From 614ec85d79fc98508bc8616baea520e69d9401f3 Mon Sep 17 00:00:00 2001
From: Mariya Abrahamyan <Mariya.Abrahamyan@avaloq.com>
Date: Mon, 14 May 2018 14:10:28 +0200
Subject: [PATCH 01/56] Make grammar reference in check language optional.

-make language attribute of validator extension point optional
-change check generator to handle absence of reference to grammar
---
 .../ddk/check/generator/CheckGenerator.xtend  |  8 +++-
 .../schema/check.exsd                         |  8 ++--
 .../registry/ICheckCatalogRegistry.java       |  8 ++++
 .../registry/ICheckValidatorRegistry.java     |  8 ++++
 .../impl/CheckCatalogRegistryImpl.java        |  5 +++
 .../impl/CheckValidatorRegistryImpl.java      | 11 +++++-
 .../ui/builder/CheckExtensionGenerator.java   |  2 +-
 .../util/CheckExtensionHelperManager.java     | 38 +++++--------------
 .../util/CheckQuickfixExtensionHelper.java    |  9 ++++-
 .../util/CheckValidatorExtensionHelper.java   |  9 ++++-
 10 files changed, 65 insertions(+), 41 deletions(-)

diff --git a/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/generator/CheckGenerator.xtend b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/generator/CheckGenerator.xtend
index 3a7fbd038..7ffbf1a05 100644
--- a/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/generator/CheckGenerator.xtend
+++ b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/generator/CheckGenerator.xtend
@@ -157,17 +157,21 @@ class CheckGenerator extends JvmModelGenerator {
     public class «catalog.standaloneSetupClassName» implements ICheckValidatorStandaloneSetup {
 
       private static final Logger LOG = Logger.getLogger(«catalog.standaloneSetupClassName».class);
+      «IF catalog.grammar !== null»
       private static final String GRAMMAR_NAME = "«catalog.grammar.name»";
+      «ENDIF»
       private static final String CATALOG_FILE_PATH = "«catalog.checkFilePath»";
 
       /** {@inheritDoc} */
       public void doSetup() {
-        ICheckValidatorRegistry.INSTANCE.registerValidator(GRAMMAR_NAME, new «catalog.validatorClassName»());
-        ICheckCatalogRegistry.INSTANCE.registerCatalog(GRAMMAR_NAME, new ModelLocation(
+
+        ICheckValidatorRegistry.INSTANCE.registerValidator(«IF catalog.grammar !== null»GRAMMAR_NAME,«ENDIF» new «catalog.validatorClassName»());
+        ICheckCatalogRegistry.INSTANCE.registerCatalog(«IF catalog.grammar !== null»GRAMMAR_NAME,«ENDIF» new ModelLocation(
           «catalog.standaloneSetupClassName».class.getClassLoader().getResource(CATALOG_FILE_PATH), CATALOG_FILE_PATH));
         LOG.info("Standalone setup done for «catalog.checkFilePath»");
       }
 
+
       @Override
       public String toString() {
         return "CheckValidatorSetup(«catalog.eResource.URI.path»)";
diff --git a/com.avaloq.tools.ddk.check.runtime.core/schema/check.exsd b/com.avaloq.tools.ddk.check.runtime.core/schema/check.exsd
index 085201317..bbcbcb78b 100644
--- a/com.avaloq.tools.ddk.check.runtime.core/schema/check.exsd
+++ b/com.avaloq.tools.ddk.check.runtime.core/schema/check.exsd
@@ -23,14 +23,14 @@
          <attribute name="point" type="string" use="required">
             <annotation>
                <documentation>
-                  
+
                </documentation>
             </annotation>
          </attribute>
          <attribute name="id" type="string" use="required">
             <annotation>
                <documentation>
-                  
+
                </documentation>
                <appinfo>
                   <meta.attribute kind="identifier"/>
@@ -40,7 +40,7 @@
          <attribute name="name" type="string">
             <annotation>
                <documentation>
-                  
+
                </documentation>
             </annotation>
          </attribute>
@@ -54,7 +54,7 @@
          </documentation>
       </annotation>
       <complexType>
-         <attribute name="language" type="string" use="required">
+         <attribute name="language" type="string">
             <annotation>
                <documentation>
                   This is the target language for which validations are defined. Corresponds to a grammar ID.
diff --git a/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/registry/ICheckCatalogRegistry.java b/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/registry/ICheckCatalogRegistry.java
index 1dbc6a773..1fa2f34a8 100644
--- a/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/registry/ICheckCatalogRegistry.java
+++ b/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/registry/ICheckCatalogRegistry.java
@@ -41,4 +41,12 @@ public interface ICheckCatalogRegistry extends ICheckImplDescriptorRegistry {
    */
   void registerCatalog(final String language, final IModelLocation modelLocation);
 
+  /**
+   * Add model location instance.
+   *
+   * @param modelLocation
+   *          model location instance
+   */
+  void registerCatalog(final IModelLocation modelLocation);
+
 }
diff --git a/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/registry/ICheckValidatorRegistry.java b/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/registry/ICheckValidatorRegistry.java
index 83efddbb5..ae52fa530 100644
--- a/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/registry/ICheckValidatorRegistry.java
+++ b/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/registry/ICheckValidatorRegistry.java
@@ -65,6 +65,14 @@ public ICheckValidatorRegistry get() {
    */
   void registerValidator(final String language, final ICheckValidatorImpl validator);
 
+  /**
+   * Add a validator that is not attached to the language.
+   *
+   * @param validator
+   *          validator for the given language
+   */
+  void registerValidator(final ICheckValidatorImpl validator);
+
   /**
    * Clear the list of registered providers.
    */
diff --git a/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/registry/impl/CheckCatalogRegistryImpl.java b/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/registry/impl/CheckCatalogRegistryImpl.java
index c304baed2..a51166daa 100644
--- a/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/registry/impl/CheckCatalogRegistryImpl.java
+++ b/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/registry/impl/CheckCatalogRegistryImpl.java
@@ -59,4 +59,9 @@ public void registerCatalog(final String language, final IModelLocation modelLoc
     concreteModelLocations.put(language, modelLocation);
   }
 
+  @Override
+  public void registerCatalog(final IModelLocation modelLocation) {
+    concreteModelLocations.put(null, modelLocation);
+  }
+
 }
diff --git a/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/registry/impl/CheckValidatorRegistryImpl.java b/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/registry/impl/CheckValidatorRegistryImpl.java
index b94140dd6..d107cb55f 100644
--- a/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/registry/impl/CheckValidatorRegistryImpl.java
+++ b/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/registry/impl/CheckValidatorRegistryImpl.java
@@ -32,6 +32,7 @@ public class CheckValidatorRegistryImpl extends AbstractCheckImplDescriptorRegis
   private final Multimap<String, ICheckValidatorImpl> concreteValidators = HashMultimap.create();
 
   /** {@inheritDoc} */
+  @Override
   public Collection<ICheckValidatorImpl> getValidators(final String language) {
     Collection<ICheckValidatorImpl> validators = Lists.newArrayList(concreteValidators.get(language));
     for (ICheckImplDescriptor v : Sets.newHashSet(getDescriptors(language))) {
@@ -48,6 +49,7 @@ public Collection<ICheckValidatorImpl> getValidators(final String language) {
   }
 
   /** {@inheritDoc} */
+  @Override
   public Collection<ICheckValidatorImpl> getValidators() {
     Collection<ICheckValidatorImpl> validators = Lists.newArrayList(concreteValidators.values());
     for (ICheckImplDescriptor v : Sets.newHashSet(getDescriptors())) {
@@ -66,19 +68,26 @@ public Collection<ICheckValidatorImpl> getValidators() {
   }
 
   /** {@inheritDoc} */
+  @Override
   public void registerValidator(final String language, final ICheckValidatorImpl validator) {
     concreteValidators.put(language, validator);
   }
 
   /** {@inheritDoc} */
+  @Override
   public void removeAllValidators() {
     concreteValidators.clear();
   }
 
   /** {@inheritDoc} */
+  @Override
   public boolean isEmpty() {
     return concreteValidators.isEmpty();
   }
 
-}
+  @Override
+  public void registerValidator(final ICheckValidatorImpl validator) {
+    concreteValidators.put(null, validator);
+  }
 
+}
diff --git a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/CheckExtensionGenerator.java b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/CheckExtensionGenerator.java
index b311bf3f5..f3b0144a1 100644
--- a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/CheckExtensionGenerator.java
+++ b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/CheckExtensionGenerator.java
@@ -495,7 +495,7 @@ private void mergeManifest(final CheckCatalog catalog, final IProgressMonitor mo
     final IProject project = RuntimeProjectUtil.getProject(catalog.eResource().getURI(), mapper);
     final IFile file = PDEProject.getManifest(project);
 
-    if (file.exists() && catalog != null) {
+    if (file.exists() && catalog != null && catalog.getGrammar() != null) {
       InputStream fileContents = null;
       try {
         fileContents = file.getContents();
diff --git a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/util/CheckExtensionHelperManager.java b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/util/CheckExtensionHelperManager.java
index 9a2a4f4ab..64595495a 100644
--- a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/util/CheckExtensionHelperManager.java
+++ b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/util/CheckExtensionHelperManager.java
@@ -21,7 +21,6 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.pde.core.plugin.IPluginExtension;
 import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.xtext.Grammar;
 import org.eclipse.xtext.naming.IQualifiedNameConverter;
 import org.eclipse.xtext.naming.IQualifiedNameProvider;
 import org.eclipse.xtext.naming.QualifiedName;
@@ -262,18 +261,6 @@ public ExtensionType apply(final IPluginExtension from) {
     }), Predicates.notNull());
   }
 
-  /**
-   * Checks if a check catalog instance has an associated grammar.
-   *
-   * @param catalog
-   *          the catalog
-   * @return {@code true} if a resolvable grammar was found
-   */
-  private boolean hasGrammar(final CheckCatalog catalog) {
-    Grammar grammar = catalog.getGrammar();
-    return grammar != null && !grammar.eIsProxy();
-  }
-
   /**
    * Update check catalog extensions if necessary.
    *
@@ -292,13 +279,8 @@ public void updateExtensions(final CheckCatalog catalog, final IPluginModelBase
 
     // Update extensions as appropriate
     for (IPluginExtension extension : catalogExtensions) {
-      if (!hasGrammar(catalog)) {
-        pluginModel.getPluginBase().remove(extension); // no extensions for Catalogs without valid grammar
-        continue; // nothing more to do if no grammar is available
-      } else {
-        for (ICheckExtensionHelper helper : getExtensionHelpers()) { // TODO getExtensionHelper using extension.getPoint() would make this more efficient
-          helper.updateExtension(catalog, extension);
-        }
+      for (ICheckExtensionHelper helper : getExtensionHelpers()) { // TODO getExtensionHelper using extension.getPoint() would make this more efficient
+        helper.updateExtension(catalog, extension);
       }
     }
   }
@@ -320,15 +302,13 @@ public void addExtensions(final CheckCatalog catalog, final IPluginModelBase plu
     Collection<IPluginExtension> catalogExtensions = findExtensions(pluginModel, catalogName, ExtensionType.ALL);
     Iterable<ExtensionType> registeredExtensionTypes = findExtensionTypes(catalogExtensions);
 
-    if (hasGrammar(catalog)) {
-      for (ExtensionType type : ExtensionType.values()) {
-        ICheckExtensionHelper helper = getExtensionHelper(type);
-        if (helper == null) {
-          continue;
-        }
-        if (!Iterables.contains(registeredExtensionTypes, type)) {
-          helper.addExtensionToPluginBase(pluginModel, catalog, type, getExtensionId(nameProvider.apply(catalog), type));
-        }
+    for (ExtensionType type : ExtensionType.values()) {
+      ICheckExtensionHelper helper = getExtensionHelper(type);
+      if (helper == null) {
+        continue;
+      }
+      if (!Iterables.contains(registeredExtensionTypes, type)) {
+        helper.addExtensionToPluginBase(pluginModel, catalog, type, getExtensionId(nameProvider.apply(catalog), type));
       }
     }
   }
diff --git a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/util/CheckQuickfixExtensionHelper.java b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/util/CheckQuickfixExtensionHelper.java
index cc9f13022..f6ade8cac 100644
--- a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/util/CheckQuickfixExtensionHelper.java
+++ b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/util/CheckQuickfixExtensionHelper.java
@@ -82,7 +82,11 @@ protected boolean isExtensionEnabled(final IPluginModelBase base, final CheckCat
   private IPluginElement updateOnlyPluginElement(final CheckCatalog catalog, final IPluginElement element) throws CoreException {
     element.setName(PROVIDER_ELEMENT_TAG);
     element.setAttribute(TARGET_CLASS_ELEMENT_TAG, getTargetClassName(catalog));
-    element.setAttribute(LANGUAGE_ELEMENT_TAG, catalog.getGrammar().getName());
+    if (catalog.getGrammar() != null) {
+      element.setAttribute(LANGUAGE_ELEMENT_TAG, catalog.getGrammar().getName());
+    } else if (element.getAttribute(LANGUAGE_ELEMENT_TAG) != null) {
+      element.setAttribute(LANGUAGE_ELEMENT_TAG, null);
+    }
     return element;
   }
 
@@ -127,7 +131,8 @@ public boolean isExtensionUpdateRequired(final CheckCatalog catalog, final IPlug
         && (!extensionNameMatches(extension, catalog)
         || Iterables.size(elements) != 1
         || !targetClassMatches(Iterables.get(elements, 0), getTargetClassName(catalog))
-        || !languageNameMatches(Iterables.get(elements, 0), catalog.getGrammar().getName()));
+        || catalog.getGrammar() == null && Iterables.get(elements, 0).getAttribute(LANGUAGE_ELEMENT_TAG) != null
+        || catalog.getGrammar() != null && !languageNameMatches(Iterables.get(elements, 0), catalog.getGrammar().getName()));
     return result;
     // @Format-On
     // CHECKSTYLE:ON
diff --git a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/util/CheckValidatorExtensionHelper.java b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/util/CheckValidatorExtensionHelper.java
index 00bda911e..c29387da5 100644
--- a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/util/CheckValidatorExtensionHelper.java
+++ b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/util/CheckValidatorExtensionHelper.java
@@ -72,7 +72,11 @@ public Iterable<IPluginElement> getElements(final CheckCatalog catalog, final IP
   private IPluginElement updateOnlyPluginElement(final CheckCatalog catalog, final IPluginElement element) throws CoreException {
     element.setName(VALIDATOR_ELEMENT_TAG);
     element.setAttribute(TARGET_CLASS_ELEMENT_TAG, getTargetClassName(catalog));
-    element.setAttribute(LANGUAGE_ELEMENT_TAG, catalog.getGrammar().getName());
+    if (catalog.getGrammar() != null) {
+      element.setAttribute(LANGUAGE_ELEMENT_TAG, catalog.getGrammar().getName());
+    } else if (element.getAttribute(LANGUAGE_ELEMENT_TAG) != null) {
+      element.setAttribute(LANGUAGE_ELEMENT_TAG, null);
+    }
     element.setAttribute(CATALOG_ELEMENT_TAG, getCatalogResourceName(catalog));
     return element;
   }
@@ -119,7 +123,8 @@ public boolean isExtensionUpdateRequired(final CheckCatalog catalog, final IPlug
         && (!extensionNameMatches(extension, catalog)
         || Iterables.size(elements) != 1
         || !targetClassMatches(Iterables.get(elements, 0), getTargetClassName(catalog))
-        || !languageNameMatches(Iterables.get(elements, 0), catalog.getGrammar().getName())
+        || catalog.getGrammar() == null && Iterables.get(elements, 0).getAttribute(LANGUAGE_ELEMENT_TAG) != null
+        || catalog.getGrammar() != null && !languageNameMatches(Iterables.get(elements, 0), catalog.getGrammar().getName())
     );
     return result;
     // @Format-On

From f94424f0c5be3b4c399b50288df38116ffffc6ad Mon Sep 17 00:00:00 2001
From: Knut Wannheden <knut.wannheden@avaloq.com>
Date: Wed, 16 May 2018 09:46:35 +0200
Subject: [PATCH 02/56] Performance: Improve opening of editor

Realigns FixedHighlightingReconciler with Xtext's HighlightingReconciler
to benefit from performance improvements made there. In particular it
puts the computation of highlighting into the background, which can help
improve the time to open an editor quite dramatically in some cases. See
commit https://github.com/eclipse/xtext-eclipse/commit/9726754baa138121b86afc499bf6fa60663bfffe.
---
 .../FixedHighlightingReconciler.java          | 265 +++++++++++++-----
 1 file changed, 191 insertions(+), 74 deletions(-)

diff --git a/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/syntaxcoloring/FixedHighlightingReconciler.java b/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/syntaxcoloring/FixedHighlightingReconciler.java
index 9ad1f0a82..062a77477 100644
--- a/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/syntaxcoloring/FixedHighlightingReconciler.java
+++ b/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/syntaxcoloring/FixedHighlightingReconciler.java
@@ -11,20 +11,28 @@
 package com.avaloq.tools.ddk.xtext.ui.syntaxcoloring;
 
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
+import java.util.Map;
 
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.TextAttribute;
 import org.eclipse.jface.text.TextPresentation;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IWorkbenchPartSite;
+import org.eclipse.xtext.resource.DerivedStateAwareResource;
+import org.eclipse.xtext.resource.IBatchLinkableResource;
 import org.eclipse.xtext.resource.XtextResource;
+import org.eclipse.xtext.resource.XtextResourceSet;
 import org.eclipse.xtext.ui.editor.XtextEditor;
 import org.eclipse.xtext.ui.editor.XtextSourceViewer;
 import org.eclipse.xtext.ui.editor.model.IXtextDocument;
+import org.eclipse.xtext.ui.editor.model.XtextDocument;
 import org.eclipse.xtext.ui.editor.syntaxcoloring.AttributedPosition;
 import org.eclipse.xtext.ui.editor.syntaxcoloring.HighlightingPresenter;
 import org.eclipse.xtext.ui.editor.syntaxcoloring.HighlightingReconciler;
@@ -32,14 +40,19 @@
 import org.eclipse.xtext.ui.editor.syntaxcoloring.ITextAttributeProvider;
 import org.eclipse.xtext.ui.editor.syntaxcoloring.MergingHighlightedPositionAcceptor;
 import org.eclipse.xtext.util.CancelIndicator;
-import org.eclipse.xtext.util.concurrent.IUnitOfWork;
+import org.eclipse.xtext.util.concurrent.CancelableUnitOfWork;
 
-import com.google.common.collect.Ordering;
+import com.google.common.collect.Maps;
 import com.google.inject.Inject;
 
 
 /**
- * Copied from Xtext HighlightingReconciler. The {@link #addPosition(int, int, String...)} method implements a binary search method to improve performance.
+ * Copied from Xtext's {@link HighlightingReconciler} with the following customizations:
+ * <ul>
+ * <li>https://review.sits.avaloq.net/#/c/8982/</li>
+ * <li>https://github.com/dsldevkit/dsl-devkit/commit/14b48aa8a35e560ddc229799f1c69cc3bddc9013#diff-cfa393424650d1e425e8727d54080250</li>
+ * </ul>
+ * .
  */
 // CHECKSTYLE:OFF
 @SuppressWarnings("PMD")
@@ -51,40 +64,60 @@ public class FixedHighlightingReconciler extends HighlightingReconciler {
   @Inject
   private ITextAttributeProvider attributeProvider;
 
-  /** The Xtext editor this highlighting reconciler is installed on. */
+  /** The Xtext editor this highlighting reconciler is installed on */
   private XtextEditor editor;
-  /** The source viewer this highlighting reconciler is installed on. */
+  /** The source viewer this highlighting reconciler is installed on */
   private XtextSourceViewer sourceViewer;
-  /** The highlighting presenter. */
+  /** The highlighting presenter */
   private HighlightingPresenter presenter;
 
-  /** Background job's added highlighted positions. */
+  /** Background job's added highlighted positions */
   private final List<AttributedPosition> addedPositions = new ArrayList<AttributedPosition>();
-  /** Background job's removed highlighted positions. */
-  private final List<AttributedPosition> removedPositions = new ArrayList<AttributedPosition>();
+  /** Background job's removed highlighted positions */
+  private List<AttributedPosition> removedPositions = new ArrayList<AttributedPosition>();
+
+  private static class PositionHandle {
+    private final int offset;
+    private final int length;
+    private final TextAttribute textAttribute;
+
+    private PositionHandle(final int offset, final int length, final TextAttribute textAttribute) {
+      this.offset = offset;
+      this.length = length;
+      this.textAttribute = textAttribute;
+    }
 
-  private final Ordering<AttributedPosition> positionOrdering = Ordering.from(new Comparator<AttributedPosition>() {
     @Override
-    public int compare(final AttributedPosition o1, final AttributedPosition o2) {
-      if (o1 == null) {
-        return o2 == null ? 0 : -1;
-      } else if (o2 == null) {
-        return 1;
-      }
-      int res = o1.offset - o2.offset;
-      if (res != 0) {
-        return res;
-      }
-      res = o1.length - o2.length;
-      if (res != 0) {
-        return res;
+    public int hashCode() {
+      final int prime = 31;
+      int result = 1;
+      result = prime * result + length;
+      result = prime * result + offset;
+      result = prime * result + ((textAttribute == null) ? 0 : textAttribute.hashCode());
+      return result;
+    }
+
+    /**
+     * @see AttributedPosition#isEqual(int, int, TextAttribute)
+     */
+    @Override
+    public boolean equals(final Object obj) {
+      if (obj == null) {
+        return false;
       }
-      if (o1.isDeleted != o2.isDeleted) {
-        return o1.isDeleted ? -1 : 1;
+      if (obj == this) {
+        return true;
       }
-      return o1.getHighlighting().hashCode() - o2.getHighlighting().hashCode();
+      PositionHandle other = (PositionHandle) obj;
+      return offset == other.offset && length == other.length && textAttribute == other.textAttribute;
     }
-  });
+
+  }
+
+  private final Map<PositionHandle, Integer> handleToListIndex = Maps.newHashMap();
+
+  /** Number of removed positions */
+  private int removedPositionCount;
 
   /**
    * Reconcile operation lock.
@@ -107,13 +140,18 @@ public int compare(final AttributedPosition o1, final AttributedPosition o2) {
    */
   private void startReconcilingPositions() {
     presenter.addAllPositions(removedPositions);
+    removedPositionCount = removedPositions.size();
+    for (int i = 0; i < removedPositionCount; i++) {
+      AttributedPosition position = removedPositions.get(i);
+      handleToListIndex.put(new PositionHandle(position.getOffset(), position.getLength(), position.getHighlighting()), i);
+    }
   }
 
   /**
-   * Reconcile positions based on the AST subtrees
+   * Reconcile positions using {@link MergingHighlightedPositionAcceptor}
    *
-   * @param subtrees
-   *          the AST subtrees
+   * @param resource
+   *          XtextResource
    */
   private void reconcilePositions(final XtextResource resource) {
     // for (int i= 0, n= subtrees.length; i < n; i++)
@@ -121,7 +159,15 @@ private void reconcilePositions(final XtextResource resource) {
     MergingHighlightedPositionAcceptor acceptor = new MergingHighlightedPositionAcceptor(calculator);
     acceptor.provideHighlightingFor(resource, this);
     // calculator.provideHighlightingFor(resource, this);
-    Collections.sort(removedPositions, positionOrdering);
+    List<AttributedPosition> oldPositions = removedPositions;
+    List<AttributedPosition> newPositions = new ArrayList<AttributedPosition>(removedPositionCount);
+    for (int i = 0, n = oldPositions.size(); i < n; i++) {
+      AttributedPosition current = oldPositions.get(i);
+      if (current != null) {
+        newPositions.add(current);
+      }
+    }
+    removedPositions = newPositions;
   }
 
   /**
@@ -131,19 +177,31 @@ private void reconcilePositions(final XtextResource resource) {
    *          The range offset
    * @param length
    *          The range length
-   * @param highlighting
-   *          The highlighting
+   * @param ids
+   *          The highlighting attribute ids
    */
   @Override
   public void addPosition(final int offset, final int length, final String... ids) {
     TextAttribute highlighting = ids.length == 1 ? attributeProvider.getAttribute(ids[0]) : attributeProvider.getMergedAttributes(ids);
-    AttributedPosition position = presenter.createHighlightedPosition(offset, length, highlighting);
-    int idx = positionOrdering.binarySearch(removedPositions, position);
-    boolean isExisting = idx >= 0 && removedPositions.get(idx).isEqual(offset, length, highlighting);
+    if (highlighting == null) {
+      return;
+    }
+    boolean isExisting = false;
+
+    PositionHandle handle = new PositionHandle(offset, length, highlighting);
+    Integer index = handleToListIndex.remove(handle);
+    if (index != null) {
+      AttributedPosition position = removedPositions.get(index);
+      if (position == null) {
+        throw new IllegalStateException("Position may not be null if the handle is still present."); //$NON-NLS-1$
+      }
+      isExisting = true;
+      removedPositions.set(index, null);
+      removedPositionCount--;
+    }
 
-    if (isExisting) {
-      removedPositions.remove(idx);
-    } else {
+    if (!isExisting && presenter != null) { // in case we have been uninstalled due to exceptions
+      AttributedPosition position = presenter.createHighlightedPosition(offset, length, highlighting);
       addedPositions.add(position);
     }
   }
@@ -157,23 +215,36 @@ public void addPosition(final int offset, final int length, final String... ids)
    *          the added positions
    * @param removedPositions
    *          the removed positions
+   * @param resource
+   *          the resource for which the positions have been computed
    */
-  private void updatePresentation(final TextPresentation textPresentation, final List<AttributedPosition> addedPositions, final List<AttributedPosition> removedPositions) {
-    Runnable runnable = presenter.createUpdateRunnable(textPresentation, addedPositions, removedPositions);
+  private void updatePresentation(final TextPresentation textPresentation, final List<AttributedPosition> addedPositions, final List<AttributedPosition> removedPositions, final XtextResource resource) {
+    final Runnable runnable = presenter.createUpdateRunnable(textPresentation, addedPositions, removedPositions);
     if (runnable == null) {
       return;
     }
-
+    final XtextResourceSet resourceSet = (XtextResourceSet) resource.getResourceSet();
+    final int modificationStamp = resourceSet.getModificationStamp();
     Display display = getDisplay();
-    display.asyncExec(runnable);
+    display.asyncExec(new Runnable() {
+      @Override
+      public void run() {
+        // never apply outdated highlighting
+        if (sourceViewer != null && modificationStamp == resourceSet.getModificationStamp()) {
+          runnable.run();
+        }
+      }
+    });
   }
 
   private Display getDisplay() {
     XtextEditor editor = this.editor;
     if (editor == null) {
+      if (sourceViewer != null) {
+        return sourceViewer.getControl().getDisplay();
+      }
       return null;
     }
-
     IWorkbenchPartSite site = editor.getSite();
     if (site == null) {
       return null;
@@ -196,6 +267,8 @@ private Display getDisplay() {
    */
   private void stopReconcilingPositions() {
     removedPositions.clear();
+    removedPositionCount = 0;
+    handleToListIndex.clear();
     addedPositions.clear();
   }
 
@@ -230,7 +303,7 @@ public void install(final XtextEditor editor, final XtextSourceViewer sourceView
   }
 
   /**
-   * Uninstall this reconciler from the editor.
+   * Uninstall this reconciler from the editor
    */
   @Override
   public void uninstall() {
@@ -238,15 +311,13 @@ public void uninstall() {
       presenter.setCanceled(true);
     }
 
-    if (editor != null) {
+    if (sourceViewer.getDocument() != null) {
       if (calculator != null) {
-        if (editor.getDocument() != null) {
-          editor.getDocument().removeModelListener(this);
-        }
+        XtextDocument document = (XtextDocument) sourceViewer.getDocument();
+        document.removeModelListener(this);
         sourceViewer.removeTextInputListener(this);
       }
     }
-
     synchronized (fReconcileLock) {
       if (reconciling) {
         cleanUpAfterReconciliation = true;
@@ -258,7 +329,6 @@ public void uninstall() {
     }
   }
 
-  /** {@inheritDoc} */
   @Override
   public void inputDocumentAboutToBeChanged(final IDocument oldInput, final IDocument newInput) {
     if (oldInput != null) {
@@ -266,7 +336,6 @@ public void inputDocumentAboutToBeChanged(final IDocument oldInput, final IDocum
     }
   }
 
-  /** {@inheritDoc} */
   @Override
   public void inputDocumentChanged(final IDocument oldInput, final IDocument newInput) {
     if (newInput != null) {
@@ -281,19 +350,24 @@ public void inputDocumentChanged(final IDocument oldInput, final IDocument newIn
   @Override
   public void refresh() {
     if (calculator != null) {
-      IDocument document;
-      if (editor != null) {
-        document = editor.getDocument();
-      } else {
-        document = sourceViewer.getDocument();
-      }
+      IDocument document = editor != null ? editor.getDocument() : sourceViewer.getDocument();
       if (document instanceof IXtextDocument) {
-        ((IXtextDocument) document).readOnly(new IUnitOfWork.Void<XtextResource>() {
+        Job job = new Job("Calculating highlighting") { //$NON-NLS-1$
           @Override
-          public void process(final XtextResource state) throws Exception {
-            modelChanged(state);
+          protected IStatus run(final IProgressMonitor monitor) {
+            ((XtextDocument) document).readOnly(new CancelableUnitOfWork<Void, XtextResource>() {
+              @Override
+              public java.lang.Void exec(final XtextResource state, final CancelIndicator cancelIndicator) throws Exception {
+                beforeRefresh(state, cancelIndicator);
+                modelChanged(state, cancelIndicator);
+                return null;
+              }
+            });
+            return Status.OK_STATUS;
           }
-        });
+        };
+        job.setSystem(true);
+        job.schedule();
       }
     } else {
       Display display = getDisplay();
@@ -301,9 +375,33 @@ public void process(final XtextResource state) throws Exception {
     }
   }
 
-  /** {@inheritDoc} */
+  /**
+   * @since 2.8
+   */
+  @Override
+  protected void beforeRefresh(final XtextResource resource, final CancelIndicator cancelIndicator) {
+    if (resource instanceof DerivedStateAwareResource) {
+      resource.getContents(); // trigger derived state computation
+    }
+    if (resource instanceof IBatchLinkableResource) {
+      ((IBatchLinkableResource) resource).linkBatched(cancelIndicator);
+    }
+  }
+
+  @Override
+  public void modelChanged(final XtextResource resource) {
+    modelChanged(resource, CancelIndicator.NullImpl);
+  }
+
+  /**
+   * @since 2.7
+   */
   @Override
   public void modelChanged(final XtextResource resource, final CancelIndicator cancelIndicator) {
+    if (resource == null) {
+      return;
+    }
+
     // ensure at most one thread can be reconciling at any time
     synchronized (fReconcileLock) {
       if (reconciling) {
@@ -317,29 +415,38 @@ public void modelChanged(final XtextResource resource, final CancelIndicator can
         return;
       }
 
-      highlightingPresenter.setCanceled(false);
+      highlightingPresenter.setCanceled(cancelIndicator.isCanceled());
 
       if (highlightingPresenter.isCanceled()) {
         return;
       }
+      checkCanceled(cancelIndicator);
 
       startReconcilingPositions();
 
-      if (!highlightingPresenter.isCanceled()) {
-        reconcilePositions(resource);
+      if (highlightingPresenter.isCanceled()) {
+        return;
       }
+      checkCanceled(cancelIndicator);
+      reconcilePositions(resource);
 
-      final TextPresentation[] textPresentation = new TextPresentation[1];
-      if (!highlightingPresenter.isCanceled()) {
-        textPresentation[0] = highlightingPresenter.createPresentation(addedPositions, removedPositions);
+      if (highlightingPresenter.isCanceled()) {
+        return;
       }
+      checkCanceled(cancelIndicator);
+      final TextPresentation textPresentation = highlightingPresenter.createPresentation(addedPositions, removedPositions);
 
-      if (!highlightingPresenter.isCanceled()) {
-        updatePresentation(textPresentation[0], addedPositions, removedPositions);
+      if (highlightingPresenter.isCanceled()) {
+        return;
       }
+      checkCanceled(cancelIndicator);
+      updatePresentation(textPresentation, addedPositions, removedPositions, resource);
 
-      stopReconcilingPositions();
     } finally {
+      if (highlightingPresenter != null) {
+        highlightingPresenter.setCanceled(false);
+      }
+      stopReconcilingPositions();
       synchronized (fReconcileLock) {
         reconciling = false;
         if (cleanUpAfterReconciliation) {
@@ -352,6 +459,16 @@ public void modelChanged(final XtextResource resource, final CancelIndicator can
     }
   }
 
+  /**
+   * @since 2.8
+   */
+  @Override
+  protected void checkCanceled(final CancelIndicator cancelIndicator) {
+    if (cancelIndicator.isCanceled()) {
+      throw new OperationCanceledException();
+    }
+  }
+
   @Override
   public void setCalculator(final ISemanticHighlightingCalculator calculator) {
     this.calculator = calculator;

From f0bb7f63036ad23420591383647a5d5e0e59a170 Mon Sep 17 00:00:00 2001
From: Knut Wannheden <knut.wannheden@avaloq.com>
Date: Wed, 16 May 2018 17:56:12 +0200
Subject: [PATCH 03/56] Cleanup: Remove unused import

Fixes compiler warning in DirectLinkingEObjectOutputStream.
---
 .../persistence/DirectLinkingEObjectOutputStream.java        | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/persistence/DirectLinkingEObjectOutputStream.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/persistence/DirectLinkingEObjectOutputStream.java
index e7ba85b60..7fb8f2168 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/persistence/DirectLinkingEObjectOutputStream.java
+++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/persistence/DirectLinkingEObjectOutputStream.java
@@ -24,7 +24,6 @@
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.impl.BinaryResourceImpl.EObjectOutputStream;
-import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.xtext.linking.lazy.LazyURIEncoder;
 
 import com.google.common.collect.Lists;
@@ -47,8 +46,8 @@ class DirectLinkingEObjectOutputStream extends EObjectOutputStream {
 
   /**
    * Writes a binary representation of the given object's URI to this output stream. For objects contained by the given resource the object's
-   * {@link Resource#getURIFragment(EObject) URI fragment} will be used. For objects in other resources the {@link EcoreUtil#getURI(EObject) full URI} will be
-   * written.
+   * {@link Resource#getURIFragment(EObject) URI fragment} will be used. For objects in other resources the
+   * {@link org.eclipse.emf.ecore.util.EcoreUtil#getURI(EObject) full URI} will be written.
    *
    * @param obj
    *          object to write, must not be {@code null}

From 8c53d0a38a332ab651919940ef53cbf2bcdaf3a1 Mon Sep 17 00:00:00 2001
From: Robbie Henderson <Robbie.Henderson@avaloq.com>
Date: Thu, 17 May 2018 12:52:07 +0200
Subject: [PATCH 04/56] #97: De-release check 'with' construct

 - De-release the check language with construct and associated tests,
validations, quick-fixes, generator code
 - Clean up use of '==' when comparing with null in touched xtend
sources
 - Change the check genmodel compliance to java 8, and commit the
associated javadoc changes
---
 .../check/core/test/CheckScopingTest.xtend    |    16 -
 .../validation/CheckValidationTest.xtend      |     7 -
 .../com/avaloq/tools/ddk/check/Check.ecore    |     1 -
 .../com/avaloq/tools/ddk/check/Check.genmodel |     3 +-
 .../com/avaloq/tools/ddk/check/Check.xtext    |     2 -
 .../com/avaloq/tools/ddk/check/Check.xtextbin |   Bin 22032 -> 21959 bytes
 .../tools/ddk/check/check/Category.java       |     2 +-
 .../avaloq/tools/ddk/check/check/Check.java   |     2 +-
 .../tools/ddk/check/check/CheckCatalog.java   |    29 +-
 .../tools/ddk/check/check/CheckPackage.java   |    38 +-
 .../avaloq/tools/ddk/check/check/Context.java |     2 +-
 .../ddk/check/check/ContextVariable.java      |     2 +-
 .../tools/ddk/check/check/Documented.java     |     2 +-
 .../ddk/check/check/FormalParameter.java      |     2 +-
 .../tools/ddk/check/check/Implementation.java |     2 +-
 .../ddk/check/check/ImplicitlyNamed.java      |     2 +-
 .../avaloq/tools/ddk/check/check/Member.java  |     2 +-
 .../tools/ddk/check/check/SeverityKind.java   |     6 +
 .../tools/ddk/check/check/SeverityRange.java  |     2 +-
 .../tools/ddk/check/check/TriggerKind.java    |     6 +
 .../ddk/check/check/XGuardExpression.java     |     2 +-
 .../ddk/check/check/XIssueExpression.java     |     2 +-
 .../ddk/check/check/impl/CategoryImpl.java    |     2 +-
 .../check/check/impl/CheckCatalogImpl.java    |    67 +-
 .../tools/ddk/check/check/impl/CheckImpl.java |     2 +-
 .../check/check/impl/CheckPackageImpl.java    |    20 +-
 .../ddk/check/check/impl/ContextImpl.java     |     2 +-
 .../check/check/impl/ContextVariableImpl.java |     2 +-
 .../ddk/check/check/impl/DocumentedImpl.java  |     2 +-
 .../check/check/impl/FormalParameterImpl.java |     2 +-
 .../check/check/impl/ImplementationImpl.java  |     2 +-
 .../check/check/impl/ImplicitlyNamedImpl.java |     2 +-
 .../ddk/check/check/impl/MemberImpl.java      |     2 +-
 .../check/check/impl/SeverityRangeImpl.java   |     2 +-
 .../check/impl/XGuardExpressionImpl.java      |     2 +-
 .../check/impl/XIssueExpressionImpl.java      |     2 +-
 .../ddk/check/check/util/CheckSwitch.java     |     2 +-
 .../parser/antlr/internal/InternalCheck.g     |    51 +-
 .../antlr/internal/InternalCheck.tokens       |    52 +-
 .../antlr/internal/InternalCheckLexer.java    |   624 +-
 .../antlr/internal/InternalCheckParser.java   | 13120 +++++----
 .../AbstractCheckSemanticSequencer.java       |     1 -
 .../check/services/CheckGrammarAccess.java    |    80 +-
 .../ddk/check/formatting/CheckFormatter.java  |     5 +-
 .../generator/CheckGeneratorExtensions.xtend  |    26 +-
 .../jvmmodel/CheckJvmModelInferrer.xtend      |   102 +-
 .../check/scoping/CheckScopeProvider.xtend    |    18 +-
 .../check/validation/CheckJavaValidator.java  |    64 -
 .../AbstractCheckProposalProvider.java        |     3 -
 .../ui/contentassist/antlr/CheckParser.java   |    12 +-
 .../antlr/internal/InternalCheck.g            |   183 +-
 .../antlr/internal/InternalCheckLexer.java    |   118 +-
 .../antlr/internal/InternalCheckParser.java   | 24303 ++++++++--------
 .../ui/quickfix/CheckQuickfixProvider.java    |    39 +-
 54 files changed, 19104 insertions(+), 19942 deletions(-)

diff --git a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/CheckScopingTest.xtend b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/CheckScopingTest.xtend
index 2d01538e0..2f541901d 100644
--- a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/CheckScopingTest.xtend
+++ b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/CheckScopingTest.xtend
@@ -49,22 +49,6 @@ class CheckScopingTest extends AbstractCheckTestCase {
     IResourcesSetupUtil::waitForAutoBuild
   }
 
-  /*
-   * Tests that Catalogs can be included in one another.
-   */
-  @Test
-  def void testResolutionOfIncludedCatalog() {
-    initializeTestProject
-
-    // test that our model is available
-    val sampleCheckModel = getModel("SampleChecks") as CheckCatalog
-
-    // test that the included catalog exists and is resolved
-    val includedCategory = sampleCheckModel.includedCatalogs
-    assertNotNull("The included Category is not null", includedCategory)
-    assertFalse("The included Category could be resolved", includedCategory.eIsProxy)
-  }
-
   /*
    * Tests that a catalog may not reference checks (in implementations, 'def') which are
    * neither local nor included.
diff --git a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/validation/CheckValidationTest.xtend b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/validation/CheckValidationTest.xtend
index 294a0bfaf..ed7718363 100644
--- a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/validation/CheckValidationTest.xtend
+++ b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/validation/CheckValidationTest.xtend
@@ -115,13 +115,6 @@ class CheckValidationTest {
     helper.assertNoError(model, IssueCodes::CONTEXT_TYPES_NOT_UNIQUE)
   }
 
-  /* Tests checkCircularDependency(CheckCatalog) */
-  @Test
-  def void testCatalogMayNotIncludeItself() {
-    val model = parser.parse("package p catalog c for grammar g with c ")
-    helper.assertError(model, CheckPackage$Literals::CHECK_CATALOG, IssueCodes::INCLUDED_CATALOGS_WITH_CIRCULAR_DEPENDENCIES)
-  }
-
   /* Tests checkGuardsFirstInBlockExpression(Context) */
   @Test
   def void testGuardsPrecedeIssues() {
diff --git a/com.avaloq.tools.ddk.check.core/metamodel/com/avaloq/tools/ddk/check/Check.ecore b/com.avaloq.tools.ddk.check.core/metamodel/com/avaloq/tools/ddk/check/Check.ecore
index 449ff70b4..e258b9e28 100644
--- a/com.avaloq.tools.ddk.check.core/metamodel/com/avaloq/tools/ddk/check/Check.ecore
+++ b/com.avaloq.tools.ddk.check.core/metamodel/com/avaloq/tools/ddk/check/Check.ecore
@@ -9,7 +9,6 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="final" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="grammar" eType="ecore:EClass platform:/plugin/org.eclipse.xtext/org/eclipse/xtext/Xtext.ecore#//Grammar"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="includedCatalogs" eType="#//CheckCatalog"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="categories" upperBound="-1"
         eType="#//Category" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="implementations" upperBound="-1"
diff --git a/com.avaloq.tools.ddk.check.core/metamodel/com/avaloq/tools/ddk/check/Check.genmodel b/com.avaloq.tools.ddk.check.core/metamodel/com/avaloq/tools/ddk/check/Check.genmodel
index ba8650a93..0c5e28983 100644
--- a/com.avaloq.tools.ddk.check.core/metamodel/com/avaloq/tools/ddk/check/Check.genmodel
+++ b/com.avaloq.tools.ddk.check.core/metamodel/com/avaloq/tools/ddk/check/Check.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/com.avaloq.tools.ddk.check.core/src-gen" editDirectory="/com.avaloq.tools.ddk.check.core.edit/src"
     editorDirectory="/com.avaloq.tools.ddk.check.core.editor/src" modelPluginID="com.avaloq.tools.ddk.check.core"
     forceOverwrite="true" modelName="Check" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="6.0" copyrightFields="false"
+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"
     editPluginID="com.avaloq.tools.ddk.check.core.edit" editorPluginID="com.avaloq.tools.ddk.check.core.editor"
     runtimeVersion="2.10" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types platform:/plugin/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xAnnotations platform:/plugin/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xbase platform:/plugin/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xtype platform:/plugin/org.eclipse.xtext/org/eclipse/xtext/Xtext.genmodel#//xtext">
   <foreignModel>Check.ecore</foreignModel>
@@ -26,7 +26,6 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Check.ecore#//CheckCatalog/final"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Check.ecore#//CheckCatalog/name"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Check.ecore#//CheckCatalog/grammar"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Check.ecore#//CheckCatalog/includedCatalogs"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Check.ecore#//CheckCatalog/categories"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Check.ecore#//CheckCatalog/implementations"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Check.ecore#//CheckCatalog/checks"/>
diff --git a/com.avaloq.tools.ddk.check.core/metamodel/com/avaloq/tools/ddk/check/Check.xtext b/com.avaloq.tools.ddk.check.core/metamodel/com/avaloq/tools/ddk/check/Check.xtext
index 3bcc84cc9..bbf8ccbbe 100644
--- a/com.avaloq.tools.ddk.check.core/metamodel/com/avaloq/tools/ddk/check/Check.xtext
+++ b/com.avaloq.tools.ddk.check.core/metamodel/com/avaloq/tools/ddk/check/Check.xtext
@@ -14,8 +14,6 @@ CheckCatalog:
   imports=XImportSection
   (final?='final')? 'catalog' name=ValidID
   ('for' 'grammar' ^grammar=[xtext::Grammar|QualifiedName])?
-  ('with' includedCatalogs=[CheckCatalog|QualifiedName])?  //TODO a list of included catalogs ??
-  // TODO only allow including a check catalog if the languages match. (matching rule are defined by the "with" clause of the grammar definition.) '{'
   '{'
   (categories+=Category | implementations+=Implementation | checks+=Check | members+=Member)*
   '}';
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/Check.xtextbin b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/Check.xtextbin
index 889a2fca776132e700b1febe33deaa4b56e87705..6e2c56d8d0fced5e421176c08d6fdf9fabc97f05 100644
GIT binary patch
delta 2508
zcmZWqS#;E76z-o)GSihQ1#A)AKr96sR6r05oesHLXlZFtHbFz14w0Emotc(a#DIwV
zQjII3;=X{}Q6GKq9L~`<Uwu*PE{X~&E(q#(lgzZmzWkkgzx&<qF8`mQgW|&j;;lK&
zqU@de=5->fD$;hLe<~D7s#6sGGk19T1n00QRrFy|A{EDtoS8^x24($oAxrTSvi^l6
z7pbM1miLH|{-p>jVf`ziD#cv^Ug%$oGD%vh$X2&1HH7tVK)Fx|{aaC{s7Yh9ne@!x
z!5piA{RpC2$@d6zASK+j#q8ReRpnU-{(<!zg&sA|R$2ei7qd)7_MecwME}`OSCKXQ
z&5V^B>@e(v>7_Wv!N(C?(K*^D>%RmQ{mK<ZHLc)o;aD*L2Ih!<f|WH2{db&WDTMw9
z`)Y;$C#ot-S$3YnOZ*onKItxLnO>s*9ppOYCR=JF`e~t{+5fovT4qT4zwV)yxm87=
zQq4>zoe_eB7_X4zhFhmPGVGCUM#i@61Uw=3D3Vg7P8d<V!m_(H%kD|5qynz+zrcnW
z8)59EGqDLfoiSA^20CncKZN&3C9uf#^@2*hk_=~HbWK#|)dcQx;G~&;OoiWjwa2oJ
zq$)3M2-7&Y{olYweZR65GPyHU2^JbJDy6d387q-6GhBd7ReqCbf)pxJD>RLrPT&<G
znuw-_Xc8B778h0JBLaZdV`OtGRU@&IwE9ittzqb7hE5y{Me!*prLzGJr|nL|gHK`j
zREAfNz@yw+bD-C>vmjOJ9QW;&RnEC+PPE(XG5V6ZG5t9&-=FjSnuGPH3t-3k)3h<`
zPt#%M^`{F(m~TsnW(ZZrWvmr+k#CZz7BQ7Qp5%5TW2DU795dtJ44TQEtiy6gX*9sh
z$TTbH=4`jOt)^`bc3Gu*P${{=Uhig*hTu9RpUYMo#NKc&4y0bf6K)W6DNDvAw&Xnb
zJkB`Z{iJPX^#Wvw?UQ2~hI1K)Bhx~5E^=$yr#hF9axV6qS3p9D8pJq-mITh7$i5W(
zksi~?^<g7<I~ql~LNOp3kI1pbLZv3K#`a*>D9+e)ubDA|O<Lw9WS7qW5js(~w$n=W
zy6?5mSa9Vi4Oe;F(+pJ8AwkRe{8-Qmobh?y8iS*SIa=MyRg;~SerVIXsIATGT{{b3
zRWJ+c;08?-)XC=tL96ovyBaEs&7_$!?OZUYYnXWvQmkQ69a^=Pqh<?Q_kZwuQR;YT
z;5RUAV<1q_wZT;@yr8rZ%)CPUN1O8O*9Gj?gMIAo6jsMzNf<xEHZvNRnY!{NINdNs
zQf4-5;3*^%H023g0K3&Ud4uZ7r>2BA;4R*OEq{Zz3%Y^D*5RX&wsYn{z7<<JZxVxw
z#C^L=DRdRz7P9#zF2T1YUE@Wd_i2x_7ivPd0)lRIKj^4dGt7~74|hx~&IPf3?&*#i
zryp>cwn6U5nhyXx9mNd>&ro60Z-N7t(rdwXgp@*PHkUCh+h6sY;cuD}0CsSXc7Wy<
zpXQ9J99EQce6XOM0UEz)7pS9HNq-@XoP{jjca3i4pxtQ2xaKi#nQjZJ+QS{G)U>gF
z^yPN1FL!WX@D2&OlS{Up{3X82FOBYoITG~Wo7p{{&Y-4y;T`><rTgH;hgQ)29G5av
zn+xmm00$01Yq-@j%k*HN@gde&tZA^90}pX7#HsYKyMJ}H^9WNKpnQ}S7T%u6VCJDb
z&ep<2o`98~$-VhKd=iG(8bSL2Q~Ql%pZ`QW#pX@i+^4zGi-UTe$#-4<sPQoEhuBhQ
zS-Pu_FQSPL%(H>w=U8#Mrj7U@`g!bdm|g(0{=T3W`8+D<B|e7*y^IrEORw;`ThOa~
z4zYsQkS5CWvAV2Wa&RR^fK&&9RO=6NuJQf^M<I~#b??%=!3mJ)O+JS~s1NH$_2V=|
fyQz+d7SViar6gtJ$Kt1Adt(jyNqjmbIVAoAd-)<i

delta 2454
zcmZ`)`&$%M80O6E%yJh{3KXrxNKsi#D~kvgn6HS7=z7i61{jvf-B}tIl(5z=R(3U~
ztW3M#wX(Dyt6zGa`mO$fvMXgb%~HGA<^5)6SE#3b9-cFN?|0ts{VwO6_xFh%`^ACz
zt)k#yP3szw3QAIgB5NNDRZ%vX$$p`IBJ!1D)9Q&0^%}j+dQy)iqJyebAJh(u0!8~&
z$WrqOS$kKg+Giq9St#(+KF5A(RA^raMUtu&Mf(ygc|Cg4h$d{)7*yrCAovRY+L*|d
za=^>TNJ`ee_6fg{<SaEW6iP!PpdArGC8&K1?i`<LL}=fMd{?vC>x%jwoQt902Lx1O
zdbbgC%|F5%E`<H4uk09at5$+N{YKA5U(ZisCIlUaAhnszvi7qlrbR{cUl2W4JK?Nv
zD^Hzd<)`3S7%_$o+f0ru)2*l>Yrp#He`EDUq0j^vB)@|sTl<4WGz#rB)`<*4`;)QR
zLi-B|<i|}b&ETf-H{w#3a89;W=92JYk>pgi&(0=UD2hS>C(>Rek>ZTD*G^W!r5d)K
zu!W$YC{ZZed8d7PX%6h!n{?YUttgOOM)I6v?NdwgfheZcmw>r|&4o@yM@4E9%t141
zC2WKH3$O?lxu!-?v8z+xJYFZ2csd15hMP3U+cL%Ll-g%ndQ6oY>Vs4Y*!v%pXL-1?
z(X`xN(%H;XCW@uS`O9rH8a3=TKr)s4iBFXRS!!V@G!7I2nua<AsDi~$caC<Hm&`yA
zC1wsoI-SGjbDgQ3)25sUb1-2=bQhS(K&8{#IiqwIfSiQYV#IZ;*Oe~ld}m8%S*j|X
z)&&!Wj%LG-p`$qyhK{OX=Aomx!aY|3nkQ7W3GJo%o=K(}>?!U`*l|79rQ3SkNE)^`
zj}+o?wV1LZa`9BgL8b+M4KCzCD+z@>kBkHAun?oB(jw3+$&mqr=Z7u=V>JX_%vKA*
zT<ayi{KZIIsuy%Ar-6d^Ctdh5mQe>8&dw!OWtSsxc#j+oAw)e&Ez=c@H#i?HnVxDK
z2Zmj+2`U2AEG8+`;)7cuKtqV^K0{9q*`5Z%WkOfNqw$Cwt`jO<1=jF39<^5XO$-<|
z+TjYi+6~B18-KM!TJ`FP86R+BT~(=$aT+?^Sy%$EruPJO@%o{lrC6I6d7Txsj5#9U
zC|%v0um+R5m25W$@rOp}F`1Tod`*Xt@Cvu4D><808MC0(T)0X>Yp|xIwSulmcXutc
z=NK^~ZdggbtJiY828dtBPSq&jdfq-y(1!myU*|i+U1zU#zG^|;{%OkGanu9faN!2e
zgL>2KhR@yy_Wv2QC`YN~jnvQHIIv`<Q@9?M?6@&Fs7DP!8=a#|OH(m76#K{BE?aJw
z6W(->3L0Q>)wre;R?^s<&in=rW24g9C^Xw;8blTGd{C0dI2X6Q2cXnLF6A(S2XHzB
zZG!wFpD(piw@tk}=8eu~rX2xok-s~Q%5<YoKkA>7e>ot`7KD-MCXk;wB{zd`7II7Z
z7gFY+Yz2UGE<&97E!dL>L4!$KH!bg|+zN-L3ZU$88<+AXeBACVh?Gv-#xijcyFa?a
z2ifsXM~{@NcQL-**&3OWbGI-19%pZ)EOoD2iTk(`y+)s)`&n#8(*vF++5u~}Umy3B
zJUA{M?F2ghts@60o;pDf@xHhb@6KF15A()dsAsT)%_&=^M|?q#avgI*As4VwzQ>?V
zrQKe;^L5KgB=w|;qPQ<SJ<d^dMA^fdGuO~wn7P1Dur-s(ld$qF`c!)Io`xa3DkbO{
z_^HEsY{+Z)vut0_m3xk>Sm#z$(DUh%Y9BNnrWcSvUQ429h>xCuSK~!LhnF~qf>7uT
zhCE)z7zgPU5NmG>+Q;j0LHl`~F(&9$e4uyq8n4?0z0T_{R&c=ST2Y$whR^+`W34D}
zJm{W@L%bOzZ}B<?Uu{e~uAQP?w4G|Hof@c)B4pD@^RedB;oaeS%EDtO$pP^Xl(-5m

diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/Category.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/Category.java
index 1d6426283..fdab261b5 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/Category.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/Category.java
@@ -11,12 +11,12 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.check.check.Category#getId <em>Id</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.Category#getLabel <em>Label</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.Category#getChecks <em>Checks</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.check.check.CheckPackage#getCategory()
  * @model
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/Check.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/Check.java
index 78a09ed84..6d9aba848 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/Check.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/Check.java
@@ -11,6 +11,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.check.check.Check#getSeverityRange <em>Severity Range</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.Check#isFinal <em>Final</em>}</li>
@@ -23,7 +24,6 @@
  *   <li>{@link com.avaloq.tools.ddk.check.check.Check#getContexts <em>Contexts</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.Check#getMessage <em>Message</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.check.check.CheckPackage#getCheck()
  * @model
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/CheckCatalog.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/CheckCatalog.java
index 9071cc9d5..bb5328560 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/CheckCatalog.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/CheckCatalog.java
@@ -15,19 +15,18 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.check.check.CheckCatalog#getPackageName <em>Package Name</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.CheckCatalog#getImports <em>Imports</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.CheckCatalog#isFinal <em>Final</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.CheckCatalog#getName <em>Name</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.CheckCatalog#getGrammar <em>Grammar</em>}</li>
- *   <li>{@link com.avaloq.tools.ddk.check.check.CheckCatalog#getIncludedCatalogs <em>Included Catalogs</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.CheckCatalog#getCategories <em>Categories</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.CheckCatalog#getImplementations <em>Implementations</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.CheckCatalog#getChecks <em>Checks</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.CheckCatalog#getMembers <em>Members</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.check.check.CheckPackage#getCheckCatalog()
  * @model
@@ -165,32 +164,6 @@ public interface CheckCatalog extends Documented
 	 */
 	void setGrammar(Grammar value);
 
-	/**
-	 * Returns the value of the '<em><b>Included Catalogs</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Included Catalogs</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Included Catalogs</em>' reference.
-	 * @see #setIncludedCatalogs(CheckCatalog)
-	 * @see com.avaloq.tools.ddk.check.check.CheckPackage#getCheckCatalog_IncludedCatalogs()
-	 * @model
-	 * @generated
-	 */
-	CheckCatalog getIncludedCatalogs();
-
-	/**
-	 * Sets the value of the '{@link com.avaloq.tools.ddk.check.check.CheckCatalog#getIncludedCatalogs <em>Included Catalogs</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Included Catalogs</em>' reference.
-	 * @see #getIncludedCatalogs()
-	 * @generated
-	 */
-	void setIncludedCatalogs(CheckCatalog value);
-
 	/**
 	 * Returns the value of the '<em><b>Categories</b></em>' containment reference list.
 	 * The list contents are of type {@link com.avaloq.tools.ddk.check.check.Category}.
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/CheckPackage.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/CheckPackage.java
index 1708335b5..2125ec739 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/CheckPackage.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/CheckPackage.java
@@ -151,15 +151,6 @@ public interface CheckPackage extends EPackage
 	 */
 	int CHECK_CATALOG__GRAMMAR = DOCUMENTED_FEATURE_COUNT + 4;
 
-	/**
-	 * The feature id for the '<em><b>Included Catalogs</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHECK_CATALOG__INCLUDED_CATALOGS = DOCUMENTED_FEATURE_COUNT + 5;
-
 	/**
 	 * The feature id for the '<em><b>Categories</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
@@ -167,7 +158,7 @@ public interface CheckPackage extends EPackage
 	 * @generated
 	 * @ordered
 	 */
-	int CHECK_CATALOG__CATEGORIES = DOCUMENTED_FEATURE_COUNT + 6;
+	int CHECK_CATALOG__CATEGORIES = DOCUMENTED_FEATURE_COUNT + 5;
 
 	/**
 	 * The feature id for the '<em><b>Implementations</b></em>' containment reference list.
@@ -176,7 +167,7 @@ public interface CheckPackage extends EPackage
 	 * @generated
 	 * @ordered
 	 */
-	int CHECK_CATALOG__IMPLEMENTATIONS = DOCUMENTED_FEATURE_COUNT + 7;
+	int CHECK_CATALOG__IMPLEMENTATIONS = DOCUMENTED_FEATURE_COUNT + 6;
 
 	/**
 	 * The feature id for the '<em><b>Checks</b></em>' containment reference list.
@@ -185,7 +176,7 @@ public interface CheckPackage extends EPackage
 	 * @generated
 	 * @ordered
 	 */
-	int CHECK_CATALOG__CHECKS = DOCUMENTED_FEATURE_COUNT + 8;
+	int CHECK_CATALOG__CHECKS = DOCUMENTED_FEATURE_COUNT + 7;
 
 	/**
 	 * The feature id for the '<em><b>Members</b></em>' containment reference list.
@@ -194,7 +185,7 @@ public interface CheckPackage extends EPackage
 	 * @generated
 	 * @ordered
 	 */
-	int CHECK_CATALOG__MEMBERS = DOCUMENTED_FEATURE_COUNT + 9;
+	int CHECK_CATALOG__MEMBERS = DOCUMENTED_FEATURE_COUNT + 8;
 
 	/**
 	 * The number of structural features of the '<em>Catalog</em>' class.
@@ -203,7 +194,7 @@ public interface CheckPackage extends EPackage
 	 * @generated
 	 * @ordered
 	 */
-	int CHECK_CATALOG_FEATURE_COUNT = DOCUMENTED_FEATURE_COUNT + 10;
+	int CHECK_CATALOG_FEATURE_COUNT = DOCUMENTED_FEATURE_COUNT + 9;
 
 	/**
 	 * The meta object id for the '{@link com.avaloq.tools.ddk.check.check.impl.ImplicitlyNamedImpl <em>Implicitly Named</em>}' class.
@@ -914,17 +905,6 @@ public interface CheckPackage extends EPackage
 	 */
 	EReference getCheckCatalog_Grammar();
 
-	/**
-	 * Returns the meta object for the reference '{@link com.avaloq.tools.ddk.check.check.CheckCatalog#getIncludedCatalogs <em>Included Catalogs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Included Catalogs</em>'.
-	 * @see com.avaloq.tools.ddk.check.check.CheckCatalog#getIncludedCatalogs()
-	 * @see #getCheckCatalog()
-	 * @generated
-	 */
-	EReference getCheckCatalog_IncludedCatalogs();
-
 	/**
 	 * Returns the meta object for the containment reference list '{@link com.avaloq.tools.ddk.check.check.CheckCatalog#getCategories <em>Categories</em>}'.
 	 * <!-- begin-user-doc -->
@@ -1622,14 +1602,6 @@ interface Literals
 		 */
 		EReference CHECK_CATALOG__GRAMMAR = eINSTANCE.getCheckCatalog_Grammar();
 
-		/**
-		 * The meta object literal for the '<em><b>Included Catalogs</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CHECK_CATALOG__INCLUDED_CATALOGS = eINSTANCE.getCheckCatalog_IncludedCatalogs();
-
 		/**
 		 * The meta object literal for the '<em><b>Categories</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/Context.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/Context.java
index fb7237a87..54d4529c1 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/Context.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/Context.java
@@ -11,11 +11,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.check.check.Context#getContextVariable <em>Context Variable</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.Context#getConstraint <em>Constraint</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.check.check.CheckPackage#getContext()
  * @model
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/ContextVariable.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/ContextVariable.java
index 7cecf8be8..2663c3681 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/ContextVariable.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/ContextVariable.java
@@ -13,11 +13,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.check.check.ContextVariable#getType <em>Type</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.ContextVariable#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.check.check.CheckPackage#getContextVariable()
  * @model
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/Documented.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/Documented.java
index 8fb40d967..fd2ef3c89 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/Documented.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/Documented.java
@@ -11,10 +11,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.check.check.Documented#getDescription <em>Description</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.check.check.CheckPackage#getDocumented()
  * @model
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/FormalParameter.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/FormalParameter.java
index 42362969b..c69b02a8b 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/FormalParameter.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/FormalParameter.java
@@ -15,13 +15,13 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.check.check.FormalParameter#getType <em>Type</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.FormalParameter#getName <em>Name</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.FormalParameter#getRight <em>Right</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.FormalParameter#getLabel <em>Label</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.check.check.CheckPackage#getFormalParameter()
  * @model
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/Implementation.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/Implementation.java
index df7bee17e..b3d3407b9 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/Implementation.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/Implementation.java
@@ -10,11 +10,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.check.check.Implementation#getName <em>Name</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.Implementation#getContext <em>Context</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.check.check.CheckPackage#getImplementation()
  * @model
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/ImplicitlyNamed.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/ImplicitlyNamed.java
index 7a959cb62..cfb754097 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/ImplicitlyNamed.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/ImplicitlyNamed.java
@@ -11,10 +11,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.check.check.ImplicitlyNamed#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.check.check.CheckPackage#getImplicitlyNamed()
  * @model
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/Member.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/Member.java
index efc235c89..2903b104c 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/Member.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/Member.java
@@ -17,13 +17,13 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.check.check.Member#getAnnotations <em>Annotations</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.Member#getType <em>Type</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.Member#getName <em>Name</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.Member#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.check.check.CheckPackage#getMember()
  * @model
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/SeverityKind.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/SeverityKind.java
index 9682bfe6c..27de63c5f 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/SeverityKind.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/SeverityKind.java
@@ -146,6 +146,8 @@ public enum SeverityKind implements Enumerator
 	 * Returns the '<em><b>Severity Kind</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static SeverityKind get(String literal)
@@ -165,6 +167,8 @@ public static SeverityKind get(String literal)
 	 * Returns the '<em><b>Severity Kind</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static SeverityKind getByName(String name)
@@ -184,6 +188,8 @@ public static SeverityKind getByName(String name)
 	 * Returns the '<em><b>Severity Kind</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static SeverityKind get(int value)
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/SeverityRange.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/SeverityRange.java
index 682418d12..6272e4b8c 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/SeverityRange.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/SeverityRange.java
@@ -11,11 +11,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.check.check.SeverityRange#getMinSeverity <em>Min Severity</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.SeverityRange#getMaxSeverity <em>Max Severity</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.check.check.CheckPackage#getSeverityRange()
  * @model
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/TriggerKind.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/TriggerKind.java
index 90dc55baf..41861222f 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/TriggerKind.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/TriggerKind.java
@@ -120,6 +120,8 @@ public enum TriggerKind implements Enumerator
 	 * Returns the '<em><b>Trigger Kind</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static TriggerKind get(String literal)
@@ -139,6 +141,8 @@ public static TriggerKind get(String literal)
 	 * Returns the '<em><b>Trigger Kind</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static TriggerKind getByName(String name)
@@ -158,6 +162,8 @@ public static TriggerKind getByName(String name)
 	 * Returns the '<em><b>Trigger Kind</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static TriggerKind get(int value)
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/XGuardExpression.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/XGuardExpression.java
index c401bec5f..1d0055dd0 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/XGuardExpression.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/XGuardExpression.java
@@ -11,10 +11,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.check.check.XGuardExpression#getGuard <em>Guard</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.check.check.CheckPackage#getXGuardExpression()
  * @model
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/XIssueExpression.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/XIssueExpression.java
index 8a101f61e..591fdb484 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/XIssueExpression.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/XIssueExpression.java
@@ -15,6 +15,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.check.check.XIssueExpression#getCheck <em>Check</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.XIssueExpression#getMarkerFeature <em>Marker Feature</em>}</li>
@@ -25,7 +26,6 @@
  *   <li>{@link com.avaloq.tools.ddk.check.check.XIssueExpression#getIssueCode <em>Issue Code</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.XIssueExpression#getIssueData <em>Issue Data</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.check.check.CheckPackage#getXIssueExpression()
  * @model
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/CategoryImpl.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/CategoryImpl.java
index 6a2f08696..46ab13769 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/CategoryImpl.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/CategoryImpl.java
@@ -28,13 +28,13 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.check.check.impl.CategoryImpl#getName <em>Name</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.impl.CategoryImpl#getId <em>Id</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.impl.CategoryImpl#getLabel <em>Label</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.impl.CategoryImpl#getChecks <em>Checks</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/CheckCatalogImpl.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/CheckCatalogImpl.java
index 9ce61224a..e228c1363 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/CheckCatalogImpl.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/CheckCatalogImpl.java
@@ -34,19 +34,18 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.check.check.impl.CheckCatalogImpl#getPackageName <em>Package Name</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.impl.CheckCatalogImpl#getImports <em>Imports</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.impl.CheckCatalogImpl#isFinal <em>Final</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.impl.CheckCatalogImpl#getName <em>Name</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.impl.CheckCatalogImpl#getGrammar <em>Grammar</em>}</li>
- *   <li>{@link com.avaloq.tools.ddk.check.check.impl.CheckCatalogImpl#getIncludedCatalogs <em>Included Catalogs</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.impl.CheckCatalogImpl#getCategories <em>Categories</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.impl.CheckCatalogImpl#getImplementations <em>Implementations</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.impl.CheckCatalogImpl#getChecks <em>Checks</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.impl.CheckCatalogImpl#getMembers <em>Members</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -132,16 +131,6 @@ public class CheckCatalogImpl extends DocumentedImplCustom implements CheckCatal
 	 */
 	protected Grammar grammar;
 
-	/**
-	 * The cached value of the '{@link #getIncludedCatalogs() <em>Included Catalogs</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIncludedCatalogs()
-	 * @generated
-	 * @ordered
-	 */
-	protected CheckCatalog includedCatalogs;
-
 	/**
 	 * The cached value of the '{@link #getCategories() <em>Categories</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
@@ -363,49 +352,6 @@ public void setGrammar(Grammar newGrammar)
 			eNotify(new ENotificationImpl(this, Notification.SET, CheckPackage.CHECK_CATALOG__GRAMMAR, oldGrammar, grammar));
 	}
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CheckCatalog getIncludedCatalogs()
-	{
-		if (includedCatalogs != null && includedCatalogs.eIsProxy())
-		{
-			InternalEObject oldIncludedCatalogs = (InternalEObject)includedCatalogs;
-			includedCatalogs = (CheckCatalog)eResolveProxy(oldIncludedCatalogs);
-			if (includedCatalogs != oldIncludedCatalogs)
-			{
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, CheckPackage.CHECK_CATALOG__INCLUDED_CATALOGS, oldIncludedCatalogs, includedCatalogs));
-			}
-		}
-		return includedCatalogs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CheckCatalog basicGetIncludedCatalogs()
-	{
-		return includedCatalogs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIncludedCatalogs(CheckCatalog newIncludedCatalogs)
-	{
-		CheckCatalog oldIncludedCatalogs = includedCatalogs;
-		includedCatalogs = newIncludedCatalogs;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CheckPackage.CHECK_CATALOG__INCLUDED_CATALOGS, oldIncludedCatalogs, includedCatalogs));
-	}
-
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -519,9 +465,6 @@ public Object eGet(int featureID, boolean resolve, boolean coreType)
 			case CheckPackage.CHECK_CATALOG__GRAMMAR:
 				if (resolve) return getGrammar();
 				return basicGetGrammar();
-			case CheckPackage.CHECK_CATALOG__INCLUDED_CATALOGS:
-				if (resolve) return getIncludedCatalogs();
-				return basicGetIncludedCatalogs();
 			case CheckPackage.CHECK_CATALOG__CATEGORIES:
 				return getCategories();
 			case CheckPackage.CHECK_CATALOG__IMPLEMENTATIONS:
@@ -560,9 +503,6 @@ public void eSet(int featureID, Object newValue)
 			case CheckPackage.CHECK_CATALOG__GRAMMAR:
 				setGrammar((Grammar)newValue);
 				return;
-			case CheckPackage.CHECK_CATALOG__INCLUDED_CATALOGS:
-				setIncludedCatalogs((CheckCatalog)newValue);
-				return;
 			case CheckPackage.CHECK_CATALOG__CATEGORIES:
 				getCategories().clear();
 				getCategories().addAll((Collection<? extends Category>)newValue);
@@ -608,9 +548,6 @@ public void eUnset(int featureID)
 			case CheckPackage.CHECK_CATALOG__GRAMMAR:
 				setGrammar((Grammar)null);
 				return;
-			case CheckPackage.CHECK_CATALOG__INCLUDED_CATALOGS:
-				setIncludedCatalogs((CheckCatalog)null);
-				return;
 			case CheckPackage.CHECK_CATALOG__CATEGORIES:
 				getCategories().clear();
 				return;
@@ -647,8 +584,6 @@ public boolean eIsSet(int featureID)
 				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
 			case CheckPackage.CHECK_CATALOG__GRAMMAR:
 				return grammar != null;
-			case CheckPackage.CHECK_CATALOG__INCLUDED_CATALOGS:
-				return includedCatalogs != null;
 			case CheckPackage.CHECK_CATALOG__CATEGORIES:
 				return categories != null && !categories.isEmpty();
 			case CheckPackage.CHECK_CATALOG__IMPLEMENTATIONS:
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/CheckImpl.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/CheckImpl.java
index 1ee8ab53c..2abfcfe10 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/CheckImpl.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/CheckImpl.java
@@ -32,6 +32,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.check.check.impl.CheckImpl#getName <em>Name</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.impl.CheckImpl#getSeverityRange <em>Severity Range</em>}</li>
@@ -45,7 +46,6 @@
  *   <li>{@link com.avaloq.tools.ddk.check.check.impl.CheckImpl#getContexts <em>Contexts</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.impl.CheckImpl#getMessage <em>Message</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/CheckPackageImpl.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/CheckPackageImpl.java
index 93db3813e..cdf6de7cb 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/CheckPackageImpl.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/CheckPackageImpl.java
@@ -281,16 +281,6 @@ public EReference getCheckCatalog_Grammar()
 		return (EReference)checkCatalogEClass.getEStructuralFeatures().get(4);
 	}
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getCheckCatalog_IncludedCatalogs()
-	{
-		return (EReference)checkCatalogEClass.getEStructuralFeatures().get(5);
-	}
-
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -298,7 +288,7 @@ public EReference getCheckCatalog_IncludedCatalogs()
 	 */
 	public EReference getCheckCatalog_Categories()
 	{
-		return (EReference)checkCatalogEClass.getEStructuralFeatures().get(6);
+		return (EReference)checkCatalogEClass.getEStructuralFeatures().get(5);
 	}
 
 	/**
@@ -308,7 +298,7 @@ public EReference getCheckCatalog_Categories()
 	 */
 	public EReference getCheckCatalog_Implementations()
 	{
-		return (EReference)checkCatalogEClass.getEStructuralFeatures().get(7);
+		return (EReference)checkCatalogEClass.getEStructuralFeatures().get(6);
 	}
 
 	/**
@@ -318,7 +308,7 @@ public EReference getCheckCatalog_Implementations()
 	 */
 	public EReference getCheckCatalog_Checks()
 	{
-		return (EReference)checkCatalogEClass.getEStructuralFeatures().get(8);
+		return (EReference)checkCatalogEClass.getEStructuralFeatures().get(7);
 	}
 
 	/**
@@ -328,7 +318,7 @@ public EReference getCheckCatalog_Checks()
 	 */
 	public EReference getCheckCatalog_Members()
 	{
-		return (EReference)checkCatalogEClass.getEStructuralFeatures().get(9);
+		return (EReference)checkCatalogEClass.getEStructuralFeatures().get(8);
 	}
 
 	/**
@@ -907,7 +897,6 @@ public void createPackageContents()
 		createEAttribute(checkCatalogEClass, CHECK_CATALOG__FINAL);
 		createEAttribute(checkCatalogEClass, CHECK_CATALOG__NAME);
 		createEReference(checkCatalogEClass, CHECK_CATALOG__GRAMMAR);
-		createEReference(checkCatalogEClass, CHECK_CATALOG__INCLUDED_CATALOGS);
 		createEReference(checkCatalogEClass, CHECK_CATALOG__CATEGORIES);
 		createEReference(checkCatalogEClass, CHECK_CATALOG__IMPLEMENTATIONS);
 		createEReference(checkCatalogEClass, CHECK_CATALOG__CHECKS);
@@ -1037,7 +1026,6 @@ public void initializePackageContents()
 		initEAttribute(getCheckCatalog_Final(), ecorePackage.getEBoolean(), "final", null, 0, 1, CheckCatalog.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getCheckCatalog_Name(), ecorePackage.getEString(), "name", null, 0, 1, CheckCatalog.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getCheckCatalog_Grammar(), theXtextPackage.getGrammar(), null, "grammar", null, 0, 1, CheckCatalog.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getCheckCatalog_IncludedCatalogs(), this.getCheckCatalog(), null, "includedCatalogs", null, 0, 1, CheckCatalog.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getCheckCatalog_Categories(), this.getCategory(), null, "categories", null, 0, -1, CheckCatalog.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getCheckCatalog_Implementations(), this.getImplementation(), null, "implementations", null, 0, -1, CheckCatalog.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getCheckCatalog_Checks(), this.getCheck(), null, "checks", null, 0, -1, CheckCatalog.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/ContextImpl.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/ContextImpl.java
index d9374b19c..85f0871b3 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/ContextImpl.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/ContextImpl.java
@@ -22,11 +22,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.check.check.impl.ContextImpl#getContextVariable <em>Context Variable</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.impl.ContextImpl#getConstraint <em>Constraint</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/ContextVariableImpl.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/ContextVariableImpl.java
index eb22136a5..6214bb09b 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/ContextVariableImpl.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/ContextVariableImpl.java
@@ -22,11 +22,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.check.check.impl.ContextVariableImpl#getType <em>Type</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.impl.ContextVariableImpl#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/DocumentedImpl.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/DocumentedImpl.java
index c98c9a1bc..d7b4874f5 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/DocumentedImpl.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/DocumentedImpl.java
@@ -15,10 +15,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.check.check.impl.DocumentedImpl#getDescription <em>Description</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/FormalParameterImpl.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/FormalParameterImpl.java
index d57db4504..f25271a4b 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/FormalParameterImpl.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/FormalParameterImpl.java
@@ -24,13 +24,13 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.check.check.impl.FormalParameterImpl#getType <em>Type</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.impl.FormalParameterImpl#getName <em>Name</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.impl.FormalParameterImpl#getRight <em>Right</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.impl.FormalParameterImpl#getLabel <em>Label</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/ImplementationImpl.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/ImplementationImpl.java
index 7a9b6c3c1..7bdb18b6c 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/ImplementationImpl.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/ImplementationImpl.java
@@ -20,11 +20,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.check.check.impl.ImplementationImpl#getName <em>Name</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.impl.ImplementationImpl#getContext <em>Context</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/ImplicitlyNamedImpl.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/ImplicitlyNamedImpl.java
index c662d1eed..df2a02597 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/ImplicitlyNamedImpl.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/ImplicitlyNamedImpl.java
@@ -15,10 +15,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.check.check.impl.ImplicitlyNamedImpl#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/MemberImpl.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/MemberImpl.java
index f2cf8df7b..9da50cc5d 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/MemberImpl.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/MemberImpl.java
@@ -32,13 +32,13 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.check.check.impl.MemberImpl#getAnnotations <em>Annotations</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.impl.MemberImpl#getType <em>Type</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.impl.MemberImpl#getName <em>Name</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.impl.MemberImpl#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/SeverityRangeImpl.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/SeverityRangeImpl.java
index e7557df69..97090f7e3 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/SeverityRangeImpl.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/SeverityRangeImpl.java
@@ -19,11 +19,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.check.check.impl.SeverityRangeImpl#getMinSeverity <em>Min Severity</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.impl.SeverityRangeImpl#getMaxSeverity <em>Max Severity</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/XGuardExpressionImpl.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/XGuardExpressionImpl.java
index fc53eaf00..62541d2b7 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/XGuardExpressionImpl.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/XGuardExpressionImpl.java
@@ -23,10 +23,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.check.check.impl.XGuardExpressionImpl#getGuard <em>Guard</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/XIssueExpressionImpl.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/XIssueExpressionImpl.java
index 3333defe4..ea885e432 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/XIssueExpressionImpl.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/impl/XIssueExpressionImpl.java
@@ -32,6 +32,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.check.check.impl.XIssueExpressionImpl#getCheck <em>Check</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.impl.XIssueExpressionImpl#getMarkerFeature <em>Marker Feature</em>}</li>
@@ -42,7 +43,6 @@
  *   <li>{@link com.avaloq.tools.ddk.check.check.impl.XIssueExpressionImpl#getIssueCode <em>Issue Code</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.check.check.impl.XIssueExpressionImpl#getIssueData <em>Issue Data</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/util/CheckSwitch.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/util/CheckSwitch.java
index 96d068b51..bc110df73 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/util/CheckSwitch.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/check/util/CheckSwitch.java
@@ -52,7 +52,7 @@ public CheckSwitch()
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
+	 * @param ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g
index ce7444230..1b56a9518 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g
@@ -184,42 +184,23 @@ ruleCheckCatalog returns [EObject current=null]
 	    }
 
 )
-))?(	otherlv_10='with' 
+))?	otherlv_10='{' 
     {
-    	newLeafNode(otherlv_10, grammarAccess.getCheckCatalogAccess().getWithKeyword_8_0());
-    }
-(
-(
-		{
-			if ($current==null) {
-	            $current = createModelElement(grammarAccess.getCheckCatalogRule());
-	        }
-        }
-		{ 
-	        newCompositeNode(grammarAccess.getCheckCatalogAccess().getIncludedCatalogsCheckCatalogCrossReference_8_1_0()); 
-	    }
-		ruleQualifiedName		{ 
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-))?	otherlv_12='{' 
-    {
-    	newLeafNode(otherlv_12, grammarAccess.getCheckCatalogAccess().getLeftCurlyBracketKeyword_9());
+    	newLeafNode(otherlv_10, grammarAccess.getCheckCatalogAccess().getLeftCurlyBracketKeyword_8());
     }
 ((
 (
 		{ 
-	        newCompositeNode(grammarAccess.getCheckCatalogAccess().getCategoriesCategoryParserRuleCall_10_0_0()); 
+	        newCompositeNode(grammarAccess.getCheckCatalogAccess().getCategoriesCategoryParserRuleCall_9_0_0()); 
 	    }
-		lv_categories_13_0=ruleCategory		{
+		lv_categories_11_0=ruleCategory		{
 	        if ($current==null) {
 	            $current = createModelElementForParent(grammarAccess.getCheckCatalogRule());
 	        }
        		add(
        			$current, 
        			"categories",
-        		lv_categories_13_0, 
+        		lv_categories_11_0, 
         		"Category");
 	        afterParserOrEnumRuleCall();
 	    }
@@ -229,16 +210,16 @@ ruleCheckCatalog returns [EObject current=null]
     |(
 (
 		{ 
-	        newCompositeNode(grammarAccess.getCheckCatalogAccess().getImplementationsImplementationParserRuleCall_10_1_0()); 
+	        newCompositeNode(grammarAccess.getCheckCatalogAccess().getImplementationsImplementationParserRuleCall_9_1_0()); 
 	    }
-		lv_implementations_14_0=ruleImplementation		{
+		lv_implementations_12_0=ruleImplementation		{
 	        if ($current==null) {
 	            $current = createModelElementForParent(grammarAccess.getCheckCatalogRule());
 	        }
        		add(
        			$current, 
        			"implementations",
-        		lv_implementations_14_0, 
+        		lv_implementations_12_0, 
         		"Implementation");
 	        afterParserOrEnumRuleCall();
 	    }
@@ -248,16 +229,16 @@ ruleCheckCatalog returns [EObject current=null]
     |(
 (
 		{ 
-	        newCompositeNode(grammarAccess.getCheckCatalogAccess().getChecksCheckParserRuleCall_10_2_0()); 
+	        newCompositeNode(grammarAccess.getCheckCatalogAccess().getChecksCheckParserRuleCall_9_2_0()); 
 	    }
-		lv_checks_15_0=ruleCheck		{
+		lv_checks_13_0=ruleCheck		{
 	        if ($current==null) {
 	            $current = createModelElementForParent(grammarAccess.getCheckCatalogRule());
 	        }
        		add(
        			$current, 
        			"checks",
-        		lv_checks_15_0, 
+        		lv_checks_13_0, 
         		"Check");
 	        afterParserOrEnumRuleCall();
 	    }
@@ -267,24 +248,24 @@ ruleCheckCatalog returns [EObject current=null]
     |(
 (
 		{ 
-	        newCompositeNode(grammarAccess.getCheckCatalogAccess().getMembersMemberParserRuleCall_10_3_0()); 
+	        newCompositeNode(grammarAccess.getCheckCatalogAccess().getMembersMemberParserRuleCall_9_3_0()); 
 	    }
-		lv_members_16_0=ruleMember		{
+		lv_members_14_0=ruleMember		{
 	        if ($current==null) {
 	            $current = createModelElementForParent(grammarAccess.getCheckCatalogRule());
 	        }
        		add(
        			$current, 
        			"members",
-        		lv_members_16_0, 
+        		lv_members_14_0, 
         		"Member");
 	        afterParserOrEnumRuleCall();
 	    }
 
 )
-))*	otherlv_17='}' 
+))*	otherlv_15='}' 
     {
-    	newLeafNode(otherlv_17, grammarAccess.getCheckCatalogAccess().getRightCurlyBracketKeyword_11());
+    	newLeafNode(otherlv_15, grammarAccess.getCheckCatalogAccess().getRightCurlyBracketKeyword_10());
     }
 )
 ;
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.tokens b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.tokens
index 9e7897d43..3ebde9c35 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.tokens
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.tokens
@@ -1,35 +1,35 @@
 '!'=77
 '!='=62
 '!=='=64
-'#'=33
+'#'=32
 '%'=76
 '%='=55
 '&&'=60
 '&'=108
-'('=24
-')'=26
+'('=23
+')'=25
 '*'=73
 '**'=74
 '*='=53
 '+'=71
 '++'=79
 '+='=51
-','=25
+','=24
 '-'=72
 '--'=80
 '-='=52
 '->'=66
 '.'=81
-'..'=30
+'..'=29
 '..<'=67
 '/'=75
 '/='=54
 ':'=88
 '::'=82
-';'=22
+';'=21
 '<'=56
 '<>'=69
-'='=32
+'='=31
 '=='=61
 '==='=63
 '=>'=68
@@ -38,46 +38,46 @@
 '?'=107
 '?.'=83
 '?:'=70
-'@'=28
-'SeverityRange'=29
-'['=34
-']'=35
+'@'=27
+'SeverityRange'=28
+'['=33
+']'=34
 'as'=78
-'bind'=39
+'bind'=38
 'case'=90
 'catalog'=15
 'catch'=106
-'category'=23
-'data'=40
-'def'=31
+'category'=22
+'data'=39
+'def'=30
 'default'=89
 'do'=92
 'else'=86
 'error'=44
-'extends'=41
-'extension'=43
+'extends'=40
+'extension'=42
 'false'=97
 'final'=14
 'finally'=104
 'for'=16
 'grammar'=17
-'guard'=36
+'guard'=35
 'if'=85
 'ignore'=47
-'import'=21
+'import'=20
 'info'=46
 'instanceof'=65
-'issue'=37
+'issue'=36
 'live'=48
-'message'=27
+'message'=26
 'new'=96
 'null'=99
-'on'=38
+'on'=37
 'onDemand'=50
 'onSave'=49
 'package'=13
 'return'=102
-'static'=42
+'static'=41
 'super'=95
 'switch'=87
 'synchronized'=105
@@ -89,11 +89,11 @@
 'var'=93
 'warning'=45
 'while'=91
-'with'=18
-'{'=19
+'with'=43
+'{'=18
 '|'=84
 '||'=59
-'}'=20
+'}'=19
 RULE_ANY_OTHER=12
 RULE_DECIMAL=7
 RULE_HEX=5
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheckLexer.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheckLexer.java
index 14cc542bd..5e266f156 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheckLexer.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheckLexer.java
@@ -242,11 +242,10 @@ public final void mT__18() throws RecognitionException {
         try {
             int _type = T__18;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:16:7: ( 'with' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:16:9: 'with'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:16:7: ( '{' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:16:9: '{'
             {
-            match("with"); 
-
+            match('{'); 
 
             }
 
@@ -263,10 +262,10 @@ public final void mT__19() throws RecognitionException {
         try {
             int _type = T__19;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:17:7: ( '{' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:17:9: '{'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:17:7: ( '}' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:17:9: '}'
             {
-            match('{'); 
+            match('}'); 
 
             }
 
@@ -283,10 +282,11 @@ public final void mT__20() throws RecognitionException {
         try {
             int _type = T__20;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:18:7: ( '}' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:18:9: '}'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:18:7: ( 'import' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:18:9: 'import'
             {
-            match('}'); 
+            match("import"); 
+
 
             }
 
@@ -303,11 +303,10 @@ public final void mT__21() throws RecognitionException {
         try {
             int _type = T__21;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:19:7: ( 'import' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:19:9: 'import'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:19:7: ( ';' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:19:9: ';'
             {
-            match("import"); 
-
+            match(';'); 
 
             }
 
@@ -324,10 +323,11 @@ public final void mT__22() throws RecognitionException {
         try {
             int _type = T__22;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:20:7: ( ';' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:20:9: ';'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:20:7: ( 'category' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:20:9: 'category'
             {
-            match(';'); 
+            match("category"); 
+
 
             }
 
@@ -344,11 +344,10 @@ public final void mT__23() throws RecognitionException {
         try {
             int _type = T__23;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:21:7: ( 'category' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:21:9: 'category'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:21:7: ( '(' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:21:9: '('
             {
-            match("category"); 
-
+            match('('); 
 
             }
 
@@ -365,10 +364,10 @@ public final void mT__24() throws RecognitionException {
         try {
             int _type = T__24;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:22:7: ( '(' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:22:9: '('
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:22:7: ( ',' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:22:9: ','
             {
-            match('('); 
+            match(','); 
 
             }
 
@@ -385,10 +384,10 @@ public final void mT__25() throws RecognitionException {
         try {
             int _type = T__25;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:23:7: ( ',' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:23:9: ','
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:23:7: ( ')' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:23:9: ')'
             {
-            match(','); 
+            match(')'); 
 
             }
 
@@ -405,10 +404,11 @@ public final void mT__26() throws RecognitionException {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:24:7: ( ')' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:24:9: ')'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:24:7: ( 'message' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:24:9: 'message'
             {
-            match(')'); 
+            match("message"); 
+
 
             }
 
@@ -425,11 +425,10 @@ public final void mT__27() throws RecognitionException {
         try {
             int _type = T__27;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:25:7: ( 'message' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:25:9: 'message'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:25:7: ( '@' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:25:9: '@'
             {
-            match("message"); 
-
+            match('@'); 
 
             }
 
@@ -446,10 +445,11 @@ public final void mT__28() throws RecognitionException {
         try {
             int _type = T__28;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:26:7: ( '@' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:26:9: '@'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:26:7: ( 'SeverityRange' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:26:9: 'SeverityRange'
             {
-            match('@'); 
+            match("SeverityRange"); 
+
 
             }
 
@@ -466,10 +466,10 @@ public final void mT__29() throws RecognitionException {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:27:7: ( 'SeverityRange' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:27:9: 'SeverityRange'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:27:7: ( '..' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:27:9: '..'
             {
-            match("SeverityRange"); 
+            match(".."); 
 
 
             }
@@ -487,10 +487,10 @@ public final void mT__30() throws RecognitionException {
         try {
             int _type = T__30;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:28:7: ( '..' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:28:9: '..'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:28:7: ( 'def' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:28:9: 'def'
             {
-            match(".."); 
+            match("def"); 
 
 
             }
@@ -508,11 +508,10 @@ public final void mT__31() throws RecognitionException {
         try {
             int _type = T__31;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:29:7: ( 'def' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:29:9: 'def'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:29:7: ( '=' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:29:9: '='
             {
-            match("def"); 
-
+            match('='); 
 
             }
 
@@ -529,10 +528,10 @@ public final void mT__32() throws RecognitionException {
         try {
             int _type = T__32;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:30:7: ( '=' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:30:9: '='
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:30:7: ( '#' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:30:9: '#'
             {
-            match('='); 
+            match('#'); 
 
             }
 
@@ -549,10 +548,10 @@ public final void mT__33() throws RecognitionException {
         try {
             int _type = T__33;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:31:7: ( '#' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:31:9: '#'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:31:7: ( '[' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:31:9: '['
             {
-            match('#'); 
+            match('['); 
 
             }
 
@@ -569,10 +568,10 @@ public final void mT__34() throws RecognitionException {
         try {
             int _type = T__34;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:32:7: ( '[' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:32:9: '['
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:32:7: ( ']' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:32:9: ']'
             {
-            match('['); 
+            match(']'); 
 
             }
 
@@ -589,10 +588,11 @@ public final void mT__35() throws RecognitionException {
         try {
             int _type = T__35;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:33:7: ( ']' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:33:9: ']'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:33:7: ( 'guard' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:33:9: 'guard'
             {
-            match(']'); 
+            match("guard"); 
+
 
             }
 
@@ -609,10 +609,10 @@ public final void mT__36() throws RecognitionException {
         try {
             int _type = T__36;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:34:7: ( 'guard' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:34:9: 'guard'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:34:7: ( 'issue' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:34:9: 'issue'
             {
-            match("guard"); 
+            match("issue"); 
 
 
             }
@@ -630,10 +630,10 @@ public final void mT__37() throws RecognitionException {
         try {
             int _type = T__37;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:35:7: ( 'issue' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:35:9: 'issue'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:35:7: ( 'on' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:35:9: 'on'
             {
-            match("issue"); 
+            match("on"); 
 
 
             }
@@ -651,10 +651,10 @@ public final void mT__38() throws RecognitionException {
         try {
             int _type = T__38;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:36:7: ( 'on' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:36:9: 'on'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:36:7: ( 'bind' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:36:9: 'bind'
             {
-            match("on"); 
+            match("bind"); 
 
 
             }
@@ -672,10 +672,10 @@ public final void mT__39() throws RecognitionException {
         try {
             int _type = T__39;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:37:7: ( 'bind' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:37:9: 'bind'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:37:7: ( 'data' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:37:9: 'data'
             {
-            match("bind"); 
+            match("data"); 
 
 
             }
@@ -693,10 +693,10 @@ public final void mT__40() throws RecognitionException {
         try {
             int _type = T__40;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:38:7: ( 'data' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:38:9: 'data'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:38:7: ( 'extends' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:38:9: 'extends'
             {
-            match("data"); 
+            match("extends"); 
 
 
             }
@@ -714,10 +714,10 @@ public final void mT__41() throws RecognitionException {
         try {
             int _type = T__41;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:39:7: ( 'extends' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:39:9: 'extends'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:39:7: ( 'static' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:39:9: 'static'
             {
-            match("extends"); 
+            match("static"); 
 
 
             }
@@ -735,10 +735,10 @@ public final void mT__42() throws RecognitionException {
         try {
             int _type = T__42;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:40:7: ( 'static' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:40:9: 'static'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:40:7: ( 'extension' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:40:9: 'extension'
             {
-            match("static"); 
+            match("extension"); 
 
 
             }
@@ -756,10 +756,10 @@ public final void mT__43() throws RecognitionException {
         try {
             int _type = T__43;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:41:7: ( 'extension' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:41:9: 'extension'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:41:7: ( 'with' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:41:9: 'with'
             {
-            match("extension"); 
+            match("with"); 
 
 
             }
@@ -2129,10 +2129,10 @@ public final void mRULE_HEX() throws RecognitionException {
         try {
             int _type = RULE_HEX;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8194:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )? )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8194:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8175:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )? )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8175:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8194:12: ( '0x' | '0X' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8175:12: ( '0x' | '0X' )
             int alt1=2;
             int LA1_0 = input.LA(1);
 
@@ -2160,7 +2160,7 @@ else if ( (LA1_1=='X') ) {
             }
             switch (alt1) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8194:13: '0x'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8175:13: '0x'
                     {
                     match("0x"); 
 
@@ -2168,7 +2168,7 @@ else if ( (LA1_1=='X') ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8194:18: '0X'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8175:18: '0X'
                     {
                     match("0X"); 
 
@@ -2178,7 +2178,7 @@ else if ( (LA1_1=='X') ) {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8194:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8175:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+
             int cnt2=0;
             loop2:
             do {
@@ -2216,7 +2216,7 @@ else if ( (LA1_1=='X') ) {
                 cnt2++;
             } while (true);
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8194:58: ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8175:58: ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
             int alt4=2;
             int LA4_0 = input.LA(1);
 
@@ -2225,10 +2225,10 @@ else if ( (LA1_1=='X') ) {
             }
             switch (alt4) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8194:59: '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8175:59: '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
                     {
                     match('#'); 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8194:63: ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8175:63: ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
                     int alt3=2;
                     int LA3_0 = input.LA(1);
 
@@ -2246,7 +2246,7 @@ else if ( (LA3_0=='L'||LA3_0=='l') ) {
                     }
                     switch (alt3) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8194:64: ( 'b' | 'B' ) ( 'i' | 'I' )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8175:64: ( 'b' | 'B' ) ( 'i' | 'I' )
                             {
                             if ( input.LA(1)=='B'||input.LA(1)=='b' ) {
                                 input.consume();
@@ -2270,7 +2270,7 @@ else if ( (LA3_0=='L'||LA3_0=='l') ) {
                             }
                             break;
                         case 2 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8194:84: ( 'l' | 'L' )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8175:84: ( 'l' | 'L' )
                             {
                             if ( input.LA(1)=='L'||input.LA(1)=='l' ) {
                                 input.consume();
@@ -2309,11 +2309,11 @@ public final void mRULE_INT() throws RecognitionException {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8196:10: ( '0' .. '9' ( '0' .. '9' | '_' )* )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8196:12: '0' .. '9' ( '0' .. '9' | '_' )*
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8177:10: ( '0' .. '9' ( '0' .. '9' | '_' )* )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8177:12: '0' .. '9' ( '0' .. '9' | '_' )*
             {
             matchRange('0','9'); 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8196:21: ( '0' .. '9' | '_' )*
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8177:21: ( '0' .. '9' | '_' )*
             loop5:
             do {
                 int alt5=2;
@@ -2362,11 +2362,11 @@ public final void mRULE_DECIMAL() throws RecognitionException {
         try {
             int _type = RULE_DECIMAL;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8198:14: ( RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )? )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8198:16: RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8179:14: ( RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )? )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8179:16: RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
             {
             mRULE_INT(); 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8198:25: ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )?
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8179:25: ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )?
             int alt7=2;
             int LA7_0 = input.LA(1);
 
@@ -2375,7 +2375,7 @@ public final void mRULE_DECIMAL() throws RecognitionException {
             }
             switch (alt7) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8198:26: ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8179:26: ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT
                     {
                     if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
                         input.consume();
@@ -2386,7 +2386,7 @@ public final void mRULE_DECIMAL() throws RecognitionException {
                         recover(mse);
                         throw mse;}
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8198:36: ( '+' | '-' )?
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8179:36: ( '+' | '-' )?
                     int alt6=2;
                     int LA6_0 = input.LA(1);
 
@@ -2419,7 +2419,7 @@ public final void mRULE_DECIMAL() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8198:58: ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8179:58: ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
             int alt8=3;
             int LA8_0 = input.LA(1);
 
@@ -2431,7 +2431,7 @@ else if ( (LA8_0=='D'||LA8_0=='F'||LA8_0=='L'||LA8_0=='d'||LA8_0=='f'||LA8_0=='l
             }
             switch (alt8) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8198:59: ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8179:59: ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' )
                     {
                     if ( input.LA(1)=='B'||input.LA(1)=='b' ) {
                         input.consume();
@@ -2455,7 +2455,7 @@ else if ( (LA8_0=='D'||LA8_0=='F'||LA8_0=='L'||LA8_0=='d'||LA8_0=='f'||LA8_0=='l
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8198:87: ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8179:87: ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' )
                     {
                     if ( input.LA(1)=='D'||input.LA(1)=='F'||input.LA(1)=='L'||input.LA(1)=='d'||input.LA(1)=='f'||input.LA(1)=='l' ) {
                         input.consume();
@@ -2488,10 +2488,10 @@ public final void mRULE_ID() throws RecognitionException {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8200:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )* )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8200:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8181:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )* )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8181:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8200:11: ( '^' )?
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8181:11: ( '^' )?
             int alt9=2;
             int LA9_0 = input.LA(1);
 
@@ -2500,7 +2500,7 @@ public final void mRULE_ID() throws RecognitionException {
             }
             switch (alt9) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8200:11: '^'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8181:11: '^'
                     {
                     match('^'); 
 
@@ -2518,7 +2518,7 @@ public final void mRULE_ID() throws RecognitionException {
                 recover(mse);
                 throw mse;}
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8200:44: ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8181:44: ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
             loop10:
             do {
                 int alt10=2;
@@ -2567,10 +2567,10 @@ public final void mRULE_STRING() throws RecognitionException {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8202:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8202:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8183:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8183:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8202:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8183:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
             int alt15=2;
             int LA15_0 = input.LA(1);
 
@@ -2588,10 +2588,10 @@ else if ( (LA15_0=='\'') ) {
             }
             switch (alt15) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8202:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )?
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8183:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )?
                     {
                     match('\"'); 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8202:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8183:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop11:
                     do {
                         int alt11=3;
@@ -2607,7 +2607,7 @@ else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA1
 
                         switch (alt11) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8202:21: '\\\\' .
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8183:21: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -2615,7 +2615,7 @@ else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA1
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8202:28: ~ ( ( '\\\\' | '\"' ) )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8183:28: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -2635,7 +2635,7 @@ else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA1
                         }
                     } while (true);
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8202:44: ( '\"' )?
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8183:44: ( '\"' )?
                     int alt12=2;
                     int LA12_0 = input.LA(1);
 
@@ -2644,7 +2644,7 @@ else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA1
                     }
                     switch (alt12) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8202:44: '\"'
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8183:44: '\"'
                             {
                             match('\"'); 
 
@@ -2657,10 +2657,10 @@ else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA1
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8202:49: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )?
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8183:49: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )?
                     {
                     match('\''); 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8202:54: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8183:54: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop13:
                     do {
                         int alt13=3;
@@ -2676,7 +2676,7 @@ else if ( ((LA13_0>='\u0000' && LA13_0<='&')||(LA13_0>='(' && LA13_0<='[')||(LA1
 
                         switch (alt13) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8202:55: '\\\\' .
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8183:55: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -2684,7 +2684,7 @@ else if ( ((LA13_0>='\u0000' && LA13_0<='&')||(LA13_0>='(' && LA13_0<='[')||(LA1
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8202:62: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8183:62: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -2704,7 +2704,7 @@ else if ( ((LA13_0>='\u0000' && LA13_0<='&')||(LA13_0>='(' && LA13_0<='[')||(LA1
                         }
                     } while (true);
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8202:79: ( '\\'' )?
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8183:79: ( '\\'' )?
                     int alt14=2;
                     int LA14_0 = input.LA(1);
 
@@ -2713,7 +2713,7 @@ else if ( ((LA13_0>='\u0000' && LA13_0<='&')||(LA13_0>='(' && LA13_0<='[')||(LA1
                     }
                     switch (alt14) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8202:79: '\\''
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8183:79: '\\''
                             {
                             match('\''); 
 
@@ -2744,12 +2744,12 @@ public final void mRULE_ML_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8204:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8204:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8185:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8185:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8204:24: ( options {greedy=false; } : . )*
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8185:24: ( options {greedy=false; } : . )*
             loop16:
             do {
                 int alt16=2;
@@ -2774,7 +2774,7 @@ else if ( ((LA16_0>='\u0000' && LA16_0<=')')||(LA16_0>='+' && LA16_0<='\uFFFF'))
 
                 switch (alt16) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8204:52: .
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8185:52: .
             	    {
             	    matchAny(); 
 
@@ -2804,12 +2804,12 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8206:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8206:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8187:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8187:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8206:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8187:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop17:
             do {
                 int alt17=2;
@@ -2822,7 +2822,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
 
                 switch (alt17) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8206:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8187:24: ~ ( ( '\\n' | '\\r' ) )
             	    {
             	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
             	        input.consume();
@@ -2842,7 +2842,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
                 }
             } while (true);
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8206:40: ( ( '\\r' )? '\\n' )?
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8187:40: ( ( '\\r' )? '\\n' )?
             int alt19=2;
             int LA19_0 = input.LA(1);
 
@@ -2851,9 +2851,9 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
             }
             switch (alt19) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8206:41: ( '\\r' )? '\\n'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8187:41: ( '\\r' )? '\\n'
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8206:41: ( '\\r' )?
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8187:41: ( '\\r' )?
                     int alt18=2;
                     int LA18_0 = input.LA(1);
 
@@ -2862,7 +2862,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
                     }
                     switch (alt18) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8206:41: '\\r'
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8187:41: '\\r'
                             {
                             match('\r'); 
 
@@ -2894,10 +2894,10 @@ public final void mRULE_WS() throws RecognitionException {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8208:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8208:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8189:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8189:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8208:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8189:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt20=0;
             loop20:
             do {
@@ -2951,8 +2951,8 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8210:16: ( . )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8210:18: .
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8191:16: ( . )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8191:18: .
             {
             matchAny(); 
 
@@ -3714,136 +3714,136 @@ public void mTokens() throws RecognitionException {
 
     protected DFA21 dfa21 = new DFA21(this);
     static final String DFA21_eotS =
-        "\1\uffff\5\65\2\uffff\1\65\4\uffff\1\65\1\uffff\1\65\1\116\1\65"+
-        "\1\124\3\uffff\5\65\1\144\1\150\1\153\1\157\1\161\1\163\1\165\1"+
+        "\1\uffff\4\65\2\uffff\1\65\4\uffff\1\65\1\uffff\1\65\1\113\1\65"+
+        "\1\121\3\uffff\6\65\1\144\1\150\1\153\1\157\1\161\1\163\1\165\1"+
         "\167\1\171\1\173\1\176\1\65\1\u0081\4\65\2\u008b\1\63\5\uffff\1"+
-        "\65\1\uffff\11\65\2\uffff\4\65\1\u009f\4\uffff\1\65\1\uffff\1\65"+
-        "\1\u00a3\1\uffff\2\65\1\u00a6\1\u00a8\5\uffff\1\u00ab\11\65\30\uffff"+
+        "\65\1\uffff\6\65\2\uffff\4\65\1\u009c\4\uffff\1\65\1\uffff\1\65"+
+        "\1\u00a0\1\uffff\2\65\1\u00a3\1\u00a5\5\uffff\1\u00a8\14\65\30\uffff"+
         "\1\u00b6\4\uffff\1\u00b7\2\uffff\7\65\1\uffff\1\u008b\4\uffff\2"+
-        "\65\1\u00c3\15\65\1\uffff\2\65\2\uffff\1\u00d6\1\65\3\uffff\2\65"+
-        "\1\uffff\11\65\3\uffff\1\u00e3\1\u00e4\1\u00e5\2\65\1\u00e8\5\65"+
-        "\1\uffff\4\65\1\u00f2\2\65\1\u00f5\4\65\1\u00fa\5\65\1\uffff\1\u0100"+
-        "\2\65\1\u0103\2\65\1\u0106\4\65\1\u010b\3\uffff\1\u010c\1\u010d"+
+        "\65\1\u00c3\12\65\1\uffff\2\65\2\uffff\1\u00d3\1\65\3\uffff\2\65"+
+        "\1\uffff\14\65\3\uffff\1\u00e3\1\u00e4\1\u00e5\2\65\1\u00e8\5\65"+
+        "\1\uffff\4\65\1\u00f2\4\65\1\u00f7\5\65\1\uffff\1\u00fd\2\65\1\u0100"+
+        "\2\65\1\u0103\4\65\1\u0108\2\65\1\u010b\3\uffff\1\u010c\1\u010d"+
         "\1\uffff\4\65\1\u0113\1\u0114\2\65\1\u0117\1\uffff\1\65\1\u0119"+
-        "\1\uffff\1\65\1\u011b\1\65\1\u011d\1\uffff\5\65\1\uffff\2\65\1\uffff"+
-        "\1\65\1\u0127\1\uffff\2\65\1\u012a\1\65\3\uffff\1\65\1\u012d\3\65"+
-        "\2\uffff\2\65\1\uffff\1\65\1\uffff\1\65\1\uffff\1\u0135\1\uffff"+
-        "\1\65\1\u0137\3\65\1\u013b\3\65\1\uffff\1\u013f\1\u0140\1\uffff"+
-        "\1\65\1\u0142\1\uffff\1\u0143\1\u0144\1\u0145\1\u0146\1\65\1\u0148"+
-        "\1\u0149\1\uffff\1\65\1\uffff\1\u014b\1\65\1\u014d\1\uffff\1\65"+
-        "\1\u014f\1\65\2\uffff\1\65\5\uffff\1\u0152\2\uffff\1\65\1\uffff"+
-        "\1\65\1\uffff\1\u0155\1\uffff\2\65\1\uffff\2\65\1\uffff\1\u015a"+
-        "\1\65\1\u015c\1\65\1\uffff\1\65\1\uffff\3\65\1\u0162\1\u0163\2\uffff";
+        "\1\65\1\u011b\1\uffff\5\65\1\uffff\2\65\1\uffff\1\65\1\u0125\1\uffff"+
+        "\2\65\1\u0128\1\65\1\uffff\1\65\1\u012b\3\uffff\1\65\1\u012d\3\65"+
+        "\2\uffff\2\65\1\uffff\1\65\1\uffff\1\u0134\1\uffff\1\65\1\u0136"+
+        "\3\65\1\u013a\3\65\1\uffff\1\u013e\1\u013f\1\uffff\2\65\1\uffff"+
+        "\1\u0142\1\uffff\1\u0143\1\u0144\1\u0145\1\u0146\1\65\1\u0148\1"+
+        "\uffff\1\65\1\uffff\1\u014a\1\65\1\u014c\1\uffff\1\65\1\u014e\1"+
+        "\65\2\uffff\1\65\1\u0151\5\uffff\1\u0152\1\uffff\1\65\1\uffff\1"+
+        "\65\1\uffff\1\u0155\1\uffff\2\65\2\uffff\2\65\1\uffff\1\u015a\1"+
+        "\65\1\u015c\1\65\1\uffff\1\65\1\uffff\3\65\1\u0162\1\u0163\2\uffff";
     static final String DFA21_eofS =
         "\u0164\uffff";
     static final String DFA21_minS =
-        "\1\0\3\141\1\162\1\141\2\uffff\1\146\4\uffff\1\145\1\uffff\1\145"+
-        "\1\56\1\141\1\75\3\uffff\1\156\1\151\1\154\1\164\1\151\1\53\1\55"+
+        "\1\0\3\141\1\162\2\uffff\1\146\4\uffff\1\145\1\uffff\1\145\1\56"+
+        "\1\141\1\75\3\uffff\1\156\1\151\1\154\1\164\1\141\1\151\1\53\1\55"+
         "\2\52\1\75\1\76\1\75\1\174\1\46\1\75\1\56\1\163\1\72\1\141\1\145"+
         "\1\150\1\145\2\60\1\44\5\uffff\1\143\1\uffff\1\156\1\162\1\154\1"+
-        "\163\2\141\1\164\1\162\1\151\2\uffff\1\160\1\163\1\146\1\156\1\44"+
-        "\4\uffff\1\163\1\uffff\1\166\1\74\1\uffff\1\146\1\164\1\44\1\75"+
-        "\5\uffff\1\44\1\156\1\164\1\162\1\163\1\141\1\151\1\160\1\156\1"+
-        "\166\30\uffff\1\75\4\uffff\1\44\2\uffff\1\154\1\167\1\154\1\165"+
-        "\1\160\1\162\1\164\1\uffff\1\60\4\uffff\1\153\1\141\1\44\1\163\1"+
-        "\141\1\145\1\155\1\162\1\150\1\156\1\154\1\157\1\165\1\157\1\164"+
-        "\1\157\1\uffff\1\163\1\145\2\uffff\1\44\1\141\3\uffff\1\141\1\145"+
-        "\1\uffff\1\144\1\145\1\157\1\145\2\164\1\145\1\143\1\145\3\uffff"+
-        "\3\44\1\154\1\145\1\44\1\145\1\157\1\165\1\141\1\154\1\uffff\1\145"+
-        "\1\154\1\147\1\150\1\44\1\155\1\144\1\44\1\151\1\145\1\162\1\145"+
-        "\1\44\1\141\1\162\1\141\1\162\1\165\1\uffff\1\44\1\166\1\155\1\44"+
-        "\1\156\1\162\1\44\1\151\1\143\1\162\1\150\1\44\3\uffff\2\44\1\uffff"+
-        "\1\157\1\167\1\162\1\147\2\44\2\157\1\44\1\uffff\1\141\1\44\1\uffff"+
-        "\1\156\1\44\1\164\1\44\1\uffff\1\156\1\145\1\147\1\151\1\154\1\uffff"+
-        "\1\145\1\141\1\uffff\1\144\1\44\1\uffff\1\143\1\150\1\44\1\162\3"+
-        "\uffff\1\146\1\44\1\156\1\145\1\171\2\uffff\1\147\1\162\1\uffff"+
-        "\1\162\1\uffff\1\147\1\uffff\1\44\1\uffff\1\143\1\44\1\145\2\164"+
-        "\1\44\1\156\1\163\1\151\1\uffff\2\44\1\uffff\1\157\1\44\1\uffff"+
-        "\4\44\1\171\2\44\1\uffff\1\145\1\uffff\1\44\1\171\1\44\1\uffff\1"+
-        "\144\1\44\1\157\2\uffff\1\156\5\uffff\1\44\2\uffff\1\157\1\uffff"+
-        "\1\122\1\uffff\1\44\1\uffff\1\156\1\151\1\uffff\1\146\1\141\1\uffff"+
-        "\1\44\1\172\1\44\1\156\1\uffff\1\145\1\uffff\1\147\1\144\1\145\2"+
-        "\44\2\uffff";
+        "\163\2\141\2\uffff\1\160\1\163\1\146\1\156\1\44\4\uffff\1\163\1"+
+        "\uffff\1\166\1\74\1\uffff\1\146\1\164\1\44\1\75\5\uffff\1\44\1\156"+
+        "\1\164\1\162\1\163\1\141\1\151\1\160\1\156\1\164\1\162\1\151\1\166"+
+        "\30\uffff\1\75\4\uffff\1\44\2\uffff\1\154\1\167\1\154\1\165\1\160"+
+        "\1\162\1\164\1\uffff\1\60\4\uffff\1\153\1\141\1\44\1\163\1\141\1"+
+        "\145\1\155\1\162\1\157\1\165\1\157\1\164\1\157\1\uffff\1\163\1\145"+
+        "\2\uffff\1\44\1\141\3\uffff\1\141\1\145\1\uffff\1\144\1\145\1\157"+
+        "\1\145\2\164\1\145\1\143\1\150\1\156\1\154\1\145\3\uffff\3\44\1"+
+        "\154\1\145\1\44\1\145\1\157\1\165\1\141\1\154\1\uffff\1\145\1\154"+
+        "\1\147\1\150\1\44\1\155\1\144\1\162\1\145\1\44\1\141\1\162\1\141"+
+        "\1\162\1\165\1\uffff\1\44\1\166\1\155\1\44\1\156\1\162\1\44\1\151"+
+        "\1\143\1\162\1\150\1\44\1\151\1\145\1\44\3\uffff\2\44\1\uffff\1"+
+        "\157\1\167\1\162\1\147\2\44\2\157\1\44\1\uffff\1\141\1\44\1\164"+
+        "\1\44\1\uffff\1\156\1\145\1\147\1\151\1\154\1\uffff\1\145\1\141"+
+        "\1\uffff\1\144\1\44\1\uffff\1\143\1\150\1\44\1\162\1\uffff\1\156"+
+        "\1\44\3\uffff\1\146\1\44\1\156\1\145\1\171\2\uffff\1\147\1\162\1"+
+        "\uffff\1\162\1\uffff\1\44\1\uffff\1\143\1\44\1\145\2\164\1\44\1"+
+        "\156\1\163\1\151\1\uffff\2\44\1\uffff\1\157\1\147\1\uffff\1\44\1"+
+        "\uffff\4\44\1\171\1\44\1\uffff\1\145\1\uffff\1\44\1\171\1\44\1\uffff"+
+        "\1\144\1\44\1\157\2\uffff\1\156\1\44\5\uffff\1\44\1\uffff\1\157"+
+        "\1\uffff\1\122\1\uffff\1\44\1\uffff\1\156\1\151\2\uffff\1\146\1"+
+        "\141\1\uffff\1\44\1\172\1\44\1\156\1\uffff\1\145\1\uffff\1\147\1"+
+        "\144\1\145\2\44\2\uffff";
     static final String DFA21_maxS =
-        "\1\uffff\1\141\1\157\1\141\1\165\1\151\2\uffff\1\163\4\uffff\1"+
-        "\145\1\uffff\1\145\1\56\1\157\1\76\3\uffff\1\156\1\151\1\170\1\171"+
-        "\1\151\1\75\1\76\3\75\1\76\1\75\1\174\1\46\1\75\1\72\1\163\1\72"+
-        "\1\141\1\165\1\171\1\145\1\170\1\154\1\172\5\uffff\1\143\1\uffff"+
-        "\1\156\1\162\1\154\1\164\2\141\1\164\1\162\1\151\2\uffff\1\160\2"+
-        "\163\1\156\1\172\4\uffff\1\163\1\uffff\1\166\1\74\1\uffff\1\146"+
-        "\1\164\1\172\1\75\5\uffff\1\172\1\156\1\164\1\162\1\163\1\141\1"+
-        "\151\1\160\1\156\1\166\30\uffff\1\75\4\uffff\1\172\2\uffff\1\162"+
-        "\1\167\1\154\1\171\1\160\1\162\1\164\1\uffff\1\154\4\uffff\1\153"+
-        "\1\141\1\172\1\163\2\145\1\155\1\162\1\150\1\156\1\154\1\157\1\165"+
-        "\1\157\1\164\1\157\1\uffff\1\163\1\145\2\uffff\1\172\1\141\3\uffff"+
-        "\1\141\1\145\1\uffff\1\144\1\145\1\157\1\145\2\164\1\145\1\143\1"+
-        "\145\3\uffff\3\172\1\154\1\145\1\172\1\145\1\157\1\165\1\141\1\154"+
-        "\1\uffff\1\145\1\154\1\147\1\150\1\172\1\155\1\144\1\172\1\151\1"+
-        "\145\1\162\1\145\1\172\1\141\1\162\1\141\1\162\1\165\1\uffff\1\172"+
-        "\1\166\1\155\1\172\1\156\1\162\1\172\1\151\1\143\1\162\1\150\1\172"+
-        "\3\uffff\2\172\1\uffff\1\157\1\167\1\162\1\147\2\172\2\157\1\172"+
-        "\1\uffff\1\141\1\172\1\uffff\1\156\1\172\1\164\1\172\1\uffff\1\156"+
-        "\1\145\1\147\1\151\1\154\1\uffff\1\145\1\141\1\uffff\1\163\1\172"+
-        "\1\uffff\1\143\1\150\1\172\1\162\3\uffff\1\146\1\172\1\156\1\145"+
-        "\1\171\2\uffff\1\147\1\162\1\uffff\1\162\1\uffff\1\147\1\uffff\1"+
-        "\172\1\uffff\1\143\1\172\1\145\2\164\1\172\1\156\1\163\1\151\1\uffff"+
-        "\2\172\1\uffff\1\157\1\172\1\uffff\4\172\1\171\2\172\1\uffff\1\145"+
+        "\1\uffff\1\141\1\157\1\141\1\165\2\uffff\1\163\4\uffff\1\145\1"+
+        "\uffff\1\145\1\56\1\157\1\76\3\uffff\1\156\1\151\1\170\1\171\2\151"+
+        "\1\75\1\76\3\75\1\76\1\75\1\174\1\46\1\75\1\72\1\163\1\72\1\141"+
+        "\1\165\1\171\1\145\1\170\1\154\1\172\5\uffff\1\143\1\uffff\1\156"+
+        "\1\162\1\154\1\164\2\141\2\uffff\1\160\2\163\1\156\1\172\4\uffff"+
+        "\1\163\1\uffff\1\166\1\74\1\uffff\1\146\1\164\1\172\1\75\5\uffff"+
+        "\1\172\1\156\1\164\1\162\1\163\1\141\1\151\1\160\1\156\1\164\1\162"+
+        "\1\151\1\166\30\uffff\1\75\4\uffff\1\172\2\uffff\1\162\1\167\1\154"+
+        "\1\171\1\160\1\162\1\164\1\uffff\1\154\4\uffff\1\153\1\141\1\172"+
+        "\1\163\2\145\1\155\1\162\1\157\1\165\1\157\1\164\1\157\1\uffff\1"+
+        "\163\1\145\2\uffff\1\172\1\141\3\uffff\1\141\1\145\1\uffff\1\144"+
+        "\1\145\1\157\1\145\2\164\1\145\1\143\1\150\1\156\1\154\1\145\3\uffff"+
+        "\3\172\1\154\1\145\1\172\1\145\1\157\1\165\1\141\1\154\1\uffff\1"+
+        "\145\1\154\1\147\1\150\1\172\1\155\1\144\1\162\1\145\1\172\1\141"+
+        "\1\162\1\141\1\162\1\165\1\uffff\1\172\1\166\1\155\1\172\1\156\1"+
+        "\162\1\172\1\151\1\143\1\162\1\150\1\172\1\151\1\145\1\172\3\uffff"+
+        "\2\172\1\uffff\1\157\1\167\1\162\1\147\2\172\2\157\1\172\1\uffff"+
+        "\1\141\1\172\1\164\1\172\1\uffff\1\156\1\145\1\147\1\151\1\154\1"+
+        "\uffff\1\145\1\141\1\uffff\1\163\1\172\1\uffff\1\143\1\150\1\172"+
+        "\1\162\1\uffff\1\156\1\172\3\uffff\1\146\1\172\1\156\1\145\1\171"+
+        "\2\uffff\1\147\1\162\1\uffff\1\162\1\uffff\1\172\1\uffff\1\143\1"+
+        "\172\1\145\2\164\1\172\1\156\1\163\1\151\1\uffff\2\172\1\uffff\1"+
+        "\157\1\147\1\uffff\1\172\1\uffff\4\172\1\171\1\172\1\uffff\1\145"+
         "\1\uffff\1\172\1\171\1\172\1\uffff\1\144\1\172\1\157\2\uffff\1\156"+
-        "\5\uffff\1\172\2\uffff\1\157\1\uffff\1\122\1\uffff\1\172\1\uffff"+
-        "\1\156\1\151\1\uffff\1\146\1\141\1\uffff\3\172\1\156\1\uffff\1\145"+
-        "\1\uffff\1\147\1\144\1\145\2\172\2\uffff";
+        "\1\172\5\uffff\1\172\1\uffff\1\157\1\uffff\1\122\1\uffff\1\172\1"+
+        "\uffff\1\156\1\151\2\uffff\1\146\1\141\1\uffff\3\172\1\156\1\uffff"+
+        "\1\145\1\uffff\1\147\1\144\1\145\2\172\2\uffff";
     static final String DFA21_acceptS =
-        "\6\uffff\1\7\1\10\1\uffff\1\12\1\14\1\15\1\16\1\uffff\1\20\4\uffff"+
-        "\1\25\1\26\1\27\31\uffff\1\144\2\145\1\150\1\151\1\uffff\1\144\11"+
-        "\uffff\1\7\1\10\5\uffff\1\12\1\14\1\15\1\16\1\uffff\1\20\2\uffff"+
-        "\1\105\4\uffff\1\70\1\24\1\25\1\26\1\27\12\uffff\1\47\1\103\1\73"+
+        "\5\uffff\1\6\1\7\1\uffff\1\11\1\13\1\14\1\15\1\uffff\1\17\4\uffff"+
+        "\1\24\1\25\1\26\32\uffff\1\144\2\145\1\150\1\151\1\uffff\1\144\6"+
+        "\uffff\1\6\1\7\5\uffff\1\11\1\13\1\14\1\15\1\uffff\1\17\2\uffff"+
+        "\1\105\4\uffff\1\70\1\23\1\24\1\25\1\26\15\uffff\1\47\1\103\1\73"+
         "\1\50\1\66\1\104\1\74\1\51\1\76\1\75\1\52\1\146\1\147\1\77\1\53"+
         "\1\100\1\71\1\54\1\56\1\55\1\57\1\110\1\60\1\140\1\uffff\1\101\1"+
         "\72\1\107\1\137\1\uffff\1\106\1\114\7\uffff\1\141\1\uffff\1\142"+
-        "\1\143\1\145\1\150\20\uffff\1\111\2\uffff\1\67\1\22\2\uffff\1\120"+
-        "\1\63\1\61\2\uffff\1\32\11\uffff\1\64\1\62\1\102\13\uffff\1\4\22"+
-        "\uffff\1\23\14\uffff\1\121\1\122\1\124\2\uffff\1\133\11\uffff\1"+
-        "\116\2\uffff\1\6\4\uffff\1\42\5\uffff\1\34\2\uffff\1\33\2\uffff"+
-        "\1\112\4\uffff\1\44\1\127\1\126\5\uffff\1\2\1\125\2\uffff\1\136"+
-        "\1\uffff\1\30\1\uffff\1\117\1\uffff\1\31\11\uffff\1\40\2\uffff\1"+
-        "\123\2\uffff\1\131\7\uffff\1\11\1\uffff\1\43\3\uffff\1\45\3\uffff"+
-        "\1\36\1\113\1\uffff\1\130\1\132\1\1\1\134\1\3\1\uffff\1\5\1\41\1"+
-        "\uffff\1\17\1\uffff\1\115\1\uffff\1\35\2\uffff\1\13\2\uffff\1\46"+
-        "\4\uffff\1\37\1\uffff\1\65\5\uffff\1\135\1\21";
+        "\1\143\1\145\1\150\15\uffff\1\111\2\uffff\1\67\1\21\2\uffff\1\120"+
+        "\1\63\1\61\2\uffff\1\31\14\uffff\1\64\1\62\1\102\13\uffff\1\4\17"+
+        "\uffff\1\22\17\uffff\1\121\1\122\1\124\2\uffff\1\133\11\uffff\1"+
+        "\116\4\uffff\1\42\5\uffff\1\33\2\uffff\1\32\2\uffff\1\112\4\uffff"+
+        "\1\37\2\uffff\1\44\1\127\1\126\5\uffff\1\2\1\125\2\uffff\1\136\1"+
+        "\uffff\1\27\1\uffff\1\30\11\uffff\1\40\2\uffff\1\123\2\uffff\1\117"+
+        "\1\uffff\1\131\6\uffff\1\10\1\uffff\1\43\3\uffff\1\45\3\uffff\1"+
+        "\35\1\113\2\uffff\1\130\1\132\1\1\1\134\1\3\1\uffff\1\5\1\uffff"+
+        "\1\16\1\uffff\1\115\1\uffff\1\34\2\uffff\1\41\1\12\2\uffff\1\46"+
+        "\4\uffff\1\36\1\uffff\1\65\5\uffff\1\135\1\20";
     static final String DFA21_specialS =
         "\1\0\u0163\uffff}>";
     static final String[] DFA21_transitionS = {
-            "\11\63\2\62\2\63\1\62\22\63\1\62\1\44\1\60\1\23\1\57\1\37\1"+
-            "\43\1\61\1\12\1\14\1\35\1\33\1\13\1\34\1\20\1\36\1\54\11\55"+
-            "\1\47\1\11\1\40\1\22\1\41\1\45\1\16\22\57\1\17\7\57\1\24\1\63"+
-            "\1\25\1\56\1\57\1\63\1\46\1\27\1\3\1\21\1\30\1\2\1\4\1\57\1"+
-            "\10\2\57\1\32\1\15\1\51\1\26\1\1\1\57\1\53\1\31\1\52\1\57\1"+
-            "\50\1\5\3\57\1\6\1\42\1\7\uff82\63",
+            "\11\63\2\62\2\63\1\62\22\63\1\62\1\44\1\60\1\22\1\57\1\37\1"+
+            "\43\1\61\1\11\1\13\1\35\1\33\1\12\1\34\1\17\1\36\1\54\11\55"+
+            "\1\47\1\10\1\40\1\21\1\41\1\45\1\15\22\57\1\16\7\57\1\23\1\63"+
+            "\1\24\1\56\1\57\1\63\1\46\1\26\1\3\1\20\1\27\1\2\1\4\1\57\1"+
+            "\7\2\57\1\32\1\14\1\51\1\25\1\1\1\57\1\53\1\30\1\52\1\57\1\50"+
+            "\1\31\3\57\1\5\1\42\1\6\uff82\63",
             "\1\64",
             "\1\70\7\uffff\1\66\5\uffff\1\67",
             "\1\71",
             "\1\72\2\uffff\1\73",
-            "\1\75\6\uffff\1\76\1\74",
             "",
             "",
-            "\1\105\1\104\5\uffff\1\101\1\103\4\uffff\1\102",
+            "\1\102\1\101\5\uffff\1\76\1\100\4\uffff\1\77",
             "",
             "",
             "",
             "",
-            "\1\112",
+            "\1\107",
             "",
-            "\1\114",
-            "\1\115",
-            "\1\120\3\uffff\1\117\11\uffff\1\121",
-            "\1\122\1\123",
+            "\1\111",
+            "\1\112",
+            "\1\115\3\uffff\1\114\11\uffff\1\116",
+            "\1\117\1\120",
             "",
             "",
             "",
-            "\1\130",
-            "\1\131",
-            "\1\134\5\uffff\1\133\5\uffff\1\132",
-            "\1\135\1\137\1\uffff\1\136\1\uffff\1\140",
+            "\1\125",
+            "\1\126",
+            "\1\131\5\uffff\1\130\5\uffff\1\127",
+            "\1\132\1\134\1\uffff\1\133\1\uffff\1\135",
+            "\1\137\6\uffff\1\140\1\136",
             "\1\141",
             "\1\143\21\uffff\1\142",
             "\1\147\17\uffff\1\145\1\146",
@@ -3882,38 +3882,38 @@ public void mTokens() throws RecognitionException {
             "\1\u0094\1\u0093",
             "\1\u0095",
             "\1\u0096",
-            "\1\u0097",
-            "\1\u0098",
-            "\1\u0099",
             "",
             "",
-            "\1\u009a",
+            "\1\u0097",
+            "\1\u0098",
+            "\1\u0099\14\uffff\1\u009a",
             "\1\u009b",
-            "\1\u009c\14\uffff\1\u009d",
-            "\1\u009e",
             "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
             "\65",
             "",
             "",
             "",
             "",
-            "\1\u00a0",
+            "\1\u009d",
+            "",
+            "\1\u009e",
+            "\1\u009f",
             "",
             "\1\u00a1",
             "\1\u00a2",
-            "",
-            "\1\u00a4",
-            "\1\u00a5",
             "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
             "\65",
-            "\1\u00a7",
+            "\1\u00a4",
             "",
             "",
             "",
             "",
             "",
-            "\1\65\13\uffff\12\65\7\uffff\3\65\1\u00aa\16\65\1\u00a9\7"+
+            "\1\65\13\uffff\12\65\7\uffff\3\65\1\u00a7\16\65\1\u00a6\7"+
             "\65\4\uffff\1\65\1\uffff\32\65",
+            "\1\u00a9",
+            "\1\u00aa",
+            "\1\u00ab",
             "\1\u00ac",
             "\1\u00ad",
             "\1\u00ae",
@@ -3985,23 +3985,23 @@ public void mTokens() throws RecognitionException {
             "\1\u00cd",
             "\1\u00ce",
             "\1\u00cf",
+            "",
             "\1\u00d0",
             "\1\u00d1",
-            "\1\u00d2",
-            "",
-            "\1\u00d3",
-            "\1\u00d4",
             "",
             "",
             "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\1"+
-            "\u00d5\31\65",
-            "\1\u00d7",
+            "\u00d2\31\65",
+            "\1\u00d4",
             "",
             "",
             "",
+            "\1\u00d5",
+            "\1\u00d6",
+            "",
+            "\1\u00d7",
             "\1\u00d8",
             "\1\u00d9",
-            "",
             "\1\u00da",
             "\1\u00db",
             "\1\u00dc",
@@ -4038,20 +4038,20 @@ public void mTokens() throws RecognitionException {
             "\65",
             "\1\u00f3",
             "\1\u00f4",
+            "\1\u00f5",
+            "\1\u00f6",
             "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
             "\65",
-            "\1\u00f6",
-            "\1\u00f7",
             "\1\u00f8",
             "\1\u00f9",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\u00fa",
             "\1\u00fb",
             "\1\u00fc",
-            "\1\u00fd",
+            "",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
+            "\65",
             "\1\u00fe",
             "\1\u00ff",
-            "",
             "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
             "\65",
             "\1\u0101",
@@ -4060,10 +4060,10 @@ public void mTokens() throws RecognitionException {
             "\65",
             "\1\u0104",
             "\1\u0105",
+            "\1\u0106",
+            "\1\u0107",
             "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
             "\65",
-            "\1\u0107",
-            "\1\u0108",
             "\1\u0109",
             "\1\u010a",
             "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
@@ -4092,32 +4092,32 @@ public void mTokens() throws RecognitionException {
             "\1\u0118",
             "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
             "\65",
-            "",
             "\1\u011a",
             "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
             "\65",
-            "\1\u011c",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
             "",
+            "\1\u011c",
+            "\1\u011d",
             "\1\u011e",
             "\1\u011f",
             "\1\u0120",
+            "",
             "\1\u0121",
             "\1\u0122",
             "",
-            "\1\u0123",
-            "\1\u0124",
-            "",
-            "\1\u0125\16\uffff\1\u0126",
+            "\1\u0123\16\uffff\1\u0124",
             "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
             "\65",
             "",
-            "\1\u0128",
+            "\1\u0126",
+            "\1\u0127",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
+            "\65",
             "\1\u0129",
+            "",
+            "\1\u012a",
             "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
             "\65",
-            "\1\u012b",
             "",
             "",
             "",
@@ -4134,29 +4134,29 @@ public void mTokens() throws RecognitionException {
             "",
             "\1\u0133",
             "",
-            "\1\u0134",
-            "",
             "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
             "\65",
             "",
-            "\1\u0136",
+            "\1\u0135",
             "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
             "\65",
+            "\1\u0137",
             "\1\u0138",
             "\1\u0139",
-            "\1\u013a",
             "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
             "\65",
+            "\1\u013b",
             "\1\u013c",
             "\1\u013d",
-            "\1\u013e",
             "",
             "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
             "\65",
             "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
             "\65",
             "",
+            "\1\u0140",
             "\1\u0141",
+            "",
             "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
             "\65",
             "",
@@ -4171,24 +4171,24 @@ public void mTokens() throws RecognitionException {
             "\1\u0147",
             "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
             "\65",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
             "",
-            "\1\u014a",
+            "\1\u0149",
             "",
             "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
             "\65",
-            "\1\u014c",
+            "\1\u014b",
             "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
             "\65",
             "",
-            "\1\u014e",
+            "\1\u014d",
             "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
             "\65",
-            "\1\u0150",
+            "\1\u014f",
             "",
             "",
-            "\1\u0151",
+            "\1\u0150",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
+            "\65",
             "",
             "",
             "",
@@ -4197,7 +4197,6 @@ public void mTokens() throws RecognitionException {
             "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
             "\65",
             "",
-            "",
             "\1\u0153",
             "",
             "\1\u0154",
@@ -4208,6 +4207,7 @@ public void mTokens() throws RecognitionException {
             "\1\u0156",
             "\1\u0157",
             "",
+            "",
             "\1\u0158",
             "\1\u0159",
             "",
@@ -4279,47 +4279,47 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
 
                         else if ( (LA21_0=='g') ) {s = 4;}
 
-                        else if ( (LA21_0=='w') ) {s = 5;}
+                        else if ( (LA21_0=='{') ) {s = 5;}
 
-                        else if ( (LA21_0=='{') ) {s = 6;}
+                        else if ( (LA21_0=='}') ) {s = 6;}
 
-                        else if ( (LA21_0=='}') ) {s = 7;}
+                        else if ( (LA21_0=='i') ) {s = 7;}
 
-                        else if ( (LA21_0=='i') ) {s = 8;}
+                        else if ( (LA21_0==';') ) {s = 8;}
 
-                        else if ( (LA21_0==';') ) {s = 9;}
+                        else if ( (LA21_0=='(') ) {s = 9;}
 
-                        else if ( (LA21_0=='(') ) {s = 10;}
+                        else if ( (LA21_0==',') ) {s = 10;}
 
-                        else if ( (LA21_0==',') ) {s = 11;}
+                        else if ( (LA21_0==')') ) {s = 11;}
 
-                        else if ( (LA21_0==')') ) {s = 12;}
+                        else if ( (LA21_0=='m') ) {s = 12;}
 
-                        else if ( (LA21_0=='m') ) {s = 13;}
+                        else if ( (LA21_0=='@') ) {s = 13;}
 
-                        else if ( (LA21_0=='@') ) {s = 14;}
+                        else if ( (LA21_0=='S') ) {s = 14;}
 
-                        else if ( (LA21_0=='S') ) {s = 15;}
+                        else if ( (LA21_0=='.') ) {s = 15;}
 
-                        else if ( (LA21_0=='.') ) {s = 16;}
+                        else if ( (LA21_0=='d') ) {s = 16;}
 
-                        else if ( (LA21_0=='d') ) {s = 17;}
+                        else if ( (LA21_0=='=') ) {s = 17;}
 
-                        else if ( (LA21_0=='=') ) {s = 18;}
+                        else if ( (LA21_0=='#') ) {s = 18;}
 
-                        else if ( (LA21_0=='#') ) {s = 19;}
+                        else if ( (LA21_0=='[') ) {s = 19;}
 
-                        else if ( (LA21_0=='[') ) {s = 20;}
+                        else if ( (LA21_0==']') ) {s = 20;}
 
-                        else if ( (LA21_0==']') ) {s = 21;}
+                        else if ( (LA21_0=='o') ) {s = 21;}
 
-                        else if ( (LA21_0=='o') ) {s = 22;}
+                        else if ( (LA21_0=='b') ) {s = 22;}
 
-                        else if ( (LA21_0=='b') ) {s = 23;}
+                        else if ( (LA21_0=='e') ) {s = 23;}
 
-                        else if ( (LA21_0=='e') ) {s = 24;}
+                        else if ( (LA21_0=='s') ) {s = 24;}
 
-                        else if ( (LA21_0=='s') ) {s = 25;}
+                        else if ( (LA21_0=='w') ) {s = 25;}
 
                         else if ( (LA21_0=='l') ) {s = 26;}
 
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheckParser.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheckParser.java
index 2849999f3..8d4f0c044 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheckParser.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheckParser.java
@@ -23,7 +23,7 @@
 @SuppressWarnings("all")
 public class InternalCheckParser extends AbstractInternalAntlrParser {
     public static final String[] tokenNames = new String[] {
-        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_STRING", "RULE_HEX", "RULE_INT", "RULE_DECIMAL", "RULE_ID", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'package'", "'final'", "'catalog'", "'for'", "'grammar'", "'with'", "'{'", "'}'", "'import'", "';'", "'category'", "'('", "','", "')'", "'message'", "'@'", "'SeverityRange'", "'..'", "'def'", "'='", "'#'", "'['", "']'", "'guard'", "'issue'", "'on'", "'bind'", "'data'", "'extends'", "'static'", "'extension'", "'error'", "'warning'", "'info'", "'ignore'", "'live'", "'onSave'", "'onDemand'", "'+='", "'-='", "'*='", "'/='", "'%='", "'<'", "'>'", "'>='", "'||'", "'&&'", "'=='", "'!='", "'==='", "'!=='", "'instanceof'", "'->'", "'..<'", "'=>'", "'<>'", "'?:'", "'+'", "'-'", "'*'", "'**'", "'/'", "'%'", "'!'", "'as'", "'++'", "'--'", "'.'", "'::'", "'?.'", "'|'", "'if'", "'else'", "'switch'", "':'", "'default'", "'case'", "'while'", "'do'", "'var'", "'val'", "'super'", "'new'", "'false'", "'true'", "'null'", "'typeof'", "'throw'", "'return'", "'try'", "'finally'", "'synchronized'", "'catch'", "'?'", "'&'"
+        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_STRING", "RULE_HEX", "RULE_INT", "RULE_DECIMAL", "RULE_ID", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'package'", "'final'", "'catalog'", "'for'", "'grammar'", "'{'", "'}'", "'import'", "';'", "'category'", "'('", "','", "')'", "'message'", "'@'", "'SeverityRange'", "'..'", "'def'", "'='", "'#'", "'['", "']'", "'guard'", "'issue'", "'on'", "'bind'", "'data'", "'extends'", "'static'", "'extension'", "'with'", "'error'", "'warning'", "'info'", "'ignore'", "'live'", "'onSave'", "'onDemand'", "'+='", "'-='", "'*='", "'/='", "'%='", "'<'", "'>'", "'>='", "'||'", "'&&'", "'=='", "'!='", "'==='", "'!=='", "'instanceof'", "'->'", "'..<'", "'=>'", "'<>'", "'?:'", "'+'", "'-'", "'*'", "'**'", "'/'", "'%'", "'!'", "'as'", "'++'", "'--'", "'.'", "'::'", "'?.'", "'|'", "'if'", "'else'", "'switch'", "':'", "'default'", "'case'", "'while'", "'do'", "'var'", "'val'", "'super'", "'new'", "'false'", "'true'", "'null'", "'typeof'", "'throw'", "'return'", "'try'", "'finally'", "'synchronized'", "'catch'", "'?'", "'&'"
     };
     public static final int RULE_HEX=5;
     public static final int T__50=50;
@@ -211,7 +211,7 @@ public final EObject entryRuleCheckCatalog() throws RecognitionException {
 
 
     // $ANTLR start "ruleCheckCatalog"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:77:1: ruleCheckCatalog returns [EObject current=null] : ( () otherlv_1= 'package' ( (lv_packageName_2_0= ruleQualifiedName ) ) ( (lv_imports_3_0= ruleXImportSection ) ) ( (lv_final_4_0= 'final' ) )? otherlv_5= 'catalog' ( (lv_name_6_0= ruleValidID ) ) (otherlv_7= 'for' otherlv_8= 'grammar' ( ( ruleQualifiedName ) ) )? (otherlv_10= 'with' ( ( ruleQualifiedName ) ) )? otherlv_12= '{' ( ( (lv_categories_13_0= ruleCategory ) ) | ( (lv_implementations_14_0= ruleImplementation ) ) | ( (lv_checks_15_0= ruleCheck ) ) | ( (lv_members_16_0= ruleMember ) ) )* otherlv_17= '}' ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:77:1: ruleCheckCatalog returns [EObject current=null] : ( () otherlv_1= 'package' ( (lv_packageName_2_0= ruleQualifiedName ) ) ( (lv_imports_3_0= ruleXImportSection ) ) ( (lv_final_4_0= 'final' ) )? otherlv_5= 'catalog' ( (lv_name_6_0= ruleValidID ) ) (otherlv_7= 'for' otherlv_8= 'grammar' ( ( ruleQualifiedName ) ) )? otherlv_10= '{' ( ( (lv_categories_11_0= ruleCategory ) ) | ( (lv_implementations_12_0= ruleImplementation ) ) | ( (lv_checks_13_0= ruleCheck ) ) | ( (lv_members_14_0= ruleMember ) ) )* otherlv_15= '}' ) ;
     public final EObject ruleCheckCatalog() throws RecognitionException {
         EObject current = null;
 
@@ -221,31 +221,30 @@ public final EObject ruleCheckCatalog() throws RecognitionException {
         Token otherlv_7=null;
         Token otherlv_8=null;
         Token otherlv_10=null;
-        Token otherlv_12=null;
-        Token otherlv_17=null;
+        Token otherlv_15=null;
         AntlrDatatypeRuleToken lv_packageName_2_0 = null;
 
         EObject lv_imports_3_0 = null;
 
         AntlrDatatypeRuleToken lv_name_6_0 = null;
 
-        EObject lv_categories_13_0 = null;
+        EObject lv_categories_11_0 = null;
 
-        EObject lv_implementations_14_0 = null;
+        EObject lv_implementations_12_0 = null;
 
-        EObject lv_checks_15_0 = null;
+        EObject lv_checks_13_0 = null;
 
-        EObject lv_members_16_0 = null;
+        EObject lv_members_14_0 = null;
 
 
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:80:28: ( ( () otherlv_1= 'package' ( (lv_packageName_2_0= ruleQualifiedName ) ) ( (lv_imports_3_0= ruleXImportSection ) ) ( (lv_final_4_0= 'final' ) )? otherlv_5= 'catalog' ( (lv_name_6_0= ruleValidID ) ) (otherlv_7= 'for' otherlv_8= 'grammar' ( ( ruleQualifiedName ) ) )? (otherlv_10= 'with' ( ( ruleQualifiedName ) ) )? otherlv_12= '{' ( ( (lv_categories_13_0= ruleCategory ) ) | ( (lv_implementations_14_0= ruleImplementation ) ) | ( (lv_checks_15_0= ruleCheck ) ) | ( (lv_members_16_0= ruleMember ) ) )* otherlv_17= '}' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:81:1: ( () otherlv_1= 'package' ( (lv_packageName_2_0= ruleQualifiedName ) ) ( (lv_imports_3_0= ruleXImportSection ) ) ( (lv_final_4_0= 'final' ) )? otherlv_5= 'catalog' ( (lv_name_6_0= ruleValidID ) ) (otherlv_7= 'for' otherlv_8= 'grammar' ( ( ruleQualifiedName ) ) )? (otherlv_10= 'with' ( ( ruleQualifiedName ) ) )? otherlv_12= '{' ( ( (lv_categories_13_0= ruleCategory ) ) | ( (lv_implementations_14_0= ruleImplementation ) ) | ( (lv_checks_15_0= ruleCheck ) ) | ( (lv_members_16_0= ruleMember ) ) )* otherlv_17= '}' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:80:28: ( ( () otherlv_1= 'package' ( (lv_packageName_2_0= ruleQualifiedName ) ) ( (lv_imports_3_0= ruleXImportSection ) ) ( (lv_final_4_0= 'final' ) )? otherlv_5= 'catalog' ( (lv_name_6_0= ruleValidID ) ) (otherlv_7= 'for' otherlv_8= 'grammar' ( ( ruleQualifiedName ) ) )? otherlv_10= '{' ( ( (lv_categories_11_0= ruleCategory ) ) | ( (lv_implementations_12_0= ruleImplementation ) ) | ( (lv_checks_13_0= ruleCheck ) ) | ( (lv_members_14_0= ruleMember ) ) )* otherlv_15= '}' ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:81:1: ( () otherlv_1= 'package' ( (lv_packageName_2_0= ruleQualifiedName ) ) ( (lv_imports_3_0= ruleXImportSection ) ) ( (lv_final_4_0= 'final' ) )? otherlv_5= 'catalog' ( (lv_name_6_0= ruleValidID ) ) (otherlv_7= 'for' otherlv_8= 'grammar' ( ( ruleQualifiedName ) ) )? otherlv_10= '{' ( ( (lv_categories_11_0= ruleCategory ) ) | ( (lv_implementations_12_0= ruleImplementation ) ) | ( (lv_checks_13_0= ruleCheck ) ) | ( (lv_members_14_0= ruleMember ) ) )* otherlv_15= '}' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:81:1: ( () otherlv_1= 'package' ( (lv_packageName_2_0= ruleQualifiedName ) ) ( (lv_imports_3_0= ruleXImportSection ) ) ( (lv_final_4_0= 'final' ) )? otherlv_5= 'catalog' ( (lv_name_6_0= ruleValidID ) ) (otherlv_7= 'for' otherlv_8= 'grammar' ( ( ruleQualifiedName ) ) )? (otherlv_10= 'with' ( ( ruleQualifiedName ) ) )? otherlv_12= '{' ( ( (lv_categories_13_0= ruleCategory ) ) | ( (lv_implementations_14_0= ruleImplementation ) ) | ( (lv_checks_15_0= ruleCheck ) ) | ( (lv_members_16_0= ruleMember ) ) )* otherlv_17= '}' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:81:2: () otherlv_1= 'package' ( (lv_packageName_2_0= ruleQualifiedName ) ) ( (lv_imports_3_0= ruleXImportSection ) ) ( (lv_final_4_0= 'final' ) )? otherlv_5= 'catalog' ( (lv_name_6_0= ruleValidID ) ) (otherlv_7= 'for' otherlv_8= 'grammar' ( ( ruleQualifiedName ) ) )? (otherlv_10= 'with' ( ( ruleQualifiedName ) ) )? otherlv_12= '{' ( ( (lv_categories_13_0= ruleCategory ) ) | ( (lv_implementations_14_0= ruleImplementation ) ) | ( (lv_checks_15_0= ruleCheck ) ) | ( (lv_members_16_0= ruleMember ) ) )* otherlv_17= '}'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:81:1: ( () otherlv_1= 'package' ( (lv_packageName_2_0= ruleQualifiedName ) ) ( (lv_imports_3_0= ruleXImportSection ) ) ( (lv_final_4_0= 'final' ) )? otherlv_5= 'catalog' ( (lv_name_6_0= ruleValidID ) ) (otherlv_7= 'for' otherlv_8= 'grammar' ( ( ruleQualifiedName ) ) )? otherlv_10= '{' ( ( (lv_categories_11_0= ruleCategory ) ) | ( (lv_implementations_12_0= ruleImplementation ) ) | ( (lv_checks_13_0= ruleCheck ) ) | ( (lv_members_14_0= ruleMember ) ) )* otherlv_15= '}' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:81:2: () otherlv_1= 'package' ( (lv_packageName_2_0= ruleQualifiedName ) ) ( (lv_imports_3_0= ruleXImportSection ) ) ( (lv_final_4_0= 'final' ) )? otherlv_5= 'catalog' ( (lv_name_6_0= ruleValidID ) ) (otherlv_7= 'for' otherlv_8= 'grammar' ( ( ruleQualifiedName ) ) )? otherlv_10= '{' ( ( (lv_categories_11_0= ruleCategory ) ) | ( (lv_implementations_12_0= ruleImplementation ) ) | ( (lv_checks_13_0= ruleCheck ) ) | ( (lv_members_14_0= ruleMember ) ) )* otherlv_15= '}'
             {
             // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:81:2: ()
             // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:82:5: 
@@ -477,93 +476,36 @@ public final EObject ruleCheckCatalog() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:187:4: (otherlv_10= 'with' ( ( ruleQualifiedName ) ) )?
-            int alt3=2;
-            int LA3_0 = input.LA(1);
-
-            if ( (LA3_0==18) ) {
-                alt3=1;
-            }
-            switch (alt3) {
-                case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:187:6: otherlv_10= 'with' ( ( ruleQualifiedName ) )
-                    {
-                    otherlv_10=(Token)match(input,18,FOLLOW_18_in_ruleCheckCatalog301); if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
-
-                          	newLeafNode(otherlv_10, grammarAccess.getCheckCatalogAccess().getWithKeyword_8_0());
-                          
-                    }
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:191:1: ( ( ruleQualifiedName ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:192:1: ( ruleQualifiedName )
-                    {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:192:1: ( ruleQualifiedName )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:193:3: ruleQualifiedName
-                    {
-                    if ( state.backtracking==0 ) {
-
-                      			if (current==null) {
-                      	            current = createModelElement(grammarAccess.getCheckCatalogRule());
-                      	        }
-                              
-                    }
-                    if ( state.backtracking==0 ) {
-                       
-                      	        newCompositeNode(grammarAccess.getCheckCatalogAccess().getIncludedCatalogsCheckCatalogCrossReference_8_1_0()); 
-                      	    
-                    }
-                    pushFollow(FOLLOW_ruleQualifiedName_in_ruleCheckCatalog324);
-                    ruleQualifiedName();
-
-                    state._fsp--;
-                    if (state.failed) return current;
-                    if ( state.backtracking==0 ) {
-                       
-                      	        afterParserOrEnumRuleCall();
-                      	    
-                    }
-
-                    }
-
-
-                    }
-
-
-                    }
-                    break;
-
-            }
-
-            otherlv_12=(Token)match(input,19,FOLLOW_19_in_ruleCheckCatalog338); if (state.failed) return current;
+            otherlv_10=(Token)match(input,18,FOLLOW_18_in_ruleCheckCatalog300); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
-                  	newLeafNode(otherlv_12, grammarAccess.getCheckCatalogAccess().getLeftCurlyBracketKeyword_9());
+                  	newLeafNode(otherlv_10, grammarAccess.getCheckCatalogAccess().getLeftCurlyBracketKeyword_8());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:210:1: ( ( (lv_categories_13_0= ruleCategory ) ) | ( (lv_implementations_14_0= ruleImplementation ) ) | ( (lv_checks_15_0= ruleCheck ) ) | ( (lv_members_16_0= ruleMember ) ) )*
-            loop4:
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:191:1: ( ( (lv_categories_11_0= ruleCategory ) ) | ( (lv_implementations_12_0= ruleImplementation ) ) | ( (lv_checks_13_0= ruleCheck ) ) | ( (lv_members_14_0= ruleMember ) ) )*
+            loop3:
             do {
-                int alt4=5;
+                int alt3=5;
                 switch ( input.LA(1) ) {
-                case 23:
+                case 22:
                     {
-                    alt4=1;
+                    alt3=1;
                     }
                     break;
-                case 31:
+                case 30:
                     {
-                    alt4=2;
+                    alt3=2;
                     }
                     break;
-                case 28:
+                case 27:
                     {
-                    int LA4_4 = input.LA(2);
+                    int LA3_4 = input.LA(2);
 
-                    if ( (LA4_4==29) ) {
-                        alt4=3;
+                    if ( (LA3_4==28) ) {
+                        alt3=3;
                     }
-                    else if ( (LA4_4==RULE_ID) ) {
-                        alt4=4;
+                    else if ( (LA3_4==RULE_ID) ) {
+                        alt3=4;
                     }
 
 
@@ -578,36 +520,36 @@ else if ( (LA4_4==RULE_ID) ) {
                 case 49:
                 case 50:
                     {
-                    alt4=3;
+                    alt3=3;
                     }
                     break;
                 case RULE_ID:
-                case 24:
+                case 23:
                 case 68:
                     {
-                    alt4=4;
+                    alt3=4;
                     }
                     break;
 
                 }
 
-                switch (alt4) {
+                switch (alt3) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:210:2: ( (lv_categories_13_0= ruleCategory ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:191:2: ( (lv_categories_11_0= ruleCategory ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:210:2: ( (lv_categories_13_0= ruleCategory ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:211:1: (lv_categories_13_0= ruleCategory )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:191:2: ( (lv_categories_11_0= ruleCategory ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:192:1: (lv_categories_11_0= ruleCategory )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:211:1: (lv_categories_13_0= ruleCategory )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:212:3: lv_categories_13_0= ruleCategory
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:192:1: (lv_categories_11_0= ruleCategory )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:193:3: lv_categories_11_0= ruleCategory
             	    {
             	    if ( state.backtracking==0 ) {
             	       
-            	      	        newCompositeNode(grammarAccess.getCheckCatalogAccess().getCategoriesCategoryParserRuleCall_10_0_0()); 
+            	      	        newCompositeNode(grammarAccess.getCheckCatalogAccess().getCategoriesCategoryParserRuleCall_9_0_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleCategory_in_ruleCheckCatalog360);
-            	    lv_categories_13_0=ruleCategory();
+            	    pushFollow(FOLLOW_ruleCategory_in_ruleCheckCatalog322);
+            	    lv_categories_11_0=ruleCategory();
 
             	    state._fsp--;
             	    if (state.failed) return current;
@@ -619,7 +561,7 @@ else if ( (LA4_4==RULE_ID) ) {
             	             		add(
             	             			current, 
             	             			"categories",
-            	              		lv_categories_13_0, 
+            	              		lv_categories_11_0, 
             	              		"Category");
             	      	        afterParserOrEnumRuleCall();
             	      	    
@@ -634,21 +576,21 @@ else if ( (LA4_4==RULE_ID) ) {
             	    }
             	    break;
             	case 2 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:229:6: ( (lv_implementations_14_0= ruleImplementation ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:210:6: ( (lv_implementations_12_0= ruleImplementation ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:229:6: ( (lv_implementations_14_0= ruleImplementation ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:230:1: (lv_implementations_14_0= ruleImplementation )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:210:6: ( (lv_implementations_12_0= ruleImplementation ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:211:1: (lv_implementations_12_0= ruleImplementation )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:230:1: (lv_implementations_14_0= ruleImplementation )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:231:3: lv_implementations_14_0= ruleImplementation
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:211:1: (lv_implementations_12_0= ruleImplementation )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:212:3: lv_implementations_12_0= ruleImplementation
             	    {
             	    if ( state.backtracking==0 ) {
             	       
-            	      	        newCompositeNode(grammarAccess.getCheckCatalogAccess().getImplementationsImplementationParserRuleCall_10_1_0()); 
+            	      	        newCompositeNode(grammarAccess.getCheckCatalogAccess().getImplementationsImplementationParserRuleCall_9_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleImplementation_in_ruleCheckCatalog387);
-            	    lv_implementations_14_0=ruleImplementation();
+            	    pushFollow(FOLLOW_ruleImplementation_in_ruleCheckCatalog349);
+            	    lv_implementations_12_0=ruleImplementation();
 
             	    state._fsp--;
             	    if (state.failed) return current;
@@ -660,7 +602,7 @@ else if ( (LA4_4==RULE_ID) ) {
             	             		add(
             	             			current, 
             	             			"implementations",
-            	              		lv_implementations_14_0, 
+            	              		lv_implementations_12_0, 
             	              		"Implementation");
             	      	        afterParserOrEnumRuleCall();
             	      	    
@@ -675,21 +617,21 @@ else if ( (LA4_4==RULE_ID) ) {
             	    }
             	    break;
             	case 3 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:248:6: ( (lv_checks_15_0= ruleCheck ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:229:6: ( (lv_checks_13_0= ruleCheck ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:248:6: ( (lv_checks_15_0= ruleCheck ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:249:1: (lv_checks_15_0= ruleCheck )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:229:6: ( (lv_checks_13_0= ruleCheck ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:230:1: (lv_checks_13_0= ruleCheck )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:249:1: (lv_checks_15_0= ruleCheck )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:250:3: lv_checks_15_0= ruleCheck
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:230:1: (lv_checks_13_0= ruleCheck )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:231:3: lv_checks_13_0= ruleCheck
             	    {
             	    if ( state.backtracking==0 ) {
             	       
-            	      	        newCompositeNode(grammarAccess.getCheckCatalogAccess().getChecksCheckParserRuleCall_10_2_0()); 
+            	      	        newCompositeNode(grammarAccess.getCheckCatalogAccess().getChecksCheckParserRuleCall_9_2_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleCheck_in_ruleCheckCatalog414);
-            	    lv_checks_15_0=ruleCheck();
+            	    pushFollow(FOLLOW_ruleCheck_in_ruleCheckCatalog376);
+            	    lv_checks_13_0=ruleCheck();
 
             	    state._fsp--;
             	    if (state.failed) return current;
@@ -701,7 +643,7 @@ else if ( (LA4_4==RULE_ID) ) {
             	             		add(
             	             			current, 
             	             			"checks",
-            	              		lv_checks_15_0, 
+            	              		lv_checks_13_0, 
             	              		"Check");
             	      	        afterParserOrEnumRuleCall();
             	      	    
@@ -716,21 +658,21 @@ else if ( (LA4_4==RULE_ID) ) {
             	    }
             	    break;
             	case 4 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:267:6: ( (lv_members_16_0= ruleMember ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:248:6: ( (lv_members_14_0= ruleMember ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:267:6: ( (lv_members_16_0= ruleMember ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:268:1: (lv_members_16_0= ruleMember )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:248:6: ( (lv_members_14_0= ruleMember ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:249:1: (lv_members_14_0= ruleMember )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:268:1: (lv_members_16_0= ruleMember )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:269:3: lv_members_16_0= ruleMember
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:249:1: (lv_members_14_0= ruleMember )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:250:3: lv_members_14_0= ruleMember
             	    {
             	    if ( state.backtracking==0 ) {
             	       
-            	      	        newCompositeNode(grammarAccess.getCheckCatalogAccess().getMembersMemberParserRuleCall_10_3_0()); 
+            	      	        newCompositeNode(grammarAccess.getCheckCatalogAccess().getMembersMemberParserRuleCall_9_3_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleMember_in_ruleCheckCatalog441);
-            	    lv_members_16_0=ruleMember();
+            	    pushFollow(FOLLOW_ruleMember_in_ruleCheckCatalog403);
+            	    lv_members_14_0=ruleMember();
 
             	    state._fsp--;
             	    if (state.failed) return current;
@@ -742,7 +684,7 @@ else if ( (LA4_4==RULE_ID) ) {
             	             		add(
             	             			current, 
             	             			"members",
-            	              		lv_members_16_0, 
+            	              		lv_members_14_0, 
             	              		"Member");
             	      	        afterParserOrEnumRuleCall();
             	      	    
@@ -758,14 +700,14 @@ else if ( (LA4_4==RULE_ID) ) {
             	    break;
 
             	default :
-            	    break loop4;
+            	    break loop3;
                 }
             } while (true);
 
-            otherlv_17=(Token)match(input,20,FOLLOW_20_in_ruleCheckCatalog455); if (state.failed) return current;
+            otherlv_15=(Token)match(input,19,FOLLOW_19_in_ruleCheckCatalog417); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
-                  	newLeafNode(otherlv_17, grammarAccess.getCheckCatalogAccess().getRightCurlyBracketKeyword_11());
+                  	newLeafNode(otherlv_15, grammarAccess.getCheckCatalogAccess().getRightCurlyBracketKeyword_10());
                   
             }
 
@@ -791,7 +733,7 @@ else if ( (LA4_4==RULE_ID) ) {
 
 
     // $ANTLR start "entryRuleXImportSection"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:297:1: entryRuleXImportSection returns [EObject current=null] : iv_ruleXImportSection= ruleXImportSection EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:278:1: entryRuleXImportSection returns [EObject current=null] : iv_ruleXImportSection= ruleXImportSection EOF ;
     public final EObject entryRuleXImportSection() throws RecognitionException {
         EObject current = null;
 
@@ -799,13 +741,13 @@ public final EObject entryRuleXImportSection() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:298:2: (iv_ruleXImportSection= ruleXImportSection EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:299:2: iv_ruleXImportSection= ruleXImportSection EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:279:2: (iv_ruleXImportSection= ruleXImportSection EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:280:2: iv_ruleXImportSection= ruleXImportSection EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXImportSectionRule()); 
             }
-            pushFollow(FOLLOW_ruleXImportSection_in_entryRuleXImportSection491);
+            pushFollow(FOLLOW_ruleXImportSection_in_entryRuleXImportSection453);
             iv_ruleXImportSection=ruleXImportSection();
 
             state._fsp--;
@@ -813,7 +755,7 @@ public final EObject entryRuleXImportSection() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXImportSection; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXImportSection501); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXImportSection463); if (state.failed) return current;
 
             }
 
@@ -831,7 +773,7 @@ public final EObject entryRuleXImportSection() throws RecognitionException {
 
 
     // $ANTLR start "ruleXImportSection"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:306:1: ruleXImportSection returns [EObject current=null] : ( () ( (lv_importDeclarations_1_0= ruleXImportDeclaration ) )* ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:287:1: ruleXImportSection returns [EObject current=null] : ( () ( (lv_importDeclarations_1_0= ruleXImportDeclaration ) )* ) ;
     public final EObject ruleXImportSection() throws RecognitionException {
         EObject current = null;
 
@@ -841,14 +783,14 @@ public final EObject ruleXImportSection() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:309:28: ( ( () ( (lv_importDeclarations_1_0= ruleXImportDeclaration ) )* ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:310:1: ( () ( (lv_importDeclarations_1_0= ruleXImportDeclaration ) )* )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:290:28: ( ( () ( (lv_importDeclarations_1_0= ruleXImportDeclaration ) )* ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:291:1: ( () ( (lv_importDeclarations_1_0= ruleXImportDeclaration ) )* )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:310:1: ( () ( (lv_importDeclarations_1_0= ruleXImportDeclaration ) )* )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:310:2: () ( (lv_importDeclarations_1_0= ruleXImportDeclaration ) )*
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:291:1: ( () ( (lv_importDeclarations_1_0= ruleXImportDeclaration ) )* )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:291:2: () ( (lv_importDeclarations_1_0= ruleXImportDeclaration ) )*
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:310:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:311:5: 
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:291:2: ()
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:292:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -860,30 +802,30 @@ public final EObject ruleXImportSection() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:316:2: ( (lv_importDeclarations_1_0= ruleXImportDeclaration ) )*
-            loop5:
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:297:2: ( (lv_importDeclarations_1_0= ruleXImportDeclaration ) )*
+            loop4:
             do {
-                int alt5=2;
-                int LA5_0 = input.LA(1);
+                int alt4=2;
+                int LA4_0 = input.LA(1);
 
-                if ( (LA5_0==21) ) {
-                    alt5=1;
+                if ( (LA4_0==20) ) {
+                    alt4=1;
                 }
 
 
-                switch (alt5) {
+                switch (alt4) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:317:1: (lv_importDeclarations_1_0= ruleXImportDeclaration )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:298:1: (lv_importDeclarations_1_0= ruleXImportDeclaration )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:317:1: (lv_importDeclarations_1_0= ruleXImportDeclaration )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:318:3: lv_importDeclarations_1_0= ruleXImportDeclaration
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:298:1: (lv_importDeclarations_1_0= ruleXImportDeclaration )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:299:3: lv_importDeclarations_1_0= ruleXImportDeclaration
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXImportSectionAccess().getImportDeclarationsXImportDeclarationParserRuleCall_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXImportDeclaration_in_ruleXImportSection556);
+            	    pushFollow(FOLLOW_ruleXImportDeclaration_in_ruleXImportSection518);
             	    lv_importDeclarations_1_0=ruleXImportDeclaration();
 
             	    state._fsp--;
@@ -909,7 +851,7 @@ public final EObject ruleXImportSection() throws RecognitionException {
             	    break;
 
             	default :
-            	    break loop5;
+            	    break loop4;
                 }
             } while (true);
 
@@ -936,7 +878,7 @@ public final EObject ruleXImportSection() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXImportDeclaration"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:342:1: entryRuleXImportDeclaration returns [EObject current=null] : iv_ruleXImportDeclaration= ruleXImportDeclaration EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:323:1: entryRuleXImportDeclaration returns [EObject current=null] : iv_ruleXImportDeclaration= ruleXImportDeclaration EOF ;
     public final EObject entryRuleXImportDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -944,13 +886,13 @@ public final EObject entryRuleXImportDeclaration() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:343:2: (iv_ruleXImportDeclaration= ruleXImportDeclaration EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:344:2: iv_ruleXImportDeclaration= ruleXImportDeclaration EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:324:2: (iv_ruleXImportDeclaration= ruleXImportDeclaration EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:325:2: iv_ruleXImportDeclaration= ruleXImportDeclaration EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXImportDeclarationRule()); 
             }
-            pushFollow(FOLLOW_ruleXImportDeclaration_in_entryRuleXImportDeclaration593);
+            pushFollow(FOLLOW_ruleXImportDeclaration_in_entryRuleXImportDeclaration555);
             iv_ruleXImportDeclaration=ruleXImportDeclaration();
 
             state._fsp--;
@@ -958,7 +900,7 @@ public final EObject entryRuleXImportDeclaration() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXImportDeclaration; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXImportDeclaration603); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXImportDeclaration565); if (state.failed) return current;
 
             }
 
@@ -976,7 +918,7 @@ public final EObject entryRuleXImportDeclaration() throws RecognitionException {
 
 
     // $ANTLR start "ruleXImportDeclaration"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:351:1: ruleXImportDeclaration returns [EObject current=null] : (otherlv_0= 'import' ( ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard ) ) ) (otherlv_3= ';' )? ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:332:1: ruleXImportDeclaration returns [EObject current=null] : (otherlv_0= 'import' ( ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard ) ) ) (otherlv_3= ';' )? ) ;
     public final EObject ruleXImportDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -988,30 +930,30 @@ public final EObject ruleXImportDeclaration() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:354:28: ( (otherlv_0= 'import' ( ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard ) ) ) (otherlv_3= ';' )? ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:355:1: (otherlv_0= 'import' ( ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard ) ) ) (otherlv_3= ';' )? )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:335:28: ( (otherlv_0= 'import' ( ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard ) ) ) (otherlv_3= ';' )? ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:336:1: (otherlv_0= 'import' ( ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard ) ) ) (otherlv_3= ';' )? )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:355:1: (otherlv_0= 'import' ( ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard ) ) ) (otherlv_3= ';' )? )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:355:3: otherlv_0= 'import' ( ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard ) ) ) (otherlv_3= ';' )?
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:336:1: (otherlv_0= 'import' ( ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard ) ) ) (otherlv_3= ';' )? )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:336:3: otherlv_0= 'import' ( ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard ) ) ) (otherlv_3= ';' )?
             {
-            otherlv_0=(Token)match(input,21,FOLLOW_21_in_ruleXImportDeclaration640); if (state.failed) return current;
+            otherlv_0=(Token)match(input,20,FOLLOW_20_in_ruleXImportDeclaration602); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getXImportDeclarationAccess().getImportKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:359:1: ( ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard ) ) )
-            int alt6=2;
-            alt6 = dfa6.predict(input);
-            switch (alt6) {
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:340:1: ( ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard ) ) )
+            int alt5=2;
+            alt5 = dfa5.predict(input);
+            switch (alt5) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:359:2: ( ( ruleQualifiedName ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:340:2: ( ( ruleQualifiedName ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:359:2: ( ( ruleQualifiedName ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:360:1: ( ruleQualifiedName )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:340:2: ( ( ruleQualifiedName ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:341:1: ( ruleQualifiedName )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:360:1: ( ruleQualifiedName )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:361:3: ruleQualifiedName
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:341:1: ( ruleQualifiedName )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:342:3: ruleQualifiedName
                     {
                     if ( state.backtracking==0 ) {
 
@@ -1025,7 +967,7 @@ public final EObject ruleXImportDeclaration() throws RecognitionException {
                       	        newCompositeNode(grammarAccess.getXImportDeclarationAccess().getImportedTypeJvmDeclaredTypeCrossReference_1_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleQualifiedName_in_ruleXImportDeclaration664);
+                    pushFollow(FOLLOW_ruleQualifiedName_in_ruleXImportDeclaration626);
                     ruleQualifiedName();
 
                     state._fsp--;
@@ -1045,20 +987,20 @@ public final EObject ruleXImportDeclaration() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:375:6: ( (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:356:6: ( (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:375:6: ( (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:376:1: (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:356:6: ( (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:357:1: (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:376:1: (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:377:3: lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:357:1: (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:358:3: lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXImportDeclarationAccess().getImportedNamespaceQualifiedNameWithWildcardParserRuleCall_1_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleQualifiedNameWithWildcard_in_ruleXImportDeclaration691);
+                    pushFollow(FOLLOW_ruleQualifiedNameWithWildcard_in_ruleXImportDeclaration653);
                     lv_importedNamespace_2_0=ruleQualifiedNameWithWildcard();
 
                     state._fsp--;
@@ -1088,18 +1030,18 @@ public final EObject ruleXImportDeclaration() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:393:3: (otherlv_3= ';' )?
-            int alt7=2;
-            int LA7_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:374:3: (otherlv_3= ';' )?
+            int alt6=2;
+            int LA6_0 = input.LA(1);
 
-            if ( (LA7_0==22) ) {
-                alt7=1;
+            if ( (LA6_0==21) ) {
+                alt6=1;
             }
-            switch (alt7) {
+            switch (alt6) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:393:5: otherlv_3= ';'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:374:5: otherlv_3= ';'
                     {
-                    otherlv_3=(Token)match(input,22,FOLLOW_22_in_ruleXImportDeclaration705); if (state.failed) return current;
+                    otherlv_3=(Token)match(input,21,FOLLOW_21_in_ruleXImportDeclaration667); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_3, grammarAccess.getXImportDeclarationAccess().getSemicolonKeyword_2());
@@ -1134,7 +1076,7 @@ public final EObject ruleXImportDeclaration() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleCategory"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:409:1: entryRuleCategory returns [EObject current=null] : iv_ruleCategory= ruleCategory EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:390:1: entryRuleCategory returns [EObject current=null] : iv_ruleCategory= ruleCategory EOF ;
     public final EObject entryRuleCategory() throws RecognitionException {
         EObject current = null;
 
@@ -1142,13 +1084,13 @@ public final EObject entryRuleCategory() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:410:2: (iv_ruleCategory= ruleCategory EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:411:2: iv_ruleCategory= ruleCategory EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:391:2: (iv_ruleCategory= ruleCategory EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:392:2: iv_ruleCategory= ruleCategory EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getCategoryRule()); 
             }
-            pushFollow(FOLLOW_ruleCategory_in_entryRuleCategory747);
+            pushFollow(FOLLOW_ruleCategory_in_entryRuleCategory709);
             iv_ruleCategory=ruleCategory();
 
             state._fsp--;
@@ -1156,7 +1098,7 @@ public final EObject entryRuleCategory() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleCategory; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleCategory757); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleCategory719); if (state.failed) return current;
 
             }
 
@@ -1174,7 +1116,7 @@ public final EObject entryRuleCategory() throws RecognitionException {
 
 
     // $ANTLR start "ruleCategory"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:418:1: ruleCategory returns [EObject current=null] : (otherlv_0= 'category' ( (lv_id_1_0= ruleValidID ) )? ( (lv_label_2_0= RULE_STRING ) ) otherlv_3= '{' ( (lv_checks_4_0= ruleCheck ) )* otherlv_5= '}' ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:399:1: ruleCategory returns [EObject current=null] : (otherlv_0= 'category' ( (lv_id_1_0= ruleValidID ) )? ( (lv_label_2_0= RULE_STRING ) ) otherlv_3= '{' ( (lv_checks_4_0= ruleCheck ) )* otherlv_5= '}' ) ;
     public final EObject ruleCategory() throws RecognitionException {
         EObject current = null;
 
@@ -1190,38 +1132,38 @@ public final EObject ruleCategory() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:421:28: ( (otherlv_0= 'category' ( (lv_id_1_0= ruleValidID ) )? ( (lv_label_2_0= RULE_STRING ) ) otherlv_3= '{' ( (lv_checks_4_0= ruleCheck ) )* otherlv_5= '}' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:422:1: (otherlv_0= 'category' ( (lv_id_1_0= ruleValidID ) )? ( (lv_label_2_0= RULE_STRING ) ) otherlv_3= '{' ( (lv_checks_4_0= ruleCheck ) )* otherlv_5= '}' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:402:28: ( (otherlv_0= 'category' ( (lv_id_1_0= ruleValidID ) )? ( (lv_label_2_0= RULE_STRING ) ) otherlv_3= '{' ( (lv_checks_4_0= ruleCheck ) )* otherlv_5= '}' ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:403:1: (otherlv_0= 'category' ( (lv_id_1_0= ruleValidID ) )? ( (lv_label_2_0= RULE_STRING ) ) otherlv_3= '{' ( (lv_checks_4_0= ruleCheck ) )* otherlv_5= '}' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:422:1: (otherlv_0= 'category' ( (lv_id_1_0= ruleValidID ) )? ( (lv_label_2_0= RULE_STRING ) ) otherlv_3= '{' ( (lv_checks_4_0= ruleCheck ) )* otherlv_5= '}' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:422:3: otherlv_0= 'category' ( (lv_id_1_0= ruleValidID ) )? ( (lv_label_2_0= RULE_STRING ) ) otherlv_3= '{' ( (lv_checks_4_0= ruleCheck ) )* otherlv_5= '}'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:403:1: (otherlv_0= 'category' ( (lv_id_1_0= ruleValidID ) )? ( (lv_label_2_0= RULE_STRING ) ) otherlv_3= '{' ( (lv_checks_4_0= ruleCheck ) )* otherlv_5= '}' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:403:3: otherlv_0= 'category' ( (lv_id_1_0= ruleValidID ) )? ( (lv_label_2_0= RULE_STRING ) ) otherlv_3= '{' ( (lv_checks_4_0= ruleCheck ) )* otherlv_5= '}'
             {
-            otherlv_0=(Token)match(input,23,FOLLOW_23_in_ruleCategory794); if (state.failed) return current;
+            otherlv_0=(Token)match(input,22,FOLLOW_22_in_ruleCategory756); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getCategoryAccess().getCategoryKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:426:1: ( (lv_id_1_0= ruleValidID ) )?
-            int alt8=2;
-            int LA8_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:407:1: ( (lv_id_1_0= ruleValidID ) )?
+            int alt7=2;
+            int LA7_0 = input.LA(1);
 
-            if ( (LA8_0==RULE_ID) ) {
-                alt8=1;
+            if ( (LA7_0==RULE_ID) ) {
+                alt7=1;
             }
-            switch (alt8) {
+            switch (alt7) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:427:1: (lv_id_1_0= ruleValidID )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:408:1: (lv_id_1_0= ruleValidID )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:427:1: (lv_id_1_0= ruleValidID )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:428:3: lv_id_1_0= ruleValidID
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:408:1: (lv_id_1_0= ruleValidID )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:409:3: lv_id_1_0= ruleValidID
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getCategoryAccess().getIdValidIDParserRuleCall_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleValidID_in_ruleCategory815);
+                    pushFollow(FOLLOW_ruleValidID_in_ruleCategory777);
                     lv_id_1_0=ruleValidID();
 
                     state._fsp--;
@@ -1248,13 +1190,13 @@ public final EObject ruleCategory() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:444:3: ( (lv_label_2_0= RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:445:1: (lv_label_2_0= RULE_STRING )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:425:3: ( (lv_label_2_0= RULE_STRING ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:426:1: (lv_label_2_0= RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:445:1: (lv_label_2_0= RULE_STRING )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:446:3: lv_label_2_0= RULE_STRING
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:426:1: (lv_label_2_0= RULE_STRING )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:427:3: lv_label_2_0= RULE_STRING
             {
-            lv_label_2_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleCategory833); if (state.failed) return current;
+            lv_label_2_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleCategory795); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(lv_label_2_0, grammarAccess.getCategoryAccess().getLabelSTRINGTerminalRuleCall_2_0()); 
@@ -1278,36 +1220,36 @@ public final EObject ruleCategory() throws RecognitionException {
 
             }
 
-            otherlv_3=(Token)match(input,19,FOLLOW_19_in_ruleCategory850); if (state.failed) return current;
+            otherlv_3=(Token)match(input,18,FOLLOW_18_in_ruleCategory812); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_3, grammarAccess.getCategoryAccess().getLeftCurlyBracketKeyword_3());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:466:1: ( (lv_checks_4_0= ruleCheck ) )*
-            loop9:
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:447:1: ( (lv_checks_4_0= ruleCheck ) )*
+            loop8:
             do {
-                int alt9=2;
-                int LA9_0 = input.LA(1);
+                int alt8=2;
+                int LA8_0 = input.LA(1);
 
-                if ( (LA9_0==14||LA9_0==28||(LA9_0>=44 && LA9_0<=50)) ) {
-                    alt9=1;
+                if ( (LA8_0==14||LA8_0==27||(LA8_0>=44 && LA8_0<=50)) ) {
+                    alt8=1;
                 }
 
 
-                switch (alt9) {
+                switch (alt8) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:467:1: (lv_checks_4_0= ruleCheck )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:448:1: (lv_checks_4_0= ruleCheck )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:467:1: (lv_checks_4_0= ruleCheck )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:468:3: lv_checks_4_0= ruleCheck
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:448:1: (lv_checks_4_0= ruleCheck )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:449:3: lv_checks_4_0= ruleCheck
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getCategoryAccess().getChecksCheckParserRuleCall_4_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleCheck_in_ruleCategory871);
+            	    pushFollow(FOLLOW_ruleCheck_in_ruleCategory833);
             	    lv_checks_4_0=ruleCheck();
 
             	    state._fsp--;
@@ -1333,11 +1275,11 @@ public final EObject ruleCategory() throws RecognitionException {
             	    break;
 
             	default :
-            	    break loop9;
+            	    break loop8;
                 }
             } while (true);
 
-            otherlv_5=(Token)match(input,20,FOLLOW_20_in_ruleCategory884); if (state.failed) return current;
+            otherlv_5=(Token)match(input,19,FOLLOW_19_in_ruleCategory846); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_5, grammarAccess.getCategoryAccess().getRightCurlyBracketKeyword_5());
@@ -1366,7 +1308,7 @@ public final EObject ruleCategory() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleCheck"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:496:1: entryRuleCheck returns [EObject current=null] : iv_ruleCheck= ruleCheck EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:477:1: entryRuleCheck returns [EObject current=null] : iv_ruleCheck= ruleCheck EOF ;
     public final EObject entryRuleCheck() throws RecognitionException {
         EObject current = null;
 
@@ -1374,13 +1316,13 @@ public final EObject entryRuleCheck() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:497:2: (iv_ruleCheck= ruleCheck EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:498:2: iv_ruleCheck= ruleCheck EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:478:2: (iv_ruleCheck= ruleCheck EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:479:2: iv_ruleCheck= ruleCheck EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getCheckRule()); 
             }
-            pushFollow(FOLLOW_ruleCheck_in_entryRuleCheck920);
+            pushFollow(FOLLOW_ruleCheck_in_entryRuleCheck882);
             iv_ruleCheck=ruleCheck();
 
             state._fsp--;
@@ -1388,7 +1330,7 @@ public final EObject entryRuleCheck() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleCheck; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleCheck930); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleCheck892); if (state.failed) return current;
 
             }
 
@@ -1406,7 +1348,7 @@ public final EObject entryRuleCheck() throws RecognitionException {
 
 
     // $ANTLR start "ruleCheck"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:505:1: ruleCheck returns [EObject current=null] : ( ( (lv_severityRange_0_0= ruleSeverityRange ) )? ( (lv_final_1_0= 'final' ) )? ( (lv_kind_2_0= ruleTriggerKind ) )? ( (lv_defaultSeverity_3_0= ruleSeverityKind ) ) ( (lv_id_4_0= ruleValidID ) )? ( (lv_label_5_0= RULE_STRING ) ) ( ( ( '(' )=>otherlv_6= '(' ) ( ( (lv_formalParameters_7_0= ruleFormalParameter ) ) (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )* )? otherlv_10= ')' )? (otherlv_11= 'message' ( (lv_givenMessage_12_0= RULE_STRING ) ) )? ( ( ( ( '{' )=>otherlv_13= '{' ) ( (lv_contexts_14_0= ruleContext ) )* otherlv_15= '}' ) | ( (lv_contexts_16_0= ruleContext ) )? ) ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:486:1: ruleCheck returns [EObject current=null] : ( ( (lv_severityRange_0_0= ruleSeverityRange ) )? ( (lv_final_1_0= 'final' ) )? ( (lv_kind_2_0= ruleTriggerKind ) )? ( (lv_defaultSeverity_3_0= ruleSeverityKind ) ) ( (lv_id_4_0= ruleValidID ) )? ( (lv_label_5_0= RULE_STRING ) ) ( ( ( '(' )=>otherlv_6= '(' ) ( ( (lv_formalParameters_7_0= ruleFormalParameter ) ) (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )* )? otherlv_10= ')' )? (otherlv_11= 'message' ( (lv_givenMessage_12_0= RULE_STRING ) ) )? ( ( ( ( '{' )=>otherlv_13= '{' ) ( (lv_contexts_14_0= ruleContext ) )* otherlv_15= '}' ) | ( (lv_contexts_16_0= ruleContext ) )? ) ) ;
     public final EObject ruleCheck() throws RecognitionException {
         EObject current = null;
 
@@ -1439,32 +1381,32 @@ public final EObject ruleCheck() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:508:28: ( ( ( (lv_severityRange_0_0= ruleSeverityRange ) )? ( (lv_final_1_0= 'final' ) )? ( (lv_kind_2_0= ruleTriggerKind ) )? ( (lv_defaultSeverity_3_0= ruleSeverityKind ) ) ( (lv_id_4_0= ruleValidID ) )? ( (lv_label_5_0= RULE_STRING ) ) ( ( ( '(' )=>otherlv_6= '(' ) ( ( (lv_formalParameters_7_0= ruleFormalParameter ) ) (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )* )? otherlv_10= ')' )? (otherlv_11= 'message' ( (lv_givenMessage_12_0= RULE_STRING ) ) )? ( ( ( ( '{' )=>otherlv_13= '{' ) ( (lv_contexts_14_0= ruleContext ) )* otherlv_15= '}' ) | ( (lv_contexts_16_0= ruleContext ) )? ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:509:1: ( ( (lv_severityRange_0_0= ruleSeverityRange ) )? ( (lv_final_1_0= 'final' ) )? ( (lv_kind_2_0= ruleTriggerKind ) )? ( (lv_defaultSeverity_3_0= ruleSeverityKind ) ) ( (lv_id_4_0= ruleValidID ) )? ( (lv_label_5_0= RULE_STRING ) ) ( ( ( '(' )=>otherlv_6= '(' ) ( ( (lv_formalParameters_7_0= ruleFormalParameter ) ) (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )* )? otherlv_10= ')' )? (otherlv_11= 'message' ( (lv_givenMessage_12_0= RULE_STRING ) ) )? ( ( ( ( '{' )=>otherlv_13= '{' ) ( (lv_contexts_14_0= ruleContext ) )* otherlv_15= '}' ) | ( (lv_contexts_16_0= ruleContext ) )? ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:489:28: ( ( ( (lv_severityRange_0_0= ruleSeverityRange ) )? ( (lv_final_1_0= 'final' ) )? ( (lv_kind_2_0= ruleTriggerKind ) )? ( (lv_defaultSeverity_3_0= ruleSeverityKind ) ) ( (lv_id_4_0= ruleValidID ) )? ( (lv_label_5_0= RULE_STRING ) ) ( ( ( '(' )=>otherlv_6= '(' ) ( ( (lv_formalParameters_7_0= ruleFormalParameter ) ) (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )* )? otherlv_10= ')' )? (otherlv_11= 'message' ( (lv_givenMessage_12_0= RULE_STRING ) ) )? ( ( ( ( '{' )=>otherlv_13= '{' ) ( (lv_contexts_14_0= ruleContext ) )* otherlv_15= '}' ) | ( (lv_contexts_16_0= ruleContext ) )? ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:490:1: ( ( (lv_severityRange_0_0= ruleSeverityRange ) )? ( (lv_final_1_0= 'final' ) )? ( (lv_kind_2_0= ruleTriggerKind ) )? ( (lv_defaultSeverity_3_0= ruleSeverityKind ) ) ( (lv_id_4_0= ruleValidID ) )? ( (lv_label_5_0= RULE_STRING ) ) ( ( ( '(' )=>otherlv_6= '(' ) ( ( (lv_formalParameters_7_0= ruleFormalParameter ) ) (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )* )? otherlv_10= ')' )? (otherlv_11= 'message' ( (lv_givenMessage_12_0= RULE_STRING ) ) )? ( ( ( ( '{' )=>otherlv_13= '{' ) ( (lv_contexts_14_0= ruleContext ) )* otherlv_15= '}' ) | ( (lv_contexts_16_0= ruleContext ) )? ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:509:1: ( ( (lv_severityRange_0_0= ruleSeverityRange ) )? ( (lv_final_1_0= 'final' ) )? ( (lv_kind_2_0= ruleTriggerKind ) )? ( (lv_defaultSeverity_3_0= ruleSeverityKind ) ) ( (lv_id_4_0= ruleValidID ) )? ( (lv_label_5_0= RULE_STRING ) ) ( ( ( '(' )=>otherlv_6= '(' ) ( ( (lv_formalParameters_7_0= ruleFormalParameter ) ) (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )* )? otherlv_10= ')' )? (otherlv_11= 'message' ( (lv_givenMessage_12_0= RULE_STRING ) ) )? ( ( ( ( '{' )=>otherlv_13= '{' ) ( (lv_contexts_14_0= ruleContext ) )* otherlv_15= '}' ) | ( (lv_contexts_16_0= ruleContext ) )? ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:509:2: ( (lv_severityRange_0_0= ruleSeverityRange ) )? ( (lv_final_1_0= 'final' ) )? ( (lv_kind_2_0= ruleTriggerKind ) )? ( (lv_defaultSeverity_3_0= ruleSeverityKind ) ) ( (lv_id_4_0= ruleValidID ) )? ( (lv_label_5_0= RULE_STRING ) ) ( ( ( '(' )=>otherlv_6= '(' ) ( ( (lv_formalParameters_7_0= ruleFormalParameter ) ) (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )* )? otherlv_10= ')' )? (otherlv_11= 'message' ( (lv_givenMessage_12_0= RULE_STRING ) ) )? ( ( ( ( '{' )=>otherlv_13= '{' ) ( (lv_contexts_14_0= ruleContext ) )* otherlv_15= '}' ) | ( (lv_contexts_16_0= ruleContext ) )? )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:490:1: ( ( (lv_severityRange_0_0= ruleSeverityRange ) )? ( (lv_final_1_0= 'final' ) )? ( (lv_kind_2_0= ruleTriggerKind ) )? ( (lv_defaultSeverity_3_0= ruleSeverityKind ) ) ( (lv_id_4_0= ruleValidID ) )? ( (lv_label_5_0= RULE_STRING ) ) ( ( ( '(' )=>otherlv_6= '(' ) ( ( (lv_formalParameters_7_0= ruleFormalParameter ) ) (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )* )? otherlv_10= ')' )? (otherlv_11= 'message' ( (lv_givenMessage_12_0= RULE_STRING ) ) )? ( ( ( ( '{' )=>otherlv_13= '{' ) ( (lv_contexts_14_0= ruleContext ) )* otherlv_15= '}' ) | ( (lv_contexts_16_0= ruleContext ) )? ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:490:2: ( (lv_severityRange_0_0= ruleSeverityRange ) )? ( (lv_final_1_0= 'final' ) )? ( (lv_kind_2_0= ruleTriggerKind ) )? ( (lv_defaultSeverity_3_0= ruleSeverityKind ) ) ( (lv_id_4_0= ruleValidID ) )? ( (lv_label_5_0= RULE_STRING ) ) ( ( ( '(' )=>otherlv_6= '(' ) ( ( (lv_formalParameters_7_0= ruleFormalParameter ) ) (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )* )? otherlv_10= ')' )? (otherlv_11= 'message' ( (lv_givenMessage_12_0= RULE_STRING ) ) )? ( ( ( ( '{' )=>otherlv_13= '{' ) ( (lv_contexts_14_0= ruleContext ) )* otherlv_15= '}' ) | ( (lv_contexts_16_0= ruleContext ) )? )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:509:2: ( (lv_severityRange_0_0= ruleSeverityRange ) )?
-            int alt10=2;
-            int LA10_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:490:2: ( (lv_severityRange_0_0= ruleSeverityRange ) )?
+            int alt9=2;
+            int LA9_0 = input.LA(1);
 
-            if ( (LA10_0==28) ) {
-                alt10=1;
+            if ( (LA9_0==27) ) {
+                alt9=1;
             }
-            switch (alt10) {
+            switch (alt9) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:510:1: (lv_severityRange_0_0= ruleSeverityRange )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:491:1: (lv_severityRange_0_0= ruleSeverityRange )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:510:1: (lv_severityRange_0_0= ruleSeverityRange )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:511:3: lv_severityRange_0_0= ruleSeverityRange
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:491:1: (lv_severityRange_0_0= ruleSeverityRange )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:492:3: lv_severityRange_0_0= ruleSeverityRange
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getCheckAccess().getSeverityRangeSeverityRangeParserRuleCall_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleSeverityRange_in_ruleCheck976);
+                    pushFollow(FOLLOW_ruleSeverityRange_in_ruleCheck938);
                     lv_severityRange_0_0=ruleSeverityRange();
 
                     state._fsp--;
@@ -1491,21 +1433,21 @@ public final EObject ruleCheck() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:527:3: ( (lv_final_1_0= 'final' ) )?
-            int alt11=2;
-            int LA11_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:508:3: ( (lv_final_1_0= 'final' ) )?
+            int alt10=2;
+            int LA10_0 = input.LA(1);
 
-            if ( (LA11_0==14) ) {
-                alt11=1;
+            if ( (LA10_0==14) ) {
+                alt10=1;
             }
-            switch (alt11) {
+            switch (alt10) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:528:1: (lv_final_1_0= 'final' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:509:1: (lv_final_1_0= 'final' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:528:1: (lv_final_1_0= 'final' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:529:3: lv_final_1_0= 'final'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:509:1: (lv_final_1_0= 'final' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:510:3: lv_final_1_0= 'final'
                     {
-                    lv_final_1_0=(Token)match(input,14,FOLLOW_14_in_ruleCheck995); if (state.failed) return current;
+                    lv_final_1_0=(Token)match(input,14,FOLLOW_14_in_ruleCheck957); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_final_1_0, grammarAccess.getCheckAccess().getFinalFinalKeyword_1_0());
@@ -1528,26 +1470,26 @@ public final EObject ruleCheck() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:542:3: ( (lv_kind_2_0= ruleTriggerKind ) )?
-            int alt12=2;
-            int LA12_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:523:3: ( (lv_kind_2_0= ruleTriggerKind ) )?
+            int alt11=2;
+            int LA11_0 = input.LA(1);
 
-            if ( ((LA12_0>=48 && LA12_0<=50)) ) {
-                alt12=1;
+            if ( ((LA11_0>=48 && LA11_0<=50)) ) {
+                alt11=1;
             }
-            switch (alt12) {
+            switch (alt11) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:543:1: (lv_kind_2_0= ruleTriggerKind )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:524:1: (lv_kind_2_0= ruleTriggerKind )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:543:1: (lv_kind_2_0= ruleTriggerKind )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:544:3: lv_kind_2_0= ruleTriggerKind
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:524:1: (lv_kind_2_0= ruleTriggerKind )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:525:3: lv_kind_2_0= ruleTriggerKind
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getCheckAccess().getKindTriggerKindEnumRuleCall_2_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleTriggerKind_in_ruleCheck1030);
+                    pushFollow(FOLLOW_ruleTriggerKind_in_ruleCheck992);
                     lv_kind_2_0=ruleTriggerKind();
 
                     state._fsp--;
@@ -1574,18 +1516,18 @@ public final EObject ruleCheck() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:560:3: ( (lv_defaultSeverity_3_0= ruleSeverityKind ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:561:1: (lv_defaultSeverity_3_0= ruleSeverityKind )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:541:3: ( (lv_defaultSeverity_3_0= ruleSeverityKind ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:542:1: (lv_defaultSeverity_3_0= ruleSeverityKind )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:561:1: (lv_defaultSeverity_3_0= ruleSeverityKind )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:562:3: lv_defaultSeverity_3_0= ruleSeverityKind
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:542:1: (lv_defaultSeverity_3_0= ruleSeverityKind )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:543:3: lv_defaultSeverity_3_0= ruleSeverityKind
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getCheckAccess().getDefaultSeveritySeverityKindEnumRuleCall_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleSeverityKind_in_ruleCheck1052);
+            pushFollow(FOLLOW_ruleSeverityKind_in_ruleCheck1014);
             lv_defaultSeverity_3_0=ruleSeverityKind();
 
             state._fsp--;
@@ -1609,26 +1551,26 @@ public final EObject ruleCheck() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:578:2: ( (lv_id_4_0= ruleValidID ) )?
-            int alt13=2;
-            int LA13_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:559:2: ( (lv_id_4_0= ruleValidID ) )?
+            int alt12=2;
+            int LA12_0 = input.LA(1);
 
-            if ( (LA13_0==RULE_ID) ) {
-                alt13=1;
+            if ( (LA12_0==RULE_ID) ) {
+                alt12=1;
             }
-            switch (alt13) {
+            switch (alt12) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:579:1: (lv_id_4_0= ruleValidID )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:560:1: (lv_id_4_0= ruleValidID )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:579:1: (lv_id_4_0= ruleValidID )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:580:3: lv_id_4_0= ruleValidID
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:560:1: (lv_id_4_0= ruleValidID )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:561:3: lv_id_4_0= ruleValidID
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getCheckAccess().getIdValidIDParserRuleCall_4_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleValidID_in_ruleCheck1073);
+                    pushFollow(FOLLOW_ruleValidID_in_ruleCheck1035);
                     lv_id_4_0=ruleValidID();
 
                     state._fsp--;
@@ -1655,13 +1597,13 @@ public final EObject ruleCheck() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:596:3: ( (lv_label_5_0= RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:597:1: (lv_label_5_0= RULE_STRING )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:577:3: ( (lv_label_5_0= RULE_STRING ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:578:1: (lv_label_5_0= RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:597:1: (lv_label_5_0= RULE_STRING )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:598:3: lv_label_5_0= RULE_STRING
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:578:1: (lv_label_5_0= RULE_STRING )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:579:3: lv_label_5_0= RULE_STRING
             {
-            lv_label_5_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleCheck1091); if (state.failed) return current;
+            lv_label_5_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleCheck1053); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(lv_label_5_0, grammarAccess.getCheckAccess().getLabelSTRINGTerminalRuleCall_5_0()); 
@@ -1685,17 +1627,17 @@ public final EObject ruleCheck() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:614:2: ( ( ( '(' )=>otherlv_6= '(' ) ( ( (lv_formalParameters_7_0= ruleFormalParameter ) ) (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )* )? otherlv_10= ')' )?
-            int alt16=2;
-            alt16 = dfa16.predict(input);
-            switch (alt16) {
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:595:2: ( ( ( '(' )=>otherlv_6= '(' ) ( ( (lv_formalParameters_7_0= ruleFormalParameter ) ) (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )* )? otherlv_10= ')' )?
+            int alt15=2;
+            alt15 = dfa15.predict(input);
+            switch (alt15) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:614:3: ( ( '(' )=>otherlv_6= '(' ) ( ( (lv_formalParameters_7_0= ruleFormalParameter ) ) (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )* )? otherlv_10= ')'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:595:3: ( ( '(' )=>otherlv_6= '(' ) ( ( (lv_formalParameters_7_0= ruleFormalParameter ) ) (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )* )? otherlv_10= ')'
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:614:3: ( ( '(' )=>otherlv_6= '(' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:614:4: ( '(' )=>otherlv_6= '('
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:595:3: ( ( '(' )=>otherlv_6= '(' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:595:4: ( '(' )=>otherlv_6= '('
                     {
-                    otherlv_6=(Token)match(input,24,FOLLOW_24_in_ruleCheck1117); if (state.failed) return current;
+                    otherlv_6=(Token)match(input,23,FOLLOW_23_in_ruleCheck1079); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_6, grammarAccess.getCheckAccess().getLeftParenthesisKeyword_6_0());
@@ -1704,29 +1646,29 @@ public final EObject ruleCheck() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:619:2: ( ( (lv_formalParameters_7_0= ruleFormalParameter ) ) (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )* )?
-                    int alt15=2;
-                    int LA15_0 = input.LA(1);
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:600:2: ( ( (lv_formalParameters_7_0= ruleFormalParameter ) ) (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )* )?
+                    int alt14=2;
+                    int LA14_0 = input.LA(1);
 
-                    if ( (LA15_0==RULE_ID) ) {
-                        alt15=1;
+                    if ( (LA14_0==RULE_ID) ) {
+                        alt14=1;
                     }
-                    switch (alt15) {
+                    switch (alt14) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:619:3: ( (lv_formalParameters_7_0= ruleFormalParameter ) ) (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )*
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:600:3: ( (lv_formalParameters_7_0= ruleFormalParameter ) ) (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )*
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:619:3: ( (lv_formalParameters_7_0= ruleFormalParameter ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:620:1: (lv_formalParameters_7_0= ruleFormalParameter )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:600:3: ( (lv_formalParameters_7_0= ruleFormalParameter ) )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:601:1: (lv_formalParameters_7_0= ruleFormalParameter )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:620:1: (lv_formalParameters_7_0= ruleFormalParameter )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:621:3: lv_formalParameters_7_0= ruleFormalParameter
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:601:1: (lv_formalParameters_7_0= ruleFormalParameter )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:602:3: lv_formalParameters_7_0= ruleFormalParameter
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getCheckAccess().getFormalParametersFormalParameterParserRuleCall_6_1_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleFormalParameter_in_ruleCheck1140);
+                            pushFollow(FOLLOW_ruleFormalParameter_in_ruleCheck1102);
                             lv_formalParameters_7_0=ruleFormalParameter();
 
                             state._fsp--;
@@ -1750,39 +1692,39 @@ public final EObject ruleCheck() throws RecognitionException {
 
                             }
 
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:637:2: (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )*
-                            loop14:
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:618:2: (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )*
+                            loop13:
                             do {
-                                int alt14=2;
-                                int LA14_0 = input.LA(1);
+                                int alt13=2;
+                                int LA13_0 = input.LA(1);
 
-                                if ( (LA14_0==25) ) {
-                                    alt14=1;
+                                if ( (LA13_0==24) ) {
+                                    alt13=1;
                                 }
 
 
-                                switch (alt14) {
+                                switch (alt13) {
                             	case 1 :
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:637:4: otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) )
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:618:4: otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) )
                             	    {
-                            	    otherlv_8=(Token)match(input,25,FOLLOW_25_in_ruleCheck1153); if (state.failed) return current;
+                            	    otherlv_8=(Token)match(input,24,FOLLOW_24_in_ruleCheck1115); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	          	newLeafNode(otherlv_8, grammarAccess.getCheckAccess().getCommaKeyword_6_1_1_0());
                             	          
                             	    }
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:641:1: ( (lv_formalParameters_9_0= ruleFormalParameter ) )
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:642:1: (lv_formalParameters_9_0= ruleFormalParameter )
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:622:1: ( (lv_formalParameters_9_0= ruleFormalParameter ) )
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:623:1: (lv_formalParameters_9_0= ruleFormalParameter )
                             	    {
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:642:1: (lv_formalParameters_9_0= ruleFormalParameter )
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:643:3: lv_formalParameters_9_0= ruleFormalParameter
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:623:1: (lv_formalParameters_9_0= ruleFormalParameter )
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:624:3: lv_formalParameters_9_0= ruleFormalParameter
                             	    {
                             	    if ( state.backtracking==0 ) {
                             	       
                             	      	        newCompositeNode(grammarAccess.getCheckAccess().getFormalParametersFormalParameterParserRuleCall_6_1_1_1_0()); 
                             	      	    
                             	    }
-                            	    pushFollow(FOLLOW_ruleFormalParameter_in_ruleCheck1174);
+                            	    pushFollow(FOLLOW_ruleFormalParameter_in_ruleCheck1136);
                             	    lv_formalParameters_9_0=ruleFormalParameter();
 
                             	    state._fsp--;
@@ -1811,7 +1753,7 @@ public final EObject ruleCheck() throws RecognitionException {
                             	    break;
 
                             	default :
-                            	    break loop14;
+                            	    break loop13;
                                 }
                             } while (true);
 
@@ -1821,7 +1763,7 @@ public final EObject ruleCheck() throws RecognitionException {
 
                     }
 
-                    otherlv_10=(Token)match(input,26,FOLLOW_26_in_ruleCheck1190); if (state.failed) return current;
+                    otherlv_10=(Token)match(input,25,FOLLOW_25_in_ruleCheck1152); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_10, grammarAccess.getCheckAccess().getRightParenthesisKeyword_6_2());
@@ -1833,30 +1775,30 @@ public final EObject ruleCheck() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:663:3: (otherlv_11= 'message' ( (lv_givenMessage_12_0= RULE_STRING ) ) )?
-            int alt17=2;
-            int LA17_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:644:3: (otherlv_11= 'message' ( (lv_givenMessage_12_0= RULE_STRING ) ) )?
+            int alt16=2;
+            int LA16_0 = input.LA(1);
 
-            if ( (LA17_0==27) ) {
-                alt17=1;
+            if ( (LA16_0==26) ) {
+                alt16=1;
             }
-            switch (alt17) {
+            switch (alt16) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:663:5: otherlv_11= 'message' ( (lv_givenMessage_12_0= RULE_STRING ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:644:5: otherlv_11= 'message' ( (lv_givenMessage_12_0= RULE_STRING ) )
                     {
-                    otherlv_11=(Token)match(input,27,FOLLOW_27_in_ruleCheck1205); if (state.failed) return current;
+                    otherlv_11=(Token)match(input,26,FOLLOW_26_in_ruleCheck1167); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_11, grammarAccess.getCheckAccess().getMessageKeyword_7_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:667:1: ( (lv_givenMessage_12_0= RULE_STRING ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:668:1: (lv_givenMessage_12_0= RULE_STRING )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:648:1: ( (lv_givenMessage_12_0= RULE_STRING ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:649:1: (lv_givenMessage_12_0= RULE_STRING )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:668:1: (lv_givenMessage_12_0= RULE_STRING )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:669:3: lv_givenMessage_12_0= RULE_STRING
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:649:1: (lv_givenMessage_12_0= RULE_STRING )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:650:3: lv_givenMessage_12_0= RULE_STRING
                     {
-                    lv_givenMessage_12_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleCheck1222); if (state.failed) return current;
+                    lv_givenMessage_12_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleCheck1184); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			newLeafNode(lv_givenMessage_12_0, grammarAccess.getCheckAccess().getGivenMessageSTRINGTerminalRuleCall_7_1_0()); 
@@ -1886,34 +1828,34 @@ public final EObject ruleCheck() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:685:4: ( ( ( ( '{' )=>otherlv_13= '{' ) ( (lv_contexts_14_0= ruleContext ) )* otherlv_15= '}' ) | ( (lv_contexts_16_0= ruleContext ) )? )
-            int alt20=2;
-            int LA20_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:666:4: ( ( ( ( '{' )=>otherlv_13= '{' ) ( (lv_contexts_14_0= ruleContext ) )* otherlv_15= '}' ) | ( (lv_contexts_16_0= ruleContext ) )? )
+            int alt19=2;
+            int LA19_0 = input.LA(1);
 
-            if ( (LA20_0==19) && (synpred2_InternalCheck())) {
-                alt20=1;
+            if ( (LA19_0==18) && (synpred2_InternalCheck())) {
+                alt19=1;
             }
-            else if ( (LA20_0==EOF||LA20_0==RULE_ID||LA20_0==14||LA20_0==16||LA20_0==20||(LA20_0>=23 && LA20_0<=24)||LA20_0==28||LA20_0==31||(LA20_0>=44 && LA20_0<=50)||LA20_0==68) ) {
-                alt20=2;
+            else if ( (LA19_0==EOF||LA19_0==RULE_ID||LA19_0==14||LA19_0==16||LA19_0==19||(LA19_0>=22 && LA19_0<=23)||LA19_0==27||LA19_0==30||(LA19_0>=44 && LA19_0<=50)||LA19_0==68) ) {
+                alt19=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 20, 0, input);
+                    new NoViableAltException("", 19, 0, input);
 
                 throw nvae;
             }
-            switch (alt20) {
+            switch (alt19) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:685:5: ( ( ( '{' )=>otherlv_13= '{' ) ( (lv_contexts_14_0= ruleContext ) )* otherlv_15= '}' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:666:5: ( ( ( '{' )=>otherlv_13= '{' ) ( (lv_contexts_14_0= ruleContext ) )* otherlv_15= '}' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:685:5: ( ( ( '{' )=>otherlv_13= '{' ) ( (lv_contexts_14_0= ruleContext ) )* otherlv_15= '}' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:685:6: ( ( '{' )=>otherlv_13= '{' ) ( (lv_contexts_14_0= ruleContext ) )* otherlv_15= '}'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:666:5: ( ( ( '{' )=>otherlv_13= '{' ) ( (lv_contexts_14_0= ruleContext ) )* otherlv_15= '}' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:666:6: ( ( '{' )=>otherlv_13= '{' ) ( (lv_contexts_14_0= ruleContext ) )* otherlv_15= '}'
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:685:6: ( ( '{' )=>otherlv_13= '{' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:685:7: ( '{' )=>otherlv_13= '{'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:666:6: ( ( '{' )=>otherlv_13= '{' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:666:7: ( '{' )=>otherlv_13= '{'
                     {
-                    otherlv_13=(Token)match(input,19,FOLLOW_19_in_ruleCheck1251); if (state.failed) return current;
+                    otherlv_13=(Token)match(input,18,FOLLOW_18_in_ruleCheck1213); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_13, grammarAccess.getCheckAccess().getLeftCurlyBracketKeyword_8_0_0());
@@ -1922,30 +1864,30 @@ else if ( (LA20_0==EOF||LA20_0==RULE_ID||LA20_0==14||LA20_0==16||LA20_0==20||(LA
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:690:2: ( (lv_contexts_14_0= ruleContext ) )*
-                    loop18:
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:671:2: ( (lv_contexts_14_0= ruleContext ) )*
+                    loop17:
                     do {
-                        int alt18=2;
-                        int LA18_0 = input.LA(1);
+                        int alt17=2;
+                        int LA17_0 = input.LA(1);
 
-                        if ( (LA18_0==16) ) {
-                            alt18=1;
+                        if ( (LA17_0==16) ) {
+                            alt17=1;
                         }
 
 
-                        switch (alt18) {
+                        switch (alt17) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:691:1: (lv_contexts_14_0= ruleContext )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:672:1: (lv_contexts_14_0= ruleContext )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:691:1: (lv_contexts_14_0= ruleContext )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:692:3: lv_contexts_14_0= ruleContext
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:672:1: (lv_contexts_14_0= ruleContext )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:673:3: lv_contexts_14_0= ruleContext
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getCheckAccess().getContextsContextParserRuleCall_8_0_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleContext_in_ruleCheck1273);
+                    	    pushFollow(FOLLOW_ruleContext_in_ruleCheck1235);
                     	    lv_contexts_14_0=ruleContext();
 
                     	    state._fsp--;
@@ -1971,11 +1913,11 @@ else if ( (LA20_0==EOF||LA20_0==RULE_ID||LA20_0==14||LA20_0==16||LA20_0==20||(LA
                     	    break;
 
                     	default :
-                    	    break loop18;
+                    	    break loop17;
                         }
                     } while (true);
 
-                    otherlv_15=(Token)match(input,20,FOLLOW_20_in_ruleCheck1286); if (state.failed) return current;
+                    otherlv_15=(Token)match(input,19,FOLLOW_19_in_ruleCheck1248); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_15, grammarAccess.getCheckAccess().getRightCurlyBracketKeyword_8_0_2());
@@ -1988,28 +1930,28 @@ else if ( (LA20_0==EOF||LA20_0==RULE_ID||LA20_0==14||LA20_0==16||LA20_0==20||(LA
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:713:6: ( (lv_contexts_16_0= ruleContext ) )?
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:694:6: ( (lv_contexts_16_0= ruleContext ) )?
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:713:6: ( (lv_contexts_16_0= ruleContext ) )?
-                    int alt19=2;
-                    int LA19_0 = input.LA(1);
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:694:6: ( (lv_contexts_16_0= ruleContext ) )?
+                    int alt18=2;
+                    int LA18_0 = input.LA(1);
 
-                    if ( (LA19_0==16) ) {
-                        alt19=1;
+                    if ( (LA18_0==16) ) {
+                        alt18=1;
                     }
-                    switch (alt19) {
+                    switch (alt18) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:714:1: (lv_contexts_16_0= ruleContext )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:695:1: (lv_contexts_16_0= ruleContext )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:714:1: (lv_contexts_16_0= ruleContext )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:715:3: lv_contexts_16_0= ruleContext
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:695:1: (lv_contexts_16_0= ruleContext )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:696:3: lv_contexts_16_0= ruleContext
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getCheckAccess().getContextsContextParserRuleCall_8_1_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleContext_in_ruleCheck1314);
+                            pushFollow(FOLLOW_ruleContext_in_ruleCheck1276);
                             lv_contexts_16_0=ruleContext();
 
                             state._fsp--;
@@ -2065,7 +2007,7 @@ else if ( (LA20_0==EOF||LA20_0==RULE_ID||LA20_0==14||LA20_0==16||LA20_0==20||(LA
 
 
     // $ANTLR start "entryRuleSeverityRange"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:739:1: entryRuleSeverityRange returns [EObject current=null] : iv_ruleSeverityRange= ruleSeverityRange EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:720:1: entryRuleSeverityRange returns [EObject current=null] : iv_ruleSeverityRange= ruleSeverityRange EOF ;
     public final EObject entryRuleSeverityRange() throws RecognitionException {
         EObject current = null;
 
@@ -2073,13 +2015,13 @@ public final EObject entryRuleSeverityRange() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:740:2: (iv_ruleSeverityRange= ruleSeverityRange EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:741:2: iv_ruleSeverityRange= ruleSeverityRange EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:721:2: (iv_ruleSeverityRange= ruleSeverityRange EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:722:2: iv_ruleSeverityRange= ruleSeverityRange EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getSeverityRangeRule()); 
             }
-            pushFollow(FOLLOW_ruleSeverityRange_in_entryRuleSeverityRange1352);
+            pushFollow(FOLLOW_ruleSeverityRange_in_entryRuleSeverityRange1314);
             iv_ruleSeverityRange=ruleSeverityRange();
 
             state._fsp--;
@@ -2087,7 +2029,7 @@ public final EObject entryRuleSeverityRange() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleSeverityRange; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSeverityRange1362); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleSeverityRange1324); if (state.failed) return current;
 
             }
 
@@ -2105,7 +2047,7 @@ public final EObject entryRuleSeverityRange() throws RecognitionException {
 
 
     // $ANTLR start "ruleSeverityRange"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:748:1: ruleSeverityRange returns [EObject current=null] : (otherlv_0= '@' otherlv_1= 'SeverityRange' otherlv_2= '(' ( (lv_minSeverity_3_0= ruleSeverityKind ) ) otherlv_4= '..' ( (lv_maxSeverity_5_0= ruleSeverityKind ) ) otherlv_6= ')' ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:729:1: ruleSeverityRange returns [EObject current=null] : (otherlv_0= '@' otherlv_1= 'SeverityRange' otherlv_2= '(' ( (lv_minSeverity_3_0= ruleSeverityKind ) ) otherlv_4= '..' ( (lv_maxSeverity_5_0= ruleSeverityKind ) ) otherlv_6= ')' ) ;
     public final EObject ruleSeverityRange() throws RecognitionException {
         EObject current = null;
 
@@ -2122,42 +2064,42 @@ public final EObject ruleSeverityRange() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:751:28: ( (otherlv_0= '@' otherlv_1= 'SeverityRange' otherlv_2= '(' ( (lv_minSeverity_3_0= ruleSeverityKind ) ) otherlv_4= '..' ( (lv_maxSeverity_5_0= ruleSeverityKind ) ) otherlv_6= ')' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:752:1: (otherlv_0= '@' otherlv_1= 'SeverityRange' otherlv_2= '(' ( (lv_minSeverity_3_0= ruleSeverityKind ) ) otherlv_4= '..' ( (lv_maxSeverity_5_0= ruleSeverityKind ) ) otherlv_6= ')' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:732:28: ( (otherlv_0= '@' otherlv_1= 'SeverityRange' otherlv_2= '(' ( (lv_minSeverity_3_0= ruleSeverityKind ) ) otherlv_4= '..' ( (lv_maxSeverity_5_0= ruleSeverityKind ) ) otherlv_6= ')' ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:733:1: (otherlv_0= '@' otherlv_1= 'SeverityRange' otherlv_2= '(' ( (lv_minSeverity_3_0= ruleSeverityKind ) ) otherlv_4= '..' ( (lv_maxSeverity_5_0= ruleSeverityKind ) ) otherlv_6= ')' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:752:1: (otherlv_0= '@' otherlv_1= 'SeverityRange' otherlv_2= '(' ( (lv_minSeverity_3_0= ruleSeverityKind ) ) otherlv_4= '..' ( (lv_maxSeverity_5_0= ruleSeverityKind ) ) otherlv_6= ')' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:752:3: otherlv_0= '@' otherlv_1= 'SeverityRange' otherlv_2= '(' ( (lv_minSeverity_3_0= ruleSeverityKind ) ) otherlv_4= '..' ( (lv_maxSeverity_5_0= ruleSeverityKind ) ) otherlv_6= ')'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:733:1: (otherlv_0= '@' otherlv_1= 'SeverityRange' otherlv_2= '(' ( (lv_minSeverity_3_0= ruleSeverityKind ) ) otherlv_4= '..' ( (lv_maxSeverity_5_0= ruleSeverityKind ) ) otherlv_6= ')' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:733:3: otherlv_0= '@' otherlv_1= 'SeverityRange' otherlv_2= '(' ( (lv_minSeverity_3_0= ruleSeverityKind ) ) otherlv_4= '..' ( (lv_maxSeverity_5_0= ruleSeverityKind ) ) otherlv_6= ')'
             {
-            otherlv_0=(Token)match(input,28,FOLLOW_28_in_ruleSeverityRange1399); if (state.failed) return current;
+            otherlv_0=(Token)match(input,27,FOLLOW_27_in_ruleSeverityRange1361); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getSeverityRangeAccess().getCommercialAtKeyword_0());
                   
             }
-            otherlv_1=(Token)match(input,29,FOLLOW_29_in_ruleSeverityRange1411); if (state.failed) return current;
+            otherlv_1=(Token)match(input,28,FOLLOW_28_in_ruleSeverityRange1373); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getSeverityRangeAccess().getSeverityRangeKeyword_1());
                   
             }
-            otherlv_2=(Token)match(input,24,FOLLOW_24_in_ruleSeverityRange1423); if (state.failed) return current;
+            otherlv_2=(Token)match(input,23,FOLLOW_23_in_ruleSeverityRange1385); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getSeverityRangeAccess().getLeftParenthesisKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:764:1: ( (lv_minSeverity_3_0= ruleSeverityKind ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:765:1: (lv_minSeverity_3_0= ruleSeverityKind )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:745:1: ( (lv_minSeverity_3_0= ruleSeverityKind ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:746:1: (lv_minSeverity_3_0= ruleSeverityKind )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:765:1: (lv_minSeverity_3_0= ruleSeverityKind )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:766:3: lv_minSeverity_3_0= ruleSeverityKind
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:746:1: (lv_minSeverity_3_0= ruleSeverityKind )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:747:3: lv_minSeverity_3_0= ruleSeverityKind
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getSeverityRangeAccess().getMinSeveritySeverityKindEnumRuleCall_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleSeverityKind_in_ruleSeverityRange1444);
+            pushFollow(FOLLOW_ruleSeverityKind_in_ruleSeverityRange1406);
             lv_minSeverity_3_0=ruleSeverityKind();
 
             state._fsp--;
@@ -2181,24 +2123,24 @@ public final EObject ruleSeverityRange() throws RecognitionException {
 
             }
 
-            otherlv_4=(Token)match(input,30,FOLLOW_30_in_ruleSeverityRange1456); if (state.failed) return current;
+            otherlv_4=(Token)match(input,29,FOLLOW_29_in_ruleSeverityRange1418); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_4, grammarAccess.getSeverityRangeAccess().getFullStopFullStopKeyword_4());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:786:1: ( (lv_maxSeverity_5_0= ruleSeverityKind ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:787:1: (lv_maxSeverity_5_0= ruleSeverityKind )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:767:1: ( (lv_maxSeverity_5_0= ruleSeverityKind ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:768:1: (lv_maxSeverity_5_0= ruleSeverityKind )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:787:1: (lv_maxSeverity_5_0= ruleSeverityKind )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:788:3: lv_maxSeverity_5_0= ruleSeverityKind
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:768:1: (lv_maxSeverity_5_0= ruleSeverityKind )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:769:3: lv_maxSeverity_5_0= ruleSeverityKind
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getSeverityRangeAccess().getMaxSeveritySeverityKindEnumRuleCall_5_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleSeverityKind_in_ruleSeverityRange1477);
+            pushFollow(FOLLOW_ruleSeverityKind_in_ruleSeverityRange1439);
             lv_maxSeverity_5_0=ruleSeverityKind();
 
             state._fsp--;
@@ -2222,7 +2164,7 @@ public final EObject ruleSeverityRange() throws RecognitionException {
 
             }
 
-            otherlv_6=(Token)match(input,26,FOLLOW_26_in_ruleSeverityRange1489); if (state.failed) return current;
+            otherlv_6=(Token)match(input,25,FOLLOW_25_in_ruleSeverityRange1451); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_6, grammarAccess.getSeverityRangeAccess().getRightParenthesisKeyword_6());
@@ -2251,7 +2193,7 @@ public final EObject ruleSeverityRange() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleMember"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:816:1: entryRuleMember returns [EObject current=null] : iv_ruleMember= ruleMember EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:797:1: entryRuleMember returns [EObject current=null] : iv_ruleMember= ruleMember EOF ;
     public final EObject entryRuleMember() throws RecognitionException {
         EObject current = null;
 
@@ -2259,13 +2201,13 @@ public final EObject entryRuleMember() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:817:2: (iv_ruleMember= ruleMember EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:818:2: iv_ruleMember= ruleMember EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:798:2: (iv_ruleMember= ruleMember EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:799:2: iv_ruleMember= ruleMember EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getMemberRule()); 
             }
-            pushFollow(FOLLOW_ruleMember_in_entryRuleMember1525);
+            pushFollow(FOLLOW_ruleMember_in_entryRuleMember1487);
             iv_ruleMember=ruleMember();
 
             state._fsp--;
@@ -2273,7 +2215,7 @@ public final EObject entryRuleMember() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleMember; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleMember1535); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleMember1497); if (state.failed) return current;
 
             }
 
@@ -2291,7 +2233,7 @@ public final EObject entryRuleMember() throws RecognitionException {
 
 
     // $ANTLR start "ruleMember"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:825:1: ruleMember returns [EObject current=null] : ( ( (lv_annotations_0_0= ruleXAnnotation ) )* ( (lv_type_1_0= ruleJvmTypeReference ) ) ( (lv_name_2_0= ruleValidID ) ) ( ruleOpSingleAssign ( (lv_value_4_0= ruleXOrExpression ) ) )? otherlv_5= ';' ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:806:1: ruleMember returns [EObject current=null] : ( ( (lv_annotations_0_0= ruleXAnnotation ) )* ( (lv_type_1_0= ruleJvmTypeReference ) ) ( (lv_name_2_0= ruleValidID ) ) ( ruleOpSingleAssign ( (lv_value_4_0= ruleXOrExpression ) ) )? otherlv_5= ';' ) ;
     public final EObject ruleMember() throws RecognitionException {
         EObject current = null;
 
@@ -2308,36 +2250,36 @@ public final EObject ruleMember() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:828:28: ( ( ( (lv_annotations_0_0= ruleXAnnotation ) )* ( (lv_type_1_0= ruleJvmTypeReference ) ) ( (lv_name_2_0= ruleValidID ) ) ( ruleOpSingleAssign ( (lv_value_4_0= ruleXOrExpression ) ) )? otherlv_5= ';' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:829:1: ( ( (lv_annotations_0_0= ruleXAnnotation ) )* ( (lv_type_1_0= ruleJvmTypeReference ) ) ( (lv_name_2_0= ruleValidID ) ) ( ruleOpSingleAssign ( (lv_value_4_0= ruleXOrExpression ) ) )? otherlv_5= ';' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:809:28: ( ( ( (lv_annotations_0_0= ruleXAnnotation ) )* ( (lv_type_1_0= ruleJvmTypeReference ) ) ( (lv_name_2_0= ruleValidID ) ) ( ruleOpSingleAssign ( (lv_value_4_0= ruleXOrExpression ) ) )? otherlv_5= ';' ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:810:1: ( ( (lv_annotations_0_0= ruleXAnnotation ) )* ( (lv_type_1_0= ruleJvmTypeReference ) ) ( (lv_name_2_0= ruleValidID ) ) ( ruleOpSingleAssign ( (lv_value_4_0= ruleXOrExpression ) ) )? otherlv_5= ';' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:829:1: ( ( (lv_annotations_0_0= ruleXAnnotation ) )* ( (lv_type_1_0= ruleJvmTypeReference ) ) ( (lv_name_2_0= ruleValidID ) ) ( ruleOpSingleAssign ( (lv_value_4_0= ruleXOrExpression ) ) )? otherlv_5= ';' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:829:2: ( (lv_annotations_0_0= ruleXAnnotation ) )* ( (lv_type_1_0= ruleJvmTypeReference ) ) ( (lv_name_2_0= ruleValidID ) ) ( ruleOpSingleAssign ( (lv_value_4_0= ruleXOrExpression ) ) )? otherlv_5= ';'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:810:1: ( ( (lv_annotations_0_0= ruleXAnnotation ) )* ( (lv_type_1_0= ruleJvmTypeReference ) ) ( (lv_name_2_0= ruleValidID ) ) ( ruleOpSingleAssign ( (lv_value_4_0= ruleXOrExpression ) ) )? otherlv_5= ';' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:810:2: ( (lv_annotations_0_0= ruleXAnnotation ) )* ( (lv_type_1_0= ruleJvmTypeReference ) ) ( (lv_name_2_0= ruleValidID ) ) ( ruleOpSingleAssign ( (lv_value_4_0= ruleXOrExpression ) ) )? otherlv_5= ';'
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:829:2: ( (lv_annotations_0_0= ruleXAnnotation ) )*
-            loop21:
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:810:2: ( (lv_annotations_0_0= ruleXAnnotation ) )*
+            loop20:
             do {
-                int alt21=2;
-                int LA21_0 = input.LA(1);
+                int alt20=2;
+                int LA20_0 = input.LA(1);
 
-                if ( (LA21_0==28) ) {
-                    alt21=1;
+                if ( (LA20_0==27) ) {
+                    alt20=1;
                 }
 
 
-                switch (alt21) {
+                switch (alt20) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:830:1: (lv_annotations_0_0= ruleXAnnotation )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:811:1: (lv_annotations_0_0= ruleXAnnotation )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:830:1: (lv_annotations_0_0= ruleXAnnotation )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:831:3: lv_annotations_0_0= ruleXAnnotation
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:811:1: (lv_annotations_0_0= ruleXAnnotation )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:812:3: lv_annotations_0_0= ruleXAnnotation
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getMemberAccess().getAnnotationsXAnnotationParserRuleCall_0_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXAnnotation_in_ruleMember1581);
+            	    pushFollow(FOLLOW_ruleXAnnotation_in_ruleMember1543);
             	    lv_annotations_0_0=ruleXAnnotation();
 
             	    state._fsp--;
@@ -2363,22 +2305,22 @@ public final EObject ruleMember() throws RecognitionException {
             	    break;
 
             	default :
-            	    break loop21;
+            	    break loop20;
                 }
             } while (true);
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:847:3: ( (lv_type_1_0= ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:848:1: (lv_type_1_0= ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:828:3: ( (lv_type_1_0= ruleJvmTypeReference ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:829:1: (lv_type_1_0= ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:848:1: (lv_type_1_0= ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:849:3: lv_type_1_0= ruleJvmTypeReference
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:829:1: (lv_type_1_0= ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:830:3: lv_type_1_0= ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getMemberAccess().getTypeJvmTypeReferenceParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleMember1603);
+            pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleMember1565);
             lv_type_1_0=ruleJvmTypeReference();
 
             state._fsp--;
@@ -2402,18 +2344,18 @@ public final EObject ruleMember() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:865:2: ( (lv_name_2_0= ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:866:1: (lv_name_2_0= ruleValidID )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:846:2: ( (lv_name_2_0= ruleValidID ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:847:1: (lv_name_2_0= ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:866:1: (lv_name_2_0= ruleValidID )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:867:3: lv_name_2_0= ruleValidID
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:847:1: (lv_name_2_0= ruleValidID )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:848:3: lv_name_2_0= ruleValidID
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getMemberAccess().getNameValidIDParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleValidID_in_ruleMember1624);
+            pushFollow(FOLLOW_ruleValidID_in_ruleMember1586);
             lv_name_2_0=ruleValidID();
 
             state._fsp--;
@@ -2437,23 +2379,23 @@ public final EObject ruleMember() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:883:2: ( ruleOpSingleAssign ( (lv_value_4_0= ruleXOrExpression ) ) )?
-            int alt22=2;
-            int LA22_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:864:2: ( ruleOpSingleAssign ( (lv_value_4_0= ruleXOrExpression ) ) )?
+            int alt21=2;
+            int LA21_0 = input.LA(1);
 
-            if ( (LA22_0==32) ) {
-                alt22=1;
+            if ( (LA21_0==31) ) {
+                alt21=1;
             }
-            switch (alt22) {
+            switch (alt21) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:884:5: ruleOpSingleAssign ( (lv_value_4_0= ruleXOrExpression ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:865:5: ruleOpSingleAssign ( (lv_value_4_0= ruleXOrExpression ) )
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getMemberAccess().getOpSingleAssignParserRuleCall_3_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleOpSingleAssign_in_ruleMember1641);
+                    pushFollow(FOLLOW_ruleOpSingleAssign_in_ruleMember1603);
                     ruleOpSingleAssign();
 
                     state._fsp--;
@@ -2463,18 +2405,18 @@ public final EObject ruleMember() throws RecognitionException {
                               afterParserOrEnumRuleCall();
                           
                     }
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:891:1: ( (lv_value_4_0= ruleXOrExpression ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:892:1: (lv_value_4_0= ruleXOrExpression )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:872:1: ( (lv_value_4_0= ruleXOrExpression ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:873:1: (lv_value_4_0= ruleXOrExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:892:1: (lv_value_4_0= ruleXOrExpression )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:893:3: lv_value_4_0= ruleXOrExpression
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:873:1: (lv_value_4_0= ruleXOrExpression )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:874:3: lv_value_4_0= ruleXOrExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getMemberAccess().getValueXOrExpressionParserRuleCall_3_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXOrExpression_in_ruleMember1661);
+                    pushFollow(FOLLOW_ruleXOrExpression_in_ruleMember1623);
                     lv_value_4_0=ruleXOrExpression();
 
                     state._fsp--;
@@ -2504,7 +2446,7 @@ public final EObject ruleMember() throws RecognitionException {
 
             }
 
-            otherlv_5=(Token)match(input,22,FOLLOW_22_in_ruleMember1675); if (state.failed) return current;
+            otherlv_5=(Token)match(input,21,FOLLOW_21_in_ruleMember1637); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_5, grammarAccess.getMemberAccess().getSemicolonKeyword_4());
@@ -2533,7 +2475,7 @@ public final EObject ruleMember() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleImplementation"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:921:1: entryRuleImplementation returns [EObject current=null] : iv_ruleImplementation= ruleImplementation EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:902:1: entryRuleImplementation returns [EObject current=null] : iv_ruleImplementation= ruleImplementation EOF ;
     public final EObject entryRuleImplementation() throws RecognitionException {
         EObject current = null;
 
@@ -2541,13 +2483,13 @@ public final EObject entryRuleImplementation() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:922:2: (iv_ruleImplementation= ruleImplementation EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:923:2: iv_ruleImplementation= ruleImplementation EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:903:2: (iv_ruleImplementation= ruleImplementation EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:904:2: iv_ruleImplementation= ruleImplementation EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getImplementationRule()); 
             }
-            pushFollow(FOLLOW_ruleImplementation_in_entryRuleImplementation1711);
+            pushFollow(FOLLOW_ruleImplementation_in_entryRuleImplementation1673);
             iv_ruleImplementation=ruleImplementation();
 
             state._fsp--;
@@ -2555,7 +2497,7 @@ public final EObject entryRuleImplementation() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleImplementation; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleImplementation1721); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleImplementation1683); if (state.failed) return current;
 
             }
 
@@ -2573,7 +2515,7 @@ public final EObject entryRuleImplementation() throws RecognitionException {
 
 
     // $ANTLR start "ruleImplementation"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:930:1: ruleImplementation returns [EObject current=null] : (otherlv_0= 'def' ( (lv_name_1_0= ruleValidID ) ) ( (lv_context_2_0= ruleContext ) ) ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:911:1: ruleImplementation returns [EObject current=null] : (otherlv_0= 'def' ( (lv_name_1_0= ruleValidID ) ) ( (lv_context_2_0= ruleContext ) ) ) ;
     public final EObject ruleImplementation() throws RecognitionException {
         EObject current = null;
 
@@ -2586,30 +2528,30 @@ public final EObject ruleImplementation() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:933:28: ( (otherlv_0= 'def' ( (lv_name_1_0= ruleValidID ) ) ( (lv_context_2_0= ruleContext ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:934:1: (otherlv_0= 'def' ( (lv_name_1_0= ruleValidID ) ) ( (lv_context_2_0= ruleContext ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:914:28: ( (otherlv_0= 'def' ( (lv_name_1_0= ruleValidID ) ) ( (lv_context_2_0= ruleContext ) ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:915:1: (otherlv_0= 'def' ( (lv_name_1_0= ruleValidID ) ) ( (lv_context_2_0= ruleContext ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:934:1: (otherlv_0= 'def' ( (lv_name_1_0= ruleValidID ) ) ( (lv_context_2_0= ruleContext ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:934:3: otherlv_0= 'def' ( (lv_name_1_0= ruleValidID ) ) ( (lv_context_2_0= ruleContext ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:915:1: (otherlv_0= 'def' ( (lv_name_1_0= ruleValidID ) ) ( (lv_context_2_0= ruleContext ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:915:3: otherlv_0= 'def' ( (lv_name_1_0= ruleValidID ) ) ( (lv_context_2_0= ruleContext ) )
             {
-            otherlv_0=(Token)match(input,31,FOLLOW_31_in_ruleImplementation1758); if (state.failed) return current;
+            otherlv_0=(Token)match(input,30,FOLLOW_30_in_ruleImplementation1720); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getImplementationAccess().getDefKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:938:1: ( (lv_name_1_0= ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:939:1: (lv_name_1_0= ruleValidID )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:919:1: ( (lv_name_1_0= ruleValidID ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:920:1: (lv_name_1_0= ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:939:1: (lv_name_1_0= ruleValidID )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:940:3: lv_name_1_0= ruleValidID
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:920:1: (lv_name_1_0= ruleValidID )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:921:3: lv_name_1_0= ruleValidID
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getImplementationAccess().getNameValidIDParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleValidID_in_ruleImplementation1779);
+            pushFollow(FOLLOW_ruleValidID_in_ruleImplementation1741);
             lv_name_1_0=ruleValidID();
 
             state._fsp--;
@@ -2633,18 +2575,18 @@ public final EObject ruleImplementation() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:956:2: ( (lv_context_2_0= ruleContext ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:957:1: (lv_context_2_0= ruleContext )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:937:2: ( (lv_context_2_0= ruleContext ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:938:1: (lv_context_2_0= ruleContext )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:957:1: (lv_context_2_0= ruleContext )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:958:3: lv_context_2_0= ruleContext
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:938:1: (lv_context_2_0= ruleContext )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:939:3: lv_context_2_0= ruleContext
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getImplementationAccess().getContextContextParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleContext_in_ruleImplementation1800);
+            pushFollow(FOLLOW_ruleContext_in_ruleImplementation1762);
             lv_context_2_0=ruleContext();
 
             state._fsp--;
@@ -2691,7 +2633,7 @@ public final EObject ruleImplementation() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleFormalParameter"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:982:1: entryRuleFormalParameter returns [EObject current=null] : iv_ruleFormalParameter= ruleFormalParameter EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:963:1: entryRuleFormalParameter returns [EObject current=null] : iv_ruleFormalParameter= ruleFormalParameter EOF ;
     public final EObject entryRuleFormalParameter() throws RecognitionException {
         EObject current = null;
 
@@ -2699,13 +2641,13 @@ public final EObject entryRuleFormalParameter() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:983:2: (iv_ruleFormalParameter= ruleFormalParameter EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:984:2: iv_ruleFormalParameter= ruleFormalParameter EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:964:2: (iv_ruleFormalParameter= ruleFormalParameter EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:965:2: iv_ruleFormalParameter= ruleFormalParameter EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getFormalParameterRule()); 
             }
-            pushFollow(FOLLOW_ruleFormalParameter_in_entryRuleFormalParameter1836);
+            pushFollow(FOLLOW_ruleFormalParameter_in_entryRuleFormalParameter1798);
             iv_ruleFormalParameter=ruleFormalParameter();
 
             state._fsp--;
@@ -2713,7 +2655,7 @@ public final EObject entryRuleFormalParameter() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleFormalParameter; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFormalParameter1846); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleFormalParameter1808); if (state.failed) return current;
 
             }
 
@@ -2731,7 +2673,7 @@ public final EObject entryRuleFormalParameter() throws RecognitionException {
 
 
     // $ANTLR start "ruleFormalParameter"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:991:1: ruleFormalParameter returns [EObject current=null] : ( ( (lv_type_0_0= ruleJvmParameterizedTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) otherlv_2= '=' ( (lv_right_3_0= ruleXFormalParameterDefaultValueLiteral ) ) ( (lv_label_4_0= RULE_STRING ) )? ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:972:1: ruleFormalParameter returns [EObject current=null] : ( ( (lv_type_0_0= ruleJvmParameterizedTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) otherlv_2= '=' ( (lv_right_3_0= ruleXFormalParameterDefaultValueLiteral ) ) ( (lv_label_4_0= RULE_STRING ) )? ) ;
     public final EObject ruleFormalParameter() throws RecognitionException {
         EObject current = null;
 
@@ -2747,24 +2689,24 @@ public final EObject ruleFormalParameter() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:994:28: ( ( ( (lv_type_0_0= ruleJvmParameterizedTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) otherlv_2= '=' ( (lv_right_3_0= ruleXFormalParameterDefaultValueLiteral ) ) ( (lv_label_4_0= RULE_STRING ) )? ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:995:1: ( ( (lv_type_0_0= ruleJvmParameterizedTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) otherlv_2= '=' ( (lv_right_3_0= ruleXFormalParameterDefaultValueLiteral ) ) ( (lv_label_4_0= RULE_STRING ) )? )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:975:28: ( ( ( (lv_type_0_0= ruleJvmParameterizedTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) otherlv_2= '=' ( (lv_right_3_0= ruleXFormalParameterDefaultValueLiteral ) ) ( (lv_label_4_0= RULE_STRING ) )? ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:976:1: ( ( (lv_type_0_0= ruleJvmParameterizedTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) otherlv_2= '=' ( (lv_right_3_0= ruleXFormalParameterDefaultValueLiteral ) ) ( (lv_label_4_0= RULE_STRING ) )? )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:995:1: ( ( (lv_type_0_0= ruleJvmParameterizedTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) otherlv_2= '=' ( (lv_right_3_0= ruleXFormalParameterDefaultValueLiteral ) ) ( (lv_label_4_0= RULE_STRING ) )? )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:995:2: ( (lv_type_0_0= ruleJvmParameterizedTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) otherlv_2= '=' ( (lv_right_3_0= ruleXFormalParameterDefaultValueLiteral ) ) ( (lv_label_4_0= RULE_STRING ) )?
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:976:1: ( ( (lv_type_0_0= ruleJvmParameterizedTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) otherlv_2= '=' ( (lv_right_3_0= ruleXFormalParameterDefaultValueLiteral ) ) ( (lv_label_4_0= RULE_STRING ) )? )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:976:2: ( (lv_type_0_0= ruleJvmParameterizedTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) otherlv_2= '=' ( (lv_right_3_0= ruleXFormalParameterDefaultValueLiteral ) ) ( (lv_label_4_0= RULE_STRING ) )?
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:995:2: ( (lv_type_0_0= ruleJvmParameterizedTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:996:1: (lv_type_0_0= ruleJvmParameterizedTypeReference )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:976:2: ( (lv_type_0_0= ruleJvmParameterizedTypeReference ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:977:1: (lv_type_0_0= ruleJvmParameterizedTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:996:1: (lv_type_0_0= ruleJvmParameterizedTypeReference )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:997:3: lv_type_0_0= ruleJvmParameterizedTypeReference
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:977:1: (lv_type_0_0= ruleJvmParameterizedTypeReference )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:978:3: lv_type_0_0= ruleJvmParameterizedTypeReference
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getFormalParameterAccess().getTypeJvmParameterizedTypeReferenceParserRuleCall_0_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleJvmParameterizedTypeReference_in_ruleFormalParameter1892);
+            pushFollow(FOLLOW_ruleJvmParameterizedTypeReference_in_ruleFormalParameter1854);
             lv_type_0_0=ruleJvmParameterizedTypeReference();
 
             state._fsp--;
@@ -2788,18 +2730,18 @@ public final EObject ruleFormalParameter() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1013:2: ( (lv_name_1_0= ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1014:1: (lv_name_1_0= ruleValidID )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:994:2: ( (lv_name_1_0= ruleValidID ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:995:1: (lv_name_1_0= ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1014:1: (lv_name_1_0= ruleValidID )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1015:3: lv_name_1_0= ruleValidID
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:995:1: (lv_name_1_0= ruleValidID )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:996:3: lv_name_1_0= ruleValidID
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getFormalParameterAccess().getNameValidIDParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleValidID_in_ruleFormalParameter1913);
+            pushFollow(FOLLOW_ruleValidID_in_ruleFormalParameter1875);
             lv_name_1_0=ruleValidID();
 
             state._fsp--;
@@ -2823,24 +2765,24 @@ public final EObject ruleFormalParameter() throws RecognitionException {
 
             }
 
-            otherlv_2=(Token)match(input,32,FOLLOW_32_in_ruleFormalParameter1925); if (state.failed) return current;
+            otherlv_2=(Token)match(input,31,FOLLOW_31_in_ruleFormalParameter1887); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getFormalParameterAccess().getEqualsSignKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1035:1: ( (lv_right_3_0= ruleXFormalParameterDefaultValueLiteral ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1036:1: (lv_right_3_0= ruleXFormalParameterDefaultValueLiteral )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1016:1: ( (lv_right_3_0= ruleXFormalParameterDefaultValueLiteral ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1017:1: (lv_right_3_0= ruleXFormalParameterDefaultValueLiteral )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1036:1: (lv_right_3_0= ruleXFormalParameterDefaultValueLiteral )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1037:3: lv_right_3_0= ruleXFormalParameterDefaultValueLiteral
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1017:1: (lv_right_3_0= ruleXFormalParameterDefaultValueLiteral )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1018:3: lv_right_3_0= ruleXFormalParameterDefaultValueLiteral
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getFormalParameterAccess().getRightXFormalParameterDefaultValueLiteralParserRuleCall_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXFormalParameterDefaultValueLiteral_in_ruleFormalParameter1946);
+            pushFollow(FOLLOW_ruleXFormalParameterDefaultValueLiteral_in_ruleFormalParameter1908);
             lv_right_3_0=ruleXFormalParameterDefaultValueLiteral();
 
             state._fsp--;
@@ -2864,21 +2806,21 @@ public final EObject ruleFormalParameter() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1053:2: ( (lv_label_4_0= RULE_STRING ) )?
-            int alt23=2;
-            int LA23_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1034:2: ( (lv_label_4_0= RULE_STRING ) )?
+            int alt22=2;
+            int LA22_0 = input.LA(1);
 
-            if ( (LA23_0==RULE_STRING) ) {
-                alt23=1;
+            if ( (LA22_0==RULE_STRING) ) {
+                alt22=1;
             }
-            switch (alt23) {
+            switch (alt22) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1054:1: (lv_label_4_0= RULE_STRING )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1035:1: (lv_label_4_0= RULE_STRING )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1054:1: (lv_label_4_0= RULE_STRING )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1055:3: lv_label_4_0= RULE_STRING
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1035:1: (lv_label_4_0= RULE_STRING )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1036:3: lv_label_4_0= RULE_STRING
                     {
-                    lv_label_4_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleFormalParameter1963); if (state.failed) return current;
+                    lv_label_4_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleFormalParameter1925); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			newLeafNode(lv_label_4_0, grammarAccess.getFormalParameterAccess().getLabelSTRINGTerminalRuleCall_4_0()); 
@@ -2928,7 +2870,7 @@ public final EObject ruleFormalParameter() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXSimpleFormalParameterDefaultValueLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1079:1: entryRuleXSimpleFormalParameterDefaultValueLiteral returns [EObject current=null] : iv_ruleXSimpleFormalParameterDefaultValueLiteral= ruleXSimpleFormalParameterDefaultValueLiteral EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1060:1: entryRuleXSimpleFormalParameterDefaultValueLiteral returns [EObject current=null] : iv_ruleXSimpleFormalParameterDefaultValueLiteral= ruleXSimpleFormalParameterDefaultValueLiteral EOF ;
     public final EObject entryRuleXSimpleFormalParameterDefaultValueLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2936,13 +2878,13 @@ public final EObject entryRuleXSimpleFormalParameterDefaultValueLiteral() throws
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1080:2: (iv_ruleXSimpleFormalParameterDefaultValueLiteral= ruleXSimpleFormalParameterDefaultValueLiteral EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1081:2: iv_ruleXSimpleFormalParameterDefaultValueLiteral= ruleXSimpleFormalParameterDefaultValueLiteral EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1061:2: (iv_ruleXSimpleFormalParameterDefaultValueLiteral= ruleXSimpleFormalParameterDefaultValueLiteral EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1062:2: iv_ruleXSimpleFormalParameterDefaultValueLiteral= ruleXSimpleFormalParameterDefaultValueLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXSimpleFormalParameterDefaultValueLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXSimpleFormalParameterDefaultValueLiteral_in_entryRuleXSimpleFormalParameterDefaultValueLiteral2005);
+            pushFollow(FOLLOW_ruleXSimpleFormalParameterDefaultValueLiteral_in_entryRuleXSimpleFormalParameterDefaultValueLiteral1967);
             iv_ruleXSimpleFormalParameterDefaultValueLiteral=ruleXSimpleFormalParameterDefaultValueLiteral();
 
             state._fsp--;
@@ -2950,7 +2892,7 @@ public final EObject entryRuleXSimpleFormalParameterDefaultValueLiteral() throws
             if ( state.backtracking==0 ) {
                current =iv_ruleXSimpleFormalParameterDefaultValueLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXSimpleFormalParameterDefaultValueLiteral2015); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXSimpleFormalParameterDefaultValueLiteral1977); if (state.failed) return current;
 
             }
 
@@ -2968,7 +2910,7 @@ public final EObject entryRuleXSimpleFormalParameterDefaultValueLiteral() throws
 
 
     // $ANTLR start "ruleXSimpleFormalParameterDefaultValueLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1088:1: ruleXSimpleFormalParameterDefaultValueLiteral returns [EObject current=null] : (this_XBooleanLiteral_0= ruleXBooleanLiteral | this_XNumberLiteral_1= ruleXNumberLiteral | this_XStringLiteral_2= ruleXStringLiteral ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1069:1: ruleXSimpleFormalParameterDefaultValueLiteral returns [EObject current=null] : (this_XBooleanLiteral_0= ruleXBooleanLiteral | this_XNumberLiteral_1= ruleXNumberLiteral | this_XStringLiteral_2= ruleXStringLiteral ) ;
     public final EObject ruleXSimpleFormalParameterDefaultValueLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2982,48 +2924,48 @@ public final EObject ruleXSimpleFormalParameterDefaultValueLiteral() throws Reco
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1091:28: ( (this_XBooleanLiteral_0= ruleXBooleanLiteral | this_XNumberLiteral_1= ruleXNumberLiteral | this_XStringLiteral_2= ruleXStringLiteral ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1092:1: (this_XBooleanLiteral_0= ruleXBooleanLiteral | this_XNumberLiteral_1= ruleXNumberLiteral | this_XStringLiteral_2= ruleXStringLiteral )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1072:28: ( (this_XBooleanLiteral_0= ruleXBooleanLiteral | this_XNumberLiteral_1= ruleXNumberLiteral | this_XStringLiteral_2= ruleXStringLiteral ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1073:1: (this_XBooleanLiteral_0= ruleXBooleanLiteral | this_XNumberLiteral_1= ruleXNumberLiteral | this_XStringLiteral_2= ruleXStringLiteral )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1092:1: (this_XBooleanLiteral_0= ruleXBooleanLiteral | this_XNumberLiteral_1= ruleXNumberLiteral | this_XStringLiteral_2= ruleXStringLiteral )
-            int alt24=3;
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1073:1: (this_XBooleanLiteral_0= ruleXBooleanLiteral | this_XNumberLiteral_1= ruleXNumberLiteral | this_XStringLiteral_2= ruleXStringLiteral )
+            int alt23=3;
             switch ( input.LA(1) ) {
             case 97:
             case 98:
                 {
-                alt24=1;
+                alt23=1;
                 }
                 break;
             case RULE_HEX:
             case RULE_INT:
             case RULE_DECIMAL:
                 {
-                alt24=2;
+                alt23=2;
                 }
                 break;
             case RULE_STRING:
                 {
-                alt24=3;
+                alt23=3;
                 }
                 break;
             default:
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 24, 0, input);
+                    new NoViableAltException("", 23, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt24) {
+            switch (alt23) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1093:5: this_XBooleanLiteral_0= ruleXBooleanLiteral
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1074:5: this_XBooleanLiteral_0= ruleXBooleanLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXSimpleFormalParameterDefaultValueLiteralAccess().getXBooleanLiteralParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXBooleanLiteral_in_ruleXSimpleFormalParameterDefaultValueLiteral2062);
+                    pushFollow(FOLLOW_ruleXBooleanLiteral_in_ruleXSimpleFormalParameterDefaultValueLiteral2024);
                     this_XBooleanLiteral_0=ruleXBooleanLiteral();
 
                     state._fsp--;
@@ -3038,14 +2980,14 @@ public final EObject ruleXSimpleFormalParameterDefaultValueLiteral() throws Reco
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1103:5: this_XNumberLiteral_1= ruleXNumberLiteral
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1084:5: this_XNumberLiteral_1= ruleXNumberLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXSimpleFormalParameterDefaultValueLiteralAccess().getXNumberLiteralParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXNumberLiteral_in_ruleXSimpleFormalParameterDefaultValueLiteral2089);
+                    pushFollow(FOLLOW_ruleXNumberLiteral_in_ruleXSimpleFormalParameterDefaultValueLiteral2051);
                     this_XNumberLiteral_1=ruleXNumberLiteral();
 
                     state._fsp--;
@@ -3060,14 +3002,14 @@ public final EObject ruleXSimpleFormalParameterDefaultValueLiteral() throws Reco
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1113:5: this_XStringLiteral_2= ruleXStringLiteral
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1094:5: this_XStringLiteral_2= ruleXStringLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXSimpleFormalParameterDefaultValueLiteralAccess().getXStringLiteralParserRuleCall_2()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXStringLiteral_in_ruleXSimpleFormalParameterDefaultValueLiteral2116);
+                    pushFollow(FOLLOW_ruleXStringLiteral_in_ruleXSimpleFormalParameterDefaultValueLiteral2078);
                     this_XStringLiteral_2=ruleXStringLiteral();
 
                     state._fsp--;
@@ -3104,7 +3046,7 @@ public final EObject ruleXSimpleFormalParameterDefaultValueLiteral() throws Reco
 
 
     // $ANTLR start "entryRuleXConstantUnaryOperation"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1129:1: entryRuleXConstantUnaryOperation returns [EObject current=null] : iv_ruleXConstantUnaryOperation= ruleXConstantUnaryOperation EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1110:1: entryRuleXConstantUnaryOperation returns [EObject current=null] : iv_ruleXConstantUnaryOperation= ruleXConstantUnaryOperation EOF ;
     public final EObject entryRuleXConstantUnaryOperation() throws RecognitionException {
         EObject current = null;
 
@@ -3112,13 +3054,13 @@ public final EObject entryRuleXConstantUnaryOperation() throws RecognitionExcept
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1130:2: (iv_ruleXConstantUnaryOperation= ruleXConstantUnaryOperation EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1131:2: iv_ruleXConstantUnaryOperation= ruleXConstantUnaryOperation EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1111:2: (iv_ruleXConstantUnaryOperation= ruleXConstantUnaryOperation EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1112:2: iv_ruleXConstantUnaryOperation= ruleXConstantUnaryOperation EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXConstantUnaryOperationRule()); 
             }
-            pushFollow(FOLLOW_ruleXConstantUnaryOperation_in_entryRuleXConstantUnaryOperation2151);
+            pushFollow(FOLLOW_ruleXConstantUnaryOperation_in_entryRuleXConstantUnaryOperation2113);
             iv_ruleXConstantUnaryOperation=ruleXConstantUnaryOperation();
 
             state._fsp--;
@@ -3126,7 +3068,7 @@ public final EObject entryRuleXConstantUnaryOperation() throws RecognitionExcept
             if ( state.backtracking==0 ) {
                current =iv_ruleXConstantUnaryOperation; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXConstantUnaryOperation2161); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXConstantUnaryOperation2123); if (state.failed) return current;
 
             }
 
@@ -3144,7 +3086,7 @@ public final EObject entryRuleXConstantUnaryOperation() throws RecognitionExcept
 
 
     // $ANTLR start "ruleXConstantUnaryOperation"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1138:1: ruleXConstantUnaryOperation returns [EObject current=null] : ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXConstantUnaryOperation ) ) ) | this_XSimpleFormalParameterDefaultValueLiteral_3= ruleXSimpleFormalParameterDefaultValueLiteral ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1119:1: ruleXConstantUnaryOperation returns [EObject current=null] : ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXConstantUnaryOperation ) ) ) | this_XSimpleFormalParameterDefaultValueLiteral_3= ruleXSimpleFormalParameterDefaultValueLiteral ) ;
     public final EObject ruleXConstantUnaryOperation() throws RecognitionException {
         EObject current = null;
 
@@ -3156,35 +3098,35 @@ public final EObject ruleXConstantUnaryOperation() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1141:28: ( ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXConstantUnaryOperation ) ) ) | this_XSimpleFormalParameterDefaultValueLiteral_3= ruleXSimpleFormalParameterDefaultValueLiteral ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1142:1: ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXConstantUnaryOperation ) ) ) | this_XSimpleFormalParameterDefaultValueLiteral_3= ruleXSimpleFormalParameterDefaultValueLiteral )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1122:28: ( ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXConstantUnaryOperation ) ) ) | this_XSimpleFormalParameterDefaultValueLiteral_3= ruleXSimpleFormalParameterDefaultValueLiteral ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1123:1: ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXConstantUnaryOperation ) ) ) | this_XSimpleFormalParameterDefaultValueLiteral_3= ruleXSimpleFormalParameterDefaultValueLiteral )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1142:1: ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXConstantUnaryOperation ) ) ) | this_XSimpleFormalParameterDefaultValueLiteral_3= ruleXSimpleFormalParameterDefaultValueLiteral )
-            int alt25=2;
-            int LA25_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1123:1: ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXConstantUnaryOperation ) ) ) | this_XSimpleFormalParameterDefaultValueLiteral_3= ruleXSimpleFormalParameterDefaultValueLiteral )
+            int alt24=2;
+            int LA24_0 = input.LA(1);
 
-            if ( ((LA25_0>=71 && LA25_0<=72)||LA25_0==77) ) {
-                alt25=1;
+            if ( ((LA24_0>=71 && LA24_0<=72)||LA24_0==77) ) {
+                alt24=1;
             }
-            else if ( ((LA25_0>=RULE_STRING && LA25_0<=RULE_DECIMAL)||(LA25_0>=97 && LA25_0<=98)) ) {
-                alt25=2;
+            else if ( ((LA24_0>=RULE_STRING && LA24_0<=RULE_DECIMAL)||(LA24_0>=97 && LA24_0<=98)) ) {
+                alt24=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 25, 0, input);
+                    new NoViableAltException("", 24, 0, input);
 
                 throw nvae;
             }
-            switch (alt25) {
+            switch (alt24) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1142:2: ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXConstantUnaryOperation ) ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1123:2: ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXConstantUnaryOperation ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1142:2: ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXConstantUnaryOperation ) ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1142:3: () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXConstantUnaryOperation ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1123:2: ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXConstantUnaryOperation ) ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1123:3: () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXConstantUnaryOperation ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1142:3: ()
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1143:5: 
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1123:3: ()
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1124:5: 
                     {
                     if ( state.backtracking==0 ) {
 
@@ -3196,11 +3138,11 @@ else if ( ((LA25_0>=RULE_STRING && LA25_0<=RULE_DECIMAL)||(LA25_0>=97 && LA25_0<
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1148:2: ( ( ruleOpUnary ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1149:1: ( ruleOpUnary )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1129:2: ( ( ruleOpUnary ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1130:1: ( ruleOpUnary )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1149:1: ( ruleOpUnary )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1150:3: ruleOpUnary
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1130:1: ( ruleOpUnary )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1131:3: ruleOpUnary
                     {
                     if ( state.backtracking==0 ) {
 
@@ -3214,7 +3156,7 @@ else if ( ((LA25_0>=RULE_STRING && LA25_0<=RULE_DECIMAL)||(LA25_0>=97 && LA25_0<
                       	        newCompositeNode(grammarAccess.getXConstantUnaryOperationAccess().getFeatureJvmIdentifiableElementCrossReference_0_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleOpUnary_in_ruleXConstantUnaryOperation2219);
+                    pushFollow(FOLLOW_ruleOpUnary_in_ruleXConstantUnaryOperation2181);
                     ruleOpUnary();
 
                     state._fsp--;
@@ -3230,18 +3172,18 @@ else if ( ((LA25_0>=RULE_STRING && LA25_0<=RULE_DECIMAL)||(LA25_0>=97 && LA25_0<
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1163:2: ( (lv_operand_2_0= ruleXConstantUnaryOperation ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1164:1: (lv_operand_2_0= ruleXConstantUnaryOperation )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1144:2: ( (lv_operand_2_0= ruleXConstantUnaryOperation ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1145:1: (lv_operand_2_0= ruleXConstantUnaryOperation )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1164:1: (lv_operand_2_0= ruleXConstantUnaryOperation )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1165:3: lv_operand_2_0= ruleXConstantUnaryOperation
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1145:1: (lv_operand_2_0= ruleXConstantUnaryOperation )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1146:3: lv_operand_2_0= ruleXConstantUnaryOperation
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXConstantUnaryOperationAccess().getOperandXConstantUnaryOperationParserRuleCall_0_2_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXConstantUnaryOperation_in_ruleXConstantUnaryOperation2240);
+                    pushFollow(FOLLOW_ruleXConstantUnaryOperation_in_ruleXConstantUnaryOperation2202);
                     lv_operand_2_0=ruleXConstantUnaryOperation();
 
                     state._fsp--;
@@ -3272,14 +3214,14 @@ else if ( ((LA25_0>=RULE_STRING && LA25_0<=RULE_DECIMAL)||(LA25_0>=97 && LA25_0<
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1183:5: this_XSimpleFormalParameterDefaultValueLiteral_3= ruleXSimpleFormalParameterDefaultValueLiteral
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1164:5: this_XSimpleFormalParameterDefaultValueLiteral_3= ruleXSimpleFormalParameterDefaultValueLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXConstantUnaryOperationAccess().getXSimpleFormalParameterDefaultValueLiteralParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXSimpleFormalParameterDefaultValueLiteral_in_ruleXConstantUnaryOperation2269);
+                    pushFollow(FOLLOW_ruleXSimpleFormalParameterDefaultValueLiteral_in_ruleXConstantUnaryOperation2231);
                     this_XSimpleFormalParameterDefaultValueLiteral_3=ruleXSimpleFormalParameterDefaultValueLiteral();
 
                     state._fsp--;
@@ -3316,7 +3258,7 @@ else if ( ((LA25_0>=RULE_STRING && LA25_0<=RULE_DECIMAL)||(LA25_0>=97 && LA25_0<
 
 
     // $ANTLR start "entryRuleXFormalParameterDefaultValueLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1199:1: entryRuleXFormalParameterDefaultValueLiteral returns [EObject current=null] : iv_ruleXFormalParameterDefaultValueLiteral= ruleXFormalParameterDefaultValueLiteral EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1180:1: entryRuleXFormalParameterDefaultValueLiteral returns [EObject current=null] : iv_ruleXFormalParameterDefaultValueLiteral= ruleXFormalParameterDefaultValueLiteral EOF ;
     public final EObject entryRuleXFormalParameterDefaultValueLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -3324,13 +3266,13 @@ public final EObject entryRuleXFormalParameterDefaultValueLiteral() throws Recog
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1200:2: (iv_ruleXFormalParameterDefaultValueLiteral= ruleXFormalParameterDefaultValueLiteral EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1201:2: iv_ruleXFormalParameterDefaultValueLiteral= ruleXFormalParameterDefaultValueLiteral EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1181:2: (iv_ruleXFormalParameterDefaultValueLiteral= ruleXFormalParameterDefaultValueLiteral EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1182:2: iv_ruleXFormalParameterDefaultValueLiteral= ruleXFormalParameterDefaultValueLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXFormalParameterDefaultValueLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXFormalParameterDefaultValueLiteral_in_entryRuleXFormalParameterDefaultValueLiteral2304);
+            pushFollow(FOLLOW_ruleXFormalParameterDefaultValueLiteral_in_entryRuleXFormalParameterDefaultValueLiteral2266);
             iv_ruleXFormalParameterDefaultValueLiteral=ruleXFormalParameterDefaultValueLiteral();
 
             state._fsp--;
@@ -3338,7 +3280,7 @@ public final EObject entryRuleXFormalParameterDefaultValueLiteral() throws Recog
             if ( state.backtracking==0 ) {
                current =iv_ruleXFormalParameterDefaultValueLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXFormalParameterDefaultValueLiteral2314); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXFormalParameterDefaultValueLiteral2276); if (state.failed) return current;
 
             }
 
@@ -3356,7 +3298,7 @@ public final EObject entryRuleXFormalParameterDefaultValueLiteral() throws Recog
 
 
     // $ANTLR start "ruleXFormalParameterDefaultValueLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1208:1: ruleXFormalParameterDefaultValueLiteral returns [EObject current=null] : (this_XConstantUnaryOperation_0= ruleXConstantUnaryOperation | this_XConstantListLiteral_1= ruleXConstantListLiteral ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1189:1: ruleXFormalParameterDefaultValueLiteral returns [EObject current=null] : (this_XConstantUnaryOperation_0= ruleXConstantUnaryOperation | this_XConstantListLiteral_1= ruleXConstantListLiteral ) ;
     public final EObject ruleXFormalParameterDefaultValueLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -3368,36 +3310,36 @@ public final EObject ruleXFormalParameterDefaultValueLiteral() throws Recognitio
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1211:28: ( (this_XConstantUnaryOperation_0= ruleXConstantUnaryOperation | this_XConstantListLiteral_1= ruleXConstantListLiteral ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1212:1: (this_XConstantUnaryOperation_0= ruleXConstantUnaryOperation | this_XConstantListLiteral_1= ruleXConstantListLiteral )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1192:28: ( (this_XConstantUnaryOperation_0= ruleXConstantUnaryOperation | this_XConstantListLiteral_1= ruleXConstantListLiteral ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1193:1: (this_XConstantUnaryOperation_0= ruleXConstantUnaryOperation | this_XConstantListLiteral_1= ruleXConstantListLiteral )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1212:1: (this_XConstantUnaryOperation_0= ruleXConstantUnaryOperation | this_XConstantListLiteral_1= ruleXConstantListLiteral )
-            int alt26=2;
-            int LA26_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1193:1: (this_XConstantUnaryOperation_0= ruleXConstantUnaryOperation | this_XConstantListLiteral_1= ruleXConstantListLiteral )
+            int alt25=2;
+            int LA25_0 = input.LA(1);
 
-            if ( ((LA26_0>=RULE_STRING && LA26_0<=RULE_DECIMAL)||(LA26_0>=71 && LA26_0<=72)||LA26_0==77||(LA26_0>=97 && LA26_0<=98)) ) {
-                alt26=1;
+            if ( ((LA25_0>=RULE_STRING && LA25_0<=RULE_DECIMAL)||(LA25_0>=71 && LA25_0<=72)||LA25_0==77||(LA25_0>=97 && LA25_0<=98)) ) {
+                alt25=1;
             }
-            else if ( (LA26_0==33) ) {
-                alt26=2;
+            else if ( (LA25_0==32) ) {
+                alt25=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 26, 0, input);
+                    new NoViableAltException("", 25, 0, input);
 
                 throw nvae;
             }
-            switch (alt26) {
+            switch (alt25) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1213:5: this_XConstantUnaryOperation_0= ruleXConstantUnaryOperation
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1194:5: this_XConstantUnaryOperation_0= ruleXConstantUnaryOperation
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXFormalParameterDefaultValueLiteralAccess().getXConstantUnaryOperationParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXConstantUnaryOperation_in_ruleXFormalParameterDefaultValueLiteral2361);
+                    pushFollow(FOLLOW_ruleXConstantUnaryOperation_in_ruleXFormalParameterDefaultValueLiteral2323);
                     this_XConstantUnaryOperation_0=ruleXConstantUnaryOperation();
 
                     state._fsp--;
@@ -3412,14 +3354,14 @@ else if ( (LA26_0==33) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1223:5: this_XConstantListLiteral_1= ruleXConstantListLiteral
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1204:5: this_XConstantListLiteral_1= ruleXConstantListLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXFormalParameterDefaultValueLiteralAccess().getXConstantListLiteralParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXConstantListLiteral_in_ruleXFormalParameterDefaultValueLiteral2388);
+                    pushFollow(FOLLOW_ruleXConstantListLiteral_in_ruleXFormalParameterDefaultValueLiteral2350);
                     this_XConstantListLiteral_1=ruleXConstantListLiteral();
 
                     state._fsp--;
@@ -3456,7 +3398,7 @@ else if ( (LA26_0==33) ) {
 
 
     // $ANTLR start "entryRuleXConstantListLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1239:1: entryRuleXConstantListLiteral returns [EObject current=null] : iv_ruleXConstantListLiteral= ruleXConstantListLiteral EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1220:1: entryRuleXConstantListLiteral returns [EObject current=null] : iv_ruleXConstantListLiteral= ruleXConstantListLiteral EOF ;
     public final EObject entryRuleXConstantListLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -3464,13 +3406,13 @@ public final EObject entryRuleXConstantListLiteral() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1240:2: (iv_ruleXConstantListLiteral= ruleXConstantListLiteral EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1241:2: iv_ruleXConstantListLiteral= ruleXConstantListLiteral EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1221:2: (iv_ruleXConstantListLiteral= ruleXConstantListLiteral EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1222:2: iv_ruleXConstantListLiteral= ruleXConstantListLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXConstantListLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXConstantListLiteral_in_entryRuleXConstantListLiteral2423);
+            pushFollow(FOLLOW_ruleXConstantListLiteral_in_entryRuleXConstantListLiteral2385);
             iv_ruleXConstantListLiteral=ruleXConstantListLiteral();
 
             state._fsp--;
@@ -3478,7 +3420,7 @@ public final EObject entryRuleXConstantListLiteral() throws RecognitionException
             if ( state.backtracking==0 ) {
                current =iv_ruleXConstantListLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXConstantListLiteral2433); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXConstantListLiteral2395); if (state.failed) return current;
 
             }
 
@@ -3496,7 +3438,7 @@ public final EObject entryRuleXConstantListLiteral() throws RecognitionException
 
 
     // $ANTLR start "ruleXConstantListLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1248:1: ruleXConstantListLiteral returns [EObject current=null] : ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXConstantUnaryOperation ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )* )? otherlv_6= ']' ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1229:1: ruleXConstantListLiteral returns [EObject current=null] : ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXConstantUnaryOperation ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )* )? otherlv_6= ']' ) ;
     public final EObject ruleXConstantListLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -3512,14 +3454,14 @@ public final EObject ruleXConstantListLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1251:28: ( ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXConstantUnaryOperation ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )* )? otherlv_6= ']' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1252:1: ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXConstantUnaryOperation ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )* )? otherlv_6= ']' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1232:28: ( ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXConstantUnaryOperation ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )* )? otherlv_6= ']' ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1233:1: ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXConstantUnaryOperation ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )* )? otherlv_6= ']' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1252:1: ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXConstantUnaryOperation ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )* )? otherlv_6= ']' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1252:2: () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXConstantUnaryOperation ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )* )? otherlv_6= ']'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1233:1: ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXConstantUnaryOperation ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )* )? otherlv_6= ']' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1233:2: () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXConstantUnaryOperation ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )* )? otherlv_6= ']'
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1252:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1253:5: 
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1233:2: ()
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1234:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -3531,41 +3473,41 @@ public final EObject ruleXConstantListLiteral() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,33,FOLLOW_33_in_ruleXConstantListLiteral2479); if (state.failed) return current;
+            otherlv_1=(Token)match(input,32,FOLLOW_32_in_ruleXConstantListLiteral2441); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXConstantListLiteralAccess().getNumberSignKeyword_1());
                   
             }
-            otherlv_2=(Token)match(input,34,FOLLOW_34_in_ruleXConstantListLiteral2491); if (state.failed) return current;
+            otherlv_2=(Token)match(input,33,FOLLOW_33_in_ruleXConstantListLiteral2453); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getXConstantListLiteralAccess().getLeftSquareBracketKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1266:1: ( ( (lv_elements_3_0= ruleXConstantUnaryOperation ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )* )?
-            int alt28=2;
-            int LA28_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1247:1: ( ( (lv_elements_3_0= ruleXConstantUnaryOperation ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )* )?
+            int alt27=2;
+            int LA27_0 = input.LA(1);
 
-            if ( ((LA28_0>=RULE_STRING && LA28_0<=RULE_DECIMAL)||(LA28_0>=71 && LA28_0<=72)||LA28_0==77||(LA28_0>=97 && LA28_0<=98)) ) {
-                alt28=1;
+            if ( ((LA27_0>=RULE_STRING && LA27_0<=RULE_DECIMAL)||(LA27_0>=71 && LA27_0<=72)||LA27_0==77||(LA27_0>=97 && LA27_0<=98)) ) {
+                alt27=1;
             }
-            switch (alt28) {
+            switch (alt27) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1266:2: ( (lv_elements_3_0= ruleXConstantUnaryOperation ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )*
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1247:2: ( (lv_elements_3_0= ruleXConstantUnaryOperation ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )*
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1266:2: ( (lv_elements_3_0= ruleXConstantUnaryOperation ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1267:1: (lv_elements_3_0= ruleXConstantUnaryOperation )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1247:2: ( (lv_elements_3_0= ruleXConstantUnaryOperation ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1248:1: (lv_elements_3_0= ruleXConstantUnaryOperation )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1267:1: (lv_elements_3_0= ruleXConstantUnaryOperation )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1268:3: lv_elements_3_0= ruleXConstantUnaryOperation
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1248:1: (lv_elements_3_0= ruleXConstantUnaryOperation )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1249:3: lv_elements_3_0= ruleXConstantUnaryOperation
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXConstantListLiteralAccess().getElementsXConstantUnaryOperationParserRuleCall_3_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXConstantUnaryOperation_in_ruleXConstantListLiteral2513);
+                    pushFollow(FOLLOW_ruleXConstantUnaryOperation_in_ruleXConstantListLiteral2475);
                     lv_elements_3_0=ruleXConstantUnaryOperation();
 
                     state._fsp--;
@@ -3589,39 +3531,39 @@ public final EObject ruleXConstantListLiteral() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1284:2: (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )*
-                    loop27:
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1265:2: (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )*
+                    loop26:
                     do {
-                        int alt27=2;
-                        int LA27_0 = input.LA(1);
+                        int alt26=2;
+                        int LA26_0 = input.LA(1);
 
-                        if ( (LA27_0==25) ) {
-                            alt27=1;
+                        if ( (LA26_0==24) ) {
+                            alt26=1;
                         }
 
 
-                        switch (alt27) {
+                        switch (alt26) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1284:4: otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1265:4: otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) )
                     	    {
-                    	    otherlv_4=(Token)match(input,25,FOLLOW_25_in_ruleXConstantListLiteral2526); if (state.failed) return current;
+                    	    otherlv_4=(Token)match(input,24,FOLLOW_24_in_ruleXConstantListLiteral2488); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_4, grammarAccess.getXConstantListLiteralAccess().getCommaKeyword_3_1_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1288:1: ( (lv_elements_5_0= ruleXConstantUnaryOperation ) )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1289:1: (lv_elements_5_0= ruleXConstantUnaryOperation )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1269:1: ( (lv_elements_5_0= ruleXConstantUnaryOperation ) )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1270:1: (lv_elements_5_0= ruleXConstantUnaryOperation )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1289:1: (lv_elements_5_0= ruleXConstantUnaryOperation )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1290:3: lv_elements_5_0= ruleXConstantUnaryOperation
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1270:1: (lv_elements_5_0= ruleXConstantUnaryOperation )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1271:3: lv_elements_5_0= ruleXConstantUnaryOperation
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getXConstantListLiteralAccess().getElementsXConstantUnaryOperationParserRuleCall_3_1_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleXConstantUnaryOperation_in_ruleXConstantListLiteral2547);
+                    	    pushFollow(FOLLOW_ruleXConstantUnaryOperation_in_ruleXConstantListLiteral2509);
                     	    lv_elements_5_0=ruleXConstantUnaryOperation();
 
                     	    state._fsp--;
@@ -3650,7 +3592,7 @@ public final EObject ruleXConstantListLiteral() throws RecognitionException {
                     	    break;
 
                     	default :
-                    	    break loop27;
+                    	    break loop26;
                         }
                     } while (true);
 
@@ -3660,7 +3602,7 @@ public final EObject ruleXConstantListLiteral() throws RecognitionException {
 
             }
 
-            otherlv_6=(Token)match(input,35,FOLLOW_35_in_ruleXConstantListLiteral2563); if (state.failed) return current;
+            otherlv_6=(Token)match(input,34,FOLLOW_34_in_ruleXConstantListLiteral2525); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_6, grammarAccess.getXConstantListLiteralAccess().getRightSquareBracketKeyword_4());
@@ -3689,7 +3631,7 @@ public final EObject ruleXConstantListLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleContext"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1318:1: entryRuleContext returns [EObject current=null] : iv_ruleContext= ruleContext EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1299:1: entryRuleContext returns [EObject current=null] : iv_ruleContext= ruleContext EOF ;
     public final EObject entryRuleContext() throws RecognitionException {
         EObject current = null;
 
@@ -3697,13 +3639,13 @@ public final EObject entryRuleContext() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1319:2: (iv_ruleContext= ruleContext EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1320:2: iv_ruleContext= ruleContext EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1300:2: (iv_ruleContext= ruleContext EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1301:2: iv_ruleContext= ruleContext EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getContextRule()); 
             }
-            pushFollow(FOLLOW_ruleContext_in_entryRuleContext2599);
+            pushFollow(FOLLOW_ruleContext_in_entryRuleContext2561);
             iv_ruleContext=ruleContext();
 
             state._fsp--;
@@ -3711,7 +3653,7 @@ public final EObject entryRuleContext() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleContext; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleContext2609); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleContext2571); if (state.failed) return current;
 
             }
 
@@ -3729,7 +3671,7 @@ public final EObject entryRuleContext() throws RecognitionException {
 
 
     // $ANTLR start "ruleContext"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1327:1: ruleContext returns [EObject current=null] : (otherlv_0= 'for' ( (lv_contextVariable_1_0= ruleContextVariable ) ) ( (lv_constraint_2_0= ruleXBlockExpression ) ) ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1308:1: ruleContext returns [EObject current=null] : (otherlv_0= 'for' ( (lv_contextVariable_1_0= ruleContextVariable ) ) ( (lv_constraint_2_0= ruleXBlockExpression ) ) ) ;
     public final EObject ruleContext() throws RecognitionException {
         EObject current = null;
 
@@ -3742,30 +3684,30 @@ public final EObject ruleContext() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1330:28: ( (otherlv_0= 'for' ( (lv_contextVariable_1_0= ruleContextVariable ) ) ( (lv_constraint_2_0= ruleXBlockExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1331:1: (otherlv_0= 'for' ( (lv_contextVariable_1_0= ruleContextVariable ) ) ( (lv_constraint_2_0= ruleXBlockExpression ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1311:28: ( (otherlv_0= 'for' ( (lv_contextVariable_1_0= ruleContextVariable ) ) ( (lv_constraint_2_0= ruleXBlockExpression ) ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1312:1: (otherlv_0= 'for' ( (lv_contextVariable_1_0= ruleContextVariable ) ) ( (lv_constraint_2_0= ruleXBlockExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1331:1: (otherlv_0= 'for' ( (lv_contextVariable_1_0= ruleContextVariable ) ) ( (lv_constraint_2_0= ruleXBlockExpression ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1331:3: otherlv_0= 'for' ( (lv_contextVariable_1_0= ruleContextVariable ) ) ( (lv_constraint_2_0= ruleXBlockExpression ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1312:1: (otherlv_0= 'for' ( (lv_contextVariable_1_0= ruleContextVariable ) ) ( (lv_constraint_2_0= ruleXBlockExpression ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1312:3: otherlv_0= 'for' ( (lv_contextVariable_1_0= ruleContextVariable ) ) ( (lv_constraint_2_0= ruleXBlockExpression ) )
             {
-            otherlv_0=(Token)match(input,16,FOLLOW_16_in_ruleContext2646); if (state.failed) return current;
+            otherlv_0=(Token)match(input,16,FOLLOW_16_in_ruleContext2608); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getContextAccess().getForKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1335:1: ( (lv_contextVariable_1_0= ruleContextVariable ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1336:1: (lv_contextVariable_1_0= ruleContextVariable )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1316:1: ( (lv_contextVariable_1_0= ruleContextVariable ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1317:1: (lv_contextVariable_1_0= ruleContextVariable )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1336:1: (lv_contextVariable_1_0= ruleContextVariable )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1337:3: lv_contextVariable_1_0= ruleContextVariable
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1317:1: (lv_contextVariable_1_0= ruleContextVariable )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1318:3: lv_contextVariable_1_0= ruleContextVariable
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getContextAccess().getContextVariableContextVariableParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleContextVariable_in_ruleContext2667);
+            pushFollow(FOLLOW_ruleContextVariable_in_ruleContext2629);
             lv_contextVariable_1_0=ruleContextVariable();
 
             state._fsp--;
@@ -3789,18 +3731,18 @@ public final EObject ruleContext() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1353:2: ( (lv_constraint_2_0= ruleXBlockExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1354:1: (lv_constraint_2_0= ruleXBlockExpression )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1334:2: ( (lv_constraint_2_0= ruleXBlockExpression ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1335:1: (lv_constraint_2_0= ruleXBlockExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1354:1: (lv_constraint_2_0= ruleXBlockExpression )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1355:3: lv_constraint_2_0= ruleXBlockExpression
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1335:1: (lv_constraint_2_0= ruleXBlockExpression )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1336:3: lv_constraint_2_0= ruleXBlockExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getContextAccess().getConstraintXBlockExpressionParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXBlockExpression_in_ruleContext2688);
+            pushFollow(FOLLOW_ruleXBlockExpression_in_ruleContext2650);
             lv_constraint_2_0=ruleXBlockExpression();
 
             state._fsp--;
@@ -3847,7 +3789,7 @@ public final EObject ruleContext() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleContextVariable"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1379:1: entryRuleContextVariable returns [EObject current=null] : iv_ruleContextVariable= ruleContextVariable EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1360:1: entryRuleContextVariable returns [EObject current=null] : iv_ruleContextVariable= ruleContextVariable EOF ;
     public final EObject entryRuleContextVariable() throws RecognitionException {
         EObject current = null;
 
@@ -3855,13 +3797,13 @@ public final EObject entryRuleContextVariable() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1380:2: (iv_ruleContextVariable= ruleContextVariable EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1381:2: iv_ruleContextVariable= ruleContextVariable EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1361:2: (iv_ruleContextVariable= ruleContextVariable EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1362:2: iv_ruleContextVariable= ruleContextVariable EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getContextVariableRule()); 
             }
-            pushFollow(FOLLOW_ruleContextVariable_in_entryRuleContextVariable2724);
+            pushFollow(FOLLOW_ruleContextVariable_in_entryRuleContextVariable2686);
             iv_ruleContextVariable=ruleContextVariable();
 
             state._fsp--;
@@ -3869,7 +3811,7 @@ public final EObject entryRuleContextVariable() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleContextVariable; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleContextVariable2734); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleContextVariable2696); if (state.failed) return current;
 
             }
 
@@ -3887,7 +3829,7 @@ public final EObject entryRuleContextVariable() throws RecognitionException {
 
 
     // $ANTLR start "ruleContextVariable"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1388:1: ruleContextVariable returns [EObject current=null] : ( ( (lv_type_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) )? ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1369:1: ruleContextVariable returns [EObject current=null] : ( ( (lv_type_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) )? ) ;
     public final EObject ruleContextVariable() throws RecognitionException {
         EObject current = null;
 
@@ -3899,24 +3841,24 @@ public final EObject ruleContextVariable() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1391:28: ( ( ( (lv_type_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) )? ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1392:1: ( ( (lv_type_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) )? )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1372:28: ( ( ( (lv_type_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) )? ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1373:1: ( ( (lv_type_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) )? )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1392:1: ( ( (lv_type_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) )? )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1392:2: ( (lv_type_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) )?
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1373:1: ( ( (lv_type_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) )? )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1373:2: ( (lv_type_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) )?
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1392:2: ( (lv_type_0_0= ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1393:1: (lv_type_0_0= ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1373:2: ( (lv_type_0_0= ruleJvmTypeReference ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1374:1: (lv_type_0_0= ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1393:1: (lv_type_0_0= ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1394:3: lv_type_0_0= ruleJvmTypeReference
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1374:1: (lv_type_0_0= ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1375:3: lv_type_0_0= ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getContextVariableAccess().getTypeJvmTypeReferenceParserRuleCall_0_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleContextVariable2780);
+            pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleContextVariable2742);
             lv_type_0_0=ruleJvmTypeReference();
 
             state._fsp--;
@@ -3940,26 +3882,26 @@ public final EObject ruleContextVariable() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1410:2: ( (lv_name_1_0= ruleValidID ) )?
-            int alt29=2;
-            int LA29_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1391:2: ( (lv_name_1_0= ruleValidID ) )?
+            int alt28=2;
+            int LA28_0 = input.LA(1);
 
-            if ( (LA29_0==RULE_ID) ) {
-                alt29=1;
+            if ( (LA28_0==RULE_ID) ) {
+                alt28=1;
             }
-            switch (alt29) {
+            switch (alt28) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1411:1: (lv_name_1_0= ruleValidID )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1392:1: (lv_name_1_0= ruleValidID )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1411:1: (lv_name_1_0= ruleValidID )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1412:3: lv_name_1_0= ruleValidID
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1392:1: (lv_name_1_0= ruleValidID )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1393:3: lv_name_1_0= ruleValidID
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getContextVariableAccess().getNameValidIDParserRuleCall_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleValidID_in_ruleContextVariable2801);
+                    pushFollow(FOLLOW_ruleValidID_in_ruleContextVariable2763);
                     lv_name_1_0=ruleValidID();
 
                     state._fsp--;
@@ -4009,7 +3951,7 @@ public final EObject ruleContextVariable() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXGuardExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1436:1: entryRuleXGuardExpression returns [EObject current=null] : iv_ruleXGuardExpression= ruleXGuardExpression EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1417:1: entryRuleXGuardExpression returns [EObject current=null] : iv_ruleXGuardExpression= ruleXGuardExpression EOF ;
     public final EObject entryRuleXGuardExpression() throws RecognitionException {
         EObject current = null;
 
@@ -4017,13 +3959,13 @@ public final EObject entryRuleXGuardExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1437:2: (iv_ruleXGuardExpression= ruleXGuardExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1438:2: iv_ruleXGuardExpression= ruleXGuardExpression EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1418:2: (iv_ruleXGuardExpression= ruleXGuardExpression EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1419:2: iv_ruleXGuardExpression= ruleXGuardExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXGuardExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXGuardExpression_in_entryRuleXGuardExpression2838);
+            pushFollow(FOLLOW_ruleXGuardExpression_in_entryRuleXGuardExpression2800);
             iv_ruleXGuardExpression=ruleXGuardExpression();
 
             state._fsp--;
@@ -4031,7 +3973,7 @@ public final EObject entryRuleXGuardExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXGuardExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXGuardExpression2848); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXGuardExpression2810); if (state.failed) return current;
 
             }
 
@@ -4049,7 +3991,7 @@ public final EObject entryRuleXGuardExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXGuardExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1445:1: ruleXGuardExpression returns [EObject current=null] : ( () otherlv_1= 'guard' ( (lv_guard_2_0= ruleXExpression ) ) ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1426:1: ruleXGuardExpression returns [EObject current=null] : ( () otherlv_1= 'guard' ( (lv_guard_2_0= ruleXExpression ) ) ) ;
     public final EObject ruleXGuardExpression() throws RecognitionException {
         EObject current = null;
 
@@ -4060,14 +4002,14 @@ public final EObject ruleXGuardExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1448:28: ( ( () otherlv_1= 'guard' ( (lv_guard_2_0= ruleXExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1449:1: ( () otherlv_1= 'guard' ( (lv_guard_2_0= ruleXExpression ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1429:28: ( ( () otherlv_1= 'guard' ( (lv_guard_2_0= ruleXExpression ) ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1430:1: ( () otherlv_1= 'guard' ( (lv_guard_2_0= ruleXExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1449:1: ( () otherlv_1= 'guard' ( (lv_guard_2_0= ruleXExpression ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1449:2: () otherlv_1= 'guard' ( (lv_guard_2_0= ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1430:1: ( () otherlv_1= 'guard' ( (lv_guard_2_0= ruleXExpression ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1430:2: () otherlv_1= 'guard' ( (lv_guard_2_0= ruleXExpression ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1449:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1450:5: 
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1430:2: ()
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1431:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -4079,24 +4021,24 @@ public final EObject ruleXGuardExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,36,FOLLOW_36_in_ruleXGuardExpression2894); if (state.failed) return current;
+            otherlv_1=(Token)match(input,35,FOLLOW_35_in_ruleXGuardExpression2856); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXGuardExpressionAccess().getGuardKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1459:1: ( (lv_guard_2_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1460:1: (lv_guard_2_0= ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1440:1: ( (lv_guard_2_0= ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1441:1: (lv_guard_2_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1460:1: (lv_guard_2_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1461:3: lv_guard_2_0= ruleXExpression
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1441:1: (lv_guard_2_0= ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1442:3: lv_guard_2_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXGuardExpressionAccess().getGuardXExpressionParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXGuardExpression2915);
+            pushFollow(FOLLOW_ruleXExpression_in_ruleXGuardExpression2877);
             lv_guard_2_0=ruleXExpression();
 
             state._fsp--;
@@ -4143,7 +4085,7 @@ public final EObject ruleXGuardExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXIssueExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1485:1: entryRuleXIssueExpression returns [EObject current=null] : iv_ruleXIssueExpression= ruleXIssueExpression EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1466:1: entryRuleXIssueExpression returns [EObject current=null] : iv_ruleXIssueExpression= ruleXIssueExpression EOF ;
     public final EObject entryRuleXIssueExpression() throws RecognitionException {
         EObject current = null;
 
@@ -4151,13 +4093,13 @@ public final EObject entryRuleXIssueExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1486:2: (iv_ruleXIssueExpression= ruleXIssueExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1487:2: iv_ruleXIssueExpression= ruleXIssueExpression EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1467:2: (iv_ruleXIssueExpression= ruleXIssueExpression EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1468:2: iv_ruleXIssueExpression= ruleXIssueExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXIssueExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXIssueExpression_in_entryRuleXIssueExpression2951);
+            pushFollow(FOLLOW_ruleXIssueExpression_in_entryRuleXIssueExpression2913);
             iv_ruleXIssueExpression=ruleXIssueExpression();
 
             state._fsp--;
@@ -4165,7 +4107,7 @@ public final EObject entryRuleXIssueExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXIssueExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXIssueExpression2961); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXIssueExpression2923); if (state.failed) return current;
 
             }
 
@@ -4183,7 +4125,7 @@ public final EObject entryRuleXIssueExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXIssueExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1494:1: ruleXIssueExpression returns [EObject current=null] : ( () otherlv_1= 'issue' ( ( ( ruleQualifiedName ) )=> ( ruleQualifiedName ) )? ( ( ( 'on' )=>otherlv_3= 'on' ) ( ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) ) | ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? ) ) ( ( ( '[' )=>otherlv_9= '[' ) ( (lv_markerIndex_10_0= ruleXExpression ) ) otherlv_11= ']' )? )? ( ( ( 'message' )=>otherlv_12= 'message' ) ( (lv_message_13_0= ruleXExpression ) ) )? ( ( ( 'bind' )=>otherlv_14= 'bind' ) otherlv_15= '(' ( (lv_messageParameters_16_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_17= ',' ) ( (lv_messageParameters_18_0= ruleXExpression ) ) )* otherlv_19= ')' )? ( ( ( 'data' )=>otherlv_20= 'data' ) ( (lv_issueCode_21_0= ruleValidID ) )? otherlv_22= '(' ( (lv_issueData_23_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_24= ',' ) ( (lv_issueData_25_0= ruleXExpression ) ) )* otherlv_26= ')' )? ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1475:1: ruleXIssueExpression returns [EObject current=null] : ( () otherlv_1= 'issue' ( ( ( ruleQualifiedName ) )=> ( ruleQualifiedName ) )? ( ( ( 'on' )=>otherlv_3= 'on' ) ( ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) ) | ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? ) ) ( ( ( '[' )=>otherlv_9= '[' ) ( (lv_markerIndex_10_0= ruleXExpression ) ) otherlv_11= ']' )? )? ( ( ( 'message' )=>otherlv_12= 'message' ) ( (lv_message_13_0= ruleXExpression ) ) )? ( ( ( 'bind' )=>otherlv_14= 'bind' ) otherlv_15= '(' ( (lv_messageParameters_16_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_17= ',' ) ( (lv_messageParameters_18_0= ruleXExpression ) ) )* otherlv_19= ')' )? ( ( ( 'data' )=>otherlv_20= 'data' ) ( (lv_issueCode_21_0= ruleValidID ) )? otherlv_22= '(' ( (lv_issueData_23_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_24= ',' ) ( (lv_issueData_25_0= ruleXExpression ) ) )* otherlv_26= ')' )? ) ;
     public final EObject ruleXIssueExpression() throws RecognitionException {
         EObject current = null;
 
@@ -4222,14 +4164,14 @@ public final EObject ruleXIssueExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1497:28: ( ( () otherlv_1= 'issue' ( ( ( ruleQualifiedName ) )=> ( ruleQualifiedName ) )? ( ( ( 'on' )=>otherlv_3= 'on' ) ( ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) ) | ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? ) ) ( ( ( '[' )=>otherlv_9= '[' ) ( (lv_markerIndex_10_0= ruleXExpression ) ) otherlv_11= ']' )? )? ( ( ( 'message' )=>otherlv_12= 'message' ) ( (lv_message_13_0= ruleXExpression ) ) )? ( ( ( 'bind' )=>otherlv_14= 'bind' ) otherlv_15= '(' ( (lv_messageParameters_16_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_17= ',' ) ( (lv_messageParameters_18_0= ruleXExpression ) ) )* otherlv_19= ')' )? ( ( ( 'data' )=>otherlv_20= 'data' ) ( (lv_issueCode_21_0= ruleValidID ) )? otherlv_22= '(' ( (lv_issueData_23_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_24= ',' ) ( (lv_issueData_25_0= ruleXExpression ) ) )* otherlv_26= ')' )? ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1498:1: ( () otherlv_1= 'issue' ( ( ( ruleQualifiedName ) )=> ( ruleQualifiedName ) )? ( ( ( 'on' )=>otherlv_3= 'on' ) ( ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) ) | ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? ) ) ( ( ( '[' )=>otherlv_9= '[' ) ( (lv_markerIndex_10_0= ruleXExpression ) ) otherlv_11= ']' )? )? ( ( ( 'message' )=>otherlv_12= 'message' ) ( (lv_message_13_0= ruleXExpression ) ) )? ( ( ( 'bind' )=>otherlv_14= 'bind' ) otherlv_15= '(' ( (lv_messageParameters_16_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_17= ',' ) ( (lv_messageParameters_18_0= ruleXExpression ) ) )* otherlv_19= ')' )? ( ( ( 'data' )=>otherlv_20= 'data' ) ( (lv_issueCode_21_0= ruleValidID ) )? otherlv_22= '(' ( (lv_issueData_23_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_24= ',' ) ( (lv_issueData_25_0= ruleXExpression ) ) )* otherlv_26= ')' )? )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1478:28: ( ( () otherlv_1= 'issue' ( ( ( ruleQualifiedName ) )=> ( ruleQualifiedName ) )? ( ( ( 'on' )=>otherlv_3= 'on' ) ( ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) ) | ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? ) ) ( ( ( '[' )=>otherlv_9= '[' ) ( (lv_markerIndex_10_0= ruleXExpression ) ) otherlv_11= ']' )? )? ( ( ( 'message' )=>otherlv_12= 'message' ) ( (lv_message_13_0= ruleXExpression ) ) )? ( ( ( 'bind' )=>otherlv_14= 'bind' ) otherlv_15= '(' ( (lv_messageParameters_16_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_17= ',' ) ( (lv_messageParameters_18_0= ruleXExpression ) ) )* otherlv_19= ')' )? ( ( ( 'data' )=>otherlv_20= 'data' ) ( (lv_issueCode_21_0= ruleValidID ) )? otherlv_22= '(' ( (lv_issueData_23_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_24= ',' ) ( (lv_issueData_25_0= ruleXExpression ) ) )* otherlv_26= ')' )? ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1479:1: ( () otherlv_1= 'issue' ( ( ( ruleQualifiedName ) )=> ( ruleQualifiedName ) )? ( ( ( 'on' )=>otherlv_3= 'on' ) ( ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) ) | ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? ) ) ( ( ( '[' )=>otherlv_9= '[' ) ( (lv_markerIndex_10_0= ruleXExpression ) ) otherlv_11= ']' )? )? ( ( ( 'message' )=>otherlv_12= 'message' ) ( (lv_message_13_0= ruleXExpression ) ) )? ( ( ( 'bind' )=>otherlv_14= 'bind' ) otherlv_15= '(' ( (lv_messageParameters_16_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_17= ',' ) ( (lv_messageParameters_18_0= ruleXExpression ) ) )* otherlv_19= ')' )? ( ( ( 'data' )=>otherlv_20= 'data' ) ( (lv_issueCode_21_0= ruleValidID ) )? otherlv_22= '(' ( (lv_issueData_23_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_24= ',' ) ( (lv_issueData_25_0= ruleXExpression ) ) )* otherlv_26= ')' )? )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1498:1: ( () otherlv_1= 'issue' ( ( ( ruleQualifiedName ) )=> ( ruleQualifiedName ) )? ( ( ( 'on' )=>otherlv_3= 'on' ) ( ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) ) | ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? ) ) ( ( ( '[' )=>otherlv_9= '[' ) ( (lv_markerIndex_10_0= ruleXExpression ) ) otherlv_11= ']' )? )? ( ( ( 'message' )=>otherlv_12= 'message' ) ( (lv_message_13_0= ruleXExpression ) ) )? ( ( ( 'bind' )=>otherlv_14= 'bind' ) otherlv_15= '(' ( (lv_messageParameters_16_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_17= ',' ) ( (lv_messageParameters_18_0= ruleXExpression ) ) )* otherlv_19= ')' )? ( ( ( 'data' )=>otherlv_20= 'data' ) ( (lv_issueCode_21_0= ruleValidID ) )? otherlv_22= '(' ( (lv_issueData_23_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_24= ',' ) ( (lv_issueData_25_0= ruleXExpression ) ) )* otherlv_26= ')' )? )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1498:2: () otherlv_1= 'issue' ( ( ( ruleQualifiedName ) )=> ( ruleQualifiedName ) )? ( ( ( 'on' )=>otherlv_3= 'on' ) ( ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) ) | ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? ) ) ( ( ( '[' )=>otherlv_9= '[' ) ( (lv_markerIndex_10_0= ruleXExpression ) ) otherlv_11= ']' )? )? ( ( ( 'message' )=>otherlv_12= 'message' ) ( (lv_message_13_0= ruleXExpression ) ) )? ( ( ( 'bind' )=>otherlv_14= 'bind' ) otherlv_15= '(' ( (lv_messageParameters_16_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_17= ',' ) ( (lv_messageParameters_18_0= ruleXExpression ) ) )* otherlv_19= ')' )? ( ( ( 'data' )=>otherlv_20= 'data' ) ( (lv_issueCode_21_0= ruleValidID ) )? otherlv_22= '(' ( (lv_issueData_23_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_24= ',' ) ( (lv_issueData_25_0= ruleXExpression ) ) )* otherlv_26= ')' )?
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1479:1: ( () otherlv_1= 'issue' ( ( ( ruleQualifiedName ) )=> ( ruleQualifiedName ) )? ( ( ( 'on' )=>otherlv_3= 'on' ) ( ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) ) | ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? ) ) ( ( ( '[' )=>otherlv_9= '[' ) ( (lv_markerIndex_10_0= ruleXExpression ) ) otherlv_11= ']' )? )? ( ( ( 'message' )=>otherlv_12= 'message' ) ( (lv_message_13_0= ruleXExpression ) ) )? ( ( ( 'bind' )=>otherlv_14= 'bind' ) otherlv_15= '(' ( (lv_messageParameters_16_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_17= ',' ) ( (lv_messageParameters_18_0= ruleXExpression ) ) )* otherlv_19= ')' )? ( ( ( 'data' )=>otherlv_20= 'data' ) ( (lv_issueCode_21_0= ruleValidID ) )? otherlv_22= '(' ( (lv_issueData_23_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_24= ',' ) ( (lv_issueData_25_0= ruleXExpression ) ) )* otherlv_26= ')' )? )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1479:2: () otherlv_1= 'issue' ( ( ( ruleQualifiedName ) )=> ( ruleQualifiedName ) )? ( ( ( 'on' )=>otherlv_3= 'on' ) ( ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) ) | ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? ) ) ( ( ( '[' )=>otherlv_9= '[' ) ( (lv_markerIndex_10_0= ruleXExpression ) ) otherlv_11= ']' )? )? ( ( ( 'message' )=>otherlv_12= 'message' ) ( (lv_message_13_0= ruleXExpression ) ) )? ( ( ( 'bind' )=>otherlv_14= 'bind' ) otherlv_15= '(' ( (lv_messageParameters_16_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_17= ',' ) ( (lv_messageParameters_18_0= ruleXExpression ) ) )* otherlv_19= ')' )? ( ( ( 'data' )=>otherlv_20= 'data' ) ( (lv_issueCode_21_0= ruleValidID ) )? otherlv_22= '(' ( (lv_issueData_23_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_24= ',' ) ( (lv_issueData_25_0= ruleXExpression ) ) )* otherlv_26= ')' )?
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1498:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1499:5: 
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1479:2: ()
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1480:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -4241,29 +4183,29 @@ public final EObject ruleXIssueExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,37,FOLLOW_37_in_ruleXIssueExpression3007); if (state.failed) return current;
+            otherlv_1=(Token)match(input,36,FOLLOW_36_in_ruleXIssueExpression2969); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXIssueExpressionAccess().getIssueKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1508:1: ( ( ( ruleQualifiedName ) )=> ( ruleQualifiedName ) )?
-            int alt30=2;
-            int LA30_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1489:1: ( ( ( ruleQualifiedName ) )=> ( ruleQualifiedName ) )?
+            int alt29=2;
+            int LA29_0 = input.LA(1);
 
-            if ( (LA30_0==RULE_ID) ) {
-                int LA30_1 = input.LA(2);
+            if ( (LA29_0==RULE_ID) ) {
+                int LA29_1 = input.LA(2);
 
                 if ( (synpred3_InternalCheck()) ) {
-                    alt30=1;
+                    alt29=1;
                 }
             }
-            switch (alt30) {
+            switch (alt29) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1508:2: ( ( ruleQualifiedName ) )=> ( ruleQualifiedName )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1489:2: ( ( ruleQualifiedName ) )=> ( ruleQualifiedName )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1513:1: ( ruleQualifiedName )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1514:3: ruleQualifiedName
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1494:1: ( ruleQualifiedName )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1495:3: ruleQualifiedName
                     {
                     if ( state.backtracking==0 ) {
 
@@ -4277,7 +4219,7 @@ public final EObject ruleXIssueExpression() throws RecognitionException {
                       	        newCompositeNode(grammarAccess.getXIssueExpressionAccess().getCheckCheckCrossReference_2_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleQualifiedName_in_ruleXIssueExpression3042);
+                    pushFollow(FOLLOW_ruleQualifiedName_in_ruleXIssueExpression3004);
                     ruleQualifiedName();
 
                     state._fsp--;
@@ -4296,17 +4238,17 @@ public final EObject ruleXIssueExpression() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1527:3: ( ( ( 'on' )=>otherlv_3= 'on' ) ( ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) ) | ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? ) ) ( ( ( '[' )=>otherlv_9= '[' ) ( (lv_markerIndex_10_0= ruleXExpression ) ) otherlv_11= ']' )? )?
-            int alt34=2;
-            alt34 = dfa34.predict(input);
-            switch (alt34) {
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1508:3: ( ( ( 'on' )=>otherlv_3= 'on' ) ( ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) ) | ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? ) ) ( ( ( '[' )=>otherlv_9= '[' ) ( (lv_markerIndex_10_0= ruleXExpression ) ) otherlv_11= ']' )? )?
+            int alt33=2;
+            alt33 = dfa33.predict(input);
+            switch (alt33) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1527:4: ( ( 'on' )=>otherlv_3= 'on' ) ( ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) ) | ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? ) ) ( ( ( '[' )=>otherlv_9= '[' ) ( (lv_markerIndex_10_0= ruleXExpression ) ) otherlv_11= ']' )?
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1508:4: ( ( 'on' )=>otherlv_3= 'on' ) ( ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) ) | ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? ) ) ( ( ( '[' )=>otherlv_9= '[' ) ( (lv_markerIndex_10_0= ruleXExpression ) ) otherlv_11= ']' )?
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1527:4: ( ( 'on' )=>otherlv_3= 'on' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1527:5: ( 'on' )=>otherlv_3= 'on'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1508:4: ( ( 'on' )=>otherlv_3= 'on' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1508:5: ( 'on' )=>otherlv_3= 'on'
                     {
-                    otherlv_3=(Token)match(input,38,FOLLOW_38_in_ruleXIssueExpression3064); if (state.failed) return current;
+                    otherlv_3=(Token)match(input,37,FOLLOW_37_in_ruleXIssueExpression3026); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_3, grammarAccess.getXIssueExpressionAccess().getOnKeyword_3_0());
@@ -4315,48 +4257,48 @@ public final EObject ruleXIssueExpression() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1532:2: ( ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) ) | ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? ) )
-                    int alt32=2;
-                    int LA32_0 = input.LA(1);
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1513:2: ( ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) ) | ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? ) )
+                    int alt31=2;
+                    int LA31_0 = input.LA(1);
 
-                    if ( (LA32_0==33) ) {
-                        int LA32_1 = input.LA(2);
+                    if ( (LA31_0==32) ) {
+                        int LA31_1 = input.LA(2);
 
-                        if ( (LA32_1==19||LA32_1==34) ) {
-                            alt32=2;
+                        if ( (LA31_1==18||LA31_1==33) ) {
+                            alt31=2;
                         }
-                        else if ( (LA32_1==RULE_ID) && (synpred5_InternalCheck())) {
-                            alt32=1;
+                        else if ( (LA31_1==RULE_ID) && (synpred5_InternalCheck())) {
+                            alt31=1;
                         }
                         else {
                             if (state.backtracking>0) {state.failed=true; return current;}
                             NoViableAltException nvae =
-                                new NoViableAltException("", 32, 1, input);
+                                new NoViableAltException("", 31, 1, input);
 
                             throw nvae;
                         }
                     }
-                    else if ( ((LA32_0>=RULE_STRING && LA32_0<=RULE_ID)||(LA32_0>=15 && LA32_0<=19)||LA32_0==21||(LA32_0>=23 && LA32_0<=24)||LA32_0==27||LA32_0==29||LA32_0==34||(LA32_0>=36 && LA32_0<=50)||LA32_0==56||(LA32_0>=71 && LA32_0<=72)||LA32_0==77||LA32_0==85||LA32_0==87||(LA32_0>=91 && LA32_0<=92)||(LA32_0>=95 && LA32_0<=103)||LA32_0==105) ) {
-                        alt32=2;
+                    else if ( ((LA31_0>=RULE_STRING && LA31_0<=RULE_ID)||(LA31_0>=15 && LA31_0<=18)||LA31_0==20||(LA31_0>=22 && LA31_0<=23)||LA31_0==26||LA31_0==28||LA31_0==33||(LA31_0>=35 && LA31_0<=50)||LA31_0==56||(LA31_0>=71 && LA31_0<=72)||LA31_0==77||LA31_0==85||LA31_0==87||(LA31_0>=91 && LA31_0<=92)||(LA31_0>=95 && LA31_0<=103)||LA31_0==105) ) {
+                        alt31=2;
                     }
                     else {
                         if (state.backtracking>0) {state.failed=true; return current;}
                         NoViableAltException nvae =
-                            new NoViableAltException("", 32, 0, input);
+                            new NoViableAltException("", 31, 0, input);
 
                         throw nvae;
                     }
-                    switch (alt32) {
+                    switch (alt31) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1532:3: ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1513:3: ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1532:3: ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1532:4: ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1513:3: ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1513:4: ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1532:4: ( ( '#' )=>otherlv_4= '#' )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1532:5: ( '#' )=>otherlv_4= '#'
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1513:4: ( ( '#' )=>otherlv_4= '#' )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1513:5: ( '#' )=>otherlv_4= '#'
                             {
-                            otherlv_4=(Token)match(input,33,FOLLOW_33_in_ruleXIssueExpression3087); if (state.failed) return current;
+                            otherlv_4=(Token)match(input,32,FOLLOW_32_in_ruleXIssueExpression3049); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                   	newLeafNode(otherlv_4, grammarAccess.getXIssueExpressionAccess().getNumberSignKeyword_3_1_0_0());
@@ -4365,11 +4307,11 @@ else if ( ((LA32_0>=RULE_STRING && LA32_0<=RULE_ID)||(LA32_0>=15 && LA32_0<=19)|
 
                             }
 
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1537:2: ( ( ruleValidID ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1538:1: ( ruleValidID )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1518:2: ( ( ruleValidID ) )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1519:1: ( ruleValidID )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1538:1: ( ruleValidID )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1539:3: ruleValidID
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1519:1: ( ruleValidID )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1520:3: ruleValidID
                             {
                             if ( state.backtracking==0 ) {
 
@@ -4383,7 +4325,7 @@ else if ( ((LA32_0>=RULE_STRING && LA32_0<=RULE_ID)||(LA32_0>=15 && LA32_0<=19)|
                               	        newCompositeNode(grammarAccess.getXIssueExpressionAccess().getMarkerFeatureEStructuralFeatureCrossReference_3_1_0_1_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleValidID_in_ruleXIssueExpression3111);
+                            pushFollow(FOLLOW_ruleValidID_in_ruleXIssueExpression3073);
                             ruleValidID();
 
                             state._fsp--;
@@ -4406,23 +4348,23 @@ else if ( ((LA32_0>=RULE_STRING && LA32_0<=RULE_ID)||(LA32_0>=15 && LA32_0<=19)|
                             }
                             break;
                         case 2 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1553:6: ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1534:6: ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1553:6: ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1553:7: ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )?
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1534:6: ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1534:7: ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )?
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1553:7: ( (lv_markerObject_6_0= ruleXExpression ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1554:1: (lv_markerObject_6_0= ruleXExpression )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1534:7: ( (lv_markerObject_6_0= ruleXExpression ) )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1535:1: (lv_markerObject_6_0= ruleXExpression )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1554:1: (lv_markerObject_6_0= ruleXExpression )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1555:3: lv_markerObject_6_0= ruleXExpression
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1535:1: (lv_markerObject_6_0= ruleXExpression )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1536:3: lv_markerObject_6_0= ruleXExpression
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXIssueExpressionAccess().getMarkerObjectXExpressionParserRuleCall_3_1_1_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleXExpression_in_ruleXIssueExpression3140);
+                            pushFollow(FOLLOW_ruleXExpression_in_ruleXIssueExpression3102);
                             lv_markerObject_6_0=ruleXExpression();
 
                             state._fsp--;
@@ -4446,25 +4388,25 @@ else if ( ((LA32_0>=RULE_STRING && LA32_0<=RULE_ID)||(LA32_0>=15 && LA32_0<=19)|
 
                             }
 
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1571:2: ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )?
-                            int alt31=2;
-                            int LA31_0 = input.LA(1);
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1552:2: ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )?
+                            int alt30=2;
+                            int LA30_0 = input.LA(1);
 
-                            if ( (LA31_0==33) ) {
-                                int LA31_1 = input.LA(2);
+                            if ( (LA30_0==32) ) {
+                                int LA30_1 = input.LA(2);
 
                                 if ( (synpred6_InternalCheck()) ) {
-                                    alt31=1;
+                                    alt30=1;
                                 }
                             }
-                            switch (alt31) {
+                            switch (alt30) {
                                 case 1 :
-                                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1571:3: ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) )
+                                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1552:3: ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) )
                                     {
-                                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1571:3: ( ( '#' )=>otherlv_7= '#' )
-                                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1571:4: ( '#' )=>otherlv_7= '#'
+                                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1552:3: ( ( '#' )=>otherlv_7= '#' )
+                                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1552:4: ( '#' )=>otherlv_7= '#'
                                     {
-                                    otherlv_7=(Token)match(input,33,FOLLOW_33_in_ruleXIssueExpression3161); if (state.failed) return current;
+                                    otherlv_7=(Token)match(input,32,FOLLOW_32_in_ruleXIssueExpression3123); if (state.failed) return current;
                                     if ( state.backtracking==0 ) {
 
                                           	newLeafNode(otherlv_7, grammarAccess.getXIssueExpressionAccess().getNumberSignKeyword_3_1_1_1_0());
@@ -4473,11 +4415,11 @@ else if ( ((LA32_0>=RULE_STRING && LA32_0<=RULE_ID)||(LA32_0>=15 && LA32_0<=19)|
 
                                     }
 
-                                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1576:2: ( ( ruleFeatureCallID ) )
-                                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1577:1: ( ruleFeatureCallID )
+                                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1557:2: ( ( ruleFeatureCallID ) )
+                                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1558:1: ( ruleFeatureCallID )
                                     {
-                                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1577:1: ( ruleFeatureCallID )
-                                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1578:3: ruleFeatureCallID
+                                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1558:1: ( ruleFeatureCallID )
+                                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1559:3: ruleFeatureCallID
                                     {
                                     if ( state.backtracking==0 ) {
 
@@ -4491,7 +4433,7 @@ else if ( ((LA32_0>=RULE_STRING && LA32_0<=RULE_ID)||(LA32_0>=15 && LA32_0<=19)|
                                       	        newCompositeNode(grammarAccess.getXIssueExpressionAccess().getMarkerFeatureEStructuralFeatureCrossReference_3_1_1_1_1_0()); 
                                       	    
                                     }
-                                    pushFollow(FOLLOW_ruleFeatureCallID_in_ruleXIssueExpression3185);
+                                    pushFollow(FOLLOW_ruleFeatureCallID_in_ruleXIssueExpression3147);
                                     ruleFeatureCallID();
 
                                     state._fsp--;
@@ -4522,25 +4464,25 @@ else if ( ((LA32_0>=RULE_STRING && LA32_0<=RULE_ID)||(LA32_0>=15 && LA32_0<=19)|
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1591:6: ( ( ( '[' )=>otherlv_9= '[' ) ( (lv_markerIndex_10_0= ruleXExpression ) ) otherlv_11= ']' )?
-                    int alt33=2;
-                    int LA33_0 = input.LA(1);
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1572:6: ( ( ( '[' )=>otherlv_9= '[' ) ( (lv_markerIndex_10_0= ruleXExpression ) ) otherlv_11= ']' )?
+                    int alt32=2;
+                    int LA32_0 = input.LA(1);
 
-                    if ( (LA33_0==34) ) {
-                        int LA33_1 = input.LA(2);
+                    if ( (LA32_0==33) ) {
+                        int LA32_1 = input.LA(2);
 
                         if ( (synpred7_InternalCheck()) ) {
-                            alt33=1;
+                            alt32=1;
                         }
                     }
-                    switch (alt33) {
+                    switch (alt32) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1591:7: ( ( '[' )=>otherlv_9= '[' ) ( (lv_markerIndex_10_0= ruleXExpression ) ) otherlv_11= ']'
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1572:7: ( ( '[' )=>otherlv_9= '[' ) ( (lv_markerIndex_10_0= ruleXExpression ) ) otherlv_11= ']'
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1591:7: ( ( '[' )=>otherlv_9= '[' )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1591:8: ( '[' )=>otherlv_9= '['
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1572:7: ( ( '[' )=>otherlv_9= '[' )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1572:8: ( '[' )=>otherlv_9= '['
                             {
-                            otherlv_9=(Token)match(input,34,FOLLOW_34_in_ruleXIssueExpression3210); if (state.failed) return current;
+                            otherlv_9=(Token)match(input,33,FOLLOW_33_in_ruleXIssueExpression3172); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                   	newLeafNode(otherlv_9, grammarAccess.getXIssueExpressionAccess().getLeftSquareBracketKeyword_3_2_0());
@@ -4549,18 +4491,18 @@ else if ( ((LA32_0>=RULE_STRING && LA32_0<=RULE_ID)||(LA32_0>=15 && LA32_0<=19)|
 
                             }
 
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1596:2: ( (lv_markerIndex_10_0= ruleXExpression ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1597:1: (lv_markerIndex_10_0= ruleXExpression )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1577:2: ( (lv_markerIndex_10_0= ruleXExpression ) )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1578:1: (lv_markerIndex_10_0= ruleXExpression )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1597:1: (lv_markerIndex_10_0= ruleXExpression )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1598:3: lv_markerIndex_10_0= ruleXExpression
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1578:1: (lv_markerIndex_10_0= ruleXExpression )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1579:3: lv_markerIndex_10_0= ruleXExpression
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXIssueExpressionAccess().getMarkerIndexXExpressionParserRuleCall_3_2_1_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleXExpression_in_ruleXIssueExpression3232);
+                            pushFollow(FOLLOW_ruleXExpression_in_ruleXIssueExpression3194);
                             lv_markerIndex_10_0=ruleXExpression();
 
                             state._fsp--;
@@ -4584,7 +4526,7 @@ else if ( ((LA32_0>=RULE_STRING && LA32_0<=RULE_ID)||(LA32_0>=15 && LA32_0<=19)|
 
                             }
 
-                            otherlv_11=(Token)match(input,35,FOLLOW_35_in_ruleXIssueExpression3244); if (state.failed) return current;
+                            otherlv_11=(Token)match(input,34,FOLLOW_34_in_ruleXIssueExpression3206); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                   	newLeafNode(otherlv_11, grammarAccess.getXIssueExpressionAccess().getRightSquareBracketKeyword_3_2_2());
@@ -4602,25 +4544,25 @@ else if ( ((LA32_0>=RULE_STRING && LA32_0<=RULE_ID)||(LA32_0>=15 && LA32_0<=19)|
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1618:5: ( ( ( 'message' )=>otherlv_12= 'message' ) ( (lv_message_13_0= ruleXExpression ) ) )?
-            int alt35=2;
-            int LA35_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1599:5: ( ( ( 'message' )=>otherlv_12= 'message' ) ( (lv_message_13_0= ruleXExpression ) ) )?
+            int alt34=2;
+            int LA34_0 = input.LA(1);
 
-            if ( (LA35_0==27) ) {
-                int LA35_1 = input.LA(2);
+            if ( (LA34_0==26) ) {
+                int LA34_1 = input.LA(2);
 
                 if ( (synpred8_InternalCheck()) ) {
-                    alt35=1;
+                    alt34=1;
                 }
             }
-            switch (alt35) {
+            switch (alt34) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1618:6: ( ( 'message' )=>otherlv_12= 'message' ) ( (lv_message_13_0= ruleXExpression ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1599:6: ( ( 'message' )=>otherlv_12= 'message' ) ( (lv_message_13_0= ruleXExpression ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1618:6: ( ( 'message' )=>otherlv_12= 'message' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1618:7: ( 'message' )=>otherlv_12= 'message'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1599:6: ( ( 'message' )=>otherlv_12= 'message' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1599:7: ( 'message' )=>otherlv_12= 'message'
                     {
-                    otherlv_12=(Token)match(input,27,FOLLOW_27_in_ruleXIssueExpression3269); if (state.failed) return current;
+                    otherlv_12=(Token)match(input,26,FOLLOW_26_in_ruleXIssueExpression3231); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_12, grammarAccess.getXIssueExpressionAccess().getMessageKeyword_4_0());
@@ -4629,18 +4571,18 @@ else if ( ((LA32_0>=RULE_STRING && LA32_0<=RULE_ID)||(LA32_0>=15 && LA32_0<=19)|
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1623:2: ( (lv_message_13_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1624:1: (lv_message_13_0= ruleXExpression )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1604:2: ( (lv_message_13_0= ruleXExpression ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1605:1: (lv_message_13_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1624:1: (lv_message_13_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1625:3: lv_message_13_0= ruleXExpression
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1605:1: (lv_message_13_0= ruleXExpression )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1606:3: lv_message_13_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXIssueExpressionAccess().getMessageXExpressionParserRuleCall_4_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXIssueExpression3291);
+                    pushFollow(FOLLOW_ruleXExpression_in_ruleXIssueExpression3253);
                     lv_message_13_0=ruleXExpression();
 
                     state._fsp--;
@@ -4670,25 +4612,25 @@ else if ( ((LA32_0>=RULE_STRING && LA32_0<=RULE_ID)||(LA32_0>=15 && LA32_0<=19)|
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1641:4: ( ( ( 'bind' )=>otherlv_14= 'bind' ) otherlv_15= '(' ( (lv_messageParameters_16_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_17= ',' ) ( (lv_messageParameters_18_0= ruleXExpression ) ) )* otherlv_19= ')' )?
-            int alt37=2;
-            int LA37_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1622:4: ( ( ( 'bind' )=>otherlv_14= 'bind' ) otherlv_15= '(' ( (lv_messageParameters_16_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_17= ',' ) ( (lv_messageParameters_18_0= ruleXExpression ) ) )* otherlv_19= ')' )?
+            int alt36=2;
+            int LA36_0 = input.LA(1);
 
-            if ( (LA37_0==39) ) {
-                int LA37_1 = input.LA(2);
+            if ( (LA36_0==38) ) {
+                int LA36_1 = input.LA(2);
 
                 if ( (synpred9_InternalCheck()) ) {
-                    alt37=1;
+                    alt36=1;
                 }
             }
-            switch (alt37) {
+            switch (alt36) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1641:5: ( ( 'bind' )=>otherlv_14= 'bind' ) otherlv_15= '(' ( (lv_messageParameters_16_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_17= ',' ) ( (lv_messageParameters_18_0= ruleXExpression ) ) )* otherlv_19= ')'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1622:5: ( ( 'bind' )=>otherlv_14= 'bind' ) otherlv_15= '(' ( (lv_messageParameters_16_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_17= ',' ) ( (lv_messageParameters_18_0= ruleXExpression ) ) )* otherlv_19= ')'
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1641:5: ( ( 'bind' )=>otherlv_14= 'bind' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1641:6: ( 'bind' )=>otherlv_14= 'bind'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1622:5: ( ( 'bind' )=>otherlv_14= 'bind' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1622:6: ( 'bind' )=>otherlv_14= 'bind'
                     {
-                    otherlv_14=(Token)match(input,39,FOLLOW_39_in_ruleXIssueExpression3314); if (state.failed) return current;
+                    otherlv_14=(Token)match(input,38,FOLLOW_38_in_ruleXIssueExpression3276); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_14, grammarAccess.getXIssueExpressionAccess().getBindKeyword_5_0());
@@ -4697,24 +4639,24 @@ else if ( ((LA32_0>=RULE_STRING && LA32_0<=RULE_ID)||(LA32_0>=15 && LA32_0<=19)|
 
                     }
 
-                    otherlv_15=(Token)match(input,24,FOLLOW_24_in_ruleXIssueExpression3327); if (state.failed) return current;
+                    otherlv_15=(Token)match(input,23,FOLLOW_23_in_ruleXIssueExpression3289); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_15, grammarAccess.getXIssueExpressionAccess().getLeftParenthesisKeyword_5_1());
                           
                     }
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1650:1: ( (lv_messageParameters_16_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1651:1: (lv_messageParameters_16_0= ruleXExpression )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1631:1: ( (lv_messageParameters_16_0= ruleXExpression ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1632:1: (lv_messageParameters_16_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1651:1: (lv_messageParameters_16_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1652:3: lv_messageParameters_16_0= ruleXExpression
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1632:1: (lv_messageParameters_16_0= ruleXExpression )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1633:3: lv_messageParameters_16_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXIssueExpressionAccess().getMessageParametersXExpressionParserRuleCall_5_2_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXIssueExpression3348);
+                    pushFollow(FOLLOW_ruleXExpression_in_ruleXIssueExpression3310);
                     lv_messageParameters_16_0=ruleXExpression();
 
                     state._fsp--;
@@ -4738,25 +4680,25 @@ else if ( ((LA32_0>=RULE_STRING && LA32_0<=RULE_ID)||(LA32_0>=15 && LA32_0<=19)|
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1668:2: ( ( ( ',' )=>otherlv_17= ',' ) ( (lv_messageParameters_18_0= ruleXExpression ) ) )*
-                    loop36:
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1649:2: ( ( ( ',' )=>otherlv_17= ',' ) ( (lv_messageParameters_18_0= ruleXExpression ) ) )*
+                    loop35:
                     do {
-                        int alt36=2;
-                        int LA36_0 = input.LA(1);
+                        int alt35=2;
+                        int LA35_0 = input.LA(1);
 
-                        if ( (LA36_0==25) && (synpred10_InternalCheck())) {
-                            alt36=1;
+                        if ( (LA35_0==24) && (synpred10_InternalCheck())) {
+                            alt35=1;
                         }
 
 
-                        switch (alt36) {
+                        switch (alt35) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1668:3: ( ( ',' )=>otherlv_17= ',' ) ( (lv_messageParameters_18_0= ruleXExpression ) )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1649:3: ( ( ',' )=>otherlv_17= ',' ) ( (lv_messageParameters_18_0= ruleXExpression ) )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1668:3: ( ( ',' )=>otherlv_17= ',' )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1668:4: ( ',' )=>otherlv_17= ','
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1649:3: ( ( ',' )=>otherlv_17= ',' )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1649:4: ( ',' )=>otherlv_17= ','
                     	    {
-                    	    otherlv_17=(Token)match(input,25,FOLLOW_25_in_ruleXIssueExpression3369); if (state.failed) return current;
+                    	    otherlv_17=(Token)match(input,24,FOLLOW_24_in_ruleXIssueExpression3331); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_17, grammarAccess.getXIssueExpressionAccess().getCommaKeyword_5_3_0());
@@ -4765,18 +4707,18 @@ else if ( ((LA32_0>=RULE_STRING && LA32_0<=RULE_ID)||(LA32_0>=15 && LA32_0<=19)|
 
                     	    }
 
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1673:2: ( (lv_messageParameters_18_0= ruleXExpression ) )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1674:1: (lv_messageParameters_18_0= ruleXExpression )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1654:2: ( (lv_messageParameters_18_0= ruleXExpression ) )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1655:1: (lv_messageParameters_18_0= ruleXExpression )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1674:1: (lv_messageParameters_18_0= ruleXExpression )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1675:3: lv_messageParameters_18_0= ruleXExpression
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1655:1: (lv_messageParameters_18_0= ruleXExpression )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1656:3: lv_messageParameters_18_0= ruleXExpression
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getXIssueExpressionAccess().getMessageParametersXExpressionParserRuleCall_5_3_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleXExpression_in_ruleXIssueExpression3391);
+                    	    pushFollow(FOLLOW_ruleXExpression_in_ruleXIssueExpression3353);
                     	    lv_messageParameters_18_0=ruleXExpression();
 
                     	    state._fsp--;
@@ -4805,11 +4747,11 @@ else if ( ((LA32_0>=RULE_STRING && LA32_0<=RULE_ID)||(LA32_0>=15 && LA32_0<=19)|
                     	    break;
 
                     	default :
-                    	    break loop36;
+                    	    break loop35;
                         }
                     } while (true);
 
-                    otherlv_19=(Token)match(input,26,FOLLOW_26_in_ruleXIssueExpression3405); if (state.failed) return current;
+                    otherlv_19=(Token)match(input,25,FOLLOW_25_in_ruleXIssueExpression3367); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_19, grammarAccess.getXIssueExpressionAccess().getRightParenthesisKeyword_5_4());
@@ -4821,25 +4763,25 @@ else if ( ((LA32_0>=RULE_STRING && LA32_0<=RULE_ID)||(LA32_0>=15 && LA32_0<=19)|
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1695:3: ( ( ( 'data' )=>otherlv_20= 'data' ) ( (lv_issueCode_21_0= ruleValidID ) )? otherlv_22= '(' ( (lv_issueData_23_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_24= ',' ) ( (lv_issueData_25_0= ruleXExpression ) ) )* otherlv_26= ')' )?
-            int alt40=2;
-            int LA40_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1676:3: ( ( ( 'data' )=>otherlv_20= 'data' ) ( (lv_issueCode_21_0= ruleValidID ) )? otherlv_22= '(' ( (lv_issueData_23_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_24= ',' ) ( (lv_issueData_25_0= ruleXExpression ) ) )* otherlv_26= ')' )?
+            int alt39=2;
+            int LA39_0 = input.LA(1);
 
-            if ( (LA40_0==40) ) {
-                int LA40_1 = input.LA(2);
+            if ( (LA39_0==39) ) {
+                int LA39_1 = input.LA(2);
 
                 if ( (synpred11_InternalCheck()) ) {
-                    alt40=1;
+                    alt39=1;
                 }
             }
-            switch (alt40) {
+            switch (alt39) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1695:4: ( ( 'data' )=>otherlv_20= 'data' ) ( (lv_issueCode_21_0= ruleValidID ) )? otherlv_22= '(' ( (lv_issueData_23_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_24= ',' ) ( (lv_issueData_25_0= ruleXExpression ) ) )* otherlv_26= ')'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1676:4: ( ( 'data' )=>otherlv_20= 'data' ) ( (lv_issueCode_21_0= ruleValidID ) )? otherlv_22= '(' ( (lv_issueData_23_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_24= ',' ) ( (lv_issueData_25_0= ruleXExpression ) ) )* otherlv_26= ')'
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1695:4: ( ( 'data' )=>otherlv_20= 'data' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1695:5: ( 'data' )=>otherlv_20= 'data'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1676:4: ( ( 'data' )=>otherlv_20= 'data' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1676:5: ( 'data' )=>otherlv_20= 'data'
                     {
-                    otherlv_20=(Token)match(input,40,FOLLOW_40_in_ruleXIssueExpression3428); if (state.failed) return current;
+                    otherlv_20=(Token)match(input,39,FOLLOW_39_in_ruleXIssueExpression3390); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_20, grammarAccess.getXIssueExpressionAccess().getDataKeyword_6_0());
@@ -4848,26 +4790,26 @@ else if ( ((LA32_0>=RULE_STRING && LA32_0<=RULE_ID)||(LA32_0>=15 && LA32_0<=19)|
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1700:2: ( (lv_issueCode_21_0= ruleValidID ) )?
-                    int alt38=2;
-                    int LA38_0 = input.LA(1);
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1681:2: ( (lv_issueCode_21_0= ruleValidID ) )?
+                    int alt37=2;
+                    int LA37_0 = input.LA(1);
 
-                    if ( (LA38_0==RULE_ID) ) {
-                        alt38=1;
+                    if ( (LA37_0==RULE_ID) ) {
+                        alt37=1;
                     }
-                    switch (alt38) {
+                    switch (alt37) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1701:1: (lv_issueCode_21_0= ruleValidID )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1682:1: (lv_issueCode_21_0= ruleValidID )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1701:1: (lv_issueCode_21_0= ruleValidID )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1702:3: lv_issueCode_21_0= ruleValidID
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1682:1: (lv_issueCode_21_0= ruleValidID )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1683:3: lv_issueCode_21_0= ruleValidID
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXIssueExpressionAccess().getIssueCodeValidIDParserRuleCall_6_1_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleValidID_in_ruleXIssueExpression3450);
+                            pushFollow(FOLLOW_ruleValidID_in_ruleXIssueExpression3412);
                             lv_issueCode_21_0=ruleValidID();
 
                             state._fsp--;
@@ -4894,24 +4836,24 @@ else if ( ((LA32_0>=RULE_STRING && LA32_0<=RULE_ID)||(LA32_0>=15 && LA32_0<=19)|
 
                     }
 
-                    otherlv_22=(Token)match(input,24,FOLLOW_24_in_ruleXIssueExpression3463); if (state.failed) return current;
+                    otherlv_22=(Token)match(input,23,FOLLOW_23_in_ruleXIssueExpression3425); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_22, grammarAccess.getXIssueExpressionAccess().getLeftParenthesisKeyword_6_2());
                           
                     }
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1722:1: ( (lv_issueData_23_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1723:1: (lv_issueData_23_0= ruleXExpression )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1703:1: ( (lv_issueData_23_0= ruleXExpression ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1704:1: (lv_issueData_23_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1723:1: (lv_issueData_23_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1724:3: lv_issueData_23_0= ruleXExpression
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1704:1: (lv_issueData_23_0= ruleXExpression )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1705:3: lv_issueData_23_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXIssueExpressionAccess().getIssueDataXExpressionParserRuleCall_6_3_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXIssueExpression3484);
+                    pushFollow(FOLLOW_ruleXExpression_in_ruleXIssueExpression3446);
                     lv_issueData_23_0=ruleXExpression();
 
                     state._fsp--;
@@ -4935,25 +4877,25 @@ else if ( ((LA32_0>=RULE_STRING && LA32_0<=RULE_ID)||(LA32_0>=15 && LA32_0<=19)|
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1740:2: ( ( ( ',' )=>otherlv_24= ',' ) ( (lv_issueData_25_0= ruleXExpression ) ) )*
-                    loop39:
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1721:2: ( ( ( ',' )=>otherlv_24= ',' ) ( (lv_issueData_25_0= ruleXExpression ) ) )*
+                    loop38:
                     do {
-                        int alt39=2;
-                        int LA39_0 = input.LA(1);
+                        int alt38=2;
+                        int LA38_0 = input.LA(1);
 
-                        if ( (LA39_0==25) && (synpred12_InternalCheck())) {
-                            alt39=1;
+                        if ( (LA38_0==24) && (synpred12_InternalCheck())) {
+                            alt38=1;
                         }
 
 
-                        switch (alt39) {
+                        switch (alt38) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1740:3: ( ( ',' )=>otherlv_24= ',' ) ( (lv_issueData_25_0= ruleXExpression ) )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1721:3: ( ( ',' )=>otherlv_24= ',' ) ( (lv_issueData_25_0= ruleXExpression ) )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1740:3: ( ( ',' )=>otherlv_24= ',' )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1740:4: ( ',' )=>otherlv_24= ','
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1721:3: ( ( ',' )=>otherlv_24= ',' )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1721:4: ( ',' )=>otherlv_24= ','
                     	    {
-                    	    otherlv_24=(Token)match(input,25,FOLLOW_25_in_ruleXIssueExpression3505); if (state.failed) return current;
+                    	    otherlv_24=(Token)match(input,24,FOLLOW_24_in_ruleXIssueExpression3467); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_24, grammarAccess.getXIssueExpressionAccess().getCommaKeyword_6_4_0());
@@ -4962,18 +4904,18 @@ else if ( ((LA32_0>=RULE_STRING && LA32_0<=RULE_ID)||(LA32_0>=15 && LA32_0<=19)|
 
                     	    }
 
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1745:2: ( (lv_issueData_25_0= ruleXExpression ) )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1746:1: (lv_issueData_25_0= ruleXExpression )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1726:2: ( (lv_issueData_25_0= ruleXExpression ) )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1727:1: (lv_issueData_25_0= ruleXExpression )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1746:1: (lv_issueData_25_0= ruleXExpression )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1747:3: lv_issueData_25_0= ruleXExpression
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1727:1: (lv_issueData_25_0= ruleXExpression )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1728:3: lv_issueData_25_0= ruleXExpression
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getXIssueExpressionAccess().getIssueDataXExpressionParserRuleCall_6_4_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleXExpression_in_ruleXIssueExpression3527);
+                    	    pushFollow(FOLLOW_ruleXExpression_in_ruleXIssueExpression3489);
                     	    lv_issueData_25_0=ruleXExpression();
 
                     	    state._fsp--;
@@ -5002,11 +4944,11 @@ else if ( ((LA32_0>=RULE_STRING && LA32_0<=RULE_ID)||(LA32_0>=15 && LA32_0<=19)|
                     	    break;
 
                     	default :
-                    	    break loop39;
+                    	    break loop38;
                         }
                     } while (true);
 
-                    otherlv_26=(Token)match(input,26,FOLLOW_26_in_ruleXIssueExpression3541); if (state.failed) return current;
+                    otherlv_26=(Token)match(input,25,FOLLOW_25_in_ruleXIssueExpression3503); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_26, grammarAccess.getXIssueExpressionAccess().getRightParenthesisKeyword_6_5());
@@ -5041,7 +4983,7 @@ else if ( ((LA32_0>=RULE_STRING && LA32_0<=RULE_ID)||(LA32_0>=15 && LA32_0<=19)|
 
 
     // $ANTLR start "entryRuleXPrimaryExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1775:1: entryRuleXPrimaryExpression returns [EObject current=null] : iv_ruleXPrimaryExpression= ruleXPrimaryExpression EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1756:1: entryRuleXPrimaryExpression returns [EObject current=null] : iv_ruleXPrimaryExpression= ruleXPrimaryExpression EOF ;
     public final EObject entryRuleXPrimaryExpression() throws RecognitionException {
         EObject current = null;
 
@@ -5049,13 +4991,13 @@ public final EObject entryRuleXPrimaryExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1776:2: (iv_ruleXPrimaryExpression= ruleXPrimaryExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1777:2: iv_ruleXPrimaryExpression= ruleXPrimaryExpression EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1757:2: (iv_ruleXPrimaryExpression= ruleXPrimaryExpression EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1758:2: iv_ruleXPrimaryExpression= ruleXPrimaryExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXPrimaryExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXPrimaryExpression_in_entryRuleXPrimaryExpression3579);
+            pushFollow(FOLLOW_ruleXPrimaryExpression_in_entryRuleXPrimaryExpression3541);
             iv_ruleXPrimaryExpression=ruleXPrimaryExpression();
 
             state._fsp--;
@@ -5063,7 +5005,7 @@ public final EObject entryRuleXPrimaryExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXPrimaryExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXPrimaryExpression3589); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXPrimaryExpression3551); if (state.failed) return current;
 
             }
 
@@ -5081,7 +5023,7 @@ public final EObject entryRuleXPrimaryExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXPrimaryExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1784:1: ruleXPrimaryExpression returns [EObject current=null] : (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression | this_XGuardExpression_15= ruleXGuardExpression | this_XIssueExpression_16= ruleXIssueExpression ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1765:1: ruleXPrimaryExpression returns [EObject current=null] : (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression | this_XGuardExpression_15= ruleXGuardExpression | this_XIssueExpression_16= ruleXIssueExpression ) ;
     public final EObject ruleXPrimaryExpression() throws RecognitionException {
         EObject current = null;
 
@@ -5123,22 +5065,22 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1787:28: ( (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression | this_XGuardExpression_15= ruleXGuardExpression | this_XIssueExpression_16= ruleXIssueExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1788:1: (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression | this_XGuardExpression_15= ruleXGuardExpression | this_XIssueExpression_16= ruleXIssueExpression )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1768:28: ( (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression | this_XGuardExpression_15= ruleXGuardExpression | this_XIssueExpression_16= ruleXIssueExpression ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1769:1: (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression | this_XGuardExpression_15= ruleXGuardExpression | this_XIssueExpression_16= ruleXIssueExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1788:1: (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression | this_XGuardExpression_15= ruleXGuardExpression | this_XIssueExpression_16= ruleXIssueExpression )
-            int alt41=17;
-            alt41 = dfa41.predict(input);
-            switch (alt41) {
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1769:1: (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression | this_XGuardExpression_15= ruleXGuardExpression | this_XIssueExpression_16= ruleXIssueExpression )
+            int alt40=17;
+            alt40 = dfa40.predict(input);
+            switch (alt40) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1789:5: this_XConstructorCall_0= ruleXConstructorCall
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1770:5: this_XConstructorCall_0= ruleXConstructorCall
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXConstructorCallParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXConstructorCall_in_ruleXPrimaryExpression3636);
+                    pushFollow(FOLLOW_ruleXConstructorCall_in_ruleXPrimaryExpression3598);
                     this_XConstructorCall_0=ruleXConstructorCall();
 
                     state._fsp--;
@@ -5153,14 +5095,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1799:5: this_XBlockExpression_1= ruleXBlockExpression
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1780:5: this_XBlockExpression_1= ruleXBlockExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXBlockExpressionParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXBlockExpression_in_ruleXPrimaryExpression3663);
+                    pushFollow(FOLLOW_ruleXBlockExpression_in_ruleXPrimaryExpression3625);
                     this_XBlockExpression_1=ruleXBlockExpression();
 
                     state._fsp--;
@@ -5175,14 +5117,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1809:5: this_XSwitchExpression_2= ruleXSwitchExpression
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1790:5: this_XSwitchExpression_2= ruleXSwitchExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXSwitchExpressionParserRuleCall_2()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXSwitchExpression_in_ruleXPrimaryExpression3690);
+                    pushFollow(FOLLOW_ruleXSwitchExpression_in_ruleXPrimaryExpression3652);
                     this_XSwitchExpression_2=ruleXSwitchExpression();
 
                     state._fsp--;
@@ -5197,17 +5139,17 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1818:6: ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1799:6: ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1818:6: ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1818:7: ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1799:6: ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1799:7: ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXSynchronizedExpressionParserRuleCall_3()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXSynchronizedExpression_in_ruleXPrimaryExpression3734);
+                    pushFollow(FOLLOW_ruleXSynchronizedExpression_in_ruleXPrimaryExpression3696);
                     this_XSynchronizedExpression_3=ruleXSynchronizedExpression();
 
                     state._fsp--;
@@ -5225,14 +5167,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1832:5: this_XFeatureCall_4= ruleXFeatureCall
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1813:5: this_XFeatureCall_4= ruleXFeatureCall
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXFeatureCallParserRuleCall_4()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXFeatureCall_in_ruleXPrimaryExpression3762);
+                    pushFollow(FOLLOW_ruleXFeatureCall_in_ruleXPrimaryExpression3724);
                     this_XFeatureCall_4=ruleXFeatureCall();
 
                     state._fsp--;
@@ -5247,14 +5189,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1842:5: this_XLiteral_5= ruleXLiteral
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1823:5: this_XLiteral_5= ruleXLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXLiteralParserRuleCall_5()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXLiteral_in_ruleXPrimaryExpression3789);
+                    pushFollow(FOLLOW_ruleXLiteral_in_ruleXPrimaryExpression3751);
                     this_XLiteral_5=ruleXLiteral();
 
                     state._fsp--;
@@ -5269,14 +5211,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1852:5: this_XIfExpression_6= ruleXIfExpression
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1833:5: this_XIfExpression_6= ruleXIfExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXIfExpressionParserRuleCall_6()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXIfExpression_in_ruleXPrimaryExpression3816);
+                    pushFollow(FOLLOW_ruleXIfExpression_in_ruleXPrimaryExpression3778);
                     this_XIfExpression_6=ruleXIfExpression();
 
                     state._fsp--;
@@ -5291,17 +5233,17 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 8 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1861:6: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1842:6: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1861:6: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1861:7: ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1842:6: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1842:7: ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXForLoopExpressionParserRuleCall_7()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXForLoopExpression_in_ruleXPrimaryExpression3873);
+                    pushFollow(FOLLOW_ruleXForLoopExpression_in_ruleXPrimaryExpression3835);
                     this_XForLoopExpression_7=ruleXForLoopExpression();
 
                     state._fsp--;
@@ -5319,14 +5261,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 9 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1880:5: this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1861:5: this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXBasicForLoopExpressionParserRuleCall_8()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXBasicForLoopExpression_in_ruleXPrimaryExpression3901);
+                    pushFollow(FOLLOW_ruleXBasicForLoopExpression_in_ruleXPrimaryExpression3863);
                     this_XBasicForLoopExpression_8=ruleXBasicForLoopExpression();
 
                     state._fsp--;
@@ -5341,14 +5283,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 10 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1890:5: this_XWhileExpression_9= ruleXWhileExpression
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1871:5: this_XWhileExpression_9= ruleXWhileExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXWhileExpressionParserRuleCall_9()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXWhileExpression_in_ruleXPrimaryExpression3928);
+                    pushFollow(FOLLOW_ruleXWhileExpression_in_ruleXPrimaryExpression3890);
                     this_XWhileExpression_9=ruleXWhileExpression();
 
                     state._fsp--;
@@ -5363,14 +5305,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 11 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1900:5: this_XDoWhileExpression_10= ruleXDoWhileExpression
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1881:5: this_XDoWhileExpression_10= ruleXDoWhileExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXDoWhileExpressionParserRuleCall_10()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXDoWhileExpression_in_ruleXPrimaryExpression3955);
+                    pushFollow(FOLLOW_ruleXDoWhileExpression_in_ruleXPrimaryExpression3917);
                     this_XDoWhileExpression_10=ruleXDoWhileExpression();
 
                     state._fsp--;
@@ -5385,14 +5327,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 12 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1910:5: this_XThrowExpression_11= ruleXThrowExpression
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1891:5: this_XThrowExpression_11= ruleXThrowExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXThrowExpressionParserRuleCall_11()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXThrowExpression_in_ruleXPrimaryExpression3982);
+                    pushFollow(FOLLOW_ruleXThrowExpression_in_ruleXPrimaryExpression3944);
                     this_XThrowExpression_11=ruleXThrowExpression();
 
                     state._fsp--;
@@ -5407,14 +5349,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 13 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1920:5: this_XReturnExpression_12= ruleXReturnExpression
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1901:5: this_XReturnExpression_12= ruleXReturnExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXReturnExpressionParserRuleCall_12()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXReturnExpression_in_ruleXPrimaryExpression4009);
+                    pushFollow(FOLLOW_ruleXReturnExpression_in_ruleXPrimaryExpression3971);
                     this_XReturnExpression_12=ruleXReturnExpression();
 
                     state._fsp--;
@@ -5429,14 +5371,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 14 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1930:5: this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1911:5: this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXTryCatchFinallyExpressionParserRuleCall_13()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXTryCatchFinallyExpression_in_ruleXPrimaryExpression4036);
+                    pushFollow(FOLLOW_ruleXTryCatchFinallyExpression_in_ruleXPrimaryExpression3998);
                     this_XTryCatchFinallyExpression_13=ruleXTryCatchFinallyExpression();
 
                     state._fsp--;
@@ -5451,14 +5393,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 15 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1940:5: this_XParenthesizedExpression_14= ruleXParenthesizedExpression
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1921:5: this_XParenthesizedExpression_14= ruleXParenthesizedExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXParenthesizedExpressionParserRuleCall_14()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXParenthesizedExpression_in_ruleXPrimaryExpression4063);
+                    pushFollow(FOLLOW_ruleXParenthesizedExpression_in_ruleXPrimaryExpression4025);
                     this_XParenthesizedExpression_14=ruleXParenthesizedExpression();
 
                     state._fsp--;
@@ -5473,14 +5415,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 16 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1950:5: this_XGuardExpression_15= ruleXGuardExpression
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1931:5: this_XGuardExpression_15= ruleXGuardExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXGuardExpressionParserRuleCall_15()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXGuardExpression_in_ruleXPrimaryExpression4090);
+                    pushFollow(FOLLOW_ruleXGuardExpression_in_ruleXPrimaryExpression4052);
                     this_XGuardExpression_15=ruleXGuardExpression();
 
                     state._fsp--;
@@ -5495,14 +5437,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 17 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1960:5: this_XIssueExpression_16= ruleXIssueExpression
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1941:5: this_XIssueExpression_16= ruleXIssueExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXIssueExpressionParserRuleCall_16()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXIssueExpression_in_ruleXPrimaryExpression4117);
+                    pushFollow(FOLLOW_ruleXIssueExpression_in_ruleXPrimaryExpression4079);
                     this_XIssueExpression_16=ruleXIssueExpression();
 
                     state._fsp--;
@@ -5539,7 +5481,7 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleFeatureCallID"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1976:1: entryRuleFeatureCallID returns [String current=null] : iv_ruleFeatureCallID= ruleFeatureCallID EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1957:1: entryRuleFeatureCallID returns [String current=null] : iv_ruleFeatureCallID= ruleFeatureCallID EOF ;
     public final String entryRuleFeatureCallID() throws RecognitionException {
         String current = null;
 
@@ -5547,13 +5489,13 @@ public final String entryRuleFeatureCallID() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1977:2: (iv_ruleFeatureCallID= ruleFeatureCallID EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1978:2: iv_ruleFeatureCallID= ruleFeatureCallID EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1958:2: (iv_ruleFeatureCallID= ruleFeatureCallID EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1959:2: iv_ruleFeatureCallID= ruleFeatureCallID EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getFeatureCallIDRule()); 
             }
-            pushFollow(FOLLOW_ruleFeatureCallID_in_entryRuleFeatureCallID4153);
+            pushFollow(FOLLOW_ruleFeatureCallID_in_entryRuleFeatureCallID4115);
             iv_ruleFeatureCallID=ruleFeatureCallID();
 
             state._fsp--;
@@ -5561,7 +5503,7 @@ public final String entryRuleFeatureCallID() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleFeatureCallID.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFeatureCallID4164); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleFeatureCallID4126); if (state.failed) return current;
 
             }
 
@@ -5579,7 +5521,7 @@ public final String entryRuleFeatureCallID() throws RecognitionException {
 
 
     // $ANTLR start "ruleFeatureCallID"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1985:1: ruleFeatureCallID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' | kw= 'catalog' | kw= 'grammar' | kw= 'with' | kw= 'category' | kw= 'message' | kw= 'on' | kw= 'bind' | kw= 'data' | kw= 'SeverityRange' | kw= 'error' | kw= 'warning' | kw= 'info' | kw= 'ignore' | kw= 'live' | kw= 'onSave' | kw= 'onDemand' ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1966:1: ruleFeatureCallID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' | kw= 'catalog' | kw= 'grammar' | kw= 'with' | kw= 'category' | kw= 'message' | kw= 'on' | kw= 'bind' | kw= 'data' | kw= 'SeverityRange' | kw= 'error' | kw= 'warning' | kw= 'info' | kw= 'ignore' | kw= 'live' | kw= 'onSave' | kw= 'onDemand' ) ;
     public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -5590,135 +5532,135 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1988:28: ( (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' | kw= 'catalog' | kw= 'grammar' | kw= 'with' | kw= 'category' | kw= 'message' | kw= 'on' | kw= 'bind' | kw= 'data' | kw= 'SeverityRange' | kw= 'error' | kw= 'warning' | kw= 'info' | kw= 'ignore' | kw= 'live' | kw= 'onSave' | kw= 'onDemand' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1989:1: (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' | kw= 'catalog' | kw= 'grammar' | kw= 'with' | kw= 'category' | kw= 'message' | kw= 'on' | kw= 'bind' | kw= 'data' | kw= 'SeverityRange' | kw= 'error' | kw= 'warning' | kw= 'info' | kw= 'ignore' | kw= 'live' | kw= 'onSave' | kw= 'onDemand' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1969:28: ( (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' | kw= 'catalog' | kw= 'grammar' | kw= 'with' | kw= 'category' | kw= 'message' | kw= 'on' | kw= 'bind' | kw= 'data' | kw= 'SeverityRange' | kw= 'error' | kw= 'warning' | kw= 'info' | kw= 'ignore' | kw= 'live' | kw= 'onSave' | kw= 'onDemand' ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1970:1: (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' | kw= 'catalog' | kw= 'grammar' | kw= 'with' | kw= 'category' | kw= 'message' | kw= 'on' | kw= 'bind' | kw= 'data' | kw= 'SeverityRange' | kw= 'error' | kw= 'warning' | kw= 'info' | kw= 'ignore' | kw= 'live' | kw= 'onSave' | kw= 'onDemand' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1989:1: (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' | kw= 'catalog' | kw= 'grammar' | kw= 'with' | kw= 'category' | kw= 'message' | kw= 'on' | kw= 'bind' | kw= 'data' | kw= 'SeverityRange' | kw= 'error' | kw= 'warning' | kw= 'info' | kw= 'ignore' | kw= 'live' | kw= 'onSave' | kw= 'onDemand' )
-            int alt42=21;
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1970:1: (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' | kw= 'catalog' | kw= 'grammar' | kw= 'with' | kw= 'category' | kw= 'message' | kw= 'on' | kw= 'bind' | kw= 'data' | kw= 'SeverityRange' | kw= 'error' | kw= 'warning' | kw= 'info' | kw= 'ignore' | kw= 'live' | kw= 'onSave' | kw= 'onDemand' )
+            int alt41=21;
             switch ( input.LA(1) ) {
             case RULE_ID:
                 {
-                alt42=1;
+                alt41=1;
                 }
                 break;
-            case 41:
+            case 40:
                 {
-                alt42=2;
+                alt41=2;
                 }
                 break;
-            case 42:
+            case 41:
                 {
-                alt42=3;
+                alt41=3;
                 }
                 break;
-            case 21:
+            case 20:
                 {
-                alt42=4;
+                alt41=4;
                 }
                 break;
-            case 43:
+            case 42:
                 {
-                alt42=5;
+                alt41=5;
                 }
                 break;
             case 15:
                 {
-                alt42=6;
+                alt41=6;
                 }
                 break;
             case 17:
                 {
-                alt42=7;
+                alt41=7;
                 }
                 break;
-            case 18:
+            case 43:
                 {
-                alt42=8;
+                alt41=8;
                 }
                 break;
-            case 23:
+            case 22:
                 {
-                alt42=9;
+                alt41=9;
                 }
                 break;
-            case 27:
+            case 26:
                 {
-                alt42=10;
+                alt41=10;
                 }
                 break;
-            case 38:
+            case 37:
                 {
-                alt42=11;
+                alt41=11;
                 }
                 break;
-            case 39:
+            case 38:
                 {
-                alt42=12;
+                alt41=12;
                 }
                 break;
-            case 40:
+            case 39:
                 {
-                alt42=13;
+                alt41=13;
                 }
                 break;
-            case 29:
+            case 28:
                 {
-                alt42=14;
+                alt41=14;
                 }
                 break;
             case 44:
                 {
-                alt42=15;
+                alt41=15;
                 }
                 break;
             case 45:
                 {
-                alt42=16;
+                alt41=16;
                 }
                 break;
             case 46:
                 {
-                alt42=17;
+                alt41=17;
                 }
                 break;
             case 47:
                 {
-                alt42=18;
+                alt41=18;
                 }
                 break;
             case 48:
                 {
-                alt42=19;
+                alt41=19;
                 }
                 break;
             case 49:
                 {
-                alt42=20;
+                alt41=20;
                 }
                 break;
             case 50:
                 {
-                alt42=21;
+                alt41=21;
                 }
                 break;
             default:
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 42, 0, input);
+                    new NoViableAltException("", 41, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt42) {
+            switch (alt41) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1990:5: this_ValidID_0= ruleValidID
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1971:5: this_ValidID_0= ruleValidID
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getFeatureCallIDAccess().getValidIDParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleValidID_in_ruleFeatureCallID4211);
+                    pushFollow(FOLLOW_ruleValidID_in_ruleFeatureCallID4173);
                     this_ValidID_0=ruleValidID();
 
                     state._fsp--;
@@ -5737,9 +5679,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2002:2: kw= 'extends'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1983:2: kw= 'extends'
                     {
-                    kw=(Token)match(input,41,FOLLOW_41_in_ruleFeatureCallID4235); if (state.failed) return current;
+                    kw=(Token)match(input,40,FOLLOW_40_in_ruleFeatureCallID4197); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5750,9 +5692,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2009:2: kw= 'static'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1990:2: kw= 'static'
                     {
-                    kw=(Token)match(input,42,FOLLOW_42_in_ruleFeatureCallID4254); if (state.failed) return current;
+                    kw=(Token)match(input,41,FOLLOW_41_in_ruleFeatureCallID4216); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5763,9 +5705,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2016:2: kw= 'import'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1997:2: kw= 'import'
                     {
-                    kw=(Token)match(input,21,FOLLOW_21_in_ruleFeatureCallID4273); if (state.failed) return current;
+                    kw=(Token)match(input,20,FOLLOW_20_in_ruleFeatureCallID4235); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5776,9 +5718,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2023:2: kw= 'extension'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2004:2: kw= 'extension'
                     {
-                    kw=(Token)match(input,43,FOLLOW_43_in_ruleFeatureCallID4292); if (state.failed) return current;
+                    kw=(Token)match(input,42,FOLLOW_42_in_ruleFeatureCallID4254); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5789,9 +5731,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2030:2: kw= 'catalog'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2011:2: kw= 'catalog'
                     {
-                    kw=(Token)match(input,15,FOLLOW_15_in_ruleFeatureCallID4311); if (state.failed) return current;
+                    kw=(Token)match(input,15,FOLLOW_15_in_ruleFeatureCallID4273); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5802,9 +5744,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2037:2: kw= 'grammar'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2018:2: kw= 'grammar'
                     {
-                    kw=(Token)match(input,17,FOLLOW_17_in_ruleFeatureCallID4330); if (state.failed) return current;
+                    kw=(Token)match(input,17,FOLLOW_17_in_ruleFeatureCallID4292); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5815,9 +5757,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 8 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2044:2: kw= 'with'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2025:2: kw= 'with'
                     {
-                    kw=(Token)match(input,18,FOLLOW_18_in_ruleFeatureCallID4349); if (state.failed) return current;
+                    kw=(Token)match(input,43,FOLLOW_43_in_ruleFeatureCallID4311); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5828,9 +5770,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 9 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2051:2: kw= 'category'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2032:2: kw= 'category'
                     {
-                    kw=(Token)match(input,23,FOLLOW_23_in_ruleFeatureCallID4368); if (state.failed) return current;
+                    kw=(Token)match(input,22,FOLLOW_22_in_ruleFeatureCallID4330); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5841,9 +5783,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 10 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2058:2: kw= 'message'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2039:2: kw= 'message'
                     {
-                    kw=(Token)match(input,27,FOLLOW_27_in_ruleFeatureCallID4387); if (state.failed) return current;
+                    kw=(Token)match(input,26,FOLLOW_26_in_ruleFeatureCallID4349); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5854,9 +5796,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 11 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2065:2: kw= 'on'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2046:2: kw= 'on'
                     {
-                    kw=(Token)match(input,38,FOLLOW_38_in_ruleFeatureCallID4406); if (state.failed) return current;
+                    kw=(Token)match(input,37,FOLLOW_37_in_ruleFeatureCallID4368); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5867,9 +5809,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 12 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2072:2: kw= 'bind'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2053:2: kw= 'bind'
                     {
-                    kw=(Token)match(input,39,FOLLOW_39_in_ruleFeatureCallID4425); if (state.failed) return current;
+                    kw=(Token)match(input,38,FOLLOW_38_in_ruleFeatureCallID4387); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5880,9 +5822,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 13 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2079:2: kw= 'data'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2060:2: kw= 'data'
                     {
-                    kw=(Token)match(input,40,FOLLOW_40_in_ruleFeatureCallID4444); if (state.failed) return current;
+                    kw=(Token)match(input,39,FOLLOW_39_in_ruleFeatureCallID4406); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5893,9 +5835,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 14 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2086:2: kw= 'SeverityRange'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2067:2: kw= 'SeverityRange'
                     {
-                    kw=(Token)match(input,29,FOLLOW_29_in_ruleFeatureCallID4463); if (state.failed) return current;
+                    kw=(Token)match(input,28,FOLLOW_28_in_ruleFeatureCallID4425); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5906,9 +5848,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 15 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2093:2: kw= 'error'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2074:2: kw= 'error'
                     {
-                    kw=(Token)match(input,44,FOLLOW_44_in_ruleFeatureCallID4482); if (state.failed) return current;
+                    kw=(Token)match(input,44,FOLLOW_44_in_ruleFeatureCallID4444); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5919,9 +5861,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 16 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2100:2: kw= 'warning'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2081:2: kw= 'warning'
                     {
-                    kw=(Token)match(input,45,FOLLOW_45_in_ruleFeatureCallID4501); if (state.failed) return current;
+                    kw=(Token)match(input,45,FOLLOW_45_in_ruleFeatureCallID4463); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5932,9 +5874,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 17 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2107:2: kw= 'info'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2088:2: kw= 'info'
                     {
-                    kw=(Token)match(input,46,FOLLOW_46_in_ruleFeatureCallID4520); if (state.failed) return current;
+                    kw=(Token)match(input,46,FOLLOW_46_in_ruleFeatureCallID4482); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5945,9 +5887,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 18 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2114:2: kw= 'ignore'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2095:2: kw= 'ignore'
                     {
-                    kw=(Token)match(input,47,FOLLOW_47_in_ruleFeatureCallID4539); if (state.failed) return current;
+                    kw=(Token)match(input,47,FOLLOW_47_in_ruleFeatureCallID4501); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5958,9 +5900,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 19 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2121:2: kw= 'live'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2102:2: kw= 'live'
                     {
-                    kw=(Token)match(input,48,FOLLOW_48_in_ruleFeatureCallID4558); if (state.failed) return current;
+                    kw=(Token)match(input,48,FOLLOW_48_in_ruleFeatureCallID4520); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5971,9 +5913,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 20 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2128:2: kw= 'onSave'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2109:2: kw= 'onSave'
                     {
-                    kw=(Token)match(input,49,FOLLOW_49_in_ruleFeatureCallID4577); if (state.failed) return current;
+                    kw=(Token)match(input,49,FOLLOW_49_in_ruleFeatureCallID4539); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5984,9 +5926,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 21 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2135:2: kw= 'onDemand'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2116:2: kw= 'onDemand'
                     {
-                    kw=(Token)match(input,50,FOLLOW_50_in_ruleFeatureCallID4596); if (state.failed) return current;
+                    kw=(Token)match(input,50,FOLLOW_50_in_ruleFeatureCallID4558); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -6019,7 +5961,7 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
 
 
     // $ANTLR start "entryRuleXAnnotation"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2148:1: entryRuleXAnnotation returns [EObject current=null] : iv_ruleXAnnotation= ruleXAnnotation EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2129:1: entryRuleXAnnotation returns [EObject current=null] : iv_ruleXAnnotation= ruleXAnnotation EOF ;
     public final EObject entryRuleXAnnotation() throws RecognitionException {
         EObject current = null;
 
@@ -6027,13 +5969,13 @@ public final EObject entryRuleXAnnotation() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2149:2: (iv_ruleXAnnotation= ruleXAnnotation EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2150:2: iv_ruleXAnnotation= ruleXAnnotation EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2130:2: (iv_ruleXAnnotation= ruleXAnnotation EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2131:2: iv_ruleXAnnotation= ruleXAnnotation EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAnnotationRule()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotation_in_entryRuleXAnnotation4636);
+            pushFollow(FOLLOW_ruleXAnnotation_in_entryRuleXAnnotation4598);
             iv_ruleXAnnotation=ruleXAnnotation();
 
             state._fsp--;
@@ -6041,7 +5983,7 @@ public final EObject entryRuleXAnnotation() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXAnnotation; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAnnotation4646); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXAnnotation4608); if (state.failed) return current;
 
             }
 
@@ -6059,7 +6001,7 @@ public final EObject entryRuleXAnnotation() throws RecognitionException {
 
 
     // $ANTLR start "ruleXAnnotation"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2157:1: ruleXAnnotation returns [EObject current=null] : ( () otherlv_1= '@' ( ( ruleQualifiedName ) ) ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )? ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2138:1: ruleXAnnotation returns [EObject current=null] : ( () otherlv_1= '@' ( ( ruleQualifiedName ) ) ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )? ) ;
     public final EObject ruleXAnnotation() throws RecognitionException {
         EObject current = null;
 
@@ -6077,14 +6019,14 @@ public final EObject ruleXAnnotation() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2160:28: ( ( () otherlv_1= '@' ( ( ruleQualifiedName ) ) ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )? ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2161:1: ( () otherlv_1= '@' ( ( ruleQualifiedName ) ) ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )? )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2141:28: ( ( () otherlv_1= '@' ( ( ruleQualifiedName ) ) ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )? ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2142:1: ( () otherlv_1= '@' ( ( ruleQualifiedName ) ) ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )? )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2161:1: ( () otherlv_1= '@' ( ( ruleQualifiedName ) ) ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )? )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2161:2: () otherlv_1= '@' ( ( ruleQualifiedName ) ) ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )?
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2142:1: ( () otherlv_1= '@' ( ( ruleQualifiedName ) ) ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )? )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2142:2: () otherlv_1= '@' ( ( ruleQualifiedName ) ) ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )?
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2161:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2162:5: 
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2142:2: ()
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2143:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -6096,17 +6038,17 @@ public final EObject ruleXAnnotation() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,28,FOLLOW_28_in_ruleXAnnotation4692); if (state.failed) return current;
+            otherlv_1=(Token)match(input,27,FOLLOW_27_in_ruleXAnnotation4654); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXAnnotationAccess().getCommercialAtKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2171:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2172:1: ( ruleQualifiedName )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2152:1: ( ( ruleQualifiedName ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2153:1: ( ruleQualifiedName )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2172:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2173:3: ruleQualifiedName
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2153:1: ( ruleQualifiedName )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2154:3: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
 
@@ -6120,7 +6062,7 @@ public final EObject ruleXAnnotation() throws RecognitionException {
               	        newCompositeNode(grammarAccess.getXAnnotationAccess().getAnnotationTypeJvmAnnotationTypeCrossReference_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_ruleXAnnotation4715);
+            pushFollow(FOLLOW_ruleQualifiedName_in_ruleXAnnotation4677);
             ruleQualifiedName();
 
             state._fsp--;
@@ -6136,17 +6078,17 @@ public final EObject ruleXAnnotation() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2186:2: ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )?
-            int alt45=2;
-            alt45 = dfa45.predict(input);
-            switch (alt45) {
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2167:2: ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )?
+            int alt44=2;
+            alt44 = dfa44.predict(input);
+            switch (alt44) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2186:3: ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2167:3: ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')'
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2186:3: ( ( '(' )=>otherlv_3= '(' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2186:4: ( '(' )=>otherlv_3= '('
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2167:3: ( ( '(' )=>otherlv_3= '(' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2167:4: ( '(' )=>otherlv_3= '('
                     {
-                    otherlv_3=(Token)match(input,24,FOLLOW_24_in_ruleXAnnotation4736); if (state.failed) return current;
+                    otherlv_3=(Token)match(input,23,FOLLOW_23_in_ruleXAnnotation4698); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_3, grammarAccess.getXAnnotationAccess().getLeftParenthesisKeyword_3_0());
@@ -6155,28 +6097,28 @@ public final EObject ruleXAnnotation() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2191:2: ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )?
-                    int alt44=3;
-                    alt44 = dfa44.predict(input);
-                    switch (alt44) {
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2172:2: ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )?
+                    int alt43=3;
+                    alt43 = dfa43.predict(input);
+                    switch (alt43) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2191:3: ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2172:3: ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2191:3: ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2191:4: ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )*
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2172:3: ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2172:4: ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )*
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2191:4: ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2191:5: ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2172:4: ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2172:5: ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2197:1: (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2198:3: lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2178:1: (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2179:3: lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXAnnotationAccess().getElementValuePairsXAnnotationElementValuePairParserRuleCall_3_1_0_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleXAnnotationElementValuePair_in_ruleXAnnotation4780);
+                            pushFollow(FOLLOW_ruleXAnnotationElementValuePair_in_ruleXAnnotation4742);
                             lv_elementValuePairs_4_0=ruleXAnnotationElementValuePair();
 
                             state._fsp--;
@@ -6200,39 +6142,39 @@ public final EObject ruleXAnnotation() throws RecognitionException {
 
                             }
 
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2214:2: (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )*
-                            loop43:
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2195:2: (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )*
+                            loop42:
                             do {
-                                int alt43=2;
-                                int LA43_0 = input.LA(1);
+                                int alt42=2;
+                                int LA42_0 = input.LA(1);
 
-                                if ( (LA43_0==25) ) {
-                                    alt43=1;
+                                if ( (LA42_0==24) ) {
+                                    alt42=1;
                                 }
 
 
-                                switch (alt43) {
+                                switch (alt42) {
                             	case 1 :
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2214:4: otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) )
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2195:4: otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) )
                             	    {
-                            	    otherlv_5=(Token)match(input,25,FOLLOW_25_in_ruleXAnnotation4793); if (state.failed) return current;
+                            	    otherlv_5=(Token)match(input,24,FOLLOW_24_in_ruleXAnnotation4755); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	          	newLeafNode(otherlv_5, grammarAccess.getXAnnotationAccess().getCommaKeyword_3_1_0_1_0());
                             	          
                             	    }
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2218:1: ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) )
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2218:2: ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair )
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2199:1: ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) )
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2199:2: ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair )
                             	    {
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2224:1: (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair )
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2225:3: lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2205:1: (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair )
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2206:3: lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair
                             	    {
                             	    if ( state.backtracking==0 ) {
                             	       
                             	      	        newCompositeNode(grammarAccess.getXAnnotationAccess().getElementValuePairsXAnnotationElementValuePairParserRuleCall_3_1_0_1_1_0()); 
                             	      	    
                             	    }
-                            	    pushFollow(FOLLOW_ruleXAnnotationElementValuePair_in_ruleXAnnotation4834);
+                            	    pushFollow(FOLLOW_ruleXAnnotationElementValuePair_in_ruleXAnnotation4796);
                             	    lv_elementValuePairs_6_0=ruleXAnnotationElementValuePair();
 
                             	    state._fsp--;
@@ -6261,7 +6203,7 @@ public final EObject ruleXAnnotation() throws RecognitionException {
                             	    break;
 
                             	default :
-                            	    break loop43;
+                            	    break loop42;
                                 }
                             } while (true);
 
@@ -6272,20 +6214,20 @@ public final EObject ruleXAnnotation() throws RecognitionException {
                             }
                             break;
                         case 2 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2242:6: ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2223:6: ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2242:6: ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2243:1: (lv_value_7_0= ruleXAnnotationElementValueOrCommaList )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2223:6: ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2224:1: (lv_value_7_0= ruleXAnnotationElementValueOrCommaList )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2243:1: (lv_value_7_0= ruleXAnnotationElementValueOrCommaList )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2244:3: lv_value_7_0= ruleXAnnotationElementValueOrCommaList
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2224:1: (lv_value_7_0= ruleXAnnotationElementValueOrCommaList )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2225:3: lv_value_7_0= ruleXAnnotationElementValueOrCommaList
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXAnnotationAccess().getValueXAnnotationElementValueOrCommaListParserRuleCall_3_1_1_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleXAnnotationElementValueOrCommaList_in_ruleXAnnotation4864);
+                            pushFollow(FOLLOW_ruleXAnnotationElementValueOrCommaList_in_ruleXAnnotation4826);
                             lv_value_7_0=ruleXAnnotationElementValueOrCommaList();
 
                             state._fsp--;
@@ -6315,7 +6257,7 @@ public final EObject ruleXAnnotation() throws RecognitionException {
 
                     }
 
-                    otherlv_8=(Token)match(input,26,FOLLOW_26_in_ruleXAnnotation4878); if (state.failed) return current;
+                    otherlv_8=(Token)match(input,25,FOLLOW_25_in_ruleXAnnotation4840); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_8, grammarAccess.getXAnnotationAccess().getRightParenthesisKeyword_3_2());
@@ -6350,7 +6292,7 @@ public final EObject ruleXAnnotation() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXAnnotationElementValuePair"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2272:1: entryRuleXAnnotationElementValuePair returns [EObject current=null] : iv_ruleXAnnotationElementValuePair= ruleXAnnotationElementValuePair EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2253:1: entryRuleXAnnotationElementValuePair returns [EObject current=null] : iv_ruleXAnnotationElementValuePair= ruleXAnnotationElementValuePair EOF ;
     public final EObject entryRuleXAnnotationElementValuePair() throws RecognitionException {
         EObject current = null;
 
@@ -6358,13 +6300,13 @@ public final EObject entryRuleXAnnotationElementValuePair() throws RecognitionEx
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2273:2: (iv_ruleXAnnotationElementValuePair= ruleXAnnotationElementValuePair EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2274:2: iv_ruleXAnnotationElementValuePair= ruleXAnnotationElementValuePair EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2254:2: (iv_ruleXAnnotationElementValuePair= ruleXAnnotationElementValuePair EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2255:2: iv_ruleXAnnotationElementValuePair= ruleXAnnotationElementValuePair EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAnnotationElementValuePairRule()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationElementValuePair_in_entryRuleXAnnotationElementValuePair4916);
+            pushFollow(FOLLOW_ruleXAnnotationElementValuePair_in_entryRuleXAnnotationElementValuePair4878);
             iv_ruleXAnnotationElementValuePair=ruleXAnnotationElementValuePair();
 
             state._fsp--;
@@ -6372,7 +6314,7 @@ public final EObject entryRuleXAnnotationElementValuePair() throws RecognitionEx
             if ( state.backtracking==0 ) {
                current =iv_ruleXAnnotationElementValuePair; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAnnotationElementValuePair4926); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXAnnotationElementValuePair4888); if (state.failed) return current;
 
             }
 
@@ -6390,7 +6332,7 @@ public final EObject entryRuleXAnnotationElementValuePair() throws RecognitionEx
 
 
     // $ANTLR start "ruleXAnnotationElementValuePair"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2281:1: ruleXAnnotationElementValuePair returns [EObject current=null] : ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) ) ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2262:1: ruleXAnnotationElementValuePair returns [EObject current=null] : ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) ) ) ;
     public final EObject ruleXAnnotationElementValuePair() throws RecognitionException {
         EObject current = null;
 
@@ -6401,23 +6343,23 @@ public final EObject ruleXAnnotationElementValuePair() throws RecognitionExcepti
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2284:28: ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2285:1: ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2265:28: ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2266:1: ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2285:1: ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2285:2: ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2266:1: ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2266:2: ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2285:2: ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2285:3: ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2266:2: ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2266:3: ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2290:5: ( ( ( ruleValidID ) ) otherlv_1= '=' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2290:6: ( ( ruleValidID ) ) otherlv_1= '='
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2271:5: ( ( ( ruleValidID ) ) otherlv_1= '=' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2271:6: ( ( ruleValidID ) ) otherlv_1= '='
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2290:6: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2291:1: ( ruleValidID )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2271:6: ( ( ruleValidID ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2272:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2291:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2292:3: ruleValidID
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2272:1: ( ruleValidID )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2273:3: ruleValidID
             {
             if ( state.backtracking==0 ) {
 
@@ -6431,7 +6373,7 @@ public final EObject ruleXAnnotationElementValuePair() throws RecognitionExcepti
               	        newCompositeNode(grammarAccess.getXAnnotationElementValuePairAccess().getElementJvmOperationCrossReference_0_0_0_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleValidID_in_ruleXAnnotationElementValuePair4996);
+            pushFollow(FOLLOW_ruleValidID_in_ruleXAnnotationElementValuePair4958);
             ruleValidID();
 
             state._fsp--;
@@ -6447,7 +6389,7 @@ public final EObject ruleXAnnotationElementValuePair() throws RecognitionExcepti
 
             }
 
-            otherlv_1=(Token)match(input,32,FOLLOW_32_in_ruleXAnnotationElementValuePair5008); if (state.failed) return current;
+            otherlv_1=(Token)match(input,31,FOLLOW_31_in_ruleXAnnotationElementValuePair4970); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXAnnotationElementValuePairAccess().getEqualsSignKeyword_0_0_1());
@@ -6459,18 +6401,18 @@ public final EObject ruleXAnnotationElementValuePair() throws RecognitionExcepti
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2309:3: ( (lv_value_2_0= ruleXAnnotationElementValue ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2310:1: (lv_value_2_0= ruleXAnnotationElementValue )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2290:3: ( (lv_value_2_0= ruleXAnnotationElementValue ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2291:1: (lv_value_2_0= ruleXAnnotationElementValue )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2310:1: (lv_value_2_0= ruleXAnnotationElementValue )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2311:3: lv_value_2_0= ruleXAnnotationElementValue
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2291:1: (lv_value_2_0= ruleXAnnotationElementValue )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2292:3: lv_value_2_0= ruleXAnnotationElementValue
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXAnnotationElementValuePairAccess().getValueXAnnotationElementValueParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXAnnotationElementValue_in_ruleXAnnotationElementValuePair5031);
+            pushFollow(FOLLOW_ruleXAnnotationElementValue_in_ruleXAnnotationElementValuePair4993);
             lv_value_2_0=ruleXAnnotationElementValue();
 
             state._fsp--;
@@ -6517,7 +6459,7 @@ public final EObject ruleXAnnotationElementValuePair() throws RecognitionExcepti
 
 
     // $ANTLR start "entryRuleXAnnotationElementValueOrCommaList"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2335:1: entryRuleXAnnotationElementValueOrCommaList returns [EObject current=null] : iv_ruleXAnnotationElementValueOrCommaList= ruleXAnnotationElementValueOrCommaList EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2316:1: entryRuleXAnnotationElementValueOrCommaList returns [EObject current=null] : iv_ruleXAnnotationElementValueOrCommaList= ruleXAnnotationElementValueOrCommaList EOF ;
     public final EObject entryRuleXAnnotationElementValueOrCommaList() throws RecognitionException {
         EObject current = null;
 
@@ -6525,13 +6467,13 @@ public final EObject entryRuleXAnnotationElementValueOrCommaList() throws Recogn
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2336:2: (iv_ruleXAnnotationElementValueOrCommaList= ruleXAnnotationElementValueOrCommaList EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2337:2: iv_ruleXAnnotationElementValueOrCommaList= ruleXAnnotationElementValueOrCommaList EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2317:2: (iv_ruleXAnnotationElementValueOrCommaList= ruleXAnnotationElementValueOrCommaList EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2318:2: iv_ruleXAnnotationElementValueOrCommaList= ruleXAnnotationElementValueOrCommaList EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAnnotationElementValueOrCommaListRule()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationElementValueOrCommaList_in_entryRuleXAnnotationElementValueOrCommaList5067);
+            pushFollow(FOLLOW_ruleXAnnotationElementValueOrCommaList_in_entryRuleXAnnotationElementValueOrCommaList5029);
             iv_ruleXAnnotationElementValueOrCommaList=ruleXAnnotationElementValueOrCommaList();
 
             state._fsp--;
@@ -6539,7 +6481,7 @@ public final EObject entryRuleXAnnotationElementValueOrCommaList() throws Recogn
             if ( state.backtracking==0 ) {
                current =iv_ruleXAnnotationElementValueOrCommaList; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAnnotationElementValueOrCommaList5077); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXAnnotationElementValueOrCommaList5039); if (state.failed) return current;
 
             }
 
@@ -6557,7 +6499,7 @@ public final EObject entryRuleXAnnotationElementValueOrCommaList() throws Recogn
 
 
     // $ANTLR start "ruleXAnnotationElementValueOrCommaList"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2344:1: ruleXAnnotationElementValueOrCommaList returns [EObject current=null] : ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? ) ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2325:1: ruleXAnnotationElementValueOrCommaList returns [EObject current=null] : ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? ) ) ;
     public final EObject ruleXAnnotationElementValueOrCommaList() throws RecognitionException {
         EObject current = null;
 
@@ -6578,27 +6520,27 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2347:28: ( ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2348:1: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2328:28: ( ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2329:1: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2348:1: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? ) )
-            int alt50=2;
-            alt50 = dfa50.predict(input);
-            switch (alt50) {
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2329:1: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? ) )
+            int alt49=2;
+            alt49 = dfa49.predict(input);
+            switch (alt49) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2348:2: ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2329:2: ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2348:2: ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2348:3: ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2329:2: ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2329:3: ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']'
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2348:3: ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2348:4: ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2329:3: ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2329:4: ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2351:5: ( () otherlv_1= '#' otherlv_2= '[' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2351:6: () otherlv_1= '#' otherlv_2= '['
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2332:5: ( () otherlv_1= '#' otherlv_2= '[' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2332:6: () otherlv_1= '#' otherlv_2= '['
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2351:6: ()
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2352:5: 
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2332:6: ()
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2333:5: 
                     {
                     if ( state.backtracking==0 ) {
 
@@ -6610,13 +6552,13 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
 
                     }
 
-                    otherlv_1=(Token)match(input,33,FOLLOW_33_in_ruleXAnnotationElementValueOrCommaList5142); if (state.failed) return current;
+                    otherlv_1=(Token)match(input,32,FOLLOW_32_in_ruleXAnnotationElementValueOrCommaList5104); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_1, grammarAccess.getXAnnotationElementValueOrCommaListAccess().getNumberSignKeyword_0_0_0_1());
                           
                     }
-                    otherlv_2=(Token)match(input,34,FOLLOW_34_in_ruleXAnnotationElementValueOrCommaList5154); if (state.failed) return current;
+                    otherlv_2=(Token)match(input,33,FOLLOW_33_in_ruleXAnnotationElementValueOrCommaList5116); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_2, grammarAccess.getXAnnotationElementValueOrCommaListAccess().getLeftSquareBracketKeyword_0_0_0_2());
@@ -6628,29 +6570,29 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2365:3: ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )?
-                    int alt47=2;
-                    int LA47_0 = input.LA(1);
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2346:3: ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )?
+                    int alt46=2;
+                    int LA46_0 = input.LA(1);
 
-                    if ( ((LA47_0>=RULE_STRING && LA47_0<=RULE_ID)||(LA47_0>=15 && LA47_0<=19)||LA47_0==21||(LA47_0>=23 && LA47_0<=24)||(LA47_0>=27 && LA47_0<=29)||(LA47_0>=33 && LA47_0<=34)||(LA47_0>=36 && LA47_0<=50)||LA47_0==56||(LA47_0>=71 && LA47_0<=72)||LA47_0==77||LA47_0==85||LA47_0==87||(LA47_0>=91 && LA47_0<=92)||(LA47_0>=95 && LA47_0<=103)||LA47_0==105) ) {
-                        alt47=1;
+                    if ( ((LA46_0>=RULE_STRING && LA46_0<=RULE_ID)||(LA46_0>=15 && LA46_0<=18)||LA46_0==20||(LA46_0>=22 && LA46_0<=23)||(LA46_0>=26 && LA46_0<=28)||(LA46_0>=32 && LA46_0<=33)||(LA46_0>=35 && LA46_0<=50)||LA46_0==56||(LA46_0>=71 && LA46_0<=72)||LA46_0==77||LA46_0==85||LA46_0==87||(LA46_0>=91 && LA46_0<=92)||(LA46_0>=95 && LA46_0<=103)||LA46_0==105) ) {
+                        alt46=1;
                     }
-                    switch (alt47) {
+                    switch (alt46) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2365:4: ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )*
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2346:4: ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )*
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2365:4: ( (lv_elements_3_0= ruleXAnnotationOrExpression ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2366:1: (lv_elements_3_0= ruleXAnnotationOrExpression )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2346:4: ( (lv_elements_3_0= ruleXAnnotationOrExpression ) )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2347:1: (lv_elements_3_0= ruleXAnnotationOrExpression )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2366:1: (lv_elements_3_0= ruleXAnnotationOrExpression )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2367:3: lv_elements_3_0= ruleXAnnotationOrExpression
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2347:1: (lv_elements_3_0= ruleXAnnotationOrExpression )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2348:3: lv_elements_3_0= ruleXAnnotationOrExpression
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsXAnnotationOrExpressionParserRuleCall_0_1_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValueOrCommaList5178);
+                            pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValueOrCommaList5140);
                             lv_elements_3_0=ruleXAnnotationOrExpression();
 
                             state._fsp--;
@@ -6674,39 +6616,39 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
 
                             }
 
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2383:2: (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )*
-                            loop46:
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2364:2: (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )*
+                            loop45:
                             do {
-                                int alt46=2;
-                                int LA46_0 = input.LA(1);
+                                int alt45=2;
+                                int LA45_0 = input.LA(1);
 
-                                if ( (LA46_0==25) ) {
-                                    alt46=1;
+                                if ( (LA45_0==24) ) {
+                                    alt45=1;
                                 }
 
 
-                                switch (alt46) {
+                                switch (alt45) {
                             	case 1 :
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2383:4: otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) )
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2364:4: otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) )
                             	    {
-                            	    otherlv_4=(Token)match(input,25,FOLLOW_25_in_ruleXAnnotationElementValueOrCommaList5191); if (state.failed) return current;
+                            	    otherlv_4=(Token)match(input,24,FOLLOW_24_in_ruleXAnnotationElementValueOrCommaList5153); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	          	newLeafNode(otherlv_4, grammarAccess.getXAnnotationElementValueOrCommaListAccess().getCommaKeyword_0_1_1_0());
                             	          
                             	    }
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2387:1: ( (lv_elements_5_0= ruleXAnnotationOrExpression ) )
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2388:1: (lv_elements_5_0= ruleXAnnotationOrExpression )
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2368:1: ( (lv_elements_5_0= ruleXAnnotationOrExpression ) )
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2369:1: (lv_elements_5_0= ruleXAnnotationOrExpression )
                             	    {
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2388:1: (lv_elements_5_0= ruleXAnnotationOrExpression )
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2389:3: lv_elements_5_0= ruleXAnnotationOrExpression
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2369:1: (lv_elements_5_0= ruleXAnnotationOrExpression )
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2370:3: lv_elements_5_0= ruleXAnnotationOrExpression
                             	    {
                             	    if ( state.backtracking==0 ) {
                             	       
                             	      	        newCompositeNode(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsXAnnotationOrExpressionParserRuleCall_0_1_1_1_0()); 
                             	      	    
                             	    }
-                            	    pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValueOrCommaList5212);
+                            	    pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValueOrCommaList5174);
                             	    lv_elements_5_0=ruleXAnnotationOrExpression();
 
                             	    state._fsp--;
@@ -6735,7 +6677,7 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
                             	    break;
 
                             	default :
-                            	    break loop46;
+                            	    break loop45;
                                 }
                             } while (true);
 
@@ -6745,7 +6687,7 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
 
                     }
 
-                    otherlv_6=(Token)match(input,35,FOLLOW_35_in_ruleXAnnotationElementValueOrCommaList5228); if (state.failed) return current;
+                    otherlv_6=(Token)match(input,34,FOLLOW_34_in_ruleXAnnotationElementValueOrCommaList5190); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_6, grammarAccess.getXAnnotationElementValueOrCommaListAccess().getRightSquareBracketKeyword_0_2());
@@ -6758,17 +6700,17 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2410:6: (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2391:6: (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2410:6: (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2411:5: this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )?
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2391:6: (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2392:5: this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )?
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getXAnnotationOrExpressionParserRuleCall_1_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValueOrCommaList5258);
+                    pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValueOrCommaList5220);
                     this_XAnnotationOrExpression_7=ruleXAnnotationOrExpression();
 
                     state._fsp--;
@@ -6779,19 +6721,19 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
                               afterParserOrEnumRuleCall();
                           
                     }
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2419:1: ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )?
-                    int alt49=2;
-                    int LA49_0 = input.LA(1);
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2400:1: ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )?
+                    int alt48=2;
+                    int LA48_0 = input.LA(1);
 
-                    if ( (LA49_0==25) ) {
-                        alt49=1;
+                    if ( (LA48_0==24) ) {
+                        alt48=1;
                     }
-                    switch (alt49) {
+                    switch (alt48) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2419:2: () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2400:2: () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2419:2: ()
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2420:5: 
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2400:2: ()
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2401:5: 
                             {
                             if ( state.backtracking==0 ) {
 
@@ -6803,40 +6745,40 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
 
                             }
 
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2425:2: (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+
-                            int cnt48=0;
-                            loop48:
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2406:2: (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+
+                            int cnt47=0;
+                            loop47:
                             do {
-                                int alt48=2;
-                                int LA48_0 = input.LA(1);
+                                int alt47=2;
+                                int LA47_0 = input.LA(1);
 
-                                if ( (LA48_0==25) ) {
-                                    alt48=1;
+                                if ( (LA47_0==24) ) {
+                                    alt47=1;
                                 }
 
 
-                                switch (alt48) {
+                                switch (alt47) {
                             	case 1 :
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2425:4: otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) )
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2406:4: otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) )
                             	    {
-                            	    otherlv_9=(Token)match(input,25,FOLLOW_25_in_ruleXAnnotationElementValueOrCommaList5280); if (state.failed) return current;
+                            	    otherlv_9=(Token)match(input,24,FOLLOW_24_in_ruleXAnnotationElementValueOrCommaList5242); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	          	newLeafNode(otherlv_9, grammarAccess.getXAnnotationElementValueOrCommaListAccess().getCommaKeyword_1_1_1_0());
                             	          
                             	    }
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2429:1: ( (lv_elements_10_0= ruleXAnnotationOrExpression ) )
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2430:1: (lv_elements_10_0= ruleXAnnotationOrExpression )
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2410:1: ( (lv_elements_10_0= ruleXAnnotationOrExpression ) )
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2411:1: (lv_elements_10_0= ruleXAnnotationOrExpression )
                             	    {
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2430:1: (lv_elements_10_0= ruleXAnnotationOrExpression )
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2431:3: lv_elements_10_0= ruleXAnnotationOrExpression
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2411:1: (lv_elements_10_0= ruleXAnnotationOrExpression )
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2412:3: lv_elements_10_0= ruleXAnnotationOrExpression
                             	    {
                             	    if ( state.backtracking==0 ) {
                             	       
                             	      	        newCompositeNode(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsXAnnotationOrExpressionParserRuleCall_1_1_1_1_0()); 
                             	      	    
                             	    }
-                            	    pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValueOrCommaList5301);
+                            	    pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValueOrCommaList5263);
                             	    lv_elements_10_0=ruleXAnnotationOrExpression();
 
                             	    state._fsp--;
@@ -6865,13 +6807,13 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
                             	    break;
 
                             	default :
-                            	    if ( cnt48 >= 1 ) break loop48;
+                            	    if ( cnt47 >= 1 ) break loop47;
                             	    if (state.backtracking>0) {state.failed=true; return current;}
                                         EarlyExitException eee =
-                                            new EarlyExitException(48, input);
+                                            new EarlyExitException(47, input);
                                         throw eee;
                                 }
-                                cnt48++;
+                                cnt47++;
                             } while (true);
 
 
@@ -6909,7 +6851,7 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
 
 
     // $ANTLR start "entryRuleXAnnotationElementValue"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2455:1: entryRuleXAnnotationElementValue returns [EObject current=null] : iv_ruleXAnnotationElementValue= ruleXAnnotationElementValue EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2436:1: entryRuleXAnnotationElementValue returns [EObject current=null] : iv_ruleXAnnotationElementValue= ruleXAnnotationElementValue EOF ;
     public final EObject entryRuleXAnnotationElementValue() throws RecognitionException {
         EObject current = null;
 
@@ -6917,13 +6859,13 @@ public final EObject entryRuleXAnnotationElementValue() throws RecognitionExcept
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2456:2: (iv_ruleXAnnotationElementValue= ruleXAnnotationElementValue EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2457:2: iv_ruleXAnnotationElementValue= ruleXAnnotationElementValue EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2437:2: (iv_ruleXAnnotationElementValue= ruleXAnnotationElementValue EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2438:2: iv_ruleXAnnotationElementValue= ruleXAnnotationElementValue EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAnnotationElementValueRule()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationElementValue_in_entryRuleXAnnotationElementValue5342);
+            pushFollow(FOLLOW_ruleXAnnotationElementValue_in_entryRuleXAnnotationElementValue5304);
             iv_ruleXAnnotationElementValue=ruleXAnnotationElementValue();
 
             state._fsp--;
@@ -6931,7 +6873,7 @@ public final EObject entryRuleXAnnotationElementValue() throws RecognitionExcept
             if ( state.backtracking==0 ) {
                current =iv_ruleXAnnotationElementValue; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAnnotationElementValue5352); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXAnnotationElementValue5314); if (state.failed) return current;
 
             }
 
@@ -6949,7 +6891,7 @@ public final EObject entryRuleXAnnotationElementValue() throws RecognitionExcept
 
 
     // $ANTLR start "ruleXAnnotationElementValue"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2464:1: ruleXAnnotationElementValue returns [EObject current=null] : ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2445:1: ruleXAnnotationElementValue returns [EObject current=null] : ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ) ;
     public final EObject ruleXAnnotationElementValue() throws RecognitionException {
         EObject current = null;
 
@@ -6967,27 +6909,27 @@ public final EObject ruleXAnnotationElementValue() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2467:28: ( ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2468:1: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2448:28: ( ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2449:1: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2468:1: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression )
-            int alt53=2;
-            alt53 = dfa53.predict(input);
-            switch (alt53) {
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2449:1: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression )
+            int alt52=2;
+            alt52 = dfa52.predict(input);
+            switch (alt52) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2468:2: ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2449:2: ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2468:2: ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2468:3: ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2449:2: ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2449:3: ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']'
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2468:3: ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2468:4: ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2449:3: ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2449:4: ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2471:5: ( () otherlv_1= '#' otherlv_2= '[' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2471:6: () otherlv_1= '#' otherlv_2= '['
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2452:5: ( () otherlv_1= '#' otherlv_2= '[' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2452:6: () otherlv_1= '#' otherlv_2= '['
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2471:6: ()
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2472:5: 
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2452:6: ()
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2453:5: 
                     {
                     if ( state.backtracking==0 ) {
 
@@ -6999,13 +6941,13 @@ public final EObject ruleXAnnotationElementValue() throws RecognitionException {
 
                     }
 
-                    otherlv_1=(Token)match(input,33,FOLLOW_33_in_ruleXAnnotationElementValue5417); if (state.failed) return current;
+                    otherlv_1=(Token)match(input,32,FOLLOW_32_in_ruleXAnnotationElementValue5379); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_1, grammarAccess.getXAnnotationElementValueAccess().getNumberSignKeyword_0_0_0_1());
                           
                     }
-                    otherlv_2=(Token)match(input,34,FOLLOW_34_in_ruleXAnnotationElementValue5429); if (state.failed) return current;
+                    otherlv_2=(Token)match(input,33,FOLLOW_33_in_ruleXAnnotationElementValue5391); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_2, grammarAccess.getXAnnotationElementValueAccess().getLeftSquareBracketKeyword_0_0_0_2());
@@ -7017,29 +6959,29 @@ public final EObject ruleXAnnotationElementValue() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2485:3: ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )?
-                    int alt52=2;
-                    int LA52_0 = input.LA(1);
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2466:3: ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )?
+                    int alt51=2;
+                    int LA51_0 = input.LA(1);
 
-                    if ( ((LA52_0>=RULE_STRING && LA52_0<=RULE_ID)||(LA52_0>=15 && LA52_0<=19)||LA52_0==21||(LA52_0>=23 && LA52_0<=24)||(LA52_0>=27 && LA52_0<=29)||(LA52_0>=33 && LA52_0<=34)||(LA52_0>=36 && LA52_0<=50)||LA52_0==56||(LA52_0>=71 && LA52_0<=72)||LA52_0==77||LA52_0==85||LA52_0==87||(LA52_0>=91 && LA52_0<=92)||(LA52_0>=95 && LA52_0<=103)||LA52_0==105) ) {
-                        alt52=1;
+                    if ( ((LA51_0>=RULE_STRING && LA51_0<=RULE_ID)||(LA51_0>=15 && LA51_0<=18)||LA51_0==20||(LA51_0>=22 && LA51_0<=23)||(LA51_0>=26 && LA51_0<=28)||(LA51_0>=32 && LA51_0<=33)||(LA51_0>=35 && LA51_0<=50)||LA51_0==56||(LA51_0>=71 && LA51_0<=72)||LA51_0==77||LA51_0==85||LA51_0==87||(LA51_0>=91 && LA51_0<=92)||(LA51_0>=95 && LA51_0<=103)||LA51_0==105) ) {
+                        alt51=1;
                     }
-                    switch (alt52) {
+                    switch (alt51) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2485:4: ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )*
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2466:4: ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )*
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2485:4: ( (lv_elements_3_0= ruleXAnnotationOrExpression ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2486:1: (lv_elements_3_0= ruleXAnnotationOrExpression )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2466:4: ( (lv_elements_3_0= ruleXAnnotationOrExpression ) )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2467:1: (lv_elements_3_0= ruleXAnnotationOrExpression )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2486:1: (lv_elements_3_0= ruleXAnnotationOrExpression )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2487:3: lv_elements_3_0= ruleXAnnotationOrExpression
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2467:1: (lv_elements_3_0= ruleXAnnotationOrExpression )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2468:3: lv_elements_3_0= ruleXAnnotationOrExpression
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXAnnotationElementValueAccess().getElementsXAnnotationOrExpressionParserRuleCall_0_1_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValue5453);
+                            pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValue5415);
                             lv_elements_3_0=ruleXAnnotationOrExpression();
 
                             state._fsp--;
@@ -7063,39 +7005,39 @@ public final EObject ruleXAnnotationElementValue() throws RecognitionException {
 
                             }
 
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2503:2: (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )*
-                            loop51:
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2484:2: (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )*
+                            loop50:
                             do {
-                                int alt51=2;
-                                int LA51_0 = input.LA(1);
+                                int alt50=2;
+                                int LA50_0 = input.LA(1);
 
-                                if ( (LA51_0==25) ) {
-                                    alt51=1;
+                                if ( (LA50_0==24) ) {
+                                    alt50=1;
                                 }
 
 
-                                switch (alt51) {
+                                switch (alt50) {
                             	case 1 :
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2503:4: otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) )
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2484:4: otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) )
                             	    {
-                            	    otherlv_4=(Token)match(input,25,FOLLOW_25_in_ruleXAnnotationElementValue5466); if (state.failed) return current;
+                            	    otherlv_4=(Token)match(input,24,FOLLOW_24_in_ruleXAnnotationElementValue5428); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	          	newLeafNode(otherlv_4, grammarAccess.getXAnnotationElementValueAccess().getCommaKeyword_0_1_1_0());
                             	          
                             	    }
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2507:1: ( (lv_elements_5_0= ruleXAnnotationOrExpression ) )
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2508:1: (lv_elements_5_0= ruleXAnnotationOrExpression )
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2488:1: ( (lv_elements_5_0= ruleXAnnotationOrExpression ) )
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2489:1: (lv_elements_5_0= ruleXAnnotationOrExpression )
                             	    {
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2508:1: (lv_elements_5_0= ruleXAnnotationOrExpression )
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2509:3: lv_elements_5_0= ruleXAnnotationOrExpression
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2489:1: (lv_elements_5_0= ruleXAnnotationOrExpression )
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2490:3: lv_elements_5_0= ruleXAnnotationOrExpression
                             	    {
                             	    if ( state.backtracking==0 ) {
                             	       
                             	      	        newCompositeNode(grammarAccess.getXAnnotationElementValueAccess().getElementsXAnnotationOrExpressionParserRuleCall_0_1_1_1_0()); 
                             	      	    
                             	    }
-                            	    pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValue5487);
+                            	    pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValue5449);
                             	    lv_elements_5_0=ruleXAnnotationOrExpression();
 
                             	    state._fsp--;
@@ -7124,7 +7066,7 @@ public final EObject ruleXAnnotationElementValue() throws RecognitionException {
                             	    break;
 
                             	default :
-                            	    break loop51;
+                            	    break loop50;
                                 }
                             } while (true);
 
@@ -7134,7 +7076,7 @@ public final EObject ruleXAnnotationElementValue() throws RecognitionException {
 
                     }
 
-                    otherlv_6=(Token)match(input,35,FOLLOW_35_in_ruleXAnnotationElementValue5503); if (state.failed) return current;
+                    otherlv_6=(Token)match(input,34,FOLLOW_34_in_ruleXAnnotationElementValue5465); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_6, grammarAccess.getXAnnotationElementValueAccess().getRightSquareBracketKeyword_0_2());
@@ -7147,14 +7089,14 @@ public final EObject ruleXAnnotationElementValue() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2531:5: this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2512:5: this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXAnnotationElementValueAccess().getXAnnotationOrExpressionParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValue5532);
+                    pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValue5494);
                     this_XAnnotationOrExpression_7=ruleXAnnotationOrExpression();
 
                     state._fsp--;
@@ -7191,7 +7133,7 @@ public final EObject ruleXAnnotationElementValue() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXAnnotationOrExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2547:1: entryRuleXAnnotationOrExpression returns [EObject current=null] : iv_ruleXAnnotationOrExpression= ruleXAnnotationOrExpression EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2528:1: entryRuleXAnnotationOrExpression returns [EObject current=null] : iv_ruleXAnnotationOrExpression= ruleXAnnotationOrExpression EOF ;
     public final EObject entryRuleXAnnotationOrExpression() throws RecognitionException {
         EObject current = null;
 
@@ -7199,13 +7141,13 @@ public final EObject entryRuleXAnnotationOrExpression() throws RecognitionExcept
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2548:2: (iv_ruleXAnnotationOrExpression= ruleXAnnotationOrExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2549:2: iv_ruleXAnnotationOrExpression= ruleXAnnotationOrExpression EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2529:2: (iv_ruleXAnnotationOrExpression= ruleXAnnotationOrExpression EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2530:2: iv_ruleXAnnotationOrExpression= ruleXAnnotationOrExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAnnotationOrExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_entryRuleXAnnotationOrExpression5567);
+            pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_entryRuleXAnnotationOrExpression5529);
             iv_ruleXAnnotationOrExpression=ruleXAnnotationOrExpression();
 
             state._fsp--;
@@ -7213,7 +7155,7 @@ public final EObject entryRuleXAnnotationOrExpression() throws RecognitionExcept
             if ( state.backtracking==0 ) {
                current =iv_ruleXAnnotationOrExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAnnotationOrExpression5577); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXAnnotationOrExpression5539); if (state.failed) return current;
 
             }
 
@@ -7231,7 +7173,7 @@ public final EObject entryRuleXAnnotationOrExpression() throws RecognitionExcept
 
 
     // $ANTLR start "ruleXAnnotationOrExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2556:1: ruleXAnnotationOrExpression returns [EObject current=null] : (this_XAnnotation_0= ruleXAnnotation | this_XExpression_1= ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2537:1: ruleXAnnotationOrExpression returns [EObject current=null] : (this_XAnnotation_0= ruleXAnnotation | this_XExpression_1= ruleXExpression ) ;
     public final EObject ruleXAnnotationOrExpression() throws RecognitionException {
         EObject current = null;
 
@@ -7243,36 +7185,36 @@ public final EObject ruleXAnnotationOrExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2559:28: ( (this_XAnnotation_0= ruleXAnnotation | this_XExpression_1= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2560:1: (this_XAnnotation_0= ruleXAnnotation | this_XExpression_1= ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2540:28: ( (this_XAnnotation_0= ruleXAnnotation | this_XExpression_1= ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2541:1: (this_XAnnotation_0= ruleXAnnotation | this_XExpression_1= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2560:1: (this_XAnnotation_0= ruleXAnnotation | this_XExpression_1= ruleXExpression )
-            int alt54=2;
-            int LA54_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2541:1: (this_XAnnotation_0= ruleXAnnotation | this_XExpression_1= ruleXExpression )
+            int alt53=2;
+            int LA53_0 = input.LA(1);
 
-            if ( (LA54_0==28) ) {
-                alt54=1;
+            if ( (LA53_0==27) ) {
+                alt53=1;
             }
-            else if ( ((LA54_0>=RULE_STRING && LA54_0<=RULE_ID)||(LA54_0>=15 && LA54_0<=19)||LA54_0==21||(LA54_0>=23 && LA54_0<=24)||LA54_0==27||LA54_0==29||(LA54_0>=33 && LA54_0<=34)||(LA54_0>=36 && LA54_0<=50)||LA54_0==56||(LA54_0>=71 && LA54_0<=72)||LA54_0==77||LA54_0==85||LA54_0==87||(LA54_0>=91 && LA54_0<=92)||(LA54_0>=95 && LA54_0<=103)||LA54_0==105) ) {
-                alt54=2;
+            else if ( ((LA53_0>=RULE_STRING && LA53_0<=RULE_ID)||(LA53_0>=15 && LA53_0<=18)||LA53_0==20||(LA53_0>=22 && LA53_0<=23)||LA53_0==26||LA53_0==28||(LA53_0>=32 && LA53_0<=33)||(LA53_0>=35 && LA53_0<=50)||LA53_0==56||(LA53_0>=71 && LA53_0<=72)||LA53_0==77||LA53_0==85||LA53_0==87||(LA53_0>=91 && LA53_0<=92)||(LA53_0>=95 && LA53_0<=103)||LA53_0==105) ) {
+                alt53=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 54, 0, input);
+                    new NoViableAltException("", 53, 0, input);
 
                 throw nvae;
             }
-            switch (alt54) {
+            switch (alt53) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2561:5: this_XAnnotation_0= ruleXAnnotation
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2542:5: this_XAnnotation_0= ruleXAnnotation
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXAnnotationOrExpressionAccess().getXAnnotationParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXAnnotation_in_ruleXAnnotationOrExpression5624);
+                    pushFollow(FOLLOW_ruleXAnnotation_in_ruleXAnnotationOrExpression5586);
                     this_XAnnotation_0=ruleXAnnotation();
 
                     state._fsp--;
@@ -7287,14 +7229,14 @@ else if ( ((LA54_0>=RULE_STRING && LA54_0<=RULE_ID)||(LA54_0>=15 && LA54_0<=19)|
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2571:5: this_XExpression_1= ruleXExpression
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2552:5: this_XExpression_1= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXAnnotationOrExpressionAccess().getXExpressionParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXAnnotationOrExpression5651);
+                    pushFollow(FOLLOW_ruleXExpression_in_ruleXAnnotationOrExpression5613);
                     this_XExpression_1=ruleXExpression();
 
                     state._fsp--;
@@ -7331,7 +7273,7 @@ else if ( ((LA54_0>=RULE_STRING && LA54_0<=RULE_ID)||(LA54_0>=15 && LA54_0<=19)|
 
 
     // $ANTLR start "entryRuleXExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2587:1: entryRuleXExpression returns [EObject current=null] : iv_ruleXExpression= ruleXExpression EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2568:1: entryRuleXExpression returns [EObject current=null] : iv_ruleXExpression= ruleXExpression EOF ;
     public final EObject entryRuleXExpression() throws RecognitionException {
         EObject current = null;
 
@@ -7339,13 +7281,13 @@ public final EObject entryRuleXExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2588:2: (iv_ruleXExpression= ruleXExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2589:2: iv_ruleXExpression= ruleXExpression EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2569:2: (iv_ruleXExpression= ruleXExpression EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2570:2: iv_ruleXExpression= ruleXExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_entryRuleXExpression5686);
+            pushFollow(FOLLOW_ruleXExpression_in_entryRuleXExpression5648);
             iv_ruleXExpression=ruleXExpression();
 
             state._fsp--;
@@ -7353,7 +7295,7 @@ public final EObject entryRuleXExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXExpression5696); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXExpression5658); if (state.failed) return current;
 
             }
 
@@ -7371,7 +7313,7 @@ public final EObject entryRuleXExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2596:1: ruleXExpression returns [EObject current=null] : this_XAssignment_0= ruleXAssignment ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2577:1: ruleXExpression returns [EObject current=null] : this_XAssignment_0= ruleXAssignment ;
     public final EObject ruleXExpression() throws RecognitionException {
         EObject current = null;
 
@@ -7381,15 +7323,15 @@ public final EObject ruleXExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2599:28: (this_XAssignment_0= ruleXAssignment )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2601:5: this_XAssignment_0= ruleXAssignment
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2580:28: (this_XAssignment_0= ruleXAssignment )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2582:5: this_XAssignment_0= ruleXAssignment
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXExpressionAccess().getXAssignmentParserRuleCall()); 
                   
             }
-            pushFollow(FOLLOW_ruleXAssignment_in_ruleXExpression5742);
+            pushFollow(FOLLOW_ruleXAssignment_in_ruleXExpression5704);
             this_XAssignment_0=ruleXAssignment();
 
             state._fsp--;
@@ -7420,7 +7362,7 @@ public final EObject ruleXExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXAssignment"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2617:1: entryRuleXAssignment returns [EObject current=null] : iv_ruleXAssignment= ruleXAssignment EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2598:1: entryRuleXAssignment returns [EObject current=null] : iv_ruleXAssignment= ruleXAssignment EOF ;
     public final EObject entryRuleXAssignment() throws RecognitionException {
         EObject current = null;
 
@@ -7428,13 +7370,13 @@ public final EObject entryRuleXAssignment() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2618:2: (iv_ruleXAssignment= ruleXAssignment EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2619:2: iv_ruleXAssignment= ruleXAssignment EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2599:2: (iv_ruleXAssignment= ruleXAssignment EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2600:2: iv_ruleXAssignment= ruleXAssignment EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAssignmentRule()); 
             }
-            pushFollow(FOLLOW_ruleXAssignment_in_entryRuleXAssignment5776);
+            pushFollow(FOLLOW_ruleXAssignment_in_entryRuleXAssignment5738);
             iv_ruleXAssignment=ruleXAssignment();
 
             state._fsp--;
@@ -7442,7 +7384,7 @@ public final EObject entryRuleXAssignment() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXAssignment; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAssignment5786); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXAssignment5748); if (state.failed) return current;
 
             }
 
@@ -7460,7 +7402,7 @@ public final EObject entryRuleXAssignment() throws RecognitionException {
 
 
     // $ANTLR start "ruleXAssignment"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2626:1: ruleXAssignment returns [EObject current=null] : ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2607:1: ruleXAssignment returns [EObject current=null] : ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) ) ;
     public final EObject ruleXAssignment() throws RecognitionException {
         EObject current = null;
 
@@ -7474,21 +7416,21 @@ public final EObject ruleXAssignment() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2629:28: ( ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2630:1: ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2610:28: ( ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2611:1: ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2630:1: ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) )
-            int alt56=2;
-            alt56 = dfa56.predict(input);
-            switch (alt56) {
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2611:1: ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) )
+            int alt55=2;
+            alt55 = dfa55.predict(input);
+            switch (alt55) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2630:2: ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2611:2: ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2630:2: ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2630:3: () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2611:2: ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2611:3: () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2630:3: ()
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2631:5: 
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2611:3: ()
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2612:5: 
                     {
                     if ( state.backtracking==0 ) {
 
@@ -7500,11 +7442,11 @@ public final EObject ruleXAssignment() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2636:2: ( ( ruleFeatureCallID ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2637:1: ( ruleFeatureCallID )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2617:2: ( ( ruleFeatureCallID ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2618:1: ( ruleFeatureCallID )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2637:1: ( ruleFeatureCallID )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2638:3: ruleFeatureCallID
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2618:1: ( ruleFeatureCallID )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2619:3: ruleFeatureCallID
                     {
                     if ( state.backtracking==0 ) {
 
@@ -7518,7 +7460,7 @@ public final EObject ruleXAssignment() throws RecognitionException {
                       	        newCompositeNode(grammarAccess.getXAssignmentAccess().getFeatureJvmIdentifiableElementCrossReference_0_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleFeatureCallID_in_ruleXAssignment5844);
+                    pushFollow(FOLLOW_ruleFeatureCallID_in_ruleXAssignment5806);
                     ruleFeatureCallID();
 
                     state._fsp--;
@@ -7539,7 +7481,7 @@ public final EObject ruleXAssignment() throws RecognitionException {
                               newCompositeNode(grammarAccess.getXAssignmentAccess().getOpSingleAssignParserRuleCall_0_2()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleOpSingleAssign_in_ruleXAssignment5860);
+                    pushFollow(FOLLOW_ruleOpSingleAssign_in_ruleXAssignment5822);
                     ruleOpSingleAssign();
 
                     state._fsp--;
@@ -7549,18 +7491,18 @@ public final EObject ruleXAssignment() throws RecognitionException {
                               afterParserOrEnumRuleCall();
                           
                     }
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2659:1: ( (lv_value_3_0= ruleXAssignment ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2660:1: (lv_value_3_0= ruleXAssignment )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2640:1: ( (lv_value_3_0= ruleXAssignment ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2641:1: (lv_value_3_0= ruleXAssignment )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2660:1: (lv_value_3_0= ruleXAssignment )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2661:3: lv_value_3_0= ruleXAssignment
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2641:1: (lv_value_3_0= ruleXAssignment )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2642:3: lv_value_3_0= ruleXAssignment
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXAssignmentAccess().getValueXAssignmentParserRuleCall_0_3_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXAssignment_in_ruleXAssignment5880);
+                    pushFollow(FOLLOW_ruleXAssignment_in_ruleXAssignment5842);
                     lv_value_3_0=ruleXAssignment();
 
                     state._fsp--;
@@ -7591,17 +7533,17 @@ public final EObject ruleXAssignment() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2678:6: (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2659:6: (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2678:6: (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2679:5: this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )?
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2659:6: (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2660:5: this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )?
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXAssignmentAccess().getXOrExpressionParserRuleCall_1_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXOrExpression_in_ruleXAssignment5910);
+                    pushFollow(FOLLOW_ruleXOrExpression_in_ruleXAssignment5872);
                     this_XOrExpression_4=ruleXOrExpression();
 
                     state._fsp--;
@@ -7612,21 +7554,21 @@ public final EObject ruleXAssignment() throws RecognitionException {
                               afterParserOrEnumRuleCall();
                           
                     }
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2687:1: ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )?
-                    int alt55=2;
-                    alt55 = dfa55.predict(input);
-                    switch (alt55) {
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2668:1: ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )?
+                    int alt54=2;
+                    alt54 = dfa54.predict(input);
+                    switch (alt54) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2687:2: ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2668:2: ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2687:2: ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2687:3: ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2668:2: ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2668:3: ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2692:6: ( () ( ( ruleOpMultiAssign ) ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2692:7: () ( ( ruleOpMultiAssign ) )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2673:6: ( () ( ( ruleOpMultiAssign ) ) )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2673:7: () ( ( ruleOpMultiAssign ) )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2692:7: ()
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2693:5: 
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2673:7: ()
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2674:5: 
                             {
                             if ( state.backtracking==0 ) {
 
@@ -7638,11 +7580,11 @@ public final EObject ruleXAssignment() throws RecognitionException {
 
                             }
 
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2698:2: ( ( ruleOpMultiAssign ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2699:1: ( ruleOpMultiAssign )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2679:2: ( ( ruleOpMultiAssign ) )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2680:1: ( ruleOpMultiAssign )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2699:1: ( ruleOpMultiAssign )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2700:3: ruleOpMultiAssign
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2680:1: ( ruleOpMultiAssign )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2681:3: ruleOpMultiAssign
                             {
                             if ( state.backtracking==0 ) {
 
@@ -7656,7 +7598,7 @@ public final EObject ruleXAssignment() throws RecognitionException {
                               	        newCompositeNode(grammarAccess.getXAssignmentAccess().getFeatureJvmIdentifiableElementCrossReference_1_1_0_0_1_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleOpMultiAssign_in_ruleXAssignment5963);
+                            pushFollow(FOLLOW_ruleOpMultiAssign_in_ruleXAssignment5925);
                             ruleOpMultiAssign();
 
                             state._fsp--;
@@ -7678,18 +7620,18 @@ public final EObject ruleXAssignment() throws RecognitionException {
 
                             }
 
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2713:4: ( (lv_rightOperand_7_0= ruleXAssignment ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2714:1: (lv_rightOperand_7_0= ruleXAssignment )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2694:4: ( (lv_rightOperand_7_0= ruleXAssignment ) )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2695:1: (lv_rightOperand_7_0= ruleXAssignment )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2714:1: (lv_rightOperand_7_0= ruleXAssignment )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2715:3: lv_rightOperand_7_0= ruleXAssignment
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2695:1: (lv_rightOperand_7_0= ruleXAssignment )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2696:3: lv_rightOperand_7_0= ruleXAssignment
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXAssignmentAccess().getRightOperandXAssignmentParserRuleCall_1_1_1_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleXAssignment_in_ruleXAssignment5986);
+                            pushFollow(FOLLOW_ruleXAssignment_in_ruleXAssignment5948);
                             lv_rightOperand_7_0=ruleXAssignment();
 
                             state._fsp--;
@@ -7748,7 +7690,7 @@ public final EObject ruleXAssignment() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpSingleAssign"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2739:1: entryRuleOpSingleAssign returns [String current=null] : iv_ruleOpSingleAssign= ruleOpSingleAssign EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2720:1: entryRuleOpSingleAssign returns [String current=null] : iv_ruleOpSingleAssign= ruleOpSingleAssign EOF ;
     public final String entryRuleOpSingleAssign() throws RecognitionException {
         String current = null;
 
@@ -7756,13 +7698,13 @@ public final String entryRuleOpSingleAssign() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2740:2: (iv_ruleOpSingleAssign= ruleOpSingleAssign EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2741:2: iv_ruleOpSingleAssign= ruleOpSingleAssign EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2721:2: (iv_ruleOpSingleAssign= ruleOpSingleAssign EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2722:2: iv_ruleOpSingleAssign= ruleOpSingleAssign EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpSingleAssignRule()); 
             }
-            pushFollow(FOLLOW_ruleOpSingleAssign_in_entryRuleOpSingleAssign6026);
+            pushFollow(FOLLOW_ruleOpSingleAssign_in_entryRuleOpSingleAssign5988);
             iv_ruleOpSingleAssign=ruleOpSingleAssign();
 
             state._fsp--;
@@ -7770,7 +7712,7 @@ public final String entryRuleOpSingleAssign() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpSingleAssign.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpSingleAssign6037); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleOpSingleAssign5999); if (state.failed) return current;
 
             }
 
@@ -7788,7 +7730,7 @@ public final String entryRuleOpSingleAssign() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpSingleAssign"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2748:1: ruleOpSingleAssign returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : kw= '=' ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2729:1: ruleOpSingleAssign returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : kw= '=' ;
     public final AntlrDatatypeRuleToken ruleOpSingleAssign() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -7797,10 +7739,10 @@ public final AntlrDatatypeRuleToken ruleOpSingleAssign() throws RecognitionExcep
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2751:28: (kw= '=' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2753:2: kw= '='
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2732:28: (kw= '=' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2734:2: kw= '='
             {
-            kw=(Token)match(input,32,FOLLOW_32_in_ruleOpSingleAssign6074); if (state.failed) return current;
+            kw=(Token)match(input,31,FOLLOW_31_in_ruleOpSingleAssign6036); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                       current.merge(kw);
@@ -7827,7 +7769,7 @@ public final AntlrDatatypeRuleToken ruleOpSingleAssign() throws RecognitionExcep
 
 
     // $ANTLR start "entryRuleOpMultiAssign"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2766:1: entryRuleOpMultiAssign returns [String current=null] : iv_ruleOpMultiAssign= ruleOpMultiAssign EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2747:1: entryRuleOpMultiAssign returns [String current=null] : iv_ruleOpMultiAssign= ruleOpMultiAssign EOF ;
     public final String entryRuleOpMultiAssign() throws RecognitionException {
         String current = null;
 
@@ -7835,13 +7777,13 @@ public final String entryRuleOpMultiAssign() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2767:2: (iv_ruleOpMultiAssign= ruleOpMultiAssign EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2768:2: iv_ruleOpMultiAssign= ruleOpMultiAssign EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2748:2: (iv_ruleOpMultiAssign= ruleOpMultiAssign EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2749:2: iv_ruleOpMultiAssign= ruleOpMultiAssign EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpMultiAssignRule()); 
             }
-            pushFollow(FOLLOW_ruleOpMultiAssign_in_entryRuleOpMultiAssign6114);
+            pushFollow(FOLLOW_ruleOpMultiAssign_in_entryRuleOpMultiAssign6076);
             iv_ruleOpMultiAssign=ruleOpMultiAssign();
 
             state._fsp--;
@@ -7849,7 +7791,7 @@ public final String entryRuleOpMultiAssign() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpMultiAssign.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpMultiAssign6125); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleOpMultiAssign6087); if (state.failed) return current;
 
             }
 
@@ -7867,7 +7809,7 @@ public final String entryRuleOpMultiAssign() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpMultiAssign"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2775:1: ruleOpMultiAssign returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2756:1: ruleOpMultiAssign returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) ) ;
     public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -7876,60 +7818,60 @@ public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionExcept
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2778:28: ( (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2779:1: (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2759:28: ( (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2760:1: (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2779:1: (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) )
-            int alt58=7;
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2760:1: (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) )
+            int alt57=7;
             switch ( input.LA(1) ) {
             case 51:
                 {
-                alt58=1;
+                alt57=1;
                 }
                 break;
             case 52:
                 {
-                alt58=2;
+                alt57=2;
                 }
                 break;
             case 53:
                 {
-                alt58=3;
+                alt57=3;
                 }
                 break;
             case 54:
                 {
-                alt58=4;
+                alt57=4;
                 }
                 break;
             case 55:
                 {
-                alt58=5;
+                alt57=5;
                 }
                 break;
             case 56:
                 {
-                alt58=6;
+                alt57=6;
                 }
                 break;
             case 57:
                 {
-                alt58=7;
+                alt57=7;
                 }
                 break;
             default:
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 58, 0, input);
+                    new NoViableAltException("", 57, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt58) {
+            switch (alt57) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2780:2: kw= '+='
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2761:2: kw= '+='
                     {
-                    kw=(Token)match(input,51,FOLLOW_51_in_ruleOpMultiAssign6163); if (state.failed) return current;
+                    kw=(Token)match(input,51,FOLLOW_51_in_ruleOpMultiAssign6125); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -7940,9 +7882,9 @@ public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionExcept
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2787:2: kw= '-='
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2768:2: kw= '-='
                     {
-                    kw=(Token)match(input,52,FOLLOW_52_in_ruleOpMultiAssign6182); if (state.failed) return current;
+                    kw=(Token)match(input,52,FOLLOW_52_in_ruleOpMultiAssign6144); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -7953,9 +7895,9 @@ public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionExcept
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2794:2: kw= '*='
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2775:2: kw= '*='
                     {
-                    kw=(Token)match(input,53,FOLLOW_53_in_ruleOpMultiAssign6201); if (state.failed) return current;
+                    kw=(Token)match(input,53,FOLLOW_53_in_ruleOpMultiAssign6163); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -7966,9 +7908,9 @@ public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionExcept
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2801:2: kw= '/='
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2782:2: kw= '/='
                     {
-                    kw=(Token)match(input,54,FOLLOW_54_in_ruleOpMultiAssign6220); if (state.failed) return current;
+                    kw=(Token)match(input,54,FOLLOW_54_in_ruleOpMultiAssign6182); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -7979,9 +7921,9 @@ public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionExcept
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2808:2: kw= '%='
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2789:2: kw= '%='
                     {
-                    kw=(Token)match(input,55,FOLLOW_55_in_ruleOpMultiAssign6239); if (state.failed) return current;
+                    kw=(Token)match(input,55,FOLLOW_55_in_ruleOpMultiAssign6201); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -7992,26 +7934,26 @@ public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionExcept
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2814:6: (kw= '<' kw= '<' kw= '=' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2795:6: (kw= '<' kw= '<' kw= '=' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2814:6: (kw= '<' kw= '<' kw= '=' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2815:2: kw= '<' kw= '<' kw= '='
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2795:6: (kw= '<' kw= '<' kw= '=' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2796:2: kw= '<' kw= '<' kw= '='
                     {
-                    kw=(Token)match(input,56,FOLLOW_56_in_ruleOpMultiAssign6259); if (state.failed) return current;
+                    kw=(Token)match(input,56,FOLLOW_56_in_ruleOpMultiAssign6221); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
                               newLeafNode(kw, grammarAccess.getOpMultiAssignAccess().getLessThanSignKeyword_5_0()); 
                           
                     }
-                    kw=(Token)match(input,56,FOLLOW_56_in_ruleOpMultiAssign6272); if (state.failed) return current;
+                    kw=(Token)match(input,56,FOLLOW_56_in_ruleOpMultiAssign6234); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
                               newLeafNode(kw, grammarAccess.getOpMultiAssignAccess().getLessThanSignKeyword_5_1()); 
                           
                     }
-                    kw=(Token)match(input,32,FOLLOW_32_in_ruleOpMultiAssign6285); if (state.failed) return current;
+                    kw=(Token)match(input,31,FOLLOW_31_in_ruleOpMultiAssign6247); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -8025,30 +7967,30 @@ public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionExcept
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2833:6: (kw= '>' (kw= '>' )? kw= '>=' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2814:6: (kw= '>' (kw= '>' )? kw= '>=' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2833:6: (kw= '>' (kw= '>' )? kw= '>=' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2834:2: kw= '>' (kw= '>' )? kw= '>='
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2814:6: (kw= '>' (kw= '>' )? kw= '>=' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2815:2: kw= '>' (kw= '>' )? kw= '>='
                     {
-                    kw=(Token)match(input,57,FOLLOW_57_in_ruleOpMultiAssign6306); if (state.failed) return current;
+                    kw=(Token)match(input,57,FOLLOW_57_in_ruleOpMultiAssign6268); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
                               newLeafNode(kw, grammarAccess.getOpMultiAssignAccess().getGreaterThanSignKeyword_6_0()); 
                           
                     }
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2839:1: (kw= '>' )?
-                    int alt57=2;
-                    int LA57_0 = input.LA(1);
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2820:1: (kw= '>' )?
+                    int alt56=2;
+                    int LA56_0 = input.LA(1);
 
-                    if ( (LA57_0==57) ) {
-                        alt57=1;
+                    if ( (LA56_0==57) ) {
+                        alt56=1;
                     }
-                    switch (alt57) {
+                    switch (alt56) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2840:2: kw= '>'
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2821:2: kw= '>'
                             {
-                            kw=(Token)match(input,57,FOLLOW_57_in_ruleOpMultiAssign6320); if (state.failed) return current;
+                            kw=(Token)match(input,57,FOLLOW_57_in_ruleOpMultiAssign6282); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       current.merge(kw);
@@ -8061,7 +8003,7 @@ public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionExcept
 
                     }
 
-                    kw=(Token)match(input,58,FOLLOW_58_in_ruleOpMultiAssign6335); if (state.failed) return current;
+                    kw=(Token)match(input,58,FOLLOW_58_in_ruleOpMultiAssign6297); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -8097,7 +8039,7 @@ public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionExcept
 
 
     // $ANTLR start "entryRuleXOrExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2859:1: entryRuleXOrExpression returns [EObject current=null] : iv_ruleXOrExpression= ruleXOrExpression EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2840:1: entryRuleXOrExpression returns [EObject current=null] : iv_ruleXOrExpression= ruleXOrExpression EOF ;
     public final EObject entryRuleXOrExpression() throws RecognitionException {
         EObject current = null;
 
@@ -8105,13 +8047,13 @@ public final EObject entryRuleXOrExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2860:2: (iv_ruleXOrExpression= ruleXOrExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2861:2: iv_ruleXOrExpression= ruleXOrExpression EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2841:2: (iv_ruleXOrExpression= ruleXOrExpression EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2842:2: iv_ruleXOrExpression= ruleXOrExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXOrExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXOrExpression_in_entryRuleXOrExpression6376);
+            pushFollow(FOLLOW_ruleXOrExpression_in_entryRuleXOrExpression6338);
             iv_ruleXOrExpression=ruleXOrExpression();
 
             state._fsp--;
@@ -8119,7 +8061,7 @@ public final EObject entryRuleXOrExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXOrExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXOrExpression6386); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXOrExpression6348); if (state.failed) return current;
 
             }
 
@@ -8137,7 +8079,7 @@ public final EObject entryRuleXOrExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXOrExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2868:1: ruleXOrExpression returns [EObject current=null] : (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2849:1: ruleXOrExpression returns [EObject current=null] : (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* ) ;
     public final EObject ruleXOrExpression() throws RecognitionException {
         EObject current = null;
 
@@ -8149,18 +8091,18 @@ public final EObject ruleXOrExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2871:28: ( (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2872:1: (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2852:28: ( (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2853:1: (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2872:1: (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2873:5: this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )*
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2853:1: (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2854:5: this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXOrExpressionAccess().getXAndExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleXAndExpression_in_ruleXOrExpression6433);
+            pushFollow(FOLLOW_ruleXAndExpression_in_ruleXOrExpression6395);
             this_XAndExpression_0=ruleXAndExpression();
 
             state._fsp--;
@@ -8171,35 +8113,35 @@ public final EObject ruleXOrExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2881:1: ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )*
-            loop59:
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2862:1: ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )*
+            loop58:
             do {
-                int alt59=2;
-                int LA59_0 = input.LA(1);
+                int alt58=2;
+                int LA58_0 = input.LA(1);
 
-                if ( (LA59_0==59) ) {
-                    int LA59_2 = input.LA(2);
+                if ( (LA58_0==59) ) {
+                    int LA58_2 = input.LA(2);
 
                     if ( (synpred22_InternalCheck()) ) {
-                        alt59=1;
+                        alt58=1;
                     }
 
 
                 }
 
 
-                switch (alt59) {
+                switch (alt58) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2881:2: ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2862:2: ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2881:2: ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2881:3: ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2862:2: ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2862:3: ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2886:6: ( () ( ( ruleOpOr ) ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2886:7: () ( ( ruleOpOr ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2867:6: ( () ( ( ruleOpOr ) ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2867:7: () ( ( ruleOpOr ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2886:7: ()
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2887:5: 
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2867:7: ()
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2868:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -8211,11 +8153,11 @@ public final EObject ruleXOrExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2892:2: ( ( ruleOpOr ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2893:1: ( ruleOpOr )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2873:2: ( ( ruleOpOr ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2874:1: ( ruleOpOr )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2893:1: ( ruleOpOr )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2894:3: ruleOpOr
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2874:1: ( ruleOpOr )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2875:3: ruleOpOr
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -8229,7 +8171,7 @@ public final EObject ruleXOrExpression() throws RecognitionException {
             	      	        newCompositeNode(grammarAccess.getXOrExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleOpOr_in_ruleXOrExpression6486);
+            	    pushFollow(FOLLOW_ruleOpOr_in_ruleXOrExpression6448);
             	    ruleOpOr();
 
             	    state._fsp--;
@@ -8251,18 +8193,18 @@ public final EObject ruleXOrExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2907:4: ( (lv_rightOperand_3_0= ruleXAndExpression ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2908:1: (lv_rightOperand_3_0= ruleXAndExpression )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2888:4: ( (lv_rightOperand_3_0= ruleXAndExpression ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2889:1: (lv_rightOperand_3_0= ruleXAndExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2908:1: (lv_rightOperand_3_0= ruleXAndExpression )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2909:3: lv_rightOperand_3_0= ruleXAndExpression
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2889:1: (lv_rightOperand_3_0= ruleXAndExpression )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2890:3: lv_rightOperand_3_0= ruleXAndExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXOrExpressionAccess().getRightOperandXAndExpressionParserRuleCall_1_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXAndExpression_in_ruleXOrExpression6509);
+            	    pushFollow(FOLLOW_ruleXAndExpression_in_ruleXOrExpression6471);
             	    lv_rightOperand_3_0=ruleXAndExpression();
 
             	    state._fsp--;
@@ -8291,7 +8233,7 @@ public final EObject ruleXOrExpression() throws RecognitionException {
             	    break;
 
             	default :
-            	    break loop59;
+            	    break loop58;
                 }
             } while (true);
 
@@ -8318,7 +8260,7 @@ public final EObject ruleXOrExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpOr"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2933:1: entryRuleOpOr returns [String current=null] : iv_ruleOpOr= ruleOpOr EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2914:1: entryRuleOpOr returns [String current=null] : iv_ruleOpOr= ruleOpOr EOF ;
     public final String entryRuleOpOr() throws RecognitionException {
         String current = null;
 
@@ -8326,13 +8268,13 @@ public final String entryRuleOpOr() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2934:2: (iv_ruleOpOr= ruleOpOr EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2935:2: iv_ruleOpOr= ruleOpOr EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2915:2: (iv_ruleOpOr= ruleOpOr EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2916:2: iv_ruleOpOr= ruleOpOr EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpOrRule()); 
             }
-            pushFollow(FOLLOW_ruleOpOr_in_entryRuleOpOr6548);
+            pushFollow(FOLLOW_ruleOpOr_in_entryRuleOpOr6510);
             iv_ruleOpOr=ruleOpOr();
 
             state._fsp--;
@@ -8340,7 +8282,7 @@ public final String entryRuleOpOr() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpOr.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpOr6559); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleOpOr6521); if (state.failed) return current;
 
             }
 
@@ -8358,7 +8300,7 @@ public final String entryRuleOpOr() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpOr"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2942:1: ruleOpOr returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : kw= '||' ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2923:1: ruleOpOr returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : kw= '||' ;
     public final AntlrDatatypeRuleToken ruleOpOr() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -8367,10 +8309,10 @@ public final AntlrDatatypeRuleToken ruleOpOr() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2945:28: (kw= '||' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2947:2: kw= '||'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2926:28: (kw= '||' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2928:2: kw= '||'
             {
-            kw=(Token)match(input,59,FOLLOW_59_in_ruleOpOr6596); if (state.failed) return current;
+            kw=(Token)match(input,59,FOLLOW_59_in_ruleOpOr6558); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                       current.merge(kw);
@@ -8397,7 +8339,7 @@ public final AntlrDatatypeRuleToken ruleOpOr() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXAndExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2960:1: entryRuleXAndExpression returns [EObject current=null] : iv_ruleXAndExpression= ruleXAndExpression EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2941:1: entryRuleXAndExpression returns [EObject current=null] : iv_ruleXAndExpression= ruleXAndExpression EOF ;
     public final EObject entryRuleXAndExpression() throws RecognitionException {
         EObject current = null;
 
@@ -8405,13 +8347,13 @@ public final EObject entryRuleXAndExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2961:2: (iv_ruleXAndExpression= ruleXAndExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2962:2: iv_ruleXAndExpression= ruleXAndExpression EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2942:2: (iv_ruleXAndExpression= ruleXAndExpression EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2943:2: iv_ruleXAndExpression= ruleXAndExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAndExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXAndExpression_in_entryRuleXAndExpression6635);
+            pushFollow(FOLLOW_ruleXAndExpression_in_entryRuleXAndExpression6597);
             iv_ruleXAndExpression=ruleXAndExpression();
 
             state._fsp--;
@@ -8419,7 +8361,7 @@ public final EObject entryRuleXAndExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXAndExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAndExpression6645); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXAndExpression6607); if (state.failed) return current;
 
             }
 
@@ -8437,7 +8379,7 @@ public final EObject entryRuleXAndExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXAndExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2969:1: ruleXAndExpression returns [EObject current=null] : (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2950:1: ruleXAndExpression returns [EObject current=null] : (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* ) ;
     public final EObject ruleXAndExpression() throws RecognitionException {
         EObject current = null;
 
@@ -8449,18 +8391,18 @@ public final EObject ruleXAndExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2972:28: ( (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2973:1: (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2953:28: ( (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2954:1: (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2973:1: (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2974:5: this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )*
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2954:1: (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2955:5: this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXAndExpressionAccess().getXEqualityExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleXEqualityExpression_in_ruleXAndExpression6692);
+            pushFollow(FOLLOW_ruleXEqualityExpression_in_ruleXAndExpression6654);
             this_XEqualityExpression_0=ruleXEqualityExpression();
 
             state._fsp--;
@@ -8471,35 +8413,35 @@ public final EObject ruleXAndExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2982:1: ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )*
-            loop60:
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2963:1: ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )*
+            loop59:
             do {
-                int alt60=2;
-                int LA60_0 = input.LA(1);
+                int alt59=2;
+                int LA59_0 = input.LA(1);
 
-                if ( (LA60_0==60) ) {
-                    int LA60_2 = input.LA(2);
+                if ( (LA59_0==60) ) {
+                    int LA59_2 = input.LA(2);
 
                     if ( (synpred23_InternalCheck()) ) {
-                        alt60=1;
+                        alt59=1;
                     }
 
 
                 }
 
 
-                switch (alt60) {
+                switch (alt59) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2982:2: ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2963:2: ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2982:2: ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2982:3: ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2963:2: ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2963:3: ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2987:6: ( () ( ( ruleOpAnd ) ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2987:7: () ( ( ruleOpAnd ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2968:6: ( () ( ( ruleOpAnd ) ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2968:7: () ( ( ruleOpAnd ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2987:7: ()
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2988:5: 
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2968:7: ()
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2969:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -8511,11 +8453,11 @@ public final EObject ruleXAndExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2993:2: ( ( ruleOpAnd ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2994:1: ( ruleOpAnd )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2974:2: ( ( ruleOpAnd ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2975:1: ( ruleOpAnd )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2994:1: ( ruleOpAnd )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2995:3: ruleOpAnd
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2975:1: ( ruleOpAnd )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2976:3: ruleOpAnd
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -8529,7 +8471,7 @@ public final EObject ruleXAndExpression() throws RecognitionException {
             	      	        newCompositeNode(grammarAccess.getXAndExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleOpAnd_in_ruleXAndExpression6745);
+            	    pushFollow(FOLLOW_ruleOpAnd_in_ruleXAndExpression6707);
             	    ruleOpAnd();
 
             	    state._fsp--;
@@ -8551,18 +8493,18 @@ public final EObject ruleXAndExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3008:4: ( (lv_rightOperand_3_0= ruleXEqualityExpression ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3009:1: (lv_rightOperand_3_0= ruleXEqualityExpression )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2989:4: ( (lv_rightOperand_3_0= ruleXEqualityExpression ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2990:1: (lv_rightOperand_3_0= ruleXEqualityExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3009:1: (lv_rightOperand_3_0= ruleXEqualityExpression )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3010:3: lv_rightOperand_3_0= ruleXEqualityExpression
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2990:1: (lv_rightOperand_3_0= ruleXEqualityExpression )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2991:3: lv_rightOperand_3_0= ruleXEqualityExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXAndExpressionAccess().getRightOperandXEqualityExpressionParserRuleCall_1_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXEqualityExpression_in_ruleXAndExpression6768);
+            	    pushFollow(FOLLOW_ruleXEqualityExpression_in_ruleXAndExpression6730);
             	    lv_rightOperand_3_0=ruleXEqualityExpression();
 
             	    state._fsp--;
@@ -8591,7 +8533,7 @@ public final EObject ruleXAndExpression() throws RecognitionException {
             	    break;
 
             	default :
-            	    break loop60;
+            	    break loop59;
                 }
             } while (true);
 
@@ -8618,7 +8560,7 @@ public final EObject ruleXAndExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpAnd"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3034:1: entryRuleOpAnd returns [String current=null] : iv_ruleOpAnd= ruleOpAnd EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3015:1: entryRuleOpAnd returns [String current=null] : iv_ruleOpAnd= ruleOpAnd EOF ;
     public final String entryRuleOpAnd() throws RecognitionException {
         String current = null;
 
@@ -8626,13 +8568,13 @@ public final String entryRuleOpAnd() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3035:2: (iv_ruleOpAnd= ruleOpAnd EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3036:2: iv_ruleOpAnd= ruleOpAnd EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3016:2: (iv_ruleOpAnd= ruleOpAnd EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3017:2: iv_ruleOpAnd= ruleOpAnd EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpAndRule()); 
             }
-            pushFollow(FOLLOW_ruleOpAnd_in_entryRuleOpAnd6807);
+            pushFollow(FOLLOW_ruleOpAnd_in_entryRuleOpAnd6769);
             iv_ruleOpAnd=ruleOpAnd();
 
             state._fsp--;
@@ -8640,7 +8582,7 @@ public final String entryRuleOpAnd() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpAnd.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpAnd6818); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleOpAnd6780); if (state.failed) return current;
 
             }
 
@@ -8658,7 +8600,7 @@ public final String entryRuleOpAnd() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpAnd"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3043:1: ruleOpAnd returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : kw= '&&' ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3024:1: ruleOpAnd returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : kw= '&&' ;
     public final AntlrDatatypeRuleToken ruleOpAnd() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -8667,10 +8609,10 @@ public final AntlrDatatypeRuleToken ruleOpAnd() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3046:28: (kw= '&&' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3048:2: kw= '&&'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3027:28: (kw= '&&' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3029:2: kw= '&&'
             {
-            kw=(Token)match(input,60,FOLLOW_60_in_ruleOpAnd6855); if (state.failed) return current;
+            kw=(Token)match(input,60,FOLLOW_60_in_ruleOpAnd6817); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                       current.merge(kw);
@@ -8697,7 +8639,7 @@ public final AntlrDatatypeRuleToken ruleOpAnd() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXEqualityExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3061:1: entryRuleXEqualityExpression returns [EObject current=null] : iv_ruleXEqualityExpression= ruleXEqualityExpression EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3042:1: entryRuleXEqualityExpression returns [EObject current=null] : iv_ruleXEqualityExpression= ruleXEqualityExpression EOF ;
     public final EObject entryRuleXEqualityExpression() throws RecognitionException {
         EObject current = null;
 
@@ -8705,13 +8647,13 @@ public final EObject entryRuleXEqualityExpression() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3062:2: (iv_ruleXEqualityExpression= ruleXEqualityExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3063:2: iv_ruleXEqualityExpression= ruleXEqualityExpression EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3043:2: (iv_ruleXEqualityExpression= ruleXEqualityExpression EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3044:2: iv_ruleXEqualityExpression= ruleXEqualityExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXEqualityExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXEqualityExpression_in_entryRuleXEqualityExpression6894);
+            pushFollow(FOLLOW_ruleXEqualityExpression_in_entryRuleXEqualityExpression6856);
             iv_ruleXEqualityExpression=ruleXEqualityExpression();
 
             state._fsp--;
@@ -8719,7 +8661,7 @@ public final EObject entryRuleXEqualityExpression() throws RecognitionException
             if ( state.backtracking==0 ) {
                current =iv_ruleXEqualityExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXEqualityExpression6904); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXEqualityExpression6866); if (state.failed) return current;
 
             }
 
@@ -8737,7 +8679,7 @@ public final EObject entryRuleXEqualityExpression() throws RecognitionException
 
 
     // $ANTLR start "ruleXEqualityExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3070:1: ruleXEqualityExpression returns [EObject current=null] : (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3051:1: ruleXEqualityExpression returns [EObject current=null] : (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* ) ;
     public final EObject ruleXEqualityExpression() throws RecognitionException {
         EObject current = null;
 
@@ -8749,18 +8691,18 @@ public final EObject ruleXEqualityExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3073:28: ( (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3074:1: (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3054:28: ( (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3055:1: (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3074:1: (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3075:5: this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )*
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3055:1: (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3056:5: this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXEqualityExpressionAccess().getXRelationalExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleXRelationalExpression_in_ruleXEqualityExpression6951);
+            pushFollow(FOLLOW_ruleXRelationalExpression_in_ruleXEqualityExpression6913);
             this_XRelationalExpression_0=ruleXRelationalExpression();
 
             state._fsp--;
@@ -8771,17 +8713,17 @@ public final EObject ruleXEqualityExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3083:1: ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )*
-            loop61:
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3064:1: ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )*
+            loop60:
             do {
-                int alt61=2;
+                int alt60=2;
                 switch ( input.LA(1) ) {
                 case 61:
                     {
-                    int LA61_2 = input.LA(2);
+                    int LA60_2 = input.LA(2);
 
                     if ( (synpred24_InternalCheck()) ) {
-                        alt61=1;
+                        alt60=1;
                     }
 
 
@@ -8789,10 +8731,10 @@ public final EObject ruleXEqualityExpression() throws RecognitionException {
                     break;
                 case 62:
                     {
-                    int LA61_3 = input.LA(2);
+                    int LA60_3 = input.LA(2);
 
                     if ( (synpred24_InternalCheck()) ) {
-                        alt61=1;
+                        alt60=1;
                     }
 
 
@@ -8800,10 +8742,10 @@ public final EObject ruleXEqualityExpression() throws RecognitionException {
                     break;
                 case 63:
                     {
-                    int LA61_4 = input.LA(2);
+                    int LA60_4 = input.LA(2);
 
                     if ( (synpred24_InternalCheck()) ) {
-                        alt61=1;
+                        alt60=1;
                     }
 
 
@@ -8811,10 +8753,10 @@ public final EObject ruleXEqualityExpression() throws RecognitionException {
                     break;
                 case 64:
                     {
-                    int LA61_5 = input.LA(2);
+                    int LA60_5 = input.LA(2);
 
                     if ( (synpred24_InternalCheck()) ) {
-                        alt61=1;
+                        alt60=1;
                     }
 
 
@@ -8823,18 +8765,18 @@ public final EObject ruleXEqualityExpression() throws RecognitionException {
 
                 }
 
-                switch (alt61) {
+                switch (alt60) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3083:2: ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3064:2: ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3083:2: ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3083:3: ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3064:2: ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3064:3: ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3088:6: ( () ( ( ruleOpEquality ) ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3088:7: () ( ( ruleOpEquality ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3069:6: ( () ( ( ruleOpEquality ) ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3069:7: () ( ( ruleOpEquality ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3088:7: ()
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3089:5: 
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3069:7: ()
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3070:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -8846,11 +8788,11 @@ public final EObject ruleXEqualityExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3094:2: ( ( ruleOpEquality ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3095:1: ( ruleOpEquality )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3075:2: ( ( ruleOpEquality ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3076:1: ( ruleOpEquality )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3095:1: ( ruleOpEquality )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3096:3: ruleOpEquality
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3076:1: ( ruleOpEquality )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3077:3: ruleOpEquality
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -8864,7 +8806,7 @@ public final EObject ruleXEqualityExpression() throws RecognitionException {
             	      	        newCompositeNode(grammarAccess.getXEqualityExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleOpEquality_in_ruleXEqualityExpression7004);
+            	    pushFollow(FOLLOW_ruleOpEquality_in_ruleXEqualityExpression6966);
             	    ruleOpEquality();
 
             	    state._fsp--;
@@ -8886,18 +8828,18 @@ public final EObject ruleXEqualityExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3109:4: ( (lv_rightOperand_3_0= ruleXRelationalExpression ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3110:1: (lv_rightOperand_3_0= ruleXRelationalExpression )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3090:4: ( (lv_rightOperand_3_0= ruleXRelationalExpression ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3091:1: (lv_rightOperand_3_0= ruleXRelationalExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3110:1: (lv_rightOperand_3_0= ruleXRelationalExpression )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3111:3: lv_rightOperand_3_0= ruleXRelationalExpression
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3091:1: (lv_rightOperand_3_0= ruleXRelationalExpression )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3092:3: lv_rightOperand_3_0= ruleXRelationalExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXEqualityExpressionAccess().getRightOperandXRelationalExpressionParserRuleCall_1_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXRelationalExpression_in_ruleXEqualityExpression7027);
+            	    pushFollow(FOLLOW_ruleXRelationalExpression_in_ruleXEqualityExpression6989);
             	    lv_rightOperand_3_0=ruleXRelationalExpression();
 
             	    state._fsp--;
@@ -8926,7 +8868,7 @@ public final EObject ruleXEqualityExpression() throws RecognitionException {
             	    break;
 
             	default :
-            	    break loop61;
+            	    break loop60;
                 }
             } while (true);
 
@@ -8953,7 +8895,7 @@ public final EObject ruleXEqualityExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpEquality"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3135:1: entryRuleOpEquality returns [String current=null] : iv_ruleOpEquality= ruleOpEquality EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3116:1: entryRuleOpEquality returns [String current=null] : iv_ruleOpEquality= ruleOpEquality EOF ;
     public final String entryRuleOpEquality() throws RecognitionException {
         String current = null;
 
@@ -8961,13 +8903,13 @@ public final String entryRuleOpEquality() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3136:2: (iv_ruleOpEquality= ruleOpEquality EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3137:2: iv_ruleOpEquality= ruleOpEquality EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3117:2: (iv_ruleOpEquality= ruleOpEquality EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3118:2: iv_ruleOpEquality= ruleOpEquality EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpEqualityRule()); 
             }
-            pushFollow(FOLLOW_ruleOpEquality_in_entryRuleOpEquality7066);
+            pushFollow(FOLLOW_ruleOpEquality_in_entryRuleOpEquality7028);
             iv_ruleOpEquality=ruleOpEquality();
 
             state._fsp--;
@@ -8975,7 +8917,7 @@ public final String entryRuleOpEquality() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpEquality.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpEquality7077); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleOpEquality7039); if (state.failed) return current;
 
             }
 
@@ -8993,7 +8935,7 @@ public final String entryRuleOpEquality() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpEquality"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3144:1: ruleOpEquality returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3125:1: ruleOpEquality returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' ) ;
     public final AntlrDatatypeRuleToken ruleOpEquality() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -9002,45 +8944,45 @@ public final AntlrDatatypeRuleToken ruleOpEquality() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3147:28: ( (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3148:1: (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3128:28: ( (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3129:1: (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3148:1: (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' )
-            int alt62=4;
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3129:1: (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' )
+            int alt61=4;
             switch ( input.LA(1) ) {
             case 61:
                 {
-                alt62=1;
+                alt61=1;
                 }
                 break;
             case 62:
                 {
-                alt62=2;
+                alt61=2;
                 }
                 break;
             case 63:
                 {
-                alt62=3;
+                alt61=3;
                 }
                 break;
             case 64:
                 {
-                alt62=4;
+                alt61=4;
                 }
                 break;
             default:
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 62, 0, input);
+                    new NoViableAltException("", 61, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt62) {
+            switch (alt61) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3149:2: kw= '=='
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3130:2: kw= '=='
                     {
-                    kw=(Token)match(input,61,FOLLOW_61_in_ruleOpEquality7115); if (state.failed) return current;
+                    kw=(Token)match(input,61,FOLLOW_61_in_ruleOpEquality7077); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -9051,9 +8993,9 @@ public final AntlrDatatypeRuleToken ruleOpEquality() throws RecognitionException
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3156:2: kw= '!='
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3137:2: kw= '!='
                     {
-                    kw=(Token)match(input,62,FOLLOW_62_in_ruleOpEquality7134); if (state.failed) return current;
+                    kw=(Token)match(input,62,FOLLOW_62_in_ruleOpEquality7096); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -9064,9 +9006,9 @@ public final AntlrDatatypeRuleToken ruleOpEquality() throws RecognitionException
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3163:2: kw= '==='
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3144:2: kw= '==='
                     {
-                    kw=(Token)match(input,63,FOLLOW_63_in_ruleOpEquality7153); if (state.failed) return current;
+                    kw=(Token)match(input,63,FOLLOW_63_in_ruleOpEquality7115); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -9077,9 +9019,9 @@ public final AntlrDatatypeRuleToken ruleOpEquality() throws RecognitionException
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3170:2: kw= '!=='
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3151:2: kw= '!=='
                     {
-                    kw=(Token)match(input,64,FOLLOW_64_in_ruleOpEquality7172); if (state.failed) return current;
+                    kw=(Token)match(input,64,FOLLOW_64_in_ruleOpEquality7134); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -9112,7 +9054,7 @@ public final AntlrDatatypeRuleToken ruleOpEquality() throws RecognitionException
 
 
     // $ANTLR start "entryRuleXRelationalExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3183:1: entryRuleXRelationalExpression returns [EObject current=null] : iv_ruleXRelationalExpression= ruleXRelationalExpression EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3164:1: entryRuleXRelationalExpression returns [EObject current=null] : iv_ruleXRelationalExpression= ruleXRelationalExpression EOF ;
     public final EObject entryRuleXRelationalExpression() throws RecognitionException {
         EObject current = null;
 
@@ -9120,13 +9062,13 @@ public final EObject entryRuleXRelationalExpression() throws RecognitionExceptio
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3184:2: (iv_ruleXRelationalExpression= ruleXRelationalExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3185:2: iv_ruleXRelationalExpression= ruleXRelationalExpression EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3165:2: (iv_ruleXRelationalExpression= ruleXRelationalExpression EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3166:2: iv_ruleXRelationalExpression= ruleXRelationalExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXRelationalExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXRelationalExpression_in_entryRuleXRelationalExpression7212);
+            pushFollow(FOLLOW_ruleXRelationalExpression_in_entryRuleXRelationalExpression7174);
             iv_ruleXRelationalExpression=ruleXRelationalExpression();
 
             state._fsp--;
@@ -9134,7 +9076,7 @@ public final EObject entryRuleXRelationalExpression() throws RecognitionExceptio
             if ( state.backtracking==0 ) {
                current =iv_ruleXRelationalExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXRelationalExpression7222); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXRelationalExpression7184); if (state.failed) return current;
 
             }
 
@@ -9152,7 +9094,7 @@ public final EObject entryRuleXRelationalExpression() throws RecognitionExceptio
 
 
     // $ANTLR start "ruleXRelationalExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3192:1: ruleXRelationalExpression returns [EObject current=null] : (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3173:1: ruleXRelationalExpression returns [EObject current=null] : (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* ) ;
     public final EObject ruleXRelationalExpression() throws RecognitionException {
         EObject current = null;
 
@@ -9167,18 +9109,18 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3195:28: ( (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3196:1: (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3176:28: ( (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3177:1: (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3196:1: (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3197:5: this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )*
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3177:1: (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3178:5: this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXRelationalExpressionAccess().getXOtherOperatorExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleXOtherOperatorExpression_in_ruleXRelationalExpression7269);
+            pushFollow(FOLLOW_ruleXOtherOperatorExpression_in_ruleXRelationalExpression7231);
             this_XOtherOperatorExpression_0=ruleXOtherOperatorExpression();
 
             state._fsp--;
@@ -9189,17 +9131,17 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3205:1: ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )*
-            loop63:
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3186:1: ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )*
+            loop62:
             do {
-                int alt63=3;
+                int alt62=3;
                 switch ( input.LA(1) ) {
                 case 56:
                     {
-                    int LA63_2 = input.LA(2);
+                    int LA62_2 = input.LA(2);
 
                     if ( (synpred26_InternalCheck()) ) {
-                        alt63=2;
+                        alt62=2;
                     }
 
 
@@ -9207,10 +9149,10 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
                     break;
                 case 57:
                     {
-                    int LA63_3 = input.LA(2);
+                    int LA62_3 = input.LA(2);
 
                     if ( (synpred26_InternalCheck()) ) {
-                        alt63=2;
+                        alt62=2;
                     }
 
 
@@ -9218,10 +9160,10 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
                     break;
                 case 65:
                     {
-                    int LA63_4 = input.LA(2);
+                    int LA62_4 = input.LA(2);
 
                     if ( (synpred25_InternalCheck()) ) {
-                        alt63=1;
+                        alt62=1;
                     }
 
 
@@ -9229,10 +9171,10 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
                     break;
                 case 58:
                     {
-                    int LA63_5 = input.LA(2);
+                    int LA62_5 = input.LA(2);
 
                     if ( (synpred26_InternalCheck()) ) {
-                        alt63=2;
+                        alt62=2;
                     }
 
 
@@ -9241,21 +9183,21 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
 
                 }
 
-                switch (alt63) {
+                switch (alt62) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3205:2: ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3186:2: ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3205:2: ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3205:3: ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3186:2: ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3186:3: ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3205:3: ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3205:4: ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3186:3: ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3186:4: ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3207:5: ( () otherlv_2= 'instanceof' )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3207:6: () otherlv_2= 'instanceof'
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3188:5: ( () otherlv_2= 'instanceof' )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3188:6: () otherlv_2= 'instanceof'
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3207:6: ()
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3208:5: 
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3188:6: ()
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3189:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -9267,7 +9209,7 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
 
             	    }
 
-            	    otherlv_2=(Token)match(input,65,FOLLOW_65_in_ruleXRelationalExpression7305); if (state.failed) return current;
+            	    otherlv_2=(Token)match(input,65,FOLLOW_65_in_ruleXRelationalExpression7267); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_2, grammarAccess.getXRelationalExpressionAccess().getInstanceofKeyword_1_0_0_0_1());
@@ -9279,18 +9221,18 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3217:3: ( (lv_type_3_0= ruleJvmTypeReference ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3218:1: (lv_type_3_0= ruleJvmTypeReference )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3198:3: ( (lv_type_3_0= ruleJvmTypeReference ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3199:1: (lv_type_3_0= ruleJvmTypeReference )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3218:1: (lv_type_3_0= ruleJvmTypeReference )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3219:3: lv_type_3_0= ruleJvmTypeReference
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3199:1: (lv_type_3_0= ruleJvmTypeReference )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3200:3: lv_type_3_0= ruleJvmTypeReference
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXRelationalExpressionAccess().getTypeJvmTypeReferenceParserRuleCall_1_0_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleXRelationalExpression7328);
+            	    pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleXRelationalExpression7290);
             	    lv_type_3_0=ruleJvmTypeReference();
 
             	    state._fsp--;
@@ -9321,19 +9263,19 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
             	    }
             	    break;
             	case 2 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3236:6: ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3217:6: ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3236:6: ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3236:7: ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3217:6: ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3217:7: ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3236:7: ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3236:8: ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3217:7: ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3217:8: ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3241:6: ( () ( ( ruleOpCompare ) ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3241:7: () ( ( ruleOpCompare ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3222:6: ( () ( ( ruleOpCompare ) ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3222:7: () ( ( ruleOpCompare ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3241:7: ()
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3242:5: 
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3222:7: ()
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3223:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -9345,11 +9287,11 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3247:2: ( ( ruleOpCompare ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3248:1: ( ruleOpCompare )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3228:2: ( ( ruleOpCompare ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3229:1: ( ruleOpCompare )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3248:1: ( ruleOpCompare )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3249:3: ruleOpCompare
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3229:1: ( ruleOpCompare )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3230:3: ruleOpCompare
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -9363,7 +9305,7 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
             	      	        newCompositeNode(grammarAccess.getXRelationalExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_1_0_0_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleOpCompare_in_ruleXRelationalExpression7389);
+            	    pushFollow(FOLLOW_ruleOpCompare_in_ruleXRelationalExpression7351);
             	    ruleOpCompare();
 
             	    state._fsp--;
@@ -9385,18 +9327,18 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3262:4: ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3263:1: (lv_rightOperand_6_0= ruleXOtherOperatorExpression )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3243:4: ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3244:1: (lv_rightOperand_6_0= ruleXOtherOperatorExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3263:1: (lv_rightOperand_6_0= ruleXOtherOperatorExpression )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3264:3: lv_rightOperand_6_0= ruleXOtherOperatorExpression
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3244:1: (lv_rightOperand_6_0= ruleXOtherOperatorExpression )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3245:3: lv_rightOperand_6_0= ruleXOtherOperatorExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXRelationalExpressionAccess().getRightOperandXOtherOperatorExpressionParserRuleCall_1_1_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXOtherOperatorExpression_in_ruleXRelationalExpression7412);
+            	    pushFollow(FOLLOW_ruleXOtherOperatorExpression_in_ruleXRelationalExpression7374);
             	    lv_rightOperand_6_0=ruleXOtherOperatorExpression();
 
             	    state._fsp--;
@@ -9428,7 +9370,7 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
             	    break;
 
             	default :
-            	    break loop63;
+            	    break loop62;
                 }
             } while (true);
 
@@ -9455,7 +9397,7 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpCompare"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3288:1: entryRuleOpCompare returns [String current=null] : iv_ruleOpCompare= ruleOpCompare EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3269:1: entryRuleOpCompare returns [String current=null] : iv_ruleOpCompare= ruleOpCompare EOF ;
     public final String entryRuleOpCompare() throws RecognitionException {
         String current = null;
 
@@ -9463,13 +9405,13 @@ public final String entryRuleOpCompare() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3289:2: (iv_ruleOpCompare= ruleOpCompare EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3290:2: iv_ruleOpCompare= ruleOpCompare EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3270:2: (iv_ruleOpCompare= ruleOpCompare EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3271:2: iv_ruleOpCompare= ruleOpCompare EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpCompareRule()); 
             }
-            pushFollow(FOLLOW_ruleOpCompare_in_entryRuleOpCompare7452);
+            pushFollow(FOLLOW_ruleOpCompare_in_entryRuleOpCompare7414);
             iv_ruleOpCompare=ruleOpCompare();
 
             state._fsp--;
@@ -9477,7 +9419,7 @@ public final String entryRuleOpCompare() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpCompare.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpCompare7463); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleOpCompare7425); if (state.failed) return current;
 
             }
 
@@ -9495,7 +9437,7 @@ public final String entryRuleOpCompare() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpCompare"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3297:1: ruleOpCompare returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3278:1: ruleOpCompare returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' ) ;
     public final AntlrDatatypeRuleToken ruleOpCompare() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -9504,31 +9446,31 @@ public final AntlrDatatypeRuleToken ruleOpCompare() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3300:28: ( (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3301:1: (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3281:28: ( (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3282:1: (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3301:1: (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' )
-            int alt64=4;
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3282:1: (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' )
+            int alt63=4;
             switch ( input.LA(1) ) {
             case 58:
                 {
-                alt64=1;
+                alt63=1;
                 }
                 break;
             case 56:
                 {
-                int LA64_2 = input.LA(2);
+                int LA63_2 = input.LA(2);
 
-                if ( (LA64_2==EOF||(LA64_2>=RULE_STRING && LA64_2<=RULE_ID)||(LA64_2>=15 && LA64_2<=19)||LA64_2==21||(LA64_2>=23 && LA64_2<=24)||LA64_2==27||LA64_2==29||(LA64_2>=33 && LA64_2<=34)||(LA64_2>=36 && LA64_2<=50)||LA64_2==56||(LA64_2>=71 && LA64_2<=72)||LA64_2==77||LA64_2==85||LA64_2==87||(LA64_2>=91 && LA64_2<=92)||(LA64_2>=95 && LA64_2<=103)||LA64_2==105) ) {
-                    alt64=4;
+                if ( (LA63_2==EOF||(LA63_2>=RULE_STRING && LA63_2<=RULE_ID)||(LA63_2>=15 && LA63_2<=18)||LA63_2==20||(LA63_2>=22 && LA63_2<=23)||LA63_2==26||LA63_2==28||(LA63_2>=32 && LA63_2<=33)||(LA63_2>=35 && LA63_2<=50)||LA63_2==56||(LA63_2>=71 && LA63_2<=72)||LA63_2==77||LA63_2==85||LA63_2==87||(LA63_2>=91 && LA63_2<=92)||(LA63_2>=95 && LA63_2<=103)||LA63_2==105) ) {
+                    alt63=4;
                 }
-                else if ( (LA64_2==32) ) {
-                    alt64=2;
+                else if ( (LA63_2==31) ) {
+                    alt63=2;
                 }
                 else {
                     if (state.backtracking>0) {state.failed=true; return current;}
                     NoViableAltException nvae =
-                        new NoViableAltException("", 64, 2, input);
+                        new NoViableAltException("", 63, 2, input);
 
                     throw nvae;
                 }
@@ -9536,22 +9478,22 @@ else if ( (LA64_2==32) ) {
                 break;
             case 57:
                 {
-                alt64=3;
+                alt63=3;
                 }
                 break;
             default:
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 64, 0, input);
+                    new NoViableAltException("", 63, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt64) {
+            switch (alt63) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3302:2: kw= '>='
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3283:2: kw= '>='
                     {
-                    kw=(Token)match(input,58,FOLLOW_58_in_ruleOpCompare7501); if (state.failed) return current;
+                    kw=(Token)match(input,58,FOLLOW_58_in_ruleOpCompare7463); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -9562,19 +9504,19 @@ else if ( (LA64_2==32) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3308:6: (kw= '<' kw= '=' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3289:6: (kw= '<' kw= '=' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3308:6: (kw= '<' kw= '=' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3309:2: kw= '<' kw= '='
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3289:6: (kw= '<' kw= '=' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3290:2: kw= '<' kw= '='
                     {
-                    kw=(Token)match(input,56,FOLLOW_56_in_ruleOpCompare7521); if (state.failed) return current;
+                    kw=(Token)match(input,56,FOLLOW_56_in_ruleOpCompare7483); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
                               newLeafNode(kw, grammarAccess.getOpCompareAccess().getLessThanSignKeyword_1_0()); 
                           
                     }
-                    kw=(Token)match(input,32,FOLLOW_32_in_ruleOpCompare7534); if (state.failed) return current;
+                    kw=(Token)match(input,31,FOLLOW_31_in_ruleOpCompare7496); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -9588,9 +9530,9 @@ else if ( (LA64_2==32) ) {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3322:2: kw= '>'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3303:2: kw= '>'
                     {
-                    kw=(Token)match(input,57,FOLLOW_57_in_ruleOpCompare7554); if (state.failed) return current;
+                    kw=(Token)match(input,57,FOLLOW_57_in_ruleOpCompare7516); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -9601,9 +9543,9 @@ else if ( (LA64_2==32) ) {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3329:2: kw= '<'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3310:2: kw= '<'
                     {
-                    kw=(Token)match(input,56,FOLLOW_56_in_ruleOpCompare7573); if (state.failed) return current;
+                    kw=(Token)match(input,56,FOLLOW_56_in_ruleOpCompare7535); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -9636,7 +9578,7 @@ else if ( (LA64_2==32) ) {
 
 
     // $ANTLR start "entryRuleXOtherOperatorExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3342:1: entryRuleXOtherOperatorExpression returns [EObject current=null] : iv_ruleXOtherOperatorExpression= ruleXOtherOperatorExpression EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3323:1: entryRuleXOtherOperatorExpression returns [EObject current=null] : iv_ruleXOtherOperatorExpression= ruleXOtherOperatorExpression EOF ;
     public final EObject entryRuleXOtherOperatorExpression() throws RecognitionException {
         EObject current = null;
 
@@ -9644,13 +9586,13 @@ public final EObject entryRuleXOtherOperatorExpression() throws RecognitionExcep
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3343:2: (iv_ruleXOtherOperatorExpression= ruleXOtherOperatorExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3344:2: iv_ruleXOtherOperatorExpression= ruleXOtherOperatorExpression EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3324:2: (iv_ruleXOtherOperatorExpression= ruleXOtherOperatorExpression EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3325:2: iv_ruleXOtherOperatorExpression= ruleXOtherOperatorExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXOtherOperatorExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXOtherOperatorExpression_in_entryRuleXOtherOperatorExpression7613);
+            pushFollow(FOLLOW_ruleXOtherOperatorExpression_in_entryRuleXOtherOperatorExpression7575);
             iv_ruleXOtherOperatorExpression=ruleXOtherOperatorExpression();
 
             state._fsp--;
@@ -9658,7 +9600,7 @@ public final EObject entryRuleXOtherOperatorExpression() throws RecognitionExcep
             if ( state.backtracking==0 ) {
                current =iv_ruleXOtherOperatorExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXOtherOperatorExpression7623); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXOtherOperatorExpression7585); if (state.failed) return current;
 
             }
 
@@ -9676,7 +9618,7 @@ public final EObject entryRuleXOtherOperatorExpression() throws RecognitionExcep
 
 
     // $ANTLR start "ruleXOtherOperatorExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3351:1: ruleXOtherOperatorExpression returns [EObject current=null] : (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3332:1: ruleXOtherOperatorExpression returns [EObject current=null] : (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* ) ;
     public final EObject ruleXOtherOperatorExpression() throws RecognitionException {
         EObject current = null;
 
@@ -9688,18 +9630,18 @@ public final EObject ruleXOtherOperatorExpression() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3354:28: ( (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3355:1: (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3335:28: ( (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3336:1: (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3355:1: (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3356:5: this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )*
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3336:1: (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3337:5: this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXOtherOperatorExpressionAccess().getXAdditiveExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleXAdditiveExpression_in_ruleXOtherOperatorExpression7670);
+            pushFollow(FOLLOW_ruleXAdditiveExpression_in_ruleXOtherOperatorExpression7632);
             this_XAdditiveExpression_0=ruleXAdditiveExpression();
 
             state._fsp--;
@@ -9710,23 +9652,23 @@ public final EObject ruleXOtherOperatorExpression() throws RecognitionException
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3364:1: ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )*
-            loop65:
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3345:1: ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )*
+            loop64:
             do {
-                int alt65=2;
-                alt65 = dfa65.predict(input);
-                switch (alt65) {
+                int alt64=2;
+                alt64 = dfa64.predict(input);
+                switch (alt64) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3364:2: ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3345:2: ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3364:2: ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3364:3: ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3345:2: ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3345:3: ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3369:6: ( () ( ( ruleOpOther ) ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3369:7: () ( ( ruleOpOther ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3350:6: ( () ( ( ruleOpOther ) ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3350:7: () ( ( ruleOpOther ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3369:7: ()
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3370:5: 
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3350:7: ()
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3351:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -9738,11 +9680,11 @@ public final EObject ruleXOtherOperatorExpression() throws RecognitionException
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3375:2: ( ( ruleOpOther ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3376:1: ( ruleOpOther )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3356:2: ( ( ruleOpOther ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3357:1: ( ruleOpOther )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3376:1: ( ruleOpOther )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3377:3: ruleOpOther
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3357:1: ( ruleOpOther )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3358:3: ruleOpOther
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -9756,7 +9698,7 @@ public final EObject ruleXOtherOperatorExpression() throws RecognitionException
             	      	        newCompositeNode(grammarAccess.getXOtherOperatorExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleOpOther_in_ruleXOtherOperatorExpression7723);
+            	    pushFollow(FOLLOW_ruleOpOther_in_ruleXOtherOperatorExpression7685);
             	    ruleOpOther();
 
             	    state._fsp--;
@@ -9778,18 +9720,18 @@ public final EObject ruleXOtherOperatorExpression() throws RecognitionException
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3390:4: ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3391:1: (lv_rightOperand_3_0= ruleXAdditiveExpression )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3371:4: ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3372:1: (lv_rightOperand_3_0= ruleXAdditiveExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3391:1: (lv_rightOperand_3_0= ruleXAdditiveExpression )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3392:3: lv_rightOperand_3_0= ruleXAdditiveExpression
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3372:1: (lv_rightOperand_3_0= ruleXAdditiveExpression )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3373:3: lv_rightOperand_3_0= ruleXAdditiveExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXOtherOperatorExpressionAccess().getRightOperandXAdditiveExpressionParserRuleCall_1_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXAdditiveExpression_in_ruleXOtherOperatorExpression7746);
+            	    pushFollow(FOLLOW_ruleXAdditiveExpression_in_ruleXOtherOperatorExpression7708);
             	    lv_rightOperand_3_0=ruleXAdditiveExpression();
 
             	    state._fsp--;
@@ -9818,7 +9760,7 @@ public final EObject ruleXOtherOperatorExpression() throws RecognitionException
             	    break;
 
             	default :
-            	    break loop65;
+            	    break loop64;
                 }
             } while (true);
 
@@ -9845,7 +9787,7 @@ public final EObject ruleXOtherOperatorExpression() throws RecognitionException
 
 
     // $ANTLR start "entryRuleOpOther"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3416:1: entryRuleOpOther returns [String current=null] : iv_ruleOpOther= ruleOpOther EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3397:1: entryRuleOpOther returns [String current=null] : iv_ruleOpOther= ruleOpOther EOF ;
     public final String entryRuleOpOther() throws RecognitionException {
         String current = null;
 
@@ -9853,13 +9795,13 @@ public final String entryRuleOpOther() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3417:2: (iv_ruleOpOther= ruleOpOther EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3418:2: iv_ruleOpOther= ruleOpOther EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3398:2: (iv_ruleOpOther= ruleOpOther EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3399:2: iv_ruleOpOther= ruleOpOther EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpOtherRule()); 
             }
-            pushFollow(FOLLOW_ruleOpOther_in_entryRuleOpOther7785);
+            pushFollow(FOLLOW_ruleOpOther_in_entryRuleOpOther7747);
             iv_ruleOpOther=ruleOpOther();
 
             state._fsp--;
@@ -9867,7 +9809,7 @@ public final String entryRuleOpOther() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpOther.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpOther7796); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleOpOther7758); if (state.failed) return current;
 
             }
 
@@ -9885,7 +9827,7 @@ public final String entryRuleOpOther() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpOther"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3425:1: ruleOpOther returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3406:1: ruleOpOther returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' ) ;
     public final AntlrDatatypeRuleToken ruleOpOther() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -9894,17 +9836,17 @@ public final AntlrDatatypeRuleToken ruleOpOther() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3428:28: ( (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3429:1: (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3409:28: ( (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3410:1: (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3429:1: (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' )
-            int alt68=9;
-            alt68 = dfa68.predict(input);
-            switch (alt68) {
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3410:1: (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' )
+            int alt67=9;
+            alt67 = dfa67.predict(input);
+            switch (alt67) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3430:2: kw= '->'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3411:2: kw= '->'
                     {
-                    kw=(Token)match(input,66,FOLLOW_66_in_ruleOpOther7834); if (state.failed) return current;
+                    kw=(Token)match(input,66,FOLLOW_66_in_ruleOpOther7796); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -9915,9 +9857,9 @@ public final AntlrDatatypeRuleToken ruleOpOther() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3437:2: kw= '..<'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3418:2: kw= '..<'
                     {
-                    kw=(Token)match(input,67,FOLLOW_67_in_ruleOpOther7853); if (state.failed) return current;
+                    kw=(Token)match(input,67,FOLLOW_67_in_ruleOpOther7815); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -9928,19 +9870,19 @@ public final AntlrDatatypeRuleToken ruleOpOther() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3443:6: (kw= '>' kw= '..' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3424:6: (kw= '>' kw= '..' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3443:6: (kw= '>' kw= '..' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3444:2: kw= '>' kw= '..'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3424:6: (kw= '>' kw= '..' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3425:2: kw= '>' kw= '..'
                     {
-                    kw=(Token)match(input,57,FOLLOW_57_in_ruleOpOther7873); if (state.failed) return current;
+                    kw=(Token)match(input,57,FOLLOW_57_in_ruleOpOther7835); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
                               newLeafNode(kw, grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_2_0()); 
                           
                     }
-                    kw=(Token)match(input,30,FOLLOW_30_in_ruleOpOther7886); if (state.failed) return current;
+                    kw=(Token)match(input,29,FOLLOW_29_in_ruleOpOther7848); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -9954,9 +9896,9 @@ public final AntlrDatatypeRuleToken ruleOpOther() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3457:2: kw= '..'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3438:2: kw= '..'
                     {
-                    kw=(Token)match(input,30,FOLLOW_30_in_ruleOpOther7906); if (state.failed) return current;
+                    kw=(Token)match(input,29,FOLLOW_29_in_ruleOpOther7868); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -9967,9 +9909,9 @@ public final AntlrDatatypeRuleToken ruleOpOther() throws RecognitionException {
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3464:2: kw= '=>'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3445:2: kw= '=>'
                     {
-                    kw=(Token)match(input,68,FOLLOW_68_in_ruleOpOther7925); if (state.failed) return current;
+                    kw=(Token)match(input,68,FOLLOW_68_in_ruleOpOther7887); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -9980,35 +9922,35 @@ public final AntlrDatatypeRuleToken ruleOpOther() throws RecognitionException {
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3470:6: (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3451:6: (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3470:6: (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3471:2: kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3451:6: (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3452:2: kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' )
                     {
-                    kw=(Token)match(input,57,FOLLOW_57_in_ruleOpOther7945); if (state.failed) return current;
+                    kw=(Token)match(input,57,FOLLOW_57_in_ruleOpOther7907); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
                               newLeafNode(kw, grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_0()); 
                           
                     }
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3476:1: ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' )
-                    int alt66=2;
-                    int LA66_0 = input.LA(1);
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3457:1: ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' )
+                    int alt65=2;
+                    int LA65_0 = input.LA(1);
 
-                    if ( (LA66_0==57) ) {
-                        int LA66_1 = input.LA(2);
+                    if ( (LA65_0==57) ) {
+                        int LA65_1 = input.LA(2);
 
-                        if ( (LA66_1==EOF||(LA66_1>=RULE_STRING && LA66_1<=RULE_ID)||(LA66_1>=15 && LA66_1<=19)||LA66_1==21||(LA66_1>=23 && LA66_1<=24)||LA66_1==27||LA66_1==29||(LA66_1>=33 && LA66_1<=34)||(LA66_1>=36 && LA66_1<=50)||LA66_1==56||(LA66_1>=71 && LA66_1<=72)||LA66_1==77||LA66_1==85||LA66_1==87||(LA66_1>=91 && LA66_1<=92)||(LA66_1>=95 && LA66_1<=103)||LA66_1==105) ) {
-                            alt66=2;
+                        if ( (LA65_1==EOF||(LA65_1>=RULE_STRING && LA65_1<=RULE_ID)||(LA65_1>=15 && LA65_1<=18)||LA65_1==20||(LA65_1>=22 && LA65_1<=23)||LA65_1==26||LA65_1==28||(LA65_1>=32 && LA65_1<=33)||(LA65_1>=35 && LA65_1<=50)||LA65_1==56||(LA65_1>=71 && LA65_1<=72)||LA65_1==77||LA65_1==85||LA65_1==87||(LA65_1>=91 && LA65_1<=92)||(LA65_1>=95 && LA65_1<=103)||LA65_1==105) ) {
+                            alt65=2;
                         }
-                        else if ( (LA66_1==57) && (synpred28_InternalCheck())) {
-                            alt66=1;
+                        else if ( (LA65_1==57) && (synpred28_InternalCheck())) {
+                            alt65=1;
                         }
                         else {
                             if (state.backtracking>0) {state.failed=true; return current;}
                             NoViableAltException nvae =
-                                new NoViableAltException("", 66, 1, input);
+                                new NoViableAltException("", 65, 1, input);
 
                             throw nvae;
                         }
@@ -10016,28 +9958,28 @@ else if ( (LA66_1==57) && (synpred28_InternalCheck())) {
                     else {
                         if (state.backtracking>0) {state.failed=true; return current;}
                         NoViableAltException nvae =
-                            new NoViableAltException("", 66, 0, input);
+                            new NoViableAltException("", 65, 0, input);
 
                         throw nvae;
                     }
-                    switch (alt66) {
+                    switch (alt65) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3476:2: ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3457:2: ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3476:2: ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3476:3: ( ( '>' '>' ) )=> (kw= '>' kw= '>' )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3457:2: ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3457:3: ( ( '>' '>' ) )=> (kw= '>' kw= '>' )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3480:5: (kw= '>' kw= '>' )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3481:2: kw= '>' kw= '>'
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3461:5: (kw= '>' kw= '>' )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3462:2: kw= '>' kw= '>'
                             {
-                            kw=(Token)match(input,57,FOLLOW_57_in_ruleOpOther7976); if (state.failed) return current;
+                            kw=(Token)match(input,57,FOLLOW_57_in_ruleOpOther7938); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       current.merge(kw);
                                       newLeafNode(kw, grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_1_0_0_0()); 
                                   
                             }
-                            kw=(Token)match(input,57,FOLLOW_57_in_ruleOpOther7989); if (state.failed) return current;
+                            kw=(Token)match(input,57,FOLLOW_57_in_ruleOpOther7951); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       current.merge(kw);
@@ -10054,9 +9996,9 @@ else if ( (LA66_1==57) && (synpred28_InternalCheck())) {
                             }
                             break;
                         case 2 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3494:2: kw= '>'
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3475:2: kw= '>'
                             {
-                            kw=(Token)match(input,57,FOLLOW_57_in_ruleOpOther8010); if (state.failed) return current;
+                            kw=(Token)match(input,57,FOLLOW_57_in_ruleOpOther7972); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       current.merge(kw);
@@ -10076,67 +10018,67 @@ else if ( (LA66_1==57) && (synpred28_InternalCheck())) {
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3500:6: (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3481:6: (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3500:6: (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3501:2: kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3481:6: (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3482:2: kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' )
                     {
-                    kw=(Token)match(input,56,FOLLOW_56_in_ruleOpOther8032); if (state.failed) return current;
+                    kw=(Token)match(input,56,FOLLOW_56_in_ruleOpOther7994); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
                               newLeafNode(kw, grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_0()); 
                           
                     }
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3506:1: ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' )
-                    int alt67=3;
-                    int LA67_0 = input.LA(1);
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3487:1: ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' )
+                    int alt66=3;
+                    int LA66_0 = input.LA(1);
 
-                    if ( (LA67_0==56) ) {
-                        int LA67_1 = input.LA(2);
+                    if ( (LA66_0==56) ) {
+                        int LA66_1 = input.LA(2);
 
                         if ( (synpred29_InternalCheck()) ) {
-                            alt67=1;
+                            alt66=1;
                         }
                         else if ( (true) ) {
-                            alt67=2;
+                            alt66=2;
                         }
                         else {
                             if (state.backtracking>0) {state.failed=true; return current;}
                             NoViableAltException nvae =
-                                new NoViableAltException("", 67, 1, input);
+                                new NoViableAltException("", 66, 1, input);
 
                             throw nvae;
                         }
                     }
-                    else if ( (LA67_0==68) ) {
-                        alt67=3;
+                    else if ( (LA66_0==68) ) {
+                        alt66=3;
                     }
                     else {
                         if (state.backtracking>0) {state.failed=true; return current;}
                         NoViableAltException nvae =
-                            new NoViableAltException("", 67, 0, input);
+                            new NoViableAltException("", 66, 0, input);
 
                         throw nvae;
                     }
-                    switch (alt67) {
+                    switch (alt66) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3506:2: ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3487:2: ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3506:2: ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3506:3: ( ( '<' '<' ) )=> (kw= '<' kw= '<' )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3487:2: ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3487:3: ( ( '<' '<' ) )=> (kw= '<' kw= '<' )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3510:5: (kw= '<' kw= '<' )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3511:2: kw= '<' kw= '<'
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3491:5: (kw= '<' kw= '<' )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3492:2: kw= '<' kw= '<'
                             {
-                            kw=(Token)match(input,56,FOLLOW_56_in_ruleOpOther8063); if (state.failed) return current;
+                            kw=(Token)match(input,56,FOLLOW_56_in_ruleOpOther8025); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       current.merge(kw);
                                       newLeafNode(kw, grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_1_0_0_0()); 
                                   
                             }
-                            kw=(Token)match(input,56,FOLLOW_56_in_ruleOpOther8076); if (state.failed) return current;
+                            kw=(Token)match(input,56,FOLLOW_56_in_ruleOpOther8038); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       current.merge(kw);
@@ -10153,9 +10095,9 @@ else if ( (LA67_0==68) ) {
                             }
                             break;
                         case 2 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3524:2: kw= '<'
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3505:2: kw= '<'
                             {
-                            kw=(Token)match(input,56,FOLLOW_56_in_ruleOpOther8097); if (state.failed) return current;
+                            kw=(Token)match(input,56,FOLLOW_56_in_ruleOpOther8059); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       current.merge(kw);
@@ -10166,9 +10108,9 @@ else if ( (LA67_0==68) ) {
                             }
                             break;
                         case 3 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3531:2: kw= '=>'
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3512:2: kw= '=>'
                             {
-                            kw=(Token)match(input,68,FOLLOW_68_in_ruleOpOther8116); if (state.failed) return current;
+                            kw=(Token)match(input,68,FOLLOW_68_in_ruleOpOther8078); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       current.merge(kw);
@@ -10188,9 +10130,9 @@ else if ( (LA67_0==68) ) {
                     }
                     break;
                 case 8 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3538:2: kw= '<>'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3519:2: kw= '<>'
                     {
-                    kw=(Token)match(input,69,FOLLOW_69_in_ruleOpOther8137); if (state.failed) return current;
+                    kw=(Token)match(input,69,FOLLOW_69_in_ruleOpOther8099); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -10201,9 +10143,9 @@ else if ( (LA67_0==68) ) {
                     }
                     break;
                 case 9 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3545:2: kw= '?:'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3526:2: kw= '?:'
                     {
-                    kw=(Token)match(input,70,FOLLOW_70_in_ruleOpOther8156); if (state.failed) return current;
+                    kw=(Token)match(input,70,FOLLOW_70_in_ruleOpOther8118); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -10236,7 +10178,7 @@ else if ( (LA67_0==68) ) {
 
 
     // $ANTLR start "entryRuleXAdditiveExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3558:1: entryRuleXAdditiveExpression returns [EObject current=null] : iv_ruleXAdditiveExpression= ruleXAdditiveExpression EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3539:1: entryRuleXAdditiveExpression returns [EObject current=null] : iv_ruleXAdditiveExpression= ruleXAdditiveExpression EOF ;
     public final EObject entryRuleXAdditiveExpression() throws RecognitionException {
         EObject current = null;
 
@@ -10244,13 +10186,13 @@ public final EObject entryRuleXAdditiveExpression() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3559:2: (iv_ruleXAdditiveExpression= ruleXAdditiveExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3560:2: iv_ruleXAdditiveExpression= ruleXAdditiveExpression EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3540:2: (iv_ruleXAdditiveExpression= ruleXAdditiveExpression EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3541:2: iv_ruleXAdditiveExpression= ruleXAdditiveExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAdditiveExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXAdditiveExpression_in_entryRuleXAdditiveExpression8196);
+            pushFollow(FOLLOW_ruleXAdditiveExpression_in_entryRuleXAdditiveExpression8158);
             iv_ruleXAdditiveExpression=ruleXAdditiveExpression();
 
             state._fsp--;
@@ -10258,7 +10200,7 @@ public final EObject entryRuleXAdditiveExpression() throws RecognitionException
             if ( state.backtracking==0 ) {
                current =iv_ruleXAdditiveExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAdditiveExpression8206); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXAdditiveExpression8168); if (state.failed) return current;
 
             }
 
@@ -10276,7 +10218,7 @@ public final EObject entryRuleXAdditiveExpression() throws RecognitionException
 
 
     // $ANTLR start "ruleXAdditiveExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3567:1: ruleXAdditiveExpression returns [EObject current=null] : (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3548:1: ruleXAdditiveExpression returns [EObject current=null] : (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* ) ;
     public final EObject ruleXAdditiveExpression() throws RecognitionException {
         EObject current = null;
 
@@ -10288,18 +10230,18 @@ public final EObject ruleXAdditiveExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3570:28: ( (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3571:1: (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3551:28: ( (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3552:1: (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3571:1: (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3572:5: this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )*
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3552:1: (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3553:5: this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXAdditiveExpressionAccess().getXMultiplicativeExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleXMultiplicativeExpression_in_ruleXAdditiveExpression8253);
+            pushFollow(FOLLOW_ruleXMultiplicativeExpression_in_ruleXAdditiveExpression8215);
             this_XMultiplicativeExpression_0=ruleXMultiplicativeExpression();
 
             state._fsp--;
@@ -10310,44 +10252,44 @@ public final EObject ruleXAdditiveExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3580:1: ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )*
-            loop69:
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3561:1: ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )*
+            loop68:
             do {
-                int alt69=2;
-                int LA69_0 = input.LA(1);
+                int alt68=2;
+                int LA68_0 = input.LA(1);
 
-                if ( (LA69_0==71) ) {
-                    int LA69_2 = input.LA(2);
+                if ( (LA68_0==71) ) {
+                    int LA68_2 = input.LA(2);
 
                     if ( (synpred30_InternalCheck()) ) {
-                        alt69=1;
+                        alt68=1;
                     }
 
 
                 }
-                else if ( (LA69_0==72) ) {
-                    int LA69_3 = input.LA(2);
+                else if ( (LA68_0==72) ) {
+                    int LA68_3 = input.LA(2);
 
                     if ( (synpred30_InternalCheck()) ) {
-                        alt69=1;
+                        alt68=1;
                     }
 
 
                 }
 
 
-                switch (alt69) {
+                switch (alt68) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3580:2: ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3561:2: ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3580:2: ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3580:3: ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3561:2: ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3561:3: ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3585:6: ( () ( ( ruleOpAdd ) ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3585:7: () ( ( ruleOpAdd ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3566:6: ( () ( ( ruleOpAdd ) ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3566:7: () ( ( ruleOpAdd ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3585:7: ()
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3586:5: 
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3566:7: ()
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3567:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -10359,11 +10301,11 @@ else if ( (LA69_0==72) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3591:2: ( ( ruleOpAdd ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3592:1: ( ruleOpAdd )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3572:2: ( ( ruleOpAdd ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3573:1: ( ruleOpAdd )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3592:1: ( ruleOpAdd )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3593:3: ruleOpAdd
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3573:1: ( ruleOpAdd )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3574:3: ruleOpAdd
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -10377,7 +10319,7 @@ else if ( (LA69_0==72) ) {
             	      	        newCompositeNode(grammarAccess.getXAdditiveExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleOpAdd_in_ruleXAdditiveExpression8306);
+            	    pushFollow(FOLLOW_ruleOpAdd_in_ruleXAdditiveExpression8268);
             	    ruleOpAdd();
 
             	    state._fsp--;
@@ -10399,18 +10341,18 @@ else if ( (LA69_0==72) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3606:4: ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3607:1: (lv_rightOperand_3_0= ruleXMultiplicativeExpression )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3587:4: ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3588:1: (lv_rightOperand_3_0= ruleXMultiplicativeExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3607:1: (lv_rightOperand_3_0= ruleXMultiplicativeExpression )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3608:3: lv_rightOperand_3_0= ruleXMultiplicativeExpression
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3588:1: (lv_rightOperand_3_0= ruleXMultiplicativeExpression )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3589:3: lv_rightOperand_3_0= ruleXMultiplicativeExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXAdditiveExpressionAccess().getRightOperandXMultiplicativeExpressionParserRuleCall_1_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXMultiplicativeExpression_in_ruleXAdditiveExpression8329);
+            	    pushFollow(FOLLOW_ruleXMultiplicativeExpression_in_ruleXAdditiveExpression8291);
             	    lv_rightOperand_3_0=ruleXMultiplicativeExpression();
 
             	    state._fsp--;
@@ -10439,7 +10381,7 @@ else if ( (LA69_0==72) ) {
             	    break;
 
             	default :
-            	    break loop69;
+            	    break loop68;
                 }
             } while (true);
 
@@ -10466,7 +10408,7 @@ else if ( (LA69_0==72) ) {
 
 
     // $ANTLR start "entryRuleOpAdd"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3632:1: entryRuleOpAdd returns [String current=null] : iv_ruleOpAdd= ruleOpAdd EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3613:1: entryRuleOpAdd returns [String current=null] : iv_ruleOpAdd= ruleOpAdd EOF ;
     public final String entryRuleOpAdd() throws RecognitionException {
         String current = null;
 
@@ -10474,13 +10416,13 @@ public final String entryRuleOpAdd() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3633:2: (iv_ruleOpAdd= ruleOpAdd EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3634:2: iv_ruleOpAdd= ruleOpAdd EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3614:2: (iv_ruleOpAdd= ruleOpAdd EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3615:2: iv_ruleOpAdd= ruleOpAdd EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpAddRule()); 
             }
-            pushFollow(FOLLOW_ruleOpAdd_in_entryRuleOpAdd8368);
+            pushFollow(FOLLOW_ruleOpAdd_in_entryRuleOpAdd8330);
             iv_ruleOpAdd=ruleOpAdd();
 
             state._fsp--;
@@ -10488,7 +10430,7 @@ public final String entryRuleOpAdd() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpAdd.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpAdd8379); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleOpAdd8341); if (state.failed) return current;
 
             }
 
@@ -10506,7 +10448,7 @@ public final String entryRuleOpAdd() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpAdd"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3641:1: ruleOpAdd returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '+' | kw= '-' ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3622:1: ruleOpAdd returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '+' | kw= '-' ) ;
     public final AntlrDatatypeRuleToken ruleOpAdd() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -10515,31 +10457,31 @@ public final AntlrDatatypeRuleToken ruleOpAdd() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3644:28: ( (kw= '+' | kw= '-' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3645:1: (kw= '+' | kw= '-' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3625:28: ( (kw= '+' | kw= '-' ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3626:1: (kw= '+' | kw= '-' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3645:1: (kw= '+' | kw= '-' )
-            int alt70=2;
-            int LA70_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3626:1: (kw= '+' | kw= '-' )
+            int alt69=2;
+            int LA69_0 = input.LA(1);
 
-            if ( (LA70_0==71) ) {
-                alt70=1;
+            if ( (LA69_0==71) ) {
+                alt69=1;
             }
-            else if ( (LA70_0==72) ) {
-                alt70=2;
+            else if ( (LA69_0==72) ) {
+                alt69=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 70, 0, input);
+                    new NoViableAltException("", 69, 0, input);
 
                 throw nvae;
             }
-            switch (alt70) {
+            switch (alt69) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3646:2: kw= '+'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3627:2: kw= '+'
                     {
-                    kw=(Token)match(input,71,FOLLOW_71_in_ruleOpAdd8417); if (state.failed) return current;
+                    kw=(Token)match(input,71,FOLLOW_71_in_ruleOpAdd8379); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -10550,9 +10492,9 @@ else if ( (LA70_0==72) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3653:2: kw= '-'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3634:2: kw= '-'
                     {
-                    kw=(Token)match(input,72,FOLLOW_72_in_ruleOpAdd8436); if (state.failed) return current;
+                    kw=(Token)match(input,72,FOLLOW_72_in_ruleOpAdd8398); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -10585,7 +10527,7 @@ else if ( (LA70_0==72) ) {
 
 
     // $ANTLR start "entryRuleXMultiplicativeExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3666:1: entryRuleXMultiplicativeExpression returns [EObject current=null] : iv_ruleXMultiplicativeExpression= ruleXMultiplicativeExpression EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3647:1: entryRuleXMultiplicativeExpression returns [EObject current=null] : iv_ruleXMultiplicativeExpression= ruleXMultiplicativeExpression EOF ;
     public final EObject entryRuleXMultiplicativeExpression() throws RecognitionException {
         EObject current = null;
 
@@ -10593,13 +10535,13 @@ public final EObject entryRuleXMultiplicativeExpression() throws RecognitionExce
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3667:2: (iv_ruleXMultiplicativeExpression= ruleXMultiplicativeExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3668:2: iv_ruleXMultiplicativeExpression= ruleXMultiplicativeExpression EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3648:2: (iv_ruleXMultiplicativeExpression= ruleXMultiplicativeExpression EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3649:2: iv_ruleXMultiplicativeExpression= ruleXMultiplicativeExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXMultiplicativeExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXMultiplicativeExpression_in_entryRuleXMultiplicativeExpression8476);
+            pushFollow(FOLLOW_ruleXMultiplicativeExpression_in_entryRuleXMultiplicativeExpression8438);
             iv_ruleXMultiplicativeExpression=ruleXMultiplicativeExpression();
 
             state._fsp--;
@@ -10607,7 +10549,7 @@ public final EObject entryRuleXMultiplicativeExpression() throws RecognitionExce
             if ( state.backtracking==0 ) {
                current =iv_ruleXMultiplicativeExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXMultiplicativeExpression8486); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXMultiplicativeExpression8448); if (state.failed) return current;
 
             }
 
@@ -10625,7 +10567,7 @@ public final EObject entryRuleXMultiplicativeExpression() throws RecognitionExce
 
 
     // $ANTLR start "ruleXMultiplicativeExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3675:1: ruleXMultiplicativeExpression returns [EObject current=null] : (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3656:1: ruleXMultiplicativeExpression returns [EObject current=null] : (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* ) ;
     public final EObject ruleXMultiplicativeExpression() throws RecognitionException {
         EObject current = null;
 
@@ -10637,18 +10579,18 @@ public final EObject ruleXMultiplicativeExpression() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3678:28: ( (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3679:1: (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3659:28: ( (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3660:1: (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3679:1: (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3680:5: this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )*
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3660:1: (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3661:5: this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXMultiplicativeExpressionAccess().getXUnaryOperationParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleXUnaryOperation_in_ruleXMultiplicativeExpression8533);
+            pushFollow(FOLLOW_ruleXUnaryOperation_in_ruleXMultiplicativeExpression8495);
             this_XUnaryOperation_0=ruleXUnaryOperation();
 
             state._fsp--;
@@ -10659,17 +10601,17 @@ public final EObject ruleXMultiplicativeExpression() throws RecognitionException
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3688:1: ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )*
-            loop71:
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3669:1: ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )*
+            loop70:
             do {
-                int alt71=2;
+                int alt70=2;
                 switch ( input.LA(1) ) {
                 case 73:
                     {
-                    int LA71_2 = input.LA(2);
+                    int LA70_2 = input.LA(2);
 
                     if ( (synpred31_InternalCheck()) ) {
-                        alt71=1;
+                        alt70=1;
                     }
 
 
@@ -10677,10 +10619,10 @@ public final EObject ruleXMultiplicativeExpression() throws RecognitionException
                     break;
                 case 74:
                     {
-                    int LA71_3 = input.LA(2);
+                    int LA70_3 = input.LA(2);
 
                     if ( (synpred31_InternalCheck()) ) {
-                        alt71=1;
+                        alt70=1;
                     }
 
 
@@ -10688,10 +10630,10 @@ public final EObject ruleXMultiplicativeExpression() throws RecognitionException
                     break;
                 case 75:
                     {
-                    int LA71_4 = input.LA(2);
+                    int LA70_4 = input.LA(2);
 
                     if ( (synpred31_InternalCheck()) ) {
-                        alt71=1;
+                        alt70=1;
                     }
 
 
@@ -10699,10 +10641,10 @@ public final EObject ruleXMultiplicativeExpression() throws RecognitionException
                     break;
                 case 76:
                     {
-                    int LA71_5 = input.LA(2);
+                    int LA70_5 = input.LA(2);
 
                     if ( (synpred31_InternalCheck()) ) {
-                        alt71=1;
+                        alt70=1;
                     }
 
 
@@ -10711,18 +10653,18 @@ public final EObject ruleXMultiplicativeExpression() throws RecognitionException
 
                 }
 
-                switch (alt71) {
+                switch (alt70) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3688:2: ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3669:2: ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3688:2: ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3688:3: ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3669:2: ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3669:3: ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3693:6: ( () ( ( ruleOpMulti ) ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3693:7: () ( ( ruleOpMulti ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3674:6: ( () ( ( ruleOpMulti ) ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3674:7: () ( ( ruleOpMulti ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3693:7: ()
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3694:5: 
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3674:7: ()
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3675:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -10734,11 +10676,11 @@ public final EObject ruleXMultiplicativeExpression() throws RecognitionException
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3699:2: ( ( ruleOpMulti ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3700:1: ( ruleOpMulti )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3680:2: ( ( ruleOpMulti ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3681:1: ( ruleOpMulti )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3700:1: ( ruleOpMulti )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3701:3: ruleOpMulti
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3681:1: ( ruleOpMulti )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3682:3: ruleOpMulti
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -10752,7 +10694,7 @@ public final EObject ruleXMultiplicativeExpression() throws RecognitionException
             	      	        newCompositeNode(grammarAccess.getXMultiplicativeExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleOpMulti_in_ruleXMultiplicativeExpression8586);
+            	    pushFollow(FOLLOW_ruleOpMulti_in_ruleXMultiplicativeExpression8548);
             	    ruleOpMulti();
 
             	    state._fsp--;
@@ -10774,18 +10716,18 @@ public final EObject ruleXMultiplicativeExpression() throws RecognitionException
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3714:4: ( (lv_rightOperand_3_0= ruleXUnaryOperation ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3715:1: (lv_rightOperand_3_0= ruleXUnaryOperation )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3695:4: ( (lv_rightOperand_3_0= ruleXUnaryOperation ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3696:1: (lv_rightOperand_3_0= ruleXUnaryOperation )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3715:1: (lv_rightOperand_3_0= ruleXUnaryOperation )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3716:3: lv_rightOperand_3_0= ruleXUnaryOperation
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3696:1: (lv_rightOperand_3_0= ruleXUnaryOperation )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3697:3: lv_rightOperand_3_0= ruleXUnaryOperation
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXMultiplicativeExpressionAccess().getRightOperandXUnaryOperationParserRuleCall_1_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXUnaryOperation_in_ruleXMultiplicativeExpression8609);
+            	    pushFollow(FOLLOW_ruleXUnaryOperation_in_ruleXMultiplicativeExpression8571);
             	    lv_rightOperand_3_0=ruleXUnaryOperation();
 
             	    state._fsp--;
@@ -10814,7 +10756,7 @@ public final EObject ruleXMultiplicativeExpression() throws RecognitionException
             	    break;
 
             	default :
-            	    break loop71;
+            	    break loop70;
                 }
             } while (true);
 
@@ -10841,7 +10783,7 @@ public final EObject ruleXMultiplicativeExpression() throws RecognitionException
 
 
     // $ANTLR start "entryRuleOpMulti"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3740:1: entryRuleOpMulti returns [String current=null] : iv_ruleOpMulti= ruleOpMulti EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3721:1: entryRuleOpMulti returns [String current=null] : iv_ruleOpMulti= ruleOpMulti EOF ;
     public final String entryRuleOpMulti() throws RecognitionException {
         String current = null;
 
@@ -10849,13 +10791,13 @@ public final String entryRuleOpMulti() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3741:2: (iv_ruleOpMulti= ruleOpMulti EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3742:2: iv_ruleOpMulti= ruleOpMulti EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3722:2: (iv_ruleOpMulti= ruleOpMulti EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3723:2: iv_ruleOpMulti= ruleOpMulti EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpMultiRule()); 
             }
-            pushFollow(FOLLOW_ruleOpMulti_in_entryRuleOpMulti8648);
+            pushFollow(FOLLOW_ruleOpMulti_in_entryRuleOpMulti8610);
             iv_ruleOpMulti=ruleOpMulti();
 
             state._fsp--;
@@ -10863,7 +10805,7 @@ public final String entryRuleOpMulti() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpMulti.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpMulti8659); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleOpMulti8621); if (state.failed) return current;
 
             }
 
@@ -10881,7 +10823,7 @@ public final String entryRuleOpMulti() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpMulti"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3749:1: ruleOpMulti returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '*' | kw= '**' | kw= '/' | kw= '%' ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3730:1: ruleOpMulti returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '*' | kw= '**' | kw= '/' | kw= '%' ) ;
     public final AntlrDatatypeRuleToken ruleOpMulti() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -10890,45 +10832,45 @@ public final AntlrDatatypeRuleToken ruleOpMulti() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3752:28: ( (kw= '*' | kw= '**' | kw= '/' | kw= '%' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3753:1: (kw= '*' | kw= '**' | kw= '/' | kw= '%' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3733:28: ( (kw= '*' | kw= '**' | kw= '/' | kw= '%' ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3734:1: (kw= '*' | kw= '**' | kw= '/' | kw= '%' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3753:1: (kw= '*' | kw= '**' | kw= '/' | kw= '%' )
-            int alt72=4;
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3734:1: (kw= '*' | kw= '**' | kw= '/' | kw= '%' )
+            int alt71=4;
             switch ( input.LA(1) ) {
             case 73:
                 {
-                alt72=1;
+                alt71=1;
                 }
                 break;
             case 74:
                 {
-                alt72=2;
+                alt71=2;
                 }
                 break;
             case 75:
                 {
-                alt72=3;
+                alt71=3;
                 }
                 break;
             case 76:
                 {
-                alt72=4;
+                alt71=4;
                 }
                 break;
             default:
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 72, 0, input);
+                    new NoViableAltException("", 71, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt72) {
+            switch (alt71) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3754:2: kw= '*'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3735:2: kw= '*'
                     {
-                    kw=(Token)match(input,73,FOLLOW_73_in_ruleOpMulti8697); if (state.failed) return current;
+                    kw=(Token)match(input,73,FOLLOW_73_in_ruleOpMulti8659); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -10939,9 +10881,9 @@ public final AntlrDatatypeRuleToken ruleOpMulti() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3761:2: kw= '**'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3742:2: kw= '**'
                     {
-                    kw=(Token)match(input,74,FOLLOW_74_in_ruleOpMulti8716); if (state.failed) return current;
+                    kw=(Token)match(input,74,FOLLOW_74_in_ruleOpMulti8678); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -10952,9 +10894,9 @@ public final AntlrDatatypeRuleToken ruleOpMulti() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3768:2: kw= '/'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3749:2: kw= '/'
                     {
-                    kw=(Token)match(input,75,FOLLOW_75_in_ruleOpMulti8735); if (state.failed) return current;
+                    kw=(Token)match(input,75,FOLLOW_75_in_ruleOpMulti8697); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -10965,9 +10907,9 @@ public final AntlrDatatypeRuleToken ruleOpMulti() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3775:2: kw= '%'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3756:2: kw= '%'
                     {
-                    kw=(Token)match(input,76,FOLLOW_76_in_ruleOpMulti8754); if (state.failed) return current;
+                    kw=(Token)match(input,76,FOLLOW_76_in_ruleOpMulti8716); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -11000,7 +10942,7 @@ public final AntlrDatatypeRuleToken ruleOpMulti() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXUnaryOperation"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3788:1: entryRuleXUnaryOperation returns [EObject current=null] : iv_ruleXUnaryOperation= ruleXUnaryOperation EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3769:1: entryRuleXUnaryOperation returns [EObject current=null] : iv_ruleXUnaryOperation= ruleXUnaryOperation EOF ;
     public final EObject entryRuleXUnaryOperation() throws RecognitionException {
         EObject current = null;
 
@@ -11008,13 +10950,13 @@ public final EObject entryRuleXUnaryOperation() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3789:2: (iv_ruleXUnaryOperation= ruleXUnaryOperation EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3790:2: iv_ruleXUnaryOperation= ruleXUnaryOperation EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3770:2: (iv_ruleXUnaryOperation= ruleXUnaryOperation EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3771:2: iv_ruleXUnaryOperation= ruleXUnaryOperation EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXUnaryOperationRule()); 
             }
-            pushFollow(FOLLOW_ruleXUnaryOperation_in_entryRuleXUnaryOperation8794);
+            pushFollow(FOLLOW_ruleXUnaryOperation_in_entryRuleXUnaryOperation8756);
             iv_ruleXUnaryOperation=ruleXUnaryOperation();
 
             state._fsp--;
@@ -11022,7 +10964,7 @@ public final EObject entryRuleXUnaryOperation() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXUnaryOperation; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXUnaryOperation8804); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXUnaryOperation8766); if (state.failed) return current;
 
             }
 
@@ -11040,7 +10982,7 @@ public final EObject entryRuleXUnaryOperation() throws RecognitionException {
 
 
     // $ANTLR start "ruleXUnaryOperation"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3797:1: ruleXUnaryOperation returns [EObject current=null] : ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3778:1: ruleXUnaryOperation returns [EObject current=null] : ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression ) ;
     public final EObject ruleXUnaryOperation() throws RecognitionException {
         EObject current = null;
 
@@ -11052,35 +10994,35 @@ public final EObject ruleXUnaryOperation() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3800:28: ( ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3801:1: ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3781:28: ( ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3782:1: ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3801:1: ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression )
-            int alt73=2;
-            int LA73_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3782:1: ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression )
+            int alt72=2;
+            int LA72_0 = input.LA(1);
 
-            if ( ((LA73_0>=71 && LA73_0<=72)||LA73_0==77) ) {
-                alt73=1;
+            if ( ((LA72_0>=71 && LA72_0<=72)||LA72_0==77) ) {
+                alt72=1;
             }
-            else if ( ((LA73_0>=RULE_STRING && LA73_0<=RULE_ID)||(LA73_0>=15 && LA73_0<=19)||LA73_0==21||(LA73_0>=23 && LA73_0<=24)||LA73_0==27||LA73_0==29||(LA73_0>=33 && LA73_0<=34)||(LA73_0>=36 && LA73_0<=50)||LA73_0==56||LA73_0==85||LA73_0==87||(LA73_0>=91 && LA73_0<=92)||(LA73_0>=95 && LA73_0<=103)||LA73_0==105) ) {
-                alt73=2;
+            else if ( ((LA72_0>=RULE_STRING && LA72_0<=RULE_ID)||(LA72_0>=15 && LA72_0<=18)||LA72_0==20||(LA72_0>=22 && LA72_0<=23)||LA72_0==26||LA72_0==28||(LA72_0>=32 && LA72_0<=33)||(LA72_0>=35 && LA72_0<=50)||LA72_0==56||LA72_0==85||LA72_0==87||(LA72_0>=91 && LA72_0<=92)||(LA72_0>=95 && LA72_0<=103)||LA72_0==105) ) {
+                alt72=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 73, 0, input);
+                    new NoViableAltException("", 72, 0, input);
 
                 throw nvae;
             }
-            switch (alt73) {
+            switch (alt72) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3801:2: ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3782:2: ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3801:2: ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3801:3: () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3782:2: ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3782:3: () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3801:3: ()
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3802:5: 
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3782:3: ()
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3783:5: 
                     {
                     if ( state.backtracking==0 ) {
 
@@ -11092,11 +11034,11 @@ else if ( ((LA73_0>=RULE_STRING && LA73_0<=RULE_ID)||(LA73_0>=15 && LA73_0<=19)|
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3807:2: ( ( ruleOpUnary ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3808:1: ( ruleOpUnary )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3788:2: ( ( ruleOpUnary ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3789:1: ( ruleOpUnary )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3808:1: ( ruleOpUnary )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3809:3: ruleOpUnary
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3789:1: ( ruleOpUnary )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3790:3: ruleOpUnary
                     {
                     if ( state.backtracking==0 ) {
 
@@ -11110,7 +11052,7 @@ else if ( ((LA73_0>=RULE_STRING && LA73_0<=RULE_ID)||(LA73_0>=15 && LA73_0<=19)|
                       	        newCompositeNode(grammarAccess.getXUnaryOperationAccess().getFeatureJvmIdentifiableElementCrossReference_0_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleOpUnary_in_ruleXUnaryOperation8862);
+                    pushFollow(FOLLOW_ruleOpUnary_in_ruleXUnaryOperation8824);
                     ruleOpUnary();
 
                     state._fsp--;
@@ -11126,18 +11068,18 @@ else if ( ((LA73_0>=RULE_STRING && LA73_0<=RULE_ID)||(LA73_0>=15 && LA73_0<=19)|
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3822:2: ( (lv_operand_2_0= ruleXUnaryOperation ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3823:1: (lv_operand_2_0= ruleXUnaryOperation )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3803:2: ( (lv_operand_2_0= ruleXUnaryOperation ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3804:1: (lv_operand_2_0= ruleXUnaryOperation )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3823:1: (lv_operand_2_0= ruleXUnaryOperation )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3824:3: lv_operand_2_0= ruleXUnaryOperation
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3804:1: (lv_operand_2_0= ruleXUnaryOperation )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3805:3: lv_operand_2_0= ruleXUnaryOperation
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXUnaryOperationAccess().getOperandXUnaryOperationParserRuleCall_0_2_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXUnaryOperation_in_ruleXUnaryOperation8883);
+                    pushFollow(FOLLOW_ruleXUnaryOperation_in_ruleXUnaryOperation8845);
                     lv_operand_2_0=ruleXUnaryOperation();
 
                     state._fsp--;
@@ -11168,14 +11110,14 @@ else if ( ((LA73_0>=RULE_STRING && LA73_0<=RULE_ID)||(LA73_0>=15 && LA73_0<=19)|
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3842:5: this_XCastedExpression_3= ruleXCastedExpression
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3823:5: this_XCastedExpression_3= ruleXCastedExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXUnaryOperationAccess().getXCastedExpressionParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXCastedExpression_in_ruleXUnaryOperation8912);
+                    pushFollow(FOLLOW_ruleXCastedExpression_in_ruleXUnaryOperation8874);
                     this_XCastedExpression_3=ruleXCastedExpression();
 
                     state._fsp--;
@@ -11212,7 +11154,7 @@ else if ( ((LA73_0>=RULE_STRING && LA73_0<=RULE_ID)||(LA73_0>=15 && LA73_0<=19)|
 
 
     // $ANTLR start "entryRuleOpUnary"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3858:1: entryRuleOpUnary returns [String current=null] : iv_ruleOpUnary= ruleOpUnary EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3839:1: entryRuleOpUnary returns [String current=null] : iv_ruleOpUnary= ruleOpUnary EOF ;
     public final String entryRuleOpUnary() throws RecognitionException {
         String current = null;
 
@@ -11220,13 +11162,13 @@ public final String entryRuleOpUnary() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3859:2: (iv_ruleOpUnary= ruleOpUnary EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3860:2: iv_ruleOpUnary= ruleOpUnary EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3840:2: (iv_ruleOpUnary= ruleOpUnary EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3841:2: iv_ruleOpUnary= ruleOpUnary EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpUnaryRule()); 
             }
-            pushFollow(FOLLOW_ruleOpUnary_in_entryRuleOpUnary8948);
+            pushFollow(FOLLOW_ruleOpUnary_in_entryRuleOpUnary8910);
             iv_ruleOpUnary=ruleOpUnary();
 
             state._fsp--;
@@ -11234,7 +11176,7 @@ public final String entryRuleOpUnary() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpUnary.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpUnary8959); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleOpUnary8921); if (state.failed) return current;
 
             }
 
@@ -11252,7 +11194,7 @@ public final String entryRuleOpUnary() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpUnary"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3867:1: ruleOpUnary returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '!' | kw= '-' | kw= '+' ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3848:1: ruleOpUnary returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '!' | kw= '-' | kw= '+' ) ;
     public final AntlrDatatypeRuleToken ruleOpUnary() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -11261,40 +11203,40 @@ public final AntlrDatatypeRuleToken ruleOpUnary() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3870:28: ( (kw= '!' | kw= '-' | kw= '+' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3871:1: (kw= '!' | kw= '-' | kw= '+' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3851:28: ( (kw= '!' | kw= '-' | kw= '+' ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3852:1: (kw= '!' | kw= '-' | kw= '+' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3871:1: (kw= '!' | kw= '-' | kw= '+' )
-            int alt74=3;
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3852:1: (kw= '!' | kw= '-' | kw= '+' )
+            int alt73=3;
             switch ( input.LA(1) ) {
             case 77:
                 {
-                alt74=1;
+                alt73=1;
                 }
                 break;
             case 72:
                 {
-                alt74=2;
+                alt73=2;
                 }
                 break;
             case 71:
                 {
-                alt74=3;
+                alt73=3;
                 }
                 break;
             default:
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 74, 0, input);
+                    new NoViableAltException("", 73, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt74) {
+            switch (alt73) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3872:2: kw= '!'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3853:2: kw= '!'
                     {
-                    kw=(Token)match(input,77,FOLLOW_77_in_ruleOpUnary8997); if (state.failed) return current;
+                    kw=(Token)match(input,77,FOLLOW_77_in_ruleOpUnary8959); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -11305,9 +11247,9 @@ public final AntlrDatatypeRuleToken ruleOpUnary() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3879:2: kw= '-'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3860:2: kw= '-'
                     {
-                    kw=(Token)match(input,72,FOLLOW_72_in_ruleOpUnary9016); if (state.failed) return current;
+                    kw=(Token)match(input,72,FOLLOW_72_in_ruleOpUnary8978); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -11318,9 +11260,9 @@ public final AntlrDatatypeRuleToken ruleOpUnary() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3886:2: kw= '+'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3867:2: kw= '+'
                     {
-                    kw=(Token)match(input,71,FOLLOW_71_in_ruleOpUnary9035); if (state.failed) return current;
+                    kw=(Token)match(input,71,FOLLOW_71_in_ruleOpUnary8997); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -11353,7 +11295,7 @@ public final AntlrDatatypeRuleToken ruleOpUnary() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXCastedExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3899:1: entryRuleXCastedExpression returns [EObject current=null] : iv_ruleXCastedExpression= ruleXCastedExpression EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3880:1: entryRuleXCastedExpression returns [EObject current=null] : iv_ruleXCastedExpression= ruleXCastedExpression EOF ;
     public final EObject entryRuleXCastedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -11361,13 +11303,13 @@ public final EObject entryRuleXCastedExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3900:2: (iv_ruleXCastedExpression= ruleXCastedExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3901:2: iv_ruleXCastedExpression= ruleXCastedExpression EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3881:2: (iv_ruleXCastedExpression= ruleXCastedExpression EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3882:2: iv_ruleXCastedExpression= ruleXCastedExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXCastedExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXCastedExpression_in_entryRuleXCastedExpression9075);
+            pushFollow(FOLLOW_ruleXCastedExpression_in_entryRuleXCastedExpression9037);
             iv_ruleXCastedExpression=ruleXCastedExpression();
 
             state._fsp--;
@@ -11375,7 +11317,7 @@ public final EObject entryRuleXCastedExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXCastedExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXCastedExpression9085); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXCastedExpression9047); if (state.failed) return current;
 
             }
 
@@ -11393,7 +11335,7 @@ public final EObject entryRuleXCastedExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXCastedExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3908:1: ruleXCastedExpression returns [EObject current=null] : (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3889:1: ruleXCastedExpression returns [EObject current=null] : (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* ) ;
     public final EObject ruleXCastedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -11406,18 +11348,18 @@ public final EObject ruleXCastedExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3911:28: ( (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3912:1: (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3892:28: ( (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3893:1: (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3912:1: (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3913:5: this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )*
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3893:1: (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3894:5: this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXCastedExpressionAccess().getXPostfixOperationParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleXPostfixOperation_in_ruleXCastedExpression9132);
+            pushFollow(FOLLOW_ruleXPostfixOperation_in_ruleXCastedExpression9094);
             this_XPostfixOperation_0=ruleXPostfixOperation();
 
             state._fsp--;
@@ -11428,35 +11370,35 @@ public final EObject ruleXCastedExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3921:1: ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )*
-            loop75:
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3902:1: ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )*
+            loop74:
             do {
-                int alt75=2;
-                int LA75_0 = input.LA(1);
+                int alt74=2;
+                int LA74_0 = input.LA(1);
 
-                if ( (LA75_0==78) ) {
-                    int LA75_2 = input.LA(2);
+                if ( (LA74_0==78) ) {
+                    int LA74_2 = input.LA(2);
 
                     if ( (synpred32_InternalCheck()) ) {
-                        alt75=1;
+                        alt74=1;
                     }
 
 
                 }
 
 
-                switch (alt75) {
+                switch (alt74) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3921:2: ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3902:2: ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3921:2: ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3921:3: ( ( () 'as' ) )=> ( () otherlv_2= 'as' )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3902:2: ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3902:3: ( ( () 'as' ) )=> ( () otherlv_2= 'as' )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3923:5: ( () otherlv_2= 'as' )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3923:6: () otherlv_2= 'as'
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3904:5: ( () otherlv_2= 'as' )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3904:6: () otherlv_2= 'as'
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3923:6: ()
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3924:5: 
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3904:6: ()
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3905:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -11468,7 +11410,7 @@ public final EObject ruleXCastedExpression() throws RecognitionException {
 
             	    }
 
-            	    otherlv_2=(Token)match(input,78,FOLLOW_78_in_ruleXCastedExpression9167); if (state.failed) return current;
+            	    otherlv_2=(Token)match(input,78,FOLLOW_78_in_ruleXCastedExpression9129); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_2, grammarAccess.getXCastedExpressionAccess().getAsKeyword_1_0_0_1());
@@ -11480,18 +11422,18 @@ public final EObject ruleXCastedExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3933:3: ( (lv_type_3_0= ruleJvmTypeReference ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3934:1: (lv_type_3_0= ruleJvmTypeReference )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3914:3: ( (lv_type_3_0= ruleJvmTypeReference ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3915:1: (lv_type_3_0= ruleJvmTypeReference )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3934:1: (lv_type_3_0= ruleJvmTypeReference )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3935:3: lv_type_3_0= ruleJvmTypeReference
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3915:1: (lv_type_3_0= ruleJvmTypeReference )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3916:3: lv_type_3_0= ruleJvmTypeReference
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXCastedExpressionAccess().getTypeJvmTypeReferenceParserRuleCall_1_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleXCastedExpression9190);
+            	    pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleXCastedExpression9152);
             	    lv_type_3_0=ruleJvmTypeReference();
 
             	    state._fsp--;
@@ -11520,7 +11462,7 @@ public final EObject ruleXCastedExpression() throws RecognitionException {
             	    break;
 
             	default :
-            	    break loop75;
+            	    break loop74;
                 }
             } while (true);
 
@@ -11547,7 +11489,7 @@ public final EObject ruleXCastedExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXPostfixOperation"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3959:1: entryRuleXPostfixOperation returns [EObject current=null] : iv_ruleXPostfixOperation= ruleXPostfixOperation EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3940:1: entryRuleXPostfixOperation returns [EObject current=null] : iv_ruleXPostfixOperation= ruleXPostfixOperation EOF ;
     public final EObject entryRuleXPostfixOperation() throws RecognitionException {
         EObject current = null;
 
@@ -11555,13 +11497,13 @@ public final EObject entryRuleXPostfixOperation() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3960:2: (iv_ruleXPostfixOperation= ruleXPostfixOperation EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3961:2: iv_ruleXPostfixOperation= ruleXPostfixOperation EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3941:2: (iv_ruleXPostfixOperation= ruleXPostfixOperation EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3942:2: iv_ruleXPostfixOperation= ruleXPostfixOperation EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXPostfixOperationRule()); 
             }
-            pushFollow(FOLLOW_ruleXPostfixOperation_in_entryRuleXPostfixOperation9228);
+            pushFollow(FOLLOW_ruleXPostfixOperation_in_entryRuleXPostfixOperation9190);
             iv_ruleXPostfixOperation=ruleXPostfixOperation();
 
             state._fsp--;
@@ -11569,7 +11511,7 @@ public final EObject entryRuleXPostfixOperation() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXPostfixOperation; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXPostfixOperation9238); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXPostfixOperation9200); if (state.failed) return current;
 
             }
 
@@ -11587,7 +11529,7 @@ public final EObject entryRuleXPostfixOperation() throws RecognitionException {
 
 
     // $ANTLR start "ruleXPostfixOperation"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3968:1: ruleXPostfixOperation returns [EObject current=null] : (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3949:1: ruleXPostfixOperation returns [EObject current=null] : (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? ) ;
     public final EObject ruleXPostfixOperation() throws RecognitionException {
         EObject current = null;
 
@@ -11597,18 +11539,18 @@ public final EObject ruleXPostfixOperation() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3971:28: ( (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3972:1: (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3952:28: ( (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3953:1: (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3972:1: (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3973:5: this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )?
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3953:1: (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3954:5: this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )?
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXPostfixOperationAccess().getXMemberFeatureCallParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleXMemberFeatureCall_in_ruleXPostfixOperation9285);
+            pushFollow(FOLLOW_ruleXMemberFeatureCall_in_ruleXPostfixOperation9247);
             this_XMemberFeatureCall_0=ruleXMemberFeatureCall();
 
             state._fsp--;
@@ -11619,33 +11561,33 @@ public final EObject ruleXPostfixOperation() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3981:1: ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )?
-            int alt76=2;
-            int LA76_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3962:1: ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )?
+            int alt75=2;
+            int LA75_0 = input.LA(1);
 
-            if ( (LA76_0==79) ) {
-                int LA76_1 = input.LA(2);
+            if ( (LA75_0==79) ) {
+                int LA75_1 = input.LA(2);
 
                 if ( (synpred33_InternalCheck()) ) {
-                    alt76=1;
+                    alt75=1;
                 }
             }
-            else if ( (LA76_0==80) ) {
-                int LA76_2 = input.LA(2);
+            else if ( (LA75_0==80) ) {
+                int LA75_2 = input.LA(2);
 
                 if ( (synpred33_InternalCheck()) ) {
-                    alt76=1;
+                    alt75=1;
                 }
             }
-            switch (alt76) {
+            switch (alt75) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3981:2: ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3962:2: ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3986:6: ( () ( ( ruleOpPostfix ) ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3986:7: () ( ( ruleOpPostfix ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3967:6: ( () ( ( ruleOpPostfix ) ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3967:7: () ( ( ruleOpPostfix ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3986:7: ()
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3987:5: 
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3967:7: ()
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3968:5: 
                     {
                     if ( state.backtracking==0 ) {
 
@@ -11657,11 +11599,11 @@ else if ( (LA76_0==80) ) {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3992:2: ( ( ruleOpPostfix ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3993:1: ( ruleOpPostfix )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3973:2: ( ( ruleOpPostfix ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3974:1: ( ruleOpPostfix )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3993:1: ( ruleOpPostfix )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3994:3: ruleOpPostfix
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3974:1: ( ruleOpPostfix )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3975:3: ruleOpPostfix
                     {
                     if ( state.backtracking==0 ) {
 
@@ -11675,7 +11617,7 @@ else if ( (LA76_0==80) ) {
                       	        newCompositeNode(grammarAccess.getXPostfixOperationAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleOpPostfix_in_ruleXPostfixOperation9337);
+                    pushFollow(FOLLOW_ruleOpPostfix_in_ruleXPostfixOperation9299);
                     ruleOpPostfix();
 
                     state._fsp--;
@@ -11723,7 +11665,7 @@ else if ( (LA76_0==80) ) {
 
 
     // $ANTLR start "entryRuleOpPostfix"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4015:1: entryRuleOpPostfix returns [String current=null] : iv_ruleOpPostfix= ruleOpPostfix EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3996:1: entryRuleOpPostfix returns [String current=null] : iv_ruleOpPostfix= ruleOpPostfix EOF ;
     public final String entryRuleOpPostfix() throws RecognitionException {
         String current = null;
 
@@ -11731,13 +11673,13 @@ public final String entryRuleOpPostfix() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4016:2: (iv_ruleOpPostfix= ruleOpPostfix EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4017:2: iv_ruleOpPostfix= ruleOpPostfix EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3997:2: (iv_ruleOpPostfix= ruleOpPostfix EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3998:2: iv_ruleOpPostfix= ruleOpPostfix EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpPostfixRule()); 
             }
-            pushFollow(FOLLOW_ruleOpPostfix_in_entryRuleOpPostfix9377);
+            pushFollow(FOLLOW_ruleOpPostfix_in_entryRuleOpPostfix9339);
             iv_ruleOpPostfix=ruleOpPostfix();
 
             state._fsp--;
@@ -11745,7 +11687,7 @@ public final String entryRuleOpPostfix() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpPostfix.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpPostfix9388); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleOpPostfix9350); if (state.failed) return current;
 
             }
 
@@ -11763,7 +11705,7 @@ public final String entryRuleOpPostfix() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpPostfix"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4024:1: ruleOpPostfix returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '++' | kw= '--' ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4005:1: ruleOpPostfix returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '++' | kw= '--' ) ;
     public final AntlrDatatypeRuleToken ruleOpPostfix() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -11772,31 +11714,31 @@ public final AntlrDatatypeRuleToken ruleOpPostfix() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4027:28: ( (kw= '++' | kw= '--' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4028:1: (kw= '++' | kw= '--' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4008:28: ( (kw= '++' | kw= '--' ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4009:1: (kw= '++' | kw= '--' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4028:1: (kw= '++' | kw= '--' )
-            int alt77=2;
-            int LA77_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4009:1: (kw= '++' | kw= '--' )
+            int alt76=2;
+            int LA76_0 = input.LA(1);
 
-            if ( (LA77_0==79) ) {
-                alt77=1;
+            if ( (LA76_0==79) ) {
+                alt76=1;
             }
-            else if ( (LA77_0==80) ) {
-                alt77=2;
+            else if ( (LA76_0==80) ) {
+                alt76=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 77, 0, input);
+                    new NoViableAltException("", 76, 0, input);
 
                 throw nvae;
             }
-            switch (alt77) {
+            switch (alt76) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4029:2: kw= '++'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4010:2: kw= '++'
                     {
-                    kw=(Token)match(input,79,FOLLOW_79_in_ruleOpPostfix9426); if (state.failed) return current;
+                    kw=(Token)match(input,79,FOLLOW_79_in_ruleOpPostfix9388); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -11807,9 +11749,9 @@ else if ( (LA77_0==80) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4036:2: kw= '--'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4017:2: kw= '--'
                     {
-                    kw=(Token)match(input,80,FOLLOW_80_in_ruleOpPostfix9445); if (state.failed) return current;
+                    kw=(Token)match(input,80,FOLLOW_80_in_ruleOpPostfix9407); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -11842,7 +11784,7 @@ else if ( (LA77_0==80) ) {
 
 
     // $ANTLR start "entryRuleXMemberFeatureCall"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4049:1: entryRuleXMemberFeatureCall returns [EObject current=null] : iv_ruleXMemberFeatureCall= ruleXMemberFeatureCall EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4030:1: entryRuleXMemberFeatureCall returns [EObject current=null] : iv_ruleXMemberFeatureCall= ruleXMemberFeatureCall EOF ;
     public final EObject entryRuleXMemberFeatureCall() throws RecognitionException {
         EObject current = null;
 
@@ -11850,13 +11792,13 @@ public final EObject entryRuleXMemberFeatureCall() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4050:2: (iv_ruleXMemberFeatureCall= ruleXMemberFeatureCall EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4051:2: iv_ruleXMemberFeatureCall= ruleXMemberFeatureCall EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4031:2: (iv_ruleXMemberFeatureCall= ruleXMemberFeatureCall EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4032:2: iv_ruleXMemberFeatureCall= ruleXMemberFeatureCall EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXMemberFeatureCallRule()); 
             }
-            pushFollow(FOLLOW_ruleXMemberFeatureCall_in_entryRuleXMemberFeatureCall9485);
+            pushFollow(FOLLOW_ruleXMemberFeatureCall_in_entryRuleXMemberFeatureCall9447);
             iv_ruleXMemberFeatureCall=ruleXMemberFeatureCall();
 
             state._fsp--;
@@ -11864,7 +11806,7 @@ public final EObject entryRuleXMemberFeatureCall() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXMemberFeatureCall; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXMemberFeatureCall9495); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXMemberFeatureCall9457); if (state.failed) return current;
 
             }
 
@@ -11882,7 +11824,7 @@ public final EObject entryRuleXMemberFeatureCall() throws RecognitionException {
 
 
     // $ANTLR start "ruleXMemberFeatureCall"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4058:1: ruleXMemberFeatureCall returns [EObject current=null] : (this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )* ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4039:1: ruleXMemberFeatureCall returns [EObject current=null] : (this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )* ) ;
     public final EObject ruleXMemberFeatureCall() throws RecognitionException {
         EObject current = null;
 
@@ -11917,18 +11859,18 @@ public final EObject ruleXMemberFeatureCall() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4061:28: ( (this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )* ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4062:1: (this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )* )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4042:28: ( (this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )* ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4043:1: (this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )* )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4062:1: (this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )* )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4063:5: this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )*
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4043:1: (this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )* )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4044:5: this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getXPrimaryExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleXPrimaryExpression_in_ruleXMemberFeatureCall9542);
+            pushFollow(FOLLOW_ruleXPrimaryExpression_in_ruleXMemberFeatureCall9504);
             this_XPrimaryExpression_0=ruleXPrimaryExpression();
 
             state._fsp--;
@@ -11939,20 +11881,20 @@ public final EObject ruleXMemberFeatureCall() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4071:1: ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )*
-            loop86:
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4052:1: ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )*
+            loop85:
             do {
-                int alt86=3;
+                int alt85=3;
                 switch ( input.LA(1) ) {
                 case 81:
                     {
-                    int LA86_2 = input.LA(2);
+                    int LA85_2 = input.LA(2);
 
                     if ( (synpred34_InternalCheck()) ) {
-                        alt86=1;
+                        alt85=1;
                     }
                     else if ( (synpred35_InternalCheck()) ) {
-                        alt86=2;
+                        alt85=2;
                     }
 
 
@@ -11960,13 +11902,13 @@ else if ( (synpred35_InternalCheck()) ) {
                     break;
                 case 82:
                     {
-                    int LA86_3 = input.LA(2);
+                    int LA85_3 = input.LA(2);
 
                     if ( (synpred34_InternalCheck()) ) {
-                        alt86=1;
+                        alt85=1;
                     }
                     else if ( (synpred35_InternalCheck()) ) {
-                        alt86=2;
+                        alt85=2;
                     }
 
 
@@ -11974,10 +11916,10 @@ else if ( (synpred35_InternalCheck()) ) {
                     break;
                 case 83:
                     {
-                    int LA86_4 = input.LA(2);
+                    int LA85_4 = input.LA(2);
 
                     if ( (synpred35_InternalCheck()) ) {
-                        alt86=2;
+                        alt85=2;
                     }
 
 
@@ -11986,21 +11928,21 @@ else if ( (synpred35_InternalCheck()) ) {
 
                 }
 
-                switch (alt86) {
+                switch (alt85) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4071:2: ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4052:2: ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4071:2: ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4071:3: ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4052:2: ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4052:3: ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4071:3: ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4071:4: ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4052:3: ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4052:4: ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4084:25: ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4084:26: () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4065:25: ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4065:26: () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4084:26: ()
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4085:5: 
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4065:26: ()
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4066:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -12012,28 +11954,28 @@ else if ( (synpred35_InternalCheck()) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4090:2: (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) )
-            	    int alt78=2;
-            	    int LA78_0 = input.LA(1);
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4071:2: (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) )
+            	    int alt77=2;
+            	    int LA77_0 = input.LA(1);
 
-            	    if ( (LA78_0==81) ) {
-            	        alt78=1;
+            	    if ( (LA77_0==81) ) {
+            	        alt77=1;
             	    }
-            	    else if ( (LA78_0==82) ) {
-            	        alt78=2;
+            	    else if ( (LA77_0==82) ) {
+            	        alt77=2;
             	    }
             	    else {
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        NoViableAltException nvae =
-            	            new NoViableAltException("", 78, 0, input);
+            	            new NoViableAltException("", 77, 0, input);
 
             	        throw nvae;
             	    }
-            	    switch (alt78) {
+            	    switch (alt77) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4090:4: otherlv_2= '.'
+            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4071:4: otherlv_2= '.'
             	            {
-            	            otherlv_2=(Token)match(input,81,FOLLOW_81_in_ruleXMemberFeatureCall9614); if (state.failed) return current;
+            	            otherlv_2=(Token)match(input,81,FOLLOW_81_in_ruleXMemberFeatureCall9576); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                  	newLeafNode(otherlv_2, grammarAccess.getXMemberFeatureCallAccess().getFullStopKeyword_1_0_0_0_1_0());
@@ -12043,15 +11985,15 @@ else if ( (LA78_0==82) ) {
             	            }
             	            break;
             	        case 2 :
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4095:6: ( (lv_explicitStatic_3_0= '::' ) )
+            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4076:6: ( (lv_explicitStatic_3_0= '::' ) )
             	            {
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4095:6: ( (lv_explicitStatic_3_0= '::' ) )
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4096:1: (lv_explicitStatic_3_0= '::' )
+            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4076:6: ( (lv_explicitStatic_3_0= '::' ) )
+            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4077:1: (lv_explicitStatic_3_0= '::' )
             	            {
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4096:1: (lv_explicitStatic_3_0= '::' )
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4097:3: lv_explicitStatic_3_0= '::'
+            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4077:1: (lv_explicitStatic_3_0= '::' )
+            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4078:3: lv_explicitStatic_3_0= '::'
             	            {
-            	            lv_explicitStatic_3_0=(Token)match(input,82,FOLLOW_82_in_ruleXMemberFeatureCall9638); if (state.failed) return current;
+            	            lv_explicitStatic_3_0=(Token)match(input,82,FOLLOW_82_in_ruleXMemberFeatureCall9600); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_explicitStatic_3_0, grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_0_0_0_1_1_0());
@@ -12077,11 +12019,11 @@ else if ( (LA78_0==82) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4110:3: ( ( ruleFeatureCallID ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4111:1: ( ruleFeatureCallID )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4091:3: ( ( ruleFeatureCallID ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4092:1: ( ruleFeatureCallID )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4111:1: ( ruleFeatureCallID )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4112:3: ruleFeatureCallID
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4092:1: ( ruleFeatureCallID )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4093:3: ruleFeatureCallID
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -12095,7 +12037,7 @@ else if ( (LA78_0==82) ) {
             	      	        newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_0_2_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleFeatureCallID_in_ruleXMemberFeatureCall9675);
+            	    pushFollow(FOLLOW_ruleFeatureCallID_in_ruleXMemberFeatureCall9637);
             	    ruleFeatureCallID();
 
             	    state._fsp--;
@@ -12116,7 +12058,7 @@ else if ( (LA78_0==82) ) {
             	              newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getOpSingleAssignParserRuleCall_1_0_0_0_3()); 
             	          
             	    }
-            	    pushFollow(FOLLOW_ruleOpSingleAssign_in_ruleXMemberFeatureCall9691);
+            	    pushFollow(FOLLOW_ruleOpSingleAssign_in_ruleXMemberFeatureCall9653);
             	    ruleOpSingleAssign();
 
             	    state._fsp--;
@@ -12132,18 +12074,18 @@ else if ( (LA78_0==82) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4133:3: ( (lv_value_6_0= ruleXAssignment ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4134:1: (lv_value_6_0= ruleXAssignment )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4114:3: ( (lv_value_6_0= ruleXAssignment ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4115:1: (lv_value_6_0= ruleXAssignment )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4134:1: (lv_value_6_0= ruleXAssignment )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4135:3: lv_value_6_0= ruleXAssignment
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4115:1: (lv_value_6_0= ruleXAssignment )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4116:3: lv_value_6_0= ruleXAssignment
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getValueXAssignmentParserRuleCall_1_0_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXAssignment_in_ruleXMemberFeatureCall9713);
+            	    pushFollow(FOLLOW_ruleXAssignment_in_ruleXMemberFeatureCall9675);
             	    lv_value_6_0=ruleXAssignment();
 
             	    state._fsp--;
@@ -12174,19 +12116,19 @@ else if ( (LA78_0==82) ) {
             	    }
             	    break;
             	case 2 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4152:6: ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4133:6: ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4152:6: ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4152:7: ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )?
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4133:6: ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4133:7: ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )?
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4152:7: ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4152:8: ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4133:7: ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4133:8: ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4168:7: ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4168:8: () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4149:7: ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4149:8: () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4168:8: ()
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4169:5: 
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4149:8: ()
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4150:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -12198,37 +12140,37 @@ else if ( (LA78_0==82) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4174:2: (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) )
-            	    int alt79=3;
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4155:2: (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) )
+            	    int alt78=3;
             	    switch ( input.LA(1) ) {
             	    case 81:
             	        {
-            	        alt79=1;
+            	        alt78=1;
             	        }
             	        break;
             	    case 83:
             	        {
-            	        alt79=2;
+            	        alt78=2;
             	        }
             	        break;
             	    case 82:
             	        {
-            	        alt79=3;
+            	        alt78=3;
             	        }
             	        break;
             	    default:
             	        if (state.backtracking>0) {state.failed=true; return current;}
             	        NoViableAltException nvae =
-            	            new NoViableAltException("", 79, 0, input);
+            	            new NoViableAltException("", 78, 0, input);
 
             	        throw nvae;
             	    }
 
-            	    switch (alt79) {
+            	    switch (alt78) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4174:4: otherlv_8= '.'
+            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4155:4: otherlv_8= '.'
             	            {
-            	            otherlv_8=(Token)match(input,81,FOLLOW_81_in_ruleXMemberFeatureCall9799); if (state.failed) return current;
+            	            otherlv_8=(Token)match(input,81,FOLLOW_81_in_ruleXMemberFeatureCall9761); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                  	newLeafNode(otherlv_8, grammarAccess.getXMemberFeatureCallAccess().getFullStopKeyword_1_1_0_0_1_0());
@@ -12238,15 +12180,15 @@ else if ( (LA78_0==82) ) {
             	            }
             	            break;
             	        case 2 :
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4179:6: ( (lv_nullSafe_9_0= '?.' ) )
+            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4160:6: ( (lv_nullSafe_9_0= '?.' ) )
             	            {
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4179:6: ( (lv_nullSafe_9_0= '?.' ) )
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4180:1: (lv_nullSafe_9_0= '?.' )
+            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4160:6: ( (lv_nullSafe_9_0= '?.' ) )
+            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4161:1: (lv_nullSafe_9_0= '?.' )
             	            {
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4180:1: (lv_nullSafe_9_0= '?.' )
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4181:3: lv_nullSafe_9_0= '?.'
+            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4161:1: (lv_nullSafe_9_0= '?.' )
+            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4162:3: lv_nullSafe_9_0= '?.'
             	            {
-            	            lv_nullSafe_9_0=(Token)match(input,83,FOLLOW_83_in_ruleXMemberFeatureCall9823); if (state.failed) return current;
+            	            lv_nullSafe_9_0=(Token)match(input,83,FOLLOW_83_in_ruleXMemberFeatureCall9785); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_nullSafe_9_0, grammarAccess.getXMemberFeatureCallAccess().getNullSafeQuestionMarkFullStopKeyword_1_1_0_0_1_1_0());
@@ -12270,15 +12212,15 @@ else if ( (LA78_0==82) ) {
             	            }
             	            break;
             	        case 3 :
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4195:6: ( (lv_explicitStatic_10_0= '::' ) )
+            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4176:6: ( (lv_explicitStatic_10_0= '::' ) )
             	            {
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4195:6: ( (lv_explicitStatic_10_0= '::' ) )
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4196:1: (lv_explicitStatic_10_0= '::' )
+            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4176:6: ( (lv_explicitStatic_10_0= '::' ) )
+            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4177:1: (lv_explicitStatic_10_0= '::' )
             	            {
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4196:1: (lv_explicitStatic_10_0= '::' )
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4197:3: lv_explicitStatic_10_0= '::'
+            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4177:1: (lv_explicitStatic_10_0= '::' )
+            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4178:3: lv_explicitStatic_10_0= '::'
             	            {
-            	            lv_explicitStatic_10_0=(Token)match(input,82,FOLLOW_82_in_ruleXMemberFeatureCall9860); if (state.failed) return current;
+            	            lv_explicitStatic_10_0=(Token)match(input,82,FOLLOW_82_in_ruleXMemberFeatureCall9822); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_explicitStatic_10_0, grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_1_0_0_1_2_0());
@@ -12310,35 +12252,35 @@ else if ( (LA78_0==82) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4210:5: (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )?
-            	    int alt81=2;
-            	    int LA81_0 = input.LA(1);
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4191:5: (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )?
+            	    int alt80=2;
+            	    int LA80_0 = input.LA(1);
 
-            	    if ( (LA81_0==56) ) {
-            	        alt81=1;
+            	    if ( (LA80_0==56) ) {
+            	        alt80=1;
             	    }
-            	    switch (alt81) {
+            	    switch (alt80) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4210:7: otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>'
+            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4191:7: otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>'
             	            {
-            	            otherlv_11=(Token)match(input,56,FOLLOW_56_in_ruleXMemberFeatureCall9889); if (state.failed) return current;
+            	            otherlv_11=(Token)match(input,56,FOLLOW_56_in_ruleXMemberFeatureCall9851); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                  	newLeafNode(otherlv_11, grammarAccess.getXMemberFeatureCallAccess().getLessThanSignKeyword_1_1_1_0());
             	                  
             	            }
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4214:1: ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) )
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4215:1: (lv_typeArguments_12_0= ruleJvmArgumentTypeReference )
+            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4195:1: ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) )
+            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4196:1: (lv_typeArguments_12_0= ruleJvmArgumentTypeReference )
             	            {
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4215:1: (lv_typeArguments_12_0= ruleJvmArgumentTypeReference )
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4216:3: lv_typeArguments_12_0= ruleJvmArgumentTypeReference
+            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4196:1: (lv_typeArguments_12_0= ruleJvmArgumentTypeReference )
+            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4197:3: lv_typeArguments_12_0= ruleJvmArgumentTypeReference
             	            {
             	            if ( state.backtracking==0 ) {
             	               
             	              	        newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_1_1_0()); 
             	              	    
             	            }
-            	            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleXMemberFeatureCall9910);
+            	            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleXMemberFeatureCall9872);
             	            lv_typeArguments_12_0=ruleJvmArgumentTypeReference();
 
             	            state._fsp--;
@@ -12362,39 +12304,39 @@ else if ( (LA78_0==82) ) {
 
             	            }
 
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4232:2: (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )*
-            	            loop80:
+            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4213:2: (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )*
+            	            loop79:
             	            do {
-            	                int alt80=2;
-            	                int LA80_0 = input.LA(1);
+            	                int alt79=2;
+            	                int LA79_0 = input.LA(1);
 
-            	                if ( (LA80_0==25) ) {
-            	                    alt80=1;
+            	                if ( (LA79_0==24) ) {
+            	                    alt79=1;
             	                }
 
 
-            	                switch (alt80) {
+            	                switch (alt79) {
             	            	case 1 :
-            	            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4232:4: otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) )
+            	            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4213:4: otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) )
             	            	    {
-            	            	    otherlv_13=(Token)match(input,25,FOLLOW_25_in_ruleXMemberFeatureCall9923); if (state.failed) return current;
+            	            	    otherlv_13=(Token)match(input,24,FOLLOW_24_in_ruleXMemberFeatureCall9885); if (state.failed) return current;
             	            	    if ( state.backtracking==0 ) {
 
             	            	          	newLeafNode(otherlv_13, grammarAccess.getXMemberFeatureCallAccess().getCommaKeyword_1_1_1_2_0());
             	            	          
             	            	    }
-            	            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4236:1: ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) )
-            	            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4237:1: (lv_typeArguments_14_0= ruleJvmArgumentTypeReference )
+            	            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4217:1: ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) )
+            	            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4218:1: (lv_typeArguments_14_0= ruleJvmArgumentTypeReference )
             	            	    {
-            	            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4237:1: (lv_typeArguments_14_0= ruleJvmArgumentTypeReference )
-            	            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4238:3: lv_typeArguments_14_0= ruleJvmArgumentTypeReference
+            	            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4218:1: (lv_typeArguments_14_0= ruleJvmArgumentTypeReference )
+            	            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4219:3: lv_typeArguments_14_0= ruleJvmArgumentTypeReference
             	            	    {
             	            	    if ( state.backtracking==0 ) {
             	            	       
             	            	      	        newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_1_2_1_0()); 
             	            	      	    
             	            	    }
-            	            	    pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleXMemberFeatureCall9944);
+            	            	    pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleXMemberFeatureCall9906);
             	            	    lv_typeArguments_14_0=ruleJvmArgumentTypeReference();
 
             	            	    state._fsp--;
@@ -12423,11 +12365,11 @@ else if ( (LA78_0==82) ) {
             	            	    break;
 
             	            	default :
-            	            	    break loop80;
+            	            	    break loop79;
             	                }
             	            } while (true);
 
-            	            otherlv_15=(Token)match(input,57,FOLLOW_57_in_ruleXMemberFeatureCall9958); if (state.failed) return current;
+            	            otherlv_15=(Token)match(input,57,FOLLOW_57_in_ruleXMemberFeatureCall9920); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                  	newLeafNode(otherlv_15, grammarAccess.getXMemberFeatureCallAccess().getGreaterThanSignKeyword_1_1_1_3());
@@ -12439,11 +12381,11 @@ else if ( (LA78_0==82) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4258:3: ( ( ruleIdOrSuper ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4259:1: ( ruleIdOrSuper )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4239:3: ( ( ruleIdOrSuper ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4240:1: ( ruleIdOrSuper )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4259:1: ( ruleIdOrSuper )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4260:3: ruleIdOrSuper
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4240:1: ( ruleIdOrSuper )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4241:3: ruleIdOrSuper
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -12457,7 +12399,7 @@ else if ( (LA78_0==82) ) {
             	      	        newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getFeatureJvmIdentifiableElementCrossReference_1_1_2_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleIdOrSuper_in_ruleXMemberFeatureCall9983);
+            	    pushFollow(FOLLOW_ruleIdOrSuper_in_ruleXMemberFeatureCall9945);
             	    ruleIdOrSuper();
 
             	    state._fsp--;
@@ -12473,20 +12415,20 @@ else if ( (LA78_0==82) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4273:2: ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )?
-            	    int alt84=2;
-            	    alt84 = dfa84.predict(input);
-            	    switch (alt84) {
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4254:2: ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )?
+            	    int alt83=2;
+            	    alt83 = dfa83.predict(input);
+            	    switch (alt83) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4273:3: ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')'
+            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4254:3: ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')'
             	            {
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4273:3: ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) )
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4273:4: ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' )
+            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4254:3: ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) )
+            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4254:4: ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' )
             	            {
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4280:1: (lv_explicitOperationCall_17_0= '(' )
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4281:3: lv_explicitOperationCall_17_0= '('
+            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4261:1: (lv_explicitOperationCall_17_0= '(' )
+            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4262:3: lv_explicitOperationCall_17_0= '('
             	            {
-            	            lv_explicitOperationCall_17_0=(Token)match(input,24,FOLLOW_24_in_ruleXMemberFeatureCall10017); if (state.failed) return current;
+            	            lv_explicitOperationCall_17_0=(Token)match(input,23,FOLLOW_23_in_ruleXMemberFeatureCall9979); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_explicitOperationCall_17_0, grammarAccess.getXMemberFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_1_1_3_0_0());
@@ -12506,25 +12448,25 @@ else if ( (LA78_0==82) ) {
 
             	            }
 
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4294:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )?
-            	            int alt83=3;
-            	            alt83 = dfa83.predict(input);
-            	            switch (alt83) {
+            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4275:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )?
+            	            int alt82=3;
+            	            alt82 = dfa82.predict(input);
+            	            switch (alt82) {
             	                case 1 :
-            	                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4294:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) )
+            	                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4275:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) )
             	                    {
-            	                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4294:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) )
-            	                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4294:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure )
+            	                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4275:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) )
+            	                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4275:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure )
             	                    {
-            	                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4311:1: (lv_memberCallArguments_18_0= ruleXShortClosure )
-            	                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4312:3: lv_memberCallArguments_18_0= ruleXShortClosure
+            	                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4292:1: (lv_memberCallArguments_18_0= ruleXShortClosure )
+            	                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4293:3: lv_memberCallArguments_18_0= ruleXShortClosure
             	                    {
             	                    if ( state.backtracking==0 ) {
             	                       
             	                      	        newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXShortClosureParserRuleCall_1_1_3_1_0_0()); 
             	                      	    
             	                    }
-            	                    pushFollow(FOLLOW_ruleXShortClosure_in_ruleXMemberFeatureCall10102);
+            	                    pushFollow(FOLLOW_ruleXShortClosure_in_ruleXMemberFeatureCall10064);
             	                    lv_memberCallArguments_18_0=ruleXShortClosure();
 
             	                    state._fsp--;
@@ -12552,23 +12494,23 @@ else if ( (LA78_0==82) ) {
             	                    }
             	                    break;
             	                case 2 :
-            	                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4329:6: ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* )
+            	                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4310:6: ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* )
             	                    {
-            	                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4329:6: ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* )
-            	                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4329:7: ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )*
+            	                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4310:6: ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* )
+            	                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4310:7: ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )*
             	                    {
-            	                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4329:7: ( (lv_memberCallArguments_19_0= ruleXExpression ) )
-            	                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4330:1: (lv_memberCallArguments_19_0= ruleXExpression )
+            	                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4310:7: ( (lv_memberCallArguments_19_0= ruleXExpression ) )
+            	                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4311:1: (lv_memberCallArguments_19_0= ruleXExpression )
             	                    {
-            	                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4330:1: (lv_memberCallArguments_19_0= ruleXExpression )
-            	                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4331:3: lv_memberCallArguments_19_0= ruleXExpression
+            	                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4311:1: (lv_memberCallArguments_19_0= ruleXExpression )
+            	                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4312:3: lv_memberCallArguments_19_0= ruleXExpression
             	                    {
             	                    if ( state.backtracking==0 ) {
             	                       
             	                      	        newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXExpressionParserRuleCall_1_1_3_1_1_0_0()); 
             	                      	    
             	                    }
-            	                    pushFollow(FOLLOW_ruleXExpression_in_ruleXMemberFeatureCall10130);
+            	                    pushFollow(FOLLOW_ruleXExpression_in_ruleXMemberFeatureCall10092);
             	                    lv_memberCallArguments_19_0=ruleXExpression();
 
             	                    state._fsp--;
@@ -12592,39 +12534,39 @@ else if ( (LA78_0==82) ) {
 
             	                    }
 
-            	                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4347:2: (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )*
-            	                    loop82:
+            	                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4328:2: (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )*
+            	                    loop81:
             	                    do {
-            	                        int alt82=2;
-            	                        int LA82_0 = input.LA(1);
+            	                        int alt81=2;
+            	                        int LA81_0 = input.LA(1);
 
-            	                        if ( (LA82_0==25) ) {
-            	                            alt82=1;
+            	                        if ( (LA81_0==24) ) {
+            	                            alt81=1;
             	                        }
 
 
-            	                        switch (alt82) {
+            	                        switch (alt81) {
             	                    	case 1 :
-            	                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4347:4: otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) )
+            	                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4328:4: otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) )
             	                    	    {
-            	                    	    otherlv_20=(Token)match(input,25,FOLLOW_25_in_ruleXMemberFeatureCall10143); if (state.failed) return current;
+            	                    	    otherlv_20=(Token)match(input,24,FOLLOW_24_in_ruleXMemberFeatureCall10105); if (state.failed) return current;
             	                    	    if ( state.backtracking==0 ) {
 
             	                    	          	newLeafNode(otherlv_20, grammarAccess.getXMemberFeatureCallAccess().getCommaKeyword_1_1_3_1_1_1_0());
             	                    	          
             	                    	    }
-            	                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4351:1: ( (lv_memberCallArguments_21_0= ruleXExpression ) )
-            	                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4352:1: (lv_memberCallArguments_21_0= ruleXExpression )
+            	                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4332:1: ( (lv_memberCallArguments_21_0= ruleXExpression ) )
+            	                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4333:1: (lv_memberCallArguments_21_0= ruleXExpression )
             	                    	    {
-            	                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4352:1: (lv_memberCallArguments_21_0= ruleXExpression )
-            	                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4353:3: lv_memberCallArguments_21_0= ruleXExpression
+            	                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4333:1: (lv_memberCallArguments_21_0= ruleXExpression )
+            	                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4334:3: lv_memberCallArguments_21_0= ruleXExpression
             	                    	    {
             	                    	    if ( state.backtracking==0 ) {
             	                    	       
             	                    	      	        newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXExpressionParserRuleCall_1_1_3_1_1_1_1_0()); 
             	                    	      	    
             	                    	    }
-            	                    	    pushFollow(FOLLOW_ruleXExpression_in_ruleXMemberFeatureCall10164);
+            	                    	    pushFollow(FOLLOW_ruleXExpression_in_ruleXMemberFeatureCall10126);
             	                    	    lv_memberCallArguments_21_0=ruleXExpression();
 
             	                    	    state._fsp--;
@@ -12653,7 +12595,7 @@ else if ( (LA78_0==82) ) {
             	                    	    break;
 
             	                    	default :
-            	                    	    break loop82;
+            	                    	    break loop81;
             	                        }
             	                    } while (true);
 
@@ -12666,7 +12608,7 @@ else if ( (LA78_0==82) ) {
 
             	            }
 
-            	            otherlv_22=(Token)match(input,26,FOLLOW_26_in_ruleXMemberFeatureCall10181); if (state.failed) return current;
+            	            otherlv_22=(Token)match(input,25,FOLLOW_25_in_ruleXMemberFeatureCall10143); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                  	newLeafNode(otherlv_22, grammarAccess.getXMemberFeatureCallAccess().getRightParenthesisKeyword_1_1_3_2());
@@ -12678,22 +12620,22 @@ else if ( (LA78_0==82) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4373:3: ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )?
-            	    int alt85=2;
-            	    alt85 = dfa85.predict(input);
-            	    switch (alt85) {
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4354:3: ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )?
+            	    int alt84=2;
+            	    alt84 = dfa84.predict(input);
+            	    switch (alt84) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4373:4: ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure )
+            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4354:4: ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure )
             	            {
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4376:1: (lv_memberCallArguments_23_0= ruleXClosure )
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4377:3: lv_memberCallArguments_23_0= ruleXClosure
+            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4357:1: (lv_memberCallArguments_23_0= ruleXClosure )
+            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4358:3: lv_memberCallArguments_23_0= ruleXClosure
             	            {
             	            if ( state.backtracking==0 ) {
             	               
             	              	        newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXClosureParserRuleCall_1_1_4_0()); 
             	              	    
             	            }
-            	            pushFollow(FOLLOW_ruleXClosure_in_ruleXMemberFeatureCall10216);
+            	            pushFollow(FOLLOW_ruleXClosure_in_ruleXMemberFeatureCall10178);
             	            lv_memberCallArguments_23_0=ruleXClosure();
 
             	            state._fsp--;
@@ -12728,7 +12670,7 @@ else if ( (LA78_0==82) ) {
             	    break;
 
             	default :
-            	    break loop86;
+            	    break loop85;
                 }
             } while (true);
 
@@ -12755,7 +12697,7 @@ else if ( (LA78_0==82) ) {
 
 
     // $ANTLR start "entryRuleXLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4401:1: entryRuleXLiteral returns [EObject current=null] : iv_ruleXLiteral= ruleXLiteral EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4382:1: entryRuleXLiteral returns [EObject current=null] : iv_ruleXLiteral= ruleXLiteral EOF ;
     public final EObject entryRuleXLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -12763,13 +12705,13 @@ public final EObject entryRuleXLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4402:2: (iv_ruleXLiteral= ruleXLiteral EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4403:2: iv_ruleXLiteral= ruleXLiteral EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4383:2: (iv_ruleXLiteral= ruleXLiteral EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4384:2: iv_ruleXLiteral= ruleXLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXLiteral_in_entryRuleXLiteral10256);
+            pushFollow(FOLLOW_ruleXLiteral_in_entryRuleXLiteral10218);
             iv_ruleXLiteral=ruleXLiteral();
 
             state._fsp--;
@@ -12777,7 +12719,7 @@ public final EObject entryRuleXLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXLiteral10266); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXLiteral10228); if (state.failed) return current;
 
             }
 
@@ -12795,7 +12737,7 @@ public final EObject entryRuleXLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4410:1: ruleXLiteral returns [EObject current=null] : (this_XCollectionLiteral_0= ruleXCollectionLiteral | ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure ) | this_XBooleanLiteral_2= ruleXBooleanLiteral | this_XNumberLiteral_3= ruleXNumberLiteral | this_XNullLiteral_4= ruleXNullLiteral | this_XStringLiteral_5= ruleXStringLiteral | this_XTypeLiteral_6= ruleXTypeLiteral ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4391:1: ruleXLiteral returns [EObject current=null] : (this_XCollectionLiteral_0= ruleXCollectionLiteral | ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure ) | this_XBooleanLiteral_2= ruleXBooleanLiteral | this_XNumberLiteral_3= ruleXNumberLiteral | this_XNullLiteral_4= ruleXNullLiteral | this_XStringLiteral_5= ruleXStringLiteral | this_XTypeLiteral_6= ruleXTypeLiteral ) ;
     public final EObject ruleXLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -12817,51 +12759,51 @@ public final EObject ruleXLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4413:28: ( (this_XCollectionLiteral_0= ruleXCollectionLiteral | ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure ) | this_XBooleanLiteral_2= ruleXBooleanLiteral | this_XNumberLiteral_3= ruleXNumberLiteral | this_XNullLiteral_4= ruleXNullLiteral | this_XStringLiteral_5= ruleXStringLiteral | this_XTypeLiteral_6= ruleXTypeLiteral ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4414:1: (this_XCollectionLiteral_0= ruleXCollectionLiteral | ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure ) | this_XBooleanLiteral_2= ruleXBooleanLiteral | this_XNumberLiteral_3= ruleXNumberLiteral | this_XNullLiteral_4= ruleXNullLiteral | this_XStringLiteral_5= ruleXStringLiteral | this_XTypeLiteral_6= ruleXTypeLiteral )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4394:28: ( (this_XCollectionLiteral_0= ruleXCollectionLiteral | ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure ) | this_XBooleanLiteral_2= ruleXBooleanLiteral | this_XNumberLiteral_3= ruleXNumberLiteral | this_XNullLiteral_4= ruleXNullLiteral | this_XStringLiteral_5= ruleXStringLiteral | this_XTypeLiteral_6= ruleXTypeLiteral ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4395:1: (this_XCollectionLiteral_0= ruleXCollectionLiteral | ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure ) | this_XBooleanLiteral_2= ruleXBooleanLiteral | this_XNumberLiteral_3= ruleXNumberLiteral | this_XNullLiteral_4= ruleXNullLiteral | this_XStringLiteral_5= ruleXStringLiteral | this_XTypeLiteral_6= ruleXTypeLiteral )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4414:1: (this_XCollectionLiteral_0= ruleXCollectionLiteral | ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure ) | this_XBooleanLiteral_2= ruleXBooleanLiteral | this_XNumberLiteral_3= ruleXNumberLiteral | this_XNullLiteral_4= ruleXNullLiteral | this_XStringLiteral_5= ruleXStringLiteral | this_XTypeLiteral_6= ruleXTypeLiteral )
-            int alt87=7;
-            int LA87_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4395:1: (this_XCollectionLiteral_0= ruleXCollectionLiteral | ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure ) | this_XBooleanLiteral_2= ruleXBooleanLiteral | this_XNumberLiteral_3= ruleXNumberLiteral | this_XNullLiteral_4= ruleXNullLiteral | this_XStringLiteral_5= ruleXStringLiteral | this_XTypeLiteral_6= ruleXTypeLiteral )
+            int alt86=7;
+            int LA86_0 = input.LA(1);
 
-            if ( (LA87_0==33) ) {
-                alt87=1;
+            if ( (LA86_0==32) ) {
+                alt86=1;
             }
-            else if ( (LA87_0==34) && (synpred39_InternalCheck())) {
-                alt87=2;
+            else if ( (LA86_0==33) && (synpred39_InternalCheck())) {
+                alt86=2;
             }
-            else if ( ((LA87_0>=97 && LA87_0<=98)) ) {
-                alt87=3;
+            else if ( ((LA86_0>=97 && LA86_0<=98)) ) {
+                alt86=3;
             }
-            else if ( ((LA87_0>=RULE_HEX && LA87_0<=RULE_DECIMAL)) ) {
-                alt87=4;
+            else if ( ((LA86_0>=RULE_HEX && LA86_0<=RULE_DECIMAL)) ) {
+                alt86=4;
             }
-            else if ( (LA87_0==99) ) {
-                alt87=5;
+            else if ( (LA86_0==99) ) {
+                alt86=5;
             }
-            else if ( (LA87_0==RULE_STRING) ) {
-                alt87=6;
+            else if ( (LA86_0==RULE_STRING) ) {
+                alt86=6;
             }
-            else if ( (LA87_0==100) ) {
-                alt87=7;
+            else if ( (LA86_0==100) ) {
+                alt86=7;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 87, 0, input);
+                    new NoViableAltException("", 86, 0, input);
 
                 throw nvae;
             }
-            switch (alt87) {
+            switch (alt86) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4415:5: this_XCollectionLiteral_0= ruleXCollectionLiteral
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4396:5: this_XCollectionLiteral_0= ruleXCollectionLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXLiteralAccess().getXCollectionLiteralParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXCollectionLiteral_in_ruleXLiteral10313);
+                    pushFollow(FOLLOW_ruleXCollectionLiteral_in_ruleXLiteral10275);
                     this_XCollectionLiteral_0=ruleXCollectionLiteral();
 
                     state._fsp--;
@@ -12876,17 +12818,17 @@ else if ( (LA87_0==100) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4424:6: ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4405:6: ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4424:6: ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4424:7: ( ( () '[' ) )=>this_XClosure_1= ruleXClosure
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4405:6: ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4405:7: ( ( () '[' ) )=>this_XClosure_1= ruleXClosure
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXLiteralAccess().getXClosureParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXClosure_in_ruleXLiteral10353);
+                    pushFollow(FOLLOW_ruleXClosure_in_ruleXLiteral10315);
                     this_XClosure_1=ruleXClosure();
 
                     state._fsp--;
@@ -12904,14 +12846,14 @@ else if ( (LA87_0==100) ) {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4437:5: this_XBooleanLiteral_2= ruleXBooleanLiteral
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4418:5: this_XBooleanLiteral_2= ruleXBooleanLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXLiteralAccess().getXBooleanLiteralParserRuleCall_2()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXBooleanLiteral_in_ruleXLiteral10381);
+                    pushFollow(FOLLOW_ruleXBooleanLiteral_in_ruleXLiteral10343);
                     this_XBooleanLiteral_2=ruleXBooleanLiteral();
 
                     state._fsp--;
@@ -12926,14 +12868,14 @@ else if ( (LA87_0==100) ) {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4447:5: this_XNumberLiteral_3= ruleXNumberLiteral
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4428:5: this_XNumberLiteral_3= ruleXNumberLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXLiteralAccess().getXNumberLiteralParserRuleCall_3()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXNumberLiteral_in_ruleXLiteral10408);
+                    pushFollow(FOLLOW_ruleXNumberLiteral_in_ruleXLiteral10370);
                     this_XNumberLiteral_3=ruleXNumberLiteral();
 
                     state._fsp--;
@@ -12948,14 +12890,14 @@ else if ( (LA87_0==100) ) {
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4457:5: this_XNullLiteral_4= ruleXNullLiteral
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4438:5: this_XNullLiteral_4= ruleXNullLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXLiteralAccess().getXNullLiteralParserRuleCall_4()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXNullLiteral_in_ruleXLiteral10435);
+                    pushFollow(FOLLOW_ruleXNullLiteral_in_ruleXLiteral10397);
                     this_XNullLiteral_4=ruleXNullLiteral();
 
                     state._fsp--;
@@ -12970,14 +12912,14 @@ else if ( (LA87_0==100) ) {
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4467:5: this_XStringLiteral_5= ruleXStringLiteral
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4448:5: this_XStringLiteral_5= ruleXStringLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXLiteralAccess().getXStringLiteralParserRuleCall_5()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXStringLiteral_in_ruleXLiteral10462);
+                    pushFollow(FOLLOW_ruleXStringLiteral_in_ruleXLiteral10424);
                     this_XStringLiteral_5=ruleXStringLiteral();
 
                     state._fsp--;
@@ -12992,14 +12934,14 @@ else if ( (LA87_0==100) ) {
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4477:5: this_XTypeLiteral_6= ruleXTypeLiteral
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4458:5: this_XTypeLiteral_6= ruleXTypeLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXLiteralAccess().getXTypeLiteralParserRuleCall_6()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXTypeLiteral_in_ruleXLiteral10489);
+                    pushFollow(FOLLOW_ruleXTypeLiteral_in_ruleXLiteral10451);
                     this_XTypeLiteral_6=ruleXTypeLiteral();
 
                     state._fsp--;
@@ -13036,7 +12978,7 @@ else if ( (LA87_0==100) ) {
 
 
     // $ANTLR start "entryRuleXCollectionLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4493:1: entryRuleXCollectionLiteral returns [EObject current=null] : iv_ruleXCollectionLiteral= ruleXCollectionLiteral EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4474:1: entryRuleXCollectionLiteral returns [EObject current=null] : iv_ruleXCollectionLiteral= ruleXCollectionLiteral EOF ;
     public final EObject entryRuleXCollectionLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -13044,13 +12986,13 @@ public final EObject entryRuleXCollectionLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4494:2: (iv_ruleXCollectionLiteral= ruleXCollectionLiteral EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4495:2: iv_ruleXCollectionLiteral= ruleXCollectionLiteral EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4475:2: (iv_ruleXCollectionLiteral= ruleXCollectionLiteral EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4476:2: iv_ruleXCollectionLiteral= ruleXCollectionLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXCollectionLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXCollectionLiteral_in_entryRuleXCollectionLiteral10524);
+            pushFollow(FOLLOW_ruleXCollectionLiteral_in_entryRuleXCollectionLiteral10486);
             iv_ruleXCollectionLiteral=ruleXCollectionLiteral();
 
             state._fsp--;
@@ -13058,7 +13000,7 @@ public final EObject entryRuleXCollectionLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXCollectionLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXCollectionLiteral10534); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXCollectionLiteral10496); if (state.failed) return current;
 
             }
 
@@ -13076,7 +13018,7 @@ public final EObject entryRuleXCollectionLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXCollectionLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4502:1: ruleXCollectionLiteral returns [EObject current=null] : (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4483:1: ruleXCollectionLiteral returns [EObject current=null] : (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral ) ;
     public final EObject ruleXCollectionLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -13088,26 +13030,26 @@ public final EObject ruleXCollectionLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4505:28: ( (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4506:1: (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4486:28: ( (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4487:1: (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4506:1: (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral )
-            int alt88=2;
-            int LA88_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4487:1: (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral )
+            int alt87=2;
+            int LA87_0 = input.LA(1);
 
-            if ( (LA88_0==33) ) {
-                int LA88_1 = input.LA(2);
+            if ( (LA87_0==32) ) {
+                int LA87_1 = input.LA(2);
 
-                if ( (LA88_1==34) ) {
-                    alt88=2;
+                if ( (LA87_1==18) ) {
+                    alt87=1;
                 }
-                else if ( (LA88_1==19) ) {
-                    alt88=1;
+                else if ( (LA87_1==33) ) {
+                    alt87=2;
                 }
                 else {
                     if (state.backtracking>0) {state.failed=true; return current;}
                     NoViableAltException nvae =
-                        new NoViableAltException("", 88, 1, input);
+                        new NoViableAltException("", 87, 1, input);
 
                     throw nvae;
                 }
@@ -13115,20 +13057,20 @@ else if ( (LA88_1==19) ) {
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 88, 0, input);
+                    new NoViableAltException("", 87, 0, input);
 
                 throw nvae;
             }
-            switch (alt88) {
+            switch (alt87) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4507:5: this_XSetLiteral_0= ruleXSetLiteral
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4488:5: this_XSetLiteral_0= ruleXSetLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXCollectionLiteralAccess().getXSetLiteralParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXSetLiteral_in_ruleXCollectionLiteral10581);
+                    pushFollow(FOLLOW_ruleXSetLiteral_in_ruleXCollectionLiteral10543);
                     this_XSetLiteral_0=ruleXSetLiteral();
 
                     state._fsp--;
@@ -13143,14 +13085,14 @@ else if ( (LA88_1==19) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4517:5: this_XListLiteral_1= ruleXListLiteral
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4498:5: this_XListLiteral_1= ruleXListLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXCollectionLiteralAccess().getXListLiteralParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXListLiteral_in_ruleXCollectionLiteral10608);
+                    pushFollow(FOLLOW_ruleXListLiteral_in_ruleXCollectionLiteral10570);
                     this_XListLiteral_1=ruleXListLiteral();
 
                     state._fsp--;
@@ -13187,7 +13129,7 @@ else if ( (LA88_1==19) ) {
 
 
     // $ANTLR start "entryRuleXSetLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4533:1: entryRuleXSetLiteral returns [EObject current=null] : iv_ruleXSetLiteral= ruleXSetLiteral EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4514:1: entryRuleXSetLiteral returns [EObject current=null] : iv_ruleXSetLiteral= ruleXSetLiteral EOF ;
     public final EObject entryRuleXSetLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -13195,13 +13137,13 @@ public final EObject entryRuleXSetLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4534:2: (iv_ruleXSetLiteral= ruleXSetLiteral EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4535:2: iv_ruleXSetLiteral= ruleXSetLiteral EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4515:2: (iv_ruleXSetLiteral= ruleXSetLiteral EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4516:2: iv_ruleXSetLiteral= ruleXSetLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXSetLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXSetLiteral_in_entryRuleXSetLiteral10643);
+            pushFollow(FOLLOW_ruleXSetLiteral_in_entryRuleXSetLiteral10605);
             iv_ruleXSetLiteral=ruleXSetLiteral();
 
             state._fsp--;
@@ -13209,7 +13151,7 @@ public final EObject entryRuleXSetLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXSetLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXSetLiteral10653); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXSetLiteral10615); if (state.failed) return current;
 
             }
 
@@ -13227,7 +13169,7 @@ public final EObject entryRuleXSetLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXSetLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4542:1: ruleXSetLiteral returns [EObject current=null] : ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4523:1: ruleXSetLiteral returns [EObject current=null] : ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' ) ;
     public final EObject ruleXSetLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -13243,14 +13185,14 @@ public final EObject ruleXSetLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4545:28: ( ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4546:1: ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4526:28: ( ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4527:1: ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4546:1: ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4546:2: () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4527:1: ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4527:2: () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}'
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4546:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4547:5: 
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4527:2: ()
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4528:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -13262,41 +13204,41 @@ public final EObject ruleXSetLiteral() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,33,FOLLOW_33_in_ruleXSetLiteral10699); if (state.failed) return current;
+            otherlv_1=(Token)match(input,32,FOLLOW_32_in_ruleXSetLiteral10661); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXSetLiteralAccess().getNumberSignKeyword_1());
                   
             }
-            otherlv_2=(Token)match(input,19,FOLLOW_19_in_ruleXSetLiteral10711); if (state.failed) return current;
+            otherlv_2=(Token)match(input,18,FOLLOW_18_in_ruleXSetLiteral10673); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getXSetLiteralAccess().getLeftCurlyBracketKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4560:1: ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )?
-            int alt90=2;
-            int LA90_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4541:1: ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )?
+            int alt89=2;
+            int LA89_0 = input.LA(1);
 
-            if ( ((LA90_0>=RULE_STRING && LA90_0<=RULE_ID)||(LA90_0>=15 && LA90_0<=19)||LA90_0==21||(LA90_0>=23 && LA90_0<=24)||LA90_0==27||LA90_0==29||(LA90_0>=33 && LA90_0<=34)||(LA90_0>=36 && LA90_0<=50)||LA90_0==56||(LA90_0>=71 && LA90_0<=72)||LA90_0==77||LA90_0==85||LA90_0==87||(LA90_0>=91 && LA90_0<=92)||(LA90_0>=95 && LA90_0<=103)||LA90_0==105) ) {
-                alt90=1;
+            if ( ((LA89_0>=RULE_STRING && LA89_0<=RULE_ID)||(LA89_0>=15 && LA89_0<=18)||LA89_0==20||(LA89_0>=22 && LA89_0<=23)||LA89_0==26||LA89_0==28||(LA89_0>=32 && LA89_0<=33)||(LA89_0>=35 && LA89_0<=50)||LA89_0==56||(LA89_0>=71 && LA89_0<=72)||LA89_0==77||LA89_0==85||LA89_0==87||(LA89_0>=91 && LA89_0<=92)||(LA89_0>=95 && LA89_0<=103)||LA89_0==105) ) {
+                alt89=1;
             }
-            switch (alt90) {
+            switch (alt89) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4560:2: ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4541:2: ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4560:2: ( (lv_elements_3_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4561:1: (lv_elements_3_0= ruleXExpression )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4541:2: ( (lv_elements_3_0= ruleXExpression ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4542:1: (lv_elements_3_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4561:1: (lv_elements_3_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4562:3: lv_elements_3_0= ruleXExpression
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4542:1: (lv_elements_3_0= ruleXExpression )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4543:3: lv_elements_3_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXSetLiteralAccess().getElementsXExpressionParserRuleCall_3_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXSetLiteral10733);
+                    pushFollow(FOLLOW_ruleXExpression_in_ruleXSetLiteral10695);
                     lv_elements_3_0=ruleXExpression();
 
                     state._fsp--;
@@ -13320,39 +13262,39 @@ public final EObject ruleXSetLiteral() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4578:2: (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
-                    loop89:
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4559:2: (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
+                    loop88:
                     do {
-                        int alt89=2;
-                        int LA89_0 = input.LA(1);
+                        int alt88=2;
+                        int LA88_0 = input.LA(1);
 
-                        if ( (LA89_0==25) ) {
-                            alt89=1;
+                        if ( (LA88_0==24) ) {
+                            alt88=1;
                         }
 
 
-                        switch (alt89) {
+                        switch (alt88) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4578:4: otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4559:4: otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) )
                     	    {
-                    	    otherlv_4=(Token)match(input,25,FOLLOW_25_in_ruleXSetLiteral10746); if (state.failed) return current;
+                    	    otherlv_4=(Token)match(input,24,FOLLOW_24_in_ruleXSetLiteral10708); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_4, grammarAccess.getXSetLiteralAccess().getCommaKeyword_3_1_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4582:1: ( (lv_elements_5_0= ruleXExpression ) )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4583:1: (lv_elements_5_0= ruleXExpression )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4563:1: ( (lv_elements_5_0= ruleXExpression ) )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4564:1: (lv_elements_5_0= ruleXExpression )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4583:1: (lv_elements_5_0= ruleXExpression )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4584:3: lv_elements_5_0= ruleXExpression
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4564:1: (lv_elements_5_0= ruleXExpression )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4565:3: lv_elements_5_0= ruleXExpression
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getXSetLiteralAccess().getElementsXExpressionParserRuleCall_3_1_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleXExpression_in_ruleXSetLiteral10767);
+                    	    pushFollow(FOLLOW_ruleXExpression_in_ruleXSetLiteral10729);
                     	    lv_elements_5_0=ruleXExpression();
 
                     	    state._fsp--;
@@ -13381,7 +13323,7 @@ public final EObject ruleXSetLiteral() throws RecognitionException {
                     	    break;
 
                     	default :
-                    	    break loop89;
+                    	    break loop88;
                         }
                     } while (true);
 
@@ -13391,7 +13333,7 @@ public final EObject ruleXSetLiteral() throws RecognitionException {
 
             }
 
-            otherlv_6=(Token)match(input,20,FOLLOW_20_in_ruleXSetLiteral10783); if (state.failed) return current;
+            otherlv_6=(Token)match(input,19,FOLLOW_19_in_ruleXSetLiteral10745); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_6, grammarAccess.getXSetLiteralAccess().getRightCurlyBracketKeyword_4());
@@ -13420,7 +13362,7 @@ public final EObject ruleXSetLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXListLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4612:1: entryRuleXListLiteral returns [EObject current=null] : iv_ruleXListLiteral= ruleXListLiteral EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4593:1: entryRuleXListLiteral returns [EObject current=null] : iv_ruleXListLiteral= ruleXListLiteral EOF ;
     public final EObject entryRuleXListLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -13428,13 +13370,13 @@ public final EObject entryRuleXListLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4613:2: (iv_ruleXListLiteral= ruleXListLiteral EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4614:2: iv_ruleXListLiteral= ruleXListLiteral EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4594:2: (iv_ruleXListLiteral= ruleXListLiteral EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4595:2: iv_ruleXListLiteral= ruleXListLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXListLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXListLiteral_in_entryRuleXListLiteral10819);
+            pushFollow(FOLLOW_ruleXListLiteral_in_entryRuleXListLiteral10781);
             iv_ruleXListLiteral=ruleXListLiteral();
 
             state._fsp--;
@@ -13442,7 +13384,7 @@ public final EObject entryRuleXListLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXListLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXListLiteral10829); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXListLiteral10791); if (state.failed) return current;
 
             }
 
@@ -13460,7 +13402,7 @@ public final EObject entryRuleXListLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXListLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4621:1: ruleXListLiteral returns [EObject current=null] : ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4602:1: ruleXListLiteral returns [EObject current=null] : ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' ) ;
     public final EObject ruleXListLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -13476,14 +13418,14 @@ public final EObject ruleXListLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4624:28: ( ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4625:1: ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4605:28: ( ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4606:1: ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4625:1: ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4625:2: () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4606:1: ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4606:2: () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']'
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4625:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4626:5: 
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4606:2: ()
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4607:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -13495,41 +13437,41 @@ public final EObject ruleXListLiteral() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,33,FOLLOW_33_in_ruleXListLiteral10875); if (state.failed) return current;
+            otherlv_1=(Token)match(input,32,FOLLOW_32_in_ruleXListLiteral10837); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXListLiteralAccess().getNumberSignKeyword_1());
                   
             }
-            otherlv_2=(Token)match(input,34,FOLLOW_34_in_ruleXListLiteral10887); if (state.failed) return current;
+            otherlv_2=(Token)match(input,33,FOLLOW_33_in_ruleXListLiteral10849); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getXListLiteralAccess().getLeftSquareBracketKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4639:1: ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )?
-            int alt92=2;
-            int LA92_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4620:1: ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )?
+            int alt91=2;
+            int LA91_0 = input.LA(1);
 
-            if ( ((LA92_0>=RULE_STRING && LA92_0<=RULE_ID)||(LA92_0>=15 && LA92_0<=19)||LA92_0==21||(LA92_0>=23 && LA92_0<=24)||LA92_0==27||LA92_0==29||(LA92_0>=33 && LA92_0<=34)||(LA92_0>=36 && LA92_0<=50)||LA92_0==56||(LA92_0>=71 && LA92_0<=72)||LA92_0==77||LA92_0==85||LA92_0==87||(LA92_0>=91 && LA92_0<=92)||(LA92_0>=95 && LA92_0<=103)||LA92_0==105) ) {
-                alt92=1;
+            if ( ((LA91_0>=RULE_STRING && LA91_0<=RULE_ID)||(LA91_0>=15 && LA91_0<=18)||LA91_0==20||(LA91_0>=22 && LA91_0<=23)||LA91_0==26||LA91_0==28||(LA91_0>=32 && LA91_0<=33)||(LA91_0>=35 && LA91_0<=50)||LA91_0==56||(LA91_0>=71 && LA91_0<=72)||LA91_0==77||LA91_0==85||LA91_0==87||(LA91_0>=91 && LA91_0<=92)||(LA91_0>=95 && LA91_0<=103)||LA91_0==105) ) {
+                alt91=1;
             }
-            switch (alt92) {
+            switch (alt91) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4639:2: ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4620:2: ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4639:2: ( (lv_elements_3_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4640:1: (lv_elements_3_0= ruleXExpression )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4620:2: ( (lv_elements_3_0= ruleXExpression ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4621:1: (lv_elements_3_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4640:1: (lv_elements_3_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4641:3: lv_elements_3_0= ruleXExpression
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4621:1: (lv_elements_3_0= ruleXExpression )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4622:3: lv_elements_3_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXListLiteralAccess().getElementsXExpressionParserRuleCall_3_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXListLiteral10909);
+                    pushFollow(FOLLOW_ruleXExpression_in_ruleXListLiteral10871);
                     lv_elements_3_0=ruleXExpression();
 
                     state._fsp--;
@@ -13553,39 +13495,39 @@ public final EObject ruleXListLiteral() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4657:2: (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
-                    loop91:
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4638:2: (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
+                    loop90:
                     do {
-                        int alt91=2;
-                        int LA91_0 = input.LA(1);
+                        int alt90=2;
+                        int LA90_0 = input.LA(1);
 
-                        if ( (LA91_0==25) ) {
-                            alt91=1;
+                        if ( (LA90_0==24) ) {
+                            alt90=1;
                         }
 
 
-                        switch (alt91) {
+                        switch (alt90) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4657:4: otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4638:4: otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) )
                     	    {
-                    	    otherlv_4=(Token)match(input,25,FOLLOW_25_in_ruleXListLiteral10922); if (state.failed) return current;
+                    	    otherlv_4=(Token)match(input,24,FOLLOW_24_in_ruleXListLiteral10884); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_4, grammarAccess.getXListLiteralAccess().getCommaKeyword_3_1_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4661:1: ( (lv_elements_5_0= ruleXExpression ) )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4662:1: (lv_elements_5_0= ruleXExpression )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4642:1: ( (lv_elements_5_0= ruleXExpression ) )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4643:1: (lv_elements_5_0= ruleXExpression )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4662:1: (lv_elements_5_0= ruleXExpression )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4663:3: lv_elements_5_0= ruleXExpression
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4643:1: (lv_elements_5_0= ruleXExpression )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4644:3: lv_elements_5_0= ruleXExpression
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getXListLiteralAccess().getElementsXExpressionParserRuleCall_3_1_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleXExpression_in_ruleXListLiteral10943);
+                    	    pushFollow(FOLLOW_ruleXExpression_in_ruleXListLiteral10905);
                     	    lv_elements_5_0=ruleXExpression();
 
                     	    state._fsp--;
@@ -13614,7 +13556,7 @@ public final EObject ruleXListLiteral() throws RecognitionException {
                     	    break;
 
                     	default :
-                    	    break loop91;
+                    	    break loop90;
                         }
                     } while (true);
 
@@ -13624,7 +13566,7 @@ public final EObject ruleXListLiteral() throws RecognitionException {
 
             }
 
-            otherlv_6=(Token)match(input,35,FOLLOW_35_in_ruleXListLiteral10959); if (state.failed) return current;
+            otherlv_6=(Token)match(input,34,FOLLOW_34_in_ruleXListLiteral10921); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_6, grammarAccess.getXListLiteralAccess().getRightSquareBracketKeyword_4());
@@ -13653,7 +13595,7 @@ public final EObject ruleXListLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXClosure"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4691:1: entryRuleXClosure returns [EObject current=null] : iv_ruleXClosure= ruleXClosure EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4672:1: entryRuleXClosure returns [EObject current=null] : iv_ruleXClosure= ruleXClosure EOF ;
     public final EObject entryRuleXClosure() throws RecognitionException {
         EObject current = null;
 
@@ -13661,13 +13603,13 @@ public final EObject entryRuleXClosure() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4692:2: (iv_ruleXClosure= ruleXClosure EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4693:2: iv_ruleXClosure= ruleXClosure EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4673:2: (iv_ruleXClosure= ruleXClosure EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4674:2: iv_ruleXClosure= ruleXClosure EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXClosureRule()); 
             }
-            pushFollow(FOLLOW_ruleXClosure_in_entryRuleXClosure10995);
+            pushFollow(FOLLOW_ruleXClosure_in_entryRuleXClosure10957);
             iv_ruleXClosure=ruleXClosure();
 
             state._fsp--;
@@ -13675,7 +13617,7 @@ public final EObject entryRuleXClosure() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXClosure; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXClosure11005); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXClosure10967); if (state.failed) return current;
 
             }
 
@@ -13693,7 +13635,7 @@ public final EObject entryRuleXClosure() throws RecognitionException {
 
 
     // $ANTLR start "ruleXClosure"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4700:1: ruleXClosure returns [EObject current=null] : ( ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']' ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4681:1: ruleXClosure returns [EObject current=null] : ( ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']' ) ;
     public final EObject ruleXClosure() throws RecognitionException {
         EObject current = null;
 
@@ -13711,20 +13653,20 @@ public final EObject ruleXClosure() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4703:28: ( ( ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4704:1: ( ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4684:28: ( ( ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']' ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4685:1: ( ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4704:1: ( ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4704:2: ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4685:1: ( ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4685:2: ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']'
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4704:2: ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4704:3: ( ( () '[' ) )=> ( () otherlv_1= '[' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4685:2: ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4685:3: ( ( () '[' ) )=> ( () otherlv_1= '[' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4706:5: ( () otherlv_1= '[' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4706:6: () otherlv_1= '['
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4687:5: ( () otherlv_1= '[' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4687:6: () otherlv_1= '['
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4706:6: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4707:5: 
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4687:6: ()
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4688:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -13736,7 +13678,7 @@ public final EObject ruleXClosure() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,34,FOLLOW_34_in_ruleXClosure11065); if (state.failed) return current;
+            otherlv_1=(Token)match(input,33,FOLLOW_33_in_ruleXClosure11027); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXClosureAccess().getLeftSquareBracketKeyword_0_0_1());
@@ -13748,39 +13690,39 @@ public final EObject ruleXClosure() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4716:3: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )?
-            int alt95=2;
-            alt95 = dfa95.predict(input);
-            switch (alt95) {
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4697:3: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )?
+            int alt94=2;
+            alt94 = dfa94.predict(input);
+            switch (alt94) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4716:4: ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4697:4: ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4731:6: ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4731:7: ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4712:6: ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4712:7: ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4731:7: ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )?
-                    int alt94=2;
-                    int LA94_0 = input.LA(1);
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4712:7: ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )?
+                    int alt93=2;
+                    int LA93_0 = input.LA(1);
 
-                    if ( (LA94_0==RULE_ID||LA94_0==24||LA94_0==68) ) {
-                        alt94=1;
+                    if ( (LA93_0==RULE_ID||LA93_0==23||LA93_0==68) ) {
+                        alt93=1;
                     }
-                    switch (alt94) {
+                    switch (alt93) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4731:8: ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )*
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4712:8: ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )*
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4731:8: ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4732:1: (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4712:8: ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4713:1: (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4732:1: (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4733:3: lv_declaredFormalParameters_2_0= ruleJvmFormalParameter
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4713:1: (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4714:3: lv_declaredFormalParameters_2_0= ruleJvmFormalParameter
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_1_0_0_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleJvmFormalParameter_in_ruleXClosure11138);
+                            pushFollow(FOLLOW_ruleJvmFormalParameter_in_ruleXClosure11100);
                             lv_declaredFormalParameters_2_0=ruleJvmFormalParameter();
 
                             state._fsp--;
@@ -13804,39 +13746,39 @@ public final EObject ruleXClosure() throws RecognitionException {
 
                             }
 
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4749:2: (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )*
-                            loop93:
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4730:2: (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )*
+                            loop92:
                             do {
-                                int alt93=2;
-                                int LA93_0 = input.LA(1);
+                                int alt92=2;
+                                int LA92_0 = input.LA(1);
 
-                                if ( (LA93_0==25) ) {
-                                    alt93=1;
+                                if ( (LA92_0==24) ) {
+                                    alt92=1;
                                 }
 
 
-                                switch (alt93) {
+                                switch (alt92) {
                             	case 1 :
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4749:4: otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) )
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4730:4: otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) )
                             	    {
-                            	    otherlv_3=(Token)match(input,25,FOLLOW_25_in_ruleXClosure11151); if (state.failed) return current;
+                            	    otherlv_3=(Token)match(input,24,FOLLOW_24_in_ruleXClosure11113); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	          	newLeafNode(otherlv_3, grammarAccess.getXClosureAccess().getCommaKeyword_1_0_0_1_0());
                             	          
                             	    }
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4753:1: ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) )
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4754:1: (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter )
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4734:1: ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) )
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4735:1: (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter )
                             	    {
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4754:1: (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter )
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4755:3: lv_declaredFormalParameters_4_0= ruleJvmFormalParameter
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4735:1: (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter )
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4736:3: lv_declaredFormalParameters_4_0= ruleJvmFormalParameter
                             	    {
                             	    if ( state.backtracking==0 ) {
                             	       
                             	      	        newCompositeNode(grammarAccess.getXClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_1_0_0_1_1_0()); 
                             	      	    
                             	    }
-                            	    pushFollow(FOLLOW_ruleJvmFormalParameter_in_ruleXClosure11172);
+                            	    pushFollow(FOLLOW_ruleJvmFormalParameter_in_ruleXClosure11134);
                             	    lv_declaredFormalParameters_4_0=ruleJvmFormalParameter();
 
                             	    state._fsp--;
@@ -13865,7 +13807,7 @@ public final EObject ruleXClosure() throws RecognitionException {
                             	    break;
 
                             	default :
-                            	    break loop93;
+                            	    break loop92;
                                 }
                             } while (true);
 
@@ -13875,13 +13817,13 @@ public final EObject ruleXClosure() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4771:6: ( (lv_explicitSyntax_5_0= '|' ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4772:1: (lv_explicitSyntax_5_0= '|' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4752:6: ( (lv_explicitSyntax_5_0= '|' ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4753:1: (lv_explicitSyntax_5_0= '|' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4772:1: (lv_explicitSyntax_5_0= '|' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4773:3: lv_explicitSyntax_5_0= '|'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4753:1: (lv_explicitSyntax_5_0= '|' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4754:3: lv_explicitSyntax_5_0= '|'
                     {
-                    lv_explicitSyntax_5_0=(Token)match(input,84,FOLLOW_84_in_ruleXClosure11194); if (state.failed) return current;
+                    lv_explicitSyntax_5_0=(Token)match(input,84,FOLLOW_84_in_ruleXClosure11156); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_explicitSyntax_5_0, grammarAccess.getXClosureAccess().getExplicitSyntaxVerticalLineKeyword_1_0_1_0());
@@ -13910,18 +13852,18 @@ public final EObject ruleXClosure() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4786:5: ( (lv_expression_6_0= ruleXExpressionInClosure ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4787:1: (lv_expression_6_0= ruleXExpressionInClosure )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4767:5: ( (lv_expression_6_0= ruleXExpressionInClosure ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4768:1: (lv_expression_6_0= ruleXExpressionInClosure )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4787:1: (lv_expression_6_0= ruleXExpressionInClosure )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4788:3: lv_expression_6_0= ruleXExpressionInClosure
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4768:1: (lv_expression_6_0= ruleXExpressionInClosure )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4769:3: lv_expression_6_0= ruleXExpressionInClosure
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXClosureAccess().getExpressionXExpressionInClosureParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpressionInClosure_in_ruleXClosure11231);
+            pushFollow(FOLLOW_ruleXExpressionInClosure_in_ruleXClosure11193);
             lv_expression_6_0=ruleXExpressionInClosure();
 
             state._fsp--;
@@ -13945,7 +13887,7 @@ public final EObject ruleXClosure() throws RecognitionException {
 
             }
 
-            otherlv_7=(Token)match(input,35,FOLLOW_35_in_ruleXClosure11243); if (state.failed) return current;
+            otherlv_7=(Token)match(input,34,FOLLOW_34_in_ruleXClosure11205); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_7, grammarAccess.getXClosureAccess().getRightSquareBracketKeyword_3());
@@ -13974,7 +13916,7 @@ public final EObject ruleXClosure() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXExpressionInClosure"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4816:1: entryRuleXExpressionInClosure returns [EObject current=null] : iv_ruleXExpressionInClosure= ruleXExpressionInClosure EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4797:1: entryRuleXExpressionInClosure returns [EObject current=null] : iv_ruleXExpressionInClosure= ruleXExpressionInClosure EOF ;
     public final EObject entryRuleXExpressionInClosure() throws RecognitionException {
         EObject current = null;
 
@@ -13982,13 +13924,13 @@ public final EObject entryRuleXExpressionInClosure() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4817:2: (iv_ruleXExpressionInClosure= ruleXExpressionInClosure EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4818:2: iv_ruleXExpressionInClosure= ruleXExpressionInClosure EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4798:2: (iv_ruleXExpressionInClosure= ruleXExpressionInClosure EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4799:2: iv_ruleXExpressionInClosure= ruleXExpressionInClosure EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXExpressionInClosureRule()); 
             }
-            pushFollow(FOLLOW_ruleXExpressionInClosure_in_entryRuleXExpressionInClosure11279);
+            pushFollow(FOLLOW_ruleXExpressionInClosure_in_entryRuleXExpressionInClosure11241);
             iv_ruleXExpressionInClosure=ruleXExpressionInClosure();
 
             state._fsp--;
@@ -13996,7 +13938,7 @@ public final EObject entryRuleXExpressionInClosure() throws RecognitionException
             if ( state.backtracking==0 ) {
                current =iv_ruleXExpressionInClosure; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXExpressionInClosure11289); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXExpressionInClosure11251); if (state.failed) return current;
 
             }
 
@@ -14014,7 +13956,7 @@ public final EObject entryRuleXExpressionInClosure() throws RecognitionException
 
 
     // $ANTLR start "ruleXExpressionInClosure"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4825:1: ruleXExpressionInClosure returns [EObject current=null] : ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4806:1: ruleXExpressionInClosure returns [EObject current=null] : ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* ) ;
     public final EObject ruleXExpressionInClosure() throws RecognitionException {
         EObject current = null;
 
@@ -14025,14 +13967,14 @@ public final EObject ruleXExpressionInClosure() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4828:28: ( ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4829:1: ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4809:28: ( ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4810:1: ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4829:1: ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4829:2: () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )*
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4810:1: ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4810:2: () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )*
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4829:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4830:5: 
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4810:2: ()
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4811:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -14044,33 +13986,33 @@ public final EObject ruleXExpressionInClosure() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4835:2: ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )*
-            loop97:
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4816:2: ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )*
+            loop96:
             do {
-                int alt97=2;
-                int LA97_0 = input.LA(1);
+                int alt96=2;
+                int LA96_0 = input.LA(1);
 
-                if ( ((LA97_0>=RULE_STRING && LA97_0<=RULE_ID)||(LA97_0>=15 && LA97_0<=19)||LA97_0==21||(LA97_0>=23 && LA97_0<=24)||LA97_0==27||LA97_0==29||(LA97_0>=33 && LA97_0<=34)||(LA97_0>=36 && LA97_0<=50)||LA97_0==56||(LA97_0>=71 && LA97_0<=72)||LA97_0==77||LA97_0==85||LA97_0==87||(LA97_0>=91 && LA97_0<=103)||LA97_0==105) ) {
-                    alt97=1;
+                if ( ((LA96_0>=RULE_STRING && LA96_0<=RULE_ID)||(LA96_0>=15 && LA96_0<=18)||LA96_0==20||(LA96_0>=22 && LA96_0<=23)||LA96_0==26||LA96_0==28||(LA96_0>=32 && LA96_0<=33)||(LA96_0>=35 && LA96_0<=50)||LA96_0==56||(LA96_0>=71 && LA96_0<=72)||LA96_0==77||LA96_0==85||LA96_0==87||(LA96_0>=91 && LA96_0<=103)||LA96_0==105) ) {
+                    alt96=1;
                 }
 
 
-                switch (alt97) {
+                switch (alt96) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4835:3: ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )?
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4816:3: ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )?
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4835:3: ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4836:1: (lv_expressions_1_0= ruleXExpressionOrVarDeclaration )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4816:3: ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4817:1: (lv_expressions_1_0= ruleXExpressionOrVarDeclaration )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4836:1: (lv_expressions_1_0= ruleXExpressionOrVarDeclaration )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4837:3: lv_expressions_1_0= ruleXExpressionOrVarDeclaration
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4817:1: (lv_expressions_1_0= ruleXExpressionOrVarDeclaration )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4818:3: lv_expressions_1_0= ruleXExpressionOrVarDeclaration
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXExpressionInClosureAccess().getExpressionsXExpressionOrVarDeclarationParserRuleCall_1_0_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_ruleXExpressionInClosure11345);
+            	    pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_ruleXExpressionInClosure11307);
             	    lv_expressions_1_0=ruleXExpressionOrVarDeclaration();
 
             	    state._fsp--;
@@ -14094,18 +14036,18 @@ public final EObject ruleXExpressionInClosure() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4853:2: (otherlv_2= ';' )?
-            	    int alt96=2;
-            	    int LA96_0 = input.LA(1);
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4834:2: (otherlv_2= ';' )?
+            	    int alt95=2;
+            	    int LA95_0 = input.LA(1);
 
-            	    if ( (LA96_0==22) ) {
-            	        alt96=1;
+            	    if ( (LA95_0==21) ) {
+            	        alt95=1;
             	    }
-            	    switch (alt96) {
+            	    switch (alt95) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4853:4: otherlv_2= ';'
+            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4834:4: otherlv_2= ';'
             	            {
-            	            otherlv_2=(Token)match(input,22,FOLLOW_22_in_ruleXExpressionInClosure11358); if (state.failed) return current;
+            	            otherlv_2=(Token)match(input,21,FOLLOW_21_in_ruleXExpressionInClosure11320); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                  	newLeafNode(otherlv_2, grammarAccess.getXExpressionInClosureAccess().getSemicolonKeyword_1_1());
@@ -14122,7 +14064,7 @@ public final EObject ruleXExpressionInClosure() throws RecognitionException {
             	    break;
 
             	default :
-            	    break loop97;
+            	    break loop96;
                 }
             } while (true);
 
@@ -14149,7 +14091,7 @@ public final EObject ruleXExpressionInClosure() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXShortClosure"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4865:1: entryRuleXShortClosure returns [EObject current=null] : iv_ruleXShortClosure= ruleXShortClosure EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4846:1: entryRuleXShortClosure returns [EObject current=null] : iv_ruleXShortClosure= ruleXShortClosure EOF ;
     public final EObject entryRuleXShortClosure() throws RecognitionException {
         EObject current = null;
 
@@ -14157,13 +14099,13 @@ public final EObject entryRuleXShortClosure() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4866:2: (iv_ruleXShortClosure= ruleXShortClosure EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4867:2: iv_ruleXShortClosure= ruleXShortClosure EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4847:2: (iv_ruleXShortClosure= ruleXShortClosure EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4848:2: iv_ruleXShortClosure= ruleXShortClosure EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXShortClosureRule()); 
             }
-            pushFollow(FOLLOW_ruleXShortClosure_in_entryRuleXShortClosure11398);
+            pushFollow(FOLLOW_ruleXShortClosure_in_entryRuleXShortClosure11360);
             iv_ruleXShortClosure=ruleXShortClosure();
 
             state._fsp--;
@@ -14171,7 +14113,7 @@ public final EObject entryRuleXShortClosure() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXShortClosure; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXShortClosure11408); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXShortClosure11370); if (state.failed) return current;
 
             }
 
@@ -14189,7 +14131,7 @@ public final EObject entryRuleXShortClosure() throws RecognitionException {
 
 
     // $ANTLR start "ruleXShortClosure"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4874:1: ruleXShortClosure returns [EObject current=null] : ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4855:1: ruleXShortClosure returns [EObject current=null] : ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) ) ;
     public final EObject ruleXShortClosure() throws RecognitionException {
         EObject current = null;
 
@@ -14205,20 +14147,20 @@ public final EObject ruleXShortClosure() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4877:28: ( ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4878:1: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4858:28: ( ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4859:1: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4878:1: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4878:2: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4859:1: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4859:2: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4878:2: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4878:3: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4859:2: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4859:3: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4894:6: ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4894:7: () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4875:6: ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4875:7: () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4894:7: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4895:5: 
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4875:7: ()
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4876:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -14230,29 +14172,29 @@ public final EObject ruleXShortClosure() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4900:2: ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )?
-            int alt99=2;
-            int LA99_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4881:2: ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )?
+            int alt98=2;
+            int LA98_0 = input.LA(1);
 
-            if ( (LA99_0==RULE_ID||LA99_0==24||LA99_0==68) ) {
-                alt99=1;
+            if ( (LA98_0==RULE_ID||LA98_0==23||LA98_0==68) ) {
+                alt98=1;
             }
-            switch (alt99) {
+            switch (alt98) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4900:3: ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )*
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4881:3: ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )*
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4900:3: ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4901:1: (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4881:3: ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4882:1: (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4901:1: (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4902:3: lv_declaredFormalParameters_1_0= ruleJvmFormalParameter
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4882:1: (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4883:3: lv_declaredFormalParameters_1_0= ruleJvmFormalParameter
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXShortClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_0_0_1_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleJvmFormalParameter_in_ruleXShortClosure11516);
+                    pushFollow(FOLLOW_ruleJvmFormalParameter_in_ruleXShortClosure11478);
                     lv_declaredFormalParameters_1_0=ruleJvmFormalParameter();
 
                     state._fsp--;
@@ -14276,39 +14218,39 @@ public final EObject ruleXShortClosure() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4918:2: (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )*
-                    loop98:
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4899:2: (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )*
+                    loop97:
                     do {
-                        int alt98=2;
-                        int LA98_0 = input.LA(1);
+                        int alt97=2;
+                        int LA97_0 = input.LA(1);
 
-                        if ( (LA98_0==25) ) {
-                            alt98=1;
+                        if ( (LA97_0==24) ) {
+                            alt97=1;
                         }
 
 
-                        switch (alt98) {
+                        switch (alt97) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4918:4: otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4899:4: otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) )
                     	    {
-                    	    otherlv_2=(Token)match(input,25,FOLLOW_25_in_ruleXShortClosure11529); if (state.failed) return current;
+                    	    otherlv_2=(Token)match(input,24,FOLLOW_24_in_ruleXShortClosure11491); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_2, grammarAccess.getXShortClosureAccess().getCommaKeyword_0_0_1_1_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4922:1: ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4923:1: (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4903:1: ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4904:1: (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4923:1: (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4924:3: lv_declaredFormalParameters_3_0= ruleJvmFormalParameter
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4904:1: (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4905:3: lv_declaredFormalParameters_3_0= ruleJvmFormalParameter
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getXShortClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_0_0_1_1_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleJvmFormalParameter_in_ruleXShortClosure11550);
+                    	    pushFollow(FOLLOW_ruleJvmFormalParameter_in_ruleXShortClosure11512);
                     	    lv_declaredFormalParameters_3_0=ruleJvmFormalParameter();
 
                     	    state._fsp--;
@@ -14337,7 +14279,7 @@ public final EObject ruleXShortClosure() throws RecognitionException {
                     	    break;
 
                     	default :
-                    	    break loop98;
+                    	    break loop97;
                         }
                     } while (true);
 
@@ -14347,13 +14289,13 @@ public final EObject ruleXShortClosure() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4940:6: ( (lv_explicitSyntax_4_0= '|' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4941:1: (lv_explicitSyntax_4_0= '|' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4921:6: ( (lv_explicitSyntax_4_0= '|' ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4922:1: (lv_explicitSyntax_4_0= '|' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4941:1: (lv_explicitSyntax_4_0= '|' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4942:3: lv_explicitSyntax_4_0= '|'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4922:1: (lv_explicitSyntax_4_0= '|' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4923:3: lv_explicitSyntax_4_0= '|'
             {
-            lv_explicitSyntax_4_0=(Token)match(input,84,FOLLOW_84_in_ruleXShortClosure11572); if (state.failed) return current;
+            lv_explicitSyntax_4_0=(Token)match(input,84,FOLLOW_84_in_ruleXShortClosure11534); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                       newLeafNode(lv_explicitSyntax_4_0, grammarAccess.getXShortClosureAccess().getExplicitSyntaxVerticalLineKeyword_0_0_2_0());
@@ -14379,18 +14321,18 @@ public final EObject ruleXShortClosure() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4955:4: ( (lv_expression_5_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4956:1: (lv_expression_5_0= ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4936:4: ( (lv_expression_5_0= ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4937:1: (lv_expression_5_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4956:1: (lv_expression_5_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4957:3: lv_expression_5_0= ruleXExpression
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4937:1: (lv_expression_5_0= ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4938:3: lv_expression_5_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXShortClosureAccess().getExpressionXExpressionParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXShortClosure11608);
+            pushFollow(FOLLOW_ruleXExpression_in_ruleXShortClosure11570);
             lv_expression_5_0=ruleXExpression();
 
             state._fsp--;
@@ -14437,7 +14379,7 @@ public final EObject ruleXShortClosure() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXParenthesizedExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4981:1: entryRuleXParenthesizedExpression returns [EObject current=null] : iv_ruleXParenthesizedExpression= ruleXParenthesizedExpression EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4962:1: entryRuleXParenthesizedExpression returns [EObject current=null] : iv_ruleXParenthesizedExpression= ruleXParenthesizedExpression EOF ;
     public final EObject entryRuleXParenthesizedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -14445,13 +14387,13 @@ public final EObject entryRuleXParenthesizedExpression() throws RecognitionExcep
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4982:2: (iv_ruleXParenthesizedExpression= ruleXParenthesizedExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4983:2: iv_ruleXParenthesizedExpression= ruleXParenthesizedExpression EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4963:2: (iv_ruleXParenthesizedExpression= ruleXParenthesizedExpression EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4964:2: iv_ruleXParenthesizedExpression= ruleXParenthesizedExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXParenthesizedExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXParenthesizedExpression_in_entryRuleXParenthesizedExpression11644);
+            pushFollow(FOLLOW_ruleXParenthesizedExpression_in_entryRuleXParenthesizedExpression11606);
             iv_ruleXParenthesizedExpression=ruleXParenthesizedExpression();
 
             state._fsp--;
@@ -14459,7 +14401,7 @@ public final EObject entryRuleXParenthesizedExpression() throws RecognitionExcep
             if ( state.backtracking==0 ) {
                current =iv_ruleXParenthesizedExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXParenthesizedExpression11654); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXParenthesizedExpression11616); if (state.failed) return current;
 
             }
 
@@ -14477,7 +14419,7 @@ public final EObject entryRuleXParenthesizedExpression() throws RecognitionExcep
 
 
     // $ANTLR start "ruleXParenthesizedExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4990:1: ruleXParenthesizedExpression returns [EObject current=null] : (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4971:1: ruleXParenthesizedExpression returns [EObject current=null] : (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' ) ;
     public final EObject ruleXParenthesizedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -14489,13 +14431,13 @@ public final EObject ruleXParenthesizedExpression() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4993:28: ( (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4994:1: (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4974:28: ( (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4975:1: (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4994:1: (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4994:3: otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4975:1: (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4975:3: otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')'
             {
-            otherlv_0=(Token)match(input,24,FOLLOW_24_in_ruleXParenthesizedExpression11691); if (state.failed) return current;
+            otherlv_0=(Token)match(input,23,FOLLOW_23_in_ruleXParenthesizedExpression11653); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getXParenthesizedExpressionAccess().getLeftParenthesisKeyword_0());
@@ -14506,7 +14448,7 @@ public final EObject ruleXParenthesizedExpression() throws RecognitionException
                       newCompositeNode(grammarAccess.getXParenthesizedExpressionAccess().getXExpressionParserRuleCall_1()); 
                   
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXParenthesizedExpression11713);
+            pushFollow(FOLLOW_ruleXExpression_in_ruleXParenthesizedExpression11675);
             this_XExpression_1=ruleXExpression();
 
             state._fsp--;
@@ -14517,7 +14459,7 @@ public final EObject ruleXParenthesizedExpression() throws RecognitionException
                       afterParserOrEnumRuleCall();
                   
             }
-            otherlv_2=(Token)match(input,26,FOLLOW_26_in_ruleXParenthesizedExpression11724); if (state.failed) return current;
+            otherlv_2=(Token)match(input,25,FOLLOW_25_in_ruleXParenthesizedExpression11686); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getXParenthesizedExpressionAccess().getRightParenthesisKeyword_2());
@@ -14546,7 +14488,7 @@ public final EObject ruleXParenthesizedExpression() throws RecognitionException
 
 
     // $ANTLR start "entryRuleXIfExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5019:1: entryRuleXIfExpression returns [EObject current=null] : iv_ruleXIfExpression= ruleXIfExpression EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5000:1: entryRuleXIfExpression returns [EObject current=null] : iv_ruleXIfExpression= ruleXIfExpression EOF ;
     public final EObject entryRuleXIfExpression() throws RecognitionException {
         EObject current = null;
 
@@ -14554,13 +14496,13 @@ public final EObject entryRuleXIfExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5020:2: (iv_ruleXIfExpression= ruleXIfExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5021:2: iv_ruleXIfExpression= ruleXIfExpression EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5001:2: (iv_ruleXIfExpression= ruleXIfExpression EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5002:2: iv_ruleXIfExpression= ruleXIfExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXIfExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXIfExpression_in_entryRuleXIfExpression11760);
+            pushFollow(FOLLOW_ruleXIfExpression_in_entryRuleXIfExpression11722);
             iv_ruleXIfExpression=ruleXIfExpression();
 
             state._fsp--;
@@ -14568,7 +14510,7 @@ public final EObject entryRuleXIfExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXIfExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXIfExpression11770); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXIfExpression11732); if (state.failed) return current;
 
             }
 
@@ -14586,7 +14528,7 @@ public final EObject entryRuleXIfExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXIfExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5028:1: ruleXIfExpression returns [EObject current=null] : ( () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )? ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5009:1: ruleXIfExpression returns [EObject current=null] : ( () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )? ) ;
     public final EObject ruleXIfExpression() throws RecognitionException {
         EObject current = null;
 
@@ -14604,14 +14546,14 @@ public final EObject ruleXIfExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5031:28: ( ( () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )? ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5032:1: ( () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )? )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5012:28: ( ( () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )? ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5013:1: ( () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )? )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5032:1: ( () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )? )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5032:2: () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )?
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5013:1: ( () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )? )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5013:2: () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )?
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5032:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5033:5: 
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5013:2: ()
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5014:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -14623,30 +14565,30 @@ public final EObject ruleXIfExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,85,FOLLOW_85_in_ruleXIfExpression11816); if (state.failed) return current;
+            otherlv_1=(Token)match(input,85,FOLLOW_85_in_ruleXIfExpression11778); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXIfExpressionAccess().getIfKeyword_1());
                   
             }
-            otherlv_2=(Token)match(input,24,FOLLOW_24_in_ruleXIfExpression11828); if (state.failed) return current;
+            otherlv_2=(Token)match(input,23,FOLLOW_23_in_ruleXIfExpression11790); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getXIfExpressionAccess().getLeftParenthesisKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5046:1: ( (lv_if_3_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5047:1: (lv_if_3_0= ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5027:1: ( (lv_if_3_0= ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5028:1: (lv_if_3_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5047:1: (lv_if_3_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5048:3: lv_if_3_0= ruleXExpression
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5028:1: (lv_if_3_0= ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5029:3: lv_if_3_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXIfExpressionAccess().getIfXExpressionParserRuleCall_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXIfExpression11849);
+            pushFollow(FOLLOW_ruleXExpression_in_ruleXIfExpression11811);
             lv_if_3_0=ruleXExpression();
 
             state._fsp--;
@@ -14670,24 +14612,24 @@ public final EObject ruleXIfExpression() throws RecognitionException {
 
             }
 
-            otherlv_4=(Token)match(input,26,FOLLOW_26_in_ruleXIfExpression11861); if (state.failed) return current;
+            otherlv_4=(Token)match(input,25,FOLLOW_25_in_ruleXIfExpression11823); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_4, grammarAccess.getXIfExpressionAccess().getRightParenthesisKeyword_4());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5068:1: ( (lv_then_5_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5069:1: (lv_then_5_0= ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5049:1: ( (lv_then_5_0= ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5050:1: (lv_then_5_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5069:1: (lv_then_5_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5070:3: lv_then_5_0= ruleXExpression
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5050:1: (lv_then_5_0= ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5051:3: lv_then_5_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXIfExpressionAccess().getThenXExpressionParserRuleCall_5_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXIfExpression11882);
+            pushFollow(FOLLOW_ruleXExpression_in_ruleXIfExpression11844);
             lv_then_5_0=ruleXExpression();
 
             state._fsp--;
@@ -14711,25 +14653,25 @@ public final EObject ruleXIfExpression() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5086:2: ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )?
-            int alt100=2;
-            int LA100_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5067:2: ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )?
+            int alt99=2;
+            int LA99_0 = input.LA(1);
 
-            if ( (LA100_0==86) ) {
-                int LA100_1 = input.LA(2);
+            if ( (LA99_0==86) ) {
+                int LA99_1 = input.LA(2);
 
                 if ( (synpred43_InternalCheck()) ) {
-                    alt100=1;
+                    alt99=1;
                 }
             }
-            switch (alt100) {
+            switch (alt99) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5086:3: ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5067:3: ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5086:3: ( ( 'else' )=>otherlv_6= 'else' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5086:4: ( 'else' )=>otherlv_6= 'else'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5067:3: ( ( 'else' )=>otherlv_6= 'else' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5067:4: ( 'else' )=>otherlv_6= 'else'
                     {
-                    otherlv_6=(Token)match(input,86,FOLLOW_86_in_ruleXIfExpression11903); if (state.failed) return current;
+                    otherlv_6=(Token)match(input,86,FOLLOW_86_in_ruleXIfExpression11865); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_6, grammarAccess.getXIfExpressionAccess().getElseKeyword_6_0());
@@ -14738,18 +14680,18 @@ public final EObject ruleXIfExpression() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5091:2: ( (lv_else_7_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5092:1: (lv_else_7_0= ruleXExpression )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5072:2: ( (lv_else_7_0= ruleXExpression ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5073:1: (lv_else_7_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5092:1: (lv_else_7_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5093:3: lv_else_7_0= ruleXExpression
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5073:1: (lv_else_7_0= ruleXExpression )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5074:3: lv_else_7_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXIfExpressionAccess().getElseXExpressionParserRuleCall_6_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXIfExpression11925);
+                    pushFollow(FOLLOW_ruleXExpression_in_ruleXIfExpression11887);
                     lv_else_7_0=ruleXExpression();
 
                     state._fsp--;
@@ -14802,7 +14744,7 @@ public final EObject ruleXIfExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXSwitchExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5117:1: entryRuleXSwitchExpression returns [EObject current=null] : iv_ruleXSwitchExpression= ruleXSwitchExpression EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5098:1: entryRuleXSwitchExpression returns [EObject current=null] : iv_ruleXSwitchExpression= ruleXSwitchExpression EOF ;
     public final EObject entryRuleXSwitchExpression() throws RecognitionException {
         EObject current = null;
 
@@ -14810,13 +14752,13 @@ public final EObject entryRuleXSwitchExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5118:2: (iv_ruleXSwitchExpression= ruleXSwitchExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5119:2: iv_ruleXSwitchExpression= ruleXSwitchExpression EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5099:2: (iv_ruleXSwitchExpression= ruleXSwitchExpression EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5100:2: iv_ruleXSwitchExpression= ruleXSwitchExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXSwitchExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXSwitchExpression_in_entryRuleXSwitchExpression11963);
+            pushFollow(FOLLOW_ruleXSwitchExpression_in_entryRuleXSwitchExpression11925);
             iv_ruleXSwitchExpression=ruleXSwitchExpression();
 
             state._fsp--;
@@ -14824,7 +14766,7 @@ public final EObject entryRuleXSwitchExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXSwitchExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXSwitchExpression11973); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXSwitchExpression11935); if (state.failed) return current;
 
             }
 
@@ -14842,7 +14784,7 @@ public final EObject entryRuleXSwitchExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXSwitchExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5126:1: ruleXSwitchExpression returns [EObject current=null] : ( () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}' ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5107:1: ruleXSwitchExpression returns [EObject current=null] : ( () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}' ) ;
     public final EObject ruleXSwitchExpression() throws RecognitionException {
         EObject current = null;
 
@@ -14871,14 +14813,14 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5129:28: ( ( () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5130:1: ( () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5110:28: ( ( () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}' ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5111:1: ( () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5130:1: ( () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5130:2: () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5111:1: ( () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5111:2: () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}'
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5130:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5131:5: 
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5111:2: ()
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5112:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -14890,46 +14832,46 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,87,FOLLOW_87_in_ruleXSwitchExpression12019); if (state.failed) return current;
+            otherlv_1=(Token)match(input,87,FOLLOW_87_in_ruleXSwitchExpression11981); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXSwitchExpressionAccess().getSwitchKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5140:1: ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) )
-            int alt102=2;
-            alt102 = dfa102.predict(input);
-            switch (alt102) {
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5121:1: ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) )
+            int alt101=2;
+            alt101 = dfa101.predict(input);
+            switch (alt101) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5140:2: ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5121:2: ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5140:2: ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5140:3: ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5121:2: ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5121:3: ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')'
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5140:3: ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5140:4: ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5121:3: ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5121:4: ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5146:5: (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5146:7: otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5127:5: (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5127:7: otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':'
                     {
-                    otherlv_2=(Token)match(input,24,FOLLOW_24_in_ruleXSwitchExpression12057); if (state.failed) return current;
+                    otherlv_2=(Token)match(input,23,FOLLOW_23_in_ruleXSwitchExpression12019); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_2, grammarAccess.getXSwitchExpressionAccess().getLeftParenthesisKeyword_2_0_0_0_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5150:1: ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5151:1: (lv_declaredParam_3_0= ruleJvmFormalParameter )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5131:1: ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5132:1: (lv_declaredParam_3_0= ruleJvmFormalParameter )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5151:1: (lv_declaredParam_3_0= ruleJvmFormalParameter )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5152:3: lv_declaredParam_3_0= ruleJvmFormalParameter
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5132:1: (lv_declaredParam_3_0= ruleJvmFormalParameter )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5133:3: lv_declaredParam_3_0= ruleJvmFormalParameter
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXSwitchExpressionAccess().getDeclaredParamJvmFormalParameterParserRuleCall_2_0_0_0_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleJvmFormalParameter_in_ruleXSwitchExpression12078);
+                    pushFollow(FOLLOW_ruleJvmFormalParameter_in_ruleXSwitchExpression12040);
                     lv_declaredParam_3_0=ruleJvmFormalParameter();
 
                     state._fsp--;
@@ -14953,7 +14895,7 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
 
                     }
 
-                    otherlv_4=(Token)match(input,88,FOLLOW_88_in_ruleXSwitchExpression12090); if (state.failed) return current;
+                    otherlv_4=(Token)match(input,88,FOLLOW_88_in_ruleXSwitchExpression12052); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_4, grammarAccess.getXSwitchExpressionAccess().getColonKeyword_2_0_0_0_2());
@@ -14965,18 +14907,18 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5172:3: ( (lv_switch_5_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5173:1: (lv_switch_5_0= ruleXExpression )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5153:3: ( (lv_switch_5_0= ruleXExpression ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5154:1: (lv_switch_5_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5173:1: (lv_switch_5_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5174:3: lv_switch_5_0= ruleXExpression
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5154:1: (lv_switch_5_0= ruleXExpression )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5155:3: lv_switch_5_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXSwitchExpressionAccess().getSwitchXExpressionParserRuleCall_2_0_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXSwitchExpression12113);
+                    pushFollow(FOLLOW_ruleXExpression_in_ruleXSwitchExpression12075);
                     lv_switch_5_0=ruleXExpression();
 
                     state._fsp--;
@@ -15000,7 +14942,7 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
 
                     }
 
-                    otherlv_6=(Token)match(input,26,FOLLOW_26_in_ruleXSwitchExpression12125); if (state.failed) return current;
+                    otherlv_6=(Token)match(input,25,FOLLOW_25_in_ruleXSwitchExpression12087); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_6, grammarAccess.getXSwitchExpressionAccess().getRightParenthesisKeyword_2_0_2());
@@ -15013,33 +14955,33 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5195:6: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5176:6: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5195:6: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5195:7: ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5176:6: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5176:7: ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5195:7: ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )?
-                    int alt101=2;
-                    alt101 = dfa101.predict(input);
-                    switch (alt101) {
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5176:7: ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )?
+                    int alt100=2;
+                    alt100 = dfa100.predict(input);
+                    switch (alt100) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5195:8: ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5176:8: ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5200:5: ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5200:6: ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':'
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5181:5: ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5181:6: ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':'
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5200:6: ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5201:1: (lv_declaredParam_7_0= ruleJvmFormalParameter )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5181:6: ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5182:1: (lv_declaredParam_7_0= ruleJvmFormalParameter )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5201:1: (lv_declaredParam_7_0= ruleJvmFormalParameter )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5202:3: lv_declaredParam_7_0= ruleJvmFormalParameter
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5182:1: (lv_declaredParam_7_0= ruleJvmFormalParameter )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5183:3: lv_declaredParam_7_0= ruleJvmFormalParameter
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXSwitchExpressionAccess().getDeclaredParamJvmFormalParameterParserRuleCall_2_1_0_0_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleJvmFormalParameter_in_ruleXSwitchExpression12174);
+                            pushFollow(FOLLOW_ruleJvmFormalParameter_in_ruleXSwitchExpression12136);
                             lv_declaredParam_7_0=ruleJvmFormalParameter();
 
                             state._fsp--;
@@ -15063,7 +15005,7 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
 
                             }
 
-                            otherlv_8=(Token)match(input,88,FOLLOW_88_in_ruleXSwitchExpression12186); if (state.failed) return current;
+                            otherlv_8=(Token)match(input,88,FOLLOW_88_in_ruleXSwitchExpression12148); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                   	newLeafNode(otherlv_8, grammarAccess.getXSwitchExpressionAccess().getColonKeyword_2_1_0_0_1());
@@ -15078,18 +15020,18 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5222:4: ( (lv_switch_9_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5223:1: (lv_switch_9_0= ruleXExpression )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5203:4: ( (lv_switch_9_0= ruleXExpression ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5204:1: (lv_switch_9_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5223:1: (lv_switch_9_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5224:3: lv_switch_9_0= ruleXExpression
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5204:1: (lv_switch_9_0= ruleXExpression )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5205:3: lv_switch_9_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXSwitchExpressionAccess().getSwitchXExpressionParserRuleCall_2_1_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXSwitchExpression12210);
+                    pushFollow(FOLLOW_ruleXExpression_in_ruleXSwitchExpression12172);
                     lv_switch_9_0=ruleXExpression();
 
                     state._fsp--;
@@ -15122,36 +15064,36 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
 
             }
 
-            otherlv_10=(Token)match(input,19,FOLLOW_19_in_ruleXSwitchExpression12224); if (state.failed) return current;
+            otherlv_10=(Token)match(input,18,FOLLOW_18_in_ruleXSwitchExpression12186); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_10, grammarAccess.getXSwitchExpressionAccess().getLeftCurlyBracketKeyword_3());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5244:1: ( (lv_cases_11_0= ruleXCasePart ) )*
-            loop103:
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5225:1: ( (lv_cases_11_0= ruleXCasePart ) )*
+            loop102:
             do {
-                int alt103=2;
-                int LA103_0 = input.LA(1);
+                int alt102=2;
+                int LA102_0 = input.LA(1);
 
-                if ( (LA103_0==RULE_ID||(LA103_0>=24 && LA103_0<=25)||LA103_0==68||LA103_0==88||LA103_0==90) ) {
-                    alt103=1;
+                if ( (LA102_0==RULE_ID||(LA102_0>=23 && LA102_0<=24)||LA102_0==68||LA102_0==88||LA102_0==90) ) {
+                    alt102=1;
                 }
 
 
-                switch (alt103) {
+                switch (alt102) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5245:1: (lv_cases_11_0= ruleXCasePart )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5226:1: (lv_cases_11_0= ruleXCasePart )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5245:1: (lv_cases_11_0= ruleXCasePart )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5246:3: lv_cases_11_0= ruleXCasePart
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5226:1: (lv_cases_11_0= ruleXCasePart )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5227:3: lv_cases_11_0= ruleXCasePart
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXSwitchExpressionAccess().getCasesXCasePartParserRuleCall_4_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXCasePart_in_ruleXSwitchExpression12245);
+            	    pushFollow(FOLLOW_ruleXCasePart_in_ruleXSwitchExpression12207);
             	    lv_cases_11_0=ruleXCasePart();
 
             	    state._fsp--;
@@ -15177,45 +15119,45 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
             	    break;
 
             	default :
-            	    break loop103;
+            	    break loop102;
                 }
             } while (true);
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5262:3: (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )?
-            int alt104=2;
-            int LA104_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5243:3: (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )?
+            int alt103=2;
+            int LA103_0 = input.LA(1);
 
-            if ( (LA104_0==89) ) {
-                alt104=1;
+            if ( (LA103_0==89) ) {
+                alt103=1;
             }
-            switch (alt104) {
+            switch (alt103) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5262:5: otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5243:5: otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) )
                     {
-                    otherlv_12=(Token)match(input,89,FOLLOW_89_in_ruleXSwitchExpression12259); if (state.failed) return current;
+                    otherlv_12=(Token)match(input,89,FOLLOW_89_in_ruleXSwitchExpression12221); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_12, grammarAccess.getXSwitchExpressionAccess().getDefaultKeyword_5_0());
                           
                     }
-                    otherlv_13=(Token)match(input,88,FOLLOW_88_in_ruleXSwitchExpression12271); if (state.failed) return current;
+                    otherlv_13=(Token)match(input,88,FOLLOW_88_in_ruleXSwitchExpression12233); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_13, grammarAccess.getXSwitchExpressionAccess().getColonKeyword_5_1());
                           
                     }
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5270:1: ( (lv_default_14_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5271:1: (lv_default_14_0= ruleXExpression )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5251:1: ( (lv_default_14_0= ruleXExpression ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5252:1: (lv_default_14_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5271:1: (lv_default_14_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5272:3: lv_default_14_0= ruleXExpression
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5252:1: (lv_default_14_0= ruleXExpression )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5253:3: lv_default_14_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXSwitchExpressionAccess().getDefaultXExpressionParserRuleCall_5_2_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXSwitchExpression12292);
+                    pushFollow(FOLLOW_ruleXExpression_in_ruleXSwitchExpression12254);
                     lv_default_14_0=ruleXExpression();
 
                     state._fsp--;
@@ -15245,7 +15187,7 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
 
             }
 
-            otherlv_15=(Token)match(input,20,FOLLOW_20_in_ruleXSwitchExpression12306); if (state.failed) return current;
+            otherlv_15=(Token)match(input,19,FOLLOW_19_in_ruleXSwitchExpression12268); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_15, grammarAccess.getXSwitchExpressionAccess().getRightCurlyBracketKeyword_6());
@@ -15274,7 +15216,7 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXCasePart"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5300:1: entryRuleXCasePart returns [EObject current=null] : iv_ruleXCasePart= ruleXCasePart EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5281:1: entryRuleXCasePart returns [EObject current=null] : iv_ruleXCasePart= ruleXCasePart EOF ;
     public final EObject entryRuleXCasePart() throws RecognitionException {
         EObject current = null;
 
@@ -15282,13 +15224,13 @@ public final EObject entryRuleXCasePart() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5301:2: (iv_ruleXCasePart= ruleXCasePart EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5302:2: iv_ruleXCasePart= ruleXCasePart EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5282:2: (iv_ruleXCasePart= ruleXCasePart EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5283:2: iv_ruleXCasePart= ruleXCasePart EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXCasePartRule()); 
             }
-            pushFollow(FOLLOW_ruleXCasePart_in_entryRuleXCasePart12342);
+            pushFollow(FOLLOW_ruleXCasePart_in_entryRuleXCasePart12304);
             iv_ruleXCasePart=ruleXCasePart();
 
             state._fsp--;
@@ -15296,7 +15238,7 @@ public final EObject entryRuleXCasePart() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXCasePart; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXCasePart12352); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXCasePart12314); if (state.failed) return current;
 
             }
 
@@ -15314,7 +15256,7 @@ public final EObject entryRuleXCasePart() throws RecognitionException {
 
 
     // $ANTLR start "ruleXCasePart"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5309:1: ruleXCasePart returns [EObject current=null] : ( () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) ) ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5290:1: ruleXCasePart returns [EObject current=null] : ( () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) ) ) ;
     public final EObject ruleXCasePart() throws RecognitionException {
         EObject current = null;
 
@@ -15331,14 +15273,14 @@ public final EObject ruleXCasePart() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5312:28: ( ( () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5313:1: ( () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5293:28: ( ( () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5294:1: ( () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5313:1: ( () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5313:2: () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5294:1: ( () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5294:2: () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5313:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5314:5: 
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5294:2: ()
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5295:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -15350,26 +15292,26 @@ public final EObject ruleXCasePart() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5319:2: ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )?
-            int alt105=2;
-            int LA105_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5300:2: ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )?
+            int alt104=2;
+            int LA104_0 = input.LA(1);
 
-            if ( (LA105_0==RULE_ID||LA105_0==24||LA105_0==68) ) {
-                alt105=1;
+            if ( (LA104_0==RULE_ID||LA104_0==23||LA104_0==68) ) {
+                alt104=1;
             }
-            switch (alt105) {
+            switch (alt104) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5320:1: (lv_typeGuard_1_0= ruleJvmTypeReference )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5301:1: (lv_typeGuard_1_0= ruleJvmTypeReference )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5320:1: (lv_typeGuard_1_0= ruleJvmTypeReference )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5321:3: lv_typeGuard_1_0= ruleJvmTypeReference
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5301:1: (lv_typeGuard_1_0= ruleJvmTypeReference )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5302:3: lv_typeGuard_1_0= ruleJvmTypeReference
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXCasePartAccess().getTypeGuardJvmTypeReferenceParserRuleCall_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleXCasePart12407);
+                    pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleXCasePart12369);
                     lv_typeGuard_1_0=ruleJvmTypeReference();
 
                     state._fsp--;
@@ -15396,35 +15338,35 @@ public final EObject ruleXCasePart() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5337:3: (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )?
-            int alt106=2;
-            int LA106_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5318:3: (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )?
+            int alt105=2;
+            int LA105_0 = input.LA(1);
 
-            if ( (LA106_0==90) ) {
-                alt106=1;
+            if ( (LA105_0==90) ) {
+                alt105=1;
             }
-            switch (alt106) {
+            switch (alt105) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5337:5: otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5318:5: otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) )
                     {
-                    otherlv_2=(Token)match(input,90,FOLLOW_90_in_ruleXCasePart12421); if (state.failed) return current;
+                    otherlv_2=(Token)match(input,90,FOLLOW_90_in_ruleXCasePart12383); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_2, grammarAccess.getXCasePartAccess().getCaseKeyword_2_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5341:1: ( (lv_case_3_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5342:1: (lv_case_3_0= ruleXExpression )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5322:1: ( (lv_case_3_0= ruleXExpression ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5323:1: (lv_case_3_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5342:1: (lv_case_3_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5343:3: lv_case_3_0= ruleXExpression
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5323:1: (lv_case_3_0= ruleXExpression )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5324:3: lv_case_3_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXCasePartAccess().getCaseXExpressionParserRuleCall_2_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXCasePart12442);
+                    pushFollow(FOLLOW_ruleXExpression_in_ruleXCasePart12404);
                     lv_case_3_0=ruleXExpression();
 
                     state._fsp--;
@@ -15454,48 +15396,48 @@ public final EObject ruleXCasePart() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5359:4: ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) )
-            int alt107=2;
-            int LA107_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5340:4: ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) )
+            int alt106=2;
+            int LA106_0 = input.LA(1);
 
-            if ( (LA107_0==88) ) {
-                alt107=1;
+            if ( (LA106_0==88) ) {
+                alt106=1;
             }
-            else if ( (LA107_0==25) ) {
-                alt107=2;
+            else if ( (LA106_0==24) ) {
+                alt106=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 107, 0, input);
+                    new NoViableAltException("", 106, 0, input);
 
                 throw nvae;
             }
-            switch (alt107) {
+            switch (alt106) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5359:5: (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5340:5: (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5359:5: (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5359:7: otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5340:5: (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5340:7: otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) )
                     {
-                    otherlv_4=(Token)match(input,88,FOLLOW_88_in_ruleXCasePart12458); if (state.failed) return current;
+                    otherlv_4=(Token)match(input,88,FOLLOW_88_in_ruleXCasePart12420); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_4, grammarAccess.getXCasePartAccess().getColonKeyword_3_0_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5363:1: ( (lv_then_5_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5364:1: (lv_then_5_0= ruleXExpression )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5344:1: ( (lv_then_5_0= ruleXExpression ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5345:1: (lv_then_5_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5364:1: (lv_then_5_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5365:3: lv_then_5_0= ruleXExpression
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5345:1: (lv_then_5_0= ruleXExpression )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5346:3: lv_then_5_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXCasePartAccess().getThenXExpressionParserRuleCall_3_0_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXCasePart12479);
+                    pushFollow(FOLLOW_ruleXExpression_in_ruleXCasePart12441);
                     lv_then_5_0=ruleXExpression();
 
                     state._fsp--;
@@ -15526,15 +15468,15 @@ else if ( (LA107_0==25) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5382:6: ( (lv_fallThrough_6_0= ',' ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5363:6: ( (lv_fallThrough_6_0= ',' ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5382:6: ( (lv_fallThrough_6_0= ',' ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5383:1: (lv_fallThrough_6_0= ',' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5363:6: ( (lv_fallThrough_6_0= ',' ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5364:1: (lv_fallThrough_6_0= ',' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5383:1: (lv_fallThrough_6_0= ',' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5384:3: lv_fallThrough_6_0= ','
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5364:1: (lv_fallThrough_6_0= ',' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5365:3: lv_fallThrough_6_0= ','
                     {
-                    lv_fallThrough_6_0=(Token)match(input,25,FOLLOW_25_in_ruleXCasePart12504); if (state.failed) return current;
+                    lv_fallThrough_6_0=(Token)match(input,24,FOLLOW_24_in_ruleXCasePart12466); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_fallThrough_6_0, grammarAccess.getXCasePartAccess().getFallThroughCommaKeyword_3_1_0());
@@ -15583,7 +15525,7 @@ else if ( (LA107_0==25) ) {
 
 
     // $ANTLR start "entryRuleXForLoopExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5405:1: entryRuleXForLoopExpression returns [EObject current=null] : iv_ruleXForLoopExpression= ruleXForLoopExpression EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5386:1: entryRuleXForLoopExpression returns [EObject current=null] : iv_ruleXForLoopExpression= ruleXForLoopExpression EOF ;
     public final EObject entryRuleXForLoopExpression() throws RecognitionException {
         EObject current = null;
 
@@ -15591,13 +15533,13 @@ public final EObject entryRuleXForLoopExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5406:2: (iv_ruleXForLoopExpression= ruleXForLoopExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5407:2: iv_ruleXForLoopExpression= ruleXForLoopExpression EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5387:2: (iv_ruleXForLoopExpression= ruleXForLoopExpression EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5388:2: iv_ruleXForLoopExpression= ruleXForLoopExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXForLoopExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXForLoopExpression_in_entryRuleXForLoopExpression12554);
+            pushFollow(FOLLOW_ruleXForLoopExpression_in_entryRuleXForLoopExpression12516);
             iv_ruleXForLoopExpression=ruleXForLoopExpression();
 
             state._fsp--;
@@ -15605,7 +15547,7 @@ public final EObject entryRuleXForLoopExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXForLoopExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXForLoopExpression12564); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXForLoopExpression12526); if (state.failed) return current;
 
             }
 
@@ -15623,7 +15565,7 @@ public final EObject entryRuleXForLoopExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXForLoopExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5414:1: ruleXForLoopExpression returns [EObject current=null] : ( ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) ) ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5395:1: ruleXForLoopExpression returns [EObject current=null] : ( ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) ) ) ;
     public final EObject ruleXForLoopExpression() throws RecognitionException {
         EObject current = null;
 
@@ -15641,20 +15583,20 @@ public final EObject ruleXForLoopExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5417:28: ( ( ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5418:1: ( ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5398:28: ( ( ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5399:1: ( ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5418:1: ( ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5418:2: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5399:1: ( ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5399:2: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5418:2: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5418:3: ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5399:2: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5399:3: ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5426:5: ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5426:6: () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5407:5: ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5407:6: () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':'
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5426:6: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5427:5: 
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5407:6: ()
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5408:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -15666,30 +15608,30 @@ public final EObject ruleXForLoopExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,16,FOLLOW_16_in_ruleXForLoopExpression12641); if (state.failed) return current;
+            otherlv_1=(Token)match(input,16,FOLLOW_16_in_ruleXForLoopExpression12603); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXForLoopExpressionAccess().getForKeyword_0_0_1());
                   
             }
-            otherlv_2=(Token)match(input,24,FOLLOW_24_in_ruleXForLoopExpression12653); if (state.failed) return current;
+            otherlv_2=(Token)match(input,23,FOLLOW_23_in_ruleXForLoopExpression12615); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getXForLoopExpressionAccess().getLeftParenthesisKeyword_0_0_2());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5440:1: ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5441:1: (lv_declaredParam_3_0= ruleJvmFormalParameter )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5421:1: ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5422:1: (lv_declaredParam_3_0= ruleJvmFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5441:1: (lv_declaredParam_3_0= ruleJvmFormalParameter )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5442:3: lv_declaredParam_3_0= ruleJvmFormalParameter
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5422:1: (lv_declaredParam_3_0= ruleJvmFormalParameter )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5423:3: lv_declaredParam_3_0= ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXForLoopExpressionAccess().getDeclaredParamJvmFormalParameterParserRuleCall_0_0_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleJvmFormalParameter_in_ruleXForLoopExpression12674);
+            pushFollow(FOLLOW_ruleJvmFormalParameter_in_ruleXForLoopExpression12636);
             lv_declaredParam_3_0=ruleJvmFormalParameter();
 
             state._fsp--;
@@ -15713,7 +15655,7 @@ public final EObject ruleXForLoopExpression() throws RecognitionException {
 
             }
 
-            otherlv_4=(Token)match(input,88,FOLLOW_88_in_ruleXForLoopExpression12686); if (state.failed) return current;
+            otherlv_4=(Token)match(input,88,FOLLOW_88_in_ruleXForLoopExpression12648); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_4, grammarAccess.getXForLoopExpressionAccess().getColonKeyword_0_0_4());
@@ -15725,18 +15667,18 @@ public final EObject ruleXForLoopExpression() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5462:3: ( (lv_forExpression_5_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5463:1: (lv_forExpression_5_0= ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5443:3: ( (lv_forExpression_5_0= ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5444:1: (lv_forExpression_5_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5463:1: (lv_forExpression_5_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5464:3: lv_forExpression_5_0= ruleXExpression
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5444:1: (lv_forExpression_5_0= ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5445:3: lv_forExpression_5_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXForLoopExpressionAccess().getForExpressionXExpressionParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXForLoopExpression12709);
+            pushFollow(FOLLOW_ruleXExpression_in_ruleXForLoopExpression12671);
             lv_forExpression_5_0=ruleXExpression();
 
             state._fsp--;
@@ -15760,24 +15702,24 @@ public final EObject ruleXForLoopExpression() throws RecognitionException {
 
             }
 
-            otherlv_6=(Token)match(input,26,FOLLOW_26_in_ruleXForLoopExpression12721); if (state.failed) return current;
+            otherlv_6=(Token)match(input,25,FOLLOW_25_in_ruleXForLoopExpression12683); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_6, grammarAccess.getXForLoopExpressionAccess().getRightParenthesisKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5484:1: ( (lv_eachExpression_7_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5485:1: (lv_eachExpression_7_0= ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5465:1: ( (lv_eachExpression_7_0= ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5466:1: (lv_eachExpression_7_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5485:1: (lv_eachExpression_7_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5486:3: lv_eachExpression_7_0= ruleXExpression
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5466:1: (lv_eachExpression_7_0= ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5467:3: lv_eachExpression_7_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXForLoopExpressionAccess().getEachExpressionXExpressionParserRuleCall_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXForLoopExpression12742);
+            pushFollow(FOLLOW_ruleXExpression_in_ruleXForLoopExpression12704);
             lv_eachExpression_7_0=ruleXExpression();
 
             state._fsp--;
@@ -15824,7 +15766,7 @@ public final EObject ruleXForLoopExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXBasicForLoopExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5510:1: entryRuleXBasicForLoopExpression returns [EObject current=null] : iv_ruleXBasicForLoopExpression= ruleXBasicForLoopExpression EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5491:1: entryRuleXBasicForLoopExpression returns [EObject current=null] : iv_ruleXBasicForLoopExpression= ruleXBasicForLoopExpression EOF ;
     public final EObject entryRuleXBasicForLoopExpression() throws RecognitionException {
         EObject current = null;
 
@@ -15832,13 +15774,13 @@ public final EObject entryRuleXBasicForLoopExpression() throws RecognitionExcept
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5511:2: (iv_ruleXBasicForLoopExpression= ruleXBasicForLoopExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5512:2: iv_ruleXBasicForLoopExpression= ruleXBasicForLoopExpression EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5492:2: (iv_ruleXBasicForLoopExpression= ruleXBasicForLoopExpression EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5493:2: iv_ruleXBasicForLoopExpression= ruleXBasicForLoopExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXBasicForLoopExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXBasicForLoopExpression_in_entryRuleXBasicForLoopExpression12778);
+            pushFollow(FOLLOW_ruleXBasicForLoopExpression_in_entryRuleXBasicForLoopExpression12740);
             iv_ruleXBasicForLoopExpression=ruleXBasicForLoopExpression();
 
             state._fsp--;
@@ -15846,7 +15788,7 @@ public final EObject entryRuleXBasicForLoopExpression() throws RecognitionExcept
             if ( state.backtracking==0 ) {
                current =iv_ruleXBasicForLoopExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXBasicForLoopExpression12788); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXBasicForLoopExpression12750); if (state.failed) return current;
 
             }
 
@@ -15864,7 +15806,7 @@ public final EObject entryRuleXBasicForLoopExpression() throws RecognitionExcept
 
 
     // $ANTLR start "ruleXBasicForLoopExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5519:1: ruleXBasicForLoopExpression returns [EObject current=null] : ( () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) ) ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5500:1: ruleXBasicForLoopExpression returns [EObject current=null] : ( () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) ) ) ;
     public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
         EObject current = null;
 
@@ -15891,14 +15833,14 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5522:28: ( ( () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5523:1: ( () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5503:28: ( ( () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5504:1: ( () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5523:1: ( () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5523:2: () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5504:1: ( () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5504:2: () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5523:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5524:5: 
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5504:2: ()
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5505:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -15910,41 +15852,41 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,16,FOLLOW_16_in_ruleXBasicForLoopExpression12834); if (state.failed) return current;
+            otherlv_1=(Token)match(input,16,FOLLOW_16_in_ruleXBasicForLoopExpression12796); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXBasicForLoopExpressionAccess().getForKeyword_1());
                   
             }
-            otherlv_2=(Token)match(input,24,FOLLOW_24_in_ruleXBasicForLoopExpression12846); if (state.failed) return current;
+            otherlv_2=(Token)match(input,23,FOLLOW_23_in_ruleXBasicForLoopExpression12808); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getXBasicForLoopExpressionAccess().getLeftParenthesisKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5537:1: ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )?
-            int alt109=2;
-            int LA109_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5518:1: ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )?
+            int alt108=2;
+            int LA108_0 = input.LA(1);
 
-            if ( ((LA109_0>=RULE_STRING && LA109_0<=RULE_ID)||(LA109_0>=15 && LA109_0<=19)||LA109_0==21||(LA109_0>=23 && LA109_0<=24)||LA109_0==27||LA109_0==29||(LA109_0>=33 && LA109_0<=34)||(LA109_0>=36 && LA109_0<=50)||LA109_0==56||(LA109_0>=71 && LA109_0<=72)||LA109_0==77||LA109_0==85||LA109_0==87||(LA109_0>=91 && LA109_0<=103)||LA109_0==105) ) {
-                alt109=1;
+            if ( ((LA108_0>=RULE_STRING && LA108_0<=RULE_ID)||(LA108_0>=15 && LA108_0<=18)||LA108_0==20||(LA108_0>=22 && LA108_0<=23)||LA108_0==26||LA108_0==28||(LA108_0>=32 && LA108_0<=33)||(LA108_0>=35 && LA108_0<=50)||LA108_0==56||(LA108_0>=71 && LA108_0<=72)||LA108_0==77||LA108_0==85||LA108_0==87||(LA108_0>=91 && LA108_0<=103)||LA108_0==105) ) {
+                alt108=1;
             }
-            switch (alt109) {
+            switch (alt108) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5537:2: ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )*
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5518:2: ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )*
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5537:2: ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5538:1: (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5518:2: ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5519:1: (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5538:1: (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5539:3: lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5519:1: (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5520:3: lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXBasicForLoopExpressionAccess().getInitExpressionsXExpressionOrVarDeclarationParserRuleCall_3_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_ruleXBasicForLoopExpression12868);
+                    pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_ruleXBasicForLoopExpression12830);
                     lv_initExpressions_3_0=ruleXExpressionOrVarDeclaration();
 
                     state._fsp--;
@@ -15968,39 +15910,39 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5555:2: (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )*
-                    loop108:
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5536:2: (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )*
+                    loop107:
                     do {
-                        int alt108=2;
-                        int LA108_0 = input.LA(1);
+                        int alt107=2;
+                        int LA107_0 = input.LA(1);
 
-                        if ( (LA108_0==25) ) {
-                            alt108=1;
+                        if ( (LA107_0==24) ) {
+                            alt107=1;
                         }
 
 
-                        switch (alt108) {
+                        switch (alt107) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5555:4: otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5536:4: otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) )
                     	    {
-                    	    otherlv_4=(Token)match(input,25,FOLLOW_25_in_ruleXBasicForLoopExpression12881); if (state.failed) return current;
+                    	    otherlv_4=(Token)match(input,24,FOLLOW_24_in_ruleXBasicForLoopExpression12843); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_4, grammarAccess.getXBasicForLoopExpressionAccess().getCommaKeyword_3_1_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5559:1: ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5560:1: (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5540:1: ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5541:1: (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5560:1: (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5561:3: lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5541:1: (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5542:3: lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getXBasicForLoopExpressionAccess().getInitExpressionsXExpressionOrVarDeclarationParserRuleCall_3_1_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_ruleXBasicForLoopExpression12902);
+                    	    pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_ruleXBasicForLoopExpression12864);
                     	    lv_initExpressions_5_0=ruleXExpressionOrVarDeclaration();
 
                     	    state._fsp--;
@@ -16029,7 +15971,7 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
                     	    break;
 
                     	default :
-                    	    break loop108;
+                    	    break loop107;
                         }
                     } while (true);
 
@@ -16039,32 +15981,32 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
 
             }
 
-            otherlv_6=(Token)match(input,22,FOLLOW_22_in_ruleXBasicForLoopExpression12918); if (state.failed) return current;
+            otherlv_6=(Token)match(input,21,FOLLOW_21_in_ruleXBasicForLoopExpression12880); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_6, grammarAccess.getXBasicForLoopExpressionAccess().getSemicolonKeyword_4());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5581:1: ( (lv_expression_7_0= ruleXExpression ) )?
-            int alt110=2;
-            int LA110_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5562:1: ( (lv_expression_7_0= ruleXExpression ) )?
+            int alt109=2;
+            int LA109_0 = input.LA(1);
 
-            if ( ((LA110_0>=RULE_STRING && LA110_0<=RULE_ID)||(LA110_0>=15 && LA110_0<=19)||LA110_0==21||(LA110_0>=23 && LA110_0<=24)||LA110_0==27||LA110_0==29||(LA110_0>=33 && LA110_0<=34)||(LA110_0>=36 && LA110_0<=50)||LA110_0==56||(LA110_0>=71 && LA110_0<=72)||LA110_0==77||LA110_0==85||LA110_0==87||(LA110_0>=91 && LA110_0<=92)||(LA110_0>=95 && LA110_0<=103)||LA110_0==105) ) {
-                alt110=1;
+            if ( ((LA109_0>=RULE_STRING && LA109_0<=RULE_ID)||(LA109_0>=15 && LA109_0<=18)||LA109_0==20||(LA109_0>=22 && LA109_0<=23)||LA109_0==26||LA109_0==28||(LA109_0>=32 && LA109_0<=33)||(LA109_0>=35 && LA109_0<=50)||LA109_0==56||(LA109_0>=71 && LA109_0<=72)||LA109_0==77||LA109_0==85||LA109_0==87||(LA109_0>=91 && LA109_0<=92)||(LA109_0>=95 && LA109_0<=103)||LA109_0==105) ) {
+                alt109=1;
             }
-            switch (alt110) {
+            switch (alt109) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5582:1: (lv_expression_7_0= ruleXExpression )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5563:1: (lv_expression_7_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5582:1: (lv_expression_7_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5583:3: lv_expression_7_0= ruleXExpression
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5563:1: (lv_expression_7_0= ruleXExpression )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5564:3: lv_expression_7_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXBasicForLoopExpressionAccess().getExpressionXExpressionParserRuleCall_5_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXBasicForLoopExpression12939);
+                    pushFollow(FOLLOW_ruleXExpression_in_ruleXBasicForLoopExpression12901);
                     lv_expression_7_0=ruleXExpression();
 
                     state._fsp--;
@@ -16091,35 +16033,35 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
 
             }
 
-            otherlv_8=(Token)match(input,22,FOLLOW_22_in_ruleXBasicForLoopExpression12952); if (state.failed) return current;
+            otherlv_8=(Token)match(input,21,FOLLOW_21_in_ruleXBasicForLoopExpression12914); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_8, grammarAccess.getXBasicForLoopExpressionAccess().getSemicolonKeyword_6());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5603:1: ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )?
-            int alt112=2;
-            int LA112_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5584:1: ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )?
+            int alt111=2;
+            int LA111_0 = input.LA(1);
 
-            if ( ((LA112_0>=RULE_STRING && LA112_0<=RULE_ID)||(LA112_0>=15 && LA112_0<=19)||LA112_0==21||(LA112_0>=23 && LA112_0<=24)||LA112_0==27||LA112_0==29||(LA112_0>=33 && LA112_0<=34)||(LA112_0>=36 && LA112_0<=50)||LA112_0==56||(LA112_0>=71 && LA112_0<=72)||LA112_0==77||LA112_0==85||LA112_0==87||(LA112_0>=91 && LA112_0<=92)||(LA112_0>=95 && LA112_0<=103)||LA112_0==105) ) {
-                alt112=1;
+            if ( ((LA111_0>=RULE_STRING && LA111_0<=RULE_ID)||(LA111_0>=15 && LA111_0<=18)||LA111_0==20||(LA111_0>=22 && LA111_0<=23)||LA111_0==26||LA111_0==28||(LA111_0>=32 && LA111_0<=33)||(LA111_0>=35 && LA111_0<=50)||LA111_0==56||(LA111_0>=71 && LA111_0<=72)||LA111_0==77||LA111_0==85||LA111_0==87||(LA111_0>=91 && LA111_0<=92)||(LA111_0>=95 && LA111_0<=103)||LA111_0==105) ) {
+                alt111=1;
             }
-            switch (alt112) {
+            switch (alt111) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5603:2: ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )*
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5584:2: ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )*
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5603:2: ( (lv_updateExpressions_9_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5604:1: (lv_updateExpressions_9_0= ruleXExpression )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5584:2: ( (lv_updateExpressions_9_0= ruleXExpression ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5585:1: (lv_updateExpressions_9_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5604:1: (lv_updateExpressions_9_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5605:3: lv_updateExpressions_9_0= ruleXExpression
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5585:1: (lv_updateExpressions_9_0= ruleXExpression )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5586:3: lv_updateExpressions_9_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXBasicForLoopExpressionAccess().getUpdateExpressionsXExpressionParserRuleCall_7_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXBasicForLoopExpression12974);
+                    pushFollow(FOLLOW_ruleXExpression_in_ruleXBasicForLoopExpression12936);
                     lv_updateExpressions_9_0=ruleXExpression();
 
                     state._fsp--;
@@ -16143,39 +16085,39 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5621:2: (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )*
-                    loop111:
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5602:2: (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )*
+                    loop110:
                     do {
-                        int alt111=2;
-                        int LA111_0 = input.LA(1);
+                        int alt110=2;
+                        int LA110_0 = input.LA(1);
 
-                        if ( (LA111_0==25) ) {
-                            alt111=1;
+                        if ( (LA110_0==24) ) {
+                            alt110=1;
                         }
 
 
-                        switch (alt111) {
+                        switch (alt110) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5621:4: otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5602:4: otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) )
                     	    {
-                    	    otherlv_10=(Token)match(input,25,FOLLOW_25_in_ruleXBasicForLoopExpression12987); if (state.failed) return current;
+                    	    otherlv_10=(Token)match(input,24,FOLLOW_24_in_ruleXBasicForLoopExpression12949); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_10, grammarAccess.getXBasicForLoopExpressionAccess().getCommaKeyword_7_1_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5625:1: ( (lv_updateExpressions_11_0= ruleXExpression ) )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5626:1: (lv_updateExpressions_11_0= ruleXExpression )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5606:1: ( (lv_updateExpressions_11_0= ruleXExpression ) )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5607:1: (lv_updateExpressions_11_0= ruleXExpression )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5626:1: (lv_updateExpressions_11_0= ruleXExpression )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5627:3: lv_updateExpressions_11_0= ruleXExpression
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5607:1: (lv_updateExpressions_11_0= ruleXExpression )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5608:3: lv_updateExpressions_11_0= ruleXExpression
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getXBasicForLoopExpressionAccess().getUpdateExpressionsXExpressionParserRuleCall_7_1_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleXExpression_in_ruleXBasicForLoopExpression13008);
+                    	    pushFollow(FOLLOW_ruleXExpression_in_ruleXBasicForLoopExpression12970);
                     	    lv_updateExpressions_11_0=ruleXExpression();
 
                     	    state._fsp--;
@@ -16204,7 +16146,7 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
                     	    break;
 
                     	default :
-                    	    break loop111;
+                    	    break loop110;
                         }
                     } while (true);
 
@@ -16214,24 +16156,24 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
 
             }
 
-            otherlv_12=(Token)match(input,26,FOLLOW_26_in_ruleXBasicForLoopExpression13024); if (state.failed) return current;
+            otherlv_12=(Token)match(input,25,FOLLOW_25_in_ruleXBasicForLoopExpression12986); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_12, grammarAccess.getXBasicForLoopExpressionAccess().getRightParenthesisKeyword_8());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5647:1: ( (lv_eachExpression_13_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5648:1: (lv_eachExpression_13_0= ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5628:1: ( (lv_eachExpression_13_0= ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5629:1: (lv_eachExpression_13_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5648:1: (lv_eachExpression_13_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5649:3: lv_eachExpression_13_0= ruleXExpression
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5629:1: (lv_eachExpression_13_0= ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5630:3: lv_eachExpression_13_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXBasicForLoopExpressionAccess().getEachExpressionXExpressionParserRuleCall_9_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXBasicForLoopExpression13045);
+            pushFollow(FOLLOW_ruleXExpression_in_ruleXBasicForLoopExpression13007);
             lv_eachExpression_13_0=ruleXExpression();
 
             state._fsp--;
@@ -16278,7 +16220,7 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXWhileExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5673:1: entryRuleXWhileExpression returns [EObject current=null] : iv_ruleXWhileExpression= ruleXWhileExpression EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5654:1: entryRuleXWhileExpression returns [EObject current=null] : iv_ruleXWhileExpression= ruleXWhileExpression EOF ;
     public final EObject entryRuleXWhileExpression() throws RecognitionException {
         EObject current = null;
 
@@ -16286,13 +16228,13 @@ public final EObject entryRuleXWhileExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5674:2: (iv_ruleXWhileExpression= ruleXWhileExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5675:2: iv_ruleXWhileExpression= ruleXWhileExpression EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5655:2: (iv_ruleXWhileExpression= ruleXWhileExpression EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5656:2: iv_ruleXWhileExpression= ruleXWhileExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXWhileExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXWhileExpression_in_entryRuleXWhileExpression13081);
+            pushFollow(FOLLOW_ruleXWhileExpression_in_entryRuleXWhileExpression13043);
             iv_ruleXWhileExpression=ruleXWhileExpression();
 
             state._fsp--;
@@ -16300,7 +16242,7 @@ public final EObject entryRuleXWhileExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXWhileExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXWhileExpression13091); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXWhileExpression13053); if (state.failed) return current;
 
             }
 
@@ -16318,7 +16260,7 @@ public final EObject entryRuleXWhileExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXWhileExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5682:1: ruleXWhileExpression returns [EObject current=null] : ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5663:1: ruleXWhileExpression returns [EObject current=null] : ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) ) ;
     public final EObject ruleXWhileExpression() throws RecognitionException {
         EObject current = null;
 
@@ -16333,14 +16275,14 @@ public final EObject ruleXWhileExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5685:28: ( ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5686:1: ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5666:28: ( ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5667:1: ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5686:1: ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5686:2: () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5667:1: ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5667:2: () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5686:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5687:5: 
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5667:2: ()
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5668:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -16352,30 +16294,30 @@ public final EObject ruleXWhileExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,91,FOLLOW_91_in_ruleXWhileExpression13137); if (state.failed) return current;
+            otherlv_1=(Token)match(input,91,FOLLOW_91_in_ruleXWhileExpression13099); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXWhileExpressionAccess().getWhileKeyword_1());
                   
             }
-            otherlv_2=(Token)match(input,24,FOLLOW_24_in_ruleXWhileExpression13149); if (state.failed) return current;
+            otherlv_2=(Token)match(input,23,FOLLOW_23_in_ruleXWhileExpression13111); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getXWhileExpressionAccess().getLeftParenthesisKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5700:1: ( (lv_predicate_3_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5701:1: (lv_predicate_3_0= ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5681:1: ( (lv_predicate_3_0= ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5682:1: (lv_predicate_3_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5701:1: (lv_predicate_3_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5702:3: lv_predicate_3_0= ruleXExpression
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5682:1: (lv_predicate_3_0= ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5683:3: lv_predicate_3_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXWhileExpressionAccess().getPredicateXExpressionParserRuleCall_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXWhileExpression13170);
+            pushFollow(FOLLOW_ruleXExpression_in_ruleXWhileExpression13132);
             lv_predicate_3_0=ruleXExpression();
 
             state._fsp--;
@@ -16399,24 +16341,24 @@ public final EObject ruleXWhileExpression() throws RecognitionException {
 
             }
 
-            otherlv_4=(Token)match(input,26,FOLLOW_26_in_ruleXWhileExpression13182); if (state.failed) return current;
+            otherlv_4=(Token)match(input,25,FOLLOW_25_in_ruleXWhileExpression13144); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_4, grammarAccess.getXWhileExpressionAccess().getRightParenthesisKeyword_4());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5722:1: ( (lv_body_5_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5723:1: (lv_body_5_0= ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5703:1: ( (lv_body_5_0= ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5704:1: (lv_body_5_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5723:1: (lv_body_5_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5724:3: lv_body_5_0= ruleXExpression
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5704:1: (lv_body_5_0= ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5705:3: lv_body_5_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXWhileExpressionAccess().getBodyXExpressionParserRuleCall_5_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXWhileExpression13203);
+            pushFollow(FOLLOW_ruleXExpression_in_ruleXWhileExpression13165);
             lv_body_5_0=ruleXExpression();
 
             state._fsp--;
@@ -16463,7 +16405,7 @@ public final EObject ruleXWhileExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXDoWhileExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5748:1: entryRuleXDoWhileExpression returns [EObject current=null] : iv_ruleXDoWhileExpression= ruleXDoWhileExpression EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5729:1: entryRuleXDoWhileExpression returns [EObject current=null] : iv_ruleXDoWhileExpression= ruleXDoWhileExpression EOF ;
     public final EObject entryRuleXDoWhileExpression() throws RecognitionException {
         EObject current = null;
 
@@ -16471,13 +16413,13 @@ public final EObject entryRuleXDoWhileExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5749:2: (iv_ruleXDoWhileExpression= ruleXDoWhileExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5750:2: iv_ruleXDoWhileExpression= ruleXDoWhileExpression EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5730:2: (iv_ruleXDoWhileExpression= ruleXDoWhileExpression EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5731:2: iv_ruleXDoWhileExpression= ruleXDoWhileExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXDoWhileExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXDoWhileExpression_in_entryRuleXDoWhileExpression13239);
+            pushFollow(FOLLOW_ruleXDoWhileExpression_in_entryRuleXDoWhileExpression13201);
             iv_ruleXDoWhileExpression=ruleXDoWhileExpression();
 
             state._fsp--;
@@ -16485,7 +16427,7 @@ public final EObject entryRuleXDoWhileExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXDoWhileExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXDoWhileExpression13249); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXDoWhileExpression13211); if (state.failed) return current;
 
             }
 
@@ -16503,7 +16445,7 @@ public final EObject entryRuleXDoWhileExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXDoWhileExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5757:1: ruleXDoWhileExpression returns [EObject current=null] : ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5738:1: ruleXDoWhileExpression returns [EObject current=null] : ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' ) ;
     public final EObject ruleXDoWhileExpression() throws RecognitionException {
         EObject current = null;
 
@@ -16519,14 +16461,14 @@ public final EObject ruleXDoWhileExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5760:28: ( ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5761:1: ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5741:28: ( ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5742:1: ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5761:1: ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5761:2: () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5742:1: ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5742:2: () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')'
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5761:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5762:5: 
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5742:2: ()
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5743:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -16538,24 +16480,24 @@ public final EObject ruleXDoWhileExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,92,FOLLOW_92_in_ruleXDoWhileExpression13295); if (state.failed) return current;
+            otherlv_1=(Token)match(input,92,FOLLOW_92_in_ruleXDoWhileExpression13257); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXDoWhileExpressionAccess().getDoKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5771:1: ( (lv_body_2_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5772:1: (lv_body_2_0= ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5752:1: ( (lv_body_2_0= ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5753:1: (lv_body_2_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5772:1: (lv_body_2_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5773:3: lv_body_2_0= ruleXExpression
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5753:1: (lv_body_2_0= ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5754:3: lv_body_2_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXDoWhileExpressionAccess().getBodyXExpressionParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXDoWhileExpression13316);
+            pushFollow(FOLLOW_ruleXExpression_in_ruleXDoWhileExpression13278);
             lv_body_2_0=ruleXExpression();
 
             state._fsp--;
@@ -16579,30 +16521,30 @@ public final EObject ruleXDoWhileExpression() throws RecognitionException {
 
             }
 
-            otherlv_3=(Token)match(input,91,FOLLOW_91_in_ruleXDoWhileExpression13328); if (state.failed) return current;
+            otherlv_3=(Token)match(input,91,FOLLOW_91_in_ruleXDoWhileExpression13290); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_3, grammarAccess.getXDoWhileExpressionAccess().getWhileKeyword_3());
                   
             }
-            otherlv_4=(Token)match(input,24,FOLLOW_24_in_ruleXDoWhileExpression13340); if (state.failed) return current;
+            otherlv_4=(Token)match(input,23,FOLLOW_23_in_ruleXDoWhileExpression13302); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_4, grammarAccess.getXDoWhileExpressionAccess().getLeftParenthesisKeyword_4());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5797:1: ( (lv_predicate_5_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5798:1: (lv_predicate_5_0= ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5778:1: ( (lv_predicate_5_0= ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5779:1: (lv_predicate_5_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5798:1: (lv_predicate_5_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5799:3: lv_predicate_5_0= ruleXExpression
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5779:1: (lv_predicate_5_0= ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5780:3: lv_predicate_5_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXDoWhileExpressionAccess().getPredicateXExpressionParserRuleCall_5_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXDoWhileExpression13361);
+            pushFollow(FOLLOW_ruleXExpression_in_ruleXDoWhileExpression13323);
             lv_predicate_5_0=ruleXExpression();
 
             state._fsp--;
@@ -16626,7 +16568,7 @@ public final EObject ruleXDoWhileExpression() throws RecognitionException {
 
             }
 
-            otherlv_6=(Token)match(input,26,FOLLOW_26_in_ruleXDoWhileExpression13373); if (state.failed) return current;
+            otherlv_6=(Token)match(input,25,FOLLOW_25_in_ruleXDoWhileExpression13335); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_6, grammarAccess.getXDoWhileExpressionAccess().getRightParenthesisKeyword_6());
@@ -16655,7 +16597,7 @@ public final EObject ruleXDoWhileExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXBlockExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5827:1: entryRuleXBlockExpression returns [EObject current=null] : iv_ruleXBlockExpression= ruleXBlockExpression EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5808:1: entryRuleXBlockExpression returns [EObject current=null] : iv_ruleXBlockExpression= ruleXBlockExpression EOF ;
     public final EObject entryRuleXBlockExpression() throws RecognitionException {
         EObject current = null;
 
@@ -16663,13 +16605,13 @@ public final EObject entryRuleXBlockExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5828:2: (iv_ruleXBlockExpression= ruleXBlockExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5829:2: iv_ruleXBlockExpression= ruleXBlockExpression EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5809:2: (iv_ruleXBlockExpression= ruleXBlockExpression EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5810:2: iv_ruleXBlockExpression= ruleXBlockExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXBlockExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXBlockExpression_in_entryRuleXBlockExpression13409);
+            pushFollow(FOLLOW_ruleXBlockExpression_in_entryRuleXBlockExpression13371);
             iv_ruleXBlockExpression=ruleXBlockExpression();
 
             state._fsp--;
@@ -16677,7 +16619,7 @@ public final EObject entryRuleXBlockExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXBlockExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXBlockExpression13419); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXBlockExpression13381); if (state.failed) return current;
 
             }
 
@@ -16695,7 +16637,7 @@ public final EObject entryRuleXBlockExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXBlockExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5836:1: ruleXBlockExpression returns [EObject current=null] : ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5817:1: ruleXBlockExpression returns [EObject current=null] : ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' ) ;
     public final EObject ruleXBlockExpression() throws RecognitionException {
         EObject current = null;
 
@@ -16708,14 +16650,14 @@ public final EObject ruleXBlockExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5839:28: ( ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5840:1: ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5820:28: ( ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5821:1: ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5840:1: ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5840:2: () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5821:1: ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5821:2: () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}'
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5840:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5841:5: 
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5821:2: ()
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5822:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -16727,39 +16669,39 @@ public final EObject ruleXBlockExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,19,FOLLOW_19_in_ruleXBlockExpression13465); if (state.failed) return current;
+            otherlv_1=(Token)match(input,18,FOLLOW_18_in_ruleXBlockExpression13427); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXBlockExpressionAccess().getLeftCurlyBracketKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5850:1: ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )*
-            loop114:
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5831:1: ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )*
+            loop113:
             do {
-                int alt114=2;
-                int LA114_0 = input.LA(1);
+                int alt113=2;
+                int LA113_0 = input.LA(1);
 
-                if ( ((LA114_0>=RULE_STRING && LA114_0<=RULE_ID)||(LA114_0>=15 && LA114_0<=19)||LA114_0==21||(LA114_0>=23 && LA114_0<=24)||LA114_0==27||LA114_0==29||(LA114_0>=33 && LA114_0<=34)||(LA114_0>=36 && LA114_0<=50)||LA114_0==56||(LA114_0>=71 && LA114_0<=72)||LA114_0==77||LA114_0==85||LA114_0==87||(LA114_0>=91 && LA114_0<=103)||LA114_0==105) ) {
-                    alt114=1;
+                if ( ((LA113_0>=RULE_STRING && LA113_0<=RULE_ID)||(LA113_0>=15 && LA113_0<=18)||LA113_0==20||(LA113_0>=22 && LA113_0<=23)||LA113_0==26||LA113_0==28||(LA113_0>=32 && LA113_0<=33)||(LA113_0>=35 && LA113_0<=50)||LA113_0==56||(LA113_0>=71 && LA113_0<=72)||LA113_0==77||LA113_0==85||LA113_0==87||(LA113_0>=91 && LA113_0<=103)||LA113_0==105) ) {
+                    alt113=1;
                 }
 
 
-                switch (alt114) {
+                switch (alt113) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5850:2: ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )?
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5831:2: ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )?
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5850:2: ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5851:1: (lv_expressions_2_0= ruleXExpressionOrVarDeclaration )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5831:2: ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5832:1: (lv_expressions_2_0= ruleXExpressionOrVarDeclaration )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5851:1: (lv_expressions_2_0= ruleXExpressionOrVarDeclaration )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5852:3: lv_expressions_2_0= ruleXExpressionOrVarDeclaration
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5832:1: (lv_expressions_2_0= ruleXExpressionOrVarDeclaration )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5833:3: lv_expressions_2_0= ruleXExpressionOrVarDeclaration
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXBlockExpressionAccess().getExpressionsXExpressionOrVarDeclarationParserRuleCall_2_0_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_ruleXBlockExpression13487);
+            	    pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_ruleXBlockExpression13449);
             	    lv_expressions_2_0=ruleXExpressionOrVarDeclaration();
 
             	    state._fsp--;
@@ -16783,18 +16725,18 @@ public final EObject ruleXBlockExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5868:2: (otherlv_3= ';' )?
-            	    int alt113=2;
-            	    int LA113_0 = input.LA(1);
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5849:2: (otherlv_3= ';' )?
+            	    int alt112=2;
+            	    int LA112_0 = input.LA(1);
 
-            	    if ( (LA113_0==22) ) {
-            	        alt113=1;
+            	    if ( (LA112_0==21) ) {
+            	        alt112=1;
             	    }
-            	    switch (alt113) {
+            	    switch (alt112) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5868:4: otherlv_3= ';'
+            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5849:4: otherlv_3= ';'
             	            {
-            	            otherlv_3=(Token)match(input,22,FOLLOW_22_in_ruleXBlockExpression13500); if (state.failed) return current;
+            	            otherlv_3=(Token)match(input,21,FOLLOW_21_in_ruleXBlockExpression13462); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                  	newLeafNode(otherlv_3, grammarAccess.getXBlockExpressionAccess().getSemicolonKeyword_2_1());
@@ -16811,11 +16753,11 @@ public final EObject ruleXBlockExpression() throws RecognitionException {
             	    break;
 
             	default :
-            	    break loop114;
+            	    break loop113;
                 }
             } while (true);
 
-            otherlv_4=(Token)match(input,20,FOLLOW_20_in_ruleXBlockExpression13516); if (state.failed) return current;
+            otherlv_4=(Token)match(input,19,FOLLOW_19_in_ruleXBlockExpression13478); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_4, grammarAccess.getXBlockExpressionAccess().getRightCurlyBracketKeyword_3());
@@ -16844,7 +16786,7 @@ public final EObject ruleXBlockExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXExpressionOrVarDeclaration"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5884:1: entryRuleXExpressionOrVarDeclaration returns [EObject current=null] : iv_ruleXExpressionOrVarDeclaration= ruleXExpressionOrVarDeclaration EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5865:1: entryRuleXExpressionOrVarDeclaration returns [EObject current=null] : iv_ruleXExpressionOrVarDeclaration= ruleXExpressionOrVarDeclaration EOF ;
     public final EObject entryRuleXExpressionOrVarDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -16852,13 +16794,13 @@ public final EObject entryRuleXExpressionOrVarDeclaration() throws RecognitionEx
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5885:2: (iv_ruleXExpressionOrVarDeclaration= ruleXExpressionOrVarDeclaration EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5886:2: iv_ruleXExpressionOrVarDeclaration= ruleXExpressionOrVarDeclaration EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5866:2: (iv_ruleXExpressionOrVarDeclaration= ruleXExpressionOrVarDeclaration EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5867:2: iv_ruleXExpressionOrVarDeclaration= ruleXExpressionOrVarDeclaration EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXExpressionOrVarDeclarationRule()); 
             }
-            pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_entryRuleXExpressionOrVarDeclaration13552);
+            pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_entryRuleXExpressionOrVarDeclaration13514);
             iv_ruleXExpressionOrVarDeclaration=ruleXExpressionOrVarDeclaration();
 
             state._fsp--;
@@ -16866,7 +16808,7 @@ public final EObject entryRuleXExpressionOrVarDeclaration() throws RecognitionEx
             if ( state.backtracking==0 ) {
                current =iv_ruleXExpressionOrVarDeclaration; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXExpressionOrVarDeclaration13562); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXExpressionOrVarDeclaration13524); if (state.failed) return current;
 
             }
 
@@ -16884,7 +16826,7 @@ public final EObject entryRuleXExpressionOrVarDeclaration() throws RecognitionEx
 
 
     // $ANTLR start "ruleXExpressionOrVarDeclaration"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5893:1: ruleXExpressionOrVarDeclaration returns [EObject current=null] : (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5874:1: ruleXExpressionOrVarDeclaration returns [EObject current=null] : (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression ) ;
     public final EObject ruleXExpressionOrVarDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -16896,36 +16838,36 @@ public final EObject ruleXExpressionOrVarDeclaration() throws RecognitionExcepti
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5896:28: ( (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5897:1: (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5877:28: ( (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5878:1: (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5897:1: (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression )
-            int alt115=2;
-            int LA115_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5878:1: (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression )
+            int alt114=2;
+            int LA114_0 = input.LA(1);
 
-            if ( ((LA115_0>=93 && LA115_0<=94)) ) {
-                alt115=1;
+            if ( ((LA114_0>=93 && LA114_0<=94)) ) {
+                alt114=1;
             }
-            else if ( ((LA115_0>=RULE_STRING && LA115_0<=RULE_ID)||(LA115_0>=15 && LA115_0<=19)||LA115_0==21||(LA115_0>=23 && LA115_0<=24)||LA115_0==27||LA115_0==29||(LA115_0>=33 && LA115_0<=34)||(LA115_0>=36 && LA115_0<=50)||LA115_0==56||(LA115_0>=71 && LA115_0<=72)||LA115_0==77||LA115_0==85||LA115_0==87||(LA115_0>=91 && LA115_0<=92)||(LA115_0>=95 && LA115_0<=103)||LA115_0==105) ) {
-                alt115=2;
+            else if ( ((LA114_0>=RULE_STRING && LA114_0<=RULE_ID)||(LA114_0>=15 && LA114_0<=18)||LA114_0==20||(LA114_0>=22 && LA114_0<=23)||LA114_0==26||LA114_0==28||(LA114_0>=32 && LA114_0<=33)||(LA114_0>=35 && LA114_0<=50)||LA114_0==56||(LA114_0>=71 && LA114_0<=72)||LA114_0==77||LA114_0==85||LA114_0==87||(LA114_0>=91 && LA114_0<=92)||(LA114_0>=95 && LA114_0<=103)||LA114_0==105) ) {
+                alt114=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 115, 0, input);
+                    new NoViableAltException("", 114, 0, input);
 
                 throw nvae;
             }
-            switch (alt115) {
+            switch (alt114) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5898:5: this_XVariableDeclaration_0= ruleXVariableDeclaration
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5879:5: this_XVariableDeclaration_0= ruleXVariableDeclaration
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXExpressionOrVarDeclarationAccess().getXVariableDeclarationParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXVariableDeclaration_in_ruleXExpressionOrVarDeclaration13609);
+                    pushFollow(FOLLOW_ruleXVariableDeclaration_in_ruleXExpressionOrVarDeclaration13571);
                     this_XVariableDeclaration_0=ruleXVariableDeclaration();
 
                     state._fsp--;
@@ -16940,14 +16882,14 @@ else if ( ((LA115_0>=RULE_STRING && LA115_0<=RULE_ID)||(LA115_0>=15 && LA115_0<=
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5908:5: this_XExpression_1= ruleXExpression
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5889:5: this_XExpression_1= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXExpressionOrVarDeclarationAccess().getXExpressionParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXExpressionOrVarDeclaration13636);
+                    pushFollow(FOLLOW_ruleXExpression_in_ruleXExpressionOrVarDeclaration13598);
                     this_XExpression_1=ruleXExpression();
 
                     state._fsp--;
@@ -16984,7 +16926,7 @@ else if ( ((LA115_0>=RULE_STRING && LA115_0<=RULE_ID)||(LA115_0>=15 && LA115_0<=
 
 
     // $ANTLR start "entryRuleXVariableDeclaration"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5924:1: entryRuleXVariableDeclaration returns [EObject current=null] : iv_ruleXVariableDeclaration= ruleXVariableDeclaration EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5905:1: entryRuleXVariableDeclaration returns [EObject current=null] : iv_ruleXVariableDeclaration= ruleXVariableDeclaration EOF ;
     public final EObject entryRuleXVariableDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -16992,13 +16934,13 @@ public final EObject entryRuleXVariableDeclaration() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5925:2: (iv_ruleXVariableDeclaration= ruleXVariableDeclaration EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5926:2: iv_ruleXVariableDeclaration= ruleXVariableDeclaration EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5906:2: (iv_ruleXVariableDeclaration= ruleXVariableDeclaration EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5907:2: iv_ruleXVariableDeclaration= ruleXVariableDeclaration EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXVariableDeclarationRule()); 
             }
-            pushFollow(FOLLOW_ruleXVariableDeclaration_in_entryRuleXVariableDeclaration13671);
+            pushFollow(FOLLOW_ruleXVariableDeclaration_in_entryRuleXVariableDeclaration13633);
             iv_ruleXVariableDeclaration=ruleXVariableDeclaration();
 
             state._fsp--;
@@ -17006,7 +16948,7 @@ public final EObject entryRuleXVariableDeclaration() throws RecognitionException
             if ( state.backtracking==0 ) {
                current =iv_ruleXVariableDeclaration; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXVariableDeclaration13681); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXVariableDeclaration13643); if (state.failed) return current;
 
             }
 
@@ -17024,7 +16966,7 @@ public final EObject entryRuleXVariableDeclaration() throws RecognitionException
 
 
     // $ANTLR start "ruleXVariableDeclaration"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5933:1: ruleXVariableDeclaration returns [EObject current=null] : ( () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )? ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5914:1: ruleXVariableDeclaration returns [EObject current=null] : ( () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )? ) ;
     public final EObject ruleXVariableDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -17043,14 +16985,14 @@ public final EObject ruleXVariableDeclaration() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5936:28: ( ( () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )? ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5937:1: ( () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )? )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5917:28: ( ( () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )? ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5918:1: ( () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )? )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5937:1: ( () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )? )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5937:2: () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )?
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5918:1: ( () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )? )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5918:2: () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )?
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5937:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5938:5: 
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5918:2: ()
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5919:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -17062,34 +17004,34 @@ public final EObject ruleXVariableDeclaration() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5943:2: ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' )
-            int alt116=2;
-            int LA116_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5924:2: ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' )
+            int alt115=2;
+            int LA115_0 = input.LA(1);
 
-            if ( (LA116_0==93) ) {
-                alt116=1;
+            if ( (LA115_0==93) ) {
+                alt115=1;
             }
-            else if ( (LA116_0==94) ) {
-                alt116=2;
+            else if ( (LA115_0==94) ) {
+                alt115=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 116, 0, input);
+                    new NoViableAltException("", 115, 0, input);
 
                 throw nvae;
             }
-            switch (alt116) {
+            switch (alt115) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5943:3: ( (lv_writeable_1_0= 'var' ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5924:3: ( (lv_writeable_1_0= 'var' ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5943:3: ( (lv_writeable_1_0= 'var' ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5944:1: (lv_writeable_1_0= 'var' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5924:3: ( (lv_writeable_1_0= 'var' ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5925:1: (lv_writeable_1_0= 'var' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5944:1: (lv_writeable_1_0= 'var' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5945:3: lv_writeable_1_0= 'var'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5925:1: (lv_writeable_1_0= 'var' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5926:3: lv_writeable_1_0= 'var'
                     {
-                    lv_writeable_1_0=(Token)match(input,93,FOLLOW_93_in_ruleXVariableDeclaration13734); if (state.failed) return current;
+                    lv_writeable_1_0=(Token)match(input,93,FOLLOW_93_in_ruleXVariableDeclaration13696); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_writeable_1_0, grammarAccess.getXVariableDeclarationAccess().getWriteableVarKeyword_1_0_0());
@@ -17113,9 +17055,9 @@ else if ( (LA116_0==94) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5959:7: otherlv_2= 'val'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5940:7: otherlv_2= 'val'
                     {
-                    otherlv_2=(Token)match(input,94,FOLLOW_94_in_ruleXVariableDeclaration13765); if (state.failed) return current;
+                    otherlv_2=(Token)match(input,94,FOLLOW_94_in_ruleXVariableDeclaration13727); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_2, grammarAccess.getXVariableDeclarationAccess().getValKeyword_1_1());
@@ -17127,62 +17069,62 @@ else if ( (LA116_0==94) ) {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5963:2: ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) )
-            int alt117=2;
-            int LA117_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5944:2: ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) )
+            int alt116=2;
+            int LA116_0 = input.LA(1);
 
-            if ( (LA117_0==RULE_ID) ) {
-                int LA117_1 = input.LA(2);
+            if ( (LA116_0==RULE_ID) ) {
+                int LA116_1 = input.LA(2);
 
                 if ( (synpred47_InternalCheck()) ) {
-                    alt117=1;
+                    alt116=1;
                 }
                 else if ( (true) ) {
-                    alt117=2;
+                    alt116=2;
                 }
                 else {
                     if (state.backtracking>0) {state.failed=true; return current;}
                     NoViableAltException nvae =
-                        new NoViableAltException("", 117, 1, input);
+                        new NoViableAltException("", 116, 1, input);
 
                     throw nvae;
                 }
             }
-            else if ( (LA117_0==24) && (synpred47_InternalCheck())) {
-                alt117=1;
+            else if ( (LA116_0==23) && (synpred47_InternalCheck())) {
+                alt116=1;
             }
-            else if ( (LA117_0==68) && (synpred47_InternalCheck())) {
-                alt117=1;
+            else if ( (LA116_0==68) && (synpred47_InternalCheck())) {
+                alt116=1;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 117, 0, input);
+                    new NoViableAltException("", 116, 0, input);
 
                 throw nvae;
             }
-            switch (alt117) {
+            switch (alt116) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5963:3: ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5944:3: ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5963:3: ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5963:4: ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5944:3: ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5944:4: ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5971:6: ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5971:7: ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5952:6: ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5952:7: ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5971:7: ( (lv_type_3_0= ruleJvmTypeReference ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5972:1: (lv_type_3_0= ruleJvmTypeReference )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5952:7: ( (lv_type_3_0= ruleJvmTypeReference ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5953:1: (lv_type_3_0= ruleJvmTypeReference )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5972:1: (lv_type_3_0= ruleJvmTypeReference )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5973:3: lv_type_3_0= ruleJvmTypeReference
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5953:1: (lv_type_3_0= ruleJvmTypeReference )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5954:3: lv_type_3_0= ruleJvmTypeReference
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXVariableDeclarationAccess().getTypeJvmTypeReferenceParserRuleCall_2_0_0_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleXVariableDeclaration13813);
+                    pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleXVariableDeclaration13775);
                     lv_type_3_0=ruleJvmTypeReference();
 
                     state._fsp--;
@@ -17206,18 +17148,18 @@ else if ( (LA117_0==68) && (synpred47_InternalCheck())) {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5989:2: ( (lv_name_4_0= ruleValidID ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5990:1: (lv_name_4_0= ruleValidID )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5970:2: ( (lv_name_4_0= ruleValidID ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5971:1: (lv_name_4_0= ruleValidID )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5990:1: (lv_name_4_0= ruleValidID )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5991:3: lv_name_4_0= ruleValidID
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5971:1: (lv_name_4_0= ruleValidID )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5972:3: lv_name_4_0= ruleValidID
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXVariableDeclarationAccess().getNameValidIDParserRuleCall_2_0_0_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleValidID_in_ruleXVariableDeclaration13834);
+                    pushFollow(FOLLOW_ruleValidID_in_ruleXVariableDeclaration13796);
                     lv_name_4_0=ruleValidID();
 
                     state._fsp--;
@@ -17251,20 +17193,20 @@ else if ( (LA117_0==68) && (synpred47_InternalCheck())) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6008:6: ( (lv_name_5_0= ruleValidID ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5989:6: ( (lv_name_5_0= ruleValidID ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6008:6: ( (lv_name_5_0= ruleValidID ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6009:1: (lv_name_5_0= ruleValidID )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5989:6: ( (lv_name_5_0= ruleValidID ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5990:1: (lv_name_5_0= ruleValidID )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6009:1: (lv_name_5_0= ruleValidID )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6010:3: lv_name_5_0= ruleValidID
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5990:1: (lv_name_5_0= ruleValidID )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5991:3: lv_name_5_0= ruleValidID
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXVariableDeclarationAccess().getNameValidIDParserRuleCall_2_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleValidID_in_ruleXVariableDeclaration13863);
+                    pushFollow(FOLLOW_ruleValidID_in_ruleXVariableDeclaration13825);
                     lv_name_5_0=ruleValidID();
 
                     state._fsp--;
@@ -17294,35 +17236,35 @@ else if ( (LA117_0==68) && (synpred47_InternalCheck())) {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6026:3: (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )?
-            int alt118=2;
-            int LA118_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6007:3: (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )?
+            int alt117=2;
+            int LA117_0 = input.LA(1);
 
-            if ( (LA118_0==32) ) {
-                alt118=1;
+            if ( (LA117_0==31) ) {
+                alt117=1;
             }
-            switch (alt118) {
+            switch (alt117) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6026:5: otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6007:5: otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) )
                     {
-                    otherlv_6=(Token)match(input,32,FOLLOW_32_in_ruleXVariableDeclaration13877); if (state.failed) return current;
+                    otherlv_6=(Token)match(input,31,FOLLOW_31_in_ruleXVariableDeclaration13839); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_6, grammarAccess.getXVariableDeclarationAccess().getEqualsSignKeyword_3_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6030:1: ( (lv_right_7_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6031:1: (lv_right_7_0= ruleXExpression )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6011:1: ( (lv_right_7_0= ruleXExpression ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6012:1: (lv_right_7_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6031:1: (lv_right_7_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6032:3: lv_right_7_0= ruleXExpression
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6012:1: (lv_right_7_0= ruleXExpression )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6013:3: lv_right_7_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXVariableDeclarationAccess().getRightXExpressionParserRuleCall_3_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXVariableDeclaration13898);
+                    pushFollow(FOLLOW_ruleXExpression_in_ruleXVariableDeclaration13860);
                     lv_right_7_0=ruleXExpression();
 
                     state._fsp--;
@@ -17375,7 +17317,7 @@ else if ( (LA117_0==68) && (synpred47_InternalCheck())) {
 
 
     // $ANTLR start "entryRuleJvmFormalParameter"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6056:1: entryRuleJvmFormalParameter returns [EObject current=null] : iv_ruleJvmFormalParameter= ruleJvmFormalParameter EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6037:1: entryRuleJvmFormalParameter returns [EObject current=null] : iv_ruleJvmFormalParameter= ruleJvmFormalParameter EOF ;
     public final EObject entryRuleJvmFormalParameter() throws RecognitionException {
         EObject current = null;
 
@@ -17383,13 +17325,13 @@ public final EObject entryRuleJvmFormalParameter() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6057:2: (iv_ruleJvmFormalParameter= ruleJvmFormalParameter EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6058:2: iv_ruleJvmFormalParameter= ruleJvmFormalParameter EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6038:2: (iv_ruleJvmFormalParameter= ruleJvmFormalParameter EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6039:2: iv_ruleJvmFormalParameter= ruleJvmFormalParameter EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmFormalParameterRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmFormalParameter_in_entryRuleJvmFormalParameter13936);
+            pushFollow(FOLLOW_ruleJvmFormalParameter_in_entryRuleJvmFormalParameter13898);
             iv_ruleJvmFormalParameter=ruleJvmFormalParameter();
 
             state._fsp--;
@@ -17397,7 +17339,7 @@ public final EObject entryRuleJvmFormalParameter() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleJvmFormalParameter; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmFormalParameter13946); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmFormalParameter13908); if (state.failed) return current;
 
             }
 
@@ -17415,7 +17357,7 @@ public final EObject entryRuleJvmFormalParameter() throws RecognitionException {
 
 
     // $ANTLR start "ruleJvmFormalParameter"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6065:1: ruleJvmFormalParameter returns [EObject current=null] : ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6046:1: ruleJvmFormalParameter returns [EObject current=null] : ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) ) ;
     public final EObject ruleJvmFormalParameter() throws RecognitionException {
         EObject current = null;
 
@@ -17427,39 +17369,39 @@ public final EObject ruleJvmFormalParameter() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6068:28: ( ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6069:1: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6049:28: ( ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6050:1: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6069:1: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6069:2: ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6050:1: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6050:2: ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6069:2: ( (lv_parameterType_0_0= ruleJvmTypeReference ) )?
-            int alt119=2;
-            int LA119_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6050:2: ( (lv_parameterType_0_0= ruleJvmTypeReference ) )?
+            int alt118=2;
+            int LA118_0 = input.LA(1);
 
-            if ( (LA119_0==RULE_ID) ) {
-                int LA119_1 = input.LA(2);
+            if ( (LA118_0==RULE_ID) ) {
+                int LA118_1 = input.LA(2);
 
-                if ( (LA119_1==RULE_ID||LA119_1==34||LA119_1==56||LA119_1==81) ) {
-                    alt119=1;
+                if ( (LA118_1==RULE_ID||LA118_1==33||LA118_1==56||LA118_1==81) ) {
+                    alt118=1;
                 }
             }
-            else if ( (LA119_0==24||LA119_0==68) ) {
-                alt119=1;
+            else if ( (LA118_0==23||LA118_0==68) ) {
+                alt118=1;
             }
-            switch (alt119) {
+            switch (alt118) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6070:1: (lv_parameterType_0_0= ruleJvmTypeReference )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6051:1: (lv_parameterType_0_0= ruleJvmTypeReference )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6070:1: (lv_parameterType_0_0= ruleJvmTypeReference )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6071:3: lv_parameterType_0_0= ruleJvmTypeReference
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6051:1: (lv_parameterType_0_0= ruleJvmTypeReference )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6052:3: lv_parameterType_0_0= ruleJvmTypeReference
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getJvmFormalParameterAccess().getParameterTypeJvmTypeReferenceParserRuleCall_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleJvmFormalParameter13992);
+                    pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleJvmFormalParameter13954);
                     lv_parameterType_0_0=ruleJvmTypeReference();
 
                     state._fsp--;
@@ -17486,18 +17428,18 @@ else if ( (LA119_0==24||LA119_0==68) ) {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6087:3: ( (lv_name_1_0= ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6088:1: (lv_name_1_0= ruleValidID )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6068:3: ( (lv_name_1_0= ruleValidID ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6069:1: (lv_name_1_0= ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6088:1: (lv_name_1_0= ruleValidID )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6089:3: lv_name_1_0= ruleValidID
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6069:1: (lv_name_1_0= ruleValidID )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6070:3: lv_name_1_0= ruleValidID
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getJvmFormalParameterAccess().getNameValidIDParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleValidID_in_ruleJvmFormalParameter14014);
+            pushFollow(FOLLOW_ruleValidID_in_ruleJvmFormalParameter13976);
             lv_name_1_0=ruleValidID();
 
             state._fsp--;
@@ -17544,7 +17486,7 @@ else if ( (LA119_0==24||LA119_0==68) ) {
 
 
     // $ANTLR start "entryRuleFullJvmFormalParameter"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6113:1: entryRuleFullJvmFormalParameter returns [EObject current=null] : iv_ruleFullJvmFormalParameter= ruleFullJvmFormalParameter EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6094:1: entryRuleFullJvmFormalParameter returns [EObject current=null] : iv_ruleFullJvmFormalParameter= ruleFullJvmFormalParameter EOF ;
     public final EObject entryRuleFullJvmFormalParameter() throws RecognitionException {
         EObject current = null;
 
@@ -17552,13 +17494,13 @@ public final EObject entryRuleFullJvmFormalParameter() throws RecognitionExcepti
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6114:2: (iv_ruleFullJvmFormalParameter= ruleFullJvmFormalParameter EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6115:2: iv_ruleFullJvmFormalParameter= ruleFullJvmFormalParameter EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6095:2: (iv_ruleFullJvmFormalParameter= ruleFullJvmFormalParameter EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6096:2: iv_ruleFullJvmFormalParameter= ruleFullJvmFormalParameter EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getFullJvmFormalParameterRule()); 
             }
-            pushFollow(FOLLOW_ruleFullJvmFormalParameter_in_entryRuleFullJvmFormalParameter14050);
+            pushFollow(FOLLOW_ruleFullJvmFormalParameter_in_entryRuleFullJvmFormalParameter14012);
             iv_ruleFullJvmFormalParameter=ruleFullJvmFormalParameter();
 
             state._fsp--;
@@ -17566,7 +17508,7 @@ public final EObject entryRuleFullJvmFormalParameter() throws RecognitionExcepti
             if ( state.backtracking==0 ) {
                current =iv_ruleFullJvmFormalParameter; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFullJvmFormalParameter14060); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleFullJvmFormalParameter14022); if (state.failed) return current;
 
             }
 
@@ -17584,7 +17526,7 @@ public final EObject entryRuleFullJvmFormalParameter() throws RecognitionExcepti
 
 
     // $ANTLR start "ruleFullJvmFormalParameter"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6122:1: ruleFullJvmFormalParameter returns [EObject current=null] : ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6103:1: ruleFullJvmFormalParameter returns [EObject current=null] : ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) ) ;
     public final EObject ruleFullJvmFormalParameter() throws RecognitionException {
         EObject current = null;
 
@@ -17596,24 +17538,24 @@ public final EObject ruleFullJvmFormalParameter() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6125:28: ( ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6126:1: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6106:28: ( ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6107:1: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6126:1: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6126:2: ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6107:1: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6107:2: ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6126:2: ( (lv_parameterType_0_0= ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6127:1: (lv_parameterType_0_0= ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6107:2: ( (lv_parameterType_0_0= ruleJvmTypeReference ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6108:1: (lv_parameterType_0_0= ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6127:1: (lv_parameterType_0_0= ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6128:3: lv_parameterType_0_0= ruleJvmTypeReference
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6108:1: (lv_parameterType_0_0= ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6109:3: lv_parameterType_0_0= ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getFullJvmFormalParameterAccess().getParameterTypeJvmTypeReferenceParserRuleCall_0_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleFullJvmFormalParameter14106);
+            pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleFullJvmFormalParameter14068);
             lv_parameterType_0_0=ruleJvmTypeReference();
 
             state._fsp--;
@@ -17637,18 +17579,18 @@ public final EObject ruleFullJvmFormalParameter() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6144:2: ( (lv_name_1_0= ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6145:1: (lv_name_1_0= ruleValidID )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6125:2: ( (lv_name_1_0= ruleValidID ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6126:1: (lv_name_1_0= ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6145:1: (lv_name_1_0= ruleValidID )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6146:3: lv_name_1_0= ruleValidID
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6126:1: (lv_name_1_0= ruleValidID )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6127:3: lv_name_1_0= ruleValidID
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getFullJvmFormalParameterAccess().getNameValidIDParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleValidID_in_ruleFullJvmFormalParameter14127);
+            pushFollow(FOLLOW_ruleValidID_in_ruleFullJvmFormalParameter14089);
             lv_name_1_0=ruleValidID();
 
             state._fsp--;
@@ -17695,7 +17637,7 @@ public final EObject ruleFullJvmFormalParameter() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXFeatureCall"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6170:1: entryRuleXFeatureCall returns [EObject current=null] : iv_ruleXFeatureCall= ruleXFeatureCall EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6151:1: entryRuleXFeatureCall returns [EObject current=null] : iv_ruleXFeatureCall= ruleXFeatureCall EOF ;
     public final EObject entryRuleXFeatureCall() throws RecognitionException {
         EObject current = null;
 
@@ -17703,13 +17645,13 @@ public final EObject entryRuleXFeatureCall() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6171:2: (iv_ruleXFeatureCall= ruleXFeatureCall EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6172:2: iv_ruleXFeatureCall= ruleXFeatureCall EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6152:2: (iv_ruleXFeatureCall= ruleXFeatureCall EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6153:2: iv_ruleXFeatureCall= ruleXFeatureCall EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXFeatureCallRule()); 
             }
-            pushFollow(FOLLOW_ruleXFeatureCall_in_entryRuleXFeatureCall14163);
+            pushFollow(FOLLOW_ruleXFeatureCall_in_entryRuleXFeatureCall14125);
             iv_ruleXFeatureCall=ruleXFeatureCall();
 
             state._fsp--;
@@ -17717,7 +17659,7 @@ public final EObject entryRuleXFeatureCall() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXFeatureCall; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXFeatureCall14173); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXFeatureCall14135); if (state.failed) return current;
 
             }
 
@@ -17735,7 +17677,7 @@ public final EObject entryRuleXFeatureCall() throws RecognitionException {
 
 
     // $ANTLR start "ruleXFeatureCall"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6179:1: ruleXFeatureCall returns [EObject current=null] : ( () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )? ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6160:1: ruleXFeatureCall returns [EObject current=null] : ( () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )? ) ;
     public final EObject ruleXFeatureCall() throws RecognitionException {
         EObject current = null;
 
@@ -17761,14 +17703,14 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6182:28: ( ( () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )? ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6183:1: ( () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )? )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6163:28: ( ( () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )? ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6164:1: ( () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )? )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6183:1: ( () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )? )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6183:2: () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )?
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6164:1: ( () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )? )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6164:2: () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )?
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6183:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6184:5: 
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6164:2: ()
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6165:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -17780,35 +17722,35 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6189:2: (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )?
-            int alt121=2;
-            int LA121_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6170:2: (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )?
+            int alt120=2;
+            int LA120_0 = input.LA(1);
 
-            if ( (LA121_0==56) ) {
-                alt121=1;
+            if ( (LA120_0==56) ) {
+                alt120=1;
             }
-            switch (alt121) {
+            switch (alt120) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6189:4: otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6170:4: otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>'
                     {
-                    otherlv_1=(Token)match(input,56,FOLLOW_56_in_ruleXFeatureCall14220); if (state.failed) return current;
+                    otherlv_1=(Token)match(input,56,FOLLOW_56_in_ruleXFeatureCall14182); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_1, grammarAccess.getXFeatureCallAccess().getLessThanSignKeyword_1_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6193:1: ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6194:1: (lv_typeArguments_2_0= ruleJvmArgumentTypeReference )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6174:1: ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6175:1: (lv_typeArguments_2_0= ruleJvmArgumentTypeReference )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6194:1: (lv_typeArguments_2_0= ruleJvmArgumentTypeReference )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6195:3: lv_typeArguments_2_0= ruleJvmArgumentTypeReference
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6175:1: (lv_typeArguments_2_0= ruleJvmArgumentTypeReference )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6176:3: lv_typeArguments_2_0= ruleJvmArgumentTypeReference
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleXFeatureCall14241);
+                    pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleXFeatureCall14203);
                     lv_typeArguments_2_0=ruleJvmArgumentTypeReference();
 
                     state._fsp--;
@@ -17832,39 +17774,39 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6211:2: (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )*
-                    loop120:
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6192:2: (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )*
+                    loop119:
                     do {
-                        int alt120=2;
-                        int LA120_0 = input.LA(1);
+                        int alt119=2;
+                        int LA119_0 = input.LA(1);
 
-                        if ( (LA120_0==25) ) {
-                            alt120=1;
+                        if ( (LA119_0==24) ) {
+                            alt119=1;
                         }
 
 
-                        switch (alt120) {
+                        switch (alt119) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6211:4: otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6192:4: otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) )
                     	    {
-                    	    otherlv_3=(Token)match(input,25,FOLLOW_25_in_ruleXFeatureCall14254); if (state.failed) return current;
+                    	    otherlv_3=(Token)match(input,24,FOLLOW_24_in_ruleXFeatureCall14216); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_3, grammarAccess.getXFeatureCallAccess().getCommaKeyword_1_2_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6215:1: ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6216:1: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6196:1: ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6197:1: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6216:1: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6217:3: lv_typeArguments_4_0= ruleJvmArgumentTypeReference
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6197:1: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6198:3: lv_typeArguments_4_0= ruleJvmArgumentTypeReference
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getXFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_2_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleXFeatureCall14275);
+                    	    pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleXFeatureCall14237);
                     	    lv_typeArguments_4_0=ruleJvmArgumentTypeReference();
 
                     	    state._fsp--;
@@ -17893,11 +17835,11 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
                     	    break;
 
                     	default :
-                    	    break loop120;
+                    	    break loop119;
                         }
                     } while (true);
 
-                    otherlv_5=(Token)match(input,57,FOLLOW_57_in_ruleXFeatureCall14289); if (state.failed) return current;
+                    otherlv_5=(Token)match(input,57,FOLLOW_57_in_ruleXFeatureCall14251); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_5, grammarAccess.getXFeatureCallAccess().getGreaterThanSignKeyword_1_3());
@@ -17909,11 +17851,11 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6237:3: ( ( ruleIdOrSuper ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6238:1: ( ruleIdOrSuper )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6218:3: ( ( ruleIdOrSuper ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6219:1: ( ruleIdOrSuper )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6238:1: ( ruleIdOrSuper )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6239:3: ruleIdOrSuper
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6219:1: ( ruleIdOrSuper )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6220:3: ruleIdOrSuper
             {
             if ( state.backtracking==0 ) {
 
@@ -17927,7 +17869,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
               	        newCompositeNode(grammarAccess.getXFeatureCallAccess().getFeatureJvmIdentifiableElementCrossReference_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleIdOrSuper_in_ruleXFeatureCall14314);
+            pushFollow(FOLLOW_ruleIdOrSuper_in_ruleXFeatureCall14276);
             ruleIdOrSuper();
 
             state._fsp--;
@@ -17943,20 +17885,20 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6252:2: ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )?
-            int alt124=2;
-            alt124 = dfa124.predict(input);
-            switch (alt124) {
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6233:2: ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )?
+            int alt123=2;
+            alt123 = dfa123.predict(input);
+            switch (alt123) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6252:3: ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6233:3: ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')'
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6252:3: ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6252:4: ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6233:3: ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6233:4: ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6259:1: (lv_explicitOperationCall_7_0= '(' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6260:3: lv_explicitOperationCall_7_0= '('
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6240:1: (lv_explicitOperationCall_7_0= '(' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6241:3: lv_explicitOperationCall_7_0= '('
                     {
-                    lv_explicitOperationCall_7_0=(Token)match(input,24,FOLLOW_24_in_ruleXFeatureCall14348); if (state.failed) return current;
+                    lv_explicitOperationCall_7_0=(Token)match(input,23,FOLLOW_23_in_ruleXFeatureCall14310); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_explicitOperationCall_7_0, grammarAccess.getXFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_3_0_0());
@@ -17976,25 +17918,25 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6273:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )?
-                    int alt123=3;
-                    alt123 = dfa123.predict(input);
-                    switch (alt123) {
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6254:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )?
+                    int alt122=3;
+                    alt122 = dfa122.predict(input);
+                    switch (alt122) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6273:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6254:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6273:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6273:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6254:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6254:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6290:1: (lv_featureCallArguments_8_0= ruleXShortClosure )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6291:3: lv_featureCallArguments_8_0= ruleXShortClosure
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6271:1: (lv_featureCallArguments_8_0= ruleXShortClosure )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6272:3: lv_featureCallArguments_8_0= ruleXShortClosure
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXShortClosureParserRuleCall_3_1_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleXShortClosure_in_ruleXFeatureCall14433);
+                            pushFollow(FOLLOW_ruleXShortClosure_in_ruleXFeatureCall14395);
                             lv_featureCallArguments_8_0=ruleXShortClosure();
 
                             state._fsp--;
@@ -18022,23 +17964,23 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
                             }
                             break;
                         case 2 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6308:6: ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6289:6: ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6308:6: ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6308:7: ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )*
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6289:6: ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6289:7: ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )*
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6308:7: ( (lv_featureCallArguments_9_0= ruleXExpression ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6309:1: (lv_featureCallArguments_9_0= ruleXExpression )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6289:7: ( (lv_featureCallArguments_9_0= ruleXExpression ) )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6290:1: (lv_featureCallArguments_9_0= ruleXExpression )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6309:1: (lv_featureCallArguments_9_0= ruleXExpression )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6310:3: lv_featureCallArguments_9_0= ruleXExpression
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6290:1: (lv_featureCallArguments_9_0= ruleXExpression )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6291:3: lv_featureCallArguments_9_0= ruleXExpression
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXExpressionParserRuleCall_3_1_1_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleXExpression_in_ruleXFeatureCall14461);
+                            pushFollow(FOLLOW_ruleXExpression_in_ruleXFeatureCall14423);
                             lv_featureCallArguments_9_0=ruleXExpression();
 
                             state._fsp--;
@@ -18062,39 +18004,39 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
 
                             }
 
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6326:2: (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )*
-                            loop122:
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6307:2: (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )*
+                            loop121:
                             do {
-                                int alt122=2;
-                                int LA122_0 = input.LA(1);
+                                int alt121=2;
+                                int LA121_0 = input.LA(1);
 
-                                if ( (LA122_0==25) ) {
-                                    alt122=1;
+                                if ( (LA121_0==24) ) {
+                                    alt121=1;
                                 }
 
 
-                                switch (alt122) {
+                                switch (alt121) {
                             	case 1 :
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6326:4: otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) )
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6307:4: otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) )
                             	    {
-                            	    otherlv_10=(Token)match(input,25,FOLLOW_25_in_ruleXFeatureCall14474); if (state.failed) return current;
+                            	    otherlv_10=(Token)match(input,24,FOLLOW_24_in_ruleXFeatureCall14436); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	          	newLeafNode(otherlv_10, grammarAccess.getXFeatureCallAccess().getCommaKeyword_3_1_1_1_0());
                             	          
                             	    }
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6330:1: ( (lv_featureCallArguments_11_0= ruleXExpression ) )
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6331:1: (lv_featureCallArguments_11_0= ruleXExpression )
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6311:1: ( (lv_featureCallArguments_11_0= ruleXExpression ) )
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6312:1: (lv_featureCallArguments_11_0= ruleXExpression )
                             	    {
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6331:1: (lv_featureCallArguments_11_0= ruleXExpression )
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6332:3: lv_featureCallArguments_11_0= ruleXExpression
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6312:1: (lv_featureCallArguments_11_0= ruleXExpression )
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6313:3: lv_featureCallArguments_11_0= ruleXExpression
                             	    {
                             	    if ( state.backtracking==0 ) {
                             	       
                             	      	        newCompositeNode(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXExpressionParserRuleCall_3_1_1_1_1_0()); 
                             	      	    
                             	    }
-                            	    pushFollow(FOLLOW_ruleXExpression_in_ruleXFeatureCall14495);
+                            	    pushFollow(FOLLOW_ruleXExpression_in_ruleXFeatureCall14457);
                             	    lv_featureCallArguments_11_0=ruleXExpression();
 
                             	    state._fsp--;
@@ -18123,7 +18065,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
                             	    break;
 
                             	default :
-                            	    break loop122;
+                            	    break loop121;
                                 }
                             } while (true);
 
@@ -18136,7 +18078,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
 
                     }
 
-                    otherlv_12=(Token)match(input,26,FOLLOW_26_in_ruleXFeatureCall14512); if (state.failed) return current;
+                    otherlv_12=(Token)match(input,25,FOLLOW_25_in_ruleXFeatureCall14474); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_12, grammarAccess.getXFeatureCallAccess().getRightParenthesisKeyword_3_2());
@@ -18148,22 +18090,22 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6352:3: ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )?
-            int alt125=2;
-            alt125 = dfa125.predict(input);
-            switch (alt125) {
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6333:3: ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )?
+            int alt124=2;
+            alt124 = dfa124.predict(input);
+            switch (alt124) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6352:4: ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6333:4: ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6355:1: (lv_featureCallArguments_13_0= ruleXClosure )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6356:3: lv_featureCallArguments_13_0= ruleXClosure
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6336:1: (lv_featureCallArguments_13_0= ruleXClosure )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6337:3: lv_featureCallArguments_13_0= ruleXClosure
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXClosureParserRuleCall_4_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXClosure_in_ruleXFeatureCall14547);
+                    pushFollow(FOLLOW_ruleXClosure_in_ruleXFeatureCall14509);
                     lv_featureCallArguments_13_0=ruleXClosure();
 
                     state._fsp--;
@@ -18213,7 +18155,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleIdOrSuper"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6380:1: entryRuleIdOrSuper returns [String current=null] : iv_ruleIdOrSuper= ruleIdOrSuper EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6361:1: entryRuleIdOrSuper returns [String current=null] : iv_ruleIdOrSuper= ruleIdOrSuper EOF ;
     public final String entryRuleIdOrSuper() throws RecognitionException {
         String current = null;
 
@@ -18221,13 +18163,13 @@ public final String entryRuleIdOrSuper() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6381:2: (iv_ruleIdOrSuper= ruleIdOrSuper EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6382:2: iv_ruleIdOrSuper= ruleIdOrSuper EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6362:2: (iv_ruleIdOrSuper= ruleIdOrSuper EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6363:2: iv_ruleIdOrSuper= ruleIdOrSuper EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getIdOrSuperRule()); 
             }
-            pushFollow(FOLLOW_ruleIdOrSuper_in_entryRuleIdOrSuper14585);
+            pushFollow(FOLLOW_ruleIdOrSuper_in_entryRuleIdOrSuper14547);
             iv_ruleIdOrSuper=ruleIdOrSuper();
 
             state._fsp--;
@@ -18235,7 +18177,7 @@ public final String entryRuleIdOrSuper() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleIdOrSuper.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIdOrSuper14596); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleIdOrSuper14558); if (state.failed) return current;
 
             }
 
@@ -18253,7 +18195,7 @@ public final String entryRuleIdOrSuper() throws RecognitionException {
 
 
     // $ANTLR start "ruleIdOrSuper"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6389:1: ruleIdOrSuper returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6370:1: ruleIdOrSuper returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' ) ;
     public final AntlrDatatypeRuleToken ruleIdOrSuper() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -18264,36 +18206,36 @@ public final AntlrDatatypeRuleToken ruleIdOrSuper() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6392:28: ( (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6393:1: (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6373:28: ( (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6374:1: (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6393:1: (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' )
-            int alt126=2;
-            int LA126_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6374:1: (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' )
+            int alt125=2;
+            int LA125_0 = input.LA(1);
 
-            if ( (LA126_0==RULE_ID||LA126_0==15||(LA126_0>=17 && LA126_0<=18)||LA126_0==21||LA126_0==23||LA126_0==27||LA126_0==29||(LA126_0>=38 && LA126_0<=50)) ) {
-                alt126=1;
+            if ( (LA125_0==RULE_ID||LA125_0==15||LA125_0==17||LA125_0==20||LA125_0==22||LA125_0==26||LA125_0==28||(LA125_0>=37 && LA125_0<=50)) ) {
+                alt125=1;
             }
-            else if ( (LA126_0==95) ) {
-                alt126=2;
+            else if ( (LA125_0==95) ) {
+                alt125=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 126, 0, input);
+                    new NoViableAltException("", 125, 0, input);
 
                 throw nvae;
             }
-            switch (alt126) {
+            switch (alt125) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6394:5: this_FeatureCallID_0= ruleFeatureCallID
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6375:5: this_FeatureCallID_0= ruleFeatureCallID
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getIdOrSuperAccess().getFeatureCallIDParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleFeatureCallID_in_ruleIdOrSuper14643);
+                    pushFollow(FOLLOW_ruleFeatureCallID_in_ruleIdOrSuper14605);
                     this_FeatureCallID_0=ruleFeatureCallID();
 
                     state._fsp--;
@@ -18312,9 +18254,9 @@ else if ( (LA126_0==95) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6406:2: kw= 'super'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6387:2: kw= 'super'
                     {
-                    kw=(Token)match(input,95,FOLLOW_95_in_ruleIdOrSuper14667); if (state.failed) return current;
+                    kw=(Token)match(input,95,FOLLOW_95_in_ruleIdOrSuper14629); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -18347,7 +18289,7 @@ else if ( (LA126_0==95) ) {
 
 
     // $ANTLR start "entryRuleXConstructorCall"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6419:1: entryRuleXConstructorCall returns [EObject current=null] : iv_ruleXConstructorCall= ruleXConstructorCall EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6400:1: entryRuleXConstructorCall returns [EObject current=null] : iv_ruleXConstructorCall= ruleXConstructorCall EOF ;
     public final EObject entryRuleXConstructorCall() throws RecognitionException {
         EObject current = null;
 
@@ -18355,13 +18297,13 @@ public final EObject entryRuleXConstructorCall() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6420:2: (iv_ruleXConstructorCall= ruleXConstructorCall EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6421:2: iv_ruleXConstructorCall= ruleXConstructorCall EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6401:2: (iv_ruleXConstructorCall= ruleXConstructorCall EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6402:2: iv_ruleXConstructorCall= ruleXConstructorCall EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXConstructorCallRule()); 
             }
-            pushFollow(FOLLOW_ruleXConstructorCall_in_entryRuleXConstructorCall14707);
+            pushFollow(FOLLOW_ruleXConstructorCall_in_entryRuleXConstructorCall14669);
             iv_ruleXConstructorCall=ruleXConstructorCall();
 
             state._fsp--;
@@ -18369,7 +18311,7 @@ public final EObject entryRuleXConstructorCall() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXConstructorCall; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXConstructorCall14717); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXConstructorCall14679); if (state.failed) return current;
 
             }
 
@@ -18387,7 +18329,7 @@ public final EObject entryRuleXConstructorCall() throws RecognitionException {
 
 
     // $ANTLR start "ruleXConstructorCall"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6428:1: ruleXConstructorCall returns [EObject current=null] : ( () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )? ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6409:1: ruleXConstructorCall returns [EObject current=null] : ( () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )? ) ;
     public final EObject ruleXConstructorCall() throws RecognitionException {
         EObject current = null;
 
@@ -18414,14 +18356,14 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6431:28: ( ( () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )? ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6432:1: ( () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )? )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6412:28: ( ( () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )? ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6413:1: ( () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )? )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6432:1: ( () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )? )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6432:2: () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )?
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6413:1: ( () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )? )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6413:2: () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )?
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6432:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6433:5: 
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6413:2: ()
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6414:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -18433,17 +18375,17 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,96,FOLLOW_96_in_ruleXConstructorCall14763); if (state.failed) return current;
+            otherlv_1=(Token)match(input,96,FOLLOW_96_in_ruleXConstructorCall14725); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXConstructorCallAccess().getNewKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6442:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6443:1: ( ruleQualifiedName )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6423:1: ( ( ruleQualifiedName ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6424:1: ( ruleQualifiedName )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6443:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6444:3: ruleQualifiedName
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6424:1: ( ruleQualifiedName )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6425:3: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
 
@@ -18457,7 +18399,7 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
               	        newCompositeNode(grammarAccess.getXConstructorCallAccess().getConstructorJvmConstructorCrossReference_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_ruleXConstructorCall14786);
+            pushFollow(FOLLOW_ruleQualifiedName_in_ruleXConstructorCall14748);
             ruleQualifiedName();
 
             state._fsp--;
@@ -18473,17 +18415,17 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6457:2: ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )?
-            int alt128=2;
-            alt128 = dfa128.predict(input);
-            switch (alt128) {
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6438:2: ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )?
+            int alt127=2;
+            alt127 = dfa127.predict(input);
+            switch (alt127) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6457:3: ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6438:3: ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>'
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6457:3: ( ( '<' )=>otherlv_3= '<' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6457:4: ( '<' )=>otherlv_3= '<'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6438:3: ( ( '<' )=>otherlv_3= '<' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6438:4: ( '<' )=>otherlv_3= '<'
                     {
-                    otherlv_3=(Token)match(input,56,FOLLOW_56_in_ruleXConstructorCall14807); if (state.failed) return current;
+                    otherlv_3=(Token)match(input,56,FOLLOW_56_in_ruleXConstructorCall14769); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_3, grammarAccess.getXConstructorCallAccess().getLessThanSignKeyword_3_0());
@@ -18492,18 +18434,18 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6462:2: ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6463:1: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6443:2: ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6444:1: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6463:1: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6464:3: lv_typeArguments_4_0= ruleJvmArgumentTypeReference
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6444:1: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6445:3: lv_typeArguments_4_0= ruleJvmArgumentTypeReference
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXConstructorCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_3_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleXConstructorCall14829);
+                    pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleXConstructorCall14791);
                     lv_typeArguments_4_0=ruleJvmArgumentTypeReference();
 
                     state._fsp--;
@@ -18527,39 +18469,39 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6480:2: (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )*
-                    loop127:
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6461:2: (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )*
+                    loop126:
                     do {
-                        int alt127=2;
-                        int LA127_0 = input.LA(1);
+                        int alt126=2;
+                        int LA126_0 = input.LA(1);
 
-                        if ( (LA127_0==25) ) {
-                            alt127=1;
+                        if ( (LA126_0==24) ) {
+                            alt126=1;
                         }
 
 
-                        switch (alt127) {
+                        switch (alt126) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6480:4: otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6461:4: otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) )
                     	    {
-                    	    otherlv_5=(Token)match(input,25,FOLLOW_25_in_ruleXConstructorCall14842); if (state.failed) return current;
+                    	    otherlv_5=(Token)match(input,24,FOLLOW_24_in_ruleXConstructorCall14804); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_5, grammarAccess.getXConstructorCallAccess().getCommaKeyword_3_2_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6484:1: ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6485:1: (lv_typeArguments_6_0= ruleJvmArgumentTypeReference )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6465:1: ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6466:1: (lv_typeArguments_6_0= ruleJvmArgumentTypeReference )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6485:1: (lv_typeArguments_6_0= ruleJvmArgumentTypeReference )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6486:3: lv_typeArguments_6_0= ruleJvmArgumentTypeReference
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6466:1: (lv_typeArguments_6_0= ruleJvmArgumentTypeReference )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6467:3: lv_typeArguments_6_0= ruleJvmArgumentTypeReference
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getXConstructorCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_3_2_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleXConstructorCall14863);
+                    	    pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleXConstructorCall14825);
                     	    lv_typeArguments_6_0=ruleJvmArgumentTypeReference();
 
                     	    state._fsp--;
@@ -18588,11 +18530,11 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
                     	    break;
 
                     	default :
-                    	    break loop127;
+                    	    break loop126;
                         }
                     } while (true);
 
-                    otherlv_7=(Token)match(input,57,FOLLOW_57_in_ruleXConstructorCall14877); if (state.failed) return current;
+                    otherlv_7=(Token)match(input,57,FOLLOW_57_in_ruleXConstructorCall14839); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_7, grammarAccess.getXConstructorCallAccess().getGreaterThanSignKeyword_3_3());
@@ -18604,20 +18546,20 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6506:3: ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )?
-            int alt131=2;
-            alt131 = dfa131.predict(input);
-            switch (alt131) {
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6487:3: ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )?
+            int alt130=2;
+            alt130 = dfa130.predict(input);
+            switch (alt130) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6506:4: ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6487:4: ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')'
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6506:4: ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6506:5: ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6487:4: ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6487:5: ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6513:1: (lv_explicitConstructorCall_8_0= '(' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6514:3: lv_explicitConstructorCall_8_0= '('
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6494:1: (lv_explicitConstructorCall_8_0= '(' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6495:3: lv_explicitConstructorCall_8_0= '('
                     {
-                    lv_explicitConstructorCall_8_0=(Token)match(input,24,FOLLOW_24_in_ruleXConstructorCall14913); if (state.failed) return current;
+                    lv_explicitConstructorCall_8_0=(Token)match(input,23,FOLLOW_23_in_ruleXConstructorCall14875); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_explicitConstructorCall_8_0, grammarAccess.getXConstructorCallAccess().getExplicitConstructorCallLeftParenthesisKeyword_4_0_0());
@@ -18637,25 +18579,25 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6527:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )?
-                    int alt130=3;
-                    alt130 = dfa130.predict(input);
-                    switch (alt130) {
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6508:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )?
+                    int alt129=3;
+                    alt129 = dfa129.predict(input);
+                    switch (alt129) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6527:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6508:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6527:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6527:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6508:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6508:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6544:1: (lv_arguments_9_0= ruleXShortClosure )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6545:3: lv_arguments_9_0= ruleXShortClosure
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6525:1: (lv_arguments_9_0= ruleXShortClosure )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6526:3: lv_arguments_9_0= ruleXShortClosure
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXConstructorCallAccess().getArgumentsXShortClosureParserRuleCall_4_1_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleXShortClosure_in_ruleXConstructorCall14998);
+                            pushFollow(FOLLOW_ruleXShortClosure_in_ruleXConstructorCall14960);
                             lv_arguments_9_0=ruleXShortClosure();
 
                             state._fsp--;
@@ -18683,23 +18625,23 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
                             }
                             break;
                         case 2 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6562:6: ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6543:6: ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6562:6: ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6562:7: ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )*
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6543:6: ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6543:7: ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )*
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6562:7: ( (lv_arguments_10_0= ruleXExpression ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6563:1: (lv_arguments_10_0= ruleXExpression )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6543:7: ( (lv_arguments_10_0= ruleXExpression ) )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6544:1: (lv_arguments_10_0= ruleXExpression )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6563:1: (lv_arguments_10_0= ruleXExpression )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6564:3: lv_arguments_10_0= ruleXExpression
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6544:1: (lv_arguments_10_0= ruleXExpression )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6545:3: lv_arguments_10_0= ruleXExpression
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXConstructorCallAccess().getArgumentsXExpressionParserRuleCall_4_1_1_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleXExpression_in_ruleXConstructorCall15026);
+                            pushFollow(FOLLOW_ruleXExpression_in_ruleXConstructorCall14988);
                             lv_arguments_10_0=ruleXExpression();
 
                             state._fsp--;
@@ -18723,39 +18665,39 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
                             }
 
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6580:2: (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )*
-                            loop129:
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6561:2: (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )*
+                            loop128:
                             do {
-                                int alt129=2;
-                                int LA129_0 = input.LA(1);
+                                int alt128=2;
+                                int LA128_0 = input.LA(1);
 
-                                if ( (LA129_0==25) ) {
-                                    alt129=1;
+                                if ( (LA128_0==24) ) {
+                                    alt128=1;
                                 }
 
 
-                                switch (alt129) {
+                                switch (alt128) {
                             	case 1 :
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6580:4: otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) )
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6561:4: otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) )
                             	    {
-                            	    otherlv_11=(Token)match(input,25,FOLLOW_25_in_ruleXConstructorCall15039); if (state.failed) return current;
+                            	    otherlv_11=(Token)match(input,24,FOLLOW_24_in_ruleXConstructorCall15001); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	          	newLeafNode(otherlv_11, grammarAccess.getXConstructorCallAccess().getCommaKeyword_4_1_1_1_0());
                             	          
                             	    }
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6584:1: ( (lv_arguments_12_0= ruleXExpression ) )
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6585:1: (lv_arguments_12_0= ruleXExpression )
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6565:1: ( (lv_arguments_12_0= ruleXExpression ) )
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6566:1: (lv_arguments_12_0= ruleXExpression )
                             	    {
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6585:1: (lv_arguments_12_0= ruleXExpression )
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6586:3: lv_arguments_12_0= ruleXExpression
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6566:1: (lv_arguments_12_0= ruleXExpression )
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6567:3: lv_arguments_12_0= ruleXExpression
                             	    {
                             	    if ( state.backtracking==0 ) {
                             	       
                             	      	        newCompositeNode(grammarAccess.getXConstructorCallAccess().getArgumentsXExpressionParserRuleCall_4_1_1_1_1_0()); 
                             	      	    
                             	    }
-                            	    pushFollow(FOLLOW_ruleXExpression_in_ruleXConstructorCall15060);
+                            	    pushFollow(FOLLOW_ruleXExpression_in_ruleXConstructorCall15022);
                             	    lv_arguments_12_0=ruleXExpression();
 
                             	    state._fsp--;
@@ -18784,7 +18726,7 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
                             	    break;
 
                             	default :
-                            	    break loop129;
+                            	    break loop128;
                                 }
                             } while (true);
 
@@ -18797,7 +18739,7 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
                     }
 
-                    otherlv_13=(Token)match(input,26,FOLLOW_26_in_ruleXConstructorCall15077); if (state.failed) return current;
+                    otherlv_13=(Token)match(input,25,FOLLOW_25_in_ruleXConstructorCall15039); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_13, grammarAccess.getXConstructorCallAccess().getRightParenthesisKeyword_4_2());
@@ -18809,22 +18751,22 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6606:3: ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )?
-            int alt132=2;
-            alt132 = dfa132.predict(input);
-            switch (alt132) {
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6587:3: ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )?
+            int alt131=2;
+            alt131 = dfa131.predict(input);
+            switch (alt131) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6606:4: ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6587:4: ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6609:1: (lv_arguments_14_0= ruleXClosure )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6610:3: lv_arguments_14_0= ruleXClosure
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6590:1: (lv_arguments_14_0= ruleXClosure )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6591:3: lv_arguments_14_0= ruleXClosure
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXConstructorCallAccess().getArgumentsXClosureParserRuleCall_5_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXClosure_in_ruleXConstructorCall15112);
+                    pushFollow(FOLLOW_ruleXClosure_in_ruleXConstructorCall15074);
                     lv_arguments_14_0=ruleXClosure();
 
                     state._fsp--;
@@ -18874,7 +18816,7 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXBooleanLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6634:1: entryRuleXBooleanLiteral returns [EObject current=null] : iv_ruleXBooleanLiteral= ruleXBooleanLiteral EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6615:1: entryRuleXBooleanLiteral returns [EObject current=null] : iv_ruleXBooleanLiteral= ruleXBooleanLiteral EOF ;
     public final EObject entryRuleXBooleanLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -18882,13 +18824,13 @@ public final EObject entryRuleXBooleanLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6635:2: (iv_ruleXBooleanLiteral= ruleXBooleanLiteral EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6636:2: iv_ruleXBooleanLiteral= ruleXBooleanLiteral EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6616:2: (iv_ruleXBooleanLiteral= ruleXBooleanLiteral EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6617:2: iv_ruleXBooleanLiteral= ruleXBooleanLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXBooleanLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXBooleanLiteral_in_entryRuleXBooleanLiteral15149);
+            pushFollow(FOLLOW_ruleXBooleanLiteral_in_entryRuleXBooleanLiteral15111);
             iv_ruleXBooleanLiteral=ruleXBooleanLiteral();
 
             state._fsp--;
@@ -18896,7 +18838,7 @@ public final EObject entryRuleXBooleanLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXBooleanLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXBooleanLiteral15159); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXBooleanLiteral15121); if (state.failed) return current;
 
             }
 
@@ -18914,7 +18856,7 @@ public final EObject entryRuleXBooleanLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXBooleanLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6643:1: ruleXBooleanLiteral returns [EObject current=null] : ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6624:1: ruleXBooleanLiteral returns [EObject current=null] : ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) ;
     public final EObject ruleXBooleanLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -18924,14 +18866,14 @@ public final EObject ruleXBooleanLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6646:28: ( ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6647:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6627:28: ( ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6628:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6647:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6647:2: () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6628:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6628:2: () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6647:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6648:5: 
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6628:2: ()
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6629:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -18943,28 +18885,28 @@ public final EObject ruleXBooleanLiteral() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6653:2: (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
-            int alt133=2;
-            int LA133_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6634:2: (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
+            int alt132=2;
+            int LA132_0 = input.LA(1);
 
-            if ( (LA133_0==97) ) {
-                alt133=1;
+            if ( (LA132_0==97) ) {
+                alt132=1;
             }
-            else if ( (LA133_0==98) ) {
-                alt133=2;
+            else if ( (LA132_0==98) ) {
+                alt132=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 133, 0, input);
+                    new NoViableAltException("", 132, 0, input);
 
                 throw nvae;
             }
-            switch (alt133) {
+            switch (alt132) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6653:4: otherlv_1= 'false'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6634:4: otherlv_1= 'false'
                     {
-                    otherlv_1=(Token)match(input,97,FOLLOW_97_in_ruleXBooleanLiteral15206); if (state.failed) return current;
+                    otherlv_1=(Token)match(input,97,FOLLOW_97_in_ruleXBooleanLiteral15168); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_1, grammarAccess.getXBooleanLiteralAccess().getFalseKeyword_1_0());
@@ -18974,15 +18916,15 @@ else if ( (LA133_0==98) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6658:6: ( (lv_isTrue_2_0= 'true' ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6639:6: ( (lv_isTrue_2_0= 'true' ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6658:6: ( (lv_isTrue_2_0= 'true' ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6659:1: (lv_isTrue_2_0= 'true' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6639:6: ( (lv_isTrue_2_0= 'true' ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6640:1: (lv_isTrue_2_0= 'true' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6659:1: (lv_isTrue_2_0= 'true' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6660:3: lv_isTrue_2_0= 'true'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6640:1: (lv_isTrue_2_0= 'true' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6641:3: lv_isTrue_2_0= 'true'
                     {
-                    lv_isTrue_2_0=(Token)match(input,98,FOLLOW_98_in_ruleXBooleanLiteral15230); if (state.failed) return current;
+                    lv_isTrue_2_0=(Token)match(input,98,FOLLOW_98_in_ruleXBooleanLiteral15192); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_isTrue_2_0, grammarAccess.getXBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0());
@@ -19031,7 +18973,7 @@ else if ( (LA133_0==98) ) {
 
 
     // $ANTLR start "entryRuleXNullLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6681:1: entryRuleXNullLiteral returns [EObject current=null] : iv_ruleXNullLiteral= ruleXNullLiteral EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6662:1: entryRuleXNullLiteral returns [EObject current=null] : iv_ruleXNullLiteral= ruleXNullLiteral EOF ;
     public final EObject entryRuleXNullLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -19039,13 +18981,13 @@ public final EObject entryRuleXNullLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6682:2: (iv_ruleXNullLiteral= ruleXNullLiteral EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6683:2: iv_ruleXNullLiteral= ruleXNullLiteral EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6663:2: (iv_ruleXNullLiteral= ruleXNullLiteral EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6664:2: iv_ruleXNullLiteral= ruleXNullLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXNullLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXNullLiteral_in_entryRuleXNullLiteral15280);
+            pushFollow(FOLLOW_ruleXNullLiteral_in_entryRuleXNullLiteral15242);
             iv_ruleXNullLiteral=ruleXNullLiteral();
 
             state._fsp--;
@@ -19053,7 +18995,7 @@ public final EObject entryRuleXNullLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXNullLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXNullLiteral15290); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXNullLiteral15252); if (state.failed) return current;
 
             }
 
@@ -19071,7 +19013,7 @@ public final EObject entryRuleXNullLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXNullLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6690:1: ruleXNullLiteral returns [EObject current=null] : ( () otherlv_1= 'null' ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6671:1: ruleXNullLiteral returns [EObject current=null] : ( () otherlv_1= 'null' ) ;
     public final EObject ruleXNullLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -19080,14 +19022,14 @@ public final EObject ruleXNullLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6693:28: ( ( () otherlv_1= 'null' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6694:1: ( () otherlv_1= 'null' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6674:28: ( ( () otherlv_1= 'null' ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6675:1: ( () otherlv_1= 'null' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6694:1: ( () otherlv_1= 'null' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6694:2: () otherlv_1= 'null'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6675:1: ( () otherlv_1= 'null' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6675:2: () otherlv_1= 'null'
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6694:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6695:5: 
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6675:2: ()
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6676:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -19099,7 +19041,7 @@ public final EObject ruleXNullLiteral() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,99,FOLLOW_99_in_ruleXNullLiteral15336); if (state.failed) return current;
+            otherlv_1=(Token)match(input,99,FOLLOW_99_in_ruleXNullLiteral15298); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXNullLiteralAccess().getNullKeyword_1());
@@ -19128,7 +19070,7 @@ public final EObject ruleXNullLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXNumberLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6712:1: entryRuleXNumberLiteral returns [EObject current=null] : iv_ruleXNumberLiteral= ruleXNumberLiteral EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6693:1: entryRuleXNumberLiteral returns [EObject current=null] : iv_ruleXNumberLiteral= ruleXNumberLiteral EOF ;
     public final EObject entryRuleXNumberLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -19136,13 +19078,13 @@ public final EObject entryRuleXNumberLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6713:2: (iv_ruleXNumberLiteral= ruleXNumberLiteral EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6714:2: iv_ruleXNumberLiteral= ruleXNumberLiteral EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6694:2: (iv_ruleXNumberLiteral= ruleXNumberLiteral EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6695:2: iv_ruleXNumberLiteral= ruleXNumberLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXNumberLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXNumberLiteral_in_entryRuleXNumberLiteral15372);
+            pushFollow(FOLLOW_ruleXNumberLiteral_in_entryRuleXNumberLiteral15334);
             iv_ruleXNumberLiteral=ruleXNumberLiteral();
 
             state._fsp--;
@@ -19150,7 +19092,7 @@ public final EObject entryRuleXNumberLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXNumberLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXNumberLiteral15382); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXNumberLiteral15344); if (state.failed) return current;
 
             }
 
@@ -19168,7 +19110,7 @@ public final EObject entryRuleXNumberLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXNumberLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6721:1: ruleXNumberLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= ruleNumber ) ) ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6702:1: ruleXNumberLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= ruleNumber ) ) ) ;
     public final EObject ruleXNumberLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -19178,14 +19120,14 @@ public final EObject ruleXNumberLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6724:28: ( ( () ( (lv_value_1_0= ruleNumber ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6725:1: ( () ( (lv_value_1_0= ruleNumber ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6705:28: ( ( () ( (lv_value_1_0= ruleNumber ) ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6706:1: ( () ( (lv_value_1_0= ruleNumber ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6725:1: ( () ( (lv_value_1_0= ruleNumber ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6725:2: () ( (lv_value_1_0= ruleNumber ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6706:1: ( () ( (lv_value_1_0= ruleNumber ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6706:2: () ( (lv_value_1_0= ruleNumber ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6725:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6726:5: 
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6706:2: ()
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6707:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -19197,18 +19139,18 @@ public final EObject ruleXNumberLiteral() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6731:2: ( (lv_value_1_0= ruleNumber ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6732:1: (lv_value_1_0= ruleNumber )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6712:2: ( (lv_value_1_0= ruleNumber ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6713:1: (lv_value_1_0= ruleNumber )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6732:1: (lv_value_1_0= ruleNumber )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6733:3: lv_value_1_0= ruleNumber
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6713:1: (lv_value_1_0= ruleNumber )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6714:3: lv_value_1_0= ruleNumber
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXNumberLiteralAccess().getValueNumberParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleNumber_in_ruleXNumberLiteral15437);
+            pushFollow(FOLLOW_ruleNumber_in_ruleXNumberLiteral15399);
             lv_value_1_0=ruleNumber();
 
             state._fsp--;
@@ -19255,7 +19197,7 @@ public final EObject ruleXNumberLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXStringLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6757:1: entryRuleXStringLiteral returns [EObject current=null] : iv_ruleXStringLiteral= ruleXStringLiteral EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6738:1: entryRuleXStringLiteral returns [EObject current=null] : iv_ruleXStringLiteral= ruleXStringLiteral EOF ;
     public final EObject entryRuleXStringLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -19263,13 +19205,13 @@ public final EObject entryRuleXStringLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6758:2: (iv_ruleXStringLiteral= ruleXStringLiteral EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6759:2: iv_ruleXStringLiteral= ruleXStringLiteral EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6739:2: (iv_ruleXStringLiteral= ruleXStringLiteral EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6740:2: iv_ruleXStringLiteral= ruleXStringLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXStringLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXStringLiteral_in_entryRuleXStringLiteral15473);
+            pushFollow(FOLLOW_ruleXStringLiteral_in_entryRuleXStringLiteral15435);
             iv_ruleXStringLiteral=ruleXStringLiteral();
 
             state._fsp--;
@@ -19277,7 +19219,7 @@ public final EObject entryRuleXStringLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXStringLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXStringLiteral15483); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXStringLiteral15445); if (state.failed) return current;
 
             }
 
@@ -19295,7 +19237,7 @@ public final EObject entryRuleXStringLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXStringLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6766:1: ruleXStringLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= RULE_STRING ) ) ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6747:1: ruleXStringLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= RULE_STRING ) ) ) ;
     public final EObject ruleXStringLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -19304,14 +19246,14 @@ public final EObject ruleXStringLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6769:28: ( ( () ( (lv_value_1_0= RULE_STRING ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6770:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6750:28: ( ( () ( (lv_value_1_0= RULE_STRING ) ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6751:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6770:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6770:2: () ( (lv_value_1_0= RULE_STRING ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6751:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6751:2: () ( (lv_value_1_0= RULE_STRING ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6770:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6771:5: 
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6751:2: ()
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6752:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -19323,13 +19265,13 @@ public final EObject ruleXStringLiteral() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6776:2: ( (lv_value_1_0= RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6777:1: (lv_value_1_0= RULE_STRING )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6757:2: ( (lv_value_1_0= RULE_STRING ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6758:1: (lv_value_1_0= RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6777:1: (lv_value_1_0= RULE_STRING )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6778:3: lv_value_1_0= RULE_STRING
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6758:1: (lv_value_1_0= RULE_STRING )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6759:3: lv_value_1_0= RULE_STRING
             {
-            lv_value_1_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleXStringLiteral15534); if (state.failed) return current;
+            lv_value_1_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleXStringLiteral15496); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(lv_value_1_0, grammarAccess.getXStringLiteralAccess().getValueSTRINGTerminalRuleCall_1_0()); 
@@ -19376,7 +19318,7 @@ public final EObject ruleXStringLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXTypeLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6802:1: entryRuleXTypeLiteral returns [EObject current=null] : iv_ruleXTypeLiteral= ruleXTypeLiteral EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6783:1: entryRuleXTypeLiteral returns [EObject current=null] : iv_ruleXTypeLiteral= ruleXTypeLiteral EOF ;
     public final EObject entryRuleXTypeLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -19384,13 +19326,13 @@ public final EObject entryRuleXTypeLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6803:2: (iv_ruleXTypeLiteral= ruleXTypeLiteral EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6804:2: iv_ruleXTypeLiteral= ruleXTypeLiteral EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6784:2: (iv_ruleXTypeLiteral= ruleXTypeLiteral EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6785:2: iv_ruleXTypeLiteral= ruleXTypeLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXTypeLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXTypeLiteral_in_entryRuleXTypeLiteral15575);
+            pushFollow(FOLLOW_ruleXTypeLiteral_in_entryRuleXTypeLiteral15537);
             iv_ruleXTypeLiteral=ruleXTypeLiteral();
 
             state._fsp--;
@@ -19398,7 +19340,7 @@ public final EObject entryRuleXTypeLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXTypeLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXTypeLiteral15585); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXTypeLiteral15547); if (state.failed) return current;
 
             }
 
@@ -19416,7 +19358,7 @@ public final EObject entryRuleXTypeLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXTypeLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6811:1: ruleXTypeLiteral returns [EObject current=null] : ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6792:1: ruleXTypeLiteral returns [EObject current=null] : ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' ) ;
     public final EObject ruleXTypeLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -19429,14 +19371,14 @@ public final EObject ruleXTypeLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6814:28: ( ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6815:1: ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6795:28: ( ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6796:1: ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6815:1: ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6815:2: () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6796:1: ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6796:2: () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')'
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6815:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6816:5: 
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6796:2: ()
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6797:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -19448,23 +19390,23 @@ public final EObject ruleXTypeLiteral() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,100,FOLLOW_100_in_ruleXTypeLiteral15631); if (state.failed) return current;
+            otherlv_1=(Token)match(input,100,FOLLOW_100_in_ruleXTypeLiteral15593); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXTypeLiteralAccess().getTypeofKeyword_1());
                   
             }
-            otherlv_2=(Token)match(input,24,FOLLOW_24_in_ruleXTypeLiteral15643); if (state.failed) return current;
+            otherlv_2=(Token)match(input,23,FOLLOW_23_in_ruleXTypeLiteral15605); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getXTypeLiteralAccess().getLeftParenthesisKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6829:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6830:1: ( ruleQualifiedName )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6810:1: ( ( ruleQualifiedName ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6811:1: ( ruleQualifiedName )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6830:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6831:3: ruleQualifiedName
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6811:1: ( ruleQualifiedName )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6812:3: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
 
@@ -19478,7 +19420,7 @@ public final EObject ruleXTypeLiteral() throws RecognitionException {
               	        newCompositeNode(grammarAccess.getXTypeLiteralAccess().getTypeJvmTypeCrossReference_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_ruleXTypeLiteral15666);
+            pushFollow(FOLLOW_ruleQualifiedName_in_ruleXTypeLiteral15628);
             ruleQualifiedName();
 
             state._fsp--;
@@ -19494,30 +19436,30 @@ public final EObject ruleXTypeLiteral() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6844:2: ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )*
-            loop134:
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6825:2: ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )*
+            loop133:
             do {
-                int alt134=2;
-                int LA134_0 = input.LA(1);
+                int alt133=2;
+                int LA133_0 = input.LA(1);
 
-                if ( (LA134_0==34) ) {
-                    alt134=1;
+                if ( (LA133_0==33) ) {
+                    alt133=1;
                 }
 
 
-                switch (alt134) {
+                switch (alt133) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6845:1: (lv_arrayDimensions_4_0= ruleArrayBrackets )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6826:1: (lv_arrayDimensions_4_0= ruleArrayBrackets )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6845:1: (lv_arrayDimensions_4_0= ruleArrayBrackets )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6846:3: lv_arrayDimensions_4_0= ruleArrayBrackets
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6826:1: (lv_arrayDimensions_4_0= ruleArrayBrackets )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6827:3: lv_arrayDimensions_4_0= ruleArrayBrackets
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXTypeLiteralAccess().getArrayDimensionsArrayBracketsParserRuleCall_4_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleArrayBrackets_in_ruleXTypeLiteral15687);
+            	    pushFollow(FOLLOW_ruleArrayBrackets_in_ruleXTypeLiteral15649);
             	    lv_arrayDimensions_4_0=ruleArrayBrackets();
 
             	    state._fsp--;
@@ -19543,11 +19485,11 @@ public final EObject ruleXTypeLiteral() throws RecognitionException {
             	    break;
 
             	default :
-            	    break loop134;
+            	    break loop133;
                 }
             } while (true);
 
-            otherlv_5=(Token)match(input,26,FOLLOW_26_in_ruleXTypeLiteral15700); if (state.failed) return current;
+            otherlv_5=(Token)match(input,25,FOLLOW_25_in_ruleXTypeLiteral15662); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_5, grammarAccess.getXTypeLiteralAccess().getRightParenthesisKeyword_5());
@@ -19576,7 +19518,7 @@ public final EObject ruleXTypeLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXThrowExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6874:1: entryRuleXThrowExpression returns [EObject current=null] : iv_ruleXThrowExpression= ruleXThrowExpression EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6855:1: entryRuleXThrowExpression returns [EObject current=null] : iv_ruleXThrowExpression= ruleXThrowExpression EOF ;
     public final EObject entryRuleXThrowExpression() throws RecognitionException {
         EObject current = null;
 
@@ -19584,13 +19526,13 @@ public final EObject entryRuleXThrowExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6875:2: (iv_ruleXThrowExpression= ruleXThrowExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6876:2: iv_ruleXThrowExpression= ruleXThrowExpression EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6856:2: (iv_ruleXThrowExpression= ruleXThrowExpression EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6857:2: iv_ruleXThrowExpression= ruleXThrowExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXThrowExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXThrowExpression_in_entryRuleXThrowExpression15736);
+            pushFollow(FOLLOW_ruleXThrowExpression_in_entryRuleXThrowExpression15698);
             iv_ruleXThrowExpression=ruleXThrowExpression();
 
             state._fsp--;
@@ -19598,7 +19540,7 @@ public final EObject entryRuleXThrowExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXThrowExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXThrowExpression15746); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXThrowExpression15708); if (state.failed) return current;
 
             }
 
@@ -19616,7 +19558,7 @@ public final EObject entryRuleXThrowExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXThrowExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6883:1: ruleXThrowExpression returns [EObject current=null] : ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6864:1: ruleXThrowExpression returns [EObject current=null] : ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) ) ;
     public final EObject ruleXThrowExpression() throws RecognitionException {
         EObject current = null;
 
@@ -19627,14 +19569,14 @@ public final EObject ruleXThrowExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6886:28: ( ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6887:1: ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6867:28: ( ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6868:1: ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6887:1: ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6887:2: () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6868:1: ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6868:2: () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6887:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6888:5: 
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6868:2: ()
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6869:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -19646,24 +19588,24 @@ public final EObject ruleXThrowExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,101,FOLLOW_101_in_ruleXThrowExpression15792); if (state.failed) return current;
+            otherlv_1=(Token)match(input,101,FOLLOW_101_in_ruleXThrowExpression15754); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXThrowExpressionAccess().getThrowKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6897:1: ( (lv_expression_2_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6898:1: (lv_expression_2_0= ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6878:1: ( (lv_expression_2_0= ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6879:1: (lv_expression_2_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6898:1: (lv_expression_2_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6899:3: lv_expression_2_0= ruleXExpression
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6879:1: (lv_expression_2_0= ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6880:3: lv_expression_2_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXThrowExpressionAccess().getExpressionXExpressionParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXThrowExpression15813);
+            pushFollow(FOLLOW_ruleXExpression_in_ruleXThrowExpression15775);
             lv_expression_2_0=ruleXExpression();
 
             state._fsp--;
@@ -19710,7 +19652,7 @@ public final EObject ruleXThrowExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXReturnExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6923:1: entryRuleXReturnExpression returns [EObject current=null] : iv_ruleXReturnExpression= ruleXReturnExpression EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6904:1: entryRuleXReturnExpression returns [EObject current=null] : iv_ruleXReturnExpression= ruleXReturnExpression EOF ;
     public final EObject entryRuleXReturnExpression() throws RecognitionException {
         EObject current = null;
 
@@ -19718,13 +19660,13 @@ public final EObject entryRuleXReturnExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6924:2: (iv_ruleXReturnExpression= ruleXReturnExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6925:2: iv_ruleXReturnExpression= ruleXReturnExpression EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6905:2: (iv_ruleXReturnExpression= ruleXReturnExpression EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6906:2: iv_ruleXReturnExpression= ruleXReturnExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXReturnExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXReturnExpression_in_entryRuleXReturnExpression15849);
+            pushFollow(FOLLOW_ruleXReturnExpression_in_entryRuleXReturnExpression15811);
             iv_ruleXReturnExpression=ruleXReturnExpression();
 
             state._fsp--;
@@ -19732,7 +19674,7 @@ public final EObject entryRuleXReturnExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXReturnExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXReturnExpression15859); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXReturnExpression15821); if (state.failed) return current;
 
             }
 
@@ -19750,7 +19692,7 @@ public final EObject entryRuleXReturnExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXReturnExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6932:1: ruleXReturnExpression returns [EObject current=null] : ( () otherlv_1= 'return' ( ( 'extends' | 'static' | 'import' | 'extension' | 'catalog' | 'grammar' | 'with' | 'category' | 'message' | 'on' | 'bind' | 'data' | 'SeverityRange' | 'error' | 'warning' | 'info' | 'ignore' | 'live' | 'onSave' | 'onDemand' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | 'guard' | 'issue' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )? ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6913:1: ruleXReturnExpression returns [EObject current=null] : ( () otherlv_1= 'return' ( ( 'extends' | 'static' | 'import' | 'extension' | 'catalog' | 'grammar' | 'with' | 'category' | 'message' | 'on' | 'bind' | 'data' | 'SeverityRange' | 'error' | 'warning' | 'info' | 'ignore' | 'live' | 'onSave' | 'onDemand' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | 'guard' | 'issue' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )? ) ;
     public final EObject ruleXReturnExpression() throws RecognitionException {
         EObject current = null;
 
@@ -19761,14 +19703,14 @@ public final EObject ruleXReturnExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6935:28: ( ( () otherlv_1= 'return' ( ( 'extends' | 'static' | 'import' | 'extension' | 'catalog' | 'grammar' | 'with' | 'category' | 'message' | 'on' | 'bind' | 'data' | 'SeverityRange' | 'error' | 'warning' | 'info' | 'ignore' | 'live' | 'onSave' | 'onDemand' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | 'guard' | 'issue' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )? ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6936:1: ( () otherlv_1= 'return' ( ( 'extends' | 'static' | 'import' | 'extension' | 'catalog' | 'grammar' | 'with' | 'category' | 'message' | 'on' | 'bind' | 'data' | 'SeverityRange' | 'error' | 'warning' | 'info' | 'ignore' | 'live' | 'onSave' | 'onDemand' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | 'guard' | 'issue' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )? )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6916:28: ( ( () otherlv_1= 'return' ( ( 'extends' | 'static' | 'import' | 'extension' | 'catalog' | 'grammar' | 'with' | 'category' | 'message' | 'on' | 'bind' | 'data' | 'SeverityRange' | 'error' | 'warning' | 'info' | 'ignore' | 'live' | 'onSave' | 'onDemand' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | 'guard' | 'issue' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )? ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6917:1: ( () otherlv_1= 'return' ( ( 'extends' | 'static' | 'import' | 'extension' | 'catalog' | 'grammar' | 'with' | 'category' | 'message' | 'on' | 'bind' | 'data' | 'SeverityRange' | 'error' | 'warning' | 'info' | 'ignore' | 'live' | 'onSave' | 'onDemand' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | 'guard' | 'issue' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )? )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6936:1: ( () otherlv_1= 'return' ( ( 'extends' | 'static' | 'import' | 'extension' | 'catalog' | 'grammar' | 'with' | 'category' | 'message' | 'on' | 'bind' | 'data' | 'SeverityRange' | 'error' | 'warning' | 'info' | 'ignore' | 'live' | 'onSave' | 'onDemand' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | 'guard' | 'issue' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )? )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6936:2: () otherlv_1= 'return' ( ( 'extends' | 'static' | 'import' | 'extension' | 'catalog' | 'grammar' | 'with' | 'category' | 'message' | 'on' | 'bind' | 'data' | 'SeverityRange' | 'error' | 'warning' | 'info' | 'ignore' | 'live' | 'onSave' | 'onDemand' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | 'guard' | 'issue' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )?
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6917:1: ( () otherlv_1= 'return' ( ( 'extends' | 'static' | 'import' | 'extension' | 'catalog' | 'grammar' | 'with' | 'category' | 'message' | 'on' | 'bind' | 'data' | 'SeverityRange' | 'error' | 'warning' | 'info' | 'ignore' | 'live' | 'onSave' | 'onDemand' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | 'guard' | 'issue' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )? )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6917:2: () otherlv_1= 'return' ( ( 'extends' | 'static' | 'import' | 'extension' | 'catalog' | 'grammar' | 'with' | 'category' | 'message' | 'on' | 'bind' | 'data' | 'SeverityRange' | 'error' | 'warning' | 'info' | 'ignore' | 'live' | 'onSave' | 'onDemand' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | 'guard' | 'issue' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )?
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6936:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6937:5: 
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6917:2: ()
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6918:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -19780,28 +19722,28 @@ public final EObject ruleXReturnExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,102,FOLLOW_102_in_ruleXReturnExpression15905); if (state.failed) return current;
+            otherlv_1=(Token)match(input,102,FOLLOW_102_in_ruleXReturnExpression15867); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXReturnExpressionAccess().getReturnKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6946:1: ( ( 'extends' | 'static' | 'import' | 'extension' | 'catalog' | 'grammar' | 'with' | 'category' | 'message' | 'on' | 'bind' | 'data' | 'SeverityRange' | 'error' | 'warning' | 'info' | 'ignore' | 'live' | 'onSave' | 'onDemand' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | 'guard' | 'issue' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )?
-            int alt135=2;
-            alt135 = dfa135.predict(input);
-            switch (alt135) {
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6927:1: ( ( 'extends' | 'static' | 'import' | 'extension' | 'catalog' | 'grammar' | 'with' | 'category' | 'message' | 'on' | 'bind' | 'data' | 'SeverityRange' | 'error' | 'warning' | 'info' | 'ignore' | 'live' | 'onSave' | 'onDemand' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | 'guard' | 'issue' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )?
+            int alt134=2;
+            alt134 = dfa134.predict(input);
+            switch (alt134) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6946:2: ( 'extends' | 'static' | 'import' | 'extension' | 'catalog' | 'grammar' | 'with' | 'category' | 'message' | 'on' | 'bind' | 'data' | 'SeverityRange' | 'error' | 'warning' | 'info' | 'ignore' | 'live' | 'onSave' | 'onDemand' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | 'guard' | 'issue' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6927:2: ( 'extends' | 'static' | 'import' | 'extension' | 'catalog' | 'grammar' | 'with' | 'category' | 'message' | 'on' | 'bind' | 'data' | 'SeverityRange' | 'error' | 'warning' | 'info' | 'ignore' | 'live' | 'onSave' | 'onDemand' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | 'guard' | 'issue' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6992:1: (lv_expression_2_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6993:3: lv_expression_2_0= ruleXExpression
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6973:1: (lv_expression_2_0= ruleXExpression )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6974:3: lv_expression_2_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXReturnExpressionAccess().getExpressionXExpressionParserRuleCall_2_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXReturnExpression16266);
+                    pushFollow(FOLLOW_ruleXExpression_in_ruleXReturnExpression16228);
                     lv_expression_2_0=ruleXExpression();
 
                     state._fsp--;
@@ -19851,7 +19793,7 @@ public final EObject ruleXReturnExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXTryCatchFinallyExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7017:1: entryRuleXTryCatchFinallyExpression returns [EObject current=null] : iv_ruleXTryCatchFinallyExpression= ruleXTryCatchFinallyExpression EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6998:1: entryRuleXTryCatchFinallyExpression returns [EObject current=null] : iv_ruleXTryCatchFinallyExpression= ruleXTryCatchFinallyExpression EOF ;
     public final EObject entryRuleXTryCatchFinallyExpression() throws RecognitionException {
         EObject current = null;
 
@@ -19859,13 +19801,13 @@ public final EObject entryRuleXTryCatchFinallyExpression() throws RecognitionExc
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7018:2: (iv_ruleXTryCatchFinallyExpression= ruleXTryCatchFinallyExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7019:2: iv_ruleXTryCatchFinallyExpression= ruleXTryCatchFinallyExpression EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6999:2: (iv_ruleXTryCatchFinallyExpression= ruleXTryCatchFinallyExpression EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7000:2: iv_ruleXTryCatchFinallyExpression= ruleXTryCatchFinallyExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXTryCatchFinallyExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXTryCatchFinallyExpression_in_entryRuleXTryCatchFinallyExpression16303);
+            pushFollow(FOLLOW_ruleXTryCatchFinallyExpression_in_entryRuleXTryCatchFinallyExpression16265);
             iv_ruleXTryCatchFinallyExpression=ruleXTryCatchFinallyExpression();
 
             state._fsp--;
@@ -19873,7 +19815,7 @@ public final EObject entryRuleXTryCatchFinallyExpression() throws RecognitionExc
             if ( state.backtracking==0 ) {
                current =iv_ruleXTryCatchFinallyExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXTryCatchFinallyExpression16313); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXTryCatchFinallyExpression16275); if (state.failed) return current;
 
             }
 
@@ -19891,7 +19833,7 @@ public final EObject entryRuleXTryCatchFinallyExpression() throws RecognitionExc
 
 
     // $ANTLR start "ruleXTryCatchFinallyExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7026:1: ruleXTryCatchFinallyExpression returns [EObject current=null] : ( () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) ) ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7007:1: ruleXTryCatchFinallyExpression returns [EObject current=null] : ( () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) ) ) ;
     public final EObject ruleXTryCatchFinallyExpression() throws RecognitionException {
         EObject current = null;
 
@@ -19910,14 +19852,14 @@ public final EObject ruleXTryCatchFinallyExpression() throws RecognitionExceptio
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7029:28: ( ( () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7030:1: ( () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7010:28: ( ( () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7011:1: ( () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7030:1: ( () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7030:2: () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7011:1: ( () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7011:2: () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7030:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7031:5: 
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7011:2: ()
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7012:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -19929,24 +19871,24 @@ public final EObject ruleXTryCatchFinallyExpression() throws RecognitionExceptio
 
             }
 
-            otherlv_1=(Token)match(input,103,FOLLOW_103_in_ruleXTryCatchFinallyExpression16359); if (state.failed) return current;
+            otherlv_1=(Token)match(input,103,FOLLOW_103_in_ruleXTryCatchFinallyExpression16321); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXTryCatchFinallyExpressionAccess().getTryKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7040:1: ( (lv_expression_2_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7041:1: (lv_expression_2_0= ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7021:1: ( (lv_expression_2_0= ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7022:1: (lv_expression_2_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7041:1: (lv_expression_2_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7042:3: lv_expression_2_0= ruleXExpression
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7022:1: (lv_expression_2_0= ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7023:3: lv_expression_2_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXTryCatchFinallyExpressionAccess().getExpressionXExpressionParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXTryCatchFinallyExpression16380);
+            pushFollow(FOLLOW_ruleXExpression_in_ruleXTryCatchFinallyExpression16342);
             lv_expression_2_0=ruleXExpression();
 
             state._fsp--;
@@ -19970,61 +19912,61 @@ public final EObject ruleXTryCatchFinallyExpression() throws RecognitionExceptio
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7058:2: ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) )
-            int alt138=2;
-            int LA138_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7039:2: ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) )
+            int alt137=2;
+            int LA137_0 = input.LA(1);
 
-            if ( (LA138_0==106) ) {
-                alt138=1;
+            if ( (LA137_0==106) ) {
+                alt137=1;
             }
-            else if ( (LA138_0==104) ) {
-                alt138=2;
+            else if ( (LA137_0==104) ) {
+                alt137=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 138, 0, input);
+                    new NoViableAltException("", 137, 0, input);
 
                 throw nvae;
             }
-            switch (alt138) {
+            switch (alt137) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7058:3: ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7039:3: ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7058:3: ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7058:4: ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )?
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7039:3: ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7039:4: ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )?
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7058:4: ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+
-                    int cnt136=0;
-                    loop136:
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7039:4: ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+
+                    int cnt135=0;
+                    loop135:
                     do {
-                        int alt136=2;
-                        int LA136_0 = input.LA(1);
+                        int alt135=2;
+                        int LA135_0 = input.LA(1);
 
-                        if ( (LA136_0==106) ) {
-                            int LA136_2 = input.LA(2);
+                        if ( (LA135_0==106) ) {
+                            int LA135_2 = input.LA(2);
 
                             if ( (synpred56_InternalCheck()) ) {
-                                alt136=1;
+                                alt135=1;
                             }
 
 
                         }
 
 
-                        switch (alt136) {
+                        switch (alt135) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7058:5: ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7039:5: ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7060:1: (lv_catchClauses_3_0= ruleXCatchClause )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7061:3: lv_catchClauses_3_0= ruleXCatchClause
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7041:1: (lv_catchClauses_3_0= ruleXCatchClause )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7042:3: lv_catchClauses_3_0= ruleXCatchClause
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getXTryCatchFinallyExpressionAccess().getCatchClausesXCatchClauseParserRuleCall_3_0_0_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleXCatchClause_in_ruleXTryCatchFinallyExpression16410);
+                    	    pushFollow(FOLLOW_ruleXCatchClause_in_ruleXTryCatchFinallyExpression16372);
                     	    lv_catchClauses_3_0=ruleXCatchClause();
 
                     	    state._fsp--;
@@ -20050,34 +19992,34 @@ else if ( (LA138_0==104) ) {
                     	    break;
 
                     	default :
-                    	    if ( cnt136 >= 1 ) break loop136;
+                    	    if ( cnt135 >= 1 ) break loop135;
                     	    if (state.backtracking>0) {state.failed=true; return current;}
                                 EarlyExitException eee =
-                                    new EarlyExitException(136, input);
+                                    new EarlyExitException(135, input);
                                 throw eee;
                         }
-                        cnt136++;
+                        cnt135++;
                     } while (true);
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7077:3: ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )?
-                    int alt137=2;
-                    int LA137_0 = input.LA(1);
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7058:3: ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )?
+                    int alt136=2;
+                    int LA136_0 = input.LA(1);
 
-                    if ( (LA137_0==104) ) {
-                        int LA137_1 = input.LA(2);
+                    if ( (LA136_0==104) ) {
+                        int LA136_1 = input.LA(2);
 
                         if ( (synpred57_InternalCheck()) ) {
-                            alt137=1;
+                            alt136=1;
                         }
                     }
-                    switch (alt137) {
+                    switch (alt136) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7077:4: ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7058:4: ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7077:4: ( ( 'finally' )=>otherlv_4= 'finally' )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7077:5: ( 'finally' )=>otherlv_4= 'finally'
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7058:4: ( ( 'finally' )=>otherlv_4= 'finally' )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7058:5: ( 'finally' )=>otherlv_4= 'finally'
                             {
-                            otherlv_4=(Token)match(input,104,FOLLOW_104_in_ruleXTryCatchFinallyExpression16432); if (state.failed) return current;
+                            otherlv_4=(Token)match(input,104,FOLLOW_104_in_ruleXTryCatchFinallyExpression16394); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                   	newLeafNode(otherlv_4, grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyKeyword_3_0_1_0());
@@ -20086,18 +20028,18 @@ else if ( (LA138_0==104) ) {
 
                             }
 
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7082:2: ( (lv_finallyExpression_5_0= ruleXExpression ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7083:1: (lv_finallyExpression_5_0= ruleXExpression )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7063:2: ( (lv_finallyExpression_5_0= ruleXExpression ) )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7064:1: (lv_finallyExpression_5_0= ruleXExpression )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7083:1: (lv_finallyExpression_5_0= ruleXExpression )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7084:3: lv_finallyExpression_5_0= ruleXExpression
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7064:1: (lv_finallyExpression_5_0= ruleXExpression )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7065:3: lv_finallyExpression_5_0= ruleXExpression
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyExpressionXExpressionParserRuleCall_3_0_1_1_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleXExpression_in_ruleXTryCatchFinallyExpression16454);
+                            pushFollow(FOLLOW_ruleXExpression_in_ruleXTryCatchFinallyExpression16416);
                             lv_finallyExpression_5_0=ruleXExpression();
 
                             state._fsp--;
@@ -20134,29 +20076,29 @@ else if ( (LA138_0==104) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7101:6: (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7082:6: (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7101:6: (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7101:8: otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7082:6: (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7082:8: otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) )
                     {
-                    otherlv_6=(Token)match(input,104,FOLLOW_104_in_ruleXTryCatchFinallyExpression16476); if (state.failed) return current;
+                    otherlv_6=(Token)match(input,104,FOLLOW_104_in_ruleXTryCatchFinallyExpression16438); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_6, grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyKeyword_3_1_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7105:1: ( (lv_finallyExpression_7_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7106:1: (lv_finallyExpression_7_0= ruleXExpression )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7086:1: ( (lv_finallyExpression_7_0= ruleXExpression ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7087:1: (lv_finallyExpression_7_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7106:1: (lv_finallyExpression_7_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7107:3: lv_finallyExpression_7_0= ruleXExpression
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7087:1: (lv_finallyExpression_7_0= ruleXExpression )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7088:3: lv_finallyExpression_7_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyExpressionXExpressionParserRuleCall_3_1_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXTryCatchFinallyExpression16497);
+                    pushFollow(FOLLOW_ruleXExpression_in_ruleXTryCatchFinallyExpression16459);
                     lv_finallyExpression_7_0=ruleXExpression();
 
                     state._fsp--;
@@ -20212,7 +20154,7 @@ else if ( (LA138_0==104) ) {
 
 
     // $ANTLR start "entryRuleXSynchronizedExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7131:1: entryRuleXSynchronizedExpression returns [EObject current=null] : iv_ruleXSynchronizedExpression= ruleXSynchronizedExpression EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7112:1: entryRuleXSynchronizedExpression returns [EObject current=null] : iv_ruleXSynchronizedExpression= ruleXSynchronizedExpression EOF ;
     public final EObject entryRuleXSynchronizedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -20220,13 +20162,13 @@ public final EObject entryRuleXSynchronizedExpression() throws RecognitionExcept
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7132:2: (iv_ruleXSynchronizedExpression= ruleXSynchronizedExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7133:2: iv_ruleXSynchronizedExpression= ruleXSynchronizedExpression EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7113:2: (iv_ruleXSynchronizedExpression= ruleXSynchronizedExpression EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7114:2: iv_ruleXSynchronizedExpression= ruleXSynchronizedExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXSynchronizedExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXSynchronizedExpression_in_entryRuleXSynchronizedExpression16535);
+            pushFollow(FOLLOW_ruleXSynchronizedExpression_in_entryRuleXSynchronizedExpression16497);
             iv_ruleXSynchronizedExpression=ruleXSynchronizedExpression();
 
             state._fsp--;
@@ -20234,7 +20176,7 @@ public final EObject entryRuleXSynchronizedExpression() throws RecognitionExcept
             if ( state.backtracking==0 ) {
                current =iv_ruleXSynchronizedExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXSynchronizedExpression16545); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXSynchronizedExpression16507); if (state.failed) return current;
 
             }
 
@@ -20252,7 +20194,7 @@ public final EObject entryRuleXSynchronizedExpression() throws RecognitionExcept
 
 
     // $ANTLR start "ruleXSynchronizedExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7140:1: ruleXSynchronizedExpression returns [EObject current=null] : ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7121:1: ruleXSynchronizedExpression returns [EObject current=null] : ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) ) ;
     public final EObject ruleXSynchronizedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -20267,20 +20209,20 @@ public final EObject ruleXSynchronizedExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7143:28: ( ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7144:1: ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7124:28: ( ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7125:1: ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7144:1: ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7144:2: ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7125:1: ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7125:2: ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7144:2: ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7144:3: ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7125:2: ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7125:3: ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7147:5: ( () otherlv_1= 'synchronized' otherlv_2= '(' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7147:6: () otherlv_1= 'synchronized' otherlv_2= '('
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7128:5: ( () otherlv_1= 'synchronized' otherlv_2= '(' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7128:6: () otherlv_1= 'synchronized' otherlv_2= '('
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7147:6: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7148:5: 
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7128:6: ()
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7129:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -20292,13 +20234,13 @@ public final EObject ruleXSynchronizedExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,105,FOLLOW_105_in_ruleXSynchronizedExpression16609); if (state.failed) return current;
+            otherlv_1=(Token)match(input,105,FOLLOW_105_in_ruleXSynchronizedExpression16571); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXSynchronizedExpressionAccess().getSynchronizedKeyword_0_0_1());
                   
             }
-            otherlv_2=(Token)match(input,24,FOLLOW_24_in_ruleXSynchronizedExpression16621); if (state.failed) return current;
+            otherlv_2=(Token)match(input,23,FOLLOW_23_in_ruleXSynchronizedExpression16583); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getXSynchronizedExpressionAccess().getLeftParenthesisKeyword_0_0_2());
@@ -20310,18 +20252,18 @@ public final EObject ruleXSynchronizedExpression() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7161:3: ( (lv_param_3_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7162:1: (lv_param_3_0= ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7142:3: ( (lv_param_3_0= ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7143:1: (lv_param_3_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7162:1: (lv_param_3_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7163:3: lv_param_3_0= ruleXExpression
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7143:1: (lv_param_3_0= ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7144:3: lv_param_3_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXSynchronizedExpressionAccess().getParamXExpressionParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXSynchronizedExpression16644);
+            pushFollow(FOLLOW_ruleXExpression_in_ruleXSynchronizedExpression16606);
             lv_param_3_0=ruleXExpression();
 
             state._fsp--;
@@ -20345,24 +20287,24 @@ public final EObject ruleXSynchronizedExpression() throws RecognitionException {
 
             }
 
-            otherlv_4=(Token)match(input,26,FOLLOW_26_in_ruleXSynchronizedExpression16656); if (state.failed) return current;
+            otherlv_4=(Token)match(input,25,FOLLOW_25_in_ruleXSynchronizedExpression16618); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_4, grammarAccess.getXSynchronizedExpressionAccess().getRightParenthesisKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7183:1: ( (lv_expression_5_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7184:1: (lv_expression_5_0= ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7164:1: ( (lv_expression_5_0= ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7165:1: (lv_expression_5_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7184:1: (lv_expression_5_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7185:3: lv_expression_5_0= ruleXExpression
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7165:1: (lv_expression_5_0= ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7166:3: lv_expression_5_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXSynchronizedExpressionAccess().getExpressionXExpressionParserRuleCall_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXSynchronizedExpression16677);
+            pushFollow(FOLLOW_ruleXExpression_in_ruleXSynchronizedExpression16639);
             lv_expression_5_0=ruleXExpression();
 
             state._fsp--;
@@ -20409,7 +20351,7 @@ public final EObject ruleXSynchronizedExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXCatchClause"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7209:1: entryRuleXCatchClause returns [EObject current=null] : iv_ruleXCatchClause= ruleXCatchClause EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7190:1: entryRuleXCatchClause returns [EObject current=null] : iv_ruleXCatchClause= ruleXCatchClause EOF ;
     public final EObject entryRuleXCatchClause() throws RecognitionException {
         EObject current = null;
 
@@ -20417,13 +20359,13 @@ public final EObject entryRuleXCatchClause() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7210:2: (iv_ruleXCatchClause= ruleXCatchClause EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7211:2: iv_ruleXCatchClause= ruleXCatchClause EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7191:2: (iv_ruleXCatchClause= ruleXCatchClause EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7192:2: iv_ruleXCatchClause= ruleXCatchClause EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXCatchClauseRule()); 
             }
-            pushFollow(FOLLOW_ruleXCatchClause_in_entryRuleXCatchClause16713);
+            pushFollow(FOLLOW_ruleXCatchClause_in_entryRuleXCatchClause16675);
             iv_ruleXCatchClause=ruleXCatchClause();
 
             state._fsp--;
@@ -20431,7 +20373,7 @@ public final EObject entryRuleXCatchClause() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXCatchClause; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXCatchClause16723); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXCatchClause16685); if (state.failed) return current;
 
             }
 
@@ -20449,7 +20391,7 @@ public final EObject entryRuleXCatchClause() throws RecognitionException {
 
 
     // $ANTLR start "ruleXCatchClause"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7218:1: ruleXCatchClause returns [EObject current=null] : ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7199:1: ruleXCatchClause returns [EObject current=null] : ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) ) ;
     public final EObject ruleXCatchClause() throws RecognitionException {
         EObject current = null;
 
@@ -20464,16 +20406,16 @@ public final EObject ruleXCatchClause() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7221:28: ( ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7222:1: ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7202:28: ( ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7203:1: ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7222:1: ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7222:2: ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7203:1: ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7203:2: ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7222:2: ( ( 'catch' )=>otherlv_0= 'catch' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7222:3: ( 'catch' )=>otherlv_0= 'catch'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7203:2: ( ( 'catch' )=>otherlv_0= 'catch' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7203:3: ( 'catch' )=>otherlv_0= 'catch'
             {
-            otherlv_0=(Token)match(input,106,FOLLOW_106_in_ruleXCatchClause16768); if (state.failed) return current;
+            otherlv_0=(Token)match(input,106,FOLLOW_106_in_ruleXCatchClause16730); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getXCatchClauseAccess().getCatchKeyword_0());
@@ -20482,24 +20424,24 @@ public final EObject ruleXCatchClause() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,24,FOLLOW_24_in_ruleXCatchClause16781); if (state.failed) return current;
+            otherlv_1=(Token)match(input,23,FOLLOW_23_in_ruleXCatchClause16743); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXCatchClauseAccess().getLeftParenthesisKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7231:1: ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7232:1: (lv_declaredParam_2_0= ruleFullJvmFormalParameter )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7212:1: ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7213:1: (lv_declaredParam_2_0= ruleFullJvmFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7232:1: (lv_declaredParam_2_0= ruleFullJvmFormalParameter )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7233:3: lv_declaredParam_2_0= ruleFullJvmFormalParameter
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7213:1: (lv_declaredParam_2_0= ruleFullJvmFormalParameter )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7214:3: lv_declaredParam_2_0= ruleFullJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXCatchClauseAccess().getDeclaredParamFullJvmFormalParameterParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleFullJvmFormalParameter_in_ruleXCatchClause16802);
+            pushFollow(FOLLOW_ruleFullJvmFormalParameter_in_ruleXCatchClause16764);
             lv_declaredParam_2_0=ruleFullJvmFormalParameter();
 
             state._fsp--;
@@ -20523,24 +20465,24 @@ public final EObject ruleXCatchClause() throws RecognitionException {
 
             }
 
-            otherlv_3=(Token)match(input,26,FOLLOW_26_in_ruleXCatchClause16814); if (state.failed) return current;
+            otherlv_3=(Token)match(input,25,FOLLOW_25_in_ruleXCatchClause16776); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_3, grammarAccess.getXCatchClauseAccess().getRightParenthesisKeyword_3());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7253:1: ( (lv_expression_4_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7254:1: (lv_expression_4_0= ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7234:1: ( (lv_expression_4_0= ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7235:1: (lv_expression_4_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7254:1: (lv_expression_4_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7255:3: lv_expression_4_0= ruleXExpression
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7235:1: (lv_expression_4_0= ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7236:3: lv_expression_4_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXCatchClauseAccess().getExpressionXExpressionParserRuleCall_4_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXCatchClause16835);
+            pushFollow(FOLLOW_ruleXExpression_in_ruleXCatchClause16797);
             lv_expression_4_0=ruleXExpression();
 
             state._fsp--;
@@ -20587,7 +20529,7 @@ public final EObject ruleXCatchClause() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleQualifiedName"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7279:1: entryRuleQualifiedName returns [String current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7260:1: entryRuleQualifiedName returns [String current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
     public final String entryRuleQualifiedName() throws RecognitionException {
         String current = null;
 
@@ -20595,13 +20537,13 @@ public final String entryRuleQualifiedName() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7280:2: (iv_ruleQualifiedName= ruleQualifiedName EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7281:2: iv_ruleQualifiedName= ruleQualifiedName EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7261:2: (iv_ruleQualifiedName= ruleQualifiedName EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7262:2: iv_ruleQualifiedName= ruleQualifiedName EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getQualifiedNameRule()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName16872);
+            pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName16834);
             iv_ruleQualifiedName=ruleQualifiedName();
 
             state._fsp--;
@@ -20609,7 +20551,7 @@ public final String entryRuleQualifiedName() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleQualifiedName.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedName16883); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedName16845); if (state.failed) return current;
 
             }
 
@@ -20627,7 +20569,7 @@ public final String entryRuleQualifiedName() throws RecognitionException {
 
 
     // $ANTLR start "ruleQualifiedName"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7288:1: ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7269:1: ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* ) ;
     public final AntlrDatatypeRuleToken ruleQualifiedName() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -20640,18 +20582,18 @@ public final AntlrDatatypeRuleToken ruleQualifiedName() throws RecognitionExcept
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7291:28: ( (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7292:1: (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7272:28: ( (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7273:1: (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7292:1: (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7293:5: this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )*
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7273:1: (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7274:5: this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getQualifiedNameAccess().getValidIDParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleValidID_in_ruleQualifiedName16930);
+            pushFollow(FOLLOW_ruleValidID_in_ruleQualifiedName16892);
             this_ValidID_0=ruleValidID();
 
             state._fsp--;
@@ -20666,20 +20608,20 @@ public final AntlrDatatypeRuleToken ruleQualifiedName() throws RecognitionExcept
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7303:1: ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )*
-            loop139:
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7284:1: ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )*
+            loop138:
             do {
-                int alt139=2;
-                int LA139_0 = input.LA(1);
+                int alt138=2;
+                int LA138_0 = input.LA(1);
 
-                if ( (LA139_0==81) ) {
-                    int LA139_2 = input.LA(2);
+                if ( (LA138_0==81) ) {
+                    int LA138_2 = input.LA(2);
 
-                    if ( (LA139_2==RULE_ID) ) {
-                        int LA139_3 = input.LA(3);
+                    if ( (LA138_2==RULE_ID) ) {
+                        int LA138_3 = input.LA(3);
 
                         if ( (synpred60_InternalCheck()) ) {
-                            alt139=1;
+                            alt138=1;
                         }
 
 
@@ -20689,14 +20631,14 @@ public final AntlrDatatypeRuleToken ruleQualifiedName() throws RecognitionExcept
                 }
 
 
-                switch (alt139) {
+                switch (alt138) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7303:2: ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7284:2: ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7303:2: ( ( '.' )=>kw= '.' )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7303:3: ( '.' )=>kw= '.'
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7284:2: ( ( '.' )=>kw= '.' )
+            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7284:3: ( '.' )=>kw= '.'
             	    {
-            	    kw=(Token)match(input,81,FOLLOW_81_in_ruleQualifiedName16958); if (state.failed) return current;
+            	    kw=(Token)match(input,81,FOLLOW_81_in_ruleQualifiedName16920); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	              current.merge(kw);
@@ -20711,7 +20653,7 @@ public final AntlrDatatypeRuleToken ruleQualifiedName() throws RecognitionExcept
             	              newCompositeNode(grammarAccess.getQualifiedNameAccess().getValidIDParserRuleCall_1_1()); 
             	          
             	    }
-            	    pushFollow(FOLLOW_ruleValidID_in_ruleQualifiedName16981);
+            	    pushFollow(FOLLOW_ruleValidID_in_ruleQualifiedName16943);
             	    this_ValidID_2=ruleValidID();
 
             	    state._fsp--;
@@ -20731,7 +20673,7 @@ public final AntlrDatatypeRuleToken ruleQualifiedName() throws RecognitionExcept
             	    break;
 
             	default :
-            	    break loop139;
+            	    break loop138;
                 }
             } while (true);
 
@@ -20758,7 +20700,7 @@ public final AntlrDatatypeRuleToken ruleQualifiedName() throws RecognitionExcept
 
 
     // $ANTLR start "entryRuleNumber"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7330:1: entryRuleNumber returns [String current=null] : iv_ruleNumber= ruleNumber EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7311:1: entryRuleNumber returns [String current=null] : iv_ruleNumber= ruleNumber EOF ;
     public final String entryRuleNumber() throws RecognitionException {
         String current = null;
 
@@ -20769,13 +20711,13 @@ public final String entryRuleNumber() throws RecognitionException {
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
         	
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7334:2: (iv_ruleNumber= ruleNumber EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7335:2: iv_ruleNumber= ruleNumber EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7315:2: (iv_ruleNumber= ruleNumber EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7316:2: iv_ruleNumber= ruleNumber EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getNumberRule()); 
             }
-            pushFollow(FOLLOW_ruleNumber_in_entryRuleNumber17035);
+            pushFollow(FOLLOW_ruleNumber_in_entryRuleNumber16997);
             iv_ruleNumber=ruleNumber();
 
             state._fsp--;
@@ -20783,7 +20725,7 @@ public final String entryRuleNumber() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleNumber.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNumber17046); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleNumber17008); if (state.failed) return current;
 
             }
 
@@ -20804,7 +20746,7 @@ public final String entryRuleNumber() throws RecognitionException {
 
 
     // $ANTLR start "ruleNumber"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7345:1: ruleNumber returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_HEX_0= RULE_HEX | ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? ) ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7326:1: ruleNumber returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_HEX_0= RULE_HEX | ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? ) ) ;
     public final AntlrDatatypeRuleToken ruleNumber() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -20819,31 +20761,31 @@ public final AntlrDatatypeRuleToken ruleNumber() throws RecognitionException {
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7349:28: ( (this_HEX_0= RULE_HEX | ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7350:1: (this_HEX_0= RULE_HEX | ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7330:28: ( (this_HEX_0= RULE_HEX | ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7331:1: (this_HEX_0= RULE_HEX | ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7350:1: (this_HEX_0= RULE_HEX | ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? ) )
-            int alt143=2;
-            int LA143_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7331:1: (this_HEX_0= RULE_HEX | ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? ) )
+            int alt142=2;
+            int LA142_0 = input.LA(1);
 
-            if ( (LA143_0==RULE_HEX) ) {
-                alt143=1;
+            if ( (LA142_0==RULE_HEX) ) {
+                alt142=1;
             }
-            else if ( ((LA143_0>=RULE_INT && LA143_0<=RULE_DECIMAL)) ) {
-                alt143=2;
+            else if ( ((LA142_0>=RULE_INT && LA142_0<=RULE_DECIMAL)) ) {
+                alt142=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 143, 0, input);
+                    new NoViableAltException("", 142, 0, input);
 
                 throw nvae;
             }
-            switch (alt143) {
+            switch (alt142) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7350:6: this_HEX_0= RULE_HEX
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7331:6: this_HEX_0= RULE_HEX
                     {
-                    this_HEX_0=(Token)match(input,RULE_HEX,FOLLOW_RULE_HEX_in_ruleNumber17090); if (state.failed) return current;
+                    this_HEX_0=(Token)match(input,RULE_HEX,FOLLOW_RULE_HEX_in_ruleNumber17052); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       		current.merge(this_HEX_0);
@@ -20858,33 +20800,33 @@ else if ( ((LA143_0>=RULE_INT && LA143_0<=RULE_DECIMAL)) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7358:6: ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7339:6: ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7358:6: ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7358:7: (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )?
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7339:6: ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7339:7: (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )?
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7358:7: (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL )
-                    int alt140=2;
-                    int LA140_0 = input.LA(1);
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7339:7: (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL )
+                    int alt139=2;
+                    int LA139_0 = input.LA(1);
 
-                    if ( (LA140_0==RULE_INT) ) {
-                        alt140=1;
+                    if ( (LA139_0==RULE_INT) ) {
+                        alt139=1;
                     }
-                    else if ( (LA140_0==RULE_DECIMAL) ) {
-                        alt140=2;
+                    else if ( (LA139_0==RULE_DECIMAL) ) {
+                        alt139=2;
                     }
                     else {
                         if (state.backtracking>0) {state.failed=true; return current;}
                         NoViableAltException nvae =
-                            new NoViableAltException("", 140, 0, input);
+                            new NoViableAltException("", 139, 0, input);
 
                         throw nvae;
                     }
-                    switch (alt140) {
+                    switch (alt139) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7358:12: this_INT_1= RULE_INT
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7339:12: this_INT_1= RULE_INT
                             {
-                            this_INT_1=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleNumber17118); if (state.failed) return current;
+                            this_INT_1=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleNumber17080); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                               		current.merge(this_INT_1);
@@ -20899,9 +20841,9 @@ else if ( (LA140_0==RULE_DECIMAL) ) {
                             }
                             break;
                         case 2 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7366:10: this_DECIMAL_2= RULE_DECIMAL
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7347:10: this_DECIMAL_2= RULE_DECIMAL
                             {
-                            this_DECIMAL_2=(Token)match(input,RULE_DECIMAL,FOLLOW_RULE_DECIMAL_in_ruleNumber17144); if (state.failed) return current;
+                            this_DECIMAL_2=(Token)match(input,RULE_DECIMAL,FOLLOW_RULE_DECIMAL_in_ruleNumber17106); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                               		current.merge(this_DECIMAL_2);
@@ -20918,50 +20860,50 @@ else if ( (LA140_0==RULE_DECIMAL) ) {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7373:2: (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )?
-                    int alt142=2;
-                    int LA142_0 = input.LA(1);
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7354:2: (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )?
+                    int alt141=2;
+                    int LA141_0 = input.LA(1);
 
-                    if ( (LA142_0==81) ) {
-                        int LA142_1 = input.LA(2);
+                    if ( (LA141_0==81) ) {
+                        int LA141_1 = input.LA(2);
 
-                        if ( ((LA142_1>=RULE_INT && LA142_1<=RULE_DECIMAL)) ) {
-                            alt142=1;
+                        if ( ((LA141_1>=RULE_INT && LA141_1<=RULE_DECIMAL)) ) {
+                            alt141=1;
                         }
                     }
-                    switch (alt142) {
+                    switch (alt141) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7374:2: kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7355:2: kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL )
                             {
-                            kw=(Token)match(input,81,FOLLOW_81_in_ruleNumber17164); if (state.failed) return current;
+                            kw=(Token)match(input,81,FOLLOW_81_in_ruleNumber17126); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       current.merge(kw);
                                       newLeafNode(kw, grammarAccess.getNumberAccess().getFullStopKeyword_1_1_0()); 
                                   
                             }
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7379:1: (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL )
-                            int alt141=2;
-                            int LA141_0 = input.LA(1);
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7360:1: (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL )
+                            int alt140=2;
+                            int LA140_0 = input.LA(1);
 
-                            if ( (LA141_0==RULE_INT) ) {
-                                alt141=1;
+                            if ( (LA140_0==RULE_INT) ) {
+                                alt140=1;
                             }
-                            else if ( (LA141_0==RULE_DECIMAL) ) {
-                                alt141=2;
+                            else if ( (LA140_0==RULE_DECIMAL) ) {
+                                alt140=2;
                             }
                             else {
                                 if (state.backtracking>0) {state.failed=true; return current;}
                                 NoViableAltException nvae =
-                                    new NoViableAltException("", 141, 0, input);
+                                    new NoViableAltException("", 140, 0, input);
 
                                 throw nvae;
                             }
-                            switch (alt141) {
+                            switch (alt140) {
                                 case 1 :
-                                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7379:6: this_INT_4= RULE_INT
+                                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7360:6: this_INT_4= RULE_INT
                                     {
-                                    this_INT_4=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleNumber17180); if (state.failed) return current;
+                                    this_INT_4=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleNumber17142); if (state.failed) return current;
                                     if ( state.backtracking==0 ) {
 
                                       		current.merge(this_INT_4);
@@ -20976,9 +20918,9 @@ else if ( (LA141_0==RULE_DECIMAL) ) {
                                     }
                                     break;
                                 case 2 :
-                                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7387:10: this_DECIMAL_5= RULE_DECIMAL
+                                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7368:10: this_DECIMAL_5= RULE_DECIMAL
                                     {
-                                    this_DECIMAL_5=(Token)match(input,RULE_DECIMAL,FOLLOW_RULE_DECIMAL_in_ruleNumber17206); if (state.failed) return current;
+                                    this_DECIMAL_5=(Token)match(input,RULE_DECIMAL,FOLLOW_RULE_DECIMAL_in_ruleNumber17168); if (state.failed) return current;
                                     if ( state.backtracking==0 ) {
 
                                       		current.merge(this_DECIMAL_5);
@@ -21033,7 +20975,7 @@ else if ( (LA141_0==RULE_DECIMAL) ) {
 
 
     // $ANTLR start "entryRuleJvmTypeReference"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7407:1: entryRuleJvmTypeReference returns [EObject current=null] : iv_ruleJvmTypeReference= ruleJvmTypeReference EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7388:1: entryRuleJvmTypeReference returns [EObject current=null] : iv_ruleJvmTypeReference= ruleJvmTypeReference EOF ;
     public final EObject entryRuleJvmTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -21041,13 +20983,13 @@ public final EObject entryRuleJvmTypeReference() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7408:2: (iv_ruleJvmTypeReference= ruleJvmTypeReference EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7409:2: iv_ruleJvmTypeReference= ruleJvmTypeReference EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7389:2: (iv_ruleJvmTypeReference= ruleJvmTypeReference EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7390:2: iv_ruleJvmTypeReference= ruleJvmTypeReference EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmTypeReferenceRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_entryRuleJvmTypeReference17261);
+            pushFollow(FOLLOW_ruleJvmTypeReference_in_entryRuleJvmTypeReference17223);
             iv_ruleJvmTypeReference=ruleJvmTypeReference();
 
             state._fsp--;
@@ -21055,7 +20997,7 @@ public final EObject entryRuleJvmTypeReference() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleJvmTypeReference; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmTypeReference17271); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmTypeReference17233); if (state.failed) return current;
 
             }
 
@@ -21073,7 +21015,7 @@ public final EObject entryRuleJvmTypeReference() throws RecognitionException {
 
 
     // $ANTLR start "ruleJvmTypeReference"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7416:1: ruleJvmTypeReference returns [EObject current=null] : ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7397:1: ruleJvmTypeReference returns [EObject current=null] : ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef ) ;
     public final EObject ruleJvmTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -21085,39 +21027,39 @@ public final EObject ruleJvmTypeReference() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7419:28: ( ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7420:1: ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7400:28: ( ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7401:1: ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7420:1: ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef )
-            int alt145=2;
-            int LA145_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7401:1: ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef )
+            int alt144=2;
+            int LA144_0 = input.LA(1);
 
-            if ( (LA145_0==RULE_ID) ) {
-                alt145=1;
+            if ( (LA144_0==RULE_ID) ) {
+                alt144=1;
             }
-            else if ( (LA145_0==24||LA145_0==68) ) {
-                alt145=2;
+            else if ( (LA144_0==23||LA144_0==68) ) {
+                alt144=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 145, 0, input);
+                    new NoViableAltException("", 144, 0, input);
 
                 throw nvae;
             }
-            switch (alt145) {
+            switch (alt144) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7420:2: (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7401:2: (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7420:2: (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7421:5: this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )*
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7401:2: (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7402:5: this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )*
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getJvmTypeReferenceAccess().getJvmParameterizedTypeReferenceParserRuleCall_0_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleJvmParameterizedTypeReference_in_ruleJvmTypeReference17319);
+                    pushFollow(FOLLOW_ruleJvmParameterizedTypeReference_in_ruleJvmTypeReference17281);
                     this_JvmParameterizedTypeReference_0=ruleJvmParameterizedTypeReference();
 
                     state._fsp--;
@@ -21128,20 +21070,20 @@ else if ( (LA145_0==24||LA145_0==68) ) {
                               afterParserOrEnumRuleCall();
                           
                     }
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7429:1: ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )*
-                    loop144:
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7410:1: ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )*
+                    loop143:
                     do {
-                        int alt144=2;
-                        int LA144_0 = input.LA(1);
+                        int alt143=2;
+                        int LA143_0 = input.LA(1);
 
-                        if ( (LA144_0==34) ) {
-                            int LA144_2 = input.LA(2);
+                        if ( (LA143_0==33) ) {
+                            int LA143_2 = input.LA(2);
 
-                            if ( (LA144_2==35) ) {
-                                int LA144_3 = input.LA(3);
+                            if ( (LA143_2==34) ) {
+                                int LA143_3 = input.LA(3);
 
                                 if ( (synpred61_InternalCheck()) ) {
-                                    alt144=1;
+                                    alt143=1;
                                 }
 
 
@@ -21151,15 +21093,15 @@ else if ( (LA145_0==24||LA145_0==68) ) {
                         }
 
 
-                        switch (alt144) {
+                        switch (alt143) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7429:2: ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7410:2: ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7430:24: ( () ruleArrayBrackets )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7430:25: () ruleArrayBrackets
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7411:24: ( () ruleArrayBrackets )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7411:25: () ruleArrayBrackets
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7430:25: ()
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7431:5: 
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7411:25: ()
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7412:5: 
                     	    {
                     	    if ( state.backtracking==0 ) {
 
@@ -21176,7 +21118,7 @@ else if ( (LA145_0==24||LA145_0==68) ) {
                     	              newCompositeNode(grammarAccess.getJvmTypeReferenceAccess().getArrayBracketsParserRuleCall_0_1_0_1()); 
                     	          
                     	    }
-                    	    pushFollow(FOLLOW_ruleArrayBrackets_in_ruleJvmTypeReference17355);
+                    	    pushFollow(FOLLOW_ruleArrayBrackets_in_ruleJvmTypeReference17317);
                     	    ruleArrayBrackets();
 
                     	    state._fsp--;
@@ -21194,7 +21136,7 @@ else if ( (LA145_0==24||LA145_0==68) ) {
                     	    break;
 
                     	default :
-                    	    break loop144;
+                    	    break loop143;
                         }
                     } while (true);
 
@@ -21205,14 +21147,14 @@ else if ( (LA145_0==24||LA145_0==68) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7446:5: this_XFunctionTypeRef_3= ruleXFunctionTypeRef
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7427:5: this_XFunctionTypeRef_3= ruleXFunctionTypeRef
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getJvmTypeReferenceAccess().getXFunctionTypeRefParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXFunctionTypeRef_in_ruleJvmTypeReference17386);
+                    pushFollow(FOLLOW_ruleXFunctionTypeRef_in_ruleJvmTypeReference17348);
                     this_XFunctionTypeRef_3=ruleXFunctionTypeRef();
 
                     state._fsp--;
@@ -21249,7 +21191,7 @@ else if ( (LA145_0==24||LA145_0==68) ) {
 
 
     // $ANTLR start "entryRuleArrayBrackets"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7462:1: entryRuleArrayBrackets returns [String current=null] : iv_ruleArrayBrackets= ruleArrayBrackets EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7443:1: entryRuleArrayBrackets returns [String current=null] : iv_ruleArrayBrackets= ruleArrayBrackets EOF ;
     public final String entryRuleArrayBrackets() throws RecognitionException {
         String current = null;
 
@@ -21257,13 +21199,13 @@ public final String entryRuleArrayBrackets() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7463:2: (iv_ruleArrayBrackets= ruleArrayBrackets EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7464:2: iv_ruleArrayBrackets= ruleArrayBrackets EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7444:2: (iv_ruleArrayBrackets= ruleArrayBrackets EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7445:2: iv_ruleArrayBrackets= ruleArrayBrackets EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getArrayBracketsRule()); 
             }
-            pushFollow(FOLLOW_ruleArrayBrackets_in_entryRuleArrayBrackets17422);
+            pushFollow(FOLLOW_ruleArrayBrackets_in_entryRuleArrayBrackets17384);
             iv_ruleArrayBrackets=ruleArrayBrackets();
 
             state._fsp--;
@@ -21271,7 +21213,7 @@ public final String entryRuleArrayBrackets() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleArrayBrackets.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleArrayBrackets17433); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleArrayBrackets17395); if (state.failed) return current;
 
             }
 
@@ -21289,7 +21231,7 @@ public final String entryRuleArrayBrackets() throws RecognitionException {
 
 
     // $ANTLR start "ruleArrayBrackets"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7471:1: ruleArrayBrackets returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '[' kw= ']' ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7452:1: ruleArrayBrackets returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '[' kw= ']' ) ;
     public final AntlrDatatypeRuleToken ruleArrayBrackets() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -21298,20 +21240,20 @@ public final AntlrDatatypeRuleToken ruleArrayBrackets() throws RecognitionExcept
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7474:28: ( (kw= '[' kw= ']' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7475:1: (kw= '[' kw= ']' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7455:28: ( (kw= '[' kw= ']' ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7456:1: (kw= '[' kw= ']' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7475:1: (kw= '[' kw= ']' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7476:2: kw= '[' kw= ']'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7456:1: (kw= '[' kw= ']' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7457:2: kw= '[' kw= ']'
             {
-            kw=(Token)match(input,34,FOLLOW_34_in_ruleArrayBrackets17471); if (state.failed) return current;
+            kw=(Token)match(input,33,FOLLOW_33_in_ruleArrayBrackets17433); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                       current.merge(kw);
                       newLeafNode(kw, grammarAccess.getArrayBracketsAccess().getLeftSquareBracketKeyword_0()); 
                   
             }
-            kw=(Token)match(input,35,FOLLOW_35_in_ruleArrayBrackets17484); if (state.failed) return current;
+            kw=(Token)match(input,34,FOLLOW_34_in_ruleArrayBrackets17446); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                       current.merge(kw);
@@ -21341,7 +21283,7 @@ public final AntlrDatatypeRuleToken ruleArrayBrackets() throws RecognitionExcept
 
 
     // $ANTLR start "entryRuleXFunctionTypeRef"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7495:1: entryRuleXFunctionTypeRef returns [EObject current=null] : iv_ruleXFunctionTypeRef= ruleXFunctionTypeRef EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7476:1: entryRuleXFunctionTypeRef returns [EObject current=null] : iv_ruleXFunctionTypeRef= ruleXFunctionTypeRef EOF ;
     public final EObject entryRuleXFunctionTypeRef() throws RecognitionException {
         EObject current = null;
 
@@ -21349,13 +21291,13 @@ public final EObject entryRuleXFunctionTypeRef() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7496:2: (iv_ruleXFunctionTypeRef= ruleXFunctionTypeRef EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7497:2: iv_ruleXFunctionTypeRef= ruleXFunctionTypeRef EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7477:2: (iv_ruleXFunctionTypeRef= ruleXFunctionTypeRef EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7478:2: iv_ruleXFunctionTypeRef= ruleXFunctionTypeRef EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXFunctionTypeRefRule()); 
             }
-            pushFollow(FOLLOW_ruleXFunctionTypeRef_in_entryRuleXFunctionTypeRef17524);
+            pushFollow(FOLLOW_ruleXFunctionTypeRef_in_entryRuleXFunctionTypeRef17486);
             iv_ruleXFunctionTypeRef=ruleXFunctionTypeRef();
 
             state._fsp--;
@@ -21363,7 +21305,7 @@ public final EObject entryRuleXFunctionTypeRef() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXFunctionTypeRef; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXFunctionTypeRef17534); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleXFunctionTypeRef17496); if (state.failed) return current;
 
             }
 
@@ -21381,7 +21323,7 @@ public final EObject entryRuleXFunctionTypeRef() throws RecognitionException {
 
 
     // $ANTLR start "ruleXFunctionTypeRef"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7504:1: ruleXFunctionTypeRef returns [EObject current=null] : ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7485:1: ruleXFunctionTypeRef returns [EObject current=null] : ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) ) ;
     public final EObject ruleXFunctionTypeRef() throws RecognitionException {
         EObject current = null;
 
@@ -21399,52 +21341,52 @@ public final EObject ruleXFunctionTypeRef() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7507:28: ( ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7508:1: ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7488:28: ( ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7489:1: ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7508:1: ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7508:2: (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7489:1: ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7489:2: (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7508:2: (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )?
-            int alt148=2;
-            int LA148_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7489:2: (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )?
+            int alt147=2;
+            int LA147_0 = input.LA(1);
 
-            if ( (LA148_0==24) ) {
-                alt148=1;
+            if ( (LA147_0==23) ) {
+                alt147=1;
             }
-            switch (alt148) {
+            switch (alt147) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7508:4: otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7489:4: otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')'
                     {
-                    otherlv_0=(Token)match(input,24,FOLLOW_24_in_ruleXFunctionTypeRef17572); if (state.failed) return current;
+                    otherlv_0=(Token)match(input,23,FOLLOW_23_in_ruleXFunctionTypeRef17534); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_0, grammarAccess.getXFunctionTypeRefAccess().getLeftParenthesisKeyword_0_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7512:1: ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )?
-                    int alt147=2;
-                    int LA147_0 = input.LA(1);
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7493:1: ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )?
+                    int alt146=2;
+                    int LA146_0 = input.LA(1);
 
-                    if ( (LA147_0==RULE_ID||LA147_0==24||LA147_0==68) ) {
-                        alt147=1;
+                    if ( (LA146_0==RULE_ID||LA146_0==23||LA146_0==68) ) {
+                        alt146=1;
                     }
-                    switch (alt147) {
+                    switch (alt146) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7512:2: ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )*
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7493:2: ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )*
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7512:2: ( (lv_paramTypes_1_0= ruleJvmTypeReference ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7513:1: (lv_paramTypes_1_0= ruleJvmTypeReference )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7493:2: ( (lv_paramTypes_1_0= ruleJvmTypeReference ) )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7494:1: (lv_paramTypes_1_0= ruleJvmTypeReference )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7513:1: (lv_paramTypes_1_0= ruleJvmTypeReference )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7514:3: lv_paramTypes_1_0= ruleJvmTypeReference
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7494:1: (lv_paramTypes_1_0= ruleJvmTypeReference )
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7495:3: lv_paramTypes_1_0= ruleJvmTypeReference
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXFunctionTypeRefAccess().getParamTypesJvmTypeReferenceParserRuleCall_0_1_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleXFunctionTypeRef17594);
+                            pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleXFunctionTypeRef17556);
                             lv_paramTypes_1_0=ruleJvmTypeReference();
 
                             state._fsp--;
@@ -21468,39 +21410,39 @@ public final EObject ruleXFunctionTypeRef() throws RecognitionException {
 
                             }
 
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7530:2: (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )*
-                            loop146:
+                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7511:2: (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )*
+                            loop145:
                             do {
-                                int alt146=2;
-                                int LA146_0 = input.LA(1);
+                                int alt145=2;
+                                int LA145_0 = input.LA(1);
 
-                                if ( (LA146_0==25) ) {
-                                    alt146=1;
+                                if ( (LA145_0==24) ) {
+                                    alt145=1;
                                 }
 
 
-                                switch (alt146) {
+                                switch (alt145) {
                             	case 1 :
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7530:4: otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) )
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7511:4: otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) )
                             	    {
-                            	    otherlv_2=(Token)match(input,25,FOLLOW_25_in_ruleXFunctionTypeRef17607); if (state.failed) return current;
+                            	    otherlv_2=(Token)match(input,24,FOLLOW_24_in_ruleXFunctionTypeRef17569); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	          	newLeafNode(otherlv_2, grammarAccess.getXFunctionTypeRefAccess().getCommaKeyword_0_1_1_0());
                             	          
                             	    }
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7534:1: ( (lv_paramTypes_3_0= ruleJvmTypeReference ) )
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7535:1: (lv_paramTypes_3_0= ruleJvmTypeReference )
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7515:1: ( (lv_paramTypes_3_0= ruleJvmTypeReference ) )
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7516:1: (lv_paramTypes_3_0= ruleJvmTypeReference )
                             	    {
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7535:1: (lv_paramTypes_3_0= ruleJvmTypeReference )
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7536:3: lv_paramTypes_3_0= ruleJvmTypeReference
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7516:1: (lv_paramTypes_3_0= ruleJvmTypeReference )
+                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7517:3: lv_paramTypes_3_0= ruleJvmTypeReference
                             	    {
                             	    if ( state.backtracking==0 ) {
                             	       
                             	      	        newCompositeNode(grammarAccess.getXFunctionTypeRefAccess().getParamTypesJvmTypeReferenceParserRuleCall_0_1_1_1_0()); 
                             	      	    
                             	    }
-                            	    pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleXFunctionTypeRef17628);
+                            	    pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleXFunctionTypeRef17590);
                             	    lv_paramTypes_3_0=ruleJvmTypeReference();
 
                             	    state._fsp--;
@@ -21529,7 +21471,7 @@ public final EObject ruleXFunctionTypeRef() throws RecognitionException {
                             	    break;
 
                             	default :
-                            	    break loop146;
+                            	    break loop145;
                                 }
                             } while (true);
 
@@ -21539,7 +21481,7 @@ public final EObject ruleXFunctionTypeRef() throws RecognitionException {
 
                     }
 
-                    otherlv_4=(Token)match(input,26,FOLLOW_26_in_ruleXFunctionTypeRef17644); if (state.failed) return current;
+                    otherlv_4=(Token)match(input,25,FOLLOW_25_in_ruleXFunctionTypeRef17606); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_4, grammarAccess.getXFunctionTypeRefAccess().getRightParenthesisKeyword_0_2());
@@ -21551,24 +21493,24 @@ public final EObject ruleXFunctionTypeRef() throws RecognitionException {
 
             }
 
-            otherlv_5=(Token)match(input,68,FOLLOW_68_in_ruleXFunctionTypeRef17658); if (state.failed) return current;
+            otherlv_5=(Token)match(input,68,FOLLOW_68_in_ruleXFunctionTypeRef17620); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_5, grammarAccess.getXFunctionTypeRefAccess().getEqualsSignGreaterThanSignKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7560:1: ( (lv_returnType_6_0= ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7561:1: (lv_returnType_6_0= ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7541:1: ( (lv_returnType_6_0= ruleJvmTypeReference ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7542:1: (lv_returnType_6_0= ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7561:1: (lv_returnType_6_0= ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7562:3: lv_returnType_6_0= ruleJvmTypeReference
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7542:1: (lv_returnType_6_0= ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7543:3: lv_returnType_6_0= ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXFunctionTypeRefAccess().getReturnTypeJvmTypeReferenceParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleXFunctionTypeRef17679);
+            pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleXFunctionTypeRef17641);
             lv_returnType_6_0=ruleJvmTypeReference();
 
             state._fsp--;
@@ -21615,7 +21557,7 @@ public final EObject ruleXFunctionTypeRef() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleJvmParameterizedTypeReference"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7586:1: entryRuleJvmParameterizedTypeReference returns [EObject current=null] : iv_ruleJvmParameterizedTypeReference= ruleJvmParameterizedTypeReference EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7567:1: entryRuleJvmParameterizedTypeReference returns [EObject current=null] : iv_ruleJvmParameterizedTypeReference= ruleJvmParameterizedTypeReference EOF ;
     public final EObject entryRuleJvmParameterizedTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -21623,13 +21565,13 @@ public final EObject entryRuleJvmParameterizedTypeReference() throws Recognition
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7587:2: (iv_ruleJvmParameterizedTypeReference= ruleJvmParameterizedTypeReference EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7588:2: iv_ruleJvmParameterizedTypeReference= ruleJvmParameterizedTypeReference EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7568:2: (iv_ruleJvmParameterizedTypeReference= ruleJvmParameterizedTypeReference EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7569:2: iv_ruleJvmParameterizedTypeReference= ruleJvmParameterizedTypeReference EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmParameterizedTypeReferenceRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmParameterizedTypeReference_in_entryRuleJvmParameterizedTypeReference17715);
+            pushFollow(FOLLOW_ruleJvmParameterizedTypeReference_in_entryRuleJvmParameterizedTypeReference17677);
             iv_ruleJvmParameterizedTypeReference=ruleJvmParameterizedTypeReference();
 
             state._fsp--;
@@ -21637,7 +21579,7 @@ public final EObject entryRuleJvmParameterizedTypeReference() throws Recognition
             if ( state.backtracking==0 ) {
                current =iv_ruleJvmParameterizedTypeReference; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmParameterizedTypeReference17725); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmParameterizedTypeReference17687); if (state.failed) return current;
 
             }
 
@@ -21655,7 +21597,7 @@ public final EObject entryRuleJvmParameterizedTypeReference() throws Recognition
 
 
     // $ANTLR start "ruleJvmParameterizedTypeReference"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7595:1: ruleJvmParameterizedTypeReference returns [EObject current=null] : ( ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )? ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7576:1: ruleJvmParameterizedTypeReference returns [EObject current=null] : ( ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )? ) ;
     public final EObject ruleJvmParameterizedTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -21678,17 +21620,17 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7598:28: ( ( ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )? ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7599:1: ( ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )? )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7579:28: ( ( ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )? ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7580:1: ( ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )? )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7599:1: ( ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )? )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7599:2: ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )?
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7580:1: ( ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )? )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7580:2: ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )?
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7599:2: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7600:1: ( ruleQualifiedName )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7580:2: ( ( ruleQualifiedName ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7581:1: ( ruleQualifiedName )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7600:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7601:3: ruleQualifiedName
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7581:1: ( ruleQualifiedName )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7582:3: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
 
@@ -21702,7 +21644,7 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
               	        newCompositeNode(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeJvmTypeCrossReference_0_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_ruleJvmParameterizedTypeReference17773);
+            pushFollow(FOLLOW_ruleQualifiedName_in_ruleJvmParameterizedTypeReference17735);
             ruleQualifiedName();
 
             state._fsp--;
@@ -21718,17 +21660,17 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7614:2: ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )?
-            int alt153=2;
-            alt153 = dfa153.predict(input);
-            switch (alt153) {
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7595:2: ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )?
+            int alt152=2;
+            alt152 = dfa152.predict(input);
+            switch (alt152) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7614:3: ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )*
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7595:3: ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )*
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7614:3: ( ( '<' )=>otherlv_1= '<' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7614:4: ( '<' )=>otherlv_1= '<'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7595:3: ( ( '<' )=>otherlv_1= '<' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7595:4: ( '<' )=>otherlv_1= '<'
                     {
-                    otherlv_1=(Token)match(input,56,FOLLOW_56_in_ruleJvmParameterizedTypeReference17794); if (state.failed) return current;
+                    otherlv_1=(Token)match(input,56,FOLLOW_56_in_ruleJvmParameterizedTypeReference17756); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_1, grammarAccess.getJvmParameterizedTypeReferenceAccess().getLessThanSignKeyword_1_0());
@@ -21737,18 +21679,18 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7619:2: ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7620:1: (lv_arguments_2_0= ruleJvmArgumentTypeReference )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7600:2: ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7601:1: (lv_arguments_2_0= ruleJvmArgumentTypeReference )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7620:1: (lv_arguments_2_0= ruleJvmArgumentTypeReference )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7621:3: lv_arguments_2_0= ruleJvmArgumentTypeReference
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7601:1: (lv_arguments_2_0= ruleJvmArgumentTypeReference )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7602:3: lv_arguments_2_0= ruleJvmArgumentTypeReference
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleJvmParameterizedTypeReference17816);
+                    pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleJvmParameterizedTypeReference17778);
                     lv_arguments_2_0=ruleJvmArgumentTypeReference();
 
                     state._fsp--;
@@ -21772,39 +21714,39 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7637:2: (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )*
-                    loop149:
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7618:2: (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )*
+                    loop148:
                     do {
-                        int alt149=2;
-                        int LA149_0 = input.LA(1);
+                        int alt148=2;
+                        int LA148_0 = input.LA(1);
 
-                        if ( (LA149_0==25) ) {
-                            alt149=1;
+                        if ( (LA148_0==24) ) {
+                            alt148=1;
                         }
 
 
-                        switch (alt149) {
+                        switch (alt148) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7637:4: otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7618:4: otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) )
                     	    {
-                    	    otherlv_3=(Token)match(input,25,FOLLOW_25_in_ruleJvmParameterizedTypeReference17829); if (state.failed) return current;
+                    	    otherlv_3=(Token)match(input,24,FOLLOW_24_in_ruleJvmParameterizedTypeReference17791); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_3, grammarAccess.getJvmParameterizedTypeReferenceAccess().getCommaKeyword_1_2_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7641:1: ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7642:1: (lv_arguments_4_0= ruleJvmArgumentTypeReference )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7622:1: ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7623:1: (lv_arguments_4_0= ruleJvmArgumentTypeReference )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7642:1: (lv_arguments_4_0= ruleJvmArgumentTypeReference )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7643:3: lv_arguments_4_0= ruleJvmArgumentTypeReference
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7623:1: (lv_arguments_4_0= ruleJvmArgumentTypeReference )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7624:3: lv_arguments_4_0= ruleJvmArgumentTypeReference
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_2_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleJvmParameterizedTypeReference17850);
+                    	    pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleJvmParameterizedTypeReference17812);
                     	    lv_arguments_4_0=ruleJvmArgumentTypeReference();
 
                     	    state._fsp--;
@@ -21833,30 +21775,30 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
                     	    break;
 
                     	default :
-                    	    break loop149;
+                    	    break loop148;
                         }
                     } while (true);
 
-                    otherlv_5=(Token)match(input,57,FOLLOW_57_in_ruleJvmParameterizedTypeReference17864); if (state.failed) return current;
+                    otherlv_5=(Token)match(input,57,FOLLOW_57_in_ruleJvmParameterizedTypeReference17826); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_5, grammarAccess.getJvmParameterizedTypeReferenceAccess().getGreaterThanSignKeyword_1_3());
                           
                     }
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7663:1: ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )*
-                    loop152:
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7644:1: ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )*
+                    loop151:
                     do {
-                        int alt152=2;
-                        int LA152_0 = input.LA(1);
+                        int alt151=2;
+                        int LA151_0 = input.LA(1);
 
-                        if ( (LA152_0==81) ) {
-                            int LA152_2 = input.LA(2);
+                        if ( (LA151_0==81) ) {
+                            int LA151_2 = input.LA(2);
 
-                            if ( (LA152_2==RULE_ID) ) {
-                                int LA152_3 = input.LA(3);
+                            if ( (LA151_2==RULE_ID) ) {
+                                int LA151_3 = input.LA(3);
 
                                 if ( (synpred63_InternalCheck()) ) {
-                                    alt152=1;
+                                    alt151=1;
                                 }
 
 
@@ -21866,18 +21808,18 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
                         }
 
 
-                        switch (alt152) {
+                        switch (alt151) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7663:2: ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )?
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7644:2: ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )?
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7663:2: ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7663:3: ( ( () '.' ) )=> ( () otherlv_7= '.' )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7644:2: ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7644:3: ( ( () '.' ) )=> ( () otherlv_7= '.' )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7665:5: ( () otherlv_7= '.' )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7665:6: () otherlv_7= '.'
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7646:5: ( () otherlv_7= '.' )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7646:6: () otherlv_7= '.'
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7665:6: ()
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7666:5: 
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7646:6: ()
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7647:5: 
                     	    {
                     	    if ( state.backtracking==0 ) {
 
@@ -21889,7 +21831,7 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
                     	    }
 
-                    	    otherlv_7=(Token)match(input,81,FOLLOW_81_in_ruleJvmParameterizedTypeReference17900); if (state.failed) return current;
+                    	    otherlv_7=(Token)match(input,81,FOLLOW_81_in_ruleJvmParameterizedTypeReference17862); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_7, grammarAccess.getJvmParameterizedTypeReferenceAccess().getFullStopKeyword_1_4_0_0_1());
@@ -21901,11 +21843,11 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
                     	    }
 
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7675:3: ( ( ruleValidID ) )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7676:1: ( ruleValidID )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7656:3: ( ( ruleValidID ) )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7657:1: ( ruleValidID )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7676:1: ( ruleValidID )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7677:3: ruleValidID
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7657:1: ( ruleValidID )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7658:3: ruleValidID
                     	    {
                     	    if ( state.backtracking==0 ) {
 
@@ -21919,7 +21861,7 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
                     	      	        newCompositeNode(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeJvmTypeCrossReference_1_4_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleValidID_in_ruleJvmParameterizedTypeReference17925);
+                    	    pushFollow(FOLLOW_ruleValidID_in_ruleJvmParameterizedTypeReference17887);
                     	    ruleValidID();
 
                     	    state._fsp--;
@@ -21935,17 +21877,17 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
                     	    }
 
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7690:2: ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )?
-                    	    int alt151=2;
-                    	    alt151 = dfa151.predict(input);
-                    	    switch (alt151) {
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7671:2: ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )?
+                    	    int alt150=2;
+                    	    alt150 = dfa150.predict(input);
+                    	    switch (alt150) {
                     	        case 1 :
-                    	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7690:3: ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>'
+                    	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7671:3: ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>'
                     	            {
-                    	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7690:3: ( ( '<' )=>otherlv_9= '<' )
-                    	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7690:4: ( '<' )=>otherlv_9= '<'
+                    	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7671:3: ( ( '<' )=>otherlv_9= '<' )
+                    	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7671:4: ( '<' )=>otherlv_9= '<'
                     	            {
-                    	            otherlv_9=(Token)match(input,56,FOLLOW_56_in_ruleJvmParameterizedTypeReference17946); if (state.failed) return current;
+                    	            otherlv_9=(Token)match(input,56,FOLLOW_56_in_ruleJvmParameterizedTypeReference17908); if (state.failed) return current;
                     	            if ( state.backtracking==0 ) {
 
                     	                  	newLeafNode(otherlv_9, grammarAccess.getJvmParameterizedTypeReferenceAccess().getLessThanSignKeyword_1_4_2_0());
@@ -21954,18 +21896,18 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
                     	            }
 
-                    	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7695:2: ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) )
-                    	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7696:1: (lv_arguments_10_0= ruleJvmArgumentTypeReference )
+                    	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7676:2: ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) )
+                    	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7677:1: (lv_arguments_10_0= ruleJvmArgumentTypeReference )
                     	            {
-                    	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7696:1: (lv_arguments_10_0= ruleJvmArgumentTypeReference )
-                    	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7697:3: lv_arguments_10_0= ruleJvmArgumentTypeReference
+                    	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7677:1: (lv_arguments_10_0= ruleJvmArgumentTypeReference )
+                    	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7678:3: lv_arguments_10_0= ruleJvmArgumentTypeReference
                     	            {
                     	            if ( state.backtracking==0 ) {
                     	               
                     	              	        newCompositeNode(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_4_2_1_0()); 
                     	              	    
                     	            }
-                    	            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleJvmParameterizedTypeReference17968);
+                    	            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleJvmParameterizedTypeReference17930);
                     	            lv_arguments_10_0=ruleJvmArgumentTypeReference();
 
                     	            state._fsp--;
@@ -21989,39 +21931,39 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
                     	            }
 
-                    	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7713:2: (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )*
-                    	            loop150:
+                    	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7694:2: (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )*
+                    	            loop149:
                     	            do {
-                    	                int alt150=2;
-                    	                int LA150_0 = input.LA(1);
+                    	                int alt149=2;
+                    	                int LA149_0 = input.LA(1);
 
-                    	                if ( (LA150_0==25) ) {
-                    	                    alt150=1;
+                    	                if ( (LA149_0==24) ) {
+                    	                    alt149=1;
                     	                }
 
 
-                    	                switch (alt150) {
+                    	                switch (alt149) {
                     	            	case 1 :
-                    	            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7713:4: otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) )
+                    	            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7694:4: otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) )
                     	            	    {
-                    	            	    otherlv_11=(Token)match(input,25,FOLLOW_25_in_ruleJvmParameterizedTypeReference17981); if (state.failed) return current;
+                    	            	    otherlv_11=(Token)match(input,24,FOLLOW_24_in_ruleJvmParameterizedTypeReference17943); if (state.failed) return current;
                     	            	    if ( state.backtracking==0 ) {
 
                     	            	          	newLeafNode(otherlv_11, grammarAccess.getJvmParameterizedTypeReferenceAccess().getCommaKeyword_1_4_2_2_0());
                     	            	          
                     	            	    }
-                    	            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7717:1: ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) )
-                    	            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7718:1: (lv_arguments_12_0= ruleJvmArgumentTypeReference )
+                    	            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7698:1: ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) )
+                    	            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7699:1: (lv_arguments_12_0= ruleJvmArgumentTypeReference )
                     	            	    {
-                    	            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7718:1: (lv_arguments_12_0= ruleJvmArgumentTypeReference )
-                    	            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7719:3: lv_arguments_12_0= ruleJvmArgumentTypeReference
+                    	            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7699:1: (lv_arguments_12_0= ruleJvmArgumentTypeReference )
+                    	            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7700:3: lv_arguments_12_0= ruleJvmArgumentTypeReference
                     	            	    {
                     	            	    if ( state.backtracking==0 ) {
                     	            	       
                     	            	      	        newCompositeNode(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_4_2_2_1_0()); 
                     	            	      	    
                     	            	    }
-                    	            	    pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleJvmParameterizedTypeReference18002);
+                    	            	    pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleJvmParameterizedTypeReference17964);
                     	            	    lv_arguments_12_0=ruleJvmArgumentTypeReference();
 
                     	            	    state._fsp--;
@@ -22050,11 +21992,11 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
                     	            	    break;
 
                     	            	default :
-                    	            	    break loop150;
+                    	            	    break loop149;
                     	                }
                     	            } while (true);
 
-                    	            otherlv_13=(Token)match(input,57,FOLLOW_57_in_ruleJvmParameterizedTypeReference18016); if (state.failed) return current;
+                    	            otherlv_13=(Token)match(input,57,FOLLOW_57_in_ruleJvmParameterizedTypeReference17978); if (state.failed) return current;
                     	            if ( state.backtracking==0 ) {
 
                     	                  	newLeafNode(otherlv_13, grammarAccess.getJvmParameterizedTypeReferenceAccess().getGreaterThanSignKeyword_1_4_2_3());
@@ -22071,7 +22013,7 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
                     	    break;
 
                     	default :
-                    	    break loop152;
+                    	    break loop151;
                         }
                     } while (true);
 
@@ -22104,7 +22046,7 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
 
     // $ANTLR start "entryRuleJvmArgumentTypeReference"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7747:1: entryRuleJvmArgumentTypeReference returns [EObject current=null] : iv_ruleJvmArgumentTypeReference= ruleJvmArgumentTypeReference EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7728:1: entryRuleJvmArgumentTypeReference returns [EObject current=null] : iv_ruleJvmArgumentTypeReference= ruleJvmArgumentTypeReference EOF ;
     public final EObject entryRuleJvmArgumentTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -22112,13 +22054,13 @@ public final EObject entryRuleJvmArgumentTypeReference() throws RecognitionExcep
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7748:2: (iv_ruleJvmArgumentTypeReference= ruleJvmArgumentTypeReference EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7749:2: iv_ruleJvmArgumentTypeReference= ruleJvmArgumentTypeReference EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7729:2: (iv_ruleJvmArgumentTypeReference= ruleJvmArgumentTypeReference EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7730:2: iv_ruleJvmArgumentTypeReference= ruleJvmArgumentTypeReference EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmArgumentTypeReferenceRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_entryRuleJvmArgumentTypeReference18058);
+            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_entryRuleJvmArgumentTypeReference18020);
             iv_ruleJvmArgumentTypeReference=ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -22126,7 +22068,7 @@ public final EObject entryRuleJvmArgumentTypeReference() throws RecognitionExcep
             if ( state.backtracking==0 ) {
                current =iv_ruleJvmArgumentTypeReference; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmArgumentTypeReference18068); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmArgumentTypeReference18030); if (state.failed) return current;
 
             }
 
@@ -22144,7 +22086,7 @@ public final EObject entryRuleJvmArgumentTypeReference() throws RecognitionExcep
 
 
     // $ANTLR start "ruleJvmArgumentTypeReference"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7756:1: ruleJvmArgumentTypeReference returns [EObject current=null] : (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7737:1: ruleJvmArgumentTypeReference returns [EObject current=null] : (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference ) ;
     public final EObject ruleJvmArgumentTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -22156,36 +22098,36 @@ public final EObject ruleJvmArgumentTypeReference() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7759:28: ( (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7760:1: (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7740:28: ( (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7741:1: (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7760:1: (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference )
-            int alt154=2;
-            int LA154_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7741:1: (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference )
+            int alt153=2;
+            int LA153_0 = input.LA(1);
 
-            if ( (LA154_0==RULE_ID||LA154_0==24||LA154_0==68) ) {
-                alt154=1;
+            if ( (LA153_0==RULE_ID||LA153_0==23||LA153_0==68) ) {
+                alt153=1;
             }
-            else if ( (LA154_0==107) ) {
-                alt154=2;
+            else if ( (LA153_0==107) ) {
+                alt153=2;
             }
             else {
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 154, 0, input);
+                    new NoViableAltException("", 153, 0, input);
 
                 throw nvae;
             }
-            switch (alt154) {
+            switch (alt153) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7761:5: this_JvmTypeReference_0= ruleJvmTypeReference
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7742:5: this_JvmTypeReference_0= ruleJvmTypeReference
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getJvmArgumentTypeReferenceAccess().getJvmTypeReferenceParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleJvmArgumentTypeReference18115);
+                    pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleJvmArgumentTypeReference18077);
                     this_JvmTypeReference_0=ruleJvmTypeReference();
 
                     state._fsp--;
@@ -22200,14 +22142,14 @@ else if ( (LA154_0==107) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7771:5: this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7752:5: this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getJvmArgumentTypeReferenceAccess().getJvmWildcardTypeReferenceParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleJvmWildcardTypeReference_in_ruleJvmArgumentTypeReference18142);
+                    pushFollow(FOLLOW_ruleJvmWildcardTypeReference_in_ruleJvmArgumentTypeReference18104);
                     this_JvmWildcardTypeReference_1=ruleJvmWildcardTypeReference();
 
                     state._fsp--;
@@ -22244,7 +22186,7 @@ else if ( (LA154_0==107) ) {
 
 
     // $ANTLR start "entryRuleJvmWildcardTypeReference"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7787:1: entryRuleJvmWildcardTypeReference returns [EObject current=null] : iv_ruleJvmWildcardTypeReference= ruleJvmWildcardTypeReference EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7768:1: entryRuleJvmWildcardTypeReference returns [EObject current=null] : iv_ruleJvmWildcardTypeReference= ruleJvmWildcardTypeReference EOF ;
     public final EObject entryRuleJvmWildcardTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -22252,13 +22194,13 @@ public final EObject entryRuleJvmWildcardTypeReference() throws RecognitionExcep
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7788:2: (iv_ruleJvmWildcardTypeReference= ruleJvmWildcardTypeReference EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7789:2: iv_ruleJvmWildcardTypeReference= ruleJvmWildcardTypeReference EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7769:2: (iv_ruleJvmWildcardTypeReference= ruleJvmWildcardTypeReference EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7770:2: iv_ruleJvmWildcardTypeReference= ruleJvmWildcardTypeReference EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmWildcardTypeReferenceRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmWildcardTypeReference_in_entryRuleJvmWildcardTypeReference18177);
+            pushFollow(FOLLOW_ruleJvmWildcardTypeReference_in_entryRuleJvmWildcardTypeReference18139);
             iv_ruleJvmWildcardTypeReference=ruleJvmWildcardTypeReference();
 
             state._fsp--;
@@ -22266,7 +22208,7 @@ public final EObject entryRuleJvmWildcardTypeReference() throws RecognitionExcep
             if ( state.backtracking==0 ) {
                current =iv_ruleJvmWildcardTypeReference; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmWildcardTypeReference18187); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmWildcardTypeReference18149); if (state.failed) return current;
 
             }
 
@@ -22284,7 +22226,7 @@ public final EObject entryRuleJvmWildcardTypeReference() throws RecognitionExcep
 
 
     // $ANTLR start "ruleJvmWildcardTypeReference"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7796:1: ruleJvmWildcardTypeReference returns [EObject current=null] : ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7777:1: ruleJvmWildcardTypeReference returns [EObject current=null] : ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? ) ;
     public final EObject ruleJvmWildcardTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -22301,14 +22243,14 @@ public final EObject ruleJvmWildcardTypeReference() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7799:28: ( ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7800:1: ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7780:28: ( ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7781:1: ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7800:1: ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7800:2: () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )?
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7781:1: ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7781:2: () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )?
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7800:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7801:5: 
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7781:2: ()
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7782:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -22320,41 +22262,41 @@ public final EObject ruleJvmWildcardTypeReference() throws RecognitionException
 
             }
 
-            otherlv_1=(Token)match(input,107,FOLLOW_107_in_ruleJvmWildcardTypeReference18233); if (state.failed) return current;
+            otherlv_1=(Token)match(input,107,FOLLOW_107_in_ruleJvmWildcardTypeReference18195); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getJvmWildcardTypeReferenceAccess().getQuestionMarkKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7810:1: ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )?
-            int alt157=3;
-            int LA157_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7791:1: ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )?
+            int alt156=3;
+            int LA156_0 = input.LA(1);
 
-            if ( (LA157_0==41) ) {
-                alt157=1;
+            if ( (LA156_0==40) ) {
+                alt156=1;
             }
-            else if ( (LA157_0==95) ) {
-                alt157=2;
+            else if ( (LA156_0==95) ) {
+                alt156=2;
             }
-            switch (alt157) {
+            switch (alt156) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7810:2: ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7791:2: ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7810:2: ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7810:3: ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )*
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7791:2: ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7791:3: ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )*
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7810:3: ( (lv_constraints_2_0= ruleJvmUpperBound ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7811:1: (lv_constraints_2_0= ruleJvmUpperBound )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7791:3: ( (lv_constraints_2_0= ruleJvmUpperBound ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7792:1: (lv_constraints_2_0= ruleJvmUpperBound )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7811:1: (lv_constraints_2_0= ruleJvmUpperBound )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7812:3: lv_constraints_2_0= ruleJvmUpperBound
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7792:1: (lv_constraints_2_0= ruleJvmUpperBound )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7793:3: lv_constraints_2_0= ruleJvmUpperBound
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmUpperBoundParserRuleCall_2_0_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleJvmUpperBound_in_ruleJvmWildcardTypeReference18256);
+                    pushFollow(FOLLOW_ruleJvmUpperBound_in_ruleJvmWildcardTypeReference18218);
                     lv_constraints_2_0=ruleJvmUpperBound();
 
                     state._fsp--;
@@ -22378,30 +22320,30 @@ else if ( (LA157_0==95) ) {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7828:2: ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )*
-                    loop155:
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7809:2: ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )*
+                    loop154:
                     do {
-                        int alt155=2;
-                        int LA155_0 = input.LA(1);
+                        int alt154=2;
+                        int LA154_0 = input.LA(1);
 
-                        if ( (LA155_0==108) ) {
-                            alt155=1;
+                        if ( (LA154_0==108) ) {
+                            alt154=1;
                         }
 
 
-                        switch (alt155) {
+                        switch (alt154) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7829:1: (lv_constraints_3_0= ruleJvmUpperBoundAnded )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7810:1: (lv_constraints_3_0= ruleJvmUpperBoundAnded )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7829:1: (lv_constraints_3_0= ruleJvmUpperBoundAnded )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7830:3: lv_constraints_3_0= ruleJvmUpperBoundAnded
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7810:1: (lv_constraints_3_0= ruleJvmUpperBoundAnded )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7811:3: lv_constraints_3_0= ruleJvmUpperBoundAnded
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmUpperBoundAndedParserRuleCall_2_0_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleJvmUpperBoundAnded_in_ruleJvmWildcardTypeReference18277);
+                    	    pushFollow(FOLLOW_ruleJvmUpperBoundAnded_in_ruleJvmWildcardTypeReference18239);
                     	    lv_constraints_3_0=ruleJvmUpperBoundAnded();
 
                     	    state._fsp--;
@@ -22427,7 +22369,7 @@ else if ( (LA157_0==95) ) {
                     	    break;
 
                     	default :
-                    	    break loop155;
+                    	    break loop154;
                         }
                     } while (true);
 
@@ -22438,23 +22380,23 @@ else if ( (LA157_0==95) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7847:6: ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7828:6: ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7847:6: ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7847:7: ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )*
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7828:6: ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7828:7: ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )*
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7847:7: ( (lv_constraints_4_0= ruleJvmLowerBound ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7848:1: (lv_constraints_4_0= ruleJvmLowerBound )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7828:7: ( (lv_constraints_4_0= ruleJvmLowerBound ) )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7829:1: (lv_constraints_4_0= ruleJvmLowerBound )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7848:1: (lv_constraints_4_0= ruleJvmLowerBound )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7849:3: lv_constraints_4_0= ruleJvmLowerBound
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7829:1: (lv_constraints_4_0= ruleJvmLowerBound )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7830:3: lv_constraints_4_0= ruleJvmLowerBound
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmLowerBoundParserRuleCall_2_1_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleJvmLowerBound_in_ruleJvmWildcardTypeReference18307);
+                    pushFollow(FOLLOW_ruleJvmLowerBound_in_ruleJvmWildcardTypeReference18269);
                     lv_constraints_4_0=ruleJvmLowerBound();
 
                     state._fsp--;
@@ -22478,30 +22420,30 @@ else if ( (LA157_0==95) ) {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7865:2: ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )*
-                    loop156:
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7846:2: ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )*
+                    loop155:
                     do {
-                        int alt156=2;
-                        int LA156_0 = input.LA(1);
+                        int alt155=2;
+                        int LA155_0 = input.LA(1);
 
-                        if ( (LA156_0==108) ) {
-                            alt156=1;
+                        if ( (LA155_0==108) ) {
+                            alt155=1;
                         }
 
 
-                        switch (alt156) {
+                        switch (alt155) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7866:1: (lv_constraints_5_0= ruleJvmLowerBoundAnded )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7847:1: (lv_constraints_5_0= ruleJvmLowerBoundAnded )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7866:1: (lv_constraints_5_0= ruleJvmLowerBoundAnded )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7867:3: lv_constraints_5_0= ruleJvmLowerBoundAnded
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7847:1: (lv_constraints_5_0= ruleJvmLowerBoundAnded )
+                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7848:3: lv_constraints_5_0= ruleJvmLowerBoundAnded
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmLowerBoundAndedParserRuleCall_2_1_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleJvmLowerBoundAnded_in_ruleJvmWildcardTypeReference18328);
+                    	    pushFollow(FOLLOW_ruleJvmLowerBoundAnded_in_ruleJvmWildcardTypeReference18290);
                     	    lv_constraints_5_0=ruleJvmLowerBoundAnded();
 
                     	    state._fsp--;
@@ -22527,7 +22469,7 @@ else if ( (LA157_0==95) ) {
                     	    break;
 
                     	default :
-                    	    break loop156;
+                    	    break loop155;
                         }
                     } while (true);
 
@@ -22563,7 +22505,7 @@ else if ( (LA157_0==95) ) {
 
 
     // $ANTLR start "entryRuleJvmUpperBound"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7891:1: entryRuleJvmUpperBound returns [EObject current=null] : iv_ruleJvmUpperBound= ruleJvmUpperBound EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7872:1: entryRuleJvmUpperBound returns [EObject current=null] : iv_ruleJvmUpperBound= ruleJvmUpperBound EOF ;
     public final EObject entryRuleJvmUpperBound() throws RecognitionException {
         EObject current = null;
 
@@ -22571,13 +22513,13 @@ public final EObject entryRuleJvmUpperBound() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7892:2: (iv_ruleJvmUpperBound= ruleJvmUpperBound EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7893:2: iv_ruleJvmUpperBound= ruleJvmUpperBound EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7873:2: (iv_ruleJvmUpperBound= ruleJvmUpperBound EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7874:2: iv_ruleJvmUpperBound= ruleJvmUpperBound EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmUpperBoundRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmUpperBound_in_entryRuleJvmUpperBound18368);
+            pushFollow(FOLLOW_ruleJvmUpperBound_in_entryRuleJvmUpperBound18330);
             iv_ruleJvmUpperBound=ruleJvmUpperBound();
 
             state._fsp--;
@@ -22585,7 +22527,7 @@ public final EObject entryRuleJvmUpperBound() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleJvmUpperBound; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmUpperBound18378); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmUpperBound18340); if (state.failed) return current;
 
             }
 
@@ -22603,7 +22545,7 @@ public final EObject entryRuleJvmUpperBound() throws RecognitionException {
 
 
     // $ANTLR start "ruleJvmUpperBound"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7900:1: ruleJvmUpperBound returns [EObject current=null] : (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7881:1: ruleJvmUpperBound returns [EObject current=null] : (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
     public final EObject ruleJvmUpperBound() throws RecognitionException {
         EObject current = null;
 
@@ -22614,30 +22556,30 @@ public final EObject ruleJvmUpperBound() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7903:28: ( (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7904:1: (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7884:28: ( (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7885:1: (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7904:1: (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7904:3: otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7885:1: (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7885:3: otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
             {
-            otherlv_0=(Token)match(input,41,FOLLOW_41_in_ruleJvmUpperBound18415); if (state.failed) return current;
+            otherlv_0=(Token)match(input,40,FOLLOW_40_in_ruleJvmUpperBound18377); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getJvmUpperBoundAccess().getExtendsKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7908:1: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7909:1: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7889:1: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7890:1: (lv_typeReference_1_0= ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7909:1: (lv_typeReference_1_0= ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7910:3: lv_typeReference_1_0= ruleJvmTypeReference
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7890:1: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7891:3: lv_typeReference_1_0= ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getJvmUpperBoundAccess().getTypeReferenceJvmTypeReferenceParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleJvmUpperBound18436);
+            pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleJvmUpperBound18398);
             lv_typeReference_1_0=ruleJvmTypeReference();
 
             state._fsp--;
@@ -22684,7 +22626,7 @@ public final EObject ruleJvmUpperBound() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleJvmUpperBoundAnded"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7934:1: entryRuleJvmUpperBoundAnded returns [EObject current=null] : iv_ruleJvmUpperBoundAnded= ruleJvmUpperBoundAnded EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7915:1: entryRuleJvmUpperBoundAnded returns [EObject current=null] : iv_ruleJvmUpperBoundAnded= ruleJvmUpperBoundAnded EOF ;
     public final EObject entryRuleJvmUpperBoundAnded() throws RecognitionException {
         EObject current = null;
 
@@ -22692,13 +22634,13 @@ public final EObject entryRuleJvmUpperBoundAnded() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7935:2: (iv_ruleJvmUpperBoundAnded= ruleJvmUpperBoundAnded EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7936:2: iv_ruleJvmUpperBoundAnded= ruleJvmUpperBoundAnded EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7916:2: (iv_ruleJvmUpperBoundAnded= ruleJvmUpperBoundAnded EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7917:2: iv_ruleJvmUpperBoundAnded= ruleJvmUpperBoundAnded EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmUpperBoundAndedRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmUpperBoundAnded_in_entryRuleJvmUpperBoundAnded18472);
+            pushFollow(FOLLOW_ruleJvmUpperBoundAnded_in_entryRuleJvmUpperBoundAnded18434);
             iv_ruleJvmUpperBoundAnded=ruleJvmUpperBoundAnded();
 
             state._fsp--;
@@ -22706,7 +22648,7 @@ public final EObject entryRuleJvmUpperBoundAnded() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleJvmUpperBoundAnded; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmUpperBoundAnded18482); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmUpperBoundAnded18444); if (state.failed) return current;
 
             }
 
@@ -22724,7 +22666,7 @@ public final EObject entryRuleJvmUpperBoundAnded() throws RecognitionException {
 
 
     // $ANTLR start "ruleJvmUpperBoundAnded"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7943:1: ruleJvmUpperBoundAnded returns [EObject current=null] : (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7924:1: ruleJvmUpperBoundAnded returns [EObject current=null] : (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
     public final EObject ruleJvmUpperBoundAnded() throws RecognitionException {
         EObject current = null;
 
@@ -22735,30 +22677,30 @@ public final EObject ruleJvmUpperBoundAnded() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7946:28: ( (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7947:1: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7927:28: ( (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7928:1: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7947:1: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7947:3: otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7928:1: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7928:3: otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
             {
-            otherlv_0=(Token)match(input,108,FOLLOW_108_in_ruleJvmUpperBoundAnded18519); if (state.failed) return current;
+            otherlv_0=(Token)match(input,108,FOLLOW_108_in_ruleJvmUpperBoundAnded18481); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getJvmUpperBoundAndedAccess().getAmpersandKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7951:1: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7952:1: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7932:1: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7933:1: (lv_typeReference_1_0= ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7952:1: (lv_typeReference_1_0= ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7953:3: lv_typeReference_1_0= ruleJvmTypeReference
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7933:1: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7934:3: lv_typeReference_1_0= ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getJvmUpperBoundAndedAccess().getTypeReferenceJvmTypeReferenceParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleJvmUpperBoundAnded18540);
+            pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleJvmUpperBoundAnded18502);
             lv_typeReference_1_0=ruleJvmTypeReference();
 
             state._fsp--;
@@ -22805,7 +22747,7 @@ public final EObject ruleJvmUpperBoundAnded() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleJvmLowerBound"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7977:1: entryRuleJvmLowerBound returns [EObject current=null] : iv_ruleJvmLowerBound= ruleJvmLowerBound EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7958:1: entryRuleJvmLowerBound returns [EObject current=null] : iv_ruleJvmLowerBound= ruleJvmLowerBound EOF ;
     public final EObject entryRuleJvmLowerBound() throws RecognitionException {
         EObject current = null;
 
@@ -22813,13 +22755,13 @@ public final EObject entryRuleJvmLowerBound() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7978:2: (iv_ruleJvmLowerBound= ruleJvmLowerBound EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7979:2: iv_ruleJvmLowerBound= ruleJvmLowerBound EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7959:2: (iv_ruleJvmLowerBound= ruleJvmLowerBound EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7960:2: iv_ruleJvmLowerBound= ruleJvmLowerBound EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmLowerBoundRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmLowerBound_in_entryRuleJvmLowerBound18576);
+            pushFollow(FOLLOW_ruleJvmLowerBound_in_entryRuleJvmLowerBound18538);
             iv_ruleJvmLowerBound=ruleJvmLowerBound();
 
             state._fsp--;
@@ -22827,7 +22769,7 @@ public final EObject entryRuleJvmLowerBound() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleJvmLowerBound; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmLowerBound18586); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmLowerBound18548); if (state.failed) return current;
 
             }
 
@@ -22845,7 +22787,7 @@ public final EObject entryRuleJvmLowerBound() throws RecognitionException {
 
 
     // $ANTLR start "ruleJvmLowerBound"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7986:1: ruleJvmLowerBound returns [EObject current=null] : (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7967:1: ruleJvmLowerBound returns [EObject current=null] : (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
     public final EObject ruleJvmLowerBound() throws RecognitionException {
         EObject current = null;
 
@@ -22856,30 +22798,30 @@ public final EObject ruleJvmLowerBound() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7989:28: ( (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7990:1: (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7970:28: ( (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7971:1: (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7990:1: (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7990:3: otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7971:1: (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7971:3: otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
             {
-            otherlv_0=(Token)match(input,95,FOLLOW_95_in_ruleJvmLowerBound18623); if (state.failed) return current;
+            otherlv_0=(Token)match(input,95,FOLLOW_95_in_ruleJvmLowerBound18585); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getJvmLowerBoundAccess().getSuperKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7994:1: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7995:1: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7975:1: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7976:1: (lv_typeReference_1_0= ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7995:1: (lv_typeReference_1_0= ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7996:3: lv_typeReference_1_0= ruleJvmTypeReference
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7976:1: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7977:3: lv_typeReference_1_0= ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getJvmLowerBoundAccess().getTypeReferenceJvmTypeReferenceParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleJvmLowerBound18644);
+            pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleJvmLowerBound18606);
             lv_typeReference_1_0=ruleJvmTypeReference();
 
             state._fsp--;
@@ -22926,7 +22868,7 @@ public final EObject ruleJvmLowerBound() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleJvmLowerBoundAnded"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8020:1: entryRuleJvmLowerBoundAnded returns [EObject current=null] : iv_ruleJvmLowerBoundAnded= ruleJvmLowerBoundAnded EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8001:1: entryRuleJvmLowerBoundAnded returns [EObject current=null] : iv_ruleJvmLowerBoundAnded= ruleJvmLowerBoundAnded EOF ;
     public final EObject entryRuleJvmLowerBoundAnded() throws RecognitionException {
         EObject current = null;
 
@@ -22934,13 +22876,13 @@ public final EObject entryRuleJvmLowerBoundAnded() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8021:2: (iv_ruleJvmLowerBoundAnded= ruleJvmLowerBoundAnded EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8022:2: iv_ruleJvmLowerBoundAnded= ruleJvmLowerBoundAnded EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8002:2: (iv_ruleJvmLowerBoundAnded= ruleJvmLowerBoundAnded EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8003:2: iv_ruleJvmLowerBoundAnded= ruleJvmLowerBoundAnded EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmLowerBoundAndedRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmLowerBoundAnded_in_entryRuleJvmLowerBoundAnded18680);
+            pushFollow(FOLLOW_ruleJvmLowerBoundAnded_in_entryRuleJvmLowerBoundAnded18642);
             iv_ruleJvmLowerBoundAnded=ruleJvmLowerBoundAnded();
 
             state._fsp--;
@@ -22948,7 +22890,7 @@ public final EObject entryRuleJvmLowerBoundAnded() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleJvmLowerBoundAnded; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmLowerBoundAnded18690); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmLowerBoundAnded18652); if (state.failed) return current;
 
             }
 
@@ -22966,7 +22908,7 @@ public final EObject entryRuleJvmLowerBoundAnded() throws RecognitionException {
 
 
     // $ANTLR start "ruleJvmLowerBoundAnded"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8029:1: ruleJvmLowerBoundAnded returns [EObject current=null] : (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8010:1: ruleJvmLowerBoundAnded returns [EObject current=null] : (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
     public final EObject ruleJvmLowerBoundAnded() throws RecognitionException {
         EObject current = null;
 
@@ -22977,30 +22919,30 @@ public final EObject ruleJvmLowerBoundAnded() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8032:28: ( (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8033:1: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8013:28: ( (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8014:1: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8033:1: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8033:3: otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8014:1: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8014:3: otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
             {
-            otherlv_0=(Token)match(input,108,FOLLOW_108_in_ruleJvmLowerBoundAnded18727); if (state.failed) return current;
+            otherlv_0=(Token)match(input,108,FOLLOW_108_in_ruleJvmLowerBoundAnded18689); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getJvmLowerBoundAndedAccess().getAmpersandKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8037:1: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8038:1: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8018:1: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8019:1: (lv_typeReference_1_0= ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8038:1: (lv_typeReference_1_0= ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8039:3: lv_typeReference_1_0= ruleJvmTypeReference
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8019:1: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8020:3: lv_typeReference_1_0= ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getJvmLowerBoundAndedAccess().getTypeReferenceJvmTypeReferenceParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleJvmLowerBoundAnded18748);
+            pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleJvmLowerBoundAnded18710);
             lv_typeReference_1_0=ruleJvmTypeReference();
 
             state._fsp--;
@@ -23047,7 +22989,7 @@ public final EObject ruleJvmLowerBoundAnded() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleQualifiedNameWithWildcard"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8065:1: entryRuleQualifiedNameWithWildcard returns [String current=null] : iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8046:1: entryRuleQualifiedNameWithWildcard returns [String current=null] : iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF ;
     public final String entryRuleQualifiedNameWithWildcard() throws RecognitionException {
         String current = null;
 
@@ -23055,13 +22997,13 @@ public final String entryRuleQualifiedNameWithWildcard() throws RecognitionExcep
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8066:2: (iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8067:2: iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8047:2: (iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8048:2: iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getQualifiedNameWithWildcardRule()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedNameWithWildcard_in_entryRuleQualifiedNameWithWildcard18787);
+            pushFollow(FOLLOW_ruleQualifiedNameWithWildcard_in_entryRuleQualifiedNameWithWildcard18749);
             iv_ruleQualifiedNameWithWildcard=ruleQualifiedNameWithWildcard();
 
             state._fsp--;
@@ -23069,7 +23011,7 @@ public final String entryRuleQualifiedNameWithWildcard() throws RecognitionExcep
             if ( state.backtracking==0 ) {
                current =iv_ruleQualifiedNameWithWildcard.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedNameWithWildcard18798); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedNameWithWildcard18760); if (state.failed) return current;
 
             }
 
@@ -23087,7 +23029,7 @@ public final String entryRuleQualifiedNameWithWildcard() throws RecognitionExcep
 
 
     // $ANTLR start "ruleQualifiedNameWithWildcard"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8074:1: ruleQualifiedNameWithWildcard returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8055:1: ruleQualifiedNameWithWildcard returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' ) ;
     public final AntlrDatatypeRuleToken ruleQualifiedNameWithWildcard() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -23098,18 +23040,18 @@ public final AntlrDatatypeRuleToken ruleQualifiedNameWithWildcard() throws Recog
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8077:28: ( (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8078:1: (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8058:28: ( (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8059:1: (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8078:1: (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8079:5: this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*'
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8059:1: (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8060:5: this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*'
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getQualifiedNameWithWildcardAccess().getQualifiedNameParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_ruleQualifiedNameWithWildcard18845);
+            pushFollow(FOLLOW_ruleQualifiedName_in_ruleQualifiedNameWithWildcard18807);
             this_QualifiedName_0=ruleQualifiedName();
 
             state._fsp--;
@@ -23124,14 +23066,14 @@ public final AntlrDatatypeRuleToken ruleQualifiedNameWithWildcard() throws Recog
                       afterParserOrEnumRuleCall();
                   
             }
-            kw=(Token)match(input,81,FOLLOW_81_in_ruleQualifiedNameWithWildcard18863); if (state.failed) return current;
+            kw=(Token)match(input,81,FOLLOW_81_in_ruleQualifiedNameWithWildcard18825); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                       current.merge(kw);
                       newLeafNode(kw, grammarAccess.getQualifiedNameWithWildcardAccess().getFullStopKeyword_1()); 
                   
             }
-            kw=(Token)match(input,73,FOLLOW_73_in_ruleQualifiedNameWithWildcard18876); if (state.failed) return current;
+            kw=(Token)match(input,73,FOLLOW_73_in_ruleQualifiedNameWithWildcard18838); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                       current.merge(kw);
@@ -23161,7 +23103,7 @@ public final AntlrDatatypeRuleToken ruleQualifiedNameWithWildcard() throws Recog
 
 
     // $ANTLR start "entryRuleValidID"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8109:1: entryRuleValidID returns [String current=null] : iv_ruleValidID= ruleValidID EOF ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8090:1: entryRuleValidID returns [String current=null] : iv_ruleValidID= ruleValidID EOF ;
     public final String entryRuleValidID() throws RecognitionException {
         String current = null;
 
@@ -23169,13 +23111,13 @@ public final String entryRuleValidID() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8110:2: (iv_ruleValidID= ruleValidID EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8111:2: iv_ruleValidID= ruleValidID EOF
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8091:2: (iv_ruleValidID= ruleValidID EOF )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8092:2: iv_ruleValidID= ruleValidID EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getValidIDRule()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_entryRuleValidID18917);
+            pushFollow(FOLLOW_ruleValidID_in_entryRuleValidID18879);
             iv_ruleValidID=ruleValidID();
 
             state._fsp--;
@@ -23183,7 +23125,7 @@ public final String entryRuleValidID() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleValidID.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleValidID18928); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleValidID18890); if (state.failed) return current;
 
             }
 
@@ -23201,7 +23143,7 @@ public final String entryRuleValidID() throws RecognitionException {
 
 
     // $ANTLR start "ruleValidID"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8118:1: ruleValidID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_ID_0= RULE_ID ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8099:1: ruleValidID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_ID_0= RULE_ID ;
     public final AntlrDatatypeRuleToken ruleValidID() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -23210,10 +23152,10 @@ public final AntlrDatatypeRuleToken ruleValidID() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8121:28: (this_ID_0= RULE_ID )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8122:5: this_ID_0= RULE_ID
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8102:28: (this_ID_0= RULE_ID )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8103:5: this_ID_0= RULE_ID
             {
-            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleValidID18967); if (state.failed) return current;
+            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleValidID18929); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               		current.merge(this_ID_0);
@@ -23244,7 +23186,7 @@ public final AntlrDatatypeRuleToken ruleValidID() throws RecognitionException {
 
 
     // $ANTLR start "ruleSeverityKind"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8139:1: ruleSeverityKind returns [Enumerator current=null] : ( (enumLiteral_0= 'error' ) | (enumLiteral_1= 'warning' ) | (enumLiteral_2= 'info' ) | (enumLiteral_3= 'ignore' ) ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8120:1: ruleSeverityKind returns [Enumerator current=null] : ( (enumLiteral_0= 'error' ) | (enumLiteral_1= 'warning' ) | (enumLiteral_2= 'info' ) | (enumLiteral_3= 'ignore' ) ) ;
     public final Enumerator ruleSeverityKind() throws RecognitionException {
         Enumerator current = null;
 
@@ -23255,48 +23197,48 @@ public final Enumerator ruleSeverityKind() throws RecognitionException {
 
          enterRule(); 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8141:28: ( ( (enumLiteral_0= 'error' ) | (enumLiteral_1= 'warning' ) | (enumLiteral_2= 'info' ) | (enumLiteral_3= 'ignore' ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8142:1: ( (enumLiteral_0= 'error' ) | (enumLiteral_1= 'warning' ) | (enumLiteral_2= 'info' ) | (enumLiteral_3= 'ignore' ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8122:28: ( ( (enumLiteral_0= 'error' ) | (enumLiteral_1= 'warning' ) | (enumLiteral_2= 'info' ) | (enumLiteral_3= 'ignore' ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8123:1: ( (enumLiteral_0= 'error' ) | (enumLiteral_1= 'warning' ) | (enumLiteral_2= 'info' ) | (enumLiteral_3= 'ignore' ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8142:1: ( (enumLiteral_0= 'error' ) | (enumLiteral_1= 'warning' ) | (enumLiteral_2= 'info' ) | (enumLiteral_3= 'ignore' ) )
-            int alt158=4;
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8123:1: ( (enumLiteral_0= 'error' ) | (enumLiteral_1= 'warning' ) | (enumLiteral_2= 'info' ) | (enumLiteral_3= 'ignore' ) )
+            int alt157=4;
             switch ( input.LA(1) ) {
             case 44:
                 {
-                alt158=1;
+                alt157=1;
                 }
                 break;
             case 45:
                 {
-                alt158=2;
+                alt157=2;
                 }
                 break;
             case 46:
                 {
-                alt158=3;
+                alt157=3;
                 }
                 break;
             case 47:
                 {
-                alt158=4;
+                alt157=4;
                 }
                 break;
             default:
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 158, 0, input);
+                    new NoViableAltException("", 157, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt158) {
+            switch (alt157) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8142:2: (enumLiteral_0= 'error' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8123:2: (enumLiteral_0= 'error' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8142:2: (enumLiteral_0= 'error' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8142:4: enumLiteral_0= 'error'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8123:2: (enumLiteral_0= 'error' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8123:4: enumLiteral_0= 'error'
                     {
-                    enumLiteral_0=(Token)match(input,44,FOLLOW_44_in_ruleSeverityKind19027); if (state.failed) return current;
+                    enumLiteral_0=(Token)match(input,44,FOLLOW_44_in_ruleSeverityKind18989); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current = grammarAccess.getSeverityKindAccess().getErrorEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
@@ -23310,12 +23252,12 @@ public final Enumerator ruleSeverityKind() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8148:6: (enumLiteral_1= 'warning' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8129:6: (enumLiteral_1= 'warning' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8148:6: (enumLiteral_1= 'warning' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8148:8: enumLiteral_1= 'warning'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8129:6: (enumLiteral_1= 'warning' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8129:8: enumLiteral_1= 'warning'
                     {
-                    enumLiteral_1=(Token)match(input,45,FOLLOW_45_in_ruleSeverityKind19044); if (state.failed) return current;
+                    enumLiteral_1=(Token)match(input,45,FOLLOW_45_in_ruleSeverityKind19006); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current = grammarAccess.getSeverityKindAccess().getWarningEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
@@ -23329,12 +23271,12 @@ public final Enumerator ruleSeverityKind() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8154:6: (enumLiteral_2= 'info' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8135:6: (enumLiteral_2= 'info' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8154:6: (enumLiteral_2= 'info' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8154:8: enumLiteral_2= 'info'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8135:6: (enumLiteral_2= 'info' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8135:8: enumLiteral_2= 'info'
                     {
-                    enumLiteral_2=(Token)match(input,46,FOLLOW_46_in_ruleSeverityKind19061); if (state.failed) return current;
+                    enumLiteral_2=(Token)match(input,46,FOLLOW_46_in_ruleSeverityKind19023); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current = grammarAccess.getSeverityKindAccess().getInfoEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
@@ -23348,12 +23290,12 @@ public final Enumerator ruleSeverityKind() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8160:6: (enumLiteral_3= 'ignore' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8141:6: (enumLiteral_3= 'ignore' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8160:6: (enumLiteral_3= 'ignore' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8160:8: enumLiteral_3= 'ignore'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8141:6: (enumLiteral_3= 'ignore' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8141:8: enumLiteral_3= 'ignore'
                     {
-                    enumLiteral_3=(Token)match(input,47,FOLLOW_47_in_ruleSeverityKind19078); if (state.failed) return current;
+                    enumLiteral_3=(Token)match(input,47,FOLLOW_47_in_ruleSeverityKind19040); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current = grammarAccess.getSeverityKindAccess().getIgnoreEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
@@ -23389,7 +23331,7 @@ public final Enumerator ruleSeverityKind() throws RecognitionException {
 
 
     // $ANTLR start "ruleTriggerKind"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8170:1: ruleTriggerKind returns [Enumerator current=null] : ( (enumLiteral_0= 'live' ) | (enumLiteral_1= 'onSave' ) | (enumLiteral_2= 'onDemand' ) ) ;
+    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8151:1: ruleTriggerKind returns [Enumerator current=null] : ( (enumLiteral_0= 'live' ) | (enumLiteral_1= 'onSave' ) | (enumLiteral_2= 'onDemand' ) ) ;
     public final Enumerator ruleTriggerKind() throws RecognitionException {
         Enumerator current = null;
 
@@ -23399,43 +23341,43 @@ public final Enumerator ruleTriggerKind() throws RecognitionException {
 
          enterRule(); 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8172:28: ( ( (enumLiteral_0= 'live' ) | (enumLiteral_1= 'onSave' ) | (enumLiteral_2= 'onDemand' ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8173:1: ( (enumLiteral_0= 'live' ) | (enumLiteral_1= 'onSave' ) | (enumLiteral_2= 'onDemand' ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8153:28: ( ( (enumLiteral_0= 'live' ) | (enumLiteral_1= 'onSave' ) | (enumLiteral_2= 'onDemand' ) ) )
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8154:1: ( (enumLiteral_0= 'live' ) | (enumLiteral_1= 'onSave' ) | (enumLiteral_2= 'onDemand' ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8173:1: ( (enumLiteral_0= 'live' ) | (enumLiteral_1= 'onSave' ) | (enumLiteral_2= 'onDemand' ) )
-            int alt159=3;
+            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8154:1: ( (enumLiteral_0= 'live' ) | (enumLiteral_1= 'onSave' ) | (enumLiteral_2= 'onDemand' ) )
+            int alt158=3;
             switch ( input.LA(1) ) {
             case 48:
                 {
-                alt159=1;
+                alt158=1;
                 }
                 break;
             case 49:
                 {
-                alt159=2;
+                alt158=2;
                 }
                 break;
             case 50:
                 {
-                alt159=3;
+                alt158=3;
                 }
                 break;
             default:
                 if (state.backtracking>0) {state.failed=true; return current;}
                 NoViableAltException nvae =
-                    new NoViableAltException("", 159, 0, input);
+                    new NoViableAltException("", 158, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt159) {
+            switch (alt158) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8173:2: (enumLiteral_0= 'live' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8154:2: (enumLiteral_0= 'live' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8173:2: (enumLiteral_0= 'live' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8173:4: enumLiteral_0= 'live'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8154:2: (enumLiteral_0= 'live' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8154:4: enumLiteral_0= 'live'
                     {
-                    enumLiteral_0=(Token)match(input,48,FOLLOW_48_in_ruleTriggerKind19123); if (state.failed) return current;
+                    enumLiteral_0=(Token)match(input,48,FOLLOW_48_in_ruleTriggerKind19085); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current = grammarAccess.getTriggerKindAccess().getFastEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
@@ -23449,12 +23391,12 @@ public final Enumerator ruleTriggerKind() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8179:6: (enumLiteral_1= 'onSave' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8160:6: (enumLiteral_1= 'onSave' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8179:6: (enumLiteral_1= 'onSave' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8179:8: enumLiteral_1= 'onSave'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8160:6: (enumLiteral_1= 'onSave' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8160:8: enumLiteral_1= 'onSave'
                     {
-                    enumLiteral_1=(Token)match(input,49,FOLLOW_49_in_ruleTriggerKind19140); if (state.failed) return current;
+                    enumLiteral_1=(Token)match(input,49,FOLLOW_49_in_ruleTriggerKind19102); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current = grammarAccess.getTriggerKindAccess().getNormalEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
@@ -23468,12 +23410,12 @@ public final Enumerator ruleTriggerKind() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8185:6: (enumLiteral_2= 'onDemand' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8166:6: (enumLiteral_2= 'onDemand' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8185:6: (enumLiteral_2= 'onDemand' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8185:8: enumLiteral_2= 'onDemand'
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8166:6: (enumLiteral_2= 'onDemand' )
+                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8166:8: enumLiteral_2= 'onDemand'
                     {
-                    enumLiteral_2=(Token)match(input,50,FOLLOW_50_in_ruleTriggerKind19157); if (state.failed) return current;
+                    enumLiteral_2=(Token)match(input,50,FOLLOW_50_in_ruleTriggerKind19119); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current = grammarAccess.getTriggerKindAccess().getExpensiveEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
@@ -23509,10 +23451,10 @@ public final Enumerator ruleTriggerKind() throws RecognitionException {
 
     // $ANTLR start synpred1_InternalCheck
     public final void synpred1_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:614:4: ( '(' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:614:6: '('
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:595:4: ( '(' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:595:6: '('
         {
-        match(input,24,FOLLOW_24_in_synpred1_InternalCheck1109); if (state.failed) return ;
+        match(input,23,FOLLOW_23_in_synpred1_InternalCheck1071); if (state.failed) return ;
 
         }
     }
@@ -23520,10 +23462,10 @@ public final void synpred1_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred2_InternalCheck
     public final void synpred2_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:685:7: ( '{' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:685:9: '{'
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:666:7: ( '{' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:666:9: '{'
         {
-        match(input,19,FOLLOW_19_in_synpred2_InternalCheck1243); if (state.failed) return ;
+        match(input,18,FOLLOW_18_in_synpred2_InternalCheck1205); if (state.failed) return ;
 
         }
     }
@@ -23531,13 +23473,13 @@ public final void synpred2_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred3_InternalCheck
     public final void synpred3_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1508:2: ( ( ruleQualifiedName ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1509:1: ( ruleQualifiedName )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1489:2: ( ( ruleQualifiedName ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1490:1: ( ruleQualifiedName )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1509:1: ( ruleQualifiedName )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1510:3: ruleQualifiedName
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1490:1: ( ruleQualifiedName )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1491:3: ruleQualifiedName
         {
-        pushFollow(FOLLOW_ruleQualifiedName_in_synpred3_InternalCheck3023);
+        pushFollow(FOLLOW_ruleQualifiedName_in_synpred3_InternalCheck2985);
         ruleQualifiedName();
 
         state._fsp--;
@@ -23552,10 +23494,10 @@ public final void synpred3_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred4_InternalCheck
     public final void synpred4_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1527:5: ( 'on' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1527:7: 'on'
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1508:5: ( 'on' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1508:7: 'on'
         {
-        match(input,38,FOLLOW_38_in_synpred4_InternalCheck3056); if (state.failed) return ;
+        match(input,37,FOLLOW_37_in_synpred4_InternalCheck3018); if (state.failed) return ;
 
         }
     }
@@ -23563,10 +23505,10 @@ public final void synpred4_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred5_InternalCheck
     public final void synpred5_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1532:5: ( '#' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1532:7: '#'
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1513:5: ( '#' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1513:7: '#'
         {
-        match(input,33,FOLLOW_33_in_synpred5_InternalCheck3079); if (state.failed) return ;
+        match(input,32,FOLLOW_32_in_synpred5_InternalCheck3041); if (state.failed) return ;
 
         }
     }
@@ -23574,10 +23516,10 @@ public final void synpred5_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred6_InternalCheck
     public final void synpred6_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1571:4: ( '#' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1571:6: '#'
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1552:4: ( '#' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1552:6: '#'
         {
-        match(input,33,FOLLOW_33_in_synpred6_InternalCheck3153); if (state.failed) return ;
+        match(input,32,FOLLOW_32_in_synpred6_InternalCheck3115); if (state.failed) return ;
 
         }
     }
@@ -23585,10 +23527,10 @@ public final void synpred6_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred7_InternalCheck
     public final void synpred7_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1591:8: ( '[' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1591:10: '['
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1572:8: ( '[' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1572:10: '['
         {
-        match(input,34,FOLLOW_34_in_synpred7_InternalCheck3202); if (state.failed) return ;
+        match(input,33,FOLLOW_33_in_synpred7_InternalCheck3164); if (state.failed) return ;
 
         }
     }
@@ -23596,10 +23538,10 @@ public final void synpred7_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred8_InternalCheck
     public final void synpred8_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1618:7: ( 'message' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1618:9: 'message'
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1599:7: ( 'message' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1599:9: 'message'
         {
-        match(input,27,FOLLOW_27_in_synpred8_InternalCheck3261); if (state.failed) return ;
+        match(input,26,FOLLOW_26_in_synpred8_InternalCheck3223); if (state.failed) return ;
 
         }
     }
@@ -23607,10 +23549,10 @@ public final void synpred8_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred9_InternalCheck
     public final void synpred9_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1641:6: ( 'bind' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1641:8: 'bind'
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1622:6: ( 'bind' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1622:8: 'bind'
         {
-        match(input,39,FOLLOW_39_in_synpred9_InternalCheck3306); if (state.failed) return ;
+        match(input,38,FOLLOW_38_in_synpred9_InternalCheck3268); if (state.failed) return ;
 
         }
     }
@@ -23618,10 +23560,10 @@ public final void synpred9_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred10_InternalCheck
     public final void synpred10_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1668:4: ( ',' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1668:6: ','
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1649:4: ( ',' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1649:6: ','
         {
-        match(input,25,FOLLOW_25_in_synpred10_InternalCheck3361); if (state.failed) return ;
+        match(input,24,FOLLOW_24_in_synpred10_InternalCheck3323); if (state.failed) return ;
 
         }
     }
@@ -23629,10 +23571,10 @@ public final void synpred10_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred11_InternalCheck
     public final void synpred11_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1695:5: ( 'data' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1695:7: 'data'
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1676:5: ( 'data' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1676:7: 'data'
         {
-        match(input,40,FOLLOW_40_in_synpred11_InternalCheck3420); if (state.failed) return ;
+        match(input,39,FOLLOW_39_in_synpred11_InternalCheck3382); if (state.failed) return ;
 
         }
     }
@@ -23640,10 +23582,10 @@ public final void synpred11_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred12_InternalCheck
     public final void synpred12_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1740:4: ( ',' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1740:6: ','
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1721:4: ( ',' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1721:6: ','
         {
-        match(input,25,FOLLOW_25_in_synpred12_InternalCheck3497); if (state.failed) return ;
+        match(input,24,FOLLOW_24_in_synpred12_InternalCheck3459); if (state.failed) return ;
 
         }
     }
@@ -23651,19 +23593,19 @@ public final void synpred12_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred13_InternalCheck
     public final void synpred13_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1818:7: ( ( () 'synchronized' '(' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1818:8: ( () 'synchronized' '(' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1799:7: ( ( () 'synchronized' '(' ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1799:8: ( () 'synchronized' '(' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1818:8: ( () 'synchronized' '(' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1818:9: () 'synchronized' '('
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1799:8: ( () 'synchronized' '(' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1799:9: () 'synchronized' '('
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1818:9: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1819:1: 
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1799:9: ()
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1800:1: 
         {
         }
 
-        match(input,105,FOLLOW_105_in_synpred13_InternalCheck3711); if (state.failed) return ;
-        match(input,24,FOLLOW_24_in_synpred13_InternalCheck3715); if (state.failed) return ;
+        match(input,105,FOLLOW_105_in_synpred13_InternalCheck3673); if (state.failed) return ;
+        match(input,23,FOLLOW_23_in_synpred13_InternalCheck3677); if (state.failed) return ;
 
         }
 
@@ -23674,26 +23616,26 @@ public final void synpred13_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred14_InternalCheck
     public final void synpred14_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1861:7: ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1861:8: ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1842:7: ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1842:8: ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1861:8: ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1861:9: () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':'
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1842:8: ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1842:9: () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':'
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1861:9: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1862:1: 
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1842:9: ()
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1843:1: 
         {
         }
 
-        match(input,16,FOLLOW_16_in_synpred14_InternalCheck3837); if (state.failed) return ;
-        match(input,24,FOLLOW_24_in_synpred14_InternalCheck3841); if (state.failed) return ;
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1864:1: ( ( ruleJvmFormalParameter ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1865:1: ( ruleJvmFormalParameter )
+        match(input,16,FOLLOW_16_in_synpred14_InternalCheck3799); if (state.failed) return ;
+        match(input,23,FOLLOW_23_in_synpred14_InternalCheck3803); if (state.failed) return ;
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1845:1: ( ( ruleJvmFormalParameter ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1846:1: ( ruleJvmFormalParameter )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1865:1: ( ruleJvmFormalParameter )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1866:1: ruleJvmFormalParameter
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1846:1: ( ruleJvmFormalParameter )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1847:1: ruleJvmFormalParameter
         {
-        pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred14_InternalCheck3848);
+        pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred14_InternalCheck3810);
         ruleJvmFormalParameter();
 
         state._fsp--;
@@ -23704,7 +23646,7 @@ public final void synpred14_InternalCheck_fragment() throws RecognitionException
 
         }
 
-        match(input,88,FOLLOW_88_in_synpred14_InternalCheck3854); if (state.failed) return ;
+        match(input,88,FOLLOW_88_in_synpred14_InternalCheck3816); if (state.failed) return ;
 
         }
 
@@ -23715,10 +23657,10 @@ public final void synpred14_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred15_InternalCheck
     public final void synpred15_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2186:4: ( '(' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2186:6: '('
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2167:4: ( '(' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2167:6: '('
         {
-        match(input,24,FOLLOW_24_in_synpred15_InternalCheck4728); if (state.failed) return ;
+        match(input,23,FOLLOW_23_in_synpred15_InternalCheck4690); if (state.failed) return ;
 
         }
     }
@@ -23726,19 +23668,19 @@ public final void synpred15_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred16_InternalCheck
     public final void synpred16_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2191:5: ( ( ( ( ruleValidID ) ) '=' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2191:6: ( ( ( ruleValidID ) ) '=' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2172:5: ( ( ( ( ruleValidID ) ) '=' ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2172:6: ( ( ( ruleValidID ) ) '=' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2191:6: ( ( ( ruleValidID ) ) '=' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2191:7: ( ( ruleValidID ) ) '='
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2172:6: ( ( ( ruleValidID ) ) '=' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2172:7: ( ( ruleValidID ) ) '='
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2191:7: ( ( ruleValidID ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2192:1: ( ruleValidID )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2172:7: ( ( ruleValidID ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2173:1: ( ruleValidID )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2192:1: ( ruleValidID )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2193:3: ruleValidID
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2173:1: ( ruleValidID )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2174:3: ruleValidID
         {
-        pushFollow(FOLLOW_ruleValidID_in_synpred16_InternalCheck4757);
+        pushFollow(FOLLOW_ruleValidID_in_synpred16_InternalCheck4719);
         ruleValidID();
 
         state._fsp--;
@@ -23749,7 +23691,7 @@ public final void synpred16_InternalCheck_fragment() throws RecognitionException
 
         }
 
-        match(input,32,FOLLOW_32_in_synpred16_InternalCheck4763); if (state.failed) return ;
+        match(input,31,FOLLOW_31_in_synpred16_InternalCheck4725); if (state.failed) return ;
 
         }
 
@@ -23760,19 +23702,19 @@ public final void synpred16_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred19_InternalCheck
     public final void synpred19_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2348:4: ( ( () '#' '[' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2348:5: ( () '#' '[' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2329:4: ( ( () '#' '[' ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2329:5: ( () '#' '[' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2348:5: ( () '#' '[' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2348:6: () '#' '['
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2329:5: ( () '#' '[' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2329:6: () '#' '['
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2348:6: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2349:1: 
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2329:6: ()
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2330:1: 
         {
         }
 
-        match(input,33,FOLLOW_33_in_synpred19_InternalCheck5119); if (state.failed) return ;
-        match(input,34,FOLLOW_34_in_synpred19_InternalCheck5123); if (state.failed) return ;
+        match(input,32,FOLLOW_32_in_synpred19_InternalCheck5081); if (state.failed) return ;
+        match(input,33,FOLLOW_33_in_synpred19_InternalCheck5085); if (state.failed) return ;
 
         }
 
@@ -23783,19 +23725,19 @@ public final void synpred19_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred20_InternalCheck
     public final void synpred20_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2468:4: ( ( () '#' '[' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2468:5: ( () '#' '[' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2449:4: ( ( () '#' '[' ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2449:5: ( () '#' '[' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2468:5: ( () '#' '[' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2468:6: () '#' '['
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2449:5: ( () '#' '[' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2449:6: () '#' '['
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2468:6: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2469:1: 
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2449:6: ()
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2450:1: 
         {
         }
 
-        match(input,33,FOLLOW_33_in_synpred20_InternalCheck5394); if (state.failed) return ;
-        match(input,34,FOLLOW_34_in_synpred20_InternalCheck5398); if (state.failed) return ;
+        match(input,32,FOLLOW_32_in_synpred20_InternalCheck5356); if (state.failed) return ;
+        match(input,33,FOLLOW_33_in_synpred20_InternalCheck5360); if (state.failed) return ;
 
         }
 
@@ -23806,24 +23748,24 @@ public final void synpred20_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred21_InternalCheck
     public final void synpred21_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2687:3: ( ( () ( ( ruleOpMultiAssign ) ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2687:4: ( () ( ( ruleOpMultiAssign ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2668:3: ( ( () ( ( ruleOpMultiAssign ) ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2668:4: ( () ( ( ruleOpMultiAssign ) ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2687:4: ( () ( ( ruleOpMultiAssign ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2687:5: () ( ( ruleOpMultiAssign ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2668:4: ( () ( ( ruleOpMultiAssign ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2668:5: () ( ( ruleOpMultiAssign ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2687:5: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2688:1: 
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2668:5: ()
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2669:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2688:2: ( ( ruleOpMultiAssign ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2689:1: ( ruleOpMultiAssign )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2669:2: ( ( ruleOpMultiAssign ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2670:1: ( ruleOpMultiAssign )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2689:1: ( ruleOpMultiAssign )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2690:3: ruleOpMultiAssign
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2670:1: ( ruleOpMultiAssign )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2671:3: ruleOpMultiAssign
         {
-        pushFollow(FOLLOW_ruleOpMultiAssign_in_synpred21_InternalCheck5931);
+        pushFollow(FOLLOW_ruleOpMultiAssign_in_synpred21_InternalCheck5893);
         ruleOpMultiAssign();
 
         state._fsp--;
@@ -23844,24 +23786,24 @@ public final void synpred21_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred22_InternalCheck
     public final void synpred22_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2881:3: ( ( () ( ( ruleOpOr ) ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2881:4: ( () ( ( ruleOpOr ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2862:3: ( ( () ( ( ruleOpOr ) ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2862:4: ( () ( ( ruleOpOr ) ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2881:4: ( () ( ( ruleOpOr ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2881:5: () ( ( ruleOpOr ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2862:4: ( () ( ( ruleOpOr ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2862:5: () ( ( ruleOpOr ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2881:5: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2882:1: 
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2862:5: ()
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2863:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2882:2: ( ( ruleOpOr ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2883:1: ( ruleOpOr )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2863:2: ( ( ruleOpOr ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2864:1: ( ruleOpOr )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2883:1: ( ruleOpOr )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2884:3: ruleOpOr
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2864:1: ( ruleOpOr )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2865:3: ruleOpOr
         {
-        pushFollow(FOLLOW_ruleOpOr_in_synpred22_InternalCheck6454);
+        pushFollow(FOLLOW_ruleOpOr_in_synpred22_InternalCheck6416);
         ruleOpOr();
 
         state._fsp--;
@@ -23882,24 +23824,24 @@ public final void synpred22_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred23_InternalCheck
     public final void synpred23_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2982:3: ( ( () ( ( ruleOpAnd ) ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2982:4: ( () ( ( ruleOpAnd ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2963:3: ( ( () ( ( ruleOpAnd ) ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2963:4: ( () ( ( ruleOpAnd ) ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2982:4: ( () ( ( ruleOpAnd ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2982:5: () ( ( ruleOpAnd ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2963:4: ( () ( ( ruleOpAnd ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2963:5: () ( ( ruleOpAnd ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2982:5: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2983:1: 
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2963:5: ()
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2964:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2983:2: ( ( ruleOpAnd ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2984:1: ( ruleOpAnd )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2964:2: ( ( ruleOpAnd ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2965:1: ( ruleOpAnd )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2984:1: ( ruleOpAnd )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2985:3: ruleOpAnd
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2965:1: ( ruleOpAnd )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2966:3: ruleOpAnd
         {
-        pushFollow(FOLLOW_ruleOpAnd_in_synpred23_InternalCheck6713);
+        pushFollow(FOLLOW_ruleOpAnd_in_synpred23_InternalCheck6675);
         ruleOpAnd();
 
         state._fsp--;
@@ -23920,24 +23862,24 @@ public final void synpred23_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred24_InternalCheck
     public final void synpred24_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3083:3: ( ( () ( ( ruleOpEquality ) ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3083:4: ( () ( ( ruleOpEquality ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3064:3: ( ( () ( ( ruleOpEquality ) ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3064:4: ( () ( ( ruleOpEquality ) ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3083:4: ( () ( ( ruleOpEquality ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3083:5: () ( ( ruleOpEquality ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3064:4: ( () ( ( ruleOpEquality ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3064:5: () ( ( ruleOpEquality ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3083:5: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3084:1: 
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3064:5: ()
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3065:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3084:2: ( ( ruleOpEquality ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3085:1: ( ruleOpEquality )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3065:2: ( ( ruleOpEquality ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3066:1: ( ruleOpEquality )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3085:1: ( ruleOpEquality )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3086:3: ruleOpEquality
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3066:1: ( ruleOpEquality )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3067:3: ruleOpEquality
         {
-        pushFollow(FOLLOW_ruleOpEquality_in_synpred24_InternalCheck6972);
+        pushFollow(FOLLOW_ruleOpEquality_in_synpred24_InternalCheck6934);
         ruleOpEquality();
 
         state._fsp--;
@@ -23958,18 +23900,18 @@ public final void synpred24_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred25_InternalCheck
     public final void synpred25_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3205:4: ( ( () 'instanceof' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3205:5: ( () 'instanceof' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3186:4: ( ( () 'instanceof' ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3186:5: ( () 'instanceof' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3205:5: ( () 'instanceof' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3205:6: () 'instanceof'
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3186:5: ( () 'instanceof' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3186:6: () 'instanceof'
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3205:6: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3206:1: 
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3186:6: ()
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3187:1: 
         {
         }
 
-        match(input,65,FOLLOW_65_in_synpred25_InternalCheck7286); if (state.failed) return ;
+        match(input,65,FOLLOW_65_in_synpred25_InternalCheck7248); if (state.failed) return ;
 
         }
 
@@ -23980,24 +23922,24 @@ public final void synpred25_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred26_InternalCheck
     public final void synpred26_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3236:8: ( ( () ( ( ruleOpCompare ) ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3236:9: ( () ( ( ruleOpCompare ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3217:8: ( ( () ( ( ruleOpCompare ) ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3217:9: ( () ( ( ruleOpCompare ) ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3236:9: ( () ( ( ruleOpCompare ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3236:10: () ( ( ruleOpCompare ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3217:9: ( () ( ( ruleOpCompare ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3217:10: () ( ( ruleOpCompare ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3236:10: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3237:1: 
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3217:10: ()
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3218:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3237:2: ( ( ruleOpCompare ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3238:1: ( ruleOpCompare )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3218:2: ( ( ruleOpCompare ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3219:1: ( ruleOpCompare )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3238:1: ( ruleOpCompare )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3239:3: ruleOpCompare
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3219:1: ( ruleOpCompare )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3220:3: ruleOpCompare
         {
-        pushFollow(FOLLOW_ruleOpCompare_in_synpred26_InternalCheck7357);
+        pushFollow(FOLLOW_ruleOpCompare_in_synpred26_InternalCheck7319);
         ruleOpCompare();
 
         state._fsp--;
@@ -24018,24 +23960,24 @@ public final void synpred26_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred27_InternalCheck
     public final void synpred27_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3364:3: ( ( () ( ( ruleOpOther ) ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3364:4: ( () ( ( ruleOpOther ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3345:3: ( ( () ( ( ruleOpOther ) ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3345:4: ( () ( ( ruleOpOther ) ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3364:4: ( () ( ( ruleOpOther ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3364:5: () ( ( ruleOpOther ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3345:4: ( () ( ( ruleOpOther ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3345:5: () ( ( ruleOpOther ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3364:5: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3365:1: 
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3345:5: ()
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3346:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3365:2: ( ( ruleOpOther ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3366:1: ( ruleOpOther )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3346:2: ( ( ruleOpOther ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3347:1: ( ruleOpOther )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3366:1: ( ruleOpOther )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3367:3: ruleOpOther
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3347:1: ( ruleOpOther )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3348:3: ruleOpOther
         {
-        pushFollow(FOLLOW_ruleOpOther_in_synpred27_InternalCheck7691);
+        pushFollow(FOLLOW_ruleOpOther_in_synpred27_InternalCheck7653);
         ruleOpOther();
 
         state._fsp--;
@@ -24056,14 +23998,14 @@ public final void synpred27_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred28_InternalCheck
     public final void synpred28_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3476:3: ( ( '>' '>' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3476:4: ( '>' '>' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3457:3: ( ( '>' '>' ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3457:4: ( '>' '>' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3476:4: ( '>' '>' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3477:2: '>' '>'
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3457:4: ( '>' '>' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3458:2: '>' '>'
         {
-        match(input,57,FOLLOW_57_in_synpred28_InternalCheck7960); if (state.failed) return ;
-        match(input,57,FOLLOW_57_in_synpred28_InternalCheck7965); if (state.failed) return ;
+        match(input,57,FOLLOW_57_in_synpred28_InternalCheck7922); if (state.failed) return ;
+        match(input,57,FOLLOW_57_in_synpred28_InternalCheck7927); if (state.failed) return ;
 
         }
 
@@ -24074,14 +24016,14 @@ public final void synpred28_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred29_InternalCheck
     public final void synpred29_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3506:3: ( ( '<' '<' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3506:4: ( '<' '<' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3487:3: ( ( '<' '<' ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3487:4: ( '<' '<' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3506:4: ( '<' '<' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3507:2: '<' '<'
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3487:4: ( '<' '<' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3488:2: '<' '<'
         {
-        match(input,56,FOLLOW_56_in_synpred29_InternalCheck8047); if (state.failed) return ;
-        match(input,56,FOLLOW_56_in_synpred29_InternalCheck8052); if (state.failed) return ;
+        match(input,56,FOLLOW_56_in_synpred29_InternalCheck8009); if (state.failed) return ;
+        match(input,56,FOLLOW_56_in_synpred29_InternalCheck8014); if (state.failed) return ;
 
         }
 
@@ -24092,24 +24034,24 @@ public final void synpred29_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred30_InternalCheck
     public final void synpred30_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3580:3: ( ( () ( ( ruleOpAdd ) ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3580:4: ( () ( ( ruleOpAdd ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3561:3: ( ( () ( ( ruleOpAdd ) ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3561:4: ( () ( ( ruleOpAdd ) ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3580:4: ( () ( ( ruleOpAdd ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3580:5: () ( ( ruleOpAdd ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3561:4: ( () ( ( ruleOpAdd ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3561:5: () ( ( ruleOpAdd ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3580:5: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3581:1: 
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3561:5: ()
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3562:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3581:2: ( ( ruleOpAdd ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3582:1: ( ruleOpAdd )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3562:2: ( ( ruleOpAdd ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3563:1: ( ruleOpAdd )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3582:1: ( ruleOpAdd )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3583:3: ruleOpAdd
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3563:1: ( ruleOpAdd )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3564:3: ruleOpAdd
         {
-        pushFollow(FOLLOW_ruleOpAdd_in_synpred30_InternalCheck8274);
+        pushFollow(FOLLOW_ruleOpAdd_in_synpred30_InternalCheck8236);
         ruleOpAdd();
 
         state._fsp--;
@@ -24130,24 +24072,24 @@ public final void synpred30_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred31_InternalCheck
     public final void synpred31_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3688:3: ( ( () ( ( ruleOpMulti ) ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3688:4: ( () ( ( ruleOpMulti ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3669:3: ( ( () ( ( ruleOpMulti ) ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3669:4: ( () ( ( ruleOpMulti ) ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3688:4: ( () ( ( ruleOpMulti ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3688:5: () ( ( ruleOpMulti ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3669:4: ( () ( ( ruleOpMulti ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3669:5: () ( ( ruleOpMulti ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3688:5: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3689:1: 
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3669:5: ()
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3670:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3689:2: ( ( ruleOpMulti ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3690:1: ( ruleOpMulti )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3670:2: ( ( ruleOpMulti ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3671:1: ( ruleOpMulti )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3690:1: ( ruleOpMulti )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3691:3: ruleOpMulti
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3671:1: ( ruleOpMulti )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3672:3: ruleOpMulti
         {
-        pushFollow(FOLLOW_ruleOpMulti_in_synpred31_InternalCheck8554);
+        pushFollow(FOLLOW_ruleOpMulti_in_synpred31_InternalCheck8516);
         ruleOpMulti();
 
         state._fsp--;
@@ -24168,18 +24110,18 @@ public final void synpred31_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred32_InternalCheck
     public final void synpred32_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3921:3: ( ( () 'as' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3921:4: ( () 'as' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3902:3: ( ( () 'as' ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3902:4: ( () 'as' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3921:4: ( () 'as' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3921:5: () 'as'
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3902:4: ( () 'as' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3902:5: () 'as'
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3921:5: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3922:1: 
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3902:5: ()
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3903:1: 
         {
         }
 
-        match(input,78,FOLLOW_78_in_synpred32_InternalCheck9148); if (state.failed) return ;
+        match(input,78,FOLLOW_78_in_synpred32_InternalCheck9110); if (state.failed) return ;
 
         }
 
@@ -24190,24 +24132,24 @@ public final void synpred32_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred33_InternalCheck
     public final void synpred33_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3981:2: ( ( () ( ( ruleOpPostfix ) ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3981:3: ( () ( ( ruleOpPostfix ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3962:2: ( ( () ( ( ruleOpPostfix ) ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3962:3: ( () ( ( ruleOpPostfix ) ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3981:3: ( () ( ( ruleOpPostfix ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3981:4: () ( ( ruleOpPostfix ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3962:3: ( () ( ( ruleOpPostfix ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3962:4: () ( ( ruleOpPostfix ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3981:4: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3982:1: 
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3962:4: ()
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3963:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3982:2: ( ( ruleOpPostfix ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3983:1: ( ruleOpPostfix )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3963:2: ( ( ruleOpPostfix ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3964:1: ( ruleOpPostfix )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3983:1: ( ruleOpPostfix )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3984:3: ruleOpPostfix
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3964:1: ( ruleOpPostfix )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3965:3: ruleOpPostfix
         {
-        pushFollow(FOLLOW_ruleOpPostfix_in_synpred33_InternalCheck9305);
+        pushFollow(FOLLOW_ruleOpPostfix_in_synpred33_InternalCheck9267);
         ruleOpPostfix();
 
         state._fsp--;
@@ -24228,52 +24170,52 @@ public final void synpred33_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred34_InternalCheck
     public final void synpred34_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4071:4: ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4071:5: ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4052:4: ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4052:5: ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4071:5: ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4071:6: () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4052:5: ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4052:6: () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4071:6: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4072:1: 
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4052:6: ()
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4053:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4072:2: ( '.' | ( ( '::' ) ) )
-        int alt160=2;
-        int LA160_0 = input.LA(1);
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4053:2: ( '.' | ( ( '::' ) ) )
+        int alt159=2;
+        int LA159_0 = input.LA(1);
 
-        if ( (LA160_0==81) ) {
-            alt160=1;
+        if ( (LA159_0==81) ) {
+            alt159=1;
         }
-        else if ( (LA160_0==82) ) {
-            alt160=2;
+        else if ( (LA159_0==82) ) {
+            alt159=2;
         }
         else {
             if (state.backtracking>0) {state.failed=true; return ;}
             NoViableAltException nvae =
-                new NoViableAltException("", 160, 0, input);
+                new NoViableAltException("", 159, 0, input);
 
             throw nvae;
         }
-        switch (alt160) {
+        switch (alt159) {
             case 1 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4072:4: '.'
+                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4053:4: '.'
                 {
-                match(input,81,FOLLOW_81_in_synpred34_InternalCheck9560); if (state.failed) return ;
+                match(input,81,FOLLOW_81_in_synpred34_InternalCheck9522); if (state.failed) return ;
 
                 }
                 break;
             case 2 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4074:6: ( ( '::' ) )
+                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4055:6: ( ( '::' ) )
                 {
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4074:6: ( ( '::' ) )
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4075:1: ( '::' )
+                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4055:6: ( ( '::' ) )
+                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4056:1: ( '::' )
                 {
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4075:1: ( '::' )
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4076:2: '::'
+                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4056:1: ( '::' )
+                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4057:2: '::'
                 {
-                match(input,82,FOLLOW_82_in_synpred34_InternalCheck9574); if (state.failed) return ;
+                match(input,82,FOLLOW_82_in_synpred34_InternalCheck9536); if (state.failed) return ;
 
                 }
 
@@ -24286,13 +24228,13 @@ else if ( (LA160_0==82) ) {
 
         }
 
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4080:3: ( ( ruleFeatureCallID ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4081:1: ( ruleFeatureCallID )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4061:3: ( ( ruleFeatureCallID ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4062:1: ( ruleFeatureCallID )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4081:1: ( ruleFeatureCallID )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4082:3: ruleFeatureCallID
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4062:1: ( ruleFeatureCallID )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4063:3: ruleFeatureCallID
         {
-        pushFollow(FOLLOW_ruleFeatureCallID_in_synpred34_InternalCheck9590);
+        pushFollow(FOLLOW_ruleFeatureCallID_in_synpred34_InternalCheck9552);
         ruleFeatureCallID();
 
         state._fsp--;
@@ -24303,7 +24245,7 @@ else if ( (LA160_0==82) ) {
 
         }
 
-        pushFollow(FOLLOW_ruleOpSingleAssign_in_synpred34_InternalCheck9596);
+        pushFollow(FOLLOW_ruleOpSingleAssign_in_synpred34_InternalCheck9558);
         ruleOpSingleAssign();
 
         state._fsp--;
@@ -24318,61 +24260,61 @@ else if ( (LA160_0==82) ) {
 
     // $ANTLR start synpred35_InternalCheck
     public final void synpred35_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4152:8: ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4152:9: ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4133:8: ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4133:9: ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4152:9: ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4152:10: () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4133:9: ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4133:10: () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4152:10: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4153:1: 
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4133:10: ()
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4134:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4153:2: ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) )
-        int alt161=3;
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4134:2: ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) )
+        int alt160=3;
         switch ( input.LA(1) ) {
         case 81:
             {
-            alt161=1;
+            alt160=1;
             }
             break;
         case 83:
             {
-            alt161=2;
+            alt160=2;
             }
             break;
         case 82:
             {
-            alt161=3;
+            alt160=3;
             }
             break;
         default:
             if (state.backtracking>0) {state.failed=true; return ;}
             NoViableAltException nvae =
-                new NoViableAltException("", 161, 0, input);
+                new NoViableAltException("", 160, 0, input);
 
             throw nvae;
         }
 
-        switch (alt161) {
+        switch (alt160) {
             case 1 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4153:4: '.'
+                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4134:4: '.'
                 {
-                match(input,81,FOLLOW_81_in_synpred35_InternalCheck9738); if (state.failed) return ;
+                match(input,81,FOLLOW_81_in_synpred35_InternalCheck9700); if (state.failed) return ;
 
                 }
                 break;
             case 2 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4155:6: ( ( '?.' ) )
+                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4136:6: ( ( '?.' ) )
                 {
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4155:6: ( ( '?.' ) )
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4156:1: ( '?.' )
+                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4136:6: ( ( '?.' ) )
+                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4137:1: ( '?.' )
                 {
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4156:1: ( '?.' )
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4157:2: '?.'
+                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4137:1: ( '?.' )
+                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4138:2: '?.'
                 {
-                match(input,83,FOLLOW_83_in_synpred35_InternalCheck9752); if (state.failed) return ;
+                match(input,83,FOLLOW_83_in_synpred35_InternalCheck9714); if (state.failed) return ;
 
                 }
 
@@ -24383,15 +24325,15 @@ public final void synpred35_InternalCheck_fragment() throws RecognitionException
                 }
                 break;
             case 3 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4162:6: ( ( '::' ) )
+                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4143:6: ( ( '::' ) )
                 {
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4162:6: ( ( '::' ) )
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4163:1: ( '::' )
+                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4143:6: ( ( '::' ) )
+                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4144:1: ( '::' )
                 {
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4163:1: ( '::' )
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4164:2: '::'
+                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4144:1: ( '::' )
+                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4145:2: '::'
                 {
-                match(input,82,FOLLOW_82_in_synpred35_InternalCheck9772); if (state.failed) return ;
+                match(input,82,FOLLOW_82_in_synpred35_InternalCheck9734); if (state.failed) return ;
 
                 }
 
@@ -24414,13 +24356,13 @@ public final void synpred35_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred36_InternalCheck
     public final void synpred36_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4273:4: ( ( '(' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4274:1: ( '(' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4254:4: ( ( '(' ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4255:1: ( '(' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4274:1: ( '(' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4275:2: '('
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4255:1: ( '(' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4256:2: '('
         {
-        match(input,24,FOLLOW_24_in_synpred36_InternalCheck9999); if (state.failed) return ;
+        match(input,23,FOLLOW_23_in_synpred36_InternalCheck9961); if (state.failed) return ;
 
         }
 
@@ -24431,35 +24373,35 @@ public final void synpred36_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred37_InternalCheck
     public final void synpred37_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4294:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4294:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4275:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4275:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4294:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4294:6: () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4275:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4275:6: () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4294:6: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4295:1: 
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4275:6: ()
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4276:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4295:2: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
-        int alt163=2;
-        int LA163_0 = input.LA(1);
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4276:2: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
+        int alt162=2;
+        int LA162_0 = input.LA(1);
 
-        if ( (LA163_0==RULE_ID||LA163_0==24||LA163_0==68) ) {
-            alt163=1;
+        if ( (LA162_0==RULE_ID||LA162_0==23||LA162_0==68) ) {
+            alt162=1;
         }
-        switch (alt163) {
+        switch (alt162) {
             case 1 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4295:3: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4276:3: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
                 {
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4295:3: ( ( ruleJvmFormalParameter ) )
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4296:1: ( ruleJvmFormalParameter )
+                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4276:3: ( ( ruleJvmFormalParameter ) )
+                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4277:1: ( ruleJvmFormalParameter )
                 {
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4296:1: ( ruleJvmFormalParameter )
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4297:1: ruleJvmFormalParameter
+                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4277:1: ( ruleJvmFormalParameter )
+                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4278:1: ruleJvmFormalParameter
                 {
-                pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred37_InternalCheck10051);
+                pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred37_InternalCheck10013);
                 ruleJvmFormalParameter();
 
                 state._fsp--;
@@ -24470,29 +24412,29 @@ public final void synpred37_InternalCheck_fragment() throws RecognitionException
 
                 }
 
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4299:2: ( ',' ( ( ruleJvmFormalParameter ) ) )*
-                loop162:
+                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4280:2: ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                loop161:
                 do {
-                    int alt162=2;
-                    int LA162_0 = input.LA(1);
+                    int alt161=2;
+                    int LA161_0 = input.LA(1);
 
-                    if ( (LA162_0==25) ) {
-                        alt162=1;
+                    if ( (LA161_0==24) ) {
+                        alt161=1;
                     }
 
 
-                    switch (alt162) {
+                    switch (alt161) {
                 	case 1 :
-                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4299:4: ',' ( ( ruleJvmFormalParameter ) )
+                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4280:4: ',' ( ( ruleJvmFormalParameter ) )
                 	    {
-                	    match(input,25,FOLLOW_25_in_synpred37_InternalCheck10058); if (state.failed) return ;
-                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4300:1: ( ( ruleJvmFormalParameter ) )
-                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4301:1: ( ruleJvmFormalParameter )
+                	    match(input,24,FOLLOW_24_in_synpred37_InternalCheck10020); if (state.failed) return ;
+                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4281:1: ( ( ruleJvmFormalParameter ) )
+                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4282:1: ( ruleJvmFormalParameter )
                 	    {
-                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4301:1: ( ruleJvmFormalParameter )
-                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4302:1: ruleJvmFormalParameter
+                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4282:1: ( ruleJvmFormalParameter )
+                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4283:1: ruleJvmFormalParameter
                 	    {
-                	    pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred37_InternalCheck10065);
+                	    pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred37_InternalCheck10027);
                 	    ruleJvmFormalParameter();
 
                 	    state._fsp--;
@@ -24508,7 +24450,7 @@ public final void synpred37_InternalCheck_fragment() throws RecognitionException
                 	    break;
 
                 	default :
-                	    break loop162;
+                	    break loop161;
                     }
                 } while (true);
 
@@ -24518,13 +24460,13 @@ public final void synpred37_InternalCheck_fragment() throws RecognitionException
 
         }
 
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4304:6: ( ( '|' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4305:1: ( '|' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4285:6: ( ( '|' ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4286:1: ( '|' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4305:1: ( '|' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4306:2: '|'
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4286:1: ( '|' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4287:2: '|'
         {
-        match(input,84,FOLLOW_84_in_synpred37_InternalCheck10079); if (state.failed) return ;
+        match(input,84,FOLLOW_84_in_synpred37_InternalCheck10041); if (state.failed) return ;
 
         }
 
@@ -24541,18 +24483,18 @@ public final void synpred37_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred38_InternalCheck
     public final void synpred38_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4373:4: ( ( () '[' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4373:5: ( () '[' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4354:4: ( ( () '[' ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4354:5: ( () '[' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4373:5: ( () '[' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4373:6: () '['
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4354:5: ( () '[' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4354:6: () '['
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4373:6: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4374:1: 
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4354:6: ()
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4355:1: 
         {
         }
 
-        match(input,34,FOLLOW_34_in_synpred38_InternalCheck10199); if (state.failed) return ;
+        match(input,33,FOLLOW_33_in_synpred38_InternalCheck10161); if (state.failed) return ;
 
         }
 
@@ -24563,18 +24505,18 @@ public final void synpred38_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred39_InternalCheck
     public final void synpred39_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4424:7: ( ( () '[' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4424:8: ( () '[' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4405:7: ( ( () '[' ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4405:8: ( () '[' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4424:8: ( () '[' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4424:9: () '['
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4405:8: ( () '[' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4405:9: () '['
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4424:9: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4425:1: 
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4405:9: ()
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4406:1: 
         {
         }
 
-        match(input,34,FOLLOW_34_in_synpred39_InternalCheck10334); if (state.failed) return ;
+        match(input,33,FOLLOW_33_in_synpred39_InternalCheck10296); if (state.failed) return ;
 
         }
 
@@ -24585,30 +24527,30 @@ public final void synpred39_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred41_InternalCheck
     public final void synpred41_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4716:4: ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4716:5: ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4697:4: ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4697:5: ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4716:5: ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4716:6: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4697:5: ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4697:6: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4716:6: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
-        int alt165=2;
-        int LA165_0 = input.LA(1);
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4697:6: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
+        int alt164=2;
+        int LA164_0 = input.LA(1);
 
-        if ( (LA165_0==RULE_ID||LA165_0==24||LA165_0==68) ) {
-            alt165=1;
+        if ( (LA164_0==RULE_ID||LA164_0==23||LA164_0==68) ) {
+            alt164=1;
         }
-        switch (alt165) {
+        switch (alt164) {
             case 1 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4716:7: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4697:7: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
                 {
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4716:7: ( ( ruleJvmFormalParameter ) )
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4717:1: ( ruleJvmFormalParameter )
+                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4697:7: ( ( ruleJvmFormalParameter ) )
+                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4698:1: ( ruleJvmFormalParameter )
                 {
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4717:1: ( ruleJvmFormalParameter )
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4718:1: ruleJvmFormalParameter
+                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4698:1: ( ruleJvmFormalParameter )
+                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4699:1: ruleJvmFormalParameter
                 {
-                pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred41_InternalCheck11084);
+                pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred41_InternalCheck11046);
                 ruleJvmFormalParameter();
 
                 state._fsp--;
@@ -24619,29 +24561,29 @@ public final void synpred41_InternalCheck_fragment() throws RecognitionException
 
                 }
 
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4720:2: ( ',' ( ( ruleJvmFormalParameter ) ) )*
-                loop164:
+                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4701:2: ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                loop163:
                 do {
-                    int alt164=2;
-                    int LA164_0 = input.LA(1);
+                    int alt163=2;
+                    int LA163_0 = input.LA(1);
 
-                    if ( (LA164_0==25) ) {
-                        alt164=1;
+                    if ( (LA163_0==24) ) {
+                        alt163=1;
                     }
 
 
-                    switch (alt164) {
+                    switch (alt163) {
                 	case 1 :
-                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4720:4: ',' ( ( ruleJvmFormalParameter ) )
+                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4701:4: ',' ( ( ruleJvmFormalParameter ) )
                 	    {
-                	    match(input,25,FOLLOW_25_in_synpred41_InternalCheck11091); if (state.failed) return ;
-                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4721:1: ( ( ruleJvmFormalParameter ) )
-                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4722:1: ( ruleJvmFormalParameter )
+                	    match(input,24,FOLLOW_24_in_synpred41_InternalCheck11053); if (state.failed) return ;
+                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4702:1: ( ( ruleJvmFormalParameter ) )
+                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4703:1: ( ruleJvmFormalParameter )
                 	    {
-                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4722:1: ( ruleJvmFormalParameter )
-                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4723:1: ruleJvmFormalParameter
+                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4703:1: ( ruleJvmFormalParameter )
+                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4704:1: ruleJvmFormalParameter
                 	    {
-                	    pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred41_InternalCheck11098);
+                	    pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred41_InternalCheck11060);
                 	    ruleJvmFormalParameter();
 
                 	    state._fsp--;
@@ -24657,7 +24599,7 @@ public final void synpred41_InternalCheck_fragment() throws RecognitionException
                 	    break;
 
                 	default :
-                	    break loop164;
+                	    break loop163;
                     }
                 } while (true);
 
@@ -24667,13 +24609,13 @@ public final void synpred41_InternalCheck_fragment() throws RecognitionException
 
         }
 
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4725:6: ( ( '|' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4726:1: ( '|' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4706:6: ( ( '|' ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4707:1: ( '|' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4726:1: ( '|' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4727:2: '|'
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4707:1: ( '|' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4708:2: '|'
         {
-        match(input,84,FOLLOW_84_in_synpred41_InternalCheck11112); if (state.failed) return ;
+        match(input,84,FOLLOW_84_in_synpred41_InternalCheck11074); if (state.failed) return ;
 
         }
 
@@ -24690,10 +24632,10 @@ public final void synpred41_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred43_InternalCheck
     public final void synpred43_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5086:4: ( 'else' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5086:6: 'else'
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5067:4: ( 'else' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5067:6: 'else'
         {
-        match(input,86,FOLLOW_86_in_synpred43_InternalCheck11895); if (state.failed) return ;
+        match(input,86,FOLLOW_86_in_synpred43_InternalCheck11857); if (state.failed) return ;
 
         }
     }
@@ -24701,20 +24643,20 @@ public final void synpred43_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred44_InternalCheck
     public final void synpred44_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5140:4: ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5140:5: ( '(' ( ( ruleJvmFormalParameter ) ) ':' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5121:4: ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5121:5: ( '(' ( ( ruleJvmFormalParameter ) ) ':' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5140:5: ( '(' ( ( ruleJvmFormalParameter ) ) ':' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5140:7: '(' ( ( ruleJvmFormalParameter ) ) ':'
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5121:5: ( '(' ( ( ruleJvmFormalParameter ) ) ':' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5121:7: '(' ( ( ruleJvmFormalParameter ) ) ':'
         {
-        match(input,24,FOLLOW_24_in_synpred44_InternalCheck12034); if (state.failed) return ;
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5141:1: ( ( ruleJvmFormalParameter ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5142:1: ( ruleJvmFormalParameter )
+        match(input,23,FOLLOW_23_in_synpred44_InternalCheck11996); if (state.failed) return ;
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5122:1: ( ( ruleJvmFormalParameter ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5123:1: ( ruleJvmFormalParameter )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5142:1: ( ruleJvmFormalParameter )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5143:1: ruleJvmFormalParameter
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5123:1: ( ruleJvmFormalParameter )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5124:1: ruleJvmFormalParameter
         {
-        pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred44_InternalCheck12041);
+        pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred44_InternalCheck12003);
         ruleJvmFormalParameter();
 
         state._fsp--;
@@ -24725,7 +24667,7 @@ public final void synpred44_InternalCheck_fragment() throws RecognitionException
 
         }
 
-        match(input,88,FOLLOW_88_in_synpred44_InternalCheck12047); if (state.failed) return ;
+        match(input,88,FOLLOW_88_in_synpred44_InternalCheck12009); if (state.failed) return ;
 
         }
 
@@ -24736,19 +24678,19 @@ public final void synpred44_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred45_InternalCheck
     public final void synpred45_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5195:8: ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5195:9: ( ( ( ruleJvmFormalParameter ) ) ':' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5176:8: ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5176:9: ( ( ( ruleJvmFormalParameter ) ) ':' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5195:9: ( ( ( ruleJvmFormalParameter ) ) ':' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5195:10: ( ( ruleJvmFormalParameter ) ) ':'
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5176:9: ( ( ( ruleJvmFormalParameter ) ) ':' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5176:10: ( ( ruleJvmFormalParameter ) ) ':'
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5195:10: ( ( ruleJvmFormalParameter ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5196:1: ( ruleJvmFormalParameter )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5176:10: ( ( ruleJvmFormalParameter ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5177:1: ( ruleJvmFormalParameter )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5196:1: ( ruleJvmFormalParameter )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5197:1: ruleJvmFormalParameter
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5177:1: ( ruleJvmFormalParameter )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5178:1: ruleJvmFormalParameter
         {
-        pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred45_InternalCheck12149);
+        pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred45_InternalCheck12111);
         ruleJvmFormalParameter();
 
         state._fsp--;
@@ -24759,7 +24701,7 @@ public final void synpred45_InternalCheck_fragment() throws RecognitionException
 
         }
 
-        match(input,88,FOLLOW_88_in_synpred45_InternalCheck12155); if (state.failed) return ;
+        match(input,88,FOLLOW_88_in_synpred45_InternalCheck12117); if (state.failed) return ;
 
         }
 
@@ -24770,19 +24712,19 @@ public final void synpred45_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred47_InternalCheck
     public final void synpred47_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5963:4: ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5963:5: ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5944:4: ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5944:5: ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5963:5: ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5963:6: ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5944:5: ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5944:6: ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5963:6: ( ( ruleJvmTypeReference ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5964:1: ( ruleJvmTypeReference )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5944:6: ( ( ruleJvmTypeReference ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5945:1: ( ruleJvmTypeReference )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5964:1: ( ruleJvmTypeReference )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5965:1: ruleJvmTypeReference
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5945:1: ( ruleJvmTypeReference )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5946:1: ruleJvmTypeReference
         {
-        pushFollow(FOLLOW_ruleJvmTypeReference_in_synpred47_InternalCheck13783);
+        pushFollow(FOLLOW_ruleJvmTypeReference_in_synpred47_InternalCheck13745);
         ruleJvmTypeReference();
 
         state._fsp--;
@@ -24793,13 +24735,13 @@ public final void synpred47_InternalCheck_fragment() throws RecognitionException
 
         }
 
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5967:2: ( ( ruleValidID ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5968:1: ( ruleValidID )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5948:2: ( ( ruleValidID ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5949:1: ( ruleValidID )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5968:1: ( ruleValidID )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5969:1: ruleValidID
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5949:1: ( ruleValidID )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5950:1: ruleValidID
         {
-        pushFollow(FOLLOW_ruleValidID_in_synpred47_InternalCheck13792);
+        pushFollow(FOLLOW_ruleValidID_in_synpred47_InternalCheck13754);
         ruleValidID();
 
         state._fsp--;
@@ -24820,13 +24762,13 @@ public final void synpred47_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred48_InternalCheck
     public final void synpred48_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6252:4: ( ( '(' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6253:1: ( '(' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6233:4: ( ( '(' ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6234:1: ( '(' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6253:1: ( '(' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6254:2: '('
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6234:1: ( '(' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6235:2: '('
         {
-        match(input,24,FOLLOW_24_in_synpred48_InternalCheck14330); if (state.failed) return ;
+        match(input,23,FOLLOW_23_in_synpred48_InternalCheck14292); if (state.failed) return ;
 
         }
 
@@ -24837,35 +24779,35 @@ public final void synpred48_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred49_InternalCheck
     public final void synpred49_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6273:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6273:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6254:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6254:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6273:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6273:6: () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6254:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6254:6: () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6273:6: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6274:1: 
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6254:6: ()
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6255:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6274:2: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
-        int alt169=2;
-        int LA169_0 = input.LA(1);
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6255:2: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
+        int alt168=2;
+        int LA168_0 = input.LA(1);
 
-        if ( (LA169_0==RULE_ID||LA169_0==24||LA169_0==68) ) {
-            alt169=1;
+        if ( (LA168_0==RULE_ID||LA168_0==23||LA168_0==68) ) {
+            alt168=1;
         }
-        switch (alt169) {
+        switch (alt168) {
             case 1 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6274:3: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6255:3: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
                 {
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6274:3: ( ( ruleJvmFormalParameter ) )
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6275:1: ( ruleJvmFormalParameter )
+                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6255:3: ( ( ruleJvmFormalParameter ) )
+                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6256:1: ( ruleJvmFormalParameter )
                 {
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6275:1: ( ruleJvmFormalParameter )
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6276:1: ruleJvmFormalParameter
+                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6256:1: ( ruleJvmFormalParameter )
+                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6257:1: ruleJvmFormalParameter
                 {
-                pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred49_InternalCheck14382);
+                pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred49_InternalCheck14344);
                 ruleJvmFormalParameter();
 
                 state._fsp--;
@@ -24876,29 +24818,29 @@ public final void synpred49_InternalCheck_fragment() throws RecognitionException
 
                 }
 
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6278:2: ( ',' ( ( ruleJvmFormalParameter ) ) )*
-                loop168:
+                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6259:2: ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                loop167:
                 do {
-                    int alt168=2;
-                    int LA168_0 = input.LA(1);
+                    int alt167=2;
+                    int LA167_0 = input.LA(1);
 
-                    if ( (LA168_0==25) ) {
-                        alt168=1;
+                    if ( (LA167_0==24) ) {
+                        alt167=1;
                     }
 
 
-                    switch (alt168) {
+                    switch (alt167) {
                 	case 1 :
-                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6278:4: ',' ( ( ruleJvmFormalParameter ) )
+                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6259:4: ',' ( ( ruleJvmFormalParameter ) )
                 	    {
-                	    match(input,25,FOLLOW_25_in_synpred49_InternalCheck14389); if (state.failed) return ;
-                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6279:1: ( ( ruleJvmFormalParameter ) )
-                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6280:1: ( ruleJvmFormalParameter )
+                	    match(input,24,FOLLOW_24_in_synpred49_InternalCheck14351); if (state.failed) return ;
+                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6260:1: ( ( ruleJvmFormalParameter ) )
+                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6261:1: ( ruleJvmFormalParameter )
                 	    {
-                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6280:1: ( ruleJvmFormalParameter )
-                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6281:1: ruleJvmFormalParameter
+                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6261:1: ( ruleJvmFormalParameter )
+                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6262:1: ruleJvmFormalParameter
                 	    {
-                	    pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred49_InternalCheck14396);
+                	    pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred49_InternalCheck14358);
                 	    ruleJvmFormalParameter();
 
                 	    state._fsp--;
@@ -24914,7 +24856,7 @@ public final void synpred49_InternalCheck_fragment() throws RecognitionException
                 	    break;
 
                 	default :
-                	    break loop168;
+                	    break loop167;
                     }
                 } while (true);
 
@@ -24924,13 +24866,13 @@ public final void synpred49_InternalCheck_fragment() throws RecognitionException
 
         }
 
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6283:6: ( ( '|' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6284:1: ( '|' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6264:6: ( ( '|' ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6265:1: ( '|' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6284:1: ( '|' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6285:2: '|'
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6265:1: ( '|' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6266:2: '|'
         {
-        match(input,84,FOLLOW_84_in_synpred49_InternalCheck14410); if (state.failed) return ;
+        match(input,84,FOLLOW_84_in_synpred49_InternalCheck14372); if (state.failed) return ;
 
         }
 
@@ -24947,18 +24889,18 @@ public final void synpred49_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred50_InternalCheck
     public final void synpred50_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6352:4: ( ( () '[' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6352:5: ( () '[' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6333:4: ( ( () '[' ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6333:5: ( () '[' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6352:5: ( () '[' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6352:6: () '['
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6333:5: ( () '[' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6333:6: () '['
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6352:6: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6353:1: 
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6333:6: ()
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6334:1: 
         {
         }
 
-        match(input,34,FOLLOW_34_in_synpred50_InternalCheck14530); if (state.failed) return ;
+        match(input,33,FOLLOW_33_in_synpred50_InternalCheck14492); if (state.failed) return ;
 
         }
 
@@ -24969,10 +24911,10 @@ public final void synpred50_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred51_InternalCheck
     public final void synpred51_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6457:4: ( '<' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6457:6: '<'
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6438:4: ( '<' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6438:6: '<'
         {
-        match(input,56,FOLLOW_56_in_synpred51_InternalCheck14799); if (state.failed) return ;
+        match(input,56,FOLLOW_56_in_synpred51_InternalCheck14761); if (state.failed) return ;
 
         }
     }
@@ -24980,13 +24922,13 @@ public final void synpred51_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred52_InternalCheck
     public final void synpred52_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6506:5: ( ( '(' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6507:1: ( '(' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6487:5: ( ( '(' ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6488:1: ( '(' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6507:1: ( '(' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6508:2: '('
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6488:1: ( '(' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6489:2: '('
         {
-        match(input,24,FOLLOW_24_in_synpred52_InternalCheck14895); if (state.failed) return ;
+        match(input,23,FOLLOW_23_in_synpred52_InternalCheck14857); if (state.failed) return ;
 
         }
 
@@ -24997,35 +24939,35 @@ public final void synpred52_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred53_InternalCheck
     public final void synpred53_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6527:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6527:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6508:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6508:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6527:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6527:6: () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6508:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6508:6: () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6527:6: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6528:1: 
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6508:6: ()
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6509:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6528:2: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
-        int alt171=2;
-        int LA171_0 = input.LA(1);
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6509:2: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
+        int alt170=2;
+        int LA170_0 = input.LA(1);
 
-        if ( (LA171_0==RULE_ID||LA171_0==24||LA171_0==68) ) {
-            alt171=1;
+        if ( (LA170_0==RULE_ID||LA170_0==23||LA170_0==68) ) {
+            alt170=1;
         }
-        switch (alt171) {
+        switch (alt170) {
             case 1 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6528:3: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6509:3: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
                 {
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6528:3: ( ( ruleJvmFormalParameter ) )
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6529:1: ( ruleJvmFormalParameter )
+                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6509:3: ( ( ruleJvmFormalParameter ) )
+                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6510:1: ( ruleJvmFormalParameter )
                 {
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6529:1: ( ruleJvmFormalParameter )
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6530:1: ruleJvmFormalParameter
+                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6510:1: ( ruleJvmFormalParameter )
+                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6511:1: ruleJvmFormalParameter
                 {
-                pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred53_InternalCheck14947);
+                pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred53_InternalCheck14909);
                 ruleJvmFormalParameter();
 
                 state._fsp--;
@@ -25036,29 +24978,29 @@ public final void synpred53_InternalCheck_fragment() throws RecognitionException
 
                 }
 
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6532:2: ( ',' ( ( ruleJvmFormalParameter ) ) )*
-                loop170:
+                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6513:2: ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                loop169:
                 do {
-                    int alt170=2;
-                    int LA170_0 = input.LA(1);
+                    int alt169=2;
+                    int LA169_0 = input.LA(1);
 
-                    if ( (LA170_0==25) ) {
-                        alt170=1;
+                    if ( (LA169_0==24) ) {
+                        alt169=1;
                     }
 
 
-                    switch (alt170) {
+                    switch (alt169) {
                 	case 1 :
-                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6532:4: ',' ( ( ruleJvmFormalParameter ) )
+                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6513:4: ',' ( ( ruleJvmFormalParameter ) )
                 	    {
-                	    match(input,25,FOLLOW_25_in_synpred53_InternalCheck14954); if (state.failed) return ;
-                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6533:1: ( ( ruleJvmFormalParameter ) )
-                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6534:1: ( ruleJvmFormalParameter )
+                	    match(input,24,FOLLOW_24_in_synpred53_InternalCheck14916); if (state.failed) return ;
+                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6514:1: ( ( ruleJvmFormalParameter ) )
+                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6515:1: ( ruleJvmFormalParameter )
                 	    {
-                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6534:1: ( ruleJvmFormalParameter )
-                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6535:1: ruleJvmFormalParameter
+                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6515:1: ( ruleJvmFormalParameter )
+                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6516:1: ruleJvmFormalParameter
                 	    {
-                	    pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred53_InternalCheck14961);
+                	    pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred53_InternalCheck14923);
                 	    ruleJvmFormalParameter();
 
                 	    state._fsp--;
@@ -25074,7 +25016,7 @@ public final void synpred53_InternalCheck_fragment() throws RecognitionException
                 	    break;
 
                 	default :
-                	    break loop170;
+                	    break loop169;
                     }
                 } while (true);
 
@@ -25084,13 +25026,13 @@ public final void synpred53_InternalCheck_fragment() throws RecognitionException
 
         }
 
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6537:6: ( ( '|' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6538:1: ( '|' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6518:6: ( ( '|' ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6519:1: ( '|' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6538:1: ( '|' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6539:2: '|'
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6519:1: ( '|' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6520:2: '|'
         {
-        match(input,84,FOLLOW_84_in_synpred53_InternalCheck14975); if (state.failed) return ;
+        match(input,84,FOLLOW_84_in_synpred53_InternalCheck14937); if (state.failed) return ;
 
         }
 
@@ -25107,18 +25049,18 @@ public final void synpred53_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred54_InternalCheck
     public final void synpred54_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6606:4: ( ( () '[' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6606:5: ( () '[' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6587:4: ( ( () '[' ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6587:5: ( () '[' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6606:5: ( () '[' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6606:6: () '['
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6587:5: ( () '[' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6587:6: () '['
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6606:6: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6607:1: 
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6587:6: ()
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6588:1: 
         {
         }
 
-        match(input,34,FOLLOW_34_in_synpred54_InternalCheck15095); if (state.failed) return ;
+        match(input,33,FOLLOW_33_in_synpred54_InternalCheck15057); if (state.failed) return ;
 
         }
 
@@ -25129,10 +25071,10 @@ public final void synpred54_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred55_InternalCheck
     public final void synpred55_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6946:2: ( 'extends' | 'static' | 'import' | 'extension' | 'catalog' | 'grammar' | 'with' | 'category' | 'message' | 'on' | 'bind' | 'data' | 'SeverityRange' | 'error' | 'warning' | 'info' | 'ignore' | 'live' | 'onSave' | 'onDemand' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | 'guard' | 'issue' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6927:2: ( 'extends' | 'static' | 'import' | 'extension' | 'catalog' | 'grammar' | 'with' | 'category' | 'message' | 'on' | 'bind' | 'data' | 'SeverityRange' | 'error' | 'warning' | 'info' | 'ignore' | 'live' | 'onSave' | 'onDemand' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | 'guard' | 'issue' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )
         // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:
         {
-        if ( (input.LA(1)>=RULE_STRING && input.LA(1)<=RULE_ID)||(input.LA(1)>=15 && input.LA(1)<=19)||input.LA(1)==21||(input.LA(1)>=23 && input.LA(1)<=24)||input.LA(1)==27||input.LA(1)==29||(input.LA(1)>=33 && input.LA(1)<=34)||(input.LA(1)>=36 && input.LA(1)<=50)||input.LA(1)==56||(input.LA(1)>=71 && input.LA(1)<=72)||input.LA(1)==77||input.LA(1)==85||input.LA(1)==87||(input.LA(1)>=91 && input.LA(1)<=92)||(input.LA(1)>=95 && input.LA(1)<=103)||input.LA(1)==105 ) {
+        if ( (input.LA(1)>=RULE_STRING && input.LA(1)<=RULE_ID)||(input.LA(1)>=15 && input.LA(1)<=18)||input.LA(1)==20||(input.LA(1)>=22 && input.LA(1)<=23)||input.LA(1)==26||input.LA(1)==28||(input.LA(1)>=32 && input.LA(1)<=33)||(input.LA(1)>=35 && input.LA(1)<=50)||input.LA(1)==56||(input.LA(1)>=71 && input.LA(1)<=72)||input.LA(1)==77||input.LA(1)==85||input.LA(1)==87||(input.LA(1)>=91 && input.LA(1)<=92)||(input.LA(1)>=95 && input.LA(1)<=103)||input.LA(1)==105 ) {
             input.consume();
             state.errorRecovery=false;state.failed=false;
         }
@@ -25149,10 +25091,10 @@ public final void synpred55_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred56_InternalCheck
     public final void synpred56_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7058:5: ( 'catch' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7058:7: 'catch'
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7039:5: ( 'catch' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7039:7: 'catch'
         {
-        match(input,106,FOLLOW_106_in_synpred56_InternalCheck16394); if (state.failed) return ;
+        match(input,106,FOLLOW_106_in_synpred56_InternalCheck16356); if (state.failed) return ;
 
         }
     }
@@ -25160,10 +25102,10 @@ public final void synpred56_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred57_InternalCheck
     public final void synpred57_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7077:5: ( 'finally' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7077:7: 'finally'
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7058:5: ( 'finally' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7058:7: 'finally'
         {
-        match(input,104,FOLLOW_104_in_synpred57_InternalCheck16424); if (state.failed) return ;
+        match(input,104,FOLLOW_104_in_synpred57_InternalCheck16386); if (state.failed) return ;
 
         }
     }
@@ -25171,10 +25113,10 @@ public final void synpred57_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred60_InternalCheck
     public final void synpred60_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7303:3: ( '.' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7304:2: '.'
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7284:3: ( '.' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7285:2: '.'
         {
-        match(input,81,FOLLOW_81_in_synpred60_InternalCheck16949); if (state.failed) return ;
+        match(input,81,FOLLOW_81_in_synpred60_InternalCheck16911); if (state.failed) return ;
 
         }
     }
@@ -25182,18 +25124,18 @@ public final void synpred60_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred61_InternalCheck
     public final void synpred61_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7429:2: ( ( () ruleArrayBrackets ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7429:3: ( () ruleArrayBrackets )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7410:2: ( ( () ruleArrayBrackets ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7410:3: ( () ruleArrayBrackets )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7429:3: ( () ruleArrayBrackets )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7429:4: () ruleArrayBrackets
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7410:3: ( () ruleArrayBrackets )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7410:4: () ruleArrayBrackets
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7429:4: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7430:1: 
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7410:4: ()
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7411:1: 
         {
         }
 
-        pushFollow(FOLLOW_ruleArrayBrackets_in_synpred61_InternalCheck17334);
+        pushFollow(FOLLOW_ruleArrayBrackets_in_synpred61_InternalCheck17296);
         ruleArrayBrackets();
 
         state._fsp--;
@@ -25208,10 +25150,10 @@ public final void synpred61_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred62_InternalCheck
     public final void synpred62_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7614:4: ( '<' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7614:6: '<'
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7595:4: ( '<' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7595:6: '<'
         {
-        match(input,56,FOLLOW_56_in_synpred62_InternalCheck17786); if (state.failed) return ;
+        match(input,56,FOLLOW_56_in_synpred62_InternalCheck17748); if (state.failed) return ;
 
         }
     }
@@ -25219,18 +25161,18 @@ public final void synpred62_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred63_InternalCheck
     public final void synpred63_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7663:3: ( ( () '.' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7663:4: ( () '.' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7644:3: ( ( () '.' ) )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7644:4: ( () '.' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7663:4: ( () '.' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7663:5: () '.'
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7644:4: ( () '.' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7644:5: () '.'
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7663:5: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7664:1: 
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7644:5: ()
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7645:1: 
         {
         }
 
-        match(input,81,FOLLOW_81_in_synpred63_InternalCheck17881); if (state.failed) return ;
+        match(input,81,FOLLOW_81_in_synpred63_InternalCheck17843); if (state.failed) return ;
 
         }
 
@@ -25241,10 +25183,10 @@ public final void synpred63_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred64_InternalCheck
     public final void synpred64_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7690:4: ( '<' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7690:6: '<'
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7671:4: ( '<' )
+        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7671:6: '<'
         {
-        match(input,56,FOLLOW_56_in_synpred64_InternalCheck17938); if (state.failed) return ;
+        match(input,56,FOLLOW_56_in_synpred64_InternalCheck17900); if (state.failed) return ;
 
         }
     }
@@ -26052,103 +25994,103 @@ public final boolean synpred14_InternalCheck() {
     }
 
 
-    protected DFA6 dfa6 = new DFA6(this);
-    protected DFA16 dfa16 = new DFA16(this);
-    protected DFA34 dfa34 = new DFA34(this);
-    protected DFA41 dfa41 = new DFA41(this);
-    protected DFA45 dfa45 = new DFA45(this);
+    protected DFA5 dfa5 = new DFA5(this);
+    protected DFA15 dfa15 = new DFA15(this);
+    protected DFA33 dfa33 = new DFA33(this);
+    protected DFA40 dfa40 = new DFA40(this);
     protected DFA44 dfa44 = new DFA44(this);
-    protected DFA50 dfa50 = new DFA50(this);
-    protected DFA53 dfa53 = new DFA53(this);
-    protected DFA56 dfa56 = new DFA56(this);
+    protected DFA43 dfa43 = new DFA43(this);
+    protected DFA49 dfa49 = new DFA49(this);
+    protected DFA52 dfa52 = new DFA52(this);
     protected DFA55 dfa55 = new DFA55(this);
-    protected DFA65 dfa65 = new DFA65(this);
-    protected DFA68 dfa68 = new DFA68(this);
-    protected DFA84 dfa84 = new DFA84(this);
+    protected DFA54 dfa54 = new DFA54(this);
+    protected DFA64 dfa64 = new DFA64(this);
+    protected DFA67 dfa67 = new DFA67(this);
     protected DFA83 dfa83 = new DFA83(this);
-    protected DFA85 dfa85 = new DFA85(this);
-    protected DFA95 dfa95 = new DFA95(this);
-    protected DFA102 dfa102 = new DFA102(this);
+    protected DFA82 dfa82 = new DFA82(this);
+    protected DFA84 dfa84 = new DFA84(this);
+    protected DFA94 dfa94 = new DFA94(this);
     protected DFA101 dfa101 = new DFA101(this);
-    protected DFA124 dfa124 = new DFA124(this);
+    protected DFA100 dfa100 = new DFA100(this);
     protected DFA123 dfa123 = new DFA123(this);
-    protected DFA125 dfa125 = new DFA125(this);
-    protected DFA128 dfa128 = new DFA128(this);
-    protected DFA131 dfa131 = new DFA131(this);
+    protected DFA122 dfa122 = new DFA122(this);
+    protected DFA124 dfa124 = new DFA124(this);
+    protected DFA127 dfa127 = new DFA127(this);
     protected DFA130 dfa130 = new DFA130(this);
-    protected DFA132 dfa132 = new DFA132(this);
-    protected DFA135 dfa135 = new DFA135(this);
-    protected DFA153 dfa153 = new DFA153(this);
-    protected DFA151 dfa151 = new DFA151(this);
-    static final String DFA6_eotS =
+    protected DFA129 dfa129 = new DFA129(this);
+    protected DFA131 dfa131 = new DFA131(this);
+    protected DFA134 dfa134 = new DFA134(this);
+    protected DFA152 dfa152 = new DFA152(this);
+    protected DFA150 dfa150 = new DFA150(this);
+    static final String DFA5_eotS =
         "\6\uffff";
-    static final String DFA6_eofS =
+    static final String DFA5_eofS =
         "\1\uffff\1\3\2\uffff\1\3\1\uffff";
-    static final String DFA6_minS =
+    static final String DFA5_minS =
         "\1\10\1\16\1\10\1\uffff\1\16\1\uffff";
-    static final String DFA6_maxS =
+    static final String DFA5_maxS =
         "\1\10\1\121\1\111\1\uffff\1\121\1\uffff";
-    static final String DFA6_acceptS =
+    static final String DFA5_acceptS =
         "\3\uffff\1\1\1\uffff\1\2";
-    static final String DFA6_specialS =
+    static final String DFA5_specialS =
         "\6\uffff}>";
-    static final String[] DFA6_transitionS = {
+    static final String[] DFA5_transitionS = {
             "\1\1",
-            "\2\3\5\uffff\2\3\72\uffff\1\2",
+            "\2\3\4\uffff\2\3\73\uffff\1\2",
             "\1\4\100\uffff\1\5",
             "",
-            "\2\3\5\uffff\2\3\72\uffff\1\2",
+            "\2\3\4\uffff\2\3\73\uffff\1\2",
             ""
     };
 
-    static final short[] DFA6_eot = DFA.unpackEncodedString(DFA6_eotS);
-    static final short[] DFA6_eof = DFA.unpackEncodedString(DFA6_eofS);
-    static final char[] DFA6_min = DFA.unpackEncodedStringToUnsignedChars(DFA6_minS);
-    static final char[] DFA6_max = DFA.unpackEncodedStringToUnsignedChars(DFA6_maxS);
-    static final short[] DFA6_accept = DFA.unpackEncodedString(DFA6_acceptS);
-    static final short[] DFA6_special = DFA.unpackEncodedString(DFA6_specialS);
-    static final short[][] DFA6_transition;
+    static final short[] DFA5_eot = DFA.unpackEncodedString(DFA5_eotS);
+    static final short[] DFA5_eof = DFA.unpackEncodedString(DFA5_eofS);
+    static final char[] DFA5_min = DFA.unpackEncodedStringToUnsignedChars(DFA5_minS);
+    static final char[] DFA5_max = DFA.unpackEncodedStringToUnsignedChars(DFA5_maxS);
+    static final short[] DFA5_accept = DFA.unpackEncodedString(DFA5_acceptS);
+    static final short[] DFA5_special = DFA.unpackEncodedString(DFA5_specialS);
+    static final short[][] DFA5_transition;
 
     static {
-        int numStates = DFA6_transitionS.length;
-        DFA6_transition = new short[numStates][];
+        int numStates = DFA5_transitionS.length;
+        DFA5_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA6_transition[i] = DFA.unpackEncodedString(DFA6_transitionS[i]);
+            DFA5_transition[i] = DFA.unpackEncodedString(DFA5_transitionS[i]);
         }
     }
 
-    class DFA6 extends DFA {
+    class DFA5 extends DFA {
 
-        public DFA6(BaseRecognizer recognizer) {
+        public DFA5(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 6;
-            this.eot = DFA6_eot;
-            this.eof = DFA6_eof;
-            this.min = DFA6_min;
-            this.max = DFA6_max;
-            this.accept = DFA6_accept;
-            this.special = DFA6_special;
-            this.transition = DFA6_transition;
+            this.decisionNumber = 5;
+            this.eot = DFA5_eot;
+            this.eof = DFA5_eof;
+            this.min = DFA5_min;
+            this.max = DFA5_max;
+            this.accept = DFA5_accept;
+            this.special = DFA5_special;
+            this.transition = DFA5_transition;
         }
         public String getDescription() {
-            return "359:1: ( ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard ) ) )";
+            return "340:1: ( ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard ) ) )";
         }
     }
-    static final String DFA16_eotS =
+    static final String DFA15_eotS =
         "\25\uffff";
-    static final String DFA16_eofS =
+    static final String DFA15_eofS =
         "\1\2\24\uffff";
-    static final String DFA16_minS =
+    static final String DFA15_minS =
         "\1\10\1\0\23\uffff";
-    static final String DFA16_maxS =
+    static final String DFA15_maxS =
         "\1\104\1\0\23\uffff";
-    static final String DFA16_acceptS =
+    static final String DFA15_acceptS =
         "\2\uffff\1\2\21\uffff\1\1";
-    static final String DFA16_specialS =
+    static final String DFA15_specialS =
         "\1\uffff\1\0\23\uffff}>";
-    static final String[] DFA16_transitionS = {
-            "\1\2\5\uffff\1\2\1\uffff\1\2\2\uffff\2\2\2\uffff\1\2\1\1\2"+
-            "\uffff\2\2\2\uffff\1\2\14\uffff\7\2\21\uffff\1\2",
+    static final String[] DFA15_transitionS = {
+            "\1\2\5\uffff\1\2\1\uffff\1\2\1\uffff\2\2\2\uffff\1\2\1\1\2"+
+            "\uffff\2\2\2\uffff\1\2\15\uffff\7\2\21\uffff\1\2",
             "\1\uffff",
             "",
             "",
@@ -26171,47 +26113,47 @@ public String getDescription() {
             ""
     };
 
-    static final short[] DFA16_eot = DFA.unpackEncodedString(DFA16_eotS);
-    static final short[] DFA16_eof = DFA.unpackEncodedString(DFA16_eofS);
-    static final char[] DFA16_min = DFA.unpackEncodedStringToUnsignedChars(DFA16_minS);
-    static final char[] DFA16_max = DFA.unpackEncodedStringToUnsignedChars(DFA16_maxS);
-    static final short[] DFA16_accept = DFA.unpackEncodedString(DFA16_acceptS);
-    static final short[] DFA16_special = DFA.unpackEncodedString(DFA16_specialS);
-    static final short[][] DFA16_transition;
+    static final short[] DFA15_eot = DFA.unpackEncodedString(DFA15_eotS);
+    static final short[] DFA15_eof = DFA.unpackEncodedString(DFA15_eofS);
+    static final char[] DFA15_min = DFA.unpackEncodedStringToUnsignedChars(DFA15_minS);
+    static final char[] DFA15_max = DFA.unpackEncodedStringToUnsignedChars(DFA15_maxS);
+    static final short[] DFA15_accept = DFA.unpackEncodedString(DFA15_acceptS);
+    static final short[] DFA15_special = DFA.unpackEncodedString(DFA15_specialS);
+    static final short[][] DFA15_transition;
 
     static {
-        int numStates = DFA16_transitionS.length;
-        DFA16_transition = new short[numStates][];
+        int numStates = DFA15_transitionS.length;
+        DFA15_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA16_transition[i] = DFA.unpackEncodedString(DFA16_transitionS[i]);
+            DFA15_transition[i] = DFA.unpackEncodedString(DFA15_transitionS[i]);
         }
     }
 
-    class DFA16 extends DFA {
+    class DFA15 extends DFA {
 
-        public DFA16(BaseRecognizer recognizer) {
+        public DFA15(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 16;
-            this.eot = DFA16_eot;
-            this.eof = DFA16_eof;
-            this.min = DFA16_min;
-            this.max = DFA16_max;
-            this.accept = DFA16_accept;
-            this.special = DFA16_special;
-            this.transition = DFA16_transition;
+            this.decisionNumber = 15;
+            this.eot = DFA15_eot;
+            this.eof = DFA15_eof;
+            this.min = DFA15_min;
+            this.max = DFA15_max;
+            this.accept = DFA15_accept;
+            this.special = DFA15_special;
+            this.transition = DFA15_transition;
         }
         public String getDescription() {
-            return "614:2: ( ( ( '(' )=>otherlv_6= '(' ) ( ( (lv_formalParameters_7_0= ruleFormalParameter ) ) (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )* )? otherlv_10= ')' )?";
+            return "595:2: ( ( ( '(' )=>otherlv_6= '(' ) ( ( (lv_formalParameters_7_0= ruleFormalParameter ) ) (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )* )? otherlv_10= ')' )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA16_1 = input.LA(1);
+                        int LA15_1 = input.LA(1);
 
                          
-                        int index16_1 = input.index();
+                        int index15_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred1_InternalCheck()) ) {s = 20;}
@@ -26219,31 +26161,31 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index16_1);
+                        input.seek(index15_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 16, _s, input);
+                new NoViableAltException(getDescription(), 15, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA34_eotS =
+    static final String DFA33_eotS =
         "\140\uffff";
-    static final String DFA34_eofS =
+    static final String DFA33_eofS =
         "\1\2\137\uffff";
-    static final String DFA34_minS =
+    static final String DFA33_minS =
         "\1\4\1\0\136\uffff";
-    static final String DFA34_maxS =
+    static final String DFA33_maxS =
         "\1\152\1\0\136\uffff";
-    static final String DFA34_acceptS =
+    static final String DFA33_acceptS =
         "\2\uffff\1\2\134\uffff\1\1";
-    static final String DFA34_specialS =
+    static final String DFA33_specialS =
         "\1\uffff\1\0\136\uffff}>";
-    static final String[] DFA34_transitionS = {
-            "\5\2\6\uffff\15\2\1\uffff\2\2\2\uffff\5\2\1\1\55\2\1\uffff"+
+    static final String[] DFA33_transitionS = {
+            "\5\2\6\uffff\14\2\1\uffff\2\2\2\uffff\5\2\1\1\56\2\1\uffff"+
             "\26\2",
             "\1\uffff",
             "",
@@ -26342,47 +26284,47 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA34_eot = DFA.unpackEncodedString(DFA34_eotS);
-    static final short[] DFA34_eof = DFA.unpackEncodedString(DFA34_eofS);
-    static final char[] DFA34_min = DFA.unpackEncodedStringToUnsignedChars(DFA34_minS);
-    static final char[] DFA34_max = DFA.unpackEncodedStringToUnsignedChars(DFA34_maxS);
-    static final short[] DFA34_accept = DFA.unpackEncodedString(DFA34_acceptS);
-    static final short[] DFA34_special = DFA.unpackEncodedString(DFA34_specialS);
-    static final short[][] DFA34_transition;
+    static final short[] DFA33_eot = DFA.unpackEncodedString(DFA33_eotS);
+    static final short[] DFA33_eof = DFA.unpackEncodedString(DFA33_eofS);
+    static final char[] DFA33_min = DFA.unpackEncodedStringToUnsignedChars(DFA33_minS);
+    static final char[] DFA33_max = DFA.unpackEncodedStringToUnsignedChars(DFA33_maxS);
+    static final short[] DFA33_accept = DFA.unpackEncodedString(DFA33_acceptS);
+    static final short[] DFA33_special = DFA.unpackEncodedString(DFA33_specialS);
+    static final short[][] DFA33_transition;
 
     static {
-        int numStates = DFA34_transitionS.length;
-        DFA34_transition = new short[numStates][];
+        int numStates = DFA33_transitionS.length;
+        DFA33_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA34_transition[i] = DFA.unpackEncodedString(DFA34_transitionS[i]);
+            DFA33_transition[i] = DFA.unpackEncodedString(DFA33_transitionS[i]);
         }
     }
 
-    class DFA34 extends DFA {
+    class DFA33 extends DFA {
 
-        public DFA34(BaseRecognizer recognizer) {
+        public DFA33(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 34;
-            this.eot = DFA34_eot;
-            this.eof = DFA34_eof;
-            this.min = DFA34_min;
-            this.max = DFA34_max;
-            this.accept = DFA34_accept;
-            this.special = DFA34_special;
-            this.transition = DFA34_transition;
+            this.decisionNumber = 33;
+            this.eot = DFA33_eot;
+            this.eof = DFA33_eof;
+            this.min = DFA33_min;
+            this.max = DFA33_max;
+            this.accept = DFA33_accept;
+            this.special = DFA33_special;
+            this.transition = DFA33_transition;
         }
         public String getDescription() {
-            return "1527:3: ( ( ( 'on' )=>otherlv_3= 'on' ) ( ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) ) | ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? ) ) ( ( ( '[' )=>otherlv_9= '[' ) ( (lv_markerIndex_10_0= ruleXExpression ) ) otherlv_11= ']' )? )?";
+            return "1508:3: ( ( ( 'on' )=>otherlv_3= 'on' ) ( ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) ) | ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? ) ) ( ( ( '[' )=>otherlv_9= '[' ) ( (lv_markerIndex_10_0= ruleXExpression ) ) otherlv_11= ']' )? )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA34_1 = input.LA(1);
+                        int LA33_1 = input.LA(1);
 
                          
-                        int index34_1 = input.index();
+                        int index33_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred4_InternalCheck()) ) {s = 95;}
@@ -26390,34 +26332,34 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index34_1);
+                        input.seek(index33_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 34, _s, input);
+                new NoViableAltException(getDescription(), 33, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA41_eotS =
+    static final String DFA40_eotS =
         "\62\uffff";
-    static final String DFA41_eofS =
+    static final String DFA40_eofS =
         "\62\uffff";
-    static final String DFA41_minS =
+    static final String DFA40_minS =
         "\1\4\46\uffff\1\0\12\uffff";
-    static final String DFA41_maxS =
+    static final String DFA40_maxS =
         "\1\151\46\uffff\1\0\12\uffff";
-    static final String DFA41_acceptS =
+    static final String DFA40_acceptS =
         "\1\uffff\1\1\1\2\1\3\1\4\1\5\26\uffff\1\6\11\uffff\1\7\1\uffff"+
         "\1\12\1\13\1\14\1\15\1\16\1\17\1\20\1\21\1\10\1\11";
-    static final String DFA41_specialS =
+    static final String DFA40_specialS =
         "\1\0\46\uffff\1\1\12\uffff}>";
-    static final String[] DFA41_transitionS = {
-            "\4\34\1\5\6\uffff\1\5\1\47\2\5\1\2\1\uffff\1\5\1\uffff\1\5"+
+    static final String[] DFA40_transitionS = {
+            "\4\34\1\5\6\uffff\1\5\1\47\1\5\1\2\1\uffff\1\5\1\uffff\1\5"+
             "\1\55\2\uffff\1\5\1\uffff\1\5\3\uffff\2\34\1\uffff\1\56\1\57"+
-            "\15\5\5\uffff\1\5\34\uffff\1\46\1\uffff\1\3\3\uffff\1\50\1\51"+
+            "\16\5\5\uffff\1\5\34\uffff\1\46\1\uffff\1\3\3\uffff\1\50\1\51"+
             "\2\uffff\1\5\1\1\4\34\1\52\1\53\1\54\1\uffff\1\4",
             "",
             "",
@@ -26470,90 +26412,90 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA41_eot = DFA.unpackEncodedString(DFA41_eotS);
-    static final short[] DFA41_eof = DFA.unpackEncodedString(DFA41_eofS);
-    static final char[] DFA41_min = DFA.unpackEncodedStringToUnsignedChars(DFA41_minS);
-    static final char[] DFA41_max = DFA.unpackEncodedStringToUnsignedChars(DFA41_maxS);
-    static final short[] DFA41_accept = DFA.unpackEncodedString(DFA41_acceptS);
-    static final short[] DFA41_special = DFA.unpackEncodedString(DFA41_specialS);
-    static final short[][] DFA41_transition;
+    static final short[] DFA40_eot = DFA.unpackEncodedString(DFA40_eotS);
+    static final short[] DFA40_eof = DFA.unpackEncodedString(DFA40_eofS);
+    static final char[] DFA40_min = DFA.unpackEncodedStringToUnsignedChars(DFA40_minS);
+    static final char[] DFA40_max = DFA.unpackEncodedStringToUnsignedChars(DFA40_maxS);
+    static final short[] DFA40_accept = DFA.unpackEncodedString(DFA40_acceptS);
+    static final short[] DFA40_special = DFA.unpackEncodedString(DFA40_specialS);
+    static final short[][] DFA40_transition;
 
     static {
-        int numStates = DFA41_transitionS.length;
-        DFA41_transition = new short[numStates][];
+        int numStates = DFA40_transitionS.length;
+        DFA40_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA41_transition[i] = DFA.unpackEncodedString(DFA41_transitionS[i]);
+            DFA40_transition[i] = DFA.unpackEncodedString(DFA40_transitionS[i]);
         }
     }
 
-    class DFA41 extends DFA {
+    class DFA40 extends DFA {
 
-        public DFA41(BaseRecognizer recognizer) {
+        public DFA40(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 41;
-            this.eot = DFA41_eot;
-            this.eof = DFA41_eof;
-            this.min = DFA41_min;
-            this.max = DFA41_max;
-            this.accept = DFA41_accept;
-            this.special = DFA41_special;
-            this.transition = DFA41_transition;
+            this.decisionNumber = 40;
+            this.eot = DFA40_eot;
+            this.eof = DFA40_eof;
+            this.min = DFA40_min;
+            this.max = DFA40_max;
+            this.accept = DFA40_accept;
+            this.special = DFA40_special;
+            this.transition = DFA40_transition;
         }
         public String getDescription() {
-            return "1788:1: (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression | this_XGuardExpression_15= ruleXGuardExpression | this_XIssueExpression_16= ruleXIssueExpression )";
+            return "1769:1: (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression | this_XGuardExpression_15= ruleXGuardExpression | this_XIssueExpression_16= ruleXIssueExpression )";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA41_0 = input.LA(1);
+                        int LA40_0 = input.LA(1);
 
                          
-                        int index41_0 = input.index();
+                        int index40_0 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA41_0==96) ) {s = 1;}
+                        if ( (LA40_0==96) ) {s = 1;}
 
-                        else if ( (LA41_0==19) ) {s = 2;}
+                        else if ( (LA40_0==18) ) {s = 2;}
 
-                        else if ( (LA41_0==87) ) {s = 3;}
+                        else if ( (LA40_0==87) ) {s = 3;}
 
-                        else if ( (LA41_0==105) && (synpred13_InternalCheck())) {s = 4;}
+                        else if ( (LA40_0==105) && (synpred13_InternalCheck())) {s = 4;}
 
-                        else if ( (LA41_0==RULE_ID||LA41_0==15||(LA41_0>=17 && LA41_0<=18)||LA41_0==21||LA41_0==23||LA41_0==27||LA41_0==29||(LA41_0>=38 && LA41_0<=50)||LA41_0==56||LA41_0==95) ) {s = 5;}
+                        else if ( (LA40_0==RULE_ID||LA40_0==15||LA40_0==17||LA40_0==20||LA40_0==22||LA40_0==26||LA40_0==28||(LA40_0>=37 && LA40_0<=50)||LA40_0==56||LA40_0==95) ) {s = 5;}
 
-                        else if ( ((LA41_0>=RULE_STRING && LA41_0<=RULE_DECIMAL)||(LA41_0>=33 && LA41_0<=34)||(LA41_0>=97 && LA41_0<=100)) ) {s = 28;}
+                        else if ( ((LA40_0>=RULE_STRING && LA40_0<=RULE_DECIMAL)||(LA40_0>=32 && LA40_0<=33)||(LA40_0>=97 && LA40_0<=100)) ) {s = 28;}
 
-                        else if ( (LA41_0==85) ) {s = 38;}
+                        else if ( (LA40_0==85) ) {s = 38;}
 
-                        else if ( (LA41_0==16) ) {s = 39;}
+                        else if ( (LA40_0==16) ) {s = 39;}
 
-                        else if ( (LA41_0==91) ) {s = 40;}
+                        else if ( (LA40_0==91) ) {s = 40;}
 
-                        else if ( (LA41_0==92) ) {s = 41;}
+                        else if ( (LA40_0==92) ) {s = 41;}
 
-                        else if ( (LA41_0==101) ) {s = 42;}
+                        else if ( (LA40_0==101) ) {s = 42;}
 
-                        else if ( (LA41_0==102) ) {s = 43;}
+                        else if ( (LA40_0==102) ) {s = 43;}
 
-                        else if ( (LA41_0==103) ) {s = 44;}
+                        else if ( (LA40_0==103) ) {s = 44;}
 
-                        else if ( (LA41_0==24) ) {s = 45;}
+                        else if ( (LA40_0==23) ) {s = 45;}
 
-                        else if ( (LA41_0==36) ) {s = 46;}
+                        else if ( (LA40_0==35) ) {s = 46;}
 
-                        else if ( (LA41_0==37) ) {s = 47;}
+                        else if ( (LA40_0==36) ) {s = 47;}
 
                          
-                        input.seek(index41_0);
+                        input.seek(index40_0);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA41_39 = input.LA(1);
+                        int LA40_39 = input.LA(1);
 
                          
-                        int index41_39 = input.index();
+                        int index40_39 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred14_InternalCheck()) ) {s = 48;}
@@ -26561,31 +26503,31 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 49;}
 
                          
-                        input.seek(index41_39);
+                        input.seek(index40_39);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 41, _s, input);
+                new NoViableAltException(getDescription(), 40, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA45_eotS =
+    static final String DFA44_eotS =
         "\12\uffff";
-    static final String DFA45_eofS =
+    static final String DFA44_eofS =
         "\1\2\11\uffff";
-    static final String DFA45_minS =
+    static final String DFA44_minS =
         "\1\10\1\0\10\uffff";
-    static final String DFA45_maxS =
+    static final String DFA44_maxS =
         "\1\104\1\0\10\uffff";
-    static final String DFA45_acceptS =
+    static final String DFA44_acceptS =
         "\2\uffff\1\2\6\uffff\1\1";
-    static final String DFA45_specialS =
+    static final String DFA44_specialS =
         "\1\uffff\1\0\10\uffff}>";
-    static final String[] DFA45_transitionS = {
-            "\1\2\17\uffff\1\1\2\2\1\uffff\1\2\6\uffff\1\2\40\uffff\1\2",
+    static final String[] DFA44_transitionS = {
+            "\1\2\16\uffff\1\1\2\2\1\uffff\1\2\6\uffff\1\2\41\uffff\1\2",
             "\1\uffff",
             "",
             "",
@@ -26597,47 +26539,47 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA45_eot = DFA.unpackEncodedString(DFA45_eotS);
-    static final short[] DFA45_eof = DFA.unpackEncodedString(DFA45_eofS);
-    static final char[] DFA45_min = DFA.unpackEncodedStringToUnsignedChars(DFA45_minS);
-    static final char[] DFA45_max = DFA.unpackEncodedStringToUnsignedChars(DFA45_maxS);
-    static final short[] DFA45_accept = DFA.unpackEncodedString(DFA45_acceptS);
-    static final short[] DFA45_special = DFA.unpackEncodedString(DFA45_specialS);
-    static final short[][] DFA45_transition;
+    static final short[] DFA44_eot = DFA.unpackEncodedString(DFA44_eotS);
+    static final short[] DFA44_eof = DFA.unpackEncodedString(DFA44_eofS);
+    static final char[] DFA44_min = DFA.unpackEncodedStringToUnsignedChars(DFA44_minS);
+    static final char[] DFA44_max = DFA.unpackEncodedStringToUnsignedChars(DFA44_maxS);
+    static final short[] DFA44_accept = DFA.unpackEncodedString(DFA44_acceptS);
+    static final short[] DFA44_special = DFA.unpackEncodedString(DFA44_specialS);
+    static final short[][] DFA44_transition;
 
     static {
-        int numStates = DFA45_transitionS.length;
-        DFA45_transition = new short[numStates][];
+        int numStates = DFA44_transitionS.length;
+        DFA44_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA45_transition[i] = DFA.unpackEncodedString(DFA45_transitionS[i]);
+            DFA44_transition[i] = DFA.unpackEncodedString(DFA44_transitionS[i]);
         }
     }
 
-    class DFA45 extends DFA {
+    class DFA44 extends DFA {
 
-        public DFA45(BaseRecognizer recognizer) {
+        public DFA44(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 45;
-            this.eot = DFA45_eot;
-            this.eof = DFA45_eof;
-            this.min = DFA45_min;
-            this.max = DFA45_max;
-            this.accept = DFA45_accept;
-            this.special = DFA45_special;
-            this.transition = DFA45_transition;
+            this.decisionNumber = 44;
+            this.eot = DFA44_eot;
+            this.eof = DFA44_eof;
+            this.min = DFA44_min;
+            this.max = DFA44_max;
+            this.accept = DFA44_accept;
+            this.special = DFA44_special;
+            this.transition = DFA44_transition;
         }
         public String getDescription() {
-            return "2186:2: ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )?";
+            return "2167:2: ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA45_1 = input.LA(1);
+                        int LA44_1 = input.LA(1);
 
                          
-                        int index45_1 = input.index();
+                        int index44_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred15_InternalCheck()) ) {s = 9;}
@@ -26645,32 +26587,32 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index45_1);
+                        input.seek(index44_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 45, _s, input);
+                new NoViableAltException(getDescription(), 44, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA44_eotS =
+    static final String DFA43_eotS =
         "\66\uffff";
-    static final String DFA44_eofS =
+    static final String DFA43_eofS =
         "\66\uffff";
-    static final String DFA44_minS =
+    static final String DFA43_minS =
         "\1\4\1\0\64\uffff";
-    static final String DFA44_maxS =
+    static final String DFA43_maxS =
         "\1\151\1\0\64\uffff";
-    static final String DFA44_acceptS =
+    static final String DFA43_acceptS =
         "\2\uffff\1\2\61\uffff\1\3\1\1";
-    static final String DFA44_specialS =
+    static final String DFA43_specialS =
         "\1\uffff\1\0\64\uffff}>";
-    static final String[] DFA44_transitionS = {
-            "\4\2\1\1\6\uffff\5\2\1\uffff\1\2\1\uffff\2\2\1\uffff\1\64\3"+
-            "\2\3\uffff\2\2\1\uffff\17\2\5\uffff\1\2\16\uffff\2\2\4\uffff"+
+    static final String[] DFA43_transitionS = {
+            "\4\2\1\1\6\uffff\4\2\1\uffff\1\2\1\uffff\2\2\1\uffff\1\64\3"+
+            "\2\3\uffff\2\2\1\uffff\20\2\5\uffff\1\2\16\uffff\2\2\4\uffff"+
             "\1\2\7\uffff\1\2\1\uffff\1\2\3\uffff\2\2\2\uffff\11\2\1\uffff"+
             "\1\2",
             "\1\uffff",
@@ -26728,47 +26670,47 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA44_eot = DFA.unpackEncodedString(DFA44_eotS);
-    static final short[] DFA44_eof = DFA.unpackEncodedString(DFA44_eofS);
-    static final char[] DFA44_min = DFA.unpackEncodedStringToUnsignedChars(DFA44_minS);
-    static final char[] DFA44_max = DFA.unpackEncodedStringToUnsignedChars(DFA44_maxS);
-    static final short[] DFA44_accept = DFA.unpackEncodedString(DFA44_acceptS);
-    static final short[] DFA44_special = DFA.unpackEncodedString(DFA44_specialS);
-    static final short[][] DFA44_transition;
+    static final short[] DFA43_eot = DFA.unpackEncodedString(DFA43_eotS);
+    static final short[] DFA43_eof = DFA.unpackEncodedString(DFA43_eofS);
+    static final char[] DFA43_min = DFA.unpackEncodedStringToUnsignedChars(DFA43_minS);
+    static final char[] DFA43_max = DFA.unpackEncodedStringToUnsignedChars(DFA43_maxS);
+    static final short[] DFA43_accept = DFA.unpackEncodedString(DFA43_acceptS);
+    static final short[] DFA43_special = DFA.unpackEncodedString(DFA43_specialS);
+    static final short[][] DFA43_transition;
 
     static {
-        int numStates = DFA44_transitionS.length;
-        DFA44_transition = new short[numStates][];
+        int numStates = DFA43_transitionS.length;
+        DFA43_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA44_transition[i] = DFA.unpackEncodedString(DFA44_transitionS[i]);
+            DFA43_transition[i] = DFA.unpackEncodedString(DFA43_transitionS[i]);
         }
     }
 
-    class DFA44 extends DFA {
+    class DFA43 extends DFA {
 
-        public DFA44(BaseRecognizer recognizer) {
+        public DFA43(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 44;
-            this.eot = DFA44_eot;
-            this.eof = DFA44_eof;
-            this.min = DFA44_min;
-            this.max = DFA44_max;
-            this.accept = DFA44_accept;
-            this.special = DFA44_special;
-            this.transition = DFA44_transition;
+            this.decisionNumber = 43;
+            this.eot = DFA43_eot;
+            this.eof = DFA43_eof;
+            this.min = DFA43_min;
+            this.max = DFA43_max;
+            this.accept = DFA43_accept;
+            this.special = DFA43_special;
+            this.transition = DFA43_transition;
         }
         public String getDescription() {
-            return "2191:2: ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )?";
+            return "2172:2: ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA44_1 = input.LA(1);
+                        int LA43_1 = input.LA(1);
 
                          
-                        int index44_1 = input.index();
+                        int index43_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred16_InternalCheck()) ) {s = 53;}
@@ -26776,32 +26718,32 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index44_1);
+                        input.seek(index43_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 44, _s, input);
+                new NoViableAltException(getDescription(), 43, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA50_eotS =
+    static final String DFA49_eotS =
         "\65\uffff";
-    static final String DFA50_eofS =
+    static final String DFA49_eofS =
         "\65\uffff";
-    static final String DFA50_minS =
+    static final String DFA49_minS =
         "\1\4\1\0\63\uffff";
-    static final String DFA50_maxS =
+    static final String DFA49_maxS =
         "\1\151\1\0\63\uffff";
-    static final String DFA50_acceptS =
+    static final String DFA49_acceptS =
         "\2\uffff\1\2\61\uffff\1\1";
-    static final String DFA50_specialS =
+    static final String DFA49_specialS =
         "\1\uffff\1\0\63\uffff}>";
-    static final String[] DFA50_transitionS = {
-            "\5\2\6\uffff\5\2\1\uffff\1\2\1\uffff\2\2\2\uffff\3\2\3\uffff"+
-            "\1\1\1\2\1\uffff\17\2\5\uffff\1\2\16\uffff\2\2\4\uffff\1\2\7"+
+    static final String[] DFA49_transitionS = {
+            "\5\2\6\uffff\4\2\1\uffff\1\2\1\uffff\2\2\2\uffff\3\2\3\uffff"+
+            "\1\1\1\2\1\uffff\20\2\5\uffff\1\2\16\uffff\2\2\4\uffff\1\2\7"+
             "\uffff\1\2\1\uffff\1\2\3\uffff\2\2\2\uffff\11\2\1\uffff\1\2",
             "\1\uffff",
             "",
@@ -26857,47 +26799,47 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA50_eot = DFA.unpackEncodedString(DFA50_eotS);
-    static final short[] DFA50_eof = DFA.unpackEncodedString(DFA50_eofS);
-    static final char[] DFA50_min = DFA.unpackEncodedStringToUnsignedChars(DFA50_minS);
-    static final char[] DFA50_max = DFA.unpackEncodedStringToUnsignedChars(DFA50_maxS);
-    static final short[] DFA50_accept = DFA.unpackEncodedString(DFA50_acceptS);
-    static final short[] DFA50_special = DFA.unpackEncodedString(DFA50_specialS);
-    static final short[][] DFA50_transition;
+    static final short[] DFA49_eot = DFA.unpackEncodedString(DFA49_eotS);
+    static final short[] DFA49_eof = DFA.unpackEncodedString(DFA49_eofS);
+    static final char[] DFA49_min = DFA.unpackEncodedStringToUnsignedChars(DFA49_minS);
+    static final char[] DFA49_max = DFA.unpackEncodedStringToUnsignedChars(DFA49_maxS);
+    static final short[] DFA49_accept = DFA.unpackEncodedString(DFA49_acceptS);
+    static final short[] DFA49_special = DFA.unpackEncodedString(DFA49_specialS);
+    static final short[][] DFA49_transition;
 
     static {
-        int numStates = DFA50_transitionS.length;
-        DFA50_transition = new short[numStates][];
+        int numStates = DFA49_transitionS.length;
+        DFA49_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA50_transition[i] = DFA.unpackEncodedString(DFA50_transitionS[i]);
+            DFA49_transition[i] = DFA.unpackEncodedString(DFA49_transitionS[i]);
         }
     }
 
-    class DFA50 extends DFA {
+    class DFA49 extends DFA {
 
-        public DFA50(BaseRecognizer recognizer) {
+        public DFA49(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 50;
-            this.eot = DFA50_eot;
-            this.eof = DFA50_eof;
-            this.min = DFA50_min;
-            this.max = DFA50_max;
-            this.accept = DFA50_accept;
-            this.special = DFA50_special;
-            this.transition = DFA50_transition;
+            this.decisionNumber = 49;
+            this.eot = DFA49_eot;
+            this.eof = DFA49_eof;
+            this.min = DFA49_min;
+            this.max = DFA49_max;
+            this.accept = DFA49_accept;
+            this.special = DFA49_special;
+            this.transition = DFA49_transition;
         }
         public String getDescription() {
-            return "2348:1: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? ) )";
+            return "2329:1: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? ) )";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA50_1 = input.LA(1);
+                        int LA49_1 = input.LA(1);
 
                          
-                        int index50_1 = input.index();
+                        int index49_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred19_InternalCheck()) ) {s = 52;}
@@ -26905,32 +26847,32 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index50_1);
+                        input.seek(index49_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 50, _s, input);
+                new NoViableAltException(getDescription(), 49, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA53_eotS =
+    static final String DFA52_eotS =
         "\65\uffff";
-    static final String DFA53_eofS =
+    static final String DFA52_eofS =
         "\65\uffff";
-    static final String DFA53_minS =
+    static final String DFA52_minS =
         "\1\4\1\0\63\uffff";
-    static final String DFA53_maxS =
+    static final String DFA52_maxS =
         "\1\151\1\0\63\uffff";
-    static final String DFA53_acceptS =
+    static final String DFA52_acceptS =
         "\2\uffff\1\2\61\uffff\1\1";
-    static final String DFA53_specialS =
+    static final String DFA52_specialS =
         "\1\uffff\1\0\63\uffff}>";
-    static final String[] DFA53_transitionS = {
-            "\5\2\6\uffff\5\2\1\uffff\1\2\1\uffff\2\2\2\uffff\3\2\3\uffff"+
-            "\1\1\1\2\1\uffff\17\2\5\uffff\1\2\16\uffff\2\2\4\uffff\1\2\7"+
+    static final String[] DFA52_transitionS = {
+            "\5\2\6\uffff\4\2\1\uffff\1\2\1\uffff\2\2\2\uffff\3\2\3\uffff"+
+            "\1\1\1\2\1\uffff\20\2\5\uffff\1\2\16\uffff\2\2\4\uffff\1\2\7"+
             "\uffff\1\2\1\uffff\1\2\3\uffff\2\2\2\uffff\11\2\1\uffff\1\2",
             "\1\uffff",
             "",
@@ -26986,47 +26928,47 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA53_eot = DFA.unpackEncodedString(DFA53_eotS);
-    static final short[] DFA53_eof = DFA.unpackEncodedString(DFA53_eofS);
-    static final char[] DFA53_min = DFA.unpackEncodedStringToUnsignedChars(DFA53_minS);
-    static final char[] DFA53_max = DFA.unpackEncodedStringToUnsignedChars(DFA53_maxS);
-    static final short[] DFA53_accept = DFA.unpackEncodedString(DFA53_acceptS);
-    static final short[] DFA53_special = DFA.unpackEncodedString(DFA53_specialS);
-    static final short[][] DFA53_transition;
+    static final short[] DFA52_eot = DFA.unpackEncodedString(DFA52_eotS);
+    static final short[] DFA52_eof = DFA.unpackEncodedString(DFA52_eofS);
+    static final char[] DFA52_min = DFA.unpackEncodedStringToUnsignedChars(DFA52_minS);
+    static final char[] DFA52_max = DFA.unpackEncodedStringToUnsignedChars(DFA52_maxS);
+    static final short[] DFA52_accept = DFA.unpackEncodedString(DFA52_acceptS);
+    static final short[] DFA52_special = DFA.unpackEncodedString(DFA52_specialS);
+    static final short[][] DFA52_transition;
 
     static {
-        int numStates = DFA53_transitionS.length;
-        DFA53_transition = new short[numStates][];
+        int numStates = DFA52_transitionS.length;
+        DFA52_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA53_transition[i] = DFA.unpackEncodedString(DFA53_transitionS[i]);
+            DFA52_transition[i] = DFA.unpackEncodedString(DFA52_transitionS[i]);
         }
     }
 
-    class DFA53 extends DFA {
+    class DFA52 extends DFA {
 
-        public DFA53(BaseRecognizer recognizer) {
+        public DFA52(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 53;
-            this.eot = DFA53_eot;
-            this.eof = DFA53_eof;
-            this.min = DFA53_min;
-            this.max = DFA53_max;
-            this.accept = DFA53_accept;
-            this.special = DFA53_special;
-            this.transition = DFA53_transition;
+            this.decisionNumber = 52;
+            this.eot = DFA52_eot;
+            this.eof = DFA52_eof;
+            this.min = DFA52_min;
+            this.max = DFA52_max;
+            this.accept = DFA52_accept;
+            this.special = DFA52_special;
+            this.transition = DFA52_transition;
         }
         public String getDescription() {
-            return "2468:1: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression )";
+            return "2449:1: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression )";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA53_1 = input.LA(1);
+                        int LA52_1 = input.LA(1);
 
                          
-                        int index53_1 = input.index();
+                        int index52_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred20_InternalCheck()) ) {s = 52;}
@@ -27034,128 +26976,128 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index53_1);
+                        input.seek(index52_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 53, _s, input);
+                new NoViableAltException(getDescription(), 52, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA56_eotS =
+    static final String DFA55_eotS =
         "\30\uffff";
-    static final String DFA56_eofS =
+    static final String DFA55_eofS =
         "\1\uffff\25\26\2\uffff";
-    static final String DFA56_minS =
+    static final String DFA55_minS =
         "\26\4\2\uffff";
-    static final String DFA56_maxS =
+    static final String DFA55_maxS =
         "\1\151\25\152\2\uffff";
-    static final String DFA56_acceptS =
+    static final String DFA55_acceptS =
         "\26\uffff\1\2\1\1";
-    static final String DFA56_specialS =
+    static final String DFA55_specialS =
         "\30\uffff}>";
-    static final String[] DFA56_transitionS = {
-            "\4\26\1\1\6\uffff\1\6\1\26\1\7\1\10\1\26\1\uffff\1\4\1\uffff"+
-            "\1\11\1\26\2\uffff\1\12\1\uffff\1\16\3\uffff\2\26\1\uffff\2"+
-            "\26\1\13\1\14\1\15\1\2\1\3\1\5\1\17\1\20\1\21\1\22\1\23\1\24"+
+    static final String[] DFA55_transitionS = {
+            "\4\26\1\1\6\uffff\1\6\1\26\1\7\1\26\1\uffff\1\4\1\uffff\1\11"+
+            "\1\26\2\uffff\1\12\1\uffff\1\16\3\uffff\2\26\1\uffff\2\26\1"+
+            "\13\1\14\1\15\1\2\1\3\1\5\1\10\1\17\1\20\1\21\1\22\1\23\1\24"+
             "\1\25\5\uffff\1\26\16\uffff\2\26\4\uffff\1\26\7\uffff\1\26\1"+
             "\uffff\1\26\3\uffff\2\26\2\uffff\11\26\1\uffff\1\26",
-            "\5\26\6\uffff\15\26\1\uffff\2\26\1\uffff\1\27\63\26\1\uffff"+
+            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff"+
             "\26\26",
-            "\5\26\6\uffff\15\26\1\uffff\2\26\1\uffff\1\27\63\26\1\uffff"+
+            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff"+
             "\26\26",
-            "\5\26\6\uffff\15\26\1\uffff\2\26\1\uffff\1\27\63\26\1\uffff"+
+            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff"+
             "\26\26",
-            "\5\26\6\uffff\15\26\1\uffff\2\26\1\uffff\1\27\63\26\1\uffff"+
+            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff"+
             "\26\26",
-            "\5\26\6\uffff\15\26\1\uffff\2\26\1\uffff\1\27\63\26\1\uffff"+
+            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff"+
             "\26\26",
-            "\5\26\6\uffff\15\26\1\uffff\2\26\1\uffff\1\27\63\26\1\uffff"+
+            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff"+
             "\26\26",
-            "\5\26\6\uffff\15\26\1\uffff\2\26\1\uffff\1\27\63\26\1\uffff"+
+            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff"+
             "\26\26",
-            "\5\26\6\uffff\15\26\1\uffff\2\26\1\uffff\1\27\63\26\1\uffff"+
+            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff"+
             "\26\26",
-            "\5\26\6\uffff\15\26\1\uffff\2\26\1\uffff\1\27\63\26\1\uffff"+
+            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff"+
             "\26\26",
-            "\5\26\6\uffff\15\26\1\uffff\2\26\1\uffff\1\27\63\26\1\uffff"+
+            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff"+
             "\26\26",
-            "\5\26\6\uffff\15\26\1\uffff\2\26\1\uffff\1\27\63\26\1\uffff"+
+            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff"+
             "\26\26",
-            "\5\26\6\uffff\15\26\1\uffff\2\26\1\uffff\1\27\63\26\1\uffff"+
+            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff"+
             "\26\26",
-            "\5\26\6\uffff\15\26\1\uffff\2\26\1\uffff\1\27\63\26\1\uffff"+
+            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff"+
             "\26\26",
-            "\5\26\6\uffff\15\26\1\uffff\2\26\1\uffff\1\27\63\26\1\uffff"+
+            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff"+
             "\26\26",
-            "\5\26\6\uffff\15\26\1\uffff\2\26\1\uffff\1\27\63\26\1\uffff"+
+            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff"+
             "\26\26",
-            "\5\26\6\uffff\15\26\1\uffff\2\26\1\uffff\1\27\63\26\1\uffff"+
+            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff"+
             "\26\26",
-            "\5\26\6\uffff\15\26\1\uffff\2\26\1\uffff\1\27\63\26\1\uffff"+
+            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff"+
             "\26\26",
-            "\5\26\6\uffff\15\26\1\uffff\2\26\1\uffff\1\27\63\26\1\uffff"+
+            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff"+
             "\26\26",
-            "\5\26\6\uffff\15\26\1\uffff\2\26\1\uffff\1\27\63\26\1\uffff"+
+            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff"+
             "\26\26",
-            "\5\26\6\uffff\15\26\1\uffff\2\26\1\uffff\1\27\63\26\1\uffff"+
+            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff"+
             "\26\26",
-            "\5\26\6\uffff\15\26\1\uffff\2\26\1\uffff\1\27\63\26\1\uffff"+
+            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff"+
             "\26\26",
             "",
             ""
     };
 
-    static final short[] DFA56_eot = DFA.unpackEncodedString(DFA56_eotS);
-    static final short[] DFA56_eof = DFA.unpackEncodedString(DFA56_eofS);
-    static final char[] DFA56_min = DFA.unpackEncodedStringToUnsignedChars(DFA56_minS);
-    static final char[] DFA56_max = DFA.unpackEncodedStringToUnsignedChars(DFA56_maxS);
-    static final short[] DFA56_accept = DFA.unpackEncodedString(DFA56_acceptS);
-    static final short[] DFA56_special = DFA.unpackEncodedString(DFA56_specialS);
-    static final short[][] DFA56_transition;
+    static final short[] DFA55_eot = DFA.unpackEncodedString(DFA55_eotS);
+    static final short[] DFA55_eof = DFA.unpackEncodedString(DFA55_eofS);
+    static final char[] DFA55_min = DFA.unpackEncodedStringToUnsignedChars(DFA55_minS);
+    static final char[] DFA55_max = DFA.unpackEncodedStringToUnsignedChars(DFA55_maxS);
+    static final short[] DFA55_accept = DFA.unpackEncodedString(DFA55_acceptS);
+    static final short[] DFA55_special = DFA.unpackEncodedString(DFA55_specialS);
+    static final short[][] DFA55_transition;
 
     static {
-        int numStates = DFA56_transitionS.length;
-        DFA56_transition = new short[numStates][];
+        int numStates = DFA55_transitionS.length;
+        DFA55_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA56_transition[i] = DFA.unpackEncodedString(DFA56_transitionS[i]);
+            DFA55_transition[i] = DFA.unpackEncodedString(DFA55_transitionS[i]);
         }
     }
 
-    class DFA56 extends DFA {
+    class DFA55 extends DFA {
 
-        public DFA56(BaseRecognizer recognizer) {
+        public DFA55(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 56;
-            this.eot = DFA56_eot;
-            this.eof = DFA56_eof;
-            this.min = DFA56_min;
-            this.max = DFA56_max;
-            this.accept = DFA56_accept;
-            this.special = DFA56_special;
-            this.transition = DFA56_transition;
+            this.decisionNumber = 55;
+            this.eot = DFA55_eot;
+            this.eof = DFA55_eof;
+            this.min = DFA55_min;
+            this.max = DFA55_max;
+            this.accept = DFA55_accept;
+            this.special = DFA55_special;
+            this.transition = DFA55_transition;
         }
         public String getDescription() {
-            return "2630:1: ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) )";
+            return "2611:1: ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) )";
         }
     }
-    static final String DFA55_eotS =
+    static final String DFA54_eotS =
         "\12\uffff";
-    static final String DFA55_eofS =
+    static final String DFA54_eofS =
         "\1\10\11\uffff";
-    static final String DFA55_minS =
+    static final String DFA54_minS =
         "\1\4\7\0\2\uffff";
-    static final String DFA55_maxS =
+    static final String DFA54_maxS =
         "\1\152\7\0\2\uffff";
-    static final String DFA55_acceptS =
+    static final String DFA54_acceptS =
         "\10\uffff\1\2\1\1";
-    static final String DFA55_specialS =
-        "\1\uffff\1\0\1\1\1\2\1\3\1\4\1\6\1\5\2\uffff}>";
-    static final String[] DFA55_transitionS = {
-            "\5\10\6\uffff\15\10\1\uffff\2\10\2\uffff\22\10\1\1\1\2\1\3"+
+    static final String DFA54_specialS =
+        "\1\uffff\1\2\1\3\1\4\1\5\1\6\1\1\1\0\2\uffff}>";
+    static final String[] DFA54_transitionS = {
+            "\5\10\6\uffff\14\10\1\uffff\2\10\2\uffff\23\10\1\1\1\2\1\3"+
             "\1\4\1\5\1\6\1\7\32\10\1\uffff\26\10",
             "\1\uffff",
             "\1\uffff",
@@ -27168,47 +27110,47 @@ public String getDescription() {
             ""
     };
 
-    static final short[] DFA55_eot = DFA.unpackEncodedString(DFA55_eotS);
-    static final short[] DFA55_eof = DFA.unpackEncodedString(DFA55_eofS);
-    static final char[] DFA55_min = DFA.unpackEncodedStringToUnsignedChars(DFA55_minS);
-    static final char[] DFA55_max = DFA.unpackEncodedStringToUnsignedChars(DFA55_maxS);
-    static final short[] DFA55_accept = DFA.unpackEncodedString(DFA55_acceptS);
-    static final short[] DFA55_special = DFA.unpackEncodedString(DFA55_specialS);
-    static final short[][] DFA55_transition;
+    static final short[] DFA54_eot = DFA.unpackEncodedString(DFA54_eotS);
+    static final short[] DFA54_eof = DFA.unpackEncodedString(DFA54_eofS);
+    static final char[] DFA54_min = DFA.unpackEncodedStringToUnsignedChars(DFA54_minS);
+    static final char[] DFA54_max = DFA.unpackEncodedStringToUnsignedChars(DFA54_maxS);
+    static final short[] DFA54_accept = DFA.unpackEncodedString(DFA54_acceptS);
+    static final short[] DFA54_special = DFA.unpackEncodedString(DFA54_specialS);
+    static final short[][] DFA54_transition;
 
     static {
-        int numStates = DFA55_transitionS.length;
-        DFA55_transition = new short[numStates][];
+        int numStates = DFA54_transitionS.length;
+        DFA54_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA55_transition[i] = DFA.unpackEncodedString(DFA55_transitionS[i]);
+            DFA54_transition[i] = DFA.unpackEncodedString(DFA54_transitionS[i]);
         }
     }
 
-    class DFA55 extends DFA {
+    class DFA54 extends DFA {
 
-        public DFA55(BaseRecognizer recognizer) {
+        public DFA54(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 55;
-            this.eot = DFA55_eot;
-            this.eof = DFA55_eof;
-            this.min = DFA55_min;
-            this.max = DFA55_max;
-            this.accept = DFA55_accept;
-            this.special = DFA55_special;
-            this.transition = DFA55_transition;
+            this.decisionNumber = 54;
+            this.eot = DFA54_eot;
+            this.eof = DFA54_eof;
+            this.min = DFA54_min;
+            this.max = DFA54_max;
+            this.accept = DFA54_accept;
+            this.special = DFA54_special;
+            this.transition = DFA54_transition;
         }
         public String getDescription() {
-            return "2687:1: ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )?";
+            return "2668:1: ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA55_1 = input.LA(1);
+                        int LA54_7 = input.LA(1);
 
                          
-                        int index55_1 = input.index();
+                        int index54_7 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred21_InternalCheck()) ) {s = 9;}
@@ -27216,14 +27158,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 8;}
 
                          
-                        input.seek(index55_1);
+                        input.seek(index54_7);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA55_2 = input.LA(1);
+                        int LA54_6 = input.LA(1);
 
                          
-                        int index55_2 = input.index();
+                        int index54_6 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred21_InternalCheck()) ) {s = 9;}
@@ -27231,14 +27173,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 8;}
 
                          
-                        input.seek(index55_2);
+                        input.seek(index54_6);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA55_3 = input.LA(1);
+                        int LA54_1 = input.LA(1);
 
                          
-                        int index55_3 = input.index();
+                        int index54_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred21_InternalCheck()) ) {s = 9;}
@@ -27246,14 +27188,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 8;}
 
                          
-                        input.seek(index55_3);
+                        input.seek(index54_1);
                         if ( s>=0 ) return s;
                         break;
                     case 3 : 
-                        int LA55_4 = input.LA(1);
+                        int LA54_2 = input.LA(1);
 
                          
-                        int index55_4 = input.index();
+                        int index54_2 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred21_InternalCheck()) ) {s = 9;}
@@ -27261,14 +27203,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 8;}
 
                          
-                        input.seek(index55_4);
+                        input.seek(index54_2);
                         if ( s>=0 ) return s;
                         break;
                     case 4 : 
-                        int LA55_5 = input.LA(1);
+                        int LA54_3 = input.LA(1);
 
                          
-                        int index55_5 = input.index();
+                        int index54_3 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred21_InternalCheck()) ) {s = 9;}
@@ -27276,14 +27218,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 8;}
 
                          
-                        input.seek(index55_5);
+                        input.seek(index54_3);
                         if ( s>=0 ) return s;
                         break;
                     case 5 : 
-                        int LA55_7 = input.LA(1);
+                        int LA54_4 = input.LA(1);
 
                          
-                        int index55_7 = input.index();
+                        int index54_4 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred21_InternalCheck()) ) {s = 9;}
@@ -27291,14 +27233,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 8;}
 
                          
-                        input.seek(index55_7);
+                        input.seek(index54_4);
                         if ( s>=0 ) return s;
                         break;
                     case 6 : 
-                        int LA55_6 = input.LA(1);
+                        int LA54_5 = input.LA(1);
 
                          
-                        int index55_6 = input.index();
+                        int index54_5 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred21_InternalCheck()) ) {s = 9;}
@@ -27306,31 +27248,31 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 8;}
 
                          
-                        input.seek(index55_6);
+                        input.seek(index54_5);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 55, _s, input);
+                new NoViableAltException(getDescription(), 54, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA65_eotS =
+    static final String DFA64_eotS =
         "\13\uffff";
-    static final String DFA65_eofS =
+    static final String DFA64_eofS =
         "\1\1\12\uffff";
-    static final String DFA65_minS =
+    static final String DFA64_minS =
         "\1\4\1\uffff\10\0\1\uffff";
-    static final String DFA65_maxS =
+    static final String DFA64_maxS =
         "\1\152\1\uffff\10\0\1\uffff";
-    static final String DFA65_acceptS =
+    static final String DFA64_acceptS =
         "\1\uffff\1\2\10\uffff\1\1";
-    static final String DFA65_specialS =
-        "\2\uffff\1\3\1\4\1\5\1\6\1\7\1\2\1\0\1\1\1\uffff}>";
-    static final String[] DFA65_transitionS = {
-            "\5\1\6\uffff\15\1\1\uffff\1\1\1\6\2\uffff\27\1\1\2\1\3\10\1"+
+    static final String DFA64_specialS =
+        "\2\uffff\1\5\1\2\1\3\1\4\1\7\1\6\1\0\1\1\1\uffff}>";
+    static final String[] DFA64_transitionS = {
+            "\5\1\6\uffff\14\1\1\uffff\1\1\1\6\2\uffff\30\1\1\2\1\3\10\1"+
             "\1\4\1\5\1\7\1\10\1\11\15\1\1\uffff\26\1",
             "",
             "\1\uffff",
@@ -27344,47 +27286,47 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA65_eot = DFA.unpackEncodedString(DFA65_eotS);
-    static final short[] DFA65_eof = DFA.unpackEncodedString(DFA65_eofS);
-    static final char[] DFA65_min = DFA.unpackEncodedStringToUnsignedChars(DFA65_minS);
-    static final char[] DFA65_max = DFA.unpackEncodedStringToUnsignedChars(DFA65_maxS);
-    static final short[] DFA65_accept = DFA.unpackEncodedString(DFA65_acceptS);
-    static final short[] DFA65_special = DFA.unpackEncodedString(DFA65_specialS);
-    static final short[][] DFA65_transition;
+    static final short[] DFA64_eot = DFA.unpackEncodedString(DFA64_eotS);
+    static final short[] DFA64_eof = DFA.unpackEncodedString(DFA64_eofS);
+    static final char[] DFA64_min = DFA.unpackEncodedStringToUnsignedChars(DFA64_minS);
+    static final char[] DFA64_max = DFA.unpackEncodedStringToUnsignedChars(DFA64_maxS);
+    static final short[] DFA64_accept = DFA.unpackEncodedString(DFA64_acceptS);
+    static final short[] DFA64_special = DFA.unpackEncodedString(DFA64_specialS);
+    static final short[][] DFA64_transition;
 
     static {
-        int numStates = DFA65_transitionS.length;
-        DFA65_transition = new short[numStates][];
+        int numStates = DFA64_transitionS.length;
+        DFA64_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA65_transition[i] = DFA.unpackEncodedString(DFA65_transitionS[i]);
+            DFA64_transition[i] = DFA.unpackEncodedString(DFA64_transitionS[i]);
         }
     }
 
-    class DFA65 extends DFA {
+    class DFA64 extends DFA {
 
-        public DFA65(BaseRecognizer recognizer) {
+        public DFA64(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 65;
-            this.eot = DFA65_eot;
-            this.eof = DFA65_eof;
-            this.min = DFA65_min;
-            this.max = DFA65_max;
-            this.accept = DFA65_accept;
-            this.special = DFA65_special;
-            this.transition = DFA65_transition;
+            this.decisionNumber = 64;
+            this.eot = DFA64_eot;
+            this.eof = DFA64_eof;
+            this.min = DFA64_min;
+            this.max = DFA64_max;
+            this.accept = DFA64_accept;
+            this.special = DFA64_special;
+            this.transition = DFA64_transition;
         }
         public String getDescription() {
-            return "()* loopback of 3364:1: ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )*";
+            return "()* loopback of 3345:1: ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )*";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA65_8 = input.LA(1);
+                        int LA64_8 = input.LA(1);
 
                          
-                        int index65_8 = input.index();
+                        int index64_8 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred27_InternalCheck()) ) {s = 10;}
@@ -27392,14 +27334,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index65_8);
+                        input.seek(index64_8);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA65_9 = input.LA(1);
+                        int LA64_9 = input.LA(1);
 
                          
-                        int index65_9 = input.index();
+                        int index64_9 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred27_InternalCheck()) ) {s = 10;}
@@ -27407,14 +27349,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index65_9);
+                        input.seek(index64_9);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA65_7 = input.LA(1);
+                        int LA64_3 = input.LA(1);
 
                          
-                        int index65_7 = input.index();
+                        int index64_3 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred27_InternalCheck()) ) {s = 10;}
@@ -27422,14 +27364,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index65_7);
+                        input.seek(index64_3);
                         if ( s>=0 ) return s;
                         break;
                     case 3 : 
-                        int LA65_2 = input.LA(1);
+                        int LA64_4 = input.LA(1);
 
                          
-                        int index65_2 = input.index();
+                        int index64_4 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred27_InternalCheck()) ) {s = 10;}
@@ -27437,14 +27379,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index65_2);
+                        input.seek(index64_4);
                         if ( s>=0 ) return s;
                         break;
                     case 4 : 
-                        int LA65_3 = input.LA(1);
+                        int LA64_5 = input.LA(1);
 
                          
-                        int index65_3 = input.index();
+                        int index64_5 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred27_InternalCheck()) ) {s = 10;}
@@ -27452,14 +27394,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index65_3);
+                        input.seek(index64_5);
                         if ( s>=0 ) return s;
                         break;
                     case 5 : 
-                        int LA65_4 = input.LA(1);
+                        int LA64_2 = input.LA(1);
 
                          
-                        int index65_4 = input.index();
+                        int index64_2 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred27_InternalCheck()) ) {s = 10;}
@@ -27467,14 +27409,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index65_4);
+                        input.seek(index64_2);
                         if ( s>=0 ) return s;
                         break;
                     case 6 : 
-                        int LA65_5 = input.LA(1);
+                        int LA64_7 = input.LA(1);
 
                          
-                        int index65_5 = input.index();
+                        int index64_7 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred27_InternalCheck()) ) {s = 10;}
@@ -27482,14 +27424,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index65_5);
+                        input.seek(index64_7);
                         if ( s>=0 ) return s;
                         break;
                     case 7 : 
-                        int LA65_6 = input.LA(1);
+                        int LA64_6 = input.LA(1);
 
                          
-                        int index65_6 = input.index();
+                        int index64_6 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred27_InternalCheck()) ) {s = 10;}
@@ -27497,34 +27439,34 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index65_6);
+                        input.seek(index64_6);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 65, _s, input);
+                new NoViableAltException(getDescription(), 64, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA68_eotS =
+    static final String DFA67_eotS =
         "\13\uffff";
-    static final String DFA68_eofS =
+    static final String DFA67_eofS =
         "\13\uffff";
-    static final String DFA68_minS =
-        "\1\36\2\uffff\1\36\7\uffff";
-    static final String DFA68_maxS =
+    static final String DFA67_minS =
+        "\1\35\2\uffff\1\35\7\uffff";
+    static final String DFA67_maxS =
         "\1\106\2\uffff\1\71\7\uffff";
-    static final String DFA68_acceptS =
+    static final String DFA67_acceptS =
         "\1\uffff\1\1\1\2\1\uffff\1\4\1\5\1\7\1\10\1\11\1\3\1\6";
-    static final String DFA68_specialS =
+    static final String DFA67_specialS =
         "\13\uffff}>";
-    static final String[] DFA68_transitionS = {
-            "\1\4\31\uffff\1\6\1\3\10\uffff\1\1\1\2\1\5\1\7\1\10",
+    static final String[] DFA67_transitionS = {
+            "\1\4\32\uffff\1\6\1\3\10\uffff\1\1\1\2\1\5\1\7\1\10",
             "",
             "",
-            "\1\11\32\uffff\1\12",
+            "\1\11\33\uffff\1\12",
             "",
             "",
             "",
@@ -27534,53 +27476,53 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA68_eot = DFA.unpackEncodedString(DFA68_eotS);
-    static final short[] DFA68_eof = DFA.unpackEncodedString(DFA68_eofS);
-    static final char[] DFA68_min = DFA.unpackEncodedStringToUnsignedChars(DFA68_minS);
-    static final char[] DFA68_max = DFA.unpackEncodedStringToUnsignedChars(DFA68_maxS);
-    static final short[] DFA68_accept = DFA.unpackEncodedString(DFA68_acceptS);
-    static final short[] DFA68_special = DFA.unpackEncodedString(DFA68_specialS);
-    static final short[][] DFA68_transition;
+    static final short[] DFA67_eot = DFA.unpackEncodedString(DFA67_eotS);
+    static final short[] DFA67_eof = DFA.unpackEncodedString(DFA67_eofS);
+    static final char[] DFA67_min = DFA.unpackEncodedStringToUnsignedChars(DFA67_minS);
+    static final char[] DFA67_max = DFA.unpackEncodedStringToUnsignedChars(DFA67_maxS);
+    static final short[] DFA67_accept = DFA.unpackEncodedString(DFA67_acceptS);
+    static final short[] DFA67_special = DFA.unpackEncodedString(DFA67_specialS);
+    static final short[][] DFA67_transition;
 
     static {
-        int numStates = DFA68_transitionS.length;
-        DFA68_transition = new short[numStates][];
+        int numStates = DFA67_transitionS.length;
+        DFA67_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA68_transition[i] = DFA.unpackEncodedString(DFA68_transitionS[i]);
+            DFA67_transition[i] = DFA.unpackEncodedString(DFA67_transitionS[i]);
         }
     }
 
-    class DFA68 extends DFA {
+    class DFA67 extends DFA {
 
-        public DFA68(BaseRecognizer recognizer) {
+        public DFA67(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 68;
-            this.eot = DFA68_eot;
-            this.eof = DFA68_eof;
-            this.min = DFA68_min;
-            this.max = DFA68_max;
-            this.accept = DFA68_accept;
-            this.special = DFA68_special;
-            this.transition = DFA68_transition;
+            this.decisionNumber = 67;
+            this.eot = DFA67_eot;
+            this.eof = DFA67_eof;
+            this.min = DFA67_min;
+            this.max = DFA67_max;
+            this.accept = DFA67_accept;
+            this.special = DFA67_special;
+            this.transition = DFA67_transition;
         }
         public String getDescription() {
-            return "3429:1: (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' )";
+            return "3410:1: (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' )";
         }
     }
-    static final String DFA84_eotS =
+    static final String DFA83_eotS =
         "\140\uffff";
-    static final String DFA84_eofS =
+    static final String DFA83_eofS =
         "\1\2\137\uffff";
-    static final String DFA84_minS =
+    static final String DFA83_minS =
         "\1\4\1\0\136\uffff";
-    static final String DFA84_maxS =
+    static final String DFA83_maxS =
         "\1\152\1\0\136\uffff";
-    static final String DFA84_acceptS =
+    static final String DFA83_acceptS =
         "\2\uffff\1\2\134\uffff\1\1";
-    static final String DFA84_specialS =
+    static final String DFA83_specialS =
         "\1\uffff\1\0\136\uffff}>";
-    static final String[] DFA84_transitionS = {
-            "\5\2\6\uffff\11\2\1\1\3\2\1\uffff\2\2\2\uffff\63\2\1\uffff"+
+    static final String[] DFA83_transitionS = {
+            "\5\2\6\uffff\10\2\1\1\3\2\1\uffff\2\2\2\uffff\64\2\1\uffff"+
             "\26\2",
             "\1\uffff",
             "",
@@ -27679,47 +27621,47 @@ public String getDescription() {
             ""
     };
 
-    static final short[] DFA84_eot = DFA.unpackEncodedString(DFA84_eotS);
-    static final short[] DFA84_eof = DFA.unpackEncodedString(DFA84_eofS);
-    static final char[] DFA84_min = DFA.unpackEncodedStringToUnsignedChars(DFA84_minS);
-    static final char[] DFA84_max = DFA.unpackEncodedStringToUnsignedChars(DFA84_maxS);
-    static final short[] DFA84_accept = DFA.unpackEncodedString(DFA84_acceptS);
-    static final short[] DFA84_special = DFA.unpackEncodedString(DFA84_specialS);
-    static final short[][] DFA84_transition;
+    static final short[] DFA83_eot = DFA.unpackEncodedString(DFA83_eotS);
+    static final short[] DFA83_eof = DFA.unpackEncodedString(DFA83_eofS);
+    static final char[] DFA83_min = DFA.unpackEncodedStringToUnsignedChars(DFA83_minS);
+    static final char[] DFA83_max = DFA.unpackEncodedStringToUnsignedChars(DFA83_maxS);
+    static final short[] DFA83_accept = DFA.unpackEncodedString(DFA83_acceptS);
+    static final short[] DFA83_special = DFA.unpackEncodedString(DFA83_specialS);
+    static final short[][] DFA83_transition;
 
     static {
-        int numStates = DFA84_transitionS.length;
-        DFA84_transition = new short[numStates][];
+        int numStates = DFA83_transitionS.length;
+        DFA83_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA84_transition[i] = DFA.unpackEncodedString(DFA84_transitionS[i]);
+            DFA83_transition[i] = DFA.unpackEncodedString(DFA83_transitionS[i]);
         }
     }
 
-    class DFA84 extends DFA {
+    class DFA83 extends DFA {
 
-        public DFA84(BaseRecognizer recognizer) {
+        public DFA83(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 84;
-            this.eot = DFA84_eot;
-            this.eof = DFA84_eof;
-            this.min = DFA84_min;
-            this.max = DFA84_max;
-            this.accept = DFA84_accept;
-            this.special = DFA84_special;
-            this.transition = DFA84_transition;
+            this.decisionNumber = 83;
+            this.eot = DFA83_eot;
+            this.eof = DFA83_eof;
+            this.min = DFA83_min;
+            this.max = DFA83_max;
+            this.accept = DFA83_accept;
+            this.special = DFA83_special;
+            this.transition = DFA83_transition;
         }
         public String getDescription() {
-            return "4273:2: ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )?";
+            return "4254:2: ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA84_1 = input.LA(1);
+                        int LA83_1 = input.LA(1);
 
                          
-                        int index84_1 = input.index();
+                        int index83_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred36_InternalCheck()) ) {s = 95;}
@@ -27727,32 +27669,32 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index84_1);
+                        input.seek(index83_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 84, _s, input);
+                new NoViableAltException(getDescription(), 83, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA83_eotS =
+    static final String DFA82_eotS =
         "\66\uffff";
-    static final String DFA83_eofS =
+    static final String DFA82_eofS =
         "\66\uffff";
-    static final String DFA83_minS =
+    static final String DFA82_minS =
         "\1\4\2\0\63\uffff";
-    static final String DFA83_maxS =
+    static final String DFA82_maxS =
         "\1\151\2\0\63\uffff";
-    static final String DFA83_acceptS =
+    static final String DFA82_acceptS =
         "\3\uffff\2\1\1\2\57\uffff\1\3";
-    static final String DFA83_specialS =
+    static final String DFA82_specialS =
         "\1\0\1\1\1\2\63\uffff}>";
-    static final String[] DFA83_transitionS = {
-            "\4\5\1\1\6\uffff\5\5\1\uffff\1\5\1\uffff\1\5\1\2\1\uffff\1"+
-            "\65\1\5\1\uffff\1\5\3\uffff\2\5\1\uffff\17\5\5\uffff\1\5\13"+
+    static final String[] DFA82_transitionS = {
+            "\4\5\1\1\6\uffff\4\5\1\uffff\1\5\1\uffff\1\5\1\2\1\uffff\1"+
+            "\65\1\5\1\uffff\1\5\3\uffff\2\5\1\uffff\20\5\5\uffff\1\5\13"+
             "\uffff\1\3\2\uffff\2\5\4\uffff\1\5\6\uffff\1\4\1\5\1\uffff\1"+
             "\5\3\uffff\2\5\2\uffff\11\5\1\uffff\1\5",
             "\1\uffff",
@@ -27810,70 +27752,70 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA83_eot = DFA.unpackEncodedString(DFA83_eotS);
-    static final short[] DFA83_eof = DFA.unpackEncodedString(DFA83_eofS);
-    static final char[] DFA83_min = DFA.unpackEncodedStringToUnsignedChars(DFA83_minS);
-    static final char[] DFA83_max = DFA.unpackEncodedStringToUnsignedChars(DFA83_maxS);
-    static final short[] DFA83_accept = DFA.unpackEncodedString(DFA83_acceptS);
-    static final short[] DFA83_special = DFA.unpackEncodedString(DFA83_specialS);
-    static final short[][] DFA83_transition;
+    static final short[] DFA82_eot = DFA.unpackEncodedString(DFA82_eotS);
+    static final short[] DFA82_eof = DFA.unpackEncodedString(DFA82_eofS);
+    static final char[] DFA82_min = DFA.unpackEncodedStringToUnsignedChars(DFA82_minS);
+    static final char[] DFA82_max = DFA.unpackEncodedStringToUnsignedChars(DFA82_maxS);
+    static final short[] DFA82_accept = DFA.unpackEncodedString(DFA82_acceptS);
+    static final short[] DFA82_special = DFA.unpackEncodedString(DFA82_specialS);
+    static final short[][] DFA82_transition;
 
     static {
-        int numStates = DFA83_transitionS.length;
-        DFA83_transition = new short[numStates][];
+        int numStates = DFA82_transitionS.length;
+        DFA82_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA83_transition[i] = DFA.unpackEncodedString(DFA83_transitionS[i]);
+            DFA82_transition[i] = DFA.unpackEncodedString(DFA82_transitionS[i]);
         }
     }
 
-    class DFA83 extends DFA {
+    class DFA82 extends DFA {
 
-        public DFA83(BaseRecognizer recognizer) {
+        public DFA82(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 83;
-            this.eot = DFA83_eot;
-            this.eof = DFA83_eof;
-            this.min = DFA83_min;
-            this.max = DFA83_max;
-            this.accept = DFA83_accept;
-            this.special = DFA83_special;
-            this.transition = DFA83_transition;
+            this.decisionNumber = 82;
+            this.eot = DFA82_eot;
+            this.eof = DFA82_eof;
+            this.min = DFA82_min;
+            this.max = DFA82_max;
+            this.accept = DFA82_accept;
+            this.special = DFA82_special;
+            this.transition = DFA82_transition;
         }
         public String getDescription() {
-            return "4294:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )?";
+            return "4275:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA83_0 = input.LA(1);
+                        int LA82_0 = input.LA(1);
 
                          
-                        int index83_0 = input.index();
+                        int index82_0 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA83_0==RULE_ID) ) {s = 1;}
+                        if ( (LA82_0==RULE_ID) ) {s = 1;}
 
-                        else if ( (LA83_0==24) ) {s = 2;}
+                        else if ( (LA82_0==23) ) {s = 2;}
 
-                        else if ( (LA83_0==68) && (synpred37_InternalCheck())) {s = 3;}
+                        else if ( (LA82_0==68) && (synpred37_InternalCheck())) {s = 3;}
 
-                        else if ( (LA83_0==84) && (synpred37_InternalCheck())) {s = 4;}
+                        else if ( (LA82_0==84) && (synpred37_InternalCheck())) {s = 4;}
 
-                        else if ( ((LA83_0>=RULE_STRING && LA83_0<=RULE_DECIMAL)||(LA83_0>=15 && LA83_0<=19)||LA83_0==21||LA83_0==23||LA83_0==27||LA83_0==29||(LA83_0>=33 && LA83_0<=34)||(LA83_0>=36 && LA83_0<=50)||LA83_0==56||(LA83_0>=71 && LA83_0<=72)||LA83_0==77||LA83_0==85||LA83_0==87||(LA83_0>=91 && LA83_0<=92)||(LA83_0>=95 && LA83_0<=103)||LA83_0==105) ) {s = 5;}
+                        else if ( ((LA82_0>=RULE_STRING && LA82_0<=RULE_DECIMAL)||(LA82_0>=15 && LA82_0<=18)||LA82_0==20||LA82_0==22||LA82_0==26||LA82_0==28||(LA82_0>=32 && LA82_0<=33)||(LA82_0>=35 && LA82_0<=50)||LA82_0==56||(LA82_0>=71 && LA82_0<=72)||LA82_0==77||LA82_0==85||LA82_0==87||(LA82_0>=91 && LA82_0<=92)||(LA82_0>=95 && LA82_0<=103)||LA82_0==105) ) {s = 5;}
 
-                        else if ( (LA83_0==26) ) {s = 53;}
+                        else if ( (LA82_0==25) ) {s = 53;}
 
                          
-                        input.seek(index83_0);
+                        input.seek(index82_0);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA83_1 = input.LA(1);
+                        int LA82_1 = input.LA(1);
 
                          
-                        int index83_1 = input.index();
+                        int index82_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred37_InternalCheck()) ) {s = 4;}
@@ -27881,14 +27823,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 5;}
 
                          
-                        input.seek(index83_1);
+                        input.seek(index82_1);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA83_2 = input.LA(1);
+                        int LA82_2 = input.LA(1);
 
                          
-                        int index83_2 = input.index();
+                        int index82_2 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred37_InternalCheck()) ) {s = 4;}
@@ -27896,31 +27838,31 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 5;}
 
                          
-                        input.seek(index83_2);
+                        input.seek(index82_2);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 83, _s, input);
+                new NoViableAltException(getDescription(), 82, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA85_eotS =
+    static final String DFA84_eotS =
         "\140\uffff";
-    static final String DFA85_eofS =
+    static final String DFA84_eofS =
         "\1\2\137\uffff";
-    static final String DFA85_minS =
+    static final String DFA84_minS =
         "\1\4\1\0\136\uffff";
-    static final String DFA85_maxS =
+    static final String DFA84_maxS =
         "\1\152\1\0\136\uffff";
-    static final String DFA85_acceptS =
+    static final String DFA84_acceptS =
         "\2\uffff\1\2\134\uffff\1\1";
-    static final String DFA85_specialS =
+    static final String DFA84_specialS =
         "\1\uffff\1\0\136\uffff}>";
-    static final String[] DFA85_transitionS = {
-            "\5\2\6\uffff\15\2\1\uffff\2\2\2\uffff\1\2\1\1\61\2\1\uffff"+
+    static final String[] DFA84_transitionS = {
+            "\5\2\6\uffff\14\2\1\uffff\2\2\2\uffff\1\2\1\1\62\2\1\uffff"+
             "\26\2",
             "\1\uffff",
             "",
@@ -28019,47 +27961,47 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA85_eot = DFA.unpackEncodedString(DFA85_eotS);
-    static final short[] DFA85_eof = DFA.unpackEncodedString(DFA85_eofS);
-    static final char[] DFA85_min = DFA.unpackEncodedStringToUnsignedChars(DFA85_minS);
-    static final char[] DFA85_max = DFA.unpackEncodedStringToUnsignedChars(DFA85_maxS);
-    static final short[] DFA85_accept = DFA.unpackEncodedString(DFA85_acceptS);
-    static final short[] DFA85_special = DFA.unpackEncodedString(DFA85_specialS);
-    static final short[][] DFA85_transition;
+    static final short[] DFA84_eot = DFA.unpackEncodedString(DFA84_eotS);
+    static final short[] DFA84_eof = DFA.unpackEncodedString(DFA84_eofS);
+    static final char[] DFA84_min = DFA.unpackEncodedStringToUnsignedChars(DFA84_minS);
+    static final char[] DFA84_max = DFA.unpackEncodedStringToUnsignedChars(DFA84_maxS);
+    static final short[] DFA84_accept = DFA.unpackEncodedString(DFA84_acceptS);
+    static final short[] DFA84_special = DFA.unpackEncodedString(DFA84_specialS);
+    static final short[][] DFA84_transition;
 
     static {
-        int numStates = DFA85_transitionS.length;
-        DFA85_transition = new short[numStates][];
+        int numStates = DFA84_transitionS.length;
+        DFA84_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA85_transition[i] = DFA.unpackEncodedString(DFA85_transitionS[i]);
+            DFA84_transition[i] = DFA.unpackEncodedString(DFA84_transitionS[i]);
         }
     }
 
-    class DFA85 extends DFA {
+    class DFA84 extends DFA {
 
-        public DFA85(BaseRecognizer recognizer) {
+        public DFA84(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 85;
-            this.eot = DFA85_eot;
-            this.eof = DFA85_eof;
-            this.min = DFA85_min;
-            this.max = DFA85_max;
-            this.accept = DFA85_accept;
-            this.special = DFA85_special;
-            this.transition = DFA85_transition;
+            this.decisionNumber = 84;
+            this.eot = DFA84_eot;
+            this.eof = DFA84_eof;
+            this.min = DFA84_min;
+            this.max = DFA84_max;
+            this.accept = DFA84_accept;
+            this.special = DFA84_special;
+            this.transition = DFA84_transition;
         }
         public String getDescription() {
-            return "4373:3: ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )?";
+            return "4354:3: ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA85_1 = input.LA(1);
+                        int LA84_1 = input.LA(1);
 
                          
-                        int index85_1 = input.index();
+                        int index84_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred38_InternalCheck()) ) {s = 95;}
@@ -28067,32 +28009,32 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index85_1);
+                        input.seek(index84_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 85, _s, input);
+                new NoViableAltException(getDescription(), 84, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA95_eotS =
+    static final String DFA94_eotS =
         "\70\uffff";
-    static final String DFA95_eofS =
+    static final String DFA94_eofS =
         "\70\uffff";
-    static final String DFA95_minS =
+    static final String DFA94_minS =
         "\1\4\2\0\65\uffff";
-    static final String DFA95_maxS =
+    static final String DFA94_maxS =
         "\1\151\2\0\65\uffff";
-    static final String DFA95_acceptS =
+    static final String DFA94_acceptS =
         "\3\uffff\2\1\1\2\62\uffff";
-    static final String DFA95_specialS =
+    static final String DFA94_specialS =
         "\1\0\1\1\1\2\65\uffff}>";
-    static final String[] DFA95_transitionS = {
-            "\4\5\1\1\6\uffff\5\5\1\uffff\1\5\1\uffff\1\5\1\2\2\uffff\1"+
-            "\5\1\uffff\1\5\3\uffff\22\5\5\uffff\1\5\13\uffff\1\3\2\uffff"+
+    static final String[] DFA94_transitionS = {
+            "\4\5\1\1\6\uffff\4\5\1\uffff\1\5\1\uffff\1\5\1\2\2\uffff\1"+
+            "\5\1\uffff\1\5\3\uffff\23\5\5\uffff\1\5\13\uffff\1\3\2\uffff"+
             "\2\5\4\uffff\1\5\6\uffff\1\4\1\5\1\uffff\1\5\3\uffff\15\5\1"+
             "\uffff\1\5",
             "\1\uffff",
@@ -28152,68 +28094,68 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA95_eot = DFA.unpackEncodedString(DFA95_eotS);
-    static final short[] DFA95_eof = DFA.unpackEncodedString(DFA95_eofS);
-    static final char[] DFA95_min = DFA.unpackEncodedStringToUnsignedChars(DFA95_minS);
-    static final char[] DFA95_max = DFA.unpackEncodedStringToUnsignedChars(DFA95_maxS);
-    static final short[] DFA95_accept = DFA.unpackEncodedString(DFA95_acceptS);
-    static final short[] DFA95_special = DFA.unpackEncodedString(DFA95_specialS);
-    static final short[][] DFA95_transition;
+    static final short[] DFA94_eot = DFA.unpackEncodedString(DFA94_eotS);
+    static final short[] DFA94_eof = DFA.unpackEncodedString(DFA94_eofS);
+    static final char[] DFA94_min = DFA.unpackEncodedStringToUnsignedChars(DFA94_minS);
+    static final char[] DFA94_max = DFA.unpackEncodedStringToUnsignedChars(DFA94_maxS);
+    static final short[] DFA94_accept = DFA.unpackEncodedString(DFA94_acceptS);
+    static final short[] DFA94_special = DFA.unpackEncodedString(DFA94_specialS);
+    static final short[][] DFA94_transition;
 
     static {
-        int numStates = DFA95_transitionS.length;
-        DFA95_transition = new short[numStates][];
+        int numStates = DFA94_transitionS.length;
+        DFA94_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA95_transition[i] = DFA.unpackEncodedString(DFA95_transitionS[i]);
+            DFA94_transition[i] = DFA.unpackEncodedString(DFA94_transitionS[i]);
         }
     }
 
-    class DFA95 extends DFA {
+    class DFA94 extends DFA {
 
-        public DFA95(BaseRecognizer recognizer) {
+        public DFA94(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 95;
-            this.eot = DFA95_eot;
-            this.eof = DFA95_eof;
-            this.min = DFA95_min;
-            this.max = DFA95_max;
-            this.accept = DFA95_accept;
-            this.special = DFA95_special;
-            this.transition = DFA95_transition;
+            this.decisionNumber = 94;
+            this.eot = DFA94_eot;
+            this.eof = DFA94_eof;
+            this.min = DFA94_min;
+            this.max = DFA94_max;
+            this.accept = DFA94_accept;
+            this.special = DFA94_special;
+            this.transition = DFA94_transition;
         }
         public String getDescription() {
-            return "4716:3: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )?";
+            return "4697:3: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA95_0 = input.LA(1);
+                        int LA94_0 = input.LA(1);
 
                          
-                        int index95_0 = input.index();
+                        int index94_0 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA95_0==RULE_ID) ) {s = 1;}
+                        if ( (LA94_0==RULE_ID) ) {s = 1;}
 
-                        else if ( (LA95_0==24) ) {s = 2;}
+                        else if ( (LA94_0==23) ) {s = 2;}
 
-                        else if ( (LA95_0==68) && (synpred41_InternalCheck())) {s = 3;}
+                        else if ( (LA94_0==68) && (synpred41_InternalCheck())) {s = 3;}
 
-                        else if ( (LA95_0==84) && (synpred41_InternalCheck())) {s = 4;}
+                        else if ( (LA94_0==84) && (synpred41_InternalCheck())) {s = 4;}
 
-                        else if ( ((LA95_0>=RULE_STRING && LA95_0<=RULE_DECIMAL)||(LA95_0>=15 && LA95_0<=19)||LA95_0==21||LA95_0==23||LA95_0==27||LA95_0==29||(LA95_0>=33 && LA95_0<=50)||LA95_0==56||(LA95_0>=71 && LA95_0<=72)||LA95_0==77||LA95_0==85||LA95_0==87||(LA95_0>=91 && LA95_0<=103)||LA95_0==105) ) {s = 5;}
+                        else if ( ((LA94_0>=RULE_STRING && LA94_0<=RULE_DECIMAL)||(LA94_0>=15 && LA94_0<=18)||LA94_0==20||LA94_0==22||LA94_0==26||LA94_0==28||(LA94_0>=32 && LA94_0<=50)||LA94_0==56||(LA94_0>=71 && LA94_0<=72)||LA94_0==77||LA94_0==85||LA94_0==87||(LA94_0>=91 && LA94_0<=103)||LA94_0==105) ) {s = 5;}
 
                          
-                        input.seek(index95_0);
+                        input.seek(index94_0);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA95_1 = input.LA(1);
+                        int LA94_1 = input.LA(1);
 
                          
-                        int index95_1 = input.index();
+                        int index94_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred41_InternalCheck()) ) {s = 4;}
@@ -28221,14 +28163,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 5;}
 
                          
-                        input.seek(index95_1);
+                        input.seek(index94_1);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA95_2 = input.LA(1);
+                        int LA94_2 = input.LA(1);
 
                          
-                        int index95_2 = input.index();
+                        int index94_2 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred41_InternalCheck()) ) {s = 4;}
@@ -28236,32 +28178,32 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 5;}
 
                          
-                        input.seek(index95_2);
+                        input.seek(index94_2);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 95, _s, input);
+                new NoViableAltException(getDescription(), 94, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA102_eotS =
+    static final String DFA101_eotS =
         "\65\uffff";
-    static final String DFA102_eofS =
+    static final String DFA101_eofS =
         "\65\uffff";
-    static final String DFA102_minS =
+    static final String DFA101_minS =
         "\1\4\1\0\63\uffff";
-    static final String DFA102_maxS =
+    static final String DFA101_maxS =
         "\1\151\1\0\63\uffff";
-    static final String DFA102_acceptS =
+    static final String DFA101_acceptS =
         "\2\uffff\1\2\61\uffff\1\1";
-    static final String DFA102_specialS =
+    static final String DFA101_specialS =
         "\1\uffff\1\0\63\uffff}>";
-    static final String[] DFA102_transitionS = {
-            "\5\2\6\uffff\5\2\1\uffff\1\2\1\uffff\1\2\1\1\2\uffff\1\2\1"+
-            "\uffff\1\2\3\uffff\2\2\1\uffff\17\2\5\uffff\1\2\13\uffff\1\2"+
+    static final String[] DFA101_transitionS = {
+            "\5\2\6\uffff\4\2\1\uffff\1\2\1\uffff\1\2\1\1\2\uffff\1\2\1"+
+            "\uffff\1\2\3\uffff\2\2\1\uffff\20\2\5\uffff\1\2\13\uffff\1\2"+
             "\2\uffff\2\2\4\uffff\1\2\7\uffff\1\2\1\uffff\1\2\3\uffff\2\2"+
             "\2\uffff\11\2\1\uffff\1\2",
             "\1\uffff",
@@ -28318,47 +28260,47 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA102_eot = DFA.unpackEncodedString(DFA102_eotS);
-    static final short[] DFA102_eof = DFA.unpackEncodedString(DFA102_eofS);
-    static final char[] DFA102_min = DFA.unpackEncodedStringToUnsignedChars(DFA102_minS);
-    static final char[] DFA102_max = DFA.unpackEncodedStringToUnsignedChars(DFA102_maxS);
-    static final short[] DFA102_accept = DFA.unpackEncodedString(DFA102_acceptS);
-    static final short[] DFA102_special = DFA.unpackEncodedString(DFA102_specialS);
-    static final short[][] DFA102_transition;
+    static final short[] DFA101_eot = DFA.unpackEncodedString(DFA101_eotS);
+    static final short[] DFA101_eof = DFA.unpackEncodedString(DFA101_eofS);
+    static final char[] DFA101_min = DFA.unpackEncodedStringToUnsignedChars(DFA101_minS);
+    static final char[] DFA101_max = DFA.unpackEncodedStringToUnsignedChars(DFA101_maxS);
+    static final short[] DFA101_accept = DFA.unpackEncodedString(DFA101_acceptS);
+    static final short[] DFA101_special = DFA.unpackEncodedString(DFA101_specialS);
+    static final short[][] DFA101_transition;
 
     static {
-        int numStates = DFA102_transitionS.length;
-        DFA102_transition = new short[numStates][];
+        int numStates = DFA101_transitionS.length;
+        DFA101_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA102_transition[i] = DFA.unpackEncodedString(DFA102_transitionS[i]);
+            DFA101_transition[i] = DFA.unpackEncodedString(DFA101_transitionS[i]);
         }
     }
 
-    class DFA102 extends DFA {
+    class DFA101 extends DFA {
 
-        public DFA102(BaseRecognizer recognizer) {
+        public DFA101(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 102;
-            this.eot = DFA102_eot;
-            this.eof = DFA102_eof;
-            this.min = DFA102_min;
-            this.max = DFA102_max;
-            this.accept = DFA102_accept;
-            this.special = DFA102_special;
-            this.transition = DFA102_transition;
+            this.decisionNumber = 101;
+            this.eot = DFA101_eot;
+            this.eof = DFA101_eof;
+            this.min = DFA101_min;
+            this.max = DFA101_max;
+            this.accept = DFA101_accept;
+            this.special = DFA101_special;
+            this.transition = DFA101_transition;
         }
         public String getDescription() {
-            return "5140:1: ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) )";
+            return "5121:1: ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) )";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA102_1 = input.LA(1);
+                        int LA101_1 = input.LA(1);
 
                          
-                        int index102_1 = input.index();
+                        int index101_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred44_InternalCheck()) ) {s = 52;}
@@ -28366,32 +28308,32 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index102_1);
+                        input.seek(index101_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 102, _s, input);
+                new NoViableAltException(getDescription(), 101, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA101_eotS =
+    static final String DFA100_eotS =
         "\64\uffff";
-    static final String DFA101_eofS =
+    static final String DFA100_eofS =
         "\64\uffff";
-    static final String DFA101_minS =
+    static final String DFA100_minS =
         "\1\4\2\0\61\uffff";
-    static final String DFA101_maxS =
+    static final String DFA100_maxS =
         "\1\151\2\0\61\uffff";
-    static final String DFA101_acceptS =
+    static final String DFA100_acceptS =
         "\3\uffff\1\1\1\2\57\uffff";
-    static final String DFA101_specialS =
+    static final String DFA100_specialS =
         "\1\0\1\1\1\2\61\uffff}>";
-    static final String[] DFA101_transitionS = {
-            "\4\4\1\1\6\uffff\5\4\1\uffff\1\4\1\uffff\1\4\1\2\2\uffff\1"+
-            "\4\1\uffff\1\4\3\uffff\2\4\1\uffff\17\4\5\uffff\1\4\13\uffff"+
+    static final String[] DFA100_transitionS = {
+            "\4\4\1\1\6\uffff\4\4\1\uffff\1\4\1\uffff\1\4\1\2\2\uffff\1"+
+            "\4\1\uffff\1\4\3\uffff\2\4\1\uffff\20\4\5\uffff\1\4\13\uffff"+
             "\1\3\2\uffff\2\4\4\uffff\1\4\7\uffff\1\4\1\uffff\1\4\3\uffff"+
             "\2\4\2\uffff\11\4\1\uffff\1\4",
             "\1\uffff",
@@ -28447,66 +28389,66 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA101_eot = DFA.unpackEncodedString(DFA101_eotS);
-    static final short[] DFA101_eof = DFA.unpackEncodedString(DFA101_eofS);
-    static final char[] DFA101_min = DFA.unpackEncodedStringToUnsignedChars(DFA101_minS);
-    static final char[] DFA101_max = DFA.unpackEncodedStringToUnsignedChars(DFA101_maxS);
-    static final short[] DFA101_accept = DFA.unpackEncodedString(DFA101_acceptS);
-    static final short[] DFA101_special = DFA.unpackEncodedString(DFA101_specialS);
-    static final short[][] DFA101_transition;
+    static final short[] DFA100_eot = DFA.unpackEncodedString(DFA100_eotS);
+    static final short[] DFA100_eof = DFA.unpackEncodedString(DFA100_eofS);
+    static final char[] DFA100_min = DFA.unpackEncodedStringToUnsignedChars(DFA100_minS);
+    static final char[] DFA100_max = DFA.unpackEncodedStringToUnsignedChars(DFA100_maxS);
+    static final short[] DFA100_accept = DFA.unpackEncodedString(DFA100_acceptS);
+    static final short[] DFA100_special = DFA.unpackEncodedString(DFA100_specialS);
+    static final short[][] DFA100_transition;
 
     static {
-        int numStates = DFA101_transitionS.length;
-        DFA101_transition = new short[numStates][];
+        int numStates = DFA100_transitionS.length;
+        DFA100_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA101_transition[i] = DFA.unpackEncodedString(DFA101_transitionS[i]);
+            DFA100_transition[i] = DFA.unpackEncodedString(DFA100_transitionS[i]);
         }
     }
 
-    class DFA101 extends DFA {
+    class DFA100 extends DFA {
 
-        public DFA101(BaseRecognizer recognizer) {
+        public DFA100(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 101;
-            this.eot = DFA101_eot;
-            this.eof = DFA101_eof;
-            this.min = DFA101_min;
-            this.max = DFA101_max;
-            this.accept = DFA101_accept;
-            this.special = DFA101_special;
-            this.transition = DFA101_transition;
+            this.decisionNumber = 100;
+            this.eot = DFA100_eot;
+            this.eof = DFA100_eof;
+            this.min = DFA100_min;
+            this.max = DFA100_max;
+            this.accept = DFA100_accept;
+            this.special = DFA100_special;
+            this.transition = DFA100_transition;
         }
         public String getDescription() {
-            return "5195:7: ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )?";
+            return "5176:7: ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA101_0 = input.LA(1);
+                        int LA100_0 = input.LA(1);
 
                          
-                        int index101_0 = input.index();
+                        int index100_0 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA101_0==RULE_ID) ) {s = 1;}
+                        if ( (LA100_0==RULE_ID) ) {s = 1;}
 
-                        else if ( (LA101_0==24) ) {s = 2;}
+                        else if ( (LA100_0==23) ) {s = 2;}
 
-                        else if ( (LA101_0==68) && (synpred45_InternalCheck())) {s = 3;}
+                        else if ( (LA100_0==68) && (synpred45_InternalCheck())) {s = 3;}
 
-                        else if ( ((LA101_0>=RULE_STRING && LA101_0<=RULE_DECIMAL)||(LA101_0>=15 && LA101_0<=19)||LA101_0==21||LA101_0==23||LA101_0==27||LA101_0==29||(LA101_0>=33 && LA101_0<=34)||(LA101_0>=36 && LA101_0<=50)||LA101_0==56||(LA101_0>=71 && LA101_0<=72)||LA101_0==77||LA101_0==85||LA101_0==87||(LA101_0>=91 && LA101_0<=92)||(LA101_0>=95 && LA101_0<=103)||LA101_0==105) ) {s = 4;}
+                        else if ( ((LA100_0>=RULE_STRING && LA100_0<=RULE_DECIMAL)||(LA100_0>=15 && LA100_0<=18)||LA100_0==20||LA100_0==22||LA100_0==26||LA100_0==28||(LA100_0>=32 && LA100_0<=33)||(LA100_0>=35 && LA100_0<=50)||LA100_0==56||(LA100_0>=71 && LA100_0<=72)||LA100_0==77||LA100_0==85||LA100_0==87||(LA100_0>=91 && LA100_0<=92)||(LA100_0>=95 && LA100_0<=103)||LA100_0==105) ) {s = 4;}
 
                          
-                        input.seek(index101_0);
+                        input.seek(index100_0);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA101_1 = input.LA(1);
+                        int LA100_1 = input.LA(1);
 
                          
-                        int index101_1 = input.index();
+                        int index100_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred45_InternalCheck()) ) {s = 3;}
@@ -28514,14 +28456,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 4;}
 
                          
-                        input.seek(index101_1);
+                        input.seek(index100_1);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA101_2 = input.LA(1);
+                        int LA100_2 = input.LA(1);
 
                          
-                        int index101_2 = input.index();
+                        int index100_2 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred45_InternalCheck()) ) {s = 3;}
@@ -28529,31 +28471,31 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 4;}
 
                          
-                        input.seek(index101_2);
+                        input.seek(index100_2);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 101, _s, input);
+                new NoViableAltException(getDescription(), 100, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA124_eotS =
+    static final String DFA123_eotS =
         "\140\uffff";
-    static final String DFA124_eofS =
+    static final String DFA123_eofS =
         "\1\2\137\uffff";
-    static final String DFA124_minS =
+    static final String DFA123_minS =
         "\1\4\1\0\136\uffff";
-    static final String DFA124_maxS =
+    static final String DFA123_maxS =
         "\1\152\1\0\136\uffff";
-    static final String DFA124_acceptS =
+    static final String DFA123_acceptS =
         "\2\uffff\1\2\134\uffff\1\1";
-    static final String DFA124_specialS =
+    static final String DFA123_specialS =
         "\1\uffff\1\0\136\uffff}>";
-    static final String[] DFA124_transitionS = {
-            "\5\2\6\uffff\11\2\1\1\3\2\1\uffff\2\2\2\uffff\63\2\1\uffff"+
+    static final String[] DFA123_transitionS = {
+            "\5\2\6\uffff\10\2\1\1\3\2\1\uffff\2\2\2\uffff\64\2\1\uffff"+
             "\26\2",
             "\1\uffff",
             "",
@@ -28652,47 +28594,47 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA124_eot = DFA.unpackEncodedString(DFA124_eotS);
-    static final short[] DFA124_eof = DFA.unpackEncodedString(DFA124_eofS);
-    static final char[] DFA124_min = DFA.unpackEncodedStringToUnsignedChars(DFA124_minS);
-    static final char[] DFA124_max = DFA.unpackEncodedStringToUnsignedChars(DFA124_maxS);
-    static final short[] DFA124_accept = DFA.unpackEncodedString(DFA124_acceptS);
-    static final short[] DFA124_special = DFA.unpackEncodedString(DFA124_specialS);
-    static final short[][] DFA124_transition;
+    static final short[] DFA123_eot = DFA.unpackEncodedString(DFA123_eotS);
+    static final short[] DFA123_eof = DFA.unpackEncodedString(DFA123_eofS);
+    static final char[] DFA123_min = DFA.unpackEncodedStringToUnsignedChars(DFA123_minS);
+    static final char[] DFA123_max = DFA.unpackEncodedStringToUnsignedChars(DFA123_maxS);
+    static final short[] DFA123_accept = DFA.unpackEncodedString(DFA123_acceptS);
+    static final short[] DFA123_special = DFA.unpackEncodedString(DFA123_specialS);
+    static final short[][] DFA123_transition;
 
     static {
-        int numStates = DFA124_transitionS.length;
-        DFA124_transition = new short[numStates][];
+        int numStates = DFA123_transitionS.length;
+        DFA123_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA124_transition[i] = DFA.unpackEncodedString(DFA124_transitionS[i]);
+            DFA123_transition[i] = DFA.unpackEncodedString(DFA123_transitionS[i]);
         }
     }
 
-    class DFA124 extends DFA {
+    class DFA123 extends DFA {
 
-        public DFA124(BaseRecognizer recognizer) {
+        public DFA123(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 124;
-            this.eot = DFA124_eot;
-            this.eof = DFA124_eof;
-            this.min = DFA124_min;
-            this.max = DFA124_max;
-            this.accept = DFA124_accept;
-            this.special = DFA124_special;
-            this.transition = DFA124_transition;
+            this.decisionNumber = 123;
+            this.eot = DFA123_eot;
+            this.eof = DFA123_eof;
+            this.min = DFA123_min;
+            this.max = DFA123_max;
+            this.accept = DFA123_accept;
+            this.special = DFA123_special;
+            this.transition = DFA123_transition;
         }
         public String getDescription() {
-            return "6252:2: ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )?";
+            return "6233:2: ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA124_1 = input.LA(1);
+                        int LA123_1 = input.LA(1);
 
                          
-                        int index124_1 = input.index();
+                        int index123_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred48_InternalCheck()) ) {s = 95;}
@@ -28700,32 +28642,32 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index124_1);
+                        input.seek(index123_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 124, _s, input);
+                new NoViableAltException(getDescription(), 123, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA123_eotS =
+    static final String DFA122_eotS =
         "\66\uffff";
-    static final String DFA123_eofS =
+    static final String DFA122_eofS =
         "\66\uffff";
-    static final String DFA123_minS =
+    static final String DFA122_minS =
         "\1\4\2\0\63\uffff";
-    static final String DFA123_maxS =
+    static final String DFA122_maxS =
         "\1\151\2\0\63\uffff";
-    static final String DFA123_acceptS =
+    static final String DFA122_acceptS =
         "\3\uffff\2\1\1\2\57\uffff\1\3";
-    static final String DFA123_specialS =
+    static final String DFA122_specialS =
         "\1\0\1\1\1\2\63\uffff}>";
-    static final String[] DFA123_transitionS = {
-            "\4\5\1\1\6\uffff\5\5\1\uffff\1\5\1\uffff\1\5\1\2\1\uffff\1"+
-            "\65\1\5\1\uffff\1\5\3\uffff\2\5\1\uffff\17\5\5\uffff\1\5\13"+
+    static final String[] DFA122_transitionS = {
+            "\4\5\1\1\6\uffff\4\5\1\uffff\1\5\1\uffff\1\5\1\2\1\uffff\1"+
+            "\65\1\5\1\uffff\1\5\3\uffff\2\5\1\uffff\20\5\5\uffff\1\5\13"+
             "\uffff\1\3\2\uffff\2\5\4\uffff\1\5\6\uffff\1\4\1\5\1\uffff\1"+
             "\5\3\uffff\2\5\2\uffff\11\5\1\uffff\1\5",
             "\1\uffff",
@@ -28783,70 +28725,70 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA123_eot = DFA.unpackEncodedString(DFA123_eotS);
-    static final short[] DFA123_eof = DFA.unpackEncodedString(DFA123_eofS);
-    static final char[] DFA123_min = DFA.unpackEncodedStringToUnsignedChars(DFA123_minS);
-    static final char[] DFA123_max = DFA.unpackEncodedStringToUnsignedChars(DFA123_maxS);
-    static final short[] DFA123_accept = DFA.unpackEncodedString(DFA123_acceptS);
-    static final short[] DFA123_special = DFA.unpackEncodedString(DFA123_specialS);
-    static final short[][] DFA123_transition;
+    static final short[] DFA122_eot = DFA.unpackEncodedString(DFA122_eotS);
+    static final short[] DFA122_eof = DFA.unpackEncodedString(DFA122_eofS);
+    static final char[] DFA122_min = DFA.unpackEncodedStringToUnsignedChars(DFA122_minS);
+    static final char[] DFA122_max = DFA.unpackEncodedStringToUnsignedChars(DFA122_maxS);
+    static final short[] DFA122_accept = DFA.unpackEncodedString(DFA122_acceptS);
+    static final short[] DFA122_special = DFA.unpackEncodedString(DFA122_specialS);
+    static final short[][] DFA122_transition;
 
     static {
-        int numStates = DFA123_transitionS.length;
-        DFA123_transition = new short[numStates][];
+        int numStates = DFA122_transitionS.length;
+        DFA122_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA123_transition[i] = DFA.unpackEncodedString(DFA123_transitionS[i]);
+            DFA122_transition[i] = DFA.unpackEncodedString(DFA122_transitionS[i]);
         }
     }
 
-    class DFA123 extends DFA {
+    class DFA122 extends DFA {
 
-        public DFA123(BaseRecognizer recognizer) {
+        public DFA122(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 123;
-            this.eot = DFA123_eot;
-            this.eof = DFA123_eof;
-            this.min = DFA123_min;
-            this.max = DFA123_max;
-            this.accept = DFA123_accept;
-            this.special = DFA123_special;
-            this.transition = DFA123_transition;
+            this.decisionNumber = 122;
+            this.eot = DFA122_eot;
+            this.eof = DFA122_eof;
+            this.min = DFA122_min;
+            this.max = DFA122_max;
+            this.accept = DFA122_accept;
+            this.special = DFA122_special;
+            this.transition = DFA122_transition;
         }
         public String getDescription() {
-            return "6273:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )?";
+            return "6254:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA123_0 = input.LA(1);
+                        int LA122_0 = input.LA(1);
 
                          
-                        int index123_0 = input.index();
+                        int index122_0 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA123_0==RULE_ID) ) {s = 1;}
+                        if ( (LA122_0==RULE_ID) ) {s = 1;}
 
-                        else if ( (LA123_0==24) ) {s = 2;}
+                        else if ( (LA122_0==23) ) {s = 2;}
 
-                        else if ( (LA123_0==68) && (synpred49_InternalCheck())) {s = 3;}
+                        else if ( (LA122_0==68) && (synpred49_InternalCheck())) {s = 3;}
 
-                        else if ( (LA123_0==84) && (synpred49_InternalCheck())) {s = 4;}
+                        else if ( (LA122_0==84) && (synpred49_InternalCheck())) {s = 4;}
 
-                        else if ( ((LA123_0>=RULE_STRING && LA123_0<=RULE_DECIMAL)||(LA123_0>=15 && LA123_0<=19)||LA123_0==21||LA123_0==23||LA123_0==27||LA123_0==29||(LA123_0>=33 && LA123_0<=34)||(LA123_0>=36 && LA123_0<=50)||LA123_0==56||(LA123_0>=71 && LA123_0<=72)||LA123_0==77||LA123_0==85||LA123_0==87||(LA123_0>=91 && LA123_0<=92)||(LA123_0>=95 && LA123_0<=103)||LA123_0==105) ) {s = 5;}
+                        else if ( ((LA122_0>=RULE_STRING && LA122_0<=RULE_DECIMAL)||(LA122_0>=15 && LA122_0<=18)||LA122_0==20||LA122_0==22||LA122_0==26||LA122_0==28||(LA122_0>=32 && LA122_0<=33)||(LA122_0>=35 && LA122_0<=50)||LA122_0==56||(LA122_0>=71 && LA122_0<=72)||LA122_0==77||LA122_0==85||LA122_0==87||(LA122_0>=91 && LA122_0<=92)||(LA122_0>=95 && LA122_0<=103)||LA122_0==105) ) {s = 5;}
 
-                        else if ( (LA123_0==26) ) {s = 53;}
+                        else if ( (LA122_0==25) ) {s = 53;}
 
                          
-                        input.seek(index123_0);
+                        input.seek(index122_0);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA123_1 = input.LA(1);
+                        int LA122_1 = input.LA(1);
 
                          
-                        int index123_1 = input.index();
+                        int index122_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred49_InternalCheck()) ) {s = 4;}
@@ -28854,14 +28796,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 5;}
 
                          
-                        input.seek(index123_1);
+                        input.seek(index122_1);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA123_2 = input.LA(1);
+                        int LA122_2 = input.LA(1);
 
                          
-                        int index123_2 = input.index();
+                        int index122_2 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred49_InternalCheck()) ) {s = 4;}
@@ -28869,31 +28811,31 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 5;}
 
                          
-                        input.seek(index123_2);
+                        input.seek(index122_2);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 123, _s, input);
+                new NoViableAltException(getDescription(), 122, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA125_eotS =
+    static final String DFA124_eotS =
         "\140\uffff";
-    static final String DFA125_eofS =
+    static final String DFA124_eofS =
         "\1\2\137\uffff";
-    static final String DFA125_minS =
+    static final String DFA124_minS =
         "\1\4\1\0\136\uffff";
-    static final String DFA125_maxS =
+    static final String DFA124_maxS =
         "\1\152\1\0\136\uffff";
-    static final String DFA125_acceptS =
+    static final String DFA124_acceptS =
         "\2\uffff\1\2\134\uffff\1\1";
-    static final String DFA125_specialS =
+    static final String DFA124_specialS =
         "\1\uffff\1\0\136\uffff}>";
-    static final String[] DFA125_transitionS = {
-            "\5\2\6\uffff\15\2\1\uffff\2\2\2\uffff\1\2\1\1\61\2\1\uffff"+
+    static final String[] DFA124_transitionS = {
+            "\5\2\6\uffff\14\2\1\uffff\2\2\2\uffff\1\2\1\1\62\2\1\uffff"+
             "\26\2",
             "\1\uffff",
             "",
@@ -28992,47 +28934,47 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA125_eot = DFA.unpackEncodedString(DFA125_eotS);
-    static final short[] DFA125_eof = DFA.unpackEncodedString(DFA125_eofS);
-    static final char[] DFA125_min = DFA.unpackEncodedStringToUnsignedChars(DFA125_minS);
-    static final char[] DFA125_max = DFA.unpackEncodedStringToUnsignedChars(DFA125_maxS);
-    static final short[] DFA125_accept = DFA.unpackEncodedString(DFA125_acceptS);
-    static final short[] DFA125_special = DFA.unpackEncodedString(DFA125_specialS);
-    static final short[][] DFA125_transition;
+    static final short[] DFA124_eot = DFA.unpackEncodedString(DFA124_eotS);
+    static final short[] DFA124_eof = DFA.unpackEncodedString(DFA124_eofS);
+    static final char[] DFA124_min = DFA.unpackEncodedStringToUnsignedChars(DFA124_minS);
+    static final char[] DFA124_max = DFA.unpackEncodedStringToUnsignedChars(DFA124_maxS);
+    static final short[] DFA124_accept = DFA.unpackEncodedString(DFA124_acceptS);
+    static final short[] DFA124_special = DFA.unpackEncodedString(DFA124_specialS);
+    static final short[][] DFA124_transition;
 
     static {
-        int numStates = DFA125_transitionS.length;
-        DFA125_transition = new short[numStates][];
+        int numStates = DFA124_transitionS.length;
+        DFA124_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA125_transition[i] = DFA.unpackEncodedString(DFA125_transitionS[i]);
+            DFA124_transition[i] = DFA.unpackEncodedString(DFA124_transitionS[i]);
         }
     }
 
-    class DFA125 extends DFA {
+    class DFA124 extends DFA {
 
-        public DFA125(BaseRecognizer recognizer) {
+        public DFA124(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 125;
-            this.eot = DFA125_eot;
-            this.eof = DFA125_eof;
-            this.min = DFA125_min;
-            this.max = DFA125_max;
-            this.accept = DFA125_accept;
-            this.special = DFA125_special;
-            this.transition = DFA125_transition;
+            this.decisionNumber = 124;
+            this.eot = DFA124_eot;
+            this.eof = DFA124_eof;
+            this.min = DFA124_min;
+            this.max = DFA124_max;
+            this.accept = DFA124_accept;
+            this.special = DFA124_special;
+            this.transition = DFA124_transition;
         }
         public String getDescription() {
-            return "6352:3: ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )?";
+            return "6333:3: ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA125_1 = input.LA(1);
+                        int LA124_1 = input.LA(1);
 
                          
-                        int index125_1 = input.index();
+                        int index124_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred50_InternalCheck()) ) {s = 95;}
@@ -29040,31 +28982,31 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index125_1);
+                        input.seek(index124_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 125, _s, input);
+                new NoViableAltException(getDescription(), 124, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA128_eotS =
+    static final String DFA127_eotS =
         "\140\uffff";
-    static final String DFA128_eofS =
+    static final String DFA127_eofS =
         "\1\2\137\uffff";
-    static final String DFA128_minS =
+    static final String DFA127_minS =
         "\1\4\1\0\136\uffff";
-    static final String DFA128_maxS =
+    static final String DFA127_maxS =
         "\1\152\1\0\136\uffff";
-    static final String DFA128_acceptS =
+    static final String DFA127_acceptS =
         "\2\uffff\1\2\134\uffff\1\1";
-    static final String DFA128_specialS =
+    static final String DFA127_specialS =
         "\1\uffff\1\0\136\uffff}>";
-    static final String[] DFA128_transitionS = {
-            "\5\2\6\uffff\15\2\1\uffff\2\2\2\uffff\27\2\1\1\33\2\1\uffff"+
+    static final String[] DFA127_transitionS = {
+            "\5\2\6\uffff\14\2\1\uffff\2\2\2\uffff\30\2\1\1\33\2\1\uffff"+
             "\26\2",
             "\1\uffff",
             "",
@@ -29163,47 +29105,47 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA128_eot = DFA.unpackEncodedString(DFA128_eotS);
-    static final short[] DFA128_eof = DFA.unpackEncodedString(DFA128_eofS);
-    static final char[] DFA128_min = DFA.unpackEncodedStringToUnsignedChars(DFA128_minS);
-    static final char[] DFA128_max = DFA.unpackEncodedStringToUnsignedChars(DFA128_maxS);
-    static final short[] DFA128_accept = DFA.unpackEncodedString(DFA128_acceptS);
-    static final short[] DFA128_special = DFA.unpackEncodedString(DFA128_specialS);
-    static final short[][] DFA128_transition;
+    static final short[] DFA127_eot = DFA.unpackEncodedString(DFA127_eotS);
+    static final short[] DFA127_eof = DFA.unpackEncodedString(DFA127_eofS);
+    static final char[] DFA127_min = DFA.unpackEncodedStringToUnsignedChars(DFA127_minS);
+    static final char[] DFA127_max = DFA.unpackEncodedStringToUnsignedChars(DFA127_maxS);
+    static final short[] DFA127_accept = DFA.unpackEncodedString(DFA127_acceptS);
+    static final short[] DFA127_special = DFA.unpackEncodedString(DFA127_specialS);
+    static final short[][] DFA127_transition;
 
     static {
-        int numStates = DFA128_transitionS.length;
-        DFA128_transition = new short[numStates][];
+        int numStates = DFA127_transitionS.length;
+        DFA127_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA128_transition[i] = DFA.unpackEncodedString(DFA128_transitionS[i]);
+            DFA127_transition[i] = DFA.unpackEncodedString(DFA127_transitionS[i]);
         }
     }
 
-    class DFA128 extends DFA {
+    class DFA127 extends DFA {
 
-        public DFA128(BaseRecognizer recognizer) {
+        public DFA127(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 128;
-            this.eot = DFA128_eot;
-            this.eof = DFA128_eof;
-            this.min = DFA128_min;
-            this.max = DFA128_max;
-            this.accept = DFA128_accept;
-            this.special = DFA128_special;
-            this.transition = DFA128_transition;
+            this.decisionNumber = 127;
+            this.eot = DFA127_eot;
+            this.eof = DFA127_eof;
+            this.min = DFA127_min;
+            this.max = DFA127_max;
+            this.accept = DFA127_accept;
+            this.special = DFA127_special;
+            this.transition = DFA127_transition;
         }
         public String getDescription() {
-            return "6457:2: ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )?";
+            return "6438:2: ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA128_1 = input.LA(1);
+                        int LA127_1 = input.LA(1);
 
                          
-                        int index128_1 = input.index();
+                        int index127_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred51_InternalCheck()) ) {s = 95;}
@@ -29211,31 +29153,31 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index128_1);
+                        input.seek(index127_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 128, _s, input);
+                new NoViableAltException(getDescription(), 127, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA131_eotS =
+    static final String DFA130_eotS =
         "\140\uffff";
-    static final String DFA131_eofS =
+    static final String DFA130_eofS =
         "\1\2\137\uffff";
-    static final String DFA131_minS =
+    static final String DFA130_minS =
         "\1\4\1\0\136\uffff";
-    static final String DFA131_maxS =
+    static final String DFA130_maxS =
         "\1\152\1\0\136\uffff";
-    static final String DFA131_acceptS =
+    static final String DFA130_acceptS =
         "\2\uffff\1\2\134\uffff\1\1";
-    static final String DFA131_specialS =
+    static final String DFA130_specialS =
         "\1\uffff\1\0\136\uffff}>";
-    static final String[] DFA131_transitionS = {
-            "\5\2\6\uffff\11\2\1\1\3\2\1\uffff\2\2\2\uffff\63\2\1\uffff"+
+    static final String[] DFA130_transitionS = {
+            "\5\2\6\uffff\10\2\1\1\3\2\1\uffff\2\2\2\uffff\64\2\1\uffff"+
             "\26\2",
             "\1\uffff",
             "",
@@ -29334,47 +29276,47 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA131_eot = DFA.unpackEncodedString(DFA131_eotS);
-    static final short[] DFA131_eof = DFA.unpackEncodedString(DFA131_eofS);
-    static final char[] DFA131_min = DFA.unpackEncodedStringToUnsignedChars(DFA131_minS);
-    static final char[] DFA131_max = DFA.unpackEncodedStringToUnsignedChars(DFA131_maxS);
-    static final short[] DFA131_accept = DFA.unpackEncodedString(DFA131_acceptS);
-    static final short[] DFA131_special = DFA.unpackEncodedString(DFA131_specialS);
-    static final short[][] DFA131_transition;
+    static final short[] DFA130_eot = DFA.unpackEncodedString(DFA130_eotS);
+    static final short[] DFA130_eof = DFA.unpackEncodedString(DFA130_eofS);
+    static final char[] DFA130_min = DFA.unpackEncodedStringToUnsignedChars(DFA130_minS);
+    static final char[] DFA130_max = DFA.unpackEncodedStringToUnsignedChars(DFA130_maxS);
+    static final short[] DFA130_accept = DFA.unpackEncodedString(DFA130_acceptS);
+    static final short[] DFA130_special = DFA.unpackEncodedString(DFA130_specialS);
+    static final short[][] DFA130_transition;
 
     static {
-        int numStates = DFA131_transitionS.length;
-        DFA131_transition = new short[numStates][];
+        int numStates = DFA130_transitionS.length;
+        DFA130_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA131_transition[i] = DFA.unpackEncodedString(DFA131_transitionS[i]);
+            DFA130_transition[i] = DFA.unpackEncodedString(DFA130_transitionS[i]);
         }
     }
 
-    class DFA131 extends DFA {
+    class DFA130 extends DFA {
 
-        public DFA131(BaseRecognizer recognizer) {
+        public DFA130(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 131;
-            this.eot = DFA131_eot;
-            this.eof = DFA131_eof;
-            this.min = DFA131_min;
-            this.max = DFA131_max;
-            this.accept = DFA131_accept;
-            this.special = DFA131_special;
-            this.transition = DFA131_transition;
+            this.decisionNumber = 130;
+            this.eot = DFA130_eot;
+            this.eof = DFA130_eof;
+            this.min = DFA130_min;
+            this.max = DFA130_max;
+            this.accept = DFA130_accept;
+            this.special = DFA130_special;
+            this.transition = DFA130_transition;
         }
         public String getDescription() {
-            return "6506:3: ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )?";
+            return "6487:3: ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA131_1 = input.LA(1);
+                        int LA130_1 = input.LA(1);
 
                          
-                        int index131_1 = input.index();
+                        int index130_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred52_InternalCheck()) ) {s = 95;}
@@ -29382,32 +29324,32 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index131_1);
+                        input.seek(index130_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 131, _s, input);
+                new NoViableAltException(getDescription(), 130, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA130_eotS =
+    static final String DFA129_eotS =
         "\66\uffff";
-    static final String DFA130_eofS =
+    static final String DFA129_eofS =
         "\66\uffff";
-    static final String DFA130_minS =
+    static final String DFA129_minS =
         "\1\4\2\0\63\uffff";
-    static final String DFA130_maxS =
+    static final String DFA129_maxS =
         "\1\151\2\0\63\uffff";
-    static final String DFA130_acceptS =
+    static final String DFA129_acceptS =
         "\3\uffff\2\1\1\2\57\uffff\1\3";
-    static final String DFA130_specialS =
+    static final String DFA129_specialS =
         "\1\0\1\1\1\2\63\uffff}>";
-    static final String[] DFA130_transitionS = {
-            "\4\5\1\1\6\uffff\5\5\1\uffff\1\5\1\uffff\1\5\1\2\1\uffff\1"+
-            "\65\1\5\1\uffff\1\5\3\uffff\2\5\1\uffff\17\5\5\uffff\1\5\13"+
+    static final String[] DFA129_transitionS = {
+            "\4\5\1\1\6\uffff\4\5\1\uffff\1\5\1\uffff\1\5\1\2\1\uffff\1"+
+            "\65\1\5\1\uffff\1\5\3\uffff\2\5\1\uffff\20\5\5\uffff\1\5\13"+
             "\uffff\1\3\2\uffff\2\5\4\uffff\1\5\6\uffff\1\4\1\5\1\uffff\1"+
             "\5\3\uffff\2\5\2\uffff\11\5\1\uffff\1\5",
             "\1\uffff",
@@ -29465,70 +29407,70 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA130_eot = DFA.unpackEncodedString(DFA130_eotS);
-    static final short[] DFA130_eof = DFA.unpackEncodedString(DFA130_eofS);
-    static final char[] DFA130_min = DFA.unpackEncodedStringToUnsignedChars(DFA130_minS);
-    static final char[] DFA130_max = DFA.unpackEncodedStringToUnsignedChars(DFA130_maxS);
-    static final short[] DFA130_accept = DFA.unpackEncodedString(DFA130_acceptS);
-    static final short[] DFA130_special = DFA.unpackEncodedString(DFA130_specialS);
-    static final short[][] DFA130_transition;
+    static final short[] DFA129_eot = DFA.unpackEncodedString(DFA129_eotS);
+    static final short[] DFA129_eof = DFA.unpackEncodedString(DFA129_eofS);
+    static final char[] DFA129_min = DFA.unpackEncodedStringToUnsignedChars(DFA129_minS);
+    static final char[] DFA129_max = DFA.unpackEncodedStringToUnsignedChars(DFA129_maxS);
+    static final short[] DFA129_accept = DFA.unpackEncodedString(DFA129_acceptS);
+    static final short[] DFA129_special = DFA.unpackEncodedString(DFA129_specialS);
+    static final short[][] DFA129_transition;
 
     static {
-        int numStates = DFA130_transitionS.length;
-        DFA130_transition = new short[numStates][];
+        int numStates = DFA129_transitionS.length;
+        DFA129_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA130_transition[i] = DFA.unpackEncodedString(DFA130_transitionS[i]);
+            DFA129_transition[i] = DFA.unpackEncodedString(DFA129_transitionS[i]);
         }
     }
 
-    class DFA130 extends DFA {
+    class DFA129 extends DFA {
 
-        public DFA130(BaseRecognizer recognizer) {
+        public DFA129(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 130;
-            this.eot = DFA130_eot;
-            this.eof = DFA130_eof;
-            this.min = DFA130_min;
-            this.max = DFA130_max;
-            this.accept = DFA130_accept;
-            this.special = DFA130_special;
-            this.transition = DFA130_transition;
+            this.decisionNumber = 129;
+            this.eot = DFA129_eot;
+            this.eof = DFA129_eof;
+            this.min = DFA129_min;
+            this.max = DFA129_max;
+            this.accept = DFA129_accept;
+            this.special = DFA129_special;
+            this.transition = DFA129_transition;
         }
         public String getDescription() {
-            return "6527:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )?";
+            return "6508:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA130_0 = input.LA(1);
+                        int LA129_0 = input.LA(1);
 
                          
-                        int index130_0 = input.index();
+                        int index129_0 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA130_0==RULE_ID) ) {s = 1;}
+                        if ( (LA129_0==RULE_ID) ) {s = 1;}
 
-                        else if ( (LA130_0==24) ) {s = 2;}
+                        else if ( (LA129_0==23) ) {s = 2;}
 
-                        else if ( (LA130_0==68) && (synpred53_InternalCheck())) {s = 3;}
+                        else if ( (LA129_0==68) && (synpred53_InternalCheck())) {s = 3;}
 
-                        else if ( (LA130_0==84) && (synpred53_InternalCheck())) {s = 4;}
+                        else if ( (LA129_0==84) && (synpred53_InternalCheck())) {s = 4;}
 
-                        else if ( ((LA130_0>=RULE_STRING && LA130_0<=RULE_DECIMAL)||(LA130_0>=15 && LA130_0<=19)||LA130_0==21||LA130_0==23||LA130_0==27||LA130_0==29||(LA130_0>=33 && LA130_0<=34)||(LA130_0>=36 && LA130_0<=50)||LA130_0==56||(LA130_0>=71 && LA130_0<=72)||LA130_0==77||LA130_0==85||LA130_0==87||(LA130_0>=91 && LA130_0<=92)||(LA130_0>=95 && LA130_0<=103)||LA130_0==105) ) {s = 5;}
+                        else if ( ((LA129_0>=RULE_STRING && LA129_0<=RULE_DECIMAL)||(LA129_0>=15 && LA129_0<=18)||LA129_0==20||LA129_0==22||LA129_0==26||LA129_0==28||(LA129_0>=32 && LA129_0<=33)||(LA129_0>=35 && LA129_0<=50)||LA129_0==56||(LA129_0>=71 && LA129_0<=72)||LA129_0==77||LA129_0==85||LA129_0==87||(LA129_0>=91 && LA129_0<=92)||(LA129_0>=95 && LA129_0<=103)||LA129_0==105) ) {s = 5;}
 
-                        else if ( (LA130_0==26) ) {s = 53;}
+                        else if ( (LA129_0==25) ) {s = 53;}
 
                          
-                        input.seek(index130_0);
+                        input.seek(index129_0);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA130_1 = input.LA(1);
+                        int LA129_1 = input.LA(1);
 
                          
-                        int index130_1 = input.index();
+                        int index129_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred53_InternalCheck()) ) {s = 4;}
@@ -29536,14 +29478,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 5;}
 
                          
-                        input.seek(index130_1);
+                        input.seek(index129_1);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA130_2 = input.LA(1);
+                        int LA129_2 = input.LA(1);
 
                          
-                        int index130_2 = input.index();
+                        int index129_2 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred53_InternalCheck()) ) {s = 4;}
@@ -29551,31 +29493,31 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 5;}
 
                          
-                        input.seek(index130_2);
+                        input.seek(index129_2);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 130, _s, input);
+                new NoViableAltException(getDescription(), 129, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA132_eotS =
+    static final String DFA131_eotS =
         "\140\uffff";
-    static final String DFA132_eofS =
+    static final String DFA131_eofS =
         "\1\2\137\uffff";
-    static final String DFA132_minS =
+    static final String DFA131_minS =
         "\1\4\1\0\136\uffff";
-    static final String DFA132_maxS =
+    static final String DFA131_maxS =
         "\1\152\1\0\136\uffff";
-    static final String DFA132_acceptS =
+    static final String DFA131_acceptS =
         "\2\uffff\1\2\134\uffff\1\1";
-    static final String DFA132_specialS =
+    static final String DFA131_specialS =
         "\1\uffff\1\0\136\uffff}>";
-    static final String[] DFA132_transitionS = {
-            "\5\2\6\uffff\15\2\1\uffff\2\2\2\uffff\1\2\1\1\61\2\1\uffff"+
+    static final String[] DFA131_transitionS = {
+            "\5\2\6\uffff\14\2\1\uffff\2\2\2\uffff\1\2\1\1\62\2\1\uffff"+
             "\26\2",
             "\1\uffff",
             "",
@@ -29674,47 +29616,47 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA132_eot = DFA.unpackEncodedString(DFA132_eotS);
-    static final short[] DFA132_eof = DFA.unpackEncodedString(DFA132_eofS);
-    static final char[] DFA132_min = DFA.unpackEncodedStringToUnsignedChars(DFA132_minS);
-    static final char[] DFA132_max = DFA.unpackEncodedStringToUnsignedChars(DFA132_maxS);
-    static final short[] DFA132_accept = DFA.unpackEncodedString(DFA132_acceptS);
-    static final short[] DFA132_special = DFA.unpackEncodedString(DFA132_specialS);
-    static final short[][] DFA132_transition;
+    static final short[] DFA131_eot = DFA.unpackEncodedString(DFA131_eotS);
+    static final short[] DFA131_eof = DFA.unpackEncodedString(DFA131_eofS);
+    static final char[] DFA131_min = DFA.unpackEncodedStringToUnsignedChars(DFA131_minS);
+    static final char[] DFA131_max = DFA.unpackEncodedStringToUnsignedChars(DFA131_maxS);
+    static final short[] DFA131_accept = DFA.unpackEncodedString(DFA131_acceptS);
+    static final short[] DFA131_special = DFA.unpackEncodedString(DFA131_specialS);
+    static final short[][] DFA131_transition;
 
     static {
-        int numStates = DFA132_transitionS.length;
-        DFA132_transition = new short[numStates][];
+        int numStates = DFA131_transitionS.length;
+        DFA131_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA132_transition[i] = DFA.unpackEncodedString(DFA132_transitionS[i]);
+            DFA131_transition[i] = DFA.unpackEncodedString(DFA131_transitionS[i]);
         }
     }
 
-    class DFA132 extends DFA {
+    class DFA131 extends DFA {
 
-        public DFA132(BaseRecognizer recognizer) {
+        public DFA131(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 132;
-            this.eot = DFA132_eot;
-            this.eof = DFA132_eof;
-            this.min = DFA132_min;
-            this.max = DFA132_max;
-            this.accept = DFA132_accept;
-            this.special = DFA132_special;
-            this.transition = DFA132_transition;
+            this.decisionNumber = 131;
+            this.eot = DFA131_eot;
+            this.eof = DFA131_eof;
+            this.min = DFA131_min;
+            this.max = DFA131_max;
+            this.accept = DFA131_accept;
+            this.special = DFA131_special;
+            this.transition = DFA131_transition;
         }
         public String getDescription() {
-            return "6606:3: ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )?";
+            return "6587:3: ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA132_1 = input.LA(1);
+                        int LA131_1 = input.LA(1);
 
                          
-                        int index132_1 = input.index();
+                        int index131_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred54_InternalCheck()) ) {s = 95;}
@@ -29722,37 +29664,37 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index132_1);
+                        input.seek(index131_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 132, _s, input);
+                new NoViableAltException(getDescription(), 131, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA135_eotS =
+    static final String DFA134_eotS =
         "\140\uffff";
-    static final String DFA135_eofS =
+    static final String DFA134_eofS =
         "\1\63\137\uffff";
-    static final String DFA135_minS =
+    static final String DFA134_minS =
         "\1\4\62\0\55\uffff";
-    static final String DFA135_maxS =
+    static final String DFA134_maxS =
         "\1\152\62\0\55\uffff";
-    static final String DFA135_acceptS =
+    static final String DFA134_acceptS =
         "\63\uffff\1\2\53\uffff\1\1";
-    static final String DFA135_specialS =
+    static final String DFA134_specialS =
         "\1\uffff\1\0\1\1\1\2\1\3\1\4\1\5\1\6\1\7\1\10\1\11\1\12\1\13\1"+
         "\14\1\15\1\16\1\17\1\20\1\21\1\22\1\23\1\24\1\25\1\26\1\27\1\30"+
         "\1\31\1\32\1\33\1\34\1\35\1\36\1\37\1\40\1\41\1\42\1\43\1\44\1\45"+
         "\1\46\1\47\1\50\1\51\1\52\1\53\1\54\1\55\1\56\1\57\1\60\1\61\55"+
         "\uffff}>";
-    static final String[] DFA135_transitionS = {
-            "\1\47\1\43\1\44\1\45\1\1\6\uffff\1\6\1\52\1\7\1\10\1\32\1\63"+
-            "\1\4\1\63\1\11\1\60\2\63\1\12\1\uffff\1\16\1\63\2\uffff\1\37"+
-            "\1\40\1\63\1\61\1\62\1\13\1\14\1\15\1\2\1\3\1\5\1\17\1\20\1"+
+    static final String[] DFA134_transitionS = {
+            "\1\47\1\43\1\44\1\45\1\1\6\uffff\1\6\1\52\1\7\1\32\1\63\1\4"+
+            "\1\63\1\11\1\60\2\63\1\12\1\uffff\1\16\1\63\2\uffff\1\37\1\40"+
+            "\1\63\1\61\1\62\1\13\1\14\1\15\1\2\1\3\1\5\1\10\1\17\1\20\1"+
             "\21\1\22\1\23\1\24\1\25\5\63\1\35\16\63\1\30\1\27\4\63\1\26"+
             "\6\63\1\uffff\1\51\1\63\1\33\3\63\1\53\1\54\2\63\1\36\1\31\1"+
             "\41\1\42\1\46\1\50\1\55\1\56\1\57\1\63\1\34\1\63",
@@ -29853,47 +29795,47 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA135_eot = DFA.unpackEncodedString(DFA135_eotS);
-    static final short[] DFA135_eof = DFA.unpackEncodedString(DFA135_eofS);
-    static final char[] DFA135_min = DFA.unpackEncodedStringToUnsignedChars(DFA135_minS);
-    static final char[] DFA135_max = DFA.unpackEncodedStringToUnsignedChars(DFA135_maxS);
-    static final short[] DFA135_accept = DFA.unpackEncodedString(DFA135_acceptS);
-    static final short[] DFA135_special = DFA.unpackEncodedString(DFA135_specialS);
-    static final short[][] DFA135_transition;
+    static final short[] DFA134_eot = DFA.unpackEncodedString(DFA134_eotS);
+    static final short[] DFA134_eof = DFA.unpackEncodedString(DFA134_eofS);
+    static final char[] DFA134_min = DFA.unpackEncodedStringToUnsignedChars(DFA134_minS);
+    static final char[] DFA134_max = DFA.unpackEncodedStringToUnsignedChars(DFA134_maxS);
+    static final short[] DFA134_accept = DFA.unpackEncodedString(DFA134_acceptS);
+    static final short[] DFA134_special = DFA.unpackEncodedString(DFA134_specialS);
+    static final short[][] DFA134_transition;
 
     static {
-        int numStates = DFA135_transitionS.length;
-        DFA135_transition = new short[numStates][];
+        int numStates = DFA134_transitionS.length;
+        DFA134_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA135_transition[i] = DFA.unpackEncodedString(DFA135_transitionS[i]);
+            DFA134_transition[i] = DFA.unpackEncodedString(DFA134_transitionS[i]);
         }
     }
 
-    class DFA135 extends DFA {
+    class DFA134 extends DFA {
 
-        public DFA135(BaseRecognizer recognizer) {
+        public DFA134(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 135;
-            this.eot = DFA135_eot;
-            this.eof = DFA135_eof;
-            this.min = DFA135_min;
-            this.max = DFA135_max;
-            this.accept = DFA135_accept;
-            this.special = DFA135_special;
-            this.transition = DFA135_transition;
+            this.decisionNumber = 134;
+            this.eot = DFA134_eot;
+            this.eof = DFA134_eof;
+            this.min = DFA134_min;
+            this.max = DFA134_max;
+            this.accept = DFA134_accept;
+            this.special = DFA134_special;
+            this.transition = DFA134_transition;
         }
         public String getDescription() {
-            return "6946:1: ( ( 'extends' | 'static' | 'import' | 'extension' | 'catalog' | 'grammar' | 'with' | 'category' | 'message' | 'on' | 'bind' | 'data' | 'SeverityRange' | 'error' | 'warning' | 'info' | 'ignore' | 'live' | 'onSave' | 'onDemand' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | 'guard' | 'issue' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )?";
+            return "6927:1: ( ( 'extends' | 'static' | 'import' | 'extension' | 'catalog' | 'grammar' | 'with' | 'category' | 'message' | 'on' | 'bind' | 'data' | 'SeverityRange' | 'error' | 'warning' | 'info' | 'ignore' | 'live' | 'onSave' | 'onDemand' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | 'guard' | 'issue' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA135_1 = input.LA(1);
+                        int LA134_1 = input.LA(1);
 
                          
-                        int index135_1 = input.index();
+                        int index134_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -29901,14 +29843,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_1);
+                        input.seek(index134_1);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA135_2 = input.LA(1);
+                        int LA134_2 = input.LA(1);
 
                          
-                        int index135_2 = input.index();
+                        int index134_2 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -29916,14 +29858,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_2);
+                        input.seek(index134_2);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA135_3 = input.LA(1);
+                        int LA134_3 = input.LA(1);
 
                          
-                        int index135_3 = input.index();
+                        int index134_3 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -29931,14 +29873,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_3);
+                        input.seek(index134_3);
                         if ( s>=0 ) return s;
                         break;
                     case 3 : 
-                        int LA135_4 = input.LA(1);
+                        int LA134_4 = input.LA(1);
 
                          
-                        int index135_4 = input.index();
+                        int index134_4 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -29946,14 +29888,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_4);
+                        input.seek(index134_4);
                         if ( s>=0 ) return s;
                         break;
                     case 4 : 
-                        int LA135_5 = input.LA(1);
+                        int LA134_5 = input.LA(1);
 
                          
-                        int index135_5 = input.index();
+                        int index134_5 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -29961,14 +29903,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_5);
+                        input.seek(index134_5);
                         if ( s>=0 ) return s;
                         break;
                     case 5 : 
-                        int LA135_6 = input.LA(1);
+                        int LA134_6 = input.LA(1);
 
                          
-                        int index135_6 = input.index();
+                        int index134_6 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -29976,14 +29918,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_6);
+                        input.seek(index134_6);
                         if ( s>=0 ) return s;
                         break;
                     case 6 : 
-                        int LA135_7 = input.LA(1);
+                        int LA134_7 = input.LA(1);
 
                          
-                        int index135_7 = input.index();
+                        int index134_7 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -29991,14 +29933,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_7);
+                        input.seek(index134_7);
                         if ( s>=0 ) return s;
                         break;
                     case 7 : 
-                        int LA135_8 = input.LA(1);
+                        int LA134_8 = input.LA(1);
 
                          
-                        int index135_8 = input.index();
+                        int index134_8 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30006,14 +29948,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_8);
+                        input.seek(index134_8);
                         if ( s>=0 ) return s;
                         break;
                     case 8 : 
-                        int LA135_9 = input.LA(1);
+                        int LA134_9 = input.LA(1);
 
                          
-                        int index135_9 = input.index();
+                        int index134_9 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30021,14 +29963,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_9);
+                        input.seek(index134_9);
                         if ( s>=0 ) return s;
                         break;
                     case 9 : 
-                        int LA135_10 = input.LA(1);
+                        int LA134_10 = input.LA(1);
 
                          
-                        int index135_10 = input.index();
+                        int index134_10 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30036,14 +29978,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_10);
+                        input.seek(index134_10);
                         if ( s>=0 ) return s;
                         break;
                     case 10 : 
-                        int LA135_11 = input.LA(1);
+                        int LA134_11 = input.LA(1);
 
                          
-                        int index135_11 = input.index();
+                        int index134_11 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30051,14 +29993,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_11);
+                        input.seek(index134_11);
                         if ( s>=0 ) return s;
                         break;
                     case 11 : 
-                        int LA135_12 = input.LA(1);
+                        int LA134_12 = input.LA(1);
 
                          
-                        int index135_12 = input.index();
+                        int index134_12 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30066,14 +30008,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_12);
+                        input.seek(index134_12);
                         if ( s>=0 ) return s;
                         break;
                     case 12 : 
-                        int LA135_13 = input.LA(1);
+                        int LA134_13 = input.LA(1);
 
                          
-                        int index135_13 = input.index();
+                        int index134_13 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30081,14 +30023,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_13);
+                        input.seek(index134_13);
                         if ( s>=0 ) return s;
                         break;
                     case 13 : 
-                        int LA135_14 = input.LA(1);
+                        int LA134_14 = input.LA(1);
 
                          
-                        int index135_14 = input.index();
+                        int index134_14 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30096,14 +30038,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_14);
+                        input.seek(index134_14);
                         if ( s>=0 ) return s;
                         break;
                     case 14 : 
-                        int LA135_15 = input.LA(1);
+                        int LA134_15 = input.LA(1);
 
                          
-                        int index135_15 = input.index();
+                        int index134_15 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30111,14 +30053,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_15);
+                        input.seek(index134_15);
                         if ( s>=0 ) return s;
                         break;
                     case 15 : 
-                        int LA135_16 = input.LA(1);
+                        int LA134_16 = input.LA(1);
 
                          
-                        int index135_16 = input.index();
+                        int index134_16 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30126,14 +30068,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_16);
+                        input.seek(index134_16);
                         if ( s>=0 ) return s;
                         break;
                     case 16 : 
-                        int LA135_17 = input.LA(1);
+                        int LA134_17 = input.LA(1);
 
                          
-                        int index135_17 = input.index();
+                        int index134_17 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30141,14 +30083,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_17);
+                        input.seek(index134_17);
                         if ( s>=0 ) return s;
                         break;
                     case 17 : 
-                        int LA135_18 = input.LA(1);
+                        int LA134_18 = input.LA(1);
 
                          
-                        int index135_18 = input.index();
+                        int index134_18 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30156,14 +30098,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_18);
+                        input.seek(index134_18);
                         if ( s>=0 ) return s;
                         break;
                     case 18 : 
-                        int LA135_19 = input.LA(1);
+                        int LA134_19 = input.LA(1);
 
                          
-                        int index135_19 = input.index();
+                        int index134_19 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30171,14 +30113,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_19);
+                        input.seek(index134_19);
                         if ( s>=0 ) return s;
                         break;
                     case 19 : 
-                        int LA135_20 = input.LA(1);
+                        int LA134_20 = input.LA(1);
 
                          
-                        int index135_20 = input.index();
+                        int index134_20 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30186,14 +30128,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_20);
+                        input.seek(index134_20);
                         if ( s>=0 ) return s;
                         break;
                     case 20 : 
-                        int LA135_21 = input.LA(1);
+                        int LA134_21 = input.LA(1);
 
                          
-                        int index135_21 = input.index();
+                        int index134_21 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30201,14 +30143,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_21);
+                        input.seek(index134_21);
                         if ( s>=0 ) return s;
                         break;
                     case 21 : 
-                        int LA135_22 = input.LA(1);
+                        int LA134_22 = input.LA(1);
 
                          
-                        int index135_22 = input.index();
+                        int index134_22 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30216,14 +30158,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_22);
+                        input.seek(index134_22);
                         if ( s>=0 ) return s;
                         break;
                     case 22 : 
-                        int LA135_23 = input.LA(1);
+                        int LA134_23 = input.LA(1);
 
                          
-                        int index135_23 = input.index();
+                        int index134_23 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30231,14 +30173,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_23);
+                        input.seek(index134_23);
                         if ( s>=0 ) return s;
                         break;
                     case 23 : 
-                        int LA135_24 = input.LA(1);
+                        int LA134_24 = input.LA(1);
 
                          
-                        int index135_24 = input.index();
+                        int index134_24 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30246,14 +30188,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_24);
+                        input.seek(index134_24);
                         if ( s>=0 ) return s;
                         break;
                     case 24 : 
-                        int LA135_25 = input.LA(1);
+                        int LA134_25 = input.LA(1);
 
                          
-                        int index135_25 = input.index();
+                        int index134_25 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30261,14 +30203,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_25);
+                        input.seek(index134_25);
                         if ( s>=0 ) return s;
                         break;
                     case 25 : 
-                        int LA135_26 = input.LA(1);
+                        int LA134_26 = input.LA(1);
 
                          
-                        int index135_26 = input.index();
+                        int index134_26 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30276,14 +30218,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_26);
+                        input.seek(index134_26);
                         if ( s>=0 ) return s;
                         break;
                     case 26 : 
-                        int LA135_27 = input.LA(1);
+                        int LA134_27 = input.LA(1);
 
                          
-                        int index135_27 = input.index();
+                        int index134_27 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30291,14 +30233,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_27);
+                        input.seek(index134_27);
                         if ( s>=0 ) return s;
                         break;
                     case 27 : 
-                        int LA135_28 = input.LA(1);
+                        int LA134_28 = input.LA(1);
 
                          
-                        int index135_28 = input.index();
+                        int index134_28 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30306,14 +30248,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_28);
+                        input.seek(index134_28);
                         if ( s>=0 ) return s;
                         break;
                     case 28 : 
-                        int LA135_29 = input.LA(1);
+                        int LA134_29 = input.LA(1);
 
                          
-                        int index135_29 = input.index();
+                        int index134_29 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30321,14 +30263,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_29);
+                        input.seek(index134_29);
                         if ( s>=0 ) return s;
                         break;
                     case 29 : 
-                        int LA135_30 = input.LA(1);
+                        int LA134_30 = input.LA(1);
 
                          
-                        int index135_30 = input.index();
+                        int index134_30 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30336,14 +30278,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_30);
+                        input.seek(index134_30);
                         if ( s>=0 ) return s;
                         break;
                     case 30 : 
-                        int LA135_31 = input.LA(1);
+                        int LA134_31 = input.LA(1);
 
                          
-                        int index135_31 = input.index();
+                        int index134_31 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30351,14 +30293,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_31);
+                        input.seek(index134_31);
                         if ( s>=0 ) return s;
                         break;
                     case 31 : 
-                        int LA135_32 = input.LA(1);
+                        int LA134_32 = input.LA(1);
 
                          
-                        int index135_32 = input.index();
+                        int index134_32 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30366,14 +30308,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_32);
+                        input.seek(index134_32);
                         if ( s>=0 ) return s;
                         break;
                     case 32 : 
-                        int LA135_33 = input.LA(1);
+                        int LA134_33 = input.LA(1);
 
                          
-                        int index135_33 = input.index();
+                        int index134_33 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30381,14 +30323,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_33);
+                        input.seek(index134_33);
                         if ( s>=0 ) return s;
                         break;
                     case 33 : 
-                        int LA135_34 = input.LA(1);
+                        int LA134_34 = input.LA(1);
 
                          
-                        int index135_34 = input.index();
+                        int index134_34 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30396,14 +30338,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_34);
+                        input.seek(index134_34);
                         if ( s>=0 ) return s;
                         break;
                     case 34 : 
-                        int LA135_35 = input.LA(1);
+                        int LA134_35 = input.LA(1);
 
                          
-                        int index135_35 = input.index();
+                        int index134_35 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30411,14 +30353,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_35);
+                        input.seek(index134_35);
                         if ( s>=0 ) return s;
                         break;
                     case 35 : 
-                        int LA135_36 = input.LA(1);
+                        int LA134_36 = input.LA(1);
 
                          
-                        int index135_36 = input.index();
+                        int index134_36 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30426,14 +30368,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_36);
+                        input.seek(index134_36);
                         if ( s>=0 ) return s;
                         break;
                     case 36 : 
-                        int LA135_37 = input.LA(1);
+                        int LA134_37 = input.LA(1);
 
                          
-                        int index135_37 = input.index();
+                        int index134_37 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30441,14 +30383,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_37);
+                        input.seek(index134_37);
                         if ( s>=0 ) return s;
                         break;
                     case 37 : 
-                        int LA135_38 = input.LA(1);
+                        int LA134_38 = input.LA(1);
 
                          
-                        int index135_38 = input.index();
+                        int index134_38 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30456,14 +30398,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_38);
+                        input.seek(index134_38);
                         if ( s>=0 ) return s;
                         break;
                     case 38 : 
-                        int LA135_39 = input.LA(1);
+                        int LA134_39 = input.LA(1);
 
                          
-                        int index135_39 = input.index();
+                        int index134_39 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30471,14 +30413,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_39);
+                        input.seek(index134_39);
                         if ( s>=0 ) return s;
                         break;
                     case 39 : 
-                        int LA135_40 = input.LA(1);
+                        int LA134_40 = input.LA(1);
 
                          
-                        int index135_40 = input.index();
+                        int index134_40 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30486,14 +30428,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_40);
+                        input.seek(index134_40);
                         if ( s>=0 ) return s;
                         break;
                     case 40 : 
-                        int LA135_41 = input.LA(1);
+                        int LA134_41 = input.LA(1);
 
                          
-                        int index135_41 = input.index();
+                        int index134_41 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30501,14 +30443,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_41);
+                        input.seek(index134_41);
                         if ( s>=0 ) return s;
                         break;
                     case 41 : 
-                        int LA135_42 = input.LA(1);
+                        int LA134_42 = input.LA(1);
 
                          
-                        int index135_42 = input.index();
+                        int index134_42 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30516,14 +30458,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_42);
+                        input.seek(index134_42);
                         if ( s>=0 ) return s;
                         break;
                     case 42 : 
-                        int LA135_43 = input.LA(1);
+                        int LA134_43 = input.LA(1);
 
                          
-                        int index135_43 = input.index();
+                        int index134_43 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30531,14 +30473,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_43);
+                        input.seek(index134_43);
                         if ( s>=0 ) return s;
                         break;
                     case 43 : 
-                        int LA135_44 = input.LA(1);
+                        int LA134_44 = input.LA(1);
 
                          
-                        int index135_44 = input.index();
+                        int index134_44 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30546,14 +30488,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_44);
+                        input.seek(index134_44);
                         if ( s>=0 ) return s;
                         break;
                     case 44 : 
-                        int LA135_45 = input.LA(1);
+                        int LA134_45 = input.LA(1);
 
                          
-                        int index135_45 = input.index();
+                        int index134_45 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30561,14 +30503,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_45);
+                        input.seek(index134_45);
                         if ( s>=0 ) return s;
                         break;
                     case 45 : 
-                        int LA135_46 = input.LA(1);
+                        int LA134_46 = input.LA(1);
 
                          
-                        int index135_46 = input.index();
+                        int index134_46 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30576,14 +30518,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_46);
+                        input.seek(index134_46);
                         if ( s>=0 ) return s;
                         break;
                     case 46 : 
-                        int LA135_47 = input.LA(1);
+                        int LA134_47 = input.LA(1);
 
                          
-                        int index135_47 = input.index();
+                        int index134_47 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30591,14 +30533,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_47);
+                        input.seek(index134_47);
                         if ( s>=0 ) return s;
                         break;
                     case 47 : 
-                        int LA135_48 = input.LA(1);
+                        int LA134_48 = input.LA(1);
 
                          
-                        int index135_48 = input.index();
+                        int index134_48 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30606,14 +30548,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_48);
+                        input.seek(index134_48);
                         if ( s>=0 ) return s;
                         break;
                     case 48 : 
-                        int LA135_49 = input.LA(1);
+                        int LA134_49 = input.LA(1);
 
                          
-                        int index135_49 = input.index();
+                        int index134_49 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30621,14 +30563,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_49);
+                        input.seek(index134_49);
                         if ( s>=0 ) return s;
                         break;
                     case 49 : 
-                        int LA135_50 = input.LA(1);
+                        int LA134_50 = input.LA(1);
 
                          
-                        int index135_50 = input.index();
+                        int index134_50 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred55_InternalCheck()) ) {s = 95;}
@@ -30636,31 +30578,31 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index135_50);
+                        input.seek(index134_50);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 135, _s, input);
+                new NoViableAltException(getDescription(), 134, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA153_eotS =
+    static final String DFA152_eotS =
         "\141\uffff";
-    static final String DFA153_eofS =
+    static final String DFA152_eofS =
         "\1\2\140\uffff";
-    static final String DFA153_minS =
+    static final String DFA152_minS =
         "\1\4\1\0\137\uffff";
-    static final String DFA153_maxS =
+    static final String DFA152_maxS =
         "\1\154\1\0\137\uffff";
-    static final String DFA153_acceptS =
+    static final String DFA152_acceptS =
         "\2\uffff\1\2\135\uffff\1\1";
-    static final String DFA153_specialS =
+    static final String DFA152_specialS =
         "\1\uffff\1\0\137\uffff}>";
-    static final String[] DFA153_transitionS = {
-            "\5\2\6\uffff\15\2\1\uffff\2\2\2\uffff\27\2\1\1\33\2\1\uffff"+
+    static final String[] DFA152_transitionS = {
+            "\5\2\6\uffff\14\2\1\uffff\2\2\2\uffff\30\2\1\1\33\2\1\uffff"+
             "\26\2\1\uffff\1\2",
             "\1\uffff",
             "",
@@ -30760,47 +30702,47 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA153_eot = DFA.unpackEncodedString(DFA153_eotS);
-    static final short[] DFA153_eof = DFA.unpackEncodedString(DFA153_eofS);
-    static final char[] DFA153_min = DFA.unpackEncodedStringToUnsignedChars(DFA153_minS);
-    static final char[] DFA153_max = DFA.unpackEncodedStringToUnsignedChars(DFA153_maxS);
-    static final short[] DFA153_accept = DFA.unpackEncodedString(DFA153_acceptS);
-    static final short[] DFA153_special = DFA.unpackEncodedString(DFA153_specialS);
-    static final short[][] DFA153_transition;
+    static final short[] DFA152_eot = DFA.unpackEncodedString(DFA152_eotS);
+    static final short[] DFA152_eof = DFA.unpackEncodedString(DFA152_eofS);
+    static final char[] DFA152_min = DFA.unpackEncodedStringToUnsignedChars(DFA152_minS);
+    static final char[] DFA152_max = DFA.unpackEncodedStringToUnsignedChars(DFA152_maxS);
+    static final short[] DFA152_accept = DFA.unpackEncodedString(DFA152_acceptS);
+    static final short[] DFA152_special = DFA.unpackEncodedString(DFA152_specialS);
+    static final short[][] DFA152_transition;
 
     static {
-        int numStates = DFA153_transitionS.length;
-        DFA153_transition = new short[numStates][];
+        int numStates = DFA152_transitionS.length;
+        DFA152_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA153_transition[i] = DFA.unpackEncodedString(DFA153_transitionS[i]);
+            DFA152_transition[i] = DFA.unpackEncodedString(DFA152_transitionS[i]);
         }
     }
 
-    class DFA153 extends DFA {
+    class DFA152 extends DFA {
 
-        public DFA153(BaseRecognizer recognizer) {
+        public DFA152(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 153;
-            this.eot = DFA153_eot;
-            this.eof = DFA153_eof;
-            this.min = DFA153_min;
-            this.max = DFA153_max;
-            this.accept = DFA153_accept;
-            this.special = DFA153_special;
-            this.transition = DFA153_transition;
+            this.decisionNumber = 152;
+            this.eot = DFA152_eot;
+            this.eof = DFA152_eof;
+            this.min = DFA152_min;
+            this.max = DFA152_max;
+            this.accept = DFA152_accept;
+            this.special = DFA152_special;
+            this.transition = DFA152_transition;
         }
         public String getDescription() {
-            return "7614:2: ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )?";
+            return "7595:2: ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA153_1 = input.LA(1);
+                        int LA152_1 = input.LA(1);
 
                          
-                        int index153_1 = input.index();
+                        int index152_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred62_InternalCheck()) ) {s = 96;}
@@ -30808,31 +30750,31 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index153_1);
+                        input.seek(index152_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 153, _s, input);
+                new NoViableAltException(getDescription(), 152, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA151_eotS =
+    static final String DFA150_eotS =
         "\141\uffff";
-    static final String DFA151_eofS =
+    static final String DFA150_eofS =
         "\1\2\140\uffff";
-    static final String DFA151_minS =
+    static final String DFA150_minS =
         "\1\4\1\0\137\uffff";
-    static final String DFA151_maxS =
+    static final String DFA150_maxS =
         "\1\154\1\0\137\uffff";
-    static final String DFA151_acceptS =
+    static final String DFA150_acceptS =
         "\2\uffff\1\2\135\uffff\1\1";
-    static final String DFA151_specialS =
+    static final String DFA150_specialS =
         "\1\uffff\1\0\137\uffff}>";
-    static final String[] DFA151_transitionS = {
-            "\5\2\6\uffff\15\2\1\uffff\2\2\2\uffff\27\2\1\1\33\2\1\uffff"+
+    static final String[] DFA150_transitionS = {
+            "\5\2\6\uffff\14\2\1\uffff\2\2\2\uffff\30\2\1\1\33\2\1\uffff"+
             "\26\2\1\uffff\1\2",
             "\1\uffff",
             "",
@@ -30932,47 +30874,47 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA151_eot = DFA.unpackEncodedString(DFA151_eotS);
-    static final short[] DFA151_eof = DFA.unpackEncodedString(DFA151_eofS);
-    static final char[] DFA151_min = DFA.unpackEncodedStringToUnsignedChars(DFA151_minS);
-    static final char[] DFA151_max = DFA.unpackEncodedStringToUnsignedChars(DFA151_maxS);
-    static final short[] DFA151_accept = DFA.unpackEncodedString(DFA151_acceptS);
-    static final short[] DFA151_special = DFA.unpackEncodedString(DFA151_specialS);
-    static final short[][] DFA151_transition;
+    static final short[] DFA150_eot = DFA.unpackEncodedString(DFA150_eotS);
+    static final short[] DFA150_eof = DFA.unpackEncodedString(DFA150_eofS);
+    static final char[] DFA150_min = DFA.unpackEncodedStringToUnsignedChars(DFA150_minS);
+    static final char[] DFA150_max = DFA.unpackEncodedStringToUnsignedChars(DFA150_maxS);
+    static final short[] DFA150_accept = DFA.unpackEncodedString(DFA150_acceptS);
+    static final short[] DFA150_special = DFA.unpackEncodedString(DFA150_specialS);
+    static final short[][] DFA150_transition;
 
     static {
-        int numStates = DFA151_transitionS.length;
-        DFA151_transition = new short[numStates][];
+        int numStates = DFA150_transitionS.length;
+        DFA150_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA151_transition[i] = DFA.unpackEncodedString(DFA151_transitionS[i]);
+            DFA150_transition[i] = DFA.unpackEncodedString(DFA150_transitionS[i]);
         }
     }
 
-    class DFA151 extends DFA {
+    class DFA150 extends DFA {
 
-        public DFA151(BaseRecognizer recognizer) {
+        public DFA150(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 151;
-            this.eot = DFA151_eot;
-            this.eof = DFA151_eof;
-            this.min = DFA151_min;
-            this.max = DFA151_max;
-            this.accept = DFA151_accept;
-            this.special = DFA151_special;
-            this.transition = DFA151_transition;
+            this.decisionNumber = 150;
+            this.eot = DFA150_eot;
+            this.eof = DFA150_eof;
+            this.min = DFA150_min;
+            this.max = DFA150_max;
+            this.accept = DFA150_accept;
+            this.special = DFA150_special;
+            this.transition = DFA150_transition;
         }
         public String getDescription() {
-            return "7690:2: ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )?";
+            return "7671:2: ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA151_1 = input.LA(1);
+                        int LA150_1 = input.LA(1);
 
                          
-                        int index151_1 = input.index();
+                        int index150_1 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred64_InternalCheck()) ) {s = 96;}
@@ -30980,13 +30922,13 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index151_1);
+                        input.seek(index150_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 151, _s, input);
+                new NoViableAltException(getDescription(), 150, _s, input);
             error(nvae);
             throw nvae;
         }
@@ -30996,804 +30938,802 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
     public static final BitSet FOLLOW_ruleCheckCatalog_in_entryRuleCheckCatalog75 = new BitSet(new long[]{0x0000000000000000L});
     public static final BitSet FOLLOW_EOF_in_entryRuleCheckCatalog85 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_13_in_ruleCheckCatalog131 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleCheckCatalog152 = new BitSet(new long[]{0x000000000020C000L});
+    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleCheckCatalog152 = new BitSet(new long[]{0x000000000010C000L});
     public static final BitSet FOLLOW_ruleXImportSection_in_ruleCheckCatalog173 = new BitSet(new long[]{0x000000000000C000L});
     public static final BitSet FOLLOW_14_in_ruleCheckCatalog191 = new BitSet(new long[]{0x0000000000008000L});
     public static final BitSet FOLLOW_15_in_ruleCheckCatalog217 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleCheckCatalog238 = new BitSet(new long[]{0x00000000000D0000L});
+    public static final BitSet FOLLOW_ruleValidID_in_ruleCheckCatalog238 = new BitSet(new long[]{0x0000000000050000L});
     public static final BitSet FOLLOW_16_in_ruleCheckCatalog251 = new BitSet(new long[]{0x0000000000020000L});
     public static final BitSet FOLLOW_17_in_ruleCheckCatalog263 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleCheckCatalog286 = new BitSet(new long[]{0x00000000000C0000L});
-    public static final BitSet FOLLOW_18_in_ruleCheckCatalog301 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleCheckCatalog324 = new BitSet(new long[]{0x0000000000080000L});
-    public static final BitSet FOLLOW_19_in_ruleCheckCatalog338 = new BitSet(new long[]{0x0007F00091904100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleCategory_in_ruleCheckCatalog360 = new BitSet(new long[]{0x0007F00091904100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleImplementation_in_ruleCheckCatalog387 = new BitSet(new long[]{0x0007F00091904100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleCheck_in_ruleCheckCatalog414 = new BitSet(new long[]{0x0007F00091904100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleMember_in_ruleCheckCatalog441 = new BitSet(new long[]{0x0007F00091904100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_20_in_ruleCheckCatalog455 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXImportSection_in_entryRuleXImportSection491 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXImportSection501 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXImportDeclaration_in_ruleXImportSection556 = new BitSet(new long[]{0x0000000000200002L});
-    public static final BitSet FOLLOW_ruleXImportDeclaration_in_entryRuleXImportDeclaration593 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXImportDeclaration603 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_21_in_ruleXImportDeclaration640 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleXImportDeclaration664 = new BitSet(new long[]{0x0000000000400002L});
-    public static final BitSet FOLLOW_ruleQualifiedNameWithWildcard_in_ruleXImportDeclaration691 = new BitSet(new long[]{0x0000000000400002L});
-    public static final BitSet FOLLOW_22_in_ruleXImportDeclaration705 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCategory_in_entryRuleCategory747 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleCategory757 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_ruleCategory794 = new BitSet(new long[]{0x0000000000000110L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleCategory815 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleCategory833 = new BitSet(new long[]{0x0000000000080000L});
-    public static final BitSet FOLLOW_19_in_ruleCategory850 = new BitSet(new long[]{0x0007F00010104000L});
-    public static final BitSet FOLLOW_ruleCheck_in_ruleCategory871 = new BitSet(new long[]{0x0007F00010104000L});
-    public static final BitSet FOLLOW_20_in_ruleCategory884 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCheck_in_entryRuleCheck920 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleCheck930 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSeverityRange_in_ruleCheck976 = new BitSet(new long[]{0x0007F00010004000L});
-    public static final BitSet FOLLOW_14_in_ruleCheck995 = new BitSet(new long[]{0x0007F00010004000L});
-    public static final BitSet FOLLOW_ruleTriggerKind_in_ruleCheck1030 = new BitSet(new long[]{0x0007F00010004000L});
-    public static final BitSet FOLLOW_ruleSeverityKind_in_ruleCheck1052 = new BitSet(new long[]{0x0000000000000110L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleCheck1073 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleCheck1091 = new BitSet(new long[]{0x0000000009090002L});
-    public static final BitSet FOLLOW_24_in_ruleCheck1117 = new BitSet(new long[]{0x0000000004000100L});
-    public static final BitSet FOLLOW_ruleFormalParameter_in_ruleCheck1140 = new BitSet(new long[]{0x0000000006000000L});
-    public static final BitSet FOLLOW_25_in_ruleCheck1153 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleFormalParameter_in_ruleCheck1174 = new BitSet(new long[]{0x0000000006000000L});
-    public static final BitSet FOLLOW_26_in_ruleCheck1190 = new BitSet(new long[]{0x0000000008090002L});
-    public static final BitSet FOLLOW_27_in_ruleCheck1205 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleCheck1222 = new BitSet(new long[]{0x0000000000090002L});
-    public static final BitSet FOLLOW_19_in_ruleCheck1251 = new BitSet(new long[]{0x0000000000110000L});
-    public static final BitSet FOLLOW_ruleContext_in_ruleCheck1273 = new BitSet(new long[]{0x0000000000110000L});
-    public static final BitSet FOLLOW_20_in_ruleCheck1286 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleContext_in_ruleCheck1314 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSeverityRange_in_entryRuleSeverityRange1352 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSeverityRange1362 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_ruleSeverityRange1399 = new BitSet(new long[]{0x0000000020000000L});
-    public static final BitSet FOLLOW_29_in_ruleSeverityRange1411 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_24_in_ruleSeverityRange1423 = new BitSet(new long[]{0x0007F00010004000L});
-    public static final BitSet FOLLOW_ruleSeverityKind_in_ruleSeverityRange1444 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_30_in_ruleSeverityRange1456 = new BitSet(new long[]{0x0007F00010004000L});
-    public static final BitSet FOLLOW_ruleSeverityKind_in_ruleSeverityRange1477 = new BitSet(new long[]{0x0000000004000000L});
-    public static final BitSet FOLLOW_26_in_ruleSeverityRange1489 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMember_in_entryRuleMember1525 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleMember1535 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotation_in_ruleMember1581 = new BitSet(new long[]{0x0007F00091804100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleMember1603 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleMember1624 = new BitSet(new long[]{0x0000000100400000L});
-    public static final BitSet FOLLOW_ruleOpSingleAssign_in_ruleMember1641 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXOrExpression_in_ruleMember1661 = new BitSet(new long[]{0x0000000000400000L});
-    public static final BitSet FOLLOW_22_in_ruleMember1675 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImplementation_in_entryRuleImplementation1711 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleImplementation1721 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_ruleImplementation1758 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleImplementation1779 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_ruleContext_in_ruleImplementation1800 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFormalParameter_in_entryRuleFormalParameter1836 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFormalParameter1846 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmParameterizedTypeReference_in_ruleFormalParameter1892 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleFormalParameter1913 = new BitSet(new long[]{0x0000000100000000L});
-    public static final BitSet FOLLOW_32_in_ruleFormalParameter1925 = new BitSet(new long[]{0x00000002000000F0L,0x0000000600002180L});
-    public static final BitSet FOLLOW_ruleXFormalParameterDefaultValueLiteral_in_ruleFormalParameter1946 = new BitSet(new long[]{0x0000000000000012L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleFormalParameter1963 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSimpleFormalParameterDefaultValueLiteral_in_entryRuleXSimpleFormalParameterDefaultValueLiteral2005 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXSimpleFormalParameterDefaultValueLiteral2015 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBooleanLiteral_in_ruleXSimpleFormalParameterDefaultValueLiteral2062 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXNumberLiteral_in_ruleXSimpleFormalParameterDefaultValueLiteral2089 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXStringLiteral_in_ruleXSimpleFormalParameterDefaultValueLiteral2116 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstantUnaryOperation_in_entryRuleXConstantUnaryOperation2151 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXConstantUnaryOperation2161 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpUnary_in_ruleXConstantUnaryOperation2219 = new BitSet(new long[]{0x00000000000000F0L,0x0000000600002180L});
-    public static final BitSet FOLLOW_ruleXConstantUnaryOperation_in_ruleXConstantUnaryOperation2240 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSimpleFormalParameterDefaultValueLiteral_in_ruleXConstantUnaryOperation2269 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXFormalParameterDefaultValueLiteral_in_entryRuleXFormalParameterDefaultValueLiteral2304 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXFormalParameterDefaultValueLiteral2314 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstantUnaryOperation_in_ruleXFormalParameterDefaultValueLiteral2361 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstantListLiteral_in_ruleXFormalParameterDefaultValueLiteral2388 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstantListLiteral_in_entryRuleXConstantListLiteral2423 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXConstantListLiteral2433 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_ruleXConstantListLiteral2479 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_34_in_ruleXConstantListLiteral2491 = new BitSet(new long[]{0x00000008000000F0L,0x0000000600002180L});
-    public static final BitSet FOLLOW_ruleXConstantUnaryOperation_in_ruleXConstantListLiteral2513 = new BitSet(new long[]{0x0000000802000000L});
-    public static final BitSet FOLLOW_25_in_ruleXConstantListLiteral2526 = new BitSet(new long[]{0x00000000000000F0L,0x0000000600002180L});
-    public static final BitSet FOLLOW_ruleXConstantUnaryOperation_in_ruleXConstantListLiteral2547 = new BitSet(new long[]{0x0000000802000000L});
-    public static final BitSet FOLLOW_35_in_ruleXConstantListLiteral2563 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleContext_in_entryRuleContext2599 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleContext2609 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_16_in_ruleContext2646 = new BitSet(new long[]{0x0007F00091804100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleContextVariable_in_ruleContext2667 = new BitSet(new long[]{0x0000000000080000L});
-    public static final BitSet FOLLOW_ruleXBlockExpression_in_ruleContext2688 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleContextVariable_in_entryRuleContextVariable2724 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleContextVariable2734 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleContextVariable2780 = new BitSet(new long[]{0x0000000000000102L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleContextVariable2801 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXGuardExpression_in_entryRuleXGuardExpression2838 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXGuardExpression2848 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_ruleXGuardExpression2894 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXGuardExpression2915 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXIssueExpression_in_entryRuleXIssueExpression2951 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXIssueExpression2961 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_37_in_ruleXIssueExpression3007 = new BitSet(new long[]{0x000001C008000102L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleXIssueExpression3042 = new BitSet(new long[]{0x000001C008000002L});
-    public static final BitSet FOLLOW_38_in_ruleXIssueExpression3064 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_33_in_ruleXIssueExpression3087 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleXIssueExpression3111 = new BitSet(new long[]{0x0000018408000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXIssueExpression3140 = new BitSet(new long[]{0x0000018608000002L});
-    public static final BitSet FOLLOW_33_in_ruleXIssueExpression3161 = new BitSet(new long[]{0x0007FFC028A68100L});
-    public static final BitSet FOLLOW_ruleFeatureCallID_in_ruleXIssueExpression3185 = new BitSet(new long[]{0x0000018408000002L});
-    public static final BitSet FOLLOW_34_in_ruleXIssueExpression3210 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXIssueExpression3232 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_35_in_ruleXIssueExpression3244 = new BitSet(new long[]{0x0000018008000002L});
-    public static final BitSet FOLLOW_27_in_ruleXIssueExpression3269 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXIssueExpression3291 = new BitSet(new long[]{0x0000018000000002L});
-    public static final BitSet FOLLOW_39_in_ruleXIssueExpression3314 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_24_in_ruleXIssueExpression3327 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXIssueExpression3348 = new BitSet(new long[]{0x0000000006000000L});
-    public static final BitSet FOLLOW_25_in_ruleXIssueExpression3369 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXIssueExpression3391 = new BitSet(new long[]{0x0000000006000000L});
-    public static final BitSet FOLLOW_26_in_ruleXIssueExpression3405 = new BitSet(new long[]{0x0000010000000002L});
-    public static final BitSet FOLLOW_40_in_ruleXIssueExpression3428 = new BitSet(new long[]{0x0000000001000100L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleXIssueExpression3450 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_24_in_ruleXIssueExpression3463 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXIssueExpression3484 = new BitSet(new long[]{0x0000000006000000L});
-    public static final BitSet FOLLOW_25_in_ruleXIssueExpression3505 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXIssueExpression3527 = new BitSet(new long[]{0x0000000006000000L});
-    public static final BitSet FOLLOW_26_in_ruleXIssueExpression3541 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXPrimaryExpression_in_entryRuleXPrimaryExpression3579 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXPrimaryExpression3589 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstructorCall_in_ruleXPrimaryExpression3636 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBlockExpression_in_ruleXPrimaryExpression3663 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSwitchExpression_in_ruleXPrimaryExpression3690 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSynchronizedExpression_in_ruleXPrimaryExpression3734 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXFeatureCall_in_ruleXPrimaryExpression3762 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXLiteral_in_ruleXPrimaryExpression3789 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXIfExpression_in_ruleXPrimaryExpression3816 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXForLoopExpression_in_ruleXPrimaryExpression3873 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBasicForLoopExpression_in_ruleXPrimaryExpression3901 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXWhileExpression_in_ruleXPrimaryExpression3928 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXDoWhileExpression_in_ruleXPrimaryExpression3955 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXThrowExpression_in_ruleXPrimaryExpression3982 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXReturnExpression_in_ruleXPrimaryExpression4009 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXTryCatchFinallyExpression_in_ruleXPrimaryExpression4036 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXParenthesizedExpression_in_ruleXPrimaryExpression4063 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXGuardExpression_in_ruleXPrimaryExpression4090 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXIssueExpression_in_ruleXPrimaryExpression4117 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFeatureCallID_in_entryRuleFeatureCallID4153 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFeatureCallID4164 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleFeatureCallID4211 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_ruleFeatureCallID4235 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleCheckCatalog286 = new BitSet(new long[]{0x0000000000040000L});
+    public static final BitSet FOLLOW_18_in_ruleCheckCatalog300 = new BitSet(new long[]{0x0007F00048C84100L,0x0000000000000010L});
+    public static final BitSet FOLLOW_ruleCategory_in_ruleCheckCatalog322 = new BitSet(new long[]{0x0007F00048C84100L,0x0000000000000010L});
+    public static final BitSet FOLLOW_ruleImplementation_in_ruleCheckCatalog349 = new BitSet(new long[]{0x0007F00048C84100L,0x0000000000000010L});
+    public static final BitSet FOLLOW_ruleCheck_in_ruleCheckCatalog376 = new BitSet(new long[]{0x0007F00048C84100L,0x0000000000000010L});
+    public static final BitSet FOLLOW_ruleMember_in_ruleCheckCatalog403 = new BitSet(new long[]{0x0007F00048C84100L,0x0000000000000010L});
+    public static final BitSet FOLLOW_19_in_ruleCheckCatalog417 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXImportSection_in_entryRuleXImportSection453 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXImportSection463 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXImportDeclaration_in_ruleXImportSection518 = new BitSet(new long[]{0x0000000000100002L});
+    public static final BitSet FOLLOW_ruleXImportDeclaration_in_entryRuleXImportDeclaration555 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXImportDeclaration565 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_20_in_ruleXImportDeclaration602 = new BitSet(new long[]{0x0000000000000100L});
+    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleXImportDeclaration626 = new BitSet(new long[]{0x0000000000200002L});
+    public static final BitSet FOLLOW_ruleQualifiedNameWithWildcard_in_ruleXImportDeclaration653 = new BitSet(new long[]{0x0000000000200002L});
+    public static final BitSet FOLLOW_21_in_ruleXImportDeclaration667 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleCategory_in_entryRuleCategory709 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleCategory719 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_22_in_ruleCategory756 = new BitSet(new long[]{0x0000000000000110L});
+    public static final BitSet FOLLOW_ruleValidID_in_ruleCategory777 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_RULE_STRING_in_ruleCategory795 = new BitSet(new long[]{0x0000000000040000L});
+    public static final BitSet FOLLOW_18_in_ruleCategory812 = new BitSet(new long[]{0x0007F00008084000L});
+    public static final BitSet FOLLOW_ruleCheck_in_ruleCategory833 = new BitSet(new long[]{0x0007F00008084000L});
+    public static final BitSet FOLLOW_19_in_ruleCategory846 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleCheck_in_entryRuleCheck882 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleCheck892 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleSeverityRange_in_ruleCheck938 = new BitSet(new long[]{0x0007F00008004000L});
+    public static final BitSet FOLLOW_14_in_ruleCheck957 = new BitSet(new long[]{0x0007F00008004000L});
+    public static final BitSet FOLLOW_ruleTriggerKind_in_ruleCheck992 = new BitSet(new long[]{0x0007F00008004000L});
+    public static final BitSet FOLLOW_ruleSeverityKind_in_ruleCheck1014 = new BitSet(new long[]{0x0000000000000110L});
+    public static final BitSet FOLLOW_ruleValidID_in_ruleCheck1035 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_RULE_STRING_in_ruleCheck1053 = new BitSet(new long[]{0x0000000004850002L});
+    public static final BitSet FOLLOW_23_in_ruleCheck1079 = new BitSet(new long[]{0x0000000002000100L});
+    public static final BitSet FOLLOW_ruleFormalParameter_in_ruleCheck1102 = new BitSet(new long[]{0x0000000003000000L});
+    public static final BitSet FOLLOW_24_in_ruleCheck1115 = new BitSet(new long[]{0x0000000000000100L});
+    public static final BitSet FOLLOW_ruleFormalParameter_in_ruleCheck1136 = new BitSet(new long[]{0x0000000003000000L});
+    public static final BitSet FOLLOW_25_in_ruleCheck1152 = new BitSet(new long[]{0x0000000004050002L});
+    public static final BitSet FOLLOW_26_in_ruleCheck1167 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_RULE_STRING_in_ruleCheck1184 = new BitSet(new long[]{0x0000000000050002L});
+    public static final BitSet FOLLOW_18_in_ruleCheck1213 = new BitSet(new long[]{0x0000000000090000L});
+    public static final BitSet FOLLOW_ruleContext_in_ruleCheck1235 = new BitSet(new long[]{0x0000000000090000L});
+    public static final BitSet FOLLOW_19_in_ruleCheck1248 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleContext_in_ruleCheck1276 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleSeverityRange_in_entryRuleSeverityRange1314 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleSeverityRange1324 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_27_in_ruleSeverityRange1361 = new BitSet(new long[]{0x0000000010000000L});
+    public static final BitSet FOLLOW_28_in_ruleSeverityRange1373 = new BitSet(new long[]{0x0000000000800000L});
+    public static final BitSet FOLLOW_23_in_ruleSeverityRange1385 = new BitSet(new long[]{0x0007F00008004000L});
+    public static final BitSet FOLLOW_ruleSeverityKind_in_ruleSeverityRange1406 = new BitSet(new long[]{0x0000000020000000L});
+    public static final BitSet FOLLOW_29_in_ruleSeverityRange1418 = new BitSet(new long[]{0x0007F00008004000L});
+    public static final BitSet FOLLOW_ruleSeverityKind_in_ruleSeverityRange1439 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_25_in_ruleSeverityRange1451 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleMember_in_entryRuleMember1487 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleMember1497 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXAnnotation_in_ruleMember1543 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
+    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleMember1565 = new BitSet(new long[]{0x0000000000000100L});
+    public static final BitSet FOLLOW_ruleValidID_in_ruleMember1586 = new BitSet(new long[]{0x0000000080200000L});
+    public static final BitSet FOLLOW_ruleOpSingleAssign_in_ruleMember1603 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXOrExpression_in_ruleMember1623 = new BitSet(new long[]{0x0000000000200000L});
+    public static final BitSet FOLLOW_21_in_ruleMember1637 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleImplementation_in_entryRuleImplementation1673 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleImplementation1683 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_30_in_ruleImplementation1720 = new BitSet(new long[]{0x0000000000000100L});
+    public static final BitSet FOLLOW_ruleValidID_in_ruleImplementation1741 = new BitSet(new long[]{0x0000000000010000L});
+    public static final BitSet FOLLOW_ruleContext_in_ruleImplementation1762 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleFormalParameter_in_entryRuleFormalParameter1798 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleFormalParameter1808 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmParameterizedTypeReference_in_ruleFormalParameter1854 = new BitSet(new long[]{0x0000000000000100L});
+    public static final BitSet FOLLOW_ruleValidID_in_ruleFormalParameter1875 = new BitSet(new long[]{0x0000000080000000L});
+    public static final BitSet FOLLOW_31_in_ruleFormalParameter1887 = new BitSet(new long[]{0x00000001000000F0L,0x0000000600002180L});
+    public static final BitSet FOLLOW_ruleXFormalParameterDefaultValueLiteral_in_ruleFormalParameter1908 = new BitSet(new long[]{0x0000000000000012L});
+    public static final BitSet FOLLOW_RULE_STRING_in_ruleFormalParameter1925 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXSimpleFormalParameterDefaultValueLiteral_in_entryRuleXSimpleFormalParameterDefaultValueLiteral1967 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXSimpleFormalParameterDefaultValueLiteral1977 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXBooleanLiteral_in_ruleXSimpleFormalParameterDefaultValueLiteral2024 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXNumberLiteral_in_ruleXSimpleFormalParameterDefaultValueLiteral2051 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXStringLiteral_in_ruleXSimpleFormalParameterDefaultValueLiteral2078 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXConstantUnaryOperation_in_entryRuleXConstantUnaryOperation2113 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXConstantUnaryOperation2123 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleOpUnary_in_ruleXConstantUnaryOperation2181 = new BitSet(new long[]{0x00000000000000F0L,0x0000000600002180L});
+    public static final BitSet FOLLOW_ruleXConstantUnaryOperation_in_ruleXConstantUnaryOperation2202 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXSimpleFormalParameterDefaultValueLiteral_in_ruleXConstantUnaryOperation2231 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXFormalParameterDefaultValueLiteral_in_entryRuleXFormalParameterDefaultValueLiteral2266 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXFormalParameterDefaultValueLiteral2276 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXConstantUnaryOperation_in_ruleXFormalParameterDefaultValueLiteral2323 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXConstantListLiteral_in_ruleXFormalParameterDefaultValueLiteral2350 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXConstantListLiteral_in_entryRuleXConstantListLiteral2385 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXConstantListLiteral2395 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_32_in_ruleXConstantListLiteral2441 = new BitSet(new long[]{0x0000000200000000L});
+    public static final BitSet FOLLOW_33_in_ruleXConstantListLiteral2453 = new BitSet(new long[]{0x00000004000000F0L,0x0000000600002180L});
+    public static final BitSet FOLLOW_ruleXConstantUnaryOperation_in_ruleXConstantListLiteral2475 = new BitSet(new long[]{0x0000000401000000L});
+    public static final BitSet FOLLOW_24_in_ruleXConstantListLiteral2488 = new BitSet(new long[]{0x00000000000000F0L,0x0000000600002180L});
+    public static final BitSet FOLLOW_ruleXConstantUnaryOperation_in_ruleXConstantListLiteral2509 = new BitSet(new long[]{0x0000000401000000L});
+    public static final BitSet FOLLOW_34_in_ruleXConstantListLiteral2525 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleContext_in_entryRuleContext2561 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleContext2571 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_16_in_ruleContext2608 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
+    public static final BitSet FOLLOW_ruleContextVariable_in_ruleContext2629 = new BitSet(new long[]{0x0000000000040000L});
+    public static final BitSet FOLLOW_ruleXBlockExpression_in_ruleContext2650 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleContextVariable_in_entryRuleContextVariable2686 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleContextVariable2696 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleContextVariable2742 = new BitSet(new long[]{0x0000000000000102L});
+    public static final BitSet FOLLOW_ruleValidID_in_ruleContextVariable2763 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXGuardExpression_in_entryRuleXGuardExpression2800 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXGuardExpression2810 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_35_in_ruleXGuardExpression2856 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXGuardExpression2877 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXIssueExpression_in_entryRuleXIssueExpression2913 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXIssueExpression2923 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_36_in_ruleXIssueExpression2969 = new BitSet(new long[]{0x000000E004000102L});
+    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleXIssueExpression3004 = new BitSet(new long[]{0x000000E004000002L});
+    public static final BitSet FOLLOW_37_in_ruleXIssueExpression3026 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_32_in_ruleXIssueExpression3049 = new BitSet(new long[]{0x0000000000000100L});
+    public static final BitSet FOLLOW_ruleValidID_in_ruleXIssueExpression3073 = new BitSet(new long[]{0x000000C204000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXIssueExpression3102 = new BitSet(new long[]{0x000000C304000002L});
+    public static final BitSet FOLLOW_32_in_ruleXIssueExpression3123 = new BitSet(new long[]{0x0007FFE014528100L});
+    public static final BitSet FOLLOW_ruleFeatureCallID_in_ruleXIssueExpression3147 = new BitSet(new long[]{0x000000C204000002L});
+    public static final BitSet FOLLOW_33_in_ruleXIssueExpression3172 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXIssueExpression3194 = new BitSet(new long[]{0x0000000400000000L});
+    public static final BitSet FOLLOW_34_in_ruleXIssueExpression3206 = new BitSet(new long[]{0x000000C004000002L});
+    public static final BitSet FOLLOW_26_in_ruleXIssueExpression3231 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXIssueExpression3253 = new BitSet(new long[]{0x000000C000000002L});
+    public static final BitSet FOLLOW_38_in_ruleXIssueExpression3276 = new BitSet(new long[]{0x0000000000800000L});
+    public static final BitSet FOLLOW_23_in_ruleXIssueExpression3289 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXIssueExpression3310 = new BitSet(new long[]{0x0000000003000000L});
+    public static final BitSet FOLLOW_24_in_ruleXIssueExpression3331 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXIssueExpression3353 = new BitSet(new long[]{0x0000000003000000L});
+    public static final BitSet FOLLOW_25_in_ruleXIssueExpression3367 = new BitSet(new long[]{0x0000008000000002L});
+    public static final BitSet FOLLOW_39_in_ruleXIssueExpression3390 = new BitSet(new long[]{0x0000000000800100L});
+    public static final BitSet FOLLOW_ruleValidID_in_ruleXIssueExpression3412 = new BitSet(new long[]{0x0000000000800000L});
+    public static final BitSet FOLLOW_23_in_ruleXIssueExpression3425 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXIssueExpression3446 = new BitSet(new long[]{0x0000000003000000L});
+    public static final BitSet FOLLOW_24_in_ruleXIssueExpression3467 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXIssueExpression3489 = new BitSet(new long[]{0x0000000003000000L});
+    public static final BitSet FOLLOW_25_in_ruleXIssueExpression3503 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXPrimaryExpression_in_entryRuleXPrimaryExpression3541 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXPrimaryExpression3551 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXConstructorCall_in_ruleXPrimaryExpression3598 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXBlockExpression_in_ruleXPrimaryExpression3625 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXSwitchExpression_in_ruleXPrimaryExpression3652 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXSynchronizedExpression_in_ruleXPrimaryExpression3696 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXFeatureCall_in_ruleXPrimaryExpression3724 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXLiteral_in_ruleXPrimaryExpression3751 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXIfExpression_in_ruleXPrimaryExpression3778 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXForLoopExpression_in_ruleXPrimaryExpression3835 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXBasicForLoopExpression_in_ruleXPrimaryExpression3863 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXWhileExpression_in_ruleXPrimaryExpression3890 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXDoWhileExpression_in_ruleXPrimaryExpression3917 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXThrowExpression_in_ruleXPrimaryExpression3944 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXReturnExpression_in_ruleXPrimaryExpression3971 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXTryCatchFinallyExpression_in_ruleXPrimaryExpression3998 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXParenthesizedExpression_in_ruleXPrimaryExpression4025 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXGuardExpression_in_ruleXPrimaryExpression4052 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXIssueExpression_in_ruleXPrimaryExpression4079 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleFeatureCallID_in_entryRuleFeatureCallID4115 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleFeatureCallID4126 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleValidID_in_ruleFeatureCallID4173 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_40_in_ruleFeatureCallID4197 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_41_in_ruleFeatureCallID4216 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_20_in_ruleFeatureCallID4235 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_42_in_ruleFeatureCallID4254 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_21_in_ruleFeatureCallID4273 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_ruleFeatureCallID4292 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_15_in_ruleFeatureCallID4311 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_17_in_ruleFeatureCallID4330 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_18_in_ruleFeatureCallID4349 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_ruleFeatureCallID4368 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_ruleFeatureCallID4387 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_38_in_ruleFeatureCallID4406 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_39_in_ruleFeatureCallID4425 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_40_in_ruleFeatureCallID4444 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_ruleFeatureCallID4463 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_44_in_ruleFeatureCallID4482 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_45_in_ruleFeatureCallID4501 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_ruleFeatureCallID4520 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_ruleFeatureCallID4539 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_ruleFeatureCallID4558 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_49_in_ruleFeatureCallID4577 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_50_in_ruleFeatureCallID4596 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotation_in_entryRuleXAnnotation4636 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAnnotation4646 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_ruleXAnnotation4692 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleXAnnotation4715 = new BitSet(new long[]{0x0000000001000002L});
-    public static final BitSet FOLLOW_24_in_ruleXAnnotation4736 = new BitSet(new long[]{0x0107FFF63DAF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXAnnotationElementValuePair_in_ruleXAnnotation4780 = new BitSet(new long[]{0x0000000006000000L});
-    public static final BitSet FOLLOW_25_in_ruleXAnnotation4793 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleXAnnotationElementValuePair_in_ruleXAnnotation4834 = new BitSet(new long[]{0x0000000006000000L});
-    public static final BitSet FOLLOW_ruleXAnnotationElementValueOrCommaList_in_ruleXAnnotation4864 = new BitSet(new long[]{0x0000000004000000L});
-    public static final BitSet FOLLOW_26_in_ruleXAnnotation4878 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationElementValuePair_in_entryRuleXAnnotationElementValuePair4916 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAnnotationElementValuePair4926 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleXAnnotationElementValuePair4996 = new BitSet(new long[]{0x0000000100000000L});
-    public static final BitSet FOLLOW_32_in_ruleXAnnotationElementValuePair5008 = new BitSet(new long[]{0x0107FFF639AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXAnnotationElementValue_in_ruleXAnnotationElementValuePair5031 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationElementValueOrCommaList_in_entryRuleXAnnotationElementValueOrCommaList5067 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAnnotationElementValueOrCommaList5077 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_ruleXAnnotationElementValueOrCommaList5142 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_34_in_ruleXAnnotationElementValueOrCommaList5154 = new BitSet(new long[]{0x0107FFFE39AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValueOrCommaList5178 = new BitSet(new long[]{0x0000000802000000L});
-    public static final BitSet FOLLOW_25_in_ruleXAnnotationElementValueOrCommaList5191 = new BitSet(new long[]{0x0107FFF639AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValueOrCommaList5212 = new BitSet(new long[]{0x0000000802000000L});
-    public static final BitSet FOLLOW_35_in_ruleXAnnotationElementValueOrCommaList5228 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValueOrCommaList5258 = new BitSet(new long[]{0x0000000002000002L});
-    public static final BitSet FOLLOW_25_in_ruleXAnnotationElementValueOrCommaList5280 = new BitSet(new long[]{0x0107FFF639AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValueOrCommaList5301 = new BitSet(new long[]{0x0000000002000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationElementValue_in_entryRuleXAnnotationElementValue5342 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAnnotationElementValue5352 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_ruleXAnnotationElementValue5417 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_34_in_ruleXAnnotationElementValue5429 = new BitSet(new long[]{0x0107FFFE39AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValue5453 = new BitSet(new long[]{0x0000000802000000L});
-    public static final BitSet FOLLOW_25_in_ruleXAnnotationElementValue5466 = new BitSet(new long[]{0x0107FFF639AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValue5487 = new BitSet(new long[]{0x0000000802000000L});
-    public static final BitSet FOLLOW_35_in_ruleXAnnotationElementValue5503 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValue5532 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_entryRuleXAnnotationOrExpression5567 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAnnotationOrExpression5577 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotation_in_ruleXAnnotationOrExpression5624 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXAnnotationOrExpression5651 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_entryRuleXExpression5686 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXExpression5696 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAssignment_in_ruleXExpression5742 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAssignment_in_entryRuleXAssignment5776 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAssignment5786 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFeatureCallID_in_ruleXAssignment5844 = new BitSet(new long[]{0x0000000100000000L});
-    public static final BitSet FOLLOW_ruleOpSingleAssign_in_ruleXAssignment5860 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXAssignment_in_ruleXAssignment5880 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXOrExpression_in_ruleXAssignment5910 = new BitSet(new long[]{0x03F8000000000002L});
-    public static final BitSet FOLLOW_ruleOpMultiAssign_in_ruleXAssignment5963 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXAssignment_in_ruleXAssignment5986 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpSingleAssign_in_entryRuleOpSingleAssign6026 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpSingleAssign6037 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_ruleOpSingleAssign6074 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpMultiAssign_in_entryRuleOpMultiAssign6114 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpMultiAssign6125 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_ruleOpMultiAssign6163 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_ruleOpMultiAssign6182 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_53_in_ruleOpMultiAssign6201 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_54_in_ruleOpMultiAssign6220 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_55_in_ruleOpMultiAssign6239 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_ruleOpMultiAssign6259 = new BitSet(new long[]{0x0100000000000000L});
-    public static final BitSet FOLLOW_56_in_ruleOpMultiAssign6272 = new BitSet(new long[]{0x0000000100000000L});
-    public static final BitSet FOLLOW_32_in_ruleOpMultiAssign6285 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_57_in_ruleOpMultiAssign6306 = new BitSet(new long[]{0x0600000000000000L});
-    public static final BitSet FOLLOW_57_in_ruleOpMultiAssign6320 = new BitSet(new long[]{0x0400000000000000L});
-    public static final BitSet FOLLOW_58_in_ruleOpMultiAssign6335 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXOrExpression_in_entryRuleXOrExpression6376 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXOrExpression6386 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAndExpression_in_ruleXOrExpression6433 = new BitSet(new long[]{0x0800000000000002L});
-    public static final BitSet FOLLOW_ruleOpOr_in_ruleXOrExpression6486 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXAndExpression_in_ruleXOrExpression6509 = new BitSet(new long[]{0x0800000000000002L});
-    public static final BitSet FOLLOW_ruleOpOr_in_entryRuleOpOr6548 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpOr6559 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_59_in_ruleOpOr6596 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAndExpression_in_entryRuleXAndExpression6635 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAndExpression6645 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXEqualityExpression_in_ruleXAndExpression6692 = new BitSet(new long[]{0x1000000000000002L});
-    public static final BitSet FOLLOW_ruleOpAnd_in_ruleXAndExpression6745 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXEqualityExpression_in_ruleXAndExpression6768 = new BitSet(new long[]{0x1000000000000002L});
-    public static final BitSet FOLLOW_ruleOpAnd_in_entryRuleOpAnd6807 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpAnd6818 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_60_in_ruleOpAnd6855 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXEqualityExpression_in_entryRuleXEqualityExpression6894 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXEqualityExpression6904 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXRelationalExpression_in_ruleXEqualityExpression6951 = new BitSet(new long[]{0xE000000000000002L,0x0000000000000001L});
-    public static final BitSet FOLLOW_ruleOpEquality_in_ruleXEqualityExpression7004 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXRelationalExpression_in_ruleXEqualityExpression7027 = new BitSet(new long[]{0xE000000000000002L,0x0000000000000001L});
-    public static final BitSet FOLLOW_ruleOpEquality_in_entryRuleOpEquality7066 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpEquality7077 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_61_in_ruleOpEquality7115 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_62_in_ruleOpEquality7134 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_ruleOpEquality7153 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_64_in_ruleOpEquality7172 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXRelationalExpression_in_entryRuleXRelationalExpression7212 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXRelationalExpression7222 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXOtherOperatorExpression_in_ruleXRelationalExpression7269 = new BitSet(new long[]{0x0700000000000002L,0x0000000000000002L});
-    public static final BitSet FOLLOW_65_in_ruleXRelationalExpression7305 = new BitSet(new long[]{0x0007F00091804100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleXRelationalExpression7328 = new BitSet(new long[]{0x0700000000000002L,0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpCompare_in_ruleXRelationalExpression7389 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXOtherOperatorExpression_in_ruleXRelationalExpression7412 = new BitSet(new long[]{0x0700000000000002L,0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpCompare_in_entryRuleOpCompare7452 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpCompare7463 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_58_in_ruleOpCompare7501 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_ruleOpCompare7521 = new BitSet(new long[]{0x0000000100000000L});
-    public static final BitSet FOLLOW_32_in_ruleOpCompare7534 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_57_in_ruleOpCompare7554 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_ruleOpCompare7573 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXOtherOperatorExpression_in_entryRuleXOtherOperatorExpression7613 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXOtherOperatorExpression7623 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAdditiveExpression_in_ruleXOtherOperatorExpression7670 = new BitSet(new long[]{0x0300000040000002L,0x000000000000007CL});
-    public static final BitSet FOLLOW_ruleOpOther_in_ruleXOtherOperatorExpression7723 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXAdditiveExpression_in_ruleXOtherOperatorExpression7746 = new BitSet(new long[]{0x0300000040000002L,0x000000000000007CL});
-    public static final BitSet FOLLOW_ruleOpOther_in_entryRuleOpOther7785 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpOther7796 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_66_in_ruleOpOther7834 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_67_in_ruleOpOther7853 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_57_in_ruleOpOther7873 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_30_in_ruleOpOther7886 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_ruleOpOther7906 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_68_in_ruleOpOther7925 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_57_in_ruleOpOther7945 = new BitSet(new long[]{0x0200000000000000L});
-    public static final BitSet FOLLOW_57_in_ruleOpOther7976 = new BitSet(new long[]{0x0200000000000000L});
-    public static final BitSet FOLLOW_57_in_ruleOpOther7989 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_57_in_ruleOpOther8010 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_ruleOpOther8032 = new BitSet(new long[]{0x0100000000000000L,0x0000000000000010L});
-    public static final BitSet FOLLOW_56_in_ruleOpOther8063 = new BitSet(new long[]{0x0100000000000000L});
-    public static final BitSet FOLLOW_56_in_ruleOpOther8076 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_ruleOpOther8097 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_68_in_ruleOpOther8116 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_69_in_ruleOpOther8137 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_70_in_ruleOpOther8156 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAdditiveExpression_in_entryRuleXAdditiveExpression8196 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAdditiveExpression8206 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXMultiplicativeExpression_in_ruleXAdditiveExpression8253 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000180L});
-    public static final BitSet FOLLOW_ruleOpAdd_in_ruleXAdditiveExpression8306 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXMultiplicativeExpression_in_ruleXAdditiveExpression8329 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000180L});
-    public static final BitSet FOLLOW_ruleOpAdd_in_entryRuleOpAdd8368 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpAdd8379 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_ruleOpAdd8417 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_ruleOpAdd8436 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXMultiplicativeExpression_in_entryRuleXMultiplicativeExpression8476 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXMultiplicativeExpression8486 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXUnaryOperation_in_ruleXMultiplicativeExpression8533 = new BitSet(new long[]{0x0000000000000002L,0x0000000000001E00L});
-    public static final BitSet FOLLOW_ruleOpMulti_in_ruleXMultiplicativeExpression8586 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXUnaryOperation_in_ruleXMultiplicativeExpression8609 = new BitSet(new long[]{0x0000000000000002L,0x0000000000001E00L});
-    public static final BitSet FOLLOW_ruleOpMulti_in_entryRuleOpMulti8648 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpMulti8659 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_ruleOpMulti8697 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_ruleOpMulti8716 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_75_in_ruleOpMulti8735 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_76_in_ruleOpMulti8754 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXUnaryOperation_in_entryRuleXUnaryOperation8794 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXUnaryOperation8804 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpUnary_in_ruleXUnaryOperation8862 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXUnaryOperation_in_ruleXUnaryOperation8883 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCastedExpression_in_ruleXUnaryOperation8912 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpUnary_in_entryRuleOpUnary8948 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpUnary8959 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_77_in_ruleOpUnary8997 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_ruleOpUnary9016 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_ruleOpUnary9035 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCastedExpression_in_entryRuleXCastedExpression9075 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXCastedExpression9085 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXPostfixOperation_in_ruleXCastedExpression9132 = new BitSet(new long[]{0x0000000000000002L,0x0000000000004000L});
-    public static final BitSet FOLLOW_78_in_ruleXCastedExpression9167 = new BitSet(new long[]{0x0007F00091804100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleXCastedExpression9190 = new BitSet(new long[]{0x0000000000000002L,0x0000000000004000L});
-    public static final BitSet FOLLOW_ruleXPostfixOperation_in_entryRuleXPostfixOperation9228 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXPostfixOperation9238 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXMemberFeatureCall_in_ruleXPostfixOperation9285 = new BitSet(new long[]{0x0000000000000002L,0x0000000000018000L});
-    public static final BitSet FOLLOW_ruleOpPostfix_in_ruleXPostfixOperation9337 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpPostfix_in_entryRuleOpPostfix9377 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpPostfix9388 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_79_in_ruleOpPostfix9426 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_80_in_ruleOpPostfix9445 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXMemberFeatureCall_in_entryRuleXMemberFeatureCall9485 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXMemberFeatureCall9495 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXPrimaryExpression_in_ruleXMemberFeatureCall9542 = new BitSet(new long[]{0x0000000000000002L,0x00000000000E0000L});
-    public static final BitSet FOLLOW_81_in_ruleXMemberFeatureCall9614 = new BitSet(new long[]{0x0007FFC028A68100L});
-    public static final BitSet FOLLOW_82_in_ruleXMemberFeatureCall9638 = new BitSet(new long[]{0x0007FFC028A68100L});
-    public static final BitSet FOLLOW_ruleFeatureCallID_in_ruleXMemberFeatureCall9675 = new BitSet(new long[]{0x0000000100000000L});
-    public static final BitSet FOLLOW_ruleOpSingleAssign_in_ruleXMemberFeatureCall9691 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXAssignment_in_ruleXMemberFeatureCall9713 = new BitSet(new long[]{0x0000000000000002L,0x00000000000E0000L});
-    public static final BitSet FOLLOW_81_in_ruleXMemberFeatureCall9799 = new BitSet(new long[]{0x0107FFC028A68100L,0x0000000080000000L});
-    public static final BitSet FOLLOW_83_in_ruleXMemberFeatureCall9823 = new BitSet(new long[]{0x0107FFC028A68100L,0x0000000080000000L});
-    public static final BitSet FOLLOW_82_in_ruleXMemberFeatureCall9860 = new BitSet(new long[]{0x0107FFC028A68100L,0x0000000080000000L});
-    public static final BitSet FOLLOW_56_in_ruleXMemberFeatureCall9889 = new BitSet(new long[]{0x0007F00091804100L,0x0000080000000010L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleXMemberFeatureCall9910 = new BitSet(new long[]{0x0200000002000000L});
-    public static final BitSet FOLLOW_25_in_ruleXMemberFeatureCall9923 = new BitSet(new long[]{0x0007F00091804100L,0x0000080000000010L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleXMemberFeatureCall9944 = new BitSet(new long[]{0x0200000002000000L});
-    public static final BitSet FOLLOW_57_in_ruleXMemberFeatureCall9958 = new BitSet(new long[]{0x0107FFC028A68100L,0x0000000080000000L});
-    public static final BitSet FOLLOW_ruleIdOrSuper_in_ruleXMemberFeatureCall9983 = new BitSet(new long[]{0x0000000401000002L,0x00000000000E0000L});
-    public static final BitSet FOLLOW_24_in_ruleXMemberFeatureCall10017 = new BitSet(new long[]{0x0107FFF6BDAFC1F0L,0x000002FF98B02190L});
-    public static final BitSet FOLLOW_ruleXShortClosure_in_ruleXMemberFeatureCall10102 = new BitSet(new long[]{0x0000000004000000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXMemberFeatureCall10130 = new BitSet(new long[]{0x0000000006000000L});
-    public static final BitSet FOLLOW_25_in_ruleXMemberFeatureCall10143 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXMemberFeatureCall10164 = new BitSet(new long[]{0x0000000006000000L});
-    public static final BitSet FOLLOW_26_in_ruleXMemberFeatureCall10181 = new BitSet(new long[]{0x0000000400000002L,0x00000000000E0000L});
-    public static final BitSet FOLLOW_ruleXClosure_in_ruleXMemberFeatureCall10216 = new BitSet(new long[]{0x0000000000000002L,0x00000000000E0000L});
-    public static final BitSet FOLLOW_ruleXLiteral_in_entryRuleXLiteral10256 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXLiteral10266 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCollectionLiteral_in_ruleXLiteral10313 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXClosure_in_ruleXLiteral10353 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBooleanLiteral_in_ruleXLiteral10381 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXNumberLiteral_in_ruleXLiteral10408 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXNullLiteral_in_ruleXLiteral10435 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXStringLiteral_in_ruleXLiteral10462 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXTypeLiteral_in_ruleXLiteral10489 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCollectionLiteral_in_entryRuleXCollectionLiteral10524 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXCollectionLiteral10534 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSetLiteral_in_ruleXCollectionLiteral10581 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXListLiteral_in_ruleXCollectionLiteral10608 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSetLiteral_in_entryRuleXSetLiteral10643 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXSetLiteral10653 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_ruleXSetLiteral10699 = new BitSet(new long[]{0x0000000000080000L});
-    public static final BitSet FOLLOW_19_in_ruleXSetLiteral10711 = new BitSet(new long[]{0x0107FFF629BF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXSetLiteral10733 = new BitSet(new long[]{0x0000000002100000L});
-    public static final BitSet FOLLOW_25_in_ruleXSetLiteral10746 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXSetLiteral10767 = new BitSet(new long[]{0x0000000002100000L});
-    public static final BitSet FOLLOW_20_in_ruleXSetLiteral10783 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXListLiteral_in_entryRuleXListLiteral10819 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXListLiteral10829 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_ruleXListLiteral10875 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_34_in_ruleXListLiteral10887 = new BitSet(new long[]{0x0107FFFE29AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXListLiteral10909 = new BitSet(new long[]{0x0000000802000000L});
-    public static final BitSet FOLLOW_25_in_ruleXListLiteral10922 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXListLiteral10943 = new BitSet(new long[]{0x0000000802000000L});
-    public static final BitSet FOLLOW_35_in_ruleXListLiteral10959 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXClosure_in_entryRuleXClosure10995 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXClosure11005 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_34_in_ruleXClosure11065 = new BitSet(new long[]{0x0107FFFEB9AFC1F0L,0x000002FFF8B02190L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_ruleXClosure11138 = new BitSet(new long[]{0x0000000002000000L,0x0000000000100000L});
-    public static final BitSet FOLLOW_25_in_ruleXClosure11151 = new BitSet(new long[]{0x0007F00091804100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_ruleXClosure11172 = new BitSet(new long[]{0x0000000002000000L,0x0000000000100000L});
-    public static final BitSet FOLLOW_84_in_ruleXClosure11194 = new BitSet(new long[]{0x0107FFFE29AF81F0L,0x000002FFF8A02180L});
-    public static final BitSet FOLLOW_ruleXExpressionInClosure_in_ruleXClosure11231 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_35_in_ruleXClosure11243 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpressionInClosure_in_entryRuleXExpressionInClosure11279 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXExpressionInClosure11289 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_ruleXExpressionInClosure11345 = new BitSet(new long[]{0x0107FFF629EF81F2L,0x000002FFF8A02180L});
-    public static final BitSet FOLLOW_22_in_ruleXExpressionInClosure11358 = new BitSet(new long[]{0x0107FFF629AF81F2L,0x000002FFF8A02180L});
-    public static final BitSet FOLLOW_ruleXShortClosure_in_entryRuleXShortClosure11398 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXShortClosure11408 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_ruleXShortClosure11516 = new BitSet(new long[]{0x0000000002000000L,0x0000000000100000L});
-    public static final BitSet FOLLOW_25_in_ruleXShortClosure11529 = new BitSet(new long[]{0x0007F00091804100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_ruleXShortClosure11550 = new BitSet(new long[]{0x0000000002000000L,0x0000000000100000L});
-    public static final BitSet FOLLOW_84_in_ruleXShortClosure11572 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXShortClosure11608 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXParenthesizedExpression_in_entryRuleXParenthesizedExpression11644 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXParenthesizedExpression11654 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_ruleXParenthesizedExpression11691 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXParenthesizedExpression11713 = new BitSet(new long[]{0x0000000004000000L});
-    public static final BitSet FOLLOW_26_in_ruleXParenthesizedExpression11724 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXIfExpression_in_entryRuleXIfExpression11760 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXIfExpression11770 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_85_in_ruleXIfExpression11816 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_24_in_ruleXIfExpression11828 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXIfExpression11849 = new BitSet(new long[]{0x0000000004000000L});
-    public static final BitSet FOLLOW_26_in_ruleXIfExpression11861 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXIfExpression11882 = new BitSet(new long[]{0x0000000000000002L,0x0000000000400000L});
-    public static final BitSet FOLLOW_86_in_ruleXIfExpression11903 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXIfExpression11925 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSwitchExpression_in_entryRuleXSwitchExpression11963 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXSwitchExpression11973 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_87_in_ruleXSwitchExpression12019 = new BitSet(new long[]{0x0107FFF6B9AFC1F0L,0x000002FF98A02190L});
-    public static final BitSet FOLLOW_24_in_ruleXSwitchExpression12057 = new BitSet(new long[]{0x0007F00091804100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_ruleXSwitchExpression12078 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_88_in_ruleXSwitchExpression12090 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXSwitchExpression12113 = new BitSet(new long[]{0x0000000004000000L});
-    public static final BitSet FOLLOW_26_in_ruleXSwitchExpression12125 = new BitSet(new long[]{0x0000000000080000L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_ruleXSwitchExpression12174 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_88_in_ruleXSwitchExpression12186 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXSwitchExpression12210 = new BitSet(new long[]{0x0000000000080000L});
-    public static final BitSet FOLLOW_19_in_ruleXSwitchExpression12224 = new BitSet(new long[]{0x0007F00093904100L,0x0000000007000010L});
-    public static final BitSet FOLLOW_ruleXCasePart_in_ruleXSwitchExpression12245 = new BitSet(new long[]{0x0007F00093904100L,0x0000000007000010L});
-    public static final BitSet FOLLOW_89_in_ruleXSwitchExpression12259 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_88_in_ruleXSwitchExpression12271 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXSwitchExpression12292 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_20_in_ruleXSwitchExpression12306 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCasePart_in_entryRuleXCasePart12342 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXCasePart12352 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleXCasePart12407 = new BitSet(new long[]{0x0000000002000000L,0x0000000005000000L});
-    public static final BitSet FOLLOW_90_in_ruleXCasePart12421 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXCasePart12442 = new BitSet(new long[]{0x0000000002000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_88_in_ruleXCasePart12458 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXCasePart12479 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_25_in_ruleXCasePart12504 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXForLoopExpression_in_entryRuleXForLoopExpression12554 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXForLoopExpression12564 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_16_in_ruleXForLoopExpression12641 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_24_in_ruleXForLoopExpression12653 = new BitSet(new long[]{0x0007F00091804100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_ruleXForLoopExpression12674 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_88_in_ruleXForLoopExpression12686 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXForLoopExpression12709 = new BitSet(new long[]{0x0000000004000000L});
-    public static final BitSet FOLLOW_26_in_ruleXForLoopExpression12721 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXForLoopExpression12742 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBasicForLoopExpression_in_entryRuleXBasicForLoopExpression12778 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXBasicForLoopExpression12788 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_16_in_ruleXBasicForLoopExpression12834 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_24_in_ruleXBasicForLoopExpression12846 = new BitSet(new long[]{0x0107FFF629EF81F0L,0x000002FFF8A02180L});
-    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_ruleXBasicForLoopExpression12868 = new BitSet(new long[]{0x0000000002400000L});
-    public static final BitSet FOLLOW_25_in_ruleXBasicForLoopExpression12881 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FFF8A02180L});
-    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_ruleXBasicForLoopExpression12902 = new BitSet(new long[]{0x0000000002400000L});
-    public static final BitSet FOLLOW_22_in_ruleXBasicForLoopExpression12918 = new BitSet(new long[]{0x0107FFF629EF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXBasicForLoopExpression12939 = new BitSet(new long[]{0x0000000000400000L});
-    public static final BitSet FOLLOW_22_in_ruleXBasicForLoopExpression12952 = new BitSet(new long[]{0x0107FFF62DAF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXBasicForLoopExpression12974 = new BitSet(new long[]{0x0000000006000000L});
-    public static final BitSet FOLLOW_25_in_ruleXBasicForLoopExpression12987 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXBasicForLoopExpression13008 = new BitSet(new long[]{0x0000000006000000L});
-    public static final BitSet FOLLOW_26_in_ruleXBasicForLoopExpression13024 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXBasicForLoopExpression13045 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXWhileExpression_in_entryRuleXWhileExpression13081 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXWhileExpression13091 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_91_in_ruleXWhileExpression13137 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_24_in_ruleXWhileExpression13149 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXWhileExpression13170 = new BitSet(new long[]{0x0000000004000000L});
-    public static final BitSet FOLLOW_26_in_ruleXWhileExpression13182 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXWhileExpression13203 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXDoWhileExpression_in_entryRuleXDoWhileExpression13239 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXDoWhileExpression13249 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_92_in_ruleXDoWhileExpression13295 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXDoWhileExpression13316 = new BitSet(new long[]{0x0000000000000000L,0x0000000008000000L});
-    public static final BitSet FOLLOW_91_in_ruleXDoWhileExpression13328 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_24_in_ruleXDoWhileExpression13340 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXDoWhileExpression13361 = new BitSet(new long[]{0x0000000004000000L});
-    public static final BitSet FOLLOW_26_in_ruleXDoWhileExpression13373 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBlockExpression_in_entryRuleXBlockExpression13409 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXBlockExpression13419 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_ruleXBlockExpression13465 = new BitSet(new long[]{0x0107FFF629BF81F0L,0x000002FFF8A02180L});
-    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_ruleXBlockExpression13487 = new BitSet(new long[]{0x0107FFF629FF81F0L,0x000002FFF8A02180L});
-    public static final BitSet FOLLOW_22_in_ruleXBlockExpression13500 = new BitSet(new long[]{0x0107FFF629BF81F0L,0x000002FFF8A02180L});
-    public static final BitSet FOLLOW_20_in_ruleXBlockExpression13516 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_entryRuleXExpressionOrVarDeclaration13552 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXExpressionOrVarDeclaration13562 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXVariableDeclaration_in_ruleXExpressionOrVarDeclaration13609 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXExpressionOrVarDeclaration13636 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXVariableDeclaration_in_entryRuleXVariableDeclaration13671 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXVariableDeclaration13681 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_93_in_ruleXVariableDeclaration13734 = new BitSet(new long[]{0x0007F00091804100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_94_in_ruleXVariableDeclaration13765 = new BitSet(new long[]{0x0007F00091804100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleXVariableDeclaration13813 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleXVariableDeclaration13834 = new BitSet(new long[]{0x0000000100000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleXVariableDeclaration13863 = new BitSet(new long[]{0x0000000100000002L});
-    public static final BitSet FOLLOW_32_in_ruleXVariableDeclaration13877 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXVariableDeclaration13898 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_entryRuleJvmFormalParameter13936 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmFormalParameter13946 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleJvmFormalParameter13992 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleJvmFormalParameter14014 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFullJvmFormalParameter_in_entryRuleFullJvmFormalParameter14050 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFullJvmFormalParameter14060 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleFullJvmFormalParameter14106 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleFullJvmFormalParameter14127 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXFeatureCall_in_entryRuleXFeatureCall14163 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXFeatureCall14173 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_ruleXFeatureCall14220 = new BitSet(new long[]{0x0007F00091804100L,0x0000080000000010L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleXFeatureCall14241 = new BitSet(new long[]{0x0200000002000000L});
-    public static final BitSet FOLLOW_25_in_ruleXFeatureCall14254 = new BitSet(new long[]{0x0007F00091804100L,0x0000080000000010L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleXFeatureCall14275 = new BitSet(new long[]{0x0200000002000000L});
-    public static final BitSet FOLLOW_57_in_ruleXFeatureCall14289 = new BitSet(new long[]{0x0107FFC028A68100L,0x0000000080000000L});
-    public static final BitSet FOLLOW_ruleIdOrSuper_in_ruleXFeatureCall14314 = new BitSet(new long[]{0x0000000401000002L});
-    public static final BitSet FOLLOW_24_in_ruleXFeatureCall14348 = new BitSet(new long[]{0x0107FFF6BDAFC1F0L,0x000002FF98B02190L});
-    public static final BitSet FOLLOW_ruleXShortClosure_in_ruleXFeatureCall14433 = new BitSet(new long[]{0x0000000004000000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXFeatureCall14461 = new BitSet(new long[]{0x0000000006000000L});
-    public static final BitSet FOLLOW_25_in_ruleXFeatureCall14474 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXFeatureCall14495 = new BitSet(new long[]{0x0000000006000000L});
-    public static final BitSet FOLLOW_26_in_ruleXFeatureCall14512 = new BitSet(new long[]{0x0000000400000002L});
-    public static final BitSet FOLLOW_ruleXClosure_in_ruleXFeatureCall14547 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdOrSuper_in_entryRuleIdOrSuper14585 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIdOrSuper14596 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFeatureCallID_in_ruleIdOrSuper14643 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_95_in_ruleIdOrSuper14667 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstructorCall_in_entryRuleXConstructorCall14707 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXConstructorCall14717 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_96_in_ruleXConstructorCall14763 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleXConstructorCall14786 = new BitSet(new long[]{0x0100000401000002L});
-    public static final BitSet FOLLOW_56_in_ruleXConstructorCall14807 = new BitSet(new long[]{0x0007F00091804100L,0x0000080000000010L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleXConstructorCall14829 = new BitSet(new long[]{0x0200000002000000L});
-    public static final BitSet FOLLOW_25_in_ruleXConstructorCall14842 = new BitSet(new long[]{0x0007F00091804100L,0x0000080000000010L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleXConstructorCall14863 = new BitSet(new long[]{0x0200000002000000L});
-    public static final BitSet FOLLOW_57_in_ruleXConstructorCall14877 = new BitSet(new long[]{0x0000000401000002L});
-    public static final BitSet FOLLOW_24_in_ruleXConstructorCall14913 = new BitSet(new long[]{0x0107FFF6BDAFC1F0L,0x000002FF98B02190L});
-    public static final BitSet FOLLOW_ruleXShortClosure_in_ruleXConstructorCall14998 = new BitSet(new long[]{0x0000000004000000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXConstructorCall15026 = new BitSet(new long[]{0x0000000006000000L});
-    public static final BitSet FOLLOW_25_in_ruleXConstructorCall15039 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXConstructorCall15060 = new BitSet(new long[]{0x0000000006000000L});
-    public static final BitSet FOLLOW_26_in_ruleXConstructorCall15077 = new BitSet(new long[]{0x0000000400000002L});
-    public static final BitSet FOLLOW_ruleXClosure_in_ruleXConstructorCall15112 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBooleanLiteral_in_entryRuleXBooleanLiteral15149 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXBooleanLiteral15159 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_97_in_ruleXBooleanLiteral15206 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_98_in_ruleXBooleanLiteral15230 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXNullLiteral_in_entryRuleXNullLiteral15280 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXNullLiteral15290 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_99_in_ruleXNullLiteral15336 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXNumberLiteral_in_entryRuleXNumberLiteral15372 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXNumberLiteral15382 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNumber_in_ruleXNumberLiteral15437 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXStringLiteral_in_entryRuleXStringLiteral15473 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXStringLiteral15483 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleXStringLiteral15534 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXTypeLiteral_in_entryRuleXTypeLiteral15575 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXTypeLiteral15585 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_100_in_ruleXTypeLiteral15631 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_24_in_ruleXTypeLiteral15643 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleXTypeLiteral15666 = new BitSet(new long[]{0x0000000404000000L});
-    public static final BitSet FOLLOW_ruleArrayBrackets_in_ruleXTypeLiteral15687 = new BitSet(new long[]{0x0000000404000000L});
-    public static final BitSet FOLLOW_26_in_ruleXTypeLiteral15700 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXThrowExpression_in_entryRuleXThrowExpression15736 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXThrowExpression15746 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_101_in_ruleXThrowExpression15792 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXThrowExpression15813 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXReturnExpression_in_entryRuleXReturnExpression15849 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXReturnExpression15859 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_102_in_ruleXReturnExpression15905 = new BitSet(new long[]{0x0107FFF629AF81F2L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXReturnExpression16266 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXTryCatchFinallyExpression_in_entryRuleXTryCatchFinallyExpression16303 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXTryCatchFinallyExpression16313 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_103_in_ruleXTryCatchFinallyExpression16359 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXTryCatchFinallyExpression16380 = new BitSet(new long[]{0x0000000000000000L,0x0000050000000000L});
-    public static final BitSet FOLLOW_ruleXCatchClause_in_ruleXTryCatchFinallyExpression16410 = new BitSet(new long[]{0x0000000000000002L,0x0000050000000000L});
-    public static final BitSet FOLLOW_104_in_ruleXTryCatchFinallyExpression16432 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXTryCatchFinallyExpression16454 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_104_in_ruleXTryCatchFinallyExpression16476 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXTryCatchFinallyExpression16497 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSynchronizedExpression_in_entryRuleXSynchronizedExpression16535 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXSynchronizedExpression16545 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_105_in_ruleXSynchronizedExpression16609 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_24_in_ruleXSynchronizedExpression16621 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXSynchronizedExpression16644 = new BitSet(new long[]{0x0000000004000000L});
-    public static final BitSet FOLLOW_26_in_ruleXSynchronizedExpression16656 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXSynchronizedExpression16677 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCatchClause_in_entryRuleXCatchClause16713 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXCatchClause16723 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_106_in_ruleXCatchClause16768 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_24_in_ruleXCatchClause16781 = new BitSet(new long[]{0x0007F00091804100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleFullJvmFormalParameter_in_ruleXCatchClause16802 = new BitSet(new long[]{0x0000000004000000L});
-    public static final BitSet FOLLOW_26_in_ruleXCatchClause16814 = new BitSet(new long[]{0x0107FFF629AF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXCatchClause16835 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName16872 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedName16883 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleQualifiedName16930 = new BitSet(new long[]{0x0000000000000002L,0x0000000000020000L});
-    public static final BitSet FOLLOW_81_in_ruleQualifiedName16958 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleQualifiedName16981 = new BitSet(new long[]{0x0000000000000002L,0x0000000000020000L});
-    public static final BitSet FOLLOW_ruleNumber_in_entryRuleNumber17035 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNumber17046 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_HEX_in_ruleNumber17090 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleNumber17118 = new BitSet(new long[]{0x0000000000000002L,0x0000000000020000L});
-    public static final BitSet FOLLOW_RULE_DECIMAL_in_ruleNumber17144 = new BitSet(new long[]{0x0000000000000002L,0x0000000000020000L});
-    public static final BitSet FOLLOW_81_in_ruleNumber17164 = new BitSet(new long[]{0x00000000000000C0L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleNumber17180 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_DECIMAL_in_ruleNumber17206 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_entryRuleJvmTypeReference17261 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmTypeReference17271 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmParameterizedTypeReference_in_ruleJvmTypeReference17319 = new BitSet(new long[]{0x0000000400000002L});
-    public static final BitSet FOLLOW_ruleArrayBrackets_in_ruleJvmTypeReference17355 = new BitSet(new long[]{0x0000000400000002L});
-    public static final BitSet FOLLOW_ruleXFunctionTypeRef_in_ruleJvmTypeReference17386 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleArrayBrackets_in_entryRuleArrayBrackets17422 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleArrayBrackets17433 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_34_in_ruleArrayBrackets17471 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_35_in_ruleArrayBrackets17484 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXFunctionTypeRef_in_entryRuleXFunctionTypeRef17524 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXFunctionTypeRef17534 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_ruleXFunctionTypeRef17572 = new BitSet(new long[]{0x0007F00095804100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleXFunctionTypeRef17594 = new BitSet(new long[]{0x0000000006000000L});
-    public static final BitSet FOLLOW_25_in_ruleXFunctionTypeRef17607 = new BitSet(new long[]{0x0007F00091804100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleXFunctionTypeRef17628 = new BitSet(new long[]{0x0000000006000000L});
-    public static final BitSet FOLLOW_26_in_ruleXFunctionTypeRef17644 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
-    public static final BitSet FOLLOW_68_in_ruleXFunctionTypeRef17658 = new BitSet(new long[]{0x0007F00091804100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleXFunctionTypeRef17679 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmParameterizedTypeReference_in_entryRuleJvmParameterizedTypeReference17715 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmParameterizedTypeReference17725 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleJvmParameterizedTypeReference17773 = new BitSet(new long[]{0x0100000000000002L});
-    public static final BitSet FOLLOW_56_in_ruleJvmParameterizedTypeReference17794 = new BitSet(new long[]{0x0007F00091804100L,0x0000080000000010L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleJvmParameterizedTypeReference17816 = new BitSet(new long[]{0x0200000002000000L});
-    public static final BitSet FOLLOW_25_in_ruleJvmParameterizedTypeReference17829 = new BitSet(new long[]{0x0007F00091804100L,0x0000080000000010L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleJvmParameterizedTypeReference17850 = new BitSet(new long[]{0x0200000002000000L});
-    public static final BitSet FOLLOW_57_in_ruleJvmParameterizedTypeReference17864 = new BitSet(new long[]{0x0000000000000002L,0x0000000000020000L});
-    public static final BitSet FOLLOW_81_in_ruleJvmParameterizedTypeReference17900 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleJvmParameterizedTypeReference17925 = new BitSet(new long[]{0x0100000000000002L,0x0000000000020000L});
-    public static final BitSet FOLLOW_56_in_ruleJvmParameterizedTypeReference17946 = new BitSet(new long[]{0x0007F00091804100L,0x0000080000000010L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleJvmParameterizedTypeReference17968 = new BitSet(new long[]{0x0200000002000000L});
-    public static final BitSet FOLLOW_25_in_ruleJvmParameterizedTypeReference17981 = new BitSet(new long[]{0x0007F00091804100L,0x0000080000000010L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleJvmParameterizedTypeReference18002 = new BitSet(new long[]{0x0200000002000000L});
-    public static final BitSet FOLLOW_57_in_ruleJvmParameterizedTypeReference18016 = new BitSet(new long[]{0x0000000000000002L,0x0000000000020000L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_entryRuleJvmArgumentTypeReference18058 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmArgumentTypeReference18068 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleJvmArgumentTypeReference18115 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmWildcardTypeReference_in_ruleJvmArgumentTypeReference18142 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmWildcardTypeReference_in_entryRuleJvmWildcardTypeReference18177 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmWildcardTypeReference18187 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_107_in_ruleJvmWildcardTypeReference18233 = new BitSet(new long[]{0x0000020000000002L,0x0000000080000000L});
-    public static final BitSet FOLLOW_ruleJvmUpperBound_in_ruleJvmWildcardTypeReference18256 = new BitSet(new long[]{0x0000000000000002L,0x0000100000000000L});
-    public static final BitSet FOLLOW_ruleJvmUpperBoundAnded_in_ruleJvmWildcardTypeReference18277 = new BitSet(new long[]{0x0000000000000002L,0x0000100000000000L});
-    public static final BitSet FOLLOW_ruleJvmLowerBound_in_ruleJvmWildcardTypeReference18307 = new BitSet(new long[]{0x0000000000000002L,0x0000100000000000L});
-    public static final BitSet FOLLOW_ruleJvmLowerBoundAnded_in_ruleJvmWildcardTypeReference18328 = new BitSet(new long[]{0x0000000000000002L,0x0000100000000000L});
-    public static final BitSet FOLLOW_ruleJvmUpperBound_in_entryRuleJvmUpperBound18368 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmUpperBound18378 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_ruleJvmUpperBound18415 = new BitSet(new long[]{0x0007F00091804100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleJvmUpperBound18436 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmUpperBoundAnded_in_entryRuleJvmUpperBoundAnded18472 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmUpperBoundAnded18482 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_108_in_ruleJvmUpperBoundAnded18519 = new BitSet(new long[]{0x0007F00091804100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleJvmUpperBoundAnded18540 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmLowerBound_in_entryRuleJvmLowerBound18576 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmLowerBound18586 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_95_in_ruleJvmLowerBound18623 = new BitSet(new long[]{0x0007F00091804100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleJvmLowerBound18644 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmLowerBoundAnded_in_entryRuleJvmLowerBoundAnded18680 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmLowerBoundAnded18690 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_108_in_ruleJvmLowerBoundAnded18727 = new BitSet(new long[]{0x0007F00091804100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleJvmLowerBoundAnded18748 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedNameWithWildcard_in_entryRuleQualifiedNameWithWildcard18787 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedNameWithWildcard18798 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleQualifiedNameWithWildcard18845 = new BitSet(new long[]{0x0000000000000000L,0x0000000000020000L});
-    public static final BitSet FOLLOW_81_in_ruleQualifiedNameWithWildcard18863 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000200L});
-    public static final BitSet FOLLOW_73_in_ruleQualifiedNameWithWildcard18876 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_entryRuleValidID18917 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleValidID18928 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleValidID18967 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_44_in_ruleSeverityKind19027 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_45_in_ruleSeverityKind19044 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_ruleSeverityKind19061 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_ruleSeverityKind19078 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_ruleTriggerKind19123 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_49_in_ruleTriggerKind19140 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_50_in_ruleTriggerKind19157 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_synpred1_InternalCheck1109 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_synpred2_InternalCheck1243 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_synpred3_InternalCheck3023 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_38_in_synpred4_InternalCheck3056 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_synpred5_InternalCheck3079 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_synpred6_InternalCheck3153 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_34_in_synpred7_InternalCheck3202 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_synpred8_InternalCheck3261 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_39_in_synpred9_InternalCheck3306 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_25_in_synpred10_InternalCheck3361 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_40_in_synpred11_InternalCheck3420 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_25_in_synpred12_InternalCheck3497 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_105_in_synpred13_InternalCheck3711 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_24_in_synpred13_InternalCheck3715 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_16_in_synpred14_InternalCheck3837 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_24_in_synpred14_InternalCheck3841 = new BitSet(new long[]{0x0007F00091804100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred14_InternalCheck3848 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_88_in_synpred14_InternalCheck3854 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_synpred15_InternalCheck4728 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_synpred16_InternalCheck4757 = new BitSet(new long[]{0x0000000100000000L});
-    public static final BitSet FOLLOW_32_in_synpred16_InternalCheck4763 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_synpred19_InternalCheck5119 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_34_in_synpred19_InternalCheck5123 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_synpred20_InternalCheck5394 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_34_in_synpred20_InternalCheck5398 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpMultiAssign_in_synpred21_InternalCheck5931 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpOr_in_synpred22_InternalCheck6454 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpAnd_in_synpred23_InternalCheck6713 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpEquality_in_synpred24_InternalCheck6972 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_65_in_synpred25_InternalCheck7286 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpCompare_in_synpred26_InternalCheck7357 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpOther_in_synpred27_InternalCheck7691 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_57_in_synpred28_InternalCheck7960 = new BitSet(new long[]{0x0200000000000000L});
-    public static final BitSet FOLLOW_57_in_synpred28_InternalCheck7965 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_synpred29_InternalCheck8047 = new BitSet(new long[]{0x0100000000000000L});
-    public static final BitSet FOLLOW_56_in_synpred29_InternalCheck8052 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpAdd_in_synpred30_InternalCheck8274 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpMulti_in_synpred31_InternalCheck8554 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_78_in_synpred32_InternalCheck9148 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpPostfix_in_synpred33_InternalCheck9305 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_81_in_synpred34_InternalCheck9560 = new BitSet(new long[]{0x0007FFC028A68100L});
-    public static final BitSet FOLLOW_82_in_synpred34_InternalCheck9574 = new BitSet(new long[]{0x0007FFC028A68100L});
-    public static final BitSet FOLLOW_ruleFeatureCallID_in_synpred34_InternalCheck9590 = new BitSet(new long[]{0x0000000100000000L});
-    public static final BitSet FOLLOW_ruleOpSingleAssign_in_synpred34_InternalCheck9596 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_81_in_synpred35_InternalCheck9738 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_83_in_synpred35_InternalCheck9752 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_82_in_synpred35_InternalCheck9772 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_synpred36_InternalCheck9999 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred37_InternalCheck10051 = new BitSet(new long[]{0x0000000002000000L,0x0000000000100000L});
-    public static final BitSet FOLLOW_25_in_synpred37_InternalCheck10058 = new BitSet(new long[]{0x0007F00091804100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred37_InternalCheck10065 = new BitSet(new long[]{0x0000000002000000L,0x0000000000100000L});
-    public static final BitSet FOLLOW_84_in_synpred37_InternalCheck10079 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_34_in_synpred38_InternalCheck10199 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_34_in_synpred39_InternalCheck10334 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred41_InternalCheck11084 = new BitSet(new long[]{0x0000000002000000L,0x0000000000100000L});
-    public static final BitSet FOLLOW_25_in_synpred41_InternalCheck11091 = new BitSet(new long[]{0x0007F00091804100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred41_InternalCheck11098 = new BitSet(new long[]{0x0000000002000000L,0x0000000000100000L});
-    public static final BitSet FOLLOW_84_in_synpred41_InternalCheck11112 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_86_in_synpred43_InternalCheck11895 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_synpred44_InternalCheck12034 = new BitSet(new long[]{0x0007F00091804100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred44_InternalCheck12041 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_88_in_synpred44_InternalCheck12047 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred45_InternalCheck12149 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_88_in_synpred45_InternalCheck12155 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_synpred47_InternalCheck13783 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleValidID_in_synpred47_InternalCheck13792 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_synpred48_InternalCheck14330 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred49_InternalCheck14382 = new BitSet(new long[]{0x0000000002000000L,0x0000000000100000L});
-    public static final BitSet FOLLOW_25_in_synpred49_InternalCheck14389 = new BitSet(new long[]{0x0007F00091804100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred49_InternalCheck14396 = new BitSet(new long[]{0x0000000002000000L,0x0000000000100000L});
-    public static final BitSet FOLLOW_84_in_synpred49_InternalCheck14410 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_34_in_synpred50_InternalCheck14530 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_synpred51_InternalCheck14799 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_synpred52_InternalCheck14895 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred53_InternalCheck14947 = new BitSet(new long[]{0x0000000002000000L,0x0000000000100000L});
-    public static final BitSet FOLLOW_25_in_synpred53_InternalCheck14954 = new BitSet(new long[]{0x0007F00091804100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred53_InternalCheck14961 = new BitSet(new long[]{0x0000000002000000L,0x0000000000100000L});
-    public static final BitSet FOLLOW_84_in_synpred53_InternalCheck14975 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_34_in_synpred54_InternalCheck15095 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_set_in_synpred55_InternalCheck15915 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_106_in_synpred56_InternalCheck16394 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_104_in_synpred57_InternalCheck16424 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_81_in_synpred60_InternalCheck16949 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleArrayBrackets_in_synpred61_InternalCheck17334 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_synpred62_InternalCheck17786 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_81_in_synpred63_InternalCheck17881 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_synpred64_InternalCheck17938 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_15_in_ruleFeatureCallID4273 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_17_in_ruleFeatureCallID4292 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_43_in_ruleFeatureCallID4311 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_22_in_ruleFeatureCallID4330 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_26_in_ruleFeatureCallID4349 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_37_in_ruleFeatureCallID4368 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_38_in_ruleFeatureCallID4387 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_39_in_ruleFeatureCallID4406 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_28_in_ruleFeatureCallID4425 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_44_in_ruleFeatureCallID4444 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_45_in_ruleFeatureCallID4463 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_46_in_ruleFeatureCallID4482 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_47_in_ruleFeatureCallID4501 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_48_in_ruleFeatureCallID4520 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_49_in_ruleFeatureCallID4539 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_50_in_ruleFeatureCallID4558 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXAnnotation_in_entryRuleXAnnotation4598 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXAnnotation4608 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_27_in_ruleXAnnotation4654 = new BitSet(new long[]{0x0000000000000100L});
+    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleXAnnotation4677 = new BitSet(new long[]{0x0000000000800002L});
+    public static final BitSet FOLLOW_23_in_ruleXAnnotation4698 = new BitSet(new long[]{0x0107FFFB1ED781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXAnnotationElementValuePair_in_ruleXAnnotation4742 = new BitSet(new long[]{0x0000000003000000L});
+    public static final BitSet FOLLOW_24_in_ruleXAnnotation4755 = new BitSet(new long[]{0x0000000000000100L});
+    public static final BitSet FOLLOW_ruleXAnnotationElementValuePair_in_ruleXAnnotation4796 = new BitSet(new long[]{0x0000000003000000L});
+    public static final BitSet FOLLOW_ruleXAnnotationElementValueOrCommaList_in_ruleXAnnotation4826 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_25_in_ruleXAnnotation4840 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXAnnotationElementValuePair_in_entryRuleXAnnotationElementValuePair4878 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXAnnotationElementValuePair4888 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleValidID_in_ruleXAnnotationElementValuePair4958 = new BitSet(new long[]{0x0000000080000000L});
+    public static final BitSet FOLLOW_31_in_ruleXAnnotationElementValuePair4970 = new BitSet(new long[]{0x0107FFFB1CD781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXAnnotationElementValue_in_ruleXAnnotationElementValuePair4993 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXAnnotationElementValueOrCommaList_in_entryRuleXAnnotationElementValueOrCommaList5029 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXAnnotationElementValueOrCommaList5039 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_32_in_ruleXAnnotationElementValueOrCommaList5104 = new BitSet(new long[]{0x0000000200000000L});
+    public static final BitSet FOLLOW_33_in_ruleXAnnotationElementValueOrCommaList5116 = new BitSet(new long[]{0x0107FFFF1CD781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValueOrCommaList5140 = new BitSet(new long[]{0x0000000401000000L});
+    public static final BitSet FOLLOW_24_in_ruleXAnnotationElementValueOrCommaList5153 = new BitSet(new long[]{0x0107FFFB1CD781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValueOrCommaList5174 = new BitSet(new long[]{0x0000000401000000L});
+    public static final BitSet FOLLOW_34_in_ruleXAnnotationElementValueOrCommaList5190 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValueOrCommaList5220 = new BitSet(new long[]{0x0000000001000002L});
+    public static final BitSet FOLLOW_24_in_ruleXAnnotationElementValueOrCommaList5242 = new BitSet(new long[]{0x0107FFFB1CD781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValueOrCommaList5263 = new BitSet(new long[]{0x0000000001000002L});
+    public static final BitSet FOLLOW_ruleXAnnotationElementValue_in_entryRuleXAnnotationElementValue5304 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXAnnotationElementValue5314 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_32_in_ruleXAnnotationElementValue5379 = new BitSet(new long[]{0x0000000200000000L});
+    public static final BitSet FOLLOW_33_in_ruleXAnnotationElementValue5391 = new BitSet(new long[]{0x0107FFFF1CD781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValue5415 = new BitSet(new long[]{0x0000000401000000L});
+    public static final BitSet FOLLOW_24_in_ruleXAnnotationElementValue5428 = new BitSet(new long[]{0x0107FFFB1CD781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValue5449 = new BitSet(new long[]{0x0000000401000000L});
+    public static final BitSet FOLLOW_34_in_ruleXAnnotationElementValue5465 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValue5494 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_entryRuleXAnnotationOrExpression5529 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXAnnotationOrExpression5539 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXAnnotation_in_ruleXAnnotationOrExpression5586 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXAnnotationOrExpression5613 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_entryRuleXExpression5648 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXExpression5658 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXAssignment_in_ruleXExpression5704 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXAssignment_in_entryRuleXAssignment5738 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXAssignment5748 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleFeatureCallID_in_ruleXAssignment5806 = new BitSet(new long[]{0x0000000080000000L});
+    public static final BitSet FOLLOW_ruleOpSingleAssign_in_ruleXAssignment5822 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXAssignment_in_ruleXAssignment5842 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXOrExpression_in_ruleXAssignment5872 = new BitSet(new long[]{0x03F8000000000002L});
+    public static final BitSet FOLLOW_ruleOpMultiAssign_in_ruleXAssignment5925 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXAssignment_in_ruleXAssignment5948 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleOpSingleAssign_in_entryRuleOpSingleAssign5988 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleOpSingleAssign5999 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_31_in_ruleOpSingleAssign6036 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleOpMultiAssign_in_entryRuleOpMultiAssign6076 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleOpMultiAssign6087 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_51_in_ruleOpMultiAssign6125 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_52_in_ruleOpMultiAssign6144 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_53_in_ruleOpMultiAssign6163 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_54_in_ruleOpMultiAssign6182 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_55_in_ruleOpMultiAssign6201 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_56_in_ruleOpMultiAssign6221 = new BitSet(new long[]{0x0100000000000000L});
+    public static final BitSet FOLLOW_56_in_ruleOpMultiAssign6234 = new BitSet(new long[]{0x0000000080000000L});
+    public static final BitSet FOLLOW_31_in_ruleOpMultiAssign6247 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_57_in_ruleOpMultiAssign6268 = new BitSet(new long[]{0x0600000000000000L});
+    public static final BitSet FOLLOW_57_in_ruleOpMultiAssign6282 = new BitSet(new long[]{0x0400000000000000L});
+    public static final BitSet FOLLOW_58_in_ruleOpMultiAssign6297 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXOrExpression_in_entryRuleXOrExpression6338 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXOrExpression6348 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXAndExpression_in_ruleXOrExpression6395 = new BitSet(new long[]{0x0800000000000002L});
+    public static final BitSet FOLLOW_ruleOpOr_in_ruleXOrExpression6448 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXAndExpression_in_ruleXOrExpression6471 = new BitSet(new long[]{0x0800000000000002L});
+    public static final BitSet FOLLOW_ruleOpOr_in_entryRuleOpOr6510 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleOpOr6521 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_59_in_ruleOpOr6558 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXAndExpression_in_entryRuleXAndExpression6597 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXAndExpression6607 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXEqualityExpression_in_ruleXAndExpression6654 = new BitSet(new long[]{0x1000000000000002L});
+    public static final BitSet FOLLOW_ruleOpAnd_in_ruleXAndExpression6707 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXEqualityExpression_in_ruleXAndExpression6730 = new BitSet(new long[]{0x1000000000000002L});
+    public static final BitSet FOLLOW_ruleOpAnd_in_entryRuleOpAnd6769 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleOpAnd6780 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_60_in_ruleOpAnd6817 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXEqualityExpression_in_entryRuleXEqualityExpression6856 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXEqualityExpression6866 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXRelationalExpression_in_ruleXEqualityExpression6913 = new BitSet(new long[]{0xE000000000000002L,0x0000000000000001L});
+    public static final BitSet FOLLOW_ruleOpEquality_in_ruleXEqualityExpression6966 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXRelationalExpression_in_ruleXEqualityExpression6989 = new BitSet(new long[]{0xE000000000000002L,0x0000000000000001L});
+    public static final BitSet FOLLOW_ruleOpEquality_in_entryRuleOpEquality7028 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleOpEquality7039 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_61_in_ruleOpEquality7077 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_62_in_ruleOpEquality7096 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_63_in_ruleOpEquality7115 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_64_in_ruleOpEquality7134 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXRelationalExpression_in_entryRuleXRelationalExpression7174 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXRelationalExpression7184 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXOtherOperatorExpression_in_ruleXRelationalExpression7231 = new BitSet(new long[]{0x0700000000000002L,0x0000000000000002L});
+    public static final BitSet FOLLOW_65_in_ruleXRelationalExpression7267 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
+    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleXRelationalExpression7290 = new BitSet(new long[]{0x0700000000000002L,0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleOpCompare_in_ruleXRelationalExpression7351 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXOtherOperatorExpression_in_ruleXRelationalExpression7374 = new BitSet(new long[]{0x0700000000000002L,0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleOpCompare_in_entryRuleOpCompare7414 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleOpCompare7425 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_58_in_ruleOpCompare7463 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_56_in_ruleOpCompare7483 = new BitSet(new long[]{0x0000000080000000L});
+    public static final BitSet FOLLOW_31_in_ruleOpCompare7496 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_57_in_ruleOpCompare7516 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_56_in_ruleOpCompare7535 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXOtherOperatorExpression_in_entryRuleXOtherOperatorExpression7575 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXOtherOperatorExpression7585 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXAdditiveExpression_in_ruleXOtherOperatorExpression7632 = new BitSet(new long[]{0x0300000020000002L,0x000000000000007CL});
+    public static final BitSet FOLLOW_ruleOpOther_in_ruleXOtherOperatorExpression7685 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXAdditiveExpression_in_ruleXOtherOperatorExpression7708 = new BitSet(new long[]{0x0300000020000002L,0x000000000000007CL});
+    public static final BitSet FOLLOW_ruleOpOther_in_entryRuleOpOther7747 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleOpOther7758 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_66_in_ruleOpOther7796 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_67_in_ruleOpOther7815 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_57_in_ruleOpOther7835 = new BitSet(new long[]{0x0000000020000000L});
+    public static final BitSet FOLLOW_29_in_ruleOpOther7848 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_29_in_ruleOpOther7868 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_68_in_ruleOpOther7887 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_57_in_ruleOpOther7907 = new BitSet(new long[]{0x0200000000000000L});
+    public static final BitSet FOLLOW_57_in_ruleOpOther7938 = new BitSet(new long[]{0x0200000000000000L});
+    public static final BitSet FOLLOW_57_in_ruleOpOther7951 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_57_in_ruleOpOther7972 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_56_in_ruleOpOther7994 = new BitSet(new long[]{0x0100000000000000L,0x0000000000000010L});
+    public static final BitSet FOLLOW_56_in_ruleOpOther8025 = new BitSet(new long[]{0x0100000000000000L});
+    public static final BitSet FOLLOW_56_in_ruleOpOther8038 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_56_in_ruleOpOther8059 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_68_in_ruleOpOther8078 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_69_in_ruleOpOther8099 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_70_in_ruleOpOther8118 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXAdditiveExpression_in_entryRuleXAdditiveExpression8158 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXAdditiveExpression8168 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXMultiplicativeExpression_in_ruleXAdditiveExpression8215 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000180L});
+    public static final BitSet FOLLOW_ruleOpAdd_in_ruleXAdditiveExpression8268 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXMultiplicativeExpression_in_ruleXAdditiveExpression8291 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000180L});
+    public static final BitSet FOLLOW_ruleOpAdd_in_entryRuleOpAdd8330 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleOpAdd8341 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_71_in_ruleOpAdd8379 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_72_in_ruleOpAdd8398 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXMultiplicativeExpression_in_entryRuleXMultiplicativeExpression8438 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXMultiplicativeExpression8448 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXUnaryOperation_in_ruleXMultiplicativeExpression8495 = new BitSet(new long[]{0x0000000000000002L,0x0000000000001E00L});
+    public static final BitSet FOLLOW_ruleOpMulti_in_ruleXMultiplicativeExpression8548 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXUnaryOperation_in_ruleXMultiplicativeExpression8571 = new BitSet(new long[]{0x0000000000000002L,0x0000000000001E00L});
+    public static final BitSet FOLLOW_ruleOpMulti_in_entryRuleOpMulti8610 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleOpMulti8621 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_73_in_ruleOpMulti8659 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_74_in_ruleOpMulti8678 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_75_in_ruleOpMulti8697 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_76_in_ruleOpMulti8716 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXUnaryOperation_in_entryRuleXUnaryOperation8756 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXUnaryOperation8766 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleOpUnary_in_ruleXUnaryOperation8824 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXUnaryOperation_in_ruleXUnaryOperation8845 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXCastedExpression_in_ruleXUnaryOperation8874 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleOpUnary_in_entryRuleOpUnary8910 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleOpUnary8921 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_77_in_ruleOpUnary8959 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_72_in_ruleOpUnary8978 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_71_in_ruleOpUnary8997 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXCastedExpression_in_entryRuleXCastedExpression9037 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXCastedExpression9047 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXPostfixOperation_in_ruleXCastedExpression9094 = new BitSet(new long[]{0x0000000000000002L,0x0000000000004000L});
+    public static final BitSet FOLLOW_78_in_ruleXCastedExpression9129 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
+    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleXCastedExpression9152 = new BitSet(new long[]{0x0000000000000002L,0x0000000000004000L});
+    public static final BitSet FOLLOW_ruleXPostfixOperation_in_entryRuleXPostfixOperation9190 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXPostfixOperation9200 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXMemberFeatureCall_in_ruleXPostfixOperation9247 = new BitSet(new long[]{0x0000000000000002L,0x0000000000018000L});
+    public static final BitSet FOLLOW_ruleOpPostfix_in_ruleXPostfixOperation9299 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleOpPostfix_in_entryRuleOpPostfix9339 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleOpPostfix9350 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_79_in_ruleOpPostfix9388 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_80_in_ruleOpPostfix9407 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXMemberFeatureCall_in_entryRuleXMemberFeatureCall9447 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXMemberFeatureCall9457 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXPrimaryExpression_in_ruleXMemberFeatureCall9504 = new BitSet(new long[]{0x0000000000000002L,0x00000000000E0000L});
+    public static final BitSet FOLLOW_81_in_ruleXMemberFeatureCall9576 = new BitSet(new long[]{0x0007FFE014528100L});
+    public static final BitSet FOLLOW_82_in_ruleXMemberFeatureCall9600 = new BitSet(new long[]{0x0007FFE014528100L});
+    public static final BitSet FOLLOW_ruleFeatureCallID_in_ruleXMemberFeatureCall9637 = new BitSet(new long[]{0x0000000080000000L});
+    public static final BitSet FOLLOW_ruleOpSingleAssign_in_ruleXMemberFeatureCall9653 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXAssignment_in_ruleXMemberFeatureCall9675 = new BitSet(new long[]{0x0000000000000002L,0x00000000000E0000L});
+    public static final BitSet FOLLOW_81_in_ruleXMemberFeatureCall9761 = new BitSet(new long[]{0x0107FFE014528100L,0x0000000080000000L});
+    public static final BitSet FOLLOW_83_in_ruleXMemberFeatureCall9785 = new BitSet(new long[]{0x0107FFE014528100L,0x0000000080000000L});
+    public static final BitSet FOLLOW_82_in_ruleXMemberFeatureCall9822 = new BitSet(new long[]{0x0107FFE014528100L,0x0000000080000000L});
+    public static final BitSet FOLLOW_56_in_ruleXMemberFeatureCall9851 = new BitSet(new long[]{0x0007F00048C04100L,0x0000080000000010L});
+    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleXMemberFeatureCall9872 = new BitSet(new long[]{0x0200000001000000L});
+    public static final BitSet FOLLOW_24_in_ruleXMemberFeatureCall9885 = new BitSet(new long[]{0x0007F00048C04100L,0x0000080000000010L});
+    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleXMemberFeatureCall9906 = new BitSet(new long[]{0x0200000001000000L});
+    public static final BitSet FOLLOW_57_in_ruleXMemberFeatureCall9920 = new BitSet(new long[]{0x0107FFE014528100L,0x0000000080000000L});
+    public static final BitSet FOLLOW_ruleIdOrSuper_in_ruleXMemberFeatureCall9945 = new BitSet(new long[]{0x0000000200800002L,0x00000000000E0000L});
+    public static final BitSet FOLLOW_23_in_ruleXMemberFeatureCall9979 = new BitSet(new long[]{0x0107FFFB5ED7C1F0L,0x000002FF98B02190L});
+    public static final BitSet FOLLOW_ruleXShortClosure_in_ruleXMemberFeatureCall10064 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXMemberFeatureCall10092 = new BitSet(new long[]{0x0000000003000000L});
+    public static final BitSet FOLLOW_24_in_ruleXMemberFeatureCall10105 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXMemberFeatureCall10126 = new BitSet(new long[]{0x0000000003000000L});
+    public static final BitSet FOLLOW_25_in_ruleXMemberFeatureCall10143 = new BitSet(new long[]{0x0000000200000002L,0x00000000000E0000L});
+    public static final BitSet FOLLOW_ruleXClosure_in_ruleXMemberFeatureCall10178 = new BitSet(new long[]{0x0000000000000002L,0x00000000000E0000L});
+    public static final BitSet FOLLOW_ruleXLiteral_in_entryRuleXLiteral10218 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXLiteral10228 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXCollectionLiteral_in_ruleXLiteral10275 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXClosure_in_ruleXLiteral10315 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXBooleanLiteral_in_ruleXLiteral10343 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXNumberLiteral_in_ruleXLiteral10370 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXNullLiteral_in_ruleXLiteral10397 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXStringLiteral_in_ruleXLiteral10424 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXTypeLiteral_in_ruleXLiteral10451 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXCollectionLiteral_in_entryRuleXCollectionLiteral10486 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXCollectionLiteral10496 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXSetLiteral_in_ruleXCollectionLiteral10543 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXListLiteral_in_ruleXCollectionLiteral10570 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXSetLiteral_in_entryRuleXSetLiteral10605 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXSetLiteral10615 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_32_in_ruleXSetLiteral10661 = new BitSet(new long[]{0x0000000000040000L});
+    public static final BitSet FOLLOW_18_in_ruleXSetLiteral10673 = new BitSet(new long[]{0x0107FFFB14DF81F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXSetLiteral10695 = new BitSet(new long[]{0x0000000001080000L});
+    public static final BitSet FOLLOW_24_in_ruleXSetLiteral10708 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXSetLiteral10729 = new BitSet(new long[]{0x0000000001080000L});
+    public static final BitSet FOLLOW_19_in_ruleXSetLiteral10745 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXListLiteral_in_entryRuleXListLiteral10781 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXListLiteral10791 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_32_in_ruleXListLiteral10837 = new BitSet(new long[]{0x0000000200000000L});
+    public static final BitSet FOLLOW_33_in_ruleXListLiteral10849 = new BitSet(new long[]{0x0107FFFF14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXListLiteral10871 = new BitSet(new long[]{0x0000000401000000L});
+    public static final BitSet FOLLOW_24_in_ruleXListLiteral10884 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXListLiteral10905 = new BitSet(new long[]{0x0000000401000000L});
+    public static final BitSet FOLLOW_34_in_ruleXListLiteral10921 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXClosure_in_entryRuleXClosure10957 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXClosure10967 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_33_in_ruleXClosure11027 = new BitSet(new long[]{0x0107FFFF5CD7C1F0L,0x000002FFF8B02190L});
+    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_ruleXClosure11100 = new BitSet(new long[]{0x0000000001000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_24_in_ruleXClosure11113 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
+    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_ruleXClosure11134 = new BitSet(new long[]{0x0000000001000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_84_in_ruleXClosure11156 = new BitSet(new long[]{0x0107FFFF14D781F0L,0x000002FFF8A02180L});
+    public static final BitSet FOLLOW_ruleXExpressionInClosure_in_ruleXClosure11193 = new BitSet(new long[]{0x0000000400000000L});
+    public static final BitSet FOLLOW_34_in_ruleXClosure11205 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpressionInClosure_in_entryRuleXExpressionInClosure11241 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXExpressionInClosure11251 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_ruleXExpressionInClosure11307 = new BitSet(new long[]{0x0107FFFB14F781F2L,0x000002FFF8A02180L});
+    public static final BitSet FOLLOW_21_in_ruleXExpressionInClosure11320 = new BitSet(new long[]{0x0107FFFB14D781F2L,0x000002FFF8A02180L});
+    public static final BitSet FOLLOW_ruleXShortClosure_in_entryRuleXShortClosure11360 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXShortClosure11370 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_ruleXShortClosure11478 = new BitSet(new long[]{0x0000000001000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_24_in_ruleXShortClosure11491 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
+    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_ruleXShortClosure11512 = new BitSet(new long[]{0x0000000001000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_84_in_ruleXShortClosure11534 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXShortClosure11570 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXParenthesizedExpression_in_entryRuleXParenthesizedExpression11606 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXParenthesizedExpression11616 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_23_in_ruleXParenthesizedExpression11653 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXParenthesizedExpression11675 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_25_in_ruleXParenthesizedExpression11686 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXIfExpression_in_entryRuleXIfExpression11722 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXIfExpression11732 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_85_in_ruleXIfExpression11778 = new BitSet(new long[]{0x0000000000800000L});
+    public static final BitSet FOLLOW_23_in_ruleXIfExpression11790 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXIfExpression11811 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_25_in_ruleXIfExpression11823 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXIfExpression11844 = new BitSet(new long[]{0x0000000000000002L,0x0000000000400000L});
+    public static final BitSet FOLLOW_86_in_ruleXIfExpression11865 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXIfExpression11887 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXSwitchExpression_in_entryRuleXSwitchExpression11925 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXSwitchExpression11935 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_87_in_ruleXSwitchExpression11981 = new BitSet(new long[]{0x0107FFFB5CD7C1F0L,0x000002FF98A02190L});
+    public static final BitSet FOLLOW_23_in_ruleXSwitchExpression12019 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
+    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_ruleXSwitchExpression12040 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
+    public static final BitSet FOLLOW_88_in_ruleXSwitchExpression12052 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXSwitchExpression12075 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_25_in_ruleXSwitchExpression12087 = new BitSet(new long[]{0x0000000000040000L});
+    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_ruleXSwitchExpression12136 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
+    public static final BitSet FOLLOW_88_in_ruleXSwitchExpression12148 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXSwitchExpression12172 = new BitSet(new long[]{0x0000000000040000L});
+    public static final BitSet FOLLOW_18_in_ruleXSwitchExpression12186 = new BitSet(new long[]{0x0007F00049C84100L,0x0000000007000010L});
+    public static final BitSet FOLLOW_ruleXCasePart_in_ruleXSwitchExpression12207 = new BitSet(new long[]{0x0007F00049C84100L,0x0000000007000010L});
+    public static final BitSet FOLLOW_89_in_ruleXSwitchExpression12221 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
+    public static final BitSet FOLLOW_88_in_ruleXSwitchExpression12233 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXSwitchExpression12254 = new BitSet(new long[]{0x0000000000080000L});
+    public static final BitSet FOLLOW_19_in_ruleXSwitchExpression12268 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXCasePart_in_entryRuleXCasePart12304 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXCasePart12314 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleXCasePart12369 = new BitSet(new long[]{0x0000000001000000L,0x0000000005000000L});
+    public static final BitSet FOLLOW_90_in_ruleXCasePart12383 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXCasePart12404 = new BitSet(new long[]{0x0000000001000000L,0x0000000001000000L});
+    public static final BitSet FOLLOW_88_in_ruleXCasePart12420 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXCasePart12441 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_24_in_ruleXCasePart12466 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXForLoopExpression_in_entryRuleXForLoopExpression12516 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXForLoopExpression12526 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_16_in_ruleXForLoopExpression12603 = new BitSet(new long[]{0x0000000000800000L});
+    public static final BitSet FOLLOW_23_in_ruleXForLoopExpression12615 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
+    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_ruleXForLoopExpression12636 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
+    public static final BitSet FOLLOW_88_in_ruleXForLoopExpression12648 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXForLoopExpression12671 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_25_in_ruleXForLoopExpression12683 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXForLoopExpression12704 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXBasicForLoopExpression_in_entryRuleXBasicForLoopExpression12740 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXBasicForLoopExpression12750 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_16_in_ruleXBasicForLoopExpression12796 = new BitSet(new long[]{0x0000000000800000L});
+    public static final BitSet FOLLOW_23_in_ruleXBasicForLoopExpression12808 = new BitSet(new long[]{0x0107FFFB14F781F0L,0x000002FFF8A02180L});
+    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_ruleXBasicForLoopExpression12830 = new BitSet(new long[]{0x0000000001200000L});
+    public static final BitSet FOLLOW_24_in_ruleXBasicForLoopExpression12843 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FFF8A02180L});
+    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_ruleXBasicForLoopExpression12864 = new BitSet(new long[]{0x0000000001200000L});
+    public static final BitSet FOLLOW_21_in_ruleXBasicForLoopExpression12880 = new BitSet(new long[]{0x0107FFFB14F781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXBasicForLoopExpression12901 = new BitSet(new long[]{0x0000000000200000L});
+    public static final BitSet FOLLOW_21_in_ruleXBasicForLoopExpression12914 = new BitSet(new long[]{0x0107FFFB16D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXBasicForLoopExpression12936 = new BitSet(new long[]{0x0000000003000000L});
+    public static final BitSet FOLLOW_24_in_ruleXBasicForLoopExpression12949 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXBasicForLoopExpression12970 = new BitSet(new long[]{0x0000000003000000L});
+    public static final BitSet FOLLOW_25_in_ruleXBasicForLoopExpression12986 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXBasicForLoopExpression13007 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXWhileExpression_in_entryRuleXWhileExpression13043 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXWhileExpression13053 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_91_in_ruleXWhileExpression13099 = new BitSet(new long[]{0x0000000000800000L});
+    public static final BitSet FOLLOW_23_in_ruleXWhileExpression13111 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXWhileExpression13132 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_25_in_ruleXWhileExpression13144 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXWhileExpression13165 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXDoWhileExpression_in_entryRuleXDoWhileExpression13201 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXDoWhileExpression13211 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_92_in_ruleXDoWhileExpression13257 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXDoWhileExpression13278 = new BitSet(new long[]{0x0000000000000000L,0x0000000008000000L});
+    public static final BitSet FOLLOW_91_in_ruleXDoWhileExpression13290 = new BitSet(new long[]{0x0000000000800000L});
+    public static final BitSet FOLLOW_23_in_ruleXDoWhileExpression13302 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXDoWhileExpression13323 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_25_in_ruleXDoWhileExpression13335 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXBlockExpression_in_entryRuleXBlockExpression13371 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXBlockExpression13381 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_18_in_ruleXBlockExpression13427 = new BitSet(new long[]{0x0107FFFB14DF81F0L,0x000002FFF8A02180L});
+    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_ruleXBlockExpression13449 = new BitSet(new long[]{0x0107FFFB14FF81F0L,0x000002FFF8A02180L});
+    public static final BitSet FOLLOW_21_in_ruleXBlockExpression13462 = new BitSet(new long[]{0x0107FFFB14DF81F0L,0x000002FFF8A02180L});
+    public static final BitSet FOLLOW_19_in_ruleXBlockExpression13478 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_entryRuleXExpressionOrVarDeclaration13514 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXExpressionOrVarDeclaration13524 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXVariableDeclaration_in_ruleXExpressionOrVarDeclaration13571 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXExpressionOrVarDeclaration13598 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXVariableDeclaration_in_entryRuleXVariableDeclaration13633 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXVariableDeclaration13643 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_93_in_ruleXVariableDeclaration13696 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
+    public static final BitSet FOLLOW_94_in_ruleXVariableDeclaration13727 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
+    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleXVariableDeclaration13775 = new BitSet(new long[]{0x0000000000000100L});
+    public static final BitSet FOLLOW_ruleValidID_in_ruleXVariableDeclaration13796 = new BitSet(new long[]{0x0000000080000002L});
+    public static final BitSet FOLLOW_ruleValidID_in_ruleXVariableDeclaration13825 = new BitSet(new long[]{0x0000000080000002L});
+    public static final BitSet FOLLOW_31_in_ruleXVariableDeclaration13839 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXVariableDeclaration13860 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_entryRuleJvmFormalParameter13898 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleJvmFormalParameter13908 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleJvmFormalParameter13954 = new BitSet(new long[]{0x0000000000000100L});
+    public static final BitSet FOLLOW_ruleValidID_in_ruleJvmFormalParameter13976 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleFullJvmFormalParameter_in_entryRuleFullJvmFormalParameter14012 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleFullJvmFormalParameter14022 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleFullJvmFormalParameter14068 = new BitSet(new long[]{0x0000000000000100L});
+    public static final BitSet FOLLOW_ruleValidID_in_ruleFullJvmFormalParameter14089 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXFeatureCall_in_entryRuleXFeatureCall14125 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXFeatureCall14135 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_56_in_ruleXFeatureCall14182 = new BitSet(new long[]{0x0007F00048C04100L,0x0000080000000010L});
+    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleXFeatureCall14203 = new BitSet(new long[]{0x0200000001000000L});
+    public static final BitSet FOLLOW_24_in_ruleXFeatureCall14216 = new BitSet(new long[]{0x0007F00048C04100L,0x0000080000000010L});
+    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleXFeatureCall14237 = new BitSet(new long[]{0x0200000001000000L});
+    public static final BitSet FOLLOW_57_in_ruleXFeatureCall14251 = new BitSet(new long[]{0x0107FFE014528100L,0x0000000080000000L});
+    public static final BitSet FOLLOW_ruleIdOrSuper_in_ruleXFeatureCall14276 = new BitSet(new long[]{0x0000000200800002L});
+    public static final BitSet FOLLOW_23_in_ruleXFeatureCall14310 = new BitSet(new long[]{0x0107FFFB5ED7C1F0L,0x000002FF98B02190L});
+    public static final BitSet FOLLOW_ruleXShortClosure_in_ruleXFeatureCall14395 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXFeatureCall14423 = new BitSet(new long[]{0x0000000003000000L});
+    public static final BitSet FOLLOW_24_in_ruleXFeatureCall14436 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXFeatureCall14457 = new BitSet(new long[]{0x0000000003000000L});
+    public static final BitSet FOLLOW_25_in_ruleXFeatureCall14474 = new BitSet(new long[]{0x0000000200000002L});
+    public static final BitSet FOLLOW_ruleXClosure_in_ruleXFeatureCall14509 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleIdOrSuper_in_entryRuleIdOrSuper14547 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleIdOrSuper14558 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleFeatureCallID_in_ruleIdOrSuper14605 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_95_in_ruleIdOrSuper14629 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXConstructorCall_in_entryRuleXConstructorCall14669 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXConstructorCall14679 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_96_in_ruleXConstructorCall14725 = new BitSet(new long[]{0x0000000000000100L});
+    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleXConstructorCall14748 = new BitSet(new long[]{0x0100000200800002L});
+    public static final BitSet FOLLOW_56_in_ruleXConstructorCall14769 = new BitSet(new long[]{0x0007F00048C04100L,0x0000080000000010L});
+    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleXConstructorCall14791 = new BitSet(new long[]{0x0200000001000000L});
+    public static final BitSet FOLLOW_24_in_ruleXConstructorCall14804 = new BitSet(new long[]{0x0007F00048C04100L,0x0000080000000010L});
+    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleXConstructorCall14825 = new BitSet(new long[]{0x0200000001000000L});
+    public static final BitSet FOLLOW_57_in_ruleXConstructorCall14839 = new BitSet(new long[]{0x0000000200800002L});
+    public static final BitSet FOLLOW_23_in_ruleXConstructorCall14875 = new BitSet(new long[]{0x0107FFFB5ED7C1F0L,0x000002FF98B02190L});
+    public static final BitSet FOLLOW_ruleXShortClosure_in_ruleXConstructorCall14960 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXConstructorCall14988 = new BitSet(new long[]{0x0000000003000000L});
+    public static final BitSet FOLLOW_24_in_ruleXConstructorCall15001 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXConstructorCall15022 = new BitSet(new long[]{0x0000000003000000L});
+    public static final BitSet FOLLOW_25_in_ruleXConstructorCall15039 = new BitSet(new long[]{0x0000000200000002L});
+    public static final BitSet FOLLOW_ruleXClosure_in_ruleXConstructorCall15074 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXBooleanLiteral_in_entryRuleXBooleanLiteral15111 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXBooleanLiteral15121 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_97_in_ruleXBooleanLiteral15168 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_98_in_ruleXBooleanLiteral15192 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXNullLiteral_in_entryRuleXNullLiteral15242 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXNullLiteral15252 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_99_in_ruleXNullLiteral15298 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXNumberLiteral_in_entryRuleXNumberLiteral15334 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXNumberLiteral15344 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleNumber_in_ruleXNumberLiteral15399 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXStringLiteral_in_entryRuleXStringLiteral15435 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXStringLiteral15445 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_STRING_in_ruleXStringLiteral15496 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXTypeLiteral_in_entryRuleXTypeLiteral15537 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXTypeLiteral15547 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_100_in_ruleXTypeLiteral15593 = new BitSet(new long[]{0x0000000000800000L});
+    public static final BitSet FOLLOW_23_in_ruleXTypeLiteral15605 = new BitSet(new long[]{0x0000000000000100L});
+    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleXTypeLiteral15628 = new BitSet(new long[]{0x0000000202000000L});
+    public static final BitSet FOLLOW_ruleArrayBrackets_in_ruleXTypeLiteral15649 = new BitSet(new long[]{0x0000000202000000L});
+    public static final BitSet FOLLOW_25_in_ruleXTypeLiteral15662 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXThrowExpression_in_entryRuleXThrowExpression15698 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXThrowExpression15708 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_101_in_ruleXThrowExpression15754 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXThrowExpression15775 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXReturnExpression_in_entryRuleXReturnExpression15811 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXReturnExpression15821 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_102_in_ruleXReturnExpression15867 = new BitSet(new long[]{0x0107FFFB14D781F2L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXReturnExpression16228 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXTryCatchFinallyExpression_in_entryRuleXTryCatchFinallyExpression16265 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXTryCatchFinallyExpression16275 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_103_in_ruleXTryCatchFinallyExpression16321 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXTryCatchFinallyExpression16342 = new BitSet(new long[]{0x0000000000000000L,0x0000050000000000L});
+    public static final BitSet FOLLOW_ruleXCatchClause_in_ruleXTryCatchFinallyExpression16372 = new BitSet(new long[]{0x0000000000000002L,0x0000050000000000L});
+    public static final BitSet FOLLOW_104_in_ruleXTryCatchFinallyExpression16394 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXTryCatchFinallyExpression16416 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_104_in_ruleXTryCatchFinallyExpression16438 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXTryCatchFinallyExpression16459 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXSynchronizedExpression_in_entryRuleXSynchronizedExpression16497 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXSynchronizedExpression16507 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_105_in_ruleXSynchronizedExpression16571 = new BitSet(new long[]{0x0000000000800000L});
+    public static final BitSet FOLLOW_23_in_ruleXSynchronizedExpression16583 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXSynchronizedExpression16606 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_25_in_ruleXSynchronizedExpression16618 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXSynchronizedExpression16639 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXCatchClause_in_entryRuleXCatchClause16675 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXCatchClause16685 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_106_in_ruleXCatchClause16730 = new BitSet(new long[]{0x0000000000800000L});
+    public static final BitSet FOLLOW_23_in_ruleXCatchClause16743 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
+    public static final BitSet FOLLOW_ruleFullJvmFormalParameter_in_ruleXCatchClause16764 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_25_in_ruleXCatchClause16776 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_ruleXExpression_in_ruleXCatchClause16797 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName16834 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedName16845 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleValidID_in_ruleQualifiedName16892 = new BitSet(new long[]{0x0000000000000002L,0x0000000000020000L});
+    public static final BitSet FOLLOW_81_in_ruleQualifiedName16920 = new BitSet(new long[]{0x0000000000000100L});
+    public static final BitSet FOLLOW_ruleValidID_in_ruleQualifiedName16943 = new BitSet(new long[]{0x0000000000000002L,0x0000000000020000L});
+    public static final BitSet FOLLOW_ruleNumber_in_entryRuleNumber16997 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleNumber17008 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_HEX_in_ruleNumber17052 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_INT_in_ruleNumber17080 = new BitSet(new long[]{0x0000000000000002L,0x0000000000020000L});
+    public static final BitSet FOLLOW_RULE_DECIMAL_in_ruleNumber17106 = new BitSet(new long[]{0x0000000000000002L,0x0000000000020000L});
+    public static final BitSet FOLLOW_81_in_ruleNumber17126 = new BitSet(new long[]{0x00000000000000C0L});
+    public static final BitSet FOLLOW_RULE_INT_in_ruleNumber17142 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_DECIMAL_in_ruleNumber17168 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmTypeReference_in_entryRuleJvmTypeReference17223 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleJvmTypeReference17233 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmParameterizedTypeReference_in_ruleJvmTypeReference17281 = new BitSet(new long[]{0x0000000200000002L});
+    public static final BitSet FOLLOW_ruleArrayBrackets_in_ruleJvmTypeReference17317 = new BitSet(new long[]{0x0000000200000002L});
+    public static final BitSet FOLLOW_ruleXFunctionTypeRef_in_ruleJvmTypeReference17348 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleArrayBrackets_in_entryRuleArrayBrackets17384 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleArrayBrackets17395 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_33_in_ruleArrayBrackets17433 = new BitSet(new long[]{0x0000000400000000L});
+    public static final BitSet FOLLOW_34_in_ruleArrayBrackets17446 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXFunctionTypeRef_in_entryRuleXFunctionTypeRef17486 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleXFunctionTypeRef17496 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_23_in_ruleXFunctionTypeRef17534 = new BitSet(new long[]{0x0007F0004AC04100L,0x0000000000000010L});
+    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleXFunctionTypeRef17556 = new BitSet(new long[]{0x0000000003000000L});
+    public static final BitSet FOLLOW_24_in_ruleXFunctionTypeRef17569 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
+    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleXFunctionTypeRef17590 = new BitSet(new long[]{0x0000000003000000L});
+    public static final BitSet FOLLOW_25_in_ruleXFunctionTypeRef17606 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
+    public static final BitSet FOLLOW_68_in_ruleXFunctionTypeRef17620 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
+    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleXFunctionTypeRef17641 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmParameterizedTypeReference_in_entryRuleJvmParameterizedTypeReference17677 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleJvmParameterizedTypeReference17687 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleJvmParameterizedTypeReference17735 = new BitSet(new long[]{0x0100000000000002L});
+    public static final BitSet FOLLOW_56_in_ruleJvmParameterizedTypeReference17756 = new BitSet(new long[]{0x0007F00048C04100L,0x0000080000000010L});
+    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleJvmParameterizedTypeReference17778 = new BitSet(new long[]{0x0200000001000000L});
+    public static final BitSet FOLLOW_24_in_ruleJvmParameterizedTypeReference17791 = new BitSet(new long[]{0x0007F00048C04100L,0x0000080000000010L});
+    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleJvmParameterizedTypeReference17812 = new BitSet(new long[]{0x0200000001000000L});
+    public static final BitSet FOLLOW_57_in_ruleJvmParameterizedTypeReference17826 = new BitSet(new long[]{0x0000000000000002L,0x0000000000020000L});
+    public static final BitSet FOLLOW_81_in_ruleJvmParameterizedTypeReference17862 = new BitSet(new long[]{0x0000000000000100L});
+    public static final BitSet FOLLOW_ruleValidID_in_ruleJvmParameterizedTypeReference17887 = new BitSet(new long[]{0x0100000000000002L,0x0000000000020000L});
+    public static final BitSet FOLLOW_56_in_ruleJvmParameterizedTypeReference17908 = new BitSet(new long[]{0x0007F00048C04100L,0x0000080000000010L});
+    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleJvmParameterizedTypeReference17930 = new BitSet(new long[]{0x0200000001000000L});
+    public static final BitSet FOLLOW_24_in_ruleJvmParameterizedTypeReference17943 = new BitSet(new long[]{0x0007F00048C04100L,0x0000080000000010L});
+    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleJvmParameterizedTypeReference17964 = new BitSet(new long[]{0x0200000001000000L});
+    public static final BitSet FOLLOW_57_in_ruleJvmParameterizedTypeReference17978 = new BitSet(new long[]{0x0000000000000002L,0x0000000000020000L});
+    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_entryRuleJvmArgumentTypeReference18020 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleJvmArgumentTypeReference18030 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleJvmArgumentTypeReference18077 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmWildcardTypeReference_in_ruleJvmArgumentTypeReference18104 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmWildcardTypeReference_in_entryRuleJvmWildcardTypeReference18139 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleJvmWildcardTypeReference18149 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_107_in_ruleJvmWildcardTypeReference18195 = new BitSet(new long[]{0x0000010000000002L,0x0000000080000000L});
+    public static final BitSet FOLLOW_ruleJvmUpperBound_in_ruleJvmWildcardTypeReference18218 = new BitSet(new long[]{0x0000000000000002L,0x0000100000000000L});
+    public static final BitSet FOLLOW_ruleJvmUpperBoundAnded_in_ruleJvmWildcardTypeReference18239 = new BitSet(new long[]{0x0000000000000002L,0x0000100000000000L});
+    public static final BitSet FOLLOW_ruleJvmLowerBound_in_ruleJvmWildcardTypeReference18269 = new BitSet(new long[]{0x0000000000000002L,0x0000100000000000L});
+    public static final BitSet FOLLOW_ruleJvmLowerBoundAnded_in_ruleJvmWildcardTypeReference18290 = new BitSet(new long[]{0x0000000000000002L,0x0000100000000000L});
+    public static final BitSet FOLLOW_ruleJvmUpperBound_in_entryRuleJvmUpperBound18330 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleJvmUpperBound18340 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_40_in_ruleJvmUpperBound18377 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
+    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleJvmUpperBound18398 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmUpperBoundAnded_in_entryRuleJvmUpperBoundAnded18434 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleJvmUpperBoundAnded18444 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_108_in_ruleJvmUpperBoundAnded18481 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
+    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleJvmUpperBoundAnded18502 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmLowerBound_in_entryRuleJvmLowerBound18538 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleJvmLowerBound18548 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_95_in_ruleJvmLowerBound18585 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
+    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleJvmLowerBound18606 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmLowerBoundAnded_in_entryRuleJvmLowerBoundAnded18642 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleJvmLowerBoundAnded18652 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_108_in_ruleJvmLowerBoundAnded18689 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
+    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleJvmLowerBoundAnded18710 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleQualifiedNameWithWildcard_in_entryRuleQualifiedNameWithWildcard18749 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedNameWithWildcard18760 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleQualifiedNameWithWildcard18807 = new BitSet(new long[]{0x0000000000000000L,0x0000000000020000L});
+    public static final BitSet FOLLOW_81_in_ruleQualifiedNameWithWildcard18825 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000200L});
+    public static final BitSet FOLLOW_73_in_ruleQualifiedNameWithWildcard18838 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleValidID_in_entryRuleValidID18879 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleValidID18890 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_ID_in_ruleValidID18929 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_44_in_ruleSeverityKind18989 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_45_in_ruleSeverityKind19006 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_46_in_ruleSeverityKind19023 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_47_in_ruleSeverityKind19040 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_48_in_ruleTriggerKind19085 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_49_in_ruleTriggerKind19102 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_50_in_ruleTriggerKind19119 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_23_in_synpred1_InternalCheck1071 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_18_in_synpred2_InternalCheck1205 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleQualifiedName_in_synpred3_InternalCheck2985 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_37_in_synpred4_InternalCheck3018 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_32_in_synpred5_InternalCheck3041 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_32_in_synpred6_InternalCheck3115 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_33_in_synpred7_InternalCheck3164 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_26_in_synpred8_InternalCheck3223 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_38_in_synpred9_InternalCheck3268 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_24_in_synpred10_InternalCheck3323 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_39_in_synpred11_InternalCheck3382 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_24_in_synpred12_InternalCheck3459 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_105_in_synpred13_InternalCheck3673 = new BitSet(new long[]{0x0000000000800000L});
+    public static final BitSet FOLLOW_23_in_synpred13_InternalCheck3677 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_16_in_synpred14_InternalCheck3799 = new BitSet(new long[]{0x0000000000800000L});
+    public static final BitSet FOLLOW_23_in_synpred14_InternalCheck3803 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
+    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred14_InternalCheck3810 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
+    public static final BitSet FOLLOW_88_in_synpred14_InternalCheck3816 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_23_in_synpred15_InternalCheck4690 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleValidID_in_synpred16_InternalCheck4719 = new BitSet(new long[]{0x0000000080000000L});
+    public static final BitSet FOLLOW_31_in_synpred16_InternalCheck4725 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_32_in_synpred19_InternalCheck5081 = new BitSet(new long[]{0x0000000200000000L});
+    public static final BitSet FOLLOW_33_in_synpred19_InternalCheck5085 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_32_in_synpred20_InternalCheck5356 = new BitSet(new long[]{0x0000000200000000L});
+    public static final BitSet FOLLOW_33_in_synpred20_InternalCheck5360 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleOpMultiAssign_in_synpred21_InternalCheck5893 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleOpOr_in_synpred22_InternalCheck6416 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleOpAnd_in_synpred23_InternalCheck6675 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleOpEquality_in_synpred24_InternalCheck6934 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_65_in_synpred25_InternalCheck7248 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleOpCompare_in_synpred26_InternalCheck7319 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleOpOther_in_synpred27_InternalCheck7653 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_57_in_synpred28_InternalCheck7922 = new BitSet(new long[]{0x0200000000000000L});
+    public static final BitSet FOLLOW_57_in_synpred28_InternalCheck7927 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_56_in_synpred29_InternalCheck8009 = new BitSet(new long[]{0x0100000000000000L});
+    public static final BitSet FOLLOW_56_in_synpred29_InternalCheck8014 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleOpAdd_in_synpred30_InternalCheck8236 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleOpMulti_in_synpred31_InternalCheck8516 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_78_in_synpred32_InternalCheck9110 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleOpPostfix_in_synpred33_InternalCheck9267 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_81_in_synpred34_InternalCheck9522 = new BitSet(new long[]{0x0007FFE014528100L});
+    public static final BitSet FOLLOW_82_in_synpred34_InternalCheck9536 = new BitSet(new long[]{0x0007FFE014528100L});
+    public static final BitSet FOLLOW_ruleFeatureCallID_in_synpred34_InternalCheck9552 = new BitSet(new long[]{0x0000000080000000L});
+    public static final BitSet FOLLOW_ruleOpSingleAssign_in_synpred34_InternalCheck9558 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_81_in_synpred35_InternalCheck9700 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_83_in_synpred35_InternalCheck9714 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_82_in_synpred35_InternalCheck9734 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_23_in_synpred36_InternalCheck9961 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred37_InternalCheck10013 = new BitSet(new long[]{0x0000000001000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_24_in_synpred37_InternalCheck10020 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
+    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred37_InternalCheck10027 = new BitSet(new long[]{0x0000000001000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_84_in_synpred37_InternalCheck10041 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_33_in_synpred38_InternalCheck10161 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_33_in_synpred39_InternalCheck10296 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred41_InternalCheck11046 = new BitSet(new long[]{0x0000000001000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_24_in_synpred41_InternalCheck11053 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
+    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred41_InternalCheck11060 = new BitSet(new long[]{0x0000000001000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_84_in_synpred41_InternalCheck11074 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_86_in_synpred43_InternalCheck11857 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_23_in_synpred44_InternalCheck11996 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
+    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred44_InternalCheck12003 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
+    public static final BitSet FOLLOW_88_in_synpred44_InternalCheck12009 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred45_InternalCheck12111 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
+    public static final BitSet FOLLOW_88_in_synpred45_InternalCheck12117 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmTypeReference_in_synpred47_InternalCheck13745 = new BitSet(new long[]{0x0000000000000100L});
+    public static final BitSet FOLLOW_ruleValidID_in_synpred47_InternalCheck13754 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_23_in_synpred48_InternalCheck14292 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred49_InternalCheck14344 = new BitSet(new long[]{0x0000000001000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_24_in_synpred49_InternalCheck14351 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
+    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred49_InternalCheck14358 = new BitSet(new long[]{0x0000000001000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_84_in_synpred49_InternalCheck14372 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_33_in_synpred50_InternalCheck14492 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_56_in_synpred51_InternalCheck14761 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_23_in_synpred52_InternalCheck14857 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred53_InternalCheck14909 = new BitSet(new long[]{0x0000000001000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_24_in_synpred53_InternalCheck14916 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
+    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred53_InternalCheck14923 = new BitSet(new long[]{0x0000000001000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_84_in_synpred53_InternalCheck14937 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_33_in_synpred54_InternalCheck15057 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_set_in_synpred55_InternalCheck15877 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_106_in_synpred56_InternalCheck16356 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_104_in_synpred57_InternalCheck16386 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_81_in_synpred60_InternalCheck16911 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleArrayBrackets_in_synpred61_InternalCheck17296 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_56_in_synpred62_InternalCheck17748 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_81_in_synpred63_InternalCheck17843 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_56_in_synpred64_InternalCheck17900 = new BitSet(new long[]{0x0000000000000002L});
 
 }
\ No newline at end of file
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/serializer/AbstractCheckSemanticSequencer.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/serializer/AbstractCheckSemanticSequencer.java
index cc7762eed..1af5cd6b1 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/serializer/AbstractCheckSemanticSequencer.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/serializer/AbstractCheckSemanticSequencer.java
@@ -472,7 +472,6 @@ protected void sequence_Category(EObject context, Category semanticObject) {
    *         final?='final'? 
    *         name=ValidID 
    *         grammar=[Grammar|QualifiedName]? 
-   *         includedCatalogs=[CheckCatalog|QualifiedName]? 
    *         (categories+=Category | implementations+=Implementation | checks+=Check | members+=Member)*
    *     )
    */
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/services/CheckGrammarAccess.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/services/CheckGrammarAccess.java
index 8870a4e8a..2af4606d9 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/services/CheckGrammarAccess.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/services/CheckGrammarAccess.java
@@ -40,34 +40,27 @@ public class CheckCatalogElements extends AbstractParserRuleElementFinder {
 		private final Assignment cGrammarAssignment_7_2 = (Assignment)cGroup_7.eContents().get(2);
 		private final CrossReference cGrammarGrammarCrossReference_7_2_0 = (CrossReference)cGrammarAssignment_7_2.eContents().get(0);
 		private final RuleCall cGrammarGrammarQualifiedNameParserRuleCall_7_2_0_1 = (RuleCall)cGrammarGrammarCrossReference_7_2_0.eContents().get(1);
-		private final Group cGroup_8 = (Group)cGroup.eContents().get(8);
-		private final Keyword cWithKeyword_8_0 = (Keyword)cGroup_8.eContents().get(0);
-		private final Assignment cIncludedCatalogsAssignment_8_1 = (Assignment)cGroup_8.eContents().get(1);
-		private final CrossReference cIncludedCatalogsCheckCatalogCrossReference_8_1_0 = (CrossReference)cIncludedCatalogsAssignment_8_1.eContents().get(0);
-		private final RuleCall cIncludedCatalogsCheckCatalogQualifiedNameParserRuleCall_8_1_0_1 = (RuleCall)cIncludedCatalogsCheckCatalogCrossReference_8_1_0.eContents().get(1);
-		private final Keyword cLeftCurlyBracketKeyword_9 = (Keyword)cGroup.eContents().get(9);
-		private final Alternatives cAlternatives_10 = (Alternatives)cGroup.eContents().get(10);
-		private final Assignment cCategoriesAssignment_10_0 = (Assignment)cAlternatives_10.eContents().get(0);
-		private final RuleCall cCategoriesCategoryParserRuleCall_10_0_0 = (RuleCall)cCategoriesAssignment_10_0.eContents().get(0);
-		private final Assignment cImplementationsAssignment_10_1 = (Assignment)cAlternatives_10.eContents().get(1);
-		private final RuleCall cImplementationsImplementationParserRuleCall_10_1_0 = (RuleCall)cImplementationsAssignment_10_1.eContents().get(0);
-		private final Assignment cChecksAssignment_10_2 = (Assignment)cAlternatives_10.eContents().get(2);
-		private final RuleCall cChecksCheckParserRuleCall_10_2_0 = (RuleCall)cChecksAssignment_10_2.eContents().get(0);
-		private final Assignment cMembersAssignment_10_3 = (Assignment)cAlternatives_10.eContents().get(3);
-		private final RuleCall cMembersMemberParserRuleCall_10_3_0 = (RuleCall)cMembersAssignment_10_3.eContents().get(0);
-		private final Keyword cRightCurlyBracketKeyword_11 = (Keyword)cGroup.eContents().get(11);
+		private final Keyword cLeftCurlyBracketKeyword_8 = (Keyword)cGroup.eContents().get(8);
+		private final Alternatives cAlternatives_9 = (Alternatives)cGroup.eContents().get(9);
+		private final Assignment cCategoriesAssignment_9_0 = (Assignment)cAlternatives_9.eContents().get(0);
+		private final RuleCall cCategoriesCategoryParserRuleCall_9_0_0 = (RuleCall)cCategoriesAssignment_9_0.eContents().get(0);
+		private final Assignment cImplementationsAssignment_9_1 = (Assignment)cAlternatives_9.eContents().get(1);
+		private final RuleCall cImplementationsImplementationParserRuleCall_9_1_0 = (RuleCall)cImplementationsAssignment_9_1.eContents().get(0);
+		private final Assignment cChecksAssignment_9_2 = (Assignment)cAlternatives_9.eContents().get(2);
+		private final RuleCall cChecksCheckParserRuleCall_9_2_0 = (RuleCall)cChecksAssignment_9_2.eContents().get(0);
+		private final Assignment cMembersAssignment_9_3 = (Assignment)cAlternatives_9.eContents().get(3);
+		private final RuleCall cMembersMemberParserRuleCall_9_3_0 = (RuleCall)cMembersAssignment_9_3.eContents().get(0);
+		private final Keyword cRightCurlyBracketKeyword_10 = (Keyword)cGroup.eContents().get(10);
 		
 		//CheckCatalog:
 		//	{CheckCatalog} "package" packageName=QualifiedName imports=XImportSection final?="final"? "catalog" name=ValidID
-		//	("for" "grammar" ^grammar=[xtext::Grammar|QualifiedName])? ("with" includedCatalogs=[CheckCatalog|QualifiedName])? //TODO a list of included catalogs ??
-		//	// TODO only allow including a check catalog if the languages match. (matching rule are defined by the "with" clause of the grammar definition.) '{'
-		//	"{" (categories+=Category | implementations+=Implementation | checks+=Check | members+=Member)* "}";
+		//	("for" "grammar" ^grammar=[xtext::Grammar|QualifiedName])? "{" (categories+=Category |
+		//	implementations+=Implementation | checks+=Check | members+=Member)* "}";
 		@Override public ParserRule getRule() { return rule; }
 
 		//{CheckCatalog} "package" packageName=QualifiedName imports=XImportSection final?="final"? "catalog" name=ValidID ("for"
-		//"grammar" ^grammar=[xtext::Grammar|QualifiedName])? ("with" includedCatalogs=[CheckCatalog|QualifiedName])? //TODO a list of included catalogs ??
-		//// TODO only allow including a check catalog if the languages match. (matching rule are defined by the "with" clause of the grammar definition.) '{'
-		//"{" (categories+=Category | implementations+=Implementation | checks+=Check | members+=Member)* "}"
+		//"grammar" ^grammar=[xtext::Grammar|QualifiedName])? "{" (categories+=Category | implementations+=Implementation |
+		//checks+=Check | members+=Member)* "}"
 		public Group getGroup() { return cGroup; }
 
 		//{CheckCatalog}
@@ -121,54 +114,38 @@ public class CheckCatalogElements extends AbstractParserRuleElementFinder {
 		//QualifiedName
 		public RuleCall getGrammarGrammarQualifiedNameParserRuleCall_7_2_0_1() { return cGrammarGrammarQualifiedNameParserRuleCall_7_2_0_1; }
 
-		//("with" includedCatalogs=[CheckCatalog|QualifiedName])?
-		public Group getGroup_8() { return cGroup_8; }
-
-		//"with"
-		public Keyword getWithKeyword_8_0() { return cWithKeyword_8_0; }
-
-		//includedCatalogs=[CheckCatalog|QualifiedName]
-		public Assignment getIncludedCatalogsAssignment_8_1() { return cIncludedCatalogsAssignment_8_1; }
-
-		//[CheckCatalog|QualifiedName]
-		public CrossReference getIncludedCatalogsCheckCatalogCrossReference_8_1_0() { return cIncludedCatalogsCheckCatalogCrossReference_8_1_0; }
-
-		//QualifiedName
-		public RuleCall getIncludedCatalogsCheckCatalogQualifiedNameParserRuleCall_8_1_0_1() { return cIncludedCatalogsCheckCatalogQualifiedNameParserRuleCall_8_1_0_1; }
-
-		//// TODO only allow including a check catalog if the languages match. (matching rule are defined by the "with" clause of the grammar definition.) '{'
 		//"{"
-		public Keyword getLeftCurlyBracketKeyword_9() { return cLeftCurlyBracketKeyword_9; }
+		public Keyword getLeftCurlyBracketKeyword_8() { return cLeftCurlyBracketKeyword_8; }
 
 		//(categories+=Category | implementations+=Implementation | checks+=Check | members+=Member)*
-		public Alternatives getAlternatives_10() { return cAlternatives_10; }
+		public Alternatives getAlternatives_9() { return cAlternatives_9; }
 
 		//categories+=Category
-		public Assignment getCategoriesAssignment_10_0() { return cCategoriesAssignment_10_0; }
+		public Assignment getCategoriesAssignment_9_0() { return cCategoriesAssignment_9_0; }
 
 		//Category
-		public RuleCall getCategoriesCategoryParserRuleCall_10_0_0() { return cCategoriesCategoryParserRuleCall_10_0_0; }
+		public RuleCall getCategoriesCategoryParserRuleCall_9_0_0() { return cCategoriesCategoryParserRuleCall_9_0_0; }
 
 		//implementations+=Implementation
-		public Assignment getImplementationsAssignment_10_1() { return cImplementationsAssignment_10_1; }
+		public Assignment getImplementationsAssignment_9_1() { return cImplementationsAssignment_9_1; }
 
 		//Implementation
-		public RuleCall getImplementationsImplementationParserRuleCall_10_1_0() { return cImplementationsImplementationParserRuleCall_10_1_0; }
+		public RuleCall getImplementationsImplementationParserRuleCall_9_1_0() { return cImplementationsImplementationParserRuleCall_9_1_0; }
 
 		//checks+=Check
-		public Assignment getChecksAssignment_10_2() { return cChecksAssignment_10_2; }
+		public Assignment getChecksAssignment_9_2() { return cChecksAssignment_9_2; }
 
 		//Check
-		public RuleCall getChecksCheckParserRuleCall_10_2_0() { return cChecksCheckParserRuleCall_10_2_0; }
+		public RuleCall getChecksCheckParserRuleCall_9_2_0() { return cChecksCheckParserRuleCall_9_2_0; }
 
 		//members+=Member
-		public Assignment getMembersAssignment_10_3() { return cMembersAssignment_10_3; }
+		public Assignment getMembersAssignment_9_3() { return cMembersAssignment_9_3; }
 
 		//Member
-		public RuleCall getMembersMemberParserRuleCall_10_3_0() { return cMembersMemberParserRuleCall_10_3_0; }
+		public RuleCall getMembersMemberParserRuleCall_9_3_0() { return cMembersMemberParserRuleCall_9_3_0; }
 
 		//"}"
-		public Keyword getRightCurlyBracketKeyword_11() { return cRightCurlyBracketKeyword_11; }
+		public Keyword getRightCurlyBracketKeyword_10() { return cRightCurlyBracketKeyword_10; }
 	}
 
 	public class XImportSectionElements extends AbstractParserRuleElementFinder {
@@ -1531,9 +1508,8 @@ public XbaseWithAnnotationsGrammarAccess getXbaseWithAnnotationsGrammarAccess()
 	
 	//CheckCatalog:
 	//	{CheckCatalog} "package" packageName=QualifiedName imports=XImportSection final?="final"? "catalog" name=ValidID
-	//	("for" "grammar" ^grammar=[xtext::Grammar|QualifiedName])? ("with" includedCatalogs=[CheckCatalog|QualifiedName])? //TODO a list of included catalogs ??
-	//	// TODO only allow including a check catalog if the languages match. (matching rule are defined by the "with" clause of the grammar definition.) '{'
-	//	"{" (categories+=Category | implementations+=Implementation | checks+=Check | members+=Member)* "}";
+	//	("for" "grammar" ^grammar=[xtext::Grammar|QualifiedName])? "{" (categories+=Category |
+	//	implementations+=Implementation | checks+=Check | members+=Member)* "}";
 	public CheckCatalogElements getCheckCatalogAccess() {
 		return pCheckCatalog;
 	}
diff --git a/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/formatting/CheckFormatter.java b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/formatting/CheckFormatter.java
index 41ee72543..9150d4f47 100644
--- a/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/formatting/CheckFormatter.java
+++ b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/formatting/CheckFormatter.java
@@ -51,7 +51,7 @@ private void configure(final FormattingConfig configuration, final CheckGrammarA
     super.configure(configuration, access.getXbaseWithAnnotationsGrammarAccess());
 
     // Common curly brackets handling (for check grammar only)
-    List<Pair<Keyword, Keyword>> curlyPairs = access.findKeywordPairs("{", "}");
+    List<Pair<Keyword, Keyword>> curlyPairs = access.findKeywordPairs("{", "}"); //$NON-NLS-1$ //$NON-NLS-2$
     for (Pair<Keyword, Keyword> pair : curlyPairs) {
       if (EcoreUtil2.getContainerOfType(pair.getFirst(), GrammarImpl.class).getName().equals(CheckConstants.GRAMMAR)) {
         configuration.setLinewrap().after(pair.getFirst());
@@ -128,7 +128,7 @@ public void configureXIfExpression(final FormattingConfig c, final XIfExpression
    *          the accessible formattable parser elements
    */
   public void configureXIssueExpression(final FormattingConfig c, final XIssueExpressionElements elements) {
-    c.setSpace(" ").after(elements.getOnKeyword_3_0());
+    c.setSpace(" ").after(elements.getOnKeyword_3_0()); //$NON-NLS-1$
 
     c.setNoSpace().around(elements.getNumberSignKeyword_3_1_0_0());
     c.setNoSpace().around(elements.getNumberSignKeyword_3_1_1_1_0());
@@ -161,7 +161,6 @@ private void configureCheckCatalog(final FormattingConfig c, final CheckCatalogE
 
     c.setLinewrap(0, 1, 2).before(elements.getCatalogKeyword_5());
     c.setLinewrap(1, 1, 2).before(elements.getForKeyword_7_0());
-    c.setLinewrap(0, 1, 2).before(elements.getWithKeyword_8_0());
   }
 
   /**
diff --git a/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/generator/CheckGeneratorExtensions.xtend b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/generator/CheckGeneratorExtensions.xtend
index 3a314fc82..746447bed 100644
--- a/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/generator/CheckGeneratorExtensions.xtend
+++ b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/generator/CheckGeneratorExtensions.xtend
@@ -36,15 +36,9 @@ import static extension com.avaloq.tools.ddk.check.generator.CheckGeneratorNamin
 
 class CheckGeneratorExtensions {
 
-  /* Returns whether a CheckCatalog has any included CheckCatalogs. */
-  def boolean hasIncludedCatalogs(CheckCatalog catalog) {
-    val included = catalog.includedCatalogs
-    return (null != included && !included.eIsProxy)
-  }
-
   def dispatch String qualifiedIssueCodeName(XIssueExpression issue) {
     val result = issue.issueCode()
-    if (result == null) {
+    if (result === null) {
       null
     } else {
       issue.parent(typeof(CheckCatalog)).issueCodesClassName + '.' + result
@@ -58,7 +52,7 @@ class CheckGeneratorExtensions {
 
   /* Gets the simple issue code name for a check. */
   def static dispatch String issueCode(Check check) {
-    if (null != check.name) {
+    if (null !== check.name) {
       check.name.splitCamelCase.toUpperCase
     } else {
       "ERROR_ISSUE_CODE_NAME_CHECK" // should only happen if the ID is missing, which will fail a validation
@@ -67,11 +61,11 @@ class CheckGeneratorExtensions {
 
   /* Gets the simple issue code name for an issue expression. */
   def static dispatch String issueCode(XIssueExpression issue) {
-    if (issue.issueCode != null) {
+    if (issue.issueCode !== null) {
       issue.issueCode.splitCamelCase.toUpperCase
     } else if (issue.check !== null && !issue.check.eIsProxy) {
       issueCode(issue.check)
-    } else if (issue.parent(Check) != null) {
+    } else if (issue.parent(Check) !== null) {
       issueCode(issue.parent(Check))
     } else {
       "ERROR_ISSUE_CODE_NAME_XISSUEEXPRESSION" // should not happen
@@ -97,7 +91,7 @@ class CheckGeneratorExtensions {
   def dispatch String issueLabel(XIssueExpression issue) {
     if (issue.check !== null && !issue.check.eIsProxy) {
       issueLabel(issue.check)
-    } else if (issue.parent(Check) != null) {
+    } else if (issue.parent(Check) !== null) {
       issueLabel(issue.parent(Check))
     } else {
       "ERROR_ISSUE_LABEL_XISSUEEXPRESSION" // should not happen
@@ -151,11 +145,11 @@ class CheckGeneratorExtensions {
   }
 
   def issuedCheck(XIssueExpression expression) {
-    if (expression.check != null) {
+    if (expression.check !== null) {
       expression.check
     } else {
       val containerCheck = EcoreUtil2::getContainerOfType(expression, typeof(Check))
-      if (containerCheck != null) {
+      if (containerCheck !== null) {
         containerCheck
         //TODO we obviously need a validation in the language so that there is always a value here!
       }
@@ -187,7 +181,7 @@ class CheckGeneratorExtensions {
    */
   def String bundleName(EObject object) {
     val proj = object.projectForObject
-    if (proj != null) {
+    if (proj !== null) {
       return proj.name
     }
     return null
@@ -206,7 +200,7 @@ class CheckGeneratorExtensions {
    *  Format the Check description for Eclipse Help
    */
   def String formatDescription(String comment) {
-    if (comment == null) {
+    if (comment === null) {
       return null
     }
     try {
@@ -219,7 +213,7 @@ class CheckGeneratorExtensions {
 
   def Set<String> getContents(CheckCatalog catalog, String path) {
     val project = catalog.projectForObject
-    if (project != null) { // In some compiler tests we may not have a project.
+    if (project !== null) { // In some compiler tests we may not have a project.
       val file = project.getFile(new Path(path))
       if (file.exists) {
         val reader = new InputStreamReader(file.getContents())
diff --git a/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/jvmmodel/CheckJvmModelInferrer.xtend b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/jvmmodel/CheckJvmModelInferrer.xtend
index cea696339..717c5cdcf 100644
--- a/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/jvmmodel/CheckJvmModelInferrer.xtend
+++ b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/jvmmodel/CheckJvmModelInferrer.xtend
@@ -24,7 +24,6 @@ import com.avaloq.tools.ddk.check.runtime.configuration.ICheckConfigurationStore
 import com.avaloq.tools.ddk.check.runtime.issue.AbstractIssue
 import com.avaloq.tools.ddk.check.runtime.issue.DefaultCheckImpl
 import com.avaloq.tools.ddk.check.runtime.issue.SeverityKind
-import com.avaloq.tools.ddk.check.runtime.validation.ComposedCheckValidator
 import com.avaloq.tools.ddk.check.validation.IssueCodes
 import com.google.common.collect.ImmutableMap
 import com.google.common.collect.Lists
@@ -41,10 +40,8 @@ import org.eclipse.emf.ecore.EStructuralFeature
 import org.eclipse.emf.ecore.resource.Resource
 import org.eclipse.xtext.common.types.JvmAnnotationReference
 import org.eclipse.xtext.common.types.JvmAnnotationType
-import org.eclipse.xtext.common.types.JvmAnnotationValue
 import org.eclipse.xtext.common.types.JvmDeclaredType
 import org.eclipse.xtext.common.types.JvmField
-import org.eclipse.xtext.common.types.JvmGenericType
 import org.eclipse.xtext.common.types.JvmMember
 import org.eclipse.xtext.common.types.JvmOperation
 import org.eclipse.xtext.common.types.JvmParameterizedTypeReference
@@ -56,9 +53,7 @@ import org.eclipse.xtext.util.Strings
 import org.eclipse.xtext.validation.CheckType
 import org.eclipse.xtext.validation.EObjectDiagnosticImpl
 import org.eclipse.xtext.xbase.XFeatureCall
-import org.eclipse.xtext.xbase.XListLiteral
 import org.eclipse.xtext.xbase.XMemberFeatureCall
-import org.eclipse.xtext.xbase.XTypeLiteral
 import org.eclipse.xtext.xbase.XbaseFactory
 import org.eclipse.xtext.xbase.jvmmodel.AbstractModelInferrer
 import org.eclipse.xtext.xbase.jvmmodel.IJvmDeclaredTypeAcceptor
@@ -93,7 +88,7 @@ class CheckJvmModelInferrer extends AbstractModelInferrer {
     val issueCodeToLabelMapTypeRef = typeRef(ImmutableMap, typeRef(String), typeRef(String))
     acceptor.accept(catalogClass, [
       val parentType = checkedTypeRef(catalog, typeof(AbstractIssue));
-      if (parentType != null) {
+      if (parentType !== null) {
         superTypes += parentType;
       }
       annotations += createAnnotation(checkedTypeRef(catalog, typeof(Singleton)), [])
@@ -114,7 +109,7 @@ class CheckJvmModelInferrer extends AbstractModelInferrer {
           val qualifiedIssueCodeName = issue.qualifiedIssueCodeName();
           val issueLabel = issue.issueLabel().escapeJava;
           val existingIssueLabel = sortedUniqueQualifiedIssueCodeNamesAndLabels.putIfAbsent(qualifiedIssueCodeName, issueLabel);
-          if (null != existingIssueLabel && issueLabel != existingIssueLabel) {
+          if (null !== existingIssueLabel && issueLabel != existingIssueLabel) {
             // This qualified issue code name is already in the map, with a different label. Fail the build.
             throw new IllegalArgumentException('''Multiple issues found with qualified issue code name: «qualifiedIssueCodeName»''')
           }
@@ -143,20 +138,14 @@ class CheckJvmModelInferrer extends AbstractModelInferrer {
 
     acceptor.accept(catalog.toClass(catalog.qualifiedValidatorClassName), [
       val parentType = checkedTypeRef(catalog, typeof(DefaultCheckImpl));
-      if (parentType != null) {
+      if (parentType !== null) {
         superTypes += parentType;
       }
       // Constructor will be added automatically.
-      setCheckComposition(catalog, it);
       documentation = '''
-        Validator for «catalog.name».«IF catalog.hasIncludedCatalogs» Includes validations from its parent catalog.
-
-        @see «catalog.includedCatalogs.validatorClassName»«ENDIF»''';
+        Validator for «catalog.name».''';
       // Create catalog injections
       members += createInjectedField(catalog, catalog.catalogInstanceName, typeRef(catalogClass));
-      if (catalog.hasIncludedCatalogs) {
-        members += createInjectedField(catalog, catalog.includedCatalogs.catalogInstanceName, checkedTypeRef(catalog, catalog.includedCatalogs.qualifiedCatalogClassName));
-      }
       // Create fields
       members += catalog.members.map(m|m.toField(m.name, m.type) [initializer = m.value; it.addAnnotations(m.annotations);]);
       // Create catalog name function
@@ -178,7 +167,7 @@ class CheckJvmModelInferrer extends AbstractModelInferrer {
     ]);
     acceptor.accept(catalog.toClass(catalog.qualifiedPreferenceInitializerClassName), [
       val parentType = checkedTypeRef(catalog, typeof(AbstractPreferenceInitializer));
-      if (parentType != null) {
+      if (parentType !== null) {
         superTypes += parentType;
       }
       members += catalog.toField('RUNTIME_NODE_NAME', typeRef(typeof(String))) [
@@ -191,35 +180,9 @@ class CheckJvmModelInferrer extends AbstractModelInferrer {
     ]);
   }
 
-  private def void setCheckComposition(CheckCatalog catalog, JvmGenericType jvmType) {
-    if (!catalog.hasIncludedCatalogs) {
-      return;
-    }
-
-    // Create an XExpression for the RHS
-    val XListLiteral rhs = XbaseFactory::eINSTANCE.createXListLiteral();
-    val XTypeLiteral containedType = XbaseFactory::eINSTANCE.createXTypeLiteral();
-    val JvmTypeReference typeRef = checkedTypeRef(catalog, catalog.includedCatalogs.qualifiedValidatorClassName);
-    if (typeRef == null) {
-      return;
-    }
-    containedType.type = typeRef.type;
-    rhs.elements += containedType;
-
-    // Create a ComposedCheckValidator annotation and associate with jvmType.
-    jvmType.annotations+= createAnnotation(checkedTypeRef(catalog, typeof (ComposedCheckValidator)), [
-      // rhs has no eResource set here. This works all the same.
-      val JvmAnnotationValue annotationValue = rhs.toJvmAnnotationValue;
-      annotationValue.operation = (annotation as JvmDeclaredType).findAllFeaturesByName('validators').head as JvmOperation;
-      values += annotationValue;
-    ]);
-
-    // Now we have the equivalent of @ComposedCheckValidator(validators = {<includedCatalogs>.class})
-  }
-
   private def Iterable<JvmField> createInjectedField(CheckCatalog context, String fieldName, JvmTypeReference type) {
     // Generate @Inject private typeName fieldName;
-    if (type == null) {
+    if (type === null) {
       return Collections::emptyList;
     }
     val field = typesFactory.createJvmField();
@@ -254,7 +217,7 @@ class CheckJvmModelInferrer extends AbstractModelInferrer {
       visibility = JvmVisibility::PRIVATE;
       // Add a fields for the parameters, so that they can be linked. We suppress generation of these fields in the generator,
       // and replace all references by calls to the getter function in the catalog.
-      members += chk.formalParameters.filter(f|f.type != null && f.name != null).map(f|f.toField(f.name, f.type) [final = true]);
+      members += chk.formalParameters.filter(f|f.type !== null && f.name !== null).map(f|f.toField(f.name, f.type) [final = true]);
     ];
     newMembers += checkClass;
     newMembers += chk.toField(chk.name.toFirstLower + 'Impl', typeRef(checkClass)) [initializer = [append('''new «checkClass.simpleName»()''')]];
@@ -265,19 +228,19 @@ class CheckJvmModelInferrer extends AbstractModelInferrer {
   }
 
   private def JvmOperation createCheckExecution(Context ctx) {
-    if (ctx == null || ctx.contextVariable == null) {
+    if (ctx === null || ctx.contextVariable === null) {
       return null;
     }
     val String functionName = 'run' + ctx.contextVariable.type?.simpleName.toFirstUpper;
     ctx.toMethod(functionName, typeRef('void')) [
-      parameters += ctx.contextVariable.toParameter(if (ctx.contextVariable.name == null) CheckConstants::IT else ctx.contextVariable.name, ctx.contextVariable.type);
+      parameters += ctx.contextVariable.toParameter(if (ctx.contextVariable.name === null) CheckConstants::IT else ctx.contextVariable.name, ctx.contextVariable.type);
       body = ctx.constraint;
     ]
   }
 
   private def Iterable<JvmAnnotationReference> createCheckAnnotation (Context ctx) {
     val checkTypeTypeRef = checkedTypeRef(ctx, typeof(CheckType));
-    if (checkTypeTypeRef == null) {
+    if (checkTypeTypeRef === null) {
       return Collections::emptyList;
     }
     val XFeatureCall featureCall = XbaseFactory::eINSTANCE.createXFeatureCall();
@@ -303,7 +266,7 @@ class CheckJvmModelInferrer extends AbstractModelInferrer {
   }
 
   private def JvmOperation createCheckCaller(Context ctx, Check chk) {
-    if (ctx == null || ctx.contextVariable == null) {
+    if (ctx === null || ctx.contextVariable === null) {
       return null;
     }
     val String functionName = chk.name.toFirstLower + ctx.contextVariable.type?.simpleName;
@@ -323,7 +286,7 @@ class CheckJvmModelInferrer extends AbstractModelInferrer {
 
   private def JvmOperation createCheckMethod(Context ctx) {
     // Simple case for contexts of checks that do not have formal parameters. No need to generate nested classes for these.
-    if (ctx == null || ctx.contextVariable == null) {
+    if (ctx === null || ctx.contextVariable === null) {
       return null;
     }
     val String functionName = switch container : ctx.eContainer {
@@ -332,7 +295,7 @@ class CheckJvmModelInferrer extends AbstractModelInferrer {
     }.toFirstLower + ctx.contextVariable.type?.simpleName;
 
     ctx.toMethod(functionName, typeRef('void')) [
-      parameters += ctx.contextVariable.toParameter(if (ctx.contextVariable.name == null) CheckConstants::IT else ctx.contextVariable.name, ctx.contextVariable.type);
+      parameters += ctx.contextVariable.toParameter(if (ctx.contextVariable.name === null) CheckConstants::IT else ctx.contextVariable.name, ctx.contextVariable.type);
       annotations += createCheckAnnotation(ctx);
       documentation = functionName + '.'; // Well, that's not very helpful, but it is what the old compiler did...
       body = ctx.constraint;
@@ -345,7 +308,7 @@ class CheckJvmModelInferrer extends AbstractModelInferrer {
     val List<JvmMember> members = Lists::newArrayList();
     for (FormalParameter parameter : check.formalParameters) {
       val JvmTypeReference returnType  = parameter.type;
-      if (returnType != null && !returnType.eIsProxy) {
+      if (returnType !== null && !returnType.eIsProxy) {
         val String returnName  = returnType.qualifiedName;
         val String operation   = switch returnName {
           case 'java.lang.Boolean'                 : 'getBoolean'
@@ -359,7 +322,7 @@ class CheckJvmModelInferrer extends AbstractModelInferrer {
         }
         val String parameterKey  = CheckPropertiesGenerator::parameterKey(parameter, check);
         var String defaultName = 'null';
-        if (parameter.right != null) {
+        if (parameter.right !== null) {
           defaultName = parameter.formalParameterGetterName.splitCamelCase.toUpperCase + '_DEFAULT';
           // Is generated into the PreferenceInitializer. Actually, since we do have it in the initializer, passing it here again
           // as default value is just a safety measure if something went wrong and the property shouldn't be set.
@@ -376,7 +339,7 @@ class CheckJvmModelInferrer extends AbstractModelInferrer {
                        order to check if a configured value exists in a project scope
             @return the run-time value of <em>«parameter.name»</em>''';
           val eObjectTypeRef = checkedTypeRef(parameter, typeof(EObject));
-          if (eObjectTypeRef != null) {
+          if (eObjectTypeRef !== null) {
             parameters += parameter.toParameter('context', eObjectTypeRef);
           }
           body = [append('''
@@ -401,7 +364,7 @@ class CheckJvmModelInferrer extends AbstractModelInferrer {
       // TODO (minor): how to get NLS into the imports?
     ];
     val severityType = checkedTypeRef(check, typeof(SeverityKind));
-    if (severityType != null) {
+    if (severityType !== null) {
       members += check.toMethod('get' + check.name.toFirstUpper + 'SeverityKind', severityType) [
         documentation = '''
           Gets the {@link SeverityKind severity kind} of check
@@ -416,7 +379,7 @@ class CheckJvmModelInferrer extends AbstractModelInferrer {
                   no configuration for this check was found, else the configured
                   value looked up in the configuration store''';
         val eObjectTypeRef = checkedTypeRef(check, typeof(EObject));
-        if (eObjectTypeRef != null) {
+        if (eObjectTypeRef !== null) {
           parameters += check.toParameter('context', eObjectTypeRef);
         }
         body = [append('''
@@ -437,7 +400,7 @@ class CheckJvmModelInferrer extends AbstractModelInferrer {
     val List<JvmMember> result = Lists::newArrayList();
     for (Check c : allChecks) {
       for (FormalParameter parameter : c.formalParameters) {
-        if (parameter.type != null && parameter.right != null) {
+        if (parameter.type !== null && parameter.right !== null) {
           val String defaultName = parameter.formalParameterGetterName.splitCamelCase.toUpperCase + '_DEFAULT';
           result += parameter.toField(defaultName, parameter.type) [
             visibility = JvmVisibility::PUBLIC;
@@ -456,7 +419,7 @@ class CheckJvmModelInferrer extends AbstractModelInferrer {
     val JvmTypeReference prefStore = checkedTypeRef(catalog, typeof (IEclipsePreferences));
     val List<JvmMember> result = Lists::newArrayList();
 
-    if (prefStore != null) {
+    if (prefStore !== null) {
       result += catalog.toMethod('initializeDefaultPreferences', typeRef('void')) [
         annotations += createAnnotation(checkedTypeRef(catalog, typeof(Override)), []);
         visibility = JvmVisibility::PUBLIC;
@@ -480,15 +443,15 @@ class CheckJvmModelInferrer extends AbstractModelInferrer {
         body = [
           for (Check c : allChecks) {
             for (FormalParameter parameter : c.formalParameters) {
-              if (parameter.right != null) {
+              if (parameter.right !== null) {
                 val String key = CheckPropertiesGenerator::parameterKey(parameter, c);
                 val String defaultFieldName = parameter.formalParameterGetterName.splitCamelCase.toUpperCase + '_DEFAULT';
                 val JvmTypeReference jvmType = parameter.type;
                 val String typeName = jvmType.qualifiedName;
-                if (typeName != null && typeName.startsWith("java.util.List<")) {
+                if (typeName !== null && typeName.startsWith("java.util.List<")) {
                   // Marshal lists.
                   val args = (jvmType as JvmParameterizedTypeReference).arguments;
-                  if (args != null && args.size == 1) {
+                  if (args !== null && args.size == 1) {
                     val baseTypeName = args.head.simpleName;
                     append('''preferences.put("«key»", com.avaloq.tools.ddk.check.runtime.configuration.CheckPreferencesHelper.marshal«baseTypeName»s(«defaultFieldName»));
                     ''');
@@ -518,7 +481,7 @@ class CheckJvmModelInferrer extends AbstractModelInferrer {
   }
 
   private def Iterable<JvmAnnotationReference> createAnnotation (JvmTypeReference typeRef, Procedure1<JvmAnnotationReference> initializer) {
-    if (typeRef == null) {
+    if (typeRef === null) {
       return Collections::emptyList;
     }
 
@@ -533,9 +496,9 @@ class CheckJvmModelInferrer extends AbstractModelInferrer {
 
   private def createError (String message, EObject context, EStructuralFeature feature) {
     val Resource rsc = context.eResource;
-    if (rsc != null) {
+    if (rsc !== null) {
       var f = feature;
-      if (f == null) {
+      if (f === null) {
         f = locationInFileProvider.getIdentifierFeature(context);
       }
       rsc.errors += new EObjectDiagnosticImpl(Severity::ERROR, IssueCodes::INFERRER_ERROR, "Check compiler: " + message, context, f, -1, null)
@@ -547,24 +510,15 @@ class CheckJvmModelInferrer extends AbstractModelInferrer {
   }
 
   private def JvmTypeReference checkedTypeRef(EObject context, Class<?> clazz) {
-    if (clazz == null) {
+    if (clazz === null) {
       createTypeNotFoundError ("<unknown>", context);
       return null;
     }
     val result = typeRef(clazz);
-    if (result == null || result.type == null) {
+    if (result === null || result.type === null) {
       createTypeNotFoundError(clazz.name, context);
       return null;
     }
     return result;
   }
-
-  private def JvmTypeReference checkedTypeRef(EObject context, String className) {
-    val result = typeRef(className);
-    if (result == null || result.type == null) {
-      createTypeNotFoundError(className, context);
-      return null;
-    }
-    return result;
-  }
 }
diff --git a/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/scoping/CheckScopeProvider.xtend b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/scoping/CheckScopeProvider.xtend
index 37bd8120a..5770ae59a 100644
--- a/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/scoping/CheckScopeProvider.xtend
+++ b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/scoping/CheckScopeProvider.xtend
@@ -56,20 +56,20 @@ class CheckScopeProvider extends XbaseWithAnnotationsBatchScopeProvider {
   // will otherwise cause the builder to fail during linking.
   override IScope getScope(EObject context, EReference reference) {
     val res = scope(context, reference)
-    if (res != null) res else super.getScope(context, reference)
+    if (res !== null) res else super.getScope(context, reference)
   }
 
   def dispatch IScope scope(XIssueExpression context, EReference reference) {
     if (reference == CheckPackage.Literals::XISSUE_EXPRESSION__MARKER_FEATURE) {
       var jvmTypeRef =
-        if (context.markerObject!= null)
+        if (context.markerObject !== null)
           typeResolver.resolveTypes(context.markerObject).getActualType(context.markerObject).toTypeReference
         else
           EcoreUtil2::getContainerOfType(context, typeof(Context)).contextVariable.type;
 
-      if (jvmTypeRef != null) {
+      if (jvmTypeRef !== null) {
         val eClass = context.classForJvmType(jvmTypeRef.type);
-        if (eClass != null) {
+        if (eClass !== null) {
           var features = eClass.EAllStructuralFeatures
           val descriptions = Collections2::transform(features,  [f | EObjectDescription::create(QualifiedName::create(f.name), f)])
           return MapBasedScope::createScope(IScope::NULLSCOPE, descriptions);
@@ -84,11 +84,11 @@ class CheckScopeProvider extends XbaseWithAnnotationsBatchScopeProvider {
       // another CheckCatalog, then use that parent as parent scope
 
       val catalog = EcoreUtil2::getContainerOfType(context, typeof(CheckCatalog))
-      val checks  = catalog.allChecks.filter(c|c.name != null).toList
+      val checks  = catalog.allChecks.filter(c|c.name !== null).toList
 
       val descriptions = Collections2::transform(checks, [c|EObjectDescription::create(QualifiedName::create(c.name), c)])
       // Determine the parent scope; use NULLSCOPE if no included CheckCatalog is defined (or if it cannot be resolved)
-      val parentScope  = if (catalog.includedCatalogs != null && !catalog.includedCatalogs.eIsProxy) getScope(catalog.includedCatalogs, reference) else IScope::NULLSCOPE
+      val parentScope  = IScope::NULLSCOPE
 
       return MapBasedScope::createScope(parentScope, Iterables::filter(descriptions, Predicates::notNull));
     }
@@ -124,12 +124,12 @@ class CheckScopeProvider extends XbaseWithAnnotationsBatchScopeProvider {
   }
 
   def EClass classForJvmType(EObject context, JvmType jvmType) {
-    if (jvmType != null && !jvmType.eIsProxy) {
+    if (jvmType !== null && !jvmType.eIsProxy) {
       val qualifiedName = jvmType.getQualifiedName();
       val qualifiedPackageName = qualifiedName.substring(0, qualifiedName.lastIndexOf("."));
       val packageName = qualifiedPackageName.substring(qualifiedPackageName.lastIndexOf(".") + 1);
       val ePackage = getEPackage(context.eResource, packageName);
-      if (ePackage != null) {
+      if (ePackage !== null) {
         val eClassifier = (EcoreUtil::resolve(ePackage, context) as EPackage).getEClassifier(jvmType.simpleName)
         if (eClassifier instanceof EClass) {
           return eClassifier
@@ -150,7 +150,7 @@ class CheckScopeProvider extends XbaseWithAnnotationsBatchScopeProvider {
       }
     }
     val desc = globalScopeProvider.getScope(context, EcorePackage.Literals.EPACKAGE__ESUPER_PACKAGE, null).getSingleElement(QualifiedName.create(name))
-    if (desc != null) {
+    if (desc !== null) {
       return desc.EObjectOrProxy as EPackage
     }
     val descs = descriptionsProvider.getResourceDescriptions(context).getExportedObjects(EcorePackage.Literals.EPACKAGE, QualifiedName.create(name), false).iterator
diff --git a/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/validation/CheckJavaValidator.java b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/validation/CheckJavaValidator.java
index b2e646d2c..f36874b25 100644
--- a/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/validation/CheckJavaValidator.java
+++ b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/validation/CheckJavaValidator.java
@@ -22,8 +22,6 @@
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.xtext.EcoreUtil2;
-import org.eclipse.xtext.Grammar;
-import org.eclipse.xtext.GrammarUtil;
 import org.eclipse.xtext.common.types.JvmType;
 import org.eclipse.xtext.common.types.JvmTypeReference;
 import org.eclipse.xtext.naming.QualifiedName;
@@ -62,7 +60,6 @@
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
-import com.google.common.collect.Sets;
 import com.google.inject.Inject;
 
 
@@ -414,67 +411,6 @@ public void checkCheckName(final com.avaloq.tools.ddk.check.check.Check check) {
     }
   }
 
-  /**
-   * Checks catalogs for circular dependencies in included catalogs. A catalog cannot include itself and may not include another catalog which includes the
-   * current one.
-   *
-   * @param catalog
-   *          the catalog to be checked
-   */
-  @Check
-  public void checkCircularDependency(final CheckCatalog catalog) {
-    if (catalog.getIncludedCatalogs() == null) {
-      return;
-    }
-    final Set<CheckCatalog> visitedCatalogs = Sets.newHashSet(catalog);
-    CheckCatalog current = catalog.getIncludedCatalogs();
-    while (current != null) {
-      if (visitedCatalogs.add(current)) {
-        current = current.getIncludedCatalogs();
-      } else {
-        error(Messages.CheckJavaValidator_CIRCULAR_DEPENDENCY_IN_INCLUDED_CATALOGS, catalog, CheckPackage.Literals.CHECK_CATALOG__INCLUDED_CATALOGS, IssueCodes.INCLUDED_CATALOGS_WITH_CIRCULAR_DEPENDENCIES);
-        break;
-      }
-    }
-  }
-
-  /**
-   * Recursively gets all included grammar names.
-   *
-   * @param grammar
-   *          the grammar to start the search with
-   * @return the set of all grammar names
-   */
-  private Set<String> getAllUsedGrammarNames(final Grammar grammar) {
-    return Sets.newHashSet(Iterables.transform(GrammarUtil.allUsedGrammars(grammar), new Function<Grammar, String>() {
-      @Override
-      public String apply(final Grammar grammar) {
-        return grammar.getName();
-      }
-    }));
-  }
-
-  /**
-   * Checks that an included catalog is configured for the same grammar as given catalog.
-   *
-   * @param catalog
-   *          the catalog to be checked
-   */
-  @Check
-  public void checkLanguageOfIncludedCatalog(final CheckCatalog catalog) {
-    if (catalog.getIncludedCatalogs() == null || catalog.getIncludedCatalogs().getGrammar() == null || catalog.getGrammar() == null) {
-      return;
-    }
-    final Grammar grammar = catalog.getGrammar();
-
-    Set<String> allUsedGrammarNames = getAllUsedGrammarNames(grammar);
-
-    final Grammar includedGrammar = catalog.getIncludedCatalogs().getGrammar();
-    if (!includedGrammar.getName().equals(grammar.getName()) && !(allUsedGrammarNames.contains(includedGrammar.getName()))) {
-      error(NLS.bind(Messages.CheckJavaValidator_INVALID_GRAMMAR_OF_INCLUDED_CATALOG, includedGrammar.getName(), grammar.getName()), catalog, CheckPackage.Literals.CHECK_CATALOG__INCLUDED_CATALOGS, IssueCodes.INCLUDED_CATALOG_GRAMMAR_MISMATCH);
-    }
-  }
-
   /**
    * Checks that an issue expression refers to check.
    * This check is either implicit (inside a context) or explicit (inside an independent implementation)
diff --git a/com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/AbstractCheckProposalProvider.java b/com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/AbstractCheckProposalProvider.java
index 7cdafee27..71867915a 100644
--- a/com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/AbstractCheckProposalProvider.java
+++ b/com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/AbstractCheckProposalProvider.java
@@ -31,9 +31,6 @@ public void completeCheckCatalog_Name(EObject model, Assignment assignment, Cont
 	public void completeCheckCatalog_Grammar(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
 	}
-	public void completeCheckCatalog_IncludedCatalogs(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
-	}
 	public void completeCheckCatalog_Categories(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
 	}
diff --git a/com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/CheckParser.java b/com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/CheckParser.java
index 30ec634bf..5e1869800 100644
--- a/com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/CheckParser.java
+++ b/com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/CheckParser.java
@@ -37,7 +37,7 @@ protected String getRuleName(AbstractElement element) {
 			nameMappings = new HashMap<AbstractElement, String>() {
 				private static final long serialVersionUID = 1L;
 				{
-					put(grammarAccess.getCheckCatalogAccess().getAlternatives_10(), "rule__CheckCatalog__Alternatives_10");
+					put(grammarAccess.getCheckCatalogAccess().getAlternatives_9(), "rule__CheckCatalog__Alternatives_9");
 					put(grammarAccess.getXImportDeclarationAccess().getAlternatives_1(), "rule__XImportDeclaration__Alternatives_1");
 					put(grammarAccess.getDocumentedAccess().getAlternatives(), "rule__Documented__Alternatives");
 					put(grammarAccess.getImplicitlyNamedAccess().getAlternatives(), "rule__ImplicitlyNamed__Alternatives");
@@ -91,7 +91,6 @@ protected String getRuleName(AbstractElement element) {
 					put(grammarAccess.getTriggerKindAccess().getAlternatives(), "rule__TriggerKind__Alternatives");
 					put(grammarAccess.getCheckCatalogAccess().getGroup(), "rule__CheckCatalog__Group__0");
 					put(grammarAccess.getCheckCatalogAccess().getGroup_7(), "rule__CheckCatalog__Group_7__0");
-					put(grammarAccess.getCheckCatalogAccess().getGroup_8(), "rule__CheckCatalog__Group_8__0");
 					put(grammarAccess.getXImportSectionAccess().getGroup(), "rule__XImportSection__Group__0");
 					put(grammarAccess.getXImportDeclarationAccess().getGroup(), "rule__XImportDeclaration__Group__0");
 					put(grammarAccess.getCategoryAccess().getGroup(), "rule__Category__Group__0");
@@ -326,11 +325,10 @@ protected String getRuleName(AbstractElement element) {
 					put(grammarAccess.getCheckCatalogAccess().getFinalAssignment_4(), "rule__CheckCatalog__FinalAssignment_4");
 					put(grammarAccess.getCheckCatalogAccess().getNameAssignment_6(), "rule__CheckCatalog__NameAssignment_6");
 					put(grammarAccess.getCheckCatalogAccess().getGrammarAssignment_7_2(), "rule__CheckCatalog__GrammarAssignment_7_2");
-					put(grammarAccess.getCheckCatalogAccess().getIncludedCatalogsAssignment_8_1(), "rule__CheckCatalog__IncludedCatalogsAssignment_8_1");
-					put(grammarAccess.getCheckCatalogAccess().getCategoriesAssignment_10_0(), "rule__CheckCatalog__CategoriesAssignment_10_0");
-					put(grammarAccess.getCheckCatalogAccess().getImplementationsAssignment_10_1(), "rule__CheckCatalog__ImplementationsAssignment_10_1");
-					put(grammarAccess.getCheckCatalogAccess().getChecksAssignment_10_2(), "rule__CheckCatalog__ChecksAssignment_10_2");
-					put(grammarAccess.getCheckCatalogAccess().getMembersAssignment_10_3(), "rule__CheckCatalog__MembersAssignment_10_3");
+					put(grammarAccess.getCheckCatalogAccess().getCategoriesAssignment_9_0(), "rule__CheckCatalog__CategoriesAssignment_9_0");
+					put(grammarAccess.getCheckCatalogAccess().getImplementationsAssignment_9_1(), "rule__CheckCatalog__ImplementationsAssignment_9_1");
+					put(grammarAccess.getCheckCatalogAccess().getChecksAssignment_9_2(), "rule__CheckCatalog__ChecksAssignment_9_2");
+					put(grammarAccess.getCheckCatalogAccess().getMembersAssignment_9_3(), "rule__CheckCatalog__MembersAssignment_9_3");
 					put(grammarAccess.getXImportSectionAccess().getImportDeclarationsAssignment_1(), "rule__XImportSection__ImportDeclarationsAssignment_1");
 					put(grammarAccess.getXImportDeclarationAccess().getImportedTypeAssignment_1_0(), "rule__XImportDeclaration__ImportedTypeAssignment_1_0");
 					put(grammarAccess.getXImportDeclarationAccess().getImportedNamespaceAssignment_1_1(), "rule__XImportDeclaration__ImportedNamespaceAssignment_1_1");
diff --git a/com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g b/com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g
index 23aed513e..9b9348497 100644
--- a/com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g
+++ b/com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g
@@ -2780,33 +2780,33 @@ finally {
 
 
 
-rule__CheckCatalog__Alternatives_10
+rule__CheckCatalog__Alternatives_9
     @init {
 		int stackSize = keepStackSize();
     }
 :
 (
-{ before(grammarAccess.getCheckCatalogAccess().getCategoriesAssignment_10_0()); }
-(rule__CheckCatalog__CategoriesAssignment_10_0)
-{ after(grammarAccess.getCheckCatalogAccess().getCategoriesAssignment_10_0()); }
+{ before(grammarAccess.getCheckCatalogAccess().getCategoriesAssignment_9_0()); }
+(rule__CheckCatalog__CategoriesAssignment_9_0)
+{ after(grammarAccess.getCheckCatalogAccess().getCategoriesAssignment_9_0()); }
 )
 
     |(
-{ before(grammarAccess.getCheckCatalogAccess().getImplementationsAssignment_10_1()); }
-(rule__CheckCatalog__ImplementationsAssignment_10_1)
-{ after(grammarAccess.getCheckCatalogAccess().getImplementationsAssignment_10_1()); }
+{ before(grammarAccess.getCheckCatalogAccess().getImplementationsAssignment_9_1()); }
+(rule__CheckCatalog__ImplementationsAssignment_9_1)
+{ after(grammarAccess.getCheckCatalogAccess().getImplementationsAssignment_9_1()); }
 )
 
     |(
-{ before(grammarAccess.getCheckCatalogAccess().getChecksAssignment_10_2()); }
-(rule__CheckCatalog__ChecksAssignment_10_2)
-{ after(grammarAccess.getCheckCatalogAccess().getChecksAssignment_10_2()); }
+{ before(grammarAccess.getCheckCatalogAccess().getChecksAssignment_9_2()); }
+(rule__CheckCatalog__ChecksAssignment_9_2)
+{ after(grammarAccess.getCheckCatalogAccess().getChecksAssignment_9_2()); }
 )
 
     |(
-{ before(grammarAccess.getCheckCatalogAccess().getMembersAssignment_10_3()); }
-(rule__CheckCatalog__MembersAssignment_10_3)
-{ after(grammarAccess.getCheckCatalogAccess().getMembersAssignment_10_3()); }
+{ before(grammarAccess.getCheckCatalogAccess().getMembersAssignment_9_3()); }
+(rule__CheckCatalog__MembersAssignment_9_3)
+{ after(grammarAccess.getCheckCatalogAccess().getMembersAssignment_9_3()); }
 )
 
 ;
@@ -4657,9 +4657,11 @@ rule__CheckCatalog__Group__8__Impl
     }
 :
 (
-{ before(grammarAccess.getCheckCatalogAccess().getGroup_8()); }
-(rule__CheckCatalog__Group_8__0)?
-{ after(grammarAccess.getCheckCatalogAccess().getGroup_8()); }
+{ before(grammarAccess.getCheckCatalogAccess().getLeftCurlyBracketKeyword_8()); }
+
+	'{' 
+
+{ after(grammarAccess.getCheckCatalogAccess().getLeftCurlyBracketKeyword_8()); }
 )
 
 ;
@@ -4686,11 +4688,9 @@ rule__CheckCatalog__Group__9__Impl
     }
 :
 (
-{ before(grammarAccess.getCheckCatalogAccess().getLeftCurlyBracketKeyword_9()); }
-
-	'{' 
-
-{ after(grammarAccess.getCheckCatalogAccess().getLeftCurlyBracketKeyword_9()); }
+{ before(grammarAccess.getCheckCatalogAccess().getAlternatives_9()); }
+(rule__CheckCatalog__Alternatives_9)*
+{ after(grammarAccess.getCheckCatalogAccess().getAlternatives_9()); }
 )
 
 ;
@@ -4705,7 +4705,6 @@ rule__CheckCatalog__Group__10
     }
 :
 	rule__CheckCatalog__Group__10__Impl
-	rule__CheckCatalog__Group__11
 ;
 finally {
 	restoreStackSize(stackSize);
@@ -4717,39 +4716,11 @@ rule__CheckCatalog__Group__10__Impl
     }
 :
 (
-{ before(grammarAccess.getCheckCatalogAccess().getAlternatives_10()); }
-(rule__CheckCatalog__Alternatives_10)*
-{ after(grammarAccess.getCheckCatalogAccess().getAlternatives_10()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__CheckCatalog__Group__11
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__CheckCatalog__Group__11__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__CheckCatalog__Group__11__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getCheckCatalogAccess().getRightCurlyBracketKeyword_11()); }
+{ before(grammarAccess.getCheckCatalogAccess().getRightCurlyBracketKeyword_10()); }
 
 	'}' 
 
-{ after(grammarAccess.getCheckCatalogAccess().getRightCurlyBracketKeyword_11()); }
+{ after(grammarAccess.getCheckCatalogAccess().getRightCurlyBracketKeyword_10()); }
 )
 
 ;
@@ -4777,8 +4748,6 @@ finally {
 
 
 
-
-
 
 
 
@@ -4878,69 +4847,6 @@ finally {
 
 
 
-rule__CheckCatalog__Group_8__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__CheckCatalog__Group_8__0__Impl
-	rule__CheckCatalog__Group_8__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__CheckCatalog__Group_8__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getCheckCatalogAccess().getWithKeyword_8_0()); }
-
-	'with' 
-
-{ after(grammarAccess.getCheckCatalogAccess().getWithKeyword_8_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__CheckCatalog__Group_8__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__CheckCatalog__Group_8__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__CheckCatalog__Group_8__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getCheckCatalogAccess().getIncludedCatalogsAssignment_8_1()); }
-(rule__CheckCatalog__IncludedCatalogsAssignment_8_1)
-{ after(grammarAccess.getCheckCatalogAccess().getIncludedCatalogsAssignment_8_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
 rule__XImportSection__Group__0
     @init {
 		int stackSize = keepStackSize();
@@ -23136,33 +23042,14 @@ finally {
 	restoreStackSize(stackSize);
 }
 
-rule__CheckCatalog__IncludedCatalogsAssignment_8_1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getCheckCatalogAccess().getIncludedCatalogsCheckCatalogCrossReference_8_1_0()); }
-(
-{ before(grammarAccess.getCheckCatalogAccess().getIncludedCatalogsCheckCatalogQualifiedNameParserRuleCall_8_1_0_1()); }
-	ruleQualifiedName{ after(grammarAccess.getCheckCatalogAccess().getIncludedCatalogsCheckCatalogQualifiedNameParserRuleCall_8_1_0_1()); }
-)
-{ after(grammarAccess.getCheckCatalogAccess().getIncludedCatalogsCheckCatalogCrossReference_8_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__CheckCatalog__CategoriesAssignment_10_0
+rule__CheckCatalog__CategoriesAssignment_9_0
     @init {
 		int stackSize = keepStackSize();
     }
 :
 (
-{ before(grammarAccess.getCheckCatalogAccess().getCategoriesCategoryParserRuleCall_10_0_0()); }
-	ruleCategory{ after(grammarAccess.getCheckCatalogAccess().getCategoriesCategoryParserRuleCall_10_0_0()); }
+{ before(grammarAccess.getCheckCatalogAccess().getCategoriesCategoryParserRuleCall_9_0_0()); }
+	ruleCategory{ after(grammarAccess.getCheckCatalogAccess().getCategoriesCategoryParserRuleCall_9_0_0()); }
 )
 
 ;
@@ -23170,14 +23057,14 @@ finally {
 	restoreStackSize(stackSize);
 }
 
-rule__CheckCatalog__ImplementationsAssignment_10_1
+rule__CheckCatalog__ImplementationsAssignment_9_1
     @init {
 		int stackSize = keepStackSize();
     }
 :
 (
-{ before(grammarAccess.getCheckCatalogAccess().getImplementationsImplementationParserRuleCall_10_1_0()); }
-	ruleImplementation{ after(grammarAccess.getCheckCatalogAccess().getImplementationsImplementationParserRuleCall_10_1_0()); }
+{ before(grammarAccess.getCheckCatalogAccess().getImplementationsImplementationParserRuleCall_9_1_0()); }
+	ruleImplementation{ after(grammarAccess.getCheckCatalogAccess().getImplementationsImplementationParserRuleCall_9_1_0()); }
 )
 
 ;
@@ -23185,14 +23072,14 @@ finally {
 	restoreStackSize(stackSize);
 }
 
-rule__CheckCatalog__ChecksAssignment_10_2
+rule__CheckCatalog__ChecksAssignment_9_2
     @init {
 		int stackSize = keepStackSize();
     }
 :
 (
-{ before(grammarAccess.getCheckCatalogAccess().getChecksCheckParserRuleCall_10_2_0()); }
-	ruleCheck{ after(grammarAccess.getCheckCatalogAccess().getChecksCheckParserRuleCall_10_2_0()); }
+{ before(grammarAccess.getCheckCatalogAccess().getChecksCheckParserRuleCall_9_2_0()); }
+	ruleCheck{ after(grammarAccess.getCheckCatalogAccess().getChecksCheckParserRuleCall_9_2_0()); }
 )
 
 ;
@@ -23200,14 +23087,14 @@ finally {
 	restoreStackSize(stackSize);
 }
 
-rule__CheckCatalog__MembersAssignment_10_3
+rule__CheckCatalog__MembersAssignment_9_3
     @init {
 		int stackSize = keepStackSize();
     }
 :
 (
-{ before(grammarAccess.getCheckCatalogAccess().getMembersMemberParserRuleCall_10_3_0()); }
-	ruleMember{ after(grammarAccess.getCheckCatalogAccess().getMembersMemberParserRuleCall_10_3_0()); }
+{ before(grammarAccess.getCheckCatalogAccess().getMembersMemberParserRuleCall_9_3_0()); }
+	ruleMember{ after(grammarAccess.getCheckCatalogAccess().getMembersMemberParserRuleCall_9_3_0()); }
 )
 
 ;
diff --git a/com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheckLexer.java b/com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheckLexer.java
index 44b88f261..2f3a22cc7 100644
--- a/com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheckLexer.java
+++ b/com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheckLexer.java
@@ -2129,10 +2129,10 @@ public final void mRULE_HEX() throws RecognitionException {
         try {
             int _type = RULE_HEX;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26313:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26313:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26200:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26200:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26313:12: ( '0x' | '0X' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26200:12: ( '0x' | '0X' )
             int alt1=2;
             int LA1_0 = input.LA(1);
 
@@ -2160,7 +2160,7 @@ else if ( (LA1_1=='X') ) {
             }
             switch (alt1) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26313:13: '0x'
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26200:13: '0x'
                     {
                     match("0x"); 
 
@@ -2168,7 +2168,7 @@ else if ( (LA1_1=='X') ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26313:18: '0X'
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26200:18: '0X'
                     {
                     match("0X"); 
 
@@ -2178,7 +2178,7 @@ else if ( (LA1_1=='X') ) {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26313:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26200:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+
             int cnt2=0;
             loop2:
             do {
@@ -2216,7 +2216,7 @@ else if ( (LA1_1=='X') ) {
                 cnt2++;
             } while (true);
 
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26313:58: ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26200:58: ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
             int alt4=2;
             int LA4_0 = input.LA(1);
 
@@ -2225,10 +2225,10 @@ else if ( (LA1_1=='X') ) {
             }
             switch (alt4) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26313:59: '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26200:59: '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
                     {
                     match('#'); 
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26313:63: ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26200:63: ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
                     int alt3=2;
                     int LA3_0 = input.LA(1);
 
@@ -2246,7 +2246,7 @@ else if ( (LA3_0=='L'||LA3_0=='l') ) {
                     }
                     switch (alt3) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26313:64: ( 'b' | 'B' ) ( 'i' | 'I' )
+                            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26200:64: ( 'b' | 'B' ) ( 'i' | 'I' )
                             {
                             if ( input.LA(1)=='B'||input.LA(1)=='b' ) {
                                 input.consume();
@@ -2270,7 +2270,7 @@ else if ( (LA3_0=='L'||LA3_0=='l') ) {
                             }
                             break;
                         case 2 :
-                            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26313:84: ( 'l' | 'L' )
+                            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26200:84: ( 'l' | 'L' )
                             {
                             if ( input.LA(1)=='L'||input.LA(1)=='l' ) {
                                 input.consume();
@@ -2309,11 +2309,11 @@ public final void mRULE_INT() throws RecognitionException {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26315:10: ( '0' .. '9' ( '0' .. '9' | '_' )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26315:12: '0' .. '9' ( '0' .. '9' | '_' )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26202:10: ( '0' .. '9' ( '0' .. '9' | '_' )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26202:12: '0' .. '9' ( '0' .. '9' | '_' )*
             {
             matchRange('0','9'); 
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26315:21: ( '0' .. '9' | '_' )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26202:21: ( '0' .. '9' | '_' )*
             loop5:
             do {
                 int alt5=2;
@@ -2362,11 +2362,11 @@ public final void mRULE_DECIMAL() throws RecognitionException {
         try {
             int _type = RULE_DECIMAL;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26317:14: ( RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26317:16: RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26204:14: ( RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26204:16: RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
             {
             mRULE_INT(); 
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26317:25: ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26204:25: ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )?
             int alt7=2;
             int LA7_0 = input.LA(1);
 
@@ -2375,7 +2375,7 @@ public final void mRULE_DECIMAL() throws RecognitionException {
             }
             switch (alt7) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26317:26: ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26204:26: ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT
                     {
                     if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
                         input.consume();
@@ -2386,7 +2386,7 @@ public final void mRULE_DECIMAL() throws RecognitionException {
                         recover(mse);
                         throw mse;}
 
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26317:36: ( '+' | '-' )?
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26204:36: ( '+' | '-' )?
                     int alt6=2;
                     int LA6_0 = input.LA(1);
 
@@ -2419,7 +2419,7 @@ public final void mRULE_DECIMAL() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26317:58: ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26204:58: ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
             int alt8=3;
             int LA8_0 = input.LA(1);
 
@@ -2431,7 +2431,7 @@ else if ( (LA8_0=='D'||LA8_0=='F'||LA8_0=='L'||LA8_0=='d'||LA8_0=='f'||LA8_0=='l
             }
             switch (alt8) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26317:59: ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' )
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26204:59: ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' )
                     {
                     if ( input.LA(1)=='B'||input.LA(1)=='b' ) {
                         input.consume();
@@ -2455,7 +2455,7 @@ else if ( (LA8_0=='D'||LA8_0=='F'||LA8_0=='L'||LA8_0=='d'||LA8_0=='f'||LA8_0=='l
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26317:87: ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' )
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26204:87: ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' )
                     {
                     if ( input.LA(1)=='D'||input.LA(1)=='F'||input.LA(1)=='L'||input.LA(1)=='d'||input.LA(1)=='f'||input.LA(1)=='l' ) {
                         input.consume();
@@ -2488,10 +2488,10 @@ public final void mRULE_ID() throws RecognitionException {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26319:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26319:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26206:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26206:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26319:11: ( '^' )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26206:11: ( '^' )?
             int alt9=2;
             int LA9_0 = input.LA(1);
 
@@ -2500,7 +2500,7 @@ public final void mRULE_ID() throws RecognitionException {
             }
             switch (alt9) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26319:11: '^'
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26206:11: '^'
                     {
                     match('^'); 
 
@@ -2518,7 +2518,7 @@ public final void mRULE_ID() throws RecognitionException {
                 recover(mse);
                 throw mse;}
 
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26319:44: ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26206:44: ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
             loop10:
             do {
                 int alt10=2;
@@ -2567,10 +2567,10 @@ public final void mRULE_STRING() throws RecognitionException {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26321:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26321:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26208:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26208:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26321:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26208:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
             int alt15=2;
             int LA15_0 = input.LA(1);
 
@@ -2588,10 +2588,10 @@ else if ( (LA15_0=='\'') ) {
             }
             switch (alt15) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26321:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )?
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26208:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )?
                     {
                     match('\"'); 
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26321:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26208:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop11:
                     do {
                         int alt11=3;
@@ -2607,7 +2607,7 @@ else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA1
 
                         switch (alt11) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26321:21: '\\\\' .
+                    	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26208:21: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -2615,7 +2615,7 @@ else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA1
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26321:28: ~ ( ( '\\\\' | '\"' ) )
+                    	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26208:28: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -2635,7 +2635,7 @@ else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA1
                         }
                     } while (true);
 
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26321:44: ( '\"' )?
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26208:44: ( '\"' )?
                     int alt12=2;
                     int LA12_0 = input.LA(1);
 
@@ -2644,7 +2644,7 @@ else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA1
                     }
                     switch (alt12) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26321:44: '\"'
+                            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26208:44: '\"'
                             {
                             match('\"'); 
 
@@ -2657,10 +2657,10 @@ else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA1
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26321:49: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )?
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26208:49: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )?
                     {
                     match('\''); 
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26321:54: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26208:54: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop13:
                     do {
                         int alt13=3;
@@ -2676,7 +2676,7 @@ else if ( ((LA13_0>='\u0000' && LA13_0<='&')||(LA13_0>='(' && LA13_0<='[')||(LA1
 
                         switch (alt13) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26321:55: '\\\\' .
+                    	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26208:55: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -2684,7 +2684,7 @@ else if ( ((LA13_0>='\u0000' && LA13_0<='&')||(LA13_0>='(' && LA13_0<='[')||(LA1
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26321:62: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26208:62: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -2704,7 +2704,7 @@ else if ( ((LA13_0>='\u0000' && LA13_0<='&')||(LA13_0>='(' && LA13_0<='[')||(LA1
                         }
                     } while (true);
 
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26321:79: ( '\\'' )?
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26208:79: ( '\\'' )?
                     int alt14=2;
                     int LA14_0 = input.LA(1);
 
@@ -2713,7 +2713,7 @@ else if ( ((LA13_0>='\u0000' && LA13_0<='&')||(LA13_0>='(' && LA13_0<='[')||(LA1
                     }
                     switch (alt14) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26321:79: '\\''
+                            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26208:79: '\\''
                             {
                             match('\''); 
 
@@ -2744,12 +2744,12 @@ public final void mRULE_ML_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26323:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26323:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26210:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26210:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26323:24: ( options {greedy=false; } : . )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26210:24: ( options {greedy=false; } : . )*
             loop16:
             do {
                 int alt16=2;
@@ -2774,7 +2774,7 @@ else if ( ((LA16_0>='\u0000' && LA16_0<=')')||(LA16_0>='+' && LA16_0<='\uFFFF'))
 
                 switch (alt16) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26323:52: .
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26210:52: .
             	    {
             	    matchAny(); 
 
@@ -2804,12 +2804,12 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26325:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26325:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26212:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26212:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26325:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26212:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop17:
             do {
                 int alt17=2;
@@ -2822,7 +2822,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
 
                 switch (alt17) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26325:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26212:24: ~ ( ( '\\n' | '\\r' ) )
             	    {
             	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
             	        input.consume();
@@ -2842,7 +2842,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
                 }
             } while (true);
 
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26325:40: ( ( '\\r' )? '\\n' )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26212:40: ( ( '\\r' )? '\\n' )?
             int alt19=2;
             int LA19_0 = input.LA(1);
 
@@ -2851,9 +2851,9 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
             }
             switch (alt19) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26325:41: ( '\\r' )? '\\n'
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26212:41: ( '\\r' )? '\\n'
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26325:41: ( '\\r' )?
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26212:41: ( '\\r' )?
                     int alt18=2;
                     int LA18_0 = input.LA(1);
 
@@ -2862,7 +2862,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
                     }
                     switch (alt18) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26325:41: '\\r'
+                            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26212:41: '\\r'
                             {
                             match('\r'); 
 
@@ -2894,10 +2894,10 @@ public final void mRULE_WS() throws RecognitionException {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26327:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26327:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26214:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26214:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26327:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26214:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt20=0;
             loop20:
             do {
@@ -2951,8 +2951,8 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26329:16: ( . )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26329:18: .
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26216:16: ( . )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26216:18: .
             {
             matchAny(); 
 
diff --git a/com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheckParser.java b/com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheckParser.java
index d0d105d72..79e6a5bec 100644
--- a/com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheckParser.java
+++ b/com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheckParser.java
@@ -8308,14 +8308,14 @@ public final void ruleTriggerKind() throws RecognitionException {
     // $ANTLR end "ruleTriggerKind"
 
 
-    // $ANTLR start "rule__CheckCatalog__Alternatives_10"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2783:1: rule__CheckCatalog__Alternatives_10 : ( ( ( rule__CheckCatalog__CategoriesAssignment_10_0 ) ) | ( ( rule__CheckCatalog__ImplementationsAssignment_10_1 ) ) | ( ( rule__CheckCatalog__ChecksAssignment_10_2 ) ) | ( ( rule__CheckCatalog__MembersAssignment_10_3 ) ) );
-    public final void rule__CheckCatalog__Alternatives_10() throws RecognitionException {
+    // $ANTLR start "rule__CheckCatalog__Alternatives_9"
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2783:1: rule__CheckCatalog__Alternatives_9 : ( ( ( rule__CheckCatalog__CategoriesAssignment_9_0 ) ) | ( ( rule__CheckCatalog__ImplementationsAssignment_9_1 ) ) | ( ( rule__CheckCatalog__ChecksAssignment_9_2 ) ) | ( ( rule__CheckCatalog__MembersAssignment_9_3 ) ) );
+    public final void rule__CheckCatalog__Alternatives_9() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2787:1: ( ( ( rule__CheckCatalog__CategoriesAssignment_10_0 ) ) | ( ( rule__CheckCatalog__ImplementationsAssignment_10_1 ) ) | ( ( rule__CheckCatalog__ChecksAssignment_10_2 ) ) | ( ( rule__CheckCatalog__MembersAssignment_10_3 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2787:1: ( ( ( rule__CheckCatalog__CategoriesAssignment_9_0 ) ) | ( ( rule__CheckCatalog__ImplementationsAssignment_9_1 ) ) | ( ( rule__CheckCatalog__ChecksAssignment_9_2 ) ) | ( ( rule__CheckCatalog__MembersAssignment_9_3 ) ) )
             int alt1=4;
             switch ( input.LA(1) ) {
             case 23:
@@ -8376,19 +8376,19 @@ else if ( (LA1_3==28) ) {
 
             switch (alt1) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2788:1: ( ( rule__CheckCatalog__CategoriesAssignment_10_0 ) )
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2788:1: ( ( rule__CheckCatalog__CategoriesAssignment_9_0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2788:1: ( ( rule__CheckCatalog__CategoriesAssignment_10_0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2789:1: ( rule__CheckCatalog__CategoriesAssignment_10_0 )
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2788:1: ( ( rule__CheckCatalog__CategoriesAssignment_9_0 ) )
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2789:1: ( rule__CheckCatalog__CategoriesAssignment_9_0 )
                     {
                     if ( state.backtracking==0 ) {
-                       before(grammarAccess.getCheckCatalogAccess().getCategoriesAssignment_10_0()); 
+                       before(grammarAccess.getCheckCatalogAccess().getCategoriesAssignment_9_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2790:1: ( rule__CheckCatalog__CategoriesAssignment_10_0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2790:2: rule__CheckCatalog__CategoriesAssignment_10_0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2790:1: ( rule__CheckCatalog__CategoriesAssignment_9_0 )
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2790:2: rule__CheckCatalog__CategoriesAssignment_9_0
                     {
-                    pushFollow(FOLLOW_rule__CheckCatalog__CategoriesAssignment_10_0_in_rule__CheckCatalog__Alternatives_105871);
-                    rule__CheckCatalog__CategoriesAssignment_10_0();
+                    pushFollow(FOLLOW_rule__CheckCatalog__CategoriesAssignment_9_0_in_rule__CheckCatalog__Alternatives_95871);
+                    rule__CheckCatalog__CategoriesAssignment_9_0();
 
                     state._fsp--;
                     if (state.failed) return ;
@@ -8396,7 +8396,7 @@ else if ( (LA1_3==28) ) {
                     }
 
                     if ( state.backtracking==0 ) {
-                       after(grammarAccess.getCheckCatalogAccess().getCategoriesAssignment_10_0()); 
+                       after(grammarAccess.getCheckCatalogAccess().getCategoriesAssignment_9_0()); 
                     }
 
                     }
@@ -8405,19 +8405,19 @@ else if ( (LA1_3==28) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2794:6: ( ( rule__CheckCatalog__ImplementationsAssignment_10_1 ) )
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2794:6: ( ( rule__CheckCatalog__ImplementationsAssignment_9_1 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2794:6: ( ( rule__CheckCatalog__ImplementationsAssignment_10_1 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2795:1: ( rule__CheckCatalog__ImplementationsAssignment_10_1 )
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2794:6: ( ( rule__CheckCatalog__ImplementationsAssignment_9_1 ) )
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2795:1: ( rule__CheckCatalog__ImplementationsAssignment_9_1 )
                     {
                     if ( state.backtracking==0 ) {
-                       before(grammarAccess.getCheckCatalogAccess().getImplementationsAssignment_10_1()); 
+                       before(grammarAccess.getCheckCatalogAccess().getImplementationsAssignment_9_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2796:1: ( rule__CheckCatalog__ImplementationsAssignment_10_1 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2796:2: rule__CheckCatalog__ImplementationsAssignment_10_1
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2796:1: ( rule__CheckCatalog__ImplementationsAssignment_9_1 )
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2796:2: rule__CheckCatalog__ImplementationsAssignment_9_1
                     {
-                    pushFollow(FOLLOW_rule__CheckCatalog__ImplementationsAssignment_10_1_in_rule__CheckCatalog__Alternatives_105889);
-                    rule__CheckCatalog__ImplementationsAssignment_10_1();
+                    pushFollow(FOLLOW_rule__CheckCatalog__ImplementationsAssignment_9_1_in_rule__CheckCatalog__Alternatives_95889);
+                    rule__CheckCatalog__ImplementationsAssignment_9_1();
 
                     state._fsp--;
                     if (state.failed) return ;
@@ -8425,7 +8425,7 @@ else if ( (LA1_3==28) ) {
                     }
 
                     if ( state.backtracking==0 ) {
-                       after(grammarAccess.getCheckCatalogAccess().getImplementationsAssignment_10_1()); 
+                       after(grammarAccess.getCheckCatalogAccess().getImplementationsAssignment_9_1()); 
                     }
 
                     }
@@ -8434,19 +8434,19 @@ else if ( (LA1_3==28) ) {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2800:6: ( ( rule__CheckCatalog__ChecksAssignment_10_2 ) )
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2800:6: ( ( rule__CheckCatalog__ChecksAssignment_9_2 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2800:6: ( ( rule__CheckCatalog__ChecksAssignment_10_2 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2801:1: ( rule__CheckCatalog__ChecksAssignment_10_2 )
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2800:6: ( ( rule__CheckCatalog__ChecksAssignment_9_2 ) )
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2801:1: ( rule__CheckCatalog__ChecksAssignment_9_2 )
                     {
                     if ( state.backtracking==0 ) {
-                       before(grammarAccess.getCheckCatalogAccess().getChecksAssignment_10_2()); 
+                       before(grammarAccess.getCheckCatalogAccess().getChecksAssignment_9_2()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2802:1: ( rule__CheckCatalog__ChecksAssignment_10_2 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2802:2: rule__CheckCatalog__ChecksAssignment_10_2
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2802:1: ( rule__CheckCatalog__ChecksAssignment_9_2 )
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2802:2: rule__CheckCatalog__ChecksAssignment_9_2
                     {
-                    pushFollow(FOLLOW_rule__CheckCatalog__ChecksAssignment_10_2_in_rule__CheckCatalog__Alternatives_105907);
-                    rule__CheckCatalog__ChecksAssignment_10_2();
+                    pushFollow(FOLLOW_rule__CheckCatalog__ChecksAssignment_9_2_in_rule__CheckCatalog__Alternatives_95907);
+                    rule__CheckCatalog__ChecksAssignment_9_2();
 
                     state._fsp--;
                     if (state.failed) return ;
@@ -8454,7 +8454,7 @@ else if ( (LA1_3==28) ) {
                     }
 
                     if ( state.backtracking==0 ) {
-                       after(grammarAccess.getCheckCatalogAccess().getChecksAssignment_10_2()); 
+                       after(grammarAccess.getCheckCatalogAccess().getChecksAssignment_9_2()); 
                     }
 
                     }
@@ -8463,19 +8463,19 @@ else if ( (LA1_3==28) ) {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2806:6: ( ( rule__CheckCatalog__MembersAssignment_10_3 ) )
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2806:6: ( ( rule__CheckCatalog__MembersAssignment_9_3 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2806:6: ( ( rule__CheckCatalog__MembersAssignment_10_3 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2807:1: ( rule__CheckCatalog__MembersAssignment_10_3 )
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2806:6: ( ( rule__CheckCatalog__MembersAssignment_9_3 ) )
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2807:1: ( rule__CheckCatalog__MembersAssignment_9_3 )
                     {
                     if ( state.backtracking==0 ) {
-                       before(grammarAccess.getCheckCatalogAccess().getMembersAssignment_10_3()); 
+                       before(grammarAccess.getCheckCatalogAccess().getMembersAssignment_9_3()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2808:1: ( rule__CheckCatalog__MembersAssignment_10_3 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2808:2: rule__CheckCatalog__MembersAssignment_10_3
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2808:1: ( rule__CheckCatalog__MembersAssignment_9_3 )
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2808:2: rule__CheckCatalog__MembersAssignment_9_3
                     {
-                    pushFollow(FOLLOW_rule__CheckCatalog__MembersAssignment_10_3_in_rule__CheckCatalog__Alternatives_105925);
-                    rule__CheckCatalog__MembersAssignment_10_3();
+                    pushFollow(FOLLOW_rule__CheckCatalog__MembersAssignment_9_3_in_rule__CheckCatalog__Alternatives_95925);
+                    rule__CheckCatalog__MembersAssignment_9_3();
 
                     state._fsp--;
                     if (state.failed) return ;
@@ -8483,7 +8483,7 @@ else if ( (LA1_3==28) ) {
                     }
 
                     if ( state.backtracking==0 ) {
-                       after(grammarAccess.getCheckCatalogAccess().getMembersAssignment_10_3()); 
+                       after(grammarAccess.getCheckCatalogAccess().getMembersAssignment_9_3()); 
                     }
 
                     }
@@ -8505,7 +8505,7 @@ else if ( (LA1_3==28) ) {
         }
         return ;
     }
-    // $ANTLR end "rule__CheckCatalog__Alternatives_10"
+    // $ANTLR end "rule__CheckCatalog__Alternatives_9"
 
 
     // $ANTLR start "rule__XImportDeclaration__Alternatives_1"
@@ -11000,12 +11000,12 @@ public final void rule__OpCompare__Alternatives() throws RecognitionException {
                 {
                 int LA19_2 = input.LA(2);
 
-                if ( (LA19_2==13) ) {
-                    alt19=2;
-                }
-                else if ( (LA19_2==EOF||(LA19_2>=RULE_ID && LA19_2<=RULE_STRING)||(LA19_2>=16 && LA19_2<=35)||LA19_2==47||(LA19_2>=54 && LA19_2<=55)||LA19_2==60||(LA19_2>=65 && LA19_2<=66)||LA19_2==68||LA19_2==70||LA19_2==72||(LA19_2>=77 && LA19_2<=78)||(LA19_2>=80 && LA19_2<=81)||LA19_2==84||LA19_2==86||(LA19_2>=90 && LA19_2<=97)||LA19_2==99||LA19_2==108) ) {
+                if ( (LA19_2==EOF||(LA19_2>=RULE_ID && LA19_2<=RULE_STRING)||(LA19_2>=16 && LA19_2<=35)||LA19_2==47||(LA19_2>=54 && LA19_2<=55)||LA19_2==60||(LA19_2>=65 && LA19_2<=66)||LA19_2==68||LA19_2==70||LA19_2==72||(LA19_2>=77 && LA19_2<=78)||(LA19_2>=80 && LA19_2<=81)||LA19_2==84||LA19_2==86||(LA19_2>=90 && LA19_2<=97)||LA19_2==99||LA19_2==108) ) {
                     alt19=4;
                 }
+                else if ( (LA19_2==13) ) {
+                    alt19=2;
+                }
                 else {
                     if (state.backtracking>0) {state.failed=true; return ;}
                     NoViableAltException nvae =
@@ -12724,12 +12724,12 @@ public final void rule__XCollectionLiteral__Alternatives() throws RecognitionExc
             if ( (LA33_0==77) ) {
                 int LA33_1 = input.LA(2);
 
-                if ( (LA33_1==68) ) {
-                    alt33=1;
-                }
-                else if ( (LA33_1==78) ) {
+                if ( (LA33_1==78) ) {
                     alt33=2;
                 }
+                else if ( (LA33_1==68) ) {
+                    alt33=1;
+                }
                 else {
                     if (state.backtracking>0) {state.failed=true; return ;}
                     NoViableAltException nvae =
@@ -15290,45 +15290,24 @@ public final void rule__CheckCatalog__Group__8() throws RecognitionException {
 
 
     // $ANTLR start "rule__CheckCatalog__Group__8__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4654:1: rule__CheckCatalog__Group__8__Impl : ( ( rule__CheckCatalog__Group_8__0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4654:1: rule__CheckCatalog__Group__8__Impl : ( '{' ) ;
     public final void rule__CheckCatalog__Group__8__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4658:1: ( ( ( rule__CheckCatalog__Group_8__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4659:1: ( ( rule__CheckCatalog__Group_8__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4658:1: ( ( '{' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4659:1: ( '{' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4659:1: ( ( rule__CheckCatalog__Group_8__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4660:1: ( rule__CheckCatalog__Group_8__0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4659:1: ( '{' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4660:1: '{'
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getCheckCatalogAccess().getGroup_8()); 
+               before(grammarAccess.getCheckCatalogAccess().getLeftCurlyBracketKeyword_8()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4661:1: ( rule__CheckCatalog__Group_8__0 )?
-            int alt54=2;
-            int LA54_0 = input.LA(1);
-
-            if ( (LA54_0==22) ) {
-                alt54=1;
-            }
-            switch (alt54) {
-                case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4661:2: rule__CheckCatalog__Group_8__0
-                    {
-                    pushFollow(FOLLOW_rule__CheckCatalog__Group_8__0_in_rule__CheckCatalog__Group__8__Impl10220);
-                    rule__CheckCatalog__Group_8__0();
-
-                    state._fsp--;
-                    if (state.failed) return ;
-
-                    }
-                    break;
-
-            }
-
+            match(input,68,FOLLOW_68_in_rule__CheckCatalog__Group__8__Impl10221); if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getCheckCatalogAccess().getGroup_8()); 
+               after(grammarAccess.getCheckCatalogAccess().getLeftCurlyBracketKeyword_8()); 
             }
 
             }
@@ -15352,21 +15331,21 @@ public final void rule__CheckCatalog__Group__8__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__CheckCatalog__Group__9"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4671:1: rule__CheckCatalog__Group__9 : rule__CheckCatalog__Group__9__Impl rule__CheckCatalog__Group__10 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4673:1: rule__CheckCatalog__Group__9 : rule__CheckCatalog__Group__9__Impl rule__CheckCatalog__Group__10 ;
     public final void rule__CheckCatalog__Group__9() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4675:1: ( rule__CheckCatalog__Group__9__Impl rule__CheckCatalog__Group__10 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4676:2: rule__CheckCatalog__Group__9__Impl rule__CheckCatalog__Group__10
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4677:1: ( rule__CheckCatalog__Group__9__Impl rule__CheckCatalog__Group__10 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4678:2: rule__CheckCatalog__Group__9__Impl rule__CheckCatalog__Group__10
             {
-            pushFollow(FOLLOW_rule__CheckCatalog__Group__9__Impl_in_rule__CheckCatalog__Group__910251);
+            pushFollow(FOLLOW_rule__CheckCatalog__Group__9__Impl_in_rule__CheckCatalog__Group__910252);
             rule__CheckCatalog__Group__9__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CheckCatalog__Group__10_in_rule__CheckCatalog__Group__910254);
+            pushFollow(FOLLOW_rule__CheckCatalog__Group__10_in_rule__CheckCatalog__Group__910255);
             rule__CheckCatalog__Group__10();
 
             state._fsp--;
@@ -15390,117 +15369,38 @@ public final void rule__CheckCatalog__Group__9() throws RecognitionException {
 
 
     // $ANTLR start "rule__CheckCatalog__Group__9__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4683:1: rule__CheckCatalog__Group__9__Impl : ( '{' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4685:1: rule__CheckCatalog__Group__9__Impl : ( ( rule__CheckCatalog__Alternatives_9 )* ) ;
     public final void rule__CheckCatalog__Group__9__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4687:1: ( ( '{' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4688:1: ( '{' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4689:1: ( ( ( rule__CheckCatalog__Alternatives_9 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4690:1: ( ( rule__CheckCatalog__Alternatives_9 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4688:1: ( '{' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4689:1: '{'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4690:1: ( ( rule__CheckCatalog__Alternatives_9 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4691:1: ( rule__CheckCatalog__Alternatives_9 )*
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getCheckCatalogAccess().getLeftCurlyBracketKeyword_9()); 
-            }
-            match(input,68,FOLLOW_68_in_rule__CheckCatalog__Group__9__Impl10282); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getCheckCatalogAccess().getLeftCurlyBracketKeyword_9()); 
-            }
-
+               before(grammarAccess.getCheckCatalogAccess().getAlternatives_9()); 
             }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__CheckCatalog__Group__9__Impl"
-
-
-    // $ANTLR start "rule__CheckCatalog__Group__10"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4702:1: rule__CheckCatalog__Group__10 : rule__CheckCatalog__Group__10__Impl rule__CheckCatalog__Group__11 ;
-    public final void rule__CheckCatalog__Group__10() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4706:1: ( rule__CheckCatalog__Group__10__Impl rule__CheckCatalog__Group__11 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4707:2: rule__CheckCatalog__Group__10__Impl rule__CheckCatalog__Group__11
-            {
-            pushFollow(FOLLOW_rule__CheckCatalog__Group__10__Impl_in_rule__CheckCatalog__Group__1010313);
-            rule__CheckCatalog__Group__10__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CheckCatalog__Group__11_in_rule__CheckCatalog__Group__1010316);
-            rule__CheckCatalog__Group__11();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__CheckCatalog__Group__10"
-
-
-    // $ANTLR start "rule__CheckCatalog__Group__10__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4714:1: rule__CheckCatalog__Group__10__Impl : ( ( rule__CheckCatalog__Alternatives_10 )* ) ;
-    public final void rule__CheckCatalog__Group__10__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4718:1: ( ( ( rule__CheckCatalog__Alternatives_10 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4719:1: ( ( rule__CheckCatalog__Alternatives_10 )* )
-            {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4719:1: ( ( rule__CheckCatalog__Alternatives_10 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4720:1: ( rule__CheckCatalog__Alternatives_10 )*
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getCheckCatalogAccess().getAlternatives_10()); 
-            }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4721:1: ( rule__CheckCatalog__Alternatives_10 )*
-            loop55:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4692:1: ( rule__CheckCatalog__Alternatives_9 )*
+            loop54:
             do {
-                int alt55=2;
-                int LA55_0 = input.LA(1);
+                int alt54=2;
+                int LA54_0 = input.LA(1);
 
-                if ( (LA55_0==RULE_ID||LA55_0==23||(LA55_0>=29 && LA55_0<=35)||LA55_0==51||LA55_0==72||(LA55_0>=75 && LA55_0<=76)||LA55_0==103) ) {
-                    alt55=1;
+                if ( (LA54_0==RULE_ID||LA54_0==23||(LA54_0>=29 && LA54_0<=35)||LA54_0==51||LA54_0==72||(LA54_0>=75 && LA54_0<=76)||LA54_0==103) ) {
+                    alt54=1;
                 }
 
 
-                switch (alt55) {
+                switch (alt54) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4721:2: rule__CheckCatalog__Alternatives_10
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4692:2: rule__CheckCatalog__Alternatives_9
             	    {
-            	    pushFollow(FOLLOW_rule__CheckCatalog__Alternatives_10_in_rule__CheckCatalog__Group__10__Impl10343);
-            	    rule__CheckCatalog__Alternatives_10();
+            	    pushFollow(FOLLOW_rule__CheckCatalog__Alternatives_9_in_rule__CheckCatalog__Group__9__Impl10282);
+            	    rule__CheckCatalog__Alternatives_9();
 
             	    state._fsp--;
             	    if (state.failed) return ;
@@ -15509,12 +15409,12 @@ public final void rule__CheckCatalog__Group__10__Impl() throws RecognitionExcept
             	    break;
 
             	default :
-            	    break loop55;
+            	    break loop54;
                 }
             } while (true);
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getCheckCatalogAccess().getAlternatives_10()); 
+               after(grammarAccess.getCheckCatalogAccess().getAlternatives_9()); 
             }
 
             }
@@ -15534,21 +15434,21 @@ public final void rule__CheckCatalog__Group__10__Impl() throws RecognitionExcept
         }
         return ;
     }
-    // $ANTLR end "rule__CheckCatalog__Group__10__Impl"
+    // $ANTLR end "rule__CheckCatalog__Group__9__Impl"
 
 
-    // $ANTLR start "rule__CheckCatalog__Group__11"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4731:1: rule__CheckCatalog__Group__11 : rule__CheckCatalog__Group__11__Impl ;
-    public final void rule__CheckCatalog__Group__11() throws RecognitionException {
+    // $ANTLR start "rule__CheckCatalog__Group__10"
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4702:1: rule__CheckCatalog__Group__10 : rule__CheckCatalog__Group__10__Impl ;
+    public final void rule__CheckCatalog__Group__10() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4735:1: ( rule__CheckCatalog__Group__11__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4736:2: rule__CheckCatalog__Group__11__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4706:1: ( rule__CheckCatalog__Group__10__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4707:2: rule__CheckCatalog__Group__10__Impl
             {
-            pushFollow(FOLLOW_rule__CheckCatalog__Group__11__Impl_in_rule__CheckCatalog__Group__1110374);
-            rule__CheckCatalog__Group__11__Impl();
+            pushFollow(FOLLOW_rule__CheckCatalog__Group__10__Impl_in_rule__CheckCatalog__Group__1010313);
+            rule__CheckCatalog__Group__10__Impl();
 
             state._fsp--;
             if (state.failed) return ;
@@ -15567,28 +15467,28 @@ public final void rule__CheckCatalog__Group__11() throws RecognitionException {
         }
         return ;
     }
-    // $ANTLR end "rule__CheckCatalog__Group__11"
+    // $ANTLR end "rule__CheckCatalog__Group__10"
 
 
-    // $ANTLR start "rule__CheckCatalog__Group__11__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4742:1: rule__CheckCatalog__Group__11__Impl : ( '}' ) ;
-    public final void rule__CheckCatalog__Group__11__Impl() throws RecognitionException {
+    // $ANTLR start "rule__CheckCatalog__Group__10__Impl"
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4713:1: rule__CheckCatalog__Group__10__Impl : ( '}' ) ;
+    public final void rule__CheckCatalog__Group__10__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4746:1: ( ( '}' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4747:1: ( '}' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4717:1: ( ( '}' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4718:1: ( '}' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4747:1: ( '}' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4748:1: '}'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4718:1: ( '}' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4719:1: '}'
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getCheckCatalogAccess().getRightCurlyBracketKeyword_11()); 
+               before(grammarAccess.getCheckCatalogAccess().getRightCurlyBracketKeyword_10()); 
             }
-            match(input,69,FOLLOW_69_in_rule__CheckCatalog__Group__11__Impl10402); if (state.failed) return ;
+            match(input,69,FOLLOW_69_in_rule__CheckCatalog__Group__10__Impl10341); if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getCheckCatalogAccess().getRightCurlyBracketKeyword_11()); 
+               after(grammarAccess.getCheckCatalogAccess().getRightCurlyBracketKeyword_10()); 
             }
 
             }
@@ -15608,25 +15508,25 @@ public final void rule__CheckCatalog__Group__11__Impl() throws RecognitionExcept
         }
         return ;
     }
-    // $ANTLR end "rule__CheckCatalog__Group__11__Impl"
+    // $ANTLR end "rule__CheckCatalog__Group__10__Impl"
 
 
     // $ANTLR start "rule__CheckCatalog__Group_7__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4785:1: rule__CheckCatalog__Group_7__0 : rule__CheckCatalog__Group_7__0__Impl rule__CheckCatalog__Group_7__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4754:1: rule__CheckCatalog__Group_7__0 : rule__CheckCatalog__Group_7__0__Impl rule__CheckCatalog__Group_7__1 ;
     public final void rule__CheckCatalog__Group_7__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4789:1: ( rule__CheckCatalog__Group_7__0__Impl rule__CheckCatalog__Group_7__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4790:2: rule__CheckCatalog__Group_7__0__Impl rule__CheckCatalog__Group_7__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4758:1: ( rule__CheckCatalog__Group_7__0__Impl rule__CheckCatalog__Group_7__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4759:2: rule__CheckCatalog__Group_7__0__Impl rule__CheckCatalog__Group_7__1
             {
-            pushFollow(FOLLOW_rule__CheckCatalog__Group_7__0__Impl_in_rule__CheckCatalog__Group_7__010457);
+            pushFollow(FOLLOW_rule__CheckCatalog__Group_7__0__Impl_in_rule__CheckCatalog__Group_7__010394);
             rule__CheckCatalog__Group_7__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CheckCatalog__Group_7__1_in_rule__CheckCatalog__Group_7__010460);
+            pushFollow(FOLLOW_rule__CheckCatalog__Group_7__1_in_rule__CheckCatalog__Group_7__010397);
             rule__CheckCatalog__Group_7__1();
 
             state._fsp--;
@@ -15650,22 +15550,22 @@ public final void rule__CheckCatalog__Group_7__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__CheckCatalog__Group_7__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4797:1: rule__CheckCatalog__Group_7__0__Impl : ( 'for' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4766:1: rule__CheckCatalog__Group_7__0__Impl : ( 'for' ) ;
     public final void rule__CheckCatalog__Group_7__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4801:1: ( ( 'for' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4802:1: ( 'for' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4770:1: ( ( 'for' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4771:1: ( 'for' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4802:1: ( 'for' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4803:1: 'for'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4771:1: ( 'for' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4772:1: 'for'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckCatalogAccess().getForKeyword_7_0()); 
             }
-            match(input,70,FOLLOW_70_in_rule__CheckCatalog__Group_7__0__Impl10488); if (state.failed) return ;
+            match(input,70,FOLLOW_70_in_rule__CheckCatalog__Group_7__0__Impl10425); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCheckCatalogAccess().getForKeyword_7_0()); 
             }
@@ -15691,21 +15591,21 @@ public final void rule__CheckCatalog__Group_7__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__CheckCatalog__Group_7__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4816:1: rule__CheckCatalog__Group_7__1 : rule__CheckCatalog__Group_7__1__Impl rule__CheckCatalog__Group_7__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4785:1: rule__CheckCatalog__Group_7__1 : rule__CheckCatalog__Group_7__1__Impl rule__CheckCatalog__Group_7__2 ;
     public final void rule__CheckCatalog__Group_7__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4820:1: ( rule__CheckCatalog__Group_7__1__Impl rule__CheckCatalog__Group_7__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4821:2: rule__CheckCatalog__Group_7__1__Impl rule__CheckCatalog__Group_7__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4789:1: ( rule__CheckCatalog__Group_7__1__Impl rule__CheckCatalog__Group_7__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4790:2: rule__CheckCatalog__Group_7__1__Impl rule__CheckCatalog__Group_7__2
             {
-            pushFollow(FOLLOW_rule__CheckCatalog__Group_7__1__Impl_in_rule__CheckCatalog__Group_7__110519);
+            pushFollow(FOLLOW_rule__CheckCatalog__Group_7__1__Impl_in_rule__CheckCatalog__Group_7__110456);
             rule__CheckCatalog__Group_7__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CheckCatalog__Group_7__2_in_rule__CheckCatalog__Group_7__110522);
+            pushFollow(FOLLOW_rule__CheckCatalog__Group_7__2_in_rule__CheckCatalog__Group_7__110459);
             rule__CheckCatalog__Group_7__2();
 
             state._fsp--;
@@ -15729,22 +15629,22 @@ public final void rule__CheckCatalog__Group_7__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__CheckCatalog__Group_7__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4828:1: rule__CheckCatalog__Group_7__1__Impl : ( 'grammar' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4797:1: rule__CheckCatalog__Group_7__1__Impl : ( 'grammar' ) ;
     public final void rule__CheckCatalog__Group_7__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4832:1: ( ( 'grammar' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4833:1: ( 'grammar' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4801:1: ( ( 'grammar' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4802:1: ( 'grammar' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4833:1: ( 'grammar' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4834:1: 'grammar'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4802:1: ( 'grammar' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4803:1: 'grammar'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckCatalogAccess().getGrammarKeyword_7_1()); 
             }
-            match(input,21,FOLLOW_21_in_rule__CheckCatalog__Group_7__1__Impl10550); if (state.failed) return ;
+            match(input,21,FOLLOW_21_in_rule__CheckCatalog__Group_7__1__Impl10487); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCheckCatalogAccess().getGrammarKeyword_7_1()); 
             }
@@ -15770,16 +15670,16 @@ public final void rule__CheckCatalog__Group_7__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__CheckCatalog__Group_7__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4847:1: rule__CheckCatalog__Group_7__2 : rule__CheckCatalog__Group_7__2__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4816:1: rule__CheckCatalog__Group_7__2 : rule__CheckCatalog__Group_7__2__Impl ;
     public final void rule__CheckCatalog__Group_7__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4851:1: ( rule__CheckCatalog__Group_7__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4852:2: rule__CheckCatalog__Group_7__2__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4820:1: ( rule__CheckCatalog__Group_7__2__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4821:2: rule__CheckCatalog__Group_7__2__Impl
             {
-            pushFollow(FOLLOW_rule__CheckCatalog__Group_7__2__Impl_in_rule__CheckCatalog__Group_7__210581);
+            pushFollow(FOLLOW_rule__CheckCatalog__Group_7__2__Impl_in_rule__CheckCatalog__Group_7__210518);
             rule__CheckCatalog__Group_7__2__Impl();
 
             state._fsp--;
@@ -15803,25 +15703,25 @@ public final void rule__CheckCatalog__Group_7__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__CheckCatalog__Group_7__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4858:1: rule__CheckCatalog__Group_7__2__Impl : ( ( rule__CheckCatalog__GrammarAssignment_7_2 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4827:1: rule__CheckCatalog__Group_7__2__Impl : ( ( rule__CheckCatalog__GrammarAssignment_7_2 ) ) ;
     public final void rule__CheckCatalog__Group_7__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4862:1: ( ( ( rule__CheckCatalog__GrammarAssignment_7_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4863:1: ( ( rule__CheckCatalog__GrammarAssignment_7_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4831:1: ( ( ( rule__CheckCatalog__GrammarAssignment_7_2 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4832:1: ( ( rule__CheckCatalog__GrammarAssignment_7_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4863:1: ( ( rule__CheckCatalog__GrammarAssignment_7_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4864:1: ( rule__CheckCatalog__GrammarAssignment_7_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4832:1: ( ( rule__CheckCatalog__GrammarAssignment_7_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4833:1: ( rule__CheckCatalog__GrammarAssignment_7_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckCatalogAccess().getGrammarAssignment_7_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4865:1: ( rule__CheckCatalog__GrammarAssignment_7_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4865:2: rule__CheckCatalog__GrammarAssignment_7_2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4834:1: ( rule__CheckCatalog__GrammarAssignment_7_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4834:2: rule__CheckCatalog__GrammarAssignment_7_2
             {
-            pushFollow(FOLLOW_rule__CheckCatalog__GrammarAssignment_7_2_in_rule__CheckCatalog__Group_7__2__Impl10608);
+            pushFollow(FOLLOW_rule__CheckCatalog__GrammarAssignment_7_2_in_rule__CheckCatalog__Group_7__2__Impl10545);
             rule__CheckCatalog__GrammarAssignment_7_2();
 
             state._fsp--;
@@ -15853,185 +15753,22 @@ public final void rule__CheckCatalog__Group_7__2__Impl() throws RecognitionExcep
     // $ANTLR end "rule__CheckCatalog__Group_7__2__Impl"
 
 
-    // $ANTLR start "rule__CheckCatalog__Group_8__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4881:1: rule__CheckCatalog__Group_8__0 : rule__CheckCatalog__Group_8__0__Impl rule__CheckCatalog__Group_8__1 ;
-    public final void rule__CheckCatalog__Group_8__0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4885:1: ( rule__CheckCatalog__Group_8__0__Impl rule__CheckCatalog__Group_8__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4886:2: rule__CheckCatalog__Group_8__0__Impl rule__CheckCatalog__Group_8__1
-            {
-            pushFollow(FOLLOW_rule__CheckCatalog__Group_8__0__Impl_in_rule__CheckCatalog__Group_8__010644);
-            rule__CheckCatalog__Group_8__0__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CheckCatalog__Group_8__1_in_rule__CheckCatalog__Group_8__010647);
-            rule__CheckCatalog__Group_8__1();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__CheckCatalog__Group_8__0"
-
-
-    // $ANTLR start "rule__CheckCatalog__Group_8__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4893:1: rule__CheckCatalog__Group_8__0__Impl : ( 'with' ) ;
-    public final void rule__CheckCatalog__Group_8__0__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4897:1: ( ( 'with' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4898:1: ( 'with' )
-            {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4898:1: ( 'with' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4899:1: 'with'
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getCheckCatalogAccess().getWithKeyword_8_0()); 
-            }
-            match(input,22,FOLLOW_22_in_rule__CheckCatalog__Group_8__0__Impl10675); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getCheckCatalogAccess().getWithKeyword_8_0()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__CheckCatalog__Group_8__0__Impl"
-
-
-    // $ANTLR start "rule__CheckCatalog__Group_8__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4912:1: rule__CheckCatalog__Group_8__1 : rule__CheckCatalog__Group_8__1__Impl ;
-    public final void rule__CheckCatalog__Group_8__1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4916:1: ( rule__CheckCatalog__Group_8__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4917:2: rule__CheckCatalog__Group_8__1__Impl
-            {
-            pushFollow(FOLLOW_rule__CheckCatalog__Group_8__1__Impl_in_rule__CheckCatalog__Group_8__110706);
-            rule__CheckCatalog__Group_8__1__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__CheckCatalog__Group_8__1"
-
-
-    // $ANTLR start "rule__CheckCatalog__Group_8__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4923:1: rule__CheckCatalog__Group_8__1__Impl : ( ( rule__CheckCatalog__IncludedCatalogsAssignment_8_1 ) ) ;
-    public final void rule__CheckCatalog__Group_8__1__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4927:1: ( ( ( rule__CheckCatalog__IncludedCatalogsAssignment_8_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4928:1: ( ( rule__CheckCatalog__IncludedCatalogsAssignment_8_1 ) )
-            {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4928:1: ( ( rule__CheckCatalog__IncludedCatalogsAssignment_8_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4929:1: ( rule__CheckCatalog__IncludedCatalogsAssignment_8_1 )
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getCheckCatalogAccess().getIncludedCatalogsAssignment_8_1()); 
-            }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4930:1: ( rule__CheckCatalog__IncludedCatalogsAssignment_8_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4930:2: rule__CheckCatalog__IncludedCatalogsAssignment_8_1
-            {
-            pushFollow(FOLLOW_rule__CheckCatalog__IncludedCatalogsAssignment_8_1_in_rule__CheckCatalog__Group_8__1__Impl10733);
-            rule__CheckCatalog__IncludedCatalogsAssignment_8_1();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getCheckCatalogAccess().getIncludedCatalogsAssignment_8_1()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__CheckCatalog__Group_8__1__Impl"
-
-
     // $ANTLR start "rule__XImportSection__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4944:1: rule__XImportSection__Group__0 : rule__XImportSection__Group__0__Impl rule__XImportSection__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4850:1: rule__XImportSection__Group__0 : rule__XImportSection__Group__0__Impl rule__XImportSection__Group__1 ;
     public final void rule__XImportSection__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4948:1: ( rule__XImportSection__Group__0__Impl rule__XImportSection__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4949:2: rule__XImportSection__Group__0__Impl rule__XImportSection__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4854:1: ( rule__XImportSection__Group__0__Impl rule__XImportSection__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4855:2: rule__XImportSection__Group__0__Impl rule__XImportSection__Group__1
             {
-            pushFollow(FOLLOW_rule__XImportSection__Group__0__Impl_in_rule__XImportSection__Group__010767);
+            pushFollow(FOLLOW_rule__XImportSection__Group__0__Impl_in_rule__XImportSection__Group__010581);
             rule__XImportSection__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XImportSection__Group__1_in_rule__XImportSection__Group__010770);
+            pushFollow(FOLLOW_rule__XImportSection__Group__1_in_rule__XImportSection__Group__010584);
             rule__XImportSection__Group__1();
 
             state._fsp--;
@@ -16055,23 +15792,23 @@ public final void rule__XImportSection__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XImportSection__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4956:1: rule__XImportSection__Group__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4862:1: rule__XImportSection__Group__0__Impl : ( () ) ;
     public final void rule__XImportSection__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4960:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4961:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4866:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4867:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4961:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4962:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4867:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4868:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportSectionAccess().getXImportSectionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4963:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4965:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4869:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4871:1: 
             {
             }
 
@@ -16096,16 +15833,16 @@ public final void rule__XImportSection__Group__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XImportSection__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4975:1: rule__XImportSection__Group__1 : rule__XImportSection__Group__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4881:1: rule__XImportSection__Group__1 : rule__XImportSection__Group__1__Impl ;
     public final void rule__XImportSection__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4979:1: ( rule__XImportSection__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4980:2: rule__XImportSection__Group__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4885:1: ( rule__XImportSection__Group__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4886:2: rule__XImportSection__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XImportSection__Group__1__Impl_in_rule__XImportSection__Group__110828);
+            pushFollow(FOLLOW_rule__XImportSection__Group__1__Impl_in_rule__XImportSection__Group__110642);
             rule__XImportSection__Group__1__Impl();
 
             state._fsp--;
@@ -16129,37 +15866,37 @@ public final void rule__XImportSection__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XImportSection__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4986:1: rule__XImportSection__Group__1__Impl : ( ( rule__XImportSection__ImportDeclarationsAssignment_1 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4892:1: rule__XImportSection__Group__1__Impl : ( ( rule__XImportSection__ImportDeclarationsAssignment_1 )* ) ;
     public final void rule__XImportSection__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4990:1: ( ( ( rule__XImportSection__ImportDeclarationsAssignment_1 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4991:1: ( ( rule__XImportSection__ImportDeclarationsAssignment_1 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4896:1: ( ( ( rule__XImportSection__ImportDeclarationsAssignment_1 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4897:1: ( ( rule__XImportSection__ImportDeclarationsAssignment_1 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4991:1: ( ( rule__XImportSection__ImportDeclarationsAssignment_1 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4992:1: ( rule__XImportSection__ImportDeclarationsAssignment_1 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4897:1: ( ( rule__XImportSection__ImportDeclarationsAssignment_1 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4898:1: ( rule__XImportSection__ImportDeclarationsAssignment_1 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportSectionAccess().getImportDeclarationsAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4993:1: ( rule__XImportSection__ImportDeclarationsAssignment_1 )*
-            loop56:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4899:1: ( rule__XImportSection__ImportDeclarationsAssignment_1 )*
+            loop55:
             do {
-                int alt56=2;
-                int LA56_0 = input.LA(1);
+                int alt55=2;
+                int LA55_0 = input.LA(1);
 
-                if ( (LA56_0==18) ) {
-                    alt56=1;
+                if ( (LA55_0==18) ) {
+                    alt55=1;
                 }
 
 
-                switch (alt56) {
+                switch (alt55) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4993:2: rule__XImportSection__ImportDeclarationsAssignment_1
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4899:2: rule__XImportSection__ImportDeclarationsAssignment_1
             	    {
-            	    pushFollow(FOLLOW_rule__XImportSection__ImportDeclarationsAssignment_1_in_rule__XImportSection__Group__1__Impl10855);
+            	    pushFollow(FOLLOW_rule__XImportSection__ImportDeclarationsAssignment_1_in_rule__XImportSection__Group__1__Impl10669);
             	    rule__XImportSection__ImportDeclarationsAssignment_1();
 
             	    state._fsp--;
@@ -16169,7 +15906,7 @@ public final void rule__XImportSection__Group__1__Impl() throws RecognitionExcep
             	    break;
 
             	default :
-            	    break loop56;
+            	    break loop55;
                 }
             } while (true);
 
@@ -16198,21 +15935,21 @@ public final void rule__XImportSection__Group__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XImportDeclaration__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5007:1: rule__XImportDeclaration__Group__0 : rule__XImportDeclaration__Group__0__Impl rule__XImportDeclaration__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4913:1: rule__XImportDeclaration__Group__0 : rule__XImportDeclaration__Group__0__Impl rule__XImportDeclaration__Group__1 ;
     public final void rule__XImportDeclaration__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5011:1: ( rule__XImportDeclaration__Group__0__Impl rule__XImportDeclaration__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5012:2: rule__XImportDeclaration__Group__0__Impl rule__XImportDeclaration__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4917:1: ( rule__XImportDeclaration__Group__0__Impl rule__XImportDeclaration__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4918:2: rule__XImportDeclaration__Group__0__Impl rule__XImportDeclaration__Group__1
             {
-            pushFollow(FOLLOW_rule__XImportDeclaration__Group__0__Impl_in_rule__XImportDeclaration__Group__010890);
+            pushFollow(FOLLOW_rule__XImportDeclaration__Group__0__Impl_in_rule__XImportDeclaration__Group__010704);
             rule__XImportDeclaration__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XImportDeclaration__Group__1_in_rule__XImportDeclaration__Group__010893);
+            pushFollow(FOLLOW_rule__XImportDeclaration__Group__1_in_rule__XImportDeclaration__Group__010707);
             rule__XImportDeclaration__Group__1();
 
             state._fsp--;
@@ -16236,22 +15973,22 @@ public final void rule__XImportDeclaration__Group__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XImportDeclaration__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5019:1: rule__XImportDeclaration__Group__0__Impl : ( 'import' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4925:1: rule__XImportDeclaration__Group__0__Impl : ( 'import' ) ;
     public final void rule__XImportDeclaration__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5023:1: ( ( 'import' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5024:1: ( 'import' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4929:1: ( ( 'import' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4930:1: ( 'import' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5024:1: ( 'import' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5025:1: 'import'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4930:1: ( 'import' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4931:1: 'import'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getImportKeyword_0()); 
             }
-            match(input,18,FOLLOW_18_in_rule__XImportDeclaration__Group__0__Impl10921); if (state.failed) return ;
+            match(input,18,FOLLOW_18_in_rule__XImportDeclaration__Group__0__Impl10735); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXImportDeclarationAccess().getImportKeyword_0()); 
             }
@@ -16277,21 +16014,21 @@ public final void rule__XImportDeclaration__Group__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XImportDeclaration__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5038:1: rule__XImportDeclaration__Group__1 : rule__XImportDeclaration__Group__1__Impl rule__XImportDeclaration__Group__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4944:1: rule__XImportDeclaration__Group__1 : rule__XImportDeclaration__Group__1__Impl rule__XImportDeclaration__Group__2 ;
     public final void rule__XImportDeclaration__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5042:1: ( rule__XImportDeclaration__Group__1__Impl rule__XImportDeclaration__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5043:2: rule__XImportDeclaration__Group__1__Impl rule__XImportDeclaration__Group__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4948:1: ( rule__XImportDeclaration__Group__1__Impl rule__XImportDeclaration__Group__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4949:2: rule__XImportDeclaration__Group__1__Impl rule__XImportDeclaration__Group__2
             {
-            pushFollow(FOLLOW_rule__XImportDeclaration__Group__1__Impl_in_rule__XImportDeclaration__Group__110952);
+            pushFollow(FOLLOW_rule__XImportDeclaration__Group__1__Impl_in_rule__XImportDeclaration__Group__110766);
             rule__XImportDeclaration__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XImportDeclaration__Group__2_in_rule__XImportDeclaration__Group__110955);
+            pushFollow(FOLLOW_rule__XImportDeclaration__Group__2_in_rule__XImportDeclaration__Group__110769);
             rule__XImportDeclaration__Group__2();
 
             state._fsp--;
@@ -16315,25 +16052,25 @@ public final void rule__XImportDeclaration__Group__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XImportDeclaration__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5050:1: rule__XImportDeclaration__Group__1__Impl : ( ( rule__XImportDeclaration__Alternatives_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4956:1: rule__XImportDeclaration__Group__1__Impl : ( ( rule__XImportDeclaration__Alternatives_1 ) ) ;
     public final void rule__XImportDeclaration__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5054:1: ( ( ( rule__XImportDeclaration__Alternatives_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5055:1: ( ( rule__XImportDeclaration__Alternatives_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4960:1: ( ( ( rule__XImportDeclaration__Alternatives_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4961:1: ( ( rule__XImportDeclaration__Alternatives_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5055:1: ( ( rule__XImportDeclaration__Alternatives_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5056:1: ( rule__XImportDeclaration__Alternatives_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4961:1: ( ( rule__XImportDeclaration__Alternatives_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4962:1: ( rule__XImportDeclaration__Alternatives_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getAlternatives_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5057:1: ( rule__XImportDeclaration__Alternatives_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5057:2: rule__XImportDeclaration__Alternatives_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4963:1: ( rule__XImportDeclaration__Alternatives_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4963:2: rule__XImportDeclaration__Alternatives_1
             {
-            pushFollow(FOLLOW_rule__XImportDeclaration__Alternatives_1_in_rule__XImportDeclaration__Group__1__Impl10982);
+            pushFollow(FOLLOW_rule__XImportDeclaration__Alternatives_1_in_rule__XImportDeclaration__Group__1__Impl10796);
             rule__XImportDeclaration__Alternatives_1();
 
             state._fsp--;
@@ -16366,16 +16103,16 @@ public final void rule__XImportDeclaration__Group__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XImportDeclaration__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5067:1: rule__XImportDeclaration__Group__2 : rule__XImportDeclaration__Group__2__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4973:1: rule__XImportDeclaration__Group__2 : rule__XImportDeclaration__Group__2__Impl ;
     public final void rule__XImportDeclaration__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5071:1: ( rule__XImportDeclaration__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5072:2: rule__XImportDeclaration__Group__2__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4977:1: ( rule__XImportDeclaration__Group__2__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4978:2: rule__XImportDeclaration__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__XImportDeclaration__Group__2__Impl_in_rule__XImportDeclaration__Group__211012);
+            pushFollow(FOLLOW_rule__XImportDeclaration__Group__2__Impl_in_rule__XImportDeclaration__Group__210826);
             rule__XImportDeclaration__Group__2__Impl();
 
             state._fsp--;
@@ -16399,33 +16136,33 @@ public final void rule__XImportDeclaration__Group__2() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XImportDeclaration__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5078:1: rule__XImportDeclaration__Group__2__Impl : ( ( ';' )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4984:1: rule__XImportDeclaration__Group__2__Impl : ( ( ';' )? ) ;
     public final void rule__XImportDeclaration__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5082:1: ( ( ( ';' )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5083:1: ( ( ';' )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4988:1: ( ( ( ';' )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4989:1: ( ( ';' )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5083:1: ( ( ';' )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5084:1: ( ';' )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4989:1: ( ( ';' )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4990:1: ( ';' )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getSemicolonKeyword_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5085:1: ( ';' )?
-            int alt57=2;
-            int LA57_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4991:1: ( ';' )?
+            int alt56=2;
+            int LA56_0 = input.LA(1);
 
-            if ( (LA57_0==71) ) {
-                alt57=1;
+            if ( (LA56_0==71) ) {
+                alt56=1;
             }
-            switch (alt57) {
+            switch (alt56) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5086:2: ';'
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4992:2: ';'
                     {
-                    match(input,71,FOLLOW_71_in_rule__XImportDeclaration__Group__2__Impl11041); if (state.failed) return ;
+                    match(input,71,FOLLOW_71_in_rule__XImportDeclaration__Group__2__Impl10855); if (state.failed) return ;
 
                     }
                     break;
@@ -16457,21 +16194,21 @@ public final void rule__XImportDeclaration__Group__2__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__Category__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5103:1: rule__Category__Group__0 : rule__Category__Group__0__Impl rule__Category__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5009:1: rule__Category__Group__0 : rule__Category__Group__0__Impl rule__Category__Group__1 ;
     public final void rule__Category__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5107:1: ( rule__Category__Group__0__Impl rule__Category__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5108:2: rule__Category__Group__0__Impl rule__Category__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5013:1: ( rule__Category__Group__0__Impl rule__Category__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5014:2: rule__Category__Group__0__Impl rule__Category__Group__1
             {
-            pushFollow(FOLLOW_rule__Category__Group__0__Impl_in_rule__Category__Group__011080);
+            pushFollow(FOLLOW_rule__Category__Group__0__Impl_in_rule__Category__Group__010894);
             rule__Category__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Category__Group__1_in_rule__Category__Group__011083);
+            pushFollow(FOLLOW_rule__Category__Group__1_in_rule__Category__Group__010897);
             rule__Category__Group__1();
 
             state._fsp--;
@@ -16495,22 +16232,22 @@ public final void rule__Category__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5115:1: rule__Category__Group__0__Impl : ( 'category' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5021:1: rule__Category__Group__0__Impl : ( 'category' ) ;
     public final void rule__Category__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5119:1: ( ( 'category' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5120:1: ( 'category' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5025:1: ( ( 'category' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5026:1: ( 'category' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5120:1: ( 'category' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5121:1: 'category'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5026:1: ( 'category' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5027:1: 'category'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCategoryAccess().getCategoryKeyword_0()); 
             }
-            match(input,23,FOLLOW_23_in_rule__Category__Group__0__Impl11111); if (state.failed) return ;
+            match(input,23,FOLLOW_23_in_rule__Category__Group__0__Impl10925); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCategoryAccess().getCategoryKeyword_0()); 
             }
@@ -16536,21 +16273,21 @@ public final void rule__Category__Group__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5134:1: rule__Category__Group__1 : rule__Category__Group__1__Impl rule__Category__Group__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5040:1: rule__Category__Group__1 : rule__Category__Group__1__Impl rule__Category__Group__2 ;
     public final void rule__Category__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5138:1: ( rule__Category__Group__1__Impl rule__Category__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5139:2: rule__Category__Group__1__Impl rule__Category__Group__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5044:1: ( rule__Category__Group__1__Impl rule__Category__Group__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5045:2: rule__Category__Group__1__Impl rule__Category__Group__2
             {
-            pushFollow(FOLLOW_rule__Category__Group__1__Impl_in_rule__Category__Group__111142);
+            pushFollow(FOLLOW_rule__Category__Group__1__Impl_in_rule__Category__Group__110956);
             rule__Category__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Category__Group__2_in_rule__Category__Group__111145);
+            pushFollow(FOLLOW_rule__Category__Group__2_in_rule__Category__Group__110959);
             rule__Category__Group__2();
 
             state._fsp--;
@@ -16574,33 +16311,33 @@ public final void rule__Category__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5146:1: rule__Category__Group__1__Impl : ( ( rule__Category__IdAssignment_1 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5052:1: rule__Category__Group__1__Impl : ( ( rule__Category__IdAssignment_1 )? ) ;
     public final void rule__Category__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5150:1: ( ( ( rule__Category__IdAssignment_1 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5151:1: ( ( rule__Category__IdAssignment_1 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5056:1: ( ( ( rule__Category__IdAssignment_1 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5057:1: ( ( rule__Category__IdAssignment_1 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5151:1: ( ( rule__Category__IdAssignment_1 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5152:1: ( rule__Category__IdAssignment_1 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5057:1: ( ( rule__Category__IdAssignment_1 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5058:1: ( rule__Category__IdAssignment_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCategoryAccess().getIdAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5153:1: ( rule__Category__IdAssignment_1 )?
-            int alt58=2;
-            int LA58_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5059:1: ( rule__Category__IdAssignment_1 )?
+            int alt57=2;
+            int LA57_0 = input.LA(1);
 
-            if ( (LA58_0==RULE_ID) ) {
-                alt58=1;
+            if ( (LA57_0==RULE_ID) ) {
+                alt57=1;
             }
-            switch (alt58) {
+            switch (alt57) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5153:2: rule__Category__IdAssignment_1
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5059:2: rule__Category__IdAssignment_1
                     {
-                    pushFollow(FOLLOW_rule__Category__IdAssignment_1_in_rule__Category__Group__1__Impl11172);
+                    pushFollow(FOLLOW_rule__Category__IdAssignment_1_in_rule__Category__Group__1__Impl10986);
                     rule__Category__IdAssignment_1();
 
                     state._fsp--;
@@ -16636,21 +16373,21 @@ public final void rule__Category__Group__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5163:1: rule__Category__Group__2 : rule__Category__Group__2__Impl rule__Category__Group__3 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5069:1: rule__Category__Group__2 : rule__Category__Group__2__Impl rule__Category__Group__3 ;
     public final void rule__Category__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5167:1: ( rule__Category__Group__2__Impl rule__Category__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5168:2: rule__Category__Group__2__Impl rule__Category__Group__3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5073:1: ( rule__Category__Group__2__Impl rule__Category__Group__3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5074:2: rule__Category__Group__2__Impl rule__Category__Group__3
             {
-            pushFollow(FOLLOW_rule__Category__Group__2__Impl_in_rule__Category__Group__211203);
+            pushFollow(FOLLOW_rule__Category__Group__2__Impl_in_rule__Category__Group__211017);
             rule__Category__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Category__Group__3_in_rule__Category__Group__211206);
+            pushFollow(FOLLOW_rule__Category__Group__3_in_rule__Category__Group__211020);
             rule__Category__Group__3();
 
             state._fsp--;
@@ -16674,25 +16411,25 @@ public final void rule__Category__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5175:1: rule__Category__Group__2__Impl : ( ( rule__Category__LabelAssignment_2 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5081:1: rule__Category__Group__2__Impl : ( ( rule__Category__LabelAssignment_2 ) ) ;
     public final void rule__Category__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5179:1: ( ( ( rule__Category__LabelAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5180:1: ( ( rule__Category__LabelAssignment_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5085:1: ( ( ( rule__Category__LabelAssignment_2 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5086:1: ( ( rule__Category__LabelAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5180:1: ( ( rule__Category__LabelAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5181:1: ( rule__Category__LabelAssignment_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5086:1: ( ( rule__Category__LabelAssignment_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5087:1: ( rule__Category__LabelAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCategoryAccess().getLabelAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5182:1: ( rule__Category__LabelAssignment_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5182:2: rule__Category__LabelAssignment_2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5088:1: ( rule__Category__LabelAssignment_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5088:2: rule__Category__LabelAssignment_2
             {
-            pushFollow(FOLLOW_rule__Category__LabelAssignment_2_in_rule__Category__Group__2__Impl11233);
+            pushFollow(FOLLOW_rule__Category__LabelAssignment_2_in_rule__Category__Group__2__Impl11047);
             rule__Category__LabelAssignment_2();
 
             state._fsp--;
@@ -16725,21 +16462,21 @@ public final void rule__Category__Group__2__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5192:1: rule__Category__Group__3 : rule__Category__Group__3__Impl rule__Category__Group__4 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5098:1: rule__Category__Group__3 : rule__Category__Group__3__Impl rule__Category__Group__4 ;
     public final void rule__Category__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5196:1: ( rule__Category__Group__3__Impl rule__Category__Group__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5197:2: rule__Category__Group__3__Impl rule__Category__Group__4
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5102:1: ( rule__Category__Group__3__Impl rule__Category__Group__4 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5103:2: rule__Category__Group__3__Impl rule__Category__Group__4
             {
-            pushFollow(FOLLOW_rule__Category__Group__3__Impl_in_rule__Category__Group__311263);
+            pushFollow(FOLLOW_rule__Category__Group__3__Impl_in_rule__Category__Group__311077);
             rule__Category__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Category__Group__4_in_rule__Category__Group__311266);
+            pushFollow(FOLLOW_rule__Category__Group__4_in_rule__Category__Group__311080);
             rule__Category__Group__4();
 
             state._fsp--;
@@ -16763,22 +16500,22 @@ public final void rule__Category__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5204:1: rule__Category__Group__3__Impl : ( '{' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5110:1: rule__Category__Group__3__Impl : ( '{' ) ;
     public final void rule__Category__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5208:1: ( ( '{' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5209:1: ( '{' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5114:1: ( ( '{' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5115:1: ( '{' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5209:1: ( '{' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5210:1: '{'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5115:1: ( '{' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5116:1: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCategoryAccess().getLeftCurlyBracketKeyword_3()); 
             }
-            match(input,68,FOLLOW_68_in_rule__Category__Group__3__Impl11294); if (state.failed) return ;
+            match(input,68,FOLLOW_68_in_rule__Category__Group__3__Impl11108); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCategoryAccess().getLeftCurlyBracketKeyword_3()); 
             }
@@ -16804,21 +16541,21 @@ public final void rule__Category__Group__3__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__Group__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5223:1: rule__Category__Group__4 : rule__Category__Group__4__Impl rule__Category__Group__5 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5129:1: rule__Category__Group__4 : rule__Category__Group__4__Impl rule__Category__Group__5 ;
     public final void rule__Category__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5227:1: ( rule__Category__Group__4__Impl rule__Category__Group__5 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5228:2: rule__Category__Group__4__Impl rule__Category__Group__5
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5133:1: ( rule__Category__Group__4__Impl rule__Category__Group__5 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5134:2: rule__Category__Group__4__Impl rule__Category__Group__5
             {
-            pushFollow(FOLLOW_rule__Category__Group__4__Impl_in_rule__Category__Group__411325);
+            pushFollow(FOLLOW_rule__Category__Group__4__Impl_in_rule__Category__Group__411139);
             rule__Category__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Category__Group__5_in_rule__Category__Group__411328);
+            pushFollow(FOLLOW_rule__Category__Group__5_in_rule__Category__Group__411142);
             rule__Category__Group__5();
 
             state._fsp--;
@@ -16842,37 +16579,37 @@ public final void rule__Category__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5235:1: rule__Category__Group__4__Impl : ( ( rule__Category__ChecksAssignment_4 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5141:1: rule__Category__Group__4__Impl : ( ( rule__Category__ChecksAssignment_4 )* ) ;
     public final void rule__Category__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5239:1: ( ( ( rule__Category__ChecksAssignment_4 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5240:1: ( ( rule__Category__ChecksAssignment_4 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5145:1: ( ( ( rule__Category__ChecksAssignment_4 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5146:1: ( ( rule__Category__ChecksAssignment_4 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5240:1: ( ( rule__Category__ChecksAssignment_4 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5241:1: ( rule__Category__ChecksAssignment_4 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5146:1: ( ( rule__Category__ChecksAssignment_4 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5147:1: ( rule__Category__ChecksAssignment_4 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCategoryAccess().getChecksAssignment_4()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5242:1: ( rule__Category__ChecksAssignment_4 )*
-            loop59:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5148:1: ( rule__Category__ChecksAssignment_4 )*
+            loop58:
             do {
-                int alt59=2;
-                int LA59_0 = input.LA(1);
+                int alt58=2;
+                int LA58_0 = input.LA(1);
 
-                if ( ((LA59_0>=29 && LA59_0<=35)||LA59_0==75||LA59_0==103) ) {
-                    alt59=1;
+                if ( ((LA58_0>=29 && LA58_0<=35)||LA58_0==75||LA58_0==103) ) {
+                    alt58=1;
                 }
 
 
-                switch (alt59) {
+                switch (alt58) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5242:2: rule__Category__ChecksAssignment_4
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5148:2: rule__Category__ChecksAssignment_4
             	    {
-            	    pushFollow(FOLLOW_rule__Category__ChecksAssignment_4_in_rule__Category__Group__4__Impl11355);
+            	    pushFollow(FOLLOW_rule__Category__ChecksAssignment_4_in_rule__Category__Group__4__Impl11169);
             	    rule__Category__ChecksAssignment_4();
 
             	    state._fsp--;
@@ -16882,7 +16619,7 @@ public final void rule__Category__Group__4__Impl() throws RecognitionException {
             	    break;
 
             	default :
-            	    break loop59;
+            	    break loop58;
                 }
             } while (true);
 
@@ -16911,16 +16648,16 @@ public final void rule__Category__Group__4__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__Group__5"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5252:1: rule__Category__Group__5 : rule__Category__Group__5__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5158:1: rule__Category__Group__5 : rule__Category__Group__5__Impl ;
     public final void rule__Category__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5256:1: ( rule__Category__Group__5__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5257:2: rule__Category__Group__5__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5162:1: ( rule__Category__Group__5__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5163:2: rule__Category__Group__5__Impl
             {
-            pushFollow(FOLLOW_rule__Category__Group__5__Impl_in_rule__Category__Group__511386);
+            pushFollow(FOLLOW_rule__Category__Group__5__Impl_in_rule__Category__Group__511200);
             rule__Category__Group__5__Impl();
 
             state._fsp--;
@@ -16944,22 +16681,22 @@ public final void rule__Category__Group__5() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5263:1: rule__Category__Group__5__Impl : ( '}' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5169:1: rule__Category__Group__5__Impl : ( '}' ) ;
     public final void rule__Category__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5267:1: ( ( '}' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5268:1: ( '}' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5173:1: ( ( '}' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5174:1: ( '}' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5268:1: ( '}' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5269:1: '}'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5174:1: ( '}' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5175:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCategoryAccess().getRightCurlyBracketKeyword_5()); 
             }
-            match(input,69,FOLLOW_69_in_rule__Category__Group__5__Impl11414); if (state.failed) return ;
+            match(input,69,FOLLOW_69_in_rule__Category__Group__5__Impl11228); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCategoryAccess().getRightCurlyBracketKeyword_5()); 
             }
@@ -16985,21 +16722,21 @@ public final void rule__Category__Group__5__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5294:1: rule__Check__Group__0 : rule__Check__Group__0__Impl rule__Check__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5200:1: rule__Check__Group__0 : rule__Check__Group__0__Impl rule__Check__Group__1 ;
     public final void rule__Check__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5298:1: ( rule__Check__Group__0__Impl rule__Check__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5299:2: rule__Check__Group__0__Impl rule__Check__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5204:1: ( rule__Check__Group__0__Impl rule__Check__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5205:2: rule__Check__Group__0__Impl rule__Check__Group__1
             {
-            pushFollow(FOLLOW_rule__Check__Group__0__Impl_in_rule__Check__Group__011457);
+            pushFollow(FOLLOW_rule__Check__Group__0__Impl_in_rule__Check__Group__011271);
             rule__Check__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Check__Group__1_in_rule__Check__Group__011460);
+            pushFollow(FOLLOW_rule__Check__Group__1_in_rule__Check__Group__011274);
             rule__Check__Group__1();
 
             state._fsp--;
@@ -17023,33 +16760,33 @@ public final void rule__Check__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5306:1: rule__Check__Group__0__Impl : ( ( rule__Check__SeverityRangeAssignment_0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5212:1: rule__Check__Group__0__Impl : ( ( rule__Check__SeverityRangeAssignment_0 )? ) ;
     public final void rule__Check__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5310:1: ( ( ( rule__Check__SeverityRangeAssignment_0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5311:1: ( ( rule__Check__SeverityRangeAssignment_0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5216:1: ( ( ( rule__Check__SeverityRangeAssignment_0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5217:1: ( ( rule__Check__SeverityRangeAssignment_0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5311:1: ( ( rule__Check__SeverityRangeAssignment_0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5312:1: ( rule__Check__SeverityRangeAssignment_0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5217:1: ( ( rule__Check__SeverityRangeAssignment_0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5218:1: ( rule__Check__SeverityRangeAssignment_0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getSeverityRangeAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5313:1: ( rule__Check__SeverityRangeAssignment_0 )?
-            int alt60=2;
-            int LA60_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5219:1: ( rule__Check__SeverityRangeAssignment_0 )?
+            int alt59=2;
+            int LA59_0 = input.LA(1);
 
-            if ( (LA60_0==75) ) {
-                alt60=1;
+            if ( (LA59_0==75) ) {
+                alt59=1;
             }
-            switch (alt60) {
+            switch (alt59) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5313:2: rule__Check__SeverityRangeAssignment_0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5219:2: rule__Check__SeverityRangeAssignment_0
                     {
-                    pushFollow(FOLLOW_rule__Check__SeverityRangeAssignment_0_in_rule__Check__Group__0__Impl11487);
+                    pushFollow(FOLLOW_rule__Check__SeverityRangeAssignment_0_in_rule__Check__Group__0__Impl11301);
                     rule__Check__SeverityRangeAssignment_0();
 
                     state._fsp--;
@@ -17085,21 +16822,21 @@ public final void rule__Check__Group__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5323:1: rule__Check__Group__1 : rule__Check__Group__1__Impl rule__Check__Group__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5229:1: rule__Check__Group__1 : rule__Check__Group__1__Impl rule__Check__Group__2 ;
     public final void rule__Check__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5327:1: ( rule__Check__Group__1__Impl rule__Check__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5328:2: rule__Check__Group__1__Impl rule__Check__Group__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5233:1: ( rule__Check__Group__1__Impl rule__Check__Group__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5234:2: rule__Check__Group__1__Impl rule__Check__Group__2
             {
-            pushFollow(FOLLOW_rule__Check__Group__1__Impl_in_rule__Check__Group__111518);
+            pushFollow(FOLLOW_rule__Check__Group__1__Impl_in_rule__Check__Group__111332);
             rule__Check__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Check__Group__2_in_rule__Check__Group__111521);
+            pushFollow(FOLLOW_rule__Check__Group__2_in_rule__Check__Group__111335);
             rule__Check__Group__2();
 
             state._fsp--;
@@ -17123,33 +16860,33 @@ public final void rule__Check__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5335:1: rule__Check__Group__1__Impl : ( ( rule__Check__FinalAssignment_1 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5241:1: rule__Check__Group__1__Impl : ( ( rule__Check__FinalAssignment_1 )? ) ;
     public final void rule__Check__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5339:1: ( ( ( rule__Check__FinalAssignment_1 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5340:1: ( ( rule__Check__FinalAssignment_1 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5245:1: ( ( ( rule__Check__FinalAssignment_1 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5246:1: ( ( rule__Check__FinalAssignment_1 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5340:1: ( ( rule__Check__FinalAssignment_1 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5341:1: ( rule__Check__FinalAssignment_1 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5246:1: ( ( rule__Check__FinalAssignment_1 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5247:1: ( rule__Check__FinalAssignment_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getFinalAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5342:1: ( rule__Check__FinalAssignment_1 )?
-            int alt61=2;
-            int LA61_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5248:1: ( rule__Check__FinalAssignment_1 )?
+            int alt60=2;
+            int LA60_0 = input.LA(1);
 
-            if ( (LA61_0==103) ) {
-                alt61=1;
+            if ( (LA60_0==103) ) {
+                alt60=1;
             }
-            switch (alt61) {
+            switch (alt60) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5342:2: rule__Check__FinalAssignment_1
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5248:2: rule__Check__FinalAssignment_1
                     {
-                    pushFollow(FOLLOW_rule__Check__FinalAssignment_1_in_rule__Check__Group__1__Impl11548);
+                    pushFollow(FOLLOW_rule__Check__FinalAssignment_1_in_rule__Check__Group__1__Impl11362);
                     rule__Check__FinalAssignment_1();
 
                     state._fsp--;
@@ -17185,21 +16922,21 @@ public final void rule__Check__Group__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5352:1: rule__Check__Group__2 : rule__Check__Group__2__Impl rule__Check__Group__3 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5258:1: rule__Check__Group__2 : rule__Check__Group__2__Impl rule__Check__Group__3 ;
     public final void rule__Check__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5356:1: ( rule__Check__Group__2__Impl rule__Check__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5357:2: rule__Check__Group__2__Impl rule__Check__Group__3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5262:1: ( rule__Check__Group__2__Impl rule__Check__Group__3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5263:2: rule__Check__Group__2__Impl rule__Check__Group__3
             {
-            pushFollow(FOLLOW_rule__Check__Group__2__Impl_in_rule__Check__Group__211579);
+            pushFollow(FOLLOW_rule__Check__Group__2__Impl_in_rule__Check__Group__211393);
             rule__Check__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Check__Group__3_in_rule__Check__Group__211582);
+            pushFollow(FOLLOW_rule__Check__Group__3_in_rule__Check__Group__211396);
             rule__Check__Group__3();
 
             state._fsp--;
@@ -17223,33 +16960,33 @@ public final void rule__Check__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5364:1: rule__Check__Group__2__Impl : ( ( rule__Check__KindAssignment_2 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5270:1: rule__Check__Group__2__Impl : ( ( rule__Check__KindAssignment_2 )? ) ;
     public final void rule__Check__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5368:1: ( ( ( rule__Check__KindAssignment_2 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5369:1: ( ( rule__Check__KindAssignment_2 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5274:1: ( ( ( rule__Check__KindAssignment_2 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5275:1: ( ( rule__Check__KindAssignment_2 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5369:1: ( ( rule__Check__KindAssignment_2 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5370:1: ( rule__Check__KindAssignment_2 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5275:1: ( ( rule__Check__KindAssignment_2 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5276:1: ( rule__Check__KindAssignment_2 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getKindAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5371:1: ( rule__Check__KindAssignment_2 )?
-            int alt62=2;
-            int LA62_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5277:1: ( rule__Check__KindAssignment_2 )?
+            int alt61=2;
+            int LA61_0 = input.LA(1);
 
-            if ( ((LA62_0>=33 && LA62_0<=35)) ) {
-                alt62=1;
+            if ( ((LA61_0>=33 && LA61_0<=35)) ) {
+                alt61=1;
             }
-            switch (alt62) {
+            switch (alt61) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5371:2: rule__Check__KindAssignment_2
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5277:2: rule__Check__KindAssignment_2
                     {
-                    pushFollow(FOLLOW_rule__Check__KindAssignment_2_in_rule__Check__Group__2__Impl11609);
+                    pushFollow(FOLLOW_rule__Check__KindAssignment_2_in_rule__Check__Group__2__Impl11423);
                     rule__Check__KindAssignment_2();
 
                     state._fsp--;
@@ -17285,21 +17022,21 @@ public final void rule__Check__Group__2__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5381:1: rule__Check__Group__3 : rule__Check__Group__3__Impl rule__Check__Group__4 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5287:1: rule__Check__Group__3 : rule__Check__Group__3__Impl rule__Check__Group__4 ;
     public final void rule__Check__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5385:1: ( rule__Check__Group__3__Impl rule__Check__Group__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5386:2: rule__Check__Group__3__Impl rule__Check__Group__4
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5291:1: ( rule__Check__Group__3__Impl rule__Check__Group__4 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5292:2: rule__Check__Group__3__Impl rule__Check__Group__4
             {
-            pushFollow(FOLLOW_rule__Check__Group__3__Impl_in_rule__Check__Group__311640);
+            pushFollow(FOLLOW_rule__Check__Group__3__Impl_in_rule__Check__Group__311454);
             rule__Check__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Check__Group__4_in_rule__Check__Group__311643);
+            pushFollow(FOLLOW_rule__Check__Group__4_in_rule__Check__Group__311457);
             rule__Check__Group__4();
 
             state._fsp--;
@@ -17323,25 +17060,25 @@ public final void rule__Check__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5393:1: rule__Check__Group__3__Impl : ( ( rule__Check__DefaultSeverityAssignment_3 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5299:1: rule__Check__Group__3__Impl : ( ( rule__Check__DefaultSeverityAssignment_3 ) ) ;
     public final void rule__Check__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5397:1: ( ( ( rule__Check__DefaultSeverityAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5398:1: ( ( rule__Check__DefaultSeverityAssignment_3 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5303:1: ( ( ( rule__Check__DefaultSeverityAssignment_3 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5304:1: ( ( rule__Check__DefaultSeverityAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5398:1: ( ( rule__Check__DefaultSeverityAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5399:1: ( rule__Check__DefaultSeverityAssignment_3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5304:1: ( ( rule__Check__DefaultSeverityAssignment_3 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5305:1: ( rule__Check__DefaultSeverityAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getDefaultSeverityAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5400:1: ( rule__Check__DefaultSeverityAssignment_3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5400:2: rule__Check__DefaultSeverityAssignment_3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5306:1: ( rule__Check__DefaultSeverityAssignment_3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5306:2: rule__Check__DefaultSeverityAssignment_3
             {
-            pushFollow(FOLLOW_rule__Check__DefaultSeverityAssignment_3_in_rule__Check__Group__3__Impl11670);
+            pushFollow(FOLLOW_rule__Check__DefaultSeverityAssignment_3_in_rule__Check__Group__3__Impl11484);
             rule__Check__DefaultSeverityAssignment_3();
 
             state._fsp--;
@@ -17374,21 +17111,21 @@ public final void rule__Check__Group__3__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5410:1: rule__Check__Group__4 : rule__Check__Group__4__Impl rule__Check__Group__5 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5316:1: rule__Check__Group__4 : rule__Check__Group__4__Impl rule__Check__Group__5 ;
     public final void rule__Check__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5414:1: ( rule__Check__Group__4__Impl rule__Check__Group__5 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5415:2: rule__Check__Group__4__Impl rule__Check__Group__5
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5320:1: ( rule__Check__Group__4__Impl rule__Check__Group__5 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5321:2: rule__Check__Group__4__Impl rule__Check__Group__5
             {
-            pushFollow(FOLLOW_rule__Check__Group__4__Impl_in_rule__Check__Group__411700);
+            pushFollow(FOLLOW_rule__Check__Group__4__Impl_in_rule__Check__Group__411514);
             rule__Check__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Check__Group__5_in_rule__Check__Group__411703);
+            pushFollow(FOLLOW_rule__Check__Group__5_in_rule__Check__Group__411517);
             rule__Check__Group__5();
 
             state._fsp--;
@@ -17412,33 +17149,33 @@ public final void rule__Check__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5422:1: rule__Check__Group__4__Impl : ( ( rule__Check__IdAssignment_4 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5328:1: rule__Check__Group__4__Impl : ( ( rule__Check__IdAssignment_4 )? ) ;
     public final void rule__Check__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5426:1: ( ( ( rule__Check__IdAssignment_4 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5427:1: ( ( rule__Check__IdAssignment_4 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5332:1: ( ( ( rule__Check__IdAssignment_4 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5333:1: ( ( rule__Check__IdAssignment_4 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5427:1: ( ( rule__Check__IdAssignment_4 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5428:1: ( rule__Check__IdAssignment_4 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5333:1: ( ( rule__Check__IdAssignment_4 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5334:1: ( rule__Check__IdAssignment_4 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getIdAssignment_4()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5429:1: ( rule__Check__IdAssignment_4 )?
-            int alt63=2;
-            int LA63_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5335:1: ( rule__Check__IdAssignment_4 )?
+            int alt62=2;
+            int LA62_0 = input.LA(1);
 
-            if ( (LA63_0==RULE_ID) ) {
-                alt63=1;
+            if ( (LA62_0==RULE_ID) ) {
+                alt62=1;
             }
-            switch (alt63) {
+            switch (alt62) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5429:2: rule__Check__IdAssignment_4
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5335:2: rule__Check__IdAssignment_4
                     {
-                    pushFollow(FOLLOW_rule__Check__IdAssignment_4_in_rule__Check__Group__4__Impl11730);
+                    pushFollow(FOLLOW_rule__Check__IdAssignment_4_in_rule__Check__Group__4__Impl11544);
                     rule__Check__IdAssignment_4();
 
                     state._fsp--;
@@ -17474,21 +17211,21 @@ public final void rule__Check__Group__4__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group__5"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5439:1: rule__Check__Group__5 : rule__Check__Group__5__Impl rule__Check__Group__6 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5345:1: rule__Check__Group__5 : rule__Check__Group__5__Impl rule__Check__Group__6 ;
     public final void rule__Check__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5443:1: ( rule__Check__Group__5__Impl rule__Check__Group__6 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5444:2: rule__Check__Group__5__Impl rule__Check__Group__6
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5349:1: ( rule__Check__Group__5__Impl rule__Check__Group__6 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5350:2: rule__Check__Group__5__Impl rule__Check__Group__6
             {
-            pushFollow(FOLLOW_rule__Check__Group__5__Impl_in_rule__Check__Group__511761);
+            pushFollow(FOLLOW_rule__Check__Group__5__Impl_in_rule__Check__Group__511575);
             rule__Check__Group__5__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Check__Group__6_in_rule__Check__Group__511764);
+            pushFollow(FOLLOW_rule__Check__Group__6_in_rule__Check__Group__511578);
             rule__Check__Group__6();
 
             state._fsp--;
@@ -17512,25 +17249,25 @@ public final void rule__Check__Group__5() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5451:1: rule__Check__Group__5__Impl : ( ( rule__Check__LabelAssignment_5 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5357:1: rule__Check__Group__5__Impl : ( ( rule__Check__LabelAssignment_5 ) ) ;
     public final void rule__Check__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5455:1: ( ( ( rule__Check__LabelAssignment_5 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5456:1: ( ( rule__Check__LabelAssignment_5 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5361:1: ( ( ( rule__Check__LabelAssignment_5 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5362:1: ( ( rule__Check__LabelAssignment_5 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5456:1: ( ( rule__Check__LabelAssignment_5 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5457:1: ( rule__Check__LabelAssignment_5 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5362:1: ( ( rule__Check__LabelAssignment_5 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5363:1: ( rule__Check__LabelAssignment_5 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getLabelAssignment_5()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5458:1: ( rule__Check__LabelAssignment_5 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5458:2: rule__Check__LabelAssignment_5
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5364:1: ( rule__Check__LabelAssignment_5 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5364:2: rule__Check__LabelAssignment_5
             {
-            pushFollow(FOLLOW_rule__Check__LabelAssignment_5_in_rule__Check__Group__5__Impl11791);
+            pushFollow(FOLLOW_rule__Check__LabelAssignment_5_in_rule__Check__Group__5__Impl11605);
             rule__Check__LabelAssignment_5();
 
             state._fsp--;
@@ -17563,21 +17300,21 @@ public final void rule__Check__Group__5__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group__6"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5468:1: rule__Check__Group__6 : rule__Check__Group__6__Impl rule__Check__Group__7 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5374:1: rule__Check__Group__6 : rule__Check__Group__6__Impl rule__Check__Group__7 ;
     public final void rule__Check__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5472:1: ( rule__Check__Group__6__Impl rule__Check__Group__7 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5473:2: rule__Check__Group__6__Impl rule__Check__Group__7
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5378:1: ( rule__Check__Group__6__Impl rule__Check__Group__7 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5379:2: rule__Check__Group__6__Impl rule__Check__Group__7
             {
-            pushFollow(FOLLOW_rule__Check__Group__6__Impl_in_rule__Check__Group__611821);
+            pushFollow(FOLLOW_rule__Check__Group__6__Impl_in_rule__Check__Group__611635);
             rule__Check__Group__6__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Check__Group__7_in_rule__Check__Group__611824);
+            pushFollow(FOLLOW_rule__Check__Group__7_in_rule__Check__Group__611638);
             rule__Check__Group__7();
 
             state._fsp--;
@@ -17601,29 +17338,29 @@ public final void rule__Check__Group__6() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group__6__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5480:1: rule__Check__Group__6__Impl : ( ( rule__Check__Group_6__0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5386:1: rule__Check__Group__6__Impl : ( ( rule__Check__Group_6__0 )? ) ;
     public final void rule__Check__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5484:1: ( ( ( rule__Check__Group_6__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5485:1: ( ( rule__Check__Group_6__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5390:1: ( ( ( rule__Check__Group_6__0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5391:1: ( ( rule__Check__Group_6__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5485:1: ( ( rule__Check__Group_6__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5486:1: ( rule__Check__Group_6__0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5391:1: ( ( rule__Check__Group_6__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5392:1: ( rule__Check__Group_6__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getGroup_6()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5487:1: ( rule__Check__Group_6__0 )?
-            int alt64=2;
-            alt64 = dfa64.predict(input);
-            switch (alt64) {
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5393:1: ( rule__Check__Group_6__0 )?
+            int alt63=2;
+            alt63 = dfa63.predict(input);
+            switch (alt63) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5487:2: rule__Check__Group_6__0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5393:2: rule__Check__Group_6__0
                     {
-                    pushFollow(FOLLOW_rule__Check__Group_6__0_in_rule__Check__Group__6__Impl11851);
+                    pushFollow(FOLLOW_rule__Check__Group_6__0_in_rule__Check__Group__6__Impl11665);
                     rule__Check__Group_6__0();
 
                     state._fsp--;
@@ -17659,21 +17396,21 @@ public final void rule__Check__Group__6__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group__7"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5497:1: rule__Check__Group__7 : rule__Check__Group__7__Impl rule__Check__Group__8 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5403:1: rule__Check__Group__7 : rule__Check__Group__7__Impl rule__Check__Group__8 ;
     public final void rule__Check__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5501:1: ( rule__Check__Group__7__Impl rule__Check__Group__8 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5502:2: rule__Check__Group__7__Impl rule__Check__Group__8
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5407:1: ( rule__Check__Group__7__Impl rule__Check__Group__8 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5408:2: rule__Check__Group__7__Impl rule__Check__Group__8
             {
-            pushFollow(FOLLOW_rule__Check__Group__7__Impl_in_rule__Check__Group__711882);
+            pushFollow(FOLLOW_rule__Check__Group__7__Impl_in_rule__Check__Group__711696);
             rule__Check__Group__7__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Check__Group__8_in_rule__Check__Group__711885);
+            pushFollow(FOLLOW_rule__Check__Group__8_in_rule__Check__Group__711699);
             rule__Check__Group__8();
 
             state._fsp--;
@@ -17697,33 +17434,33 @@ public final void rule__Check__Group__7() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group__7__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5509:1: rule__Check__Group__7__Impl : ( ( rule__Check__Group_7__0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5415:1: rule__Check__Group__7__Impl : ( ( rule__Check__Group_7__0 )? ) ;
     public final void rule__Check__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5513:1: ( ( ( rule__Check__Group_7__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5514:1: ( ( rule__Check__Group_7__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5419:1: ( ( ( rule__Check__Group_7__0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5420:1: ( ( rule__Check__Group_7__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5514:1: ( ( rule__Check__Group_7__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5515:1: ( rule__Check__Group_7__0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5420:1: ( ( rule__Check__Group_7__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5421:1: ( rule__Check__Group_7__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getGroup_7()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5516:1: ( rule__Check__Group_7__0 )?
-            int alt65=2;
-            int LA65_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5422:1: ( rule__Check__Group_7__0 )?
+            int alt64=2;
+            int LA64_0 = input.LA(1);
 
-            if ( (LA65_0==24) ) {
-                alt65=1;
+            if ( (LA64_0==24) ) {
+                alt64=1;
             }
-            switch (alt65) {
+            switch (alt64) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5516:2: rule__Check__Group_7__0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5422:2: rule__Check__Group_7__0
                     {
-                    pushFollow(FOLLOW_rule__Check__Group_7__0_in_rule__Check__Group__7__Impl11912);
+                    pushFollow(FOLLOW_rule__Check__Group_7__0_in_rule__Check__Group__7__Impl11726);
                     rule__Check__Group_7__0();
 
                     state._fsp--;
@@ -17759,16 +17496,16 @@ public final void rule__Check__Group__7__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group__8"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5526:1: rule__Check__Group__8 : rule__Check__Group__8__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5432:1: rule__Check__Group__8 : rule__Check__Group__8__Impl ;
     public final void rule__Check__Group__8() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5530:1: ( rule__Check__Group__8__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5531:2: rule__Check__Group__8__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5436:1: ( rule__Check__Group__8__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5437:2: rule__Check__Group__8__Impl
             {
-            pushFollow(FOLLOW_rule__Check__Group__8__Impl_in_rule__Check__Group__811943);
+            pushFollow(FOLLOW_rule__Check__Group__8__Impl_in_rule__Check__Group__811757);
             rule__Check__Group__8__Impl();
 
             state._fsp--;
@@ -17792,25 +17529,25 @@ public final void rule__Check__Group__8() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group__8__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5537:1: rule__Check__Group__8__Impl : ( ( rule__Check__Alternatives_8 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5443:1: rule__Check__Group__8__Impl : ( ( rule__Check__Alternatives_8 ) ) ;
     public final void rule__Check__Group__8__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5541:1: ( ( ( rule__Check__Alternatives_8 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5542:1: ( ( rule__Check__Alternatives_8 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5447:1: ( ( ( rule__Check__Alternatives_8 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5448:1: ( ( rule__Check__Alternatives_8 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5542:1: ( ( rule__Check__Alternatives_8 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5543:1: ( rule__Check__Alternatives_8 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5448:1: ( ( rule__Check__Alternatives_8 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5449:1: ( rule__Check__Alternatives_8 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getAlternatives_8()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5544:1: ( rule__Check__Alternatives_8 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5544:2: rule__Check__Alternatives_8
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5450:1: ( rule__Check__Alternatives_8 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5450:2: rule__Check__Alternatives_8
             {
-            pushFollow(FOLLOW_rule__Check__Alternatives_8_in_rule__Check__Group__8__Impl11970);
+            pushFollow(FOLLOW_rule__Check__Alternatives_8_in_rule__Check__Group__8__Impl11784);
             rule__Check__Alternatives_8();
 
             state._fsp--;
@@ -17843,21 +17580,21 @@ public final void rule__Check__Group__8__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group_6__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5572:1: rule__Check__Group_6__0 : rule__Check__Group_6__0__Impl rule__Check__Group_6__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5478:1: rule__Check__Group_6__0 : rule__Check__Group_6__0__Impl rule__Check__Group_6__1 ;
     public final void rule__Check__Group_6__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5576:1: ( rule__Check__Group_6__0__Impl rule__Check__Group_6__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5577:2: rule__Check__Group_6__0__Impl rule__Check__Group_6__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5482:1: ( rule__Check__Group_6__0__Impl rule__Check__Group_6__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5483:2: rule__Check__Group_6__0__Impl rule__Check__Group_6__1
             {
-            pushFollow(FOLLOW_rule__Check__Group_6__0__Impl_in_rule__Check__Group_6__012018);
+            pushFollow(FOLLOW_rule__Check__Group_6__0__Impl_in_rule__Check__Group_6__011832);
             rule__Check__Group_6__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Check__Group_6__1_in_rule__Check__Group_6__012021);
+            pushFollow(FOLLOW_rule__Check__Group_6__1_in_rule__Check__Group_6__011835);
             rule__Check__Group_6__1();
 
             state._fsp--;
@@ -17881,25 +17618,25 @@ public final void rule__Check__Group_6__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group_6__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5584:1: rule__Check__Group_6__0__Impl : ( ( '(' ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5490:1: rule__Check__Group_6__0__Impl : ( ( '(' ) ) ;
     public final void rule__Check__Group_6__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5588:1: ( ( ( '(' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5589:1: ( ( '(' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5494:1: ( ( ( '(' ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5495:1: ( ( '(' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5589:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5590:1: ( '(' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5495:1: ( ( '(' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5496:1: ( '(' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getLeftParenthesisKeyword_6_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5591:1: ( '(' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5592:2: '('
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5497:1: ( '(' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5498:2: '('
             {
-            match(input,72,FOLLOW_72_in_rule__Check__Group_6__0__Impl12050); if (state.failed) return ;
+            match(input,72,FOLLOW_72_in_rule__Check__Group_6__0__Impl11864); if (state.failed) return ;
 
             }
 
@@ -17928,21 +17665,21 @@ public final void rule__Check__Group_6__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group_6__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5603:1: rule__Check__Group_6__1 : rule__Check__Group_6__1__Impl rule__Check__Group_6__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5509:1: rule__Check__Group_6__1 : rule__Check__Group_6__1__Impl rule__Check__Group_6__2 ;
     public final void rule__Check__Group_6__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5607:1: ( rule__Check__Group_6__1__Impl rule__Check__Group_6__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5608:2: rule__Check__Group_6__1__Impl rule__Check__Group_6__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5513:1: ( rule__Check__Group_6__1__Impl rule__Check__Group_6__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5514:2: rule__Check__Group_6__1__Impl rule__Check__Group_6__2
             {
-            pushFollow(FOLLOW_rule__Check__Group_6__1__Impl_in_rule__Check__Group_6__112082);
+            pushFollow(FOLLOW_rule__Check__Group_6__1__Impl_in_rule__Check__Group_6__111896);
             rule__Check__Group_6__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Check__Group_6__2_in_rule__Check__Group_6__112085);
+            pushFollow(FOLLOW_rule__Check__Group_6__2_in_rule__Check__Group_6__111899);
             rule__Check__Group_6__2();
 
             state._fsp--;
@@ -17966,33 +17703,33 @@ public final void rule__Check__Group_6__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group_6__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5615:1: rule__Check__Group_6__1__Impl : ( ( rule__Check__Group_6_1__0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5521:1: rule__Check__Group_6__1__Impl : ( ( rule__Check__Group_6_1__0 )? ) ;
     public final void rule__Check__Group_6__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5619:1: ( ( ( rule__Check__Group_6_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5620:1: ( ( rule__Check__Group_6_1__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5525:1: ( ( ( rule__Check__Group_6_1__0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5526:1: ( ( rule__Check__Group_6_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5620:1: ( ( rule__Check__Group_6_1__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5621:1: ( rule__Check__Group_6_1__0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5526:1: ( ( rule__Check__Group_6_1__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5527:1: ( rule__Check__Group_6_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getGroup_6_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5622:1: ( rule__Check__Group_6_1__0 )?
-            int alt66=2;
-            int LA66_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5528:1: ( rule__Check__Group_6_1__0 )?
+            int alt65=2;
+            int LA65_0 = input.LA(1);
 
-            if ( (LA66_0==RULE_ID) ) {
-                alt66=1;
+            if ( (LA65_0==RULE_ID) ) {
+                alt65=1;
             }
-            switch (alt66) {
+            switch (alt65) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5622:2: rule__Check__Group_6_1__0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5528:2: rule__Check__Group_6_1__0
                     {
-                    pushFollow(FOLLOW_rule__Check__Group_6_1__0_in_rule__Check__Group_6__1__Impl12112);
+                    pushFollow(FOLLOW_rule__Check__Group_6_1__0_in_rule__Check__Group_6__1__Impl11926);
                     rule__Check__Group_6_1__0();
 
                     state._fsp--;
@@ -18028,16 +17765,16 @@ public final void rule__Check__Group_6__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group_6__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5632:1: rule__Check__Group_6__2 : rule__Check__Group_6__2__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5538:1: rule__Check__Group_6__2 : rule__Check__Group_6__2__Impl ;
     public final void rule__Check__Group_6__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5636:1: ( rule__Check__Group_6__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5637:2: rule__Check__Group_6__2__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5542:1: ( rule__Check__Group_6__2__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5543:2: rule__Check__Group_6__2__Impl
             {
-            pushFollow(FOLLOW_rule__Check__Group_6__2__Impl_in_rule__Check__Group_6__212143);
+            pushFollow(FOLLOW_rule__Check__Group_6__2__Impl_in_rule__Check__Group_6__211957);
             rule__Check__Group_6__2__Impl();
 
             state._fsp--;
@@ -18061,22 +17798,22 @@ public final void rule__Check__Group_6__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group_6__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5643:1: rule__Check__Group_6__2__Impl : ( ')' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5549:1: rule__Check__Group_6__2__Impl : ( ')' ) ;
     public final void rule__Check__Group_6__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5647:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5648:1: ( ')' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5553:1: ( ( ')' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5554:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5648:1: ( ')' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5649:1: ')'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5554:1: ( ')' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5555:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getRightParenthesisKeyword_6_2()); 
             }
-            match(input,73,FOLLOW_73_in_rule__Check__Group_6__2__Impl12171); if (state.failed) return ;
+            match(input,73,FOLLOW_73_in_rule__Check__Group_6__2__Impl11985); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCheckAccess().getRightParenthesisKeyword_6_2()); 
             }
@@ -18102,21 +17839,21 @@ public final void rule__Check__Group_6__2__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group_6_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5668:1: rule__Check__Group_6_1__0 : rule__Check__Group_6_1__0__Impl rule__Check__Group_6_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5574:1: rule__Check__Group_6_1__0 : rule__Check__Group_6_1__0__Impl rule__Check__Group_6_1__1 ;
     public final void rule__Check__Group_6_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5672:1: ( rule__Check__Group_6_1__0__Impl rule__Check__Group_6_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5673:2: rule__Check__Group_6_1__0__Impl rule__Check__Group_6_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5578:1: ( rule__Check__Group_6_1__0__Impl rule__Check__Group_6_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5579:2: rule__Check__Group_6_1__0__Impl rule__Check__Group_6_1__1
             {
-            pushFollow(FOLLOW_rule__Check__Group_6_1__0__Impl_in_rule__Check__Group_6_1__012208);
+            pushFollow(FOLLOW_rule__Check__Group_6_1__0__Impl_in_rule__Check__Group_6_1__012022);
             rule__Check__Group_6_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Check__Group_6_1__1_in_rule__Check__Group_6_1__012211);
+            pushFollow(FOLLOW_rule__Check__Group_6_1__1_in_rule__Check__Group_6_1__012025);
             rule__Check__Group_6_1__1();
 
             state._fsp--;
@@ -18140,25 +17877,25 @@ public final void rule__Check__Group_6_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group_6_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5680:1: rule__Check__Group_6_1__0__Impl : ( ( rule__Check__FormalParametersAssignment_6_1_0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5586:1: rule__Check__Group_6_1__0__Impl : ( ( rule__Check__FormalParametersAssignment_6_1_0 ) ) ;
     public final void rule__Check__Group_6_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5684:1: ( ( ( rule__Check__FormalParametersAssignment_6_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5685:1: ( ( rule__Check__FormalParametersAssignment_6_1_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5590:1: ( ( ( rule__Check__FormalParametersAssignment_6_1_0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5591:1: ( ( rule__Check__FormalParametersAssignment_6_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5685:1: ( ( rule__Check__FormalParametersAssignment_6_1_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5686:1: ( rule__Check__FormalParametersAssignment_6_1_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5591:1: ( ( rule__Check__FormalParametersAssignment_6_1_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5592:1: ( rule__Check__FormalParametersAssignment_6_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getFormalParametersAssignment_6_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5687:1: ( rule__Check__FormalParametersAssignment_6_1_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5687:2: rule__Check__FormalParametersAssignment_6_1_0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5593:1: ( rule__Check__FormalParametersAssignment_6_1_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5593:2: rule__Check__FormalParametersAssignment_6_1_0
             {
-            pushFollow(FOLLOW_rule__Check__FormalParametersAssignment_6_1_0_in_rule__Check__Group_6_1__0__Impl12238);
+            pushFollow(FOLLOW_rule__Check__FormalParametersAssignment_6_1_0_in_rule__Check__Group_6_1__0__Impl12052);
             rule__Check__FormalParametersAssignment_6_1_0();
 
             state._fsp--;
@@ -18191,16 +17928,16 @@ public final void rule__Check__Group_6_1__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__Check__Group_6_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5697:1: rule__Check__Group_6_1__1 : rule__Check__Group_6_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5603:1: rule__Check__Group_6_1__1 : rule__Check__Group_6_1__1__Impl ;
     public final void rule__Check__Group_6_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5701:1: ( rule__Check__Group_6_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5702:2: rule__Check__Group_6_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5607:1: ( rule__Check__Group_6_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5608:2: rule__Check__Group_6_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__Check__Group_6_1__1__Impl_in_rule__Check__Group_6_1__112268);
+            pushFollow(FOLLOW_rule__Check__Group_6_1__1__Impl_in_rule__Check__Group_6_1__112082);
             rule__Check__Group_6_1__1__Impl();
 
             state._fsp--;
@@ -18224,37 +17961,37 @@ public final void rule__Check__Group_6_1__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group_6_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5708:1: rule__Check__Group_6_1__1__Impl : ( ( rule__Check__Group_6_1_1__0 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5614:1: rule__Check__Group_6_1__1__Impl : ( ( rule__Check__Group_6_1_1__0 )* ) ;
     public final void rule__Check__Group_6_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5712:1: ( ( ( rule__Check__Group_6_1_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5713:1: ( ( rule__Check__Group_6_1_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5618:1: ( ( ( rule__Check__Group_6_1_1__0 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5619:1: ( ( rule__Check__Group_6_1_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5713:1: ( ( rule__Check__Group_6_1_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5714:1: ( rule__Check__Group_6_1_1__0 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5619:1: ( ( rule__Check__Group_6_1_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5620:1: ( rule__Check__Group_6_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getGroup_6_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5715:1: ( rule__Check__Group_6_1_1__0 )*
-            loop67:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5621:1: ( rule__Check__Group_6_1_1__0 )*
+            loop66:
             do {
-                int alt67=2;
-                int LA67_0 = input.LA(1);
+                int alt66=2;
+                int LA66_0 = input.LA(1);
 
-                if ( (LA67_0==74) ) {
-                    alt67=1;
+                if ( (LA66_0==74) ) {
+                    alt66=1;
                 }
 
 
-                switch (alt67) {
+                switch (alt66) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5715:2: rule__Check__Group_6_1_1__0
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5621:2: rule__Check__Group_6_1_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__Check__Group_6_1_1__0_in_rule__Check__Group_6_1__1__Impl12295);
+            	    pushFollow(FOLLOW_rule__Check__Group_6_1_1__0_in_rule__Check__Group_6_1__1__Impl12109);
             	    rule__Check__Group_6_1_1__0();
 
             	    state._fsp--;
@@ -18264,7 +18001,7 @@ public final void rule__Check__Group_6_1__1__Impl() throws RecognitionException
             	    break;
 
             	default :
-            	    break loop67;
+            	    break loop66;
                 }
             } while (true);
 
@@ -18293,21 +18030,21 @@ public final void rule__Check__Group_6_1__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__Check__Group_6_1_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5729:1: rule__Check__Group_6_1_1__0 : rule__Check__Group_6_1_1__0__Impl rule__Check__Group_6_1_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5635:1: rule__Check__Group_6_1_1__0 : rule__Check__Group_6_1_1__0__Impl rule__Check__Group_6_1_1__1 ;
     public final void rule__Check__Group_6_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5733:1: ( rule__Check__Group_6_1_1__0__Impl rule__Check__Group_6_1_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5734:2: rule__Check__Group_6_1_1__0__Impl rule__Check__Group_6_1_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5639:1: ( rule__Check__Group_6_1_1__0__Impl rule__Check__Group_6_1_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5640:2: rule__Check__Group_6_1_1__0__Impl rule__Check__Group_6_1_1__1
             {
-            pushFollow(FOLLOW_rule__Check__Group_6_1_1__0__Impl_in_rule__Check__Group_6_1_1__012330);
+            pushFollow(FOLLOW_rule__Check__Group_6_1_1__0__Impl_in_rule__Check__Group_6_1_1__012144);
             rule__Check__Group_6_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Check__Group_6_1_1__1_in_rule__Check__Group_6_1_1__012333);
+            pushFollow(FOLLOW_rule__Check__Group_6_1_1__1_in_rule__Check__Group_6_1_1__012147);
             rule__Check__Group_6_1_1__1();
 
             state._fsp--;
@@ -18331,22 +18068,22 @@ public final void rule__Check__Group_6_1_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group_6_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5741:1: rule__Check__Group_6_1_1__0__Impl : ( ',' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5647:1: rule__Check__Group_6_1_1__0__Impl : ( ',' ) ;
     public final void rule__Check__Group_6_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5745:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5746:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5651:1: ( ( ',' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5652:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5746:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5747:1: ','
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5652:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5653:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getCommaKeyword_6_1_1_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__Check__Group_6_1_1__0__Impl12361); if (state.failed) return ;
+            match(input,74,FOLLOW_74_in_rule__Check__Group_6_1_1__0__Impl12175); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCheckAccess().getCommaKeyword_6_1_1_0()); 
             }
@@ -18372,16 +18109,16 @@ public final void rule__Check__Group_6_1_1__0__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__Check__Group_6_1_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5760:1: rule__Check__Group_6_1_1__1 : rule__Check__Group_6_1_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5666:1: rule__Check__Group_6_1_1__1 : rule__Check__Group_6_1_1__1__Impl ;
     public final void rule__Check__Group_6_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5764:1: ( rule__Check__Group_6_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5765:2: rule__Check__Group_6_1_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5670:1: ( rule__Check__Group_6_1_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5671:2: rule__Check__Group_6_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__Check__Group_6_1_1__1__Impl_in_rule__Check__Group_6_1_1__112392);
+            pushFollow(FOLLOW_rule__Check__Group_6_1_1__1__Impl_in_rule__Check__Group_6_1_1__112206);
             rule__Check__Group_6_1_1__1__Impl();
 
             state._fsp--;
@@ -18405,25 +18142,25 @@ public final void rule__Check__Group_6_1_1__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group_6_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5771:1: rule__Check__Group_6_1_1__1__Impl : ( ( rule__Check__FormalParametersAssignment_6_1_1_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5677:1: rule__Check__Group_6_1_1__1__Impl : ( ( rule__Check__FormalParametersAssignment_6_1_1_1 ) ) ;
     public final void rule__Check__Group_6_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5775:1: ( ( ( rule__Check__FormalParametersAssignment_6_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5776:1: ( ( rule__Check__FormalParametersAssignment_6_1_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5681:1: ( ( ( rule__Check__FormalParametersAssignment_6_1_1_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5682:1: ( ( rule__Check__FormalParametersAssignment_6_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5776:1: ( ( rule__Check__FormalParametersAssignment_6_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5777:1: ( rule__Check__FormalParametersAssignment_6_1_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5682:1: ( ( rule__Check__FormalParametersAssignment_6_1_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5683:1: ( rule__Check__FormalParametersAssignment_6_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getFormalParametersAssignment_6_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5778:1: ( rule__Check__FormalParametersAssignment_6_1_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5778:2: rule__Check__FormalParametersAssignment_6_1_1_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5684:1: ( rule__Check__FormalParametersAssignment_6_1_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5684:2: rule__Check__FormalParametersAssignment_6_1_1_1
             {
-            pushFollow(FOLLOW_rule__Check__FormalParametersAssignment_6_1_1_1_in_rule__Check__Group_6_1_1__1__Impl12419);
+            pushFollow(FOLLOW_rule__Check__FormalParametersAssignment_6_1_1_1_in_rule__Check__Group_6_1_1__1__Impl12233);
             rule__Check__FormalParametersAssignment_6_1_1_1();
 
             state._fsp--;
@@ -18456,21 +18193,21 @@ public final void rule__Check__Group_6_1_1__1__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__Check__Group_7__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5792:1: rule__Check__Group_7__0 : rule__Check__Group_7__0__Impl rule__Check__Group_7__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5698:1: rule__Check__Group_7__0 : rule__Check__Group_7__0__Impl rule__Check__Group_7__1 ;
     public final void rule__Check__Group_7__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5796:1: ( rule__Check__Group_7__0__Impl rule__Check__Group_7__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5797:2: rule__Check__Group_7__0__Impl rule__Check__Group_7__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5702:1: ( rule__Check__Group_7__0__Impl rule__Check__Group_7__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5703:2: rule__Check__Group_7__0__Impl rule__Check__Group_7__1
             {
-            pushFollow(FOLLOW_rule__Check__Group_7__0__Impl_in_rule__Check__Group_7__012453);
+            pushFollow(FOLLOW_rule__Check__Group_7__0__Impl_in_rule__Check__Group_7__012267);
             rule__Check__Group_7__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Check__Group_7__1_in_rule__Check__Group_7__012456);
+            pushFollow(FOLLOW_rule__Check__Group_7__1_in_rule__Check__Group_7__012270);
             rule__Check__Group_7__1();
 
             state._fsp--;
@@ -18494,22 +18231,22 @@ public final void rule__Check__Group_7__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group_7__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5804:1: rule__Check__Group_7__0__Impl : ( 'message' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5710:1: rule__Check__Group_7__0__Impl : ( 'message' ) ;
     public final void rule__Check__Group_7__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5808:1: ( ( 'message' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5809:1: ( 'message' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5714:1: ( ( 'message' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5715:1: ( 'message' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5809:1: ( 'message' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5810:1: 'message'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5715:1: ( 'message' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5716:1: 'message'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getMessageKeyword_7_0()); 
             }
-            match(input,24,FOLLOW_24_in_rule__Check__Group_7__0__Impl12484); if (state.failed) return ;
+            match(input,24,FOLLOW_24_in_rule__Check__Group_7__0__Impl12298); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCheckAccess().getMessageKeyword_7_0()); 
             }
@@ -18535,16 +18272,16 @@ public final void rule__Check__Group_7__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group_7__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5823:1: rule__Check__Group_7__1 : rule__Check__Group_7__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5729:1: rule__Check__Group_7__1 : rule__Check__Group_7__1__Impl ;
     public final void rule__Check__Group_7__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5827:1: ( rule__Check__Group_7__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5828:2: rule__Check__Group_7__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5733:1: ( rule__Check__Group_7__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5734:2: rule__Check__Group_7__1__Impl
             {
-            pushFollow(FOLLOW_rule__Check__Group_7__1__Impl_in_rule__Check__Group_7__112515);
+            pushFollow(FOLLOW_rule__Check__Group_7__1__Impl_in_rule__Check__Group_7__112329);
             rule__Check__Group_7__1__Impl();
 
             state._fsp--;
@@ -18568,25 +18305,25 @@ public final void rule__Check__Group_7__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group_7__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5834:1: rule__Check__Group_7__1__Impl : ( ( rule__Check__GivenMessageAssignment_7_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5740:1: rule__Check__Group_7__1__Impl : ( ( rule__Check__GivenMessageAssignment_7_1 ) ) ;
     public final void rule__Check__Group_7__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5838:1: ( ( ( rule__Check__GivenMessageAssignment_7_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5839:1: ( ( rule__Check__GivenMessageAssignment_7_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5744:1: ( ( ( rule__Check__GivenMessageAssignment_7_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5745:1: ( ( rule__Check__GivenMessageAssignment_7_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5839:1: ( ( rule__Check__GivenMessageAssignment_7_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5840:1: ( rule__Check__GivenMessageAssignment_7_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5745:1: ( ( rule__Check__GivenMessageAssignment_7_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5746:1: ( rule__Check__GivenMessageAssignment_7_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getGivenMessageAssignment_7_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5841:1: ( rule__Check__GivenMessageAssignment_7_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5841:2: rule__Check__GivenMessageAssignment_7_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5747:1: ( rule__Check__GivenMessageAssignment_7_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5747:2: rule__Check__GivenMessageAssignment_7_1
             {
-            pushFollow(FOLLOW_rule__Check__GivenMessageAssignment_7_1_in_rule__Check__Group_7__1__Impl12542);
+            pushFollow(FOLLOW_rule__Check__GivenMessageAssignment_7_1_in_rule__Check__Group_7__1__Impl12356);
             rule__Check__GivenMessageAssignment_7_1();
 
             state._fsp--;
@@ -18619,21 +18356,21 @@ public final void rule__Check__Group_7__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group_8_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5855:1: rule__Check__Group_8_0__0 : rule__Check__Group_8_0__0__Impl rule__Check__Group_8_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5761:1: rule__Check__Group_8_0__0 : rule__Check__Group_8_0__0__Impl rule__Check__Group_8_0__1 ;
     public final void rule__Check__Group_8_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5859:1: ( rule__Check__Group_8_0__0__Impl rule__Check__Group_8_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5860:2: rule__Check__Group_8_0__0__Impl rule__Check__Group_8_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5765:1: ( rule__Check__Group_8_0__0__Impl rule__Check__Group_8_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5766:2: rule__Check__Group_8_0__0__Impl rule__Check__Group_8_0__1
             {
-            pushFollow(FOLLOW_rule__Check__Group_8_0__0__Impl_in_rule__Check__Group_8_0__012576);
+            pushFollow(FOLLOW_rule__Check__Group_8_0__0__Impl_in_rule__Check__Group_8_0__012390);
             rule__Check__Group_8_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Check__Group_8_0__1_in_rule__Check__Group_8_0__012579);
+            pushFollow(FOLLOW_rule__Check__Group_8_0__1_in_rule__Check__Group_8_0__012393);
             rule__Check__Group_8_0__1();
 
             state._fsp--;
@@ -18657,25 +18394,25 @@ public final void rule__Check__Group_8_0__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group_8_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5867:1: rule__Check__Group_8_0__0__Impl : ( ( '{' ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5773:1: rule__Check__Group_8_0__0__Impl : ( ( '{' ) ) ;
     public final void rule__Check__Group_8_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5871:1: ( ( ( '{' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5872:1: ( ( '{' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5777:1: ( ( ( '{' ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5778:1: ( ( '{' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5872:1: ( ( '{' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5873:1: ( '{' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5778:1: ( ( '{' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5779:1: ( '{' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getLeftCurlyBracketKeyword_8_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5874:1: ( '{' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5875:2: '{'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5780:1: ( '{' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5781:2: '{'
             {
-            match(input,68,FOLLOW_68_in_rule__Check__Group_8_0__0__Impl12608); if (state.failed) return ;
+            match(input,68,FOLLOW_68_in_rule__Check__Group_8_0__0__Impl12422); if (state.failed) return ;
 
             }
 
@@ -18704,21 +18441,21 @@ public final void rule__Check__Group_8_0__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__Check__Group_8_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5886:1: rule__Check__Group_8_0__1 : rule__Check__Group_8_0__1__Impl rule__Check__Group_8_0__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5792:1: rule__Check__Group_8_0__1 : rule__Check__Group_8_0__1__Impl rule__Check__Group_8_0__2 ;
     public final void rule__Check__Group_8_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5890:1: ( rule__Check__Group_8_0__1__Impl rule__Check__Group_8_0__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5891:2: rule__Check__Group_8_0__1__Impl rule__Check__Group_8_0__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5796:1: ( rule__Check__Group_8_0__1__Impl rule__Check__Group_8_0__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5797:2: rule__Check__Group_8_0__1__Impl rule__Check__Group_8_0__2
             {
-            pushFollow(FOLLOW_rule__Check__Group_8_0__1__Impl_in_rule__Check__Group_8_0__112640);
+            pushFollow(FOLLOW_rule__Check__Group_8_0__1__Impl_in_rule__Check__Group_8_0__112454);
             rule__Check__Group_8_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Check__Group_8_0__2_in_rule__Check__Group_8_0__112643);
+            pushFollow(FOLLOW_rule__Check__Group_8_0__2_in_rule__Check__Group_8_0__112457);
             rule__Check__Group_8_0__2();
 
             state._fsp--;
@@ -18742,37 +18479,37 @@ public final void rule__Check__Group_8_0__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group_8_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5898:1: rule__Check__Group_8_0__1__Impl : ( ( rule__Check__ContextsAssignment_8_0_1 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5804:1: rule__Check__Group_8_0__1__Impl : ( ( rule__Check__ContextsAssignment_8_0_1 )* ) ;
     public final void rule__Check__Group_8_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5902:1: ( ( ( rule__Check__ContextsAssignment_8_0_1 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5903:1: ( ( rule__Check__ContextsAssignment_8_0_1 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5808:1: ( ( ( rule__Check__ContextsAssignment_8_0_1 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5809:1: ( ( rule__Check__ContextsAssignment_8_0_1 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5903:1: ( ( rule__Check__ContextsAssignment_8_0_1 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5904:1: ( rule__Check__ContextsAssignment_8_0_1 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5809:1: ( ( rule__Check__ContextsAssignment_8_0_1 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5810:1: ( rule__Check__ContextsAssignment_8_0_1 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getContextsAssignment_8_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5905:1: ( rule__Check__ContextsAssignment_8_0_1 )*
-            loop68:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5811:1: ( rule__Check__ContextsAssignment_8_0_1 )*
+            loop67:
             do {
-                int alt68=2;
-                int LA68_0 = input.LA(1);
+                int alt67=2;
+                int LA67_0 = input.LA(1);
 
-                if ( (LA68_0==70) ) {
-                    alt68=1;
+                if ( (LA67_0==70) ) {
+                    alt67=1;
                 }
 
 
-                switch (alt68) {
+                switch (alt67) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5905:2: rule__Check__ContextsAssignment_8_0_1
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5811:2: rule__Check__ContextsAssignment_8_0_1
             	    {
-            	    pushFollow(FOLLOW_rule__Check__ContextsAssignment_8_0_1_in_rule__Check__Group_8_0__1__Impl12670);
+            	    pushFollow(FOLLOW_rule__Check__ContextsAssignment_8_0_1_in_rule__Check__Group_8_0__1__Impl12484);
             	    rule__Check__ContextsAssignment_8_0_1();
 
             	    state._fsp--;
@@ -18782,7 +18519,7 @@ public final void rule__Check__Group_8_0__1__Impl() throws RecognitionException
             	    break;
 
             	default :
-            	    break loop68;
+            	    break loop67;
                 }
             } while (true);
 
@@ -18811,16 +18548,16 @@ public final void rule__Check__Group_8_0__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__Check__Group_8_0__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5915:1: rule__Check__Group_8_0__2 : rule__Check__Group_8_0__2__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5821:1: rule__Check__Group_8_0__2 : rule__Check__Group_8_0__2__Impl ;
     public final void rule__Check__Group_8_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5919:1: ( rule__Check__Group_8_0__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5920:2: rule__Check__Group_8_0__2__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5825:1: ( rule__Check__Group_8_0__2__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5826:2: rule__Check__Group_8_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__Check__Group_8_0__2__Impl_in_rule__Check__Group_8_0__212701);
+            pushFollow(FOLLOW_rule__Check__Group_8_0__2__Impl_in_rule__Check__Group_8_0__212515);
             rule__Check__Group_8_0__2__Impl();
 
             state._fsp--;
@@ -18844,22 +18581,22 @@ public final void rule__Check__Group_8_0__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group_8_0__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5926:1: rule__Check__Group_8_0__2__Impl : ( '}' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5832:1: rule__Check__Group_8_0__2__Impl : ( '}' ) ;
     public final void rule__Check__Group_8_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5930:1: ( ( '}' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5931:1: ( '}' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5836:1: ( ( '}' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5837:1: ( '}' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5931:1: ( '}' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5932:1: '}'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5837:1: ( '}' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5838:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getRightCurlyBracketKeyword_8_0_2()); 
             }
-            match(input,69,FOLLOW_69_in_rule__Check__Group_8_0__2__Impl12729); if (state.failed) return ;
+            match(input,69,FOLLOW_69_in_rule__Check__Group_8_0__2__Impl12543); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCheckAccess().getRightCurlyBracketKeyword_8_0_2()); 
             }
@@ -18885,21 +18622,21 @@ public final void rule__Check__Group_8_0__2__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__SeverityRange__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5951:1: rule__SeverityRange__Group__0 : rule__SeverityRange__Group__0__Impl rule__SeverityRange__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5857:1: rule__SeverityRange__Group__0 : rule__SeverityRange__Group__0__Impl rule__SeverityRange__Group__1 ;
     public final void rule__SeverityRange__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5955:1: ( rule__SeverityRange__Group__0__Impl rule__SeverityRange__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5956:2: rule__SeverityRange__Group__0__Impl rule__SeverityRange__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5861:1: ( rule__SeverityRange__Group__0__Impl rule__SeverityRange__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5862:2: rule__SeverityRange__Group__0__Impl rule__SeverityRange__Group__1
             {
-            pushFollow(FOLLOW_rule__SeverityRange__Group__0__Impl_in_rule__SeverityRange__Group__012766);
+            pushFollow(FOLLOW_rule__SeverityRange__Group__0__Impl_in_rule__SeverityRange__Group__012580);
             rule__SeverityRange__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SeverityRange__Group__1_in_rule__SeverityRange__Group__012769);
+            pushFollow(FOLLOW_rule__SeverityRange__Group__1_in_rule__SeverityRange__Group__012583);
             rule__SeverityRange__Group__1();
 
             state._fsp--;
@@ -18923,22 +18660,22 @@ public final void rule__SeverityRange__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__SeverityRange__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5963:1: rule__SeverityRange__Group__0__Impl : ( '@' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5869:1: rule__SeverityRange__Group__0__Impl : ( '@' ) ;
     public final void rule__SeverityRange__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5967:1: ( ( '@' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5968:1: ( '@' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5873:1: ( ( '@' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5874:1: ( '@' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5968:1: ( '@' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5969:1: '@'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5874:1: ( '@' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5875:1: '@'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSeverityRangeAccess().getCommercialAtKeyword_0()); 
             }
-            match(input,75,FOLLOW_75_in_rule__SeverityRange__Group__0__Impl12797); if (state.failed) return ;
+            match(input,75,FOLLOW_75_in_rule__SeverityRange__Group__0__Impl12611); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSeverityRangeAccess().getCommercialAtKeyword_0()); 
             }
@@ -18964,21 +18701,21 @@ public final void rule__SeverityRange__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__SeverityRange__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5982:1: rule__SeverityRange__Group__1 : rule__SeverityRange__Group__1__Impl rule__SeverityRange__Group__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5888:1: rule__SeverityRange__Group__1 : rule__SeverityRange__Group__1__Impl rule__SeverityRange__Group__2 ;
     public final void rule__SeverityRange__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5986:1: ( rule__SeverityRange__Group__1__Impl rule__SeverityRange__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5987:2: rule__SeverityRange__Group__1__Impl rule__SeverityRange__Group__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5892:1: ( rule__SeverityRange__Group__1__Impl rule__SeverityRange__Group__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5893:2: rule__SeverityRange__Group__1__Impl rule__SeverityRange__Group__2
             {
-            pushFollow(FOLLOW_rule__SeverityRange__Group__1__Impl_in_rule__SeverityRange__Group__112828);
+            pushFollow(FOLLOW_rule__SeverityRange__Group__1__Impl_in_rule__SeverityRange__Group__112642);
             rule__SeverityRange__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SeverityRange__Group__2_in_rule__SeverityRange__Group__112831);
+            pushFollow(FOLLOW_rule__SeverityRange__Group__2_in_rule__SeverityRange__Group__112645);
             rule__SeverityRange__Group__2();
 
             state._fsp--;
@@ -19002,22 +18739,22 @@ public final void rule__SeverityRange__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__SeverityRange__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5994:1: rule__SeverityRange__Group__1__Impl : ( 'SeverityRange' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5900:1: rule__SeverityRange__Group__1__Impl : ( 'SeverityRange' ) ;
     public final void rule__SeverityRange__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5998:1: ( ( 'SeverityRange' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5999:1: ( 'SeverityRange' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5904:1: ( ( 'SeverityRange' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5905:1: ( 'SeverityRange' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5999:1: ( 'SeverityRange' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6000:1: 'SeverityRange'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5905:1: ( 'SeverityRange' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5906:1: 'SeverityRange'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSeverityRangeAccess().getSeverityRangeKeyword_1()); 
             }
-            match(input,28,FOLLOW_28_in_rule__SeverityRange__Group__1__Impl12859); if (state.failed) return ;
+            match(input,28,FOLLOW_28_in_rule__SeverityRange__Group__1__Impl12673); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSeverityRangeAccess().getSeverityRangeKeyword_1()); 
             }
@@ -19043,21 +18780,21 @@ public final void rule__SeverityRange__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__SeverityRange__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6013:1: rule__SeverityRange__Group__2 : rule__SeverityRange__Group__2__Impl rule__SeverityRange__Group__3 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5919:1: rule__SeverityRange__Group__2 : rule__SeverityRange__Group__2__Impl rule__SeverityRange__Group__3 ;
     public final void rule__SeverityRange__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6017:1: ( rule__SeverityRange__Group__2__Impl rule__SeverityRange__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6018:2: rule__SeverityRange__Group__2__Impl rule__SeverityRange__Group__3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5923:1: ( rule__SeverityRange__Group__2__Impl rule__SeverityRange__Group__3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5924:2: rule__SeverityRange__Group__2__Impl rule__SeverityRange__Group__3
             {
-            pushFollow(FOLLOW_rule__SeverityRange__Group__2__Impl_in_rule__SeverityRange__Group__212890);
+            pushFollow(FOLLOW_rule__SeverityRange__Group__2__Impl_in_rule__SeverityRange__Group__212704);
             rule__SeverityRange__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SeverityRange__Group__3_in_rule__SeverityRange__Group__212893);
+            pushFollow(FOLLOW_rule__SeverityRange__Group__3_in_rule__SeverityRange__Group__212707);
             rule__SeverityRange__Group__3();
 
             state._fsp--;
@@ -19081,22 +18818,22 @@ public final void rule__SeverityRange__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__SeverityRange__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6025:1: rule__SeverityRange__Group__2__Impl : ( '(' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5931:1: rule__SeverityRange__Group__2__Impl : ( '(' ) ;
     public final void rule__SeverityRange__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6029:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6030:1: ( '(' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5935:1: ( ( '(' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5936:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6030:1: ( '(' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6031:1: '('
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5936:1: ( '(' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5937:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSeverityRangeAccess().getLeftParenthesisKeyword_2()); 
             }
-            match(input,72,FOLLOW_72_in_rule__SeverityRange__Group__2__Impl12921); if (state.failed) return ;
+            match(input,72,FOLLOW_72_in_rule__SeverityRange__Group__2__Impl12735); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSeverityRangeAccess().getLeftParenthesisKeyword_2()); 
             }
@@ -19122,21 +18859,21 @@ public final void rule__SeverityRange__Group__2__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__SeverityRange__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6044:1: rule__SeverityRange__Group__3 : rule__SeverityRange__Group__3__Impl rule__SeverityRange__Group__4 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5950:1: rule__SeverityRange__Group__3 : rule__SeverityRange__Group__3__Impl rule__SeverityRange__Group__4 ;
     public final void rule__SeverityRange__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6048:1: ( rule__SeverityRange__Group__3__Impl rule__SeverityRange__Group__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6049:2: rule__SeverityRange__Group__3__Impl rule__SeverityRange__Group__4
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5954:1: ( rule__SeverityRange__Group__3__Impl rule__SeverityRange__Group__4 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5955:2: rule__SeverityRange__Group__3__Impl rule__SeverityRange__Group__4
             {
-            pushFollow(FOLLOW_rule__SeverityRange__Group__3__Impl_in_rule__SeverityRange__Group__312952);
+            pushFollow(FOLLOW_rule__SeverityRange__Group__3__Impl_in_rule__SeverityRange__Group__312766);
             rule__SeverityRange__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SeverityRange__Group__4_in_rule__SeverityRange__Group__312955);
+            pushFollow(FOLLOW_rule__SeverityRange__Group__4_in_rule__SeverityRange__Group__312769);
             rule__SeverityRange__Group__4();
 
             state._fsp--;
@@ -19160,25 +18897,25 @@ public final void rule__SeverityRange__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__SeverityRange__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6056:1: rule__SeverityRange__Group__3__Impl : ( ( rule__SeverityRange__MinSeverityAssignment_3 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5962:1: rule__SeverityRange__Group__3__Impl : ( ( rule__SeverityRange__MinSeverityAssignment_3 ) ) ;
     public final void rule__SeverityRange__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6060:1: ( ( ( rule__SeverityRange__MinSeverityAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6061:1: ( ( rule__SeverityRange__MinSeverityAssignment_3 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5966:1: ( ( ( rule__SeverityRange__MinSeverityAssignment_3 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5967:1: ( ( rule__SeverityRange__MinSeverityAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6061:1: ( ( rule__SeverityRange__MinSeverityAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6062:1: ( rule__SeverityRange__MinSeverityAssignment_3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5967:1: ( ( rule__SeverityRange__MinSeverityAssignment_3 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5968:1: ( rule__SeverityRange__MinSeverityAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSeverityRangeAccess().getMinSeverityAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6063:1: ( rule__SeverityRange__MinSeverityAssignment_3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6063:2: rule__SeverityRange__MinSeverityAssignment_3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5969:1: ( rule__SeverityRange__MinSeverityAssignment_3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5969:2: rule__SeverityRange__MinSeverityAssignment_3
             {
-            pushFollow(FOLLOW_rule__SeverityRange__MinSeverityAssignment_3_in_rule__SeverityRange__Group__3__Impl12982);
+            pushFollow(FOLLOW_rule__SeverityRange__MinSeverityAssignment_3_in_rule__SeverityRange__Group__3__Impl12796);
             rule__SeverityRange__MinSeverityAssignment_3();
 
             state._fsp--;
@@ -19211,21 +18948,21 @@ public final void rule__SeverityRange__Group__3__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__SeverityRange__Group__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6073:1: rule__SeverityRange__Group__4 : rule__SeverityRange__Group__4__Impl rule__SeverityRange__Group__5 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5979:1: rule__SeverityRange__Group__4 : rule__SeverityRange__Group__4__Impl rule__SeverityRange__Group__5 ;
     public final void rule__SeverityRange__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6077:1: ( rule__SeverityRange__Group__4__Impl rule__SeverityRange__Group__5 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6078:2: rule__SeverityRange__Group__4__Impl rule__SeverityRange__Group__5
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5983:1: ( rule__SeverityRange__Group__4__Impl rule__SeverityRange__Group__5 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5984:2: rule__SeverityRange__Group__4__Impl rule__SeverityRange__Group__5
             {
-            pushFollow(FOLLOW_rule__SeverityRange__Group__4__Impl_in_rule__SeverityRange__Group__413012);
+            pushFollow(FOLLOW_rule__SeverityRange__Group__4__Impl_in_rule__SeverityRange__Group__412826);
             rule__SeverityRange__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SeverityRange__Group__5_in_rule__SeverityRange__Group__413015);
+            pushFollow(FOLLOW_rule__SeverityRange__Group__5_in_rule__SeverityRange__Group__412829);
             rule__SeverityRange__Group__5();
 
             state._fsp--;
@@ -19249,22 +18986,22 @@ public final void rule__SeverityRange__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__SeverityRange__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6085:1: rule__SeverityRange__Group__4__Impl : ( '..' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5991:1: rule__SeverityRange__Group__4__Impl : ( '..' ) ;
     public final void rule__SeverityRange__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6089:1: ( ( '..' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6090:1: ( '..' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5995:1: ( ( '..' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5996:1: ( '..' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6090:1: ( '..' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6091:1: '..'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5996:1: ( '..' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5997:1: '..'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSeverityRangeAccess().getFullStopFullStopKeyword_4()); 
             }
-            match(input,50,FOLLOW_50_in_rule__SeverityRange__Group__4__Impl13043); if (state.failed) return ;
+            match(input,50,FOLLOW_50_in_rule__SeverityRange__Group__4__Impl12857); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSeverityRangeAccess().getFullStopFullStopKeyword_4()); 
             }
@@ -19290,21 +19027,21 @@ public final void rule__SeverityRange__Group__4__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__SeverityRange__Group__5"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6104:1: rule__SeverityRange__Group__5 : rule__SeverityRange__Group__5__Impl rule__SeverityRange__Group__6 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6010:1: rule__SeverityRange__Group__5 : rule__SeverityRange__Group__5__Impl rule__SeverityRange__Group__6 ;
     public final void rule__SeverityRange__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6108:1: ( rule__SeverityRange__Group__5__Impl rule__SeverityRange__Group__6 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6109:2: rule__SeverityRange__Group__5__Impl rule__SeverityRange__Group__6
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6014:1: ( rule__SeverityRange__Group__5__Impl rule__SeverityRange__Group__6 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6015:2: rule__SeverityRange__Group__5__Impl rule__SeverityRange__Group__6
             {
-            pushFollow(FOLLOW_rule__SeverityRange__Group__5__Impl_in_rule__SeverityRange__Group__513074);
+            pushFollow(FOLLOW_rule__SeverityRange__Group__5__Impl_in_rule__SeverityRange__Group__512888);
             rule__SeverityRange__Group__5__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SeverityRange__Group__6_in_rule__SeverityRange__Group__513077);
+            pushFollow(FOLLOW_rule__SeverityRange__Group__6_in_rule__SeverityRange__Group__512891);
             rule__SeverityRange__Group__6();
 
             state._fsp--;
@@ -19328,25 +19065,25 @@ public final void rule__SeverityRange__Group__5() throws RecognitionException {
 
 
     // $ANTLR start "rule__SeverityRange__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6116:1: rule__SeverityRange__Group__5__Impl : ( ( rule__SeverityRange__MaxSeverityAssignment_5 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6022:1: rule__SeverityRange__Group__5__Impl : ( ( rule__SeverityRange__MaxSeverityAssignment_5 ) ) ;
     public final void rule__SeverityRange__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6120:1: ( ( ( rule__SeverityRange__MaxSeverityAssignment_5 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6121:1: ( ( rule__SeverityRange__MaxSeverityAssignment_5 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6026:1: ( ( ( rule__SeverityRange__MaxSeverityAssignment_5 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6027:1: ( ( rule__SeverityRange__MaxSeverityAssignment_5 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6121:1: ( ( rule__SeverityRange__MaxSeverityAssignment_5 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6122:1: ( rule__SeverityRange__MaxSeverityAssignment_5 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6027:1: ( ( rule__SeverityRange__MaxSeverityAssignment_5 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6028:1: ( rule__SeverityRange__MaxSeverityAssignment_5 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSeverityRangeAccess().getMaxSeverityAssignment_5()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6123:1: ( rule__SeverityRange__MaxSeverityAssignment_5 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6123:2: rule__SeverityRange__MaxSeverityAssignment_5
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6029:1: ( rule__SeverityRange__MaxSeverityAssignment_5 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6029:2: rule__SeverityRange__MaxSeverityAssignment_5
             {
-            pushFollow(FOLLOW_rule__SeverityRange__MaxSeverityAssignment_5_in_rule__SeverityRange__Group__5__Impl13104);
+            pushFollow(FOLLOW_rule__SeverityRange__MaxSeverityAssignment_5_in_rule__SeverityRange__Group__5__Impl12918);
             rule__SeverityRange__MaxSeverityAssignment_5();
 
             state._fsp--;
@@ -19379,16 +19116,16 @@ public final void rule__SeverityRange__Group__5__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__SeverityRange__Group__6"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6133:1: rule__SeverityRange__Group__6 : rule__SeverityRange__Group__6__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6039:1: rule__SeverityRange__Group__6 : rule__SeverityRange__Group__6__Impl ;
     public final void rule__SeverityRange__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6137:1: ( rule__SeverityRange__Group__6__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6138:2: rule__SeverityRange__Group__6__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6043:1: ( rule__SeverityRange__Group__6__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6044:2: rule__SeverityRange__Group__6__Impl
             {
-            pushFollow(FOLLOW_rule__SeverityRange__Group__6__Impl_in_rule__SeverityRange__Group__613134);
+            pushFollow(FOLLOW_rule__SeverityRange__Group__6__Impl_in_rule__SeverityRange__Group__612948);
             rule__SeverityRange__Group__6__Impl();
 
             state._fsp--;
@@ -19412,22 +19149,22 @@ public final void rule__SeverityRange__Group__6() throws RecognitionException {
 
 
     // $ANTLR start "rule__SeverityRange__Group__6__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6144:1: rule__SeverityRange__Group__6__Impl : ( ')' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6050:1: rule__SeverityRange__Group__6__Impl : ( ')' ) ;
     public final void rule__SeverityRange__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6148:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6149:1: ( ')' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6054:1: ( ( ')' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6055:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6149:1: ( ')' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6150:1: ')'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6055:1: ( ')' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6056:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSeverityRangeAccess().getRightParenthesisKeyword_6()); 
             }
-            match(input,73,FOLLOW_73_in_rule__SeverityRange__Group__6__Impl13162); if (state.failed) return ;
+            match(input,73,FOLLOW_73_in_rule__SeverityRange__Group__6__Impl12976); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSeverityRangeAccess().getRightParenthesisKeyword_6()); 
             }
@@ -19453,21 +19190,21 @@ public final void rule__SeverityRange__Group__6__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__Member__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6177:1: rule__Member__Group__0 : rule__Member__Group__0__Impl rule__Member__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6083:1: rule__Member__Group__0 : rule__Member__Group__0__Impl rule__Member__Group__1 ;
     public final void rule__Member__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6181:1: ( rule__Member__Group__0__Impl rule__Member__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6182:2: rule__Member__Group__0__Impl rule__Member__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6087:1: ( rule__Member__Group__0__Impl rule__Member__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6088:2: rule__Member__Group__0__Impl rule__Member__Group__1
             {
-            pushFollow(FOLLOW_rule__Member__Group__0__Impl_in_rule__Member__Group__013207);
+            pushFollow(FOLLOW_rule__Member__Group__0__Impl_in_rule__Member__Group__013021);
             rule__Member__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Member__Group__1_in_rule__Member__Group__013210);
+            pushFollow(FOLLOW_rule__Member__Group__1_in_rule__Member__Group__013024);
             rule__Member__Group__1();
 
             state._fsp--;
@@ -19491,37 +19228,37 @@ public final void rule__Member__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Member__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6189:1: rule__Member__Group__0__Impl : ( ( rule__Member__AnnotationsAssignment_0 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6095:1: rule__Member__Group__0__Impl : ( ( rule__Member__AnnotationsAssignment_0 )* ) ;
     public final void rule__Member__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6193:1: ( ( ( rule__Member__AnnotationsAssignment_0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6194:1: ( ( rule__Member__AnnotationsAssignment_0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6099:1: ( ( ( rule__Member__AnnotationsAssignment_0 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6100:1: ( ( rule__Member__AnnotationsAssignment_0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6194:1: ( ( rule__Member__AnnotationsAssignment_0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6195:1: ( rule__Member__AnnotationsAssignment_0 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6100:1: ( ( rule__Member__AnnotationsAssignment_0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6101:1: ( rule__Member__AnnotationsAssignment_0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMemberAccess().getAnnotationsAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6196:1: ( rule__Member__AnnotationsAssignment_0 )*
-            loop69:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6102:1: ( rule__Member__AnnotationsAssignment_0 )*
+            loop68:
             do {
-                int alt69=2;
-                int LA69_0 = input.LA(1);
+                int alt68=2;
+                int LA68_0 = input.LA(1);
 
-                if ( (LA69_0==75) ) {
-                    alt69=1;
+                if ( (LA68_0==75) ) {
+                    alt68=1;
                 }
 
 
-                switch (alt69) {
+                switch (alt68) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6196:2: rule__Member__AnnotationsAssignment_0
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6102:2: rule__Member__AnnotationsAssignment_0
             	    {
-            	    pushFollow(FOLLOW_rule__Member__AnnotationsAssignment_0_in_rule__Member__Group__0__Impl13237);
+            	    pushFollow(FOLLOW_rule__Member__AnnotationsAssignment_0_in_rule__Member__Group__0__Impl13051);
             	    rule__Member__AnnotationsAssignment_0();
 
             	    state._fsp--;
@@ -19531,7 +19268,7 @@ public final void rule__Member__Group__0__Impl() throws RecognitionException {
             	    break;
 
             	default :
-            	    break loop69;
+            	    break loop68;
                 }
             } while (true);
 
@@ -19560,21 +19297,21 @@ public final void rule__Member__Group__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Member__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6206:1: rule__Member__Group__1 : rule__Member__Group__1__Impl rule__Member__Group__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6112:1: rule__Member__Group__1 : rule__Member__Group__1__Impl rule__Member__Group__2 ;
     public final void rule__Member__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6210:1: ( rule__Member__Group__1__Impl rule__Member__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6211:2: rule__Member__Group__1__Impl rule__Member__Group__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6116:1: ( rule__Member__Group__1__Impl rule__Member__Group__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6117:2: rule__Member__Group__1__Impl rule__Member__Group__2
             {
-            pushFollow(FOLLOW_rule__Member__Group__1__Impl_in_rule__Member__Group__113268);
+            pushFollow(FOLLOW_rule__Member__Group__1__Impl_in_rule__Member__Group__113082);
             rule__Member__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Member__Group__2_in_rule__Member__Group__113271);
+            pushFollow(FOLLOW_rule__Member__Group__2_in_rule__Member__Group__113085);
             rule__Member__Group__2();
 
             state._fsp--;
@@ -19598,25 +19335,25 @@ public final void rule__Member__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Member__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6218:1: rule__Member__Group__1__Impl : ( ( rule__Member__TypeAssignment_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6124:1: rule__Member__Group__1__Impl : ( ( rule__Member__TypeAssignment_1 ) ) ;
     public final void rule__Member__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6222:1: ( ( ( rule__Member__TypeAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6223:1: ( ( rule__Member__TypeAssignment_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6128:1: ( ( ( rule__Member__TypeAssignment_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6129:1: ( ( rule__Member__TypeAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6223:1: ( ( rule__Member__TypeAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6224:1: ( rule__Member__TypeAssignment_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6129:1: ( ( rule__Member__TypeAssignment_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6130:1: ( rule__Member__TypeAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMemberAccess().getTypeAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6225:1: ( rule__Member__TypeAssignment_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6225:2: rule__Member__TypeAssignment_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6131:1: ( rule__Member__TypeAssignment_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6131:2: rule__Member__TypeAssignment_1
             {
-            pushFollow(FOLLOW_rule__Member__TypeAssignment_1_in_rule__Member__Group__1__Impl13298);
+            pushFollow(FOLLOW_rule__Member__TypeAssignment_1_in_rule__Member__Group__1__Impl13112);
             rule__Member__TypeAssignment_1();
 
             state._fsp--;
@@ -19649,21 +19386,21 @@ public final void rule__Member__Group__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Member__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6235:1: rule__Member__Group__2 : rule__Member__Group__2__Impl rule__Member__Group__3 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6141:1: rule__Member__Group__2 : rule__Member__Group__2__Impl rule__Member__Group__3 ;
     public final void rule__Member__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6239:1: ( rule__Member__Group__2__Impl rule__Member__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6240:2: rule__Member__Group__2__Impl rule__Member__Group__3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6145:1: ( rule__Member__Group__2__Impl rule__Member__Group__3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6146:2: rule__Member__Group__2__Impl rule__Member__Group__3
             {
-            pushFollow(FOLLOW_rule__Member__Group__2__Impl_in_rule__Member__Group__213328);
+            pushFollow(FOLLOW_rule__Member__Group__2__Impl_in_rule__Member__Group__213142);
             rule__Member__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Member__Group__3_in_rule__Member__Group__213331);
+            pushFollow(FOLLOW_rule__Member__Group__3_in_rule__Member__Group__213145);
             rule__Member__Group__3();
 
             state._fsp--;
@@ -19687,25 +19424,25 @@ public final void rule__Member__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__Member__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6247:1: rule__Member__Group__2__Impl : ( ( rule__Member__NameAssignment_2 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6153:1: rule__Member__Group__2__Impl : ( ( rule__Member__NameAssignment_2 ) ) ;
     public final void rule__Member__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6251:1: ( ( ( rule__Member__NameAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6252:1: ( ( rule__Member__NameAssignment_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6157:1: ( ( ( rule__Member__NameAssignment_2 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6158:1: ( ( rule__Member__NameAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6252:1: ( ( rule__Member__NameAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6253:1: ( rule__Member__NameAssignment_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6158:1: ( ( rule__Member__NameAssignment_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6159:1: ( rule__Member__NameAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMemberAccess().getNameAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6254:1: ( rule__Member__NameAssignment_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6254:2: rule__Member__NameAssignment_2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6160:1: ( rule__Member__NameAssignment_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6160:2: rule__Member__NameAssignment_2
             {
-            pushFollow(FOLLOW_rule__Member__NameAssignment_2_in_rule__Member__Group__2__Impl13358);
+            pushFollow(FOLLOW_rule__Member__NameAssignment_2_in_rule__Member__Group__2__Impl13172);
             rule__Member__NameAssignment_2();
 
             state._fsp--;
@@ -19738,21 +19475,21 @@ public final void rule__Member__Group__2__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Member__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6264:1: rule__Member__Group__3 : rule__Member__Group__3__Impl rule__Member__Group__4 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6170:1: rule__Member__Group__3 : rule__Member__Group__3__Impl rule__Member__Group__4 ;
     public final void rule__Member__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6268:1: ( rule__Member__Group__3__Impl rule__Member__Group__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6269:2: rule__Member__Group__3__Impl rule__Member__Group__4
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6174:1: ( rule__Member__Group__3__Impl rule__Member__Group__4 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6175:2: rule__Member__Group__3__Impl rule__Member__Group__4
             {
-            pushFollow(FOLLOW_rule__Member__Group__3__Impl_in_rule__Member__Group__313388);
+            pushFollow(FOLLOW_rule__Member__Group__3__Impl_in_rule__Member__Group__313202);
             rule__Member__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Member__Group__4_in_rule__Member__Group__313391);
+            pushFollow(FOLLOW_rule__Member__Group__4_in_rule__Member__Group__313205);
             rule__Member__Group__4();
 
             state._fsp--;
@@ -19776,33 +19513,33 @@ public final void rule__Member__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__Member__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6276:1: rule__Member__Group__3__Impl : ( ( rule__Member__Group_3__0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6182:1: rule__Member__Group__3__Impl : ( ( rule__Member__Group_3__0 )? ) ;
     public final void rule__Member__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6280:1: ( ( ( rule__Member__Group_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6281:1: ( ( rule__Member__Group_3__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6186:1: ( ( ( rule__Member__Group_3__0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6187:1: ( ( rule__Member__Group_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6281:1: ( ( rule__Member__Group_3__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6282:1: ( rule__Member__Group_3__0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6187:1: ( ( rule__Member__Group_3__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6188:1: ( rule__Member__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMemberAccess().getGroup_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6283:1: ( rule__Member__Group_3__0 )?
-            int alt70=2;
-            int LA70_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6189:1: ( rule__Member__Group_3__0 )?
+            int alt69=2;
+            int LA69_0 = input.LA(1);
 
-            if ( (LA70_0==13) ) {
-                alt70=1;
+            if ( (LA69_0==13) ) {
+                alt69=1;
             }
-            switch (alt70) {
+            switch (alt69) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6283:2: rule__Member__Group_3__0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6189:2: rule__Member__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__Member__Group_3__0_in_rule__Member__Group__3__Impl13418);
+                    pushFollow(FOLLOW_rule__Member__Group_3__0_in_rule__Member__Group__3__Impl13232);
                     rule__Member__Group_3__0();
 
                     state._fsp--;
@@ -19838,16 +19575,16 @@ public final void rule__Member__Group__3__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Member__Group__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6293:1: rule__Member__Group__4 : rule__Member__Group__4__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6199:1: rule__Member__Group__4 : rule__Member__Group__4__Impl ;
     public final void rule__Member__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6297:1: ( rule__Member__Group__4__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6298:2: rule__Member__Group__4__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6203:1: ( rule__Member__Group__4__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6204:2: rule__Member__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__Member__Group__4__Impl_in_rule__Member__Group__413449);
+            pushFollow(FOLLOW_rule__Member__Group__4__Impl_in_rule__Member__Group__413263);
             rule__Member__Group__4__Impl();
 
             state._fsp--;
@@ -19871,22 +19608,22 @@ public final void rule__Member__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__Member__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6304:1: rule__Member__Group__4__Impl : ( ';' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6210:1: rule__Member__Group__4__Impl : ( ';' ) ;
     public final void rule__Member__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6308:1: ( ( ';' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6309:1: ( ';' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6214:1: ( ( ';' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6215:1: ( ';' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6309:1: ( ';' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6310:1: ';'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6215:1: ( ';' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6216:1: ';'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMemberAccess().getSemicolonKeyword_4()); 
             }
-            match(input,71,FOLLOW_71_in_rule__Member__Group__4__Impl13477); if (state.failed) return ;
+            match(input,71,FOLLOW_71_in_rule__Member__Group__4__Impl13291); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getMemberAccess().getSemicolonKeyword_4()); 
             }
@@ -19912,21 +19649,21 @@ public final void rule__Member__Group__4__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Member__Group_3__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6333:1: rule__Member__Group_3__0 : rule__Member__Group_3__0__Impl rule__Member__Group_3__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6239:1: rule__Member__Group_3__0 : rule__Member__Group_3__0__Impl rule__Member__Group_3__1 ;
     public final void rule__Member__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6337:1: ( rule__Member__Group_3__0__Impl rule__Member__Group_3__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6338:2: rule__Member__Group_3__0__Impl rule__Member__Group_3__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6243:1: ( rule__Member__Group_3__0__Impl rule__Member__Group_3__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6244:2: rule__Member__Group_3__0__Impl rule__Member__Group_3__1
             {
-            pushFollow(FOLLOW_rule__Member__Group_3__0__Impl_in_rule__Member__Group_3__013518);
+            pushFollow(FOLLOW_rule__Member__Group_3__0__Impl_in_rule__Member__Group_3__013332);
             rule__Member__Group_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Member__Group_3__1_in_rule__Member__Group_3__013521);
+            pushFollow(FOLLOW_rule__Member__Group_3__1_in_rule__Member__Group_3__013335);
             rule__Member__Group_3__1();
 
             state._fsp--;
@@ -19950,22 +19687,22 @@ public final void rule__Member__Group_3__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Member__Group_3__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6345:1: rule__Member__Group_3__0__Impl : ( ruleOpSingleAssign ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6251:1: rule__Member__Group_3__0__Impl : ( ruleOpSingleAssign ) ;
     public final void rule__Member__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6349:1: ( ( ruleOpSingleAssign ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6350:1: ( ruleOpSingleAssign )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6255:1: ( ( ruleOpSingleAssign ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6256:1: ( ruleOpSingleAssign )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6350:1: ( ruleOpSingleAssign )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6351:1: ruleOpSingleAssign
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6256:1: ( ruleOpSingleAssign )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6257:1: ruleOpSingleAssign
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMemberAccess().getOpSingleAssignParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleOpSingleAssign_in_rule__Member__Group_3__0__Impl13548);
+            pushFollow(FOLLOW_ruleOpSingleAssign_in_rule__Member__Group_3__0__Impl13362);
             ruleOpSingleAssign();
 
             state._fsp--;
@@ -19995,16 +19732,16 @@ public final void rule__Member__Group_3__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Member__Group_3__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6362:1: rule__Member__Group_3__1 : rule__Member__Group_3__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6268:1: rule__Member__Group_3__1 : rule__Member__Group_3__1__Impl ;
     public final void rule__Member__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6366:1: ( rule__Member__Group_3__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6367:2: rule__Member__Group_3__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6272:1: ( rule__Member__Group_3__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6273:2: rule__Member__Group_3__1__Impl
             {
-            pushFollow(FOLLOW_rule__Member__Group_3__1__Impl_in_rule__Member__Group_3__113577);
+            pushFollow(FOLLOW_rule__Member__Group_3__1__Impl_in_rule__Member__Group_3__113391);
             rule__Member__Group_3__1__Impl();
 
             state._fsp--;
@@ -20028,25 +19765,25 @@ public final void rule__Member__Group_3__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Member__Group_3__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6373:1: rule__Member__Group_3__1__Impl : ( ( rule__Member__ValueAssignment_3_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6279:1: rule__Member__Group_3__1__Impl : ( ( rule__Member__ValueAssignment_3_1 ) ) ;
     public final void rule__Member__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6377:1: ( ( ( rule__Member__ValueAssignment_3_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6378:1: ( ( rule__Member__ValueAssignment_3_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6283:1: ( ( ( rule__Member__ValueAssignment_3_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6284:1: ( ( rule__Member__ValueAssignment_3_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6378:1: ( ( rule__Member__ValueAssignment_3_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6379:1: ( rule__Member__ValueAssignment_3_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6284:1: ( ( rule__Member__ValueAssignment_3_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6285:1: ( rule__Member__ValueAssignment_3_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMemberAccess().getValueAssignment_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6380:1: ( rule__Member__ValueAssignment_3_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6380:2: rule__Member__ValueAssignment_3_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6286:1: ( rule__Member__ValueAssignment_3_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6286:2: rule__Member__ValueAssignment_3_1
             {
-            pushFollow(FOLLOW_rule__Member__ValueAssignment_3_1_in_rule__Member__Group_3__1__Impl13604);
+            pushFollow(FOLLOW_rule__Member__ValueAssignment_3_1_in_rule__Member__Group_3__1__Impl13418);
             rule__Member__ValueAssignment_3_1();
 
             state._fsp--;
@@ -20079,21 +19816,21 @@ public final void rule__Member__Group_3__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Implementation__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6394:1: rule__Implementation__Group__0 : rule__Implementation__Group__0__Impl rule__Implementation__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6300:1: rule__Implementation__Group__0 : rule__Implementation__Group__0__Impl rule__Implementation__Group__1 ;
     public final void rule__Implementation__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6398:1: ( rule__Implementation__Group__0__Impl rule__Implementation__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6399:2: rule__Implementation__Group__0__Impl rule__Implementation__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6304:1: ( rule__Implementation__Group__0__Impl rule__Implementation__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6305:2: rule__Implementation__Group__0__Impl rule__Implementation__Group__1
             {
-            pushFollow(FOLLOW_rule__Implementation__Group__0__Impl_in_rule__Implementation__Group__013638);
+            pushFollow(FOLLOW_rule__Implementation__Group__0__Impl_in_rule__Implementation__Group__013452);
             rule__Implementation__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Implementation__Group__1_in_rule__Implementation__Group__013641);
+            pushFollow(FOLLOW_rule__Implementation__Group__1_in_rule__Implementation__Group__013455);
             rule__Implementation__Group__1();
 
             state._fsp--;
@@ -20117,22 +19854,22 @@ public final void rule__Implementation__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Implementation__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6406:1: rule__Implementation__Group__0__Impl : ( 'def' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6312:1: rule__Implementation__Group__0__Impl : ( 'def' ) ;
     public final void rule__Implementation__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6410:1: ( ( 'def' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6411:1: ( 'def' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6316:1: ( ( 'def' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6317:1: ( 'def' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6411:1: ( 'def' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6412:1: 'def'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6317:1: ( 'def' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6318:1: 'def'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImplementationAccess().getDefKeyword_0()); 
             }
-            match(input,76,FOLLOW_76_in_rule__Implementation__Group__0__Impl13669); if (state.failed) return ;
+            match(input,76,FOLLOW_76_in_rule__Implementation__Group__0__Impl13483); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getImplementationAccess().getDefKeyword_0()); 
             }
@@ -20158,21 +19895,21 @@ public final void rule__Implementation__Group__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__Implementation__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6425:1: rule__Implementation__Group__1 : rule__Implementation__Group__1__Impl rule__Implementation__Group__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6331:1: rule__Implementation__Group__1 : rule__Implementation__Group__1__Impl rule__Implementation__Group__2 ;
     public final void rule__Implementation__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6429:1: ( rule__Implementation__Group__1__Impl rule__Implementation__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6430:2: rule__Implementation__Group__1__Impl rule__Implementation__Group__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6335:1: ( rule__Implementation__Group__1__Impl rule__Implementation__Group__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6336:2: rule__Implementation__Group__1__Impl rule__Implementation__Group__2
             {
-            pushFollow(FOLLOW_rule__Implementation__Group__1__Impl_in_rule__Implementation__Group__113700);
+            pushFollow(FOLLOW_rule__Implementation__Group__1__Impl_in_rule__Implementation__Group__113514);
             rule__Implementation__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Implementation__Group__2_in_rule__Implementation__Group__113703);
+            pushFollow(FOLLOW_rule__Implementation__Group__2_in_rule__Implementation__Group__113517);
             rule__Implementation__Group__2();
 
             state._fsp--;
@@ -20196,25 +19933,25 @@ public final void rule__Implementation__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Implementation__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6437:1: rule__Implementation__Group__1__Impl : ( ( rule__Implementation__NameAssignment_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6343:1: rule__Implementation__Group__1__Impl : ( ( rule__Implementation__NameAssignment_1 ) ) ;
     public final void rule__Implementation__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6441:1: ( ( ( rule__Implementation__NameAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6442:1: ( ( rule__Implementation__NameAssignment_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6347:1: ( ( ( rule__Implementation__NameAssignment_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6348:1: ( ( rule__Implementation__NameAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6442:1: ( ( rule__Implementation__NameAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6443:1: ( rule__Implementation__NameAssignment_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6348:1: ( ( rule__Implementation__NameAssignment_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6349:1: ( rule__Implementation__NameAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImplementationAccess().getNameAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6444:1: ( rule__Implementation__NameAssignment_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6444:2: rule__Implementation__NameAssignment_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6350:1: ( rule__Implementation__NameAssignment_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6350:2: rule__Implementation__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__Implementation__NameAssignment_1_in_rule__Implementation__Group__1__Impl13730);
+            pushFollow(FOLLOW_rule__Implementation__NameAssignment_1_in_rule__Implementation__Group__1__Impl13544);
             rule__Implementation__NameAssignment_1();
 
             state._fsp--;
@@ -20247,16 +19984,16 @@ public final void rule__Implementation__Group__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__Implementation__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6454:1: rule__Implementation__Group__2 : rule__Implementation__Group__2__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6360:1: rule__Implementation__Group__2 : rule__Implementation__Group__2__Impl ;
     public final void rule__Implementation__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6458:1: ( rule__Implementation__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6459:2: rule__Implementation__Group__2__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6364:1: ( rule__Implementation__Group__2__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6365:2: rule__Implementation__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__Implementation__Group__2__Impl_in_rule__Implementation__Group__213760);
+            pushFollow(FOLLOW_rule__Implementation__Group__2__Impl_in_rule__Implementation__Group__213574);
             rule__Implementation__Group__2__Impl();
 
             state._fsp--;
@@ -20280,25 +20017,25 @@ public final void rule__Implementation__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__Implementation__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6465:1: rule__Implementation__Group__2__Impl : ( ( rule__Implementation__ContextAssignment_2 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6371:1: rule__Implementation__Group__2__Impl : ( ( rule__Implementation__ContextAssignment_2 ) ) ;
     public final void rule__Implementation__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6469:1: ( ( ( rule__Implementation__ContextAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6470:1: ( ( rule__Implementation__ContextAssignment_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6375:1: ( ( ( rule__Implementation__ContextAssignment_2 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6376:1: ( ( rule__Implementation__ContextAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6470:1: ( ( rule__Implementation__ContextAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6471:1: ( rule__Implementation__ContextAssignment_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6376:1: ( ( rule__Implementation__ContextAssignment_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6377:1: ( rule__Implementation__ContextAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImplementationAccess().getContextAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6472:1: ( rule__Implementation__ContextAssignment_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6472:2: rule__Implementation__ContextAssignment_2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6378:1: ( rule__Implementation__ContextAssignment_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6378:2: rule__Implementation__ContextAssignment_2
             {
-            pushFollow(FOLLOW_rule__Implementation__ContextAssignment_2_in_rule__Implementation__Group__2__Impl13787);
+            pushFollow(FOLLOW_rule__Implementation__ContextAssignment_2_in_rule__Implementation__Group__2__Impl13601);
             rule__Implementation__ContextAssignment_2();
 
             state._fsp--;
@@ -20331,21 +20068,21 @@ public final void rule__Implementation__Group__2__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__FormalParameter__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6488:1: rule__FormalParameter__Group__0 : rule__FormalParameter__Group__0__Impl rule__FormalParameter__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6394:1: rule__FormalParameter__Group__0 : rule__FormalParameter__Group__0__Impl rule__FormalParameter__Group__1 ;
     public final void rule__FormalParameter__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6492:1: ( rule__FormalParameter__Group__0__Impl rule__FormalParameter__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6493:2: rule__FormalParameter__Group__0__Impl rule__FormalParameter__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6398:1: ( rule__FormalParameter__Group__0__Impl rule__FormalParameter__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6399:2: rule__FormalParameter__Group__0__Impl rule__FormalParameter__Group__1
             {
-            pushFollow(FOLLOW_rule__FormalParameter__Group__0__Impl_in_rule__FormalParameter__Group__013823);
+            pushFollow(FOLLOW_rule__FormalParameter__Group__0__Impl_in_rule__FormalParameter__Group__013637);
             rule__FormalParameter__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__FormalParameter__Group__1_in_rule__FormalParameter__Group__013826);
+            pushFollow(FOLLOW_rule__FormalParameter__Group__1_in_rule__FormalParameter__Group__013640);
             rule__FormalParameter__Group__1();
 
             state._fsp--;
@@ -20369,25 +20106,25 @@ public final void rule__FormalParameter__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__FormalParameter__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6500:1: rule__FormalParameter__Group__0__Impl : ( ( rule__FormalParameter__TypeAssignment_0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6406:1: rule__FormalParameter__Group__0__Impl : ( ( rule__FormalParameter__TypeAssignment_0 ) ) ;
     public final void rule__FormalParameter__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6504:1: ( ( ( rule__FormalParameter__TypeAssignment_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6505:1: ( ( rule__FormalParameter__TypeAssignment_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6410:1: ( ( ( rule__FormalParameter__TypeAssignment_0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6411:1: ( ( rule__FormalParameter__TypeAssignment_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6505:1: ( ( rule__FormalParameter__TypeAssignment_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6506:1: ( rule__FormalParameter__TypeAssignment_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6411:1: ( ( rule__FormalParameter__TypeAssignment_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6412:1: ( rule__FormalParameter__TypeAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormalParameterAccess().getTypeAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6507:1: ( rule__FormalParameter__TypeAssignment_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6507:2: rule__FormalParameter__TypeAssignment_0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6413:1: ( rule__FormalParameter__TypeAssignment_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6413:2: rule__FormalParameter__TypeAssignment_0
             {
-            pushFollow(FOLLOW_rule__FormalParameter__TypeAssignment_0_in_rule__FormalParameter__Group__0__Impl13853);
+            pushFollow(FOLLOW_rule__FormalParameter__TypeAssignment_0_in_rule__FormalParameter__Group__0__Impl13667);
             rule__FormalParameter__TypeAssignment_0();
 
             state._fsp--;
@@ -20420,21 +20157,21 @@ public final void rule__FormalParameter__Group__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__FormalParameter__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6517:1: rule__FormalParameter__Group__1 : rule__FormalParameter__Group__1__Impl rule__FormalParameter__Group__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6423:1: rule__FormalParameter__Group__1 : rule__FormalParameter__Group__1__Impl rule__FormalParameter__Group__2 ;
     public final void rule__FormalParameter__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6521:1: ( rule__FormalParameter__Group__1__Impl rule__FormalParameter__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6522:2: rule__FormalParameter__Group__1__Impl rule__FormalParameter__Group__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6427:1: ( rule__FormalParameter__Group__1__Impl rule__FormalParameter__Group__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6428:2: rule__FormalParameter__Group__1__Impl rule__FormalParameter__Group__2
             {
-            pushFollow(FOLLOW_rule__FormalParameter__Group__1__Impl_in_rule__FormalParameter__Group__113883);
+            pushFollow(FOLLOW_rule__FormalParameter__Group__1__Impl_in_rule__FormalParameter__Group__113697);
             rule__FormalParameter__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__FormalParameter__Group__2_in_rule__FormalParameter__Group__113886);
+            pushFollow(FOLLOW_rule__FormalParameter__Group__2_in_rule__FormalParameter__Group__113700);
             rule__FormalParameter__Group__2();
 
             state._fsp--;
@@ -20458,25 +20195,25 @@ public final void rule__FormalParameter__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__FormalParameter__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6529:1: rule__FormalParameter__Group__1__Impl : ( ( rule__FormalParameter__NameAssignment_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6435:1: rule__FormalParameter__Group__1__Impl : ( ( rule__FormalParameter__NameAssignment_1 ) ) ;
     public final void rule__FormalParameter__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6533:1: ( ( ( rule__FormalParameter__NameAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6534:1: ( ( rule__FormalParameter__NameAssignment_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6439:1: ( ( ( rule__FormalParameter__NameAssignment_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6440:1: ( ( rule__FormalParameter__NameAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6534:1: ( ( rule__FormalParameter__NameAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6535:1: ( rule__FormalParameter__NameAssignment_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6440:1: ( ( rule__FormalParameter__NameAssignment_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6441:1: ( rule__FormalParameter__NameAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormalParameterAccess().getNameAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6536:1: ( rule__FormalParameter__NameAssignment_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6536:2: rule__FormalParameter__NameAssignment_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6442:1: ( rule__FormalParameter__NameAssignment_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6442:2: rule__FormalParameter__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__FormalParameter__NameAssignment_1_in_rule__FormalParameter__Group__1__Impl13913);
+            pushFollow(FOLLOW_rule__FormalParameter__NameAssignment_1_in_rule__FormalParameter__Group__1__Impl13727);
             rule__FormalParameter__NameAssignment_1();
 
             state._fsp--;
@@ -20509,21 +20246,21 @@ public final void rule__FormalParameter__Group__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__FormalParameter__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6546:1: rule__FormalParameter__Group__2 : rule__FormalParameter__Group__2__Impl rule__FormalParameter__Group__3 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6452:1: rule__FormalParameter__Group__2 : rule__FormalParameter__Group__2__Impl rule__FormalParameter__Group__3 ;
     public final void rule__FormalParameter__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6550:1: ( rule__FormalParameter__Group__2__Impl rule__FormalParameter__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6551:2: rule__FormalParameter__Group__2__Impl rule__FormalParameter__Group__3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6456:1: ( rule__FormalParameter__Group__2__Impl rule__FormalParameter__Group__3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6457:2: rule__FormalParameter__Group__2__Impl rule__FormalParameter__Group__3
             {
-            pushFollow(FOLLOW_rule__FormalParameter__Group__2__Impl_in_rule__FormalParameter__Group__213943);
+            pushFollow(FOLLOW_rule__FormalParameter__Group__2__Impl_in_rule__FormalParameter__Group__213757);
             rule__FormalParameter__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__FormalParameter__Group__3_in_rule__FormalParameter__Group__213946);
+            pushFollow(FOLLOW_rule__FormalParameter__Group__3_in_rule__FormalParameter__Group__213760);
             rule__FormalParameter__Group__3();
 
             state._fsp--;
@@ -20547,22 +20284,22 @@ public final void rule__FormalParameter__Group__2() throws RecognitionException
 
 
     // $ANTLR start "rule__FormalParameter__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6558:1: rule__FormalParameter__Group__2__Impl : ( '=' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6464:1: rule__FormalParameter__Group__2__Impl : ( '=' ) ;
     public final void rule__FormalParameter__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6562:1: ( ( '=' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6563:1: ( '=' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6468:1: ( ( '=' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6469:1: ( '=' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6563:1: ( '=' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6564:1: '='
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6469:1: ( '=' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6470:1: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormalParameterAccess().getEqualsSignKeyword_2()); 
             }
-            match(input,13,FOLLOW_13_in_rule__FormalParameter__Group__2__Impl13974); if (state.failed) return ;
+            match(input,13,FOLLOW_13_in_rule__FormalParameter__Group__2__Impl13788); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getFormalParameterAccess().getEqualsSignKeyword_2()); 
             }
@@ -20588,21 +20325,21 @@ public final void rule__FormalParameter__Group__2__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__FormalParameter__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6577:1: rule__FormalParameter__Group__3 : rule__FormalParameter__Group__3__Impl rule__FormalParameter__Group__4 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6483:1: rule__FormalParameter__Group__3 : rule__FormalParameter__Group__3__Impl rule__FormalParameter__Group__4 ;
     public final void rule__FormalParameter__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6581:1: ( rule__FormalParameter__Group__3__Impl rule__FormalParameter__Group__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6582:2: rule__FormalParameter__Group__3__Impl rule__FormalParameter__Group__4
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6487:1: ( rule__FormalParameter__Group__3__Impl rule__FormalParameter__Group__4 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6488:2: rule__FormalParameter__Group__3__Impl rule__FormalParameter__Group__4
             {
-            pushFollow(FOLLOW_rule__FormalParameter__Group__3__Impl_in_rule__FormalParameter__Group__314005);
+            pushFollow(FOLLOW_rule__FormalParameter__Group__3__Impl_in_rule__FormalParameter__Group__313819);
             rule__FormalParameter__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__FormalParameter__Group__4_in_rule__FormalParameter__Group__314008);
+            pushFollow(FOLLOW_rule__FormalParameter__Group__4_in_rule__FormalParameter__Group__313822);
             rule__FormalParameter__Group__4();
 
             state._fsp--;
@@ -20626,25 +20363,25 @@ public final void rule__FormalParameter__Group__3() throws RecognitionException
 
 
     // $ANTLR start "rule__FormalParameter__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6589:1: rule__FormalParameter__Group__3__Impl : ( ( rule__FormalParameter__RightAssignment_3 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6495:1: rule__FormalParameter__Group__3__Impl : ( ( rule__FormalParameter__RightAssignment_3 ) ) ;
     public final void rule__FormalParameter__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6593:1: ( ( ( rule__FormalParameter__RightAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6594:1: ( ( rule__FormalParameter__RightAssignment_3 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6499:1: ( ( ( rule__FormalParameter__RightAssignment_3 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6500:1: ( ( rule__FormalParameter__RightAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6594:1: ( ( rule__FormalParameter__RightAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6595:1: ( rule__FormalParameter__RightAssignment_3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6500:1: ( ( rule__FormalParameter__RightAssignment_3 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6501:1: ( rule__FormalParameter__RightAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormalParameterAccess().getRightAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6596:1: ( rule__FormalParameter__RightAssignment_3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6596:2: rule__FormalParameter__RightAssignment_3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6502:1: ( rule__FormalParameter__RightAssignment_3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6502:2: rule__FormalParameter__RightAssignment_3
             {
-            pushFollow(FOLLOW_rule__FormalParameter__RightAssignment_3_in_rule__FormalParameter__Group__3__Impl14035);
+            pushFollow(FOLLOW_rule__FormalParameter__RightAssignment_3_in_rule__FormalParameter__Group__3__Impl13849);
             rule__FormalParameter__RightAssignment_3();
 
             state._fsp--;
@@ -20677,16 +20414,16 @@ public final void rule__FormalParameter__Group__3__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__FormalParameter__Group__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6606:1: rule__FormalParameter__Group__4 : rule__FormalParameter__Group__4__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6512:1: rule__FormalParameter__Group__4 : rule__FormalParameter__Group__4__Impl ;
     public final void rule__FormalParameter__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6610:1: ( rule__FormalParameter__Group__4__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6611:2: rule__FormalParameter__Group__4__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6516:1: ( rule__FormalParameter__Group__4__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6517:2: rule__FormalParameter__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__FormalParameter__Group__4__Impl_in_rule__FormalParameter__Group__414065);
+            pushFollow(FOLLOW_rule__FormalParameter__Group__4__Impl_in_rule__FormalParameter__Group__413879);
             rule__FormalParameter__Group__4__Impl();
 
             state._fsp--;
@@ -20710,33 +20447,33 @@ public final void rule__FormalParameter__Group__4() throws RecognitionException
 
 
     // $ANTLR start "rule__FormalParameter__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6617:1: rule__FormalParameter__Group__4__Impl : ( ( rule__FormalParameter__LabelAssignment_4 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6523:1: rule__FormalParameter__Group__4__Impl : ( ( rule__FormalParameter__LabelAssignment_4 )? ) ;
     public final void rule__FormalParameter__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6621:1: ( ( ( rule__FormalParameter__LabelAssignment_4 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6622:1: ( ( rule__FormalParameter__LabelAssignment_4 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6527:1: ( ( ( rule__FormalParameter__LabelAssignment_4 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6528:1: ( ( rule__FormalParameter__LabelAssignment_4 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6622:1: ( ( rule__FormalParameter__LabelAssignment_4 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6623:1: ( rule__FormalParameter__LabelAssignment_4 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6528:1: ( ( rule__FormalParameter__LabelAssignment_4 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6529:1: ( rule__FormalParameter__LabelAssignment_4 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormalParameterAccess().getLabelAssignment_4()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6624:1: ( rule__FormalParameter__LabelAssignment_4 )?
-            int alt71=2;
-            int LA71_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6530:1: ( rule__FormalParameter__LabelAssignment_4 )?
+            int alt70=2;
+            int LA70_0 = input.LA(1);
 
-            if ( (LA71_0==RULE_STRING) ) {
-                alt71=1;
+            if ( (LA70_0==RULE_STRING) ) {
+                alt70=1;
             }
-            switch (alt71) {
+            switch (alt70) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6624:2: rule__FormalParameter__LabelAssignment_4
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6530:2: rule__FormalParameter__LabelAssignment_4
                     {
-                    pushFollow(FOLLOW_rule__FormalParameter__LabelAssignment_4_in_rule__FormalParameter__Group__4__Impl14092);
+                    pushFollow(FOLLOW_rule__FormalParameter__LabelAssignment_4_in_rule__FormalParameter__Group__4__Impl13906);
                     rule__FormalParameter__LabelAssignment_4();
 
                     state._fsp--;
@@ -20772,21 +20509,21 @@ public final void rule__FormalParameter__Group__4__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XConstantUnaryOperation__Group_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6644:1: rule__XConstantUnaryOperation__Group_0__0 : rule__XConstantUnaryOperation__Group_0__0__Impl rule__XConstantUnaryOperation__Group_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6550:1: rule__XConstantUnaryOperation__Group_0__0 : rule__XConstantUnaryOperation__Group_0__0__Impl rule__XConstantUnaryOperation__Group_0__1 ;
     public final void rule__XConstantUnaryOperation__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6648:1: ( rule__XConstantUnaryOperation__Group_0__0__Impl rule__XConstantUnaryOperation__Group_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6649:2: rule__XConstantUnaryOperation__Group_0__0__Impl rule__XConstantUnaryOperation__Group_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6554:1: ( rule__XConstantUnaryOperation__Group_0__0__Impl rule__XConstantUnaryOperation__Group_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6555:2: rule__XConstantUnaryOperation__Group_0__0__Impl rule__XConstantUnaryOperation__Group_0__1
             {
-            pushFollow(FOLLOW_rule__XConstantUnaryOperation__Group_0__0__Impl_in_rule__XConstantUnaryOperation__Group_0__014133);
+            pushFollow(FOLLOW_rule__XConstantUnaryOperation__Group_0__0__Impl_in_rule__XConstantUnaryOperation__Group_0__013947);
             rule__XConstantUnaryOperation__Group_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstantUnaryOperation__Group_0__1_in_rule__XConstantUnaryOperation__Group_0__014136);
+            pushFollow(FOLLOW_rule__XConstantUnaryOperation__Group_0__1_in_rule__XConstantUnaryOperation__Group_0__013950);
             rule__XConstantUnaryOperation__Group_0__1();
 
             state._fsp--;
@@ -20810,23 +20547,23 @@ public final void rule__XConstantUnaryOperation__Group_0__0() throws Recognition
 
 
     // $ANTLR start "rule__XConstantUnaryOperation__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6656:1: rule__XConstantUnaryOperation__Group_0__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6562:1: rule__XConstantUnaryOperation__Group_0__0__Impl : ( () ) ;
     public final void rule__XConstantUnaryOperation__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6660:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6661:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6566:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6567:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6661:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6662:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6567:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6568:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantUnaryOperationAccess().getXUnaryOperationAction_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6663:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6665:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6569:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6571:1: 
             {
             }
 
@@ -20851,21 +20588,21 @@ public final void rule__XConstantUnaryOperation__Group_0__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XConstantUnaryOperation__Group_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6675:1: rule__XConstantUnaryOperation__Group_0__1 : rule__XConstantUnaryOperation__Group_0__1__Impl rule__XConstantUnaryOperation__Group_0__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6581:1: rule__XConstantUnaryOperation__Group_0__1 : rule__XConstantUnaryOperation__Group_0__1__Impl rule__XConstantUnaryOperation__Group_0__2 ;
     public final void rule__XConstantUnaryOperation__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6679:1: ( rule__XConstantUnaryOperation__Group_0__1__Impl rule__XConstantUnaryOperation__Group_0__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6680:2: rule__XConstantUnaryOperation__Group_0__1__Impl rule__XConstantUnaryOperation__Group_0__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6585:1: ( rule__XConstantUnaryOperation__Group_0__1__Impl rule__XConstantUnaryOperation__Group_0__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6586:2: rule__XConstantUnaryOperation__Group_0__1__Impl rule__XConstantUnaryOperation__Group_0__2
             {
-            pushFollow(FOLLOW_rule__XConstantUnaryOperation__Group_0__1__Impl_in_rule__XConstantUnaryOperation__Group_0__114194);
+            pushFollow(FOLLOW_rule__XConstantUnaryOperation__Group_0__1__Impl_in_rule__XConstantUnaryOperation__Group_0__114008);
             rule__XConstantUnaryOperation__Group_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstantUnaryOperation__Group_0__2_in_rule__XConstantUnaryOperation__Group_0__114197);
+            pushFollow(FOLLOW_rule__XConstantUnaryOperation__Group_0__2_in_rule__XConstantUnaryOperation__Group_0__114011);
             rule__XConstantUnaryOperation__Group_0__2();
 
             state._fsp--;
@@ -20889,25 +20626,25 @@ public final void rule__XConstantUnaryOperation__Group_0__1() throws Recognition
 
 
     // $ANTLR start "rule__XConstantUnaryOperation__Group_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6687:1: rule__XConstantUnaryOperation__Group_0__1__Impl : ( ( rule__XConstantUnaryOperation__FeatureAssignment_0_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6593:1: rule__XConstantUnaryOperation__Group_0__1__Impl : ( ( rule__XConstantUnaryOperation__FeatureAssignment_0_1 ) ) ;
     public final void rule__XConstantUnaryOperation__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6691:1: ( ( ( rule__XConstantUnaryOperation__FeatureAssignment_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6692:1: ( ( rule__XConstantUnaryOperation__FeatureAssignment_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6597:1: ( ( ( rule__XConstantUnaryOperation__FeatureAssignment_0_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6598:1: ( ( rule__XConstantUnaryOperation__FeatureAssignment_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6692:1: ( ( rule__XConstantUnaryOperation__FeatureAssignment_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6693:1: ( rule__XConstantUnaryOperation__FeatureAssignment_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6598:1: ( ( rule__XConstantUnaryOperation__FeatureAssignment_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6599:1: ( rule__XConstantUnaryOperation__FeatureAssignment_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantUnaryOperationAccess().getFeatureAssignment_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6694:1: ( rule__XConstantUnaryOperation__FeatureAssignment_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6694:2: rule__XConstantUnaryOperation__FeatureAssignment_0_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6600:1: ( rule__XConstantUnaryOperation__FeatureAssignment_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6600:2: rule__XConstantUnaryOperation__FeatureAssignment_0_1
             {
-            pushFollow(FOLLOW_rule__XConstantUnaryOperation__FeatureAssignment_0_1_in_rule__XConstantUnaryOperation__Group_0__1__Impl14224);
+            pushFollow(FOLLOW_rule__XConstantUnaryOperation__FeatureAssignment_0_1_in_rule__XConstantUnaryOperation__Group_0__1__Impl14038);
             rule__XConstantUnaryOperation__FeatureAssignment_0_1();
 
             state._fsp--;
@@ -20940,16 +20677,16 @@ public final void rule__XConstantUnaryOperation__Group_0__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__XConstantUnaryOperation__Group_0__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6704:1: rule__XConstantUnaryOperation__Group_0__2 : rule__XConstantUnaryOperation__Group_0__2__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6610:1: rule__XConstantUnaryOperation__Group_0__2 : rule__XConstantUnaryOperation__Group_0__2__Impl ;
     public final void rule__XConstantUnaryOperation__Group_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6708:1: ( rule__XConstantUnaryOperation__Group_0__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6709:2: rule__XConstantUnaryOperation__Group_0__2__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6614:1: ( rule__XConstantUnaryOperation__Group_0__2__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6615:2: rule__XConstantUnaryOperation__Group_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__XConstantUnaryOperation__Group_0__2__Impl_in_rule__XConstantUnaryOperation__Group_0__214254);
+            pushFollow(FOLLOW_rule__XConstantUnaryOperation__Group_0__2__Impl_in_rule__XConstantUnaryOperation__Group_0__214068);
             rule__XConstantUnaryOperation__Group_0__2__Impl();
 
             state._fsp--;
@@ -20973,25 +20710,25 @@ public final void rule__XConstantUnaryOperation__Group_0__2() throws Recognition
 
 
     // $ANTLR start "rule__XConstantUnaryOperation__Group_0__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6715:1: rule__XConstantUnaryOperation__Group_0__2__Impl : ( ( rule__XConstantUnaryOperation__OperandAssignment_0_2 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6621:1: rule__XConstantUnaryOperation__Group_0__2__Impl : ( ( rule__XConstantUnaryOperation__OperandAssignment_0_2 ) ) ;
     public final void rule__XConstantUnaryOperation__Group_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6719:1: ( ( ( rule__XConstantUnaryOperation__OperandAssignment_0_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6720:1: ( ( rule__XConstantUnaryOperation__OperandAssignment_0_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6625:1: ( ( ( rule__XConstantUnaryOperation__OperandAssignment_0_2 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6626:1: ( ( rule__XConstantUnaryOperation__OperandAssignment_0_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6720:1: ( ( rule__XConstantUnaryOperation__OperandAssignment_0_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6721:1: ( rule__XConstantUnaryOperation__OperandAssignment_0_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6626:1: ( ( rule__XConstantUnaryOperation__OperandAssignment_0_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6627:1: ( rule__XConstantUnaryOperation__OperandAssignment_0_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantUnaryOperationAccess().getOperandAssignment_0_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6722:1: ( rule__XConstantUnaryOperation__OperandAssignment_0_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6722:2: rule__XConstantUnaryOperation__OperandAssignment_0_2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6628:1: ( rule__XConstantUnaryOperation__OperandAssignment_0_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6628:2: rule__XConstantUnaryOperation__OperandAssignment_0_2
             {
-            pushFollow(FOLLOW_rule__XConstantUnaryOperation__OperandAssignment_0_2_in_rule__XConstantUnaryOperation__Group_0__2__Impl14281);
+            pushFollow(FOLLOW_rule__XConstantUnaryOperation__OperandAssignment_0_2_in_rule__XConstantUnaryOperation__Group_0__2__Impl14095);
             rule__XConstantUnaryOperation__OperandAssignment_0_2();
 
             state._fsp--;
@@ -21024,21 +20761,21 @@ public final void rule__XConstantUnaryOperation__Group_0__2__Impl() throws Recog
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6738:1: rule__XConstantListLiteral__Group__0 : rule__XConstantListLiteral__Group__0__Impl rule__XConstantListLiteral__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6644:1: rule__XConstantListLiteral__Group__0 : rule__XConstantListLiteral__Group__0__Impl rule__XConstantListLiteral__Group__1 ;
     public final void rule__XConstantListLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6742:1: ( rule__XConstantListLiteral__Group__0__Impl rule__XConstantListLiteral__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6743:2: rule__XConstantListLiteral__Group__0__Impl rule__XConstantListLiteral__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6648:1: ( rule__XConstantListLiteral__Group__0__Impl rule__XConstantListLiteral__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6649:2: rule__XConstantListLiteral__Group__0__Impl rule__XConstantListLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group__0__Impl_in_rule__XConstantListLiteral__Group__014317);
+            pushFollow(FOLLOW_rule__XConstantListLiteral__Group__0__Impl_in_rule__XConstantListLiteral__Group__014131);
             rule__XConstantListLiteral__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group__1_in_rule__XConstantListLiteral__Group__014320);
+            pushFollow(FOLLOW_rule__XConstantListLiteral__Group__1_in_rule__XConstantListLiteral__Group__014134);
             rule__XConstantListLiteral__Group__1();
 
             state._fsp--;
@@ -21062,23 +20799,23 @@ public final void rule__XConstantListLiteral__Group__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6750:1: rule__XConstantListLiteral__Group__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6656:1: rule__XConstantListLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XConstantListLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6754:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6755:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6660:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6661:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6755:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6756:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6661:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6662:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantListLiteralAccess().getXListLiteralAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6757:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6759:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6663:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6665:1: 
             {
             }
 
@@ -21103,21 +20840,21 @@ public final void rule__XConstantListLiteral__Group__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6769:1: rule__XConstantListLiteral__Group__1 : rule__XConstantListLiteral__Group__1__Impl rule__XConstantListLiteral__Group__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6675:1: rule__XConstantListLiteral__Group__1 : rule__XConstantListLiteral__Group__1__Impl rule__XConstantListLiteral__Group__2 ;
     public final void rule__XConstantListLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6773:1: ( rule__XConstantListLiteral__Group__1__Impl rule__XConstantListLiteral__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6774:2: rule__XConstantListLiteral__Group__1__Impl rule__XConstantListLiteral__Group__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6679:1: ( rule__XConstantListLiteral__Group__1__Impl rule__XConstantListLiteral__Group__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6680:2: rule__XConstantListLiteral__Group__1__Impl rule__XConstantListLiteral__Group__2
             {
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group__1__Impl_in_rule__XConstantListLiteral__Group__114378);
+            pushFollow(FOLLOW_rule__XConstantListLiteral__Group__1__Impl_in_rule__XConstantListLiteral__Group__114192);
             rule__XConstantListLiteral__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group__2_in_rule__XConstantListLiteral__Group__114381);
+            pushFollow(FOLLOW_rule__XConstantListLiteral__Group__2_in_rule__XConstantListLiteral__Group__114195);
             rule__XConstantListLiteral__Group__2();
 
             state._fsp--;
@@ -21141,22 +20878,22 @@ public final void rule__XConstantListLiteral__Group__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6781:1: rule__XConstantListLiteral__Group__1__Impl : ( '#' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6687:1: rule__XConstantListLiteral__Group__1__Impl : ( '#' ) ;
     public final void rule__XConstantListLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6785:1: ( ( '#' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6786:1: ( '#' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6691:1: ( ( '#' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6692:1: ( '#' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6786:1: ( '#' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6787:1: '#'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6692:1: ( '#' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6693:1: '#'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantListLiteralAccess().getNumberSignKeyword_1()); 
             }
-            match(input,77,FOLLOW_77_in_rule__XConstantListLiteral__Group__1__Impl14409); if (state.failed) return ;
+            match(input,77,FOLLOW_77_in_rule__XConstantListLiteral__Group__1__Impl14223); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstantListLiteralAccess().getNumberSignKeyword_1()); 
             }
@@ -21182,21 +20919,21 @@ public final void rule__XConstantListLiteral__Group__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6800:1: rule__XConstantListLiteral__Group__2 : rule__XConstantListLiteral__Group__2__Impl rule__XConstantListLiteral__Group__3 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6706:1: rule__XConstantListLiteral__Group__2 : rule__XConstantListLiteral__Group__2__Impl rule__XConstantListLiteral__Group__3 ;
     public final void rule__XConstantListLiteral__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6804:1: ( rule__XConstantListLiteral__Group__2__Impl rule__XConstantListLiteral__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6805:2: rule__XConstantListLiteral__Group__2__Impl rule__XConstantListLiteral__Group__3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6710:1: ( rule__XConstantListLiteral__Group__2__Impl rule__XConstantListLiteral__Group__3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6711:2: rule__XConstantListLiteral__Group__2__Impl rule__XConstantListLiteral__Group__3
             {
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group__2__Impl_in_rule__XConstantListLiteral__Group__214440);
+            pushFollow(FOLLOW_rule__XConstantListLiteral__Group__2__Impl_in_rule__XConstantListLiteral__Group__214254);
             rule__XConstantListLiteral__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group__3_in_rule__XConstantListLiteral__Group__214443);
+            pushFollow(FOLLOW_rule__XConstantListLiteral__Group__3_in_rule__XConstantListLiteral__Group__214257);
             rule__XConstantListLiteral__Group__3();
 
             state._fsp--;
@@ -21220,22 +20957,22 @@ public final void rule__XConstantListLiteral__Group__2() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6812:1: rule__XConstantListLiteral__Group__2__Impl : ( '[' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6718:1: rule__XConstantListLiteral__Group__2__Impl : ( '[' ) ;
     public final void rule__XConstantListLiteral__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6816:1: ( ( '[' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6817:1: ( '[' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6722:1: ( ( '[' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6723:1: ( '[' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6817:1: ( '[' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6818:1: '['
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6723:1: ( '[' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6724:1: '['
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantListLiteralAccess().getLeftSquareBracketKeyword_2()); 
             }
-            match(input,78,FOLLOW_78_in_rule__XConstantListLiteral__Group__2__Impl14471); if (state.failed) return ;
+            match(input,78,FOLLOW_78_in_rule__XConstantListLiteral__Group__2__Impl14285); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstantListLiteralAccess().getLeftSquareBracketKeyword_2()); 
             }
@@ -21261,21 +20998,21 @@ public final void rule__XConstantListLiteral__Group__2__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6831:1: rule__XConstantListLiteral__Group__3 : rule__XConstantListLiteral__Group__3__Impl rule__XConstantListLiteral__Group__4 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6737:1: rule__XConstantListLiteral__Group__3 : rule__XConstantListLiteral__Group__3__Impl rule__XConstantListLiteral__Group__4 ;
     public final void rule__XConstantListLiteral__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6835:1: ( rule__XConstantListLiteral__Group__3__Impl rule__XConstantListLiteral__Group__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6836:2: rule__XConstantListLiteral__Group__3__Impl rule__XConstantListLiteral__Group__4
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6741:1: ( rule__XConstantListLiteral__Group__3__Impl rule__XConstantListLiteral__Group__4 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6742:2: rule__XConstantListLiteral__Group__3__Impl rule__XConstantListLiteral__Group__4
             {
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group__3__Impl_in_rule__XConstantListLiteral__Group__314502);
+            pushFollow(FOLLOW_rule__XConstantListLiteral__Group__3__Impl_in_rule__XConstantListLiteral__Group__314316);
             rule__XConstantListLiteral__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group__4_in_rule__XConstantListLiteral__Group__314505);
+            pushFollow(FOLLOW_rule__XConstantListLiteral__Group__4_in_rule__XConstantListLiteral__Group__314319);
             rule__XConstantListLiteral__Group__4();
 
             state._fsp--;
@@ -21299,33 +21036,33 @@ public final void rule__XConstantListLiteral__Group__3() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6843:1: rule__XConstantListLiteral__Group__3__Impl : ( ( rule__XConstantListLiteral__Group_3__0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6749:1: rule__XConstantListLiteral__Group__3__Impl : ( ( rule__XConstantListLiteral__Group_3__0 )? ) ;
     public final void rule__XConstantListLiteral__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6847:1: ( ( ( rule__XConstantListLiteral__Group_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6848:1: ( ( rule__XConstantListLiteral__Group_3__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6753:1: ( ( ( rule__XConstantListLiteral__Group_3__0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6754:1: ( ( rule__XConstantListLiteral__Group_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6848:1: ( ( rule__XConstantListLiteral__Group_3__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6849:1: ( rule__XConstantListLiteral__Group_3__0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6754:1: ( ( rule__XConstantListLiteral__Group_3__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6755:1: ( rule__XConstantListLiteral__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantListLiteralAccess().getGroup_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6850:1: ( rule__XConstantListLiteral__Group_3__0 )?
-            int alt72=2;
-            int LA72_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6756:1: ( rule__XConstantListLiteral__Group_3__0 )?
+            int alt71=2;
+            int LA71_0 = input.LA(1);
 
-            if ( ((LA72_0>=RULE_HEX && LA72_0<=RULE_STRING)||(LA72_0>=54 && LA72_0<=55)||LA72_0==60||LA72_0==66||LA72_0==108) ) {
-                alt72=1;
+            if ( ((LA71_0>=RULE_HEX && LA71_0<=RULE_STRING)||(LA71_0>=54 && LA71_0<=55)||LA71_0==60||LA71_0==66||LA71_0==108) ) {
+                alt71=1;
             }
-            switch (alt72) {
+            switch (alt71) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6850:2: rule__XConstantListLiteral__Group_3__0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6756:2: rule__XConstantListLiteral__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__XConstantListLiteral__Group_3__0_in_rule__XConstantListLiteral__Group__3__Impl14532);
+                    pushFollow(FOLLOW_rule__XConstantListLiteral__Group_3__0_in_rule__XConstantListLiteral__Group__3__Impl14346);
                     rule__XConstantListLiteral__Group_3__0();
 
                     state._fsp--;
@@ -21361,16 +21098,16 @@ public final void rule__XConstantListLiteral__Group__3__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6860:1: rule__XConstantListLiteral__Group__4 : rule__XConstantListLiteral__Group__4__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6766:1: rule__XConstantListLiteral__Group__4 : rule__XConstantListLiteral__Group__4__Impl ;
     public final void rule__XConstantListLiteral__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6864:1: ( rule__XConstantListLiteral__Group__4__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6865:2: rule__XConstantListLiteral__Group__4__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6770:1: ( rule__XConstantListLiteral__Group__4__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6771:2: rule__XConstantListLiteral__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group__4__Impl_in_rule__XConstantListLiteral__Group__414563);
+            pushFollow(FOLLOW_rule__XConstantListLiteral__Group__4__Impl_in_rule__XConstantListLiteral__Group__414377);
             rule__XConstantListLiteral__Group__4__Impl();
 
             state._fsp--;
@@ -21394,22 +21131,22 @@ public final void rule__XConstantListLiteral__Group__4() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6871:1: rule__XConstantListLiteral__Group__4__Impl : ( ']' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6777:1: rule__XConstantListLiteral__Group__4__Impl : ( ']' ) ;
     public final void rule__XConstantListLiteral__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6875:1: ( ( ']' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6876:1: ( ']' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6781:1: ( ( ']' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6782:1: ( ']' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6876:1: ( ']' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6877:1: ']'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6782:1: ( ']' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6783:1: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantListLiteralAccess().getRightSquareBracketKeyword_4()); 
             }
-            match(input,79,FOLLOW_79_in_rule__XConstantListLiteral__Group__4__Impl14591); if (state.failed) return ;
+            match(input,79,FOLLOW_79_in_rule__XConstantListLiteral__Group__4__Impl14405); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstantListLiteralAccess().getRightSquareBracketKeyword_4()); 
             }
@@ -21435,21 +21172,21 @@ public final void rule__XConstantListLiteral__Group__4__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group_3__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6900:1: rule__XConstantListLiteral__Group_3__0 : rule__XConstantListLiteral__Group_3__0__Impl rule__XConstantListLiteral__Group_3__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6806:1: rule__XConstantListLiteral__Group_3__0 : rule__XConstantListLiteral__Group_3__0__Impl rule__XConstantListLiteral__Group_3__1 ;
     public final void rule__XConstantListLiteral__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6904:1: ( rule__XConstantListLiteral__Group_3__0__Impl rule__XConstantListLiteral__Group_3__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6905:2: rule__XConstantListLiteral__Group_3__0__Impl rule__XConstantListLiteral__Group_3__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6810:1: ( rule__XConstantListLiteral__Group_3__0__Impl rule__XConstantListLiteral__Group_3__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6811:2: rule__XConstantListLiteral__Group_3__0__Impl rule__XConstantListLiteral__Group_3__1
             {
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group_3__0__Impl_in_rule__XConstantListLiteral__Group_3__014632);
+            pushFollow(FOLLOW_rule__XConstantListLiteral__Group_3__0__Impl_in_rule__XConstantListLiteral__Group_3__014446);
             rule__XConstantListLiteral__Group_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group_3__1_in_rule__XConstantListLiteral__Group_3__014635);
+            pushFollow(FOLLOW_rule__XConstantListLiteral__Group_3__1_in_rule__XConstantListLiteral__Group_3__014449);
             rule__XConstantListLiteral__Group_3__1();
 
             state._fsp--;
@@ -21473,25 +21210,25 @@ public final void rule__XConstantListLiteral__Group_3__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group_3__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6912:1: rule__XConstantListLiteral__Group_3__0__Impl : ( ( rule__XConstantListLiteral__ElementsAssignment_3_0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6818:1: rule__XConstantListLiteral__Group_3__0__Impl : ( ( rule__XConstantListLiteral__ElementsAssignment_3_0 ) ) ;
     public final void rule__XConstantListLiteral__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6916:1: ( ( ( rule__XConstantListLiteral__ElementsAssignment_3_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6917:1: ( ( rule__XConstantListLiteral__ElementsAssignment_3_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6822:1: ( ( ( rule__XConstantListLiteral__ElementsAssignment_3_0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6823:1: ( ( rule__XConstantListLiteral__ElementsAssignment_3_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6917:1: ( ( rule__XConstantListLiteral__ElementsAssignment_3_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6918:1: ( rule__XConstantListLiteral__ElementsAssignment_3_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6823:1: ( ( rule__XConstantListLiteral__ElementsAssignment_3_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6824:1: ( rule__XConstantListLiteral__ElementsAssignment_3_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantListLiteralAccess().getElementsAssignment_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6919:1: ( rule__XConstantListLiteral__ElementsAssignment_3_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6919:2: rule__XConstantListLiteral__ElementsAssignment_3_0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6825:1: ( rule__XConstantListLiteral__ElementsAssignment_3_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6825:2: rule__XConstantListLiteral__ElementsAssignment_3_0
             {
-            pushFollow(FOLLOW_rule__XConstantListLiteral__ElementsAssignment_3_0_in_rule__XConstantListLiteral__Group_3__0__Impl14662);
+            pushFollow(FOLLOW_rule__XConstantListLiteral__ElementsAssignment_3_0_in_rule__XConstantListLiteral__Group_3__0__Impl14476);
             rule__XConstantListLiteral__ElementsAssignment_3_0();
 
             state._fsp--;
@@ -21524,16 +21261,16 @@ public final void rule__XConstantListLiteral__Group_3__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group_3__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6929:1: rule__XConstantListLiteral__Group_3__1 : rule__XConstantListLiteral__Group_3__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6835:1: rule__XConstantListLiteral__Group_3__1 : rule__XConstantListLiteral__Group_3__1__Impl ;
     public final void rule__XConstantListLiteral__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6933:1: ( rule__XConstantListLiteral__Group_3__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6934:2: rule__XConstantListLiteral__Group_3__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6839:1: ( rule__XConstantListLiteral__Group_3__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6840:2: rule__XConstantListLiteral__Group_3__1__Impl
             {
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group_3__1__Impl_in_rule__XConstantListLiteral__Group_3__114692);
+            pushFollow(FOLLOW_rule__XConstantListLiteral__Group_3__1__Impl_in_rule__XConstantListLiteral__Group_3__114506);
             rule__XConstantListLiteral__Group_3__1__Impl();
 
             state._fsp--;
@@ -21557,37 +21294,37 @@ public final void rule__XConstantListLiteral__Group_3__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group_3__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6940:1: rule__XConstantListLiteral__Group_3__1__Impl : ( ( rule__XConstantListLiteral__Group_3_1__0 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6846:1: rule__XConstantListLiteral__Group_3__1__Impl : ( ( rule__XConstantListLiteral__Group_3_1__0 )* ) ;
     public final void rule__XConstantListLiteral__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6944:1: ( ( ( rule__XConstantListLiteral__Group_3_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6945:1: ( ( rule__XConstantListLiteral__Group_3_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6850:1: ( ( ( rule__XConstantListLiteral__Group_3_1__0 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6851:1: ( ( rule__XConstantListLiteral__Group_3_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6945:1: ( ( rule__XConstantListLiteral__Group_3_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6946:1: ( rule__XConstantListLiteral__Group_3_1__0 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6851:1: ( ( rule__XConstantListLiteral__Group_3_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6852:1: ( rule__XConstantListLiteral__Group_3_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantListLiteralAccess().getGroup_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6947:1: ( rule__XConstantListLiteral__Group_3_1__0 )*
-            loop73:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6853:1: ( rule__XConstantListLiteral__Group_3_1__0 )*
+            loop72:
             do {
-                int alt73=2;
-                int LA73_0 = input.LA(1);
+                int alt72=2;
+                int LA72_0 = input.LA(1);
 
-                if ( (LA73_0==74) ) {
-                    alt73=1;
+                if ( (LA72_0==74) ) {
+                    alt72=1;
                 }
 
 
-                switch (alt73) {
+                switch (alt72) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6947:2: rule__XConstantListLiteral__Group_3_1__0
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6853:2: rule__XConstantListLiteral__Group_3_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XConstantListLiteral__Group_3_1__0_in_rule__XConstantListLiteral__Group_3__1__Impl14719);
+            	    pushFollow(FOLLOW_rule__XConstantListLiteral__Group_3_1__0_in_rule__XConstantListLiteral__Group_3__1__Impl14533);
             	    rule__XConstantListLiteral__Group_3_1__0();
 
             	    state._fsp--;
@@ -21597,7 +21334,7 @@ public final void rule__XConstantListLiteral__Group_3__1__Impl() throws Recognit
             	    break;
 
             	default :
-            	    break loop73;
+            	    break loop72;
                 }
             } while (true);
 
@@ -21626,21 +21363,21 @@ public final void rule__XConstantListLiteral__Group_3__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group_3_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6961:1: rule__XConstantListLiteral__Group_3_1__0 : rule__XConstantListLiteral__Group_3_1__0__Impl rule__XConstantListLiteral__Group_3_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6867:1: rule__XConstantListLiteral__Group_3_1__0 : rule__XConstantListLiteral__Group_3_1__0__Impl rule__XConstantListLiteral__Group_3_1__1 ;
     public final void rule__XConstantListLiteral__Group_3_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6965:1: ( rule__XConstantListLiteral__Group_3_1__0__Impl rule__XConstantListLiteral__Group_3_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6966:2: rule__XConstantListLiteral__Group_3_1__0__Impl rule__XConstantListLiteral__Group_3_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6871:1: ( rule__XConstantListLiteral__Group_3_1__0__Impl rule__XConstantListLiteral__Group_3_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6872:2: rule__XConstantListLiteral__Group_3_1__0__Impl rule__XConstantListLiteral__Group_3_1__1
             {
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group_3_1__0__Impl_in_rule__XConstantListLiteral__Group_3_1__014754);
+            pushFollow(FOLLOW_rule__XConstantListLiteral__Group_3_1__0__Impl_in_rule__XConstantListLiteral__Group_3_1__014568);
             rule__XConstantListLiteral__Group_3_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group_3_1__1_in_rule__XConstantListLiteral__Group_3_1__014757);
+            pushFollow(FOLLOW_rule__XConstantListLiteral__Group_3_1__1_in_rule__XConstantListLiteral__Group_3_1__014571);
             rule__XConstantListLiteral__Group_3_1__1();
 
             state._fsp--;
@@ -21664,22 +21401,22 @@ public final void rule__XConstantListLiteral__Group_3_1__0() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group_3_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6973:1: rule__XConstantListLiteral__Group_3_1__0__Impl : ( ',' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6879:1: rule__XConstantListLiteral__Group_3_1__0__Impl : ( ',' ) ;
     public final void rule__XConstantListLiteral__Group_3_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6977:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6978:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6883:1: ( ( ',' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6884:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6978:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6979:1: ','
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6884:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6885:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantListLiteralAccess().getCommaKeyword_3_1_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XConstantListLiteral__Group_3_1__0__Impl14785); if (state.failed) return ;
+            match(input,74,FOLLOW_74_in_rule__XConstantListLiteral__Group_3_1__0__Impl14599); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstantListLiteralAccess().getCommaKeyword_3_1_0()); 
             }
@@ -21705,16 +21442,16 @@ public final void rule__XConstantListLiteral__Group_3_1__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group_3_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6992:1: rule__XConstantListLiteral__Group_3_1__1 : rule__XConstantListLiteral__Group_3_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6898:1: rule__XConstantListLiteral__Group_3_1__1 : rule__XConstantListLiteral__Group_3_1__1__Impl ;
     public final void rule__XConstantListLiteral__Group_3_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6996:1: ( rule__XConstantListLiteral__Group_3_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6997:2: rule__XConstantListLiteral__Group_3_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6902:1: ( rule__XConstantListLiteral__Group_3_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6903:2: rule__XConstantListLiteral__Group_3_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group_3_1__1__Impl_in_rule__XConstantListLiteral__Group_3_1__114816);
+            pushFollow(FOLLOW_rule__XConstantListLiteral__Group_3_1__1__Impl_in_rule__XConstantListLiteral__Group_3_1__114630);
             rule__XConstantListLiteral__Group_3_1__1__Impl();
 
             state._fsp--;
@@ -21738,25 +21475,25 @@ public final void rule__XConstantListLiteral__Group_3_1__1() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group_3_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7003:1: rule__XConstantListLiteral__Group_3_1__1__Impl : ( ( rule__XConstantListLiteral__ElementsAssignment_3_1_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6909:1: rule__XConstantListLiteral__Group_3_1__1__Impl : ( ( rule__XConstantListLiteral__ElementsAssignment_3_1_1 ) ) ;
     public final void rule__XConstantListLiteral__Group_3_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7007:1: ( ( ( rule__XConstantListLiteral__ElementsAssignment_3_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7008:1: ( ( rule__XConstantListLiteral__ElementsAssignment_3_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6913:1: ( ( ( rule__XConstantListLiteral__ElementsAssignment_3_1_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6914:1: ( ( rule__XConstantListLiteral__ElementsAssignment_3_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7008:1: ( ( rule__XConstantListLiteral__ElementsAssignment_3_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7009:1: ( rule__XConstantListLiteral__ElementsAssignment_3_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6914:1: ( ( rule__XConstantListLiteral__ElementsAssignment_3_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6915:1: ( rule__XConstantListLiteral__ElementsAssignment_3_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantListLiteralAccess().getElementsAssignment_3_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7010:1: ( rule__XConstantListLiteral__ElementsAssignment_3_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7010:2: rule__XConstantListLiteral__ElementsAssignment_3_1_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6916:1: ( rule__XConstantListLiteral__ElementsAssignment_3_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6916:2: rule__XConstantListLiteral__ElementsAssignment_3_1_1
             {
-            pushFollow(FOLLOW_rule__XConstantListLiteral__ElementsAssignment_3_1_1_in_rule__XConstantListLiteral__Group_3_1__1__Impl14843);
+            pushFollow(FOLLOW_rule__XConstantListLiteral__ElementsAssignment_3_1_1_in_rule__XConstantListLiteral__Group_3_1__1__Impl14657);
             rule__XConstantListLiteral__ElementsAssignment_3_1_1();
 
             state._fsp--;
@@ -21789,21 +21526,21 @@ public final void rule__XConstantListLiteral__Group_3_1__1__Impl() throws Recogn
 
 
     // $ANTLR start "rule__Context__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7024:1: rule__Context__Group__0 : rule__Context__Group__0__Impl rule__Context__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6930:1: rule__Context__Group__0 : rule__Context__Group__0__Impl rule__Context__Group__1 ;
     public final void rule__Context__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7028:1: ( rule__Context__Group__0__Impl rule__Context__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7029:2: rule__Context__Group__0__Impl rule__Context__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6934:1: ( rule__Context__Group__0__Impl rule__Context__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6935:2: rule__Context__Group__0__Impl rule__Context__Group__1
             {
-            pushFollow(FOLLOW_rule__Context__Group__0__Impl_in_rule__Context__Group__014877);
+            pushFollow(FOLLOW_rule__Context__Group__0__Impl_in_rule__Context__Group__014691);
             rule__Context__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Context__Group__1_in_rule__Context__Group__014880);
+            pushFollow(FOLLOW_rule__Context__Group__1_in_rule__Context__Group__014694);
             rule__Context__Group__1();
 
             state._fsp--;
@@ -21827,22 +21564,22 @@ public final void rule__Context__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Context__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7036:1: rule__Context__Group__0__Impl : ( 'for' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6942:1: rule__Context__Group__0__Impl : ( 'for' ) ;
     public final void rule__Context__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7040:1: ( ( 'for' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7041:1: ( 'for' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6946:1: ( ( 'for' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6947:1: ( 'for' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7041:1: ( 'for' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7042:1: 'for'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6947:1: ( 'for' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6948:1: 'for'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getContextAccess().getForKeyword_0()); 
             }
-            match(input,70,FOLLOW_70_in_rule__Context__Group__0__Impl14908); if (state.failed) return ;
+            match(input,70,FOLLOW_70_in_rule__Context__Group__0__Impl14722); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getContextAccess().getForKeyword_0()); 
             }
@@ -21868,21 +21605,21 @@ public final void rule__Context__Group__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Context__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7055:1: rule__Context__Group__1 : rule__Context__Group__1__Impl rule__Context__Group__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6961:1: rule__Context__Group__1 : rule__Context__Group__1__Impl rule__Context__Group__2 ;
     public final void rule__Context__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7059:1: ( rule__Context__Group__1__Impl rule__Context__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7060:2: rule__Context__Group__1__Impl rule__Context__Group__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6965:1: ( rule__Context__Group__1__Impl rule__Context__Group__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6966:2: rule__Context__Group__1__Impl rule__Context__Group__2
             {
-            pushFollow(FOLLOW_rule__Context__Group__1__Impl_in_rule__Context__Group__114939);
+            pushFollow(FOLLOW_rule__Context__Group__1__Impl_in_rule__Context__Group__114753);
             rule__Context__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Context__Group__2_in_rule__Context__Group__114942);
+            pushFollow(FOLLOW_rule__Context__Group__2_in_rule__Context__Group__114756);
             rule__Context__Group__2();
 
             state._fsp--;
@@ -21906,25 +21643,25 @@ public final void rule__Context__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Context__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7067:1: rule__Context__Group__1__Impl : ( ( rule__Context__ContextVariableAssignment_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6973:1: rule__Context__Group__1__Impl : ( ( rule__Context__ContextVariableAssignment_1 ) ) ;
     public final void rule__Context__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7071:1: ( ( ( rule__Context__ContextVariableAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7072:1: ( ( rule__Context__ContextVariableAssignment_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6977:1: ( ( ( rule__Context__ContextVariableAssignment_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6978:1: ( ( rule__Context__ContextVariableAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7072:1: ( ( rule__Context__ContextVariableAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7073:1: ( rule__Context__ContextVariableAssignment_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6978:1: ( ( rule__Context__ContextVariableAssignment_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6979:1: ( rule__Context__ContextVariableAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getContextAccess().getContextVariableAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7074:1: ( rule__Context__ContextVariableAssignment_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7074:2: rule__Context__ContextVariableAssignment_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6980:1: ( rule__Context__ContextVariableAssignment_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6980:2: rule__Context__ContextVariableAssignment_1
             {
-            pushFollow(FOLLOW_rule__Context__ContextVariableAssignment_1_in_rule__Context__Group__1__Impl14969);
+            pushFollow(FOLLOW_rule__Context__ContextVariableAssignment_1_in_rule__Context__Group__1__Impl14783);
             rule__Context__ContextVariableAssignment_1();
 
             state._fsp--;
@@ -21957,16 +21694,16 @@ public final void rule__Context__Group__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Context__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7084:1: rule__Context__Group__2 : rule__Context__Group__2__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6990:1: rule__Context__Group__2 : rule__Context__Group__2__Impl ;
     public final void rule__Context__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7088:1: ( rule__Context__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7089:2: rule__Context__Group__2__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6994:1: ( rule__Context__Group__2__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6995:2: rule__Context__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__Context__Group__2__Impl_in_rule__Context__Group__214999);
+            pushFollow(FOLLOW_rule__Context__Group__2__Impl_in_rule__Context__Group__214813);
             rule__Context__Group__2__Impl();
 
             state._fsp--;
@@ -21990,25 +21727,25 @@ public final void rule__Context__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__Context__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7095:1: rule__Context__Group__2__Impl : ( ( rule__Context__ConstraintAssignment_2 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7001:1: rule__Context__Group__2__Impl : ( ( rule__Context__ConstraintAssignment_2 ) ) ;
     public final void rule__Context__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7099:1: ( ( ( rule__Context__ConstraintAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7100:1: ( ( rule__Context__ConstraintAssignment_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7005:1: ( ( ( rule__Context__ConstraintAssignment_2 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7006:1: ( ( rule__Context__ConstraintAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7100:1: ( ( rule__Context__ConstraintAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7101:1: ( rule__Context__ConstraintAssignment_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7006:1: ( ( rule__Context__ConstraintAssignment_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7007:1: ( rule__Context__ConstraintAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getContextAccess().getConstraintAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7102:1: ( rule__Context__ConstraintAssignment_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7102:2: rule__Context__ConstraintAssignment_2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7008:1: ( rule__Context__ConstraintAssignment_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7008:2: rule__Context__ConstraintAssignment_2
             {
-            pushFollow(FOLLOW_rule__Context__ConstraintAssignment_2_in_rule__Context__Group__2__Impl15026);
+            pushFollow(FOLLOW_rule__Context__ConstraintAssignment_2_in_rule__Context__Group__2__Impl14840);
             rule__Context__ConstraintAssignment_2();
 
             state._fsp--;
@@ -22041,21 +21778,21 @@ public final void rule__Context__Group__2__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__ContextVariable__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7118:1: rule__ContextVariable__Group__0 : rule__ContextVariable__Group__0__Impl rule__ContextVariable__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7024:1: rule__ContextVariable__Group__0 : rule__ContextVariable__Group__0__Impl rule__ContextVariable__Group__1 ;
     public final void rule__ContextVariable__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7122:1: ( rule__ContextVariable__Group__0__Impl rule__ContextVariable__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7123:2: rule__ContextVariable__Group__0__Impl rule__ContextVariable__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7028:1: ( rule__ContextVariable__Group__0__Impl rule__ContextVariable__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7029:2: rule__ContextVariable__Group__0__Impl rule__ContextVariable__Group__1
             {
-            pushFollow(FOLLOW_rule__ContextVariable__Group__0__Impl_in_rule__ContextVariable__Group__015062);
+            pushFollow(FOLLOW_rule__ContextVariable__Group__0__Impl_in_rule__ContextVariable__Group__014876);
             rule__ContextVariable__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ContextVariable__Group__1_in_rule__ContextVariable__Group__015065);
+            pushFollow(FOLLOW_rule__ContextVariable__Group__1_in_rule__ContextVariable__Group__014879);
             rule__ContextVariable__Group__1();
 
             state._fsp--;
@@ -22079,25 +21816,25 @@ public final void rule__ContextVariable__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__ContextVariable__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7130:1: rule__ContextVariable__Group__0__Impl : ( ( rule__ContextVariable__TypeAssignment_0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7036:1: rule__ContextVariable__Group__0__Impl : ( ( rule__ContextVariable__TypeAssignment_0 ) ) ;
     public final void rule__ContextVariable__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7134:1: ( ( ( rule__ContextVariable__TypeAssignment_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7135:1: ( ( rule__ContextVariable__TypeAssignment_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7040:1: ( ( ( rule__ContextVariable__TypeAssignment_0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7041:1: ( ( rule__ContextVariable__TypeAssignment_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7135:1: ( ( rule__ContextVariable__TypeAssignment_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7136:1: ( rule__ContextVariable__TypeAssignment_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7041:1: ( ( rule__ContextVariable__TypeAssignment_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7042:1: ( rule__ContextVariable__TypeAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getContextVariableAccess().getTypeAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7137:1: ( rule__ContextVariable__TypeAssignment_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7137:2: rule__ContextVariable__TypeAssignment_0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7043:1: ( rule__ContextVariable__TypeAssignment_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7043:2: rule__ContextVariable__TypeAssignment_0
             {
-            pushFollow(FOLLOW_rule__ContextVariable__TypeAssignment_0_in_rule__ContextVariable__Group__0__Impl15092);
+            pushFollow(FOLLOW_rule__ContextVariable__TypeAssignment_0_in_rule__ContextVariable__Group__0__Impl14906);
             rule__ContextVariable__TypeAssignment_0();
 
             state._fsp--;
@@ -22130,16 +21867,16 @@ public final void rule__ContextVariable__Group__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__ContextVariable__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7147:1: rule__ContextVariable__Group__1 : rule__ContextVariable__Group__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7053:1: rule__ContextVariable__Group__1 : rule__ContextVariable__Group__1__Impl ;
     public final void rule__ContextVariable__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7151:1: ( rule__ContextVariable__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7152:2: rule__ContextVariable__Group__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7057:1: ( rule__ContextVariable__Group__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7058:2: rule__ContextVariable__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__ContextVariable__Group__1__Impl_in_rule__ContextVariable__Group__115122);
+            pushFollow(FOLLOW_rule__ContextVariable__Group__1__Impl_in_rule__ContextVariable__Group__114936);
             rule__ContextVariable__Group__1__Impl();
 
             state._fsp--;
@@ -22163,33 +21900,33 @@ public final void rule__ContextVariable__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__ContextVariable__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7158:1: rule__ContextVariable__Group__1__Impl : ( ( rule__ContextVariable__NameAssignment_1 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7064:1: rule__ContextVariable__Group__1__Impl : ( ( rule__ContextVariable__NameAssignment_1 )? ) ;
     public final void rule__ContextVariable__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7162:1: ( ( ( rule__ContextVariable__NameAssignment_1 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7163:1: ( ( rule__ContextVariable__NameAssignment_1 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7068:1: ( ( ( rule__ContextVariable__NameAssignment_1 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7069:1: ( ( rule__ContextVariable__NameAssignment_1 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7163:1: ( ( rule__ContextVariable__NameAssignment_1 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7164:1: ( rule__ContextVariable__NameAssignment_1 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7069:1: ( ( rule__ContextVariable__NameAssignment_1 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7070:1: ( rule__ContextVariable__NameAssignment_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getContextVariableAccess().getNameAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7165:1: ( rule__ContextVariable__NameAssignment_1 )?
-            int alt74=2;
-            int LA74_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7071:1: ( rule__ContextVariable__NameAssignment_1 )?
+            int alt73=2;
+            int LA73_0 = input.LA(1);
 
-            if ( (LA74_0==RULE_ID) ) {
-                alt74=1;
+            if ( (LA73_0==RULE_ID) ) {
+                alt73=1;
             }
-            switch (alt74) {
+            switch (alt73) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7165:2: rule__ContextVariable__NameAssignment_1
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7071:2: rule__ContextVariable__NameAssignment_1
                     {
-                    pushFollow(FOLLOW_rule__ContextVariable__NameAssignment_1_in_rule__ContextVariable__Group__1__Impl15149);
+                    pushFollow(FOLLOW_rule__ContextVariable__NameAssignment_1_in_rule__ContextVariable__Group__1__Impl14963);
                     rule__ContextVariable__NameAssignment_1();
 
                     state._fsp--;
@@ -22225,21 +21962,21 @@ public final void rule__ContextVariable__Group__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XGuardExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7179:1: rule__XGuardExpression__Group__0 : rule__XGuardExpression__Group__0__Impl rule__XGuardExpression__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7085:1: rule__XGuardExpression__Group__0 : rule__XGuardExpression__Group__0__Impl rule__XGuardExpression__Group__1 ;
     public final void rule__XGuardExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7183:1: ( rule__XGuardExpression__Group__0__Impl rule__XGuardExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7184:2: rule__XGuardExpression__Group__0__Impl rule__XGuardExpression__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7089:1: ( rule__XGuardExpression__Group__0__Impl rule__XGuardExpression__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7090:2: rule__XGuardExpression__Group__0__Impl rule__XGuardExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XGuardExpression__Group__0__Impl_in_rule__XGuardExpression__Group__015184);
+            pushFollow(FOLLOW_rule__XGuardExpression__Group__0__Impl_in_rule__XGuardExpression__Group__014998);
             rule__XGuardExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XGuardExpression__Group__1_in_rule__XGuardExpression__Group__015187);
+            pushFollow(FOLLOW_rule__XGuardExpression__Group__1_in_rule__XGuardExpression__Group__015001);
             rule__XGuardExpression__Group__1();
 
             state._fsp--;
@@ -22263,23 +22000,23 @@ public final void rule__XGuardExpression__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XGuardExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7191:1: rule__XGuardExpression__Group__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7097:1: rule__XGuardExpression__Group__0__Impl : ( () ) ;
     public final void rule__XGuardExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7195:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7196:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7101:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7102:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7196:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7197:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7102:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7103:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXGuardExpressionAccess().getXGuardExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7198:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7200:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7104:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7106:1: 
             {
             }
 
@@ -22304,21 +22041,21 @@ public final void rule__XGuardExpression__Group__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XGuardExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7210:1: rule__XGuardExpression__Group__1 : rule__XGuardExpression__Group__1__Impl rule__XGuardExpression__Group__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7116:1: rule__XGuardExpression__Group__1 : rule__XGuardExpression__Group__1__Impl rule__XGuardExpression__Group__2 ;
     public final void rule__XGuardExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7214:1: ( rule__XGuardExpression__Group__1__Impl rule__XGuardExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7215:2: rule__XGuardExpression__Group__1__Impl rule__XGuardExpression__Group__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7120:1: ( rule__XGuardExpression__Group__1__Impl rule__XGuardExpression__Group__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7121:2: rule__XGuardExpression__Group__1__Impl rule__XGuardExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XGuardExpression__Group__1__Impl_in_rule__XGuardExpression__Group__115245);
+            pushFollow(FOLLOW_rule__XGuardExpression__Group__1__Impl_in_rule__XGuardExpression__Group__115059);
             rule__XGuardExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XGuardExpression__Group__2_in_rule__XGuardExpression__Group__115248);
+            pushFollow(FOLLOW_rule__XGuardExpression__Group__2_in_rule__XGuardExpression__Group__115062);
             rule__XGuardExpression__Group__2();
 
             state._fsp--;
@@ -22342,22 +22079,22 @@ public final void rule__XGuardExpression__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XGuardExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7222:1: rule__XGuardExpression__Group__1__Impl : ( 'guard' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7128:1: rule__XGuardExpression__Group__1__Impl : ( 'guard' ) ;
     public final void rule__XGuardExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7226:1: ( ( 'guard' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7227:1: ( 'guard' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7132:1: ( ( 'guard' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7133:1: ( 'guard' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7227:1: ( 'guard' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7228:1: 'guard'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7133:1: ( 'guard' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7134:1: 'guard'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXGuardExpressionAccess().getGuardKeyword_1()); 
             }
-            match(input,80,FOLLOW_80_in_rule__XGuardExpression__Group__1__Impl15276); if (state.failed) return ;
+            match(input,80,FOLLOW_80_in_rule__XGuardExpression__Group__1__Impl15090); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXGuardExpressionAccess().getGuardKeyword_1()); 
             }
@@ -22383,16 +22120,16 @@ public final void rule__XGuardExpression__Group__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XGuardExpression__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7241:1: rule__XGuardExpression__Group__2 : rule__XGuardExpression__Group__2__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7147:1: rule__XGuardExpression__Group__2 : rule__XGuardExpression__Group__2__Impl ;
     public final void rule__XGuardExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7245:1: ( rule__XGuardExpression__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7246:2: rule__XGuardExpression__Group__2__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7151:1: ( rule__XGuardExpression__Group__2__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7152:2: rule__XGuardExpression__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__XGuardExpression__Group__2__Impl_in_rule__XGuardExpression__Group__215307);
+            pushFollow(FOLLOW_rule__XGuardExpression__Group__2__Impl_in_rule__XGuardExpression__Group__215121);
             rule__XGuardExpression__Group__2__Impl();
 
             state._fsp--;
@@ -22416,25 +22153,25 @@ public final void rule__XGuardExpression__Group__2() throws RecognitionException
 
 
     // $ANTLR start "rule__XGuardExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7252:1: rule__XGuardExpression__Group__2__Impl : ( ( rule__XGuardExpression__GuardAssignment_2 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7158:1: rule__XGuardExpression__Group__2__Impl : ( ( rule__XGuardExpression__GuardAssignment_2 ) ) ;
     public final void rule__XGuardExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7256:1: ( ( ( rule__XGuardExpression__GuardAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7257:1: ( ( rule__XGuardExpression__GuardAssignment_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7162:1: ( ( ( rule__XGuardExpression__GuardAssignment_2 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7163:1: ( ( rule__XGuardExpression__GuardAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7257:1: ( ( rule__XGuardExpression__GuardAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7258:1: ( rule__XGuardExpression__GuardAssignment_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7163:1: ( ( rule__XGuardExpression__GuardAssignment_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7164:1: ( rule__XGuardExpression__GuardAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXGuardExpressionAccess().getGuardAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7259:1: ( rule__XGuardExpression__GuardAssignment_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7259:2: rule__XGuardExpression__GuardAssignment_2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7165:1: ( rule__XGuardExpression__GuardAssignment_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7165:2: rule__XGuardExpression__GuardAssignment_2
             {
-            pushFollow(FOLLOW_rule__XGuardExpression__GuardAssignment_2_in_rule__XGuardExpression__Group__2__Impl15334);
+            pushFollow(FOLLOW_rule__XGuardExpression__GuardAssignment_2_in_rule__XGuardExpression__Group__2__Impl15148);
             rule__XGuardExpression__GuardAssignment_2();
 
             state._fsp--;
@@ -22467,21 +22204,21 @@ public final void rule__XGuardExpression__Group__2__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XIssueExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7275:1: rule__XIssueExpression__Group__0 : rule__XIssueExpression__Group__0__Impl rule__XIssueExpression__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7181:1: rule__XIssueExpression__Group__0 : rule__XIssueExpression__Group__0__Impl rule__XIssueExpression__Group__1 ;
     public final void rule__XIssueExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7279:1: ( rule__XIssueExpression__Group__0__Impl rule__XIssueExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7280:2: rule__XIssueExpression__Group__0__Impl rule__XIssueExpression__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7185:1: ( rule__XIssueExpression__Group__0__Impl rule__XIssueExpression__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7186:2: rule__XIssueExpression__Group__0__Impl rule__XIssueExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group__0__Impl_in_rule__XIssueExpression__Group__015370);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group__0__Impl_in_rule__XIssueExpression__Group__015184);
             rule__XIssueExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group__1_in_rule__XIssueExpression__Group__015373);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group__1_in_rule__XIssueExpression__Group__015187);
             rule__XIssueExpression__Group__1();
 
             state._fsp--;
@@ -22505,23 +22242,23 @@ public final void rule__XIssueExpression__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XIssueExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7287:1: rule__XIssueExpression__Group__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7193:1: rule__XIssueExpression__Group__0__Impl : ( () ) ;
     public final void rule__XIssueExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7291:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7292:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7197:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7198:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7292:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7293:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7198:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7199:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getXIssueExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7294:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7296:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7200:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7202:1: 
             {
             }
 
@@ -22546,21 +22283,21 @@ public final void rule__XIssueExpression__Group__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XIssueExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7306:1: rule__XIssueExpression__Group__1 : rule__XIssueExpression__Group__1__Impl rule__XIssueExpression__Group__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7212:1: rule__XIssueExpression__Group__1 : rule__XIssueExpression__Group__1__Impl rule__XIssueExpression__Group__2 ;
     public final void rule__XIssueExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7310:1: ( rule__XIssueExpression__Group__1__Impl rule__XIssueExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7311:2: rule__XIssueExpression__Group__1__Impl rule__XIssueExpression__Group__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7216:1: ( rule__XIssueExpression__Group__1__Impl rule__XIssueExpression__Group__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7217:2: rule__XIssueExpression__Group__1__Impl rule__XIssueExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group__1__Impl_in_rule__XIssueExpression__Group__115431);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group__1__Impl_in_rule__XIssueExpression__Group__115245);
             rule__XIssueExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group__2_in_rule__XIssueExpression__Group__115434);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group__2_in_rule__XIssueExpression__Group__115248);
             rule__XIssueExpression__Group__2();
 
             state._fsp--;
@@ -22584,22 +22321,22 @@ public final void rule__XIssueExpression__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XIssueExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7318:1: rule__XIssueExpression__Group__1__Impl : ( 'issue' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7224:1: rule__XIssueExpression__Group__1__Impl : ( 'issue' ) ;
     public final void rule__XIssueExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7322:1: ( ( 'issue' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7323:1: ( 'issue' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7228:1: ( ( 'issue' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7229:1: ( 'issue' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7323:1: ( 'issue' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7324:1: 'issue'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7229:1: ( 'issue' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7230:1: 'issue'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getIssueKeyword_1()); 
             }
-            match(input,81,FOLLOW_81_in_rule__XIssueExpression__Group__1__Impl15462); if (state.failed) return ;
+            match(input,81,FOLLOW_81_in_rule__XIssueExpression__Group__1__Impl15276); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXIssueExpressionAccess().getIssueKeyword_1()); 
             }
@@ -22625,21 +22362,21 @@ public final void rule__XIssueExpression__Group__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XIssueExpression__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7337:1: rule__XIssueExpression__Group__2 : rule__XIssueExpression__Group__2__Impl rule__XIssueExpression__Group__3 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7243:1: rule__XIssueExpression__Group__2 : rule__XIssueExpression__Group__2__Impl rule__XIssueExpression__Group__3 ;
     public final void rule__XIssueExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7341:1: ( rule__XIssueExpression__Group__2__Impl rule__XIssueExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7342:2: rule__XIssueExpression__Group__2__Impl rule__XIssueExpression__Group__3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7247:1: ( rule__XIssueExpression__Group__2__Impl rule__XIssueExpression__Group__3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7248:2: rule__XIssueExpression__Group__2__Impl rule__XIssueExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group__2__Impl_in_rule__XIssueExpression__Group__215493);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group__2__Impl_in_rule__XIssueExpression__Group__215307);
             rule__XIssueExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group__3_in_rule__XIssueExpression__Group__215496);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group__3_in_rule__XIssueExpression__Group__215310);
             rule__XIssueExpression__Group__3();
 
             state._fsp--;
@@ -22663,37 +22400,37 @@ public final void rule__XIssueExpression__Group__2() throws RecognitionException
 
 
     // $ANTLR start "rule__XIssueExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7349:1: rule__XIssueExpression__Group__2__Impl : ( ( rule__XIssueExpression__CheckAssignment_2 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7255:1: rule__XIssueExpression__Group__2__Impl : ( ( rule__XIssueExpression__CheckAssignment_2 )? ) ;
     public final void rule__XIssueExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7353:1: ( ( ( rule__XIssueExpression__CheckAssignment_2 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7354:1: ( ( rule__XIssueExpression__CheckAssignment_2 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7259:1: ( ( ( rule__XIssueExpression__CheckAssignment_2 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7260:1: ( ( rule__XIssueExpression__CheckAssignment_2 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7354:1: ( ( rule__XIssueExpression__CheckAssignment_2 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7355:1: ( rule__XIssueExpression__CheckAssignment_2 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7260:1: ( ( rule__XIssueExpression__CheckAssignment_2 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7261:1: ( rule__XIssueExpression__CheckAssignment_2 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getCheckAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7356:1: ( rule__XIssueExpression__CheckAssignment_2 )?
-            int alt75=2;
-            int LA75_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7262:1: ( rule__XIssueExpression__CheckAssignment_2 )?
+            int alt74=2;
+            int LA74_0 = input.LA(1);
 
-            if ( (LA75_0==RULE_ID) ) {
-                int LA75_1 = input.LA(2);
+            if ( (LA74_0==RULE_ID) ) {
+                int LA74_1 = input.LA(2);
 
-                if ( (synpred141_InternalCheck()) ) {
-                    alt75=1;
+                if ( (synpred140_InternalCheck()) ) {
+                    alt74=1;
                 }
             }
-            switch (alt75) {
+            switch (alt74) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7356:2: rule__XIssueExpression__CheckAssignment_2
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7262:2: rule__XIssueExpression__CheckAssignment_2
                     {
-                    pushFollow(FOLLOW_rule__XIssueExpression__CheckAssignment_2_in_rule__XIssueExpression__Group__2__Impl15523);
+                    pushFollow(FOLLOW_rule__XIssueExpression__CheckAssignment_2_in_rule__XIssueExpression__Group__2__Impl15337);
                     rule__XIssueExpression__CheckAssignment_2();
 
                     state._fsp--;
@@ -22729,21 +22466,21 @@ public final void rule__XIssueExpression__Group__2__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XIssueExpression__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7366:1: rule__XIssueExpression__Group__3 : rule__XIssueExpression__Group__3__Impl rule__XIssueExpression__Group__4 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7272:1: rule__XIssueExpression__Group__3 : rule__XIssueExpression__Group__3__Impl rule__XIssueExpression__Group__4 ;
     public final void rule__XIssueExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7370:1: ( rule__XIssueExpression__Group__3__Impl rule__XIssueExpression__Group__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7371:2: rule__XIssueExpression__Group__3__Impl rule__XIssueExpression__Group__4
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7276:1: ( rule__XIssueExpression__Group__3__Impl rule__XIssueExpression__Group__4 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7277:2: rule__XIssueExpression__Group__3__Impl rule__XIssueExpression__Group__4
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group__3__Impl_in_rule__XIssueExpression__Group__315554);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group__3__Impl_in_rule__XIssueExpression__Group__315368);
             rule__XIssueExpression__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group__4_in_rule__XIssueExpression__Group__315557);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group__4_in_rule__XIssueExpression__Group__315371);
             rule__XIssueExpression__Group__4();
 
             state._fsp--;
@@ -22767,29 +22504,29 @@ public final void rule__XIssueExpression__Group__3() throws RecognitionException
 
 
     // $ANTLR start "rule__XIssueExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7378:1: rule__XIssueExpression__Group__3__Impl : ( ( rule__XIssueExpression__Group_3__0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7284:1: rule__XIssueExpression__Group__3__Impl : ( ( rule__XIssueExpression__Group_3__0 )? ) ;
     public final void rule__XIssueExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7382:1: ( ( ( rule__XIssueExpression__Group_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7383:1: ( ( rule__XIssueExpression__Group_3__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7288:1: ( ( ( rule__XIssueExpression__Group_3__0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7289:1: ( ( rule__XIssueExpression__Group_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7383:1: ( ( rule__XIssueExpression__Group_3__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7384:1: ( rule__XIssueExpression__Group_3__0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7289:1: ( ( rule__XIssueExpression__Group_3__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7290:1: ( rule__XIssueExpression__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getGroup_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7385:1: ( rule__XIssueExpression__Group_3__0 )?
-            int alt76=2;
-            alt76 = dfa76.predict(input);
-            switch (alt76) {
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7291:1: ( rule__XIssueExpression__Group_3__0 )?
+            int alt75=2;
+            alt75 = dfa75.predict(input);
+            switch (alt75) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7385:2: rule__XIssueExpression__Group_3__0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7291:2: rule__XIssueExpression__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__XIssueExpression__Group_3__0_in_rule__XIssueExpression__Group__3__Impl15584);
+                    pushFollow(FOLLOW_rule__XIssueExpression__Group_3__0_in_rule__XIssueExpression__Group__3__Impl15398);
                     rule__XIssueExpression__Group_3__0();
 
                     state._fsp--;
@@ -22825,21 +22562,21 @@ public final void rule__XIssueExpression__Group__3__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XIssueExpression__Group__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7395:1: rule__XIssueExpression__Group__4 : rule__XIssueExpression__Group__4__Impl rule__XIssueExpression__Group__5 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7301:1: rule__XIssueExpression__Group__4 : rule__XIssueExpression__Group__4__Impl rule__XIssueExpression__Group__5 ;
     public final void rule__XIssueExpression__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7399:1: ( rule__XIssueExpression__Group__4__Impl rule__XIssueExpression__Group__5 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7400:2: rule__XIssueExpression__Group__4__Impl rule__XIssueExpression__Group__5
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7305:1: ( rule__XIssueExpression__Group__4__Impl rule__XIssueExpression__Group__5 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7306:2: rule__XIssueExpression__Group__4__Impl rule__XIssueExpression__Group__5
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group__4__Impl_in_rule__XIssueExpression__Group__415615);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group__4__Impl_in_rule__XIssueExpression__Group__415429);
             rule__XIssueExpression__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group__5_in_rule__XIssueExpression__Group__415618);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group__5_in_rule__XIssueExpression__Group__415432);
             rule__XIssueExpression__Group__5();
 
             state._fsp--;
@@ -22863,37 +22600,37 @@ public final void rule__XIssueExpression__Group__4() throws RecognitionException
 
 
     // $ANTLR start "rule__XIssueExpression__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7407:1: rule__XIssueExpression__Group__4__Impl : ( ( rule__XIssueExpression__Group_4__0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7313:1: rule__XIssueExpression__Group__4__Impl : ( ( rule__XIssueExpression__Group_4__0 )? ) ;
     public final void rule__XIssueExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7411:1: ( ( ( rule__XIssueExpression__Group_4__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7412:1: ( ( rule__XIssueExpression__Group_4__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7317:1: ( ( ( rule__XIssueExpression__Group_4__0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7318:1: ( ( rule__XIssueExpression__Group_4__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7412:1: ( ( rule__XIssueExpression__Group_4__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7413:1: ( rule__XIssueExpression__Group_4__0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7318:1: ( ( rule__XIssueExpression__Group_4__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7319:1: ( rule__XIssueExpression__Group_4__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getGroup_4()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7414:1: ( rule__XIssueExpression__Group_4__0 )?
-            int alt77=2;
-            int LA77_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7320:1: ( rule__XIssueExpression__Group_4__0 )?
+            int alt76=2;
+            int LA76_0 = input.LA(1);
 
-            if ( (LA77_0==24) ) {
-                int LA77_1 = input.LA(2);
+            if ( (LA76_0==24) ) {
+                int LA76_1 = input.LA(2);
 
-                if ( (synpred143_InternalCheck()) ) {
-                    alt77=1;
+                if ( (synpred142_InternalCheck()) ) {
+                    alt76=1;
                 }
             }
-            switch (alt77) {
+            switch (alt76) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7414:2: rule__XIssueExpression__Group_4__0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7320:2: rule__XIssueExpression__Group_4__0
                     {
-                    pushFollow(FOLLOW_rule__XIssueExpression__Group_4__0_in_rule__XIssueExpression__Group__4__Impl15645);
+                    pushFollow(FOLLOW_rule__XIssueExpression__Group_4__0_in_rule__XIssueExpression__Group__4__Impl15459);
                     rule__XIssueExpression__Group_4__0();
 
                     state._fsp--;
@@ -22929,21 +22666,21 @@ public final void rule__XIssueExpression__Group__4__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XIssueExpression__Group__5"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7424:1: rule__XIssueExpression__Group__5 : rule__XIssueExpression__Group__5__Impl rule__XIssueExpression__Group__6 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7330:1: rule__XIssueExpression__Group__5 : rule__XIssueExpression__Group__5__Impl rule__XIssueExpression__Group__6 ;
     public final void rule__XIssueExpression__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7428:1: ( rule__XIssueExpression__Group__5__Impl rule__XIssueExpression__Group__6 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7429:2: rule__XIssueExpression__Group__5__Impl rule__XIssueExpression__Group__6
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7334:1: ( rule__XIssueExpression__Group__5__Impl rule__XIssueExpression__Group__6 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7335:2: rule__XIssueExpression__Group__5__Impl rule__XIssueExpression__Group__6
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group__5__Impl_in_rule__XIssueExpression__Group__515676);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group__5__Impl_in_rule__XIssueExpression__Group__515490);
             rule__XIssueExpression__Group__5__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group__6_in_rule__XIssueExpression__Group__515679);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group__6_in_rule__XIssueExpression__Group__515493);
             rule__XIssueExpression__Group__6();
 
             state._fsp--;
@@ -22967,37 +22704,37 @@ public final void rule__XIssueExpression__Group__5() throws RecognitionException
 
 
     // $ANTLR start "rule__XIssueExpression__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7436:1: rule__XIssueExpression__Group__5__Impl : ( ( rule__XIssueExpression__Group_5__0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7342:1: rule__XIssueExpression__Group__5__Impl : ( ( rule__XIssueExpression__Group_5__0 )? ) ;
     public final void rule__XIssueExpression__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7440:1: ( ( ( rule__XIssueExpression__Group_5__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7441:1: ( ( rule__XIssueExpression__Group_5__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7346:1: ( ( ( rule__XIssueExpression__Group_5__0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7347:1: ( ( rule__XIssueExpression__Group_5__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7441:1: ( ( rule__XIssueExpression__Group_5__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7442:1: ( rule__XIssueExpression__Group_5__0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7347:1: ( ( rule__XIssueExpression__Group_5__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7348:1: ( rule__XIssueExpression__Group_5__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getGroup_5()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7443:1: ( rule__XIssueExpression__Group_5__0 )?
-            int alt78=2;
-            int LA78_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7349:1: ( rule__XIssueExpression__Group_5__0 )?
+            int alt77=2;
+            int LA77_0 = input.LA(1);
 
-            if ( (LA78_0==26) ) {
-                int LA78_1 = input.LA(2);
+            if ( (LA77_0==26) ) {
+                int LA77_1 = input.LA(2);
 
-                if ( (synpred144_InternalCheck()) ) {
-                    alt78=1;
+                if ( (synpred143_InternalCheck()) ) {
+                    alt77=1;
                 }
             }
-            switch (alt78) {
+            switch (alt77) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7443:2: rule__XIssueExpression__Group_5__0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7349:2: rule__XIssueExpression__Group_5__0
                     {
-                    pushFollow(FOLLOW_rule__XIssueExpression__Group_5__0_in_rule__XIssueExpression__Group__5__Impl15706);
+                    pushFollow(FOLLOW_rule__XIssueExpression__Group_5__0_in_rule__XIssueExpression__Group__5__Impl15520);
                     rule__XIssueExpression__Group_5__0();
 
                     state._fsp--;
@@ -23033,16 +22770,16 @@ public final void rule__XIssueExpression__Group__5__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XIssueExpression__Group__6"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7453:1: rule__XIssueExpression__Group__6 : rule__XIssueExpression__Group__6__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7359:1: rule__XIssueExpression__Group__6 : rule__XIssueExpression__Group__6__Impl ;
     public final void rule__XIssueExpression__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7457:1: ( rule__XIssueExpression__Group__6__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7458:2: rule__XIssueExpression__Group__6__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7363:1: ( rule__XIssueExpression__Group__6__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7364:2: rule__XIssueExpression__Group__6__Impl
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group__6__Impl_in_rule__XIssueExpression__Group__615737);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group__6__Impl_in_rule__XIssueExpression__Group__615551);
             rule__XIssueExpression__Group__6__Impl();
 
             state._fsp--;
@@ -23066,37 +22803,37 @@ public final void rule__XIssueExpression__Group__6() throws RecognitionException
 
 
     // $ANTLR start "rule__XIssueExpression__Group__6__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7464:1: rule__XIssueExpression__Group__6__Impl : ( ( rule__XIssueExpression__Group_6__0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7370:1: rule__XIssueExpression__Group__6__Impl : ( ( rule__XIssueExpression__Group_6__0 )? ) ;
     public final void rule__XIssueExpression__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7468:1: ( ( ( rule__XIssueExpression__Group_6__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7469:1: ( ( rule__XIssueExpression__Group_6__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7374:1: ( ( ( rule__XIssueExpression__Group_6__0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7375:1: ( ( rule__XIssueExpression__Group_6__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7469:1: ( ( rule__XIssueExpression__Group_6__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7470:1: ( rule__XIssueExpression__Group_6__0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7375:1: ( ( rule__XIssueExpression__Group_6__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7376:1: ( rule__XIssueExpression__Group_6__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getGroup_6()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7471:1: ( rule__XIssueExpression__Group_6__0 )?
-            int alt79=2;
-            int LA79_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7377:1: ( rule__XIssueExpression__Group_6__0 )?
+            int alt78=2;
+            int LA78_0 = input.LA(1);
 
-            if ( (LA79_0==27) ) {
-                int LA79_1 = input.LA(2);
+            if ( (LA78_0==27) ) {
+                int LA78_1 = input.LA(2);
 
-                if ( (synpred145_InternalCheck()) ) {
-                    alt79=1;
+                if ( (synpred144_InternalCheck()) ) {
+                    alt78=1;
                 }
             }
-            switch (alt79) {
+            switch (alt78) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7471:2: rule__XIssueExpression__Group_6__0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7377:2: rule__XIssueExpression__Group_6__0
                     {
-                    pushFollow(FOLLOW_rule__XIssueExpression__Group_6__0_in_rule__XIssueExpression__Group__6__Impl15764);
+                    pushFollow(FOLLOW_rule__XIssueExpression__Group_6__0_in_rule__XIssueExpression__Group__6__Impl15578);
                     rule__XIssueExpression__Group_6__0();
 
                     state._fsp--;
@@ -23132,21 +22869,21 @@ public final void rule__XIssueExpression__Group__6__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7495:1: rule__XIssueExpression__Group_3__0 : rule__XIssueExpression__Group_3__0__Impl rule__XIssueExpression__Group_3__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7401:1: rule__XIssueExpression__Group_3__0 : rule__XIssueExpression__Group_3__0__Impl rule__XIssueExpression__Group_3__1 ;
     public final void rule__XIssueExpression__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7499:1: ( rule__XIssueExpression__Group_3__0__Impl rule__XIssueExpression__Group_3__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7500:2: rule__XIssueExpression__Group_3__0__Impl rule__XIssueExpression__Group_3__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7405:1: ( rule__XIssueExpression__Group_3__0__Impl rule__XIssueExpression__Group_3__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7406:2: rule__XIssueExpression__Group_3__0__Impl rule__XIssueExpression__Group_3__1
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_3__0__Impl_in_rule__XIssueExpression__Group_3__015809);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_3__0__Impl_in_rule__XIssueExpression__Group_3__015623);
             rule__XIssueExpression__Group_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_3__1_in_rule__XIssueExpression__Group_3__015812);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_3__1_in_rule__XIssueExpression__Group_3__015626);
             rule__XIssueExpression__Group_3__1();
 
             state._fsp--;
@@ -23170,25 +22907,25 @@ public final void rule__XIssueExpression__Group_3__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7507:1: rule__XIssueExpression__Group_3__0__Impl : ( ( 'on' ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7413:1: rule__XIssueExpression__Group_3__0__Impl : ( ( 'on' ) ) ;
     public final void rule__XIssueExpression__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7511:1: ( ( ( 'on' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7512:1: ( ( 'on' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7417:1: ( ( ( 'on' ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7418:1: ( ( 'on' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7512:1: ( ( 'on' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7513:1: ( 'on' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7418:1: ( ( 'on' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7419:1: ( 'on' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getOnKeyword_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7514:1: ( 'on' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7515:2: 'on'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7420:1: ( 'on' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7421:2: 'on'
             {
-            match(input,25,FOLLOW_25_in_rule__XIssueExpression__Group_3__0__Impl15841); if (state.failed) return ;
+            match(input,25,FOLLOW_25_in_rule__XIssueExpression__Group_3__0__Impl15655); if (state.failed) return ;
 
             }
 
@@ -23217,21 +22954,21 @@ public final void rule__XIssueExpression__Group_3__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7526:1: rule__XIssueExpression__Group_3__1 : rule__XIssueExpression__Group_3__1__Impl rule__XIssueExpression__Group_3__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7432:1: rule__XIssueExpression__Group_3__1 : rule__XIssueExpression__Group_3__1__Impl rule__XIssueExpression__Group_3__2 ;
     public final void rule__XIssueExpression__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7530:1: ( rule__XIssueExpression__Group_3__1__Impl rule__XIssueExpression__Group_3__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7531:2: rule__XIssueExpression__Group_3__1__Impl rule__XIssueExpression__Group_3__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7436:1: ( rule__XIssueExpression__Group_3__1__Impl rule__XIssueExpression__Group_3__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7437:2: rule__XIssueExpression__Group_3__1__Impl rule__XIssueExpression__Group_3__2
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_3__1__Impl_in_rule__XIssueExpression__Group_3__115873);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_3__1__Impl_in_rule__XIssueExpression__Group_3__115687);
             rule__XIssueExpression__Group_3__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_3__2_in_rule__XIssueExpression__Group_3__115876);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_3__2_in_rule__XIssueExpression__Group_3__115690);
             rule__XIssueExpression__Group_3__2();
 
             state._fsp--;
@@ -23255,25 +22992,25 @@ public final void rule__XIssueExpression__Group_3__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7538:1: rule__XIssueExpression__Group_3__1__Impl : ( ( rule__XIssueExpression__Alternatives_3_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7444:1: rule__XIssueExpression__Group_3__1__Impl : ( ( rule__XIssueExpression__Alternatives_3_1 ) ) ;
     public final void rule__XIssueExpression__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7542:1: ( ( ( rule__XIssueExpression__Alternatives_3_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7543:1: ( ( rule__XIssueExpression__Alternatives_3_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7448:1: ( ( ( rule__XIssueExpression__Alternatives_3_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7449:1: ( ( rule__XIssueExpression__Alternatives_3_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7543:1: ( ( rule__XIssueExpression__Alternatives_3_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7544:1: ( rule__XIssueExpression__Alternatives_3_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7449:1: ( ( rule__XIssueExpression__Alternatives_3_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7450:1: ( rule__XIssueExpression__Alternatives_3_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getAlternatives_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7545:1: ( rule__XIssueExpression__Alternatives_3_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7545:2: rule__XIssueExpression__Alternatives_3_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7451:1: ( rule__XIssueExpression__Alternatives_3_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7451:2: rule__XIssueExpression__Alternatives_3_1
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Alternatives_3_1_in_rule__XIssueExpression__Group_3__1__Impl15903);
+            pushFollow(FOLLOW_rule__XIssueExpression__Alternatives_3_1_in_rule__XIssueExpression__Group_3__1__Impl15717);
             rule__XIssueExpression__Alternatives_3_1();
 
             state._fsp--;
@@ -23306,16 +23043,16 @@ public final void rule__XIssueExpression__Group_3__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7555:1: rule__XIssueExpression__Group_3__2 : rule__XIssueExpression__Group_3__2__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7461:1: rule__XIssueExpression__Group_3__2 : rule__XIssueExpression__Group_3__2__Impl ;
     public final void rule__XIssueExpression__Group_3__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7559:1: ( rule__XIssueExpression__Group_3__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7560:2: rule__XIssueExpression__Group_3__2__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7465:1: ( rule__XIssueExpression__Group_3__2__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7466:2: rule__XIssueExpression__Group_3__2__Impl
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_3__2__Impl_in_rule__XIssueExpression__Group_3__215933);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_3__2__Impl_in_rule__XIssueExpression__Group_3__215747);
             rule__XIssueExpression__Group_3__2__Impl();
 
             state._fsp--;
@@ -23339,37 +23076,37 @@ public final void rule__XIssueExpression__Group_3__2() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7566:1: rule__XIssueExpression__Group_3__2__Impl : ( ( rule__XIssueExpression__Group_3_2__0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7472:1: rule__XIssueExpression__Group_3__2__Impl : ( ( rule__XIssueExpression__Group_3_2__0 )? ) ;
     public final void rule__XIssueExpression__Group_3__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7570:1: ( ( ( rule__XIssueExpression__Group_3_2__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7571:1: ( ( rule__XIssueExpression__Group_3_2__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7476:1: ( ( ( rule__XIssueExpression__Group_3_2__0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7477:1: ( ( rule__XIssueExpression__Group_3_2__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7571:1: ( ( rule__XIssueExpression__Group_3_2__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7572:1: ( rule__XIssueExpression__Group_3_2__0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7477:1: ( ( rule__XIssueExpression__Group_3_2__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7478:1: ( rule__XIssueExpression__Group_3_2__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getGroup_3_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7573:1: ( rule__XIssueExpression__Group_3_2__0 )?
-            int alt80=2;
-            int LA80_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7479:1: ( rule__XIssueExpression__Group_3_2__0 )?
+            int alt79=2;
+            int LA79_0 = input.LA(1);
 
-            if ( (LA80_0==78) ) {
-                int LA80_1 = input.LA(2);
+            if ( (LA79_0==78) ) {
+                int LA79_1 = input.LA(2);
 
-                if ( (synpred146_InternalCheck()) ) {
-                    alt80=1;
+                if ( (synpred145_InternalCheck()) ) {
+                    alt79=1;
                 }
             }
-            switch (alt80) {
+            switch (alt79) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7573:2: rule__XIssueExpression__Group_3_2__0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7479:2: rule__XIssueExpression__Group_3_2__0
                     {
-                    pushFollow(FOLLOW_rule__XIssueExpression__Group_3_2__0_in_rule__XIssueExpression__Group_3__2__Impl15960);
+                    pushFollow(FOLLOW_rule__XIssueExpression__Group_3_2__0_in_rule__XIssueExpression__Group_3__2__Impl15774);
                     rule__XIssueExpression__Group_3_2__0();
 
                     state._fsp--;
@@ -23405,21 +23142,21 @@ public final void rule__XIssueExpression__Group_3__2__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3_1_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7589:1: rule__XIssueExpression__Group_3_1_0__0 : rule__XIssueExpression__Group_3_1_0__0__Impl rule__XIssueExpression__Group_3_1_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7495:1: rule__XIssueExpression__Group_3_1_0__0 : rule__XIssueExpression__Group_3_1_0__0__Impl rule__XIssueExpression__Group_3_1_0__1 ;
     public final void rule__XIssueExpression__Group_3_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7593:1: ( rule__XIssueExpression__Group_3_1_0__0__Impl rule__XIssueExpression__Group_3_1_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7594:2: rule__XIssueExpression__Group_3_1_0__0__Impl rule__XIssueExpression__Group_3_1_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7499:1: ( rule__XIssueExpression__Group_3_1_0__0__Impl rule__XIssueExpression__Group_3_1_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7500:2: rule__XIssueExpression__Group_3_1_0__0__Impl rule__XIssueExpression__Group_3_1_0__1
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_3_1_0__0__Impl_in_rule__XIssueExpression__Group_3_1_0__015997);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_3_1_0__0__Impl_in_rule__XIssueExpression__Group_3_1_0__015811);
             rule__XIssueExpression__Group_3_1_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_3_1_0__1_in_rule__XIssueExpression__Group_3_1_0__016000);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_3_1_0__1_in_rule__XIssueExpression__Group_3_1_0__015814);
             rule__XIssueExpression__Group_3_1_0__1();
 
             state._fsp--;
@@ -23443,25 +23180,25 @@ public final void rule__XIssueExpression__Group_3_1_0__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7601:1: rule__XIssueExpression__Group_3_1_0__0__Impl : ( ( '#' ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7507:1: rule__XIssueExpression__Group_3_1_0__0__Impl : ( ( '#' ) ) ;
     public final void rule__XIssueExpression__Group_3_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7605:1: ( ( ( '#' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7606:1: ( ( '#' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7511:1: ( ( ( '#' ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7512:1: ( ( '#' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7606:1: ( ( '#' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7607:1: ( '#' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7512:1: ( ( '#' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7513:1: ( '#' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getNumberSignKeyword_3_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7608:1: ( '#' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7609:2: '#'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7514:1: ( '#' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7515:2: '#'
             {
-            match(input,77,FOLLOW_77_in_rule__XIssueExpression__Group_3_1_0__0__Impl16029); if (state.failed) return ;
+            match(input,77,FOLLOW_77_in_rule__XIssueExpression__Group_3_1_0__0__Impl15843); if (state.failed) return ;
 
             }
 
@@ -23490,16 +23227,16 @@ public final void rule__XIssueExpression__Group_3_1_0__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3_1_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7620:1: rule__XIssueExpression__Group_3_1_0__1 : rule__XIssueExpression__Group_3_1_0__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7526:1: rule__XIssueExpression__Group_3_1_0__1 : rule__XIssueExpression__Group_3_1_0__1__Impl ;
     public final void rule__XIssueExpression__Group_3_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7624:1: ( rule__XIssueExpression__Group_3_1_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7625:2: rule__XIssueExpression__Group_3_1_0__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7530:1: ( rule__XIssueExpression__Group_3_1_0__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7531:2: rule__XIssueExpression__Group_3_1_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_3_1_0__1__Impl_in_rule__XIssueExpression__Group_3_1_0__116061);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_3_1_0__1__Impl_in_rule__XIssueExpression__Group_3_1_0__115875);
             rule__XIssueExpression__Group_3_1_0__1__Impl();
 
             state._fsp--;
@@ -23523,25 +23260,25 @@ public final void rule__XIssueExpression__Group_3_1_0__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3_1_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7631:1: rule__XIssueExpression__Group_3_1_0__1__Impl : ( ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7537:1: rule__XIssueExpression__Group_3_1_0__1__Impl : ( ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1 ) ) ;
     public final void rule__XIssueExpression__Group_3_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7635:1: ( ( ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7636:1: ( ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7541:1: ( ( ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7542:1: ( ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7636:1: ( ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7637:1: ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7542:1: ( ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7543:1: ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getMarkerFeatureAssignment_3_1_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7638:1: ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7638:2: rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7544:1: ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7544:2: rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1_in_rule__XIssueExpression__Group_3_1_0__1__Impl16088);
+            pushFollow(FOLLOW_rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1_in_rule__XIssueExpression__Group_3_1_0__1__Impl15902);
             rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1();
 
             state._fsp--;
@@ -23574,21 +23311,21 @@ public final void rule__XIssueExpression__Group_3_1_0__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3_1_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7652:1: rule__XIssueExpression__Group_3_1_1__0 : rule__XIssueExpression__Group_3_1_1__0__Impl rule__XIssueExpression__Group_3_1_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7558:1: rule__XIssueExpression__Group_3_1_1__0 : rule__XIssueExpression__Group_3_1_1__0__Impl rule__XIssueExpression__Group_3_1_1__1 ;
     public final void rule__XIssueExpression__Group_3_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7656:1: ( rule__XIssueExpression__Group_3_1_1__0__Impl rule__XIssueExpression__Group_3_1_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7657:2: rule__XIssueExpression__Group_3_1_1__0__Impl rule__XIssueExpression__Group_3_1_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7562:1: ( rule__XIssueExpression__Group_3_1_1__0__Impl rule__XIssueExpression__Group_3_1_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7563:2: rule__XIssueExpression__Group_3_1_1__0__Impl rule__XIssueExpression__Group_3_1_1__1
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_3_1_1__0__Impl_in_rule__XIssueExpression__Group_3_1_1__016122);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_3_1_1__0__Impl_in_rule__XIssueExpression__Group_3_1_1__015936);
             rule__XIssueExpression__Group_3_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_3_1_1__1_in_rule__XIssueExpression__Group_3_1_1__016125);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_3_1_1__1_in_rule__XIssueExpression__Group_3_1_1__015939);
             rule__XIssueExpression__Group_3_1_1__1();
 
             state._fsp--;
@@ -23612,25 +23349,25 @@ public final void rule__XIssueExpression__Group_3_1_1__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7664:1: rule__XIssueExpression__Group_3_1_1__0__Impl : ( ( rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7570:1: rule__XIssueExpression__Group_3_1_1__0__Impl : ( ( rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0 ) ) ;
     public final void rule__XIssueExpression__Group_3_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7668:1: ( ( ( rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7669:1: ( ( rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7574:1: ( ( ( rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7575:1: ( ( rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7669:1: ( ( rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7670:1: ( rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7575:1: ( ( rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7576:1: ( rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getMarkerObjectAssignment_3_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7671:1: ( rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7671:2: rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7577:1: ( rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7577:2: rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0_in_rule__XIssueExpression__Group_3_1_1__0__Impl16152);
+            pushFollow(FOLLOW_rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0_in_rule__XIssueExpression__Group_3_1_1__0__Impl15966);
             rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0();
 
             state._fsp--;
@@ -23663,16 +23400,16 @@ public final void rule__XIssueExpression__Group_3_1_1__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3_1_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7681:1: rule__XIssueExpression__Group_3_1_1__1 : rule__XIssueExpression__Group_3_1_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7587:1: rule__XIssueExpression__Group_3_1_1__1 : rule__XIssueExpression__Group_3_1_1__1__Impl ;
     public final void rule__XIssueExpression__Group_3_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7685:1: ( rule__XIssueExpression__Group_3_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7686:2: rule__XIssueExpression__Group_3_1_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7591:1: ( rule__XIssueExpression__Group_3_1_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7592:2: rule__XIssueExpression__Group_3_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_3_1_1__1__Impl_in_rule__XIssueExpression__Group_3_1_1__116182);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_3_1_1__1__Impl_in_rule__XIssueExpression__Group_3_1_1__115996);
             rule__XIssueExpression__Group_3_1_1__1__Impl();
 
             state._fsp--;
@@ -23696,37 +23433,37 @@ public final void rule__XIssueExpression__Group_3_1_1__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7692:1: rule__XIssueExpression__Group_3_1_1__1__Impl : ( ( rule__XIssueExpression__Group_3_1_1_1__0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7598:1: rule__XIssueExpression__Group_3_1_1__1__Impl : ( ( rule__XIssueExpression__Group_3_1_1_1__0 )? ) ;
     public final void rule__XIssueExpression__Group_3_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7696:1: ( ( ( rule__XIssueExpression__Group_3_1_1_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7697:1: ( ( rule__XIssueExpression__Group_3_1_1_1__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7602:1: ( ( ( rule__XIssueExpression__Group_3_1_1_1__0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7603:1: ( ( rule__XIssueExpression__Group_3_1_1_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7697:1: ( ( rule__XIssueExpression__Group_3_1_1_1__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7698:1: ( rule__XIssueExpression__Group_3_1_1_1__0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7603:1: ( ( rule__XIssueExpression__Group_3_1_1_1__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7604:1: ( rule__XIssueExpression__Group_3_1_1_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getGroup_3_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7699:1: ( rule__XIssueExpression__Group_3_1_1_1__0 )?
-            int alt81=2;
-            int LA81_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7605:1: ( rule__XIssueExpression__Group_3_1_1_1__0 )?
+            int alt80=2;
+            int LA80_0 = input.LA(1);
 
-            if ( (LA81_0==77) ) {
-                int LA81_1 = input.LA(2);
+            if ( (LA80_0==77) ) {
+                int LA80_1 = input.LA(2);
 
-                if ( (synpred147_InternalCheck()) ) {
-                    alt81=1;
+                if ( (synpred146_InternalCheck()) ) {
+                    alt80=1;
                 }
             }
-            switch (alt81) {
+            switch (alt80) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7699:2: rule__XIssueExpression__Group_3_1_1_1__0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7605:2: rule__XIssueExpression__Group_3_1_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__XIssueExpression__Group_3_1_1_1__0_in_rule__XIssueExpression__Group_3_1_1__1__Impl16209);
+                    pushFollow(FOLLOW_rule__XIssueExpression__Group_3_1_1_1__0_in_rule__XIssueExpression__Group_3_1_1__1__Impl16023);
                     rule__XIssueExpression__Group_3_1_1_1__0();
 
                     state._fsp--;
@@ -23762,21 +23499,21 @@ public final void rule__XIssueExpression__Group_3_1_1__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3_1_1_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7713:1: rule__XIssueExpression__Group_3_1_1_1__0 : rule__XIssueExpression__Group_3_1_1_1__0__Impl rule__XIssueExpression__Group_3_1_1_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7619:1: rule__XIssueExpression__Group_3_1_1_1__0 : rule__XIssueExpression__Group_3_1_1_1__0__Impl rule__XIssueExpression__Group_3_1_1_1__1 ;
     public final void rule__XIssueExpression__Group_3_1_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7717:1: ( rule__XIssueExpression__Group_3_1_1_1__0__Impl rule__XIssueExpression__Group_3_1_1_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7718:2: rule__XIssueExpression__Group_3_1_1_1__0__Impl rule__XIssueExpression__Group_3_1_1_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7623:1: ( rule__XIssueExpression__Group_3_1_1_1__0__Impl rule__XIssueExpression__Group_3_1_1_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7624:2: rule__XIssueExpression__Group_3_1_1_1__0__Impl rule__XIssueExpression__Group_3_1_1_1__1
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_3_1_1_1__0__Impl_in_rule__XIssueExpression__Group_3_1_1_1__016244);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_3_1_1_1__0__Impl_in_rule__XIssueExpression__Group_3_1_1_1__016058);
             rule__XIssueExpression__Group_3_1_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_3_1_1_1__1_in_rule__XIssueExpression__Group_3_1_1_1__016247);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_3_1_1_1__1_in_rule__XIssueExpression__Group_3_1_1_1__016061);
             rule__XIssueExpression__Group_3_1_1_1__1();
 
             state._fsp--;
@@ -23800,25 +23537,25 @@ public final void rule__XIssueExpression__Group_3_1_1_1__0() throws RecognitionE
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3_1_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7725:1: rule__XIssueExpression__Group_3_1_1_1__0__Impl : ( ( '#' ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7631:1: rule__XIssueExpression__Group_3_1_1_1__0__Impl : ( ( '#' ) ) ;
     public final void rule__XIssueExpression__Group_3_1_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7729:1: ( ( ( '#' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7730:1: ( ( '#' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7635:1: ( ( ( '#' ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7636:1: ( ( '#' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7730:1: ( ( '#' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7731:1: ( '#' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7636:1: ( ( '#' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7637:1: ( '#' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getNumberSignKeyword_3_1_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7732:1: ( '#' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7733:2: '#'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7638:1: ( '#' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7639:2: '#'
             {
-            match(input,77,FOLLOW_77_in_rule__XIssueExpression__Group_3_1_1_1__0__Impl16276); if (state.failed) return ;
+            match(input,77,FOLLOW_77_in_rule__XIssueExpression__Group_3_1_1_1__0__Impl16090); if (state.failed) return ;
 
             }
 
@@ -23847,16 +23584,16 @@ public final void rule__XIssueExpression__Group_3_1_1_1__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3_1_1_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7744:1: rule__XIssueExpression__Group_3_1_1_1__1 : rule__XIssueExpression__Group_3_1_1_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7650:1: rule__XIssueExpression__Group_3_1_1_1__1 : rule__XIssueExpression__Group_3_1_1_1__1__Impl ;
     public final void rule__XIssueExpression__Group_3_1_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7748:1: ( rule__XIssueExpression__Group_3_1_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7749:2: rule__XIssueExpression__Group_3_1_1_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7654:1: ( rule__XIssueExpression__Group_3_1_1_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7655:2: rule__XIssueExpression__Group_3_1_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_3_1_1_1__1__Impl_in_rule__XIssueExpression__Group_3_1_1_1__116308);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_3_1_1_1__1__Impl_in_rule__XIssueExpression__Group_3_1_1_1__116122);
             rule__XIssueExpression__Group_3_1_1_1__1__Impl();
 
             state._fsp--;
@@ -23880,25 +23617,25 @@ public final void rule__XIssueExpression__Group_3_1_1_1__1() throws RecognitionE
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3_1_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7755:1: rule__XIssueExpression__Group_3_1_1_1__1__Impl : ( ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7661:1: rule__XIssueExpression__Group_3_1_1_1__1__Impl : ( ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1 ) ) ;
     public final void rule__XIssueExpression__Group_3_1_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7759:1: ( ( ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7760:1: ( ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7665:1: ( ( ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7666:1: ( ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7760:1: ( ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7761:1: ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7666:1: ( ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7667:1: ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getMarkerFeatureAssignment_3_1_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7762:1: ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7762:2: rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7668:1: ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7668:2: rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1_in_rule__XIssueExpression__Group_3_1_1_1__1__Impl16335);
+            pushFollow(FOLLOW_rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1_in_rule__XIssueExpression__Group_3_1_1_1__1__Impl16149);
             rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1();
 
             state._fsp--;
@@ -23931,21 +23668,21 @@ public final void rule__XIssueExpression__Group_3_1_1_1__1__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3_2__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7776:1: rule__XIssueExpression__Group_3_2__0 : rule__XIssueExpression__Group_3_2__0__Impl rule__XIssueExpression__Group_3_2__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7682:1: rule__XIssueExpression__Group_3_2__0 : rule__XIssueExpression__Group_3_2__0__Impl rule__XIssueExpression__Group_3_2__1 ;
     public final void rule__XIssueExpression__Group_3_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7780:1: ( rule__XIssueExpression__Group_3_2__0__Impl rule__XIssueExpression__Group_3_2__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7781:2: rule__XIssueExpression__Group_3_2__0__Impl rule__XIssueExpression__Group_3_2__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7686:1: ( rule__XIssueExpression__Group_3_2__0__Impl rule__XIssueExpression__Group_3_2__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7687:2: rule__XIssueExpression__Group_3_2__0__Impl rule__XIssueExpression__Group_3_2__1
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_3_2__0__Impl_in_rule__XIssueExpression__Group_3_2__016369);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_3_2__0__Impl_in_rule__XIssueExpression__Group_3_2__016183);
             rule__XIssueExpression__Group_3_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_3_2__1_in_rule__XIssueExpression__Group_3_2__016372);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_3_2__1_in_rule__XIssueExpression__Group_3_2__016186);
             rule__XIssueExpression__Group_3_2__1();
 
             state._fsp--;
@@ -23969,25 +23706,25 @@ public final void rule__XIssueExpression__Group_3_2__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3_2__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7788:1: rule__XIssueExpression__Group_3_2__0__Impl : ( ( '[' ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7694:1: rule__XIssueExpression__Group_3_2__0__Impl : ( ( '[' ) ) ;
     public final void rule__XIssueExpression__Group_3_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7792:1: ( ( ( '[' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7793:1: ( ( '[' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7698:1: ( ( ( '[' ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7699:1: ( ( '[' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7793:1: ( ( '[' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7794:1: ( '[' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7699:1: ( ( '[' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7700:1: ( '[' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getLeftSquareBracketKeyword_3_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7795:1: ( '[' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7796:2: '['
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7701:1: ( '[' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7702:2: '['
             {
-            match(input,78,FOLLOW_78_in_rule__XIssueExpression__Group_3_2__0__Impl16401); if (state.failed) return ;
+            match(input,78,FOLLOW_78_in_rule__XIssueExpression__Group_3_2__0__Impl16215); if (state.failed) return ;
 
             }
 
@@ -24016,21 +23753,21 @@ public final void rule__XIssueExpression__Group_3_2__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3_2__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7807:1: rule__XIssueExpression__Group_3_2__1 : rule__XIssueExpression__Group_3_2__1__Impl rule__XIssueExpression__Group_3_2__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7713:1: rule__XIssueExpression__Group_3_2__1 : rule__XIssueExpression__Group_3_2__1__Impl rule__XIssueExpression__Group_3_2__2 ;
     public final void rule__XIssueExpression__Group_3_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7811:1: ( rule__XIssueExpression__Group_3_2__1__Impl rule__XIssueExpression__Group_3_2__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7812:2: rule__XIssueExpression__Group_3_2__1__Impl rule__XIssueExpression__Group_3_2__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7717:1: ( rule__XIssueExpression__Group_3_2__1__Impl rule__XIssueExpression__Group_3_2__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7718:2: rule__XIssueExpression__Group_3_2__1__Impl rule__XIssueExpression__Group_3_2__2
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_3_2__1__Impl_in_rule__XIssueExpression__Group_3_2__116433);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_3_2__1__Impl_in_rule__XIssueExpression__Group_3_2__116247);
             rule__XIssueExpression__Group_3_2__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_3_2__2_in_rule__XIssueExpression__Group_3_2__116436);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_3_2__2_in_rule__XIssueExpression__Group_3_2__116250);
             rule__XIssueExpression__Group_3_2__2();
 
             state._fsp--;
@@ -24054,25 +23791,25 @@ public final void rule__XIssueExpression__Group_3_2__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3_2__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7819:1: rule__XIssueExpression__Group_3_2__1__Impl : ( ( rule__XIssueExpression__MarkerIndexAssignment_3_2_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7725:1: rule__XIssueExpression__Group_3_2__1__Impl : ( ( rule__XIssueExpression__MarkerIndexAssignment_3_2_1 ) ) ;
     public final void rule__XIssueExpression__Group_3_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7823:1: ( ( ( rule__XIssueExpression__MarkerIndexAssignment_3_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7824:1: ( ( rule__XIssueExpression__MarkerIndexAssignment_3_2_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7729:1: ( ( ( rule__XIssueExpression__MarkerIndexAssignment_3_2_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7730:1: ( ( rule__XIssueExpression__MarkerIndexAssignment_3_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7824:1: ( ( rule__XIssueExpression__MarkerIndexAssignment_3_2_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7825:1: ( rule__XIssueExpression__MarkerIndexAssignment_3_2_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7730:1: ( ( rule__XIssueExpression__MarkerIndexAssignment_3_2_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7731:1: ( rule__XIssueExpression__MarkerIndexAssignment_3_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getMarkerIndexAssignment_3_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7826:1: ( rule__XIssueExpression__MarkerIndexAssignment_3_2_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7826:2: rule__XIssueExpression__MarkerIndexAssignment_3_2_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7732:1: ( rule__XIssueExpression__MarkerIndexAssignment_3_2_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7732:2: rule__XIssueExpression__MarkerIndexAssignment_3_2_1
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__MarkerIndexAssignment_3_2_1_in_rule__XIssueExpression__Group_3_2__1__Impl16463);
+            pushFollow(FOLLOW_rule__XIssueExpression__MarkerIndexAssignment_3_2_1_in_rule__XIssueExpression__Group_3_2__1__Impl16277);
             rule__XIssueExpression__MarkerIndexAssignment_3_2_1();
 
             state._fsp--;
@@ -24105,16 +23842,16 @@ public final void rule__XIssueExpression__Group_3_2__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3_2__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7836:1: rule__XIssueExpression__Group_3_2__2 : rule__XIssueExpression__Group_3_2__2__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7742:1: rule__XIssueExpression__Group_3_2__2 : rule__XIssueExpression__Group_3_2__2__Impl ;
     public final void rule__XIssueExpression__Group_3_2__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7840:1: ( rule__XIssueExpression__Group_3_2__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7841:2: rule__XIssueExpression__Group_3_2__2__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7746:1: ( rule__XIssueExpression__Group_3_2__2__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7747:2: rule__XIssueExpression__Group_3_2__2__Impl
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_3_2__2__Impl_in_rule__XIssueExpression__Group_3_2__216493);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_3_2__2__Impl_in_rule__XIssueExpression__Group_3_2__216307);
             rule__XIssueExpression__Group_3_2__2__Impl();
 
             state._fsp--;
@@ -24138,22 +23875,22 @@ public final void rule__XIssueExpression__Group_3_2__2() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3_2__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7847:1: rule__XIssueExpression__Group_3_2__2__Impl : ( ']' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7753:1: rule__XIssueExpression__Group_3_2__2__Impl : ( ']' ) ;
     public final void rule__XIssueExpression__Group_3_2__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7851:1: ( ( ']' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7852:1: ( ']' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7757:1: ( ( ']' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7758:1: ( ']' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7852:1: ( ']' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7853:1: ']'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7758:1: ( ']' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7759:1: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getRightSquareBracketKeyword_3_2_2()); 
             }
-            match(input,79,FOLLOW_79_in_rule__XIssueExpression__Group_3_2__2__Impl16521); if (state.failed) return ;
+            match(input,79,FOLLOW_79_in_rule__XIssueExpression__Group_3_2__2__Impl16335); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXIssueExpressionAccess().getRightSquareBracketKeyword_3_2_2()); 
             }
@@ -24179,21 +23916,21 @@ public final void rule__XIssueExpression__Group_3_2__2__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XIssueExpression__Group_4__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7872:1: rule__XIssueExpression__Group_4__0 : rule__XIssueExpression__Group_4__0__Impl rule__XIssueExpression__Group_4__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7778:1: rule__XIssueExpression__Group_4__0 : rule__XIssueExpression__Group_4__0__Impl rule__XIssueExpression__Group_4__1 ;
     public final void rule__XIssueExpression__Group_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7876:1: ( rule__XIssueExpression__Group_4__0__Impl rule__XIssueExpression__Group_4__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7877:2: rule__XIssueExpression__Group_4__0__Impl rule__XIssueExpression__Group_4__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7782:1: ( rule__XIssueExpression__Group_4__0__Impl rule__XIssueExpression__Group_4__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7783:2: rule__XIssueExpression__Group_4__0__Impl rule__XIssueExpression__Group_4__1
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_4__0__Impl_in_rule__XIssueExpression__Group_4__016558);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_4__0__Impl_in_rule__XIssueExpression__Group_4__016372);
             rule__XIssueExpression__Group_4__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_4__1_in_rule__XIssueExpression__Group_4__016561);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_4__1_in_rule__XIssueExpression__Group_4__016375);
             rule__XIssueExpression__Group_4__1();
 
             state._fsp--;
@@ -24217,25 +23954,25 @@ public final void rule__XIssueExpression__Group_4__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XIssueExpression__Group_4__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7884:1: rule__XIssueExpression__Group_4__0__Impl : ( ( 'message' ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7790:1: rule__XIssueExpression__Group_4__0__Impl : ( ( 'message' ) ) ;
     public final void rule__XIssueExpression__Group_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7888:1: ( ( ( 'message' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7889:1: ( ( 'message' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7794:1: ( ( ( 'message' ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7795:1: ( ( 'message' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7889:1: ( ( 'message' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7890:1: ( 'message' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7795:1: ( ( 'message' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7796:1: ( 'message' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getMessageKeyword_4_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7891:1: ( 'message' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7892:2: 'message'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7797:1: ( 'message' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7798:2: 'message'
             {
-            match(input,24,FOLLOW_24_in_rule__XIssueExpression__Group_4__0__Impl16590); if (state.failed) return ;
+            match(input,24,FOLLOW_24_in_rule__XIssueExpression__Group_4__0__Impl16404); if (state.failed) return ;
 
             }
 
@@ -24264,16 +24001,16 @@ public final void rule__XIssueExpression__Group_4__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XIssueExpression__Group_4__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7903:1: rule__XIssueExpression__Group_4__1 : rule__XIssueExpression__Group_4__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7809:1: rule__XIssueExpression__Group_4__1 : rule__XIssueExpression__Group_4__1__Impl ;
     public final void rule__XIssueExpression__Group_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7907:1: ( rule__XIssueExpression__Group_4__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7908:2: rule__XIssueExpression__Group_4__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7813:1: ( rule__XIssueExpression__Group_4__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7814:2: rule__XIssueExpression__Group_4__1__Impl
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_4__1__Impl_in_rule__XIssueExpression__Group_4__116622);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_4__1__Impl_in_rule__XIssueExpression__Group_4__116436);
             rule__XIssueExpression__Group_4__1__Impl();
 
             state._fsp--;
@@ -24297,25 +24034,25 @@ public final void rule__XIssueExpression__Group_4__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XIssueExpression__Group_4__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7914:1: rule__XIssueExpression__Group_4__1__Impl : ( ( rule__XIssueExpression__MessageAssignment_4_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7820:1: rule__XIssueExpression__Group_4__1__Impl : ( ( rule__XIssueExpression__MessageAssignment_4_1 ) ) ;
     public final void rule__XIssueExpression__Group_4__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7918:1: ( ( ( rule__XIssueExpression__MessageAssignment_4_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7919:1: ( ( rule__XIssueExpression__MessageAssignment_4_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7824:1: ( ( ( rule__XIssueExpression__MessageAssignment_4_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7825:1: ( ( rule__XIssueExpression__MessageAssignment_4_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7919:1: ( ( rule__XIssueExpression__MessageAssignment_4_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7920:1: ( rule__XIssueExpression__MessageAssignment_4_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7825:1: ( ( rule__XIssueExpression__MessageAssignment_4_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7826:1: ( rule__XIssueExpression__MessageAssignment_4_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getMessageAssignment_4_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7921:1: ( rule__XIssueExpression__MessageAssignment_4_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7921:2: rule__XIssueExpression__MessageAssignment_4_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7827:1: ( rule__XIssueExpression__MessageAssignment_4_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7827:2: rule__XIssueExpression__MessageAssignment_4_1
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__MessageAssignment_4_1_in_rule__XIssueExpression__Group_4__1__Impl16649);
+            pushFollow(FOLLOW_rule__XIssueExpression__MessageAssignment_4_1_in_rule__XIssueExpression__Group_4__1__Impl16463);
             rule__XIssueExpression__MessageAssignment_4_1();
 
             state._fsp--;
@@ -24348,21 +24085,21 @@ public final void rule__XIssueExpression__Group_4__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XIssueExpression__Group_5__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7935:1: rule__XIssueExpression__Group_5__0 : rule__XIssueExpression__Group_5__0__Impl rule__XIssueExpression__Group_5__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7841:1: rule__XIssueExpression__Group_5__0 : rule__XIssueExpression__Group_5__0__Impl rule__XIssueExpression__Group_5__1 ;
     public final void rule__XIssueExpression__Group_5__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7939:1: ( rule__XIssueExpression__Group_5__0__Impl rule__XIssueExpression__Group_5__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7940:2: rule__XIssueExpression__Group_5__0__Impl rule__XIssueExpression__Group_5__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7845:1: ( rule__XIssueExpression__Group_5__0__Impl rule__XIssueExpression__Group_5__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7846:2: rule__XIssueExpression__Group_5__0__Impl rule__XIssueExpression__Group_5__1
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_5__0__Impl_in_rule__XIssueExpression__Group_5__016683);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_5__0__Impl_in_rule__XIssueExpression__Group_5__016497);
             rule__XIssueExpression__Group_5__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_5__1_in_rule__XIssueExpression__Group_5__016686);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_5__1_in_rule__XIssueExpression__Group_5__016500);
             rule__XIssueExpression__Group_5__1();
 
             state._fsp--;
@@ -24386,25 +24123,25 @@ public final void rule__XIssueExpression__Group_5__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XIssueExpression__Group_5__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7947:1: rule__XIssueExpression__Group_5__0__Impl : ( ( 'bind' ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7853:1: rule__XIssueExpression__Group_5__0__Impl : ( ( 'bind' ) ) ;
     public final void rule__XIssueExpression__Group_5__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7951:1: ( ( ( 'bind' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7952:1: ( ( 'bind' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7857:1: ( ( ( 'bind' ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7858:1: ( ( 'bind' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7952:1: ( ( 'bind' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7953:1: ( 'bind' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7858:1: ( ( 'bind' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7859:1: ( 'bind' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getBindKeyword_5_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7954:1: ( 'bind' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7955:2: 'bind'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7860:1: ( 'bind' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7861:2: 'bind'
             {
-            match(input,26,FOLLOW_26_in_rule__XIssueExpression__Group_5__0__Impl16715); if (state.failed) return ;
+            match(input,26,FOLLOW_26_in_rule__XIssueExpression__Group_5__0__Impl16529); if (state.failed) return ;
 
             }
 
@@ -24433,21 +24170,21 @@ public final void rule__XIssueExpression__Group_5__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XIssueExpression__Group_5__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7966:1: rule__XIssueExpression__Group_5__1 : rule__XIssueExpression__Group_5__1__Impl rule__XIssueExpression__Group_5__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7872:1: rule__XIssueExpression__Group_5__1 : rule__XIssueExpression__Group_5__1__Impl rule__XIssueExpression__Group_5__2 ;
     public final void rule__XIssueExpression__Group_5__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7970:1: ( rule__XIssueExpression__Group_5__1__Impl rule__XIssueExpression__Group_5__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7971:2: rule__XIssueExpression__Group_5__1__Impl rule__XIssueExpression__Group_5__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7876:1: ( rule__XIssueExpression__Group_5__1__Impl rule__XIssueExpression__Group_5__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7877:2: rule__XIssueExpression__Group_5__1__Impl rule__XIssueExpression__Group_5__2
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_5__1__Impl_in_rule__XIssueExpression__Group_5__116747);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_5__1__Impl_in_rule__XIssueExpression__Group_5__116561);
             rule__XIssueExpression__Group_5__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_5__2_in_rule__XIssueExpression__Group_5__116750);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_5__2_in_rule__XIssueExpression__Group_5__116564);
             rule__XIssueExpression__Group_5__2();
 
             state._fsp--;
@@ -24471,22 +24208,22 @@ public final void rule__XIssueExpression__Group_5__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XIssueExpression__Group_5__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7978:1: rule__XIssueExpression__Group_5__1__Impl : ( '(' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7884:1: rule__XIssueExpression__Group_5__1__Impl : ( '(' ) ;
     public final void rule__XIssueExpression__Group_5__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7982:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7983:1: ( '(' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7888:1: ( ( '(' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7889:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7983:1: ( '(' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7984:1: '('
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7889:1: ( '(' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7890:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getLeftParenthesisKeyword_5_1()); 
             }
-            match(input,72,FOLLOW_72_in_rule__XIssueExpression__Group_5__1__Impl16778); if (state.failed) return ;
+            match(input,72,FOLLOW_72_in_rule__XIssueExpression__Group_5__1__Impl16592); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXIssueExpressionAccess().getLeftParenthesisKeyword_5_1()); 
             }
@@ -24512,21 +24249,21 @@ public final void rule__XIssueExpression__Group_5__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XIssueExpression__Group_5__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7997:1: rule__XIssueExpression__Group_5__2 : rule__XIssueExpression__Group_5__2__Impl rule__XIssueExpression__Group_5__3 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7903:1: rule__XIssueExpression__Group_5__2 : rule__XIssueExpression__Group_5__2__Impl rule__XIssueExpression__Group_5__3 ;
     public final void rule__XIssueExpression__Group_5__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8001:1: ( rule__XIssueExpression__Group_5__2__Impl rule__XIssueExpression__Group_5__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8002:2: rule__XIssueExpression__Group_5__2__Impl rule__XIssueExpression__Group_5__3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7907:1: ( rule__XIssueExpression__Group_5__2__Impl rule__XIssueExpression__Group_5__3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7908:2: rule__XIssueExpression__Group_5__2__Impl rule__XIssueExpression__Group_5__3
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_5__2__Impl_in_rule__XIssueExpression__Group_5__216809);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_5__2__Impl_in_rule__XIssueExpression__Group_5__216623);
             rule__XIssueExpression__Group_5__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_5__3_in_rule__XIssueExpression__Group_5__216812);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_5__3_in_rule__XIssueExpression__Group_5__216626);
             rule__XIssueExpression__Group_5__3();
 
             state._fsp--;
@@ -24550,25 +24287,25 @@ public final void rule__XIssueExpression__Group_5__2() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XIssueExpression__Group_5__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8009:1: rule__XIssueExpression__Group_5__2__Impl : ( ( rule__XIssueExpression__MessageParametersAssignment_5_2 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7915:1: rule__XIssueExpression__Group_5__2__Impl : ( ( rule__XIssueExpression__MessageParametersAssignment_5_2 ) ) ;
     public final void rule__XIssueExpression__Group_5__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8013:1: ( ( ( rule__XIssueExpression__MessageParametersAssignment_5_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8014:1: ( ( rule__XIssueExpression__MessageParametersAssignment_5_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7919:1: ( ( ( rule__XIssueExpression__MessageParametersAssignment_5_2 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7920:1: ( ( rule__XIssueExpression__MessageParametersAssignment_5_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8014:1: ( ( rule__XIssueExpression__MessageParametersAssignment_5_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8015:1: ( rule__XIssueExpression__MessageParametersAssignment_5_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7920:1: ( ( rule__XIssueExpression__MessageParametersAssignment_5_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7921:1: ( rule__XIssueExpression__MessageParametersAssignment_5_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getMessageParametersAssignment_5_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8016:1: ( rule__XIssueExpression__MessageParametersAssignment_5_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8016:2: rule__XIssueExpression__MessageParametersAssignment_5_2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7922:1: ( rule__XIssueExpression__MessageParametersAssignment_5_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7922:2: rule__XIssueExpression__MessageParametersAssignment_5_2
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__MessageParametersAssignment_5_2_in_rule__XIssueExpression__Group_5__2__Impl16839);
+            pushFollow(FOLLOW_rule__XIssueExpression__MessageParametersAssignment_5_2_in_rule__XIssueExpression__Group_5__2__Impl16653);
             rule__XIssueExpression__MessageParametersAssignment_5_2();
 
             state._fsp--;
@@ -24601,21 +24338,21 @@ public final void rule__XIssueExpression__Group_5__2__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XIssueExpression__Group_5__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8026:1: rule__XIssueExpression__Group_5__3 : rule__XIssueExpression__Group_5__3__Impl rule__XIssueExpression__Group_5__4 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7932:1: rule__XIssueExpression__Group_5__3 : rule__XIssueExpression__Group_5__3__Impl rule__XIssueExpression__Group_5__4 ;
     public final void rule__XIssueExpression__Group_5__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8030:1: ( rule__XIssueExpression__Group_5__3__Impl rule__XIssueExpression__Group_5__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8031:2: rule__XIssueExpression__Group_5__3__Impl rule__XIssueExpression__Group_5__4
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7936:1: ( rule__XIssueExpression__Group_5__3__Impl rule__XIssueExpression__Group_5__4 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7937:2: rule__XIssueExpression__Group_5__3__Impl rule__XIssueExpression__Group_5__4
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_5__3__Impl_in_rule__XIssueExpression__Group_5__316869);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_5__3__Impl_in_rule__XIssueExpression__Group_5__316683);
             rule__XIssueExpression__Group_5__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_5__4_in_rule__XIssueExpression__Group_5__316872);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_5__4_in_rule__XIssueExpression__Group_5__316686);
             rule__XIssueExpression__Group_5__4();
 
             state._fsp--;
@@ -24639,37 +24376,37 @@ public final void rule__XIssueExpression__Group_5__3() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XIssueExpression__Group_5__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8038:1: rule__XIssueExpression__Group_5__3__Impl : ( ( rule__XIssueExpression__Group_5_3__0 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7944:1: rule__XIssueExpression__Group_5__3__Impl : ( ( rule__XIssueExpression__Group_5_3__0 )* ) ;
     public final void rule__XIssueExpression__Group_5__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8042:1: ( ( ( rule__XIssueExpression__Group_5_3__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8043:1: ( ( rule__XIssueExpression__Group_5_3__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7948:1: ( ( ( rule__XIssueExpression__Group_5_3__0 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7949:1: ( ( rule__XIssueExpression__Group_5_3__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8043:1: ( ( rule__XIssueExpression__Group_5_3__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8044:1: ( rule__XIssueExpression__Group_5_3__0 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7949:1: ( ( rule__XIssueExpression__Group_5_3__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7950:1: ( rule__XIssueExpression__Group_5_3__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getGroup_5_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8045:1: ( rule__XIssueExpression__Group_5_3__0 )*
-            loop82:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7951:1: ( rule__XIssueExpression__Group_5_3__0 )*
+            loop81:
             do {
-                int alt82=2;
-                int LA82_0 = input.LA(1);
+                int alt81=2;
+                int LA81_0 = input.LA(1);
 
-                if ( (LA82_0==74) ) {
-                    alt82=1;
+                if ( (LA81_0==74) ) {
+                    alt81=1;
                 }
 
 
-                switch (alt82) {
+                switch (alt81) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8045:2: rule__XIssueExpression__Group_5_3__0
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7951:2: rule__XIssueExpression__Group_5_3__0
             	    {
-            	    pushFollow(FOLLOW_rule__XIssueExpression__Group_5_3__0_in_rule__XIssueExpression__Group_5__3__Impl16899);
+            	    pushFollow(FOLLOW_rule__XIssueExpression__Group_5_3__0_in_rule__XIssueExpression__Group_5__3__Impl16713);
             	    rule__XIssueExpression__Group_5_3__0();
 
             	    state._fsp--;
@@ -24679,7 +24416,7 @@ public final void rule__XIssueExpression__Group_5__3__Impl() throws RecognitionE
             	    break;
 
             	default :
-            	    break loop82;
+            	    break loop81;
                 }
             } while (true);
 
@@ -24708,16 +24445,16 @@ public final void rule__XIssueExpression__Group_5__3__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XIssueExpression__Group_5__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8055:1: rule__XIssueExpression__Group_5__4 : rule__XIssueExpression__Group_5__4__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7961:1: rule__XIssueExpression__Group_5__4 : rule__XIssueExpression__Group_5__4__Impl ;
     public final void rule__XIssueExpression__Group_5__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8059:1: ( rule__XIssueExpression__Group_5__4__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8060:2: rule__XIssueExpression__Group_5__4__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7965:1: ( rule__XIssueExpression__Group_5__4__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7966:2: rule__XIssueExpression__Group_5__4__Impl
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_5__4__Impl_in_rule__XIssueExpression__Group_5__416930);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_5__4__Impl_in_rule__XIssueExpression__Group_5__416744);
             rule__XIssueExpression__Group_5__4__Impl();
 
             state._fsp--;
@@ -24741,22 +24478,22 @@ public final void rule__XIssueExpression__Group_5__4() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XIssueExpression__Group_5__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8066:1: rule__XIssueExpression__Group_5__4__Impl : ( ')' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7972:1: rule__XIssueExpression__Group_5__4__Impl : ( ')' ) ;
     public final void rule__XIssueExpression__Group_5__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8070:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8071:1: ( ')' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7976:1: ( ( ')' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7977:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8071:1: ( ')' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8072:1: ')'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7977:1: ( ')' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7978:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getRightParenthesisKeyword_5_4()); 
             }
-            match(input,73,FOLLOW_73_in_rule__XIssueExpression__Group_5__4__Impl16958); if (state.failed) return ;
+            match(input,73,FOLLOW_73_in_rule__XIssueExpression__Group_5__4__Impl16772); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXIssueExpressionAccess().getRightParenthesisKeyword_5_4()); 
             }
@@ -24782,21 +24519,21 @@ public final void rule__XIssueExpression__Group_5__4__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XIssueExpression__Group_5_3__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8095:1: rule__XIssueExpression__Group_5_3__0 : rule__XIssueExpression__Group_5_3__0__Impl rule__XIssueExpression__Group_5_3__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8001:1: rule__XIssueExpression__Group_5_3__0 : rule__XIssueExpression__Group_5_3__0__Impl rule__XIssueExpression__Group_5_3__1 ;
     public final void rule__XIssueExpression__Group_5_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8099:1: ( rule__XIssueExpression__Group_5_3__0__Impl rule__XIssueExpression__Group_5_3__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8100:2: rule__XIssueExpression__Group_5_3__0__Impl rule__XIssueExpression__Group_5_3__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8005:1: ( rule__XIssueExpression__Group_5_3__0__Impl rule__XIssueExpression__Group_5_3__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8006:2: rule__XIssueExpression__Group_5_3__0__Impl rule__XIssueExpression__Group_5_3__1
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_5_3__0__Impl_in_rule__XIssueExpression__Group_5_3__016999);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_5_3__0__Impl_in_rule__XIssueExpression__Group_5_3__016813);
             rule__XIssueExpression__Group_5_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_5_3__1_in_rule__XIssueExpression__Group_5_3__017002);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_5_3__1_in_rule__XIssueExpression__Group_5_3__016816);
             rule__XIssueExpression__Group_5_3__1();
 
             state._fsp--;
@@ -24820,25 +24557,25 @@ public final void rule__XIssueExpression__Group_5_3__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XIssueExpression__Group_5_3__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8107:1: rule__XIssueExpression__Group_5_3__0__Impl : ( ( ',' ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8013:1: rule__XIssueExpression__Group_5_3__0__Impl : ( ( ',' ) ) ;
     public final void rule__XIssueExpression__Group_5_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8111:1: ( ( ( ',' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8112:1: ( ( ',' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8017:1: ( ( ( ',' ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8018:1: ( ( ',' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8112:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8113:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8018:1: ( ( ',' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8019:1: ( ',' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getCommaKeyword_5_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8114:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8115:2: ','
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8020:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8021:2: ','
             {
-            match(input,74,FOLLOW_74_in_rule__XIssueExpression__Group_5_3__0__Impl17031); if (state.failed) return ;
+            match(input,74,FOLLOW_74_in_rule__XIssueExpression__Group_5_3__0__Impl16845); if (state.failed) return ;
 
             }
 
@@ -24867,16 +24604,16 @@ public final void rule__XIssueExpression__Group_5_3__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XIssueExpression__Group_5_3__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8126:1: rule__XIssueExpression__Group_5_3__1 : rule__XIssueExpression__Group_5_3__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8032:1: rule__XIssueExpression__Group_5_3__1 : rule__XIssueExpression__Group_5_3__1__Impl ;
     public final void rule__XIssueExpression__Group_5_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8130:1: ( rule__XIssueExpression__Group_5_3__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8131:2: rule__XIssueExpression__Group_5_3__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8036:1: ( rule__XIssueExpression__Group_5_3__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8037:2: rule__XIssueExpression__Group_5_3__1__Impl
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_5_3__1__Impl_in_rule__XIssueExpression__Group_5_3__117063);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_5_3__1__Impl_in_rule__XIssueExpression__Group_5_3__116877);
             rule__XIssueExpression__Group_5_3__1__Impl();
 
             state._fsp--;
@@ -24900,25 +24637,25 @@ public final void rule__XIssueExpression__Group_5_3__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XIssueExpression__Group_5_3__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8137:1: rule__XIssueExpression__Group_5_3__1__Impl : ( ( rule__XIssueExpression__MessageParametersAssignment_5_3_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8043:1: rule__XIssueExpression__Group_5_3__1__Impl : ( ( rule__XIssueExpression__MessageParametersAssignment_5_3_1 ) ) ;
     public final void rule__XIssueExpression__Group_5_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8141:1: ( ( ( rule__XIssueExpression__MessageParametersAssignment_5_3_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8142:1: ( ( rule__XIssueExpression__MessageParametersAssignment_5_3_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8047:1: ( ( ( rule__XIssueExpression__MessageParametersAssignment_5_3_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8048:1: ( ( rule__XIssueExpression__MessageParametersAssignment_5_3_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8142:1: ( ( rule__XIssueExpression__MessageParametersAssignment_5_3_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8143:1: ( rule__XIssueExpression__MessageParametersAssignment_5_3_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8048:1: ( ( rule__XIssueExpression__MessageParametersAssignment_5_3_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8049:1: ( rule__XIssueExpression__MessageParametersAssignment_5_3_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getMessageParametersAssignment_5_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8144:1: ( rule__XIssueExpression__MessageParametersAssignment_5_3_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8144:2: rule__XIssueExpression__MessageParametersAssignment_5_3_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8050:1: ( rule__XIssueExpression__MessageParametersAssignment_5_3_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8050:2: rule__XIssueExpression__MessageParametersAssignment_5_3_1
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__MessageParametersAssignment_5_3_1_in_rule__XIssueExpression__Group_5_3__1__Impl17090);
+            pushFollow(FOLLOW_rule__XIssueExpression__MessageParametersAssignment_5_3_1_in_rule__XIssueExpression__Group_5_3__1__Impl16904);
             rule__XIssueExpression__MessageParametersAssignment_5_3_1();
 
             state._fsp--;
@@ -24951,21 +24688,21 @@ public final void rule__XIssueExpression__Group_5_3__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XIssueExpression__Group_6__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8158:1: rule__XIssueExpression__Group_6__0 : rule__XIssueExpression__Group_6__0__Impl rule__XIssueExpression__Group_6__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8064:1: rule__XIssueExpression__Group_6__0 : rule__XIssueExpression__Group_6__0__Impl rule__XIssueExpression__Group_6__1 ;
     public final void rule__XIssueExpression__Group_6__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8162:1: ( rule__XIssueExpression__Group_6__0__Impl rule__XIssueExpression__Group_6__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8163:2: rule__XIssueExpression__Group_6__0__Impl rule__XIssueExpression__Group_6__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8068:1: ( rule__XIssueExpression__Group_6__0__Impl rule__XIssueExpression__Group_6__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8069:2: rule__XIssueExpression__Group_6__0__Impl rule__XIssueExpression__Group_6__1
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_6__0__Impl_in_rule__XIssueExpression__Group_6__017124);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_6__0__Impl_in_rule__XIssueExpression__Group_6__016938);
             rule__XIssueExpression__Group_6__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_6__1_in_rule__XIssueExpression__Group_6__017127);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_6__1_in_rule__XIssueExpression__Group_6__016941);
             rule__XIssueExpression__Group_6__1();
 
             state._fsp--;
@@ -24989,25 +24726,25 @@ public final void rule__XIssueExpression__Group_6__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XIssueExpression__Group_6__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8170:1: rule__XIssueExpression__Group_6__0__Impl : ( ( 'data' ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8076:1: rule__XIssueExpression__Group_6__0__Impl : ( ( 'data' ) ) ;
     public final void rule__XIssueExpression__Group_6__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8174:1: ( ( ( 'data' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8175:1: ( ( 'data' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8080:1: ( ( ( 'data' ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8081:1: ( ( 'data' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8175:1: ( ( 'data' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8176:1: ( 'data' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8081:1: ( ( 'data' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8082:1: ( 'data' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getDataKeyword_6_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8177:1: ( 'data' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8178:2: 'data'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8083:1: ( 'data' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8084:2: 'data'
             {
-            match(input,27,FOLLOW_27_in_rule__XIssueExpression__Group_6__0__Impl17156); if (state.failed) return ;
+            match(input,27,FOLLOW_27_in_rule__XIssueExpression__Group_6__0__Impl16970); if (state.failed) return ;
 
             }
 
@@ -25036,21 +24773,21 @@ public final void rule__XIssueExpression__Group_6__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XIssueExpression__Group_6__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8189:1: rule__XIssueExpression__Group_6__1 : rule__XIssueExpression__Group_6__1__Impl rule__XIssueExpression__Group_6__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8095:1: rule__XIssueExpression__Group_6__1 : rule__XIssueExpression__Group_6__1__Impl rule__XIssueExpression__Group_6__2 ;
     public final void rule__XIssueExpression__Group_6__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8193:1: ( rule__XIssueExpression__Group_6__1__Impl rule__XIssueExpression__Group_6__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8194:2: rule__XIssueExpression__Group_6__1__Impl rule__XIssueExpression__Group_6__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8099:1: ( rule__XIssueExpression__Group_6__1__Impl rule__XIssueExpression__Group_6__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8100:2: rule__XIssueExpression__Group_6__1__Impl rule__XIssueExpression__Group_6__2
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_6__1__Impl_in_rule__XIssueExpression__Group_6__117188);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_6__1__Impl_in_rule__XIssueExpression__Group_6__117002);
             rule__XIssueExpression__Group_6__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_6__2_in_rule__XIssueExpression__Group_6__117191);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_6__2_in_rule__XIssueExpression__Group_6__117005);
             rule__XIssueExpression__Group_6__2();
 
             state._fsp--;
@@ -25074,33 +24811,33 @@ public final void rule__XIssueExpression__Group_6__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XIssueExpression__Group_6__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8201:1: rule__XIssueExpression__Group_6__1__Impl : ( ( rule__XIssueExpression__IssueCodeAssignment_6_1 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8107:1: rule__XIssueExpression__Group_6__1__Impl : ( ( rule__XIssueExpression__IssueCodeAssignment_6_1 )? ) ;
     public final void rule__XIssueExpression__Group_6__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8205:1: ( ( ( rule__XIssueExpression__IssueCodeAssignment_6_1 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8206:1: ( ( rule__XIssueExpression__IssueCodeAssignment_6_1 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8111:1: ( ( ( rule__XIssueExpression__IssueCodeAssignment_6_1 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8112:1: ( ( rule__XIssueExpression__IssueCodeAssignment_6_1 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8206:1: ( ( rule__XIssueExpression__IssueCodeAssignment_6_1 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8207:1: ( rule__XIssueExpression__IssueCodeAssignment_6_1 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8112:1: ( ( rule__XIssueExpression__IssueCodeAssignment_6_1 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8113:1: ( rule__XIssueExpression__IssueCodeAssignment_6_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getIssueCodeAssignment_6_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8208:1: ( rule__XIssueExpression__IssueCodeAssignment_6_1 )?
-            int alt83=2;
-            int LA83_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8114:1: ( rule__XIssueExpression__IssueCodeAssignment_6_1 )?
+            int alt82=2;
+            int LA82_0 = input.LA(1);
 
-            if ( (LA83_0==RULE_ID) ) {
-                alt83=1;
+            if ( (LA82_0==RULE_ID) ) {
+                alt82=1;
             }
-            switch (alt83) {
+            switch (alt82) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8208:2: rule__XIssueExpression__IssueCodeAssignment_6_1
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8114:2: rule__XIssueExpression__IssueCodeAssignment_6_1
                     {
-                    pushFollow(FOLLOW_rule__XIssueExpression__IssueCodeAssignment_6_1_in_rule__XIssueExpression__Group_6__1__Impl17218);
+                    pushFollow(FOLLOW_rule__XIssueExpression__IssueCodeAssignment_6_1_in_rule__XIssueExpression__Group_6__1__Impl17032);
                     rule__XIssueExpression__IssueCodeAssignment_6_1();
 
                     state._fsp--;
@@ -25136,21 +24873,21 @@ public final void rule__XIssueExpression__Group_6__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XIssueExpression__Group_6__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8218:1: rule__XIssueExpression__Group_6__2 : rule__XIssueExpression__Group_6__2__Impl rule__XIssueExpression__Group_6__3 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8124:1: rule__XIssueExpression__Group_6__2 : rule__XIssueExpression__Group_6__2__Impl rule__XIssueExpression__Group_6__3 ;
     public final void rule__XIssueExpression__Group_6__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8222:1: ( rule__XIssueExpression__Group_6__2__Impl rule__XIssueExpression__Group_6__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8223:2: rule__XIssueExpression__Group_6__2__Impl rule__XIssueExpression__Group_6__3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8128:1: ( rule__XIssueExpression__Group_6__2__Impl rule__XIssueExpression__Group_6__3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8129:2: rule__XIssueExpression__Group_6__2__Impl rule__XIssueExpression__Group_6__3
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_6__2__Impl_in_rule__XIssueExpression__Group_6__217249);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_6__2__Impl_in_rule__XIssueExpression__Group_6__217063);
             rule__XIssueExpression__Group_6__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_6__3_in_rule__XIssueExpression__Group_6__217252);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_6__3_in_rule__XIssueExpression__Group_6__217066);
             rule__XIssueExpression__Group_6__3();
 
             state._fsp--;
@@ -25174,22 +24911,22 @@ public final void rule__XIssueExpression__Group_6__2() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XIssueExpression__Group_6__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8230:1: rule__XIssueExpression__Group_6__2__Impl : ( '(' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8136:1: rule__XIssueExpression__Group_6__2__Impl : ( '(' ) ;
     public final void rule__XIssueExpression__Group_6__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8234:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8235:1: ( '(' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8140:1: ( ( '(' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8141:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8235:1: ( '(' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8236:1: '('
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8141:1: ( '(' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8142:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getLeftParenthesisKeyword_6_2()); 
             }
-            match(input,72,FOLLOW_72_in_rule__XIssueExpression__Group_6__2__Impl17280); if (state.failed) return ;
+            match(input,72,FOLLOW_72_in_rule__XIssueExpression__Group_6__2__Impl17094); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXIssueExpressionAccess().getLeftParenthesisKeyword_6_2()); 
             }
@@ -25215,21 +24952,21 @@ public final void rule__XIssueExpression__Group_6__2__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XIssueExpression__Group_6__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8249:1: rule__XIssueExpression__Group_6__3 : rule__XIssueExpression__Group_6__3__Impl rule__XIssueExpression__Group_6__4 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8155:1: rule__XIssueExpression__Group_6__3 : rule__XIssueExpression__Group_6__3__Impl rule__XIssueExpression__Group_6__4 ;
     public final void rule__XIssueExpression__Group_6__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8253:1: ( rule__XIssueExpression__Group_6__3__Impl rule__XIssueExpression__Group_6__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8254:2: rule__XIssueExpression__Group_6__3__Impl rule__XIssueExpression__Group_6__4
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8159:1: ( rule__XIssueExpression__Group_6__3__Impl rule__XIssueExpression__Group_6__4 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8160:2: rule__XIssueExpression__Group_6__3__Impl rule__XIssueExpression__Group_6__4
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_6__3__Impl_in_rule__XIssueExpression__Group_6__317311);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_6__3__Impl_in_rule__XIssueExpression__Group_6__317125);
             rule__XIssueExpression__Group_6__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_6__4_in_rule__XIssueExpression__Group_6__317314);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_6__4_in_rule__XIssueExpression__Group_6__317128);
             rule__XIssueExpression__Group_6__4();
 
             state._fsp--;
@@ -25253,25 +24990,25 @@ public final void rule__XIssueExpression__Group_6__3() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XIssueExpression__Group_6__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8261:1: rule__XIssueExpression__Group_6__3__Impl : ( ( rule__XIssueExpression__IssueDataAssignment_6_3 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8167:1: rule__XIssueExpression__Group_6__3__Impl : ( ( rule__XIssueExpression__IssueDataAssignment_6_3 ) ) ;
     public final void rule__XIssueExpression__Group_6__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8265:1: ( ( ( rule__XIssueExpression__IssueDataAssignment_6_3 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8266:1: ( ( rule__XIssueExpression__IssueDataAssignment_6_3 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8171:1: ( ( ( rule__XIssueExpression__IssueDataAssignment_6_3 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8172:1: ( ( rule__XIssueExpression__IssueDataAssignment_6_3 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8266:1: ( ( rule__XIssueExpression__IssueDataAssignment_6_3 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8267:1: ( rule__XIssueExpression__IssueDataAssignment_6_3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8172:1: ( ( rule__XIssueExpression__IssueDataAssignment_6_3 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8173:1: ( rule__XIssueExpression__IssueDataAssignment_6_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getIssueDataAssignment_6_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8268:1: ( rule__XIssueExpression__IssueDataAssignment_6_3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8268:2: rule__XIssueExpression__IssueDataAssignment_6_3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8174:1: ( rule__XIssueExpression__IssueDataAssignment_6_3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8174:2: rule__XIssueExpression__IssueDataAssignment_6_3
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__IssueDataAssignment_6_3_in_rule__XIssueExpression__Group_6__3__Impl17341);
+            pushFollow(FOLLOW_rule__XIssueExpression__IssueDataAssignment_6_3_in_rule__XIssueExpression__Group_6__3__Impl17155);
             rule__XIssueExpression__IssueDataAssignment_6_3();
 
             state._fsp--;
@@ -25304,21 +25041,21 @@ public final void rule__XIssueExpression__Group_6__3__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XIssueExpression__Group_6__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8278:1: rule__XIssueExpression__Group_6__4 : rule__XIssueExpression__Group_6__4__Impl rule__XIssueExpression__Group_6__5 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8184:1: rule__XIssueExpression__Group_6__4 : rule__XIssueExpression__Group_6__4__Impl rule__XIssueExpression__Group_6__5 ;
     public final void rule__XIssueExpression__Group_6__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8282:1: ( rule__XIssueExpression__Group_6__4__Impl rule__XIssueExpression__Group_6__5 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8283:2: rule__XIssueExpression__Group_6__4__Impl rule__XIssueExpression__Group_6__5
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8188:1: ( rule__XIssueExpression__Group_6__4__Impl rule__XIssueExpression__Group_6__5 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8189:2: rule__XIssueExpression__Group_6__4__Impl rule__XIssueExpression__Group_6__5
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_6__4__Impl_in_rule__XIssueExpression__Group_6__417371);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_6__4__Impl_in_rule__XIssueExpression__Group_6__417185);
             rule__XIssueExpression__Group_6__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_6__5_in_rule__XIssueExpression__Group_6__417374);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_6__5_in_rule__XIssueExpression__Group_6__417188);
             rule__XIssueExpression__Group_6__5();
 
             state._fsp--;
@@ -25342,37 +25079,37 @@ public final void rule__XIssueExpression__Group_6__4() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XIssueExpression__Group_6__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8290:1: rule__XIssueExpression__Group_6__4__Impl : ( ( rule__XIssueExpression__Group_6_4__0 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8196:1: rule__XIssueExpression__Group_6__4__Impl : ( ( rule__XIssueExpression__Group_6_4__0 )* ) ;
     public final void rule__XIssueExpression__Group_6__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8294:1: ( ( ( rule__XIssueExpression__Group_6_4__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8295:1: ( ( rule__XIssueExpression__Group_6_4__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8200:1: ( ( ( rule__XIssueExpression__Group_6_4__0 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8201:1: ( ( rule__XIssueExpression__Group_6_4__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8295:1: ( ( rule__XIssueExpression__Group_6_4__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8296:1: ( rule__XIssueExpression__Group_6_4__0 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8201:1: ( ( rule__XIssueExpression__Group_6_4__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8202:1: ( rule__XIssueExpression__Group_6_4__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getGroup_6_4()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8297:1: ( rule__XIssueExpression__Group_6_4__0 )*
-            loop84:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8203:1: ( rule__XIssueExpression__Group_6_4__0 )*
+            loop83:
             do {
-                int alt84=2;
-                int LA84_0 = input.LA(1);
+                int alt83=2;
+                int LA83_0 = input.LA(1);
 
-                if ( (LA84_0==74) ) {
-                    alt84=1;
+                if ( (LA83_0==74) ) {
+                    alt83=1;
                 }
 
 
-                switch (alt84) {
+                switch (alt83) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8297:2: rule__XIssueExpression__Group_6_4__0
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8203:2: rule__XIssueExpression__Group_6_4__0
             	    {
-            	    pushFollow(FOLLOW_rule__XIssueExpression__Group_6_4__0_in_rule__XIssueExpression__Group_6__4__Impl17401);
+            	    pushFollow(FOLLOW_rule__XIssueExpression__Group_6_4__0_in_rule__XIssueExpression__Group_6__4__Impl17215);
             	    rule__XIssueExpression__Group_6_4__0();
 
             	    state._fsp--;
@@ -25382,7 +25119,7 @@ public final void rule__XIssueExpression__Group_6__4__Impl() throws RecognitionE
             	    break;
 
             	default :
-            	    break loop84;
+            	    break loop83;
                 }
             } while (true);
 
@@ -25411,16 +25148,16 @@ public final void rule__XIssueExpression__Group_6__4__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XIssueExpression__Group_6__5"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8307:1: rule__XIssueExpression__Group_6__5 : rule__XIssueExpression__Group_6__5__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8213:1: rule__XIssueExpression__Group_6__5 : rule__XIssueExpression__Group_6__5__Impl ;
     public final void rule__XIssueExpression__Group_6__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8311:1: ( rule__XIssueExpression__Group_6__5__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8312:2: rule__XIssueExpression__Group_6__5__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8217:1: ( rule__XIssueExpression__Group_6__5__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8218:2: rule__XIssueExpression__Group_6__5__Impl
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_6__5__Impl_in_rule__XIssueExpression__Group_6__517432);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_6__5__Impl_in_rule__XIssueExpression__Group_6__517246);
             rule__XIssueExpression__Group_6__5__Impl();
 
             state._fsp--;
@@ -25444,22 +25181,22 @@ public final void rule__XIssueExpression__Group_6__5() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XIssueExpression__Group_6__5__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8318:1: rule__XIssueExpression__Group_6__5__Impl : ( ')' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8224:1: rule__XIssueExpression__Group_6__5__Impl : ( ')' ) ;
     public final void rule__XIssueExpression__Group_6__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8322:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8323:1: ( ')' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8228:1: ( ( ')' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8229:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8323:1: ( ')' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8324:1: ')'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8229:1: ( ')' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8230:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getRightParenthesisKeyword_6_5()); 
             }
-            match(input,73,FOLLOW_73_in_rule__XIssueExpression__Group_6__5__Impl17460); if (state.failed) return ;
+            match(input,73,FOLLOW_73_in_rule__XIssueExpression__Group_6__5__Impl17274); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXIssueExpressionAccess().getRightParenthesisKeyword_6_5()); 
             }
@@ -25485,21 +25222,21 @@ public final void rule__XIssueExpression__Group_6__5__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XIssueExpression__Group_6_4__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8349:1: rule__XIssueExpression__Group_6_4__0 : rule__XIssueExpression__Group_6_4__0__Impl rule__XIssueExpression__Group_6_4__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8255:1: rule__XIssueExpression__Group_6_4__0 : rule__XIssueExpression__Group_6_4__0__Impl rule__XIssueExpression__Group_6_4__1 ;
     public final void rule__XIssueExpression__Group_6_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8353:1: ( rule__XIssueExpression__Group_6_4__0__Impl rule__XIssueExpression__Group_6_4__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8354:2: rule__XIssueExpression__Group_6_4__0__Impl rule__XIssueExpression__Group_6_4__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8259:1: ( rule__XIssueExpression__Group_6_4__0__Impl rule__XIssueExpression__Group_6_4__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8260:2: rule__XIssueExpression__Group_6_4__0__Impl rule__XIssueExpression__Group_6_4__1
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_6_4__0__Impl_in_rule__XIssueExpression__Group_6_4__017503);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_6_4__0__Impl_in_rule__XIssueExpression__Group_6_4__017317);
             rule__XIssueExpression__Group_6_4__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_6_4__1_in_rule__XIssueExpression__Group_6_4__017506);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_6_4__1_in_rule__XIssueExpression__Group_6_4__017320);
             rule__XIssueExpression__Group_6_4__1();
 
             state._fsp--;
@@ -25523,25 +25260,25 @@ public final void rule__XIssueExpression__Group_6_4__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XIssueExpression__Group_6_4__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8361:1: rule__XIssueExpression__Group_6_4__0__Impl : ( ( ',' ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8267:1: rule__XIssueExpression__Group_6_4__0__Impl : ( ( ',' ) ) ;
     public final void rule__XIssueExpression__Group_6_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8365:1: ( ( ( ',' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8366:1: ( ( ',' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8271:1: ( ( ( ',' ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8272:1: ( ( ',' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8366:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8367:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8272:1: ( ( ',' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8273:1: ( ',' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getCommaKeyword_6_4_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8368:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8369:2: ','
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8274:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8275:2: ','
             {
-            match(input,74,FOLLOW_74_in_rule__XIssueExpression__Group_6_4__0__Impl17535); if (state.failed) return ;
+            match(input,74,FOLLOW_74_in_rule__XIssueExpression__Group_6_4__0__Impl17349); if (state.failed) return ;
 
             }
 
@@ -25570,16 +25307,16 @@ public final void rule__XIssueExpression__Group_6_4__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XIssueExpression__Group_6_4__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8380:1: rule__XIssueExpression__Group_6_4__1 : rule__XIssueExpression__Group_6_4__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8286:1: rule__XIssueExpression__Group_6_4__1 : rule__XIssueExpression__Group_6_4__1__Impl ;
     public final void rule__XIssueExpression__Group_6_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8384:1: ( rule__XIssueExpression__Group_6_4__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8385:2: rule__XIssueExpression__Group_6_4__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8290:1: ( rule__XIssueExpression__Group_6_4__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8291:2: rule__XIssueExpression__Group_6_4__1__Impl
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_6_4__1__Impl_in_rule__XIssueExpression__Group_6_4__117567);
+            pushFollow(FOLLOW_rule__XIssueExpression__Group_6_4__1__Impl_in_rule__XIssueExpression__Group_6_4__117381);
             rule__XIssueExpression__Group_6_4__1__Impl();
 
             state._fsp--;
@@ -25603,25 +25340,25 @@ public final void rule__XIssueExpression__Group_6_4__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XIssueExpression__Group_6_4__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8391:1: rule__XIssueExpression__Group_6_4__1__Impl : ( ( rule__XIssueExpression__IssueDataAssignment_6_4_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8297:1: rule__XIssueExpression__Group_6_4__1__Impl : ( ( rule__XIssueExpression__IssueDataAssignment_6_4_1 ) ) ;
     public final void rule__XIssueExpression__Group_6_4__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8395:1: ( ( ( rule__XIssueExpression__IssueDataAssignment_6_4_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8396:1: ( ( rule__XIssueExpression__IssueDataAssignment_6_4_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8301:1: ( ( ( rule__XIssueExpression__IssueDataAssignment_6_4_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8302:1: ( ( rule__XIssueExpression__IssueDataAssignment_6_4_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8396:1: ( ( rule__XIssueExpression__IssueDataAssignment_6_4_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8397:1: ( rule__XIssueExpression__IssueDataAssignment_6_4_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8302:1: ( ( rule__XIssueExpression__IssueDataAssignment_6_4_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8303:1: ( rule__XIssueExpression__IssueDataAssignment_6_4_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getIssueDataAssignment_6_4_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8398:1: ( rule__XIssueExpression__IssueDataAssignment_6_4_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8398:2: rule__XIssueExpression__IssueDataAssignment_6_4_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8304:1: ( rule__XIssueExpression__IssueDataAssignment_6_4_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8304:2: rule__XIssueExpression__IssueDataAssignment_6_4_1
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__IssueDataAssignment_6_4_1_in_rule__XIssueExpression__Group_6_4__1__Impl17594);
+            pushFollow(FOLLOW_rule__XIssueExpression__IssueDataAssignment_6_4_1_in_rule__XIssueExpression__Group_6_4__1__Impl17408);
             rule__XIssueExpression__IssueDataAssignment_6_4_1();
 
             state._fsp--;
@@ -25654,21 +25391,21 @@ public final void rule__XIssueExpression__Group_6_4__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XAnnotation__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8412:1: rule__XAnnotation__Group__0 : rule__XAnnotation__Group__0__Impl rule__XAnnotation__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8318:1: rule__XAnnotation__Group__0 : rule__XAnnotation__Group__0__Impl rule__XAnnotation__Group__1 ;
     public final void rule__XAnnotation__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8416:1: ( rule__XAnnotation__Group__0__Impl rule__XAnnotation__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8417:2: rule__XAnnotation__Group__0__Impl rule__XAnnotation__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8322:1: ( rule__XAnnotation__Group__0__Impl rule__XAnnotation__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8323:2: rule__XAnnotation__Group__0__Impl rule__XAnnotation__Group__1
             {
-            pushFollow(FOLLOW_rule__XAnnotation__Group__0__Impl_in_rule__XAnnotation__Group__017628);
+            pushFollow(FOLLOW_rule__XAnnotation__Group__0__Impl_in_rule__XAnnotation__Group__017442);
             rule__XAnnotation__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotation__Group__1_in_rule__XAnnotation__Group__017631);
+            pushFollow(FOLLOW_rule__XAnnotation__Group__1_in_rule__XAnnotation__Group__017445);
             rule__XAnnotation__Group__1();
 
             state._fsp--;
@@ -25692,23 +25429,23 @@ public final void rule__XAnnotation__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAnnotation__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8424:1: rule__XAnnotation__Group__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8330:1: rule__XAnnotation__Group__0__Impl : ( () ) ;
     public final void rule__XAnnotation__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8428:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8429:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8334:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8335:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8429:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8430:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8335:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8336:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getXAnnotationAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8431:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8433:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8337:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8339:1: 
             {
             }
 
@@ -25733,21 +25470,21 @@ public final void rule__XAnnotation__Group__0__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XAnnotation__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8443:1: rule__XAnnotation__Group__1 : rule__XAnnotation__Group__1__Impl rule__XAnnotation__Group__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8349:1: rule__XAnnotation__Group__1 : rule__XAnnotation__Group__1__Impl rule__XAnnotation__Group__2 ;
     public final void rule__XAnnotation__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8447:1: ( rule__XAnnotation__Group__1__Impl rule__XAnnotation__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8448:2: rule__XAnnotation__Group__1__Impl rule__XAnnotation__Group__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8353:1: ( rule__XAnnotation__Group__1__Impl rule__XAnnotation__Group__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8354:2: rule__XAnnotation__Group__1__Impl rule__XAnnotation__Group__2
             {
-            pushFollow(FOLLOW_rule__XAnnotation__Group__1__Impl_in_rule__XAnnotation__Group__117689);
+            pushFollow(FOLLOW_rule__XAnnotation__Group__1__Impl_in_rule__XAnnotation__Group__117503);
             rule__XAnnotation__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotation__Group__2_in_rule__XAnnotation__Group__117692);
+            pushFollow(FOLLOW_rule__XAnnotation__Group__2_in_rule__XAnnotation__Group__117506);
             rule__XAnnotation__Group__2();
 
             state._fsp--;
@@ -25771,22 +25508,22 @@ public final void rule__XAnnotation__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAnnotation__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8455:1: rule__XAnnotation__Group__1__Impl : ( '@' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8361:1: rule__XAnnotation__Group__1__Impl : ( '@' ) ;
     public final void rule__XAnnotation__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8459:1: ( ( '@' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8460:1: ( '@' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8365:1: ( ( '@' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8366:1: ( '@' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8460:1: ( '@' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8461:1: '@'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8366:1: ( '@' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8367:1: '@'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getCommercialAtKeyword_1()); 
             }
-            match(input,75,FOLLOW_75_in_rule__XAnnotation__Group__1__Impl17720); if (state.failed) return ;
+            match(input,75,FOLLOW_75_in_rule__XAnnotation__Group__1__Impl17534); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationAccess().getCommercialAtKeyword_1()); 
             }
@@ -25812,21 +25549,21 @@ public final void rule__XAnnotation__Group__1__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XAnnotation__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8474:1: rule__XAnnotation__Group__2 : rule__XAnnotation__Group__2__Impl rule__XAnnotation__Group__3 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8380:1: rule__XAnnotation__Group__2 : rule__XAnnotation__Group__2__Impl rule__XAnnotation__Group__3 ;
     public final void rule__XAnnotation__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8478:1: ( rule__XAnnotation__Group__2__Impl rule__XAnnotation__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8479:2: rule__XAnnotation__Group__2__Impl rule__XAnnotation__Group__3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8384:1: ( rule__XAnnotation__Group__2__Impl rule__XAnnotation__Group__3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8385:2: rule__XAnnotation__Group__2__Impl rule__XAnnotation__Group__3
             {
-            pushFollow(FOLLOW_rule__XAnnotation__Group__2__Impl_in_rule__XAnnotation__Group__217751);
+            pushFollow(FOLLOW_rule__XAnnotation__Group__2__Impl_in_rule__XAnnotation__Group__217565);
             rule__XAnnotation__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotation__Group__3_in_rule__XAnnotation__Group__217754);
+            pushFollow(FOLLOW_rule__XAnnotation__Group__3_in_rule__XAnnotation__Group__217568);
             rule__XAnnotation__Group__3();
 
             state._fsp--;
@@ -25850,25 +25587,25 @@ public final void rule__XAnnotation__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAnnotation__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8486:1: rule__XAnnotation__Group__2__Impl : ( ( rule__XAnnotation__AnnotationTypeAssignment_2 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8392:1: rule__XAnnotation__Group__2__Impl : ( ( rule__XAnnotation__AnnotationTypeAssignment_2 ) ) ;
     public final void rule__XAnnotation__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8490:1: ( ( ( rule__XAnnotation__AnnotationTypeAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8491:1: ( ( rule__XAnnotation__AnnotationTypeAssignment_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8396:1: ( ( ( rule__XAnnotation__AnnotationTypeAssignment_2 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8397:1: ( ( rule__XAnnotation__AnnotationTypeAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8491:1: ( ( rule__XAnnotation__AnnotationTypeAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8492:1: ( rule__XAnnotation__AnnotationTypeAssignment_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8397:1: ( ( rule__XAnnotation__AnnotationTypeAssignment_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8398:1: ( rule__XAnnotation__AnnotationTypeAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getAnnotationTypeAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8493:1: ( rule__XAnnotation__AnnotationTypeAssignment_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8493:2: rule__XAnnotation__AnnotationTypeAssignment_2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8399:1: ( rule__XAnnotation__AnnotationTypeAssignment_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8399:2: rule__XAnnotation__AnnotationTypeAssignment_2
             {
-            pushFollow(FOLLOW_rule__XAnnotation__AnnotationTypeAssignment_2_in_rule__XAnnotation__Group__2__Impl17781);
+            pushFollow(FOLLOW_rule__XAnnotation__AnnotationTypeAssignment_2_in_rule__XAnnotation__Group__2__Impl17595);
             rule__XAnnotation__AnnotationTypeAssignment_2();
 
             state._fsp--;
@@ -25901,16 +25638,16 @@ public final void rule__XAnnotation__Group__2__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XAnnotation__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8503:1: rule__XAnnotation__Group__3 : rule__XAnnotation__Group__3__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8409:1: rule__XAnnotation__Group__3 : rule__XAnnotation__Group__3__Impl ;
     public final void rule__XAnnotation__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8507:1: ( rule__XAnnotation__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8508:2: rule__XAnnotation__Group__3__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8413:1: ( rule__XAnnotation__Group__3__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8414:2: rule__XAnnotation__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotation__Group__3__Impl_in_rule__XAnnotation__Group__317811);
+            pushFollow(FOLLOW_rule__XAnnotation__Group__3__Impl_in_rule__XAnnotation__Group__317625);
             rule__XAnnotation__Group__3__Impl();
 
             state._fsp--;
@@ -25934,29 +25671,29 @@ public final void rule__XAnnotation__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAnnotation__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8514:1: rule__XAnnotation__Group__3__Impl : ( ( rule__XAnnotation__Group_3__0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8420:1: rule__XAnnotation__Group__3__Impl : ( ( rule__XAnnotation__Group_3__0 )? ) ;
     public final void rule__XAnnotation__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8518:1: ( ( ( rule__XAnnotation__Group_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8519:1: ( ( rule__XAnnotation__Group_3__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8424:1: ( ( ( rule__XAnnotation__Group_3__0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8425:1: ( ( rule__XAnnotation__Group_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8519:1: ( ( rule__XAnnotation__Group_3__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8520:1: ( rule__XAnnotation__Group_3__0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8425:1: ( ( rule__XAnnotation__Group_3__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8426:1: ( rule__XAnnotation__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getGroup_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8521:1: ( rule__XAnnotation__Group_3__0 )?
-            int alt85=2;
-            alt85 = dfa85.predict(input);
-            switch (alt85) {
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8427:1: ( rule__XAnnotation__Group_3__0 )?
+            int alt84=2;
+            alt84 = dfa84.predict(input);
+            switch (alt84) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8521:2: rule__XAnnotation__Group_3__0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8427:2: rule__XAnnotation__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__XAnnotation__Group_3__0_in_rule__XAnnotation__Group__3__Impl17838);
+                    pushFollow(FOLLOW_rule__XAnnotation__Group_3__0_in_rule__XAnnotation__Group__3__Impl17652);
                     rule__XAnnotation__Group_3__0();
 
                     state._fsp--;
@@ -25992,21 +25729,21 @@ public final void rule__XAnnotation__Group__3__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XAnnotation__Group_3__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8539:1: rule__XAnnotation__Group_3__0 : rule__XAnnotation__Group_3__0__Impl rule__XAnnotation__Group_3__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8445:1: rule__XAnnotation__Group_3__0 : rule__XAnnotation__Group_3__0__Impl rule__XAnnotation__Group_3__1 ;
     public final void rule__XAnnotation__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8543:1: ( rule__XAnnotation__Group_3__0__Impl rule__XAnnotation__Group_3__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8544:2: rule__XAnnotation__Group_3__0__Impl rule__XAnnotation__Group_3__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8449:1: ( rule__XAnnotation__Group_3__0__Impl rule__XAnnotation__Group_3__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8450:2: rule__XAnnotation__Group_3__0__Impl rule__XAnnotation__Group_3__1
             {
-            pushFollow(FOLLOW_rule__XAnnotation__Group_3__0__Impl_in_rule__XAnnotation__Group_3__017877);
+            pushFollow(FOLLOW_rule__XAnnotation__Group_3__0__Impl_in_rule__XAnnotation__Group_3__017691);
             rule__XAnnotation__Group_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotation__Group_3__1_in_rule__XAnnotation__Group_3__017880);
+            pushFollow(FOLLOW_rule__XAnnotation__Group_3__1_in_rule__XAnnotation__Group_3__017694);
             rule__XAnnotation__Group_3__1();
 
             state._fsp--;
@@ -26030,25 +25767,25 @@ public final void rule__XAnnotation__Group_3__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAnnotation__Group_3__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8551:1: rule__XAnnotation__Group_3__0__Impl : ( ( '(' ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8457:1: rule__XAnnotation__Group_3__0__Impl : ( ( '(' ) ) ;
     public final void rule__XAnnotation__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8555:1: ( ( ( '(' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8556:1: ( ( '(' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8461:1: ( ( ( '(' ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8462:1: ( ( '(' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8556:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8557:1: ( '(' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8462:1: ( ( '(' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8463:1: ( '(' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getLeftParenthesisKeyword_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8558:1: ( '(' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8559:2: '('
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8464:1: ( '(' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8465:2: '('
             {
-            match(input,72,FOLLOW_72_in_rule__XAnnotation__Group_3__0__Impl17909); if (state.failed) return ;
+            match(input,72,FOLLOW_72_in_rule__XAnnotation__Group_3__0__Impl17723); if (state.failed) return ;
 
             }
 
@@ -26077,21 +25814,21 @@ public final void rule__XAnnotation__Group_3__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAnnotation__Group_3__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8570:1: rule__XAnnotation__Group_3__1 : rule__XAnnotation__Group_3__1__Impl rule__XAnnotation__Group_3__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8476:1: rule__XAnnotation__Group_3__1 : rule__XAnnotation__Group_3__1__Impl rule__XAnnotation__Group_3__2 ;
     public final void rule__XAnnotation__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8574:1: ( rule__XAnnotation__Group_3__1__Impl rule__XAnnotation__Group_3__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8575:2: rule__XAnnotation__Group_3__1__Impl rule__XAnnotation__Group_3__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8480:1: ( rule__XAnnotation__Group_3__1__Impl rule__XAnnotation__Group_3__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8481:2: rule__XAnnotation__Group_3__1__Impl rule__XAnnotation__Group_3__2
             {
-            pushFollow(FOLLOW_rule__XAnnotation__Group_3__1__Impl_in_rule__XAnnotation__Group_3__117941);
+            pushFollow(FOLLOW_rule__XAnnotation__Group_3__1__Impl_in_rule__XAnnotation__Group_3__117755);
             rule__XAnnotation__Group_3__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotation__Group_3__2_in_rule__XAnnotation__Group_3__117944);
+            pushFollow(FOLLOW_rule__XAnnotation__Group_3__2_in_rule__XAnnotation__Group_3__117758);
             rule__XAnnotation__Group_3__2();
 
             state._fsp--;
@@ -26115,33 +25852,33 @@ public final void rule__XAnnotation__Group_3__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAnnotation__Group_3__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8582:1: rule__XAnnotation__Group_3__1__Impl : ( ( rule__XAnnotation__Alternatives_3_1 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8488:1: rule__XAnnotation__Group_3__1__Impl : ( ( rule__XAnnotation__Alternatives_3_1 )? ) ;
     public final void rule__XAnnotation__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8586:1: ( ( ( rule__XAnnotation__Alternatives_3_1 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8587:1: ( ( rule__XAnnotation__Alternatives_3_1 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8492:1: ( ( ( rule__XAnnotation__Alternatives_3_1 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8493:1: ( ( rule__XAnnotation__Alternatives_3_1 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8587:1: ( ( rule__XAnnotation__Alternatives_3_1 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8588:1: ( rule__XAnnotation__Alternatives_3_1 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8493:1: ( ( rule__XAnnotation__Alternatives_3_1 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8494:1: ( rule__XAnnotation__Alternatives_3_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getAlternatives_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8589:1: ( rule__XAnnotation__Alternatives_3_1 )?
-            int alt86=2;
-            int LA86_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8495:1: ( rule__XAnnotation__Alternatives_3_1 )?
+            int alt85=2;
+            int LA85_0 = input.LA(1);
 
-            if ( ((LA86_0>=RULE_ID && LA86_0<=RULE_STRING)||(LA86_0>=16 && LA86_0<=35)||LA86_0==47||(LA86_0>=54 && LA86_0<=55)||LA86_0==60||(LA86_0>=65 && LA86_0<=66)||LA86_0==68||LA86_0==70||LA86_0==72||LA86_0==75||(LA86_0>=77 && LA86_0<=78)||(LA86_0>=80 && LA86_0<=81)||LA86_0==84||LA86_0==86||(LA86_0>=90 && LA86_0<=97)||LA86_0==99||LA86_0==108) ) {
-                alt86=1;
+            if ( ((LA85_0>=RULE_ID && LA85_0<=RULE_STRING)||(LA85_0>=16 && LA85_0<=35)||LA85_0==47||(LA85_0>=54 && LA85_0<=55)||LA85_0==60||(LA85_0>=65 && LA85_0<=66)||LA85_0==68||LA85_0==70||LA85_0==72||LA85_0==75||(LA85_0>=77 && LA85_0<=78)||(LA85_0>=80 && LA85_0<=81)||LA85_0==84||LA85_0==86||(LA85_0>=90 && LA85_0<=97)||LA85_0==99||LA85_0==108) ) {
+                alt85=1;
             }
-            switch (alt86) {
+            switch (alt85) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8589:2: rule__XAnnotation__Alternatives_3_1
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8495:2: rule__XAnnotation__Alternatives_3_1
                     {
-                    pushFollow(FOLLOW_rule__XAnnotation__Alternatives_3_1_in_rule__XAnnotation__Group_3__1__Impl17971);
+                    pushFollow(FOLLOW_rule__XAnnotation__Alternatives_3_1_in_rule__XAnnotation__Group_3__1__Impl17785);
                     rule__XAnnotation__Alternatives_3_1();
 
                     state._fsp--;
@@ -26177,16 +25914,16 @@ public final void rule__XAnnotation__Group_3__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAnnotation__Group_3__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8599:1: rule__XAnnotation__Group_3__2 : rule__XAnnotation__Group_3__2__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8505:1: rule__XAnnotation__Group_3__2 : rule__XAnnotation__Group_3__2__Impl ;
     public final void rule__XAnnotation__Group_3__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8603:1: ( rule__XAnnotation__Group_3__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8604:2: rule__XAnnotation__Group_3__2__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8509:1: ( rule__XAnnotation__Group_3__2__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8510:2: rule__XAnnotation__Group_3__2__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotation__Group_3__2__Impl_in_rule__XAnnotation__Group_3__218002);
+            pushFollow(FOLLOW_rule__XAnnotation__Group_3__2__Impl_in_rule__XAnnotation__Group_3__217816);
             rule__XAnnotation__Group_3__2__Impl();
 
             state._fsp--;
@@ -26210,22 +25947,22 @@ public final void rule__XAnnotation__Group_3__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAnnotation__Group_3__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8610:1: rule__XAnnotation__Group_3__2__Impl : ( ')' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8516:1: rule__XAnnotation__Group_3__2__Impl : ( ')' ) ;
     public final void rule__XAnnotation__Group_3__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8614:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8615:1: ( ')' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8520:1: ( ( ')' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8521:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8615:1: ( ')' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8616:1: ')'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8521:1: ( ')' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8522:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getRightParenthesisKeyword_3_2()); 
             }
-            match(input,73,FOLLOW_73_in_rule__XAnnotation__Group_3__2__Impl18030); if (state.failed) return ;
+            match(input,73,FOLLOW_73_in_rule__XAnnotation__Group_3__2__Impl17844); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationAccess().getRightParenthesisKeyword_3_2()); 
             }
@@ -26251,21 +25988,21 @@ public final void rule__XAnnotation__Group_3__2__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAnnotation__Group_3_1_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8635:1: rule__XAnnotation__Group_3_1_0__0 : rule__XAnnotation__Group_3_1_0__0__Impl rule__XAnnotation__Group_3_1_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8541:1: rule__XAnnotation__Group_3_1_0__0 : rule__XAnnotation__Group_3_1_0__0__Impl rule__XAnnotation__Group_3_1_0__1 ;
     public final void rule__XAnnotation__Group_3_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8639:1: ( rule__XAnnotation__Group_3_1_0__0__Impl rule__XAnnotation__Group_3_1_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8640:2: rule__XAnnotation__Group_3_1_0__0__Impl rule__XAnnotation__Group_3_1_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8545:1: ( rule__XAnnotation__Group_3_1_0__0__Impl rule__XAnnotation__Group_3_1_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8546:2: rule__XAnnotation__Group_3_1_0__0__Impl rule__XAnnotation__Group_3_1_0__1
             {
-            pushFollow(FOLLOW_rule__XAnnotation__Group_3_1_0__0__Impl_in_rule__XAnnotation__Group_3_1_0__018067);
+            pushFollow(FOLLOW_rule__XAnnotation__Group_3_1_0__0__Impl_in_rule__XAnnotation__Group_3_1_0__017881);
             rule__XAnnotation__Group_3_1_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotation__Group_3_1_0__1_in_rule__XAnnotation__Group_3_1_0__018070);
+            pushFollow(FOLLOW_rule__XAnnotation__Group_3_1_0__1_in_rule__XAnnotation__Group_3_1_0__017884);
             rule__XAnnotation__Group_3_1_0__1();
 
             state._fsp--;
@@ -26289,25 +26026,25 @@ public final void rule__XAnnotation__Group_3_1_0__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XAnnotation__Group_3_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8647:1: rule__XAnnotation__Group_3_1_0__0__Impl : ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8553:1: rule__XAnnotation__Group_3_1_0__0__Impl : ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 ) ) ;
     public final void rule__XAnnotation__Group_3_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8651:1: ( ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8652:1: ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8557:1: ( ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8558:1: ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8652:1: ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8653:1: ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8558:1: ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8559:1: ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getElementValuePairsAssignment_3_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8654:1: ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8654:2: rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8560:1: ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8560:2: rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0
             {
-            pushFollow(FOLLOW_rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0_in_rule__XAnnotation__Group_3_1_0__0__Impl18097);
+            pushFollow(FOLLOW_rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0_in_rule__XAnnotation__Group_3_1_0__0__Impl17911);
             rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0();
 
             state._fsp--;
@@ -26340,16 +26077,16 @@ public final void rule__XAnnotation__Group_3_1_0__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XAnnotation__Group_3_1_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8664:1: rule__XAnnotation__Group_3_1_0__1 : rule__XAnnotation__Group_3_1_0__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8570:1: rule__XAnnotation__Group_3_1_0__1 : rule__XAnnotation__Group_3_1_0__1__Impl ;
     public final void rule__XAnnotation__Group_3_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8668:1: ( rule__XAnnotation__Group_3_1_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8669:2: rule__XAnnotation__Group_3_1_0__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8574:1: ( rule__XAnnotation__Group_3_1_0__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8575:2: rule__XAnnotation__Group_3_1_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotation__Group_3_1_0__1__Impl_in_rule__XAnnotation__Group_3_1_0__118127);
+            pushFollow(FOLLOW_rule__XAnnotation__Group_3_1_0__1__Impl_in_rule__XAnnotation__Group_3_1_0__117941);
             rule__XAnnotation__Group_3_1_0__1__Impl();
 
             state._fsp--;
@@ -26373,37 +26110,37 @@ public final void rule__XAnnotation__Group_3_1_0__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XAnnotation__Group_3_1_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8675:1: rule__XAnnotation__Group_3_1_0__1__Impl : ( ( rule__XAnnotation__Group_3_1_0_1__0 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8581:1: rule__XAnnotation__Group_3_1_0__1__Impl : ( ( rule__XAnnotation__Group_3_1_0_1__0 )* ) ;
     public final void rule__XAnnotation__Group_3_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8679:1: ( ( ( rule__XAnnotation__Group_3_1_0_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8680:1: ( ( rule__XAnnotation__Group_3_1_0_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8585:1: ( ( ( rule__XAnnotation__Group_3_1_0_1__0 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8586:1: ( ( rule__XAnnotation__Group_3_1_0_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8680:1: ( ( rule__XAnnotation__Group_3_1_0_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8681:1: ( rule__XAnnotation__Group_3_1_0_1__0 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8586:1: ( ( rule__XAnnotation__Group_3_1_0_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8587:1: ( rule__XAnnotation__Group_3_1_0_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getGroup_3_1_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8682:1: ( rule__XAnnotation__Group_3_1_0_1__0 )*
-            loop87:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8588:1: ( rule__XAnnotation__Group_3_1_0_1__0 )*
+            loop86:
             do {
-                int alt87=2;
-                int LA87_0 = input.LA(1);
+                int alt86=2;
+                int LA86_0 = input.LA(1);
 
-                if ( (LA87_0==74) ) {
-                    alt87=1;
+                if ( (LA86_0==74) ) {
+                    alt86=1;
                 }
 
 
-                switch (alt87) {
+                switch (alt86) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8682:2: rule__XAnnotation__Group_3_1_0_1__0
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8588:2: rule__XAnnotation__Group_3_1_0_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XAnnotation__Group_3_1_0_1__0_in_rule__XAnnotation__Group_3_1_0__1__Impl18154);
+            	    pushFollow(FOLLOW_rule__XAnnotation__Group_3_1_0_1__0_in_rule__XAnnotation__Group_3_1_0__1__Impl17968);
             	    rule__XAnnotation__Group_3_1_0_1__0();
 
             	    state._fsp--;
@@ -26413,7 +26150,7 @@ public final void rule__XAnnotation__Group_3_1_0__1__Impl() throws RecognitionEx
             	    break;
 
             	default :
-            	    break loop87;
+            	    break loop86;
                 }
             } while (true);
 
@@ -26442,21 +26179,21 @@ public final void rule__XAnnotation__Group_3_1_0__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XAnnotation__Group_3_1_0_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8696:1: rule__XAnnotation__Group_3_1_0_1__0 : rule__XAnnotation__Group_3_1_0_1__0__Impl rule__XAnnotation__Group_3_1_0_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8602:1: rule__XAnnotation__Group_3_1_0_1__0 : rule__XAnnotation__Group_3_1_0_1__0__Impl rule__XAnnotation__Group_3_1_0_1__1 ;
     public final void rule__XAnnotation__Group_3_1_0_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8700:1: ( rule__XAnnotation__Group_3_1_0_1__0__Impl rule__XAnnotation__Group_3_1_0_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8701:2: rule__XAnnotation__Group_3_1_0_1__0__Impl rule__XAnnotation__Group_3_1_0_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8606:1: ( rule__XAnnotation__Group_3_1_0_1__0__Impl rule__XAnnotation__Group_3_1_0_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8607:2: rule__XAnnotation__Group_3_1_0_1__0__Impl rule__XAnnotation__Group_3_1_0_1__1
             {
-            pushFollow(FOLLOW_rule__XAnnotation__Group_3_1_0_1__0__Impl_in_rule__XAnnotation__Group_3_1_0_1__018189);
+            pushFollow(FOLLOW_rule__XAnnotation__Group_3_1_0_1__0__Impl_in_rule__XAnnotation__Group_3_1_0_1__018003);
             rule__XAnnotation__Group_3_1_0_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotation__Group_3_1_0_1__1_in_rule__XAnnotation__Group_3_1_0_1__018192);
+            pushFollow(FOLLOW_rule__XAnnotation__Group_3_1_0_1__1_in_rule__XAnnotation__Group_3_1_0_1__018006);
             rule__XAnnotation__Group_3_1_0_1__1();
 
             state._fsp--;
@@ -26480,22 +26217,22 @@ public final void rule__XAnnotation__Group_3_1_0_1__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAnnotation__Group_3_1_0_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8708:1: rule__XAnnotation__Group_3_1_0_1__0__Impl : ( ',' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8614:1: rule__XAnnotation__Group_3_1_0_1__0__Impl : ( ',' ) ;
     public final void rule__XAnnotation__Group_3_1_0_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8712:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8713:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8618:1: ( ( ',' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8619:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8713:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8714:1: ','
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8619:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8620:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getCommaKeyword_3_1_0_1_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XAnnotation__Group_3_1_0_1__0__Impl18220); if (state.failed) return ;
+            match(input,74,FOLLOW_74_in_rule__XAnnotation__Group_3_1_0_1__0__Impl18034); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationAccess().getCommaKeyword_3_1_0_1_0()); 
             }
@@ -26521,16 +26258,16 @@ public final void rule__XAnnotation__Group_3_1_0_1__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XAnnotation__Group_3_1_0_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8727:1: rule__XAnnotation__Group_3_1_0_1__1 : rule__XAnnotation__Group_3_1_0_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8633:1: rule__XAnnotation__Group_3_1_0_1__1 : rule__XAnnotation__Group_3_1_0_1__1__Impl ;
     public final void rule__XAnnotation__Group_3_1_0_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8731:1: ( rule__XAnnotation__Group_3_1_0_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8732:2: rule__XAnnotation__Group_3_1_0_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8637:1: ( rule__XAnnotation__Group_3_1_0_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8638:2: rule__XAnnotation__Group_3_1_0_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotation__Group_3_1_0_1__1__Impl_in_rule__XAnnotation__Group_3_1_0_1__118251);
+            pushFollow(FOLLOW_rule__XAnnotation__Group_3_1_0_1__1__Impl_in_rule__XAnnotation__Group_3_1_0_1__118065);
             rule__XAnnotation__Group_3_1_0_1__1__Impl();
 
             state._fsp--;
@@ -26554,25 +26291,25 @@ public final void rule__XAnnotation__Group_3_1_0_1__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAnnotation__Group_3_1_0_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8738:1: rule__XAnnotation__Group_3_1_0_1__1__Impl : ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8644:1: rule__XAnnotation__Group_3_1_0_1__1__Impl : ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 ) ) ;
     public final void rule__XAnnotation__Group_3_1_0_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8742:1: ( ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8743:1: ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8648:1: ( ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8649:1: ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8743:1: ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8744:1: ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8649:1: ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8650:1: ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getElementValuePairsAssignment_3_1_0_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8745:1: ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8745:2: rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8651:1: ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8651:2: rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1
             {
-            pushFollow(FOLLOW_rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1_in_rule__XAnnotation__Group_3_1_0_1__1__Impl18278);
+            pushFollow(FOLLOW_rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1_in_rule__XAnnotation__Group_3_1_0_1__1__Impl18092);
             rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1();
 
             state._fsp--;
@@ -26605,21 +26342,21 @@ public final void rule__XAnnotation__Group_3_1_0_1__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8759:1: rule__XAnnotationElementValuePair__Group__0 : rule__XAnnotationElementValuePair__Group__0__Impl rule__XAnnotationElementValuePair__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8665:1: rule__XAnnotationElementValuePair__Group__0 : rule__XAnnotationElementValuePair__Group__0__Impl rule__XAnnotationElementValuePair__Group__1 ;
     public final void rule__XAnnotationElementValuePair__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8763:1: ( rule__XAnnotationElementValuePair__Group__0__Impl rule__XAnnotationElementValuePair__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8764:2: rule__XAnnotationElementValuePair__Group__0__Impl rule__XAnnotationElementValuePair__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8669:1: ( rule__XAnnotationElementValuePair__Group__0__Impl rule__XAnnotationElementValuePair__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8670:2: rule__XAnnotationElementValuePair__Group__0__Impl rule__XAnnotationElementValuePair__Group__1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__Group__0__Impl_in_rule__XAnnotationElementValuePair__Group__018312);
+            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__Group__0__Impl_in_rule__XAnnotationElementValuePair__Group__018126);
             rule__XAnnotationElementValuePair__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__Group__1_in_rule__XAnnotationElementValuePair__Group__018315);
+            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__Group__1_in_rule__XAnnotationElementValuePair__Group__018129);
             rule__XAnnotationElementValuePair__Group__1();
 
             state._fsp--;
@@ -26643,25 +26380,25 @@ public final void rule__XAnnotationElementValuePair__Group__0() throws Recogniti
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8771:1: rule__XAnnotationElementValuePair__Group__0__Impl : ( ( rule__XAnnotationElementValuePair__Group_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8677:1: rule__XAnnotationElementValuePair__Group__0__Impl : ( ( rule__XAnnotationElementValuePair__Group_0__0 ) ) ;
     public final void rule__XAnnotationElementValuePair__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8775:1: ( ( ( rule__XAnnotationElementValuePair__Group_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8776:1: ( ( rule__XAnnotationElementValuePair__Group_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8681:1: ( ( ( rule__XAnnotationElementValuePair__Group_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8682:1: ( ( rule__XAnnotationElementValuePair__Group_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8776:1: ( ( rule__XAnnotationElementValuePair__Group_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8777:1: ( rule__XAnnotationElementValuePair__Group_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8682:1: ( ( rule__XAnnotationElementValuePair__Group_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8683:1: ( rule__XAnnotationElementValuePair__Group_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getGroup_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8778:1: ( rule__XAnnotationElementValuePair__Group_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8778:2: rule__XAnnotationElementValuePair__Group_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8684:1: ( rule__XAnnotationElementValuePair__Group_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8684:2: rule__XAnnotationElementValuePair__Group_0__0
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__Group_0__0_in_rule__XAnnotationElementValuePair__Group__0__Impl18342);
+            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__Group_0__0_in_rule__XAnnotationElementValuePair__Group__0__Impl18156);
             rule__XAnnotationElementValuePair__Group_0__0();
 
             state._fsp--;
@@ -26694,16 +26431,16 @@ public final void rule__XAnnotationElementValuePair__Group__0__Impl() throws Rec
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8788:1: rule__XAnnotationElementValuePair__Group__1 : rule__XAnnotationElementValuePair__Group__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8694:1: rule__XAnnotationElementValuePair__Group__1 : rule__XAnnotationElementValuePair__Group__1__Impl ;
     public final void rule__XAnnotationElementValuePair__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8792:1: ( rule__XAnnotationElementValuePair__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8793:2: rule__XAnnotationElementValuePair__Group__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8698:1: ( rule__XAnnotationElementValuePair__Group__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8699:2: rule__XAnnotationElementValuePair__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__Group__1__Impl_in_rule__XAnnotationElementValuePair__Group__118372);
+            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__Group__1__Impl_in_rule__XAnnotationElementValuePair__Group__118186);
             rule__XAnnotationElementValuePair__Group__1__Impl();
 
             state._fsp--;
@@ -26727,25 +26464,25 @@ public final void rule__XAnnotationElementValuePair__Group__1() throws Recogniti
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8799:1: rule__XAnnotationElementValuePair__Group__1__Impl : ( ( rule__XAnnotationElementValuePair__ValueAssignment_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8705:1: rule__XAnnotationElementValuePair__Group__1__Impl : ( ( rule__XAnnotationElementValuePair__ValueAssignment_1 ) ) ;
     public final void rule__XAnnotationElementValuePair__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8803:1: ( ( ( rule__XAnnotationElementValuePair__ValueAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8804:1: ( ( rule__XAnnotationElementValuePair__ValueAssignment_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8709:1: ( ( ( rule__XAnnotationElementValuePair__ValueAssignment_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8710:1: ( ( rule__XAnnotationElementValuePair__ValueAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8804:1: ( ( rule__XAnnotationElementValuePair__ValueAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8805:1: ( rule__XAnnotationElementValuePair__ValueAssignment_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8710:1: ( ( rule__XAnnotationElementValuePair__ValueAssignment_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8711:1: ( rule__XAnnotationElementValuePair__ValueAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getValueAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8806:1: ( rule__XAnnotationElementValuePair__ValueAssignment_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8806:2: rule__XAnnotationElementValuePair__ValueAssignment_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8712:1: ( rule__XAnnotationElementValuePair__ValueAssignment_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8712:2: rule__XAnnotationElementValuePair__ValueAssignment_1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__ValueAssignment_1_in_rule__XAnnotationElementValuePair__Group__1__Impl18399);
+            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__ValueAssignment_1_in_rule__XAnnotationElementValuePair__Group__1__Impl18213);
             rule__XAnnotationElementValuePair__ValueAssignment_1();
 
             state._fsp--;
@@ -26778,16 +26515,16 @@ public final void rule__XAnnotationElementValuePair__Group__1__Impl() throws Rec
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8820:1: rule__XAnnotationElementValuePair__Group_0__0 : rule__XAnnotationElementValuePair__Group_0__0__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8726:1: rule__XAnnotationElementValuePair__Group_0__0 : rule__XAnnotationElementValuePair__Group_0__0__Impl ;
     public final void rule__XAnnotationElementValuePair__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8824:1: ( rule__XAnnotationElementValuePair__Group_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8825:2: rule__XAnnotationElementValuePair__Group_0__0__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8730:1: ( rule__XAnnotationElementValuePair__Group_0__0__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8731:2: rule__XAnnotationElementValuePair__Group_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__Group_0__0__Impl_in_rule__XAnnotationElementValuePair__Group_0__018433);
+            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__Group_0__0__Impl_in_rule__XAnnotationElementValuePair__Group_0__018247);
             rule__XAnnotationElementValuePair__Group_0__0__Impl();
 
             state._fsp--;
@@ -26811,25 +26548,25 @@ public final void rule__XAnnotationElementValuePair__Group_0__0() throws Recogni
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8831:1: rule__XAnnotationElementValuePair__Group_0__0__Impl : ( ( rule__XAnnotationElementValuePair__Group_0_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8737:1: rule__XAnnotationElementValuePair__Group_0__0__Impl : ( ( rule__XAnnotationElementValuePair__Group_0_0__0 ) ) ;
     public final void rule__XAnnotationElementValuePair__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8835:1: ( ( ( rule__XAnnotationElementValuePair__Group_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8836:1: ( ( rule__XAnnotationElementValuePair__Group_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8741:1: ( ( ( rule__XAnnotationElementValuePair__Group_0_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8742:1: ( ( rule__XAnnotationElementValuePair__Group_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8836:1: ( ( rule__XAnnotationElementValuePair__Group_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8837:1: ( rule__XAnnotationElementValuePair__Group_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8742:1: ( ( rule__XAnnotationElementValuePair__Group_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8743:1: ( rule__XAnnotationElementValuePair__Group_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getGroup_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8838:1: ( rule__XAnnotationElementValuePair__Group_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8838:2: rule__XAnnotationElementValuePair__Group_0_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8744:1: ( rule__XAnnotationElementValuePair__Group_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8744:2: rule__XAnnotationElementValuePair__Group_0_0__0
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__Group_0_0__0_in_rule__XAnnotationElementValuePair__Group_0__0__Impl18460);
+            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__Group_0_0__0_in_rule__XAnnotationElementValuePair__Group_0__0__Impl18274);
             rule__XAnnotationElementValuePair__Group_0_0__0();
 
             state._fsp--;
@@ -26862,21 +26599,21 @@ public final void rule__XAnnotationElementValuePair__Group_0__0__Impl() throws R
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8850:1: rule__XAnnotationElementValuePair__Group_0_0__0 : rule__XAnnotationElementValuePair__Group_0_0__0__Impl rule__XAnnotationElementValuePair__Group_0_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8756:1: rule__XAnnotationElementValuePair__Group_0_0__0 : rule__XAnnotationElementValuePair__Group_0_0__0__Impl rule__XAnnotationElementValuePair__Group_0_0__1 ;
     public final void rule__XAnnotationElementValuePair__Group_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8854:1: ( rule__XAnnotationElementValuePair__Group_0_0__0__Impl rule__XAnnotationElementValuePair__Group_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8855:2: rule__XAnnotationElementValuePair__Group_0_0__0__Impl rule__XAnnotationElementValuePair__Group_0_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8760:1: ( rule__XAnnotationElementValuePair__Group_0_0__0__Impl rule__XAnnotationElementValuePair__Group_0_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8761:2: rule__XAnnotationElementValuePair__Group_0_0__0__Impl rule__XAnnotationElementValuePair__Group_0_0__1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__Group_0_0__0__Impl_in_rule__XAnnotationElementValuePair__Group_0_0__018492);
+            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__Group_0_0__0__Impl_in_rule__XAnnotationElementValuePair__Group_0_0__018306);
             rule__XAnnotationElementValuePair__Group_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__Group_0_0__1_in_rule__XAnnotationElementValuePair__Group_0_0__018495);
+            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__Group_0_0__1_in_rule__XAnnotationElementValuePair__Group_0_0__018309);
             rule__XAnnotationElementValuePair__Group_0_0__1();
 
             state._fsp--;
@@ -26900,25 +26637,25 @@ public final void rule__XAnnotationElementValuePair__Group_0_0__0() throws Recog
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8862:1: rule__XAnnotationElementValuePair__Group_0_0__0__Impl : ( ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8768:1: rule__XAnnotationElementValuePair__Group_0_0__0__Impl : ( ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 ) ) ;
     public final void rule__XAnnotationElementValuePair__Group_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8866:1: ( ( ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8867:1: ( ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8772:1: ( ( ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8773:1: ( ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8867:1: ( ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8868:1: ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8773:1: ( ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8774:1: ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getElementAssignment_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8869:1: ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8869:2: rule__XAnnotationElementValuePair__ElementAssignment_0_0_0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8775:1: ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8775:2: rule__XAnnotationElementValuePair__ElementAssignment_0_0_0
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__ElementAssignment_0_0_0_in_rule__XAnnotationElementValuePair__Group_0_0__0__Impl18522);
+            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__ElementAssignment_0_0_0_in_rule__XAnnotationElementValuePair__Group_0_0__0__Impl18336);
             rule__XAnnotationElementValuePair__ElementAssignment_0_0_0();
 
             state._fsp--;
@@ -26951,16 +26688,16 @@ public final void rule__XAnnotationElementValuePair__Group_0_0__0__Impl() throws
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8879:1: rule__XAnnotationElementValuePair__Group_0_0__1 : rule__XAnnotationElementValuePair__Group_0_0__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8785:1: rule__XAnnotationElementValuePair__Group_0_0__1 : rule__XAnnotationElementValuePair__Group_0_0__1__Impl ;
     public final void rule__XAnnotationElementValuePair__Group_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8883:1: ( rule__XAnnotationElementValuePair__Group_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8884:2: rule__XAnnotationElementValuePair__Group_0_0__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8789:1: ( rule__XAnnotationElementValuePair__Group_0_0__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8790:2: rule__XAnnotationElementValuePair__Group_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__Group_0_0__1__Impl_in_rule__XAnnotationElementValuePair__Group_0_0__118552);
+            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__Group_0_0__1__Impl_in_rule__XAnnotationElementValuePair__Group_0_0__118366);
             rule__XAnnotationElementValuePair__Group_0_0__1__Impl();
 
             state._fsp--;
@@ -26984,22 +26721,22 @@ public final void rule__XAnnotationElementValuePair__Group_0_0__1() throws Recog
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8890:1: rule__XAnnotationElementValuePair__Group_0_0__1__Impl : ( '=' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8796:1: rule__XAnnotationElementValuePair__Group_0_0__1__Impl : ( '=' ) ;
     public final void rule__XAnnotationElementValuePair__Group_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8894:1: ( ( '=' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8895:1: ( '=' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8800:1: ( ( '=' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8801:1: ( '=' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8895:1: ( '=' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8896:1: '='
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8801:1: ( '=' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8802:1: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getEqualsSignKeyword_0_0_1()); 
             }
-            match(input,13,FOLLOW_13_in_rule__XAnnotationElementValuePair__Group_0_0__1__Impl18580); if (state.failed) return ;
+            match(input,13,FOLLOW_13_in_rule__XAnnotationElementValuePair__Group_0_0__1__Impl18394); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValuePairAccess().getEqualsSignKeyword_0_0_1()); 
             }
@@ -27025,21 +26762,21 @@ public final void rule__XAnnotationElementValuePair__Group_0_0__1__Impl() throws
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8913:1: rule__XAnnotationElementValueOrCommaList__Group_0__0 : rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8819:1: rule__XAnnotationElementValueOrCommaList__Group_0__0 : rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0__1 ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8917:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8918:2: rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8823:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8824:2: rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0__1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0__018615);
+            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0__018429);
             rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__1_in_rule__XAnnotationElementValueOrCommaList__Group_0__018618);
+            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__1_in_rule__XAnnotationElementValueOrCommaList__Group_0__018432);
             rule__XAnnotationElementValueOrCommaList__Group_0__1();
 
             state._fsp--;
@@ -27063,25 +26800,25 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0__0() throws
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8925:1: rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8831:1: rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 ) ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8929:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8930:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8835:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8836:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8930:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8931:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8836:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8837:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8932:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8932:2: rule__XAnnotationElementValueOrCommaList__Group_0_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8838:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8838:2: rule__XAnnotationElementValueOrCommaList__Group_0_0__0
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0__0_in_rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl18645);
+            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0__0_in_rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl18459);
             rule__XAnnotationElementValueOrCommaList__Group_0_0__0();
 
             state._fsp--;
@@ -27114,21 +26851,21 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl() t
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8942:1: rule__XAnnotationElementValueOrCommaList__Group_0__1 : rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8848:1: rule__XAnnotationElementValueOrCommaList__Group_0__1 : rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0__2 ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8946:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8947:2: rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8852:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8853:2: rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0__2
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0__118675);
+            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0__118489);
             rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__2_in_rule__XAnnotationElementValueOrCommaList__Group_0__118678);
+            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__2_in_rule__XAnnotationElementValueOrCommaList__Group_0__118492);
             rule__XAnnotationElementValueOrCommaList__Group_0__2();
 
             state._fsp--;
@@ -27152,33 +26889,33 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0__1() throws
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8954:1: rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8860:1: rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )? ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8958:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8959:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8864:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8865:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8959:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8960:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8865:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8866:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8961:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )?
-            int alt88=2;
-            int LA88_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8867:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )?
+            int alt87=2;
+            int LA87_0 = input.LA(1);
 
-            if ( ((LA88_0>=RULE_ID && LA88_0<=RULE_STRING)||(LA88_0>=16 && LA88_0<=35)||LA88_0==47||(LA88_0>=54 && LA88_0<=55)||LA88_0==60||(LA88_0>=65 && LA88_0<=66)||LA88_0==68||LA88_0==70||LA88_0==72||LA88_0==75||(LA88_0>=77 && LA88_0<=78)||(LA88_0>=80 && LA88_0<=81)||LA88_0==84||LA88_0==86||(LA88_0>=90 && LA88_0<=97)||LA88_0==99||LA88_0==108) ) {
-                alt88=1;
+            if ( ((LA87_0>=RULE_ID && LA87_0<=RULE_STRING)||(LA87_0>=16 && LA87_0<=35)||LA87_0==47||(LA87_0>=54 && LA87_0<=55)||LA87_0==60||(LA87_0>=65 && LA87_0<=66)||LA87_0==68||LA87_0==70||LA87_0==72||LA87_0==75||(LA87_0>=77 && LA87_0<=78)||(LA87_0>=80 && LA87_0<=81)||LA87_0==84||LA87_0==86||(LA87_0>=90 && LA87_0<=97)||LA87_0==99||LA87_0==108) ) {
+                alt87=1;
             }
-            switch (alt88) {
+            switch (alt87) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8961:2: rule__XAnnotationElementValueOrCommaList__Group_0_1__0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8867:2: rule__XAnnotationElementValueOrCommaList__Group_0_1__0
                     {
-                    pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1__0_in_rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl18705);
+                    pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1__0_in_rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl18519);
                     rule__XAnnotationElementValueOrCommaList__Group_0_1__0();
 
                     state._fsp--;
@@ -27214,16 +26951,16 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl() t
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8971:1: rule__XAnnotationElementValueOrCommaList__Group_0__2 : rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8877:1: rule__XAnnotationElementValueOrCommaList__Group_0__2 : rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8975:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8976:2: rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8881:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8882:2: rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0__218736);
+            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0__218550);
             rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl();
 
             state._fsp--;
@@ -27247,22 +26984,22 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0__2() throws
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8982:1: rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl : ( ']' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8888:1: rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl : ( ']' ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8986:1: ( ( ']' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8987:1: ( ']' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8892:1: ( ( ']' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8893:1: ( ']' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8987:1: ( ']' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8988:1: ']'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8893:1: ( ']' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8894:1: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getRightSquareBracketKeyword_0_2()); 
             }
-            match(input,79,FOLLOW_79_in_rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl18764); if (state.failed) return ;
+            match(input,79,FOLLOW_79_in_rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl18578); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getRightSquareBracketKeyword_0_2()); 
             }
@@ -27288,16 +27025,16 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl() t
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9007:1: rule__XAnnotationElementValueOrCommaList__Group_0_0__0 : rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8913:1: rule__XAnnotationElementValueOrCommaList__Group_0_0__0 : rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9011:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9012:2: rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8917:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8918:2: rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_0__018801);
+            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_0__018615);
             rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl();
 
             state._fsp--;
@@ -27321,25 +27058,25 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_0__0() throw
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9018:1: rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8924:1: rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 ) ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9022:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9023:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8928:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8929:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9023:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9024:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8929:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8930:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9025:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9025:2: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8931:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8931:2: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0_in_rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl18828);
+            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0_in_rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl18642);
             rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0();
 
             state._fsp--;
@@ -27372,21 +27109,21 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl()
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9037:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 : rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8943:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 : rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1 ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9041:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9042:2: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8947:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8948:2: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__018860);
+            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__018674);
             rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__018863);
+            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__018677);
             rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1();
 
             state._fsp--;
@@ -27410,23 +27147,23 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0() thr
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9049:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8955:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl : ( () ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9053:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9054:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8959:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8960:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9054:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9055:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8960:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8961:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getXListLiteralAction_0_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9056:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9058:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8962:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8964:1: 
             {
             }
 
@@ -27451,21 +27188,21 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9068:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1 : rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8974:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1 : rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2 ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9072:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9073:2: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8978:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8979:2: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__118921);
+            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__118735);
             rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__118924);
+            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__118738);
             rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2();
 
             state._fsp--;
@@ -27489,22 +27226,22 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1() thr
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9080:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl : ( '#' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8986:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl : ( '#' ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9084:1: ( ( '#' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9085:1: ( '#' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8990:1: ( ( '#' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8991:1: ( '#' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9085:1: ( '#' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9086:1: '#'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8991:1: ( '#' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8992:1: '#'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getNumberSignKeyword_0_0_0_1()); 
             }
-            match(input,77,FOLLOW_77_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl18952); if (state.failed) return ;
+            match(input,77,FOLLOW_77_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl18766); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getNumberSignKeyword_0_0_0_1()); 
             }
@@ -27530,16 +27267,16 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9099:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2 : rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9005:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2 : rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9103:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9104:2: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9009:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9010:2: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__218983);
+            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__218797);
             rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl();
 
             state._fsp--;
@@ -27563,22 +27300,22 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2() thr
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9110:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl : ( '[' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9016:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl : ( '[' ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9114:1: ( ( '[' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9115:1: ( '[' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9020:1: ( ( '[' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9021:1: ( '[' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9115:1: ( '[' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9116:1: '['
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9021:1: ( '[' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9022:1: '['
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getLeftSquareBracketKeyword_0_0_0_2()); 
             }
-            match(input,78,FOLLOW_78_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl19011); if (state.failed) return ;
+            match(input,78,FOLLOW_78_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl18825); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getLeftSquareBracketKeyword_0_0_0_2()); 
             }
@@ -27604,21 +27341,21 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9135:1: rule__XAnnotationElementValueOrCommaList__Group_0_1__0 : rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9041:1: rule__XAnnotationElementValueOrCommaList__Group_0_1__0 : rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1__1 ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9139:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9140:2: rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9045:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9046:2: rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1__1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_1__019048);
+            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_1__018862);
             rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1__1_in_rule__XAnnotationElementValueOrCommaList__Group_0_1__019051);
+            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1__1_in_rule__XAnnotationElementValueOrCommaList__Group_0_1__018865);
             rule__XAnnotationElementValueOrCommaList__Group_0_1__1();
 
             state._fsp--;
@@ -27642,25 +27379,25 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_1__0() throw
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9147:1: rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl : ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9053:1: rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl : ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 ) ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9151:1: ( ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9152:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9057:1: ( ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9058:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9152:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9153:1: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9058:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9059:1: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsAssignment_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9154:1: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9154:2: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9060:1: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9060:2: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0_in_rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl19078);
+            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0_in_rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl18892);
             rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0();
 
             state._fsp--;
@@ -27693,16 +27430,16 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl()
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9164:1: rule__XAnnotationElementValueOrCommaList__Group_0_1__1 : rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9070:1: rule__XAnnotationElementValueOrCommaList__Group_0_1__1 : rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9168:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9169:2: rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9074:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9075:2: rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_1__119108);
+            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_1__118922);
             rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl();
 
             state._fsp--;
@@ -27726,37 +27463,37 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_1__1() throw
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9175:1: rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9081:1: rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )* ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9179:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9180:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9085:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9086:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9180:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9181:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9086:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9087:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_0_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9182:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )*
-            loop89:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9088:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )*
+            loop88:
             do {
-                int alt89=2;
-                int LA89_0 = input.LA(1);
+                int alt88=2;
+                int LA88_0 = input.LA(1);
 
-                if ( (LA89_0==74) ) {
-                    alt89=1;
+                if ( (LA88_0==74) ) {
+                    alt88=1;
                 }
 
 
-                switch (alt89) {
+                switch (alt88) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9182:2: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9088:2: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0_in_rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl19135);
+            	    pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0_in_rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl18949);
             	    rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0();
 
             	    state._fsp--;
@@ -27766,7 +27503,7 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl()
             	    break;
 
             	default :
-            	    break loop89;
+            	    break loop88;
                 }
             } while (true);
 
@@ -27795,21 +27532,21 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl()
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9196:1: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 : rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9102:1: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 : rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1 ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9200:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9201:2: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9106:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9107:2: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__019170);
+            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__018984);
             rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1_in_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__019173);
+            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1_in_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__018987);
             rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1();
 
             state._fsp--;
@@ -27833,22 +27570,22 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0() thr
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9208:1: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl : ( ',' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9114:1: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl : ( ',' ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9212:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9213:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9118:1: ( ( ',' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9119:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9213:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9214:1: ','
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9119:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9120:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getCommaKeyword_0_1_1_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl19201); if (state.failed) return ;
+            match(input,74,FOLLOW_74_in_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl19015); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getCommaKeyword_0_1_1_0()); 
             }
@@ -27874,16 +27611,16 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9227:1: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1 : rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9133:1: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1 : rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9231:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9232:2: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9137:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9138:2: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__119232);
+            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__119046);
             rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl();
 
             state._fsp--;
@@ -27907,25 +27644,25 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1() thr
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9238:1: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9144:1: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 ) ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9242:1: ( ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9243:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9148:1: ( ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9149:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9243:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9244:1: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9149:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9150:1: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsAssignment_0_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9245:1: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9245:2: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9151:1: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9151:2: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1_in_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl19259);
+            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1_in_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl19073);
             rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1();
 
             state._fsp--;
@@ -27958,21 +27695,21 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9259:1: rule__XAnnotationElementValueOrCommaList__Group_1__0 : rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9165:1: rule__XAnnotationElementValueOrCommaList__Group_1__0 : rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1__1 ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9263:1: ( rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9264:2: rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9169:1: ( rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9170:2: rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1__019293);
+            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1__019107);
             rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1__1_in_rule__XAnnotationElementValueOrCommaList__Group_1__019296);
+            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1__1_in_rule__XAnnotationElementValueOrCommaList__Group_1__019110);
             rule__XAnnotationElementValueOrCommaList__Group_1__1();
 
             state._fsp--;
@@ -27996,22 +27733,22 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1__0() throws
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9271:1: rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl : ( ruleXAnnotationOrExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9177:1: rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl : ( ruleXAnnotationOrExpression ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9275:1: ( ( ruleXAnnotationOrExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9276:1: ( ruleXAnnotationOrExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9181:1: ( ( ruleXAnnotationOrExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9182:1: ( ruleXAnnotationOrExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9276:1: ( ruleXAnnotationOrExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9277:1: ruleXAnnotationOrExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9182:1: ( ruleXAnnotationOrExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9183:1: ruleXAnnotationOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getXAnnotationOrExpressionParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl19323);
+            pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl19137);
             ruleXAnnotationOrExpression();
 
             state._fsp--;
@@ -28041,16 +27778,16 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl() t
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9288:1: rule__XAnnotationElementValueOrCommaList__Group_1__1 : rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9194:1: rule__XAnnotationElementValueOrCommaList__Group_1__1 : rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9292:1: ( rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9293:2: rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9198:1: ( rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9199:2: rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1__119352);
+            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1__119166);
             rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl();
 
             state._fsp--;
@@ -28074,33 +27811,33 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1__1() throws
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9299:1: rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9205:1: rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )? ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9303:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9304:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9209:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9210:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9304:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9305:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9210:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9211:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9306:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )?
-            int alt90=2;
-            int LA90_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9212:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )?
+            int alt89=2;
+            int LA89_0 = input.LA(1);
 
-            if ( (LA90_0==74) ) {
-                alt90=1;
+            if ( (LA89_0==74) ) {
+                alt89=1;
             }
-            switch (alt90) {
+            switch (alt89) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9306:2: rule__XAnnotationElementValueOrCommaList__Group_1_1__0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9212:2: rule__XAnnotationElementValueOrCommaList__Group_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1__0_in_rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl19379);
+                    pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1__0_in_rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl19193);
                     rule__XAnnotationElementValueOrCommaList__Group_1_1__0();
 
                     state._fsp--;
@@ -28136,21 +27873,21 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl() t
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9320:1: rule__XAnnotationElementValueOrCommaList__Group_1_1__0 : rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9226:1: rule__XAnnotationElementValueOrCommaList__Group_1_1__0 : rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1__1 ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9324:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9325:2: rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9230:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9231:2: rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1__1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1_1__019414);
+            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1_1__019228);
             rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1__1_in_rule__XAnnotationElementValueOrCommaList__Group_1_1__019417);
+            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1__1_in_rule__XAnnotationElementValueOrCommaList__Group_1_1__019231);
             rule__XAnnotationElementValueOrCommaList__Group_1_1__1();
 
             state._fsp--;
@@ -28174,23 +27911,23 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1_1__0() throw
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9332:1: rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9238:1: rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl : ( () ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9336:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9337:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9242:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9243:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9337:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9338:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9243:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9244:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getXListLiteralElementsAction_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9339:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9341:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9245:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9247:1: 
             {
             }
 
@@ -28215,16 +27952,16 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl()
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9351:1: rule__XAnnotationElementValueOrCommaList__Group_1_1__1 : rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9257:1: rule__XAnnotationElementValueOrCommaList__Group_1_1__1 : rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9355:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9356:2: rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9261:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9262:2: rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1_1__119475);
+            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1_1__119289);
             rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl();
 
             state._fsp--;
@@ -28248,28 +27985,28 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1_1__1() throw
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9362:1: rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl : ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9268:1: rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl : ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* ) ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9366:1: ( ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9367:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9272:1: ( ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9273:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9367:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9368:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9273:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9274:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9368:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9369:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9274:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9275:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9370:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9370:2: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9276:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9276:2: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0_in_rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl19504);
+            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0_in_rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl19318);
             rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0();
 
             state._fsp--;
@@ -28283,28 +28020,28 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl()
 
             }
 
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9373:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9374:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9279:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9280:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9375:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )*
-            loop91:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9281:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )*
+            loop90:
             do {
-                int alt91=2;
-                int LA91_0 = input.LA(1);
+                int alt90=2;
+                int LA90_0 = input.LA(1);
 
-                if ( (LA91_0==74) ) {
-                    alt91=1;
+                if ( (LA90_0==74) ) {
+                    alt90=1;
                 }
 
 
-                switch (alt91) {
+                switch (alt90) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9375:2: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9281:2: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0_in_rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl19516);
+            	    pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0_in_rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl19330);
             	    rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0();
 
             	    state._fsp--;
@@ -28314,7 +28051,7 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl()
             	    break;
 
             	default :
-            	    break loop91;
+            	    break loop90;
                 }
             } while (true);
 
@@ -28346,21 +28083,21 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl()
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9390:1: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 : rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9296:1: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 : rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1 ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9394:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9395:2: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9300:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9301:2: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__019553);
+            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__019367);
             rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1_in_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__019556);
+            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1_in_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__019370);
             rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1();
 
             state._fsp--;
@@ -28384,22 +28121,22 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0() thr
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9402:1: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl : ( ',' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9308:1: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl : ( ',' ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9406:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9407:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9312:1: ( ( ',' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9313:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9407:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9408:1: ','
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9313:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9314:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getCommaKeyword_1_1_1_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl19584); if (state.failed) return ;
+            match(input,74,FOLLOW_74_in_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl19398); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getCommaKeyword_1_1_1_0()); 
             }
@@ -28425,16 +28162,16 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9421:1: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1 : rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9327:1: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1 : rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9425:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9426:2: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9331:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9332:2: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__119615);
+            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__119429);
             rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl();
 
             state._fsp--;
@@ -28458,25 +28195,25 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1() thr
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9432:1: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9338:1: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 ) ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9436:1: ( ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9437:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9342:1: ( ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9343:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9437:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9438:1: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9343:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9344:1: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsAssignment_1_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9439:1: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9439:2: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9345:1: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9345:2: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1_in_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl19642);
+            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1_in_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl19456);
             rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1();
 
             state._fsp--;
@@ -28509,21 +28246,21 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9453:1: rule__XAnnotationElementValue__Group_0__0 : rule__XAnnotationElementValue__Group_0__0__Impl rule__XAnnotationElementValue__Group_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9359:1: rule__XAnnotationElementValue__Group_0__0 : rule__XAnnotationElementValue__Group_0__0__Impl rule__XAnnotationElementValue__Group_0__1 ;
     public final void rule__XAnnotationElementValue__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9457:1: ( rule__XAnnotationElementValue__Group_0__0__Impl rule__XAnnotationElementValue__Group_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9458:2: rule__XAnnotationElementValue__Group_0__0__Impl rule__XAnnotationElementValue__Group_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9363:1: ( rule__XAnnotationElementValue__Group_0__0__Impl rule__XAnnotationElementValue__Group_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9364:2: rule__XAnnotationElementValue__Group_0__0__Impl rule__XAnnotationElementValue__Group_0__1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0__0__Impl_in_rule__XAnnotationElementValue__Group_0__019676);
+            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0__0__Impl_in_rule__XAnnotationElementValue__Group_0__019490);
             rule__XAnnotationElementValue__Group_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0__1_in_rule__XAnnotationElementValue__Group_0__019679);
+            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0__1_in_rule__XAnnotationElementValue__Group_0__019493);
             rule__XAnnotationElementValue__Group_0__1();
 
             state._fsp--;
@@ -28547,25 +28284,25 @@ public final void rule__XAnnotationElementValue__Group_0__0() throws Recognition
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9465:1: rule__XAnnotationElementValue__Group_0__0__Impl : ( ( rule__XAnnotationElementValue__Group_0_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9371:1: rule__XAnnotationElementValue__Group_0__0__Impl : ( ( rule__XAnnotationElementValue__Group_0_0__0 ) ) ;
     public final void rule__XAnnotationElementValue__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9469:1: ( ( ( rule__XAnnotationElementValue__Group_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9470:1: ( ( rule__XAnnotationElementValue__Group_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9375:1: ( ( ( rule__XAnnotationElementValue__Group_0_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9376:1: ( ( rule__XAnnotationElementValue__Group_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9470:1: ( ( rule__XAnnotationElementValue__Group_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9471:1: ( rule__XAnnotationElementValue__Group_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9376:1: ( ( rule__XAnnotationElementValue__Group_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9377:1: ( rule__XAnnotationElementValue__Group_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getGroup_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9472:1: ( rule__XAnnotationElementValue__Group_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9472:2: rule__XAnnotationElementValue__Group_0_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9378:1: ( rule__XAnnotationElementValue__Group_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9378:2: rule__XAnnotationElementValue__Group_0_0__0
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_0__0_in_rule__XAnnotationElementValue__Group_0__0__Impl19706);
+            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_0__0_in_rule__XAnnotationElementValue__Group_0__0__Impl19520);
             rule__XAnnotationElementValue__Group_0_0__0();
 
             state._fsp--;
@@ -28598,21 +28335,21 @@ public final void rule__XAnnotationElementValue__Group_0__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9482:1: rule__XAnnotationElementValue__Group_0__1 : rule__XAnnotationElementValue__Group_0__1__Impl rule__XAnnotationElementValue__Group_0__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9388:1: rule__XAnnotationElementValue__Group_0__1 : rule__XAnnotationElementValue__Group_0__1__Impl rule__XAnnotationElementValue__Group_0__2 ;
     public final void rule__XAnnotationElementValue__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9486:1: ( rule__XAnnotationElementValue__Group_0__1__Impl rule__XAnnotationElementValue__Group_0__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9487:2: rule__XAnnotationElementValue__Group_0__1__Impl rule__XAnnotationElementValue__Group_0__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9392:1: ( rule__XAnnotationElementValue__Group_0__1__Impl rule__XAnnotationElementValue__Group_0__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9393:2: rule__XAnnotationElementValue__Group_0__1__Impl rule__XAnnotationElementValue__Group_0__2
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0__1__Impl_in_rule__XAnnotationElementValue__Group_0__119736);
+            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0__1__Impl_in_rule__XAnnotationElementValue__Group_0__119550);
             rule__XAnnotationElementValue__Group_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0__2_in_rule__XAnnotationElementValue__Group_0__119739);
+            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0__2_in_rule__XAnnotationElementValue__Group_0__119553);
             rule__XAnnotationElementValue__Group_0__2();
 
             state._fsp--;
@@ -28636,33 +28373,33 @@ public final void rule__XAnnotationElementValue__Group_0__1() throws Recognition
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9494:1: rule__XAnnotationElementValue__Group_0__1__Impl : ( ( rule__XAnnotationElementValue__Group_0_1__0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9400:1: rule__XAnnotationElementValue__Group_0__1__Impl : ( ( rule__XAnnotationElementValue__Group_0_1__0 )? ) ;
     public final void rule__XAnnotationElementValue__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9498:1: ( ( ( rule__XAnnotationElementValue__Group_0_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9499:1: ( ( rule__XAnnotationElementValue__Group_0_1__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9404:1: ( ( ( rule__XAnnotationElementValue__Group_0_1__0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9405:1: ( ( rule__XAnnotationElementValue__Group_0_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9499:1: ( ( rule__XAnnotationElementValue__Group_0_1__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9500:1: ( rule__XAnnotationElementValue__Group_0_1__0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9405:1: ( ( rule__XAnnotationElementValue__Group_0_1__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9406:1: ( rule__XAnnotationElementValue__Group_0_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getGroup_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9501:1: ( rule__XAnnotationElementValue__Group_0_1__0 )?
-            int alt92=2;
-            int LA92_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9407:1: ( rule__XAnnotationElementValue__Group_0_1__0 )?
+            int alt91=2;
+            int LA91_0 = input.LA(1);
 
-            if ( ((LA92_0>=RULE_ID && LA92_0<=RULE_STRING)||(LA92_0>=16 && LA92_0<=35)||LA92_0==47||(LA92_0>=54 && LA92_0<=55)||LA92_0==60||(LA92_0>=65 && LA92_0<=66)||LA92_0==68||LA92_0==70||LA92_0==72||LA92_0==75||(LA92_0>=77 && LA92_0<=78)||(LA92_0>=80 && LA92_0<=81)||LA92_0==84||LA92_0==86||(LA92_0>=90 && LA92_0<=97)||LA92_0==99||LA92_0==108) ) {
-                alt92=1;
+            if ( ((LA91_0>=RULE_ID && LA91_0<=RULE_STRING)||(LA91_0>=16 && LA91_0<=35)||LA91_0==47||(LA91_0>=54 && LA91_0<=55)||LA91_0==60||(LA91_0>=65 && LA91_0<=66)||LA91_0==68||LA91_0==70||LA91_0==72||LA91_0==75||(LA91_0>=77 && LA91_0<=78)||(LA91_0>=80 && LA91_0<=81)||LA91_0==84||LA91_0==86||(LA91_0>=90 && LA91_0<=97)||LA91_0==99||LA91_0==108) ) {
+                alt91=1;
             }
-            switch (alt92) {
+            switch (alt91) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9501:2: rule__XAnnotationElementValue__Group_0_1__0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9407:2: rule__XAnnotationElementValue__Group_0_1__0
                     {
-                    pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_1__0_in_rule__XAnnotationElementValue__Group_0__1__Impl19766);
+                    pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_1__0_in_rule__XAnnotationElementValue__Group_0__1__Impl19580);
                     rule__XAnnotationElementValue__Group_0_1__0();
 
                     state._fsp--;
@@ -28698,16 +28435,16 @@ public final void rule__XAnnotationElementValue__Group_0__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9511:1: rule__XAnnotationElementValue__Group_0__2 : rule__XAnnotationElementValue__Group_0__2__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9417:1: rule__XAnnotationElementValue__Group_0__2 : rule__XAnnotationElementValue__Group_0__2__Impl ;
     public final void rule__XAnnotationElementValue__Group_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9515:1: ( rule__XAnnotationElementValue__Group_0__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9516:2: rule__XAnnotationElementValue__Group_0__2__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9421:1: ( rule__XAnnotationElementValue__Group_0__2__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9422:2: rule__XAnnotationElementValue__Group_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0__2__Impl_in_rule__XAnnotationElementValue__Group_0__219797);
+            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0__2__Impl_in_rule__XAnnotationElementValue__Group_0__219611);
             rule__XAnnotationElementValue__Group_0__2__Impl();
 
             state._fsp--;
@@ -28731,22 +28468,22 @@ public final void rule__XAnnotationElementValue__Group_0__2() throws Recognition
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9522:1: rule__XAnnotationElementValue__Group_0__2__Impl : ( ']' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9428:1: rule__XAnnotationElementValue__Group_0__2__Impl : ( ']' ) ;
     public final void rule__XAnnotationElementValue__Group_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9526:1: ( ( ']' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9527:1: ( ']' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9432:1: ( ( ']' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9433:1: ( ']' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9527:1: ( ']' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9528:1: ']'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9433:1: ( ']' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9434:1: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getRightSquareBracketKeyword_0_2()); 
             }
-            match(input,79,FOLLOW_79_in_rule__XAnnotationElementValue__Group_0__2__Impl19825); if (state.failed) return ;
+            match(input,79,FOLLOW_79_in_rule__XAnnotationElementValue__Group_0__2__Impl19639); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValueAccess().getRightSquareBracketKeyword_0_2()); 
             }
@@ -28772,16 +28509,16 @@ public final void rule__XAnnotationElementValue__Group_0__2__Impl() throws Recog
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9547:1: rule__XAnnotationElementValue__Group_0_0__0 : rule__XAnnotationElementValue__Group_0_0__0__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9453:1: rule__XAnnotationElementValue__Group_0_0__0 : rule__XAnnotationElementValue__Group_0_0__0__Impl ;
     public final void rule__XAnnotationElementValue__Group_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9551:1: ( rule__XAnnotationElementValue__Group_0_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9552:2: rule__XAnnotationElementValue__Group_0_0__0__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9457:1: ( rule__XAnnotationElementValue__Group_0_0__0__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9458:2: rule__XAnnotationElementValue__Group_0_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_0__0__Impl_in_rule__XAnnotationElementValue__Group_0_0__019862);
+            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_0__0__Impl_in_rule__XAnnotationElementValue__Group_0_0__019676);
             rule__XAnnotationElementValue__Group_0_0__0__Impl();
 
             state._fsp--;
@@ -28805,25 +28542,25 @@ public final void rule__XAnnotationElementValue__Group_0_0__0() throws Recogniti
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9558:1: rule__XAnnotationElementValue__Group_0_0__0__Impl : ( ( rule__XAnnotationElementValue__Group_0_0_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9464:1: rule__XAnnotationElementValue__Group_0_0__0__Impl : ( ( rule__XAnnotationElementValue__Group_0_0_0__0 ) ) ;
     public final void rule__XAnnotationElementValue__Group_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9562:1: ( ( ( rule__XAnnotationElementValue__Group_0_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9563:1: ( ( rule__XAnnotationElementValue__Group_0_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9468:1: ( ( ( rule__XAnnotationElementValue__Group_0_0_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9469:1: ( ( rule__XAnnotationElementValue__Group_0_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9563:1: ( ( rule__XAnnotationElementValue__Group_0_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9564:1: ( rule__XAnnotationElementValue__Group_0_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9469:1: ( ( rule__XAnnotationElementValue__Group_0_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9470:1: ( rule__XAnnotationElementValue__Group_0_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getGroup_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9565:1: ( rule__XAnnotationElementValue__Group_0_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9565:2: rule__XAnnotationElementValue__Group_0_0_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9471:1: ( rule__XAnnotationElementValue__Group_0_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9471:2: rule__XAnnotationElementValue__Group_0_0_0__0
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__0_in_rule__XAnnotationElementValue__Group_0_0__0__Impl19889);
+            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__0_in_rule__XAnnotationElementValue__Group_0_0__0__Impl19703);
             rule__XAnnotationElementValue__Group_0_0_0__0();
 
             state._fsp--;
@@ -28856,21 +28593,21 @@ public final void rule__XAnnotationElementValue__Group_0_0__0__Impl() throws Rec
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9577:1: rule__XAnnotationElementValue__Group_0_0_0__0 : rule__XAnnotationElementValue__Group_0_0_0__0__Impl rule__XAnnotationElementValue__Group_0_0_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9483:1: rule__XAnnotationElementValue__Group_0_0_0__0 : rule__XAnnotationElementValue__Group_0_0_0__0__Impl rule__XAnnotationElementValue__Group_0_0_0__1 ;
     public final void rule__XAnnotationElementValue__Group_0_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9581:1: ( rule__XAnnotationElementValue__Group_0_0_0__0__Impl rule__XAnnotationElementValue__Group_0_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9582:2: rule__XAnnotationElementValue__Group_0_0_0__0__Impl rule__XAnnotationElementValue__Group_0_0_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9487:1: ( rule__XAnnotationElementValue__Group_0_0_0__0__Impl rule__XAnnotationElementValue__Group_0_0_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9488:2: rule__XAnnotationElementValue__Group_0_0_0__0__Impl rule__XAnnotationElementValue__Group_0_0_0__1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__0__Impl_in_rule__XAnnotationElementValue__Group_0_0_0__019921);
+            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__0__Impl_in_rule__XAnnotationElementValue__Group_0_0_0__019735);
             rule__XAnnotationElementValue__Group_0_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__1_in_rule__XAnnotationElementValue__Group_0_0_0__019924);
+            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__1_in_rule__XAnnotationElementValue__Group_0_0_0__019738);
             rule__XAnnotationElementValue__Group_0_0_0__1();
 
             state._fsp--;
@@ -28894,23 +28631,23 @@ public final void rule__XAnnotationElementValue__Group_0_0_0__0() throws Recogni
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9589:1: rule__XAnnotationElementValue__Group_0_0_0__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9495:1: rule__XAnnotationElementValue__Group_0_0_0__0__Impl : ( () ) ;
     public final void rule__XAnnotationElementValue__Group_0_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9593:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9594:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9499:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9500:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9594:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9595:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9500:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9501:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getXListLiteralAction_0_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9596:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9598:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9502:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9504:1: 
             {
             }
 
@@ -28935,21 +28672,21 @@ public final void rule__XAnnotationElementValue__Group_0_0_0__0__Impl() throws R
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9608:1: rule__XAnnotationElementValue__Group_0_0_0__1 : rule__XAnnotationElementValue__Group_0_0_0__1__Impl rule__XAnnotationElementValue__Group_0_0_0__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9514:1: rule__XAnnotationElementValue__Group_0_0_0__1 : rule__XAnnotationElementValue__Group_0_0_0__1__Impl rule__XAnnotationElementValue__Group_0_0_0__2 ;
     public final void rule__XAnnotationElementValue__Group_0_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9612:1: ( rule__XAnnotationElementValue__Group_0_0_0__1__Impl rule__XAnnotationElementValue__Group_0_0_0__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9613:2: rule__XAnnotationElementValue__Group_0_0_0__1__Impl rule__XAnnotationElementValue__Group_0_0_0__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9518:1: ( rule__XAnnotationElementValue__Group_0_0_0__1__Impl rule__XAnnotationElementValue__Group_0_0_0__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9519:2: rule__XAnnotationElementValue__Group_0_0_0__1__Impl rule__XAnnotationElementValue__Group_0_0_0__2
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__1__Impl_in_rule__XAnnotationElementValue__Group_0_0_0__119982);
+            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__1__Impl_in_rule__XAnnotationElementValue__Group_0_0_0__119796);
             rule__XAnnotationElementValue__Group_0_0_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__2_in_rule__XAnnotationElementValue__Group_0_0_0__119985);
+            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__2_in_rule__XAnnotationElementValue__Group_0_0_0__119799);
             rule__XAnnotationElementValue__Group_0_0_0__2();
 
             state._fsp--;
@@ -28973,22 +28710,22 @@ public final void rule__XAnnotationElementValue__Group_0_0_0__1() throws Recogni
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9620:1: rule__XAnnotationElementValue__Group_0_0_0__1__Impl : ( '#' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9526:1: rule__XAnnotationElementValue__Group_0_0_0__1__Impl : ( '#' ) ;
     public final void rule__XAnnotationElementValue__Group_0_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9624:1: ( ( '#' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9625:1: ( '#' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9530:1: ( ( '#' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9531:1: ( '#' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9625:1: ( '#' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9626:1: '#'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9531:1: ( '#' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9532:1: '#'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getNumberSignKeyword_0_0_0_1()); 
             }
-            match(input,77,FOLLOW_77_in_rule__XAnnotationElementValue__Group_0_0_0__1__Impl20013); if (state.failed) return ;
+            match(input,77,FOLLOW_77_in_rule__XAnnotationElementValue__Group_0_0_0__1__Impl19827); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValueAccess().getNumberSignKeyword_0_0_0_1()); 
             }
@@ -29014,16 +28751,16 @@ public final void rule__XAnnotationElementValue__Group_0_0_0__1__Impl() throws R
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_0_0__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9639:1: rule__XAnnotationElementValue__Group_0_0_0__2 : rule__XAnnotationElementValue__Group_0_0_0__2__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9545:1: rule__XAnnotationElementValue__Group_0_0_0__2 : rule__XAnnotationElementValue__Group_0_0_0__2__Impl ;
     public final void rule__XAnnotationElementValue__Group_0_0_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9643:1: ( rule__XAnnotationElementValue__Group_0_0_0__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9644:2: rule__XAnnotationElementValue__Group_0_0_0__2__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9549:1: ( rule__XAnnotationElementValue__Group_0_0_0__2__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9550:2: rule__XAnnotationElementValue__Group_0_0_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__2__Impl_in_rule__XAnnotationElementValue__Group_0_0_0__220044);
+            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__2__Impl_in_rule__XAnnotationElementValue__Group_0_0_0__219858);
             rule__XAnnotationElementValue__Group_0_0_0__2__Impl();
 
             state._fsp--;
@@ -29047,22 +28784,22 @@ public final void rule__XAnnotationElementValue__Group_0_0_0__2() throws Recogni
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_0_0__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9650:1: rule__XAnnotationElementValue__Group_0_0_0__2__Impl : ( '[' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9556:1: rule__XAnnotationElementValue__Group_0_0_0__2__Impl : ( '[' ) ;
     public final void rule__XAnnotationElementValue__Group_0_0_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9654:1: ( ( '[' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9655:1: ( '[' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9560:1: ( ( '[' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9561:1: ( '[' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9655:1: ( '[' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9656:1: '['
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9561:1: ( '[' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9562:1: '['
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getLeftSquareBracketKeyword_0_0_0_2()); 
             }
-            match(input,78,FOLLOW_78_in_rule__XAnnotationElementValue__Group_0_0_0__2__Impl20072); if (state.failed) return ;
+            match(input,78,FOLLOW_78_in_rule__XAnnotationElementValue__Group_0_0_0__2__Impl19886); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValueAccess().getLeftSquareBracketKeyword_0_0_0_2()); 
             }
@@ -29088,21 +28825,21 @@ public final void rule__XAnnotationElementValue__Group_0_0_0__2__Impl() throws R
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9675:1: rule__XAnnotationElementValue__Group_0_1__0 : rule__XAnnotationElementValue__Group_0_1__0__Impl rule__XAnnotationElementValue__Group_0_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9581:1: rule__XAnnotationElementValue__Group_0_1__0 : rule__XAnnotationElementValue__Group_0_1__0__Impl rule__XAnnotationElementValue__Group_0_1__1 ;
     public final void rule__XAnnotationElementValue__Group_0_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9679:1: ( rule__XAnnotationElementValue__Group_0_1__0__Impl rule__XAnnotationElementValue__Group_0_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9680:2: rule__XAnnotationElementValue__Group_0_1__0__Impl rule__XAnnotationElementValue__Group_0_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9585:1: ( rule__XAnnotationElementValue__Group_0_1__0__Impl rule__XAnnotationElementValue__Group_0_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9586:2: rule__XAnnotationElementValue__Group_0_1__0__Impl rule__XAnnotationElementValue__Group_0_1__1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_1__0__Impl_in_rule__XAnnotationElementValue__Group_0_1__020109);
+            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_1__0__Impl_in_rule__XAnnotationElementValue__Group_0_1__019923);
             rule__XAnnotationElementValue__Group_0_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_1__1_in_rule__XAnnotationElementValue__Group_0_1__020112);
+            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_1__1_in_rule__XAnnotationElementValue__Group_0_1__019926);
             rule__XAnnotationElementValue__Group_0_1__1();
 
             state._fsp--;
@@ -29126,25 +28863,25 @@ public final void rule__XAnnotationElementValue__Group_0_1__0() throws Recogniti
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9687:1: rule__XAnnotationElementValue__Group_0_1__0__Impl : ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9593:1: rule__XAnnotationElementValue__Group_0_1__0__Impl : ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 ) ) ;
     public final void rule__XAnnotationElementValue__Group_0_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9691:1: ( ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9692:1: ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9597:1: ( ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9598:1: ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9692:1: ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9693:1: ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9598:1: ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9599:1: ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getElementsAssignment_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9694:1: ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9694:2: rule__XAnnotationElementValue__ElementsAssignment_0_1_0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9600:1: ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9600:2: rule__XAnnotationElementValue__ElementsAssignment_0_1_0
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__ElementsAssignment_0_1_0_in_rule__XAnnotationElementValue__Group_0_1__0__Impl20139);
+            pushFollow(FOLLOW_rule__XAnnotationElementValue__ElementsAssignment_0_1_0_in_rule__XAnnotationElementValue__Group_0_1__0__Impl19953);
             rule__XAnnotationElementValue__ElementsAssignment_0_1_0();
 
             state._fsp--;
@@ -29177,16 +28914,16 @@ public final void rule__XAnnotationElementValue__Group_0_1__0__Impl() throws Rec
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9704:1: rule__XAnnotationElementValue__Group_0_1__1 : rule__XAnnotationElementValue__Group_0_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9610:1: rule__XAnnotationElementValue__Group_0_1__1 : rule__XAnnotationElementValue__Group_0_1__1__Impl ;
     public final void rule__XAnnotationElementValue__Group_0_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9708:1: ( rule__XAnnotationElementValue__Group_0_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9709:2: rule__XAnnotationElementValue__Group_0_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9614:1: ( rule__XAnnotationElementValue__Group_0_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9615:2: rule__XAnnotationElementValue__Group_0_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_1__1__Impl_in_rule__XAnnotationElementValue__Group_0_1__120169);
+            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_1__1__Impl_in_rule__XAnnotationElementValue__Group_0_1__119983);
             rule__XAnnotationElementValue__Group_0_1__1__Impl();
 
             state._fsp--;
@@ -29210,37 +28947,37 @@ public final void rule__XAnnotationElementValue__Group_0_1__1() throws Recogniti
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9715:1: rule__XAnnotationElementValue__Group_0_1__1__Impl : ( ( rule__XAnnotationElementValue__Group_0_1_1__0 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9621:1: rule__XAnnotationElementValue__Group_0_1__1__Impl : ( ( rule__XAnnotationElementValue__Group_0_1_1__0 )* ) ;
     public final void rule__XAnnotationElementValue__Group_0_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9719:1: ( ( ( rule__XAnnotationElementValue__Group_0_1_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9720:1: ( ( rule__XAnnotationElementValue__Group_0_1_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9625:1: ( ( ( rule__XAnnotationElementValue__Group_0_1_1__0 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9626:1: ( ( rule__XAnnotationElementValue__Group_0_1_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9720:1: ( ( rule__XAnnotationElementValue__Group_0_1_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9721:1: ( rule__XAnnotationElementValue__Group_0_1_1__0 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9626:1: ( ( rule__XAnnotationElementValue__Group_0_1_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9627:1: ( rule__XAnnotationElementValue__Group_0_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getGroup_0_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9722:1: ( rule__XAnnotationElementValue__Group_0_1_1__0 )*
-            loop93:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9628:1: ( rule__XAnnotationElementValue__Group_0_1_1__0 )*
+            loop92:
             do {
-                int alt93=2;
-                int LA93_0 = input.LA(1);
+                int alt92=2;
+                int LA92_0 = input.LA(1);
 
-                if ( (LA93_0==74) ) {
-                    alt93=1;
+                if ( (LA92_0==74) ) {
+                    alt92=1;
                 }
 
 
-                switch (alt93) {
+                switch (alt92) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9722:2: rule__XAnnotationElementValue__Group_0_1_1__0
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9628:2: rule__XAnnotationElementValue__Group_0_1_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_1_1__0_in_rule__XAnnotationElementValue__Group_0_1__1__Impl20196);
+            	    pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_1_1__0_in_rule__XAnnotationElementValue__Group_0_1__1__Impl20010);
             	    rule__XAnnotationElementValue__Group_0_1_1__0();
 
             	    state._fsp--;
@@ -29250,7 +28987,7 @@ public final void rule__XAnnotationElementValue__Group_0_1__1__Impl() throws Rec
             	    break;
 
             	default :
-            	    break loop93;
+            	    break loop92;
                 }
             } while (true);
 
@@ -29279,21 +29016,21 @@ public final void rule__XAnnotationElementValue__Group_0_1__1__Impl() throws Rec
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_1_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9736:1: rule__XAnnotationElementValue__Group_0_1_1__0 : rule__XAnnotationElementValue__Group_0_1_1__0__Impl rule__XAnnotationElementValue__Group_0_1_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9642:1: rule__XAnnotationElementValue__Group_0_1_1__0 : rule__XAnnotationElementValue__Group_0_1_1__0__Impl rule__XAnnotationElementValue__Group_0_1_1__1 ;
     public final void rule__XAnnotationElementValue__Group_0_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9740:1: ( rule__XAnnotationElementValue__Group_0_1_1__0__Impl rule__XAnnotationElementValue__Group_0_1_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9741:2: rule__XAnnotationElementValue__Group_0_1_1__0__Impl rule__XAnnotationElementValue__Group_0_1_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9646:1: ( rule__XAnnotationElementValue__Group_0_1_1__0__Impl rule__XAnnotationElementValue__Group_0_1_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9647:2: rule__XAnnotationElementValue__Group_0_1_1__0__Impl rule__XAnnotationElementValue__Group_0_1_1__1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_1_1__0__Impl_in_rule__XAnnotationElementValue__Group_0_1_1__020231);
+            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_1_1__0__Impl_in_rule__XAnnotationElementValue__Group_0_1_1__020045);
             rule__XAnnotationElementValue__Group_0_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_1_1__1_in_rule__XAnnotationElementValue__Group_0_1_1__020234);
+            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_1_1__1_in_rule__XAnnotationElementValue__Group_0_1_1__020048);
             rule__XAnnotationElementValue__Group_0_1_1__1();
 
             state._fsp--;
@@ -29317,22 +29054,22 @@ public final void rule__XAnnotationElementValue__Group_0_1_1__0() throws Recogni
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9748:1: rule__XAnnotationElementValue__Group_0_1_1__0__Impl : ( ',' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9654:1: rule__XAnnotationElementValue__Group_0_1_1__0__Impl : ( ',' ) ;
     public final void rule__XAnnotationElementValue__Group_0_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9752:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9753:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9658:1: ( ( ',' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9659:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9753:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9754:1: ','
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9659:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9660:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getCommaKeyword_0_1_1_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XAnnotationElementValue__Group_0_1_1__0__Impl20262); if (state.failed) return ;
+            match(input,74,FOLLOW_74_in_rule__XAnnotationElementValue__Group_0_1_1__0__Impl20076); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValueAccess().getCommaKeyword_0_1_1_0()); 
             }
@@ -29358,16 +29095,16 @@ public final void rule__XAnnotationElementValue__Group_0_1_1__0__Impl() throws R
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_1_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9767:1: rule__XAnnotationElementValue__Group_0_1_1__1 : rule__XAnnotationElementValue__Group_0_1_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9673:1: rule__XAnnotationElementValue__Group_0_1_1__1 : rule__XAnnotationElementValue__Group_0_1_1__1__Impl ;
     public final void rule__XAnnotationElementValue__Group_0_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9771:1: ( rule__XAnnotationElementValue__Group_0_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9772:2: rule__XAnnotationElementValue__Group_0_1_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9677:1: ( rule__XAnnotationElementValue__Group_0_1_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9678:2: rule__XAnnotationElementValue__Group_0_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_1_1__1__Impl_in_rule__XAnnotationElementValue__Group_0_1_1__120293);
+            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_1_1__1__Impl_in_rule__XAnnotationElementValue__Group_0_1_1__120107);
             rule__XAnnotationElementValue__Group_0_1_1__1__Impl();
 
             state._fsp--;
@@ -29391,25 +29128,25 @@ public final void rule__XAnnotationElementValue__Group_0_1_1__1() throws Recogni
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9778:1: rule__XAnnotationElementValue__Group_0_1_1__1__Impl : ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9684:1: rule__XAnnotationElementValue__Group_0_1_1__1__Impl : ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 ) ) ;
     public final void rule__XAnnotationElementValue__Group_0_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9782:1: ( ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9783:1: ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9688:1: ( ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9689:1: ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9783:1: ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9784:1: ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9689:1: ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9690:1: ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getElementsAssignment_0_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9785:1: ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9785:2: rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9691:1: ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9691:2: rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1_in_rule__XAnnotationElementValue__Group_0_1_1__1__Impl20320);
+            pushFollow(FOLLOW_rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1_in_rule__XAnnotationElementValue__Group_0_1_1__1__Impl20134);
             rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1();
 
             state._fsp--;
@@ -29442,21 +29179,21 @@ public final void rule__XAnnotationElementValue__Group_0_1_1__1__Impl() throws R
 
 
     // $ANTLR start "rule__XAssignment__Group_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9799:1: rule__XAssignment__Group_0__0 : rule__XAssignment__Group_0__0__Impl rule__XAssignment__Group_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9705:1: rule__XAssignment__Group_0__0 : rule__XAssignment__Group_0__0__Impl rule__XAssignment__Group_0__1 ;
     public final void rule__XAssignment__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9803:1: ( rule__XAssignment__Group_0__0__Impl rule__XAssignment__Group_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9804:2: rule__XAssignment__Group_0__0__Impl rule__XAssignment__Group_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9709:1: ( rule__XAssignment__Group_0__0__Impl rule__XAssignment__Group_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9710:2: rule__XAssignment__Group_0__0__Impl rule__XAssignment__Group_0__1
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_0__0__Impl_in_rule__XAssignment__Group_0__020354);
+            pushFollow(FOLLOW_rule__XAssignment__Group_0__0__Impl_in_rule__XAssignment__Group_0__020168);
             rule__XAssignment__Group_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAssignment__Group_0__1_in_rule__XAssignment__Group_0__020357);
+            pushFollow(FOLLOW_rule__XAssignment__Group_0__1_in_rule__XAssignment__Group_0__020171);
             rule__XAssignment__Group_0__1();
 
             state._fsp--;
@@ -29480,23 +29217,23 @@ public final void rule__XAssignment__Group_0__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAssignment__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9811:1: rule__XAssignment__Group_0__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9717:1: rule__XAssignment__Group_0__0__Impl : ( () ) ;
     public final void rule__XAssignment__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9815:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9816:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9721:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9722:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9816:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9817:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9722:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9723:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getXAssignmentAction_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9818:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9820:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9724:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9726:1: 
             {
             }
 
@@ -29521,21 +29258,21 @@ public final void rule__XAssignment__Group_0__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAssignment__Group_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9830:1: rule__XAssignment__Group_0__1 : rule__XAssignment__Group_0__1__Impl rule__XAssignment__Group_0__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9736:1: rule__XAssignment__Group_0__1 : rule__XAssignment__Group_0__1__Impl rule__XAssignment__Group_0__2 ;
     public final void rule__XAssignment__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9834:1: ( rule__XAssignment__Group_0__1__Impl rule__XAssignment__Group_0__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9835:2: rule__XAssignment__Group_0__1__Impl rule__XAssignment__Group_0__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9740:1: ( rule__XAssignment__Group_0__1__Impl rule__XAssignment__Group_0__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9741:2: rule__XAssignment__Group_0__1__Impl rule__XAssignment__Group_0__2
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_0__1__Impl_in_rule__XAssignment__Group_0__120415);
+            pushFollow(FOLLOW_rule__XAssignment__Group_0__1__Impl_in_rule__XAssignment__Group_0__120229);
             rule__XAssignment__Group_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAssignment__Group_0__2_in_rule__XAssignment__Group_0__120418);
+            pushFollow(FOLLOW_rule__XAssignment__Group_0__2_in_rule__XAssignment__Group_0__120232);
             rule__XAssignment__Group_0__2();
 
             state._fsp--;
@@ -29559,25 +29296,25 @@ public final void rule__XAssignment__Group_0__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAssignment__Group_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9842:1: rule__XAssignment__Group_0__1__Impl : ( ( rule__XAssignment__FeatureAssignment_0_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9748:1: rule__XAssignment__Group_0__1__Impl : ( ( rule__XAssignment__FeatureAssignment_0_1 ) ) ;
     public final void rule__XAssignment__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9846:1: ( ( ( rule__XAssignment__FeatureAssignment_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9847:1: ( ( rule__XAssignment__FeatureAssignment_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9752:1: ( ( ( rule__XAssignment__FeatureAssignment_0_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9753:1: ( ( rule__XAssignment__FeatureAssignment_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9847:1: ( ( rule__XAssignment__FeatureAssignment_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9848:1: ( rule__XAssignment__FeatureAssignment_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9753:1: ( ( rule__XAssignment__FeatureAssignment_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9754:1: ( rule__XAssignment__FeatureAssignment_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getFeatureAssignment_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9849:1: ( rule__XAssignment__FeatureAssignment_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9849:2: rule__XAssignment__FeatureAssignment_0_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9755:1: ( rule__XAssignment__FeatureAssignment_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9755:2: rule__XAssignment__FeatureAssignment_0_1
             {
-            pushFollow(FOLLOW_rule__XAssignment__FeatureAssignment_0_1_in_rule__XAssignment__Group_0__1__Impl20445);
+            pushFollow(FOLLOW_rule__XAssignment__FeatureAssignment_0_1_in_rule__XAssignment__Group_0__1__Impl20259);
             rule__XAssignment__FeatureAssignment_0_1();
 
             state._fsp--;
@@ -29610,21 +29347,21 @@ public final void rule__XAssignment__Group_0__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAssignment__Group_0__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9859:1: rule__XAssignment__Group_0__2 : rule__XAssignment__Group_0__2__Impl rule__XAssignment__Group_0__3 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9765:1: rule__XAssignment__Group_0__2 : rule__XAssignment__Group_0__2__Impl rule__XAssignment__Group_0__3 ;
     public final void rule__XAssignment__Group_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9863:1: ( rule__XAssignment__Group_0__2__Impl rule__XAssignment__Group_0__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9864:2: rule__XAssignment__Group_0__2__Impl rule__XAssignment__Group_0__3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9769:1: ( rule__XAssignment__Group_0__2__Impl rule__XAssignment__Group_0__3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9770:2: rule__XAssignment__Group_0__2__Impl rule__XAssignment__Group_0__3
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_0__2__Impl_in_rule__XAssignment__Group_0__220475);
+            pushFollow(FOLLOW_rule__XAssignment__Group_0__2__Impl_in_rule__XAssignment__Group_0__220289);
             rule__XAssignment__Group_0__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAssignment__Group_0__3_in_rule__XAssignment__Group_0__220478);
+            pushFollow(FOLLOW_rule__XAssignment__Group_0__3_in_rule__XAssignment__Group_0__220292);
             rule__XAssignment__Group_0__3();
 
             state._fsp--;
@@ -29648,22 +29385,22 @@ public final void rule__XAssignment__Group_0__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAssignment__Group_0__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9871:1: rule__XAssignment__Group_0__2__Impl : ( ruleOpSingleAssign ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9777:1: rule__XAssignment__Group_0__2__Impl : ( ruleOpSingleAssign ) ;
     public final void rule__XAssignment__Group_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9875:1: ( ( ruleOpSingleAssign ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9876:1: ( ruleOpSingleAssign )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9781:1: ( ( ruleOpSingleAssign ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9782:1: ( ruleOpSingleAssign )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9876:1: ( ruleOpSingleAssign )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9877:1: ruleOpSingleAssign
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9782:1: ( ruleOpSingleAssign )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9783:1: ruleOpSingleAssign
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getOpSingleAssignParserRuleCall_0_2()); 
             }
-            pushFollow(FOLLOW_ruleOpSingleAssign_in_rule__XAssignment__Group_0__2__Impl20505);
+            pushFollow(FOLLOW_ruleOpSingleAssign_in_rule__XAssignment__Group_0__2__Impl20319);
             ruleOpSingleAssign();
 
             state._fsp--;
@@ -29693,16 +29430,16 @@ public final void rule__XAssignment__Group_0__2__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAssignment__Group_0__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9888:1: rule__XAssignment__Group_0__3 : rule__XAssignment__Group_0__3__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9794:1: rule__XAssignment__Group_0__3 : rule__XAssignment__Group_0__3__Impl ;
     public final void rule__XAssignment__Group_0__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9892:1: ( rule__XAssignment__Group_0__3__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9893:2: rule__XAssignment__Group_0__3__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9798:1: ( rule__XAssignment__Group_0__3__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9799:2: rule__XAssignment__Group_0__3__Impl
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_0__3__Impl_in_rule__XAssignment__Group_0__320534);
+            pushFollow(FOLLOW_rule__XAssignment__Group_0__3__Impl_in_rule__XAssignment__Group_0__320348);
             rule__XAssignment__Group_0__3__Impl();
 
             state._fsp--;
@@ -29726,25 +29463,25 @@ public final void rule__XAssignment__Group_0__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAssignment__Group_0__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9899:1: rule__XAssignment__Group_0__3__Impl : ( ( rule__XAssignment__ValueAssignment_0_3 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9805:1: rule__XAssignment__Group_0__3__Impl : ( ( rule__XAssignment__ValueAssignment_0_3 ) ) ;
     public final void rule__XAssignment__Group_0__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9903:1: ( ( ( rule__XAssignment__ValueAssignment_0_3 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9904:1: ( ( rule__XAssignment__ValueAssignment_0_3 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9809:1: ( ( ( rule__XAssignment__ValueAssignment_0_3 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9810:1: ( ( rule__XAssignment__ValueAssignment_0_3 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9904:1: ( ( rule__XAssignment__ValueAssignment_0_3 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9905:1: ( rule__XAssignment__ValueAssignment_0_3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9810:1: ( ( rule__XAssignment__ValueAssignment_0_3 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9811:1: ( rule__XAssignment__ValueAssignment_0_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getValueAssignment_0_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9906:1: ( rule__XAssignment__ValueAssignment_0_3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9906:2: rule__XAssignment__ValueAssignment_0_3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9812:1: ( rule__XAssignment__ValueAssignment_0_3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9812:2: rule__XAssignment__ValueAssignment_0_3
             {
-            pushFollow(FOLLOW_rule__XAssignment__ValueAssignment_0_3_in_rule__XAssignment__Group_0__3__Impl20561);
+            pushFollow(FOLLOW_rule__XAssignment__ValueAssignment_0_3_in_rule__XAssignment__Group_0__3__Impl20375);
             rule__XAssignment__ValueAssignment_0_3();
 
             state._fsp--;
@@ -29777,21 +29514,21 @@ public final void rule__XAssignment__Group_0__3__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAssignment__Group_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9924:1: rule__XAssignment__Group_1__0 : rule__XAssignment__Group_1__0__Impl rule__XAssignment__Group_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9830:1: rule__XAssignment__Group_1__0 : rule__XAssignment__Group_1__0__Impl rule__XAssignment__Group_1__1 ;
     public final void rule__XAssignment__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9928:1: ( rule__XAssignment__Group_1__0__Impl rule__XAssignment__Group_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9929:2: rule__XAssignment__Group_1__0__Impl rule__XAssignment__Group_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9834:1: ( rule__XAssignment__Group_1__0__Impl rule__XAssignment__Group_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9835:2: rule__XAssignment__Group_1__0__Impl rule__XAssignment__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_1__0__Impl_in_rule__XAssignment__Group_1__020599);
+            pushFollow(FOLLOW_rule__XAssignment__Group_1__0__Impl_in_rule__XAssignment__Group_1__020413);
             rule__XAssignment__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAssignment__Group_1__1_in_rule__XAssignment__Group_1__020602);
+            pushFollow(FOLLOW_rule__XAssignment__Group_1__1_in_rule__XAssignment__Group_1__020416);
             rule__XAssignment__Group_1__1();
 
             state._fsp--;
@@ -29815,22 +29552,22 @@ public final void rule__XAssignment__Group_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAssignment__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9936:1: rule__XAssignment__Group_1__0__Impl : ( ruleXOrExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9842:1: rule__XAssignment__Group_1__0__Impl : ( ruleXOrExpression ) ;
     public final void rule__XAssignment__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9940:1: ( ( ruleXOrExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9941:1: ( ruleXOrExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9846:1: ( ( ruleXOrExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9847:1: ( ruleXOrExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9941:1: ( ruleXOrExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9942:1: ruleXOrExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9847:1: ( ruleXOrExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9848:1: ruleXOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getXOrExpressionParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXOrExpression_in_rule__XAssignment__Group_1__0__Impl20629);
+            pushFollow(FOLLOW_ruleXOrExpression_in_rule__XAssignment__Group_1__0__Impl20443);
             ruleXOrExpression();
 
             state._fsp--;
@@ -29860,16 +29597,16 @@ public final void rule__XAssignment__Group_1__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAssignment__Group_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9953:1: rule__XAssignment__Group_1__1 : rule__XAssignment__Group_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9859:1: rule__XAssignment__Group_1__1 : rule__XAssignment__Group_1__1__Impl ;
     public final void rule__XAssignment__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9957:1: ( rule__XAssignment__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9958:2: rule__XAssignment__Group_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9863:1: ( rule__XAssignment__Group_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9864:2: rule__XAssignment__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_1__1__Impl_in_rule__XAssignment__Group_1__120658);
+            pushFollow(FOLLOW_rule__XAssignment__Group_1__1__Impl_in_rule__XAssignment__Group_1__120472);
             rule__XAssignment__Group_1__1__Impl();
 
             state._fsp--;
@@ -29893,29 +29630,29 @@ public final void rule__XAssignment__Group_1__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAssignment__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9964:1: rule__XAssignment__Group_1__1__Impl : ( ( rule__XAssignment__Group_1_1__0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9870:1: rule__XAssignment__Group_1__1__Impl : ( ( rule__XAssignment__Group_1_1__0 )? ) ;
     public final void rule__XAssignment__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9968:1: ( ( ( rule__XAssignment__Group_1_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9969:1: ( ( rule__XAssignment__Group_1_1__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9874:1: ( ( ( rule__XAssignment__Group_1_1__0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9875:1: ( ( rule__XAssignment__Group_1_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9969:1: ( ( rule__XAssignment__Group_1_1__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9970:1: ( rule__XAssignment__Group_1_1__0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9875:1: ( ( rule__XAssignment__Group_1_1__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9876:1: ( rule__XAssignment__Group_1_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getGroup_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9971:1: ( rule__XAssignment__Group_1_1__0 )?
-            int alt94=2;
-            alt94 = dfa94.predict(input);
-            switch (alt94) {
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9877:1: ( rule__XAssignment__Group_1_1__0 )?
+            int alt93=2;
+            alt93 = dfa93.predict(input);
+            switch (alt93) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9971:2: rule__XAssignment__Group_1_1__0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9877:2: rule__XAssignment__Group_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__XAssignment__Group_1_1__0_in_rule__XAssignment__Group_1__1__Impl20685);
+                    pushFollow(FOLLOW_rule__XAssignment__Group_1_1__0_in_rule__XAssignment__Group_1__1__Impl20499);
                     rule__XAssignment__Group_1_1__0();
 
                     state._fsp--;
@@ -29951,21 +29688,21 @@ public final void rule__XAssignment__Group_1__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9985:1: rule__XAssignment__Group_1_1__0 : rule__XAssignment__Group_1_1__0__Impl rule__XAssignment__Group_1_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9891:1: rule__XAssignment__Group_1_1__0 : rule__XAssignment__Group_1_1__0__Impl rule__XAssignment__Group_1_1__1 ;
     public final void rule__XAssignment__Group_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9989:1: ( rule__XAssignment__Group_1_1__0__Impl rule__XAssignment__Group_1_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9990:2: rule__XAssignment__Group_1_1__0__Impl rule__XAssignment__Group_1_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9895:1: ( rule__XAssignment__Group_1_1__0__Impl rule__XAssignment__Group_1_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9896:2: rule__XAssignment__Group_1_1__0__Impl rule__XAssignment__Group_1_1__1
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_1_1__0__Impl_in_rule__XAssignment__Group_1_1__020720);
+            pushFollow(FOLLOW_rule__XAssignment__Group_1_1__0__Impl_in_rule__XAssignment__Group_1_1__020534);
             rule__XAssignment__Group_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAssignment__Group_1_1__1_in_rule__XAssignment__Group_1_1__020723);
+            pushFollow(FOLLOW_rule__XAssignment__Group_1_1__1_in_rule__XAssignment__Group_1_1__020537);
             rule__XAssignment__Group_1_1__1();
 
             state._fsp--;
@@ -29989,25 +29726,25 @@ public final void rule__XAssignment__Group_1_1__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9997:1: rule__XAssignment__Group_1_1__0__Impl : ( ( rule__XAssignment__Group_1_1_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9903:1: rule__XAssignment__Group_1_1__0__Impl : ( ( rule__XAssignment__Group_1_1_0__0 ) ) ;
     public final void rule__XAssignment__Group_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10001:1: ( ( ( rule__XAssignment__Group_1_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10002:1: ( ( rule__XAssignment__Group_1_1_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9907:1: ( ( ( rule__XAssignment__Group_1_1_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9908:1: ( ( rule__XAssignment__Group_1_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10002:1: ( ( rule__XAssignment__Group_1_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10003:1: ( rule__XAssignment__Group_1_1_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9908:1: ( ( rule__XAssignment__Group_1_1_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9909:1: ( rule__XAssignment__Group_1_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getGroup_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10004:1: ( rule__XAssignment__Group_1_1_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10004:2: rule__XAssignment__Group_1_1_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9910:1: ( rule__XAssignment__Group_1_1_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9910:2: rule__XAssignment__Group_1_1_0__0
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_1_1_0__0_in_rule__XAssignment__Group_1_1__0__Impl20750);
+            pushFollow(FOLLOW_rule__XAssignment__Group_1_1_0__0_in_rule__XAssignment__Group_1_1__0__Impl20564);
             rule__XAssignment__Group_1_1_0__0();
 
             state._fsp--;
@@ -30040,16 +29777,16 @@ public final void rule__XAssignment__Group_1_1__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10014:1: rule__XAssignment__Group_1_1__1 : rule__XAssignment__Group_1_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9920:1: rule__XAssignment__Group_1_1__1 : rule__XAssignment__Group_1_1__1__Impl ;
     public final void rule__XAssignment__Group_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10018:1: ( rule__XAssignment__Group_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10019:2: rule__XAssignment__Group_1_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9924:1: ( rule__XAssignment__Group_1_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9925:2: rule__XAssignment__Group_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_1_1__1__Impl_in_rule__XAssignment__Group_1_1__120780);
+            pushFollow(FOLLOW_rule__XAssignment__Group_1_1__1__Impl_in_rule__XAssignment__Group_1_1__120594);
             rule__XAssignment__Group_1_1__1__Impl();
 
             state._fsp--;
@@ -30073,25 +29810,25 @@ public final void rule__XAssignment__Group_1_1__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10025:1: rule__XAssignment__Group_1_1__1__Impl : ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9931:1: rule__XAssignment__Group_1_1__1__Impl : ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) ) ;
     public final void rule__XAssignment__Group_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10029:1: ( ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10030:1: ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9935:1: ( ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9936:1: ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10030:1: ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10031:1: ( rule__XAssignment__RightOperandAssignment_1_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9936:1: ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9937:1: ( rule__XAssignment__RightOperandAssignment_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getRightOperandAssignment_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10032:1: ( rule__XAssignment__RightOperandAssignment_1_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10032:2: rule__XAssignment__RightOperandAssignment_1_1_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9938:1: ( rule__XAssignment__RightOperandAssignment_1_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9938:2: rule__XAssignment__RightOperandAssignment_1_1_1
             {
-            pushFollow(FOLLOW_rule__XAssignment__RightOperandAssignment_1_1_1_in_rule__XAssignment__Group_1_1__1__Impl20807);
+            pushFollow(FOLLOW_rule__XAssignment__RightOperandAssignment_1_1_1_in_rule__XAssignment__Group_1_1__1__Impl20621);
             rule__XAssignment__RightOperandAssignment_1_1_1();
 
             state._fsp--;
@@ -30124,16 +29861,16 @@ public final void rule__XAssignment__Group_1_1__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10046:1: rule__XAssignment__Group_1_1_0__0 : rule__XAssignment__Group_1_1_0__0__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9952:1: rule__XAssignment__Group_1_1_0__0 : rule__XAssignment__Group_1_1_0__0__Impl ;
     public final void rule__XAssignment__Group_1_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10050:1: ( rule__XAssignment__Group_1_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10051:2: rule__XAssignment__Group_1_1_0__0__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9956:1: ( rule__XAssignment__Group_1_1_0__0__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9957:2: rule__XAssignment__Group_1_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_1_1_0__0__Impl_in_rule__XAssignment__Group_1_1_0__020841);
+            pushFollow(FOLLOW_rule__XAssignment__Group_1_1_0__0__Impl_in_rule__XAssignment__Group_1_1_0__020655);
             rule__XAssignment__Group_1_1_0__0__Impl();
 
             state._fsp--;
@@ -30157,25 +29894,25 @@ public final void rule__XAssignment__Group_1_1_0__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10057:1: rule__XAssignment__Group_1_1_0__0__Impl : ( ( rule__XAssignment__Group_1_1_0_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9963:1: rule__XAssignment__Group_1_1_0__0__Impl : ( ( rule__XAssignment__Group_1_1_0_0__0 ) ) ;
     public final void rule__XAssignment__Group_1_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10061:1: ( ( ( rule__XAssignment__Group_1_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10062:1: ( ( rule__XAssignment__Group_1_1_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9967:1: ( ( ( rule__XAssignment__Group_1_1_0_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9968:1: ( ( rule__XAssignment__Group_1_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10062:1: ( ( rule__XAssignment__Group_1_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10063:1: ( rule__XAssignment__Group_1_1_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9968:1: ( ( rule__XAssignment__Group_1_1_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9969:1: ( rule__XAssignment__Group_1_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getGroup_1_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10064:1: ( rule__XAssignment__Group_1_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10064:2: rule__XAssignment__Group_1_1_0_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9970:1: ( rule__XAssignment__Group_1_1_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9970:2: rule__XAssignment__Group_1_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_1_1_0_0__0_in_rule__XAssignment__Group_1_1_0__0__Impl20868);
+            pushFollow(FOLLOW_rule__XAssignment__Group_1_1_0_0__0_in_rule__XAssignment__Group_1_1_0__0__Impl20682);
             rule__XAssignment__Group_1_1_0_0__0();
 
             state._fsp--;
@@ -30208,21 +29945,21 @@ public final void rule__XAssignment__Group_1_1_0__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10076:1: rule__XAssignment__Group_1_1_0_0__0 : rule__XAssignment__Group_1_1_0_0__0__Impl rule__XAssignment__Group_1_1_0_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9982:1: rule__XAssignment__Group_1_1_0_0__0 : rule__XAssignment__Group_1_1_0_0__0__Impl rule__XAssignment__Group_1_1_0_0__1 ;
     public final void rule__XAssignment__Group_1_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10080:1: ( rule__XAssignment__Group_1_1_0_0__0__Impl rule__XAssignment__Group_1_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10081:2: rule__XAssignment__Group_1_1_0_0__0__Impl rule__XAssignment__Group_1_1_0_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9986:1: ( rule__XAssignment__Group_1_1_0_0__0__Impl rule__XAssignment__Group_1_1_0_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9987:2: rule__XAssignment__Group_1_1_0_0__0__Impl rule__XAssignment__Group_1_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_1_1_0_0__0__Impl_in_rule__XAssignment__Group_1_1_0_0__020900);
+            pushFollow(FOLLOW_rule__XAssignment__Group_1_1_0_0__0__Impl_in_rule__XAssignment__Group_1_1_0_0__020714);
             rule__XAssignment__Group_1_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAssignment__Group_1_1_0_0__1_in_rule__XAssignment__Group_1_1_0_0__020903);
+            pushFollow(FOLLOW_rule__XAssignment__Group_1_1_0_0__1_in_rule__XAssignment__Group_1_1_0_0__020717);
             rule__XAssignment__Group_1_1_0_0__1();
 
             state._fsp--;
@@ -30246,23 +29983,23 @@ public final void rule__XAssignment__Group_1_1_0_0__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10088:1: rule__XAssignment__Group_1_1_0_0__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9994:1: rule__XAssignment__Group_1_1_0_0__0__Impl : ( () ) ;
     public final void rule__XAssignment__Group_1_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10092:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10093:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9998:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9999:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10093:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10094:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9999:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10000:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10095:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10097:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10001:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10003:1: 
             {
             }
 
@@ -30287,16 +30024,16 @@ public final void rule__XAssignment__Group_1_1_0_0__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10107:1: rule__XAssignment__Group_1_1_0_0__1 : rule__XAssignment__Group_1_1_0_0__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10013:1: rule__XAssignment__Group_1_1_0_0__1 : rule__XAssignment__Group_1_1_0_0__1__Impl ;
     public final void rule__XAssignment__Group_1_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10111:1: ( rule__XAssignment__Group_1_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10112:2: rule__XAssignment__Group_1_1_0_0__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10017:1: ( rule__XAssignment__Group_1_1_0_0__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10018:2: rule__XAssignment__Group_1_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_1_1_0_0__1__Impl_in_rule__XAssignment__Group_1_1_0_0__120961);
+            pushFollow(FOLLOW_rule__XAssignment__Group_1_1_0_0__1__Impl_in_rule__XAssignment__Group_1_1_0_0__120775);
             rule__XAssignment__Group_1_1_0_0__1__Impl();
 
             state._fsp--;
@@ -30320,25 +30057,25 @@ public final void rule__XAssignment__Group_1_1_0_0__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10118:1: rule__XAssignment__Group_1_1_0_0__1__Impl : ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10024:1: rule__XAssignment__Group_1_1_0_0__1__Impl : ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) ) ;
     public final void rule__XAssignment__Group_1_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10122:1: ( ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10123:1: ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10028:1: ( ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10029:1: ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10123:1: ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10124:1: ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10029:1: ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10030:1: ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getFeatureAssignment_1_1_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10125:1: ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10125:2: rule__XAssignment__FeatureAssignment_1_1_0_0_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10031:1: ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10031:2: rule__XAssignment__FeatureAssignment_1_1_0_0_1
             {
-            pushFollow(FOLLOW_rule__XAssignment__FeatureAssignment_1_1_0_0_1_in_rule__XAssignment__Group_1_1_0_0__1__Impl20988);
+            pushFollow(FOLLOW_rule__XAssignment__FeatureAssignment_1_1_0_0_1_in_rule__XAssignment__Group_1_1_0_0__1__Impl20802);
             rule__XAssignment__FeatureAssignment_1_1_0_0_1();
 
             state._fsp--;
@@ -30371,21 +30108,21 @@ public final void rule__XAssignment__Group_1_1_0_0__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_5__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10139:1: rule__OpMultiAssign__Group_5__0 : rule__OpMultiAssign__Group_5__0__Impl rule__OpMultiAssign__Group_5__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10045:1: rule__OpMultiAssign__Group_5__0 : rule__OpMultiAssign__Group_5__0__Impl rule__OpMultiAssign__Group_5__1 ;
     public final void rule__OpMultiAssign__Group_5__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10143:1: ( rule__OpMultiAssign__Group_5__0__Impl rule__OpMultiAssign__Group_5__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10144:2: rule__OpMultiAssign__Group_5__0__Impl rule__OpMultiAssign__Group_5__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10049:1: ( rule__OpMultiAssign__Group_5__0__Impl rule__OpMultiAssign__Group_5__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10050:2: rule__OpMultiAssign__Group_5__0__Impl rule__OpMultiAssign__Group_5__1
             {
-            pushFollow(FOLLOW_rule__OpMultiAssign__Group_5__0__Impl_in_rule__OpMultiAssign__Group_5__021022);
+            pushFollow(FOLLOW_rule__OpMultiAssign__Group_5__0__Impl_in_rule__OpMultiAssign__Group_5__020836);
             rule__OpMultiAssign__Group_5__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OpMultiAssign__Group_5__1_in_rule__OpMultiAssign__Group_5__021025);
+            pushFollow(FOLLOW_rule__OpMultiAssign__Group_5__1_in_rule__OpMultiAssign__Group_5__020839);
             rule__OpMultiAssign__Group_5__1();
 
             state._fsp--;
@@ -30409,22 +30146,22 @@ public final void rule__OpMultiAssign__Group_5__0() throws RecognitionException
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_5__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10151:1: rule__OpMultiAssign__Group_5__0__Impl : ( '<' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10057:1: rule__OpMultiAssign__Group_5__0__Impl : ( '<' ) ;
     public final void rule__OpMultiAssign__Group_5__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10155:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10156:1: ( '<' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10061:1: ( ( '<' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10062:1: ( '<' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10156:1: ( '<' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10157:1: '<'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10062:1: ( '<' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10063:1: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignAccess().getLessThanSignKeyword_5_0()); 
             }
-            match(input,47,FOLLOW_47_in_rule__OpMultiAssign__Group_5__0__Impl21053); if (state.failed) return ;
+            match(input,47,FOLLOW_47_in_rule__OpMultiAssign__Group_5__0__Impl20867); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpMultiAssignAccess().getLessThanSignKeyword_5_0()); 
             }
@@ -30450,21 +30187,21 @@ public final void rule__OpMultiAssign__Group_5__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_5__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10170:1: rule__OpMultiAssign__Group_5__1 : rule__OpMultiAssign__Group_5__1__Impl rule__OpMultiAssign__Group_5__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10076:1: rule__OpMultiAssign__Group_5__1 : rule__OpMultiAssign__Group_5__1__Impl rule__OpMultiAssign__Group_5__2 ;
     public final void rule__OpMultiAssign__Group_5__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10174:1: ( rule__OpMultiAssign__Group_5__1__Impl rule__OpMultiAssign__Group_5__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10175:2: rule__OpMultiAssign__Group_5__1__Impl rule__OpMultiAssign__Group_5__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10080:1: ( rule__OpMultiAssign__Group_5__1__Impl rule__OpMultiAssign__Group_5__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10081:2: rule__OpMultiAssign__Group_5__1__Impl rule__OpMultiAssign__Group_5__2
             {
-            pushFollow(FOLLOW_rule__OpMultiAssign__Group_5__1__Impl_in_rule__OpMultiAssign__Group_5__121084);
+            pushFollow(FOLLOW_rule__OpMultiAssign__Group_5__1__Impl_in_rule__OpMultiAssign__Group_5__120898);
             rule__OpMultiAssign__Group_5__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OpMultiAssign__Group_5__2_in_rule__OpMultiAssign__Group_5__121087);
+            pushFollow(FOLLOW_rule__OpMultiAssign__Group_5__2_in_rule__OpMultiAssign__Group_5__120901);
             rule__OpMultiAssign__Group_5__2();
 
             state._fsp--;
@@ -30488,22 +30225,22 @@ public final void rule__OpMultiAssign__Group_5__1() throws RecognitionException
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_5__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10182:1: rule__OpMultiAssign__Group_5__1__Impl : ( '<' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10088:1: rule__OpMultiAssign__Group_5__1__Impl : ( '<' ) ;
     public final void rule__OpMultiAssign__Group_5__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10186:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10187:1: ( '<' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10092:1: ( ( '<' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10093:1: ( '<' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10187:1: ( '<' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10188:1: '<'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10093:1: ( '<' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10094:1: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignAccess().getLessThanSignKeyword_5_1()); 
             }
-            match(input,47,FOLLOW_47_in_rule__OpMultiAssign__Group_5__1__Impl21115); if (state.failed) return ;
+            match(input,47,FOLLOW_47_in_rule__OpMultiAssign__Group_5__1__Impl20929); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpMultiAssignAccess().getLessThanSignKeyword_5_1()); 
             }
@@ -30529,16 +30266,16 @@ public final void rule__OpMultiAssign__Group_5__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_5__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10201:1: rule__OpMultiAssign__Group_5__2 : rule__OpMultiAssign__Group_5__2__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10107:1: rule__OpMultiAssign__Group_5__2 : rule__OpMultiAssign__Group_5__2__Impl ;
     public final void rule__OpMultiAssign__Group_5__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10205:1: ( rule__OpMultiAssign__Group_5__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10206:2: rule__OpMultiAssign__Group_5__2__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10111:1: ( rule__OpMultiAssign__Group_5__2__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10112:2: rule__OpMultiAssign__Group_5__2__Impl
             {
-            pushFollow(FOLLOW_rule__OpMultiAssign__Group_5__2__Impl_in_rule__OpMultiAssign__Group_5__221146);
+            pushFollow(FOLLOW_rule__OpMultiAssign__Group_5__2__Impl_in_rule__OpMultiAssign__Group_5__220960);
             rule__OpMultiAssign__Group_5__2__Impl();
 
             state._fsp--;
@@ -30562,22 +30299,22 @@ public final void rule__OpMultiAssign__Group_5__2() throws RecognitionException
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_5__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10212:1: rule__OpMultiAssign__Group_5__2__Impl : ( '=' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10118:1: rule__OpMultiAssign__Group_5__2__Impl : ( '=' ) ;
     public final void rule__OpMultiAssign__Group_5__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10216:1: ( ( '=' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10217:1: ( '=' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10122:1: ( ( '=' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10123:1: ( '=' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10217:1: ( '=' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10218:1: '='
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10123:1: ( '=' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10124:1: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignAccess().getEqualsSignKeyword_5_2()); 
             }
-            match(input,13,FOLLOW_13_in_rule__OpMultiAssign__Group_5__2__Impl21174); if (state.failed) return ;
+            match(input,13,FOLLOW_13_in_rule__OpMultiAssign__Group_5__2__Impl20988); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpMultiAssignAccess().getEqualsSignKeyword_5_2()); 
             }
@@ -30603,21 +30340,21 @@ public final void rule__OpMultiAssign__Group_5__2__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_6__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10237:1: rule__OpMultiAssign__Group_6__0 : rule__OpMultiAssign__Group_6__0__Impl rule__OpMultiAssign__Group_6__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10143:1: rule__OpMultiAssign__Group_6__0 : rule__OpMultiAssign__Group_6__0__Impl rule__OpMultiAssign__Group_6__1 ;
     public final void rule__OpMultiAssign__Group_6__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10241:1: ( rule__OpMultiAssign__Group_6__0__Impl rule__OpMultiAssign__Group_6__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10242:2: rule__OpMultiAssign__Group_6__0__Impl rule__OpMultiAssign__Group_6__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10147:1: ( rule__OpMultiAssign__Group_6__0__Impl rule__OpMultiAssign__Group_6__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10148:2: rule__OpMultiAssign__Group_6__0__Impl rule__OpMultiAssign__Group_6__1
             {
-            pushFollow(FOLLOW_rule__OpMultiAssign__Group_6__0__Impl_in_rule__OpMultiAssign__Group_6__021211);
+            pushFollow(FOLLOW_rule__OpMultiAssign__Group_6__0__Impl_in_rule__OpMultiAssign__Group_6__021025);
             rule__OpMultiAssign__Group_6__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OpMultiAssign__Group_6__1_in_rule__OpMultiAssign__Group_6__021214);
+            pushFollow(FOLLOW_rule__OpMultiAssign__Group_6__1_in_rule__OpMultiAssign__Group_6__021028);
             rule__OpMultiAssign__Group_6__1();
 
             state._fsp--;
@@ -30641,22 +30378,22 @@ public final void rule__OpMultiAssign__Group_6__0() throws RecognitionException
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_6__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10249:1: rule__OpMultiAssign__Group_6__0__Impl : ( '>' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10155:1: rule__OpMultiAssign__Group_6__0__Impl : ( '>' ) ;
     public final void rule__OpMultiAssign__Group_6__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10253:1: ( ( '>' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10254:1: ( '>' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10159:1: ( ( '>' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10160:1: ( '>' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10254:1: ( '>' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10255:1: '>'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10160:1: ( '>' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10161:1: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignAccess().getGreaterThanSignKeyword_6_0()); 
             }
-            match(input,46,FOLLOW_46_in_rule__OpMultiAssign__Group_6__0__Impl21242); if (state.failed) return ;
+            match(input,46,FOLLOW_46_in_rule__OpMultiAssign__Group_6__0__Impl21056); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpMultiAssignAccess().getGreaterThanSignKeyword_6_0()); 
             }
@@ -30682,21 +30419,21 @@ public final void rule__OpMultiAssign__Group_6__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_6__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10268:1: rule__OpMultiAssign__Group_6__1 : rule__OpMultiAssign__Group_6__1__Impl rule__OpMultiAssign__Group_6__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10174:1: rule__OpMultiAssign__Group_6__1 : rule__OpMultiAssign__Group_6__1__Impl rule__OpMultiAssign__Group_6__2 ;
     public final void rule__OpMultiAssign__Group_6__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10272:1: ( rule__OpMultiAssign__Group_6__1__Impl rule__OpMultiAssign__Group_6__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10273:2: rule__OpMultiAssign__Group_6__1__Impl rule__OpMultiAssign__Group_6__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10178:1: ( rule__OpMultiAssign__Group_6__1__Impl rule__OpMultiAssign__Group_6__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10179:2: rule__OpMultiAssign__Group_6__1__Impl rule__OpMultiAssign__Group_6__2
             {
-            pushFollow(FOLLOW_rule__OpMultiAssign__Group_6__1__Impl_in_rule__OpMultiAssign__Group_6__121273);
+            pushFollow(FOLLOW_rule__OpMultiAssign__Group_6__1__Impl_in_rule__OpMultiAssign__Group_6__121087);
             rule__OpMultiAssign__Group_6__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OpMultiAssign__Group_6__2_in_rule__OpMultiAssign__Group_6__121276);
+            pushFollow(FOLLOW_rule__OpMultiAssign__Group_6__2_in_rule__OpMultiAssign__Group_6__121090);
             rule__OpMultiAssign__Group_6__2();
 
             state._fsp--;
@@ -30720,33 +30457,33 @@ public final void rule__OpMultiAssign__Group_6__1() throws RecognitionException
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_6__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10280:1: rule__OpMultiAssign__Group_6__1__Impl : ( ( '>' )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10186:1: rule__OpMultiAssign__Group_6__1__Impl : ( ( '>' )? ) ;
     public final void rule__OpMultiAssign__Group_6__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10284:1: ( ( ( '>' )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10285:1: ( ( '>' )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10190:1: ( ( ( '>' )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10191:1: ( ( '>' )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10285:1: ( ( '>' )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10286:1: ( '>' )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10191:1: ( ( '>' )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10192:1: ( '>' )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignAccess().getGreaterThanSignKeyword_6_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10287:1: ( '>' )?
-            int alt95=2;
-            int LA95_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10193:1: ( '>' )?
+            int alt94=2;
+            int LA94_0 = input.LA(1);
 
-            if ( (LA95_0==46) ) {
-                alt95=1;
+            if ( (LA94_0==46) ) {
+                alt94=1;
             }
-            switch (alt95) {
+            switch (alt94) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10288:2: '>'
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10194:2: '>'
                     {
-                    match(input,46,FOLLOW_46_in_rule__OpMultiAssign__Group_6__1__Impl21305); if (state.failed) return ;
+                    match(input,46,FOLLOW_46_in_rule__OpMultiAssign__Group_6__1__Impl21119); if (state.failed) return ;
 
                     }
                     break;
@@ -30778,16 +30515,16 @@ public final void rule__OpMultiAssign__Group_6__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_6__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10299:1: rule__OpMultiAssign__Group_6__2 : rule__OpMultiAssign__Group_6__2__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10205:1: rule__OpMultiAssign__Group_6__2 : rule__OpMultiAssign__Group_6__2__Impl ;
     public final void rule__OpMultiAssign__Group_6__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10303:1: ( rule__OpMultiAssign__Group_6__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10304:2: rule__OpMultiAssign__Group_6__2__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10209:1: ( rule__OpMultiAssign__Group_6__2__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10210:2: rule__OpMultiAssign__Group_6__2__Impl
             {
-            pushFollow(FOLLOW_rule__OpMultiAssign__Group_6__2__Impl_in_rule__OpMultiAssign__Group_6__221338);
+            pushFollow(FOLLOW_rule__OpMultiAssign__Group_6__2__Impl_in_rule__OpMultiAssign__Group_6__221152);
             rule__OpMultiAssign__Group_6__2__Impl();
 
             state._fsp--;
@@ -30811,22 +30548,22 @@ public final void rule__OpMultiAssign__Group_6__2() throws RecognitionException
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_6__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10310:1: rule__OpMultiAssign__Group_6__2__Impl : ( '>=' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10216:1: rule__OpMultiAssign__Group_6__2__Impl : ( '>=' ) ;
     public final void rule__OpMultiAssign__Group_6__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10314:1: ( ( '>=' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10315:1: ( '>=' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10220:1: ( ( '>=' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10221:1: ( '>=' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10315:1: ( '>=' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10316:1: '>='
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10221:1: ( '>=' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10222:1: '>='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignAccess().getGreaterThanSignEqualsSignKeyword_6_2()); 
             }
-            match(input,45,FOLLOW_45_in_rule__OpMultiAssign__Group_6__2__Impl21366); if (state.failed) return ;
+            match(input,45,FOLLOW_45_in_rule__OpMultiAssign__Group_6__2__Impl21180); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpMultiAssignAccess().getGreaterThanSignEqualsSignKeyword_6_2()); 
             }
@@ -30852,21 +30589,21 @@ public final void rule__OpMultiAssign__Group_6__2__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XOrExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10335:1: rule__XOrExpression__Group__0 : rule__XOrExpression__Group__0__Impl rule__XOrExpression__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10241:1: rule__XOrExpression__Group__0 : rule__XOrExpression__Group__0__Impl rule__XOrExpression__Group__1 ;
     public final void rule__XOrExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10339:1: ( rule__XOrExpression__Group__0__Impl rule__XOrExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10340:2: rule__XOrExpression__Group__0__Impl rule__XOrExpression__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10245:1: ( rule__XOrExpression__Group__0__Impl rule__XOrExpression__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10246:2: rule__XOrExpression__Group__0__Impl rule__XOrExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XOrExpression__Group__0__Impl_in_rule__XOrExpression__Group__021403);
+            pushFollow(FOLLOW_rule__XOrExpression__Group__0__Impl_in_rule__XOrExpression__Group__021217);
             rule__XOrExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XOrExpression__Group__1_in_rule__XOrExpression__Group__021406);
+            pushFollow(FOLLOW_rule__XOrExpression__Group__1_in_rule__XOrExpression__Group__021220);
             rule__XOrExpression__Group__1();
 
             state._fsp--;
@@ -30890,22 +30627,22 @@ public final void rule__XOrExpression__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XOrExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10347:1: rule__XOrExpression__Group__0__Impl : ( ruleXAndExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10253:1: rule__XOrExpression__Group__0__Impl : ( ruleXAndExpression ) ;
     public final void rule__XOrExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10351:1: ( ( ruleXAndExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10352:1: ( ruleXAndExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10257:1: ( ( ruleXAndExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10258:1: ( ruleXAndExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10352:1: ( ruleXAndExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10353:1: ruleXAndExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10258:1: ( ruleXAndExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10259:1: ruleXAndExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getXAndExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleXAndExpression_in_rule__XOrExpression__Group__0__Impl21433);
+            pushFollow(FOLLOW_ruleXAndExpression_in_rule__XOrExpression__Group__0__Impl21247);
             ruleXAndExpression();
 
             state._fsp--;
@@ -30935,16 +30672,16 @@ public final void rule__XOrExpression__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XOrExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10364:1: rule__XOrExpression__Group__1 : rule__XOrExpression__Group__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10270:1: rule__XOrExpression__Group__1 : rule__XOrExpression__Group__1__Impl ;
     public final void rule__XOrExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10368:1: ( rule__XOrExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10369:2: rule__XOrExpression__Group__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10274:1: ( rule__XOrExpression__Group__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10275:2: rule__XOrExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XOrExpression__Group__1__Impl_in_rule__XOrExpression__Group__121462);
+            pushFollow(FOLLOW_rule__XOrExpression__Group__1__Impl_in_rule__XOrExpression__Group__121276);
             rule__XOrExpression__Group__1__Impl();
 
             state._fsp--;
@@ -30968,43 +30705,43 @@ public final void rule__XOrExpression__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XOrExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10375:1: rule__XOrExpression__Group__1__Impl : ( ( rule__XOrExpression__Group_1__0 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10281:1: rule__XOrExpression__Group__1__Impl : ( ( rule__XOrExpression__Group_1__0 )* ) ;
     public final void rule__XOrExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10379:1: ( ( ( rule__XOrExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10380:1: ( ( rule__XOrExpression__Group_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10285:1: ( ( ( rule__XOrExpression__Group_1__0 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10286:1: ( ( rule__XOrExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10380:1: ( ( rule__XOrExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10381:1: ( rule__XOrExpression__Group_1__0 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10286:1: ( ( rule__XOrExpression__Group_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10287:1: ( rule__XOrExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10382:1: ( rule__XOrExpression__Group_1__0 )*
-            loop96:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10288:1: ( rule__XOrExpression__Group_1__0 )*
+            loop95:
             do {
-                int alt96=2;
-                int LA96_0 = input.LA(1);
+                int alt95=2;
+                int LA95_0 = input.LA(1);
 
-                if ( (LA96_0==14) ) {
-                    int LA96_2 = input.LA(2);
+                if ( (LA95_0==14) ) {
+                    int LA95_2 = input.LA(2);
 
-                    if ( (synpred162_InternalCheck()) ) {
-                        alt96=1;
+                    if ( (synpred161_InternalCheck()) ) {
+                        alt95=1;
                     }
 
 
                 }
 
 
-                switch (alt96) {
+                switch (alt95) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10382:2: rule__XOrExpression__Group_1__0
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10288:2: rule__XOrExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XOrExpression__Group_1__0_in_rule__XOrExpression__Group__1__Impl21489);
+            	    pushFollow(FOLLOW_rule__XOrExpression__Group_1__0_in_rule__XOrExpression__Group__1__Impl21303);
             	    rule__XOrExpression__Group_1__0();
 
             	    state._fsp--;
@@ -31014,7 +30751,7 @@ public final void rule__XOrExpression__Group__1__Impl() throws RecognitionExcept
             	    break;
 
             	default :
-            	    break loop96;
+            	    break loop95;
                 }
             } while (true);
 
@@ -31043,21 +30780,21 @@ public final void rule__XOrExpression__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XOrExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10396:1: rule__XOrExpression__Group_1__0 : rule__XOrExpression__Group_1__0__Impl rule__XOrExpression__Group_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10302:1: rule__XOrExpression__Group_1__0 : rule__XOrExpression__Group_1__0__Impl rule__XOrExpression__Group_1__1 ;
     public final void rule__XOrExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10400:1: ( rule__XOrExpression__Group_1__0__Impl rule__XOrExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10401:2: rule__XOrExpression__Group_1__0__Impl rule__XOrExpression__Group_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10306:1: ( rule__XOrExpression__Group_1__0__Impl rule__XOrExpression__Group_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10307:2: rule__XOrExpression__Group_1__0__Impl rule__XOrExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XOrExpression__Group_1__0__Impl_in_rule__XOrExpression__Group_1__021524);
+            pushFollow(FOLLOW_rule__XOrExpression__Group_1__0__Impl_in_rule__XOrExpression__Group_1__021338);
             rule__XOrExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XOrExpression__Group_1__1_in_rule__XOrExpression__Group_1__021527);
+            pushFollow(FOLLOW_rule__XOrExpression__Group_1__1_in_rule__XOrExpression__Group_1__021341);
             rule__XOrExpression__Group_1__1();
 
             state._fsp--;
@@ -31081,25 +30818,25 @@ public final void rule__XOrExpression__Group_1__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XOrExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10408:1: rule__XOrExpression__Group_1__0__Impl : ( ( rule__XOrExpression__Group_1_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10314:1: rule__XOrExpression__Group_1__0__Impl : ( ( rule__XOrExpression__Group_1_0__0 ) ) ;
     public final void rule__XOrExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10412:1: ( ( ( rule__XOrExpression__Group_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10413:1: ( ( rule__XOrExpression__Group_1_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10318:1: ( ( ( rule__XOrExpression__Group_1_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10319:1: ( ( rule__XOrExpression__Group_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10413:1: ( ( rule__XOrExpression__Group_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10414:1: ( rule__XOrExpression__Group_1_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10319:1: ( ( rule__XOrExpression__Group_1_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10320:1: ( rule__XOrExpression__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getGroup_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10415:1: ( rule__XOrExpression__Group_1_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10415:2: rule__XOrExpression__Group_1_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10321:1: ( rule__XOrExpression__Group_1_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10321:2: rule__XOrExpression__Group_1_0__0
             {
-            pushFollow(FOLLOW_rule__XOrExpression__Group_1_0__0_in_rule__XOrExpression__Group_1__0__Impl21554);
+            pushFollow(FOLLOW_rule__XOrExpression__Group_1_0__0_in_rule__XOrExpression__Group_1__0__Impl21368);
             rule__XOrExpression__Group_1_0__0();
 
             state._fsp--;
@@ -31132,16 +30869,16 @@ public final void rule__XOrExpression__Group_1__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XOrExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10425:1: rule__XOrExpression__Group_1__1 : rule__XOrExpression__Group_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10331:1: rule__XOrExpression__Group_1__1 : rule__XOrExpression__Group_1__1__Impl ;
     public final void rule__XOrExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10429:1: ( rule__XOrExpression__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10430:2: rule__XOrExpression__Group_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10335:1: ( rule__XOrExpression__Group_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10336:2: rule__XOrExpression__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XOrExpression__Group_1__1__Impl_in_rule__XOrExpression__Group_1__121584);
+            pushFollow(FOLLOW_rule__XOrExpression__Group_1__1__Impl_in_rule__XOrExpression__Group_1__121398);
             rule__XOrExpression__Group_1__1__Impl();
 
             state._fsp--;
@@ -31165,25 +30902,25 @@ public final void rule__XOrExpression__Group_1__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XOrExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10436:1: rule__XOrExpression__Group_1__1__Impl : ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10342:1: rule__XOrExpression__Group_1__1__Impl : ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) ) ;
     public final void rule__XOrExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10440:1: ( ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10441:1: ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10346:1: ( ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10347:1: ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10441:1: ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10442:1: ( rule__XOrExpression__RightOperandAssignment_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10347:1: ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10348:1: ( rule__XOrExpression__RightOperandAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getRightOperandAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10443:1: ( rule__XOrExpression__RightOperandAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10443:2: rule__XOrExpression__RightOperandAssignment_1_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10349:1: ( rule__XOrExpression__RightOperandAssignment_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10349:2: rule__XOrExpression__RightOperandAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__XOrExpression__RightOperandAssignment_1_1_in_rule__XOrExpression__Group_1__1__Impl21611);
+            pushFollow(FOLLOW_rule__XOrExpression__RightOperandAssignment_1_1_in_rule__XOrExpression__Group_1__1__Impl21425);
             rule__XOrExpression__RightOperandAssignment_1_1();
 
             state._fsp--;
@@ -31216,16 +30953,16 @@ public final void rule__XOrExpression__Group_1__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XOrExpression__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10457:1: rule__XOrExpression__Group_1_0__0 : rule__XOrExpression__Group_1_0__0__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10363:1: rule__XOrExpression__Group_1_0__0 : rule__XOrExpression__Group_1_0__0__Impl ;
     public final void rule__XOrExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10461:1: ( rule__XOrExpression__Group_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10462:2: rule__XOrExpression__Group_1_0__0__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10367:1: ( rule__XOrExpression__Group_1_0__0__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10368:2: rule__XOrExpression__Group_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XOrExpression__Group_1_0__0__Impl_in_rule__XOrExpression__Group_1_0__021645);
+            pushFollow(FOLLOW_rule__XOrExpression__Group_1_0__0__Impl_in_rule__XOrExpression__Group_1_0__021459);
             rule__XOrExpression__Group_1_0__0__Impl();
 
             state._fsp--;
@@ -31249,25 +30986,25 @@ public final void rule__XOrExpression__Group_1_0__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XOrExpression__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10468:1: rule__XOrExpression__Group_1_0__0__Impl : ( ( rule__XOrExpression__Group_1_0_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10374:1: rule__XOrExpression__Group_1_0__0__Impl : ( ( rule__XOrExpression__Group_1_0_0__0 ) ) ;
     public final void rule__XOrExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10472:1: ( ( ( rule__XOrExpression__Group_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10473:1: ( ( rule__XOrExpression__Group_1_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10378:1: ( ( ( rule__XOrExpression__Group_1_0_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10379:1: ( ( rule__XOrExpression__Group_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10473:1: ( ( rule__XOrExpression__Group_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10474:1: ( rule__XOrExpression__Group_1_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10379:1: ( ( rule__XOrExpression__Group_1_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10380:1: ( rule__XOrExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getGroup_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10475:1: ( rule__XOrExpression__Group_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10475:2: rule__XOrExpression__Group_1_0_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10381:1: ( rule__XOrExpression__Group_1_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10381:2: rule__XOrExpression__Group_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XOrExpression__Group_1_0_0__0_in_rule__XOrExpression__Group_1_0__0__Impl21672);
+            pushFollow(FOLLOW_rule__XOrExpression__Group_1_0_0__0_in_rule__XOrExpression__Group_1_0__0__Impl21486);
             rule__XOrExpression__Group_1_0_0__0();
 
             state._fsp--;
@@ -31300,21 +31037,21 @@ public final void rule__XOrExpression__Group_1_0__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XOrExpression__Group_1_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10487:1: rule__XOrExpression__Group_1_0_0__0 : rule__XOrExpression__Group_1_0_0__0__Impl rule__XOrExpression__Group_1_0_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10393:1: rule__XOrExpression__Group_1_0_0__0 : rule__XOrExpression__Group_1_0_0__0__Impl rule__XOrExpression__Group_1_0_0__1 ;
     public final void rule__XOrExpression__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10491:1: ( rule__XOrExpression__Group_1_0_0__0__Impl rule__XOrExpression__Group_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10492:2: rule__XOrExpression__Group_1_0_0__0__Impl rule__XOrExpression__Group_1_0_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10397:1: ( rule__XOrExpression__Group_1_0_0__0__Impl rule__XOrExpression__Group_1_0_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10398:2: rule__XOrExpression__Group_1_0_0__0__Impl rule__XOrExpression__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XOrExpression__Group_1_0_0__0__Impl_in_rule__XOrExpression__Group_1_0_0__021704);
+            pushFollow(FOLLOW_rule__XOrExpression__Group_1_0_0__0__Impl_in_rule__XOrExpression__Group_1_0_0__021518);
             rule__XOrExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XOrExpression__Group_1_0_0__1_in_rule__XOrExpression__Group_1_0_0__021707);
+            pushFollow(FOLLOW_rule__XOrExpression__Group_1_0_0__1_in_rule__XOrExpression__Group_1_0_0__021521);
             rule__XOrExpression__Group_1_0_0__1();
 
             state._fsp--;
@@ -31338,23 +31075,23 @@ public final void rule__XOrExpression__Group_1_0_0__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XOrExpression__Group_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10499:1: rule__XOrExpression__Group_1_0_0__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10405:1: rule__XOrExpression__Group_1_0_0__0__Impl : ( () ) ;
     public final void rule__XOrExpression__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10503:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10504:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10409:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10410:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10504:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10505:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10410:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10411:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10506:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10508:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10412:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10414:1: 
             {
             }
 
@@ -31379,16 +31116,16 @@ public final void rule__XOrExpression__Group_1_0_0__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XOrExpression__Group_1_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10518:1: rule__XOrExpression__Group_1_0_0__1 : rule__XOrExpression__Group_1_0_0__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10424:1: rule__XOrExpression__Group_1_0_0__1 : rule__XOrExpression__Group_1_0_0__1__Impl ;
     public final void rule__XOrExpression__Group_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10522:1: ( rule__XOrExpression__Group_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10523:2: rule__XOrExpression__Group_1_0_0__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10428:1: ( rule__XOrExpression__Group_1_0_0__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10429:2: rule__XOrExpression__Group_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XOrExpression__Group_1_0_0__1__Impl_in_rule__XOrExpression__Group_1_0_0__121765);
+            pushFollow(FOLLOW_rule__XOrExpression__Group_1_0_0__1__Impl_in_rule__XOrExpression__Group_1_0_0__121579);
             rule__XOrExpression__Group_1_0_0__1__Impl();
 
             state._fsp--;
@@ -31412,25 +31149,25 @@ public final void rule__XOrExpression__Group_1_0_0__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XOrExpression__Group_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10529:1: rule__XOrExpression__Group_1_0_0__1__Impl : ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10435:1: rule__XOrExpression__Group_1_0_0__1__Impl : ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) ) ;
     public final void rule__XOrExpression__Group_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10533:1: ( ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10534:1: ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10439:1: ( ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10440:1: ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10534:1: ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10535:1: ( rule__XOrExpression__FeatureAssignment_1_0_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10440:1: ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10441:1: ( rule__XOrExpression__FeatureAssignment_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getFeatureAssignment_1_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10536:1: ( rule__XOrExpression__FeatureAssignment_1_0_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10536:2: rule__XOrExpression__FeatureAssignment_1_0_0_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10442:1: ( rule__XOrExpression__FeatureAssignment_1_0_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10442:2: rule__XOrExpression__FeatureAssignment_1_0_0_1
             {
-            pushFollow(FOLLOW_rule__XOrExpression__FeatureAssignment_1_0_0_1_in_rule__XOrExpression__Group_1_0_0__1__Impl21792);
+            pushFollow(FOLLOW_rule__XOrExpression__FeatureAssignment_1_0_0_1_in_rule__XOrExpression__Group_1_0_0__1__Impl21606);
             rule__XOrExpression__FeatureAssignment_1_0_0_1();
 
             state._fsp--;
@@ -31463,21 +31200,21 @@ public final void rule__XOrExpression__Group_1_0_0__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XAndExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10550:1: rule__XAndExpression__Group__0 : rule__XAndExpression__Group__0__Impl rule__XAndExpression__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10456:1: rule__XAndExpression__Group__0 : rule__XAndExpression__Group__0__Impl rule__XAndExpression__Group__1 ;
     public final void rule__XAndExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10554:1: ( rule__XAndExpression__Group__0__Impl rule__XAndExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10555:2: rule__XAndExpression__Group__0__Impl rule__XAndExpression__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10460:1: ( rule__XAndExpression__Group__0__Impl rule__XAndExpression__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10461:2: rule__XAndExpression__Group__0__Impl rule__XAndExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XAndExpression__Group__0__Impl_in_rule__XAndExpression__Group__021826);
+            pushFollow(FOLLOW_rule__XAndExpression__Group__0__Impl_in_rule__XAndExpression__Group__021640);
             rule__XAndExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAndExpression__Group__1_in_rule__XAndExpression__Group__021829);
+            pushFollow(FOLLOW_rule__XAndExpression__Group__1_in_rule__XAndExpression__Group__021643);
             rule__XAndExpression__Group__1();
 
             state._fsp--;
@@ -31501,22 +31238,22 @@ public final void rule__XAndExpression__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAndExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10562:1: rule__XAndExpression__Group__0__Impl : ( ruleXEqualityExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10468:1: rule__XAndExpression__Group__0__Impl : ( ruleXEqualityExpression ) ;
     public final void rule__XAndExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10566:1: ( ( ruleXEqualityExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10567:1: ( ruleXEqualityExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10472:1: ( ( ruleXEqualityExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10473:1: ( ruleXEqualityExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10567:1: ( ruleXEqualityExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10568:1: ruleXEqualityExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10473:1: ( ruleXEqualityExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10474:1: ruleXEqualityExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getXEqualityExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleXEqualityExpression_in_rule__XAndExpression__Group__0__Impl21856);
+            pushFollow(FOLLOW_ruleXEqualityExpression_in_rule__XAndExpression__Group__0__Impl21670);
             ruleXEqualityExpression();
 
             state._fsp--;
@@ -31546,16 +31283,16 @@ public final void rule__XAndExpression__Group__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XAndExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10579:1: rule__XAndExpression__Group__1 : rule__XAndExpression__Group__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10485:1: rule__XAndExpression__Group__1 : rule__XAndExpression__Group__1__Impl ;
     public final void rule__XAndExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10583:1: ( rule__XAndExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10584:2: rule__XAndExpression__Group__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10489:1: ( rule__XAndExpression__Group__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10490:2: rule__XAndExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAndExpression__Group__1__Impl_in_rule__XAndExpression__Group__121885);
+            pushFollow(FOLLOW_rule__XAndExpression__Group__1__Impl_in_rule__XAndExpression__Group__121699);
             rule__XAndExpression__Group__1__Impl();
 
             state._fsp--;
@@ -31579,43 +31316,43 @@ public final void rule__XAndExpression__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAndExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10590:1: rule__XAndExpression__Group__1__Impl : ( ( rule__XAndExpression__Group_1__0 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10496:1: rule__XAndExpression__Group__1__Impl : ( ( rule__XAndExpression__Group_1__0 )* ) ;
     public final void rule__XAndExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10594:1: ( ( ( rule__XAndExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10595:1: ( ( rule__XAndExpression__Group_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10500:1: ( ( ( rule__XAndExpression__Group_1__0 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10501:1: ( ( rule__XAndExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10595:1: ( ( rule__XAndExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10596:1: ( rule__XAndExpression__Group_1__0 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10501:1: ( ( rule__XAndExpression__Group_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10502:1: ( rule__XAndExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10597:1: ( rule__XAndExpression__Group_1__0 )*
-            loop97:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10503:1: ( rule__XAndExpression__Group_1__0 )*
+            loop96:
             do {
-                int alt97=2;
-                int LA97_0 = input.LA(1);
+                int alt96=2;
+                int LA96_0 = input.LA(1);
 
-                if ( (LA97_0==15) ) {
-                    int LA97_2 = input.LA(2);
+                if ( (LA96_0==15) ) {
+                    int LA96_2 = input.LA(2);
 
-                    if ( (synpred163_InternalCheck()) ) {
-                        alt97=1;
+                    if ( (synpred162_InternalCheck()) ) {
+                        alt96=1;
                     }
 
 
                 }
 
 
-                switch (alt97) {
+                switch (alt96) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10597:2: rule__XAndExpression__Group_1__0
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10503:2: rule__XAndExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XAndExpression__Group_1__0_in_rule__XAndExpression__Group__1__Impl21912);
+            	    pushFollow(FOLLOW_rule__XAndExpression__Group_1__0_in_rule__XAndExpression__Group__1__Impl21726);
             	    rule__XAndExpression__Group_1__0();
 
             	    state._fsp--;
@@ -31625,7 +31362,7 @@ public final void rule__XAndExpression__Group__1__Impl() throws RecognitionExcep
             	    break;
 
             	default :
-            	    break loop97;
+            	    break loop96;
                 }
             } while (true);
 
@@ -31654,21 +31391,21 @@ public final void rule__XAndExpression__Group__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XAndExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10611:1: rule__XAndExpression__Group_1__0 : rule__XAndExpression__Group_1__0__Impl rule__XAndExpression__Group_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10517:1: rule__XAndExpression__Group_1__0 : rule__XAndExpression__Group_1__0__Impl rule__XAndExpression__Group_1__1 ;
     public final void rule__XAndExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10615:1: ( rule__XAndExpression__Group_1__0__Impl rule__XAndExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10616:2: rule__XAndExpression__Group_1__0__Impl rule__XAndExpression__Group_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10521:1: ( rule__XAndExpression__Group_1__0__Impl rule__XAndExpression__Group_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10522:2: rule__XAndExpression__Group_1__0__Impl rule__XAndExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XAndExpression__Group_1__0__Impl_in_rule__XAndExpression__Group_1__021947);
+            pushFollow(FOLLOW_rule__XAndExpression__Group_1__0__Impl_in_rule__XAndExpression__Group_1__021761);
             rule__XAndExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAndExpression__Group_1__1_in_rule__XAndExpression__Group_1__021950);
+            pushFollow(FOLLOW_rule__XAndExpression__Group_1__1_in_rule__XAndExpression__Group_1__021764);
             rule__XAndExpression__Group_1__1();
 
             state._fsp--;
@@ -31692,25 +31429,25 @@ public final void rule__XAndExpression__Group_1__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XAndExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10623:1: rule__XAndExpression__Group_1__0__Impl : ( ( rule__XAndExpression__Group_1_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10529:1: rule__XAndExpression__Group_1__0__Impl : ( ( rule__XAndExpression__Group_1_0__0 ) ) ;
     public final void rule__XAndExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10627:1: ( ( ( rule__XAndExpression__Group_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10628:1: ( ( rule__XAndExpression__Group_1_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10533:1: ( ( ( rule__XAndExpression__Group_1_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10534:1: ( ( rule__XAndExpression__Group_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10628:1: ( ( rule__XAndExpression__Group_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10629:1: ( rule__XAndExpression__Group_1_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10534:1: ( ( rule__XAndExpression__Group_1_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10535:1: ( rule__XAndExpression__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getGroup_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10630:1: ( rule__XAndExpression__Group_1_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10630:2: rule__XAndExpression__Group_1_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10536:1: ( rule__XAndExpression__Group_1_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10536:2: rule__XAndExpression__Group_1_0__0
             {
-            pushFollow(FOLLOW_rule__XAndExpression__Group_1_0__0_in_rule__XAndExpression__Group_1__0__Impl21977);
+            pushFollow(FOLLOW_rule__XAndExpression__Group_1_0__0_in_rule__XAndExpression__Group_1__0__Impl21791);
             rule__XAndExpression__Group_1_0__0();
 
             state._fsp--;
@@ -31743,16 +31480,16 @@ public final void rule__XAndExpression__Group_1__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XAndExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10640:1: rule__XAndExpression__Group_1__1 : rule__XAndExpression__Group_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10546:1: rule__XAndExpression__Group_1__1 : rule__XAndExpression__Group_1__1__Impl ;
     public final void rule__XAndExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10644:1: ( rule__XAndExpression__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10645:2: rule__XAndExpression__Group_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10550:1: ( rule__XAndExpression__Group_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10551:2: rule__XAndExpression__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAndExpression__Group_1__1__Impl_in_rule__XAndExpression__Group_1__122007);
+            pushFollow(FOLLOW_rule__XAndExpression__Group_1__1__Impl_in_rule__XAndExpression__Group_1__121821);
             rule__XAndExpression__Group_1__1__Impl();
 
             state._fsp--;
@@ -31776,25 +31513,25 @@ public final void rule__XAndExpression__Group_1__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XAndExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10651:1: rule__XAndExpression__Group_1__1__Impl : ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10557:1: rule__XAndExpression__Group_1__1__Impl : ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) ) ;
     public final void rule__XAndExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10655:1: ( ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10656:1: ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10561:1: ( ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10562:1: ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10656:1: ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10657:1: ( rule__XAndExpression__RightOperandAssignment_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10562:1: ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10563:1: ( rule__XAndExpression__RightOperandAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getRightOperandAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10658:1: ( rule__XAndExpression__RightOperandAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10658:2: rule__XAndExpression__RightOperandAssignment_1_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10564:1: ( rule__XAndExpression__RightOperandAssignment_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10564:2: rule__XAndExpression__RightOperandAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__XAndExpression__RightOperandAssignment_1_1_in_rule__XAndExpression__Group_1__1__Impl22034);
+            pushFollow(FOLLOW_rule__XAndExpression__RightOperandAssignment_1_1_in_rule__XAndExpression__Group_1__1__Impl21848);
             rule__XAndExpression__RightOperandAssignment_1_1();
 
             state._fsp--;
@@ -31827,16 +31564,16 @@ public final void rule__XAndExpression__Group_1__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XAndExpression__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10672:1: rule__XAndExpression__Group_1_0__0 : rule__XAndExpression__Group_1_0__0__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10578:1: rule__XAndExpression__Group_1_0__0 : rule__XAndExpression__Group_1_0__0__Impl ;
     public final void rule__XAndExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10676:1: ( rule__XAndExpression__Group_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10677:2: rule__XAndExpression__Group_1_0__0__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10582:1: ( rule__XAndExpression__Group_1_0__0__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10583:2: rule__XAndExpression__Group_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XAndExpression__Group_1_0__0__Impl_in_rule__XAndExpression__Group_1_0__022068);
+            pushFollow(FOLLOW_rule__XAndExpression__Group_1_0__0__Impl_in_rule__XAndExpression__Group_1_0__021882);
             rule__XAndExpression__Group_1_0__0__Impl();
 
             state._fsp--;
@@ -31860,25 +31597,25 @@ public final void rule__XAndExpression__Group_1_0__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XAndExpression__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10683:1: rule__XAndExpression__Group_1_0__0__Impl : ( ( rule__XAndExpression__Group_1_0_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10589:1: rule__XAndExpression__Group_1_0__0__Impl : ( ( rule__XAndExpression__Group_1_0_0__0 ) ) ;
     public final void rule__XAndExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10687:1: ( ( ( rule__XAndExpression__Group_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10688:1: ( ( rule__XAndExpression__Group_1_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10593:1: ( ( ( rule__XAndExpression__Group_1_0_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10594:1: ( ( rule__XAndExpression__Group_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10688:1: ( ( rule__XAndExpression__Group_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10689:1: ( rule__XAndExpression__Group_1_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10594:1: ( ( rule__XAndExpression__Group_1_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10595:1: ( rule__XAndExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getGroup_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10690:1: ( rule__XAndExpression__Group_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10690:2: rule__XAndExpression__Group_1_0_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10596:1: ( rule__XAndExpression__Group_1_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10596:2: rule__XAndExpression__Group_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XAndExpression__Group_1_0_0__0_in_rule__XAndExpression__Group_1_0__0__Impl22095);
+            pushFollow(FOLLOW_rule__XAndExpression__Group_1_0_0__0_in_rule__XAndExpression__Group_1_0__0__Impl21909);
             rule__XAndExpression__Group_1_0_0__0();
 
             state._fsp--;
@@ -31911,21 +31648,21 @@ public final void rule__XAndExpression__Group_1_0__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XAndExpression__Group_1_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10702:1: rule__XAndExpression__Group_1_0_0__0 : rule__XAndExpression__Group_1_0_0__0__Impl rule__XAndExpression__Group_1_0_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10608:1: rule__XAndExpression__Group_1_0_0__0 : rule__XAndExpression__Group_1_0_0__0__Impl rule__XAndExpression__Group_1_0_0__1 ;
     public final void rule__XAndExpression__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10706:1: ( rule__XAndExpression__Group_1_0_0__0__Impl rule__XAndExpression__Group_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10707:2: rule__XAndExpression__Group_1_0_0__0__Impl rule__XAndExpression__Group_1_0_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10612:1: ( rule__XAndExpression__Group_1_0_0__0__Impl rule__XAndExpression__Group_1_0_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10613:2: rule__XAndExpression__Group_1_0_0__0__Impl rule__XAndExpression__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XAndExpression__Group_1_0_0__0__Impl_in_rule__XAndExpression__Group_1_0_0__022127);
+            pushFollow(FOLLOW_rule__XAndExpression__Group_1_0_0__0__Impl_in_rule__XAndExpression__Group_1_0_0__021941);
             rule__XAndExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAndExpression__Group_1_0_0__1_in_rule__XAndExpression__Group_1_0_0__022130);
+            pushFollow(FOLLOW_rule__XAndExpression__Group_1_0_0__1_in_rule__XAndExpression__Group_1_0_0__021944);
             rule__XAndExpression__Group_1_0_0__1();
 
             state._fsp--;
@@ -31949,23 +31686,23 @@ public final void rule__XAndExpression__Group_1_0_0__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XAndExpression__Group_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10714:1: rule__XAndExpression__Group_1_0_0__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10620:1: rule__XAndExpression__Group_1_0_0__0__Impl : ( () ) ;
     public final void rule__XAndExpression__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10718:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10719:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10624:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10625:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10719:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10720:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10625:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10626:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10721:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10723:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10627:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10629:1: 
             {
             }
 
@@ -31990,16 +31727,16 @@ public final void rule__XAndExpression__Group_1_0_0__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XAndExpression__Group_1_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10733:1: rule__XAndExpression__Group_1_0_0__1 : rule__XAndExpression__Group_1_0_0__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10639:1: rule__XAndExpression__Group_1_0_0__1 : rule__XAndExpression__Group_1_0_0__1__Impl ;
     public final void rule__XAndExpression__Group_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10737:1: ( rule__XAndExpression__Group_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10738:2: rule__XAndExpression__Group_1_0_0__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10643:1: ( rule__XAndExpression__Group_1_0_0__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10644:2: rule__XAndExpression__Group_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAndExpression__Group_1_0_0__1__Impl_in_rule__XAndExpression__Group_1_0_0__122188);
+            pushFollow(FOLLOW_rule__XAndExpression__Group_1_0_0__1__Impl_in_rule__XAndExpression__Group_1_0_0__122002);
             rule__XAndExpression__Group_1_0_0__1__Impl();
 
             state._fsp--;
@@ -32023,25 +31760,25 @@ public final void rule__XAndExpression__Group_1_0_0__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XAndExpression__Group_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10744:1: rule__XAndExpression__Group_1_0_0__1__Impl : ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10650:1: rule__XAndExpression__Group_1_0_0__1__Impl : ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) ) ;
     public final void rule__XAndExpression__Group_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10748:1: ( ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10749:1: ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10654:1: ( ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10655:1: ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10749:1: ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10750:1: ( rule__XAndExpression__FeatureAssignment_1_0_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10655:1: ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10656:1: ( rule__XAndExpression__FeatureAssignment_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getFeatureAssignment_1_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10751:1: ( rule__XAndExpression__FeatureAssignment_1_0_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10751:2: rule__XAndExpression__FeatureAssignment_1_0_0_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10657:1: ( rule__XAndExpression__FeatureAssignment_1_0_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10657:2: rule__XAndExpression__FeatureAssignment_1_0_0_1
             {
-            pushFollow(FOLLOW_rule__XAndExpression__FeatureAssignment_1_0_0_1_in_rule__XAndExpression__Group_1_0_0__1__Impl22215);
+            pushFollow(FOLLOW_rule__XAndExpression__FeatureAssignment_1_0_0_1_in_rule__XAndExpression__Group_1_0_0__1__Impl22029);
             rule__XAndExpression__FeatureAssignment_1_0_0_1();
 
             state._fsp--;
@@ -32074,21 +31811,21 @@ public final void rule__XAndExpression__Group_1_0_0__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XEqualityExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10765:1: rule__XEqualityExpression__Group__0 : rule__XEqualityExpression__Group__0__Impl rule__XEqualityExpression__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10671:1: rule__XEqualityExpression__Group__0 : rule__XEqualityExpression__Group__0__Impl rule__XEqualityExpression__Group__1 ;
     public final void rule__XEqualityExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10769:1: ( rule__XEqualityExpression__Group__0__Impl rule__XEqualityExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10770:2: rule__XEqualityExpression__Group__0__Impl rule__XEqualityExpression__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10675:1: ( rule__XEqualityExpression__Group__0__Impl rule__XEqualityExpression__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10676:2: rule__XEqualityExpression__Group__0__Impl rule__XEqualityExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group__0__Impl_in_rule__XEqualityExpression__Group__022249);
+            pushFollow(FOLLOW_rule__XEqualityExpression__Group__0__Impl_in_rule__XEqualityExpression__Group__022063);
             rule__XEqualityExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group__1_in_rule__XEqualityExpression__Group__022252);
+            pushFollow(FOLLOW_rule__XEqualityExpression__Group__1_in_rule__XEqualityExpression__Group__022066);
             rule__XEqualityExpression__Group__1();
 
             state._fsp--;
@@ -32112,22 +31849,22 @@ public final void rule__XEqualityExpression__Group__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XEqualityExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10777:1: rule__XEqualityExpression__Group__0__Impl : ( ruleXRelationalExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10683:1: rule__XEqualityExpression__Group__0__Impl : ( ruleXRelationalExpression ) ;
     public final void rule__XEqualityExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10781:1: ( ( ruleXRelationalExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10782:1: ( ruleXRelationalExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10687:1: ( ( ruleXRelationalExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10688:1: ( ruleXRelationalExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10782:1: ( ruleXRelationalExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10783:1: ruleXRelationalExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10688:1: ( ruleXRelationalExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10689:1: ruleXRelationalExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getXRelationalExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleXRelationalExpression_in_rule__XEqualityExpression__Group__0__Impl22279);
+            pushFollow(FOLLOW_ruleXRelationalExpression_in_rule__XEqualityExpression__Group__0__Impl22093);
             ruleXRelationalExpression();
 
             state._fsp--;
@@ -32157,16 +31894,16 @@ public final void rule__XEqualityExpression__Group__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XEqualityExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10794:1: rule__XEqualityExpression__Group__1 : rule__XEqualityExpression__Group__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10700:1: rule__XEqualityExpression__Group__1 : rule__XEqualityExpression__Group__1__Impl ;
     public final void rule__XEqualityExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10798:1: ( rule__XEqualityExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10799:2: rule__XEqualityExpression__Group__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10704:1: ( rule__XEqualityExpression__Group__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10705:2: rule__XEqualityExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group__1__Impl_in_rule__XEqualityExpression__Group__122308);
+            pushFollow(FOLLOW_rule__XEqualityExpression__Group__1__Impl_in_rule__XEqualityExpression__Group__122122);
             rule__XEqualityExpression__Group__1__Impl();
 
             state._fsp--;
@@ -32190,32 +31927,32 @@ public final void rule__XEqualityExpression__Group__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XEqualityExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10805:1: rule__XEqualityExpression__Group__1__Impl : ( ( rule__XEqualityExpression__Group_1__0 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10711:1: rule__XEqualityExpression__Group__1__Impl : ( ( rule__XEqualityExpression__Group_1__0 )* ) ;
     public final void rule__XEqualityExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10809:1: ( ( ( rule__XEqualityExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10810:1: ( ( rule__XEqualityExpression__Group_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10715:1: ( ( ( rule__XEqualityExpression__Group_1__0 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10716:1: ( ( rule__XEqualityExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10810:1: ( ( rule__XEqualityExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10811:1: ( rule__XEqualityExpression__Group_1__0 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10716:1: ( ( rule__XEqualityExpression__Group_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10717:1: ( rule__XEqualityExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10812:1: ( rule__XEqualityExpression__Group_1__0 )*
-            loop98:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10718:1: ( rule__XEqualityExpression__Group_1__0 )*
+            loop97:
             do {
-                int alt98=2;
+                int alt97=2;
                 switch ( input.LA(1) ) {
                 case 41:
                     {
-                    int LA98_2 = input.LA(2);
+                    int LA97_2 = input.LA(2);
 
-                    if ( (synpred164_InternalCheck()) ) {
-                        alt98=1;
+                    if ( (synpred163_InternalCheck()) ) {
+                        alt97=1;
                     }
 
 
@@ -32223,10 +31960,10 @@ public final void rule__XEqualityExpression__Group__1__Impl() throws Recognition
                     break;
                 case 42:
                     {
-                    int LA98_3 = input.LA(2);
+                    int LA97_3 = input.LA(2);
 
-                    if ( (synpred164_InternalCheck()) ) {
-                        alt98=1;
+                    if ( (synpred163_InternalCheck()) ) {
+                        alt97=1;
                     }
 
 
@@ -32234,10 +31971,10 @@ public final void rule__XEqualityExpression__Group__1__Impl() throws Recognition
                     break;
                 case 43:
                     {
-                    int LA98_4 = input.LA(2);
+                    int LA97_4 = input.LA(2);
 
-                    if ( (synpred164_InternalCheck()) ) {
-                        alt98=1;
+                    if ( (synpred163_InternalCheck()) ) {
+                        alt97=1;
                     }
 
 
@@ -32245,10 +31982,10 @@ public final void rule__XEqualityExpression__Group__1__Impl() throws Recognition
                     break;
                 case 44:
                     {
-                    int LA98_5 = input.LA(2);
+                    int LA97_5 = input.LA(2);
 
-                    if ( (synpred164_InternalCheck()) ) {
-                        alt98=1;
+                    if ( (synpred163_InternalCheck()) ) {
+                        alt97=1;
                     }
 
 
@@ -32257,11 +31994,11 @@ public final void rule__XEqualityExpression__Group__1__Impl() throws Recognition
 
                 }
 
-                switch (alt98) {
+                switch (alt97) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10812:2: rule__XEqualityExpression__Group_1__0
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10718:2: rule__XEqualityExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XEqualityExpression__Group_1__0_in_rule__XEqualityExpression__Group__1__Impl22335);
+            	    pushFollow(FOLLOW_rule__XEqualityExpression__Group_1__0_in_rule__XEqualityExpression__Group__1__Impl22149);
             	    rule__XEqualityExpression__Group_1__0();
 
             	    state._fsp--;
@@ -32271,7 +32008,7 @@ public final void rule__XEqualityExpression__Group__1__Impl() throws Recognition
             	    break;
 
             	default :
-            	    break loop98;
+            	    break loop97;
                 }
             } while (true);
 
@@ -32300,21 +32037,21 @@ public final void rule__XEqualityExpression__Group__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10826:1: rule__XEqualityExpression__Group_1__0 : rule__XEqualityExpression__Group_1__0__Impl rule__XEqualityExpression__Group_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10732:1: rule__XEqualityExpression__Group_1__0 : rule__XEqualityExpression__Group_1__0__Impl rule__XEqualityExpression__Group_1__1 ;
     public final void rule__XEqualityExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10830:1: ( rule__XEqualityExpression__Group_1__0__Impl rule__XEqualityExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10831:2: rule__XEqualityExpression__Group_1__0__Impl rule__XEqualityExpression__Group_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10736:1: ( rule__XEqualityExpression__Group_1__0__Impl rule__XEqualityExpression__Group_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10737:2: rule__XEqualityExpression__Group_1__0__Impl rule__XEqualityExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1__0__Impl_in_rule__XEqualityExpression__Group_1__022370);
+            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1__0__Impl_in_rule__XEqualityExpression__Group_1__022184);
             rule__XEqualityExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1__1_in_rule__XEqualityExpression__Group_1__022373);
+            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1__1_in_rule__XEqualityExpression__Group_1__022187);
             rule__XEqualityExpression__Group_1__1();
 
             state._fsp--;
@@ -32338,25 +32075,25 @@ public final void rule__XEqualityExpression__Group_1__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10838:1: rule__XEqualityExpression__Group_1__0__Impl : ( ( rule__XEqualityExpression__Group_1_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10744:1: rule__XEqualityExpression__Group_1__0__Impl : ( ( rule__XEqualityExpression__Group_1_0__0 ) ) ;
     public final void rule__XEqualityExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10842:1: ( ( ( rule__XEqualityExpression__Group_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10843:1: ( ( rule__XEqualityExpression__Group_1_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10748:1: ( ( ( rule__XEqualityExpression__Group_1_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10749:1: ( ( rule__XEqualityExpression__Group_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10843:1: ( ( rule__XEqualityExpression__Group_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10844:1: ( rule__XEqualityExpression__Group_1_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10749:1: ( ( rule__XEqualityExpression__Group_1_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10750:1: ( rule__XEqualityExpression__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getGroup_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10845:1: ( rule__XEqualityExpression__Group_1_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10845:2: rule__XEqualityExpression__Group_1_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10751:1: ( rule__XEqualityExpression__Group_1_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10751:2: rule__XEqualityExpression__Group_1_0__0
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1_0__0_in_rule__XEqualityExpression__Group_1__0__Impl22400);
+            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1_0__0_in_rule__XEqualityExpression__Group_1__0__Impl22214);
             rule__XEqualityExpression__Group_1_0__0();
 
             state._fsp--;
@@ -32389,16 +32126,16 @@ public final void rule__XEqualityExpression__Group_1__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10855:1: rule__XEqualityExpression__Group_1__1 : rule__XEqualityExpression__Group_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10761:1: rule__XEqualityExpression__Group_1__1 : rule__XEqualityExpression__Group_1__1__Impl ;
     public final void rule__XEqualityExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10859:1: ( rule__XEqualityExpression__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10860:2: rule__XEqualityExpression__Group_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10765:1: ( rule__XEqualityExpression__Group_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10766:2: rule__XEqualityExpression__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1__1__Impl_in_rule__XEqualityExpression__Group_1__122430);
+            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1__1__Impl_in_rule__XEqualityExpression__Group_1__122244);
             rule__XEqualityExpression__Group_1__1__Impl();
 
             state._fsp--;
@@ -32422,25 +32159,25 @@ public final void rule__XEqualityExpression__Group_1__1() throws RecognitionExce
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10866:1: rule__XEqualityExpression__Group_1__1__Impl : ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10772:1: rule__XEqualityExpression__Group_1__1__Impl : ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) ) ;
     public final void rule__XEqualityExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10870:1: ( ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10871:1: ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10776:1: ( ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10777:1: ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10871:1: ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10872:1: ( rule__XEqualityExpression__RightOperandAssignment_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10777:1: ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10778:1: ( rule__XEqualityExpression__RightOperandAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getRightOperandAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10873:1: ( rule__XEqualityExpression__RightOperandAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10873:2: rule__XEqualityExpression__RightOperandAssignment_1_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10779:1: ( rule__XEqualityExpression__RightOperandAssignment_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10779:2: rule__XEqualityExpression__RightOperandAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__RightOperandAssignment_1_1_in_rule__XEqualityExpression__Group_1__1__Impl22457);
+            pushFollow(FOLLOW_rule__XEqualityExpression__RightOperandAssignment_1_1_in_rule__XEqualityExpression__Group_1__1__Impl22271);
             rule__XEqualityExpression__RightOperandAssignment_1_1();
 
             state._fsp--;
@@ -32473,16 +32210,16 @@ public final void rule__XEqualityExpression__Group_1__1__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10887:1: rule__XEqualityExpression__Group_1_0__0 : rule__XEqualityExpression__Group_1_0__0__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10793:1: rule__XEqualityExpression__Group_1_0__0 : rule__XEqualityExpression__Group_1_0__0__Impl ;
     public final void rule__XEqualityExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10891:1: ( rule__XEqualityExpression__Group_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10892:2: rule__XEqualityExpression__Group_1_0__0__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10797:1: ( rule__XEqualityExpression__Group_1_0__0__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10798:2: rule__XEqualityExpression__Group_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1_0__0__Impl_in_rule__XEqualityExpression__Group_1_0__022491);
+            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1_0__0__Impl_in_rule__XEqualityExpression__Group_1_0__022305);
             rule__XEqualityExpression__Group_1_0__0__Impl();
 
             state._fsp--;
@@ -32506,25 +32243,25 @@ public final void rule__XEqualityExpression__Group_1_0__0() throws RecognitionEx
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10898:1: rule__XEqualityExpression__Group_1_0__0__Impl : ( ( rule__XEqualityExpression__Group_1_0_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10804:1: rule__XEqualityExpression__Group_1_0__0__Impl : ( ( rule__XEqualityExpression__Group_1_0_0__0 ) ) ;
     public final void rule__XEqualityExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10902:1: ( ( ( rule__XEqualityExpression__Group_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10903:1: ( ( rule__XEqualityExpression__Group_1_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10808:1: ( ( ( rule__XEqualityExpression__Group_1_0_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10809:1: ( ( rule__XEqualityExpression__Group_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10903:1: ( ( rule__XEqualityExpression__Group_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10904:1: ( rule__XEqualityExpression__Group_1_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10809:1: ( ( rule__XEqualityExpression__Group_1_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10810:1: ( rule__XEqualityExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getGroup_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10905:1: ( rule__XEqualityExpression__Group_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10905:2: rule__XEqualityExpression__Group_1_0_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10811:1: ( rule__XEqualityExpression__Group_1_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10811:2: rule__XEqualityExpression__Group_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1_0_0__0_in_rule__XEqualityExpression__Group_1_0__0__Impl22518);
+            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1_0_0__0_in_rule__XEqualityExpression__Group_1_0__0__Impl22332);
             rule__XEqualityExpression__Group_1_0_0__0();
 
             state._fsp--;
@@ -32557,21 +32294,21 @@ public final void rule__XEqualityExpression__Group_1_0__0__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10917:1: rule__XEqualityExpression__Group_1_0_0__0 : rule__XEqualityExpression__Group_1_0_0__0__Impl rule__XEqualityExpression__Group_1_0_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10823:1: rule__XEqualityExpression__Group_1_0_0__0 : rule__XEqualityExpression__Group_1_0_0__0__Impl rule__XEqualityExpression__Group_1_0_0__1 ;
     public final void rule__XEqualityExpression__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10921:1: ( rule__XEqualityExpression__Group_1_0_0__0__Impl rule__XEqualityExpression__Group_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10922:2: rule__XEqualityExpression__Group_1_0_0__0__Impl rule__XEqualityExpression__Group_1_0_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10827:1: ( rule__XEqualityExpression__Group_1_0_0__0__Impl rule__XEqualityExpression__Group_1_0_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10828:2: rule__XEqualityExpression__Group_1_0_0__0__Impl rule__XEqualityExpression__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1_0_0__0__Impl_in_rule__XEqualityExpression__Group_1_0_0__022550);
+            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1_0_0__0__Impl_in_rule__XEqualityExpression__Group_1_0_0__022364);
             rule__XEqualityExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1_0_0__1_in_rule__XEqualityExpression__Group_1_0_0__022553);
+            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1_0_0__1_in_rule__XEqualityExpression__Group_1_0_0__022367);
             rule__XEqualityExpression__Group_1_0_0__1();
 
             state._fsp--;
@@ -32595,23 +32332,23 @@ public final void rule__XEqualityExpression__Group_1_0_0__0() throws Recognition
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10929:1: rule__XEqualityExpression__Group_1_0_0__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10835:1: rule__XEqualityExpression__Group_1_0_0__0__Impl : ( () ) ;
     public final void rule__XEqualityExpression__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10933:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10934:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10839:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10840:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10934:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10935:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10840:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10841:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10936:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10938:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10842:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10844:1: 
             {
             }
 
@@ -32636,16 +32373,16 @@ public final void rule__XEqualityExpression__Group_1_0_0__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10948:1: rule__XEqualityExpression__Group_1_0_0__1 : rule__XEqualityExpression__Group_1_0_0__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10854:1: rule__XEqualityExpression__Group_1_0_0__1 : rule__XEqualityExpression__Group_1_0_0__1__Impl ;
     public final void rule__XEqualityExpression__Group_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10952:1: ( rule__XEqualityExpression__Group_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10953:2: rule__XEqualityExpression__Group_1_0_0__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10858:1: ( rule__XEqualityExpression__Group_1_0_0__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10859:2: rule__XEqualityExpression__Group_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1_0_0__1__Impl_in_rule__XEqualityExpression__Group_1_0_0__122611);
+            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1_0_0__1__Impl_in_rule__XEqualityExpression__Group_1_0_0__122425);
             rule__XEqualityExpression__Group_1_0_0__1__Impl();
 
             state._fsp--;
@@ -32669,25 +32406,25 @@ public final void rule__XEqualityExpression__Group_1_0_0__1() throws Recognition
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10959:1: rule__XEqualityExpression__Group_1_0_0__1__Impl : ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10865:1: rule__XEqualityExpression__Group_1_0_0__1__Impl : ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) ) ;
     public final void rule__XEqualityExpression__Group_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10963:1: ( ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10964:1: ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10869:1: ( ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10870:1: ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10964:1: ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10965:1: ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10870:1: ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10871:1: ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getFeatureAssignment_1_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10966:1: ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10966:2: rule__XEqualityExpression__FeatureAssignment_1_0_0_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10872:1: ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10872:2: rule__XEqualityExpression__FeatureAssignment_1_0_0_1
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__FeatureAssignment_1_0_0_1_in_rule__XEqualityExpression__Group_1_0_0__1__Impl22638);
+            pushFollow(FOLLOW_rule__XEqualityExpression__FeatureAssignment_1_0_0_1_in_rule__XEqualityExpression__Group_1_0_0__1__Impl22452);
             rule__XEqualityExpression__FeatureAssignment_1_0_0_1();
 
             state._fsp--;
@@ -32720,21 +32457,21 @@ public final void rule__XEqualityExpression__Group_1_0_0__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__XRelationalExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10980:1: rule__XRelationalExpression__Group__0 : rule__XRelationalExpression__Group__0__Impl rule__XRelationalExpression__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10886:1: rule__XRelationalExpression__Group__0 : rule__XRelationalExpression__Group__0__Impl rule__XRelationalExpression__Group__1 ;
     public final void rule__XRelationalExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10984:1: ( rule__XRelationalExpression__Group__0__Impl rule__XRelationalExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10985:2: rule__XRelationalExpression__Group__0__Impl rule__XRelationalExpression__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10890:1: ( rule__XRelationalExpression__Group__0__Impl rule__XRelationalExpression__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10891:2: rule__XRelationalExpression__Group__0__Impl rule__XRelationalExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group__0__Impl_in_rule__XRelationalExpression__Group__022672);
+            pushFollow(FOLLOW_rule__XRelationalExpression__Group__0__Impl_in_rule__XRelationalExpression__Group__022486);
             rule__XRelationalExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group__1_in_rule__XRelationalExpression__Group__022675);
+            pushFollow(FOLLOW_rule__XRelationalExpression__Group__1_in_rule__XRelationalExpression__Group__022489);
             rule__XRelationalExpression__Group__1();
 
             state._fsp--;
@@ -32758,22 +32495,22 @@ public final void rule__XRelationalExpression__Group__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__XRelationalExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10992:1: rule__XRelationalExpression__Group__0__Impl : ( ruleXOtherOperatorExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10898:1: rule__XRelationalExpression__Group__0__Impl : ( ruleXOtherOperatorExpression ) ;
     public final void rule__XRelationalExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10996:1: ( ( ruleXOtherOperatorExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10997:1: ( ruleXOtherOperatorExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10902:1: ( ( ruleXOtherOperatorExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10903:1: ( ruleXOtherOperatorExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10997:1: ( ruleXOtherOperatorExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10998:1: ruleXOtherOperatorExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10903:1: ( ruleXOtherOperatorExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10904:1: ruleXOtherOperatorExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getXOtherOperatorExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleXOtherOperatorExpression_in_rule__XRelationalExpression__Group__0__Impl22702);
+            pushFollow(FOLLOW_ruleXOtherOperatorExpression_in_rule__XRelationalExpression__Group__0__Impl22516);
             ruleXOtherOperatorExpression();
 
             state._fsp--;
@@ -32803,16 +32540,16 @@ public final void rule__XRelationalExpression__Group__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XRelationalExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11009:1: rule__XRelationalExpression__Group__1 : rule__XRelationalExpression__Group__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10915:1: rule__XRelationalExpression__Group__1 : rule__XRelationalExpression__Group__1__Impl ;
     public final void rule__XRelationalExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11013:1: ( rule__XRelationalExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11014:2: rule__XRelationalExpression__Group__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10919:1: ( rule__XRelationalExpression__Group__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10920:2: rule__XRelationalExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group__1__Impl_in_rule__XRelationalExpression__Group__122731);
+            pushFollow(FOLLOW_rule__XRelationalExpression__Group__1__Impl_in_rule__XRelationalExpression__Group__122545);
             rule__XRelationalExpression__Group__1__Impl();
 
             state._fsp--;
@@ -32836,32 +32573,32 @@ public final void rule__XRelationalExpression__Group__1() throws RecognitionExce
 
 
     // $ANTLR start "rule__XRelationalExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11020:1: rule__XRelationalExpression__Group__1__Impl : ( ( rule__XRelationalExpression__Alternatives_1 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10926:1: rule__XRelationalExpression__Group__1__Impl : ( ( rule__XRelationalExpression__Alternatives_1 )* ) ;
     public final void rule__XRelationalExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11024:1: ( ( ( rule__XRelationalExpression__Alternatives_1 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11025:1: ( ( rule__XRelationalExpression__Alternatives_1 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10930:1: ( ( ( rule__XRelationalExpression__Alternatives_1 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10931:1: ( ( rule__XRelationalExpression__Alternatives_1 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11025:1: ( ( rule__XRelationalExpression__Alternatives_1 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11026:1: ( rule__XRelationalExpression__Alternatives_1 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10931:1: ( ( rule__XRelationalExpression__Alternatives_1 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10932:1: ( rule__XRelationalExpression__Alternatives_1 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getAlternatives_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11027:1: ( rule__XRelationalExpression__Alternatives_1 )*
-            loop99:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10933:1: ( rule__XRelationalExpression__Alternatives_1 )*
+            loop98:
             do {
-                int alt99=2;
+                int alt98=2;
                 switch ( input.LA(1) ) {
                 case 47:
                     {
-                    int LA99_2 = input.LA(2);
+                    int LA98_2 = input.LA(2);
 
-                    if ( (synpred165_InternalCheck()) ) {
-                        alt99=1;
+                    if ( (synpred164_InternalCheck()) ) {
+                        alt98=1;
                     }
 
 
@@ -32869,10 +32606,10 @@ public final void rule__XRelationalExpression__Group__1__Impl() throws Recogniti
                     break;
                 case 46:
                     {
-                    int LA99_3 = input.LA(2);
+                    int LA98_3 = input.LA(2);
 
-                    if ( (synpred165_InternalCheck()) ) {
-                        alt99=1;
+                    if ( (synpred164_InternalCheck()) ) {
+                        alt98=1;
                     }
 
 
@@ -32880,10 +32617,10 @@ public final void rule__XRelationalExpression__Group__1__Impl() throws Recogniti
                     break;
                 case 82:
                     {
-                    int LA99_4 = input.LA(2);
+                    int LA98_4 = input.LA(2);
 
-                    if ( (synpred165_InternalCheck()) ) {
-                        alt99=1;
+                    if ( (synpred164_InternalCheck()) ) {
+                        alt98=1;
                     }
 
 
@@ -32891,10 +32628,10 @@ public final void rule__XRelationalExpression__Group__1__Impl() throws Recogniti
                     break;
                 case 45:
                     {
-                    int LA99_5 = input.LA(2);
+                    int LA98_5 = input.LA(2);
 
-                    if ( (synpred165_InternalCheck()) ) {
-                        alt99=1;
+                    if ( (synpred164_InternalCheck()) ) {
+                        alt98=1;
                     }
 
 
@@ -32903,11 +32640,11 @@ public final void rule__XRelationalExpression__Group__1__Impl() throws Recogniti
 
                 }
 
-                switch (alt99) {
+                switch (alt98) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11027:2: rule__XRelationalExpression__Alternatives_1
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10933:2: rule__XRelationalExpression__Alternatives_1
             	    {
-            	    pushFollow(FOLLOW_rule__XRelationalExpression__Alternatives_1_in_rule__XRelationalExpression__Group__1__Impl22758);
+            	    pushFollow(FOLLOW_rule__XRelationalExpression__Alternatives_1_in_rule__XRelationalExpression__Group__1__Impl22572);
             	    rule__XRelationalExpression__Alternatives_1();
 
             	    state._fsp--;
@@ -32917,7 +32654,7 @@ public final void rule__XRelationalExpression__Group__1__Impl() throws Recogniti
             	    break;
 
             	default :
-            	    break loop99;
+            	    break loop98;
                 }
             } while (true);
 
@@ -32946,21 +32683,21 @@ public final void rule__XRelationalExpression__Group__1__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11041:1: rule__XRelationalExpression__Group_1_0__0 : rule__XRelationalExpression__Group_1_0__0__Impl rule__XRelationalExpression__Group_1_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10947:1: rule__XRelationalExpression__Group_1_0__0 : rule__XRelationalExpression__Group_1_0__0__Impl rule__XRelationalExpression__Group_1_0__1 ;
     public final void rule__XRelationalExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11045:1: ( rule__XRelationalExpression__Group_1_0__0__Impl rule__XRelationalExpression__Group_1_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11046:2: rule__XRelationalExpression__Group_1_0__0__Impl rule__XRelationalExpression__Group_1_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10951:1: ( rule__XRelationalExpression__Group_1_0__0__Impl rule__XRelationalExpression__Group_1_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10952:2: rule__XRelationalExpression__Group_1_0__0__Impl rule__XRelationalExpression__Group_1_0__1
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0__0__Impl_in_rule__XRelationalExpression__Group_1_0__022793);
+            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0__0__Impl_in_rule__XRelationalExpression__Group_1_0__022607);
             rule__XRelationalExpression__Group_1_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0__1_in_rule__XRelationalExpression__Group_1_0__022796);
+            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0__1_in_rule__XRelationalExpression__Group_1_0__022610);
             rule__XRelationalExpression__Group_1_0__1();
 
             state._fsp--;
@@ -32984,25 +32721,25 @@ public final void rule__XRelationalExpression__Group_1_0__0() throws Recognition
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11053:1: rule__XRelationalExpression__Group_1_0__0__Impl : ( ( rule__XRelationalExpression__Group_1_0_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10959:1: rule__XRelationalExpression__Group_1_0__0__Impl : ( ( rule__XRelationalExpression__Group_1_0_0__0 ) ) ;
     public final void rule__XRelationalExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11057:1: ( ( ( rule__XRelationalExpression__Group_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11058:1: ( ( rule__XRelationalExpression__Group_1_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10963:1: ( ( ( rule__XRelationalExpression__Group_1_0_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10964:1: ( ( rule__XRelationalExpression__Group_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11058:1: ( ( rule__XRelationalExpression__Group_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11059:1: ( rule__XRelationalExpression__Group_1_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10964:1: ( ( rule__XRelationalExpression__Group_1_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10965:1: ( rule__XRelationalExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getGroup_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11060:1: ( rule__XRelationalExpression__Group_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11060:2: rule__XRelationalExpression__Group_1_0_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10966:1: ( rule__XRelationalExpression__Group_1_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10966:2: rule__XRelationalExpression__Group_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0_0__0_in_rule__XRelationalExpression__Group_1_0__0__Impl22823);
+            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0_0__0_in_rule__XRelationalExpression__Group_1_0__0__Impl22637);
             rule__XRelationalExpression__Group_1_0_0__0();
 
             state._fsp--;
@@ -33035,16 +32772,16 @@ public final void rule__XRelationalExpression__Group_1_0__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11070:1: rule__XRelationalExpression__Group_1_0__1 : rule__XRelationalExpression__Group_1_0__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10976:1: rule__XRelationalExpression__Group_1_0__1 : rule__XRelationalExpression__Group_1_0__1__Impl ;
     public final void rule__XRelationalExpression__Group_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11074:1: ( rule__XRelationalExpression__Group_1_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11075:2: rule__XRelationalExpression__Group_1_0__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10980:1: ( rule__XRelationalExpression__Group_1_0__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10981:2: rule__XRelationalExpression__Group_1_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0__1__Impl_in_rule__XRelationalExpression__Group_1_0__122853);
+            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0__1__Impl_in_rule__XRelationalExpression__Group_1_0__122667);
             rule__XRelationalExpression__Group_1_0__1__Impl();
 
             state._fsp--;
@@ -33068,25 +32805,25 @@ public final void rule__XRelationalExpression__Group_1_0__1() throws Recognition
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11081:1: rule__XRelationalExpression__Group_1_0__1__Impl : ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10987:1: rule__XRelationalExpression__Group_1_0__1__Impl : ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) ) ;
     public final void rule__XRelationalExpression__Group_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11085:1: ( ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11086:1: ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10991:1: ( ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10992:1: ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11086:1: ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11087:1: ( rule__XRelationalExpression__TypeAssignment_1_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10992:1: ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10993:1: ( rule__XRelationalExpression__TypeAssignment_1_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getTypeAssignment_1_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11088:1: ( rule__XRelationalExpression__TypeAssignment_1_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11088:2: rule__XRelationalExpression__TypeAssignment_1_0_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10994:1: ( rule__XRelationalExpression__TypeAssignment_1_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10994:2: rule__XRelationalExpression__TypeAssignment_1_0_1
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__TypeAssignment_1_0_1_in_rule__XRelationalExpression__Group_1_0__1__Impl22880);
+            pushFollow(FOLLOW_rule__XRelationalExpression__TypeAssignment_1_0_1_in_rule__XRelationalExpression__Group_1_0__1__Impl22694);
             rule__XRelationalExpression__TypeAssignment_1_0_1();
 
             state._fsp--;
@@ -33119,16 +32856,16 @@ public final void rule__XRelationalExpression__Group_1_0__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11102:1: rule__XRelationalExpression__Group_1_0_0__0 : rule__XRelationalExpression__Group_1_0_0__0__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11008:1: rule__XRelationalExpression__Group_1_0_0__0 : rule__XRelationalExpression__Group_1_0_0__0__Impl ;
     public final void rule__XRelationalExpression__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11106:1: ( rule__XRelationalExpression__Group_1_0_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11107:2: rule__XRelationalExpression__Group_1_0_0__0__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11012:1: ( rule__XRelationalExpression__Group_1_0_0__0__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11013:2: rule__XRelationalExpression__Group_1_0_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0_0__0__Impl_in_rule__XRelationalExpression__Group_1_0_0__022914);
+            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0_0__0__Impl_in_rule__XRelationalExpression__Group_1_0_0__022728);
             rule__XRelationalExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
@@ -33152,25 +32889,25 @@ public final void rule__XRelationalExpression__Group_1_0_0__0() throws Recogniti
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11113:1: rule__XRelationalExpression__Group_1_0_0__0__Impl : ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11019:1: rule__XRelationalExpression__Group_1_0_0__0__Impl : ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) ) ;
     public final void rule__XRelationalExpression__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11117:1: ( ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11118:1: ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11023:1: ( ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11024:1: ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11118:1: ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11119:1: ( rule__XRelationalExpression__Group_1_0_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11024:1: ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11025:1: ( rule__XRelationalExpression__Group_1_0_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getGroup_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11120:1: ( rule__XRelationalExpression__Group_1_0_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11120:2: rule__XRelationalExpression__Group_1_0_0_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11026:1: ( rule__XRelationalExpression__Group_1_0_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11026:2: rule__XRelationalExpression__Group_1_0_0_0__0
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0_0_0__0_in_rule__XRelationalExpression__Group_1_0_0__0__Impl22941);
+            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0_0_0__0_in_rule__XRelationalExpression__Group_1_0_0__0__Impl22755);
             rule__XRelationalExpression__Group_1_0_0_0__0();
 
             state._fsp--;
@@ -33203,21 +32940,21 @@ public final void rule__XRelationalExpression__Group_1_0_0__0__Impl() throws Rec
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11132:1: rule__XRelationalExpression__Group_1_0_0_0__0 : rule__XRelationalExpression__Group_1_0_0_0__0__Impl rule__XRelationalExpression__Group_1_0_0_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11038:1: rule__XRelationalExpression__Group_1_0_0_0__0 : rule__XRelationalExpression__Group_1_0_0_0__0__Impl rule__XRelationalExpression__Group_1_0_0_0__1 ;
     public final void rule__XRelationalExpression__Group_1_0_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11136:1: ( rule__XRelationalExpression__Group_1_0_0_0__0__Impl rule__XRelationalExpression__Group_1_0_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11137:2: rule__XRelationalExpression__Group_1_0_0_0__0__Impl rule__XRelationalExpression__Group_1_0_0_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11042:1: ( rule__XRelationalExpression__Group_1_0_0_0__0__Impl rule__XRelationalExpression__Group_1_0_0_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11043:2: rule__XRelationalExpression__Group_1_0_0_0__0__Impl rule__XRelationalExpression__Group_1_0_0_0__1
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0_0_0__0__Impl_in_rule__XRelationalExpression__Group_1_0_0_0__022973);
+            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0_0_0__0__Impl_in_rule__XRelationalExpression__Group_1_0_0_0__022787);
             rule__XRelationalExpression__Group_1_0_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0_0_0__1_in_rule__XRelationalExpression__Group_1_0_0_0__022976);
+            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0_0_0__1_in_rule__XRelationalExpression__Group_1_0_0_0__022790);
             rule__XRelationalExpression__Group_1_0_0_0__1();
 
             state._fsp--;
@@ -33241,23 +32978,23 @@ public final void rule__XRelationalExpression__Group_1_0_0_0__0() throws Recogni
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11144:1: rule__XRelationalExpression__Group_1_0_0_0__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11050:1: rule__XRelationalExpression__Group_1_0_0_0__0__Impl : ( () ) ;
     public final void rule__XRelationalExpression__Group_1_0_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11148:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11149:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11054:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11055:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11149:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11150:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11055:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11056:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getXInstanceOfExpressionExpressionAction_1_0_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11151:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11153:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11057:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11059:1: 
             {
             }
 
@@ -33282,16 +33019,16 @@ public final void rule__XRelationalExpression__Group_1_0_0_0__0__Impl() throws R
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11163:1: rule__XRelationalExpression__Group_1_0_0_0__1 : rule__XRelationalExpression__Group_1_0_0_0__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11069:1: rule__XRelationalExpression__Group_1_0_0_0__1 : rule__XRelationalExpression__Group_1_0_0_0__1__Impl ;
     public final void rule__XRelationalExpression__Group_1_0_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11167:1: ( rule__XRelationalExpression__Group_1_0_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11168:2: rule__XRelationalExpression__Group_1_0_0_0__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11073:1: ( rule__XRelationalExpression__Group_1_0_0_0__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11074:2: rule__XRelationalExpression__Group_1_0_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0_0_0__1__Impl_in_rule__XRelationalExpression__Group_1_0_0_0__123034);
+            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0_0_0__1__Impl_in_rule__XRelationalExpression__Group_1_0_0_0__122848);
             rule__XRelationalExpression__Group_1_0_0_0__1__Impl();
 
             state._fsp--;
@@ -33315,22 +33052,22 @@ public final void rule__XRelationalExpression__Group_1_0_0_0__1() throws Recogni
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11174:1: rule__XRelationalExpression__Group_1_0_0_0__1__Impl : ( 'instanceof' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11080:1: rule__XRelationalExpression__Group_1_0_0_0__1__Impl : ( 'instanceof' ) ;
     public final void rule__XRelationalExpression__Group_1_0_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11178:1: ( ( 'instanceof' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11179:1: ( 'instanceof' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11084:1: ( ( 'instanceof' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11085:1: ( 'instanceof' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11179:1: ( 'instanceof' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11180:1: 'instanceof'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11085:1: ( 'instanceof' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11086:1: 'instanceof'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getInstanceofKeyword_1_0_0_0_1()); 
             }
-            match(input,82,FOLLOW_82_in_rule__XRelationalExpression__Group_1_0_0_0__1__Impl23062); if (state.failed) return ;
+            match(input,82,FOLLOW_82_in_rule__XRelationalExpression__Group_1_0_0_0__1__Impl22876); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXRelationalExpressionAccess().getInstanceofKeyword_1_0_0_0_1()); 
             }
@@ -33356,21 +33093,21 @@ public final void rule__XRelationalExpression__Group_1_0_0_0__1__Impl() throws R
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11197:1: rule__XRelationalExpression__Group_1_1__0 : rule__XRelationalExpression__Group_1_1__0__Impl rule__XRelationalExpression__Group_1_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11103:1: rule__XRelationalExpression__Group_1_1__0 : rule__XRelationalExpression__Group_1_1__0__Impl rule__XRelationalExpression__Group_1_1__1 ;
     public final void rule__XRelationalExpression__Group_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11201:1: ( rule__XRelationalExpression__Group_1_1__0__Impl rule__XRelationalExpression__Group_1_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11202:2: rule__XRelationalExpression__Group_1_1__0__Impl rule__XRelationalExpression__Group_1_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11107:1: ( rule__XRelationalExpression__Group_1_1__0__Impl rule__XRelationalExpression__Group_1_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11108:2: rule__XRelationalExpression__Group_1_1__0__Impl rule__XRelationalExpression__Group_1_1__1
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1__0__Impl_in_rule__XRelationalExpression__Group_1_1__023097);
+            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1__0__Impl_in_rule__XRelationalExpression__Group_1_1__022911);
             rule__XRelationalExpression__Group_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1__1_in_rule__XRelationalExpression__Group_1_1__023100);
+            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1__1_in_rule__XRelationalExpression__Group_1_1__022914);
             rule__XRelationalExpression__Group_1_1__1();
 
             state._fsp--;
@@ -33394,25 +33131,25 @@ public final void rule__XRelationalExpression__Group_1_1__0() throws Recognition
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11209:1: rule__XRelationalExpression__Group_1_1__0__Impl : ( ( rule__XRelationalExpression__Group_1_1_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11115:1: rule__XRelationalExpression__Group_1_1__0__Impl : ( ( rule__XRelationalExpression__Group_1_1_0__0 ) ) ;
     public final void rule__XRelationalExpression__Group_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11213:1: ( ( ( rule__XRelationalExpression__Group_1_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11214:1: ( ( rule__XRelationalExpression__Group_1_1_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11119:1: ( ( ( rule__XRelationalExpression__Group_1_1_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11120:1: ( ( rule__XRelationalExpression__Group_1_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11214:1: ( ( rule__XRelationalExpression__Group_1_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11215:1: ( rule__XRelationalExpression__Group_1_1_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11120:1: ( ( rule__XRelationalExpression__Group_1_1_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11121:1: ( rule__XRelationalExpression__Group_1_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getGroup_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11216:1: ( rule__XRelationalExpression__Group_1_1_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11216:2: rule__XRelationalExpression__Group_1_1_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11122:1: ( rule__XRelationalExpression__Group_1_1_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11122:2: rule__XRelationalExpression__Group_1_1_0__0
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1_0__0_in_rule__XRelationalExpression__Group_1_1__0__Impl23127);
+            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1_0__0_in_rule__XRelationalExpression__Group_1_1__0__Impl22941);
             rule__XRelationalExpression__Group_1_1_0__0();
 
             state._fsp--;
@@ -33445,16 +33182,16 @@ public final void rule__XRelationalExpression__Group_1_1__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11226:1: rule__XRelationalExpression__Group_1_1__1 : rule__XRelationalExpression__Group_1_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11132:1: rule__XRelationalExpression__Group_1_1__1 : rule__XRelationalExpression__Group_1_1__1__Impl ;
     public final void rule__XRelationalExpression__Group_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11230:1: ( rule__XRelationalExpression__Group_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11231:2: rule__XRelationalExpression__Group_1_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11136:1: ( rule__XRelationalExpression__Group_1_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11137:2: rule__XRelationalExpression__Group_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1__1__Impl_in_rule__XRelationalExpression__Group_1_1__123157);
+            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1__1__Impl_in_rule__XRelationalExpression__Group_1_1__122971);
             rule__XRelationalExpression__Group_1_1__1__Impl();
 
             state._fsp--;
@@ -33478,25 +33215,25 @@ public final void rule__XRelationalExpression__Group_1_1__1() throws Recognition
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11237:1: rule__XRelationalExpression__Group_1_1__1__Impl : ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11143:1: rule__XRelationalExpression__Group_1_1__1__Impl : ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) ) ;
     public final void rule__XRelationalExpression__Group_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11241:1: ( ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11242:1: ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11147:1: ( ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11148:1: ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11242:1: ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11243:1: ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11148:1: ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11149:1: ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getRightOperandAssignment_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11244:1: ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11244:2: rule__XRelationalExpression__RightOperandAssignment_1_1_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11150:1: ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11150:2: rule__XRelationalExpression__RightOperandAssignment_1_1_1
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__RightOperandAssignment_1_1_1_in_rule__XRelationalExpression__Group_1_1__1__Impl23184);
+            pushFollow(FOLLOW_rule__XRelationalExpression__RightOperandAssignment_1_1_1_in_rule__XRelationalExpression__Group_1_1__1__Impl22998);
             rule__XRelationalExpression__RightOperandAssignment_1_1_1();
 
             state._fsp--;
@@ -33529,16 +33266,16 @@ public final void rule__XRelationalExpression__Group_1_1__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11258:1: rule__XRelationalExpression__Group_1_1_0__0 : rule__XRelationalExpression__Group_1_1_0__0__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11164:1: rule__XRelationalExpression__Group_1_1_0__0 : rule__XRelationalExpression__Group_1_1_0__0__Impl ;
     public final void rule__XRelationalExpression__Group_1_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11262:1: ( rule__XRelationalExpression__Group_1_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11263:2: rule__XRelationalExpression__Group_1_1_0__0__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11168:1: ( rule__XRelationalExpression__Group_1_1_0__0__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11169:2: rule__XRelationalExpression__Group_1_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1_0__0__Impl_in_rule__XRelationalExpression__Group_1_1_0__023218);
+            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1_0__0__Impl_in_rule__XRelationalExpression__Group_1_1_0__023032);
             rule__XRelationalExpression__Group_1_1_0__0__Impl();
 
             state._fsp--;
@@ -33562,25 +33299,25 @@ public final void rule__XRelationalExpression__Group_1_1_0__0() throws Recogniti
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11269:1: rule__XRelationalExpression__Group_1_1_0__0__Impl : ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11175:1: rule__XRelationalExpression__Group_1_1_0__0__Impl : ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) ) ;
     public final void rule__XRelationalExpression__Group_1_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11273:1: ( ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11274:1: ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11179:1: ( ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11180:1: ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11274:1: ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11275:1: ( rule__XRelationalExpression__Group_1_1_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11180:1: ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11181:1: ( rule__XRelationalExpression__Group_1_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getGroup_1_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11276:1: ( rule__XRelationalExpression__Group_1_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11276:2: rule__XRelationalExpression__Group_1_1_0_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11182:1: ( rule__XRelationalExpression__Group_1_1_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11182:2: rule__XRelationalExpression__Group_1_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1_0_0__0_in_rule__XRelationalExpression__Group_1_1_0__0__Impl23245);
+            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1_0_0__0_in_rule__XRelationalExpression__Group_1_1_0__0__Impl23059);
             rule__XRelationalExpression__Group_1_1_0_0__0();
 
             state._fsp--;
@@ -33613,21 +33350,21 @@ public final void rule__XRelationalExpression__Group_1_1_0__0__Impl() throws Rec
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11288:1: rule__XRelationalExpression__Group_1_1_0_0__0 : rule__XRelationalExpression__Group_1_1_0_0__0__Impl rule__XRelationalExpression__Group_1_1_0_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11194:1: rule__XRelationalExpression__Group_1_1_0_0__0 : rule__XRelationalExpression__Group_1_1_0_0__0__Impl rule__XRelationalExpression__Group_1_1_0_0__1 ;
     public final void rule__XRelationalExpression__Group_1_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11292:1: ( rule__XRelationalExpression__Group_1_1_0_0__0__Impl rule__XRelationalExpression__Group_1_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11293:2: rule__XRelationalExpression__Group_1_1_0_0__0__Impl rule__XRelationalExpression__Group_1_1_0_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11198:1: ( rule__XRelationalExpression__Group_1_1_0_0__0__Impl rule__XRelationalExpression__Group_1_1_0_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11199:2: rule__XRelationalExpression__Group_1_1_0_0__0__Impl rule__XRelationalExpression__Group_1_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1_0_0__0__Impl_in_rule__XRelationalExpression__Group_1_1_0_0__023277);
+            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1_0_0__0__Impl_in_rule__XRelationalExpression__Group_1_1_0_0__023091);
             rule__XRelationalExpression__Group_1_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1_0_0__1_in_rule__XRelationalExpression__Group_1_1_0_0__023280);
+            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1_0_0__1_in_rule__XRelationalExpression__Group_1_1_0_0__023094);
             rule__XRelationalExpression__Group_1_1_0_0__1();
 
             state._fsp--;
@@ -33651,23 +33388,23 @@ public final void rule__XRelationalExpression__Group_1_1_0_0__0() throws Recogni
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11300:1: rule__XRelationalExpression__Group_1_1_0_0__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11206:1: rule__XRelationalExpression__Group_1_1_0_0__0__Impl : ( () ) ;
     public final void rule__XRelationalExpression__Group_1_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11304:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11305:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11210:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11211:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11305:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11306:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11211:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11212:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11307:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11309:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11213:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11215:1: 
             {
             }
 
@@ -33692,16 +33429,16 @@ public final void rule__XRelationalExpression__Group_1_1_0_0__0__Impl() throws R
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11319:1: rule__XRelationalExpression__Group_1_1_0_0__1 : rule__XRelationalExpression__Group_1_1_0_0__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11225:1: rule__XRelationalExpression__Group_1_1_0_0__1 : rule__XRelationalExpression__Group_1_1_0_0__1__Impl ;
     public final void rule__XRelationalExpression__Group_1_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11323:1: ( rule__XRelationalExpression__Group_1_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11324:2: rule__XRelationalExpression__Group_1_1_0_0__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11229:1: ( rule__XRelationalExpression__Group_1_1_0_0__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11230:2: rule__XRelationalExpression__Group_1_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1_0_0__1__Impl_in_rule__XRelationalExpression__Group_1_1_0_0__123338);
+            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1_0_0__1__Impl_in_rule__XRelationalExpression__Group_1_1_0_0__123152);
             rule__XRelationalExpression__Group_1_1_0_0__1__Impl();
 
             state._fsp--;
@@ -33725,25 +33462,25 @@ public final void rule__XRelationalExpression__Group_1_1_0_0__1() throws Recogni
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11330:1: rule__XRelationalExpression__Group_1_1_0_0__1__Impl : ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11236:1: rule__XRelationalExpression__Group_1_1_0_0__1__Impl : ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) ) ;
     public final void rule__XRelationalExpression__Group_1_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11334:1: ( ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11335:1: ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11240:1: ( ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11241:1: ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11335:1: ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11336:1: ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11241:1: ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11242:1: ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getFeatureAssignment_1_1_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11337:1: ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11337:2: rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11243:1: ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11243:2: rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1_in_rule__XRelationalExpression__Group_1_1_0_0__1__Impl23365);
+            pushFollow(FOLLOW_rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1_in_rule__XRelationalExpression__Group_1_1_0_0__1__Impl23179);
             rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1();
 
             state._fsp--;
@@ -33776,21 +33513,21 @@ public final void rule__XRelationalExpression__Group_1_1_0_0__1__Impl() throws R
 
 
     // $ANTLR start "rule__OpCompare__Group_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11351:1: rule__OpCompare__Group_1__0 : rule__OpCompare__Group_1__0__Impl rule__OpCompare__Group_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11257:1: rule__OpCompare__Group_1__0 : rule__OpCompare__Group_1__0__Impl rule__OpCompare__Group_1__1 ;
     public final void rule__OpCompare__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11355:1: ( rule__OpCompare__Group_1__0__Impl rule__OpCompare__Group_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11356:2: rule__OpCompare__Group_1__0__Impl rule__OpCompare__Group_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11261:1: ( rule__OpCompare__Group_1__0__Impl rule__OpCompare__Group_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11262:2: rule__OpCompare__Group_1__0__Impl rule__OpCompare__Group_1__1
             {
-            pushFollow(FOLLOW_rule__OpCompare__Group_1__0__Impl_in_rule__OpCompare__Group_1__023399);
+            pushFollow(FOLLOW_rule__OpCompare__Group_1__0__Impl_in_rule__OpCompare__Group_1__023213);
             rule__OpCompare__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OpCompare__Group_1__1_in_rule__OpCompare__Group_1__023402);
+            pushFollow(FOLLOW_rule__OpCompare__Group_1__1_in_rule__OpCompare__Group_1__023216);
             rule__OpCompare__Group_1__1();
 
             state._fsp--;
@@ -33814,22 +33551,22 @@ public final void rule__OpCompare__Group_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpCompare__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11363:1: rule__OpCompare__Group_1__0__Impl : ( '<' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11269:1: rule__OpCompare__Group_1__0__Impl : ( '<' ) ;
     public final void rule__OpCompare__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11367:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11368:1: ( '<' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11273:1: ( ( '<' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11274:1: ( '<' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11368:1: ( '<' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11369:1: '<'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11274:1: ( '<' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11275:1: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpCompareAccess().getLessThanSignKeyword_1_0()); 
             }
-            match(input,47,FOLLOW_47_in_rule__OpCompare__Group_1__0__Impl23430); if (state.failed) return ;
+            match(input,47,FOLLOW_47_in_rule__OpCompare__Group_1__0__Impl23244); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpCompareAccess().getLessThanSignKeyword_1_0()); 
             }
@@ -33855,16 +33592,16 @@ public final void rule__OpCompare__Group_1__0__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__OpCompare__Group_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11382:1: rule__OpCompare__Group_1__1 : rule__OpCompare__Group_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11288:1: rule__OpCompare__Group_1__1 : rule__OpCompare__Group_1__1__Impl ;
     public final void rule__OpCompare__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11386:1: ( rule__OpCompare__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11387:2: rule__OpCompare__Group_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11292:1: ( rule__OpCompare__Group_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11293:2: rule__OpCompare__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__OpCompare__Group_1__1__Impl_in_rule__OpCompare__Group_1__123461);
+            pushFollow(FOLLOW_rule__OpCompare__Group_1__1__Impl_in_rule__OpCompare__Group_1__123275);
             rule__OpCompare__Group_1__1__Impl();
 
             state._fsp--;
@@ -33888,22 +33625,22 @@ public final void rule__OpCompare__Group_1__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpCompare__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11393:1: rule__OpCompare__Group_1__1__Impl : ( '=' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11299:1: rule__OpCompare__Group_1__1__Impl : ( '=' ) ;
     public final void rule__OpCompare__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11397:1: ( ( '=' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11398:1: ( '=' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11303:1: ( ( '=' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11304:1: ( '=' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11398:1: ( '=' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11399:1: '='
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11304:1: ( '=' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11305:1: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpCompareAccess().getEqualsSignKeyword_1_1()); 
             }
-            match(input,13,FOLLOW_13_in_rule__OpCompare__Group_1__1__Impl23489); if (state.failed) return ;
+            match(input,13,FOLLOW_13_in_rule__OpCompare__Group_1__1__Impl23303); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpCompareAccess().getEqualsSignKeyword_1_1()); 
             }
@@ -33929,21 +33666,21 @@ public final void rule__OpCompare__Group_1__1__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11416:1: rule__XOtherOperatorExpression__Group__0 : rule__XOtherOperatorExpression__Group__0__Impl rule__XOtherOperatorExpression__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11322:1: rule__XOtherOperatorExpression__Group__0 : rule__XOtherOperatorExpression__Group__0__Impl rule__XOtherOperatorExpression__Group__1 ;
     public final void rule__XOtherOperatorExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11420:1: ( rule__XOtherOperatorExpression__Group__0__Impl rule__XOtherOperatorExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11421:2: rule__XOtherOperatorExpression__Group__0__Impl rule__XOtherOperatorExpression__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11326:1: ( rule__XOtherOperatorExpression__Group__0__Impl rule__XOtherOperatorExpression__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11327:2: rule__XOtherOperatorExpression__Group__0__Impl rule__XOtherOperatorExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group__0__Impl_in_rule__XOtherOperatorExpression__Group__023524);
+            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group__0__Impl_in_rule__XOtherOperatorExpression__Group__023338);
             rule__XOtherOperatorExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group__1_in_rule__XOtherOperatorExpression__Group__023527);
+            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group__1_in_rule__XOtherOperatorExpression__Group__023341);
             rule__XOtherOperatorExpression__Group__1();
 
             state._fsp--;
@@ -33967,22 +33704,22 @@ public final void rule__XOtherOperatorExpression__Group__0() throws RecognitionE
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11428:1: rule__XOtherOperatorExpression__Group__0__Impl : ( ruleXAdditiveExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11334:1: rule__XOtherOperatorExpression__Group__0__Impl : ( ruleXAdditiveExpression ) ;
     public final void rule__XOtherOperatorExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11432:1: ( ( ruleXAdditiveExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11433:1: ( ruleXAdditiveExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11338:1: ( ( ruleXAdditiveExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11339:1: ( ruleXAdditiveExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11433:1: ( ruleXAdditiveExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11434:1: ruleXAdditiveExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11339:1: ( ruleXAdditiveExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11340:1: ruleXAdditiveExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getXAdditiveExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleXAdditiveExpression_in_rule__XOtherOperatorExpression__Group__0__Impl23554);
+            pushFollow(FOLLOW_ruleXAdditiveExpression_in_rule__XOtherOperatorExpression__Group__0__Impl23368);
             ruleXAdditiveExpression();
 
             state._fsp--;
@@ -34012,16 +33749,16 @@ public final void rule__XOtherOperatorExpression__Group__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11445:1: rule__XOtherOperatorExpression__Group__1 : rule__XOtherOperatorExpression__Group__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11351:1: rule__XOtherOperatorExpression__Group__1 : rule__XOtherOperatorExpression__Group__1__Impl ;
     public final void rule__XOtherOperatorExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11449:1: ( rule__XOtherOperatorExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11450:2: rule__XOtherOperatorExpression__Group__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11355:1: ( rule__XOtherOperatorExpression__Group__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11356:2: rule__XOtherOperatorExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group__1__Impl_in_rule__XOtherOperatorExpression__Group__123583);
+            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group__1__Impl_in_rule__XOtherOperatorExpression__Group__123397);
             rule__XOtherOperatorExpression__Group__1__Impl();
 
             state._fsp--;
@@ -34045,31 +33782,31 @@ public final void rule__XOtherOperatorExpression__Group__1() throws RecognitionE
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11456:1: rule__XOtherOperatorExpression__Group__1__Impl : ( ( rule__XOtherOperatorExpression__Group_1__0 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11362:1: rule__XOtherOperatorExpression__Group__1__Impl : ( ( rule__XOtherOperatorExpression__Group_1__0 )* ) ;
     public final void rule__XOtherOperatorExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11460:1: ( ( ( rule__XOtherOperatorExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11461:1: ( ( rule__XOtherOperatorExpression__Group_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11366:1: ( ( ( rule__XOtherOperatorExpression__Group_1__0 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11367:1: ( ( rule__XOtherOperatorExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11461:1: ( ( rule__XOtherOperatorExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11462:1: ( rule__XOtherOperatorExpression__Group_1__0 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11367:1: ( ( rule__XOtherOperatorExpression__Group_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11368:1: ( rule__XOtherOperatorExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11463:1: ( rule__XOtherOperatorExpression__Group_1__0 )*
-            loop100:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11369:1: ( rule__XOtherOperatorExpression__Group_1__0 )*
+            loop99:
             do {
-                int alt100=2;
-                alt100 = dfa100.predict(input);
-                switch (alt100) {
+                int alt99=2;
+                alt99 = dfa99.predict(input);
+                switch (alt99) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11463:2: rule__XOtherOperatorExpression__Group_1__0
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11369:2: rule__XOtherOperatorExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1__0_in_rule__XOtherOperatorExpression__Group__1__Impl23610);
+            	    pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1__0_in_rule__XOtherOperatorExpression__Group__1__Impl23424);
             	    rule__XOtherOperatorExpression__Group_1__0();
 
             	    state._fsp--;
@@ -34079,7 +33816,7 @@ public final void rule__XOtherOperatorExpression__Group__1__Impl() throws Recogn
             	    break;
 
             	default :
-            	    break loop100;
+            	    break loop99;
                 }
             } while (true);
 
@@ -34108,21 +33845,21 @@ public final void rule__XOtherOperatorExpression__Group__1__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11477:1: rule__XOtherOperatorExpression__Group_1__0 : rule__XOtherOperatorExpression__Group_1__0__Impl rule__XOtherOperatorExpression__Group_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11383:1: rule__XOtherOperatorExpression__Group_1__0 : rule__XOtherOperatorExpression__Group_1__0__Impl rule__XOtherOperatorExpression__Group_1__1 ;
     public final void rule__XOtherOperatorExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11481:1: ( rule__XOtherOperatorExpression__Group_1__0__Impl rule__XOtherOperatorExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11482:2: rule__XOtherOperatorExpression__Group_1__0__Impl rule__XOtherOperatorExpression__Group_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11387:1: ( rule__XOtherOperatorExpression__Group_1__0__Impl rule__XOtherOperatorExpression__Group_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11388:2: rule__XOtherOperatorExpression__Group_1__0__Impl rule__XOtherOperatorExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1__0__Impl_in_rule__XOtherOperatorExpression__Group_1__023645);
+            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1__0__Impl_in_rule__XOtherOperatorExpression__Group_1__023459);
             rule__XOtherOperatorExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1__1_in_rule__XOtherOperatorExpression__Group_1__023648);
+            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1__1_in_rule__XOtherOperatorExpression__Group_1__023462);
             rule__XOtherOperatorExpression__Group_1__1();
 
             state._fsp--;
@@ -34146,25 +33883,25 @@ public final void rule__XOtherOperatorExpression__Group_1__0() throws Recognitio
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11489:1: rule__XOtherOperatorExpression__Group_1__0__Impl : ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11395:1: rule__XOtherOperatorExpression__Group_1__0__Impl : ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) ) ;
     public final void rule__XOtherOperatorExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11493:1: ( ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11494:1: ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11399:1: ( ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11400:1: ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11494:1: ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11495:1: ( rule__XOtherOperatorExpression__Group_1_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11400:1: ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11401:1: ( rule__XOtherOperatorExpression__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getGroup_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11496:1: ( rule__XOtherOperatorExpression__Group_1_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11496:2: rule__XOtherOperatorExpression__Group_1_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11402:1: ( rule__XOtherOperatorExpression__Group_1_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11402:2: rule__XOtherOperatorExpression__Group_1_0__0
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1_0__0_in_rule__XOtherOperatorExpression__Group_1__0__Impl23675);
+            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1_0__0_in_rule__XOtherOperatorExpression__Group_1__0__Impl23489);
             rule__XOtherOperatorExpression__Group_1_0__0();
 
             state._fsp--;
@@ -34197,16 +33934,16 @@ public final void rule__XOtherOperatorExpression__Group_1__0__Impl() throws Reco
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11506:1: rule__XOtherOperatorExpression__Group_1__1 : rule__XOtherOperatorExpression__Group_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11412:1: rule__XOtherOperatorExpression__Group_1__1 : rule__XOtherOperatorExpression__Group_1__1__Impl ;
     public final void rule__XOtherOperatorExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11510:1: ( rule__XOtherOperatorExpression__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11511:2: rule__XOtherOperatorExpression__Group_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11416:1: ( rule__XOtherOperatorExpression__Group_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11417:2: rule__XOtherOperatorExpression__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1__1__Impl_in_rule__XOtherOperatorExpression__Group_1__123705);
+            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1__1__Impl_in_rule__XOtherOperatorExpression__Group_1__123519);
             rule__XOtherOperatorExpression__Group_1__1__Impl();
 
             state._fsp--;
@@ -34230,25 +33967,25 @@ public final void rule__XOtherOperatorExpression__Group_1__1() throws Recognitio
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11517:1: rule__XOtherOperatorExpression__Group_1__1__Impl : ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11423:1: rule__XOtherOperatorExpression__Group_1__1__Impl : ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) ) ;
     public final void rule__XOtherOperatorExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11521:1: ( ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11522:1: ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11427:1: ( ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11428:1: ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11522:1: ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11523:1: ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11428:1: ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11429:1: ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getRightOperandAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11524:1: ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11524:2: rule__XOtherOperatorExpression__RightOperandAssignment_1_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11430:1: ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11430:2: rule__XOtherOperatorExpression__RightOperandAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__RightOperandAssignment_1_1_in_rule__XOtherOperatorExpression__Group_1__1__Impl23732);
+            pushFollow(FOLLOW_rule__XOtherOperatorExpression__RightOperandAssignment_1_1_in_rule__XOtherOperatorExpression__Group_1__1__Impl23546);
             rule__XOtherOperatorExpression__RightOperandAssignment_1_1();
 
             state._fsp--;
@@ -34281,16 +34018,16 @@ public final void rule__XOtherOperatorExpression__Group_1__1__Impl() throws Reco
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11538:1: rule__XOtherOperatorExpression__Group_1_0__0 : rule__XOtherOperatorExpression__Group_1_0__0__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11444:1: rule__XOtherOperatorExpression__Group_1_0__0 : rule__XOtherOperatorExpression__Group_1_0__0__Impl ;
     public final void rule__XOtherOperatorExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11542:1: ( rule__XOtherOperatorExpression__Group_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11543:2: rule__XOtherOperatorExpression__Group_1_0__0__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11448:1: ( rule__XOtherOperatorExpression__Group_1_0__0__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11449:2: rule__XOtherOperatorExpression__Group_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1_0__0__Impl_in_rule__XOtherOperatorExpression__Group_1_0__023766);
+            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1_0__0__Impl_in_rule__XOtherOperatorExpression__Group_1_0__023580);
             rule__XOtherOperatorExpression__Group_1_0__0__Impl();
 
             state._fsp--;
@@ -34314,25 +34051,25 @@ public final void rule__XOtherOperatorExpression__Group_1_0__0() throws Recognit
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11549:1: rule__XOtherOperatorExpression__Group_1_0__0__Impl : ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11455:1: rule__XOtherOperatorExpression__Group_1_0__0__Impl : ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) ) ;
     public final void rule__XOtherOperatorExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11553:1: ( ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11554:1: ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11459:1: ( ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11460:1: ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11554:1: ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11555:1: ( rule__XOtherOperatorExpression__Group_1_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11460:1: ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11461:1: ( rule__XOtherOperatorExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getGroup_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11556:1: ( rule__XOtherOperatorExpression__Group_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11556:2: rule__XOtherOperatorExpression__Group_1_0_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11462:1: ( rule__XOtherOperatorExpression__Group_1_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11462:2: rule__XOtherOperatorExpression__Group_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1_0_0__0_in_rule__XOtherOperatorExpression__Group_1_0__0__Impl23793);
+            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1_0_0__0_in_rule__XOtherOperatorExpression__Group_1_0__0__Impl23607);
             rule__XOtherOperatorExpression__Group_1_0_0__0();
 
             state._fsp--;
@@ -34365,21 +34102,21 @@ public final void rule__XOtherOperatorExpression__Group_1_0__0__Impl() throws Re
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11568:1: rule__XOtherOperatorExpression__Group_1_0_0__0 : rule__XOtherOperatorExpression__Group_1_0_0__0__Impl rule__XOtherOperatorExpression__Group_1_0_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11474:1: rule__XOtherOperatorExpression__Group_1_0_0__0 : rule__XOtherOperatorExpression__Group_1_0_0__0__Impl rule__XOtherOperatorExpression__Group_1_0_0__1 ;
     public final void rule__XOtherOperatorExpression__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11572:1: ( rule__XOtherOperatorExpression__Group_1_0_0__0__Impl rule__XOtherOperatorExpression__Group_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11573:2: rule__XOtherOperatorExpression__Group_1_0_0__0__Impl rule__XOtherOperatorExpression__Group_1_0_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11478:1: ( rule__XOtherOperatorExpression__Group_1_0_0__0__Impl rule__XOtherOperatorExpression__Group_1_0_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11479:2: rule__XOtherOperatorExpression__Group_1_0_0__0__Impl rule__XOtherOperatorExpression__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1_0_0__0__Impl_in_rule__XOtherOperatorExpression__Group_1_0_0__023825);
+            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1_0_0__0__Impl_in_rule__XOtherOperatorExpression__Group_1_0_0__023639);
             rule__XOtherOperatorExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1_0_0__1_in_rule__XOtherOperatorExpression__Group_1_0_0__023828);
+            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1_0_0__1_in_rule__XOtherOperatorExpression__Group_1_0_0__023642);
             rule__XOtherOperatorExpression__Group_1_0_0__1();
 
             state._fsp--;
@@ -34403,23 +34140,23 @@ public final void rule__XOtherOperatorExpression__Group_1_0_0__0() throws Recogn
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11580:1: rule__XOtherOperatorExpression__Group_1_0_0__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11486:1: rule__XOtherOperatorExpression__Group_1_0_0__0__Impl : ( () ) ;
     public final void rule__XOtherOperatorExpression__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11584:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11585:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11490:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11491:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11585:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11586:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11491:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11492:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11587:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11589:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11493:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11495:1: 
             {
             }
 
@@ -34444,16 +34181,16 @@ public final void rule__XOtherOperatorExpression__Group_1_0_0__0__Impl() throws
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11599:1: rule__XOtherOperatorExpression__Group_1_0_0__1 : rule__XOtherOperatorExpression__Group_1_0_0__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11505:1: rule__XOtherOperatorExpression__Group_1_0_0__1 : rule__XOtherOperatorExpression__Group_1_0_0__1__Impl ;
     public final void rule__XOtherOperatorExpression__Group_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11603:1: ( rule__XOtherOperatorExpression__Group_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11604:2: rule__XOtherOperatorExpression__Group_1_0_0__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11509:1: ( rule__XOtherOperatorExpression__Group_1_0_0__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11510:2: rule__XOtherOperatorExpression__Group_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1_0_0__1__Impl_in_rule__XOtherOperatorExpression__Group_1_0_0__123886);
+            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1_0_0__1__Impl_in_rule__XOtherOperatorExpression__Group_1_0_0__123700);
             rule__XOtherOperatorExpression__Group_1_0_0__1__Impl();
 
             state._fsp--;
@@ -34477,25 +34214,25 @@ public final void rule__XOtherOperatorExpression__Group_1_0_0__1() throws Recogn
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11610:1: rule__XOtherOperatorExpression__Group_1_0_0__1__Impl : ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11516:1: rule__XOtherOperatorExpression__Group_1_0_0__1__Impl : ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) ) ;
     public final void rule__XOtherOperatorExpression__Group_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11614:1: ( ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11615:1: ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11520:1: ( ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11521:1: ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11615:1: ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11616:1: ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11521:1: ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11522:1: ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getFeatureAssignment_1_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11617:1: ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11617:2: rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11523:1: ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11523:2: rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1_in_rule__XOtherOperatorExpression__Group_1_0_0__1__Impl23913);
+            pushFollow(FOLLOW_rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1_in_rule__XOtherOperatorExpression__Group_1_0_0__1__Impl23727);
             rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1();
 
             state._fsp--;
@@ -34528,21 +34265,21 @@ public final void rule__XOtherOperatorExpression__Group_1_0_0__1__Impl() throws
 
 
     // $ANTLR start "rule__OpOther__Group_2__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11631:1: rule__OpOther__Group_2__0 : rule__OpOther__Group_2__0__Impl rule__OpOther__Group_2__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11537:1: rule__OpOther__Group_2__0 : rule__OpOther__Group_2__0__Impl rule__OpOther__Group_2__1 ;
     public final void rule__OpOther__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11635:1: ( rule__OpOther__Group_2__0__Impl rule__OpOther__Group_2__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11636:2: rule__OpOther__Group_2__0__Impl rule__OpOther__Group_2__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11541:1: ( rule__OpOther__Group_2__0__Impl rule__OpOther__Group_2__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11542:2: rule__OpOther__Group_2__0__Impl rule__OpOther__Group_2__1
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_2__0__Impl_in_rule__OpOther__Group_2__023947);
+            pushFollow(FOLLOW_rule__OpOther__Group_2__0__Impl_in_rule__OpOther__Group_2__023761);
             rule__OpOther__Group_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OpOther__Group_2__1_in_rule__OpOther__Group_2__023950);
+            pushFollow(FOLLOW_rule__OpOther__Group_2__1_in_rule__OpOther__Group_2__023764);
             rule__OpOther__Group_2__1();
 
             state._fsp--;
@@ -34566,22 +34303,22 @@ public final void rule__OpOther__Group_2__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpOther__Group_2__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11643:1: rule__OpOther__Group_2__0__Impl : ( '>' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11549:1: rule__OpOther__Group_2__0__Impl : ( '>' ) ;
     public final void rule__OpOther__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11647:1: ( ( '>' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11648:1: ( '>' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11553:1: ( ( '>' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11554:1: ( '>' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11648:1: ( '>' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11649:1: '>'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11554:1: ( '>' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11555:1: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_2_0()); 
             }
-            match(input,46,FOLLOW_46_in_rule__OpOther__Group_2__0__Impl23978); if (state.failed) return ;
+            match(input,46,FOLLOW_46_in_rule__OpOther__Group_2__0__Impl23792); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_2_0()); 
             }
@@ -34607,16 +34344,16 @@ public final void rule__OpOther__Group_2__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__OpOther__Group_2__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11662:1: rule__OpOther__Group_2__1 : rule__OpOther__Group_2__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11568:1: rule__OpOther__Group_2__1 : rule__OpOther__Group_2__1__Impl ;
     public final void rule__OpOther__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11666:1: ( rule__OpOther__Group_2__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11667:2: rule__OpOther__Group_2__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11572:1: ( rule__OpOther__Group_2__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11573:2: rule__OpOther__Group_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_2__1__Impl_in_rule__OpOther__Group_2__124009);
+            pushFollow(FOLLOW_rule__OpOther__Group_2__1__Impl_in_rule__OpOther__Group_2__123823);
             rule__OpOther__Group_2__1__Impl();
 
             state._fsp--;
@@ -34640,22 +34377,22 @@ public final void rule__OpOther__Group_2__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpOther__Group_2__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11673:1: rule__OpOther__Group_2__1__Impl : ( '..' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11579:1: rule__OpOther__Group_2__1__Impl : ( '..' ) ;
     public final void rule__OpOther__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11677:1: ( ( '..' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11678:1: ( '..' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11583:1: ( ( '..' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11584:1: ( '..' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11678:1: ( '..' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11679:1: '..'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11584:1: ( '..' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11585:1: '..'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getFullStopFullStopKeyword_2_1()); 
             }
-            match(input,50,FOLLOW_50_in_rule__OpOther__Group_2__1__Impl24037); if (state.failed) return ;
+            match(input,50,FOLLOW_50_in_rule__OpOther__Group_2__1__Impl23851); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpOtherAccess().getFullStopFullStopKeyword_2_1()); 
             }
@@ -34681,21 +34418,21 @@ public final void rule__OpOther__Group_2__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__OpOther__Group_5__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11696:1: rule__OpOther__Group_5__0 : rule__OpOther__Group_5__0__Impl rule__OpOther__Group_5__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11602:1: rule__OpOther__Group_5__0 : rule__OpOther__Group_5__0__Impl rule__OpOther__Group_5__1 ;
     public final void rule__OpOther__Group_5__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11700:1: ( rule__OpOther__Group_5__0__Impl rule__OpOther__Group_5__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11701:2: rule__OpOther__Group_5__0__Impl rule__OpOther__Group_5__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11606:1: ( rule__OpOther__Group_5__0__Impl rule__OpOther__Group_5__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11607:2: rule__OpOther__Group_5__0__Impl rule__OpOther__Group_5__1
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_5__0__Impl_in_rule__OpOther__Group_5__024072);
+            pushFollow(FOLLOW_rule__OpOther__Group_5__0__Impl_in_rule__OpOther__Group_5__023886);
             rule__OpOther__Group_5__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OpOther__Group_5__1_in_rule__OpOther__Group_5__024075);
+            pushFollow(FOLLOW_rule__OpOther__Group_5__1_in_rule__OpOther__Group_5__023889);
             rule__OpOther__Group_5__1();
 
             state._fsp--;
@@ -34719,22 +34456,22 @@ public final void rule__OpOther__Group_5__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpOther__Group_5__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11708:1: rule__OpOther__Group_5__0__Impl : ( '>' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11614:1: rule__OpOther__Group_5__0__Impl : ( '>' ) ;
     public final void rule__OpOther__Group_5__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11712:1: ( ( '>' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11713:1: ( '>' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11618:1: ( ( '>' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11619:1: ( '>' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11713:1: ( '>' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11714:1: '>'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11619:1: ( '>' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11620:1: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_0()); 
             }
-            match(input,46,FOLLOW_46_in_rule__OpOther__Group_5__0__Impl24103); if (state.failed) return ;
+            match(input,46,FOLLOW_46_in_rule__OpOther__Group_5__0__Impl23917); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_0()); 
             }
@@ -34760,16 +34497,16 @@ public final void rule__OpOther__Group_5__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__OpOther__Group_5__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11727:1: rule__OpOther__Group_5__1 : rule__OpOther__Group_5__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11633:1: rule__OpOther__Group_5__1 : rule__OpOther__Group_5__1__Impl ;
     public final void rule__OpOther__Group_5__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11731:1: ( rule__OpOther__Group_5__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11732:2: rule__OpOther__Group_5__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11637:1: ( rule__OpOther__Group_5__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11638:2: rule__OpOther__Group_5__1__Impl
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_5__1__Impl_in_rule__OpOther__Group_5__124134);
+            pushFollow(FOLLOW_rule__OpOther__Group_5__1__Impl_in_rule__OpOther__Group_5__123948);
             rule__OpOther__Group_5__1__Impl();
 
             state._fsp--;
@@ -34793,25 +34530,25 @@ public final void rule__OpOther__Group_5__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpOther__Group_5__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11738:1: rule__OpOther__Group_5__1__Impl : ( ( rule__OpOther__Alternatives_5_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11644:1: rule__OpOther__Group_5__1__Impl : ( ( rule__OpOther__Alternatives_5_1 ) ) ;
     public final void rule__OpOther__Group_5__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11742:1: ( ( ( rule__OpOther__Alternatives_5_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11743:1: ( ( rule__OpOther__Alternatives_5_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11648:1: ( ( ( rule__OpOther__Alternatives_5_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11649:1: ( ( rule__OpOther__Alternatives_5_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11743:1: ( ( rule__OpOther__Alternatives_5_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11744:1: ( rule__OpOther__Alternatives_5_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11649:1: ( ( rule__OpOther__Alternatives_5_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11650:1: ( rule__OpOther__Alternatives_5_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getAlternatives_5_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11745:1: ( rule__OpOther__Alternatives_5_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11745:2: rule__OpOther__Alternatives_5_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11651:1: ( rule__OpOther__Alternatives_5_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11651:2: rule__OpOther__Alternatives_5_1
             {
-            pushFollow(FOLLOW_rule__OpOther__Alternatives_5_1_in_rule__OpOther__Group_5__1__Impl24161);
+            pushFollow(FOLLOW_rule__OpOther__Alternatives_5_1_in_rule__OpOther__Group_5__1__Impl23975);
             rule__OpOther__Alternatives_5_1();
 
             state._fsp--;
@@ -34844,16 +34581,16 @@ public final void rule__OpOther__Group_5__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__OpOther__Group_5_1_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11759:1: rule__OpOther__Group_5_1_0__0 : rule__OpOther__Group_5_1_0__0__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11665:1: rule__OpOther__Group_5_1_0__0 : rule__OpOther__Group_5_1_0__0__Impl ;
     public final void rule__OpOther__Group_5_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11763:1: ( rule__OpOther__Group_5_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11764:2: rule__OpOther__Group_5_1_0__0__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11669:1: ( rule__OpOther__Group_5_1_0__0__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11670:2: rule__OpOther__Group_5_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_5_1_0__0__Impl_in_rule__OpOther__Group_5_1_0__024195);
+            pushFollow(FOLLOW_rule__OpOther__Group_5_1_0__0__Impl_in_rule__OpOther__Group_5_1_0__024009);
             rule__OpOther__Group_5_1_0__0__Impl();
 
             state._fsp--;
@@ -34877,25 +34614,25 @@ public final void rule__OpOther__Group_5_1_0__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpOther__Group_5_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11770:1: rule__OpOther__Group_5_1_0__0__Impl : ( ( rule__OpOther__Group_5_1_0_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11676:1: rule__OpOther__Group_5_1_0__0__Impl : ( ( rule__OpOther__Group_5_1_0_0__0 ) ) ;
     public final void rule__OpOther__Group_5_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11774:1: ( ( ( rule__OpOther__Group_5_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11775:1: ( ( rule__OpOther__Group_5_1_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11680:1: ( ( ( rule__OpOther__Group_5_1_0_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11681:1: ( ( rule__OpOther__Group_5_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11775:1: ( ( rule__OpOther__Group_5_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11776:1: ( rule__OpOther__Group_5_1_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11681:1: ( ( rule__OpOther__Group_5_1_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11682:1: ( rule__OpOther__Group_5_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getGroup_5_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11777:1: ( rule__OpOther__Group_5_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11777:2: rule__OpOther__Group_5_1_0_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11683:1: ( rule__OpOther__Group_5_1_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11683:2: rule__OpOther__Group_5_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_5_1_0_0__0_in_rule__OpOther__Group_5_1_0__0__Impl24222);
+            pushFollow(FOLLOW_rule__OpOther__Group_5_1_0_0__0_in_rule__OpOther__Group_5_1_0__0__Impl24036);
             rule__OpOther__Group_5_1_0_0__0();
 
             state._fsp--;
@@ -34928,21 +34665,21 @@ public final void rule__OpOther__Group_5_1_0__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__OpOther__Group_5_1_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11789:1: rule__OpOther__Group_5_1_0_0__0 : rule__OpOther__Group_5_1_0_0__0__Impl rule__OpOther__Group_5_1_0_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11695:1: rule__OpOther__Group_5_1_0_0__0 : rule__OpOther__Group_5_1_0_0__0__Impl rule__OpOther__Group_5_1_0_0__1 ;
     public final void rule__OpOther__Group_5_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11793:1: ( rule__OpOther__Group_5_1_0_0__0__Impl rule__OpOther__Group_5_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11794:2: rule__OpOther__Group_5_1_0_0__0__Impl rule__OpOther__Group_5_1_0_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11699:1: ( rule__OpOther__Group_5_1_0_0__0__Impl rule__OpOther__Group_5_1_0_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11700:2: rule__OpOther__Group_5_1_0_0__0__Impl rule__OpOther__Group_5_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_5_1_0_0__0__Impl_in_rule__OpOther__Group_5_1_0_0__024254);
+            pushFollow(FOLLOW_rule__OpOther__Group_5_1_0_0__0__Impl_in_rule__OpOther__Group_5_1_0_0__024068);
             rule__OpOther__Group_5_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OpOther__Group_5_1_0_0__1_in_rule__OpOther__Group_5_1_0_0__024257);
+            pushFollow(FOLLOW_rule__OpOther__Group_5_1_0_0__1_in_rule__OpOther__Group_5_1_0_0__024071);
             rule__OpOther__Group_5_1_0_0__1();
 
             state._fsp--;
@@ -34966,22 +34703,22 @@ public final void rule__OpOther__Group_5_1_0_0__0() throws RecognitionException
 
 
     // $ANTLR start "rule__OpOther__Group_5_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11801:1: rule__OpOther__Group_5_1_0_0__0__Impl : ( '>' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11707:1: rule__OpOther__Group_5_1_0_0__0__Impl : ( '>' ) ;
     public final void rule__OpOther__Group_5_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11805:1: ( ( '>' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11806:1: ( '>' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11711:1: ( ( '>' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11712:1: ( '>' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11806:1: ( '>' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11807:1: '>'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11712:1: ( '>' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11713:1: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_1_0_0_0()); 
             }
-            match(input,46,FOLLOW_46_in_rule__OpOther__Group_5_1_0_0__0__Impl24285); if (state.failed) return ;
+            match(input,46,FOLLOW_46_in_rule__OpOther__Group_5_1_0_0__0__Impl24099); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_1_0_0_0()); 
             }
@@ -35007,16 +34744,16 @@ public final void rule__OpOther__Group_5_1_0_0__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__OpOther__Group_5_1_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11820:1: rule__OpOther__Group_5_1_0_0__1 : rule__OpOther__Group_5_1_0_0__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11726:1: rule__OpOther__Group_5_1_0_0__1 : rule__OpOther__Group_5_1_0_0__1__Impl ;
     public final void rule__OpOther__Group_5_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11824:1: ( rule__OpOther__Group_5_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11825:2: rule__OpOther__Group_5_1_0_0__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11730:1: ( rule__OpOther__Group_5_1_0_0__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11731:2: rule__OpOther__Group_5_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_5_1_0_0__1__Impl_in_rule__OpOther__Group_5_1_0_0__124316);
+            pushFollow(FOLLOW_rule__OpOther__Group_5_1_0_0__1__Impl_in_rule__OpOther__Group_5_1_0_0__124130);
             rule__OpOther__Group_5_1_0_0__1__Impl();
 
             state._fsp--;
@@ -35040,22 +34777,22 @@ public final void rule__OpOther__Group_5_1_0_0__1() throws RecognitionException
 
 
     // $ANTLR start "rule__OpOther__Group_5_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11831:1: rule__OpOther__Group_5_1_0_0__1__Impl : ( '>' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11737:1: rule__OpOther__Group_5_1_0_0__1__Impl : ( '>' ) ;
     public final void rule__OpOther__Group_5_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11835:1: ( ( '>' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11836:1: ( '>' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11741:1: ( ( '>' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11742:1: ( '>' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11836:1: ( '>' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11837:1: '>'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11742:1: ( '>' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11743:1: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_1_0_0_1()); 
             }
-            match(input,46,FOLLOW_46_in_rule__OpOther__Group_5_1_0_0__1__Impl24344); if (state.failed) return ;
+            match(input,46,FOLLOW_46_in_rule__OpOther__Group_5_1_0_0__1__Impl24158); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_1_0_0_1()); 
             }
@@ -35081,21 +34818,21 @@ public final void rule__OpOther__Group_5_1_0_0__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__OpOther__Group_6__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11854:1: rule__OpOther__Group_6__0 : rule__OpOther__Group_6__0__Impl rule__OpOther__Group_6__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11760:1: rule__OpOther__Group_6__0 : rule__OpOther__Group_6__0__Impl rule__OpOther__Group_6__1 ;
     public final void rule__OpOther__Group_6__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11858:1: ( rule__OpOther__Group_6__0__Impl rule__OpOther__Group_6__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11859:2: rule__OpOther__Group_6__0__Impl rule__OpOther__Group_6__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11764:1: ( rule__OpOther__Group_6__0__Impl rule__OpOther__Group_6__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11765:2: rule__OpOther__Group_6__0__Impl rule__OpOther__Group_6__1
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_6__0__Impl_in_rule__OpOther__Group_6__024379);
+            pushFollow(FOLLOW_rule__OpOther__Group_6__0__Impl_in_rule__OpOther__Group_6__024193);
             rule__OpOther__Group_6__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OpOther__Group_6__1_in_rule__OpOther__Group_6__024382);
+            pushFollow(FOLLOW_rule__OpOther__Group_6__1_in_rule__OpOther__Group_6__024196);
             rule__OpOther__Group_6__1();
 
             state._fsp--;
@@ -35119,22 +34856,22 @@ public final void rule__OpOther__Group_6__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpOther__Group_6__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11866:1: rule__OpOther__Group_6__0__Impl : ( '<' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11772:1: rule__OpOther__Group_6__0__Impl : ( '<' ) ;
     public final void rule__OpOther__Group_6__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11870:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11871:1: ( '<' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11776:1: ( ( '<' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11777:1: ( '<' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11871:1: ( '<' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11872:1: '<'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11777:1: ( '<' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11778:1: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_0()); 
             }
-            match(input,47,FOLLOW_47_in_rule__OpOther__Group_6__0__Impl24410); if (state.failed) return ;
+            match(input,47,FOLLOW_47_in_rule__OpOther__Group_6__0__Impl24224); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_0()); 
             }
@@ -35160,16 +34897,16 @@ public final void rule__OpOther__Group_6__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__OpOther__Group_6__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11885:1: rule__OpOther__Group_6__1 : rule__OpOther__Group_6__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11791:1: rule__OpOther__Group_6__1 : rule__OpOther__Group_6__1__Impl ;
     public final void rule__OpOther__Group_6__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11889:1: ( rule__OpOther__Group_6__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11890:2: rule__OpOther__Group_6__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11795:1: ( rule__OpOther__Group_6__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11796:2: rule__OpOther__Group_6__1__Impl
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_6__1__Impl_in_rule__OpOther__Group_6__124441);
+            pushFollow(FOLLOW_rule__OpOther__Group_6__1__Impl_in_rule__OpOther__Group_6__124255);
             rule__OpOther__Group_6__1__Impl();
 
             state._fsp--;
@@ -35193,25 +34930,25 @@ public final void rule__OpOther__Group_6__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpOther__Group_6__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11896:1: rule__OpOther__Group_6__1__Impl : ( ( rule__OpOther__Alternatives_6_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11802:1: rule__OpOther__Group_6__1__Impl : ( ( rule__OpOther__Alternatives_6_1 ) ) ;
     public final void rule__OpOther__Group_6__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11900:1: ( ( ( rule__OpOther__Alternatives_6_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11901:1: ( ( rule__OpOther__Alternatives_6_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11806:1: ( ( ( rule__OpOther__Alternatives_6_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11807:1: ( ( rule__OpOther__Alternatives_6_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11901:1: ( ( rule__OpOther__Alternatives_6_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11902:1: ( rule__OpOther__Alternatives_6_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11807:1: ( ( rule__OpOther__Alternatives_6_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11808:1: ( rule__OpOther__Alternatives_6_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getAlternatives_6_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11903:1: ( rule__OpOther__Alternatives_6_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11903:2: rule__OpOther__Alternatives_6_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11809:1: ( rule__OpOther__Alternatives_6_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11809:2: rule__OpOther__Alternatives_6_1
             {
-            pushFollow(FOLLOW_rule__OpOther__Alternatives_6_1_in_rule__OpOther__Group_6__1__Impl24468);
+            pushFollow(FOLLOW_rule__OpOther__Alternatives_6_1_in_rule__OpOther__Group_6__1__Impl24282);
             rule__OpOther__Alternatives_6_1();
 
             state._fsp--;
@@ -35244,16 +34981,16 @@ public final void rule__OpOther__Group_6__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__OpOther__Group_6_1_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11917:1: rule__OpOther__Group_6_1_0__0 : rule__OpOther__Group_6_1_0__0__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11823:1: rule__OpOther__Group_6_1_0__0 : rule__OpOther__Group_6_1_0__0__Impl ;
     public final void rule__OpOther__Group_6_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11921:1: ( rule__OpOther__Group_6_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11922:2: rule__OpOther__Group_6_1_0__0__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11827:1: ( rule__OpOther__Group_6_1_0__0__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11828:2: rule__OpOther__Group_6_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_6_1_0__0__Impl_in_rule__OpOther__Group_6_1_0__024502);
+            pushFollow(FOLLOW_rule__OpOther__Group_6_1_0__0__Impl_in_rule__OpOther__Group_6_1_0__024316);
             rule__OpOther__Group_6_1_0__0__Impl();
 
             state._fsp--;
@@ -35277,25 +35014,25 @@ public final void rule__OpOther__Group_6_1_0__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpOther__Group_6_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11928:1: rule__OpOther__Group_6_1_0__0__Impl : ( ( rule__OpOther__Group_6_1_0_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11834:1: rule__OpOther__Group_6_1_0__0__Impl : ( ( rule__OpOther__Group_6_1_0_0__0 ) ) ;
     public final void rule__OpOther__Group_6_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11932:1: ( ( ( rule__OpOther__Group_6_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11933:1: ( ( rule__OpOther__Group_6_1_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11838:1: ( ( ( rule__OpOther__Group_6_1_0_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11839:1: ( ( rule__OpOther__Group_6_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11933:1: ( ( rule__OpOther__Group_6_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11934:1: ( rule__OpOther__Group_6_1_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11839:1: ( ( rule__OpOther__Group_6_1_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11840:1: ( rule__OpOther__Group_6_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getGroup_6_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11935:1: ( rule__OpOther__Group_6_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11935:2: rule__OpOther__Group_6_1_0_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11841:1: ( rule__OpOther__Group_6_1_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11841:2: rule__OpOther__Group_6_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_6_1_0_0__0_in_rule__OpOther__Group_6_1_0__0__Impl24529);
+            pushFollow(FOLLOW_rule__OpOther__Group_6_1_0_0__0_in_rule__OpOther__Group_6_1_0__0__Impl24343);
             rule__OpOther__Group_6_1_0_0__0();
 
             state._fsp--;
@@ -35328,21 +35065,21 @@ public final void rule__OpOther__Group_6_1_0__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__OpOther__Group_6_1_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11947:1: rule__OpOther__Group_6_1_0_0__0 : rule__OpOther__Group_6_1_0_0__0__Impl rule__OpOther__Group_6_1_0_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11853:1: rule__OpOther__Group_6_1_0_0__0 : rule__OpOther__Group_6_1_0_0__0__Impl rule__OpOther__Group_6_1_0_0__1 ;
     public final void rule__OpOther__Group_6_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11951:1: ( rule__OpOther__Group_6_1_0_0__0__Impl rule__OpOther__Group_6_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11952:2: rule__OpOther__Group_6_1_0_0__0__Impl rule__OpOther__Group_6_1_0_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11857:1: ( rule__OpOther__Group_6_1_0_0__0__Impl rule__OpOther__Group_6_1_0_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11858:2: rule__OpOther__Group_6_1_0_0__0__Impl rule__OpOther__Group_6_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_6_1_0_0__0__Impl_in_rule__OpOther__Group_6_1_0_0__024561);
+            pushFollow(FOLLOW_rule__OpOther__Group_6_1_0_0__0__Impl_in_rule__OpOther__Group_6_1_0_0__024375);
             rule__OpOther__Group_6_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OpOther__Group_6_1_0_0__1_in_rule__OpOther__Group_6_1_0_0__024564);
+            pushFollow(FOLLOW_rule__OpOther__Group_6_1_0_0__1_in_rule__OpOther__Group_6_1_0_0__024378);
             rule__OpOther__Group_6_1_0_0__1();
 
             state._fsp--;
@@ -35366,22 +35103,22 @@ public final void rule__OpOther__Group_6_1_0_0__0() throws RecognitionException
 
 
     // $ANTLR start "rule__OpOther__Group_6_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11959:1: rule__OpOther__Group_6_1_0_0__0__Impl : ( '<' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11865:1: rule__OpOther__Group_6_1_0_0__0__Impl : ( '<' ) ;
     public final void rule__OpOther__Group_6_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11963:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11964:1: ( '<' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11869:1: ( ( '<' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11870:1: ( '<' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11964:1: ( '<' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11965:1: '<'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11870:1: ( '<' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11871:1: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_1_0_0_0()); 
             }
-            match(input,47,FOLLOW_47_in_rule__OpOther__Group_6_1_0_0__0__Impl24592); if (state.failed) return ;
+            match(input,47,FOLLOW_47_in_rule__OpOther__Group_6_1_0_0__0__Impl24406); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_1_0_0_0()); 
             }
@@ -35407,16 +35144,16 @@ public final void rule__OpOther__Group_6_1_0_0__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__OpOther__Group_6_1_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11978:1: rule__OpOther__Group_6_1_0_0__1 : rule__OpOther__Group_6_1_0_0__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11884:1: rule__OpOther__Group_6_1_0_0__1 : rule__OpOther__Group_6_1_0_0__1__Impl ;
     public final void rule__OpOther__Group_6_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11982:1: ( rule__OpOther__Group_6_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11983:2: rule__OpOther__Group_6_1_0_0__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11888:1: ( rule__OpOther__Group_6_1_0_0__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11889:2: rule__OpOther__Group_6_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_6_1_0_0__1__Impl_in_rule__OpOther__Group_6_1_0_0__124623);
+            pushFollow(FOLLOW_rule__OpOther__Group_6_1_0_0__1__Impl_in_rule__OpOther__Group_6_1_0_0__124437);
             rule__OpOther__Group_6_1_0_0__1__Impl();
 
             state._fsp--;
@@ -35440,22 +35177,22 @@ public final void rule__OpOther__Group_6_1_0_0__1() throws RecognitionException
 
 
     // $ANTLR start "rule__OpOther__Group_6_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11989:1: rule__OpOther__Group_6_1_0_0__1__Impl : ( '<' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11895:1: rule__OpOther__Group_6_1_0_0__1__Impl : ( '<' ) ;
     public final void rule__OpOther__Group_6_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11993:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11994:1: ( '<' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11899:1: ( ( '<' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11900:1: ( '<' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11994:1: ( '<' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11995:1: '<'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11900:1: ( '<' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11901:1: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_1_0_0_1()); 
             }
-            match(input,47,FOLLOW_47_in_rule__OpOther__Group_6_1_0_0__1__Impl24651); if (state.failed) return ;
+            match(input,47,FOLLOW_47_in_rule__OpOther__Group_6_1_0_0__1__Impl24465); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_1_0_0_1()); 
             }
@@ -35481,21 +35218,21 @@ public final void rule__OpOther__Group_6_1_0_0__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12012:1: rule__XAdditiveExpression__Group__0 : rule__XAdditiveExpression__Group__0__Impl rule__XAdditiveExpression__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11918:1: rule__XAdditiveExpression__Group__0 : rule__XAdditiveExpression__Group__0__Impl rule__XAdditiveExpression__Group__1 ;
     public final void rule__XAdditiveExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12016:1: ( rule__XAdditiveExpression__Group__0__Impl rule__XAdditiveExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12017:2: rule__XAdditiveExpression__Group__0__Impl rule__XAdditiveExpression__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11922:1: ( rule__XAdditiveExpression__Group__0__Impl rule__XAdditiveExpression__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11923:2: rule__XAdditiveExpression__Group__0__Impl rule__XAdditiveExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group__0__Impl_in_rule__XAdditiveExpression__Group__024686);
+            pushFollow(FOLLOW_rule__XAdditiveExpression__Group__0__Impl_in_rule__XAdditiveExpression__Group__024500);
             rule__XAdditiveExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group__1_in_rule__XAdditiveExpression__Group__024689);
+            pushFollow(FOLLOW_rule__XAdditiveExpression__Group__1_in_rule__XAdditiveExpression__Group__024503);
             rule__XAdditiveExpression__Group__1();
 
             state._fsp--;
@@ -35519,22 +35256,22 @@ public final void rule__XAdditiveExpression__Group__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12024:1: rule__XAdditiveExpression__Group__0__Impl : ( ruleXMultiplicativeExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11930:1: rule__XAdditiveExpression__Group__0__Impl : ( ruleXMultiplicativeExpression ) ;
     public final void rule__XAdditiveExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12028:1: ( ( ruleXMultiplicativeExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12029:1: ( ruleXMultiplicativeExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11934:1: ( ( ruleXMultiplicativeExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11935:1: ( ruleXMultiplicativeExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12029:1: ( ruleXMultiplicativeExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12030:1: ruleXMultiplicativeExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11935:1: ( ruleXMultiplicativeExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11936:1: ruleXMultiplicativeExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getXMultiplicativeExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleXMultiplicativeExpression_in_rule__XAdditiveExpression__Group__0__Impl24716);
+            pushFollow(FOLLOW_ruleXMultiplicativeExpression_in_rule__XAdditiveExpression__Group__0__Impl24530);
             ruleXMultiplicativeExpression();
 
             state._fsp--;
@@ -35564,16 +35301,16 @@ public final void rule__XAdditiveExpression__Group__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12041:1: rule__XAdditiveExpression__Group__1 : rule__XAdditiveExpression__Group__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11947:1: rule__XAdditiveExpression__Group__1 : rule__XAdditiveExpression__Group__1__Impl ;
     public final void rule__XAdditiveExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12045:1: ( rule__XAdditiveExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12046:2: rule__XAdditiveExpression__Group__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11951:1: ( rule__XAdditiveExpression__Group__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11952:2: rule__XAdditiveExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group__1__Impl_in_rule__XAdditiveExpression__Group__124745);
+            pushFollow(FOLLOW_rule__XAdditiveExpression__Group__1__Impl_in_rule__XAdditiveExpression__Group__124559);
             rule__XAdditiveExpression__Group__1__Impl();
 
             state._fsp--;
@@ -35597,52 +35334,52 @@ public final void rule__XAdditiveExpression__Group__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12052:1: rule__XAdditiveExpression__Group__1__Impl : ( ( rule__XAdditiveExpression__Group_1__0 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11958:1: rule__XAdditiveExpression__Group__1__Impl : ( ( rule__XAdditiveExpression__Group_1__0 )* ) ;
     public final void rule__XAdditiveExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12056:1: ( ( ( rule__XAdditiveExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12057:1: ( ( rule__XAdditiveExpression__Group_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11962:1: ( ( ( rule__XAdditiveExpression__Group_1__0 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11963:1: ( ( rule__XAdditiveExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12057:1: ( ( rule__XAdditiveExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12058:1: ( rule__XAdditiveExpression__Group_1__0 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11963:1: ( ( rule__XAdditiveExpression__Group_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11964:1: ( rule__XAdditiveExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12059:1: ( rule__XAdditiveExpression__Group_1__0 )*
-            loop101:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11965:1: ( rule__XAdditiveExpression__Group_1__0 )*
+            loop100:
             do {
-                int alt101=2;
-                int LA101_0 = input.LA(1);
+                int alt100=2;
+                int LA100_0 = input.LA(1);
 
-                if ( (LA101_0==55) ) {
-                    int LA101_2 = input.LA(2);
+                if ( (LA100_0==55) ) {
+                    int LA100_2 = input.LA(2);
 
-                    if ( (synpred167_InternalCheck()) ) {
-                        alt101=1;
+                    if ( (synpred166_InternalCheck()) ) {
+                        alt100=1;
                     }
 
 
                 }
-                else if ( (LA101_0==54) ) {
-                    int LA101_3 = input.LA(2);
+                else if ( (LA100_0==54) ) {
+                    int LA100_3 = input.LA(2);
 
-                    if ( (synpred167_InternalCheck()) ) {
-                        alt101=1;
+                    if ( (synpred166_InternalCheck()) ) {
+                        alt100=1;
                     }
 
 
                 }
 
 
-                switch (alt101) {
+                switch (alt100) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12059:2: rule__XAdditiveExpression__Group_1__0
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11965:2: rule__XAdditiveExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1__0_in_rule__XAdditiveExpression__Group__1__Impl24772);
+            	    pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1__0_in_rule__XAdditiveExpression__Group__1__Impl24586);
             	    rule__XAdditiveExpression__Group_1__0();
 
             	    state._fsp--;
@@ -35652,7 +35389,7 @@ else if ( (LA101_0==54) ) {
             	    break;
 
             	default :
-            	    break loop101;
+            	    break loop100;
                 }
             } while (true);
 
@@ -35681,21 +35418,21 @@ else if ( (LA101_0==54) ) {
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12073:1: rule__XAdditiveExpression__Group_1__0 : rule__XAdditiveExpression__Group_1__0__Impl rule__XAdditiveExpression__Group_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11979:1: rule__XAdditiveExpression__Group_1__0 : rule__XAdditiveExpression__Group_1__0__Impl rule__XAdditiveExpression__Group_1__1 ;
     public final void rule__XAdditiveExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12077:1: ( rule__XAdditiveExpression__Group_1__0__Impl rule__XAdditiveExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12078:2: rule__XAdditiveExpression__Group_1__0__Impl rule__XAdditiveExpression__Group_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11983:1: ( rule__XAdditiveExpression__Group_1__0__Impl rule__XAdditiveExpression__Group_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11984:2: rule__XAdditiveExpression__Group_1__0__Impl rule__XAdditiveExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1__0__Impl_in_rule__XAdditiveExpression__Group_1__024807);
+            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1__0__Impl_in_rule__XAdditiveExpression__Group_1__024621);
             rule__XAdditiveExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1__1_in_rule__XAdditiveExpression__Group_1__024810);
+            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1__1_in_rule__XAdditiveExpression__Group_1__024624);
             rule__XAdditiveExpression__Group_1__1();
 
             state._fsp--;
@@ -35719,25 +35456,25 @@ public final void rule__XAdditiveExpression__Group_1__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12085:1: rule__XAdditiveExpression__Group_1__0__Impl : ( ( rule__XAdditiveExpression__Group_1_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11991:1: rule__XAdditiveExpression__Group_1__0__Impl : ( ( rule__XAdditiveExpression__Group_1_0__0 ) ) ;
     public final void rule__XAdditiveExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12089:1: ( ( ( rule__XAdditiveExpression__Group_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12090:1: ( ( rule__XAdditiveExpression__Group_1_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11995:1: ( ( ( rule__XAdditiveExpression__Group_1_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11996:1: ( ( rule__XAdditiveExpression__Group_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12090:1: ( ( rule__XAdditiveExpression__Group_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12091:1: ( rule__XAdditiveExpression__Group_1_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11996:1: ( ( rule__XAdditiveExpression__Group_1_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11997:1: ( rule__XAdditiveExpression__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getGroup_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12092:1: ( rule__XAdditiveExpression__Group_1_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12092:2: rule__XAdditiveExpression__Group_1_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11998:1: ( rule__XAdditiveExpression__Group_1_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11998:2: rule__XAdditiveExpression__Group_1_0__0
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1_0__0_in_rule__XAdditiveExpression__Group_1__0__Impl24837);
+            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1_0__0_in_rule__XAdditiveExpression__Group_1__0__Impl24651);
             rule__XAdditiveExpression__Group_1_0__0();
 
             state._fsp--;
@@ -35770,16 +35507,16 @@ public final void rule__XAdditiveExpression__Group_1__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12102:1: rule__XAdditiveExpression__Group_1__1 : rule__XAdditiveExpression__Group_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12008:1: rule__XAdditiveExpression__Group_1__1 : rule__XAdditiveExpression__Group_1__1__Impl ;
     public final void rule__XAdditiveExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12106:1: ( rule__XAdditiveExpression__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12107:2: rule__XAdditiveExpression__Group_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12012:1: ( rule__XAdditiveExpression__Group_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12013:2: rule__XAdditiveExpression__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1__1__Impl_in_rule__XAdditiveExpression__Group_1__124867);
+            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1__1__Impl_in_rule__XAdditiveExpression__Group_1__124681);
             rule__XAdditiveExpression__Group_1__1__Impl();
 
             state._fsp--;
@@ -35803,25 +35540,25 @@ public final void rule__XAdditiveExpression__Group_1__1() throws RecognitionExce
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12113:1: rule__XAdditiveExpression__Group_1__1__Impl : ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12019:1: rule__XAdditiveExpression__Group_1__1__Impl : ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) ) ;
     public final void rule__XAdditiveExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12117:1: ( ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12118:1: ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12023:1: ( ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12024:1: ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12118:1: ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12119:1: ( rule__XAdditiveExpression__RightOperandAssignment_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12024:1: ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12025:1: ( rule__XAdditiveExpression__RightOperandAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getRightOperandAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12120:1: ( rule__XAdditiveExpression__RightOperandAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12120:2: rule__XAdditiveExpression__RightOperandAssignment_1_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12026:1: ( rule__XAdditiveExpression__RightOperandAssignment_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12026:2: rule__XAdditiveExpression__RightOperandAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__RightOperandAssignment_1_1_in_rule__XAdditiveExpression__Group_1__1__Impl24894);
+            pushFollow(FOLLOW_rule__XAdditiveExpression__RightOperandAssignment_1_1_in_rule__XAdditiveExpression__Group_1__1__Impl24708);
             rule__XAdditiveExpression__RightOperandAssignment_1_1();
 
             state._fsp--;
@@ -35854,16 +35591,16 @@ public final void rule__XAdditiveExpression__Group_1__1__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12134:1: rule__XAdditiveExpression__Group_1_0__0 : rule__XAdditiveExpression__Group_1_0__0__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12040:1: rule__XAdditiveExpression__Group_1_0__0 : rule__XAdditiveExpression__Group_1_0__0__Impl ;
     public final void rule__XAdditiveExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12138:1: ( rule__XAdditiveExpression__Group_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12139:2: rule__XAdditiveExpression__Group_1_0__0__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12044:1: ( rule__XAdditiveExpression__Group_1_0__0__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12045:2: rule__XAdditiveExpression__Group_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1_0__0__Impl_in_rule__XAdditiveExpression__Group_1_0__024928);
+            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1_0__0__Impl_in_rule__XAdditiveExpression__Group_1_0__024742);
             rule__XAdditiveExpression__Group_1_0__0__Impl();
 
             state._fsp--;
@@ -35887,25 +35624,25 @@ public final void rule__XAdditiveExpression__Group_1_0__0() throws RecognitionEx
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12145:1: rule__XAdditiveExpression__Group_1_0__0__Impl : ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12051:1: rule__XAdditiveExpression__Group_1_0__0__Impl : ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) ) ;
     public final void rule__XAdditiveExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12149:1: ( ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12150:1: ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12055:1: ( ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12056:1: ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12150:1: ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12151:1: ( rule__XAdditiveExpression__Group_1_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12056:1: ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12057:1: ( rule__XAdditiveExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getGroup_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12152:1: ( rule__XAdditiveExpression__Group_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12152:2: rule__XAdditiveExpression__Group_1_0_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12058:1: ( rule__XAdditiveExpression__Group_1_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12058:2: rule__XAdditiveExpression__Group_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1_0_0__0_in_rule__XAdditiveExpression__Group_1_0__0__Impl24955);
+            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1_0_0__0_in_rule__XAdditiveExpression__Group_1_0__0__Impl24769);
             rule__XAdditiveExpression__Group_1_0_0__0();
 
             state._fsp--;
@@ -35938,21 +35675,21 @@ public final void rule__XAdditiveExpression__Group_1_0__0__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12164:1: rule__XAdditiveExpression__Group_1_0_0__0 : rule__XAdditiveExpression__Group_1_0_0__0__Impl rule__XAdditiveExpression__Group_1_0_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12070:1: rule__XAdditiveExpression__Group_1_0_0__0 : rule__XAdditiveExpression__Group_1_0_0__0__Impl rule__XAdditiveExpression__Group_1_0_0__1 ;
     public final void rule__XAdditiveExpression__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12168:1: ( rule__XAdditiveExpression__Group_1_0_0__0__Impl rule__XAdditiveExpression__Group_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12169:2: rule__XAdditiveExpression__Group_1_0_0__0__Impl rule__XAdditiveExpression__Group_1_0_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12074:1: ( rule__XAdditiveExpression__Group_1_0_0__0__Impl rule__XAdditiveExpression__Group_1_0_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12075:2: rule__XAdditiveExpression__Group_1_0_0__0__Impl rule__XAdditiveExpression__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1_0_0__0__Impl_in_rule__XAdditiveExpression__Group_1_0_0__024987);
+            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1_0_0__0__Impl_in_rule__XAdditiveExpression__Group_1_0_0__024801);
             rule__XAdditiveExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1_0_0__1_in_rule__XAdditiveExpression__Group_1_0_0__024990);
+            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1_0_0__1_in_rule__XAdditiveExpression__Group_1_0_0__024804);
             rule__XAdditiveExpression__Group_1_0_0__1();
 
             state._fsp--;
@@ -35976,23 +35713,23 @@ public final void rule__XAdditiveExpression__Group_1_0_0__0() throws Recognition
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12176:1: rule__XAdditiveExpression__Group_1_0_0__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12082:1: rule__XAdditiveExpression__Group_1_0_0__0__Impl : ( () ) ;
     public final void rule__XAdditiveExpression__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12180:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12181:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12086:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12087:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12181:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12182:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12087:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12088:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12183:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12185:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12089:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12091:1: 
             {
             }
 
@@ -36017,16 +35754,16 @@ public final void rule__XAdditiveExpression__Group_1_0_0__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12195:1: rule__XAdditiveExpression__Group_1_0_0__1 : rule__XAdditiveExpression__Group_1_0_0__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12101:1: rule__XAdditiveExpression__Group_1_0_0__1 : rule__XAdditiveExpression__Group_1_0_0__1__Impl ;
     public final void rule__XAdditiveExpression__Group_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12199:1: ( rule__XAdditiveExpression__Group_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12200:2: rule__XAdditiveExpression__Group_1_0_0__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12105:1: ( rule__XAdditiveExpression__Group_1_0_0__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12106:2: rule__XAdditiveExpression__Group_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1_0_0__1__Impl_in_rule__XAdditiveExpression__Group_1_0_0__125048);
+            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1_0_0__1__Impl_in_rule__XAdditiveExpression__Group_1_0_0__124862);
             rule__XAdditiveExpression__Group_1_0_0__1__Impl();
 
             state._fsp--;
@@ -36050,25 +35787,25 @@ public final void rule__XAdditiveExpression__Group_1_0_0__1() throws Recognition
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12206:1: rule__XAdditiveExpression__Group_1_0_0__1__Impl : ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12112:1: rule__XAdditiveExpression__Group_1_0_0__1__Impl : ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) ) ;
     public final void rule__XAdditiveExpression__Group_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12210:1: ( ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12211:1: ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12116:1: ( ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12117:1: ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12211:1: ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12212:1: ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12117:1: ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12118:1: ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getFeatureAssignment_1_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12213:1: ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12213:2: rule__XAdditiveExpression__FeatureAssignment_1_0_0_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12119:1: ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12119:2: rule__XAdditiveExpression__FeatureAssignment_1_0_0_1
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__FeatureAssignment_1_0_0_1_in_rule__XAdditiveExpression__Group_1_0_0__1__Impl25075);
+            pushFollow(FOLLOW_rule__XAdditiveExpression__FeatureAssignment_1_0_0_1_in_rule__XAdditiveExpression__Group_1_0_0__1__Impl24889);
             rule__XAdditiveExpression__FeatureAssignment_1_0_0_1();
 
             state._fsp--;
@@ -36101,21 +35838,21 @@ public final void rule__XAdditiveExpression__Group_1_0_0__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12227:1: rule__XMultiplicativeExpression__Group__0 : rule__XMultiplicativeExpression__Group__0__Impl rule__XMultiplicativeExpression__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12133:1: rule__XMultiplicativeExpression__Group__0 : rule__XMultiplicativeExpression__Group__0__Impl rule__XMultiplicativeExpression__Group__1 ;
     public final void rule__XMultiplicativeExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12231:1: ( rule__XMultiplicativeExpression__Group__0__Impl rule__XMultiplicativeExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12232:2: rule__XMultiplicativeExpression__Group__0__Impl rule__XMultiplicativeExpression__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12137:1: ( rule__XMultiplicativeExpression__Group__0__Impl rule__XMultiplicativeExpression__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12138:2: rule__XMultiplicativeExpression__Group__0__Impl rule__XMultiplicativeExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group__0__Impl_in_rule__XMultiplicativeExpression__Group__025109);
+            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group__0__Impl_in_rule__XMultiplicativeExpression__Group__024923);
             rule__XMultiplicativeExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group__1_in_rule__XMultiplicativeExpression__Group__025112);
+            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group__1_in_rule__XMultiplicativeExpression__Group__024926);
             rule__XMultiplicativeExpression__Group__1();
 
             state._fsp--;
@@ -36139,22 +35876,22 @@ public final void rule__XMultiplicativeExpression__Group__0() throws Recognition
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12239:1: rule__XMultiplicativeExpression__Group__0__Impl : ( ruleXUnaryOperation ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12145:1: rule__XMultiplicativeExpression__Group__0__Impl : ( ruleXUnaryOperation ) ;
     public final void rule__XMultiplicativeExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12243:1: ( ( ruleXUnaryOperation ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12244:1: ( ruleXUnaryOperation )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12149:1: ( ( ruleXUnaryOperation ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12150:1: ( ruleXUnaryOperation )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12244:1: ( ruleXUnaryOperation )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12245:1: ruleXUnaryOperation
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12150:1: ( ruleXUnaryOperation )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12151:1: ruleXUnaryOperation
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getXUnaryOperationParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleXUnaryOperation_in_rule__XMultiplicativeExpression__Group__0__Impl25139);
+            pushFollow(FOLLOW_ruleXUnaryOperation_in_rule__XMultiplicativeExpression__Group__0__Impl24953);
             ruleXUnaryOperation();
 
             state._fsp--;
@@ -36184,16 +35921,16 @@ public final void rule__XMultiplicativeExpression__Group__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12256:1: rule__XMultiplicativeExpression__Group__1 : rule__XMultiplicativeExpression__Group__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12162:1: rule__XMultiplicativeExpression__Group__1 : rule__XMultiplicativeExpression__Group__1__Impl ;
     public final void rule__XMultiplicativeExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12260:1: ( rule__XMultiplicativeExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12261:2: rule__XMultiplicativeExpression__Group__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12166:1: ( rule__XMultiplicativeExpression__Group__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12167:2: rule__XMultiplicativeExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group__1__Impl_in_rule__XMultiplicativeExpression__Group__125168);
+            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group__1__Impl_in_rule__XMultiplicativeExpression__Group__124982);
             rule__XMultiplicativeExpression__Group__1__Impl();
 
             state._fsp--;
@@ -36217,32 +35954,32 @@ public final void rule__XMultiplicativeExpression__Group__1() throws Recognition
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12267:1: rule__XMultiplicativeExpression__Group__1__Impl : ( ( rule__XMultiplicativeExpression__Group_1__0 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12173:1: rule__XMultiplicativeExpression__Group__1__Impl : ( ( rule__XMultiplicativeExpression__Group_1__0 )* ) ;
     public final void rule__XMultiplicativeExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12271:1: ( ( ( rule__XMultiplicativeExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12272:1: ( ( rule__XMultiplicativeExpression__Group_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12177:1: ( ( ( rule__XMultiplicativeExpression__Group_1__0 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12178:1: ( ( rule__XMultiplicativeExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12272:1: ( ( rule__XMultiplicativeExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12273:1: ( rule__XMultiplicativeExpression__Group_1__0 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12178:1: ( ( rule__XMultiplicativeExpression__Group_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12179:1: ( rule__XMultiplicativeExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12274:1: ( rule__XMultiplicativeExpression__Group_1__0 )*
-            loop102:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12180:1: ( rule__XMultiplicativeExpression__Group_1__0 )*
+            loop101:
             do {
-                int alt102=2;
+                int alt101=2;
                 switch ( input.LA(1) ) {
                 case 56:
                     {
-                    int LA102_2 = input.LA(2);
+                    int LA101_2 = input.LA(2);
 
-                    if ( (synpred168_InternalCheck()) ) {
-                        alt102=1;
+                    if ( (synpred167_InternalCheck()) ) {
+                        alt101=1;
                     }
 
 
@@ -36250,10 +35987,10 @@ public final void rule__XMultiplicativeExpression__Group__1__Impl() throws Recog
                     break;
                 case 57:
                     {
-                    int LA102_3 = input.LA(2);
+                    int LA101_3 = input.LA(2);
 
-                    if ( (synpred168_InternalCheck()) ) {
-                        alt102=1;
+                    if ( (synpred167_InternalCheck()) ) {
+                        alt101=1;
                     }
 
 
@@ -36261,10 +35998,10 @@ public final void rule__XMultiplicativeExpression__Group__1__Impl() throws Recog
                     break;
                 case 58:
                     {
-                    int LA102_4 = input.LA(2);
+                    int LA101_4 = input.LA(2);
 
-                    if ( (synpred168_InternalCheck()) ) {
-                        alt102=1;
+                    if ( (synpred167_InternalCheck()) ) {
+                        alt101=1;
                     }
 
 
@@ -36272,10 +36009,10 @@ public final void rule__XMultiplicativeExpression__Group__1__Impl() throws Recog
                     break;
                 case 59:
                     {
-                    int LA102_5 = input.LA(2);
+                    int LA101_5 = input.LA(2);
 
-                    if ( (synpred168_InternalCheck()) ) {
-                        alt102=1;
+                    if ( (synpred167_InternalCheck()) ) {
+                        alt101=1;
                     }
 
 
@@ -36284,11 +36021,11 @@ public final void rule__XMultiplicativeExpression__Group__1__Impl() throws Recog
 
                 }
 
-                switch (alt102) {
+                switch (alt101) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12274:2: rule__XMultiplicativeExpression__Group_1__0
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12180:2: rule__XMultiplicativeExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1__0_in_rule__XMultiplicativeExpression__Group__1__Impl25195);
+            	    pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1__0_in_rule__XMultiplicativeExpression__Group__1__Impl25009);
             	    rule__XMultiplicativeExpression__Group_1__0();
 
             	    state._fsp--;
@@ -36298,7 +36035,7 @@ public final void rule__XMultiplicativeExpression__Group__1__Impl() throws Recog
             	    break;
 
             	default :
-            	    break loop102;
+            	    break loop101;
                 }
             } while (true);
 
@@ -36327,21 +36064,21 @@ public final void rule__XMultiplicativeExpression__Group__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12288:1: rule__XMultiplicativeExpression__Group_1__0 : rule__XMultiplicativeExpression__Group_1__0__Impl rule__XMultiplicativeExpression__Group_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12194:1: rule__XMultiplicativeExpression__Group_1__0 : rule__XMultiplicativeExpression__Group_1__0__Impl rule__XMultiplicativeExpression__Group_1__1 ;
     public final void rule__XMultiplicativeExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12292:1: ( rule__XMultiplicativeExpression__Group_1__0__Impl rule__XMultiplicativeExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12293:2: rule__XMultiplicativeExpression__Group_1__0__Impl rule__XMultiplicativeExpression__Group_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12198:1: ( rule__XMultiplicativeExpression__Group_1__0__Impl rule__XMultiplicativeExpression__Group_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12199:2: rule__XMultiplicativeExpression__Group_1__0__Impl rule__XMultiplicativeExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1__0__Impl_in_rule__XMultiplicativeExpression__Group_1__025230);
+            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1__0__Impl_in_rule__XMultiplicativeExpression__Group_1__025044);
             rule__XMultiplicativeExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1__1_in_rule__XMultiplicativeExpression__Group_1__025233);
+            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1__1_in_rule__XMultiplicativeExpression__Group_1__025047);
             rule__XMultiplicativeExpression__Group_1__1();
 
             state._fsp--;
@@ -36365,25 +36102,25 @@ public final void rule__XMultiplicativeExpression__Group_1__0() throws Recogniti
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12300:1: rule__XMultiplicativeExpression__Group_1__0__Impl : ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12206:1: rule__XMultiplicativeExpression__Group_1__0__Impl : ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) ) ;
     public final void rule__XMultiplicativeExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12304:1: ( ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12305:1: ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12210:1: ( ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12211:1: ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12305:1: ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12306:1: ( rule__XMultiplicativeExpression__Group_1_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12211:1: ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12212:1: ( rule__XMultiplicativeExpression__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getGroup_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12307:1: ( rule__XMultiplicativeExpression__Group_1_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12307:2: rule__XMultiplicativeExpression__Group_1_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12213:1: ( rule__XMultiplicativeExpression__Group_1_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12213:2: rule__XMultiplicativeExpression__Group_1_0__0
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1_0__0_in_rule__XMultiplicativeExpression__Group_1__0__Impl25260);
+            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1_0__0_in_rule__XMultiplicativeExpression__Group_1__0__Impl25074);
             rule__XMultiplicativeExpression__Group_1_0__0();
 
             state._fsp--;
@@ -36416,16 +36153,16 @@ public final void rule__XMultiplicativeExpression__Group_1__0__Impl() throws Rec
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12317:1: rule__XMultiplicativeExpression__Group_1__1 : rule__XMultiplicativeExpression__Group_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12223:1: rule__XMultiplicativeExpression__Group_1__1 : rule__XMultiplicativeExpression__Group_1__1__Impl ;
     public final void rule__XMultiplicativeExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12321:1: ( rule__XMultiplicativeExpression__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12322:2: rule__XMultiplicativeExpression__Group_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12227:1: ( rule__XMultiplicativeExpression__Group_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12228:2: rule__XMultiplicativeExpression__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1__1__Impl_in_rule__XMultiplicativeExpression__Group_1__125290);
+            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1__1__Impl_in_rule__XMultiplicativeExpression__Group_1__125104);
             rule__XMultiplicativeExpression__Group_1__1__Impl();
 
             state._fsp--;
@@ -36449,25 +36186,25 @@ public final void rule__XMultiplicativeExpression__Group_1__1() throws Recogniti
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12328:1: rule__XMultiplicativeExpression__Group_1__1__Impl : ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12234:1: rule__XMultiplicativeExpression__Group_1__1__Impl : ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) ) ;
     public final void rule__XMultiplicativeExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12332:1: ( ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12333:1: ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12238:1: ( ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12239:1: ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12333:1: ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12334:1: ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12239:1: ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12240:1: ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getRightOperandAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12335:1: ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12335:2: rule__XMultiplicativeExpression__RightOperandAssignment_1_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12241:1: ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12241:2: rule__XMultiplicativeExpression__RightOperandAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__RightOperandAssignment_1_1_in_rule__XMultiplicativeExpression__Group_1__1__Impl25317);
+            pushFollow(FOLLOW_rule__XMultiplicativeExpression__RightOperandAssignment_1_1_in_rule__XMultiplicativeExpression__Group_1__1__Impl25131);
             rule__XMultiplicativeExpression__RightOperandAssignment_1_1();
 
             state._fsp--;
@@ -36500,16 +36237,16 @@ public final void rule__XMultiplicativeExpression__Group_1__1__Impl() throws Rec
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12349:1: rule__XMultiplicativeExpression__Group_1_0__0 : rule__XMultiplicativeExpression__Group_1_0__0__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12255:1: rule__XMultiplicativeExpression__Group_1_0__0 : rule__XMultiplicativeExpression__Group_1_0__0__Impl ;
     public final void rule__XMultiplicativeExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12353:1: ( rule__XMultiplicativeExpression__Group_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12354:2: rule__XMultiplicativeExpression__Group_1_0__0__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12259:1: ( rule__XMultiplicativeExpression__Group_1_0__0__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12260:2: rule__XMultiplicativeExpression__Group_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1_0__0__Impl_in_rule__XMultiplicativeExpression__Group_1_0__025351);
+            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1_0__0__Impl_in_rule__XMultiplicativeExpression__Group_1_0__025165);
             rule__XMultiplicativeExpression__Group_1_0__0__Impl();
 
             state._fsp--;
@@ -36533,25 +36270,25 @@ public final void rule__XMultiplicativeExpression__Group_1_0__0() throws Recogni
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12360:1: rule__XMultiplicativeExpression__Group_1_0__0__Impl : ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12266:1: rule__XMultiplicativeExpression__Group_1_0__0__Impl : ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) ) ;
     public final void rule__XMultiplicativeExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12364:1: ( ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12365:1: ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12270:1: ( ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12271:1: ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12365:1: ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12366:1: ( rule__XMultiplicativeExpression__Group_1_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12271:1: ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12272:1: ( rule__XMultiplicativeExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getGroup_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12367:1: ( rule__XMultiplicativeExpression__Group_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12367:2: rule__XMultiplicativeExpression__Group_1_0_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12273:1: ( rule__XMultiplicativeExpression__Group_1_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12273:2: rule__XMultiplicativeExpression__Group_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1_0_0__0_in_rule__XMultiplicativeExpression__Group_1_0__0__Impl25378);
+            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1_0_0__0_in_rule__XMultiplicativeExpression__Group_1_0__0__Impl25192);
             rule__XMultiplicativeExpression__Group_1_0_0__0();
 
             state._fsp--;
@@ -36584,21 +36321,21 @@ public final void rule__XMultiplicativeExpression__Group_1_0__0__Impl() throws R
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12379:1: rule__XMultiplicativeExpression__Group_1_0_0__0 : rule__XMultiplicativeExpression__Group_1_0_0__0__Impl rule__XMultiplicativeExpression__Group_1_0_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12285:1: rule__XMultiplicativeExpression__Group_1_0_0__0 : rule__XMultiplicativeExpression__Group_1_0_0__0__Impl rule__XMultiplicativeExpression__Group_1_0_0__1 ;
     public final void rule__XMultiplicativeExpression__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12383:1: ( rule__XMultiplicativeExpression__Group_1_0_0__0__Impl rule__XMultiplicativeExpression__Group_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12384:2: rule__XMultiplicativeExpression__Group_1_0_0__0__Impl rule__XMultiplicativeExpression__Group_1_0_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12289:1: ( rule__XMultiplicativeExpression__Group_1_0_0__0__Impl rule__XMultiplicativeExpression__Group_1_0_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12290:2: rule__XMultiplicativeExpression__Group_1_0_0__0__Impl rule__XMultiplicativeExpression__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1_0_0__0__Impl_in_rule__XMultiplicativeExpression__Group_1_0_0__025410);
+            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1_0_0__0__Impl_in_rule__XMultiplicativeExpression__Group_1_0_0__025224);
             rule__XMultiplicativeExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1_0_0__1_in_rule__XMultiplicativeExpression__Group_1_0_0__025413);
+            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1_0_0__1_in_rule__XMultiplicativeExpression__Group_1_0_0__025227);
             rule__XMultiplicativeExpression__Group_1_0_0__1();
 
             state._fsp--;
@@ -36622,23 +36359,23 @@ public final void rule__XMultiplicativeExpression__Group_1_0_0__0() throws Recog
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12391:1: rule__XMultiplicativeExpression__Group_1_0_0__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12297:1: rule__XMultiplicativeExpression__Group_1_0_0__0__Impl : ( () ) ;
     public final void rule__XMultiplicativeExpression__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12395:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12396:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12301:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12302:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12396:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12397:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12302:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12303:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12398:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12400:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12304:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12306:1: 
             {
             }
 
@@ -36663,16 +36400,16 @@ public final void rule__XMultiplicativeExpression__Group_1_0_0__0__Impl() throws
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12410:1: rule__XMultiplicativeExpression__Group_1_0_0__1 : rule__XMultiplicativeExpression__Group_1_0_0__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12316:1: rule__XMultiplicativeExpression__Group_1_0_0__1 : rule__XMultiplicativeExpression__Group_1_0_0__1__Impl ;
     public final void rule__XMultiplicativeExpression__Group_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12414:1: ( rule__XMultiplicativeExpression__Group_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12415:2: rule__XMultiplicativeExpression__Group_1_0_0__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12320:1: ( rule__XMultiplicativeExpression__Group_1_0_0__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12321:2: rule__XMultiplicativeExpression__Group_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1_0_0__1__Impl_in_rule__XMultiplicativeExpression__Group_1_0_0__125471);
+            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1_0_0__1__Impl_in_rule__XMultiplicativeExpression__Group_1_0_0__125285);
             rule__XMultiplicativeExpression__Group_1_0_0__1__Impl();
 
             state._fsp--;
@@ -36696,25 +36433,25 @@ public final void rule__XMultiplicativeExpression__Group_1_0_0__1() throws Recog
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12421:1: rule__XMultiplicativeExpression__Group_1_0_0__1__Impl : ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12327:1: rule__XMultiplicativeExpression__Group_1_0_0__1__Impl : ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) ) ;
     public final void rule__XMultiplicativeExpression__Group_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12425:1: ( ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12426:1: ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12331:1: ( ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12332:1: ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12426:1: ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12427:1: ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12332:1: ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12333:1: ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getFeatureAssignment_1_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12428:1: ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12428:2: rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12334:1: ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12334:2: rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1_in_rule__XMultiplicativeExpression__Group_1_0_0__1__Impl25498);
+            pushFollow(FOLLOW_rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1_in_rule__XMultiplicativeExpression__Group_1_0_0__1__Impl25312);
             rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1();
 
             state._fsp--;
@@ -36747,21 +36484,21 @@ public final void rule__XMultiplicativeExpression__Group_1_0_0__1__Impl() throws
 
 
     // $ANTLR start "rule__XUnaryOperation__Group_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12442:1: rule__XUnaryOperation__Group_0__0 : rule__XUnaryOperation__Group_0__0__Impl rule__XUnaryOperation__Group_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12348:1: rule__XUnaryOperation__Group_0__0 : rule__XUnaryOperation__Group_0__0__Impl rule__XUnaryOperation__Group_0__1 ;
     public final void rule__XUnaryOperation__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12446:1: ( rule__XUnaryOperation__Group_0__0__Impl rule__XUnaryOperation__Group_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12447:2: rule__XUnaryOperation__Group_0__0__Impl rule__XUnaryOperation__Group_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12352:1: ( rule__XUnaryOperation__Group_0__0__Impl rule__XUnaryOperation__Group_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12353:2: rule__XUnaryOperation__Group_0__0__Impl rule__XUnaryOperation__Group_0__1
             {
-            pushFollow(FOLLOW_rule__XUnaryOperation__Group_0__0__Impl_in_rule__XUnaryOperation__Group_0__025532);
+            pushFollow(FOLLOW_rule__XUnaryOperation__Group_0__0__Impl_in_rule__XUnaryOperation__Group_0__025346);
             rule__XUnaryOperation__Group_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XUnaryOperation__Group_0__1_in_rule__XUnaryOperation__Group_0__025535);
+            pushFollow(FOLLOW_rule__XUnaryOperation__Group_0__1_in_rule__XUnaryOperation__Group_0__025349);
             rule__XUnaryOperation__Group_0__1();
 
             state._fsp--;
@@ -36785,23 +36522,23 @@ public final void rule__XUnaryOperation__Group_0__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XUnaryOperation__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12454:1: rule__XUnaryOperation__Group_0__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12360:1: rule__XUnaryOperation__Group_0__0__Impl : ( () ) ;
     public final void rule__XUnaryOperation__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12458:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12459:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12364:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12365:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12459:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12460:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12365:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12366:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationAccess().getXUnaryOperationAction_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12461:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12463:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12367:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12369:1: 
             {
             }
 
@@ -36826,21 +36563,21 @@ public final void rule__XUnaryOperation__Group_0__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XUnaryOperation__Group_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12473:1: rule__XUnaryOperation__Group_0__1 : rule__XUnaryOperation__Group_0__1__Impl rule__XUnaryOperation__Group_0__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12379:1: rule__XUnaryOperation__Group_0__1 : rule__XUnaryOperation__Group_0__1__Impl rule__XUnaryOperation__Group_0__2 ;
     public final void rule__XUnaryOperation__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12477:1: ( rule__XUnaryOperation__Group_0__1__Impl rule__XUnaryOperation__Group_0__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12478:2: rule__XUnaryOperation__Group_0__1__Impl rule__XUnaryOperation__Group_0__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12383:1: ( rule__XUnaryOperation__Group_0__1__Impl rule__XUnaryOperation__Group_0__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12384:2: rule__XUnaryOperation__Group_0__1__Impl rule__XUnaryOperation__Group_0__2
             {
-            pushFollow(FOLLOW_rule__XUnaryOperation__Group_0__1__Impl_in_rule__XUnaryOperation__Group_0__125593);
+            pushFollow(FOLLOW_rule__XUnaryOperation__Group_0__1__Impl_in_rule__XUnaryOperation__Group_0__125407);
             rule__XUnaryOperation__Group_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XUnaryOperation__Group_0__2_in_rule__XUnaryOperation__Group_0__125596);
+            pushFollow(FOLLOW_rule__XUnaryOperation__Group_0__2_in_rule__XUnaryOperation__Group_0__125410);
             rule__XUnaryOperation__Group_0__2();
 
             state._fsp--;
@@ -36864,25 +36601,25 @@ public final void rule__XUnaryOperation__Group_0__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XUnaryOperation__Group_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12485:1: rule__XUnaryOperation__Group_0__1__Impl : ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12391:1: rule__XUnaryOperation__Group_0__1__Impl : ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) ) ;
     public final void rule__XUnaryOperation__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12489:1: ( ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12490:1: ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12395:1: ( ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12396:1: ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12490:1: ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12491:1: ( rule__XUnaryOperation__FeatureAssignment_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12396:1: ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12397:1: ( rule__XUnaryOperation__FeatureAssignment_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationAccess().getFeatureAssignment_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12492:1: ( rule__XUnaryOperation__FeatureAssignment_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12492:2: rule__XUnaryOperation__FeatureAssignment_0_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12398:1: ( rule__XUnaryOperation__FeatureAssignment_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12398:2: rule__XUnaryOperation__FeatureAssignment_0_1
             {
-            pushFollow(FOLLOW_rule__XUnaryOperation__FeatureAssignment_0_1_in_rule__XUnaryOperation__Group_0__1__Impl25623);
+            pushFollow(FOLLOW_rule__XUnaryOperation__FeatureAssignment_0_1_in_rule__XUnaryOperation__Group_0__1__Impl25437);
             rule__XUnaryOperation__FeatureAssignment_0_1();
 
             state._fsp--;
@@ -36915,16 +36652,16 @@ public final void rule__XUnaryOperation__Group_0__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XUnaryOperation__Group_0__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12502:1: rule__XUnaryOperation__Group_0__2 : rule__XUnaryOperation__Group_0__2__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12408:1: rule__XUnaryOperation__Group_0__2 : rule__XUnaryOperation__Group_0__2__Impl ;
     public final void rule__XUnaryOperation__Group_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12506:1: ( rule__XUnaryOperation__Group_0__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12507:2: rule__XUnaryOperation__Group_0__2__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12412:1: ( rule__XUnaryOperation__Group_0__2__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12413:2: rule__XUnaryOperation__Group_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__XUnaryOperation__Group_0__2__Impl_in_rule__XUnaryOperation__Group_0__225653);
+            pushFollow(FOLLOW_rule__XUnaryOperation__Group_0__2__Impl_in_rule__XUnaryOperation__Group_0__225467);
             rule__XUnaryOperation__Group_0__2__Impl();
 
             state._fsp--;
@@ -36948,25 +36685,25 @@ public final void rule__XUnaryOperation__Group_0__2() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XUnaryOperation__Group_0__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12513:1: rule__XUnaryOperation__Group_0__2__Impl : ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12419:1: rule__XUnaryOperation__Group_0__2__Impl : ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) ) ;
     public final void rule__XUnaryOperation__Group_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12517:1: ( ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12518:1: ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12423:1: ( ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12424:1: ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12518:1: ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12519:1: ( rule__XUnaryOperation__OperandAssignment_0_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12424:1: ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12425:1: ( rule__XUnaryOperation__OperandAssignment_0_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationAccess().getOperandAssignment_0_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12520:1: ( rule__XUnaryOperation__OperandAssignment_0_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12520:2: rule__XUnaryOperation__OperandAssignment_0_2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12426:1: ( rule__XUnaryOperation__OperandAssignment_0_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12426:2: rule__XUnaryOperation__OperandAssignment_0_2
             {
-            pushFollow(FOLLOW_rule__XUnaryOperation__OperandAssignment_0_2_in_rule__XUnaryOperation__Group_0__2__Impl25680);
+            pushFollow(FOLLOW_rule__XUnaryOperation__OperandAssignment_0_2_in_rule__XUnaryOperation__Group_0__2__Impl25494);
             rule__XUnaryOperation__OperandAssignment_0_2();
 
             state._fsp--;
@@ -36999,21 +36736,21 @@ public final void rule__XUnaryOperation__Group_0__2__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XCastedExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12536:1: rule__XCastedExpression__Group__0 : rule__XCastedExpression__Group__0__Impl rule__XCastedExpression__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12442:1: rule__XCastedExpression__Group__0 : rule__XCastedExpression__Group__0__Impl rule__XCastedExpression__Group__1 ;
     public final void rule__XCastedExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12540:1: ( rule__XCastedExpression__Group__0__Impl rule__XCastedExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12541:2: rule__XCastedExpression__Group__0__Impl rule__XCastedExpression__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12446:1: ( rule__XCastedExpression__Group__0__Impl rule__XCastedExpression__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12447:2: rule__XCastedExpression__Group__0__Impl rule__XCastedExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__Group__0__Impl_in_rule__XCastedExpression__Group__025716);
+            pushFollow(FOLLOW_rule__XCastedExpression__Group__0__Impl_in_rule__XCastedExpression__Group__025530);
             rule__XCastedExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCastedExpression__Group__1_in_rule__XCastedExpression__Group__025719);
+            pushFollow(FOLLOW_rule__XCastedExpression__Group__1_in_rule__XCastedExpression__Group__025533);
             rule__XCastedExpression__Group__1();
 
             state._fsp--;
@@ -37037,22 +36774,22 @@ public final void rule__XCastedExpression__Group__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XCastedExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12548:1: rule__XCastedExpression__Group__0__Impl : ( ruleXPostfixOperation ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12454:1: rule__XCastedExpression__Group__0__Impl : ( ruleXPostfixOperation ) ;
     public final void rule__XCastedExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12552:1: ( ( ruleXPostfixOperation ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12553:1: ( ruleXPostfixOperation )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12458:1: ( ( ruleXPostfixOperation ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12459:1: ( ruleXPostfixOperation )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12553:1: ( ruleXPostfixOperation )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12554:1: ruleXPostfixOperation
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12459:1: ( ruleXPostfixOperation )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12460:1: ruleXPostfixOperation
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getXPostfixOperationParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleXPostfixOperation_in_rule__XCastedExpression__Group__0__Impl25746);
+            pushFollow(FOLLOW_ruleXPostfixOperation_in_rule__XCastedExpression__Group__0__Impl25560);
             ruleXPostfixOperation();
 
             state._fsp--;
@@ -37082,16 +36819,16 @@ public final void rule__XCastedExpression__Group__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XCastedExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12565:1: rule__XCastedExpression__Group__1 : rule__XCastedExpression__Group__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12471:1: rule__XCastedExpression__Group__1 : rule__XCastedExpression__Group__1__Impl ;
     public final void rule__XCastedExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12569:1: ( rule__XCastedExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12570:2: rule__XCastedExpression__Group__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12475:1: ( rule__XCastedExpression__Group__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12476:2: rule__XCastedExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__Group__1__Impl_in_rule__XCastedExpression__Group__125775);
+            pushFollow(FOLLOW_rule__XCastedExpression__Group__1__Impl_in_rule__XCastedExpression__Group__125589);
             rule__XCastedExpression__Group__1__Impl();
 
             state._fsp--;
@@ -37115,43 +36852,43 @@ public final void rule__XCastedExpression__Group__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XCastedExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12576:1: rule__XCastedExpression__Group__1__Impl : ( ( rule__XCastedExpression__Group_1__0 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12482:1: rule__XCastedExpression__Group__1__Impl : ( ( rule__XCastedExpression__Group_1__0 )* ) ;
     public final void rule__XCastedExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12580:1: ( ( ( rule__XCastedExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12581:1: ( ( rule__XCastedExpression__Group_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12486:1: ( ( ( rule__XCastedExpression__Group_1__0 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12487:1: ( ( rule__XCastedExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12581:1: ( ( rule__XCastedExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12582:1: ( rule__XCastedExpression__Group_1__0 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12487:1: ( ( rule__XCastedExpression__Group_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12488:1: ( rule__XCastedExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12583:1: ( rule__XCastedExpression__Group_1__0 )*
-            loop103:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12489:1: ( rule__XCastedExpression__Group_1__0 )*
+            loop102:
             do {
-                int alt103=2;
-                int LA103_0 = input.LA(1);
+                int alt102=2;
+                int LA102_0 = input.LA(1);
 
-                if ( (LA103_0==83) ) {
-                    int LA103_2 = input.LA(2);
+                if ( (LA102_0==83) ) {
+                    int LA102_2 = input.LA(2);
 
-                    if ( (synpred169_InternalCheck()) ) {
-                        alt103=1;
+                    if ( (synpred168_InternalCheck()) ) {
+                        alt102=1;
                     }
 
 
                 }
 
 
-                switch (alt103) {
+                switch (alt102) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12583:2: rule__XCastedExpression__Group_1__0
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12489:2: rule__XCastedExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XCastedExpression__Group_1__0_in_rule__XCastedExpression__Group__1__Impl25802);
+            	    pushFollow(FOLLOW_rule__XCastedExpression__Group_1__0_in_rule__XCastedExpression__Group__1__Impl25616);
             	    rule__XCastedExpression__Group_1__0();
 
             	    state._fsp--;
@@ -37161,7 +36898,7 @@ public final void rule__XCastedExpression__Group__1__Impl() throws RecognitionEx
             	    break;
 
             	default :
-            	    break loop103;
+            	    break loop102;
                 }
             } while (true);
 
@@ -37190,21 +36927,21 @@ public final void rule__XCastedExpression__Group__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12597:1: rule__XCastedExpression__Group_1__0 : rule__XCastedExpression__Group_1__0__Impl rule__XCastedExpression__Group_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12503:1: rule__XCastedExpression__Group_1__0 : rule__XCastedExpression__Group_1__0__Impl rule__XCastedExpression__Group_1__1 ;
     public final void rule__XCastedExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12601:1: ( rule__XCastedExpression__Group_1__0__Impl rule__XCastedExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12602:2: rule__XCastedExpression__Group_1__0__Impl rule__XCastedExpression__Group_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12507:1: ( rule__XCastedExpression__Group_1__0__Impl rule__XCastedExpression__Group_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12508:2: rule__XCastedExpression__Group_1__0__Impl rule__XCastedExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__Group_1__0__Impl_in_rule__XCastedExpression__Group_1__025837);
+            pushFollow(FOLLOW_rule__XCastedExpression__Group_1__0__Impl_in_rule__XCastedExpression__Group_1__025651);
             rule__XCastedExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCastedExpression__Group_1__1_in_rule__XCastedExpression__Group_1__025840);
+            pushFollow(FOLLOW_rule__XCastedExpression__Group_1__1_in_rule__XCastedExpression__Group_1__025654);
             rule__XCastedExpression__Group_1__1();
 
             state._fsp--;
@@ -37228,25 +36965,25 @@ public final void rule__XCastedExpression__Group_1__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12609:1: rule__XCastedExpression__Group_1__0__Impl : ( ( rule__XCastedExpression__Group_1_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12515:1: rule__XCastedExpression__Group_1__0__Impl : ( ( rule__XCastedExpression__Group_1_0__0 ) ) ;
     public final void rule__XCastedExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12613:1: ( ( ( rule__XCastedExpression__Group_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12614:1: ( ( rule__XCastedExpression__Group_1_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12519:1: ( ( ( rule__XCastedExpression__Group_1_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12520:1: ( ( rule__XCastedExpression__Group_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12614:1: ( ( rule__XCastedExpression__Group_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12615:1: ( rule__XCastedExpression__Group_1_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12520:1: ( ( rule__XCastedExpression__Group_1_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12521:1: ( rule__XCastedExpression__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getGroup_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12616:1: ( rule__XCastedExpression__Group_1_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12616:2: rule__XCastedExpression__Group_1_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12522:1: ( rule__XCastedExpression__Group_1_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12522:2: rule__XCastedExpression__Group_1_0__0
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__Group_1_0__0_in_rule__XCastedExpression__Group_1__0__Impl25867);
+            pushFollow(FOLLOW_rule__XCastedExpression__Group_1_0__0_in_rule__XCastedExpression__Group_1__0__Impl25681);
             rule__XCastedExpression__Group_1_0__0();
 
             state._fsp--;
@@ -37279,16 +37016,16 @@ public final void rule__XCastedExpression__Group_1__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12626:1: rule__XCastedExpression__Group_1__1 : rule__XCastedExpression__Group_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12532:1: rule__XCastedExpression__Group_1__1 : rule__XCastedExpression__Group_1__1__Impl ;
     public final void rule__XCastedExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12630:1: ( rule__XCastedExpression__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12631:2: rule__XCastedExpression__Group_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12536:1: ( rule__XCastedExpression__Group_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12537:2: rule__XCastedExpression__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__Group_1__1__Impl_in_rule__XCastedExpression__Group_1__125897);
+            pushFollow(FOLLOW_rule__XCastedExpression__Group_1__1__Impl_in_rule__XCastedExpression__Group_1__125711);
             rule__XCastedExpression__Group_1__1__Impl();
 
             state._fsp--;
@@ -37312,25 +37049,25 @@ public final void rule__XCastedExpression__Group_1__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12637:1: rule__XCastedExpression__Group_1__1__Impl : ( ( rule__XCastedExpression__TypeAssignment_1_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12543:1: rule__XCastedExpression__Group_1__1__Impl : ( ( rule__XCastedExpression__TypeAssignment_1_1 ) ) ;
     public final void rule__XCastedExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12641:1: ( ( ( rule__XCastedExpression__TypeAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12642:1: ( ( rule__XCastedExpression__TypeAssignment_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12547:1: ( ( ( rule__XCastedExpression__TypeAssignment_1_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12548:1: ( ( rule__XCastedExpression__TypeAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12642:1: ( ( rule__XCastedExpression__TypeAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12643:1: ( rule__XCastedExpression__TypeAssignment_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12548:1: ( ( rule__XCastedExpression__TypeAssignment_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12549:1: ( rule__XCastedExpression__TypeAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getTypeAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12644:1: ( rule__XCastedExpression__TypeAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12644:2: rule__XCastedExpression__TypeAssignment_1_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12550:1: ( rule__XCastedExpression__TypeAssignment_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12550:2: rule__XCastedExpression__TypeAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__TypeAssignment_1_1_in_rule__XCastedExpression__Group_1__1__Impl25924);
+            pushFollow(FOLLOW_rule__XCastedExpression__TypeAssignment_1_1_in_rule__XCastedExpression__Group_1__1__Impl25738);
             rule__XCastedExpression__TypeAssignment_1_1();
 
             state._fsp--;
@@ -37363,16 +37100,16 @@ public final void rule__XCastedExpression__Group_1__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12658:1: rule__XCastedExpression__Group_1_0__0 : rule__XCastedExpression__Group_1_0__0__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12564:1: rule__XCastedExpression__Group_1_0__0 : rule__XCastedExpression__Group_1_0__0__Impl ;
     public final void rule__XCastedExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12662:1: ( rule__XCastedExpression__Group_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12663:2: rule__XCastedExpression__Group_1_0__0__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12568:1: ( rule__XCastedExpression__Group_1_0__0__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12569:2: rule__XCastedExpression__Group_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__Group_1_0__0__Impl_in_rule__XCastedExpression__Group_1_0__025958);
+            pushFollow(FOLLOW_rule__XCastedExpression__Group_1_0__0__Impl_in_rule__XCastedExpression__Group_1_0__025772);
             rule__XCastedExpression__Group_1_0__0__Impl();
 
             state._fsp--;
@@ -37396,25 +37133,25 @@ public final void rule__XCastedExpression__Group_1_0__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12669:1: rule__XCastedExpression__Group_1_0__0__Impl : ( ( rule__XCastedExpression__Group_1_0_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12575:1: rule__XCastedExpression__Group_1_0__0__Impl : ( ( rule__XCastedExpression__Group_1_0_0__0 ) ) ;
     public final void rule__XCastedExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12673:1: ( ( ( rule__XCastedExpression__Group_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12674:1: ( ( rule__XCastedExpression__Group_1_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12579:1: ( ( ( rule__XCastedExpression__Group_1_0_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12580:1: ( ( rule__XCastedExpression__Group_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12674:1: ( ( rule__XCastedExpression__Group_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12675:1: ( rule__XCastedExpression__Group_1_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12580:1: ( ( rule__XCastedExpression__Group_1_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12581:1: ( rule__XCastedExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getGroup_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12676:1: ( rule__XCastedExpression__Group_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12676:2: rule__XCastedExpression__Group_1_0_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12582:1: ( rule__XCastedExpression__Group_1_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12582:2: rule__XCastedExpression__Group_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__Group_1_0_0__0_in_rule__XCastedExpression__Group_1_0__0__Impl25985);
+            pushFollow(FOLLOW_rule__XCastedExpression__Group_1_0_0__0_in_rule__XCastedExpression__Group_1_0__0__Impl25799);
             rule__XCastedExpression__Group_1_0_0__0();
 
             state._fsp--;
@@ -37447,21 +37184,21 @@ public final void rule__XCastedExpression__Group_1_0__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12688:1: rule__XCastedExpression__Group_1_0_0__0 : rule__XCastedExpression__Group_1_0_0__0__Impl rule__XCastedExpression__Group_1_0_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12594:1: rule__XCastedExpression__Group_1_0_0__0 : rule__XCastedExpression__Group_1_0_0__0__Impl rule__XCastedExpression__Group_1_0_0__1 ;
     public final void rule__XCastedExpression__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12692:1: ( rule__XCastedExpression__Group_1_0_0__0__Impl rule__XCastedExpression__Group_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12693:2: rule__XCastedExpression__Group_1_0_0__0__Impl rule__XCastedExpression__Group_1_0_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12598:1: ( rule__XCastedExpression__Group_1_0_0__0__Impl rule__XCastedExpression__Group_1_0_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12599:2: rule__XCastedExpression__Group_1_0_0__0__Impl rule__XCastedExpression__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__Group_1_0_0__0__Impl_in_rule__XCastedExpression__Group_1_0_0__026017);
+            pushFollow(FOLLOW_rule__XCastedExpression__Group_1_0_0__0__Impl_in_rule__XCastedExpression__Group_1_0_0__025831);
             rule__XCastedExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCastedExpression__Group_1_0_0__1_in_rule__XCastedExpression__Group_1_0_0__026020);
+            pushFollow(FOLLOW_rule__XCastedExpression__Group_1_0_0__1_in_rule__XCastedExpression__Group_1_0_0__025834);
             rule__XCastedExpression__Group_1_0_0__1();
 
             state._fsp--;
@@ -37485,23 +37222,23 @@ public final void rule__XCastedExpression__Group_1_0_0__0() throws RecognitionEx
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12700:1: rule__XCastedExpression__Group_1_0_0__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12606:1: rule__XCastedExpression__Group_1_0_0__0__Impl : ( () ) ;
     public final void rule__XCastedExpression__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12704:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12705:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12610:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12611:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12705:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12706:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12611:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12612:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getXCastedExpressionTargetAction_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12707:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12709:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12613:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12615:1: 
             {
             }
 
@@ -37526,16 +37263,16 @@ public final void rule__XCastedExpression__Group_1_0_0__0__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12719:1: rule__XCastedExpression__Group_1_0_0__1 : rule__XCastedExpression__Group_1_0_0__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12625:1: rule__XCastedExpression__Group_1_0_0__1 : rule__XCastedExpression__Group_1_0_0__1__Impl ;
     public final void rule__XCastedExpression__Group_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12723:1: ( rule__XCastedExpression__Group_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12724:2: rule__XCastedExpression__Group_1_0_0__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12629:1: ( rule__XCastedExpression__Group_1_0_0__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12630:2: rule__XCastedExpression__Group_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__Group_1_0_0__1__Impl_in_rule__XCastedExpression__Group_1_0_0__126078);
+            pushFollow(FOLLOW_rule__XCastedExpression__Group_1_0_0__1__Impl_in_rule__XCastedExpression__Group_1_0_0__125892);
             rule__XCastedExpression__Group_1_0_0__1__Impl();
 
             state._fsp--;
@@ -37559,22 +37296,22 @@ public final void rule__XCastedExpression__Group_1_0_0__1() throws RecognitionEx
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12730:1: rule__XCastedExpression__Group_1_0_0__1__Impl : ( 'as' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12636:1: rule__XCastedExpression__Group_1_0_0__1__Impl : ( 'as' ) ;
     public final void rule__XCastedExpression__Group_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12734:1: ( ( 'as' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12735:1: ( 'as' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12640:1: ( ( 'as' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12641:1: ( 'as' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12735:1: ( 'as' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12736:1: 'as'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12641:1: ( 'as' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12642:1: 'as'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getAsKeyword_1_0_0_1()); 
             }
-            match(input,83,FOLLOW_83_in_rule__XCastedExpression__Group_1_0_0__1__Impl26106); if (state.failed) return ;
+            match(input,83,FOLLOW_83_in_rule__XCastedExpression__Group_1_0_0__1__Impl25920); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXCastedExpressionAccess().getAsKeyword_1_0_0_1()); 
             }
@@ -37600,21 +37337,21 @@ public final void rule__XCastedExpression__Group_1_0_0__1__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XPostfixOperation__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12753:1: rule__XPostfixOperation__Group__0 : rule__XPostfixOperation__Group__0__Impl rule__XPostfixOperation__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12659:1: rule__XPostfixOperation__Group__0 : rule__XPostfixOperation__Group__0__Impl rule__XPostfixOperation__Group__1 ;
     public final void rule__XPostfixOperation__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12757:1: ( rule__XPostfixOperation__Group__0__Impl rule__XPostfixOperation__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12758:2: rule__XPostfixOperation__Group__0__Impl rule__XPostfixOperation__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12663:1: ( rule__XPostfixOperation__Group__0__Impl rule__XPostfixOperation__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12664:2: rule__XPostfixOperation__Group__0__Impl rule__XPostfixOperation__Group__1
             {
-            pushFollow(FOLLOW_rule__XPostfixOperation__Group__0__Impl_in_rule__XPostfixOperation__Group__026141);
+            pushFollow(FOLLOW_rule__XPostfixOperation__Group__0__Impl_in_rule__XPostfixOperation__Group__025955);
             rule__XPostfixOperation__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XPostfixOperation__Group__1_in_rule__XPostfixOperation__Group__026144);
+            pushFollow(FOLLOW_rule__XPostfixOperation__Group__1_in_rule__XPostfixOperation__Group__025958);
             rule__XPostfixOperation__Group__1();
 
             state._fsp--;
@@ -37638,22 +37375,22 @@ public final void rule__XPostfixOperation__Group__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XPostfixOperation__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12765:1: rule__XPostfixOperation__Group__0__Impl : ( ruleXMemberFeatureCall ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12671:1: rule__XPostfixOperation__Group__0__Impl : ( ruleXMemberFeatureCall ) ;
     public final void rule__XPostfixOperation__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12769:1: ( ( ruleXMemberFeatureCall ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12770:1: ( ruleXMemberFeatureCall )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12675:1: ( ( ruleXMemberFeatureCall ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12676:1: ( ruleXMemberFeatureCall )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12770:1: ( ruleXMemberFeatureCall )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12771:1: ruleXMemberFeatureCall
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12676:1: ( ruleXMemberFeatureCall )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12677:1: ruleXMemberFeatureCall
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getXMemberFeatureCallParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleXMemberFeatureCall_in_rule__XPostfixOperation__Group__0__Impl26171);
+            pushFollow(FOLLOW_ruleXMemberFeatureCall_in_rule__XPostfixOperation__Group__0__Impl25985);
             ruleXMemberFeatureCall();
 
             state._fsp--;
@@ -37683,16 +37420,16 @@ public final void rule__XPostfixOperation__Group__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XPostfixOperation__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12782:1: rule__XPostfixOperation__Group__1 : rule__XPostfixOperation__Group__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12688:1: rule__XPostfixOperation__Group__1 : rule__XPostfixOperation__Group__1__Impl ;
     public final void rule__XPostfixOperation__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12786:1: ( rule__XPostfixOperation__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12787:2: rule__XPostfixOperation__Group__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12692:1: ( rule__XPostfixOperation__Group__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12693:2: rule__XPostfixOperation__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XPostfixOperation__Group__1__Impl_in_rule__XPostfixOperation__Group__126200);
+            pushFollow(FOLLOW_rule__XPostfixOperation__Group__1__Impl_in_rule__XPostfixOperation__Group__126014);
             rule__XPostfixOperation__Group__1__Impl();
 
             state._fsp--;
@@ -37716,44 +37453,44 @@ public final void rule__XPostfixOperation__Group__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XPostfixOperation__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12793:1: rule__XPostfixOperation__Group__1__Impl : ( ( rule__XPostfixOperation__Group_1__0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12699:1: rule__XPostfixOperation__Group__1__Impl : ( ( rule__XPostfixOperation__Group_1__0 )? ) ;
     public final void rule__XPostfixOperation__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12797:1: ( ( ( rule__XPostfixOperation__Group_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12798:1: ( ( rule__XPostfixOperation__Group_1__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12703:1: ( ( ( rule__XPostfixOperation__Group_1__0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12704:1: ( ( rule__XPostfixOperation__Group_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12798:1: ( ( rule__XPostfixOperation__Group_1__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12799:1: ( rule__XPostfixOperation__Group_1__0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12704:1: ( ( rule__XPostfixOperation__Group_1__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12705:1: ( rule__XPostfixOperation__Group_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12800:1: ( rule__XPostfixOperation__Group_1__0 )?
-            int alt104=2;
-            int LA104_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12706:1: ( rule__XPostfixOperation__Group_1__0 )?
+            int alt103=2;
+            int LA103_0 = input.LA(1);
 
-            if ( (LA104_0==61) ) {
-                int LA104_1 = input.LA(2);
+            if ( (LA103_0==61) ) {
+                int LA103_1 = input.LA(2);
 
-                if ( (synpred170_InternalCheck()) ) {
-                    alt104=1;
+                if ( (synpred169_InternalCheck()) ) {
+                    alt103=1;
                 }
             }
-            else if ( (LA104_0==62) ) {
-                int LA104_2 = input.LA(2);
+            else if ( (LA103_0==62) ) {
+                int LA103_2 = input.LA(2);
 
-                if ( (synpred170_InternalCheck()) ) {
-                    alt104=1;
+                if ( (synpred169_InternalCheck()) ) {
+                    alt103=1;
                 }
             }
-            switch (alt104) {
+            switch (alt103) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12800:2: rule__XPostfixOperation__Group_1__0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12706:2: rule__XPostfixOperation__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__XPostfixOperation__Group_1__0_in_rule__XPostfixOperation__Group__1__Impl26227);
+                    pushFollow(FOLLOW_rule__XPostfixOperation__Group_1__0_in_rule__XPostfixOperation__Group__1__Impl26041);
                     rule__XPostfixOperation__Group_1__0();
 
                     state._fsp--;
@@ -37789,16 +37526,16 @@ else if ( (LA104_0==62) ) {
 
 
     // $ANTLR start "rule__XPostfixOperation__Group_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12814:1: rule__XPostfixOperation__Group_1__0 : rule__XPostfixOperation__Group_1__0__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12720:1: rule__XPostfixOperation__Group_1__0 : rule__XPostfixOperation__Group_1__0__Impl ;
     public final void rule__XPostfixOperation__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12818:1: ( rule__XPostfixOperation__Group_1__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12819:2: rule__XPostfixOperation__Group_1__0__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12724:1: ( rule__XPostfixOperation__Group_1__0__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12725:2: rule__XPostfixOperation__Group_1__0__Impl
             {
-            pushFollow(FOLLOW_rule__XPostfixOperation__Group_1__0__Impl_in_rule__XPostfixOperation__Group_1__026262);
+            pushFollow(FOLLOW_rule__XPostfixOperation__Group_1__0__Impl_in_rule__XPostfixOperation__Group_1__026076);
             rule__XPostfixOperation__Group_1__0__Impl();
 
             state._fsp--;
@@ -37822,25 +37559,25 @@ public final void rule__XPostfixOperation__Group_1__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XPostfixOperation__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12825:1: rule__XPostfixOperation__Group_1__0__Impl : ( ( rule__XPostfixOperation__Group_1_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12731:1: rule__XPostfixOperation__Group_1__0__Impl : ( ( rule__XPostfixOperation__Group_1_0__0 ) ) ;
     public final void rule__XPostfixOperation__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12829:1: ( ( ( rule__XPostfixOperation__Group_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12830:1: ( ( rule__XPostfixOperation__Group_1_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12735:1: ( ( ( rule__XPostfixOperation__Group_1_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12736:1: ( ( rule__XPostfixOperation__Group_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12830:1: ( ( rule__XPostfixOperation__Group_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12831:1: ( rule__XPostfixOperation__Group_1_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12736:1: ( ( rule__XPostfixOperation__Group_1_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12737:1: ( rule__XPostfixOperation__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getGroup_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12832:1: ( rule__XPostfixOperation__Group_1_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12832:2: rule__XPostfixOperation__Group_1_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12738:1: ( rule__XPostfixOperation__Group_1_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12738:2: rule__XPostfixOperation__Group_1_0__0
             {
-            pushFollow(FOLLOW_rule__XPostfixOperation__Group_1_0__0_in_rule__XPostfixOperation__Group_1__0__Impl26289);
+            pushFollow(FOLLOW_rule__XPostfixOperation__Group_1_0__0_in_rule__XPostfixOperation__Group_1__0__Impl26103);
             rule__XPostfixOperation__Group_1_0__0();
 
             state._fsp--;
@@ -37873,21 +37610,21 @@ public final void rule__XPostfixOperation__Group_1__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XPostfixOperation__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12844:1: rule__XPostfixOperation__Group_1_0__0 : rule__XPostfixOperation__Group_1_0__0__Impl rule__XPostfixOperation__Group_1_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12750:1: rule__XPostfixOperation__Group_1_0__0 : rule__XPostfixOperation__Group_1_0__0__Impl rule__XPostfixOperation__Group_1_0__1 ;
     public final void rule__XPostfixOperation__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12848:1: ( rule__XPostfixOperation__Group_1_0__0__Impl rule__XPostfixOperation__Group_1_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12849:2: rule__XPostfixOperation__Group_1_0__0__Impl rule__XPostfixOperation__Group_1_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12754:1: ( rule__XPostfixOperation__Group_1_0__0__Impl rule__XPostfixOperation__Group_1_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12755:2: rule__XPostfixOperation__Group_1_0__0__Impl rule__XPostfixOperation__Group_1_0__1
             {
-            pushFollow(FOLLOW_rule__XPostfixOperation__Group_1_0__0__Impl_in_rule__XPostfixOperation__Group_1_0__026321);
+            pushFollow(FOLLOW_rule__XPostfixOperation__Group_1_0__0__Impl_in_rule__XPostfixOperation__Group_1_0__026135);
             rule__XPostfixOperation__Group_1_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XPostfixOperation__Group_1_0__1_in_rule__XPostfixOperation__Group_1_0__026324);
+            pushFollow(FOLLOW_rule__XPostfixOperation__Group_1_0__1_in_rule__XPostfixOperation__Group_1_0__026138);
             rule__XPostfixOperation__Group_1_0__1();
 
             state._fsp--;
@@ -37911,23 +37648,23 @@ public final void rule__XPostfixOperation__Group_1_0__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__XPostfixOperation__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12856:1: rule__XPostfixOperation__Group_1_0__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12762:1: rule__XPostfixOperation__Group_1_0__0__Impl : ( () ) ;
     public final void rule__XPostfixOperation__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12860:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12861:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12766:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12767:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12861:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12862:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12767:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12768:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getXPostfixOperationOperandAction_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12863:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12865:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12769:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12771:1: 
             {
             }
 
@@ -37952,16 +37689,16 @@ public final void rule__XPostfixOperation__Group_1_0__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XPostfixOperation__Group_1_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12875:1: rule__XPostfixOperation__Group_1_0__1 : rule__XPostfixOperation__Group_1_0__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12781:1: rule__XPostfixOperation__Group_1_0__1 : rule__XPostfixOperation__Group_1_0__1__Impl ;
     public final void rule__XPostfixOperation__Group_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12879:1: ( rule__XPostfixOperation__Group_1_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12880:2: rule__XPostfixOperation__Group_1_0__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12785:1: ( rule__XPostfixOperation__Group_1_0__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12786:2: rule__XPostfixOperation__Group_1_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XPostfixOperation__Group_1_0__1__Impl_in_rule__XPostfixOperation__Group_1_0__126382);
+            pushFollow(FOLLOW_rule__XPostfixOperation__Group_1_0__1__Impl_in_rule__XPostfixOperation__Group_1_0__126196);
             rule__XPostfixOperation__Group_1_0__1__Impl();
 
             state._fsp--;
@@ -37985,25 +37722,25 @@ public final void rule__XPostfixOperation__Group_1_0__1() throws RecognitionExce
 
 
     // $ANTLR start "rule__XPostfixOperation__Group_1_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12886:1: rule__XPostfixOperation__Group_1_0__1__Impl : ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12792:1: rule__XPostfixOperation__Group_1_0__1__Impl : ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) ) ;
     public final void rule__XPostfixOperation__Group_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12890:1: ( ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12891:1: ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12796:1: ( ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12797:1: ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12891:1: ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12892:1: ( rule__XPostfixOperation__FeatureAssignment_1_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12797:1: ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12798:1: ( rule__XPostfixOperation__FeatureAssignment_1_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getFeatureAssignment_1_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12893:1: ( rule__XPostfixOperation__FeatureAssignment_1_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12893:2: rule__XPostfixOperation__FeatureAssignment_1_0_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12799:1: ( rule__XPostfixOperation__FeatureAssignment_1_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12799:2: rule__XPostfixOperation__FeatureAssignment_1_0_1
             {
-            pushFollow(FOLLOW_rule__XPostfixOperation__FeatureAssignment_1_0_1_in_rule__XPostfixOperation__Group_1_0__1__Impl26409);
+            pushFollow(FOLLOW_rule__XPostfixOperation__FeatureAssignment_1_0_1_in_rule__XPostfixOperation__Group_1_0__1__Impl26223);
             rule__XPostfixOperation__FeatureAssignment_1_0_1();
 
             state._fsp--;
@@ -38036,21 +37773,21 @@ public final void rule__XPostfixOperation__Group_1_0__1__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12907:1: rule__XMemberFeatureCall__Group__0 : rule__XMemberFeatureCall__Group__0__Impl rule__XMemberFeatureCall__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12813:1: rule__XMemberFeatureCall__Group__0 : rule__XMemberFeatureCall__Group__0__Impl rule__XMemberFeatureCall__Group__1 ;
     public final void rule__XMemberFeatureCall__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12911:1: ( rule__XMemberFeatureCall__Group__0__Impl rule__XMemberFeatureCall__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12912:2: rule__XMemberFeatureCall__Group__0__Impl rule__XMemberFeatureCall__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12817:1: ( rule__XMemberFeatureCall__Group__0__Impl rule__XMemberFeatureCall__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12818:2: rule__XMemberFeatureCall__Group__0__Impl rule__XMemberFeatureCall__Group__1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group__0__Impl_in_rule__XMemberFeatureCall__Group__026443);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group__0__Impl_in_rule__XMemberFeatureCall__Group__026257);
             rule__XMemberFeatureCall__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group__1_in_rule__XMemberFeatureCall__Group__026446);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group__1_in_rule__XMemberFeatureCall__Group__026260);
             rule__XMemberFeatureCall__Group__1();
 
             state._fsp--;
@@ -38074,22 +37811,22 @@ public final void rule__XMemberFeatureCall__Group__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12919:1: rule__XMemberFeatureCall__Group__0__Impl : ( ruleXPrimaryExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12825:1: rule__XMemberFeatureCall__Group__0__Impl : ( ruleXPrimaryExpression ) ;
     public final void rule__XMemberFeatureCall__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12923:1: ( ( ruleXPrimaryExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12924:1: ( ruleXPrimaryExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12829:1: ( ( ruleXPrimaryExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12830:1: ( ruleXPrimaryExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12924:1: ( ruleXPrimaryExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12925:1: ruleXPrimaryExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12830:1: ( ruleXPrimaryExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12831:1: ruleXPrimaryExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getXPrimaryExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleXPrimaryExpression_in_rule__XMemberFeatureCall__Group__0__Impl26473);
+            pushFollow(FOLLOW_ruleXPrimaryExpression_in_rule__XMemberFeatureCall__Group__0__Impl26287);
             ruleXPrimaryExpression();
 
             state._fsp--;
@@ -38119,16 +37856,16 @@ public final void rule__XMemberFeatureCall__Group__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12936:1: rule__XMemberFeatureCall__Group__1 : rule__XMemberFeatureCall__Group__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12842:1: rule__XMemberFeatureCall__Group__1 : rule__XMemberFeatureCall__Group__1__Impl ;
     public final void rule__XMemberFeatureCall__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12940:1: ( rule__XMemberFeatureCall__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12941:2: rule__XMemberFeatureCall__Group__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12846:1: ( rule__XMemberFeatureCall__Group__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12847:2: rule__XMemberFeatureCall__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group__1__Impl_in_rule__XMemberFeatureCall__Group__126502);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group__1__Impl_in_rule__XMemberFeatureCall__Group__126316);
             rule__XMemberFeatureCall__Group__1__Impl();
 
             state._fsp--;
@@ -38152,32 +37889,32 @@ public final void rule__XMemberFeatureCall__Group__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12947:1: rule__XMemberFeatureCall__Group__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12853:1: rule__XMemberFeatureCall__Group__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1 )* ) ;
     public final void rule__XMemberFeatureCall__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12951:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12952:1: ( ( rule__XMemberFeatureCall__Alternatives_1 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12857:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12858:1: ( ( rule__XMemberFeatureCall__Alternatives_1 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12952:1: ( ( rule__XMemberFeatureCall__Alternatives_1 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12953:1: ( rule__XMemberFeatureCall__Alternatives_1 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12858:1: ( ( rule__XMemberFeatureCall__Alternatives_1 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12859:1: ( rule__XMemberFeatureCall__Alternatives_1 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getAlternatives_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12954:1: ( rule__XMemberFeatureCall__Alternatives_1 )*
-            loop105:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12860:1: ( rule__XMemberFeatureCall__Alternatives_1 )*
+            loop104:
             do {
-                int alt105=2;
+                int alt104=2;
                 switch ( input.LA(1) ) {
                 case 63:
                     {
-                    int LA105_2 = input.LA(2);
+                    int LA104_2 = input.LA(2);
 
-                    if ( (synpred171_InternalCheck()) ) {
-                        alt105=1;
+                    if ( (synpred170_InternalCheck()) ) {
+                        alt104=1;
                     }
 
 
@@ -38185,10 +37922,10 @@ public final void rule__XMemberFeatureCall__Group__1__Impl() throws RecognitionE
                     break;
                 case 104:
                     {
-                    int LA105_3 = input.LA(2);
+                    int LA104_3 = input.LA(2);
 
-                    if ( (synpred171_InternalCheck()) ) {
-                        alt105=1;
+                    if ( (synpred170_InternalCheck()) ) {
+                        alt104=1;
                     }
 
 
@@ -38196,10 +37933,10 @@ public final void rule__XMemberFeatureCall__Group__1__Impl() throws RecognitionE
                     break;
                 case 105:
                     {
-                    int LA105_4 = input.LA(2);
+                    int LA104_4 = input.LA(2);
 
-                    if ( (synpred171_InternalCheck()) ) {
-                        alt105=1;
+                    if ( (synpred170_InternalCheck()) ) {
+                        alt104=1;
                     }
 
 
@@ -38208,11 +37945,11 @@ public final void rule__XMemberFeatureCall__Group__1__Impl() throws RecognitionE
 
                 }
 
-                switch (alt105) {
+                switch (alt104) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12954:2: rule__XMemberFeatureCall__Alternatives_1
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12860:2: rule__XMemberFeatureCall__Alternatives_1
             	    {
-            	    pushFollow(FOLLOW_rule__XMemberFeatureCall__Alternatives_1_in_rule__XMemberFeatureCall__Group__1__Impl26529);
+            	    pushFollow(FOLLOW_rule__XMemberFeatureCall__Alternatives_1_in_rule__XMemberFeatureCall__Group__1__Impl26343);
             	    rule__XMemberFeatureCall__Alternatives_1();
 
             	    state._fsp--;
@@ -38222,7 +37959,7 @@ public final void rule__XMemberFeatureCall__Group__1__Impl() throws RecognitionE
             	    break;
 
             	default :
-            	    break loop105;
+            	    break loop104;
                 }
             } while (true);
 
@@ -38251,21 +37988,21 @@ public final void rule__XMemberFeatureCall__Group__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12968:1: rule__XMemberFeatureCall__Group_1_0__0 : rule__XMemberFeatureCall__Group_1_0__0__Impl rule__XMemberFeatureCall__Group_1_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12874:1: rule__XMemberFeatureCall__Group_1_0__0 : rule__XMemberFeatureCall__Group_1_0__0__Impl rule__XMemberFeatureCall__Group_1_0__1 ;
     public final void rule__XMemberFeatureCall__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12972:1: ( rule__XMemberFeatureCall__Group_1_0__0__Impl rule__XMemberFeatureCall__Group_1_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12973:2: rule__XMemberFeatureCall__Group_1_0__0__Impl rule__XMemberFeatureCall__Group_1_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12878:1: ( rule__XMemberFeatureCall__Group_1_0__0__Impl rule__XMemberFeatureCall__Group_1_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12879:2: rule__XMemberFeatureCall__Group_1_0__0__Impl rule__XMemberFeatureCall__Group_1_0__1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_0__026564);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_0__026378);
             rule__XMemberFeatureCall__Group_1_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0__1_in_rule__XMemberFeatureCall__Group_1_0__026567);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0__1_in_rule__XMemberFeatureCall__Group_1_0__026381);
             rule__XMemberFeatureCall__Group_1_0__1();
 
             state._fsp--;
@@ -38289,25 +38026,25 @@ public final void rule__XMemberFeatureCall__Group_1_0__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12980:1: rule__XMemberFeatureCall__Group_1_0__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12886:1: rule__XMemberFeatureCall__Group_1_0__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12984:1: ( ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12985:1: ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12890:1: ( ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12891:1: ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12985:1: ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12986:1: ( rule__XMemberFeatureCall__Group_1_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12891:1: ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12892:1: ( rule__XMemberFeatureCall__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12987:1: ( rule__XMemberFeatureCall__Group_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12987:2: rule__XMemberFeatureCall__Group_1_0_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12893:1: ( rule__XMemberFeatureCall__Group_1_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12893:2: rule__XMemberFeatureCall__Group_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0__0_in_rule__XMemberFeatureCall__Group_1_0__0__Impl26594);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0__0_in_rule__XMemberFeatureCall__Group_1_0__0__Impl26408);
             rule__XMemberFeatureCall__Group_1_0_0__0();
 
             state._fsp--;
@@ -38340,16 +38077,16 @@ public final void rule__XMemberFeatureCall__Group_1_0__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12997:1: rule__XMemberFeatureCall__Group_1_0__1 : rule__XMemberFeatureCall__Group_1_0__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12903:1: rule__XMemberFeatureCall__Group_1_0__1 : rule__XMemberFeatureCall__Group_1_0__1__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13001:1: ( rule__XMemberFeatureCall__Group_1_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13002:2: rule__XMemberFeatureCall__Group_1_0__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12907:1: ( rule__XMemberFeatureCall__Group_1_0__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12908:2: rule__XMemberFeatureCall__Group_1_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0__1__Impl_in_rule__XMemberFeatureCall__Group_1_0__126624);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0__1__Impl_in_rule__XMemberFeatureCall__Group_1_0__126438);
             rule__XMemberFeatureCall__Group_1_0__1__Impl();
 
             state._fsp--;
@@ -38373,25 +38110,25 @@ public final void rule__XMemberFeatureCall__Group_1_0__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13008:1: rule__XMemberFeatureCall__Group_1_0__1__Impl : ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12914:1: rule__XMemberFeatureCall__Group_1_0__1__Impl : ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13012:1: ( ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13013:1: ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12918:1: ( ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12919:1: ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13013:1: ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13014:1: ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12919:1: ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12920:1: ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getValueAssignment_1_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13015:1: ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13015:2: rule__XMemberFeatureCall__ValueAssignment_1_0_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12921:1: ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12921:2: rule__XMemberFeatureCall__ValueAssignment_1_0_1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__ValueAssignment_1_0_1_in_rule__XMemberFeatureCall__Group_1_0__1__Impl26651);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__ValueAssignment_1_0_1_in_rule__XMemberFeatureCall__Group_1_0__1__Impl26465);
             rule__XMemberFeatureCall__ValueAssignment_1_0_1();
 
             state._fsp--;
@@ -38424,16 +38161,16 @@ public final void rule__XMemberFeatureCall__Group_1_0__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13029:1: rule__XMemberFeatureCall__Group_1_0_0__0 : rule__XMemberFeatureCall__Group_1_0_0__0__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12935:1: rule__XMemberFeatureCall__Group_1_0_0__0 : rule__XMemberFeatureCall__Group_1_0_0__0__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13033:1: ( rule__XMemberFeatureCall__Group_1_0_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13034:2: rule__XMemberFeatureCall__Group_1_0_0__0__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12939:1: ( rule__XMemberFeatureCall__Group_1_0_0__0__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12940:2: rule__XMemberFeatureCall__Group_1_0_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_0_0__026685);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_0_0__026499);
             rule__XMemberFeatureCall__Group_1_0_0__0__Impl();
 
             state._fsp--;
@@ -38457,25 +38194,25 @@ public final void rule__XMemberFeatureCall__Group_1_0_0__0() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13040:1: rule__XMemberFeatureCall__Group_1_0_0__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12946:1: rule__XMemberFeatureCall__Group_1_0_0__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13044:1: ( ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13045:1: ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12950:1: ( ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12951:1: ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13045:1: ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13046:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12951:1: ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12952:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13047:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13047:2: rule__XMemberFeatureCall__Group_1_0_0_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12953:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12953:2: rule__XMemberFeatureCall__Group_1_0_0_0__0
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__0_in_rule__XMemberFeatureCall__Group_1_0_0__0__Impl26712);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__0_in_rule__XMemberFeatureCall__Group_1_0_0__0__Impl26526);
             rule__XMemberFeatureCall__Group_1_0_0_0__0();
 
             state._fsp--;
@@ -38508,21 +38245,21 @@ public final void rule__XMemberFeatureCall__Group_1_0_0__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13059:1: rule__XMemberFeatureCall__Group_1_0_0_0__0 : rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl rule__XMemberFeatureCall__Group_1_0_0_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12965:1: rule__XMemberFeatureCall__Group_1_0_0_0__0 : rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl rule__XMemberFeatureCall__Group_1_0_0_0__1 ;
     public final void rule__XMemberFeatureCall__Group_1_0_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13063:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl rule__XMemberFeatureCall__Group_1_0_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13064:2: rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl rule__XMemberFeatureCall__Group_1_0_0_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12969:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl rule__XMemberFeatureCall__Group_1_0_0_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12970:2: rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl rule__XMemberFeatureCall__Group_1_0_0_0__1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_0_0_0__026744);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_0_0_0__026558);
             rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__1_in_rule__XMemberFeatureCall__Group_1_0_0_0__026747);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__1_in_rule__XMemberFeatureCall__Group_1_0_0_0__026561);
             rule__XMemberFeatureCall__Group_1_0_0_0__1();
 
             state._fsp--;
@@ -38546,23 +38283,23 @@ public final void rule__XMemberFeatureCall__Group_1_0_0_0__0() throws Recognitio
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13071:1: rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12977:1: rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl : ( () ) ;
     public final void rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13075:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13076:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12981:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12982:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13076:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13077:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12982:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12983:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getXAssignmentAssignableAction_1_0_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13078:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13080:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12984:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12986:1: 
             {
             }
 
@@ -38587,21 +38324,21 @@ public final void rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl() throws Reco
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13090:1: rule__XMemberFeatureCall__Group_1_0_0_0__1 : rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl rule__XMemberFeatureCall__Group_1_0_0_0__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12996:1: rule__XMemberFeatureCall__Group_1_0_0_0__1 : rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl rule__XMemberFeatureCall__Group_1_0_0_0__2 ;
     public final void rule__XMemberFeatureCall__Group_1_0_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13094:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl rule__XMemberFeatureCall__Group_1_0_0_0__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13095:2: rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl rule__XMemberFeatureCall__Group_1_0_0_0__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13000:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl rule__XMemberFeatureCall__Group_1_0_0_0__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13001:2: rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl rule__XMemberFeatureCall__Group_1_0_0_0__2
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl_in_rule__XMemberFeatureCall__Group_1_0_0_0__126805);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl_in_rule__XMemberFeatureCall__Group_1_0_0_0__126619);
             rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__2_in_rule__XMemberFeatureCall__Group_1_0_0_0__126808);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__2_in_rule__XMemberFeatureCall__Group_1_0_0_0__126622);
             rule__XMemberFeatureCall__Group_1_0_0_0__2();
 
             state._fsp--;
@@ -38625,25 +38362,25 @@ public final void rule__XMemberFeatureCall__Group_1_0_0_0__1() throws Recognitio
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13102:1: rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13008:1: rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13106:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13107:1: ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13012:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13013:1: ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13107:1: ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13108:1: ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13013:1: ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13014:1: ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getAlternatives_1_0_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13109:1: ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13109:2: rule__XMemberFeatureCall__Alternatives_1_0_0_0_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13015:1: ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13015:2: rule__XMemberFeatureCall__Alternatives_1_0_0_0_1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Alternatives_1_0_0_0_1_in_rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl26835);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Alternatives_1_0_0_0_1_in_rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl26649);
             rule__XMemberFeatureCall__Alternatives_1_0_0_0_1();
 
             state._fsp--;
@@ -38676,21 +38413,21 @@ public final void rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl() throws Reco
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13119:1: rule__XMemberFeatureCall__Group_1_0_0_0__2 : rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl rule__XMemberFeatureCall__Group_1_0_0_0__3 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13025:1: rule__XMemberFeatureCall__Group_1_0_0_0__2 : rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl rule__XMemberFeatureCall__Group_1_0_0_0__3 ;
     public final void rule__XMemberFeatureCall__Group_1_0_0_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13123:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl rule__XMemberFeatureCall__Group_1_0_0_0__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13124:2: rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl rule__XMemberFeatureCall__Group_1_0_0_0__3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13029:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl rule__XMemberFeatureCall__Group_1_0_0_0__3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13030:2: rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl rule__XMemberFeatureCall__Group_1_0_0_0__3
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl_in_rule__XMemberFeatureCall__Group_1_0_0_0__226865);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl_in_rule__XMemberFeatureCall__Group_1_0_0_0__226679);
             rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__3_in_rule__XMemberFeatureCall__Group_1_0_0_0__226868);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__3_in_rule__XMemberFeatureCall__Group_1_0_0_0__226682);
             rule__XMemberFeatureCall__Group_1_0_0_0__3();
 
             state._fsp--;
@@ -38714,25 +38451,25 @@ public final void rule__XMemberFeatureCall__Group_1_0_0_0__2() throws Recognitio
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13131:1: rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl : ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13037:1: rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl : ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13135:1: ( ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13136:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13041:1: ( ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13042:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13136:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13137:1: ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13042:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13043:1: ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getFeatureAssignment_1_0_0_0_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13138:1: ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13138:2: rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13044:1: ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13044:2: rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2_in_rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl26895);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2_in_rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl26709);
             rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2();
 
             state._fsp--;
@@ -38765,16 +38502,16 @@ public final void rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl() throws Reco
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13148:1: rule__XMemberFeatureCall__Group_1_0_0_0__3 : rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13054:1: rule__XMemberFeatureCall__Group_1_0_0_0__3 : rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_0_0_0__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13152:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13153:2: rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13058:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13059:2: rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl_in_rule__XMemberFeatureCall__Group_1_0_0_0__326925);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl_in_rule__XMemberFeatureCall__Group_1_0_0_0__326739);
             rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl();
 
             state._fsp--;
@@ -38798,22 +38535,22 @@ public final void rule__XMemberFeatureCall__Group_1_0_0_0__3() throws Recognitio
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13159:1: rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl : ( ruleOpSingleAssign ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13065:1: rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl : ( ruleOpSingleAssign ) ;
     public final void rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13163:1: ( ( ruleOpSingleAssign ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13164:1: ( ruleOpSingleAssign )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13069:1: ( ( ruleOpSingleAssign ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13070:1: ( ruleOpSingleAssign )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13164:1: ( ruleOpSingleAssign )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13165:1: ruleOpSingleAssign
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13070:1: ( ruleOpSingleAssign )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13071:1: ruleOpSingleAssign
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getOpSingleAssignParserRuleCall_1_0_0_0_3()); 
             }
-            pushFollow(FOLLOW_ruleOpSingleAssign_in_rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl26952);
+            pushFollow(FOLLOW_ruleOpSingleAssign_in_rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl26766);
             ruleOpSingleAssign();
 
             state._fsp--;
@@ -38843,21 +38580,21 @@ public final void rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl() throws Reco
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13184:1: rule__XMemberFeatureCall__Group_1_1__0 : rule__XMemberFeatureCall__Group_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13090:1: rule__XMemberFeatureCall__Group_1_1__0 : rule__XMemberFeatureCall__Group_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1__1 ;
     public final void rule__XMemberFeatureCall__Group_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13188:1: ( rule__XMemberFeatureCall__Group_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13189:2: rule__XMemberFeatureCall__Group_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13094:1: ( rule__XMemberFeatureCall__Group_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13095:2: rule__XMemberFeatureCall__Group_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1__1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__0__Impl_in_rule__XMemberFeatureCall__Group_1_1__026989);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__0__Impl_in_rule__XMemberFeatureCall__Group_1_1__026803);
             rule__XMemberFeatureCall__Group_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__1_in_rule__XMemberFeatureCall__Group_1_1__026992);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__1_in_rule__XMemberFeatureCall__Group_1_1__026806);
             rule__XMemberFeatureCall__Group_1_1__1();
 
             state._fsp--;
@@ -38881,25 +38618,25 @@ public final void rule__XMemberFeatureCall__Group_1_1__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13196:1: rule__XMemberFeatureCall__Group_1_1__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13102:1: rule__XMemberFeatureCall__Group_1_1__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13200:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13201:1: ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13106:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13107:1: ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13201:1: ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13202:1: ( rule__XMemberFeatureCall__Group_1_1_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13107:1: ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13108:1: ( rule__XMemberFeatureCall__Group_1_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13203:1: ( rule__XMemberFeatureCall__Group_1_1_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13203:2: rule__XMemberFeatureCall__Group_1_1_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13109:1: ( rule__XMemberFeatureCall__Group_1_1_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13109:2: rule__XMemberFeatureCall__Group_1_1_0__0
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_0__0_in_rule__XMemberFeatureCall__Group_1_1__0__Impl27019);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_0__0_in_rule__XMemberFeatureCall__Group_1_1__0__Impl26833);
             rule__XMemberFeatureCall__Group_1_1_0__0();
 
             state._fsp--;
@@ -38932,21 +38669,21 @@ public final void rule__XMemberFeatureCall__Group_1_1__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13213:1: rule__XMemberFeatureCall__Group_1_1__1 : rule__XMemberFeatureCall__Group_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13119:1: rule__XMemberFeatureCall__Group_1_1__1 : rule__XMemberFeatureCall__Group_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1__2 ;
     public final void rule__XMemberFeatureCall__Group_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13217:1: ( rule__XMemberFeatureCall__Group_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13218:2: rule__XMemberFeatureCall__Group_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13123:1: ( rule__XMemberFeatureCall__Group_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13124:2: rule__XMemberFeatureCall__Group_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1__2
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__1__Impl_in_rule__XMemberFeatureCall__Group_1_1__127049);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__1__Impl_in_rule__XMemberFeatureCall__Group_1_1__126863);
             rule__XMemberFeatureCall__Group_1_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__2_in_rule__XMemberFeatureCall__Group_1_1__127052);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__2_in_rule__XMemberFeatureCall__Group_1_1__126866);
             rule__XMemberFeatureCall__Group_1_1__2();
 
             state._fsp--;
@@ -38970,33 +38707,33 @@ public final void rule__XMemberFeatureCall__Group_1_1__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13225:1: rule__XMemberFeatureCall__Group_1_1__1__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13131:1: rule__XMemberFeatureCall__Group_1_1__1__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? ) ;
     public final void rule__XMemberFeatureCall__Group_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13229:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13230:1: ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13135:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13136:1: ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13230:1: ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13231:1: ( rule__XMemberFeatureCall__Group_1_1_1__0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13136:1: ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13137:1: ( rule__XMemberFeatureCall__Group_1_1_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13232:1: ( rule__XMemberFeatureCall__Group_1_1_1__0 )?
-            int alt106=2;
-            int LA106_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13138:1: ( rule__XMemberFeatureCall__Group_1_1_1__0 )?
+            int alt105=2;
+            int LA105_0 = input.LA(1);
 
-            if ( (LA106_0==47) ) {
-                alt106=1;
+            if ( (LA105_0==47) ) {
+                alt105=1;
             }
-            switch (alt106) {
+            switch (alt105) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13232:2: rule__XMemberFeatureCall__Group_1_1_1__0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13138:2: rule__XMemberFeatureCall__Group_1_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__0_in_rule__XMemberFeatureCall__Group_1_1__1__Impl27079);
+                    pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__0_in_rule__XMemberFeatureCall__Group_1_1__1__Impl26893);
                     rule__XMemberFeatureCall__Group_1_1_1__0();
 
                     state._fsp--;
@@ -39032,21 +38769,21 @@ public final void rule__XMemberFeatureCall__Group_1_1__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13242:1: rule__XMemberFeatureCall__Group_1_1__2 : rule__XMemberFeatureCall__Group_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1__3 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13148:1: rule__XMemberFeatureCall__Group_1_1__2 : rule__XMemberFeatureCall__Group_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1__3 ;
     public final void rule__XMemberFeatureCall__Group_1_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13246:1: ( rule__XMemberFeatureCall__Group_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13247:2: rule__XMemberFeatureCall__Group_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1__3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13152:1: ( rule__XMemberFeatureCall__Group_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1__3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13153:2: rule__XMemberFeatureCall__Group_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1__3
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__2__Impl_in_rule__XMemberFeatureCall__Group_1_1__227110);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__2__Impl_in_rule__XMemberFeatureCall__Group_1_1__226924);
             rule__XMemberFeatureCall__Group_1_1__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__3_in_rule__XMemberFeatureCall__Group_1_1__227113);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__3_in_rule__XMemberFeatureCall__Group_1_1__226927);
             rule__XMemberFeatureCall__Group_1_1__3();
 
             state._fsp--;
@@ -39070,25 +38807,25 @@ public final void rule__XMemberFeatureCall__Group_1_1__2() throws RecognitionExc
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13254:1: rule__XMemberFeatureCall__Group_1_1__2__Impl : ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13160:1: rule__XMemberFeatureCall__Group_1_1__2__Impl : ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13258:1: ( ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13259:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13164:1: ( ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13165:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13259:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13260:1: ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13165:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13166:1: ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getFeatureAssignment_1_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13261:1: ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13261:2: rule__XMemberFeatureCall__FeatureAssignment_1_1_2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13167:1: ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13167:2: rule__XMemberFeatureCall__FeatureAssignment_1_1_2
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__FeatureAssignment_1_1_2_in_rule__XMemberFeatureCall__Group_1_1__2__Impl27140);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__FeatureAssignment_1_1_2_in_rule__XMemberFeatureCall__Group_1_1__2__Impl26954);
             rule__XMemberFeatureCall__FeatureAssignment_1_1_2();
 
             state._fsp--;
@@ -39121,21 +38858,21 @@ public final void rule__XMemberFeatureCall__Group_1_1__2__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13271:1: rule__XMemberFeatureCall__Group_1_1__3 : rule__XMemberFeatureCall__Group_1_1__3__Impl rule__XMemberFeatureCall__Group_1_1__4 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13177:1: rule__XMemberFeatureCall__Group_1_1__3 : rule__XMemberFeatureCall__Group_1_1__3__Impl rule__XMemberFeatureCall__Group_1_1__4 ;
     public final void rule__XMemberFeatureCall__Group_1_1__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13275:1: ( rule__XMemberFeatureCall__Group_1_1__3__Impl rule__XMemberFeatureCall__Group_1_1__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13276:2: rule__XMemberFeatureCall__Group_1_1__3__Impl rule__XMemberFeatureCall__Group_1_1__4
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13181:1: ( rule__XMemberFeatureCall__Group_1_1__3__Impl rule__XMemberFeatureCall__Group_1_1__4 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13182:2: rule__XMemberFeatureCall__Group_1_1__3__Impl rule__XMemberFeatureCall__Group_1_1__4
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__3__Impl_in_rule__XMemberFeatureCall__Group_1_1__327170);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__3__Impl_in_rule__XMemberFeatureCall__Group_1_1__326984);
             rule__XMemberFeatureCall__Group_1_1__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__4_in_rule__XMemberFeatureCall__Group_1_1__327173);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__4_in_rule__XMemberFeatureCall__Group_1_1__326987);
             rule__XMemberFeatureCall__Group_1_1__4();
 
             state._fsp--;
@@ -39159,29 +38896,29 @@ public final void rule__XMemberFeatureCall__Group_1_1__3() throws RecognitionExc
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13283:1: rule__XMemberFeatureCall__Group_1_1__3__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13189:1: rule__XMemberFeatureCall__Group_1_1__3__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? ) ;
     public final void rule__XMemberFeatureCall__Group_1_1__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13287:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13288:1: ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13193:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13194:1: ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13288:1: ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13289:1: ( rule__XMemberFeatureCall__Group_1_1_3__0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13194:1: ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13195:1: ( rule__XMemberFeatureCall__Group_1_1_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13290:1: ( rule__XMemberFeatureCall__Group_1_1_3__0 )?
-            int alt107=2;
-            alt107 = dfa107.predict(input);
-            switch (alt107) {
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13196:1: ( rule__XMemberFeatureCall__Group_1_1_3__0 )?
+            int alt106=2;
+            alt106 = dfa106.predict(input);
+            switch (alt106) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13290:2: rule__XMemberFeatureCall__Group_1_1_3__0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13196:2: rule__XMemberFeatureCall__Group_1_1_3__0
                     {
-                    pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__0_in_rule__XMemberFeatureCall__Group_1_1__3__Impl27200);
+                    pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__0_in_rule__XMemberFeatureCall__Group_1_1__3__Impl27014);
                     rule__XMemberFeatureCall__Group_1_1_3__0();
 
                     state._fsp--;
@@ -39217,16 +38954,16 @@ public final void rule__XMemberFeatureCall__Group_1_1__3__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13300:1: rule__XMemberFeatureCall__Group_1_1__4 : rule__XMemberFeatureCall__Group_1_1__4__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13206:1: rule__XMemberFeatureCall__Group_1_1__4 : rule__XMemberFeatureCall__Group_1_1__4__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_1__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13304:1: ( rule__XMemberFeatureCall__Group_1_1__4__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13305:2: rule__XMemberFeatureCall__Group_1_1__4__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13210:1: ( rule__XMemberFeatureCall__Group_1_1__4__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13211:2: rule__XMemberFeatureCall__Group_1_1__4__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__4__Impl_in_rule__XMemberFeatureCall__Group_1_1__427231);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__4__Impl_in_rule__XMemberFeatureCall__Group_1_1__427045);
             rule__XMemberFeatureCall__Group_1_1__4__Impl();
 
             state._fsp--;
@@ -39250,29 +38987,29 @@ public final void rule__XMemberFeatureCall__Group_1_1__4() throws RecognitionExc
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13311:1: rule__XMemberFeatureCall__Group_1_1__4__Impl : ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13217:1: rule__XMemberFeatureCall__Group_1_1__4__Impl : ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? ) ;
     public final void rule__XMemberFeatureCall__Group_1_1__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13315:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13316:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13221:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13222:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13316:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13317:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13222:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13223:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsAssignment_1_1_4()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13318:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )?
-            int alt108=2;
-            alt108 = dfa108.predict(input);
-            switch (alt108) {
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13224:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )?
+            int alt107=2;
+            alt107 = dfa107.predict(input);
+            switch (alt107) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13318:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13224:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4
                     {
-                    pushFollow(FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4_in_rule__XMemberFeatureCall__Group_1_1__4__Impl27258);
+                    pushFollow(FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4_in_rule__XMemberFeatureCall__Group_1_1__4__Impl27072);
                     rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4();
 
                     state._fsp--;
@@ -39308,16 +39045,16 @@ public final void rule__XMemberFeatureCall__Group_1_1__4__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13338:1: rule__XMemberFeatureCall__Group_1_1_0__0 : rule__XMemberFeatureCall__Group_1_1_0__0__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13244:1: rule__XMemberFeatureCall__Group_1_1_0__0 : rule__XMemberFeatureCall__Group_1_1_0__0__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13342:1: ( rule__XMemberFeatureCall__Group_1_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13343:2: rule__XMemberFeatureCall__Group_1_1_0__0__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13248:1: ( rule__XMemberFeatureCall__Group_1_1_0__0__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13249:2: rule__XMemberFeatureCall__Group_1_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_0__027299);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_0__027113);
             rule__XMemberFeatureCall__Group_1_1_0__0__Impl();
 
             state._fsp--;
@@ -39341,25 +39078,25 @@ public final void rule__XMemberFeatureCall__Group_1_1_0__0() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13349:1: rule__XMemberFeatureCall__Group_1_1_0__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13255:1: rule__XMemberFeatureCall__Group_1_1_0__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13353:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13354:1: ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13259:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13260:1: ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13354:1: ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13355:1: ( rule__XMemberFeatureCall__Group_1_1_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13260:1: ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13261:1: ( rule__XMemberFeatureCall__Group_1_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13356:1: ( rule__XMemberFeatureCall__Group_1_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13356:2: rule__XMemberFeatureCall__Group_1_1_0_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13262:1: ( rule__XMemberFeatureCall__Group_1_1_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13262:2: rule__XMemberFeatureCall__Group_1_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_0_0__0_in_rule__XMemberFeatureCall__Group_1_1_0__0__Impl27326);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_0_0__0_in_rule__XMemberFeatureCall__Group_1_1_0__0__Impl27140);
             rule__XMemberFeatureCall__Group_1_1_0_0__0();
 
             state._fsp--;
@@ -39392,21 +39129,21 @@ public final void rule__XMemberFeatureCall__Group_1_1_0__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13368:1: rule__XMemberFeatureCall__Group_1_1_0_0__0 : rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl rule__XMemberFeatureCall__Group_1_1_0_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13274:1: rule__XMemberFeatureCall__Group_1_1_0_0__0 : rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl rule__XMemberFeatureCall__Group_1_1_0_0__1 ;
     public final void rule__XMemberFeatureCall__Group_1_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13372:1: ( rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl rule__XMemberFeatureCall__Group_1_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13373:2: rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl rule__XMemberFeatureCall__Group_1_1_0_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13278:1: ( rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl rule__XMemberFeatureCall__Group_1_1_0_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13279:2: rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl rule__XMemberFeatureCall__Group_1_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_0_0__027358);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_0_0__027172);
             rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_0_0__1_in_rule__XMemberFeatureCall__Group_1_1_0_0__027361);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_0_0__1_in_rule__XMemberFeatureCall__Group_1_1_0_0__027175);
             rule__XMemberFeatureCall__Group_1_1_0_0__1();
 
             state._fsp--;
@@ -39430,23 +39167,23 @@ public final void rule__XMemberFeatureCall__Group_1_1_0_0__0() throws Recognitio
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13380:1: rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13286:1: rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl : ( () ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13384:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13385:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13290:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13291:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13385:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13386:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13291:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13292:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getXMemberFeatureCallMemberCallTargetAction_1_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13387:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13389:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13293:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13295:1: 
             {
             }
 
@@ -39471,16 +39208,16 @@ public final void rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl() throws Reco
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13399:1: rule__XMemberFeatureCall__Group_1_1_0_0__1 : rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13305:1: rule__XMemberFeatureCall__Group_1_1_0_0__1 : rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13403:1: ( rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13404:2: rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13309:1: ( rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13310:2: rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_0_0__127419);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_0_0__127233);
             rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl();
 
             state._fsp--;
@@ -39504,25 +39241,25 @@ public final void rule__XMemberFeatureCall__Group_1_1_0_0__1() throws Recognitio
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13410:1: rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13316:1: rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13414:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13415:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13320:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13321:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13415:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13416:1: ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13321:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13322:1: ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getAlternatives_1_1_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13417:1: ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13417:2: rule__XMemberFeatureCall__Alternatives_1_1_0_0_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13323:1: ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13323:2: rule__XMemberFeatureCall__Alternatives_1_1_0_0_1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Alternatives_1_1_0_0_1_in_rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl27446);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Alternatives_1_1_0_0_1_in_rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl27260);
             rule__XMemberFeatureCall__Alternatives_1_1_0_0_1();
 
             state._fsp--;
@@ -39555,21 +39292,21 @@ public final void rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl() throws Reco
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13431:1: rule__XMemberFeatureCall__Group_1_1_1__0 : rule__XMemberFeatureCall__Group_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13337:1: rule__XMemberFeatureCall__Group_1_1_1__0 : rule__XMemberFeatureCall__Group_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_1__1 ;
     public final void rule__XMemberFeatureCall__Group_1_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13435:1: ( rule__XMemberFeatureCall__Group_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13436:2: rule__XMemberFeatureCall__Group_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13341:1: ( rule__XMemberFeatureCall__Group_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13342:2: rule__XMemberFeatureCall__Group_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_1__1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_1__027480);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_1__027294);
             rule__XMemberFeatureCall__Group_1_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__1_in_rule__XMemberFeatureCall__Group_1_1_1__027483);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__1_in_rule__XMemberFeatureCall__Group_1_1_1__027297);
             rule__XMemberFeatureCall__Group_1_1_1__1();
 
             state._fsp--;
@@ -39593,22 +39330,22 @@ public final void rule__XMemberFeatureCall__Group_1_1_1__0() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13443:1: rule__XMemberFeatureCall__Group_1_1_1__0__Impl : ( '<' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13349:1: rule__XMemberFeatureCall__Group_1_1_1__0__Impl : ( '<' ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13447:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13448:1: ( '<' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13353:1: ( ( '<' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13354:1: ( '<' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13448:1: ( '<' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13449:1: '<'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13354:1: ( '<' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13355:1: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getLessThanSignKeyword_1_1_1_0()); 
             }
-            match(input,47,FOLLOW_47_in_rule__XMemberFeatureCall__Group_1_1_1__0__Impl27511); if (state.failed) return ;
+            match(input,47,FOLLOW_47_in_rule__XMemberFeatureCall__Group_1_1_1__0__Impl27325); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getLessThanSignKeyword_1_1_1_0()); 
             }
@@ -39634,21 +39371,21 @@ public final void rule__XMemberFeatureCall__Group_1_1_1__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13462:1: rule__XMemberFeatureCall__Group_1_1_1__1 : rule__XMemberFeatureCall__Group_1_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1_1__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13368:1: rule__XMemberFeatureCall__Group_1_1_1__1 : rule__XMemberFeatureCall__Group_1_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1_1__2 ;
     public final void rule__XMemberFeatureCall__Group_1_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13466:1: ( rule__XMemberFeatureCall__Group_1_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1_1__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13467:2: rule__XMemberFeatureCall__Group_1_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1_1__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13372:1: ( rule__XMemberFeatureCall__Group_1_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1_1__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13373:2: rule__XMemberFeatureCall__Group_1_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1_1__2
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_1__127542);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_1__127356);
             rule__XMemberFeatureCall__Group_1_1_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__2_in_rule__XMemberFeatureCall__Group_1_1_1__127545);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__2_in_rule__XMemberFeatureCall__Group_1_1_1__127359);
             rule__XMemberFeatureCall__Group_1_1_1__2();
 
             state._fsp--;
@@ -39672,25 +39409,25 @@ public final void rule__XMemberFeatureCall__Group_1_1_1__1() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13474:1: rule__XMemberFeatureCall__Group_1_1_1__1__Impl : ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13380:1: rule__XMemberFeatureCall__Group_1_1_1__1__Impl : ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13478:1: ( ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13479:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13384:1: ( ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13385:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13479:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13480:1: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13385:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13386:1: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getTypeArgumentsAssignment_1_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13481:1: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13481:2: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13387:1: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13387:2: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1_in_rule__XMemberFeatureCall__Group_1_1_1__1__Impl27572);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1_in_rule__XMemberFeatureCall__Group_1_1_1__1__Impl27386);
             rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1();
 
             state._fsp--;
@@ -39723,21 +39460,21 @@ public final void rule__XMemberFeatureCall__Group_1_1_1__1__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13491:1: rule__XMemberFeatureCall__Group_1_1_1__2 : rule__XMemberFeatureCall__Group_1_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1_1__3 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13397:1: rule__XMemberFeatureCall__Group_1_1_1__2 : rule__XMemberFeatureCall__Group_1_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1_1__3 ;
     public final void rule__XMemberFeatureCall__Group_1_1_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13495:1: ( rule__XMemberFeatureCall__Group_1_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1_1__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13496:2: rule__XMemberFeatureCall__Group_1_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1_1__3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13401:1: ( rule__XMemberFeatureCall__Group_1_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1_1__3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13402:2: rule__XMemberFeatureCall__Group_1_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1_1__3
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__2__Impl_in_rule__XMemberFeatureCall__Group_1_1_1__227602);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__2__Impl_in_rule__XMemberFeatureCall__Group_1_1_1__227416);
             rule__XMemberFeatureCall__Group_1_1_1__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__3_in_rule__XMemberFeatureCall__Group_1_1_1__227605);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__3_in_rule__XMemberFeatureCall__Group_1_1_1__227419);
             rule__XMemberFeatureCall__Group_1_1_1__3();
 
             state._fsp--;
@@ -39761,37 +39498,37 @@ public final void rule__XMemberFeatureCall__Group_1_1_1__2() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13503:1: rule__XMemberFeatureCall__Group_1_1_1__2__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13409:1: rule__XMemberFeatureCall__Group_1_1_1__2__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13507:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13508:1: ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13413:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13414:1: ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13508:1: ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13509:1: ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13414:1: ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13415:1: ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13510:1: ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )*
-            loop109:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13416:1: ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )*
+            loop108:
             do {
-                int alt109=2;
-                int LA109_0 = input.LA(1);
+                int alt108=2;
+                int LA108_0 = input.LA(1);
 
-                if ( (LA109_0==74) ) {
-                    alt109=1;
+                if ( (LA108_0==74) ) {
+                    alt108=1;
                 }
 
 
-                switch (alt109) {
+                switch (alt108) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13510:2: rule__XMemberFeatureCall__Group_1_1_1_2__0
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13416:2: rule__XMemberFeatureCall__Group_1_1_1_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1_2__0_in_rule__XMemberFeatureCall__Group_1_1_1__2__Impl27632);
+            	    pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1_2__0_in_rule__XMemberFeatureCall__Group_1_1_1__2__Impl27446);
             	    rule__XMemberFeatureCall__Group_1_1_1_2__0();
 
             	    state._fsp--;
@@ -39801,7 +39538,7 @@ public final void rule__XMemberFeatureCall__Group_1_1_1__2__Impl() throws Recogn
             	    break;
 
             	default :
-            	    break loop109;
+            	    break loop108;
                 }
             } while (true);
 
@@ -39830,16 +39567,16 @@ public final void rule__XMemberFeatureCall__Group_1_1_1__2__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13520:1: rule__XMemberFeatureCall__Group_1_1_1__3 : rule__XMemberFeatureCall__Group_1_1_1__3__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13426:1: rule__XMemberFeatureCall__Group_1_1_1__3 : rule__XMemberFeatureCall__Group_1_1_1__3__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_1_1__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13524:1: ( rule__XMemberFeatureCall__Group_1_1_1__3__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13525:2: rule__XMemberFeatureCall__Group_1_1_1__3__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13430:1: ( rule__XMemberFeatureCall__Group_1_1_1__3__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13431:2: rule__XMemberFeatureCall__Group_1_1_1__3__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__3__Impl_in_rule__XMemberFeatureCall__Group_1_1_1__327663);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__3__Impl_in_rule__XMemberFeatureCall__Group_1_1_1__327477);
             rule__XMemberFeatureCall__Group_1_1_1__3__Impl();
 
             state._fsp--;
@@ -39863,22 +39600,22 @@ public final void rule__XMemberFeatureCall__Group_1_1_1__3() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13531:1: rule__XMemberFeatureCall__Group_1_1_1__3__Impl : ( '>' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13437:1: rule__XMemberFeatureCall__Group_1_1_1__3__Impl : ( '>' ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_1__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13535:1: ( ( '>' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13536:1: ( '>' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13441:1: ( ( '>' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13442:1: ( '>' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13536:1: ( '>' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13537:1: '>'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13442:1: ( '>' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13443:1: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGreaterThanSignKeyword_1_1_1_3()); 
             }
-            match(input,46,FOLLOW_46_in_rule__XMemberFeatureCall__Group_1_1_1__3__Impl27691); if (state.failed) return ;
+            match(input,46,FOLLOW_46_in_rule__XMemberFeatureCall__Group_1_1_1__3__Impl27505); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getGreaterThanSignKeyword_1_1_1_3()); 
             }
@@ -39904,21 +39641,21 @@ public final void rule__XMemberFeatureCall__Group_1_1_1__3__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1_2__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13558:1: rule__XMemberFeatureCall__Group_1_1_1_2__0 : rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl rule__XMemberFeatureCall__Group_1_1_1_2__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13464:1: rule__XMemberFeatureCall__Group_1_1_1_2__0 : rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl rule__XMemberFeatureCall__Group_1_1_1_2__1 ;
     public final void rule__XMemberFeatureCall__Group_1_1_1_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13562:1: ( rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl rule__XMemberFeatureCall__Group_1_1_1_2__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13563:2: rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl rule__XMemberFeatureCall__Group_1_1_1_2__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13468:1: ( rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl rule__XMemberFeatureCall__Group_1_1_1_2__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13469:2: rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl rule__XMemberFeatureCall__Group_1_1_1_2__1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_1_2__027730);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_1_2__027544);
             rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1_2__1_in_rule__XMemberFeatureCall__Group_1_1_1_2__027733);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1_2__1_in_rule__XMemberFeatureCall__Group_1_1_1_2__027547);
             rule__XMemberFeatureCall__Group_1_1_1_2__1();
 
             state._fsp--;
@@ -39942,22 +39679,22 @@ public final void rule__XMemberFeatureCall__Group_1_1_1_2__0() throws Recognitio
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13570:1: rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl : ( ',' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13476:1: rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl : ( ',' ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13574:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13575:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13480:1: ( ( ',' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13481:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13575:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13576:1: ','
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13481:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13482:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getCommaKeyword_1_1_1_2_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl27761); if (state.failed) return ;
+            match(input,74,FOLLOW_74_in_rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl27575); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getCommaKeyword_1_1_1_2_0()); 
             }
@@ -39983,16 +39720,16 @@ public final void rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl() throws Reco
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1_2__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13589:1: rule__XMemberFeatureCall__Group_1_1_1_2__1 : rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13495:1: rule__XMemberFeatureCall__Group_1_1_1_2__1 : rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_1_1_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13593:1: ( rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13594:2: rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13499:1: ( rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13500:2: rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_1_2__127792);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_1_2__127606);
             rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl();
 
             state._fsp--;
@@ -40016,25 +39753,25 @@ public final void rule__XMemberFeatureCall__Group_1_1_1_2__1() throws Recognitio
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13600:1: rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl : ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13506:1: rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl : ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13604:1: ( ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13605:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13510:1: ( ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13511:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13605:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13606:1: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13511:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13512:1: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getTypeArgumentsAssignment_1_1_1_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13607:1: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13607:2: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13513:1: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13513:2: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1_in_rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl27819);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1_in_rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl27633);
             rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1();
 
             state._fsp--;
@@ -40067,21 +39804,21 @@ public final void rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl() throws Reco
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13621:1: rule__XMemberFeatureCall__Group_1_1_3__0 : rule__XMemberFeatureCall__Group_1_1_3__0__Impl rule__XMemberFeatureCall__Group_1_1_3__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13527:1: rule__XMemberFeatureCall__Group_1_1_3__0 : rule__XMemberFeatureCall__Group_1_1_3__0__Impl rule__XMemberFeatureCall__Group_1_1_3__1 ;
     public final void rule__XMemberFeatureCall__Group_1_1_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13625:1: ( rule__XMemberFeatureCall__Group_1_1_3__0__Impl rule__XMemberFeatureCall__Group_1_1_3__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13626:2: rule__XMemberFeatureCall__Group_1_1_3__0__Impl rule__XMemberFeatureCall__Group_1_1_3__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13531:1: ( rule__XMemberFeatureCall__Group_1_1_3__0__Impl rule__XMemberFeatureCall__Group_1_1_3__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13532:2: rule__XMemberFeatureCall__Group_1_1_3__0__Impl rule__XMemberFeatureCall__Group_1_1_3__1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_3__027853);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_3__027667);
             rule__XMemberFeatureCall__Group_1_1_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__1_in_rule__XMemberFeatureCall__Group_1_1_3__027856);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__1_in_rule__XMemberFeatureCall__Group_1_1_3__027670);
             rule__XMemberFeatureCall__Group_1_1_3__1();
 
             state._fsp--;
@@ -40105,25 +39842,25 @@ public final void rule__XMemberFeatureCall__Group_1_1_3__0() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13633:1: rule__XMemberFeatureCall__Group_1_1_3__0__Impl : ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13539:1: rule__XMemberFeatureCall__Group_1_1_3__0__Impl : ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13637:1: ( ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13638:1: ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13543:1: ( ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13544:1: ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13638:1: ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13639:1: ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13544:1: ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13545:1: ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getExplicitOperationCallAssignment_1_1_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13640:1: ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13640:2: rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13546:1: ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13546:2: rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0_in_rule__XMemberFeatureCall__Group_1_1_3__0__Impl27883);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0_in_rule__XMemberFeatureCall__Group_1_1_3__0__Impl27697);
             rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0();
 
             state._fsp--;
@@ -40156,21 +39893,21 @@ public final void rule__XMemberFeatureCall__Group_1_1_3__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13650:1: rule__XMemberFeatureCall__Group_1_1_3__1 : rule__XMemberFeatureCall__Group_1_1_3__1__Impl rule__XMemberFeatureCall__Group_1_1_3__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13556:1: rule__XMemberFeatureCall__Group_1_1_3__1 : rule__XMemberFeatureCall__Group_1_1_3__1__Impl rule__XMemberFeatureCall__Group_1_1_3__2 ;
     public final void rule__XMemberFeatureCall__Group_1_1_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13654:1: ( rule__XMemberFeatureCall__Group_1_1_3__1__Impl rule__XMemberFeatureCall__Group_1_1_3__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13655:2: rule__XMemberFeatureCall__Group_1_1_3__1__Impl rule__XMemberFeatureCall__Group_1_1_3__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13560:1: ( rule__XMemberFeatureCall__Group_1_1_3__1__Impl rule__XMemberFeatureCall__Group_1_1_3__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13561:2: rule__XMemberFeatureCall__Group_1_1_3__1__Impl rule__XMemberFeatureCall__Group_1_1_3__2
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_3__127913);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_3__127727);
             rule__XMemberFeatureCall__Group_1_1_3__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__2_in_rule__XMemberFeatureCall__Group_1_1_3__127916);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__2_in_rule__XMemberFeatureCall__Group_1_1_3__127730);
             rule__XMemberFeatureCall__Group_1_1_3__2();
 
             state._fsp--;
@@ -40194,33 +39931,33 @@ public final void rule__XMemberFeatureCall__Group_1_1_3__1() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13662:1: rule__XMemberFeatureCall__Group_1_1_3__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13568:1: rule__XMemberFeatureCall__Group_1_1_3__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13666:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13667:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13572:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13573:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13667:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13668:1: ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13573:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13574:1: ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getAlternatives_1_1_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13669:1: ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )?
-            int alt110=2;
-            int LA110_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13575:1: ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )?
+            int alt109=2;
+            int LA109_0 = input.LA(1);
 
-            if ( ((LA110_0>=RULE_ID && LA110_0<=RULE_STRING)||(LA110_0>=16 && LA110_0<=35)||LA110_0==47||LA110_0==51||(LA110_0>=54 && LA110_0<=55)||LA110_0==60||(LA110_0>=65 && LA110_0<=66)||LA110_0==68||LA110_0==70||LA110_0==72||(LA110_0>=77 && LA110_0<=78)||(LA110_0>=80 && LA110_0<=81)||LA110_0==84||LA110_0==86||(LA110_0>=90 && LA110_0<=97)||LA110_0==99||LA110_0==106||LA110_0==108) ) {
-                alt110=1;
+            if ( ((LA109_0>=RULE_ID && LA109_0<=RULE_STRING)||(LA109_0>=16 && LA109_0<=35)||LA109_0==47||LA109_0==51||(LA109_0>=54 && LA109_0<=55)||LA109_0==60||(LA109_0>=65 && LA109_0<=66)||LA109_0==68||LA109_0==70||LA109_0==72||(LA109_0>=77 && LA109_0<=78)||(LA109_0>=80 && LA109_0<=81)||LA109_0==84||LA109_0==86||(LA109_0>=90 && LA109_0<=97)||LA109_0==99||LA109_0==106||LA109_0==108) ) {
+                alt109=1;
             }
-            switch (alt110) {
+            switch (alt109) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13669:2: rule__XMemberFeatureCall__Alternatives_1_1_3_1
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13575:2: rule__XMemberFeatureCall__Alternatives_1_1_3_1
                     {
-                    pushFollow(FOLLOW_rule__XMemberFeatureCall__Alternatives_1_1_3_1_in_rule__XMemberFeatureCall__Group_1_1_3__1__Impl27943);
+                    pushFollow(FOLLOW_rule__XMemberFeatureCall__Alternatives_1_1_3_1_in_rule__XMemberFeatureCall__Group_1_1_3__1__Impl27757);
                     rule__XMemberFeatureCall__Alternatives_1_1_3_1();
 
                     state._fsp--;
@@ -40256,16 +39993,16 @@ public final void rule__XMemberFeatureCall__Group_1_1_3__1__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13679:1: rule__XMemberFeatureCall__Group_1_1_3__2 : rule__XMemberFeatureCall__Group_1_1_3__2__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13585:1: rule__XMemberFeatureCall__Group_1_1_3__2 : rule__XMemberFeatureCall__Group_1_1_3__2__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_1_3__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13683:1: ( rule__XMemberFeatureCall__Group_1_1_3__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13684:2: rule__XMemberFeatureCall__Group_1_1_3__2__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13589:1: ( rule__XMemberFeatureCall__Group_1_1_3__2__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13590:2: rule__XMemberFeatureCall__Group_1_1_3__2__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__2__Impl_in_rule__XMemberFeatureCall__Group_1_1_3__227974);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__2__Impl_in_rule__XMemberFeatureCall__Group_1_1_3__227788);
             rule__XMemberFeatureCall__Group_1_1_3__2__Impl();
 
             state._fsp--;
@@ -40289,22 +40026,22 @@ public final void rule__XMemberFeatureCall__Group_1_1_3__2() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13690:1: rule__XMemberFeatureCall__Group_1_1_3__2__Impl : ( ')' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13596:1: rule__XMemberFeatureCall__Group_1_1_3__2__Impl : ( ')' ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_3__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13694:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13695:1: ( ')' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13600:1: ( ( ')' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13601:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13695:1: ( ')' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13696:1: ')'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13601:1: ( ')' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13602:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getRightParenthesisKeyword_1_1_3_2()); 
             }
-            match(input,73,FOLLOW_73_in_rule__XMemberFeatureCall__Group_1_1_3__2__Impl28002); if (state.failed) return ;
+            match(input,73,FOLLOW_73_in_rule__XMemberFeatureCall__Group_1_1_3__2__Impl27816); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getRightParenthesisKeyword_1_1_3_2()); 
             }
@@ -40330,21 +40067,21 @@ public final void rule__XMemberFeatureCall__Group_1_1_3__2__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13715:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__0 : rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13621:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__0 : rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1__1 ;
     public final void rule__XMemberFeatureCall__Group_1_1_3_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13719:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13720:2: rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13625:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13626:2: rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1__1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__028039);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__027853);
             rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1__1_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__028042);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1__1_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__027856);
             rule__XMemberFeatureCall__Group_1_1_3_1_1__1();
 
             state._fsp--;
@@ -40368,25 +40105,25 @@ public final void rule__XMemberFeatureCall__Group_1_1_3_1_1__0() throws Recognit
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13727:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl : ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13633:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl : ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13731:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13732:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13637:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13638:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13732:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13733:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13638:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13639:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsAssignment_1_1_3_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13734:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13734:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13640:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13640:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl28069);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl27883);
             rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0();
 
             state._fsp--;
@@ -40419,16 +40156,16 @@ public final void rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl() throws Re
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13744:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__1 : rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13650:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__1 : rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_1_3_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13748:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13749:2: rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13654:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13655:2: rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__128099);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__127913);
             rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl();
 
             state._fsp--;
@@ -40452,37 +40189,37 @@ public final void rule__XMemberFeatureCall__Group_1_1_3_1_1__1() throws Recognit
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13755:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13661:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13759:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13760:1: ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13665:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13666:1: ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13760:1: ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13761:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13666:1: ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13667:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1_3_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13762:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )*
-            loop111:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13668:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )*
+            loop110:
             do {
-                int alt111=2;
-                int LA111_0 = input.LA(1);
+                int alt110=2;
+                int LA110_0 = input.LA(1);
 
-                if ( (LA111_0==74) ) {
-                    alt111=1;
+                if ( (LA110_0==74) ) {
+                    alt110=1;
                 }
 
 
-                switch (alt111) {
+                switch (alt110) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13762:2: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13668:2: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl28126);
+            	    pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl27940);
             	    rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0();
 
             	    state._fsp--;
@@ -40492,7 +40229,7 @@ public final void rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl() throws Re
             	    break;
 
             	default :
-            	    break loop111;
+            	    break loop110;
                 }
             } while (true);
 
@@ -40521,21 +40258,21 @@ public final void rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl() throws Re
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13776:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 : rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13682:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 : rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1 ;
     public final void rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13780:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13781:2: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13686:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13687:2: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__028161);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__027975);
             rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__028164);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__027978);
             rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1();
 
             state._fsp--;
@@ -40559,22 +40296,22 @@ public final void rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13788:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl : ( ',' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13694:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl : ( ',' ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13792:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13793:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13698:1: ( ( ',' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13699:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13793:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13794:1: ','
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13699:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13700:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getCommaKeyword_1_1_3_1_1_1_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl28192); if (state.failed) return ;
+            match(input,74,FOLLOW_74_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl28006); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getCommaKeyword_1_1_3_1_1_1_0()); 
             }
@@ -40600,16 +40337,16 @@ public final void rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl() throws
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13807:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1 : rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13713:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1 : rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13811:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13812:2: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13717:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13718:2: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__128223);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__128037);
             rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl();
 
             state._fsp--;
@@ -40633,25 +40370,25 @@ public final void rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13818:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl : ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13724:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl : ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13822:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13823:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13728:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13729:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13823:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13824:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13729:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13730:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsAssignment_1_1_3_1_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13825:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13825:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13731:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13731:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl28250);
+            pushFollow(FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl28064);
             rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1();
 
             state._fsp--;
@@ -40684,21 +40421,21 @@ public final void rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl() throws
 
 
     // $ANTLR start "rule__XSetLiteral__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13839:1: rule__XSetLiteral__Group__0 : rule__XSetLiteral__Group__0__Impl rule__XSetLiteral__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13745:1: rule__XSetLiteral__Group__0 : rule__XSetLiteral__Group__0__Impl rule__XSetLiteral__Group__1 ;
     public final void rule__XSetLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13843:1: ( rule__XSetLiteral__Group__0__Impl rule__XSetLiteral__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13844:2: rule__XSetLiteral__Group__0__Impl rule__XSetLiteral__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13749:1: ( rule__XSetLiteral__Group__0__Impl rule__XSetLiteral__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13750:2: rule__XSetLiteral__Group__0__Impl rule__XSetLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__Group__0__Impl_in_rule__XSetLiteral__Group__028284);
+            pushFollow(FOLLOW_rule__XSetLiteral__Group__0__Impl_in_rule__XSetLiteral__Group__028098);
             rule__XSetLiteral__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSetLiteral__Group__1_in_rule__XSetLiteral__Group__028287);
+            pushFollow(FOLLOW_rule__XSetLiteral__Group__1_in_rule__XSetLiteral__Group__028101);
             rule__XSetLiteral__Group__1();
 
             state._fsp--;
@@ -40722,23 +40459,23 @@ public final void rule__XSetLiteral__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XSetLiteral__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13851:1: rule__XSetLiteral__Group__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13757:1: rule__XSetLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XSetLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13855:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13856:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13761:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13762:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13856:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13857:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13762:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13763:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getXSetLiteralAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13858:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13860:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13764:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13766:1: 
             {
             }
 
@@ -40763,21 +40500,21 @@ public final void rule__XSetLiteral__Group__0__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSetLiteral__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13870:1: rule__XSetLiteral__Group__1 : rule__XSetLiteral__Group__1__Impl rule__XSetLiteral__Group__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13776:1: rule__XSetLiteral__Group__1 : rule__XSetLiteral__Group__1__Impl rule__XSetLiteral__Group__2 ;
     public final void rule__XSetLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13874:1: ( rule__XSetLiteral__Group__1__Impl rule__XSetLiteral__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13875:2: rule__XSetLiteral__Group__1__Impl rule__XSetLiteral__Group__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13780:1: ( rule__XSetLiteral__Group__1__Impl rule__XSetLiteral__Group__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13781:2: rule__XSetLiteral__Group__1__Impl rule__XSetLiteral__Group__2
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__Group__1__Impl_in_rule__XSetLiteral__Group__128345);
+            pushFollow(FOLLOW_rule__XSetLiteral__Group__1__Impl_in_rule__XSetLiteral__Group__128159);
             rule__XSetLiteral__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSetLiteral__Group__2_in_rule__XSetLiteral__Group__128348);
+            pushFollow(FOLLOW_rule__XSetLiteral__Group__2_in_rule__XSetLiteral__Group__128162);
             rule__XSetLiteral__Group__2();
 
             state._fsp--;
@@ -40801,22 +40538,22 @@ public final void rule__XSetLiteral__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XSetLiteral__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13882:1: rule__XSetLiteral__Group__1__Impl : ( '#' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13788:1: rule__XSetLiteral__Group__1__Impl : ( '#' ) ;
     public final void rule__XSetLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13886:1: ( ( '#' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13887:1: ( '#' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13792:1: ( ( '#' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13793:1: ( '#' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13887:1: ( '#' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13888:1: '#'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13793:1: ( '#' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13794:1: '#'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getNumberSignKeyword_1()); 
             }
-            match(input,77,FOLLOW_77_in_rule__XSetLiteral__Group__1__Impl28376); if (state.failed) return ;
+            match(input,77,FOLLOW_77_in_rule__XSetLiteral__Group__1__Impl28190); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSetLiteralAccess().getNumberSignKeyword_1()); 
             }
@@ -40842,21 +40579,21 @@ public final void rule__XSetLiteral__Group__1__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSetLiteral__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13901:1: rule__XSetLiteral__Group__2 : rule__XSetLiteral__Group__2__Impl rule__XSetLiteral__Group__3 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13807:1: rule__XSetLiteral__Group__2 : rule__XSetLiteral__Group__2__Impl rule__XSetLiteral__Group__3 ;
     public final void rule__XSetLiteral__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13905:1: ( rule__XSetLiteral__Group__2__Impl rule__XSetLiteral__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13906:2: rule__XSetLiteral__Group__2__Impl rule__XSetLiteral__Group__3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13811:1: ( rule__XSetLiteral__Group__2__Impl rule__XSetLiteral__Group__3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13812:2: rule__XSetLiteral__Group__2__Impl rule__XSetLiteral__Group__3
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__Group__2__Impl_in_rule__XSetLiteral__Group__228407);
+            pushFollow(FOLLOW_rule__XSetLiteral__Group__2__Impl_in_rule__XSetLiteral__Group__228221);
             rule__XSetLiteral__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSetLiteral__Group__3_in_rule__XSetLiteral__Group__228410);
+            pushFollow(FOLLOW_rule__XSetLiteral__Group__3_in_rule__XSetLiteral__Group__228224);
             rule__XSetLiteral__Group__3();
 
             state._fsp--;
@@ -40880,22 +40617,22 @@ public final void rule__XSetLiteral__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XSetLiteral__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13913:1: rule__XSetLiteral__Group__2__Impl : ( '{' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13819:1: rule__XSetLiteral__Group__2__Impl : ( '{' ) ;
     public final void rule__XSetLiteral__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13917:1: ( ( '{' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13918:1: ( '{' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13823:1: ( ( '{' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13824:1: ( '{' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13918:1: ( '{' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13919:1: '{'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13824:1: ( '{' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13825:1: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getLeftCurlyBracketKeyword_2()); 
             }
-            match(input,68,FOLLOW_68_in_rule__XSetLiteral__Group__2__Impl28438); if (state.failed) return ;
+            match(input,68,FOLLOW_68_in_rule__XSetLiteral__Group__2__Impl28252); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSetLiteralAccess().getLeftCurlyBracketKeyword_2()); 
             }
@@ -40921,21 +40658,21 @@ public final void rule__XSetLiteral__Group__2__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSetLiteral__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13932:1: rule__XSetLiteral__Group__3 : rule__XSetLiteral__Group__3__Impl rule__XSetLiteral__Group__4 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13838:1: rule__XSetLiteral__Group__3 : rule__XSetLiteral__Group__3__Impl rule__XSetLiteral__Group__4 ;
     public final void rule__XSetLiteral__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13936:1: ( rule__XSetLiteral__Group__3__Impl rule__XSetLiteral__Group__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13937:2: rule__XSetLiteral__Group__3__Impl rule__XSetLiteral__Group__4
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13842:1: ( rule__XSetLiteral__Group__3__Impl rule__XSetLiteral__Group__4 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13843:2: rule__XSetLiteral__Group__3__Impl rule__XSetLiteral__Group__4
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__Group__3__Impl_in_rule__XSetLiteral__Group__328469);
+            pushFollow(FOLLOW_rule__XSetLiteral__Group__3__Impl_in_rule__XSetLiteral__Group__328283);
             rule__XSetLiteral__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSetLiteral__Group__4_in_rule__XSetLiteral__Group__328472);
+            pushFollow(FOLLOW_rule__XSetLiteral__Group__4_in_rule__XSetLiteral__Group__328286);
             rule__XSetLiteral__Group__4();
 
             state._fsp--;
@@ -40959,33 +40696,33 @@ public final void rule__XSetLiteral__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XSetLiteral__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13944:1: rule__XSetLiteral__Group__3__Impl : ( ( rule__XSetLiteral__Group_3__0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13850:1: rule__XSetLiteral__Group__3__Impl : ( ( rule__XSetLiteral__Group_3__0 )? ) ;
     public final void rule__XSetLiteral__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13948:1: ( ( ( rule__XSetLiteral__Group_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13949:1: ( ( rule__XSetLiteral__Group_3__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13854:1: ( ( ( rule__XSetLiteral__Group_3__0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13855:1: ( ( rule__XSetLiteral__Group_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13949:1: ( ( rule__XSetLiteral__Group_3__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13950:1: ( rule__XSetLiteral__Group_3__0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13855:1: ( ( rule__XSetLiteral__Group_3__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13856:1: ( rule__XSetLiteral__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getGroup_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13951:1: ( rule__XSetLiteral__Group_3__0 )?
-            int alt112=2;
-            int LA112_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13857:1: ( rule__XSetLiteral__Group_3__0 )?
+            int alt111=2;
+            int LA111_0 = input.LA(1);
 
-            if ( ((LA112_0>=RULE_ID && LA112_0<=RULE_STRING)||(LA112_0>=16 && LA112_0<=35)||LA112_0==47||(LA112_0>=54 && LA112_0<=55)||LA112_0==60||(LA112_0>=65 && LA112_0<=66)||LA112_0==68||LA112_0==70||LA112_0==72||(LA112_0>=77 && LA112_0<=78)||(LA112_0>=80 && LA112_0<=81)||LA112_0==84||LA112_0==86||(LA112_0>=90 && LA112_0<=97)||LA112_0==99||LA112_0==108) ) {
-                alt112=1;
+            if ( ((LA111_0>=RULE_ID && LA111_0<=RULE_STRING)||(LA111_0>=16 && LA111_0<=35)||LA111_0==47||(LA111_0>=54 && LA111_0<=55)||LA111_0==60||(LA111_0>=65 && LA111_0<=66)||LA111_0==68||LA111_0==70||LA111_0==72||(LA111_0>=77 && LA111_0<=78)||(LA111_0>=80 && LA111_0<=81)||LA111_0==84||LA111_0==86||(LA111_0>=90 && LA111_0<=97)||LA111_0==99||LA111_0==108) ) {
+                alt111=1;
             }
-            switch (alt112) {
+            switch (alt111) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13951:2: rule__XSetLiteral__Group_3__0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13857:2: rule__XSetLiteral__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__XSetLiteral__Group_3__0_in_rule__XSetLiteral__Group__3__Impl28499);
+                    pushFollow(FOLLOW_rule__XSetLiteral__Group_3__0_in_rule__XSetLiteral__Group__3__Impl28313);
                     rule__XSetLiteral__Group_3__0();
 
                     state._fsp--;
@@ -41021,16 +40758,16 @@ public final void rule__XSetLiteral__Group__3__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSetLiteral__Group__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13961:1: rule__XSetLiteral__Group__4 : rule__XSetLiteral__Group__4__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13867:1: rule__XSetLiteral__Group__4 : rule__XSetLiteral__Group__4__Impl ;
     public final void rule__XSetLiteral__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13965:1: ( rule__XSetLiteral__Group__4__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13966:2: rule__XSetLiteral__Group__4__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13871:1: ( rule__XSetLiteral__Group__4__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13872:2: rule__XSetLiteral__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__Group__4__Impl_in_rule__XSetLiteral__Group__428530);
+            pushFollow(FOLLOW_rule__XSetLiteral__Group__4__Impl_in_rule__XSetLiteral__Group__428344);
             rule__XSetLiteral__Group__4__Impl();
 
             state._fsp--;
@@ -41054,22 +40791,22 @@ public final void rule__XSetLiteral__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__XSetLiteral__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13972:1: rule__XSetLiteral__Group__4__Impl : ( '}' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13878:1: rule__XSetLiteral__Group__4__Impl : ( '}' ) ;
     public final void rule__XSetLiteral__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13976:1: ( ( '}' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13977:1: ( '}' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13882:1: ( ( '}' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13883:1: ( '}' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13977:1: ( '}' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13978:1: '}'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13883:1: ( '}' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13884:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getRightCurlyBracketKeyword_4()); 
             }
-            match(input,69,FOLLOW_69_in_rule__XSetLiteral__Group__4__Impl28558); if (state.failed) return ;
+            match(input,69,FOLLOW_69_in_rule__XSetLiteral__Group__4__Impl28372); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSetLiteralAccess().getRightCurlyBracketKeyword_4()); 
             }
@@ -41095,21 +40832,21 @@ public final void rule__XSetLiteral__Group__4__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14001:1: rule__XSetLiteral__Group_3__0 : rule__XSetLiteral__Group_3__0__Impl rule__XSetLiteral__Group_3__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13907:1: rule__XSetLiteral__Group_3__0 : rule__XSetLiteral__Group_3__0__Impl rule__XSetLiteral__Group_3__1 ;
     public final void rule__XSetLiteral__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14005:1: ( rule__XSetLiteral__Group_3__0__Impl rule__XSetLiteral__Group_3__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14006:2: rule__XSetLiteral__Group_3__0__Impl rule__XSetLiteral__Group_3__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13911:1: ( rule__XSetLiteral__Group_3__0__Impl rule__XSetLiteral__Group_3__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13912:2: rule__XSetLiteral__Group_3__0__Impl rule__XSetLiteral__Group_3__1
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__Group_3__0__Impl_in_rule__XSetLiteral__Group_3__028599);
+            pushFollow(FOLLOW_rule__XSetLiteral__Group_3__0__Impl_in_rule__XSetLiteral__Group_3__028413);
             rule__XSetLiteral__Group_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSetLiteral__Group_3__1_in_rule__XSetLiteral__Group_3__028602);
+            pushFollow(FOLLOW_rule__XSetLiteral__Group_3__1_in_rule__XSetLiteral__Group_3__028416);
             rule__XSetLiteral__Group_3__1();
 
             state._fsp--;
@@ -41133,25 +40870,25 @@ public final void rule__XSetLiteral__Group_3__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14013:1: rule__XSetLiteral__Group_3__0__Impl : ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13919:1: rule__XSetLiteral__Group_3__0__Impl : ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) ) ;
     public final void rule__XSetLiteral__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14017:1: ( ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14018:1: ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13923:1: ( ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13924:1: ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14018:1: ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14019:1: ( rule__XSetLiteral__ElementsAssignment_3_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13924:1: ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13925:1: ( rule__XSetLiteral__ElementsAssignment_3_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getElementsAssignment_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14020:1: ( rule__XSetLiteral__ElementsAssignment_3_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14020:2: rule__XSetLiteral__ElementsAssignment_3_0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13926:1: ( rule__XSetLiteral__ElementsAssignment_3_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13926:2: rule__XSetLiteral__ElementsAssignment_3_0
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__ElementsAssignment_3_0_in_rule__XSetLiteral__Group_3__0__Impl28629);
+            pushFollow(FOLLOW_rule__XSetLiteral__ElementsAssignment_3_0_in_rule__XSetLiteral__Group_3__0__Impl28443);
             rule__XSetLiteral__ElementsAssignment_3_0();
 
             state._fsp--;
@@ -41184,16 +40921,16 @@ public final void rule__XSetLiteral__Group_3__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14030:1: rule__XSetLiteral__Group_3__1 : rule__XSetLiteral__Group_3__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13936:1: rule__XSetLiteral__Group_3__1 : rule__XSetLiteral__Group_3__1__Impl ;
     public final void rule__XSetLiteral__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14034:1: ( rule__XSetLiteral__Group_3__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14035:2: rule__XSetLiteral__Group_3__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13940:1: ( rule__XSetLiteral__Group_3__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13941:2: rule__XSetLiteral__Group_3__1__Impl
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__Group_3__1__Impl_in_rule__XSetLiteral__Group_3__128659);
+            pushFollow(FOLLOW_rule__XSetLiteral__Group_3__1__Impl_in_rule__XSetLiteral__Group_3__128473);
             rule__XSetLiteral__Group_3__1__Impl();
 
             state._fsp--;
@@ -41217,37 +40954,37 @@ public final void rule__XSetLiteral__Group_3__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14041:1: rule__XSetLiteral__Group_3__1__Impl : ( ( rule__XSetLiteral__Group_3_1__0 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13947:1: rule__XSetLiteral__Group_3__1__Impl : ( ( rule__XSetLiteral__Group_3_1__0 )* ) ;
     public final void rule__XSetLiteral__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14045:1: ( ( ( rule__XSetLiteral__Group_3_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14046:1: ( ( rule__XSetLiteral__Group_3_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13951:1: ( ( ( rule__XSetLiteral__Group_3_1__0 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13952:1: ( ( rule__XSetLiteral__Group_3_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14046:1: ( ( rule__XSetLiteral__Group_3_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14047:1: ( rule__XSetLiteral__Group_3_1__0 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13952:1: ( ( rule__XSetLiteral__Group_3_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13953:1: ( rule__XSetLiteral__Group_3_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getGroup_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14048:1: ( rule__XSetLiteral__Group_3_1__0 )*
-            loop113:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13954:1: ( rule__XSetLiteral__Group_3_1__0 )*
+            loop112:
             do {
-                int alt113=2;
-                int LA113_0 = input.LA(1);
+                int alt112=2;
+                int LA112_0 = input.LA(1);
 
-                if ( (LA113_0==74) ) {
-                    alt113=1;
+                if ( (LA112_0==74) ) {
+                    alt112=1;
                 }
 
 
-                switch (alt113) {
+                switch (alt112) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14048:2: rule__XSetLiteral__Group_3_1__0
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13954:2: rule__XSetLiteral__Group_3_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XSetLiteral__Group_3_1__0_in_rule__XSetLiteral__Group_3__1__Impl28686);
+            	    pushFollow(FOLLOW_rule__XSetLiteral__Group_3_1__0_in_rule__XSetLiteral__Group_3__1__Impl28500);
             	    rule__XSetLiteral__Group_3_1__0();
 
             	    state._fsp--;
@@ -41257,7 +40994,7 @@ public final void rule__XSetLiteral__Group_3__1__Impl() throws RecognitionExcept
             	    break;
 
             	default :
-            	    break loop113;
+            	    break loop112;
                 }
             } while (true);
 
@@ -41286,21 +41023,21 @@ public final void rule__XSetLiteral__Group_3__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14062:1: rule__XSetLiteral__Group_3_1__0 : rule__XSetLiteral__Group_3_1__0__Impl rule__XSetLiteral__Group_3_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13968:1: rule__XSetLiteral__Group_3_1__0 : rule__XSetLiteral__Group_3_1__0__Impl rule__XSetLiteral__Group_3_1__1 ;
     public final void rule__XSetLiteral__Group_3_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14066:1: ( rule__XSetLiteral__Group_3_1__0__Impl rule__XSetLiteral__Group_3_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14067:2: rule__XSetLiteral__Group_3_1__0__Impl rule__XSetLiteral__Group_3_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13972:1: ( rule__XSetLiteral__Group_3_1__0__Impl rule__XSetLiteral__Group_3_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13973:2: rule__XSetLiteral__Group_3_1__0__Impl rule__XSetLiteral__Group_3_1__1
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__Group_3_1__0__Impl_in_rule__XSetLiteral__Group_3_1__028721);
+            pushFollow(FOLLOW_rule__XSetLiteral__Group_3_1__0__Impl_in_rule__XSetLiteral__Group_3_1__028535);
             rule__XSetLiteral__Group_3_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSetLiteral__Group_3_1__1_in_rule__XSetLiteral__Group_3_1__028724);
+            pushFollow(FOLLOW_rule__XSetLiteral__Group_3_1__1_in_rule__XSetLiteral__Group_3_1__028538);
             rule__XSetLiteral__Group_3_1__1();
 
             state._fsp--;
@@ -41324,22 +41061,22 @@ public final void rule__XSetLiteral__Group_3_1__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14074:1: rule__XSetLiteral__Group_3_1__0__Impl : ( ',' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13980:1: rule__XSetLiteral__Group_3_1__0__Impl : ( ',' ) ;
     public final void rule__XSetLiteral__Group_3_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14078:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14079:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13984:1: ( ( ',' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13985:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14079:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14080:1: ','
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13985:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13986:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getCommaKeyword_3_1_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XSetLiteral__Group_3_1__0__Impl28752); if (state.failed) return ;
+            match(input,74,FOLLOW_74_in_rule__XSetLiteral__Group_3_1__0__Impl28566); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSetLiteralAccess().getCommaKeyword_3_1_0()); 
             }
@@ -41365,16 +41102,16 @@ public final void rule__XSetLiteral__Group_3_1__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14093:1: rule__XSetLiteral__Group_3_1__1 : rule__XSetLiteral__Group_3_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13999:1: rule__XSetLiteral__Group_3_1__1 : rule__XSetLiteral__Group_3_1__1__Impl ;
     public final void rule__XSetLiteral__Group_3_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14097:1: ( rule__XSetLiteral__Group_3_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14098:2: rule__XSetLiteral__Group_3_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14003:1: ( rule__XSetLiteral__Group_3_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14004:2: rule__XSetLiteral__Group_3_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__Group_3_1__1__Impl_in_rule__XSetLiteral__Group_3_1__128783);
+            pushFollow(FOLLOW_rule__XSetLiteral__Group_3_1__1__Impl_in_rule__XSetLiteral__Group_3_1__128597);
             rule__XSetLiteral__Group_3_1__1__Impl();
 
             state._fsp--;
@@ -41398,25 +41135,25 @@ public final void rule__XSetLiteral__Group_3_1__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14104:1: rule__XSetLiteral__Group_3_1__1__Impl : ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14010:1: rule__XSetLiteral__Group_3_1__1__Impl : ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) ) ;
     public final void rule__XSetLiteral__Group_3_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14108:1: ( ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14109:1: ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14014:1: ( ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14015:1: ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14109:1: ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14110:1: ( rule__XSetLiteral__ElementsAssignment_3_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14015:1: ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14016:1: ( rule__XSetLiteral__ElementsAssignment_3_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getElementsAssignment_3_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14111:1: ( rule__XSetLiteral__ElementsAssignment_3_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14111:2: rule__XSetLiteral__ElementsAssignment_3_1_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14017:1: ( rule__XSetLiteral__ElementsAssignment_3_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14017:2: rule__XSetLiteral__ElementsAssignment_3_1_1
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__ElementsAssignment_3_1_1_in_rule__XSetLiteral__Group_3_1__1__Impl28810);
+            pushFollow(FOLLOW_rule__XSetLiteral__ElementsAssignment_3_1_1_in_rule__XSetLiteral__Group_3_1__1__Impl28624);
             rule__XSetLiteral__ElementsAssignment_3_1_1();
 
             state._fsp--;
@@ -41449,21 +41186,21 @@ public final void rule__XSetLiteral__Group_3_1__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XListLiteral__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14125:1: rule__XListLiteral__Group__0 : rule__XListLiteral__Group__0__Impl rule__XListLiteral__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14031:1: rule__XListLiteral__Group__0 : rule__XListLiteral__Group__0__Impl rule__XListLiteral__Group__1 ;
     public final void rule__XListLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14129:1: ( rule__XListLiteral__Group__0__Impl rule__XListLiteral__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14130:2: rule__XListLiteral__Group__0__Impl rule__XListLiteral__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14035:1: ( rule__XListLiteral__Group__0__Impl rule__XListLiteral__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14036:2: rule__XListLiteral__Group__0__Impl rule__XListLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__XListLiteral__Group__0__Impl_in_rule__XListLiteral__Group__028844);
+            pushFollow(FOLLOW_rule__XListLiteral__Group__0__Impl_in_rule__XListLiteral__Group__028658);
             rule__XListLiteral__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XListLiteral__Group__1_in_rule__XListLiteral__Group__028847);
+            pushFollow(FOLLOW_rule__XListLiteral__Group__1_in_rule__XListLiteral__Group__028661);
             rule__XListLiteral__Group__1();
 
             state._fsp--;
@@ -41487,23 +41224,23 @@ public final void rule__XListLiteral__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XListLiteral__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14137:1: rule__XListLiteral__Group__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14043:1: rule__XListLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XListLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14141:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14142:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14047:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14048:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14142:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14143:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14048:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14049:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getXListLiteralAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14144:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14146:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14050:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14052:1: 
             {
             }
 
@@ -41528,21 +41265,21 @@ public final void rule__XListLiteral__Group__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XListLiteral__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14156:1: rule__XListLiteral__Group__1 : rule__XListLiteral__Group__1__Impl rule__XListLiteral__Group__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14062:1: rule__XListLiteral__Group__1 : rule__XListLiteral__Group__1__Impl rule__XListLiteral__Group__2 ;
     public final void rule__XListLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14160:1: ( rule__XListLiteral__Group__1__Impl rule__XListLiteral__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14161:2: rule__XListLiteral__Group__1__Impl rule__XListLiteral__Group__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14066:1: ( rule__XListLiteral__Group__1__Impl rule__XListLiteral__Group__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14067:2: rule__XListLiteral__Group__1__Impl rule__XListLiteral__Group__2
             {
-            pushFollow(FOLLOW_rule__XListLiteral__Group__1__Impl_in_rule__XListLiteral__Group__128905);
+            pushFollow(FOLLOW_rule__XListLiteral__Group__1__Impl_in_rule__XListLiteral__Group__128719);
             rule__XListLiteral__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XListLiteral__Group__2_in_rule__XListLiteral__Group__128908);
+            pushFollow(FOLLOW_rule__XListLiteral__Group__2_in_rule__XListLiteral__Group__128722);
             rule__XListLiteral__Group__2();
 
             state._fsp--;
@@ -41566,22 +41303,22 @@ public final void rule__XListLiteral__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XListLiteral__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14168:1: rule__XListLiteral__Group__1__Impl : ( '#' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14074:1: rule__XListLiteral__Group__1__Impl : ( '#' ) ;
     public final void rule__XListLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14172:1: ( ( '#' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14173:1: ( '#' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14078:1: ( ( '#' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14079:1: ( '#' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14173:1: ( '#' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14174:1: '#'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14079:1: ( '#' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14080:1: '#'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getNumberSignKeyword_1()); 
             }
-            match(input,77,FOLLOW_77_in_rule__XListLiteral__Group__1__Impl28936); if (state.failed) return ;
+            match(input,77,FOLLOW_77_in_rule__XListLiteral__Group__1__Impl28750); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXListLiteralAccess().getNumberSignKeyword_1()); 
             }
@@ -41607,21 +41344,21 @@ public final void rule__XListLiteral__Group__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XListLiteral__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14187:1: rule__XListLiteral__Group__2 : rule__XListLiteral__Group__2__Impl rule__XListLiteral__Group__3 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14093:1: rule__XListLiteral__Group__2 : rule__XListLiteral__Group__2__Impl rule__XListLiteral__Group__3 ;
     public final void rule__XListLiteral__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14191:1: ( rule__XListLiteral__Group__2__Impl rule__XListLiteral__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14192:2: rule__XListLiteral__Group__2__Impl rule__XListLiteral__Group__3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14097:1: ( rule__XListLiteral__Group__2__Impl rule__XListLiteral__Group__3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14098:2: rule__XListLiteral__Group__2__Impl rule__XListLiteral__Group__3
             {
-            pushFollow(FOLLOW_rule__XListLiteral__Group__2__Impl_in_rule__XListLiteral__Group__228967);
+            pushFollow(FOLLOW_rule__XListLiteral__Group__2__Impl_in_rule__XListLiteral__Group__228781);
             rule__XListLiteral__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XListLiteral__Group__3_in_rule__XListLiteral__Group__228970);
+            pushFollow(FOLLOW_rule__XListLiteral__Group__3_in_rule__XListLiteral__Group__228784);
             rule__XListLiteral__Group__3();
 
             state._fsp--;
@@ -41645,22 +41382,22 @@ public final void rule__XListLiteral__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XListLiteral__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14199:1: rule__XListLiteral__Group__2__Impl : ( '[' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14105:1: rule__XListLiteral__Group__2__Impl : ( '[' ) ;
     public final void rule__XListLiteral__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14203:1: ( ( '[' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14204:1: ( '[' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14109:1: ( ( '[' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14110:1: ( '[' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14204:1: ( '[' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14205:1: '['
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14110:1: ( '[' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14111:1: '['
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getLeftSquareBracketKeyword_2()); 
             }
-            match(input,78,FOLLOW_78_in_rule__XListLiteral__Group__2__Impl28998); if (state.failed) return ;
+            match(input,78,FOLLOW_78_in_rule__XListLiteral__Group__2__Impl28812); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXListLiteralAccess().getLeftSquareBracketKeyword_2()); 
             }
@@ -41686,21 +41423,21 @@ public final void rule__XListLiteral__Group__2__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XListLiteral__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14218:1: rule__XListLiteral__Group__3 : rule__XListLiteral__Group__3__Impl rule__XListLiteral__Group__4 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14124:1: rule__XListLiteral__Group__3 : rule__XListLiteral__Group__3__Impl rule__XListLiteral__Group__4 ;
     public final void rule__XListLiteral__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14222:1: ( rule__XListLiteral__Group__3__Impl rule__XListLiteral__Group__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14223:2: rule__XListLiteral__Group__3__Impl rule__XListLiteral__Group__4
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14128:1: ( rule__XListLiteral__Group__3__Impl rule__XListLiteral__Group__4 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14129:2: rule__XListLiteral__Group__3__Impl rule__XListLiteral__Group__4
             {
-            pushFollow(FOLLOW_rule__XListLiteral__Group__3__Impl_in_rule__XListLiteral__Group__329029);
+            pushFollow(FOLLOW_rule__XListLiteral__Group__3__Impl_in_rule__XListLiteral__Group__328843);
             rule__XListLiteral__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XListLiteral__Group__4_in_rule__XListLiteral__Group__329032);
+            pushFollow(FOLLOW_rule__XListLiteral__Group__4_in_rule__XListLiteral__Group__328846);
             rule__XListLiteral__Group__4();
 
             state._fsp--;
@@ -41724,33 +41461,33 @@ public final void rule__XListLiteral__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XListLiteral__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14230:1: rule__XListLiteral__Group__3__Impl : ( ( rule__XListLiteral__Group_3__0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14136:1: rule__XListLiteral__Group__3__Impl : ( ( rule__XListLiteral__Group_3__0 )? ) ;
     public final void rule__XListLiteral__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14234:1: ( ( ( rule__XListLiteral__Group_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14235:1: ( ( rule__XListLiteral__Group_3__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14140:1: ( ( ( rule__XListLiteral__Group_3__0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14141:1: ( ( rule__XListLiteral__Group_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14235:1: ( ( rule__XListLiteral__Group_3__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14236:1: ( rule__XListLiteral__Group_3__0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14141:1: ( ( rule__XListLiteral__Group_3__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14142:1: ( rule__XListLiteral__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getGroup_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14237:1: ( rule__XListLiteral__Group_3__0 )?
-            int alt114=2;
-            int LA114_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14143:1: ( rule__XListLiteral__Group_3__0 )?
+            int alt113=2;
+            int LA113_0 = input.LA(1);
 
-            if ( ((LA114_0>=RULE_ID && LA114_0<=RULE_STRING)||(LA114_0>=16 && LA114_0<=35)||LA114_0==47||(LA114_0>=54 && LA114_0<=55)||LA114_0==60||(LA114_0>=65 && LA114_0<=66)||LA114_0==68||LA114_0==70||LA114_0==72||(LA114_0>=77 && LA114_0<=78)||(LA114_0>=80 && LA114_0<=81)||LA114_0==84||LA114_0==86||(LA114_0>=90 && LA114_0<=97)||LA114_0==99||LA114_0==108) ) {
-                alt114=1;
+            if ( ((LA113_0>=RULE_ID && LA113_0<=RULE_STRING)||(LA113_0>=16 && LA113_0<=35)||LA113_0==47||(LA113_0>=54 && LA113_0<=55)||LA113_0==60||(LA113_0>=65 && LA113_0<=66)||LA113_0==68||LA113_0==70||LA113_0==72||(LA113_0>=77 && LA113_0<=78)||(LA113_0>=80 && LA113_0<=81)||LA113_0==84||LA113_0==86||(LA113_0>=90 && LA113_0<=97)||LA113_0==99||LA113_0==108) ) {
+                alt113=1;
             }
-            switch (alt114) {
+            switch (alt113) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14237:2: rule__XListLiteral__Group_3__0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14143:2: rule__XListLiteral__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__XListLiteral__Group_3__0_in_rule__XListLiteral__Group__3__Impl29059);
+                    pushFollow(FOLLOW_rule__XListLiteral__Group_3__0_in_rule__XListLiteral__Group__3__Impl28873);
                     rule__XListLiteral__Group_3__0();
 
                     state._fsp--;
@@ -41786,16 +41523,16 @@ public final void rule__XListLiteral__Group__3__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XListLiteral__Group__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14247:1: rule__XListLiteral__Group__4 : rule__XListLiteral__Group__4__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14153:1: rule__XListLiteral__Group__4 : rule__XListLiteral__Group__4__Impl ;
     public final void rule__XListLiteral__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14251:1: ( rule__XListLiteral__Group__4__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14252:2: rule__XListLiteral__Group__4__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14157:1: ( rule__XListLiteral__Group__4__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14158:2: rule__XListLiteral__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__XListLiteral__Group__4__Impl_in_rule__XListLiteral__Group__429090);
+            pushFollow(FOLLOW_rule__XListLiteral__Group__4__Impl_in_rule__XListLiteral__Group__428904);
             rule__XListLiteral__Group__4__Impl();
 
             state._fsp--;
@@ -41819,22 +41556,22 @@ public final void rule__XListLiteral__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__XListLiteral__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14258:1: rule__XListLiteral__Group__4__Impl : ( ']' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14164:1: rule__XListLiteral__Group__4__Impl : ( ']' ) ;
     public final void rule__XListLiteral__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14262:1: ( ( ']' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14263:1: ( ']' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14168:1: ( ( ']' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14169:1: ( ']' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14263:1: ( ']' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14264:1: ']'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14169:1: ( ']' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14170:1: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getRightSquareBracketKeyword_4()); 
             }
-            match(input,79,FOLLOW_79_in_rule__XListLiteral__Group__4__Impl29118); if (state.failed) return ;
+            match(input,79,FOLLOW_79_in_rule__XListLiteral__Group__4__Impl28932); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXListLiteralAccess().getRightSquareBracketKeyword_4()); 
             }
@@ -41860,21 +41597,21 @@ public final void rule__XListLiteral__Group__4__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XListLiteral__Group_3__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14287:1: rule__XListLiteral__Group_3__0 : rule__XListLiteral__Group_3__0__Impl rule__XListLiteral__Group_3__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14193:1: rule__XListLiteral__Group_3__0 : rule__XListLiteral__Group_3__0__Impl rule__XListLiteral__Group_3__1 ;
     public final void rule__XListLiteral__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14291:1: ( rule__XListLiteral__Group_3__0__Impl rule__XListLiteral__Group_3__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14292:2: rule__XListLiteral__Group_3__0__Impl rule__XListLiteral__Group_3__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14197:1: ( rule__XListLiteral__Group_3__0__Impl rule__XListLiteral__Group_3__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14198:2: rule__XListLiteral__Group_3__0__Impl rule__XListLiteral__Group_3__1
             {
-            pushFollow(FOLLOW_rule__XListLiteral__Group_3__0__Impl_in_rule__XListLiteral__Group_3__029159);
+            pushFollow(FOLLOW_rule__XListLiteral__Group_3__0__Impl_in_rule__XListLiteral__Group_3__028973);
             rule__XListLiteral__Group_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XListLiteral__Group_3__1_in_rule__XListLiteral__Group_3__029162);
+            pushFollow(FOLLOW_rule__XListLiteral__Group_3__1_in_rule__XListLiteral__Group_3__028976);
             rule__XListLiteral__Group_3__1();
 
             state._fsp--;
@@ -41898,25 +41635,25 @@ public final void rule__XListLiteral__Group_3__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XListLiteral__Group_3__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14299:1: rule__XListLiteral__Group_3__0__Impl : ( ( rule__XListLiteral__ElementsAssignment_3_0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14205:1: rule__XListLiteral__Group_3__0__Impl : ( ( rule__XListLiteral__ElementsAssignment_3_0 ) ) ;
     public final void rule__XListLiteral__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14303:1: ( ( ( rule__XListLiteral__ElementsAssignment_3_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14304:1: ( ( rule__XListLiteral__ElementsAssignment_3_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14209:1: ( ( ( rule__XListLiteral__ElementsAssignment_3_0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14210:1: ( ( rule__XListLiteral__ElementsAssignment_3_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14304:1: ( ( rule__XListLiteral__ElementsAssignment_3_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14305:1: ( rule__XListLiteral__ElementsAssignment_3_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14210:1: ( ( rule__XListLiteral__ElementsAssignment_3_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14211:1: ( rule__XListLiteral__ElementsAssignment_3_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getElementsAssignment_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14306:1: ( rule__XListLiteral__ElementsAssignment_3_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14306:2: rule__XListLiteral__ElementsAssignment_3_0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14212:1: ( rule__XListLiteral__ElementsAssignment_3_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14212:2: rule__XListLiteral__ElementsAssignment_3_0
             {
-            pushFollow(FOLLOW_rule__XListLiteral__ElementsAssignment_3_0_in_rule__XListLiteral__Group_3__0__Impl29189);
+            pushFollow(FOLLOW_rule__XListLiteral__ElementsAssignment_3_0_in_rule__XListLiteral__Group_3__0__Impl29003);
             rule__XListLiteral__ElementsAssignment_3_0();
 
             state._fsp--;
@@ -41949,16 +41686,16 @@ public final void rule__XListLiteral__Group_3__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XListLiteral__Group_3__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14316:1: rule__XListLiteral__Group_3__1 : rule__XListLiteral__Group_3__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14222:1: rule__XListLiteral__Group_3__1 : rule__XListLiteral__Group_3__1__Impl ;
     public final void rule__XListLiteral__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14320:1: ( rule__XListLiteral__Group_3__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14321:2: rule__XListLiteral__Group_3__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14226:1: ( rule__XListLiteral__Group_3__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14227:2: rule__XListLiteral__Group_3__1__Impl
             {
-            pushFollow(FOLLOW_rule__XListLiteral__Group_3__1__Impl_in_rule__XListLiteral__Group_3__129219);
+            pushFollow(FOLLOW_rule__XListLiteral__Group_3__1__Impl_in_rule__XListLiteral__Group_3__129033);
             rule__XListLiteral__Group_3__1__Impl();
 
             state._fsp--;
@@ -41982,37 +41719,37 @@ public final void rule__XListLiteral__Group_3__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XListLiteral__Group_3__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14327:1: rule__XListLiteral__Group_3__1__Impl : ( ( rule__XListLiteral__Group_3_1__0 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14233:1: rule__XListLiteral__Group_3__1__Impl : ( ( rule__XListLiteral__Group_3_1__0 )* ) ;
     public final void rule__XListLiteral__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14331:1: ( ( ( rule__XListLiteral__Group_3_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14332:1: ( ( rule__XListLiteral__Group_3_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14237:1: ( ( ( rule__XListLiteral__Group_3_1__0 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14238:1: ( ( rule__XListLiteral__Group_3_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14332:1: ( ( rule__XListLiteral__Group_3_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14333:1: ( rule__XListLiteral__Group_3_1__0 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14238:1: ( ( rule__XListLiteral__Group_3_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14239:1: ( rule__XListLiteral__Group_3_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getGroup_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14334:1: ( rule__XListLiteral__Group_3_1__0 )*
-            loop115:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14240:1: ( rule__XListLiteral__Group_3_1__0 )*
+            loop114:
             do {
-                int alt115=2;
-                int LA115_0 = input.LA(1);
+                int alt114=2;
+                int LA114_0 = input.LA(1);
 
-                if ( (LA115_0==74) ) {
-                    alt115=1;
+                if ( (LA114_0==74) ) {
+                    alt114=1;
                 }
 
 
-                switch (alt115) {
+                switch (alt114) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14334:2: rule__XListLiteral__Group_3_1__0
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14240:2: rule__XListLiteral__Group_3_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XListLiteral__Group_3_1__0_in_rule__XListLiteral__Group_3__1__Impl29246);
+            	    pushFollow(FOLLOW_rule__XListLiteral__Group_3_1__0_in_rule__XListLiteral__Group_3__1__Impl29060);
             	    rule__XListLiteral__Group_3_1__0();
 
             	    state._fsp--;
@@ -42022,7 +41759,7 @@ public final void rule__XListLiteral__Group_3__1__Impl() throws RecognitionExcep
             	    break;
 
             	default :
-            	    break loop115;
+            	    break loop114;
                 }
             } while (true);
 
@@ -42051,21 +41788,21 @@ public final void rule__XListLiteral__Group_3__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XListLiteral__Group_3_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14348:1: rule__XListLiteral__Group_3_1__0 : rule__XListLiteral__Group_3_1__0__Impl rule__XListLiteral__Group_3_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14254:1: rule__XListLiteral__Group_3_1__0 : rule__XListLiteral__Group_3_1__0__Impl rule__XListLiteral__Group_3_1__1 ;
     public final void rule__XListLiteral__Group_3_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14352:1: ( rule__XListLiteral__Group_3_1__0__Impl rule__XListLiteral__Group_3_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14353:2: rule__XListLiteral__Group_3_1__0__Impl rule__XListLiteral__Group_3_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14258:1: ( rule__XListLiteral__Group_3_1__0__Impl rule__XListLiteral__Group_3_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14259:2: rule__XListLiteral__Group_3_1__0__Impl rule__XListLiteral__Group_3_1__1
             {
-            pushFollow(FOLLOW_rule__XListLiteral__Group_3_1__0__Impl_in_rule__XListLiteral__Group_3_1__029281);
+            pushFollow(FOLLOW_rule__XListLiteral__Group_3_1__0__Impl_in_rule__XListLiteral__Group_3_1__029095);
             rule__XListLiteral__Group_3_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XListLiteral__Group_3_1__1_in_rule__XListLiteral__Group_3_1__029284);
+            pushFollow(FOLLOW_rule__XListLiteral__Group_3_1__1_in_rule__XListLiteral__Group_3_1__029098);
             rule__XListLiteral__Group_3_1__1();
 
             state._fsp--;
@@ -42089,22 +41826,22 @@ public final void rule__XListLiteral__Group_3_1__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XListLiteral__Group_3_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14360:1: rule__XListLiteral__Group_3_1__0__Impl : ( ',' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14266:1: rule__XListLiteral__Group_3_1__0__Impl : ( ',' ) ;
     public final void rule__XListLiteral__Group_3_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14364:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14365:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14270:1: ( ( ',' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14271:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14365:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14366:1: ','
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14271:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14272:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getCommaKeyword_3_1_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XListLiteral__Group_3_1__0__Impl29312); if (state.failed) return ;
+            match(input,74,FOLLOW_74_in_rule__XListLiteral__Group_3_1__0__Impl29126); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXListLiteralAccess().getCommaKeyword_3_1_0()); 
             }
@@ -42130,16 +41867,16 @@ public final void rule__XListLiteral__Group_3_1__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XListLiteral__Group_3_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14379:1: rule__XListLiteral__Group_3_1__1 : rule__XListLiteral__Group_3_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14285:1: rule__XListLiteral__Group_3_1__1 : rule__XListLiteral__Group_3_1__1__Impl ;
     public final void rule__XListLiteral__Group_3_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14383:1: ( rule__XListLiteral__Group_3_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14384:2: rule__XListLiteral__Group_3_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14289:1: ( rule__XListLiteral__Group_3_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14290:2: rule__XListLiteral__Group_3_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XListLiteral__Group_3_1__1__Impl_in_rule__XListLiteral__Group_3_1__129343);
+            pushFollow(FOLLOW_rule__XListLiteral__Group_3_1__1__Impl_in_rule__XListLiteral__Group_3_1__129157);
             rule__XListLiteral__Group_3_1__1__Impl();
 
             state._fsp--;
@@ -42163,25 +41900,25 @@ public final void rule__XListLiteral__Group_3_1__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XListLiteral__Group_3_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14390:1: rule__XListLiteral__Group_3_1__1__Impl : ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14296:1: rule__XListLiteral__Group_3_1__1__Impl : ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) ) ;
     public final void rule__XListLiteral__Group_3_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14394:1: ( ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14395:1: ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14300:1: ( ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14301:1: ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14395:1: ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14396:1: ( rule__XListLiteral__ElementsAssignment_3_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14301:1: ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14302:1: ( rule__XListLiteral__ElementsAssignment_3_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getElementsAssignment_3_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14397:1: ( rule__XListLiteral__ElementsAssignment_3_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14397:2: rule__XListLiteral__ElementsAssignment_3_1_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14303:1: ( rule__XListLiteral__ElementsAssignment_3_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14303:2: rule__XListLiteral__ElementsAssignment_3_1_1
             {
-            pushFollow(FOLLOW_rule__XListLiteral__ElementsAssignment_3_1_1_in_rule__XListLiteral__Group_3_1__1__Impl29370);
+            pushFollow(FOLLOW_rule__XListLiteral__ElementsAssignment_3_1_1_in_rule__XListLiteral__Group_3_1__1__Impl29184);
             rule__XListLiteral__ElementsAssignment_3_1_1();
 
             state._fsp--;
@@ -42214,21 +41951,21 @@ public final void rule__XListLiteral__Group_3_1__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XClosure__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14411:1: rule__XClosure__Group__0 : rule__XClosure__Group__0__Impl rule__XClosure__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14317:1: rule__XClosure__Group__0 : rule__XClosure__Group__0__Impl rule__XClosure__Group__1 ;
     public final void rule__XClosure__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14415:1: ( rule__XClosure__Group__0__Impl rule__XClosure__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14416:2: rule__XClosure__Group__0__Impl rule__XClosure__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14321:1: ( rule__XClosure__Group__0__Impl rule__XClosure__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14322:2: rule__XClosure__Group__0__Impl rule__XClosure__Group__1
             {
-            pushFollow(FOLLOW_rule__XClosure__Group__0__Impl_in_rule__XClosure__Group__029404);
+            pushFollow(FOLLOW_rule__XClosure__Group__0__Impl_in_rule__XClosure__Group__029218);
             rule__XClosure__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XClosure__Group__1_in_rule__XClosure__Group__029407);
+            pushFollow(FOLLOW_rule__XClosure__Group__1_in_rule__XClosure__Group__029221);
             rule__XClosure__Group__1();
 
             state._fsp--;
@@ -42252,25 +41989,25 @@ public final void rule__XClosure__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14423:1: rule__XClosure__Group__0__Impl : ( ( rule__XClosure__Group_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14329:1: rule__XClosure__Group__0__Impl : ( ( rule__XClosure__Group_0__0 ) ) ;
     public final void rule__XClosure__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14427:1: ( ( ( rule__XClosure__Group_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14428:1: ( ( rule__XClosure__Group_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14333:1: ( ( ( rule__XClosure__Group_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14334:1: ( ( rule__XClosure__Group_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14428:1: ( ( rule__XClosure__Group_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14429:1: ( rule__XClosure__Group_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14334:1: ( ( rule__XClosure__Group_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14335:1: ( rule__XClosure__Group_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getGroup_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14430:1: ( rule__XClosure__Group_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14430:2: rule__XClosure__Group_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14336:1: ( rule__XClosure__Group_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14336:2: rule__XClosure__Group_0__0
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_0__0_in_rule__XClosure__Group__0__Impl29434);
+            pushFollow(FOLLOW_rule__XClosure__Group_0__0_in_rule__XClosure__Group__0__Impl29248);
             rule__XClosure__Group_0__0();
 
             state._fsp--;
@@ -42303,21 +42040,21 @@ public final void rule__XClosure__Group__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14440:1: rule__XClosure__Group__1 : rule__XClosure__Group__1__Impl rule__XClosure__Group__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14346:1: rule__XClosure__Group__1 : rule__XClosure__Group__1__Impl rule__XClosure__Group__2 ;
     public final void rule__XClosure__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14444:1: ( rule__XClosure__Group__1__Impl rule__XClosure__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14445:2: rule__XClosure__Group__1__Impl rule__XClosure__Group__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14350:1: ( rule__XClosure__Group__1__Impl rule__XClosure__Group__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14351:2: rule__XClosure__Group__1__Impl rule__XClosure__Group__2
             {
-            pushFollow(FOLLOW_rule__XClosure__Group__1__Impl_in_rule__XClosure__Group__129464);
+            pushFollow(FOLLOW_rule__XClosure__Group__1__Impl_in_rule__XClosure__Group__129278);
             rule__XClosure__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XClosure__Group__2_in_rule__XClosure__Group__129467);
+            pushFollow(FOLLOW_rule__XClosure__Group__2_in_rule__XClosure__Group__129281);
             rule__XClosure__Group__2();
 
             state._fsp--;
@@ -42341,29 +42078,29 @@ public final void rule__XClosure__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14452:1: rule__XClosure__Group__1__Impl : ( ( rule__XClosure__Group_1__0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14358:1: rule__XClosure__Group__1__Impl : ( ( rule__XClosure__Group_1__0 )? ) ;
     public final void rule__XClosure__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14456:1: ( ( ( rule__XClosure__Group_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14457:1: ( ( rule__XClosure__Group_1__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14362:1: ( ( ( rule__XClosure__Group_1__0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14363:1: ( ( rule__XClosure__Group_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14457:1: ( ( rule__XClosure__Group_1__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14458:1: ( rule__XClosure__Group_1__0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14363:1: ( ( rule__XClosure__Group_1__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14364:1: ( rule__XClosure__Group_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14459:1: ( rule__XClosure__Group_1__0 )?
-            int alt116=2;
-            alt116 = dfa116.predict(input);
-            switch (alt116) {
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14365:1: ( rule__XClosure__Group_1__0 )?
+            int alt115=2;
+            alt115 = dfa115.predict(input);
+            switch (alt115) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14459:2: rule__XClosure__Group_1__0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14365:2: rule__XClosure__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__XClosure__Group_1__0_in_rule__XClosure__Group__1__Impl29494);
+                    pushFollow(FOLLOW_rule__XClosure__Group_1__0_in_rule__XClosure__Group__1__Impl29308);
                     rule__XClosure__Group_1__0();
 
                     state._fsp--;
@@ -42399,21 +42136,21 @@ public final void rule__XClosure__Group__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14469:1: rule__XClosure__Group__2 : rule__XClosure__Group__2__Impl rule__XClosure__Group__3 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14375:1: rule__XClosure__Group__2 : rule__XClosure__Group__2__Impl rule__XClosure__Group__3 ;
     public final void rule__XClosure__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14473:1: ( rule__XClosure__Group__2__Impl rule__XClosure__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14474:2: rule__XClosure__Group__2__Impl rule__XClosure__Group__3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14379:1: ( rule__XClosure__Group__2__Impl rule__XClosure__Group__3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14380:2: rule__XClosure__Group__2__Impl rule__XClosure__Group__3
             {
-            pushFollow(FOLLOW_rule__XClosure__Group__2__Impl_in_rule__XClosure__Group__229525);
+            pushFollow(FOLLOW_rule__XClosure__Group__2__Impl_in_rule__XClosure__Group__229339);
             rule__XClosure__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XClosure__Group__3_in_rule__XClosure__Group__229528);
+            pushFollow(FOLLOW_rule__XClosure__Group__3_in_rule__XClosure__Group__229342);
             rule__XClosure__Group__3();
 
             state._fsp--;
@@ -42437,25 +42174,25 @@ public final void rule__XClosure__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14481:1: rule__XClosure__Group__2__Impl : ( ( rule__XClosure__ExpressionAssignment_2 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14387:1: rule__XClosure__Group__2__Impl : ( ( rule__XClosure__ExpressionAssignment_2 ) ) ;
     public final void rule__XClosure__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14485:1: ( ( ( rule__XClosure__ExpressionAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14486:1: ( ( rule__XClosure__ExpressionAssignment_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14391:1: ( ( ( rule__XClosure__ExpressionAssignment_2 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14392:1: ( ( rule__XClosure__ExpressionAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14486:1: ( ( rule__XClosure__ExpressionAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14487:1: ( rule__XClosure__ExpressionAssignment_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14392:1: ( ( rule__XClosure__ExpressionAssignment_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14393:1: ( rule__XClosure__ExpressionAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getExpressionAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14488:1: ( rule__XClosure__ExpressionAssignment_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14488:2: rule__XClosure__ExpressionAssignment_2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14394:1: ( rule__XClosure__ExpressionAssignment_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14394:2: rule__XClosure__ExpressionAssignment_2
             {
-            pushFollow(FOLLOW_rule__XClosure__ExpressionAssignment_2_in_rule__XClosure__Group__2__Impl29555);
+            pushFollow(FOLLOW_rule__XClosure__ExpressionAssignment_2_in_rule__XClosure__Group__2__Impl29369);
             rule__XClosure__ExpressionAssignment_2();
 
             state._fsp--;
@@ -42488,16 +42225,16 @@ public final void rule__XClosure__Group__2__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14498:1: rule__XClosure__Group__3 : rule__XClosure__Group__3__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14404:1: rule__XClosure__Group__3 : rule__XClosure__Group__3__Impl ;
     public final void rule__XClosure__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14502:1: ( rule__XClosure__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14503:2: rule__XClosure__Group__3__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14408:1: ( rule__XClosure__Group__3__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14409:2: rule__XClosure__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__XClosure__Group__3__Impl_in_rule__XClosure__Group__329585);
+            pushFollow(FOLLOW_rule__XClosure__Group__3__Impl_in_rule__XClosure__Group__329399);
             rule__XClosure__Group__3__Impl();
 
             state._fsp--;
@@ -42521,22 +42258,22 @@ public final void rule__XClosure__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14509:1: rule__XClosure__Group__3__Impl : ( ']' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14415:1: rule__XClosure__Group__3__Impl : ( ']' ) ;
     public final void rule__XClosure__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14513:1: ( ( ']' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14514:1: ( ']' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14419:1: ( ( ']' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14420:1: ( ']' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14514:1: ( ']' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14515:1: ']'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14420:1: ( ']' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14421:1: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getRightSquareBracketKeyword_3()); 
             }
-            match(input,79,FOLLOW_79_in_rule__XClosure__Group__3__Impl29613); if (state.failed) return ;
+            match(input,79,FOLLOW_79_in_rule__XClosure__Group__3__Impl29427); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXClosureAccess().getRightSquareBracketKeyword_3()); 
             }
@@ -42562,16 +42299,16 @@ public final void rule__XClosure__Group__3__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14536:1: rule__XClosure__Group_0__0 : rule__XClosure__Group_0__0__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14442:1: rule__XClosure__Group_0__0 : rule__XClosure__Group_0__0__Impl ;
     public final void rule__XClosure__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14540:1: ( rule__XClosure__Group_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14541:2: rule__XClosure__Group_0__0__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14446:1: ( rule__XClosure__Group_0__0__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14447:2: rule__XClosure__Group_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_0__0__Impl_in_rule__XClosure__Group_0__029652);
+            pushFollow(FOLLOW_rule__XClosure__Group_0__0__Impl_in_rule__XClosure__Group_0__029466);
             rule__XClosure__Group_0__0__Impl();
 
             state._fsp--;
@@ -42595,25 +42332,25 @@ public final void rule__XClosure__Group_0__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14547:1: rule__XClosure__Group_0__0__Impl : ( ( rule__XClosure__Group_0_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14453:1: rule__XClosure__Group_0__0__Impl : ( ( rule__XClosure__Group_0_0__0 ) ) ;
     public final void rule__XClosure__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14551:1: ( ( ( rule__XClosure__Group_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14552:1: ( ( rule__XClosure__Group_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14457:1: ( ( ( rule__XClosure__Group_0_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14458:1: ( ( rule__XClosure__Group_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14552:1: ( ( rule__XClosure__Group_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14553:1: ( rule__XClosure__Group_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14458:1: ( ( rule__XClosure__Group_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14459:1: ( rule__XClosure__Group_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getGroup_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14554:1: ( rule__XClosure__Group_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14554:2: rule__XClosure__Group_0_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14460:1: ( rule__XClosure__Group_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14460:2: rule__XClosure__Group_0_0__0
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_0_0__0_in_rule__XClosure__Group_0__0__Impl29679);
+            pushFollow(FOLLOW_rule__XClosure__Group_0_0__0_in_rule__XClosure__Group_0__0__Impl29493);
             rule__XClosure__Group_0_0__0();
 
             state._fsp--;
@@ -42646,21 +42383,21 @@ public final void rule__XClosure__Group_0__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__XClosure__Group_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14566:1: rule__XClosure__Group_0_0__0 : rule__XClosure__Group_0_0__0__Impl rule__XClosure__Group_0_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14472:1: rule__XClosure__Group_0_0__0 : rule__XClosure__Group_0_0__0__Impl rule__XClosure__Group_0_0__1 ;
     public final void rule__XClosure__Group_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14570:1: ( rule__XClosure__Group_0_0__0__Impl rule__XClosure__Group_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14571:2: rule__XClosure__Group_0_0__0__Impl rule__XClosure__Group_0_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14476:1: ( rule__XClosure__Group_0_0__0__Impl rule__XClosure__Group_0_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14477:2: rule__XClosure__Group_0_0__0__Impl rule__XClosure__Group_0_0__1
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_0_0__0__Impl_in_rule__XClosure__Group_0_0__029711);
+            pushFollow(FOLLOW_rule__XClosure__Group_0_0__0__Impl_in_rule__XClosure__Group_0_0__029525);
             rule__XClosure__Group_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XClosure__Group_0_0__1_in_rule__XClosure__Group_0_0__029714);
+            pushFollow(FOLLOW_rule__XClosure__Group_0_0__1_in_rule__XClosure__Group_0_0__029528);
             rule__XClosure__Group_0_0__1();
 
             state._fsp--;
@@ -42684,23 +42421,23 @@ public final void rule__XClosure__Group_0_0__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14578:1: rule__XClosure__Group_0_0__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14484:1: rule__XClosure__Group_0_0__0__Impl : ( () ) ;
     public final void rule__XClosure__Group_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14582:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14583:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14488:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14489:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14583:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14584:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14489:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14490:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getXClosureAction_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14585:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14587:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14491:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14493:1: 
             {
             }
 
@@ -42725,16 +42462,16 @@ public final void rule__XClosure__Group_0_0__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XClosure__Group_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14597:1: rule__XClosure__Group_0_0__1 : rule__XClosure__Group_0_0__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14503:1: rule__XClosure__Group_0_0__1 : rule__XClosure__Group_0_0__1__Impl ;
     public final void rule__XClosure__Group_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14601:1: ( rule__XClosure__Group_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14602:2: rule__XClosure__Group_0_0__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14507:1: ( rule__XClosure__Group_0_0__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14508:2: rule__XClosure__Group_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_0_0__1__Impl_in_rule__XClosure__Group_0_0__129772);
+            pushFollow(FOLLOW_rule__XClosure__Group_0_0__1__Impl_in_rule__XClosure__Group_0_0__129586);
             rule__XClosure__Group_0_0__1__Impl();
 
             state._fsp--;
@@ -42758,22 +42495,22 @@ public final void rule__XClosure__Group_0_0__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14608:1: rule__XClosure__Group_0_0__1__Impl : ( '[' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14514:1: rule__XClosure__Group_0_0__1__Impl : ( '[' ) ;
     public final void rule__XClosure__Group_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14612:1: ( ( '[' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14613:1: ( '[' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14518:1: ( ( '[' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14519:1: ( '[' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14613:1: ( '[' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14614:1: '['
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14519:1: ( '[' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14520:1: '['
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getLeftSquareBracketKeyword_0_0_1()); 
             }
-            match(input,78,FOLLOW_78_in_rule__XClosure__Group_0_0__1__Impl29800); if (state.failed) return ;
+            match(input,78,FOLLOW_78_in_rule__XClosure__Group_0_0__1__Impl29614); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXClosureAccess().getLeftSquareBracketKeyword_0_0_1()); 
             }
@@ -42799,16 +42536,16 @@ public final void rule__XClosure__Group_0_0__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XClosure__Group_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14631:1: rule__XClosure__Group_1__0 : rule__XClosure__Group_1__0__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14537:1: rule__XClosure__Group_1__0 : rule__XClosure__Group_1__0__Impl ;
     public final void rule__XClosure__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14635:1: ( rule__XClosure__Group_1__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14636:2: rule__XClosure__Group_1__0__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14541:1: ( rule__XClosure__Group_1__0__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14542:2: rule__XClosure__Group_1__0__Impl
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_1__0__Impl_in_rule__XClosure__Group_1__029835);
+            pushFollow(FOLLOW_rule__XClosure__Group_1__0__Impl_in_rule__XClosure__Group_1__029649);
             rule__XClosure__Group_1__0__Impl();
 
             state._fsp--;
@@ -42832,25 +42569,25 @@ public final void rule__XClosure__Group_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14642:1: rule__XClosure__Group_1__0__Impl : ( ( rule__XClosure__Group_1_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14548:1: rule__XClosure__Group_1__0__Impl : ( ( rule__XClosure__Group_1_0__0 ) ) ;
     public final void rule__XClosure__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14646:1: ( ( ( rule__XClosure__Group_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14647:1: ( ( rule__XClosure__Group_1_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14552:1: ( ( ( rule__XClosure__Group_1_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14553:1: ( ( rule__XClosure__Group_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14647:1: ( ( rule__XClosure__Group_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14648:1: ( rule__XClosure__Group_1_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14553:1: ( ( rule__XClosure__Group_1_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14554:1: ( rule__XClosure__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getGroup_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14649:1: ( rule__XClosure__Group_1_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14649:2: rule__XClosure__Group_1_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14555:1: ( rule__XClosure__Group_1_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14555:2: rule__XClosure__Group_1_0__0
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_1_0__0_in_rule__XClosure__Group_1__0__Impl29862);
+            pushFollow(FOLLOW_rule__XClosure__Group_1_0__0_in_rule__XClosure__Group_1__0__Impl29676);
             rule__XClosure__Group_1_0__0();
 
             state._fsp--;
@@ -42883,21 +42620,21 @@ public final void rule__XClosure__Group_1__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__XClosure__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14661:1: rule__XClosure__Group_1_0__0 : rule__XClosure__Group_1_0__0__Impl rule__XClosure__Group_1_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14567:1: rule__XClosure__Group_1_0__0 : rule__XClosure__Group_1_0__0__Impl rule__XClosure__Group_1_0__1 ;
     public final void rule__XClosure__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14665:1: ( rule__XClosure__Group_1_0__0__Impl rule__XClosure__Group_1_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14666:2: rule__XClosure__Group_1_0__0__Impl rule__XClosure__Group_1_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14571:1: ( rule__XClosure__Group_1_0__0__Impl rule__XClosure__Group_1_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14572:2: rule__XClosure__Group_1_0__0__Impl rule__XClosure__Group_1_0__1
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_1_0__0__Impl_in_rule__XClosure__Group_1_0__029894);
+            pushFollow(FOLLOW_rule__XClosure__Group_1_0__0__Impl_in_rule__XClosure__Group_1_0__029708);
             rule__XClosure__Group_1_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XClosure__Group_1_0__1_in_rule__XClosure__Group_1_0__029897);
+            pushFollow(FOLLOW_rule__XClosure__Group_1_0__1_in_rule__XClosure__Group_1_0__029711);
             rule__XClosure__Group_1_0__1();
 
             state._fsp--;
@@ -42921,33 +42658,33 @@ public final void rule__XClosure__Group_1_0__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14673:1: rule__XClosure__Group_1_0__0__Impl : ( ( rule__XClosure__Group_1_0_0__0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14579:1: rule__XClosure__Group_1_0__0__Impl : ( ( rule__XClosure__Group_1_0_0__0 )? ) ;
     public final void rule__XClosure__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14677:1: ( ( ( rule__XClosure__Group_1_0_0__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14678:1: ( ( rule__XClosure__Group_1_0_0__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14583:1: ( ( ( rule__XClosure__Group_1_0_0__0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14584:1: ( ( rule__XClosure__Group_1_0_0__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14678:1: ( ( rule__XClosure__Group_1_0_0__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14679:1: ( rule__XClosure__Group_1_0_0__0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14584:1: ( ( rule__XClosure__Group_1_0_0__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14585:1: ( rule__XClosure__Group_1_0_0__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getGroup_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14680:1: ( rule__XClosure__Group_1_0_0__0 )?
-            int alt117=2;
-            int LA117_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14586:1: ( rule__XClosure__Group_1_0_0__0 )?
+            int alt116=2;
+            int LA116_0 = input.LA(1);
 
-            if ( (LA117_0==RULE_ID||LA117_0==51||LA117_0==72) ) {
-                alt117=1;
+            if ( (LA116_0==RULE_ID||LA116_0==51||LA116_0==72) ) {
+                alt116=1;
             }
-            switch (alt117) {
+            switch (alt116) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14680:2: rule__XClosure__Group_1_0_0__0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14586:2: rule__XClosure__Group_1_0_0__0
                     {
-                    pushFollow(FOLLOW_rule__XClosure__Group_1_0_0__0_in_rule__XClosure__Group_1_0__0__Impl29924);
+                    pushFollow(FOLLOW_rule__XClosure__Group_1_0_0__0_in_rule__XClosure__Group_1_0__0__Impl29738);
                     rule__XClosure__Group_1_0_0__0();
 
                     state._fsp--;
@@ -42983,16 +42720,16 @@ public final void rule__XClosure__Group_1_0__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XClosure__Group_1_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14690:1: rule__XClosure__Group_1_0__1 : rule__XClosure__Group_1_0__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14596:1: rule__XClosure__Group_1_0__1 : rule__XClosure__Group_1_0__1__Impl ;
     public final void rule__XClosure__Group_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14694:1: ( rule__XClosure__Group_1_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14695:2: rule__XClosure__Group_1_0__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14600:1: ( rule__XClosure__Group_1_0__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14601:2: rule__XClosure__Group_1_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_1_0__1__Impl_in_rule__XClosure__Group_1_0__129955);
+            pushFollow(FOLLOW_rule__XClosure__Group_1_0__1__Impl_in_rule__XClosure__Group_1_0__129769);
             rule__XClosure__Group_1_0__1__Impl();
 
             state._fsp--;
@@ -43016,25 +42753,25 @@ public final void rule__XClosure__Group_1_0__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group_1_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14701:1: rule__XClosure__Group_1_0__1__Impl : ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14607:1: rule__XClosure__Group_1_0__1__Impl : ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) ) ;
     public final void rule__XClosure__Group_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14705:1: ( ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14706:1: ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14611:1: ( ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14612:1: ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14706:1: ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14707:1: ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14612:1: ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14613:1: ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getExplicitSyntaxAssignment_1_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14708:1: ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14708:2: rule__XClosure__ExplicitSyntaxAssignment_1_0_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14614:1: ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14614:2: rule__XClosure__ExplicitSyntaxAssignment_1_0_1
             {
-            pushFollow(FOLLOW_rule__XClosure__ExplicitSyntaxAssignment_1_0_1_in_rule__XClosure__Group_1_0__1__Impl29982);
+            pushFollow(FOLLOW_rule__XClosure__ExplicitSyntaxAssignment_1_0_1_in_rule__XClosure__Group_1_0__1__Impl29796);
             rule__XClosure__ExplicitSyntaxAssignment_1_0_1();
 
             state._fsp--;
@@ -43067,21 +42804,21 @@ public final void rule__XClosure__Group_1_0__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14722:1: rule__XClosure__Group_1_0_0__0 : rule__XClosure__Group_1_0_0__0__Impl rule__XClosure__Group_1_0_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14628:1: rule__XClosure__Group_1_0_0__0 : rule__XClosure__Group_1_0_0__0__Impl rule__XClosure__Group_1_0_0__1 ;
     public final void rule__XClosure__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14726:1: ( rule__XClosure__Group_1_0_0__0__Impl rule__XClosure__Group_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14727:2: rule__XClosure__Group_1_0_0__0__Impl rule__XClosure__Group_1_0_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14632:1: ( rule__XClosure__Group_1_0_0__0__Impl rule__XClosure__Group_1_0_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14633:2: rule__XClosure__Group_1_0_0__0__Impl rule__XClosure__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_1_0_0__0__Impl_in_rule__XClosure__Group_1_0_0__030016);
+            pushFollow(FOLLOW_rule__XClosure__Group_1_0_0__0__Impl_in_rule__XClosure__Group_1_0_0__029830);
             rule__XClosure__Group_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XClosure__Group_1_0_0__1_in_rule__XClosure__Group_1_0_0__030019);
+            pushFollow(FOLLOW_rule__XClosure__Group_1_0_0__1_in_rule__XClosure__Group_1_0_0__029833);
             rule__XClosure__Group_1_0_0__1();
 
             state._fsp--;
@@ -43105,25 +42842,25 @@ public final void rule__XClosure__Group_1_0_0__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14734:1: rule__XClosure__Group_1_0_0__0__Impl : ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14640:1: rule__XClosure__Group_1_0_0__0__Impl : ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) ) ;
     public final void rule__XClosure__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14738:1: ( ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14739:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14644:1: ( ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14645:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14739:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14740:1: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14645:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14646:1: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getDeclaredFormalParametersAssignment_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14741:1: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14741:2: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14647:1: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14647:2: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0
             {
-            pushFollow(FOLLOW_rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0_in_rule__XClosure__Group_1_0_0__0__Impl30046);
+            pushFollow(FOLLOW_rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0_in_rule__XClosure__Group_1_0_0__0__Impl29860);
             rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0();
 
             state._fsp--;
@@ -43156,16 +42893,16 @@ public final void rule__XClosure__Group_1_0_0__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14751:1: rule__XClosure__Group_1_0_0__1 : rule__XClosure__Group_1_0_0__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14657:1: rule__XClosure__Group_1_0_0__1 : rule__XClosure__Group_1_0_0__1__Impl ;
     public final void rule__XClosure__Group_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14755:1: ( rule__XClosure__Group_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14756:2: rule__XClosure__Group_1_0_0__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14661:1: ( rule__XClosure__Group_1_0_0__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14662:2: rule__XClosure__Group_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_1_0_0__1__Impl_in_rule__XClosure__Group_1_0_0__130076);
+            pushFollow(FOLLOW_rule__XClosure__Group_1_0_0__1__Impl_in_rule__XClosure__Group_1_0_0__129890);
             rule__XClosure__Group_1_0_0__1__Impl();
 
             state._fsp--;
@@ -43189,37 +42926,37 @@ public final void rule__XClosure__Group_1_0_0__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14762:1: rule__XClosure__Group_1_0_0__1__Impl : ( ( rule__XClosure__Group_1_0_0_1__0 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14668:1: rule__XClosure__Group_1_0_0__1__Impl : ( ( rule__XClosure__Group_1_0_0_1__0 )* ) ;
     public final void rule__XClosure__Group_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14766:1: ( ( ( rule__XClosure__Group_1_0_0_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14767:1: ( ( rule__XClosure__Group_1_0_0_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14672:1: ( ( ( rule__XClosure__Group_1_0_0_1__0 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14673:1: ( ( rule__XClosure__Group_1_0_0_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14767:1: ( ( rule__XClosure__Group_1_0_0_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14768:1: ( rule__XClosure__Group_1_0_0_1__0 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14673:1: ( ( rule__XClosure__Group_1_0_0_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14674:1: ( rule__XClosure__Group_1_0_0_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getGroup_1_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14769:1: ( rule__XClosure__Group_1_0_0_1__0 )*
-            loop118:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14675:1: ( rule__XClosure__Group_1_0_0_1__0 )*
+            loop117:
             do {
-                int alt118=2;
-                int LA118_0 = input.LA(1);
+                int alt117=2;
+                int LA117_0 = input.LA(1);
 
-                if ( (LA118_0==74) ) {
-                    alt118=1;
+                if ( (LA117_0==74) ) {
+                    alt117=1;
                 }
 
 
-                switch (alt118) {
+                switch (alt117) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14769:2: rule__XClosure__Group_1_0_0_1__0
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14675:2: rule__XClosure__Group_1_0_0_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XClosure__Group_1_0_0_1__0_in_rule__XClosure__Group_1_0_0__1__Impl30103);
+            	    pushFollow(FOLLOW_rule__XClosure__Group_1_0_0_1__0_in_rule__XClosure__Group_1_0_0__1__Impl29917);
             	    rule__XClosure__Group_1_0_0_1__0();
 
             	    state._fsp--;
@@ -43229,7 +42966,7 @@ public final void rule__XClosure__Group_1_0_0__1__Impl() throws RecognitionExcep
             	    break;
 
             	default :
-            	    break loop118;
+            	    break loop117;
                 }
             } while (true);
 
@@ -43258,21 +42995,21 @@ public final void rule__XClosure__Group_1_0_0__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14783:1: rule__XClosure__Group_1_0_0_1__0 : rule__XClosure__Group_1_0_0_1__0__Impl rule__XClosure__Group_1_0_0_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14689:1: rule__XClosure__Group_1_0_0_1__0 : rule__XClosure__Group_1_0_0_1__0__Impl rule__XClosure__Group_1_0_0_1__1 ;
     public final void rule__XClosure__Group_1_0_0_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14787:1: ( rule__XClosure__Group_1_0_0_1__0__Impl rule__XClosure__Group_1_0_0_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14788:2: rule__XClosure__Group_1_0_0_1__0__Impl rule__XClosure__Group_1_0_0_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14693:1: ( rule__XClosure__Group_1_0_0_1__0__Impl rule__XClosure__Group_1_0_0_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14694:2: rule__XClosure__Group_1_0_0_1__0__Impl rule__XClosure__Group_1_0_0_1__1
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_1_0_0_1__0__Impl_in_rule__XClosure__Group_1_0_0_1__030138);
+            pushFollow(FOLLOW_rule__XClosure__Group_1_0_0_1__0__Impl_in_rule__XClosure__Group_1_0_0_1__029952);
             rule__XClosure__Group_1_0_0_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XClosure__Group_1_0_0_1__1_in_rule__XClosure__Group_1_0_0_1__030141);
+            pushFollow(FOLLOW_rule__XClosure__Group_1_0_0_1__1_in_rule__XClosure__Group_1_0_0_1__029955);
             rule__XClosure__Group_1_0_0_1__1();
 
             state._fsp--;
@@ -43296,22 +43033,22 @@ public final void rule__XClosure__Group_1_0_0_1__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14795:1: rule__XClosure__Group_1_0_0_1__0__Impl : ( ',' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14701:1: rule__XClosure__Group_1_0_0_1__0__Impl : ( ',' ) ;
     public final void rule__XClosure__Group_1_0_0_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14799:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14800:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14705:1: ( ( ',' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14706:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14800:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14801:1: ','
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14706:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14707:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getCommaKeyword_1_0_0_1_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XClosure__Group_1_0_0_1__0__Impl30169); if (state.failed) return ;
+            match(input,74,FOLLOW_74_in_rule__XClosure__Group_1_0_0_1__0__Impl29983); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXClosureAccess().getCommaKeyword_1_0_0_1_0()); 
             }
@@ -43337,16 +43074,16 @@ public final void rule__XClosure__Group_1_0_0_1__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14814:1: rule__XClosure__Group_1_0_0_1__1 : rule__XClosure__Group_1_0_0_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14720:1: rule__XClosure__Group_1_0_0_1__1 : rule__XClosure__Group_1_0_0_1__1__Impl ;
     public final void rule__XClosure__Group_1_0_0_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14818:1: ( rule__XClosure__Group_1_0_0_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14819:2: rule__XClosure__Group_1_0_0_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14724:1: ( rule__XClosure__Group_1_0_0_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14725:2: rule__XClosure__Group_1_0_0_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_1_0_0_1__1__Impl_in_rule__XClosure__Group_1_0_0_1__130200);
+            pushFollow(FOLLOW_rule__XClosure__Group_1_0_0_1__1__Impl_in_rule__XClosure__Group_1_0_0_1__130014);
             rule__XClosure__Group_1_0_0_1__1__Impl();
 
             state._fsp--;
@@ -43370,25 +43107,25 @@ public final void rule__XClosure__Group_1_0_0_1__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14825:1: rule__XClosure__Group_1_0_0_1__1__Impl : ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14731:1: rule__XClosure__Group_1_0_0_1__1__Impl : ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) ) ;
     public final void rule__XClosure__Group_1_0_0_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14829:1: ( ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14830:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14735:1: ( ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14736:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14830:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14831:1: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14736:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14737:1: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getDeclaredFormalParametersAssignment_1_0_0_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14832:1: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14832:2: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14738:1: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14738:2: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1
             {
-            pushFollow(FOLLOW_rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1_in_rule__XClosure__Group_1_0_0_1__1__Impl30227);
+            pushFollow(FOLLOW_rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1_in_rule__XClosure__Group_1_0_0_1__1__Impl30041);
             rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1();
 
             state._fsp--;
@@ -43421,21 +43158,21 @@ public final void rule__XClosure__Group_1_0_0_1__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14846:1: rule__XExpressionInClosure__Group__0 : rule__XExpressionInClosure__Group__0__Impl rule__XExpressionInClosure__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14752:1: rule__XExpressionInClosure__Group__0 : rule__XExpressionInClosure__Group__0__Impl rule__XExpressionInClosure__Group__1 ;
     public final void rule__XExpressionInClosure__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14850:1: ( rule__XExpressionInClosure__Group__0__Impl rule__XExpressionInClosure__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14851:2: rule__XExpressionInClosure__Group__0__Impl rule__XExpressionInClosure__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14756:1: ( rule__XExpressionInClosure__Group__0__Impl rule__XExpressionInClosure__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14757:2: rule__XExpressionInClosure__Group__0__Impl rule__XExpressionInClosure__Group__1
             {
-            pushFollow(FOLLOW_rule__XExpressionInClosure__Group__0__Impl_in_rule__XExpressionInClosure__Group__030261);
+            pushFollow(FOLLOW_rule__XExpressionInClosure__Group__0__Impl_in_rule__XExpressionInClosure__Group__030075);
             rule__XExpressionInClosure__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XExpressionInClosure__Group__1_in_rule__XExpressionInClosure__Group__030264);
+            pushFollow(FOLLOW_rule__XExpressionInClosure__Group__1_in_rule__XExpressionInClosure__Group__030078);
             rule__XExpressionInClosure__Group__1();
 
             state._fsp--;
@@ -43459,23 +43196,23 @@ public final void rule__XExpressionInClosure__Group__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14858:1: rule__XExpressionInClosure__Group__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14764:1: rule__XExpressionInClosure__Group__0__Impl : ( () ) ;
     public final void rule__XExpressionInClosure__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14862:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14863:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14768:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14769:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14863:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14864:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14769:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14770:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionInClosureAccess().getXBlockExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14865:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14867:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14771:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14773:1: 
             {
             }
 
@@ -43500,16 +43237,16 @@ public final void rule__XExpressionInClosure__Group__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14877:1: rule__XExpressionInClosure__Group__1 : rule__XExpressionInClosure__Group__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14783:1: rule__XExpressionInClosure__Group__1 : rule__XExpressionInClosure__Group__1__Impl ;
     public final void rule__XExpressionInClosure__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14881:1: ( rule__XExpressionInClosure__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14882:2: rule__XExpressionInClosure__Group__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14787:1: ( rule__XExpressionInClosure__Group__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14788:2: rule__XExpressionInClosure__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XExpressionInClosure__Group__1__Impl_in_rule__XExpressionInClosure__Group__130322);
+            pushFollow(FOLLOW_rule__XExpressionInClosure__Group__1__Impl_in_rule__XExpressionInClosure__Group__130136);
             rule__XExpressionInClosure__Group__1__Impl();
 
             state._fsp--;
@@ -43533,37 +43270,37 @@ public final void rule__XExpressionInClosure__Group__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14888:1: rule__XExpressionInClosure__Group__1__Impl : ( ( rule__XExpressionInClosure__Group_1__0 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14794:1: rule__XExpressionInClosure__Group__1__Impl : ( ( rule__XExpressionInClosure__Group_1__0 )* ) ;
     public final void rule__XExpressionInClosure__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14892:1: ( ( ( rule__XExpressionInClosure__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14893:1: ( ( rule__XExpressionInClosure__Group_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14798:1: ( ( ( rule__XExpressionInClosure__Group_1__0 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14799:1: ( ( rule__XExpressionInClosure__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14893:1: ( ( rule__XExpressionInClosure__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14894:1: ( rule__XExpressionInClosure__Group_1__0 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14799:1: ( ( rule__XExpressionInClosure__Group_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14800:1: ( rule__XExpressionInClosure__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionInClosureAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14895:1: ( rule__XExpressionInClosure__Group_1__0 )*
-            loop119:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14801:1: ( rule__XExpressionInClosure__Group_1__0 )*
+            loop118:
             do {
-                int alt119=2;
-                int LA119_0 = input.LA(1);
+                int alt118=2;
+                int LA118_0 = input.LA(1);
 
-                if ( ((LA119_0>=RULE_ID && LA119_0<=RULE_STRING)||(LA119_0>=16 && LA119_0<=35)||LA119_0==47||(LA119_0>=54 && LA119_0<=55)||LA119_0==60||(LA119_0>=64 && LA119_0<=66)||LA119_0==68||LA119_0==70||LA119_0==72||(LA119_0>=77 && LA119_0<=78)||(LA119_0>=80 && LA119_0<=81)||LA119_0==84||LA119_0==86||(LA119_0>=90 && LA119_0<=97)||LA119_0==99||(LA119_0>=107 && LA119_0<=108)) ) {
-                    alt119=1;
+                if ( ((LA118_0>=RULE_ID && LA118_0<=RULE_STRING)||(LA118_0>=16 && LA118_0<=35)||LA118_0==47||(LA118_0>=54 && LA118_0<=55)||LA118_0==60||(LA118_0>=64 && LA118_0<=66)||LA118_0==68||LA118_0==70||LA118_0==72||(LA118_0>=77 && LA118_0<=78)||(LA118_0>=80 && LA118_0<=81)||LA118_0==84||LA118_0==86||(LA118_0>=90 && LA118_0<=97)||LA118_0==99||(LA118_0>=107 && LA118_0<=108)) ) {
+                    alt118=1;
                 }
 
 
-                switch (alt119) {
+                switch (alt118) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14895:2: rule__XExpressionInClosure__Group_1__0
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14801:2: rule__XExpressionInClosure__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XExpressionInClosure__Group_1__0_in_rule__XExpressionInClosure__Group__1__Impl30349);
+            	    pushFollow(FOLLOW_rule__XExpressionInClosure__Group_1__0_in_rule__XExpressionInClosure__Group__1__Impl30163);
             	    rule__XExpressionInClosure__Group_1__0();
 
             	    state._fsp--;
@@ -43573,7 +43310,7 @@ public final void rule__XExpressionInClosure__Group__1__Impl() throws Recognitio
             	    break;
 
             	default :
-            	    break loop119;
+            	    break loop118;
                 }
             } while (true);
 
@@ -43602,21 +43339,21 @@ public final void rule__XExpressionInClosure__Group__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14909:1: rule__XExpressionInClosure__Group_1__0 : rule__XExpressionInClosure__Group_1__0__Impl rule__XExpressionInClosure__Group_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14815:1: rule__XExpressionInClosure__Group_1__0 : rule__XExpressionInClosure__Group_1__0__Impl rule__XExpressionInClosure__Group_1__1 ;
     public final void rule__XExpressionInClosure__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14913:1: ( rule__XExpressionInClosure__Group_1__0__Impl rule__XExpressionInClosure__Group_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14914:2: rule__XExpressionInClosure__Group_1__0__Impl rule__XExpressionInClosure__Group_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14819:1: ( rule__XExpressionInClosure__Group_1__0__Impl rule__XExpressionInClosure__Group_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14820:2: rule__XExpressionInClosure__Group_1__0__Impl rule__XExpressionInClosure__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XExpressionInClosure__Group_1__0__Impl_in_rule__XExpressionInClosure__Group_1__030384);
+            pushFollow(FOLLOW_rule__XExpressionInClosure__Group_1__0__Impl_in_rule__XExpressionInClosure__Group_1__030198);
             rule__XExpressionInClosure__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XExpressionInClosure__Group_1__1_in_rule__XExpressionInClosure__Group_1__030387);
+            pushFollow(FOLLOW_rule__XExpressionInClosure__Group_1__1_in_rule__XExpressionInClosure__Group_1__030201);
             rule__XExpressionInClosure__Group_1__1();
 
             state._fsp--;
@@ -43640,25 +43377,25 @@ public final void rule__XExpressionInClosure__Group_1__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14921:1: rule__XExpressionInClosure__Group_1__0__Impl : ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14827:1: rule__XExpressionInClosure__Group_1__0__Impl : ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) ) ;
     public final void rule__XExpressionInClosure__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14925:1: ( ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14926:1: ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14831:1: ( ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14832:1: ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14926:1: ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14927:1: ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14832:1: ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14833:1: ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionInClosureAccess().getExpressionsAssignment_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14928:1: ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14928:2: rule__XExpressionInClosure__ExpressionsAssignment_1_0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14834:1: ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14834:2: rule__XExpressionInClosure__ExpressionsAssignment_1_0
             {
-            pushFollow(FOLLOW_rule__XExpressionInClosure__ExpressionsAssignment_1_0_in_rule__XExpressionInClosure__Group_1__0__Impl30414);
+            pushFollow(FOLLOW_rule__XExpressionInClosure__ExpressionsAssignment_1_0_in_rule__XExpressionInClosure__Group_1__0__Impl30228);
             rule__XExpressionInClosure__ExpressionsAssignment_1_0();
 
             state._fsp--;
@@ -43691,16 +43428,16 @@ public final void rule__XExpressionInClosure__Group_1__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14938:1: rule__XExpressionInClosure__Group_1__1 : rule__XExpressionInClosure__Group_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14844:1: rule__XExpressionInClosure__Group_1__1 : rule__XExpressionInClosure__Group_1__1__Impl ;
     public final void rule__XExpressionInClosure__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14942:1: ( rule__XExpressionInClosure__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14943:2: rule__XExpressionInClosure__Group_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14848:1: ( rule__XExpressionInClosure__Group_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14849:2: rule__XExpressionInClosure__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XExpressionInClosure__Group_1__1__Impl_in_rule__XExpressionInClosure__Group_1__130444);
+            pushFollow(FOLLOW_rule__XExpressionInClosure__Group_1__1__Impl_in_rule__XExpressionInClosure__Group_1__130258);
             rule__XExpressionInClosure__Group_1__1__Impl();
 
             state._fsp--;
@@ -43724,33 +43461,33 @@ public final void rule__XExpressionInClosure__Group_1__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14949:1: rule__XExpressionInClosure__Group_1__1__Impl : ( ( ';' )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14855:1: rule__XExpressionInClosure__Group_1__1__Impl : ( ( ';' )? ) ;
     public final void rule__XExpressionInClosure__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14953:1: ( ( ( ';' )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14954:1: ( ( ';' )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14859:1: ( ( ( ';' )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14860:1: ( ( ';' )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14954:1: ( ( ';' )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14955:1: ( ';' )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14860:1: ( ( ';' )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14861:1: ( ';' )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionInClosureAccess().getSemicolonKeyword_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14956:1: ( ';' )?
-            int alt120=2;
-            int LA120_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14862:1: ( ';' )?
+            int alt119=2;
+            int LA119_0 = input.LA(1);
 
-            if ( (LA120_0==71) ) {
-                alt120=1;
+            if ( (LA119_0==71) ) {
+                alt119=1;
             }
-            switch (alt120) {
+            switch (alt119) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14957:2: ';'
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14863:2: ';'
                     {
-                    match(input,71,FOLLOW_71_in_rule__XExpressionInClosure__Group_1__1__Impl30473); if (state.failed) return ;
+                    match(input,71,FOLLOW_71_in_rule__XExpressionInClosure__Group_1__1__Impl30287); if (state.failed) return ;
 
                     }
                     break;
@@ -43782,21 +43519,21 @@ public final void rule__XExpressionInClosure__Group_1__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XShortClosure__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14972:1: rule__XShortClosure__Group__0 : rule__XShortClosure__Group__0__Impl rule__XShortClosure__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14878:1: rule__XShortClosure__Group__0 : rule__XShortClosure__Group__0__Impl rule__XShortClosure__Group__1 ;
     public final void rule__XShortClosure__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14976:1: ( rule__XShortClosure__Group__0__Impl rule__XShortClosure__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14977:2: rule__XShortClosure__Group__0__Impl rule__XShortClosure__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14882:1: ( rule__XShortClosure__Group__0__Impl rule__XShortClosure__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14883:2: rule__XShortClosure__Group__0__Impl rule__XShortClosure__Group__1
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group__0__Impl_in_rule__XShortClosure__Group__030510);
+            pushFollow(FOLLOW_rule__XShortClosure__Group__0__Impl_in_rule__XShortClosure__Group__030324);
             rule__XShortClosure__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XShortClosure__Group__1_in_rule__XShortClosure__Group__030513);
+            pushFollow(FOLLOW_rule__XShortClosure__Group__1_in_rule__XShortClosure__Group__030327);
             rule__XShortClosure__Group__1();
 
             state._fsp--;
@@ -43820,25 +43557,25 @@ public final void rule__XShortClosure__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XShortClosure__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14984:1: rule__XShortClosure__Group__0__Impl : ( ( rule__XShortClosure__Group_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14890:1: rule__XShortClosure__Group__0__Impl : ( ( rule__XShortClosure__Group_0__0 ) ) ;
     public final void rule__XShortClosure__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14988:1: ( ( ( rule__XShortClosure__Group_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14989:1: ( ( rule__XShortClosure__Group_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14894:1: ( ( ( rule__XShortClosure__Group_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14895:1: ( ( rule__XShortClosure__Group_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14989:1: ( ( rule__XShortClosure__Group_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14990:1: ( rule__XShortClosure__Group_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14895:1: ( ( rule__XShortClosure__Group_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14896:1: ( rule__XShortClosure__Group_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getGroup_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14991:1: ( rule__XShortClosure__Group_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14991:2: rule__XShortClosure__Group_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14897:1: ( rule__XShortClosure__Group_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14897:2: rule__XShortClosure__Group_0__0
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0__0_in_rule__XShortClosure__Group__0__Impl30540);
+            pushFollow(FOLLOW_rule__XShortClosure__Group_0__0_in_rule__XShortClosure__Group__0__Impl30354);
             rule__XShortClosure__Group_0__0();
 
             state._fsp--;
@@ -43871,16 +43608,16 @@ public final void rule__XShortClosure__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XShortClosure__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15001:1: rule__XShortClosure__Group__1 : rule__XShortClosure__Group__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14907:1: rule__XShortClosure__Group__1 : rule__XShortClosure__Group__1__Impl ;
     public final void rule__XShortClosure__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15005:1: ( rule__XShortClosure__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15006:2: rule__XShortClosure__Group__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14911:1: ( rule__XShortClosure__Group__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14912:2: rule__XShortClosure__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group__1__Impl_in_rule__XShortClosure__Group__130570);
+            pushFollow(FOLLOW_rule__XShortClosure__Group__1__Impl_in_rule__XShortClosure__Group__130384);
             rule__XShortClosure__Group__1__Impl();
 
             state._fsp--;
@@ -43904,25 +43641,25 @@ public final void rule__XShortClosure__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XShortClosure__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15012:1: rule__XShortClosure__Group__1__Impl : ( ( rule__XShortClosure__ExpressionAssignment_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14918:1: rule__XShortClosure__Group__1__Impl : ( ( rule__XShortClosure__ExpressionAssignment_1 ) ) ;
     public final void rule__XShortClosure__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15016:1: ( ( ( rule__XShortClosure__ExpressionAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15017:1: ( ( rule__XShortClosure__ExpressionAssignment_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14922:1: ( ( ( rule__XShortClosure__ExpressionAssignment_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14923:1: ( ( rule__XShortClosure__ExpressionAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15017:1: ( ( rule__XShortClosure__ExpressionAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15018:1: ( rule__XShortClosure__ExpressionAssignment_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14923:1: ( ( rule__XShortClosure__ExpressionAssignment_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14924:1: ( rule__XShortClosure__ExpressionAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getExpressionAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15019:1: ( rule__XShortClosure__ExpressionAssignment_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15019:2: rule__XShortClosure__ExpressionAssignment_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14925:1: ( rule__XShortClosure__ExpressionAssignment_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14925:2: rule__XShortClosure__ExpressionAssignment_1
             {
-            pushFollow(FOLLOW_rule__XShortClosure__ExpressionAssignment_1_in_rule__XShortClosure__Group__1__Impl30597);
+            pushFollow(FOLLOW_rule__XShortClosure__ExpressionAssignment_1_in_rule__XShortClosure__Group__1__Impl30411);
             rule__XShortClosure__ExpressionAssignment_1();
 
             state._fsp--;
@@ -43955,16 +43692,16 @@ public final void rule__XShortClosure__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XShortClosure__Group_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15033:1: rule__XShortClosure__Group_0__0 : rule__XShortClosure__Group_0__0__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14939:1: rule__XShortClosure__Group_0__0 : rule__XShortClosure__Group_0__0__Impl ;
     public final void rule__XShortClosure__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15037:1: ( rule__XShortClosure__Group_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15038:2: rule__XShortClosure__Group_0__0__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14943:1: ( rule__XShortClosure__Group_0__0__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14944:2: rule__XShortClosure__Group_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0__0__Impl_in_rule__XShortClosure__Group_0__030631);
+            pushFollow(FOLLOW_rule__XShortClosure__Group_0__0__Impl_in_rule__XShortClosure__Group_0__030445);
             rule__XShortClosure__Group_0__0__Impl();
 
             state._fsp--;
@@ -43988,25 +43725,25 @@ public final void rule__XShortClosure__Group_0__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XShortClosure__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15044:1: rule__XShortClosure__Group_0__0__Impl : ( ( rule__XShortClosure__Group_0_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14950:1: rule__XShortClosure__Group_0__0__Impl : ( ( rule__XShortClosure__Group_0_0__0 ) ) ;
     public final void rule__XShortClosure__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15048:1: ( ( ( rule__XShortClosure__Group_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15049:1: ( ( rule__XShortClosure__Group_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14954:1: ( ( ( rule__XShortClosure__Group_0_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14955:1: ( ( rule__XShortClosure__Group_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15049:1: ( ( rule__XShortClosure__Group_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15050:1: ( rule__XShortClosure__Group_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14955:1: ( ( rule__XShortClosure__Group_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14956:1: ( rule__XShortClosure__Group_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getGroup_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15051:1: ( rule__XShortClosure__Group_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15051:2: rule__XShortClosure__Group_0_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14957:1: ( rule__XShortClosure__Group_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14957:2: rule__XShortClosure__Group_0_0__0
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0__0_in_rule__XShortClosure__Group_0__0__Impl30658);
+            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0__0_in_rule__XShortClosure__Group_0__0__Impl30472);
             rule__XShortClosure__Group_0_0__0();
 
             state._fsp--;
@@ -44039,21 +43776,21 @@ public final void rule__XShortClosure__Group_0__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15063:1: rule__XShortClosure__Group_0_0__0 : rule__XShortClosure__Group_0_0__0__Impl rule__XShortClosure__Group_0_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14969:1: rule__XShortClosure__Group_0_0__0 : rule__XShortClosure__Group_0_0__0__Impl rule__XShortClosure__Group_0_0__1 ;
     public final void rule__XShortClosure__Group_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15067:1: ( rule__XShortClosure__Group_0_0__0__Impl rule__XShortClosure__Group_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15068:2: rule__XShortClosure__Group_0_0__0__Impl rule__XShortClosure__Group_0_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14973:1: ( rule__XShortClosure__Group_0_0__0__Impl rule__XShortClosure__Group_0_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14974:2: rule__XShortClosure__Group_0_0__0__Impl rule__XShortClosure__Group_0_0__1
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0__0__Impl_in_rule__XShortClosure__Group_0_0__030690);
+            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0__0__Impl_in_rule__XShortClosure__Group_0_0__030504);
             rule__XShortClosure__Group_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0__1_in_rule__XShortClosure__Group_0_0__030693);
+            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0__1_in_rule__XShortClosure__Group_0_0__030507);
             rule__XShortClosure__Group_0_0__1();
 
             state._fsp--;
@@ -44077,23 +43814,23 @@ public final void rule__XShortClosure__Group_0_0__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15075:1: rule__XShortClosure__Group_0_0__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14981:1: rule__XShortClosure__Group_0_0__0__Impl : ( () ) ;
     public final void rule__XShortClosure__Group_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15079:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15080:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14985:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14986:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15080:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15081:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14986:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14987:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getXClosureAction_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15082:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15084:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14988:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14990:1: 
             {
             }
 
@@ -44118,21 +43855,21 @@ public final void rule__XShortClosure__Group_0_0__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15094:1: rule__XShortClosure__Group_0_0__1 : rule__XShortClosure__Group_0_0__1__Impl rule__XShortClosure__Group_0_0__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15000:1: rule__XShortClosure__Group_0_0__1 : rule__XShortClosure__Group_0_0__1__Impl rule__XShortClosure__Group_0_0__2 ;
     public final void rule__XShortClosure__Group_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15098:1: ( rule__XShortClosure__Group_0_0__1__Impl rule__XShortClosure__Group_0_0__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15099:2: rule__XShortClosure__Group_0_0__1__Impl rule__XShortClosure__Group_0_0__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15004:1: ( rule__XShortClosure__Group_0_0__1__Impl rule__XShortClosure__Group_0_0__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15005:2: rule__XShortClosure__Group_0_0__1__Impl rule__XShortClosure__Group_0_0__2
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0__1__Impl_in_rule__XShortClosure__Group_0_0__130751);
+            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0__1__Impl_in_rule__XShortClosure__Group_0_0__130565);
             rule__XShortClosure__Group_0_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0__2_in_rule__XShortClosure__Group_0_0__130754);
+            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0__2_in_rule__XShortClosure__Group_0_0__130568);
             rule__XShortClosure__Group_0_0__2();
 
             state._fsp--;
@@ -44156,33 +43893,33 @@ public final void rule__XShortClosure__Group_0_0__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15106:1: rule__XShortClosure__Group_0_0__1__Impl : ( ( rule__XShortClosure__Group_0_0_1__0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15012:1: rule__XShortClosure__Group_0_0__1__Impl : ( ( rule__XShortClosure__Group_0_0_1__0 )? ) ;
     public final void rule__XShortClosure__Group_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15110:1: ( ( ( rule__XShortClosure__Group_0_0_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15111:1: ( ( rule__XShortClosure__Group_0_0_1__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15016:1: ( ( ( rule__XShortClosure__Group_0_0_1__0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15017:1: ( ( rule__XShortClosure__Group_0_0_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15111:1: ( ( rule__XShortClosure__Group_0_0_1__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15112:1: ( rule__XShortClosure__Group_0_0_1__0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15017:1: ( ( rule__XShortClosure__Group_0_0_1__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15018:1: ( rule__XShortClosure__Group_0_0_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getGroup_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15113:1: ( rule__XShortClosure__Group_0_0_1__0 )?
-            int alt121=2;
-            int LA121_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15019:1: ( rule__XShortClosure__Group_0_0_1__0 )?
+            int alt120=2;
+            int LA120_0 = input.LA(1);
 
-            if ( (LA121_0==RULE_ID||LA121_0==51||LA121_0==72) ) {
-                alt121=1;
+            if ( (LA120_0==RULE_ID||LA120_0==51||LA120_0==72) ) {
+                alt120=1;
             }
-            switch (alt121) {
+            switch (alt120) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15113:2: rule__XShortClosure__Group_0_0_1__0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15019:2: rule__XShortClosure__Group_0_0_1__0
                     {
-                    pushFollow(FOLLOW_rule__XShortClosure__Group_0_0_1__0_in_rule__XShortClosure__Group_0_0__1__Impl30781);
+                    pushFollow(FOLLOW_rule__XShortClosure__Group_0_0_1__0_in_rule__XShortClosure__Group_0_0__1__Impl30595);
                     rule__XShortClosure__Group_0_0_1__0();
 
                     state._fsp--;
@@ -44218,16 +43955,16 @@ public final void rule__XShortClosure__Group_0_0__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15123:1: rule__XShortClosure__Group_0_0__2 : rule__XShortClosure__Group_0_0__2__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15029:1: rule__XShortClosure__Group_0_0__2 : rule__XShortClosure__Group_0_0__2__Impl ;
     public final void rule__XShortClosure__Group_0_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15127:1: ( rule__XShortClosure__Group_0_0__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15128:2: rule__XShortClosure__Group_0_0__2__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15033:1: ( rule__XShortClosure__Group_0_0__2__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15034:2: rule__XShortClosure__Group_0_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0__2__Impl_in_rule__XShortClosure__Group_0_0__230812);
+            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0__2__Impl_in_rule__XShortClosure__Group_0_0__230626);
             rule__XShortClosure__Group_0_0__2__Impl();
 
             state._fsp--;
@@ -44251,25 +43988,25 @@ public final void rule__XShortClosure__Group_0_0__2() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15134:1: rule__XShortClosure__Group_0_0__2__Impl : ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15040:1: rule__XShortClosure__Group_0_0__2__Impl : ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) ) ;
     public final void rule__XShortClosure__Group_0_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15138:1: ( ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15139:1: ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15044:1: ( ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15045:1: ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15139:1: ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15140:1: ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15045:1: ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15046:1: ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getExplicitSyntaxAssignment_0_0_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15141:1: ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15141:2: rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15047:1: ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15047:2: rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2
             {
-            pushFollow(FOLLOW_rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2_in_rule__XShortClosure__Group_0_0__2__Impl30839);
+            pushFollow(FOLLOW_rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2_in_rule__XShortClosure__Group_0_0__2__Impl30653);
             rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2();
 
             state._fsp--;
@@ -44302,21 +44039,21 @@ public final void rule__XShortClosure__Group_0_0__2__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15157:1: rule__XShortClosure__Group_0_0_1__0 : rule__XShortClosure__Group_0_0_1__0__Impl rule__XShortClosure__Group_0_0_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15063:1: rule__XShortClosure__Group_0_0_1__0 : rule__XShortClosure__Group_0_0_1__0__Impl rule__XShortClosure__Group_0_0_1__1 ;
     public final void rule__XShortClosure__Group_0_0_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15161:1: ( rule__XShortClosure__Group_0_0_1__0__Impl rule__XShortClosure__Group_0_0_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15162:2: rule__XShortClosure__Group_0_0_1__0__Impl rule__XShortClosure__Group_0_0_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15067:1: ( rule__XShortClosure__Group_0_0_1__0__Impl rule__XShortClosure__Group_0_0_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15068:2: rule__XShortClosure__Group_0_0_1__0__Impl rule__XShortClosure__Group_0_0_1__1
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0_1__0__Impl_in_rule__XShortClosure__Group_0_0_1__030875);
+            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0_1__0__Impl_in_rule__XShortClosure__Group_0_0_1__030689);
             rule__XShortClosure__Group_0_0_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0_1__1_in_rule__XShortClosure__Group_0_0_1__030878);
+            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0_1__1_in_rule__XShortClosure__Group_0_0_1__030692);
             rule__XShortClosure__Group_0_0_1__1();
 
             state._fsp--;
@@ -44340,25 +44077,25 @@ public final void rule__XShortClosure__Group_0_0_1__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15169:1: rule__XShortClosure__Group_0_0_1__0__Impl : ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15075:1: rule__XShortClosure__Group_0_0_1__0__Impl : ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) ) ;
     public final void rule__XShortClosure__Group_0_0_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15173:1: ( ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15174:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15079:1: ( ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15080:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15174:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15175:1: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15080:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15081:1: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getDeclaredFormalParametersAssignment_0_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15176:1: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15176:2: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15082:1: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15082:2: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0
             {
-            pushFollow(FOLLOW_rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0_in_rule__XShortClosure__Group_0_0_1__0__Impl30905);
+            pushFollow(FOLLOW_rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0_in_rule__XShortClosure__Group_0_0_1__0__Impl30719);
             rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0();
 
             state._fsp--;
@@ -44391,16 +44128,16 @@ public final void rule__XShortClosure__Group_0_0_1__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15186:1: rule__XShortClosure__Group_0_0_1__1 : rule__XShortClosure__Group_0_0_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15092:1: rule__XShortClosure__Group_0_0_1__1 : rule__XShortClosure__Group_0_0_1__1__Impl ;
     public final void rule__XShortClosure__Group_0_0_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15190:1: ( rule__XShortClosure__Group_0_0_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15191:2: rule__XShortClosure__Group_0_0_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15096:1: ( rule__XShortClosure__Group_0_0_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15097:2: rule__XShortClosure__Group_0_0_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0_1__1__Impl_in_rule__XShortClosure__Group_0_0_1__130935);
+            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0_1__1__Impl_in_rule__XShortClosure__Group_0_0_1__130749);
             rule__XShortClosure__Group_0_0_1__1__Impl();
 
             state._fsp--;
@@ -44424,37 +44161,37 @@ public final void rule__XShortClosure__Group_0_0_1__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15197:1: rule__XShortClosure__Group_0_0_1__1__Impl : ( ( rule__XShortClosure__Group_0_0_1_1__0 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15103:1: rule__XShortClosure__Group_0_0_1__1__Impl : ( ( rule__XShortClosure__Group_0_0_1_1__0 )* ) ;
     public final void rule__XShortClosure__Group_0_0_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15201:1: ( ( ( rule__XShortClosure__Group_0_0_1_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15202:1: ( ( rule__XShortClosure__Group_0_0_1_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15107:1: ( ( ( rule__XShortClosure__Group_0_0_1_1__0 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15108:1: ( ( rule__XShortClosure__Group_0_0_1_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15202:1: ( ( rule__XShortClosure__Group_0_0_1_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15203:1: ( rule__XShortClosure__Group_0_0_1_1__0 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15108:1: ( ( rule__XShortClosure__Group_0_0_1_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15109:1: ( rule__XShortClosure__Group_0_0_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getGroup_0_0_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15204:1: ( rule__XShortClosure__Group_0_0_1_1__0 )*
-            loop122:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15110:1: ( rule__XShortClosure__Group_0_0_1_1__0 )*
+            loop121:
             do {
-                int alt122=2;
-                int LA122_0 = input.LA(1);
+                int alt121=2;
+                int LA121_0 = input.LA(1);
 
-                if ( (LA122_0==74) ) {
-                    alt122=1;
+                if ( (LA121_0==74) ) {
+                    alt121=1;
                 }
 
 
-                switch (alt122) {
+                switch (alt121) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15204:2: rule__XShortClosure__Group_0_0_1_1__0
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15110:2: rule__XShortClosure__Group_0_0_1_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XShortClosure__Group_0_0_1_1__0_in_rule__XShortClosure__Group_0_0_1__1__Impl30962);
+            	    pushFollow(FOLLOW_rule__XShortClosure__Group_0_0_1_1__0_in_rule__XShortClosure__Group_0_0_1__1__Impl30776);
             	    rule__XShortClosure__Group_0_0_1_1__0();
 
             	    state._fsp--;
@@ -44464,7 +44201,7 @@ public final void rule__XShortClosure__Group_0_0_1__1__Impl() throws Recognition
             	    break;
 
             	default :
-            	    break loop122;
+            	    break loop121;
                 }
             } while (true);
 
@@ -44493,21 +44230,21 @@ public final void rule__XShortClosure__Group_0_0_1__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15218:1: rule__XShortClosure__Group_0_0_1_1__0 : rule__XShortClosure__Group_0_0_1_1__0__Impl rule__XShortClosure__Group_0_0_1_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15124:1: rule__XShortClosure__Group_0_0_1_1__0 : rule__XShortClosure__Group_0_0_1_1__0__Impl rule__XShortClosure__Group_0_0_1_1__1 ;
     public final void rule__XShortClosure__Group_0_0_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15222:1: ( rule__XShortClosure__Group_0_0_1_1__0__Impl rule__XShortClosure__Group_0_0_1_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15223:2: rule__XShortClosure__Group_0_0_1_1__0__Impl rule__XShortClosure__Group_0_0_1_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15128:1: ( rule__XShortClosure__Group_0_0_1_1__0__Impl rule__XShortClosure__Group_0_0_1_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15129:2: rule__XShortClosure__Group_0_0_1_1__0__Impl rule__XShortClosure__Group_0_0_1_1__1
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0_1_1__0__Impl_in_rule__XShortClosure__Group_0_0_1_1__030997);
+            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0_1_1__0__Impl_in_rule__XShortClosure__Group_0_0_1_1__030811);
             rule__XShortClosure__Group_0_0_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0_1_1__1_in_rule__XShortClosure__Group_0_0_1_1__031000);
+            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0_1_1__1_in_rule__XShortClosure__Group_0_0_1_1__030814);
             rule__XShortClosure__Group_0_0_1_1__1();
 
             state._fsp--;
@@ -44531,22 +44268,22 @@ public final void rule__XShortClosure__Group_0_0_1_1__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15230:1: rule__XShortClosure__Group_0_0_1_1__0__Impl : ( ',' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15136:1: rule__XShortClosure__Group_0_0_1_1__0__Impl : ( ',' ) ;
     public final void rule__XShortClosure__Group_0_0_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15234:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15235:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15140:1: ( ( ',' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15141:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15235:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15236:1: ','
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15141:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15142:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getCommaKeyword_0_0_1_1_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XShortClosure__Group_0_0_1_1__0__Impl31028); if (state.failed) return ;
+            match(input,74,FOLLOW_74_in_rule__XShortClosure__Group_0_0_1_1__0__Impl30842); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXShortClosureAccess().getCommaKeyword_0_0_1_1_0()); 
             }
@@ -44572,16 +44309,16 @@ public final void rule__XShortClosure__Group_0_0_1_1__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15249:1: rule__XShortClosure__Group_0_0_1_1__1 : rule__XShortClosure__Group_0_0_1_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15155:1: rule__XShortClosure__Group_0_0_1_1__1 : rule__XShortClosure__Group_0_0_1_1__1__Impl ;
     public final void rule__XShortClosure__Group_0_0_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15253:1: ( rule__XShortClosure__Group_0_0_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15254:2: rule__XShortClosure__Group_0_0_1_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15159:1: ( rule__XShortClosure__Group_0_0_1_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15160:2: rule__XShortClosure__Group_0_0_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0_1_1__1__Impl_in_rule__XShortClosure__Group_0_0_1_1__131059);
+            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0_1_1__1__Impl_in_rule__XShortClosure__Group_0_0_1_1__130873);
             rule__XShortClosure__Group_0_0_1_1__1__Impl();
 
             state._fsp--;
@@ -44605,25 +44342,25 @@ public final void rule__XShortClosure__Group_0_0_1_1__1() throws RecognitionExce
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15260:1: rule__XShortClosure__Group_0_0_1_1__1__Impl : ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15166:1: rule__XShortClosure__Group_0_0_1_1__1__Impl : ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) ) ;
     public final void rule__XShortClosure__Group_0_0_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15264:1: ( ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15265:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15170:1: ( ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15171:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15265:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15266:1: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15171:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15172:1: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getDeclaredFormalParametersAssignment_0_0_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15267:1: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15267:2: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15173:1: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15173:2: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1
             {
-            pushFollow(FOLLOW_rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1_in_rule__XShortClosure__Group_0_0_1_1__1__Impl31086);
+            pushFollow(FOLLOW_rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1_in_rule__XShortClosure__Group_0_0_1_1__1__Impl30900);
             rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1();
 
             state._fsp--;
@@ -44656,21 +44393,21 @@ public final void rule__XShortClosure__Group_0_0_1_1__1__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XParenthesizedExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15281:1: rule__XParenthesizedExpression__Group__0 : rule__XParenthesizedExpression__Group__0__Impl rule__XParenthesizedExpression__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15187:1: rule__XParenthesizedExpression__Group__0 : rule__XParenthesizedExpression__Group__0__Impl rule__XParenthesizedExpression__Group__1 ;
     public final void rule__XParenthesizedExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15285:1: ( rule__XParenthesizedExpression__Group__0__Impl rule__XParenthesizedExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15286:2: rule__XParenthesizedExpression__Group__0__Impl rule__XParenthesizedExpression__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15191:1: ( rule__XParenthesizedExpression__Group__0__Impl rule__XParenthesizedExpression__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15192:2: rule__XParenthesizedExpression__Group__0__Impl rule__XParenthesizedExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XParenthesizedExpression__Group__0__Impl_in_rule__XParenthesizedExpression__Group__031120);
+            pushFollow(FOLLOW_rule__XParenthesizedExpression__Group__0__Impl_in_rule__XParenthesizedExpression__Group__030934);
             rule__XParenthesizedExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XParenthesizedExpression__Group__1_in_rule__XParenthesizedExpression__Group__031123);
+            pushFollow(FOLLOW_rule__XParenthesizedExpression__Group__1_in_rule__XParenthesizedExpression__Group__030937);
             rule__XParenthesizedExpression__Group__1();
 
             state._fsp--;
@@ -44694,22 +44431,22 @@ public final void rule__XParenthesizedExpression__Group__0() throws RecognitionE
 
 
     // $ANTLR start "rule__XParenthesizedExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15293:1: rule__XParenthesizedExpression__Group__0__Impl : ( '(' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15199:1: rule__XParenthesizedExpression__Group__0__Impl : ( '(' ) ;
     public final void rule__XParenthesizedExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15297:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15298:1: ( '(' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15203:1: ( ( '(' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15204:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15298:1: ( '(' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15299:1: '('
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15204:1: ( '(' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15205:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXParenthesizedExpressionAccess().getLeftParenthesisKeyword_0()); 
             }
-            match(input,72,FOLLOW_72_in_rule__XParenthesizedExpression__Group__0__Impl31151); if (state.failed) return ;
+            match(input,72,FOLLOW_72_in_rule__XParenthesizedExpression__Group__0__Impl30965); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXParenthesizedExpressionAccess().getLeftParenthesisKeyword_0()); 
             }
@@ -44735,21 +44472,21 @@ public final void rule__XParenthesizedExpression__Group__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XParenthesizedExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15312:1: rule__XParenthesizedExpression__Group__1 : rule__XParenthesizedExpression__Group__1__Impl rule__XParenthesizedExpression__Group__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15218:1: rule__XParenthesizedExpression__Group__1 : rule__XParenthesizedExpression__Group__1__Impl rule__XParenthesizedExpression__Group__2 ;
     public final void rule__XParenthesizedExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15316:1: ( rule__XParenthesizedExpression__Group__1__Impl rule__XParenthesizedExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15317:2: rule__XParenthesizedExpression__Group__1__Impl rule__XParenthesizedExpression__Group__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15222:1: ( rule__XParenthesizedExpression__Group__1__Impl rule__XParenthesizedExpression__Group__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15223:2: rule__XParenthesizedExpression__Group__1__Impl rule__XParenthesizedExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XParenthesizedExpression__Group__1__Impl_in_rule__XParenthesizedExpression__Group__131182);
+            pushFollow(FOLLOW_rule__XParenthesizedExpression__Group__1__Impl_in_rule__XParenthesizedExpression__Group__130996);
             rule__XParenthesizedExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XParenthesizedExpression__Group__2_in_rule__XParenthesizedExpression__Group__131185);
+            pushFollow(FOLLOW_rule__XParenthesizedExpression__Group__2_in_rule__XParenthesizedExpression__Group__130999);
             rule__XParenthesizedExpression__Group__2();
 
             state._fsp--;
@@ -44773,22 +44510,22 @@ public final void rule__XParenthesizedExpression__Group__1() throws RecognitionE
 
 
     // $ANTLR start "rule__XParenthesizedExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15324:1: rule__XParenthesizedExpression__Group__1__Impl : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15230:1: rule__XParenthesizedExpression__Group__1__Impl : ( ruleXExpression ) ;
     public final void rule__XParenthesizedExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15328:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15329:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15234:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15235:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15329:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15330:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15235:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15236:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXParenthesizedExpressionAccess().getXExpressionParserRuleCall_1()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XParenthesizedExpression__Group__1__Impl31212);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XParenthesizedExpression__Group__1__Impl31026);
             ruleXExpression();
 
             state._fsp--;
@@ -44818,16 +44555,16 @@ public final void rule__XParenthesizedExpression__Group__1__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XParenthesizedExpression__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15341:1: rule__XParenthesizedExpression__Group__2 : rule__XParenthesizedExpression__Group__2__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15247:1: rule__XParenthesizedExpression__Group__2 : rule__XParenthesizedExpression__Group__2__Impl ;
     public final void rule__XParenthesizedExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15345:1: ( rule__XParenthesizedExpression__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15346:2: rule__XParenthesizedExpression__Group__2__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15251:1: ( rule__XParenthesizedExpression__Group__2__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15252:2: rule__XParenthesizedExpression__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__XParenthesizedExpression__Group__2__Impl_in_rule__XParenthesizedExpression__Group__231241);
+            pushFollow(FOLLOW_rule__XParenthesizedExpression__Group__2__Impl_in_rule__XParenthesizedExpression__Group__231055);
             rule__XParenthesizedExpression__Group__2__Impl();
 
             state._fsp--;
@@ -44851,22 +44588,22 @@ public final void rule__XParenthesizedExpression__Group__2() throws RecognitionE
 
 
     // $ANTLR start "rule__XParenthesizedExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15352:1: rule__XParenthesizedExpression__Group__2__Impl : ( ')' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15258:1: rule__XParenthesizedExpression__Group__2__Impl : ( ')' ) ;
     public final void rule__XParenthesizedExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15356:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15357:1: ( ')' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15262:1: ( ( ')' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15263:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15357:1: ( ')' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15358:1: ')'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15263:1: ( ')' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15264:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXParenthesizedExpressionAccess().getRightParenthesisKeyword_2()); 
             }
-            match(input,73,FOLLOW_73_in_rule__XParenthesizedExpression__Group__2__Impl31269); if (state.failed) return ;
+            match(input,73,FOLLOW_73_in_rule__XParenthesizedExpression__Group__2__Impl31083); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXParenthesizedExpressionAccess().getRightParenthesisKeyword_2()); 
             }
@@ -44892,21 +44629,21 @@ public final void rule__XParenthesizedExpression__Group__2__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XIfExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15377:1: rule__XIfExpression__Group__0 : rule__XIfExpression__Group__0__Impl rule__XIfExpression__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15283:1: rule__XIfExpression__Group__0 : rule__XIfExpression__Group__0__Impl rule__XIfExpression__Group__1 ;
     public final void rule__XIfExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15381:1: ( rule__XIfExpression__Group__0__Impl rule__XIfExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15382:2: rule__XIfExpression__Group__0__Impl rule__XIfExpression__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15287:1: ( rule__XIfExpression__Group__0__Impl rule__XIfExpression__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15288:2: rule__XIfExpression__Group__0__Impl rule__XIfExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XIfExpression__Group__0__Impl_in_rule__XIfExpression__Group__031306);
+            pushFollow(FOLLOW_rule__XIfExpression__Group__0__Impl_in_rule__XIfExpression__Group__031120);
             rule__XIfExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIfExpression__Group__1_in_rule__XIfExpression__Group__031309);
+            pushFollow(FOLLOW_rule__XIfExpression__Group__1_in_rule__XIfExpression__Group__031123);
             rule__XIfExpression__Group__1();
 
             state._fsp--;
@@ -44930,23 +44667,23 @@ public final void rule__XIfExpression__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XIfExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15389:1: rule__XIfExpression__Group__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15295:1: rule__XIfExpression__Group__0__Impl : ( () ) ;
     public final void rule__XIfExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15393:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15394:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15299:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15300:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15394:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15395:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15300:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15301:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getXIfExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15396:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15398:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15302:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15304:1: 
             {
             }
 
@@ -44971,21 +44708,21 @@ public final void rule__XIfExpression__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XIfExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15408:1: rule__XIfExpression__Group__1 : rule__XIfExpression__Group__1__Impl rule__XIfExpression__Group__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15314:1: rule__XIfExpression__Group__1 : rule__XIfExpression__Group__1__Impl rule__XIfExpression__Group__2 ;
     public final void rule__XIfExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15412:1: ( rule__XIfExpression__Group__1__Impl rule__XIfExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15413:2: rule__XIfExpression__Group__1__Impl rule__XIfExpression__Group__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15318:1: ( rule__XIfExpression__Group__1__Impl rule__XIfExpression__Group__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15319:2: rule__XIfExpression__Group__1__Impl rule__XIfExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XIfExpression__Group__1__Impl_in_rule__XIfExpression__Group__131367);
+            pushFollow(FOLLOW_rule__XIfExpression__Group__1__Impl_in_rule__XIfExpression__Group__131181);
             rule__XIfExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIfExpression__Group__2_in_rule__XIfExpression__Group__131370);
+            pushFollow(FOLLOW_rule__XIfExpression__Group__2_in_rule__XIfExpression__Group__131184);
             rule__XIfExpression__Group__2();
 
             state._fsp--;
@@ -45009,22 +44746,22 @@ public final void rule__XIfExpression__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XIfExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15420:1: rule__XIfExpression__Group__1__Impl : ( 'if' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15326:1: rule__XIfExpression__Group__1__Impl : ( 'if' ) ;
     public final void rule__XIfExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15424:1: ( ( 'if' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15425:1: ( 'if' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15330:1: ( ( 'if' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15331:1: ( 'if' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15425:1: ( 'if' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15426:1: 'if'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15331:1: ( 'if' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15332:1: 'if'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getIfKeyword_1()); 
             }
-            match(input,84,FOLLOW_84_in_rule__XIfExpression__Group__1__Impl31398); if (state.failed) return ;
+            match(input,84,FOLLOW_84_in_rule__XIfExpression__Group__1__Impl31212); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXIfExpressionAccess().getIfKeyword_1()); 
             }
@@ -45050,21 +44787,21 @@ public final void rule__XIfExpression__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XIfExpression__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15439:1: rule__XIfExpression__Group__2 : rule__XIfExpression__Group__2__Impl rule__XIfExpression__Group__3 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15345:1: rule__XIfExpression__Group__2 : rule__XIfExpression__Group__2__Impl rule__XIfExpression__Group__3 ;
     public final void rule__XIfExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15443:1: ( rule__XIfExpression__Group__2__Impl rule__XIfExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15444:2: rule__XIfExpression__Group__2__Impl rule__XIfExpression__Group__3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15349:1: ( rule__XIfExpression__Group__2__Impl rule__XIfExpression__Group__3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15350:2: rule__XIfExpression__Group__2__Impl rule__XIfExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__XIfExpression__Group__2__Impl_in_rule__XIfExpression__Group__231429);
+            pushFollow(FOLLOW_rule__XIfExpression__Group__2__Impl_in_rule__XIfExpression__Group__231243);
             rule__XIfExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIfExpression__Group__3_in_rule__XIfExpression__Group__231432);
+            pushFollow(FOLLOW_rule__XIfExpression__Group__3_in_rule__XIfExpression__Group__231246);
             rule__XIfExpression__Group__3();
 
             state._fsp--;
@@ -45088,22 +44825,22 @@ public final void rule__XIfExpression__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XIfExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15451:1: rule__XIfExpression__Group__2__Impl : ( '(' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15357:1: rule__XIfExpression__Group__2__Impl : ( '(' ) ;
     public final void rule__XIfExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15455:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15456:1: ( '(' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15361:1: ( ( '(' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15362:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15456:1: ( '(' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15457:1: '('
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15362:1: ( '(' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15363:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getLeftParenthesisKeyword_2()); 
             }
-            match(input,72,FOLLOW_72_in_rule__XIfExpression__Group__2__Impl31460); if (state.failed) return ;
+            match(input,72,FOLLOW_72_in_rule__XIfExpression__Group__2__Impl31274); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXIfExpressionAccess().getLeftParenthesisKeyword_2()); 
             }
@@ -45129,21 +44866,21 @@ public final void rule__XIfExpression__Group__2__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XIfExpression__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15470:1: rule__XIfExpression__Group__3 : rule__XIfExpression__Group__3__Impl rule__XIfExpression__Group__4 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15376:1: rule__XIfExpression__Group__3 : rule__XIfExpression__Group__3__Impl rule__XIfExpression__Group__4 ;
     public final void rule__XIfExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15474:1: ( rule__XIfExpression__Group__3__Impl rule__XIfExpression__Group__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15475:2: rule__XIfExpression__Group__3__Impl rule__XIfExpression__Group__4
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15380:1: ( rule__XIfExpression__Group__3__Impl rule__XIfExpression__Group__4 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15381:2: rule__XIfExpression__Group__3__Impl rule__XIfExpression__Group__4
             {
-            pushFollow(FOLLOW_rule__XIfExpression__Group__3__Impl_in_rule__XIfExpression__Group__331491);
+            pushFollow(FOLLOW_rule__XIfExpression__Group__3__Impl_in_rule__XIfExpression__Group__331305);
             rule__XIfExpression__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIfExpression__Group__4_in_rule__XIfExpression__Group__331494);
+            pushFollow(FOLLOW_rule__XIfExpression__Group__4_in_rule__XIfExpression__Group__331308);
             rule__XIfExpression__Group__4();
 
             state._fsp--;
@@ -45167,25 +44904,25 @@ public final void rule__XIfExpression__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XIfExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15482:1: rule__XIfExpression__Group__3__Impl : ( ( rule__XIfExpression__IfAssignment_3 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15388:1: rule__XIfExpression__Group__3__Impl : ( ( rule__XIfExpression__IfAssignment_3 ) ) ;
     public final void rule__XIfExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15486:1: ( ( ( rule__XIfExpression__IfAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15487:1: ( ( rule__XIfExpression__IfAssignment_3 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15392:1: ( ( ( rule__XIfExpression__IfAssignment_3 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15393:1: ( ( rule__XIfExpression__IfAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15487:1: ( ( rule__XIfExpression__IfAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15488:1: ( rule__XIfExpression__IfAssignment_3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15393:1: ( ( rule__XIfExpression__IfAssignment_3 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15394:1: ( rule__XIfExpression__IfAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getIfAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15489:1: ( rule__XIfExpression__IfAssignment_3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15489:2: rule__XIfExpression__IfAssignment_3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15395:1: ( rule__XIfExpression__IfAssignment_3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15395:2: rule__XIfExpression__IfAssignment_3
             {
-            pushFollow(FOLLOW_rule__XIfExpression__IfAssignment_3_in_rule__XIfExpression__Group__3__Impl31521);
+            pushFollow(FOLLOW_rule__XIfExpression__IfAssignment_3_in_rule__XIfExpression__Group__3__Impl31335);
             rule__XIfExpression__IfAssignment_3();
 
             state._fsp--;
@@ -45218,21 +44955,21 @@ public final void rule__XIfExpression__Group__3__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XIfExpression__Group__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15499:1: rule__XIfExpression__Group__4 : rule__XIfExpression__Group__4__Impl rule__XIfExpression__Group__5 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15405:1: rule__XIfExpression__Group__4 : rule__XIfExpression__Group__4__Impl rule__XIfExpression__Group__5 ;
     public final void rule__XIfExpression__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15503:1: ( rule__XIfExpression__Group__4__Impl rule__XIfExpression__Group__5 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15504:2: rule__XIfExpression__Group__4__Impl rule__XIfExpression__Group__5
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15409:1: ( rule__XIfExpression__Group__4__Impl rule__XIfExpression__Group__5 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15410:2: rule__XIfExpression__Group__4__Impl rule__XIfExpression__Group__5
             {
-            pushFollow(FOLLOW_rule__XIfExpression__Group__4__Impl_in_rule__XIfExpression__Group__431551);
+            pushFollow(FOLLOW_rule__XIfExpression__Group__4__Impl_in_rule__XIfExpression__Group__431365);
             rule__XIfExpression__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIfExpression__Group__5_in_rule__XIfExpression__Group__431554);
+            pushFollow(FOLLOW_rule__XIfExpression__Group__5_in_rule__XIfExpression__Group__431368);
             rule__XIfExpression__Group__5();
 
             state._fsp--;
@@ -45256,22 +44993,22 @@ public final void rule__XIfExpression__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__XIfExpression__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15511:1: rule__XIfExpression__Group__4__Impl : ( ')' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15417:1: rule__XIfExpression__Group__4__Impl : ( ')' ) ;
     public final void rule__XIfExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15515:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15516:1: ( ')' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15421:1: ( ( ')' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15422:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15516:1: ( ')' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15517:1: ')'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15422:1: ( ')' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15423:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getRightParenthesisKeyword_4()); 
             }
-            match(input,73,FOLLOW_73_in_rule__XIfExpression__Group__4__Impl31582); if (state.failed) return ;
+            match(input,73,FOLLOW_73_in_rule__XIfExpression__Group__4__Impl31396); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXIfExpressionAccess().getRightParenthesisKeyword_4()); 
             }
@@ -45297,21 +45034,21 @@ public final void rule__XIfExpression__Group__4__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XIfExpression__Group__5"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15530:1: rule__XIfExpression__Group__5 : rule__XIfExpression__Group__5__Impl rule__XIfExpression__Group__6 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15436:1: rule__XIfExpression__Group__5 : rule__XIfExpression__Group__5__Impl rule__XIfExpression__Group__6 ;
     public final void rule__XIfExpression__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15534:1: ( rule__XIfExpression__Group__5__Impl rule__XIfExpression__Group__6 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15535:2: rule__XIfExpression__Group__5__Impl rule__XIfExpression__Group__6
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15440:1: ( rule__XIfExpression__Group__5__Impl rule__XIfExpression__Group__6 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15441:2: rule__XIfExpression__Group__5__Impl rule__XIfExpression__Group__6
             {
-            pushFollow(FOLLOW_rule__XIfExpression__Group__5__Impl_in_rule__XIfExpression__Group__531613);
+            pushFollow(FOLLOW_rule__XIfExpression__Group__5__Impl_in_rule__XIfExpression__Group__531427);
             rule__XIfExpression__Group__5__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIfExpression__Group__6_in_rule__XIfExpression__Group__531616);
+            pushFollow(FOLLOW_rule__XIfExpression__Group__6_in_rule__XIfExpression__Group__531430);
             rule__XIfExpression__Group__6();
 
             state._fsp--;
@@ -45335,25 +45072,25 @@ public final void rule__XIfExpression__Group__5() throws RecognitionException {
 
 
     // $ANTLR start "rule__XIfExpression__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15542:1: rule__XIfExpression__Group__5__Impl : ( ( rule__XIfExpression__ThenAssignment_5 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15448:1: rule__XIfExpression__Group__5__Impl : ( ( rule__XIfExpression__ThenAssignment_5 ) ) ;
     public final void rule__XIfExpression__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15546:1: ( ( ( rule__XIfExpression__ThenAssignment_5 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15547:1: ( ( rule__XIfExpression__ThenAssignment_5 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15452:1: ( ( ( rule__XIfExpression__ThenAssignment_5 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15453:1: ( ( rule__XIfExpression__ThenAssignment_5 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15547:1: ( ( rule__XIfExpression__ThenAssignment_5 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15548:1: ( rule__XIfExpression__ThenAssignment_5 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15453:1: ( ( rule__XIfExpression__ThenAssignment_5 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15454:1: ( rule__XIfExpression__ThenAssignment_5 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getThenAssignment_5()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15549:1: ( rule__XIfExpression__ThenAssignment_5 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15549:2: rule__XIfExpression__ThenAssignment_5
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15455:1: ( rule__XIfExpression__ThenAssignment_5 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15455:2: rule__XIfExpression__ThenAssignment_5
             {
-            pushFollow(FOLLOW_rule__XIfExpression__ThenAssignment_5_in_rule__XIfExpression__Group__5__Impl31643);
+            pushFollow(FOLLOW_rule__XIfExpression__ThenAssignment_5_in_rule__XIfExpression__Group__5__Impl31457);
             rule__XIfExpression__ThenAssignment_5();
 
             state._fsp--;
@@ -45386,16 +45123,16 @@ public final void rule__XIfExpression__Group__5__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XIfExpression__Group__6"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15559:1: rule__XIfExpression__Group__6 : rule__XIfExpression__Group__6__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15465:1: rule__XIfExpression__Group__6 : rule__XIfExpression__Group__6__Impl ;
     public final void rule__XIfExpression__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15563:1: ( rule__XIfExpression__Group__6__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15564:2: rule__XIfExpression__Group__6__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15469:1: ( rule__XIfExpression__Group__6__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15470:2: rule__XIfExpression__Group__6__Impl
             {
-            pushFollow(FOLLOW_rule__XIfExpression__Group__6__Impl_in_rule__XIfExpression__Group__631673);
+            pushFollow(FOLLOW_rule__XIfExpression__Group__6__Impl_in_rule__XIfExpression__Group__631487);
             rule__XIfExpression__Group__6__Impl();
 
             state._fsp--;
@@ -45419,37 +45156,37 @@ public final void rule__XIfExpression__Group__6() throws RecognitionException {
 
 
     // $ANTLR start "rule__XIfExpression__Group__6__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15570:1: rule__XIfExpression__Group__6__Impl : ( ( rule__XIfExpression__Group_6__0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15476:1: rule__XIfExpression__Group__6__Impl : ( ( rule__XIfExpression__Group_6__0 )? ) ;
     public final void rule__XIfExpression__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15574:1: ( ( ( rule__XIfExpression__Group_6__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15575:1: ( ( rule__XIfExpression__Group_6__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15480:1: ( ( ( rule__XIfExpression__Group_6__0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15481:1: ( ( rule__XIfExpression__Group_6__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15575:1: ( ( rule__XIfExpression__Group_6__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15576:1: ( rule__XIfExpression__Group_6__0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15481:1: ( ( rule__XIfExpression__Group_6__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15482:1: ( rule__XIfExpression__Group_6__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getGroup_6()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15577:1: ( rule__XIfExpression__Group_6__0 )?
-            int alt123=2;
-            int LA123_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15483:1: ( rule__XIfExpression__Group_6__0 )?
+            int alt122=2;
+            int LA122_0 = input.LA(1);
 
-            if ( (LA123_0==85) ) {
-                int LA123_1 = input.LA(2);
+            if ( (LA122_0==85) ) {
+                int LA122_1 = input.LA(2);
 
-                if ( (synpred189_InternalCheck()) ) {
-                    alt123=1;
+                if ( (synpred188_InternalCheck()) ) {
+                    alt122=1;
                 }
             }
-            switch (alt123) {
+            switch (alt122) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15577:2: rule__XIfExpression__Group_6__0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15483:2: rule__XIfExpression__Group_6__0
                     {
-                    pushFollow(FOLLOW_rule__XIfExpression__Group_6__0_in_rule__XIfExpression__Group__6__Impl31700);
+                    pushFollow(FOLLOW_rule__XIfExpression__Group_6__0_in_rule__XIfExpression__Group__6__Impl31514);
                     rule__XIfExpression__Group_6__0();
 
                     state._fsp--;
@@ -45485,21 +45222,21 @@ public final void rule__XIfExpression__Group__6__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XIfExpression__Group_6__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15601:1: rule__XIfExpression__Group_6__0 : rule__XIfExpression__Group_6__0__Impl rule__XIfExpression__Group_6__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15507:1: rule__XIfExpression__Group_6__0 : rule__XIfExpression__Group_6__0__Impl rule__XIfExpression__Group_6__1 ;
     public final void rule__XIfExpression__Group_6__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15605:1: ( rule__XIfExpression__Group_6__0__Impl rule__XIfExpression__Group_6__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15606:2: rule__XIfExpression__Group_6__0__Impl rule__XIfExpression__Group_6__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15511:1: ( rule__XIfExpression__Group_6__0__Impl rule__XIfExpression__Group_6__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15512:2: rule__XIfExpression__Group_6__0__Impl rule__XIfExpression__Group_6__1
             {
-            pushFollow(FOLLOW_rule__XIfExpression__Group_6__0__Impl_in_rule__XIfExpression__Group_6__031745);
+            pushFollow(FOLLOW_rule__XIfExpression__Group_6__0__Impl_in_rule__XIfExpression__Group_6__031559);
             rule__XIfExpression__Group_6__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIfExpression__Group_6__1_in_rule__XIfExpression__Group_6__031748);
+            pushFollow(FOLLOW_rule__XIfExpression__Group_6__1_in_rule__XIfExpression__Group_6__031562);
             rule__XIfExpression__Group_6__1();
 
             state._fsp--;
@@ -45523,25 +45260,25 @@ public final void rule__XIfExpression__Group_6__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XIfExpression__Group_6__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15613:1: rule__XIfExpression__Group_6__0__Impl : ( ( 'else' ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15519:1: rule__XIfExpression__Group_6__0__Impl : ( ( 'else' ) ) ;
     public final void rule__XIfExpression__Group_6__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15617:1: ( ( ( 'else' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15618:1: ( ( 'else' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15523:1: ( ( ( 'else' ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15524:1: ( ( 'else' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15618:1: ( ( 'else' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15619:1: ( 'else' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15524:1: ( ( 'else' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15525:1: ( 'else' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getElseKeyword_6_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15620:1: ( 'else' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15621:2: 'else'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15526:1: ( 'else' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15527:2: 'else'
             {
-            match(input,85,FOLLOW_85_in_rule__XIfExpression__Group_6__0__Impl31777); if (state.failed) return ;
+            match(input,85,FOLLOW_85_in_rule__XIfExpression__Group_6__0__Impl31591); if (state.failed) return ;
 
             }
 
@@ -45570,16 +45307,16 @@ public final void rule__XIfExpression__Group_6__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XIfExpression__Group_6__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15632:1: rule__XIfExpression__Group_6__1 : rule__XIfExpression__Group_6__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15538:1: rule__XIfExpression__Group_6__1 : rule__XIfExpression__Group_6__1__Impl ;
     public final void rule__XIfExpression__Group_6__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15636:1: ( rule__XIfExpression__Group_6__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15637:2: rule__XIfExpression__Group_6__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15542:1: ( rule__XIfExpression__Group_6__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15543:2: rule__XIfExpression__Group_6__1__Impl
             {
-            pushFollow(FOLLOW_rule__XIfExpression__Group_6__1__Impl_in_rule__XIfExpression__Group_6__131809);
+            pushFollow(FOLLOW_rule__XIfExpression__Group_6__1__Impl_in_rule__XIfExpression__Group_6__131623);
             rule__XIfExpression__Group_6__1__Impl();
 
             state._fsp--;
@@ -45603,25 +45340,25 @@ public final void rule__XIfExpression__Group_6__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XIfExpression__Group_6__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15643:1: rule__XIfExpression__Group_6__1__Impl : ( ( rule__XIfExpression__ElseAssignment_6_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15549:1: rule__XIfExpression__Group_6__1__Impl : ( ( rule__XIfExpression__ElseAssignment_6_1 ) ) ;
     public final void rule__XIfExpression__Group_6__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15647:1: ( ( ( rule__XIfExpression__ElseAssignment_6_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15648:1: ( ( rule__XIfExpression__ElseAssignment_6_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15553:1: ( ( ( rule__XIfExpression__ElseAssignment_6_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15554:1: ( ( rule__XIfExpression__ElseAssignment_6_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15648:1: ( ( rule__XIfExpression__ElseAssignment_6_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15649:1: ( rule__XIfExpression__ElseAssignment_6_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15554:1: ( ( rule__XIfExpression__ElseAssignment_6_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15555:1: ( rule__XIfExpression__ElseAssignment_6_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getElseAssignment_6_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15650:1: ( rule__XIfExpression__ElseAssignment_6_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15650:2: rule__XIfExpression__ElseAssignment_6_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15556:1: ( rule__XIfExpression__ElseAssignment_6_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15556:2: rule__XIfExpression__ElseAssignment_6_1
             {
-            pushFollow(FOLLOW_rule__XIfExpression__ElseAssignment_6_1_in_rule__XIfExpression__Group_6__1__Impl31836);
+            pushFollow(FOLLOW_rule__XIfExpression__ElseAssignment_6_1_in_rule__XIfExpression__Group_6__1__Impl31650);
             rule__XIfExpression__ElseAssignment_6_1();
 
             state._fsp--;
@@ -45654,21 +45391,21 @@ public final void rule__XIfExpression__Group_6__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15664:1: rule__XSwitchExpression__Group__0 : rule__XSwitchExpression__Group__0__Impl rule__XSwitchExpression__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15570:1: rule__XSwitchExpression__Group__0 : rule__XSwitchExpression__Group__0__Impl rule__XSwitchExpression__Group__1 ;
     public final void rule__XSwitchExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15668:1: ( rule__XSwitchExpression__Group__0__Impl rule__XSwitchExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15669:2: rule__XSwitchExpression__Group__0__Impl rule__XSwitchExpression__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15574:1: ( rule__XSwitchExpression__Group__0__Impl rule__XSwitchExpression__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15575:2: rule__XSwitchExpression__Group__0__Impl rule__XSwitchExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__0__Impl_in_rule__XSwitchExpression__Group__031870);
+            pushFollow(FOLLOW_rule__XSwitchExpression__Group__0__Impl_in_rule__XSwitchExpression__Group__031684);
             rule__XSwitchExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__1_in_rule__XSwitchExpression__Group__031873);
+            pushFollow(FOLLOW_rule__XSwitchExpression__Group__1_in_rule__XSwitchExpression__Group__031687);
             rule__XSwitchExpression__Group__1();
 
             state._fsp--;
@@ -45692,23 +45429,23 @@ public final void rule__XSwitchExpression__Group__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15676:1: rule__XSwitchExpression__Group__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15582:1: rule__XSwitchExpression__Group__0__Impl : ( () ) ;
     public final void rule__XSwitchExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15680:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15681:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15586:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15587:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15681:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15682:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15587:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15588:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getXSwitchExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15683:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15685:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15589:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15591:1: 
             {
             }
 
@@ -45733,21 +45470,21 @@ public final void rule__XSwitchExpression__Group__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15695:1: rule__XSwitchExpression__Group__1 : rule__XSwitchExpression__Group__1__Impl rule__XSwitchExpression__Group__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15601:1: rule__XSwitchExpression__Group__1 : rule__XSwitchExpression__Group__1__Impl rule__XSwitchExpression__Group__2 ;
     public final void rule__XSwitchExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15699:1: ( rule__XSwitchExpression__Group__1__Impl rule__XSwitchExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15700:2: rule__XSwitchExpression__Group__1__Impl rule__XSwitchExpression__Group__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15605:1: ( rule__XSwitchExpression__Group__1__Impl rule__XSwitchExpression__Group__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15606:2: rule__XSwitchExpression__Group__1__Impl rule__XSwitchExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__1__Impl_in_rule__XSwitchExpression__Group__131931);
+            pushFollow(FOLLOW_rule__XSwitchExpression__Group__1__Impl_in_rule__XSwitchExpression__Group__131745);
             rule__XSwitchExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__2_in_rule__XSwitchExpression__Group__131934);
+            pushFollow(FOLLOW_rule__XSwitchExpression__Group__2_in_rule__XSwitchExpression__Group__131748);
             rule__XSwitchExpression__Group__2();
 
             state._fsp--;
@@ -45771,22 +45508,22 @@ public final void rule__XSwitchExpression__Group__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15707:1: rule__XSwitchExpression__Group__1__Impl : ( 'switch' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15613:1: rule__XSwitchExpression__Group__1__Impl : ( 'switch' ) ;
     public final void rule__XSwitchExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15711:1: ( ( 'switch' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15712:1: ( 'switch' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15617:1: ( ( 'switch' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15618:1: ( 'switch' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15712:1: ( 'switch' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15713:1: 'switch'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15618:1: ( 'switch' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15619:1: 'switch'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getSwitchKeyword_1()); 
             }
-            match(input,86,FOLLOW_86_in_rule__XSwitchExpression__Group__1__Impl31962); if (state.failed) return ;
+            match(input,86,FOLLOW_86_in_rule__XSwitchExpression__Group__1__Impl31776); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getSwitchKeyword_1()); 
             }
@@ -45812,21 +45549,21 @@ public final void rule__XSwitchExpression__Group__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15726:1: rule__XSwitchExpression__Group__2 : rule__XSwitchExpression__Group__2__Impl rule__XSwitchExpression__Group__3 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15632:1: rule__XSwitchExpression__Group__2 : rule__XSwitchExpression__Group__2__Impl rule__XSwitchExpression__Group__3 ;
     public final void rule__XSwitchExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15730:1: ( rule__XSwitchExpression__Group__2__Impl rule__XSwitchExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15731:2: rule__XSwitchExpression__Group__2__Impl rule__XSwitchExpression__Group__3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15636:1: ( rule__XSwitchExpression__Group__2__Impl rule__XSwitchExpression__Group__3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15637:2: rule__XSwitchExpression__Group__2__Impl rule__XSwitchExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__2__Impl_in_rule__XSwitchExpression__Group__231993);
+            pushFollow(FOLLOW_rule__XSwitchExpression__Group__2__Impl_in_rule__XSwitchExpression__Group__231807);
             rule__XSwitchExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__3_in_rule__XSwitchExpression__Group__231996);
+            pushFollow(FOLLOW_rule__XSwitchExpression__Group__3_in_rule__XSwitchExpression__Group__231810);
             rule__XSwitchExpression__Group__3();
 
             state._fsp--;
@@ -45850,25 +45587,25 @@ public final void rule__XSwitchExpression__Group__2() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15738:1: rule__XSwitchExpression__Group__2__Impl : ( ( rule__XSwitchExpression__Alternatives_2 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15644:1: rule__XSwitchExpression__Group__2__Impl : ( ( rule__XSwitchExpression__Alternatives_2 ) ) ;
     public final void rule__XSwitchExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15742:1: ( ( ( rule__XSwitchExpression__Alternatives_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15743:1: ( ( rule__XSwitchExpression__Alternatives_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15648:1: ( ( ( rule__XSwitchExpression__Alternatives_2 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15649:1: ( ( rule__XSwitchExpression__Alternatives_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15743:1: ( ( rule__XSwitchExpression__Alternatives_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15744:1: ( rule__XSwitchExpression__Alternatives_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15649:1: ( ( rule__XSwitchExpression__Alternatives_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15650:1: ( rule__XSwitchExpression__Alternatives_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getAlternatives_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15745:1: ( rule__XSwitchExpression__Alternatives_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15745:2: rule__XSwitchExpression__Alternatives_2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15651:1: ( rule__XSwitchExpression__Alternatives_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15651:2: rule__XSwitchExpression__Alternatives_2
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Alternatives_2_in_rule__XSwitchExpression__Group__2__Impl32023);
+            pushFollow(FOLLOW_rule__XSwitchExpression__Alternatives_2_in_rule__XSwitchExpression__Group__2__Impl31837);
             rule__XSwitchExpression__Alternatives_2();
 
             state._fsp--;
@@ -45901,21 +45638,21 @@ public final void rule__XSwitchExpression__Group__2__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15755:1: rule__XSwitchExpression__Group__3 : rule__XSwitchExpression__Group__3__Impl rule__XSwitchExpression__Group__4 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15661:1: rule__XSwitchExpression__Group__3 : rule__XSwitchExpression__Group__3__Impl rule__XSwitchExpression__Group__4 ;
     public final void rule__XSwitchExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15759:1: ( rule__XSwitchExpression__Group__3__Impl rule__XSwitchExpression__Group__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15760:2: rule__XSwitchExpression__Group__3__Impl rule__XSwitchExpression__Group__4
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15665:1: ( rule__XSwitchExpression__Group__3__Impl rule__XSwitchExpression__Group__4 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15666:2: rule__XSwitchExpression__Group__3__Impl rule__XSwitchExpression__Group__4
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__3__Impl_in_rule__XSwitchExpression__Group__332053);
+            pushFollow(FOLLOW_rule__XSwitchExpression__Group__3__Impl_in_rule__XSwitchExpression__Group__331867);
             rule__XSwitchExpression__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__4_in_rule__XSwitchExpression__Group__332056);
+            pushFollow(FOLLOW_rule__XSwitchExpression__Group__4_in_rule__XSwitchExpression__Group__331870);
             rule__XSwitchExpression__Group__4();
 
             state._fsp--;
@@ -45939,22 +45676,22 @@ public final void rule__XSwitchExpression__Group__3() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15767:1: rule__XSwitchExpression__Group__3__Impl : ( '{' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15673:1: rule__XSwitchExpression__Group__3__Impl : ( '{' ) ;
     public final void rule__XSwitchExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15771:1: ( ( '{' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15772:1: ( '{' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15677:1: ( ( '{' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15678:1: ( '{' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15772:1: ( '{' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15773:1: '{'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15678:1: ( '{' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15679:1: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getLeftCurlyBracketKeyword_3()); 
             }
-            match(input,68,FOLLOW_68_in_rule__XSwitchExpression__Group__3__Impl32084); if (state.failed) return ;
+            match(input,68,FOLLOW_68_in_rule__XSwitchExpression__Group__3__Impl31898); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getLeftCurlyBracketKeyword_3()); 
             }
@@ -45980,21 +45717,21 @@ public final void rule__XSwitchExpression__Group__3__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15786:1: rule__XSwitchExpression__Group__4 : rule__XSwitchExpression__Group__4__Impl rule__XSwitchExpression__Group__5 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15692:1: rule__XSwitchExpression__Group__4 : rule__XSwitchExpression__Group__4__Impl rule__XSwitchExpression__Group__5 ;
     public final void rule__XSwitchExpression__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15790:1: ( rule__XSwitchExpression__Group__4__Impl rule__XSwitchExpression__Group__5 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15791:2: rule__XSwitchExpression__Group__4__Impl rule__XSwitchExpression__Group__5
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15696:1: ( rule__XSwitchExpression__Group__4__Impl rule__XSwitchExpression__Group__5 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15697:2: rule__XSwitchExpression__Group__4__Impl rule__XSwitchExpression__Group__5
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__4__Impl_in_rule__XSwitchExpression__Group__432115);
+            pushFollow(FOLLOW_rule__XSwitchExpression__Group__4__Impl_in_rule__XSwitchExpression__Group__431929);
             rule__XSwitchExpression__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__5_in_rule__XSwitchExpression__Group__432118);
+            pushFollow(FOLLOW_rule__XSwitchExpression__Group__5_in_rule__XSwitchExpression__Group__431932);
             rule__XSwitchExpression__Group__5();
 
             state._fsp--;
@@ -46018,37 +45755,37 @@ public final void rule__XSwitchExpression__Group__4() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15798:1: rule__XSwitchExpression__Group__4__Impl : ( ( rule__XSwitchExpression__CasesAssignment_4 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15704:1: rule__XSwitchExpression__Group__4__Impl : ( ( rule__XSwitchExpression__CasesAssignment_4 )* ) ;
     public final void rule__XSwitchExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15802:1: ( ( ( rule__XSwitchExpression__CasesAssignment_4 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15803:1: ( ( rule__XSwitchExpression__CasesAssignment_4 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15708:1: ( ( ( rule__XSwitchExpression__CasesAssignment_4 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15709:1: ( ( rule__XSwitchExpression__CasesAssignment_4 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15803:1: ( ( rule__XSwitchExpression__CasesAssignment_4 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15804:1: ( rule__XSwitchExpression__CasesAssignment_4 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15709:1: ( ( rule__XSwitchExpression__CasesAssignment_4 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15710:1: ( rule__XSwitchExpression__CasesAssignment_4 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getCasesAssignment_4()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15805:1: ( rule__XSwitchExpression__CasesAssignment_4 )*
-            loop124:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15711:1: ( rule__XSwitchExpression__CasesAssignment_4 )*
+            loop123:
             do {
-                int alt124=2;
-                int LA124_0 = input.LA(1);
+                int alt123=2;
+                int LA123_0 = input.LA(1);
 
-                if ( (LA124_0==RULE_ID||LA124_0==51||LA124_0==72||LA124_0==74||LA124_0==87||LA124_0==89) ) {
-                    alt124=1;
+                if ( (LA123_0==RULE_ID||LA123_0==51||LA123_0==72||LA123_0==74||LA123_0==87||LA123_0==89) ) {
+                    alt123=1;
                 }
 
 
-                switch (alt124) {
+                switch (alt123) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15805:2: rule__XSwitchExpression__CasesAssignment_4
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15711:2: rule__XSwitchExpression__CasesAssignment_4
             	    {
-            	    pushFollow(FOLLOW_rule__XSwitchExpression__CasesAssignment_4_in_rule__XSwitchExpression__Group__4__Impl32145);
+            	    pushFollow(FOLLOW_rule__XSwitchExpression__CasesAssignment_4_in_rule__XSwitchExpression__Group__4__Impl31959);
             	    rule__XSwitchExpression__CasesAssignment_4();
 
             	    state._fsp--;
@@ -46058,7 +45795,7 @@ public final void rule__XSwitchExpression__Group__4__Impl() throws RecognitionEx
             	    break;
 
             	default :
-            	    break loop124;
+            	    break loop123;
                 }
             } while (true);
 
@@ -46087,21 +45824,21 @@ public final void rule__XSwitchExpression__Group__4__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__5"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15815:1: rule__XSwitchExpression__Group__5 : rule__XSwitchExpression__Group__5__Impl rule__XSwitchExpression__Group__6 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15721:1: rule__XSwitchExpression__Group__5 : rule__XSwitchExpression__Group__5__Impl rule__XSwitchExpression__Group__6 ;
     public final void rule__XSwitchExpression__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15819:1: ( rule__XSwitchExpression__Group__5__Impl rule__XSwitchExpression__Group__6 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15820:2: rule__XSwitchExpression__Group__5__Impl rule__XSwitchExpression__Group__6
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15725:1: ( rule__XSwitchExpression__Group__5__Impl rule__XSwitchExpression__Group__6 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15726:2: rule__XSwitchExpression__Group__5__Impl rule__XSwitchExpression__Group__6
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__5__Impl_in_rule__XSwitchExpression__Group__532176);
+            pushFollow(FOLLOW_rule__XSwitchExpression__Group__5__Impl_in_rule__XSwitchExpression__Group__531990);
             rule__XSwitchExpression__Group__5__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__6_in_rule__XSwitchExpression__Group__532179);
+            pushFollow(FOLLOW_rule__XSwitchExpression__Group__6_in_rule__XSwitchExpression__Group__531993);
             rule__XSwitchExpression__Group__6();
 
             state._fsp--;
@@ -46125,33 +45862,33 @@ public final void rule__XSwitchExpression__Group__5() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15827:1: rule__XSwitchExpression__Group__5__Impl : ( ( rule__XSwitchExpression__Group_5__0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15733:1: rule__XSwitchExpression__Group__5__Impl : ( ( rule__XSwitchExpression__Group_5__0 )? ) ;
     public final void rule__XSwitchExpression__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15831:1: ( ( ( rule__XSwitchExpression__Group_5__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15832:1: ( ( rule__XSwitchExpression__Group_5__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15737:1: ( ( ( rule__XSwitchExpression__Group_5__0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15738:1: ( ( rule__XSwitchExpression__Group_5__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15832:1: ( ( rule__XSwitchExpression__Group_5__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15833:1: ( rule__XSwitchExpression__Group_5__0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15738:1: ( ( rule__XSwitchExpression__Group_5__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15739:1: ( rule__XSwitchExpression__Group_5__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getGroup_5()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15834:1: ( rule__XSwitchExpression__Group_5__0 )?
-            int alt125=2;
-            int LA125_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15740:1: ( rule__XSwitchExpression__Group_5__0 )?
+            int alt124=2;
+            int LA124_0 = input.LA(1);
 
-            if ( (LA125_0==88) ) {
-                alt125=1;
+            if ( (LA124_0==88) ) {
+                alt124=1;
             }
-            switch (alt125) {
+            switch (alt124) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15834:2: rule__XSwitchExpression__Group_5__0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15740:2: rule__XSwitchExpression__Group_5__0
                     {
-                    pushFollow(FOLLOW_rule__XSwitchExpression__Group_5__0_in_rule__XSwitchExpression__Group__5__Impl32206);
+                    pushFollow(FOLLOW_rule__XSwitchExpression__Group_5__0_in_rule__XSwitchExpression__Group__5__Impl32020);
                     rule__XSwitchExpression__Group_5__0();
 
                     state._fsp--;
@@ -46187,16 +45924,16 @@ public final void rule__XSwitchExpression__Group__5__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__6"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15844:1: rule__XSwitchExpression__Group__6 : rule__XSwitchExpression__Group__6__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15750:1: rule__XSwitchExpression__Group__6 : rule__XSwitchExpression__Group__6__Impl ;
     public final void rule__XSwitchExpression__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15848:1: ( rule__XSwitchExpression__Group__6__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15849:2: rule__XSwitchExpression__Group__6__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15754:1: ( rule__XSwitchExpression__Group__6__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15755:2: rule__XSwitchExpression__Group__6__Impl
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__6__Impl_in_rule__XSwitchExpression__Group__632237);
+            pushFollow(FOLLOW_rule__XSwitchExpression__Group__6__Impl_in_rule__XSwitchExpression__Group__632051);
             rule__XSwitchExpression__Group__6__Impl();
 
             state._fsp--;
@@ -46220,22 +45957,22 @@ public final void rule__XSwitchExpression__Group__6() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__6__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15855:1: rule__XSwitchExpression__Group__6__Impl : ( '}' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15761:1: rule__XSwitchExpression__Group__6__Impl : ( '}' ) ;
     public final void rule__XSwitchExpression__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15859:1: ( ( '}' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15860:1: ( '}' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15765:1: ( ( '}' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15766:1: ( '}' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15860:1: ( '}' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15861:1: '}'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15766:1: ( '}' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15767:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getRightCurlyBracketKeyword_6()); 
             }
-            match(input,69,FOLLOW_69_in_rule__XSwitchExpression__Group__6__Impl32265); if (state.failed) return ;
+            match(input,69,FOLLOW_69_in_rule__XSwitchExpression__Group__6__Impl32079); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getRightCurlyBracketKeyword_6()); 
             }
@@ -46261,21 +45998,21 @@ public final void rule__XSwitchExpression__Group__6__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15888:1: rule__XSwitchExpression__Group_2_0__0 : rule__XSwitchExpression__Group_2_0__0__Impl rule__XSwitchExpression__Group_2_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15794:1: rule__XSwitchExpression__Group_2_0__0 : rule__XSwitchExpression__Group_2_0__0__Impl rule__XSwitchExpression__Group_2_0__1 ;
     public final void rule__XSwitchExpression__Group_2_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15892:1: ( rule__XSwitchExpression__Group_2_0__0__Impl rule__XSwitchExpression__Group_2_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15893:2: rule__XSwitchExpression__Group_2_0__0__Impl rule__XSwitchExpression__Group_2_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15798:1: ( rule__XSwitchExpression__Group_2_0__0__Impl rule__XSwitchExpression__Group_2_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15799:2: rule__XSwitchExpression__Group_2_0__0__Impl rule__XSwitchExpression__Group_2_0__1
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0__0__Impl_in_rule__XSwitchExpression__Group_2_0__032310);
+            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0__0__Impl_in_rule__XSwitchExpression__Group_2_0__032124);
             rule__XSwitchExpression__Group_2_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0__1_in_rule__XSwitchExpression__Group_2_0__032313);
+            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0__1_in_rule__XSwitchExpression__Group_2_0__032127);
             rule__XSwitchExpression__Group_2_0__1();
 
             state._fsp--;
@@ -46299,25 +46036,25 @@ public final void rule__XSwitchExpression__Group_2_0__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15900:1: rule__XSwitchExpression__Group_2_0__0__Impl : ( ( rule__XSwitchExpression__Group_2_0_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15806:1: rule__XSwitchExpression__Group_2_0__0__Impl : ( ( rule__XSwitchExpression__Group_2_0_0__0 ) ) ;
     public final void rule__XSwitchExpression__Group_2_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15904:1: ( ( ( rule__XSwitchExpression__Group_2_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15905:1: ( ( rule__XSwitchExpression__Group_2_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15810:1: ( ( ( rule__XSwitchExpression__Group_2_0_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15811:1: ( ( rule__XSwitchExpression__Group_2_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15905:1: ( ( rule__XSwitchExpression__Group_2_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15906:1: ( rule__XSwitchExpression__Group_2_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15811:1: ( ( rule__XSwitchExpression__Group_2_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15812:1: ( rule__XSwitchExpression__Group_2_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getGroup_2_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15907:1: ( rule__XSwitchExpression__Group_2_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15907:2: rule__XSwitchExpression__Group_2_0_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15813:1: ( rule__XSwitchExpression__Group_2_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15813:2: rule__XSwitchExpression__Group_2_0_0__0
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0_0__0_in_rule__XSwitchExpression__Group_2_0__0__Impl32340);
+            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0_0__0_in_rule__XSwitchExpression__Group_2_0__0__Impl32154);
             rule__XSwitchExpression__Group_2_0_0__0();
 
             state._fsp--;
@@ -46350,21 +46087,21 @@ public final void rule__XSwitchExpression__Group_2_0__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15917:1: rule__XSwitchExpression__Group_2_0__1 : rule__XSwitchExpression__Group_2_0__1__Impl rule__XSwitchExpression__Group_2_0__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15823:1: rule__XSwitchExpression__Group_2_0__1 : rule__XSwitchExpression__Group_2_0__1__Impl rule__XSwitchExpression__Group_2_0__2 ;
     public final void rule__XSwitchExpression__Group_2_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15921:1: ( rule__XSwitchExpression__Group_2_0__1__Impl rule__XSwitchExpression__Group_2_0__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15922:2: rule__XSwitchExpression__Group_2_0__1__Impl rule__XSwitchExpression__Group_2_0__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15827:1: ( rule__XSwitchExpression__Group_2_0__1__Impl rule__XSwitchExpression__Group_2_0__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15828:2: rule__XSwitchExpression__Group_2_0__1__Impl rule__XSwitchExpression__Group_2_0__2
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0__1__Impl_in_rule__XSwitchExpression__Group_2_0__132370);
+            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0__1__Impl_in_rule__XSwitchExpression__Group_2_0__132184);
             rule__XSwitchExpression__Group_2_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0__2_in_rule__XSwitchExpression__Group_2_0__132373);
+            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0__2_in_rule__XSwitchExpression__Group_2_0__132187);
             rule__XSwitchExpression__Group_2_0__2();
 
             state._fsp--;
@@ -46388,25 +46125,25 @@ public final void rule__XSwitchExpression__Group_2_0__1() throws RecognitionExce
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15929:1: rule__XSwitchExpression__Group_2_0__1__Impl : ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15835:1: rule__XSwitchExpression__Group_2_0__1__Impl : ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) ) ;
     public final void rule__XSwitchExpression__Group_2_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15933:1: ( ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15934:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15839:1: ( ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15840:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15934:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15935:1: ( rule__XSwitchExpression__SwitchAssignment_2_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15840:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15841:1: ( rule__XSwitchExpression__SwitchAssignment_2_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getSwitchAssignment_2_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15936:1: ( rule__XSwitchExpression__SwitchAssignment_2_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15936:2: rule__XSwitchExpression__SwitchAssignment_2_0_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15842:1: ( rule__XSwitchExpression__SwitchAssignment_2_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15842:2: rule__XSwitchExpression__SwitchAssignment_2_0_1
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__SwitchAssignment_2_0_1_in_rule__XSwitchExpression__Group_2_0__1__Impl32400);
+            pushFollow(FOLLOW_rule__XSwitchExpression__SwitchAssignment_2_0_1_in_rule__XSwitchExpression__Group_2_0__1__Impl32214);
             rule__XSwitchExpression__SwitchAssignment_2_0_1();
 
             state._fsp--;
@@ -46439,16 +46176,16 @@ public final void rule__XSwitchExpression__Group_2_0__1__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15946:1: rule__XSwitchExpression__Group_2_0__2 : rule__XSwitchExpression__Group_2_0__2__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15852:1: rule__XSwitchExpression__Group_2_0__2 : rule__XSwitchExpression__Group_2_0__2__Impl ;
     public final void rule__XSwitchExpression__Group_2_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15950:1: ( rule__XSwitchExpression__Group_2_0__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15951:2: rule__XSwitchExpression__Group_2_0__2__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15856:1: ( rule__XSwitchExpression__Group_2_0__2__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15857:2: rule__XSwitchExpression__Group_2_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0__2__Impl_in_rule__XSwitchExpression__Group_2_0__232430);
+            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0__2__Impl_in_rule__XSwitchExpression__Group_2_0__232244);
             rule__XSwitchExpression__Group_2_0__2__Impl();
 
             state._fsp--;
@@ -46472,22 +46209,22 @@ public final void rule__XSwitchExpression__Group_2_0__2() throws RecognitionExce
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15957:1: rule__XSwitchExpression__Group_2_0__2__Impl : ( ')' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15863:1: rule__XSwitchExpression__Group_2_0__2__Impl : ( ')' ) ;
     public final void rule__XSwitchExpression__Group_2_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15961:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15962:1: ( ')' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15867:1: ( ( ')' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15868:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15962:1: ( ')' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15963:1: ')'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15868:1: ( ')' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15869:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getRightParenthesisKeyword_2_0_2()); 
             }
-            match(input,73,FOLLOW_73_in_rule__XSwitchExpression__Group_2_0__2__Impl32458); if (state.failed) return ;
+            match(input,73,FOLLOW_73_in_rule__XSwitchExpression__Group_2_0__2__Impl32272); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getRightParenthesisKeyword_2_0_2()); 
             }
@@ -46513,16 +46250,16 @@ public final void rule__XSwitchExpression__Group_2_0__2__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15982:1: rule__XSwitchExpression__Group_2_0_0__0 : rule__XSwitchExpression__Group_2_0_0__0__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15888:1: rule__XSwitchExpression__Group_2_0_0__0 : rule__XSwitchExpression__Group_2_0_0__0__Impl ;
     public final void rule__XSwitchExpression__Group_2_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15986:1: ( rule__XSwitchExpression__Group_2_0_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15987:2: rule__XSwitchExpression__Group_2_0_0__0__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15892:1: ( rule__XSwitchExpression__Group_2_0_0__0__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15893:2: rule__XSwitchExpression__Group_2_0_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0_0__0__Impl_in_rule__XSwitchExpression__Group_2_0_0__032495);
+            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0_0__0__Impl_in_rule__XSwitchExpression__Group_2_0_0__032309);
             rule__XSwitchExpression__Group_2_0_0__0__Impl();
 
             state._fsp--;
@@ -46546,25 +46283,25 @@ public final void rule__XSwitchExpression__Group_2_0_0__0() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15993:1: rule__XSwitchExpression__Group_2_0_0__0__Impl : ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15899:1: rule__XSwitchExpression__Group_2_0_0__0__Impl : ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) ) ;
     public final void rule__XSwitchExpression__Group_2_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15997:1: ( ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15998:1: ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15903:1: ( ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15904:1: ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15998:1: ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15999:1: ( rule__XSwitchExpression__Group_2_0_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15904:1: ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15905:1: ( rule__XSwitchExpression__Group_2_0_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getGroup_2_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16000:1: ( rule__XSwitchExpression__Group_2_0_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16000:2: rule__XSwitchExpression__Group_2_0_0_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15906:1: ( rule__XSwitchExpression__Group_2_0_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15906:2: rule__XSwitchExpression__Group_2_0_0_0__0
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__0_in_rule__XSwitchExpression__Group_2_0_0__0__Impl32522);
+            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__0_in_rule__XSwitchExpression__Group_2_0_0__0__Impl32336);
             rule__XSwitchExpression__Group_2_0_0_0__0();
 
             state._fsp--;
@@ -46597,21 +46334,21 @@ public final void rule__XSwitchExpression__Group_2_0_0__0__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16012:1: rule__XSwitchExpression__Group_2_0_0_0__0 : rule__XSwitchExpression__Group_2_0_0_0__0__Impl rule__XSwitchExpression__Group_2_0_0_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15918:1: rule__XSwitchExpression__Group_2_0_0_0__0 : rule__XSwitchExpression__Group_2_0_0_0__0__Impl rule__XSwitchExpression__Group_2_0_0_0__1 ;
     public final void rule__XSwitchExpression__Group_2_0_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16016:1: ( rule__XSwitchExpression__Group_2_0_0_0__0__Impl rule__XSwitchExpression__Group_2_0_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16017:2: rule__XSwitchExpression__Group_2_0_0_0__0__Impl rule__XSwitchExpression__Group_2_0_0_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15922:1: ( rule__XSwitchExpression__Group_2_0_0_0__0__Impl rule__XSwitchExpression__Group_2_0_0_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15923:2: rule__XSwitchExpression__Group_2_0_0_0__0__Impl rule__XSwitchExpression__Group_2_0_0_0__1
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__0__Impl_in_rule__XSwitchExpression__Group_2_0_0_0__032554);
+            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__0__Impl_in_rule__XSwitchExpression__Group_2_0_0_0__032368);
             rule__XSwitchExpression__Group_2_0_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__1_in_rule__XSwitchExpression__Group_2_0_0_0__032557);
+            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__1_in_rule__XSwitchExpression__Group_2_0_0_0__032371);
             rule__XSwitchExpression__Group_2_0_0_0__1();
 
             state._fsp--;
@@ -46635,22 +46372,22 @@ public final void rule__XSwitchExpression__Group_2_0_0_0__0() throws Recognition
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16024:1: rule__XSwitchExpression__Group_2_0_0_0__0__Impl : ( '(' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15930:1: rule__XSwitchExpression__Group_2_0_0_0__0__Impl : ( '(' ) ;
     public final void rule__XSwitchExpression__Group_2_0_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16028:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16029:1: ( '(' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15934:1: ( ( '(' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15935:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16029:1: ( '(' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16030:1: '('
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15935:1: ( '(' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15936:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getLeftParenthesisKeyword_2_0_0_0_0()); 
             }
-            match(input,72,FOLLOW_72_in_rule__XSwitchExpression__Group_2_0_0_0__0__Impl32585); if (state.failed) return ;
+            match(input,72,FOLLOW_72_in_rule__XSwitchExpression__Group_2_0_0_0__0__Impl32399); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getLeftParenthesisKeyword_2_0_0_0_0()); 
             }
@@ -46676,21 +46413,21 @@ public final void rule__XSwitchExpression__Group_2_0_0_0__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16043:1: rule__XSwitchExpression__Group_2_0_0_0__1 : rule__XSwitchExpression__Group_2_0_0_0__1__Impl rule__XSwitchExpression__Group_2_0_0_0__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15949:1: rule__XSwitchExpression__Group_2_0_0_0__1 : rule__XSwitchExpression__Group_2_0_0_0__1__Impl rule__XSwitchExpression__Group_2_0_0_0__2 ;
     public final void rule__XSwitchExpression__Group_2_0_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16047:1: ( rule__XSwitchExpression__Group_2_0_0_0__1__Impl rule__XSwitchExpression__Group_2_0_0_0__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16048:2: rule__XSwitchExpression__Group_2_0_0_0__1__Impl rule__XSwitchExpression__Group_2_0_0_0__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15953:1: ( rule__XSwitchExpression__Group_2_0_0_0__1__Impl rule__XSwitchExpression__Group_2_0_0_0__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15954:2: rule__XSwitchExpression__Group_2_0_0_0__1__Impl rule__XSwitchExpression__Group_2_0_0_0__2
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__1__Impl_in_rule__XSwitchExpression__Group_2_0_0_0__132616);
+            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__1__Impl_in_rule__XSwitchExpression__Group_2_0_0_0__132430);
             rule__XSwitchExpression__Group_2_0_0_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__2_in_rule__XSwitchExpression__Group_2_0_0_0__132619);
+            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__2_in_rule__XSwitchExpression__Group_2_0_0_0__132433);
             rule__XSwitchExpression__Group_2_0_0_0__2();
 
             state._fsp--;
@@ -46714,25 +46451,25 @@ public final void rule__XSwitchExpression__Group_2_0_0_0__1() throws Recognition
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16055:1: rule__XSwitchExpression__Group_2_0_0_0__1__Impl : ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15961:1: rule__XSwitchExpression__Group_2_0_0_0__1__Impl : ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) ) ;
     public final void rule__XSwitchExpression__Group_2_0_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16059:1: ( ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16060:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15965:1: ( ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15966:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16060:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16061:1: ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15966:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15967:1: ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getDeclaredParamAssignment_2_0_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16062:1: ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16062:2: rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15968:1: ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15968:2: rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1_in_rule__XSwitchExpression__Group_2_0_0_0__1__Impl32646);
+            pushFollow(FOLLOW_rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1_in_rule__XSwitchExpression__Group_2_0_0_0__1__Impl32460);
             rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1();
 
             state._fsp--;
@@ -46765,16 +46502,16 @@ public final void rule__XSwitchExpression__Group_2_0_0_0__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0_0__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16072:1: rule__XSwitchExpression__Group_2_0_0_0__2 : rule__XSwitchExpression__Group_2_0_0_0__2__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15978:1: rule__XSwitchExpression__Group_2_0_0_0__2 : rule__XSwitchExpression__Group_2_0_0_0__2__Impl ;
     public final void rule__XSwitchExpression__Group_2_0_0_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16076:1: ( rule__XSwitchExpression__Group_2_0_0_0__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16077:2: rule__XSwitchExpression__Group_2_0_0_0__2__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15982:1: ( rule__XSwitchExpression__Group_2_0_0_0__2__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15983:2: rule__XSwitchExpression__Group_2_0_0_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__2__Impl_in_rule__XSwitchExpression__Group_2_0_0_0__232676);
+            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__2__Impl_in_rule__XSwitchExpression__Group_2_0_0_0__232490);
             rule__XSwitchExpression__Group_2_0_0_0__2__Impl();
 
             state._fsp--;
@@ -46798,22 +46535,22 @@ public final void rule__XSwitchExpression__Group_2_0_0_0__2() throws Recognition
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0_0__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16083:1: rule__XSwitchExpression__Group_2_0_0_0__2__Impl : ( ':' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15989:1: rule__XSwitchExpression__Group_2_0_0_0__2__Impl : ( ':' ) ;
     public final void rule__XSwitchExpression__Group_2_0_0_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16087:1: ( ( ':' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16088:1: ( ':' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15993:1: ( ( ':' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15994:1: ( ':' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16088:1: ( ':' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16089:1: ':'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15994:1: ( ':' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15995:1: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getColonKeyword_2_0_0_0_2()); 
             }
-            match(input,87,FOLLOW_87_in_rule__XSwitchExpression__Group_2_0_0_0__2__Impl32704); if (state.failed) return ;
+            match(input,87,FOLLOW_87_in_rule__XSwitchExpression__Group_2_0_0_0__2__Impl32518); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getColonKeyword_2_0_0_0_2()); 
             }
@@ -46839,21 +46576,21 @@ public final void rule__XSwitchExpression__Group_2_0_0_0__2__Impl() throws Recog
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16108:1: rule__XSwitchExpression__Group_2_1__0 : rule__XSwitchExpression__Group_2_1__0__Impl rule__XSwitchExpression__Group_2_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16014:1: rule__XSwitchExpression__Group_2_1__0 : rule__XSwitchExpression__Group_2_1__0__Impl rule__XSwitchExpression__Group_2_1__1 ;
     public final void rule__XSwitchExpression__Group_2_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16112:1: ( rule__XSwitchExpression__Group_2_1__0__Impl rule__XSwitchExpression__Group_2_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16113:2: rule__XSwitchExpression__Group_2_1__0__Impl rule__XSwitchExpression__Group_2_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16018:1: ( rule__XSwitchExpression__Group_2_1__0__Impl rule__XSwitchExpression__Group_2_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16019:2: rule__XSwitchExpression__Group_2_1__0__Impl rule__XSwitchExpression__Group_2_1__1
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1__0__Impl_in_rule__XSwitchExpression__Group_2_1__032741);
+            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1__0__Impl_in_rule__XSwitchExpression__Group_2_1__032555);
             rule__XSwitchExpression__Group_2_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1__1_in_rule__XSwitchExpression__Group_2_1__032744);
+            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1__1_in_rule__XSwitchExpression__Group_2_1__032558);
             rule__XSwitchExpression__Group_2_1__1();
 
             state._fsp--;
@@ -46877,29 +46614,29 @@ public final void rule__XSwitchExpression__Group_2_1__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16120:1: rule__XSwitchExpression__Group_2_1__0__Impl : ( ( rule__XSwitchExpression__Group_2_1_0__0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16026:1: rule__XSwitchExpression__Group_2_1__0__Impl : ( ( rule__XSwitchExpression__Group_2_1_0__0 )? ) ;
     public final void rule__XSwitchExpression__Group_2_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16124:1: ( ( ( rule__XSwitchExpression__Group_2_1_0__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16125:1: ( ( rule__XSwitchExpression__Group_2_1_0__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16030:1: ( ( ( rule__XSwitchExpression__Group_2_1_0__0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16031:1: ( ( rule__XSwitchExpression__Group_2_1_0__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16125:1: ( ( rule__XSwitchExpression__Group_2_1_0__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16126:1: ( rule__XSwitchExpression__Group_2_1_0__0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16031:1: ( ( rule__XSwitchExpression__Group_2_1_0__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16032:1: ( rule__XSwitchExpression__Group_2_1_0__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getGroup_2_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16127:1: ( rule__XSwitchExpression__Group_2_1_0__0 )?
-            int alt126=2;
-            alt126 = dfa126.predict(input);
-            switch (alt126) {
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16033:1: ( rule__XSwitchExpression__Group_2_1_0__0 )?
+            int alt125=2;
+            alt125 = dfa125.predict(input);
+            switch (alt125) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16127:2: rule__XSwitchExpression__Group_2_1_0__0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16033:2: rule__XSwitchExpression__Group_2_1_0__0
                     {
-                    pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1_0__0_in_rule__XSwitchExpression__Group_2_1__0__Impl32771);
+                    pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1_0__0_in_rule__XSwitchExpression__Group_2_1__0__Impl32585);
                     rule__XSwitchExpression__Group_2_1_0__0();
 
                     state._fsp--;
@@ -46935,16 +46672,16 @@ public final void rule__XSwitchExpression__Group_2_1__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16137:1: rule__XSwitchExpression__Group_2_1__1 : rule__XSwitchExpression__Group_2_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16043:1: rule__XSwitchExpression__Group_2_1__1 : rule__XSwitchExpression__Group_2_1__1__Impl ;
     public final void rule__XSwitchExpression__Group_2_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16141:1: ( rule__XSwitchExpression__Group_2_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16142:2: rule__XSwitchExpression__Group_2_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16047:1: ( rule__XSwitchExpression__Group_2_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16048:2: rule__XSwitchExpression__Group_2_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1__1__Impl_in_rule__XSwitchExpression__Group_2_1__132802);
+            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1__1__Impl_in_rule__XSwitchExpression__Group_2_1__132616);
             rule__XSwitchExpression__Group_2_1__1__Impl();
 
             state._fsp--;
@@ -46968,25 +46705,25 @@ public final void rule__XSwitchExpression__Group_2_1__1() throws RecognitionExce
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16148:1: rule__XSwitchExpression__Group_2_1__1__Impl : ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16054:1: rule__XSwitchExpression__Group_2_1__1__Impl : ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) ) ;
     public final void rule__XSwitchExpression__Group_2_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16152:1: ( ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16153:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16058:1: ( ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16059:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16153:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16154:1: ( rule__XSwitchExpression__SwitchAssignment_2_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16059:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16060:1: ( rule__XSwitchExpression__SwitchAssignment_2_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getSwitchAssignment_2_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16155:1: ( rule__XSwitchExpression__SwitchAssignment_2_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16155:2: rule__XSwitchExpression__SwitchAssignment_2_1_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16061:1: ( rule__XSwitchExpression__SwitchAssignment_2_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16061:2: rule__XSwitchExpression__SwitchAssignment_2_1_1
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__SwitchAssignment_2_1_1_in_rule__XSwitchExpression__Group_2_1__1__Impl32829);
+            pushFollow(FOLLOW_rule__XSwitchExpression__SwitchAssignment_2_1_1_in_rule__XSwitchExpression__Group_2_1__1__Impl32643);
             rule__XSwitchExpression__SwitchAssignment_2_1_1();
 
             state._fsp--;
@@ -47019,16 +46756,16 @@ public final void rule__XSwitchExpression__Group_2_1__1__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16169:1: rule__XSwitchExpression__Group_2_1_0__0 : rule__XSwitchExpression__Group_2_1_0__0__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16075:1: rule__XSwitchExpression__Group_2_1_0__0 : rule__XSwitchExpression__Group_2_1_0__0__Impl ;
     public final void rule__XSwitchExpression__Group_2_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16173:1: ( rule__XSwitchExpression__Group_2_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16174:2: rule__XSwitchExpression__Group_2_1_0__0__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16079:1: ( rule__XSwitchExpression__Group_2_1_0__0__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16080:2: rule__XSwitchExpression__Group_2_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1_0__0__Impl_in_rule__XSwitchExpression__Group_2_1_0__032863);
+            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1_0__0__Impl_in_rule__XSwitchExpression__Group_2_1_0__032677);
             rule__XSwitchExpression__Group_2_1_0__0__Impl();
 
             state._fsp--;
@@ -47052,25 +46789,25 @@ public final void rule__XSwitchExpression__Group_2_1_0__0() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16180:1: rule__XSwitchExpression__Group_2_1_0__0__Impl : ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16086:1: rule__XSwitchExpression__Group_2_1_0__0__Impl : ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) ) ;
     public final void rule__XSwitchExpression__Group_2_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16184:1: ( ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16185:1: ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16090:1: ( ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16091:1: ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16185:1: ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16186:1: ( rule__XSwitchExpression__Group_2_1_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16091:1: ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16092:1: ( rule__XSwitchExpression__Group_2_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getGroup_2_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16187:1: ( rule__XSwitchExpression__Group_2_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16187:2: rule__XSwitchExpression__Group_2_1_0_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16093:1: ( rule__XSwitchExpression__Group_2_1_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16093:2: rule__XSwitchExpression__Group_2_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1_0_0__0_in_rule__XSwitchExpression__Group_2_1_0__0__Impl32890);
+            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1_0_0__0_in_rule__XSwitchExpression__Group_2_1_0__0__Impl32704);
             rule__XSwitchExpression__Group_2_1_0_0__0();
 
             state._fsp--;
@@ -47103,21 +46840,21 @@ public final void rule__XSwitchExpression__Group_2_1_0__0__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16199:1: rule__XSwitchExpression__Group_2_1_0_0__0 : rule__XSwitchExpression__Group_2_1_0_0__0__Impl rule__XSwitchExpression__Group_2_1_0_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16105:1: rule__XSwitchExpression__Group_2_1_0_0__0 : rule__XSwitchExpression__Group_2_1_0_0__0__Impl rule__XSwitchExpression__Group_2_1_0_0__1 ;
     public final void rule__XSwitchExpression__Group_2_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16203:1: ( rule__XSwitchExpression__Group_2_1_0_0__0__Impl rule__XSwitchExpression__Group_2_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16204:2: rule__XSwitchExpression__Group_2_1_0_0__0__Impl rule__XSwitchExpression__Group_2_1_0_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16109:1: ( rule__XSwitchExpression__Group_2_1_0_0__0__Impl rule__XSwitchExpression__Group_2_1_0_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16110:2: rule__XSwitchExpression__Group_2_1_0_0__0__Impl rule__XSwitchExpression__Group_2_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1_0_0__0__Impl_in_rule__XSwitchExpression__Group_2_1_0_0__032922);
+            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1_0_0__0__Impl_in_rule__XSwitchExpression__Group_2_1_0_0__032736);
             rule__XSwitchExpression__Group_2_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1_0_0__1_in_rule__XSwitchExpression__Group_2_1_0_0__032925);
+            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1_0_0__1_in_rule__XSwitchExpression__Group_2_1_0_0__032739);
             rule__XSwitchExpression__Group_2_1_0_0__1();
 
             state._fsp--;
@@ -47141,25 +46878,25 @@ public final void rule__XSwitchExpression__Group_2_1_0_0__0() throws Recognition
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16211:1: rule__XSwitchExpression__Group_2_1_0_0__0__Impl : ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16117:1: rule__XSwitchExpression__Group_2_1_0_0__0__Impl : ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) ) ;
     public final void rule__XSwitchExpression__Group_2_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16215:1: ( ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16216:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16121:1: ( ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16122:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16216:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16217:1: ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16122:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16123:1: ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getDeclaredParamAssignment_2_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16218:1: ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16218:2: rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16124:1: ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16124:2: rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0_in_rule__XSwitchExpression__Group_2_1_0_0__0__Impl32952);
+            pushFollow(FOLLOW_rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0_in_rule__XSwitchExpression__Group_2_1_0_0__0__Impl32766);
             rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0();
 
             state._fsp--;
@@ -47192,16 +46929,16 @@ public final void rule__XSwitchExpression__Group_2_1_0_0__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16228:1: rule__XSwitchExpression__Group_2_1_0_0__1 : rule__XSwitchExpression__Group_2_1_0_0__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16134:1: rule__XSwitchExpression__Group_2_1_0_0__1 : rule__XSwitchExpression__Group_2_1_0_0__1__Impl ;
     public final void rule__XSwitchExpression__Group_2_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16232:1: ( rule__XSwitchExpression__Group_2_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16233:2: rule__XSwitchExpression__Group_2_1_0_0__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16138:1: ( rule__XSwitchExpression__Group_2_1_0_0__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16139:2: rule__XSwitchExpression__Group_2_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1_0_0__1__Impl_in_rule__XSwitchExpression__Group_2_1_0_0__132982);
+            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1_0_0__1__Impl_in_rule__XSwitchExpression__Group_2_1_0_0__132796);
             rule__XSwitchExpression__Group_2_1_0_0__1__Impl();
 
             state._fsp--;
@@ -47225,22 +46962,22 @@ public final void rule__XSwitchExpression__Group_2_1_0_0__1() throws Recognition
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16239:1: rule__XSwitchExpression__Group_2_1_0_0__1__Impl : ( ':' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16145:1: rule__XSwitchExpression__Group_2_1_0_0__1__Impl : ( ':' ) ;
     public final void rule__XSwitchExpression__Group_2_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16243:1: ( ( ':' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16244:1: ( ':' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16149:1: ( ( ':' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16150:1: ( ':' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16244:1: ( ':' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16245:1: ':'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16150:1: ( ':' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16151:1: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getColonKeyword_2_1_0_0_1()); 
             }
-            match(input,87,FOLLOW_87_in_rule__XSwitchExpression__Group_2_1_0_0__1__Impl33010); if (state.failed) return ;
+            match(input,87,FOLLOW_87_in_rule__XSwitchExpression__Group_2_1_0_0__1__Impl32824); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getColonKeyword_2_1_0_0_1()); 
             }
@@ -47266,21 +47003,21 @@ public final void rule__XSwitchExpression__Group_2_1_0_0__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_5__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16262:1: rule__XSwitchExpression__Group_5__0 : rule__XSwitchExpression__Group_5__0__Impl rule__XSwitchExpression__Group_5__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16168:1: rule__XSwitchExpression__Group_5__0 : rule__XSwitchExpression__Group_5__0__Impl rule__XSwitchExpression__Group_5__1 ;
     public final void rule__XSwitchExpression__Group_5__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16266:1: ( rule__XSwitchExpression__Group_5__0__Impl rule__XSwitchExpression__Group_5__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16267:2: rule__XSwitchExpression__Group_5__0__Impl rule__XSwitchExpression__Group_5__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16172:1: ( rule__XSwitchExpression__Group_5__0__Impl rule__XSwitchExpression__Group_5__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16173:2: rule__XSwitchExpression__Group_5__0__Impl rule__XSwitchExpression__Group_5__1
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_5__0__Impl_in_rule__XSwitchExpression__Group_5__033045);
+            pushFollow(FOLLOW_rule__XSwitchExpression__Group_5__0__Impl_in_rule__XSwitchExpression__Group_5__032859);
             rule__XSwitchExpression__Group_5__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_5__1_in_rule__XSwitchExpression__Group_5__033048);
+            pushFollow(FOLLOW_rule__XSwitchExpression__Group_5__1_in_rule__XSwitchExpression__Group_5__032862);
             rule__XSwitchExpression__Group_5__1();
 
             state._fsp--;
@@ -47304,22 +47041,22 @@ public final void rule__XSwitchExpression__Group_5__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_5__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16274:1: rule__XSwitchExpression__Group_5__0__Impl : ( 'default' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16180:1: rule__XSwitchExpression__Group_5__0__Impl : ( 'default' ) ;
     public final void rule__XSwitchExpression__Group_5__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16278:1: ( ( 'default' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16279:1: ( 'default' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16184:1: ( ( 'default' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16185:1: ( 'default' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16279:1: ( 'default' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16280:1: 'default'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16185:1: ( 'default' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16186:1: 'default'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getDefaultKeyword_5_0()); 
             }
-            match(input,88,FOLLOW_88_in_rule__XSwitchExpression__Group_5__0__Impl33076); if (state.failed) return ;
+            match(input,88,FOLLOW_88_in_rule__XSwitchExpression__Group_5__0__Impl32890); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getDefaultKeyword_5_0()); 
             }
@@ -47345,21 +47082,21 @@ public final void rule__XSwitchExpression__Group_5__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_5__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16293:1: rule__XSwitchExpression__Group_5__1 : rule__XSwitchExpression__Group_5__1__Impl rule__XSwitchExpression__Group_5__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16199:1: rule__XSwitchExpression__Group_5__1 : rule__XSwitchExpression__Group_5__1__Impl rule__XSwitchExpression__Group_5__2 ;
     public final void rule__XSwitchExpression__Group_5__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16297:1: ( rule__XSwitchExpression__Group_5__1__Impl rule__XSwitchExpression__Group_5__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16298:2: rule__XSwitchExpression__Group_5__1__Impl rule__XSwitchExpression__Group_5__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16203:1: ( rule__XSwitchExpression__Group_5__1__Impl rule__XSwitchExpression__Group_5__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16204:2: rule__XSwitchExpression__Group_5__1__Impl rule__XSwitchExpression__Group_5__2
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_5__1__Impl_in_rule__XSwitchExpression__Group_5__133107);
+            pushFollow(FOLLOW_rule__XSwitchExpression__Group_5__1__Impl_in_rule__XSwitchExpression__Group_5__132921);
             rule__XSwitchExpression__Group_5__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_5__2_in_rule__XSwitchExpression__Group_5__133110);
+            pushFollow(FOLLOW_rule__XSwitchExpression__Group_5__2_in_rule__XSwitchExpression__Group_5__132924);
             rule__XSwitchExpression__Group_5__2();
 
             state._fsp--;
@@ -47383,22 +47120,22 @@ public final void rule__XSwitchExpression__Group_5__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_5__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16305:1: rule__XSwitchExpression__Group_5__1__Impl : ( ':' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16211:1: rule__XSwitchExpression__Group_5__1__Impl : ( ':' ) ;
     public final void rule__XSwitchExpression__Group_5__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16309:1: ( ( ':' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16310:1: ( ':' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16215:1: ( ( ':' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16216:1: ( ':' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16310:1: ( ':' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16311:1: ':'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16216:1: ( ':' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16217:1: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getColonKeyword_5_1()); 
             }
-            match(input,87,FOLLOW_87_in_rule__XSwitchExpression__Group_5__1__Impl33138); if (state.failed) return ;
+            match(input,87,FOLLOW_87_in_rule__XSwitchExpression__Group_5__1__Impl32952); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getColonKeyword_5_1()); 
             }
@@ -47424,16 +47161,16 @@ public final void rule__XSwitchExpression__Group_5__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_5__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16324:1: rule__XSwitchExpression__Group_5__2 : rule__XSwitchExpression__Group_5__2__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16230:1: rule__XSwitchExpression__Group_5__2 : rule__XSwitchExpression__Group_5__2__Impl ;
     public final void rule__XSwitchExpression__Group_5__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16328:1: ( rule__XSwitchExpression__Group_5__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16329:2: rule__XSwitchExpression__Group_5__2__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16234:1: ( rule__XSwitchExpression__Group_5__2__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16235:2: rule__XSwitchExpression__Group_5__2__Impl
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_5__2__Impl_in_rule__XSwitchExpression__Group_5__233169);
+            pushFollow(FOLLOW_rule__XSwitchExpression__Group_5__2__Impl_in_rule__XSwitchExpression__Group_5__232983);
             rule__XSwitchExpression__Group_5__2__Impl();
 
             state._fsp--;
@@ -47457,25 +47194,25 @@ public final void rule__XSwitchExpression__Group_5__2() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_5__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16335:1: rule__XSwitchExpression__Group_5__2__Impl : ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16241:1: rule__XSwitchExpression__Group_5__2__Impl : ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) ) ;
     public final void rule__XSwitchExpression__Group_5__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16339:1: ( ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16340:1: ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16245:1: ( ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16246:1: ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16340:1: ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16341:1: ( rule__XSwitchExpression__DefaultAssignment_5_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16246:1: ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16247:1: ( rule__XSwitchExpression__DefaultAssignment_5_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getDefaultAssignment_5_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16342:1: ( rule__XSwitchExpression__DefaultAssignment_5_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16342:2: rule__XSwitchExpression__DefaultAssignment_5_2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16248:1: ( rule__XSwitchExpression__DefaultAssignment_5_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16248:2: rule__XSwitchExpression__DefaultAssignment_5_2
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__DefaultAssignment_5_2_in_rule__XSwitchExpression__Group_5__2__Impl33196);
+            pushFollow(FOLLOW_rule__XSwitchExpression__DefaultAssignment_5_2_in_rule__XSwitchExpression__Group_5__2__Impl33010);
             rule__XSwitchExpression__DefaultAssignment_5_2();
 
             state._fsp--;
@@ -47508,21 +47245,21 @@ public final void rule__XSwitchExpression__Group_5__2__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XCasePart__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16358:1: rule__XCasePart__Group__0 : rule__XCasePart__Group__0__Impl rule__XCasePart__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16264:1: rule__XCasePart__Group__0 : rule__XCasePart__Group__0__Impl rule__XCasePart__Group__1 ;
     public final void rule__XCasePart__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16362:1: ( rule__XCasePart__Group__0__Impl rule__XCasePart__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16363:2: rule__XCasePart__Group__0__Impl rule__XCasePart__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16268:1: ( rule__XCasePart__Group__0__Impl rule__XCasePart__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16269:2: rule__XCasePart__Group__0__Impl rule__XCasePart__Group__1
             {
-            pushFollow(FOLLOW_rule__XCasePart__Group__0__Impl_in_rule__XCasePart__Group__033232);
+            pushFollow(FOLLOW_rule__XCasePart__Group__0__Impl_in_rule__XCasePart__Group__033046);
             rule__XCasePart__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCasePart__Group__1_in_rule__XCasePart__Group__033235);
+            pushFollow(FOLLOW_rule__XCasePart__Group__1_in_rule__XCasePart__Group__033049);
             rule__XCasePart__Group__1();
 
             state._fsp--;
@@ -47546,23 +47283,23 @@ public final void rule__XCasePart__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCasePart__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16370:1: rule__XCasePart__Group__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16276:1: rule__XCasePart__Group__0__Impl : ( () ) ;
     public final void rule__XCasePart__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16374:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16375:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16280:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16281:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16375:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16376:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16281:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16282:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getXCasePartAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16377:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16379:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16283:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16285:1: 
             {
             }
 
@@ -47587,21 +47324,21 @@ public final void rule__XCasePart__Group__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__XCasePart__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16389:1: rule__XCasePart__Group__1 : rule__XCasePart__Group__1__Impl rule__XCasePart__Group__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16295:1: rule__XCasePart__Group__1 : rule__XCasePart__Group__1__Impl rule__XCasePart__Group__2 ;
     public final void rule__XCasePart__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16393:1: ( rule__XCasePart__Group__1__Impl rule__XCasePart__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16394:2: rule__XCasePart__Group__1__Impl rule__XCasePart__Group__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16299:1: ( rule__XCasePart__Group__1__Impl rule__XCasePart__Group__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16300:2: rule__XCasePart__Group__1__Impl rule__XCasePart__Group__2
             {
-            pushFollow(FOLLOW_rule__XCasePart__Group__1__Impl_in_rule__XCasePart__Group__133293);
+            pushFollow(FOLLOW_rule__XCasePart__Group__1__Impl_in_rule__XCasePart__Group__133107);
             rule__XCasePart__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCasePart__Group__2_in_rule__XCasePart__Group__133296);
+            pushFollow(FOLLOW_rule__XCasePart__Group__2_in_rule__XCasePart__Group__133110);
             rule__XCasePart__Group__2();
 
             state._fsp--;
@@ -47625,33 +47362,33 @@ public final void rule__XCasePart__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCasePart__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16401:1: rule__XCasePart__Group__1__Impl : ( ( rule__XCasePart__TypeGuardAssignment_1 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16307:1: rule__XCasePart__Group__1__Impl : ( ( rule__XCasePart__TypeGuardAssignment_1 )? ) ;
     public final void rule__XCasePart__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16405:1: ( ( ( rule__XCasePart__TypeGuardAssignment_1 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16406:1: ( ( rule__XCasePart__TypeGuardAssignment_1 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16311:1: ( ( ( rule__XCasePart__TypeGuardAssignment_1 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16312:1: ( ( rule__XCasePart__TypeGuardAssignment_1 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16406:1: ( ( rule__XCasePart__TypeGuardAssignment_1 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16407:1: ( rule__XCasePart__TypeGuardAssignment_1 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16312:1: ( ( rule__XCasePart__TypeGuardAssignment_1 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16313:1: ( rule__XCasePart__TypeGuardAssignment_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getTypeGuardAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16408:1: ( rule__XCasePart__TypeGuardAssignment_1 )?
-            int alt127=2;
-            int LA127_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16314:1: ( rule__XCasePart__TypeGuardAssignment_1 )?
+            int alt126=2;
+            int LA126_0 = input.LA(1);
 
-            if ( (LA127_0==RULE_ID||LA127_0==51||LA127_0==72) ) {
-                alt127=1;
+            if ( (LA126_0==RULE_ID||LA126_0==51||LA126_0==72) ) {
+                alt126=1;
             }
-            switch (alt127) {
+            switch (alt126) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16408:2: rule__XCasePart__TypeGuardAssignment_1
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16314:2: rule__XCasePart__TypeGuardAssignment_1
                     {
-                    pushFollow(FOLLOW_rule__XCasePart__TypeGuardAssignment_1_in_rule__XCasePart__Group__1__Impl33323);
+                    pushFollow(FOLLOW_rule__XCasePart__TypeGuardAssignment_1_in_rule__XCasePart__Group__1__Impl33137);
                     rule__XCasePart__TypeGuardAssignment_1();
 
                     state._fsp--;
@@ -47687,21 +47424,21 @@ public final void rule__XCasePart__Group__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__XCasePart__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16418:1: rule__XCasePart__Group__2 : rule__XCasePart__Group__2__Impl rule__XCasePart__Group__3 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16324:1: rule__XCasePart__Group__2 : rule__XCasePart__Group__2__Impl rule__XCasePart__Group__3 ;
     public final void rule__XCasePart__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16422:1: ( rule__XCasePart__Group__2__Impl rule__XCasePart__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16423:2: rule__XCasePart__Group__2__Impl rule__XCasePart__Group__3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16328:1: ( rule__XCasePart__Group__2__Impl rule__XCasePart__Group__3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16329:2: rule__XCasePart__Group__2__Impl rule__XCasePart__Group__3
             {
-            pushFollow(FOLLOW_rule__XCasePart__Group__2__Impl_in_rule__XCasePart__Group__233354);
+            pushFollow(FOLLOW_rule__XCasePart__Group__2__Impl_in_rule__XCasePart__Group__233168);
             rule__XCasePart__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCasePart__Group__3_in_rule__XCasePart__Group__233357);
+            pushFollow(FOLLOW_rule__XCasePart__Group__3_in_rule__XCasePart__Group__233171);
             rule__XCasePart__Group__3();
 
             state._fsp--;
@@ -47725,33 +47462,33 @@ public final void rule__XCasePart__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCasePart__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16430:1: rule__XCasePart__Group__2__Impl : ( ( rule__XCasePart__Group_2__0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16336:1: rule__XCasePart__Group__2__Impl : ( ( rule__XCasePart__Group_2__0 )? ) ;
     public final void rule__XCasePart__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16434:1: ( ( ( rule__XCasePart__Group_2__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16435:1: ( ( rule__XCasePart__Group_2__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16340:1: ( ( ( rule__XCasePart__Group_2__0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16341:1: ( ( rule__XCasePart__Group_2__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16435:1: ( ( rule__XCasePart__Group_2__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16436:1: ( rule__XCasePart__Group_2__0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16341:1: ( ( rule__XCasePart__Group_2__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16342:1: ( rule__XCasePart__Group_2__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getGroup_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16437:1: ( rule__XCasePart__Group_2__0 )?
-            int alt128=2;
-            int LA128_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16343:1: ( rule__XCasePart__Group_2__0 )?
+            int alt127=2;
+            int LA127_0 = input.LA(1);
 
-            if ( (LA128_0==89) ) {
-                alt128=1;
+            if ( (LA127_0==89) ) {
+                alt127=1;
             }
-            switch (alt128) {
+            switch (alt127) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16437:2: rule__XCasePart__Group_2__0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16343:2: rule__XCasePart__Group_2__0
                     {
-                    pushFollow(FOLLOW_rule__XCasePart__Group_2__0_in_rule__XCasePart__Group__2__Impl33384);
+                    pushFollow(FOLLOW_rule__XCasePart__Group_2__0_in_rule__XCasePart__Group__2__Impl33198);
                     rule__XCasePart__Group_2__0();
 
                     state._fsp--;
@@ -47787,16 +47524,16 @@ public final void rule__XCasePart__Group__2__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__XCasePart__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16447:1: rule__XCasePart__Group__3 : rule__XCasePart__Group__3__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16353:1: rule__XCasePart__Group__3 : rule__XCasePart__Group__3__Impl ;
     public final void rule__XCasePart__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16451:1: ( rule__XCasePart__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16452:2: rule__XCasePart__Group__3__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16357:1: ( rule__XCasePart__Group__3__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16358:2: rule__XCasePart__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__XCasePart__Group__3__Impl_in_rule__XCasePart__Group__333415);
+            pushFollow(FOLLOW_rule__XCasePart__Group__3__Impl_in_rule__XCasePart__Group__333229);
             rule__XCasePart__Group__3__Impl();
 
             state._fsp--;
@@ -47820,25 +47557,25 @@ public final void rule__XCasePart__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCasePart__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16458:1: rule__XCasePart__Group__3__Impl : ( ( rule__XCasePart__Alternatives_3 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16364:1: rule__XCasePart__Group__3__Impl : ( ( rule__XCasePart__Alternatives_3 ) ) ;
     public final void rule__XCasePart__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16462:1: ( ( ( rule__XCasePart__Alternatives_3 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16463:1: ( ( rule__XCasePart__Alternatives_3 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16368:1: ( ( ( rule__XCasePart__Alternatives_3 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16369:1: ( ( rule__XCasePart__Alternatives_3 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16463:1: ( ( rule__XCasePart__Alternatives_3 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16464:1: ( rule__XCasePart__Alternatives_3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16369:1: ( ( rule__XCasePart__Alternatives_3 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16370:1: ( rule__XCasePart__Alternatives_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getAlternatives_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16465:1: ( rule__XCasePart__Alternatives_3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16465:2: rule__XCasePart__Alternatives_3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16371:1: ( rule__XCasePart__Alternatives_3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16371:2: rule__XCasePart__Alternatives_3
             {
-            pushFollow(FOLLOW_rule__XCasePart__Alternatives_3_in_rule__XCasePart__Group__3__Impl33442);
+            pushFollow(FOLLOW_rule__XCasePart__Alternatives_3_in_rule__XCasePart__Group__3__Impl33256);
             rule__XCasePart__Alternatives_3();
 
             state._fsp--;
@@ -47871,21 +47608,21 @@ public final void rule__XCasePart__Group__3__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__XCasePart__Group_2__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16483:1: rule__XCasePart__Group_2__0 : rule__XCasePart__Group_2__0__Impl rule__XCasePart__Group_2__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16389:1: rule__XCasePart__Group_2__0 : rule__XCasePart__Group_2__0__Impl rule__XCasePart__Group_2__1 ;
     public final void rule__XCasePart__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16487:1: ( rule__XCasePart__Group_2__0__Impl rule__XCasePart__Group_2__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16488:2: rule__XCasePart__Group_2__0__Impl rule__XCasePart__Group_2__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16393:1: ( rule__XCasePart__Group_2__0__Impl rule__XCasePart__Group_2__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16394:2: rule__XCasePart__Group_2__0__Impl rule__XCasePart__Group_2__1
             {
-            pushFollow(FOLLOW_rule__XCasePart__Group_2__0__Impl_in_rule__XCasePart__Group_2__033480);
+            pushFollow(FOLLOW_rule__XCasePart__Group_2__0__Impl_in_rule__XCasePart__Group_2__033294);
             rule__XCasePart__Group_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCasePart__Group_2__1_in_rule__XCasePart__Group_2__033483);
+            pushFollow(FOLLOW_rule__XCasePart__Group_2__1_in_rule__XCasePart__Group_2__033297);
             rule__XCasePart__Group_2__1();
 
             state._fsp--;
@@ -47909,22 +47646,22 @@ public final void rule__XCasePart__Group_2__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCasePart__Group_2__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16495:1: rule__XCasePart__Group_2__0__Impl : ( 'case' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16401:1: rule__XCasePart__Group_2__0__Impl : ( 'case' ) ;
     public final void rule__XCasePart__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16499:1: ( ( 'case' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16500:1: ( 'case' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16405:1: ( ( 'case' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16406:1: ( 'case' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16500:1: ( 'case' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16501:1: 'case'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16406:1: ( 'case' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16407:1: 'case'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getCaseKeyword_2_0()); 
             }
-            match(input,89,FOLLOW_89_in_rule__XCasePart__Group_2__0__Impl33511); if (state.failed) return ;
+            match(input,89,FOLLOW_89_in_rule__XCasePart__Group_2__0__Impl33325); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXCasePartAccess().getCaseKeyword_2_0()); 
             }
@@ -47950,16 +47687,16 @@ public final void rule__XCasePart__Group_2__0__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XCasePart__Group_2__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16514:1: rule__XCasePart__Group_2__1 : rule__XCasePart__Group_2__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16420:1: rule__XCasePart__Group_2__1 : rule__XCasePart__Group_2__1__Impl ;
     public final void rule__XCasePart__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16518:1: ( rule__XCasePart__Group_2__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16519:2: rule__XCasePart__Group_2__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16424:1: ( rule__XCasePart__Group_2__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16425:2: rule__XCasePart__Group_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__XCasePart__Group_2__1__Impl_in_rule__XCasePart__Group_2__133542);
+            pushFollow(FOLLOW_rule__XCasePart__Group_2__1__Impl_in_rule__XCasePart__Group_2__133356);
             rule__XCasePart__Group_2__1__Impl();
 
             state._fsp--;
@@ -47983,25 +47720,25 @@ public final void rule__XCasePart__Group_2__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCasePart__Group_2__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16525:1: rule__XCasePart__Group_2__1__Impl : ( ( rule__XCasePart__CaseAssignment_2_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16431:1: rule__XCasePart__Group_2__1__Impl : ( ( rule__XCasePart__CaseAssignment_2_1 ) ) ;
     public final void rule__XCasePart__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16529:1: ( ( ( rule__XCasePart__CaseAssignment_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16530:1: ( ( rule__XCasePart__CaseAssignment_2_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16435:1: ( ( ( rule__XCasePart__CaseAssignment_2_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16436:1: ( ( rule__XCasePart__CaseAssignment_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16530:1: ( ( rule__XCasePart__CaseAssignment_2_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16531:1: ( rule__XCasePart__CaseAssignment_2_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16436:1: ( ( rule__XCasePart__CaseAssignment_2_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16437:1: ( rule__XCasePart__CaseAssignment_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getCaseAssignment_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16532:1: ( rule__XCasePart__CaseAssignment_2_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16532:2: rule__XCasePart__CaseAssignment_2_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16438:1: ( rule__XCasePart__CaseAssignment_2_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16438:2: rule__XCasePart__CaseAssignment_2_1
             {
-            pushFollow(FOLLOW_rule__XCasePart__CaseAssignment_2_1_in_rule__XCasePart__Group_2__1__Impl33569);
+            pushFollow(FOLLOW_rule__XCasePart__CaseAssignment_2_1_in_rule__XCasePart__Group_2__1__Impl33383);
             rule__XCasePart__CaseAssignment_2_1();
 
             state._fsp--;
@@ -48034,21 +47771,21 @@ public final void rule__XCasePart__Group_2__1__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XCasePart__Group_3_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16546:1: rule__XCasePart__Group_3_0__0 : rule__XCasePart__Group_3_0__0__Impl rule__XCasePart__Group_3_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16452:1: rule__XCasePart__Group_3_0__0 : rule__XCasePart__Group_3_0__0__Impl rule__XCasePart__Group_3_0__1 ;
     public final void rule__XCasePart__Group_3_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16550:1: ( rule__XCasePart__Group_3_0__0__Impl rule__XCasePart__Group_3_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16551:2: rule__XCasePart__Group_3_0__0__Impl rule__XCasePart__Group_3_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16456:1: ( rule__XCasePart__Group_3_0__0__Impl rule__XCasePart__Group_3_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16457:2: rule__XCasePart__Group_3_0__0__Impl rule__XCasePart__Group_3_0__1
             {
-            pushFollow(FOLLOW_rule__XCasePart__Group_3_0__0__Impl_in_rule__XCasePart__Group_3_0__033603);
+            pushFollow(FOLLOW_rule__XCasePart__Group_3_0__0__Impl_in_rule__XCasePart__Group_3_0__033417);
             rule__XCasePart__Group_3_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCasePart__Group_3_0__1_in_rule__XCasePart__Group_3_0__033606);
+            pushFollow(FOLLOW_rule__XCasePart__Group_3_0__1_in_rule__XCasePart__Group_3_0__033420);
             rule__XCasePart__Group_3_0__1();
 
             state._fsp--;
@@ -48072,22 +47809,22 @@ public final void rule__XCasePart__Group_3_0__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCasePart__Group_3_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16558:1: rule__XCasePart__Group_3_0__0__Impl : ( ':' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16464:1: rule__XCasePart__Group_3_0__0__Impl : ( ':' ) ;
     public final void rule__XCasePart__Group_3_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16562:1: ( ( ':' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16563:1: ( ':' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16468:1: ( ( ':' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16469:1: ( ':' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16563:1: ( ':' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16564:1: ':'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16469:1: ( ':' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16470:1: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getColonKeyword_3_0_0()); 
             }
-            match(input,87,FOLLOW_87_in_rule__XCasePart__Group_3_0__0__Impl33634); if (state.failed) return ;
+            match(input,87,FOLLOW_87_in_rule__XCasePart__Group_3_0__0__Impl33448); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXCasePartAccess().getColonKeyword_3_0_0()); 
             }
@@ -48113,16 +47850,16 @@ public final void rule__XCasePart__Group_3_0__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XCasePart__Group_3_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16577:1: rule__XCasePart__Group_3_0__1 : rule__XCasePart__Group_3_0__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16483:1: rule__XCasePart__Group_3_0__1 : rule__XCasePart__Group_3_0__1__Impl ;
     public final void rule__XCasePart__Group_3_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16581:1: ( rule__XCasePart__Group_3_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16582:2: rule__XCasePart__Group_3_0__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16487:1: ( rule__XCasePart__Group_3_0__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16488:2: rule__XCasePart__Group_3_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XCasePart__Group_3_0__1__Impl_in_rule__XCasePart__Group_3_0__133665);
+            pushFollow(FOLLOW_rule__XCasePart__Group_3_0__1__Impl_in_rule__XCasePart__Group_3_0__133479);
             rule__XCasePart__Group_3_0__1__Impl();
 
             state._fsp--;
@@ -48146,25 +47883,25 @@ public final void rule__XCasePart__Group_3_0__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCasePart__Group_3_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16588:1: rule__XCasePart__Group_3_0__1__Impl : ( ( rule__XCasePart__ThenAssignment_3_0_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16494:1: rule__XCasePart__Group_3_0__1__Impl : ( ( rule__XCasePart__ThenAssignment_3_0_1 ) ) ;
     public final void rule__XCasePart__Group_3_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16592:1: ( ( ( rule__XCasePart__ThenAssignment_3_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16593:1: ( ( rule__XCasePart__ThenAssignment_3_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16498:1: ( ( ( rule__XCasePart__ThenAssignment_3_0_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16499:1: ( ( rule__XCasePart__ThenAssignment_3_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16593:1: ( ( rule__XCasePart__ThenAssignment_3_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16594:1: ( rule__XCasePart__ThenAssignment_3_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16499:1: ( ( rule__XCasePart__ThenAssignment_3_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16500:1: ( rule__XCasePart__ThenAssignment_3_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getThenAssignment_3_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16595:1: ( rule__XCasePart__ThenAssignment_3_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16595:2: rule__XCasePart__ThenAssignment_3_0_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16501:1: ( rule__XCasePart__ThenAssignment_3_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16501:2: rule__XCasePart__ThenAssignment_3_0_1
             {
-            pushFollow(FOLLOW_rule__XCasePart__ThenAssignment_3_0_1_in_rule__XCasePart__Group_3_0__1__Impl33692);
+            pushFollow(FOLLOW_rule__XCasePart__ThenAssignment_3_0_1_in_rule__XCasePart__Group_3_0__1__Impl33506);
             rule__XCasePart__ThenAssignment_3_0_1();
 
             state._fsp--;
@@ -48197,21 +47934,21 @@ public final void rule__XCasePart__Group_3_0__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16609:1: rule__XForLoopExpression__Group__0 : rule__XForLoopExpression__Group__0__Impl rule__XForLoopExpression__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16515:1: rule__XForLoopExpression__Group__0 : rule__XForLoopExpression__Group__0__Impl rule__XForLoopExpression__Group__1 ;
     public final void rule__XForLoopExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16613:1: ( rule__XForLoopExpression__Group__0__Impl rule__XForLoopExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16614:2: rule__XForLoopExpression__Group__0__Impl rule__XForLoopExpression__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16519:1: ( rule__XForLoopExpression__Group__0__Impl rule__XForLoopExpression__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16520:2: rule__XForLoopExpression__Group__0__Impl rule__XForLoopExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group__0__Impl_in_rule__XForLoopExpression__Group__033726);
+            pushFollow(FOLLOW_rule__XForLoopExpression__Group__0__Impl_in_rule__XForLoopExpression__Group__033540);
             rule__XForLoopExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group__1_in_rule__XForLoopExpression__Group__033729);
+            pushFollow(FOLLOW_rule__XForLoopExpression__Group__1_in_rule__XForLoopExpression__Group__033543);
             rule__XForLoopExpression__Group__1();
 
             state._fsp--;
@@ -48235,25 +47972,25 @@ public final void rule__XForLoopExpression__Group__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16621:1: rule__XForLoopExpression__Group__0__Impl : ( ( rule__XForLoopExpression__Group_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16527:1: rule__XForLoopExpression__Group__0__Impl : ( ( rule__XForLoopExpression__Group_0__0 ) ) ;
     public final void rule__XForLoopExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16625:1: ( ( ( rule__XForLoopExpression__Group_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16626:1: ( ( rule__XForLoopExpression__Group_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16531:1: ( ( ( rule__XForLoopExpression__Group_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16532:1: ( ( rule__XForLoopExpression__Group_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16626:1: ( ( rule__XForLoopExpression__Group_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16627:1: ( rule__XForLoopExpression__Group_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16532:1: ( ( rule__XForLoopExpression__Group_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16533:1: ( rule__XForLoopExpression__Group_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getGroup_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16628:1: ( rule__XForLoopExpression__Group_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16628:2: rule__XForLoopExpression__Group_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16534:1: ( rule__XForLoopExpression__Group_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16534:2: rule__XForLoopExpression__Group_0__0
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0__0_in_rule__XForLoopExpression__Group__0__Impl33756);
+            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0__0_in_rule__XForLoopExpression__Group__0__Impl33570);
             rule__XForLoopExpression__Group_0__0();
 
             state._fsp--;
@@ -48286,21 +48023,21 @@ public final void rule__XForLoopExpression__Group__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16638:1: rule__XForLoopExpression__Group__1 : rule__XForLoopExpression__Group__1__Impl rule__XForLoopExpression__Group__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16544:1: rule__XForLoopExpression__Group__1 : rule__XForLoopExpression__Group__1__Impl rule__XForLoopExpression__Group__2 ;
     public final void rule__XForLoopExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16642:1: ( rule__XForLoopExpression__Group__1__Impl rule__XForLoopExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16643:2: rule__XForLoopExpression__Group__1__Impl rule__XForLoopExpression__Group__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16548:1: ( rule__XForLoopExpression__Group__1__Impl rule__XForLoopExpression__Group__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16549:2: rule__XForLoopExpression__Group__1__Impl rule__XForLoopExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group__1__Impl_in_rule__XForLoopExpression__Group__133786);
+            pushFollow(FOLLOW_rule__XForLoopExpression__Group__1__Impl_in_rule__XForLoopExpression__Group__133600);
             rule__XForLoopExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group__2_in_rule__XForLoopExpression__Group__133789);
+            pushFollow(FOLLOW_rule__XForLoopExpression__Group__2_in_rule__XForLoopExpression__Group__133603);
             rule__XForLoopExpression__Group__2();
 
             state._fsp--;
@@ -48324,25 +48061,25 @@ public final void rule__XForLoopExpression__Group__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16650:1: rule__XForLoopExpression__Group__1__Impl : ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16556:1: rule__XForLoopExpression__Group__1__Impl : ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) ) ;
     public final void rule__XForLoopExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16654:1: ( ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16655:1: ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16560:1: ( ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16561:1: ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16655:1: ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16656:1: ( rule__XForLoopExpression__ForExpressionAssignment_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16561:1: ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16562:1: ( rule__XForLoopExpression__ForExpressionAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getForExpressionAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16657:1: ( rule__XForLoopExpression__ForExpressionAssignment_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16657:2: rule__XForLoopExpression__ForExpressionAssignment_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16563:1: ( rule__XForLoopExpression__ForExpressionAssignment_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16563:2: rule__XForLoopExpression__ForExpressionAssignment_1
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__ForExpressionAssignment_1_in_rule__XForLoopExpression__Group__1__Impl33816);
+            pushFollow(FOLLOW_rule__XForLoopExpression__ForExpressionAssignment_1_in_rule__XForLoopExpression__Group__1__Impl33630);
             rule__XForLoopExpression__ForExpressionAssignment_1();
 
             state._fsp--;
@@ -48375,21 +48112,21 @@ public final void rule__XForLoopExpression__Group__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16667:1: rule__XForLoopExpression__Group__2 : rule__XForLoopExpression__Group__2__Impl rule__XForLoopExpression__Group__3 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16573:1: rule__XForLoopExpression__Group__2 : rule__XForLoopExpression__Group__2__Impl rule__XForLoopExpression__Group__3 ;
     public final void rule__XForLoopExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16671:1: ( rule__XForLoopExpression__Group__2__Impl rule__XForLoopExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16672:2: rule__XForLoopExpression__Group__2__Impl rule__XForLoopExpression__Group__3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16577:1: ( rule__XForLoopExpression__Group__2__Impl rule__XForLoopExpression__Group__3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16578:2: rule__XForLoopExpression__Group__2__Impl rule__XForLoopExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group__2__Impl_in_rule__XForLoopExpression__Group__233846);
+            pushFollow(FOLLOW_rule__XForLoopExpression__Group__2__Impl_in_rule__XForLoopExpression__Group__233660);
             rule__XForLoopExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group__3_in_rule__XForLoopExpression__Group__233849);
+            pushFollow(FOLLOW_rule__XForLoopExpression__Group__3_in_rule__XForLoopExpression__Group__233663);
             rule__XForLoopExpression__Group__3();
 
             state._fsp--;
@@ -48413,22 +48150,22 @@ public final void rule__XForLoopExpression__Group__2() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16679:1: rule__XForLoopExpression__Group__2__Impl : ( ')' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16585:1: rule__XForLoopExpression__Group__2__Impl : ( ')' ) ;
     public final void rule__XForLoopExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16683:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16684:1: ( ')' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16589:1: ( ( ')' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16590:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16684:1: ( ')' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16685:1: ')'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16590:1: ( ')' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16591:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getRightParenthesisKeyword_2()); 
             }
-            match(input,73,FOLLOW_73_in_rule__XForLoopExpression__Group__2__Impl33877); if (state.failed) return ;
+            match(input,73,FOLLOW_73_in_rule__XForLoopExpression__Group__2__Impl33691); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXForLoopExpressionAccess().getRightParenthesisKeyword_2()); 
             }
@@ -48454,16 +48191,16 @@ public final void rule__XForLoopExpression__Group__2__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16698:1: rule__XForLoopExpression__Group__3 : rule__XForLoopExpression__Group__3__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16604:1: rule__XForLoopExpression__Group__3 : rule__XForLoopExpression__Group__3__Impl ;
     public final void rule__XForLoopExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16702:1: ( rule__XForLoopExpression__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16703:2: rule__XForLoopExpression__Group__3__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16608:1: ( rule__XForLoopExpression__Group__3__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16609:2: rule__XForLoopExpression__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group__3__Impl_in_rule__XForLoopExpression__Group__333908);
+            pushFollow(FOLLOW_rule__XForLoopExpression__Group__3__Impl_in_rule__XForLoopExpression__Group__333722);
             rule__XForLoopExpression__Group__3__Impl();
 
             state._fsp--;
@@ -48487,25 +48224,25 @@ public final void rule__XForLoopExpression__Group__3() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16709:1: rule__XForLoopExpression__Group__3__Impl : ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16615:1: rule__XForLoopExpression__Group__3__Impl : ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) ) ;
     public final void rule__XForLoopExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16713:1: ( ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16714:1: ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16619:1: ( ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16620:1: ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16714:1: ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16715:1: ( rule__XForLoopExpression__EachExpressionAssignment_3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16620:1: ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16621:1: ( rule__XForLoopExpression__EachExpressionAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getEachExpressionAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16716:1: ( rule__XForLoopExpression__EachExpressionAssignment_3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16716:2: rule__XForLoopExpression__EachExpressionAssignment_3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16622:1: ( rule__XForLoopExpression__EachExpressionAssignment_3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16622:2: rule__XForLoopExpression__EachExpressionAssignment_3
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__EachExpressionAssignment_3_in_rule__XForLoopExpression__Group__3__Impl33935);
+            pushFollow(FOLLOW_rule__XForLoopExpression__EachExpressionAssignment_3_in_rule__XForLoopExpression__Group__3__Impl33749);
             rule__XForLoopExpression__EachExpressionAssignment_3();
 
             state._fsp--;
@@ -48538,16 +48275,16 @@ public final void rule__XForLoopExpression__Group__3__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16734:1: rule__XForLoopExpression__Group_0__0 : rule__XForLoopExpression__Group_0__0__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16640:1: rule__XForLoopExpression__Group_0__0 : rule__XForLoopExpression__Group_0__0__Impl ;
     public final void rule__XForLoopExpression__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16738:1: ( rule__XForLoopExpression__Group_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16739:2: rule__XForLoopExpression__Group_0__0__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16644:1: ( rule__XForLoopExpression__Group_0__0__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16645:2: rule__XForLoopExpression__Group_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0__0__Impl_in_rule__XForLoopExpression__Group_0__033973);
+            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0__0__Impl_in_rule__XForLoopExpression__Group_0__033787);
             rule__XForLoopExpression__Group_0__0__Impl();
 
             state._fsp--;
@@ -48571,25 +48308,25 @@ public final void rule__XForLoopExpression__Group_0__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16745:1: rule__XForLoopExpression__Group_0__0__Impl : ( ( rule__XForLoopExpression__Group_0_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16651:1: rule__XForLoopExpression__Group_0__0__Impl : ( ( rule__XForLoopExpression__Group_0_0__0 ) ) ;
     public final void rule__XForLoopExpression__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16749:1: ( ( ( rule__XForLoopExpression__Group_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16750:1: ( ( rule__XForLoopExpression__Group_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16655:1: ( ( ( rule__XForLoopExpression__Group_0_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16656:1: ( ( rule__XForLoopExpression__Group_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16750:1: ( ( rule__XForLoopExpression__Group_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16751:1: ( rule__XForLoopExpression__Group_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16656:1: ( ( rule__XForLoopExpression__Group_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16657:1: ( rule__XForLoopExpression__Group_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getGroup_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16752:1: ( rule__XForLoopExpression__Group_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16752:2: rule__XForLoopExpression__Group_0_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16658:1: ( rule__XForLoopExpression__Group_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16658:2: rule__XForLoopExpression__Group_0_0__0
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__0_in_rule__XForLoopExpression__Group_0__0__Impl34000);
+            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__0_in_rule__XForLoopExpression__Group_0__0__Impl33814);
             rule__XForLoopExpression__Group_0_0__0();
 
             state._fsp--;
@@ -48622,21 +48359,21 @@ public final void rule__XForLoopExpression__Group_0__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16764:1: rule__XForLoopExpression__Group_0_0__0 : rule__XForLoopExpression__Group_0_0__0__Impl rule__XForLoopExpression__Group_0_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16670:1: rule__XForLoopExpression__Group_0_0__0 : rule__XForLoopExpression__Group_0_0__0__Impl rule__XForLoopExpression__Group_0_0__1 ;
     public final void rule__XForLoopExpression__Group_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16768:1: ( rule__XForLoopExpression__Group_0_0__0__Impl rule__XForLoopExpression__Group_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16769:2: rule__XForLoopExpression__Group_0_0__0__Impl rule__XForLoopExpression__Group_0_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16674:1: ( rule__XForLoopExpression__Group_0_0__0__Impl rule__XForLoopExpression__Group_0_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16675:2: rule__XForLoopExpression__Group_0_0__0__Impl rule__XForLoopExpression__Group_0_0__1
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__0__Impl_in_rule__XForLoopExpression__Group_0_0__034032);
+            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__0__Impl_in_rule__XForLoopExpression__Group_0_0__033846);
             rule__XForLoopExpression__Group_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__1_in_rule__XForLoopExpression__Group_0_0__034035);
+            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__1_in_rule__XForLoopExpression__Group_0_0__033849);
             rule__XForLoopExpression__Group_0_0__1();
 
             state._fsp--;
@@ -48660,23 +48397,23 @@ public final void rule__XForLoopExpression__Group_0_0__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16776:1: rule__XForLoopExpression__Group_0_0__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16682:1: rule__XForLoopExpression__Group_0_0__0__Impl : ( () ) ;
     public final void rule__XForLoopExpression__Group_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16780:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16781:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16686:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16687:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16781:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16782:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16687:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16688:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getXForLoopExpressionAction_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16783:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16785:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16689:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16691:1: 
             {
             }
 
@@ -48701,21 +48438,21 @@ public final void rule__XForLoopExpression__Group_0_0__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16795:1: rule__XForLoopExpression__Group_0_0__1 : rule__XForLoopExpression__Group_0_0__1__Impl rule__XForLoopExpression__Group_0_0__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16701:1: rule__XForLoopExpression__Group_0_0__1 : rule__XForLoopExpression__Group_0_0__1__Impl rule__XForLoopExpression__Group_0_0__2 ;
     public final void rule__XForLoopExpression__Group_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16799:1: ( rule__XForLoopExpression__Group_0_0__1__Impl rule__XForLoopExpression__Group_0_0__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16800:2: rule__XForLoopExpression__Group_0_0__1__Impl rule__XForLoopExpression__Group_0_0__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16705:1: ( rule__XForLoopExpression__Group_0_0__1__Impl rule__XForLoopExpression__Group_0_0__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16706:2: rule__XForLoopExpression__Group_0_0__1__Impl rule__XForLoopExpression__Group_0_0__2
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__1__Impl_in_rule__XForLoopExpression__Group_0_0__134093);
+            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__1__Impl_in_rule__XForLoopExpression__Group_0_0__133907);
             rule__XForLoopExpression__Group_0_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__2_in_rule__XForLoopExpression__Group_0_0__134096);
+            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__2_in_rule__XForLoopExpression__Group_0_0__133910);
             rule__XForLoopExpression__Group_0_0__2();
 
             state._fsp--;
@@ -48739,22 +48476,22 @@ public final void rule__XForLoopExpression__Group_0_0__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16807:1: rule__XForLoopExpression__Group_0_0__1__Impl : ( 'for' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16713:1: rule__XForLoopExpression__Group_0_0__1__Impl : ( 'for' ) ;
     public final void rule__XForLoopExpression__Group_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16811:1: ( ( 'for' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16812:1: ( 'for' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16717:1: ( ( 'for' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16718:1: ( 'for' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16812:1: ( 'for' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16813:1: 'for'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16718:1: ( 'for' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16719:1: 'for'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getForKeyword_0_0_1()); 
             }
-            match(input,70,FOLLOW_70_in_rule__XForLoopExpression__Group_0_0__1__Impl34124); if (state.failed) return ;
+            match(input,70,FOLLOW_70_in_rule__XForLoopExpression__Group_0_0__1__Impl33938); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXForLoopExpressionAccess().getForKeyword_0_0_1()); 
             }
@@ -48780,21 +48517,21 @@ public final void rule__XForLoopExpression__Group_0_0__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16826:1: rule__XForLoopExpression__Group_0_0__2 : rule__XForLoopExpression__Group_0_0__2__Impl rule__XForLoopExpression__Group_0_0__3 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16732:1: rule__XForLoopExpression__Group_0_0__2 : rule__XForLoopExpression__Group_0_0__2__Impl rule__XForLoopExpression__Group_0_0__3 ;
     public final void rule__XForLoopExpression__Group_0_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16830:1: ( rule__XForLoopExpression__Group_0_0__2__Impl rule__XForLoopExpression__Group_0_0__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16831:2: rule__XForLoopExpression__Group_0_0__2__Impl rule__XForLoopExpression__Group_0_0__3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16736:1: ( rule__XForLoopExpression__Group_0_0__2__Impl rule__XForLoopExpression__Group_0_0__3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16737:2: rule__XForLoopExpression__Group_0_0__2__Impl rule__XForLoopExpression__Group_0_0__3
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__2__Impl_in_rule__XForLoopExpression__Group_0_0__234155);
+            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__2__Impl_in_rule__XForLoopExpression__Group_0_0__233969);
             rule__XForLoopExpression__Group_0_0__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__3_in_rule__XForLoopExpression__Group_0_0__234158);
+            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__3_in_rule__XForLoopExpression__Group_0_0__233972);
             rule__XForLoopExpression__Group_0_0__3();
 
             state._fsp--;
@@ -48818,22 +48555,22 @@ public final void rule__XForLoopExpression__Group_0_0__2() throws RecognitionExc
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16838:1: rule__XForLoopExpression__Group_0_0__2__Impl : ( '(' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16744:1: rule__XForLoopExpression__Group_0_0__2__Impl : ( '(' ) ;
     public final void rule__XForLoopExpression__Group_0_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16842:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16843:1: ( '(' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16748:1: ( ( '(' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16749:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16843:1: ( '(' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16844:1: '('
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16749:1: ( '(' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16750:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getLeftParenthesisKeyword_0_0_2()); 
             }
-            match(input,72,FOLLOW_72_in_rule__XForLoopExpression__Group_0_0__2__Impl34186); if (state.failed) return ;
+            match(input,72,FOLLOW_72_in_rule__XForLoopExpression__Group_0_0__2__Impl34000); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXForLoopExpressionAccess().getLeftParenthesisKeyword_0_0_2()); 
             }
@@ -48859,21 +48596,21 @@ public final void rule__XForLoopExpression__Group_0_0__2__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16857:1: rule__XForLoopExpression__Group_0_0__3 : rule__XForLoopExpression__Group_0_0__3__Impl rule__XForLoopExpression__Group_0_0__4 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16763:1: rule__XForLoopExpression__Group_0_0__3 : rule__XForLoopExpression__Group_0_0__3__Impl rule__XForLoopExpression__Group_0_0__4 ;
     public final void rule__XForLoopExpression__Group_0_0__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16861:1: ( rule__XForLoopExpression__Group_0_0__3__Impl rule__XForLoopExpression__Group_0_0__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16862:2: rule__XForLoopExpression__Group_0_0__3__Impl rule__XForLoopExpression__Group_0_0__4
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16767:1: ( rule__XForLoopExpression__Group_0_0__3__Impl rule__XForLoopExpression__Group_0_0__4 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16768:2: rule__XForLoopExpression__Group_0_0__3__Impl rule__XForLoopExpression__Group_0_0__4
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__3__Impl_in_rule__XForLoopExpression__Group_0_0__334217);
+            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__3__Impl_in_rule__XForLoopExpression__Group_0_0__334031);
             rule__XForLoopExpression__Group_0_0__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__4_in_rule__XForLoopExpression__Group_0_0__334220);
+            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__4_in_rule__XForLoopExpression__Group_0_0__334034);
             rule__XForLoopExpression__Group_0_0__4();
 
             state._fsp--;
@@ -48897,25 +48634,25 @@ public final void rule__XForLoopExpression__Group_0_0__3() throws RecognitionExc
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16869:1: rule__XForLoopExpression__Group_0_0__3__Impl : ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16775:1: rule__XForLoopExpression__Group_0_0__3__Impl : ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) ) ;
     public final void rule__XForLoopExpression__Group_0_0__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16873:1: ( ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16874:1: ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16779:1: ( ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16780:1: ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16874:1: ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16875:1: ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16780:1: ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16781:1: ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getDeclaredParamAssignment_0_0_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16876:1: ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16876:2: rule__XForLoopExpression__DeclaredParamAssignment_0_0_3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16782:1: ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16782:2: rule__XForLoopExpression__DeclaredParamAssignment_0_0_3
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__DeclaredParamAssignment_0_0_3_in_rule__XForLoopExpression__Group_0_0__3__Impl34247);
+            pushFollow(FOLLOW_rule__XForLoopExpression__DeclaredParamAssignment_0_0_3_in_rule__XForLoopExpression__Group_0_0__3__Impl34061);
             rule__XForLoopExpression__DeclaredParamAssignment_0_0_3();
 
             state._fsp--;
@@ -48948,16 +48685,16 @@ public final void rule__XForLoopExpression__Group_0_0__3__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16886:1: rule__XForLoopExpression__Group_0_0__4 : rule__XForLoopExpression__Group_0_0__4__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16792:1: rule__XForLoopExpression__Group_0_0__4 : rule__XForLoopExpression__Group_0_0__4__Impl ;
     public final void rule__XForLoopExpression__Group_0_0__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16890:1: ( rule__XForLoopExpression__Group_0_0__4__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16891:2: rule__XForLoopExpression__Group_0_0__4__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16796:1: ( rule__XForLoopExpression__Group_0_0__4__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16797:2: rule__XForLoopExpression__Group_0_0__4__Impl
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__4__Impl_in_rule__XForLoopExpression__Group_0_0__434277);
+            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__4__Impl_in_rule__XForLoopExpression__Group_0_0__434091);
             rule__XForLoopExpression__Group_0_0__4__Impl();
 
             state._fsp--;
@@ -48981,22 +48718,22 @@ public final void rule__XForLoopExpression__Group_0_0__4() throws RecognitionExc
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16897:1: rule__XForLoopExpression__Group_0_0__4__Impl : ( ':' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16803:1: rule__XForLoopExpression__Group_0_0__4__Impl : ( ':' ) ;
     public final void rule__XForLoopExpression__Group_0_0__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16901:1: ( ( ':' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16902:1: ( ':' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16807:1: ( ( ':' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16808:1: ( ':' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16902:1: ( ':' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16903:1: ':'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16808:1: ( ':' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16809:1: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getColonKeyword_0_0_4()); 
             }
-            match(input,87,FOLLOW_87_in_rule__XForLoopExpression__Group_0_0__4__Impl34305); if (state.failed) return ;
+            match(input,87,FOLLOW_87_in_rule__XForLoopExpression__Group_0_0__4__Impl34119); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXForLoopExpressionAccess().getColonKeyword_0_0_4()); 
             }
@@ -49022,21 +48759,21 @@ public final void rule__XForLoopExpression__Group_0_0__4__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16926:1: rule__XBasicForLoopExpression__Group__0 : rule__XBasicForLoopExpression__Group__0__Impl rule__XBasicForLoopExpression__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16832:1: rule__XBasicForLoopExpression__Group__0 : rule__XBasicForLoopExpression__Group__0__Impl rule__XBasicForLoopExpression__Group__1 ;
     public final void rule__XBasicForLoopExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16930:1: ( rule__XBasicForLoopExpression__Group__0__Impl rule__XBasicForLoopExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16931:2: rule__XBasicForLoopExpression__Group__0__Impl rule__XBasicForLoopExpression__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16836:1: ( rule__XBasicForLoopExpression__Group__0__Impl rule__XBasicForLoopExpression__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16837:2: rule__XBasicForLoopExpression__Group__0__Impl rule__XBasicForLoopExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__0__Impl_in_rule__XBasicForLoopExpression__Group__034346);
+            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__0__Impl_in_rule__XBasicForLoopExpression__Group__034160);
             rule__XBasicForLoopExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__1_in_rule__XBasicForLoopExpression__Group__034349);
+            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__1_in_rule__XBasicForLoopExpression__Group__034163);
             rule__XBasicForLoopExpression__Group__1();
 
             state._fsp--;
@@ -49060,23 +48797,23 @@ public final void rule__XBasicForLoopExpression__Group__0() throws RecognitionEx
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16938:1: rule__XBasicForLoopExpression__Group__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16844:1: rule__XBasicForLoopExpression__Group__0__Impl : ( () ) ;
     public final void rule__XBasicForLoopExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16942:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16943:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16848:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16849:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16943:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16944:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16849:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16850:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getXBasicForLoopExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16945:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16947:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16851:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16853:1: 
             {
             }
 
@@ -49101,21 +48838,21 @@ public final void rule__XBasicForLoopExpression__Group__0__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16957:1: rule__XBasicForLoopExpression__Group__1 : rule__XBasicForLoopExpression__Group__1__Impl rule__XBasicForLoopExpression__Group__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16863:1: rule__XBasicForLoopExpression__Group__1 : rule__XBasicForLoopExpression__Group__1__Impl rule__XBasicForLoopExpression__Group__2 ;
     public final void rule__XBasicForLoopExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16961:1: ( rule__XBasicForLoopExpression__Group__1__Impl rule__XBasicForLoopExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16962:2: rule__XBasicForLoopExpression__Group__1__Impl rule__XBasicForLoopExpression__Group__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16867:1: ( rule__XBasicForLoopExpression__Group__1__Impl rule__XBasicForLoopExpression__Group__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16868:2: rule__XBasicForLoopExpression__Group__1__Impl rule__XBasicForLoopExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__1__Impl_in_rule__XBasicForLoopExpression__Group__134407);
+            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__1__Impl_in_rule__XBasicForLoopExpression__Group__134221);
             rule__XBasicForLoopExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__2_in_rule__XBasicForLoopExpression__Group__134410);
+            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__2_in_rule__XBasicForLoopExpression__Group__134224);
             rule__XBasicForLoopExpression__Group__2();
 
             state._fsp--;
@@ -49139,22 +48876,22 @@ public final void rule__XBasicForLoopExpression__Group__1() throws RecognitionEx
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16969:1: rule__XBasicForLoopExpression__Group__1__Impl : ( 'for' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16875:1: rule__XBasicForLoopExpression__Group__1__Impl : ( 'for' ) ;
     public final void rule__XBasicForLoopExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16973:1: ( ( 'for' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16974:1: ( 'for' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16879:1: ( ( 'for' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16880:1: ( 'for' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16974:1: ( 'for' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16975:1: 'for'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16880:1: ( 'for' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16881:1: 'for'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getForKeyword_1()); 
             }
-            match(input,70,FOLLOW_70_in_rule__XBasicForLoopExpression__Group__1__Impl34438); if (state.failed) return ;
+            match(input,70,FOLLOW_70_in_rule__XBasicForLoopExpression__Group__1__Impl34252); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBasicForLoopExpressionAccess().getForKeyword_1()); 
             }
@@ -49180,21 +48917,21 @@ public final void rule__XBasicForLoopExpression__Group__1__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16988:1: rule__XBasicForLoopExpression__Group__2 : rule__XBasicForLoopExpression__Group__2__Impl rule__XBasicForLoopExpression__Group__3 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16894:1: rule__XBasicForLoopExpression__Group__2 : rule__XBasicForLoopExpression__Group__2__Impl rule__XBasicForLoopExpression__Group__3 ;
     public final void rule__XBasicForLoopExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16992:1: ( rule__XBasicForLoopExpression__Group__2__Impl rule__XBasicForLoopExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16993:2: rule__XBasicForLoopExpression__Group__2__Impl rule__XBasicForLoopExpression__Group__3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16898:1: ( rule__XBasicForLoopExpression__Group__2__Impl rule__XBasicForLoopExpression__Group__3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16899:2: rule__XBasicForLoopExpression__Group__2__Impl rule__XBasicForLoopExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__2__Impl_in_rule__XBasicForLoopExpression__Group__234469);
+            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__2__Impl_in_rule__XBasicForLoopExpression__Group__234283);
             rule__XBasicForLoopExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__3_in_rule__XBasicForLoopExpression__Group__234472);
+            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__3_in_rule__XBasicForLoopExpression__Group__234286);
             rule__XBasicForLoopExpression__Group__3();
 
             state._fsp--;
@@ -49218,22 +48955,22 @@ public final void rule__XBasicForLoopExpression__Group__2() throws RecognitionEx
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17000:1: rule__XBasicForLoopExpression__Group__2__Impl : ( '(' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16906:1: rule__XBasicForLoopExpression__Group__2__Impl : ( '(' ) ;
     public final void rule__XBasicForLoopExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17004:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17005:1: ( '(' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16910:1: ( ( '(' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16911:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17005:1: ( '(' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17006:1: '('
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16911:1: ( '(' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16912:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getLeftParenthesisKeyword_2()); 
             }
-            match(input,72,FOLLOW_72_in_rule__XBasicForLoopExpression__Group__2__Impl34500); if (state.failed) return ;
+            match(input,72,FOLLOW_72_in_rule__XBasicForLoopExpression__Group__2__Impl34314); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBasicForLoopExpressionAccess().getLeftParenthesisKeyword_2()); 
             }
@@ -49259,21 +48996,21 @@ public final void rule__XBasicForLoopExpression__Group__2__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17019:1: rule__XBasicForLoopExpression__Group__3 : rule__XBasicForLoopExpression__Group__3__Impl rule__XBasicForLoopExpression__Group__4 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16925:1: rule__XBasicForLoopExpression__Group__3 : rule__XBasicForLoopExpression__Group__3__Impl rule__XBasicForLoopExpression__Group__4 ;
     public final void rule__XBasicForLoopExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17023:1: ( rule__XBasicForLoopExpression__Group__3__Impl rule__XBasicForLoopExpression__Group__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17024:2: rule__XBasicForLoopExpression__Group__3__Impl rule__XBasicForLoopExpression__Group__4
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16929:1: ( rule__XBasicForLoopExpression__Group__3__Impl rule__XBasicForLoopExpression__Group__4 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16930:2: rule__XBasicForLoopExpression__Group__3__Impl rule__XBasicForLoopExpression__Group__4
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__3__Impl_in_rule__XBasicForLoopExpression__Group__334531);
+            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__3__Impl_in_rule__XBasicForLoopExpression__Group__334345);
             rule__XBasicForLoopExpression__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__4_in_rule__XBasicForLoopExpression__Group__334534);
+            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__4_in_rule__XBasicForLoopExpression__Group__334348);
             rule__XBasicForLoopExpression__Group__4();
 
             state._fsp--;
@@ -49297,33 +49034,33 @@ public final void rule__XBasicForLoopExpression__Group__3() throws RecognitionEx
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17031:1: rule__XBasicForLoopExpression__Group__3__Impl : ( ( rule__XBasicForLoopExpression__Group_3__0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16937:1: rule__XBasicForLoopExpression__Group__3__Impl : ( ( rule__XBasicForLoopExpression__Group_3__0 )? ) ;
     public final void rule__XBasicForLoopExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17035:1: ( ( ( rule__XBasicForLoopExpression__Group_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17036:1: ( ( rule__XBasicForLoopExpression__Group_3__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16941:1: ( ( ( rule__XBasicForLoopExpression__Group_3__0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16942:1: ( ( rule__XBasicForLoopExpression__Group_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17036:1: ( ( rule__XBasicForLoopExpression__Group_3__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17037:1: ( rule__XBasicForLoopExpression__Group_3__0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16942:1: ( ( rule__XBasicForLoopExpression__Group_3__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16943:1: ( rule__XBasicForLoopExpression__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getGroup_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17038:1: ( rule__XBasicForLoopExpression__Group_3__0 )?
-            int alt129=2;
-            int LA129_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16944:1: ( rule__XBasicForLoopExpression__Group_3__0 )?
+            int alt128=2;
+            int LA128_0 = input.LA(1);
 
-            if ( ((LA129_0>=RULE_ID && LA129_0<=RULE_STRING)||(LA129_0>=16 && LA129_0<=35)||LA129_0==47||(LA129_0>=54 && LA129_0<=55)||LA129_0==60||(LA129_0>=64 && LA129_0<=66)||LA129_0==68||LA129_0==70||LA129_0==72||(LA129_0>=77 && LA129_0<=78)||(LA129_0>=80 && LA129_0<=81)||LA129_0==84||LA129_0==86||(LA129_0>=90 && LA129_0<=97)||LA129_0==99||(LA129_0>=107 && LA129_0<=108)) ) {
-                alt129=1;
+            if ( ((LA128_0>=RULE_ID && LA128_0<=RULE_STRING)||(LA128_0>=16 && LA128_0<=35)||LA128_0==47||(LA128_0>=54 && LA128_0<=55)||LA128_0==60||(LA128_0>=64 && LA128_0<=66)||LA128_0==68||LA128_0==70||LA128_0==72||(LA128_0>=77 && LA128_0<=78)||(LA128_0>=80 && LA128_0<=81)||LA128_0==84||LA128_0==86||(LA128_0>=90 && LA128_0<=97)||LA128_0==99||(LA128_0>=107 && LA128_0<=108)) ) {
+                alt128=1;
             }
-            switch (alt129) {
+            switch (alt128) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17038:2: rule__XBasicForLoopExpression__Group_3__0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16944:2: rule__XBasicForLoopExpression__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_3__0_in_rule__XBasicForLoopExpression__Group__3__Impl34561);
+                    pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_3__0_in_rule__XBasicForLoopExpression__Group__3__Impl34375);
                     rule__XBasicForLoopExpression__Group_3__0();
 
                     state._fsp--;
@@ -49359,21 +49096,21 @@ public final void rule__XBasicForLoopExpression__Group__3__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17048:1: rule__XBasicForLoopExpression__Group__4 : rule__XBasicForLoopExpression__Group__4__Impl rule__XBasicForLoopExpression__Group__5 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16954:1: rule__XBasicForLoopExpression__Group__4 : rule__XBasicForLoopExpression__Group__4__Impl rule__XBasicForLoopExpression__Group__5 ;
     public final void rule__XBasicForLoopExpression__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17052:1: ( rule__XBasicForLoopExpression__Group__4__Impl rule__XBasicForLoopExpression__Group__5 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17053:2: rule__XBasicForLoopExpression__Group__4__Impl rule__XBasicForLoopExpression__Group__5
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16958:1: ( rule__XBasicForLoopExpression__Group__4__Impl rule__XBasicForLoopExpression__Group__5 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16959:2: rule__XBasicForLoopExpression__Group__4__Impl rule__XBasicForLoopExpression__Group__5
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__4__Impl_in_rule__XBasicForLoopExpression__Group__434592);
+            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__4__Impl_in_rule__XBasicForLoopExpression__Group__434406);
             rule__XBasicForLoopExpression__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__5_in_rule__XBasicForLoopExpression__Group__434595);
+            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__5_in_rule__XBasicForLoopExpression__Group__434409);
             rule__XBasicForLoopExpression__Group__5();
 
             state._fsp--;
@@ -49397,22 +49134,22 @@ public final void rule__XBasicForLoopExpression__Group__4() throws RecognitionEx
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17060:1: rule__XBasicForLoopExpression__Group__4__Impl : ( ';' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16966:1: rule__XBasicForLoopExpression__Group__4__Impl : ( ';' ) ;
     public final void rule__XBasicForLoopExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17064:1: ( ( ';' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17065:1: ( ';' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16970:1: ( ( ';' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16971:1: ( ';' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17065:1: ( ';' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17066:1: ';'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16971:1: ( ';' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16972:1: ';'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getSemicolonKeyword_4()); 
             }
-            match(input,71,FOLLOW_71_in_rule__XBasicForLoopExpression__Group__4__Impl34623); if (state.failed) return ;
+            match(input,71,FOLLOW_71_in_rule__XBasicForLoopExpression__Group__4__Impl34437); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBasicForLoopExpressionAccess().getSemicolonKeyword_4()); 
             }
@@ -49438,21 +49175,21 @@ public final void rule__XBasicForLoopExpression__Group__4__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__5"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17079:1: rule__XBasicForLoopExpression__Group__5 : rule__XBasicForLoopExpression__Group__5__Impl rule__XBasicForLoopExpression__Group__6 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16985:1: rule__XBasicForLoopExpression__Group__5 : rule__XBasicForLoopExpression__Group__5__Impl rule__XBasicForLoopExpression__Group__6 ;
     public final void rule__XBasicForLoopExpression__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17083:1: ( rule__XBasicForLoopExpression__Group__5__Impl rule__XBasicForLoopExpression__Group__6 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17084:2: rule__XBasicForLoopExpression__Group__5__Impl rule__XBasicForLoopExpression__Group__6
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16989:1: ( rule__XBasicForLoopExpression__Group__5__Impl rule__XBasicForLoopExpression__Group__6 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16990:2: rule__XBasicForLoopExpression__Group__5__Impl rule__XBasicForLoopExpression__Group__6
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__5__Impl_in_rule__XBasicForLoopExpression__Group__534654);
+            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__5__Impl_in_rule__XBasicForLoopExpression__Group__534468);
             rule__XBasicForLoopExpression__Group__5__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__6_in_rule__XBasicForLoopExpression__Group__534657);
+            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__6_in_rule__XBasicForLoopExpression__Group__534471);
             rule__XBasicForLoopExpression__Group__6();
 
             state._fsp--;
@@ -49476,33 +49213,33 @@ public final void rule__XBasicForLoopExpression__Group__5() throws RecognitionEx
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17091:1: rule__XBasicForLoopExpression__Group__5__Impl : ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16997:1: rule__XBasicForLoopExpression__Group__5__Impl : ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? ) ;
     public final void rule__XBasicForLoopExpression__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17095:1: ( ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17096:1: ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17001:1: ( ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17002:1: ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17096:1: ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17097:1: ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17002:1: ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17003:1: ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getExpressionAssignment_5()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17098:1: ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )?
-            int alt130=2;
-            int LA130_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17004:1: ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )?
+            int alt129=2;
+            int LA129_0 = input.LA(1);
 
-            if ( ((LA130_0>=RULE_ID && LA130_0<=RULE_STRING)||(LA130_0>=16 && LA130_0<=35)||LA130_0==47||(LA130_0>=54 && LA130_0<=55)||LA130_0==60||(LA130_0>=65 && LA130_0<=66)||LA130_0==68||LA130_0==70||LA130_0==72||(LA130_0>=77 && LA130_0<=78)||(LA130_0>=80 && LA130_0<=81)||LA130_0==84||LA130_0==86||(LA130_0>=90 && LA130_0<=97)||LA130_0==99||LA130_0==108) ) {
-                alt130=1;
+            if ( ((LA129_0>=RULE_ID && LA129_0<=RULE_STRING)||(LA129_0>=16 && LA129_0<=35)||LA129_0==47||(LA129_0>=54 && LA129_0<=55)||LA129_0==60||(LA129_0>=65 && LA129_0<=66)||LA129_0==68||LA129_0==70||LA129_0==72||(LA129_0>=77 && LA129_0<=78)||(LA129_0>=80 && LA129_0<=81)||LA129_0==84||LA129_0==86||(LA129_0>=90 && LA129_0<=97)||LA129_0==99||LA129_0==108) ) {
+                alt129=1;
             }
-            switch (alt130) {
+            switch (alt129) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17098:2: rule__XBasicForLoopExpression__ExpressionAssignment_5
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17004:2: rule__XBasicForLoopExpression__ExpressionAssignment_5
                     {
-                    pushFollow(FOLLOW_rule__XBasicForLoopExpression__ExpressionAssignment_5_in_rule__XBasicForLoopExpression__Group__5__Impl34684);
+                    pushFollow(FOLLOW_rule__XBasicForLoopExpression__ExpressionAssignment_5_in_rule__XBasicForLoopExpression__Group__5__Impl34498);
                     rule__XBasicForLoopExpression__ExpressionAssignment_5();
 
                     state._fsp--;
@@ -49538,21 +49275,21 @@ public final void rule__XBasicForLoopExpression__Group__5__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__6"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17108:1: rule__XBasicForLoopExpression__Group__6 : rule__XBasicForLoopExpression__Group__6__Impl rule__XBasicForLoopExpression__Group__7 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17014:1: rule__XBasicForLoopExpression__Group__6 : rule__XBasicForLoopExpression__Group__6__Impl rule__XBasicForLoopExpression__Group__7 ;
     public final void rule__XBasicForLoopExpression__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17112:1: ( rule__XBasicForLoopExpression__Group__6__Impl rule__XBasicForLoopExpression__Group__7 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17113:2: rule__XBasicForLoopExpression__Group__6__Impl rule__XBasicForLoopExpression__Group__7
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17018:1: ( rule__XBasicForLoopExpression__Group__6__Impl rule__XBasicForLoopExpression__Group__7 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17019:2: rule__XBasicForLoopExpression__Group__6__Impl rule__XBasicForLoopExpression__Group__7
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__6__Impl_in_rule__XBasicForLoopExpression__Group__634715);
+            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__6__Impl_in_rule__XBasicForLoopExpression__Group__634529);
             rule__XBasicForLoopExpression__Group__6__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__7_in_rule__XBasicForLoopExpression__Group__634718);
+            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__7_in_rule__XBasicForLoopExpression__Group__634532);
             rule__XBasicForLoopExpression__Group__7();
 
             state._fsp--;
@@ -49576,22 +49313,22 @@ public final void rule__XBasicForLoopExpression__Group__6() throws RecognitionEx
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__6__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17120:1: rule__XBasicForLoopExpression__Group__6__Impl : ( ';' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17026:1: rule__XBasicForLoopExpression__Group__6__Impl : ( ';' ) ;
     public final void rule__XBasicForLoopExpression__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17124:1: ( ( ';' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17125:1: ( ';' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17030:1: ( ( ';' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17031:1: ( ';' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17125:1: ( ';' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17126:1: ';'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17031:1: ( ';' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17032:1: ';'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getSemicolonKeyword_6()); 
             }
-            match(input,71,FOLLOW_71_in_rule__XBasicForLoopExpression__Group__6__Impl34746); if (state.failed) return ;
+            match(input,71,FOLLOW_71_in_rule__XBasicForLoopExpression__Group__6__Impl34560); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBasicForLoopExpressionAccess().getSemicolonKeyword_6()); 
             }
@@ -49617,21 +49354,21 @@ public final void rule__XBasicForLoopExpression__Group__6__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__7"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17139:1: rule__XBasicForLoopExpression__Group__7 : rule__XBasicForLoopExpression__Group__7__Impl rule__XBasicForLoopExpression__Group__8 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17045:1: rule__XBasicForLoopExpression__Group__7 : rule__XBasicForLoopExpression__Group__7__Impl rule__XBasicForLoopExpression__Group__8 ;
     public final void rule__XBasicForLoopExpression__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17143:1: ( rule__XBasicForLoopExpression__Group__7__Impl rule__XBasicForLoopExpression__Group__8 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17144:2: rule__XBasicForLoopExpression__Group__7__Impl rule__XBasicForLoopExpression__Group__8
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17049:1: ( rule__XBasicForLoopExpression__Group__7__Impl rule__XBasicForLoopExpression__Group__8 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17050:2: rule__XBasicForLoopExpression__Group__7__Impl rule__XBasicForLoopExpression__Group__8
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__7__Impl_in_rule__XBasicForLoopExpression__Group__734777);
+            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__7__Impl_in_rule__XBasicForLoopExpression__Group__734591);
             rule__XBasicForLoopExpression__Group__7__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__8_in_rule__XBasicForLoopExpression__Group__734780);
+            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__8_in_rule__XBasicForLoopExpression__Group__734594);
             rule__XBasicForLoopExpression__Group__8();
 
             state._fsp--;
@@ -49655,33 +49392,33 @@ public final void rule__XBasicForLoopExpression__Group__7() throws RecognitionEx
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__7__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17151:1: rule__XBasicForLoopExpression__Group__7__Impl : ( ( rule__XBasicForLoopExpression__Group_7__0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17057:1: rule__XBasicForLoopExpression__Group__7__Impl : ( ( rule__XBasicForLoopExpression__Group_7__0 )? ) ;
     public final void rule__XBasicForLoopExpression__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17155:1: ( ( ( rule__XBasicForLoopExpression__Group_7__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17156:1: ( ( rule__XBasicForLoopExpression__Group_7__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17061:1: ( ( ( rule__XBasicForLoopExpression__Group_7__0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17062:1: ( ( rule__XBasicForLoopExpression__Group_7__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17156:1: ( ( rule__XBasicForLoopExpression__Group_7__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17157:1: ( rule__XBasicForLoopExpression__Group_7__0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17062:1: ( ( rule__XBasicForLoopExpression__Group_7__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17063:1: ( rule__XBasicForLoopExpression__Group_7__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getGroup_7()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17158:1: ( rule__XBasicForLoopExpression__Group_7__0 )?
-            int alt131=2;
-            int LA131_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17064:1: ( rule__XBasicForLoopExpression__Group_7__0 )?
+            int alt130=2;
+            int LA130_0 = input.LA(1);
 
-            if ( ((LA131_0>=RULE_ID && LA131_0<=RULE_STRING)||(LA131_0>=16 && LA131_0<=35)||LA131_0==47||(LA131_0>=54 && LA131_0<=55)||LA131_0==60||(LA131_0>=65 && LA131_0<=66)||LA131_0==68||LA131_0==70||LA131_0==72||(LA131_0>=77 && LA131_0<=78)||(LA131_0>=80 && LA131_0<=81)||LA131_0==84||LA131_0==86||(LA131_0>=90 && LA131_0<=97)||LA131_0==99||LA131_0==108) ) {
-                alt131=1;
+            if ( ((LA130_0>=RULE_ID && LA130_0<=RULE_STRING)||(LA130_0>=16 && LA130_0<=35)||LA130_0==47||(LA130_0>=54 && LA130_0<=55)||LA130_0==60||(LA130_0>=65 && LA130_0<=66)||LA130_0==68||LA130_0==70||LA130_0==72||(LA130_0>=77 && LA130_0<=78)||(LA130_0>=80 && LA130_0<=81)||LA130_0==84||LA130_0==86||(LA130_0>=90 && LA130_0<=97)||LA130_0==99||LA130_0==108) ) {
+                alt130=1;
             }
-            switch (alt131) {
+            switch (alt130) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17158:2: rule__XBasicForLoopExpression__Group_7__0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17064:2: rule__XBasicForLoopExpression__Group_7__0
                     {
-                    pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_7__0_in_rule__XBasicForLoopExpression__Group__7__Impl34807);
+                    pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_7__0_in_rule__XBasicForLoopExpression__Group__7__Impl34621);
                     rule__XBasicForLoopExpression__Group_7__0();
 
                     state._fsp--;
@@ -49717,21 +49454,21 @@ public final void rule__XBasicForLoopExpression__Group__7__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__8"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17168:1: rule__XBasicForLoopExpression__Group__8 : rule__XBasicForLoopExpression__Group__8__Impl rule__XBasicForLoopExpression__Group__9 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17074:1: rule__XBasicForLoopExpression__Group__8 : rule__XBasicForLoopExpression__Group__8__Impl rule__XBasicForLoopExpression__Group__9 ;
     public final void rule__XBasicForLoopExpression__Group__8() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17172:1: ( rule__XBasicForLoopExpression__Group__8__Impl rule__XBasicForLoopExpression__Group__9 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17173:2: rule__XBasicForLoopExpression__Group__8__Impl rule__XBasicForLoopExpression__Group__9
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17078:1: ( rule__XBasicForLoopExpression__Group__8__Impl rule__XBasicForLoopExpression__Group__9 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17079:2: rule__XBasicForLoopExpression__Group__8__Impl rule__XBasicForLoopExpression__Group__9
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__8__Impl_in_rule__XBasicForLoopExpression__Group__834838);
+            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__8__Impl_in_rule__XBasicForLoopExpression__Group__834652);
             rule__XBasicForLoopExpression__Group__8__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__9_in_rule__XBasicForLoopExpression__Group__834841);
+            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__9_in_rule__XBasicForLoopExpression__Group__834655);
             rule__XBasicForLoopExpression__Group__9();
 
             state._fsp--;
@@ -49755,22 +49492,22 @@ public final void rule__XBasicForLoopExpression__Group__8() throws RecognitionEx
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__8__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17180:1: rule__XBasicForLoopExpression__Group__8__Impl : ( ')' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17086:1: rule__XBasicForLoopExpression__Group__8__Impl : ( ')' ) ;
     public final void rule__XBasicForLoopExpression__Group__8__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17184:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17185:1: ( ')' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17090:1: ( ( ')' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17091:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17185:1: ( ')' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17186:1: ')'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17091:1: ( ')' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17092:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getRightParenthesisKeyword_8()); 
             }
-            match(input,73,FOLLOW_73_in_rule__XBasicForLoopExpression__Group__8__Impl34869); if (state.failed) return ;
+            match(input,73,FOLLOW_73_in_rule__XBasicForLoopExpression__Group__8__Impl34683); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBasicForLoopExpressionAccess().getRightParenthesisKeyword_8()); 
             }
@@ -49796,16 +49533,16 @@ public final void rule__XBasicForLoopExpression__Group__8__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__9"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17199:1: rule__XBasicForLoopExpression__Group__9 : rule__XBasicForLoopExpression__Group__9__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17105:1: rule__XBasicForLoopExpression__Group__9 : rule__XBasicForLoopExpression__Group__9__Impl ;
     public final void rule__XBasicForLoopExpression__Group__9() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17203:1: ( rule__XBasicForLoopExpression__Group__9__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17204:2: rule__XBasicForLoopExpression__Group__9__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17109:1: ( rule__XBasicForLoopExpression__Group__9__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17110:2: rule__XBasicForLoopExpression__Group__9__Impl
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__9__Impl_in_rule__XBasicForLoopExpression__Group__934900);
+            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__9__Impl_in_rule__XBasicForLoopExpression__Group__934714);
             rule__XBasicForLoopExpression__Group__9__Impl();
 
             state._fsp--;
@@ -49829,25 +49566,25 @@ public final void rule__XBasicForLoopExpression__Group__9() throws RecognitionEx
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__9__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17210:1: rule__XBasicForLoopExpression__Group__9__Impl : ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17116:1: rule__XBasicForLoopExpression__Group__9__Impl : ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) ) ;
     public final void rule__XBasicForLoopExpression__Group__9__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17214:1: ( ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17215:1: ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17120:1: ( ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17121:1: ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17215:1: ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17216:1: ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17121:1: ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17122:1: ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getEachExpressionAssignment_9()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17217:1: ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17217:2: rule__XBasicForLoopExpression__EachExpressionAssignment_9
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17123:1: ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17123:2: rule__XBasicForLoopExpression__EachExpressionAssignment_9
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__EachExpressionAssignment_9_in_rule__XBasicForLoopExpression__Group__9__Impl34927);
+            pushFollow(FOLLOW_rule__XBasicForLoopExpression__EachExpressionAssignment_9_in_rule__XBasicForLoopExpression__Group__9__Impl34741);
             rule__XBasicForLoopExpression__EachExpressionAssignment_9();
 
             state._fsp--;
@@ -49880,21 +49617,21 @@ public final void rule__XBasicForLoopExpression__Group__9__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17247:1: rule__XBasicForLoopExpression__Group_3__0 : rule__XBasicForLoopExpression__Group_3__0__Impl rule__XBasicForLoopExpression__Group_3__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17153:1: rule__XBasicForLoopExpression__Group_3__0 : rule__XBasicForLoopExpression__Group_3__0__Impl rule__XBasicForLoopExpression__Group_3__1 ;
     public final void rule__XBasicForLoopExpression__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17251:1: ( rule__XBasicForLoopExpression__Group_3__0__Impl rule__XBasicForLoopExpression__Group_3__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17252:2: rule__XBasicForLoopExpression__Group_3__0__Impl rule__XBasicForLoopExpression__Group_3__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17157:1: ( rule__XBasicForLoopExpression__Group_3__0__Impl rule__XBasicForLoopExpression__Group_3__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17158:2: rule__XBasicForLoopExpression__Group_3__0__Impl rule__XBasicForLoopExpression__Group_3__1
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_3__0__Impl_in_rule__XBasicForLoopExpression__Group_3__034977);
+            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_3__0__Impl_in_rule__XBasicForLoopExpression__Group_3__034791);
             rule__XBasicForLoopExpression__Group_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_3__1_in_rule__XBasicForLoopExpression__Group_3__034980);
+            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_3__1_in_rule__XBasicForLoopExpression__Group_3__034794);
             rule__XBasicForLoopExpression__Group_3__1();
 
             state._fsp--;
@@ -49918,25 +49655,25 @@ public final void rule__XBasicForLoopExpression__Group_3__0() throws Recognition
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17259:1: rule__XBasicForLoopExpression__Group_3__0__Impl : ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17165:1: rule__XBasicForLoopExpression__Group_3__0__Impl : ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) ) ;
     public final void rule__XBasicForLoopExpression__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17263:1: ( ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17264:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17169:1: ( ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17170:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17264:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17265:1: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17170:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17171:1: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getInitExpressionsAssignment_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17266:1: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17266:2: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17172:1: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17172:2: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0_in_rule__XBasicForLoopExpression__Group_3__0__Impl35007);
+            pushFollow(FOLLOW_rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0_in_rule__XBasicForLoopExpression__Group_3__0__Impl34821);
             rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0();
 
             state._fsp--;
@@ -49969,16 +49706,16 @@ public final void rule__XBasicForLoopExpression__Group_3__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17276:1: rule__XBasicForLoopExpression__Group_3__1 : rule__XBasicForLoopExpression__Group_3__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17182:1: rule__XBasicForLoopExpression__Group_3__1 : rule__XBasicForLoopExpression__Group_3__1__Impl ;
     public final void rule__XBasicForLoopExpression__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17280:1: ( rule__XBasicForLoopExpression__Group_3__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17281:2: rule__XBasicForLoopExpression__Group_3__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17186:1: ( rule__XBasicForLoopExpression__Group_3__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17187:2: rule__XBasicForLoopExpression__Group_3__1__Impl
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_3__1__Impl_in_rule__XBasicForLoopExpression__Group_3__135037);
+            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_3__1__Impl_in_rule__XBasicForLoopExpression__Group_3__134851);
             rule__XBasicForLoopExpression__Group_3__1__Impl();
 
             state._fsp--;
@@ -50002,37 +49739,37 @@ public final void rule__XBasicForLoopExpression__Group_3__1() throws Recognition
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17287:1: rule__XBasicForLoopExpression__Group_3__1__Impl : ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17193:1: rule__XBasicForLoopExpression__Group_3__1__Impl : ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* ) ;
     public final void rule__XBasicForLoopExpression__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17291:1: ( ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17292:1: ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17197:1: ( ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17198:1: ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17292:1: ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17293:1: ( rule__XBasicForLoopExpression__Group_3_1__0 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17198:1: ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17199:1: ( rule__XBasicForLoopExpression__Group_3_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getGroup_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17294:1: ( rule__XBasicForLoopExpression__Group_3_1__0 )*
-            loop132:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17200:1: ( rule__XBasicForLoopExpression__Group_3_1__0 )*
+            loop131:
             do {
-                int alt132=2;
-                int LA132_0 = input.LA(1);
+                int alt131=2;
+                int LA131_0 = input.LA(1);
 
-                if ( (LA132_0==74) ) {
-                    alt132=1;
+                if ( (LA131_0==74) ) {
+                    alt131=1;
                 }
 
 
-                switch (alt132) {
+                switch (alt131) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17294:2: rule__XBasicForLoopExpression__Group_3_1__0
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17200:2: rule__XBasicForLoopExpression__Group_3_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_3_1__0_in_rule__XBasicForLoopExpression__Group_3__1__Impl35064);
+            	    pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_3_1__0_in_rule__XBasicForLoopExpression__Group_3__1__Impl34878);
             	    rule__XBasicForLoopExpression__Group_3_1__0();
 
             	    state._fsp--;
@@ -50042,7 +49779,7 @@ public final void rule__XBasicForLoopExpression__Group_3__1__Impl() throws Recog
             	    break;
 
             	default :
-            	    break loop132;
+            	    break loop131;
                 }
             } while (true);
 
@@ -50071,21 +49808,21 @@ public final void rule__XBasicForLoopExpression__Group_3__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17308:1: rule__XBasicForLoopExpression__Group_3_1__0 : rule__XBasicForLoopExpression__Group_3_1__0__Impl rule__XBasicForLoopExpression__Group_3_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17214:1: rule__XBasicForLoopExpression__Group_3_1__0 : rule__XBasicForLoopExpression__Group_3_1__0__Impl rule__XBasicForLoopExpression__Group_3_1__1 ;
     public final void rule__XBasicForLoopExpression__Group_3_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17312:1: ( rule__XBasicForLoopExpression__Group_3_1__0__Impl rule__XBasicForLoopExpression__Group_3_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17313:2: rule__XBasicForLoopExpression__Group_3_1__0__Impl rule__XBasicForLoopExpression__Group_3_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17218:1: ( rule__XBasicForLoopExpression__Group_3_1__0__Impl rule__XBasicForLoopExpression__Group_3_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17219:2: rule__XBasicForLoopExpression__Group_3_1__0__Impl rule__XBasicForLoopExpression__Group_3_1__1
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_3_1__0__Impl_in_rule__XBasicForLoopExpression__Group_3_1__035099);
+            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_3_1__0__Impl_in_rule__XBasicForLoopExpression__Group_3_1__034913);
             rule__XBasicForLoopExpression__Group_3_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_3_1__1_in_rule__XBasicForLoopExpression__Group_3_1__035102);
+            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_3_1__1_in_rule__XBasicForLoopExpression__Group_3_1__034916);
             rule__XBasicForLoopExpression__Group_3_1__1();
 
             state._fsp--;
@@ -50109,22 +49846,22 @@ public final void rule__XBasicForLoopExpression__Group_3_1__0() throws Recogniti
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17320:1: rule__XBasicForLoopExpression__Group_3_1__0__Impl : ( ',' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17226:1: rule__XBasicForLoopExpression__Group_3_1__0__Impl : ( ',' ) ;
     public final void rule__XBasicForLoopExpression__Group_3_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17324:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17325:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17230:1: ( ( ',' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17231:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17325:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17326:1: ','
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17231:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17232:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getCommaKeyword_3_1_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XBasicForLoopExpression__Group_3_1__0__Impl35130); if (state.failed) return ;
+            match(input,74,FOLLOW_74_in_rule__XBasicForLoopExpression__Group_3_1__0__Impl34944); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBasicForLoopExpressionAccess().getCommaKeyword_3_1_0()); 
             }
@@ -50150,16 +49887,16 @@ public final void rule__XBasicForLoopExpression__Group_3_1__0__Impl() throws Rec
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17339:1: rule__XBasicForLoopExpression__Group_3_1__1 : rule__XBasicForLoopExpression__Group_3_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17245:1: rule__XBasicForLoopExpression__Group_3_1__1 : rule__XBasicForLoopExpression__Group_3_1__1__Impl ;
     public final void rule__XBasicForLoopExpression__Group_3_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17343:1: ( rule__XBasicForLoopExpression__Group_3_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17344:2: rule__XBasicForLoopExpression__Group_3_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17249:1: ( rule__XBasicForLoopExpression__Group_3_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17250:2: rule__XBasicForLoopExpression__Group_3_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_3_1__1__Impl_in_rule__XBasicForLoopExpression__Group_3_1__135161);
+            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_3_1__1__Impl_in_rule__XBasicForLoopExpression__Group_3_1__134975);
             rule__XBasicForLoopExpression__Group_3_1__1__Impl();
 
             state._fsp--;
@@ -50183,25 +49920,25 @@ public final void rule__XBasicForLoopExpression__Group_3_1__1() throws Recogniti
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17350:1: rule__XBasicForLoopExpression__Group_3_1__1__Impl : ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17256:1: rule__XBasicForLoopExpression__Group_3_1__1__Impl : ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) ) ;
     public final void rule__XBasicForLoopExpression__Group_3_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17354:1: ( ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17355:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17260:1: ( ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17261:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17355:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17356:1: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17261:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17262:1: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getInitExpressionsAssignment_3_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17357:1: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17357:2: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17263:1: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17263:2: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1_in_rule__XBasicForLoopExpression__Group_3_1__1__Impl35188);
+            pushFollow(FOLLOW_rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1_in_rule__XBasicForLoopExpression__Group_3_1__1__Impl35002);
             rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1();
 
             state._fsp--;
@@ -50234,21 +49971,21 @@ public final void rule__XBasicForLoopExpression__Group_3_1__1__Impl() throws Rec
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17371:1: rule__XBasicForLoopExpression__Group_7__0 : rule__XBasicForLoopExpression__Group_7__0__Impl rule__XBasicForLoopExpression__Group_7__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17277:1: rule__XBasicForLoopExpression__Group_7__0 : rule__XBasicForLoopExpression__Group_7__0__Impl rule__XBasicForLoopExpression__Group_7__1 ;
     public final void rule__XBasicForLoopExpression__Group_7__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17375:1: ( rule__XBasicForLoopExpression__Group_7__0__Impl rule__XBasicForLoopExpression__Group_7__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17376:2: rule__XBasicForLoopExpression__Group_7__0__Impl rule__XBasicForLoopExpression__Group_7__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17281:1: ( rule__XBasicForLoopExpression__Group_7__0__Impl rule__XBasicForLoopExpression__Group_7__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17282:2: rule__XBasicForLoopExpression__Group_7__0__Impl rule__XBasicForLoopExpression__Group_7__1
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_7__0__Impl_in_rule__XBasicForLoopExpression__Group_7__035222);
+            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_7__0__Impl_in_rule__XBasicForLoopExpression__Group_7__035036);
             rule__XBasicForLoopExpression__Group_7__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_7__1_in_rule__XBasicForLoopExpression__Group_7__035225);
+            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_7__1_in_rule__XBasicForLoopExpression__Group_7__035039);
             rule__XBasicForLoopExpression__Group_7__1();
 
             state._fsp--;
@@ -50272,25 +50009,25 @@ public final void rule__XBasicForLoopExpression__Group_7__0() throws Recognition
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17383:1: rule__XBasicForLoopExpression__Group_7__0__Impl : ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17289:1: rule__XBasicForLoopExpression__Group_7__0__Impl : ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) ) ;
     public final void rule__XBasicForLoopExpression__Group_7__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17387:1: ( ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17388:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17293:1: ( ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17294:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17388:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17389:1: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17294:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17295:1: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getUpdateExpressionsAssignment_7_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17390:1: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17390:2: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17296:1: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17296:2: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0_in_rule__XBasicForLoopExpression__Group_7__0__Impl35252);
+            pushFollow(FOLLOW_rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0_in_rule__XBasicForLoopExpression__Group_7__0__Impl35066);
             rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0();
 
             state._fsp--;
@@ -50323,16 +50060,16 @@ public final void rule__XBasicForLoopExpression__Group_7__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17400:1: rule__XBasicForLoopExpression__Group_7__1 : rule__XBasicForLoopExpression__Group_7__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17306:1: rule__XBasicForLoopExpression__Group_7__1 : rule__XBasicForLoopExpression__Group_7__1__Impl ;
     public final void rule__XBasicForLoopExpression__Group_7__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17404:1: ( rule__XBasicForLoopExpression__Group_7__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17405:2: rule__XBasicForLoopExpression__Group_7__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17310:1: ( rule__XBasicForLoopExpression__Group_7__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17311:2: rule__XBasicForLoopExpression__Group_7__1__Impl
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_7__1__Impl_in_rule__XBasicForLoopExpression__Group_7__135282);
+            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_7__1__Impl_in_rule__XBasicForLoopExpression__Group_7__135096);
             rule__XBasicForLoopExpression__Group_7__1__Impl();
 
             state._fsp--;
@@ -50356,37 +50093,37 @@ public final void rule__XBasicForLoopExpression__Group_7__1() throws Recognition
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17411:1: rule__XBasicForLoopExpression__Group_7__1__Impl : ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17317:1: rule__XBasicForLoopExpression__Group_7__1__Impl : ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* ) ;
     public final void rule__XBasicForLoopExpression__Group_7__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17415:1: ( ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17416:1: ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17321:1: ( ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17322:1: ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17416:1: ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17417:1: ( rule__XBasicForLoopExpression__Group_7_1__0 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17322:1: ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17323:1: ( rule__XBasicForLoopExpression__Group_7_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getGroup_7_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17418:1: ( rule__XBasicForLoopExpression__Group_7_1__0 )*
-            loop133:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17324:1: ( rule__XBasicForLoopExpression__Group_7_1__0 )*
+            loop132:
             do {
-                int alt133=2;
-                int LA133_0 = input.LA(1);
+                int alt132=2;
+                int LA132_0 = input.LA(1);
 
-                if ( (LA133_0==74) ) {
-                    alt133=1;
+                if ( (LA132_0==74) ) {
+                    alt132=1;
                 }
 
 
-                switch (alt133) {
+                switch (alt132) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17418:2: rule__XBasicForLoopExpression__Group_7_1__0
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17324:2: rule__XBasicForLoopExpression__Group_7_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_7_1__0_in_rule__XBasicForLoopExpression__Group_7__1__Impl35309);
+            	    pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_7_1__0_in_rule__XBasicForLoopExpression__Group_7__1__Impl35123);
             	    rule__XBasicForLoopExpression__Group_7_1__0();
 
             	    state._fsp--;
@@ -50396,7 +50133,7 @@ public final void rule__XBasicForLoopExpression__Group_7__1__Impl() throws Recog
             	    break;
 
             	default :
-            	    break loop133;
+            	    break loop132;
                 }
             } while (true);
 
@@ -50425,21 +50162,21 @@ public final void rule__XBasicForLoopExpression__Group_7__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17432:1: rule__XBasicForLoopExpression__Group_7_1__0 : rule__XBasicForLoopExpression__Group_7_1__0__Impl rule__XBasicForLoopExpression__Group_7_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17338:1: rule__XBasicForLoopExpression__Group_7_1__0 : rule__XBasicForLoopExpression__Group_7_1__0__Impl rule__XBasicForLoopExpression__Group_7_1__1 ;
     public final void rule__XBasicForLoopExpression__Group_7_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17436:1: ( rule__XBasicForLoopExpression__Group_7_1__0__Impl rule__XBasicForLoopExpression__Group_7_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17437:2: rule__XBasicForLoopExpression__Group_7_1__0__Impl rule__XBasicForLoopExpression__Group_7_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17342:1: ( rule__XBasicForLoopExpression__Group_7_1__0__Impl rule__XBasicForLoopExpression__Group_7_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17343:2: rule__XBasicForLoopExpression__Group_7_1__0__Impl rule__XBasicForLoopExpression__Group_7_1__1
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_7_1__0__Impl_in_rule__XBasicForLoopExpression__Group_7_1__035344);
+            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_7_1__0__Impl_in_rule__XBasicForLoopExpression__Group_7_1__035158);
             rule__XBasicForLoopExpression__Group_7_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_7_1__1_in_rule__XBasicForLoopExpression__Group_7_1__035347);
+            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_7_1__1_in_rule__XBasicForLoopExpression__Group_7_1__035161);
             rule__XBasicForLoopExpression__Group_7_1__1();
 
             state._fsp--;
@@ -50463,22 +50200,22 @@ public final void rule__XBasicForLoopExpression__Group_7_1__0() throws Recogniti
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17444:1: rule__XBasicForLoopExpression__Group_7_1__0__Impl : ( ',' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17350:1: rule__XBasicForLoopExpression__Group_7_1__0__Impl : ( ',' ) ;
     public final void rule__XBasicForLoopExpression__Group_7_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17448:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17449:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17354:1: ( ( ',' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17355:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17449:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17450:1: ','
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17355:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17356:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getCommaKeyword_7_1_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XBasicForLoopExpression__Group_7_1__0__Impl35375); if (state.failed) return ;
+            match(input,74,FOLLOW_74_in_rule__XBasicForLoopExpression__Group_7_1__0__Impl35189); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBasicForLoopExpressionAccess().getCommaKeyword_7_1_0()); 
             }
@@ -50504,16 +50241,16 @@ public final void rule__XBasicForLoopExpression__Group_7_1__0__Impl() throws Rec
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17463:1: rule__XBasicForLoopExpression__Group_7_1__1 : rule__XBasicForLoopExpression__Group_7_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17369:1: rule__XBasicForLoopExpression__Group_7_1__1 : rule__XBasicForLoopExpression__Group_7_1__1__Impl ;
     public final void rule__XBasicForLoopExpression__Group_7_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17467:1: ( rule__XBasicForLoopExpression__Group_7_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17468:2: rule__XBasicForLoopExpression__Group_7_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17373:1: ( rule__XBasicForLoopExpression__Group_7_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17374:2: rule__XBasicForLoopExpression__Group_7_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_7_1__1__Impl_in_rule__XBasicForLoopExpression__Group_7_1__135406);
+            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_7_1__1__Impl_in_rule__XBasicForLoopExpression__Group_7_1__135220);
             rule__XBasicForLoopExpression__Group_7_1__1__Impl();
 
             state._fsp--;
@@ -50537,25 +50274,25 @@ public final void rule__XBasicForLoopExpression__Group_7_1__1() throws Recogniti
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17474:1: rule__XBasicForLoopExpression__Group_7_1__1__Impl : ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17380:1: rule__XBasicForLoopExpression__Group_7_1__1__Impl : ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) ) ;
     public final void rule__XBasicForLoopExpression__Group_7_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17478:1: ( ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17479:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17384:1: ( ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17385:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17479:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17480:1: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17385:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17386:1: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getUpdateExpressionsAssignment_7_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17481:1: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17481:2: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17387:1: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17387:2: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1_in_rule__XBasicForLoopExpression__Group_7_1__1__Impl35433);
+            pushFollow(FOLLOW_rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1_in_rule__XBasicForLoopExpression__Group_7_1__1__Impl35247);
             rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1();
 
             state._fsp--;
@@ -50588,21 +50325,21 @@ public final void rule__XBasicForLoopExpression__Group_7_1__1__Impl() throws Rec
 
 
     // $ANTLR start "rule__XWhileExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17495:1: rule__XWhileExpression__Group__0 : rule__XWhileExpression__Group__0__Impl rule__XWhileExpression__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17401:1: rule__XWhileExpression__Group__0 : rule__XWhileExpression__Group__0__Impl rule__XWhileExpression__Group__1 ;
     public final void rule__XWhileExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17499:1: ( rule__XWhileExpression__Group__0__Impl rule__XWhileExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17500:2: rule__XWhileExpression__Group__0__Impl rule__XWhileExpression__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17405:1: ( rule__XWhileExpression__Group__0__Impl rule__XWhileExpression__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17406:2: rule__XWhileExpression__Group__0__Impl rule__XWhileExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__0__Impl_in_rule__XWhileExpression__Group__035467);
+            pushFollow(FOLLOW_rule__XWhileExpression__Group__0__Impl_in_rule__XWhileExpression__Group__035281);
             rule__XWhileExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__1_in_rule__XWhileExpression__Group__035470);
+            pushFollow(FOLLOW_rule__XWhileExpression__Group__1_in_rule__XWhileExpression__Group__035284);
             rule__XWhileExpression__Group__1();
 
             state._fsp--;
@@ -50626,23 +50363,23 @@ public final void rule__XWhileExpression__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XWhileExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17507:1: rule__XWhileExpression__Group__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17413:1: rule__XWhileExpression__Group__0__Impl : ( () ) ;
     public final void rule__XWhileExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17511:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17512:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17417:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17418:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17512:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17513:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17418:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17419:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getXWhileExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17514:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17516:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17420:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17422:1: 
             {
             }
 
@@ -50667,21 +50404,21 @@ public final void rule__XWhileExpression__Group__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XWhileExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17526:1: rule__XWhileExpression__Group__1 : rule__XWhileExpression__Group__1__Impl rule__XWhileExpression__Group__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17432:1: rule__XWhileExpression__Group__1 : rule__XWhileExpression__Group__1__Impl rule__XWhileExpression__Group__2 ;
     public final void rule__XWhileExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17530:1: ( rule__XWhileExpression__Group__1__Impl rule__XWhileExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17531:2: rule__XWhileExpression__Group__1__Impl rule__XWhileExpression__Group__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17436:1: ( rule__XWhileExpression__Group__1__Impl rule__XWhileExpression__Group__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17437:2: rule__XWhileExpression__Group__1__Impl rule__XWhileExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__1__Impl_in_rule__XWhileExpression__Group__135528);
+            pushFollow(FOLLOW_rule__XWhileExpression__Group__1__Impl_in_rule__XWhileExpression__Group__135342);
             rule__XWhileExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__2_in_rule__XWhileExpression__Group__135531);
+            pushFollow(FOLLOW_rule__XWhileExpression__Group__2_in_rule__XWhileExpression__Group__135345);
             rule__XWhileExpression__Group__2();
 
             state._fsp--;
@@ -50705,22 +50442,22 @@ public final void rule__XWhileExpression__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XWhileExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17538:1: rule__XWhileExpression__Group__1__Impl : ( 'while' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17444:1: rule__XWhileExpression__Group__1__Impl : ( 'while' ) ;
     public final void rule__XWhileExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17542:1: ( ( 'while' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17543:1: ( 'while' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17448:1: ( ( 'while' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17449:1: ( 'while' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17543:1: ( 'while' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17544:1: 'while'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17449:1: ( 'while' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17450:1: 'while'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getWhileKeyword_1()); 
             }
-            match(input,90,FOLLOW_90_in_rule__XWhileExpression__Group__1__Impl35559); if (state.failed) return ;
+            match(input,90,FOLLOW_90_in_rule__XWhileExpression__Group__1__Impl35373); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXWhileExpressionAccess().getWhileKeyword_1()); 
             }
@@ -50746,21 +50483,21 @@ public final void rule__XWhileExpression__Group__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XWhileExpression__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17557:1: rule__XWhileExpression__Group__2 : rule__XWhileExpression__Group__2__Impl rule__XWhileExpression__Group__3 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17463:1: rule__XWhileExpression__Group__2 : rule__XWhileExpression__Group__2__Impl rule__XWhileExpression__Group__3 ;
     public final void rule__XWhileExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17561:1: ( rule__XWhileExpression__Group__2__Impl rule__XWhileExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17562:2: rule__XWhileExpression__Group__2__Impl rule__XWhileExpression__Group__3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17467:1: ( rule__XWhileExpression__Group__2__Impl rule__XWhileExpression__Group__3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17468:2: rule__XWhileExpression__Group__2__Impl rule__XWhileExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__2__Impl_in_rule__XWhileExpression__Group__235590);
+            pushFollow(FOLLOW_rule__XWhileExpression__Group__2__Impl_in_rule__XWhileExpression__Group__235404);
             rule__XWhileExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__3_in_rule__XWhileExpression__Group__235593);
+            pushFollow(FOLLOW_rule__XWhileExpression__Group__3_in_rule__XWhileExpression__Group__235407);
             rule__XWhileExpression__Group__3();
 
             state._fsp--;
@@ -50784,22 +50521,22 @@ public final void rule__XWhileExpression__Group__2() throws RecognitionException
 
 
     // $ANTLR start "rule__XWhileExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17569:1: rule__XWhileExpression__Group__2__Impl : ( '(' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17475:1: rule__XWhileExpression__Group__2__Impl : ( '(' ) ;
     public final void rule__XWhileExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17573:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17574:1: ( '(' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17479:1: ( ( '(' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17480:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17574:1: ( '(' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17575:1: '('
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17480:1: ( '(' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17481:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getLeftParenthesisKeyword_2()); 
             }
-            match(input,72,FOLLOW_72_in_rule__XWhileExpression__Group__2__Impl35621); if (state.failed) return ;
+            match(input,72,FOLLOW_72_in_rule__XWhileExpression__Group__2__Impl35435); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXWhileExpressionAccess().getLeftParenthesisKeyword_2()); 
             }
@@ -50825,21 +50562,21 @@ public final void rule__XWhileExpression__Group__2__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XWhileExpression__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17588:1: rule__XWhileExpression__Group__3 : rule__XWhileExpression__Group__3__Impl rule__XWhileExpression__Group__4 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17494:1: rule__XWhileExpression__Group__3 : rule__XWhileExpression__Group__3__Impl rule__XWhileExpression__Group__4 ;
     public final void rule__XWhileExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17592:1: ( rule__XWhileExpression__Group__3__Impl rule__XWhileExpression__Group__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17593:2: rule__XWhileExpression__Group__3__Impl rule__XWhileExpression__Group__4
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17498:1: ( rule__XWhileExpression__Group__3__Impl rule__XWhileExpression__Group__4 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17499:2: rule__XWhileExpression__Group__3__Impl rule__XWhileExpression__Group__4
             {
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__3__Impl_in_rule__XWhileExpression__Group__335652);
+            pushFollow(FOLLOW_rule__XWhileExpression__Group__3__Impl_in_rule__XWhileExpression__Group__335466);
             rule__XWhileExpression__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__4_in_rule__XWhileExpression__Group__335655);
+            pushFollow(FOLLOW_rule__XWhileExpression__Group__4_in_rule__XWhileExpression__Group__335469);
             rule__XWhileExpression__Group__4();
 
             state._fsp--;
@@ -50863,25 +50600,25 @@ public final void rule__XWhileExpression__Group__3() throws RecognitionException
 
 
     // $ANTLR start "rule__XWhileExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17600:1: rule__XWhileExpression__Group__3__Impl : ( ( rule__XWhileExpression__PredicateAssignment_3 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17506:1: rule__XWhileExpression__Group__3__Impl : ( ( rule__XWhileExpression__PredicateAssignment_3 ) ) ;
     public final void rule__XWhileExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17604:1: ( ( ( rule__XWhileExpression__PredicateAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17605:1: ( ( rule__XWhileExpression__PredicateAssignment_3 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17510:1: ( ( ( rule__XWhileExpression__PredicateAssignment_3 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17511:1: ( ( rule__XWhileExpression__PredicateAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17605:1: ( ( rule__XWhileExpression__PredicateAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17606:1: ( rule__XWhileExpression__PredicateAssignment_3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17511:1: ( ( rule__XWhileExpression__PredicateAssignment_3 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17512:1: ( rule__XWhileExpression__PredicateAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getPredicateAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17607:1: ( rule__XWhileExpression__PredicateAssignment_3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17607:2: rule__XWhileExpression__PredicateAssignment_3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17513:1: ( rule__XWhileExpression__PredicateAssignment_3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17513:2: rule__XWhileExpression__PredicateAssignment_3
             {
-            pushFollow(FOLLOW_rule__XWhileExpression__PredicateAssignment_3_in_rule__XWhileExpression__Group__3__Impl35682);
+            pushFollow(FOLLOW_rule__XWhileExpression__PredicateAssignment_3_in_rule__XWhileExpression__Group__3__Impl35496);
             rule__XWhileExpression__PredicateAssignment_3();
 
             state._fsp--;
@@ -50914,21 +50651,21 @@ public final void rule__XWhileExpression__Group__3__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XWhileExpression__Group__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17617:1: rule__XWhileExpression__Group__4 : rule__XWhileExpression__Group__4__Impl rule__XWhileExpression__Group__5 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17523:1: rule__XWhileExpression__Group__4 : rule__XWhileExpression__Group__4__Impl rule__XWhileExpression__Group__5 ;
     public final void rule__XWhileExpression__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17621:1: ( rule__XWhileExpression__Group__4__Impl rule__XWhileExpression__Group__5 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17622:2: rule__XWhileExpression__Group__4__Impl rule__XWhileExpression__Group__5
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17527:1: ( rule__XWhileExpression__Group__4__Impl rule__XWhileExpression__Group__5 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17528:2: rule__XWhileExpression__Group__4__Impl rule__XWhileExpression__Group__5
             {
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__4__Impl_in_rule__XWhileExpression__Group__435712);
+            pushFollow(FOLLOW_rule__XWhileExpression__Group__4__Impl_in_rule__XWhileExpression__Group__435526);
             rule__XWhileExpression__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__5_in_rule__XWhileExpression__Group__435715);
+            pushFollow(FOLLOW_rule__XWhileExpression__Group__5_in_rule__XWhileExpression__Group__435529);
             rule__XWhileExpression__Group__5();
 
             state._fsp--;
@@ -50952,22 +50689,22 @@ public final void rule__XWhileExpression__Group__4() throws RecognitionException
 
 
     // $ANTLR start "rule__XWhileExpression__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17629:1: rule__XWhileExpression__Group__4__Impl : ( ')' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17535:1: rule__XWhileExpression__Group__4__Impl : ( ')' ) ;
     public final void rule__XWhileExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17633:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17634:1: ( ')' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17539:1: ( ( ')' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17540:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17634:1: ( ')' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17635:1: ')'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17540:1: ( ')' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17541:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getRightParenthesisKeyword_4()); 
             }
-            match(input,73,FOLLOW_73_in_rule__XWhileExpression__Group__4__Impl35743); if (state.failed) return ;
+            match(input,73,FOLLOW_73_in_rule__XWhileExpression__Group__4__Impl35557); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXWhileExpressionAccess().getRightParenthesisKeyword_4()); 
             }
@@ -50993,16 +50730,16 @@ public final void rule__XWhileExpression__Group__4__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XWhileExpression__Group__5"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17648:1: rule__XWhileExpression__Group__5 : rule__XWhileExpression__Group__5__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17554:1: rule__XWhileExpression__Group__5 : rule__XWhileExpression__Group__5__Impl ;
     public final void rule__XWhileExpression__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17652:1: ( rule__XWhileExpression__Group__5__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17653:2: rule__XWhileExpression__Group__5__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17558:1: ( rule__XWhileExpression__Group__5__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17559:2: rule__XWhileExpression__Group__5__Impl
             {
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__5__Impl_in_rule__XWhileExpression__Group__535774);
+            pushFollow(FOLLOW_rule__XWhileExpression__Group__5__Impl_in_rule__XWhileExpression__Group__535588);
             rule__XWhileExpression__Group__5__Impl();
 
             state._fsp--;
@@ -51026,25 +50763,25 @@ public final void rule__XWhileExpression__Group__5() throws RecognitionException
 
 
     // $ANTLR start "rule__XWhileExpression__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17659:1: rule__XWhileExpression__Group__5__Impl : ( ( rule__XWhileExpression__BodyAssignment_5 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17565:1: rule__XWhileExpression__Group__5__Impl : ( ( rule__XWhileExpression__BodyAssignment_5 ) ) ;
     public final void rule__XWhileExpression__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17663:1: ( ( ( rule__XWhileExpression__BodyAssignment_5 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17664:1: ( ( rule__XWhileExpression__BodyAssignment_5 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17569:1: ( ( ( rule__XWhileExpression__BodyAssignment_5 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17570:1: ( ( rule__XWhileExpression__BodyAssignment_5 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17664:1: ( ( rule__XWhileExpression__BodyAssignment_5 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17665:1: ( rule__XWhileExpression__BodyAssignment_5 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17570:1: ( ( rule__XWhileExpression__BodyAssignment_5 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17571:1: ( rule__XWhileExpression__BodyAssignment_5 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getBodyAssignment_5()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17666:1: ( rule__XWhileExpression__BodyAssignment_5 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17666:2: rule__XWhileExpression__BodyAssignment_5
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17572:1: ( rule__XWhileExpression__BodyAssignment_5 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17572:2: rule__XWhileExpression__BodyAssignment_5
             {
-            pushFollow(FOLLOW_rule__XWhileExpression__BodyAssignment_5_in_rule__XWhileExpression__Group__5__Impl35801);
+            pushFollow(FOLLOW_rule__XWhileExpression__BodyAssignment_5_in_rule__XWhileExpression__Group__5__Impl35615);
             rule__XWhileExpression__BodyAssignment_5();
 
             state._fsp--;
@@ -51077,21 +50814,21 @@ public final void rule__XWhileExpression__Group__5__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17688:1: rule__XDoWhileExpression__Group__0 : rule__XDoWhileExpression__Group__0__Impl rule__XDoWhileExpression__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17594:1: rule__XDoWhileExpression__Group__0 : rule__XDoWhileExpression__Group__0__Impl rule__XDoWhileExpression__Group__1 ;
     public final void rule__XDoWhileExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17692:1: ( rule__XDoWhileExpression__Group__0__Impl rule__XDoWhileExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17693:2: rule__XDoWhileExpression__Group__0__Impl rule__XDoWhileExpression__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17598:1: ( rule__XDoWhileExpression__Group__0__Impl rule__XDoWhileExpression__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17599:2: rule__XDoWhileExpression__Group__0__Impl rule__XDoWhileExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__0__Impl_in_rule__XDoWhileExpression__Group__035843);
+            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__0__Impl_in_rule__XDoWhileExpression__Group__035657);
             rule__XDoWhileExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__1_in_rule__XDoWhileExpression__Group__035846);
+            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__1_in_rule__XDoWhileExpression__Group__035660);
             rule__XDoWhileExpression__Group__1();
 
             state._fsp--;
@@ -51115,23 +50852,23 @@ public final void rule__XDoWhileExpression__Group__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17700:1: rule__XDoWhileExpression__Group__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17606:1: rule__XDoWhileExpression__Group__0__Impl : ( () ) ;
     public final void rule__XDoWhileExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17704:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17705:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17610:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17611:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17705:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17706:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17611:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17612:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getXDoWhileExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17707:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17709:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17613:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17615:1: 
             {
             }
 
@@ -51156,21 +50893,21 @@ public final void rule__XDoWhileExpression__Group__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17719:1: rule__XDoWhileExpression__Group__1 : rule__XDoWhileExpression__Group__1__Impl rule__XDoWhileExpression__Group__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17625:1: rule__XDoWhileExpression__Group__1 : rule__XDoWhileExpression__Group__1__Impl rule__XDoWhileExpression__Group__2 ;
     public final void rule__XDoWhileExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17723:1: ( rule__XDoWhileExpression__Group__1__Impl rule__XDoWhileExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17724:2: rule__XDoWhileExpression__Group__1__Impl rule__XDoWhileExpression__Group__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17629:1: ( rule__XDoWhileExpression__Group__1__Impl rule__XDoWhileExpression__Group__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17630:2: rule__XDoWhileExpression__Group__1__Impl rule__XDoWhileExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__1__Impl_in_rule__XDoWhileExpression__Group__135904);
+            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__1__Impl_in_rule__XDoWhileExpression__Group__135718);
             rule__XDoWhileExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__2_in_rule__XDoWhileExpression__Group__135907);
+            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__2_in_rule__XDoWhileExpression__Group__135721);
             rule__XDoWhileExpression__Group__2();
 
             state._fsp--;
@@ -51194,22 +50931,22 @@ public final void rule__XDoWhileExpression__Group__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17731:1: rule__XDoWhileExpression__Group__1__Impl : ( 'do' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17637:1: rule__XDoWhileExpression__Group__1__Impl : ( 'do' ) ;
     public final void rule__XDoWhileExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17735:1: ( ( 'do' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17736:1: ( 'do' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17641:1: ( ( 'do' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17642:1: ( 'do' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17736:1: ( 'do' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17737:1: 'do'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17642:1: ( 'do' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17643:1: 'do'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getDoKeyword_1()); 
             }
-            match(input,91,FOLLOW_91_in_rule__XDoWhileExpression__Group__1__Impl35935); if (state.failed) return ;
+            match(input,91,FOLLOW_91_in_rule__XDoWhileExpression__Group__1__Impl35749); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXDoWhileExpressionAccess().getDoKeyword_1()); 
             }
@@ -51235,21 +50972,21 @@ public final void rule__XDoWhileExpression__Group__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17750:1: rule__XDoWhileExpression__Group__2 : rule__XDoWhileExpression__Group__2__Impl rule__XDoWhileExpression__Group__3 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17656:1: rule__XDoWhileExpression__Group__2 : rule__XDoWhileExpression__Group__2__Impl rule__XDoWhileExpression__Group__3 ;
     public final void rule__XDoWhileExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17754:1: ( rule__XDoWhileExpression__Group__2__Impl rule__XDoWhileExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17755:2: rule__XDoWhileExpression__Group__2__Impl rule__XDoWhileExpression__Group__3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17660:1: ( rule__XDoWhileExpression__Group__2__Impl rule__XDoWhileExpression__Group__3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17661:2: rule__XDoWhileExpression__Group__2__Impl rule__XDoWhileExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__2__Impl_in_rule__XDoWhileExpression__Group__235966);
+            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__2__Impl_in_rule__XDoWhileExpression__Group__235780);
             rule__XDoWhileExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__3_in_rule__XDoWhileExpression__Group__235969);
+            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__3_in_rule__XDoWhileExpression__Group__235783);
             rule__XDoWhileExpression__Group__3();
 
             state._fsp--;
@@ -51273,25 +51010,25 @@ public final void rule__XDoWhileExpression__Group__2() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17762:1: rule__XDoWhileExpression__Group__2__Impl : ( ( rule__XDoWhileExpression__BodyAssignment_2 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17668:1: rule__XDoWhileExpression__Group__2__Impl : ( ( rule__XDoWhileExpression__BodyAssignment_2 ) ) ;
     public final void rule__XDoWhileExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17766:1: ( ( ( rule__XDoWhileExpression__BodyAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17767:1: ( ( rule__XDoWhileExpression__BodyAssignment_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17672:1: ( ( ( rule__XDoWhileExpression__BodyAssignment_2 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17673:1: ( ( rule__XDoWhileExpression__BodyAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17767:1: ( ( rule__XDoWhileExpression__BodyAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17768:1: ( rule__XDoWhileExpression__BodyAssignment_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17673:1: ( ( rule__XDoWhileExpression__BodyAssignment_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17674:1: ( rule__XDoWhileExpression__BodyAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getBodyAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17769:1: ( rule__XDoWhileExpression__BodyAssignment_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17769:2: rule__XDoWhileExpression__BodyAssignment_2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17675:1: ( rule__XDoWhileExpression__BodyAssignment_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17675:2: rule__XDoWhileExpression__BodyAssignment_2
             {
-            pushFollow(FOLLOW_rule__XDoWhileExpression__BodyAssignment_2_in_rule__XDoWhileExpression__Group__2__Impl35996);
+            pushFollow(FOLLOW_rule__XDoWhileExpression__BodyAssignment_2_in_rule__XDoWhileExpression__Group__2__Impl35810);
             rule__XDoWhileExpression__BodyAssignment_2();
 
             state._fsp--;
@@ -51324,21 +51061,21 @@ public final void rule__XDoWhileExpression__Group__2__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17779:1: rule__XDoWhileExpression__Group__3 : rule__XDoWhileExpression__Group__3__Impl rule__XDoWhileExpression__Group__4 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17685:1: rule__XDoWhileExpression__Group__3 : rule__XDoWhileExpression__Group__3__Impl rule__XDoWhileExpression__Group__4 ;
     public final void rule__XDoWhileExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17783:1: ( rule__XDoWhileExpression__Group__3__Impl rule__XDoWhileExpression__Group__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17784:2: rule__XDoWhileExpression__Group__3__Impl rule__XDoWhileExpression__Group__4
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17689:1: ( rule__XDoWhileExpression__Group__3__Impl rule__XDoWhileExpression__Group__4 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17690:2: rule__XDoWhileExpression__Group__3__Impl rule__XDoWhileExpression__Group__4
             {
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__3__Impl_in_rule__XDoWhileExpression__Group__336026);
+            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__3__Impl_in_rule__XDoWhileExpression__Group__335840);
             rule__XDoWhileExpression__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__4_in_rule__XDoWhileExpression__Group__336029);
+            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__4_in_rule__XDoWhileExpression__Group__335843);
             rule__XDoWhileExpression__Group__4();
 
             state._fsp--;
@@ -51362,22 +51099,22 @@ public final void rule__XDoWhileExpression__Group__3() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17791:1: rule__XDoWhileExpression__Group__3__Impl : ( 'while' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17697:1: rule__XDoWhileExpression__Group__3__Impl : ( 'while' ) ;
     public final void rule__XDoWhileExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17795:1: ( ( 'while' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17796:1: ( 'while' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17701:1: ( ( 'while' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17702:1: ( 'while' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17796:1: ( 'while' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17797:1: 'while'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17702:1: ( 'while' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17703:1: 'while'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getWhileKeyword_3()); 
             }
-            match(input,90,FOLLOW_90_in_rule__XDoWhileExpression__Group__3__Impl36057); if (state.failed) return ;
+            match(input,90,FOLLOW_90_in_rule__XDoWhileExpression__Group__3__Impl35871); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXDoWhileExpressionAccess().getWhileKeyword_3()); 
             }
@@ -51403,21 +51140,21 @@ public final void rule__XDoWhileExpression__Group__3__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17810:1: rule__XDoWhileExpression__Group__4 : rule__XDoWhileExpression__Group__4__Impl rule__XDoWhileExpression__Group__5 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17716:1: rule__XDoWhileExpression__Group__4 : rule__XDoWhileExpression__Group__4__Impl rule__XDoWhileExpression__Group__5 ;
     public final void rule__XDoWhileExpression__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17814:1: ( rule__XDoWhileExpression__Group__4__Impl rule__XDoWhileExpression__Group__5 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17815:2: rule__XDoWhileExpression__Group__4__Impl rule__XDoWhileExpression__Group__5
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17720:1: ( rule__XDoWhileExpression__Group__4__Impl rule__XDoWhileExpression__Group__5 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17721:2: rule__XDoWhileExpression__Group__4__Impl rule__XDoWhileExpression__Group__5
             {
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__4__Impl_in_rule__XDoWhileExpression__Group__436088);
+            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__4__Impl_in_rule__XDoWhileExpression__Group__435902);
             rule__XDoWhileExpression__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__5_in_rule__XDoWhileExpression__Group__436091);
+            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__5_in_rule__XDoWhileExpression__Group__435905);
             rule__XDoWhileExpression__Group__5();
 
             state._fsp--;
@@ -51441,22 +51178,22 @@ public final void rule__XDoWhileExpression__Group__4() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17822:1: rule__XDoWhileExpression__Group__4__Impl : ( '(' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17728:1: rule__XDoWhileExpression__Group__4__Impl : ( '(' ) ;
     public final void rule__XDoWhileExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17826:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17827:1: ( '(' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17732:1: ( ( '(' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17733:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17827:1: ( '(' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17828:1: '('
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17733:1: ( '(' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17734:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getLeftParenthesisKeyword_4()); 
             }
-            match(input,72,FOLLOW_72_in_rule__XDoWhileExpression__Group__4__Impl36119); if (state.failed) return ;
+            match(input,72,FOLLOW_72_in_rule__XDoWhileExpression__Group__4__Impl35933); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXDoWhileExpressionAccess().getLeftParenthesisKeyword_4()); 
             }
@@ -51482,21 +51219,21 @@ public final void rule__XDoWhileExpression__Group__4__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__5"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17841:1: rule__XDoWhileExpression__Group__5 : rule__XDoWhileExpression__Group__5__Impl rule__XDoWhileExpression__Group__6 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17747:1: rule__XDoWhileExpression__Group__5 : rule__XDoWhileExpression__Group__5__Impl rule__XDoWhileExpression__Group__6 ;
     public final void rule__XDoWhileExpression__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17845:1: ( rule__XDoWhileExpression__Group__5__Impl rule__XDoWhileExpression__Group__6 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17846:2: rule__XDoWhileExpression__Group__5__Impl rule__XDoWhileExpression__Group__6
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17751:1: ( rule__XDoWhileExpression__Group__5__Impl rule__XDoWhileExpression__Group__6 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17752:2: rule__XDoWhileExpression__Group__5__Impl rule__XDoWhileExpression__Group__6
             {
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__5__Impl_in_rule__XDoWhileExpression__Group__536150);
+            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__5__Impl_in_rule__XDoWhileExpression__Group__535964);
             rule__XDoWhileExpression__Group__5__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__6_in_rule__XDoWhileExpression__Group__536153);
+            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__6_in_rule__XDoWhileExpression__Group__535967);
             rule__XDoWhileExpression__Group__6();
 
             state._fsp--;
@@ -51520,25 +51257,25 @@ public final void rule__XDoWhileExpression__Group__5() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17853:1: rule__XDoWhileExpression__Group__5__Impl : ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17759:1: rule__XDoWhileExpression__Group__5__Impl : ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) ) ;
     public final void rule__XDoWhileExpression__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17857:1: ( ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17858:1: ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17763:1: ( ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17764:1: ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17858:1: ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17859:1: ( rule__XDoWhileExpression__PredicateAssignment_5 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17764:1: ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17765:1: ( rule__XDoWhileExpression__PredicateAssignment_5 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getPredicateAssignment_5()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17860:1: ( rule__XDoWhileExpression__PredicateAssignment_5 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17860:2: rule__XDoWhileExpression__PredicateAssignment_5
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17766:1: ( rule__XDoWhileExpression__PredicateAssignment_5 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17766:2: rule__XDoWhileExpression__PredicateAssignment_5
             {
-            pushFollow(FOLLOW_rule__XDoWhileExpression__PredicateAssignment_5_in_rule__XDoWhileExpression__Group__5__Impl36180);
+            pushFollow(FOLLOW_rule__XDoWhileExpression__PredicateAssignment_5_in_rule__XDoWhileExpression__Group__5__Impl35994);
             rule__XDoWhileExpression__PredicateAssignment_5();
 
             state._fsp--;
@@ -51571,16 +51308,16 @@ public final void rule__XDoWhileExpression__Group__5__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__6"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17870:1: rule__XDoWhileExpression__Group__6 : rule__XDoWhileExpression__Group__6__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17776:1: rule__XDoWhileExpression__Group__6 : rule__XDoWhileExpression__Group__6__Impl ;
     public final void rule__XDoWhileExpression__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17874:1: ( rule__XDoWhileExpression__Group__6__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17875:2: rule__XDoWhileExpression__Group__6__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17780:1: ( rule__XDoWhileExpression__Group__6__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17781:2: rule__XDoWhileExpression__Group__6__Impl
             {
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__6__Impl_in_rule__XDoWhileExpression__Group__636210);
+            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__6__Impl_in_rule__XDoWhileExpression__Group__636024);
             rule__XDoWhileExpression__Group__6__Impl();
 
             state._fsp--;
@@ -51604,22 +51341,22 @@ public final void rule__XDoWhileExpression__Group__6() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__6__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17881:1: rule__XDoWhileExpression__Group__6__Impl : ( ')' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17787:1: rule__XDoWhileExpression__Group__6__Impl : ( ')' ) ;
     public final void rule__XDoWhileExpression__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17885:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17886:1: ( ')' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17791:1: ( ( ')' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17792:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17886:1: ( ')' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17887:1: ')'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17792:1: ( ')' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17793:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getRightParenthesisKeyword_6()); 
             }
-            match(input,73,FOLLOW_73_in_rule__XDoWhileExpression__Group__6__Impl36238); if (state.failed) return ;
+            match(input,73,FOLLOW_73_in_rule__XDoWhileExpression__Group__6__Impl36052); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXDoWhileExpressionAccess().getRightParenthesisKeyword_6()); 
             }
@@ -51645,21 +51382,21 @@ public final void rule__XDoWhileExpression__Group__6__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XBlockExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17914:1: rule__XBlockExpression__Group__0 : rule__XBlockExpression__Group__0__Impl rule__XBlockExpression__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17820:1: rule__XBlockExpression__Group__0 : rule__XBlockExpression__Group__0__Impl rule__XBlockExpression__Group__1 ;
     public final void rule__XBlockExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17918:1: ( rule__XBlockExpression__Group__0__Impl rule__XBlockExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17919:2: rule__XBlockExpression__Group__0__Impl rule__XBlockExpression__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17824:1: ( rule__XBlockExpression__Group__0__Impl rule__XBlockExpression__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17825:2: rule__XBlockExpression__Group__0__Impl rule__XBlockExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XBlockExpression__Group__0__Impl_in_rule__XBlockExpression__Group__036283);
+            pushFollow(FOLLOW_rule__XBlockExpression__Group__0__Impl_in_rule__XBlockExpression__Group__036097);
             rule__XBlockExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBlockExpression__Group__1_in_rule__XBlockExpression__Group__036286);
+            pushFollow(FOLLOW_rule__XBlockExpression__Group__1_in_rule__XBlockExpression__Group__036100);
             rule__XBlockExpression__Group__1();
 
             state._fsp--;
@@ -51683,23 +51420,23 @@ public final void rule__XBlockExpression__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XBlockExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17926:1: rule__XBlockExpression__Group__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17832:1: rule__XBlockExpression__Group__0__Impl : ( () ) ;
     public final void rule__XBlockExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17930:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17931:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17836:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17837:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17931:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17932:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17837:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17838:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getXBlockExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17933:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17935:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17839:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17841:1: 
             {
             }
 
@@ -51724,21 +51461,21 @@ public final void rule__XBlockExpression__Group__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XBlockExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17945:1: rule__XBlockExpression__Group__1 : rule__XBlockExpression__Group__1__Impl rule__XBlockExpression__Group__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17851:1: rule__XBlockExpression__Group__1 : rule__XBlockExpression__Group__1__Impl rule__XBlockExpression__Group__2 ;
     public final void rule__XBlockExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17949:1: ( rule__XBlockExpression__Group__1__Impl rule__XBlockExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17950:2: rule__XBlockExpression__Group__1__Impl rule__XBlockExpression__Group__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17855:1: ( rule__XBlockExpression__Group__1__Impl rule__XBlockExpression__Group__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17856:2: rule__XBlockExpression__Group__1__Impl rule__XBlockExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XBlockExpression__Group__1__Impl_in_rule__XBlockExpression__Group__136344);
+            pushFollow(FOLLOW_rule__XBlockExpression__Group__1__Impl_in_rule__XBlockExpression__Group__136158);
             rule__XBlockExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBlockExpression__Group__2_in_rule__XBlockExpression__Group__136347);
+            pushFollow(FOLLOW_rule__XBlockExpression__Group__2_in_rule__XBlockExpression__Group__136161);
             rule__XBlockExpression__Group__2();
 
             state._fsp--;
@@ -51762,22 +51499,22 @@ public final void rule__XBlockExpression__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XBlockExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17957:1: rule__XBlockExpression__Group__1__Impl : ( '{' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17863:1: rule__XBlockExpression__Group__1__Impl : ( '{' ) ;
     public final void rule__XBlockExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17961:1: ( ( '{' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17962:1: ( '{' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17867:1: ( ( '{' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17868:1: ( '{' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17962:1: ( '{' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17963:1: '{'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17868:1: ( '{' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17869:1: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getLeftCurlyBracketKeyword_1()); 
             }
-            match(input,68,FOLLOW_68_in_rule__XBlockExpression__Group__1__Impl36375); if (state.failed) return ;
+            match(input,68,FOLLOW_68_in_rule__XBlockExpression__Group__1__Impl36189); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBlockExpressionAccess().getLeftCurlyBracketKeyword_1()); 
             }
@@ -51803,21 +51540,21 @@ public final void rule__XBlockExpression__Group__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XBlockExpression__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17976:1: rule__XBlockExpression__Group__2 : rule__XBlockExpression__Group__2__Impl rule__XBlockExpression__Group__3 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17882:1: rule__XBlockExpression__Group__2 : rule__XBlockExpression__Group__2__Impl rule__XBlockExpression__Group__3 ;
     public final void rule__XBlockExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17980:1: ( rule__XBlockExpression__Group__2__Impl rule__XBlockExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17981:2: rule__XBlockExpression__Group__2__Impl rule__XBlockExpression__Group__3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17886:1: ( rule__XBlockExpression__Group__2__Impl rule__XBlockExpression__Group__3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17887:2: rule__XBlockExpression__Group__2__Impl rule__XBlockExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__XBlockExpression__Group__2__Impl_in_rule__XBlockExpression__Group__236406);
+            pushFollow(FOLLOW_rule__XBlockExpression__Group__2__Impl_in_rule__XBlockExpression__Group__236220);
             rule__XBlockExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBlockExpression__Group__3_in_rule__XBlockExpression__Group__236409);
+            pushFollow(FOLLOW_rule__XBlockExpression__Group__3_in_rule__XBlockExpression__Group__236223);
             rule__XBlockExpression__Group__3();
 
             state._fsp--;
@@ -51841,37 +51578,37 @@ public final void rule__XBlockExpression__Group__2() throws RecognitionException
 
 
     // $ANTLR start "rule__XBlockExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17988:1: rule__XBlockExpression__Group__2__Impl : ( ( rule__XBlockExpression__Group_2__0 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17894:1: rule__XBlockExpression__Group__2__Impl : ( ( rule__XBlockExpression__Group_2__0 )* ) ;
     public final void rule__XBlockExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17992:1: ( ( ( rule__XBlockExpression__Group_2__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17993:1: ( ( rule__XBlockExpression__Group_2__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17898:1: ( ( ( rule__XBlockExpression__Group_2__0 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17899:1: ( ( rule__XBlockExpression__Group_2__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17993:1: ( ( rule__XBlockExpression__Group_2__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17994:1: ( rule__XBlockExpression__Group_2__0 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17899:1: ( ( rule__XBlockExpression__Group_2__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17900:1: ( rule__XBlockExpression__Group_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getGroup_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17995:1: ( rule__XBlockExpression__Group_2__0 )*
-            loop134:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17901:1: ( rule__XBlockExpression__Group_2__0 )*
+            loop133:
             do {
-                int alt134=2;
-                int LA134_0 = input.LA(1);
+                int alt133=2;
+                int LA133_0 = input.LA(1);
 
-                if ( ((LA134_0>=RULE_ID && LA134_0<=RULE_STRING)||(LA134_0>=16 && LA134_0<=35)||LA134_0==47||(LA134_0>=54 && LA134_0<=55)||LA134_0==60||(LA134_0>=64 && LA134_0<=66)||LA134_0==68||LA134_0==70||LA134_0==72||(LA134_0>=77 && LA134_0<=78)||(LA134_0>=80 && LA134_0<=81)||LA134_0==84||LA134_0==86||(LA134_0>=90 && LA134_0<=97)||LA134_0==99||(LA134_0>=107 && LA134_0<=108)) ) {
-                    alt134=1;
+                if ( ((LA133_0>=RULE_ID && LA133_0<=RULE_STRING)||(LA133_0>=16 && LA133_0<=35)||LA133_0==47||(LA133_0>=54 && LA133_0<=55)||LA133_0==60||(LA133_0>=64 && LA133_0<=66)||LA133_0==68||LA133_0==70||LA133_0==72||(LA133_0>=77 && LA133_0<=78)||(LA133_0>=80 && LA133_0<=81)||LA133_0==84||LA133_0==86||(LA133_0>=90 && LA133_0<=97)||LA133_0==99||(LA133_0>=107 && LA133_0<=108)) ) {
+                    alt133=1;
                 }
 
 
-                switch (alt134) {
+                switch (alt133) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17995:2: rule__XBlockExpression__Group_2__0
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17901:2: rule__XBlockExpression__Group_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__XBlockExpression__Group_2__0_in_rule__XBlockExpression__Group__2__Impl36436);
+            	    pushFollow(FOLLOW_rule__XBlockExpression__Group_2__0_in_rule__XBlockExpression__Group__2__Impl36250);
             	    rule__XBlockExpression__Group_2__0();
 
             	    state._fsp--;
@@ -51881,7 +51618,7 @@ public final void rule__XBlockExpression__Group__2__Impl() throws RecognitionExc
             	    break;
 
             	default :
-            	    break loop134;
+            	    break loop133;
                 }
             } while (true);
 
@@ -51910,16 +51647,16 @@ public final void rule__XBlockExpression__Group__2__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XBlockExpression__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18005:1: rule__XBlockExpression__Group__3 : rule__XBlockExpression__Group__3__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17911:1: rule__XBlockExpression__Group__3 : rule__XBlockExpression__Group__3__Impl ;
     public final void rule__XBlockExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18009:1: ( rule__XBlockExpression__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18010:2: rule__XBlockExpression__Group__3__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17915:1: ( rule__XBlockExpression__Group__3__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17916:2: rule__XBlockExpression__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__XBlockExpression__Group__3__Impl_in_rule__XBlockExpression__Group__336467);
+            pushFollow(FOLLOW_rule__XBlockExpression__Group__3__Impl_in_rule__XBlockExpression__Group__336281);
             rule__XBlockExpression__Group__3__Impl();
 
             state._fsp--;
@@ -51943,22 +51680,22 @@ public final void rule__XBlockExpression__Group__3() throws RecognitionException
 
 
     // $ANTLR start "rule__XBlockExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18016:1: rule__XBlockExpression__Group__3__Impl : ( '}' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17922:1: rule__XBlockExpression__Group__3__Impl : ( '}' ) ;
     public final void rule__XBlockExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18020:1: ( ( '}' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18021:1: ( '}' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17926:1: ( ( '}' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17927:1: ( '}' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18021:1: ( '}' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18022:1: '}'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17927:1: ( '}' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17928:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getRightCurlyBracketKeyword_3()); 
             }
-            match(input,69,FOLLOW_69_in_rule__XBlockExpression__Group__3__Impl36495); if (state.failed) return ;
+            match(input,69,FOLLOW_69_in_rule__XBlockExpression__Group__3__Impl36309); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBlockExpressionAccess().getRightCurlyBracketKeyword_3()); 
             }
@@ -51984,21 +51721,21 @@ public final void rule__XBlockExpression__Group__3__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XBlockExpression__Group_2__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18043:1: rule__XBlockExpression__Group_2__0 : rule__XBlockExpression__Group_2__0__Impl rule__XBlockExpression__Group_2__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17949:1: rule__XBlockExpression__Group_2__0 : rule__XBlockExpression__Group_2__0__Impl rule__XBlockExpression__Group_2__1 ;
     public final void rule__XBlockExpression__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18047:1: ( rule__XBlockExpression__Group_2__0__Impl rule__XBlockExpression__Group_2__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18048:2: rule__XBlockExpression__Group_2__0__Impl rule__XBlockExpression__Group_2__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17953:1: ( rule__XBlockExpression__Group_2__0__Impl rule__XBlockExpression__Group_2__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17954:2: rule__XBlockExpression__Group_2__0__Impl rule__XBlockExpression__Group_2__1
             {
-            pushFollow(FOLLOW_rule__XBlockExpression__Group_2__0__Impl_in_rule__XBlockExpression__Group_2__036534);
+            pushFollow(FOLLOW_rule__XBlockExpression__Group_2__0__Impl_in_rule__XBlockExpression__Group_2__036348);
             rule__XBlockExpression__Group_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBlockExpression__Group_2__1_in_rule__XBlockExpression__Group_2__036537);
+            pushFollow(FOLLOW_rule__XBlockExpression__Group_2__1_in_rule__XBlockExpression__Group_2__036351);
             rule__XBlockExpression__Group_2__1();
 
             state._fsp--;
@@ -52022,25 +51759,25 @@ public final void rule__XBlockExpression__Group_2__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XBlockExpression__Group_2__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18055:1: rule__XBlockExpression__Group_2__0__Impl : ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17961:1: rule__XBlockExpression__Group_2__0__Impl : ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) ) ;
     public final void rule__XBlockExpression__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18059:1: ( ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18060:1: ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17965:1: ( ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17966:1: ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18060:1: ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18061:1: ( rule__XBlockExpression__ExpressionsAssignment_2_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17966:1: ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17967:1: ( rule__XBlockExpression__ExpressionsAssignment_2_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getExpressionsAssignment_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18062:1: ( rule__XBlockExpression__ExpressionsAssignment_2_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18062:2: rule__XBlockExpression__ExpressionsAssignment_2_0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17968:1: ( rule__XBlockExpression__ExpressionsAssignment_2_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17968:2: rule__XBlockExpression__ExpressionsAssignment_2_0
             {
-            pushFollow(FOLLOW_rule__XBlockExpression__ExpressionsAssignment_2_0_in_rule__XBlockExpression__Group_2__0__Impl36564);
+            pushFollow(FOLLOW_rule__XBlockExpression__ExpressionsAssignment_2_0_in_rule__XBlockExpression__Group_2__0__Impl36378);
             rule__XBlockExpression__ExpressionsAssignment_2_0();
 
             state._fsp--;
@@ -52073,16 +51810,16 @@ public final void rule__XBlockExpression__Group_2__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XBlockExpression__Group_2__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18072:1: rule__XBlockExpression__Group_2__1 : rule__XBlockExpression__Group_2__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17978:1: rule__XBlockExpression__Group_2__1 : rule__XBlockExpression__Group_2__1__Impl ;
     public final void rule__XBlockExpression__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18076:1: ( rule__XBlockExpression__Group_2__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18077:2: rule__XBlockExpression__Group_2__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17982:1: ( rule__XBlockExpression__Group_2__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17983:2: rule__XBlockExpression__Group_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__XBlockExpression__Group_2__1__Impl_in_rule__XBlockExpression__Group_2__136594);
+            pushFollow(FOLLOW_rule__XBlockExpression__Group_2__1__Impl_in_rule__XBlockExpression__Group_2__136408);
             rule__XBlockExpression__Group_2__1__Impl();
 
             state._fsp--;
@@ -52106,33 +51843,33 @@ public final void rule__XBlockExpression__Group_2__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XBlockExpression__Group_2__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18083:1: rule__XBlockExpression__Group_2__1__Impl : ( ( ';' )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17989:1: rule__XBlockExpression__Group_2__1__Impl : ( ( ';' )? ) ;
     public final void rule__XBlockExpression__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18087:1: ( ( ( ';' )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18088:1: ( ( ';' )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17993:1: ( ( ( ';' )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17994:1: ( ( ';' )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18088:1: ( ( ';' )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18089:1: ( ';' )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17994:1: ( ( ';' )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17995:1: ( ';' )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getSemicolonKeyword_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18090:1: ( ';' )?
-            int alt135=2;
-            int LA135_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17996:1: ( ';' )?
+            int alt134=2;
+            int LA134_0 = input.LA(1);
 
-            if ( (LA135_0==71) ) {
-                alt135=1;
+            if ( (LA134_0==71) ) {
+                alt134=1;
             }
-            switch (alt135) {
+            switch (alt134) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18091:2: ';'
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17997:2: ';'
                     {
-                    match(input,71,FOLLOW_71_in_rule__XBlockExpression__Group_2__1__Impl36623); if (state.failed) return ;
+                    match(input,71,FOLLOW_71_in_rule__XBlockExpression__Group_2__1__Impl36437); if (state.failed) return ;
 
                     }
                     break;
@@ -52164,21 +51901,21 @@ public final void rule__XBlockExpression__Group_2__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18106:1: rule__XVariableDeclaration__Group__0 : rule__XVariableDeclaration__Group__0__Impl rule__XVariableDeclaration__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18012:1: rule__XVariableDeclaration__Group__0 : rule__XVariableDeclaration__Group__0__Impl rule__XVariableDeclaration__Group__1 ;
     public final void rule__XVariableDeclaration__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18110:1: ( rule__XVariableDeclaration__Group__0__Impl rule__XVariableDeclaration__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18111:2: rule__XVariableDeclaration__Group__0__Impl rule__XVariableDeclaration__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18016:1: ( rule__XVariableDeclaration__Group__0__Impl rule__XVariableDeclaration__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18017:2: rule__XVariableDeclaration__Group__0__Impl rule__XVariableDeclaration__Group__1
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group__0__Impl_in_rule__XVariableDeclaration__Group__036660);
+            pushFollow(FOLLOW_rule__XVariableDeclaration__Group__0__Impl_in_rule__XVariableDeclaration__Group__036474);
             rule__XVariableDeclaration__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group__1_in_rule__XVariableDeclaration__Group__036663);
+            pushFollow(FOLLOW_rule__XVariableDeclaration__Group__1_in_rule__XVariableDeclaration__Group__036477);
             rule__XVariableDeclaration__Group__1();
 
             state._fsp--;
@@ -52202,23 +51939,23 @@ public final void rule__XVariableDeclaration__Group__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18118:1: rule__XVariableDeclaration__Group__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18024:1: rule__XVariableDeclaration__Group__0__Impl : ( () ) ;
     public final void rule__XVariableDeclaration__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18122:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18123:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18028:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18029:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18123:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18124:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18029:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18030:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getXVariableDeclarationAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18125:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18127:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18031:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18033:1: 
             {
             }
 
@@ -52243,21 +51980,21 @@ public final void rule__XVariableDeclaration__Group__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18137:1: rule__XVariableDeclaration__Group__1 : rule__XVariableDeclaration__Group__1__Impl rule__XVariableDeclaration__Group__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18043:1: rule__XVariableDeclaration__Group__1 : rule__XVariableDeclaration__Group__1__Impl rule__XVariableDeclaration__Group__2 ;
     public final void rule__XVariableDeclaration__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18141:1: ( rule__XVariableDeclaration__Group__1__Impl rule__XVariableDeclaration__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18142:2: rule__XVariableDeclaration__Group__1__Impl rule__XVariableDeclaration__Group__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18047:1: ( rule__XVariableDeclaration__Group__1__Impl rule__XVariableDeclaration__Group__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18048:2: rule__XVariableDeclaration__Group__1__Impl rule__XVariableDeclaration__Group__2
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group__1__Impl_in_rule__XVariableDeclaration__Group__136721);
+            pushFollow(FOLLOW_rule__XVariableDeclaration__Group__1__Impl_in_rule__XVariableDeclaration__Group__136535);
             rule__XVariableDeclaration__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group__2_in_rule__XVariableDeclaration__Group__136724);
+            pushFollow(FOLLOW_rule__XVariableDeclaration__Group__2_in_rule__XVariableDeclaration__Group__136538);
             rule__XVariableDeclaration__Group__2();
 
             state._fsp--;
@@ -52281,25 +52018,25 @@ public final void rule__XVariableDeclaration__Group__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18149:1: rule__XVariableDeclaration__Group__1__Impl : ( ( rule__XVariableDeclaration__Alternatives_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18055:1: rule__XVariableDeclaration__Group__1__Impl : ( ( rule__XVariableDeclaration__Alternatives_1 ) ) ;
     public final void rule__XVariableDeclaration__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18153:1: ( ( ( rule__XVariableDeclaration__Alternatives_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18154:1: ( ( rule__XVariableDeclaration__Alternatives_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18059:1: ( ( ( rule__XVariableDeclaration__Alternatives_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18060:1: ( ( rule__XVariableDeclaration__Alternatives_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18154:1: ( ( rule__XVariableDeclaration__Alternatives_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18155:1: ( rule__XVariableDeclaration__Alternatives_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18060:1: ( ( rule__XVariableDeclaration__Alternatives_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18061:1: ( rule__XVariableDeclaration__Alternatives_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getAlternatives_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18156:1: ( rule__XVariableDeclaration__Alternatives_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18156:2: rule__XVariableDeclaration__Alternatives_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18062:1: ( rule__XVariableDeclaration__Alternatives_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18062:2: rule__XVariableDeclaration__Alternatives_1
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Alternatives_1_in_rule__XVariableDeclaration__Group__1__Impl36751);
+            pushFollow(FOLLOW_rule__XVariableDeclaration__Alternatives_1_in_rule__XVariableDeclaration__Group__1__Impl36565);
             rule__XVariableDeclaration__Alternatives_1();
 
             state._fsp--;
@@ -52332,21 +52069,21 @@ public final void rule__XVariableDeclaration__Group__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18166:1: rule__XVariableDeclaration__Group__2 : rule__XVariableDeclaration__Group__2__Impl rule__XVariableDeclaration__Group__3 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18072:1: rule__XVariableDeclaration__Group__2 : rule__XVariableDeclaration__Group__2__Impl rule__XVariableDeclaration__Group__3 ;
     public final void rule__XVariableDeclaration__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18170:1: ( rule__XVariableDeclaration__Group__2__Impl rule__XVariableDeclaration__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18171:2: rule__XVariableDeclaration__Group__2__Impl rule__XVariableDeclaration__Group__3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18076:1: ( rule__XVariableDeclaration__Group__2__Impl rule__XVariableDeclaration__Group__3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18077:2: rule__XVariableDeclaration__Group__2__Impl rule__XVariableDeclaration__Group__3
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group__2__Impl_in_rule__XVariableDeclaration__Group__236781);
+            pushFollow(FOLLOW_rule__XVariableDeclaration__Group__2__Impl_in_rule__XVariableDeclaration__Group__236595);
             rule__XVariableDeclaration__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group__3_in_rule__XVariableDeclaration__Group__236784);
+            pushFollow(FOLLOW_rule__XVariableDeclaration__Group__3_in_rule__XVariableDeclaration__Group__236598);
             rule__XVariableDeclaration__Group__3();
 
             state._fsp--;
@@ -52370,25 +52107,25 @@ public final void rule__XVariableDeclaration__Group__2() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18178:1: rule__XVariableDeclaration__Group__2__Impl : ( ( rule__XVariableDeclaration__Alternatives_2 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18084:1: rule__XVariableDeclaration__Group__2__Impl : ( ( rule__XVariableDeclaration__Alternatives_2 ) ) ;
     public final void rule__XVariableDeclaration__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18182:1: ( ( ( rule__XVariableDeclaration__Alternatives_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18183:1: ( ( rule__XVariableDeclaration__Alternatives_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18088:1: ( ( ( rule__XVariableDeclaration__Alternatives_2 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18089:1: ( ( rule__XVariableDeclaration__Alternatives_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18183:1: ( ( rule__XVariableDeclaration__Alternatives_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18184:1: ( rule__XVariableDeclaration__Alternatives_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18089:1: ( ( rule__XVariableDeclaration__Alternatives_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18090:1: ( rule__XVariableDeclaration__Alternatives_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getAlternatives_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18185:1: ( rule__XVariableDeclaration__Alternatives_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18185:2: rule__XVariableDeclaration__Alternatives_2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18091:1: ( rule__XVariableDeclaration__Alternatives_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18091:2: rule__XVariableDeclaration__Alternatives_2
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Alternatives_2_in_rule__XVariableDeclaration__Group__2__Impl36811);
+            pushFollow(FOLLOW_rule__XVariableDeclaration__Alternatives_2_in_rule__XVariableDeclaration__Group__2__Impl36625);
             rule__XVariableDeclaration__Alternatives_2();
 
             state._fsp--;
@@ -52421,16 +52158,16 @@ public final void rule__XVariableDeclaration__Group__2__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18195:1: rule__XVariableDeclaration__Group__3 : rule__XVariableDeclaration__Group__3__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18101:1: rule__XVariableDeclaration__Group__3 : rule__XVariableDeclaration__Group__3__Impl ;
     public final void rule__XVariableDeclaration__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18199:1: ( rule__XVariableDeclaration__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18200:2: rule__XVariableDeclaration__Group__3__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18105:1: ( rule__XVariableDeclaration__Group__3__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18106:2: rule__XVariableDeclaration__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group__3__Impl_in_rule__XVariableDeclaration__Group__336841);
+            pushFollow(FOLLOW_rule__XVariableDeclaration__Group__3__Impl_in_rule__XVariableDeclaration__Group__336655);
             rule__XVariableDeclaration__Group__3__Impl();
 
             state._fsp--;
@@ -52454,33 +52191,33 @@ public final void rule__XVariableDeclaration__Group__3() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18206:1: rule__XVariableDeclaration__Group__3__Impl : ( ( rule__XVariableDeclaration__Group_3__0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18112:1: rule__XVariableDeclaration__Group__3__Impl : ( ( rule__XVariableDeclaration__Group_3__0 )? ) ;
     public final void rule__XVariableDeclaration__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18210:1: ( ( ( rule__XVariableDeclaration__Group_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18211:1: ( ( rule__XVariableDeclaration__Group_3__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18116:1: ( ( ( rule__XVariableDeclaration__Group_3__0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18117:1: ( ( rule__XVariableDeclaration__Group_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18211:1: ( ( rule__XVariableDeclaration__Group_3__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18212:1: ( rule__XVariableDeclaration__Group_3__0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18117:1: ( ( rule__XVariableDeclaration__Group_3__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18118:1: ( rule__XVariableDeclaration__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getGroup_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18213:1: ( rule__XVariableDeclaration__Group_3__0 )?
-            int alt136=2;
-            int LA136_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18119:1: ( rule__XVariableDeclaration__Group_3__0 )?
+            int alt135=2;
+            int LA135_0 = input.LA(1);
 
-            if ( (LA136_0==13) ) {
-                alt136=1;
+            if ( (LA135_0==13) ) {
+                alt135=1;
             }
-            switch (alt136) {
+            switch (alt135) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18213:2: rule__XVariableDeclaration__Group_3__0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18119:2: rule__XVariableDeclaration__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__XVariableDeclaration__Group_3__0_in_rule__XVariableDeclaration__Group__3__Impl36868);
+                    pushFollow(FOLLOW_rule__XVariableDeclaration__Group_3__0_in_rule__XVariableDeclaration__Group__3__Impl36682);
                     rule__XVariableDeclaration__Group_3__0();
 
                     state._fsp--;
@@ -52516,16 +52253,16 @@ public final void rule__XVariableDeclaration__Group__3__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_2_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18231:1: rule__XVariableDeclaration__Group_2_0__0 : rule__XVariableDeclaration__Group_2_0__0__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18137:1: rule__XVariableDeclaration__Group_2_0__0 : rule__XVariableDeclaration__Group_2_0__0__Impl ;
     public final void rule__XVariableDeclaration__Group_2_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18235:1: ( rule__XVariableDeclaration__Group_2_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18236:2: rule__XVariableDeclaration__Group_2_0__0__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18141:1: ( rule__XVariableDeclaration__Group_2_0__0__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18142:2: rule__XVariableDeclaration__Group_2_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group_2_0__0__Impl_in_rule__XVariableDeclaration__Group_2_0__036907);
+            pushFollow(FOLLOW_rule__XVariableDeclaration__Group_2_0__0__Impl_in_rule__XVariableDeclaration__Group_2_0__036721);
             rule__XVariableDeclaration__Group_2_0__0__Impl();
 
             state._fsp--;
@@ -52549,25 +52286,25 @@ public final void rule__XVariableDeclaration__Group_2_0__0() throws RecognitionE
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_2_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18242:1: rule__XVariableDeclaration__Group_2_0__0__Impl : ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18148:1: rule__XVariableDeclaration__Group_2_0__0__Impl : ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) ) ;
     public final void rule__XVariableDeclaration__Group_2_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18246:1: ( ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18247:1: ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18152:1: ( ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18153:1: ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18247:1: ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18248:1: ( rule__XVariableDeclaration__Group_2_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18153:1: ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18154:1: ( rule__XVariableDeclaration__Group_2_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getGroup_2_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18249:1: ( rule__XVariableDeclaration__Group_2_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18249:2: rule__XVariableDeclaration__Group_2_0_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18155:1: ( rule__XVariableDeclaration__Group_2_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18155:2: rule__XVariableDeclaration__Group_2_0_0__0
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group_2_0_0__0_in_rule__XVariableDeclaration__Group_2_0__0__Impl36934);
+            pushFollow(FOLLOW_rule__XVariableDeclaration__Group_2_0_0__0_in_rule__XVariableDeclaration__Group_2_0__0__Impl36748);
             rule__XVariableDeclaration__Group_2_0_0__0();
 
             state._fsp--;
@@ -52600,21 +52337,21 @@ public final void rule__XVariableDeclaration__Group_2_0__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_2_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18261:1: rule__XVariableDeclaration__Group_2_0_0__0 : rule__XVariableDeclaration__Group_2_0_0__0__Impl rule__XVariableDeclaration__Group_2_0_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18167:1: rule__XVariableDeclaration__Group_2_0_0__0 : rule__XVariableDeclaration__Group_2_0_0__0__Impl rule__XVariableDeclaration__Group_2_0_0__1 ;
     public final void rule__XVariableDeclaration__Group_2_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18265:1: ( rule__XVariableDeclaration__Group_2_0_0__0__Impl rule__XVariableDeclaration__Group_2_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18266:2: rule__XVariableDeclaration__Group_2_0_0__0__Impl rule__XVariableDeclaration__Group_2_0_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18171:1: ( rule__XVariableDeclaration__Group_2_0_0__0__Impl rule__XVariableDeclaration__Group_2_0_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18172:2: rule__XVariableDeclaration__Group_2_0_0__0__Impl rule__XVariableDeclaration__Group_2_0_0__1
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group_2_0_0__0__Impl_in_rule__XVariableDeclaration__Group_2_0_0__036966);
+            pushFollow(FOLLOW_rule__XVariableDeclaration__Group_2_0_0__0__Impl_in_rule__XVariableDeclaration__Group_2_0_0__036780);
             rule__XVariableDeclaration__Group_2_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group_2_0_0__1_in_rule__XVariableDeclaration__Group_2_0_0__036969);
+            pushFollow(FOLLOW_rule__XVariableDeclaration__Group_2_0_0__1_in_rule__XVariableDeclaration__Group_2_0_0__036783);
             rule__XVariableDeclaration__Group_2_0_0__1();
 
             state._fsp--;
@@ -52638,25 +52375,25 @@ public final void rule__XVariableDeclaration__Group_2_0_0__0() throws Recognitio
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_2_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18273:1: rule__XVariableDeclaration__Group_2_0_0__0__Impl : ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18179:1: rule__XVariableDeclaration__Group_2_0_0__0__Impl : ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) ) ;
     public final void rule__XVariableDeclaration__Group_2_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18277:1: ( ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18278:1: ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18183:1: ( ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18184:1: ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18278:1: ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18279:1: ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18184:1: ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18185:1: ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getTypeAssignment_2_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18280:1: ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18280:2: rule__XVariableDeclaration__TypeAssignment_2_0_0_0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18186:1: ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18186:2: rule__XVariableDeclaration__TypeAssignment_2_0_0_0
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__TypeAssignment_2_0_0_0_in_rule__XVariableDeclaration__Group_2_0_0__0__Impl36996);
+            pushFollow(FOLLOW_rule__XVariableDeclaration__TypeAssignment_2_0_0_0_in_rule__XVariableDeclaration__Group_2_0_0__0__Impl36810);
             rule__XVariableDeclaration__TypeAssignment_2_0_0_0();
 
             state._fsp--;
@@ -52689,16 +52426,16 @@ public final void rule__XVariableDeclaration__Group_2_0_0__0__Impl() throws Reco
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_2_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18290:1: rule__XVariableDeclaration__Group_2_0_0__1 : rule__XVariableDeclaration__Group_2_0_0__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18196:1: rule__XVariableDeclaration__Group_2_0_0__1 : rule__XVariableDeclaration__Group_2_0_0__1__Impl ;
     public final void rule__XVariableDeclaration__Group_2_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18294:1: ( rule__XVariableDeclaration__Group_2_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18295:2: rule__XVariableDeclaration__Group_2_0_0__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18200:1: ( rule__XVariableDeclaration__Group_2_0_0__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18201:2: rule__XVariableDeclaration__Group_2_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group_2_0_0__1__Impl_in_rule__XVariableDeclaration__Group_2_0_0__137026);
+            pushFollow(FOLLOW_rule__XVariableDeclaration__Group_2_0_0__1__Impl_in_rule__XVariableDeclaration__Group_2_0_0__136840);
             rule__XVariableDeclaration__Group_2_0_0__1__Impl();
 
             state._fsp--;
@@ -52722,25 +52459,25 @@ public final void rule__XVariableDeclaration__Group_2_0_0__1() throws Recognitio
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_2_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18301:1: rule__XVariableDeclaration__Group_2_0_0__1__Impl : ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18207:1: rule__XVariableDeclaration__Group_2_0_0__1__Impl : ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) ) ;
     public final void rule__XVariableDeclaration__Group_2_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18305:1: ( ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18306:1: ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18211:1: ( ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18212:1: ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18306:1: ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18307:1: ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18212:1: ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18213:1: ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getNameAssignment_2_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18308:1: ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18308:2: rule__XVariableDeclaration__NameAssignment_2_0_0_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18214:1: ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18214:2: rule__XVariableDeclaration__NameAssignment_2_0_0_1
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__NameAssignment_2_0_0_1_in_rule__XVariableDeclaration__Group_2_0_0__1__Impl37053);
+            pushFollow(FOLLOW_rule__XVariableDeclaration__NameAssignment_2_0_0_1_in_rule__XVariableDeclaration__Group_2_0_0__1__Impl36867);
             rule__XVariableDeclaration__NameAssignment_2_0_0_1();
 
             state._fsp--;
@@ -52773,21 +52510,21 @@ public final void rule__XVariableDeclaration__Group_2_0_0__1__Impl() throws Reco
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_3__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18322:1: rule__XVariableDeclaration__Group_3__0 : rule__XVariableDeclaration__Group_3__0__Impl rule__XVariableDeclaration__Group_3__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18228:1: rule__XVariableDeclaration__Group_3__0 : rule__XVariableDeclaration__Group_3__0__Impl rule__XVariableDeclaration__Group_3__1 ;
     public final void rule__XVariableDeclaration__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18326:1: ( rule__XVariableDeclaration__Group_3__0__Impl rule__XVariableDeclaration__Group_3__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18327:2: rule__XVariableDeclaration__Group_3__0__Impl rule__XVariableDeclaration__Group_3__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18232:1: ( rule__XVariableDeclaration__Group_3__0__Impl rule__XVariableDeclaration__Group_3__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18233:2: rule__XVariableDeclaration__Group_3__0__Impl rule__XVariableDeclaration__Group_3__1
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group_3__0__Impl_in_rule__XVariableDeclaration__Group_3__037087);
+            pushFollow(FOLLOW_rule__XVariableDeclaration__Group_3__0__Impl_in_rule__XVariableDeclaration__Group_3__036901);
             rule__XVariableDeclaration__Group_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group_3__1_in_rule__XVariableDeclaration__Group_3__037090);
+            pushFollow(FOLLOW_rule__XVariableDeclaration__Group_3__1_in_rule__XVariableDeclaration__Group_3__036904);
             rule__XVariableDeclaration__Group_3__1();
 
             state._fsp--;
@@ -52811,22 +52548,22 @@ public final void rule__XVariableDeclaration__Group_3__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_3__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18334:1: rule__XVariableDeclaration__Group_3__0__Impl : ( '=' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18240:1: rule__XVariableDeclaration__Group_3__0__Impl : ( '=' ) ;
     public final void rule__XVariableDeclaration__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18338:1: ( ( '=' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18339:1: ( '=' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18244:1: ( ( '=' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18245:1: ( '=' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18339:1: ( '=' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18340:1: '='
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18245:1: ( '=' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18246:1: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getEqualsSignKeyword_3_0()); 
             }
-            match(input,13,FOLLOW_13_in_rule__XVariableDeclaration__Group_3__0__Impl37118); if (state.failed) return ;
+            match(input,13,FOLLOW_13_in_rule__XVariableDeclaration__Group_3__0__Impl36932); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXVariableDeclarationAccess().getEqualsSignKeyword_3_0()); 
             }
@@ -52852,16 +52589,16 @@ public final void rule__XVariableDeclaration__Group_3__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_3__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18353:1: rule__XVariableDeclaration__Group_3__1 : rule__XVariableDeclaration__Group_3__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18259:1: rule__XVariableDeclaration__Group_3__1 : rule__XVariableDeclaration__Group_3__1__Impl ;
     public final void rule__XVariableDeclaration__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18357:1: ( rule__XVariableDeclaration__Group_3__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18358:2: rule__XVariableDeclaration__Group_3__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18263:1: ( rule__XVariableDeclaration__Group_3__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18264:2: rule__XVariableDeclaration__Group_3__1__Impl
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group_3__1__Impl_in_rule__XVariableDeclaration__Group_3__137149);
+            pushFollow(FOLLOW_rule__XVariableDeclaration__Group_3__1__Impl_in_rule__XVariableDeclaration__Group_3__136963);
             rule__XVariableDeclaration__Group_3__1__Impl();
 
             state._fsp--;
@@ -52885,25 +52622,25 @@ public final void rule__XVariableDeclaration__Group_3__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_3__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18364:1: rule__XVariableDeclaration__Group_3__1__Impl : ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18270:1: rule__XVariableDeclaration__Group_3__1__Impl : ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) ) ;
     public final void rule__XVariableDeclaration__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18368:1: ( ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18369:1: ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18274:1: ( ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18275:1: ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18369:1: ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18370:1: ( rule__XVariableDeclaration__RightAssignment_3_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18275:1: ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18276:1: ( rule__XVariableDeclaration__RightAssignment_3_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getRightAssignment_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18371:1: ( rule__XVariableDeclaration__RightAssignment_3_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18371:2: rule__XVariableDeclaration__RightAssignment_3_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18277:1: ( rule__XVariableDeclaration__RightAssignment_3_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18277:2: rule__XVariableDeclaration__RightAssignment_3_1
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__RightAssignment_3_1_in_rule__XVariableDeclaration__Group_3__1__Impl37176);
+            pushFollow(FOLLOW_rule__XVariableDeclaration__RightAssignment_3_1_in_rule__XVariableDeclaration__Group_3__1__Impl36990);
             rule__XVariableDeclaration__RightAssignment_3_1();
 
             state._fsp--;
@@ -52936,21 +52673,21 @@ public final void rule__XVariableDeclaration__Group_3__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__JvmFormalParameter__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18385:1: rule__JvmFormalParameter__Group__0 : rule__JvmFormalParameter__Group__0__Impl rule__JvmFormalParameter__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18291:1: rule__JvmFormalParameter__Group__0 : rule__JvmFormalParameter__Group__0__Impl rule__JvmFormalParameter__Group__1 ;
     public final void rule__JvmFormalParameter__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18389:1: ( rule__JvmFormalParameter__Group__0__Impl rule__JvmFormalParameter__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18390:2: rule__JvmFormalParameter__Group__0__Impl rule__JvmFormalParameter__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18295:1: ( rule__JvmFormalParameter__Group__0__Impl rule__JvmFormalParameter__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18296:2: rule__JvmFormalParameter__Group__0__Impl rule__JvmFormalParameter__Group__1
             {
-            pushFollow(FOLLOW_rule__JvmFormalParameter__Group__0__Impl_in_rule__JvmFormalParameter__Group__037210);
+            pushFollow(FOLLOW_rule__JvmFormalParameter__Group__0__Impl_in_rule__JvmFormalParameter__Group__037024);
             rule__JvmFormalParameter__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmFormalParameter__Group__1_in_rule__JvmFormalParameter__Group__037213);
+            pushFollow(FOLLOW_rule__JvmFormalParameter__Group__1_in_rule__JvmFormalParameter__Group__037027);
             rule__JvmFormalParameter__Group__1();
 
             state._fsp--;
@@ -52974,40 +52711,40 @@ public final void rule__JvmFormalParameter__Group__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__JvmFormalParameter__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18397:1: rule__JvmFormalParameter__Group__0__Impl : ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18303:1: rule__JvmFormalParameter__Group__0__Impl : ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? ) ;
     public final void rule__JvmFormalParameter__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18401:1: ( ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18402:1: ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18307:1: ( ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18308:1: ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18402:1: ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18403:1: ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18308:1: ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18309:1: ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmFormalParameterAccess().getParameterTypeAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18404:1: ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )?
-            int alt137=2;
-            int LA137_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18310:1: ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )?
+            int alt136=2;
+            int LA136_0 = input.LA(1);
 
-            if ( (LA137_0==RULE_ID) ) {
-                int LA137_1 = input.LA(2);
+            if ( (LA136_0==RULE_ID) ) {
+                int LA136_1 = input.LA(2);
 
-                if ( (LA137_1==RULE_ID||LA137_1==47||LA137_1==63||LA137_1==78) ) {
-                    alt137=1;
+                if ( (LA136_1==RULE_ID||LA136_1==47||LA136_1==63||LA136_1==78) ) {
+                    alt136=1;
                 }
             }
-            else if ( (LA137_0==51||LA137_0==72) ) {
-                alt137=1;
+            else if ( (LA136_0==51||LA136_0==72) ) {
+                alt136=1;
             }
-            switch (alt137) {
+            switch (alt136) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18404:2: rule__JvmFormalParameter__ParameterTypeAssignment_0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18310:2: rule__JvmFormalParameter__ParameterTypeAssignment_0
                     {
-                    pushFollow(FOLLOW_rule__JvmFormalParameter__ParameterTypeAssignment_0_in_rule__JvmFormalParameter__Group__0__Impl37240);
+                    pushFollow(FOLLOW_rule__JvmFormalParameter__ParameterTypeAssignment_0_in_rule__JvmFormalParameter__Group__0__Impl37054);
                     rule__JvmFormalParameter__ParameterTypeAssignment_0();
 
                     state._fsp--;
@@ -53043,16 +52780,16 @@ else if ( (LA137_0==51||LA137_0==72) ) {
 
 
     // $ANTLR start "rule__JvmFormalParameter__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18414:1: rule__JvmFormalParameter__Group__1 : rule__JvmFormalParameter__Group__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18320:1: rule__JvmFormalParameter__Group__1 : rule__JvmFormalParameter__Group__1__Impl ;
     public final void rule__JvmFormalParameter__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18418:1: ( rule__JvmFormalParameter__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18419:2: rule__JvmFormalParameter__Group__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18324:1: ( rule__JvmFormalParameter__Group__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18325:2: rule__JvmFormalParameter__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmFormalParameter__Group__1__Impl_in_rule__JvmFormalParameter__Group__137271);
+            pushFollow(FOLLOW_rule__JvmFormalParameter__Group__1__Impl_in_rule__JvmFormalParameter__Group__137085);
             rule__JvmFormalParameter__Group__1__Impl();
 
             state._fsp--;
@@ -53076,25 +52813,25 @@ public final void rule__JvmFormalParameter__Group__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__JvmFormalParameter__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18425:1: rule__JvmFormalParameter__Group__1__Impl : ( ( rule__JvmFormalParameter__NameAssignment_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18331:1: rule__JvmFormalParameter__Group__1__Impl : ( ( rule__JvmFormalParameter__NameAssignment_1 ) ) ;
     public final void rule__JvmFormalParameter__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18429:1: ( ( ( rule__JvmFormalParameter__NameAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18430:1: ( ( rule__JvmFormalParameter__NameAssignment_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18335:1: ( ( ( rule__JvmFormalParameter__NameAssignment_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18336:1: ( ( rule__JvmFormalParameter__NameAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18430:1: ( ( rule__JvmFormalParameter__NameAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18431:1: ( rule__JvmFormalParameter__NameAssignment_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18336:1: ( ( rule__JvmFormalParameter__NameAssignment_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18337:1: ( rule__JvmFormalParameter__NameAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmFormalParameterAccess().getNameAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18432:1: ( rule__JvmFormalParameter__NameAssignment_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18432:2: rule__JvmFormalParameter__NameAssignment_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18338:1: ( rule__JvmFormalParameter__NameAssignment_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18338:2: rule__JvmFormalParameter__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__JvmFormalParameter__NameAssignment_1_in_rule__JvmFormalParameter__Group__1__Impl37298);
+            pushFollow(FOLLOW_rule__JvmFormalParameter__NameAssignment_1_in_rule__JvmFormalParameter__Group__1__Impl37112);
             rule__JvmFormalParameter__NameAssignment_1();
 
             state._fsp--;
@@ -53127,21 +52864,21 @@ public final void rule__JvmFormalParameter__Group__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__FullJvmFormalParameter__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18446:1: rule__FullJvmFormalParameter__Group__0 : rule__FullJvmFormalParameter__Group__0__Impl rule__FullJvmFormalParameter__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18352:1: rule__FullJvmFormalParameter__Group__0 : rule__FullJvmFormalParameter__Group__0__Impl rule__FullJvmFormalParameter__Group__1 ;
     public final void rule__FullJvmFormalParameter__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18450:1: ( rule__FullJvmFormalParameter__Group__0__Impl rule__FullJvmFormalParameter__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18451:2: rule__FullJvmFormalParameter__Group__0__Impl rule__FullJvmFormalParameter__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18356:1: ( rule__FullJvmFormalParameter__Group__0__Impl rule__FullJvmFormalParameter__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18357:2: rule__FullJvmFormalParameter__Group__0__Impl rule__FullJvmFormalParameter__Group__1
             {
-            pushFollow(FOLLOW_rule__FullJvmFormalParameter__Group__0__Impl_in_rule__FullJvmFormalParameter__Group__037332);
+            pushFollow(FOLLOW_rule__FullJvmFormalParameter__Group__0__Impl_in_rule__FullJvmFormalParameter__Group__037146);
             rule__FullJvmFormalParameter__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__FullJvmFormalParameter__Group__1_in_rule__FullJvmFormalParameter__Group__037335);
+            pushFollow(FOLLOW_rule__FullJvmFormalParameter__Group__1_in_rule__FullJvmFormalParameter__Group__037149);
             rule__FullJvmFormalParameter__Group__1();
 
             state._fsp--;
@@ -53165,25 +52902,25 @@ public final void rule__FullJvmFormalParameter__Group__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__FullJvmFormalParameter__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18458:1: rule__FullJvmFormalParameter__Group__0__Impl : ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18364:1: rule__FullJvmFormalParameter__Group__0__Impl : ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) ) ;
     public final void rule__FullJvmFormalParameter__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18462:1: ( ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18463:1: ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18368:1: ( ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18369:1: ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18463:1: ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18464:1: ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18369:1: ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18370:1: ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFullJvmFormalParameterAccess().getParameterTypeAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18465:1: ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18465:2: rule__FullJvmFormalParameter__ParameterTypeAssignment_0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18371:1: ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18371:2: rule__FullJvmFormalParameter__ParameterTypeAssignment_0
             {
-            pushFollow(FOLLOW_rule__FullJvmFormalParameter__ParameterTypeAssignment_0_in_rule__FullJvmFormalParameter__Group__0__Impl37362);
+            pushFollow(FOLLOW_rule__FullJvmFormalParameter__ParameterTypeAssignment_0_in_rule__FullJvmFormalParameter__Group__0__Impl37176);
             rule__FullJvmFormalParameter__ParameterTypeAssignment_0();
 
             state._fsp--;
@@ -53216,16 +52953,16 @@ public final void rule__FullJvmFormalParameter__Group__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__FullJvmFormalParameter__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18475:1: rule__FullJvmFormalParameter__Group__1 : rule__FullJvmFormalParameter__Group__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18381:1: rule__FullJvmFormalParameter__Group__1 : rule__FullJvmFormalParameter__Group__1__Impl ;
     public final void rule__FullJvmFormalParameter__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18479:1: ( rule__FullJvmFormalParameter__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18480:2: rule__FullJvmFormalParameter__Group__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18385:1: ( rule__FullJvmFormalParameter__Group__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18386:2: rule__FullJvmFormalParameter__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__FullJvmFormalParameter__Group__1__Impl_in_rule__FullJvmFormalParameter__Group__137392);
+            pushFollow(FOLLOW_rule__FullJvmFormalParameter__Group__1__Impl_in_rule__FullJvmFormalParameter__Group__137206);
             rule__FullJvmFormalParameter__Group__1__Impl();
 
             state._fsp--;
@@ -53249,25 +52986,25 @@ public final void rule__FullJvmFormalParameter__Group__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__FullJvmFormalParameter__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18486:1: rule__FullJvmFormalParameter__Group__1__Impl : ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18392:1: rule__FullJvmFormalParameter__Group__1__Impl : ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) ) ;
     public final void rule__FullJvmFormalParameter__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18490:1: ( ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18491:1: ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18396:1: ( ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18397:1: ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18491:1: ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18492:1: ( rule__FullJvmFormalParameter__NameAssignment_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18397:1: ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18398:1: ( rule__FullJvmFormalParameter__NameAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFullJvmFormalParameterAccess().getNameAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18493:1: ( rule__FullJvmFormalParameter__NameAssignment_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18493:2: rule__FullJvmFormalParameter__NameAssignment_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18399:1: ( rule__FullJvmFormalParameter__NameAssignment_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18399:2: rule__FullJvmFormalParameter__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__FullJvmFormalParameter__NameAssignment_1_in_rule__FullJvmFormalParameter__Group__1__Impl37419);
+            pushFollow(FOLLOW_rule__FullJvmFormalParameter__NameAssignment_1_in_rule__FullJvmFormalParameter__Group__1__Impl37233);
             rule__FullJvmFormalParameter__NameAssignment_1();
 
             state._fsp--;
@@ -53300,21 +53037,21 @@ public final void rule__FullJvmFormalParameter__Group__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XFeatureCall__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18507:1: rule__XFeatureCall__Group__0 : rule__XFeatureCall__Group__0__Impl rule__XFeatureCall__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18413:1: rule__XFeatureCall__Group__0 : rule__XFeatureCall__Group__0__Impl rule__XFeatureCall__Group__1 ;
     public final void rule__XFeatureCall__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18511:1: ( rule__XFeatureCall__Group__0__Impl rule__XFeatureCall__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18512:2: rule__XFeatureCall__Group__0__Impl rule__XFeatureCall__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18417:1: ( rule__XFeatureCall__Group__0__Impl rule__XFeatureCall__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18418:2: rule__XFeatureCall__Group__0__Impl rule__XFeatureCall__Group__1
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group__0__Impl_in_rule__XFeatureCall__Group__037453);
+            pushFollow(FOLLOW_rule__XFeatureCall__Group__0__Impl_in_rule__XFeatureCall__Group__037267);
             rule__XFeatureCall__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group__1_in_rule__XFeatureCall__Group__037456);
+            pushFollow(FOLLOW_rule__XFeatureCall__Group__1_in_rule__XFeatureCall__Group__037270);
             rule__XFeatureCall__Group__1();
 
             state._fsp--;
@@ -53338,23 +53075,23 @@ public final void rule__XFeatureCall__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18519:1: rule__XFeatureCall__Group__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18425:1: rule__XFeatureCall__Group__0__Impl : ( () ) ;
     public final void rule__XFeatureCall__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18523:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18524:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18429:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18430:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18524:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18525:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18430:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18431:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getXFeatureCallAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18526:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18528:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18432:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18434:1: 
             {
             }
 
@@ -53379,21 +53116,21 @@ public final void rule__XFeatureCall__Group__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XFeatureCall__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18538:1: rule__XFeatureCall__Group__1 : rule__XFeatureCall__Group__1__Impl rule__XFeatureCall__Group__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18444:1: rule__XFeatureCall__Group__1 : rule__XFeatureCall__Group__1__Impl rule__XFeatureCall__Group__2 ;
     public final void rule__XFeatureCall__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18542:1: ( rule__XFeatureCall__Group__1__Impl rule__XFeatureCall__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18543:2: rule__XFeatureCall__Group__1__Impl rule__XFeatureCall__Group__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18448:1: ( rule__XFeatureCall__Group__1__Impl rule__XFeatureCall__Group__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18449:2: rule__XFeatureCall__Group__1__Impl rule__XFeatureCall__Group__2
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group__1__Impl_in_rule__XFeatureCall__Group__137514);
+            pushFollow(FOLLOW_rule__XFeatureCall__Group__1__Impl_in_rule__XFeatureCall__Group__137328);
             rule__XFeatureCall__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group__2_in_rule__XFeatureCall__Group__137517);
+            pushFollow(FOLLOW_rule__XFeatureCall__Group__2_in_rule__XFeatureCall__Group__137331);
             rule__XFeatureCall__Group__2();
 
             state._fsp--;
@@ -53417,33 +53154,33 @@ public final void rule__XFeatureCall__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18550:1: rule__XFeatureCall__Group__1__Impl : ( ( rule__XFeatureCall__Group_1__0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18456:1: rule__XFeatureCall__Group__1__Impl : ( ( rule__XFeatureCall__Group_1__0 )? ) ;
     public final void rule__XFeatureCall__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18554:1: ( ( ( rule__XFeatureCall__Group_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18555:1: ( ( rule__XFeatureCall__Group_1__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18460:1: ( ( ( rule__XFeatureCall__Group_1__0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18461:1: ( ( rule__XFeatureCall__Group_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18555:1: ( ( rule__XFeatureCall__Group_1__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18556:1: ( rule__XFeatureCall__Group_1__0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18461:1: ( ( rule__XFeatureCall__Group_1__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18462:1: ( rule__XFeatureCall__Group_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18557:1: ( rule__XFeatureCall__Group_1__0 )?
-            int alt138=2;
-            int LA138_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18463:1: ( rule__XFeatureCall__Group_1__0 )?
+            int alt137=2;
+            int LA137_0 = input.LA(1);
 
-            if ( (LA138_0==47) ) {
-                alt138=1;
+            if ( (LA137_0==47) ) {
+                alt137=1;
             }
-            switch (alt138) {
+            switch (alt137) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18557:2: rule__XFeatureCall__Group_1__0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18463:2: rule__XFeatureCall__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__XFeatureCall__Group_1__0_in_rule__XFeatureCall__Group__1__Impl37544);
+                    pushFollow(FOLLOW_rule__XFeatureCall__Group_1__0_in_rule__XFeatureCall__Group__1__Impl37358);
                     rule__XFeatureCall__Group_1__0();
 
                     state._fsp--;
@@ -53479,21 +53216,21 @@ public final void rule__XFeatureCall__Group__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XFeatureCall__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18567:1: rule__XFeatureCall__Group__2 : rule__XFeatureCall__Group__2__Impl rule__XFeatureCall__Group__3 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18473:1: rule__XFeatureCall__Group__2 : rule__XFeatureCall__Group__2__Impl rule__XFeatureCall__Group__3 ;
     public final void rule__XFeatureCall__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18571:1: ( rule__XFeatureCall__Group__2__Impl rule__XFeatureCall__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18572:2: rule__XFeatureCall__Group__2__Impl rule__XFeatureCall__Group__3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18477:1: ( rule__XFeatureCall__Group__2__Impl rule__XFeatureCall__Group__3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18478:2: rule__XFeatureCall__Group__2__Impl rule__XFeatureCall__Group__3
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group__2__Impl_in_rule__XFeatureCall__Group__237575);
+            pushFollow(FOLLOW_rule__XFeatureCall__Group__2__Impl_in_rule__XFeatureCall__Group__237389);
             rule__XFeatureCall__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group__3_in_rule__XFeatureCall__Group__237578);
+            pushFollow(FOLLOW_rule__XFeatureCall__Group__3_in_rule__XFeatureCall__Group__237392);
             rule__XFeatureCall__Group__3();
 
             state._fsp--;
@@ -53517,25 +53254,25 @@ public final void rule__XFeatureCall__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18579:1: rule__XFeatureCall__Group__2__Impl : ( ( rule__XFeatureCall__FeatureAssignment_2 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18485:1: rule__XFeatureCall__Group__2__Impl : ( ( rule__XFeatureCall__FeatureAssignment_2 ) ) ;
     public final void rule__XFeatureCall__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18583:1: ( ( ( rule__XFeatureCall__FeatureAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18584:1: ( ( rule__XFeatureCall__FeatureAssignment_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18489:1: ( ( ( rule__XFeatureCall__FeatureAssignment_2 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18490:1: ( ( rule__XFeatureCall__FeatureAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18584:1: ( ( rule__XFeatureCall__FeatureAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18585:1: ( rule__XFeatureCall__FeatureAssignment_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18490:1: ( ( rule__XFeatureCall__FeatureAssignment_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18491:1: ( rule__XFeatureCall__FeatureAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18586:1: ( rule__XFeatureCall__FeatureAssignment_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18586:2: rule__XFeatureCall__FeatureAssignment_2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18492:1: ( rule__XFeatureCall__FeatureAssignment_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18492:2: rule__XFeatureCall__FeatureAssignment_2
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__FeatureAssignment_2_in_rule__XFeatureCall__Group__2__Impl37605);
+            pushFollow(FOLLOW_rule__XFeatureCall__FeatureAssignment_2_in_rule__XFeatureCall__Group__2__Impl37419);
             rule__XFeatureCall__FeatureAssignment_2();
 
             state._fsp--;
@@ -53568,21 +53305,21 @@ public final void rule__XFeatureCall__Group__2__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XFeatureCall__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18596:1: rule__XFeatureCall__Group__3 : rule__XFeatureCall__Group__3__Impl rule__XFeatureCall__Group__4 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18502:1: rule__XFeatureCall__Group__3 : rule__XFeatureCall__Group__3__Impl rule__XFeatureCall__Group__4 ;
     public final void rule__XFeatureCall__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18600:1: ( rule__XFeatureCall__Group__3__Impl rule__XFeatureCall__Group__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18601:2: rule__XFeatureCall__Group__3__Impl rule__XFeatureCall__Group__4
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18506:1: ( rule__XFeatureCall__Group__3__Impl rule__XFeatureCall__Group__4 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18507:2: rule__XFeatureCall__Group__3__Impl rule__XFeatureCall__Group__4
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group__3__Impl_in_rule__XFeatureCall__Group__337635);
+            pushFollow(FOLLOW_rule__XFeatureCall__Group__3__Impl_in_rule__XFeatureCall__Group__337449);
             rule__XFeatureCall__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group__4_in_rule__XFeatureCall__Group__337638);
+            pushFollow(FOLLOW_rule__XFeatureCall__Group__4_in_rule__XFeatureCall__Group__337452);
             rule__XFeatureCall__Group__4();
 
             state._fsp--;
@@ -53606,29 +53343,29 @@ public final void rule__XFeatureCall__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18608:1: rule__XFeatureCall__Group__3__Impl : ( ( rule__XFeatureCall__Group_3__0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18514:1: rule__XFeatureCall__Group__3__Impl : ( ( rule__XFeatureCall__Group_3__0 )? ) ;
     public final void rule__XFeatureCall__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18612:1: ( ( ( rule__XFeatureCall__Group_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18613:1: ( ( rule__XFeatureCall__Group_3__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18518:1: ( ( ( rule__XFeatureCall__Group_3__0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18519:1: ( ( rule__XFeatureCall__Group_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18613:1: ( ( rule__XFeatureCall__Group_3__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18614:1: ( rule__XFeatureCall__Group_3__0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18519:1: ( ( rule__XFeatureCall__Group_3__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18520:1: ( rule__XFeatureCall__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getGroup_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18615:1: ( rule__XFeatureCall__Group_3__0 )?
-            int alt139=2;
-            alt139 = dfa139.predict(input);
-            switch (alt139) {
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18521:1: ( rule__XFeatureCall__Group_3__0 )?
+            int alt138=2;
+            alt138 = dfa138.predict(input);
+            switch (alt138) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18615:2: rule__XFeatureCall__Group_3__0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18521:2: rule__XFeatureCall__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__XFeatureCall__Group_3__0_in_rule__XFeatureCall__Group__3__Impl37665);
+                    pushFollow(FOLLOW_rule__XFeatureCall__Group_3__0_in_rule__XFeatureCall__Group__3__Impl37479);
                     rule__XFeatureCall__Group_3__0();
 
                     state._fsp--;
@@ -53664,16 +53401,16 @@ public final void rule__XFeatureCall__Group__3__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XFeatureCall__Group__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18625:1: rule__XFeatureCall__Group__4 : rule__XFeatureCall__Group__4__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18531:1: rule__XFeatureCall__Group__4 : rule__XFeatureCall__Group__4__Impl ;
     public final void rule__XFeatureCall__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18629:1: ( rule__XFeatureCall__Group__4__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18630:2: rule__XFeatureCall__Group__4__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18535:1: ( rule__XFeatureCall__Group__4__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18536:2: rule__XFeatureCall__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group__4__Impl_in_rule__XFeatureCall__Group__437696);
+            pushFollow(FOLLOW_rule__XFeatureCall__Group__4__Impl_in_rule__XFeatureCall__Group__437510);
             rule__XFeatureCall__Group__4__Impl();
 
             state._fsp--;
@@ -53697,29 +53434,29 @@ public final void rule__XFeatureCall__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18636:1: rule__XFeatureCall__Group__4__Impl : ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18542:1: rule__XFeatureCall__Group__4__Impl : ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? ) ;
     public final void rule__XFeatureCall__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18640:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18641:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18546:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18547:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18641:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18642:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18547:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18548:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsAssignment_4()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18643:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )?
-            int alt140=2;
-            alt140 = dfa140.predict(input);
-            switch (alt140) {
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18549:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )?
+            int alt139=2;
+            alt139 = dfa139.predict(input);
+            switch (alt139) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18643:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_4
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18549:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_4
                     {
-                    pushFollow(FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_4_in_rule__XFeatureCall__Group__4__Impl37723);
+                    pushFollow(FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_4_in_rule__XFeatureCall__Group__4__Impl37537);
                     rule__XFeatureCall__FeatureCallArgumentsAssignment_4();
 
                     state._fsp--;
@@ -53755,21 +53492,21 @@ public final void rule__XFeatureCall__Group__4__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18663:1: rule__XFeatureCall__Group_1__0 : rule__XFeatureCall__Group_1__0__Impl rule__XFeatureCall__Group_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18569:1: rule__XFeatureCall__Group_1__0 : rule__XFeatureCall__Group_1__0__Impl rule__XFeatureCall__Group_1__1 ;
     public final void rule__XFeatureCall__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18667:1: ( rule__XFeatureCall__Group_1__0__Impl rule__XFeatureCall__Group_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18668:2: rule__XFeatureCall__Group_1__0__Impl rule__XFeatureCall__Group_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18573:1: ( rule__XFeatureCall__Group_1__0__Impl rule__XFeatureCall__Group_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18574:2: rule__XFeatureCall__Group_1__0__Impl rule__XFeatureCall__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_1__0__Impl_in_rule__XFeatureCall__Group_1__037764);
+            pushFollow(FOLLOW_rule__XFeatureCall__Group_1__0__Impl_in_rule__XFeatureCall__Group_1__037578);
             rule__XFeatureCall__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_1__1_in_rule__XFeatureCall__Group_1__037767);
+            pushFollow(FOLLOW_rule__XFeatureCall__Group_1__1_in_rule__XFeatureCall__Group_1__037581);
             rule__XFeatureCall__Group_1__1();
 
             state._fsp--;
@@ -53793,22 +53530,22 @@ public final void rule__XFeatureCall__Group_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18675:1: rule__XFeatureCall__Group_1__0__Impl : ( '<' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18581:1: rule__XFeatureCall__Group_1__0__Impl : ( '<' ) ;
     public final void rule__XFeatureCall__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18679:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18680:1: ( '<' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18585:1: ( ( '<' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18586:1: ( '<' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18680:1: ( '<' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18681:1: '<'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18586:1: ( '<' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18587:1: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getLessThanSignKeyword_1_0()); 
             }
-            match(input,47,FOLLOW_47_in_rule__XFeatureCall__Group_1__0__Impl37795); if (state.failed) return ;
+            match(input,47,FOLLOW_47_in_rule__XFeatureCall__Group_1__0__Impl37609); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFeatureCallAccess().getLessThanSignKeyword_1_0()); 
             }
@@ -53834,21 +53571,21 @@ public final void rule__XFeatureCall__Group_1__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18694:1: rule__XFeatureCall__Group_1__1 : rule__XFeatureCall__Group_1__1__Impl rule__XFeatureCall__Group_1__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18600:1: rule__XFeatureCall__Group_1__1 : rule__XFeatureCall__Group_1__1__Impl rule__XFeatureCall__Group_1__2 ;
     public final void rule__XFeatureCall__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18698:1: ( rule__XFeatureCall__Group_1__1__Impl rule__XFeatureCall__Group_1__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18699:2: rule__XFeatureCall__Group_1__1__Impl rule__XFeatureCall__Group_1__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18604:1: ( rule__XFeatureCall__Group_1__1__Impl rule__XFeatureCall__Group_1__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18605:2: rule__XFeatureCall__Group_1__1__Impl rule__XFeatureCall__Group_1__2
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_1__1__Impl_in_rule__XFeatureCall__Group_1__137826);
+            pushFollow(FOLLOW_rule__XFeatureCall__Group_1__1__Impl_in_rule__XFeatureCall__Group_1__137640);
             rule__XFeatureCall__Group_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_1__2_in_rule__XFeatureCall__Group_1__137829);
+            pushFollow(FOLLOW_rule__XFeatureCall__Group_1__2_in_rule__XFeatureCall__Group_1__137643);
             rule__XFeatureCall__Group_1__2();
 
             state._fsp--;
@@ -53872,25 +53609,25 @@ public final void rule__XFeatureCall__Group_1__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18706:1: rule__XFeatureCall__Group_1__1__Impl : ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18612:1: rule__XFeatureCall__Group_1__1__Impl : ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) ) ;
     public final void rule__XFeatureCall__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18710:1: ( ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18711:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18616:1: ( ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18617:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18711:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18712:1: ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18617:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18618:1: ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getTypeArgumentsAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18713:1: ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18713:2: rule__XFeatureCall__TypeArgumentsAssignment_1_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18619:1: ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18619:2: rule__XFeatureCall__TypeArgumentsAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__TypeArgumentsAssignment_1_1_in_rule__XFeatureCall__Group_1__1__Impl37856);
+            pushFollow(FOLLOW_rule__XFeatureCall__TypeArgumentsAssignment_1_1_in_rule__XFeatureCall__Group_1__1__Impl37670);
             rule__XFeatureCall__TypeArgumentsAssignment_1_1();
 
             state._fsp--;
@@ -53923,21 +53660,21 @@ public final void rule__XFeatureCall__Group_1__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18723:1: rule__XFeatureCall__Group_1__2 : rule__XFeatureCall__Group_1__2__Impl rule__XFeatureCall__Group_1__3 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18629:1: rule__XFeatureCall__Group_1__2 : rule__XFeatureCall__Group_1__2__Impl rule__XFeatureCall__Group_1__3 ;
     public final void rule__XFeatureCall__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18727:1: ( rule__XFeatureCall__Group_1__2__Impl rule__XFeatureCall__Group_1__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18728:2: rule__XFeatureCall__Group_1__2__Impl rule__XFeatureCall__Group_1__3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18633:1: ( rule__XFeatureCall__Group_1__2__Impl rule__XFeatureCall__Group_1__3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18634:2: rule__XFeatureCall__Group_1__2__Impl rule__XFeatureCall__Group_1__3
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_1__2__Impl_in_rule__XFeatureCall__Group_1__237886);
+            pushFollow(FOLLOW_rule__XFeatureCall__Group_1__2__Impl_in_rule__XFeatureCall__Group_1__237700);
             rule__XFeatureCall__Group_1__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_1__3_in_rule__XFeatureCall__Group_1__237889);
+            pushFollow(FOLLOW_rule__XFeatureCall__Group_1__3_in_rule__XFeatureCall__Group_1__237703);
             rule__XFeatureCall__Group_1__3();
 
             state._fsp--;
@@ -53961,37 +53698,37 @@ public final void rule__XFeatureCall__Group_1__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18735:1: rule__XFeatureCall__Group_1__2__Impl : ( ( rule__XFeatureCall__Group_1_2__0 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18641:1: rule__XFeatureCall__Group_1__2__Impl : ( ( rule__XFeatureCall__Group_1_2__0 )* ) ;
     public final void rule__XFeatureCall__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18739:1: ( ( ( rule__XFeatureCall__Group_1_2__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18740:1: ( ( rule__XFeatureCall__Group_1_2__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18645:1: ( ( ( rule__XFeatureCall__Group_1_2__0 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18646:1: ( ( rule__XFeatureCall__Group_1_2__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18740:1: ( ( rule__XFeatureCall__Group_1_2__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18741:1: ( rule__XFeatureCall__Group_1_2__0 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18646:1: ( ( rule__XFeatureCall__Group_1_2__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18647:1: ( rule__XFeatureCall__Group_1_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getGroup_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18742:1: ( rule__XFeatureCall__Group_1_2__0 )*
-            loop141:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18648:1: ( rule__XFeatureCall__Group_1_2__0 )*
+            loop140:
             do {
-                int alt141=2;
-                int LA141_0 = input.LA(1);
+                int alt140=2;
+                int LA140_0 = input.LA(1);
 
-                if ( (LA141_0==74) ) {
-                    alt141=1;
+                if ( (LA140_0==74) ) {
+                    alt140=1;
                 }
 
 
-                switch (alt141) {
+                switch (alt140) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18742:2: rule__XFeatureCall__Group_1_2__0
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18648:2: rule__XFeatureCall__Group_1_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__XFeatureCall__Group_1_2__0_in_rule__XFeatureCall__Group_1__2__Impl37916);
+            	    pushFollow(FOLLOW_rule__XFeatureCall__Group_1_2__0_in_rule__XFeatureCall__Group_1__2__Impl37730);
             	    rule__XFeatureCall__Group_1_2__0();
 
             	    state._fsp--;
@@ -54001,7 +53738,7 @@ public final void rule__XFeatureCall__Group_1__2__Impl() throws RecognitionExcep
             	    break;
 
             	default :
-            	    break loop141;
+            	    break loop140;
                 }
             } while (true);
 
@@ -54030,16 +53767,16 @@ public final void rule__XFeatureCall__Group_1__2__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18752:1: rule__XFeatureCall__Group_1__3 : rule__XFeatureCall__Group_1__3__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18658:1: rule__XFeatureCall__Group_1__3 : rule__XFeatureCall__Group_1__3__Impl ;
     public final void rule__XFeatureCall__Group_1__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18756:1: ( rule__XFeatureCall__Group_1__3__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18757:2: rule__XFeatureCall__Group_1__3__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18662:1: ( rule__XFeatureCall__Group_1__3__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18663:2: rule__XFeatureCall__Group_1__3__Impl
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_1__3__Impl_in_rule__XFeatureCall__Group_1__337947);
+            pushFollow(FOLLOW_rule__XFeatureCall__Group_1__3__Impl_in_rule__XFeatureCall__Group_1__337761);
             rule__XFeatureCall__Group_1__3__Impl();
 
             state._fsp--;
@@ -54063,22 +53800,22 @@ public final void rule__XFeatureCall__Group_1__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18763:1: rule__XFeatureCall__Group_1__3__Impl : ( '>' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18669:1: rule__XFeatureCall__Group_1__3__Impl : ( '>' ) ;
     public final void rule__XFeatureCall__Group_1__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18767:1: ( ( '>' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18768:1: ( '>' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18673:1: ( ( '>' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18674:1: ( '>' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18768:1: ( '>' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18769:1: '>'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18674:1: ( '>' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18675:1: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getGreaterThanSignKeyword_1_3()); 
             }
-            match(input,46,FOLLOW_46_in_rule__XFeatureCall__Group_1__3__Impl37975); if (state.failed) return ;
+            match(input,46,FOLLOW_46_in_rule__XFeatureCall__Group_1__3__Impl37789); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFeatureCallAccess().getGreaterThanSignKeyword_1_3()); 
             }
@@ -54104,21 +53841,21 @@ public final void rule__XFeatureCall__Group_1__3__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1_2__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18790:1: rule__XFeatureCall__Group_1_2__0 : rule__XFeatureCall__Group_1_2__0__Impl rule__XFeatureCall__Group_1_2__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18696:1: rule__XFeatureCall__Group_1_2__0 : rule__XFeatureCall__Group_1_2__0__Impl rule__XFeatureCall__Group_1_2__1 ;
     public final void rule__XFeatureCall__Group_1_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18794:1: ( rule__XFeatureCall__Group_1_2__0__Impl rule__XFeatureCall__Group_1_2__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18795:2: rule__XFeatureCall__Group_1_2__0__Impl rule__XFeatureCall__Group_1_2__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18700:1: ( rule__XFeatureCall__Group_1_2__0__Impl rule__XFeatureCall__Group_1_2__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18701:2: rule__XFeatureCall__Group_1_2__0__Impl rule__XFeatureCall__Group_1_2__1
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_1_2__0__Impl_in_rule__XFeatureCall__Group_1_2__038014);
+            pushFollow(FOLLOW_rule__XFeatureCall__Group_1_2__0__Impl_in_rule__XFeatureCall__Group_1_2__037828);
             rule__XFeatureCall__Group_1_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_1_2__1_in_rule__XFeatureCall__Group_1_2__038017);
+            pushFollow(FOLLOW_rule__XFeatureCall__Group_1_2__1_in_rule__XFeatureCall__Group_1_2__037831);
             rule__XFeatureCall__Group_1_2__1();
 
             state._fsp--;
@@ -54142,22 +53879,22 @@ public final void rule__XFeatureCall__Group_1_2__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1_2__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18802:1: rule__XFeatureCall__Group_1_2__0__Impl : ( ',' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18708:1: rule__XFeatureCall__Group_1_2__0__Impl : ( ',' ) ;
     public final void rule__XFeatureCall__Group_1_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18806:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18807:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18712:1: ( ( ',' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18713:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18807:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18808:1: ','
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18713:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18714:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getCommaKeyword_1_2_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XFeatureCall__Group_1_2__0__Impl38045); if (state.failed) return ;
+            match(input,74,FOLLOW_74_in_rule__XFeatureCall__Group_1_2__0__Impl37859); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFeatureCallAccess().getCommaKeyword_1_2_0()); 
             }
@@ -54183,16 +53920,16 @@ public final void rule__XFeatureCall__Group_1_2__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1_2__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18821:1: rule__XFeatureCall__Group_1_2__1 : rule__XFeatureCall__Group_1_2__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18727:1: rule__XFeatureCall__Group_1_2__1 : rule__XFeatureCall__Group_1_2__1__Impl ;
     public final void rule__XFeatureCall__Group_1_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18825:1: ( rule__XFeatureCall__Group_1_2__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18826:2: rule__XFeatureCall__Group_1_2__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18731:1: ( rule__XFeatureCall__Group_1_2__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18732:2: rule__XFeatureCall__Group_1_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_1_2__1__Impl_in_rule__XFeatureCall__Group_1_2__138076);
+            pushFollow(FOLLOW_rule__XFeatureCall__Group_1_2__1__Impl_in_rule__XFeatureCall__Group_1_2__137890);
             rule__XFeatureCall__Group_1_2__1__Impl();
 
             state._fsp--;
@@ -54216,25 +53953,25 @@ public final void rule__XFeatureCall__Group_1_2__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1_2__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18832:1: rule__XFeatureCall__Group_1_2__1__Impl : ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18738:1: rule__XFeatureCall__Group_1_2__1__Impl : ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) ) ;
     public final void rule__XFeatureCall__Group_1_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18836:1: ( ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18837:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18742:1: ( ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18743:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18837:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18838:1: ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18743:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18744:1: ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getTypeArgumentsAssignment_1_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18839:1: ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18839:2: rule__XFeatureCall__TypeArgumentsAssignment_1_2_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18745:1: ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18745:2: rule__XFeatureCall__TypeArgumentsAssignment_1_2_1
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__TypeArgumentsAssignment_1_2_1_in_rule__XFeatureCall__Group_1_2__1__Impl38103);
+            pushFollow(FOLLOW_rule__XFeatureCall__TypeArgumentsAssignment_1_2_1_in_rule__XFeatureCall__Group_1_2__1__Impl37917);
             rule__XFeatureCall__TypeArgumentsAssignment_1_2_1();
 
             state._fsp--;
@@ -54267,21 +54004,21 @@ public final void rule__XFeatureCall__Group_1_2__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18853:1: rule__XFeatureCall__Group_3__0 : rule__XFeatureCall__Group_3__0__Impl rule__XFeatureCall__Group_3__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18759:1: rule__XFeatureCall__Group_3__0 : rule__XFeatureCall__Group_3__0__Impl rule__XFeatureCall__Group_3__1 ;
     public final void rule__XFeatureCall__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18857:1: ( rule__XFeatureCall__Group_3__0__Impl rule__XFeatureCall__Group_3__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18858:2: rule__XFeatureCall__Group_3__0__Impl rule__XFeatureCall__Group_3__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18763:1: ( rule__XFeatureCall__Group_3__0__Impl rule__XFeatureCall__Group_3__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18764:2: rule__XFeatureCall__Group_3__0__Impl rule__XFeatureCall__Group_3__1
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3__0__Impl_in_rule__XFeatureCall__Group_3__038137);
+            pushFollow(FOLLOW_rule__XFeatureCall__Group_3__0__Impl_in_rule__XFeatureCall__Group_3__037951);
             rule__XFeatureCall__Group_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3__1_in_rule__XFeatureCall__Group_3__038140);
+            pushFollow(FOLLOW_rule__XFeatureCall__Group_3__1_in_rule__XFeatureCall__Group_3__037954);
             rule__XFeatureCall__Group_3__1();
 
             state._fsp--;
@@ -54305,25 +54042,25 @@ public final void rule__XFeatureCall__Group_3__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18865:1: rule__XFeatureCall__Group_3__0__Impl : ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18771:1: rule__XFeatureCall__Group_3__0__Impl : ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) ) ;
     public final void rule__XFeatureCall__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18869:1: ( ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18870:1: ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18775:1: ( ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18776:1: ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18870:1: ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18871:1: ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18776:1: ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18777:1: ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getExplicitOperationCallAssignment_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18872:1: ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18872:2: rule__XFeatureCall__ExplicitOperationCallAssignment_3_0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18778:1: ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18778:2: rule__XFeatureCall__ExplicitOperationCallAssignment_3_0
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__ExplicitOperationCallAssignment_3_0_in_rule__XFeatureCall__Group_3__0__Impl38167);
+            pushFollow(FOLLOW_rule__XFeatureCall__ExplicitOperationCallAssignment_3_0_in_rule__XFeatureCall__Group_3__0__Impl37981);
             rule__XFeatureCall__ExplicitOperationCallAssignment_3_0();
 
             state._fsp--;
@@ -54356,21 +54093,21 @@ public final void rule__XFeatureCall__Group_3__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18882:1: rule__XFeatureCall__Group_3__1 : rule__XFeatureCall__Group_3__1__Impl rule__XFeatureCall__Group_3__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18788:1: rule__XFeatureCall__Group_3__1 : rule__XFeatureCall__Group_3__1__Impl rule__XFeatureCall__Group_3__2 ;
     public final void rule__XFeatureCall__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18886:1: ( rule__XFeatureCall__Group_3__1__Impl rule__XFeatureCall__Group_3__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18887:2: rule__XFeatureCall__Group_3__1__Impl rule__XFeatureCall__Group_3__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18792:1: ( rule__XFeatureCall__Group_3__1__Impl rule__XFeatureCall__Group_3__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18793:2: rule__XFeatureCall__Group_3__1__Impl rule__XFeatureCall__Group_3__2
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3__1__Impl_in_rule__XFeatureCall__Group_3__138197);
+            pushFollow(FOLLOW_rule__XFeatureCall__Group_3__1__Impl_in_rule__XFeatureCall__Group_3__138011);
             rule__XFeatureCall__Group_3__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3__2_in_rule__XFeatureCall__Group_3__138200);
+            pushFollow(FOLLOW_rule__XFeatureCall__Group_3__2_in_rule__XFeatureCall__Group_3__138014);
             rule__XFeatureCall__Group_3__2();
 
             state._fsp--;
@@ -54394,33 +54131,33 @@ public final void rule__XFeatureCall__Group_3__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18894:1: rule__XFeatureCall__Group_3__1__Impl : ( ( rule__XFeatureCall__Alternatives_3_1 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18800:1: rule__XFeatureCall__Group_3__1__Impl : ( ( rule__XFeatureCall__Alternatives_3_1 )? ) ;
     public final void rule__XFeatureCall__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18898:1: ( ( ( rule__XFeatureCall__Alternatives_3_1 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18899:1: ( ( rule__XFeatureCall__Alternatives_3_1 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18804:1: ( ( ( rule__XFeatureCall__Alternatives_3_1 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18805:1: ( ( rule__XFeatureCall__Alternatives_3_1 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18899:1: ( ( rule__XFeatureCall__Alternatives_3_1 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18900:1: ( rule__XFeatureCall__Alternatives_3_1 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18805:1: ( ( rule__XFeatureCall__Alternatives_3_1 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18806:1: ( rule__XFeatureCall__Alternatives_3_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getAlternatives_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18901:1: ( rule__XFeatureCall__Alternatives_3_1 )?
-            int alt142=2;
-            int LA142_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18807:1: ( rule__XFeatureCall__Alternatives_3_1 )?
+            int alt141=2;
+            int LA141_0 = input.LA(1);
 
-            if ( ((LA142_0>=RULE_ID && LA142_0<=RULE_STRING)||(LA142_0>=16 && LA142_0<=35)||LA142_0==47||LA142_0==51||(LA142_0>=54 && LA142_0<=55)||LA142_0==60||(LA142_0>=65 && LA142_0<=66)||LA142_0==68||LA142_0==70||LA142_0==72||(LA142_0>=77 && LA142_0<=78)||(LA142_0>=80 && LA142_0<=81)||LA142_0==84||LA142_0==86||(LA142_0>=90 && LA142_0<=97)||LA142_0==99||LA142_0==106||LA142_0==108) ) {
-                alt142=1;
+            if ( ((LA141_0>=RULE_ID && LA141_0<=RULE_STRING)||(LA141_0>=16 && LA141_0<=35)||LA141_0==47||LA141_0==51||(LA141_0>=54 && LA141_0<=55)||LA141_0==60||(LA141_0>=65 && LA141_0<=66)||LA141_0==68||LA141_0==70||LA141_0==72||(LA141_0>=77 && LA141_0<=78)||(LA141_0>=80 && LA141_0<=81)||LA141_0==84||LA141_0==86||(LA141_0>=90 && LA141_0<=97)||LA141_0==99||LA141_0==106||LA141_0==108) ) {
+                alt141=1;
             }
-            switch (alt142) {
+            switch (alt141) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18901:2: rule__XFeatureCall__Alternatives_3_1
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18807:2: rule__XFeatureCall__Alternatives_3_1
                     {
-                    pushFollow(FOLLOW_rule__XFeatureCall__Alternatives_3_1_in_rule__XFeatureCall__Group_3__1__Impl38227);
+                    pushFollow(FOLLOW_rule__XFeatureCall__Alternatives_3_1_in_rule__XFeatureCall__Group_3__1__Impl38041);
                     rule__XFeatureCall__Alternatives_3_1();
 
                     state._fsp--;
@@ -54456,16 +54193,16 @@ public final void rule__XFeatureCall__Group_3__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18911:1: rule__XFeatureCall__Group_3__2 : rule__XFeatureCall__Group_3__2__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18817:1: rule__XFeatureCall__Group_3__2 : rule__XFeatureCall__Group_3__2__Impl ;
     public final void rule__XFeatureCall__Group_3__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18915:1: ( rule__XFeatureCall__Group_3__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18916:2: rule__XFeatureCall__Group_3__2__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18821:1: ( rule__XFeatureCall__Group_3__2__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18822:2: rule__XFeatureCall__Group_3__2__Impl
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3__2__Impl_in_rule__XFeatureCall__Group_3__238258);
+            pushFollow(FOLLOW_rule__XFeatureCall__Group_3__2__Impl_in_rule__XFeatureCall__Group_3__238072);
             rule__XFeatureCall__Group_3__2__Impl();
 
             state._fsp--;
@@ -54489,22 +54226,22 @@ public final void rule__XFeatureCall__Group_3__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18922:1: rule__XFeatureCall__Group_3__2__Impl : ( ')' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18828:1: rule__XFeatureCall__Group_3__2__Impl : ( ')' ) ;
     public final void rule__XFeatureCall__Group_3__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18926:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18927:1: ( ')' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18832:1: ( ( ')' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18833:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18927:1: ( ')' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18928:1: ')'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18833:1: ( ')' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18834:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getRightParenthesisKeyword_3_2()); 
             }
-            match(input,73,FOLLOW_73_in_rule__XFeatureCall__Group_3__2__Impl38286); if (state.failed) return ;
+            match(input,73,FOLLOW_73_in_rule__XFeatureCall__Group_3__2__Impl38100); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFeatureCallAccess().getRightParenthesisKeyword_3_2()); 
             }
@@ -54530,21 +54267,21 @@ public final void rule__XFeatureCall__Group_3__2__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18947:1: rule__XFeatureCall__Group_3_1_1__0 : rule__XFeatureCall__Group_3_1_1__0__Impl rule__XFeatureCall__Group_3_1_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18853:1: rule__XFeatureCall__Group_3_1_1__0 : rule__XFeatureCall__Group_3_1_1__0__Impl rule__XFeatureCall__Group_3_1_1__1 ;
     public final void rule__XFeatureCall__Group_3_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18951:1: ( rule__XFeatureCall__Group_3_1_1__0__Impl rule__XFeatureCall__Group_3_1_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18952:2: rule__XFeatureCall__Group_3_1_1__0__Impl rule__XFeatureCall__Group_3_1_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18857:1: ( rule__XFeatureCall__Group_3_1_1__0__Impl rule__XFeatureCall__Group_3_1_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18858:2: rule__XFeatureCall__Group_3_1_1__0__Impl rule__XFeatureCall__Group_3_1_1__1
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3_1_1__0__Impl_in_rule__XFeatureCall__Group_3_1_1__038323);
+            pushFollow(FOLLOW_rule__XFeatureCall__Group_3_1_1__0__Impl_in_rule__XFeatureCall__Group_3_1_1__038137);
             rule__XFeatureCall__Group_3_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3_1_1__1_in_rule__XFeatureCall__Group_3_1_1__038326);
+            pushFollow(FOLLOW_rule__XFeatureCall__Group_3_1_1__1_in_rule__XFeatureCall__Group_3_1_1__038140);
             rule__XFeatureCall__Group_3_1_1__1();
 
             state._fsp--;
@@ -54568,25 +54305,25 @@ public final void rule__XFeatureCall__Group_3_1_1__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18959:1: rule__XFeatureCall__Group_3_1_1__0__Impl : ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18865:1: rule__XFeatureCall__Group_3_1_1__0__Impl : ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) ) ;
     public final void rule__XFeatureCall__Group_3_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18963:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18964:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18869:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18870:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18964:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18965:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18870:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18871:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsAssignment_3_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18966:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18966:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18872:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18872:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0_in_rule__XFeatureCall__Group_3_1_1__0__Impl38353);
+            pushFollow(FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0_in_rule__XFeatureCall__Group_3_1_1__0__Impl38167);
             rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0();
 
             state._fsp--;
@@ -54619,16 +54356,16 @@ public final void rule__XFeatureCall__Group_3_1_1__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18976:1: rule__XFeatureCall__Group_3_1_1__1 : rule__XFeatureCall__Group_3_1_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18882:1: rule__XFeatureCall__Group_3_1_1__1 : rule__XFeatureCall__Group_3_1_1__1__Impl ;
     public final void rule__XFeatureCall__Group_3_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18980:1: ( rule__XFeatureCall__Group_3_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18981:2: rule__XFeatureCall__Group_3_1_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18886:1: ( rule__XFeatureCall__Group_3_1_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18887:2: rule__XFeatureCall__Group_3_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3_1_1__1__Impl_in_rule__XFeatureCall__Group_3_1_1__138383);
+            pushFollow(FOLLOW_rule__XFeatureCall__Group_3_1_1__1__Impl_in_rule__XFeatureCall__Group_3_1_1__138197);
             rule__XFeatureCall__Group_3_1_1__1__Impl();
 
             state._fsp--;
@@ -54652,37 +54389,37 @@ public final void rule__XFeatureCall__Group_3_1_1__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18987:1: rule__XFeatureCall__Group_3_1_1__1__Impl : ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18893:1: rule__XFeatureCall__Group_3_1_1__1__Impl : ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* ) ;
     public final void rule__XFeatureCall__Group_3_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18991:1: ( ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18992:1: ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18897:1: ( ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18898:1: ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18992:1: ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18993:1: ( rule__XFeatureCall__Group_3_1_1_1__0 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18898:1: ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18899:1: ( rule__XFeatureCall__Group_3_1_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getGroup_3_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18994:1: ( rule__XFeatureCall__Group_3_1_1_1__0 )*
-            loop143:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18900:1: ( rule__XFeatureCall__Group_3_1_1_1__0 )*
+            loop142:
             do {
-                int alt143=2;
-                int LA143_0 = input.LA(1);
+                int alt142=2;
+                int LA142_0 = input.LA(1);
 
-                if ( (LA143_0==74) ) {
-                    alt143=1;
+                if ( (LA142_0==74) ) {
+                    alt142=1;
                 }
 
 
-                switch (alt143) {
+                switch (alt142) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18994:2: rule__XFeatureCall__Group_3_1_1_1__0
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18900:2: rule__XFeatureCall__Group_3_1_1_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XFeatureCall__Group_3_1_1_1__0_in_rule__XFeatureCall__Group_3_1_1__1__Impl38410);
+            	    pushFollow(FOLLOW_rule__XFeatureCall__Group_3_1_1_1__0_in_rule__XFeatureCall__Group_3_1_1__1__Impl38224);
             	    rule__XFeatureCall__Group_3_1_1_1__0();
 
             	    state._fsp--;
@@ -54692,7 +54429,7 @@ public final void rule__XFeatureCall__Group_3_1_1__1__Impl() throws RecognitionE
             	    break;
 
             	default :
-            	    break loop143;
+            	    break loop142;
                 }
             } while (true);
 
@@ -54721,21 +54458,21 @@ public final void rule__XFeatureCall__Group_3_1_1__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19008:1: rule__XFeatureCall__Group_3_1_1_1__0 : rule__XFeatureCall__Group_3_1_1_1__0__Impl rule__XFeatureCall__Group_3_1_1_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18914:1: rule__XFeatureCall__Group_3_1_1_1__0 : rule__XFeatureCall__Group_3_1_1_1__0__Impl rule__XFeatureCall__Group_3_1_1_1__1 ;
     public final void rule__XFeatureCall__Group_3_1_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19012:1: ( rule__XFeatureCall__Group_3_1_1_1__0__Impl rule__XFeatureCall__Group_3_1_1_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19013:2: rule__XFeatureCall__Group_3_1_1_1__0__Impl rule__XFeatureCall__Group_3_1_1_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18918:1: ( rule__XFeatureCall__Group_3_1_1_1__0__Impl rule__XFeatureCall__Group_3_1_1_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18919:2: rule__XFeatureCall__Group_3_1_1_1__0__Impl rule__XFeatureCall__Group_3_1_1_1__1
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3_1_1_1__0__Impl_in_rule__XFeatureCall__Group_3_1_1_1__038445);
+            pushFollow(FOLLOW_rule__XFeatureCall__Group_3_1_1_1__0__Impl_in_rule__XFeatureCall__Group_3_1_1_1__038259);
             rule__XFeatureCall__Group_3_1_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3_1_1_1__1_in_rule__XFeatureCall__Group_3_1_1_1__038448);
+            pushFollow(FOLLOW_rule__XFeatureCall__Group_3_1_1_1__1_in_rule__XFeatureCall__Group_3_1_1_1__038262);
             rule__XFeatureCall__Group_3_1_1_1__1();
 
             state._fsp--;
@@ -54759,22 +54496,22 @@ public final void rule__XFeatureCall__Group_3_1_1_1__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19020:1: rule__XFeatureCall__Group_3_1_1_1__0__Impl : ( ',' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18926:1: rule__XFeatureCall__Group_3_1_1_1__0__Impl : ( ',' ) ;
     public final void rule__XFeatureCall__Group_3_1_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19024:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19025:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18930:1: ( ( ',' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18931:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19025:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19026:1: ','
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18931:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18932:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getCommaKeyword_3_1_1_1_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XFeatureCall__Group_3_1_1_1__0__Impl38476); if (state.failed) return ;
+            match(input,74,FOLLOW_74_in_rule__XFeatureCall__Group_3_1_1_1__0__Impl38290); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFeatureCallAccess().getCommaKeyword_3_1_1_1_0()); 
             }
@@ -54800,16 +54537,16 @@ public final void rule__XFeatureCall__Group_3_1_1_1__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19039:1: rule__XFeatureCall__Group_3_1_1_1__1 : rule__XFeatureCall__Group_3_1_1_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18945:1: rule__XFeatureCall__Group_3_1_1_1__1 : rule__XFeatureCall__Group_3_1_1_1__1__Impl ;
     public final void rule__XFeatureCall__Group_3_1_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19043:1: ( rule__XFeatureCall__Group_3_1_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19044:2: rule__XFeatureCall__Group_3_1_1_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18949:1: ( rule__XFeatureCall__Group_3_1_1_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18950:2: rule__XFeatureCall__Group_3_1_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3_1_1_1__1__Impl_in_rule__XFeatureCall__Group_3_1_1_1__138507);
+            pushFollow(FOLLOW_rule__XFeatureCall__Group_3_1_1_1__1__Impl_in_rule__XFeatureCall__Group_3_1_1_1__138321);
             rule__XFeatureCall__Group_3_1_1_1__1__Impl();
 
             state._fsp--;
@@ -54833,25 +54570,25 @@ public final void rule__XFeatureCall__Group_3_1_1_1__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19050:1: rule__XFeatureCall__Group_3_1_1_1__1__Impl : ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18956:1: rule__XFeatureCall__Group_3_1_1_1__1__Impl : ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) ) ;
     public final void rule__XFeatureCall__Group_3_1_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19054:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19055:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18960:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18961:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19055:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19056:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18961:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18962:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsAssignment_3_1_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19057:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19057:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18963:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18963:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1_in_rule__XFeatureCall__Group_3_1_1_1__1__Impl38534);
+            pushFollow(FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1_in_rule__XFeatureCall__Group_3_1_1_1__1__Impl38348);
             rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1();
 
             state._fsp--;
@@ -54884,21 +54621,21 @@ public final void rule__XFeatureCall__Group_3_1_1_1__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XConstructorCall__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19071:1: rule__XConstructorCall__Group__0 : rule__XConstructorCall__Group__0__Impl rule__XConstructorCall__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18977:1: rule__XConstructorCall__Group__0 : rule__XConstructorCall__Group__0__Impl rule__XConstructorCall__Group__1 ;
     public final void rule__XConstructorCall__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19075:1: ( rule__XConstructorCall__Group__0__Impl rule__XConstructorCall__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19076:2: rule__XConstructorCall__Group__0__Impl rule__XConstructorCall__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18981:1: ( rule__XConstructorCall__Group__0__Impl rule__XConstructorCall__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18982:2: rule__XConstructorCall__Group__0__Impl rule__XConstructorCall__Group__1
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__0__Impl_in_rule__XConstructorCall__Group__038568);
+            pushFollow(FOLLOW_rule__XConstructorCall__Group__0__Impl_in_rule__XConstructorCall__Group__038382);
             rule__XConstructorCall__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__1_in_rule__XConstructorCall__Group__038571);
+            pushFollow(FOLLOW_rule__XConstructorCall__Group__1_in_rule__XConstructorCall__Group__038385);
             rule__XConstructorCall__Group__1();
 
             state._fsp--;
@@ -54922,23 +54659,23 @@ public final void rule__XConstructorCall__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XConstructorCall__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19083:1: rule__XConstructorCall__Group__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18989:1: rule__XConstructorCall__Group__0__Impl : ( () ) ;
     public final void rule__XConstructorCall__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19087:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19088:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18993:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18994:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19088:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19089:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18994:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18995:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getXConstructorCallAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19090:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19092:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18996:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18998:1: 
             {
             }
 
@@ -54963,21 +54700,21 @@ public final void rule__XConstructorCall__Group__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XConstructorCall__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19102:1: rule__XConstructorCall__Group__1 : rule__XConstructorCall__Group__1__Impl rule__XConstructorCall__Group__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19008:1: rule__XConstructorCall__Group__1 : rule__XConstructorCall__Group__1__Impl rule__XConstructorCall__Group__2 ;
     public final void rule__XConstructorCall__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19106:1: ( rule__XConstructorCall__Group__1__Impl rule__XConstructorCall__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19107:2: rule__XConstructorCall__Group__1__Impl rule__XConstructorCall__Group__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19012:1: ( rule__XConstructorCall__Group__1__Impl rule__XConstructorCall__Group__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19013:2: rule__XConstructorCall__Group__1__Impl rule__XConstructorCall__Group__2
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__1__Impl_in_rule__XConstructorCall__Group__138629);
+            pushFollow(FOLLOW_rule__XConstructorCall__Group__1__Impl_in_rule__XConstructorCall__Group__138443);
             rule__XConstructorCall__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__2_in_rule__XConstructorCall__Group__138632);
+            pushFollow(FOLLOW_rule__XConstructorCall__Group__2_in_rule__XConstructorCall__Group__138446);
             rule__XConstructorCall__Group__2();
 
             state._fsp--;
@@ -55001,22 +54738,22 @@ public final void rule__XConstructorCall__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XConstructorCall__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19114:1: rule__XConstructorCall__Group__1__Impl : ( 'new' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19020:1: rule__XConstructorCall__Group__1__Impl : ( 'new' ) ;
     public final void rule__XConstructorCall__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19118:1: ( ( 'new' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19119:1: ( 'new' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19024:1: ( ( 'new' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19025:1: ( 'new' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19119:1: ( 'new' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19120:1: 'new'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19025:1: ( 'new' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19026:1: 'new'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getNewKeyword_1()); 
             }
-            match(input,92,FOLLOW_92_in_rule__XConstructorCall__Group__1__Impl38660); if (state.failed) return ;
+            match(input,92,FOLLOW_92_in_rule__XConstructorCall__Group__1__Impl38474); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstructorCallAccess().getNewKeyword_1()); 
             }
@@ -55042,21 +54779,21 @@ public final void rule__XConstructorCall__Group__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XConstructorCall__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19133:1: rule__XConstructorCall__Group__2 : rule__XConstructorCall__Group__2__Impl rule__XConstructorCall__Group__3 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19039:1: rule__XConstructorCall__Group__2 : rule__XConstructorCall__Group__2__Impl rule__XConstructorCall__Group__3 ;
     public final void rule__XConstructorCall__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19137:1: ( rule__XConstructorCall__Group__2__Impl rule__XConstructorCall__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19138:2: rule__XConstructorCall__Group__2__Impl rule__XConstructorCall__Group__3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19043:1: ( rule__XConstructorCall__Group__2__Impl rule__XConstructorCall__Group__3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19044:2: rule__XConstructorCall__Group__2__Impl rule__XConstructorCall__Group__3
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__2__Impl_in_rule__XConstructorCall__Group__238691);
+            pushFollow(FOLLOW_rule__XConstructorCall__Group__2__Impl_in_rule__XConstructorCall__Group__238505);
             rule__XConstructorCall__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__3_in_rule__XConstructorCall__Group__238694);
+            pushFollow(FOLLOW_rule__XConstructorCall__Group__3_in_rule__XConstructorCall__Group__238508);
             rule__XConstructorCall__Group__3();
 
             state._fsp--;
@@ -55080,25 +54817,25 @@ public final void rule__XConstructorCall__Group__2() throws RecognitionException
 
 
     // $ANTLR start "rule__XConstructorCall__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19145:1: rule__XConstructorCall__Group__2__Impl : ( ( rule__XConstructorCall__ConstructorAssignment_2 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19051:1: rule__XConstructorCall__Group__2__Impl : ( ( rule__XConstructorCall__ConstructorAssignment_2 ) ) ;
     public final void rule__XConstructorCall__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19149:1: ( ( ( rule__XConstructorCall__ConstructorAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19150:1: ( ( rule__XConstructorCall__ConstructorAssignment_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19055:1: ( ( ( rule__XConstructorCall__ConstructorAssignment_2 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19056:1: ( ( rule__XConstructorCall__ConstructorAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19150:1: ( ( rule__XConstructorCall__ConstructorAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19151:1: ( rule__XConstructorCall__ConstructorAssignment_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19056:1: ( ( rule__XConstructorCall__ConstructorAssignment_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19057:1: ( rule__XConstructorCall__ConstructorAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getConstructorAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19152:1: ( rule__XConstructorCall__ConstructorAssignment_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19152:2: rule__XConstructorCall__ConstructorAssignment_2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19058:1: ( rule__XConstructorCall__ConstructorAssignment_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19058:2: rule__XConstructorCall__ConstructorAssignment_2
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__ConstructorAssignment_2_in_rule__XConstructorCall__Group__2__Impl38721);
+            pushFollow(FOLLOW_rule__XConstructorCall__ConstructorAssignment_2_in_rule__XConstructorCall__Group__2__Impl38535);
             rule__XConstructorCall__ConstructorAssignment_2();
 
             state._fsp--;
@@ -55131,21 +54868,21 @@ public final void rule__XConstructorCall__Group__2__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XConstructorCall__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19162:1: rule__XConstructorCall__Group__3 : rule__XConstructorCall__Group__3__Impl rule__XConstructorCall__Group__4 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19068:1: rule__XConstructorCall__Group__3 : rule__XConstructorCall__Group__3__Impl rule__XConstructorCall__Group__4 ;
     public final void rule__XConstructorCall__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19166:1: ( rule__XConstructorCall__Group__3__Impl rule__XConstructorCall__Group__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19167:2: rule__XConstructorCall__Group__3__Impl rule__XConstructorCall__Group__4
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19072:1: ( rule__XConstructorCall__Group__3__Impl rule__XConstructorCall__Group__4 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19073:2: rule__XConstructorCall__Group__3__Impl rule__XConstructorCall__Group__4
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__3__Impl_in_rule__XConstructorCall__Group__338751);
+            pushFollow(FOLLOW_rule__XConstructorCall__Group__3__Impl_in_rule__XConstructorCall__Group__338565);
             rule__XConstructorCall__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__4_in_rule__XConstructorCall__Group__338754);
+            pushFollow(FOLLOW_rule__XConstructorCall__Group__4_in_rule__XConstructorCall__Group__338568);
             rule__XConstructorCall__Group__4();
 
             state._fsp--;
@@ -55169,29 +54906,29 @@ public final void rule__XConstructorCall__Group__3() throws RecognitionException
 
 
     // $ANTLR start "rule__XConstructorCall__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19174:1: rule__XConstructorCall__Group__3__Impl : ( ( rule__XConstructorCall__Group_3__0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19080:1: rule__XConstructorCall__Group__3__Impl : ( ( rule__XConstructorCall__Group_3__0 )? ) ;
     public final void rule__XConstructorCall__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19178:1: ( ( ( rule__XConstructorCall__Group_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19179:1: ( ( rule__XConstructorCall__Group_3__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19084:1: ( ( ( rule__XConstructorCall__Group_3__0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19085:1: ( ( rule__XConstructorCall__Group_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19179:1: ( ( rule__XConstructorCall__Group_3__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19180:1: ( rule__XConstructorCall__Group_3__0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19085:1: ( ( rule__XConstructorCall__Group_3__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19086:1: ( rule__XConstructorCall__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getGroup_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19181:1: ( rule__XConstructorCall__Group_3__0 )?
-            int alt144=2;
-            alt144 = dfa144.predict(input);
-            switch (alt144) {
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19087:1: ( rule__XConstructorCall__Group_3__0 )?
+            int alt143=2;
+            alt143 = dfa143.predict(input);
+            switch (alt143) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19181:2: rule__XConstructorCall__Group_3__0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19087:2: rule__XConstructorCall__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__XConstructorCall__Group_3__0_in_rule__XConstructorCall__Group__3__Impl38781);
+                    pushFollow(FOLLOW_rule__XConstructorCall__Group_3__0_in_rule__XConstructorCall__Group__3__Impl38595);
                     rule__XConstructorCall__Group_3__0();
 
                     state._fsp--;
@@ -55227,21 +54964,21 @@ public final void rule__XConstructorCall__Group__3__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XConstructorCall__Group__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19191:1: rule__XConstructorCall__Group__4 : rule__XConstructorCall__Group__4__Impl rule__XConstructorCall__Group__5 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19097:1: rule__XConstructorCall__Group__4 : rule__XConstructorCall__Group__4__Impl rule__XConstructorCall__Group__5 ;
     public final void rule__XConstructorCall__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19195:1: ( rule__XConstructorCall__Group__4__Impl rule__XConstructorCall__Group__5 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19196:2: rule__XConstructorCall__Group__4__Impl rule__XConstructorCall__Group__5
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19101:1: ( rule__XConstructorCall__Group__4__Impl rule__XConstructorCall__Group__5 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19102:2: rule__XConstructorCall__Group__4__Impl rule__XConstructorCall__Group__5
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__4__Impl_in_rule__XConstructorCall__Group__438812);
+            pushFollow(FOLLOW_rule__XConstructorCall__Group__4__Impl_in_rule__XConstructorCall__Group__438626);
             rule__XConstructorCall__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__5_in_rule__XConstructorCall__Group__438815);
+            pushFollow(FOLLOW_rule__XConstructorCall__Group__5_in_rule__XConstructorCall__Group__438629);
             rule__XConstructorCall__Group__5();
 
             state._fsp--;
@@ -55265,29 +55002,29 @@ public final void rule__XConstructorCall__Group__4() throws RecognitionException
 
 
     // $ANTLR start "rule__XConstructorCall__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19203:1: rule__XConstructorCall__Group__4__Impl : ( ( rule__XConstructorCall__Group_4__0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19109:1: rule__XConstructorCall__Group__4__Impl : ( ( rule__XConstructorCall__Group_4__0 )? ) ;
     public final void rule__XConstructorCall__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19207:1: ( ( ( rule__XConstructorCall__Group_4__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19208:1: ( ( rule__XConstructorCall__Group_4__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19113:1: ( ( ( rule__XConstructorCall__Group_4__0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19114:1: ( ( rule__XConstructorCall__Group_4__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19208:1: ( ( rule__XConstructorCall__Group_4__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19209:1: ( rule__XConstructorCall__Group_4__0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19114:1: ( ( rule__XConstructorCall__Group_4__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19115:1: ( rule__XConstructorCall__Group_4__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getGroup_4()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19210:1: ( rule__XConstructorCall__Group_4__0 )?
-            int alt145=2;
-            alt145 = dfa145.predict(input);
-            switch (alt145) {
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19116:1: ( rule__XConstructorCall__Group_4__0 )?
+            int alt144=2;
+            alt144 = dfa144.predict(input);
+            switch (alt144) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19210:2: rule__XConstructorCall__Group_4__0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19116:2: rule__XConstructorCall__Group_4__0
                     {
-                    pushFollow(FOLLOW_rule__XConstructorCall__Group_4__0_in_rule__XConstructorCall__Group__4__Impl38842);
+                    pushFollow(FOLLOW_rule__XConstructorCall__Group_4__0_in_rule__XConstructorCall__Group__4__Impl38656);
                     rule__XConstructorCall__Group_4__0();
 
                     state._fsp--;
@@ -55323,16 +55060,16 @@ public final void rule__XConstructorCall__Group__4__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XConstructorCall__Group__5"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19220:1: rule__XConstructorCall__Group__5 : rule__XConstructorCall__Group__5__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19126:1: rule__XConstructorCall__Group__5 : rule__XConstructorCall__Group__5__Impl ;
     public final void rule__XConstructorCall__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19224:1: ( rule__XConstructorCall__Group__5__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19225:2: rule__XConstructorCall__Group__5__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19130:1: ( rule__XConstructorCall__Group__5__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19131:2: rule__XConstructorCall__Group__5__Impl
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__5__Impl_in_rule__XConstructorCall__Group__538873);
+            pushFollow(FOLLOW_rule__XConstructorCall__Group__5__Impl_in_rule__XConstructorCall__Group__538687);
             rule__XConstructorCall__Group__5__Impl();
 
             state._fsp--;
@@ -55356,29 +55093,29 @@ public final void rule__XConstructorCall__Group__5() throws RecognitionException
 
 
     // $ANTLR start "rule__XConstructorCall__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19231:1: rule__XConstructorCall__Group__5__Impl : ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19137:1: rule__XConstructorCall__Group__5__Impl : ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? ) ;
     public final void rule__XConstructorCall__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19235:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19236:1: ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19141:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19142:1: ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19236:1: ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19237:1: ( rule__XConstructorCall__ArgumentsAssignment_5 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19142:1: ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19143:1: ( rule__XConstructorCall__ArgumentsAssignment_5 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getArgumentsAssignment_5()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19238:1: ( rule__XConstructorCall__ArgumentsAssignment_5 )?
-            int alt146=2;
-            alt146 = dfa146.predict(input);
-            switch (alt146) {
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19144:1: ( rule__XConstructorCall__ArgumentsAssignment_5 )?
+            int alt145=2;
+            alt145 = dfa145.predict(input);
+            switch (alt145) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19238:2: rule__XConstructorCall__ArgumentsAssignment_5
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19144:2: rule__XConstructorCall__ArgumentsAssignment_5
                     {
-                    pushFollow(FOLLOW_rule__XConstructorCall__ArgumentsAssignment_5_in_rule__XConstructorCall__Group__5__Impl38900);
+                    pushFollow(FOLLOW_rule__XConstructorCall__ArgumentsAssignment_5_in_rule__XConstructorCall__Group__5__Impl38714);
                     rule__XConstructorCall__ArgumentsAssignment_5();
 
                     state._fsp--;
@@ -55414,21 +55151,21 @@ public final void rule__XConstructorCall__Group__5__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19260:1: rule__XConstructorCall__Group_3__0 : rule__XConstructorCall__Group_3__0__Impl rule__XConstructorCall__Group_3__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19166:1: rule__XConstructorCall__Group_3__0 : rule__XConstructorCall__Group_3__0__Impl rule__XConstructorCall__Group_3__1 ;
     public final void rule__XConstructorCall__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19264:1: ( rule__XConstructorCall__Group_3__0__Impl rule__XConstructorCall__Group_3__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19265:2: rule__XConstructorCall__Group_3__0__Impl rule__XConstructorCall__Group_3__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19170:1: ( rule__XConstructorCall__Group_3__0__Impl rule__XConstructorCall__Group_3__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19171:2: rule__XConstructorCall__Group_3__0__Impl rule__XConstructorCall__Group_3__1
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_3__0__Impl_in_rule__XConstructorCall__Group_3__038943);
+            pushFollow(FOLLOW_rule__XConstructorCall__Group_3__0__Impl_in_rule__XConstructorCall__Group_3__038757);
             rule__XConstructorCall__Group_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_3__1_in_rule__XConstructorCall__Group_3__038946);
+            pushFollow(FOLLOW_rule__XConstructorCall__Group_3__1_in_rule__XConstructorCall__Group_3__038760);
             rule__XConstructorCall__Group_3__1();
 
             state._fsp--;
@@ -55452,25 +55189,25 @@ public final void rule__XConstructorCall__Group_3__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19272:1: rule__XConstructorCall__Group_3__0__Impl : ( ( '<' ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19178:1: rule__XConstructorCall__Group_3__0__Impl : ( ( '<' ) ) ;
     public final void rule__XConstructorCall__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19276:1: ( ( ( '<' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19277:1: ( ( '<' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19182:1: ( ( ( '<' ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19183:1: ( ( '<' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19277:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19278:1: ( '<' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19183:1: ( ( '<' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19184:1: ( '<' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getLessThanSignKeyword_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19279:1: ( '<' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19280:2: '<'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19185:1: ( '<' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19186:2: '<'
             {
-            match(input,47,FOLLOW_47_in_rule__XConstructorCall__Group_3__0__Impl38975); if (state.failed) return ;
+            match(input,47,FOLLOW_47_in_rule__XConstructorCall__Group_3__0__Impl38789); if (state.failed) return ;
 
             }
 
@@ -55499,21 +55236,21 @@ public final void rule__XConstructorCall__Group_3__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19291:1: rule__XConstructorCall__Group_3__1 : rule__XConstructorCall__Group_3__1__Impl rule__XConstructorCall__Group_3__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19197:1: rule__XConstructorCall__Group_3__1 : rule__XConstructorCall__Group_3__1__Impl rule__XConstructorCall__Group_3__2 ;
     public final void rule__XConstructorCall__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19295:1: ( rule__XConstructorCall__Group_3__1__Impl rule__XConstructorCall__Group_3__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19296:2: rule__XConstructorCall__Group_3__1__Impl rule__XConstructorCall__Group_3__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19201:1: ( rule__XConstructorCall__Group_3__1__Impl rule__XConstructorCall__Group_3__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19202:2: rule__XConstructorCall__Group_3__1__Impl rule__XConstructorCall__Group_3__2
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_3__1__Impl_in_rule__XConstructorCall__Group_3__139007);
+            pushFollow(FOLLOW_rule__XConstructorCall__Group_3__1__Impl_in_rule__XConstructorCall__Group_3__138821);
             rule__XConstructorCall__Group_3__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_3__2_in_rule__XConstructorCall__Group_3__139010);
+            pushFollow(FOLLOW_rule__XConstructorCall__Group_3__2_in_rule__XConstructorCall__Group_3__138824);
             rule__XConstructorCall__Group_3__2();
 
             state._fsp--;
@@ -55537,25 +55274,25 @@ public final void rule__XConstructorCall__Group_3__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19303:1: rule__XConstructorCall__Group_3__1__Impl : ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19209:1: rule__XConstructorCall__Group_3__1__Impl : ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) ) ;
     public final void rule__XConstructorCall__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19307:1: ( ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19308:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19213:1: ( ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19214:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19308:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19309:1: ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19214:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19215:1: ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getTypeArgumentsAssignment_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19310:1: ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19310:2: rule__XConstructorCall__TypeArgumentsAssignment_3_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19216:1: ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19216:2: rule__XConstructorCall__TypeArgumentsAssignment_3_1
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__TypeArgumentsAssignment_3_1_in_rule__XConstructorCall__Group_3__1__Impl39037);
+            pushFollow(FOLLOW_rule__XConstructorCall__TypeArgumentsAssignment_3_1_in_rule__XConstructorCall__Group_3__1__Impl38851);
             rule__XConstructorCall__TypeArgumentsAssignment_3_1();
 
             state._fsp--;
@@ -55588,21 +55325,21 @@ public final void rule__XConstructorCall__Group_3__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19320:1: rule__XConstructorCall__Group_3__2 : rule__XConstructorCall__Group_3__2__Impl rule__XConstructorCall__Group_3__3 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19226:1: rule__XConstructorCall__Group_3__2 : rule__XConstructorCall__Group_3__2__Impl rule__XConstructorCall__Group_3__3 ;
     public final void rule__XConstructorCall__Group_3__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19324:1: ( rule__XConstructorCall__Group_3__2__Impl rule__XConstructorCall__Group_3__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19325:2: rule__XConstructorCall__Group_3__2__Impl rule__XConstructorCall__Group_3__3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19230:1: ( rule__XConstructorCall__Group_3__2__Impl rule__XConstructorCall__Group_3__3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19231:2: rule__XConstructorCall__Group_3__2__Impl rule__XConstructorCall__Group_3__3
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_3__2__Impl_in_rule__XConstructorCall__Group_3__239067);
+            pushFollow(FOLLOW_rule__XConstructorCall__Group_3__2__Impl_in_rule__XConstructorCall__Group_3__238881);
             rule__XConstructorCall__Group_3__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_3__3_in_rule__XConstructorCall__Group_3__239070);
+            pushFollow(FOLLOW_rule__XConstructorCall__Group_3__3_in_rule__XConstructorCall__Group_3__238884);
             rule__XConstructorCall__Group_3__3();
 
             state._fsp--;
@@ -55626,37 +55363,37 @@ public final void rule__XConstructorCall__Group_3__2() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19332:1: rule__XConstructorCall__Group_3__2__Impl : ( ( rule__XConstructorCall__Group_3_2__0 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19238:1: rule__XConstructorCall__Group_3__2__Impl : ( ( rule__XConstructorCall__Group_3_2__0 )* ) ;
     public final void rule__XConstructorCall__Group_3__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19336:1: ( ( ( rule__XConstructorCall__Group_3_2__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19337:1: ( ( rule__XConstructorCall__Group_3_2__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19242:1: ( ( ( rule__XConstructorCall__Group_3_2__0 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19243:1: ( ( rule__XConstructorCall__Group_3_2__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19337:1: ( ( rule__XConstructorCall__Group_3_2__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19338:1: ( rule__XConstructorCall__Group_3_2__0 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19243:1: ( ( rule__XConstructorCall__Group_3_2__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19244:1: ( rule__XConstructorCall__Group_3_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getGroup_3_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19339:1: ( rule__XConstructorCall__Group_3_2__0 )*
-            loop147:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19245:1: ( rule__XConstructorCall__Group_3_2__0 )*
+            loop146:
             do {
-                int alt147=2;
-                int LA147_0 = input.LA(1);
+                int alt146=2;
+                int LA146_0 = input.LA(1);
 
-                if ( (LA147_0==74) ) {
-                    alt147=1;
+                if ( (LA146_0==74) ) {
+                    alt146=1;
                 }
 
 
-                switch (alt147) {
+                switch (alt146) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19339:2: rule__XConstructorCall__Group_3_2__0
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19245:2: rule__XConstructorCall__Group_3_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__XConstructorCall__Group_3_2__0_in_rule__XConstructorCall__Group_3__2__Impl39097);
+            	    pushFollow(FOLLOW_rule__XConstructorCall__Group_3_2__0_in_rule__XConstructorCall__Group_3__2__Impl38911);
             	    rule__XConstructorCall__Group_3_2__0();
 
             	    state._fsp--;
@@ -55666,7 +55403,7 @@ public final void rule__XConstructorCall__Group_3__2__Impl() throws RecognitionE
             	    break;
 
             	default :
-            	    break loop147;
+            	    break loop146;
                 }
             } while (true);
 
@@ -55695,16 +55432,16 @@ public final void rule__XConstructorCall__Group_3__2__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19349:1: rule__XConstructorCall__Group_3__3 : rule__XConstructorCall__Group_3__3__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19255:1: rule__XConstructorCall__Group_3__3 : rule__XConstructorCall__Group_3__3__Impl ;
     public final void rule__XConstructorCall__Group_3__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19353:1: ( rule__XConstructorCall__Group_3__3__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19354:2: rule__XConstructorCall__Group_3__3__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19259:1: ( rule__XConstructorCall__Group_3__3__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19260:2: rule__XConstructorCall__Group_3__3__Impl
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_3__3__Impl_in_rule__XConstructorCall__Group_3__339128);
+            pushFollow(FOLLOW_rule__XConstructorCall__Group_3__3__Impl_in_rule__XConstructorCall__Group_3__338942);
             rule__XConstructorCall__Group_3__3__Impl();
 
             state._fsp--;
@@ -55728,22 +55465,22 @@ public final void rule__XConstructorCall__Group_3__3() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19360:1: rule__XConstructorCall__Group_3__3__Impl : ( '>' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19266:1: rule__XConstructorCall__Group_3__3__Impl : ( '>' ) ;
     public final void rule__XConstructorCall__Group_3__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19364:1: ( ( '>' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19365:1: ( '>' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19270:1: ( ( '>' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19271:1: ( '>' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19365:1: ( '>' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19366:1: '>'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19271:1: ( '>' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19272:1: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getGreaterThanSignKeyword_3_3()); 
             }
-            match(input,46,FOLLOW_46_in_rule__XConstructorCall__Group_3__3__Impl39156); if (state.failed) return ;
+            match(input,46,FOLLOW_46_in_rule__XConstructorCall__Group_3__3__Impl38970); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstructorCallAccess().getGreaterThanSignKeyword_3_3()); 
             }
@@ -55769,21 +55506,21 @@ public final void rule__XConstructorCall__Group_3__3__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3_2__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19387:1: rule__XConstructorCall__Group_3_2__0 : rule__XConstructorCall__Group_3_2__0__Impl rule__XConstructorCall__Group_3_2__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19293:1: rule__XConstructorCall__Group_3_2__0 : rule__XConstructorCall__Group_3_2__0__Impl rule__XConstructorCall__Group_3_2__1 ;
     public final void rule__XConstructorCall__Group_3_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19391:1: ( rule__XConstructorCall__Group_3_2__0__Impl rule__XConstructorCall__Group_3_2__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19392:2: rule__XConstructorCall__Group_3_2__0__Impl rule__XConstructorCall__Group_3_2__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19297:1: ( rule__XConstructorCall__Group_3_2__0__Impl rule__XConstructorCall__Group_3_2__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19298:2: rule__XConstructorCall__Group_3_2__0__Impl rule__XConstructorCall__Group_3_2__1
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_3_2__0__Impl_in_rule__XConstructorCall__Group_3_2__039195);
+            pushFollow(FOLLOW_rule__XConstructorCall__Group_3_2__0__Impl_in_rule__XConstructorCall__Group_3_2__039009);
             rule__XConstructorCall__Group_3_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_3_2__1_in_rule__XConstructorCall__Group_3_2__039198);
+            pushFollow(FOLLOW_rule__XConstructorCall__Group_3_2__1_in_rule__XConstructorCall__Group_3_2__039012);
             rule__XConstructorCall__Group_3_2__1();
 
             state._fsp--;
@@ -55807,22 +55544,22 @@ public final void rule__XConstructorCall__Group_3_2__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3_2__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19399:1: rule__XConstructorCall__Group_3_2__0__Impl : ( ',' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19305:1: rule__XConstructorCall__Group_3_2__0__Impl : ( ',' ) ;
     public final void rule__XConstructorCall__Group_3_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19403:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19404:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19309:1: ( ( ',' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19310:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19404:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19405:1: ','
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19310:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19311:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getCommaKeyword_3_2_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XConstructorCall__Group_3_2__0__Impl39226); if (state.failed) return ;
+            match(input,74,FOLLOW_74_in_rule__XConstructorCall__Group_3_2__0__Impl39040); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstructorCallAccess().getCommaKeyword_3_2_0()); 
             }
@@ -55848,16 +55585,16 @@ public final void rule__XConstructorCall__Group_3_2__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3_2__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19418:1: rule__XConstructorCall__Group_3_2__1 : rule__XConstructorCall__Group_3_2__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19324:1: rule__XConstructorCall__Group_3_2__1 : rule__XConstructorCall__Group_3_2__1__Impl ;
     public final void rule__XConstructorCall__Group_3_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19422:1: ( rule__XConstructorCall__Group_3_2__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19423:2: rule__XConstructorCall__Group_3_2__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19328:1: ( rule__XConstructorCall__Group_3_2__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19329:2: rule__XConstructorCall__Group_3_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_3_2__1__Impl_in_rule__XConstructorCall__Group_3_2__139257);
+            pushFollow(FOLLOW_rule__XConstructorCall__Group_3_2__1__Impl_in_rule__XConstructorCall__Group_3_2__139071);
             rule__XConstructorCall__Group_3_2__1__Impl();
 
             state._fsp--;
@@ -55881,25 +55618,25 @@ public final void rule__XConstructorCall__Group_3_2__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3_2__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19429:1: rule__XConstructorCall__Group_3_2__1__Impl : ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19335:1: rule__XConstructorCall__Group_3_2__1__Impl : ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) ) ;
     public final void rule__XConstructorCall__Group_3_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19433:1: ( ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19434:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19339:1: ( ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19340:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19434:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19435:1: ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19340:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19341:1: ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getTypeArgumentsAssignment_3_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19436:1: ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19436:2: rule__XConstructorCall__TypeArgumentsAssignment_3_2_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19342:1: ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19342:2: rule__XConstructorCall__TypeArgumentsAssignment_3_2_1
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__TypeArgumentsAssignment_3_2_1_in_rule__XConstructorCall__Group_3_2__1__Impl39284);
+            pushFollow(FOLLOW_rule__XConstructorCall__TypeArgumentsAssignment_3_2_1_in_rule__XConstructorCall__Group_3_2__1__Impl39098);
             rule__XConstructorCall__TypeArgumentsAssignment_3_2_1();
 
             state._fsp--;
@@ -55932,21 +55669,21 @@ public final void rule__XConstructorCall__Group_3_2__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19450:1: rule__XConstructorCall__Group_4__0 : rule__XConstructorCall__Group_4__0__Impl rule__XConstructorCall__Group_4__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19356:1: rule__XConstructorCall__Group_4__0 : rule__XConstructorCall__Group_4__0__Impl rule__XConstructorCall__Group_4__1 ;
     public final void rule__XConstructorCall__Group_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19454:1: ( rule__XConstructorCall__Group_4__0__Impl rule__XConstructorCall__Group_4__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19455:2: rule__XConstructorCall__Group_4__0__Impl rule__XConstructorCall__Group_4__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19360:1: ( rule__XConstructorCall__Group_4__0__Impl rule__XConstructorCall__Group_4__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19361:2: rule__XConstructorCall__Group_4__0__Impl rule__XConstructorCall__Group_4__1
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4__0__Impl_in_rule__XConstructorCall__Group_4__039318);
+            pushFollow(FOLLOW_rule__XConstructorCall__Group_4__0__Impl_in_rule__XConstructorCall__Group_4__039132);
             rule__XConstructorCall__Group_4__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4__1_in_rule__XConstructorCall__Group_4__039321);
+            pushFollow(FOLLOW_rule__XConstructorCall__Group_4__1_in_rule__XConstructorCall__Group_4__039135);
             rule__XConstructorCall__Group_4__1();
 
             state._fsp--;
@@ -55970,25 +55707,25 @@ public final void rule__XConstructorCall__Group_4__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19462:1: rule__XConstructorCall__Group_4__0__Impl : ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19368:1: rule__XConstructorCall__Group_4__0__Impl : ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) ) ;
     public final void rule__XConstructorCall__Group_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19466:1: ( ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19467:1: ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19372:1: ( ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19373:1: ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19467:1: ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19468:1: ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19373:1: ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19374:1: ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getExplicitConstructorCallAssignment_4_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19469:1: ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19469:2: rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19375:1: ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19375:2: rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0_in_rule__XConstructorCall__Group_4__0__Impl39348);
+            pushFollow(FOLLOW_rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0_in_rule__XConstructorCall__Group_4__0__Impl39162);
             rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0();
 
             state._fsp--;
@@ -56021,21 +55758,21 @@ public final void rule__XConstructorCall__Group_4__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19479:1: rule__XConstructorCall__Group_4__1 : rule__XConstructorCall__Group_4__1__Impl rule__XConstructorCall__Group_4__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19385:1: rule__XConstructorCall__Group_4__1 : rule__XConstructorCall__Group_4__1__Impl rule__XConstructorCall__Group_4__2 ;
     public final void rule__XConstructorCall__Group_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19483:1: ( rule__XConstructorCall__Group_4__1__Impl rule__XConstructorCall__Group_4__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19484:2: rule__XConstructorCall__Group_4__1__Impl rule__XConstructorCall__Group_4__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19389:1: ( rule__XConstructorCall__Group_4__1__Impl rule__XConstructorCall__Group_4__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19390:2: rule__XConstructorCall__Group_4__1__Impl rule__XConstructorCall__Group_4__2
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4__1__Impl_in_rule__XConstructorCall__Group_4__139378);
+            pushFollow(FOLLOW_rule__XConstructorCall__Group_4__1__Impl_in_rule__XConstructorCall__Group_4__139192);
             rule__XConstructorCall__Group_4__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4__2_in_rule__XConstructorCall__Group_4__139381);
+            pushFollow(FOLLOW_rule__XConstructorCall__Group_4__2_in_rule__XConstructorCall__Group_4__139195);
             rule__XConstructorCall__Group_4__2();
 
             state._fsp--;
@@ -56059,33 +55796,33 @@ public final void rule__XConstructorCall__Group_4__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19491:1: rule__XConstructorCall__Group_4__1__Impl : ( ( rule__XConstructorCall__Alternatives_4_1 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19397:1: rule__XConstructorCall__Group_4__1__Impl : ( ( rule__XConstructorCall__Alternatives_4_1 )? ) ;
     public final void rule__XConstructorCall__Group_4__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19495:1: ( ( ( rule__XConstructorCall__Alternatives_4_1 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19496:1: ( ( rule__XConstructorCall__Alternatives_4_1 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19401:1: ( ( ( rule__XConstructorCall__Alternatives_4_1 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19402:1: ( ( rule__XConstructorCall__Alternatives_4_1 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19496:1: ( ( rule__XConstructorCall__Alternatives_4_1 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19497:1: ( rule__XConstructorCall__Alternatives_4_1 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19402:1: ( ( rule__XConstructorCall__Alternatives_4_1 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19403:1: ( rule__XConstructorCall__Alternatives_4_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getAlternatives_4_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19498:1: ( rule__XConstructorCall__Alternatives_4_1 )?
-            int alt148=2;
-            int LA148_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19404:1: ( rule__XConstructorCall__Alternatives_4_1 )?
+            int alt147=2;
+            int LA147_0 = input.LA(1);
 
-            if ( ((LA148_0>=RULE_ID && LA148_0<=RULE_STRING)||(LA148_0>=16 && LA148_0<=35)||LA148_0==47||LA148_0==51||(LA148_0>=54 && LA148_0<=55)||LA148_0==60||(LA148_0>=65 && LA148_0<=66)||LA148_0==68||LA148_0==70||LA148_0==72||(LA148_0>=77 && LA148_0<=78)||(LA148_0>=80 && LA148_0<=81)||LA148_0==84||LA148_0==86||(LA148_0>=90 && LA148_0<=97)||LA148_0==99||LA148_0==106||LA148_0==108) ) {
-                alt148=1;
+            if ( ((LA147_0>=RULE_ID && LA147_0<=RULE_STRING)||(LA147_0>=16 && LA147_0<=35)||LA147_0==47||LA147_0==51||(LA147_0>=54 && LA147_0<=55)||LA147_0==60||(LA147_0>=65 && LA147_0<=66)||LA147_0==68||LA147_0==70||LA147_0==72||(LA147_0>=77 && LA147_0<=78)||(LA147_0>=80 && LA147_0<=81)||LA147_0==84||LA147_0==86||(LA147_0>=90 && LA147_0<=97)||LA147_0==99||LA147_0==106||LA147_0==108) ) {
+                alt147=1;
             }
-            switch (alt148) {
+            switch (alt147) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19498:2: rule__XConstructorCall__Alternatives_4_1
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19404:2: rule__XConstructorCall__Alternatives_4_1
                     {
-                    pushFollow(FOLLOW_rule__XConstructorCall__Alternatives_4_1_in_rule__XConstructorCall__Group_4__1__Impl39408);
+                    pushFollow(FOLLOW_rule__XConstructorCall__Alternatives_4_1_in_rule__XConstructorCall__Group_4__1__Impl39222);
                     rule__XConstructorCall__Alternatives_4_1();
 
                     state._fsp--;
@@ -56121,16 +55858,16 @@ public final void rule__XConstructorCall__Group_4__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19508:1: rule__XConstructorCall__Group_4__2 : rule__XConstructorCall__Group_4__2__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19414:1: rule__XConstructorCall__Group_4__2 : rule__XConstructorCall__Group_4__2__Impl ;
     public final void rule__XConstructorCall__Group_4__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19512:1: ( rule__XConstructorCall__Group_4__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19513:2: rule__XConstructorCall__Group_4__2__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19418:1: ( rule__XConstructorCall__Group_4__2__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19419:2: rule__XConstructorCall__Group_4__2__Impl
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4__2__Impl_in_rule__XConstructorCall__Group_4__239439);
+            pushFollow(FOLLOW_rule__XConstructorCall__Group_4__2__Impl_in_rule__XConstructorCall__Group_4__239253);
             rule__XConstructorCall__Group_4__2__Impl();
 
             state._fsp--;
@@ -56154,22 +55891,22 @@ public final void rule__XConstructorCall__Group_4__2() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19519:1: rule__XConstructorCall__Group_4__2__Impl : ( ')' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19425:1: rule__XConstructorCall__Group_4__2__Impl : ( ')' ) ;
     public final void rule__XConstructorCall__Group_4__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19523:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19524:1: ( ')' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19429:1: ( ( ')' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19430:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19524:1: ( ')' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19525:1: ')'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19430:1: ( ')' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19431:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getRightParenthesisKeyword_4_2()); 
             }
-            match(input,73,FOLLOW_73_in_rule__XConstructorCall__Group_4__2__Impl39467); if (state.failed) return ;
+            match(input,73,FOLLOW_73_in_rule__XConstructorCall__Group_4__2__Impl39281); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstructorCallAccess().getRightParenthesisKeyword_4_2()); 
             }
@@ -56195,21 +55932,21 @@ public final void rule__XConstructorCall__Group_4__2__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19544:1: rule__XConstructorCall__Group_4_1_1__0 : rule__XConstructorCall__Group_4_1_1__0__Impl rule__XConstructorCall__Group_4_1_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19450:1: rule__XConstructorCall__Group_4_1_1__0 : rule__XConstructorCall__Group_4_1_1__0__Impl rule__XConstructorCall__Group_4_1_1__1 ;
     public final void rule__XConstructorCall__Group_4_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19548:1: ( rule__XConstructorCall__Group_4_1_1__0__Impl rule__XConstructorCall__Group_4_1_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19549:2: rule__XConstructorCall__Group_4_1_1__0__Impl rule__XConstructorCall__Group_4_1_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19454:1: ( rule__XConstructorCall__Group_4_1_1__0__Impl rule__XConstructorCall__Group_4_1_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19455:2: rule__XConstructorCall__Group_4_1_1__0__Impl rule__XConstructorCall__Group_4_1_1__1
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4_1_1__0__Impl_in_rule__XConstructorCall__Group_4_1_1__039504);
+            pushFollow(FOLLOW_rule__XConstructorCall__Group_4_1_1__0__Impl_in_rule__XConstructorCall__Group_4_1_1__039318);
             rule__XConstructorCall__Group_4_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4_1_1__1_in_rule__XConstructorCall__Group_4_1_1__039507);
+            pushFollow(FOLLOW_rule__XConstructorCall__Group_4_1_1__1_in_rule__XConstructorCall__Group_4_1_1__039321);
             rule__XConstructorCall__Group_4_1_1__1();
 
             state._fsp--;
@@ -56233,25 +55970,25 @@ public final void rule__XConstructorCall__Group_4_1_1__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19556:1: rule__XConstructorCall__Group_4_1_1__0__Impl : ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19462:1: rule__XConstructorCall__Group_4_1_1__0__Impl : ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) ) ;
     public final void rule__XConstructorCall__Group_4_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19560:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19561:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19466:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19467:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19561:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19562:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19467:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19468:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getArgumentsAssignment_4_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19563:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19563:2: rule__XConstructorCall__ArgumentsAssignment_4_1_1_0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19469:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19469:2: rule__XConstructorCall__ArgumentsAssignment_4_1_1_0
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__ArgumentsAssignment_4_1_1_0_in_rule__XConstructorCall__Group_4_1_1__0__Impl39534);
+            pushFollow(FOLLOW_rule__XConstructorCall__ArgumentsAssignment_4_1_1_0_in_rule__XConstructorCall__Group_4_1_1__0__Impl39348);
             rule__XConstructorCall__ArgumentsAssignment_4_1_1_0();
 
             state._fsp--;
@@ -56284,16 +56021,16 @@ public final void rule__XConstructorCall__Group_4_1_1__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19573:1: rule__XConstructorCall__Group_4_1_1__1 : rule__XConstructorCall__Group_4_1_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19479:1: rule__XConstructorCall__Group_4_1_1__1 : rule__XConstructorCall__Group_4_1_1__1__Impl ;
     public final void rule__XConstructorCall__Group_4_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19577:1: ( rule__XConstructorCall__Group_4_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19578:2: rule__XConstructorCall__Group_4_1_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19483:1: ( rule__XConstructorCall__Group_4_1_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19484:2: rule__XConstructorCall__Group_4_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4_1_1__1__Impl_in_rule__XConstructorCall__Group_4_1_1__139564);
+            pushFollow(FOLLOW_rule__XConstructorCall__Group_4_1_1__1__Impl_in_rule__XConstructorCall__Group_4_1_1__139378);
             rule__XConstructorCall__Group_4_1_1__1__Impl();
 
             state._fsp--;
@@ -56317,37 +56054,37 @@ public final void rule__XConstructorCall__Group_4_1_1__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19584:1: rule__XConstructorCall__Group_4_1_1__1__Impl : ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19490:1: rule__XConstructorCall__Group_4_1_1__1__Impl : ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* ) ;
     public final void rule__XConstructorCall__Group_4_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19588:1: ( ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19589:1: ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19494:1: ( ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19495:1: ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19589:1: ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19590:1: ( rule__XConstructorCall__Group_4_1_1_1__0 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19495:1: ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19496:1: ( rule__XConstructorCall__Group_4_1_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getGroup_4_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19591:1: ( rule__XConstructorCall__Group_4_1_1_1__0 )*
-            loop149:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19497:1: ( rule__XConstructorCall__Group_4_1_1_1__0 )*
+            loop148:
             do {
-                int alt149=2;
-                int LA149_0 = input.LA(1);
+                int alt148=2;
+                int LA148_0 = input.LA(1);
 
-                if ( (LA149_0==74) ) {
-                    alt149=1;
+                if ( (LA148_0==74) ) {
+                    alt148=1;
                 }
 
 
-                switch (alt149) {
+                switch (alt148) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19591:2: rule__XConstructorCall__Group_4_1_1_1__0
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19497:2: rule__XConstructorCall__Group_4_1_1_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XConstructorCall__Group_4_1_1_1__0_in_rule__XConstructorCall__Group_4_1_1__1__Impl39591);
+            	    pushFollow(FOLLOW_rule__XConstructorCall__Group_4_1_1_1__0_in_rule__XConstructorCall__Group_4_1_1__1__Impl39405);
             	    rule__XConstructorCall__Group_4_1_1_1__0();
 
             	    state._fsp--;
@@ -56357,7 +56094,7 @@ public final void rule__XConstructorCall__Group_4_1_1__1__Impl() throws Recognit
             	    break;
 
             	default :
-            	    break loop149;
+            	    break loop148;
                 }
             } while (true);
 
@@ -56386,21 +56123,21 @@ public final void rule__XConstructorCall__Group_4_1_1__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19605:1: rule__XConstructorCall__Group_4_1_1_1__0 : rule__XConstructorCall__Group_4_1_1_1__0__Impl rule__XConstructorCall__Group_4_1_1_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19511:1: rule__XConstructorCall__Group_4_1_1_1__0 : rule__XConstructorCall__Group_4_1_1_1__0__Impl rule__XConstructorCall__Group_4_1_1_1__1 ;
     public final void rule__XConstructorCall__Group_4_1_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19609:1: ( rule__XConstructorCall__Group_4_1_1_1__0__Impl rule__XConstructorCall__Group_4_1_1_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19610:2: rule__XConstructorCall__Group_4_1_1_1__0__Impl rule__XConstructorCall__Group_4_1_1_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19515:1: ( rule__XConstructorCall__Group_4_1_1_1__0__Impl rule__XConstructorCall__Group_4_1_1_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19516:2: rule__XConstructorCall__Group_4_1_1_1__0__Impl rule__XConstructorCall__Group_4_1_1_1__1
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4_1_1_1__0__Impl_in_rule__XConstructorCall__Group_4_1_1_1__039626);
+            pushFollow(FOLLOW_rule__XConstructorCall__Group_4_1_1_1__0__Impl_in_rule__XConstructorCall__Group_4_1_1_1__039440);
             rule__XConstructorCall__Group_4_1_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4_1_1_1__1_in_rule__XConstructorCall__Group_4_1_1_1__039629);
+            pushFollow(FOLLOW_rule__XConstructorCall__Group_4_1_1_1__1_in_rule__XConstructorCall__Group_4_1_1_1__039443);
             rule__XConstructorCall__Group_4_1_1_1__1();
 
             state._fsp--;
@@ -56424,22 +56161,22 @@ public final void rule__XConstructorCall__Group_4_1_1_1__0() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19617:1: rule__XConstructorCall__Group_4_1_1_1__0__Impl : ( ',' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19523:1: rule__XConstructorCall__Group_4_1_1_1__0__Impl : ( ',' ) ;
     public final void rule__XConstructorCall__Group_4_1_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19621:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19622:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19527:1: ( ( ',' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19528:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19622:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19623:1: ','
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19528:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19529:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getCommaKeyword_4_1_1_1_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XConstructorCall__Group_4_1_1_1__0__Impl39657); if (state.failed) return ;
+            match(input,74,FOLLOW_74_in_rule__XConstructorCall__Group_4_1_1_1__0__Impl39471); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstructorCallAccess().getCommaKeyword_4_1_1_1_0()); 
             }
@@ -56465,16 +56202,16 @@ public final void rule__XConstructorCall__Group_4_1_1_1__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19636:1: rule__XConstructorCall__Group_4_1_1_1__1 : rule__XConstructorCall__Group_4_1_1_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19542:1: rule__XConstructorCall__Group_4_1_1_1__1 : rule__XConstructorCall__Group_4_1_1_1__1__Impl ;
     public final void rule__XConstructorCall__Group_4_1_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19640:1: ( rule__XConstructorCall__Group_4_1_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19641:2: rule__XConstructorCall__Group_4_1_1_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19546:1: ( rule__XConstructorCall__Group_4_1_1_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19547:2: rule__XConstructorCall__Group_4_1_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4_1_1_1__1__Impl_in_rule__XConstructorCall__Group_4_1_1_1__139688);
+            pushFollow(FOLLOW_rule__XConstructorCall__Group_4_1_1_1__1__Impl_in_rule__XConstructorCall__Group_4_1_1_1__139502);
             rule__XConstructorCall__Group_4_1_1_1__1__Impl();
 
             state._fsp--;
@@ -56498,25 +56235,25 @@ public final void rule__XConstructorCall__Group_4_1_1_1__1() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19647:1: rule__XConstructorCall__Group_4_1_1_1__1__Impl : ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19553:1: rule__XConstructorCall__Group_4_1_1_1__1__Impl : ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) ) ;
     public final void rule__XConstructorCall__Group_4_1_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19651:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19652:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19557:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19558:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19652:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19653:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19558:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19559:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getArgumentsAssignment_4_1_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19654:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19654:2: rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19560:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19560:2: rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1_in_rule__XConstructorCall__Group_4_1_1_1__1__Impl39715);
+            pushFollow(FOLLOW_rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1_in_rule__XConstructorCall__Group_4_1_1_1__1__Impl39529);
             rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1();
 
             state._fsp--;
@@ -56549,21 +56286,21 @@ public final void rule__XConstructorCall__Group_4_1_1_1__1__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XBooleanLiteral__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19668:1: rule__XBooleanLiteral__Group__0 : rule__XBooleanLiteral__Group__0__Impl rule__XBooleanLiteral__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19574:1: rule__XBooleanLiteral__Group__0 : rule__XBooleanLiteral__Group__0__Impl rule__XBooleanLiteral__Group__1 ;
     public final void rule__XBooleanLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19672:1: ( rule__XBooleanLiteral__Group__0__Impl rule__XBooleanLiteral__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19673:2: rule__XBooleanLiteral__Group__0__Impl rule__XBooleanLiteral__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19578:1: ( rule__XBooleanLiteral__Group__0__Impl rule__XBooleanLiteral__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19579:2: rule__XBooleanLiteral__Group__0__Impl rule__XBooleanLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__XBooleanLiteral__Group__0__Impl_in_rule__XBooleanLiteral__Group__039749);
+            pushFollow(FOLLOW_rule__XBooleanLiteral__Group__0__Impl_in_rule__XBooleanLiteral__Group__039563);
             rule__XBooleanLiteral__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBooleanLiteral__Group__1_in_rule__XBooleanLiteral__Group__039752);
+            pushFollow(FOLLOW_rule__XBooleanLiteral__Group__1_in_rule__XBooleanLiteral__Group__039566);
             rule__XBooleanLiteral__Group__1();
 
             state._fsp--;
@@ -56587,23 +56324,23 @@ public final void rule__XBooleanLiteral__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XBooleanLiteral__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19680:1: rule__XBooleanLiteral__Group__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19586:1: rule__XBooleanLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XBooleanLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19684:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19685:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19590:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19591:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19685:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19686:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19591:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19592:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBooleanLiteralAccess().getXBooleanLiteralAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19687:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19689:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19593:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19595:1: 
             {
             }
 
@@ -56628,16 +56365,16 @@ public final void rule__XBooleanLiteral__Group__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XBooleanLiteral__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19699:1: rule__XBooleanLiteral__Group__1 : rule__XBooleanLiteral__Group__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19605:1: rule__XBooleanLiteral__Group__1 : rule__XBooleanLiteral__Group__1__Impl ;
     public final void rule__XBooleanLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19703:1: ( rule__XBooleanLiteral__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19704:2: rule__XBooleanLiteral__Group__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19609:1: ( rule__XBooleanLiteral__Group__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19610:2: rule__XBooleanLiteral__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XBooleanLiteral__Group__1__Impl_in_rule__XBooleanLiteral__Group__139810);
+            pushFollow(FOLLOW_rule__XBooleanLiteral__Group__1__Impl_in_rule__XBooleanLiteral__Group__139624);
             rule__XBooleanLiteral__Group__1__Impl();
 
             state._fsp--;
@@ -56661,25 +56398,25 @@ public final void rule__XBooleanLiteral__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XBooleanLiteral__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19710:1: rule__XBooleanLiteral__Group__1__Impl : ( ( rule__XBooleanLiteral__Alternatives_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19616:1: rule__XBooleanLiteral__Group__1__Impl : ( ( rule__XBooleanLiteral__Alternatives_1 ) ) ;
     public final void rule__XBooleanLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19714:1: ( ( ( rule__XBooleanLiteral__Alternatives_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19715:1: ( ( rule__XBooleanLiteral__Alternatives_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19620:1: ( ( ( rule__XBooleanLiteral__Alternatives_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19621:1: ( ( rule__XBooleanLiteral__Alternatives_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19715:1: ( ( rule__XBooleanLiteral__Alternatives_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19716:1: ( rule__XBooleanLiteral__Alternatives_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19621:1: ( ( rule__XBooleanLiteral__Alternatives_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19622:1: ( rule__XBooleanLiteral__Alternatives_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBooleanLiteralAccess().getAlternatives_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19717:1: ( rule__XBooleanLiteral__Alternatives_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19717:2: rule__XBooleanLiteral__Alternatives_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19623:1: ( rule__XBooleanLiteral__Alternatives_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19623:2: rule__XBooleanLiteral__Alternatives_1
             {
-            pushFollow(FOLLOW_rule__XBooleanLiteral__Alternatives_1_in_rule__XBooleanLiteral__Group__1__Impl39837);
+            pushFollow(FOLLOW_rule__XBooleanLiteral__Alternatives_1_in_rule__XBooleanLiteral__Group__1__Impl39651);
             rule__XBooleanLiteral__Alternatives_1();
 
             state._fsp--;
@@ -56712,21 +56449,21 @@ public final void rule__XBooleanLiteral__Group__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XNullLiteral__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19731:1: rule__XNullLiteral__Group__0 : rule__XNullLiteral__Group__0__Impl rule__XNullLiteral__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19637:1: rule__XNullLiteral__Group__0 : rule__XNullLiteral__Group__0__Impl rule__XNullLiteral__Group__1 ;
     public final void rule__XNullLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19735:1: ( rule__XNullLiteral__Group__0__Impl rule__XNullLiteral__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19736:2: rule__XNullLiteral__Group__0__Impl rule__XNullLiteral__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19641:1: ( rule__XNullLiteral__Group__0__Impl rule__XNullLiteral__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19642:2: rule__XNullLiteral__Group__0__Impl rule__XNullLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__XNullLiteral__Group__0__Impl_in_rule__XNullLiteral__Group__039871);
+            pushFollow(FOLLOW_rule__XNullLiteral__Group__0__Impl_in_rule__XNullLiteral__Group__039685);
             rule__XNullLiteral__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XNullLiteral__Group__1_in_rule__XNullLiteral__Group__039874);
+            pushFollow(FOLLOW_rule__XNullLiteral__Group__1_in_rule__XNullLiteral__Group__039688);
             rule__XNullLiteral__Group__1();
 
             state._fsp--;
@@ -56750,23 +56487,23 @@ public final void rule__XNullLiteral__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XNullLiteral__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19743:1: rule__XNullLiteral__Group__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19649:1: rule__XNullLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XNullLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19747:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19748:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19653:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19654:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19748:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19749:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19654:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19655:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNullLiteralAccess().getXNullLiteralAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19750:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19752:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19656:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19658:1: 
             {
             }
 
@@ -56791,16 +56528,16 @@ public final void rule__XNullLiteral__Group__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XNullLiteral__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19762:1: rule__XNullLiteral__Group__1 : rule__XNullLiteral__Group__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19668:1: rule__XNullLiteral__Group__1 : rule__XNullLiteral__Group__1__Impl ;
     public final void rule__XNullLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19766:1: ( rule__XNullLiteral__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19767:2: rule__XNullLiteral__Group__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19672:1: ( rule__XNullLiteral__Group__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19673:2: rule__XNullLiteral__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XNullLiteral__Group__1__Impl_in_rule__XNullLiteral__Group__139932);
+            pushFollow(FOLLOW_rule__XNullLiteral__Group__1__Impl_in_rule__XNullLiteral__Group__139746);
             rule__XNullLiteral__Group__1__Impl();
 
             state._fsp--;
@@ -56824,22 +56561,22 @@ public final void rule__XNullLiteral__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XNullLiteral__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19773:1: rule__XNullLiteral__Group__1__Impl : ( 'null' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19679:1: rule__XNullLiteral__Group__1__Impl : ( 'null' ) ;
     public final void rule__XNullLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19777:1: ( ( 'null' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19778:1: ( 'null' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19683:1: ( ( 'null' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19684:1: ( 'null' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19778:1: ( 'null' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19779:1: 'null'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19684:1: ( 'null' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19685:1: 'null'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNullLiteralAccess().getNullKeyword_1()); 
             }
-            match(input,93,FOLLOW_93_in_rule__XNullLiteral__Group__1__Impl39960); if (state.failed) return ;
+            match(input,93,FOLLOW_93_in_rule__XNullLiteral__Group__1__Impl39774); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXNullLiteralAccess().getNullKeyword_1()); 
             }
@@ -56865,21 +56602,21 @@ public final void rule__XNullLiteral__Group__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XNumberLiteral__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19796:1: rule__XNumberLiteral__Group__0 : rule__XNumberLiteral__Group__0__Impl rule__XNumberLiteral__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19702:1: rule__XNumberLiteral__Group__0 : rule__XNumberLiteral__Group__0__Impl rule__XNumberLiteral__Group__1 ;
     public final void rule__XNumberLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19800:1: ( rule__XNumberLiteral__Group__0__Impl rule__XNumberLiteral__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19801:2: rule__XNumberLiteral__Group__0__Impl rule__XNumberLiteral__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19706:1: ( rule__XNumberLiteral__Group__0__Impl rule__XNumberLiteral__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19707:2: rule__XNumberLiteral__Group__0__Impl rule__XNumberLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__XNumberLiteral__Group__0__Impl_in_rule__XNumberLiteral__Group__039995);
+            pushFollow(FOLLOW_rule__XNumberLiteral__Group__0__Impl_in_rule__XNumberLiteral__Group__039809);
             rule__XNumberLiteral__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XNumberLiteral__Group__1_in_rule__XNumberLiteral__Group__039998);
+            pushFollow(FOLLOW_rule__XNumberLiteral__Group__1_in_rule__XNumberLiteral__Group__039812);
             rule__XNumberLiteral__Group__1();
 
             state._fsp--;
@@ -56903,23 +56640,23 @@ public final void rule__XNumberLiteral__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XNumberLiteral__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19808:1: rule__XNumberLiteral__Group__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19714:1: rule__XNumberLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XNumberLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19812:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19813:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19718:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19719:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19813:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19814:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19719:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19720:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNumberLiteralAccess().getXNumberLiteralAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19815:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19817:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19721:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19723:1: 
             {
             }
 
@@ -56944,16 +56681,16 @@ public final void rule__XNumberLiteral__Group__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XNumberLiteral__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19827:1: rule__XNumberLiteral__Group__1 : rule__XNumberLiteral__Group__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19733:1: rule__XNumberLiteral__Group__1 : rule__XNumberLiteral__Group__1__Impl ;
     public final void rule__XNumberLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19831:1: ( rule__XNumberLiteral__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19832:2: rule__XNumberLiteral__Group__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19737:1: ( rule__XNumberLiteral__Group__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19738:2: rule__XNumberLiteral__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XNumberLiteral__Group__1__Impl_in_rule__XNumberLiteral__Group__140056);
+            pushFollow(FOLLOW_rule__XNumberLiteral__Group__1__Impl_in_rule__XNumberLiteral__Group__139870);
             rule__XNumberLiteral__Group__1__Impl();
 
             state._fsp--;
@@ -56977,25 +56714,25 @@ public final void rule__XNumberLiteral__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XNumberLiteral__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19838:1: rule__XNumberLiteral__Group__1__Impl : ( ( rule__XNumberLiteral__ValueAssignment_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19744:1: rule__XNumberLiteral__Group__1__Impl : ( ( rule__XNumberLiteral__ValueAssignment_1 ) ) ;
     public final void rule__XNumberLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19842:1: ( ( ( rule__XNumberLiteral__ValueAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19843:1: ( ( rule__XNumberLiteral__ValueAssignment_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19748:1: ( ( ( rule__XNumberLiteral__ValueAssignment_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19749:1: ( ( rule__XNumberLiteral__ValueAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19843:1: ( ( rule__XNumberLiteral__ValueAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19844:1: ( rule__XNumberLiteral__ValueAssignment_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19749:1: ( ( rule__XNumberLiteral__ValueAssignment_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19750:1: ( rule__XNumberLiteral__ValueAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNumberLiteralAccess().getValueAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19845:1: ( rule__XNumberLiteral__ValueAssignment_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19845:2: rule__XNumberLiteral__ValueAssignment_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19751:1: ( rule__XNumberLiteral__ValueAssignment_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19751:2: rule__XNumberLiteral__ValueAssignment_1
             {
-            pushFollow(FOLLOW_rule__XNumberLiteral__ValueAssignment_1_in_rule__XNumberLiteral__Group__1__Impl40083);
+            pushFollow(FOLLOW_rule__XNumberLiteral__ValueAssignment_1_in_rule__XNumberLiteral__Group__1__Impl39897);
             rule__XNumberLiteral__ValueAssignment_1();
 
             state._fsp--;
@@ -57028,21 +56765,21 @@ public final void rule__XNumberLiteral__Group__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XStringLiteral__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19859:1: rule__XStringLiteral__Group__0 : rule__XStringLiteral__Group__0__Impl rule__XStringLiteral__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19765:1: rule__XStringLiteral__Group__0 : rule__XStringLiteral__Group__0__Impl rule__XStringLiteral__Group__1 ;
     public final void rule__XStringLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19863:1: ( rule__XStringLiteral__Group__0__Impl rule__XStringLiteral__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19864:2: rule__XStringLiteral__Group__0__Impl rule__XStringLiteral__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19769:1: ( rule__XStringLiteral__Group__0__Impl rule__XStringLiteral__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19770:2: rule__XStringLiteral__Group__0__Impl rule__XStringLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__XStringLiteral__Group__0__Impl_in_rule__XStringLiteral__Group__040117);
+            pushFollow(FOLLOW_rule__XStringLiteral__Group__0__Impl_in_rule__XStringLiteral__Group__039931);
             rule__XStringLiteral__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XStringLiteral__Group__1_in_rule__XStringLiteral__Group__040120);
+            pushFollow(FOLLOW_rule__XStringLiteral__Group__1_in_rule__XStringLiteral__Group__039934);
             rule__XStringLiteral__Group__1();
 
             state._fsp--;
@@ -57066,23 +56803,23 @@ public final void rule__XStringLiteral__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XStringLiteral__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19871:1: rule__XStringLiteral__Group__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19777:1: rule__XStringLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XStringLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19875:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19876:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19781:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19782:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19876:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19877:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19782:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19783:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXStringLiteralAccess().getXStringLiteralAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19878:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19880:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19784:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19786:1: 
             {
             }
 
@@ -57107,16 +56844,16 @@ public final void rule__XStringLiteral__Group__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XStringLiteral__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19890:1: rule__XStringLiteral__Group__1 : rule__XStringLiteral__Group__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19796:1: rule__XStringLiteral__Group__1 : rule__XStringLiteral__Group__1__Impl ;
     public final void rule__XStringLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19894:1: ( rule__XStringLiteral__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19895:2: rule__XStringLiteral__Group__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19800:1: ( rule__XStringLiteral__Group__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19801:2: rule__XStringLiteral__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XStringLiteral__Group__1__Impl_in_rule__XStringLiteral__Group__140178);
+            pushFollow(FOLLOW_rule__XStringLiteral__Group__1__Impl_in_rule__XStringLiteral__Group__139992);
             rule__XStringLiteral__Group__1__Impl();
 
             state._fsp--;
@@ -57140,25 +56877,25 @@ public final void rule__XStringLiteral__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XStringLiteral__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19901:1: rule__XStringLiteral__Group__1__Impl : ( ( rule__XStringLiteral__ValueAssignment_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19807:1: rule__XStringLiteral__Group__1__Impl : ( ( rule__XStringLiteral__ValueAssignment_1 ) ) ;
     public final void rule__XStringLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19905:1: ( ( ( rule__XStringLiteral__ValueAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19906:1: ( ( rule__XStringLiteral__ValueAssignment_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19811:1: ( ( ( rule__XStringLiteral__ValueAssignment_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19812:1: ( ( rule__XStringLiteral__ValueAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19906:1: ( ( rule__XStringLiteral__ValueAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19907:1: ( rule__XStringLiteral__ValueAssignment_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19812:1: ( ( rule__XStringLiteral__ValueAssignment_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19813:1: ( rule__XStringLiteral__ValueAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXStringLiteralAccess().getValueAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19908:1: ( rule__XStringLiteral__ValueAssignment_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19908:2: rule__XStringLiteral__ValueAssignment_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19814:1: ( rule__XStringLiteral__ValueAssignment_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19814:2: rule__XStringLiteral__ValueAssignment_1
             {
-            pushFollow(FOLLOW_rule__XStringLiteral__ValueAssignment_1_in_rule__XStringLiteral__Group__1__Impl40205);
+            pushFollow(FOLLOW_rule__XStringLiteral__ValueAssignment_1_in_rule__XStringLiteral__Group__1__Impl40019);
             rule__XStringLiteral__ValueAssignment_1();
 
             state._fsp--;
@@ -57191,21 +56928,21 @@ public final void rule__XStringLiteral__Group__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19922:1: rule__XTypeLiteral__Group__0 : rule__XTypeLiteral__Group__0__Impl rule__XTypeLiteral__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19828:1: rule__XTypeLiteral__Group__0 : rule__XTypeLiteral__Group__0__Impl rule__XTypeLiteral__Group__1 ;
     public final void rule__XTypeLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19926:1: ( rule__XTypeLiteral__Group__0__Impl rule__XTypeLiteral__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19927:2: rule__XTypeLiteral__Group__0__Impl rule__XTypeLiteral__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19832:1: ( rule__XTypeLiteral__Group__0__Impl rule__XTypeLiteral__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19833:2: rule__XTypeLiteral__Group__0__Impl rule__XTypeLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__0__Impl_in_rule__XTypeLiteral__Group__040239);
+            pushFollow(FOLLOW_rule__XTypeLiteral__Group__0__Impl_in_rule__XTypeLiteral__Group__040053);
             rule__XTypeLiteral__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__1_in_rule__XTypeLiteral__Group__040242);
+            pushFollow(FOLLOW_rule__XTypeLiteral__Group__1_in_rule__XTypeLiteral__Group__040056);
             rule__XTypeLiteral__Group__1();
 
             state._fsp--;
@@ -57229,23 +56966,23 @@ public final void rule__XTypeLiteral__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19934:1: rule__XTypeLiteral__Group__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19840:1: rule__XTypeLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XTypeLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19938:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19939:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19844:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19845:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19939:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19940:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19845:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19846:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getXTypeLiteralAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19941:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19943:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19847:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19849:1: 
             {
             }
 
@@ -57270,21 +57007,21 @@ public final void rule__XTypeLiteral__Group__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19953:1: rule__XTypeLiteral__Group__1 : rule__XTypeLiteral__Group__1__Impl rule__XTypeLiteral__Group__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19859:1: rule__XTypeLiteral__Group__1 : rule__XTypeLiteral__Group__1__Impl rule__XTypeLiteral__Group__2 ;
     public final void rule__XTypeLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19957:1: ( rule__XTypeLiteral__Group__1__Impl rule__XTypeLiteral__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19958:2: rule__XTypeLiteral__Group__1__Impl rule__XTypeLiteral__Group__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19863:1: ( rule__XTypeLiteral__Group__1__Impl rule__XTypeLiteral__Group__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19864:2: rule__XTypeLiteral__Group__1__Impl rule__XTypeLiteral__Group__2
             {
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__1__Impl_in_rule__XTypeLiteral__Group__140300);
+            pushFollow(FOLLOW_rule__XTypeLiteral__Group__1__Impl_in_rule__XTypeLiteral__Group__140114);
             rule__XTypeLiteral__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__2_in_rule__XTypeLiteral__Group__140303);
+            pushFollow(FOLLOW_rule__XTypeLiteral__Group__2_in_rule__XTypeLiteral__Group__140117);
             rule__XTypeLiteral__Group__2();
 
             state._fsp--;
@@ -57308,22 +57045,22 @@ public final void rule__XTypeLiteral__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19965:1: rule__XTypeLiteral__Group__1__Impl : ( 'typeof' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19871:1: rule__XTypeLiteral__Group__1__Impl : ( 'typeof' ) ;
     public final void rule__XTypeLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19969:1: ( ( 'typeof' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19970:1: ( 'typeof' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19875:1: ( ( 'typeof' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19876:1: ( 'typeof' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19970:1: ( 'typeof' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19971:1: 'typeof'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19876:1: ( 'typeof' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19877:1: 'typeof'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getTypeofKeyword_1()); 
             }
-            match(input,94,FOLLOW_94_in_rule__XTypeLiteral__Group__1__Impl40331); if (state.failed) return ;
+            match(input,94,FOLLOW_94_in_rule__XTypeLiteral__Group__1__Impl40145); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXTypeLiteralAccess().getTypeofKeyword_1()); 
             }
@@ -57349,21 +57086,21 @@ public final void rule__XTypeLiteral__Group__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19984:1: rule__XTypeLiteral__Group__2 : rule__XTypeLiteral__Group__2__Impl rule__XTypeLiteral__Group__3 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19890:1: rule__XTypeLiteral__Group__2 : rule__XTypeLiteral__Group__2__Impl rule__XTypeLiteral__Group__3 ;
     public final void rule__XTypeLiteral__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19988:1: ( rule__XTypeLiteral__Group__2__Impl rule__XTypeLiteral__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19989:2: rule__XTypeLiteral__Group__2__Impl rule__XTypeLiteral__Group__3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19894:1: ( rule__XTypeLiteral__Group__2__Impl rule__XTypeLiteral__Group__3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19895:2: rule__XTypeLiteral__Group__2__Impl rule__XTypeLiteral__Group__3
             {
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__2__Impl_in_rule__XTypeLiteral__Group__240362);
+            pushFollow(FOLLOW_rule__XTypeLiteral__Group__2__Impl_in_rule__XTypeLiteral__Group__240176);
             rule__XTypeLiteral__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__3_in_rule__XTypeLiteral__Group__240365);
+            pushFollow(FOLLOW_rule__XTypeLiteral__Group__3_in_rule__XTypeLiteral__Group__240179);
             rule__XTypeLiteral__Group__3();
 
             state._fsp--;
@@ -57387,22 +57124,22 @@ public final void rule__XTypeLiteral__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19996:1: rule__XTypeLiteral__Group__2__Impl : ( '(' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19902:1: rule__XTypeLiteral__Group__2__Impl : ( '(' ) ;
     public final void rule__XTypeLiteral__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20000:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20001:1: ( '(' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19906:1: ( ( '(' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19907:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20001:1: ( '(' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20002:1: '('
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19907:1: ( '(' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19908:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getLeftParenthesisKeyword_2()); 
             }
-            match(input,72,FOLLOW_72_in_rule__XTypeLiteral__Group__2__Impl40393); if (state.failed) return ;
+            match(input,72,FOLLOW_72_in_rule__XTypeLiteral__Group__2__Impl40207); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXTypeLiteralAccess().getLeftParenthesisKeyword_2()); 
             }
@@ -57428,21 +57165,21 @@ public final void rule__XTypeLiteral__Group__2__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20015:1: rule__XTypeLiteral__Group__3 : rule__XTypeLiteral__Group__3__Impl rule__XTypeLiteral__Group__4 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19921:1: rule__XTypeLiteral__Group__3 : rule__XTypeLiteral__Group__3__Impl rule__XTypeLiteral__Group__4 ;
     public final void rule__XTypeLiteral__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20019:1: ( rule__XTypeLiteral__Group__3__Impl rule__XTypeLiteral__Group__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20020:2: rule__XTypeLiteral__Group__3__Impl rule__XTypeLiteral__Group__4
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19925:1: ( rule__XTypeLiteral__Group__3__Impl rule__XTypeLiteral__Group__4 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19926:2: rule__XTypeLiteral__Group__3__Impl rule__XTypeLiteral__Group__4
             {
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__3__Impl_in_rule__XTypeLiteral__Group__340424);
+            pushFollow(FOLLOW_rule__XTypeLiteral__Group__3__Impl_in_rule__XTypeLiteral__Group__340238);
             rule__XTypeLiteral__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__4_in_rule__XTypeLiteral__Group__340427);
+            pushFollow(FOLLOW_rule__XTypeLiteral__Group__4_in_rule__XTypeLiteral__Group__340241);
             rule__XTypeLiteral__Group__4();
 
             state._fsp--;
@@ -57466,25 +57203,25 @@ public final void rule__XTypeLiteral__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20027:1: rule__XTypeLiteral__Group__3__Impl : ( ( rule__XTypeLiteral__TypeAssignment_3 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19933:1: rule__XTypeLiteral__Group__3__Impl : ( ( rule__XTypeLiteral__TypeAssignment_3 ) ) ;
     public final void rule__XTypeLiteral__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20031:1: ( ( ( rule__XTypeLiteral__TypeAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20032:1: ( ( rule__XTypeLiteral__TypeAssignment_3 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19937:1: ( ( ( rule__XTypeLiteral__TypeAssignment_3 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19938:1: ( ( rule__XTypeLiteral__TypeAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20032:1: ( ( rule__XTypeLiteral__TypeAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20033:1: ( rule__XTypeLiteral__TypeAssignment_3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19938:1: ( ( rule__XTypeLiteral__TypeAssignment_3 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19939:1: ( rule__XTypeLiteral__TypeAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getTypeAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20034:1: ( rule__XTypeLiteral__TypeAssignment_3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20034:2: rule__XTypeLiteral__TypeAssignment_3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19940:1: ( rule__XTypeLiteral__TypeAssignment_3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19940:2: rule__XTypeLiteral__TypeAssignment_3
             {
-            pushFollow(FOLLOW_rule__XTypeLiteral__TypeAssignment_3_in_rule__XTypeLiteral__Group__3__Impl40454);
+            pushFollow(FOLLOW_rule__XTypeLiteral__TypeAssignment_3_in_rule__XTypeLiteral__Group__3__Impl40268);
             rule__XTypeLiteral__TypeAssignment_3();
 
             state._fsp--;
@@ -57517,21 +57254,21 @@ public final void rule__XTypeLiteral__Group__3__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20044:1: rule__XTypeLiteral__Group__4 : rule__XTypeLiteral__Group__4__Impl rule__XTypeLiteral__Group__5 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19950:1: rule__XTypeLiteral__Group__4 : rule__XTypeLiteral__Group__4__Impl rule__XTypeLiteral__Group__5 ;
     public final void rule__XTypeLiteral__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20048:1: ( rule__XTypeLiteral__Group__4__Impl rule__XTypeLiteral__Group__5 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20049:2: rule__XTypeLiteral__Group__4__Impl rule__XTypeLiteral__Group__5
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19954:1: ( rule__XTypeLiteral__Group__4__Impl rule__XTypeLiteral__Group__5 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19955:2: rule__XTypeLiteral__Group__4__Impl rule__XTypeLiteral__Group__5
             {
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__4__Impl_in_rule__XTypeLiteral__Group__440484);
+            pushFollow(FOLLOW_rule__XTypeLiteral__Group__4__Impl_in_rule__XTypeLiteral__Group__440298);
             rule__XTypeLiteral__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__5_in_rule__XTypeLiteral__Group__440487);
+            pushFollow(FOLLOW_rule__XTypeLiteral__Group__5_in_rule__XTypeLiteral__Group__440301);
             rule__XTypeLiteral__Group__5();
 
             state._fsp--;
@@ -57555,37 +57292,37 @@ public final void rule__XTypeLiteral__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20056:1: rule__XTypeLiteral__Group__4__Impl : ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19962:1: rule__XTypeLiteral__Group__4__Impl : ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* ) ;
     public final void rule__XTypeLiteral__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20060:1: ( ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20061:1: ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19966:1: ( ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19967:1: ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20061:1: ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20062:1: ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19967:1: ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19968:1: ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getArrayDimensionsAssignment_4()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20063:1: ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )*
-            loop150:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19969:1: ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )*
+            loop149:
             do {
-                int alt150=2;
-                int LA150_0 = input.LA(1);
+                int alt149=2;
+                int LA149_0 = input.LA(1);
 
-                if ( (LA150_0==78) ) {
-                    alt150=1;
+                if ( (LA149_0==78) ) {
+                    alt149=1;
                 }
 
 
-                switch (alt150) {
+                switch (alt149) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20063:2: rule__XTypeLiteral__ArrayDimensionsAssignment_4
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19969:2: rule__XTypeLiteral__ArrayDimensionsAssignment_4
             	    {
-            	    pushFollow(FOLLOW_rule__XTypeLiteral__ArrayDimensionsAssignment_4_in_rule__XTypeLiteral__Group__4__Impl40514);
+            	    pushFollow(FOLLOW_rule__XTypeLiteral__ArrayDimensionsAssignment_4_in_rule__XTypeLiteral__Group__4__Impl40328);
             	    rule__XTypeLiteral__ArrayDimensionsAssignment_4();
 
             	    state._fsp--;
@@ -57595,7 +57332,7 @@ public final void rule__XTypeLiteral__Group__4__Impl() throws RecognitionExcepti
             	    break;
 
             	default :
-            	    break loop150;
+            	    break loop149;
                 }
             } while (true);
 
@@ -57624,16 +57361,16 @@ public final void rule__XTypeLiteral__Group__4__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__5"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20073:1: rule__XTypeLiteral__Group__5 : rule__XTypeLiteral__Group__5__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19979:1: rule__XTypeLiteral__Group__5 : rule__XTypeLiteral__Group__5__Impl ;
     public final void rule__XTypeLiteral__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20077:1: ( rule__XTypeLiteral__Group__5__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20078:2: rule__XTypeLiteral__Group__5__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19983:1: ( rule__XTypeLiteral__Group__5__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19984:2: rule__XTypeLiteral__Group__5__Impl
             {
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__5__Impl_in_rule__XTypeLiteral__Group__540545);
+            pushFollow(FOLLOW_rule__XTypeLiteral__Group__5__Impl_in_rule__XTypeLiteral__Group__540359);
             rule__XTypeLiteral__Group__5__Impl();
 
             state._fsp--;
@@ -57657,22 +57394,22 @@ public final void rule__XTypeLiteral__Group__5() throws RecognitionException {
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20084:1: rule__XTypeLiteral__Group__5__Impl : ( ')' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19990:1: rule__XTypeLiteral__Group__5__Impl : ( ')' ) ;
     public final void rule__XTypeLiteral__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20088:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20089:1: ( ')' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19994:1: ( ( ')' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19995:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20089:1: ( ')' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20090:1: ')'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19995:1: ( ')' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19996:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getRightParenthesisKeyword_5()); 
             }
-            match(input,73,FOLLOW_73_in_rule__XTypeLiteral__Group__5__Impl40573); if (state.failed) return ;
+            match(input,73,FOLLOW_73_in_rule__XTypeLiteral__Group__5__Impl40387); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXTypeLiteralAccess().getRightParenthesisKeyword_5()); 
             }
@@ -57698,21 +57435,21 @@ public final void rule__XTypeLiteral__Group__5__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XThrowExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20115:1: rule__XThrowExpression__Group__0 : rule__XThrowExpression__Group__0__Impl rule__XThrowExpression__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20021:1: rule__XThrowExpression__Group__0 : rule__XThrowExpression__Group__0__Impl rule__XThrowExpression__Group__1 ;
     public final void rule__XThrowExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20119:1: ( rule__XThrowExpression__Group__0__Impl rule__XThrowExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20120:2: rule__XThrowExpression__Group__0__Impl rule__XThrowExpression__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20025:1: ( rule__XThrowExpression__Group__0__Impl rule__XThrowExpression__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20026:2: rule__XThrowExpression__Group__0__Impl rule__XThrowExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XThrowExpression__Group__0__Impl_in_rule__XThrowExpression__Group__040616);
+            pushFollow(FOLLOW_rule__XThrowExpression__Group__0__Impl_in_rule__XThrowExpression__Group__040430);
             rule__XThrowExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XThrowExpression__Group__1_in_rule__XThrowExpression__Group__040619);
+            pushFollow(FOLLOW_rule__XThrowExpression__Group__1_in_rule__XThrowExpression__Group__040433);
             rule__XThrowExpression__Group__1();
 
             state._fsp--;
@@ -57736,23 +57473,23 @@ public final void rule__XThrowExpression__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XThrowExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20127:1: rule__XThrowExpression__Group__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20033:1: rule__XThrowExpression__Group__0__Impl : ( () ) ;
     public final void rule__XThrowExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20131:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20132:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20037:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20038:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20132:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20133:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20038:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20039:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXThrowExpressionAccess().getXThrowExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20134:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20136:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20040:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20042:1: 
             {
             }
 
@@ -57777,21 +57514,21 @@ public final void rule__XThrowExpression__Group__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XThrowExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20146:1: rule__XThrowExpression__Group__1 : rule__XThrowExpression__Group__1__Impl rule__XThrowExpression__Group__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20052:1: rule__XThrowExpression__Group__1 : rule__XThrowExpression__Group__1__Impl rule__XThrowExpression__Group__2 ;
     public final void rule__XThrowExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20150:1: ( rule__XThrowExpression__Group__1__Impl rule__XThrowExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20151:2: rule__XThrowExpression__Group__1__Impl rule__XThrowExpression__Group__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20056:1: ( rule__XThrowExpression__Group__1__Impl rule__XThrowExpression__Group__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20057:2: rule__XThrowExpression__Group__1__Impl rule__XThrowExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XThrowExpression__Group__1__Impl_in_rule__XThrowExpression__Group__140677);
+            pushFollow(FOLLOW_rule__XThrowExpression__Group__1__Impl_in_rule__XThrowExpression__Group__140491);
             rule__XThrowExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XThrowExpression__Group__2_in_rule__XThrowExpression__Group__140680);
+            pushFollow(FOLLOW_rule__XThrowExpression__Group__2_in_rule__XThrowExpression__Group__140494);
             rule__XThrowExpression__Group__2();
 
             state._fsp--;
@@ -57815,22 +57552,22 @@ public final void rule__XThrowExpression__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XThrowExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20158:1: rule__XThrowExpression__Group__1__Impl : ( 'throw' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20064:1: rule__XThrowExpression__Group__1__Impl : ( 'throw' ) ;
     public final void rule__XThrowExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20162:1: ( ( 'throw' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20163:1: ( 'throw' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20068:1: ( ( 'throw' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20069:1: ( 'throw' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20163:1: ( 'throw' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20164:1: 'throw'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20069:1: ( 'throw' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20070:1: 'throw'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXThrowExpressionAccess().getThrowKeyword_1()); 
             }
-            match(input,95,FOLLOW_95_in_rule__XThrowExpression__Group__1__Impl40708); if (state.failed) return ;
+            match(input,95,FOLLOW_95_in_rule__XThrowExpression__Group__1__Impl40522); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXThrowExpressionAccess().getThrowKeyword_1()); 
             }
@@ -57856,16 +57593,16 @@ public final void rule__XThrowExpression__Group__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XThrowExpression__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20177:1: rule__XThrowExpression__Group__2 : rule__XThrowExpression__Group__2__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20083:1: rule__XThrowExpression__Group__2 : rule__XThrowExpression__Group__2__Impl ;
     public final void rule__XThrowExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20181:1: ( rule__XThrowExpression__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20182:2: rule__XThrowExpression__Group__2__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20087:1: ( rule__XThrowExpression__Group__2__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20088:2: rule__XThrowExpression__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__XThrowExpression__Group__2__Impl_in_rule__XThrowExpression__Group__240739);
+            pushFollow(FOLLOW_rule__XThrowExpression__Group__2__Impl_in_rule__XThrowExpression__Group__240553);
             rule__XThrowExpression__Group__2__Impl();
 
             state._fsp--;
@@ -57889,25 +57626,25 @@ public final void rule__XThrowExpression__Group__2() throws RecognitionException
 
 
     // $ANTLR start "rule__XThrowExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20188:1: rule__XThrowExpression__Group__2__Impl : ( ( rule__XThrowExpression__ExpressionAssignment_2 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20094:1: rule__XThrowExpression__Group__2__Impl : ( ( rule__XThrowExpression__ExpressionAssignment_2 ) ) ;
     public final void rule__XThrowExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20192:1: ( ( ( rule__XThrowExpression__ExpressionAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20193:1: ( ( rule__XThrowExpression__ExpressionAssignment_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20098:1: ( ( ( rule__XThrowExpression__ExpressionAssignment_2 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20099:1: ( ( rule__XThrowExpression__ExpressionAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20193:1: ( ( rule__XThrowExpression__ExpressionAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20194:1: ( rule__XThrowExpression__ExpressionAssignment_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20099:1: ( ( rule__XThrowExpression__ExpressionAssignment_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20100:1: ( rule__XThrowExpression__ExpressionAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXThrowExpressionAccess().getExpressionAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20195:1: ( rule__XThrowExpression__ExpressionAssignment_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20195:2: rule__XThrowExpression__ExpressionAssignment_2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20101:1: ( rule__XThrowExpression__ExpressionAssignment_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20101:2: rule__XThrowExpression__ExpressionAssignment_2
             {
-            pushFollow(FOLLOW_rule__XThrowExpression__ExpressionAssignment_2_in_rule__XThrowExpression__Group__2__Impl40766);
+            pushFollow(FOLLOW_rule__XThrowExpression__ExpressionAssignment_2_in_rule__XThrowExpression__Group__2__Impl40580);
             rule__XThrowExpression__ExpressionAssignment_2();
 
             state._fsp--;
@@ -57940,21 +57677,21 @@ public final void rule__XThrowExpression__Group__2__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XReturnExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20211:1: rule__XReturnExpression__Group__0 : rule__XReturnExpression__Group__0__Impl rule__XReturnExpression__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20117:1: rule__XReturnExpression__Group__0 : rule__XReturnExpression__Group__0__Impl rule__XReturnExpression__Group__1 ;
     public final void rule__XReturnExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20215:1: ( rule__XReturnExpression__Group__0__Impl rule__XReturnExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20216:2: rule__XReturnExpression__Group__0__Impl rule__XReturnExpression__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20121:1: ( rule__XReturnExpression__Group__0__Impl rule__XReturnExpression__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20122:2: rule__XReturnExpression__Group__0__Impl rule__XReturnExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XReturnExpression__Group__0__Impl_in_rule__XReturnExpression__Group__040802);
+            pushFollow(FOLLOW_rule__XReturnExpression__Group__0__Impl_in_rule__XReturnExpression__Group__040616);
             rule__XReturnExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XReturnExpression__Group__1_in_rule__XReturnExpression__Group__040805);
+            pushFollow(FOLLOW_rule__XReturnExpression__Group__1_in_rule__XReturnExpression__Group__040619);
             rule__XReturnExpression__Group__1();
 
             state._fsp--;
@@ -57978,23 +57715,23 @@ public final void rule__XReturnExpression__Group__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XReturnExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20223:1: rule__XReturnExpression__Group__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20129:1: rule__XReturnExpression__Group__0__Impl : ( () ) ;
     public final void rule__XReturnExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20227:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20228:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20133:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20134:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20228:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20229:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20134:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20135:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXReturnExpressionAccess().getXReturnExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20230:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20232:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20136:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20138:1: 
             {
             }
 
@@ -58019,21 +57756,21 @@ public final void rule__XReturnExpression__Group__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XReturnExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20242:1: rule__XReturnExpression__Group__1 : rule__XReturnExpression__Group__1__Impl rule__XReturnExpression__Group__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20148:1: rule__XReturnExpression__Group__1 : rule__XReturnExpression__Group__1__Impl rule__XReturnExpression__Group__2 ;
     public final void rule__XReturnExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20246:1: ( rule__XReturnExpression__Group__1__Impl rule__XReturnExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20247:2: rule__XReturnExpression__Group__1__Impl rule__XReturnExpression__Group__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20152:1: ( rule__XReturnExpression__Group__1__Impl rule__XReturnExpression__Group__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20153:2: rule__XReturnExpression__Group__1__Impl rule__XReturnExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XReturnExpression__Group__1__Impl_in_rule__XReturnExpression__Group__140863);
+            pushFollow(FOLLOW_rule__XReturnExpression__Group__1__Impl_in_rule__XReturnExpression__Group__140677);
             rule__XReturnExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XReturnExpression__Group__2_in_rule__XReturnExpression__Group__140866);
+            pushFollow(FOLLOW_rule__XReturnExpression__Group__2_in_rule__XReturnExpression__Group__140680);
             rule__XReturnExpression__Group__2();
 
             state._fsp--;
@@ -58057,22 +57794,22 @@ public final void rule__XReturnExpression__Group__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XReturnExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20254:1: rule__XReturnExpression__Group__1__Impl : ( 'return' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20160:1: rule__XReturnExpression__Group__1__Impl : ( 'return' ) ;
     public final void rule__XReturnExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20258:1: ( ( 'return' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20259:1: ( 'return' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20164:1: ( ( 'return' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20165:1: ( 'return' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20259:1: ( 'return' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20260:1: 'return'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20165:1: ( 'return' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20166:1: 'return'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXReturnExpressionAccess().getReturnKeyword_1()); 
             }
-            match(input,96,FOLLOW_96_in_rule__XReturnExpression__Group__1__Impl40894); if (state.failed) return ;
+            match(input,96,FOLLOW_96_in_rule__XReturnExpression__Group__1__Impl40708); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXReturnExpressionAccess().getReturnKeyword_1()); 
             }
@@ -58098,16 +57835,16 @@ public final void rule__XReturnExpression__Group__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XReturnExpression__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20273:1: rule__XReturnExpression__Group__2 : rule__XReturnExpression__Group__2__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20179:1: rule__XReturnExpression__Group__2 : rule__XReturnExpression__Group__2__Impl ;
     public final void rule__XReturnExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20277:1: ( rule__XReturnExpression__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20278:2: rule__XReturnExpression__Group__2__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20183:1: ( rule__XReturnExpression__Group__2__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20184:2: rule__XReturnExpression__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__XReturnExpression__Group__2__Impl_in_rule__XReturnExpression__Group__240925);
+            pushFollow(FOLLOW_rule__XReturnExpression__Group__2__Impl_in_rule__XReturnExpression__Group__240739);
             rule__XReturnExpression__Group__2__Impl();
 
             state._fsp--;
@@ -58131,29 +57868,29 @@ public final void rule__XReturnExpression__Group__2() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XReturnExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20284:1: rule__XReturnExpression__Group__2__Impl : ( ( rule__XReturnExpression__ExpressionAssignment_2 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20190:1: rule__XReturnExpression__Group__2__Impl : ( ( rule__XReturnExpression__ExpressionAssignment_2 )? ) ;
     public final void rule__XReturnExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20288:1: ( ( ( rule__XReturnExpression__ExpressionAssignment_2 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20289:1: ( ( rule__XReturnExpression__ExpressionAssignment_2 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20194:1: ( ( ( rule__XReturnExpression__ExpressionAssignment_2 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20195:1: ( ( rule__XReturnExpression__ExpressionAssignment_2 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20289:1: ( ( rule__XReturnExpression__ExpressionAssignment_2 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20290:1: ( rule__XReturnExpression__ExpressionAssignment_2 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20195:1: ( ( rule__XReturnExpression__ExpressionAssignment_2 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20196:1: ( rule__XReturnExpression__ExpressionAssignment_2 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXReturnExpressionAccess().getExpressionAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20291:1: ( rule__XReturnExpression__ExpressionAssignment_2 )?
-            int alt151=2;
-            alt151 = dfa151.predict(input);
-            switch (alt151) {
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20197:1: ( rule__XReturnExpression__ExpressionAssignment_2 )?
+            int alt150=2;
+            alt150 = dfa150.predict(input);
+            switch (alt150) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20291:2: rule__XReturnExpression__ExpressionAssignment_2
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20197:2: rule__XReturnExpression__ExpressionAssignment_2
                     {
-                    pushFollow(FOLLOW_rule__XReturnExpression__ExpressionAssignment_2_in_rule__XReturnExpression__Group__2__Impl40952);
+                    pushFollow(FOLLOW_rule__XReturnExpression__ExpressionAssignment_2_in_rule__XReturnExpression__Group__2__Impl40766);
                     rule__XReturnExpression__ExpressionAssignment_2();
 
                     state._fsp--;
@@ -58189,21 +57926,21 @@ public final void rule__XReturnExpression__Group__2__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20307:1: rule__XTryCatchFinallyExpression__Group__0 : rule__XTryCatchFinallyExpression__Group__0__Impl rule__XTryCatchFinallyExpression__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20213:1: rule__XTryCatchFinallyExpression__Group__0 : rule__XTryCatchFinallyExpression__Group__0__Impl rule__XTryCatchFinallyExpression__Group__1 ;
     public final void rule__XTryCatchFinallyExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20311:1: ( rule__XTryCatchFinallyExpression__Group__0__Impl rule__XTryCatchFinallyExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20312:2: rule__XTryCatchFinallyExpression__Group__0__Impl rule__XTryCatchFinallyExpression__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20217:1: ( rule__XTryCatchFinallyExpression__Group__0__Impl rule__XTryCatchFinallyExpression__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20218:2: rule__XTryCatchFinallyExpression__Group__0__Impl rule__XTryCatchFinallyExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group__0__Impl_in_rule__XTryCatchFinallyExpression__Group__040989);
+            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group__0__Impl_in_rule__XTryCatchFinallyExpression__Group__040803);
             rule__XTryCatchFinallyExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group__1_in_rule__XTryCatchFinallyExpression__Group__040992);
+            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group__1_in_rule__XTryCatchFinallyExpression__Group__040806);
             rule__XTryCatchFinallyExpression__Group__1();
 
             state._fsp--;
@@ -58227,23 +57964,23 @@ public final void rule__XTryCatchFinallyExpression__Group__0() throws Recognitio
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20319:1: rule__XTryCatchFinallyExpression__Group__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20225:1: rule__XTryCatchFinallyExpression__Group__0__Impl : ( () ) ;
     public final void rule__XTryCatchFinallyExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20323:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20324:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20229:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20230:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20324:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20325:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20230:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20231:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getXTryCatchFinallyExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20326:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20328:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20232:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20234:1: 
             {
             }
 
@@ -58268,21 +58005,21 @@ public final void rule__XTryCatchFinallyExpression__Group__0__Impl() throws Reco
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20338:1: rule__XTryCatchFinallyExpression__Group__1 : rule__XTryCatchFinallyExpression__Group__1__Impl rule__XTryCatchFinallyExpression__Group__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20244:1: rule__XTryCatchFinallyExpression__Group__1 : rule__XTryCatchFinallyExpression__Group__1__Impl rule__XTryCatchFinallyExpression__Group__2 ;
     public final void rule__XTryCatchFinallyExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20342:1: ( rule__XTryCatchFinallyExpression__Group__1__Impl rule__XTryCatchFinallyExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20343:2: rule__XTryCatchFinallyExpression__Group__1__Impl rule__XTryCatchFinallyExpression__Group__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20248:1: ( rule__XTryCatchFinallyExpression__Group__1__Impl rule__XTryCatchFinallyExpression__Group__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20249:2: rule__XTryCatchFinallyExpression__Group__1__Impl rule__XTryCatchFinallyExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group__1__Impl_in_rule__XTryCatchFinallyExpression__Group__141050);
+            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group__1__Impl_in_rule__XTryCatchFinallyExpression__Group__140864);
             rule__XTryCatchFinallyExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group__2_in_rule__XTryCatchFinallyExpression__Group__141053);
+            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group__2_in_rule__XTryCatchFinallyExpression__Group__140867);
             rule__XTryCatchFinallyExpression__Group__2();
 
             state._fsp--;
@@ -58306,22 +58043,22 @@ public final void rule__XTryCatchFinallyExpression__Group__1() throws Recognitio
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20350:1: rule__XTryCatchFinallyExpression__Group__1__Impl : ( 'try' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20256:1: rule__XTryCatchFinallyExpression__Group__1__Impl : ( 'try' ) ;
     public final void rule__XTryCatchFinallyExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20354:1: ( ( 'try' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20355:1: ( 'try' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20260:1: ( ( 'try' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20261:1: ( 'try' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20355:1: ( 'try' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20356:1: 'try'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20261:1: ( 'try' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20262:1: 'try'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getTryKeyword_1()); 
             }
-            match(input,97,FOLLOW_97_in_rule__XTryCatchFinallyExpression__Group__1__Impl41081); if (state.failed) return ;
+            match(input,97,FOLLOW_97_in_rule__XTryCatchFinallyExpression__Group__1__Impl40895); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXTryCatchFinallyExpressionAccess().getTryKeyword_1()); 
             }
@@ -58347,21 +58084,21 @@ public final void rule__XTryCatchFinallyExpression__Group__1__Impl() throws Reco
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20369:1: rule__XTryCatchFinallyExpression__Group__2 : rule__XTryCatchFinallyExpression__Group__2__Impl rule__XTryCatchFinallyExpression__Group__3 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20275:1: rule__XTryCatchFinallyExpression__Group__2 : rule__XTryCatchFinallyExpression__Group__2__Impl rule__XTryCatchFinallyExpression__Group__3 ;
     public final void rule__XTryCatchFinallyExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20373:1: ( rule__XTryCatchFinallyExpression__Group__2__Impl rule__XTryCatchFinallyExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20374:2: rule__XTryCatchFinallyExpression__Group__2__Impl rule__XTryCatchFinallyExpression__Group__3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20279:1: ( rule__XTryCatchFinallyExpression__Group__2__Impl rule__XTryCatchFinallyExpression__Group__3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20280:2: rule__XTryCatchFinallyExpression__Group__2__Impl rule__XTryCatchFinallyExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group__2__Impl_in_rule__XTryCatchFinallyExpression__Group__241112);
+            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group__2__Impl_in_rule__XTryCatchFinallyExpression__Group__240926);
             rule__XTryCatchFinallyExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group__3_in_rule__XTryCatchFinallyExpression__Group__241115);
+            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group__3_in_rule__XTryCatchFinallyExpression__Group__240929);
             rule__XTryCatchFinallyExpression__Group__3();
 
             state._fsp--;
@@ -58385,25 +58122,25 @@ public final void rule__XTryCatchFinallyExpression__Group__2() throws Recognitio
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20381:1: rule__XTryCatchFinallyExpression__Group__2__Impl : ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20287:1: rule__XTryCatchFinallyExpression__Group__2__Impl : ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) ) ;
     public final void rule__XTryCatchFinallyExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20385:1: ( ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20386:1: ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20291:1: ( ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20292:1: ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20386:1: ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20387:1: ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20292:1: ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20293:1: ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getExpressionAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20388:1: ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20388:2: rule__XTryCatchFinallyExpression__ExpressionAssignment_2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20294:1: ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20294:2: rule__XTryCatchFinallyExpression__ExpressionAssignment_2
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__ExpressionAssignment_2_in_rule__XTryCatchFinallyExpression__Group__2__Impl41142);
+            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__ExpressionAssignment_2_in_rule__XTryCatchFinallyExpression__Group__2__Impl40956);
             rule__XTryCatchFinallyExpression__ExpressionAssignment_2();
 
             state._fsp--;
@@ -58436,16 +58173,16 @@ public final void rule__XTryCatchFinallyExpression__Group__2__Impl() throws Reco
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20398:1: rule__XTryCatchFinallyExpression__Group__3 : rule__XTryCatchFinallyExpression__Group__3__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20304:1: rule__XTryCatchFinallyExpression__Group__3 : rule__XTryCatchFinallyExpression__Group__3__Impl ;
     public final void rule__XTryCatchFinallyExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20402:1: ( rule__XTryCatchFinallyExpression__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20403:2: rule__XTryCatchFinallyExpression__Group__3__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20308:1: ( rule__XTryCatchFinallyExpression__Group__3__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20309:2: rule__XTryCatchFinallyExpression__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group__3__Impl_in_rule__XTryCatchFinallyExpression__Group__341172);
+            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group__3__Impl_in_rule__XTryCatchFinallyExpression__Group__340986);
             rule__XTryCatchFinallyExpression__Group__3__Impl();
 
             state._fsp--;
@@ -58469,25 +58206,25 @@ public final void rule__XTryCatchFinallyExpression__Group__3() throws Recognitio
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20409:1: rule__XTryCatchFinallyExpression__Group__3__Impl : ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20315:1: rule__XTryCatchFinallyExpression__Group__3__Impl : ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) ) ;
     public final void rule__XTryCatchFinallyExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20413:1: ( ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20414:1: ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20319:1: ( ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20320:1: ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20414:1: ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20415:1: ( rule__XTryCatchFinallyExpression__Alternatives_3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20320:1: ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20321:1: ( rule__XTryCatchFinallyExpression__Alternatives_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getAlternatives_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20416:1: ( rule__XTryCatchFinallyExpression__Alternatives_3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20416:2: rule__XTryCatchFinallyExpression__Alternatives_3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20322:1: ( rule__XTryCatchFinallyExpression__Alternatives_3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20322:2: rule__XTryCatchFinallyExpression__Alternatives_3
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Alternatives_3_in_rule__XTryCatchFinallyExpression__Group__3__Impl41199);
+            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Alternatives_3_in_rule__XTryCatchFinallyExpression__Group__3__Impl41013);
             rule__XTryCatchFinallyExpression__Alternatives_3();
 
             state._fsp--;
@@ -58520,21 +58257,21 @@ public final void rule__XTryCatchFinallyExpression__Group__3__Impl() throws Reco
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20434:1: rule__XTryCatchFinallyExpression__Group_3_0__0 : rule__XTryCatchFinallyExpression__Group_3_0__0__Impl rule__XTryCatchFinallyExpression__Group_3_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20340:1: rule__XTryCatchFinallyExpression__Group_3_0__0 : rule__XTryCatchFinallyExpression__Group_3_0__0__Impl rule__XTryCatchFinallyExpression__Group_3_0__1 ;
     public final void rule__XTryCatchFinallyExpression__Group_3_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20438:1: ( rule__XTryCatchFinallyExpression__Group_3_0__0__Impl rule__XTryCatchFinallyExpression__Group_3_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20439:2: rule__XTryCatchFinallyExpression__Group_3_0__0__Impl rule__XTryCatchFinallyExpression__Group_3_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20344:1: ( rule__XTryCatchFinallyExpression__Group_3_0__0__Impl rule__XTryCatchFinallyExpression__Group_3_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20345:2: rule__XTryCatchFinallyExpression__Group_3_0__0__Impl rule__XTryCatchFinallyExpression__Group_3_0__1
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0__0__Impl_in_rule__XTryCatchFinallyExpression__Group_3_0__041237);
+            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0__0__Impl_in_rule__XTryCatchFinallyExpression__Group_3_0__041051);
             rule__XTryCatchFinallyExpression__Group_3_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0__1_in_rule__XTryCatchFinallyExpression__Group_3_0__041240);
+            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0__1_in_rule__XTryCatchFinallyExpression__Group_3_0__041054);
             rule__XTryCatchFinallyExpression__Group_3_0__1();
 
             state._fsp--;
@@ -58558,28 +58295,28 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0__0() throws Recogn
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20446:1: rule__XTryCatchFinallyExpression__Group_3_0__0__Impl : ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20352:1: rule__XTryCatchFinallyExpression__Group_3_0__0__Impl : ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) ) ;
     public final void rule__XTryCatchFinallyExpression__Group_3_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20450:1: ( ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20451:1: ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20356:1: ( ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20357:1: ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20451:1: ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20452:1: ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20357:1: ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20358:1: ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20452:1: ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20453:1: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20358:1: ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20359:1: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getCatchClausesAssignment_3_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20454:1: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20454:2: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20360:1: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20360:2: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0_in_rule__XTryCatchFinallyExpression__Group_3_0__0__Impl41269);
+            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0_in_rule__XTryCatchFinallyExpression__Group_3_0__0__Impl41083);
             rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0();
 
             state._fsp--;
@@ -58593,34 +58330,34 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0__0__Impl() throws
 
             }
 
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20457:1: ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20458:1: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20363:1: ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20364:1: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getCatchClausesAssignment_3_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20459:1: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )*
-            loop152:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20365:1: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )*
+            loop151:
             do {
-                int alt152=2;
-                int LA152_0 = input.LA(1);
+                int alt151=2;
+                int LA151_0 = input.LA(1);
 
-                if ( (LA152_0==100) ) {
-                    int LA152_2 = input.LA(2);
+                if ( (LA151_0==100) ) {
+                    int LA151_2 = input.LA(2);
 
-                    if ( (synpred218_InternalCheck()) ) {
-                        alt152=1;
+                    if ( (synpred217_InternalCheck()) ) {
+                        alt151=1;
                     }
 
 
                 }
 
 
-                switch (alt152) {
+                switch (alt151) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20459:2: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20365:2: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0
             	    {
-            	    pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0_in_rule__XTryCatchFinallyExpression__Group_3_0__0__Impl41281);
+            	    pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0_in_rule__XTryCatchFinallyExpression__Group_3_0__0__Impl41095);
             	    rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0();
 
             	    state._fsp--;
@@ -58630,7 +58367,7 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0__0__Impl() throws
             	    break;
 
             	default :
-            	    break loop152;
+            	    break loop151;
                 }
             } while (true);
 
@@ -58662,16 +58399,16 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0__0__Impl() throws
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20470:1: rule__XTryCatchFinallyExpression__Group_3_0__1 : rule__XTryCatchFinallyExpression__Group_3_0__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20376:1: rule__XTryCatchFinallyExpression__Group_3_0__1 : rule__XTryCatchFinallyExpression__Group_3_0__1__Impl ;
     public final void rule__XTryCatchFinallyExpression__Group_3_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20474:1: ( rule__XTryCatchFinallyExpression__Group_3_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20475:2: rule__XTryCatchFinallyExpression__Group_3_0__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20380:1: ( rule__XTryCatchFinallyExpression__Group_3_0__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20381:2: rule__XTryCatchFinallyExpression__Group_3_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0__1__Impl_in_rule__XTryCatchFinallyExpression__Group_3_0__141314);
+            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0__1__Impl_in_rule__XTryCatchFinallyExpression__Group_3_0__141128);
             rule__XTryCatchFinallyExpression__Group_3_0__1__Impl();
 
             state._fsp--;
@@ -58695,37 +58432,37 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0__1() throws Recogn
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20481:1: rule__XTryCatchFinallyExpression__Group_3_0__1__Impl : ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20387:1: rule__XTryCatchFinallyExpression__Group_3_0__1__Impl : ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? ) ;
     public final void rule__XTryCatchFinallyExpression__Group_3_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20485:1: ( ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20486:1: ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20391:1: ( ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20392:1: ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20486:1: ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20487:1: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20392:1: ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20393:1: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getGroup_3_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20488:1: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )?
-            int alt153=2;
-            int LA153_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20394:1: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )?
+            int alt152=2;
+            int LA152_0 = input.LA(1);
 
-            if ( (LA153_0==98) ) {
-                int LA153_1 = input.LA(2);
+            if ( (LA152_0==98) ) {
+                int LA152_1 = input.LA(2);
 
-                if ( (synpred219_InternalCheck()) ) {
-                    alt153=1;
+                if ( (synpred218_InternalCheck()) ) {
+                    alt152=1;
                 }
             }
-            switch (alt153) {
+            switch (alt152) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20488:2: rule__XTryCatchFinallyExpression__Group_3_0_1__0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20394:2: rule__XTryCatchFinallyExpression__Group_3_0_1__0
                     {
-                    pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__0_in_rule__XTryCatchFinallyExpression__Group_3_0__1__Impl41341);
+                    pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__0_in_rule__XTryCatchFinallyExpression__Group_3_0__1__Impl41155);
                     rule__XTryCatchFinallyExpression__Group_3_0_1__0();
 
                     state._fsp--;
@@ -58761,21 +58498,21 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0__1__Impl() throws
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20502:1: rule__XTryCatchFinallyExpression__Group_3_0_1__0 : rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_0_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20408:1: rule__XTryCatchFinallyExpression__Group_3_0_1__0 : rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_0_1__1 ;
     public final void rule__XTryCatchFinallyExpression__Group_3_0_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20506:1: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_0_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20507:2: rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_0_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20412:1: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_0_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20413:2: rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_0_1__1
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl_in_rule__XTryCatchFinallyExpression__Group_3_0_1__041376);
+            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl_in_rule__XTryCatchFinallyExpression__Group_3_0_1__041190);
             rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__1_in_rule__XTryCatchFinallyExpression__Group_3_0_1__041379);
+            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__1_in_rule__XTryCatchFinallyExpression__Group_3_0_1__041193);
             rule__XTryCatchFinallyExpression__Group_3_0_1__1();
 
             state._fsp--;
@@ -58799,25 +58536,25 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0_1__0() throws Reco
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20514:1: rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl : ( ( 'finally' ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20420:1: rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl : ( ( 'finally' ) ) ;
     public final void rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20518:1: ( ( ( 'finally' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20519:1: ( ( 'finally' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20424:1: ( ( ( 'finally' ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20425:1: ( ( 'finally' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20519:1: ( ( 'finally' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20520:1: ( 'finally' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20425:1: ( ( 'finally' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20426:1: ( 'finally' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyKeyword_3_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20521:1: ( 'finally' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20522:2: 'finally'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20427:1: ( 'finally' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20428:2: 'finally'
             {
-            match(input,98,FOLLOW_98_in_rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl41408); if (state.failed) return ;
+            match(input,98,FOLLOW_98_in_rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl41222); if (state.failed) return ;
 
             }
 
@@ -58846,16 +58583,16 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl() throw
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20533:1: rule__XTryCatchFinallyExpression__Group_3_0_1__1 : rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20439:1: rule__XTryCatchFinallyExpression__Group_3_0_1__1 : rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl ;
     public final void rule__XTryCatchFinallyExpression__Group_3_0_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20537:1: ( rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20538:2: rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20443:1: ( rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20444:2: rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl_in_rule__XTryCatchFinallyExpression__Group_3_0_1__141440);
+            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl_in_rule__XTryCatchFinallyExpression__Group_3_0_1__141254);
             rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl();
 
             state._fsp--;
@@ -58879,25 +58616,25 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0_1__1() throws Reco
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20544:1: rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl : ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20450:1: rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl : ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) ) ;
     public final void rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20548:1: ( ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20549:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20454:1: ( ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20455:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20549:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20550:1: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20455:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20456:1: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyExpressionAssignment_3_0_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20551:1: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20551:2: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20457:1: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20457:2: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1_in_rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl41467);
+            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1_in_rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl41281);
             rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1();
 
             state._fsp--;
@@ -58930,21 +58667,21 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl() throw
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20565:1: rule__XTryCatchFinallyExpression__Group_3_1__0 : rule__XTryCatchFinallyExpression__Group_3_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20471:1: rule__XTryCatchFinallyExpression__Group_3_1__0 : rule__XTryCatchFinallyExpression__Group_3_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_1__1 ;
     public final void rule__XTryCatchFinallyExpression__Group_3_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20569:1: ( rule__XTryCatchFinallyExpression__Group_3_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20570:2: rule__XTryCatchFinallyExpression__Group_3_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20475:1: ( rule__XTryCatchFinallyExpression__Group_3_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20476:2: rule__XTryCatchFinallyExpression__Group_3_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_1__1
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_1__0__Impl_in_rule__XTryCatchFinallyExpression__Group_3_1__041501);
+            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_1__0__Impl_in_rule__XTryCatchFinallyExpression__Group_3_1__041315);
             rule__XTryCatchFinallyExpression__Group_3_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_1__1_in_rule__XTryCatchFinallyExpression__Group_3_1__041504);
+            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_1__1_in_rule__XTryCatchFinallyExpression__Group_3_1__041318);
             rule__XTryCatchFinallyExpression__Group_3_1__1();
 
             state._fsp--;
@@ -58968,22 +58705,22 @@ public final void rule__XTryCatchFinallyExpression__Group_3_1__0() throws Recogn
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20577:1: rule__XTryCatchFinallyExpression__Group_3_1__0__Impl : ( 'finally' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20483:1: rule__XTryCatchFinallyExpression__Group_3_1__0__Impl : ( 'finally' ) ;
     public final void rule__XTryCatchFinallyExpression__Group_3_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20581:1: ( ( 'finally' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20582:1: ( 'finally' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20487:1: ( ( 'finally' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20488:1: ( 'finally' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20582:1: ( 'finally' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20583:1: 'finally'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20488:1: ( 'finally' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20489:1: 'finally'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyKeyword_3_1_0()); 
             }
-            match(input,98,FOLLOW_98_in_rule__XTryCatchFinallyExpression__Group_3_1__0__Impl41532); if (state.failed) return ;
+            match(input,98,FOLLOW_98_in_rule__XTryCatchFinallyExpression__Group_3_1__0__Impl41346); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyKeyword_3_1_0()); 
             }
@@ -59009,16 +58746,16 @@ public final void rule__XTryCatchFinallyExpression__Group_3_1__0__Impl() throws
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20596:1: rule__XTryCatchFinallyExpression__Group_3_1__1 : rule__XTryCatchFinallyExpression__Group_3_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20502:1: rule__XTryCatchFinallyExpression__Group_3_1__1 : rule__XTryCatchFinallyExpression__Group_3_1__1__Impl ;
     public final void rule__XTryCatchFinallyExpression__Group_3_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20600:1: ( rule__XTryCatchFinallyExpression__Group_3_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20601:2: rule__XTryCatchFinallyExpression__Group_3_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20506:1: ( rule__XTryCatchFinallyExpression__Group_3_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20507:2: rule__XTryCatchFinallyExpression__Group_3_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_1__1__Impl_in_rule__XTryCatchFinallyExpression__Group_3_1__141563);
+            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_1__1__Impl_in_rule__XTryCatchFinallyExpression__Group_3_1__141377);
             rule__XTryCatchFinallyExpression__Group_3_1__1__Impl();
 
             state._fsp--;
@@ -59042,25 +58779,25 @@ public final void rule__XTryCatchFinallyExpression__Group_3_1__1() throws Recogn
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20607:1: rule__XTryCatchFinallyExpression__Group_3_1__1__Impl : ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20513:1: rule__XTryCatchFinallyExpression__Group_3_1__1__Impl : ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) ) ;
     public final void rule__XTryCatchFinallyExpression__Group_3_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20611:1: ( ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20612:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20517:1: ( ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20518:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20612:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20613:1: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20518:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20519:1: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyExpressionAssignment_3_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20614:1: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20614:2: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20520:1: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20520:2: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1_in_rule__XTryCatchFinallyExpression__Group_3_1__1__Impl41590);
+            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1_in_rule__XTryCatchFinallyExpression__Group_3_1__1__Impl41404);
             rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1();
 
             state._fsp--;
@@ -59093,21 +58830,21 @@ public final void rule__XTryCatchFinallyExpression__Group_3_1__1__Impl() throws
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20628:1: rule__XSynchronizedExpression__Group__0 : rule__XSynchronizedExpression__Group__0__Impl rule__XSynchronizedExpression__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20534:1: rule__XSynchronizedExpression__Group__0 : rule__XSynchronizedExpression__Group__0__Impl rule__XSynchronizedExpression__Group__1 ;
     public final void rule__XSynchronizedExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20632:1: ( rule__XSynchronizedExpression__Group__0__Impl rule__XSynchronizedExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20633:2: rule__XSynchronizedExpression__Group__0__Impl rule__XSynchronizedExpression__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20538:1: ( rule__XSynchronizedExpression__Group__0__Impl rule__XSynchronizedExpression__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20539:2: rule__XSynchronizedExpression__Group__0__Impl rule__XSynchronizedExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group__0__Impl_in_rule__XSynchronizedExpression__Group__041624);
+            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group__0__Impl_in_rule__XSynchronizedExpression__Group__041438);
             rule__XSynchronizedExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group__1_in_rule__XSynchronizedExpression__Group__041627);
+            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group__1_in_rule__XSynchronizedExpression__Group__041441);
             rule__XSynchronizedExpression__Group__1();
 
             state._fsp--;
@@ -59131,25 +58868,25 @@ public final void rule__XSynchronizedExpression__Group__0() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20640:1: rule__XSynchronizedExpression__Group__0__Impl : ( ( rule__XSynchronizedExpression__Group_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20546:1: rule__XSynchronizedExpression__Group__0__Impl : ( ( rule__XSynchronizedExpression__Group_0__0 ) ) ;
     public final void rule__XSynchronizedExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20644:1: ( ( ( rule__XSynchronizedExpression__Group_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20645:1: ( ( rule__XSynchronizedExpression__Group_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20550:1: ( ( ( rule__XSynchronizedExpression__Group_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20551:1: ( ( rule__XSynchronizedExpression__Group_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20645:1: ( ( rule__XSynchronizedExpression__Group_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20646:1: ( rule__XSynchronizedExpression__Group_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20551:1: ( ( rule__XSynchronizedExpression__Group_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20552:1: ( rule__XSynchronizedExpression__Group_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getGroup_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20647:1: ( rule__XSynchronizedExpression__Group_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20647:2: rule__XSynchronizedExpression__Group_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20553:1: ( rule__XSynchronizedExpression__Group_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20553:2: rule__XSynchronizedExpression__Group_0__0
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group_0__0_in_rule__XSynchronizedExpression__Group__0__Impl41654);
+            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group_0__0_in_rule__XSynchronizedExpression__Group__0__Impl41468);
             rule__XSynchronizedExpression__Group_0__0();
 
             state._fsp--;
@@ -59182,21 +58919,21 @@ public final void rule__XSynchronizedExpression__Group__0__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20657:1: rule__XSynchronizedExpression__Group__1 : rule__XSynchronizedExpression__Group__1__Impl rule__XSynchronizedExpression__Group__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20563:1: rule__XSynchronizedExpression__Group__1 : rule__XSynchronizedExpression__Group__1__Impl rule__XSynchronizedExpression__Group__2 ;
     public final void rule__XSynchronizedExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20661:1: ( rule__XSynchronizedExpression__Group__1__Impl rule__XSynchronizedExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20662:2: rule__XSynchronizedExpression__Group__1__Impl rule__XSynchronizedExpression__Group__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20567:1: ( rule__XSynchronizedExpression__Group__1__Impl rule__XSynchronizedExpression__Group__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20568:2: rule__XSynchronizedExpression__Group__1__Impl rule__XSynchronizedExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group__1__Impl_in_rule__XSynchronizedExpression__Group__141684);
+            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group__1__Impl_in_rule__XSynchronizedExpression__Group__141498);
             rule__XSynchronizedExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group__2_in_rule__XSynchronizedExpression__Group__141687);
+            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group__2_in_rule__XSynchronizedExpression__Group__141501);
             rule__XSynchronizedExpression__Group__2();
 
             state._fsp--;
@@ -59220,25 +58957,25 @@ public final void rule__XSynchronizedExpression__Group__1() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20669:1: rule__XSynchronizedExpression__Group__1__Impl : ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20575:1: rule__XSynchronizedExpression__Group__1__Impl : ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) ) ;
     public final void rule__XSynchronizedExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20673:1: ( ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20674:1: ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20579:1: ( ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20580:1: ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20674:1: ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20675:1: ( rule__XSynchronizedExpression__ParamAssignment_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20580:1: ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20581:1: ( rule__XSynchronizedExpression__ParamAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getParamAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20676:1: ( rule__XSynchronizedExpression__ParamAssignment_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20676:2: rule__XSynchronizedExpression__ParamAssignment_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20582:1: ( rule__XSynchronizedExpression__ParamAssignment_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20582:2: rule__XSynchronizedExpression__ParamAssignment_1
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__ParamAssignment_1_in_rule__XSynchronizedExpression__Group__1__Impl41714);
+            pushFollow(FOLLOW_rule__XSynchronizedExpression__ParamAssignment_1_in_rule__XSynchronizedExpression__Group__1__Impl41528);
             rule__XSynchronizedExpression__ParamAssignment_1();
 
             state._fsp--;
@@ -59271,21 +59008,21 @@ public final void rule__XSynchronizedExpression__Group__1__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20686:1: rule__XSynchronizedExpression__Group__2 : rule__XSynchronizedExpression__Group__2__Impl rule__XSynchronizedExpression__Group__3 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20592:1: rule__XSynchronizedExpression__Group__2 : rule__XSynchronizedExpression__Group__2__Impl rule__XSynchronizedExpression__Group__3 ;
     public final void rule__XSynchronizedExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20690:1: ( rule__XSynchronizedExpression__Group__2__Impl rule__XSynchronizedExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20691:2: rule__XSynchronizedExpression__Group__2__Impl rule__XSynchronizedExpression__Group__3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20596:1: ( rule__XSynchronizedExpression__Group__2__Impl rule__XSynchronizedExpression__Group__3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20597:2: rule__XSynchronizedExpression__Group__2__Impl rule__XSynchronizedExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group__2__Impl_in_rule__XSynchronizedExpression__Group__241744);
+            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group__2__Impl_in_rule__XSynchronizedExpression__Group__241558);
             rule__XSynchronizedExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group__3_in_rule__XSynchronizedExpression__Group__241747);
+            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group__3_in_rule__XSynchronizedExpression__Group__241561);
             rule__XSynchronizedExpression__Group__3();
 
             state._fsp--;
@@ -59309,22 +59046,22 @@ public final void rule__XSynchronizedExpression__Group__2() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20698:1: rule__XSynchronizedExpression__Group__2__Impl : ( ')' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20604:1: rule__XSynchronizedExpression__Group__2__Impl : ( ')' ) ;
     public final void rule__XSynchronizedExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20702:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20703:1: ( ')' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20608:1: ( ( ')' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20609:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20703:1: ( ')' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20704:1: ')'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20609:1: ( ')' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20610:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getRightParenthesisKeyword_2()); 
             }
-            match(input,73,FOLLOW_73_in_rule__XSynchronizedExpression__Group__2__Impl41775); if (state.failed) return ;
+            match(input,73,FOLLOW_73_in_rule__XSynchronizedExpression__Group__2__Impl41589); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSynchronizedExpressionAccess().getRightParenthesisKeyword_2()); 
             }
@@ -59350,16 +59087,16 @@ public final void rule__XSynchronizedExpression__Group__2__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20717:1: rule__XSynchronizedExpression__Group__3 : rule__XSynchronizedExpression__Group__3__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20623:1: rule__XSynchronizedExpression__Group__3 : rule__XSynchronizedExpression__Group__3__Impl ;
     public final void rule__XSynchronizedExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20721:1: ( rule__XSynchronizedExpression__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20722:2: rule__XSynchronizedExpression__Group__3__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20627:1: ( rule__XSynchronizedExpression__Group__3__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20628:2: rule__XSynchronizedExpression__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group__3__Impl_in_rule__XSynchronizedExpression__Group__341806);
+            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group__3__Impl_in_rule__XSynchronizedExpression__Group__341620);
             rule__XSynchronizedExpression__Group__3__Impl();
 
             state._fsp--;
@@ -59383,25 +59120,25 @@ public final void rule__XSynchronizedExpression__Group__3() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20728:1: rule__XSynchronizedExpression__Group__3__Impl : ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20634:1: rule__XSynchronizedExpression__Group__3__Impl : ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) ) ;
     public final void rule__XSynchronizedExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20732:1: ( ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20733:1: ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20638:1: ( ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20639:1: ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20733:1: ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20734:1: ( rule__XSynchronizedExpression__ExpressionAssignment_3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20639:1: ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20640:1: ( rule__XSynchronizedExpression__ExpressionAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getExpressionAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20735:1: ( rule__XSynchronizedExpression__ExpressionAssignment_3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20735:2: rule__XSynchronizedExpression__ExpressionAssignment_3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20641:1: ( rule__XSynchronizedExpression__ExpressionAssignment_3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20641:2: rule__XSynchronizedExpression__ExpressionAssignment_3
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__ExpressionAssignment_3_in_rule__XSynchronizedExpression__Group__3__Impl41833);
+            pushFollow(FOLLOW_rule__XSynchronizedExpression__ExpressionAssignment_3_in_rule__XSynchronizedExpression__Group__3__Impl41647);
             rule__XSynchronizedExpression__ExpressionAssignment_3();
 
             state._fsp--;
@@ -59434,16 +59171,16 @@ public final void rule__XSynchronizedExpression__Group__3__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20753:1: rule__XSynchronizedExpression__Group_0__0 : rule__XSynchronizedExpression__Group_0__0__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20659:1: rule__XSynchronizedExpression__Group_0__0 : rule__XSynchronizedExpression__Group_0__0__Impl ;
     public final void rule__XSynchronizedExpression__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20757:1: ( rule__XSynchronizedExpression__Group_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20758:2: rule__XSynchronizedExpression__Group_0__0__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20663:1: ( rule__XSynchronizedExpression__Group_0__0__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20664:2: rule__XSynchronizedExpression__Group_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group_0__0__Impl_in_rule__XSynchronizedExpression__Group_0__041871);
+            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group_0__0__Impl_in_rule__XSynchronizedExpression__Group_0__041685);
             rule__XSynchronizedExpression__Group_0__0__Impl();
 
             state._fsp--;
@@ -59467,25 +59204,25 @@ public final void rule__XSynchronizedExpression__Group_0__0() throws Recognition
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20764:1: rule__XSynchronizedExpression__Group_0__0__Impl : ( ( rule__XSynchronizedExpression__Group_0_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20670:1: rule__XSynchronizedExpression__Group_0__0__Impl : ( ( rule__XSynchronizedExpression__Group_0_0__0 ) ) ;
     public final void rule__XSynchronizedExpression__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20768:1: ( ( ( rule__XSynchronizedExpression__Group_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20769:1: ( ( rule__XSynchronizedExpression__Group_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20674:1: ( ( ( rule__XSynchronizedExpression__Group_0_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20675:1: ( ( rule__XSynchronizedExpression__Group_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20769:1: ( ( rule__XSynchronizedExpression__Group_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20770:1: ( rule__XSynchronizedExpression__Group_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20675:1: ( ( rule__XSynchronizedExpression__Group_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20676:1: ( rule__XSynchronizedExpression__Group_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getGroup_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20771:1: ( rule__XSynchronizedExpression__Group_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20771:2: rule__XSynchronizedExpression__Group_0_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20677:1: ( rule__XSynchronizedExpression__Group_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20677:2: rule__XSynchronizedExpression__Group_0_0__0
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group_0_0__0_in_rule__XSynchronizedExpression__Group_0__0__Impl41898);
+            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group_0_0__0_in_rule__XSynchronizedExpression__Group_0__0__Impl41712);
             rule__XSynchronizedExpression__Group_0_0__0();
 
             state._fsp--;
@@ -59518,21 +59255,21 @@ public final void rule__XSynchronizedExpression__Group_0__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20783:1: rule__XSynchronizedExpression__Group_0_0__0 : rule__XSynchronizedExpression__Group_0_0__0__Impl rule__XSynchronizedExpression__Group_0_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20689:1: rule__XSynchronizedExpression__Group_0_0__0 : rule__XSynchronizedExpression__Group_0_0__0__Impl rule__XSynchronizedExpression__Group_0_0__1 ;
     public final void rule__XSynchronizedExpression__Group_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20787:1: ( rule__XSynchronizedExpression__Group_0_0__0__Impl rule__XSynchronizedExpression__Group_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20788:2: rule__XSynchronizedExpression__Group_0_0__0__Impl rule__XSynchronizedExpression__Group_0_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20693:1: ( rule__XSynchronizedExpression__Group_0_0__0__Impl rule__XSynchronizedExpression__Group_0_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20694:2: rule__XSynchronizedExpression__Group_0_0__0__Impl rule__XSynchronizedExpression__Group_0_0__1
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group_0_0__0__Impl_in_rule__XSynchronizedExpression__Group_0_0__041930);
+            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group_0_0__0__Impl_in_rule__XSynchronizedExpression__Group_0_0__041744);
             rule__XSynchronizedExpression__Group_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group_0_0__1_in_rule__XSynchronizedExpression__Group_0_0__041933);
+            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group_0_0__1_in_rule__XSynchronizedExpression__Group_0_0__041747);
             rule__XSynchronizedExpression__Group_0_0__1();
 
             state._fsp--;
@@ -59556,23 +59293,23 @@ public final void rule__XSynchronizedExpression__Group_0_0__0() throws Recogniti
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20795:1: rule__XSynchronizedExpression__Group_0_0__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20701:1: rule__XSynchronizedExpression__Group_0_0__0__Impl : ( () ) ;
     public final void rule__XSynchronizedExpression__Group_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20799:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20800:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20705:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20706:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20800:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20801:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20706:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20707:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getXSynchronizedExpressionAction_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20802:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20804:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20708:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20710:1: 
             {
             }
 
@@ -59597,21 +59334,21 @@ public final void rule__XSynchronizedExpression__Group_0_0__0__Impl() throws Rec
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20814:1: rule__XSynchronizedExpression__Group_0_0__1 : rule__XSynchronizedExpression__Group_0_0__1__Impl rule__XSynchronizedExpression__Group_0_0__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20720:1: rule__XSynchronizedExpression__Group_0_0__1 : rule__XSynchronizedExpression__Group_0_0__1__Impl rule__XSynchronizedExpression__Group_0_0__2 ;
     public final void rule__XSynchronizedExpression__Group_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20818:1: ( rule__XSynchronizedExpression__Group_0_0__1__Impl rule__XSynchronizedExpression__Group_0_0__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20819:2: rule__XSynchronizedExpression__Group_0_0__1__Impl rule__XSynchronizedExpression__Group_0_0__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20724:1: ( rule__XSynchronizedExpression__Group_0_0__1__Impl rule__XSynchronizedExpression__Group_0_0__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20725:2: rule__XSynchronizedExpression__Group_0_0__1__Impl rule__XSynchronizedExpression__Group_0_0__2
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group_0_0__1__Impl_in_rule__XSynchronizedExpression__Group_0_0__141991);
+            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group_0_0__1__Impl_in_rule__XSynchronizedExpression__Group_0_0__141805);
             rule__XSynchronizedExpression__Group_0_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group_0_0__2_in_rule__XSynchronizedExpression__Group_0_0__141994);
+            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group_0_0__2_in_rule__XSynchronizedExpression__Group_0_0__141808);
             rule__XSynchronizedExpression__Group_0_0__2();
 
             state._fsp--;
@@ -59635,22 +59372,22 @@ public final void rule__XSynchronizedExpression__Group_0_0__1() throws Recogniti
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20826:1: rule__XSynchronizedExpression__Group_0_0__1__Impl : ( 'synchronized' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20732:1: rule__XSynchronizedExpression__Group_0_0__1__Impl : ( 'synchronized' ) ;
     public final void rule__XSynchronizedExpression__Group_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20830:1: ( ( 'synchronized' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20831:1: ( 'synchronized' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20736:1: ( ( 'synchronized' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20737:1: ( 'synchronized' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20831:1: ( 'synchronized' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20832:1: 'synchronized'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20737:1: ( 'synchronized' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20738:1: 'synchronized'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getSynchronizedKeyword_0_0_1()); 
             }
-            match(input,99,FOLLOW_99_in_rule__XSynchronizedExpression__Group_0_0__1__Impl42022); if (state.failed) return ;
+            match(input,99,FOLLOW_99_in_rule__XSynchronizedExpression__Group_0_0__1__Impl41836); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSynchronizedExpressionAccess().getSynchronizedKeyword_0_0_1()); 
             }
@@ -59676,16 +59413,16 @@ public final void rule__XSynchronizedExpression__Group_0_0__1__Impl() throws Rec
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0_0__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20845:1: rule__XSynchronizedExpression__Group_0_0__2 : rule__XSynchronizedExpression__Group_0_0__2__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20751:1: rule__XSynchronizedExpression__Group_0_0__2 : rule__XSynchronizedExpression__Group_0_0__2__Impl ;
     public final void rule__XSynchronizedExpression__Group_0_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20849:1: ( rule__XSynchronizedExpression__Group_0_0__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20850:2: rule__XSynchronizedExpression__Group_0_0__2__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20755:1: ( rule__XSynchronizedExpression__Group_0_0__2__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20756:2: rule__XSynchronizedExpression__Group_0_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group_0_0__2__Impl_in_rule__XSynchronizedExpression__Group_0_0__242053);
+            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group_0_0__2__Impl_in_rule__XSynchronizedExpression__Group_0_0__241867);
             rule__XSynchronizedExpression__Group_0_0__2__Impl();
 
             state._fsp--;
@@ -59709,22 +59446,22 @@ public final void rule__XSynchronizedExpression__Group_0_0__2() throws Recogniti
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0_0__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20856:1: rule__XSynchronizedExpression__Group_0_0__2__Impl : ( '(' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20762:1: rule__XSynchronizedExpression__Group_0_0__2__Impl : ( '(' ) ;
     public final void rule__XSynchronizedExpression__Group_0_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20860:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20861:1: ( '(' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20766:1: ( ( '(' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20767:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20861:1: ( '(' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20862:1: '('
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20767:1: ( '(' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20768:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getLeftParenthesisKeyword_0_0_2()); 
             }
-            match(input,72,FOLLOW_72_in_rule__XSynchronizedExpression__Group_0_0__2__Impl42081); if (state.failed) return ;
+            match(input,72,FOLLOW_72_in_rule__XSynchronizedExpression__Group_0_0__2__Impl41895); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSynchronizedExpressionAccess().getLeftParenthesisKeyword_0_0_2()); 
             }
@@ -59750,21 +59487,21 @@ public final void rule__XSynchronizedExpression__Group_0_0__2__Impl() throws Rec
 
 
     // $ANTLR start "rule__XCatchClause__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20881:1: rule__XCatchClause__Group__0 : rule__XCatchClause__Group__0__Impl rule__XCatchClause__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20787:1: rule__XCatchClause__Group__0 : rule__XCatchClause__Group__0__Impl rule__XCatchClause__Group__1 ;
     public final void rule__XCatchClause__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20885:1: ( rule__XCatchClause__Group__0__Impl rule__XCatchClause__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20886:2: rule__XCatchClause__Group__0__Impl rule__XCatchClause__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20791:1: ( rule__XCatchClause__Group__0__Impl rule__XCatchClause__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20792:2: rule__XCatchClause__Group__0__Impl rule__XCatchClause__Group__1
             {
-            pushFollow(FOLLOW_rule__XCatchClause__Group__0__Impl_in_rule__XCatchClause__Group__042118);
+            pushFollow(FOLLOW_rule__XCatchClause__Group__0__Impl_in_rule__XCatchClause__Group__041932);
             rule__XCatchClause__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCatchClause__Group__1_in_rule__XCatchClause__Group__042121);
+            pushFollow(FOLLOW_rule__XCatchClause__Group__1_in_rule__XCatchClause__Group__041935);
             rule__XCatchClause__Group__1();
 
             state._fsp--;
@@ -59788,25 +59525,25 @@ public final void rule__XCatchClause__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCatchClause__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20893:1: rule__XCatchClause__Group__0__Impl : ( ( 'catch' ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20799:1: rule__XCatchClause__Group__0__Impl : ( ( 'catch' ) ) ;
     public final void rule__XCatchClause__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20897:1: ( ( ( 'catch' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20898:1: ( ( 'catch' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20803:1: ( ( ( 'catch' ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20804:1: ( ( 'catch' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20898:1: ( ( 'catch' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20899:1: ( 'catch' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20804:1: ( ( 'catch' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20805:1: ( 'catch' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getCatchKeyword_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20900:1: ( 'catch' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20901:2: 'catch'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20806:1: ( 'catch' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20807:2: 'catch'
             {
-            match(input,100,FOLLOW_100_in_rule__XCatchClause__Group__0__Impl42150); if (state.failed) return ;
+            match(input,100,FOLLOW_100_in_rule__XCatchClause__Group__0__Impl41964); if (state.failed) return ;
 
             }
 
@@ -59835,21 +59572,21 @@ public final void rule__XCatchClause__Group__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XCatchClause__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20912:1: rule__XCatchClause__Group__1 : rule__XCatchClause__Group__1__Impl rule__XCatchClause__Group__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20818:1: rule__XCatchClause__Group__1 : rule__XCatchClause__Group__1__Impl rule__XCatchClause__Group__2 ;
     public final void rule__XCatchClause__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20916:1: ( rule__XCatchClause__Group__1__Impl rule__XCatchClause__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20917:2: rule__XCatchClause__Group__1__Impl rule__XCatchClause__Group__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20822:1: ( rule__XCatchClause__Group__1__Impl rule__XCatchClause__Group__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20823:2: rule__XCatchClause__Group__1__Impl rule__XCatchClause__Group__2
             {
-            pushFollow(FOLLOW_rule__XCatchClause__Group__1__Impl_in_rule__XCatchClause__Group__142182);
+            pushFollow(FOLLOW_rule__XCatchClause__Group__1__Impl_in_rule__XCatchClause__Group__141996);
             rule__XCatchClause__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCatchClause__Group__2_in_rule__XCatchClause__Group__142185);
+            pushFollow(FOLLOW_rule__XCatchClause__Group__2_in_rule__XCatchClause__Group__141999);
             rule__XCatchClause__Group__2();
 
             state._fsp--;
@@ -59873,22 +59610,22 @@ public final void rule__XCatchClause__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCatchClause__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20924:1: rule__XCatchClause__Group__1__Impl : ( '(' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20830:1: rule__XCatchClause__Group__1__Impl : ( '(' ) ;
     public final void rule__XCatchClause__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20928:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20929:1: ( '(' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20834:1: ( ( '(' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20835:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20929:1: ( '(' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20930:1: '('
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20835:1: ( '(' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20836:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getLeftParenthesisKeyword_1()); 
             }
-            match(input,72,FOLLOW_72_in_rule__XCatchClause__Group__1__Impl42213); if (state.failed) return ;
+            match(input,72,FOLLOW_72_in_rule__XCatchClause__Group__1__Impl42027); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXCatchClauseAccess().getLeftParenthesisKeyword_1()); 
             }
@@ -59914,21 +59651,21 @@ public final void rule__XCatchClause__Group__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XCatchClause__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20943:1: rule__XCatchClause__Group__2 : rule__XCatchClause__Group__2__Impl rule__XCatchClause__Group__3 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20849:1: rule__XCatchClause__Group__2 : rule__XCatchClause__Group__2__Impl rule__XCatchClause__Group__3 ;
     public final void rule__XCatchClause__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20947:1: ( rule__XCatchClause__Group__2__Impl rule__XCatchClause__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20948:2: rule__XCatchClause__Group__2__Impl rule__XCatchClause__Group__3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20853:1: ( rule__XCatchClause__Group__2__Impl rule__XCatchClause__Group__3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20854:2: rule__XCatchClause__Group__2__Impl rule__XCatchClause__Group__3
             {
-            pushFollow(FOLLOW_rule__XCatchClause__Group__2__Impl_in_rule__XCatchClause__Group__242244);
+            pushFollow(FOLLOW_rule__XCatchClause__Group__2__Impl_in_rule__XCatchClause__Group__242058);
             rule__XCatchClause__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCatchClause__Group__3_in_rule__XCatchClause__Group__242247);
+            pushFollow(FOLLOW_rule__XCatchClause__Group__3_in_rule__XCatchClause__Group__242061);
             rule__XCatchClause__Group__3();
 
             state._fsp--;
@@ -59952,25 +59689,25 @@ public final void rule__XCatchClause__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCatchClause__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20955:1: rule__XCatchClause__Group__2__Impl : ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20861:1: rule__XCatchClause__Group__2__Impl : ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) ) ;
     public final void rule__XCatchClause__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20959:1: ( ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20960:1: ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20865:1: ( ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20866:1: ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20960:1: ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20961:1: ( rule__XCatchClause__DeclaredParamAssignment_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20866:1: ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20867:1: ( rule__XCatchClause__DeclaredParamAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getDeclaredParamAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20962:1: ( rule__XCatchClause__DeclaredParamAssignment_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20962:2: rule__XCatchClause__DeclaredParamAssignment_2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20868:1: ( rule__XCatchClause__DeclaredParamAssignment_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20868:2: rule__XCatchClause__DeclaredParamAssignment_2
             {
-            pushFollow(FOLLOW_rule__XCatchClause__DeclaredParamAssignment_2_in_rule__XCatchClause__Group__2__Impl42274);
+            pushFollow(FOLLOW_rule__XCatchClause__DeclaredParamAssignment_2_in_rule__XCatchClause__Group__2__Impl42088);
             rule__XCatchClause__DeclaredParamAssignment_2();
 
             state._fsp--;
@@ -60003,21 +59740,21 @@ public final void rule__XCatchClause__Group__2__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XCatchClause__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20972:1: rule__XCatchClause__Group__3 : rule__XCatchClause__Group__3__Impl rule__XCatchClause__Group__4 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20878:1: rule__XCatchClause__Group__3 : rule__XCatchClause__Group__3__Impl rule__XCatchClause__Group__4 ;
     public final void rule__XCatchClause__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20976:1: ( rule__XCatchClause__Group__3__Impl rule__XCatchClause__Group__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20977:2: rule__XCatchClause__Group__3__Impl rule__XCatchClause__Group__4
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20882:1: ( rule__XCatchClause__Group__3__Impl rule__XCatchClause__Group__4 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20883:2: rule__XCatchClause__Group__3__Impl rule__XCatchClause__Group__4
             {
-            pushFollow(FOLLOW_rule__XCatchClause__Group__3__Impl_in_rule__XCatchClause__Group__342304);
+            pushFollow(FOLLOW_rule__XCatchClause__Group__3__Impl_in_rule__XCatchClause__Group__342118);
             rule__XCatchClause__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCatchClause__Group__4_in_rule__XCatchClause__Group__342307);
+            pushFollow(FOLLOW_rule__XCatchClause__Group__4_in_rule__XCatchClause__Group__342121);
             rule__XCatchClause__Group__4();
 
             state._fsp--;
@@ -60041,22 +59778,22 @@ public final void rule__XCatchClause__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCatchClause__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20984:1: rule__XCatchClause__Group__3__Impl : ( ')' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20890:1: rule__XCatchClause__Group__3__Impl : ( ')' ) ;
     public final void rule__XCatchClause__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20988:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20989:1: ( ')' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20894:1: ( ( ')' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20895:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20989:1: ( ')' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20990:1: ')'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20895:1: ( ')' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20896:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getRightParenthesisKeyword_3()); 
             }
-            match(input,73,FOLLOW_73_in_rule__XCatchClause__Group__3__Impl42335); if (state.failed) return ;
+            match(input,73,FOLLOW_73_in_rule__XCatchClause__Group__3__Impl42149); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXCatchClauseAccess().getRightParenthesisKeyword_3()); 
             }
@@ -60082,16 +59819,16 @@ public final void rule__XCatchClause__Group__3__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XCatchClause__Group__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21003:1: rule__XCatchClause__Group__4 : rule__XCatchClause__Group__4__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20909:1: rule__XCatchClause__Group__4 : rule__XCatchClause__Group__4__Impl ;
     public final void rule__XCatchClause__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21007:1: ( rule__XCatchClause__Group__4__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21008:2: rule__XCatchClause__Group__4__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20913:1: ( rule__XCatchClause__Group__4__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20914:2: rule__XCatchClause__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__XCatchClause__Group__4__Impl_in_rule__XCatchClause__Group__442366);
+            pushFollow(FOLLOW_rule__XCatchClause__Group__4__Impl_in_rule__XCatchClause__Group__442180);
             rule__XCatchClause__Group__4__Impl();
 
             state._fsp--;
@@ -60115,25 +59852,25 @@ public final void rule__XCatchClause__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCatchClause__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21014:1: rule__XCatchClause__Group__4__Impl : ( ( rule__XCatchClause__ExpressionAssignment_4 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20920:1: rule__XCatchClause__Group__4__Impl : ( ( rule__XCatchClause__ExpressionAssignment_4 ) ) ;
     public final void rule__XCatchClause__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21018:1: ( ( ( rule__XCatchClause__ExpressionAssignment_4 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21019:1: ( ( rule__XCatchClause__ExpressionAssignment_4 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20924:1: ( ( ( rule__XCatchClause__ExpressionAssignment_4 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20925:1: ( ( rule__XCatchClause__ExpressionAssignment_4 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21019:1: ( ( rule__XCatchClause__ExpressionAssignment_4 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21020:1: ( rule__XCatchClause__ExpressionAssignment_4 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20925:1: ( ( rule__XCatchClause__ExpressionAssignment_4 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20926:1: ( rule__XCatchClause__ExpressionAssignment_4 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getExpressionAssignment_4()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21021:1: ( rule__XCatchClause__ExpressionAssignment_4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21021:2: rule__XCatchClause__ExpressionAssignment_4
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20927:1: ( rule__XCatchClause__ExpressionAssignment_4 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20927:2: rule__XCatchClause__ExpressionAssignment_4
             {
-            pushFollow(FOLLOW_rule__XCatchClause__ExpressionAssignment_4_in_rule__XCatchClause__Group__4__Impl42393);
+            pushFollow(FOLLOW_rule__XCatchClause__ExpressionAssignment_4_in_rule__XCatchClause__Group__4__Impl42207);
             rule__XCatchClause__ExpressionAssignment_4();
 
             state._fsp--;
@@ -60166,21 +59903,21 @@ public final void rule__XCatchClause__Group__4__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__QualifiedName__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21041:1: rule__QualifiedName__Group__0 : rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20947:1: rule__QualifiedName__Group__0 : rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 ;
     public final void rule__QualifiedName__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21045:1: ( rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21046:2: rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20951:1: ( rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20952:2: rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1
             {
-            pushFollow(FOLLOW_rule__QualifiedName__Group__0__Impl_in_rule__QualifiedName__Group__042433);
+            pushFollow(FOLLOW_rule__QualifiedName__Group__0__Impl_in_rule__QualifiedName__Group__042247);
             rule__QualifiedName__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__QualifiedName__Group__1_in_rule__QualifiedName__Group__042436);
+            pushFollow(FOLLOW_rule__QualifiedName__Group__1_in_rule__QualifiedName__Group__042250);
             rule__QualifiedName__Group__1();
 
             state._fsp--;
@@ -60204,22 +59941,22 @@ public final void rule__QualifiedName__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__QualifiedName__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21053:1: rule__QualifiedName__Group__0__Impl : ( ruleValidID ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20959:1: rule__QualifiedName__Group__0__Impl : ( ruleValidID ) ;
     public final void rule__QualifiedName__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21057:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21058:1: ( ruleValidID )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20963:1: ( ( ruleValidID ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20964:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21058:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21059:1: ruleValidID
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20964:1: ( ruleValidID )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20965:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameAccess().getValidIDParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__QualifiedName__Group__0__Impl42463);
+            pushFollow(FOLLOW_ruleValidID_in_rule__QualifiedName__Group__0__Impl42277);
             ruleValidID();
 
             state._fsp--;
@@ -60249,16 +59986,16 @@ public final void rule__QualifiedName__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__QualifiedName__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21070:1: rule__QualifiedName__Group__1 : rule__QualifiedName__Group__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20976:1: rule__QualifiedName__Group__1 : rule__QualifiedName__Group__1__Impl ;
     public final void rule__QualifiedName__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21074:1: ( rule__QualifiedName__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21075:2: rule__QualifiedName__Group__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20980:1: ( rule__QualifiedName__Group__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20981:2: rule__QualifiedName__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__QualifiedName__Group__1__Impl_in_rule__QualifiedName__Group__142492);
+            pushFollow(FOLLOW_rule__QualifiedName__Group__1__Impl_in_rule__QualifiedName__Group__142306);
             rule__QualifiedName__Group__1__Impl();
 
             state._fsp--;
@@ -60282,35 +60019,35 @@ public final void rule__QualifiedName__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__QualifiedName__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21081:1: rule__QualifiedName__Group__1__Impl : ( ( rule__QualifiedName__Group_1__0 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20987:1: rule__QualifiedName__Group__1__Impl : ( ( rule__QualifiedName__Group_1__0 )* ) ;
     public final void rule__QualifiedName__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21085:1: ( ( ( rule__QualifiedName__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21086:1: ( ( rule__QualifiedName__Group_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20991:1: ( ( ( rule__QualifiedName__Group_1__0 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20992:1: ( ( rule__QualifiedName__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21086:1: ( ( rule__QualifiedName__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21087:1: ( rule__QualifiedName__Group_1__0 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20992:1: ( ( rule__QualifiedName__Group_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20993:1: ( rule__QualifiedName__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21088:1: ( rule__QualifiedName__Group_1__0 )*
-            loop154:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20994:1: ( rule__QualifiedName__Group_1__0 )*
+            loop153:
             do {
-                int alt154=2;
-                int LA154_0 = input.LA(1);
+                int alt153=2;
+                int LA153_0 = input.LA(1);
 
-                if ( (LA154_0==63) ) {
-                    int LA154_2 = input.LA(2);
+                if ( (LA153_0==63) ) {
+                    int LA153_2 = input.LA(2);
 
-                    if ( (LA154_2==RULE_ID) ) {
-                        int LA154_3 = input.LA(3);
+                    if ( (LA153_2==RULE_ID) ) {
+                        int LA153_3 = input.LA(3);
 
-                        if ( (synpred220_InternalCheck()) ) {
-                            alt154=1;
+                        if ( (synpred219_InternalCheck()) ) {
+                            alt153=1;
                         }
 
 
@@ -60320,11 +60057,11 @@ public final void rule__QualifiedName__Group__1__Impl() throws RecognitionExcept
                 }
 
 
-                switch (alt154) {
+                switch (alt153) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21088:2: rule__QualifiedName__Group_1__0
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20994:2: rule__QualifiedName__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__QualifiedName__Group_1__0_in_rule__QualifiedName__Group__1__Impl42519);
+            	    pushFollow(FOLLOW_rule__QualifiedName__Group_1__0_in_rule__QualifiedName__Group__1__Impl42333);
             	    rule__QualifiedName__Group_1__0();
 
             	    state._fsp--;
@@ -60334,7 +60071,7 @@ public final void rule__QualifiedName__Group__1__Impl() throws RecognitionExcept
             	    break;
 
             	default :
-            	    break loop154;
+            	    break loop153;
                 }
             } while (true);
 
@@ -60363,21 +60100,21 @@ public final void rule__QualifiedName__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21102:1: rule__QualifiedName__Group_1__0 : rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21008:1: rule__QualifiedName__Group_1__0 : rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 ;
     public final void rule__QualifiedName__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21106:1: ( rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21107:2: rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21012:1: ( rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21013:2: rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1
             {
-            pushFollow(FOLLOW_rule__QualifiedName__Group_1__0__Impl_in_rule__QualifiedName__Group_1__042554);
+            pushFollow(FOLLOW_rule__QualifiedName__Group_1__0__Impl_in_rule__QualifiedName__Group_1__042368);
             rule__QualifiedName__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__QualifiedName__Group_1__1_in_rule__QualifiedName__Group_1__042557);
+            pushFollow(FOLLOW_rule__QualifiedName__Group_1__1_in_rule__QualifiedName__Group_1__042371);
             rule__QualifiedName__Group_1__1();
 
             state._fsp--;
@@ -60401,25 +60138,25 @@ public final void rule__QualifiedName__Group_1__0() throws RecognitionException
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21114:1: rule__QualifiedName__Group_1__0__Impl : ( ( '.' ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21020:1: rule__QualifiedName__Group_1__0__Impl : ( ( '.' ) ) ;
     public final void rule__QualifiedName__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21118:1: ( ( ( '.' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21119:1: ( ( '.' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21024:1: ( ( ( '.' ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21025:1: ( ( '.' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21119:1: ( ( '.' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21120:1: ( '.' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21025:1: ( ( '.' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21026:1: ( '.' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameAccess().getFullStopKeyword_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21121:1: ( '.' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21122:2: '.'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21027:1: ( '.' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21028:2: '.'
             {
-            match(input,63,FOLLOW_63_in_rule__QualifiedName__Group_1__0__Impl42586); if (state.failed) return ;
+            match(input,63,FOLLOW_63_in_rule__QualifiedName__Group_1__0__Impl42400); if (state.failed) return ;
 
             }
 
@@ -60448,16 +60185,16 @@ public final void rule__QualifiedName__Group_1__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21133:1: rule__QualifiedName__Group_1__1 : rule__QualifiedName__Group_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21039:1: rule__QualifiedName__Group_1__1 : rule__QualifiedName__Group_1__1__Impl ;
     public final void rule__QualifiedName__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21137:1: ( rule__QualifiedName__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21138:2: rule__QualifiedName__Group_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21043:1: ( rule__QualifiedName__Group_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21044:2: rule__QualifiedName__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__QualifiedName__Group_1__1__Impl_in_rule__QualifiedName__Group_1__142618);
+            pushFollow(FOLLOW_rule__QualifiedName__Group_1__1__Impl_in_rule__QualifiedName__Group_1__142432);
             rule__QualifiedName__Group_1__1__Impl();
 
             state._fsp--;
@@ -60481,22 +60218,22 @@ public final void rule__QualifiedName__Group_1__1() throws RecognitionException
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21144:1: rule__QualifiedName__Group_1__1__Impl : ( ruleValidID ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21050:1: rule__QualifiedName__Group_1__1__Impl : ( ruleValidID ) ;
     public final void rule__QualifiedName__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21148:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21149:1: ( ruleValidID )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21054:1: ( ( ruleValidID ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21055:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21149:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21150:1: ruleValidID
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21055:1: ( ruleValidID )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21056:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameAccess().getValidIDParserRuleCall_1_1()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__QualifiedName__Group_1__1__Impl42645);
+            pushFollow(FOLLOW_ruleValidID_in_rule__QualifiedName__Group_1__1__Impl42459);
             ruleValidID();
 
             state._fsp--;
@@ -60526,21 +60263,21 @@ public final void rule__QualifiedName__Group_1__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__Number__Group_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21165:1: rule__Number__Group_1__0 : rule__Number__Group_1__0__Impl rule__Number__Group_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21071:1: rule__Number__Group_1__0 : rule__Number__Group_1__0__Impl rule__Number__Group_1__1 ;
     public final void rule__Number__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21169:1: ( rule__Number__Group_1__0__Impl rule__Number__Group_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21170:2: rule__Number__Group_1__0__Impl rule__Number__Group_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21075:1: ( rule__Number__Group_1__0__Impl rule__Number__Group_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21076:2: rule__Number__Group_1__0__Impl rule__Number__Group_1__1
             {
-            pushFollow(FOLLOW_rule__Number__Group_1__0__Impl_in_rule__Number__Group_1__042678);
+            pushFollow(FOLLOW_rule__Number__Group_1__0__Impl_in_rule__Number__Group_1__042492);
             rule__Number__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Number__Group_1__1_in_rule__Number__Group_1__042681);
+            pushFollow(FOLLOW_rule__Number__Group_1__1_in_rule__Number__Group_1__042495);
             rule__Number__Group_1__1();
 
             state._fsp--;
@@ -60564,25 +60301,25 @@ public final void rule__Number__Group_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Number__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21177:1: rule__Number__Group_1__0__Impl : ( ( rule__Number__Alternatives_1_0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21083:1: rule__Number__Group_1__0__Impl : ( ( rule__Number__Alternatives_1_0 ) ) ;
     public final void rule__Number__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21181:1: ( ( ( rule__Number__Alternatives_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21182:1: ( ( rule__Number__Alternatives_1_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21087:1: ( ( ( rule__Number__Alternatives_1_0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21088:1: ( ( rule__Number__Alternatives_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21182:1: ( ( rule__Number__Alternatives_1_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21183:1: ( rule__Number__Alternatives_1_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21088:1: ( ( rule__Number__Alternatives_1_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21089:1: ( rule__Number__Alternatives_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNumberAccess().getAlternatives_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21184:1: ( rule__Number__Alternatives_1_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21184:2: rule__Number__Alternatives_1_0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21090:1: ( rule__Number__Alternatives_1_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21090:2: rule__Number__Alternatives_1_0
             {
-            pushFollow(FOLLOW_rule__Number__Alternatives_1_0_in_rule__Number__Group_1__0__Impl42708);
+            pushFollow(FOLLOW_rule__Number__Alternatives_1_0_in_rule__Number__Group_1__0__Impl42522);
             rule__Number__Alternatives_1_0();
 
             state._fsp--;
@@ -60615,16 +60352,16 @@ public final void rule__Number__Group_1__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Number__Group_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21194:1: rule__Number__Group_1__1 : rule__Number__Group_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21100:1: rule__Number__Group_1__1 : rule__Number__Group_1__1__Impl ;
     public final void rule__Number__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21198:1: ( rule__Number__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21199:2: rule__Number__Group_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21104:1: ( rule__Number__Group_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21105:2: rule__Number__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__Number__Group_1__1__Impl_in_rule__Number__Group_1__142738);
+            pushFollow(FOLLOW_rule__Number__Group_1__1__Impl_in_rule__Number__Group_1__142552);
             rule__Number__Group_1__1__Impl();
 
             state._fsp--;
@@ -60648,37 +60385,37 @@ public final void rule__Number__Group_1__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Number__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21205:1: rule__Number__Group_1__1__Impl : ( ( rule__Number__Group_1_1__0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21111:1: rule__Number__Group_1__1__Impl : ( ( rule__Number__Group_1_1__0 )? ) ;
     public final void rule__Number__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21209:1: ( ( ( rule__Number__Group_1_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21210:1: ( ( rule__Number__Group_1_1__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21115:1: ( ( ( rule__Number__Group_1_1__0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21116:1: ( ( rule__Number__Group_1_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21210:1: ( ( rule__Number__Group_1_1__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21211:1: ( rule__Number__Group_1_1__0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21116:1: ( ( rule__Number__Group_1_1__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21117:1: ( rule__Number__Group_1_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNumberAccess().getGroup_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21212:1: ( rule__Number__Group_1_1__0 )?
-            int alt155=2;
-            int LA155_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21118:1: ( rule__Number__Group_1_1__0 )?
+            int alt154=2;
+            int LA154_0 = input.LA(1);
 
-            if ( (LA155_0==63) ) {
-                int LA155_1 = input.LA(2);
+            if ( (LA154_0==63) ) {
+                int LA154_1 = input.LA(2);
 
-                if ( ((LA155_1>=RULE_INT && LA155_1<=RULE_DECIMAL)) ) {
-                    alt155=1;
+                if ( ((LA154_1>=RULE_INT && LA154_1<=RULE_DECIMAL)) ) {
+                    alt154=1;
                 }
             }
-            switch (alt155) {
+            switch (alt154) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21212:2: rule__Number__Group_1_1__0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21118:2: rule__Number__Group_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__Number__Group_1_1__0_in_rule__Number__Group_1__1__Impl42765);
+                    pushFollow(FOLLOW_rule__Number__Group_1_1__0_in_rule__Number__Group_1__1__Impl42579);
                     rule__Number__Group_1_1__0();
 
                     state._fsp--;
@@ -60714,21 +60451,21 @@ public final void rule__Number__Group_1__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Number__Group_1_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21226:1: rule__Number__Group_1_1__0 : rule__Number__Group_1_1__0__Impl rule__Number__Group_1_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21132:1: rule__Number__Group_1_1__0 : rule__Number__Group_1_1__0__Impl rule__Number__Group_1_1__1 ;
     public final void rule__Number__Group_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21230:1: ( rule__Number__Group_1_1__0__Impl rule__Number__Group_1_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21231:2: rule__Number__Group_1_1__0__Impl rule__Number__Group_1_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21136:1: ( rule__Number__Group_1_1__0__Impl rule__Number__Group_1_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21137:2: rule__Number__Group_1_1__0__Impl rule__Number__Group_1_1__1
             {
-            pushFollow(FOLLOW_rule__Number__Group_1_1__0__Impl_in_rule__Number__Group_1_1__042800);
+            pushFollow(FOLLOW_rule__Number__Group_1_1__0__Impl_in_rule__Number__Group_1_1__042614);
             rule__Number__Group_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Number__Group_1_1__1_in_rule__Number__Group_1_1__042803);
+            pushFollow(FOLLOW_rule__Number__Group_1_1__1_in_rule__Number__Group_1_1__042617);
             rule__Number__Group_1_1__1();
 
             state._fsp--;
@@ -60752,22 +60489,22 @@ public final void rule__Number__Group_1_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Number__Group_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21238:1: rule__Number__Group_1_1__0__Impl : ( '.' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21144:1: rule__Number__Group_1_1__0__Impl : ( '.' ) ;
     public final void rule__Number__Group_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21242:1: ( ( '.' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21243:1: ( '.' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21148:1: ( ( '.' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21149:1: ( '.' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21243:1: ( '.' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21244:1: '.'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21149:1: ( '.' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21150:1: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNumberAccess().getFullStopKeyword_1_1_0()); 
             }
-            match(input,63,FOLLOW_63_in_rule__Number__Group_1_1__0__Impl42831); if (state.failed) return ;
+            match(input,63,FOLLOW_63_in_rule__Number__Group_1_1__0__Impl42645); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getNumberAccess().getFullStopKeyword_1_1_0()); 
             }
@@ -60793,16 +60530,16 @@ public final void rule__Number__Group_1_1__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__Number__Group_1_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21257:1: rule__Number__Group_1_1__1 : rule__Number__Group_1_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21163:1: rule__Number__Group_1_1__1 : rule__Number__Group_1_1__1__Impl ;
     public final void rule__Number__Group_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21261:1: ( rule__Number__Group_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21262:2: rule__Number__Group_1_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21167:1: ( rule__Number__Group_1_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21168:2: rule__Number__Group_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__Number__Group_1_1__1__Impl_in_rule__Number__Group_1_1__142862);
+            pushFollow(FOLLOW_rule__Number__Group_1_1__1__Impl_in_rule__Number__Group_1_1__142676);
             rule__Number__Group_1_1__1__Impl();
 
             state._fsp--;
@@ -60826,25 +60563,25 @@ public final void rule__Number__Group_1_1__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Number__Group_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21268:1: rule__Number__Group_1_1__1__Impl : ( ( rule__Number__Alternatives_1_1_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21174:1: rule__Number__Group_1_1__1__Impl : ( ( rule__Number__Alternatives_1_1_1 ) ) ;
     public final void rule__Number__Group_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21272:1: ( ( ( rule__Number__Alternatives_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21273:1: ( ( rule__Number__Alternatives_1_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21178:1: ( ( ( rule__Number__Alternatives_1_1_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21179:1: ( ( rule__Number__Alternatives_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21273:1: ( ( rule__Number__Alternatives_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21274:1: ( rule__Number__Alternatives_1_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21179:1: ( ( rule__Number__Alternatives_1_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21180:1: ( rule__Number__Alternatives_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNumberAccess().getAlternatives_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21275:1: ( rule__Number__Alternatives_1_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21275:2: rule__Number__Alternatives_1_1_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21181:1: ( rule__Number__Alternatives_1_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21181:2: rule__Number__Alternatives_1_1_1
             {
-            pushFollow(FOLLOW_rule__Number__Alternatives_1_1_1_in_rule__Number__Group_1_1__1__Impl42889);
+            pushFollow(FOLLOW_rule__Number__Alternatives_1_1_1_in_rule__Number__Group_1_1__1__Impl42703);
             rule__Number__Alternatives_1_1_1();
 
             state._fsp--;
@@ -60877,21 +60614,21 @@ public final void rule__Number__Group_1_1__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21290:1: rule__JvmTypeReference__Group_0__0 : rule__JvmTypeReference__Group_0__0__Impl rule__JvmTypeReference__Group_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21196:1: rule__JvmTypeReference__Group_0__0 : rule__JvmTypeReference__Group_0__0__Impl rule__JvmTypeReference__Group_0__1 ;
     public final void rule__JvmTypeReference__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21294:1: ( rule__JvmTypeReference__Group_0__0__Impl rule__JvmTypeReference__Group_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21295:2: rule__JvmTypeReference__Group_0__0__Impl rule__JvmTypeReference__Group_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21200:1: ( rule__JvmTypeReference__Group_0__0__Impl rule__JvmTypeReference__Group_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21201:2: rule__JvmTypeReference__Group_0__0__Impl rule__JvmTypeReference__Group_0__1
             {
-            pushFollow(FOLLOW_rule__JvmTypeReference__Group_0__0__Impl_in_rule__JvmTypeReference__Group_0__042924);
+            pushFollow(FOLLOW_rule__JvmTypeReference__Group_0__0__Impl_in_rule__JvmTypeReference__Group_0__042738);
             rule__JvmTypeReference__Group_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmTypeReference__Group_0__1_in_rule__JvmTypeReference__Group_0__042927);
+            pushFollow(FOLLOW_rule__JvmTypeReference__Group_0__1_in_rule__JvmTypeReference__Group_0__042741);
             rule__JvmTypeReference__Group_0__1();
 
             state._fsp--;
@@ -60915,22 +60652,22 @@ public final void rule__JvmTypeReference__Group_0__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21302:1: rule__JvmTypeReference__Group_0__0__Impl : ( ruleJvmParameterizedTypeReference ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21208:1: rule__JvmTypeReference__Group_0__0__Impl : ( ruleJvmParameterizedTypeReference ) ;
     public final void rule__JvmTypeReference__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21306:1: ( ( ruleJvmParameterizedTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21307:1: ( ruleJvmParameterizedTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21212:1: ( ( ruleJvmParameterizedTypeReference ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21213:1: ( ruleJvmParameterizedTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21307:1: ( ruleJvmParameterizedTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21308:1: ruleJvmParameterizedTypeReference
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21213:1: ( ruleJvmParameterizedTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21214:1: ruleJvmParameterizedTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmTypeReferenceAccess().getJvmParameterizedTypeReferenceParserRuleCall_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmParameterizedTypeReference_in_rule__JvmTypeReference__Group_0__0__Impl42954);
+            pushFollow(FOLLOW_ruleJvmParameterizedTypeReference_in_rule__JvmTypeReference__Group_0__0__Impl42768);
             ruleJvmParameterizedTypeReference();
 
             state._fsp--;
@@ -60960,16 +60697,16 @@ public final void rule__JvmTypeReference__Group_0__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21319:1: rule__JvmTypeReference__Group_0__1 : rule__JvmTypeReference__Group_0__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21225:1: rule__JvmTypeReference__Group_0__1 : rule__JvmTypeReference__Group_0__1__Impl ;
     public final void rule__JvmTypeReference__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21323:1: ( rule__JvmTypeReference__Group_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21324:2: rule__JvmTypeReference__Group_0__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21229:1: ( rule__JvmTypeReference__Group_0__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21230:2: rule__JvmTypeReference__Group_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmTypeReference__Group_0__1__Impl_in_rule__JvmTypeReference__Group_0__142983);
+            pushFollow(FOLLOW_rule__JvmTypeReference__Group_0__1__Impl_in_rule__JvmTypeReference__Group_0__142797);
             rule__JvmTypeReference__Group_0__1__Impl();
 
             state._fsp--;
@@ -60993,35 +60730,35 @@ public final void rule__JvmTypeReference__Group_0__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21330:1: rule__JvmTypeReference__Group_0__1__Impl : ( ( rule__JvmTypeReference__Group_0_1__0 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21236:1: rule__JvmTypeReference__Group_0__1__Impl : ( ( rule__JvmTypeReference__Group_0_1__0 )* ) ;
     public final void rule__JvmTypeReference__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21334:1: ( ( ( rule__JvmTypeReference__Group_0_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21335:1: ( ( rule__JvmTypeReference__Group_0_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21240:1: ( ( ( rule__JvmTypeReference__Group_0_1__0 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21241:1: ( ( rule__JvmTypeReference__Group_0_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21335:1: ( ( rule__JvmTypeReference__Group_0_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21336:1: ( rule__JvmTypeReference__Group_0_1__0 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21241:1: ( ( rule__JvmTypeReference__Group_0_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21242:1: ( rule__JvmTypeReference__Group_0_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmTypeReferenceAccess().getGroup_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21337:1: ( rule__JvmTypeReference__Group_0_1__0 )*
-            loop156:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21243:1: ( rule__JvmTypeReference__Group_0_1__0 )*
+            loop155:
             do {
-                int alt156=2;
-                int LA156_0 = input.LA(1);
+                int alt155=2;
+                int LA155_0 = input.LA(1);
 
-                if ( (LA156_0==78) ) {
-                    int LA156_2 = input.LA(2);
+                if ( (LA155_0==78) ) {
+                    int LA155_2 = input.LA(2);
 
-                    if ( (LA156_2==79) ) {
-                        int LA156_3 = input.LA(3);
+                    if ( (LA155_2==79) ) {
+                        int LA155_3 = input.LA(3);
 
-                        if ( (synpred222_InternalCheck()) ) {
-                            alt156=1;
+                        if ( (synpred221_InternalCheck()) ) {
+                            alt155=1;
                         }
 
 
@@ -61031,11 +60768,11 @@ public final void rule__JvmTypeReference__Group_0__1__Impl() throws RecognitionE
                 }
 
 
-                switch (alt156) {
+                switch (alt155) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21337:2: rule__JvmTypeReference__Group_0_1__0
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21243:2: rule__JvmTypeReference__Group_0_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__JvmTypeReference__Group_0_1__0_in_rule__JvmTypeReference__Group_0__1__Impl43010);
+            	    pushFollow(FOLLOW_rule__JvmTypeReference__Group_0_1__0_in_rule__JvmTypeReference__Group_0__1__Impl42824);
             	    rule__JvmTypeReference__Group_0_1__0();
 
             	    state._fsp--;
@@ -61045,7 +60782,7 @@ public final void rule__JvmTypeReference__Group_0__1__Impl() throws RecognitionE
             	    break;
 
             	default :
-            	    break loop156;
+            	    break loop155;
                 }
             } while (true);
 
@@ -61074,16 +60811,16 @@ public final void rule__JvmTypeReference__Group_0__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21351:1: rule__JvmTypeReference__Group_0_1__0 : rule__JvmTypeReference__Group_0_1__0__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21257:1: rule__JvmTypeReference__Group_0_1__0 : rule__JvmTypeReference__Group_0_1__0__Impl ;
     public final void rule__JvmTypeReference__Group_0_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21355:1: ( rule__JvmTypeReference__Group_0_1__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21356:2: rule__JvmTypeReference__Group_0_1__0__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21261:1: ( rule__JvmTypeReference__Group_0_1__0__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21262:2: rule__JvmTypeReference__Group_0_1__0__Impl
             {
-            pushFollow(FOLLOW_rule__JvmTypeReference__Group_0_1__0__Impl_in_rule__JvmTypeReference__Group_0_1__043045);
+            pushFollow(FOLLOW_rule__JvmTypeReference__Group_0_1__0__Impl_in_rule__JvmTypeReference__Group_0_1__042859);
             rule__JvmTypeReference__Group_0_1__0__Impl();
 
             state._fsp--;
@@ -61107,25 +60844,25 @@ public final void rule__JvmTypeReference__Group_0_1__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21362:1: rule__JvmTypeReference__Group_0_1__0__Impl : ( ( rule__JvmTypeReference__Group_0_1_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21268:1: rule__JvmTypeReference__Group_0_1__0__Impl : ( ( rule__JvmTypeReference__Group_0_1_0__0 ) ) ;
     public final void rule__JvmTypeReference__Group_0_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21366:1: ( ( ( rule__JvmTypeReference__Group_0_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21367:1: ( ( rule__JvmTypeReference__Group_0_1_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21272:1: ( ( ( rule__JvmTypeReference__Group_0_1_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21273:1: ( ( rule__JvmTypeReference__Group_0_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21367:1: ( ( rule__JvmTypeReference__Group_0_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21368:1: ( rule__JvmTypeReference__Group_0_1_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21273:1: ( ( rule__JvmTypeReference__Group_0_1_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21274:1: ( rule__JvmTypeReference__Group_0_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmTypeReferenceAccess().getGroup_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21369:1: ( rule__JvmTypeReference__Group_0_1_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21369:2: rule__JvmTypeReference__Group_0_1_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21275:1: ( rule__JvmTypeReference__Group_0_1_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21275:2: rule__JvmTypeReference__Group_0_1_0__0
             {
-            pushFollow(FOLLOW_rule__JvmTypeReference__Group_0_1_0__0_in_rule__JvmTypeReference__Group_0_1__0__Impl43072);
+            pushFollow(FOLLOW_rule__JvmTypeReference__Group_0_1_0__0_in_rule__JvmTypeReference__Group_0_1__0__Impl42886);
             rule__JvmTypeReference__Group_0_1_0__0();
 
             state._fsp--;
@@ -61158,21 +60895,21 @@ public final void rule__JvmTypeReference__Group_0_1__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0_1_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21381:1: rule__JvmTypeReference__Group_0_1_0__0 : rule__JvmTypeReference__Group_0_1_0__0__Impl rule__JvmTypeReference__Group_0_1_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21287:1: rule__JvmTypeReference__Group_0_1_0__0 : rule__JvmTypeReference__Group_0_1_0__0__Impl rule__JvmTypeReference__Group_0_1_0__1 ;
     public final void rule__JvmTypeReference__Group_0_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21385:1: ( rule__JvmTypeReference__Group_0_1_0__0__Impl rule__JvmTypeReference__Group_0_1_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21386:2: rule__JvmTypeReference__Group_0_1_0__0__Impl rule__JvmTypeReference__Group_0_1_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21291:1: ( rule__JvmTypeReference__Group_0_1_0__0__Impl rule__JvmTypeReference__Group_0_1_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21292:2: rule__JvmTypeReference__Group_0_1_0__0__Impl rule__JvmTypeReference__Group_0_1_0__1
             {
-            pushFollow(FOLLOW_rule__JvmTypeReference__Group_0_1_0__0__Impl_in_rule__JvmTypeReference__Group_0_1_0__043104);
+            pushFollow(FOLLOW_rule__JvmTypeReference__Group_0_1_0__0__Impl_in_rule__JvmTypeReference__Group_0_1_0__042918);
             rule__JvmTypeReference__Group_0_1_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmTypeReference__Group_0_1_0__1_in_rule__JvmTypeReference__Group_0_1_0__043107);
+            pushFollow(FOLLOW_rule__JvmTypeReference__Group_0_1_0__1_in_rule__JvmTypeReference__Group_0_1_0__042921);
             rule__JvmTypeReference__Group_0_1_0__1();
 
             state._fsp--;
@@ -61196,23 +60933,23 @@ public final void rule__JvmTypeReference__Group_0_1_0__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21393:1: rule__JvmTypeReference__Group_0_1_0__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21299:1: rule__JvmTypeReference__Group_0_1_0__0__Impl : ( () ) ;
     public final void rule__JvmTypeReference__Group_0_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21397:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21398:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21303:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21304:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21398:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21399:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21304:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21305:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmTypeReferenceAccess().getJvmGenericArrayTypeReferenceComponentTypeAction_0_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21400:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21402:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21306:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21308:1: 
             {
             }
 
@@ -61237,16 +60974,16 @@ public final void rule__JvmTypeReference__Group_0_1_0__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0_1_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21412:1: rule__JvmTypeReference__Group_0_1_0__1 : rule__JvmTypeReference__Group_0_1_0__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21318:1: rule__JvmTypeReference__Group_0_1_0__1 : rule__JvmTypeReference__Group_0_1_0__1__Impl ;
     public final void rule__JvmTypeReference__Group_0_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21416:1: ( rule__JvmTypeReference__Group_0_1_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21417:2: rule__JvmTypeReference__Group_0_1_0__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21322:1: ( rule__JvmTypeReference__Group_0_1_0__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21323:2: rule__JvmTypeReference__Group_0_1_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmTypeReference__Group_0_1_0__1__Impl_in_rule__JvmTypeReference__Group_0_1_0__143165);
+            pushFollow(FOLLOW_rule__JvmTypeReference__Group_0_1_0__1__Impl_in_rule__JvmTypeReference__Group_0_1_0__142979);
             rule__JvmTypeReference__Group_0_1_0__1__Impl();
 
             state._fsp--;
@@ -61270,22 +61007,22 @@ public final void rule__JvmTypeReference__Group_0_1_0__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0_1_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21423:1: rule__JvmTypeReference__Group_0_1_0__1__Impl : ( ruleArrayBrackets ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21329:1: rule__JvmTypeReference__Group_0_1_0__1__Impl : ( ruleArrayBrackets ) ;
     public final void rule__JvmTypeReference__Group_0_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21427:1: ( ( ruleArrayBrackets ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21428:1: ( ruleArrayBrackets )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21333:1: ( ( ruleArrayBrackets ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21334:1: ( ruleArrayBrackets )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21428:1: ( ruleArrayBrackets )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21429:1: ruleArrayBrackets
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21334:1: ( ruleArrayBrackets )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21335:1: ruleArrayBrackets
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmTypeReferenceAccess().getArrayBracketsParserRuleCall_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleArrayBrackets_in_rule__JvmTypeReference__Group_0_1_0__1__Impl43192);
+            pushFollow(FOLLOW_ruleArrayBrackets_in_rule__JvmTypeReference__Group_0_1_0__1__Impl43006);
             ruleArrayBrackets();
 
             state._fsp--;
@@ -61315,21 +61052,21 @@ public final void rule__JvmTypeReference__Group_0_1_0__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__ArrayBrackets__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21444:1: rule__ArrayBrackets__Group__0 : rule__ArrayBrackets__Group__0__Impl rule__ArrayBrackets__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21350:1: rule__ArrayBrackets__Group__0 : rule__ArrayBrackets__Group__0__Impl rule__ArrayBrackets__Group__1 ;
     public final void rule__ArrayBrackets__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21448:1: ( rule__ArrayBrackets__Group__0__Impl rule__ArrayBrackets__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21449:2: rule__ArrayBrackets__Group__0__Impl rule__ArrayBrackets__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21354:1: ( rule__ArrayBrackets__Group__0__Impl rule__ArrayBrackets__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21355:2: rule__ArrayBrackets__Group__0__Impl rule__ArrayBrackets__Group__1
             {
-            pushFollow(FOLLOW_rule__ArrayBrackets__Group__0__Impl_in_rule__ArrayBrackets__Group__043225);
+            pushFollow(FOLLOW_rule__ArrayBrackets__Group__0__Impl_in_rule__ArrayBrackets__Group__043039);
             rule__ArrayBrackets__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ArrayBrackets__Group__1_in_rule__ArrayBrackets__Group__043228);
+            pushFollow(FOLLOW_rule__ArrayBrackets__Group__1_in_rule__ArrayBrackets__Group__043042);
             rule__ArrayBrackets__Group__1();
 
             state._fsp--;
@@ -61353,22 +61090,22 @@ public final void rule__ArrayBrackets__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__ArrayBrackets__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21456:1: rule__ArrayBrackets__Group__0__Impl : ( '[' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21362:1: rule__ArrayBrackets__Group__0__Impl : ( '[' ) ;
     public final void rule__ArrayBrackets__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21460:1: ( ( '[' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21461:1: ( '[' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21366:1: ( ( '[' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21367:1: ( '[' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21461:1: ( '[' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21462:1: '['
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21367:1: ( '[' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21368:1: '['
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getArrayBracketsAccess().getLeftSquareBracketKeyword_0()); 
             }
-            match(input,78,FOLLOW_78_in_rule__ArrayBrackets__Group__0__Impl43256); if (state.failed) return ;
+            match(input,78,FOLLOW_78_in_rule__ArrayBrackets__Group__0__Impl43070); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getArrayBracketsAccess().getLeftSquareBracketKeyword_0()); 
             }
@@ -61394,16 +61131,16 @@ public final void rule__ArrayBrackets__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ArrayBrackets__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21475:1: rule__ArrayBrackets__Group__1 : rule__ArrayBrackets__Group__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21381:1: rule__ArrayBrackets__Group__1 : rule__ArrayBrackets__Group__1__Impl ;
     public final void rule__ArrayBrackets__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21479:1: ( rule__ArrayBrackets__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21480:2: rule__ArrayBrackets__Group__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21385:1: ( rule__ArrayBrackets__Group__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21386:2: rule__ArrayBrackets__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__ArrayBrackets__Group__1__Impl_in_rule__ArrayBrackets__Group__143287);
+            pushFollow(FOLLOW_rule__ArrayBrackets__Group__1__Impl_in_rule__ArrayBrackets__Group__143101);
             rule__ArrayBrackets__Group__1__Impl();
 
             state._fsp--;
@@ -61427,22 +61164,22 @@ public final void rule__ArrayBrackets__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__ArrayBrackets__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21486:1: rule__ArrayBrackets__Group__1__Impl : ( ']' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21392:1: rule__ArrayBrackets__Group__1__Impl : ( ']' ) ;
     public final void rule__ArrayBrackets__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21490:1: ( ( ']' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21491:1: ( ']' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21396:1: ( ( ']' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21397:1: ( ']' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21491:1: ( ']' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21492:1: ']'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21397:1: ( ']' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21398:1: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getArrayBracketsAccess().getRightSquareBracketKeyword_1()); 
             }
-            match(input,79,FOLLOW_79_in_rule__ArrayBrackets__Group__1__Impl43315); if (state.failed) return ;
+            match(input,79,FOLLOW_79_in_rule__ArrayBrackets__Group__1__Impl43129); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getArrayBracketsAccess().getRightSquareBracketKeyword_1()); 
             }
@@ -61468,21 +61205,21 @@ public final void rule__ArrayBrackets__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21509:1: rule__XFunctionTypeRef__Group__0 : rule__XFunctionTypeRef__Group__0__Impl rule__XFunctionTypeRef__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21415:1: rule__XFunctionTypeRef__Group__0 : rule__XFunctionTypeRef__Group__0__Impl rule__XFunctionTypeRef__Group__1 ;
     public final void rule__XFunctionTypeRef__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21513:1: ( rule__XFunctionTypeRef__Group__0__Impl rule__XFunctionTypeRef__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21514:2: rule__XFunctionTypeRef__Group__0__Impl rule__XFunctionTypeRef__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21419:1: ( rule__XFunctionTypeRef__Group__0__Impl rule__XFunctionTypeRef__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21420:2: rule__XFunctionTypeRef__Group__0__Impl rule__XFunctionTypeRef__Group__1
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group__0__Impl_in_rule__XFunctionTypeRef__Group__043350);
+            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group__0__Impl_in_rule__XFunctionTypeRef__Group__043164);
             rule__XFunctionTypeRef__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group__1_in_rule__XFunctionTypeRef__Group__043353);
+            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group__1_in_rule__XFunctionTypeRef__Group__043167);
             rule__XFunctionTypeRef__Group__1();
 
             state._fsp--;
@@ -61506,33 +61243,33 @@ public final void rule__XFunctionTypeRef__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21521:1: rule__XFunctionTypeRef__Group__0__Impl : ( ( rule__XFunctionTypeRef__Group_0__0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21427:1: rule__XFunctionTypeRef__Group__0__Impl : ( ( rule__XFunctionTypeRef__Group_0__0 )? ) ;
     public final void rule__XFunctionTypeRef__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21525:1: ( ( ( rule__XFunctionTypeRef__Group_0__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21526:1: ( ( rule__XFunctionTypeRef__Group_0__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21431:1: ( ( ( rule__XFunctionTypeRef__Group_0__0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21432:1: ( ( rule__XFunctionTypeRef__Group_0__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21526:1: ( ( rule__XFunctionTypeRef__Group_0__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21527:1: ( rule__XFunctionTypeRef__Group_0__0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21432:1: ( ( rule__XFunctionTypeRef__Group_0__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21433:1: ( rule__XFunctionTypeRef__Group_0__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getGroup_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21528:1: ( rule__XFunctionTypeRef__Group_0__0 )?
-            int alt157=2;
-            int LA157_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21434:1: ( rule__XFunctionTypeRef__Group_0__0 )?
+            int alt156=2;
+            int LA156_0 = input.LA(1);
 
-            if ( (LA157_0==72) ) {
-                alt157=1;
+            if ( (LA156_0==72) ) {
+                alt156=1;
             }
-            switch (alt157) {
+            switch (alt156) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21528:2: rule__XFunctionTypeRef__Group_0__0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21434:2: rule__XFunctionTypeRef__Group_0__0
                     {
-                    pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0__0_in_rule__XFunctionTypeRef__Group__0__Impl43380);
+                    pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0__0_in_rule__XFunctionTypeRef__Group__0__Impl43194);
                     rule__XFunctionTypeRef__Group_0__0();
 
                     state._fsp--;
@@ -61568,21 +61305,21 @@ public final void rule__XFunctionTypeRef__Group__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21538:1: rule__XFunctionTypeRef__Group__1 : rule__XFunctionTypeRef__Group__1__Impl rule__XFunctionTypeRef__Group__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21444:1: rule__XFunctionTypeRef__Group__1 : rule__XFunctionTypeRef__Group__1__Impl rule__XFunctionTypeRef__Group__2 ;
     public final void rule__XFunctionTypeRef__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21542:1: ( rule__XFunctionTypeRef__Group__1__Impl rule__XFunctionTypeRef__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21543:2: rule__XFunctionTypeRef__Group__1__Impl rule__XFunctionTypeRef__Group__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21448:1: ( rule__XFunctionTypeRef__Group__1__Impl rule__XFunctionTypeRef__Group__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21449:2: rule__XFunctionTypeRef__Group__1__Impl rule__XFunctionTypeRef__Group__2
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group__1__Impl_in_rule__XFunctionTypeRef__Group__143411);
+            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group__1__Impl_in_rule__XFunctionTypeRef__Group__143225);
             rule__XFunctionTypeRef__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group__2_in_rule__XFunctionTypeRef__Group__143414);
+            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group__2_in_rule__XFunctionTypeRef__Group__143228);
             rule__XFunctionTypeRef__Group__2();
 
             state._fsp--;
@@ -61606,22 +61343,22 @@ public final void rule__XFunctionTypeRef__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21550:1: rule__XFunctionTypeRef__Group__1__Impl : ( '=>' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21456:1: rule__XFunctionTypeRef__Group__1__Impl : ( '=>' ) ;
     public final void rule__XFunctionTypeRef__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21554:1: ( ( '=>' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21555:1: ( '=>' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21460:1: ( ( '=>' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21461:1: ( '=>' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21555:1: ( '=>' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21556:1: '=>'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21461:1: ( '=>' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21462:1: '=>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getEqualsSignGreaterThanSignKeyword_1()); 
             }
-            match(input,51,FOLLOW_51_in_rule__XFunctionTypeRef__Group__1__Impl43442); if (state.failed) return ;
+            match(input,51,FOLLOW_51_in_rule__XFunctionTypeRef__Group__1__Impl43256); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFunctionTypeRefAccess().getEqualsSignGreaterThanSignKeyword_1()); 
             }
@@ -61647,16 +61384,16 @@ public final void rule__XFunctionTypeRef__Group__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21569:1: rule__XFunctionTypeRef__Group__2 : rule__XFunctionTypeRef__Group__2__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21475:1: rule__XFunctionTypeRef__Group__2 : rule__XFunctionTypeRef__Group__2__Impl ;
     public final void rule__XFunctionTypeRef__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21573:1: ( rule__XFunctionTypeRef__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21574:2: rule__XFunctionTypeRef__Group__2__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21479:1: ( rule__XFunctionTypeRef__Group__2__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21480:2: rule__XFunctionTypeRef__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group__2__Impl_in_rule__XFunctionTypeRef__Group__243473);
+            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group__2__Impl_in_rule__XFunctionTypeRef__Group__243287);
             rule__XFunctionTypeRef__Group__2__Impl();
 
             state._fsp--;
@@ -61680,25 +61417,25 @@ public final void rule__XFunctionTypeRef__Group__2() throws RecognitionException
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21580:1: rule__XFunctionTypeRef__Group__2__Impl : ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21486:1: rule__XFunctionTypeRef__Group__2__Impl : ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) ) ;
     public final void rule__XFunctionTypeRef__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21584:1: ( ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21585:1: ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21490:1: ( ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21491:1: ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21585:1: ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21586:1: ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21491:1: ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21492:1: ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getReturnTypeAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21587:1: ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21587:2: rule__XFunctionTypeRef__ReturnTypeAssignment_2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21493:1: ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21493:2: rule__XFunctionTypeRef__ReturnTypeAssignment_2
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__ReturnTypeAssignment_2_in_rule__XFunctionTypeRef__Group__2__Impl43500);
+            pushFollow(FOLLOW_rule__XFunctionTypeRef__ReturnTypeAssignment_2_in_rule__XFunctionTypeRef__Group__2__Impl43314);
             rule__XFunctionTypeRef__ReturnTypeAssignment_2();
 
             state._fsp--;
@@ -61731,21 +61468,21 @@ public final void rule__XFunctionTypeRef__Group__2__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21603:1: rule__XFunctionTypeRef__Group_0__0 : rule__XFunctionTypeRef__Group_0__0__Impl rule__XFunctionTypeRef__Group_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21509:1: rule__XFunctionTypeRef__Group_0__0 : rule__XFunctionTypeRef__Group_0__0__Impl rule__XFunctionTypeRef__Group_0__1 ;
     public final void rule__XFunctionTypeRef__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21607:1: ( rule__XFunctionTypeRef__Group_0__0__Impl rule__XFunctionTypeRef__Group_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21608:2: rule__XFunctionTypeRef__Group_0__0__Impl rule__XFunctionTypeRef__Group_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21513:1: ( rule__XFunctionTypeRef__Group_0__0__Impl rule__XFunctionTypeRef__Group_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21514:2: rule__XFunctionTypeRef__Group_0__0__Impl rule__XFunctionTypeRef__Group_0__1
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0__0__Impl_in_rule__XFunctionTypeRef__Group_0__043536);
+            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0__0__Impl_in_rule__XFunctionTypeRef__Group_0__043350);
             rule__XFunctionTypeRef__Group_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0__1_in_rule__XFunctionTypeRef__Group_0__043539);
+            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0__1_in_rule__XFunctionTypeRef__Group_0__043353);
             rule__XFunctionTypeRef__Group_0__1();
 
             state._fsp--;
@@ -61769,22 +61506,22 @@ public final void rule__XFunctionTypeRef__Group_0__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21615:1: rule__XFunctionTypeRef__Group_0__0__Impl : ( '(' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21521:1: rule__XFunctionTypeRef__Group_0__0__Impl : ( '(' ) ;
     public final void rule__XFunctionTypeRef__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21619:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21620:1: ( '(' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21525:1: ( ( '(' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21526:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21620:1: ( '(' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21621:1: '('
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21526:1: ( '(' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21527:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getLeftParenthesisKeyword_0_0()); 
             }
-            match(input,72,FOLLOW_72_in_rule__XFunctionTypeRef__Group_0__0__Impl43567); if (state.failed) return ;
+            match(input,72,FOLLOW_72_in_rule__XFunctionTypeRef__Group_0__0__Impl43381); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFunctionTypeRefAccess().getLeftParenthesisKeyword_0_0()); 
             }
@@ -61810,21 +61547,21 @@ public final void rule__XFunctionTypeRef__Group_0__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21634:1: rule__XFunctionTypeRef__Group_0__1 : rule__XFunctionTypeRef__Group_0__1__Impl rule__XFunctionTypeRef__Group_0__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21540:1: rule__XFunctionTypeRef__Group_0__1 : rule__XFunctionTypeRef__Group_0__1__Impl rule__XFunctionTypeRef__Group_0__2 ;
     public final void rule__XFunctionTypeRef__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21638:1: ( rule__XFunctionTypeRef__Group_0__1__Impl rule__XFunctionTypeRef__Group_0__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21639:2: rule__XFunctionTypeRef__Group_0__1__Impl rule__XFunctionTypeRef__Group_0__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21544:1: ( rule__XFunctionTypeRef__Group_0__1__Impl rule__XFunctionTypeRef__Group_0__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21545:2: rule__XFunctionTypeRef__Group_0__1__Impl rule__XFunctionTypeRef__Group_0__2
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0__1__Impl_in_rule__XFunctionTypeRef__Group_0__143598);
+            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0__1__Impl_in_rule__XFunctionTypeRef__Group_0__143412);
             rule__XFunctionTypeRef__Group_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0__2_in_rule__XFunctionTypeRef__Group_0__143601);
+            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0__2_in_rule__XFunctionTypeRef__Group_0__143415);
             rule__XFunctionTypeRef__Group_0__2();
 
             state._fsp--;
@@ -61848,33 +61585,33 @@ public final void rule__XFunctionTypeRef__Group_0__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21646:1: rule__XFunctionTypeRef__Group_0__1__Impl : ( ( rule__XFunctionTypeRef__Group_0_1__0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21552:1: rule__XFunctionTypeRef__Group_0__1__Impl : ( ( rule__XFunctionTypeRef__Group_0_1__0 )? ) ;
     public final void rule__XFunctionTypeRef__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21650:1: ( ( ( rule__XFunctionTypeRef__Group_0_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21651:1: ( ( rule__XFunctionTypeRef__Group_0_1__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21556:1: ( ( ( rule__XFunctionTypeRef__Group_0_1__0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21557:1: ( ( rule__XFunctionTypeRef__Group_0_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21651:1: ( ( rule__XFunctionTypeRef__Group_0_1__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21652:1: ( rule__XFunctionTypeRef__Group_0_1__0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21557:1: ( ( rule__XFunctionTypeRef__Group_0_1__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21558:1: ( rule__XFunctionTypeRef__Group_0_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getGroup_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21653:1: ( rule__XFunctionTypeRef__Group_0_1__0 )?
-            int alt158=2;
-            int LA158_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21559:1: ( rule__XFunctionTypeRef__Group_0_1__0 )?
+            int alt157=2;
+            int LA157_0 = input.LA(1);
 
-            if ( (LA158_0==RULE_ID||LA158_0==51||LA158_0==72) ) {
-                alt158=1;
+            if ( (LA157_0==RULE_ID||LA157_0==51||LA157_0==72) ) {
+                alt157=1;
             }
-            switch (alt158) {
+            switch (alt157) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21653:2: rule__XFunctionTypeRef__Group_0_1__0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21559:2: rule__XFunctionTypeRef__Group_0_1__0
                     {
-                    pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0_1__0_in_rule__XFunctionTypeRef__Group_0__1__Impl43628);
+                    pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0_1__0_in_rule__XFunctionTypeRef__Group_0__1__Impl43442);
                     rule__XFunctionTypeRef__Group_0_1__0();
 
                     state._fsp--;
@@ -61910,16 +61647,16 @@ public final void rule__XFunctionTypeRef__Group_0__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21663:1: rule__XFunctionTypeRef__Group_0__2 : rule__XFunctionTypeRef__Group_0__2__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21569:1: rule__XFunctionTypeRef__Group_0__2 : rule__XFunctionTypeRef__Group_0__2__Impl ;
     public final void rule__XFunctionTypeRef__Group_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21667:1: ( rule__XFunctionTypeRef__Group_0__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21668:2: rule__XFunctionTypeRef__Group_0__2__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21573:1: ( rule__XFunctionTypeRef__Group_0__2__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21574:2: rule__XFunctionTypeRef__Group_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0__2__Impl_in_rule__XFunctionTypeRef__Group_0__243659);
+            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0__2__Impl_in_rule__XFunctionTypeRef__Group_0__243473);
             rule__XFunctionTypeRef__Group_0__2__Impl();
 
             state._fsp--;
@@ -61943,22 +61680,22 @@ public final void rule__XFunctionTypeRef__Group_0__2() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21674:1: rule__XFunctionTypeRef__Group_0__2__Impl : ( ')' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21580:1: rule__XFunctionTypeRef__Group_0__2__Impl : ( ')' ) ;
     public final void rule__XFunctionTypeRef__Group_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21678:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21679:1: ( ')' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21584:1: ( ( ')' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21585:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21679:1: ( ')' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21680:1: ')'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21585:1: ( ')' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21586:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getRightParenthesisKeyword_0_2()); 
             }
-            match(input,73,FOLLOW_73_in_rule__XFunctionTypeRef__Group_0__2__Impl43687); if (state.failed) return ;
+            match(input,73,FOLLOW_73_in_rule__XFunctionTypeRef__Group_0__2__Impl43501); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFunctionTypeRefAccess().getRightParenthesisKeyword_0_2()); 
             }
@@ -61984,21 +61721,21 @@ public final void rule__XFunctionTypeRef__Group_0__2__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21699:1: rule__XFunctionTypeRef__Group_0_1__0 : rule__XFunctionTypeRef__Group_0_1__0__Impl rule__XFunctionTypeRef__Group_0_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21605:1: rule__XFunctionTypeRef__Group_0_1__0 : rule__XFunctionTypeRef__Group_0_1__0__Impl rule__XFunctionTypeRef__Group_0_1__1 ;
     public final void rule__XFunctionTypeRef__Group_0_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21703:1: ( rule__XFunctionTypeRef__Group_0_1__0__Impl rule__XFunctionTypeRef__Group_0_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21704:2: rule__XFunctionTypeRef__Group_0_1__0__Impl rule__XFunctionTypeRef__Group_0_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21609:1: ( rule__XFunctionTypeRef__Group_0_1__0__Impl rule__XFunctionTypeRef__Group_0_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21610:2: rule__XFunctionTypeRef__Group_0_1__0__Impl rule__XFunctionTypeRef__Group_0_1__1
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0_1__0__Impl_in_rule__XFunctionTypeRef__Group_0_1__043724);
+            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0_1__0__Impl_in_rule__XFunctionTypeRef__Group_0_1__043538);
             rule__XFunctionTypeRef__Group_0_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0_1__1_in_rule__XFunctionTypeRef__Group_0_1__043727);
+            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0_1__1_in_rule__XFunctionTypeRef__Group_0_1__043541);
             rule__XFunctionTypeRef__Group_0_1__1();
 
             state._fsp--;
@@ -62022,25 +61759,25 @@ public final void rule__XFunctionTypeRef__Group_0_1__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21711:1: rule__XFunctionTypeRef__Group_0_1__0__Impl : ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21617:1: rule__XFunctionTypeRef__Group_0_1__0__Impl : ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) ) ;
     public final void rule__XFunctionTypeRef__Group_0_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21715:1: ( ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21716:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21621:1: ( ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21622:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21716:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21717:1: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21622:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21623:1: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getParamTypesAssignment_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21718:1: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21718:2: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21624:1: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21624:2: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0_in_rule__XFunctionTypeRef__Group_0_1__0__Impl43754);
+            pushFollow(FOLLOW_rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0_in_rule__XFunctionTypeRef__Group_0_1__0__Impl43568);
             rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0();
 
             state._fsp--;
@@ -62073,16 +61810,16 @@ public final void rule__XFunctionTypeRef__Group_0_1__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21728:1: rule__XFunctionTypeRef__Group_0_1__1 : rule__XFunctionTypeRef__Group_0_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21634:1: rule__XFunctionTypeRef__Group_0_1__1 : rule__XFunctionTypeRef__Group_0_1__1__Impl ;
     public final void rule__XFunctionTypeRef__Group_0_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21732:1: ( rule__XFunctionTypeRef__Group_0_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21733:2: rule__XFunctionTypeRef__Group_0_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21638:1: ( rule__XFunctionTypeRef__Group_0_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21639:2: rule__XFunctionTypeRef__Group_0_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0_1__1__Impl_in_rule__XFunctionTypeRef__Group_0_1__143784);
+            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0_1__1__Impl_in_rule__XFunctionTypeRef__Group_0_1__143598);
             rule__XFunctionTypeRef__Group_0_1__1__Impl();
 
             state._fsp--;
@@ -62106,37 +61843,37 @@ public final void rule__XFunctionTypeRef__Group_0_1__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21739:1: rule__XFunctionTypeRef__Group_0_1__1__Impl : ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21645:1: rule__XFunctionTypeRef__Group_0_1__1__Impl : ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* ) ;
     public final void rule__XFunctionTypeRef__Group_0_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21743:1: ( ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21744:1: ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21649:1: ( ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21650:1: ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21744:1: ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21745:1: ( rule__XFunctionTypeRef__Group_0_1_1__0 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21650:1: ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21651:1: ( rule__XFunctionTypeRef__Group_0_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getGroup_0_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21746:1: ( rule__XFunctionTypeRef__Group_0_1_1__0 )*
-            loop159:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21652:1: ( rule__XFunctionTypeRef__Group_0_1_1__0 )*
+            loop158:
             do {
-                int alt159=2;
-                int LA159_0 = input.LA(1);
+                int alt158=2;
+                int LA158_0 = input.LA(1);
 
-                if ( (LA159_0==74) ) {
-                    alt159=1;
+                if ( (LA158_0==74) ) {
+                    alt158=1;
                 }
 
 
-                switch (alt159) {
+                switch (alt158) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21746:2: rule__XFunctionTypeRef__Group_0_1_1__0
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21652:2: rule__XFunctionTypeRef__Group_0_1_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0_1_1__0_in_rule__XFunctionTypeRef__Group_0_1__1__Impl43811);
+            	    pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0_1_1__0_in_rule__XFunctionTypeRef__Group_0_1__1__Impl43625);
             	    rule__XFunctionTypeRef__Group_0_1_1__0();
 
             	    state._fsp--;
@@ -62146,7 +61883,7 @@ public final void rule__XFunctionTypeRef__Group_0_1__1__Impl() throws Recognitio
             	    break;
 
             	default :
-            	    break loop159;
+            	    break loop158;
                 }
             } while (true);
 
@@ -62175,21 +61912,21 @@ public final void rule__XFunctionTypeRef__Group_0_1__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21760:1: rule__XFunctionTypeRef__Group_0_1_1__0 : rule__XFunctionTypeRef__Group_0_1_1__0__Impl rule__XFunctionTypeRef__Group_0_1_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21666:1: rule__XFunctionTypeRef__Group_0_1_1__0 : rule__XFunctionTypeRef__Group_0_1_1__0__Impl rule__XFunctionTypeRef__Group_0_1_1__1 ;
     public final void rule__XFunctionTypeRef__Group_0_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21764:1: ( rule__XFunctionTypeRef__Group_0_1_1__0__Impl rule__XFunctionTypeRef__Group_0_1_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21765:2: rule__XFunctionTypeRef__Group_0_1_1__0__Impl rule__XFunctionTypeRef__Group_0_1_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21670:1: ( rule__XFunctionTypeRef__Group_0_1_1__0__Impl rule__XFunctionTypeRef__Group_0_1_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21671:2: rule__XFunctionTypeRef__Group_0_1_1__0__Impl rule__XFunctionTypeRef__Group_0_1_1__1
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0_1_1__0__Impl_in_rule__XFunctionTypeRef__Group_0_1_1__043846);
+            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0_1_1__0__Impl_in_rule__XFunctionTypeRef__Group_0_1_1__043660);
             rule__XFunctionTypeRef__Group_0_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0_1_1__1_in_rule__XFunctionTypeRef__Group_0_1_1__043849);
+            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0_1_1__1_in_rule__XFunctionTypeRef__Group_0_1_1__043663);
             rule__XFunctionTypeRef__Group_0_1_1__1();
 
             state._fsp--;
@@ -62213,22 +61950,22 @@ public final void rule__XFunctionTypeRef__Group_0_1_1__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21772:1: rule__XFunctionTypeRef__Group_0_1_1__0__Impl : ( ',' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21678:1: rule__XFunctionTypeRef__Group_0_1_1__0__Impl : ( ',' ) ;
     public final void rule__XFunctionTypeRef__Group_0_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21776:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21777:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21682:1: ( ( ',' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21683:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21777:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21778:1: ','
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21683:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21684:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getCommaKeyword_0_1_1_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XFunctionTypeRef__Group_0_1_1__0__Impl43877); if (state.failed) return ;
+            match(input,74,FOLLOW_74_in_rule__XFunctionTypeRef__Group_0_1_1__0__Impl43691); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFunctionTypeRefAccess().getCommaKeyword_0_1_1_0()); 
             }
@@ -62254,16 +61991,16 @@ public final void rule__XFunctionTypeRef__Group_0_1_1__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21791:1: rule__XFunctionTypeRef__Group_0_1_1__1 : rule__XFunctionTypeRef__Group_0_1_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21697:1: rule__XFunctionTypeRef__Group_0_1_1__1 : rule__XFunctionTypeRef__Group_0_1_1__1__Impl ;
     public final void rule__XFunctionTypeRef__Group_0_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21795:1: ( rule__XFunctionTypeRef__Group_0_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21796:2: rule__XFunctionTypeRef__Group_0_1_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21701:1: ( rule__XFunctionTypeRef__Group_0_1_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21702:2: rule__XFunctionTypeRef__Group_0_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0_1_1__1__Impl_in_rule__XFunctionTypeRef__Group_0_1_1__143908);
+            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0_1_1__1__Impl_in_rule__XFunctionTypeRef__Group_0_1_1__143722);
             rule__XFunctionTypeRef__Group_0_1_1__1__Impl();
 
             state._fsp--;
@@ -62287,25 +62024,25 @@ public final void rule__XFunctionTypeRef__Group_0_1_1__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21802:1: rule__XFunctionTypeRef__Group_0_1_1__1__Impl : ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21708:1: rule__XFunctionTypeRef__Group_0_1_1__1__Impl : ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) ) ;
     public final void rule__XFunctionTypeRef__Group_0_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21806:1: ( ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21807:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21712:1: ( ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21713:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21807:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21808:1: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21713:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21714:1: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getParamTypesAssignment_0_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21809:1: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21809:2: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21715:1: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21715:2: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1_in_rule__XFunctionTypeRef__Group_0_1_1__1__Impl43935);
+            pushFollow(FOLLOW_rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1_in_rule__XFunctionTypeRef__Group_0_1_1__1__Impl43749);
             rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1();
 
             state._fsp--;
@@ -62338,21 +62075,21 @@ public final void rule__XFunctionTypeRef__Group_0_1_1__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21823:1: rule__JvmParameterizedTypeReference__Group__0 : rule__JvmParameterizedTypeReference__Group__0__Impl rule__JvmParameterizedTypeReference__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21729:1: rule__JvmParameterizedTypeReference__Group__0 : rule__JvmParameterizedTypeReference__Group__0__Impl rule__JvmParameterizedTypeReference__Group__1 ;
     public final void rule__JvmParameterizedTypeReference__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21827:1: ( rule__JvmParameterizedTypeReference__Group__0__Impl rule__JvmParameterizedTypeReference__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21828:2: rule__JvmParameterizedTypeReference__Group__0__Impl rule__JvmParameterizedTypeReference__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21733:1: ( rule__JvmParameterizedTypeReference__Group__0__Impl rule__JvmParameterizedTypeReference__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21734:2: rule__JvmParameterizedTypeReference__Group__0__Impl rule__JvmParameterizedTypeReference__Group__1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group__0__Impl_in_rule__JvmParameterizedTypeReference__Group__043969);
+            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group__0__Impl_in_rule__JvmParameterizedTypeReference__Group__043783);
             rule__JvmParameterizedTypeReference__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group__1_in_rule__JvmParameterizedTypeReference__Group__043972);
+            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group__1_in_rule__JvmParameterizedTypeReference__Group__043786);
             rule__JvmParameterizedTypeReference__Group__1();
 
             state._fsp--;
@@ -62376,25 +62113,25 @@ public final void rule__JvmParameterizedTypeReference__Group__0() throws Recogni
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21835:1: rule__JvmParameterizedTypeReference__Group__0__Impl : ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21741:1: rule__JvmParameterizedTypeReference__Group__0__Impl : ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21839:1: ( ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21840:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21745:1: ( ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21746:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21840:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21841:1: ( rule__JvmParameterizedTypeReference__TypeAssignment_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21746:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21747:1: ( rule__JvmParameterizedTypeReference__TypeAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21842:1: ( rule__JvmParameterizedTypeReference__TypeAssignment_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21842:2: rule__JvmParameterizedTypeReference__TypeAssignment_0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21748:1: ( rule__JvmParameterizedTypeReference__TypeAssignment_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21748:2: rule__JvmParameterizedTypeReference__TypeAssignment_0
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__TypeAssignment_0_in_rule__JvmParameterizedTypeReference__Group__0__Impl43999);
+            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__TypeAssignment_0_in_rule__JvmParameterizedTypeReference__Group__0__Impl43813);
             rule__JvmParameterizedTypeReference__TypeAssignment_0();
 
             state._fsp--;
@@ -62427,16 +62164,16 @@ public final void rule__JvmParameterizedTypeReference__Group__0__Impl() throws R
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21852:1: rule__JvmParameterizedTypeReference__Group__1 : rule__JvmParameterizedTypeReference__Group__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21758:1: rule__JvmParameterizedTypeReference__Group__1 : rule__JvmParameterizedTypeReference__Group__1__Impl ;
     public final void rule__JvmParameterizedTypeReference__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21856:1: ( rule__JvmParameterizedTypeReference__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21857:2: rule__JvmParameterizedTypeReference__Group__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21762:1: ( rule__JvmParameterizedTypeReference__Group__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21763:2: rule__JvmParameterizedTypeReference__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group__1__Impl_in_rule__JvmParameterizedTypeReference__Group__144029);
+            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group__1__Impl_in_rule__JvmParameterizedTypeReference__Group__143843);
             rule__JvmParameterizedTypeReference__Group__1__Impl();
 
             state._fsp--;
@@ -62460,29 +62197,29 @@ public final void rule__JvmParameterizedTypeReference__Group__1() throws Recogni
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21863:1: rule__JvmParameterizedTypeReference__Group__1__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21769:1: rule__JvmParameterizedTypeReference__Group__1__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? ) ;
     public final void rule__JvmParameterizedTypeReference__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21867:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21868:1: ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21773:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21774:1: ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21868:1: ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21869:1: ( rule__JvmParameterizedTypeReference__Group_1__0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21774:1: ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21775:1: ( rule__JvmParameterizedTypeReference__Group_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21870:1: ( rule__JvmParameterizedTypeReference__Group_1__0 )?
-            int alt160=2;
-            alt160 = dfa160.predict(input);
-            switch (alt160) {
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21776:1: ( rule__JvmParameterizedTypeReference__Group_1__0 )?
+            int alt159=2;
+            alt159 = dfa159.predict(input);
+            switch (alt159) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21870:2: rule__JvmParameterizedTypeReference__Group_1__0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21776:2: rule__JvmParameterizedTypeReference__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__0_in_rule__JvmParameterizedTypeReference__Group__1__Impl44056);
+                    pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__0_in_rule__JvmParameterizedTypeReference__Group__1__Impl43870);
                     rule__JvmParameterizedTypeReference__Group_1__0();
 
                     state._fsp--;
@@ -62518,21 +62255,21 @@ public final void rule__JvmParameterizedTypeReference__Group__1__Impl() throws R
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21884:1: rule__JvmParameterizedTypeReference__Group_1__0 : rule__JvmParameterizedTypeReference__Group_1__0__Impl rule__JvmParameterizedTypeReference__Group_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21790:1: rule__JvmParameterizedTypeReference__Group_1__0 : rule__JvmParameterizedTypeReference__Group_1__0__Impl rule__JvmParameterizedTypeReference__Group_1__1 ;
     public final void rule__JvmParameterizedTypeReference__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21888:1: ( rule__JvmParameterizedTypeReference__Group_1__0__Impl rule__JvmParameterizedTypeReference__Group_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21889:2: rule__JvmParameterizedTypeReference__Group_1__0__Impl rule__JvmParameterizedTypeReference__Group_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21794:1: ( rule__JvmParameterizedTypeReference__Group_1__0__Impl rule__JvmParameterizedTypeReference__Group_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21795:2: rule__JvmParameterizedTypeReference__Group_1__0__Impl rule__JvmParameterizedTypeReference__Group_1__1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1__044091);
+            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1__043905);
             rule__JvmParameterizedTypeReference__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__1_in_rule__JvmParameterizedTypeReference__Group_1__044094);
+            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__1_in_rule__JvmParameterizedTypeReference__Group_1__043908);
             rule__JvmParameterizedTypeReference__Group_1__1();
 
             state._fsp--;
@@ -62556,25 +62293,25 @@ public final void rule__JvmParameterizedTypeReference__Group_1__0() throws Recog
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21896:1: rule__JvmParameterizedTypeReference__Group_1__0__Impl : ( ( '<' ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21802:1: rule__JvmParameterizedTypeReference__Group_1__0__Impl : ( ( '<' ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21900:1: ( ( ( '<' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21901:1: ( ( '<' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21806:1: ( ( ( '<' ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21807:1: ( ( '<' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21901:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21902:1: ( '<' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21807:1: ( ( '<' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21808:1: ( '<' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getLessThanSignKeyword_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21903:1: ( '<' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21904:2: '<'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21809:1: ( '<' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21810:2: '<'
             {
-            match(input,47,FOLLOW_47_in_rule__JvmParameterizedTypeReference__Group_1__0__Impl44123); if (state.failed) return ;
+            match(input,47,FOLLOW_47_in_rule__JvmParameterizedTypeReference__Group_1__0__Impl43937); if (state.failed) return ;
 
             }
 
@@ -62603,21 +62340,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1__0__Impl() throws
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21915:1: rule__JvmParameterizedTypeReference__Group_1__1 : rule__JvmParameterizedTypeReference__Group_1__1__Impl rule__JvmParameterizedTypeReference__Group_1__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21821:1: rule__JvmParameterizedTypeReference__Group_1__1 : rule__JvmParameterizedTypeReference__Group_1__1__Impl rule__JvmParameterizedTypeReference__Group_1__2 ;
     public final void rule__JvmParameterizedTypeReference__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21919:1: ( rule__JvmParameterizedTypeReference__Group_1__1__Impl rule__JvmParameterizedTypeReference__Group_1__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21920:2: rule__JvmParameterizedTypeReference__Group_1__1__Impl rule__JvmParameterizedTypeReference__Group_1__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21825:1: ( rule__JvmParameterizedTypeReference__Group_1__1__Impl rule__JvmParameterizedTypeReference__Group_1__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21826:2: rule__JvmParameterizedTypeReference__Group_1__1__Impl rule__JvmParameterizedTypeReference__Group_1__2
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1__144155);
+            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1__143969);
             rule__JvmParameterizedTypeReference__Group_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__2_in_rule__JvmParameterizedTypeReference__Group_1__144158);
+            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__2_in_rule__JvmParameterizedTypeReference__Group_1__143972);
             rule__JvmParameterizedTypeReference__Group_1__2();
 
             state._fsp--;
@@ -62641,25 +62378,25 @@ public final void rule__JvmParameterizedTypeReference__Group_1__1() throws Recog
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21927:1: rule__JvmParameterizedTypeReference__Group_1__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21833:1: rule__JvmParameterizedTypeReference__Group_1__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21931:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21932:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21837:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21838:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21932:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21933:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21838:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21839:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21934:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21934:2: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21840:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21840:2: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1_in_rule__JvmParameterizedTypeReference__Group_1__1__Impl44185);
+            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1_in_rule__JvmParameterizedTypeReference__Group_1__1__Impl43999);
             rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1();
 
             state._fsp--;
@@ -62692,21 +62429,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1__1__Impl() throws
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21944:1: rule__JvmParameterizedTypeReference__Group_1__2 : rule__JvmParameterizedTypeReference__Group_1__2__Impl rule__JvmParameterizedTypeReference__Group_1__3 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21850:1: rule__JvmParameterizedTypeReference__Group_1__2 : rule__JvmParameterizedTypeReference__Group_1__2__Impl rule__JvmParameterizedTypeReference__Group_1__3 ;
     public final void rule__JvmParameterizedTypeReference__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21948:1: ( rule__JvmParameterizedTypeReference__Group_1__2__Impl rule__JvmParameterizedTypeReference__Group_1__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21949:2: rule__JvmParameterizedTypeReference__Group_1__2__Impl rule__JvmParameterizedTypeReference__Group_1__3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21854:1: ( rule__JvmParameterizedTypeReference__Group_1__2__Impl rule__JvmParameterizedTypeReference__Group_1__3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21855:2: rule__JvmParameterizedTypeReference__Group_1__2__Impl rule__JvmParameterizedTypeReference__Group_1__3
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__2__Impl_in_rule__JvmParameterizedTypeReference__Group_1__244215);
+            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__2__Impl_in_rule__JvmParameterizedTypeReference__Group_1__244029);
             rule__JvmParameterizedTypeReference__Group_1__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__3_in_rule__JvmParameterizedTypeReference__Group_1__244218);
+            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__3_in_rule__JvmParameterizedTypeReference__Group_1__244032);
             rule__JvmParameterizedTypeReference__Group_1__3();
 
             state._fsp--;
@@ -62730,37 +62467,37 @@ public final void rule__JvmParameterizedTypeReference__Group_1__2() throws Recog
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21956:1: rule__JvmParameterizedTypeReference__Group_1__2__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21862:1: rule__JvmParameterizedTypeReference__Group_1__2__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21960:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21961:1: ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21866:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21867:1: ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21961:1: ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21962:1: ( rule__JvmParameterizedTypeReference__Group_1_2__0 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21867:1: ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21868:1: ( rule__JvmParameterizedTypeReference__Group_1_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21963:1: ( rule__JvmParameterizedTypeReference__Group_1_2__0 )*
-            loop161:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21869:1: ( rule__JvmParameterizedTypeReference__Group_1_2__0 )*
+            loop160:
             do {
-                int alt161=2;
-                int LA161_0 = input.LA(1);
+                int alt160=2;
+                int LA160_0 = input.LA(1);
 
-                if ( (LA161_0==74) ) {
-                    alt161=1;
+                if ( (LA160_0==74) ) {
+                    alt160=1;
                 }
 
 
-                switch (alt161) {
+                switch (alt160) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21963:2: rule__JvmParameterizedTypeReference__Group_1_2__0
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21869:2: rule__JvmParameterizedTypeReference__Group_1_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_2__0_in_rule__JvmParameterizedTypeReference__Group_1__2__Impl44245);
+            	    pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_2__0_in_rule__JvmParameterizedTypeReference__Group_1__2__Impl44059);
             	    rule__JvmParameterizedTypeReference__Group_1_2__0();
 
             	    state._fsp--;
@@ -62770,7 +62507,7 @@ public final void rule__JvmParameterizedTypeReference__Group_1__2__Impl() throws
             	    break;
 
             	default :
-            	    break loop161;
+            	    break loop160;
                 }
             } while (true);
 
@@ -62799,21 +62536,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1__2__Impl() throws
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21973:1: rule__JvmParameterizedTypeReference__Group_1__3 : rule__JvmParameterizedTypeReference__Group_1__3__Impl rule__JvmParameterizedTypeReference__Group_1__4 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21879:1: rule__JvmParameterizedTypeReference__Group_1__3 : rule__JvmParameterizedTypeReference__Group_1__3__Impl rule__JvmParameterizedTypeReference__Group_1__4 ;
     public final void rule__JvmParameterizedTypeReference__Group_1__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21977:1: ( rule__JvmParameterizedTypeReference__Group_1__3__Impl rule__JvmParameterizedTypeReference__Group_1__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21978:2: rule__JvmParameterizedTypeReference__Group_1__3__Impl rule__JvmParameterizedTypeReference__Group_1__4
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21883:1: ( rule__JvmParameterizedTypeReference__Group_1__3__Impl rule__JvmParameterizedTypeReference__Group_1__4 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21884:2: rule__JvmParameterizedTypeReference__Group_1__3__Impl rule__JvmParameterizedTypeReference__Group_1__4
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__3__Impl_in_rule__JvmParameterizedTypeReference__Group_1__344276);
+            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__3__Impl_in_rule__JvmParameterizedTypeReference__Group_1__344090);
             rule__JvmParameterizedTypeReference__Group_1__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__4_in_rule__JvmParameterizedTypeReference__Group_1__344279);
+            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__4_in_rule__JvmParameterizedTypeReference__Group_1__344093);
             rule__JvmParameterizedTypeReference__Group_1__4();
 
             state._fsp--;
@@ -62837,22 +62574,22 @@ public final void rule__JvmParameterizedTypeReference__Group_1__3() throws Recog
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21985:1: rule__JvmParameterizedTypeReference__Group_1__3__Impl : ( '>' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21891:1: rule__JvmParameterizedTypeReference__Group_1__3__Impl : ( '>' ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21989:1: ( ( '>' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21990:1: ( '>' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21895:1: ( ( '>' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21896:1: ( '>' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21990:1: ( '>' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21991:1: '>'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21896:1: ( '>' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21897:1: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGreaterThanSignKeyword_1_3()); 
             }
-            match(input,46,FOLLOW_46_in_rule__JvmParameterizedTypeReference__Group_1__3__Impl44307); if (state.failed) return ;
+            match(input,46,FOLLOW_46_in_rule__JvmParameterizedTypeReference__Group_1__3__Impl44121); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGreaterThanSignKeyword_1_3()); 
             }
@@ -62878,16 +62615,16 @@ public final void rule__JvmParameterizedTypeReference__Group_1__3__Impl() throws
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22004:1: rule__JvmParameterizedTypeReference__Group_1__4 : rule__JvmParameterizedTypeReference__Group_1__4__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21910:1: rule__JvmParameterizedTypeReference__Group_1__4 : rule__JvmParameterizedTypeReference__Group_1__4__Impl ;
     public final void rule__JvmParameterizedTypeReference__Group_1__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22008:1: ( rule__JvmParameterizedTypeReference__Group_1__4__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22009:2: rule__JvmParameterizedTypeReference__Group_1__4__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21914:1: ( rule__JvmParameterizedTypeReference__Group_1__4__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21915:2: rule__JvmParameterizedTypeReference__Group_1__4__Impl
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__4__Impl_in_rule__JvmParameterizedTypeReference__Group_1__444338);
+            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__4__Impl_in_rule__JvmParameterizedTypeReference__Group_1__444152);
             rule__JvmParameterizedTypeReference__Group_1__4__Impl();
 
             state._fsp--;
@@ -62911,35 +62648,35 @@ public final void rule__JvmParameterizedTypeReference__Group_1__4() throws Recog
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22015:1: rule__JvmParameterizedTypeReference__Group_1__4__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21921:1: rule__JvmParameterizedTypeReference__Group_1__4__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22019:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22020:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21925:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21926:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22020:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22021:1: ( rule__JvmParameterizedTypeReference__Group_1_4__0 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21926:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21927:1: ( rule__JvmParameterizedTypeReference__Group_1_4__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup_1_4()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22022:1: ( rule__JvmParameterizedTypeReference__Group_1_4__0 )*
-            loop162:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21928:1: ( rule__JvmParameterizedTypeReference__Group_1_4__0 )*
+            loop161:
             do {
-                int alt162=2;
-                int LA162_0 = input.LA(1);
+                int alt161=2;
+                int LA161_0 = input.LA(1);
 
-                if ( (LA162_0==63) ) {
-                    int LA162_2 = input.LA(2);
+                if ( (LA161_0==63) ) {
+                    int LA161_2 = input.LA(2);
 
-                    if ( (LA162_2==RULE_ID) ) {
-                        int LA162_3 = input.LA(3);
+                    if ( (LA161_2==RULE_ID) ) {
+                        int LA161_3 = input.LA(3);
 
-                        if ( (synpred228_InternalCheck()) ) {
-                            alt162=1;
+                        if ( (synpred227_InternalCheck()) ) {
+                            alt161=1;
                         }
 
 
@@ -62949,11 +62686,11 @@ public final void rule__JvmParameterizedTypeReference__Group_1__4__Impl() throws
                 }
 
 
-                switch (alt162) {
+                switch (alt161) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22022:2: rule__JvmParameterizedTypeReference__Group_1_4__0
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21928:2: rule__JvmParameterizedTypeReference__Group_1_4__0
             	    {
-            	    pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__0_in_rule__JvmParameterizedTypeReference__Group_1__4__Impl44365);
+            	    pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__0_in_rule__JvmParameterizedTypeReference__Group_1__4__Impl44179);
             	    rule__JvmParameterizedTypeReference__Group_1_4__0();
 
             	    state._fsp--;
@@ -62963,7 +62700,7 @@ public final void rule__JvmParameterizedTypeReference__Group_1__4__Impl() throws
             	    break;
 
             	default :
-            	    break loop162;
+            	    break loop161;
                 }
             } while (true);
 
@@ -62992,21 +62729,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1__4__Impl() throws
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_2__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22042:1: rule__JvmParameterizedTypeReference__Group_1_2__0 : rule__JvmParameterizedTypeReference__Group_1_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_2__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21948:1: rule__JvmParameterizedTypeReference__Group_1_2__0 : rule__JvmParameterizedTypeReference__Group_1_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_2__1 ;
     public final void rule__JvmParameterizedTypeReference__Group_1_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22046:1: ( rule__JvmParameterizedTypeReference__Group_1_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_2__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22047:2: rule__JvmParameterizedTypeReference__Group_1_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_2__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21952:1: ( rule__JvmParameterizedTypeReference__Group_1_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_2__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21953:2: rule__JvmParameterizedTypeReference__Group_1_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_2__1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_2__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_2__044406);
+            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_2__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_2__044220);
             rule__JvmParameterizedTypeReference__Group_1_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_2__1_in_rule__JvmParameterizedTypeReference__Group_1_2__044409);
+            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_2__1_in_rule__JvmParameterizedTypeReference__Group_1_2__044223);
             rule__JvmParameterizedTypeReference__Group_1_2__1();
 
             state._fsp--;
@@ -63030,22 +62767,22 @@ public final void rule__JvmParameterizedTypeReference__Group_1_2__0() throws Rec
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_2__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22054:1: rule__JvmParameterizedTypeReference__Group_1_2__0__Impl : ( ',' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21960:1: rule__JvmParameterizedTypeReference__Group_1_2__0__Impl : ( ',' ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22058:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22059:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21964:1: ( ( ',' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21965:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22059:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22060:1: ','
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21965:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21966:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getCommaKeyword_1_2_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__JvmParameterizedTypeReference__Group_1_2__0__Impl44437); if (state.failed) return ;
+            match(input,74,FOLLOW_74_in_rule__JvmParameterizedTypeReference__Group_1_2__0__Impl44251); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmParameterizedTypeReferenceAccess().getCommaKeyword_1_2_0()); 
             }
@@ -63071,16 +62808,16 @@ public final void rule__JvmParameterizedTypeReference__Group_1_2__0__Impl() thro
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_2__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22073:1: rule__JvmParameterizedTypeReference__Group_1_2__1 : rule__JvmParameterizedTypeReference__Group_1_2__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21979:1: rule__JvmParameterizedTypeReference__Group_1_2__1 : rule__JvmParameterizedTypeReference__Group_1_2__1__Impl ;
     public final void rule__JvmParameterizedTypeReference__Group_1_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22077:1: ( rule__JvmParameterizedTypeReference__Group_1_2__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22078:2: rule__JvmParameterizedTypeReference__Group_1_2__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21983:1: ( rule__JvmParameterizedTypeReference__Group_1_2__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21984:2: rule__JvmParameterizedTypeReference__Group_1_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_2__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_2__144468);
+            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_2__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_2__144282);
             rule__JvmParameterizedTypeReference__Group_1_2__1__Impl();
 
             state._fsp--;
@@ -63104,25 +62841,25 @@ public final void rule__JvmParameterizedTypeReference__Group_1_2__1() throws Rec
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_2__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22084:1: rule__JvmParameterizedTypeReference__Group_1_2__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21990:1: rule__JvmParameterizedTypeReference__Group_1_2__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22088:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22089:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21994:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21995:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22089:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22090:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21995:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21996:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsAssignment_1_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22091:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22091:2: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21997:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21997:2: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1_in_rule__JvmParameterizedTypeReference__Group_1_2__1__Impl44495);
+            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1_in_rule__JvmParameterizedTypeReference__Group_1_2__1__Impl44309);
             rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1();
 
             state._fsp--;
@@ -63155,21 +62892,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1_2__1__Impl() thro
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22105:1: rule__JvmParameterizedTypeReference__Group_1_4__0 : rule__JvmParameterizedTypeReference__Group_1_4__0__Impl rule__JvmParameterizedTypeReference__Group_1_4__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22011:1: rule__JvmParameterizedTypeReference__Group_1_4__0 : rule__JvmParameterizedTypeReference__Group_1_4__0__Impl rule__JvmParameterizedTypeReference__Group_1_4__1 ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22109:1: ( rule__JvmParameterizedTypeReference__Group_1_4__0__Impl rule__JvmParameterizedTypeReference__Group_1_4__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22110:2: rule__JvmParameterizedTypeReference__Group_1_4__0__Impl rule__JvmParameterizedTypeReference__Group_1_4__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22015:1: ( rule__JvmParameterizedTypeReference__Group_1_4__0__Impl rule__JvmParameterizedTypeReference__Group_1_4__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22016:2: rule__JvmParameterizedTypeReference__Group_1_4__0__Impl rule__JvmParameterizedTypeReference__Group_1_4__1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4__044529);
+            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4__044343);
             rule__JvmParameterizedTypeReference__Group_1_4__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__1_in_rule__JvmParameterizedTypeReference__Group_1_4__044532);
+            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__1_in_rule__JvmParameterizedTypeReference__Group_1_4__044346);
             rule__JvmParameterizedTypeReference__Group_1_4__1();
 
             state._fsp--;
@@ -63193,25 +62930,25 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4__0() throws Rec
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22117:1: rule__JvmParameterizedTypeReference__Group_1_4__0__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22023:1: rule__JvmParameterizedTypeReference__Group_1_4__0__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22121:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22122:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22027:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22028:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22122:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22123:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22028:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22029:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup_1_4_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22124:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22124:2: rule__JvmParameterizedTypeReference__Group_1_4_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22030:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22030:2: rule__JvmParameterizedTypeReference__Group_1_4_0__0
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0__0_in_rule__JvmParameterizedTypeReference__Group_1_4__0__Impl44559);
+            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0__0_in_rule__JvmParameterizedTypeReference__Group_1_4__0__Impl44373);
             rule__JvmParameterizedTypeReference__Group_1_4_0__0();
 
             state._fsp--;
@@ -63244,21 +62981,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4__0__Impl() thro
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22134:1: rule__JvmParameterizedTypeReference__Group_1_4__1 : rule__JvmParameterizedTypeReference__Group_1_4__1__Impl rule__JvmParameterizedTypeReference__Group_1_4__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22040:1: rule__JvmParameterizedTypeReference__Group_1_4__1 : rule__JvmParameterizedTypeReference__Group_1_4__1__Impl rule__JvmParameterizedTypeReference__Group_1_4__2 ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22138:1: ( rule__JvmParameterizedTypeReference__Group_1_4__1__Impl rule__JvmParameterizedTypeReference__Group_1_4__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22139:2: rule__JvmParameterizedTypeReference__Group_1_4__1__Impl rule__JvmParameterizedTypeReference__Group_1_4__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22044:1: ( rule__JvmParameterizedTypeReference__Group_1_4__1__Impl rule__JvmParameterizedTypeReference__Group_1_4__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22045:2: rule__JvmParameterizedTypeReference__Group_1_4__1__Impl rule__JvmParameterizedTypeReference__Group_1_4__2
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4__144589);
+            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4__144403);
             rule__JvmParameterizedTypeReference__Group_1_4__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__2_in_rule__JvmParameterizedTypeReference__Group_1_4__144592);
+            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__2_in_rule__JvmParameterizedTypeReference__Group_1_4__144406);
             rule__JvmParameterizedTypeReference__Group_1_4__2();
 
             state._fsp--;
@@ -63282,25 +63019,25 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4__1() throws Rec
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22146:1: rule__JvmParameterizedTypeReference__Group_1_4__1__Impl : ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22052:1: rule__JvmParameterizedTypeReference__Group_1_4__1__Impl : ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22150:1: ( ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22151:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22056:1: ( ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22057:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22151:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22152:1: ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22057:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22058:1: ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeAssignment_1_4_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22153:1: ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22153:2: rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22059:1: ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22059:2: rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1_in_rule__JvmParameterizedTypeReference__Group_1_4__1__Impl44619);
+            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1_in_rule__JvmParameterizedTypeReference__Group_1_4__1__Impl44433);
             rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1();
 
             state._fsp--;
@@ -63333,16 +63070,16 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4__1__Impl() thro
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22163:1: rule__JvmParameterizedTypeReference__Group_1_4__2 : rule__JvmParameterizedTypeReference__Group_1_4__2__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22069:1: rule__JvmParameterizedTypeReference__Group_1_4__2 : rule__JvmParameterizedTypeReference__Group_1_4__2__Impl ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22167:1: ( rule__JvmParameterizedTypeReference__Group_1_4__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22168:2: rule__JvmParameterizedTypeReference__Group_1_4__2__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22073:1: ( rule__JvmParameterizedTypeReference__Group_1_4__2__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22074:2: rule__JvmParameterizedTypeReference__Group_1_4__2__Impl
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__2__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4__244649);
+            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__2__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4__244463);
             rule__JvmParameterizedTypeReference__Group_1_4__2__Impl();
 
             state._fsp--;
@@ -63366,29 +63103,29 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4__2() throws Rec
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22174:1: rule__JvmParameterizedTypeReference__Group_1_4__2__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22080:1: rule__JvmParameterizedTypeReference__Group_1_4__2__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22178:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22179:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22084:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22085:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22179:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22180:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22085:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22086:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup_1_4_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22181:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )?
-            int alt163=2;
-            alt163 = dfa163.predict(input);
-            switch (alt163) {
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22087:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )?
+            int alt162=2;
+            alt162 = dfa162.predict(input);
+            switch (alt162) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22181:2: rule__JvmParameterizedTypeReference__Group_1_4_2__0
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22087:2: rule__JvmParameterizedTypeReference__Group_1_4_2__0
                     {
-                    pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__0_in_rule__JvmParameterizedTypeReference__Group_1_4__2__Impl44676);
+                    pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__0_in_rule__JvmParameterizedTypeReference__Group_1_4__2__Impl44490);
                     rule__JvmParameterizedTypeReference__Group_1_4_2__0();
 
                     state._fsp--;
@@ -63424,16 +63161,16 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4__2__Impl() thro
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22197:1: rule__JvmParameterizedTypeReference__Group_1_4_0__0 : rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22103:1: rule__JvmParameterizedTypeReference__Group_1_4_0__0 : rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22201:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22202:2: rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22107:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22108:2: rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_0__044713);
+            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_0__044527);
             rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl();
 
             state._fsp--;
@@ -63457,25 +63194,25 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_0__0() throws R
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22208:1: rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22114:1: rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22212:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22213:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22118:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22119:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22213:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22214:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22119:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22120:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup_1_4_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22215:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22215:2: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22121:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22121:2: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0_0__0_in_rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl44740);
+            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0_0__0_in_rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl44554);
             rule__JvmParameterizedTypeReference__Group_1_4_0_0__0();
 
             state._fsp--;
@@ -63508,21 +63245,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl() th
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22227:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 : rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_0_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22133:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 : rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_0_0__1 ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22231:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22232:2: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_0_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22137:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_0_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22138:2: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_0_0__1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_0_0__044772);
+            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_0_0__044586);
             rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0_0__1_in_rule__JvmParameterizedTypeReference__Group_1_4_0_0__044775);
+            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0_0__1_in_rule__JvmParameterizedTypeReference__Group_1_4_0_0__044589);
             rule__JvmParameterizedTypeReference__Group_1_4_0_0__1();
 
             state._fsp--;
@@ -63546,23 +63283,23 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_0_0__0() throws
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22239:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22145:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl : ( () ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22243:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22244:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22149:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22150:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22244:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22245:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22150:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22151:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getJvmInnerTypeReferenceOuterAction_1_4_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22246:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22248:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22152:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22154:1: 
             {
             }
 
@@ -63587,16 +63324,16 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl()
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22258:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__1 : rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22164:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__1 : rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22262:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22263:2: rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22168:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22169:2: rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_0_0__144833);
+            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_0_0__144647);
             rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl();
 
             state._fsp--;
@@ -63620,22 +63357,22 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_0_0__1() throws
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22269:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl : ( '.' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22175:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl : ( '.' ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22273:1: ( ( '.' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22274:1: ( '.' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22179:1: ( ( '.' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22180:1: ( '.' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22274:1: ( '.' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22275:1: '.'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22180:1: ( '.' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22181:1: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getFullStopKeyword_1_4_0_0_1()); 
             }
-            match(input,63,FOLLOW_63_in_rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl44861); if (state.failed) return ;
+            match(input,63,FOLLOW_63_in_rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl44675); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmParameterizedTypeReferenceAccess().getFullStopKeyword_1_4_0_0_1()); 
             }
@@ -63661,21 +63398,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl()
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22292:1: rule__JvmParameterizedTypeReference__Group_1_4_2__0 : rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22198:1: rule__JvmParameterizedTypeReference__Group_1_4_2__0 : rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__1 ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22296:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22297:2: rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22202:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22203:2: rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2__044896);
+            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2__044710);
             rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__1_in_rule__JvmParameterizedTypeReference__Group_1_4_2__044899);
+            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__1_in_rule__JvmParameterizedTypeReference__Group_1_4_2__044713);
             rule__JvmParameterizedTypeReference__Group_1_4_2__1();
 
             state._fsp--;
@@ -63699,25 +63436,25 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2__0() throws R
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22304:1: rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl : ( ( '<' ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22210:1: rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl : ( ( '<' ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22308:1: ( ( ( '<' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22309:1: ( ( '<' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22214:1: ( ( ( '<' ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22215:1: ( ( '<' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22309:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22310:1: ( '<' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22215:1: ( ( '<' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22216:1: ( '<' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getLessThanSignKeyword_1_4_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22311:1: ( '<' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22312:2: '<'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22217:1: ( '<' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22218:2: '<'
             {
-            match(input,47,FOLLOW_47_in_rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl44928); if (state.failed) return ;
+            match(input,47,FOLLOW_47_in_rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl44742); if (state.failed) return ;
 
             }
 
@@ -63746,21 +63483,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl() th
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22323:1: rule__JvmParameterizedTypeReference__Group_1_4_2__1 : rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22229:1: rule__JvmParameterizedTypeReference__Group_1_4_2__1 : rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__2 ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22327:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22328:2: rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22233:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22234:2: rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__2
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2__144960);
+            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2__144774);
             rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__2_in_rule__JvmParameterizedTypeReference__Group_1_4_2__144963);
+            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__2_in_rule__JvmParameterizedTypeReference__Group_1_4_2__144777);
             rule__JvmParameterizedTypeReference__Group_1_4_2__2();
 
             state._fsp--;
@@ -63784,25 +63521,25 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2__1() throws R
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22335:1: rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22241:1: rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22339:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22340:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22245:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22246:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22340:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22341:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22246:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22247:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsAssignment_1_4_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22342:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22342:2: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22248:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22248:2: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1_in_rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl44990);
+            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1_in_rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl44804);
             rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1();
 
             state._fsp--;
@@ -63835,21 +63572,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl() th
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22352:1: rule__JvmParameterizedTypeReference__Group_1_4_2__2 : rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__3 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22258:1: rule__JvmParameterizedTypeReference__Group_1_4_2__2 : rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__3 ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22356:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22357:2: rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__3
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22262:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__3 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22263:2: rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__3
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2__245020);
+            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2__244834);
             rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__3_in_rule__JvmParameterizedTypeReference__Group_1_4_2__245023);
+            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__3_in_rule__JvmParameterizedTypeReference__Group_1_4_2__244837);
             rule__JvmParameterizedTypeReference__Group_1_4_2__3();
 
             state._fsp--;
@@ -63873,37 +63610,37 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2__2() throws R
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22364:1: rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22270:1: rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22368:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22369:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22274:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22275:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22369:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22370:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22275:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22276:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup_1_4_2_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22371:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )*
-            loop164:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22277:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )*
+            loop163:
             do {
-                int alt164=2;
-                int LA164_0 = input.LA(1);
+                int alt163=2;
+                int LA163_0 = input.LA(1);
 
-                if ( (LA164_0==74) ) {
-                    alt164=1;
+                if ( (LA163_0==74) ) {
+                    alt163=1;
                 }
 
 
-                switch (alt164) {
+                switch (alt163) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22371:2: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22277:2: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2_2__0_in_rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl45050);
+            	    pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2_2__0_in_rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl44864);
             	    rule__JvmParameterizedTypeReference__Group_1_4_2_2__0();
 
             	    state._fsp--;
@@ -63913,7 +63650,7 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl() th
             	    break;
 
             	default :
-            	    break loop164;
+            	    break loop163;
                 }
             } while (true);
 
@@ -63942,16 +63679,16 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl() th
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22381:1: rule__JvmParameterizedTypeReference__Group_1_4_2__3 : rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22287:1: rule__JvmParameterizedTypeReference__Group_1_4_2__3 : rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22385:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22386:2: rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22291:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22292:2: rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2__345081);
+            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2__344895);
             rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl();
 
             state._fsp--;
@@ -63975,22 +63712,22 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2__3() throws R
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22392:1: rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl : ( '>' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22298:1: rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl : ( '>' ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22396:1: ( ( '>' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22397:1: ( '>' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22302:1: ( ( '>' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22303:1: ( '>' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22397:1: ( '>' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22398:1: '>'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22303:1: ( '>' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22304:1: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGreaterThanSignKeyword_1_4_2_3()); 
             }
-            match(input,46,FOLLOW_46_in_rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl45109); if (state.failed) return ;
+            match(input,46,FOLLOW_46_in_rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl44923); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGreaterThanSignKeyword_1_4_2_3()); 
             }
@@ -64016,21 +63753,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl() th
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2_2__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22419:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 : rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2_2__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22325:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 : rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2_2__1 ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22423:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2_2__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22424:2: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2_2__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22329:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2_2__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22330:2: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2_2__1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__045148);
+            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__044962);
             rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2_2__1_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__045151);
+            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2_2__1_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__044965);
             rule__JvmParameterizedTypeReference__Group_1_4_2_2__1();
 
             state._fsp--;
@@ -64054,22 +63791,22 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2_2__0() throws
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22431:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl : ( ',' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22337:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl : ( ',' ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22435:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22436:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22341:1: ( ( ',' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22342:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22436:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22437:1: ','
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22342:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22343:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getCommaKeyword_1_4_2_2_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl45179); if (state.failed) return ;
+            match(input,74,FOLLOW_74_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl44993); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmParameterizedTypeReferenceAccess().getCommaKeyword_1_4_2_2_0()); 
             }
@@ -64095,16 +63832,16 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl()
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2_2__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22450:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__1 : rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22356:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__1 : rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22454:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22455:2: rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22360:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22361:2: rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__145210);
+            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__145024);
             rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl();
 
             state._fsp--;
@@ -64128,25 +63865,25 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2_2__1() throws
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22461:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22367:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22465:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22466:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22371:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22372:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22466:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22467:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22372:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22373:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsAssignment_1_4_2_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22468:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22468:2: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22374:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22374:2: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl45237);
+            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl45051);
             rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1();
 
             state._fsp--;
@@ -64179,21 +63916,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl()
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22482:1: rule__JvmWildcardTypeReference__Group__0 : rule__JvmWildcardTypeReference__Group__0__Impl rule__JvmWildcardTypeReference__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22388:1: rule__JvmWildcardTypeReference__Group__0 : rule__JvmWildcardTypeReference__Group__0__Impl rule__JvmWildcardTypeReference__Group__1 ;
     public final void rule__JvmWildcardTypeReference__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22486:1: ( rule__JvmWildcardTypeReference__Group__0__Impl rule__JvmWildcardTypeReference__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22487:2: rule__JvmWildcardTypeReference__Group__0__Impl rule__JvmWildcardTypeReference__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22392:1: ( rule__JvmWildcardTypeReference__Group__0__Impl rule__JvmWildcardTypeReference__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22393:2: rule__JvmWildcardTypeReference__Group__0__Impl rule__JvmWildcardTypeReference__Group__1
             {
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group__0__Impl_in_rule__JvmWildcardTypeReference__Group__045271);
+            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group__0__Impl_in_rule__JvmWildcardTypeReference__Group__045085);
             rule__JvmWildcardTypeReference__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group__1_in_rule__JvmWildcardTypeReference__Group__045274);
+            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group__1_in_rule__JvmWildcardTypeReference__Group__045088);
             rule__JvmWildcardTypeReference__Group__1();
 
             state._fsp--;
@@ -64217,23 +63954,23 @@ public final void rule__JvmWildcardTypeReference__Group__0() throws RecognitionE
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22494:1: rule__JvmWildcardTypeReference__Group__0__Impl : ( () ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22400:1: rule__JvmWildcardTypeReference__Group__0__Impl : ( () ) ;
     public final void rule__JvmWildcardTypeReference__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22498:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22499:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22404:1: ( ( () ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22405:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22499:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22500:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22405:1: ( () )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22406:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getJvmWildcardTypeReferenceAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22501:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22503:1: 
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22407:1: ()
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22409:1: 
             {
             }
 
@@ -64258,21 +63995,21 @@ public final void rule__JvmWildcardTypeReference__Group__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22513:1: rule__JvmWildcardTypeReference__Group__1 : rule__JvmWildcardTypeReference__Group__1__Impl rule__JvmWildcardTypeReference__Group__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22419:1: rule__JvmWildcardTypeReference__Group__1 : rule__JvmWildcardTypeReference__Group__1__Impl rule__JvmWildcardTypeReference__Group__2 ;
     public final void rule__JvmWildcardTypeReference__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22517:1: ( rule__JvmWildcardTypeReference__Group__1__Impl rule__JvmWildcardTypeReference__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22518:2: rule__JvmWildcardTypeReference__Group__1__Impl rule__JvmWildcardTypeReference__Group__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22423:1: ( rule__JvmWildcardTypeReference__Group__1__Impl rule__JvmWildcardTypeReference__Group__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22424:2: rule__JvmWildcardTypeReference__Group__1__Impl rule__JvmWildcardTypeReference__Group__2
             {
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group__1__Impl_in_rule__JvmWildcardTypeReference__Group__145332);
+            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group__1__Impl_in_rule__JvmWildcardTypeReference__Group__145146);
             rule__JvmWildcardTypeReference__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group__2_in_rule__JvmWildcardTypeReference__Group__145335);
+            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group__2_in_rule__JvmWildcardTypeReference__Group__145149);
             rule__JvmWildcardTypeReference__Group__2();
 
             state._fsp--;
@@ -64296,22 +64033,22 @@ public final void rule__JvmWildcardTypeReference__Group__1() throws RecognitionE
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22525:1: rule__JvmWildcardTypeReference__Group__1__Impl : ( '?' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22431:1: rule__JvmWildcardTypeReference__Group__1__Impl : ( '?' ) ;
     public final void rule__JvmWildcardTypeReference__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22529:1: ( ( '?' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22530:1: ( '?' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22435:1: ( ( '?' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22436:1: ( '?' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22530:1: ( '?' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22531:1: '?'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22436:1: ( '?' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22437:1: '?'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getQuestionMarkKeyword_1()); 
             }
-            match(input,101,FOLLOW_101_in_rule__JvmWildcardTypeReference__Group__1__Impl45363); if (state.failed) return ;
+            match(input,101,FOLLOW_101_in_rule__JvmWildcardTypeReference__Group__1__Impl45177); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmWildcardTypeReferenceAccess().getQuestionMarkKeyword_1()); 
             }
@@ -64337,16 +64074,16 @@ public final void rule__JvmWildcardTypeReference__Group__1__Impl() throws Recogn
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22544:1: rule__JvmWildcardTypeReference__Group__2 : rule__JvmWildcardTypeReference__Group__2__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22450:1: rule__JvmWildcardTypeReference__Group__2 : rule__JvmWildcardTypeReference__Group__2__Impl ;
     public final void rule__JvmWildcardTypeReference__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22548:1: ( rule__JvmWildcardTypeReference__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22549:2: rule__JvmWildcardTypeReference__Group__2__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22454:1: ( rule__JvmWildcardTypeReference__Group__2__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22455:2: rule__JvmWildcardTypeReference__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group__2__Impl_in_rule__JvmWildcardTypeReference__Group__245394);
+            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group__2__Impl_in_rule__JvmWildcardTypeReference__Group__245208);
             rule__JvmWildcardTypeReference__Group__2__Impl();
 
             state._fsp--;
@@ -64370,33 +64107,33 @@ public final void rule__JvmWildcardTypeReference__Group__2() throws RecognitionE
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22555:1: rule__JvmWildcardTypeReference__Group__2__Impl : ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22461:1: rule__JvmWildcardTypeReference__Group__2__Impl : ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? ) ;
     public final void rule__JvmWildcardTypeReference__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22559:1: ( ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22560:1: ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22465:1: ( ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22466:1: ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22560:1: ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22561:1: ( rule__JvmWildcardTypeReference__Alternatives_2 )?
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22466:1: ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22467:1: ( rule__JvmWildcardTypeReference__Alternatives_2 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getAlternatives_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22562:1: ( rule__JvmWildcardTypeReference__Alternatives_2 )?
-            int alt165=2;
-            int LA165_0 = input.LA(1);
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22468:1: ( rule__JvmWildcardTypeReference__Alternatives_2 )?
+            int alt164=2;
+            int LA164_0 = input.LA(1);
 
-            if ( (LA165_0==16||LA165_0==65) ) {
-                alt165=1;
+            if ( (LA164_0==16||LA164_0==65) ) {
+                alt164=1;
             }
-            switch (alt165) {
+            switch (alt164) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22562:2: rule__JvmWildcardTypeReference__Alternatives_2
+                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22468:2: rule__JvmWildcardTypeReference__Alternatives_2
                     {
-                    pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Alternatives_2_in_rule__JvmWildcardTypeReference__Group__2__Impl45421);
+                    pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Alternatives_2_in_rule__JvmWildcardTypeReference__Group__2__Impl45235);
                     rule__JvmWildcardTypeReference__Alternatives_2();
 
                     state._fsp--;
@@ -64432,21 +64169,21 @@ public final void rule__JvmWildcardTypeReference__Group__2__Impl() throws Recogn
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22578:1: rule__JvmWildcardTypeReference__Group_2_0__0 : rule__JvmWildcardTypeReference__Group_2_0__0__Impl rule__JvmWildcardTypeReference__Group_2_0__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22484:1: rule__JvmWildcardTypeReference__Group_2_0__0 : rule__JvmWildcardTypeReference__Group_2_0__0__Impl rule__JvmWildcardTypeReference__Group_2_0__1 ;
     public final void rule__JvmWildcardTypeReference__Group_2_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22582:1: ( rule__JvmWildcardTypeReference__Group_2_0__0__Impl rule__JvmWildcardTypeReference__Group_2_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22583:2: rule__JvmWildcardTypeReference__Group_2_0__0__Impl rule__JvmWildcardTypeReference__Group_2_0__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22488:1: ( rule__JvmWildcardTypeReference__Group_2_0__0__Impl rule__JvmWildcardTypeReference__Group_2_0__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22489:2: rule__JvmWildcardTypeReference__Group_2_0__0__Impl rule__JvmWildcardTypeReference__Group_2_0__1
             {
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group_2_0__0__Impl_in_rule__JvmWildcardTypeReference__Group_2_0__045458);
+            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group_2_0__0__Impl_in_rule__JvmWildcardTypeReference__Group_2_0__045272);
             rule__JvmWildcardTypeReference__Group_2_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group_2_0__1_in_rule__JvmWildcardTypeReference__Group_2_0__045461);
+            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group_2_0__1_in_rule__JvmWildcardTypeReference__Group_2_0__045275);
             rule__JvmWildcardTypeReference__Group_2_0__1();
 
             state._fsp--;
@@ -64470,25 +64207,25 @@ public final void rule__JvmWildcardTypeReference__Group_2_0__0() throws Recognit
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22590:1: rule__JvmWildcardTypeReference__Group_2_0__0__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22496:1: rule__JvmWildcardTypeReference__Group_2_0__0__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) ) ;
     public final void rule__JvmWildcardTypeReference__Group_2_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22594:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22595:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22500:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22501:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22595:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22596:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22501:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22502:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsAssignment_2_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22597:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22597:2: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22503:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22503:2: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0
             {
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0_in_rule__JvmWildcardTypeReference__Group_2_0__0__Impl45488);
+            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0_in_rule__JvmWildcardTypeReference__Group_2_0__0__Impl45302);
             rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0();
 
             state._fsp--;
@@ -64521,16 +64258,16 @@ public final void rule__JvmWildcardTypeReference__Group_2_0__0__Impl() throws Re
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22607:1: rule__JvmWildcardTypeReference__Group_2_0__1 : rule__JvmWildcardTypeReference__Group_2_0__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22513:1: rule__JvmWildcardTypeReference__Group_2_0__1 : rule__JvmWildcardTypeReference__Group_2_0__1__Impl ;
     public final void rule__JvmWildcardTypeReference__Group_2_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22611:1: ( rule__JvmWildcardTypeReference__Group_2_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22612:2: rule__JvmWildcardTypeReference__Group_2_0__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22517:1: ( rule__JvmWildcardTypeReference__Group_2_0__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22518:2: rule__JvmWildcardTypeReference__Group_2_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group_2_0__1__Impl_in_rule__JvmWildcardTypeReference__Group_2_0__145518);
+            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group_2_0__1__Impl_in_rule__JvmWildcardTypeReference__Group_2_0__145332);
             rule__JvmWildcardTypeReference__Group_2_0__1__Impl();
 
             state._fsp--;
@@ -64554,37 +64291,37 @@ public final void rule__JvmWildcardTypeReference__Group_2_0__1() throws Recognit
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22618:1: rule__JvmWildcardTypeReference__Group_2_0__1__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22524:1: rule__JvmWildcardTypeReference__Group_2_0__1__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* ) ;
     public final void rule__JvmWildcardTypeReference__Group_2_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22622:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22623:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22528:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22529:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22623:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22624:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22529:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22530:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsAssignment_2_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22625:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )*
-            loop166:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22531:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )*
+            loop165:
             do {
-                int alt166=2;
-                int LA166_0 = input.LA(1);
+                int alt165=2;
+                int LA165_0 = input.LA(1);
 
-                if ( (LA166_0==102) ) {
-                    alt166=1;
+                if ( (LA165_0==102) ) {
+                    alt165=1;
                 }
 
 
-                switch (alt166) {
+                switch (alt165) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22625:2: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22531:2: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1
             	    {
-            	    pushFollow(FOLLOW_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1_in_rule__JvmWildcardTypeReference__Group_2_0__1__Impl45545);
+            	    pushFollow(FOLLOW_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1_in_rule__JvmWildcardTypeReference__Group_2_0__1__Impl45359);
             	    rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1();
 
             	    state._fsp--;
@@ -64594,7 +64331,7 @@ public final void rule__JvmWildcardTypeReference__Group_2_0__1__Impl() throws Re
             	    break;
 
             	default :
-            	    break loop166;
+            	    break loop165;
                 }
             } while (true);
 
@@ -64623,21 +64360,21 @@ public final void rule__JvmWildcardTypeReference__Group_2_0__1__Impl() throws Re
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22639:1: rule__JvmWildcardTypeReference__Group_2_1__0 : rule__JvmWildcardTypeReference__Group_2_1__0__Impl rule__JvmWildcardTypeReference__Group_2_1__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22545:1: rule__JvmWildcardTypeReference__Group_2_1__0 : rule__JvmWildcardTypeReference__Group_2_1__0__Impl rule__JvmWildcardTypeReference__Group_2_1__1 ;
     public final void rule__JvmWildcardTypeReference__Group_2_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22643:1: ( rule__JvmWildcardTypeReference__Group_2_1__0__Impl rule__JvmWildcardTypeReference__Group_2_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22644:2: rule__JvmWildcardTypeReference__Group_2_1__0__Impl rule__JvmWildcardTypeReference__Group_2_1__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22549:1: ( rule__JvmWildcardTypeReference__Group_2_1__0__Impl rule__JvmWildcardTypeReference__Group_2_1__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22550:2: rule__JvmWildcardTypeReference__Group_2_1__0__Impl rule__JvmWildcardTypeReference__Group_2_1__1
             {
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group_2_1__0__Impl_in_rule__JvmWildcardTypeReference__Group_2_1__045580);
+            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group_2_1__0__Impl_in_rule__JvmWildcardTypeReference__Group_2_1__045394);
             rule__JvmWildcardTypeReference__Group_2_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group_2_1__1_in_rule__JvmWildcardTypeReference__Group_2_1__045583);
+            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group_2_1__1_in_rule__JvmWildcardTypeReference__Group_2_1__045397);
             rule__JvmWildcardTypeReference__Group_2_1__1();
 
             state._fsp--;
@@ -64661,25 +64398,25 @@ public final void rule__JvmWildcardTypeReference__Group_2_1__0() throws Recognit
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22651:1: rule__JvmWildcardTypeReference__Group_2_1__0__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22557:1: rule__JvmWildcardTypeReference__Group_2_1__0__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) ) ;
     public final void rule__JvmWildcardTypeReference__Group_2_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22655:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22656:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22561:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22562:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22656:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22657:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22562:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22563:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsAssignment_2_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22658:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22658:2: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22564:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22564:2: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0
             {
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0_in_rule__JvmWildcardTypeReference__Group_2_1__0__Impl45610);
+            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0_in_rule__JvmWildcardTypeReference__Group_2_1__0__Impl45424);
             rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0();
 
             state._fsp--;
@@ -64712,16 +64449,16 @@ public final void rule__JvmWildcardTypeReference__Group_2_1__0__Impl() throws Re
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22668:1: rule__JvmWildcardTypeReference__Group_2_1__1 : rule__JvmWildcardTypeReference__Group_2_1__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22574:1: rule__JvmWildcardTypeReference__Group_2_1__1 : rule__JvmWildcardTypeReference__Group_2_1__1__Impl ;
     public final void rule__JvmWildcardTypeReference__Group_2_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22672:1: ( rule__JvmWildcardTypeReference__Group_2_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22673:2: rule__JvmWildcardTypeReference__Group_2_1__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22578:1: ( rule__JvmWildcardTypeReference__Group_2_1__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22579:2: rule__JvmWildcardTypeReference__Group_2_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group_2_1__1__Impl_in_rule__JvmWildcardTypeReference__Group_2_1__145640);
+            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group_2_1__1__Impl_in_rule__JvmWildcardTypeReference__Group_2_1__145454);
             rule__JvmWildcardTypeReference__Group_2_1__1__Impl();
 
             state._fsp--;
@@ -64745,37 +64482,37 @@ public final void rule__JvmWildcardTypeReference__Group_2_1__1() throws Recognit
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22679:1: rule__JvmWildcardTypeReference__Group_2_1__1__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22585:1: rule__JvmWildcardTypeReference__Group_2_1__1__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* ) ;
     public final void rule__JvmWildcardTypeReference__Group_2_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22683:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22684:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22589:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22590:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22684:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22685:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )*
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22590:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22591:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsAssignment_2_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22686:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )*
-            loop167:
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22592:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )*
+            loop166:
             do {
-                int alt167=2;
-                int LA167_0 = input.LA(1);
+                int alt166=2;
+                int LA166_0 = input.LA(1);
 
-                if ( (LA167_0==102) ) {
-                    alt167=1;
+                if ( (LA166_0==102) ) {
+                    alt166=1;
                 }
 
 
-                switch (alt167) {
+                switch (alt166) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22686:2: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1
+            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22592:2: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1
             	    {
-            	    pushFollow(FOLLOW_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1_in_rule__JvmWildcardTypeReference__Group_2_1__1__Impl45667);
+            	    pushFollow(FOLLOW_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1_in_rule__JvmWildcardTypeReference__Group_2_1__1__Impl45481);
             	    rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1();
 
             	    state._fsp--;
@@ -64785,7 +64522,7 @@ public final void rule__JvmWildcardTypeReference__Group_2_1__1__Impl() throws Re
             	    break;
 
             	default :
-            	    break loop167;
+            	    break loop166;
                 }
             } while (true);
 
@@ -64814,21 +64551,21 @@ public final void rule__JvmWildcardTypeReference__Group_2_1__1__Impl() throws Re
 
 
     // $ANTLR start "rule__JvmUpperBound__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22700:1: rule__JvmUpperBound__Group__0 : rule__JvmUpperBound__Group__0__Impl rule__JvmUpperBound__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22606:1: rule__JvmUpperBound__Group__0 : rule__JvmUpperBound__Group__0__Impl rule__JvmUpperBound__Group__1 ;
     public final void rule__JvmUpperBound__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22704:1: ( rule__JvmUpperBound__Group__0__Impl rule__JvmUpperBound__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22705:2: rule__JvmUpperBound__Group__0__Impl rule__JvmUpperBound__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22610:1: ( rule__JvmUpperBound__Group__0__Impl rule__JvmUpperBound__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22611:2: rule__JvmUpperBound__Group__0__Impl rule__JvmUpperBound__Group__1
             {
-            pushFollow(FOLLOW_rule__JvmUpperBound__Group__0__Impl_in_rule__JvmUpperBound__Group__045702);
+            pushFollow(FOLLOW_rule__JvmUpperBound__Group__0__Impl_in_rule__JvmUpperBound__Group__045516);
             rule__JvmUpperBound__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmUpperBound__Group__1_in_rule__JvmUpperBound__Group__045705);
+            pushFollow(FOLLOW_rule__JvmUpperBound__Group__1_in_rule__JvmUpperBound__Group__045519);
             rule__JvmUpperBound__Group__1();
 
             state._fsp--;
@@ -64852,22 +64589,22 @@ public final void rule__JvmUpperBound__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__JvmUpperBound__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22712:1: rule__JvmUpperBound__Group__0__Impl : ( 'extends' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22618:1: rule__JvmUpperBound__Group__0__Impl : ( 'extends' ) ;
     public final void rule__JvmUpperBound__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22716:1: ( ( 'extends' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22717:1: ( 'extends' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22622:1: ( ( 'extends' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22623:1: ( 'extends' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22717:1: ( 'extends' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22718:1: 'extends'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22623:1: ( 'extends' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22624:1: 'extends'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAccess().getExtendsKeyword_0()); 
             }
-            match(input,16,FOLLOW_16_in_rule__JvmUpperBound__Group__0__Impl45733); if (state.failed) return ;
+            match(input,16,FOLLOW_16_in_rule__JvmUpperBound__Group__0__Impl45547); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmUpperBoundAccess().getExtendsKeyword_0()); 
             }
@@ -64893,16 +64630,16 @@ public final void rule__JvmUpperBound__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__JvmUpperBound__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22731:1: rule__JvmUpperBound__Group__1 : rule__JvmUpperBound__Group__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22637:1: rule__JvmUpperBound__Group__1 : rule__JvmUpperBound__Group__1__Impl ;
     public final void rule__JvmUpperBound__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22735:1: ( rule__JvmUpperBound__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22736:2: rule__JvmUpperBound__Group__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22641:1: ( rule__JvmUpperBound__Group__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22642:2: rule__JvmUpperBound__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmUpperBound__Group__1__Impl_in_rule__JvmUpperBound__Group__145764);
+            pushFollow(FOLLOW_rule__JvmUpperBound__Group__1__Impl_in_rule__JvmUpperBound__Group__145578);
             rule__JvmUpperBound__Group__1__Impl();
 
             state._fsp--;
@@ -64926,25 +64663,25 @@ public final void rule__JvmUpperBound__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__JvmUpperBound__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22742:1: rule__JvmUpperBound__Group__1__Impl : ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22648:1: rule__JvmUpperBound__Group__1__Impl : ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) ) ;
     public final void rule__JvmUpperBound__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22746:1: ( ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22747:1: ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22652:1: ( ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22653:1: ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22747:1: ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22748:1: ( rule__JvmUpperBound__TypeReferenceAssignment_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22653:1: ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22654:1: ( rule__JvmUpperBound__TypeReferenceAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAccess().getTypeReferenceAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22749:1: ( rule__JvmUpperBound__TypeReferenceAssignment_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22749:2: rule__JvmUpperBound__TypeReferenceAssignment_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22655:1: ( rule__JvmUpperBound__TypeReferenceAssignment_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22655:2: rule__JvmUpperBound__TypeReferenceAssignment_1
             {
-            pushFollow(FOLLOW_rule__JvmUpperBound__TypeReferenceAssignment_1_in_rule__JvmUpperBound__Group__1__Impl45791);
+            pushFollow(FOLLOW_rule__JvmUpperBound__TypeReferenceAssignment_1_in_rule__JvmUpperBound__Group__1__Impl45605);
             rule__JvmUpperBound__TypeReferenceAssignment_1();
 
             state._fsp--;
@@ -64977,21 +64714,21 @@ public final void rule__JvmUpperBound__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__JvmUpperBoundAnded__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22763:1: rule__JvmUpperBoundAnded__Group__0 : rule__JvmUpperBoundAnded__Group__0__Impl rule__JvmUpperBoundAnded__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22669:1: rule__JvmUpperBoundAnded__Group__0 : rule__JvmUpperBoundAnded__Group__0__Impl rule__JvmUpperBoundAnded__Group__1 ;
     public final void rule__JvmUpperBoundAnded__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22767:1: ( rule__JvmUpperBoundAnded__Group__0__Impl rule__JvmUpperBoundAnded__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22768:2: rule__JvmUpperBoundAnded__Group__0__Impl rule__JvmUpperBoundAnded__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22673:1: ( rule__JvmUpperBoundAnded__Group__0__Impl rule__JvmUpperBoundAnded__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22674:2: rule__JvmUpperBoundAnded__Group__0__Impl rule__JvmUpperBoundAnded__Group__1
             {
-            pushFollow(FOLLOW_rule__JvmUpperBoundAnded__Group__0__Impl_in_rule__JvmUpperBoundAnded__Group__045825);
+            pushFollow(FOLLOW_rule__JvmUpperBoundAnded__Group__0__Impl_in_rule__JvmUpperBoundAnded__Group__045639);
             rule__JvmUpperBoundAnded__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmUpperBoundAnded__Group__1_in_rule__JvmUpperBoundAnded__Group__045828);
+            pushFollow(FOLLOW_rule__JvmUpperBoundAnded__Group__1_in_rule__JvmUpperBoundAnded__Group__045642);
             rule__JvmUpperBoundAnded__Group__1();
 
             state._fsp--;
@@ -65015,22 +64752,22 @@ public final void rule__JvmUpperBoundAnded__Group__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__JvmUpperBoundAnded__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22775:1: rule__JvmUpperBoundAnded__Group__0__Impl : ( '&' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22681:1: rule__JvmUpperBoundAnded__Group__0__Impl : ( '&' ) ;
     public final void rule__JvmUpperBoundAnded__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22779:1: ( ( '&' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22780:1: ( '&' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22685:1: ( ( '&' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22686:1: ( '&' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22780:1: ( '&' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22781:1: '&'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22686:1: ( '&' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22687:1: '&'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAndedAccess().getAmpersandKeyword_0()); 
             }
-            match(input,102,FOLLOW_102_in_rule__JvmUpperBoundAnded__Group__0__Impl45856); if (state.failed) return ;
+            match(input,102,FOLLOW_102_in_rule__JvmUpperBoundAnded__Group__0__Impl45670); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmUpperBoundAndedAccess().getAmpersandKeyword_0()); 
             }
@@ -65056,16 +64793,16 @@ public final void rule__JvmUpperBoundAnded__Group__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__JvmUpperBoundAnded__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22794:1: rule__JvmUpperBoundAnded__Group__1 : rule__JvmUpperBoundAnded__Group__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22700:1: rule__JvmUpperBoundAnded__Group__1 : rule__JvmUpperBoundAnded__Group__1__Impl ;
     public final void rule__JvmUpperBoundAnded__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22798:1: ( rule__JvmUpperBoundAnded__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22799:2: rule__JvmUpperBoundAnded__Group__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22704:1: ( rule__JvmUpperBoundAnded__Group__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22705:2: rule__JvmUpperBoundAnded__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmUpperBoundAnded__Group__1__Impl_in_rule__JvmUpperBoundAnded__Group__145887);
+            pushFollow(FOLLOW_rule__JvmUpperBoundAnded__Group__1__Impl_in_rule__JvmUpperBoundAnded__Group__145701);
             rule__JvmUpperBoundAnded__Group__1__Impl();
 
             state._fsp--;
@@ -65089,25 +64826,25 @@ public final void rule__JvmUpperBoundAnded__Group__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__JvmUpperBoundAnded__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22805:1: rule__JvmUpperBoundAnded__Group__1__Impl : ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22711:1: rule__JvmUpperBoundAnded__Group__1__Impl : ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) ) ;
     public final void rule__JvmUpperBoundAnded__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22809:1: ( ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22810:1: ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22715:1: ( ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22716:1: ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22810:1: ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22811:1: ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22716:1: ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22717:1: ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAndedAccess().getTypeReferenceAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22812:1: ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22812:2: rule__JvmUpperBoundAnded__TypeReferenceAssignment_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22718:1: ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22718:2: rule__JvmUpperBoundAnded__TypeReferenceAssignment_1
             {
-            pushFollow(FOLLOW_rule__JvmUpperBoundAnded__TypeReferenceAssignment_1_in_rule__JvmUpperBoundAnded__Group__1__Impl45914);
+            pushFollow(FOLLOW_rule__JvmUpperBoundAnded__TypeReferenceAssignment_1_in_rule__JvmUpperBoundAnded__Group__1__Impl45728);
             rule__JvmUpperBoundAnded__TypeReferenceAssignment_1();
 
             state._fsp--;
@@ -65140,21 +64877,21 @@ public final void rule__JvmUpperBoundAnded__Group__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__JvmLowerBound__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22826:1: rule__JvmLowerBound__Group__0 : rule__JvmLowerBound__Group__0__Impl rule__JvmLowerBound__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22732:1: rule__JvmLowerBound__Group__0 : rule__JvmLowerBound__Group__0__Impl rule__JvmLowerBound__Group__1 ;
     public final void rule__JvmLowerBound__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22830:1: ( rule__JvmLowerBound__Group__0__Impl rule__JvmLowerBound__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22831:2: rule__JvmLowerBound__Group__0__Impl rule__JvmLowerBound__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22736:1: ( rule__JvmLowerBound__Group__0__Impl rule__JvmLowerBound__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22737:2: rule__JvmLowerBound__Group__0__Impl rule__JvmLowerBound__Group__1
             {
-            pushFollow(FOLLOW_rule__JvmLowerBound__Group__0__Impl_in_rule__JvmLowerBound__Group__045948);
+            pushFollow(FOLLOW_rule__JvmLowerBound__Group__0__Impl_in_rule__JvmLowerBound__Group__045762);
             rule__JvmLowerBound__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmLowerBound__Group__1_in_rule__JvmLowerBound__Group__045951);
+            pushFollow(FOLLOW_rule__JvmLowerBound__Group__1_in_rule__JvmLowerBound__Group__045765);
             rule__JvmLowerBound__Group__1();
 
             state._fsp--;
@@ -65178,22 +64915,22 @@ public final void rule__JvmLowerBound__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__JvmLowerBound__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22838:1: rule__JvmLowerBound__Group__0__Impl : ( 'super' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22744:1: rule__JvmLowerBound__Group__0__Impl : ( 'super' ) ;
     public final void rule__JvmLowerBound__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22842:1: ( ( 'super' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22843:1: ( 'super' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22748:1: ( ( 'super' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22749:1: ( 'super' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22843:1: ( 'super' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22844:1: 'super'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22749:1: ( 'super' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22750:1: 'super'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAccess().getSuperKeyword_0()); 
             }
-            match(input,65,FOLLOW_65_in_rule__JvmLowerBound__Group__0__Impl45979); if (state.failed) return ;
+            match(input,65,FOLLOW_65_in_rule__JvmLowerBound__Group__0__Impl45793); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmLowerBoundAccess().getSuperKeyword_0()); 
             }
@@ -65219,16 +64956,16 @@ public final void rule__JvmLowerBound__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__JvmLowerBound__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22857:1: rule__JvmLowerBound__Group__1 : rule__JvmLowerBound__Group__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22763:1: rule__JvmLowerBound__Group__1 : rule__JvmLowerBound__Group__1__Impl ;
     public final void rule__JvmLowerBound__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22861:1: ( rule__JvmLowerBound__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22862:2: rule__JvmLowerBound__Group__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22767:1: ( rule__JvmLowerBound__Group__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22768:2: rule__JvmLowerBound__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmLowerBound__Group__1__Impl_in_rule__JvmLowerBound__Group__146010);
+            pushFollow(FOLLOW_rule__JvmLowerBound__Group__1__Impl_in_rule__JvmLowerBound__Group__145824);
             rule__JvmLowerBound__Group__1__Impl();
 
             state._fsp--;
@@ -65252,25 +64989,25 @@ public final void rule__JvmLowerBound__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__JvmLowerBound__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22868:1: rule__JvmLowerBound__Group__1__Impl : ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22774:1: rule__JvmLowerBound__Group__1__Impl : ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) ) ;
     public final void rule__JvmLowerBound__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22872:1: ( ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22873:1: ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22778:1: ( ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22779:1: ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22873:1: ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22874:1: ( rule__JvmLowerBound__TypeReferenceAssignment_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22779:1: ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22780:1: ( rule__JvmLowerBound__TypeReferenceAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAccess().getTypeReferenceAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22875:1: ( rule__JvmLowerBound__TypeReferenceAssignment_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22875:2: rule__JvmLowerBound__TypeReferenceAssignment_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22781:1: ( rule__JvmLowerBound__TypeReferenceAssignment_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22781:2: rule__JvmLowerBound__TypeReferenceAssignment_1
             {
-            pushFollow(FOLLOW_rule__JvmLowerBound__TypeReferenceAssignment_1_in_rule__JvmLowerBound__Group__1__Impl46037);
+            pushFollow(FOLLOW_rule__JvmLowerBound__TypeReferenceAssignment_1_in_rule__JvmLowerBound__Group__1__Impl45851);
             rule__JvmLowerBound__TypeReferenceAssignment_1();
 
             state._fsp--;
@@ -65303,21 +65040,21 @@ public final void rule__JvmLowerBound__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__JvmLowerBoundAnded__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22889:1: rule__JvmLowerBoundAnded__Group__0 : rule__JvmLowerBoundAnded__Group__0__Impl rule__JvmLowerBoundAnded__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22795:1: rule__JvmLowerBoundAnded__Group__0 : rule__JvmLowerBoundAnded__Group__0__Impl rule__JvmLowerBoundAnded__Group__1 ;
     public final void rule__JvmLowerBoundAnded__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22893:1: ( rule__JvmLowerBoundAnded__Group__0__Impl rule__JvmLowerBoundAnded__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22894:2: rule__JvmLowerBoundAnded__Group__0__Impl rule__JvmLowerBoundAnded__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22799:1: ( rule__JvmLowerBoundAnded__Group__0__Impl rule__JvmLowerBoundAnded__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22800:2: rule__JvmLowerBoundAnded__Group__0__Impl rule__JvmLowerBoundAnded__Group__1
             {
-            pushFollow(FOLLOW_rule__JvmLowerBoundAnded__Group__0__Impl_in_rule__JvmLowerBoundAnded__Group__046071);
+            pushFollow(FOLLOW_rule__JvmLowerBoundAnded__Group__0__Impl_in_rule__JvmLowerBoundAnded__Group__045885);
             rule__JvmLowerBoundAnded__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmLowerBoundAnded__Group__1_in_rule__JvmLowerBoundAnded__Group__046074);
+            pushFollow(FOLLOW_rule__JvmLowerBoundAnded__Group__1_in_rule__JvmLowerBoundAnded__Group__045888);
             rule__JvmLowerBoundAnded__Group__1();
 
             state._fsp--;
@@ -65341,22 +65078,22 @@ public final void rule__JvmLowerBoundAnded__Group__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__JvmLowerBoundAnded__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22901:1: rule__JvmLowerBoundAnded__Group__0__Impl : ( '&' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22807:1: rule__JvmLowerBoundAnded__Group__0__Impl : ( '&' ) ;
     public final void rule__JvmLowerBoundAnded__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22905:1: ( ( '&' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22906:1: ( '&' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22811:1: ( ( '&' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22812:1: ( '&' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22906:1: ( '&' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22907:1: '&'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22812:1: ( '&' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22813:1: '&'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAndedAccess().getAmpersandKeyword_0()); 
             }
-            match(input,102,FOLLOW_102_in_rule__JvmLowerBoundAnded__Group__0__Impl46102); if (state.failed) return ;
+            match(input,102,FOLLOW_102_in_rule__JvmLowerBoundAnded__Group__0__Impl45916); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmLowerBoundAndedAccess().getAmpersandKeyword_0()); 
             }
@@ -65382,16 +65119,16 @@ public final void rule__JvmLowerBoundAnded__Group__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__JvmLowerBoundAnded__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22920:1: rule__JvmLowerBoundAnded__Group__1 : rule__JvmLowerBoundAnded__Group__1__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22826:1: rule__JvmLowerBoundAnded__Group__1 : rule__JvmLowerBoundAnded__Group__1__Impl ;
     public final void rule__JvmLowerBoundAnded__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22924:1: ( rule__JvmLowerBoundAnded__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22925:2: rule__JvmLowerBoundAnded__Group__1__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22830:1: ( rule__JvmLowerBoundAnded__Group__1__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22831:2: rule__JvmLowerBoundAnded__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmLowerBoundAnded__Group__1__Impl_in_rule__JvmLowerBoundAnded__Group__146133);
+            pushFollow(FOLLOW_rule__JvmLowerBoundAnded__Group__1__Impl_in_rule__JvmLowerBoundAnded__Group__145947);
             rule__JvmLowerBoundAnded__Group__1__Impl();
 
             state._fsp--;
@@ -65415,25 +65152,25 @@ public final void rule__JvmLowerBoundAnded__Group__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__JvmLowerBoundAnded__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22931:1: rule__JvmLowerBoundAnded__Group__1__Impl : ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22837:1: rule__JvmLowerBoundAnded__Group__1__Impl : ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) ) ;
     public final void rule__JvmLowerBoundAnded__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22935:1: ( ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22936:1: ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22841:1: ( ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22842:1: ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22936:1: ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22937:1: ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22842:1: ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22843:1: ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAndedAccess().getTypeReferenceAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22938:1: ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22938:2: rule__JvmLowerBoundAnded__TypeReferenceAssignment_1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22844:1: ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22844:2: rule__JvmLowerBoundAnded__TypeReferenceAssignment_1
             {
-            pushFollow(FOLLOW_rule__JvmLowerBoundAnded__TypeReferenceAssignment_1_in_rule__JvmLowerBoundAnded__Group__1__Impl46160);
+            pushFollow(FOLLOW_rule__JvmLowerBoundAnded__TypeReferenceAssignment_1_in_rule__JvmLowerBoundAnded__Group__1__Impl45974);
             rule__JvmLowerBoundAnded__TypeReferenceAssignment_1();
 
             state._fsp--;
@@ -65466,21 +65203,21 @@ public final void rule__JvmLowerBoundAnded__Group__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22954:1: rule__QualifiedNameWithWildcard__Group__0 : rule__QualifiedNameWithWildcard__Group__0__Impl rule__QualifiedNameWithWildcard__Group__1 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22860:1: rule__QualifiedNameWithWildcard__Group__0 : rule__QualifiedNameWithWildcard__Group__0__Impl rule__QualifiedNameWithWildcard__Group__1 ;
     public final void rule__QualifiedNameWithWildcard__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22958:1: ( rule__QualifiedNameWithWildcard__Group__0__Impl rule__QualifiedNameWithWildcard__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22959:2: rule__QualifiedNameWithWildcard__Group__0__Impl rule__QualifiedNameWithWildcard__Group__1
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22864:1: ( rule__QualifiedNameWithWildcard__Group__0__Impl rule__QualifiedNameWithWildcard__Group__1 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22865:2: rule__QualifiedNameWithWildcard__Group__0__Impl rule__QualifiedNameWithWildcard__Group__1
             {
-            pushFollow(FOLLOW_rule__QualifiedNameWithWildcard__Group__0__Impl_in_rule__QualifiedNameWithWildcard__Group__046196);
+            pushFollow(FOLLOW_rule__QualifiedNameWithWildcard__Group__0__Impl_in_rule__QualifiedNameWithWildcard__Group__046010);
             rule__QualifiedNameWithWildcard__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__QualifiedNameWithWildcard__Group__1_in_rule__QualifiedNameWithWildcard__Group__046199);
+            pushFollow(FOLLOW_rule__QualifiedNameWithWildcard__Group__1_in_rule__QualifiedNameWithWildcard__Group__046013);
             rule__QualifiedNameWithWildcard__Group__1();
 
             state._fsp--;
@@ -65504,22 +65241,22 @@ public final void rule__QualifiedNameWithWildcard__Group__0() throws Recognition
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22966:1: rule__QualifiedNameWithWildcard__Group__0__Impl : ( ruleQualifiedName ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22872:1: rule__QualifiedNameWithWildcard__Group__0__Impl : ( ruleQualifiedName ) ;
     public final void rule__QualifiedNameWithWildcard__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22970:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22971:1: ( ruleQualifiedName )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22876:1: ( ( ruleQualifiedName ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22877:1: ( ruleQualifiedName )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22971:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22972:1: ruleQualifiedName
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22877:1: ( ruleQualifiedName )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22878:1: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameWithWildcardAccess().getQualifiedNameParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_rule__QualifiedNameWithWildcard__Group__0__Impl46226);
+            pushFollow(FOLLOW_ruleQualifiedName_in_rule__QualifiedNameWithWildcard__Group__0__Impl46040);
             ruleQualifiedName();
 
             state._fsp--;
@@ -65549,21 +65286,21 @@ public final void rule__QualifiedNameWithWildcard__Group__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22983:1: rule__QualifiedNameWithWildcard__Group__1 : rule__QualifiedNameWithWildcard__Group__1__Impl rule__QualifiedNameWithWildcard__Group__2 ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22889:1: rule__QualifiedNameWithWildcard__Group__1 : rule__QualifiedNameWithWildcard__Group__1__Impl rule__QualifiedNameWithWildcard__Group__2 ;
     public final void rule__QualifiedNameWithWildcard__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22987:1: ( rule__QualifiedNameWithWildcard__Group__1__Impl rule__QualifiedNameWithWildcard__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22988:2: rule__QualifiedNameWithWildcard__Group__1__Impl rule__QualifiedNameWithWildcard__Group__2
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22893:1: ( rule__QualifiedNameWithWildcard__Group__1__Impl rule__QualifiedNameWithWildcard__Group__2 )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22894:2: rule__QualifiedNameWithWildcard__Group__1__Impl rule__QualifiedNameWithWildcard__Group__2
             {
-            pushFollow(FOLLOW_rule__QualifiedNameWithWildcard__Group__1__Impl_in_rule__QualifiedNameWithWildcard__Group__146255);
+            pushFollow(FOLLOW_rule__QualifiedNameWithWildcard__Group__1__Impl_in_rule__QualifiedNameWithWildcard__Group__146069);
             rule__QualifiedNameWithWildcard__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__QualifiedNameWithWildcard__Group__2_in_rule__QualifiedNameWithWildcard__Group__146258);
+            pushFollow(FOLLOW_rule__QualifiedNameWithWildcard__Group__2_in_rule__QualifiedNameWithWildcard__Group__146072);
             rule__QualifiedNameWithWildcard__Group__2();
 
             state._fsp--;
@@ -65587,22 +65324,22 @@ public final void rule__QualifiedNameWithWildcard__Group__1() throws Recognition
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22995:1: rule__QualifiedNameWithWildcard__Group__1__Impl : ( '.' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22901:1: rule__QualifiedNameWithWildcard__Group__1__Impl : ( '.' ) ;
     public final void rule__QualifiedNameWithWildcard__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22999:1: ( ( '.' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23000:1: ( '.' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22905:1: ( ( '.' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22906:1: ( '.' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23000:1: ( '.' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23001:1: '.'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22906:1: ( '.' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22907:1: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameWithWildcardAccess().getFullStopKeyword_1()); 
             }
-            match(input,63,FOLLOW_63_in_rule__QualifiedNameWithWildcard__Group__1__Impl46286); if (state.failed) return ;
+            match(input,63,FOLLOW_63_in_rule__QualifiedNameWithWildcard__Group__1__Impl46100); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getQualifiedNameWithWildcardAccess().getFullStopKeyword_1()); 
             }
@@ -65628,16 +65365,16 @@ public final void rule__QualifiedNameWithWildcard__Group__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23014:1: rule__QualifiedNameWithWildcard__Group__2 : rule__QualifiedNameWithWildcard__Group__2__Impl ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22920:1: rule__QualifiedNameWithWildcard__Group__2 : rule__QualifiedNameWithWildcard__Group__2__Impl ;
     public final void rule__QualifiedNameWithWildcard__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23018:1: ( rule__QualifiedNameWithWildcard__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23019:2: rule__QualifiedNameWithWildcard__Group__2__Impl
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22924:1: ( rule__QualifiedNameWithWildcard__Group__2__Impl )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22925:2: rule__QualifiedNameWithWildcard__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__QualifiedNameWithWildcard__Group__2__Impl_in_rule__QualifiedNameWithWildcard__Group__246317);
+            pushFollow(FOLLOW_rule__QualifiedNameWithWildcard__Group__2__Impl_in_rule__QualifiedNameWithWildcard__Group__246131);
             rule__QualifiedNameWithWildcard__Group__2__Impl();
 
             state._fsp--;
@@ -65661,22 +65398,22 @@ public final void rule__QualifiedNameWithWildcard__Group__2() throws Recognition
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23025:1: rule__QualifiedNameWithWildcard__Group__2__Impl : ( '*' ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22931:1: rule__QualifiedNameWithWildcard__Group__2__Impl : ( '*' ) ;
     public final void rule__QualifiedNameWithWildcard__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23029:1: ( ( '*' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23030:1: ( '*' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22935:1: ( ( '*' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22936:1: ( '*' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23030:1: ( '*' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23031:1: '*'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22936:1: ( '*' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22937:1: '*'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameWithWildcardAccess().getAsteriskKeyword_2()); 
             }
-            match(input,56,FOLLOW_56_in_rule__QualifiedNameWithWildcard__Group__2__Impl46345); if (state.failed) return ;
+            match(input,56,FOLLOW_56_in_rule__QualifiedNameWithWildcard__Group__2__Impl46159); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getQualifiedNameWithWildcardAccess().getAsteriskKeyword_2()); 
             }
@@ -65702,22 +65439,22 @@ public final void rule__QualifiedNameWithWildcard__Group__2__Impl() throws Recog
 
 
     // $ANTLR start "rule__CheckCatalog__PackageNameAssignment_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23052:1: rule__CheckCatalog__PackageNameAssignment_2 : ( ruleQualifiedName ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22958:1: rule__CheckCatalog__PackageNameAssignment_2 : ( ruleQualifiedName ) ;
     public final void rule__CheckCatalog__PackageNameAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23056:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23057:1: ( ruleQualifiedName )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22962:1: ( ( ruleQualifiedName ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22963:1: ( ruleQualifiedName )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23057:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23058:1: ruleQualifiedName
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22963:1: ( ruleQualifiedName )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22964:1: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckCatalogAccess().getPackageNameQualifiedNameParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_rule__CheckCatalog__PackageNameAssignment_246388);
+            pushFollow(FOLLOW_ruleQualifiedName_in_rule__CheckCatalog__PackageNameAssignment_246202);
             ruleQualifiedName();
 
             state._fsp--;
@@ -65747,22 +65484,22 @@ public final void rule__CheckCatalog__PackageNameAssignment_2() throws Recogniti
 
 
     // $ANTLR start "rule__CheckCatalog__ImportsAssignment_3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23067:1: rule__CheckCatalog__ImportsAssignment_3 : ( ruleXImportSection ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22973:1: rule__CheckCatalog__ImportsAssignment_3 : ( ruleXImportSection ) ;
     public final void rule__CheckCatalog__ImportsAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23071:1: ( ( ruleXImportSection ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23072:1: ( ruleXImportSection )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22977:1: ( ( ruleXImportSection ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22978:1: ( ruleXImportSection )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23072:1: ( ruleXImportSection )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23073:1: ruleXImportSection
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22978:1: ( ruleXImportSection )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22979:1: ruleXImportSection
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckCatalogAccess().getImportsXImportSectionParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleXImportSection_in_rule__CheckCatalog__ImportsAssignment_346419);
+            pushFollow(FOLLOW_ruleXImportSection_in_rule__CheckCatalog__ImportsAssignment_346233);
             ruleXImportSection();
 
             state._fsp--;
@@ -65792,28 +65529,28 @@ public final void rule__CheckCatalog__ImportsAssignment_3() throws RecognitionEx
 
 
     // $ANTLR start "rule__CheckCatalog__FinalAssignment_4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23082:1: rule__CheckCatalog__FinalAssignment_4 : ( ( 'final' ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22988:1: rule__CheckCatalog__FinalAssignment_4 : ( ( 'final' ) ) ;
     public final void rule__CheckCatalog__FinalAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23086:1: ( ( ( 'final' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23087:1: ( ( 'final' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22992:1: ( ( ( 'final' ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22993:1: ( ( 'final' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23087:1: ( ( 'final' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23088:1: ( 'final' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22993:1: ( ( 'final' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22994:1: ( 'final' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckCatalogAccess().getFinalFinalKeyword_4_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23089:1: ( 'final' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23090:1: 'final'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22995:1: ( 'final' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22996:1: 'final'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckCatalogAccess().getFinalFinalKeyword_4_0()); 
             }
-            match(input,103,FOLLOW_103_in_rule__CheckCatalog__FinalAssignment_446455); if (state.failed) return ;
+            match(input,103,FOLLOW_103_in_rule__CheckCatalog__FinalAssignment_446269); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCheckCatalogAccess().getFinalFinalKeyword_4_0()); 
             }
@@ -65845,22 +65582,22 @@ public final void rule__CheckCatalog__FinalAssignment_4() throws RecognitionExce
 
 
     // $ANTLR start "rule__CheckCatalog__NameAssignment_6"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23105:1: rule__CheckCatalog__NameAssignment_6 : ( ruleValidID ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23011:1: rule__CheckCatalog__NameAssignment_6 : ( ruleValidID ) ;
     public final void rule__CheckCatalog__NameAssignment_6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23109:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23110:1: ( ruleValidID )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23015:1: ( ( ruleValidID ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23016:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23110:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23111:1: ruleValidID
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23016:1: ( ruleValidID )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23017:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckCatalogAccess().getNameValidIDParserRuleCall_6_0()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__CheckCatalog__NameAssignment_646494);
+            pushFollow(FOLLOW_ruleValidID_in_rule__CheckCatalog__NameAssignment_646308);
             ruleValidID();
 
             state._fsp--;
@@ -65890,28 +65627,28 @@ public final void rule__CheckCatalog__NameAssignment_6() throws RecognitionExcep
 
 
     // $ANTLR start "rule__CheckCatalog__GrammarAssignment_7_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23120:1: rule__CheckCatalog__GrammarAssignment_7_2 : ( ( ruleQualifiedName ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23026:1: rule__CheckCatalog__GrammarAssignment_7_2 : ( ( ruleQualifiedName ) ) ;
     public final void rule__CheckCatalog__GrammarAssignment_7_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23124:1: ( ( ( ruleQualifiedName ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23125:1: ( ( ruleQualifiedName ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23030:1: ( ( ( ruleQualifiedName ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23031:1: ( ( ruleQualifiedName ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23125:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23126:1: ( ruleQualifiedName )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23031:1: ( ( ruleQualifiedName ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23032:1: ( ruleQualifiedName )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckCatalogAccess().getGrammarGrammarCrossReference_7_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23127:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23128:1: ruleQualifiedName
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23033:1: ( ruleQualifiedName )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23034:1: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckCatalogAccess().getGrammarGrammarQualifiedNameParserRuleCall_7_2_0_1()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_rule__CheckCatalog__GrammarAssignment_7_246529);
+            pushFollow(FOLLOW_ruleQualifiedName_in_rule__CheckCatalog__GrammarAssignment_7_246343);
             ruleQualifiedName();
 
             state._fsp--;
@@ -65946,86 +65683,29 @@ public final void rule__CheckCatalog__GrammarAssignment_7_2() throws Recognition
     // $ANTLR end "rule__CheckCatalog__GrammarAssignment_7_2"
 
 
-    // $ANTLR start "rule__CheckCatalog__IncludedCatalogsAssignment_8_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23139:1: rule__CheckCatalog__IncludedCatalogsAssignment_8_1 : ( ( ruleQualifiedName ) ) ;
-    public final void rule__CheckCatalog__IncludedCatalogsAssignment_8_1() throws RecognitionException {
+    // $ANTLR start "rule__CheckCatalog__CategoriesAssignment_9_0"
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23045:1: rule__CheckCatalog__CategoriesAssignment_9_0 : ( ruleCategory ) ;
+    public final void rule__CheckCatalog__CategoriesAssignment_9_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23143:1: ( ( ( ruleQualifiedName ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23144:1: ( ( ruleQualifiedName ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23049:1: ( ( ruleCategory ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23050:1: ( ruleCategory )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23144:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23145:1: ( ruleQualifiedName )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23050:1: ( ruleCategory )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23051:1: ruleCategory
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getCheckCatalogAccess().getIncludedCatalogsCheckCatalogCrossReference_8_1_0()); 
-            }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23146:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23147:1: ruleQualifiedName
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getCheckCatalogAccess().getIncludedCatalogsCheckCatalogQualifiedNameParserRuleCall_8_1_0_1()); 
-            }
-            pushFollow(FOLLOW_ruleQualifiedName_in_rule__CheckCatalog__IncludedCatalogsAssignment_8_146568);
-            ruleQualifiedName();
-
-            state._fsp--;
-            if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getCheckCatalogAccess().getIncludedCatalogsCheckCatalogQualifiedNameParserRuleCall_8_1_0_1()); 
-            }
-
-            }
-
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getCheckCatalogAccess().getIncludedCatalogsCheckCatalogCrossReference_8_1_0()); 
-            }
-
-            }
-
-
+               before(grammarAccess.getCheckCatalogAccess().getCategoriesCategoryParserRuleCall_9_0_0()); 
             }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__CheckCatalog__IncludedCatalogsAssignment_8_1"
-
-
-    // $ANTLR start "rule__CheckCatalog__CategoriesAssignment_10_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23158:1: rule__CheckCatalog__CategoriesAssignment_10_0 : ( ruleCategory ) ;
-    public final void rule__CheckCatalog__CategoriesAssignment_10_0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23162:1: ( ( ruleCategory ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23163:1: ( ruleCategory )
-            {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23163:1: ( ruleCategory )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23164:1: ruleCategory
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getCheckCatalogAccess().getCategoriesCategoryParserRuleCall_10_0_0()); 
-            }
-            pushFollow(FOLLOW_ruleCategory_in_rule__CheckCatalog__CategoriesAssignment_10_046603);
+            pushFollow(FOLLOW_ruleCategory_in_rule__CheckCatalog__CategoriesAssignment_9_046378);
             ruleCategory();
 
             state._fsp--;
             if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getCheckCatalogAccess().getCategoriesCategoryParserRuleCall_10_0_0()); 
+               after(grammarAccess.getCheckCatalogAccess().getCategoriesCategoryParserRuleCall_9_0_0()); 
             }
 
             }
@@ -66045,32 +65725,32 @@ public final void rule__CheckCatalog__CategoriesAssignment_10_0() throws Recogni
         }
         return ;
     }
-    // $ANTLR end "rule__CheckCatalog__CategoriesAssignment_10_0"
+    // $ANTLR end "rule__CheckCatalog__CategoriesAssignment_9_0"
 
 
-    // $ANTLR start "rule__CheckCatalog__ImplementationsAssignment_10_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23173:1: rule__CheckCatalog__ImplementationsAssignment_10_1 : ( ruleImplementation ) ;
-    public final void rule__CheckCatalog__ImplementationsAssignment_10_1() throws RecognitionException {
+    // $ANTLR start "rule__CheckCatalog__ImplementationsAssignment_9_1"
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23060:1: rule__CheckCatalog__ImplementationsAssignment_9_1 : ( ruleImplementation ) ;
+    public final void rule__CheckCatalog__ImplementationsAssignment_9_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23177:1: ( ( ruleImplementation ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23178:1: ( ruleImplementation )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23064:1: ( ( ruleImplementation ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23065:1: ( ruleImplementation )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23178:1: ( ruleImplementation )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23179:1: ruleImplementation
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23065:1: ( ruleImplementation )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23066:1: ruleImplementation
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getCheckCatalogAccess().getImplementationsImplementationParserRuleCall_10_1_0()); 
+               before(grammarAccess.getCheckCatalogAccess().getImplementationsImplementationParserRuleCall_9_1_0()); 
             }
-            pushFollow(FOLLOW_ruleImplementation_in_rule__CheckCatalog__ImplementationsAssignment_10_146634);
+            pushFollow(FOLLOW_ruleImplementation_in_rule__CheckCatalog__ImplementationsAssignment_9_146409);
             ruleImplementation();
 
             state._fsp--;
             if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getCheckCatalogAccess().getImplementationsImplementationParserRuleCall_10_1_0()); 
+               after(grammarAccess.getCheckCatalogAccess().getImplementationsImplementationParserRuleCall_9_1_0()); 
             }
 
             }
@@ -66090,32 +65770,32 @@ public final void rule__CheckCatalog__ImplementationsAssignment_10_1() throws Re
         }
         return ;
     }
-    // $ANTLR end "rule__CheckCatalog__ImplementationsAssignment_10_1"
+    // $ANTLR end "rule__CheckCatalog__ImplementationsAssignment_9_1"
 
 
-    // $ANTLR start "rule__CheckCatalog__ChecksAssignment_10_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23188:1: rule__CheckCatalog__ChecksAssignment_10_2 : ( ruleCheck ) ;
-    public final void rule__CheckCatalog__ChecksAssignment_10_2() throws RecognitionException {
+    // $ANTLR start "rule__CheckCatalog__ChecksAssignment_9_2"
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23075:1: rule__CheckCatalog__ChecksAssignment_9_2 : ( ruleCheck ) ;
+    public final void rule__CheckCatalog__ChecksAssignment_9_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23192:1: ( ( ruleCheck ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23193:1: ( ruleCheck )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23079:1: ( ( ruleCheck ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23080:1: ( ruleCheck )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23193:1: ( ruleCheck )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23194:1: ruleCheck
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23080:1: ( ruleCheck )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23081:1: ruleCheck
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getCheckCatalogAccess().getChecksCheckParserRuleCall_10_2_0()); 
+               before(grammarAccess.getCheckCatalogAccess().getChecksCheckParserRuleCall_9_2_0()); 
             }
-            pushFollow(FOLLOW_ruleCheck_in_rule__CheckCatalog__ChecksAssignment_10_246665);
+            pushFollow(FOLLOW_ruleCheck_in_rule__CheckCatalog__ChecksAssignment_9_246440);
             ruleCheck();
 
             state._fsp--;
             if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getCheckCatalogAccess().getChecksCheckParserRuleCall_10_2_0()); 
+               after(grammarAccess.getCheckCatalogAccess().getChecksCheckParserRuleCall_9_2_0()); 
             }
 
             }
@@ -66135,32 +65815,32 @@ public final void rule__CheckCatalog__ChecksAssignment_10_2() throws Recognition
         }
         return ;
     }
-    // $ANTLR end "rule__CheckCatalog__ChecksAssignment_10_2"
+    // $ANTLR end "rule__CheckCatalog__ChecksAssignment_9_2"
 
 
-    // $ANTLR start "rule__CheckCatalog__MembersAssignment_10_3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23203:1: rule__CheckCatalog__MembersAssignment_10_3 : ( ruleMember ) ;
-    public final void rule__CheckCatalog__MembersAssignment_10_3() throws RecognitionException {
+    // $ANTLR start "rule__CheckCatalog__MembersAssignment_9_3"
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23090:1: rule__CheckCatalog__MembersAssignment_9_3 : ( ruleMember ) ;
+    public final void rule__CheckCatalog__MembersAssignment_9_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23207:1: ( ( ruleMember ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23208:1: ( ruleMember )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23094:1: ( ( ruleMember ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23095:1: ( ruleMember )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23208:1: ( ruleMember )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23209:1: ruleMember
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23095:1: ( ruleMember )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23096:1: ruleMember
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getCheckCatalogAccess().getMembersMemberParserRuleCall_10_3_0()); 
+               before(grammarAccess.getCheckCatalogAccess().getMembersMemberParserRuleCall_9_3_0()); 
             }
-            pushFollow(FOLLOW_ruleMember_in_rule__CheckCatalog__MembersAssignment_10_346696);
+            pushFollow(FOLLOW_ruleMember_in_rule__CheckCatalog__MembersAssignment_9_346471);
             ruleMember();
 
             state._fsp--;
             if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getCheckCatalogAccess().getMembersMemberParserRuleCall_10_3_0()); 
+               after(grammarAccess.getCheckCatalogAccess().getMembersMemberParserRuleCall_9_3_0()); 
             }
 
             }
@@ -66180,26 +65860,26 @@ public final void rule__CheckCatalog__MembersAssignment_10_3() throws Recognitio
         }
         return ;
     }
-    // $ANTLR end "rule__CheckCatalog__MembersAssignment_10_3"
+    // $ANTLR end "rule__CheckCatalog__MembersAssignment_9_3"
 
 
     // $ANTLR start "rule__XImportSection__ImportDeclarationsAssignment_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23218:1: rule__XImportSection__ImportDeclarationsAssignment_1 : ( ruleXImportDeclaration ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23105:1: rule__XImportSection__ImportDeclarationsAssignment_1 : ( ruleXImportDeclaration ) ;
     public final void rule__XImportSection__ImportDeclarationsAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23222:1: ( ( ruleXImportDeclaration ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23223:1: ( ruleXImportDeclaration )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23109:1: ( ( ruleXImportDeclaration ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23110:1: ( ruleXImportDeclaration )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23223:1: ( ruleXImportDeclaration )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23224:1: ruleXImportDeclaration
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23110:1: ( ruleXImportDeclaration )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23111:1: ruleXImportDeclaration
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportSectionAccess().getImportDeclarationsXImportDeclarationParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXImportDeclaration_in_rule__XImportSection__ImportDeclarationsAssignment_146727);
+            pushFollow(FOLLOW_ruleXImportDeclaration_in_rule__XImportSection__ImportDeclarationsAssignment_146502);
             ruleXImportDeclaration();
 
             state._fsp--;
@@ -66229,28 +65909,28 @@ public final void rule__XImportSection__ImportDeclarationsAssignment_1() throws
 
 
     // $ANTLR start "rule__XImportDeclaration__ImportedTypeAssignment_1_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23233:1: rule__XImportDeclaration__ImportedTypeAssignment_1_0 : ( ( ruleQualifiedName ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23120:1: rule__XImportDeclaration__ImportedTypeAssignment_1_0 : ( ( ruleQualifiedName ) ) ;
     public final void rule__XImportDeclaration__ImportedTypeAssignment_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23237:1: ( ( ( ruleQualifiedName ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23238:1: ( ( ruleQualifiedName ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23124:1: ( ( ( ruleQualifiedName ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23125:1: ( ( ruleQualifiedName ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23238:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23239:1: ( ruleQualifiedName )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23125:1: ( ( ruleQualifiedName ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23126:1: ( ruleQualifiedName )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getImportedTypeJvmDeclaredTypeCrossReference_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23240:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23241:1: ruleQualifiedName
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23127:1: ( ruleQualifiedName )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23128:1: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getImportedTypeJvmDeclaredTypeQualifiedNameParserRuleCall_1_0_0_1()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_rule__XImportDeclaration__ImportedTypeAssignment_1_046762);
+            pushFollow(FOLLOW_ruleQualifiedName_in_rule__XImportDeclaration__ImportedTypeAssignment_1_046537);
             ruleQualifiedName();
 
             state._fsp--;
@@ -66286,22 +65966,22 @@ public final void rule__XImportDeclaration__ImportedTypeAssignment_1_0() throws
 
 
     // $ANTLR start "rule__XImportDeclaration__ImportedNamespaceAssignment_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23252:1: rule__XImportDeclaration__ImportedNamespaceAssignment_1_1 : ( ruleQualifiedNameWithWildcard ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23139:1: rule__XImportDeclaration__ImportedNamespaceAssignment_1_1 : ( ruleQualifiedNameWithWildcard ) ;
     public final void rule__XImportDeclaration__ImportedNamespaceAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23256:1: ( ( ruleQualifiedNameWithWildcard ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23257:1: ( ruleQualifiedNameWithWildcard )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23143:1: ( ( ruleQualifiedNameWithWildcard ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23144:1: ( ruleQualifiedNameWithWildcard )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23257:1: ( ruleQualifiedNameWithWildcard )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23258:1: ruleQualifiedNameWithWildcard
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23144:1: ( ruleQualifiedNameWithWildcard )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23145:1: ruleQualifiedNameWithWildcard
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getImportedNamespaceQualifiedNameWithWildcardParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedNameWithWildcard_in_rule__XImportDeclaration__ImportedNamespaceAssignment_1_146797);
+            pushFollow(FOLLOW_ruleQualifiedNameWithWildcard_in_rule__XImportDeclaration__ImportedNamespaceAssignment_1_146572);
             ruleQualifiedNameWithWildcard();
 
             state._fsp--;
@@ -66331,22 +66011,22 @@ public final void rule__XImportDeclaration__ImportedNamespaceAssignment_1_1() th
 
 
     // $ANTLR start "rule__Category__IdAssignment_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23267:1: rule__Category__IdAssignment_1 : ( ruleValidID ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23154:1: rule__Category__IdAssignment_1 : ( ruleValidID ) ;
     public final void rule__Category__IdAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23271:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23272:1: ( ruleValidID )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23158:1: ( ( ruleValidID ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23159:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23272:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23273:1: ruleValidID
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23159:1: ( ruleValidID )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23160:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCategoryAccess().getIdValidIDParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__Category__IdAssignment_146828);
+            pushFollow(FOLLOW_ruleValidID_in_rule__Category__IdAssignment_146603);
             ruleValidID();
 
             state._fsp--;
@@ -66376,22 +66056,22 @@ public final void rule__Category__IdAssignment_1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__LabelAssignment_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23282:1: rule__Category__LabelAssignment_2 : ( RULE_STRING ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23169:1: rule__Category__LabelAssignment_2 : ( RULE_STRING ) ;
     public final void rule__Category__LabelAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23286:1: ( ( RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23287:1: ( RULE_STRING )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23173:1: ( ( RULE_STRING ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23174:1: ( RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23287:1: ( RULE_STRING )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23288:1: RULE_STRING
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23174:1: ( RULE_STRING )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23175:1: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCategoryAccess().getLabelSTRINGTerminalRuleCall_2_0()); 
             }
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__Category__LabelAssignment_246859); if (state.failed) return ;
+            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__Category__LabelAssignment_246634); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCategoryAccess().getLabelSTRINGTerminalRuleCall_2_0()); 
             }
@@ -66417,22 +66097,22 @@ public final void rule__Category__LabelAssignment_2() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__Category__ChecksAssignment_4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23297:1: rule__Category__ChecksAssignment_4 : ( ruleCheck ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23184:1: rule__Category__ChecksAssignment_4 : ( ruleCheck ) ;
     public final void rule__Category__ChecksAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23301:1: ( ( ruleCheck ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23302:1: ( ruleCheck )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23188:1: ( ( ruleCheck ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23189:1: ( ruleCheck )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23302:1: ( ruleCheck )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23303:1: ruleCheck
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23189:1: ( ruleCheck )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23190:1: ruleCheck
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCategoryAccess().getChecksCheckParserRuleCall_4_0()); 
             }
-            pushFollow(FOLLOW_ruleCheck_in_rule__Category__ChecksAssignment_446890);
+            pushFollow(FOLLOW_ruleCheck_in_rule__Category__ChecksAssignment_446665);
             ruleCheck();
 
             state._fsp--;
@@ -66462,22 +66142,22 @@ public final void rule__Category__ChecksAssignment_4() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__Check__SeverityRangeAssignment_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23312:1: rule__Check__SeverityRangeAssignment_0 : ( ruleSeverityRange ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23199:1: rule__Check__SeverityRangeAssignment_0 : ( ruleSeverityRange ) ;
     public final void rule__Check__SeverityRangeAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23316:1: ( ( ruleSeverityRange ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23317:1: ( ruleSeverityRange )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23203:1: ( ( ruleSeverityRange ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23204:1: ( ruleSeverityRange )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23317:1: ( ruleSeverityRange )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23318:1: ruleSeverityRange
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23204:1: ( ruleSeverityRange )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23205:1: ruleSeverityRange
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getSeverityRangeSeverityRangeParserRuleCall_0_0()); 
             }
-            pushFollow(FOLLOW_ruleSeverityRange_in_rule__Check__SeverityRangeAssignment_046921);
+            pushFollow(FOLLOW_ruleSeverityRange_in_rule__Check__SeverityRangeAssignment_046696);
             ruleSeverityRange();
 
             state._fsp--;
@@ -66507,28 +66187,28 @@ public final void rule__Check__SeverityRangeAssignment_0() throws RecognitionExc
 
 
     // $ANTLR start "rule__Check__FinalAssignment_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23327:1: rule__Check__FinalAssignment_1 : ( ( 'final' ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23214:1: rule__Check__FinalAssignment_1 : ( ( 'final' ) ) ;
     public final void rule__Check__FinalAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23331:1: ( ( ( 'final' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23332:1: ( ( 'final' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23218:1: ( ( ( 'final' ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23219:1: ( ( 'final' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23332:1: ( ( 'final' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23333:1: ( 'final' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23219:1: ( ( 'final' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23220:1: ( 'final' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getFinalFinalKeyword_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23334:1: ( 'final' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23335:1: 'final'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23221:1: ( 'final' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23222:1: 'final'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getFinalFinalKeyword_1_0()); 
             }
-            match(input,103,FOLLOW_103_in_rule__Check__FinalAssignment_146957); if (state.failed) return ;
+            match(input,103,FOLLOW_103_in_rule__Check__FinalAssignment_146732); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCheckAccess().getFinalFinalKeyword_1_0()); 
             }
@@ -66560,22 +66240,22 @@ public final void rule__Check__FinalAssignment_1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__KindAssignment_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23350:1: rule__Check__KindAssignment_2 : ( ruleTriggerKind ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23237:1: rule__Check__KindAssignment_2 : ( ruleTriggerKind ) ;
     public final void rule__Check__KindAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23354:1: ( ( ruleTriggerKind ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23355:1: ( ruleTriggerKind )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23241:1: ( ( ruleTriggerKind ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23242:1: ( ruleTriggerKind )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23355:1: ( ruleTriggerKind )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23356:1: ruleTriggerKind
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23242:1: ( ruleTriggerKind )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23243:1: ruleTriggerKind
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getKindTriggerKindEnumRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleTriggerKind_in_rule__Check__KindAssignment_246996);
+            pushFollow(FOLLOW_ruleTriggerKind_in_rule__Check__KindAssignment_246771);
             ruleTriggerKind();
 
             state._fsp--;
@@ -66605,22 +66285,22 @@ public final void rule__Check__KindAssignment_2() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__DefaultSeverityAssignment_3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23365:1: rule__Check__DefaultSeverityAssignment_3 : ( ruleSeverityKind ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23252:1: rule__Check__DefaultSeverityAssignment_3 : ( ruleSeverityKind ) ;
     public final void rule__Check__DefaultSeverityAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23369:1: ( ( ruleSeverityKind ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23370:1: ( ruleSeverityKind )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23256:1: ( ( ruleSeverityKind ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23257:1: ( ruleSeverityKind )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23370:1: ( ruleSeverityKind )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23371:1: ruleSeverityKind
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23257:1: ( ruleSeverityKind )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23258:1: ruleSeverityKind
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getDefaultSeveritySeverityKindEnumRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleSeverityKind_in_rule__Check__DefaultSeverityAssignment_347027);
+            pushFollow(FOLLOW_ruleSeverityKind_in_rule__Check__DefaultSeverityAssignment_346802);
             ruleSeverityKind();
 
             state._fsp--;
@@ -66650,22 +66330,22 @@ public final void rule__Check__DefaultSeverityAssignment_3() throws RecognitionE
 
 
     // $ANTLR start "rule__Check__IdAssignment_4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23380:1: rule__Check__IdAssignment_4 : ( ruleValidID ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23267:1: rule__Check__IdAssignment_4 : ( ruleValidID ) ;
     public final void rule__Check__IdAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23384:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23385:1: ( ruleValidID )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23271:1: ( ( ruleValidID ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23272:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23385:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23386:1: ruleValidID
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23272:1: ( ruleValidID )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23273:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getIdValidIDParserRuleCall_4_0()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__Check__IdAssignment_447058);
+            pushFollow(FOLLOW_ruleValidID_in_rule__Check__IdAssignment_446833);
             ruleValidID();
 
             state._fsp--;
@@ -66695,22 +66375,22 @@ public final void rule__Check__IdAssignment_4() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__LabelAssignment_5"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23395:1: rule__Check__LabelAssignment_5 : ( RULE_STRING ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23282:1: rule__Check__LabelAssignment_5 : ( RULE_STRING ) ;
     public final void rule__Check__LabelAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23399:1: ( ( RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23400:1: ( RULE_STRING )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23286:1: ( ( RULE_STRING ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23287:1: ( RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23400:1: ( RULE_STRING )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23401:1: RULE_STRING
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23287:1: ( RULE_STRING )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23288:1: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getLabelSTRINGTerminalRuleCall_5_0()); 
             }
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__Check__LabelAssignment_547089); if (state.failed) return ;
+            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__Check__LabelAssignment_546864); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCheckAccess().getLabelSTRINGTerminalRuleCall_5_0()); 
             }
@@ -66736,22 +66416,22 @@ public final void rule__Check__LabelAssignment_5() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__FormalParametersAssignment_6_1_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23410:1: rule__Check__FormalParametersAssignment_6_1_0 : ( ruleFormalParameter ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23297:1: rule__Check__FormalParametersAssignment_6_1_0 : ( ruleFormalParameter ) ;
     public final void rule__Check__FormalParametersAssignment_6_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23414:1: ( ( ruleFormalParameter ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23415:1: ( ruleFormalParameter )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23301:1: ( ( ruleFormalParameter ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23302:1: ( ruleFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23415:1: ( ruleFormalParameter )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23416:1: ruleFormalParameter
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23302:1: ( ruleFormalParameter )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23303:1: ruleFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getFormalParametersFormalParameterParserRuleCall_6_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleFormalParameter_in_rule__Check__FormalParametersAssignment_6_1_047120);
+            pushFollow(FOLLOW_ruleFormalParameter_in_rule__Check__FormalParametersAssignment_6_1_046895);
             ruleFormalParameter();
 
             state._fsp--;
@@ -66781,22 +66461,22 @@ public final void rule__Check__FormalParametersAssignment_6_1_0() throws Recogni
 
 
     // $ANTLR start "rule__Check__FormalParametersAssignment_6_1_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23425:1: rule__Check__FormalParametersAssignment_6_1_1_1 : ( ruleFormalParameter ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23312:1: rule__Check__FormalParametersAssignment_6_1_1_1 : ( ruleFormalParameter ) ;
     public final void rule__Check__FormalParametersAssignment_6_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23429:1: ( ( ruleFormalParameter ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23430:1: ( ruleFormalParameter )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23316:1: ( ( ruleFormalParameter ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23317:1: ( ruleFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23430:1: ( ruleFormalParameter )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23431:1: ruleFormalParameter
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23317:1: ( ruleFormalParameter )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23318:1: ruleFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getFormalParametersFormalParameterParserRuleCall_6_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleFormalParameter_in_rule__Check__FormalParametersAssignment_6_1_1_147151);
+            pushFollow(FOLLOW_ruleFormalParameter_in_rule__Check__FormalParametersAssignment_6_1_1_146926);
             ruleFormalParameter();
 
             state._fsp--;
@@ -66826,22 +66506,22 @@ public final void rule__Check__FormalParametersAssignment_6_1_1_1() throws Recog
 
 
     // $ANTLR start "rule__Check__GivenMessageAssignment_7_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23440:1: rule__Check__GivenMessageAssignment_7_1 : ( RULE_STRING ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23327:1: rule__Check__GivenMessageAssignment_7_1 : ( RULE_STRING ) ;
     public final void rule__Check__GivenMessageAssignment_7_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23444:1: ( ( RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23445:1: ( RULE_STRING )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23331:1: ( ( RULE_STRING ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23332:1: ( RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23445:1: ( RULE_STRING )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23446:1: RULE_STRING
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23332:1: ( RULE_STRING )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23333:1: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getGivenMessageSTRINGTerminalRuleCall_7_1_0()); 
             }
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__Check__GivenMessageAssignment_7_147182); if (state.failed) return ;
+            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__Check__GivenMessageAssignment_7_146957); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCheckAccess().getGivenMessageSTRINGTerminalRuleCall_7_1_0()); 
             }
@@ -66867,22 +66547,22 @@ public final void rule__Check__GivenMessageAssignment_7_1() throws RecognitionEx
 
 
     // $ANTLR start "rule__Check__ContextsAssignment_8_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23455:1: rule__Check__ContextsAssignment_8_0_1 : ( ruleContext ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23342:1: rule__Check__ContextsAssignment_8_0_1 : ( ruleContext ) ;
     public final void rule__Check__ContextsAssignment_8_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23459:1: ( ( ruleContext ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23460:1: ( ruleContext )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23346:1: ( ( ruleContext ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23347:1: ( ruleContext )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23460:1: ( ruleContext )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23461:1: ruleContext
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23347:1: ( ruleContext )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23348:1: ruleContext
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getContextsContextParserRuleCall_8_0_1_0()); 
             }
-            pushFollow(FOLLOW_ruleContext_in_rule__Check__ContextsAssignment_8_0_147213);
+            pushFollow(FOLLOW_ruleContext_in_rule__Check__ContextsAssignment_8_0_146988);
             ruleContext();
 
             state._fsp--;
@@ -66912,22 +66592,22 @@ public final void rule__Check__ContextsAssignment_8_0_1() throws RecognitionExce
 
 
     // $ANTLR start "rule__Check__ContextsAssignment_8_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23470:1: rule__Check__ContextsAssignment_8_1 : ( ruleContext ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23357:1: rule__Check__ContextsAssignment_8_1 : ( ruleContext ) ;
     public final void rule__Check__ContextsAssignment_8_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23474:1: ( ( ruleContext ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23475:1: ( ruleContext )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23361:1: ( ( ruleContext ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23362:1: ( ruleContext )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23475:1: ( ruleContext )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23476:1: ruleContext
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23362:1: ( ruleContext )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23363:1: ruleContext
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getContextsContextParserRuleCall_8_1_0()); 
             }
-            pushFollow(FOLLOW_ruleContext_in_rule__Check__ContextsAssignment_8_147244);
+            pushFollow(FOLLOW_ruleContext_in_rule__Check__ContextsAssignment_8_147019);
             ruleContext();
 
             state._fsp--;
@@ -66957,22 +66637,22 @@ public final void rule__Check__ContextsAssignment_8_1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__SeverityRange__MinSeverityAssignment_3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23485:1: rule__SeverityRange__MinSeverityAssignment_3 : ( ruleSeverityKind ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23372:1: rule__SeverityRange__MinSeverityAssignment_3 : ( ruleSeverityKind ) ;
     public final void rule__SeverityRange__MinSeverityAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23489:1: ( ( ruleSeverityKind ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23490:1: ( ruleSeverityKind )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23376:1: ( ( ruleSeverityKind ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23377:1: ( ruleSeverityKind )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23490:1: ( ruleSeverityKind )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23491:1: ruleSeverityKind
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23377:1: ( ruleSeverityKind )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23378:1: ruleSeverityKind
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSeverityRangeAccess().getMinSeveritySeverityKindEnumRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleSeverityKind_in_rule__SeverityRange__MinSeverityAssignment_347275);
+            pushFollow(FOLLOW_ruleSeverityKind_in_rule__SeverityRange__MinSeverityAssignment_347050);
             ruleSeverityKind();
 
             state._fsp--;
@@ -67002,22 +66682,22 @@ public final void rule__SeverityRange__MinSeverityAssignment_3() throws Recognit
 
 
     // $ANTLR start "rule__SeverityRange__MaxSeverityAssignment_5"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23500:1: rule__SeverityRange__MaxSeverityAssignment_5 : ( ruleSeverityKind ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23387:1: rule__SeverityRange__MaxSeverityAssignment_5 : ( ruleSeverityKind ) ;
     public final void rule__SeverityRange__MaxSeverityAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23504:1: ( ( ruleSeverityKind ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23505:1: ( ruleSeverityKind )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23391:1: ( ( ruleSeverityKind ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23392:1: ( ruleSeverityKind )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23505:1: ( ruleSeverityKind )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23506:1: ruleSeverityKind
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23392:1: ( ruleSeverityKind )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23393:1: ruleSeverityKind
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSeverityRangeAccess().getMaxSeveritySeverityKindEnumRuleCall_5_0()); 
             }
-            pushFollow(FOLLOW_ruleSeverityKind_in_rule__SeverityRange__MaxSeverityAssignment_547306);
+            pushFollow(FOLLOW_ruleSeverityKind_in_rule__SeverityRange__MaxSeverityAssignment_547081);
             ruleSeverityKind();
 
             state._fsp--;
@@ -67047,22 +66727,22 @@ public final void rule__SeverityRange__MaxSeverityAssignment_5() throws Recognit
 
 
     // $ANTLR start "rule__Member__AnnotationsAssignment_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23515:1: rule__Member__AnnotationsAssignment_0 : ( ruleXAnnotation ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23402:1: rule__Member__AnnotationsAssignment_0 : ( ruleXAnnotation ) ;
     public final void rule__Member__AnnotationsAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23519:1: ( ( ruleXAnnotation ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23520:1: ( ruleXAnnotation )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23406:1: ( ( ruleXAnnotation ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23407:1: ( ruleXAnnotation )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23520:1: ( ruleXAnnotation )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23521:1: ruleXAnnotation
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23407:1: ( ruleXAnnotation )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23408:1: ruleXAnnotation
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMemberAccess().getAnnotationsXAnnotationParserRuleCall_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotation_in_rule__Member__AnnotationsAssignment_047337);
+            pushFollow(FOLLOW_ruleXAnnotation_in_rule__Member__AnnotationsAssignment_047112);
             ruleXAnnotation();
 
             state._fsp--;
@@ -67092,22 +66772,22 @@ public final void rule__Member__AnnotationsAssignment_0() throws RecognitionExce
 
 
     // $ANTLR start "rule__Member__TypeAssignment_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23530:1: rule__Member__TypeAssignment_1 : ( ruleJvmTypeReference ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23417:1: rule__Member__TypeAssignment_1 : ( ruleJvmTypeReference ) ;
     public final void rule__Member__TypeAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23534:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23535:1: ( ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23421:1: ( ( ruleJvmTypeReference ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23422:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23535:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23536:1: ruleJvmTypeReference
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23422:1: ( ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23423:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMemberAccess().getTypeJvmTypeReferenceParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__Member__TypeAssignment_147368);
+            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__Member__TypeAssignment_147143);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -67137,22 +66817,22 @@ public final void rule__Member__TypeAssignment_1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Member__NameAssignment_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23545:1: rule__Member__NameAssignment_2 : ( ruleValidID ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23432:1: rule__Member__NameAssignment_2 : ( ruleValidID ) ;
     public final void rule__Member__NameAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23549:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23550:1: ( ruleValidID )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23436:1: ( ( ruleValidID ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23437:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23550:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23551:1: ruleValidID
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23437:1: ( ruleValidID )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23438:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMemberAccess().getNameValidIDParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__Member__NameAssignment_247399);
+            pushFollow(FOLLOW_ruleValidID_in_rule__Member__NameAssignment_247174);
             ruleValidID();
 
             state._fsp--;
@@ -67182,22 +66862,22 @@ public final void rule__Member__NameAssignment_2() throws RecognitionException {
 
 
     // $ANTLR start "rule__Member__ValueAssignment_3_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23560:1: rule__Member__ValueAssignment_3_1 : ( ruleXOrExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23447:1: rule__Member__ValueAssignment_3_1 : ( ruleXOrExpression ) ;
     public final void rule__Member__ValueAssignment_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23564:1: ( ( ruleXOrExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23565:1: ( ruleXOrExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23451:1: ( ( ruleXOrExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23452:1: ( ruleXOrExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23565:1: ( ruleXOrExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23566:1: ruleXOrExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23452:1: ( ruleXOrExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23453:1: ruleXOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMemberAccess().getValueXOrExpressionParserRuleCall_3_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXOrExpression_in_rule__Member__ValueAssignment_3_147430);
+            pushFollow(FOLLOW_ruleXOrExpression_in_rule__Member__ValueAssignment_3_147205);
             ruleXOrExpression();
 
             state._fsp--;
@@ -67227,22 +66907,22 @@ public final void rule__Member__ValueAssignment_3_1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__Implementation__NameAssignment_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23575:1: rule__Implementation__NameAssignment_1 : ( ruleValidID ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23462:1: rule__Implementation__NameAssignment_1 : ( ruleValidID ) ;
     public final void rule__Implementation__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23579:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23580:1: ( ruleValidID )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23466:1: ( ( ruleValidID ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23467:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23580:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23581:1: ruleValidID
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23467:1: ( ruleValidID )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23468:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImplementationAccess().getNameValidIDParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__Implementation__NameAssignment_147461);
+            pushFollow(FOLLOW_ruleValidID_in_rule__Implementation__NameAssignment_147236);
             ruleValidID();
 
             state._fsp--;
@@ -67272,22 +66952,22 @@ public final void rule__Implementation__NameAssignment_1() throws RecognitionExc
 
 
     // $ANTLR start "rule__Implementation__ContextAssignment_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23590:1: rule__Implementation__ContextAssignment_2 : ( ruleContext ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23477:1: rule__Implementation__ContextAssignment_2 : ( ruleContext ) ;
     public final void rule__Implementation__ContextAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23594:1: ( ( ruleContext ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23595:1: ( ruleContext )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23481:1: ( ( ruleContext ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23482:1: ( ruleContext )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23595:1: ( ruleContext )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23596:1: ruleContext
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23482:1: ( ruleContext )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23483:1: ruleContext
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImplementationAccess().getContextContextParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleContext_in_rule__Implementation__ContextAssignment_247492);
+            pushFollow(FOLLOW_ruleContext_in_rule__Implementation__ContextAssignment_247267);
             ruleContext();
 
             state._fsp--;
@@ -67317,22 +66997,22 @@ public final void rule__Implementation__ContextAssignment_2() throws Recognition
 
 
     // $ANTLR start "rule__FormalParameter__TypeAssignment_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23605:1: rule__FormalParameter__TypeAssignment_0 : ( ruleJvmParameterizedTypeReference ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23492:1: rule__FormalParameter__TypeAssignment_0 : ( ruleJvmParameterizedTypeReference ) ;
     public final void rule__FormalParameter__TypeAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23609:1: ( ( ruleJvmParameterizedTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23610:1: ( ruleJvmParameterizedTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23496:1: ( ( ruleJvmParameterizedTypeReference ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23497:1: ( ruleJvmParameterizedTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23610:1: ( ruleJvmParameterizedTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23611:1: ruleJvmParameterizedTypeReference
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23497:1: ( ruleJvmParameterizedTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23498:1: ruleJvmParameterizedTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormalParameterAccess().getTypeJvmParameterizedTypeReferenceParserRuleCall_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmParameterizedTypeReference_in_rule__FormalParameter__TypeAssignment_047523);
+            pushFollow(FOLLOW_ruleJvmParameterizedTypeReference_in_rule__FormalParameter__TypeAssignment_047298);
             ruleJvmParameterizedTypeReference();
 
             state._fsp--;
@@ -67362,22 +67042,22 @@ public final void rule__FormalParameter__TypeAssignment_0() throws RecognitionEx
 
 
     // $ANTLR start "rule__FormalParameter__NameAssignment_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23620:1: rule__FormalParameter__NameAssignment_1 : ( ruleValidID ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23507:1: rule__FormalParameter__NameAssignment_1 : ( ruleValidID ) ;
     public final void rule__FormalParameter__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23624:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23625:1: ( ruleValidID )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23511:1: ( ( ruleValidID ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23512:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23625:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23626:1: ruleValidID
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23512:1: ( ruleValidID )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23513:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormalParameterAccess().getNameValidIDParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__FormalParameter__NameAssignment_147554);
+            pushFollow(FOLLOW_ruleValidID_in_rule__FormalParameter__NameAssignment_147329);
             ruleValidID();
 
             state._fsp--;
@@ -67407,22 +67087,22 @@ public final void rule__FormalParameter__NameAssignment_1() throws RecognitionEx
 
 
     // $ANTLR start "rule__FormalParameter__RightAssignment_3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23635:1: rule__FormalParameter__RightAssignment_3 : ( ruleXFormalParameterDefaultValueLiteral ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23522:1: rule__FormalParameter__RightAssignment_3 : ( ruleXFormalParameterDefaultValueLiteral ) ;
     public final void rule__FormalParameter__RightAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23639:1: ( ( ruleXFormalParameterDefaultValueLiteral ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23640:1: ( ruleXFormalParameterDefaultValueLiteral )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23526:1: ( ( ruleXFormalParameterDefaultValueLiteral ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23527:1: ( ruleXFormalParameterDefaultValueLiteral )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23640:1: ( ruleXFormalParameterDefaultValueLiteral )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23641:1: ruleXFormalParameterDefaultValueLiteral
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23527:1: ( ruleXFormalParameterDefaultValueLiteral )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23528:1: ruleXFormalParameterDefaultValueLiteral
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormalParameterAccess().getRightXFormalParameterDefaultValueLiteralParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleXFormalParameterDefaultValueLiteral_in_rule__FormalParameter__RightAssignment_347585);
+            pushFollow(FOLLOW_ruleXFormalParameterDefaultValueLiteral_in_rule__FormalParameter__RightAssignment_347360);
             ruleXFormalParameterDefaultValueLiteral();
 
             state._fsp--;
@@ -67452,22 +67132,22 @@ public final void rule__FormalParameter__RightAssignment_3() throws RecognitionE
 
 
     // $ANTLR start "rule__FormalParameter__LabelAssignment_4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23650:1: rule__FormalParameter__LabelAssignment_4 : ( RULE_STRING ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23537:1: rule__FormalParameter__LabelAssignment_4 : ( RULE_STRING ) ;
     public final void rule__FormalParameter__LabelAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23654:1: ( ( RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23655:1: ( RULE_STRING )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23541:1: ( ( RULE_STRING ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23542:1: ( RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23655:1: ( RULE_STRING )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23656:1: RULE_STRING
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23542:1: ( RULE_STRING )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23543:1: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormalParameterAccess().getLabelSTRINGTerminalRuleCall_4_0()); 
             }
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__FormalParameter__LabelAssignment_447616); if (state.failed) return ;
+            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__FormalParameter__LabelAssignment_447391); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getFormalParameterAccess().getLabelSTRINGTerminalRuleCall_4_0()); 
             }
@@ -67493,28 +67173,28 @@ public final void rule__FormalParameter__LabelAssignment_4() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstantUnaryOperation__FeatureAssignment_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23665:1: rule__XConstantUnaryOperation__FeatureAssignment_0_1 : ( ( ruleOpUnary ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23552:1: rule__XConstantUnaryOperation__FeatureAssignment_0_1 : ( ( ruleOpUnary ) ) ;
     public final void rule__XConstantUnaryOperation__FeatureAssignment_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23669:1: ( ( ( ruleOpUnary ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23670:1: ( ( ruleOpUnary ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23556:1: ( ( ( ruleOpUnary ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23557:1: ( ( ruleOpUnary ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23670:1: ( ( ruleOpUnary ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23671:1: ( ruleOpUnary )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23557:1: ( ( ruleOpUnary ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23558:1: ( ruleOpUnary )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantUnaryOperationAccess().getFeatureJvmIdentifiableElementCrossReference_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23672:1: ( ruleOpUnary )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23673:1: ruleOpUnary
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23559:1: ( ruleOpUnary )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23560:1: ruleOpUnary
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantUnaryOperationAccess().getFeatureJvmIdentifiableElementOpUnaryParserRuleCall_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpUnary_in_rule__XConstantUnaryOperation__FeatureAssignment_0_147651);
+            pushFollow(FOLLOW_ruleOpUnary_in_rule__XConstantUnaryOperation__FeatureAssignment_0_147426);
             ruleOpUnary();
 
             state._fsp--;
@@ -67550,22 +67230,22 @@ public final void rule__XConstantUnaryOperation__FeatureAssignment_0_1() throws
 
 
     // $ANTLR start "rule__XConstantUnaryOperation__OperandAssignment_0_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23684:1: rule__XConstantUnaryOperation__OperandAssignment_0_2 : ( ruleXConstantUnaryOperation ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23571:1: rule__XConstantUnaryOperation__OperandAssignment_0_2 : ( ruleXConstantUnaryOperation ) ;
     public final void rule__XConstantUnaryOperation__OperandAssignment_0_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23688:1: ( ( ruleXConstantUnaryOperation ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23689:1: ( ruleXConstantUnaryOperation )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23575:1: ( ( ruleXConstantUnaryOperation ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23576:1: ( ruleXConstantUnaryOperation )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23689:1: ( ruleXConstantUnaryOperation )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23690:1: ruleXConstantUnaryOperation
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23576:1: ( ruleXConstantUnaryOperation )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23577:1: ruleXConstantUnaryOperation
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantUnaryOperationAccess().getOperandXConstantUnaryOperationParserRuleCall_0_2_0()); 
             }
-            pushFollow(FOLLOW_ruleXConstantUnaryOperation_in_rule__XConstantUnaryOperation__OperandAssignment_0_247686);
+            pushFollow(FOLLOW_ruleXConstantUnaryOperation_in_rule__XConstantUnaryOperation__OperandAssignment_0_247461);
             ruleXConstantUnaryOperation();
 
             state._fsp--;
@@ -67595,22 +67275,22 @@ public final void rule__XConstantUnaryOperation__OperandAssignment_0_2() throws
 
 
     // $ANTLR start "rule__XConstantListLiteral__ElementsAssignment_3_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23699:1: rule__XConstantListLiteral__ElementsAssignment_3_0 : ( ruleXConstantUnaryOperation ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23586:1: rule__XConstantListLiteral__ElementsAssignment_3_0 : ( ruleXConstantUnaryOperation ) ;
     public final void rule__XConstantListLiteral__ElementsAssignment_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23703:1: ( ( ruleXConstantUnaryOperation ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23704:1: ( ruleXConstantUnaryOperation )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23590:1: ( ( ruleXConstantUnaryOperation ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23591:1: ( ruleXConstantUnaryOperation )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23704:1: ( ruleXConstantUnaryOperation )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23705:1: ruleXConstantUnaryOperation
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23591:1: ( ruleXConstantUnaryOperation )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23592:1: ruleXConstantUnaryOperation
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantListLiteralAccess().getElementsXConstantUnaryOperationParserRuleCall_3_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXConstantUnaryOperation_in_rule__XConstantListLiteral__ElementsAssignment_3_047717);
+            pushFollow(FOLLOW_ruleXConstantUnaryOperation_in_rule__XConstantListLiteral__ElementsAssignment_3_047492);
             ruleXConstantUnaryOperation();
 
             state._fsp--;
@@ -67640,22 +67320,22 @@ public final void rule__XConstantListLiteral__ElementsAssignment_3_0() throws Re
 
 
     // $ANTLR start "rule__XConstantListLiteral__ElementsAssignment_3_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23714:1: rule__XConstantListLiteral__ElementsAssignment_3_1_1 : ( ruleXConstantUnaryOperation ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23601:1: rule__XConstantListLiteral__ElementsAssignment_3_1_1 : ( ruleXConstantUnaryOperation ) ;
     public final void rule__XConstantListLiteral__ElementsAssignment_3_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23718:1: ( ( ruleXConstantUnaryOperation ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23719:1: ( ruleXConstantUnaryOperation )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23605:1: ( ( ruleXConstantUnaryOperation ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23606:1: ( ruleXConstantUnaryOperation )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23719:1: ( ruleXConstantUnaryOperation )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23720:1: ruleXConstantUnaryOperation
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23606:1: ( ruleXConstantUnaryOperation )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23607:1: ruleXConstantUnaryOperation
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantListLiteralAccess().getElementsXConstantUnaryOperationParserRuleCall_3_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXConstantUnaryOperation_in_rule__XConstantListLiteral__ElementsAssignment_3_1_147748);
+            pushFollow(FOLLOW_ruleXConstantUnaryOperation_in_rule__XConstantListLiteral__ElementsAssignment_3_1_147523);
             ruleXConstantUnaryOperation();
 
             state._fsp--;
@@ -67685,22 +67365,22 @@ public final void rule__XConstantListLiteral__ElementsAssignment_3_1_1() throws
 
 
     // $ANTLR start "rule__Context__ContextVariableAssignment_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23729:1: rule__Context__ContextVariableAssignment_1 : ( ruleContextVariable ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23616:1: rule__Context__ContextVariableAssignment_1 : ( ruleContextVariable ) ;
     public final void rule__Context__ContextVariableAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23733:1: ( ( ruleContextVariable ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23734:1: ( ruleContextVariable )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23620:1: ( ( ruleContextVariable ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23621:1: ( ruleContextVariable )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23734:1: ( ruleContextVariable )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23735:1: ruleContextVariable
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23621:1: ( ruleContextVariable )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23622:1: ruleContextVariable
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getContextAccess().getContextVariableContextVariableParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleContextVariable_in_rule__Context__ContextVariableAssignment_147779);
+            pushFollow(FOLLOW_ruleContextVariable_in_rule__Context__ContextVariableAssignment_147554);
             ruleContextVariable();
 
             state._fsp--;
@@ -67730,22 +67410,22 @@ public final void rule__Context__ContextVariableAssignment_1() throws Recognitio
 
 
     // $ANTLR start "rule__Context__ConstraintAssignment_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23744:1: rule__Context__ConstraintAssignment_2 : ( ruleXBlockExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23631:1: rule__Context__ConstraintAssignment_2 : ( ruleXBlockExpression ) ;
     public final void rule__Context__ConstraintAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23748:1: ( ( ruleXBlockExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23749:1: ( ruleXBlockExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23635:1: ( ( ruleXBlockExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23636:1: ( ruleXBlockExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23749:1: ( ruleXBlockExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23750:1: ruleXBlockExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23636:1: ( ruleXBlockExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23637:1: ruleXBlockExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getContextAccess().getConstraintXBlockExpressionParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleXBlockExpression_in_rule__Context__ConstraintAssignment_247810);
+            pushFollow(FOLLOW_ruleXBlockExpression_in_rule__Context__ConstraintAssignment_247585);
             ruleXBlockExpression();
 
             state._fsp--;
@@ -67775,22 +67455,22 @@ public final void rule__Context__ConstraintAssignment_2() throws RecognitionExce
 
 
     // $ANTLR start "rule__ContextVariable__TypeAssignment_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23759:1: rule__ContextVariable__TypeAssignment_0 : ( ruleJvmTypeReference ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23646:1: rule__ContextVariable__TypeAssignment_0 : ( ruleJvmTypeReference ) ;
     public final void rule__ContextVariable__TypeAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23763:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23764:1: ( ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23650:1: ( ( ruleJvmTypeReference ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23651:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23764:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23765:1: ruleJvmTypeReference
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23651:1: ( ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23652:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getContextVariableAccess().getTypeJvmTypeReferenceParserRuleCall_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__ContextVariable__TypeAssignment_047841);
+            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__ContextVariable__TypeAssignment_047616);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -67820,22 +67500,22 @@ public final void rule__ContextVariable__TypeAssignment_0() throws RecognitionEx
 
 
     // $ANTLR start "rule__ContextVariable__NameAssignment_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23774:1: rule__ContextVariable__NameAssignment_1 : ( ruleValidID ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23661:1: rule__ContextVariable__NameAssignment_1 : ( ruleValidID ) ;
     public final void rule__ContextVariable__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23778:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23779:1: ( ruleValidID )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23665:1: ( ( ruleValidID ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23666:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23779:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23780:1: ruleValidID
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23666:1: ( ruleValidID )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23667:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getContextVariableAccess().getNameValidIDParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__ContextVariable__NameAssignment_147872);
+            pushFollow(FOLLOW_ruleValidID_in_rule__ContextVariable__NameAssignment_147647);
             ruleValidID();
 
             state._fsp--;
@@ -67865,22 +67545,22 @@ public final void rule__ContextVariable__NameAssignment_1() throws RecognitionEx
 
 
     // $ANTLR start "rule__XGuardExpression__GuardAssignment_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23789:1: rule__XGuardExpression__GuardAssignment_2 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23676:1: rule__XGuardExpression__GuardAssignment_2 : ( ruleXExpression ) ;
     public final void rule__XGuardExpression__GuardAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23793:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23794:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23680:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23681:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23794:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23795:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23681:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23682:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXGuardExpressionAccess().getGuardXExpressionParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XGuardExpression__GuardAssignment_247903);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XGuardExpression__GuardAssignment_247678);
             ruleXExpression();
 
             state._fsp--;
@@ -67910,28 +67590,28 @@ public final void rule__XGuardExpression__GuardAssignment_2() throws Recognition
 
 
     // $ANTLR start "rule__XIssueExpression__CheckAssignment_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23804:1: rule__XIssueExpression__CheckAssignment_2 : ( ( ruleQualifiedName ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23691:1: rule__XIssueExpression__CheckAssignment_2 : ( ( ruleQualifiedName ) ) ;
     public final void rule__XIssueExpression__CheckAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23808:1: ( ( ( ruleQualifiedName ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23809:1: ( ( ruleQualifiedName ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23695:1: ( ( ( ruleQualifiedName ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23696:1: ( ( ruleQualifiedName ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23809:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23810:1: ( ruleQualifiedName )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23696:1: ( ( ruleQualifiedName ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23697:1: ( ruleQualifiedName )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getCheckCheckCrossReference_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23811:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23812:1: ruleQualifiedName
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23698:1: ( ruleQualifiedName )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23699:1: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getCheckCheckQualifiedNameParserRuleCall_2_0_1()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_rule__XIssueExpression__CheckAssignment_247938);
+            pushFollow(FOLLOW_ruleQualifiedName_in_rule__XIssueExpression__CheckAssignment_247713);
             ruleQualifiedName();
 
             state._fsp--;
@@ -67967,28 +67647,28 @@ public final void rule__XIssueExpression__CheckAssignment_2() throws Recognition
 
 
     // $ANTLR start "rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23823:1: rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1 : ( ( ruleValidID ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23710:1: rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1 : ( ( ruleValidID ) ) ;
     public final void rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23827:1: ( ( ( ruleValidID ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23828:1: ( ( ruleValidID ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23714:1: ( ( ( ruleValidID ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23715:1: ( ( ruleValidID ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23828:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23829:1: ( ruleValidID )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23715:1: ( ( ruleValidID ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23716:1: ( ruleValidID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getMarkerFeatureEStructuralFeatureCrossReference_3_1_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23830:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23831:1: ruleValidID
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23717:1: ( ruleValidID )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23718:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getMarkerFeatureEStructuralFeatureValidIDParserRuleCall_3_1_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_147977);
+            pushFollow(FOLLOW_ruleValidID_in_rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_147752);
             ruleValidID();
 
             state._fsp--;
@@ -68024,22 +67704,22 @@ public final void rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1() thro
 
 
     // $ANTLR start "rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23842:1: rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23729:1: rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0 : ( ruleXExpression ) ;
     public final void rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23846:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23847:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23733:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23734:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23847:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23848:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23734:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23735:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getMarkerObjectXExpressionParserRuleCall_3_1_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XIssueExpression__MarkerObjectAssignment_3_1_1_048012);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XIssueExpression__MarkerObjectAssignment_3_1_1_047787);
             ruleXExpression();
 
             state._fsp--;
@@ -68069,28 +67749,28 @@ public final void rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0() throw
 
 
     // $ANTLR start "rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23857:1: rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1 : ( ( ruleFeatureCallID ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23744:1: rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1 : ( ( ruleFeatureCallID ) ) ;
     public final void rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23861:1: ( ( ( ruleFeatureCallID ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23862:1: ( ( ruleFeatureCallID ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23748:1: ( ( ( ruleFeatureCallID ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23749:1: ( ( ruleFeatureCallID ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23862:1: ( ( ruleFeatureCallID ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23863:1: ( ruleFeatureCallID )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23749:1: ( ( ruleFeatureCallID ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23750:1: ( ruleFeatureCallID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getMarkerFeatureEStructuralFeatureCrossReference_3_1_1_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23864:1: ( ruleFeatureCallID )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23865:1: ruleFeatureCallID
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23751:1: ( ruleFeatureCallID )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23752:1: ruleFeatureCallID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getMarkerFeatureEStructuralFeatureFeatureCallIDParserRuleCall_3_1_1_1_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleFeatureCallID_in_rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_148047);
+            pushFollow(FOLLOW_ruleFeatureCallID_in_rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_147822);
             ruleFeatureCallID();
 
             state._fsp--;
@@ -68126,22 +67806,22 @@ public final void rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1() th
 
 
     // $ANTLR start "rule__XIssueExpression__MarkerIndexAssignment_3_2_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23876:1: rule__XIssueExpression__MarkerIndexAssignment_3_2_1 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23763:1: rule__XIssueExpression__MarkerIndexAssignment_3_2_1 : ( ruleXExpression ) ;
     public final void rule__XIssueExpression__MarkerIndexAssignment_3_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23880:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23881:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23767:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23768:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23881:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23882:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23768:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23769:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getMarkerIndexXExpressionParserRuleCall_3_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XIssueExpression__MarkerIndexAssignment_3_2_148082);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XIssueExpression__MarkerIndexAssignment_3_2_147857);
             ruleXExpression();
 
             state._fsp--;
@@ -68171,22 +67851,22 @@ public final void rule__XIssueExpression__MarkerIndexAssignment_3_2_1() throws R
 
 
     // $ANTLR start "rule__XIssueExpression__MessageAssignment_4_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23891:1: rule__XIssueExpression__MessageAssignment_4_1 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23778:1: rule__XIssueExpression__MessageAssignment_4_1 : ( ruleXExpression ) ;
     public final void rule__XIssueExpression__MessageAssignment_4_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23895:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23896:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23782:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23783:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23896:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23897:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23783:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23784:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getMessageXExpressionParserRuleCall_4_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XIssueExpression__MessageAssignment_4_148113);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XIssueExpression__MessageAssignment_4_147888);
             ruleXExpression();
 
             state._fsp--;
@@ -68216,22 +67896,22 @@ public final void rule__XIssueExpression__MessageAssignment_4_1() throws Recogni
 
 
     // $ANTLR start "rule__XIssueExpression__MessageParametersAssignment_5_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23906:1: rule__XIssueExpression__MessageParametersAssignment_5_2 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23793:1: rule__XIssueExpression__MessageParametersAssignment_5_2 : ( ruleXExpression ) ;
     public final void rule__XIssueExpression__MessageParametersAssignment_5_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23910:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23911:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23797:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23798:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23911:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23912:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23798:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23799:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getMessageParametersXExpressionParserRuleCall_5_2_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XIssueExpression__MessageParametersAssignment_5_248144);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XIssueExpression__MessageParametersAssignment_5_247919);
             ruleXExpression();
 
             state._fsp--;
@@ -68261,22 +67941,22 @@ public final void rule__XIssueExpression__MessageParametersAssignment_5_2() thro
 
 
     // $ANTLR start "rule__XIssueExpression__MessageParametersAssignment_5_3_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23921:1: rule__XIssueExpression__MessageParametersAssignment_5_3_1 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23808:1: rule__XIssueExpression__MessageParametersAssignment_5_3_1 : ( ruleXExpression ) ;
     public final void rule__XIssueExpression__MessageParametersAssignment_5_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23925:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23926:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23812:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23813:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23926:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23927:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23813:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23814:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getMessageParametersXExpressionParserRuleCall_5_3_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XIssueExpression__MessageParametersAssignment_5_3_148175);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XIssueExpression__MessageParametersAssignment_5_3_147950);
             ruleXExpression();
 
             state._fsp--;
@@ -68306,22 +67986,22 @@ public final void rule__XIssueExpression__MessageParametersAssignment_5_3_1() th
 
 
     // $ANTLR start "rule__XIssueExpression__IssueCodeAssignment_6_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23936:1: rule__XIssueExpression__IssueCodeAssignment_6_1 : ( ruleValidID ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23823:1: rule__XIssueExpression__IssueCodeAssignment_6_1 : ( ruleValidID ) ;
     public final void rule__XIssueExpression__IssueCodeAssignment_6_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23940:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23941:1: ( ruleValidID )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23827:1: ( ( ruleValidID ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23828:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23941:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23942:1: ruleValidID
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23828:1: ( ruleValidID )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23829:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getIssueCodeValidIDParserRuleCall_6_1_0()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__XIssueExpression__IssueCodeAssignment_6_148206);
+            pushFollow(FOLLOW_ruleValidID_in_rule__XIssueExpression__IssueCodeAssignment_6_147981);
             ruleValidID();
 
             state._fsp--;
@@ -68351,22 +68031,22 @@ public final void rule__XIssueExpression__IssueCodeAssignment_6_1() throws Recog
 
 
     // $ANTLR start "rule__XIssueExpression__IssueDataAssignment_6_3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23951:1: rule__XIssueExpression__IssueDataAssignment_6_3 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23838:1: rule__XIssueExpression__IssueDataAssignment_6_3 : ( ruleXExpression ) ;
     public final void rule__XIssueExpression__IssueDataAssignment_6_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23955:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23956:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23842:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23843:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23956:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23957:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23843:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23844:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getIssueDataXExpressionParserRuleCall_6_3_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XIssueExpression__IssueDataAssignment_6_348237);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XIssueExpression__IssueDataAssignment_6_348012);
             ruleXExpression();
 
             state._fsp--;
@@ -68396,22 +68076,22 @@ public final void rule__XIssueExpression__IssueDataAssignment_6_3() throws Recog
 
 
     // $ANTLR start "rule__XIssueExpression__IssueDataAssignment_6_4_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23966:1: rule__XIssueExpression__IssueDataAssignment_6_4_1 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23853:1: rule__XIssueExpression__IssueDataAssignment_6_4_1 : ( ruleXExpression ) ;
     public final void rule__XIssueExpression__IssueDataAssignment_6_4_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23970:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23971:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23857:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23858:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23971:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23972:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23858:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23859:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getIssueDataXExpressionParserRuleCall_6_4_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XIssueExpression__IssueDataAssignment_6_4_148268);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XIssueExpression__IssueDataAssignment_6_4_148043);
             ruleXExpression();
 
             state._fsp--;
@@ -68441,28 +68121,28 @@ public final void rule__XIssueExpression__IssueDataAssignment_6_4_1() throws Rec
 
 
     // $ANTLR start "rule__XAnnotation__AnnotationTypeAssignment_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23981:1: rule__XAnnotation__AnnotationTypeAssignment_2 : ( ( ruleQualifiedName ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23868:1: rule__XAnnotation__AnnotationTypeAssignment_2 : ( ( ruleQualifiedName ) ) ;
     public final void rule__XAnnotation__AnnotationTypeAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23985:1: ( ( ( ruleQualifiedName ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23986:1: ( ( ruleQualifiedName ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23872:1: ( ( ( ruleQualifiedName ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23873:1: ( ( ruleQualifiedName ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23986:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23987:1: ( ruleQualifiedName )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23873:1: ( ( ruleQualifiedName ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23874:1: ( ruleQualifiedName )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getAnnotationTypeJvmAnnotationTypeCrossReference_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23988:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23989:1: ruleQualifiedName
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23875:1: ( ruleQualifiedName )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23876:1: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getAnnotationTypeJvmAnnotationTypeQualifiedNameParserRuleCall_2_0_1()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_rule__XAnnotation__AnnotationTypeAssignment_248303);
+            pushFollow(FOLLOW_ruleQualifiedName_in_rule__XAnnotation__AnnotationTypeAssignment_248078);
             ruleQualifiedName();
 
             state._fsp--;
@@ -68498,22 +68178,22 @@ public final void rule__XAnnotation__AnnotationTypeAssignment_2() throws Recogni
 
 
     // $ANTLR start "rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24000:1: rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 : ( ruleXAnnotationElementValuePair ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23887:1: rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 : ( ruleXAnnotationElementValuePair ) ;
     public final void rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24004:1: ( ( ruleXAnnotationElementValuePair ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24005:1: ( ruleXAnnotationElementValuePair )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23891:1: ( ( ruleXAnnotationElementValuePair ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23892:1: ( ruleXAnnotationElementValuePair )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24005:1: ( ruleXAnnotationElementValuePair )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24006:1: ruleXAnnotationElementValuePair
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23892:1: ( ruleXAnnotationElementValuePair )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23893:1: ruleXAnnotationElementValuePair
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getElementValuePairsXAnnotationElementValuePairParserRuleCall_3_1_0_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationElementValuePair_in_rule__XAnnotation__ElementValuePairsAssignment_3_1_0_048338);
+            pushFollow(FOLLOW_ruleXAnnotationElementValuePair_in_rule__XAnnotation__ElementValuePairsAssignment_3_1_0_048113);
             ruleXAnnotationElementValuePair();
 
             state._fsp--;
@@ -68543,22 +68223,22 @@ public final void rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0() throw
 
 
     // $ANTLR start "rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24015:1: rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 : ( ruleXAnnotationElementValuePair ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23902:1: rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 : ( ruleXAnnotationElementValuePair ) ;
     public final void rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24019:1: ( ( ruleXAnnotationElementValuePair ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24020:1: ( ruleXAnnotationElementValuePair )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23906:1: ( ( ruleXAnnotationElementValuePair ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23907:1: ( ruleXAnnotationElementValuePair )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24020:1: ( ruleXAnnotationElementValuePair )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24021:1: ruleXAnnotationElementValuePair
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23907:1: ( ruleXAnnotationElementValuePair )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23908:1: ruleXAnnotationElementValuePair
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getElementValuePairsXAnnotationElementValuePairParserRuleCall_3_1_0_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationElementValuePair_in_rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_148369);
+            pushFollow(FOLLOW_ruleXAnnotationElementValuePair_in_rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_148144);
             ruleXAnnotationElementValuePair();
 
             state._fsp--;
@@ -68588,22 +68268,22 @@ public final void rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1() thr
 
 
     // $ANTLR start "rule__XAnnotation__ValueAssignment_3_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24030:1: rule__XAnnotation__ValueAssignment_3_1_1 : ( ruleXAnnotationElementValueOrCommaList ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23917:1: rule__XAnnotation__ValueAssignment_3_1_1 : ( ruleXAnnotationElementValueOrCommaList ) ;
     public final void rule__XAnnotation__ValueAssignment_3_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24034:1: ( ( ruleXAnnotationElementValueOrCommaList ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24035:1: ( ruleXAnnotationElementValueOrCommaList )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23921:1: ( ( ruleXAnnotationElementValueOrCommaList ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23922:1: ( ruleXAnnotationElementValueOrCommaList )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24035:1: ( ruleXAnnotationElementValueOrCommaList )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24036:1: ruleXAnnotationElementValueOrCommaList
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23922:1: ( ruleXAnnotationElementValueOrCommaList )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23923:1: ruleXAnnotationElementValueOrCommaList
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getValueXAnnotationElementValueOrCommaListParserRuleCall_3_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationElementValueOrCommaList_in_rule__XAnnotation__ValueAssignment_3_1_148400);
+            pushFollow(FOLLOW_ruleXAnnotationElementValueOrCommaList_in_rule__XAnnotation__ValueAssignment_3_1_148175);
             ruleXAnnotationElementValueOrCommaList();
 
             state._fsp--;
@@ -68633,28 +68313,28 @@ public final void rule__XAnnotation__ValueAssignment_3_1_1() throws RecognitionE
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__ElementAssignment_0_0_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24045:1: rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 : ( ( ruleValidID ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23932:1: rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 : ( ( ruleValidID ) ) ;
     public final void rule__XAnnotationElementValuePair__ElementAssignment_0_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24049:1: ( ( ( ruleValidID ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24050:1: ( ( ruleValidID ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23936:1: ( ( ( ruleValidID ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23937:1: ( ( ruleValidID ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24050:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24051:1: ( ruleValidID )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23937:1: ( ( ruleValidID ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23938:1: ( ruleValidID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getElementJvmOperationCrossReference_0_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24052:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24053:1: ruleValidID
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23939:1: ( ruleValidID )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23940:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getElementJvmOperationValidIDParserRuleCall_0_0_0_0_1()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__XAnnotationElementValuePair__ElementAssignment_0_0_048435);
+            pushFollow(FOLLOW_ruleValidID_in_rule__XAnnotationElementValuePair__ElementAssignment_0_0_048210);
             ruleValidID();
 
             state._fsp--;
@@ -68690,22 +68370,22 @@ public final void rule__XAnnotationElementValuePair__ElementAssignment_0_0_0() t
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__ValueAssignment_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24064:1: rule__XAnnotationElementValuePair__ValueAssignment_1 : ( ruleXAnnotationElementValue ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23951:1: rule__XAnnotationElementValuePair__ValueAssignment_1 : ( ruleXAnnotationElementValue ) ;
     public final void rule__XAnnotationElementValuePair__ValueAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24068:1: ( ( ruleXAnnotationElementValue ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24069:1: ( ruleXAnnotationElementValue )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23955:1: ( ( ruleXAnnotationElementValue ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23956:1: ( ruleXAnnotationElementValue )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24069:1: ( ruleXAnnotationElementValue )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24070:1: ruleXAnnotationElementValue
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23956:1: ( ruleXAnnotationElementValue )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23957:1: ruleXAnnotationElementValue
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getValueXAnnotationElementValueParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationElementValue_in_rule__XAnnotationElementValuePair__ValueAssignment_148470);
+            pushFollow(FOLLOW_ruleXAnnotationElementValue_in_rule__XAnnotationElementValuePair__ValueAssignment_148245);
             ruleXAnnotationElementValue();
 
             state._fsp--;
@@ -68735,22 +68415,22 @@ public final void rule__XAnnotationElementValuePair__ValueAssignment_1() throws
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24079:1: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 : ( ruleXAnnotationOrExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23966:1: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 : ( ruleXAnnotationOrExpression ) ;
     public final void rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24083:1: ( ( ruleXAnnotationOrExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24084:1: ( ruleXAnnotationOrExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23970:1: ( ( ruleXAnnotationOrExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23971:1: ( ruleXAnnotationOrExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24084:1: ( ruleXAnnotationOrExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24085:1: ruleXAnnotationOrExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23971:1: ( ruleXAnnotationOrExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23972:1: ruleXAnnotationOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsXAnnotationOrExpressionParserRuleCall_0_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_048501);
+            pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_048276);
             ruleXAnnotationOrExpression();
 
             state._fsp--;
@@ -68780,22 +68460,22 @@ public final void rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24094:1: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 : ( ruleXAnnotationOrExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23981:1: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 : ( ruleXAnnotationOrExpression ) ;
     public final void rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24098:1: ( ( ruleXAnnotationOrExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24099:1: ( ruleXAnnotationOrExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23985:1: ( ( ruleXAnnotationOrExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23986:1: ( ruleXAnnotationOrExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24099:1: ( ruleXAnnotationOrExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24100:1: ruleXAnnotationOrExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23986:1: ( ruleXAnnotationOrExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23987:1: ruleXAnnotationOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsXAnnotationOrExpressionParserRuleCall_0_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_148532);
+            pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_148307);
             ruleXAnnotationOrExpression();
 
             state._fsp--;
@@ -68825,22 +68505,22 @@ public final void rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24109:1: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 : ( ruleXAnnotationOrExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23996:1: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 : ( ruleXAnnotationOrExpression ) ;
     public final void rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24113:1: ( ( ruleXAnnotationOrExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24114:1: ( ruleXAnnotationOrExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24000:1: ( ( ruleXAnnotationOrExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24001:1: ( ruleXAnnotationOrExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24114:1: ( ruleXAnnotationOrExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24115:1: ruleXAnnotationOrExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24001:1: ( ruleXAnnotationOrExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24002:1: ruleXAnnotationOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsXAnnotationOrExpressionParserRuleCall_1_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_148563);
+            pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_148338);
             ruleXAnnotationOrExpression();
 
             state._fsp--;
@@ -68870,22 +68550,22 @@ public final void rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1
 
 
     // $ANTLR start "rule__XAnnotationElementValue__ElementsAssignment_0_1_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24124:1: rule__XAnnotationElementValue__ElementsAssignment_0_1_0 : ( ruleXAnnotationOrExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24011:1: rule__XAnnotationElementValue__ElementsAssignment_0_1_0 : ( ruleXAnnotationOrExpression ) ;
     public final void rule__XAnnotationElementValue__ElementsAssignment_0_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24128:1: ( ( ruleXAnnotationOrExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24129:1: ( ruleXAnnotationOrExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24015:1: ( ( ruleXAnnotationOrExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24016:1: ( ruleXAnnotationOrExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24129:1: ( ruleXAnnotationOrExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24130:1: ruleXAnnotationOrExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24016:1: ( ruleXAnnotationOrExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24017:1: ruleXAnnotationOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getElementsXAnnotationOrExpressionParserRuleCall_0_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValue__ElementsAssignment_0_1_048594);
+            pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValue__ElementsAssignment_0_1_048369);
             ruleXAnnotationOrExpression();
 
             state._fsp--;
@@ -68915,22 +68595,22 @@ public final void rule__XAnnotationElementValue__ElementsAssignment_0_1_0() thro
 
 
     // $ANTLR start "rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24139:1: rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 : ( ruleXAnnotationOrExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24026:1: rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 : ( ruleXAnnotationOrExpression ) ;
     public final void rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24143:1: ( ( ruleXAnnotationOrExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24144:1: ( ruleXAnnotationOrExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24030:1: ( ( ruleXAnnotationOrExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24031:1: ( ruleXAnnotationOrExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24144:1: ( ruleXAnnotationOrExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24145:1: ruleXAnnotationOrExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24031:1: ( ruleXAnnotationOrExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24032:1: ruleXAnnotationOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getElementsXAnnotationOrExpressionParserRuleCall_0_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValue__ElementsAssignment_0_1_1_148625);
+            pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValue__ElementsAssignment_0_1_1_148400);
             ruleXAnnotationOrExpression();
 
             state._fsp--;
@@ -68960,28 +68640,28 @@ public final void rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1() th
 
 
     // $ANTLR start "rule__XAssignment__FeatureAssignment_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24154:1: rule__XAssignment__FeatureAssignment_0_1 : ( ( ruleFeatureCallID ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24041:1: rule__XAssignment__FeatureAssignment_0_1 : ( ( ruleFeatureCallID ) ) ;
     public final void rule__XAssignment__FeatureAssignment_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24158:1: ( ( ( ruleFeatureCallID ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24159:1: ( ( ruleFeatureCallID ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24045:1: ( ( ( ruleFeatureCallID ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24046:1: ( ( ruleFeatureCallID ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24159:1: ( ( ruleFeatureCallID ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24160:1: ( ruleFeatureCallID )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24046:1: ( ( ruleFeatureCallID ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24047:1: ( ruleFeatureCallID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getFeatureJvmIdentifiableElementCrossReference_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24161:1: ( ruleFeatureCallID )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24162:1: ruleFeatureCallID
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24048:1: ( ruleFeatureCallID )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24049:1: ruleFeatureCallID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getFeatureJvmIdentifiableElementFeatureCallIDParserRuleCall_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleFeatureCallID_in_rule__XAssignment__FeatureAssignment_0_148660);
+            pushFollow(FOLLOW_ruleFeatureCallID_in_rule__XAssignment__FeatureAssignment_0_148435);
             ruleFeatureCallID();
 
             state._fsp--;
@@ -69017,22 +68697,22 @@ public final void rule__XAssignment__FeatureAssignment_0_1() throws RecognitionE
 
 
     // $ANTLR start "rule__XAssignment__ValueAssignment_0_3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24173:1: rule__XAssignment__ValueAssignment_0_3 : ( ruleXAssignment ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24060:1: rule__XAssignment__ValueAssignment_0_3 : ( ruleXAssignment ) ;
     public final void rule__XAssignment__ValueAssignment_0_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24177:1: ( ( ruleXAssignment ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24178:1: ( ruleXAssignment )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24064:1: ( ( ruleXAssignment ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24065:1: ( ruleXAssignment )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24178:1: ( ruleXAssignment )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24179:1: ruleXAssignment
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24065:1: ( ruleXAssignment )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24066:1: ruleXAssignment
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getValueXAssignmentParserRuleCall_0_3_0()); 
             }
-            pushFollow(FOLLOW_ruleXAssignment_in_rule__XAssignment__ValueAssignment_0_348695);
+            pushFollow(FOLLOW_ruleXAssignment_in_rule__XAssignment__ValueAssignment_0_348470);
             ruleXAssignment();
 
             state._fsp--;
@@ -69062,28 +68742,28 @@ public final void rule__XAssignment__ValueAssignment_0_3() throws RecognitionExc
 
 
     // $ANTLR start "rule__XAssignment__FeatureAssignment_1_1_0_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24188:1: rule__XAssignment__FeatureAssignment_1_1_0_0_1 : ( ( ruleOpMultiAssign ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24075:1: rule__XAssignment__FeatureAssignment_1_1_0_0_1 : ( ( ruleOpMultiAssign ) ) ;
     public final void rule__XAssignment__FeatureAssignment_1_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24192:1: ( ( ( ruleOpMultiAssign ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24193:1: ( ( ruleOpMultiAssign ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24079:1: ( ( ( ruleOpMultiAssign ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24080:1: ( ( ruleOpMultiAssign ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24193:1: ( ( ruleOpMultiAssign ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24194:1: ( ruleOpMultiAssign )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24080:1: ( ( ruleOpMultiAssign ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24081:1: ( ruleOpMultiAssign )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getFeatureJvmIdentifiableElementCrossReference_1_1_0_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24195:1: ( ruleOpMultiAssign )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24196:1: ruleOpMultiAssign
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24082:1: ( ruleOpMultiAssign )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24083:1: ruleOpMultiAssign
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getFeatureJvmIdentifiableElementOpMultiAssignParserRuleCall_1_1_0_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpMultiAssign_in_rule__XAssignment__FeatureAssignment_1_1_0_0_148730);
+            pushFollow(FOLLOW_ruleOpMultiAssign_in_rule__XAssignment__FeatureAssignment_1_1_0_0_148505);
             ruleOpMultiAssign();
 
             state._fsp--;
@@ -69119,22 +68799,22 @@ public final void rule__XAssignment__FeatureAssignment_1_1_0_0_1() throws Recogn
 
 
     // $ANTLR start "rule__XAssignment__RightOperandAssignment_1_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24207:1: rule__XAssignment__RightOperandAssignment_1_1_1 : ( ruleXAssignment ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24094:1: rule__XAssignment__RightOperandAssignment_1_1_1 : ( ruleXAssignment ) ;
     public final void rule__XAssignment__RightOperandAssignment_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24211:1: ( ( ruleXAssignment ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24212:1: ( ruleXAssignment )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24098:1: ( ( ruleXAssignment ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24099:1: ( ruleXAssignment )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24212:1: ( ruleXAssignment )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24213:1: ruleXAssignment
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24099:1: ( ruleXAssignment )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24100:1: ruleXAssignment
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getRightOperandXAssignmentParserRuleCall_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXAssignment_in_rule__XAssignment__RightOperandAssignment_1_1_148765);
+            pushFollow(FOLLOW_ruleXAssignment_in_rule__XAssignment__RightOperandAssignment_1_1_148540);
             ruleXAssignment();
 
             state._fsp--;
@@ -69164,28 +68844,28 @@ public final void rule__XAssignment__RightOperandAssignment_1_1_1() throws Recog
 
 
     // $ANTLR start "rule__XOrExpression__FeatureAssignment_1_0_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24222:1: rule__XOrExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpOr ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24109:1: rule__XOrExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpOr ) ) ;
     public final void rule__XOrExpression__FeatureAssignment_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24226:1: ( ( ( ruleOpOr ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24227:1: ( ( ruleOpOr ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24113:1: ( ( ( ruleOpOr ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24114:1: ( ( ruleOpOr ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24227:1: ( ( ruleOpOr ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24228:1: ( ruleOpOr )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24114:1: ( ( ruleOpOr ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24115:1: ( ruleOpOr )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24229:1: ( ruleOpOr )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24230:1: ruleOpOr
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24116:1: ( ruleOpOr )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24117:1: ruleOpOr
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getFeatureJvmIdentifiableElementOpOrParserRuleCall_1_0_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpOr_in_rule__XOrExpression__FeatureAssignment_1_0_0_148800);
+            pushFollow(FOLLOW_ruleOpOr_in_rule__XOrExpression__FeatureAssignment_1_0_0_148575);
             ruleOpOr();
 
             state._fsp--;
@@ -69221,22 +68901,22 @@ public final void rule__XOrExpression__FeatureAssignment_1_0_0_1() throws Recogn
 
 
     // $ANTLR start "rule__XOrExpression__RightOperandAssignment_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24241:1: rule__XOrExpression__RightOperandAssignment_1_1 : ( ruleXAndExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24128:1: rule__XOrExpression__RightOperandAssignment_1_1 : ( ruleXAndExpression ) ;
     public final void rule__XOrExpression__RightOperandAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24245:1: ( ( ruleXAndExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24246:1: ( ruleXAndExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24132:1: ( ( ruleXAndExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24133:1: ( ruleXAndExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24246:1: ( ruleXAndExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24247:1: ruleXAndExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24133:1: ( ruleXAndExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24134:1: ruleXAndExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getRightOperandXAndExpressionParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXAndExpression_in_rule__XOrExpression__RightOperandAssignment_1_148835);
+            pushFollow(FOLLOW_ruleXAndExpression_in_rule__XOrExpression__RightOperandAssignment_1_148610);
             ruleXAndExpression();
 
             state._fsp--;
@@ -69266,28 +68946,28 @@ public final void rule__XOrExpression__RightOperandAssignment_1_1() throws Recog
 
 
     // $ANTLR start "rule__XAndExpression__FeatureAssignment_1_0_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24256:1: rule__XAndExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpAnd ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24143:1: rule__XAndExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpAnd ) ) ;
     public final void rule__XAndExpression__FeatureAssignment_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24260:1: ( ( ( ruleOpAnd ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24261:1: ( ( ruleOpAnd ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24147:1: ( ( ( ruleOpAnd ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24148:1: ( ( ruleOpAnd ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24261:1: ( ( ruleOpAnd ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24262:1: ( ruleOpAnd )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24148:1: ( ( ruleOpAnd ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24149:1: ( ruleOpAnd )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24263:1: ( ruleOpAnd )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24264:1: ruleOpAnd
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24150:1: ( ruleOpAnd )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24151:1: ruleOpAnd
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getFeatureJvmIdentifiableElementOpAndParserRuleCall_1_0_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpAnd_in_rule__XAndExpression__FeatureAssignment_1_0_0_148870);
+            pushFollow(FOLLOW_ruleOpAnd_in_rule__XAndExpression__FeatureAssignment_1_0_0_148645);
             ruleOpAnd();
 
             state._fsp--;
@@ -69323,22 +69003,22 @@ public final void rule__XAndExpression__FeatureAssignment_1_0_0_1() throws Recog
 
 
     // $ANTLR start "rule__XAndExpression__RightOperandAssignment_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24275:1: rule__XAndExpression__RightOperandAssignment_1_1 : ( ruleXEqualityExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24162:1: rule__XAndExpression__RightOperandAssignment_1_1 : ( ruleXEqualityExpression ) ;
     public final void rule__XAndExpression__RightOperandAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24279:1: ( ( ruleXEqualityExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24280:1: ( ruleXEqualityExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24166:1: ( ( ruleXEqualityExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24167:1: ( ruleXEqualityExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24280:1: ( ruleXEqualityExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24281:1: ruleXEqualityExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24167:1: ( ruleXEqualityExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24168:1: ruleXEqualityExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getRightOperandXEqualityExpressionParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXEqualityExpression_in_rule__XAndExpression__RightOperandAssignment_1_148905);
+            pushFollow(FOLLOW_ruleXEqualityExpression_in_rule__XAndExpression__RightOperandAssignment_1_148680);
             ruleXEqualityExpression();
 
             state._fsp--;
@@ -69368,28 +69048,28 @@ public final void rule__XAndExpression__RightOperandAssignment_1_1() throws Reco
 
 
     // $ANTLR start "rule__XEqualityExpression__FeatureAssignment_1_0_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24290:1: rule__XEqualityExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpEquality ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24177:1: rule__XEqualityExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpEquality ) ) ;
     public final void rule__XEqualityExpression__FeatureAssignment_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24294:1: ( ( ( ruleOpEquality ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24295:1: ( ( ruleOpEquality ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24181:1: ( ( ( ruleOpEquality ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24182:1: ( ( ruleOpEquality ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24295:1: ( ( ruleOpEquality ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24296:1: ( ruleOpEquality )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24182:1: ( ( ruleOpEquality ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24183:1: ( ruleOpEquality )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24297:1: ( ruleOpEquality )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24298:1: ruleOpEquality
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24184:1: ( ruleOpEquality )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24185:1: ruleOpEquality
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getFeatureJvmIdentifiableElementOpEqualityParserRuleCall_1_0_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpEquality_in_rule__XEqualityExpression__FeatureAssignment_1_0_0_148940);
+            pushFollow(FOLLOW_ruleOpEquality_in_rule__XEqualityExpression__FeatureAssignment_1_0_0_148715);
             ruleOpEquality();
 
             state._fsp--;
@@ -69425,22 +69105,22 @@ public final void rule__XEqualityExpression__FeatureAssignment_1_0_0_1() throws
 
 
     // $ANTLR start "rule__XEqualityExpression__RightOperandAssignment_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24309:1: rule__XEqualityExpression__RightOperandAssignment_1_1 : ( ruleXRelationalExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24196:1: rule__XEqualityExpression__RightOperandAssignment_1_1 : ( ruleXRelationalExpression ) ;
     public final void rule__XEqualityExpression__RightOperandAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24313:1: ( ( ruleXRelationalExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24314:1: ( ruleXRelationalExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24200:1: ( ( ruleXRelationalExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24201:1: ( ruleXRelationalExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24314:1: ( ruleXRelationalExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24315:1: ruleXRelationalExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24201:1: ( ruleXRelationalExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24202:1: ruleXRelationalExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getRightOperandXRelationalExpressionParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXRelationalExpression_in_rule__XEqualityExpression__RightOperandAssignment_1_148975);
+            pushFollow(FOLLOW_ruleXRelationalExpression_in_rule__XEqualityExpression__RightOperandAssignment_1_148750);
             ruleXRelationalExpression();
 
             state._fsp--;
@@ -69470,22 +69150,22 @@ public final void rule__XEqualityExpression__RightOperandAssignment_1_1() throws
 
 
     // $ANTLR start "rule__XRelationalExpression__TypeAssignment_1_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24324:1: rule__XRelationalExpression__TypeAssignment_1_0_1 : ( ruleJvmTypeReference ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24211:1: rule__XRelationalExpression__TypeAssignment_1_0_1 : ( ruleJvmTypeReference ) ;
     public final void rule__XRelationalExpression__TypeAssignment_1_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24328:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24329:1: ( ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24215:1: ( ( ruleJvmTypeReference ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24216:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24329:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24330:1: ruleJvmTypeReference
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24216:1: ( ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24217:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getTypeJvmTypeReferenceParserRuleCall_1_0_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__XRelationalExpression__TypeAssignment_1_0_149006);
+            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__XRelationalExpression__TypeAssignment_1_0_148781);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -69515,28 +69195,28 @@ public final void rule__XRelationalExpression__TypeAssignment_1_0_1() throws Rec
 
 
     // $ANTLR start "rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24339:1: rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 : ( ( ruleOpCompare ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24226:1: rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 : ( ( ruleOpCompare ) ) ;
     public final void rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24343:1: ( ( ( ruleOpCompare ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24344:1: ( ( ruleOpCompare ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24230:1: ( ( ( ruleOpCompare ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24231:1: ( ( ruleOpCompare ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24344:1: ( ( ruleOpCompare ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24345:1: ( ruleOpCompare )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24231:1: ( ( ruleOpCompare ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24232:1: ( ruleOpCompare )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_1_0_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24346:1: ( ruleOpCompare )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24347:1: ruleOpCompare
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24233:1: ( ruleOpCompare )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24234:1: ruleOpCompare
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getFeatureJvmIdentifiableElementOpCompareParserRuleCall_1_1_0_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpCompare_in_rule__XRelationalExpression__FeatureAssignment_1_1_0_0_149041);
+            pushFollow(FOLLOW_ruleOpCompare_in_rule__XRelationalExpression__FeatureAssignment_1_1_0_0_148816);
             ruleOpCompare();
 
             state._fsp--;
@@ -69572,22 +69252,22 @@ public final void rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1() thr
 
 
     // $ANTLR start "rule__XRelationalExpression__RightOperandAssignment_1_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24358:1: rule__XRelationalExpression__RightOperandAssignment_1_1_1 : ( ruleXOtherOperatorExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24245:1: rule__XRelationalExpression__RightOperandAssignment_1_1_1 : ( ruleXOtherOperatorExpression ) ;
     public final void rule__XRelationalExpression__RightOperandAssignment_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24362:1: ( ( ruleXOtherOperatorExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24363:1: ( ruleXOtherOperatorExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24249:1: ( ( ruleXOtherOperatorExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24250:1: ( ruleXOtherOperatorExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24363:1: ( ruleXOtherOperatorExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24364:1: ruleXOtherOperatorExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24250:1: ( ruleXOtherOperatorExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24251:1: ruleXOtherOperatorExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getRightOperandXOtherOperatorExpressionParserRuleCall_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXOtherOperatorExpression_in_rule__XRelationalExpression__RightOperandAssignment_1_1_149076);
+            pushFollow(FOLLOW_ruleXOtherOperatorExpression_in_rule__XRelationalExpression__RightOperandAssignment_1_1_148851);
             ruleXOtherOperatorExpression();
 
             state._fsp--;
@@ -69617,28 +69297,28 @@ public final void rule__XRelationalExpression__RightOperandAssignment_1_1_1() th
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24373:1: rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpOther ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24260:1: rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpOther ) ) ;
     public final void rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24377:1: ( ( ( ruleOpOther ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24378:1: ( ( ruleOpOther ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24264:1: ( ( ( ruleOpOther ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24265:1: ( ( ruleOpOther ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24378:1: ( ( ruleOpOther ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24379:1: ( ruleOpOther )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24265:1: ( ( ruleOpOther ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24266:1: ( ruleOpOther )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24380:1: ( ruleOpOther )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24381:1: ruleOpOther
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24267:1: ( ruleOpOther )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24268:1: ruleOpOther
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getFeatureJvmIdentifiableElementOpOtherParserRuleCall_1_0_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpOther_in_rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_149111);
+            pushFollow(FOLLOW_ruleOpOther_in_rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_148886);
             ruleOpOther();
 
             state._fsp--;
@@ -69674,22 +69354,22 @@ public final void rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1() th
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__RightOperandAssignment_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24392:1: rule__XOtherOperatorExpression__RightOperandAssignment_1_1 : ( ruleXAdditiveExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24279:1: rule__XOtherOperatorExpression__RightOperandAssignment_1_1 : ( ruleXAdditiveExpression ) ;
     public final void rule__XOtherOperatorExpression__RightOperandAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24396:1: ( ( ruleXAdditiveExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24397:1: ( ruleXAdditiveExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24283:1: ( ( ruleXAdditiveExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24284:1: ( ruleXAdditiveExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24397:1: ( ruleXAdditiveExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24398:1: ruleXAdditiveExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24284:1: ( ruleXAdditiveExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24285:1: ruleXAdditiveExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getRightOperandXAdditiveExpressionParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXAdditiveExpression_in_rule__XOtherOperatorExpression__RightOperandAssignment_1_149146);
+            pushFollow(FOLLOW_ruleXAdditiveExpression_in_rule__XOtherOperatorExpression__RightOperandAssignment_1_148921);
             ruleXAdditiveExpression();
 
             state._fsp--;
@@ -69719,28 +69399,28 @@ public final void rule__XOtherOperatorExpression__RightOperandAssignment_1_1() t
 
 
     // $ANTLR start "rule__XAdditiveExpression__FeatureAssignment_1_0_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24407:1: rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpAdd ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24294:1: rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpAdd ) ) ;
     public final void rule__XAdditiveExpression__FeatureAssignment_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24411:1: ( ( ( ruleOpAdd ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24412:1: ( ( ruleOpAdd ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24298:1: ( ( ( ruleOpAdd ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24299:1: ( ( ruleOpAdd ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24412:1: ( ( ruleOpAdd ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24413:1: ( ruleOpAdd )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24299:1: ( ( ruleOpAdd ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24300:1: ( ruleOpAdd )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24414:1: ( ruleOpAdd )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24415:1: ruleOpAdd
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24301:1: ( ruleOpAdd )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24302:1: ruleOpAdd
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getFeatureJvmIdentifiableElementOpAddParserRuleCall_1_0_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpAdd_in_rule__XAdditiveExpression__FeatureAssignment_1_0_0_149181);
+            pushFollow(FOLLOW_ruleOpAdd_in_rule__XAdditiveExpression__FeatureAssignment_1_0_0_148956);
             ruleOpAdd();
 
             state._fsp--;
@@ -69776,22 +69456,22 @@ public final void rule__XAdditiveExpression__FeatureAssignment_1_0_0_1() throws
 
 
     // $ANTLR start "rule__XAdditiveExpression__RightOperandAssignment_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24426:1: rule__XAdditiveExpression__RightOperandAssignment_1_1 : ( ruleXMultiplicativeExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24313:1: rule__XAdditiveExpression__RightOperandAssignment_1_1 : ( ruleXMultiplicativeExpression ) ;
     public final void rule__XAdditiveExpression__RightOperandAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24430:1: ( ( ruleXMultiplicativeExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24431:1: ( ruleXMultiplicativeExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24317:1: ( ( ruleXMultiplicativeExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24318:1: ( ruleXMultiplicativeExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24431:1: ( ruleXMultiplicativeExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24432:1: ruleXMultiplicativeExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24318:1: ( ruleXMultiplicativeExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24319:1: ruleXMultiplicativeExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getRightOperandXMultiplicativeExpressionParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXMultiplicativeExpression_in_rule__XAdditiveExpression__RightOperandAssignment_1_149216);
+            pushFollow(FOLLOW_ruleXMultiplicativeExpression_in_rule__XAdditiveExpression__RightOperandAssignment_1_148991);
             ruleXMultiplicativeExpression();
 
             state._fsp--;
@@ -69821,28 +69501,28 @@ public final void rule__XAdditiveExpression__RightOperandAssignment_1_1() throws
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24441:1: rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpMulti ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24328:1: rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpMulti ) ) ;
     public final void rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24445:1: ( ( ( ruleOpMulti ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24446:1: ( ( ruleOpMulti ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24332:1: ( ( ( ruleOpMulti ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24333:1: ( ( ruleOpMulti ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24446:1: ( ( ruleOpMulti ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24447:1: ( ruleOpMulti )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24333:1: ( ( ruleOpMulti ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24334:1: ( ruleOpMulti )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24448:1: ( ruleOpMulti )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24449:1: ruleOpMulti
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24335:1: ( ruleOpMulti )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24336:1: ruleOpMulti
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getFeatureJvmIdentifiableElementOpMultiParserRuleCall_1_0_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpMulti_in_rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_149251);
+            pushFollow(FOLLOW_ruleOpMulti_in_rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_149026);
             ruleOpMulti();
 
             state._fsp--;
@@ -69878,22 +69558,22 @@ public final void rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1() t
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__RightOperandAssignment_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24460:1: rule__XMultiplicativeExpression__RightOperandAssignment_1_1 : ( ruleXUnaryOperation ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24347:1: rule__XMultiplicativeExpression__RightOperandAssignment_1_1 : ( ruleXUnaryOperation ) ;
     public final void rule__XMultiplicativeExpression__RightOperandAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24464:1: ( ( ruleXUnaryOperation ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24465:1: ( ruleXUnaryOperation )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24351:1: ( ( ruleXUnaryOperation ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24352:1: ( ruleXUnaryOperation )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24465:1: ( ruleXUnaryOperation )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24466:1: ruleXUnaryOperation
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24352:1: ( ruleXUnaryOperation )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24353:1: ruleXUnaryOperation
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getRightOperandXUnaryOperationParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXUnaryOperation_in_rule__XMultiplicativeExpression__RightOperandAssignment_1_149286);
+            pushFollow(FOLLOW_ruleXUnaryOperation_in_rule__XMultiplicativeExpression__RightOperandAssignment_1_149061);
             ruleXUnaryOperation();
 
             state._fsp--;
@@ -69923,28 +69603,28 @@ public final void rule__XMultiplicativeExpression__RightOperandAssignment_1_1()
 
 
     // $ANTLR start "rule__XUnaryOperation__FeatureAssignment_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24475:1: rule__XUnaryOperation__FeatureAssignment_0_1 : ( ( ruleOpUnary ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24362:1: rule__XUnaryOperation__FeatureAssignment_0_1 : ( ( ruleOpUnary ) ) ;
     public final void rule__XUnaryOperation__FeatureAssignment_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24479:1: ( ( ( ruleOpUnary ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24480:1: ( ( ruleOpUnary ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24366:1: ( ( ( ruleOpUnary ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24367:1: ( ( ruleOpUnary ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24480:1: ( ( ruleOpUnary ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24481:1: ( ruleOpUnary )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24367:1: ( ( ruleOpUnary ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24368:1: ( ruleOpUnary )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationAccess().getFeatureJvmIdentifiableElementCrossReference_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24482:1: ( ruleOpUnary )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24483:1: ruleOpUnary
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24369:1: ( ruleOpUnary )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24370:1: ruleOpUnary
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationAccess().getFeatureJvmIdentifiableElementOpUnaryParserRuleCall_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpUnary_in_rule__XUnaryOperation__FeatureAssignment_0_149321);
+            pushFollow(FOLLOW_ruleOpUnary_in_rule__XUnaryOperation__FeatureAssignment_0_149096);
             ruleOpUnary();
 
             state._fsp--;
@@ -69980,22 +69660,22 @@ public final void rule__XUnaryOperation__FeatureAssignment_0_1() throws Recognit
 
 
     // $ANTLR start "rule__XUnaryOperation__OperandAssignment_0_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24494:1: rule__XUnaryOperation__OperandAssignment_0_2 : ( ruleXUnaryOperation ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24381:1: rule__XUnaryOperation__OperandAssignment_0_2 : ( ruleXUnaryOperation ) ;
     public final void rule__XUnaryOperation__OperandAssignment_0_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24498:1: ( ( ruleXUnaryOperation ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24499:1: ( ruleXUnaryOperation )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24385:1: ( ( ruleXUnaryOperation ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24386:1: ( ruleXUnaryOperation )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24499:1: ( ruleXUnaryOperation )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24500:1: ruleXUnaryOperation
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24386:1: ( ruleXUnaryOperation )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24387:1: ruleXUnaryOperation
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationAccess().getOperandXUnaryOperationParserRuleCall_0_2_0()); 
             }
-            pushFollow(FOLLOW_ruleXUnaryOperation_in_rule__XUnaryOperation__OperandAssignment_0_249356);
+            pushFollow(FOLLOW_ruleXUnaryOperation_in_rule__XUnaryOperation__OperandAssignment_0_249131);
             ruleXUnaryOperation();
 
             state._fsp--;
@@ -70025,22 +69705,22 @@ public final void rule__XUnaryOperation__OperandAssignment_0_2() throws Recognit
 
 
     // $ANTLR start "rule__XCastedExpression__TypeAssignment_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24509:1: rule__XCastedExpression__TypeAssignment_1_1 : ( ruleJvmTypeReference ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24396:1: rule__XCastedExpression__TypeAssignment_1_1 : ( ruleJvmTypeReference ) ;
     public final void rule__XCastedExpression__TypeAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24513:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24514:1: ( ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24400:1: ( ( ruleJvmTypeReference ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24401:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24514:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24515:1: ruleJvmTypeReference
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24401:1: ( ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24402:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getTypeJvmTypeReferenceParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__XCastedExpression__TypeAssignment_1_149387);
+            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__XCastedExpression__TypeAssignment_1_149162);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -70070,28 +69750,28 @@ public final void rule__XCastedExpression__TypeAssignment_1_1() throws Recogniti
 
 
     // $ANTLR start "rule__XPostfixOperation__FeatureAssignment_1_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24524:1: rule__XPostfixOperation__FeatureAssignment_1_0_1 : ( ( ruleOpPostfix ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24411:1: rule__XPostfixOperation__FeatureAssignment_1_0_1 : ( ( ruleOpPostfix ) ) ;
     public final void rule__XPostfixOperation__FeatureAssignment_1_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24528:1: ( ( ( ruleOpPostfix ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24529:1: ( ( ruleOpPostfix ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24415:1: ( ( ( ruleOpPostfix ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24416:1: ( ( ruleOpPostfix ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24529:1: ( ( ruleOpPostfix ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24530:1: ( ruleOpPostfix )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24416:1: ( ( ruleOpPostfix ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24417:1: ( ruleOpPostfix )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24531:1: ( ruleOpPostfix )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24532:1: ruleOpPostfix
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24418:1: ( ruleOpPostfix )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24419:1: ruleOpPostfix
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getFeatureJvmIdentifiableElementOpPostfixParserRuleCall_1_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpPostfix_in_rule__XPostfixOperation__FeatureAssignment_1_0_149422);
+            pushFollow(FOLLOW_ruleOpPostfix_in_rule__XPostfixOperation__FeatureAssignment_1_0_149197);
             ruleOpPostfix();
 
             state._fsp--;
@@ -70127,28 +69807,28 @@ public final void rule__XPostfixOperation__FeatureAssignment_1_0_1() throws Reco
 
 
     // $ANTLR start "rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24543:1: rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 : ( ( '::' ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24430:1: rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 : ( ( '::' ) ) ;
     public final void rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24547:1: ( ( ( '::' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24548:1: ( ( '::' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24434:1: ( ( ( '::' ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24435:1: ( ( '::' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24548:1: ( ( '::' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24549:1: ( '::' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24435:1: ( ( '::' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24436:1: ( '::' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_0_0_0_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24550:1: ( '::' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24551:1: '::'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24437:1: ( '::' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24438:1: '::'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_0_0_0_1_1_0()); 
             }
-            match(input,104,FOLLOW_104_in_rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_149462); if (state.failed) return ;
+            match(input,104,FOLLOW_104_in_rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_149237); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_0_0_0_1_1_0()); 
             }
@@ -70180,28 +69860,28 @@ public final void rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1
 
 
     // $ANTLR start "rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24566:1: rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 : ( ( ruleFeatureCallID ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24453:1: rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 : ( ( ruleFeatureCallID ) ) ;
     public final void rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24570:1: ( ( ( ruleFeatureCallID ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24571:1: ( ( ruleFeatureCallID ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24457:1: ( ( ( ruleFeatureCallID ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24458:1: ( ( ruleFeatureCallID ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24571:1: ( ( ruleFeatureCallID ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24572:1: ( ruleFeatureCallID )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24458:1: ( ( ruleFeatureCallID ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24459:1: ( ruleFeatureCallID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_0_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24573:1: ( ruleFeatureCallID )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24574:1: ruleFeatureCallID
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24460:1: ( ruleFeatureCallID )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24461:1: ruleFeatureCallID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getFeatureJvmIdentifiableElementFeatureCallIDParserRuleCall_1_0_0_0_2_0_1()); 
             }
-            pushFollow(FOLLOW_ruleFeatureCallID_in_rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_249505);
+            pushFollow(FOLLOW_ruleFeatureCallID_in_rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_249280);
             ruleFeatureCallID();
 
             state._fsp--;
@@ -70237,22 +69917,22 @@ public final void rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2() throws
 
 
     // $ANTLR start "rule__XMemberFeatureCall__ValueAssignment_1_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24585:1: rule__XMemberFeatureCall__ValueAssignment_1_0_1 : ( ruleXAssignment ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24472:1: rule__XMemberFeatureCall__ValueAssignment_1_0_1 : ( ruleXAssignment ) ;
     public final void rule__XMemberFeatureCall__ValueAssignment_1_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24589:1: ( ( ruleXAssignment ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24590:1: ( ruleXAssignment )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24476:1: ( ( ruleXAssignment ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24477:1: ( ruleXAssignment )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24590:1: ( ruleXAssignment )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24591:1: ruleXAssignment
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24477:1: ( ruleXAssignment )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24478:1: ruleXAssignment
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getValueXAssignmentParserRuleCall_1_0_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXAssignment_in_rule__XMemberFeatureCall__ValueAssignment_1_0_149540);
+            pushFollow(FOLLOW_ruleXAssignment_in_rule__XMemberFeatureCall__ValueAssignment_1_0_149315);
             ruleXAssignment();
 
             state._fsp--;
@@ -70282,28 +69962,28 @@ public final void rule__XMemberFeatureCall__ValueAssignment_1_0_1() throws Recog
 
 
     // $ANTLR start "rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24600:1: rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 : ( ( '?.' ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24487:1: rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 : ( ( '?.' ) ) ;
     public final void rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24604:1: ( ( ( '?.' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24605:1: ( ( '?.' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24491:1: ( ( ( '?.' ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24492:1: ( ( '?.' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24605:1: ( ( '?.' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24606:1: ( '?.' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24492:1: ( ( '?.' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24493:1: ( '?.' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getNullSafeQuestionMarkFullStopKeyword_1_1_0_0_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24607:1: ( '?.' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24608:1: '?.'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24494:1: ( '?.' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24495:1: '?.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getNullSafeQuestionMarkFullStopKeyword_1_1_0_0_1_1_0()); 
             }
-            match(input,105,FOLLOW_105_in_rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_149576); if (state.failed) return ;
+            match(input,105,FOLLOW_105_in_rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_149351); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getNullSafeQuestionMarkFullStopKeyword_1_1_0_0_1_1_0()); 
             }
@@ -70335,28 +70015,28 @@ public final void rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1() thr
 
 
     // $ANTLR start "rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24623:1: rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 : ( ( '::' ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24510:1: rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 : ( ( '::' ) ) ;
     public final void rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24627:1: ( ( ( '::' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24628:1: ( ( '::' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24514:1: ( ( ( '::' ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24515:1: ( ( '::' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24628:1: ( ( '::' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24629:1: ( '::' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24515:1: ( ( '::' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24516:1: ( '::' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_1_0_0_1_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24630:1: ( '::' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24631:1: '::'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24517:1: ( '::' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24518:1: '::'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_1_0_0_1_2_0()); 
             }
-            match(input,104,FOLLOW_104_in_rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_249620); if (state.failed) return ;
+            match(input,104,FOLLOW_104_in_rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_249395); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_1_0_0_1_2_0()); 
             }
@@ -70388,22 +70068,22 @@ public final void rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2
 
 
     // $ANTLR start "rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24646:1: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 : ( ruleJvmArgumentTypeReference ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24533:1: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24650:1: ( ( ruleJvmArgumentTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24651:1: ( ruleJvmArgumentTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24537:1: ( ( ruleJvmArgumentTypeReference ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24538:1: ( ruleJvmArgumentTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24651:1: ( ruleJvmArgumentTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24652:1: ruleJvmArgumentTypeReference
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24538:1: ( ruleJvmArgumentTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24539:1: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_149659);
+            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_149434);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -70433,22 +70113,22 @@ public final void rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1() th
 
 
     // $ANTLR start "rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24661:1: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 : ( ruleJvmArgumentTypeReference ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24548:1: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24665:1: ( ( ruleJvmArgumentTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24666:1: ( ruleJvmArgumentTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24552:1: ( ( ruleJvmArgumentTypeReference ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24553:1: ( ruleJvmArgumentTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24666:1: ( ruleJvmArgumentTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24667:1: ruleJvmArgumentTypeReference
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24553:1: ( ruleJvmArgumentTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24554:1: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_1_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_149690);
+            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_149465);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -70478,28 +70158,28 @@ public final void rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1()
 
 
     // $ANTLR start "rule__XMemberFeatureCall__FeatureAssignment_1_1_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24676:1: rule__XMemberFeatureCall__FeatureAssignment_1_1_2 : ( ( ruleIdOrSuper ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24563:1: rule__XMemberFeatureCall__FeatureAssignment_1_1_2 : ( ( ruleIdOrSuper ) ) ;
     public final void rule__XMemberFeatureCall__FeatureAssignment_1_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24680:1: ( ( ( ruleIdOrSuper ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24681:1: ( ( ruleIdOrSuper ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24567:1: ( ( ( ruleIdOrSuper ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24568:1: ( ( ruleIdOrSuper ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24681:1: ( ( ruleIdOrSuper ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24682:1: ( ruleIdOrSuper )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24568:1: ( ( ruleIdOrSuper ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24569:1: ( ruleIdOrSuper )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getFeatureJvmIdentifiableElementCrossReference_1_1_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24683:1: ( ruleIdOrSuper )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24684:1: ruleIdOrSuper
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24570:1: ( ruleIdOrSuper )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24571:1: ruleIdOrSuper
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getFeatureJvmIdentifiableElementIdOrSuperParserRuleCall_1_1_2_0_1()); 
             }
-            pushFollow(FOLLOW_ruleIdOrSuper_in_rule__XMemberFeatureCall__FeatureAssignment_1_1_249725);
+            pushFollow(FOLLOW_ruleIdOrSuper_in_rule__XMemberFeatureCall__FeatureAssignment_1_1_249500);
             ruleIdOrSuper();
 
             state._fsp--;
@@ -70535,28 +70215,28 @@ public final void rule__XMemberFeatureCall__FeatureAssignment_1_1_2() throws Rec
 
 
     // $ANTLR start "rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24695:1: rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 : ( ( '(' ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24582:1: rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 : ( ( '(' ) ) ;
     public final void rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24699:1: ( ( ( '(' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24700:1: ( ( '(' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24586:1: ( ( ( '(' ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24587:1: ( ( '(' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24700:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24701:1: ( '(' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24587:1: ( ( '(' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24588:1: ( '(' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_1_1_3_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24702:1: ( '(' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24703:1: '('
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24589:1: ( '(' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24590:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_1_1_3_0_0()); 
             }
-            match(input,72,FOLLOW_72_in_rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_049765); if (state.failed) return ;
+            match(input,72,FOLLOW_72_in_rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_049540); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_1_1_3_0_0()); 
             }
@@ -70588,22 +70268,22 @@ public final void rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_
 
 
     // $ANTLR start "rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24718:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 : ( ruleXShortClosure ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24605:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 : ( ruleXShortClosure ) ;
     public final void rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24722:1: ( ( ruleXShortClosure ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24723:1: ( ruleXShortClosure )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24609:1: ( ( ruleXShortClosure ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24610:1: ( ruleXShortClosure )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24723:1: ( ruleXShortClosure )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24724:1: ruleXShortClosure
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24610:1: ( ruleXShortClosure )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24611:1: ruleXShortClosure
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXShortClosureParserRuleCall_1_1_3_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXShortClosure_in_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_049804);
+            pushFollow(FOLLOW_ruleXShortClosure_in_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_049579);
             ruleXShortClosure();
 
             state._fsp--;
@@ -70633,22 +70313,22 @@ public final void rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_
 
 
     // $ANTLR start "rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24733:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24620:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 : ( ruleXExpression ) ;
     public final void rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24737:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24738:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24624:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24625:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24738:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24739:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24625:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24626:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXExpressionParserRuleCall_1_1_3_1_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_049835);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_049610);
             ruleXExpression();
 
             state._fsp--;
@@ -70678,22 +70358,22 @@ public final void rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_
 
 
     // $ANTLR start "rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24748:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24635:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 : ( ruleXExpression ) ;
     public final void rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24752:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24753:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24639:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24640:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24753:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24754:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24640:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24641:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXExpressionParserRuleCall_1_1_3_1_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_149866);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_149641);
             ruleXExpression();
 
             state._fsp--;
@@ -70723,22 +70403,22 @@ public final void rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_
 
 
     // $ANTLR start "rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24763:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 : ( ruleXClosure ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24650:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 : ( ruleXClosure ) ;
     public final void rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24767:1: ( ( ruleXClosure ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24768:1: ( ruleXClosure )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24654:1: ( ( ruleXClosure ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24655:1: ( ruleXClosure )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24768:1: ( ruleXClosure )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24769:1: ruleXClosure
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24655:1: ( ruleXClosure )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24656:1: ruleXClosure
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXClosureParserRuleCall_1_1_4_0()); 
             }
-            pushFollow(FOLLOW_ruleXClosure_in_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_449897);
+            pushFollow(FOLLOW_ruleXClosure_in_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_449672);
             ruleXClosure();
 
             state._fsp--;
@@ -70768,22 +70448,22 @@ public final void rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4(
 
 
     // $ANTLR start "rule__XSetLiteral__ElementsAssignment_3_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24778:1: rule__XSetLiteral__ElementsAssignment_3_0 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24665:1: rule__XSetLiteral__ElementsAssignment_3_0 : ( ruleXExpression ) ;
     public final void rule__XSetLiteral__ElementsAssignment_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24782:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24783:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24669:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24670:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24783:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24784:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24670:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24671:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getElementsXExpressionParserRuleCall_3_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XSetLiteral__ElementsAssignment_3_049928);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XSetLiteral__ElementsAssignment_3_049703);
             ruleXExpression();
 
             state._fsp--;
@@ -70813,22 +70493,22 @@ public final void rule__XSetLiteral__ElementsAssignment_3_0() throws Recognition
 
 
     // $ANTLR start "rule__XSetLiteral__ElementsAssignment_3_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24793:1: rule__XSetLiteral__ElementsAssignment_3_1_1 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24680:1: rule__XSetLiteral__ElementsAssignment_3_1_1 : ( ruleXExpression ) ;
     public final void rule__XSetLiteral__ElementsAssignment_3_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24797:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24798:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24684:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24685:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24798:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24799:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24685:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24686:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getElementsXExpressionParserRuleCall_3_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XSetLiteral__ElementsAssignment_3_1_149959);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XSetLiteral__ElementsAssignment_3_1_149734);
             ruleXExpression();
 
             state._fsp--;
@@ -70858,22 +70538,22 @@ public final void rule__XSetLiteral__ElementsAssignment_3_1_1() throws Recogniti
 
 
     // $ANTLR start "rule__XListLiteral__ElementsAssignment_3_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24808:1: rule__XListLiteral__ElementsAssignment_3_0 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24695:1: rule__XListLiteral__ElementsAssignment_3_0 : ( ruleXExpression ) ;
     public final void rule__XListLiteral__ElementsAssignment_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24812:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24813:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24699:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24700:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24813:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24814:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24700:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24701:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getElementsXExpressionParserRuleCall_3_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XListLiteral__ElementsAssignment_3_049990);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XListLiteral__ElementsAssignment_3_049765);
             ruleXExpression();
 
             state._fsp--;
@@ -70903,22 +70583,22 @@ public final void rule__XListLiteral__ElementsAssignment_3_0() throws Recognitio
 
 
     // $ANTLR start "rule__XListLiteral__ElementsAssignment_3_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24823:1: rule__XListLiteral__ElementsAssignment_3_1_1 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24710:1: rule__XListLiteral__ElementsAssignment_3_1_1 : ( ruleXExpression ) ;
     public final void rule__XListLiteral__ElementsAssignment_3_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24827:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24828:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24714:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24715:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24828:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24829:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24715:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24716:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getElementsXExpressionParserRuleCall_3_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XListLiteral__ElementsAssignment_3_1_150021);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XListLiteral__ElementsAssignment_3_1_149796);
             ruleXExpression();
 
             state._fsp--;
@@ -70948,22 +70628,22 @@ public final void rule__XListLiteral__ElementsAssignment_3_1_1() throws Recognit
 
 
     // $ANTLR start "rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24838:1: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 : ( ruleJvmFormalParameter ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24725:1: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 : ( ruleJvmFormalParameter ) ;
     public final void rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24842:1: ( ( ruleJvmFormalParameter ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24843:1: ( ruleJvmFormalParameter )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24729:1: ( ( ruleJvmFormalParameter ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24730:1: ( ruleJvmFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24843:1: ( ruleJvmFormalParameter )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24844:1: ruleJvmFormalParameter
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24730:1: ( ruleJvmFormalParameter )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24731:1: ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_1_0_0_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmFormalParameter_in_rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_050052);
+            pushFollow(FOLLOW_ruleJvmFormalParameter_in_rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_049827);
             ruleJvmFormalParameter();
 
             state._fsp--;
@@ -70993,22 +70673,22 @@ public final void rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0() t
 
 
     // $ANTLR start "rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24853:1: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 : ( ruleJvmFormalParameter ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24740:1: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 : ( ruleJvmFormalParameter ) ;
     public final void rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24857:1: ( ( ruleJvmFormalParameter ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24858:1: ( ruleJvmFormalParameter )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24744:1: ( ( ruleJvmFormalParameter ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24745:1: ( ruleJvmFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24858:1: ( ruleJvmFormalParameter )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24859:1: ruleJvmFormalParameter
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24745:1: ( ruleJvmFormalParameter )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24746:1: ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_1_0_0_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmFormalParameter_in_rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_150083);
+            pushFollow(FOLLOW_ruleJvmFormalParameter_in_rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_149858);
             ruleJvmFormalParameter();
 
             state._fsp--;
@@ -71038,28 +70718,28 @@ public final void rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1()
 
 
     // $ANTLR start "rule__XClosure__ExplicitSyntaxAssignment_1_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24868:1: rule__XClosure__ExplicitSyntaxAssignment_1_0_1 : ( ( '|' ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24755:1: rule__XClosure__ExplicitSyntaxAssignment_1_0_1 : ( ( '|' ) ) ;
     public final void rule__XClosure__ExplicitSyntaxAssignment_1_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24872:1: ( ( ( '|' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24873:1: ( ( '|' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24759:1: ( ( ( '|' ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24760:1: ( ( '|' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24873:1: ( ( '|' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24874:1: ( '|' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24760:1: ( ( '|' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24761:1: ( '|' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getExplicitSyntaxVerticalLineKeyword_1_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24875:1: ( '|' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24876:1: '|'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24762:1: ( '|' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24763:1: '|'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getExplicitSyntaxVerticalLineKeyword_1_0_1_0()); 
             }
-            match(input,106,FOLLOW_106_in_rule__XClosure__ExplicitSyntaxAssignment_1_0_150119); if (state.failed) return ;
+            match(input,106,FOLLOW_106_in_rule__XClosure__ExplicitSyntaxAssignment_1_0_149894); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXClosureAccess().getExplicitSyntaxVerticalLineKeyword_1_0_1_0()); 
             }
@@ -71091,22 +70771,22 @@ public final void rule__XClosure__ExplicitSyntaxAssignment_1_0_1() throws Recogn
 
 
     // $ANTLR start "rule__XClosure__ExpressionAssignment_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24891:1: rule__XClosure__ExpressionAssignment_2 : ( ruleXExpressionInClosure ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24778:1: rule__XClosure__ExpressionAssignment_2 : ( ruleXExpressionInClosure ) ;
     public final void rule__XClosure__ExpressionAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24895:1: ( ( ruleXExpressionInClosure ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24896:1: ( ruleXExpressionInClosure )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24782:1: ( ( ruleXExpressionInClosure ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24783:1: ( ruleXExpressionInClosure )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24896:1: ( ruleXExpressionInClosure )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24897:1: ruleXExpressionInClosure
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24783:1: ( ruleXExpressionInClosure )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24784:1: ruleXExpressionInClosure
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getExpressionXExpressionInClosureParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpressionInClosure_in_rule__XClosure__ExpressionAssignment_250158);
+            pushFollow(FOLLOW_ruleXExpressionInClosure_in_rule__XClosure__ExpressionAssignment_249933);
             ruleXExpressionInClosure();
 
             state._fsp--;
@@ -71136,22 +70816,22 @@ public final void rule__XClosure__ExpressionAssignment_2() throws RecognitionExc
 
 
     // $ANTLR start "rule__XExpressionInClosure__ExpressionsAssignment_1_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24906:1: rule__XExpressionInClosure__ExpressionsAssignment_1_0 : ( ruleXExpressionOrVarDeclaration ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24793:1: rule__XExpressionInClosure__ExpressionsAssignment_1_0 : ( ruleXExpressionOrVarDeclaration ) ;
     public final void rule__XExpressionInClosure__ExpressionsAssignment_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24910:1: ( ( ruleXExpressionOrVarDeclaration ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24911:1: ( ruleXExpressionOrVarDeclaration )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24797:1: ( ( ruleXExpressionOrVarDeclaration ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24798:1: ( ruleXExpressionOrVarDeclaration )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24911:1: ( ruleXExpressionOrVarDeclaration )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24912:1: ruleXExpressionOrVarDeclaration
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24798:1: ( ruleXExpressionOrVarDeclaration )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24799:1: ruleXExpressionOrVarDeclaration
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionInClosureAccess().getExpressionsXExpressionOrVarDeclarationParserRuleCall_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_rule__XExpressionInClosure__ExpressionsAssignment_1_050189);
+            pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_rule__XExpressionInClosure__ExpressionsAssignment_1_049964);
             ruleXExpressionOrVarDeclaration();
 
             state._fsp--;
@@ -71181,22 +70861,22 @@ public final void rule__XExpressionInClosure__ExpressionsAssignment_1_0() throws
 
 
     // $ANTLR start "rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24921:1: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 : ( ruleJvmFormalParameter ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24808:1: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 : ( ruleJvmFormalParameter ) ;
     public final void rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24925:1: ( ( ruleJvmFormalParameter ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24926:1: ( ruleJvmFormalParameter )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24812:1: ( ( ruleJvmFormalParameter ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24813:1: ( ruleJvmFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24926:1: ( ruleJvmFormalParameter )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24927:1: ruleJvmFormalParameter
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24813:1: ( ruleJvmFormalParameter )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24814:1: ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_0_0_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmFormalParameter_in_rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_050220);
+            pushFollow(FOLLOW_ruleJvmFormalParameter_in_rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_049995);
             ruleJvmFormalParameter();
 
             state._fsp--;
@@ -71226,22 +70906,22 @@ public final void rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_
 
 
     // $ANTLR start "rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24936:1: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 : ( ruleJvmFormalParameter ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24823:1: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 : ( ruleJvmFormalParameter ) ;
     public final void rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24940:1: ( ( ruleJvmFormalParameter ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24941:1: ( ruleJvmFormalParameter )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24827:1: ( ( ruleJvmFormalParameter ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24828:1: ( ruleJvmFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24941:1: ( ruleJvmFormalParameter )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24942:1: ruleJvmFormalParameter
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24828:1: ( ruleJvmFormalParameter )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24829:1: ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_0_0_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmFormalParameter_in_rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_150251);
+            pushFollow(FOLLOW_ruleJvmFormalParameter_in_rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_150026);
             ruleJvmFormalParameter();
 
             state._fsp--;
@@ -71271,28 +70951,28 @@ public final void rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_
 
 
     // $ANTLR start "rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24951:1: rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 : ( ( '|' ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24838:1: rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 : ( ( '|' ) ) ;
     public final void rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24955:1: ( ( ( '|' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24956:1: ( ( '|' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24842:1: ( ( ( '|' ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24843:1: ( ( '|' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24956:1: ( ( '|' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24957:1: ( '|' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24843:1: ( ( '|' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24844:1: ( '|' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getExplicitSyntaxVerticalLineKeyword_0_0_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24958:1: ( '|' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24959:1: '|'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24845:1: ( '|' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24846:1: '|'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getExplicitSyntaxVerticalLineKeyword_0_0_2_0()); 
             }
-            match(input,106,FOLLOW_106_in_rule__XShortClosure__ExplicitSyntaxAssignment_0_0_250287); if (state.failed) return ;
+            match(input,106,FOLLOW_106_in_rule__XShortClosure__ExplicitSyntaxAssignment_0_0_250062); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXShortClosureAccess().getExplicitSyntaxVerticalLineKeyword_0_0_2_0()); 
             }
@@ -71324,22 +71004,22 @@ public final void rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2() throws R
 
 
     // $ANTLR start "rule__XShortClosure__ExpressionAssignment_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24974:1: rule__XShortClosure__ExpressionAssignment_1 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24861:1: rule__XShortClosure__ExpressionAssignment_1 : ( ruleXExpression ) ;
     public final void rule__XShortClosure__ExpressionAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24978:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24979:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24865:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24866:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24979:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24980:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24866:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24867:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getExpressionXExpressionParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XShortClosure__ExpressionAssignment_150326);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XShortClosure__ExpressionAssignment_150101);
             ruleXExpression();
 
             state._fsp--;
@@ -71369,22 +71049,22 @@ public final void rule__XShortClosure__ExpressionAssignment_1() throws Recogniti
 
 
     // $ANTLR start "rule__XIfExpression__IfAssignment_3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24989:1: rule__XIfExpression__IfAssignment_3 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24876:1: rule__XIfExpression__IfAssignment_3 : ( ruleXExpression ) ;
     public final void rule__XIfExpression__IfAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24993:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24994:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24880:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24881:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24994:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24995:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24881:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24882:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getIfXExpressionParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XIfExpression__IfAssignment_350357);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XIfExpression__IfAssignment_350132);
             ruleXExpression();
 
             state._fsp--;
@@ -71414,22 +71094,22 @@ public final void rule__XIfExpression__IfAssignment_3() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XIfExpression__ThenAssignment_5"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25004:1: rule__XIfExpression__ThenAssignment_5 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24891:1: rule__XIfExpression__ThenAssignment_5 : ( ruleXExpression ) ;
     public final void rule__XIfExpression__ThenAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25008:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25009:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24895:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24896:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25009:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25010:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24896:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24897:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getThenXExpressionParserRuleCall_5_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XIfExpression__ThenAssignment_550388);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XIfExpression__ThenAssignment_550163);
             ruleXExpression();
 
             state._fsp--;
@@ -71459,22 +71139,22 @@ public final void rule__XIfExpression__ThenAssignment_5() throws RecognitionExce
 
 
     // $ANTLR start "rule__XIfExpression__ElseAssignment_6_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25019:1: rule__XIfExpression__ElseAssignment_6_1 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24906:1: rule__XIfExpression__ElseAssignment_6_1 : ( ruleXExpression ) ;
     public final void rule__XIfExpression__ElseAssignment_6_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25023:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25024:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24910:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24911:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25024:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25025:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24911:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24912:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getElseXExpressionParserRuleCall_6_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XIfExpression__ElseAssignment_6_150419);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XIfExpression__ElseAssignment_6_150194);
             ruleXExpression();
 
             state._fsp--;
@@ -71504,22 +71184,22 @@ public final void rule__XIfExpression__ElseAssignment_6_1() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25034:1: rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 : ( ruleJvmFormalParameter ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24921:1: rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 : ( ruleJvmFormalParameter ) ;
     public final void rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25038:1: ( ( ruleJvmFormalParameter ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25039:1: ( ruleJvmFormalParameter )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24925:1: ( ( ruleJvmFormalParameter ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24926:1: ( ruleJvmFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25039:1: ( ruleJvmFormalParameter )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25040:1: ruleJvmFormalParameter
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24926:1: ( ruleJvmFormalParameter )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24927:1: ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getDeclaredParamJvmFormalParameterParserRuleCall_2_0_0_0_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmFormalParameter_in_rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_150450);
+            pushFollow(FOLLOW_ruleJvmFormalParameter_in_rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_150225);
             ruleJvmFormalParameter();
 
             state._fsp--;
@@ -71549,22 +71229,22 @@ public final void rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1() t
 
 
     // $ANTLR start "rule__XSwitchExpression__SwitchAssignment_2_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25049:1: rule__XSwitchExpression__SwitchAssignment_2_0_1 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24936:1: rule__XSwitchExpression__SwitchAssignment_2_0_1 : ( ruleXExpression ) ;
     public final void rule__XSwitchExpression__SwitchAssignment_2_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25053:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25054:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24940:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24941:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25054:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25055:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24941:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24942:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getSwitchXExpressionParserRuleCall_2_0_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XSwitchExpression__SwitchAssignment_2_0_150481);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XSwitchExpression__SwitchAssignment_2_0_150256);
             ruleXExpression();
 
             state._fsp--;
@@ -71594,22 +71274,22 @@ public final void rule__XSwitchExpression__SwitchAssignment_2_0_1() throws Recog
 
 
     // $ANTLR start "rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25064:1: rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 : ( ruleJvmFormalParameter ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24951:1: rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 : ( ruleJvmFormalParameter ) ;
     public final void rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25068:1: ( ( ruleJvmFormalParameter ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25069:1: ( ruleJvmFormalParameter )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24955:1: ( ( ruleJvmFormalParameter ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24956:1: ( ruleJvmFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25069:1: ( ruleJvmFormalParameter )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25070:1: ruleJvmFormalParameter
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24956:1: ( ruleJvmFormalParameter )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24957:1: ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getDeclaredParamJvmFormalParameterParserRuleCall_2_1_0_0_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmFormalParameter_in_rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_050512);
+            pushFollow(FOLLOW_ruleJvmFormalParameter_in_rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_050287);
             ruleJvmFormalParameter();
 
             state._fsp--;
@@ -71639,22 +71319,22 @@ public final void rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0() t
 
 
     // $ANTLR start "rule__XSwitchExpression__SwitchAssignment_2_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25079:1: rule__XSwitchExpression__SwitchAssignment_2_1_1 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24966:1: rule__XSwitchExpression__SwitchAssignment_2_1_1 : ( ruleXExpression ) ;
     public final void rule__XSwitchExpression__SwitchAssignment_2_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25083:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25084:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24970:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24971:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25084:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25085:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24971:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24972:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getSwitchXExpressionParserRuleCall_2_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XSwitchExpression__SwitchAssignment_2_1_150543);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XSwitchExpression__SwitchAssignment_2_1_150318);
             ruleXExpression();
 
             state._fsp--;
@@ -71684,22 +71364,22 @@ public final void rule__XSwitchExpression__SwitchAssignment_2_1_1() throws Recog
 
 
     // $ANTLR start "rule__XSwitchExpression__CasesAssignment_4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25094:1: rule__XSwitchExpression__CasesAssignment_4 : ( ruleXCasePart ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24981:1: rule__XSwitchExpression__CasesAssignment_4 : ( ruleXCasePart ) ;
     public final void rule__XSwitchExpression__CasesAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25098:1: ( ( ruleXCasePart ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25099:1: ( ruleXCasePart )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24985:1: ( ( ruleXCasePart ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24986:1: ( ruleXCasePart )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25099:1: ( ruleXCasePart )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25100:1: ruleXCasePart
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24986:1: ( ruleXCasePart )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24987:1: ruleXCasePart
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getCasesXCasePartParserRuleCall_4_0()); 
             }
-            pushFollow(FOLLOW_ruleXCasePart_in_rule__XSwitchExpression__CasesAssignment_450574);
+            pushFollow(FOLLOW_ruleXCasePart_in_rule__XSwitchExpression__CasesAssignment_450349);
             ruleXCasePart();
 
             state._fsp--;
@@ -71729,22 +71409,22 @@ public final void rule__XSwitchExpression__CasesAssignment_4() throws Recognitio
 
 
     // $ANTLR start "rule__XSwitchExpression__DefaultAssignment_5_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25109:1: rule__XSwitchExpression__DefaultAssignment_5_2 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24996:1: rule__XSwitchExpression__DefaultAssignment_5_2 : ( ruleXExpression ) ;
     public final void rule__XSwitchExpression__DefaultAssignment_5_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25113:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25114:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25000:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25001:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25114:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25115:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25001:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25002:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getDefaultXExpressionParserRuleCall_5_2_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XSwitchExpression__DefaultAssignment_5_250605);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XSwitchExpression__DefaultAssignment_5_250380);
             ruleXExpression();
 
             state._fsp--;
@@ -71774,22 +71454,22 @@ public final void rule__XSwitchExpression__DefaultAssignment_5_2() throws Recogn
 
 
     // $ANTLR start "rule__XCasePart__TypeGuardAssignment_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25124:1: rule__XCasePart__TypeGuardAssignment_1 : ( ruleJvmTypeReference ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25011:1: rule__XCasePart__TypeGuardAssignment_1 : ( ruleJvmTypeReference ) ;
     public final void rule__XCasePart__TypeGuardAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25128:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25129:1: ( ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25015:1: ( ( ruleJvmTypeReference ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25016:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25129:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25130:1: ruleJvmTypeReference
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25016:1: ( ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25017:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getTypeGuardJvmTypeReferenceParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__XCasePart__TypeGuardAssignment_150636);
+            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__XCasePart__TypeGuardAssignment_150411);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -71819,22 +71499,22 @@ public final void rule__XCasePart__TypeGuardAssignment_1() throws RecognitionExc
 
 
     // $ANTLR start "rule__XCasePart__CaseAssignment_2_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25139:1: rule__XCasePart__CaseAssignment_2_1 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25026:1: rule__XCasePart__CaseAssignment_2_1 : ( ruleXExpression ) ;
     public final void rule__XCasePart__CaseAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25143:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25144:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25030:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25031:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25144:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25145:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25031:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25032:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getCaseXExpressionParserRuleCall_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XCasePart__CaseAssignment_2_150667);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XCasePart__CaseAssignment_2_150442);
             ruleXExpression();
 
             state._fsp--;
@@ -71864,22 +71544,22 @@ public final void rule__XCasePart__CaseAssignment_2_1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XCasePart__ThenAssignment_3_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25154:1: rule__XCasePart__ThenAssignment_3_0_1 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25041:1: rule__XCasePart__ThenAssignment_3_0_1 : ( ruleXExpression ) ;
     public final void rule__XCasePart__ThenAssignment_3_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25158:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25159:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25045:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25046:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25159:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25160:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25046:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25047:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getThenXExpressionParserRuleCall_3_0_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XCasePart__ThenAssignment_3_0_150698);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XCasePart__ThenAssignment_3_0_150473);
             ruleXExpression();
 
             state._fsp--;
@@ -71909,28 +71589,28 @@ public final void rule__XCasePart__ThenAssignment_3_0_1() throws RecognitionExce
 
 
     // $ANTLR start "rule__XCasePart__FallThroughAssignment_3_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25169:1: rule__XCasePart__FallThroughAssignment_3_1 : ( ( ',' ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25056:1: rule__XCasePart__FallThroughAssignment_3_1 : ( ( ',' ) ) ;
     public final void rule__XCasePart__FallThroughAssignment_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25173:1: ( ( ( ',' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25174:1: ( ( ',' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25060:1: ( ( ( ',' ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25061:1: ( ( ',' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25174:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25175:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25061:1: ( ( ',' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25062:1: ( ',' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getFallThroughCommaKeyword_3_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25176:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25177:1: ','
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25063:1: ( ',' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25064:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getFallThroughCommaKeyword_3_1_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XCasePart__FallThroughAssignment_3_150734); if (state.failed) return ;
+            match(input,74,FOLLOW_74_in_rule__XCasePart__FallThroughAssignment_3_150509); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXCasePartAccess().getFallThroughCommaKeyword_3_1_0()); 
             }
@@ -71962,22 +71642,22 @@ public final void rule__XCasePart__FallThroughAssignment_3_1() throws Recognitio
 
 
     // $ANTLR start "rule__XForLoopExpression__DeclaredParamAssignment_0_0_3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25192:1: rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 : ( ruleJvmFormalParameter ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25079:1: rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 : ( ruleJvmFormalParameter ) ;
     public final void rule__XForLoopExpression__DeclaredParamAssignment_0_0_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25196:1: ( ( ruleJvmFormalParameter ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25197:1: ( ruleJvmFormalParameter )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25083:1: ( ( ruleJvmFormalParameter ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25084:1: ( ruleJvmFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25197:1: ( ruleJvmFormalParameter )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25198:1: ruleJvmFormalParameter
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25084:1: ( ruleJvmFormalParameter )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25085:1: ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getDeclaredParamJvmFormalParameterParserRuleCall_0_0_3_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmFormalParameter_in_rule__XForLoopExpression__DeclaredParamAssignment_0_0_350773);
+            pushFollow(FOLLOW_ruleJvmFormalParameter_in_rule__XForLoopExpression__DeclaredParamAssignment_0_0_350548);
             ruleJvmFormalParameter();
 
             state._fsp--;
@@ -72007,22 +71687,22 @@ public final void rule__XForLoopExpression__DeclaredParamAssignment_0_0_3() thro
 
 
     // $ANTLR start "rule__XForLoopExpression__ForExpressionAssignment_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25207:1: rule__XForLoopExpression__ForExpressionAssignment_1 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25094:1: rule__XForLoopExpression__ForExpressionAssignment_1 : ( ruleXExpression ) ;
     public final void rule__XForLoopExpression__ForExpressionAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25211:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25212:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25098:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25099:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25212:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25213:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25099:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25100:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getForExpressionXExpressionParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XForLoopExpression__ForExpressionAssignment_150804);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XForLoopExpression__ForExpressionAssignment_150579);
             ruleXExpression();
 
             state._fsp--;
@@ -72052,22 +71732,22 @@ public final void rule__XForLoopExpression__ForExpressionAssignment_1() throws R
 
 
     // $ANTLR start "rule__XForLoopExpression__EachExpressionAssignment_3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25222:1: rule__XForLoopExpression__EachExpressionAssignment_3 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25109:1: rule__XForLoopExpression__EachExpressionAssignment_3 : ( ruleXExpression ) ;
     public final void rule__XForLoopExpression__EachExpressionAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25226:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25227:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25113:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25114:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25227:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25228:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25114:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25115:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getEachExpressionXExpressionParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XForLoopExpression__EachExpressionAssignment_350835);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XForLoopExpression__EachExpressionAssignment_350610);
             ruleXExpression();
 
             state._fsp--;
@@ -72097,22 +71777,22 @@ public final void rule__XForLoopExpression__EachExpressionAssignment_3() throws
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25237:1: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 : ( ruleXExpressionOrVarDeclaration ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25124:1: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 : ( ruleXExpressionOrVarDeclaration ) ;
     public final void rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25241:1: ( ( ruleXExpressionOrVarDeclaration ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25242:1: ( ruleXExpressionOrVarDeclaration )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25128:1: ( ( ruleXExpressionOrVarDeclaration ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25129:1: ( ruleXExpressionOrVarDeclaration )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25242:1: ( ruleXExpressionOrVarDeclaration )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25243:1: ruleXExpressionOrVarDeclaration
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25129:1: ( ruleXExpressionOrVarDeclaration )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25130:1: ruleXExpressionOrVarDeclaration
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getInitExpressionsXExpressionOrVarDeclarationParserRuleCall_3_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_rule__XBasicForLoopExpression__InitExpressionsAssignment_3_050866);
+            pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_rule__XBasicForLoopExpression__InitExpressionsAssignment_3_050641);
             ruleXExpressionOrVarDeclaration();
 
             state._fsp--;
@@ -72142,22 +71822,22 @@ public final void rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0()
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25252:1: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 : ( ruleXExpressionOrVarDeclaration ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25139:1: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 : ( ruleXExpressionOrVarDeclaration ) ;
     public final void rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25256:1: ( ( ruleXExpressionOrVarDeclaration ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25257:1: ( ruleXExpressionOrVarDeclaration )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25143:1: ( ( ruleXExpressionOrVarDeclaration ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25144:1: ( ruleXExpressionOrVarDeclaration )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25257:1: ( ruleXExpressionOrVarDeclaration )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25258:1: ruleXExpressionOrVarDeclaration
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25144:1: ( ruleXExpressionOrVarDeclaration )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25145:1: ruleXExpressionOrVarDeclaration
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getInitExpressionsXExpressionOrVarDeclarationParserRuleCall_3_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_150897);
+            pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_150672);
             ruleXExpressionOrVarDeclaration();
 
             state._fsp--;
@@ -72187,22 +71867,22 @@ public final void rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__ExpressionAssignment_5"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25267:1: rule__XBasicForLoopExpression__ExpressionAssignment_5 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25154:1: rule__XBasicForLoopExpression__ExpressionAssignment_5 : ( ruleXExpression ) ;
     public final void rule__XBasicForLoopExpression__ExpressionAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25271:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25272:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25158:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25159:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25272:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25273:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25159:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25160:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getExpressionXExpressionParserRuleCall_5_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XBasicForLoopExpression__ExpressionAssignment_550928);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XBasicForLoopExpression__ExpressionAssignment_550703);
             ruleXExpression();
 
             state._fsp--;
@@ -72232,22 +71912,22 @@ public final void rule__XBasicForLoopExpression__ExpressionAssignment_5() throws
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25282:1: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25169:1: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 : ( ruleXExpression ) ;
     public final void rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25286:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25287:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25173:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25174:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25287:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25288:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25174:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25175:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getUpdateExpressionsXExpressionParserRuleCall_7_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_050959);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_050734);
             ruleXExpression();
 
             state._fsp--;
@@ -72277,22 +71957,22 @@ public final void rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25297:1: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25184:1: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 : ( ruleXExpression ) ;
     public final void rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25301:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25302:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25188:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25189:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25302:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25303:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25189:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25190:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getUpdateExpressionsXExpressionParserRuleCall_7_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_150990);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_150765);
             ruleXExpression();
 
             state._fsp--;
@@ -72322,22 +72002,22 @@ public final void rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__EachExpressionAssignment_9"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25312:1: rule__XBasicForLoopExpression__EachExpressionAssignment_9 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25199:1: rule__XBasicForLoopExpression__EachExpressionAssignment_9 : ( ruleXExpression ) ;
     public final void rule__XBasicForLoopExpression__EachExpressionAssignment_9() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25316:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25317:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25203:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25204:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25317:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25318:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25204:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25205:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getEachExpressionXExpressionParserRuleCall_9_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XBasicForLoopExpression__EachExpressionAssignment_951021);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XBasicForLoopExpression__EachExpressionAssignment_950796);
             ruleXExpression();
 
             state._fsp--;
@@ -72367,22 +72047,22 @@ public final void rule__XBasicForLoopExpression__EachExpressionAssignment_9() th
 
 
     // $ANTLR start "rule__XWhileExpression__PredicateAssignment_3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25327:1: rule__XWhileExpression__PredicateAssignment_3 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25214:1: rule__XWhileExpression__PredicateAssignment_3 : ( ruleXExpression ) ;
     public final void rule__XWhileExpression__PredicateAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25331:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25332:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25218:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25219:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25332:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25333:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25219:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25220:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getPredicateXExpressionParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XWhileExpression__PredicateAssignment_351052);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XWhileExpression__PredicateAssignment_350827);
             ruleXExpression();
 
             state._fsp--;
@@ -72412,22 +72092,22 @@ public final void rule__XWhileExpression__PredicateAssignment_3() throws Recogni
 
 
     // $ANTLR start "rule__XWhileExpression__BodyAssignment_5"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25342:1: rule__XWhileExpression__BodyAssignment_5 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25229:1: rule__XWhileExpression__BodyAssignment_5 : ( ruleXExpression ) ;
     public final void rule__XWhileExpression__BodyAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25346:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25347:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25233:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25234:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25347:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25348:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25234:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25235:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getBodyXExpressionParserRuleCall_5_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XWhileExpression__BodyAssignment_551083);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XWhileExpression__BodyAssignment_550858);
             ruleXExpression();
 
             state._fsp--;
@@ -72457,22 +72137,22 @@ public final void rule__XWhileExpression__BodyAssignment_5() throws RecognitionE
 
 
     // $ANTLR start "rule__XDoWhileExpression__BodyAssignment_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25357:1: rule__XDoWhileExpression__BodyAssignment_2 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25244:1: rule__XDoWhileExpression__BodyAssignment_2 : ( ruleXExpression ) ;
     public final void rule__XDoWhileExpression__BodyAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25361:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25362:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25248:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25249:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25362:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25363:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25249:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25250:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getBodyXExpressionParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XDoWhileExpression__BodyAssignment_251114);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XDoWhileExpression__BodyAssignment_250889);
             ruleXExpression();
 
             state._fsp--;
@@ -72502,22 +72182,22 @@ public final void rule__XDoWhileExpression__BodyAssignment_2() throws Recognitio
 
 
     // $ANTLR start "rule__XDoWhileExpression__PredicateAssignment_5"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25372:1: rule__XDoWhileExpression__PredicateAssignment_5 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25259:1: rule__XDoWhileExpression__PredicateAssignment_5 : ( ruleXExpression ) ;
     public final void rule__XDoWhileExpression__PredicateAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25376:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25377:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25263:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25264:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25377:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25378:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25264:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25265:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getPredicateXExpressionParserRuleCall_5_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XDoWhileExpression__PredicateAssignment_551145);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XDoWhileExpression__PredicateAssignment_550920);
             ruleXExpression();
 
             state._fsp--;
@@ -72547,22 +72227,22 @@ public final void rule__XDoWhileExpression__PredicateAssignment_5() throws Recog
 
 
     // $ANTLR start "rule__XBlockExpression__ExpressionsAssignment_2_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25387:1: rule__XBlockExpression__ExpressionsAssignment_2_0 : ( ruleXExpressionOrVarDeclaration ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25274:1: rule__XBlockExpression__ExpressionsAssignment_2_0 : ( ruleXExpressionOrVarDeclaration ) ;
     public final void rule__XBlockExpression__ExpressionsAssignment_2_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25391:1: ( ( ruleXExpressionOrVarDeclaration ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25392:1: ( ruleXExpressionOrVarDeclaration )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25278:1: ( ( ruleXExpressionOrVarDeclaration ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25279:1: ( ruleXExpressionOrVarDeclaration )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25392:1: ( ruleXExpressionOrVarDeclaration )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25393:1: ruleXExpressionOrVarDeclaration
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25279:1: ( ruleXExpressionOrVarDeclaration )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25280:1: ruleXExpressionOrVarDeclaration
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getExpressionsXExpressionOrVarDeclarationParserRuleCall_2_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_rule__XBlockExpression__ExpressionsAssignment_2_051176);
+            pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_rule__XBlockExpression__ExpressionsAssignment_2_050951);
             ruleXExpressionOrVarDeclaration();
 
             state._fsp--;
@@ -72592,28 +72272,28 @@ public final void rule__XBlockExpression__ExpressionsAssignment_2_0() throws Rec
 
 
     // $ANTLR start "rule__XVariableDeclaration__WriteableAssignment_1_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25402:1: rule__XVariableDeclaration__WriteableAssignment_1_0 : ( ( 'var' ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25289:1: rule__XVariableDeclaration__WriteableAssignment_1_0 : ( ( 'var' ) ) ;
     public final void rule__XVariableDeclaration__WriteableAssignment_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25406:1: ( ( ( 'var' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25407:1: ( ( 'var' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25293:1: ( ( ( 'var' ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25294:1: ( ( 'var' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25407:1: ( ( 'var' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25408:1: ( 'var' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25294:1: ( ( 'var' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25295:1: ( 'var' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getWriteableVarKeyword_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25409:1: ( 'var' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25410:1: 'var'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25296:1: ( 'var' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25297:1: 'var'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getWriteableVarKeyword_1_0_0()); 
             }
-            match(input,107,FOLLOW_107_in_rule__XVariableDeclaration__WriteableAssignment_1_051212); if (state.failed) return ;
+            match(input,107,FOLLOW_107_in_rule__XVariableDeclaration__WriteableAssignment_1_050987); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXVariableDeclarationAccess().getWriteableVarKeyword_1_0_0()); 
             }
@@ -72645,22 +72325,22 @@ public final void rule__XVariableDeclaration__WriteableAssignment_1_0() throws R
 
 
     // $ANTLR start "rule__XVariableDeclaration__TypeAssignment_2_0_0_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25425:1: rule__XVariableDeclaration__TypeAssignment_2_0_0_0 : ( ruleJvmTypeReference ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25312:1: rule__XVariableDeclaration__TypeAssignment_2_0_0_0 : ( ruleJvmTypeReference ) ;
     public final void rule__XVariableDeclaration__TypeAssignment_2_0_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25429:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25430:1: ( ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25316:1: ( ( ruleJvmTypeReference ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25317:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25430:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25431:1: ruleJvmTypeReference
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25317:1: ( ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25318:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getTypeJvmTypeReferenceParserRuleCall_2_0_0_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__XVariableDeclaration__TypeAssignment_2_0_0_051251);
+            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__XVariableDeclaration__TypeAssignment_2_0_0_051026);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -72690,22 +72370,22 @@ public final void rule__XVariableDeclaration__TypeAssignment_2_0_0_0() throws Re
 
 
     // $ANTLR start "rule__XVariableDeclaration__NameAssignment_2_0_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25440:1: rule__XVariableDeclaration__NameAssignment_2_0_0_1 : ( ruleValidID ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25327:1: rule__XVariableDeclaration__NameAssignment_2_0_0_1 : ( ruleValidID ) ;
     public final void rule__XVariableDeclaration__NameAssignment_2_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25444:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25445:1: ( ruleValidID )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25331:1: ( ( ruleValidID ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25332:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25445:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25446:1: ruleValidID
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25332:1: ( ruleValidID )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25333:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getNameValidIDParserRuleCall_2_0_0_1_0()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__XVariableDeclaration__NameAssignment_2_0_0_151282);
+            pushFollow(FOLLOW_ruleValidID_in_rule__XVariableDeclaration__NameAssignment_2_0_0_151057);
             ruleValidID();
 
             state._fsp--;
@@ -72735,22 +72415,22 @@ public final void rule__XVariableDeclaration__NameAssignment_2_0_0_1() throws Re
 
 
     // $ANTLR start "rule__XVariableDeclaration__NameAssignment_2_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25455:1: rule__XVariableDeclaration__NameAssignment_2_1 : ( ruleValidID ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25342:1: rule__XVariableDeclaration__NameAssignment_2_1 : ( ruleValidID ) ;
     public final void rule__XVariableDeclaration__NameAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25459:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25460:1: ( ruleValidID )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25346:1: ( ( ruleValidID ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25347:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25460:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25461:1: ruleValidID
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25347:1: ( ruleValidID )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25348:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getNameValidIDParserRuleCall_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__XVariableDeclaration__NameAssignment_2_151313);
+            pushFollow(FOLLOW_ruleValidID_in_rule__XVariableDeclaration__NameAssignment_2_151088);
             ruleValidID();
 
             state._fsp--;
@@ -72780,22 +72460,22 @@ public final void rule__XVariableDeclaration__NameAssignment_2_1() throws Recogn
 
 
     // $ANTLR start "rule__XVariableDeclaration__RightAssignment_3_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25470:1: rule__XVariableDeclaration__RightAssignment_3_1 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25357:1: rule__XVariableDeclaration__RightAssignment_3_1 : ( ruleXExpression ) ;
     public final void rule__XVariableDeclaration__RightAssignment_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25474:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25475:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25361:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25362:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25475:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25476:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25362:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25363:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getRightXExpressionParserRuleCall_3_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XVariableDeclaration__RightAssignment_3_151344);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XVariableDeclaration__RightAssignment_3_151119);
             ruleXExpression();
 
             state._fsp--;
@@ -72825,22 +72505,22 @@ public final void rule__XVariableDeclaration__RightAssignment_3_1() throws Recog
 
 
     // $ANTLR start "rule__JvmFormalParameter__ParameterTypeAssignment_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25485:1: rule__JvmFormalParameter__ParameterTypeAssignment_0 : ( ruleJvmTypeReference ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25372:1: rule__JvmFormalParameter__ParameterTypeAssignment_0 : ( ruleJvmTypeReference ) ;
     public final void rule__JvmFormalParameter__ParameterTypeAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25489:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25490:1: ( ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25376:1: ( ( ruleJvmTypeReference ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25377:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25490:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25491:1: ruleJvmTypeReference
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25377:1: ( ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25378:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmFormalParameterAccess().getParameterTypeJvmTypeReferenceParserRuleCall_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__JvmFormalParameter__ParameterTypeAssignment_051375);
+            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__JvmFormalParameter__ParameterTypeAssignment_051150);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -72870,22 +72550,22 @@ public final void rule__JvmFormalParameter__ParameterTypeAssignment_0() throws R
 
 
     // $ANTLR start "rule__JvmFormalParameter__NameAssignment_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25500:1: rule__JvmFormalParameter__NameAssignment_1 : ( ruleValidID ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25387:1: rule__JvmFormalParameter__NameAssignment_1 : ( ruleValidID ) ;
     public final void rule__JvmFormalParameter__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25504:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25505:1: ( ruleValidID )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25391:1: ( ( ruleValidID ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25392:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25505:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25506:1: ruleValidID
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25392:1: ( ruleValidID )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25393:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmFormalParameterAccess().getNameValidIDParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__JvmFormalParameter__NameAssignment_151406);
+            pushFollow(FOLLOW_ruleValidID_in_rule__JvmFormalParameter__NameAssignment_151181);
             ruleValidID();
 
             state._fsp--;
@@ -72915,22 +72595,22 @@ public final void rule__JvmFormalParameter__NameAssignment_1() throws Recognitio
 
 
     // $ANTLR start "rule__FullJvmFormalParameter__ParameterTypeAssignment_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25515:1: rule__FullJvmFormalParameter__ParameterTypeAssignment_0 : ( ruleJvmTypeReference ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25402:1: rule__FullJvmFormalParameter__ParameterTypeAssignment_0 : ( ruleJvmTypeReference ) ;
     public final void rule__FullJvmFormalParameter__ParameterTypeAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25519:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25520:1: ( ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25406:1: ( ( ruleJvmTypeReference ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25407:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25520:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25521:1: ruleJvmTypeReference
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25407:1: ( ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25408:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFullJvmFormalParameterAccess().getParameterTypeJvmTypeReferenceParserRuleCall_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__FullJvmFormalParameter__ParameterTypeAssignment_051437);
+            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__FullJvmFormalParameter__ParameterTypeAssignment_051212);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -72960,22 +72640,22 @@ public final void rule__FullJvmFormalParameter__ParameterTypeAssignment_0() thro
 
 
     // $ANTLR start "rule__FullJvmFormalParameter__NameAssignment_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25530:1: rule__FullJvmFormalParameter__NameAssignment_1 : ( ruleValidID ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25417:1: rule__FullJvmFormalParameter__NameAssignment_1 : ( ruleValidID ) ;
     public final void rule__FullJvmFormalParameter__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25534:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25535:1: ( ruleValidID )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25421:1: ( ( ruleValidID ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25422:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25535:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25536:1: ruleValidID
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25422:1: ( ruleValidID )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25423:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFullJvmFormalParameterAccess().getNameValidIDParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__FullJvmFormalParameter__NameAssignment_151468);
+            pushFollow(FOLLOW_ruleValidID_in_rule__FullJvmFormalParameter__NameAssignment_151243);
             ruleValidID();
 
             state._fsp--;
@@ -73005,22 +72685,22 @@ public final void rule__FullJvmFormalParameter__NameAssignment_1() throws Recogn
 
 
     // $ANTLR start "rule__XFeatureCall__TypeArgumentsAssignment_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25545:1: rule__XFeatureCall__TypeArgumentsAssignment_1_1 : ( ruleJvmArgumentTypeReference ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25432:1: rule__XFeatureCall__TypeArgumentsAssignment_1_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__XFeatureCall__TypeArgumentsAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25549:1: ( ( ruleJvmArgumentTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25550:1: ( ruleJvmArgumentTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25436:1: ( ( ruleJvmArgumentTypeReference ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25437:1: ( ruleJvmArgumentTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25550:1: ( ruleJvmArgumentTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25551:1: ruleJvmArgumentTypeReference
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25437:1: ( ruleJvmArgumentTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25438:1: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__XFeatureCall__TypeArgumentsAssignment_1_151499);
+            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__XFeatureCall__TypeArgumentsAssignment_1_151274);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -73050,22 +72730,22 @@ public final void rule__XFeatureCall__TypeArgumentsAssignment_1_1() throws Recog
 
 
     // $ANTLR start "rule__XFeatureCall__TypeArgumentsAssignment_1_2_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25560:1: rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 : ( ruleJvmArgumentTypeReference ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25447:1: rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__XFeatureCall__TypeArgumentsAssignment_1_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25564:1: ( ( ruleJvmArgumentTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25565:1: ( ruleJvmArgumentTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25451:1: ( ( ruleJvmArgumentTypeReference ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25452:1: ( ruleJvmArgumentTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25565:1: ( ruleJvmArgumentTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25566:1: ruleJvmArgumentTypeReference
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25452:1: ( ruleJvmArgumentTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25453:1: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__XFeatureCall__TypeArgumentsAssignment_1_2_151530);
+            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__XFeatureCall__TypeArgumentsAssignment_1_2_151305);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -73095,28 +72775,28 @@ public final void rule__XFeatureCall__TypeArgumentsAssignment_1_2_1() throws Rec
 
 
     // $ANTLR start "rule__XFeatureCall__FeatureAssignment_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25575:1: rule__XFeatureCall__FeatureAssignment_2 : ( ( ruleIdOrSuper ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25462:1: rule__XFeatureCall__FeatureAssignment_2 : ( ( ruleIdOrSuper ) ) ;
     public final void rule__XFeatureCall__FeatureAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25579:1: ( ( ( ruleIdOrSuper ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25580:1: ( ( ruleIdOrSuper ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25466:1: ( ( ( ruleIdOrSuper ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25467:1: ( ( ruleIdOrSuper ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25580:1: ( ( ruleIdOrSuper ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25581:1: ( ruleIdOrSuper )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25467:1: ( ( ruleIdOrSuper ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25468:1: ( ruleIdOrSuper )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureJvmIdentifiableElementCrossReference_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25582:1: ( ruleIdOrSuper )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25583:1: ruleIdOrSuper
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25469:1: ( ruleIdOrSuper )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25470:1: ruleIdOrSuper
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureJvmIdentifiableElementIdOrSuperParserRuleCall_2_0_1()); 
             }
-            pushFollow(FOLLOW_ruleIdOrSuper_in_rule__XFeatureCall__FeatureAssignment_251565);
+            pushFollow(FOLLOW_ruleIdOrSuper_in_rule__XFeatureCall__FeatureAssignment_251340);
             ruleIdOrSuper();
 
             state._fsp--;
@@ -73152,28 +72832,28 @@ public final void rule__XFeatureCall__FeatureAssignment_2() throws RecognitionEx
 
 
     // $ANTLR start "rule__XFeatureCall__ExplicitOperationCallAssignment_3_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25594:1: rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 : ( ( '(' ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25481:1: rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 : ( ( '(' ) ) ;
     public final void rule__XFeatureCall__ExplicitOperationCallAssignment_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25598:1: ( ( ( '(' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25599:1: ( ( '(' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25485:1: ( ( ( '(' ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25486:1: ( ( '(' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25599:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25600:1: ( '(' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25486:1: ( ( '(' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25487:1: ( '(' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_3_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25601:1: ( '(' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25602:1: '('
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25488:1: ( '(' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25489:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_3_0_0()); 
             }
-            match(input,72,FOLLOW_72_in_rule__XFeatureCall__ExplicitOperationCallAssignment_3_051605); if (state.failed) return ;
+            match(input,72,FOLLOW_72_in_rule__XFeatureCall__ExplicitOperationCallAssignment_3_051380); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_3_0_0()); 
             }
@@ -73205,22 +72885,22 @@ public final void rule__XFeatureCall__ExplicitOperationCallAssignment_3_0() thro
 
 
     // $ANTLR start "rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25617:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 : ( ruleXShortClosure ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25504:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 : ( ruleXShortClosure ) ;
     public final void rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25621:1: ( ( ruleXShortClosure ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25622:1: ( ruleXShortClosure )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25508:1: ( ( ruleXShortClosure ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25509:1: ( ruleXShortClosure )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25622:1: ( ruleXShortClosure )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25623:1: ruleXShortClosure
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25509:1: ( ruleXShortClosure )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25510:1: ruleXShortClosure
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXShortClosureParserRuleCall_3_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXShortClosure_in_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_051644);
+            pushFollow(FOLLOW_ruleXShortClosure_in_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_051419);
             ruleXShortClosure();
 
             state._fsp--;
@@ -73250,22 +72930,22 @@ public final void rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0() thr
 
 
     // $ANTLR start "rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25632:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25519:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 : ( ruleXExpression ) ;
     public final void rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25636:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25637:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25523:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25524:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25637:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25638:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25524:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25525:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXExpressionParserRuleCall_3_1_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_051675);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_051450);
             ruleXExpression();
 
             state._fsp--;
@@ -73295,22 +72975,22 @@ public final void rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0() t
 
 
     // $ANTLR start "rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25647:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25534:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 : ( ruleXExpression ) ;
     public final void rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25651:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25652:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25538:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25539:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25652:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25653:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25539:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25540:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXExpressionParserRuleCall_3_1_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_151706);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_151481);
             ruleXExpression();
 
             state._fsp--;
@@ -73340,22 +73020,22 @@ public final void rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1()
 
 
     // $ANTLR start "rule__XFeatureCall__FeatureCallArgumentsAssignment_4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25662:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_4 : ( ruleXClosure ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25549:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_4 : ( ruleXClosure ) ;
     public final void rule__XFeatureCall__FeatureCallArgumentsAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25666:1: ( ( ruleXClosure ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25667:1: ( ruleXClosure )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25553:1: ( ( ruleXClosure ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25554:1: ( ruleXClosure )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25667:1: ( ruleXClosure )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25668:1: ruleXClosure
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25554:1: ( ruleXClosure )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25555:1: ruleXClosure
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXClosureParserRuleCall_4_0()); 
             }
-            pushFollow(FOLLOW_ruleXClosure_in_rule__XFeatureCall__FeatureCallArgumentsAssignment_451737);
+            pushFollow(FOLLOW_ruleXClosure_in_rule__XFeatureCall__FeatureCallArgumentsAssignment_451512);
             ruleXClosure();
 
             state._fsp--;
@@ -73385,28 +73065,28 @@ public final void rule__XFeatureCall__FeatureCallArgumentsAssignment_4() throws
 
 
     // $ANTLR start "rule__XConstructorCall__ConstructorAssignment_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25677:1: rule__XConstructorCall__ConstructorAssignment_2 : ( ( ruleQualifiedName ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25564:1: rule__XConstructorCall__ConstructorAssignment_2 : ( ( ruleQualifiedName ) ) ;
     public final void rule__XConstructorCall__ConstructorAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25681:1: ( ( ( ruleQualifiedName ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25682:1: ( ( ruleQualifiedName ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25568:1: ( ( ( ruleQualifiedName ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25569:1: ( ( ruleQualifiedName ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25682:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25683:1: ( ruleQualifiedName )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25569:1: ( ( ruleQualifiedName ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25570:1: ( ruleQualifiedName )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getConstructorJvmConstructorCrossReference_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25684:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25685:1: ruleQualifiedName
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25571:1: ( ruleQualifiedName )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25572:1: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getConstructorJvmConstructorQualifiedNameParserRuleCall_2_0_1()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_rule__XConstructorCall__ConstructorAssignment_251772);
+            pushFollow(FOLLOW_ruleQualifiedName_in_rule__XConstructorCall__ConstructorAssignment_251547);
             ruleQualifiedName();
 
             state._fsp--;
@@ -73442,22 +73122,22 @@ public final void rule__XConstructorCall__ConstructorAssignment_2() throws Recog
 
 
     // $ANTLR start "rule__XConstructorCall__TypeArgumentsAssignment_3_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25696:1: rule__XConstructorCall__TypeArgumentsAssignment_3_1 : ( ruleJvmArgumentTypeReference ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25583:1: rule__XConstructorCall__TypeArgumentsAssignment_3_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__XConstructorCall__TypeArgumentsAssignment_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25700:1: ( ( ruleJvmArgumentTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25701:1: ( ruleJvmArgumentTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25587:1: ( ( ruleJvmArgumentTypeReference ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25588:1: ( ruleJvmArgumentTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25701:1: ( ruleJvmArgumentTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25702:1: ruleJvmArgumentTypeReference
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25588:1: ( ruleJvmArgumentTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25589:1: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_3_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__XConstructorCall__TypeArgumentsAssignment_3_151807);
+            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__XConstructorCall__TypeArgumentsAssignment_3_151582);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -73487,22 +73167,22 @@ public final void rule__XConstructorCall__TypeArgumentsAssignment_3_1() throws R
 
 
     // $ANTLR start "rule__XConstructorCall__TypeArgumentsAssignment_3_2_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25711:1: rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 : ( ruleJvmArgumentTypeReference ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25598:1: rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__XConstructorCall__TypeArgumentsAssignment_3_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25715:1: ( ( ruleJvmArgumentTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25716:1: ( ruleJvmArgumentTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25602:1: ( ( ruleJvmArgumentTypeReference ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25603:1: ( ruleJvmArgumentTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25716:1: ( ruleJvmArgumentTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25717:1: ruleJvmArgumentTypeReference
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25603:1: ( ruleJvmArgumentTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25604:1: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_3_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__XConstructorCall__TypeArgumentsAssignment_3_2_151838);
+            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__XConstructorCall__TypeArgumentsAssignment_3_2_151613);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -73532,28 +73212,28 @@ public final void rule__XConstructorCall__TypeArgumentsAssignment_3_2_1() throws
 
 
     // $ANTLR start "rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25726:1: rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 : ( ( '(' ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25613:1: rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 : ( ( '(' ) ) ;
     public final void rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25730:1: ( ( ( '(' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25731:1: ( ( '(' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25617:1: ( ( ( '(' ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25618:1: ( ( '(' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25731:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25732:1: ( '(' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25618:1: ( ( '(' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25619:1: ( '(' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getExplicitConstructorCallLeftParenthesisKeyword_4_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25733:1: ( '(' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25734:1: '('
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25620:1: ( '(' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25621:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getExplicitConstructorCallLeftParenthesisKeyword_4_0_0()); 
             }
-            match(input,72,FOLLOW_72_in_rule__XConstructorCall__ExplicitConstructorCallAssignment_4_051874); if (state.failed) return ;
+            match(input,72,FOLLOW_72_in_rule__XConstructorCall__ExplicitConstructorCallAssignment_4_051649); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstructorCallAccess().getExplicitConstructorCallLeftParenthesisKeyword_4_0_0()); 
             }
@@ -73585,22 +73265,22 @@ public final void rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0(
 
 
     // $ANTLR start "rule__XConstructorCall__ArgumentsAssignment_4_1_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25749:1: rule__XConstructorCall__ArgumentsAssignment_4_1_0 : ( ruleXShortClosure ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25636:1: rule__XConstructorCall__ArgumentsAssignment_4_1_0 : ( ruleXShortClosure ) ;
     public final void rule__XConstructorCall__ArgumentsAssignment_4_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25753:1: ( ( ruleXShortClosure ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25754:1: ( ruleXShortClosure )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25640:1: ( ( ruleXShortClosure ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25641:1: ( ruleXShortClosure )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25754:1: ( ruleXShortClosure )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25755:1: ruleXShortClosure
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25641:1: ( ruleXShortClosure )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25642:1: ruleXShortClosure
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getArgumentsXShortClosureParserRuleCall_4_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXShortClosure_in_rule__XConstructorCall__ArgumentsAssignment_4_1_051913);
+            pushFollow(FOLLOW_ruleXShortClosure_in_rule__XConstructorCall__ArgumentsAssignment_4_1_051688);
             ruleXShortClosure();
 
             state._fsp--;
@@ -73630,22 +73310,22 @@ public final void rule__XConstructorCall__ArgumentsAssignment_4_1_0() throws Rec
 
 
     // $ANTLR start "rule__XConstructorCall__ArgumentsAssignment_4_1_1_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25764:1: rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25651:1: rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 : ( ruleXExpression ) ;
     public final void rule__XConstructorCall__ArgumentsAssignment_4_1_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25768:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25769:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25655:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25656:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25769:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25770:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25656:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25657:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getArgumentsXExpressionParserRuleCall_4_1_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XConstructorCall__ArgumentsAssignment_4_1_1_051944);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XConstructorCall__ArgumentsAssignment_4_1_1_051719);
             ruleXExpression();
 
             state._fsp--;
@@ -73675,22 +73355,22 @@ public final void rule__XConstructorCall__ArgumentsAssignment_4_1_1_0() throws R
 
 
     // $ANTLR start "rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25779:1: rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25666:1: rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 : ( ruleXExpression ) ;
     public final void rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25783:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25784:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25670:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25671:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25784:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25785:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25671:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25672:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getArgumentsXExpressionParserRuleCall_4_1_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_151975);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_151750);
             ruleXExpression();
 
             state._fsp--;
@@ -73720,22 +73400,22 @@ public final void rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1() throws
 
 
     // $ANTLR start "rule__XConstructorCall__ArgumentsAssignment_5"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25794:1: rule__XConstructorCall__ArgumentsAssignment_5 : ( ruleXClosure ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25681:1: rule__XConstructorCall__ArgumentsAssignment_5 : ( ruleXClosure ) ;
     public final void rule__XConstructorCall__ArgumentsAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25798:1: ( ( ruleXClosure ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25799:1: ( ruleXClosure )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25685:1: ( ( ruleXClosure ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25686:1: ( ruleXClosure )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25799:1: ( ruleXClosure )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25800:1: ruleXClosure
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25686:1: ( ruleXClosure )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25687:1: ruleXClosure
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getArgumentsXClosureParserRuleCall_5_0()); 
             }
-            pushFollow(FOLLOW_ruleXClosure_in_rule__XConstructorCall__ArgumentsAssignment_552006);
+            pushFollow(FOLLOW_ruleXClosure_in_rule__XConstructorCall__ArgumentsAssignment_551781);
             ruleXClosure();
 
             state._fsp--;
@@ -73765,28 +73445,28 @@ public final void rule__XConstructorCall__ArgumentsAssignment_5() throws Recogni
 
 
     // $ANTLR start "rule__XBooleanLiteral__IsTrueAssignment_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25809:1: rule__XBooleanLiteral__IsTrueAssignment_1_1 : ( ( 'true' ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25696:1: rule__XBooleanLiteral__IsTrueAssignment_1_1 : ( ( 'true' ) ) ;
     public final void rule__XBooleanLiteral__IsTrueAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25813:1: ( ( ( 'true' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25814:1: ( ( 'true' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25700:1: ( ( ( 'true' ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25701:1: ( ( 'true' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25814:1: ( ( 'true' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25815:1: ( 'true' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25701:1: ( ( 'true' ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25702:1: ( 'true' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25816:1: ( 'true' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25817:1: 'true'
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25703:1: ( 'true' )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25704:1: 'true'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); 
             }
-            match(input,108,FOLLOW_108_in_rule__XBooleanLiteral__IsTrueAssignment_1_152042); if (state.failed) return ;
+            match(input,108,FOLLOW_108_in_rule__XBooleanLiteral__IsTrueAssignment_1_151817); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); 
             }
@@ -73818,22 +73498,22 @@ public final void rule__XBooleanLiteral__IsTrueAssignment_1_1() throws Recogniti
 
 
     // $ANTLR start "rule__XNumberLiteral__ValueAssignment_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25832:1: rule__XNumberLiteral__ValueAssignment_1 : ( ruleNumber ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25719:1: rule__XNumberLiteral__ValueAssignment_1 : ( ruleNumber ) ;
     public final void rule__XNumberLiteral__ValueAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25836:1: ( ( ruleNumber ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25837:1: ( ruleNumber )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25723:1: ( ( ruleNumber ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25724:1: ( ruleNumber )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25837:1: ( ruleNumber )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25838:1: ruleNumber
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25724:1: ( ruleNumber )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25725:1: ruleNumber
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNumberLiteralAccess().getValueNumberParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleNumber_in_rule__XNumberLiteral__ValueAssignment_152081);
+            pushFollow(FOLLOW_ruleNumber_in_rule__XNumberLiteral__ValueAssignment_151856);
             ruleNumber();
 
             state._fsp--;
@@ -73863,22 +73543,22 @@ public final void rule__XNumberLiteral__ValueAssignment_1() throws RecognitionEx
 
 
     // $ANTLR start "rule__XStringLiteral__ValueAssignment_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25847:1: rule__XStringLiteral__ValueAssignment_1 : ( RULE_STRING ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25734:1: rule__XStringLiteral__ValueAssignment_1 : ( RULE_STRING ) ;
     public final void rule__XStringLiteral__ValueAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25851:1: ( ( RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25852:1: ( RULE_STRING )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25738:1: ( ( RULE_STRING ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25739:1: ( RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25852:1: ( RULE_STRING )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25853:1: RULE_STRING
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25739:1: ( RULE_STRING )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25740:1: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXStringLiteralAccess().getValueSTRINGTerminalRuleCall_1_0()); 
             }
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__XStringLiteral__ValueAssignment_152112); if (state.failed) return ;
+            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__XStringLiteral__ValueAssignment_151887); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXStringLiteralAccess().getValueSTRINGTerminalRuleCall_1_0()); 
             }
@@ -73904,28 +73584,28 @@ public final void rule__XStringLiteral__ValueAssignment_1() throws RecognitionEx
 
 
     // $ANTLR start "rule__XTypeLiteral__TypeAssignment_3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25862:1: rule__XTypeLiteral__TypeAssignment_3 : ( ( ruleQualifiedName ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25749:1: rule__XTypeLiteral__TypeAssignment_3 : ( ( ruleQualifiedName ) ) ;
     public final void rule__XTypeLiteral__TypeAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25866:1: ( ( ( ruleQualifiedName ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25867:1: ( ( ruleQualifiedName ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25753:1: ( ( ( ruleQualifiedName ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25754:1: ( ( ruleQualifiedName ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25867:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25868:1: ( ruleQualifiedName )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25754:1: ( ( ruleQualifiedName ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25755:1: ( ruleQualifiedName )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getTypeJvmTypeCrossReference_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25869:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25870:1: ruleQualifiedName
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25756:1: ( ruleQualifiedName )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25757:1: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getTypeJvmTypeQualifiedNameParserRuleCall_3_0_1()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_rule__XTypeLiteral__TypeAssignment_352147);
+            pushFollow(FOLLOW_ruleQualifiedName_in_rule__XTypeLiteral__TypeAssignment_351922);
             ruleQualifiedName();
 
             state._fsp--;
@@ -73961,22 +73641,22 @@ public final void rule__XTypeLiteral__TypeAssignment_3() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XTypeLiteral__ArrayDimensionsAssignment_4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25881:1: rule__XTypeLiteral__ArrayDimensionsAssignment_4 : ( ruleArrayBrackets ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25768:1: rule__XTypeLiteral__ArrayDimensionsAssignment_4 : ( ruleArrayBrackets ) ;
     public final void rule__XTypeLiteral__ArrayDimensionsAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25885:1: ( ( ruleArrayBrackets ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25886:1: ( ruleArrayBrackets )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25772:1: ( ( ruleArrayBrackets ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25773:1: ( ruleArrayBrackets )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25886:1: ( ruleArrayBrackets )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25887:1: ruleArrayBrackets
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25773:1: ( ruleArrayBrackets )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25774:1: ruleArrayBrackets
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getArrayDimensionsArrayBracketsParserRuleCall_4_0()); 
             }
-            pushFollow(FOLLOW_ruleArrayBrackets_in_rule__XTypeLiteral__ArrayDimensionsAssignment_452182);
+            pushFollow(FOLLOW_ruleArrayBrackets_in_rule__XTypeLiteral__ArrayDimensionsAssignment_451957);
             ruleArrayBrackets();
 
             state._fsp--;
@@ -74006,22 +73686,22 @@ public final void rule__XTypeLiteral__ArrayDimensionsAssignment_4() throws Recog
 
 
     // $ANTLR start "rule__XThrowExpression__ExpressionAssignment_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25896:1: rule__XThrowExpression__ExpressionAssignment_2 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25783:1: rule__XThrowExpression__ExpressionAssignment_2 : ( ruleXExpression ) ;
     public final void rule__XThrowExpression__ExpressionAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25900:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25901:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25787:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25788:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25901:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25902:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25788:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25789:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXThrowExpressionAccess().getExpressionXExpressionParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XThrowExpression__ExpressionAssignment_252213);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XThrowExpression__ExpressionAssignment_251988);
             ruleXExpression();
 
             state._fsp--;
@@ -74051,22 +73731,22 @@ public final void rule__XThrowExpression__ExpressionAssignment_2() throws Recogn
 
 
     // $ANTLR start "rule__XReturnExpression__ExpressionAssignment_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25911:1: rule__XReturnExpression__ExpressionAssignment_2 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25798:1: rule__XReturnExpression__ExpressionAssignment_2 : ( ruleXExpression ) ;
     public final void rule__XReturnExpression__ExpressionAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25915:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25916:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25802:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25803:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25916:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25917:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25803:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25804:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXReturnExpressionAccess().getExpressionXExpressionParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XReturnExpression__ExpressionAssignment_252244);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XReturnExpression__ExpressionAssignment_252019);
             ruleXExpression();
 
             state._fsp--;
@@ -74096,22 +73776,22 @@ public final void rule__XReturnExpression__ExpressionAssignment_2() throws Recog
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__ExpressionAssignment_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25926:1: rule__XTryCatchFinallyExpression__ExpressionAssignment_2 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25813:1: rule__XTryCatchFinallyExpression__ExpressionAssignment_2 : ( ruleXExpression ) ;
     public final void rule__XTryCatchFinallyExpression__ExpressionAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25930:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25931:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25817:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25818:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25931:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25932:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25818:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25819:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getExpressionXExpressionParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XTryCatchFinallyExpression__ExpressionAssignment_252275);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XTryCatchFinallyExpression__ExpressionAssignment_252050);
             ruleXExpression();
 
             state._fsp--;
@@ -74141,22 +73821,22 @@ public final void rule__XTryCatchFinallyExpression__ExpressionAssignment_2() thr
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25941:1: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 : ( ruleXCatchClause ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25828:1: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 : ( ruleXCatchClause ) ;
     public final void rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25945:1: ( ( ruleXCatchClause ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25946:1: ( ruleXCatchClause )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25832:1: ( ( ruleXCatchClause ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25833:1: ( ruleXCatchClause )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25946:1: ( ruleXCatchClause )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25947:1: ruleXCatchClause
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25833:1: ( ruleXCatchClause )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25834:1: ruleXCatchClause
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getCatchClausesXCatchClauseParserRuleCall_3_0_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXCatchClause_in_rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_052306);
+            pushFollow(FOLLOW_ruleXCatchClause_in_rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_052081);
             ruleXCatchClause();
 
             state._fsp--;
@@ -74186,22 +73866,22 @@ public final void rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25956:1: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25843:1: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 : ( ruleXExpression ) ;
     public final void rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25960:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25961:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25847:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25848:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25961:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25962:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25848:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25849:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyExpressionXExpressionParserRuleCall_3_0_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_152337);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_152112);
             ruleXExpression();
 
             state._fsp--;
@@ -74231,22 +73911,22 @@ public final void rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25971:1: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25858:1: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 : ( ruleXExpression ) ;
     public final void rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25975:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25976:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25862:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25863:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25976:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25977:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25863:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25864:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyExpressionXExpressionParserRuleCall_3_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_152368);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_152143);
             ruleXExpression();
 
             state._fsp--;
@@ -74276,22 +73956,22 @@ public final void rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_
 
 
     // $ANTLR start "rule__XSynchronizedExpression__ParamAssignment_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25986:1: rule__XSynchronizedExpression__ParamAssignment_1 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25873:1: rule__XSynchronizedExpression__ParamAssignment_1 : ( ruleXExpression ) ;
     public final void rule__XSynchronizedExpression__ParamAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25990:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25991:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25877:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25878:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25991:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25992:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25878:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25879:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getParamXExpressionParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XSynchronizedExpression__ParamAssignment_152399);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XSynchronizedExpression__ParamAssignment_152174);
             ruleXExpression();
 
             state._fsp--;
@@ -74321,22 +74001,22 @@ public final void rule__XSynchronizedExpression__ParamAssignment_1() throws Reco
 
 
     // $ANTLR start "rule__XSynchronizedExpression__ExpressionAssignment_3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26001:1: rule__XSynchronizedExpression__ExpressionAssignment_3 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25888:1: rule__XSynchronizedExpression__ExpressionAssignment_3 : ( ruleXExpression ) ;
     public final void rule__XSynchronizedExpression__ExpressionAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26005:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26006:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25892:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25893:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26006:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26007:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25893:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25894:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getExpressionXExpressionParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XSynchronizedExpression__ExpressionAssignment_352430);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XSynchronizedExpression__ExpressionAssignment_352205);
             ruleXExpression();
 
             state._fsp--;
@@ -74366,22 +74046,22 @@ public final void rule__XSynchronizedExpression__ExpressionAssignment_3() throws
 
 
     // $ANTLR start "rule__XCatchClause__DeclaredParamAssignment_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26016:1: rule__XCatchClause__DeclaredParamAssignment_2 : ( ruleFullJvmFormalParameter ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25903:1: rule__XCatchClause__DeclaredParamAssignment_2 : ( ruleFullJvmFormalParameter ) ;
     public final void rule__XCatchClause__DeclaredParamAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26020:1: ( ( ruleFullJvmFormalParameter ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26021:1: ( ruleFullJvmFormalParameter )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25907:1: ( ( ruleFullJvmFormalParameter ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25908:1: ( ruleFullJvmFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26021:1: ( ruleFullJvmFormalParameter )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26022:1: ruleFullJvmFormalParameter
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25908:1: ( ruleFullJvmFormalParameter )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25909:1: ruleFullJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getDeclaredParamFullJvmFormalParameterParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleFullJvmFormalParameter_in_rule__XCatchClause__DeclaredParamAssignment_252461);
+            pushFollow(FOLLOW_ruleFullJvmFormalParameter_in_rule__XCatchClause__DeclaredParamAssignment_252236);
             ruleFullJvmFormalParameter();
 
             state._fsp--;
@@ -74411,22 +74091,22 @@ public final void rule__XCatchClause__DeclaredParamAssignment_2() throws Recogni
 
 
     // $ANTLR start "rule__XCatchClause__ExpressionAssignment_4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26031:1: rule__XCatchClause__ExpressionAssignment_4 : ( ruleXExpression ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25918:1: rule__XCatchClause__ExpressionAssignment_4 : ( ruleXExpression ) ;
     public final void rule__XCatchClause__ExpressionAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26035:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26036:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25922:1: ( ( ruleXExpression ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25923:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26036:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26037:1: ruleXExpression
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25923:1: ( ruleXExpression )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25924:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getExpressionXExpressionParserRuleCall_4_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XCatchClause__ExpressionAssignment_452492);
+            pushFollow(FOLLOW_ruleXExpression_in_rule__XCatchClause__ExpressionAssignment_452267);
             ruleXExpression();
 
             state._fsp--;
@@ -74456,22 +74136,22 @@ public final void rule__XCatchClause__ExpressionAssignment_4() throws Recognitio
 
 
     // $ANTLR start "rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26046:1: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 : ( ruleJvmTypeReference ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25933:1: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 : ( ruleJvmTypeReference ) ;
     public final void rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26050:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26051:1: ( ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25937:1: ( ( ruleJvmTypeReference ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25938:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26051:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26052:1: ruleJvmTypeReference
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25938:1: ( ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25939:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getParamTypesJvmTypeReferenceParserRuleCall_0_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__XFunctionTypeRef__ParamTypesAssignment_0_1_052523);
+            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__XFunctionTypeRef__ParamTypesAssignment_0_1_052298);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -74501,22 +74181,22 @@ public final void rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0() throws Re
 
 
     // $ANTLR start "rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26061:1: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 : ( ruleJvmTypeReference ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25948:1: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 : ( ruleJvmTypeReference ) ;
     public final void rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26065:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26066:1: ( ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25952:1: ( ( ruleJvmTypeReference ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25953:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26066:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26067:1: ruleJvmTypeReference
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25953:1: ( ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25954:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getParamTypesJvmTypeReferenceParserRuleCall_0_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_152554);
+            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_152329);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -74546,22 +74226,22 @@ public final void rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1() throws
 
 
     // $ANTLR start "rule__XFunctionTypeRef__ReturnTypeAssignment_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26076:1: rule__XFunctionTypeRef__ReturnTypeAssignment_2 : ( ruleJvmTypeReference ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25963:1: rule__XFunctionTypeRef__ReturnTypeAssignment_2 : ( ruleJvmTypeReference ) ;
     public final void rule__XFunctionTypeRef__ReturnTypeAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26080:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26081:1: ( ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25967:1: ( ( ruleJvmTypeReference ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25968:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26081:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26082:1: ruleJvmTypeReference
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25968:1: ( ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25969:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getReturnTypeJvmTypeReferenceParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__XFunctionTypeRef__ReturnTypeAssignment_252585);
+            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__XFunctionTypeRef__ReturnTypeAssignment_252360);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -74591,28 +74271,28 @@ public final void rule__XFunctionTypeRef__ReturnTypeAssignment_2() throws Recogn
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__TypeAssignment_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26091:1: rule__JvmParameterizedTypeReference__TypeAssignment_0 : ( ( ruleQualifiedName ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25978:1: rule__JvmParameterizedTypeReference__TypeAssignment_0 : ( ( ruleQualifiedName ) ) ;
     public final void rule__JvmParameterizedTypeReference__TypeAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26095:1: ( ( ( ruleQualifiedName ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26096:1: ( ( ruleQualifiedName ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25982:1: ( ( ( ruleQualifiedName ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25983:1: ( ( ruleQualifiedName ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26096:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26097:1: ( ruleQualifiedName )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25983:1: ( ( ruleQualifiedName ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25984:1: ( ruleQualifiedName )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeJvmTypeCrossReference_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26098:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26099:1: ruleQualifiedName
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25985:1: ( ruleQualifiedName )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25986:1: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeJvmTypeQualifiedNameParserRuleCall_0_0_1()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_rule__JvmParameterizedTypeReference__TypeAssignment_052620);
+            pushFollow(FOLLOW_ruleQualifiedName_in_rule__JvmParameterizedTypeReference__TypeAssignment_052395);
             ruleQualifiedName();
 
             state._fsp--;
@@ -74648,22 +74328,22 @@ public final void rule__JvmParameterizedTypeReference__TypeAssignment_0() throws
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26110:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 : ( ruleJvmArgumentTypeReference ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25997:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26114:1: ( ( ruleJvmArgumentTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26115:1: ( ruleJvmArgumentTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26001:1: ( ( ruleJvmArgumentTypeReference ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26002:1: ( ruleJvmArgumentTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26115:1: ( ruleJvmArgumentTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26116:1: ruleJvmArgumentTypeReference
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26002:1: ( ruleJvmArgumentTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26003:1: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_152655);
+            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_152430);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -74693,22 +74373,22 @@ public final void rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1()
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26125:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 : ( ruleJvmArgumentTypeReference ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26012:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26129:1: ( ( ruleJvmArgumentTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26130:1: ( ruleJvmArgumentTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26016:1: ( ( ruleJvmArgumentTypeReference ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26017:1: ( ruleJvmArgumentTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26130:1: ( ruleJvmArgumentTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26131:1: ruleJvmArgumentTypeReference
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26017:1: ( ruleJvmArgumentTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26018:1: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_152686);
+            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_152461);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -74738,28 +74418,28 @@ public final void rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26140:1: rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 : ( ( ruleValidID ) ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26027:1: rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 : ( ( ruleValidID ) ) ;
     public final void rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26144:1: ( ( ( ruleValidID ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26145:1: ( ( ruleValidID ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26031:1: ( ( ( ruleValidID ) ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26032:1: ( ( ruleValidID ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26145:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26146:1: ( ruleValidID )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26032:1: ( ( ruleValidID ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26033:1: ( ruleValidID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeJvmTypeCrossReference_1_4_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26147:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26148:1: ruleValidID
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26034:1: ( ruleValidID )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26035:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeJvmTypeValidIDParserRuleCall_1_4_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__JvmParameterizedTypeReference__TypeAssignment_1_4_152721);
+            pushFollow(FOLLOW_ruleValidID_in_rule__JvmParameterizedTypeReference__TypeAssignment_1_4_152496);
             ruleValidID();
 
             state._fsp--;
@@ -74795,22 +74475,22 @@ public final void rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1() th
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26159:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 : ( ruleJvmArgumentTypeReference ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26046:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26163:1: ( ( ruleJvmArgumentTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26164:1: ( ruleJvmArgumentTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26050:1: ( ( ruleJvmArgumentTypeReference ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26051:1: ( ruleJvmArgumentTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26164:1: ( ruleJvmArgumentTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26165:1: ruleJvmArgumentTypeReference
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26051:1: ( ruleJvmArgumentTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26052:1: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_4_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_152756);
+            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_152531);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -74840,22 +74520,22 @@ public final void rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26174:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 : ( ruleJvmArgumentTypeReference ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26061:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26178:1: ( ( ruleJvmArgumentTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26179:1: ( ruleJvmArgumentTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26065:1: ( ( ruleJvmArgumentTypeReference ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26066:1: ( ruleJvmArgumentTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26179:1: ( ruleJvmArgumentTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26180:1: ruleJvmArgumentTypeReference
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26066:1: ( ruleJvmArgumentTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26067:1: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_4_2_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_152787);
+            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_152562);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -74885,22 +74565,22 @@ public final void rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26189:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 : ( ruleJvmUpperBound ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26076:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 : ( ruleJvmUpperBound ) ;
     public final void rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26193:1: ( ( ruleJvmUpperBound ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26194:1: ( ruleJvmUpperBound )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26080:1: ( ( ruleJvmUpperBound ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26081:1: ( ruleJvmUpperBound )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26194:1: ( ruleJvmUpperBound )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26195:1: ruleJvmUpperBound
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26081:1: ( ruleJvmUpperBound )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26082:1: ruleJvmUpperBound
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmUpperBoundParserRuleCall_2_0_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmUpperBound_in_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_052818);
+            pushFollow(FOLLOW_ruleJvmUpperBound_in_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_052593);
             ruleJvmUpperBound();
 
             state._fsp--;
@@ -74930,22 +74610,22 @@ public final void rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0()
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26204:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 : ( ruleJvmUpperBoundAnded ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26091:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 : ( ruleJvmUpperBoundAnded ) ;
     public final void rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26208:1: ( ( ruleJvmUpperBoundAnded ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26209:1: ( ruleJvmUpperBoundAnded )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26095:1: ( ( ruleJvmUpperBoundAnded ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26096:1: ( ruleJvmUpperBoundAnded )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26209:1: ( ruleJvmUpperBoundAnded )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26210:1: ruleJvmUpperBoundAnded
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26096:1: ( ruleJvmUpperBoundAnded )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26097:1: ruleJvmUpperBoundAnded
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmUpperBoundAndedParserRuleCall_2_0_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmUpperBoundAnded_in_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_152849);
+            pushFollow(FOLLOW_ruleJvmUpperBoundAnded_in_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_152624);
             ruleJvmUpperBoundAnded();
 
             state._fsp--;
@@ -74975,22 +74655,22 @@ public final void rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1()
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26219:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 : ( ruleJvmLowerBound ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26106:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 : ( ruleJvmLowerBound ) ;
     public final void rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26223:1: ( ( ruleJvmLowerBound ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26224:1: ( ruleJvmLowerBound )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26110:1: ( ( ruleJvmLowerBound ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26111:1: ( ruleJvmLowerBound )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26224:1: ( ruleJvmLowerBound )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26225:1: ruleJvmLowerBound
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26111:1: ( ruleJvmLowerBound )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26112:1: ruleJvmLowerBound
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmLowerBoundParserRuleCall_2_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmLowerBound_in_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_052880);
+            pushFollow(FOLLOW_ruleJvmLowerBound_in_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_052655);
             ruleJvmLowerBound();
 
             state._fsp--;
@@ -75020,22 +74700,22 @@ public final void rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0()
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26234:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 : ( ruleJvmLowerBoundAnded ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26121:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 : ( ruleJvmLowerBoundAnded ) ;
     public final void rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26238:1: ( ( ruleJvmLowerBoundAnded ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26239:1: ( ruleJvmLowerBoundAnded )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26125:1: ( ( ruleJvmLowerBoundAnded ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26126:1: ( ruleJvmLowerBoundAnded )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26239:1: ( ruleJvmLowerBoundAnded )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26240:1: ruleJvmLowerBoundAnded
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26126:1: ( ruleJvmLowerBoundAnded )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26127:1: ruleJvmLowerBoundAnded
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmLowerBoundAndedParserRuleCall_2_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmLowerBoundAnded_in_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_152911);
+            pushFollow(FOLLOW_ruleJvmLowerBoundAnded_in_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_152686);
             ruleJvmLowerBoundAnded();
 
             state._fsp--;
@@ -75065,22 +74745,22 @@ public final void rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1()
 
 
     // $ANTLR start "rule__JvmUpperBound__TypeReferenceAssignment_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26249:1: rule__JvmUpperBound__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26136:1: rule__JvmUpperBound__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
     public final void rule__JvmUpperBound__TypeReferenceAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26253:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26254:1: ( ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26140:1: ( ( ruleJvmTypeReference ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26141:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26254:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26255:1: ruleJvmTypeReference
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26141:1: ( ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26142:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAccess().getTypeReferenceJvmTypeReferenceParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__JvmUpperBound__TypeReferenceAssignment_152942);
+            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__JvmUpperBound__TypeReferenceAssignment_152717);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -75110,22 +74790,22 @@ public final void rule__JvmUpperBound__TypeReferenceAssignment_1() throws Recogn
 
 
     // $ANTLR start "rule__JvmUpperBoundAnded__TypeReferenceAssignment_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26264:1: rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26151:1: rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
     public final void rule__JvmUpperBoundAnded__TypeReferenceAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26268:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26269:1: ( ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26155:1: ( ( ruleJvmTypeReference ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26156:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26269:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26270:1: ruleJvmTypeReference
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26156:1: ( ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26157:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAndedAccess().getTypeReferenceJvmTypeReferenceParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__JvmUpperBoundAnded__TypeReferenceAssignment_152973);
+            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__JvmUpperBoundAnded__TypeReferenceAssignment_152748);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -75155,22 +74835,22 @@ public final void rule__JvmUpperBoundAnded__TypeReferenceAssignment_1() throws R
 
 
     // $ANTLR start "rule__JvmLowerBound__TypeReferenceAssignment_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26279:1: rule__JvmLowerBound__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26166:1: rule__JvmLowerBound__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
     public final void rule__JvmLowerBound__TypeReferenceAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26283:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26284:1: ( ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26170:1: ( ( ruleJvmTypeReference ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26171:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26284:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26285:1: ruleJvmTypeReference
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26171:1: ( ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26172:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAccess().getTypeReferenceJvmTypeReferenceParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__JvmLowerBound__TypeReferenceAssignment_153004);
+            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__JvmLowerBound__TypeReferenceAssignment_152779);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -75200,22 +74880,22 @@ public final void rule__JvmLowerBound__TypeReferenceAssignment_1() throws Recogn
 
 
     // $ANTLR start "rule__JvmLowerBoundAnded__TypeReferenceAssignment_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26294:1: rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
+    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26181:1: rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
     public final void rule__JvmLowerBoundAnded__TypeReferenceAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26298:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26299:1: ( ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26185:1: ( ( ruleJvmTypeReference ) )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26186:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26299:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26300:1: ruleJvmTypeReference
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26186:1: ( ruleJvmTypeReference )
+            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26187:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAndedAccess().getTypeReferenceJvmTypeReferenceParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__JvmLowerBoundAnded__TypeReferenceAssignment_153035);
+            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__JvmLowerBoundAnded__TypeReferenceAssignment_152810);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -75587,12 +75267,12 @@ public final void synpred104_InternalCheck_fragment() throws RecognitionExceptio
     }
     // $ANTLR end synpred104_InternalCheck
 
-    // $ANTLR start synpred130_InternalCheck
-    public final void synpred130_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5487:2: ( rule__Check__Group_6__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5487:2: rule__Check__Group_6__0
+    // $ANTLR start synpred129_InternalCheck
+    public final void synpred129_InternalCheck_fragment() throws RecognitionException {   
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5393:2: ( rule__Check__Group_6__0 )
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5393:2: rule__Check__Group_6__0
         {
-        pushFollow(FOLLOW_rule__Check__Group_6__0_in_synpred130_InternalCheck11851);
+        pushFollow(FOLLOW_rule__Check__Group_6__0_in_synpred129_InternalCheck11665);
         rule__Check__Group_6__0();
 
         state._fsp--;
@@ -75600,15 +75280,30 @@ public final void synpred130_InternalCheck_fragment() throws RecognitionExceptio
 
         }
     }
-    // $ANTLR end synpred130_InternalCheck
+    // $ANTLR end synpred129_InternalCheck
+
+    // $ANTLR start synpred140_InternalCheck
+    public final void synpred140_InternalCheck_fragment() throws RecognitionException {   
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7262:2: ( rule__XIssueExpression__CheckAssignment_2 )
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7262:2: rule__XIssueExpression__CheckAssignment_2
+        {
+        pushFollow(FOLLOW_rule__XIssueExpression__CheckAssignment_2_in_synpred140_InternalCheck15337);
+        rule__XIssueExpression__CheckAssignment_2();
+
+        state._fsp--;
+        if (state.failed) return ;
+
+        }
+    }
+    // $ANTLR end synpred140_InternalCheck
 
     // $ANTLR start synpred141_InternalCheck
     public final void synpred141_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7356:2: ( rule__XIssueExpression__CheckAssignment_2 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7356:2: rule__XIssueExpression__CheckAssignment_2
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7291:2: ( rule__XIssueExpression__Group_3__0 )
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7291:2: rule__XIssueExpression__Group_3__0
         {
-        pushFollow(FOLLOW_rule__XIssueExpression__CheckAssignment_2_in_synpred141_InternalCheck15523);
-        rule__XIssueExpression__CheckAssignment_2();
+        pushFollow(FOLLOW_rule__XIssueExpression__Group_3__0_in_synpred141_InternalCheck15398);
+        rule__XIssueExpression__Group_3__0();
 
         state._fsp--;
         if (state.failed) return ;
@@ -75619,11 +75314,11 @@ public final void synpred141_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred142_InternalCheck
     public final void synpred142_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7385:2: ( rule__XIssueExpression__Group_3__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7385:2: rule__XIssueExpression__Group_3__0
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7320:2: ( rule__XIssueExpression__Group_4__0 )
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7320:2: rule__XIssueExpression__Group_4__0
         {
-        pushFollow(FOLLOW_rule__XIssueExpression__Group_3__0_in_synpred142_InternalCheck15584);
-        rule__XIssueExpression__Group_3__0();
+        pushFollow(FOLLOW_rule__XIssueExpression__Group_4__0_in_synpred142_InternalCheck15459);
+        rule__XIssueExpression__Group_4__0();
 
         state._fsp--;
         if (state.failed) return ;
@@ -75634,11 +75329,11 @@ public final void synpred142_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred143_InternalCheck
     public final void synpred143_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7414:2: ( rule__XIssueExpression__Group_4__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7414:2: rule__XIssueExpression__Group_4__0
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7349:2: ( rule__XIssueExpression__Group_5__0 )
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7349:2: rule__XIssueExpression__Group_5__0
         {
-        pushFollow(FOLLOW_rule__XIssueExpression__Group_4__0_in_synpred143_InternalCheck15645);
-        rule__XIssueExpression__Group_4__0();
+        pushFollow(FOLLOW_rule__XIssueExpression__Group_5__0_in_synpred143_InternalCheck15520);
+        rule__XIssueExpression__Group_5__0();
 
         state._fsp--;
         if (state.failed) return ;
@@ -75649,11 +75344,11 @@ public final void synpred143_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred144_InternalCheck
     public final void synpred144_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7443:2: ( rule__XIssueExpression__Group_5__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7443:2: rule__XIssueExpression__Group_5__0
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7377:2: ( rule__XIssueExpression__Group_6__0 )
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7377:2: rule__XIssueExpression__Group_6__0
         {
-        pushFollow(FOLLOW_rule__XIssueExpression__Group_5__0_in_synpred144_InternalCheck15706);
-        rule__XIssueExpression__Group_5__0();
+        pushFollow(FOLLOW_rule__XIssueExpression__Group_6__0_in_synpred144_InternalCheck15578);
+        rule__XIssueExpression__Group_6__0();
 
         state._fsp--;
         if (state.failed) return ;
@@ -75664,11 +75359,11 @@ public final void synpred144_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred145_InternalCheck
     public final void synpred145_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7471:2: ( rule__XIssueExpression__Group_6__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7471:2: rule__XIssueExpression__Group_6__0
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7479:2: ( rule__XIssueExpression__Group_3_2__0 )
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7479:2: rule__XIssueExpression__Group_3_2__0
         {
-        pushFollow(FOLLOW_rule__XIssueExpression__Group_6__0_in_synpred145_InternalCheck15764);
-        rule__XIssueExpression__Group_6__0();
+        pushFollow(FOLLOW_rule__XIssueExpression__Group_3_2__0_in_synpred145_InternalCheck15774);
+        rule__XIssueExpression__Group_3_2__0();
 
         state._fsp--;
         if (state.failed) return ;
@@ -75679,11 +75374,11 @@ public final void synpred145_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred146_InternalCheck
     public final void synpred146_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7573:2: ( rule__XIssueExpression__Group_3_2__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7573:2: rule__XIssueExpression__Group_3_2__0
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7605:2: ( rule__XIssueExpression__Group_3_1_1_1__0 )
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7605:2: rule__XIssueExpression__Group_3_1_1_1__0
         {
-        pushFollow(FOLLOW_rule__XIssueExpression__Group_3_2__0_in_synpred146_InternalCheck15960);
-        rule__XIssueExpression__Group_3_2__0();
+        pushFollow(FOLLOW_rule__XIssueExpression__Group_3_1_1_1__0_in_synpred146_InternalCheck16023);
+        rule__XIssueExpression__Group_3_1_1_1__0();
 
         state._fsp--;
         if (state.failed) return ;
@@ -75692,58 +75387,58 @@ public final void synpred146_InternalCheck_fragment() throws RecognitionExceptio
     }
     // $ANTLR end synpred146_InternalCheck
 
-    // $ANTLR start synpred147_InternalCheck
-    public final void synpred147_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7699:2: ( rule__XIssueExpression__Group_3_1_1_1__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7699:2: rule__XIssueExpression__Group_3_1_1_1__0
+    // $ANTLR start synpred150_InternalCheck
+    public final void synpred150_InternalCheck_fragment() throws RecognitionException {   
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8427:2: ( rule__XAnnotation__Group_3__0 )
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8427:2: rule__XAnnotation__Group_3__0
         {
-        pushFollow(FOLLOW_rule__XIssueExpression__Group_3_1_1_1__0_in_synpred147_InternalCheck16209);
-        rule__XIssueExpression__Group_3_1_1_1__0();
+        pushFollow(FOLLOW_rule__XAnnotation__Group_3__0_in_synpred150_InternalCheck17652);
+        rule__XAnnotation__Group_3__0();
 
         state._fsp--;
         if (state.failed) return ;
 
         }
     }
-    // $ANTLR end synpred147_InternalCheck
+    // $ANTLR end synpred150_InternalCheck
 
-    // $ANTLR start synpred151_InternalCheck
-    public final void synpred151_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8521:2: ( rule__XAnnotation__Group_3__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8521:2: rule__XAnnotation__Group_3__0
+    // $ANTLR start synpred159_InternalCheck
+    public final void synpred159_InternalCheck_fragment() throws RecognitionException {   
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9877:2: ( rule__XAssignment__Group_1_1__0 )
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9877:2: rule__XAssignment__Group_1_1__0
         {
-        pushFollow(FOLLOW_rule__XAnnotation__Group_3__0_in_synpred151_InternalCheck17838);
-        rule__XAnnotation__Group_3__0();
+        pushFollow(FOLLOW_rule__XAssignment__Group_1_1__0_in_synpred159_InternalCheck20499);
+        rule__XAssignment__Group_1_1__0();
 
         state._fsp--;
         if (state.failed) return ;
 
         }
     }
-    // $ANTLR end synpred151_InternalCheck
+    // $ANTLR end synpred159_InternalCheck
 
-    // $ANTLR start synpred160_InternalCheck
-    public final void synpred160_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9971:2: ( rule__XAssignment__Group_1_1__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9971:2: rule__XAssignment__Group_1_1__0
+    // $ANTLR start synpred161_InternalCheck
+    public final void synpred161_InternalCheck_fragment() throws RecognitionException {   
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10288:2: ( rule__XOrExpression__Group_1__0 )
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10288:2: rule__XOrExpression__Group_1__0
         {
-        pushFollow(FOLLOW_rule__XAssignment__Group_1_1__0_in_synpred160_InternalCheck20685);
-        rule__XAssignment__Group_1_1__0();
+        pushFollow(FOLLOW_rule__XOrExpression__Group_1__0_in_synpred161_InternalCheck21303);
+        rule__XOrExpression__Group_1__0();
 
         state._fsp--;
         if (state.failed) return ;
 
         }
     }
-    // $ANTLR end synpred160_InternalCheck
+    // $ANTLR end synpred161_InternalCheck
 
     // $ANTLR start synpred162_InternalCheck
     public final void synpred162_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10382:2: ( rule__XOrExpression__Group_1__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10382:2: rule__XOrExpression__Group_1__0
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10503:2: ( rule__XAndExpression__Group_1__0 )
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10503:2: rule__XAndExpression__Group_1__0
         {
-        pushFollow(FOLLOW_rule__XOrExpression__Group_1__0_in_synpred162_InternalCheck21489);
-        rule__XOrExpression__Group_1__0();
+        pushFollow(FOLLOW_rule__XAndExpression__Group_1__0_in_synpred162_InternalCheck21726);
+        rule__XAndExpression__Group_1__0();
 
         state._fsp--;
         if (state.failed) return ;
@@ -75754,11 +75449,11 @@ public final void synpred162_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred163_InternalCheck
     public final void synpred163_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10597:2: ( rule__XAndExpression__Group_1__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10597:2: rule__XAndExpression__Group_1__0
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10718:2: ( rule__XEqualityExpression__Group_1__0 )
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10718:2: rule__XEqualityExpression__Group_1__0
         {
-        pushFollow(FOLLOW_rule__XAndExpression__Group_1__0_in_synpred163_InternalCheck21912);
-        rule__XAndExpression__Group_1__0();
+        pushFollow(FOLLOW_rule__XEqualityExpression__Group_1__0_in_synpred163_InternalCheck22149);
+        rule__XEqualityExpression__Group_1__0();
 
         state._fsp--;
         if (state.failed) return ;
@@ -75769,11 +75464,11 @@ public final void synpred163_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred164_InternalCheck
     public final void synpred164_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10812:2: ( rule__XEqualityExpression__Group_1__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10812:2: rule__XEqualityExpression__Group_1__0
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10933:2: ( rule__XRelationalExpression__Alternatives_1 )
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10933:2: rule__XRelationalExpression__Alternatives_1
         {
-        pushFollow(FOLLOW_rule__XEqualityExpression__Group_1__0_in_synpred164_InternalCheck22335);
-        rule__XEqualityExpression__Group_1__0();
+        pushFollow(FOLLOW_rule__XRelationalExpression__Alternatives_1_in_synpred164_InternalCheck22572);
+        rule__XRelationalExpression__Alternatives_1();
 
         state._fsp--;
         if (state.failed) return ;
@@ -75784,11 +75479,11 @@ public final void synpred164_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred165_InternalCheck
     public final void synpred165_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11027:2: ( rule__XRelationalExpression__Alternatives_1 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11027:2: rule__XRelationalExpression__Alternatives_1
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11369:2: ( rule__XOtherOperatorExpression__Group_1__0 )
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11369:2: rule__XOtherOperatorExpression__Group_1__0
         {
-        pushFollow(FOLLOW_rule__XRelationalExpression__Alternatives_1_in_synpred165_InternalCheck22758);
-        rule__XRelationalExpression__Alternatives_1();
+        pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1__0_in_synpred165_InternalCheck23424);
+        rule__XOtherOperatorExpression__Group_1__0();
 
         state._fsp--;
         if (state.failed) return ;
@@ -75799,11 +75494,11 @@ public final void synpred165_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred166_InternalCheck
     public final void synpred166_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11463:2: ( rule__XOtherOperatorExpression__Group_1__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11463:2: rule__XOtherOperatorExpression__Group_1__0
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11965:2: ( rule__XAdditiveExpression__Group_1__0 )
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11965:2: rule__XAdditiveExpression__Group_1__0
         {
-        pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1__0_in_synpred166_InternalCheck23610);
-        rule__XOtherOperatorExpression__Group_1__0();
+        pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1__0_in_synpred166_InternalCheck24586);
+        rule__XAdditiveExpression__Group_1__0();
 
         state._fsp--;
         if (state.failed) return ;
@@ -75814,11 +75509,11 @@ public final void synpred166_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred167_InternalCheck
     public final void synpred167_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12059:2: ( rule__XAdditiveExpression__Group_1__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12059:2: rule__XAdditiveExpression__Group_1__0
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12180:2: ( rule__XMultiplicativeExpression__Group_1__0 )
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12180:2: rule__XMultiplicativeExpression__Group_1__0
         {
-        pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1__0_in_synpred167_InternalCheck24772);
-        rule__XAdditiveExpression__Group_1__0();
+        pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1__0_in_synpred167_InternalCheck25009);
+        rule__XMultiplicativeExpression__Group_1__0();
 
         state._fsp--;
         if (state.failed) return ;
@@ -75829,11 +75524,11 @@ public final void synpred167_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred168_InternalCheck
     public final void synpred168_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12274:2: ( rule__XMultiplicativeExpression__Group_1__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12274:2: rule__XMultiplicativeExpression__Group_1__0
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12489:2: ( rule__XCastedExpression__Group_1__0 )
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12489:2: rule__XCastedExpression__Group_1__0
         {
-        pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1__0_in_synpred168_InternalCheck25195);
-        rule__XMultiplicativeExpression__Group_1__0();
+        pushFollow(FOLLOW_rule__XCastedExpression__Group_1__0_in_synpred168_InternalCheck25616);
+        rule__XCastedExpression__Group_1__0();
 
         state._fsp--;
         if (state.failed) return ;
@@ -75844,11 +75539,11 @@ public final void synpred168_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred169_InternalCheck
     public final void synpred169_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12583:2: ( rule__XCastedExpression__Group_1__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12583:2: rule__XCastedExpression__Group_1__0
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12706:2: ( rule__XPostfixOperation__Group_1__0 )
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12706:2: rule__XPostfixOperation__Group_1__0
         {
-        pushFollow(FOLLOW_rule__XCastedExpression__Group_1__0_in_synpred169_InternalCheck25802);
-        rule__XCastedExpression__Group_1__0();
+        pushFollow(FOLLOW_rule__XPostfixOperation__Group_1__0_in_synpred169_InternalCheck26041);
+        rule__XPostfixOperation__Group_1__0();
 
         state._fsp--;
         if (state.failed) return ;
@@ -75859,11 +75554,11 @@ public final void synpred169_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred170_InternalCheck
     public final void synpred170_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12800:2: ( rule__XPostfixOperation__Group_1__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12800:2: rule__XPostfixOperation__Group_1__0
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12860:2: ( rule__XMemberFeatureCall__Alternatives_1 )
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12860:2: rule__XMemberFeatureCall__Alternatives_1
         {
-        pushFollow(FOLLOW_rule__XPostfixOperation__Group_1__0_in_synpred170_InternalCheck26227);
-        rule__XPostfixOperation__Group_1__0();
+        pushFollow(FOLLOW_rule__XMemberFeatureCall__Alternatives_1_in_synpred170_InternalCheck26343);
+        rule__XMemberFeatureCall__Alternatives_1();
 
         state._fsp--;
         if (state.failed) return ;
@@ -75872,28 +75567,28 @@ public final void synpred170_InternalCheck_fragment() throws RecognitionExceptio
     }
     // $ANTLR end synpred170_InternalCheck
 
-    // $ANTLR start synpred171_InternalCheck
-    public final void synpred171_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12954:2: ( rule__XMemberFeatureCall__Alternatives_1 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12954:2: rule__XMemberFeatureCall__Alternatives_1
+    // $ANTLR start synpred172_InternalCheck
+    public final void synpred172_InternalCheck_fragment() throws RecognitionException {   
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13196:2: ( rule__XMemberFeatureCall__Group_1_1_3__0 )
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13196:2: rule__XMemberFeatureCall__Group_1_1_3__0
         {
-        pushFollow(FOLLOW_rule__XMemberFeatureCall__Alternatives_1_in_synpred171_InternalCheck26529);
-        rule__XMemberFeatureCall__Alternatives_1();
+        pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__0_in_synpred172_InternalCheck27014);
+        rule__XMemberFeatureCall__Group_1_1_3__0();
 
         state._fsp--;
         if (state.failed) return ;
 
         }
     }
-    // $ANTLR end synpred171_InternalCheck
+    // $ANTLR end synpred172_InternalCheck
 
     // $ANTLR start synpred173_InternalCheck
     public final void synpred173_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13290:2: ( rule__XMemberFeatureCall__Group_1_1_3__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13290:2: rule__XMemberFeatureCall__Group_1_1_3__0
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13224:2: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13224:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4
         {
-        pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__0_in_synpred173_InternalCheck27200);
-        rule__XMemberFeatureCall__Group_1_1_3__0();
+        pushFollow(FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4_in_synpred173_InternalCheck27072);
+        rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4();
 
         state._fsp--;
         if (state.failed) return ;
@@ -75902,73 +75597,73 @@ public final void synpred173_InternalCheck_fragment() throws RecognitionExceptio
     }
     // $ANTLR end synpred173_InternalCheck
 
-    // $ANTLR start synpred174_InternalCheck
-    public final void synpred174_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13318:2: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13318:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4
+    // $ANTLR start synpred181_InternalCheck
+    public final void synpred181_InternalCheck_fragment() throws RecognitionException {   
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14365:2: ( rule__XClosure__Group_1__0 )
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14365:2: rule__XClosure__Group_1__0
         {
-        pushFollow(FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4_in_synpred174_InternalCheck27258);
-        rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4();
+        pushFollow(FOLLOW_rule__XClosure__Group_1__0_in_synpred181_InternalCheck29308);
+        rule__XClosure__Group_1__0();
 
         state._fsp--;
         if (state.failed) return ;
 
         }
     }
-    // $ANTLR end synpred174_InternalCheck
+    // $ANTLR end synpred181_InternalCheck
 
-    // $ANTLR start synpred182_InternalCheck
-    public final void synpred182_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14459:2: ( rule__XClosure__Group_1__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14459:2: rule__XClosure__Group_1__0
+    // $ANTLR start synpred188_InternalCheck
+    public final void synpred188_InternalCheck_fragment() throws RecognitionException {   
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15483:2: ( rule__XIfExpression__Group_6__0 )
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15483:2: rule__XIfExpression__Group_6__0
         {
-        pushFollow(FOLLOW_rule__XClosure__Group_1__0_in_synpred182_InternalCheck29494);
-        rule__XClosure__Group_1__0();
+        pushFollow(FOLLOW_rule__XIfExpression__Group_6__0_in_synpred188_InternalCheck31514);
+        rule__XIfExpression__Group_6__0();
 
         state._fsp--;
         if (state.failed) return ;
 
         }
     }
-    // $ANTLR end synpred182_InternalCheck
+    // $ANTLR end synpred188_InternalCheck
 
-    // $ANTLR start synpred189_InternalCheck
-    public final void synpred189_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15577:2: ( rule__XIfExpression__Group_6__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15577:2: rule__XIfExpression__Group_6__0
+    // $ANTLR start synpred191_InternalCheck
+    public final void synpred191_InternalCheck_fragment() throws RecognitionException {   
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16033:2: ( rule__XSwitchExpression__Group_2_1_0__0 )
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16033:2: rule__XSwitchExpression__Group_2_1_0__0
         {
-        pushFollow(FOLLOW_rule__XIfExpression__Group_6__0_in_synpred189_InternalCheck31700);
-        rule__XIfExpression__Group_6__0();
+        pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1_0__0_in_synpred191_InternalCheck32585);
+        rule__XSwitchExpression__Group_2_1_0__0();
 
         state._fsp--;
         if (state.failed) return ;
 
         }
     }
-    // $ANTLR end synpred189_InternalCheck
+    // $ANTLR end synpred191_InternalCheck
 
-    // $ANTLR start synpred192_InternalCheck
-    public final void synpred192_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16127:2: ( rule__XSwitchExpression__Group_2_1_0__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16127:2: rule__XSwitchExpression__Group_2_1_0__0
+    // $ANTLR start synpred204_InternalCheck
+    public final void synpred204_InternalCheck_fragment() throws RecognitionException {   
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18521:2: ( rule__XFeatureCall__Group_3__0 )
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18521:2: rule__XFeatureCall__Group_3__0
         {
-        pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1_0__0_in_synpred192_InternalCheck32771);
-        rule__XSwitchExpression__Group_2_1_0__0();
+        pushFollow(FOLLOW_rule__XFeatureCall__Group_3__0_in_synpred204_InternalCheck37479);
+        rule__XFeatureCall__Group_3__0();
 
         state._fsp--;
         if (state.failed) return ;
 
         }
     }
-    // $ANTLR end synpred192_InternalCheck
+    // $ANTLR end synpred204_InternalCheck
 
     // $ANTLR start synpred205_InternalCheck
     public final void synpred205_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18615:2: ( rule__XFeatureCall__Group_3__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18615:2: rule__XFeatureCall__Group_3__0
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18549:2: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18549:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_4
         {
-        pushFollow(FOLLOW_rule__XFeatureCall__Group_3__0_in_synpred205_InternalCheck37665);
-        rule__XFeatureCall__Group_3__0();
+        pushFollow(FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_4_in_synpred205_InternalCheck37537);
+        rule__XFeatureCall__FeatureCallArgumentsAssignment_4();
 
         state._fsp--;
         if (state.failed) return ;
@@ -75977,28 +75672,28 @@ public final void synpred205_InternalCheck_fragment() throws RecognitionExceptio
     }
     // $ANTLR end synpred205_InternalCheck
 
-    // $ANTLR start synpred206_InternalCheck
-    public final void synpred206_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18643:2: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18643:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_4
+    // $ANTLR start synpred209_InternalCheck
+    public final void synpred209_InternalCheck_fragment() throws RecognitionException {   
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19087:2: ( rule__XConstructorCall__Group_3__0 )
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19087:2: rule__XConstructorCall__Group_3__0
         {
-        pushFollow(FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_4_in_synpred206_InternalCheck37723);
-        rule__XFeatureCall__FeatureCallArgumentsAssignment_4();
+        pushFollow(FOLLOW_rule__XConstructorCall__Group_3__0_in_synpred209_InternalCheck38595);
+        rule__XConstructorCall__Group_3__0();
 
         state._fsp--;
         if (state.failed) return ;
 
         }
     }
-    // $ANTLR end synpred206_InternalCheck
+    // $ANTLR end synpred209_InternalCheck
 
     // $ANTLR start synpred210_InternalCheck
     public final void synpred210_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19181:2: ( rule__XConstructorCall__Group_3__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19181:2: rule__XConstructorCall__Group_3__0
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19116:2: ( rule__XConstructorCall__Group_4__0 )
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19116:2: rule__XConstructorCall__Group_4__0
         {
-        pushFollow(FOLLOW_rule__XConstructorCall__Group_3__0_in_synpred210_InternalCheck38781);
-        rule__XConstructorCall__Group_3__0();
+        pushFollow(FOLLOW_rule__XConstructorCall__Group_4__0_in_synpred210_InternalCheck38656);
+        rule__XConstructorCall__Group_4__0();
 
         state._fsp--;
         if (state.failed) return ;
@@ -76009,11 +75704,11 @@ public final void synpred210_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred211_InternalCheck
     public final void synpred211_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19210:2: ( rule__XConstructorCall__Group_4__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19210:2: rule__XConstructorCall__Group_4__0
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19144:2: ( rule__XConstructorCall__ArgumentsAssignment_5 )
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19144:2: rule__XConstructorCall__ArgumentsAssignment_5
         {
-        pushFollow(FOLLOW_rule__XConstructorCall__Group_4__0_in_synpred211_InternalCheck38842);
-        rule__XConstructorCall__Group_4__0();
+        pushFollow(FOLLOW_rule__XConstructorCall__ArgumentsAssignment_5_in_synpred211_InternalCheck38714);
+        rule__XConstructorCall__ArgumentsAssignment_5();
 
         state._fsp--;
         if (state.failed) return ;
@@ -76022,28 +75717,28 @@ public final void synpred211_InternalCheck_fragment() throws RecognitionExceptio
     }
     // $ANTLR end synpred211_InternalCheck
 
-    // $ANTLR start synpred212_InternalCheck
-    public final void synpred212_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19238:2: ( rule__XConstructorCall__ArgumentsAssignment_5 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19238:2: rule__XConstructorCall__ArgumentsAssignment_5
+    // $ANTLR start synpred216_InternalCheck
+    public final void synpred216_InternalCheck_fragment() throws RecognitionException {   
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20197:2: ( rule__XReturnExpression__ExpressionAssignment_2 )
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20197:2: rule__XReturnExpression__ExpressionAssignment_2
         {
-        pushFollow(FOLLOW_rule__XConstructorCall__ArgumentsAssignment_5_in_synpred212_InternalCheck38900);
-        rule__XConstructorCall__ArgumentsAssignment_5();
+        pushFollow(FOLLOW_rule__XReturnExpression__ExpressionAssignment_2_in_synpred216_InternalCheck40766);
+        rule__XReturnExpression__ExpressionAssignment_2();
 
         state._fsp--;
         if (state.failed) return ;
 
         }
     }
-    // $ANTLR end synpred212_InternalCheck
+    // $ANTLR end synpred216_InternalCheck
 
     // $ANTLR start synpred217_InternalCheck
     public final void synpred217_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20291:2: ( rule__XReturnExpression__ExpressionAssignment_2 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20291:2: rule__XReturnExpression__ExpressionAssignment_2
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20365:2: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20365:2: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0
         {
-        pushFollow(FOLLOW_rule__XReturnExpression__ExpressionAssignment_2_in_synpred217_InternalCheck40952);
-        rule__XReturnExpression__ExpressionAssignment_2();
+        pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0_in_synpred217_InternalCheck41095);
+        rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0();
 
         state._fsp--;
         if (state.failed) return ;
@@ -76054,11 +75749,11 @@ public final void synpred217_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred218_InternalCheck
     public final void synpred218_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20459:2: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20459:2: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20394:2: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20394:2: rule__XTryCatchFinallyExpression__Group_3_0_1__0
         {
-        pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0_in_synpred218_InternalCheck41281);
-        rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0();
+        pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__0_in_synpred218_InternalCheck41155);
+        rule__XTryCatchFinallyExpression__Group_3_0_1__0();
 
         state._fsp--;
         if (state.failed) return ;
@@ -76069,25 +75764,10 @@ public final void synpred218_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred219_InternalCheck
     public final void synpred219_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20488:2: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20488:2: rule__XTryCatchFinallyExpression__Group_3_0_1__0
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20994:2: ( rule__QualifiedName__Group_1__0 )
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20994:2: rule__QualifiedName__Group_1__0
         {
-        pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__0_in_synpred219_InternalCheck41341);
-        rule__XTryCatchFinallyExpression__Group_3_0_1__0();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-    }
-    // $ANTLR end synpred219_InternalCheck
-
-    // $ANTLR start synpred220_InternalCheck
-    public final void synpred220_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21088:2: ( rule__QualifiedName__Group_1__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21088:2: rule__QualifiedName__Group_1__0
-        {
-        pushFollow(FOLLOW_rule__QualifiedName__Group_1__0_in_synpred220_InternalCheck42519);
+        pushFollow(FOLLOW_rule__QualifiedName__Group_1__0_in_synpred219_InternalCheck42333);
         rule__QualifiedName__Group_1__0();
 
         state._fsp--;
@@ -76095,14 +75775,14 @@ public final void synpred220_InternalCheck_fragment() throws RecognitionExceptio
 
         }
     }
-    // $ANTLR end synpred220_InternalCheck
+    // $ANTLR end synpred219_InternalCheck
 
-    // $ANTLR start synpred222_InternalCheck
-    public final void synpred222_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21337:2: ( rule__JvmTypeReference__Group_0_1__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21337:2: rule__JvmTypeReference__Group_0_1__0
+    // $ANTLR start synpred221_InternalCheck
+    public final void synpred221_InternalCheck_fragment() throws RecognitionException {   
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21243:2: ( rule__JvmTypeReference__Group_0_1__0 )
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21243:2: rule__JvmTypeReference__Group_0_1__0
         {
-        pushFollow(FOLLOW_rule__JvmTypeReference__Group_0_1__0_in_synpred222_InternalCheck43010);
+        pushFollow(FOLLOW_rule__JvmTypeReference__Group_0_1__0_in_synpred221_InternalCheck42824);
         rule__JvmTypeReference__Group_0_1__0();
 
         state._fsp--;
@@ -76110,14 +75790,14 @@ public final void synpred222_InternalCheck_fragment() throws RecognitionExceptio
 
         }
     }
-    // $ANTLR end synpred222_InternalCheck
+    // $ANTLR end synpred221_InternalCheck
 
-    // $ANTLR start synpred226_InternalCheck
-    public final void synpred226_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21870:2: ( rule__JvmParameterizedTypeReference__Group_1__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21870:2: rule__JvmParameterizedTypeReference__Group_1__0
+    // $ANTLR start synpred225_InternalCheck
+    public final void synpred225_InternalCheck_fragment() throws RecognitionException {   
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21776:2: ( rule__JvmParameterizedTypeReference__Group_1__0 )
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21776:2: rule__JvmParameterizedTypeReference__Group_1__0
         {
-        pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__0_in_synpred226_InternalCheck44056);
+        pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__0_in_synpred225_InternalCheck43870);
         rule__JvmParameterizedTypeReference__Group_1__0();
 
         state._fsp--;
@@ -76125,14 +75805,14 @@ public final void synpred226_InternalCheck_fragment() throws RecognitionExceptio
 
         }
     }
-    // $ANTLR end synpred226_InternalCheck
+    // $ANTLR end synpred225_InternalCheck
 
-    // $ANTLR start synpred228_InternalCheck
-    public final void synpred228_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22022:2: ( rule__JvmParameterizedTypeReference__Group_1_4__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22022:2: rule__JvmParameterizedTypeReference__Group_1_4__0
+    // $ANTLR start synpred227_InternalCheck
+    public final void synpred227_InternalCheck_fragment() throws RecognitionException {   
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21928:2: ( rule__JvmParameterizedTypeReference__Group_1_4__0 )
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21928:2: rule__JvmParameterizedTypeReference__Group_1_4__0
         {
-        pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__0_in_synpred228_InternalCheck44365);
+        pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__0_in_synpred227_InternalCheck44179);
         rule__JvmParameterizedTypeReference__Group_1_4__0();
 
         state._fsp--;
@@ -76140,14 +75820,14 @@ public final void synpred228_InternalCheck_fragment() throws RecognitionExceptio
 
         }
     }
-    // $ANTLR end synpred228_InternalCheck
+    // $ANTLR end synpred227_InternalCheck
 
-    // $ANTLR start synpred229_InternalCheck
-    public final void synpred229_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22181:2: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22181:2: rule__JvmParameterizedTypeReference__Group_1_4_2__0
+    // $ANTLR start synpred228_InternalCheck
+    public final void synpred228_InternalCheck_fragment() throws RecognitionException {   
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22087:2: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )
+        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22087:2: rule__JvmParameterizedTypeReference__Group_1_4_2__0
         {
-        pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__0_in_synpred229_InternalCheck44676);
+        pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__0_in_synpred228_InternalCheck44490);
         rule__JvmParameterizedTypeReference__Group_1_4_2__0();
 
         state._fsp--;
@@ -76155,29 +75835,15 @@ public final void synpred229_InternalCheck_fragment() throws RecognitionExceptio
 
         }
     }
-    // $ANTLR end synpred229_InternalCheck
+    // $ANTLR end synpred228_InternalCheck
 
     // Delegated rules
 
-    public final boolean synpred189_InternalCheck() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred189_InternalCheck_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred147_InternalCheck() {
+    public final boolean synpred168_InternalCheck() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred147_InternalCheck_fragment(); // can never throw exception
+            synpred168_InternalCheck_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -76187,11 +75853,11 @@ public final boolean synpred147_InternalCheck() {
         state.failed=false;
         return success;
     }
-    public final boolean synpred168_InternalCheck() {
+    public final boolean synpred150_InternalCheck() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred168_InternalCheck_fragment(); // can never throw exception
+            synpred150_InternalCheck_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -76201,11 +75867,11 @@ public final boolean synpred168_InternalCheck() {
         state.failed=false;
         return success;
     }
-    public final boolean synpred212_InternalCheck() {
+    public final boolean synpred172_InternalCheck() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred212_InternalCheck_fragment(); // can never throw exception
+            synpred172_InternalCheck_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -76215,11 +75881,11 @@ public final boolean synpred212_InternalCheck() {
         state.failed=false;
         return success;
     }
-    public final boolean synpred220_InternalCheck() {
+    public final boolean synpred50_InternalCheck() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred220_InternalCheck_fragment(); // can never throw exception
+            synpred50_InternalCheck_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -76229,11 +75895,11 @@ public final boolean synpred220_InternalCheck() {
         state.failed=false;
         return success;
     }
-    public final boolean synpred171_InternalCheck() {
+    public final boolean synpred216_InternalCheck() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred171_InternalCheck_fragment(); // can never throw exception
+            synpred216_InternalCheck_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -76243,11 +75909,11 @@ public final boolean synpred171_InternalCheck() {
         state.failed=false;
         return success;
     }
-    public final boolean synpred192_InternalCheck() {
+    public final boolean synpred211_InternalCheck() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred192_InternalCheck_fragment(); // can never throw exception
+            synpred211_InternalCheck_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -76257,11 +75923,11 @@ public final boolean synpred192_InternalCheck() {
         state.failed=false;
         return success;
     }
-    public final boolean synpred50_InternalCheck() {
+    public final boolean synpred163_InternalCheck() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred50_InternalCheck_fragment(); // can never throw exception
+            synpred163_InternalCheck_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -76271,11 +75937,11 @@ public final boolean synpred50_InternalCheck() {
         state.failed=false;
         return success;
     }
-    public final boolean synpred229_InternalCheck() {
+    public final boolean synpred89_InternalCheck() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred229_InternalCheck_fragment(); // can never throw exception
+            synpred89_InternalCheck_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -76285,11 +75951,11 @@ public final boolean synpred229_InternalCheck() {
         state.failed=false;
         return success;
     }
-    public final boolean synpred211_InternalCheck() {
+    public final boolean synpred97_InternalCheck() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred211_InternalCheck_fragment(); // can never throw exception
+            synpred97_InternalCheck_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -76299,11 +75965,11 @@ public final boolean synpred211_InternalCheck() {
         state.failed=false;
         return success;
     }
-    public final boolean synpred163_InternalCheck() {
+    public final boolean synpred142_InternalCheck() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred163_InternalCheck_fragment(); // can never throw exception
+            synpred142_InternalCheck_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -76313,11 +75979,11 @@ public final boolean synpred163_InternalCheck() {
         state.failed=false;
         return success;
     }
-    public final boolean synpred89_InternalCheck() {
+    public final boolean synpred76_InternalCheck() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred89_InternalCheck_fragment(); // can never throw exception
+            synpred76_InternalCheck_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -76327,11 +75993,11 @@ public final boolean synpred89_InternalCheck() {
         state.failed=false;
         return success;
     }
-    public final boolean synpred97_InternalCheck() {
+    public final boolean synpred221_InternalCheck() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred97_InternalCheck_fragment(); // can never throw exception
+            synpred221_InternalCheck_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -76341,11 +76007,11 @@ public final boolean synpred97_InternalCheck() {
         state.failed=false;
         return success;
     }
-    public final boolean synpred142_InternalCheck() {
+    public final boolean synpred159_InternalCheck() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred142_InternalCheck_fragment(); // can never throw exception
+            synpred159_InternalCheck_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -76355,11 +76021,11 @@ public final boolean synpred142_InternalCheck() {
         state.failed=false;
         return success;
     }
-    public final boolean synpred76_InternalCheck() {
+    public final boolean synpred205_InternalCheck() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred76_InternalCheck_fragment(); // can never throw exception
+            synpred205_InternalCheck_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -76369,11 +76035,11 @@ public final boolean synpred76_InternalCheck() {
         state.failed=false;
         return success;
     }
-    public final boolean synpred205_InternalCheck() {
+    public final boolean synpred170_InternalCheck() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred205_InternalCheck_fragment(); // can never throw exception
+            synpred170_InternalCheck_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -76383,11 +76049,11 @@ public final boolean synpred205_InternalCheck() {
         state.failed=false;
         return success;
     }
-    public final boolean synpred226_InternalCheck() {
+    public final boolean synpred191_InternalCheck() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred226_InternalCheck_fragment(); // can never throw exception
+            synpred191_InternalCheck_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -76397,11 +76063,11 @@ public final boolean synpred226_InternalCheck() {
         state.failed=false;
         return success;
     }
-    public final boolean synpred170_InternalCheck() {
+    public final boolean synpred165_InternalCheck() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred170_InternalCheck_fragment(); // can never throw exception
+            synpred165_InternalCheck_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -76411,11 +76077,11 @@ public final boolean synpred170_InternalCheck() {
         state.failed=false;
         return success;
     }
-    public final boolean synpred165_InternalCheck() {
+    public final boolean synpred209_InternalCheck() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred165_InternalCheck_fragment(); // can never throw exception
+            synpred209_InternalCheck_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -76495,11 +76161,11 @@ public final boolean synpred164_InternalCheck() {
         state.failed=false;
         return success;
     }
-    public final boolean synpred160_InternalCheck() {
+    public final boolean synpred181_InternalCheck() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred160_InternalCheck_fragment(); // can never throw exception
+            synpred181_InternalCheck_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -76523,11 +76189,11 @@ public final boolean synpred169_InternalCheck() {
         state.failed=false;
         return success;
     }
-    public final boolean synpred75_InternalCheck() {
+    public final boolean synpred225_InternalCheck() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred75_InternalCheck_fragment(); // can never throw exception
+            synpred225_InternalCheck_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -76537,11 +76203,25 @@ public final boolean synpred75_InternalCheck() {
         state.failed=false;
         return success;
     }
-    public final boolean synpred219_InternalCheck() {
+    public final boolean synpred204_InternalCheck() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred219_InternalCheck_fragment(); // can never throw exception
+            synpred204_InternalCheck_fragment(); // can never throw exception
+        } catch (RecognitionException re) {
+            System.err.println("impossible: "+re);
+        }
+        boolean success = !state.failed;
+        input.rewind(start);
+        state.backtracking--;
+        state.failed=false;
+        return success;
+    }
+    public final boolean synpred75_InternalCheck() {
+        state.backtracking++;
+        int start = input.mark();
+        try {
+            synpred75_InternalCheck_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -76551,11 +76231,11 @@ public final boolean synpred219_InternalCheck() {
         state.failed=false;
         return success;
     }
-    public final boolean synpred206_InternalCheck() {
+    public final boolean synpred219_InternalCheck() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred206_InternalCheck_fragment(); // can never throw exception
+            synpred219_InternalCheck_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -76565,11 +76245,11 @@ public final boolean synpred206_InternalCheck() {
         state.failed=false;
         return success;
     }
-    public final boolean synpred174_InternalCheck() {
+    public final boolean synpred140_InternalCheck() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred174_InternalCheck_fragment(); // can never throw exception
+            synpred140_InternalCheck_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -76579,11 +76259,11 @@ public final boolean synpred174_InternalCheck() {
         state.failed=false;
         return success;
     }
-    public final boolean synpred145_InternalCheck() {
+    public final boolean synpred227_InternalCheck() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred145_InternalCheck_fragment(); // can never throw exception
+            synpred227_InternalCheck_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -76593,11 +76273,11 @@ public final boolean synpred145_InternalCheck() {
         state.failed=false;
         return success;
     }
-    public final boolean synpred166_InternalCheck() {
+    public final boolean synpred145_InternalCheck() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred166_InternalCheck_fragment(); // can never throw exception
+            synpred145_InternalCheck_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -76607,11 +76287,11 @@ public final boolean synpred166_InternalCheck() {
         state.failed=false;
         return success;
     }
-    public final boolean synpred102_InternalCheck() {
+    public final boolean synpred166_InternalCheck() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred102_InternalCheck_fragment(); // can never throw exception
+            synpred166_InternalCheck_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -76621,11 +76301,11 @@ public final boolean synpred102_InternalCheck() {
         state.failed=false;
         return success;
     }
-    public final boolean synpred144_InternalCheck() {
+    public final boolean synpred102_InternalCheck() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred144_InternalCheck_fragment(); // can never throw exception
+            synpred102_InternalCheck_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -76635,11 +76315,11 @@ public final boolean synpred144_InternalCheck() {
         state.failed=false;
         return success;
     }
-    public final boolean synpred222_InternalCheck() {
+    public final boolean synpred144_InternalCheck() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred222_InternalCheck_fragment(); // can never throw exception
+            synpred144_InternalCheck_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -76663,11 +76343,11 @@ public final boolean synpred49_InternalCheck() {
         state.failed=false;
         return success;
     }
-    public final boolean synpred218_InternalCheck() {
+    public final boolean synpred161_InternalCheck() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred218_InternalCheck_fragment(); // can never throw exception
+            synpred161_InternalCheck_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -76677,11 +76357,11 @@ public final boolean synpred218_InternalCheck() {
         state.failed=false;
         return success;
     }
-    public final boolean synpred182_InternalCheck() {
+    public final boolean synpred218_InternalCheck() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred182_InternalCheck_fragment(); // can never throw exception
+            synpred218_InternalCheck_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -76719,11 +76399,11 @@ public final boolean synpred146_InternalCheck() {
         state.failed=false;
         return success;
     }
-    public final boolean synpred167_InternalCheck() {
+    public final boolean synpred188_InternalCheck() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred167_InternalCheck_fragment(); // can never throw exception
+            synpred188_InternalCheck_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -76733,11 +76413,11 @@ public final boolean synpred167_InternalCheck() {
         state.failed=false;
         return success;
     }
-    public final boolean synpred173_InternalCheck() {
+    public final boolean synpred167_InternalCheck() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred173_InternalCheck_fragment(); // can never throw exception
+            synpred167_InternalCheck_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -76747,11 +76427,11 @@ public final boolean synpred173_InternalCheck() {
         state.failed=false;
         return success;
     }
-    public final boolean synpred19_InternalCheck() {
+    public final boolean synpred173_InternalCheck() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred19_InternalCheck_fragment(); // can never throw exception
+            synpred173_InternalCheck_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -76761,11 +76441,11 @@ public final boolean synpred19_InternalCheck() {
         state.failed=false;
         return success;
     }
-    public final boolean synpred228_InternalCheck() {
+    public final boolean synpred19_InternalCheck() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred228_InternalCheck_fragment(); // can never throw exception
+            synpred19_InternalCheck_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -76775,11 +76455,11 @@ public final boolean synpred228_InternalCheck() {
         state.failed=false;
         return success;
     }
-    public final boolean synpred130_InternalCheck() {
+    public final boolean synpred228_InternalCheck() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred130_InternalCheck_fragment(); // can never throw exception
+            synpred228_InternalCheck_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -76789,11 +76469,11 @@ public final boolean synpred130_InternalCheck() {
         state.failed=false;
         return success;
     }
-    public final boolean synpred151_InternalCheck() {
+    public final boolean synpred20_InternalCheck() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred151_InternalCheck_fragment(); // can never throw exception
+            synpred20_InternalCheck_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -76803,11 +76483,11 @@ public final boolean synpred151_InternalCheck() {
         state.failed=false;
         return success;
     }
-    public final boolean synpred20_InternalCheck() {
+    public final boolean synpred217_InternalCheck() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred20_InternalCheck_fragment(); // can never throw exception
+            synpred217_InternalCheck_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -76817,11 +76497,11 @@ public final boolean synpred20_InternalCheck() {
         state.failed=false;
         return success;
     }
-    public final boolean synpred217_InternalCheck() {
+    public final boolean synpred162_InternalCheck() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred217_InternalCheck_fragment(); // can never throw exception
+            synpred162_InternalCheck_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -76831,11 +76511,11 @@ public final boolean synpred217_InternalCheck() {
         state.failed=false;
         return success;
     }
-    public final boolean synpred162_InternalCheck() {
+    public final boolean synpred129_InternalCheck() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred162_InternalCheck_fragment(); // can never throw exception
+            synpred129_InternalCheck_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -76873,42 +76553,42 @@ public final boolean synpred141_InternalCheck() {
     protected DFA34 dfa34 = new DFA34(this);
     protected DFA39 dfa39 = new DFA39(this);
     protected DFA41 dfa41 = new DFA41(this);
-    protected DFA64 dfa64 = new DFA64(this);
-    protected DFA76 dfa76 = new DFA76(this);
-    protected DFA85 dfa85 = new DFA85(this);
-    protected DFA94 dfa94 = new DFA94(this);
-    protected DFA100 dfa100 = new DFA100(this);
+    protected DFA63 dfa63 = new DFA63(this);
+    protected DFA75 dfa75 = new DFA75(this);
+    protected DFA84 dfa84 = new DFA84(this);
+    protected DFA93 dfa93 = new DFA93(this);
+    protected DFA99 dfa99 = new DFA99(this);
+    protected DFA106 dfa106 = new DFA106(this);
     protected DFA107 dfa107 = new DFA107(this);
-    protected DFA108 dfa108 = new DFA108(this);
-    protected DFA116 dfa116 = new DFA116(this);
-    protected DFA126 dfa126 = new DFA126(this);
+    protected DFA115 dfa115 = new DFA115(this);
+    protected DFA125 dfa125 = new DFA125(this);
+    protected DFA138 dfa138 = new DFA138(this);
     protected DFA139 dfa139 = new DFA139(this);
-    protected DFA140 dfa140 = new DFA140(this);
+    protected DFA143 dfa143 = new DFA143(this);
     protected DFA144 dfa144 = new DFA144(this);
     protected DFA145 dfa145 = new DFA145(this);
-    protected DFA146 dfa146 = new DFA146(this);
-    protected DFA151 dfa151 = new DFA151(this);
-    protected DFA160 dfa160 = new DFA160(this);
-    protected DFA163 dfa163 = new DFA163(this);
+    protected DFA150 dfa150 = new DFA150(this);
+    protected DFA159 dfa159 = new DFA159(this);
+    protected DFA162 dfa162 = new DFA162(this);
     static final String DFA2_eotS =
         "\6\uffff";
     static final String DFA2_eofS =
-        "\1\uffff\1\3\2\uffff\1\3\1\uffff";
+        "\1\uffff\1\3\3\uffff\1\3";
     static final String DFA2_minS =
-        "\1\4\1\22\1\4\1\uffff\1\22\1\uffff";
+        "\1\4\1\22\1\4\2\uffff\1\22";
     static final String DFA2_maxS =
-        "\1\4\1\147\1\70\1\uffff\1\147\1\uffff";
+        "\1\4\1\147\1\70\2\uffff\1\147";
     static final String DFA2_acceptS =
-        "\3\uffff\1\1\1\uffff\1\2";
+        "\3\uffff\1\1\1\2\1\uffff";
     static final String DFA2_specialS =
         "\6\uffff}>";
     static final String[] DFA2_transitionS = {
             "\1\1",
             "\1\3\1\uffff\1\3\52\uffff\1\2\7\uffff\1\3\37\uffff\1\3",
-            "\1\4\63\uffff\1\5",
+            "\1\5\63\uffff\1\4",
             "",
-            "\1\3\1\uffff\1\3\52\uffff\1\2\7\uffff\1\3\37\uffff\1\3",
-            ""
+            "",
+            "\1\3\1\uffff\1\3\52\uffff\1\2\7\uffff\1\3\37\uffff\1\3"
     };
 
     static final short[] DFA2_eot = DFA.unpackEncodedString(DFA2_eotS);
@@ -77568,14 +77248,14 @@ public String getDescription() {
     static final String DFA20_maxS =
         "\1\65\2\uffff\1\62\7\uffff";
     static final String DFA20_acceptS =
-        "\1\uffff\1\1\1\2\1\uffff\1\4\1\5\1\7\1\10\1\11\1\3\1\6";
+        "\1\uffff\1\1\1\2\1\uffff\1\4\1\5\1\7\1\10\1\11\1\6\1\3";
     static final String DFA20_specialS =
         "\13\uffff}>";
     static final String[] DFA20_transitionS = {
             "\1\3\1\6\1\1\1\2\1\4\1\5\1\7\1\10",
             "",
             "",
-            "\1\12\3\uffff\1\11",
+            "\1\11\3\uffff\1\12",
             "",
             "",
             "",
@@ -78282,19 +77962,19 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA64_eotS =
+    static final String DFA63_eotS =
         "\25\uffff";
-    static final String DFA64_eofS =
+    static final String DFA63_eofS =
         "\1\2\24\uffff";
-    static final String DFA64_minS =
+    static final String DFA63_minS =
         "\1\4\1\0\23\uffff";
-    static final String DFA64_maxS =
+    static final String DFA63_maxS =
         "\1\147\1\0\23\uffff";
-    static final String DFA64_acceptS =
+    static final String DFA63_acceptS =
         "\2\uffff\1\2\21\uffff\1\1";
-    static final String DFA64_specialS =
+    static final String DFA63_specialS =
         "\1\uffff\1\0\23\uffff}>";
-    static final String[] DFA64_transitionS = {
+    static final String[] DFA63_transitionS = {
             "\1\2\22\uffff\2\2\4\uffff\7\2\17\uffff\1\2\20\uffff\3\2\1\uffff"+
             "\1\1\2\uffff\2\2\32\uffff\1\2",
             "\1\uffff",
@@ -78319,78 +77999,78 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA64_eot = DFA.unpackEncodedString(DFA64_eotS);
-    static final short[] DFA64_eof = DFA.unpackEncodedString(DFA64_eofS);
-    static final char[] DFA64_min = DFA.unpackEncodedStringToUnsignedChars(DFA64_minS);
-    static final char[] DFA64_max = DFA.unpackEncodedStringToUnsignedChars(DFA64_maxS);
-    static final short[] DFA64_accept = DFA.unpackEncodedString(DFA64_acceptS);
-    static final short[] DFA64_special = DFA.unpackEncodedString(DFA64_specialS);
-    static final short[][] DFA64_transition;
+    static final short[] DFA63_eot = DFA.unpackEncodedString(DFA63_eotS);
+    static final short[] DFA63_eof = DFA.unpackEncodedString(DFA63_eofS);
+    static final char[] DFA63_min = DFA.unpackEncodedStringToUnsignedChars(DFA63_minS);
+    static final char[] DFA63_max = DFA.unpackEncodedStringToUnsignedChars(DFA63_maxS);
+    static final short[] DFA63_accept = DFA.unpackEncodedString(DFA63_acceptS);
+    static final short[] DFA63_special = DFA.unpackEncodedString(DFA63_specialS);
+    static final short[][] DFA63_transition;
 
     static {
-        int numStates = DFA64_transitionS.length;
-        DFA64_transition = new short[numStates][];
+        int numStates = DFA63_transitionS.length;
+        DFA63_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA64_transition[i] = DFA.unpackEncodedString(DFA64_transitionS[i]);
+            DFA63_transition[i] = DFA.unpackEncodedString(DFA63_transitionS[i]);
         }
     }
 
-    class DFA64 extends DFA {
+    class DFA63 extends DFA {
 
-        public DFA64(BaseRecognizer recognizer) {
+        public DFA63(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 64;
-            this.eot = DFA64_eot;
-            this.eof = DFA64_eof;
-            this.min = DFA64_min;
-            this.max = DFA64_max;
-            this.accept = DFA64_accept;
-            this.special = DFA64_special;
-            this.transition = DFA64_transition;
+            this.decisionNumber = 63;
+            this.eot = DFA63_eot;
+            this.eof = DFA63_eof;
+            this.min = DFA63_min;
+            this.max = DFA63_max;
+            this.accept = DFA63_accept;
+            this.special = DFA63_special;
+            this.transition = DFA63_transition;
         }
         public String getDescription() {
-            return "5487:1: ( rule__Check__Group_6__0 )?";
+            return "5393:1: ( rule__Check__Group_6__0 )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA64_1 = input.LA(1);
+                        int LA63_1 = input.LA(1);
 
                          
-                        int index64_1 = input.index();
+                        int index63_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred130_InternalCheck()) ) {s = 20;}
+                        if ( (synpred129_InternalCheck()) ) {s = 20;}
 
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index64_1);
+                        input.seek(index63_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 64, _s, input);
+                new NoViableAltException(getDescription(), 63, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA76_eotS =
+    static final String DFA75_eotS =
         "\140\uffff";
-    static final String DFA76_eofS =
+    static final String DFA75_eofS =
         "\1\2\137\uffff";
-    static final String DFA76_minS =
+    static final String DFA75_minS =
         "\1\4\1\0\136\uffff";
-    static final String DFA76_maxS =
+    static final String DFA75_maxS =
         "\1\154\1\0\136\uffff";
-    static final String DFA76_acceptS =
+    static final String DFA75_acceptS =
         "\2\uffff\1\2\134\uffff\1\1";
-    static final String DFA76_specialS =
+    static final String DFA75_specialS =
         "\1\uffff\1\0\136\uffff}>";
-    static final String[] DFA76_transitionS = {
+    static final String[] DFA75_transitionS = {
             "\5\2\5\uffff\13\2\1\1\51\2\1\uffff\7\2\2\uffff\30\2\3\uffff"+
             "\2\2\1\uffff\2\2",
             "\1\uffff",
@@ -78490,78 +78170,78 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA76_eot = DFA.unpackEncodedString(DFA76_eotS);
-    static final short[] DFA76_eof = DFA.unpackEncodedString(DFA76_eofS);
-    static final char[] DFA76_min = DFA.unpackEncodedStringToUnsignedChars(DFA76_minS);
-    static final char[] DFA76_max = DFA.unpackEncodedStringToUnsignedChars(DFA76_maxS);
-    static final short[] DFA76_accept = DFA.unpackEncodedString(DFA76_acceptS);
-    static final short[] DFA76_special = DFA.unpackEncodedString(DFA76_specialS);
-    static final short[][] DFA76_transition;
+    static final short[] DFA75_eot = DFA.unpackEncodedString(DFA75_eotS);
+    static final short[] DFA75_eof = DFA.unpackEncodedString(DFA75_eofS);
+    static final char[] DFA75_min = DFA.unpackEncodedStringToUnsignedChars(DFA75_minS);
+    static final char[] DFA75_max = DFA.unpackEncodedStringToUnsignedChars(DFA75_maxS);
+    static final short[] DFA75_accept = DFA.unpackEncodedString(DFA75_acceptS);
+    static final short[] DFA75_special = DFA.unpackEncodedString(DFA75_specialS);
+    static final short[][] DFA75_transition;
 
     static {
-        int numStates = DFA76_transitionS.length;
-        DFA76_transition = new short[numStates][];
+        int numStates = DFA75_transitionS.length;
+        DFA75_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA76_transition[i] = DFA.unpackEncodedString(DFA76_transitionS[i]);
+            DFA75_transition[i] = DFA.unpackEncodedString(DFA75_transitionS[i]);
         }
     }
 
-    class DFA76 extends DFA {
+    class DFA75 extends DFA {
 
-        public DFA76(BaseRecognizer recognizer) {
+        public DFA75(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 76;
-            this.eot = DFA76_eot;
-            this.eof = DFA76_eof;
-            this.min = DFA76_min;
-            this.max = DFA76_max;
-            this.accept = DFA76_accept;
-            this.special = DFA76_special;
-            this.transition = DFA76_transition;
+            this.decisionNumber = 75;
+            this.eot = DFA75_eot;
+            this.eof = DFA75_eof;
+            this.min = DFA75_min;
+            this.max = DFA75_max;
+            this.accept = DFA75_accept;
+            this.special = DFA75_special;
+            this.transition = DFA75_transition;
         }
         public String getDescription() {
-            return "7385:1: ( rule__XIssueExpression__Group_3__0 )?";
+            return "7291:1: ( rule__XIssueExpression__Group_3__0 )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA76_1 = input.LA(1);
+                        int LA75_1 = input.LA(1);
 
                          
-                        int index76_1 = input.index();
+                        int index75_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred142_InternalCheck()) ) {s = 95;}
+                        if ( (synpred141_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index76_1);
+                        input.seek(index75_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 76, _s, input);
+                new NoViableAltException(getDescription(), 75, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA85_eotS =
+    static final String DFA84_eotS =
         "\12\uffff";
-    static final String DFA85_eofS =
+    static final String DFA84_eofS =
         "\1\2\11\uffff";
-    static final String DFA85_minS =
+    static final String DFA84_minS =
         "\1\4\1\0\10\uffff";
-    static final String DFA85_maxS =
+    static final String DFA84_maxS =
         "\1\117\1\0\10\uffff";
-    static final String DFA85_acceptS =
+    static final String DFA84_acceptS =
         "\2\uffff\1\2\6\uffff\1\1";
-    static final String DFA85_specialS =
+    static final String DFA84_specialS =
         "\1\uffff\1\0\10\uffff}>";
-    static final String[] DFA85_transitionS = {
+    static final String[] DFA84_transitionS = {
             "\1\2\56\uffff\1\2\24\uffff\1\1\3\2\3\uffff\1\2",
             "\1\uffff",
             "",
@@ -78574,78 +78254,78 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA85_eot = DFA.unpackEncodedString(DFA85_eotS);
-    static final short[] DFA85_eof = DFA.unpackEncodedString(DFA85_eofS);
-    static final char[] DFA85_min = DFA.unpackEncodedStringToUnsignedChars(DFA85_minS);
-    static final char[] DFA85_max = DFA.unpackEncodedStringToUnsignedChars(DFA85_maxS);
-    static final short[] DFA85_accept = DFA.unpackEncodedString(DFA85_acceptS);
-    static final short[] DFA85_special = DFA.unpackEncodedString(DFA85_specialS);
-    static final short[][] DFA85_transition;
+    static final short[] DFA84_eot = DFA.unpackEncodedString(DFA84_eotS);
+    static final short[] DFA84_eof = DFA.unpackEncodedString(DFA84_eofS);
+    static final char[] DFA84_min = DFA.unpackEncodedStringToUnsignedChars(DFA84_minS);
+    static final char[] DFA84_max = DFA.unpackEncodedStringToUnsignedChars(DFA84_maxS);
+    static final short[] DFA84_accept = DFA.unpackEncodedString(DFA84_acceptS);
+    static final short[] DFA84_special = DFA.unpackEncodedString(DFA84_specialS);
+    static final short[][] DFA84_transition;
 
     static {
-        int numStates = DFA85_transitionS.length;
-        DFA85_transition = new short[numStates][];
+        int numStates = DFA84_transitionS.length;
+        DFA84_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA85_transition[i] = DFA.unpackEncodedString(DFA85_transitionS[i]);
+            DFA84_transition[i] = DFA.unpackEncodedString(DFA84_transitionS[i]);
         }
     }
 
-    class DFA85 extends DFA {
+    class DFA84 extends DFA {
 
-        public DFA85(BaseRecognizer recognizer) {
+        public DFA84(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 85;
-            this.eot = DFA85_eot;
-            this.eof = DFA85_eof;
-            this.min = DFA85_min;
-            this.max = DFA85_max;
-            this.accept = DFA85_accept;
-            this.special = DFA85_special;
-            this.transition = DFA85_transition;
+            this.decisionNumber = 84;
+            this.eot = DFA84_eot;
+            this.eof = DFA84_eof;
+            this.min = DFA84_min;
+            this.max = DFA84_max;
+            this.accept = DFA84_accept;
+            this.special = DFA84_special;
+            this.transition = DFA84_transition;
         }
         public String getDescription() {
-            return "8521:1: ( rule__XAnnotation__Group_3__0 )?";
+            return "8427:1: ( rule__XAnnotation__Group_3__0 )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA85_1 = input.LA(1);
+                        int LA84_1 = input.LA(1);
 
                          
-                        int index85_1 = input.index();
+                        int index84_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred151_InternalCheck()) ) {s = 9;}
+                        if ( (synpred150_InternalCheck()) ) {s = 9;}
 
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index85_1);
+                        input.seek(index84_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 85, _s, input);
+                new NoViableAltException(getDescription(), 84, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA94_eotS =
+    static final String DFA93_eotS =
         "\12\uffff";
-    static final String DFA94_eofS =
+    static final String DFA93_eofS =
         "\1\10\11\uffff";
-    static final String DFA94_minS =
+    static final String DFA93_minS =
         "\1\4\7\0\2\uffff";
-    static final String DFA94_maxS =
+    static final String DFA93_maxS =
         "\1\154\7\0\2\uffff";
-    static final String DFA94_acceptS =
+    static final String DFA93_acceptS =
         "\10\uffff\1\2\1\1";
-    static final String DFA94_specialS =
-        "\1\uffff\1\0\1\2\1\4\1\5\1\1\1\6\1\3\2\uffff}>";
-    static final String[] DFA94_transitionS = {
+    static final String DFA93_specialS =
+        "\1\uffff\1\4\1\2\1\1\1\0\1\5\1\6\1\3\2\uffff}>";
+    static final String[] DFA93_transitionS = {
             "\5\10\5\uffff\26\10\1\1\1\2\1\3\1\4\1\5\5\10\1\7\1\6\23\10"+
             "\1\uffff\7\10\2\uffff\30\10\3\uffff\2\10\1\uffff\2\10",
             "\1\uffff",
@@ -78659,168 +78339,168 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA94_eot = DFA.unpackEncodedString(DFA94_eotS);
-    static final short[] DFA94_eof = DFA.unpackEncodedString(DFA94_eofS);
-    static final char[] DFA94_min = DFA.unpackEncodedStringToUnsignedChars(DFA94_minS);
-    static final char[] DFA94_max = DFA.unpackEncodedStringToUnsignedChars(DFA94_maxS);
-    static final short[] DFA94_accept = DFA.unpackEncodedString(DFA94_acceptS);
-    static final short[] DFA94_special = DFA.unpackEncodedString(DFA94_specialS);
-    static final short[][] DFA94_transition;
+    static final short[] DFA93_eot = DFA.unpackEncodedString(DFA93_eotS);
+    static final short[] DFA93_eof = DFA.unpackEncodedString(DFA93_eofS);
+    static final char[] DFA93_min = DFA.unpackEncodedStringToUnsignedChars(DFA93_minS);
+    static final char[] DFA93_max = DFA.unpackEncodedStringToUnsignedChars(DFA93_maxS);
+    static final short[] DFA93_accept = DFA.unpackEncodedString(DFA93_acceptS);
+    static final short[] DFA93_special = DFA.unpackEncodedString(DFA93_specialS);
+    static final short[][] DFA93_transition;
 
     static {
-        int numStates = DFA94_transitionS.length;
-        DFA94_transition = new short[numStates][];
+        int numStates = DFA93_transitionS.length;
+        DFA93_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA94_transition[i] = DFA.unpackEncodedString(DFA94_transitionS[i]);
+            DFA93_transition[i] = DFA.unpackEncodedString(DFA93_transitionS[i]);
         }
     }
 
-    class DFA94 extends DFA {
+    class DFA93 extends DFA {
 
-        public DFA94(BaseRecognizer recognizer) {
+        public DFA93(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 94;
-            this.eot = DFA94_eot;
-            this.eof = DFA94_eof;
-            this.min = DFA94_min;
-            this.max = DFA94_max;
-            this.accept = DFA94_accept;
-            this.special = DFA94_special;
-            this.transition = DFA94_transition;
+            this.decisionNumber = 93;
+            this.eot = DFA93_eot;
+            this.eof = DFA93_eof;
+            this.min = DFA93_min;
+            this.max = DFA93_max;
+            this.accept = DFA93_accept;
+            this.special = DFA93_special;
+            this.transition = DFA93_transition;
         }
         public String getDescription() {
-            return "9971:1: ( rule__XAssignment__Group_1_1__0 )?";
+            return "9877:1: ( rule__XAssignment__Group_1_1__0 )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA94_1 = input.LA(1);
+                        int LA93_4 = input.LA(1);
 
                          
-                        int index94_1 = input.index();
+                        int index93_4 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred160_InternalCheck()) ) {s = 9;}
+                        if ( (synpred159_InternalCheck()) ) {s = 9;}
 
                         else if ( (true) ) {s = 8;}
 
                          
-                        input.seek(index94_1);
+                        input.seek(index93_4);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA94_5 = input.LA(1);
+                        int LA93_3 = input.LA(1);
 
                          
-                        int index94_5 = input.index();
+                        int index93_3 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred160_InternalCheck()) ) {s = 9;}
+                        if ( (synpred159_InternalCheck()) ) {s = 9;}
 
                         else if ( (true) ) {s = 8;}
 
                          
-                        input.seek(index94_5);
+                        input.seek(index93_3);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA94_2 = input.LA(1);
+                        int LA93_2 = input.LA(1);
 
                          
-                        int index94_2 = input.index();
+                        int index93_2 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred160_InternalCheck()) ) {s = 9;}
+                        if ( (synpred159_InternalCheck()) ) {s = 9;}
 
                         else if ( (true) ) {s = 8;}
 
                          
-                        input.seek(index94_2);
+                        input.seek(index93_2);
                         if ( s>=0 ) return s;
                         break;
                     case 3 : 
-                        int LA94_7 = input.LA(1);
+                        int LA93_7 = input.LA(1);
 
                          
-                        int index94_7 = input.index();
+                        int index93_7 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred160_InternalCheck()) ) {s = 9;}
+                        if ( (synpred159_InternalCheck()) ) {s = 9;}
 
                         else if ( (true) ) {s = 8;}
 
                          
-                        input.seek(index94_7);
+                        input.seek(index93_7);
                         if ( s>=0 ) return s;
                         break;
                     case 4 : 
-                        int LA94_3 = input.LA(1);
+                        int LA93_1 = input.LA(1);
 
                          
-                        int index94_3 = input.index();
+                        int index93_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred160_InternalCheck()) ) {s = 9;}
+                        if ( (synpred159_InternalCheck()) ) {s = 9;}
 
                         else if ( (true) ) {s = 8;}
 
                          
-                        input.seek(index94_3);
+                        input.seek(index93_1);
                         if ( s>=0 ) return s;
                         break;
                     case 5 : 
-                        int LA94_4 = input.LA(1);
+                        int LA93_5 = input.LA(1);
 
                          
-                        int index94_4 = input.index();
+                        int index93_5 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred160_InternalCheck()) ) {s = 9;}
+                        if ( (synpred159_InternalCheck()) ) {s = 9;}
 
                         else if ( (true) ) {s = 8;}
 
                          
-                        input.seek(index94_4);
+                        input.seek(index93_5);
                         if ( s>=0 ) return s;
                         break;
                     case 6 : 
-                        int LA94_6 = input.LA(1);
+                        int LA93_6 = input.LA(1);
 
                          
-                        int index94_6 = input.index();
+                        int index93_6 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred160_InternalCheck()) ) {s = 9;}
+                        if ( (synpred159_InternalCheck()) ) {s = 9;}
 
                         else if ( (true) ) {s = 8;}
 
                          
-                        input.seek(index94_6);
+                        input.seek(index93_6);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 94, _s, input);
+                new NoViableAltException(getDescription(), 93, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA100_eotS =
+    static final String DFA99_eotS =
         "\13\uffff";
-    static final String DFA100_eofS =
+    static final String DFA99_eofS =
         "\1\1\12\uffff";
-    static final String DFA100_minS =
+    static final String DFA99_minS =
         "\1\4\1\uffff\10\0\1\uffff";
-    static final String DFA100_maxS =
+    static final String DFA99_maxS =
         "\1\154\1\uffff\10\0\1\uffff";
-    static final String DFA100_acceptS =
+    static final String DFA99_acceptS =
         "\1\uffff\1\2\10\uffff\1\1";
-    static final String DFA100_specialS =
-        "\2\uffff\1\5\1\0\1\1\1\6\1\4\1\3\1\2\1\7\1\uffff}>";
-    static final String[] DFA100_transitionS = {
+    static final String DFA99_specialS =
+        "\2\uffff\1\5\1\1\1\0\1\6\1\4\1\2\1\3\1\7\1\uffff}>";
+    static final String[] DFA99_transitionS = {
             "\5\1\5\uffff\40\1\1\3\1\2\1\4\1\5\1\6\1\7\1\10\1\11\15\1\1"+
             "\uffff\7\1\2\uffff\30\1\3\uffff\2\1\1\uffff\2\1",
             "",
@@ -78835,166 +78515,337 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA100_eot = DFA.unpackEncodedString(DFA100_eotS);
-    static final short[] DFA100_eof = DFA.unpackEncodedString(DFA100_eofS);
-    static final char[] DFA100_min = DFA.unpackEncodedStringToUnsignedChars(DFA100_minS);
-    static final char[] DFA100_max = DFA.unpackEncodedStringToUnsignedChars(DFA100_maxS);
-    static final short[] DFA100_accept = DFA.unpackEncodedString(DFA100_acceptS);
-    static final short[] DFA100_special = DFA.unpackEncodedString(DFA100_specialS);
-    static final short[][] DFA100_transition;
+    static final short[] DFA99_eot = DFA.unpackEncodedString(DFA99_eotS);
+    static final short[] DFA99_eof = DFA.unpackEncodedString(DFA99_eofS);
+    static final char[] DFA99_min = DFA.unpackEncodedStringToUnsignedChars(DFA99_minS);
+    static final char[] DFA99_max = DFA.unpackEncodedStringToUnsignedChars(DFA99_maxS);
+    static final short[] DFA99_accept = DFA.unpackEncodedString(DFA99_acceptS);
+    static final short[] DFA99_special = DFA.unpackEncodedString(DFA99_specialS);
+    static final short[][] DFA99_transition;
 
     static {
-        int numStates = DFA100_transitionS.length;
-        DFA100_transition = new short[numStates][];
+        int numStates = DFA99_transitionS.length;
+        DFA99_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA100_transition[i] = DFA.unpackEncodedString(DFA100_transitionS[i]);
+            DFA99_transition[i] = DFA.unpackEncodedString(DFA99_transitionS[i]);
         }
     }
 
-    class DFA100 extends DFA {
+    class DFA99 extends DFA {
 
-        public DFA100(BaseRecognizer recognizer) {
+        public DFA99(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 100;
-            this.eot = DFA100_eot;
-            this.eof = DFA100_eof;
-            this.min = DFA100_min;
-            this.max = DFA100_max;
-            this.accept = DFA100_accept;
-            this.special = DFA100_special;
-            this.transition = DFA100_transition;
+            this.decisionNumber = 99;
+            this.eot = DFA99_eot;
+            this.eof = DFA99_eof;
+            this.min = DFA99_min;
+            this.max = DFA99_max;
+            this.accept = DFA99_accept;
+            this.special = DFA99_special;
+            this.transition = DFA99_transition;
         }
         public String getDescription() {
-            return "()* loopback of 11463:1: ( rule__XOtherOperatorExpression__Group_1__0 )*";
+            return "()* loopback of 11369:1: ( rule__XOtherOperatorExpression__Group_1__0 )*";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA100_3 = input.LA(1);
+                        int LA99_4 = input.LA(1);
 
                          
-                        int index100_3 = input.index();
+                        int index99_4 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred166_InternalCheck()) ) {s = 10;}
+                        if ( (synpred165_InternalCheck()) ) {s = 10;}
 
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index100_3);
+                        input.seek(index99_4);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA100_4 = input.LA(1);
+                        int LA99_3 = input.LA(1);
 
                          
-                        int index100_4 = input.index();
+                        int index99_3 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred166_InternalCheck()) ) {s = 10;}
+                        if ( (synpred165_InternalCheck()) ) {s = 10;}
 
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index100_4);
+                        input.seek(index99_3);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA100_8 = input.LA(1);
+                        int LA99_7 = input.LA(1);
 
                          
-                        int index100_8 = input.index();
+                        int index99_7 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred166_InternalCheck()) ) {s = 10;}
+                        if ( (synpred165_InternalCheck()) ) {s = 10;}
 
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index100_8);
+                        input.seek(index99_7);
                         if ( s>=0 ) return s;
                         break;
                     case 3 : 
-                        int LA100_7 = input.LA(1);
+                        int LA99_8 = input.LA(1);
 
                          
-                        int index100_7 = input.index();
+                        int index99_8 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred166_InternalCheck()) ) {s = 10;}
+                        if ( (synpred165_InternalCheck()) ) {s = 10;}
 
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index100_7);
+                        input.seek(index99_8);
                         if ( s>=0 ) return s;
                         break;
                     case 4 : 
-                        int LA100_6 = input.LA(1);
+                        int LA99_6 = input.LA(1);
 
                          
-                        int index100_6 = input.index();
+                        int index99_6 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred166_InternalCheck()) ) {s = 10;}
+                        if ( (synpred165_InternalCheck()) ) {s = 10;}
 
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index100_6);
+                        input.seek(index99_6);
                         if ( s>=0 ) return s;
                         break;
                     case 5 : 
-                        int LA100_2 = input.LA(1);
+                        int LA99_2 = input.LA(1);
 
                          
-                        int index100_2 = input.index();
+                        int index99_2 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred166_InternalCheck()) ) {s = 10;}
+                        if ( (synpred165_InternalCheck()) ) {s = 10;}
 
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index100_2);
+                        input.seek(index99_2);
                         if ( s>=0 ) return s;
                         break;
                     case 6 : 
-                        int LA100_5 = input.LA(1);
+                        int LA99_5 = input.LA(1);
 
                          
-                        int index100_5 = input.index();
+                        int index99_5 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred166_InternalCheck()) ) {s = 10;}
+                        if ( (synpred165_InternalCheck()) ) {s = 10;}
 
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index100_5);
+                        input.seek(index99_5);
                         if ( s>=0 ) return s;
                         break;
                     case 7 : 
-                        int LA100_9 = input.LA(1);
+                        int LA99_9 = input.LA(1);
 
                          
-                        int index100_9 = input.index();
+                        int index99_9 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred166_InternalCheck()) ) {s = 10;}
+                        if ( (synpred165_InternalCheck()) ) {s = 10;}
 
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index100_9);
+                        input.seek(index99_9);
+                        if ( s>=0 ) return s;
+                        break;
+            }
+            if (state.backtracking>0) {state.failed=true; return -1;}
+            NoViableAltException nvae =
+                new NoViableAltException(getDescription(), 99, _s, input);
+            error(nvae);
+            throw nvae;
+        }
+    }
+    static final String DFA106_eotS =
+        "\140\uffff";
+    static final String DFA106_eofS =
+        "\1\2\137\uffff";
+    static final String DFA106_minS =
+        "\1\4\1\0\136\uffff";
+    static final String DFA106_maxS =
+        "\1\154\1\0\136\uffff";
+    static final String DFA106_acceptS =
+        "\2\uffff\1\2\134\uffff\1\1";
+    static final String DFA106_specialS =
+        "\1\uffff\1\0\136\uffff}>";
+    static final String[] DFA106_transitionS = {
+            "\5\2\5\uffff\65\2\1\uffff\4\2\1\1\2\2\2\uffff\30\2\3\uffff"+
+            "\2\2\1\uffff\2\2",
+            "\1\uffff",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            ""
+    };
+
+    static final short[] DFA106_eot = DFA.unpackEncodedString(DFA106_eotS);
+    static final short[] DFA106_eof = DFA.unpackEncodedString(DFA106_eofS);
+    static final char[] DFA106_min = DFA.unpackEncodedStringToUnsignedChars(DFA106_minS);
+    static final char[] DFA106_max = DFA.unpackEncodedStringToUnsignedChars(DFA106_maxS);
+    static final short[] DFA106_accept = DFA.unpackEncodedString(DFA106_acceptS);
+    static final short[] DFA106_special = DFA.unpackEncodedString(DFA106_specialS);
+    static final short[][] DFA106_transition;
+
+    static {
+        int numStates = DFA106_transitionS.length;
+        DFA106_transition = new short[numStates][];
+        for (int i=0; i<numStates; i++) {
+            DFA106_transition[i] = DFA.unpackEncodedString(DFA106_transitionS[i]);
+        }
+    }
+
+    class DFA106 extends DFA {
+
+        public DFA106(BaseRecognizer recognizer) {
+            this.recognizer = recognizer;
+            this.decisionNumber = 106;
+            this.eot = DFA106_eot;
+            this.eof = DFA106_eof;
+            this.min = DFA106_min;
+            this.max = DFA106_max;
+            this.accept = DFA106_accept;
+            this.special = DFA106_special;
+            this.transition = DFA106_transition;
+        }
+        public String getDescription() {
+            return "13196:1: ( rule__XMemberFeatureCall__Group_1_1_3__0 )?";
+        }
+        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
+            TokenStream input = (TokenStream)_input;
+        	int _s = s;
+            switch ( s ) {
+                    case 0 : 
+                        int LA106_1 = input.LA(1);
+
+                         
+                        int index106_1 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (synpred172_InternalCheck()) ) {s = 95;}
+
+                        else if ( (true) ) {s = 2;}
+
+                         
+                        input.seek(index106_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 100, _s, input);
+                new NoViableAltException(getDescription(), 106, _s, input);
             error(nvae);
             throw nvae;
         }
@@ -79012,7 +78863,7 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
     static final String DFA107_specialS =
         "\1\uffff\1\0\136\uffff}>";
     static final String[] DFA107_transitionS = {
-            "\5\2\5\uffff\65\2\1\uffff\4\2\1\1\2\2\2\uffff\30\2\3\uffff"+
+            "\5\2\5\uffff\65\2\1\uffff\7\2\2\uffff\1\2\1\1\26\2\3\uffff"+
             "\2\2\1\uffff\2\2",
             "\1\uffff",
             "",
@@ -79141,7 +78992,7 @@ public DFA107(BaseRecognizer recognizer) {
             this.transition = DFA107_transition;
         }
         public String getDescription() {
-            return "13290:1: ( rule__XMemberFeatureCall__Group_1_1_3__0 )?";
+            return "13224:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
@@ -79170,22 +79021,26 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA108_eotS =
-        "\140\uffff";
-    static final String DFA108_eofS =
-        "\1\2\137\uffff";
-    static final String DFA108_minS =
-        "\1\4\1\0\136\uffff";
-    static final String DFA108_maxS =
-        "\1\154\1\0\136\uffff";
-    static final String DFA108_acceptS =
-        "\2\uffff\1\2\134\uffff\1\1";
-    static final String DFA108_specialS =
-        "\1\uffff\1\0\136\uffff}>";
-    static final String[] DFA108_transitionS = {
-            "\5\2\5\uffff\65\2\1\uffff\7\2\2\uffff\1\2\1\1\26\2\3\uffff"+
-            "\2\2\1\uffff\2\2",
+    static final String DFA115_eotS =
+        "\70\uffff";
+    static final String DFA115_eofS =
+        "\70\uffff";
+    static final String DFA115_minS =
+        "\1\4\2\0\65\uffff";
+    static final String DFA115_maxS =
+        "\1\154\2\0\65\uffff";
+    static final String DFA115_acceptS =
+        "\3\uffff\1\1\1\uffff\1\2\62\uffff";
+    static final String DFA115_specialS =
+        "\1\uffff\1\0\1\1\65\uffff}>";
+    static final String[] DFA115_transitionS = {
+            "\1\1\4\5\7\uffff\24\5\13\uffff\1\5\3\uffff\1\3\2\uffff\2\5"+
+            "\4\uffff\1\5\3\uffff\3\5\1\uffff\1\5\1\uffff\1\5\1\uffff\1\2"+
+            "\4\uffff\5\5\2\uffff\1\5\1\uffff\1\5\3\uffff\10\5\1\uffff\1"+
+            "\5\6\uffff\1\3\2\5",
             "\1\uffff",
+            "\1\uffff",
+            "",
             "",
             "",
             "",
@@ -79237,6 +79092,108 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             "",
             "",
             "",
+            ""
+    };
+
+    static final short[] DFA115_eot = DFA.unpackEncodedString(DFA115_eotS);
+    static final short[] DFA115_eof = DFA.unpackEncodedString(DFA115_eofS);
+    static final char[] DFA115_min = DFA.unpackEncodedStringToUnsignedChars(DFA115_minS);
+    static final char[] DFA115_max = DFA.unpackEncodedStringToUnsignedChars(DFA115_maxS);
+    static final short[] DFA115_accept = DFA.unpackEncodedString(DFA115_acceptS);
+    static final short[] DFA115_special = DFA.unpackEncodedString(DFA115_specialS);
+    static final short[][] DFA115_transition;
+
+    static {
+        int numStates = DFA115_transitionS.length;
+        DFA115_transition = new short[numStates][];
+        for (int i=0; i<numStates; i++) {
+            DFA115_transition[i] = DFA.unpackEncodedString(DFA115_transitionS[i]);
+        }
+    }
+
+    class DFA115 extends DFA {
+
+        public DFA115(BaseRecognizer recognizer) {
+            this.recognizer = recognizer;
+            this.decisionNumber = 115;
+            this.eot = DFA115_eot;
+            this.eof = DFA115_eof;
+            this.min = DFA115_min;
+            this.max = DFA115_max;
+            this.accept = DFA115_accept;
+            this.special = DFA115_special;
+            this.transition = DFA115_transition;
+        }
+        public String getDescription() {
+            return "14365:1: ( rule__XClosure__Group_1__0 )?";
+        }
+        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
+            TokenStream input = (TokenStream)_input;
+        	int _s = s;
+            switch ( s ) {
+                    case 0 : 
+                        int LA115_1 = input.LA(1);
+
+                         
+                        int index115_1 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (synpred181_InternalCheck()) ) {s = 3;}
+
+                        else if ( (true) ) {s = 5;}
+
+                         
+                        input.seek(index115_1);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 1 : 
+                        int LA115_2 = input.LA(1);
+
+                         
+                        int index115_2 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (synpred181_InternalCheck()) ) {s = 3;}
+
+                        else if ( (true) ) {s = 5;}
+
+                         
+                        input.seek(index115_2);
+                        if ( s>=0 ) return s;
+                        break;
+            }
+            if (state.backtracking>0) {state.failed=true; return -1;}
+            NoViableAltException nvae =
+                new NoViableAltException(getDescription(), 115, _s, input);
+            error(nvae);
+            throw nvae;
+        }
+    }
+    static final String DFA125_eotS =
+        "\64\uffff";
+    static final String DFA125_eofS =
+        "\64\uffff";
+    static final String DFA125_minS =
+        "\1\4\2\0\61\uffff";
+    static final String DFA125_maxS =
+        "\1\154\2\0\61\uffff";
+    static final String DFA125_acceptS =
+        "\3\uffff\1\1\1\2\57\uffff";
+    static final String DFA125_specialS =
+        "\1\uffff\1\0\1\1\61\uffff}>";
+    static final String[] DFA125_transitionS = {
+            "\1\1\4\4\7\uffff\24\4\13\uffff\1\4\3\uffff\1\3\2\uffff\2\4"+
+            "\4\uffff\1\4\4\uffff\2\4\1\uffff\1\4\1\uffff\1\4\1\uffff\1\2"+
+            "\4\uffff\2\4\1\uffff\2\4\2\uffff\1\4\1\uffff\1\4\3\uffff\10"+
+            "\4\1\uffff\1\4\10\uffff\1\4",
+            "\1\uffff",
+            "\1\uffff",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
             "",
             "",
             "",
@@ -79282,83 +79239,95 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA108_eot = DFA.unpackEncodedString(DFA108_eotS);
-    static final short[] DFA108_eof = DFA.unpackEncodedString(DFA108_eofS);
-    static final char[] DFA108_min = DFA.unpackEncodedStringToUnsignedChars(DFA108_minS);
-    static final char[] DFA108_max = DFA.unpackEncodedStringToUnsignedChars(DFA108_maxS);
-    static final short[] DFA108_accept = DFA.unpackEncodedString(DFA108_acceptS);
-    static final short[] DFA108_special = DFA.unpackEncodedString(DFA108_specialS);
-    static final short[][] DFA108_transition;
+    static final short[] DFA125_eot = DFA.unpackEncodedString(DFA125_eotS);
+    static final short[] DFA125_eof = DFA.unpackEncodedString(DFA125_eofS);
+    static final char[] DFA125_min = DFA.unpackEncodedStringToUnsignedChars(DFA125_minS);
+    static final char[] DFA125_max = DFA.unpackEncodedStringToUnsignedChars(DFA125_maxS);
+    static final short[] DFA125_accept = DFA.unpackEncodedString(DFA125_acceptS);
+    static final short[] DFA125_special = DFA.unpackEncodedString(DFA125_specialS);
+    static final short[][] DFA125_transition;
 
     static {
-        int numStates = DFA108_transitionS.length;
-        DFA108_transition = new short[numStates][];
+        int numStates = DFA125_transitionS.length;
+        DFA125_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA108_transition[i] = DFA.unpackEncodedString(DFA108_transitionS[i]);
+            DFA125_transition[i] = DFA.unpackEncodedString(DFA125_transitionS[i]);
         }
     }
 
-    class DFA108 extends DFA {
+    class DFA125 extends DFA {
 
-        public DFA108(BaseRecognizer recognizer) {
+        public DFA125(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 108;
-            this.eot = DFA108_eot;
-            this.eof = DFA108_eof;
-            this.min = DFA108_min;
-            this.max = DFA108_max;
-            this.accept = DFA108_accept;
-            this.special = DFA108_special;
-            this.transition = DFA108_transition;
+            this.decisionNumber = 125;
+            this.eot = DFA125_eot;
+            this.eof = DFA125_eof;
+            this.min = DFA125_min;
+            this.max = DFA125_max;
+            this.accept = DFA125_accept;
+            this.special = DFA125_special;
+            this.transition = DFA125_transition;
         }
         public String getDescription() {
-            return "13318:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )?";
+            return "16033:1: ( rule__XSwitchExpression__Group_2_1_0__0 )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA108_1 = input.LA(1);
+                        int LA125_1 = input.LA(1);
 
                          
-                        int index108_1 = input.index();
+                        int index125_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred174_InternalCheck()) ) {s = 95;}
+                        if ( (synpred191_InternalCheck()) ) {s = 3;}
 
-                        else if ( (true) ) {s = 2;}
+                        else if ( (true) ) {s = 4;}
 
                          
-                        input.seek(index108_1);
+                        input.seek(index125_1);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 1 : 
+                        int LA125_2 = input.LA(1);
+
+                         
+                        int index125_2 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (synpred191_InternalCheck()) ) {s = 3;}
+
+                        else if ( (true) ) {s = 4;}
+
+                         
+                        input.seek(index125_2);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 108, _s, input);
+                new NoViableAltException(getDescription(), 125, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA116_eotS =
-        "\70\uffff";
-    static final String DFA116_eofS =
-        "\70\uffff";
-    static final String DFA116_minS =
-        "\1\4\2\0\65\uffff";
-    static final String DFA116_maxS =
-        "\1\154\2\0\65\uffff";
-    static final String DFA116_acceptS =
-        "\3\uffff\1\1\1\uffff\1\2\62\uffff";
-    static final String DFA116_specialS =
-        "\1\uffff\1\0\1\1\65\uffff}>";
-    static final String[] DFA116_transitionS = {
-            "\1\1\4\5\7\uffff\24\5\13\uffff\1\5\3\uffff\1\3\2\uffff\2\5"+
-            "\4\uffff\1\5\3\uffff\3\5\1\uffff\1\5\1\uffff\1\5\1\uffff\1\2"+
-            "\4\uffff\5\5\2\uffff\1\5\1\uffff\1\5\3\uffff\10\5\1\uffff\1"+
-            "\5\6\uffff\1\3\2\5",
-            "\1\uffff",
+    static final String DFA138_eotS =
+        "\140\uffff";
+    static final String DFA138_eofS =
+        "\1\2\137\uffff";
+    static final String DFA138_minS =
+        "\1\4\1\0\136\uffff";
+    static final String DFA138_maxS =
+        "\1\154\1\0\136\uffff";
+    static final String DFA138_acceptS =
+        "\2\uffff\1\2\134\uffff\1\1";
+    static final String DFA138_specialS =
+        "\1\uffff\1\0\136\uffff}>";
+    static final String[] DFA138_transitionS = {
+            "\5\2\5\uffff\65\2\1\uffff\4\2\1\1\2\2\2\uffff\30\2\3\uffff"+
+            "\2\2\1\uffff\2\2",
             "\1\uffff",
             "",
             "",
@@ -79412,109 +79381,6 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             "",
             "",
             "",
-            ""
-    };
-
-    static final short[] DFA116_eot = DFA.unpackEncodedString(DFA116_eotS);
-    static final short[] DFA116_eof = DFA.unpackEncodedString(DFA116_eofS);
-    static final char[] DFA116_min = DFA.unpackEncodedStringToUnsignedChars(DFA116_minS);
-    static final char[] DFA116_max = DFA.unpackEncodedStringToUnsignedChars(DFA116_maxS);
-    static final short[] DFA116_accept = DFA.unpackEncodedString(DFA116_acceptS);
-    static final short[] DFA116_special = DFA.unpackEncodedString(DFA116_specialS);
-    static final short[][] DFA116_transition;
-
-    static {
-        int numStates = DFA116_transitionS.length;
-        DFA116_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA116_transition[i] = DFA.unpackEncodedString(DFA116_transitionS[i]);
-        }
-    }
-
-    class DFA116 extends DFA {
-
-        public DFA116(BaseRecognizer recognizer) {
-            this.recognizer = recognizer;
-            this.decisionNumber = 116;
-            this.eot = DFA116_eot;
-            this.eof = DFA116_eof;
-            this.min = DFA116_min;
-            this.max = DFA116_max;
-            this.accept = DFA116_accept;
-            this.special = DFA116_special;
-            this.transition = DFA116_transition;
-        }
-        public String getDescription() {
-            return "14459:1: ( rule__XClosure__Group_1__0 )?";
-        }
-        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
-            TokenStream input = (TokenStream)_input;
-        	int _s = s;
-            switch ( s ) {
-                    case 0 : 
-                        int LA116_1 = input.LA(1);
-
-                         
-                        int index116_1 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (synpred182_InternalCheck()) ) {s = 3;}
-
-                        else if ( (true) ) {s = 5;}
-
-                         
-                        input.seek(index116_1);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 1 : 
-                        int LA116_2 = input.LA(1);
-
-                         
-                        int index116_2 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (synpred182_InternalCheck()) ) {s = 3;}
-
-                        else if ( (true) ) {s = 5;}
-
-                         
-                        input.seek(index116_2);
-                        if ( s>=0 ) return s;
-                        break;
-            }
-            if (state.backtracking>0) {state.failed=true; return -1;}
-            NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 116, _s, input);
-            error(nvae);
-            throw nvae;
-        }
-    }
-    static final String DFA126_eotS =
-        "\64\uffff";
-    static final String DFA126_eofS =
-        "\64\uffff";
-    static final String DFA126_minS =
-        "\1\4\2\0\61\uffff";
-    static final String DFA126_maxS =
-        "\1\154\2\0\61\uffff";
-    static final String DFA126_acceptS =
-        "\3\uffff\1\1\1\2\57\uffff";
-    static final String DFA126_specialS =
-        "\1\uffff\1\0\1\1\61\uffff}>";
-    static final String[] DFA126_transitionS = {
-            "\1\1\4\4\7\uffff\24\4\13\uffff\1\4\3\uffff\1\3\2\uffff\2\4"+
-            "\4\uffff\1\4\4\uffff\2\4\1\uffff\1\4\1\uffff\1\4\1\uffff\1\2"+
-            "\4\uffff\2\4\1\uffff\2\4\2\uffff\1\4\1\uffff\1\4\3\uffff\10"+
-            "\4\1\uffff\1\4\10\uffff\1\4",
-            "\1\uffff",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
             "",
             "",
             "",
@@ -79559,76 +79425,61 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA126_eot = DFA.unpackEncodedString(DFA126_eotS);
-    static final short[] DFA126_eof = DFA.unpackEncodedString(DFA126_eofS);
-    static final char[] DFA126_min = DFA.unpackEncodedStringToUnsignedChars(DFA126_minS);
-    static final char[] DFA126_max = DFA.unpackEncodedStringToUnsignedChars(DFA126_maxS);
-    static final short[] DFA126_accept = DFA.unpackEncodedString(DFA126_acceptS);
-    static final short[] DFA126_special = DFA.unpackEncodedString(DFA126_specialS);
-    static final short[][] DFA126_transition;
+    static final short[] DFA138_eot = DFA.unpackEncodedString(DFA138_eotS);
+    static final short[] DFA138_eof = DFA.unpackEncodedString(DFA138_eofS);
+    static final char[] DFA138_min = DFA.unpackEncodedStringToUnsignedChars(DFA138_minS);
+    static final char[] DFA138_max = DFA.unpackEncodedStringToUnsignedChars(DFA138_maxS);
+    static final short[] DFA138_accept = DFA.unpackEncodedString(DFA138_acceptS);
+    static final short[] DFA138_special = DFA.unpackEncodedString(DFA138_specialS);
+    static final short[][] DFA138_transition;
 
     static {
-        int numStates = DFA126_transitionS.length;
-        DFA126_transition = new short[numStates][];
+        int numStates = DFA138_transitionS.length;
+        DFA138_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA126_transition[i] = DFA.unpackEncodedString(DFA126_transitionS[i]);
+            DFA138_transition[i] = DFA.unpackEncodedString(DFA138_transitionS[i]);
         }
     }
 
-    class DFA126 extends DFA {
+    class DFA138 extends DFA {
 
-        public DFA126(BaseRecognizer recognizer) {
+        public DFA138(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 126;
-            this.eot = DFA126_eot;
-            this.eof = DFA126_eof;
-            this.min = DFA126_min;
-            this.max = DFA126_max;
-            this.accept = DFA126_accept;
-            this.special = DFA126_special;
-            this.transition = DFA126_transition;
+            this.decisionNumber = 138;
+            this.eot = DFA138_eot;
+            this.eof = DFA138_eof;
+            this.min = DFA138_min;
+            this.max = DFA138_max;
+            this.accept = DFA138_accept;
+            this.special = DFA138_special;
+            this.transition = DFA138_transition;
         }
         public String getDescription() {
-            return "16127:1: ( rule__XSwitchExpression__Group_2_1_0__0 )?";
+            return "18521:1: ( rule__XFeatureCall__Group_3__0 )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA126_1 = input.LA(1);
-
-                         
-                        int index126_1 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (synpred192_InternalCheck()) ) {s = 3;}
-
-                        else if ( (true) ) {s = 4;}
-
-                         
-                        input.seek(index126_1);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 1 : 
-                        int LA126_2 = input.LA(1);
+                        int LA138_1 = input.LA(1);
 
                          
-                        int index126_2 = input.index();
+                        int index138_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred192_InternalCheck()) ) {s = 3;}
+                        if ( (synpred204_InternalCheck()) ) {s = 95;}
 
-                        else if ( (true) ) {s = 4;}
+                        else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index126_2);
+                        input.seek(index138_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 126, _s, input);
+                new NoViableAltException(getDescription(), 138, _s, input);
             error(nvae);
             throw nvae;
         }
@@ -79646,7 +79497,7 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
     static final String DFA139_specialS =
         "\1\uffff\1\0\136\uffff}>";
     static final String[] DFA139_transitionS = {
-            "\5\2\5\uffff\65\2\1\uffff\4\2\1\1\2\2\2\uffff\30\2\3\uffff"+
+            "\5\2\5\uffff\65\2\1\uffff\7\2\2\uffff\1\2\1\1\26\2\3\uffff"+
             "\2\2\1\uffff\2\2",
             "\1\uffff",
             "",
@@ -79775,7 +79626,7 @@ public DFA139(BaseRecognizer recognizer) {
             this.transition = DFA139_transition;
         }
         public String getDescription() {
-            return "18615:1: ( rule__XFeatureCall__Group_3__0 )?";
+            return "18549:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
@@ -79804,20 +79655,20 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA140_eotS =
+    static final String DFA143_eotS =
         "\140\uffff";
-    static final String DFA140_eofS =
+    static final String DFA143_eofS =
         "\1\2\137\uffff";
-    static final String DFA140_minS =
+    static final String DFA143_minS =
         "\1\4\1\0\136\uffff";
-    static final String DFA140_maxS =
+    static final String DFA143_maxS =
         "\1\154\1\0\136\uffff";
-    static final String DFA140_acceptS =
+    static final String DFA143_acceptS =
         "\2\uffff\1\2\134\uffff\1\1";
-    static final String DFA140_specialS =
+    static final String DFA143_specialS =
         "\1\uffff\1\0\136\uffff}>";
-    static final String[] DFA140_transitionS = {
-            "\5\2\5\uffff\65\2\1\uffff\7\2\2\uffff\1\2\1\1\26\2\3\uffff"+
+    static final String[] DFA143_transitionS = {
+            "\5\2\5\uffff\41\2\1\1\23\2\1\uffff\7\2\2\uffff\30\2\3\uffff"+
             "\2\2\1\uffff\2\2",
             "\1\uffff",
             "",
@@ -79916,61 +79767,61 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA140_eot = DFA.unpackEncodedString(DFA140_eotS);
-    static final short[] DFA140_eof = DFA.unpackEncodedString(DFA140_eofS);
-    static final char[] DFA140_min = DFA.unpackEncodedStringToUnsignedChars(DFA140_minS);
-    static final char[] DFA140_max = DFA.unpackEncodedStringToUnsignedChars(DFA140_maxS);
-    static final short[] DFA140_accept = DFA.unpackEncodedString(DFA140_acceptS);
-    static final short[] DFA140_special = DFA.unpackEncodedString(DFA140_specialS);
-    static final short[][] DFA140_transition;
+    static final short[] DFA143_eot = DFA.unpackEncodedString(DFA143_eotS);
+    static final short[] DFA143_eof = DFA.unpackEncodedString(DFA143_eofS);
+    static final char[] DFA143_min = DFA.unpackEncodedStringToUnsignedChars(DFA143_minS);
+    static final char[] DFA143_max = DFA.unpackEncodedStringToUnsignedChars(DFA143_maxS);
+    static final short[] DFA143_accept = DFA.unpackEncodedString(DFA143_acceptS);
+    static final short[] DFA143_special = DFA.unpackEncodedString(DFA143_specialS);
+    static final short[][] DFA143_transition;
 
     static {
-        int numStates = DFA140_transitionS.length;
-        DFA140_transition = new short[numStates][];
+        int numStates = DFA143_transitionS.length;
+        DFA143_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA140_transition[i] = DFA.unpackEncodedString(DFA140_transitionS[i]);
+            DFA143_transition[i] = DFA.unpackEncodedString(DFA143_transitionS[i]);
         }
     }
 
-    class DFA140 extends DFA {
+    class DFA143 extends DFA {
 
-        public DFA140(BaseRecognizer recognizer) {
+        public DFA143(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 140;
-            this.eot = DFA140_eot;
-            this.eof = DFA140_eof;
-            this.min = DFA140_min;
-            this.max = DFA140_max;
-            this.accept = DFA140_accept;
-            this.special = DFA140_special;
-            this.transition = DFA140_transition;
+            this.decisionNumber = 143;
+            this.eot = DFA143_eot;
+            this.eof = DFA143_eof;
+            this.min = DFA143_min;
+            this.max = DFA143_max;
+            this.accept = DFA143_accept;
+            this.special = DFA143_special;
+            this.transition = DFA143_transition;
         }
         public String getDescription() {
-            return "18643:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )?";
+            return "19087:1: ( rule__XConstructorCall__Group_3__0 )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA140_1 = input.LA(1);
+                        int LA143_1 = input.LA(1);
 
                          
-                        int index140_1 = input.index();
+                        int index143_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred206_InternalCheck()) ) {s = 95;}
+                        if ( (synpred209_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index140_1);
+                        input.seek(index143_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 140, _s, input);
+                new NoViableAltException(getDescription(), 143, _s, input);
             error(nvae);
             throw nvae;
         }
@@ -79988,7 +79839,7 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
     static final String DFA144_specialS =
         "\1\uffff\1\0\136\uffff}>";
     static final String[] DFA144_transitionS = {
-            "\5\2\5\uffff\41\2\1\1\23\2\1\uffff\7\2\2\uffff\30\2\3\uffff"+
+            "\5\2\5\uffff\65\2\1\uffff\4\2\1\1\2\2\2\uffff\30\2\3\uffff"+
             "\2\2\1\uffff\2\2",
             "\1\uffff",
             "",
@@ -80117,7 +79968,7 @@ public DFA144(BaseRecognizer recognizer) {
             this.transition = DFA144_transition;
         }
         public String getDescription() {
-            return "19181:1: ( rule__XConstructorCall__Group_3__0 )?";
+            return "19116:1: ( rule__XConstructorCall__Group_4__0 )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
@@ -80159,7 +80010,7 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
     static final String DFA145_specialS =
         "\1\uffff\1\0\136\uffff}>";
     static final String[] DFA145_transitionS = {
-            "\5\2\5\uffff\65\2\1\uffff\4\2\1\1\2\2\2\uffff\30\2\3\uffff"+
+            "\5\2\5\uffff\65\2\1\uffff\7\2\2\uffff\1\2\1\1\26\2\3\uffff"+
             "\2\2\1\uffff\2\2",
             "\1\uffff",
             "",
@@ -80288,7 +80139,7 @@ public DFA145(BaseRecognizer recognizer) {
             this.transition = DFA145_transition;
         }
         public String getDescription() {
-            return "19210:1: ( rule__XConstructorCall__Group_4__0 )?";
+            return "19144:1: ( rule__XConstructorCall__ArgumentsAssignment_5 )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
@@ -80317,194 +80168,23 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA146_eotS =
-        "\140\uffff";
-    static final String DFA146_eofS =
-        "\1\2\137\uffff";
-    static final String DFA146_minS =
-        "\1\4\1\0\136\uffff";
-    static final String DFA146_maxS =
-        "\1\154\1\0\136\uffff";
-    static final String DFA146_acceptS =
-        "\2\uffff\1\2\134\uffff\1\1";
-    static final String DFA146_specialS =
-        "\1\uffff\1\0\136\uffff}>";
-    static final String[] DFA146_transitionS = {
-            "\5\2\5\uffff\65\2\1\uffff\7\2\2\uffff\1\2\1\1\26\2\3\uffff"+
-            "\2\2\1\uffff\2\2",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA146_eot = DFA.unpackEncodedString(DFA146_eotS);
-    static final short[] DFA146_eof = DFA.unpackEncodedString(DFA146_eofS);
-    static final char[] DFA146_min = DFA.unpackEncodedStringToUnsignedChars(DFA146_minS);
-    static final char[] DFA146_max = DFA.unpackEncodedStringToUnsignedChars(DFA146_maxS);
-    static final short[] DFA146_accept = DFA.unpackEncodedString(DFA146_acceptS);
-    static final short[] DFA146_special = DFA.unpackEncodedString(DFA146_specialS);
-    static final short[][] DFA146_transition;
-
-    static {
-        int numStates = DFA146_transitionS.length;
-        DFA146_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA146_transition[i] = DFA.unpackEncodedString(DFA146_transitionS[i]);
-        }
-    }
-
-    class DFA146 extends DFA {
-
-        public DFA146(BaseRecognizer recognizer) {
-            this.recognizer = recognizer;
-            this.decisionNumber = 146;
-            this.eot = DFA146_eot;
-            this.eof = DFA146_eof;
-            this.min = DFA146_min;
-            this.max = DFA146_max;
-            this.accept = DFA146_accept;
-            this.special = DFA146_special;
-            this.transition = DFA146_transition;
-        }
-        public String getDescription() {
-            return "19238:1: ( rule__XConstructorCall__ArgumentsAssignment_5 )?";
-        }
-        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
-            TokenStream input = (TokenStream)_input;
-        	int _s = s;
-            switch ( s ) {
-                    case 0 : 
-                        int LA146_1 = input.LA(1);
-
-                         
-                        int index146_1 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (synpred212_InternalCheck()) ) {s = 95;}
-
-                        else if ( (true) ) {s = 2;}
-
-                         
-                        input.seek(index146_1);
-                        if ( s>=0 ) return s;
-                        break;
-            }
-            if (state.backtracking>0) {state.failed=true; return -1;}
-            NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 146, _s, input);
-            error(nvae);
-            throw nvae;
-        }
-    }
-    static final String DFA151_eotS =
+    static final String DFA150_eotS =
         "\140\uffff";
-    static final String DFA151_eofS =
+    static final String DFA150_eofS =
         "\1\63\137\uffff";
-    static final String DFA151_minS =
+    static final String DFA150_minS =
         "\1\4\62\0\55\uffff";
-    static final String DFA151_maxS =
+    static final String DFA150_maxS =
         "\1\154\62\0\55\uffff";
-    static final String DFA151_acceptS =
+    static final String DFA150_acceptS =
         "\63\uffff\1\2\53\uffff\1\1";
-    static final String DFA151_specialS =
+    static final String DFA150_specialS =
         "\1\uffff\1\0\1\1\1\2\1\3\1\4\1\5\1\6\1\7\1\10\1\11\1\12\1\13\1"+
         "\14\1\15\1\16\1\17\1\20\1\21\1\22\1\23\1\24\1\25\1\26\1\27\1\30"+
         "\1\31\1\32\1\33\1\34\1\35\1\36\1\37\1\40\1\41\1\42\1\43\1\44\1\45"+
         "\1\46\1\47\1\50\1\51\1\52\1\53\1\54\1\55\1\56\1\57\1\60\1\61\55"+
         "\uffff}>";
-    static final String[] DFA151_transitionS = {
+    static final String[] DFA150_transitionS = {
             "\1\1\1\43\1\44\1\45\1\47\5\uffff\2\63\1\2\1\3\1\4\1\5\1\6\1"+
             "\7\1\10\1\11\1\12\1\13\1\14\1\15\1\16\1\17\1\20\1\21\1\22\1"+
             "\23\1\24\1\25\13\63\1\35\6\63\1\30\1\27\4\63\1\26\4\63\1\36"+
@@ -80609,813 +80289,813 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA151_eot = DFA.unpackEncodedString(DFA151_eotS);
-    static final short[] DFA151_eof = DFA.unpackEncodedString(DFA151_eofS);
-    static final char[] DFA151_min = DFA.unpackEncodedStringToUnsignedChars(DFA151_minS);
-    static final char[] DFA151_max = DFA.unpackEncodedStringToUnsignedChars(DFA151_maxS);
-    static final short[] DFA151_accept = DFA.unpackEncodedString(DFA151_acceptS);
-    static final short[] DFA151_special = DFA.unpackEncodedString(DFA151_specialS);
-    static final short[][] DFA151_transition;
+    static final short[] DFA150_eot = DFA.unpackEncodedString(DFA150_eotS);
+    static final short[] DFA150_eof = DFA.unpackEncodedString(DFA150_eofS);
+    static final char[] DFA150_min = DFA.unpackEncodedStringToUnsignedChars(DFA150_minS);
+    static final char[] DFA150_max = DFA.unpackEncodedStringToUnsignedChars(DFA150_maxS);
+    static final short[] DFA150_accept = DFA.unpackEncodedString(DFA150_acceptS);
+    static final short[] DFA150_special = DFA.unpackEncodedString(DFA150_specialS);
+    static final short[][] DFA150_transition;
 
     static {
-        int numStates = DFA151_transitionS.length;
-        DFA151_transition = new short[numStates][];
+        int numStates = DFA150_transitionS.length;
+        DFA150_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA151_transition[i] = DFA.unpackEncodedString(DFA151_transitionS[i]);
+            DFA150_transition[i] = DFA.unpackEncodedString(DFA150_transitionS[i]);
         }
     }
 
-    class DFA151 extends DFA {
+    class DFA150 extends DFA {
 
-        public DFA151(BaseRecognizer recognizer) {
+        public DFA150(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 151;
-            this.eot = DFA151_eot;
-            this.eof = DFA151_eof;
-            this.min = DFA151_min;
-            this.max = DFA151_max;
-            this.accept = DFA151_accept;
-            this.special = DFA151_special;
-            this.transition = DFA151_transition;
+            this.decisionNumber = 150;
+            this.eot = DFA150_eot;
+            this.eof = DFA150_eof;
+            this.min = DFA150_min;
+            this.max = DFA150_max;
+            this.accept = DFA150_accept;
+            this.special = DFA150_special;
+            this.transition = DFA150_transition;
         }
         public String getDescription() {
-            return "20291:1: ( rule__XReturnExpression__ExpressionAssignment_2 )?";
+            return "20197:1: ( rule__XReturnExpression__ExpressionAssignment_2 )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA151_1 = input.LA(1);
+                        int LA150_1 = input.LA(1);
 
                          
-                        int index151_1 = input.index();
+                        int index150_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_1);
+                        input.seek(index150_1);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA151_2 = input.LA(1);
+                        int LA150_2 = input.LA(1);
 
                          
-                        int index151_2 = input.index();
+                        int index150_2 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_2);
+                        input.seek(index150_2);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA151_3 = input.LA(1);
+                        int LA150_3 = input.LA(1);
 
                          
-                        int index151_3 = input.index();
+                        int index150_3 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_3);
+                        input.seek(index150_3);
                         if ( s>=0 ) return s;
                         break;
                     case 3 : 
-                        int LA151_4 = input.LA(1);
+                        int LA150_4 = input.LA(1);
 
                          
-                        int index151_4 = input.index();
+                        int index150_4 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_4);
+                        input.seek(index150_4);
                         if ( s>=0 ) return s;
                         break;
                     case 4 : 
-                        int LA151_5 = input.LA(1);
+                        int LA150_5 = input.LA(1);
 
                          
-                        int index151_5 = input.index();
+                        int index150_5 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_5);
+                        input.seek(index150_5);
                         if ( s>=0 ) return s;
                         break;
                     case 5 : 
-                        int LA151_6 = input.LA(1);
+                        int LA150_6 = input.LA(1);
 
                          
-                        int index151_6 = input.index();
+                        int index150_6 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_6);
+                        input.seek(index150_6);
                         if ( s>=0 ) return s;
                         break;
                     case 6 : 
-                        int LA151_7 = input.LA(1);
+                        int LA150_7 = input.LA(1);
 
                          
-                        int index151_7 = input.index();
+                        int index150_7 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_7);
+                        input.seek(index150_7);
                         if ( s>=0 ) return s;
                         break;
                     case 7 : 
-                        int LA151_8 = input.LA(1);
+                        int LA150_8 = input.LA(1);
 
                          
-                        int index151_8 = input.index();
+                        int index150_8 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_8);
+                        input.seek(index150_8);
                         if ( s>=0 ) return s;
                         break;
                     case 8 : 
-                        int LA151_9 = input.LA(1);
+                        int LA150_9 = input.LA(1);
 
                          
-                        int index151_9 = input.index();
+                        int index150_9 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_9);
+                        input.seek(index150_9);
                         if ( s>=0 ) return s;
                         break;
                     case 9 : 
-                        int LA151_10 = input.LA(1);
+                        int LA150_10 = input.LA(1);
 
                          
-                        int index151_10 = input.index();
+                        int index150_10 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_10);
+                        input.seek(index150_10);
                         if ( s>=0 ) return s;
                         break;
                     case 10 : 
-                        int LA151_11 = input.LA(1);
+                        int LA150_11 = input.LA(1);
 
                          
-                        int index151_11 = input.index();
+                        int index150_11 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_11);
+                        input.seek(index150_11);
                         if ( s>=0 ) return s;
                         break;
                     case 11 : 
-                        int LA151_12 = input.LA(1);
+                        int LA150_12 = input.LA(1);
 
                          
-                        int index151_12 = input.index();
+                        int index150_12 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_12);
+                        input.seek(index150_12);
                         if ( s>=0 ) return s;
                         break;
                     case 12 : 
-                        int LA151_13 = input.LA(1);
+                        int LA150_13 = input.LA(1);
 
                          
-                        int index151_13 = input.index();
+                        int index150_13 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_13);
+                        input.seek(index150_13);
                         if ( s>=0 ) return s;
                         break;
                     case 13 : 
-                        int LA151_14 = input.LA(1);
+                        int LA150_14 = input.LA(1);
 
                          
-                        int index151_14 = input.index();
+                        int index150_14 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_14);
+                        input.seek(index150_14);
                         if ( s>=0 ) return s;
                         break;
                     case 14 : 
-                        int LA151_15 = input.LA(1);
+                        int LA150_15 = input.LA(1);
 
                          
-                        int index151_15 = input.index();
+                        int index150_15 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_15);
+                        input.seek(index150_15);
                         if ( s>=0 ) return s;
                         break;
                     case 15 : 
-                        int LA151_16 = input.LA(1);
+                        int LA150_16 = input.LA(1);
 
                          
-                        int index151_16 = input.index();
+                        int index150_16 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_16);
+                        input.seek(index150_16);
                         if ( s>=0 ) return s;
                         break;
                     case 16 : 
-                        int LA151_17 = input.LA(1);
+                        int LA150_17 = input.LA(1);
 
                          
-                        int index151_17 = input.index();
+                        int index150_17 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_17);
+                        input.seek(index150_17);
                         if ( s>=0 ) return s;
                         break;
                     case 17 : 
-                        int LA151_18 = input.LA(1);
+                        int LA150_18 = input.LA(1);
 
                          
-                        int index151_18 = input.index();
+                        int index150_18 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_18);
+                        input.seek(index150_18);
                         if ( s>=0 ) return s;
                         break;
                     case 18 : 
-                        int LA151_19 = input.LA(1);
+                        int LA150_19 = input.LA(1);
 
                          
-                        int index151_19 = input.index();
+                        int index150_19 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_19);
+                        input.seek(index150_19);
                         if ( s>=0 ) return s;
                         break;
                     case 19 : 
-                        int LA151_20 = input.LA(1);
+                        int LA150_20 = input.LA(1);
 
                          
-                        int index151_20 = input.index();
+                        int index150_20 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_20);
+                        input.seek(index150_20);
                         if ( s>=0 ) return s;
                         break;
                     case 20 : 
-                        int LA151_21 = input.LA(1);
+                        int LA150_21 = input.LA(1);
 
                          
-                        int index151_21 = input.index();
+                        int index150_21 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_21);
+                        input.seek(index150_21);
                         if ( s>=0 ) return s;
                         break;
                     case 21 : 
-                        int LA151_22 = input.LA(1);
+                        int LA150_22 = input.LA(1);
 
                          
-                        int index151_22 = input.index();
+                        int index150_22 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_22);
+                        input.seek(index150_22);
                         if ( s>=0 ) return s;
                         break;
                     case 22 : 
-                        int LA151_23 = input.LA(1);
+                        int LA150_23 = input.LA(1);
 
                          
-                        int index151_23 = input.index();
+                        int index150_23 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_23);
+                        input.seek(index150_23);
                         if ( s>=0 ) return s;
                         break;
                     case 23 : 
-                        int LA151_24 = input.LA(1);
+                        int LA150_24 = input.LA(1);
 
                          
-                        int index151_24 = input.index();
+                        int index150_24 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_24);
+                        input.seek(index150_24);
                         if ( s>=0 ) return s;
                         break;
                     case 24 : 
-                        int LA151_25 = input.LA(1);
+                        int LA150_25 = input.LA(1);
 
                          
-                        int index151_25 = input.index();
+                        int index150_25 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_25);
+                        input.seek(index150_25);
                         if ( s>=0 ) return s;
                         break;
                     case 25 : 
-                        int LA151_26 = input.LA(1);
+                        int LA150_26 = input.LA(1);
 
                          
-                        int index151_26 = input.index();
+                        int index150_26 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_26);
+                        input.seek(index150_26);
                         if ( s>=0 ) return s;
                         break;
                     case 26 : 
-                        int LA151_27 = input.LA(1);
+                        int LA150_27 = input.LA(1);
 
                          
-                        int index151_27 = input.index();
+                        int index150_27 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_27);
+                        input.seek(index150_27);
                         if ( s>=0 ) return s;
                         break;
                     case 27 : 
-                        int LA151_28 = input.LA(1);
+                        int LA150_28 = input.LA(1);
 
                          
-                        int index151_28 = input.index();
+                        int index150_28 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_28);
+                        input.seek(index150_28);
                         if ( s>=0 ) return s;
                         break;
                     case 28 : 
-                        int LA151_29 = input.LA(1);
+                        int LA150_29 = input.LA(1);
 
                          
-                        int index151_29 = input.index();
+                        int index150_29 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_29);
+                        input.seek(index150_29);
                         if ( s>=0 ) return s;
                         break;
                     case 29 : 
-                        int LA151_30 = input.LA(1);
+                        int LA150_30 = input.LA(1);
 
                          
-                        int index151_30 = input.index();
+                        int index150_30 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_30);
+                        input.seek(index150_30);
                         if ( s>=0 ) return s;
                         break;
                     case 30 : 
-                        int LA151_31 = input.LA(1);
+                        int LA150_31 = input.LA(1);
 
                          
-                        int index151_31 = input.index();
+                        int index150_31 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_31);
+                        input.seek(index150_31);
                         if ( s>=0 ) return s;
                         break;
                     case 31 : 
-                        int LA151_32 = input.LA(1);
+                        int LA150_32 = input.LA(1);
 
                          
-                        int index151_32 = input.index();
+                        int index150_32 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_32);
+                        input.seek(index150_32);
                         if ( s>=0 ) return s;
                         break;
                     case 32 : 
-                        int LA151_33 = input.LA(1);
+                        int LA150_33 = input.LA(1);
 
                          
-                        int index151_33 = input.index();
+                        int index150_33 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_33);
+                        input.seek(index150_33);
                         if ( s>=0 ) return s;
                         break;
                     case 33 : 
-                        int LA151_34 = input.LA(1);
+                        int LA150_34 = input.LA(1);
 
                          
-                        int index151_34 = input.index();
+                        int index150_34 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_34);
+                        input.seek(index150_34);
                         if ( s>=0 ) return s;
                         break;
                     case 34 : 
-                        int LA151_35 = input.LA(1);
+                        int LA150_35 = input.LA(1);
 
                          
-                        int index151_35 = input.index();
+                        int index150_35 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_35);
+                        input.seek(index150_35);
                         if ( s>=0 ) return s;
                         break;
                     case 35 : 
-                        int LA151_36 = input.LA(1);
+                        int LA150_36 = input.LA(1);
 
                          
-                        int index151_36 = input.index();
+                        int index150_36 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_36);
+                        input.seek(index150_36);
                         if ( s>=0 ) return s;
                         break;
                     case 36 : 
-                        int LA151_37 = input.LA(1);
+                        int LA150_37 = input.LA(1);
 
                          
-                        int index151_37 = input.index();
+                        int index150_37 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_37);
+                        input.seek(index150_37);
                         if ( s>=0 ) return s;
                         break;
                     case 37 : 
-                        int LA151_38 = input.LA(1);
+                        int LA150_38 = input.LA(1);
 
                          
-                        int index151_38 = input.index();
+                        int index150_38 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_38);
+                        input.seek(index150_38);
                         if ( s>=0 ) return s;
                         break;
                     case 38 : 
-                        int LA151_39 = input.LA(1);
+                        int LA150_39 = input.LA(1);
 
                          
-                        int index151_39 = input.index();
+                        int index150_39 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_39);
+                        input.seek(index150_39);
                         if ( s>=0 ) return s;
                         break;
                     case 39 : 
-                        int LA151_40 = input.LA(1);
+                        int LA150_40 = input.LA(1);
 
                          
-                        int index151_40 = input.index();
+                        int index150_40 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_40);
+                        input.seek(index150_40);
                         if ( s>=0 ) return s;
                         break;
                     case 40 : 
-                        int LA151_41 = input.LA(1);
+                        int LA150_41 = input.LA(1);
 
                          
-                        int index151_41 = input.index();
+                        int index150_41 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_41);
+                        input.seek(index150_41);
                         if ( s>=0 ) return s;
                         break;
                     case 41 : 
-                        int LA151_42 = input.LA(1);
+                        int LA150_42 = input.LA(1);
 
                          
-                        int index151_42 = input.index();
+                        int index150_42 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_42);
+                        input.seek(index150_42);
                         if ( s>=0 ) return s;
                         break;
                     case 42 : 
-                        int LA151_43 = input.LA(1);
+                        int LA150_43 = input.LA(1);
 
                          
-                        int index151_43 = input.index();
+                        int index150_43 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_43);
+                        input.seek(index150_43);
                         if ( s>=0 ) return s;
                         break;
                     case 43 : 
-                        int LA151_44 = input.LA(1);
+                        int LA150_44 = input.LA(1);
 
                          
-                        int index151_44 = input.index();
+                        int index150_44 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_44);
+                        input.seek(index150_44);
                         if ( s>=0 ) return s;
                         break;
                     case 44 : 
-                        int LA151_45 = input.LA(1);
+                        int LA150_45 = input.LA(1);
 
                          
-                        int index151_45 = input.index();
+                        int index150_45 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_45);
+                        input.seek(index150_45);
                         if ( s>=0 ) return s;
                         break;
                     case 45 : 
-                        int LA151_46 = input.LA(1);
+                        int LA150_46 = input.LA(1);
 
                          
-                        int index151_46 = input.index();
+                        int index150_46 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_46);
+                        input.seek(index150_46);
                         if ( s>=0 ) return s;
                         break;
                     case 46 : 
-                        int LA151_47 = input.LA(1);
+                        int LA150_47 = input.LA(1);
 
                          
-                        int index151_47 = input.index();
+                        int index150_47 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_47);
+                        input.seek(index150_47);
                         if ( s>=0 ) return s;
                         break;
                     case 47 : 
-                        int LA151_48 = input.LA(1);
+                        int LA150_48 = input.LA(1);
 
                          
-                        int index151_48 = input.index();
+                        int index150_48 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_48);
+                        input.seek(index150_48);
                         if ( s>=0 ) return s;
                         break;
                     case 48 : 
-                        int LA151_49 = input.LA(1);
+                        int LA150_49 = input.LA(1);
 
                          
-                        int index151_49 = input.index();
+                        int index150_49 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_49);
+                        input.seek(index150_49);
                         if ( s>=0 ) return s;
                         break;
                     case 49 : 
-                        int LA151_50 = input.LA(1);
+                        int LA150_50 = input.LA(1);
 
                          
-                        int index151_50 = input.index();
+                        int index150_50 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred217_InternalCheck()) ) {s = 95;}
+                        if ( (synpred216_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 51;}
 
                          
-                        input.seek(index151_50);
+                        input.seek(index150_50);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 151, _s, input);
+                new NoViableAltException(getDescription(), 150, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA160_eotS =
+    static final String DFA159_eotS =
         "\141\uffff";
-    static final String DFA160_eofS =
+    static final String DFA159_eofS =
         "\1\2\140\uffff";
-    static final String DFA160_minS =
+    static final String DFA159_minS =
         "\1\4\1\0\137\uffff";
-    static final String DFA160_maxS =
+    static final String DFA159_maxS =
         "\1\154\1\0\137\uffff";
-    static final String DFA160_acceptS =
+    static final String DFA159_acceptS =
         "\2\uffff\1\2\135\uffff\1\1";
-    static final String DFA160_specialS =
+    static final String DFA159_specialS =
         "\1\uffff\1\0\137\uffff}>";
-    static final String[] DFA160_transitionS = {
+    static final String[] DFA159_transitionS = {
             "\5\2\5\uffff\41\2\1\1\23\2\1\uffff\7\2\2\uffff\30\2\1\uffff"+
             "\1\2\1\uffff\2\2\1\uffff\2\2",
             "\1\uffff",
@@ -81516,78 +81196,78 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA160_eot = DFA.unpackEncodedString(DFA160_eotS);
-    static final short[] DFA160_eof = DFA.unpackEncodedString(DFA160_eofS);
-    static final char[] DFA160_min = DFA.unpackEncodedStringToUnsignedChars(DFA160_minS);
-    static final char[] DFA160_max = DFA.unpackEncodedStringToUnsignedChars(DFA160_maxS);
-    static final short[] DFA160_accept = DFA.unpackEncodedString(DFA160_acceptS);
-    static final short[] DFA160_special = DFA.unpackEncodedString(DFA160_specialS);
-    static final short[][] DFA160_transition;
+    static final short[] DFA159_eot = DFA.unpackEncodedString(DFA159_eotS);
+    static final short[] DFA159_eof = DFA.unpackEncodedString(DFA159_eofS);
+    static final char[] DFA159_min = DFA.unpackEncodedStringToUnsignedChars(DFA159_minS);
+    static final char[] DFA159_max = DFA.unpackEncodedStringToUnsignedChars(DFA159_maxS);
+    static final short[] DFA159_accept = DFA.unpackEncodedString(DFA159_acceptS);
+    static final short[] DFA159_special = DFA.unpackEncodedString(DFA159_specialS);
+    static final short[][] DFA159_transition;
 
     static {
-        int numStates = DFA160_transitionS.length;
-        DFA160_transition = new short[numStates][];
+        int numStates = DFA159_transitionS.length;
+        DFA159_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA160_transition[i] = DFA.unpackEncodedString(DFA160_transitionS[i]);
+            DFA159_transition[i] = DFA.unpackEncodedString(DFA159_transitionS[i]);
         }
     }
 
-    class DFA160 extends DFA {
+    class DFA159 extends DFA {
 
-        public DFA160(BaseRecognizer recognizer) {
+        public DFA159(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 160;
-            this.eot = DFA160_eot;
-            this.eof = DFA160_eof;
-            this.min = DFA160_min;
-            this.max = DFA160_max;
-            this.accept = DFA160_accept;
-            this.special = DFA160_special;
-            this.transition = DFA160_transition;
+            this.decisionNumber = 159;
+            this.eot = DFA159_eot;
+            this.eof = DFA159_eof;
+            this.min = DFA159_min;
+            this.max = DFA159_max;
+            this.accept = DFA159_accept;
+            this.special = DFA159_special;
+            this.transition = DFA159_transition;
         }
         public String getDescription() {
-            return "21870:1: ( rule__JvmParameterizedTypeReference__Group_1__0 )?";
+            return "21776:1: ( rule__JvmParameterizedTypeReference__Group_1__0 )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA160_1 = input.LA(1);
+                        int LA159_1 = input.LA(1);
 
                          
-                        int index160_1 = input.index();
+                        int index159_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred226_InternalCheck()) ) {s = 96;}
+                        if ( (synpred225_InternalCheck()) ) {s = 96;}
 
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index160_1);
+                        input.seek(index159_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 160, _s, input);
+                new NoViableAltException(getDescription(), 159, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA163_eotS =
+    static final String DFA162_eotS =
         "\141\uffff";
-    static final String DFA163_eofS =
+    static final String DFA162_eofS =
         "\1\2\140\uffff";
-    static final String DFA163_minS =
+    static final String DFA162_minS =
         "\1\4\1\0\137\uffff";
-    static final String DFA163_maxS =
+    static final String DFA162_maxS =
         "\1\154\1\0\137\uffff";
-    static final String DFA163_acceptS =
+    static final String DFA162_acceptS =
         "\2\uffff\1\2\135\uffff\1\1";
-    static final String DFA163_specialS =
+    static final String DFA162_specialS =
         "\1\uffff\1\0\137\uffff}>";
-    static final String[] DFA163_transitionS = {
+    static final String[] DFA162_transitionS = {
             "\5\2\5\uffff\41\2\1\1\23\2\1\uffff\7\2\2\uffff\30\2\1\uffff"+
             "\1\2\1\uffff\2\2\1\uffff\2\2",
             "\1\uffff",
@@ -81688,61 +81368,61 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA163_eot = DFA.unpackEncodedString(DFA163_eotS);
-    static final short[] DFA163_eof = DFA.unpackEncodedString(DFA163_eofS);
-    static final char[] DFA163_min = DFA.unpackEncodedStringToUnsignedChars(DFA163_minS);
-    static final char[] DFA163_max = DFA.unpackEncodedStringToUnsignedChars(DFA163_maxS);
-    static final short[] DFA163_accept = DFA.unpackEncodedString(DFA163_acceptS);
-    static final short[] DFA163_special = DFA.unpackEncodedString(DFA163_specialS);
-    static final short[][] DFA163_transition;
+    static final short[] DFA162_eot = DFA.unpackEncodedString(DFA162_eotS);
+    static final short[] DFA162_eof = DFA.unpackEncodedString(DFA162_eofS);
+    static final char[] DFA162_min = DFA.unpackEncodedStringToUnsignedChars(DFA162_minS);
+    static final char[] DFA162_max = DFA.unpackEncodedStringToUnsignedChars(DFA162_maxS);
+    static final short[] DFA162_accept = DFA.unpackEncodedString(DFA162_acceptS);
+    static final short[] DFA162_special = DFA.unpackEncodedString(DFA162_specialS);
+    static final short[][] DFA162_transition;
 
     static {
-        int numStates = DFA163_transitionS.length;
-        DFA163_transition = new short[numStates][];
+        int numStates = DFA162_transitionS.length;
+        DFA162_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA163_transition[i] = DFA.unpackEncodedString(DFA163_transitionS[i]);
+            DFA162_transition[i] = DFA.unpackEncodedString(DFA162_transitionS[i]);
         }
     }
 
-    class DFA163 extends DFA {
+    class DFA162 extends DFA {
 
-        public DFA163(BaseRecognizer recognizer) {
+        public DFA162(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 163;
-            this.eot = DFA163_eot;
-            this.eof = DFA163_eof;
-            this.min = DFA163_min;
-            this.max = DFA163_max;
-            this.accept = DFA163_accept;
-            this.special = DFA163_special;
-            this.transition = DFA163_transition;
+            this.decisionNumber = 162;
+            this.eot = DFA162_eot;
+            this.eof = DFA162_eof;
+            this.min = DFA162_min;
+            this.max = DFA162_max;
+            this.accept = DFA162_accept;
+            this.special = DFA162_special;
+            this.transition = DFA162_transition;
         }
         public String getDescription() {
-            return "22181:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )?";
+            return "22087:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA163_1 = input.LA(1);
+                        int LA162_1 = input.LA(1);
 
                          
-                        int index163_1 = input.index();
+                        int index162_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred229_InternalCheck()) ) {s = 96;}
+                        if ( (synpred228_InternalCheck()) ) {s = 96;}
 
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index163_1);
+                        input.seek(index162_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 163, _s, input);
+                new NoViableAltException(getDescription(), 162, _s, input);
             error(nvae);
             throw nvae;
         }
@@ -82036,10 +81716,10 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
     public static final BitSet FOLLOW_RULE_ID_in_ruleValidID5762 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_rule__SeverityKind__Alternatives_in_ruleSeverityKind5800 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_rule__TriggerKind__Alternatives_in_ruleTriggerKind5836 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__CategoriesAssignment_10_0_in_rule__CheckCatalog__Alternatives_105871 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__ImplementationsAssignment_10_1_in_rule__CheckCatalog__Alternatives_105889 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__ChecksAssignment_10_2_in_rule__CheckCatalog__Alternatives_105907 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__MembersAssignment_10_3_in_rule__CheckCatalog__Alternatives_105925 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__CheckCatalog__CategoriesAssignment_9_0_in_rule__CheckCatalog__Alternatives_95871 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__CheckCatalog__ImplementationsAssignment_9_1_in_rule__CheckCatalog__Alternatives_95889 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__CheckCatalog__ChecksAssignment_9_2_in_rule__CheckCatalog__Alternatives_95907 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__CheckCatalog__MembersAssignment_9_3_in_rule__CheckCatalog__Alternatives_95925 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_rule__XImportDeclaration__ImportedTypeAssignment_1_0_in_rule__XImportDeclaration__Alternatives_15958 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_rule__XImportDeclaration__ImportedNamespaceAssignment_1_1_in_rule__XImportDeclaration__Alternatives_15976 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_rule__Check__Group_8_0__0_in_rule__Check__Alternatives_86011 = new BitSet(new long[]{0x0000000000000002L});
@@ -82219,1692 +81899,1683 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
     public static final BitSet FOLLOW_rule__CheckCatalog__Group__5__Impl_in_rule__CheckCatalog__Group__510007 = new BitSet(new long[]{0x0000000000000010L});
     public static final BitSet FOLLOW_rule__CheckCatalog__Group__6_in_rule__CheckCatalog__Group__510010 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_20_in_rule__CheckCatalog__Group__5__Impl10038 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group__6__Impl_in_rule__CheckCatalog__Group__610069 = new BitSet(new long[]{0x0000000000400000L,0x0000000000000050L});
+    public static final BitSet FOLLOW_rule__CheckCatalog__Group__6__Impl_in_rule__CheckCatalog__Group__610069 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000050L});
     public static final BitSet FOLLOW_rule__CheckCatalog__Group__7_in_rule__CheckCatalog__Group__610072 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_rule__CheckCatalog__NameAssignment_6_in_rule__CheckCatalog__Group__6__Impl10099 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group__7__Impl_in_rule__CheckCatalog__Group__710129 = new BitSet(new long[]{0x0000000000400000L,0x0000000000000050L});
+    public static final BitSet FOLLOW_rule__CheckCatalog__Group__7__Impl_in_rule__CheckCatalog__Group__710129 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000050L});
     public static final BitSet FOLLOW_rule__CheckCatalog__Group__8_in_rule__CheckCatalog__Group__710132 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_rule__CheckCatalog__Group_7__0_in_rule__CheckCatalog__Group__7__Impl10159 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group__8__Impl_in_rule__CheckCatalog__Group__810190 = new BitSet(new long[]{0x0000000000400000L,0x0000000000000050L});
+    public static final BitSet FOLLOW_rule__CheckCatalog__Group__8__Impl_in_rule__CheckCatalog__Group__810190 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001920L});
     public static final BitSet FOLLOW_rule__CheckCatalog__Group__9_in_rule__CheckCatalog__Group__810193 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group_8__0_in_rule__CheckCatalog__Group__8__Impl10220 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group__9__Impl_in_rule__CheckCatalog__Group__910251 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001920L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group__10_in_rule__CheckCatalog__Group__910254 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_68_in_rule__CheckCatalog__Group__9__Impl10282 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group__10__Impl_in_rule__CheckCatalog__Group__1010313 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001920L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group__11_in_rule__CheckCatalog__Group__1010316 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Alternatives_10_in_rule__CheckCatalog__Group__10__Impl10343 = new BitSet(new long[]{0x0008000FE0800012L,0x0000008000001900L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group__11__Impl_in_rule__CheckCatalog__Group__1110374 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_69_in_rule__CheckCatalog__Group__11__Impl10402 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group_7__0__Impl_in_rule__CheckCatalog__Group_7__010457 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group_7__1_in_rule__CheckCatalog__Group_7__010460 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_70_in_rule__CheckCatalog__Group_7__0__Impl10488 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group_7__1__Impl_in_rule__CheckCatalog__Group_7__110519 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group_7__2_in_rule__CheckCatalog__Group_7__110522 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_21_in_rule__CheckCatalog__Group_7__1__Impl10550 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group_7__2__Impl_in_rule__CheckCatalog__Group_7__210581 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__GrammarAssignment_7_2_in_rule__CheckCatalog__Group_7__2__Impl10608 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group_8__0__Impl_in_rule__CheckCatalog__Group_8__010644 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group_8__1_in_rule__CheckCatalog__Group_8__010647 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_22_in_rule__CheckCatalog__Group_8__0__Impl10675 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group_8__1__Impl_in_rule__CheckCatalog__Group_8__110706 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__IncludedCatalogsAssignment_8_1_in_rule__CheckCatalog__Group_8__1__Impl10733 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportSection__Group__0__Impl_in_rule__XImportSection__Group__010767 = new BitSet(new long[]{0x0000000000040000L});
-    public static final BitSet FOLLOW_rule__XImportSection__Group__1_in_rule__XImportSection__Group__010770 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportSection__Group__1__Impl_in_rule__XImportSection__Group__110828 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportSection__ImportDeclarationsAssignment_1_in_rule__XImportSection__Group__1__Impl10855 = new BitSet(new long[]{0x0000000000040002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Group__0__Impl_in_rule__XImportDeclaration__Group__010890 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Group__1_in_rule__XImportDeclaration__Group__010893 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_18_in_rule__XImportDeclaration__Group__0__Impl10921 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Group__1__Impl_in_rule__XImportDeclaration__Group__110952 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Group__2_in_rule__XImportDeclaration__Group__110955 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Alternatives_1_in_rule__XImportDeclaration__Group__1__Impl10982 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Group__2__Impl_in_rule__XImportDeclaration__Group__211012 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__XImportDeclaration__Group__2__Impl11041 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Category__Group__0__Impl_in_rule__Category__Group__011080 = new BitSet(new long[]{0x0000000000000110L});
-    public static final BitSet FOLLOW_rule__Category__Group__1_in_rule__Category__Group__011083 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_rule__Category__Group__0__Impl11111 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Category__Group__1__Impl_in_rule__Category__Group__111142 = new BitSet(new long[]{0x0000000000000110L});
-    public static final BitSet FOLLOW_rule__Category__Group__2_in_rule__Category__Group__111145 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Category__IdAssignment_1_in_rule__Category__Group__1__Impl11172 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Category__Group__2__Impl_in_rule__Category__Group__211203 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__Category__Group__3_in_rule__Category__Group__211206 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Category__LabelAssignment_2_in_rule__Category__Group__2__Impl11233 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Category__Group__3__Impl_in_rule__Category__Group__311263 = new BitSet(new long[]{0x0000000FE0000000L,0x0000008000000820L});
-    public static final BitSet FOLLOW_rule__Category__Group__4_in_rule__Category__Group__311266 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_68_in_rule__Category__Group__3__Impl11294 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Category__Group__4__Impl_in_rule__Category__Group__411325 = new BitSet(new long[]{0x0000000FE0000000L,0x0000008000000820L});
-    public static final BitSet FOLLOW_rule__Category__Group__5_in_rule__Category__Group__411328 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Category__ChecksAssignment_4_in_rule__Category__Group__4__Impl11355 = new BitSet(new long[]{0x0000000FE0000002L,0x0000008000000800L});
-    public static final BitSet FOLLOW_rule__Category__Group__5__Impl_in_rule__Category__Group__511386 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_69_in_rule__Category__Group__5__Impl11414 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group__0__Impl_in_rule__Check__Group__011457 = new BitSet(new long[]{0x0000000FE0000000L,0x0000008000000800L});
-    public static final BitSet FOLLOW_rule__Check__Group__1_in_rule__Check__Group__011460 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__SeverityRangeAssignment_0_in_rule__Check__Group__0__Impl11487 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group__1__Impl_in_rule__Check__Group__111518 = new BitSet(new long[]{0x0000000FE0000000L,0x0000008000000800L});
-    public static final BitSet FOLLOW_rule__Check__Group__2_in_rule__Check__Group__111521 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__FinalAssignment_1_in_rule__Check__Group__1__Impl11548 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group__2__Impl_in_rule__Check__Group__211579 = new BitSet(new long[]{0x0000000FE0000000L,0x0000008000000800L});
-    public static final BitSet FOLLOW_rule__Check__Group__3_in_rule__Check__Group__211582 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__KindAssignment_2_in_rule__Check__Group__2__Impl11609 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group__3__Impl_in_rule__Check__Group__311640 = new BitSet(new long[]{0x0000000000000110L});
-    public static final BitSet FOLLOW_rule__Check__Group__4_in_rule__Check__Group__311643 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__DefaultSeverityAssignment_3_in_rule__Check__Group__3__Impl11670 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group__4__Impl_in_rule__Check__Group__411700 = new BitSet(new long[]{0x0000000000000110L});
-    public static final BitSet FOLLOW_rule__Check__Group__5_in_rule__Check__Group__411703 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__IdAssignment_4_in_rule__Check__Group__4__Impl11730 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group__5__Impl_in_rule__Check__Group__511761 = new BitSet(new long[]{0x0000000001000000L,0x0000000000000150L});
-    public static final BitSet FOLLOW_rule__Check__Group__6_in_rule__Check__Group__511764 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__LabelAssignment_5_in_rule__Check__Group__5__Impl11791 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group__6__Impl_in_rule__Check__Group__611821 = new BitSet(new long[]{0x0000000001000000L,0x0000000000000150L});
-    public static final BitSet FOLLOW_rule__Check__Group__7_in_rule__Check__Group__611824 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group_6__0_in_rule__Check__Group__6__Impl11851 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group__7__Impl_in_rule__Check__Group__711882 = new BitSet(new long[]{0x0000000001000000L,0x0000000000000150L});
-    public static final BitSet FOLLOW_rule__Check__Group__8_in_rule__Check__Group__711885 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group_7__0_in_rule__Check__Group__7__Impl11912 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group__8__Impl_in_rule__Check__Group__811943 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Alternatives_8_in_rule__Check__Group__8__Impl11970 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group_6__0__Impl_in_rule__Check__Group_6__012018 = new BitSet(new long[]{0x0000000000000010L,0x0000000000000200L});
-    public static final BitSet FOLLOW_rule__Check__Group_6__1_in_rule__Check__Group_6__012021 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__Check__Group_6__0__Impl12050 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group_6__1__Impl_in_rule__Check__Group_6__112082 = new BitSet(new long[]{0x0000000000000010L,0x0000000000000200L});
-    public static final BitSet FOLLOW_rule__Check__Group_6__2_in_rule__Check__Group_6__112085 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group_6_1__0_in_rule__Check__Group_6__1__Impl12112 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group_6__2__Impl_in_rule__Check__Group_6__212143 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__Check__Group_6__2__Impl12171 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group_6_1__0__Impl_in_rule__Check__Group_6_1__012208 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__Check__Group_6_1__1_in_rule__Check__Group_6_1__012211 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__FormalParametersAssignment_6_1_0_in_rule__Check__Group_6_1__0__Impl12238 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group_6_1__1__Impl_in_rule__Check__Group_6_1__112268 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group_6_1_1__0_in_rule__Check__Group_6_1__1__Impl12295 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__Check__Group_6_1_1__0__Impl_in_rule__Check__Group_6_1_1__012330 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__Check__Group_6_1_1__1_in_rule__Check__Group_6_1_1__012333 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__Check__Group_6_1_1__0__Impl12361 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group_6_1_1__1__Impl_in_rule__Check__Group_6_1_1__112392 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__FormalParametersAssignment_6_1_1_1_in_rule__Check__Group_6_1_1__1__Impl12419 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group_7__0__Impl_in_rule__Check__Group_7__012453 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__Check__Group_7__1_in_rule__Check__Group_7__012456 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_rule__Check__Group_7__0__Impl12484 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group_7__1__Impl_in_rule__Check__Group_7__112515 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__GivenMessageAssignment_7_1_in_rule__Check__Group_7__1__Impl12542 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group_8_0__0__Impl_in_rule__Check__Group_8_0__012576 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000060L});
-    public static final BitSet FOLLOW_rule__Check__Group_8_0__1_in_rule__Check__Group_8_0__012579 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_68_in_rule__Check__Group_8_0__0__Impl12608 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group_8_0__1__Impl_in_rule__Check__Group_8_0__112640 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000060L});
-    public static final BitSet FOLLOW_rule__Check__Group_8_0__2_in_rule__Check__Group_8_0__112643 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__ContextsAssignment_8_0_1_in_rule__Check__Group_8_0__1__Impl12670 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__Check__Group_8_0__2__Impl_in_rule__Check__Group_8_0__212701 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_69_in_rule__Check__Group_8_0__2__Impl12729 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SeverityRange__Group__0__Impl_in_rule__SeverityRange__Group__012766 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_rule__SeverityRange__Group__1_in_rule__SeverityRange__Group__012769 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_75_in_rule__SeverityRange__Group__0__Impl12797 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SeverityRange__Group__1__Impl_in_rule__SeverityRange__Group__112828 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__SeverityRange__Group__2_in_rule__SeverityRange__Group__112831 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__SeverityRange__Group__1__Impl12859 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SeverityRange__Group__2__Impl_in_rule__SeverityRange__Group__212890 = new BitSet(new long[]{0x0000000FE0000000L,0x0000008000000800L});
-    public static final BitSet FOLLOW_rule__SeverityRange__Group__3_in_rule__SeverityRange__Group__212893 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__SeverityRange__Group__2__Impl12921 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SeverityRange__Group__3__Impl_in_rule__SeverityRange__Group__312952 = new BitSet(new long[]{0x0004000000000000L});
-    public static final BitSet FOLLOW_rule__SeverityRange__Group__4_in_rule__SeverityRange__Group__312955 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SeverityRange__MinSeverityAssignment_3_in_rule__SeverityRange__Group__3__Impl12982 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SeverityRange__Group__4__Impl_in_rule__SeverityRange__Group__413012 = new BitSet(new long[]{0x0000000FE0000000L,0x0000008000000800L});
-    public static final BitSet FOLLOW_rule__SeverityRange__Group__5_in_rule__SeverityRange__Group__413015 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_50_in_rule__SeverityRange__Group__4__Impl13043 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SeverityRange__Group__5__Impl_in_rule__SeverityRange__Group__513074 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000200L});
-    public static final BitSet FOLLOW_rule__SeverityRange__Group__6_in_rule__SeverityRange__Group__513077 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SeverityRange__MaxSeverityAssignment_5_in_rule__SeverityRange__Group__5__Impl13104 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SeverityRange__Group__6__Impl_in_rule__SeverityRange__Group__613134 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__SeverityRange__Group__6__Impl13162 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Member__Group__0__Impl_in_rule__Member__Group__013207 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
-    public static final BitSet FOLLOW_rule__Member__Group__1_in_rule__Member__Group__013210 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Member__AnnotationsAssignment_0_in_rule__Member__Group__0__Impl13237 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000800L});
-    public static final BitSet FOLLOW_rule__Member__Group__1__Impl_in_rule__Member__Group__113268 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__Member__Group__2_in_rule__Member__Group__113271 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Member__TypeAssignment_1_in_rule__Member__Group__1__Impl13298 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Member__Group__2__Impl_in_rule__Member__Group__213328 = new BitSet(new long[]{0x0000000000002000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__Member__Group__3_in_rule__Member__Group__213331 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Member__NameAssignment_2_in_rule__Member__Group__2__Impl13358 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Member__Group__3__Impl_in_rule__Member__Group__313388 = new BitSet(new long[]{0x0000000000002000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__Member__Group__4_in_rule__Member__Group__313391 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Member__Group_3__0_in_rule__Member__Group__3__Impl13418 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Member__Group__4__Impl_in_rule__Member__Group__413449 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__Member__Group__4__Impl13477 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Member__Group_3__0__Impl_in_rule__Member__Group_3__013518 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__Member__Group_3__1_in_rule__Member__Group_3__013521 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpSingleAssign_in_rule__Member__Group_3__0__Impl13548 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Member__Group_3__1__Impl_in_rule__Member__Group_3__113577 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Member__ValueAssignment_3_1_in_rule__Member__Group_3__1__Impl13604 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Implementation__Group__0__Impl_in_rule__Implementation__Group__013638 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__Implementation__Group__1_in_rule__Implementation__Group__013641 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_76_in_rule__Implementation__Group__0__Impl13669 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Implementation__Group__1__Impl_in_rule__Implementation__Group__113700 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__Implementation__Group__2_in_rule__Implementation__Group__113703 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Implementation__NameAssignment_1_in_rule__Implementation__Group__1__Impl13730 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Implementation__Group__2__Impl_in_rule__Implementation__Group__213760 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Implementation__ContextAssignment_2_in_rule__Implementation__Group__2__Impl13787 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FormalParameter__Group__0__Impl_in_rule__FormalParameter__Group__013823 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__FormalParameter__Group__1_in_rule__FormalParameter__Group__013826 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FormalParameter__TypeAssignment_0_in_rule__FormalParameter__Group__0__Impl13853 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FormalParameter__Group__1__Impl_in_rule__FormalParameter__Group__113883 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_rule__FormalParameter__Group__2_in_rule__FormalParameter__Group__113886 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FormalParameter__NameAssignment_1_in_rule__FormalParameter__Group__1__Impl13913 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FormalParameter__Group__2__Impl_in_rule__FormalParameter__Group__213943 = new BitSet(new long[]{0x10C00000000001E0L,0x0000100000002004L});
-    public static final BitSet FOLLOW_rule__FormalParameter__Group__3_in_rule__FormalParameter__Group__213946 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_13_in_rule__FormalParameter__Group__2__Impl13974 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FormalParameter__Group__3__Impl_in_rule__FormalParameter__Group__314005 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__FormalParameter__Group__4_in_rule__FormalParameter__Group__314008 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FormalParameter__RightAssignment_3_in_rule__FormalParameter__Group__3__Impl14035 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FormalParameter__Group__4__Impl_in_rule__FormalParameter__Group__414065 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FormalParameter__LabelAssignment_4_in_rule__FormalParameter__Group__4__Impl14092 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantUnaryOperation__Group_0__0__Impl_in_rule__XConstantUnaryOperation__Group_0__014133 = new BitSet(new long[]{0x10C0000000000000L});
-    public static final BitSet FOLLOW_rule__XConstantUnaryOperation__Group_0__1_in_rule__XConstantUnaryOperation__Group_0__014136 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantUnaryOperation__Group_0__1__Impl_in_rule__XConstantUnaryOperation__Group_0__114194 = new BitSet(new long[]{0x10C00000000001E0L,0x0000100000000004L});
-    public static final BitSet FOLLOW_rule__XConstantUnaryOperation__Group_0__2_in_rule__XConstantUnaryOperation__Group_0__114197 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantUnaryOperation__FeatureAssignment_0_1_in_rule__XConstantUnaryOperation__Group_0__1__Impl14224 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantUnaryOperation__Group_0__2__Impl_in_rule__XConstantUnaryOperation__Group_0__214254 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantUnaryOperation__OperandAssignment_0_2_in_rule__XConstantUnaryOperation__Group_0__2__Impl14281 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group__0__Impl_in_rule__XConstantListLiteral__Group__014317 = new BitSet(new long[]{0x10C00000000001E0L,0x0000100000002004L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group__1_in_rule__XConstantListLiteral__Group__014320 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group__1__Impl_in_rule__XConstantListLiteral__Group__114378 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group__2_in_rule__XConstantListLiteral__Group__114381 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_77_in_rule__XConstantListLiteral__Group__1__Impl14409 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group__2__Impl_in_rule__XConstantListLiteral__Group__214440 = new BitSet(new long[]{0x10C00000000001E0L,0x0000100000008004L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group__3_in_rule__XConstantListLiteral__Group__214443 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_78_in_rule__XConstantListLiteral__Group__2__Impl14471 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group__3__Impl_in_rule__XConstantListLiteral__Group__314502 = new BitSet(new long[]{0x10C00000000001E0L,0x0000100000008004L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group__4_in_rule__XConstantListLiteral__Group__314505 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group_3__0_in_rule__XConstantListLiteral__Group__3__Impl14532 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group__4__Impl_in_rule__XConstantListLiteral__Group__414563 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_79_in_rule__XConstantListLiteral__Group__4__Impl14591 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group_3__0__Impl_in_rule__XConstantListLiteral__Group_3__014632 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group_3__1_in_rule__XConstantListLiteral__Group_3__014635 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__ElementsAssignment_3_0_in_rule__XConstantListLiteral__Group_3__0__Impl14662 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group_3__1__Impl_in_rule__XConstantListLiteral__Group_3__114692 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group_3_1__0_in_rule__XConstantListLiteral__Group_3__1__Impl14719 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group_3_1__0__Impl_in_rule__XConstantListLiteral__Group_3_1__014754 = new BitSet(new long[]{0x10C00000000001E0L,0x0000100000000004L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group_3_1__1_in_rule__XConstantListLiteral__Group_3_1__014757 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XConstantListLiteral__Group_3_1__0__Impl14785 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group_3_1__1__Impl_in_rule__XConstantListLiteral__Group_3_1__114816 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__ElementsAssignment_3_1_1_in_rule__XConstantListLiteral__Group_3_1__1__Impl14843 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Context__Group__0__Impl_in_rule__Context__Group__014877 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
-    public static final BitSet FOLLOW_rule__Context__Group__1_in_rule__Context__Group__014880 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_70_in_rule__Context__Group__0__Impl14908 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Context__Group__1__Impl_in_rule__Context__Group__114939 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__Context__Group__2_in_rule__Context__Group__114942 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Context__ContextVariableAssignment_1_in_rule__Context__Group__1__Impl14969 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Context__Group__2__Impl_in_rule__Context__Group__214999 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Context__ConstraintAssignment_2_in_rule__Context__Group__2__Impl15026 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContextVariable__Group__0__Impl_in_rule__ContextVariable__Group__015062 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__ContextVariable__Group__1_in_rule__ContextVariable__Group__015065 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContextVariable__TypeAssignment_0_in_rule__ContextVariable__Group__0__Impl15092 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContextVariable__Group__1__Impl_in_rule__ContextVariable__Group__115122 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContextVariable__NameAssignment_1_in_rule__ContextVariable__Group__1__Impl15149 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XGuardExpression__Group__0__Impl_in_rule__XGuardExpression__Group__015184 = new BitSet(new long[]{0x0000000000000000L,0x0000000000010000L});
-    public static final BitSet FOLLOW_rule__XGuardExpression__Group__1_in_rule__XGuardExpression__Group__015187 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XGuardExpression__Group__1__Impl_in_rule__XGuardExpression__Group__115245 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XGuardExpression__Group__2_in_rule__XGuardExpression__Group__115248 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_80_in_rule__XGuardExpression__Group__1__Impl15276 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XGuardExpression__Group__2__Impl_in_rule__XGuardExpression__Group__215307 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XGuardExpression__GuardAssignment_2_in_rule__XGuardExpression__Group__2__Impl15334 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group__0__Impl_in_rule__XIssueExpression__Group__015370 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group__1_in_rule__XIssueExpression__Group__015373 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group__1__Impl_in_rule__XIssueExpression__Group__115431 = new BitSet(new long[]{0x000000000F000010L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group__2_in_rule__XIssueExpression__Group__115434 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_81_in_rule__XIssueExpression__Group__1__Impl15462 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group__2__Impl_in_rule__XIssueExpression__Group__215493 = new BitSet(new long[]{0x000000000F000010L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group__3_in_rule__XIssueExpression__Group__215496 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__CheckAssignment_2_in_rule__XIssueExpression__Group__2__Impl15523 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group__3__Impl_in_rule__XIssueExpression__Group__315554 = new BitSet(new long[]{0x000000000F000010L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group__4_in_rule__XIssueExpression__Group__315557 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3__0_in_rule__XIssueExpression__Group__3__Impl15584 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group__4__Impl_in_rule__XIssueExpression__Group__415615 = new BitSet(new long[]{0x000000000F000010L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group__5_in_rule__XIssueExpression__Group__415618 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_4__0_in_rule__XIssueExpression__Group__4__Impl15645 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group__5__Impl_in_rule__XIssueExpression__Group__515676 = new BitSet(new long[]{0x000000000F000010L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group__6_in_rule__XIssueExpression__Group__515679 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5__0_in_rule__XIssueExpression__Group__5__Impl15706 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group__6__Impl_in_rule__XIssueExpression__Group__615737 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6__0_in_rule__XIssueExpression__Group__6__Impl15764 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3__0__Impl_in_rule__XIssueExpression__Group_3__015809 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3__1_in_rule__XIssueExpression__Group_3__015812 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_25_in_rule__XIssueExpression__Group_3__0__Impl15841 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3__1__Impl_in_rule__XIssueExpression__Group_3__115873 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3__2_in_rule__XIssueExpression__Group_3__115876 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Alternatives_3_1_in_rule__XIssueExpression__Group_3__1__Impl15903 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3__2__Impl_in_rule__XIssueExpression__Group_3__215933 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_2__0_in_rule__XIssueExpression__Group_3__2__Impl15960 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_1_0__0__Impl_in_rule__XIssueExpression__Group_3_1_0__015997 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_1_0__1_in_rule__XIssueExpression__Group_3_1_0__016000 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_77_in_rule__XIssueExpression__Group_3_1_0__0__Impl16029 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_1_0__1__Impl_in_rule__XIssueExpression__Group_3_1_0__116061 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1_in_rule__XIssueExpression__Group_3_1_0__1__Impl16088 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_1_1__0__Impl_in_rule__XIssueExpression__Group_3_1_1__016122 = new BitSet(new long[]{0x0000000000000000L,0x0000000000002000L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_1_1__1_in_rule__XIssueExpression__Group_3_1_1__016125 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0_in_rule__XIssueExpression__Group_3_1_1__0__Impl16152 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_1_1__1__Impl_in_rule__XIssueExpression__Group_3_1_1__116182 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_1_1_1__0_in_rule__XIssueExpression__Group_3_1_1__1__Impl16209 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_1_1_1__0__Impl_in_rule__XIssueExpression__Group_3_1_1_1__016244 = new BitSet(new long[]{0x0000000FFFFF0010L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_1_1_1__1_in_rule__XIssueExpression__Group_3_1_1_1__016247 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_77_in_rule__XIssueExpression__Group_3_1_1_1__0__Impl16276 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_1_1_1__1__Impl_in_rule__XIssueExpression__Group_3_1_1_1__116308 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1_in_rule__XIssueExpression__Group_3_1_1_1__1__Impl16335 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_2__0__Impl_in_rule__XIssueExpression__Group_3_2__016369 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_2__1_in_rule__XIssueExpression__Group_3_2__016372 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_78_in_rule__XIssueExpression__Group_3_2__0__Impl16401 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_2__1__Impl_in_rule__XIssueExpression__Group_3_2__116433 = new BitSet(new long[]{0x0000000000000000L,0x0000000000008000L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_2__2_in_rule__XIssueExpression__Group_3_2__116436 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__MarkerIndexAssignment_3_2_1_in_rule__XIssueExpression__Group_3_2__1__Impl16463 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_2__2__Impl_in_rule__XIssueExpression__Group_3_2__216493 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_79_in_rule__XIssueExpression__Group_3_2__2__Impl16521 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_4__0__Impl_in_rule__XIssueExpression__Group_4__016558 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_4__1_in_rule__XIssueExpression__Group_4__016561 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_rule__XIssueExpression__Group_4__0__Impl16590 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_4__1__Impl_in_rule__XIssueExpression__Group_4__116622 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__MessageAssignment_4_1_in_rule__XIssueExpression__Group_4__1__Impl16649 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5__0__Impl_in_rule__XIssueExpression__Group_5__016683 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5__1_in_rule__XIssueExpression__Group_5__016686 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_rule__XIssueExpression__Group_5__0__Impl16715 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5__1__Impl_in_rule__XIssueExpression__Group_5__116747 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5__2_in_rule__XIssueExpression__Group_5__116750 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__XIssueExpression__Group_5__1__Impl16778 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5__2__Impl_in_rule__XIssueExpression__Group_5__216809 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000600L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5__3_in_rule__XIssueExpression__Group_5__216812 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__MessageParametersAssignment_5_2_in_rule__XIssueExpression__Group_5__2__Impl16839 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5__3__Impl_in_rule__XIssueExpression__Group_5__316869 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000600L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5__4_in_rule__XIssueExpression__Group_5__316872 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5_3__0_in_rule__XIssueExpression__Group_5__3__Impl16899 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5__4__Impl_in_rule__XIssueExpression__Group_5__416930 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__XIssueExpression__Group_5__4__Impl16958 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5_3__0__Impl_in_rule__XIssueExpression__Group_5_3__016999 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5_3__1_in_rule__XIssueExpression__Group_5_3__017002 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XIssueExpression__Group_5_3__0__Impl17031 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5_3__1__Impl_in_rule__XIssueExpression__Group_5_3__117063 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__MessageParametersAssignment_5_3_1_in_rule__XIssueExpression__Group_5_3__1__Impl17090 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6__0__Impl_in_rule__XIssueExpression__Group_6__017124 = new BitSet(new long[]{0x0000000000000010L,0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6__1_in_rule__XIssueExpression__Group_6__017127 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__XIssueExpression__Group_6__0__Impl17156 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6__1__Impl_in_rule__XIssueExpression__Group_6__117188 = new BitSet(new long[]{0x0000000000000010L,0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6__2_in_rule__XIssueExpression__Group_6__117191 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__IssueCodeAssignment_6_1_in_rule__XIssueExpression__Group_6__1__Impl17218 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6__2__Impl_in_rule__XIssueExpression__Group_6__217249 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6__3_in_rule__XIssueExpression__Group_6__217252 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__XIssueExpression__Group_6__2__Impl17280 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6__3__Impl_in_rule__XIssueExpression__Group_6__317311 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000600L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6__4_in_rule__XIssueExpression__Group_6__317314 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__IssueDataAssignment_6_3_in_rule__XIssueExpression__Group_6__3__Impl17341 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6__4__Impl_in_rule__XIssueExpression__Group_6__417371 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000600L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6__5_in_rule__XIssueExpression__Group_6__417374 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6_4__0_in_rule__XIssueExpression__Group_6__4__Impl17401 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6__5__Impl_in_rule__XIssueExpression__Group_6__517432 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__XIssueExpression__Group_6__5__Impl17460 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6_4__0__Impl_in_rule__XIssueExpression__Group_6_4__017503 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6_4__1_in_rule__XIssueExpression__Group_6_4__017506 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XIssueExpression__Group_6_4__0__Impl17535 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6_4__1__Impl_in_rule__XIssueExpression__Group_6_4__117567 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__IssueDataAssignment_6_4_1_in_rule__XIssueExpression__Group_6_4__1__Impl17594 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group__0__Impl_in_rule__XAnnotation__Group__017628 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000800L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group__1_in_rule__XAnnotation__Group__017631 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group__1__Impl_in_rule__XAnnotation__Group__117689 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group__2_in_rule__XAnnotation__Group__117692 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_75_in_rule__XAnnotation__Group__1__Impl17720 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group__2__Impl_in_rule__XAnnotation__Group__217751 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group__3_in_rule__XAnnotation__Group__217754 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__AnnotationTypeAssignment_2_in_rule__XAnnotation__Group__2__Impl17781 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group__3__Impl_in_rule__XAnnotation__Group__317811 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3__0_in_rule__XAnnotation__Group__3__Impl17838 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3__0__Impl_in_rule__XAnnotation__Group_3__017877 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536B56L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3__1_in_rule__XAnnotation__Group_3__017880 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__XAnnotation__Group_3__0__Impl17909 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3__1__Impl_in_rule__XAnnotation__Group_3__117941 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536B56L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3__2_in_rule__XAnnotation__Group_3__117944 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Alternatives_3_1_in_rule__XAnnotation__Group_3__1__Impl17971 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3__2__Impl_in_rule__XAnnotation__Group_3__218002 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__XAnnotation__Group_3__2__Impl18030 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3_1_0__0__Impl_in_rule__XAnnotation__Group_3_1_0__018067 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3_1_0__1_in_rule__XAnnotation__Group_3_1_0__018070 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0_in_rule__XAnnotation__Group_3_1_0__0__Impl18097 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3_1_0__1__Impl_in_rule__XAnnotation__Group_3_1_0__118127 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3_1_0_1__0_in_rule__XAnnotation__Group_3_1_0__1__Impl18154 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3_1_0_1__0__Impl_in_rule__XAnnotation__Group_3_1_0_1__018189 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3_1_0_1__1_in_rule__XAnnotation__Group_3_1_0_1__018192 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XAnnotation__Group_3_1_0_1__0__Impl18220 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3_1_0_1__1__Impl_in_rule__XAnnotation__Group_3_1_0_1__118251 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1_in_rule__XAnnotation__Group_3_1_0_1__1__Impl18278 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__Group__0__Impl_in_rule__XAnnotationElementValuePair__Group__018312 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536956L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__Group__1_in_rule__XAnnotationElementValuePair__Group__018315 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__Group_0__0_in_rule__XAnnotationElementValuePair__Group__0__Impl18342 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__Group__1__Impl_in_rule__XAnnotationElementValuePair__Group__118372 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__ValueAssignment_1_in_rule__XAnnotationElementValuePair__Group__1__Impl18399 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__Group_0__0__Impl_in_rule__XAnnotationElementValuePair__Group_0__018433 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__Group_0_0__0_in_rule__XAnnotationElementValuePair__Group_0__0__Impl18460 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__Group_0_0__0__Impl_in_rule__XAnnotationElementValuePair__Group_0_0__018492 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__Group_0_0__1_in_rule__XAnnotationElementValuePair__Group_0_0__018495 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__ElementAssignment_0_0_0_in_rule__XAnnotationElementValuePair__Group_0_0__0__Impl18522 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__Group_0_0__1__Impl_in_rule__XAnnotationElementValuePair__Group_0_0__118552 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_13_in_rule__XAnnotationElementValuePair__Group_0_0__1__Impl18580 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0__018615 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC53E956L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__1_in_rule__XAnnotationElementValueOrCommaList__Group_0__018618 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0__0_in_rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl18645 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0__118675 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC53E956L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__2_in_rule__XAnnotationElementValueOrCommaList__Group_0__118678 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1__0_in_rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl18705 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0__218736 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_79_in_rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl18764 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_0__018801 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0_in_rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl18828 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__018860 = new BitSet(new long[]{0x0000000000000000L,0x0000000000002000L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__018863 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__118921 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__118924 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_77_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl18952 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__218983 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_78_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl19011 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_1__019048 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1__1_in_rule__XAnnotationElementValueOrCommaList__Group_0_1__019051 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0_in_rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl19078 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_1__119108 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0_in_rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl19135 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__019170 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536956L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1_in_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__019173 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl19201 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__119232 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1_in_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl19259 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1__019293 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1__1_in_rule__XAnnotationElementValueOrCommaList__Group_1__019296 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl19323 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1__119352 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1__0_in_rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl19379 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1_1__019414 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1__1_in_rule__XAnnotationElementValueOrCommaList__Group_1_1__019417 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1_1__119475 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0_in_rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl19504 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0_in_rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl19516 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__019553 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536956L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1_in_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__019556 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl19584 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__119615 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1_in_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl19642 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0__0__Impl_in_rule__XAnnotationElementValue__Group_0__019676 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC53E956L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0__1_in_rule__XAnnotationElementValue__Group_0__019679 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_0__0_in_rule__XAnnotationElementValue__Group_0__0__Impl19706 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0__1__Impl_in_rule__XAnnotationElementValue__Group_0__119736 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC53E956L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0__2_in_rule__XAnnotationElementValue__Group_0__119739 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_1__0_in_rule__XAnnotationElementValue__Group_0__1__Impl19766 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0__2__Impl_in_rule__XAnnotationElementValue__Group_0__219797 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_79_in_rule__XAnnotationElementValue__Group_0__2__Impl19825 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_0__0__Impl_in_rule__XAnnotationElementValue__Group_0_0__019862 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__0_in_rule__XAnnotationElementValue__Group_0_0__0__Impl19889 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__0__Impl_in_rule__XAnnotationElementValue__Group_0_0_0__019921 = new BitSet(new long[]{0x0000000000000000L,0x0000000000002000L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__1_in_rule__XAnnotationElementValue__Group_0_0_0__019924 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__1__Impl_in_rule__XAnnotationElementValue__Group_0_0_0__119982 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__2_in_rule__XAnnotationElementValue__Group_0_0_0__119985 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_77_in_rule__XAnnotationElementValue__Group_0_0_0__1__Impl20013 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__2__Impl_in_rule__XAnnotationElementValue__Group_0_0_0__220044 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_78_in_rule__XAnnotationElementValue__Group_0_0_0__2__Impl20072 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_1__0__Impl_in_rule__XAnnotationElementValue__Group_0_1__020109 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_1__1_in_rule__XAnnotationElementValue__Group_0_1__020112 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__ElementsAssignment_0_1_0_in_rule__XAnnotationElementValue__Group_0_1__0__Impl20139 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_1__1__Impl_in_rule__XAnnotationElementValue__Group_0_1__120169 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_1_1__0_in_rule__XAnnotationElementValue__Group_0_1__1__Impl20196 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_1_1__0__Impl_in_rule__XAnnotationElementValue__Group_0_1_1__020231 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536956L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_1_1__1_in_rule__XAnnotationElementValue__Group_0_1_1__020234 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XAnnotationElementValue__Group_0_1_1__0__Impl20262 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_1_1__1__Impl_in_rule__XAnnotationElementValue__Group_0_1_1__120293 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1_in_rule__XAnnotationElementValue__Group_0_1_1__1__Impl20320 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_0__0__Impl_in_rule__XAssignment__Group_0__020354 = new BitSet(new long[]{0x0000000FFFFF0010L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_0__1_in_rule__XAssignment__Group_0__020357 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_0__1__Impl_in_rule__XAssignment__Group_0__120415 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_0__2_in_rule__XAssignment__Group_0__120418 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__FeatureAssignment_0_1_in_rule__XAssignment__Group_0__1__Impl20445 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_0__2__Impl_in_rule__XAssignment__Group_0__220475 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_0__3_in_rule__XAssignment__Group_0__220478 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpSingleAssign_in_rule__XAssignment__Group_0__2__Impl20505 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_0__3__Impl_in_rule__XAssignment__Group_0__320534 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__ValueAssignment_0_3_in_rule__XAssignment__Group_0__3__Impl20561 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1__0__Impl_in_rule__XAssignment__Group_1__020599 = new BitSet(new long[]{0x0000C1F000000000L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1__1_in_rule__XAssignment__Group_1__020602 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXOrExpression_in_rule__XAssignment__Group_1__0__Impl20629 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1__1__Impl_in_rule__XAssignment__Group_1__120658 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1__0_in_rule__XAssignment__Group_1__1__Impl20685 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1__0__Impl_in_rule__XAssignment__Group_1_1__020720 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1__1_in_rule__XAssignment__Group_1_1__020723 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1_0__0_in_rule__XAssignment__Group_1_1__0__Impl20750 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1__1__Impl_in_rule__XAssignment__Group_1_1__120780 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__RightOperandAssignment_1_1_1_in_rule__XAssignment__Group_1_1__1__Impl20807 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1_0__0__Impl_in_rule__XAssignment__Group_1_1_0__020841 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1_0_0__0_in_rule__XAssignment__Group_1_1_0__0__Impl20868 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1_0_0__0__Impl_in_rule__XAssignment__Group_1_1_0_0__020900 = new BitSet(new long[]{0x0000C1F000000000L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1_0_0__1_in_rule__XAssignment__Group_1_1_0_0__020903 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1_0_0__1__Impl_in_rule__XAssignment__Group_1_1_0_0__120961 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__FeatureAssignment_1_1_0_0_1_in_rule__XAssignment__Group_1_1_0_0__1__Impl20988 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_5__0__Impl_in_rule__OpMultiAssign__Group_5__021022 = new BitSet(new long[]{0x0000800000000000L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_5__1_in_rule__OpMultiAssign__Group_5__021025 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__OpMultiAssign__Group_5__0__Impl21053 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_5__1__Impl_in_rule__OpMultiAssign__Group_5__121084 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_5__2_in_rule__OpMultiAssign__Group_5__121087 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__OpMultiAssign__Group_5__1__Impl21115 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_5__2__Impl_in_rule__OpMultiAssign__Group_5__221146 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_13_in_rule__OpMultiAssign__Group_5__2__Impl21174 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_6__0__Impl_in_rule__OpMultiAssign__Group_6__021211 = new BitSet(new long[]{0x0000600000000000L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_6__1_in_rule__OpMultiAssign__Group_6__021214 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rule__OpMultiAssign__Group_6__0__Impl21242 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_6__1__Impl_in_rule__OpMultiAssign__Group_6__121273 = new BitSet(new long[]{0x0000600000000000L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_6__2_in_rule__OpMultiAssign__Group_6__121276 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rule__OpMultiAssign__Group_6__1__Impl21305 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_6__2__Impl_in_rule__OpMultiAssign__Group_6__221338 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_45_in_rule__OpMultiAssign__Group_6__2__Impl21366 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group__0__Impl_in_rule__XOrExpression__Group__021403 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group__1_in_rule__XOrExpression__Group__021406 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAndExpression_in_rule__XOrExpression__Group__0__Impl21433 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group__1__Impl_in_rule__XOrExpression__Group__121462 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1__0_in_rule__XOrExpression__Group__1__Impl21489 = new BitSet(new long[]{0x0000000000004002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1__0__Impl_in_rule__XOrExpression__Group_1__021524 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1__1_in_rule__XOrExpression__Group_1__021527 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1_0__0_in_rule__XOrExpression__Group_1__0__Impl21554 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1__1__Impl_in_rule__XOrExpression__Group_1__121584 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__RightOperandAssignment_1_1_in_rule__XOrExpression__Group_1__1__Impl21611 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1_0__0__Impl_in_rule__XOrExpression__Group_1_0__021645 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1_0_0__0_in_rule__XOrExpression__Group_1_0__0__Impl21672 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1_0_0__0__Impl_in_rule__XOrExpression__Group_1_0_0__021704 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1_0_0__1_in_rule__XOrExpression__Group_1_0_0__021707 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1_0_0__1__Impl_in_rule__XOrExpression__Group_1_0_0__121765 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__FeatureAssignment_1_0_0_1_in_rule__XOrExpression__Group_1_0_0__1__Impl21792 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group__0__Impl_in_rule__XAndExpression__Group__021826 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group__1_in_rule__XAndExpression__Group__021829 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXEqualityExpression_in_rule__XAndExpression__Group__0__Impl21856 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group__1__Impl_in_rule__XAndExpression__Group__121885 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1__0_in_rule__XAndExpression__Group__1__Impl21912 = new BitSet(new long[]{0x0000000000008002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1__0__Impl_in_rule__XAndExpression__Group_1__021947 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1__1_in_rule__XAndExpression__Group_1__021950 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1_0__0_in_rule__XAndExpression__Group_1__0__Impl21977 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1__1__Impl_in_rule__XAndExpression__Group_1__122007 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__RightOperandAssignment_1_1_in_rule__XAndExpression__Group_1__1__Impl22034 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1_0__0__Impl_in_rule__XAndExpression__Group_1_0__022068 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1_0_0__0_in_rule__XAndExpression__Group_1_0__0__Impl22095 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1_0_0__0__Impl_in_rule__XAndExpression__Group_1_0_0__022127 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1_0_0__1_in_rule__XAndExpression__Group_1_0_0__022130 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1_0_0__1__Impl_in_rule__XAndExpression__Group_1_0_0__122188 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__FeatureAssignment_1_0_0_1_in_rule__XAndExpression__Group_1_0_0__1__Impl22215 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group__0__Impl_in_rule__XEqualityExpression__Group__022249 = new BitSet(new long[]{0x00001E0000000000L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group__1_in_rule__XEqualityExpression__Group__022252 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXRelationalExpression_in_rule__XEqualityExpression__Group__0__Impl22279 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group__1__Impl_in_rule__XEqualityExpression__Group__122308 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1__0_in_rule__XEqualityExpression__Group__1__Impl22335 = new BitSet(new long[]{0x00001E0000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1__0__Impl_in_rule__XEqualityExpression__Group_1__022370 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1__1_in_rule__XEqualityExpression__Group_1__022373 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1_0__0_in_rule__XEqualityExpression__Group_1__0__Impl22400 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1__1__Impl_in_rule__XEqualityExpression__Group_1__122430 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__RightOperandAssignment_1_1_in_rule__XEqualityExpression__Group_1__1__Impl22457 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1_0__0__Impl_in_rule__XEqualityExpression__Group_1_0__022491 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1_0_0__0_in_rule__XEqualityExpression__Group_1_0__0__Impl22518 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1_0_0__0__Impl_in_rule__XEqualityExpression__Group_1_0_0__022550 = new BitSet(new long[]{0x00001E0000000000L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1_0_0__1_in_rule__XEqualityExpression__Group_1_0_0__022553 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1_0_0__1__Impl_in_rule__XEqualityExpression__Group_1_0_0__122611 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__FeatureAssignment_1_0_0_1_in_rule__XEqualityExpression__Group_1_0_0__1__Impl22638 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group__0__Impl_in_rule__XRelationalExpression__Group__022672 = new BitSet(new long[]{0x0000E00000000000L,0x0000000000040000L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group__1_in_rule__XRelationalExpression__Group__022675 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXOtherOperatorExpression_in_rule__XRelationalExpression__Group__0__Impl22702 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group__1__Impl_in_rule__XRelationalExpression__Group__122731 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Alternatives_1_in_rule__XRelationalExpression__Group__1__Impl22758 = new BitSet(new long[]{0x0000E00000000002L,0x0000000000040000L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0__0__Impl_in_rule__XRelationalExpression__Group_1_0__022793 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0__1_in_rule__XRelationalExpression__Group_1_0__022796 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0_0__0_in_rule__XRelationalExpression__Group_1_0__0__Impl22823 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0__1__Impl_in_rule__XRelationalExpression__Group_1_0__122853 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__TypeAssignment_1_0_1_in_rule__XRelationalExpression__Group_1_0__1__Impl22880 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0_0__0__Impl_in_rule__XRelationalExpression__Group_1_0_0__022914 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0_0_0__0_in_rule__XRelationalExpression__Group_1_0_0__0__Impl22941 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0_0_0__0__Impl_in_rule__XRelationalExpression__Group_1_0_0_0__022973 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0_0_0__1_in_rule__XRelationalExpression__Group_1_0_0_0__022976 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0_0_0__1__Impl_in_rule__XRelationalExpression__Group_1_0_0_0__123034 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_82_in_rule__XRelationalExpression__Group_1_0_0_0__1__Impl23062 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1__0__Impl_in_rule__XRelationalExpression__Group_1_1__023097 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1__1_in_rule__XRelationalExpression__Group_1_1__023100 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1_0__0_in_rule__XRelationalExpression__Group_1_1__0__Impl23127 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1__1__Impl_in_rule__XRelationalExpression__Group_1_1__123157 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__RightOperandAssignment_1_1_1_in_rule__XRelationalExpression__Group_1_1__1__Impl23184 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1_0__0__Impl_in_rule__XRelationalExpression__Group_1_1_0__023218 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1_0_0__0_in_rule__XRelationalExpression__Group_1_1_0__0__Impl23245 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1_0_0__0__Impl_in_rule__XRelationalExpression__Group_1_1_0_0__023277 = new BitSet(new long[]{0x0000E00000000000L,0x0000000000040000L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1_0_0__1_in_rule__XRelationalExpression__Group_1_1_0_0__023280 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1_0_0__1__Impl_in_rule__XRelationalExpression__Group_1_1_0_0__123338 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1_in_rule__XRelationalExpression__Group_1_1_0_0__1__Impl23365 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpCompare__Group_1__0__Impl_in_rule__OpCompare__Group_1__023399 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_rule__OpCompare__Group_1__1_in_rule__OpCompare__Group_1__023402 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__OpCompare__Group_1__0__Impl23430 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpCompare__Group_1__1__Impl_in_rule__OpCompare__Group_1__123461 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_13_in_rule__OpCompare__Group_1__1__Impl23489 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group__0__Impl_in_rule__XOtherOperatorExpression__Group__023524 = new BitSet(new long[]{0x003FC00000000000L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group__1_in_rule__XOtherOperatorExpression__Group__023527 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAdditiveExpression_in_rule__XOtherOperatorExpression__Group__0__Impl23554 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group__1__Impl_in_rule__XOtherOperatorExpression__Group__123583 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1__0_in_rule__XOtherOperatorExpression__Group__1__Impl23610 = new BitSet(new long[]{0x003FC00000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1__0__Impl_in_rule__XOtherOperatorExpression__Group_1__023645 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1__1_in_rule__XOtherOperatorExpression__Group_1__023648 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1_0__0_in_rule__XOtherOperatorExpression__Group_1__0__Impl23675 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1__1__Impl_in_rule__XOtherOperatorExpression__Group_1__123705 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__RightOperandAssignment_1_1_in_rule__XOtherOperatorExpression__Group_1__1__Impl23732 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1_0__0__Impl_in_rule__XOtherOperatorExpression__Group_1_0__023766 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1_0_0__0_in_rule__XOtherOperatorExpression__Group_1_0__0__Impl23793 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1_0_0__0__Impl_in_rule__XOtherOperatorExpression__Group_1_0_0__023825 = new BitSet(new long[]{0x003FC00000000000L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1_0_0__1_in_rule__XOtherOperatorExpression__Group_1_0_0__023828 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1_0_0__1__Impl_in_rule__XOtherOperatorExpression__Group_1_0_0__123886 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1_in_rule__XOtherOperatorExpression__Group_1_0_0__1__Impl23913 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_2__0__Impl_in_rule__OpOther__Group_2__023947 = new BitSet(new long[]{0x0004000000000000L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_2__1_in_rule__OpOther__Group_2__023950 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rule__OpOther__Group_2__0__Impl23978 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_2__1__Impl_in_rule__OpOther__Group_2__124009 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_50_in_rule__OpOther__Group_2__1__Impl24037 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_5__0__Impl_in_rule__OpOther__Group_5__024072 = new BitSet(new long[]{0x0000400000000000L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_5__1_in_rule__OpOther__Group_5__024075 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rule__OpOther__Group_5__0__Impl24103 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_5__1__Impl_in_rule__OpOther__Group_5__124134 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Alternatives_5_1_in_rule__OpOther__Group_5__1__Impl24161 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_5_1_0__0__Impl_in_rule__OpOther__Group_5_1_0__024195 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_5_1_0_0__0_in_rule__OpOther__Group_5_1_0__0__Impl24222 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_5_1_0_0__0__Impl_in_rule__OpOther__Group_5_1_0_0__024254 = new BitSet(new long[]{0x0000400000000000L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_5_1_0_0__1_in_rule__OpOther__Group_5_1_0_0__024257 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rule__OpOther__Group_5_1_0_0__0__Impl24285 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_5_1_0_0__1__Impl_in_rule__OpOther__Group_5_1_0_0__124316 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rule__OpOther__Group_5_1_0_0__1__Impl24344 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_6__0__Impl_in_rule__OpOther__Group_6__024379 = new BitSet(new long[]{0x0008800000000000L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_6__1_in_rule__OpOther__Group_6__024382 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__OpOther__Group_6__0__Impl24410 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_6__1__Impl_in_rule__OpOther__Group_6__124441 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Alternatives_6_1_in_rule__OpOther__Group_6__1__Impl24468 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_6_1_0__0__Impl_in_rule__OpOther__Group_6_1_0__024502 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_6_1_0_0__0_in_rule__OpOther__Group_6_1_0__0__Impl24529 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_6_1_0_0__0__Impl_in_rule__OpOther__Group_6_1_0_0__024561 = new BitSet(new long[]{0x0000800000000000L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_6_1_0_0__1_in_rule__OpOther__Group_6_1_0_0__024564 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__OpOther__Group_6_1_0_0__0__Impl24592 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_6_1_0_0__1__Impl_in_rule__OpOther__Group_6_1_0_0__124623 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__OpOther__Group_6_1_0_0__1__Impl24651 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group__0__Impl_in_rule__XAdditiveExpression__Group__024686 = new BitSet(new long[]{0x00C0000000000000L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group__1_in_rule__XAdditiveExpression__Group__024689 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXMultiplicativeExpression_in_rule__XAdditiveExpression__Group__0__Impl24716 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group__1__Impl_in_rule__XAdditiveExpression__Group__124745 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1__0_in_rule__XAdditiveExpression__Group__1__Impl24772 = new BitSet(new long[]{0x00C0000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1__0__Impl_in_rule__XAdditiveExpression__Group_1__024807 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1__1_in_rule__XAdditiveExpression__Group_1__024810 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1_0__0_in_rule__XAdditiveExpression__Group_1__0__Impl24837 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1__1__Impl_in_rule__XAdditiveExpression__Group_1__124867 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__RightOperandAssignment_1_1_in_rule__XAdditiveExpression__Group_1__1__Impl24894 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1_0__0__Impl_in_rule__XAdditiveExpression__Group_1_0__024928 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1_0_0__0_in_rule__XAdditiveExpression__Group_1_0__0__Impl24955 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1_0_0__0__Impl_in_rule__XAdditiveExpression__Group_1_0_0__024987 = new BitSet(new long[]{0x00C0000000000000L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1_0_0__1_in_rule__XAdditiveExpression__Group_1_0_0__024990 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1_0_0__1__Impl_in_rule__XAdditiveExpression__Group_1_0_0__125048 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__FeatureAssignment_1_0_0_1_in_rule__XAdditiveExpression__Group_1_0_0__1__Impl25075 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group__0__Impl_in_rule__XMultiplicativeExpression__Group__025109 = new BitSet(new long[]{0x0F00000000000000L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group__1_in_rule__XMultiplicativeExpression__Group__025112 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXUnaryOperation_in_rule__XMultiplicativeExpression__Group__0__Impl25139 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group__1__Impl_in_rule__XMultiplicativeExpression__Group__125168 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1__0_in_rule__XMultiplicativeExpression__Group__1__Impl25195 = new BitSet(new long[]{0x0F00000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1__0__Impl_in_rule__XMultiplicativeExpression__Group_1__025230 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1__1_in_rule__XMultiplicativeExpression__Group_1__025233 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1_0__0_in_rule__XMultiplicativeExpression__Group_1__0__Impl25260 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1__1__Impl_in_rule__XMultiplicativeExpression__Group_1__125290 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__RightOperandAssignment_1_1_in_rule__XMultiplicativeExpression__Group_1__1__Impl25317 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1_0__0__Impl_in_rule__XMultiplicativeExpression__Group_1_0__025351 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1_0_0__0_in_rule__XMultiplicativeExpression__Group_1_0__0__Impl25378 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1_0_0__0__Impl_in_rule__XMultiplicativeExpression__Group_1_0_0__025410 = new BitSet(new long[]{0x0F00000000000000L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1_0_0__1_in_rule__XMultiplicativeExpression__Group_1_0_0__025413 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1_0_0__1__Impl_in_rule__XMultiplicativeExpression__Group_1_0_0__125471 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1_in_rule__XMultiplicativeExpression__Group_1_0_0__1__Impl25498 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XUnaryOperation__Group_0__0__Impl_in_rule__XUnaryOperation__Group_0__025532 = new BitSet(new long[]{0x10C0000000000000L});
-    public static final BitSet FOLLOW_rule__XUnaryOperation__Group_0__1_in_rule__XUnaryOperation__Group_0__025535 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XUnaryOperation__Group_0__1__Impl_in_rule__XUnaryOperation__Group_0__125593 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XUnaryOperation__Group_0__2_in_rule__XUnaryOperation__Group_0__125596 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XUnaryOperation__FeatureAssignment_0_1_in_rule__XUnaryOperation__Group_0__1__Impl25623 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XUnaryOperation__Group_0__2__Impl_in_rule__XUnaryOperation__Group_0__225653 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XUnaryOperation__OperandAssignment_0_2_in_rule__XUnaryOperation__Group_0__2__Impl25680 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group__0__Impl_in_rule__XCastedExpression__Group__025716 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group__1_in_rule__XCastedExpression__Group__025719 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXPostfixOperation_in_rule__XCastedExpression__Group__0__Impl25746 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group__1__Impl_in_rule__XCastedExpression__Group__125775 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1__0_in_rule__XCastedExpression__Group__1__Impl25802 = new BitSet(new long[]{0x0000000000000002L,0x0000000000080000L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1__0__Impl_in_rule__XCastedExpression__Group_1__025837 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1__1_in_rule__XCastedExpression__Group_1__025840 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1_0__0_in_rule__XCastedExpression__Group_1__0__Impl25867 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1__1__Impl_in_rule__XCastedExpression__Group_1__125897 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__TypeAssignment_1_1_in_rule__XCastedExpression__Group_1__1__Impl25924 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1_0__0__Impl_in_rule__XCastedExpression__Group_1_0__025958 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1_0_0__0_in_rule__XCastedExpression__Group_1_0__0__Impl25985 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1_0_0__0__Impl_in_rule__XCastedExpression__Group_1_0_0__026017 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1_0_0__1_in_rule__XCastedExpression__Group_1_0_0__026020 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1_0_0__1__Impl_in_rule__XCastedExpression__Group_1_0_0__126078 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_83_in_rule__XCastedExpression__Group_1_0_0__1__Impl26106 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group__0__Impl_in_rule__XPostfixOperation__Group__026141 = new BitSet(new long[]{0x6000000000000000L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group__1_in_rule__XPostfixOperation__Group__026144 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXMemberFeatureCall_in_rule__XPostfixOperation__Group__0__Impl26171 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group__1__Impl_in_rule__XPostfixOperation__Group__126200 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group_1__0_in_rule__XPostfixOperation__Group__1__Impl26227 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group_1__0__Impl_in_rule__XPostfixOperation__Group_1__026262 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group_1_0__0_in_rule__XPostfixOperation__Group_1__0__Impl26289 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group_1_0__0__Impl_in_rule__XPostfixOperation__Group_1_0__026321 = new BitSet(new long[]{0x6000000000000000L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group_1_0__1_in_rule__XPostfixOperation__Group_1_0__026324 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group_1_0__1__Impl_in_rule__XPostfixOperation__Group_1_0__126382 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__FeatureAssignment_1_0_1_in_rule__XPostfixOperation__Group_1_0__1__Impl26409 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group__0__Impl_in_rule__XMemberFeatureCall__Group__026443 = new BitSet(new long[]{0x8000000000000000L,0x0000030000000000L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group__1_in_rule__XMemberFeatureCall__Group__026446 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXPrimaryExpression_in_rule__XMemberFeatureCall__Group__0__Impl26473 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group__1__Impl_in_rule__XMemberFeatureCall__Group__126502 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Alternatives_1_in_rule__XMemberFeatureCall__Group__1__Impl26529 = new BitSet(new long[]{0x8000000000000002L,0x0000030000000000L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_0__026564 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0__1_in_rule__XMemberFeatureCall__Group_1_0__026567 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0__0_in_rule__XMemberFeatureCall__Group_1_0__0__Impl26594 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0__1__Impl_in_rule__XMemberFeatureCall__Group_1_0__126624 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__ValueAssignment_1_0_1_in_rule__XMemberFeatureCall__Group_1_0__1__Impl26651 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_0_0__026685 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__0_in_rule__XMemberFeatureCall__Group_1_0_0__0__Impl26712 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_0_0_0__026744 = new BitSet(new long[]{0x8000000000000000L,0x0000010000000000L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__1_in_rule__XMemberFeatureCall__Group_1_0_0_0__026747 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl_in_rule__XMemberFeatureCall__Group_1_0_0_0__126805 = new BitSet(new long[]{0x0000000FFFFF0010L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__2_in_rule__XMemberFeatureCall__Group_1_0_0_0__126808 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Alternatives_1_0_0_0_1_in_rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl26835 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl_in_rule__XMemberFeatureCall__Group_1_0_0_0__226865 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__3_in_rule__XMemberFeatureCall__Group_1_0_0_0__226868 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2_in_rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl26895 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl_in_rule__XMemberFeatureCall__Group_1_0_0_0__326925 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpSingleAssign_in_rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl26952 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__0__Impl_in_rule__XMemberFeatureCall__Group_1_1__026989 = new BitSet(new long[]{0x0000800FFFFF0010L,0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__1_in_rule__XMemberFeatureCall__Group_1_1__026992 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_0__0_in_rule__XMemberFeatureCall__Group_1_1__0__Impl27019 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__1__Impl_in_rule__XMemberFeatureCall__Group_1_1__127049 = new BitSet(new long[]{0x0000800FFFFF0010L,0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__2_in_rule__XMemberFeatureCall__Group_1_1__127052 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__0_in_rule__XMemberFeatureCall__Group_1_1__1__Impl27079 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__2__Impl_in_rule__XMemberFeatureCall__Group_1_1__227110 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004100L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__3_in_rule__XMemberFeatureCall__Group_1_1__227113 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__FeatureAssignment_1_1_2_in_rule__XMemberFeatureCall__Group_1_1__2__Impl27140 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__3__Impl_in_rule__XMemberFeatureCall__Group_1_1__327170 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004100L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__4_in_rule__XMemberFeatureCall__Group_1_1__327173 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__0_in_rule__XMemberFeatureCall__Group_1_1__3__Impl27200 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__4__Impl_in_rule__XMemberFeatureCall__Group_1_1__427231 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4_in_rule__XMemberFeatureCall__Group_1_1__4__Impl27258 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_0__027299 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_0_0__0_in_rule__XMemberFeatureCall__Group_1_1_0__0__Impl27326 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_0_0__027358 = new BitSet(new long[]{0x8000000000000000L,0x0000030000000000L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_0_0__1_in_rule__XMemberFeatureCall__Group_1_1_0_0__027361 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_0_0__127419 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Alternatives_1_1_0_0_1_in_rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl27446 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_1__027480 = new BitSet(new long[]{0x0008000FE0800010L,0x000000A000001900L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__1_in_rule__XMemberFeatureCall__Group_1_1_1__027483 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__XMemberFeatureCall__Group_1_1_1__0__Impl27511 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_1__127542 = new BitSet(new long[]{0x0000400000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__2_in_rule__XMemberFeatureCall__Group_1_1_1__127545 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1_in_rule__XMemberFeatureCall__Group_1_1_1__1__Impl27572 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__2__Impl_in_rule__XMemberFeatureCall__Group_1_1_1__227602 = new BitSet(new long[]{0x0000400000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__3_in_rule__XMemberFeatureCall__Group_1_1_1__227605 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1_2__0_in_rule__XMemberFeatureCall__Group_1_1_1__2__Impl27632 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__3__Impl_in_rule__XMemberFeatureCall__Group_1_1_1__327663 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rule__XMemberFeatureCall__Group_1_1_1__3__Impl27691 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_1_2__027730 = new BitSet(new long[]{0x0008000FE0800010L,0x000000A000001900L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1_2__1_in_rule__XMemberFeatureCall__Group_1_1_1_2__027733 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl27761 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_1_2__127792 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1_in_rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl27819 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_3__027853 = new BitSet(new long[]{0x10C8800FFFFF01F0L,0x0000148BFC537B56L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__1_in_rule__XMemberFeatureCall__Group_1_1_3__027856 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0_in_rule__XMemberFeatureCall__Group_1_1_3__0__Impl27883 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_3__127913 = new BitSet(new long[]{0x10C8800FFFFF01F0L,0x0000148BFC537B56L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__2_in_rule__XMemberFeatureCall__Group_1_1_3__127916 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Alternatives_1_1_3_1_in_rule__XMemberFeatureCall__Group_1_1_3__1__Impl27943 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__2__Impl_in_rule__XMemberFeatureCall__Group_1_1_3__227974 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__XMemberFeatureCall__Group_1_1_3__2__Impl28002 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__028039 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1__1_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__028042 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl28069 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__128099 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl28126 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__028161 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__028164 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl28192 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__128223 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl28250 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group__0__Impl_in_rule__XSetLiteral__Group__028284 = new BitSet(new long[]{0x0000000000000000L,0x0000000000002000L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group__1_in_rule__XSetLiteral__Group__028287 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group__1__Impl_in_rule__XSetLiteral__Group__128345 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group__2_in_rule__XSetLiteral__Group__128348 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_77_in_rule__XSetLiteral__Group__1__Impl28376 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group__2__Impl_in_rule__XSetLiteral__Group__228407 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536176L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group__3_in_rule__XSetLiteral__Group__228410 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_68_in_rule__XSetLiteral__Group__2__Impl28438 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group__3__Impl_in_rule__XSetLiteral__Group__328469 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536176L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group__4_in_rule__XSetLiteral__Group__328472 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group_3__0_in_rule__XSetLiteral__Group__3__Impl28499 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group__4__Impl_in_rule__XSetLiteral__Group__428530 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_69_in_rule__XSetLiteral__Group__4__Impl28558 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group_3__0__Impl_in_rule__XSetLiteral__Group_3__028599 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group_3__1_in_rule__XSetLiteral__Group_3__028602 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__ElementsAssignment_3_0_in_rule__XSetLiteral__Group_3__0__Impl28629 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group_3__1__Impl_in_rule__XSetLiteral__Group_3__128659 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group_3_1__0_in_rule__XSetLiteral__Group_3__1__Impl28686 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group_3_1__0__Impl_in_rule__XSetLiteral__Group_3_1__028721 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group_3_1__1_in_rule__XSetLiteral__Group_3_1__028724 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XSetLiteral__Group_3_1__0__Impl28752 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group_3_1__1__Impl_in_rule__XSetLiteral__Group_3_1__128783 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__ElementsAssignment_3_1_1_in_rule__XSetLiteral__Group_3_1__1__Impl28810 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group__0__Impl_in_rule__XListLiteral__Group__028844 = new BitSet(new long[]{0x0000000000000000L,0x0000000000002000L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group__1_in_rule__XListLiteral__Group__028847 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group__1__Impl_in_rule__XListLiteral__Group__128905 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group__2_in_rule__XListLiteral__Group__128908 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_77_in_rule__XListLiteral__Group__1__Impl28936 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group__2__Impl_in_rule__XListLiteral__Group__228967 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC53E156L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group__3_in_rule__XListLiteral__Group__228970 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_78_in_rule__XListLiteral__Group__2__Impl28998 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group__3__Impl_in_rule__XListLiteral__Group__329029 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC53E156L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group__4_in_rule__XListLiteral__Group__329032 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group_3__0_in_rule__XListLiteral__Group__3__Impl29059 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group__4__Impl_in_rule__XListLiteral__Group__429090 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_79_in_rule__XListLiteral__Group__4__Impl29118 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group_3__0__Impl_in_rule__XListLiteral__Group_3__029159 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group_3__1_in_rule__XListLiteral__Group_3__029162 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__ElementsAssignment_3_0_in_rule__XListLiteral__Group_3__0__Impl29189 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group_3__1__Impl_in_rule__XListLiteral__Group_3__129219 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group_3_1__0_in_rule__XListLiteral__Group_3__1__Impl29246 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group_3_1__0__Impl_in_rule__XListLiteral__Group_3_1__029281 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group_3_1__1_in_rule__XListLiteral__Group_3_1__029284 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XListLiteral__Group_3_1__0__Impl29312 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group_3_1__1__Impl_in_rule__XListLiteral__Group_3_1__129343 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__ElementsAssignment_3_1_1_in_rule__XListLiteral__Group_3_1__1__Impl29370 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group__0__Impl_in_rule__XClosure__Group__029404 = new BitSet(new long[]{0x10C8800FFFFF01F0L,0x00001C8BFC537957L});
-    public static final BitSet FOLLOW_rule__XClosure__Group__1_in_rule__XClosure__Group__029407 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_0__0_in_rule__XClosure__Group__0__Impl29434 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group__1__Impl_in_rule__XClosure__Group__129464 = new BitSet(new long[]{0x10C8800FFFFF01F0L,0x00001C8BFC537957L});
-    public static final BitSet FOLLOW_rule__XClosure__Group__2_in_rule__XClosure__Group__129467 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1__0_in_rule__XClosure__Group__1__Impl29494 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group__2__Impl_in_rule__XClosure__Group__229525 = new BitSet(new long[]{0x0000000000000000L,0x0000000000008000L});
-    public static final BitSet FOLLOW_rule__XClosure__Group__3_in_rule__XClosure__Group__229528 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__ExpressionAssignment_2_in_rule__XClosure__Group__2__Impl29555 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group__3__Impl_in_rule__XClosure__Group__329585 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_79_in_rule__XClosure__Group__3__Impl29613 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_0__0__Impl_in_rule__XClosure__Group_0__029652 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_0_0__0_in_rule__XClosure__Group_0__0__Impl29679 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_0_0__0__Impl_in_rule__XClosure__Group_0_0__029711 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_0_0__1_in_rule__XClosure__Group_0_0__029714 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_0_0__1__Impl_in_rule__XClosure__Group_0_0__129772 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_78_in_rule__XClosure__Group_0_0__1__Impl29800 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1__0__Impl_in_rule__XClosure__Group_1__029835 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0__0_in_rule__XClosure__Group_1__0__Impl29862 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0__0__Impl_in_rule__XClosure__Group_1_0__029894 = new BitSet(new long[]{0x0008000FE0800010L,0x0000048000001900L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0__1_in_rule__XClosure__Group_1_0__029897 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0_0__0_in_rule__XClosure__Group_1_0__0__Impl29924 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0__1__Impl_in_rule__XClosure__Group_1_0__129955 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__ExplicitSyntaxAssignment_1_0_1_in_rule__XClosure__Group_1_0__1__Impl29982 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0_0__0__Impl_in_rule__XClosure__Group_1_0_0__030016 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0_0__1_in_rule__XClosure__Group_1_0_0__030019 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0_in_rule__XClosure__Group_1_0_0__0__Impl30046 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0_0__1__Impl_in_rule__XClosure__Group_1_0_0__130076 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0_0_1__0_in_rule__XClosure__Group_1_0_0__1__Impl30103 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0_0_1__0__Impl_in_rule__XClosure__Group_1_0_0_1__030138 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0_0_1__1_in_rule__XClosure__Group_1_0_0_1__030141 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XClosure__Group_1_0_0_1__0__Impl30169 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0_0_1__1__Impl_in_rule__XClosure__Group_1_0_0_1__130200 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1_in_rule__XClosure__Group_1_0_0_1__1__Impl30227 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XExpressionInClosure__Group__0__Impl_in_rule__XExpressionInClosure__Group__030261 = new BitSet(new long[]{0x10C8800FFFFF01F0L,0x00001C8BFC537957L});
-    public static final BitSet FOLLOW_rule__XExpressionInClosure__Group__1_in_rule__XExpressionInClosure__Group__030264 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XExpressionInClosure__Group__1__Impl_in_rule__XExpressionInClosure__Group__130322 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XExpressionInClosure__Group_1__0_in_rule__XExpressionInClosure__Group__1__Impl30349 = new BitSet(new long[]{0x10C0800FFFFF01F2L,0x0000180BFC536157L});
-    public static final BitSet FOLLOW_rule__XExpressionInClosure__Group_1__0__Impl_in_rule__XExpressionInClosure__Group_1__030384 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XExpressionInClosure__Group_1__1_in_rule__XExpressionInClosure__Group_1__030387 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XExpressionInClosure__ExpressionsAssignment_1_0_in_rule__XExpressionInClosure__Group_1__0__Impl30414 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XExpressionInClosure__Group_1__1__Impl_in_rule__XExpressionInClosure__Group_1__130444 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__XExpressionInClosure__Group_1__1__Impl30473 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group__0__Impl_in_rule__XShortClosure__Group__030510 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group__1_in_rule__XShortClosure__Group__030513 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0__0_in_rule__XShortClosure__Group__0__Impl30540 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group__1__Impl_in_rule__XShortClosure__Group__130570 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__ExpressionAssignment_1_in_rule__XShortClosure__Group__1__Impl30597 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0__0__Impl_in_rule__XShortClosure__Group_0__030631 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0__0_in_rule__XShortClosure__Group_0__0__Impl30658 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0__0__Impl_in_rule__XShortClosure__Group_0_0__030690 = new BitSet(new long[]{0x0008000FE0800010L,0x0000048000001900L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0__1_in_rule__XShortClosure__Group_0_0__030693 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0__1__Impl_in_rule__XShortClosure__Group_0_0__130751 = new BitSet(new long[]{0x0008000FE0800010L,0x0000048000001900L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0__2_in_rule__XShortClosure__Group_0_0__130754 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0_1__0_in_rule__XShortClosure__Group_0_0__1__Impl30781 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0__2__Impl_in_rule__XShortClosure__Group_0_0__230812 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2_in_rule__XShortClosure__Group_0_0__2__Impl30839 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0_1__0__Impl_in_rule__XShortClosure__Group_0_0_1__030875 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0_1__1_in_rule__XShortClosure__Group_0_0_1__030878 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0_in_rule__XShortClosure__Group_0_0_1__0__Impl30905 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0_1__1__Impl_in_rule__XShortClosure__Group_0_0_1__130935 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0_1_1__0_in_rule__XShortClosure__Group_0_0_1__1__Impl30962 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0_1_1__0__Impl_in_rule__XShortClosure__Group_0_0_1_1__030997 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0_1_1__1_in_rule__XShortClosure__Group_0_0_1_1__031000 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XShortClosure__Group_0_0_1_1__0__Impl31028 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0_1_1__1__Impl_in_rule__XShortClosure__Group_0_0_1_1__131059 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1_in_rule__XShortClosure__Group_0_0_1_1__1__Impl31086 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XParenthesizedExpression__Group__0__Impl_in_rule__XParenthesizedExpression__Group__031120 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XParenthesizedExpression__Group__1_in_rule__XParenthesizedExpression__Group__031123 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__XParenthesizedExpression__Group__0__Impl31151 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XParenthesizedExpression__Group__1__Impl_in_rule__XParenthesizedExpression__Group__131182 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000200L});
-    public static final BitSet FOLLOW_rule__XParenthesizedExpression__Group__2_in_rule__XParenthesizedExpression__Group__131185 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XParenthesizedExpression__Group__1__Impl31212 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XParenthesizedExpression__Group__2__Impl_in_rule__XParenthesizedExpression__Group__231241 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__XParenthesizedExpression__Group__2__Impl31269 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__0__Impl_in_rule__XIfExpression__Group__031306 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__1_in_rule__XIfExpression__Group__031309 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__1__Impl_in_rule__XIfExpression__Group__131367 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__2_in_rule__XIfExpression__Group__131370 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_84_in_rule__XIfExpression__Group__1__Impl31398 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__2__Impl_in_rule__XIfExpression__Group__231429 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__3_in_rule__XIfExpression__Group__231432 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__XIfExpression__Group__2__Impl31460 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__3__Impl_in_rule__XIfExpression__Group__331491 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000200L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__4_in_rule__XIfExpression__Group__331494 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__IfAssignment_3_in_rule__XIfExpression__Group__3__Impl31521 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__4__Impl_in_rule__XIfExpression__Group__431551 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__5_in_rule__XIfExpression__Group__431554 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__XIfExpression__Group__4__Impl31582 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__5__Impl_in_rule__XIfExpression__Group__531613 = new BitSet(new long[]{0x0000000000000000L,0x0000000000200000L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__6_in_rule__XIfExpression__Group__531616 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__ThenAssignment_5_in_rule__XIfExpression__Group__5__Impl31643 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__6__Impl_in_rule__XIfExpression__Group__631673 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group_6__0_in_rule__XIfExpression__Group__6__Impl31700 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group_6__0__Impl_in_rule__XIfExpression__Group_6__031745 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group_6__1_in_rule__XIfExpression__Group_6__031748 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_85_in_rule__XIfExpression__Group_6__0__Impl31777 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group_6__1__Impl_in_rule__XIfExpression__Group_6__131809 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__ElseAssignment_6_1_in_rule__XIfExpression__Group_6__1__Impl31836 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__0__Impl_in_rule__XSwitchExpression__Group__031870 = new BitSet(new long[]{0x0000000000000000L,0x0000000000400000L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__1_in_rule__XSwitchExpression__Group__031873 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__1__Impl_in_rule__XSwitchExpression__Group__131931 = new BitSet(new long[]{0x10C8800FFFFF01F0L,0x0000108BFC537956L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__2_in_rule__XSwitchExpression__Group__131934 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_86_in_rule__XSwitchExpression__Group__1__Impl31962 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__2__Impl_in_rule__XSwitchExpression__Group__231993 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__3_in_rule__XSwitchExpression__Group__231996 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Alternatives_2_in_rule__XSwitchExpression__Group__2__Impl32023 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__3__Impl_in_rule__XSwitchExpression__Group__332053 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008003801D20L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__4_in_rule__XSwitchExpression__Group__332056 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_68_in_rule__XSwitchExpression__Group__3__Impl32084 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__4__Impl_in_rule__XSwitchExpression__Group__432115 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008003801D20L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__5_in_rule__XSwitchExpression__Group__432118 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__CasesAssignment_4_in_rule__XSwitchExpression__Group__4__Impl32145 = new BitSet(new long[]{0x0008000FE0800012L,0x0000008002801D00L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__5__Impl_in_rule__XSwitchExpression__Group__532176 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008003801D20L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__6_in_rule__XSwitchExpression__Group__532179 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_5__0_in_rule__XSwitchExpression__Group__5__Impl32206 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__6__Impl_in_rule__XSwitchExpression__Group__632237 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_69_in_rule__XSwitchExpression__Group__6__Impl32265 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0__0__Impl_in_rule__XSwitchExpression__Group_2_0__032310 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0__1_in_rule__XSwitchExpression__Group_2_0__032313 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0_0__0_in_rule__XSwitchExpression__Group_2_0__0__Impl32340 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0__1__Impl_in_rule__XSwitchExpression__Group_2_0__132370 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000200L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0__2_in_rule__XSwitchExpression__Group_2_0__132373 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__SwitchAssignment_2_0_1_in_rule__XSwitchExpression__Group_2_0__1__Impl32400 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0__2__Impl_in_rule__XSwitchExpression__Group_2_0__232430 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__XSwitchExpression__Group_2_0__2__Impl32458 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0_0__0__Impl_in_rule__XSwitchExpression__Group_2_0_0__032495 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__0_in_rule__XSwitchExpression__Group_2_0_0__0__Impl32522 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__0__Impl_in_rule__XSwitchExpression__Group_2_0_0_0__032554 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__1_in_rule__XSwitchExpression__Group_2_0_0_0__032557 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__XSwitchExpression__Group_2_0_0_0__0__Impl32585 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__1__Impl_in_rule__XSwitchExpression__Group_2_0_0_0__132616 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__2_in_rule__XSwitchExpression__Group_2_0_0_0__132619 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1_in_rule__XSwitchExpression__Group_2_0_0_0__1__Impl32646 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__2__Impl_in_rule__XSwitchExpression__Group_2_0_0_0__232676 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_87_in_rule__XSwitchExpression__Group_2_0_0_0__2__Impl32704 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1__0__Impl_in_rule__XSwitchExpression__Group_2_1__032741 = new BitSet(new long[]{0x10C8800FFFFF01F0L,0x0000108BFC537956L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1__1_in_rule__XSwitchExpression__Group_2_1__032744 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1_0__0_in_rule__XSwitchExpression__Group_2_1__0__Impl32771 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1__1__Impl_in_rule__XSwitchExpression__Group_2_1__132802 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__SwitchAssignment_2_1_1_in_rule__XSwitchExpression__Group_2_1__1__Impl32829 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1_0__0__Impl_in_rule__XSwitchExpression__Group_2_1_0__032863 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1_0_0__0_in_rule__XSwitchExpression__Group_2_1_0__0__Impl32890 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1_0_0__0__Impl_in_rule__XSwitchExpression__Group_2_1_0_0__032922 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1_0_0__1_in_rule__XSwitchExpression__Group_2_1_0_0__032925 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0_in_rule__XSwitchExpression__Group_2_1_0_0__0__Impl32952 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1_0_0__1__Impl_in_rule__XSwitchExpression__Group_2_1_0_0__132982 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_87_in_rule__XSwitchExpression__Group_2_1_0_0__1__Impl33010 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_5__0__Impl_in_rule__XSwitchExpression__Group_5__033045 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_5__1_in_rule__XSwitchExpression__Group_5__033048 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_88_in_rule__XSwitchExpression__Group_5__0__Impl33076 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_5__1__Impl_in_rule__XSwitchExpression__Group_5__133107 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_5__2_in_rule__XSwitchExpression__Group_5__133110 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_87_in_rule__XSwitchExpression__Group_5__1__Impl33138 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_5__2__Impl_in_rule__XSwitchExpression__Group_5__233169 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__DefaultAssignment_5_2_in_rule__XSwitchExpression__Group_5__2__Impl33196 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group__0__Impl_in_rule__XCasePart__Group__033232 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008002801D00L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group__1_in_rule__XCasePart__Group__033235 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group__1__Impl_in_rule__XCasePart__Group__133293 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008002801D00L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group__2_in_rule__XCasePart__Group__133296 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__TypeGuardAssignment_1_in_rule__XCasePart__Group__1__Impl33323 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group__2__Impl_in_rule__XCasePart__Group__233354 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008002801D00L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group__3_in_rule__XCasePart__Group__233357 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group_2__0_in_rule__XCasePart__Group__2__Impl33384 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group__3__Impl_in_rule__XCasePart__Group__333415 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Alternatives_3_in_rule__XCasePart__Group__3__Impl33442 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group_2__0__Impl_in_rule__XCasePart__Group_2__033480 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group_2__1_in_rule__XCasePart__Group_2__033483 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_89_in_rule__XCasePart__Group_2__0__Impl33511 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group_2__1__Impl_in_rule__XCasePart__Group_2__133542 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__CaseAssignment_2_1_in_rule__XCasePart__Group_2__1__Impl33569 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group_3_0__0__Impl_in_rule__XCasePart__Group_3_0__033603 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group_3_0__1_in_rule__XCasePart__Group_3_0__033606 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_87_in_rule__XCasePart__Group_3_0__0__Impl33634 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group_3_0__1__Impl_in_rule__XCasePart__Group_3_0__133665 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__ThenAssignment_3_0_1_in_rule__XCasePart__Group_3_0__1__Impl33692 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group__0__Impl_in_rule__XForLoopExpression__Group__033726 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group__1_in_rule__XForLoopExpression__Group__033729 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0__0_in_rule__XForLoopExpression__Group__0__Impl33756 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group__1__Impl_in_rule__XForLoopExpression__Group__133786 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000200L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group__2_in_rule__XForLoopExpression__Group__133789 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__ForExpressionAssignment_1_in_rule__XForLoopExpression__Group__1__Impl33816 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group__2__Impl_in_rule__XForLoopExpression__Group__233846 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group__3_in_rule__XForLoopExpression__Group__233849 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__XForLoopExpression__Group__2__Impl33877 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group__3__Impl_in_rule__XForLoopExpression__Group__333908 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__EachExpressionAssignment_3_in_rule__XForLoopExpression__Group__3__Impl33935 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0__0__Impl_in_rule__XForLoopExpression__Group_0__033973 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__0_in_rule__XForLoopExpression__Group_0__0__Impl34000 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__0__Impl_in_rule__XForLoopExpression__Group_0_0__034032 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__1_in_rule__XForLoopExpression__Group_0_0__034035 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__1__Impl_in_rule__XForLoopExpression__Group_0_0__134093 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__2_in_rule__XForLoopExpression__Group_0_0__134096 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_70_in_rule__XForLoopExpression__Group_0_0__1__Impl34124 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__2__Impl_in_rule__XForLoopExpression__Group_0_0__234155 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__3_in_rule__XForLoopExpression__Group_0_0__234158 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__XForLoopExpression__Group_0_0__2__Impl34186 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__3__Impl_in_rule__XForLoopExpression__Group_0_0__334217 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__4_in_rule__XForLoopExpression__Group_0_0__334220 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__DeclaredParamAssignment_0_0_3_in_rule__XForLoopExpression__Group_0_0__3__Impl34247 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__4__Impl_in_rule__XForLoopExpression__Group_0_0__434277 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_87_in_rule__XForLoopExpression__Group_0_0__4__Impl34305 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__0__Impl_in_rule__XBasicForLoopExpression__Group__034346 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__1_in_rule__XBasicForLoopExpression__Group__034349 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__1__Impl_in_rule__XBasicForLoopExpression__Group__134407 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__2_in_rule__XBasicForLoopExpression__Group__134410 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_70_in_rule__XBasicForLoopExpression__Group__1__Impl34438 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__2__Impl_in_rule__XBasicForLoopExpression__Group__234469 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000180BFC5361D7L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__3_in_rule__XBasicForLoopExpression__Group__234472 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__XBasicForLoopExpression__Group__2__Impl34500 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__3__Impl_in_rule__XBasicForLoopExpression__Group__334531 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000180BFC5361D7L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__4_in_rule__XBasicForLoopExpression__Group__334534 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_3__0_in_rule__XBasicForLoopExpression__Group__3__Impl34561 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__4__Impl_in_rule__XBasicForLoopExpression__Group__434592 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC5361D6L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__5_in_rule__XBasicForLoopExpression__Group__434595 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__XBasicForLoopExpression__Group__4__Impl34623 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__5__Impl_in_rule__XBasicForLoopExpression__Group__534654 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC5361D6L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__6_in_rule__XBasicForLoopExpression__Group__534657 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__ExpressionAssignment_5_in_rule__XBasicForLoopExpression__Group__5__Impl34684 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__6__Impl_in_rule__XBasicForLoopExpression__Group__634715 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536356L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__7_in_rule__XBasicForLoopExpression__Group__634718 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__XBasicForLoopExpression__Group__6__Impl34746 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__7__Impl_in_rule__XBasicForLoopExpression__Group__734777 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536356L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__8_in_rule__XBasicForLoopExpression__Group__734780 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_7__0_in_rule__XBasicForLoopExpression__Group__7__Impl34807 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__8__Impl_in_rule__XBasicForLoopExpression__Group__834838 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__9_in_rule__XBasicForLoopExpression__Group__834841 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__XBasicForLoopExpression__Group__8__Impl34869 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__9__Impl_in_rule__XBasicForLoopExpression__Group__934900 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__EachExpressionAssignment_9_in_rule__XBasicForLoopExpression__Group__9__Impl34927 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_3__0__Impl_in_rule__XBasicForLoopExpression__Group_3__034977 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_3__1_in_rule__XBasicForLoopExpression__Group_3__034980 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0_in_rule__XBasicForLoopExpression__Group_3__0__Impl35007 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_3__1__Impl_in_rule__XBasicForLoopExpression__Group_3__135037 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_3_1__0_in_rule__XBasicForLoopExpression__Group_3__1__Impl35064 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_3_1__0__Impl_in_rule__XBasicForLoopExpression__Group_3_1__035099 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000180BFC536157L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_3_1__1_in_rule__XBasicForLoopExpression__Group_3_1__035102 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XBasicForLoopExpression__Group_3_1__0__Impl35130 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_3_1__1__Impl_in_rule__XBasicForLoopExpression__Group_3_1__135161 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1_in_rule__XBasicForLoopExpression__Group_3_1__1__Impl35188 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_7__0__Impl_in_rule__XBasicForLoopExpression__Group_7__035222 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_7__1_in_rule__XBasicForLoopExpression__Group_7__035225 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0_in_rule__XBasicForLoopExpression__Group_7__0__Impl35252 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_7__1__Impl_in_rule__XBasicForLoopExpression__Group_7__135282 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_7_1__0_in_rule__XBasicForLoopExpression__Group_7__1__Impl35309 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_7_1__0__Impl_in_rule__XBasicForLoopExpression__Group_7_1__035344 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_7_1__1_in_rule__XBasicForLoopExpression__Group_7_1__035347 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XBasicForLoopExpression__Group_7_1__0__Impl35375 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_7_1__1__Impl_in_rule__XBasicForLoopExpression__Group_7_1__135406 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1_in_rule__XBasicForLoopExpression__Group_7_1__1__Impl35433 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__0__Impl_in_rule__XWhileExpression__Group__035467 = new BitSet(new long[]{0x0000000000000000L,0x0000000004000000L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__1_in_rule__XWhileExpression__Group__035470 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__1__Impl_in_rule__XWhileExpression__Group__135528 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__2_in_rule__XWhileExpression__Group__135531 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_90_in_rule__XWhileExpression__Group__1__Impl35559 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__2__Impl_in_rule__XWhileExpression__Group__235590 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__3_in_rule__XWhileExpression__Group__235593 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__XWhileExpression__Group__2__Impl35621 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__3__Impl_in_rule__XWhileExpression__Group__335652 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000200L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__4_in_rule__XWhileExpression__Group__335655 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__PredicateAssignment_3_in_rule__XWhileExpression__Group__3__Impl35682 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__4__Impl_in_rule__XWhileExpression__Group__435712 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__5_in_rule__XWhileExpression__Group__435715 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__XWhileExpression__Group__4__Impl35743 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__5__Impl_in_rule__XWhileExpression__Group__535774 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__BodyAssignment_5_in_rule__XWhileExpression__Group__5__Impl35801 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__0__Impl_in_rule__XDoWhileExpression__Group__035843 = new BitSet(new long[]{0x0000000000000000L,0x0000000008000000L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__1_in_rule__XDoWhileExpression__Group__035846 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__1__Impl_in_rule__XDoWhileExpression__Group__135904 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__2_in_rule__XDoWhileExpression__Group__135907 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_91_in_rule__XDoWhileExpression__Group__1__Impl35935 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__2__Impl_in_rule__XDoWhileExpression__Group__235966 = new BitSet(new long[]{0x0000000000000000L,0x0000000004000000L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__3_in_rule__XDoWhileExpression__Group__235969 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__BodyAssignment_2_in_rule__XDoWhileExpression__Group__2__Impl35996 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__3__Impl_in_rule__XDoWhileExpression__Group__336026 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__4_in_rule__XDoWhileExpression__Group__336029 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_90_in_rule__XDoWhileExpression__Group__3__Impl36057 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__4__Impl_in_rule__XDoWhileExpression__Group__436088 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__5_in_rule__XDoWhileExpression__Group__436091 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__XDoWhileExpression__Group__4__Impl36119 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__5__Impl_in_rule__XDoWhileExpression__Group__536150 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000200L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__6_in_rule__XDoWhileExpression__Group__536153 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__PredicateAssignment_5_in_rule__XDoWhileExpression__Group__5__Impl36180 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__6__Impl_in_rule__XDoWhileExpression__Group__636210 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__XDoWhileExpression__Group__6__Impl36238 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group__0__Impl_in_rule__XBlockExpression__Group__036283 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group__1_in_rule__XBlockExpression__Group__036286 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group__1__Impl_in_rule__XBlockExpression__Group__136344 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000180BFC536177L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group__2_in_rule__XBlockExpression__Group__136347 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_68_in_rule__XBlockExpression__Group__1__Impl36375 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group__2__Impl_in_rule__XBlockExpression__Group__236406 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000180BFC536177L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group__3_in_rule__XBlockExpression__Group__236409 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group_2__0_in_rule__XBlockExpression__Group__2__Impl36436 = new BitSet(new long[]{0x10C0800FFFFF01F2L,0x0000180BFC536157L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group__3__Impl_in_rule__XBlockExpression__Group__336467 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_69_in_rule__XBlockExpression__Group__3__Impl36495 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group_2__0__Impl_in_rule__XBlockExpression__Group_2__036534 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group_2__1_in_rule__XBlockExpression__Group_2__036537 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__ExpressionsAssignment_2_0_in_rule__XBlockExpression__Group_2__0__Impl36564 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group_2__1__Impl_in_rule__XBlockExpression__Group_2__136594 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__XBlockExpression__Group_2__1__Impl36623 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group__0__Impl_in_rule__XVariableDeclaration__Group__036660 = new BitSet(new long[]{0x0000000000000000L,0x0000080000000001L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group__1_in_rule__XVariableDeclaration__Group__036663 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group__1__Impl_in_rule__XVariableDeclaration__Group__136721 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group__2_in_rule__XVariableDeclaration__Group__136724 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Alternatives_1_in_rule__XVariableDeclaration__Group__1__Impl36751 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group__2__Impl_in_rule__XVariableDeclaration__Group__236781 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group__3_in_rule__XVariableDeclaration__Group__236784 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Alternatives_2_in_rule__XVariableDeclaration__Group__2__Impl36811 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group__3__Impl_in_rule__XVariableDeclaration__Group__336841 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_3__0_in_rule__XVariableDeclaration__Group__3__Impl36868 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_2_0__0__Impl_in_rule__XVariableDeclaration__Group_2_0__036907 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_2_0_0__0_in_rule__XVariableDeclaration__Group_2_0__0__Impl36934 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_2_0_0__0__Impl_in_rule__XVariableDeclaration__Group_2_0_0__036966 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_2_0_0__1_in_rule__XVariableDeclaration__Group_2_0_0__036969 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__TypeAssignment_2_0_0_0_in_rule__XVariableDeclaration__Group_2_0_0__0__Impl36996 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_2_0_0__1__Impl_in_rule__XVariableDeclaration__Group_2_0_0__137026 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__NameAssignment_2_0_0_1_in_rule__XVariableDeclaration__Group_2_0_0__1__Impl37053 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_3__0__Impl_in_rule__XVariableDeclaration__Group_3__037087 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_3__1_in_rule__XVariableDeclaration__Group_3__037090 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_13_in_rule__XVariableDeclaration__Group_3__0__Impl37118 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_3__1__Impl_in_rule__XVariableDeclaration__Group_3__137149 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__RightAssignment_3_1_in_rule__XVariableDeclaration__Group_3__1__Impl37176 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmFormalParameter__Group__0__Impl_in_rule__JvmFormalParameter__Group__037210 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
-    public static final BitSet FOLLOW_rule__JvmFormalParameter__Group__1_in_rule__JvmFormalParameter__Group__037213 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmFormalParameter__ParameterTypeAssignment_0_in_rule__JvmFormalParameter__Group__0__Impl37240 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmFormalParameter__Group__1__Impl_in_rule__JvmFormalParameter__Group__137271 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmFormalParameter__NameAssignment_1_in_rule__JvmFormalParameter__Group__1__Impl37298 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FullJvmFormalParameter__Group__0__Impl_in_rule__FullJvmFormalParameter__Group__037332 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__FullJvmFormalParameter__Group__1_in_rule__FullJvmFormalParameter__Group__037335 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FullJvmFormalParameter__ParameterTypeAssignment_0_in_rule__FullJvmFormalParameter__Group__0__Impl37362 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FullJvmFormalParameter__Group__1__Impl_in_rule__FullJvmFormalParameter__Group__137392 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FullJvmFormalParameter__NameAssignment_1_in_rule__FullJvmFormalParameter__Group__1__Impl37419 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group__0__Impl_in_rule__XFeatureCall__Group__037453 = new BitSet(new long[]{0x0000800FFFFF0010L,0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group__1_in_rule__XFeatureCall__Group__037456 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group__1__Impl_in_rule__XFeatureCall__Group__137514 = new BitSet(new long[]{0x0000800FFFFF0010L,0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group__2_in_rule__XFeatureCall__Group__137517 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1__0_in_rule__XFeatureCall__Group__1__Impl37544 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group__2__Impl_in_rule__XFeatureCall__Group__237575 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004100L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group__3_in_rule__XFeatureCall__Group__237578 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__FeatureAssignment_2_in_rule__XFeatureCall__Group__2__Impl37605 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group__3__Impl_in_rule__XFeatureCall__Group__337635 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004100L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group__4_in_rule__XFeatureCall__Group__337638 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3__0_in_rule__XFeatureCall__Group__3__Impl37665 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group__4__Impl_in_rule__XFeatureCall__Group__437696 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_4_in_rule__XFeatureCall__Group__4__Impl37723 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1__0__Impl_in_rule__XFeatureCall__Group_1__037764 = new BitSet(new long[]{0x0008000FE0800010L,0x000000A000001900L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1__1_in_rule__XFeatureCall__Group_1__037767 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__XFeatureCall__Group_1__0__Impl37795 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1__1__Impl_in_rule__XFeatureCall__Group_1__137826 = new BitSet(new long[]{0x0000400000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1__2_in_rule__XFeatureCall__Group_1__137829 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__TypeArgumentsAssignment_1_1_in_rule__XFeatureCall__Group_1__1__Impl37856 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1__2__Impl_in_rule__XFeatureCall__Group_1__237886 = new BitSet(new long[]{0x0000400000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1__3_in_rule__XFeatureCall__Group_1__237889 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1_2__0_in_rule__XFeatureCall__Group_1__2__Impl37916 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1__3__Impl_in_rule__XFeatureCall__Group_1__337947 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rule__XFeatureCall__Group_1__3__Impl37975 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1_2__0__Impl_in_rule__XFeatureCall__Group_1_2__038014 = new BitSet(new long[]{0x0008000FE0800010L,0x000000A000001900L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1_2__1_in_rule__XFeatureCall__Group_1_2__038017 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XFeatureCall__Group_1_2__0__Impl38045 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1_2__1__Impl_in_rule__XFeatureCall__Group_1_2__138076 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__TypeArgumentsAssignment_1_2_1_in_rule__XFeatureCall__Group_1_2__1__Impl38103 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3__0__Impl_in_rule__XFeatureCall__Group_3__038137 = new BitSet(new long[]{0x10C8800FFFFF01F0L,0x0000148BFC537B56L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3__1_in_rule__XFeatureCall__Group_3__038140 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__ExplicitOperationCallAssignment_3_0_in_rule__XFeatureCall__Group_3__0__Impl38167 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3__1__Impl_in_rule__XFeatureCall__Group_3__138197 = new BitSet(new long[]{0x10C8800FFFFF01F0L,0x0000148BFC537B56L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3__2_in_rule__XFeatureCall__Group_3__138200 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Alternatives_3_1_in_rule__XFeatureCall__Group_3__1__Impl38227 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3__2__Impl_in_rule__XFeatureCall__Group_3__238258 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__XFeatureCall__Group_3__2__Impl38286 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3_1_1__0__Impl_in_rule__XFeatureCall__Group_3_1_1__038323 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3_1_1__1_in_rule__XFeatureCall__Group_3_1_1__038326 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0_in_rule__XFeatureCall__Group_3_1_1__0__Impl38353 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3_1_1__1__Impl_in_rule__XFeatureCall__Group_3_1_1__138383 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3_1_1_1__0_in_rule__XFeatureCall__Group_3_1_1__1__Impl38410 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3_1_1_1__0__Impl_in_rule__XFeatureCall__Group_3_1_1_1__038445 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3_1_1_1__1_in_rule__XFeatureCall__Group_3_1_1_1__038448 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XFeatureCall__Group_3_1_1_1__0__Impl38476 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3_1_1_1__1__Impl_in_rule__XFeatureCall__Group_3_1_1_1__138507 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1_in_rule__XFeatureCall__Group_3_1_1_1__1__Impl38534 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__0__Impl_in_rule__XConstructorCall__Group__038568 = new BitSet(new long[]{0x0000000000000000L,0x0000000010000000L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__1_in_rule__XConstructorCall__Group__038571 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__1__Impl_in_rule__XConstructorCall__Group__138629 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__2_in_rule__XConstructorCall__Group__138632 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_92_in_rule__XConstructorCall__Group__1__Impl38660 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__2__Impl_in_rule__XConstructorCall__Group__238691 = new BitSet(new long[]{0x0000800000000000L,0x0000000000004100L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__3_in_rule__XConstructorCall__Group__238694 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__ConstructorAssignment_2_in_rule__XConstructorCall__Group__2__Impl38721 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__3__Impl_in_rule__XConstructorCall__Group__338751 = new BitSet(new long[]{0x0000800000000000L,0x0000000000004100L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__4_in_rule__XConstructorCall__Group__338754 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__0_in_rule__XConstructorCall__Group__3__Impl38781 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__4__Impl_in_rule__XConstructorCall__Group__438812 = new BitSet(new long[]{0x0000800000000000L,0x0000000000004100L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__5_in_rule__XConstructorCall__Group__438815 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4__0_in_rule__XConstructorCall__Group__4__Impl38842 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__5__Impl_in_rule__XConstructorCall__Group__538873 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__ArgumentsAssignment_5_in_rule__XConstructorCall__Group__5__Impl38900 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__0__Impl_in_rule__XConstructorCall__Group_3__038943 = new BitSet(new long[]{0x0008000FE0800010L,0x000000A000001900L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__1_in_rule__XConstructorCall__Group_3__038946 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__XConstructorCall__Group_3__0__Impl38975 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__1__Impl_in_rule__XConstructorCall__Group_3__139007 = new BitSet(new long[]{0x0000400000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__2_in_rule__XConstructorCall__Group_3__139010 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__TypeArgumentsAssignment_3_1_in_rule__XConstructorCall__Group_3__1__Impl39037 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__2__Impl_in_rule__XConstructorCall__Group_3__239067 = new BitSet(new long[]{0x0000400000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__3_in_rule__XConstructorCall__Group_3__239070 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3_2__0_in_rule__XConstructorCall__Group_3__2__Impl39097 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__3__Impl_in_rule__XConstructorCall__Group_3__339128 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rule__XConstructorCall__Group_3__3__Impl39156 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3_2__0__Impl_in_rule__XConstructorCall__Group_3_2__039195 = new BitSet(new long[]{0x0008000FE0800010L,0x000000A000001900L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3_2__1_in_rule__XConstructorCall__Group_3_2__039198 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XConstructorCall__Group_3_2__0__Impl39226 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3_2__1__Impl_in_rule__XConstructorCall__Group_3_2__139257 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__TypeArgumentsAssignment_3_2_1_in_rule__XConstructorCall__Group_3_2__1__Impl39284 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4__0__Impl_in_rule__XConstructorCall__Group_4__039318 = new BitSet(new long[]{0x10C8800FFFFF01F0L,0x0000148BFC537B56L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4__1_in_rule__XConstructorCall__Group_4__039321 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0_in_rule__XConstructorCall__Group_4__0__Impl39348 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4__1__Impl_in_rule__XConstructorCall__Group_4__139378 = new BitSet(new long[]{0x10C8800FFFFF01F0L,0x0000148BFC537B56L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4__2_in_rule__XConstructorCall__Group_4__139381 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Alternatives_4_1_in_rule__XConstructorCall__Group_4__1__Impl39408 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4__2__Impl_in_rule__XConstructorCall__Group_4__239439 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__XConstructorCall__Group_4__2__Impl39467 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4_1_1__0__Impl_in_rule__XConstructorCall__Group_4_1_1__039504 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4_1_1__1_in_rule__XConstructorCall__Group_4_1_1__039507 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__ArgumentsAssignment_4_1_1_0_in_rule__XConstructorCall__Group_4_1_1__0__Impl39534 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4_1_1__1__Impl_in_rule__XConstructorCall__Group_4_1_1__139564 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4_1_1_1__0_in_rule__XConstructorCall__Group_4_1_1__1__Impl39591 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4_1_1_1__0__Impl_in_rule__XConstructorCall__Group_4_1_1_1__039626 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4_1_1_1__1_in_rule__XConstructorCall__Group_4_1_1_1__039629 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XConstructorCall__Group_4_1_1_1__0__Impl39657 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4_1_1_1__1__Impl_in_rule__XConstructorCall__Group_4_1_1_1__139688 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1_in_rule__XConstructorCall__Group_4_1_1_1__1__Impl39715 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBooleanLiteral__Group__0__Impl_in_rule__XBooleanLiteral__Group__039749 = new BitSet(new long[]{0x0000000000000000L,0x0000100000000004L});
-    public static final BitSet FOLLOW_rule__XBooleanLiteral__Group__1_in_rule__XBooleanLiteral__Group__039752 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBooleanLiteral__Group__1__Impl_in_rule__XBooleanLiteral__Group__139810 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBooleanLiteral__Alternatives_1_in_rule__XBooleanLiteral__Group__1__Impl39837 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XNullLiteral__Group__0__Impl_in_rule__XNullLiteral__Group__039871 = new BitSet(new long[]{0x0000000000000000L,0x0000000020000000L});
-    public static final BitSet FOLLOW_rule__XNullLiteral__Group__1_in_rule__XNullLiteral__Group__039874 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XNullLiteral__Group__1__Impl_in_rule__XNullLiteral__Group__139932 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_93_in_rule__XNullLiteral__Group__1__Impl39960 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XNumberLiteral__Group__0__Impl_in_rule__XNumberLiteral__Group__039995 = new BitSet(new long[]{0x00000000000000E0L});
-    public static final BitSet FOLLOW_rule__XNumberLiteral__Group__1_in_rule__XNumberLiteral__Group__039998 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XNumberLiteral__Group__1__Impl_in_rule__XNumberLiteral__Group__140056 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XNumberLiteral__ValueAssignment_1_in_rule__XNumberLiteral__Group__1__Impl40083 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XStringLiteral__Group__0__Impl_in_rule__XStringLiteral__Group__040117 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__XStringLiteral__Group__1_in_rule__XStringLiteral__Group__040120 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XStringLiteral__Group__1__Impl_in_rule__XStringLiteral__Group__140178 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XStringLiteral__ValueAssignment_1_in_rule__XStringLiteral__Group__1__Impl40205 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__0__Impl_in_rule__XTypeLiteral__Group__040239 = new BitSet(new long[]{0x00000000000001E0L,0x0000100060006004L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__1_in_rule__XTypeLiteral__Group__040242 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__1__Impl_in_rule__XTypeLiteral__Group__140300 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__2_in_rule__XTypeLiteral__Group__140303 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_94_in_rule__XTypeLiteral__Group__1__Impl40331 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__2__Impl_in_rule__XTypeLiteral__Group__240362 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__3_in_rule__XTypeLiteral__Group__240365 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__XTypeLiteral__Group__2__Impl40393 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__3__Impl_in_rule__XTypeLiteral__Group__340424 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004200L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__4_in_rule__XTypeLiteral__Group__340427 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__TypeAssignment_3_in_rule__XTypeLiteral__Group__3__Impl40454 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__4__Impl_in_rule__XTypeLiteral__Group__440484 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004200L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__5_in_rule__XTypeLiteral__Group__440487 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__ArrayDimensionsAssignment_4_in_rule__XTypeLiteral__Group__4__Impl40514 = new BitSet(new long[]{0x0000000000000002L,0x0000000000004000L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__5__Impl_in_rule__XTypeLiteral__Group__540545 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__XTypeLiteral__Group__5__Impl40573 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XThrowExpression__Group__0__Impl_in_rule__XThrowExpression__Group__040616 = new BitSet(new long[]{0x0000000000000000L,0x0000000080000000L});
-    public static final BitSet FOLLOW_rule__XThrowExpression__Group__1_in_rule__XThrowExpression__Group__040619 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XThrowExpression__Group__1__Impl_in_rule__XThrowExpression__Group__140677 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XThrowExpression__Group__2_in_rule__XThrowExpression__Group__140680 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_95_in_rule__XThrowExpression__Group__1__Impl40708 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XThrowExpression__Group__2__Impl_in_rule__XThrowExpression__Group__240739 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XThrowExpression__ExpressionAssignment_2_in_rule__XThrowExpression__Group__2__Impl40766 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XReturnExpression__Group__0__Impl_in_rule__XReturnExpression__Group__040802 = new BitSet(new long[]{0x0000000000000000L,0x0000000100000000L});
-    public static final BitSet FOLLOW_rule__XReturnExpression__Group__1_in_rule__XReturnExpression__Group__040805 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XReturnExpression__Group__1__Impl_in_rule__XReturnExpression__Group__140863 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XReturnExpression__Group__2_in_rule__XReturnExpression__Group__140866 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_96_in_rule__XReturnExpression__Group__1__Impl40894 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XReturnExpression__Group__2__Impl_in_rule__XReturnExpression__Group__240925 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XReturnExpression__ExpressionAssignment_2_in_rule__XReturnExpression__Group__2__Impl40952 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group__0__Impl_in_rule__XTryCatchFinallyExpression__Group__040989 = new BitSet(new long[]{0x0000000000000000L,0x0000000200000000L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group__1_in_rule__XTryCatchFinallyExpression__Group__040992 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group__1__Impl_in_rule__XTryCatchFinallyExpression__Group__141050 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group__2_in_rule__XTryCatchFinallyExpression__Group__141053 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_97_in_rule__XTryCatchFinallyExpression__Group__1__Impl41081 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group__2__Impl_in_rule__XTryCatchFinallyExpression__Group__241112 = new BitSet(new long[]{0x0000000000000000L,0x0000001400000000L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group__3_in_rule__XTryCatchFinallyExpression__Group__241115 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__ExpressionAssignment_2_in_rule__XTryCatchFinallyExpression__Group__2__Impl41142 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group__3__Impl_in_rule__XTryCatchFinallyExpression__Group__341172 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Alternatives_3_in_rule__XTryCatchFinallyExpression__Group__3__Impl41199 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0__0__Impl_in_rule__XTryCatchFinallyExpression__Group_3_0__041237 = new BitSet(new long[]{0x0000000000000000L,0x0000000400000000L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0__1_in_rule__XTryCatchFinallyExpression__Group_3_0__041240 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0_in_rule__XTryCatchFinallyExpression__Group_3_0__0__Impl41269 = new BitSet(new long[]{0x0000000000000002L,0x0000001000000000L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0_in_rule__XTryCatchFinallyExpression__Group_3_0__0__Impl41281 = new BitSet(new long[]{0x0000000000000002L,0x0000001000000000L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0__1__Impl_in_rule__XTryCatchFinallyExpression__Group_3_0__141314 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__0_in_rule__XTryCatchFinallyExpression__Group_3_0__1__Impl41341 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl_in_rule__XTryCatchFinallyExpression__Group_3_0_1__041376 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__1_in_rule__XTryCatchFinallyExpression__Group_3_0_1__041379 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_98_in_rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl41408 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl_in_rule__XTryCatchFinallyExpression__Group_3_0_1__141440 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1_in_rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl41467 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_1__0__Impl_in_rule__XTryCatchFinallyExpression__Group_3_1__041501 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_1__1_in_rule__XTryCatchFinallyExpression__Group_3_1__041504 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_98_in_rule__XTryCatchFinallyExpression__Group_3_1__0__Impl41532 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_1__1__Impl_in_rule__XTryCatchFinallyExpression__Group_3_1__141563 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1_in_rule__XTryCatchFinallyExpression__Group_3_1__1__Impl41590 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group__0__Impl_in_rule__XSynchronizedExpression__Group__041624 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group__1_in_rule__XSynchronizedExpression__Group__041627 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group_0__0_in_rule__XSynchronizedExpression__Group__0__Impl41654 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group__1__Impl_in_rule__XSynchronizedExpression__Group__141684 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000200L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group__2_in_rule__XSynchronizedExpression__Group__141687 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__ParamAssignment_1_in_rule__XSynchronizedExpression__Group__1__Impl41714 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group__2__Impl_in_rule__XSynchronizedExpression__Group__241744 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group__3_in_rule__XSynchronizedExpression__Group__241747 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__XSynchronizedExpression__Group__2__Impl41775 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group__3__Impl_in_rule__XSynchronizedExpression__Group__341806 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__ExpressionAssignment_3_in_rule__XSynchronizedExpression__Group__3__Impl41833 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group_0__0__Impl_in_rule__XSynchronizedExpression__Group_0__041871 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group_0_0__0_in_rule__XSynchronizedExpression__Group_0__0__Impl41898 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group_0_0__0__Impl_in_rule__XSynchronizedExpression__Group_0_0__041930 = new BitSet(new long[]{0x0000000000000000L,0x0000000800000000L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group_0_0__1_in_rule__XSynchronizedExpression__Group_0_0__041933 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group_0_0__1__Impl_in_rule__XSynchronizedExpression__Group_0_0__141991 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group_0_0__2_in_rule__XSynchronizedExpression__Group_0_0__141994 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_99_in_rule__XSynchronizedExpression__Group_0_0__1__Impl42022 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group_0_0__2__Impl_in_rule__XSynchronizedExpression__Group_0_0__242053 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__XSynchronizedExpression__Group_0_0__2__Impl42081 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCatchClause__Group__0__Impl_in_rule__XCatchClause__Group__042118 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__XCatchClause__Group__1_in_rule__XCatchClause__Group__042121 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_100_in_rule__XCatchClause__Group__0__Impl42150 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCatchClause__Group__1__Impl_in_rule__XCatchClause__Group__142182 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
-    public static final BitSet FOLLOW_rule__XCatchClause__Group__2_in_rule__XCatchClause__Group__142185 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__XCatchClause__Group__1__Impl42213 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCatchClause__Group__2__Impl_in_rule__XCatchClause__Group__242244 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000200L});
-    public static final BitSet FOLLOW_rule__XCatchClause__Group__3_in_rule__XCatchClause__Group__242247 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCatchClause__DeclaredParamAssignment_2_in_rule__XCatchClause__Group__2__Impl42274 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCatchClause__Group__3__Impl_in_rule__XCatchClause__Group__342304 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XCatchClause__Group__4_in_rule__XCatchClause__Group__342307 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__XCatchClause__Group__3__Impl42335 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCatchClause__Group__4__Impl_in_rule__XCatchClause__Group__442366 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCatchClause__ExpressionAssignment_4_in_rule__XCatchClause__Group__4__Impl42393 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group__0__Impl_in_rule__QualifiedName__Group__042433 = new BitSet(new long[]{0x8000000000000000L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group__1_in_rule__QualifiedName__Group__042436 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__QualifiedName__Group__0__Impl42463 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group__1__Impl_in_rule__QualifiedName__Group__142492 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group_1__0_in_rule__QualifiedName__Group__1__Impl42519 = new BitSet(new long[]{0x8000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group_1__0__Impl_in_rule__QualifiedName__Group_1__042554 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group_1__1_in_rule__QualifiedName__Group_1__042557 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_rule__QualifiedName__Group_1__0__Impl42586 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group_1__1__Impl_in_rule__QualifiedName__Group_1__142618 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__QualifiedName__Group_1__1__Impl42645 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Number__Group_1__0__Impl_in_rule__Number__Group_1__042678 = new BitSet(new long[]{0x8000000000000000L});
-    public static final BitSet FOLLOW_rule__Number__Group_1__1_in_rule__Number__Group_1__042681 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Number__Alternatives_1_0_in_rule__Number__Group_1__0__Impl42708 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Number__Group_1__1__Impl_in_rule__Number__Group_1__142738 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Number__Group_1_1__0_in_rule__Number__Group_1__1__Impl42765 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Number__Group_1_1__0__Impl_in_rule__Number__Group_1_1__042800 = new BitSet(new long[]{0x00000000000000C0L});
-    public static final BitSet FOLLOW_rule__Number__Group_1_1__1_in_rule__Number__Group_1_1__042803 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_rule__Number__Group_1_1__0__Impl42831 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Number__Group_1_1__1__Impl_in_rule__Number__Group_1_1__142862 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Number__Alternatives_1_1_1_in_rule__Number__Group_1_1__1__Impl42889 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0__0__Impl_in_rule__JvmTypeReference__Group_0__042924 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0__1_in_rule__JvmTypeReference__Group_0__042927 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmParameterizedTypeReference_in_rule__JvmTypeReference__Group_0__0__Impl42954 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0__1__Impl_in_rule__JvmTypeReference__Group_0__142983 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0_1__0_in_rule__JvmTypeReference__Group_0__1__Impl43010 = new BitSet(new long[]{0x0000000000000002L,0x0000000000004000L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0_1__0__Impl_in_rule__JvmTypeReference__Group_0_1__043045 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0_1_0__0_in_rule__JvmTypeReference__Group_0_1__0__Impl43072 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0_1_0__0__Impl_in_rule__JvmTypeReference__Group_0_1_0__043104 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0_1_0__1_in_rule__JvmTypeReference__Group_0_1_0__043107 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0_1_0__1__Impl_in_rule__JvmTypeReference__Group_0_1_0__143165 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleArrayBrackets_in_rule__JvmTypeReference__Group_0_1_0__1__Impl43192 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ArrayBrackets__Group__0__Impl_in_rule__ArrayBrackets__Group__043225 = new BitSet(new long[]{0x0000000000000000L,0x0000000000008000L});
-    public static final BitSet FOLLOW_rule__ArrayBrackets__Group__1_in_rule__ArrayBrackets__Group__043228 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_78_in_rule__ArrayBrackets__Group__0__Impl43256 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ArrayBrackets__Group__1__Impl_in_rule__ArrayBrackets__Group__143287 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_79_in_rule__ArrayBrackets__Group__1__Impl43315 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group__0__Impl_in_rule__XFunctionTypeRef__Group__043350 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group__1_in_rule__XFunctionTypeRef__Group__043353 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0__0_in_rule__XFunctionTypeRef__Group__0__Impl43380 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group__1__Impl_in_rule__XFunctionTypeRef__Group__143411 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group__2_in_rule__XFunctionTypeRef__Group__143414 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__XFunctionTypeRef__Group__1__Impl43442 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group__2__Impl_in_rule__XFunctionTypeRef__Group__243473 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__ReturnTypeAssignment_2_in_rule__XFunctionTypeRef__Group__2__Impl43500 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0__0__Impl_in_rule__XFunctionTypeRef__Group_0__043536 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001B00L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0__1_in_rule__XFunctionTypeRef__Group_0__043539 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__XFunctionTypeRef__Group_0__0__Impl43567 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0__1__Impl_in_rule__XFunctionTypeRef__Group_0__143598 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001B00L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0__2_in_rule__XFunctionTypeRef__Group_0__143601 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0_1__0_in_rule__XFunctionTypeRef__Group_0__1__Impl43628 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0__2__Impl_in_rule__XFunctionTypeRef__Group_0__243659 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__XFunctionTypeRef__Group_0__2__Impl43687 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0_1__0__Impl_in_rule__XFunctionTypeRef__Group_0_1__043724 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0_1__1_in_rule__XFunctionTypeRef__Group_0_1__043727 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0_in_rule__XFunctionTypeRef__Group_0_1__0__Impl43754 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0_1__1__Impl_in_rule__XFunctionTypeRef__Group_0_1__143784 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0_1_1__0_in_rule__XFunctionTypeRef__Group_0_1__1__Impl43811 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0_1_1__0__Impl_in_rule__XFunctionTypeRef__Group_0_1_1__043846 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0_1_1__1_in_rule__XFunctionTypeRef__Group_0_1_1__043849 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XFunctionTypeRef__Group_0_1_1__0__Impl43877 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0_1_1__1__Impl_in_rule__XFunctionTypeRef__Group_0_1_1__143908 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1_in_rule__XFunctionTypeRef__Group_0_1_1__1__Impl43935 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group__0__Impl_in_rule__JvmParameterizedTypeReference__Group__043969 = new BitSet(new long[]{0x0000800000000000L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group__1_in_rule__JvmParameterizedTypeReference__Group__043972 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__TypeAssignment_0_in_rule__JvmParameterizedTypeReference__Group__0__Impl43999 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group__1__Impl_in_rule__JvmParameterizedTypeReference__Group__144029 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__0_in_rule__JvmParameterizedTypeReference__Group__1__Impl44056 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1__044091 = new BitSet(new long[]{0x0008000FE0800010L,0x000000A000001900L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__1_in_rule__JvmParameterizedTypeReference__Group_1__044094 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__JvmParameterizedTypeReference__Group_1__0__Impl44123 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1__144155 = new BitSet(new long[]{0x0000400000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__2_in_rule__JvmParameterizedTypeReference__Group_1__144158 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1_in_rule__JvmParameterizedTypeReference__Group_1__1__Impl44185 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__2__Impl_in_rule__JvmParameterizedTypeReference__Group_1__244215 = new BitSet(new long[]{0x0000400000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__3_in_rule__JvmParameterizedTypeReference__Group_1__244218 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_2__0_in_rule__JvmParameterizedTypeReference__Group_1__2__Impl44245 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__3__Impl_in_rule__JvmParameterizedTypeReference__Group_1__344276 = new BitSet(new long[]{0x8000000000000000L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__4_in_rule__JvmParameterizedTypeReference__Group_1__344279 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rule__JvmParameterizedTypeReference__Group_1__3__Impl44307 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__4__Impl_in_rule__JvmParameterizedTypeReference__Group_1__444338 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__0_in_rule__JvmParameterizedTypeReference__Group_1__4__Impl44365 = new BitSet(new long[]{0x8000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_2__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_2__044406 = new BitSet(new long[]{0x0008000FE0800010L,0x000000A000001900L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_2__1_in_rule__JvmParameterizedTypeReference__Group_1_2__044409 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__JvmParameterizedTypeReference__Group_1_2__0__Impl44437 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_2__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_2__144468 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1_in_rule__JvmParameterizedTypeReference__Group_1_2__1__Impl44495 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4__044529 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__1_in_rule__JvmParameterizedTypeReference__Group_1_4__044532 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0__0_in_rule__JvmParameterizedTypeReference__Group_1_4__0__Impl44559 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4__144589 = new BitSet(new long[]{0x0000800000000000L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__2_in_rule__JvmParameterizedTypeReference__Group_1_4__144592 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1_in_rule__JvmParameterizedTypeReference__Group_1_4__1__Impl44619 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__2__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4__244649 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__0_in_rule__JvmParameterizedTypeReference__Group_1_4__2__Impl44676 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_0__044713 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0_0__0_in_rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl44740 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_0_0__044772 = new BitSet(new long[]{0x8000000000000000L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0_0__1_in_rule__JvmParameterizedTypeReference__Group_1_4_0_0__044775 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_0_0__144833 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl44861 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2__044896 = new BitSet(new long[]{0x0008000FE0800010L,0x000000A000001900L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__1_in_rule__JvmParameterizedTypeReference__Group_1_4_2__044899 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl44928 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2__144960 = new BitSet(new long[]{0x0000400000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__2_in_rule__JvmParameterizedTypeReference__Group_1_4_2__144963 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1_in_rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl44990 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2__245020 = new BitSet(new long[]{0x0000400000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__3_in_rule__JvmParameterizedTypeReference__Group_1_4_2__245023 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2_2__0_in_rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl45050 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2__345081 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl45109 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__045148 = new BitSet(new long[]{0x0008000FE0800010L,0x000000A000001900L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2_2__1_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__045151 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl45179 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__145210 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl45237 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group__0__Impl_in_rule__JvmWildcardTypeReference__Group__045271 = new BitSet(new long[]{0x0008000FE0800010L,0x000000A000001900L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group__1_in_rule__JvmWildcardTypeReference__Group__045274 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group__1__Impl_in_rule__JvmWildcardTypeReference__Group__145332 = new BitSet(new long[]{0x0000000000010000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group__2_in_rule__JvmWildcardTypeReference__Group__145335 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_101_in_rule__JvmWildcardTypeReference__Group__1__Impl45363 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group__2__Impl_in_rule__JvmWildcardTypeReference__Group__245394 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Alternatives_2_in_rule__JvmWildcardTypeReference__Group__2__Impl45421 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group_2_0__0__Impl_in_rule__JvmWildcardTypeReference__Group_2_0__045458 = new BitSet(new long[]{0x0000000000000000L,0x0000004000000000L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group_2_0__1_in_rule__JvmWildcardTypeReference__Group_2_0__045461 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0_in_rule__JvmWildcardTypeReference__Group_2_0__0__Impl45488 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group_2_0__1__Impl_in_rule__JvmWildcardTypeReference__Group_2_0__145518 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1_in_rule__JvmWildcardTypeReference__Group_2_0__1__Impl45545 = new BitSet(new long[]{0x0000000000000002L,0x0000004000000000L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group_2_1__0__Impl_in_rule__JvmWildcardTypeReference__Group_2_1__045580 = new BitSet(new long[]{0x0000000000000000L,0x0000004000000000L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group_2_1__1_in_rule__JvmWildcardTypeReference__Group_2_1__045583 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0_in_rule__JvmWildcardTypeReference__Group_2_1__0__Impl45610 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group_2_1__1__Impl_in_rule__JvmWildcardTypeReference__Group_2_1__145640 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1_in_rule__JvmWildcardTypeReference__Group_2_1__1__Impl45667 = new BitSet(new long[]{0x0000000000000002L,0x0000004000000000L});
-    public static final BitSet FOLLOW_rule__JvmUpperBound__Group__0__Impl_in_rule__JvmUpperBound__Group__045702 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
-    public static final BitSet FOLLOW_rule__JvmUpperBound__Group__1_in_rule__JvmUpperBound__Group__045705 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_16_in_rule__JvmUpperBound__Group__0__Impl45733 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmUpperBound__Group__1__Impl_in_rule__JvmUpperBound__Group__145764 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmUpperBound__TypeReferenceAssignment_1_in_rule__JvmUpperBound__Group__1__Impl45791 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmUpperBoundAnded__Group__0__Impl_in_rule__JvmUpperBoundAnded__Group__045825 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
-    public static final BitSet FOLLOW_rule__JvmUpperBoundAnded__Group__1_in_rule__JvmUpperBoundAnded__Group__045828 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_102_in_rule__JvmUpperBoundAnded__Group__0__Impl45856 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmUpperBoundAnded__Group__1__Impl_in_rule__JvmUpperBoundAnded__Group__145887 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmUpperBoundAnded__TypeReferenceAssignment_1_in_rule__JvmUpperBoundAnded__Group__1__Impl45914 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmLowerBound__Group__0__Impl_in_rule__JvmLowerBound__Group__045948 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
-    public static final BitSet FOLLOW_rule__JvmLowerBound__Group__1_in_rule__JvmLowerBound__Group__045951 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_65_in_rule__JvmLowerBound__Group__0__Impl45979 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmLowerBound__Group__1__Impl_in_rule__JvmLowerBound__Group__146010 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmLowerBound__TypeReferenceAssignment_1_in_rule__JvmLowerBound__Group__1__Impl46037 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmLowerBoundAnded__Group__0__Impl_in_rule__JvmLowerBoundAnded__Group__046071 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
-    public static final BitSet FOLLOW_rule__JvmLowerBoundAnded__Group__1_in_rule__JvmLowerBoundAnded__Group__046074 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_102_in_rule__JvmLowerBoundAnded__Group__0__Impl46102 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmLowerBoundAnded__Group__1__Impl_in_rule__JvmLowerBoundAnded__Group__146133 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmLowerBoundAnded__TypeReferenceAssignment_1_in_rule__JvmLowerBoundAnded__Group__1__Impl46160 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedNameWithWildcard__Group__0__Impl_in_rule__QualifiedNameWithWildcard__Group__046196 = new BitSet(new long[]{0x8000000000000000L});
-    public static final BitSet FOLLOW_rule__QualifiedNameWithWildcard__Group__1_in_rule__QualifiedNameWithWildcard__Group__046199 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__QualifiedNameWithWildcard__Group__0__Impl46226 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedNameWithWildcard__Group__1__Impl_in_rule__QualifiedNameWithWildcard__Group__146255 = new BitSet(new long[]{0x0100000000000000L});
-    public static final BitSet FOLLOW_rule__QualifiedNameWithWildcard__Group__2_in_rule__QualifiedNameWithWildcard__Group__146258 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_rule__QualifiedNameWithWildcard__Group__1__Impl46286 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedNameWithWildcard__Group__2__Impl_in_rule__QualifiedNameWithWildcard__Group__246317 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_rule__QualifiedNameWithWildcard__Group__2__Impl46345 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__CheckCatalog__PackageNameAssignment_246388 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXImportSection_in_rule__CheckCatalog__ImportsAssignment_346419 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_103_in_rule__CheckCatalog__FinalAssignment_446455 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__CheckCatalog__NameAssignment_646494 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__CheckCatalog__GrammarAssignment_7_246529 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__CheckCatalog__IncludedCatalogsAssignment_8_146568 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCategory_in_rule__CheckCatalog__CategoriesAssignment_10_046603 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImplementation_in_rule__CheckCatalog__ImplementationsAssignment_10_146634 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCheck_in_rule__CheckCatalog__ChecksAssignment_10_246665 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMember_in_rule__CheckCatalog__MembersAssignment_10_346696 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXImportDeclaration_in_rule__XImportSection__ImportDeclarationsAssignment_146727 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__XImportDeclaration__ImportedTypeAssignment_1_046762 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedNameWithWildcard_in_rule__XImportDeclaration__ImportedNamespaceAssignment_1_146797 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__Category__IdAssignment_146828 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__Category__LabelAssignment_246859 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCheck_in_rule__Category__ChecksAssignment_446890 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSeverityRange_in_rule__Check__SeverityRangeAssignment_046921 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_103_in_rule__Check__FinalAssignment_146957 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTriggerKind_in_rule__Check__KindAssignment_246996 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSeverityKind_in_rule__Check__DefaultSeverityAssignment_347027 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__Check__IdAssignment_447058 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__Check__LabelAssignment_547089 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFormalParameter_in_rule__Check__FormalParametersAssignment_6_1_047120 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFormalParameter_in_rule__Check__FormalParametersAssignment_6_1_1_147151 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__Check__GivenMessageAssignment_7_147182 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleContext_in_rule__Check__ContextsAssignment_8_0_147213 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleContext_in_rule__Check__ContextsAssignment_8_147244 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSeverityKind_in_rule__SeverityRange__MinSeverityAssignment_347275 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSeverityKind_in_rule__SeverityRange__MaxSeverityAssignment_547306 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotation_in_rule__Member__AnnotationsAssignment_047337 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__Member__TypeAssignment_147368 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__Member__NameAssignment_247399 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXOrExpression_in_rule__Member__ValueAssignment_3_147430 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__Implementation__NameAssignment_147461 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleContext_in_rule__Implementation__ContextAssignment_247492 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmParameterizedTypeReference_in_rule__FormalParameter__TypeAssignment_047523 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__FormalParameter__NameAssignment_147554 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXFormalParameterDefaultValueLiteral_in_rule__FormalParameter__RightAssignment_347585 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__FormalParameter__LabelAssignment_447616 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpUnary_in_rule__XConstantUnaryOperation__FeatureAssignment_0_147651 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstantUnaryOperation_in_rule__XConstantUnaryOperation__OperandAssignment_0_247686 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstantUnaryOperation_in_rule__XConstantListLiteral__ElementsAssignment_3_047717 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstantUnaryOperation_in_rule__XConstantListLiteral__ElementsAssignment_3_1_147748 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleContextVariable_in_rule__Context__ContextVariableAssignment_147779 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBlockExpression_in_rule__Context__ConstraintAssignment_247810 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__ContextVariable__TypeAssignment_047841 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__ContextVariable__NameAssignment_147872 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XGuardExpression__GuardAssignment_247903 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__XIssueExpression__CheckAssignment_247938 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_147977 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XIssueExpression__MarkerObjectAssignment_3_1_1_048012 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFeatureCallID_in_rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_148047 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XIssueExpression__MarkerIndexAssignment_3_2_148082 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XIssueExpression__MessageAssignment_4_148113 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XIssueExpression__MessageParametersAssignment_5_248144 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XIssueExpression__MessageParametersAssignment_5_3_148175 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__XIssueExpression__IssueCodeAssignment_6_148206 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XIssueExpression__IssueDataAssignment_6_348237 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XIssueExpression__IssueDataAssignment_6_4_148268 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__XAnnotation__AnnotationTypeAssignment_248303 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationElementValuePair_in_rule__XAnnotation__ElementValuePairsAssignment_3_1_0_048338 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationElementValuePair_in_rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_148369 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationElementValueOrCommaList_in_rule__XAnnotation__ValueAssignment_3_1_148400 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__XAnnotationElementValuePair__ElementAssignment_0_0_048435 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationElementValue_in_rule__XAnnotationElementValuePair__ValueAssignment_148470 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_048501 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_148532 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_148563 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValue__ElementsAssignment_0_1_048594 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValue__ElementsAssignment_0_1_1_148625 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFeatureCallID_in_rule__XAssignment__FeatureAssignment_0_148660 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAssignment_in_rule__XAssignment__ValueAssignment_0_348695 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpMultiAssign_in_rule__XAssignment__FeatureAssignment_1_1_0_0_148730 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAssignment_in_rule__XAssignment__RightOperandAssignment_1_1_148765 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpOr_in_rule__XOrExpression__FeatureAssignment_1_0_0_148800 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAndExpression_in_rule__XOrExpression__RightOperandAssignment_1_148835 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpAnd_in_rule__XAndExpression__FeatureAssignment_1_0_0_148870 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXEqualityExpression_in_rule__XAndExpression__RightOperandAssignment_1_148905 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpEquality_in_rule__XEqualityExpression__FeatureAssignment_1_0_0_148940 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXRelationalExpression_in_rule__XEqualityExpression__RightOperandAssignment_1_148975 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__XRelationalExpression__TypeAssignment_1_0_149006 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpCompare_in_rule__XRelationalExpression__FeatureAssignment_1_1_0_0_149041 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXOtherOperatorExpression_in_rule__XRelationalExpression__RightOperandAssignment_1_1_149076 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpOther_in_rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_149111 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAdditiveExpression_in_rule__XOtherOperatorExpression__RightOperandAssignment_1_149146 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpAdd_in_rule__XAdditiveExpression__FeatureAssignment_1_0_0_149181 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXMultiplicativeExpression_in_rule__XAdditiveExpression__RightOperandAssignment_1_149216 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpMulti_in_rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_149251 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXUnaryOperation_in_rule__XMultiplicativeExpression__RightOperandAssignment_1_149286 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpUnary_in_rule__XUnaryOperation__FeatureAssignment_0_149321 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXUnaryOperation_in_rule__XUnaryOperation__OperandAssignment_0_249356 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__XCastedExpression__TypeAssignment_1_149387 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpPostfix_in_rule__XPostfixOperation__FeatureAssignment_1_0_149422 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_104_in_rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_149462 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFeatureCallID_in_rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_249505 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAssignment_in_rule__XMemberFeatureCall__ValueAssignment_1_0_149540 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_105_in_rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_149576 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_104_in_rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_249620 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_149659 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_149690 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdOrSuper_in_rule__XMemberFeatureCall__FeatureAssignment_1_1_249725 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_049765 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXShortClosure_in_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_049804 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_049835 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_149866 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXClosure_in_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_449897 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XSetLiteral__ElementsAssignment_3_049928 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XSetLiteral__ElementsAssignment_3_1_149959 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XListLiteral__ElementsAssignment_3_049990 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XListLiteral__ElementsAssignment_3_1_150021 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_050052 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_150083 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_106_in_rule__XClosure__ExplicitSyntaxAssignment_1_0_150119 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpressionInClosure_in_rule__XClosure__ExpressionAssignment_250158 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_rule__XExpressionInClosure__ExpressionsAssignment_1_050189 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_050220 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_150251 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_106_in_rule__XShortClosure__ExplicitSyntaxAssignment_0_0_250287 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XShortClosure__ExpressionAssignment_150326 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XIfExpression__IfAssignment_350357 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XIfExpression__ThenAssignment_550388 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XIfExpression__ElseAssignment_6_150419 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_150450 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XSwitchExpression__SwitchAssignment_2_0_150481 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_050512 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XSwitchExpression__SwitchAssignment_2_1_150543 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCasePart_in_rule__XSwitchExpression__CasesAssignment_450574 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XSwitchExpression__DefaultAssignment_5_250605 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__XCasePart__TypeGuardAssignment_150636 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XCasePart__CaseAssignment_2_150667 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XCasePart__ThenAssignment_3_0_150698 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XCasePart__FallThroughAssignment_3_150734 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_rule__XForLoopExpression__DeclaredParamAssignment_0_0_350773 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XForLoopExpression__ForExpressionAssignment_150804 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XForLoopExpression__EachExpressionAssignment_350835 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_rule__XBasicForLoopExpression__InitExpressionsAssignment_3_050866 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_150897 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XBasicForLoopExpression__ExpressionAssignment_550928 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_050959 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_150990 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XBasicForLoopExpression__EachExpressionAssignment_951021 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XWhileExpression__PredicateAssignment_351052 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XWhileExpression__BodyAssignment_551083 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XDoWhileExpression__BodyAssignment_251114 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XDoWhileExpression__PredicateAssignment_551145 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_rule__XBlockExpression__ExpressionsAssignment_2_051176 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_107_in_rule__XVariableDeclaration__WriteableAssignment_1_051212 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__XVariableDeclaration__TypeAssignment_2_0_0_051251 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__XVariableDeclaration__NameAssignment_2_0_0_151282 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__XVariableDeclaration__NameAssignment_2_151313 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XVariableDeclaration__RightAssignment_3_151344 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__JvmFormalParameter__ParameterTypeAssignment_051375 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__JvmFormalParameter__NameAssignment_151406 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__FullJvmFormalParameter__ParameterTypeAssignment_051437 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__FullJvmFormalParameter__NameAssignment_151468 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__XFeatureCall__TypeArgumentsAssignment_1_151499 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__XFeatureCall__TypeArgumentsAssignment_1_2_151530 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdOrSuper_in_rule__XFeatureCall__FeatureAssignment_251565 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__XFeatureCall__ExplicitOperationCallAssignment_3_051605 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXShortClosure_in_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_051644 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_051675 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_151706 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXClosure_in_rule__XFeatureCall__FeatureCallArgumentsAssignment_451737 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__XConstructorCall__ConstructorAssignment_251772 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__XConstructorCall__TypeArgumentsAssignment_3_151807 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__XConstructorCall__TypeArgumentsAssignment_3_2_151838 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__XConstructorCall__ExplicitConstructorCallAssignment_4_051874 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXShortClosure_in_rule__XConstructorCall__ArgumentsAssignment_4_1_051913 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XConstructorCall__ArgumentsAssignment_4_1_1_051944 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_151975 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXClosure_in_rule__XConstructorCall__ArgumentsAssignment_552006 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_108_in_rule__XBooleanLiteral__IsTrueAssignment_1_152042 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNumber_in_rule__XNumberLiteral__ValueAssignment_152081 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__XStringLiteral__ValueAssignment_152112 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__XTypeLiteral__TypeAssignment_352147 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleArrayBrackets_in_rule__XTypeLiteral__ArrayDimensionsAssignment_452182 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XThrowExpression__ExpressionAssignment_252213 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XReturnExpression__ExpressionAssignment_252244 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XTryCatchFinallyExpression__ExpressionAssignment_252275 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCatchClause_in_rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_052306 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_152337 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_152368 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XSynchronizedExpression__ParamAssignment_152399 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XSynchronizedExpression__ExpressionAssignment_352430 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFullJvmFormalParameter_in_rule__XCatchClause__DeclaredParamAssignment_252461 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XCatchClause__ExpressionAssignment_452492 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__XFunctionTypeRef__ParamTypesAssignment_0_1_052523 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_152554 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__XFunctionTypeRef__ReturnTypeAssignment_252585 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__JvmParameterizedTypeReference__TypeAssignment_052620 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_152655 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_152686 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__JvmParameterizedTypeReference__TypeAssignment_1_4_152721 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_152756 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_152787 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmUpperBound_in_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_052818 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmUpperBoundAnded_in_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_152849 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmLowerBound_in_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_052880 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmLowerBoundAnded_in_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_152911 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__JvmUpperBound__TypeReferenceAssignment_152942 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__JvmUpperBoundAnded__TypeReferenceAssignment_152973 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__JvmLowerBound__TypeReferenceAssignment_153004 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__JvmLowerBoundAnded__TypeReferenceAssignment_153035 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_68_in_rule__CheckCatalog__Group__8__Impl10221 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__CheckCatalog__Group__9__Impl_in_rule__CheckCatalog__Group__910252 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001920L});
+    public static final BitSet FOLLOW_rule__CheckCatalog__Group__10_in_rule__CheckCatalog__Group__910255 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__CheckCatalog__Alternatives_9_in_rule__CheckCatalog__Group__9__Impl10282 = new BitSet(new long[]{0x0008000FE0800012L,0x0000008000001900L});
+    public static final BitSet FOLLOW_rule__CheckCatalog__Group__10__Impl_in_rule__CheckCatalog__Group__1010313 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_69_in_rule__CheckCatalog__Group__10__Impl10341 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__CheckCatalog__Group_7__0__Impl_in_rule__CheckCatalog__Group_7__010394 = new BitSet(new long[]{0x0000000000200000L});
+    public static final BitSet FOLLOW_rule__CheckCatalog__Group_7__1_in_rule__CheckCatalog__Group_7__010397 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_70_in_rule__CheckCatalog__Group_7__0__Impl10425 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__CheckCatalog__Group_7__1__Impl_in_rule__CheckCatalog__Group_7__110456 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_rule__CheckCatalog__Group_7__2_in_rule__CheckCatalog__Group_7__110459 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_21_in_rule__CheckCatalog__Group_7__1__Impl10487 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__CheckCatalog__Group_7__2__Impl_in_rule__CheckCatalog__Group_7__210518 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__CheckCatalog__GrammarAssignment_7_2_in_rule__CheckCatalog__Group_7__2__Impl10545 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XImportSection__Group__0__Impl_in_rule__XImportSection__Group__010581 = new BitSet(new long[]{0x0000000000040000L});
+    public static final BitSet FOLLOW_rule__XImportSection__Group__1_in_rule__XImportSection__Group__010584 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XImportSection__Group__1__Impl_in_rule__XImportSection__Group__110642 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XImportSection__ImportDeclarationsAssignment_1_in_rule__XImportSection__Group__1__Impl10669 = new BitSet(new long[]{0x0000000000040002L});
+    public static final BitSet FOLLOW_rule__XImportDeclaration__Group__0__Impl_in_rule__XImportDeclaration__Group__010704 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_rule__XImportDeclaration__Group__1_in_rule__XImportDeclaration__Group__010707 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_18_in_rule__XImportDeclaration__Group__0__Impl10735 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XImportDeclaration__Group__1__Impl_in_rule__XImportDeclaration__Group__110766 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
+    public static final BitSet FOLLOW_rule__XImportDeclaration__Group__2_in_rule__XImportDeclaration__Group__110769 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XImportDeclaration__Alternatives_1_in_rule__XImportDeclaration__Group__1__Impl10796 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XImportDeclaration__Group__2__Impl_in_rule__XImportDeclaration__Group__210826 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_71_in_rule__XImportDeclaration__Group__2__Impl10855 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Category__Group__0__Impl_in_rule__Category__Group__010894 = new BitSet(new long[]{0x0000000000000110L});
+    public static final BitSet FOLLOW_rule__Category__Group__1_in_rule__Category__Group__010897 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_23_in_rule__Category__Group__0__Impl10925 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Category__Group__1__Impl_in_rule__Category__Group__110956 = new BitSet(new long[]{0x0000000000000110L});
+    public static final BitSet FOLLOW_rule__Category__Group__2_in_rule__Category__Group__110959 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Category__IdAssignment_1_in_rule__Category__Group__1__Impl10986 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Category__Group__2__Impl_in_rule__Category__Group__211017 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
+    public static final BitSet FOLLOW_rule__Category__Group__3_in_rule__Category__Group__211020 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Category__LabelAssignment_2_in_rule__Category__Group__2__Impl11047 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Category__Group__3__Impl_in_rule__Category__Group__311077 = new BitSet(new long[]{0x0000000FE0000000L,0x0000008000000820L});
+    public static final BitSet FOLLOW_rule__Category__Group__4_in_rule__Category__Group__311080 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_68_in_rule__Category__Group__3__Impl11108 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Category__Group__4__Impl_in_rule__Category__Group__411139 = new BitSet(new long[]{0x0000000FE0000000L,0x0000008000000820L});
+    public static final BitSet FOLLOW_rule__Category__Group__5_in_rule__Category__Group__411142 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Category__ChecksAssignment_4_in_rule__Category__Group__4__Impl11169 = new BitSet(new long[]{0x0000000FE0000002L,0x0000008000000800L});
+    public static final BitSet FOLLOW_rule__Category__Group__5__Impl_in_rule__Category__Group__511200 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_69_in_rule__Category__Group__5__Impl11228 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Check__Group__0__Impl_in_rule__Check__Group__011271 = new BitSet(new long[]{0x0000000FE0000000L,0x0000008000000800L});
+    public static final BitSet FOLLOW_rule__Check__Group__1_in_rule__Check__Group__011274 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Check__SeverityRangeAssignment_0_in_rule__Check__Group__0__Impl11301 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Check__Group__1__Impl_in_rule__Check__Group__111332 = new BitSet(new long[]{0x0000000FE0000000L,0x0000008000000800L});
+    public static final BitSet FOLLOW_rule__Check__Group__2_in_rule__Check__Group__111335 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Check__FinalAssignment_1_in_rule__Check__Group__1__Impl11362 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Check__Group__2__Impl_in_rule__Check__Group__211393 = new BitSet(new long[]{0x0000000FE0000000L,0x0000008000000800L});
+    public static final BitSet FOLLOW_rule__Check__Group__3_in_rule__Check__Group__211396 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Check__KindAssignment_2_in_rule__Check__Group__2__Impl11423 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Check__Group__3__Impl_in_rule__Check__Group__311454 = new BitSet(new long[]{0x0000000000000110L});
+    public static final BitSet FOLLOW_rule__Check__Group__4_in_rule__Check__Group__311457 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Check__DefaultSeverityAssignment_3_in_rule__Check__Group__3__Impl11484 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Check__Group__4__Impl_in_rule__Check__Group__411514 = new BitSet(new long[]{0x0000000000000110L});
+    public static final BitSet FOLLOW_rule__Check__Group__5_in_rule__Check__Group__411517 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Check__IdAssignment_4_in_rule__Check__Group__4__Impl11544 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Check__Group__5__Impl_in_rule__Check__Group__511575 = new BitSet(new long[]{0x0000000001000000L,0x0000000000000150L});
+    public static final BitSet FOLLOW_rule__Check__Group__6_in_rule__Check__Group__511578 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Check__LabelAssignment_5_in_rule__Check__Group__5__Impl11605 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Check__Group__6__Impl_in_rule__Check__Group__611635 = new BitSet(new long[]{0x0000000001000000L,0x0000000000000150L});
+    public static final BitSet FOLLOW_rule__Check__Group__7_in_rule__Check__Group__611638 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Check__Group_6__0_in_rule__Check__Group__6__Impl11665 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Check__Group__7__Impl_in_rule__Check__Group__711696 = new BitSet(new long[]{0x0000000001000000L,0x0000000000000150L});
+    public static final BitSet FOLLOW_rule__Check__Group__8_in_rule__Check__Group__711699 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Check__Group_7__0_in_rule__Check__Group__7__Impl11726 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Check__Group__8__Impl_in_rule__Check__Group__811757 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Check__Alternatives_8_in_rule__Check__Group__8__Impl11784 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Check__Group_6__0__Impl_in_rule__Check__Group_6__011832 = new BitSet(new long[]{0x0000000000000010L,0x0000000000000200L});
+    public static final BitSet FOLLOW_rule__Check__Group_6__1_in_rule__Check__Group_6__011835 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_72_in_rule__Check__Group_6__0__Impl11864 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Check__Group_6__1__Impl_in_rule__Check__Group_6__111896 = new BitSet(new long[]{0x0000000000000010L,0x0000000000000200L});
+    public static final BitSet FOLLOW_rule__Check__Group_6__2_in_rule__Check__Group_6__111899 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Check__Group_6_1__0_in_rule__Check__Group_6__1__Impl11926 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Check__Group_6__2__Impl_in_rule__Check__Group_6__211957 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_73_in_rule__Check__Group_6__2__Impl11985 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Check__Group_6_1__0__Impl_in_rule__Check__Group_6_1__012022 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__Check__Group_6_1__1_in_rule__Check__Group_6_1__012025 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Check__FormalParametersAssignment_6_1_0_in_rule__Check__Group_6_1__0__Impl12052 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Check__Group_6_1__1__Impl_in_rule__Check__Group_6_1__112082 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Check__Group_6_1_1__0_in_rule__Check__Group_6_1__1__Impl12109 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__Check__Group_6_1_1__0__Impl_in_rule__Check__Group_6_1_1__012144 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_rule__Check__Group_6_1_1__1_in_rule__Check__Group_6_1_1__012147 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_74_in_rule__Check__Group_6_1_1__0__Impl12175 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Check__Group_6_1_1__1__Impl_in_rule__Check__Group_6_1_1__112206 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Check__FormalParametersAssignment_6_1_1_1_in_rule__Check__Group_6_1_1__1__Impl12233 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Check__Group_7__0__Impl_in_rule__Check__Group_7__012267 = new BitSet(new long[]{0x0000000000000100L});
+    public static final BitSet FOLLOW_rule__Check__Group_7__1_in_rule__Check__Group_7__012270 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_24_in_rule__Check__Group_7__0__Impl12298 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Check__Group_7__1__Impl_in_rule__Check__Group_7__112329 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Check__GivenMessageAssignment_7_1_in_rule__Check__Group_7__1__Impl12356 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Check__Group_8_0__0__Impl_in_rule__Check__Group_8_0__012390 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000060L});
+    public static final BitSet FOLLOW_rule__Check__Group_8_0__1_in_rule__Check__Group_8_0__012393 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_68_in_rule__Check__Group_8_0__0__Impl12422 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Check__Group_8_0__1__Impl_in_rule__Check__Group_8_0__112454 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000060L});
+    public static final BitSet FOLLOW_rule__Check__Group_8_0__2_in_rule__Check__Group_8_0__112457 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Check__ContextsAssignment_8_0_1_in_rule__Check__Group_8_0__1__Impl12484 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000040L});
+    public static final BitSet FOLLOW_rule__Check__Group_8_0__2__Impl_in_rule__Check__Group_8_0__212515 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_69_in_rule__Check__Group_8_0__2__Impl12543 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__SeverityRange__Group__0__Impl_in_rule__SeverityRange__Group__012580 = new BitSet(new long[]{0x0000000010000000L});
+    public static final BitSet FOLLOW_rule__SeverityRange__Group__1_in_rule__SeverityRange__Group__012583 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_75_in_rule__SeverityRange__Group__0__Impl12611 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__SeverityRange__Group__1__Impl_in_rule__SeverityRange__Group__112642 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
+    public static final BitSet FOLLOW_rule__SeverityRange__Group__2_in_rule__SeverityRange__Group__112645 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_28_in_rule__SeverityRange__Group__1__Impl12673 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__SeverityRange__Group__2__Impl_in_rule__SeverityRange__Group__212704 = new BitSet(new long[]{0x0000000FE0000000L,0x0000008000000800L});
+    public static final BitSet FOLLOW_rule__SeverityRange__Group__3_in_rule__SeverityRange__Group__212707 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_72_in_rule__SeverityRange__Group__2__Impl12735 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__SeverityRange__Group__3__Impl_in_rule__SeverityRange__Group__312766 = new BitSet(new long[]{0x0004000000000000L});
+    public static final BitSet FOLLOW_rule__SeverityRange__Group__4_in_rule__SeverityRange__Group__312769 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__SeverityRange__MinSeverityAssignment_3_in_rule__SeverityRange__Group__3__Impl12796 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__SeverityRange__Group__4__Impl_in_rule__SeverityRange__Group__412826 = new BitSet(new long[]{0x0000000FE0000000L,0x0000008000000800L});
+    public static final BitSet FOLLOW_rule__SeverityRange__Group__5_in_rule__SeverityRange__Group__412829 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_50_in_rule__SeverityRange__Group__4__Impl12857 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__SeverityRange__Group__5__Impl_in_rule__SeverityRange__Group__512888 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000200L});
+    public static final BitSet FOLLOW_rule__SeverityRange__Group__6_in_rule__SeverityRange__Group__512891 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__SeverityRange__MaxSeverityAssignment_5_in_rule__SeverityRange__Group__5__Impl12918 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__SeverityRange__Group__6__Impl_in_rule__SeverityRange__Group__612948 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_73_in_rule__SeverityRange__Group__6__Impl12976 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Member__Group__0__Impl_in_rule__Member__Group__013021 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
+    public static final BitSet FOLLOW_rule__Member__Group__1_in_rule__Member__Group__013024 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Member__AnnotationsAssignment_0_in_rule__Member__Group__0__Impl13051 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000800L});
+    public static final BitSet FOLLOW_rule__Member__Group__1__Impl_in_rule__Member__Group__113082 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_rule__Member__Group__2_in_rule__Member__Group__113085 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Member__TypeAssignment_1_in_rule__Member__Group__1__Impl13112 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Member__Group__2__Impl_in_rule__Member__Group__213142 = new BitSet(new long[]{0x0000000000002000L,0x0000000000000080L});
+    public static final BitSet FOLLOW_rule__Member__Group__3_in_rule__Member__Group__213145 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Member__NameAssignment_2_in_rule__Member__Group__2__Impl13172 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Member__Group__3__Impl_in_rule__Member__Group__313202 = new BitSet(new long[]{0x0000000000002000L,0x0000000000000080L});
+    public static final BitSet FOLLOW_rule__Member__Group__4_in_rule__Member__Group__313205 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Member__Group_3__0_in_rule__Member__Group__3__Impl13232 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Member__Group__4__Impl_in_rule__Member__Group__413263 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_71_in_rule__Member__Group__4__Impl13291 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Member__Group_3__0__Impl_in_rule__Member__Group_3__013332 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__Member__Group_3__1_in_rule__Member__Group_3__013335 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleOpSingleAssign_in_rule__Member__Group_3__0__Impl13362 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Member__Group_3__1__Impl_in_rule__Member__Group_3__113391 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Member__ValueAssignment_3_1_in_rule__Member__Group_3__1__Impl13418 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Implementation__Group__0__Impl_in_rule__Implementation__Group__013452 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_rule__Implementation__Group__1_in_rule__Implementation__Group__013455 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_76_in_rule__Implementation__Group__0__Impl13483 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Implementation__Group__1__Impl_in_rule__Implementation__Group__113514 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000040L});
+    public static final BitSet FOLLOW_rule__Implementation__Group__2_in_rule__Implementation__Group__113517 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Implementation__NameAssignment_1_in_rule__Implementation__Group__1__Impl13544 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Implementation__Group__2__Impl_in_rule__Implementation__Group__213574 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Implementation__ContextAssignment_2_in_rule__Implementation__Group__2__Impl13601 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__FormalParameter__Group__0__Impl_in_rule__FormalParameter__Group__013637 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_rule__FormalParameter__Group__1_in_rule__FormalParameter__Group__013640 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__FormalParameter__TypeAssignment_0_in_rule__FormalParameter__Group__0__Impl13667 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__FormalParameter__Group__1__Impl_in_rule__FormalParameter__Group__113697 = new BitSet(new long[]{0x0000000000002000L});
+    public static final BitSet FOLLOW_rule__FormalParameter__Group__2_in_rule__FormalParameter__Group__113700 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__FormalParameter__NameAssignment_1_in_rule__FormalParameter__Group__1__Impl13727 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__FormalParameter__Group__2__Impl_in_rule__FormalParameter__Group__213757 = new BitSet(new long[]{0x10C00000000001E0L,0x0000100000002004L});
+    public static final BitSet FOLLOW_rule__FormalParameter__Group__3_in_rule__FormalParameter__Group__213760 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_13_in_rule__FormalParameter__Group__2__Impl13788 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__FormalParameter__Group__3__Impl_in_rule__FormalParameter__Group__313819 = new BitSet(new long[]{0x0000000000000100L});
+    public static final BitSet FOLLOW_rule__FormalParameter__Group__4_in_rule__FormalParameter__Group__313822 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__FormalParameter__RightAssignment_3_in_rule__FormalParameter__Group__3__Impl13849 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__FormalParameter__Group__4__Impl_in_rule__FormalParameter__Group__413879 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__FormalParameter__LabelAssignment_4_in_rule__FormalParameter__Group__4__Impl13906 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstantUnaryOperation__Group_0__0__Impl_in_rule__XConstantUnaryOperation__Group_0__013947 = new BitSet(new long[]{0x10C0000000000000L});
+    public static final BitSet FOLLOW_rule__XConstantUnaryOperation__Group_0__1_in_rule__XConstantUnaryOperation__Group_0__013950 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstantUnaryOperation__Group_0__1__Impl_in_rule__XConstantUnaryOperation__Group_0__114008 = new BitSet(new long[]{0x10C00000000001E0L,0x0000100000000004L});
+    public static final BitSet FOLLOW_rule__XConstantUnaryOperation__Group_0__2_in_rule__XConstantUnaryOperation__Group_0__114011 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstantUnaryOperation__FeatureAssignment_0_1_in_rule__XConstantUnaryOperation__Group_0__1__Impl14038 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstantUnaryOperation__Group_0__2__Impl_in_rule__XConstantUnaryOperation__Group_0__214068 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstantUnaryOperation__OperandAssignment_0_2_in_rule__XConstantUnaryOperation__Group_0__2__Impl14095 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group__0__Impl_in_rule__XConstantListLiteral__Group__014131 = new BitSet(new long[]{0x10C00000000001E0L,0x0000100000002004L});
+    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group__1_in_rule__XConstantListLiteral__Group__014134 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group__1__Impl_in_rule__XConstantListLiteral__Group__114192 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L});
+    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group__2_in_rule__XConstantListLiteral__Group__114195 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_77_in_rule__XConstantListLiteral__Group__1__Impl14223 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group__2__Impl_in_rule__XConstantListLiteral__Group__214254 = new BitSet(new long[]{0x10C00000000001E0L,0x0000100000008004L});
+    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group__3_in_rule__XConstantListLiteral__Group__214257 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_78_in_rule__XConstantListLiteral__Group__2__Impl14285 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group__3__Impl_in_rule__XConstantListLiteral__Group__314316 = new BitSet(new long[]{0x10C00000000001E0L,0x0000100000008004L});
+    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group__4_in_rule__XConstantListLiteral__Group__314319 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group_3__0_in_rule__XConstantListLiteral__Group__3__Impl14346 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group__4__Impl_in_rule__XConstantListLiteral__Group__414377 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_79_in_rule__XConstantListLiteral__Group__4__Impl14405 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group_3__0__Impl_in_rule__XConstantListLiteral__Group_3__014446 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group_3__1_in_rule__XConstantListLiteral__Group_3__014449 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstantListLiteral__ElementsAssignment_3_0_in_rule__XConstantListLiteral__Group_3__0__Impl14476 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group_3__1__Impl_in_rule__XConstantListLiteral__Group_3__114506 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group_3_1__0_in_rule__XConstantListLiteral__Group_3__1__Impl14533 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group_3_1__0__Impl_in_rule__XConstantListLiteral__Group_3_1__014568 = new BitSet(new long[]{0x10C00000000001E0L,0x0000100000000004L});
+    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group_3_1__1_in_rule__XConstantListLiteral__Group_3_1__014571 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_74_in_rule__XConstantListLiteral__Group_3_1__0__Impl14599 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group_3_1__1__Impl_in_rule__XConstantListLiteral__Group_3_1__114630 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstantListLiteral__ElementsAssignment_3_1_1_in_rule__XConstantListLiteral__Group_3_1__1__Impl14657 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Context__Group__0__Impl_in_rule__Context__Group__014691 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
+    public static final BitSet FOLLOW_rule__Context__Group__1_in_rule__Context__Group__014694 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_70_in_rule__Context__Group__0__Impl14722 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Context__Group__1__Impl_in_rule__Context__Group__114753 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
+    public static final BitSet FOLLOW_rule__Context__Group__2_in_rule__Context__Group__114756 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Context__ContextVariableAssignment_1_in_rule__Context__Group__1__Impl14783 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Context__Group__2__Impl_in_rule__Context__Group__214813 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Context__ConstraintAssignment_2_in_rule__Context__Group__2__Impl14840 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__ContextVariable__Group__0__Impl_in_rule__ContextVariable__Group__014876 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_rule__ContextVariable__Group__1_in_rule__ContextVariable__Group__014879 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__ContextVariable__TypeAssignment_0_in_rule__ContextVariable__Group__0__Impl14906 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__ContextVariable__Group__1__Impl_in_rule__ContextVariable__Group__114936 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__ContextVariable__NameAssignment_1_in_rule__ContextVariable__Group__1__Impl14963 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XGuardExpression__Group__0__Impl_in_rule__XGuardExpression__Group__014998 = new BitSet(new long[]{0x0000000000000000L,0x0000000000010000L});
+    public static final BitSet FOLLOW_rule__XGuardExpression__Group__1_in_rule__XGuardExpression__Group__015001 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XGuardExpression__Group__1__Impl_in_rule__XGuardExpression__Group__115059 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XGuardExpression__Group__2_in_rule__XGuardExpression__Group__115062 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_80_in_rule__XGuardExpression__Group__1__Impl15090 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XGuardExpression__Group__2__Impl_in_rule__XGuardExpression__Group__215121 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XGuardExpression__GuardAssignment_2_in_rule__XGuardExpression__Group__2__Impl15148 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group__0__Impl_in_rule__XIssueExpression__Group__015184 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group__1_in_rule__XIssueExpression__Group__015187 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group__1__Impl_in_rule__XIssueExpression__Group__115245 = new BitSet(new long[]{0x000000000F000010L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group__2_in_rule__XIssueExpression__Group__115248 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_81_in_rule__XIssueExpression__Group__1__Impl15276 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group__2__Impl_in_rule__XIssueExpression__Group__215307 = new BitSet(new long[]{0x000000000F000010L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group__3_in_rule__XIssueExpression__Group__215310 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__CheckAssignment_2_in_rule__XIssueExpression__Group__2__Impl15337 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group__3__Impl_in_rule__XIssueExpression__Group__315368 = new BitSet(new long[]{0x000000000F000010L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group__4_in_rule__XIssueExpression__Group__315371 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3__0_in_rule__XIssueExpression__Group__3__Impl15398 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group__4__Impl_in_rule__XIssueExpression__Group__415429 = new BitSet(new long[]{0x000000000F000010L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group__5_in_rule__XIssueExpression__Group__415432 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_4__0_in_rule__XIssueExpression__Group__4__Impl15459 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group__5__Impl_in_rule__XIssueExpression__Group__515490 = new BitSet(new long[]{0x000000000F000010L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group__6_in_rule__XIssueExpression__Group__515493 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5__0_in_rule__XIssueExpression__Group__5__Impl15520 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group__6__Impl_in_rule__XIssueExpression__Group__615551 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6__0_in_rule__XIssueExpression__Group__6__Impl15578 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3__0__Impl_in_rule__XIssueExpression__Group_3__015623 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3__1_in_rule__XIssueExpression__Group_3__015626 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_25_in_rule__XIssueExpression__Group_3__0__Impl15655 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3__1__Impl_in_rule__XIssueExpression__Group_3__115687 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3__2_in_rule__XIssueExpression__Group_3__115690 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Alternatives_3_1_in_rule__XIssueExpression__Group_3__1__Impl15717 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3__2__Impl_in_rule__XIssueExpression__Group_3__215747 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_2__0_in_rule__XIssueExpression__Group_3__2__Impl15774 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_1_0__0__Impl_in_rule__XIssueExpression__Group_3_1_0__015811 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_1_0__1_in_rule__XIssueExpression__Group_3_1_0__015814 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_77_in_rule__XIssueExpression__Group_3_1_0__0__Impl15843 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_1_0__1__Impl_in_rule__XIssueExpression__Group_3_1_0__115875 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1_in_rule__XIssueExpression__Group_3_1_0__1__Impl15902 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_1_1__0__Impl_in_rule__XIssueExpression__Group_3_1_1__015936 = new BitSet(new long[]{0x0000000000000000L,0x0000000000002000L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_1_1__1_in_rule__XIssueExpression__Group_3_1_1__015939 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0_in_rule__XIssueExpression__Group_3_1_1__0__Impl15966 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_1_1__1__Impl_in_rule__XIssueExpression__Group_3_1_1__115996 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_1_1_1__0_in_rule__XIssueExpression__Group_3_1_1__1__Impl16023 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_1_1_1__0__Impl_in_rule__XIssueExpression__Group_3_1_1_1__016058 = new BitSet(new long[]{0x0000000FFFFF0010L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_1_1_1__1_in_rule__XIssueExpression__Group_3_1_1_1__016061 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_77_in_rule__XIssueExpression__Group_3_1_1_1__0__Impl16090 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_1_1_1__1__Impl_in_rule__XIssueExpression__Group_3_1_1_1__116122 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1_in_rule__XIssueExpression__Group_3_1_1_1__1__Impl16149 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_2__0__Impl_in_rule__XIssueExpression__Group_3_2__016183 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_2__1_in_rule__XIssueExpression__Group_3_2__016186 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_78_in_rule__XIssueExpression__Group_3_2__0__Impl16215 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_2__1__Impl_in_rule__XIssueExpression__Group_3_2__116247 = new BitSet(new long[]{0x0000000000000000L,0x0000000000008000L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_2__2_in_rule__XIssueExpression__Group_3_2__116250 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__MarkerIndexAssignment_3_2_1_in_rule__XIssueExpression__Group_3_2__1__Impl16277 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_2__2__Impl_in_rule__XIssueExpression__Group_3_2__216307 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_79_in_rule__XIssueExpression__Group_3_2__2__Impl16335 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_4__0__Impl_in_rule__XIssueExpression__Group_4__016372 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_4__1_in_rule__XIssueExpression__Group_4__016375 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_24_in_rule__XIssueExpression__Group_4__0__Impl16404 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_4__1__Impl_in_rule__XIssueExpression__Group_4__116436 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__MessageAssignment_4_1_in_rule__XIssueExpression__Group_4__1__Impl16463 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5__0__Impl_in_rule__XIssueExpression__Group_5__016497 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5__1_in_rule__XIssueExpression__Group_5__016500 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_26_in_rule__XIssueExpression__Group_5__0__Impl16529 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5__1__Impl_in_rule__XIssueExpression__Group_5__116561 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5__2_in_rule__XIssueExpression__Group_5__116564 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_72_in_rule__XIssueExpression__Group_5__1__Impl16592 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5__2__Impl_in_rule__XIssueExpression__Group_5__216623 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000600L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5__3_in_rule__XIssueExpression__Group_5__216626 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__MessageParametersAssignment_5_2_in_rule__XIssueExpression__Group_5__2__Impl16653 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5__3__Impl_in_rule__XIssueExpression__Group_5__316683 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000600L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5__4_in_rule__XIssueExpression__Group_5__316686 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5_3__0_in_rule__XIssueExpression__Group_5__3__Impl16713 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5__4__Impl_in_rule__XIssueExpression__Group_5__416744 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_73_in_rule__XIssueExpression__Group_5__4__Impl16772 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5_3__0__Impl_in_rule__XIssueExpression__Group_5_3__016813 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5_3__1_in_rule__XIssueExpression__Group_5_3__016816 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_74_in_rule__XIssueExpression__Group_5_3__0__Impl16845 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5_3__1__Impl_in_rule__XIssueExpression__Group_5_3__116877 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__MessageParametersAssignment_5_3_1_in_rule__XIssueExpression__Group_5_3__1__Impl16904 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6__0__Impl_in_rule__XIssueExpression__Group_6__016938 = new BitSet(new long[]{0x0000000000000010L,0x0000000000000100L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6__1_in_rule__XIssueExpression__Group_6__016941 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_27_in_rule__XIssueExpression__Group_6__0__Impl16970 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6__1__Impl_in_rule__XIssueExpression__Group_6__117002 = new BitSet(new long[]{0x0000000000000010L,0x0000000000000100L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6__2_in_rule__XIssueExpression__Group_6__117005 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__IssueCodeAssignment_6_1_in_rule__XIssueExpression__Group_6__1__Impl17032 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6__2__Impl_in_rule__XIssueExpression__Group_6__217063 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6__3_in_rule__XIssueExpression__Group_6__217066 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_72_in_rule__XIssueExpression__Group_6__2__Impl17094 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6__3__Impl_in_rule__XIssueExpression__Group_6__317125 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000600L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6__4_in_rule__XIssueExpression__Group_6__317128 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__IssueDataAssignment_6_3_in_rule__XIssueExpression__Group_6__3__Impl17155 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6__4__Impl_in_rule__XIssueExpression__Group_6__417185 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000600L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6__5_in_rule__XIssueExpression__Group_6__417188 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6_4__0_in_rule__XIssueExpression__Group_6__4__Impl17215 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6__5__Impl_in_rule__XIssueExpression__Group_6__517246 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_73_in_rule__XIssueExpression__Group_6__5__Impl17274 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6_4__0__Impl_in_rule__XIssueExpression__Group_6_4__017317 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6_4__1_in_rule__XIssueExpression__Group_6_4__017320 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_74_in_rule__XIssueExpression__Group_6_4__0__Impl17349 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6_4__1__Impl_in_rule__XIssueExpression__Group_6_4__117381 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__IssueDataAssignment_6_4_1_in_rule__XIssueExpression__Group_6_4__1__Impl17408 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotation__Group__0__Impl_in_rule__XAnnotation__Group__017442 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000800L});
+    public static final BitSet FOLLOW_rule__XAnnotation__Group__1_in_rule__XAnnotation__Group__017445 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotation__Group__1__Impl_in_rule__XAnnotation__Group__117503 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_rule__XAnnotation__Group__2_in_rule__XAnnotation__Group__117506 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_75_in_rule__XAnnotation__Group__1__Impl17534 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotation__Group__2__Impl_in_rule__XAnnotation__Group__217565 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
+    public static final BitSet FOLLOW_rule__XAnnotation__Group__3_in_rule__XAnnotation__Group__217568 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotation__AnnotationTypeAssignment_2_in_rule__XAnnotation__Group__2__Impl17595 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotation__Group__3__Impl_in_rule__XAnnotation__Group__317625 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotation__Group_3__0_in_rule__XAnnotation__Group__3__Impl17652 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotation__Group_3__0__Impl_in_rule__XAnnotation__Group_3__017691 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536B56L});
+    public static final BitSet FOLLOW_rule__XAnnotation__Group_3__1_in_rule__XAnnotation__Group_3__017694 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_72_in_rule__XAnnotation__Group_3__0__Impl17723 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotation__Group_3__1__Impl_in_rule__XAnnotation__Group_3__117755 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536B56L});
+    public static final BitSet FOLLOW_rule__XAnnotation__Group_3__2_in_rule__XAnnotation__Group_3__117758 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotation__Alternatives_3_1_in_rule__XAnnotation__Group_3__1__Impl17785 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotation__Group_3__2__Impl_in_rule__XAnnotation__Group_3__217816 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_73_in_rule__XAnnotation__Group_3__2__Impl17844 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotation__Group_3_1_0__0__Impl_in_rule__XAnnotation__Group_3_1_0__017881 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XAnnotation__Group_3_1_0__1_in_rule__XAnnotation__Group_3_1_0__017884 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0_in_rule__XAnnotation__Group_3_1_0__0__Impl17911 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotation__Group_3_1_0__1__Impl_in_rule__XAnnotation__Group_3_1_0__117941 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotation__Group_3_1_0_1__0_in_rule__XAnnotation__Group_3_1_0__1__Impl17968 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XAnnotation__Group_3_1_0_1__0__Impl_in_rule__XAnnotation__Group_3_1_0_1__018003 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_rule__XAnnotation__Group_3_1_0_1__1_in_rule__XAnnotation__Group_3_1_0_1__018006 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_74_in_rule__XAnnotation__Group_3_1_0_1__0__Impl18034 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotation__Group_3_1_0_1__1__Impl_in_rule__XAnnotation__Group_3_1_0_1__118065 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1_in_rule__XAnnotation__Group_3_1_0_1__1__Impl18092 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__Group__0__Impl_in_rule__XAnnotationElementValuePair__Group__018126 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536956L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__Group__1_in_rule__XAnnotationElementValuePair__Group__018129 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__Group_0__0_in_rule__XAnnotationElementValuePair__Group__0__Impl18156 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__Group__1__Impl_in_rule__XAnnotationElementValuePair__Group__118186 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__ValueAssignment_1_in_rule__XAnnotationElementValuePair__Group__1__Impl18213 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__Group_0__0__Impl_in_rule__XAnnotationElementValuePair__Group_0__018247 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__Group_0_0__0_in_rule__XAnnotationElementValuePair__Group_0__0__Impl18274 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__Group_0_0__0__Impl_in_rule__XAnnotationElementValuePair__Group_0_0__018306 = new BitSet(new long[]{0x0000000000002000L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__Group_0_0__1_in_rule__XAnnotationElementValuePair__Group_0_0__018309 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__ElementAssignment_0_0_0_in_rule__XAnnotationElementValuePair__Group_0_0__0__Impl18336 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__Group_0_0__1__Impl_in_rule__XAnnotationElementValuePair__Group_0_0__118366 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_13_in_rule__XAnnotationElementValuePair__Group_0_0__1__Impl18394 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0__018429 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC53E956L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__1_in_rule__XAnnotationElementValueOrCommaList__Group_0__018432 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0__0_in_rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl18459 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0__118489 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC53E956L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__2_in_rule__XAnnotationElementValueOrCommaList__Group_0__118492 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1__0_in_rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl18519 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0__218550 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_79_in_rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl18578 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_0__018615 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0_in_rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl18642 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__018674 = new BitSet(new long[]{0x0000000000000000L,0x0000000000002000L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__018677 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__118735 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__118738 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_77_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl18766 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__218797 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_78_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl18825 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_1__018862 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1__1_in_rule__XAnnotationElementValueOrCommaList__Group_0_1__018865 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0_in_rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl18892 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_1__118922 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0_in_rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl18949 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__018984 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536956L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1_in_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__018987 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_74_in_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl19015 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__119046 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1_in_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl19073 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1__019107 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1__1_in_rule__XAnnotationElementValueOrCommaList__Group_1__019110 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl19137 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1__119166 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1__0_in_rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl19193 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1_1__019228 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1__1_in_rule__XAnnotationElementValueOrCommaList__Group_1_1__019231 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1_1__119289 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0_in_rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl19318 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0_in_rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl19330 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__019367 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536956L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1_in_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__019370 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_74_in_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl19398 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__119429 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1_in_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl19456 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0__0__Impl_in_rule__XAnnotationElementValue__Group_0__019490 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC53E956L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0__1_in_rule__XAnnotationElementValue__Group_0__019493 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_0__0_in_rule__XAnnotationElementValue__Group_0__0__Impl19520 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0__1__Impl_in_rule__XAnnotationElementValue__Group_0__119550 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC53E956L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0__2_in_rule__XAnnotationElementValue__Group_0__119553 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_1__0_in_rule__XAnnotationElementValue__Group_0__1__Impl19580 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0__2__Impl_in_rule__XAnnotationElementValue__Group_0__219611 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_79_in_rule__XAnnotationElementValue__Group_0__2__Impl19639 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_0__0__Impl_in_rule__XAnnotationElementValue__Group_0_0__019676 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__0_in_rule__XAnnotationElementValue__Group_0_0__0__Impl19703 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__0__Impl_in_rule__XAnnotationElementValue__Group_0_0_0__019735 = new BitSet(new long[]{0x0000000000000000L,0x0000000000002000L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__1_in_rule__XAnnotationElementValue__Group_0_0_0__019738 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__1__Impl_in_rule__XAnnotationElementValue__Group_0_0_0__119796 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__2_in_rule__XAnnotationElementValue__Group_0_0_0__119799 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_77_in_rule__XAnnotationElementValue__Group_0_0_0__1__Impl19827 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__2__Impl_in_rule__XAnnotationElementValue__Group_0_0_0__219858 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_78_in_rule__XAnnotationElementValue__Group_0_0_0__2__Impl19886 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_1__0__Impl_in_rule__XAnnotationElementValue__Group_0_1__019923 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_1__1_in_rule__XAnnotationElementValue__Group_0_1__019926 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValue__ElementsAssignment_0_1_0_in_rule__XAnnotationElementValue__Group_0_1__0__Impl19953 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_1__1__Impl_in_rule__XAnnotationElementValue__Group_0_1__119983 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_1_1__0_in_rule__XAnnotationElementValue__Group_0_1__1__Impl20010 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_1_1__0__Impl_in_rule__XAnnotationElementValue__Group_0_1_1__020045 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536956L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_1_1__1_in_rule__XAnnotationElementValue__Group_0_1_1__020048 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_74_in_rule__XAnnotationElementValue__Group_0_1_1__0__Impl20076 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_1_1__1__Impl_in_rule__XAnnotationElementValue__Group_0_1_1__120107 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1_in_rule__XAnnotationElementValue__Group_0_1_1__1__Impl20134 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAssignment__Group_0__0__Impl_in_rule__XAssignment__Group_0__020168 = new BitSet(new long[]{0x0000000FFFFF0010L});
+    public static final BitSet FOLLOW_rule__XAssignment__Group_0__1_in_rule__XAssignment__Group_0__020171 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAssignment__Group_0__1__Impl_in_rule__XAssignment__Group_0__120229 = new BitSet(new long[]{0x0000000000002000L});
+    public static final BitSet FOLLOW_rule__XAssignment__Group_0__2_in_rule__XAssignment__Group_0__120232 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAssignment__FeatureAssignment_0_1_in_rule__XAssignment__Group_0__1__Impl20259 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAssignment__Group_0__2__Impl_in_rule__XAssignment__Group_0__220289 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XAssignment__Group_0__3_in_rule__XAssignment__Group_0__220292 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleOpSingleAssign_in_rule__XAssignment__Group_0__2__Impl20319 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAssignment__Group_0__3__Impl_in_rule__XAssignment__Group_0__320348 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAssignment__ValueAssignment_0_3_in_rule__XAssignment__Group_0__3__Impl20375 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAssignment__Group_1__0__Impl_in_rule__XAssignment__Group_1__020413 = new BitSet(new long[]{0x0000C1F000000000L});
+    public static final BitSet FOLLOW_rule__XAssignment__Group_1__1_in_rule__XAssignment__Group_1__020416 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXOrExpression_in_rule__XAssignment__Group_1__0__Impl20443 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAssignment__Group_1__1__Impl_in_rule__XAssignment__Group_1__120472 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1__0_in_rule__XAssignment__Group_1__1__Impl20499 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1__0__Impl_in_rule__XAssignment__Group_1_1__020534 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1__1_in_rule__XAssignment__Group_1_1__020537 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1_0__0_in_rule__XAssignment__Group_1_1__0__Impl20564 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1__1__Impl_in_rule__XAssignment__Group_1_1__120594 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAssignment__RightOperandAssignment_1_1_1_in_rule__XAssignment__Group_1_1__1__Impl20621 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1_0__0__Impl_in_rule__XAssignment__Group_1_1_0__020655 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1_0_0__0_in_rule__XAssignment__Group_1_1_0__0__Impl20682 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1_0_0__0__Impl_in_rule__XAssignment__Group_1_1_0_0__020714 = new BitSet(new long[]{0x0000C1F000000000L});
+    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1_0_0__1_in_rule__XAssignment__Group_1_1_0_0__020717 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1_0_0__1__Impl_in_rule__XAssignment__Group_1_1_0_0__120775 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAssignment__FeatureAssignment_1_1_0_0_1_in_rule__XAssignment__Group_1_1_0_0__1__Impl20802 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_5__0__Impl_in_rule__OpMultiAssign__Group_5__020836 = new BitSet(new long[]{0x0000800000000000L});
+    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_5__1_in_rule__OpMultiAssign__Group_5__020839 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_47_in_rule__OpMultiAssign__Group_5__0__Impl20867 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_5__1__Impl_in_rule__OpMultiAssign__Group_5__120898 = new BitSet(new long[]{0x0000000000002000L});
+    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_5__2_in_rule__OpMultiAssign__Group_5__120901 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_47_in_rule__OpMultiAssign__Group_5__1__Impl20929 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_5__2__Impl_in_rule__OpMultiAssign__Group_5__220960 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_13_in_rule__OpMultiAssign__Group_5__2__Impl20988 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_6__0__Impl_in_rule__OpMultiAssign__Group_6__021025 = new BitSet(new long[]{0x0000600000000000L});
+    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_6__1_in_rule__OpMultiAssign__Group_6__021028 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_46_in_rule__OpMultiAssign__Group_6__0__Impl21056 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_6__1__Impl_in_rule__OpMultiAssign__Group_6__121087 = new BitSet(new long[]{0x0000600000000000L});
+    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_6__2_in_rule__OpMultiAssign__Group_6__121090 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_46_in_rule__OpMultiAssign__Group_6__1__Impl21119 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_6__2__Impl_in_rule__OpMultiAssign__Group_6__221152 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_45_in_rule__OpMultiAssign__Group_6__2__Impl21180 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XOrExpression__Group__0__Impl_in_rule__XOrExpression__Group__021217 = new BitSet(new long[]{0x0000000000004000L});
+    public static final BitSet FOLLOW_rule__XOrExpression__Group__1_in_rule__XOrExpression__Group__021220 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXAndExpression_in_rule__XOrExpression__Group__0__Impl21247 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XOrExpression__Group__1__Impl_in_rule__XOrExpression__Group__121276 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XOrExpression__Group_1__0_in_rule__XOrExpression__Group__1__Impl21303 = new BitSet(new long[]{0x0000000000004002L});
+    public static final BitSet FOLLOW_rule__XOrExpression__Group_1__0__Impl_in_rule__XOrExpression__Group_1__021338 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XOrExpression__Group_1__1_in_rule__XOrExpression__Group_1__021341 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XOrExpression__Group_1_0__0_in_rule__XOrExpression__Group_1__0__Impl21368 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XOrExpression__Group_1__1__Impl_in_rule__XOrExpression__Group_1__121398 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XOrExpression__RightOperandAssignment_1_1_in_rule__XOrExpression__Group_1__1__Impl21425 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XOrExpression__Group_1_0__0__Impl_in_rule__XOrExpression__Group_1_0__021459 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XOrExpression__Group_1_0_0__0_in_rule__XOrExpression__Group_1_0__0__Impl21486 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XOrExpression__Group_1_0_0__0__Impl_in_rule__XOrExpression__Group_1_0_0__021518 = new BitSet(new long[]{0x0000000000004000L});
+    public static final BitSet FOLLOW_rule__XOrExpression__Group_1_0_0__1_in_rule__XOrExpression__Group_1_0_0__021521 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XOrExpression__Group_1_0_0__1__Impl_in_rule__XOrExpression__Group_1_0_0__121579 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XOrExpression__FeatureAssignment_1_0_0_1_in_rule__XOrExpression__Group_1_0_0__1__Impl21606 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAndExpression__Group__0__Impl_in_rule__XAndExpression__Group__021640 = new BitSet(new long[]{0x0000000000008000L});
+    public static final BitSet FOLLOW_rule__XAndExpression__Group__1_in_rule__XAndExpression__Group__021643 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXEqualityExpression_in_rule__XAndExpression__Group__0__Impl21670 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAndExpression__Group__1__Impl_in_rule__XAndExpression__Group__121699 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAndExpression__Group_1__0_in_rule__XAndExpression__Group__1__Impl21726 = new BitSet(new long[]{0x0000000000008002L});
+    public static final BitSet FOLLOW_rule__XAndExpression__Group_1__0__Impl_in_rule__XAndExpression__Group_1__021761 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XAndExpression__Group_1__1_in_rule__XAndExpression__Group_1__021764 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAndExpression__Group_1_0__0_in_rule__XAndExpression__Group_1__0__Impl21791 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAndExpression__Group_1__1__Impl_in_rule__XAndExpression__Group_1__121821 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAndExpression__RightOperandAssignment_1_1_in_rule__XAndExpression__Group_1__1__Impl21848 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAndExpression__Group_1_0__0__Impl_in_rule__XAndExpression__Group_1_0__021882 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAndExpression__Group_1_0_0__0_in_rule__XAndExpression__Group_1_0__0__Impl21909 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAndExpression__Group_1_0_0__0__Impl_in_rule__XAndExpression__Group_1_0_0__021941 = new BitSet(new long[]{0x0000000000008000L});
+    public static final BitSet FOLLOW_rule__XAndExpression__Group_1_0_0__1_in_rule__XAndExpression__Group_1_0_0__021944 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAndExpression__Group_1_0_0__1__Impl_in_rule__XAndExpression__Group_1_0_0__122002 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAndExpression__FeatureAssignment_1_0_0_1_in_rule__XAndExpression__Group_1_0_0__1__Impl22029 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XEqualityExpression__Group__0__Impl_in_rule__XEqualityExpression__Group__022063 = new BitSet(new long[]{0x00001E0000000000L});
+    public static final BitSet FOLLOW_rule__XEqualityExpression__Group__1_in_rule__XEqualityExpression__Group__022066 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXRelationalExpression_in_rule__XEqualityExpression__Group__0__Impl22093 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XEqualityExpression__Group__1__Impl_in_rule__XEqualityExpression__Group__122122 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1__0_in_rule__XEqualityExpression__Group__1__Impl22149 = new BitSet(new long[]{0x00001E0000000002L});
+    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1__0__Impl_in_rule__XEqualityExpression__Group_1__022184 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1__1_in_rule__XEqualityExpression__Group_1__022187 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1_0__0_in_rule__XEqualityExpression__Group_1__0__Impl22214 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1__1__Impl_in_rule__XEqualityExpression__Group_1__122244 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XEqualityExpression__RightOperandAssignment_1_1_in_rule__XEqualityExpression__Group_1__1__Impl22271 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1_0__0__Impl_in_rule__XEqualityExpression__Group_1_0__022305 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1_0_0__0_in_rule__XEqualityExpression__Group_1_0__0__Impl22332 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1_0_0__0__Impl_in_rule__XEqualityExpression__Group_1_0_0__022364 = new BitSet(new long[]{0x00001E0000000000L});
+    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1_0_0__1_in_rule__XEqualityExpression__Group_1_0_0__022367 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1_0_0__1__Impl_in_rule__XEqualityExpression__Group_1_0_0__122425 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XEqualityExpression__FeatureAssignment_1_0_0_1_in_rule__XEqualityExpression__Group_1_0_0__1__Impl22452 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XRelationalExpression__Group__0__Impl_in_rule__XRelationalExpression__Group__022486 = new BitSet(new long[]{0x0000E00000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_rule__XRelationalExpression__Group__1_in_rule__XRelationalExpression__Group__022489 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXOtherOperatorExpression_in_rule__XRelationalExpression__Group__0__Impl22516 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XRelationalExpression__Group__1__Impl_in_rule__XRelationalExpression__Group__122545 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XRelationalExpression__Alternatives_1_in_rule__XRelationalExpression__Group__1__Impl22572 = new BitSet(new long[]{0x0000E00000000002L,0x0000000000040000L});
+    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0__0__Impl_in_rule__XRelationalExpression__Group_1_0__022607 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
+    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0__1_in_rule__XRelationalExpression__Group_1_0__022610 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0_0__0_in_rule__XRelationalExpression__Group_1_0__0__Impl22637 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0__1__Impl_in_rule__XRelationalExpression__Group_1_0__122667 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XRelationalExpression__TypeAssignment_1_0_1_in_rule__XRelationalExpression__Group_1_0__1__Impl22694 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0_0__0__Impl_in_rule__XRelationalExpression__Group_1_0_0__022728 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0_0_0__0_in_rule__XRelationalExpression__Group_1_0_0__0__Impl22755 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0_0_0__0__Impl_in_rule__XRelationalExpression__Group_1_0_0_0__022787 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0_0_0__1_in_rule__XRelationalExpression__Group_1_0_0_0__022790 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0_0_0__1__Impl_in_rule__XRelationalExpression__Group_1_0_0_0__122848 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_82_in_rule__XRelationalExpression__Group_1_0_0_0__1__Impl22876 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1__0__Impl_in_rule__XRelationalExpression__Group_1_1__022911 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1__1_in_rule__XRelationalExpression__Group_1_1__022914 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1_0__0_in_rule__XRelationalExpression__Group_1_1__0__Impl22941 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1__1__Impl_in_rule__XRelationalExpression__Group_1_1__122971 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XRelationalExpression__RightOperandAssignment_1_1_1_in_rule__XRelationalExpression__Group_1_1__1__Impl22998 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1_0__0__Impl_in_rule__XRelationalExpression__Group_1_1_0__023032 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1_0_0__0_in_rule__XRelationalExpression__Group_1_1_0__0__Impl23059 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1_0_0__0__Impl_in_rule__XRelationalExpression__Group_1_1_0_0__023091 = new BitSet(new long[]{0x0000E00000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1_0_0__1_in_rule__XRelationalExpression__Group_1_1_0_0__023094 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1_0_0__1__Impl_in_rule__XRelationalExpression__Group_1_1_0_0__123152 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1_in_rule__XRelationalExpression__Group_1_1_0_0__1__Impl23179 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__OpCompare__Group_1__0__Impl_in_rule__OpCompare__Group_1__023213 = new BitSet(new long[]{0x0000000000002000L});
+    public static final BitSet FOLLOW_rule__OpCompare__Group_1__1_in_rule__OpCompare__Group_1__023216 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_47_in_rule__OpCompare__Group_1__0__Impl23244 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__OpCompare__Group_1__1__Impl_in_rule__OpCompare__Group_1__123275 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_13_in_rule__OpCompare__Group_1__1__Impl23303 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group__0__Impl_in_rule__XOtherOperatorExpression__Group__023338 = new BitSet(new long[]{0x003FC00000000000L});
+    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group__1_in_rule__XOtherOperatorExpression__Group__023341 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXAdditiveExpression_in_rule__XOtherOperatorExpression__Group__0__Impl23368 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group__1__Impl_in_rule__XOtherOperatorExpression__Group__123397 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1__0_in_rule__XOtherOperatorExpression__Group__1__Impl23424 = new BitSet(new long[]{0x003FC00000000002L});
+    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1__0__Impl_in_rule__XOtherOperatorExpression__Group_1__023459 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1__1_in_rule__XOtherOperatorExpression__Group_1__023462 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1_0__0_in_rule__XOtherOperatorExpression__Group_1__0__Impl23489 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1__1__Impl_in_rule__XOtherOperatorExpression__Group_1__123519 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__RightOperandAssignment_1_1_in_rule__XOtherOperatorExpression__Group_1__1__Impl23546 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1_0__0__Impl_in_rule__XOtherOperatorExpression__Group_1_0__023580 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1_0_0__0_in_rule__XOtherOperatorExpression__Group_1_0__0__Impl23607 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1_0_0__0__Impl_in_rule__XOtherOperatorExpression__Group_1_0_0__023639 = new BitSet(new long[]{0x003FC00000000000L});
+    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1_0_0__1_in_rule__XOtherOperatorExpression__Group_1_0_0__023642 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1_0_0__1__Impl_in_rule__XOtherOperatorExpression__Group_1_0_0__123700 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1_in_rule__XOtherOperatorExpression__Group_1_0_0__1__Impl23727 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__OpOther__Group_2__0__Impl_in_rule__OpOther__Group_2__023761 = new BitSet(new long[]{0x0004000000000000L});
+    public static final BitSet FOLLOW_rule__OpOther__Group_2__1_in_rule__OpOther__Group_2__023764 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_46_in_rule__OpOther__Group_2__0__Impl23792 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__OpOther__Group_2__1__Impl_in_rule__OpOther__Group_2__123823 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_50_in_rule__OpOther__Group_2__1__Impl23851 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__OpOther__Group_5__0__Impl_in_rule__OpOther__Group_5__023886 = new BitSet(new long[]{0x0000400000000000L});
+    public static final BitSet FOLLOW_rule__OpOther__Group_5__1_in_rule__OpOther__Group_5__023889 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_46_in_rule__OpOther__Group_5__0__Impl23917 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__OpOther__Group_5__1__Impl_in_rule__OpOther__Group_5__123948 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__OpOther__Alternatives_5_1_in_rule__OpOther__Group_5__1__Impl23975 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__OpOther__Group_5_1_0__0__Impl_in_rule__OpOther__Group_5_1_0__024009 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__OpOther__Group_5_1_0_0__0_in_rule__OpOther__Group_5_1_0__0__Impl24036 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__OpOther__Group_5_1_0_0__0__Impl_in_rule__OpOther__Group_5_1_0_0__024068 = new BitSet(new long[]{0x0000400000000000L});
+    public static final BitSet FOLLOW_rule__OpOther__Group_5_1_0_0__1_in_rule__OpOther__Group_5_1_0_0__024071 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_46_in_rule__OpOther__Group_5_1_0_0__0__Impl24099 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__OpOther__Group_5_1_0_0__1__Impl_in_rule__OpOther__Group_5_1_0_0__124130 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_46_in_rule__OpOther__Group_5_1_0_0__1__Impl24158 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__OpOther__Group_6__0__Impl_in_rule__OpOther__Group_6__024193 = new BitSet(new long[]{0x0008800000000000L});
+    public static final BitSet FOLLOW_rule__OpOther__Group_6__1_in_rule__OpOther__Group_6__024196 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_47_in_rule__OpOther__Group_6__0__Impl24224 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__OpOther__Group_6__1__Impl_in_rule__OpOther__Group_6__124255 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__OpOther__Alternatives_6_1_in_rule__OpOther__Group_6__1__Impl24282 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__OpOther__Group_6_1_0__0__Impl_in_rule__OpOther__Group_6_1_0__024316 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__OpOther__Group_6_1_0_0__0_in_rule__OpOther__Group_6_1_0__0__Impl24343 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__OpOther__Group_6_1_0_0__0__Impl_in_rule__OpOther__Group_6_1_0_0__024375 = new BitSet(new long[]{0x0000800000000000L});
+    public static final BitSet FOLLOW_rule__OpOther__Group_6_1_0_0__1_in_rule__OpOther__Group_6_1_0_0__024378 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_47_in_rule__OpOther__Group_6_1_0_0__0__Impl24406 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__OpOther__Group_6_1_0_0__1__Impl_in_rule__OpOther__Group_6_1_0_0__124437 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_47_in_rule__OpOther__Group_6_1_0_0__1__Impl24465 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group__0__Impl_in_rule__XAdditiveExpression__Group__024500 = new BitSet(new long[]{0x00C0000000000000L});
+    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group__1_in_rule__XAdditiveExpression__Group__024503 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXMultiplicativeExpression_in_rule__XAdditiveExpression__Group__0__Impl24530 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group__1__Impl_in_rule__XAdditiveExpression__Group__124559 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1__0_in_rule__XAdditiveExpression__Group__1__Impl24586 = new BitSet(new long[]{0x00C0000000000002L});
+    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1__0__Impl_in_rule__XAdditiveExpression__Group_1__024621 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1__1_in_rule__XAdditiveExpression__Group_1__024624 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1_0__0_in_rule__XAdditiveExpression__Group_1__0__Impl24651 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1__1__Impl_in_rule__XAdditiveExpression__Group_1__124681 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAdditiveExpression__RightOperandAssignment_1_1_in_rule__XAdditiveExpression__Group_1__1__Impl24708 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1_0__0__Impl_in_rule__XAdditiveExpression__Group_1_0__024742 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1_0_0__0_in_rule__XAdditiveExpression__Group_1_0__0__Impl24769 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1_0_0__0__Impl_in_rule__XAdditiveExpression__Group_1_0_0__024801 = new BitSet(new long[]{0x00C0000000000000L});
+    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1_0_0__1_in_rule__XAdditiveExpression__Group_1_0_0__024804 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1_0_0__1__Impl_in_rule__XAdditiveExpression__Group_1_0_0__124862 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAdditiveExpression__FeatureAssignment_1_0_0_1_in_rule__XAdditiveExpression__Group_1_0_0__1__Impl24889 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group__0__Impl_in_rule__XMultiplicativeExpression__Group__024923 = new BitSet(new long[]{0x0F00000000000000L});
+    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group__1_in_rule__XMultiplicativeExpression__Group__024926 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXUnaryOperation_in_rule__XMultiplicativeExpression__Group__0__Impl24953 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group__1__Impl_in_rule__XMultiplicativeExpression__Group__124982 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1__0_in_rule__XMultiplicativeExpression__Group__1__Impl25009 = new BitSet(new long[]{0x0F00000000000002L});
+    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1__0__Impl_in_rule__XMultiplicativeExpression__Group_1__025044 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1__1_in_rule__XMultiplicativeExpression__Group_1__025047 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1_0__0_in_rule__XMultiplicativeExpression__Group_1__0__Impl25074 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1__1__Impl_in_rule__XMultiplicativeExpression__Group_1__125104 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__RightOperandAssignment_1_1_in_rule__XMultiplicativeExpression__Group_1__1__Impl25131 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1_0__0__Impl_in_rule__XMultiplicativeExpression__Group_1_0__025165 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1_0_0__0_in_rule__XMultiplicativeExpression__Group_1_0__0__Impl25192 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1_0_0__0__Impl_in_rule__XMultiplicativeExpression__Group_1_0_0__025224 = new BitSet(new long[]{0x0F00000000000000L});
+    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1_0_0__1_in_rule__XMultiplicativeExpression__Group_1_0_0__025227 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1_0_0__1__Impl_in_rule__XMultiplicativeExpression__Group_1_0_0__125285 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1_in_rule__XMultiplicativeExpression__Group_1_0_0__1__Impl25312 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XUnaryOperation__Group_0__0__Impl_in_rule__XUnaryOperation__Group_0__025346 = new BitSet(new long[]{0x10C0000000000000L});
+    public static final BitSet FOLLOW_rule__XUnaryOperation__Group_0__1_in_rule__XUnaryOperation__Group_0__025349 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XUnaryOperation__Group_0__1__Impl_in_rule__XUnaryOperation__Group_0__125407 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XUnaryOperation__Group_0__2_in_rule__XUnaryOperation__Group_0__125410 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XUnaryOperation__FeatureAssignment_0_1_in_rule__XUnaryOperation__Group_0__1__Impl25437 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XUnaryOperation__Group_0__2__Impl_in_rule__XUnaryOperation__Group_0__225467 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XUnaryOperation__OperandAssignment_0_2_in_rule__XUnaryOperation__Group_0__2__Impl25494 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XCastedExpression__Group__0__Impl_in_rule__XCastedExpression__Group__025530 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_rule__XCastedExpression__Group__1_in_rule__XCastedExpression__Group__025533 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXPostfixOperation_in_rule__XCastedExpression__Group__0__Impl25560 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XCastedExpression__Group__1__Impl_in_rule__XCastedExpression__Group__125589 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1__0_in_rule__XCastedExpression__Group__1__Impl25616 = new BitSet(new long[]{0x0000000000000002L,0x0000000000080000L});
+    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1__0__Impl_in_rule__XCastedExpression__Group_1__025651 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
+    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1__1_in_rule__XCastedExpression__Group_1__025654 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1_0__0_in_rule__XCastedExpression__Group_1__0__Impl25681 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1__1__Impl_in_rule__XCastedExpression__Group_1__125711 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XCastedExpression__TypeAssignment_1_1_in_rule__XCastedExpression__Group_1__1__Impl25738 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1_0__0__Impl_in_rule__XCastedExpression__Group_1_0__025772 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1_0_0__0_in_rule__XCastedExpression__Group_1_0__0__Impl25799 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1_0_0__0__Impl_in_rule__XCastedExpression__Group_1_0_0__025831 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1_0_0__1_in_rule__XCastedExpression__Group_1_0_0__025834 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1_0_0__1__Impl_in_rule__XCastedExpression__Group_1_0_0__125892 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_83_in_rule__XCastedExpression__Group_1_0_0__1__Impl25920 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XPostfixOperation__Group__0__Impl_in_rule__XPostfixOperation__Group__025955 = new BitSet(new long[]{0x6000000000000000L});
+    public static final BitSet FOLLOW_rule__XPostfixOperation__Group__1_in_rule__XPostfixOperation__Group__025958 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXMemberFeatureCall_in_rule__XPostfixOperation__Group__0__Impl25985 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XPostfixOperation__Group__1__Impl_in_rule__XPostfixOperation__Group__126014 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XPostfixOperation__Group_1__0_in_rule__XPostfixOperation__Group__1__Impl26041 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XPostfixOperation__Group_1__0__Impl_in_rule__XPostfixOperation__Group_1__026076 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XPostfixOperation__Group_1_0__0_in_rule__XPostfixOperation__Group_1__0__Impl26103 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XPostfixOperation__Group_1_0__0__Impl_in_rule__XPostfixOperation__Group_1_0__026135 = new BitSet(new long[]{0x6000000000000000L});
+    public static final BitSet FOLLOW_rule__XPostfixOperation__Group_1_0__1_in_rule__XPostfixOperation__Group_1_0__026138 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XPostfixOperation__Group_1_0__1__Impl_in_rule__XPostfixOperation__Group_1_0__126196 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XPostfixOperation__FeatureAssignment_1_0_1_in_rule__XPostfixOperation__Group_1_0__1__Impl26223 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group__0__Impl_in_rule__XMemberFeatureCall__Group__026257 = new BitSet(new long[]{0x8000000000000000L,0x0000030000000000L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group__1_in_rule__XMemberFeatureCall__Group__026260 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXPrimaryExpression_in_rule__XMemberFeatureCall__Group__0__Impl26287 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group__1__Impl_in_rule__XMemberFeatureCall__Group__126316 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Alternatives_1_in_rule__XMemberFeatureCall__Group__1__Impl26343 = new BitSet(new long[]{0x8000000000000002L,0x0000030000000000L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_0__026378 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0__1_in_rule__XMemberFeatureCall__Group_1_0__026381 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0__0_in_rule__XMemberFeatureCall__Group_1_0__0__Impl26408 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0__1__Impl_in_rule__XMemberFeatureCall__Group_1_0__126438 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__ValueAssignment_1_0_1_in_rule__XMemberFeatureCall__Group_1_0__1__Impl26465 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_0_0__026499 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__0_in_rule__XMemberFeatureCall__Group_1_0_0__0__Impl26526 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_0_0_0__026558 = new BitSet(new long[]{0x8000000000000000L,0x0000010000000000L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__1_in_rule__XMemberFeatureCall__Group_1_0_0_0__026561 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl_in_rule__XMemberFeatureCall__Group_1_0_0_0__126619 = new BitSet(new long[]{0x0000000FFFFF0010L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__2_in_rule__XMemberFeatureCall__Group_1_0_0_0__126622 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Alternatives_1_0_0_0_1_in_rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl26649 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl_in_rule__XMemberFeatureCall__Group_1_0_0_0__226679 = new BitSet(new long[]{0x0000000000002000L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__3_in_rule__XMemberFeatureCall__Group_1_0_0_0__226682 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2_in_rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl26709 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl_in_rule__XMemberFeatureCall__Group_1_0_0_0__326739 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleOpSingleAssign_in_rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl26766 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__0__Impl_in_rule__XMemberFeatureCall__Group_1_1__026803 = new BitSet(new long[]{0x0000800FFFFF0010L,0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__1_in_rule__XMemberFeatureCall__Group_1_1__026806 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_0__0_in_rule__XMemberFeatureCall__Group_1_1__0__Impl26833 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__1__Impl_in_rule__XMemberFeatureCall__Group_1_1__126863 = new BitSet(new long[]{0x0000800FFFFF0010L,0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__2_in_rule__XMemberFeatureCall__Group_1_1__126866 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__0_in_rule__XMemberFeatureCall__Group_1_1__1__Impl26893 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__2__Impl_in_rule__XMemberFeatureCall__Group_1_1__226924 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004100L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__3_in_rule__XMemberFeatureCall__Group_1_1__226927 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__FeatureAssignment_1_1_2_in_rule__XMemberFeatureCall__Group_1_1__2__Impl26954 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__3__Impl_in_rule__XMemberFeatureCall__Group_1_1__326984 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004100L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__4_in_rule__XMemberFeatureCall__Group_1_1__326987 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__0_in_rule__XMemberFeatureCall__Group_1_1__3__Impl27014 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__4__Impl_in_rule__XMemberFeatureCall__Group_1_1__427045 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4_in_rule__XMemberFeatureCall__Group_1_1__4__Impl27072 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_0__027113 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_0_0__0_in_rule__XMemberFeatureCall__Group_1_1_0__0__Impl27140 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_0_0__027172 = new BitSet(new long[]{0x8000000000000000L,0x0000030000000000L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_0_0__1_in_rule__XMemberFeatureCall__Group_1_1_0_0__027175 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_0_0__127233 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Alternatives_1_1_0_0_1_in_rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl27260 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_1__027294 = new BitSet(new long[]{0x0008000FE0800010L,0x000000A000001900L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__1_in_rule__XMemberFeatureCall__Group_1_1_1__027297 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_47_in_rule__XMemberFeatureCall__Group_1_1_1__0__Impl27325 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_1__127356 = new BitSet(new long[]{0x0000400000000000L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__2_in_rule__XMemberFeatureCall__Group_1_1_1__127359 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1_in_rule__XMemberFeatureCall__Group_1_1_1__1__Impl27386 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__2__Impl_in_rule__XMemberFeatureCall__Group_1_1_1__227416 = new BitSet(new long[]{0x0000400000000000L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__3_in_rule__XMemberFeatureCall__Group_1_1_1__227419 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1_2__0_in_rule__XMemberFeatureCall__Group_1_1_1__2__Impl27446 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__3__Impl_in_rule__XMemberFeatureCall__Group_1_1_1__327477 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_46_in_rule__XMemberFeatureCall__Group_1_1_1__3__Impl27505 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_1_2__027544 = new BitSet(new long[]{0x0008000FE0800010L,0x000000A000001900L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1_2__1_in_rule__XMemberFeatureCall__Group_1_1_1_2__027547 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_74_in_rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl27575 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_1_2__127606 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1_in_rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl27633 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_3__027667 = new BitSet(new long[]{0x10C8800FFFFF01F0L,0x0000148BFC537B56L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__1_in_rule__XMemberFeatureCall__Group_1_1_3__027670 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0_in_rule__XMemberFeatureCall__Group_1_1_3__0__Impl27697 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_3__127727 = new BitSet(new long[]{0x10C8800FFFFF01F0L,0x0000148BFC537B56L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__2_in_rule__XMemberFeatureCall__Group_1_1_3__127730 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Alternatives_1_1_3_1_in_rule__XMemberFeatureCall__Group_1_1_3__1__Impl27757 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__2__Impl_in_rule__XMemberFeatureCall__Group_1_1_3__227788 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_73_in_rule__XMemberFeatureCall__Group_1_1_3__2__Impl27816 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__027853 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1__1_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__027856 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl27883 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__127913 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl27940 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__027975 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__027978 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_74_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl28006 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__128037 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl28064 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSetLiteral__Group__0__Impl_in_rule__XSetLiteral__Group__028098 = new BitSet(new long[]{0x0000000000000000L,0x0000000000002000L});
+    public static final BitSet FOLLOW_rule__XSetLiteral__Group__1_in_rule__XSetLiteral__Group__028101 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSetLiteral__Group__1__Impl_in_rule__XSetLiteral__Group__128159 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
+    public static final BitSet FOLLOW_rule__XSetLiteral__Group__2_in_rule__XSetLiteral__Group__128162 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_77_in_rule__XSetLiteral__Group__1__Impl28190 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSetLiteral__Group__2__Impl_in_rule__XSetLiteral__Group__228221 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536176L});
+    public static final BitSet FOLLOW_rule__XSetLiteral__Group__3_in_rule__XSetLiteral__Group__228224 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_68_in_rule__XSetLiteral__Group__2__Impl28252 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSetLiteral__Group__3__Impl_in_rule__XSetLiteral__Group__328283 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536176L});
+    public static final BitSet FOLLOW_rule__XSetLiteral__Group__4_in_rule__XSetLiteral__Group__328286 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSetLiteral__Group_3__0_in_rule__XSetLiteral__Group__3__Impl28313 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSetLiteral__Group__4__Impl_in_rule__XSetLiteral__Group__428344 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_69_in_rule__XSetLiteral__Group__4__Impl28372 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSetLiteral__Group_3__0__Impl_in_rule__XSetLiteral__Group_3__028413 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XSetLiteral__Group_3__1_in_rule__XSetLiteral__Group_3__028416 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSetLiteral__ElementsAssignment_3_0_in_rule__XSetLiteral__Group_3__0__Impl28443 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSetLiteral__Group_3__1__Impl_in_rule__XSetLiteral__Group_3__128473 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSetLiteral__Group_3_1__0_in_rule__XSetLiteral__Group_3__1__Impl28500 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XSetLiteral__Group_3_1__0__Impl_in_rule__XSetLiteral__Group_3_1__028535 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XSetLiteral__Group_3_1__1_in_rule__XSetLiteral__Group_3_1__028538 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_74_in_rule__XSetLiteral__Group_3_1__0__Impl28566 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSetLiteral__Group_3_1__1__Impl_in_rule__XSetLiteral__Group_3_1__128597 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSetLiteral__ElementsAssignment_3_1_1_in_rule__XSetLiteral__Group_3_1__1__Impl28624 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XListLiteral__Group__0__Impl_in_rule__XListLiteral__Group__028658 = new BitSet(new long[]{0x0000000000000000L,0x0000000000002000L});
+    public static final BitSet FOLLOW_rule__XListLiteral__Group__1_in_rule__XListLiteral__Group__028661 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XListLiteral__Group__1__Impl_in_rule__XListLiteral__Group__128719 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L});
+    public static final BitSet FOLLOW_rule__XListLiteral__Group__2_in_rule__XListLiteral__Group__128722 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_77_in_rule__XListLiteral__Group__1__Impl28750 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XListLiteral__Group__2__Impl_in_rule__XListLiteral__Group__228781 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC53E156L});
+    public static final BitSet FOLLOW_rule__XListLiteral__Group__3_in_rule__XListLiteral__Group__228784 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_78_in_rule__XListLiteral__Group__2__Impl28812 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XListLiteral__Group__3__Impl_in_rule__XListLiteral__Group__328843 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC53E156L});
+    public static final BitSet FOLLOW_rule__XListLiteral__Group__4_in_rule__XListLiteral__Group__328846 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XListLiteral__Group_3__0_in_rule__XListLiteral__Group__3__Impl28873 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XListLiteral__Group__4__Impl_in_rule__XListLiteral__Group__428904 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_79_in_rule__XListLiteral__Group__4__Impl28932 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XListLiteral__Group_3__0__Impl_in_rule__XListLiteral__Group_3__028973 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XListLiteral__Group_3__1_in_rule__XListLiteral__Group_3__028976 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XListLiteral__ElementsAssignment_3_0_in_rule__XListLiteral__Group_3__0__Impl29003 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XListLiteral__Group_3__1__Impl_in_rule__XListLiteral__Group_3__129033 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XListLiteral__Group_3_1__0_in_rule__XListLiteral__Group_3__1__Impl29060 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XListLiteral__Group_3_1__0__Impl_in_rule__XListLiteral__Group_3_1__029095 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XListLiteral__Group_3_1__1_in_rule__XListLiteral__Group_3_1__029098 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_74_in_rule__XListLiteral__Group_3_1__0__Impl29126 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XListLiteral__Group_3_1__1__Impl_in_rule__XListLiteral__Group_3_1__129157 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XListLiteral__ElementsAssignment_3_1_1_in_rule__XListLiteral__Group_3_1__1__Impl29184 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XClosure__Group__0__Impl_in_rule__XClosure__Group__029218 = new BitSet(new long[]{0x10C8800FFFFF01F0L,0x00001C8BFC537957L});
+    public static final BitSet FOLLOW_rule__XClosure__Group__1_in_rule__XClosure__Group__029221 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XClosure__Group_0__0_in_rule__XClosure__Group__0__Impl29248 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XClosure__Group__1__Impl_in_rule__XClosure__Group__129278 = new BitSet(new long[]{0x10C8800FFFFF01F0L,0x00001C8BFC537957L});
+    public static final BitSet FOLLOW_rule__XClosure__Group__2_in_rule__XClosure__Group__129281 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XClosure__Group_1__0_in_rule__XClosure__Group__1__Impl29308 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XClosure__Group__2__Impl_in_rule__XClosure__Group__229339 = new BitSet(new long[]{0x0000000000000000L,0x0000000000008000L});
+    public static final BitSet FOLLOW_rule__XClosure__Group__3_in_rule__XClosure__Group__229342 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XClosure__ExpressionAssignment_2_in_rule__XClosure__Group__2__Impl29369 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XClosure__Group__3__Impl_in_rule__XClosure__Group__329399 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_79_in_rule__XClosure__Group__3__Impl29427 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XClosure__Group_0__0__Impl_in_rule__XClosure__Group_0__029466 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XClosure__Group_0_0__0_in_rule__XClosure__Group_0__0__Impl29493 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XClosure__Group_0_0__0__Impl_in_rule__XClosure__Group_0_0__029525 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L});
+    public static final BitSet FOLLOW_rule__XClosure__Group_0_0__1_in_rule__XClosure__Group_0_0__029528 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XClosure__Group_0_0__1__Impl_in_rule__XClosure__Group_0_0__129586 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_78_in_rule__XClosure__Group_0_0__1__Impl29614 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XClosure__Group_1__0__Impl_in_rule__XClosure__Group_1__029649 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XClosure__Group_1_0__0_in_rule__XClosure__Group_1__0__Impl29676 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XClosure__Group_1_0__0__Impl_in_rule__XClosure__Group_1_0__029708 = new BitSet(new long[]{0x0008000FE0800010L,0x0000048000001900L});
+    public static final BitSet FOLLOW_rule__XClosure__Group_1_0__1_in_rule__XClosure__Group_1_0__029711 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XClosure__Group_1_0_0__0_in_rule__XClosure__Group_1_0__0__Impl29738 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XClosure__Group_1_0__1__Impl_in_rule__XClosure__Group_1_0__129769 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XClosure__ExplicitSyntaxAssignment_1_0_1_in_rule__XClosure__Group_1_0__1__Impl29796 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XClosure__Group_1_0_0__0__Impl_in_rule__XClosure__Group_1_0_0__029830 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XClosure__Group_1_0_0__1_in_rule__XClosure__Group_1_0_0__029833 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0_in_rule__XClosure__Group_1_0_0__0__Impl29860 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XClosure__Group_1_0_0__1__Impl_in_rule__XClosure__Group_1_0_0__129890 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XClosure__Group_1_0_0_1__0_in_rule__XClosure__Group_1_0_0__1__Impl29917 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XClosure__Group_1_0_0_1__0__Impl_in_rule__XClosure__Group_1_0_0_1__029952 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
+    public static final BitSet FOLLOW_rule__XClosure__Group_1_0_0_1__1_in_rule__XClosure__Group_1_0_0_1__029955 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_74_in_rule__XClosure__Group_1_0_0_1__0__Impl29983 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XClosure__Group_1_0_0_1__1__Impl_in_rule__XClosure__Group_1_0_0_1__130014 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1_in_rule__XClosure__Group_1_0_0_1__1__Impl30041 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XExpressionInClosure__Group__0__Impl_in_rule__XExpressionInClosure__Group__030075 = new BitSet(new long[]{0x10C8800FFFFF01F0L,0x00001C8BFC537957L});
+    public static final BitSet FOLLOW_rule__XExpressionInClosure__Group__1_in_rule__XExpressionInClosure__Group__030078 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XExpressionInClosure__Group__1__Impl_in_rule__XExpressionInClosure__Group__130136 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XExpressionInClosure__Group_1__0_in_rule__XExpressionInClosure__Group__1__Impl30163 = new BitSet(new long[]{0x10C0800FFFFF01F2L,0x0000180BFC536157L});
+    public static final BitSet FOLLOW_rule__XExpressionInClosure__Group_1__0__Impl_in_rule__XExpressionInClosure__Group_1__030198 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
+    public static final BitSet FOLLOW_rule__XExpressionInClosure__Group_1__1_in_rule__XExpressionInClosure__Group_1__030201 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XExpressionInClosure__ExpressionsAssignment_1_0_in_rule__XExpressionInClosure__Group_1__0__Impl30228 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XExpressionInClosure__Group_1__1__Impl_in_rule__XExpressionInClosure__Group_1__130258 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_71_in_rule__XExpressionInClosure__Group_1__1__Impl30287 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XShortClosure__Group__0__Impl_in_rule__XShortClosure__Group__030324 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XShortClosure__Group__1_in_rule__XShortClosure__Group__030327 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XShortClosure__Group_0__0_in_rule__XShortClosure__Group__0__Impl30354 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XShortClosure__Group__1__Impl_in_rule__XShortClosure__Group__130384 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XShortClosure__ExpressionAssignment_1_in_rule__XShortClosure__Group__1__Impl30411 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XShortClosure__Group_0__0__Impl_in_rule__XShortClosure__Group_0__030445 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0__0_in_rule__XShortClosure__Group_0__0__Impl30472 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0__0__Impl_in_rule__XShortClosure__Group_0_0__030504 = new BitSet(new long[]{0x0008000FE0800010L,0x0000048000001900L});
+    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0__1_in_rule__XShortClosure__Group_0_0__030507 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0__1__Impl_in_rule__XShortClosure__Group_0_0__130565 = new BitSet(new long[]{0x0008000FE0800010L,0x0000048000001900L});
+    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0__2_in_rule__XShortClosure__Group_0_0__130568 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0_1__0_in_rule__XShortClosure__Group_0_0__1__Impl30595 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0__2__Impl_in_rule__XShortClosure__Group_0_0__230626 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2_in_rule__XShortClosure__Group_0_0__2__Impl30653 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0_1__0__Impl_in_rule__XShortClosure__Group_0_0_1__030689 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0_1__1_in_rule__XShortClosure__Group_0_0_1__030692 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0_in_rule__XShortClosure__Group_0_0_1__0__Impl30719 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0_1__1__Impl_in_rule__XShortClosure__Group_0_0_1__130749 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0_1_1__0_in_rule__XShortClosure__Group_0_0_1__1__Impl30776 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0_1_1__0__Impl_in_rule__XShortClosure__Group_0_0_1_1__030811 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
+    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0_1_1__1_in_rule__XShortClosure__Group_0_0_1_1__030814 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_74_in_rule__XShortClosure__Group_0_0_1_1__0__Impl30842 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0_1_1__1__Impl_in_rule__XShortClosure__Group_0_0_1_1__130873 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1_in_rule__XShortClosure__Group_0_0_1_1__1__Impl30900 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XParenthesizedExpression__Group__0__Impl_in_rule__XParenthesizedExpression__Group__030934 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XParenthesizedExpression__Group__1_in_rule__XParenthesizedExpression__Group__030937 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_72_in_rule__XParenthesizedExpression__Group__0__Impl30965 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XParenthesizedExpression__Group__1__Impl_in_rule__XParenthesizedExpression__Group__130996 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000200L});
+    public static final BitSet FOLLOW_rule__XParenthesizedExpression__Group__2_in_rule__XParenthesizedExpression__Group__130999 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XParenthesizedExpression__Group__1__Impl31026 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XParenthesizedExpression__Group__2__Impl_in_rule__XParenthesizedExpression__Group__231055 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_73_in_rule__XParenthesizedExpression__Group__2__Impl31083 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIfExpression__Group__0__Impl_in_rule__XIfExpression__Group__031120 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_rule__XIfExpression__Group__1_in_rule__XIfExpression__Group__031123 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIfExpression__Group__1__Impl_in_rule__XIfExpression__Group__131181 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
+    public static final BitSet FOLLOW_rule__XIfExpression__Group__2_in_rule__XIfExpression__Group__131184 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_84_in_rule__XIfExpression__Group__1__Impl31212 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIfExpression__Group__2__Impl_in_rule__XIfExpression__Group__231243 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XIfExpression__Group__3_in_rule__XIfExpression__Group__231246 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_72_in_rule__XIfExpression__Group__2__Impl31274 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIfExpression__Group__3__Impl_in_rule__XIfExpression__Group__331305 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000200L});
+    public static final BitSet FOLLOW_rule__XIfExpression__Group__4_in_rule__XIfExpression__Group__331308 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIfExpression__IfAssignment_3_in_rule__XIfExpression__Group__3__Impl31335 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIfExpression__Group__4__Impl_in_rule__XIfExpression__Group__431365 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XIfExpression__Group__5_in_rule__XIfExpression__Group__431368 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_73_in_rule__XIfExpression__Group__4__Impl31396 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIfExpression__Group__5__Impl_in_rule__XIfExpression__Group__531427 = new BitSet(new long[]{0x0000000000000000L,0x0000000000200000L});
+    public static final BitSet FOLLOW_rule__XIfExpression__Group__6_in_rule__XIfExpression__Group__531430 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIfExpression__ThenAssignment_5_in_rule__XIfExpression__Group__5__Impl31457 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIfExpression__Group__6__Impl_in_rule__XIfExpression__Group__631487 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIfExpression__Group_6__0_in_rule__XIfExpression__Group__6__Impl31514 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIfExpression__Group_6__0__Impl_in_rule__XIfExpression__Group_6__031559 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XIfExpression__Group_6__1_in_rule__XIfExpression__Group_6__031562 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_85_in_rule__XIfExpression__Group_6__0__Impl31591 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIfExpression__Group_6__1__Impl_in_rule__XIfExpression__Group_6__131623 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIfExpression__ElseAssignment_6_1_in_rule__XIfExpression__Group_6__1__Impl31650 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__0__Impl_in_rule__XSwitchExpression__Group__031684 = new BitSet(new long[]{0x0000000000000000L,0x0000000000400000L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__1_in_rule__XSwitchExpression__Group__031687 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__1__Impl_in_rule__XSwitchExpression__Group__131745 = new BitSet(new long[]{0x10C8800FFFFF01F0L,0x0000108BFC537956L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__2_in_rule__XSwitchExpression__Group__131748 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_86_in_rule__XSwitchExpression__Group__1__Impl31776 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__2__Impl_in_rule__XSwitchExpression__Group__231807 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__3_in_rule__XSwitchExpression__Group__231810 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Alternatives_2_in_rule__XSwitchExpression__Group__2__Impl31837 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__3__Impl_in_rule__XSwitchExpression__Group__331867 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008003801D20L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__4_in_rule__XSwitchExpression__Group__331870 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_68_in_rule__XSwitchExpression__Group__3__Impl31898 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__4__Impl_in_rule__XSwitchExpression__Group__431929 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008003801D20L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__5_in_rule__XSwitchExpression__Group__431932 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__CasesAssignment_4_in_rule__XSwitchExpression__Group__4__Impl31959 = new BitSet(new long[]{0x0008000FE0800012L,0x0000008002801D00L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__5__Impl_in_rule__XSwitchExpression__Group__531990 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008003801D20L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__6_in_rule__XSwitchExpression__Group__531993 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_5__0_in_rule__XSwitchExpression__Group__5__Impl32020 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__6__Impl_in_rule__XSwitchExpression__Group__632051 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_69_in_rule__XSwitchExpression__Group__6__Impl32079 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0__0__Impl_in_rule__XSwitchExpression__Group_2_0__032124 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0__1_in_rule__XSwitchExpression__Group_2_0__032127 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0_0__0_in_rule__XSwitchExpression__Group_2_0__0__Impl32154 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0__1__Impl_in_rule__XSwitchExpression__Group_2_0__132184 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000200L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0__2_in_rule__XSwitchExpression__Group_2_0__132187 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__SwitchAssignment_2_0_1_in_rule__XSwitchExpression__Group_2_0__1__Impl32214 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0__2__Impl_in_rule__XSwitchExpression__Group_2_0__232244 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_73_in_rule__XSwitchExpression__Group_2_0__2__Impl32272 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0_0__0__Impl_in_rule__XSwitchExpression__Group_2_0_0__032309 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__0_in_rule__XSwitchExpression__Group_2_0_0__0__Impl32336 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__0__Impl_in_rule__XSwitchExpression__Group_2_0_0_0__032368 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__1_in_rule__XSwitchExpression__Group_2_0_0_0__032371 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_72_in_rule__XSwitchExpression__Group_2_0_0_0__0__Impl32399 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__1__Impl_in_rule__XSwitchExpression__Group_2_0_0_0__132430 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__2_in_rule__XSwitchExpression__Group_2_0_0_0__132433 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1_in_rule__XSwitchExpression__Group_2_0_0_0__1__Impl32460 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__2__Impl_in_rule__XSwitchExpression__Group_2_0_0_0__232490 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_87_in_rule__XSwitchExpression__Group_2_0_0_0__2__Impl32518 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1__0__Impl_in_rule__XSwitchExpression__Group_2_1__032555 = new BitSet(new long[]{0x10C8800FFFFF01F0L,0x0000108BFC537956L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1__1_in_rule__XSwitchExpression__Group_2_1__032558 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1_0__0_in_rule__XSwitchExpression__Group_2_1__0__Impl32585 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1__1__Impl_in_rule__XSwitchExpression__Group_2_1__132616 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__SwitchAssignment_2_1_1_in_rule__XSwitchExpression__Group_2_1__1__Impl32643 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1_0__0__Impl_in_rule__XSwitchExpression__Group_2_1_0__032677 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1_0_0__0_in_rule__XSwitchExpression__Group_2_1_0__0__Impl32704 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1_0_0__0__Impl_in_rule__XSwitchExpression__Group_2_1_0_0__032736 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1_0_0__1_in_rule__XSwitchExpression__Group_2_1_0_0__032739 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0_in_rule__XSwitchExpression__Group_2_1_0_0__0__Impl32766 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1_0_0__1__Impl_in_rule__XSwitchExpression__Group_2_1_0_0__132796 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_87_in_rule__XSwitchExpression__Group_2_1_0_0__1__Impl32824 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_5__0__Impl_in_rule__XSwitchExpression__Group_5__032859 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_5__1_in_rule__XSwitchExpression__Group_5__032862 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_88_in_rule__XSwitchExpression__Group_5__0__Impl32890 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_5__1__Impl_in_rule__XSwitchExpression__Group_5__132921 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_5__2_in_rule__XSwitchExpression__Group_5__132924 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_87_in_rule__XSwitchExpression__Group_5__1__Impl32952 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_5__2__Impl_in_rule__XSwitchExpression__Group_5__232983 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__DefaultAssignment_5_2_in_rule__XSwitchExpression__Group_5__2__Impl33010 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XCasePart__Group__0__Impl_in_rule__XCasePart__Group__033046 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008002801D00L});
+    public static final BitSet FOLLOW_rule__XCasePart__Group__1_in_rule__XCasePart__Group__033049 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XCasePart__Group__1__Impl_in_rule__XCasePart__Group__133107 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008002801D00L});
+    public static final BitSet FOLLOW_rule__XCasePart__Group__2_in_rule__XCasePart__Group__133110 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XCasePart__TypeGuardAssignment_1_in_rule__XCasePart__Group__1__Impl33137 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XCasePart__Group__2__Impl_in_rule__XCasePart__Group__233168 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008002801D00L});
+    public static final BitSet FOLLOW_rule__XCasePart__Group__3_in_rule__XCasePart__Group__233171 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XCasePart__Group_2__0_in_rule__XCasePart__Group__2__Impl33198 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XCasePart__Group__3__Impl_in_rule__XCasePart__Group__333229 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XCasePart__Alternatives_3_in_rule__XCasePart__Group__3__Impl33256 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XCasePart__Group_2__0__Impl_in_rule__XCasePart__Group_2__033294 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XCasePart__Group_2__1_in_rule__XCasePart__Group_2__033297 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_89_in_rule__XCasePart__Group_2__0__Impl33325 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XCasePart__Group_2__1__Impl_in_rule__XCasePart__Group_2__133356 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XCasePart__CaseAssignment_2_1_in_rule__XCasePart__Group_2__1__Impl33383 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XCasePart__Group_3_0__0__Impl_in_rule__XCasePart__Group_3_0__033417 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XCasePart__Group_3_0__1_in_rule__XCasePart__Group_3_0__033420 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_87_in_rule__XCasePart__Group_3_0__0__Impl33448 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XCasePart__Group_3_0__1__Impl_in_rule__XCasePart__Group_3_0__133479 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XCasePart__ThenAssignment_3_0_1_in_rule__XCasePart__Group_3_0__1__Impl33506 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XForLoopExpression__Group__0__Impl_in_rule__XForLoopExpression__Group__033540 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XForLoopExpression__Group__1_in_rule__XForLoopExpression__Group__033543 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0__0_in_rule__XForLoopExpression__Group__0__Impl33570 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XForLoopExpression__Group__1__Impl_in_rule__XForLoopExpression__Group__133600 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000200L});
+    public static final BitSet FOLLOW_rule__XForLoopExpression__Group__2_in_rule__XForLoopExpression__Group__133603 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XForLoopExpression__ForExpressionAssignment_1_in_rule__XForLoopExpression__Group__1__Impl33630 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XForLoopExpression__Group__2__Impl_in_rule__XForLoopExpression__Group__233660 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XForLoopExpression__Group__3_in_rule__XForLoopExpression__Group__233663 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_73_in_rule__XForLoopExpression__Group__2__Impl33691 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XForLoopExpression__Group__3__Impl_in_rule__XForLoopExpression__Group__333722 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XForLoopExpression__EachExpressionAssignment_3_in_rule__XForLoopExpression__Group__3__Impl33749 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0__0__Impl_in_rule__XForLoopExpression__Group_0__033787 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__0_in_rule__XForLoopExpression__Group_0__0__Impl33814 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__0__Impl_in_rule__XForLoopExpression__Group_0_0__033846 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000040L});
+    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__1_in_rule__XForLoopExpression__Group_0_0__033849 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__1__Impl_in_rule__XForLoopExpression__Group_0_0__133907 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
+    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__2_in_rule__XForLoopExpression__Group_0_0__133910 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_70_in_rule__XForLoopExpression__Group_0_0__1__Impl33938 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__2__Impl_in_rule__XForLoopExpression__Group_0_0__233969 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
+    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__3_in_rule__XForLoopExpression__Group_0_0__233972 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_72_in_rule__XForLoopExpression__Group_0_0__2__Impl34000 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__3__Impl_in_rule__XForLoopExpression__Group_0_0__334031 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
+    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__4_in_rule__XForLoopExpression__Group_0_0__334034 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XForLoopExpression__DeclaredParamAssignment_0_0_3_in_rule__XForLoopExpression__Group_0_0__3__Impl34061 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__4__Impl_in_rule__XForLoopExpression__Group_0_0__434091 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_87_in_rule__XForLoopExpression__Group_0_0__4__Impl34119 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__0__Impl_in_rule__XBasicForLoopExpression__Group__034160 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000040L});
+    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__1_in_rule__XBasicForLoopExpression__Group__034163 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__1__Impl_in_rule__XBasicForLoopExpression__Group__134221 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
+    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__2_in_rule__XBasicForLoopExpression__Group__134224 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_70_in_rule__XBasicForLoopExpression__Group__1__Impl34252 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__2__Impl_in_rule__XBasicForLoopExpression__Group__234283 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000180BFC5361D7L});
+    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__3_in_rule__XBasicForLoopExpression__Group__234286 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_72_in_rule__XBasicForLoopExpression__Group__2__Impl34314 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__3__Impl_in_rule__XBasicForLoopExpression__Group__334345 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000180BFC5361D7L});
+    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__4_in_rule__XBasicForLoopExpression__Group__334348 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_3__0_in_rule__XBasicForLoopExpression__Group__3__Impl34375 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__4__Impl_in_rule__XBasicForLoopExpression__Group__434406 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC5361D6L});
+    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__5_in_rule__XBasicForLoopExpression__Group__434409 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_71_in_rule__XBasicForLoopExpression__Group__4__Impl34437 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__5__Impl_in_rule__XBasicForLoopExpression__Group__534468 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC5361D6L});
+    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__6_in_rule__XBasicForLoopExpression__Group__534471 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__ExpressionAssignment_5_in_rule__XBasicForLoopExpression__Group__5__Impl34498 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__6__Impl_in_rule__XBasicForLoopExpression__Group__634529 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536356L});
+    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__7_in_rule__XBasicForLoopExpression__Group__634532 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_71_in_rule__XBasicForLoopExpression__Group__6__Impl34560 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__7__Impl_in_rule__XBasicForLoopExpression__Group__734591 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536356L});
+    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__8_in_rule__XBasicForLoopExpression__Group__734594 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_7__0_in_rule__XBasicForLoopExpression__Group__7__Impl34621 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__8__Impl_in_rule__XBasicForLoopExpression__Group__834652 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__9_in_rule__XBasicForLoopExpression__Group__834655 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_73_in_rule__XBasicForLoopExpression__Group__8__Impl34683 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__9__Impl_in_rule__XBasicForLoopExpression__Group__934714 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__EachExpressionAssignment_9_in_rule__XBasicForLoopExpression__Group__9__Impl34741 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_3__0__Impl_in_rule__XBasicForLoopExpression__Group_3__034791 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_3__1_in_rule__XBasicForLoopExpression__Group_3__034794 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0_in_rule__XBasicForLoopExpression__Group_3__0__Impl34821 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_3__1__Impl_in_rule__XBasicForLoopExpression__Group_3__134851 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_3_1__0_in_rule__XBasicForLoopExpression__Group_3__1__Impl34878 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_3_1__0__Impl_in_rule__XBasicForLoopExpression__Group_3_1__034913 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000180BFC536157L});
+    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_3_1__1_in_rule__XBasicForLoopExpression__Group_3_1__034916 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_74_in_rule__XBasicForLoopExpression__Group_3_1__0__Impl34944 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_3_1__1__Impl_in_rule__XBasicForLoopExpression__Group_3_1__134975 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1_in_rule__XBasicForLoopExpression__Group_3_1__1__Impl35002 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_7__0__Impl_in_rule__XBasicForLoopExpression__Group_7__035036 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_7__1_in_rule__XBasicForLoopExpression__Group_7__035039 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0_in_rule__XBasicForLoopExpression__Group_7__0__Impl35066 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_7__1__Impl_in_rule__XBasicForLoopExpression__Group_7__135096 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_7_1__0_in_rule__XBasicForLoopExpression__Group_7__1__Impl35123 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_7_1__0__Impl_in_rule__XBasicForLoopExpression__Group_7_1__035158 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_7_1__1_in_rule__XBasicForLoopExpression__Group_7_1__035161 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_74_in_rule__XBasicForLoopExpression__Group_7_1__0__Impl35189 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_7_1__1__Impl_in_rule__XBasicForLoopExpression__Group_7_1__135220 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1_in_rule__XBasicForLoopExpression__Group_7_1__1__Impl35247 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XWhileExpression__Group__0__Impl_in_rule__XWhileExpression__Group__035281 = new BitSet(new long[]{0x0000000000000000L,0x0000000004000000L});
+    public static final BitSet FOLLOW_rule__XWhileExpression__Group__1_in_rule__XWhileExpression__Group__035284 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XWhileExpression__Group__1__Impl_in_rule__XWhileExpression__Group__135342 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
+    public static final BitSet FOLLOW_rule__XWhileExpression__Group__2_in_rule__XWhileExpression__Group__135345 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_90_in_rule__XWhileExpression__Group__1__Impl35373 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XWhileExpression__Group__2__Impl_in_rule__XWhileExpression__Group__235404 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XWhileExpression__Group__3_in_rule__XWhileExpression__Group__235407 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_72_in_rule__XWhileExpression__Group__2__Impl35435 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XWhileExpression__Group__3__Impl_in_rule__XWhileExpression__Group__335466 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000200L});
+    public static final BitSet FOLLOW_rule__XWhileExpression__Group__4_in_rule__XWhileExpression__Group__335469 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XWhileExpression__PredicateAssignment_3_in_rule__XWhileExpression__Group__3__Impl35496 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XWhileExpression__Group__4__Impl_in_rule__XWhileExpression__Group__435526 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XWhileExpression__Group__5_in_rule__XWhileExpression__Group__435529 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_73_in_rule__XWhileExpression__Group__4__Impl35557 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XWhileExpression__Group__5__Impl_in_rule__XWhileExpression__Group__535588 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XWhileExpression__BodyAssignment_5_in_rule__XWhileExpression__Group__5__Impl35615 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__0__Impl_in_rule__XDoWhileExpression__Group__035657 = new BitSet(new long[]{0x0000000000000000L,0x0000000008000000L});
+    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__1_in_rule__XDoWhileExpression__Group__035660 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__1__Impl_in_rule__XDoWhileExpression__Group__135718 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__2_in_rule__XDoWhileExpression__Group__135721 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_91_in_rule__XDoWhileExpression__Group__1__Impl35749 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__2__Impl_in_rule__XDoWhileExpression__Group__235780 = new BitSet(new long[]{0x0000000000000000L,0x0000000004000000L});
+    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__3_in_rule__XDoWhileExpression__Group__235783 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XDoWhileExpression__BodyAssignment_2_in_rule__XDoWhileExpression__Group__2__Impl35810 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__3__Impl_in_rule__XDoWhileExpression__Group__335840 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
+    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__4_in_rule__XDoWhileExpression__Group__335843 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_90_in_rule__XDoWhileExpression__Group__3__Impl35871 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__4__Impl_in_rule__XDoWhileExpression__Group__435902 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__5_in_rule__XDoWhileExpression__Group__435905 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_72_in_rule__XDoWhileExpression__Group__4__Impl35933 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__5__Impl_in_rule__XDoWhileExpression__Group__535964 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000200L});
+    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__6_in_rule__XDoWhileExpression__Group__535967 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XDoWhileExpression__PredicateAssignment_5_in_rule__XDoWhileExpression__Group__5__Impl35994 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__6__Impl_in_rule__XDoWhileExpression__Group__636024 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_73_in_rule__XDoWhileExpression__Group__6__Impl36052 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XBlockExpression__Group__0__Impl_in_rule__XBlockExpression__Group__036097 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
+    public static final BitSet FOLLOW_rule__XBlockExpression__Group__1_in_rule__XBlockExpression__Group__036100 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XBlockExpression__Group__1__Impl_in_rule__XBlockExpression__Group__136158 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000180BFC536177L});
+    public static final BitSet FOLLOW_rule__XBlockExpression__Group__2_in_rule__XBlockExpression__Group__136161 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_68_in_rule__XBlockExpression__Group__1__Impl36189 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XBlockExpression__Group__2__Impl_in_rule__XBlockExpression__Group__236220 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000180BFC536177L});
+    public static final BitSet FOLLOW_rule__XBlockExpression__Group__3_in_rule__XBlockExpression__Group__236223 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XBlockExpression__Group_2__0_in_rule__XBlockExpression__Group__2__Impl36250 = new BitSet(new long[]{0x10C0800FFFFF01F2L,0x0000180BFC536157L});
+    public static final BitSet FOLLOW_rule__XBlockExpression__Group__3__Impl_in_rule__XBlockExpression__Group__336281 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_69_in_rule__XBlockExpression__Group__3__Impl36309 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XBlockExpression__Group_2__0__Impl_in_rule__XBlockExpression__Group_2__036348 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
+    public static final BitSet FOLLOW_rule__XBlockExpression__Group_2__1_in_rule__XBlockExpression__Group_2__036351 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XBlockExpression__ExpressionsAssignment_2_0_in_rule__XBlockExpression__Group_2__0__Impl36378 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XBlockExpression__Group_2__1__Impl_in_rule__XBlockExpression__Group_2__136408 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_71_in_rule__XBlockExpression__Group_2__1__Impl36437 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group__0__Impl_in_rule__XVariableDeclaration__Group__036474 = new BitSet(new long[]{0x0000000000000000L,0x0000080000000001L});
+    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group__1_in_rule__XVariableDeclaration__Group__036477 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group__1__Impl_in_rule__XVariableDeclaration__Group__136535 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
+    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group__2_in_rule__XVariableDeclaration__Group__136538 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XVariableDeclaration__Alternatives_1_in_rule__XVariableDeclaration__Group__1__Impl36565 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group__2__Impl_in_rule__XVariableDeclaration__Group__236595 = new BitSet(new long[]{0x0000000000002000L});
+    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group__3_in_rule__XVariableDeclaration__Group__236598 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XVariableDeclaration__Alternatives_2_in_rule__XVariableDeclaration__Group__2__Impl36625 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group__3__Impl_in_rule__XVariableDeclaration__Group__336655 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_3__0_in_rule__XVariableDeclaration__Group__3__Impl36682 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_2_0__0__Impl_in_rule__XVariableDeclaration__Group_2_0__036721 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_2_0_0__0_in_rule__XVariableDeclaration__Group_2_0__0__Impl36748 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_2_0_0__0__Impl_in_rule__XVariableDeclaration__Group_2_0_0__036780 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_2_0_0__1_in_rule__XVariableDeclaration__Group_2_0_0__036783 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XVariableDeclaration__TypeAssignment_2_0_0_0_in_rule__XVariableDeclaration__Group_2_0_0__0__Impl36810 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_2_0_0__1__Impl_in_rule__XVariableDeclaration__Group_2_0_0__136840 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XVariableDeclaration__NameAssignment_2_0_0_1_in_rule__XVariableDeclaration__Group_2_0_0__1__Impl36867 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_3__0__Impl_in_rule__XVariableDeclaration__Group_3__036901 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_3__1_in_rule__XVariableDeclaration__Group_3__036904 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_13_in_rule__XVariableDeclaration__Group_3__0__Impl36932 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_3__1__Impl_in_rule__XVariableDeclaration__Group_3__136963 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XVariableDeclaration__RightAssignment_3_1_in_rule__XVariableDeclaration__Group_3__1__Impl36990 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmFormalParameter__Group__0__Impl_in_rule__JvmFormalParameter__Group__037024 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
+    public static final BitSet FOLLOW_rule__JvmFormalParameter__Group__1_in_rule__JvmFormalParameter__Group__037027 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmFormalParameter__ParameterTypeAssignment_0_in_rule__JvmFormalParameter__Group__0__Impl37054 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmFormalParameter__Group__1__Impl_in_rule__JvmFormalParameter__Group__137085 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmFormalParameter__NameAssignment_1_in_rule__JvmFormalParameter__Group__1__Impl37112 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__FullJvmFormalParameter__Group__0__Impl_in_rule__FullJvmFormalParameter__Group__037146 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_rule__FullJvmFormalParameter__Group__1_in_rule__FullJvmFormalParameter__Group__037149 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__FullJvmFormalParameter__ParameterTypeAssignment_0_in_rule__FullJvmFormalParameter__Group__0__Impl37176 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__FullJvmFormalParameter__Group__1__Impl_in_rule__FullJvmFormalParameter__Group__137206 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__FullJvmFormalParameter__NameAssignment_1_in_rule__FullJvmFormalParameter__Group__1__Impl37233 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__Group__0__Impl_in_rule__XFeatureCall__Group__037267 = new BitSet(new long[]{0x0000800FFFFF0010L,0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__Group__1_in_rule__XFeatureCall__Group__037270 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__Group__1__Impl_in_rule__XFeatureCall__Group__137328 = new BitSet(new long[]{0x0000800FFFFF0010L,0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__Group__2_in_rule__XFeatureCall__Group__137331 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1__0_in_rule__XFeatureCall__Group__1__Impl37358 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__Group__2__Impl_in_rule__XFeatureCall__Group__237389 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004100L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__Group__3_in_rule__XFeatureCall__Group__237392 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__FeatureAssignment_2_in_rule__XFeatureCall__Group__2__Impl37419 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__Group__3__Impl_in_rule__XFeatureCall__Group__337449 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004100L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__Group__4_in_rule__XFeatureCall__Group__337452 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3__0_in_rule__XFeatureCall__Group__3__Impl37479 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__Group__4__Impl_in_rule__XFeatureCall__Group__437510 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_4_in_rule__XFeatureCall__Group__4__Impl37537 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1__0__Impl_in_rule__XFeatureCall__Group_1__037578 = new BitSet(new long[]{0x0008000FE0800010L,0x000000A000001900L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1__1_in_rule__XFeatureCall__Group_1__037581 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_47_in_rule__XFeatureCall__Group_1__0__Impl37609 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1__1__Impl_in_rule__XFeatureCall__Group_1__137640 = new BitSet(new long[]{0x0000400000000000L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1__2_in_rule__XFeatureCall__Group_1__137643 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__TypeArgumentsAssignment_1_1_in_rule__XFeatureCall__Group_1__1__Impl37670 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1__2__Impl_in_rule__XFeatureCall__Group_1__237700 = new BitSet(new long[]{0x0000400000000000L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1__3_in_rule__XFeatureCall__Group_1__237703 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1_2__0_in_rule__XFeatureCall__Group_1__2__Impl37730 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1__3__Impl_in_rule__XFeatureCall__Group_1__337761 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_46_in_rule__XFeatureCall__Group_1__3__Impl37789 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1_2__0__Impl_in_rule__XFeatureCall__Group_1_2__037828 = new BitSet(new long[]{0x0008000FE0800010L,0x000000A000001900L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1_2__1_in_rule__XFeatureCall__Group_1_2__037831 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_74_in_rule__XFeatureCall__Group_1_2__0__Impl37859 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1_2__1__Impl_in_rule__XFeatureCall__Group_1_2__137890 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__TypeArgumentsAssignment_1_2_1_in_rule__XFeatureCall__Group_1_2__1__Impl37917 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3__0__Impl_in_rule__XFeatureCall__Group_3__037951 = new BitSet(new long[]{0x10C8800FFFFF01F0L,0x0000148BFC537B56L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3__1_in_rule__XFeatureCall__Group_3__037954 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__ExplicitOperationCallAssignment_3_0_in_rule__XFeatureCall__Group_3__0__Impl37981 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3__1__Impl_in_rule__XFeatureCall__Group_3__138011 = new BitSet(new long[]{0x10C8800FFFFF01F0L,0x0000148BFC537B56L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3__2_in_rule__XFeatureCall__Group_3__138014 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__Alternatives_3_1_in_rule__XFeatureCall__Group_3__1__Impl38041 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3__2__Impl_in_rule__XFeatureCall__Group_3__238072 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_73_in_rule__XFeatureCall__Group_3__2__Impl38100 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3_1_1__0__Impl_in_rule__XFeatureCall__Group_3_1_1__038137 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3_1_1__1_in_rule__XFeatureCall__Group_3_1_1__038140 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0_in_rule__XFeatureCall__Group_3_1_1__0__Impl38167 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3_1_1__1__Impl_in_rule__XFeatureCall__Group_3_1_1__138197 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3_1_1_1__0_in_rule__XFeatureCall__Group_3_1_1__1__Impl38224 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3_1_1_1__0__Impl_in_rule__XFeatureCall__Group_3_1_1_1__038259 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3_1_1_1__1_in_rule__XFeatureCall__Group_3_1_1_1__038262 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_74_in_rule__XFeatureCall__Group_3_1_1_1__0__Impl38290 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3_1_1_1__1__Impl_in_rule__XFeatureCall__Group_3_1_1_1__138321 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1_in_rule__XFeatureCall__Group_3_1_1_1__1__Impl38348 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__Group__0__Impl_in_rule__XConstructorCall__Group__038382 = new BitSet(new long[]{0x0000000000000000L,0x0000000010000000L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__Group__1_in_rule__XConstructorCall__Group__038385 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__Group__1__Impl_in_rule__XConstructorCall__Group__138443 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__Group__2_in_rule__XConstructorCall__Group__138446 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_92_in_rule__XConstructorCall__Group__1__Impl38474 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__Group__2__Impl_in_rule__XConstructorCall__Group__238505 = new BitSet(new long[]{0x0000800000000000L,0x0000000000004100L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__Group__3_in_rule__XConstructorCall__Group__238508 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__ConstructorAssignment_2_in_rule__XConstructorCall__Group__2__Impl38535 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__Group__3__Impl_in_rule__XConstructorCall__Group__338565 = new BitSet(new long[]{0x0000800000000000L,0x0000000000004100L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__Group__4_in_rule__XConstructorCall__Group__338568 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__0_in_rule__XConstructorCall__Group__3__Impl38595 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__Group__4__Impl_in_rule__XConstructorCall__Group__438626 = new BitSet(new long[]{0x0000800000000000L,0x0000000000004100L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__Group__5_in_rule__XConstructorCall__Group__438629 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4__0_in_rule__XConstructorCall__Group__4__Impl38656 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__Group__5__Impl_in_rule__XConstructorCall__Group__538687 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__ArgumentsAssignment_5_in_rule__XConstructorCall__Group__5__Impl38714 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__0__Impl_in_rule__XConstructorCall__Group_3__038757 = new BitSet(new long[]{0x0008000FE0800010L,0x000000A000001900L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__1_in_rule__XConstructorCall__Group_3__038760 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_47_in_rule__XConstructorCall__Group_3__0__Impl38789 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__1__Impl_in_rule__XConstructorCall__Group_3__138821 = new BitSet(new long[]{0x0000400000000000L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__2_in_rule__XConstructorCall__Group_3__138824 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__TypeArgumentsAssignment_3_1_in_rule__XConstructorCall__Group_3__1__Impl38851 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__2__Impl_in_rule__XConstructorCall__Group_3__238881 = new BitSet(new long[]{0x0000400000000000L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__3_in_rule__XConstructorCall__Group_3__238884 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3_2__0_in_rule__XConstructorCall__Group_3__2__Impl38911 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__3__Impl_in_rule__XConstructorCall__Group_3__338942 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_46_in_rule__XConstructorCall__Group_3__3__Impl38970 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3_2__0__Impl_in_rule__XConstructorCall__Group_3_2__039009 = new BitSet(new long[]{0x0008000FE0800010L,0x000000A000001900L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3_2__1_in_rule__XConstructorCall__Group_3_2__039012 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_74_in_rule__XConstructorCall__Group_3_2__0__Impl39040 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3_2__1__Impl_in_rule__XConstructorCall__Group_3_2__139071 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__TypeArgumentsAssignment_3_2_1_in_rule__XConstructorCall__Group_3_2__1__Impl39098 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4__0__Impl_in_rule__XConstructorCall__Group_4__039132 = new BitSet(new long[]{0x10C8800FFFFF01F0L,0x0000148BFC537B56L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4__1_in_rule__XConstructorCall__Group_4__039135 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0_in_rule__XConstructorCall__Group_4__0__Impl39162 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4__1__Impl_in_rule__XConstructorCall__Group_4__139192 = new BitSet(new long[]{0x10C8800FFFFF01F0L,0x0000148BFC537B56L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4__2_in_rule__XConstructorCall__Group_4__139195 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__Alternatives_4_1_in_rule__XConstructorCall__Group_4__1__Impl39222 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4__2__Impl_in_rule__XConstructorCall__Group_4__239253 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_73_in_rule__XConstructorCall__Group_4__2__Impl39281 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4_1_1__0__Impl_in_rule__XConstructorCall__Group_4_1_1__039318 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4_1_1__1_in_rule__XConstructorCall__Group_4_1_1__039321 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__ArgumentsAssignment_4_1_1_0_in_rule__XConstructorCall__Group_4_1_1__0__Impl39348 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4_1_1__1__Impl_in_rule__XConstructorCall__Group_4_1_1__139378 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4_1_1_1__0_in_rule__XConstructorCall__Group_4_1_1__1__Impl39405 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4_1_1_1__0__Impl_in_rule__XConstructorCall__Group_4_1_1_1__039440 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4_1_1_1__1_in_rule__XConstructorCall__Group_4_1_1_1__039443 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_74_in_rule__XConstructorCall__Group_4_1_1_1__0__Impl39471 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4_1_1_1__1__Impl_in_rule__XConstructorCall__Group_4_1_1_1__139502 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1_in_rule__XConstructorCall__Group_4_1_1_1__1__Impl39529 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XBooleanLiteral__Group__0__Impl_in_rule__XBooleanLiteral__Group__039563 = new BitSet(new long[]{0x0000000000000000L,0x0000100000000004L});
+    public static final BitSet FOLLOW_rule__XBooleanLiteral__Group__1_in_rule__XBooleanLiteral__Group__039566 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XBooleanLiteral__Group__1__Impl_in_rule__XBooleanLiteral__Group__139624 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XBooleanLiteral__Alternatives_1_in_rule__XBooleanLiteral__Group__1__Impl39651 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XNullLiteral__Group__0__Impl_in_rule__XNullLiteral__Group__039685 = new BitSet(new long[]{0x0000000000000000L,0x0000000020000000L});
+    public static final BitSet FOLLOW_rule__XNullLiteral__Group__1_in_rule__XNullLiteral__Group__039688 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XNullLiteral__Group__1__Impl_in_rule__XNullLiteral__Group__139746 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_93_in_rule__XNullLiteral__Group__1__Impl39774 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XNumberLiteral__Group__0__Impl_in_rule__XNumberLiteral__Group__039809 = new BitSet(new long[]{0x00000000000000E0L});
+    public static final BitSet FOLLOW_rule__XNumberLiteral__Group__1_in_rule__XNumberLiteral__Group__039812 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XNumberLiteral__Group__1__Impl_in_rule__XNumberLiteral__Group__139870 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XNumberLiteral__ValueAssignment_1_in_rule__XNumberLiteral__Group__1__Impl39897 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XStringLiteral__Group__0__Impl_in_rule__XStringLiteral__Group__039931 = new BitSet(new long[]{0x0000000000000100L});
+    public static final BitSet FOLLOW_rule__XStringLiteral__Group__1_in_rule__XStringLiteral__Group__039934 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XStringLiteral__Group__1__Impl_in_rule__XStringLiteral__Group__139992 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XStringLiteral__ValueAssignment_1_in_rule__XStringLiteral__Group__1__Impl40019 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__0__Impl_in_rule__XTypeLiteral__Group__040053 = new BitSet(new long[]{0x00000000000001E0L,0x0000100060006004L});
+    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__1_in_rule__XTypeLiteral__Group__040056 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__1__Impl_in_rule__XTypeLiteral__Group__140114 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
+    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__2_in_rule__XTypeLiteral__Group__140117 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_94_in_rule__XTypeLiteral__Group__1__Impl40145 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__2__Impl_in_rule__XTypeLiteral__Group__240176 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__3_in_rule__XTypeLiteral__Group__240179 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_72_in_rule__XTypeLiteral__Group__2__Impl40207 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__3__Impl_in_rule__XTypeLiteral__Group__340238 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004200L});
+    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__4_in_rule__XTypeLiteral__Group__340241 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XTypeLiteral__TypeAssignment_3_in_rule__XTypeLiteral__Group__3__Impl40268 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__4__Impl_in_rule__XTypeLiteral__Group__440298 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004200L});
+    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__5_in_rule__XTypeLiteral__Group__440301 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XTypeLiteral__ArrayDimensionsAssignment_4_in_rule__XTypeLiteral__Group__4__Impl40328 = new BitSet(new long[]{0x0000000000000002L,0x0000000000004000L});
+    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__5__Impl_in_rule__XTypeLiteral__Group__540359 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_73_in_rule__XTypeLiteral__Group__5__Impl40387 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XThrowExpression__Group__0__Impl_in_rule__XThrowExpression__Group__040430 = new BitSet(new long[]{0x0000000000000000L,0x0000000080000000L});
+    public static final BitSet FOLLOW_rule__XThrowExpression__Group__1_in_rule__XThrowExpression__Group__040433 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XThrowExpression__Group__1__Impl_in_rule__XThrowExpression__Group__140491 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XThrowExpression__Group__2_in_rule__XThrowExpression__Group__140494 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_95_in_rule__XThrowExpression__Group__1__Impl40522 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XThrowExpression__Group__2__Impl_in_rule__XThrowExpression__Group__240553 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XThrowExpression__ExpressionAssignment_2_in_rule__XThrowExpression__Group__2__Impl40580 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XReturnExpression__Group__0__Impl_in_rule__XReturnExpression__Group__040616 = new BitSet(new long[]{0x0000000000000000L,0x0000000100000000L});
+    public static final BitSet FOLLOW_rule__XReturnExpression__Group__1_in_rule__XReturnExpression__Group__040619 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XReturnExpression__Group__1__Impl_in_rule__XReturnExpression__Group__140677 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XReturnExpression__Group__2_in_rule__XReturnExpression__Group__140680 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_96_in_rule__XReturnExpression__Group__1__Impl40708 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XReturnExpression__Group__2__Impl_in_rule__XReturnExpression__Group__240739 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XReturnExpression__ExpressionAssignment_2_in_rule__XReturnExpression__Group__2__Impl40766 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group__0__Impl_in_rule__XTryCatchFinallyExpression__Group__040803 = new BitSet(new long[]{0x0000000000000000L,0x0000000200000000L});
+    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group__1_in_rule__XTryCatchFinallyExpression__Group__040806 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group__1__Impl_in_rule__XTryCatchFinallyExpression__Group__140864 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group__2_in_rule__XTryCatchFinallyExpression__Group__140867 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_97_in_rule__XTryCatchFinallyExpression__Group__1__Impl40895 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group__2__Impl_in_rule__XTryCatchFinallyExpression__Group__240926 = new BitSet(new long[]{0x0000000000000000L,0x0000001400000000L});
+    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group__3_in_rule__XTryCatchFinallyExpression__Group__240929 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__ExpressionAssignment_2_in_rule__XTryCatchFinallyExpression__Group__2__Impl40956 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group__3__Impl_in_rule__XTryCatchFinallyExpression__Group__340986 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Alternatives_3_in_rule__XTryCatchFinallyExpression__Group__3__Impl41013 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0__0__Impl_in_rule__XTryCatchFinallyExpression__Group_3_0__041051 = new BitSet(new long[]{0x0000000000000000L,0x0000000400000000L});
+    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0__1_in_rule__XTryCatchFinallyExpression__Group_3_0__041054 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0_in_rule__XTryCatchFinallyExpression__Group_3_0__0__Impl41083 = new BitSet(new long[]{0x0000000000000002L,0x0000001000000000L});
+    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0_in_rule__XTryCatchFinallyExpression__Group_3_0__0__Impl41095 = new BitSet(new long[]{0x0000000000000002L,0x0000001000000000L});
+    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0__1__Impl_in_rule__XTryCatchFinallyExpression__Group_3_0__141128 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__0_in_rule__XTryCatchFinallyExpression__Group_3_0__1__Impl41155 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl_in_rule__XTryCatchFinallyExpression__Group_3_0_1__041190 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__1_in_rule__XTryCatchFinallyExpression__Group_3_0_1__041193 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_98_in_rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl41222 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl_in_rule__XTryCatchFinallyExpression__Group_3_0_1__141254 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1_in_rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl41281 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_1__0__Impl_in_rule__XTryCatchFinallyExpression__Group_3_1__041315 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_1__1_in_rule__XTryCatchFinallyExpression__Group_3_1__041318 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_98_in_rule__XTryCatchFinallyExpression__Group_3_1__0__Impl41346 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_1__1__Impl_in_rule__XTryCatchFinallyExpression__Group_3_1__141377 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1_in_rule__XTryCatchFinallyExpression__Group_3_1__1__Impl41404 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group__0__Impl_in_rule__XSynchronizedExpression__Group__041438 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group__1_in_rule__XSynchronizedExpression__Group__041441 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group_0__0_in_rule__XSynchronizedExpression__Group__0__Impl41468 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group__1__Impl_in_rule__XSynchronizedExpression__Group__141498 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000200L});
+    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group__2_in_rule__XSynchronizedExpression__Group__141501 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSynchronizedExpression__ParamAssignment_1_in_rule__XSynchronizedExpression__Group__1__Impl41528 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group__2__Impl_in_rule__XSynchronizedExpression__Group__241558 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group__3_in_rule__XSynchronizedExpression__Group__241561 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_73_in_rule__XSynchronizedExpression__Group__2__Impl41589 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group__3__Impl_in_rule__XSynchronizedExpression__Group__341620 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSynchronizedExpression__ExpressionAssignment_3_in_rule__XSynchronizedExpression__Group__3__Impl41647 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group_0__0__Impl_in_rule__XSynchronizedExpression__Group_0__041685 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group_0_0__0_in_rule__XSynchronizedExpression__Group_0__0__Impl41712 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group_0_0__0__Impl_in_rule__XSynchronizedExpression__Group_0_0__041744 = new BitSet(new long[]{0x0000000000000000L,0x0000000800000000L});
+    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group_0_0__1_in_rule__XSynchronizedExpression__Group_0_0__041747 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group_0_0__1__Impl_in_rule__XSynchronizedExpression__Group_0_0__141805 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
+    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group_0_0__2_in_rule__XSynchronizedExpression__Group_0_0__141808 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_99_in_rule__XSynchronizedExpression__Group_0_0__1__Impl41836 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group_0_0__2__Impl_in_rule__XSynchronizedExpression__Group_0_0__241867 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_72_in_rule__XSynchronizedExpression__Group_0_0__2__Impl41895 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XCatchClause__Group__0__Impl_in_rule__XCatchClause__Group__041932 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
+    public static final BitSet FOLLOW_rule__XCatchClause__Group__1_in_rule__XCatchClause__Group__041935 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_100_in_rule__XCatchClause__Group__0__Impl41964 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XCatchClause__Group__1__Impl_in_rule__XCatchClause__Group__141996 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
+    public static final BitSet FOLLOW_rule__XCatchClause__Group__2_in_rule__XCatchClause__Group__141999 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_72_in_rule__XCatchClause__Group__1__Impl42027 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XCatchClause__Group__2__Impl_in_rule__XCatchClause__Group__242058 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000200L});
+    public static final BitSet FOLLOW_rule__XCatchClause__Group__3_in_rule__XCatchClause__Group__242061 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XCatchClause__DeclaredParamAssignment_2_in_rule__XCatchClause__Group__2__Impl42088 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XCatchClause__Group__3__Impl_in_rule__XCatchClause__Group__342118 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_rule__XCatchClause__Group__4_in_rule__XCatchClause__Group__342121 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_73_in_rule__XCatchClause__Group__3__Impl42149 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XCatchClause__Group__4__Impl_in_rule__XCatchClause__Group__442180 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XCatchClause__ExpressionAssignment_4_in_rule__XCatchClause__Group__4__Impl42207 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__QualifiedName__Group__0__Impl_in_rule__QualifiedName__Group__042247 = new BitSet(new long[]{0x8000000000000000L});
+    public static final BitSet FOLLOW_rule__QualifiedName__Group__1_in_rule__QualifiedName__Group__042250 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleValidID_in_rule__QualifiedName__Group__0__Impl42277 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__QualifiedName__Group__1__Impl_in_rule__QualifiedName__Group__142306 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__QualifiedName__Group_1__0_in_rule__QualifiedName__Group__1__Impl42333 = new BitSet(new long[]{0x8000000000000002L});
+    public static final BitSet FOLLOW_rule__QualifiedName__Group_1__0__Impl_in_rule__QualifiedName__Group_1__042368 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_rule__QualifiedName__Group_1__1_in_rule__QualifiedName__Group_1__042371 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_63_in_rule__QualifiedName__Group_1__0__Impl42400 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__QualifiedName__Group_1__1__Impl_in_rule__QualifiedName__Group_1__142432 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleValidID_in_rule__QualifiedName__Group_1__1__Impl42459 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Number__Group_1__0__Impl_in_rule__Number__Group_1__042492 = new BitSet(new long[]{0x8000000000000000L});
+    public static final BitSet FOLLOW_rule__Number__Group_1__1_in_rule__Number__Group_1__042495 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Number__Alternatives_1_0_in_rule__Number__Group_1__0__Impl42522 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Number__Group_1__1__Impl_in_rule__Number__Group_1__142552 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Number__Group_1_1__0_in_rule__Number__Group_1__1__Impl42579 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Number__Group_1_1__0__Impl_in_rule__Number__Group_1_1__042614 = new BitSet(new long[]{0x00000000000000C0L});
+    public static final BitSet FOLLOW_rule__Number__Group_1_1__1_in_rule__Number__Group_1_1__042617 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_63_in_rule__Number__Group_1_1__0__Impl42645 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Number__Group_1_1__1__Impl_in_rule__Number__Group_1_1__142676 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Number__Alternatives_1_1_1_in_rule__Number__Group_1_1__1__Impl42703 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0__0__Impl_in_rule__JvmTypeReference__Group_0__042738 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L});
+    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0__1_in_rule__JvmTypeReference__Group_0__042741 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmParameterizedTypeReference_in_rule__JvmTypeReference__Group_0__0__Impl42768 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0__1__Impl_in_rule__JvmTypeReference__Group_0__142797 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0_1__0_in_rule__JvmTypeReference__Group_0__1__Impl42824 = new BitSet(new long[]{0x0000000000000002L,0x0000000000004000L});
+    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0_1__0__Impl_in_rule__JvmTypeReference__Group_0_1__042859 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0_1_0__0_in_rule__JvmTypeReference__Group_0_1__0__Impl42886 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0_1_0__0__Impl_in_rule__JvmTypeReference__Group_0_1_0__042918 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L});
+    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0_1_0__1_in_rule__JvmTypeReference__Group_0_1_0__042921 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0_1_0__1__Impl_in_rule__JvmTypeReference__Group_0_1_0__142979 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleArrayBrackets_in_rule__JvmTypeReference__Group_0_1_0__1__Impl43006 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__ArrayBrackets__Group__0__Impl_in_rule__ArrayBrackets__Group__043039 = new BitSet(new long[]{0x0000000000000000L,0x0000000000008000L});
+    public static final BitSet FOLLOW_rule__ArrayBrackets__Group__1_in_rule__ArrayBrackets__Group__043042 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_78_in_rule__ArrayBrackets__Group__0__Impl43070 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__ArrayBrackets__Group__1__Impl_in_rule__ArrayBrackets__Group__143101 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_79_in_rule__ArrayBrackets__Group__1__Impl43129 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group__0__Impl_in_rule__XFunctionTypeRef__Group__043164 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
+    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group__1_in_rule__XFunctionTypeRef__Group__043167 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0__0_in_rule__XFunctionTypeRef__Group__0__Impl43194 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group__1__Impl_in_rule__XFunctionTypeRef__Group__143225 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
+    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group__2_in_rule__XFunctionTypeRef__Group__143228 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_51_in_rule__XFunctionTypeRef__Group__1__Impl43256 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group__2__Impl_in_rule__XFunctionTypeRef__Group__243287 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFunctionTypeRef__ReturnTypeAssignment_2_in_rule__XFunctionTypeRef__Group__2__Impl43314 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0__0__Impl_in_rule__XFunctionTypeRef__Group_0__043350 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001B00L});
+    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0__1_in_rule__XFunctionTypeRef__Group_0__043353 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_72_in_rule__XFunctionTypeRef__Group_0__0__Impl43381 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0__1__Impl_in_rule__XFunctionTypeRef__Group_0__143412 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001B00L});
+    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0__2_in_rule__XFunctionTypeRef__Group_0__143415 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0_1__0_in_rule__XFunctionTypeRef__Group_0__1__Impl43442 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0__2__Impl_in_rule__XFunctionTypeRef__Group_0__243473 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_73_in_rule__XFunctionTypeRef__Group_0__2__Impl43501 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0_1__0__Impl_in_rule__XFunctionTypeRef__Group_0_1__043538 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0_1__1_in_rule__XFunctionTypeRef__Group_0_1__043541 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0_in_rule__XFunctionTypeRef__Group_0_1__0__Impl43568 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0_1__1__Impl_in_rule__XFunctionTypeRef__Group_0_1__143598 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0_1_1__0_in_rule__XFunctionTypeRef__Group_0_1__1__Impl43625 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0_1_1__0__Impl_in_rule__XFunctionTypeRef__Group_0_1_1__043660 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
+    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0_1_1__1_in_rule__XFunctionTypeRef__Group_0_1_1__043663 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_74_in_rule__XFunctionTypeRef__Group_0_1_1__0__Impl43691 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0_1_1__1__Impl_in_rule__XFunctionTypeRef__Group_0_1_1__143722 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1_in_rule__XFunctionTypeRef__Group_0_1_1__1__Impl43749 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group__0__Impl_in_rule__JvmParameterizedTypeReference__Group__043783 = new BitSet(new long[]{0x0000800000000000L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group__1_in_rule__JvmParameterizedTypeReference__Group__043786 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__TypeAssignment_0_in_rule__JvmParameterizedTypeReference__Group__0__Impl43813 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group__1__Impl_in_rule__JvmParameterizedTypeReference__Group__143843 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__0_in_rule__JvmParameterizedTypeReference__Group__1__Impl43870 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1__043905 = new BitSet(new long[]{0x0008000FE0800010L,0x000000A000001900L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__1_in_rule__JvmParameterizedTypeReference__Group_1__043908 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_47_in_rule__JvmParameterizedTypeReference__Group_1__0__Impl43937 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1__143969 = new BitSet(new long[]{0x0000400000000000L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__2_in_rule__JvmParameterizedTypeReference__Group_1__143972 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1_in_rule__JvmParameterizedTypeReference__Group_1__1__Impl43999 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__2__Impl_in_rule__JvmParameterizedTypeReference__Group_1__244029 = new BitSet(new long[]{0x0000400000000000L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__3_in_rule__JvmParameterizedTypeReference__Group_1__244032 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_2__0_in_rule__JvmParameterizedTypeReference__Group_1__2__Impl44059 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__3__Impl_in_rule__JvmParameterizedTypeReference__Group_1__344090 = new BitSet(new long[]{0x8000000000000000L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__4_in_rule__JvmParameterizedTypeReference__Group_1__344093 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_46_in_rule__JvmParameterizedTypeReference__Group_1__3__Impl44121 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__4__Impl_in_rule__JvmParameterizedTypeReference__Group_1__444152 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__0_in_rule__JvmParameterizedTypeReference__Group_1__4__Impl44179 = new BitSet(new long[]{0x8000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_2__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_2__044220 = new BitSet(new long[]{0x0008000FE0800010L,0x000000A000001900L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_2__1_in_rule__JvmParameterizedTypeReference__Group_1_2__044223 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_74_in_rule__JvmParameterizedTypeReference__Group_1_2__0__Impl44251 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_2__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_2__144282 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1_in_rule__JvmParameterizedTypeReference__Group_1_2__1__Impl44309 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4__044343 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__1_in_rule__JvmParameterizedTypeReference__Group_1_4__044346 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0__0_in_rule__JvmParameterizedTypeReference__Group_1_4__0__Impl44373 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4__144403 = new BitSet(new long[]{0x0000800000000000L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__2_in_rule__JvmParameterizedTypeReference__Group_1_4__144406 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1_in_rule__JvmParameterizedTypeReference__Group_1_4__1__Impl44433 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__2__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4__244463 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__0_in_rule__JvmParameterizedTypeReference__Group_1_4__2__Impl44490 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_0__044527 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0_0__0_in_rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl44554 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_0_0__044586 = new BitSet(new long[]{0x8000000000000000L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0_0__1_in_rule__JvmParameterizedTypeReference__Group_1_4_0_0__044589 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_0_0__144647 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_63_in_rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl44675 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2__044710 = new BitSet(new long[]{0x0008000FE0800010L,0x000000A000001900L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__1_in_rule__JvmParameterizedTypeReference__Group_1_4_2__044713 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_47_in_rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl44742 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2__144774 = new BitSet(new long[]{0x0000400000000000L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__2_in_rule__JvmParameterizedTypeReference__Group_1_4_2__144777 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1_in_rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl44804 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2__244834 = new BitSet(new long[]{0x0000400000000000L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__3_in_rule__JvmParameterizedTypeReference__Group_1_4_2__244837 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2_2__0_in_rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl44864 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2__344895 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_46_in_rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl44923 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__044962 = new BitSet(new long[]{0x0008000FE0800010L,0x000000A000001900L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2_2__1_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__044965 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_74_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl44993 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__145024 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl45051 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group__0__Impl_in_rule__JvmWildcardTypeReference__Group__045085 = new BitSet(new long[]{0x0008000FE0800010L,0x000000A000001900L});
+    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group__1_in_rule__JvmWildcardTypeReference__Group__045088 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group__1__Impl_in_rule__JvmWildcardTypeReference__Group__145146 = new BitSet(new long[]{0x0000000000010000L,0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group__2_in_rule__JvmWildcardTypeReference__Group__145149 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_101_in_rule__JvmWildcardTypeReference__Group__1__Impl45177 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group__2__Impl_in_rule__JvmWildcardTypeReference__Group__245208 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Alternatives_2_in_rule__JvmWildcardTypeReference__Group__2__Impl45235 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group_2_0__0__Impl_in_rule__JvmWildcardTypeReference__Group_2_0__045272 = new BitSet(new long[]{0x0000000000000000L,0x0000004000000000L});
+    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group_2_0__1_in_rule__JvmWildcardTypeReference__Group_2_0__045275 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0_in_rule__JvmWildcardTypeReference__Group_2_0__0__Impl45302 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group_2_0__1__Impl_in_rule__JvmWildcardTypeReference__Group_2_0__145332 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1_in_rule__JvmWildcardTypeReference__Group_2_0__1__Impl45359 = new BitSet(new long[]{0x0000000000000002L,0x0000004000000000L});
+    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group_2_1__0__Impl_in_rule__JvmWildcardTypeReference__Group_2_1__045394 = new BitSet(new long[]{0x0000000000000000L,0x0000004000000000L});
+    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group_2_1__1_in_rule__JvmWildcardTypeReference__Group_2_1__045397 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0_in_rule__JvmWildcardTypeReference__Group_2_1__0__Impl45424 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group_2_1__1__Impl_in_rule__JvmWildcardTypeReference__Group_2_1__145454 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1_in_rule__JvmWildcardTypeReference__Group_2_1__1__Impl45481 = new BitSet(new long[]{0x0000000000000002L,0x0000004000000000L});
+    public static final BitSet FOLLOW_rule__JvmUpperBound__Group__0__Impl_in_rule__JvmUpperBound__Group__045516 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
+    public static final BitSet FOLLOW_rule__JvmUpperBound__Group__1_in_rule__JvmUpperBound__Group__045519 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_16_in_rule__JvmUpperBound__Group__0__Impl45547 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmUpperBound__Group__1__Impl_in_rule__JvmUpperBound__Group__145578 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmUpperBound__TypeReferenceAssignment_1_in_rule__JvmUpperBound__Group__1__Impl45605 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmUpperBoundAnded__Group__0__Impl_in_rule__JvmUpperBoundAnded__Group__045639 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
+    public static final BitSet FOLLOW_rule__JvmUpperBoundAnded__Group__1_in_rule__JvmUpperBoundAnded__Group__045642 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_102_in_rule__JvmUpperBoundAnded__Group__0__Impl45670 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmUpperBoundAnded__Group__1__Impl_in_rule__JvmUpperBoundAnded__Group__145701 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmUpperBoundAnded__TypeReferenceAssignment_1_in_rule__JvmUpperBoundAnded__Group__1__Impl45728 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmLowerBound__Group__0__Impl_in_rule__JvmLowerBound__Group__045762 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
+    public static final BitSet FOLLOW_rule__JvmLowerBound__Group__1_in_rule__JvmLowerBound__Group__045765 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_65_in_rule__JvmLowerBound__Group__0__Impl45793 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmLowerBound__Group__1__Impl_in_rule__JvmLowerBound__Group__145824 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmLowerBound__TypeReferenceAssignment_1_in_rule__JvmLowerBound__Group__1__Impl45851 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmLowerBoundAnded__Group__0__Impl_in_rule__JvmLowerBoundAnded__Group__045885 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
+    public static final BitSet FOLLOW_rule__JvmLowerBoundAnded__Group__1_in_rule__JvmLowerBoundAnded__Group__045888 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_102_in_rule__JvmLowerBoundAnded__Group__0__Impl45916 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmLowerBoundAnded__Group__1__Impl_in_rule__JvmLowerBoundAnded__Group__145947 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmLowerBoundAnded__TypeReferenceAssignment_1_in_rule__JvmLowerBoundAnded__Group__1__Impl45974 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__QualifiedNameWithWildcard__Group__0__Impl_in_rule__QualifiedNameWithWildcard__Group__046010 = new BitSet(new long[]{0x8000000000000000L});
+    public static final BitSet FOLLOW_rule__QualifiedNameWithWildcard__Group__1_in_rule__QualifiedNameWithWildcard__Group__046013 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__QualifiedNameWithWildcard__Group__0__Impl46040 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__QualifiedNameWithWildcard__Group__1__Impl_in_rule__QualifiedNameWithWildcard__Group__146069 = new BitSet(new long[]{0x0100000000000000L});
+    public static final BitSet FOLLOW_rule__QualifiedNameWithWildcard__Group__2_in_rule__QualifiedNameWithWildcard__Group__146072 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_63_in_rule__QualifiedNameWithWildcard__Group__1__Impl46100 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__QualifiedNameWithWildcard__Group__2__Impl_in_rule__QualifiedNameWithWildcard__Group__246131 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_56_in_rule__QualifiedNameWithWildcard__Group__2__Impl46159 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__CheckCatalog__PackageNameAssignment_246202 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXImportSection_in_rule__CheckCatalog__ImportsAssignment_346233 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_103_in_rule__CheckCatalog__FinalAssignment_446269 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleValidID_in_rule__CheckCatalog__NameAssignment_646308 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__CheckCatalog__GrammarAssignment_7_246343 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleCategory_in_rule__CheckCatalog__CategoriesAssignment_9_046378 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleImplementation_in_rule__CheckCatalog__ImplementationsAssignment_9_146409 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleCheck_in_rule__CheckCatalog__ChecksAssignment_9_246440 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleMember_in_rule__CheckCatalog__MembersAssignment_9_346471 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXImportDeclaration_in_rule__XImportSection__ImportDeclarationsAssignment_146502 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__XImportDeclaration__ImportedTypeAssignment_1_046537 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleQualifiedNameWithWildcard_in_rule__XImportDeclaration__ImportedNamespaceAssignment_1_146572 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleValidID_in_rule__Category__IdAssignment_146603 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_STRING_in_rule__Category__LabelAssignment_246634 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleCheck_in_rule__Category__ChecksAssignment_446665 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleSeverityRange_in_rule__Check__SeverityRangeAssignment_046696 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_103_in_rule__Check__FinalAssignment_146732 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleTriggerKind_in_rule__Check__KindAssignment_246771 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleSeverityKind_in_rule__Check__DefaultSeverityAssignment_346802 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleValidID_in_rule__Check__IdAssignment_446833 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_STRING_in_rule__Check__LabelAssignment_546864 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleFormalParameter_in_rule__Check__FormalParametersAssignment_6_1_046895 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleFormalParameter_in_rule__Check__FormalParametersAssignment_6_1_1_146926 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_STRING_in_rule__Check__GivenMessageAssignment_7_146957 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleContext_in_rule__Check__ContextsAssignment_8_0_146988 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleContext_in_rule__Check__ContextsAssignment_8_147019 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleSeverityKind_in_rule__SeverityRange__MinSeverityAssignment_347050 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleSeverityKind_in_rule__SeverityRange__MaxSeverityAssignment_547081 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXAnnotation_in_rule__Member__AnnotationsAssignment_047112 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__Member__TypeAssignment_147143 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleValidID_in_rule__Member__NameAssignment_247174 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXOrExpression_in_rule__Member__ValueAssignment_3_147205 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleValidID_in_rule__Implementation__NameAssignment_147236 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleContext_in_rule__Implementation__ContextAssignment_247267 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmParameterizedTypeReference_in_rule__FormalParameter__TypeAssignment_047298 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleValidID_in_rule__FormalParameter__NameAssignment_147329 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXFormalParameterDefaultValueLiteral_in_rule__FormalParameter__RightAssignment_347360 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_STRING_in_rule__FormalParameter__LabelAssignment_447391 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleOpUnary_in_rule__XConstantUnaryOperation__FeatureAssignment_0_147426 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXConstantUnaryOperation_in_rule__XConstantUnaryOperation__OperandAssignment_0_247461 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXConstantUnaryOperation_in_rule__XConstantListLiteral__ElementsAssignment_3_047492 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXConstantUnaryOperation_in_rule__XConstantListLiteral__ElementsAssignment_3_1_147523 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleContextVariable_in_rule__Context__ContextVariableAssignment_147554 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXBlockExpression_in_rule__Context__ConstraintAssignment_247585 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__ContextVariable__TypeAssignment_047616 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleValidID_in_rule__ContextVariable__NameAssignment_147647 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XGuardExpression__GuardAssignment_247678 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__XIssueExpression__CheckAssignment_247713 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleValidID_in_rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_147752 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XIssueExpression__MarkerObjectAssignment_3_1_1_047787 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleFeatureCallID_in_rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_147822 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XIssueExpression__MarkerIndexAssignment_3_2_147857 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XIssueExpression__MessageAssignment_4_147888 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XIssueExpression__MessageParametersAssignment_5_247919 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XIssueExpression__MessageParametersAssignment_5_3_147950 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleValidID_in_rule__XIssueExpression__IssueCodeAssignment_6_147981 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XIssueExpression__IssueDataAssignment_6_348012 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XIssueExpression__IssueDataAssignment_6_4_148043 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__XAnnotation__AnnotationTypeAssignment_248078 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXAnnotationElementValuePair_in_rule__XAnnotation__ElementValuePairsAssignment_3_1_0_048113 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXAnnotationElementValuePair_in_rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_148144 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXAnnotationElementValueOrCommaList_in_rule__XAnnotation__ValueAssignment_3_1_148175 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleValidID_in_rule__XAnnotationElementValuePair__ElementAssignment_0_0_048210 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXAnnotationElementValue_in_rule__XAnnotationElementValuePair__ValueAssignment_148245 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_048276 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_148307 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_148338 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValue__ElementsAssignment_0_1_048369 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValue__ElementsAssignment_0_1_1_148400 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleFeatureCallID_in_rule__XAssignment__FeatureAssignment_0_148435 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXAssignment_in_rule__XAssignment__ValueAssignment_0_348470 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleOpMultiAssign_in_rule__XAssignment__FeatureAssignment_1_1_0_0_148505 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXAssignment_in_rule__XAssignment__RightOperandAssignment_1_1_148540 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleOpOr_in_rule__XOrExpression__FeatureAssignment_1_0_0_148575 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXAndExpression_in_rule__XOrExpression__RightOperandAssignment_1_148610 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleOpAnd_in_rule__XAndExpression__FeatureAssignment_1_0_0_148645 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXEqualityExpression_in_rule__XAndExpression__RightOperandAssignment_1_148680 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleOpEquality_in_rule__XEqualityExpression__FeatureAssignment_1_0_0_148715 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXRelationalExpression_in_rule__XEqualityExpression__RightOperandAssignment_1_148750 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__XRelationalExpression__TypeAssignment_1_0_148781 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleOpCompare_in_rule__XRelationalExpression__FeatureAssignment_1_1_0_0_148816 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXOtherOperatorExpression_in_rule__XRelationalExpression__RightOperandAssignment_1_1_148851 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleOpOther_in_rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_148886 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXAdditiveExpression_in_rule__XOtherOperatorExpression__RightOperandAssignment_1_148921 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleOpAdd_in_rule__XAdditiveExpression__FeatureAssignment_1_0_0_148956 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXMultiplicativeExpression_in_rule__XAdditiveExpression__RightOperandAssignment_1_148991 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleOpMulti_in_rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_149026 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXUnaryOperation_in_rule__XMultiplicativeExpression__RightOperandAssignment_1_149061 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleOpUnary_in_rule__XUnaryOperation__FeatureAssignment_0_149096 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXUnaryOperation_in_rule__XUnaryOperation__OperandAssignment_0_249131 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__XCastedExpression__TypeAssignment_1_149162 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleOpPostfix_in_rule__XPostfixOperation__FeatureAssignment_1_0_149197 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_104_in_rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_149237 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleFeatureCallID_in_rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_249280 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXAssignment_in_rule__XMemberFeatureCall__ValueAssignment_1_0_149315 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_105_in_rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_149351 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_104_in_rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_249395 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_149434 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_149465 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleIdOrSuper_in_rule__XMemberFeatureCall__FeatureAssignment_1_1_249500 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_72_in_rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_049540 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXShortClosure_in_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_049579 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_049610 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_149641 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXClosure_in_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_449672 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XSetLiteral__ElementsAssignment_3_049703 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XSetLiteral__ElementsAssignment_3_1_149734 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XListLiteral__ElementsAssignment_3_049765 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XListLiteral__ElementsAssignment_3_1_149796 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_049827 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_149858 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_106_in_rule__XClosure__ExplicitSyntaxAssignment_1_0_149894 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpressionInClosure_in_rule__XClosure__ExpressionAssignment_249933 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_rule__XExpressionInClosure__ExpressionsAssignment_1_049964 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_049995 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_150026 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_106_in_rule__XShortClosure__ExplicitSyntaxAssignment_0_0_250062 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XShortClosure__ExpressionAssignment_150101 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XIfExpression__IfAssignment_350132 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XIfExpression__ThenAssignment_550163 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XIfExpression__ElseAssignment_6_150194 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_150225 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XSwitchExpression__SwitchAssignment_2_0_150256 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_050287 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XSwitchExpression__SwitchAssignment_2_1_150318 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXCasePart_in_rule__XSwitchExpression__CasesAssignment_450349 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XSwitchExpression__DefaultAssignment_5_250380 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__XCasePart__TypeGuardAssignment_150411 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XCasePart__CaseAssignment_2_150442 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XCasePart__ThenAssignment_3_0_150473 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_74_in_rule__XCasePart__FallThroughAssignment_3_150509 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_rule__XForLoopExpression__DeclaredParamAssignment_0_0_350548 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XForLoopExpression__ForExpressionAssignment_150579 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XForLoopExpression__EachExpressionAssignment_350610 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_rule__XBasicForLoopExpression__InitExpressionsAssignment_3_050641 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_150672 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XBasicForLoopExpression__ExpressionAssignment_550703 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_050734 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_150765 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XBasicForLoopExpression__EachExpressionAssignment_950796 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XWhileExpression__PredicateAssignment_350827 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XWhileExpression__BodyAssignment_550858 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XDoWhileExpression__BodyAssignment_250889 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XDoWhileExpression__PredicateAssignment_550920 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_rule__XBlockExpression__ExpressionsAssignment_2_050951 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_107_in_rule__XVariableDeclaration__WriteableAssignment_1_050987 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__XVariableDeclaration__TypeAssignment_2_0_0_051026 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleValidID_in_rule__XVariableDeclaration__NameAssignment_2_0_0_151057 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleValidID_in_rule__XVariableDeclaration__NameAssignment_2_151088 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XVariableDeclaration__RightAssignment_3_151119 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__JvmFormalParameter__ParameterTypeAssignment_051150 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleValidID_in_rule__JvmFormalParameter__NameAssignment_151181 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__FullJvmFormalParameter__ParameterTypeAssignment_051212 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleValidID_in_rule__FullJvmFormalParameter__NameAssignment_151243 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__XFeatureCall__TypeArgumentsAssignment_1_151274 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__XFeatureCall__TypeArgumentsAssignment_1_2_151305 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleIdOrSuper_in_rule__XFeatureCall__FeatureAssignment_251340 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_72_in_rule__XFeatureCall__ExplicitOperationCallAssignment_3_051380 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXShortClosure_in_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_051419 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_051450 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_151481 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXClosure_in_rule__XFeatureCall__FeatureCallArgumentsAssignment_451512 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__XConstructorCall__ConstructorAssignment_251547 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__XConstructorCall__TypeArgumentsAssignment_3_151582 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__XConstructorCall__TypeArgumentsAssignment_3_2_151613 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_72_in_rule__XConstructorCall__ExplicitConstructorCallAssignment_4_051649 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXShortClosure_in_rule__XConstructorCall__ArgumentsAssignment_4_1_051688 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XConstructorCall__ArgumentsAssignment_4_1_1_051719 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_151750 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXClosure_in_rule__XConstructorCall__ArgumentsAssignment_551781 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_108_in_rule__XBooleanLiteral__IsTrueAssignment_1_151817 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleNumber_in_rule__XNumberLiteral__ValueAssignment_151856 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_STRING_in_rule__XStringLiteral__ValueAssignment_151887 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__XTypeLiteral__TypeAssignment_351922 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleArrayBrackets_in_rule__XTypeLiteral__ArrayDimensionsAssignment_451957 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XThrowExpression__ExpressionAssignment_251988 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XReturnExpression__ExpressionAssignment_252019 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XTryCatchFinallyExpression__ExpressionAssignment_252050 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXCatchClause_in_rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_052081 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_152112 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_152143 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XSynchronizedExpression__ParamAssignment_152174 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XSynchronizedExpression__ExpressionAssignment_352205 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleFullJvmFormalParameter_in_rule__XCatchClause__DeclaredParamAssignment_252236 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleXExpression_in_rule__XCatchClause__ExpressionAssignment_452267 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__XFunctionTypeRef__ParamTypesAssignment_0_1_052298 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_152329 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__XFunctionTypeRef__ReturnTypeAssignment_252360 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__JvmParameterizedTypeReference__TypeAssignment_052395 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_152430 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_152461 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleValidID_in_rule__JvmParameterizedTypeReference__TypeAssignment_1_4_152496 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_152531 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_152562 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmUpperBound_in_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_052593 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmUpperBoundAnded_in_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_152624 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmLowerBound_in_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_052655 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmLowerBoundAnded_in_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_152686 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__JvmUpperBound__TypeReferenceAssignment_152717 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__JvmUpperBoundAnded__TypeReferenceAssignment_152748 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__JvmLowerBound__TypeReferenceAssignment_152779 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__JvmLowerBoundAnded__TypeReferenceAssignment_152810 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_ruleXForLoopExpression_in_synpred19_InternalCheck6401 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_ruleXBasicForLoopExpression_in_synpred20_InternalCheck6419 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_rule__XAnnotation__Group_3_1_0__0_in_synpred48_InternalCheck7019 = new BitSet(new long[]{0x0000000000000002L});
@@ -83917,43 +83588,43 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
     public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_2_0__0_in_synpred101_InternalCheck8921 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0_in_synpred102_InternalCheck8972 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_rule__XConstructorCall__ArgumentsAssignment_4_1_0_in_synpred104_InternalCheck9075 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group_6__0_in_synpred130_InternalCheck11851 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__CheckAssignment_2_in_synpred141_InternalCheck15523 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3__0_in_synpred142_InternalCheck15584 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_4__0_in_synpred143_InternalCheck15645 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5__0_in_synpred144_InternalCheck15706 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6__0_in_synpred145_InternalCheck15764 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_2__0_in_synpred146_InternalCheck15960 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_1_1_1__0_in_synpred147_InternalCheck16209 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3__0_in_synpred151_InternalCheck17838 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1__0_in_synpred160_InternalCheck20685 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1__0_in_synpred162_InternalCheck21489 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1__0_in_synpred163_InternalCheck21912 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1__0_in_synpred164_InternalCheck22335 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Alternatives_1_in_synpred165_InternalCheck22758 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1__0_in_synpred166_InternalCheck23610 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1__0_in_synpred167_InternalCheck24772 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1__0_in_synpred168_InternalCheck25195 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1__0_in_synpred169_InternalCheck25802 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group_1__0_in_synpred170_InternalCheck26227 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Alternatives_1_in_synpred171_InternalCheck26529 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__0_in_synpred173_InternalCheck27200 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4_in_synpred174_InternalCheck27258 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1__0_in_synpred182_InternalCheck29494 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group_6__0_in_synpred189_InternalCheck31700 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1_0__0_in_synpred192_InternalCheck32771 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3__0_in_synpred205_InternalCheck37665 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_4_in_synpred206_InternalCheck37723 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__0_in_synpred210_InternalCheck38781 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4__0_in_synpred211_InternalCheck38842 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__ArgumentsAssignment_5_in_synpred212_InternalCheck38900 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XReturnExpression__ExpressionAssignment_2_in_synpred217_InternalCheck40952 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0_in_synpred218_InternalCheck41281 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__0_in_synpred219_InternalCheck41341 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group_1__0_in_synpred220_InternalCheck42519 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0_1__0_in_synpred222_InternalCheck43010 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__0_in_synpred226_InternalCheck44056 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__0_in_synpred228_InternalCheck44365 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__0_in_synpred229_InternalCheck44676 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Check__Group_6__0_in_synpred129_InternalCheck11665 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__CheckAssignment_2_in_synpred140_InternalCheck15337 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3__0_in_synpred141_InternalCheck15398 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_4__0_in_synpred142_InternalCheck15459 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5__0_in_synpred143_InternalCheck15520 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6__0_in_synpred144_InternalCheck15578 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_2__0_in_synpred145_InternalCheck15774 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_1_1_1__0_in_synpred146_InternalCheck16023 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAnnotation__Group_3__0_in_synpred150_InternalCheck17652 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1__0_in_synpred159_InternalCheck20499 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XOrExpression__Group_1__0_in_synpred161_InternalCheck21303 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAndExpression__Group_1__0_in_synpred162_InternalCheck21726 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1__0_in_synpred163_InternalCheck22149 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XRelationalExpression__Alternatives_1_in_synpred164_InternalCheck22572 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1__0_in_synpred165_InternalCheck23424 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1__0_in_synpred166_InternalCheck24586 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1__0_in_synpred167_InternalCheck25009 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1__0_in_synpred168_InternalCheck25616 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XPostfixOperation__Group_1__0_in_synpred169_InternalCheck26041 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Alternatives_1_in_synpred170_InternalCheck26343 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__0_in_synpred172_InternalCheck27014 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4_in_synpred173_InternalCheck27072 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XClosure__Group_1__0_in_synpred181_InternalCheck29308 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XIfExpression__Group_6__0_in_synpred188_InternalCheck31514 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1_0__0_in_synpred191_InternalCheck32585 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3__0_in_synpred204_InternalCheck37479 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_4_in_synpred205_InternalCheck37537 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__0_in_synpred209_InternalCheck38595 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4__0_in_synpred210_InternalCheck38656 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XConstructorCall__ArgumentsAssignment_5_in_synpred211_InternalCheck38714 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XReturnExpression__ExpressionAssignment_2_in_synpred216_InternalCheck40766 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0_in_synpred217_InternalCheck41095 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__0_in_synpred218_InternalCheck41155 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__QualifiedName__Group_1__0_in_synpred219_InternalCheck42333 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0_1__0_in_synpred221_InternalCheck42824 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__0_in_synpred225_InternalCheck43870 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__0_in_synpred227_InternalCheck44179 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__0_in_synpred228_InternalCheck44490 = new BitSet(new long[]{0x0000000000000002L});
 
 }
\ No newline at end of file
diff --git a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/quickfix/CheckQuickfixProvider.java b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/quickfix/CheckQuickfixProvider.java
index ffacdb1ec..e6e5fb5f6 100644
--- a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/quickfix/CheckQuickfixProvider.java
+++ b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/quickfix/CheckQuickfixProvider.java
@@ -29,8 +29,6 @@
 import org.eclipse.xtext.xbase.ui.quickfix.XbaseQuickfixProvider;
 
 import com.avaloq.tools.ddk.check.check.Check;
-import com.avaloq.tools.ddk.check.check.CheckCatalog;
-import com.avaloq.tools.ddk.check.check.CheckPackage;
 import com.avaloq.tools.ddk.check.check.Documented;
 import com.avaloq.tools.ddk.check.check.Implementation;
 import com.avaloq.tools.ddk.check.check.SeverityKind;
@@ -51,7 +49,7 @@ public class CheckQuickfixProvider extends XbaseQuickfixProvider {
   private CheckResourceUtil resourceUtil;
 
   private static final String NO_IMAGE = null;
-  private static final String CHECK = "check";
+  private static final String CHECK = "check"; //$NON-NLS-1$
 
   /**
    * Replaces a guard by an if-expression.
@@ -68,7 +66,7 @@ public void fixGuardStatement(final Issue issue, final IssueResolutionAcceptor a
       public void apply(final IModificationContext context) throws BadLocationException {
         IXtextDocument xtextDocument = context.getXtextDocument();
         String expr = xtextDocument.get(issue.getOffset(), issue.getLength());
-        expr = expr.replaceFirst("^guard(\\s*)", "if (!(") + ")) {return}";
+        expr = expr.replaceFirst("^guard(\\s*)", "if (!(") + ")) {return}"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         xtextDocument.replace(issue.getOffset(), issue.getLength(), expr);
       }
     });
@@ -134,7 +132,7 @@ public void addIssueExpression(final Issue issue, final IssueResolutionAcceptor
       @Override
       public void apply(final IModificationContext context) throws BadLocationException {
         IXtextDocument xtextDocument = context.getXtextDocument();
-        xtextDocument.replace(issue.getOffset() + issue.getLength() - 1, 0, ' ' + "issue" + ' ');
+        xtextDocument.replace(issue.getOffset() + issue.getLength() - 1, 0, ' ' + "issue" + ' '); //$NON-NLS-1$
       }
     });
   }
@@ -191,7 +189,7 @@ public void process(final XtextResource state) throws Exception { // NOPMD
   @Fix(IssueCodes.MISSING_DOCUMENTATION_ON_CHECK)
   public void addDocumentationToCheck(final Issue issue, final IssueResolutionAcceptor acceptor) {
     acceptor.accept(issue, Messages.CheckQuickfixProvider_ADD_DOCUMENTATION_LABEL, NLS.bind(Messages.CheckQuickfixProvider_ADD_DOCUMENTATION_DESCN, CHECK), NO_IMAGE, // LF
-        new AutoDoc<Check>(Check.class, issue, "/**\n{0} * @todo document check\n{0} */\n{0}"));
+        new AutoDoc<Check>(Check.class, issue, "/**\n{0} * @todo document check\n{0} */\n{0}")); //$NON-NLS-1$
   }
 
   /**
@@ -205,8 +203,8 @@ public void addDocumentationToCheck(final Issue issue, final IssueResolutionAcce
    */
   @Fix(IssueCodes.MISSING_DOCUMENTATION_ON_IMPLEMENTATION)
   public void addDocumentationToImplementation(final Issue issue, final IssueResolutionAcceptor acceptor) {
-    acceptor.accept(issue, Messages.CheckQuickfixProvider_ADD_DOCUMENTATION_LABEL, NLS.bind(Messages.CheckQuickfixProvider_ADD_DOCUMENTATION_DESCN, "definition"), NO_IMAGE, // LF
-        new AutoDoc<Implementation>(Implementation.class, issue, "/**\n{0} * @todo document implementation\n{0} */\n{0}"));
+    acceptor.accept(issue, Messages.CheckQuickfixProvider_ADD_DOCUMENTATION_LABEL, NLS.bind(Messages.CheckQuickfixProvider_ADD_DOCUMENTATION_DESCN, "definition"), NO_IMAGE, // LF //$NON-NLS-1$
+        new AutoDoc<Implementation>(Implementation.class, issue, "/**\n{0} * @todo document implementation\n{0} */\n{0}")); //$NON-NLS-1$
   }
 
   /**
@@ -229,27 +227,6 @@ public void addIdToCheck(final Issue issue, final IssueResolutionAcceptor accept
     });
   }
 
-  /**
-   * Fixes the circular dependency problem by removing the {@code with} clause.
-   *
-   * @param issue
-   *          the issue
-   * @param acceptor
-   *          the acceptor
-   */
-  @Fix(IssueCodes.INCLUDED_CATALOGS_WITH_CIRCULAR_DEPENDENCIES)
-  public void removeWithClause(final Issue issue, final IssueResolutionAcceptor acceptor) {
-    acceptor.accept(issue, Messages.CheckQuickfixProvider_REMOVE_WITH_LABEL, Messages.CheckQuickfixProvider_REMOVE_WITH_DESCN, NO_IMAGE, new ISemanticModification() {
-      @Override
-      public void apply(final EObject element, final IModificationContext context) {
-        final CheckCatalog catalog = EcoreUtil2.getContainerOfType(element, CheckCatalog.class);
-        if (catalog != null) {
-          catalog.eUnset(CheckPackage.Literals.CHECK_CATALOG__INCLUDED_CATALOGS);
-        }
-      }
-    });
-  }
-
   /**
    * Removes the guard statement occurring at offending position.
    *
@@ -285,7 +262,7 @@ public void apply(final EObject element, final IModificationContext context) {
    */
   @Fix(IssueCodes.SEVERITY_RANGES_FOR_FINAL_CHECK)
   public void removeFinal(final Issue issue, final IssueResolutionAcceptor acceptor) {
-    doTextualTokenReplacement(issue, acceptor, Messages.CheckQuickfixProvider_REMOVE_FINAL_KW_LABEL, Messages.CheckQuickfixProvider_REMOVE_FINAL_KW_DESCN, "");
+    doTextualTokenReplacement(issue, acceptor, Messages.CheckQuickfixProvider_REMOVE_FINAL_KW_LABEL, Messages.CheckQuickfixProvider_REMOVE_FINAL_KW_DESCN, ""); //$NON-NLS-1$
   }
 
   /**
@@ -390,7 +367,7 @@ public void apply(final IModificationContext context) throws BadLocationExceptio
   public void fixRedundantFinalKeyword(final Issue issue, final IssueResolutionAcceptor acceptor) {
     final String label = Messages.CheckQuickfixProvider_REDUNDANT_FINAL_FIX_LABEL;
     final String descn = Messages.CheckQuickfixProvider_REDUNDANT_FINAL_FIX_DESCN;
-    doTextualTokenReplacement(issue, acceptor, label, descn, "");
+    doTextualTokenReplacement(issue, acceptor, label, descn, ""); //$NON-NLS-1$
   }
 
   /**

From 1327516d7a42ac3f9a2990e52bc6a8a5c0ae42cf Mon Sep 17 00:00:00 2001
From: Ralph Ursprung <usr@avaloq.com>
Date: Thu, 17 May 2018 19:41:17 +0200
Subject: [PATCH 05/56] Remove unnecessary empty line in doSetup of generated
 check code

This unnecessary newline was recently introduced with commit 614ec85 and
causes lots of unwanted changes to generated code in projects using DDK.
---
 .../com/avaloq/tools/ddk/check/generator/CheckGenerator.xtend    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/generator/CheckGenerator.xtend b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/generator/CheckGenerator.xtend
index 7ffbf1a05..9c67a90f8 100644
--- a/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/generator/CheckGenerator.xtend
+++ b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/generator/CheckGenerator.xtend
@@ -164,7 +164,6 @@ class CheckGenerator extends JvmModelGenerator {
 
       /** {@inheritDoc} */
       public void doSetup() {
-
         ICheckValidatorRegistry.INSTANCE.registerValidator(«IF catalog.grammar !== null»GRAMMAR_NAME,«ENDIF» new «catalog.validatorClassName»());
         ICheckCatalogRegistry.INSTANCE.registerCatalog(«IF catalog.grammar !== null»GRAMMAR_NAME,«ENDIF» new ModelLocation(
           «catalog.standaloneSetupClassName».class.getClassLoader().getResource(CATALOG_FILE_PATH), CATALOG_FILE_PATH));

From b000c937bed3bb69b0e351acf2f31d960e74863d Mon Sep 17 00:00:00 2001
From: Mariya Abrahamyan <Mariya.Abrahamyan@avaloq.com>
Date: Tue, 22 May 2018 12:46:37 +0200
Subject: [PATCH 06/56] Remove newline in generator introduced with commit
 614ec85

---
 .../com/avaloq/tools/ddk/check/generator/CheckGenerator.xtend    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/generator/CheckGenerator.xtend b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/generator/CheckGenerator.xtend
index 9c67a90f8..385840bf6 100644
--- a/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/generator/CheckGenerator.xtend
+++ b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/generator/CheckGenerator.xtend
@@ -170,7 +170,6 @@ class CheckGenerator extends JvmModelGenerator {
         LOG.info("Standalone setup done for «catalog.checkFilePath»");
       }
 
-
       @Override
       public String toString() {
         return "CheckValidatorSetup(«catalog.eResource.URI.path»)";

From eb746f5e1d7e9d2d8b6ce077f6ecf159107bddd4 Mon Sep 17 00:00:00 2001
From: Knut Wannheden <knut.wannheden@avaloq.com>
Date: Thu, 24 May 2018 14:35:23 +0200
Subject: [PATCH 07/56] Add logging to ExtendableInferredModelAssociator

ExtendableInferredModelAssociator#installDerivedState() will now catch
and log any RuntimeExceptions thrown by the
IModelInferrerFeatureExtensionService. Otherwise these will never be
seen when a resource is demand-loaded as EcoreUtil#resolve() swallows
them. This is also how it works in the InferredModelAssociator class.
---
 .../ExtendableInferredModelAssociator.java            | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/modelinference/ExtendableInferredModelAssociator.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/modelinference/ExtendableInferredModelAssociator.java
index c7f3a5962..752eeaa03 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/modelinference/ExtendableInferredModelAssociator.java
+++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/modelinference/ExtendableInferredModelAssociator.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package com.avaloq.tools.ddk.xtext.modelinference;
 
+import org.apache.log4j.Logger;
 import org.eclipse.xtext.resource.DerivedStateAwareResource;
 
 import com.google.inject.Inject;
@@ -23,13 +24,21 @@
 @Singleton
 public class ExtendableInferredModelAssociator extends InferredModelAssociator {
 
+  private static final Logger LOGGER = Logger.getLogger(ExtendableInferredModelAssociator.class);
+
   @Inject
   private IModelInferrerFeatureExtensionService additionalInferrers;
 
   @Override
   public void installDerivedState(final DerivedStateAwareResource resource, final boolean isPreLinkingPhase) {
     super.installDerivedState(resource, isPreLinkingPhase);
-    additionalInferrers.inferTargetModel(resource.getContents().get(0), createAcceptor(resource), isPreLinkingPhase);
+    try {
+      additionalInferrers.inferTargetModel(resource.getContents().get(0), createAcceptor(resource), isPreLinkingPhase);
+      // CHECKSTYLE:OFF
+    } catch (RuntimeException e) {
+      // CHECKSTYLE:ON
+      LOGGER.error("Failed to install additional derived state for resource " + resource.getURI(), e); //$NON-NLS-1$
+    }
   }
 
 }

From 5367986821526ab6d054d4bbe7a034c9498c077d Mon Sep 17 00:00:00 2001
From: Mariya Abrahamyan <Mariya.Abrahamyan@avaloq.com>
Date: Fri, 25 May 2018 13:37:23 +0200
Subject: [PATCH 08/56] Make IGrammarAccess optional

This allows to use DefaultCheckValidator without having a grammar.
---
 .../runtime/validation/DefaultCheckValidator.java | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/validation/DefaultCheckValidator.java b/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/validation/DefaultCheckValidator.java
index 33f25735c..aa67450e2 100644
--- a/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/validation/DefaultCheckValidator.java
+++ b/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/validation/DefaultCheckValidator.java
@@ -33,7 +33,7 @@ public class DefaultCheckValidator extends AbstractCheckValidator {
   @Named(Constants.LANGUAGE_NAME)
   private String hostLanguage;
 
-  @Inject
+  @Inject(optional = true)
   private IGrammarAccess grammarAccess;
 
   @Override
@@ -49,7 +49,7 @@ public void register(final EValidatorRegistrar registrar) {}
 
   /**
    * At this point, {@link #grammarAccess} has been injected. See {@link #register(EValidatorRegistrar)}.
-   * 
+   *
    * @param registrar
    *          the validator registrar
    */
@@ -61,14 +61,15 @@ public void register2(final EValidatorRegistrar registrar) {
   @Override
   protected List<EPackage> getEPackages() {
     List<EPackage> result = Lists.newArrayList();
-    for (AbstractMetamodelDeclaration decl : grammarAccess.getGrammar().getMetamodelDeclarations()) {
-      // TODO what about imported meta models?
-      if (decl instanceof GeneratedMetamodel) {
-        result.add(EPackage.Registry.INSTANCE.getEPackage(decl.getEPackage().getNsURI()));
+    if (grammarAccess != null) {
+      for (AbstractMetamodelDeclaration decl : grammarAccess.getGrammar().getMetamodelDeclarations()) {
+        // TODO what about imported meta models?
+        if (decl instanceof GeneratedMetamodel) {
+          result.add(EPackage.Registry.INSTANCE.getEPackage(decl.getEPackage().getNsURI()));
+        }
       }
     }
     return result;
   }
 
 }
-

From 07f49a189270d81ad631243cc775cd9f0a37fe70 Mon Sep 17 00:00:00 2001
From: Roman Mitin <roman.mitin@avaloq.com>
Date: Wed, 9 May 2018 17:57:13 +0200
Subject: [PATCH 09/56] Target file update for Xtext 2.13

Xtext and Xtend 2.13.0.v20171020-0920

Do mechanical adjustments.

Remove fixed serializer as the problem of duplicate methods seems to be
fixed in 2.13. If new problems occur, we'll have to customize
SerializerFragment2 instead of AbstractFixedSemanticSequencer.xtend
---
 .../META-INF/MANIFEST.MF                      |   2 +-
 .../ddk/check/generator/CheckCompiler.java    |  16 ++-
 .../META-INF/MANIFEST.MF                      |   4 +-
 .../META-INF/MANIFEST.MF                      |   2 +-
 .../AbstractFixedSemanticSequencer.xtend      | 107 ------------------
 .../serializer/SerializerFragment.xtend       |  23 ----
 .../DirectLinkingResourceStorageLoadable.java |   3 +
 .../xtext/serializer/IndentingSerializer.java |   2 +-
 .../ReorderingHiddenTokenSequencer.java       |  14 +++
 ddk-target/ddk.target                         |   6 +-
 10 files changed, 32 insertions(+), 147 deletions(-)
 delete mode 100644 com.avaloq.tools.ddk.xtext.generator/src/com/avaloq/tools/ddk/xtext/generator/serializer/AbstractFixedSemanticSequencer.xtend
 delete mode 100644 com.avaloq.tools.ddk.xtext.generator/src/com/avaloq/tools/ddk/xtext/generator/serializer/SerializerFragment.xtend

diff --git a/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF
index 93cbfface..8924ec411 100644
--- a/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Require-Bundle: com.avaloq.tools.ddk.check.core,
  org.eclipse.ui,
  org.eclipse.ui.ide,
  org.eclipse.core.runtime,
- org.eclipse.xtend2.lib,
+ org.eclipse.xtend.lib,
  org.eclipse.xtext.junit4,
  org.junit,
  org.mockito,
diff --git a/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/generator/CheckCompiler.java b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/generator/CheckCompiler.java
index 70538d822..604e958f0 100644
--- a/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/generator/CheckCompiler.java
+++ b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/generator/CheckCompiler.java
@@ -59,7 +59,7 @@ public class CheckCompiler extends XbaseCompiler {
 
   /**
    * Gets the name of the implicit variable in a context.
-   * 
+   *
    * @param expr
    *          any expression
    * @return the parameter name, if the expression is within a context and set, or CheckConstants.IT otherwise.
@@ -71,7 +71,7 @@ private String getContextImplicitVariableName(final XExpression expr) {
 
   /**
    * Gets the FormalParameter this feature call references, if any.
-   * 
+   *
    * @param expression
    *          to check
    * @return The source model element (FormalParameter) for this feature call target, or null.
@@ -82,7 +82,7 @@ private FormalParameter getFormalParameter(final XAbstractFeatureCall expression
 
   /**
    * Gets the FormalParameter this feature call references, if any.
-   * 
+   *
    * @param element
    *          to check
    * @return The source model element (FormalParameter) for this feature call target, or null.
@@ -101,7 +101,7 @@ public FormalParameter getFormalParameter(final JvmIdentifiableElement element)
 
   /**
    * Gets the Member this feature call references, if any.
-   * 
+   *
    * @param expression
    *          to check
    * @return The source model element (Member) for this feature call target, or null.
@@ -112,7 +112,7 @@ private Member getMember(final XAbstractFeatureCall expression) {
 
   /**
    * Gets the Member this feature call references, if any.
-   * 
+   *
    * @param element
    *          to check
    * @return The source model element (Member) for this feature call target, or null.
@@ -130,13 +130,12 @@ private Member getMember(final JvmIdentifiableElement element) {
 
   }
 
-  /** {@inheritDoc} */
   @Override
-  protected boolean isVariableDeclarationRequired(final XExpression expression, final ITreeAppendable b) {
+  protected boolean isVariableDeclarationRequired(final XExpression expression, final ITreeAppendable b, final boolean recursive) {
     if (expression instanceof XAbstractFeatureCall && getFormalParameter((XAbstractFeatureCall) expression) != null) {
       return false;
     }
-    return super.isVariableDeclarationRequired(expression, b);
+    return super.isVariableDeclarationRequired(expression, b, recursive);
   }
 
   @Override
@@ -363,4 +362,3 @@ protected ITreeAppendable appendTypeArguments(final XAbstractFeatureCall call, f
   }
 
 }
-
diff --git a/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF
index 435aa4cd6..067e657b6 100644
--- a/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF
@@ -13,10 +13,10 @@ Require-Bundle: com.avaloq.tools.ddk.check.runtime.core,
  org.eclipse.core.resources,
  org.eclipse.xtext,
  org.eclipse.xtext.junit4,
- org.eclipse.xtext.ui.junit,
+ org.eclipse.xtext.ui.testing,
  org.junit,
  org.eclipse.ui.workbench;resolution:=optional,
- org.eclipse.xtend2.lib,
+ org.eclipse.xtend.lib,
  org.eclipse.xtext.xbase.lib, 
  org.apache.log4j,
  org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional
diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.checkcfg.core.test/META-INF/MANIFEST.MF
index 72358fa7d..eb83d97b7 100644
--- a/com.avaloq.tools.ddk.checkcfg.core.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.checkcfg.core.test/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: com.avaloq.tools.ddk.test.core,
  org.eclipse.ui,
  org.eclipse.ui.ide,
  org.eclipse.core.runtime,
- org.eclipse.xtend2.lib,
+ org.eclipse.xtend.lib,
  org.eclipse.xtext.junit4,
  org.junit,
  org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional,
diff --git a/com.avaloq.tools.ddk.xtext.generator/src/com/avaloq/tools/ddk/xtext/generator/serializer/AbstractFixedSemanticSequencer.xtend b/com.avaloq.tools.ddk.xtext.generator/src/com/avaloq/tools/ddk/xtext/generator/serializer/AbstractFixedSemanticSequencer.xtend
deleted file mode 100644
index 6a9717841..000000000
--- a/com.avaloq.tools.ddk.xtext.generator/src/com/avaloq/tools/ddk/xtext/generator/serializer/AbstractFixedSemanticSequencer.xtend
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 Avaloq Evolution AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Avaloq Evolution AG - initial API and implementation
- *******************************************************************************/
-package com.avaloq.tools.ddk.xtext.generator.serializer
-
-import com.google.inject.Inject
-import com.google.inject.Provider
-import org.eclipse.emf.ecore.EObject
-import org.eclipse.xtext.Grammar
-import org.eclipse.xtext.generator.Naming
-import org.eclipse.xtext.generator.grammarAccess.GrammarAccess
-import org.eclipse.xtext.generator.serializer.AbstractSemanticSequencer
-import org.eclipse.xtext.generator.serializer.JavaEMFFile
-import org.eclipse.xtext.generator.serializer.SemanticSequencerUtil
-import org.eclipse.xtext.generator.serializer.SerializerGenFileNames
-import org.eclipse.xtext.serializer.acceptor.ISemanticSequenceAcceptor
-import org.eclipse.xtext.serializer.diagnostic.ISemanticSequencerDiagnosticProvider
-import org.eclipse.xtext.serializer.diagnostic.ISerializationDiagnostic
-import org.eclipse.xtext.serializer.sequencer.AbstractDelegatingSemanticSequencer
-import org.eclipse.xtext.serializer.sequencer.GenericSequencer
-import org.eclipse.xtext.serializer.sequencer.ISemanticSequencer
-import org.eclipse.xtext.serializer.sequencer.ITransientValueService
-import org.eclipse.xtext.serializer.analysis.IGrammarConstraintProvider.IConstraint
-import org.apache.log4j.Logger
-
-class AbstractFixedSemanticSequencer extends AbstractSemanticSequencer {
-
-  val LOG = Logger.getLogger(AbstractFixedSemanticSequencer);
-  val METHOD_SEPARATOR = "\n\n"
-
-  @Inject Grammar grammar
-
-  @Inject extension GrammarAccess grammarAccess
-
-  @Inject extension SemanticSequencerUtil sequencerUtil
-
-  @Inject SerializerGenFileNames names
-
-  @Inject extension Naming
-
-  override getFileContents(SerializerGenFileNames.GenFileName filename) {
-    val file = new JavaEMFFile(grammar.eResource.resourceSet, filename.packageName, fileHeader);
-
-    file.imported(EObject)
-    file.imported(GenericSequencer)
-    file.imported(ISemanticSequencer)
-    file.imported(ITransientValueService)
-    file.imported(ISemanticSequenceAcceptor)
-    file.imported(ISemanticSequencerDiagnosticProvider)
-    file.imported(ISerializationDiagnostic.Acceptor)
-    file.imported(Inject)
-    file.imported(Provider)
-    if (annotationImports != null)
-      annotationImports.split("(import)|;").map[trim].filter[!empty].forEach[file.imported(it)]
-
-    val localConstraints = grammar.grammarConstraints
-    val superConstraints = grammar.superGrammar.grammarConstraints
-    val newLocalConstraints = localConstraints.filter[type !== null && !superConstraints.contains(it)].toSet
-    val superGrammar = if(localConstraints.exists[superConstraints.contains(it)])
-        file.imported(names.semanticSequencer.getQualifiedName(grammar.usedGrammars.head))
-      else
-        file.imported(AbstractDelegatingSemanticSequencer)
-    val methodSignatures = newHashSet()
-    val clazz = names.abstractSemanticSequencer.getSimpleName(grammar)
-    val _abstract = if (filename.isAbstract) "abstract " else ""
-    file.body = '''
-      «classAnnotations»@SuppressWarnings("all")
-      public «_abstract»class «filename.simpleName» extends «superGrammar» {
-
-        @Inject
-        private «file.imported(grammar.gaFQName)» grammarAccess;
-
-        «file.genMethodCreateSequence()»
-
-        «FOR c : newLocalConstraints.sort SEPARATOR METHOD_SEPARATOR»
-        «IF methodSignatures.add(c.simpleName -> c.type)»
-        «file.genMethodSequence(c)»
-        «ELSE»
-        «LOG.warn("Skipped generating duplicate method in " + clazz)»
-        «file.genMethodSequenceComment(c)»
-        «ENDIF»
-        «ENDFOR»
-      }
-    '''
-    file.toString
-  } //        //«localConstraints.filter(e|e.type!=null && !superConstraints.contains(e)).sort.join("\n\n",[e|file.genMethodSequence(e)])»
-
-  private def genMethodSequenceComment(JavaEMFFile file, IConstraint c) '''
-       // This method is commented out because it has the same signature as another method in this class.
-       // This is probably a bug in Xtext's serializer, please report it here:
-       // https://bugs.eclipse.org/bugs/enter_bug.cgi?product=TMF
-       //
-       //
-       // Constraint:
-       //     «IF c.body === null»{«c.type.name»}«ELSE»«c.body.toString.replaceAll("\\n","\n//     ")»«ENDIF»
-       //
-       // protected void sequence_«c.simpleName»(EObject context, «c.type» semanticObject) { }
-   '''
-}
-
diff --git a/com.avaloq.tools.ddk.xtext.generator/src/com/avaloq/tools/ddk/xtext/generator/serializer/SerializerFragment.xtend b/com.avaloq.tools.ddk.xtext.generator/src/com/avaloq/tools/ddk/xtext/generator/serializer/SerializerFragment.xtend
deleted file mode 100644
index 448f65710..000000000
--- a/com.avaloq.tools.ddk.xtext.generator/src/com/avaloq/tools/ddk/xtext/generator/serializer/SerializerFragment.xtend
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 Avaloq Evolution AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Avaloq Evolution AG - initial API and implementation
- *******************************************************************************/
-package com.avaloq.tools.ddk.xtext.generator.serializer
-
-import com.google.inject.Binder
-import org.eclipse.xtext.generator.serializer.AbstractSemanticSequencer
-
-class SerializerFragment extends org.eclipse.xtext.generator.serializer.SerializerFragment {
-
-    override protected addLocalBindings(Binder binder) {
-        super.addLocalBindings(binder)
-        binder.bind(AbstractSemanticSequencer).to(AbstractFixedSemanticSequencer)
-    }
-
-}
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/persistence/DirectLinkingResourceStorageLoadable.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/persistence/DirectLinkingResourceStorageLoadable.java
index 20faa99df..8f96c921b 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/persistence/DirectLinkingResourceStorageLoadable.java
+++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/persistence/DirectLinkingResourceStorageLoadable.java
@@ -73,6 +73,9 @@ protected void loadIntoResource(final StorageAwareResource resource) {
       // CHECKSTYLE:ON
       LOG.warn("Error loading " + resource.getURI(), e); //$NON-NLS-1$
       throw e instanceof WrappedException ? e : new WrappedException(e); // NOPMD
+    } catch (IOException e) {
+      LOG.warn("Error loading " + resource.getURI(), e); //$NON-NLS-1$
+      throw new WrappedException(e); // NOPMD
     } finally {
       traceSet.ended(ResourceLoadStorageEvent.class);
     }
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/serializer/IndentingSerializer.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/serializer/IndentingSerializer.java
index ae4e01d25..2cc28353e 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/serializer/IndentingSerializer.java
+++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/serializer/IndentingSerializer.java
@@ -72,7 +72,7 @@ protected void serialize(final EObject obj, final ITokenStream tokenStream, fina
       formatterTokenStream = formatter.createFormatterStream(initialIndentation, tokenStream, !options.isFormatting());
     }
     EObject context = getContext(obj);
-    ISequenceAcceptor acceptor = new TokenStreamSequenceAdapter(formatterTokenStream, errors);
+    ISequenceAcceptor acceptor = new TokenStreamSequenceAdapter(formatterTokenStream, grammar.getGrammar(), errors);
     serialize(obj, context, acceptor, errors);
     formatterTokenStream.flush();
   }
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/serializer/sequencer/ReorderingHiddenTokenSequencer.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/serializer/sequencer/ReorderingHiddenTokenSequencer.java
index 0bf592945..ab0aa6c32 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/serializer/sequencer/ReorderingHiddenTokenSequencer.java
+++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/serializer/sequencer/ReorderingHiddenTokenSequencer.java
@@ -29,6 +29,7 @@
 import org.eclipse.xtext.parsetree.reconstr.IHiddenTokenHelper;
 import org.eclipse.xtext.parsetree.reconstr.impl.NodeIterator;
 import org.eclipse.xtext.parsetree.reconstr.impl.TokenUtil;
+import org.eclipse.xtext.serializer.ISerializationContext;
 import org.eclipse.xtext.serializer.acceptor.ISequenceAcceptor;
 import org.eclipse.xtext.serializer.acceptor.ISyntacticSequenceAcceptor;
 import org.eclipse.xtext.serializer.diagnostic.ISerializationDiagnostic.Acceptor;
@@ -74,6 +75,7 @@ public class ReorderingHiddenTokenSequencer implements IHiddenTokenSequencer, IS
   // Implementation of the IHiddenTokenSequencer interface.
 
   @Override
+  @Deprecated
   public void init(final EObject context, final EObject semanticObject, final ISequenceAcceptor sequenceAcceptor, final Acceptor errorAcceptor) {
     this.delegate = sequenceAcceptor;
     this.lastNode = NodeModelUtils.findActualNodeFor(semanticObject);
@@ -84,6 +86,17 @@ public void init(final EObject context, final EObject semanticObject, final ISeq
     }
   }
 
+  @Override
+  public void init(final ISerializationContext context, final EObject semanticObject, final ISequenceAcceptor sequenceAcceptor, final Acceptor errorAcceptor) {
+    this.delegate = sequenceAcceptor;
+    this.lastNode = NodeModelUtils.findActualNodeFor(semanticObject);
+    this.rootNode = lastNode;
+    if (rootNode != null) {
+      this.rootOffset = rootNode.getTotalOffset();
+      this.rootEndOffset = rootNode.getTotalEndOffset();
+    }
+  }
+
   // Implementation of the ISyntacticSequenceAcceptor interface
 
   @Override
@@ -734,4 +747,5 @@ public String getText() {
       return NEW_LINE;
     }
   }
+
 }
diff --git a/ddk-target/ddk.target b/ddk-target/ddk.target
index d0b0263a6..38bfcef0a 100644
--- a/ddk-target/ddk.target
+++ b/ddk-target/ddk.target
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="DDK Target" sequenceNumber="6">
+<?pde version="3.8"?><target name="DDK Target" sequenceNumber="7">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
@@ -25,9 +25,9 @@
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.emf.codegen.ecore.ui.feature.group" version="2.10.0.v20150123-0452"/>
-<unit id="org.eclipse.xtend.sdk.feature.group" version="2.8.3.v201506010551"/>
+<unit id="org.eclipse.xtend.sdk.feature.group" version="2.13.0.v20171020-0920"/>
 <unit id="org.eclipse.xpand.sdk.feature.group" version="2.0.0.v201406030414"/>
-<unit id="org.eclipse.xtext.sdk.feature.group" version="2.8.3.v201506010551"/>
+<unit id="org.eclipse.xtext.sdk.feature.group" version="2.13.0.v20171020-0920"/>
 <repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/"/>
 </location>
 </locations>

From 19586702f5578e50241c5a75022bf8baee69959f Mon Sep 17 00:00:00 2001
From: Roman Mitin <roman.mitin@avaloq.com>
Date: Fri, 11 May 2018 09:45:52 +0200
Subject: [PATCH 10/56] Fix unit tests failing after Xtext upgrade

---
 .../check/ui/wizard/CheckProjectCreator.java  |  2 +-
 .../test/AbstractXtextMarkerBasedTest.java    |  4 +-
 .../xtext/test/PluginTestProjectManager.java  |  2 +-
 .../test/generator/AbstractGeneratorTest.java |  2 +-
 .../AllTests DDK.launch                       |  2 +-
 .../AllTests DSLSDK.launch                    | 43 -------------------
 .../WorkbenchResolutionAdaptorRunTest.java    |  7 +++
 ddk-configuration/launches/devkit-run.launch  |  2 +-
 8 files changed, 14 insertions(+), 50 deletions(-)
 delete mode 100644 com.avaloq.tools.ddk.xtext.test/AllTests DSLSDK.launch

diff --git a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/wizard/CheckProjectCreator.java b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/wizard/CheckProjectCreator.java
index e111503ef..1dcfdca4a 100644
--- a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/wizard/CheckProjectCreator.java
+++ b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/wizard/CheckProjectCreator.java
@@ -69,7 +69,7 @@ protected CheckProjectInfo getProjectInfo() {
   "com.avaloq.tools.ddk.check.lib", // Check user library
   "com.avaloq.tools.targetdefinition.check.core;resolution:=optional", // Check configuration preferences, TODO should only be added for ASMD
   "org.eclipse.core.runtime", //
-  "org.eclipse.xtend2.lib", // required for CheckGenerator operations, e.g. 'StringConcatenation()'
+  "org.eclipse.xtend.lib", // required for CheckGenerator operations, e.g. 'StringConcatenation()'
   "org.eclipse.xtext.xbase.lib", // required for Xbase operations, e.g. '=='
   "com.avaloq.tools.dsl.check.lib;resolution:=optional" // utility operations (ASMD specific)
   );
diff --git a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/AbstractXtextMarkerBasedTest.java b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/AbstractXtextMarkerBasedTest.java
index bf503e9fb..194bc8075 100644
--- a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/AbstractXtextMarkerBasedTest.java
+++ b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/AbstractXtextMarkerBasedTest.java
@@ -44,7 +44,7 @@
  */
 public abstract class AbstractXtextMarkerBasedTest extends AbstractXtextTest {
 
-  private static final String INVALID_TEST_CONFIGURATION = "Invalid test configuration. Missing org.eclipse.xtend2.lib in MANIFEST.MF in this plugin?"; //$NON-NLS-1$
+  private static final String INVALID_TEST_CONFIGURATION = "Invalid test configuration. Missing org.eclipse.xtend.lib in MANIFEST.MF in this plugin?"; //$NON-NLS-1$
   private static final String LINE_BREAK = "\n";
   private static final String MARKER_START_GUARD = "##";
   private static final String MARKER_END_GUARD = "#";
@@ -264,7 +264,7 @@ protected String addAssertion(final AbstractModelAssertion assertion) {
    * global ids start with {@value com.avaloq.tools.asmd.testbase.scoping.TagCompilationParticipant#COUNTER_BASE}. Since it is unlikely to get local ids wrong,
    * the most common reason for global ids to be wrong is that they were not initialized. Global ids get initialized with active annotation
    * {@link com.avaloq.tools.asmd.testbase.scoping.Tag} that executes {@link com.avaloq.tools.asmd.testbase.scoping.TagCompilationParticipant}. Active
-   * annotations do not get executed if {@code org.eclipse.xtend2.lib} is missing in {@code MANIFEST.MF}. Thus we report this common mistake to the user via an
+   * annotations do not get executed if {@code org.eclipse.xtend.lib} is missing in {@code MANIFEST.MF}. Thus we report this common mistake to the user via an
    * assertion.
    * </p>
    *
diff --git a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/PluginTestProjectManager.java b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/PluginTestProjectManager.java
index 781f36182..0eed738a3 100644
--- a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/PluginTestProjectManager.java
+++ b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/PluginTestProjectManager.java
@@ -49,7 +49,7 @@ public class PluginTestProjectManager extends XtextTestProjectManager {
 
   // org.eclipse.osgi needed for NLS
   // org.apache.log4j needed for logging in generated StandaloneSetup
-  private static final List<String> REQUIRED_BUNDLES = newArrayList("org.eclipse.xtext.xbase.lib", "org.eclipse.xtend2.lib", //
+  private static final List<String> REQUIRED_BUNDLES = newArrayList("org.eclipse.xtext.xbase.lib", "org.eclipse.xtend.lib", //
       "org.eclipse.emf.ecore", "com.avaloq.tools.ddk.check.core", "com.avaloq.tools.ddk.check.runtime.core", "com.avaloq.tools.ddk.check.lib", //
       "org.eclipse.xtext", "org.eclipse.osgi", "org.eclipse.xtend", "org.eclipse.core.runtime", "org.eclipse.xtext.xbase", "org.apache.log4j");
 
diff --git a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/generator/AbstractGeneratorTest.java b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/generator/AbstractGeneratorTest.java
index 519253ff6..e1da29813 100644
--- a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/generator/AbstractGeneratorTest.java
+++ b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/generator/AbstractGeneratorTest.java
@@ -73,7 +73,7 @@ public abstract class AbstractGeneratorTest {
   private final Set<IFile> files = newHashSet();
   protected static final List<String> REQUIRED_BUNDLES = newArrayList(//
   "org.eclipse.xtext.xbase.lib", //$NON-NLS-1$
-  "org.eclipse.xtend2.lib", // //$NON-NLS-1$
+  "org.eclipse.xtend.lib", // //$NON-NLS-1$
   "org.eclipse.emf.ecore", //$NON-NLS-1$
   "org.eclipse.xtext", // //$NON-NLS-1$
   "org.eclipse.osgi", //$NON-NLS-1$
diff --git a/com.avaloq.tools.ddk.xtext.test/AllTests DDK.launch b/com.avaloq.tools.ddk.xtext.test/AllTests DDK.launch
index 98bb469cd..d39c904e1 100644
--- a/com.avaloq.tools.ddk.xtext.test/AllTests DDK.launch	
+++ b/com.avaloq.tools.ddk.xtext.test/AllTests DDK.launch	
@@ -32,7 +32,7 @@
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.platform.ide"/>
 <booleanAttribute key="run_in_ui_thread" value="true"/>
-<stringAttribute key="selected_target_plugins" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.avaloq.tools.extra-jre-packages@default:false,com.avaloq.tools.foundation.common@default:default,com.google.guava@default:default,com.google.inject@default:default,com.ibm.icu@default:default,com.jcraft.jsch@default:default,com.oracle.jdbc@default:default,com.oracle.ucp@default:default,com.sun.el@default:default,com.sun.jersey.jersey-client@default:default,com.sun.jersey.jersey-core@default:default,com.sun.xml.bind@default:default,edu.umd.cs.findbugs.annotations@default:default,edu.umd.cs.findbugs.jsr305@default:default,javax.activation@default:default,javax.annotation@default:default,javax.el@default:default,javax.inject@default:default,javax.mail@default:default,javax.persistence@default:default,javax.servlet-api@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.xml.stream@default:default,javax.xml@default:default,jaxb-api@default:default,jdepend@default:default,net.ffxml.swtforms@default:default,net.sourceforge.jwebunit@default:default,org.antlr.runtime@default:default,org.aopalliance@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.cli@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.digester@default:default,org.apache.commons.io@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.jasper.glassfish@default:default,org.apache.log4j@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.poi.ooxml.schemas@default:default,org.apache.poi.ooxml@default:default,org.apache.poi@default:default,org.apache.xmlbeans@default:default,org.dom4j@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare.win32@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources.win32.x86_64@default:false,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.draw2d.doc.isv@default:default,org.eclipse.draw2d@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.dialogs@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient4@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.emf.ant@default:default,org.eclipse.emf.cheatsheets@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen.ui@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.converter@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.doc@default:default,org.eclipse.emf.ecore.change.edit@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.example.installer@default:default,org.eclipse.emf.exporter@default:default,org.eclipse.emf.generic.editor@default:default,org.eclipse.emf.importer.ecore@default:default,org.eclipse.emf.importer.java@default:default,org.eclipse.emf.importer.rose@default:default,org.eclipse.emf.importer@default:default,org.eclipse.emf.mapping.ecore.editor@default:default,org.eclipse.emf.mapping.ecore2ecore.editor@default:default,org.eclipse.emf.mapping.ecore2ecore@default:default,org.eclipse.emf.mapping.ecore2xml.ui@default:default,org.eclipse.emf.mapping.ecore2xml@default:default,org.eclipse.emf.mapping.ecore@default:default,org.eclipse.emf.mapping.ui@default:default,org.eclipse.emf.mapping@default:default,org.eclipse.emf.mwe.activities@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.emf.mwe.doc@default:default,org.eclipse.emf.mwe.ui.simpleEditor@default:default,org.eclipse.emf.mwe.ui@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.emf.mwe2.language.ui@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.emf.mwe2.lib@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.emf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.launcher.win32.win32.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.p2.ui.importexport@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.gef.doc.isv@default:default,org.eclipse.gef.examples.flow@default:default,org.eclipse.gef.examples.logic@default:default,org.eclipse.gef.examples.shapes@default:default,org.eclipse.gef.examples.text@default:default,org.eclipse.gef.examples.ui.pde@default:default,org.eclipse.gef@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help.webapp@default:default,org.eclipse.help@default:default,org.eclipse.jdt.annotation*1.1.100.v20160418-1457@default:default,org.eclipse.jdt.annotation*2.1.0.v20160418-1457@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.doc.user@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.api.tools.annotations@default:default,org.eclipse.pde.api.tools.ui@default:default,org.eclipse.pde.api.tools@default:default,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.pde.ds.annotations@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.pde.ds.ui@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.pde.ua.ui@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde@default:default,org.eclipse.persistence.antlr@default:default,org.eclipse.persistence.asm@default:default,org.eclipse.persistence.core@default:default,org.eclipse.persistence.jpa.jpql@default:default,org.eclipse.persistence.jpa@default:default,org.eclipse.persistence.oracle@default:false,org.eclipse.platform.doc.user@default:default,org.eclipse.platform@default:default,org.eclipse.rcp@default:default,org.eclipse.search@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.swtbot.ant.junit@default:false,org.eclipse.swtbot.e4.finder@default:default,org.eclipse.swtbot.eclipse.core@default:default,org.eclipse.swtbot.eclipse.finder@default:default,org.eclipse.swtbot.eclipse.gef.finder@default:default,org.eclipse.swtbot.eclipse.junit.headless@default:default,org.eclipse.swtbot.eclipse.spy@default:default,org.eclipse.swtbot.eclipse.ui@default:default,org.eclipse.swtbot.forms.finder@default:default,org.eclipse.swtbot.generator.jdt@default:default,org.eclipse.swtbot.generator.rules.workbench@default:default,org.eclipse.swtbot.generator.ui@default:default,org.eclipse.swtbot.generator@default:default,org.eclipse.swtbot.go@default:default,org.eclipse.swtbot.junit4_x@default:default,org.eclipse.swtbot.swt.finder@default:default,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro.quicklinks@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.monitoring@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.net@default:default,org.eclipse.ui.themes@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.win32@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.uml2.codegen.ecore.ui@default:default,org.eclipse.uml2.codegen.ecore@default:default,org.eclipse.uml2.common.edit@default:default,org.eclipse.uml2.common@default:default,org.eclipse.uml2.doc@default:default,org.eclipse.uml2.examples.uml.ui@default:default,org.eclipse.uml2.examples@default:default,org.eclipse.uml2.types@default:default,org.eclipse.uml2.uml.ecore.exporter@default:default,org.eclipse.uml2.uml.ecore.importer@default:default,org.eclipse.uml2.uml.edit@default:default,org.eclipse.uml2.uml.editor@default:default,org.eclipse.uml2.uml.profile.l2@default:default,org.eclipse.uml2.uml.profile.l3@default:default,org.eclipse.uml2.uml.resources@default:default,org.eclipse.uml2.uml@default:default,org.eclipse.uml2@default:default,org.eclipse.update.configurator@3:true,org.eclipse.xpand.activities@default:default,org.eclipse.xpand.doc@default:default,org.eclipse.xpand.examples@default:default,org.eclipse.xpand.ui@default:default,org.eclipse.xpand@default:default,org.eclipse.xsd@default:default,org.eclipse.xtend.check.ui@default:default,org.eclipse.xtend.core@default:default,org.eclipse.xtend.doc@default:default,org.eclipse.xtend.examples@default:default,org.eclipse.xtend.ide.common@default:default,org.eclipse.xtend.ide@default:default,org.eclipse.xtend.lib.macro@default:default,org.eclipse.xtend.lib@default:default,org.eclipse.xtend.m2e@default:default,org.eclipse.xtend.profiler@default:default,org.eclipse.xtend.shared.ui@default:default,org.eclipse.xtend.standalone@default:default,org.eclipse.xtend.typesystem.emf.ui@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.xtend.typesystem.uml2.ui@default:default,org.eclipse.xtend.typesystem.uml2@default:default,org.eclipse.xtend.typesystem.xsd.ui@default:default,org.eclipse.xtend.typesystem.xsd@default:default,org.eclipse.xtend.ui@default:default,org.eclipse.xtend.util.stdlib@default:default,org.eclipse.xtend2.lib@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.activities@default:default,org.eclipse.xtext.builder.standalone@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.xtext.common.types.edit@default:default,org.eclipse.xtext.common.types.shared.jdt38@default:false,org.eclipse.xtext.common.types.shared@default:default,org.eclipse.xtext.common.types.ui@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.xtext.doc@default:default,org.eclipse.xtext.ecore@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.xtext.ide@default:default,org.eclipse.xtext.idea.generator@default:default,org.eclipse.xtext.junit4@default:default,org.eclipse.xtext.junit@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.xtext.m2e@default:default,org.eclipse.xtext.purexbase.ui@default:default,org.eclipse.xtext.purexbase@default:default,org.eclipse.xtext.smap@default:default,org.eclipse.xtext.ui.codetemplates.ui@default:default,org.eclipse.xtext.ui.codetemplates@default:default,org.eclipse.xtext.ui.ecore@default:default,org.eclipse.xtext.ui.junit@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.junit@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext.xbase.ui@default:default,org.eclipse.xtext.xbase@default:default,org.eclipse.xtext.xtext.ui.examples@default:default,org.eclipse.xtext.xtext.ui.graph@default:default,org.eclipse.xtext.xtext.ui@default:default,org.eclipse.xtext@default:default,org.eclipse.zest.core@default:default,org.eclipse.zest.doc.isv@default:default,org.eclipse.zest.layouts@default:default,org.glassfish.hk2.osgi-resource-locator@default:default,org.glassfish.main.core.glassfish-extra-jre-packages@default:false,org.glassfish.main.core.glassfish@default:default,org.glassfish.main.ejb.javax.ejb@default:default,org.glassfish.main.javaee-api.javax.annotation@default:default,org.glassfish.main.transaction.javax.transaction@default:false,org.hamcrest.core@default:default,org.hamcrest.integration@default:default,org.hamcrest.library@default:default,org.hamcrest.text@default:default,org.hamcrest@default:default,org.jboss.resteasy@default:default,org.junit4@default:default,org.junit@default:default,org.mockito.mockito-all@default:default,org.mockito@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.ext@default:default,org.slf4j.jcl@default:default,org.slf4j.jul@default:default,org.tukaani.xz@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
+<stringAttribute key="selected_target_plugins" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.avaloq.tools.extra-jre-packages@default:false,com.avaloq.tools.foundation.common@default:default,com.google.guava@default:default,com.google.inject@default:default,com.ibm.icu@default:default,com.jcraft.jsch@default:default,com.oracle.jdbc@default:default,com.oracle.ucp@default:default,com.sun.el@default:default,com.sun.jersey.jersey-client@default:default,com.sun.jersey.jersey-core@default:default,com.sun.xml.bind@default:default,edu.umd.cs.findbugs.annotations@default:default,edu.umd.cs.findbugs.jsr305@default:default,javax.activation@default:default,javax.annotation@default:default,javax.el@default:default,javax.inject@default:default,javax.mail@default:default,javax.persistence@default:default,javax.servlet-api@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.xml.stream@default:default,javax.xml@default:default,jaxb-api@default:default,jdepend@default:default,net.ffxml.swtforms@default:default,net.sourceforge.jwebunit@default:default,org.antlr.runtime@default:default,org.aopalliance@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.cli@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.digester@default:default,org.apache.commons.io@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.jasper.glassfish@default:default,org.apache.log4j@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.poi.ooxml.schemas@default:default,org.apache.poi.ooxml@default:default,org.apache.poi@default:default,org.apache.xmlbeans@default:default,org.dom4j@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare.win32@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources.win32.x86_64@default:false,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.draw2d.doc.isv@default:default,org.eclipse.draw2d@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.dialogs@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient4@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.emf.ant@default:default,org.eclipse.emf.cheatsheets@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen.ui@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.converter@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.doc@default:default,org.eclipse.emf.ecore.change.edit@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.example.installer@default:default,org.eclipse.emf.exporter@default:default,org.eclipse.emf.generic.editor@default:default,org.eclipse.emf.importer.ecore@default:default,org.eclipse.emf.importer.java@default:default,org.eclipse.emf.importer.rose@default:default,org.eclipse.emf.importer@default:default,org.eclipse.emf.mapping.ecore.editor@default:default,org.eclipse.emf.mapping.ecore2ecore.editor@default:default,org.eclipse.emf.mapping.ecore2ecore@default:default,org.eclipse.emf.mapping.ecore2xml.ui@default:default,org.eclipse.emf.mapping.ecore2xml@default:default,org.eclipse.emf.mapping.ecore@default:default,org.eclipse.emf.mapping.ui@default:default,org.eclipse.emf.mapping@default:default,org.eclipse.emf.mwe.activities@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.emf.mwe.doc@default:default,org.eclipse.emf.mwe.ui.simpleEditor@default:default,org.eclipse.emf.mwe.ui@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.emf.mwe2.language.ui@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.emf.mwe2.lib@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.emf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.launcher.win32.win32.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.p2.ui.importexport@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.gef.doc.isv@default:default,org.eclipse.gef.examples.flow@default:default,org.eclipse.gef.examples.logic@default:default,org.eclipse.gef.examples.shapes@default:default,org.eclipse.gef.examples.text@default:default,org.eclipse.gef.examples.ui.pde@default:default,org.eclipse.gef@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help.webapp@default:default,org.eclipse.help@default:default,org.eclipse.jdt.annotation*1.1.100.v20160418-1457@default:default,org.eclipse.jdt.annotation*2.1.0.v20160418-1457@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.doc.user@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.api.tools.annotations@default:default,org.eclipse.pde.api.tools.ui@default:default,org.eclipse.pde.api.tools@default:default,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.pde.ds.annotations@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.pde.ds.ui@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.pde.ua.ui@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde@default:default,org.eclipse.persistence.antlr@default:default,org.eclipse.persistence.asm@default:default,org.eclipse.persistence.core@default:default,org.eclipse.persistence.jpa.jpql@default:default,org.eclipse.persistence.jpa@default:default,org.eclipse.persistence.oracle@default:false,org.eclipse.platform.doc.user@default:default,org.eclipse.platform@default:default,org.eclipse.rcp@default:default,org.eclipse.search@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.swtbot.ant.junit@default:false,org.eclipse.swtbot.e4.finder@default:default,org.eclipse.swtbot.eclipse.core@default:default,org.eclipse.swtbot.eclipse.finder@default:default,org.eclipse.swtbot.eclipse.gef.finder@default:default,org.eclipse.swtbot.eclipse.junit.headless@default:default,org.eclipse.swtbot.eclipse.spy@default:default,org.eclipse.swtbot.eclipse.ui@default:default,org.eclipse.swtbot.forms.finder@default:default,org.eclipse.swtbot.generator.jdt@default:default,org.eclipse.swtbot.generator.rules.workbench@default:default,org.eclipse.swtbot.generator.ui@default:default,org.eclipse.swtbot.generator@default:default,org.eclipse.swtbot.go@default:default,org.eclipse.swtbot.junit4_x@default:default,org.eclipse.swtbot.swt.finder@default:default,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro.quicklinks@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.monitoring@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.net@default:default,org.eclipse.ui.themes@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.win32@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.uml2.codegen.ecore.ui@default:default,org.eclipse.uml2.codegen.ecore@default:default,org.eclipse.uml2.common.edit@default:default,org.eclipse.uml2.common@default:default,org.eclipse.uml2.doc@default:default,org.eclipse.uml2.examples.uml.ui@default:default,org.eclipse.uml2.examples@default:default,org.eclipse.uml2.types@default:default,org.eclipse.uml2.uml.ecore.exporter@default:default,org.eclipse.uml2.uml.ecore.importer@default:default,org.eclipse.uml2.uml.edit@default:default,org.eclipse.uml2.uml.editor@default:default,org.eclipse.uml2.uml.profile.l2@default:default,org.eclipse.uml2.uml.profile.l3@default:default,org.eclipse.uml2.uml.resources@default:default,org.eclipse.uml2.uml@default:default,org.eclipse.uml2@default:default,org.eclipse.update.configurator@3:true,org.eclipse.xpand.activities@default:default,org.eclipse.xpand.doc@default:default,org.eclipse.xpand.examples@default:default,org.eclipse.xpand.ui@default:default,org.eclipse.xpand@default:default,org.eclipse.xsd@default:default,org.eclipse.xtend.check.ui@default:default,org.eclipse.xtend.core@default:default,org.eclipse.xtend.doc@default:default,org.eclipse.xtend.examples@default:default,org.eclipse.xtend.ide.common@default:default,org.eclipse.xtend.ide@default:default,org.eclipse.xtend.lib.macro@default:default,org.eclipse.xtend.lib@default:default,org.eclipse.xtend.m2e@default:default,org.eclipse.xtend.profiler@default:default,org.eclipse.xtend.shared.ui@default:default,org.eclipse.xtend.standalone@default:default,org.eclipse.xtend.typesystem.emf.ui@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.xtend.typesystem.uml2.ui@default:default,org.eclipse.xtend.typesystem.uml2@default:default,org.eclipse.xtend.typesystem.xsd.ui@default:default,org.eclipse.xtend.typesystem.xsd@default:default,org.eclipse.xtend.ui@default:default,org.eclipse.xtend.util.stdlib@default:default,org.eclipse.xtend.lib@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.activities@default:default,org.eclipse.xtext.builder.standalone@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.xtext.common.types.edit@default:default,org.eclipse.xtext.common.types.shared.jdt38@default:false,org.eclipse.xtext.common.types.shared@default:default,org.eclipse.xtext.common.types.ui@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.xtext.doc@default:default,org.eclipse.xtext.ecore@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.xtext.ide@default:default,org.eclipse.xtext.idea.generator@default:default,org.eclipse.xtext.junit4@default:default,org.eclipse.xtext.junit@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.xtext.m2e@default:default,org.eclipse.xtext.purexbase.ui@default:default,org.eclipse.xtext.purexbase@default:default,org.eclipse.xtext.smap@default:default,org.eclipse.xtext.ui.codetemplates.ui@default:default,org.eclipse.xtext.ui.codetemplates@default:default,org.eclipse.xtext.ui.ecore@default:default,org.eclipse.xtext.ui.junit@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.junit@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext.xbase.ui@default:default,org.eclipse.xtext.xbase@default:default,org.eclipse.xtext.xtext.ui.examples@default:default,org.eclipse.xtext.xtext.ui.graph@default:default,org.eclipse.xtext.xtext.ui@default:default,org.eclipse.xtext@default:default,org.eclipse.zest.core@default:default,org.eclipse.zest.doc.isv@default:default,org.eclipse.zest.layouts@default:default,org.glassfish.hk2.osgi-resource-locator@default:default,org.glassfish.main.core.glassfish-extra-jre-packages@default:false,org.glassfish.main.core.glassfish@default:default,org.glassfish.main.ejb.javax.ejb@default:default,org.glassfish.main.javaee-api.javax.annotation@default:default,org.glassfish.main.transaction.javax.transaction@default:false,org.hamcrest.core@default:default,org.hamcrest.integration@default:default,org.hamcrest.library@default:default,org.hamcrest.text@default:default,org.hamcrest@default:default,org.jboss.resteasy@default:default,org.junit4@default:default,org.junit@default:default,org.mockito.mockito-all@default:default,org.mockito@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.ext@default:default,org.slf4j.jcl@default:default,org.slf4j.jul@default:default,org.tukaani.xz@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
 <stringAttribute key="selected_workspace_plugins" value="com.avaloq.test.core.test@default:false,com.avaloq.test.core@default:default,com.avaloq.tools.ddk.check.core.test@default:default,com.avaloq.tools.ddk.check.core@default:default,com.avaloq.tools.ddk.check.generator@default:default,com.avaloq.tools.ddk.check.lib@default:default,com.avaloq.tools.ddk.check.runtime.core.test@default:default,com.avaloq.tools.ddk.check.runtime.core@default:default,com.avaloq.tools.ddk.check.runtime.ui@default:default,com.avaloq.tools.ddk.check.test.runtime.tests@default:default,com.avaloq.tools.ddk.check.test.runtime.ui@default:default,com.avaloq.tools.ddk.check.test.runtime@default:default,com.avaloq.tools.ddk.check.ui.test@default:default,com.avaloq.tools.ddk.check.ui@default:default,com.avaloq.tools.ddk.checkcfg.core.test@default:default,com.avaloq.tools.ddk.checkcfg.core@default:default,com.avaloq.tools.ddk.checkcfg.ui.test@default:default,com.avaloq.tools.ddk.checkcfg.ui@default:default,com.avaloq.tools.ddk.typesystem.test@default:false,com.avaloq.tools.ddk.typesystem@default:default,com.avaloq.tools.ddk.workflow@default:default,com.avaloq.tools.ddk.xtext.builder.ui@default:default,com.avaloq.tools.ddk.xtext.builder@default:default,com.avaloq.tools.ddk.xtext.common.types.ui@default:default,com.avaloq.tools.ddk.xtext.common.types@default:default,com.avaloq.tools.ddk.xtext.common.ui@default:default,com.avaloq.tools.ddk.xtext.export.generator@default:default,com.avaloq.tools.ddk.xtext.export.test@default:false,com.avaloq.tools.ddk.xtext.export.ui@default:default,com.avaloq.tools.ddk.xtext.export@default:default,com.avaloq.tools.ddk.xtext.expression.ui@default:default,com.avaloq.tools.ddk.xtext.expression@default:default,com.avaloq.tools.ddk.xtext.format.generator@default:default,com.avaloq.tools.ddk.xtext.format.test@default:false,com.avaloq.tools.ddk.xtext.format.ui@default:default,com.avaloq.tools.ddk.xtext.format@default:default,com.avaloq.tools.ddk.xtext.generator.test@default:false,com.avaloq.tools.ddk.xtext.generator@default:default,com.avaloq.tools.ddk.xtext.scope.generator@default:default,com.avaloq.tools.ddk.xtext.scope.ui@default:default,com.avaloq.tools.ddk.xtext.scope@default:default,com.avaloq.tools.ddk.xtext.test.core@default:default,com.avaloq.tools.ddk.xtext.test@default:default,com.avaloq.tools.ddk.xtext.ui@default:default,com.avaloq.tools.ddk.xtext.valid.generator@default:default,com.avaloq.tools.ddk.xtext.valid.test@default:false,com.avaloq.tools.ddk.xtext.valid.ui@default:default,com.avaloq.tools.ddk.xtext.valid@default:default,com.avaloq.tools.ddk.xtext@default:default,com.avaloq.tools.xtextspy.test@default:false,com.avaloq.tools.xtextspy@default:default"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <booleanAttribute key="tracing" value="false"/>
diff --git a/com.avaloq.tools.ddk.xtext.test/AllTests DSLSDK.launch b/com.avaloq.tools.ddk.xtext.test/AllTests DSLSDK.launch
deleted file mode 100644
index a420a330a..000000000
--- a/com.avaloq.tools.ddk.xtext.test/AllTests DSLSDK.launch	
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.swtbot.eclipse.ui.launcher.JunitLaunchConfig">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/AllTests.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.avaloq.tools.ddk.xtext.AllTests"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.avaloq.tools.ddk.xtext.test"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djava.util.logging.config.file=&quot;${workspace_loc:dslsdk-configuration/logging/jdbc-log.properties}&quot;&#13;&#10;-Dlogback.configurationFile=&quot;${workspace_loc:dslsdk-configuration/logging/logback-config.xml}&quot;&#13;&#10;-Xms256m&#13;&#10;-Xmx1536m&#13;&#10;-XX:+UseConcMarkSweepGC&#13;&#10;-ea"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<booleanAttribute key="run_in_ui_thread" value="true"/>
-<stringAttribute key="selected_target_plugins" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.avaloq.tools.extra-jre-packages@default:false,com.avaloq.tools.foundation.common@default:default,com.google.guava@default:default,com.google.inject@default:default,com.ibm.icu@default:default,com.jcraft.jsch@default:default,com.oracle.jdbc@default:default,com.oracle.ucp@default:default,com.sun.el@default:default,com.sun.jersey.jersey-client@default:default,com.sun.jersey.jersey-core@default:default,com.sun.xml.bind@default:default,edu.umd.cs.findbugs.annotations@default:default,edu.umd.cs.findbugs.jsr305@default:default,javax.activation@default:default,javax.annotation@default:default,javax.el@default:default,javax.inject@default:default,javax.mail@default:default,javax.persistence@default:default,javax.servlet-api@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.xml.stream@default:default,javax.xml@default:default,jaxb-api@default:default,jdepend@default:default,net.ffxml.swtforms@default:default,net.sourceforge.jwebunit@default:default,org.antlr.runtime@default:default,org.aopalliance@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.cli@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.digester@default:default,org.apache.commons.io@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.jasper.glassfish@default:default,org.apache.log4j@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.poi.ooxml.schemas@default:default,org.apache.poi.ooxml@default:default,org.apache.poi@default:default,org.apache.xmlbeans@default:default,org.dom4j@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare.win32@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources.win32.x86_64@default:false,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.draw2d.doc.isv@default:default,org.eclipse.draw2d@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.dialogs@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient4@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.emf.ant@default:default,org.eclipse.emf.cheatsheets@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen.ui@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.converter@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.doc@default:default,org.eclipse.emf.ecore.change.edit@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.example.installer@default:default,org.eclipse.emf.exporter@default:default,org.eclipse.emf.generic.editor@default:default,org.eclipse.emf.importer.ecore@default:default,org.eclipse.emf.importer.java@default:default,org.eclipse.emf.importer.rose@default:default,org.eclipse.emf.importer@default:default,org.eclipse.emf.mapping.ecore.editor@default:default,org.eclipse.emf.mapping.ecore2ecore.editor@default:default,org.eclipse.emf.mapping.ecore2ecore@default:default,org.eclipse.emf.mapping.ecore2xml.ui@default:default,org.eclipse.emf.mapping.ecore2xml@default:default,org.eclipse.emf.mapping.ecore@default:default,org.eclipse.emf.mapping.ui@default:default,org.eclipse.emf.mapping@default:default,org.eclipse.emf.mwe.activities@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.emf.mwe.doc@default:default,org.eclipse.emf.mwe.ui.simpleEditor@default:default,org.eclipse.emf.mwe.ui@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.emf.mwe2.language.ui@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.emf.mwe2.lib@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.emf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.launcher.win32.win32.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.p2.ui.importexport@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.gef.doc.isv@default:default,org.eclipse.gef.examples.flow@default:default,org.eclipse.gef.examples.logic@default:default,org.eclipse.gef.examples.shapes@default:default,org.eclipse.gef.examples.text@default:default,org.eclipse.gef.examples.ui.pde@default:default,org.eclipse.gef@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help.webapp@default:default,org.eclipse.help@default:default,org.eclipse.jdt.annotation*1.1.100.v20160418-1457@default:default,org.eclipse.jdt.annotation*2.1.0.v20160418-1457@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.doc.user@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.api.tools.annotations@default:default,org.eclipse.pde.api.tools.ui@default:default,org.eclipse.pde.api.tools@default:default,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.pde.ds.annotations@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.pde.ds.ui@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.pde.ua.ui@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde@default:default,org.eclipse.persistence.antlr@default:default,org.eclipse.persistence.asm@default:default,org.eclipse.persistence.core@default:default,org.eclipse.persistence.jpa.jpql@default:default,org.eclipse.persistence.jpa@default:default,org.eclipse.persistence.oracle@default:false,org.eclipse.platform.doc.user@default:default,org.eclipse.platform@default:default,org.eclipse.rcp@default:default,org.eclipse.search@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.swtbot.ant.junit@default:false,org.eclipse.swtbot.e4.finder@default:default,org.eclipse.swtbot.eclipse.core@default:default,org.eclipse.swtbot.eclipse.finder@default:default,org.eclipse.swtbot.eclipse.gef.finder@default:default,org.eclipse.swtbot.eclipse.junit.headless@default:default,org.eclipse.swtbot.eclipse.spy@default:default,org.eclipse.swtbot.eclipse.ui@default:default,org.eclipse.swtbot.forms.finder@default:default,org.eclipse.swtbot.generator.jdt@default:default,org.eclipse.swtbot.generator.rules.workbench@default:default,org.eclipse.swtbot.generator.ui@default:default,org.eclipse.swtbot.generator@default:default,org.eclipse.swtbot.go@default:default,org.eclipse.swtbot.junit4_x@default:default,org.eclipse.swtbot.swt.finder@default:default,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro.quicklinks@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.monitoring@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.net@default:default,org.eclipse.ui.themes@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.win32@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.uml2.codegen.ecore.ui@default:default,org.eclipse.uml2.codegen.ecore@default:default,org.eclipse.uml2.common.edit@default:default,org.eclipse.uml2.common@default:default,org.eclipse.uml2.doc@default:default,org.eclipse.uml2.examples.uml.ui@default:default,org.eclipse.uml2.examples@default:default,org.eclipse.uml2.types@default:default,org.eclipse.uml2.uml.ecore.exporter@default:default,org.eclipse.uml2.uml.ecore.importer@default:default,org.eclipse.uml2.uml.edit@default:default,org.eclipse.uml2.uml.editor@default:default,org.eclipse.uml2.uml.profile.l2@default:default,org.eclipse.uml2.uml.profile.l3@default:default,org.eclipse.uml2.uml.resources@default:default,org.eclipse.uml2.uml@default:default,org.eclipse.uml2@default:default,org.eclipse.update.configurator@3:true,org.eclipse.xpand.activities@default:default,org.eclipse.xpand.doc@default:default,org.eclipse.xpand.examples@default:default,org.eclipse.xpand.ui@default:default,org.eclipse.xpand@default:default,org.eclipse.xsd@default:default,org.eclipse.xtend.check.ui@default:default,org.eclipse.xtend.core@default:default,org.eclipse.xtend.doc@default:default,org.eclipse.xtend.examples@default:default,org.eclipse.xtend.ide.common@default:default,org.eclipse.xtend.ide@default:default,org.eclipse.xtend.lib.macro@default:default,org.eclipse.xtend.lib@default:default,org.eclipse.xtend.m2e@default:default,org.eclipse.xtend.profiler@default:default,org.eclipse.xtend.shared.ui@default:default,org.eclipse.xtend.standalone@default:default,org.eclipse.xtend.typesystem.emf.ui@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.xtend.typesystem.uml2.ui@default:default,org.eclipse.xtend.typesystem.uml2@default:default,org.eclipse.xtend.typesystem.xsd.ui@default:default,org.eclipse.xtend.typesystem.xsd@default:default,org.eclipse.xtend.ui@default:default,org.eclipse.xtend.util.stdlib@default:default,org.eclipse.xtend2.lib@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.activities@default:default,org.eclipse.xtext.builder.standalone@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.xtext.common.types.edit@default:default,org.eclipse.xtext.common.types.shared.jdt38@default:false,org.eclipse.xtext.common.types.shared@default:default,org.eclipse.xtext.common.types.ui@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.xtext.doc@default:default,org.eclipse.xtext.ecore@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.xtext.ide@default:default,org.eclipse.xtext.idea.generator@default:default,org.eclipse.xtext.junit4@default:default,org.eclipse.xtext.junit@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.xtext.m2e@default:default,org.eclipse.xtext.purexbase.ui@default:default,org.eclipse.xtext.purexbase@default:default,org.eclipse.xtext.smap@default:default,org.eclipse.xtext.ui.codetemplates.ui@default:default,org.eclipse.xtext.ui.codetemplates@default:default,org.eclipse.xtext.ui.ecore@default:default,org.eclipse.xtext.ui.junit@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.junit@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext.xbase.ui@default:default,org.eclipse.xtext.xbase@default:default,org.eclipse.xtext.xtext.ui.examples@default:default,org.eclipse.xtext.xtext.ui.graph@default:default,org.eclipse.xtext.xtext.ui@default:default,org.eclipse.xtext@default:default,org.eclipse.zest.core@default:default,org.eclipse.zest.doc.isv@default:default,org.eclipse.zest.layouts@default:default,org.glassfish.hk2.osgi-resource-locator@default:default,org.glassfish.main.core.glassfish-extra-jre-packages@default:false,org.glassfish.main.core.glassfish@default:default,org.glassfish.main.ejb.javax.ejb@default:default,org.glassfish.main.javaee-api.javax.annotation@default:default,org.glassfish.main.transaction.javax.transaction@default:false,org.hamcrest.core@default:default,org.hamcrest.integration@default:default,org.hamcrest.library@default:default,org.hamcrest.text@default:default,org.hamcrest@default:default,org.jboss.resteasy@default:default,org.junit4@default:default,org.junit@default:default,org.mockito.mockito-all@default:default,org.mockito@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.ext@default:default,org.slf4j.jcl@default:default,org.slf4j.jul@default:default,org.tukaani.xz@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="com.avaloq.tools.ddk.test.ui.test@default:false,com.avaloq.tools.ddk.test.core@default:default,com.avaloq.tools.ddk.test.ui@default:default,com.avaloq.tools.ddk.check.core.test@default:default,com.avaloq.tools.ddk.check.core@default:default,com.avaloq.tools.ddk.check.generator@default:default,com.avaloq.tools.ddk.check.lib@default:default,com.avaloq.tools.ddk.check.runtime.core.test@default:default,com.avaloq.tools.ddk.check.runtime.core@default:default,com.avaloq.tools.ddk.check.runtime.ui@default:default,com.avaloq.tools.ddk.check.test.runtime.tests@default:default,com.avaloq.tools.ddk.check.test.runtime.ui@default:default,com.avaloq.tools.ddk.check.test.runtime@default:default,com.avaloq.tools.ddk.check.ui.test@default:default,com.avaloq.tools.ddk.check.ui@default:default,com.avaloq.tools.ddk.checkcfg.core.test@default:default,com.avaloq.tools.ddk.checkcfg.core@default:default,com.avaloq.tools.ddk.checkcfg.ui.test@default:default,com.avaloq.tools.ddk.checkcfg.ui@default:default,com.avaloq.tools.ddk.typesystem.test@default:false,com.avaloq.tools.ddk.typesystem@default:default,com.avaloq.tools.ddk.workflow@default:default,com.avaloq.tools.ddk.xtext.builder.ui@default:default,com.avaloq.tools.ddk.xtext.builder@default:default,com.avaloq.tools.ddk.xtext.common.types.ui@default:default,com.avaloq.tools.ddk.xtext.common.types@default:default,com.avaloq.tools.ddk.xtext.common.ui@default:default,com.avaloq.tools.ddk.xtext.export.generator@default:default,com.avaloq.tools.ddk.xtext.export.test@default:false,com.avaloq.tools.ddk.xtext.export.ui@default:default,com.avaloq.tools.ddk.xtext.export@default:default,com.avaloq.tools.ddk.xtext.expression.ui@default:default,com.avaloq.tools.ddk.xtext.expression@default:default,com.avaloq.tools.ddk.xtext.format.generator@default:default,com.avaloq.tools.ddk.xtext.format.test@default:false,com.avaloq.tools.ddk.xtext.format.ui@default:default,com.avaloq.tools.ddk.xtext.format@default:default,com.avaloq.tools.ddk.xtext.generator.test@default:false,com.avaloq.tools.ddk.xtext.generator@default:default,com.avaloq.tools.ddk.xtext.scope.generator@default:default,com.avaloq.tools.ddk.xtext.scope.ui@default:default,com.avaloq.tools.ddk.xtext.scope@default:default,com.avaloq.tools.ddk.xtext.test.core@default:default,com.avaloq.tools.ddk.xtext.test@default:default,com.avaloq.tools.ddk.xtext.ui@default:default,com.avaloq.tools.ddk.xtext.valid.generator@default:default,com.avaloq.tools.ddk.xtext.valid.test@default:false,com.avaloq.tools.ddk.xtext.valid.ui@default:default,com.avaloq.tools.ddk.xtext.valid@default:default,com.avaloq.tools.ddk.xtext@default:default,com.avaloq.tools.ddk.xtextspy.test@default:false,com.avaloq.tools.ddk.xtextspy@default:default"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useProduct" value="true"/>
-</launchConfiguration>
diff --git a/com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/quickfix/WorkbenchResolutionAdaptorRunTest.java b/com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/quickfix/WorkbenchResolutionAdaptorRunTest.java
index 1f24de541..017472498 100644
--- a/com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/quickfix/WorkbenchResolutionAdaptorRunTest.java
+++ b/com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/quickfix/WorkbenchResolutionAdaptorRunTest.java
@@ -33,9 +33,11 @@
 import org.eclipse.xtext.Constants;
 import org.eclipse.xtext.resource.IResourceDescriptions;
 import org.eclipse.xtext.ui.MarkerTypes;
+import org.eclipse.xtext.ui.editor.IDirtyStateManager;
 import org.eclipse.xtext.ui.editor.quickfix.ILanguageResourceHelper;
 import org.eclipse.xtext.ui.editor.quickfix.IssueResolution;
 import org.eclipse.xtext.ui.editor.quickfix.IssueResolutionProvider;
+import org.eclipse.xtext.ui.resource.IResourceSetProvider;
 import org.eclipse.xtext.ui.resource.IStorage2UriMapper;
 import org.eclipse.xtext.ui.util.IssueUtil;
 import org.eclipse.xtext.util.Pair;
@@ -63,6 +65,8 @@ public class WorkbenchResolutionAdaptorRunTest {
   private final IStorage2UriMapper mockStorage2UriMapper = mock(IStorage2UriMapper.class);
   private final ILanguageResourceHelper mockLanguageResourceHelper = mock(ILanguageResourceHelper.class);
   private final IssueResolutionProvider mockIssueResolutionProvider = mock(IssueResolutionProvider.class);
+  private final IResourceSetProvider mockResourceSetProvider = mock(IResourceSetProvider.class);
+  private final IDirtyStateManager mockDirtyStateManager = mock(IDirtyStateManager.class);
 
   private final Injector injector = Guice.createInjector(new AbstractModule() {
     @Override
@@ -78,6 +82,9 @@ protected void configure() {
       bind(IStorage2UriMapper.class).toInstance(mockStorage2UriMapper);
       bind(ILanguageResourceHelper.class).toInstance(mockLanguageResourceHelper);
       bind(IssueResolutionProvider.class).toInstance(mockIssueResolutionProvider);
+
+      bind(IResourceSetProvider.class).toInstance(mockResourceSetProvider);
+      bind(IDirtyStateManager.class).toInstance(mockDirtyStateManager);
     }
   });
 
diff --git a/ddk-configuration/launches/devkit-run.launch b/ddk-configuration/launches/devkit-run.launch
index 2308a3476..1885113e7 100644
--- a/ddk-configuration/launches/devkit-run.launch
+++ b/ddk-configuration/launches/devkit-run.launch
@@ -23,7 +23,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dlogback.configurationFile=&quot;${workspace_loc:ddk-configuration/logging/logback-config.xml}&quot;&#13;&#10;-Xms1g&#13;&#10;-Xmx3g"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.equinox.p2.director.app.product"/>
-<stringAttribute key="selected_target_plugins" value="com.google.guava@default:default,com.google.inject@default:default,com.ibm.icu@default:default,com.jcraft.jsch@default:default,com.sun.el@default:default,javax.el@default:default,javax.inject@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.xml@default:default,org.antlr.runtime@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.cli@default:default,org.apache.commons.codec@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.jasper.glassfish@default:default,org.apache.log4j@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare.win32@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.draw2d@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.emf.ant@default:default,org.eclipse.emf.cheatsheets@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen.ui@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.converter@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.doc@default:default,org.eclipse.emf.ecore.change.edit@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.example.installer@default:default,org.eclipse.emf.exporter@default:default,org.eclipse.emf.importer.ecore@default:default,org.eclipse.emf.importer.java@default:default,org.eclipse.emf.importer.rose@default:default,org.eclipse.emf.importer@default:default,org.eclipse.emf.mapping.ecore.editor@default:default,org.eclipse.emf.mapping.ecore2ecore.editor@default:default,org.eclipse.emf.mapping.ecore2ecore@default:default,org.eclipse.emf.mapping.ecore2xml.ui@default:default,org.eclipse.emf.mapping.ecore2xml@default:default,org.eclipse.emf.mapping.ecore@default:default,org.eclipse.emf.mapping.ui@default:default,org.eclipse.emf.mapping@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.emf.mwe2.language.ui@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.emf.mwe2.lib@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.emf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.launcher.win32.win32.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.p2.ui.importexport@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.gef@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help.webapp@default:default,org.eclipse.help@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.ui@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.platform@default:default,org.eclipse.rcp@default:default,org.eclipse.search@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.swtbot.eclipse.core@default:default,org.eclipse.swtbot.eclipse.finder@default:default,org.eclipse.swtbot.eclipse.gef.finder@default:default,org.eclipse.swtbot.eclipse.spy@default:default,org.eclipse.swtbot.eclipse.ui@default:default,org.eclipse.swtbot.forms.finder@default:default,org.eclipse.swtbot.go@default:default,org.eclipse.swtbot.junit4_x@default:default,org.eclipse.swtbot.swt.finder@default:default,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.net@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.win32@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator@3:true,org.eclipse.xpand@default:default,org.eclipse.xtend.core@default:default,org.eclipse.xtend.doc@default:default,org.eclipse.xtend.examples@default:default,org.eclipse.xtend.ide@default:default,org.eclipse.xtend.lib@default:default,org.eclipse.xtend.m2e@default:default,org.eclipse.xtend.standalone@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.xtend2.lib@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.activities@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.xtext.common.types.edit@default:default,org.eclipse.xtext.common.types.shared.jdt38@default:false,org.eclipse.xtext.common.types.shared@default:default,org.eclipse.xtext.common.types.ui@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.xtext.doc@default:default,org.eclipse.xtext.ecore@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.xtext.junit4@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.xtext.purexbase.ui@default:default,org.eclipse.xtext.purexbase@default:default,org.eclipse.xtext.smap@default:default,org.eclipse.xtext.ui.codetemplates.ui@default:default,org.eclipse.xtext.ui.codetemplates@default:default,org.eclipse.xtext.ui.ecore@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.junit@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext.xbase.ui@default:default,org.eclipse.xtext.xbase@default:default,org.eclipse.xtext.xtext.ui.examples@default:default,org.eclipse.xtext.xtext.ui.graph@default:default,org.eclipse.xtext.xtext.ui@default:default,org.eclipse.xtext@default:default,org.hamcrest.core@default:default,org.hamcrest.integration@default:default,org.hamcrest.library@default:default,org.hamcrest.text@default:default,org.hamcrest@default:default,org.junit@default:default,org.mockito@default:default,org.objectweb.asm@default:default,org.objenesis@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
+<stringAttribute key="selected_target_plugins" value="com.google.guava@default:default,com.google.inject@default:default,com.ibm.icu@default:default,com.jcraft.jsch@default:default,com.sun.el@default:default,javax.el@default:default,javax.inject@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.xml@default:default,org.antlr.runtime@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.cli@default:default,org.apache.commons.codec@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.jasper.glassfish@default:default,org.apache.log4j@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare.win32@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.draw2d@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.emf.ant@default:default,org.eclipse.emf.cheatsheets@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen.ui@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.converter@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.doc@default:default,org.eclipse.emf.ecore.change.edit@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.example.installer@default:default,org.eclipse.emf.exporter@default:default,org.eclipse.emf.importer.ecore@default:default,org.eclipse.emf.importer.java@default:default,org.eclipse.emf.importer.rose@default:default,org.eclipse.emf.importer@default:default,org.eclipse.emf.mapping.ecore.editor@default:default,org.eclipse.emf.mapping.ecore2ecore.editor@default:default,org.eclipse.emf.mapping.ecore2ecore@default:default,org.eclipse.emf.mapping.ecore2xml.ui@default:default,org.eclipse.emf.mapping.ecore2xml@default:default,org.eclipse.emf.mapping.ecore@default:default,org.eclipse.emf.mapping.ui@default:default,org.eclipse.emf.mapping@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.emf.mwe2.language.ui@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.emf.mwe2.lib@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.emf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.launcher.win32.win32.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.p2.ui.importexport@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.gef@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help.webapp@default:default,org.eclipse.help@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.ui@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.platform@default:default,org.eclipse.rcp@default:default,org.eclipse.search@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.swtbot.eclipse.core@default:default,org.eclipse.swtbot.eclipse.finder@default:default,org.eclipse.swtbot.eclipse.gef.finder@default:default,org.eclipse.swtbot.eclipse.spy@default:default,org.eclipse.swtbot.eclipse.ui@default:default,org.eclipse.swtbot.forms.finder@default:default,org.eclipse.swtbot.go@default:default,org.eclipse.swtbot.junit4_x@default:default,org.eclipse.swtbot.swt.finder@default:default,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.net@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.win32@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator@3:true,org.eclipse.xpand@default:default,org.eclipse.xtend.core@default:default,org.eclipse.xtend.doc@default:default,org.eclipse.xtend.examples@default:default,org.eclipse.xtend.ide@default:default,org.eclipse.xtend.lib@default:default,org.eclipse.xtend.m2e@default:default,org.eclipse.xtend.standalone@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.xtend.lib@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.activities@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.xtext.common.types.edit@default:default,org.eclipse.xtext.common.types.shared.jdt38@default:false,org.eclipse.xtext.common.types.shared@default:default,org.eclipse.xtext.common.types.ui@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.xtext.doc@default:default,org.eclipse.xtext.ecore@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.xtext.junit4@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.xtext.purexbase.ui@default:default,org.eclipse.xtext.purexbase@default:default,org.eclipse.xtext.smap@default:default,org.eclipse.xtext.ui.codetemplates.ui@default:default,org.eclipse.xtext.ui.codetemplates@default:default,org.eclipse.xtext.ui.ecore@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.junit@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext.xbase.ui@default:default,org.eclipse.xtext.xbase@default:default,org.eclipse.xtext.xtext.ui.examples@default:default,org.eclipse.xtext.xtext.ui.graph@default:default,org.eclipse.xtext.xtext.ui@default:default,org.eclipse.xtext@default:default,org.hamcrest.core@default:default,org.hamcrest.integration@default:default,org.hamcrest.library@default:default,org.hamcrest.text@default:default,org.hamcrest@default:default,org.junit@default:default,org.mockito@default:default,org.objectweb.asm@default:default,org.objenesis@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
 <stringAttribute key="selected_workspace_plugins" value="com.avaloq.tools.ddk.workflow@default:default,com.avaloq.tools.ddk.xtext.builder@default:default,com.avaloq.tools.ddk.xtext.format.generator@default:default,com.avaloq.tools.ddk.xtext.format.ui@default:default,com.avaloq.tools.ddk.xtext.format@default:default,com.avaloq.tools.ddk.xtext.generator@default:default,com.avaloq.tools.ddk.xtext.ui@default:default,com.avaloq.tools.ddk.xtext@default:default"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>

From 01ef110d66bcddb0e0b7c5c568a1be835b97c679 Mon Sep 17 00:00:00 2001
From: Roman Mitin <roman.mitin@avaloq.com>
Date: Fri, 11 May 2018 14:39:16 +0200
Subject: [PATCH 11/56] More specific pointer to Xtext update site

Also remove an unnecessary package export
---
 com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF | 3 +--
 ddk-target/ddk.target                                     | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF
index d37c9759b..4e8a7cd6f 100644
--- a/com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF
@@ -21,8 +21,7 @@ Require-Bundle: org.eclipse.jface,
  com.avaloq.tools.ddk.xtext.ui,
  org.eclipse.xtend.lib,
  org.eclipse.jdt.core
-Export-Package: com.avaloq.tools.ddk.xtext.generator.serializer,
- com.avaloq.tools.ddk.xtext.generator.builder,
+Export-Package: com.avaloq.tools.ddk.xtext.generator.builder,
  com.avaloq.tools.ddk.xtext.generator.ecore,
  com.avaloq.tools.ddk.xtext.generator.expression,
  com.avaloq.tools.ddk.xtext.generator.formatting,
diff --git a/ddk-target/ddk.target b/ddk-target/ddk.target
index 38bfcef0a..fbda05761 100644
--- a/ddk-target/ddk.target
+++ b/ddk-target/ddk.target
@@ -28,7 +28,7 @@
 <unit id="org.eclipse.xtend.sdk.feature.group" version="2.13.0.v20171020-0920"/>
 <unit id="org.eclipse.xpand.sdk.feature.group" version="2.0.0.v201406030414"/>
 <unit id="org.eclipse.xtext.sdk.feature.group" version="2.13.0.v20171020-0920"/>
-<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/"/>
+<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.13.0/"/>
 </location>
 </locations>
 </target>

From 62ab305bf23c68d37c7d3fb55928cd960deece27 Mon Sep 17 00:00:00 2001
From: Roman Mitin <roman.mitin@avaloq.com>
Date: Fri, 11 May 2018 15:04:10 +0200
Subject: [PATCH 12/56] Correct target file

---
 ddk-target/ddk.target | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/ddk-target/ddk.target b/ddk-target/ddk.target
index fbda05761..84c42e2a2 100644
--- a/ddk-target/ddk.target
+++ b/ddk-target/ddk.target
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="DDK Target" sequenceNumber="7">
+<?pde version="3.8"?><target name="DDK Target" sequenceNumber="8">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
@@ -24,11 +24,17 @@
 <repository location="http://download.eclipse.org/releases/neon"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.emf.codegen.ecore.ui.feature.group" version="2.10.0.v20150123-0452"/>
 <unit id="org.eclipse.xtend.sdk.feature.group" version="2.13.0.v20171020-0920"/>
-<unit id="org.eclipse.xpand.sdk.feature.group" version="2.0.0.v201406030414"/>
 <unit id="org.eclipse.xtext.sdk.feature.group" version="2.13.0.v20171020-0920"/>
 <repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.13.0/"/>
 </location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.emf.codegen.ecore.ui.feature.group" version="2.10.0.v20150123-0452"/>
+<repository location="http://download.eclipse.org/modeling/emf/emf/updates/2.10.x/core/S201501230452/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.xpand.sdk.feature.group" version="2.0.0.v201406030414"/>
+<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/xpand/R201406030414/"/>
+</location>
 </locations>
 </target>

From e3a8fc5fbb417255553bf3bfa4a4085f4f84a1e3 Mon Sep 17 00:00:00 2001
From: Roman Mitin <roman.mitin@avaloq.com>
Date: Fri, 11 May 2018 15:46:22 +0200
Subject: [PATCH 13/56] More specific path for Neon in target file

Point to 201705151400
---
 ddk-target/ddk.target | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ddk-target/ddk.target b/ddk-target/ddk.target
index 84c42e2a2..0a62e14b9 100644
--- a/ddk-target/ddk.target
+++ b/ddk-target/ddk.target
@@ -21,7 +21,7 @@
 <unit id="org.eclipse.jdt.source.feature.group" version="3.12.3.v20170301-0400"/>
 <unit id="org.eclipse.platform.feature.group" version="4.6.3.v20170301-0400"/>
 <unit id="org.eclipse.platform.source.feature.group" version="4.6.3.v20170301-0400"/>
-<repository location="http://download.eclipse.org/releases/neon"/>
+<repository location="http://download.eclipse.org/releases/neon/201705151400/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.xtend.sdk.feature.group" version="2.13.0.v20171020-0920"/>

From 33bfe45d901fa72a2f13ddaa8555f0d02633e1f6 Mon Sep 17 00:00:00 2001
From: Roman Mitin <roman.mitin@avaloq.com>
Date: Mon, 28 May 2018 16:14:21 +0200
Subject: [PATCH 14/56] Update to Xtext 2.14

Change target file
Minor adjustments (rename)
Regenerate everything

Tests pass, but with lots of exceptions
---
 .../com/avaloq/tools/ddk/check/Check.xtextbin |   Bin 21959 -> 22004 bytes
 .../check/CheckStandaloneSetupGenerated.java  |     2 +-
 .../parser/antlr/internal/InternalCheck.g     |   326 +-
 .../antlr/internal/InternalCheckLexer.java    |   987 +-
 .../antlr/internal/InternalCheckParser.java   | 10273 +++---
 .../AbstractCheckSemanticSequencer.java       |  1776 +-
 .../AbstractCheckSyntacticSequencer.java      |    22 +-
 .../check/services/CheckGrammarAccess.java    |  1069 +-
 .../META-INF/MANIFEST.MF                      |    15 +-
 .../ddk/check/CheckInjectorProvider.java      |    29 +-
 .../ddk/check/CheckUiInjectorProvider.java    |     4 +-
 .../META-INF/MANIFEST.MF                      |     3 +-
 .../ddk/check/ui/AbstractCheckUiModule.java   |     5 +
 .../AbstractCheckProposalProvider.java        |    21 -
 .../antlr/internal/InternalCheckLexer.java    |   986 +-
 .../antlr/internal/InternalCheckParser.java   | 26573 +++++++--------
 .../checkcfg/CheckCfgInjectorProvider.java    |    29 +-
 .../checkcfg/CheckCfgUiInjectorProvider.java  |     4 +-
 .../tools/ddk/checkcfg/CheckCfg.xtextbin      |   Bin 18084 -> 18129 bytes
 .../CheckCfgStandaloneSetupGenerated.java     |     2 +-
 .../checkcfg/checkcfg/CheckConfiguration.java |     2 +-
 .../checkcfg/ConfigurableSection.java         |     2 +-
 .../checkcfg/checkcfg/ConfiguredCatalog.java  |     2 +-
 .../checkcfg/checkcfg/ConfiguredCheck.java    |     2 +-
 .../checkcfg/ConfiguredLanguageValidator.java |     2 +-
 .../checkcfg/ConfiguredParameter.java         |     2 +-
 .../ddk/checkcfg/checkcfg/SeverityKind.java   |     6 +
 .../checkcfg/impl/CheckConfigurationImpl.java |     2 +-
 .../impl/ConfigurableSectionImpl.java         |     2 +-
 .../checkcfg/impl/ConfiguredCatalogImpl.java  |     2 +-
 .../checkcfg/impl/ConfiguredCheckImpl.java    |     2 +-
 .../impl/ConfiguredLanguageValidatorImpl.java |     2 +-
 .../impl/ConfiguredParameterImpl.java         |     2 +-
 .../checkcfg/util/CheckcfgSwitch.java         |     2 +-
 .../parser/antlr/internal/InternalCheckCfg.g  |   244 +-
 .../antlr/internal/InternalCheckCfgLexer.java |   830 +-
 .../internal/InternalCheckCfgParser.java      |  8218 ++---
 .../AbstractCheckCfgSemanticSequencer.java    |  1341 +-
 .../AbstractCheckCfgSyntacticSequencer.java   |    18 +-
 .../services/CheckCfgGrammarAccess.java       |   510 +-
 .../META-INF/MANIFEST.MF                      |     3 +-
 .../checkcfg/ui/AbstractCheckCfgUiModule.java |     5 +
 .../antlr/internal/InternalCheckCfgLexer.java |   831 +-
 .../internal/InternalCheckCfgParser.java      | 20931 ++++++------
 .../builtintypemodel/BuiltInTypeModel.java    |     2 +-
 .../builtintypemodel/InternalType.java        |     2 +-
 .../impl/BuiltInTypeModelImpl.java            |     2 +-
 .../impl/InternalTypeImpl.java                |     2 +-
 .../util/BuiltInTypeModelSwitch.java          |     2 +-
 .../typemodel/impl/CallableImpl.java          |     2 -
 .../typemodel/impl/NamedElementImpl.java      |     2 -
 .../impl/NamedFormalParameterImpl.java        |     2 -
 .../typemodel/impl/NamedTypeImpl.java         |     2 -
 .../impl/OverrideDeclarationImpl.java         |     2 -
 .../typemodel/util/TypeModelSwitch.java       |     2 +-
 .../tools/ddk/workflow/CommonXbase.mwe2       |     2 +-
 .../tools/ddk/workflow/GenerateExport.mwe2    |     2 +-
 .../META-INF/MANIFEST.MF                      |     3 +-
 .../export/ui/AbstractExportUiModule.java     |     5 +
 .../antlr/internal/InternalExportLexer.java   |   620 +-
 .../antlr/internal/InternalExportParser.java  | 10138 +++---
 .../tools/ddk/xtext/export/Export.ecore       |    42 +-
 .../tools/ddk/xtext/export/Export.genmodel    |     2 +-
 .../ExportStandaloneSetupGenerated.java       |     2 +-
 .../export/export/impl/ExportPackageImpl.java |     2 +-
 .../parser/antlr/internal/InternalExport.g    |   134 +-
 .../antlr/internal/InternalExportLexer.java   |   622 +-
 .../antlr/internal/InternalExportParser.java  |  3238 +-
 .../AbstractExportSemanticSequencer.java      |   879 +-
 .../AbstractExportSyntacticSequencer.java     |     4 +-
 .../export/services/ExportGrammarAccess.java  |   445 +-
 .../META-INF/MANIFEST.MF                      |     3 +-
 .../internal/InternalExpressionLexer.java     |   489 +-
 .../internal/InternalExpressionParser.java    |  6588 ++--
 .../ddk/xtext/expression/Expression.ecore     |    24 +-
 .../ddk/xtext/expression/Expression.genmodel  |     3 +-
 .../ExpressionStandaloneSetupGenerated.java   |     2 +-
 .../impl/ExpressionPackageImpl.java           |    31 +-
 .../antlr/internal/InternalExpression.g       |    94 +-
 .../internal/InternalExpressionLexer.java     |   491 +-
 .../internal/InternalExpressionParser.java    |  2273 +-
 .../AbstractExpressionSemanticSequencer.java  |  1096 +-
 .../AbstractExpressionSyntacticSequencer.java |     4 +-
 .../services/ExpressionGrammarAccess.java     |   637 +-
 .../META-INF/MANIFEST.MF                      |     4 +-
 .../format/ui/AbstractFormatUiModule.java     |     5 +
 .../AbstractFormatProposalProvider.java       |     3 -
 .../antlr/internal/InternalFormat.g           |     4 +-
 .../antlr/internal/InternalFormatLexer.java   |  1261 +-
 .../antlr/internal/InternalFormatParser.java  | 26990 +++++++---------
 .../tools/ddk/xtext/format/Format.xtextbin    |   Bin 22848 -> 22986 bytes
 .../FormatStandaloneSetupGenerated.java       |     2 +-
 .../xtext/format/format/ColumnLocator.java    |     2 +-
 .../ddk/xtext/format/format/Constant.java     |     2 +-
 .../format/format/ContextFreeDirective.java   |     2 +-
 .../format/format/FormatConfiguration.java    |     2 +-
 .../format/format/GrammarElementLookup.java   |     2 +-
 .../format/GrammarElementReference.java       |     2 +-
 .../ddk/xtext/format/format/GrammarRule.java  |     2 +-
 .../ddk/xtext/format/format/GroupBlock.java   |     2 +-
 .../xtext/format/format/IndentLocator.java    |     2 +-
 .../ddk/xtext/format/format/IntValue.java     |     2 +-
 .../ddk/xtext/format/format/KeywordPair.java  |     2 +-
 .../xtext/format/format/LinewrapLocator.java  |     2 +-
 .../ddk/xtext/format/format/Matcher.java      |     2 +-
 .../ddk/xtext/format/format/MatcherList.java  |     2 +-
 .../ddk/xtext/format/format/MatcherType.java  |     6 +
 .../xtext/format/format/OffsetLocator.java    |     2 +-
 .../format/format/RightPaddingLocator.java    |     2 +-
 .../tools/ddk/xtext/format/format/Rule.java   |     2 +-
 .../ddk/xtext/format/format/SpaceLocator.java |     2 +-
 .../format/format/SpecificDirective.java      |     2 +-
 .../ddk/xtext/format/format/StringValue.java  |     2 +-
 .../ddk/xtext/format/format/WildcardRule.java |     2 +-
 .../format/format/impl/ColumnLocatorImpl.java |     2 +-
 .../format/format/impl/ConstantImpl.java      |     2 +-
 .../format/impl/ContextFreeDirectiveImpl.java |     2 +-
 .../format/impl/FormatConfigurationImpl.java  |     2 +-
 .../format/impl/GrammarElementLookupImpl.java |     2 +-
 .../impl/GrammarElementReferenceImpl.java     |     2 +-
 .../format/impl/GrammarRuleDirectiveImpl.java |     2 -
 .../format/format/impl/GrammarRuleImpl.java   |     2 +-
 .../format/format/impl/GroupBlockImpl.java    |     2 +-
 .../format/format/impl/IndentLocatorImpl.java |     2 +-
 .../format/format/impl/IntValueImpl.java      |     2 +-
 .../format/format/impl/KeywordPairImpl.java   |     2 +-
 .../format/impl/LinewrapLocatorImpl.java      |     2 +-
 .../xtext/format/format/impl/LocatorImpl.java |     2 -
 .../xtext/format/format/impl/MatcherImpl.java |     2 +-
 .../format/format/impl/MatcherListImpl.java   |     2 +-
 .../format/impl/NoFormatLocatorImpl.java      |     2 -
 .../format/format/impl/OffsetLocatorImpl.java |     2 +-
 .../format/impl/RightPaddingLocatorImpl.java  |     2 +-
 .../xtext/format/format/impl/RuleImpl.java    |     2 +-
 .../format/format/impl/SpaceLocatorImpl.java  |     2 +-
 .../format/impl/SpecificDirectiveImpl.java    |     2 +-
 .../format/format/impl/StringValueImpl.java   |     2 +-
 .../impl/WildcardRuleDirectiveImpl.java       |     2 -
 .../format/format/impl/WildcardRuleImpl.java  |     2 +-
 .../format/format/util/FormatSwitch.java      |     2 +-
 .../parser/antlr/internal/InternalFormat.g    |   318 +-
 .../antlr/internal/InternalFormatLexer.java   |  1261 +-
 .../antlr/internal/InternalFormatParser.java  | 10557 +++---
 .../AbstractFormatSemanticSequencer.java      |   418 +-
 .../AbstractFormatSyntacticSequencer.java     |    18 +-
 .../format/services/FormatGrammarAccess.java  |   977 +-
 .../tools/ddk/xtext/format/Format.xtext       |     6 +
 .../META-INF/MANIFEST.MF                      |     3 +-
 .../xtext/scope/ui/AbstractScopeUiModule.java |     5 +
 .../antlr/internal/InternalScopeLexer.java    |   660 +-
 .../antlr/internal/InternalScopeParser.java   | 12139 ++++---
 .../avaloq/tools/ddk/xtext/scope/Scope.ecore  |    42 +-
 .../tools/ddk/xtext/scope/Scope.genmodel      |     2 +-
 .../scope/ScopeStandaloneSetupGenerated.java  |     2 +-
 .../parser/antlr/internal/InternalScope.g     |   176 +-
 .../antlr/internal/InternalScopeLexer.java    |   660 +-
 .../antlr/internal/InternalScopeParser.java   |  3996 +--
 .../scope/scope/impl/ScopePackageImpl.java    |    44 +-
 .../AbstractScopeSemanticSequencer.java       |   537 +-
 .../AbstractScopeSyntacticSequencer.java      |     4 +-
 .../scope/services/ScopeGrammarAccess.java    |   559 +-
 .../occurrences/AbstractOccurrencesTest.java  |     4 +-
 .../formatter/FormatterTestLanguage.xtextbin  |   Bin 4820 -> 4820 bytes
 ...rTestLanguageStandaloneSetupGenerated.java |     2 +-
 .../formatterTestLanguage/Assign.java         |     2 +-
 .../formatterTestLanguage/Datatypes.java      |     2 +-
 .../formatter/formatterTestLanguage/Decl.java |     2 +-
 .../formatterTestLanguage/Enum1.java          |     6 +
 .../formatterTestLanguage/Enumeration.java    |     2 +-
 .../formatterTestLanguage/FqnObj.java         |     2 +-
 .../formatterTestLanguage/FqnRef.java         |     2 +-
 .../formatter/formatterTestLanguage/Meth.java |     2 +-
 .../formatterTestLanguage/Param.java          |     2 +-
 .../formatterTestLanguage/Space.java          |     2 +-
 .../SuppressedHidden.java                     |     2 +-
 .../SuppressedHiddenSub.java                  |     2 +-
 .../formatterTestLanguage/TestColumn.java     |     2 +-
 .../TestIndentation.java                      |     2 +-
 .../formatterTestLanguage/TestLinewrap.java   |     2 +-
 .../TestLinewrapMinMax.java                   |     2 +-
 .../formatterTestLanguage/TestOffset.java     |     2 +-
 .../TestRightPadding.java                     |     2 +-
 .../impl/AssignImpl.java                      |     2 +-
 .../impl/DatatypesImpl.java                   |     2 +-
 .../formatterTestLanguage/impl/DeclImpl.java  |     2 +-
 .../impl/EnumerationImpl.java                 |     2 +-
 .../impl/FqnObjImpl.java                      |     2 +-
 .../impl/FqnRefImpl.java                      |     2 +-
 .../formatterTestLanguage/impl/LineImpl.java  |     2 -
 .../formatterTestLanguage/impl/MethImpl.java  |     2 +-
 .../formatterTestLanguage/impl/ParamImpl.java |     2 +-
 .../formatterTestLanguage/impl/RootImpl.java  |     2 -
 .../formatterTestLanguage/impl/SpaceImpl.java |     2 +-
 .../impl/SuppressedHiddenImpl.java            |     2 +-
 .../impl/SuppressedHiddenSubIDImpl.java       |     2 -
 .../impl/SuppressedHiddenSubImpl.java         |     2 +-
 .../impl/SuppressedHiddenSubSubImpl.java      |     2 -
 .../impl/TestColumnImpl.java                  |     2 +-
 .../impl/TestIndentationImpl.java             |     2 +-
 .../impl/TestLinewrapImpl.java                |     2 +-
 .../impl/TestLinewrapMinMaxImpl.java          |     2 +-
 .../impl/TestOffsetImpl.java                  |     2 +-
 .../impl/TestRightPaddingImpl.java            |     2 +-
 .../util/FormatterTestLanguageSwitch.java     |     2 +-
 .../internal/InternalFormatterTestLanguage.g  |    64 +-
 .../InternalFormatterTestLanguageLexer.java   |   376 +-
 .../InternalFormatterTestLanguageParser.java  |  1403 +-
 ...ormatterTestLanguageSemanticSequencer.java |   209 +-
 .../FormatterTestLanguageGrammarAccess.java   |   105 +-
 .../META-INF/MANIFEST.MF                      |     3 +-
 .../xtext/valid/ui/AbstractValidUiModule.java |     5 +
 .../antlr/internal/InternalValidLexer.java    |   315 +-
 .../antlr/internal/InternalValidParser.java   |  5558 ++--
 .../valid/ValidStandaloneSetupGenerated.java  |     2 +-
 .../parser/antlr/internal/InternalValid.g     |    88 +-
 .../antlr/internal/InternalValidLexer.java    |   317 +-
 .../antlr/internal/InternalValidParser.java   |  1743 +-
 .../AbstractValidSemanticSequencer.java       |   116 +-
 .../valid/services/ValidGrammarAccess.java    |   421 +-
 .../tools/ddk/xtext/valid/valid/Category.java |     2 +-
 .../ddk/xtext/valid/valid/CheckKind.java      |     6 +
 .../tools/ddk/xtext/valid/valid/Context.java  |     2 +-
 .../xtext/valid/valid/DuplicateContext.java   |     2 +-
 .../tools/ddk/xtext/valid/valid/Import.java   |     2 +-
 .../ddk/xtext/valid/valid/NativeContext.java  |     2 +-
 .../ddk/xtext/valid/valid/NativeRule.java     |     2 +-
 .../tools/ddk/xtext/valid/valid/QuickFix.java |     2 +-
 .../ddk/xtext/valid/valid/QuickFixKind.java   |     6 +
 .../ddk/xtext/valid/valid/RangeRule.java      |     2 +-
 .../tools/ddk/xtext/valid/valid/Rule.java     |     2 +-
 .../ddk/xtext/valid/valid/SeverityKind.java   |     6 +
 .../tools/ddk/xtext/valid/valid/SizeRule.java |     2 +-
 .../ddk/xtext/valid/valid/UniqueRule.java     |     2 +-
 .../ddk/xtext/valid/valid/ValidModel.java     |     2 +-
 .../xtext/valid/valid/impl/CategoryImpl.java  |     2 +-
 .../xtext/valid/valid/impl/ContextImpl.java   |     2 +-
 .../valid/impl/DuplicateContextImpl.java      |     2 +-
 .../xtext/valid/valid/impl/ImportImpl.java    |     2 +-
 .../valid/valid/impl/NativeContextImpl.java   |     2 +-
 .../valid/valid/impl/NativeRuleImpl.java      |     2 +-
 .../valid/valid/impl/PredefinedRuleImpl.java  |     2 -
 .../xtext/valid/valid/impl/QuickFixImpl.java  |     2 +-
 .../xtext/valid/valid/impl/RangeRuleImpl.java |     2 +-
 .../ddk/xtext/valid/valid/impl/RuleImpl.java  |     2 +-
 .../valid/valid/impl/SimpleContextImpl.java   |     2 -
 .../xtext/valid/valid/impl/SizeRuleImpl.java  |     2 +-
 .../valid/valid/impl/UniqueRuleImpl.java      |     2 +-
 .../valid/valid/impl/ValidModelImpl.java      |     2 +-
 .../xtext/valid/valid/util/ValidSwitch.java   |     2 +-
 .../modelinference/InferenceContainer.java    |     2 +-
 .../impl/InferenceContainerImpl.java          |     2 +-
 .../util/ModelInferenceSwitch.java            |     2 +-
 ddk-configuration/launches/Maven Clean.launch |    20 +
 ddk-target/ddk.target                         |     6 +-
 254 files changed, 77201 insertions(+), 97457 deletions(-)
 create mode 100644 ddk-configuration/launches/Maven Clean.launch

diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/Check.xtextbin b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/Check.xtextbin
index 6e2c56d8d0fced5e421176c08d6fdf9fabc97f05..1678fb03394df78a2159115138320d4605e785eb 100644
GIT binary patch
literal 22004
zcma)EcYs_~_0F9)Z)R&ckkCVDX}h5sAmz3D!eR=L080&%-N|Om?94JVOA>l7qVfX-
zM2sK;qEZw=QBaX0U;!)$Dk{Z-C<-cA5d3}LdH2n{o!y}O$IiU>PWjHc=iYbDEpusp
za9vyH_HE;ArFL6is|_98-Mw++#;$x{u`pE4ca<vx-TTg;zo5IfmfuwSA4pQ&s%2><
zH#nH9r0h~|Fh8TOJlK^xHCHU3(p4*$i`B0F{taDy>+^jZx_th(I)|(Ie#28urIbn?
z1hsVto2a>K)7l*1<VvM-Emtd)OVzGk-Z`dFTkke*S}6<cJ8z9$Sgcg~J!xv2hw|yE
z{rPo;Qoed<p}#+0T3z0dFIAP@xju23wpFTgb-prKDCLSr4j1#0z1A_SESoYi%4%7S
z&m;5eQf-6zT5ho1pD$)rdMfVZEBR7izJGaqJJp&$JlD4&H;`{h?YWh9KvS_T_U+bv
z<x2j4CF@qL+K3*PN_AVAT(OX=X7ZGwtoFWQu39auE95J!sZ^T|a<v>mk4v?6ck5NP
zN})8M(w(_tEng|Y@u%jiZSaGexK4HS<tqJjLZP-fHOFqv7xRPpQmtyYt4z!L^P4x8
zEB$r`5ip!j?W#Id#!j`WPJVQ%@%(60N=;CyRQvK}Yy6eVm+KX)t%=G?Wvy0~o}{vw
zrIqsVP(!da8C+KPY&Au-v>#Qf6^hb8b}K+iYfR<y+1(JUwxQfr4Y}LKa<@}iJ3UPV
zb*t&BwR1&&AXm%xi>Q${&2C8EUfH&_Lj-z9esn^|PAWT+VTo<+tTN5_K)XxC37*Wh
z^^geA*>aUAs?)owbZSOQjk9KLB?_cFbW3+Yr$kes$L$8DnP5uKe@`a##KCf@`!Mvz
zqnERltKiLMGZh4Hb=vN#t^M#^rJAoaf_c(mrw*DJjv_V+?LFYc-K;%RR#y9rpK<9a
z-QCTkO<}VaJ-0WUZp~8dtyJOXibdO|^4Y2_wKMpk9wP=?v2Yq1BI-Lv?;KG%H)V}W
z?<%^sPOH-MsHRJGw7ZDyffA$9ZdsSl)rKqisBgBGhw^ZFxsqCxt%psw>YU(L%GGMU
zgW5tpUv%$7-RKp@PL-+i?W@}D{b0iQBZkol(3kpGzzl1DupNMwX|dwohHyTR(B21z
z1z>178ua}=fpri_CE5?hlS2@)7H%$#Z!Th}E=EA5me{G2)Dn2ob{sW+g1;UP>w~|J
z%#{Z6wq4Axt2r)XET=M=N?~Aq&GC47no^Fh#@kN7D^NI^Uyj4=kY9FJ&QgA^!Hq+e
zol4ENGfoc~4&!Y|bKcJ{l(UStm-C8pR`3hutmGHSIh>zslyd~hj^xFBkgejEgAn)f
z=d4DLfey<#N@c9}p-R5L(8taP)m_RtTHK?Q-H{mYQ_eAJLVIJZk4D?pm8a$_l|p|$
zlG{tUOMv}Y$c3<l$~jJT*loGWz_5%-8Eej>taCgRI47V1rlT=k^K4|iIVVb^@2S$x
zNsL@)4R~PQ$z;tL)?*6Aehz+3tZRkU>0`j`AOSNbAw>7HWu3g5n05R3R*T}zS!V>m
ztpjx266LICt6*Gl3Jf6U1F)*253j*mC0D>$8`-si;EIey*mcwpLfk74m-;PdFcMfI
zqKSg2@f0x1B6A3;TJWyTm-?&9IRzTV*OGlOgTCTa#0`<RtEyw<7&m(iOf_N}2Bs+^
zFuA4vJb;~QfC0ot0kMhp?x~#3W2--{p<X$s3&$B_y5dZ#J<GUaS$SjK6=z2p&uO@#
z@f0Y|6`AJ&MW#9o2P)_Mv5{QRK;m2oM<AR>H^@aqaj`MJp~o11iGc#Omx|gC8sje;
zTjhruDx-dc|IUZwuJjQy&sEOlU~Ufh|09kQNPY#W7Axn<h%N10rLs*u(D|r<xmr!M
zoogb9*V0?lByf64rF>;Xz~e1%#@0-E7=uwZF}Nz{V^r8h)z<-7H2N}-KCU`#=Xw#p
z4+e-&0O0~sZHc<D?R>J{g>M+cq8p7x&ZlDgZ!-3OdJO8D>-OIg*$+)rcB?RRq;NhX
zM&CxGKN}hSIU2o-7`-$PqYHg*rIOp+Wczr$RfozYykhtun_8rt&r{p&j6GrSFh+04
z*Q%Ct2L#J7@7yWc?jo4umGcFDo)}?L&KJpkH`pijhQlQp7mQBJ`4S}TYB~1+nuT|6
zGXWy$UPw+mUyi((cD_Q<dn@O@=!WHd74B&t;)|9-&A{<BsN5a?xIcF017t%meSIwI
zZ$#9f|0c<1;md>gVl6^keTxj0Jl?b=%9k<Yp_ra7zumcewsV4$bBfNebCz?l^Dr$n
zFV*@>-Etm@8sSkkLL<AV6Ts4Miw_@zLMb#v)#FfwFmj%V&HWA@kM5V>1sMiP<$P~z
zJ@@;h7?vh+o@7&we78GK)tmBZf$;-T?EElx;E(7Tyvu$Z0fMS$AZ7azQdqpiZwAZx
zNnPTz(uB`}b3f($)Cl?+KW78b0_W$DG@-W#VOOcG%1eM)&ht@Z{DP4&36U}4F}(Fl
zS~|y`QV_Oe&KbQseno>{faEELH9=xIFG9NW5_3~4v#ExLRhIKIRc%vOm7s^ZUyBXD
z0qAU`Q8~Yr_vr7?Af3^zD94j_dxfLH@2TWf=CW3XI;v3e2e$uY>4cGjhzTRcAH_d#
z>}!xXIhM%Gt2&hHiz4q&H0l|K-JebRbci&ma$et>rEf%jd>J<UMQr$M(uTjmhP3l0
z9@x%X(3`EY9PP_kOE9GUos`iHX#58qzQk^mH)<6x_lW49AZpwL-M_|k$lG+tzky{p
z_yE?vLrdNT=p9FdP)})<0O*lcwVeNeLq-^P93yd#ZMh1Z3zVCJUKxks02d=3o}{6<
zb)(5)1f6S>3Q^`}@T`3>Ke#qup-b6FZdN3bzhx}UE~+})ZL4E;+d;n{$vZ$kb_=<k
zw2Lj|q7;+_mo4PHdx*=5FuQ8?kv%JxT5i1@bSDY)$!r>T3eoPS+^I~CkWRYW;I`#%
z%iAX?cRMwyHSS+fFio}E?sQ?_-cU#-w;L2H7uB4o$CZnM4$@J=*{QvhyGty6SCKx$
z@b0E2fpjK??k+<2Fc0>O_$YKQBXlpSn6QoQ?hT{b+!e>JS-JX9eWc~is<+o{ic^`i
zI|m)Wor`MD{+~)f&VrzfbLS=d%>h}*bGr~N9ld%J(rc7K<&x!gLz_Fta_6H{+2hf3
z8xK|5-3LwK?kh}<y2*0)i<v;OzZiM|{9wBW;#KLs&pccZOKfn${DaW$_1u6FbTA|2
z5c15k+=cAg)1#yUlPon<PPw(kypE<1RK{IIK#Kurd>GYktQb)kxl1U)fx#n6E7t|O
zZCwvsh<6{YP|s#v);)38bTu!`sN}N#N%TjTbx;e65lmPODECla4Mg)<%I(3Gy%D3f
za#<I(vSt}5S2in`)lmyZo+@T=l)DU9R=K2HmPz*7LaAT5ER^hi$W<;&rSYrss9Z2(
zBBh&hSvF-*%9Jb0Jp$ibHs&fNPQJLTq3l9wU0J!TqOvGxId$W%=KUgOWR#04%FdQc
zt8%<J8W*kQQjj0aL9hI|$Iz3#@Z^M*L#rUQn2*}Ya*u^858ynDdmQ+Xy`b5SN3%uq
zHPY=*h~fedPLvLC60g^=S$bDi8WCi<C!1iH4{13eT}#qF>g`3&o22be(B_499cc$Z
zJGEDz!a};XImxg-!5}q|`vEd+0K>MuN9Kz%f08RES&9jkLD5knOBpQFdso)h=PN7C
zEI^WLD8Y4#aIxlbtAfn!?=Nr`EXhzyFboUBsbts)hV6To4;O2Np(4xMCbmrpw#~xE
z;>JB4Y!iErD&;DhBXrVp&qxrTDV^{vu%z9y*$K}v56@*M#JjSI8x40}b4NU%9q|J4
zu_L0dT}a&*L3hi_AyIC*7vpgh8kaz0+P#zkGDEpirOZ?AWxSqaBJ4xdAd@Pkeu<h7
zN5(+;NBHe>h@RZ*=c=gklg|6Ugke{R7p^4vRYHDvxmsIS*p%?YM-${%3;8u9zZT?E
zdY8-VDlt}A?#B}J*9rZ{Nq@c2A6_Y7ntDW(eS-8`WCTW{!?9IixI{dE5-ynR-azIX
z!91zgm*RW44|7NymMr&E2~{^iRo4A98|P+o`xZ71Q}!lCIOtY5GF{4VRPJZsMU$<H
zWbx!}Y%A6zY%3{Bkl!I;P6$E+vgnYP?d?(OYrA*E1(bUy#7Zq6&vis;zk3&WSQffp
zFlnp%MYic&<=(v&jxQMw<=#We#o)a+(wBC>tU5+klGE~=82N=-0x5kJr5dI(QSN<a
zYQtq|(p0&+tW4bd;qmdktJWjm^^4^yX7McdfrPuiE-m{FRI(7|eiK(|_dz=UTZZT%
zI=`LHkJthG;Rv?nJ_4=N`(+L`-yfDMgSle8$}oO<lpwy%n1S1yNG$g;(=?CseTIB^
zG!5bh1qm_}R3l6>#!LOhiO#r2a#@j}0&`K2G|Cy5RS2tM{JBrYZS<6Bqo@Bna8@M%
zPWB&ydP3YFt2UQvxlK_!NTqUy(EJ!Q?VvFUgGApm6v6r(f9_Ajif2LA+)k`kNap@D
zhA9OLLh0vYP(R-g>i&Y}poVm%LP5eja<a~4VdAndX^mUYa#@Z@A_LF91WdO3vT1zQ
z9hUnWHvVtp#)s_RQOWT%;T36j36$Rp?W=Jh`~g7!OCYf3pg-N$Vk`e-8spFZo%wac
z4E8rbJ!WJ4h2o;d_$z3d8{=;j@g{t+O(J#cDb+j0TM57XU99^DJ@HR-`(N=G<Q2<(
z8ydqf5WO86^lzx`XvBc&0W3dUDL)d5S5}VBRT5>N<+A)R?c$B&YszEw;iUvIh$X>G
za(GsPBh8ldY#{cqct$~9mWa1Q#~p)NDX&Fzv;uP5MkG^t=8qE9UK<>lJ~dYXQG4_i
z<-XS;^qo<xc;o3IZvwdM(^B3<;6*?5Ch;!UFWCva$+#>1(3>*i{#0|{+r|WuC$+~S
z<!uMLXa-&cOao!ui@fQL3lEh@z3M@DdQy?ZQ$fnx5v1NuaNnffrZ%&@omIoxyNK&{
zrR!#x+y8>J-55@%D{rQ0U2k{58r8bq9t89*=ux`FXgt&|cIr%adv9-|m<1G*dsiX-
z?OWdn9m|_-^x-Y(%>j%SZ!TfXi*9>eY{98$!Ddd#?S_hMRU|5JzO>CgkdXHFH7&HC
zT<uRJdn@k%fFB=^)G|hkZx1ATbV~1iq&t{^7l6_T7LtQVg3-x4m?Ri%yh9+_@)k<7
zaWL=}$&JNht5_1NaOx`DCKW6@q89d8deG}ZG`W=NLmCnFBTs|M3*pH&=0aHWt<)@U
zsfvRAP`avvZz=N#9_;}v+dGUNeSb^__{+@X0;frq4r2*I%v=uX4Bi!SG_umLsa|=9
z1Fw7)$|GX5-jU+=Rbo9$3OLX^inPd&OG3-#7_rPd2KPJG;SIieJyv7~)<<2fmt1oh
zDERY^jdZ6y))OsQM$aJwR^IVO^a&6V-xcX6)}^0Bk|^NT;HGyn+%&Bhuc|(1D{)CM
z8FsnI8%)l;wc?~c6Ew1@;$cz6_PCJ3VPt@w-JU@>rZm7_59OWJ#8c%Jh-Yuw#MPFJ
zyt4)J1_RkEl46$f2JyUUsP?4Ph~ArCndS_^oX*~4cIusyu%QAQGG3LaO+n!e6ZHh3
zPA~z@sgZ|mZzI(&RNf}2A0xf<HbX7bJMT1dV1C3qog8zO$2F6&IL<U2$~%jcNbkI}
zL7J@Ly>pO`dgl^(R62O)(Yo^)(>?twE33F_VtK4Bq<HWylmO#O2x@unV#qZsD^a{$
z635G>NFSBGEnYp6GuD&-ddBEU;eiJ6E;AXU$EstSb&bh^k@>ABHOT#7_=tozS4Q50
znu{bdNT3dh+;ydK*H!P$_)){iP`R2c9AK`Adgy!TyOwM(L|*t9zI)ffhpoNK@E)t=
zikA0r)fnHehZ9>oE|Pd#Ks5zbM6no6{nqI}8PR(;Fl;z4JBkKf<wj|ZPf^fK5Y*AT
zDqpKh__UF5GbM0-sPPc2w@8HE$_V{TOsJH18!euxywCCzqu%GD2DQA;!)x`;ATr79
z-A<D^4&M>G_)g>EyG9d#!4QL7%93bkxSP<w1n8acRJDQq9s}v#xYHz_0z4K((7nDw
z@b|@(5d2jG{%ia^UU{+rf@N0kfzf!r9)m}r5ygirf1o=(IGXrd4e$?9cKk~B9_E7=
zl=lejcocR_?DeoMDxWLWo8j9LKpEN|lgNFXxSue%ze5XI=8xoqHQ$xS{T}pXFiLaO
z|2~jq3)R(?VUrg<iHCL#mlAi%dx|ig28;>4D~37STSxJO1d1ODiXRchj}3}vh=L0Z
zBiI1qCs5g#J@THVg6E(h8xdOGPaz>18h$2te@=?$F)^AxRQFomFY1qf39V`GS3>jx
za9i^?Dep!3(hEf|aTJ(?x8uv$YT*4E_qo-;<C+7v8hF3uZAtudxcv%mufy%%^Y*K}
za&a4T>vk%{?LYDh_CI)%+A{<swMSt8Spd8)E_g$}OP0P?d0ZMuA;tB$EMR$W^0J`3
zxA@t^(ctfL{~x?ADvwkDsb!JlmG>_Z__k2|n=W{VF6hDDC+}TF4|)GdrN*VQ*oW0q
zs;RV(8GYOG72x|anGa)qiy~pHpQbY~#QQd%XLy^>v+?s5et~)T^IM_KZ-cg$K>Iz*
z-DQ^FE*dcn=y%ZRerE*8M~cjZFzrtuPJbe$<dr{(pBkbjn~~U;srWg{pUNlm@MN1v
zg7UYGNx0+6@~4TQ=_FgLe5AkPL4OC_wtd-BRZ#v;yxpUGnS$?EzU-R{h<#VkW&Ig^
zUR1v1x6712lh>fzou7g7Wh#E1@{!L<>qd6(Wkx1{Z{F@w{w%>V+t@lMatmoQWA6VG
zDaxNqx_L4Jtr#vA;|}9@!H1^!@v*N8w$4X~@%M>t`}@WNQ-TQw?FTG&334di-=DG%
zknR|5zN<?=Fd_YYB7Fg+bLSA0`Ul6|aReJA9x|dk`U{}|ODm#m5tVU%y|b6|5Oq~D
zz0PF<go6WBS>L59&#3ZaLlR6-Bvb6nN6T<Lr`VA@`60B|iz|OAQV0J~ikWBagXru5
z0M1$Yheet4#2gpcg95hdaKR$Vnf>>J3d`xr=d?QCt@7tH+4WZd{rKLVb&1T-UzzaK
z;eg-bA3^v>8u+USADduCa6vkgU#kG@oJ}Y8qk$banDY5DfsPlKFUjsK<sU1CnH1SS
z4p{hJ^N){1>;##7v-2E<{S!&duOdt4&!fyx`OI{EX1Y^)F|o9)TpmiAl1OrWNpgLY
z<oZl<Gd`1C-z2%dB)NR=j}io6>tR%S9aa~7lh*o7YDZU7z9hG(rhG|mSxxy&Z^whT
zflTa(GhDwMwTnLlx(WGQvOE;RQ;c^gi*xBd=hCP3dbw($ZxmL`H|ej0ALrBC{Znb?
zM$>+q*nZ6A$L5EQ&2?K(GfjDV+$>CdCl*SDTEi9-WlVip1N)d*k4Dn7$vjv2=WLbd
zT*Cvd^GJM%^08Zp17=e-;B&W-1jvPk?xGmc#gIOEcnB*)iA4p2>5`c1(ioGZz`(>E
zLR;hdkl_NV4^tbW^&=o3t7R^)lPaI-uYUzvW>W7l>kC+itIq>k{*{R?g$+X(5kAT$
zx!N?zHEa^jZ8tFj!L>k;*+_ZHm#skPSl0nfTYb}?gow<_vjbgk5Pt$R_S$m)W_i3N
zf%B8Zd4u$rpxmU;@^4Ha#nvEn{+o!@WVXI!w(KLLSfTqC=(hUH%D;7l^3NFM{%r|c
zB-@28pBrt<=VSWYBU>2ucM$ZQ;#}6w8<WnxD*+i3@p##Ok&y2;&izvC+$Kgyy@!Bm
zl&AcA0i-$VzHE>X!B>djJ|LKk)iQ3+NkaH)0>ak>!u^C`=GgtO69VUOnmHl&8^Dl_
zHvB06n-cx$DeDTADz>K74o~dtYzFsW0vxkt{~>_ep?7s<v!BBhQ^+0V#pL3Q|8N53
zBS2~Uj}oOxm;J|xawnkNstCY+9B|V$EZO=`jN!2F7)-uo(*F0L#PX3tGtcbA5?<eW
z?03d-1=ByDB<!aEyAxA3^@o=Kv}w8@5D^Rb#8bRenN4SW%)6uB#pDnemH%VL3gYP*
zpc-RT{s}cb3r*XFNEJq}Fj)R`)QO7xaVWqXJaGSvqGZ-0xzgY>-Nq!5|2!VoXE^;|
z;I3I|@PA1x7&U%1hKF7N9S1W0`7g$U*h^wd3yw^%&6NK#I47H{Mx04k{&ih|{~Lk%
zTWD)=a(mELIA5uAQupt1<-ZD#Oz*`k8nzFt&sUq~i2Oe!0_KlUmiAvWZvImw%l~s^
zDh0kyfp0+Iq+Xd(Yv8v0zfjPYC?oo-2>Kf%?@iqH-@<C4|99-y$jnXbzQ-PWo_N9L
zz-~G9(v4Fu-E!)sTTZ=T%ZBCu1M!jJxY?u-Xjm&`1~{{)eC`m6zKaLnZur4x;o!d`
zpnIy-;Sqy2tB4r%e*n5A7zfbEq6yjxu*p19-o&U>z^Wospga{|lMr5L5~)0`Lj-}1
zJTAx>Ih>-;v~)*isZ7uUNKER2)+jpCL7PN}g$)rwJ2UQpHHH;*%56*?1mj`gcr3+k
z$XCo%m#CRQHQf2*I#w_VYEl@vc_;;Iqr;dYF|^QGpPvt=i0G*h*cl02x%LB?ClPrp
zNf^7qwkB?a?dlMwjSXQsA#5K*fTkTN1M_113wDexM7;tJVFDr88FD%z%{|!Syh#-A
z5-Z-7;l`<eU`7l9B@9^Wdq;wq5D;Gp^X`UO1$#t1nE+)Cc%qFZ!CsWPw+i+K<7Bf1
z1w8^w7nnzi2C4u@E+WfkQv}MyU`~X1t_tS92j9H9?k;LU?j4}AVS<wlP+k&*Y-tJh
ziPD}n2^t><odo*6V8@^mu*M<8{h=x%;W;Cj5(*B8p&b}QdtV(Ir}3NV<EeZV9Bd#-
zTd3d=QvnB<)Q5qX&u5bai*aQKOBneM+Yxom0+ngc$;l9|7jesOz^y}8;89|i3Vi5o
zEYCG|_yw$Stb>^p2O2cVdC?$bsK``)G%p$)O3N530qY!Wzri;YI*G}VfTaz#T;aho
zz{~{84QNc@1I|i<K0E>)9D(?kS-nxa98_jfv{8>UrK_=eny-mXoY_wYtBg&np}CcH
z=BnJfyiD8&EOe|T><}z<#x(ety1}3_rz`B>Sjt?eg5$t8#x!zpJj~+6b8tf3rYDjE
z!FJMCI9LXeLj@<35?%{(ARXc0wRCVF-C-Qu4<_$?GGPaiOj88w{@WySFhKd3L=NH;
z6+r=trZzk{at=9=T}GHg4mL=e6yKA0knKr_mSV%DHiF@-jkc~NQ6U8t0%T9)@e1^`
zt#j3=Et)_EIZCBypiTu?Awc+SWcZj}M!{x=4^z12JvG?9Z?^47(45xn_0#Ef*?wfa
z&O#|T3$L8El|x3D6`YM`kvYBK9O+5t!U${592KxGvgXZ0BgKEg`LS;<FwuUYz`clY
zFE-JBNemZDVIy`7sZ6%k2=PlPJy(V3;DZ2OpJ@m#14tw}<}dhAtn$M~r7Q>pms6$L
zffQUpm3$d{$YK(kuT-Xk=c;5qqSP-=y0Y0xSJ6oyO@!vvbka3&61G#x7BDNgw(g>j
z!9{j(9ou=f3O-I7X5)*LKHVz#1Rv~C$G!#1I^`^vfgnRGt03$ZlfU4G*t{E!d8~Y_
zfR#^RDxctrG3>ax*^XOi$E^uFSo;LG!H&$zA?$s#0`5bK8v1k6(4Qw*w6oMY^=1z4
z7!&lJ1ijIKzAFZenny<JFAC_p37W?oFj9{R`krRc_Y(A%6QEh@1T1yneA(t_1uSqP
z*k1$ew%~p`ecoafJb*9ht}YB_vWX~QIfLOR;MBg=#jgCI`4)VOUvS1Dcu0UgY$zWQ
zKRjxTkV6T<W9AvF4Gv~1c%uI8JHq{4UPJ5mz?}}hZ@8b7XHS`DPe-5N{(-skLwphf
zZlQdzt%X3t%E4N~car=CtRP0m3kwLB9R+{Ev+=9)Injr5K^ov^a`kgI!1Ja7c$~n-
z!Jpn995u_~$nwg>R2yES`T8V*bPQGw?FB=Mc|ho55z*+EEFah}1C$PkQ0(0i%`eN<
zuc`SrM)O$l`rGEF{~eqD6>^xtiB&<sssMwNkApd=46J}<K-BnugtzU0MS!&!Z~Z@s
zTB!lh6tCkpasd^*!7uQvO!F_K$M_d;L(XW&{*8_;M<gnEGY;yvjAgP5C*Ure;Gged
z8B_cbFFWr45B{C7>>XOh9XRbPhvNOQR=^E6Vw&c58yi#d43I@ir}$+CzA%?hFXF8<
zzs<lm^QY~x4AL1Iv>~F=S!0iGiR{rx>TOH6!5+;ugROK@-O*%^?u0#he8V0+0c!L_
zGqT`}qMlSYWiqkvxn~TMTW&`AT~8&<0RvOE-yp5k$m|(VTGkr$G{T(z9x%6WhPeY_
z?wEkN6JhQQm^Q|eiluj{qhu~`opDBta>ke_cO%L^gK{RFiIpY2yFrPB9#?x3<zDZB
zl9_!nIP@%{lzlf**y}k&ITt9$o7aum-mSR{CyI|Q#7B$nCg?c`24wFT0P$rXewmFg
z`|?XSzA#(2_Q03@0WYl&z$Hd1eW3Y7dM@2WFObIv@p7@!$i`_LzaD~H>|gPpUO1+2
z7ST6Me&x^I*X`AF-8Fh=w@*)W2ZDFq4Z*8!Ik?ZQ2DiBzgKON=-HY7I-K&DL+-o(L
zEvEF2-odLAix=8~%@egtJvS=N9Xi-crG0+RQaa%0$x6$foFSz{USFs5QhZ`zK{J2H
z)VyZ)jwx$>7(cI2nn^n*AoVhS-l?=KMBJzJ3SK{?^h$od3ZuO1ye-~M-k01L+&A6(
z{a5`J-YhTlPxh<+75)w0PVT#2%Kf(gtT&_&XWN;2mT5drIp`zmZO2SLqgO%h0;Rc5
zQ9szAnZw5i8#K56#|IlUQ}@Kd2EaMrz0rHrpXWX8AK)+c@AU8UAM#H2pW4rRPV;QQ
z#ONqde7*?5erz4VaSUCYCelpp0Rqb#rV#R;_uj!`V#d}dVj{$y8*iJ|C*iVwT1>CO
zRsC3(J{ea!hdGn%)_$=-es83^mpib#adx2ovmcl@$!7Fg!0kxfwlwPkeX^zd@xsb-
z>q3J^r8VjU436vA(FS5dr8E~sQjXHB046lfnsZ%?NtXTq``HFEtg&<vlGDhbG5OYz
zO;VN7%=<a#p(XFfdZ|X<&w*%frHA;kWv@R)dV2-BCYztg!14cK>;c1Msno){3Ng9{
z+jdOAH|JsMw3Z$=CY(xJcOGGDGcj!6C~7yEA!oB(NtSOwh^5T(HM4wLdL}K!v?VO9
z@4|tRXGzn;NLd(R_tsn*X{_~Yu7~LJfPdOn@LT$P>Nrtm()0xgYfCfxPiw4)$iRKE
zTwTJJx-=s7?u8;*_n4{lWo)tIsajHcy7j}rFmjuT{s?jK#6c3rh_fo1S$~Y<3c+zD
znbs<O6+X=jr^ZQWnJ&>+Q}0}*v8$(9*|m`}Vv+@p6Y=G``aRsn^~Ym5lH)@Tmp8T+
z1zX5m6TVN5^zRLP!s7=sx8mQG6(l`_Ic|Ni^rsRg-Xtb|TAX{carG^7#r-_`GYMC7
zl>?J<T2?s3)$xuVJ$grv=8hh?TIoAt6U~kuJ$grv=8hf`gZzusLRZ}l6qe?>0zA?8
zPzqc1UczEhk48cSWa=%PmDkr-NXPN$KGQHfJ5Z;IdJ~ThMB1nks+jb%vc}h%zEPit
zhncMZmg~4%oR^$e^#dH0zK&5z@pp3MhgMW}n*IhH-YJu|n8xR^FiU?Ez%YlZA4E^d
zpr<6Cs<i$VZ0gVt(S(O%N+^8<`de@|l|S>N^rJxBVXopMmipVkjDbWyhKDWD5w)sx
z(8p=a6F|~@@K=8a8l0Cb=NC}?U2*33sQCN!+e$ylnS|L}J^QP<3CJ-M2^z-=*aR7w
zzL$w2{R04xt^tiTNd17E{t<xIR}u7&AqW$G`kAO1)A}bMmSt!CEZO3dbox2kXRgG)
zpK<{D88GVyEd6u1RpF;rmYRci8U1|Z7l@YQ0;ene%czF2wX9NL6@@493T9<Sv(C^j
z!d<OsGdZJY>6c7X@Z53+he6^eDy@GFzh(7r0I_kVPovt9SS-lqTKzj?+be*cDdyJZ
zivpY#hl>pr`c-ga|C`1!0y;Y@ll^93|0ChN1~?gs6ifdp!V=);p!A=iyiLCzX&YZn
zo(mKWZ;<&fU><p9(9(Z32K|i&VMoKrBZX;=VgxCl>_);%?(e`iQi9U|AZEOy{t25p
z@Y6}L1kw91>U~>HZq=pX!NzX_b;d;R$GOJn_kc7D750aBQt6B)x%7%8VbiYx>31<8
z+4?_f%623-TTg<<FCk%<dgFdLE@gL$Tthf6gOz}!_-;8mnQ19Tn<qooLFPE63R7x|
z9a<@STm~lzMsS%!mYI;XQT@oJ3T<*^$blFB2o4^^%!FBxM`tos*h1P?(r(*KD<?HG
zA+w|S*d|9G6}ICJXBR@&Nmwq}6zibl!_LU@DjW~8Xuwh-jwv*C%Wxtd$K5i-fdxLd
zH=tES3fDx!DQa@6V>M=v2J#hYuW)MARN*$M^tcQXrNl#(4zXFwPKVpkq-it>^I-{s
z?sb@r%Y@URH#&K$!tF`A14+>$Nm3kA#Yw76xFd+;v#BcFiR3$z9Fq!3a!e#})6c2-
zOvue%O$S&*{BD>%(QGCk;j0<3uXc;<x1!z}&cuC;L?I76G<s_&CmqmR!#&Li748)$
zY9W4{O8R>^3p|ss-(~bku#kJj!a3-R6R~k6`P>TU8pqCKZ^ZV@CIUFO3;i(@c0+o7
zLL{6IfjDm;VgaQwj)rF8B$S1dMJnXNN#it0$TgGjK%m&2dwr5Hg1qdvmt-;C&lSoc
z?JbgXg$tMngj_@k4~Bqg(Q(9Fsn&GjG?Y`?hH0TN@q|P=T#T1XC`A??o(tp-uqCV0
z(8W+5a<iE8s+=tiS#Y@*G4639V#F!YkhK?p;1R2@a48_o?p=i!Uoro`SSEYP49Fe{
zT^4EHqbg*PhJCG}6ln)Q0slglY9aTGZBw^9u}#<tW$V}$CLHOITgNgXw~mFfbxdxn
zP}Wmss*q(EGSTp;IBK|tGBN`RxoeEpg|c#j`H4_gPUfocxY5L{ti%;6WOY^FF|0yt
zACs<Mf9Zs>g$!XVMy(+N3YVo52<OVlR^oRpmB^Xhu#ZZR4Tb%&1$o?wmmXD!r4+k!
z06ns_JUZ7dqsjmT@O7s`te-$<L4x7~Q71ZGg&T+!KbY57F7bC8qxWA}q}oCFy#+@>
zdEW|4rn{8cUGT0q58(JA5qS#0Nahf-Vwz~=#mB$|3(KXD<<dmM96z-}mPmLZg)EWS
z8Jh^8MarU(M<*Jckq0I)I~k%plCd;C{}rB&2N+Gn-DiNM9dOJ~ZwZn!@f=eN5y4q>
z?3oaAb|j|B7v~W5U_`4zE|f%vUR20a+7l)A`CDbt4+2Um8=g;|3t;Jl9(IlTV=KJS
z7<v&6#dhqG&taz&RN*D`CdN+{UP_DWhJ7$HEaZN&7UN^F=tBvVAxo@eJ`+lT^%_jP
zoP5#RnQ3ZnBMZ5WEE_FUS|K-&u`RA5#MbWa=suwFccwDo)ltMGf9owW`Wi?=L8iiM
z37I=f1sRV@u#vcntYHW@ka4`fJ`Uzj;0D%QLoS~*O4Lx+O}Gy_yn&uS#I)IsaWm*A
zoEO4R0e*W>?vvk)!_Sn3HyIN?O%po1yBp77#?9ym+3*&k{e}u}<>zZE<jM&$(C{{V
zqPfG*^78@}evY445Wwddxoj^UkuGj#4FFZQ8&!9h$ZaBkzB{Gk-9`D(BQ@2Fkf&eN
ouj#*pSA-XYbHb(J!Qp}7if}Nj`EU5|xYxUj_1nk>QdV01Kk_b~ng9R*

literal 21959
zcma)EcYs_~_0F9)Z)STMgwP?Ogp^&X)R5QigOwCa0t_`wc4w0zlbK~^Hih0nR0IS>
zL=XW{DT<&ds7S{GSP)e7N3kG^f(jM{{e9ng_szVW-9-0~oq6w_@||<fz3-e`=7WW`
zLml1QbWE_7nz6cGA3mtBZ~gl9y@i2Naky6KtyEX_?Y-xo2lVCYg$?!pfh5(Z+77Gc
z*RIW1Q+7GOwy^U+Wo>VMUA|N~wYOfWlxn?$gKK&RRu=}=^!og7b&u2vgNCP;N-32(
z5NaC`Hc)f#hLw51$(PHOdcIz)lxw{?-Z`dNU+p$;S}6<cJ8X(wSgcffvo!UM!-ez~
zgN31DxllX2I5=1+FR!dAlxxcFUY)p1+bY$)yii?REayv0M@ogrUh9};mQ5KMWwkBG
z=hDJZs$*@To?lxTER?b;y#?+Rs)h1EVQ^7=JJnt|GC!~;zpBud+HDi<fTm(w?A@ma
zD%HaOO4g^^wGllbmFlxH`BE`o%M>U>S)Bu=e63a-Di*5ksZ@s!^7TAHPe^t2_335x
zYO%aZrMvT`dZAi|<JT2x9q@yjxK4Eq<g0^pLb1LvHOFo*lnQGL<$BHTRGGFT3LDo~
zs)Ke05in9n?WDR?#!j`XZhmyD9)5Hvr6#IWs&mo875<V%i}d2<)+A-6vR1oFPgdE?
zVb#jWa8s}~1zc9&Y&BK2bskl&7faGWb~`{yYiz;iv-==cZArPynsTSba<@`hJ3U<l
z^{K5@d-vkPs(igLD56H&G`lHz8)e(pwh`#<_|Xj=+pFwoh6T2@gUYnt1MQ9xCwMZ`
z8X*y&v*oK%RHt`R>D10CHNo0r6Hy@Dp-;L4IwhJ4J#Ge=W`Zfb=VqDE6W3PCeeXwa
zJbDpZxdz^BHd96L)~4^GIy#TcS8Ii8Gngm8f8AOW!%@UWp}i}dIK$d4Wo5O`_?eKN
z+Sk`g+7dRq({r=nbZZaQ*-jOHzErYpDxa-7QagYj>M>%V6^o~#A)>xx^v)5Lb5quY
z^iHB{)3ho*k7{~VSEq~EUR7o^+HFIHe0`)^i27!GWw-#BSE{M`*+$s(sqTq>wNk4!
zI;btwdy4M8s2jb)*r_rNzP(kay$?+2`M?M|0s7M5Vwhp=3%32xGHq7e+Yrw0Beea&
zZ~z$Ejt2c;e_$O5Qi=A1@Z?~Gtc9D0#5d<NR1ZZ!r54z!lhguu(smrxGtplShYi4A
zOY`Mb1=}tahU$*X7|W|nrdnLJy6$+qJWVObS3R~9@Cp=;=9lAeJLH#LlyewASK!9s
z%1)(b+Zm^y4DaV{NOO+h7s^@4+lzQbIg9y)a+dH5<Q&P*70USl$(HhBPmnF+mje;^
z^5-l^kAV)$IZ9=$&f#idusFcZ2i3jGIa=IfNRJ`u0>H_E6weP)&atY??#NeHjmR*Q
zvF6OrI>&*>IUYXU8tvnnXQM;NIYHWSH<flyWH34>fd`0Jko9E4dQ7o2$nmU&H7~5r
zO2)vp5(DEBLi7L|%NbM?v+e+2R8a^y7;DjGoR#p@5Ph*gIjiVs3>D65#)MOZRb2yk
zv(>BlB8Jb%u2TqZ4TB4I9W{)o^(rIfLCYyc0@o7JBtg`C3K(UPS%IoHygm!%!J2Z0
zp`oXq>{c0szjLa%A!?Ya>KZ+4%^n9+jhO1dG<6gvw>($?un_|cAl3<p^|W_4<!l&V
z{l=zx<(wuQr;qE3GpP1V<BElq^$k~?6=^)X>5Ar4pg2clo(mM2+6Ww|ob$#<a()wu
za{(NI2p!uX7ZSxq#`vZlWBkPi3e;XAYCmX<zjS<+A8M+M;vN5;568XZBV?YdoXf!6
z8t@+_j^jywIjIg+&J__`+PP9?TRN5VF#&UxnrJ&$M-Z=}x28+r^q0$p>ZpLni`xvB
znaT*pmuzCZRL;k#u$QW@1+Zv9WgvY*b=%H$B7QIQ`A-7j0i?P<>cY13sYVyRVH}HY
zG!{9Zj_tq6*#DVvsBdoAe@kRPG*Q{D!pxDv`K%ay8;$;4Wc250^p0ZmVFegn9B`}E
z{KgjBd+?$hu9WfC;Dc;xzH+`mZMQS_gu%nGyQWaDS<W30EF-sbr)ay2V2)SL7x{T&
zgh@GHBKzH7pPUOv$}%n(otE=uNZ848?g2CluhCWlMAE&GoOZqvc`@yLm7-@U=f3EM
z<$Mk9=^W;}lS0kF@pY)&1^&1{cIE?QLoj_~JnC;o)S&+s$@ajP2l2(4kGT3a8L9=m
zJj;|XW5z=<JzajgbN6iLc;{qijZ=5dbS`oprlsaR*?3P|&LdGHJjzCBCJYS%So)aw
z@Np=V+Cfx30aXYi=gHXI@8I#+e)(OHVW3pb_cqmYzfX#~G>P*Rn{xE)+IhOsl+Or^
zABbY-hp_{HM9<*$^y3H+R6PqR+l-RJdL(``Sk6xx5}%VMd>)+pDCeg}(9ife8-NaQ
zehx_!bNvXrYJFKj0>pA&h$7<`jEu>Mj8Tu_tzXj8Irh||uqD&T=-u&uH26hGo@!VV
zB$o3Mq&qJ&-Lx_r>S$PHIj>OFmJL-2dZ_!A*zjwB&PE!Q^BZ}O{uT|=9o>r3Hfgt4
zIU4+qN?v1nYGtUS1|`2|`%jTh7%7ODFk<{c`~%0n4vAA@iA<(y!})<I^8QGpo@Lnm
z$z((aOOq<+jZInlX5`0LV8frqhQB0j_$zEkJ8$8E?Ys@W*%~X%fsC~PL)za+8Qp-!
zztiCh><)RO*6?zVi2ebh<~`8;b6khKLx=neSda(&9@f4~OWp(M?M8)Ae|ebz=$BTt
zoPUEO8e#s!NStF^?gVfipj-vLG7iH5Zi-FeTF~6S-sCWX&P|gFQRdos*15K@c4eVT
zm$H%Ej7TDXc09~(8!)@=4a{x_==ULcC&<TdA-9Wmv4va|d6KiTg`D>ec6*T7W|u8r
z+Q0ZP%bgh8<xUdlDD>>K%hE12L%CC#93ew=x4>=7-IBLYQ0_D}sXgvrP_UJ1x83Q&
zzO|v)CK5pPsMAFK41C{Cq;JoMyDN8xSo)44eJ8`avzi3b85BBGgzjP<>>BY==x#>n
z?zm7Bx3t~eVN{2^_}CRomLIN{TJEfdU3*ZR%B0=d=m72<6lnJURMl}}1C^OOH`#CY
z%Q~Jr57E+<(;JX6qq3=#Ew>li+}W1fhfZbppyxIps<gW&n!?>nn3|=K<?bCbfn*;s
zbYJ+vcK5@p(tV$KxPL6M$qDlhK)W|`14ht+jF5xKGuLttX4l?2N-8jKQb#eAUs)>X
zXhuL~+(QUxJ^=NEQ8~sU5VekbC?za_!K11r*8#d|t_v>2J4=~HHtYJhio2#8@WPBr
zE^C`ae{@;mw4uJh9Mmf1ve0Q;6-`ko_i$X<>oIC8w;x~IS%$2tR5vP@l}{T+o*E`)
zl*{tRs+5(xkPIt}<w51L2(kwuSGg>MdX^Q|A*HBqlxj@5tcWs&YPC{TE~}!p_4#U<
z^C|8J$XF~7Rg}vLDT^AFvoS8KB)f!37UeGI{YrURo)@T+?Dk4ID6Gvxul%_zlH6n9
z$%#vbmqBW&5Ve!#=HSZxICbJ43qE8oXtv|fY|#{qbo=9@xWI!GqywDD>yy|lxh2(R
z1X=D16AXQjcCwJ>NxG7HbI5s<v;zs+L7^>>b_ldv<n*bmjq4ke4670hQUkd~GMoa2
zX}P6^l1z!@OG%bB36_%RSWA{NShmhBsjn_nmzcsn$yG^k4GR}*9=9sU+`+*jC$^Fd
zcuhsU3TD@ZVT26pz_3kj(MYLY94@h9ZDCuVVA~*UEN<M>z&0s&R5@SW7@?D%dwPQS
z4C#btf+g*q#ZGv(d3X*xA>NfO+-SISTRY-;?1<-+j~x+x?E>n)5W3rz42yEhy$Fw^
z(6|^H)9xh<ke!t)Rmwc&Udrn^Cc-{M4Khzs9+as0aAXXWe}vyIgXk$aKVL)Po^;+v
z6NX(bUbuqfR|@%&m0EqMxFO+(k0r>j67s7_ehtW{<`&88Dlt}A?#C1K*9!e7NPnHs
zA6YG8=6O_<eUkLo%Lt4_hhwY4aEXTf6kIUHy@AX(f_ZYzm*RV50MkMomMr(v2~{^i
zRo49s8|P+o`xZ71Q}z}{IOtY5GF>jLSMF!wMU$<HWbx!}Y%A6zY%3{Bkl!I;P6$E+
zvgnYP?d?(OYrA*E1(bUy#7Zq6&vis;zk3&WSQffpG-<2*CAR5Y<=(vsjxQSy<=#We
zL&1A*q%ZA$MRkp?B&QcPF!GD_1XB7cN;OPnqTKt;)P~E_q@{9oS(&)^!{a@<Wvh|z
z`lU(@6LXgPK*HVMke2->Dp`nfzlE!``yieFZA0`Bo!?34N9=(8a0J_OAA#1b2W48d
zFc?;<YxAW>m0|q!C_y~Nn1S0{NG$hp(=<=;eTIB^EDhoZ1qm_}R3l6>dZhm1++|!N
zxvWS~fw?G1n&phkDuh)r{@kbHHhS8$(KG)YII9u>C;JaUJuz;OWgE-&{D!C<q*6IU
zXnqWuPSBWyL89+jikQd85b_hT;yIADwiBxrlDR*PVM@V*Q2O~e)GsuJy1$?~s3Bdc
zP>?W>o~(0On7AxV+T+%<T$Uq}$iTBN1C#B(Vj7=yhvoj7jsKgt@ge)SRDwuX?yJ)7
z5-7hD+SlSh_&tFBmq1|6L4Ufh$5#H)G{&F)JM$Zc8SHO@dfdkNGsQ)X@fXmvHpX8m
z;w|`M%S7tdUv6}Yw-bK(n^^aEdg34E_CMn>$SYL_)-;D<AbKY@=wDFV)r<kt16Y2z
zQhp>9FR31#uO`Yq%Vqfyx66O{n(|nEcuEk1SQ5M>hnH${cotjIO9QcIN4LEU5pRW#
zI}Wo_URHFp0dmKBBvS?Ej}p~hI~<u_m#>1TBl=px*G{4Diekm<riZ*9a5tu<yotbz
ze&|i&T`ozo6L^zxSNfqhWz_wt=DxRu2_jEwkNL`*2D)fcT?A|e!nhZC)0-C_Dv?Ij
zgYfjEB8jJhl(#KNz3t$>$+?y`v%Kw9!`a>r;<_E_x}D7Je?r>M45!nTH^a29HxsbN
zw63=c0lf!$lrAwE54DS(I+NYr+np$80mYQuGNiu)tDB)?d3zXrcuRV-0i(^ELl|?T
z+ul63;1+1XR!+$6g^FxVBr2~@+GbBkNPByk7TQ~`_92p4%G(#<d*YE=#%S^FengK>
z>AjD12NCf8pfrMo<N%Ujbn*@)2?iVQAV{{ngQeLx7<h-sjrrrNI5bwVprOKPQNgk!
zYGF@SQQ&nynq0~ZAdQInkr#l<)9_>mb0I9_R_m4*DrrdXFuJOXZz=N#9z7heY_Fdl
zeSb^__(zz@1x}M3Hi9JxF>@iLGk6!p(a1`}rh4Tq0bcnklt;#By$^`nmx}eW@N$sy
zmXj9waam}OYS12y`&~nLgD+o=Mb=fTqpo%geKMDUf<G@8=}vpBC)%(wo<|0(yyGIr
zdB;OUd{?BO(2#y2Nuq!|2{*kJaMSc0UR49oR^}>SGVD%{yuswm%Zrm%nxGlLRocU%
zitQnL<9Or^(X-ny2*;HM*sGwtyOwyWyw$`ri#Bn!B_r=_fqaUA?5!ci9?C1>dCO4k
zNvRRNH@z~=slc4>TrxZLh7&fN3e*{|O4O#H@ajZ85vUVPKr<3~*!I>@{UOR*5B1}u
zcisl5WqRjrBnRe4ywk`rS9x4B8IR)(!=b!0Ns08%I}4=A8s0k_>8N)Oks}>N>ENA9
z>&|0L_YW?qF5{|+<*~Mq;=#K>0*osmsO7zjAlIy{FkF;(aU3s~AbnK!G`xBwXKW<>
zjf~Ng!UGNBU1~B$k5$K(L(R#7(fO?>HOT#7_=tozS4K8N%|#L!Bv6M$?z+Ob>&neD
ze#|h^oU6#f0p{wchi*pSHDr4+^1{dQ-Mbb(Y|kykd#su-S>7j<1g}K+b#P*v$3+tF
zdQeS86;UchQ@;)RPet_J4GbI3%Z{NzSGiGI<I@y$69jeTmKEv^37;_%Zl(mz4>ccx
z^%jZHTN$CBjR}?VZllFBmG?P*V$}P5)S#C41$eEoze6UOz1wLr$Kg9-7vE`IeAigw
zFB)QyOIZ>P4R;gzmjS&So~kvm-(w)%8+V$-Q-H^U2)fr-3I4vA5`w>Gz<-^e$16`3
zK(Nf}Junu}H)8N8G@|&B<qveH2geeBy9xdw%05xr85$qvgBO+e2<><jc1+57*y&Wr
zmmAISSOicS{&9)iCy4t=gZn$QkY)a8KFI#AH17AHFN0B<qyG1SEL*HCua20!=qWt3
z>$r^Ycuy0?Gk`HMw|IoJy$uvUNTB$kp!g9{{Mev)mMFN;Fp3Qzegc)v*(2{cDtI0W
zvJs)>{S*?Sq2XtO_vfT|0TZL?!*$N`e$jaROK44d|0hH*0=Kp22IajZUvg0NGDm?q
zcsss=-2>jQaG$#eJgzx#_ki~s-j>8akK3>E_7HCWj<;Xqm5bY$TenjoZvTN_u%*G1
z)Se+AsXYSwPXgc#alxDNU9$9*%Hz^N3fZm4WdX~3i<d>^z0J>ljs|~|`+w(kNqL<5
zPc4iC;h!S#9ijLaUGOel(2wm*-g}B3^8TGlO-N<2wW_~dM+jp^-?sb-fbT0xg0X&z
zUtp}y9EL-@pXPHrex8Y+XZZ!@;m>b_HoqO(+5+wOFLD=JeurqpG@#!}r~6$IARj3*
z6T-CLL!ACZN+~FR5<fLWO*SL3FH`Yzls}bE(8K*LA_>ahGA5ZO__q>4(@C~c`AC1o
zgFg34**+%W=|Nw1OZ6*Xrr-yaj}20GDj@b9L6`Mq4!)%Poq2zu@@Mc9bTcD5U#8-R
zl#hH?S~s$LH#0K%yYqIh@@EMaY%!wq{n?RQNNbO~rB9?Ne-7#9$_TW0q*RJKj6V-P
zG{ukKE4KEb!}#0~gxfy11j*Yx!32Z$1{S*vIh5}2L)rUEcZ~MaHKgyCkp4cAzCWcO
zV5A=ycgIm|ka*Cj?&u#31z1`UWrt81=hwS)oQG(rlIe9W6CfNGKvmXvsLC~}yx5Qg
z6BNl5JM+;B9M36s<W9bZ_C|5#he#d#!zgC1wHKoIZ~)+(mERv_%9HY3U=NDes>20~
zC};NH4=OCDE1%Qqe7DM<&t%tM1oS<*{-H!>=r2xqY6;-C`9~7|2MqkBgpW-yqqrcQ
z$*)xecFv{~`%%D-8%+6pnLuY)OR~F%@^fOCNs;|yfrali|F}5Bj+e<dyTDP{KY_&j
zDzaq$9K`(dnd$n>bf@Mpv9z#K8BUs#NOFBia($EJ`b=^&K9gL(U<{Kam+$>Cf}m#=
zj7kq-b-_1jt<R)(Y&GRea*Jxpm*ke!l+X0G2fR&WVn>|e`sJuy{0itM7V^pRPzZ;O
zcPNW<=|1Pur{}zUtvE0StL2;YSHh3;>7D)v&0J^9T+jAnE<Zj$bZltYy3sV{X>qeK
z@tssG7wb)1Oq4P8Wex0OVm%s3&m!|&<)6Jto^uQjxXvZ<!OF*OAr6==)qsD#ae;q<
zp}R0fbP=Ra85zdPP-0QRV7fTwx+KOVDKIc`htQ_DK4iFn>ciBAX#EJt$7`9(8l=i+
z`s-hgmYJM8W_1zkaE*CD%fBMgrLbWLBf`hnBv+XxxtdMFx$PE4Ah-qyGV3W%`LY!V
z9qU@4>1gcZlMs<vd3K=d4B}6M#$H(&+$fK)PvHC%ao!+3CaAP1wEP<rNU=2to&P2x
zHJPn1nJxRs7*^=M1-h-lit=wArTnu-xqn;27Rh#D%jd`1@`afG_Q)27{T&2-r#P3j
z^ZKN7?@B<%L_A)$Un1nYjdQ;oJGX@qQtu(4I^`+<UI1y0x~~`{MDSH2xDN=XV6}|f
zbCM9gmVoeefp9+|m^pU;8-&0)oK{ZA{U$JEqYXdG|CU65dg@TITEo_q`jLsvnyug-
zOn_sy>^}r>+vb*6H~M)@F@@YDUP>;`_zx#gJ_3}s|0q#DW*qf6QEm^En-l@KPXKPZ
zjwM_F$#ER^9fQf2Oxph*lvqA;Xy%#SSi&1v?U(X6fnfUQQ-u9AV0UB6rt#47pD~Dj
zKtwFy6HoC@Wj3AhG4GC~4U<D)RQ`_{D~P9Ofohyl`6tx$95iheB2^f>!eIH&Qzt6&
zC!hdx@WA~uijrB2<Vu6jbQ_aI{tI~AnBnw)fxBj<!T%+(VAS}(aXj=Q==i4NpZ`)k
zh`lVfwBZy4+f4bdfOCquYQ~v#<zF=f_`epIzk#+UC$|S}g7eh|Cw2c0SN?18$ksW`
zqG9{M>O!q$j>!LgB4GXiWoiF)<K{m`viv_qrc&S=6!<0tPR_}US`)YB|CxfWk20da
zh@ihR^4`L2|812{`G3QHjm+G{hI(^|1)Br=<RD8Q4zl#gL6$x_$bu~!mj8FeM~35O
zi$b7bt&my8nLXumhfwrgJorx24?YVA|6KvyU#pFb8njtO#GwBT&~5&I06Lf;pshf~
z%3Bzf3RqQSij=1UOS-f~Di7cgL6Als7uZHlhH~2aBC}K`$O00Rx}YtJj&y*zc<@`;
z5E0-!h;0R|F|43VZe!{o=!StkSc+X!sG6xRQPV>;6KTZ)E0_c|DU94aXM(lS5loR7
zTIg)d&j(XP^i&A!jsz}Qc?#x9L>@~L#%{2siQ8aW1HxA0LzqqoTgMQfX&cIz5A$f@
zwy}k%S70F~5Q6O?rz_Ijk1fs{MDY%>VmZ>mseoXo7y?Qdur~IN1T!EYz7pn{hFJx>
zL_C=QWes?ujU|E1)6Y`D?qHl^wxFO#VCe$$NYOwQ%!&c*K@lhugV_<{xhj~m8NRs<
z-SbRG2~gQE!N~@F5eV7R66_hJJslD>KF%%)^u552K_y^~gTXD>2dW~H02^UsN+{Sj
zhPGb}4b%8^CZKT|zm-0o%2&aG29mUe3JzkONz*W?kN=p@r<7nmuI%7YM*ae}BkG#{
zRi-m9hdsDn#4Wo4w+>l>ONqTI@SwN3JlEXe7qG^$4q{Rq1fWUIiw2sZB2)R%yl8M3
zEn}zztaGsa2H#NVBqm1!mNwXOg$G9fW+qr@Kw|<Qa26Bvk_dEgB;sFY^~UUSP?^cm
zMm^4yF30L=p)NLYW<MP)H8w4S=62SZ%ko17nYa&F=vWJ|H#=adGp@l$Hw*@qIbC4~
zIm$dl1w30Z&NOmx9L(axb8vjzrYDdCEqdZ6I9LXeLj@~HiHYanWRQ+>aGnlcNp~0r
z4}b|1&!EK)BAKQL3jb{qIT)gROd<#IiHcw~6m8M;;OIHzKz1435BgK2P1bCdxWxA4
z2(vaeTxug2&e~|xN)i=Pa4G?!$_;qD0zGZhTs3NoCXhjnQVHY|^H?E3_^f02m|aG}
z28It)xYj*2*u8JI?MTpUZ1wtS^tx<6GG1q)6r71yPREjABg_iULbJ%6UU0Vbq;p_|
zHD`_rSQlCIOu~Ss0?_kf-<)rv{Q`k|A>m$RqW$6+E|$VZ?HE#-Y`q!cmr#1XMyVeJ
z@WxC-a4A3{$uWPyhhmi<HY#O7Ah?VwKWbE7PL+Had&puEo3B)+i$|qoJ)%4)PP(Gi
zNmtTIA4`PhRdmwTa1ypt$rdmxxTfKvkHbZFa4p+;whBH$8)oB+ls<hb_#_|f+Q5E2
zly%GTECWG?R#rjSD<*%z4Y7GQ8uM8BSOF`az*IiL<>T0KbE_S<(2iRZcChvdZi5|}
zCBxYJW(C}b6gBkcrJ=t-uxMwgbsEha+%YcbI|+K70ex2t8a0nZ?Uw}f-2}~J4j8G&
z1$|E|=z9tJD+$mnbpn<;aK3EwvjP@45$vx6c1LhOoj&hS6+D11>E2!pX0nMWU^#=~
zC*ah+)yuK*LGvy6HoxGEL-3FQeb`VwB7S((7$Jueg2&A>RvR45RPbcu+joTfyS#?h
z?}0lVeBW?CCC{EV&z^}s!Tkes=ZE+t1l&UTU|WX(4J!w00pCgT7qEgD8!s#%T<nJ6
zU+`S~s(fDbp<Iv#_?cY&oDJ}TX#gH4uyODw*N>xSd7MICl9+14YqZdqB#@55%AvDp
zNHGrxT`VG+{gUMa`(=RA0TGJ5JEHj&x%w3~|9Ue`|C`pP|1F#T)kM>?DhOB=U~uwr
zFb9=^6|fA58vhUQwjHntunxsr|Bs?pY5+9F8@SC4u)&-B0?*1c{~`1k{{n8v8SB`;
z(y`@;L<MifLH)L|Om^V}+=UbTV>6a9#UJ&u<Np8PUkS_JrDfcK)460g-XCiP+;9__
z#_cw?o<P&)&sUh6$CsV)g}HosK5tq4wllt&Kb;=WAZ^p2Qz9CjG4|+eWRFHtZ(F(@
z_GqpdY@(Cu&K7%g7wpm9O?z|?)aZ$3WWgClJt;OtPbT)=c8g(h%gq?S>#2mv2*aP2
z?KjB%G%|Yzl$Nyyy%k|j-we#HTVZZPnA;{`Zbz8g1E!6!q-yCM8Yr2|TW82#EkeLy
z^>I+{Oq44Hq|!6!Osp*FnFb{idR*;Fl)G&PB{TbEaOhb?Df@1sce0*MlyiWx$GmRL
z_HNBxI1(Rv9^#`-_Y(9R1Ou{n41oBuC%??bm%aF<4_}zATf5@RK7g0j`{EKKmEO;M
zB0ZOGqW71_2k`PxrIC%(IDS0{x7fepKYj4HzBz=xVe%_~?q2ROdX9UN-rilQC%Qwy
zd+sU0Yi>EX&#eZxx$A<f-P7C)-OJo7gEQT0G?y)==Em;e)rrLmy#O{((hl|9s5E!z
zU@w*S_&G~ypPws~mOVKYr8TdwRXW5c78W$~cTCM|X78A?*8TjvTxllln1Iwr@bgZk
zWg+4|r5Ew~A*C1d^EDXdUF%)%-Q<1QebIf(z2AS$U*yg5w7<fy`j`7Rc-y(}dCGmv
zf6lAuC2TuW&oYh2DF=OIqwSc<XY^9YJwR!$Q#1}XXy)+o!3NE(|M9^F&D1?{umNz+
zb8qw>_2+ue`1|_v{X6~p{D-_1{?q$-&ug9ym=ql)iq97z*mDg8$1-$rnn*LX2M8>0
zm_o>V!F$(7g>UN<FcIR;iMLJb6LHx%Ev8SxRpVHfUV$rpGUiOOoB9y~`3aG}9Cu*%
z;p{-;mpm|UlFjHm;C3Z$Tbgx&USa70ys)y|y3piNX^r{-gJXdmZ73#0pXH)R%2ApX
zz{KXyg>YSqNtQ0MpPfR6lPtXklGDhbG5OY%O;VN7%=<a#p(XFfdZ|X<&w&VGR^iK*
zy?$7F`>D`1#r*08PV|pp4;Us(r54szh|x9Jwp{|gIS<pIwRGK>FhW~*7-efKF>GHa
zYS)_~XM<cxmTy3arOfg*vwT{51}(+3B`j_1!hw-zO4GwgSr}pW)?6BCuJvoKhv;*G
zfBGiyTlzfeI6-F8^!W&DOEddVYpjRJz<rTiUCfrcBqH_hg(6w^n5p!oY%$h}T2gwt
z^~1n0dYg&<2yyVlK@!KPvnrZde~jaD!Eptd@=9NcPcy@*aS~eQ6!cZpJ6CD!>S<MW
zO{9#NWP#&Ee7Ux954UmsiCB*0_>jZpjZH<t^<-vEqx7dn`}YPu;qil+oAB?FDw3YH
zd2W5N^rsUh-Xtb|Mx1-IarG^7#r-_`vk6yol>?J<T2?s3)$xuVJ$6Tr=8hh?TIoAt
z6U~kuJ$6Tr=8hf`gZxX>LRZ}l6qe?>0zA?8Pzqc1UczEhk48cSWEw4;mDkr-NyqW%
zKGQHfJJ6tsdJ~ThMB1nks+jb%vc}h%zEPixhncMZw!6T+-g()1O+Ua<=^Gf86o2|g
zemg~Fr|WOR;oUN6i)nlw3$ygM0L*{e(hs7iWYANRPgPof8#Z<6hiJmXF(s5f0{v|`
zo62AAQTkCJ?lM>L5lj6TFk>LmkK<umbVRKt9rOtr^CXb89{kncfd=Pg%lQQqe^;FO
zJu3cw<F?XIaVBB*CeQwAZUVyDU-{EGR=_66$n?ET6ls<p(KVp425B6S(?0^x#wvpT
zF$7`4Pd^(qV_N?N#Io$HpCj8UbCOO!Py5W3*!NQoKtBU!{eY!^4!0`&ddgvjJfmNT
z`~uN(T;O!2e;L&<ww6^2tfKHFUeT<~Xx16}CAg~{Z6;^*Ed8=+3Z7fe;4n!1M5Xnw
z;J2*)H6S+6^l4NZ5{pIIT&sU;Y<m^ZGo}2>LP>zL;&6Ka>@{#>|C`1!0y;Y@ll^93
z{{!K?4mcT!6ifdx!V+Yl{7+Ecq2GwK_0*E*0!71{Wd1XlN1qwA^k0lYf2Bd#(J=Z*
zVOpaYLCPn)k?@lH8}N;mp!DB~8Skinz@{$z8d5Al^!}52-%*p>b$MiM^Jjj#W1=H)
zt}*(FAI(CA{o&nII-^N0y&_52@&iBmJq$>;{<oU470J!klf=mY>{4&u*Z)b`-6Gcz
zPRL*-ASu32j!tIUO3~)YkadtbPN_nrrr2RBWlzZ9B*7>ybI39ivNmcQxm01A95y-d
z!XL%KgP56++p3~7nJUbZwvDvYT508^W+r5I6d&7^J{ET14rdoa)=5|{*bwWW<HN4V
z@ha>FSu|j&5XTf+x@9;KkK=9`;=lr*+iTD&B86)r;S@DF)wLY6N2>}|X|Hf<)KuXX
zsq};l5~ajLl@764%T9;WXwp_R3G-nIg1#Zl#%03k&>NjRRpHho-G-!Skt8V&sp2G6
zCfpXp@!3=rZb$O%NsdW{BsnG$xantIAro@5SIYs`a7XxQlG#i?%2zwZzS=pm-->!`
zI0N@F5`{BI_0~{MI-s|PyP6Ry#PUg$sD-<mcTYGAJd?5CW$a0?kbA{K{sPq`Y+Ok`
zw?h8t6#78OpPkBJdu9s(oI4NwF%$MedSgN)?1RABz=H*p<~SOfg_BSgPUfqS3n$If
zBq7&K!u^0^7w+{*!U&@M_L3~d`?*3nq#dnZhWj%S2)T$79tZ)`qvMGAa=qomX(*?(
z4b#EG#1j(fa6Voxp%htocn**+0Jdax8af!tLv9vxUXu;tAqy_|LPUP(lh#Z(OOUem
z0uVf6^%aJIG&{EpFTPUYf3ZyVk{OWrDJsBYk>)+BLKbP**BVNZwy*R$C}F7<a?jY7
z4Z9QDgso7vj$O}$BOP+<SSIAwu~4>-$!!(Nddf@{vJ68e8ZM8chHEIJGmwzG#%NtA
zD<_zr2xaADt_qJGOU%kjT%kf%S4@tgzYyEUr0X|cI-zVKLm2ZfJc$S>T$WBCoGT}r
zh~GSwAl|^Xl1h*bg#)n#gSZnfJ*p5(DR%cN^vLp}=v=!r*boHpb*DnCpFrno35sIW
ziB4DHDa4B3z#FKP`BRM1`!8HWwI%qy4M#zF-wM~7?owuV!Mol(fa5D7au{GFa|l^6
zO)~Q0V_<@X<x<FUX_8@%pIRYHBz8uYNbHO)1kfU7QOKhc&CbXJ6PTS0Q69-y8lV3P
zPs0PVJ0d(CES-R3etJugoPp<<T9Ci+Ogi>Vh&d|~)8dP>iMkZgs*npMB*tIJQ`(ax
z_W4_7(Qo`oDjS|hp7UYp#C~>-#$zkIz!-WV4aIis(a&M06jb5G^d`nn6<$J%8-{%_
zGA!hNvNq#mvFJkylp#y3WIhv0f%Q5dUq-%Y?aVYaw~>Y1MwX2hDy@*4$JiEE5@LH_
zUvwYP_&ZaX@Tw?cx|;R3k#sdAp&(P?HH6HarGkt{CD=&ZMb<Qg8^}1`Ul#}SCvgL7
zt|6CCnk8x|>n11B+c(hj2h;JmxG`=9{iO3^_-VlJ3@QWin{oJ=vhXHj!e?kgcVA!g
z8O*pD9U&XuLbTsh;jR39U4>jZK?WM$hEFti_&I)_ufoss^K$C^0wb60#Us+CjjREn
z>UN{*4imX81kiV<biBJLA9|#wdI|FMOZs*F=kW6I{BU*{h6jfGg^R*cSo7cX-*vBZ
N=j(Tn4Wz8J`hRY4jgkNW

diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/CheckStandaloneSetupGenerated.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/CheckStandaloneSetupGenerated.java
index c432427ff..a6f1c445d 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/CheckStandaloneSetupGenerated.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/CheckStandaloneSetupGenerated.java
@@ -4,8 +4,8 @@
 package com.avaloq.tools.ddk.check;
 
 import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.xtext.ISetup;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.xtext.ISetup;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g
index 1b56a9518..51110d20c 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g
@@ -101,7 +101,7 @@ ruleCheckCatalog returns [EObject current=null]
        			$current, 
        			"packageName",
         		lv_packageName_2_0, 
-        		"QualifiedName");
+        		"org.eclipse.xtext.xbase.Xbase.QualifiedName");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -119,7 +119,7 @@ ruleCheckCatalog returns [EObject current=null]
        			$current, 
        			"imports",
         		lv_imports_3_0, 
-        		"XImportSection");
+        		"com.avaloq.tools.ddk.check.Check.XImportSection");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -156,7 +156,7 @@ ruleCheckCatalog returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_6_0, 
-        		"ValidID");
+        		"org.eclipse.xtext.xbase.Xtype.ValidID");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -201,7 +201,7 @@ ruleCheckCatalog returns [EObject current=null]
        			$current, 
        			"categories",
         		lv_categories_11_0, 
-        		"Category");
+        		"com.avaloq.tools.ddk.check.Check.Category");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -220,7 +220,7 @@ ruleCheckCatalog returns [EObject current=null]
        			$current, 
        			"implementations",
         		lv_implementations_12_0, 
-        		"Implementation");
+        		"com.avaloq.tools.ddk.check.Check.Implementation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -239,7 +239,7 @@ ruleCheckCatalog returns [EObject current=null]
        			$current, 
        			"checks",
         		lv_checks_13_0, 
-        		"Check");
+        		"com.avaloq.tools.ddk.check.Check.Check");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -258,7 +258,7 @@ ruleCheckCatalog returns [EObject current=null]
        			$current, 
        			"members",
         		lv_members_14_0, 
-        		"Member");
+        		"com.avaloq.tools.ddk.check.Check.Member");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -307,7 +307,7 @@ ruleXImportSection returns [EObject current=null]
        			$current, 
        			"importDeclarations",
         		lv_importDeclarations_1_0, 
-        		"XImportDeclaration");
+        		"com.avaloq.tools.ddk.check.Check.XImportDeclaration");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -366,7 +366,7 @@ ruleXImportDeclaration returns [EObject current=null]
        			$current, 
        			"importedNamespace",
         		lv_importedNamespace_2_0, 
-        		"QualifiedNameWithWildcard");
+        		"org.eclipse.xtext.xbase.Xtype.QualifiedNameWithWildcard");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -417,7 +417,7 @@ ruleCategory returns [EObject current=null]
        			$current, 
        			"id",
         		lv_id_1_0, 
-        		"ValidID");
+        		"org.eclipse.xtext.xbase.Xtype.ValidID");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -436,7 +436,7 @@ ruleCategory returns [EObject current=null]
        			$current, 
        			"label",
         		lv_label_2_0, 
-        		"STRING");
+        		"org.eclipse.xtext.xbase.Xtype.STRING");
 	    }
 
 )
@@ -457,7 +457,7 @@ ruleCategory returns [EObject current=null]
        			$current, 
        			"checks",
         		lv_checks_4_0, 
-        		"Check");
+        		"com.avaloq.tools.ddk.check.Check.Check");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -500,7 +500,7 @@ ruleCheck returns [EObject current=null]
        			$current, 
        			"severityRange",
         		lv_severityRange_0_0, 
-        		"SeverityRange");
+        		"com.avaloq.tools.ddk.check.Check.SeverityRange");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -533,7 +533,7 @@ ruleCheck returns [EObject current=null]
        			$current, 
        			"kind",
         		lv_kind_2_0, 
-        		"TriggerKind");
+        		"com.avaloq.tools.ddk.check.Check.TriggerKind");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -551,7 +551,7 @@ ruleCheck returns [EObject current=null]
        			$current, 
        			"defaultSeverity",
         		lv_defaultSeverity_3_0, 
-        		"SeverityKind");
+        		"com.avaloq.tools.ddk.check.Check.SeverityKind");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -569,7 +569,7 @@ ruleCheck returns [EObject current=null]
        			$current, 
        			"id",
         		lv_id_4_0, 
-        		"ValidID");
+        		"org.eclipse.xtext.xbase.Xtype.ValidID");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -588,7 +588,7 @@ ruleCheck returns [EObject current=null]
        			$current, 
        			"label",
         		lv_label_5_0, 
-        		"STRING");
+        		"org.eclipse.xtext.xbase.Xtype.STRING");
 	    }
 
 )
@@ -610,7 +610,7 @@ ruleCheck returns [EObject current=null]
        			$current, 
        			"formalParameters",
         		lv_formalParameters_7_0, 
-        		"FormalParameter");
+        		"com.avaloq.tools.ddk.check.Check.FormalParameter");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -632,7 +632,7 @@ ruleCheck returns [EObject current=null]
        			$current, 
        			"formalParameters",
         		lv_formalParameters_9_0, 
-        		"FormalParameter");
+        		"com.avaloq.tools.ddk.check.Check.FormalParameter");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -659,7 +659,7 @@ ruleCheck returns [EObject current=null]
        			$current, 
        			"givenMessage",
         		lv_givenMessage_12_0, 
-        		"STRING");
+        		"org.eclipse.xtext.xbase.Xtype.STRING");
 	    }
 
 )
@@ -681,7 +681,7 @@ ruleCheck returns [EObject current=null]
        			$current, 
        			"contexts",
         		lv_contexts_14_0, 
-        		"Context");
+        		"com.avaloq.tools.ddk.check.Check.Context");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -704,7 +704,7 @@ ruleCheck returns [EObject current=null]
        			$current, 
        			"contexts",
         		lv_contexts_16_0, 
-        		"Context");
+        		"com.avaloq.tools.ddk.check.Check.Context");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -755,7 +755,7 @@ ruleSeverityRange returns [EObject current=null]
        			$current, 
        			"minSeverity",
         		lv_minSeverity_3_0, 
-        		"SeverityKind");
+        		"com.avaloq.tools.ddk.check.Check.SeverityKind");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -777,7 +777,7 @@ ruleSeverityRange returns [EObject current=null]
        			$current, 
        			"maxSeverity",
         		lv_maxSeverity_5_0, 
-        		"SeverityKind");
+        		"com.avaloq.tools.ddk.check.Check.SeverityKind");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -820,7 +820,7 @@ ruleMember returns [EObject current=null]
        			$current, 
        			"annotations",
         		lv_annotations_0_0, 
-        		"XAnnotation");
+        		"org.eclipse.xtext.xbase.annotations.XbaseWithAnnotations.XAnnotation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -838,7 +838,7 @@ ruleMember returns [EObject current=null]
        			$current, 
        			"type",
         		lv_type_1_0, 
-        		"JvmTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -856,7 +856,7 @@ ruleMember returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_2_0, 
-        		"ValidID");
+        		"org.eclipse.xtext.xbase.Xtype.ValidID");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -882,7 +882,7 @@ ruleOpSingleAssign
        			$current, 
        			"value",
         		lv_value_4_0, 
-        		"XOrExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XOrExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -929,7 +929,7 @@ ruleImplementation returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ValidID");
+        		"org.eclipse.xtext.xbase.Xtype.ValidID");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -947,7 +947,7 @@ ruleImplementation returns [EObject current=null]
        			$current, 
        			"context",
         		lv_context_2_0, 
-        		"Context");
+        		"com.avaloq.tools.ddk.check.Check.Context");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -986,7 +986,7 @@ ruleFormalParameter returns [EObject current=null]
        			$current, 
        			"type",
         		lv_type_0_0, 
-        		"JvmParameterizedTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmParameterizedTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1004,7 +1004,7 @@ ruleFormalParameter returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ValidID");
+        		"org.eclipse.xtext.xbase.Xtype.ValidID");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1026,7 +1026,7 @@ ruleFormalParameter returns [EObject current=null]
        			$current, 
        			"right",
         		lv_right_3_0, 
-        		"XFormalParameterDefaultValueLiteral");
+        		"com.avaloq.tools.ddk.check.Check.XFormalParameterDefaultValueLiteral");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1045,7 +1045,7 @@ ruleFormalParameter returns [EObject current=null]
        			$current, 
        			"label",
         		lv_label_4_0, 
-        		"STRING");
+        		"org.eclipse.xtext.xbase.Xtype.STRING");
 	    }
 
 )
@@ -1154,7 +1154,7 @@ ruleXConstantUnaryOperation returns [EObject current=null]
        			$current, 
        			"operand",
         		lv_operand_2_0, 
-        		"XConstantUnaryOperation");
+        		"com.avaloq.tools.ddk.check.Check.XConstantUnaryOperation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1257,7 +1257,7 @@ ruleXConstantListLiteral returns [EObject current=null]
        			$current, 
        			"elements",
         		lv_elements_3_0, 
-        		"XConstantUnaryOperation");
+        		"com.avaloq.tools.ddk.check.Check.XConstantUnaryOperation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1279,7 +1279,7 @@ ruleXConstantListLiteral returns [EObject current=null]
        			$current, 
        			"elements",
         		lv_elements_5_0, 
-        		"XConstantUnaryOperation");
+        		"com.avaloq.tools.ddk.check.Check.XConstantUnaryOperation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1326,7 +1326,7 @@ ruleContext returns [EObject current=null]
        			$current, 
        			"contextVariable",
         		lv_contextVariable_1_0, 
-        		"ContextVariable");
+        		"com.avaloq.tools.ddk.check.Check.ContextVariable");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1344,7 +1344,7 @@ ruleContext returns [EObject current=null]
        			$current, 
        			"constraint",
         		lv_constraint_2_0, 
-        		"XBlockExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XBlockExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1383,7 +1383,7 @@ ruleContextVariable returns [EObject current=null]
        			$current, 
        			"type",
         		lv_type_0_0, 
-        		"JvmTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1401,7 +1401,7 @@ ruleContextVariable returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ValidID");
+        		"org.eclipse.xtext.xbase.Xtype.ValidID");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1450,7 +1450,7 @@ ruleXGuardExpression returns [EObject current=null]
        			$current, 
        			"guard",
         		lv_guard_2_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1544,7 +1544,7 @@ ruleXIssueExpression returns [EObject current=null]
        			$current, 
        			"markerObject",
         		lv_markerObject_6_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1587,7 +1587,7 @@ ruleXIssueExpression returns [EObject current=null]
        			$current, 
        			"markerIndex",
         		lv_markerIndex_10_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1614,7 +1614,7 @@ ruleXIssueExpression returns [EObject current=null]
        			$current, 
        			"message",
         		lv_message_13_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1641,7 +1641,7 @@ ruleXIssueExpression returns [EObject current=null]
        			$current, 
        			"messageParameters",
         		lv_messageParameters_16_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1664,7 +1664,7 @@ ruleXIssueExpression returns [EObject current=null]
        			$current, 
        			"messageParameters",
         		lv_messageParameters_18_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1691,7 +1691,7 @@ ruleXIssueExpression returns [EObject current=null]
        			$current, 
        			"issueCode",
         		lv_issueCode_21_0, 
-        		"ValidID");
+        		"org.eclipse.xtext.xbase.Xtype.ValidID");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1713,7 +1713,7 @@ ruleXIssueExpression returns [EObject current=null]
        			$current, 
        			"issueData",
         		lv_issueData_23_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1736,7 +1736,7 @@ ruleXIssueExpression returns [EObject current=null]
        			$current, 
        			"issueData",
         		lv_issueData_25_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2187,7 +2187,7 @@ ruleXAnnotation returns [EObject current=null]
        			$current, 
        			"elementValuePairs",
         		lv_elementValuePairs_4_0, 
-        		"XAnnotationElementValuePair");
+        		"org.eclipse.xtext.xbase.annotations.XbaseWithAnnotations.XAnnotationElementValuePair");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2214,7 +2214,7 @@ ruleXAnnotation returns [EObject current=null]
        			$current, 
        			"elementValuePairs",
         		lv_elementValuePairs_6_0, 
-        		"XAnnotationElementValuePair");
+        		"org.eclipse.xtext.xbase.annotations.XbaseWithAnnotations.XAnnotationElementValuePair");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2233,7 +2233,7 @@ ruleXAnnotation returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_7_0, 
-        		"XAnnotationElementValueOrCommaList");
+        		"org.eclipse.xtext.xbase.annotations.XbaseWithAnnotations.XAnnotationElementValueOrCommaList");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2300,7 +2300,7 @@ ruleXAnnotationElementValuePair returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_2_0, 
-        		"XAnnotationElementValue");
+        		"org.eclipse.xtext.xbase.annotations.XbaseWithAnnotations.XAnnotationElementValue");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2356,7 +2356,7 @@ ruleXAnnotationElementValueOrCommaList returns [EObject current=null]
        			$current, 
        			"elements",
         		lv_elements_3_0, 
-        		"XAnnotationOrExpression");
+        		"org.eclipse.xtext.xbase.annotations.XbaseWithAnnotations.XAnnotationOrExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2378,7 +2378,7 @@ ruleXAnnotationElementValueOrCommaList returns [EObject current=null]
        			$current, 
        			"elements",
         		lv_elements_5_0, 
-        		"XAnnotationOrExpression");
+        		"org.eclipse.xtext.xbase.annotations.XbaseWithAnnotations.XAnnotationOrExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2420,7 +2420,7 @@ ruleXAnnotationElementValueOrCommaList returns [EObject current=null]
        			$current, 
        			"elements",
         		lv_elements_10_0, 
-        		"XAnnotationOrExpression");
+        		"org.eclipse.xtext.xbase.annotations.XbaseWithAnnotations.XAnnotationOrExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2476,7 +2476,7 @@ ruleXAnnotationElementValue returns [EObject current=null]
        			$current, 
        			"elements",
         		lv_elements_3_0, 
-        		"XAnnotationOrExpression");
+        		"org.eclipse.xtext.xbase.annotations.XbaseWithAnnotations.XAnnotationOrExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2498,7 +2498,7 @@ ruleXAnnotationElementValue returns [EObject current=null]
        			$current, 
        			"elements",
         		lv_elements_5_0, 
-        		"XAnnotationOrExpression");
+        		"org.eclipse.xtext.xbase.annotations.XbaseWithAnnotations.XAnnotationOrExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2650,7 +2650,7 @@ ruleOpSingleAssign
        			$current, 
        			"value",
         		lv_value_3_0, 
-        		"XAssignment");
+        		"org.eclipse.xtext.xbase.Xbase.XAssignment");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2704,7 +2704,7 @@ ruleOpSingleAssign
        			$current, 
        			"rightOperand",
         		lv_rightOperand_7_0, 
-        		"XAssignment");
+        		"org.eclipse.xtext.xbase.Xbase.XAssignment");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2898,7 +2898,7 @@ ruleXOrExpression returns [EObject current=null]
        			$current, 
        			"rightOperand",
         		lv_rightOperand_3_0, 
-        		"XAndExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XAndExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2999,7 +2999,7 @@ ruleXAndExpression returns [EObject current=null]
        			$current, 
        			"rightOperand",
         		lv_rightOperand_3_0, 
-        		"XEqualityExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XEqualityExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3100,7 +3100,7 @@ ruleXEqualityExpression returns [EObject current=null]
        			$current, 
        			"rightOperand",
         		lv_rightOperand_3_0, 
-        		"XRelationalExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XRelationalExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3208,7 +3208,7 @@ ruleXRelationalExpression returns [EObject current=null]
        			$current, 
        			"type",
         		lv_type_3_0, 
-        		"JvmTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3253,7 +3253,7 @@ ruleXRelationalExpression returns [EObject current=null]
        			$current, 
        			"rightOperand",
         		lv_rightOperand_6_0, 
-        		"XOtherOperatorExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XOtherOperatorExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3381,7 +3381,7 @@ ruleXOtherOperatorExpression returns [EObject current=null]
        			$current, 
        			"rightOperand",
         		lv_rightOperand_3_0, 
-        		"XAdditiveExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XAdditiveExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3597,7 +3597,7 @@ ruleXAdditiveExpression returns [EObject current=null]
        			$current, 
        			"rightOperand",
         		lv_rightOperand_3_0, 
-        		"XMultiplicativeExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XMultiplicativeExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3705,7 +3705,7 @@ ruleXMultiplicativeExpression returns [EObject current=null]
        			$current, 
        			"rightOperand",
         		lv_rightOperand_3_0, 
-        		"XUnaryOperation");
+        		"org.eclipse.xtext.xbase.Xbase.XUnaryOperation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3813,7 +3813,7 @@ ruleXUnaryOperation returns [EObject current=null]
        			$current, 
        			"operand",
         		lv_operand_2_0, 
-        		"XUnaryOperation");
+        		"org.eclipse.xtext.xbase.Xbase.XUnaryOperation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3924,7 +3924,7 @@ ruleXCastedExpression returns [EObject current=null]
        			$current, 
        			"type",
         		lv_type_3_0, 
-        		"JvmTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4124,7 +4124,7 @@ ruleOpSingleAssign
        			$current, 
        			"value",
         		lv_value_6_0, 
-        		"XAssignment");
+        		"org.eclipse.xtext.xbase.Xbase.XAssignment");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4205,7 +4205,7 @@ ruleOpSingleAssign
        			$current, 
        			"typeArguments",
         		lv_typeArguments_12_0, 
-        		"JvmArgumentTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4227,7 +4227,7 @@ ruleOpSingleAssign
        			$current, 
        			"typeArguments",
         		lv_typeArguments_14_0, 
-        		"JvmArgumentTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4301,7 +4301,7 @@ ruleJvmFormalParameter
        			$current, 
        			"memberCallArguments",
         		lv_memberCallArguments_18_0, 
-        		"XShortClosure");
+        		"org.eclipse.xtext.xbase.Xbase.XShortClosure");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4320,7 +4320,7 @@ ruleJvmFormalParameter
        			$current, 
        			"memberCallArguments",
         		lv_memberCallArguments_19_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4342,7 +4342,7 @@ ruleJvmFormalParameter
        			$current, 
        			"memberCallArguments",
         		lv_memberCallArguments_21_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4366,7 +4366,7 @@ ruleJvmFormalParameter
        			$current, 
        			"memberCallArguments",
         		lv_memberCallArguments_23_0, 
-        		"XClosure");
+        		"org.eclipse.xtext.xbase.Xbase.XClosure");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4551,7 +4551,7 @@ ruleXSetLiteral returns [EObject current=null]
        			$current, 
        			"elements",
         		lv_elements_3_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4573,7 +4573,7 @@ ruleXSetLiteral returns [EObject current=null]
        			$current, 
        			"elements",
         		lv_elements_5_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4630,7 +4630,7 @@ ruleXListLiteral returns [EObject current=null]
        			$current, 
        			"elements",
         		lv_elements_3_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4652,7 +4652,7 @@ ruleXListLiteral returns [EObject current=null]
        			$current, 
        			"elements",
         		lv_elements_5_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4722,7 +4722,7 @@ ruleJvmFormalParameter
        			$current, 
        			"declaredFormalParameters",
         		lv_declaredFormalParameters_2_0, 
-        		"JvmFormalParameter");
+        		"org.eclipse.xtext.xbase.Xbase.JvmFormalParameter");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4744,7 +4744,7 @@ ruleJvmFormalParameter
        			$current, 
        			"declaredFormalParameters",
         		lv_declaredFormalParameters_4_0, 
-        		"JvmFormalParameter");
+        		"org.eclipse.xtext.xbase.Xbase.JvmFormalParameter");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4777,7 +4777,7 @@ ruleJvmFormalParameter
        			$current, 
        			"expression",
         		lv_expression_6_0, 
-        		"XExpressionInClosure");
+        		"org.eclipse.xtext.xbase.Xbase.XExpressionInClosure");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4826,7 +4826,7 @@ ruleXExpressionInClosure returns [EObject current=null]
        			$current, 
        			"expressions",
         		lv_expressions_1_0, 
-        		"XExpressionOrVarDeclaration");
+        		"org.eclipse.xtext.xbase.Xbase.XExpressionOrVarDeclaration");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4891,7 +4891,7 @@ ruleJvmFormalParameter
        			$current, 
        			"declaredFormalParameters",
         		lv_declaredFormalParameters_1_0, 
-        		"JvmFormalParameter");
+        		"org.eclipse.xtext.xbase.Xbase.JvmFormalParameter");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4913,7 +4913,7 @@ ruleJvmFormalParameter
        			$current, 
        			"declaredFormalParameters",
         		lv_declaredFormalParameters_3_0, 
-        		"JvmFormalParameter");
+        		"org.eclipse.xtext.xbase.Xbase.JvmFormalParameter");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4946,7 +4946,7 @@ ruleJvmFormalParameter
        			$current, 
        			"expression",
         		lv_expression_5_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5037,7 +5037,7 @@ ruleXIfExpression returns [EObject current=null]
        			$current, 
        			"if",
         		lv_if_3_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5059,7 +5059,7 @@ ruleXIfExpression returns [EObject current=null]
        			$current, 
        			"then",
         		lv_then_5_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5082,7 +5082,7 @@ ruleXIfExpression returns [EObject current=null]
        			$current, 
        			"else",
         		lv_else_7_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5141,7 +5141,7 @@ ruleJvmFormalParameter
        			$current, 
        			"declaredParam",
         		lv_declaredParam_3_0, 
-        		"JvmFormalParameter");
+        		"org.eclipse.xtext.xbase.Xbase.JvmFormalParameter");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5163,7 +5163,7 @@ ruleJvmFormalParameter
        			$current, 
        			"switch",
         		lv_switch_5_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5191,7 +5191,7 @@ ruleJvmFormalParameter
        			$current, 
        			"declaredParam",
         		lv_declaredParam_7_0, 
-        		"JvmFormalParameter");
+        		"org.eclipse.xtext.xbase.Xbase.JvmFormalParameter");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5213,7 +5213,7 @@ ruleJvmFormalParameter
        			$current, 
        			"switch",
         		lv_switch_9_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5235,7 +5235,7 @@ ruleJvmFormalParameter
        			$current, 
        			"cases",
         		lv_cases_11_0, 
-        		"XCasePart");
+        		"org.eclipse.xtext.xbase.Xbase.XCasePart");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5261,7 +5261,7 @@ ruleJvmFormalParameter
        			$current, 
        			"default",
         		lv_default_14_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5310,7 +5310,7 @@ ruleXCasePart returns [EObject current=null]
        			$current, 
        			"typeGuard",
         		lv_typeGuard_1_0, 
-        		"JvmTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5332,7 +5332,7 @@ ruleXCasePart returns [EObject current=null]
        			$current, 
        			"case",
         		lv_case_3_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5354,7 +5354,7 @@ ruleXCasePart returns [EObject current=null]
        			$current, 
        			"then",
         		lv_then_5_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5431,7 +5431,7 @@ ruleJvmFormalParameter
        			$current, 
        			"declaredParam",
         		lv_declaredParam_3_0, 
-        		"JvmFormalParameter");
+        		"org.eclipse.xtext.xbase.Xbase.JvmFormalParameter");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5453,7 +5453,7 @@ ruleJvmFormalParameter
        			$current, 
        			"forExpression",
         		lv_forExpression_5_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5475,7 +5475,7 @@ ruleJvmFormalParameter
        			$current, 
        			"eachExpression",
         		lv_eachExpression_7_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5528,7 +5528,7 @@ ruleXBasicForLoopExpression returns [EObject current=null]
        			$current, 
        			"initExpressions",
         		lv_initExpressions_3_0, 
-        		"XExpressionOrVarDeclaration");
+        		"org.eclipse.xtext.xbase.Xbase.XExpressionOrVarDeclaration");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5550,7 +5550,7 @@ ruleXBasicForLoopExpression returns [EObject current=null]
        			$current, 
        			"initExpressions",
         		lv_initExpressions_5_0, 
-        		"XExpressionOrVarDeclaration");
+        		"org.eclipse.xtext.xbase.Xbase.XExpressionOrVarDeclaration");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5572,7 +5572,7 @@ ruleXBasicForLoopExpression returns [EObject current=null]
        			$current, 
        			"expression",
         		lv_expression_7_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5594,7 +5594,7 @@ ruleXBasicForLoopExpression returns [EObject current=null]
        			$current, 
        			"updateExpressions",
         		lv_updateExpressions_9_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5616,7 +5616,7 @@ ruleXBasicForLoopExpression returns [EObject current=null]
        			$current, 
        			"updateExpressions",
         		lv_updateExpressions_11_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5638,7 +5638,7 @@ ruleXBasicForLoopExpression returns [EObject current=null]
        			$current, 
        			"eachExpression",
         		lv_eachExpression_13_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5691,7 +5691,7 @@ ruleXWhileExpression returns [EObject current=null]
        			$current, 
        			"predicate",
         		lv_predicate_3_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5713,7 +5713,7 @@ ruleXWhileExpression returns [EObject current=null]
        			$current, 
        			"body",
         		lv_body_5_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5762,7 +5762,7 @@ ruleXDoWhileExpression returns [EObject current=null]
        			$current, 
        			"body",
         		lv_body_2_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5788,7 +5788,7 @@ ruleXDoWhileExpression returns [EObject current=null]
        			$current, 
        			"predicate",
         		lv_predicate_5_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5841,7 +5841,7 @@ ruleXBlockExpression returns [EObject current=null]
        			$current, 
        			"expressions",
         		lv_expressions_2_0, 
-        		"XExpressionOrVarDeclaration");
+        		"org.eclipse.xtext.xbase.Xbase.XExpressionOrVarDeclaration");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5962,7 +5962,7 @@ ruleValidID
        			$current, 
        			"type",
         		lv_type_3_0, 
-        		"JvmTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5980,7 +5980,7 @@ ruleValidID
        			$current, 
        			"name",
         		lv_name_4_0, 
-        		"ValidID");
+        		"org.eclipse.xtext.xbase.Xtype.ValidID");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5999,7 +5999,7 @@ ruleValidID
        			$current, 
        			"name",
         		lv_name_5_0, 
-        		"ValidID");
+        		"org.eclipse.xtext.xbase.Xtype.ValidID");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6021,7 +6021,7 @@ ruleValidID
        			$current, 
        			"right",
         		lv_right_7_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6060,7 +6060,7 @@ ruleJvmFormalParameter returns [EObject current=null]
        			$current, 
        			"parameterType",
         		lv_parameterType_0_0, 
-        		"JvmTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6078,7 +6078,7 @@ ruleJvmFormalParameter returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ValidID");
+        		"org.eclipse.xtext.xbase.Xtype.ValidID");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6117,7 +6117,7 @@ ruleFullJvmFormalParameter returns [EObject current=null]
        			$current, 
        			"parameterType",
         		lv_parameterType_0_0, 
-        		"JvmTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6135,7 +6135,7 @@ ruleFullJvmFormalParameter returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ValidID");
+        		"org.eclipse.xtext.xbase.Xtype.ValidID");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6184,7 +6184,7 @@ ruleXFeatureCall returns [EObject current=null]
        			$current, 
        			"typeArguments",
         		lv_typeArguments_2_0, 
-        		"JvmArgumentTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6206,7 +6206,7 @@ ruleXFeatureCall returns [EObject current=null]
        			$current, 
        			"typeArguments",
         		lv_typeArguments_4_0, 
-        		"JvmArgumentTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6280,7 +6280,7 @@ ruleJvmFormalParameter
        			$current, 
        			"featureCallArguments",
         		lv_featureCallArguments_8_0, 
-        		"XShortClosure");
+        		"org.eclipse.xtext.xbase.Xbase.XShortClosure");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6299,7 +6299,7 @@ ruleJvmFormalParameter
        			$current, 
        			"featureCallArguments",
         		lv_featureCallArguments_9_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6321,7 +6321,7 @@ ruleJvmFormalParameter
        			$current, 
        			"featureCallArguments",
         		lv_featureCallArguments_11_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6345,7 +6345,7 @@ ruleJvmFormalParameter
        			$current, 
        			"featureCallArguments",
         		lv_featureCallArguments_13_0, 
-        		"XClosure");
+        		"org.eclipse.xtext.xbase.Xbase.XClosure");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6453,7 +6453,7 @@ ruleXConstructorCall returns [EObject current=null]
        			$current, 
        			"typeArguments",
         		lv_typeArguments_4_0, 
-        		"JvmArgumentTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6475,7 +6475,7 @@ ruleXConstructorCall returns [EObject current=null]
        			$current, 
        			"typeArguments",
         		lv_typeArguments_6_0, 
-        		"JvmArgumentTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6534,7 +6534,7 @@ ruleJvmFormalParameter
        			$current, 
        			"arguments",
         		lv_arguments_9_0, 
-        		"XShortClosure");
+        		"org.eclipse.xtext.xbase.Xbase.XShortClosure");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6553,7 +6553,7 @@ ruleJvmFormalParameter
        			$current, 
        			"arguments",
         		lv_arguments_10_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6575,7 +6575,7 @@ ruleJvmFormalParameter
        			$current, 
        			"arguments",
         		lv_arguments_12_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6599,7 +6599,7 @@ ruleJvmFormalParameter
        			$current, 
        			"arguments",
         		lv_arguments_14_0, 
-        		"XClosure");
+        		"org.eclipse.xtext.xbase.Xbase.XClosure");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6722,7 +6722,7 @@ ruleXNumberLiteral returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_1_0, 
-        		"Number");
+        		"org.eclipse.xtext.xbase.Xbase.Number");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6768,7 +6768,7 @@ ruleXStringLiteral returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_1_0, 
-        		"STRING");
+        		"org.eclipse.xtext.xbase.Xtype.STRING");
 	    }
 
 )
@@ -6835,7 +6835,7 @@ ruleXTypeLiteral returns [EObject current=null]
        			$current, 
        			"arrayDimensions",
         		lv_arrayDimensions_4_0, 
-        		"ArrayBrackets");
+        		"org.eclipse.xtext.xbase.Xtype.ArrayBrackets");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6888,7 +6888,7 @@ ruleXThrowExpression returns [EObject current=null]
        			$current, 
        			"expression",
         		lv_expression_2_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6982,7 +6982,7 @@ ruleXReturnExpression returns [EObject current=null]
        			$current, 
        			"expression",
         		lv_expression_2_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7031,7 +7031,7 @@ ruleXTryCatchFinallyExpression returns [EObject current=null]
        			$current, 
        			"expression",
         		lv_expression_2_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7050,7 +7050,7 @@ ruleXTryCatchFinallyExpression returns [EObject current=null]
        			$current, 
        			"catchClauses",
         		lv_catchClauses_3_0, 
-        		"XCatchClause");
+        		"org.eclipse.xtext.xbase.Xbase.XCatchClause");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7073,7 +7073,7 @@ ruleXTryCatchFinallyExpression returns [EObject current=null]
        			$current, 
        			"finallyExpression",
         		lv_finallyExpression_5_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7096,7 +7096,7 @@ ruleXTryCatchFinallyExpression returns [EObject current=null]
        			$current, 
        			"finallyExpression",
         		lv_finallyExpression_7_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7152,7 +7152,7 @@ ruleXSynchronizedExpression returns [EObject current=null]
        			$current, 
        			"param",
         		lv_param_3_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7174,7 +7174,7 @@ ruleXSynchronizedExpression returns [EObject current=null]
        			$current, 
        			"expression",
         		lv_expression_5_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7222,7 +7222,7 @@ ruleXCatchClause returns [EObject current=null]
        			$current, 
        			"declaredParam",
         		lv_declaredParam_2_0, 
-        		"FullJvmFormalParameter");
+        		"org.eclipse.xtext.xbase.Xbase.FullJvmFormalParameter");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7244,7 +7244,7 @@ ruleXCatchClause returns [EObject current=null]
        			$current, 
        			"expression",
         		lv_expression_4_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7503,7 +7503,7 @@ ruleXFunctionTypeRef returns [EObject current=null]
        			$current, 
        			"paramTypes",
         		lv_paramTypes_1_0, 
-        		"JvmTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7525,7 +7525,7 @@ ruleXFunctionTypeRef returns [EObject current=null]
        			$current, 
        			"paramTypes",
         		lv_paramTypes_3_0, 
-        		"JvmTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7551,7 +7551,7 @@ ruleXFunctionTypeRef returns [EObject current=null]
        			$current, 
        			"returnType",
         		lv_returnType_6_0, 
-        		"JvmTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7610,7 +7610,7 @@ ruleJvmParameterizedTypeReference returns [EObject current=null]
        			$current, 
        			"arguments",
         		lv_arguments_2_0, 
-        		"JvmArgumentTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7632,7 +7632,7 @@ ruleJvmParameterizedTypeReference returns [EObject current=null]
        			$current, 
        			"arguments",
         		lv_arguments_4_0, 
-        		"JvmArgumentTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7686,7 +7686,7 @@ ruleJvmParameterizedTypeReference returns [EObject current=null]
        			$current, 
        			"arguments",
         		lv_arguments_10_0, 
-        		"JvmArgumentTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7708,7 +7708,7 @@ ruleJvmParameterizedTypeReference returns [EObject current=null]
        			$current, 
        			"arguments",
         		lv_arguments_12_0, 
-        		"JvmArgumentTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7801,7 +7801,7 @@ ruleJvmWildcardTypeReference returns [EObject current=null]
        			$current, 
        			"constraints",
         		lv_constraints_2_0, 
-        		"JvmUpperBound");
+        		"org.eclipse.xtext.xbase.Xtype.JvmUpperBound");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7819,7 +7819,7 @@ ruleJvmWildcardTypeReference returns [EObject current=null]
        			$current, 
        			"constraints",
         		lv_constraints_3_0, 
-        		"JvmUpperBoundAnded");
+        		"org.eclipse.xtext.xbase.Xtype.JvmUpperBoundAnded");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7838,7 +7838,7 @@ ruleJvmWildcardTypeReference returns [EObject current=null]
        			$current, 
        			"constraints",
         		lv_constraints_4_0, 
-        		"JvmLowerBound");
+        		"org.eclipse.xtext.xbase.Xtype.JvmLowerBound");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7856,7 +7856,7 @@ ruleJvmWildcardTypeReference returns [EObject current=null]
        			$current, 
        			"constraints",
         		lv_constraints_5_0, 
-        		"JvmLowerBoundAnded");
+        		"org.eclipse.xtext.xbase.Xtype.JvmLowerBoundAnded");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7899,7 +7899,7 @@ ruleJvmUpperBound returns [EObject current=null]
        			$current, 
        			"typeReference",
         		lv_typeReference_1_0, 
-        		"JvmTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7942,7 +7942,7 @@ ruleJvmUpperBoundAnded returns [EObject current=null]
        			$current, 
        			"typeReference",
         		lv_typeReference_1_0, 
-        		"JvmTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7985,7 +7985,7 @@ ruleJvmLowerBound returns [EObject current=null]
        			$current, 
        			"typeReference",
         		lv_typeReference_1_0, 
-        		"JvmTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -8028,7 +8028,7 @@ ruleJvmLowerBoundAnded returns [EObject current=null]
        			$current, 
        			"typeReference",
         		lv_typeReference_1_0, 
-        		"JvmTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheckLexer.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheckLexer.java
index 5e266f156..0d6b7f082 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheckLexer.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheckLexer.java
@@ -130,15 +130,15 @@ public InternalCheckLexer(CharStream input, RecognizerSharedState state) {
         super(input,state);
 
     }
-    public String getGrammarFileName() { return "../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g"; }
+    public String getGrammarFileName() { return "InternalCheck.g"; }
 
     // $ANTLR start "T__13"
     public final void mT__13() throws RecognitionException {
         try {
             int _type = T__13;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:11:7: ( 'package' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:11:9: 'package'
+            // InternalCheck.g:11:7: ( 'package' )
+            // InternalCheck.g:11:9: 'package'
             {
             match("package"); 
 
@@ -158,8 +158,8 @@ public final void mT__14() throws RecognitionException {
         try {
             int _type = T__14;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:12:7: ( 'final' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:12:9: 'final'
+            // InternalCheck.g:12:7: ( 'final' )
+            // InternalCheck.g:12:9: 'final'
             {
             match("final"); 
 
@@ -179,8 +179,8 @@ public final void mT__15() throws RecognitionException {
         try {
             int _type = T__15;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:13:7: ( 'catalog' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:13:9: 'catalog'
+            // InternalCheck.g:13:7: ( 'catalog' )
+            // InternalCheck.g:13:9: 'catalog'
             {
             match("catalog"); 
 
@@ -200,8 +200,8 @@ public final void mT__16() throws RecognitionException {
         try {
             int _type = T__16;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:14:7: ( 'for' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:14:9: 'for'
+            // InternalCheck.g:14:7: ( 'for' )
+            // InternalCheck.g:14:9: 'for'
             {
             match("for"); 
 
@@ -221,8 +221,8 @@ public final void mT__17() throws RecognitionException {
         try {
             int _type = T__17;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:15:7: ( 'grammar' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:15:9: 'grammar'
+            // InternalCheck.g:15:7: ( 'grammar' )
+            // InternalCheck.g:15:9: 'grammar'
             {
             match("grammar"); 
 
@@ -242,8 +242,8 @@ public final void mT__18() throws RecognitionException {
         try {
             int _type = T__18;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:16:7: ( '{' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:16:9: '{'
+            // InternalCheck.g:16:7: ( '{' )
+            // InternalCheck.g:16:9: '{'
             {
             match('{'); 
 
@@ -262,8 +262,8 @@ public final void mT__19() throws RecognitionException {
         try {
             int _type = T__19;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:17:7: ( '}' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:17:9: '}'
+            // InternalCheck.g:17:7: ( '}' )
+            // InternalCheck.g:17:9: '}'
             {
             match('}'); 
 
@@ -282,8 +282,8 @@ public final void mT__20() throws RecognitionException {
         try {
             int _type = T__20;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:18:7: ( 'import' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:18:9: 'import'
+            // InternalCheck.g:18:7: ( 'import' )
+            // InternalCheck.g:18:9: 'import'
             {
             match("import"); 
 
@@ -303,8 +303,8 @@ public final void mT__21() throws RecognitionException {
         try {
             int _type = T__21;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:19:7: ( ';' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:19:9: ';'
+            // InternalCheck.g:19:7: ( ';' )
+            // InternalCheck.g:19:9: ';'
             {
             match(';'); 
 
@@ -323,8 +323,8 @@ public final void mT__22() throws RecognitionException {
         try {
             int _type = T__22;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:20:7: ( 'category' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:20:9: 'category'
+            // InternalCheck.g:20:7: ( 'category' )
+            // InternalCheck.g:20:9: 'category'
             {
             match("category"); 
 
@@ -344,8 +344,8 @@ public final void mT__23() throws RecognitionException {
         try {
             int _type = T__23;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:21:7: ( '(' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:21:9: '('
+            // InternalCheck.g:21:7: ( '(' )
+            // InternalCheck.g:21:9: '('
             {
             match('('); 
 
@@ -364,8 +364,8 @@ public final void mT__24() throws RecognitionException {
         try {
             int _type = T__24;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:22:7: ( ',' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:22:9: ','
+            // InternalCheck.g:22:7: ( ',' )
+            // InternalCheck.g:22:9: ','
             {
             match(','); 
 
@@ -384,8 +384,8 @@ public final void mT__25() throws RecognitionException {
         try {
             int _type = T__25;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:23:7: ( ')' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:23:9: ')'
+            // InternalCheck.g:23:7: ( ')' )
+            // InternalCheck.g:23:9: ')'
             {
             match(')'); 
 
@@ -404,8 +404,8 @@ public final void mT__26() throws RecognitionException {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:24:7: ( 'message' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:24:9: 'message'
+            // InternalCheck.g:24:7: ( 'message' )
+            // InternalCheck.g:24:9: 'message'
             {
             match("message"); 
 
@@ -425,8 +425,8 @@ public final void mT__27() throws RecognitionException {
         try {
             int _type = T__27;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:25:7: ( '@' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:25:9: '@'
+            // InternalCheck.g:25:7: ( '@' )
+            // InternalCheck.g:25:9: '@'
             {
             match('@'); 
 
@@ -445,8 +445,8 @@ public final void mT__28() throws RecognitionException {
         try {
             int _type = T__28;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:26:7: ( 'SeverityRange' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:26:9: 'SeverityRange'
+            // InternalCheck.g:26:7: ( 'SeverityRange' )
+            // InternalCheck.g:26:9: 'SeverityRange'
             {
             match("SeverityRange"); 
 
@@ -466,8 +466,8 @@ public final void mT__29() throws RecognitionException {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:27:7: ( '..' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:27:9: '..'
+            // InternalCheck.g:27:7: ( '..' )
+            // InternalCheck.g:27:9: '..'
             {
             match(".."); 
 
@@ -487,8 +487,8 @@ public final void mT__30() throws RecognitionException {
         try {
             int _type = T__30;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:28:7: ( 'def' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:28:9: 'def'
+            // InternalCheck.g:28:7: ( 'def' )
+            // InternalCheck.g:28:9: 'def'
             {
             match("def"); 
 
@@ -508,8 +508,8 @@ public final void mT__31() throws RecognitionException {
         try {
             int _type = T__31;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:29:7: ( '=' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:29:9: '='
+            // InternalCheck.g:29:7: ( '=' )
+            // InternalCheck.g:29:9: '='
             {
             match('='); 
 
@@ -528,8 +528,8 @@ public final void mT__32() throws RecognitionException {
         try {
             int _type = T__32;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:30:7: ( '#' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:30:9: '#'
+            // InternalCheck.g:30:7: ( '#' )
+            // InternalCheck.g:30:9: '#'
             {
             match('#'); 
 
@@ -548,8 +548,8 @@ public final void mT__33() throws RecognitionException {
         try {
             int _type = T__33;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:31:7: ( '[' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:31:9: '['
+            // InternalCheck.g:31:7: ( '[' )
+            // InternalCheck.g:31:9: '['
             {
             match('['); 
 
@@ -568,8 +568,8 @@ public final void mT__34() throws RecognitionException {
         try {
             int _type = T__34;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:32:7: ( ']' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:32:9: ']'
+            // InternalCheck.g:32:7: ( ']' )
+            // InternalCheck.g:32:9: ']'
             {
             match(']'); 
 
@@ -588,8 +588,8 @@ public final void mT__35() throws RecognitionException {
         try {
             int _type = T__35;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:33:7: ( 'guard' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:33:9: 'guard'
+            // InternalCheck.g:33:7: ( 'guard' )
+            // InternalCheck.g:33:9: 'guard'
             {
             match("guard"); 
 
@@ -609,8 +609,8 @@ public final void mT__36() throws RecognitionException {
         try {
             int _type = T__36;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:34:7: ( 'issue' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:34:9: 'issue'
+            // InternalCheck.g:34:7: ( 'issue' )
+            // InternalCheck.g:34:9: 'issue'
             {
             match("issue"); 
 
@@ -630,8 +630,8 @@ public final void mT__37() throws RecognitionException {
         try {
             int _type = T__37;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:35:7: ( 'on' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:35:9: 'on'
+            // InternalCheck.g:35:7: ( 'on' )
+            // InternalCheck.g:35:9: 'on'
             {
             match("on"); 
 
@@ -651,8 +651,8 @@ public final void mT__38() throws RecognitionException {
         try {
             int _type = T__38;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:36:7: ( 'bind' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:36:9: 'bind'
+            // InternalCheck.g:36:7: ( 'bind' )
+            // InternalCheck.g:36:9: 'bind'
             {
             match("bind"); 
 
@@ -672,8 +672,8 @@ public final void mT__39() throws RecognitionException {
         try {
             int _type = T__39;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:37:7: ( 'data' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:37:9: 'data'
+            // InternalCheck.g:37:7: ( 'data' )
+            // InternalCheck.g:37:9: 'data'
             {
             match("data"); 
 
@@ -693,8 +693,8 @@ public final void mT__40() throws RecognitionException {
         try {
             int _type = T__40;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:38:7: ( 'extends' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:38:9: 'extends'
+            // InternalCheck.g:38:7: ( 'extends' )
+            // InternalCheck.g:38:9: 'extends'
             {
             match("extends"); 
 
@@ -714,8 +714,8 @@ public final void mT__41() throws RecognitionException {
         try {
             int _type = T__41;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:39:7: ( 'static' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:39:9: 'static'
+            // InternalCheck.g:39:7: ( 'static' )
+            // InternalCheck.g:39:9: 'static'
             {
             match("static"); 
 
@@ -735,8 +735,8 @@ public final void mT__42() throws RecognitionException {
         try {
             int _type = T__42;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:40:7: ( 'extension' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:40:9: 'extension'
+            // InternalCheck.g:40:7: ( 'extension' )
+            // InternalCheck.g:40:9: 'extension'
             {
             match("extension"); 
 
@@ -756,8 +756,8 @@ public final void mT__43() throws RecognitionException {
         try {
             int _type = T__43;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:41:7: ( 'with' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:41:9: 'with'
+            // InternalCheck.g:41:7: ( 'with' )
+            // InternalCheck.g:41:9: 'with'
             {
             match("with"); 
 
@@ -777,8 +777,8 @@ public final void mT__44() throws RecognitionException {
         try {
             int _type = T__44;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:42:7: ( 'error' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:42:9: 'error'
+            // InternalCheck.g:42:7: ( 'error' )
+            // InternalCheck.g:42:9: 'error'
             {
             match("error"); 
 
@@ -798,8 +798,8 @@ public final void mT__45() throws RecognitionException {
         try {
             int _type = T__45;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:43:7: ( 'warning' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:43:9: 'warning'
+            // InternalCheck.g:43:7: ( 'warning' )
+            // InternalCheck.g:43:9: 'warning'
             {
             match("warning"); 
 
@@ -819,8 +819,8 @@ public final void mT__46() throws RecognitionException {
         try {
             int _type = T__46;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:44:7: ( 'info' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:44:9: 'info'
+            // InternalCheck.g:44:7: ( 'info' )
+            // InternalCheck.g:44:9: 'info'
             {
             match("info"); 
 
@@ -840,8 +840,8 @@ public final void mT__47() throws RecognitionException {
         try {
             int _type = T__47;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:45:7: ( 'ignore' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:45:9: 'ignore'
+            // InternalCheck.g:45:7: ( 'ignore' )
+            // InternalCheck.g:45:9: 'ignore'
             {
             match("ignore"); 
 
@@ -861,8 +861,8 @@ public final void mT__48() throws RecognitionException {
         try {
             int _type = T__48;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:46:7: ( 'live' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:46:9: 'live'
+            // InternalCheck.g:46:7: ( 'live' )
+            // InternalCheck.g:46:9: 'live'
             {
             match("live"); 
 
@@ -882,8 +882,8 @@ public final void mT__49() throws RecognitionException {
         try {
             int _type = T__49;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:47:7: ( 'onSave' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:47:9: 'onSave'
+            // InternalCheck.g:47:7: ( 'onSave' )
+            // InternalCheck.g:47:9: 'onSave'
             {
             match("onSave"); 
 
@@ -903,8 +903,8 @@ public final void mT__50() throws RecognitionException {
         try {
             int _type = T__50;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:48:7: ( 'onDemand' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:48:9: 'onDemand'
+            // InternalCheck.g:48:7: ( 'onDemand' )
+            // InternalCheck.g:48:9: 'onDemand'
             {
             match("onDemand"); 
 
@@ -924,8 +924,8 @@ public final void mT__51() throws RecognitionException {
         try {
             int _type = T__51;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:49:7: ( '+=' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:49:9: '+='
+            // InternalCheck.g:49:7: ( '+=' )
+            // InternalCheck.g:49:9: '+='
             {
             match("+="); 
 
@@ -945,8 +945,8 @@ public final void mT__52() throws RecognitionException {
         try {
             int _type = T__52;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:50:7: ( '-=' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:50:9: '-='
+            // InternalCheck.g:50:7: ( '-=' )
+            // InternalCheck.g:50:9: '-='
             {
             match("-="); 
 
@@ -966,8 +966,8 @@ public final void mT__53() throws RecognitionException {
         try {
             int _type = T__53;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:51:7: ( '*=' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:51:9: '*='
+            // InternalCheck.g:51:7: ( '*=' )
+            // InternalCheck.g:51:9: '*='
             {
             match("*="); 
 
@@ -987,8 +987,8 @@ public final void mT__54() throws RecognitionException {
         try {
             int _type = T__54;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:52:7: ( '/=' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:52:9: '/='
+            // InternalCheck.g:52:7: ( '/=' )
+            // InternalCheck.g:52:9: '/='
             {
             match("/="); 
 
@@ -1008,8 +1008,8 @@ public final void mT__55() throws RecognitionException {
         try {
             int _type = T__55;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:53:7: ( '%=' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:53:9: '%='
+            // InternalCheck.g:53:7: ( '%=' )
+            // InternalCheck.g:53:9: '%='
             {
             match("%="); 
 
@@ -1029,8 +1029,8 @@ public final void mT__56() throws RecognitionException {
         try {
             int _type = T__56;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:54:7: ( '<' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:54:9: '<'
+            // InternalCheck.g:54:7: ( '<' )
+            // InternalCheck.g:54:9: '<'
             {
             match('<'); 
 
@@ -1049,8 +1049,8 @@ public final void mT__57() throws RecognitionException {
         try {
             int _type = T__57;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:55:7: ( '>' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:55:9: '>'
+            // InternalCheck.g:55:7: ( '>' )
+            // InternalCheck.g:55:9: '>'
             {
             match('>'); 
 
@@ -1069,8 +1069,8 @@ public final void mT__58() throws RecognitionException {
         try {
             int _type = T__58;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:56:7: ( '>=' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:56:9: '>='
+            // InternalCheck.g:56:7: ( '>=' )
+            // InternalCheck.g:56:9: '>='
             {
             match(">="); 
 
@@ -1090,8 +1090,8 @@ public final void mT__59() throws RecognitionException {
         try {
             int _type = T__59;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:57:7: ( '||' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:57:9: '||'
+            // InternalCheck.g:57:7: ( '||' )
+            // InternalCheck.g:57:9: '||'
             {
             match("||"); 
 
@@ -1111,8 +1111,8 @@ public final void mT__60() throws RecognitionException {
         try {
             int _type = T__60;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:58:7: ( '&&' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:58:9: '&&'
+            // InternalCheck.g:58:7: ( '&&' )
+            // InternalCheck.g:58:9: '&&'
             {
             match("&&"); 
 
@@ -1132,8 +1132,8 @@ public final void mT__61() throws RecognitionException {
         try {
             int _type = T__61;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:59:7: ( '==' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:59:9: '=='
+            // InternalCheck.g:59:7: ( '==' )
+            // InternalCheck.g:59:9: '=='
             {
             match("=="); 
 
@@ -1153,8 +1153,8 @@ public final void mT__62() throws RecognitionException {
         try {
             int _type = T__62;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:60:7: ( '!=' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:60:9: '!='
+            // InternalCheck.g:60:7: ( '!=' )
+            // InternalCheck.g:60:9: '!='
             {
             match("!="); 
 
@@ -1174,8 +1174,8 @@ public final void mT__63() throws RecognitionException {
         try {
             int _type = T__63;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:61:7: ( '===' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:61:9: '==='
+            // InternalCheck.g:61:7: ( '===' )
+            // InternalCheck.g:61:9: '==='
             {
             match("==="); 
 
@@ -1195,8 +1195,8 @@ public final void mT__64() throws RecognitionException {
         try {
             int _type = T__64;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:62:7: ( '!==' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:62:9: '!=='
+            // InternalCheck.g:62:7: ( '!==' )
+            // InternalCheck.g:62:9: '!=='
             {
             match("!=="); 
 
@@ -1216,8 +1216,8 @@ public final void mT__65() throws RecognitionException {
         try {
             int _type = T__65;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:63:7: ( 'instanceof' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:63:9: 'instanceof'
+            // InternalCheck.g:63:7: ( 'instanceof' )
+            // InternalCheck.g:63:9: 'instanceof'
             {
             match("instanceof"); 
 
@@ -1237,8 +1237,8 @@ public final void mT__66() throws RecognitionException {
         try {
             int _type = T__66;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:64:7: ( '->' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:64:9: '->'
+            // InternalCheck.g:64:7: ( '->' )
+            // InternalCheck.g:64:9: '->'
             {
             match("->"); 
 
@@ -1258,8 +1258,8 @@ public final void mT__67() throws RecognitionException {
         try {
             int _type = T__67;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:65:7: ( '..<' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:65:9: '..<'
+            // InternalCheck.g:65:7: ( '..<' )
+            // InternalCheck.g:65:9: '..<'
             {
             match("..<"); 
 
@@ -1279,8 +1279,8 @@ public final void mT__68() throws RecognitionException {
         try {
             int _type = T__68;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:66:7: ( '=>' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:66:9: '=>'
+            // InternalCheck.g:66:7: ( '=>' )
+            // InternalCheck.g:66:9: '=>'
             {
             match("=>"); 
 
@@ -1300,8 +1300,8 @@ public final void mT__69() throws RecognitionException {
         try {
             int _type = T__69;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:67:7: ( '<>' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:67:9: '<>'
+            // InternalCheck.g:67:7: ( '<>' )
+            // InternalCheck.g:67:9: '<>'
             {
             match("<>"); 
 
@@ -1321,8 +1321,8 @@ public final void mT__70() throws RecognitionException {
         try {
             int _type = T__70;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:68:7: ( '?:' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:68:9: '?:'
+            // InternalCheck.g:68:7: ( '?:' )
+            // InternalCheck.g:68:9: '?:'
             {
             match("?:"); 
 
@@ -1342,8 +1342,8 @@ public final void mT__71() throws RecognitionException {
         try {
             int _type = T__71;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:69:7: ( '+' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:69:9: '+'
+            // InternalCheck.g:69:7: ( '+' )
+            // InternalCheck.g:69:9: '+'
             {
             match('+'); 
 
@@ -1362,8 +1362,8 @@ public final void mT__72() throws RecognitionException {
         try {
             int _type = T__72;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:70:7: ( '-' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:70:9: '-'
+            // InternalCheck.g:70:7: ( '-' )
+            // InternalCheck.g:70:9: '-'
             {
             match('-'); 
 
@@ -1382,8 +1382,8 @@ public final void mT__73() throws RecognitionException {
         try {
             int _type = T__73;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:71:7: ( '*' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:71:9: '*'
+            // InternalCheck.g:71:7: ( '*' )
+            // InternalCheck.g:71:9: '*'
             {
             match('*'); 
 
@@ -1402,8 +1402,8 @@ public final void mT__74() throws RecognitionException {
         try {
             int _type = T__74;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:72:7: ( '**' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:72:9: '**'
+            // InternalCheck.g:72:7: ( '**' )
+            // InternalCheck.g:72:9: '**'
             {
             match("**"); 
 
@@ -1423,8 +1423,8 @@ public final void mT__75() throws RecognitionException {
         try {
             int _type = T__75;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:73:7: ( '/' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:73:9: '/'
+            // InternalCheck.g:73:7: ( '/' )
+            // InternalCheck.g:73:9: '/'
             {
             match('/'); 
 
@@ -1443,8 +1443,8 @@ public final void mT__76() throws RecognitionException {
         try {
             int _type = T__76;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:74:7: ( '%' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:74:9: '%'
+            // InternalCheck.g:74:7: ( '%' )
+            // InternalCheck.g:74:9: '%'
             {
             match('%'); 
 
@@ -1463,8 +1463,8 @@ public final void mT__77() throws RecognitionException {
         try {
             int _type = T__77;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:75:7: ( '!' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:75:9: '!'
+            // InternalCheck.g:75:7: ( '!' )
+            // InternalCheck.g:75:9: '!'
             {
             match('!'); 
 
@@ -1483,8 +1483,8 @@ public final void mT__78() throws RecognitionException {
         try {
             int _type = T__78;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:76:7: ( 'as' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:76:9: 'as'
+            // InternalCheck.g:76:7: ( 'as' )
+            // InternalCheck.g:76:9: 'as'
             {
             match("as"); 
 
@@ -1504,8 +1504,8 @@ public final void mT__79() throws RecognitionException {
         try {
             int _type = T__79;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:77:7: ( '++' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:77:9: '++'
+            // InternalCheck.g:77:7: ( '++' )
+            // InternalCheck.g:77:9: '++'
             {
             match("++"); 
 
@@ -1525,8 +1525,8 @@ public final void mT__80() throws RecognitionException {
         try {
             int _type = T__80;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:78:7: ( '--' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:78:9: '--'
+            // InternalCheck.g:78:7: ( '--' )
+            // InternalCheck.g:78:9: '--'
             {
             match("--"); 
 
@@ -1546,8 +1546,8 @@ public final void mT__81() throws RecognitionException {
         try {
             int _type = T__81;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:79:7: ( '.' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:79:9: '.'
+            // InternalCheck.g:79:7: ( '.' )
+            // InternalCheck.g:79:9: '.'
             {
             match('.'); 
 
@@ -1566,8 +1566,8 @@ public final void mT__82() throws RecognitionException {
         try {
             int _type = T__82;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:80:7: ( '::' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:80:9: '::'
+            // InternalCheck.g:80:7: ( '::' )
+            // InternalCheck.g:80:9: '::'
             {
             match("::"); 
 
@@ -1587,8 +1587,8 @@ public final void mT__83() throws RecognitionException {
         try {
             int _type = T__83;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:81:7: ( '?.' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:81:9: '?.'
+            // InternalCheck.g:81:7: ( '?.' )
+            // InternalCheck.g:81:9: '?.'
             {
             match("?."); 
 
@@ -1608,8 +1608,8 @@ public final void mT__84() throws RecognitionException {
         try {
             int _type = T__84;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:82:7: ( '|' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:82:9: '|'
+            // InternalCheck.g:82:7: ( '|' )
+            // InternalCheck.g:82:9: '|'
             {
             match('|'); 
 
@@ -1628,8 +1628,8 @@ public final void mT__85() throws RecognitionException {
         try {
             int _type = T__85;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:83:7: ( 'if' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:83:9: 'if'
+            // InternalCheck.g:83:7: ( 'if' )
+            // InternalCheck.g:83:9: 'if'
             {
             match("if"); 
 
@@ -1649,8 +1649,8 @@ public final void mT__86() throws RecognitionException {
         try {
             int _type = T__86;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:84:7: ( 'else' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:84:9: 'else'
+            // InternalCheck.g:84:7: ( 'else' )
+            // InternalCheck.g:84:9: 'else'
             {
             match("else"); 
 
@@ -1670,8 +1670,8 @@ public final void mT__87() throws RecognitionException {
         try {
             int _type = T__87;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:85:7: ( 'switch' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:85:9: 'switch'
+            // InternalCheck.g:85:7: ( 'switch' )
+            // InternalCheck.g:85:9: 'switch'
             {
             match("switch"); 
 
@@ -1691,8 +1691,8 @@ public final void mT__88() throws RecognitionException {
         try {
             int _type = T__88;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:86:7: ( ':' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:86:9: ':'
+            // InternalCheck.g:86:7: ( ':' )
+            // InternalCheck.g:86:9: ':'
             {
             match(':'); 
 
@@ -1711,8 +1711,8 @@ public final void mT__89() throws RecognitionException {
         try {
             int _type = T__89;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:87:7: ( 'default' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:87:9: 'default'
+            // InternalCheck.g:87:7: ( 'default' )
+            // InternalCheck.g:87:9: 'default'
             {
             match("default"); 
 
@@ -1732,8 +1732,8 @@ public final void mT__90() throws RecognitionException {
         try {
             int _type = T__90;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:88:7: ( 'case' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:88:9: 'case'
+            // InternalCheck.g:88:7: ( 'case' )
+            // InternalCheck.g:88:9: 'case'
             {
             match("case"); 
 
@@ -1753,8 +1753,8 @@ public final void mT__91() throws RecognitionException {
         try {
             int _type = T__91;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:89:7: ( 'while' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:89:9: 'while'
+            // InternalCheck.g:89:7: ( 'while' )
+            // InternalCheck.g:89:9: 'while'
             {
             match("while"); 
 
@@ -1774,8 +1774,8 @@ public final void mT__92() throws RecognitionException {
         try {
             int _type = T__92;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:90:7: ( 'do' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:90:9: 'do'
+            // InternalCheck.g:90:7: ( 'do' )
+            // InternalCheck.g:90:9: 'do'
             {
             match("do"); 
 
@@ -1795,8 +1795,8 @@ public final void mT__93() throws RecognitionException {
         try {
             int _type = T__93;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:91:7: ( 'var' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:91:9: 'var'
+            // InternalCheck.g:91:7: ( 'var' )
+            // InternalCheck.g:91:9: 'var'
             {
             match("var"); 
 
@@ -1816,8 +1816,8 @@ public final void mT__94() throws RecognitionException {
         try {
             int _type = T__94;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:92:7: ( 'val' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:92:9: 'val'
+            // InternalCheck.g:92:7: ( 'val' )
+            // InternalCheck.g:92:9: 'val'
             {
             match("val"); 
 
@@ -1837,8 +1837,8 @@ public final void mT__95() throws RecognitionException {
         try {
             int _type = T__95;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:93:7: ( 'super' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:93:9: 'super'
+            // InternalCheck.g:93:7: ( 'super' )
+            // InternalCheck.g:93:9: 'super'
             {
             match("super"); 
 
@@ -1858,8 +1858,8 @@ public final void mT__96() throws RecognitionException {
         try {
             int _type = T__96;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:94:7: ( 'new' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:94:9: 'new'
+            // InternalCheck.g:94:7: ( 'new' )
+            // InternalCheck.g:94:9: 'new'
             {
             match("new"); 
 
@@ -1879,8 +1879,8 @@ public final void mT__97() throws RecognitionException {
         try {
             int _type = T__97;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:95:7: ( 'false' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:95:9: 'false'
+            // InternalCheck.g:95:7: ( 'false' )
+            // InternalCheck.g:95:9: 'false'
             {
             match("false"); 
 
@@ -1900,8 +1900,8 @@ public final void mT__98() throws RecognitionException {
         try {
             int _type = T__98;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:96:7: ( 'true' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:96:9: 'true'
+            // InternalCheck.g:96:7: ( 'true' )
+            // InternalCheck.g:96:9: 'true'
             {
             match("true"); 
 
@@ -1921,8 +1921,8 @@ public final void mT__99() throws RecognitionException {
         try {
             int _type = T__99;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:97:7: ( 'null' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:97:9: 'null'
+            // InternalCheck.g:97:7: ( 'null' )
+            // InternalCheck.g:97:9: 'null'
             {
             match("null"); 
 
@@ -1942,8 +1942,8 @@ public final void mT__100() throws RecognitionException {
         try {
             int _type = T__100;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:98:8: ( 'typeof' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:98:10: 'typeof'
+            // InternalCheck.g:98:8: ( 'typeof' )
+            // InternalCheck.g:98:10: 'typeof'
             {
             match("typeof"); 
 
@@ -1963,8 +1963,8 @@ public final void mT__101() throws RecognitionException {
         try {
             int _type = T__101;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:99:8: ( 'throw' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:99:10: 'throw'
+            // InternalCheck.g:99:8: ( 'throw' )
+            // InternalCheck.g:99:10: 'throw'
             {
             match("throw"); 
 
@@ -1984,8 +1984,8 @@ public final void mT__102() throws RecognitionException {
         try {
             int _type = T__102;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:100:8: ( 'return' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:100:10: 'return'
+            // InternalCheck.g:100:8: ( 'return' )
+            // InternalCheck.g:100:10: 'return'
             {
             match("return"); 
 
@@ -2005,8 +2005,8 @@ public final void mT__103() throws RecognitionException {
         try {
             int _type = T__103;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:101:8: ( 'try' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:101:10: 'try'
+            // InternalCheck.g:101:8: ( 'try' )
+            // InternalCheck.g:101:10: 'try'
             {
             match("try"); 
 
@@ -2026,8 +2026,8 @@ public final void mT__104() throws RecognitionException {
         try {
             int _type = T__104;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:102:8: ( 'finally' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:102:10: 'finally'
+            // InternalCheck.g:102:8: ( 'finally' )
+            // InternalCheck.g:102:10: 'finally'
             {
             match("finally"); 
 
@@ -2047,8 +2047,8 @@ public final void mT__105() throws RecognitionException {
         try {
             int _type = T__105;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:103:8: ( 'synchronized' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:103:10: 'synchronized'
+            // InternalCheck.g:103:8: ( 'synchronized' )
+            // InternalCheck.g:103:10: 'synchronized'
             {
             match("synchronized"); 
 
@@ -2068,8 +2068,8 @@ public final void mT__106() throws RecognitionException {
         try {
             int _type = T__106;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:104:8: ( 'catch' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:104:10: 'catch'
+            // InternalCheck.g:104:8: ( 'catch' )
+            // InternalCheck.g:104:10: 'catch'
             {
             match("catch"); 
 
@@ -2089,8 +2089,8 @@ public final void mT__107() throws RecognitionException {
         try {
             int _type = T__107;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:105:8: ( '?' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:105:10: '?'
+            // InternalCheck.g:105:8: ( '?' )
+            // InternalCheck.g:105:10: '?'
             {
             match('?'); 
 
@@ -2109,8 +2109,8 @@ public final void mT__108() throws RecognitionException {
         try {
             int _type = T__108;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:106:8: ( '&' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:106:10: '&'
+            // InternalCheck.g:106:8: ( '&' )
+            // InternalCheck.g:106:10: '&'
             {
             match('&'); 
 
@@ -2129,10 +2129,10 @@ public final void mRULE_HEX() throws RecognitionException {
         try {
             int _type = RULE_HEX;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8175:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )? )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8175:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
+            // InternalCheck.g:8175:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )? )
+            // InternalCheck.g:8175:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8175:12: ( '0x' | '0X' )
+            // InternalCheck.g:8175:12: ( '0x' | '0X' )
             int alt1=2;
             int LA1_0 = input.LA(1);
 
@@ -2160,7 +2160,7 @@ else if ( (LA1_1=='X') ) {
             }
             switch (alt1) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8175:13: '0x'
+                    // InternalCheck.g:8175:13: '0x'
                     {
                     match("0x"); 
 
@@ -2168,7 +2168,7 @@ else if ( (LA1_1=='X') ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8175:18: '0X'
+                    // InternalCheck.g:8175:18: '0X'
                     {
                     match("0X"); 
 
@@ -2178,7 +2178,7 @@ else if ( (LA1_1=='X') ) {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8175:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+
+            // InternalCheck.g:8175:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+
             int cnt2=0;
             loop2:
             do {
@@ -2192,7 +2192,7 @@ else if ( (LA1_1=='X') ) {
 
                 switch (alt2) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:
+            	    // InternalCheck.g:
             	    {
             	    if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='F')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='f') ) {
             	        input.consume();
@@ -2216,7 +2216,7 @@ else if ( (LA1_1=='X') ) {
                 cnt2++;
             } while (true);
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8175:58: ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
+            // InternalCheck.g:8175:58: ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
             int alt4=2;
             int LA4_0 = input.LA(1);
 
@@ -2225,10 +2225,10 @@ else if ( (LA1_1=='X') ) {
             }
             switch (alt4) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8175:59: '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
+                    // InternalCheck.g:8175:59: '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
                     {
                     match('#'); 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8175:63: ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
+                    // InternalCheck.g:8175:63: ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
                     int alt3=2;
                     int LA3_0 = input.LA(1);
 
@@ -2246,7 +2246,7 @@ else if ( (LA3_0=='L'||LA3_0=='l') ) {
                     }
                     switch (alt3) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8175:64: ( 'b' | 'B' ) ( 'i' | 'I' )
+                            // InternalCheck.g:8175:64: ( 'b' | 'B' ) ( 'i' | 'I' )
                             {
                             if ( input.LA(1)=='B'||input.LA(1)=='b' ) {
                                 input.consume();
@@ -2270,7 +2270,7 @@ else if ( (LA3_0=='L'||LA3_0=='l') ) {
                             }
                             break;
                         case 2 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8175:84: ( 'l' | 'L' )
+                            // InternalCheck.g:8175:84: ( 'l' | 'L' )
                             {
                             if ( input.LA(1)=='L'||input.LA(1)=='l' ) {
                                 input.consume();
@@ -2309,11 +2309,11 @@ public final void mRULE_INT() throws RecognitionException {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8177:10: ( '0' .. '9' ( '0' .. '9' | '_' )* )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8177:12: '0' .. '9' ( '0' .. '9' | '_' )*
+            // InternalCheck.g:8177:10: ( '0' .. '9' ( '0' .. '9' | '_' )* )
+            // InternalCheck.g:8177:12: '0' .. '9' ( '0' .. '9' | '_' )*
             {
             matchRange('0','9'); 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8177:21: ( '0' .. '9' | '_' )*
+            // InternalCheck.g:8177:21: ( '0' .. '9' | '_' )*
             loop5:
             do {
                 int alt5=2;
@@ -2326,7 +2326,7 @@ public final void mRULE_INT() throws RecognitionException {
 
                 switch (alt5) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:
+            	    // InternalCheck.g:
             	    {
             	    if ( (input.LA(1)>='0' && input.LA(1)<='9')||input.LA(1)=='_' ) {
             	        input.consume();
@@ -2362,11 +2362,11 @@ public final void mRULE_DECIMAL() throws RecognitionException {
         try {
             int _type = RULE_DECIMAL;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8179:14: ( RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )? )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8179:16: RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
+            // InternalCheck.g:8179:14: ( RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )? )
+            // InternalCheck.g:8179:16: RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
             {
             mRULE_INT(); 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8179:25: ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )?
+            // InternalCheck.g:8179:25: ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )?
             int alt7=2;
             int LA7_0 = input.LA(1);
 
@@ -2375,7 +2375,7 @@ public final void mRULE_DECIMAL() throws RecognitionException {
             }
             switch (alt7) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8179:26: ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT
+                    // InternalCheck.g:8179:26: ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT
                     {
                     if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
                         input.consume();
@@ -2386,7 +2386,7 @@ public final void mRULE_DECIMAL() throws RecognitionException {
                         recover(mse);
                         throw mse;}
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8179:36: ( '+' | '-' )?
+                    // InternalCheck.g:8179:36: ( '+' | '-' )?
                     int alt6=2;
                     int LA6_0 = input.LA(1);
 
@@ -2395,7 +2395,7 @@ public final void mRULE_DECIMAL() throws RecognitionException {
                     }
                     switch (alt6) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:
+                            // InternalCheck.g:
                             {
                             if ( input.LA(1)=='+'||input.LA(1)=='-' ) {
                                 input.consume();
@@ -2419,7 +2419,7 @@ public final void mRULE_DECIMAL() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8179:58: ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
+            // InternalCheck.g:8179:58: ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
             int alt8=3;
             int LA8_0 = input.LA(1);
 
@@ -2431,7 +2431,7 @@ else if ( (LA8_0=='D'||LA8_0=='F'||LA8_0=='L'||LA8_0=='d'||LA8_0=='f'||LA8_0=='l
             }
             switch (alt8) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8179:59: ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' )
+                    // InternalCheck.g:8179:59: ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' )
                     {
                     if ( input.LA(1)=='B'||input.LA(1)=='b' ) {
                         input.consume();
@@ -2455,7 +2455,7 @@ else if ( (LA8_0=='D'||LA8_0=='F'||LA8_0=='L'||LA8_0=='d'||LA8_0=='f'||LA8_0=='l
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8179:87: ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' )
+                    // InternalCheck.g:8179:87: ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' )
                     {
                     if ( input.LA(1)=='D'||input.LA(1)=='F'||input.LA(1)=='L'||input.LA(1)=='d'||input.LA(1)=='f'||input.LA(1)=='l' ) {
                         input.consume();
@@ -2488,10 +2488,10 @@ public final void mRULE_ID() throws RecognitionException {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8181:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )* )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8181:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
+            // InternalCheck.g:8181:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )* )
+            // InternalCheck.g:8181:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8181:11: ( '^' )?
+            // InternalCheck.g:8181:11: ( '^' )?
             int alt9=2;
             int LA9_0 = input.LA(1);
 
@@ -2500,7 +2500,7 @@ public final void mRULE_ID() throws RecognitionException {
             }
             switch (alt9) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8181:11: '^'
+                    // InternalCheck.g:8181:11: '^'
                     {
                     match('^'); 
 
@@ -2518,7 +2518,7 @@ public final void mRULE_ID() throws RecognitionException {
                 recover(mse);
                 throw mse;}
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8181:44: ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
+            // InternalCheck.g:8181:44: ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
             loop10:
             do {
                 int alt10=2;
@@ -2531,7 +2531,7 @@ public final void mRULE_ID() throws RecognitionException {
 
                 switch (alt10) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:
+            	    // InternalCheck.g:
             	    {
             	    if ( input.LA(1)=='$'||(input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
             	        input.consume();
@@ -2567,10 +2567,10 @@ public final void mRULE_STRING() throws RecognitionException {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8183:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8183:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
+            // InternalCheck.g:8183:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? ) )
+            // InternalCheck.g:8183:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8183:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
+            // InternalCheck.g:8183:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
             int alt15=2;
             int LA15_0 = input.LA(1);
 
@@ -2588,10 +2588,10 @@ else if ( (LA15_0=='\'') ) {
             }
             switch (alt15) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8183:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )?
+                    // InternalCheck.g:8183:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )?
                     {
                     match('\"'); 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8183:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // InternalCheck.g:8183:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop11:
                     do {
                         int alt11=3;
@@ -2607,7 +2607,7 @@ else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA1
 
                         switch (alt11) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8183:21: '\\\\' .
+                    	    // InternalCheck.g:8183:21: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -2615,7 +2615,7 @@ else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA1
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8183:28: ~ ( ( '\\\\' | '\"' ) )
+                    	    // InternalCheck.g:8183:28: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -2635,7 +2635,7 @@ else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA1
                         }
                     } while (true);
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8183:44: ( '\"' )?
+                    // InternalCheck.g:8183:44: ( '\"' )?
                     int alt12=2;
                     int LA12_0 = input.LA(1);
 
@@ -2644,7 +2644,7 @@ else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA1
                     }
                     switch (alt12) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8183:44: '\"'
+                            // InternalCheck.g:8183:44: '\"'
                             {
                             match('\"'); 
 
@@ -2657,10 +2657,10 @@ else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA1
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8183:49: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )?
+                    // InternalCheck.g:8183:49: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )?
                     {
                     match('\''); 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8183:54: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // InternalCheck.g:8183:54: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop13:
                     do {
                         int alt13=3;
@@ -2676,7 +2676,7 @@ else if ( ((LA13_0>='\u0000' && LA13_0<='&')||(LA13_0>='(' && LA13_0<='[')||(LA1
 
                         switch (alt13) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8183:55: '\\\\' .
+                    	    // InternalCheck.g:8183:55: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -2684,7 +2684,7 @@ else if ( ((LA13_0>='\u0000' && LA13_0<='&')||(LA13_0>='(' && LA13_0<='[')||(LA1
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8183:62: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // InternalCheck.g:8183:62: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -2704,7 +2704,7 @@ else if ( ((LA13_0>='\u0000' && LA13_0<='&')||(LA13_0>='(' && LA13_0<='[')||(LA1
                         }
                     } while (true);
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8183:79: ( '\\'' )?
+                    // InternalCheck.g:8183:79: ( '\\'' )?
                     int alt14=2;
                     int LA14_0 = input.LA(1);
 
@@ -2713,7 +2713,7 @@ else if ( ((LA13_0>='\u0000' && LA13_0<='&')||(LA13_0>='(' && LA13_0<='[')||(LA1
                     }
                     switch (alt14) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8183:79: '\\''
+                            // InternalCheck.g:8183:79: '\\''
                             {
                             match('\''); 
 
@@ -2744,12 +2744,12 @@ public final void mRULE_ML_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8185:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8185:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalCheck.g:8185:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalCheck.g:8185:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8185:24: ( options {greedy=false; } : . )*
+            // InternalCheck.g:8185:24: ( options {greedy=false; } : . )*
             loop16:
             do {
                 int alt16=2;
@@ -2774,7 +2774,7 @@ else if ( ((LA16_0>='\u0000' && LA16_0<=')')||(LA16_0>='+' && LA16_0<='\uFFFF'))
 
                 switch (alt16) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8185:52: .
+            	    // InternalCheck.g:8185:52: .
             	    {
             	    matchAny(); 
 
@@ -2804,12 +2804,12 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8187:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8187:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalCheck.g:8187:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalCheck.g:8187:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8187:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // InternalCheck.g:8187:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop17:
             do {
                 int alt17=2;
@@ -2822,7 +2822,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
 
                 switch (alt17) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8187:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // InternalCheck.g:8187:24: ~ ( ( '\\n' | '\\r' ) )
             	    {
             	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
             	        input.consume();
@@ -2842,7 +2842,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
                 }
             } while (true);
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8187:40: ( ( '\\r' )? '\\n' )?
+            // InternalCheck.g:8187:40: ( ( '\\r' )? '\\n' )?
             int alt19=2;
             int LA19_0 = input.LA(1);
 
@@ -2851,9 +2851,9 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
             }
             switch (alt19) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8187:41: ( '\\r' )? '\\n'
+                    // InternalCheck.g:8187:41: ( '\\r' )? '\\n'
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8187:41: ( '\\r' )?
+                    // InternalCheck.g:8187:41: ( '\\r' )?
                     int alt18=2;
                     int LA18_0 = input.LA(1);
 
@@ -2862,7 +2862,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
                     }
                     switch (alt18) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8187:41: '\\r'
+                            // InternalCheck.g:8187:41: '\\r'
                             {
                             match('\r'); 
 
@@ -2894,10 +2894,10 @@ public final void mRULE_WS() throws RecognitionException {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8189:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8189:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalCheck.g:8189:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalCheck.g:8189:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8189:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalCheck.g:8189:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt20=0;
             loop20:
             do {
@@ -2911,7 +2911,7 @@ public final void mRULE_WS() throws RecognitionException {
 
                 switch (alt20) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:
+            	    // InternalCheck.g:
             	    {
             	    if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
             	        input.consume();
@@ -2951,8 +2951,8 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8191:16: ( . )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8191:18: .
+            // InternalCheck.g:8191:16: ( . )
+            // InternalCheck.g:8191:18: .
             {
             matchAny(); 
 
@@ -2967,740 +2967,740 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:8: ( T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | T__97 | T__98 | T__99 | T__100 | T__101 | T__102 | T__103 | T__104 | T__105 | T__106 | T__107 | T__108 | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        // InternalCheck.g:1:8: ( T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | T__97 | T__98 | T__99 | T__100 | T__101 | T__102 | T__103 | T__104 | T__105 | T__106 | T__107 | T__108 | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
         int alt21=105;
         alt21 = dfa21.predict(input);
         switch (alt21) {
             case 1 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:10: T__13
+                // InternalCheck.g:1:10: T__13
                 {
                 mT__13(); 
 
                 }
                 break;
             case 2 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:16: T__14
+                // InternalCheck.g:1:16: T__14
                 {
                 mT__14(); 
 
                 }
                 break;
             case 3 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:22: T__15
+                // InternalCheck.g:1:22: T__15
                 {
                 mT__15(); 
 
                 }
                 break;
             case 4 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:28: T__16
+                // InternalCheck.g:1:28: T__16
                 {
                 mT__16(); 
 
                 }
                 break;
             case 5 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:34: T__17
+                // InternalCheck.g:1:34: T__17
                 {
                 mT__17(); 
 
                 }
                 break;
             case 6 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:40: T__18
+                // InternalCheck.g:1:40: T__18
                 {
                 mT__18(); 
 
                 }
                 break;
             case 7 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:46: T__19
+                // InternalCheck.g:1:46: T__19
                 {
                 mT__19(); 
 
                 }
                 break;
             case 8 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:52: T__20
+                // InternalCheck.g:1:52: T__20
                 {
                 mT__20(); 
 
                 }
                 break;
             case 9 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:58: T__21
+                // InternalCheck.g:1:58: T__21
                 {
                 mT__21(); 
 
                 }
                 break;
             case 10 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:64: T__22
+                // InternalCheck.g:1:64: T__22
                 {
                 mT__22(); 
 
                 }
                 break;
             case 11 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:70: T__23
+                // InternalCheck.g:1:70: T__23
                 {
                 mT__23(); 
 
                 }
                 break;
             case 12 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:76: T__24
+                // InternalCheck.g:1:76: T__24
                 {
                 mT__24(); 
 
                 }
                 break;
             case 13 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:82: T__25
+                // InternalCheck.g:1:82: T__25
                 {
                 mT__25(); 
 
                 }
                 break;
             case 14 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:88: T__26
+                // InternalCheck.g:1:88: T__26
                 {
                 mT__26(); 
 
                 }
                 break;
             case 15 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:94: T__27
+                // InternalCheck.g:1:94: T__27
                 {
                 mT__27(); 
 
                 }
                 break;
             case 16 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:100: T__28
+                // InternalCheck.g:1:100: T__28
                 {
                 mT__28(); 
 
                 }
                 break;
             case 17 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:106: T__29
+                // InternalCheck.g:1:106: T__29
                 {
                 mT__29(); 
 
                 }
                 break;
             case 18 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:112: T__30
+                // InternalCheck.g:1:112: T__30
                 {
                 mT__30(); 
 
                 }
                 break;
             case 19 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:118: T__31
+                // InternalCheck.g:1:118: T__31
                 {
                 mT__31(); 
 
                 }
                 break;
             case 20 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:124: T__32
+                // InternalCheck.g:1:124: T__32
                 {
                 mT__32(); 
 
                 }
                 break;
             case 21 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:130: T__33
+                // InternalCheck.g:1:130: T__33
                 {
                 mT__33(); 
 
                 }
                 break;
             case 22 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:136: T__34
+                // InternalCheck.g:1:136: T__34
                 {
                 mT__34(); 
 
                 }
                 break;
             case 23 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:142: T__35
+                // InternalCheck.g:1:142: T__35
                 {
                 mT__35(); 
 
                 }
                 break;
             case 24 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:148: T__36
+                // InternalCheck.g:1:148: T__36
                 {
                 mT__36(); 
 
                 }
                 break;
             case 25 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:154: T__37
+                // InternalCheck.g:1:154: T__37
                 {
                 mT__37(); 
 
                 }
                 break;
             case 26 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:160: T__38
+                // InternalCheck.g:1:160: T__38
                 {
                 mT__38(); 
 
                 }
                 break;
             case 27 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:166: T__39
+                // InternalCheck.g:1:166: T__39
                 {
                 mT__39(); 
 
                 }
                 break;
             case 28 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:172: T__40
+                // InternalCheck.g:1:172: T__40
                 {
                 mT__40(); 
 
                 }
                 break;
             case 29 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:178: T__41
+                // InternalCheck.g:1:178: T__41
                 {
                 mT__41(); 
 
                 }
                 break;
             case 30 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:184: T__42
+                // InternalCheck.g:1:184: T__42
                 {
                 mT__42(); 
 
                 }
                 break;
             case 31 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:190: T__43
+                // InternalCheck.g:1:190: T__43
                 {
                 mT__43(); 
 
                 }
                 break;
             case 32 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:196: T__44
+                // InternalCheck.g:1:196: T__44
                 {
                 mT__44(); 
 
                 }
                 break;
             case 33 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:202: T__45
+                // InternalCheck.g:1:202: T__45
                 {
                 mT__45(); 
 
                 }
                 break;
             case 34 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:208: T__46
+                // InternalCheck.g:1:208: T__46
                 {
                 mT__46(); 
 
                 }
                 break;
             case 35 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:214: T__47
+                // InternalCheck.g:1:214: T__47
                 {
                 mT__47(); 
 
                 }
                 break;
             case 36 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:220: T__48
+                // InternalCheck.g:1:220: T__48
                 {
                 mT__48(); 
 
                 }
                 break;
             case 37 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:226: T__49
+                // InternalCheck.g:1:226: T__49
                 {
                 mT__49(); 
 
                 }
                 break;
             case 38 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:232: T__50
+                // InternalCheck.g:1:232: T__50
                 {
                 mT__50(); 
 
                 }
                 break;
             case 39 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:238: T__51
+                // InternalCheck.g:1:238: T__51
                 {
                 mT__51(); 
 
                 }
                 break;
             case 40 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:244: T__52
+                // InternalCheck.g:1:244: T__52
                 {
                 mT__52(); 
 
                 }
                 break;
             case 41 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:250: T__53
+                // InternalCheck.g:1:250: T__53
                 {
                 mT__53(); 
 
                 }
                 break;
             case 42 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:256: T__54
+                // InternalCheck.g:1:256: T__54
                 {
                 mT__54(); 
 
                 }
                 break;
             case 43 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:262: T__55
+                // InternalCheck.g:1:262: T__55
                 {
                 mT__55(); 
 
                 }
                 break;
             case 44 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:268: T__56
+                // InternalCheck.g:1:268: T__56
                 {
                 mT__56(); 
 
                 }
                 break;
             case 45 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:274: T__57
+                // InternalCheck.g:1:274: T__57
                 {
                 mT__57(); 
 
                 }
                 break;
             case 46 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:280: T__58
+                // InternalCheck.g:1:280: T__58
                 {
                 mT__58(); 
 
                 }
                 break;
             case 47 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:286: T__59
+                // InternalCheck.g:1:286: T__59
                 {
                 mT__59(); 
 
                 }
                 break;
             case 48 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:292: T__60
+                // InternalCheck.g:1:292: T__60
                 {
                 mT__60(); 
 
                 }
                 break;
             case 49 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:298: T__61
+                // InternalCheck.g:1:298: T__61
                 {
                 mT__61(); 
 
                 }
                 break;
             case 50 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:304: T__62
+                // InternalCheck.g:1:304: T__62
                 {
                 mT__62(); 
 
                 }
                 break;
             case 51 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:310: T__63
+                // InternalCheck.g:1:310: T__63
                 {
                 mT__63(); 
 
                 }
                 break;
             case 52 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:316: T__64
+                // InternalCheck.g:1:316: T__64
                 {
                 mT__64(); 
 
                 }
                 break;
             case 53 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:322: T__65
+                // InternalCheck.g:1:322: T__65
                 {
                 mT__65(); 
 
                 }
                 break;
             case 54 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:328: T__66
+                // InternalCheck.g:1:328: T__66
                 {
                 mT__66(); 
 
                 }
                 break;
             case 55 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:334: T__67
+                // InternalCheck.g:1:334: T__67
                 {
                 mT__67(); 
 
                 }
                 break;
             case 56 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:340: T__68
+                // InternalCheck.g:1:340: T__68
                 {
                 mT__68(); 
 
                 }
                 break;
             case 57 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:346: T__69
+                // InternalCheck.g:1:346: T__69
                 {
                 mT__69(); 
 
                 }
                 break;
             case 58 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:352: T__70
+                // InternalCheck.g:1:352: T__70
                 {
                 mT__70(); 
 
                 }
                 break;
             case 59 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:358: T__71
+                // InternalCheck.g:1:358: T__71
                 {
                 mT__71(); 
 
                 }
                 break;
             case 60 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:364: T__72
+                // InternalCheck.g:1:364: T__72
                 {
                 mT__72(); 
 
                 }
                 break;
             case 61 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:370: T__73
+                // InternalCheck.g:1:370: T__73
                 {
                 mT__73(); 
 
                 }
                 break;
             case 62 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:376: T__74
+                // InternalCheck.g:1:376: T__74
                 {
                 mT__74(); 
 
                 }
                 break;
             case 63 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:382: T__75
+                // InternalCheck.g:1:382: T__75
                 {
                 mT__75(); 
 
                 }
                 break;
             case 64 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:388: T__76
+                // InternalCheck.g:1:388: T__76
                 {
                 mT__76(); 
 
                 }
                 break;
             case 65 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:394: T__77
+                // InternalCheck.g:1:394: T__77
                 {
                 mT__77(); 
 
                 }
                 break;
             case 66 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:400: T__78
+                // InternalCheck.g:1:400: T__78
                 {
                 mT__78(); 
 
                 }
                 break;
             case 67 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:406: T__79
+                // InternalCheck.g:1:406: T__79
                 {
                 mT__79(); 
 
                 }
                 break;
             case 68 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:412: T__80
+                // InternalCheck.g:1:412: T__80
                 {
                 mT__80(); 
 
                 }
                 break;
             case 69 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:418: T__81
+                // InternalCheck.g:1:418: T__81
                 {
                 mT__81(); 
 
                 }
                 break;
             case 70 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:424: T__82
+                // InternalCheck.g:1:424: T__82
                 {
                 mT__82(); 
 
                 }
                 break;
             case 71 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:430: T__83
+                // InternalCheck.g:1:430: T__83
                 {
                 mT__83(); 
 
                 }
                 break;
             case 72 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:436: T__84
+                // InternalCheck.g:1:436: T__84
                 {
                 mT__84(); 
 
                 }
                 break;
             case 73 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:442: T__85
+                // InternalCheck.g:1:442: T__85
                 {
                 mT__85(); 
 
                 }
                 break;
             case 74 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:448: T__86
+                // InternalCheck.g:1:448: T__86
                 {
                 mT__86(); 
 
                 }
                 break;
             case 75 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:454: T__87
+                // InternalCheck.g:1:454: T__87
                 {
                 mT__87(); 
 
                 }
                 break;
             case 76 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:460: T__88
+                // InternalCheck.g:1:460: T__88
                 {
                 mT__88(); 
 
                 }
                 break;
             case 77 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:466: T__89
+                // InternalCheck.g:1:466: T__89
                 {
                 mT__89(); 
 
                 }
                 break;
             case 78 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:472: T__90
+                // InternalCheck.g:1:472: T__90
                 {
                 mT__90(); 
 
                 }
                 break;
             case 79 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:478: T__91
+                // InternalCheck.g:1:478: T__91
                 {
                 mT__91(); 
 
                 }
                 break;
             case 80 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:484: T__92
+                // InternalCheck.g:1:484: T__92
                 {
                 mT__92(); 
 
                 }
                 break;
             case 81 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:490: T__93
+                // InternalCheck.g:1:490: T__93
                 {
                 mT__93(); 
 
                 }
                 break;
             case 82 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:496: T__94
+                // InternalCheck.g:1:496: T__94
                 {
                 mT__94(); 
 
                 }
                 break;
             case 83 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:502: T__95
+                // InternalCheck.g:1:502: T__95
                 {
                 mT__95(); 
 
                 }
                 break;
             case 84 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:508: T__96
+                // InternalCheck.g:1:508: T__96
                 {
                 mT__96(); 
 
                 }
                 break;
             case 85 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:514: T__97
+                // InternalCheck.g:1:514: T__97
                 {
                 mT__97(); 
 
                 }
                 break;
             case 86 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:520: T__98
+                // InternalCheck.g:1:520: T__98
                 {
                 mT__98(); 
 
                 }
                 break;
             case 87 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:526: T__99
+                // InternalCheck.g:1:526: T__99
                 {
                 mT__99(); 
 
                 }
                 break;
             case 88 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:532: T__100
+                // InternalCheck.g:1:532: T__100
                 {
                 mT__100(); 
 
                 }
                 break;
             case 89 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:539: T__101
+                // InternalCheck.g:1:539: T__101
                 {
                 mT__101(); 
 
                 }
                 break;
             case 90 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:546: T__102
+                // InternalCheck.g:1:546: T__102
                 {
                 mT__102(); 
 
                 }
                 break;
             case 91 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:553: T__103
+                // InternalCheck.g:1:553: T__103
                 {
                 mT__103(); 
 
                 }
                 break;
             case 92 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:560: T__104
+                // InternalCheck.g:1:560: T__104
                 {
                 mT__104(); 
 
                 }
                 break;
             case 93 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:567: T__105
+                // InternalCheck.g:1:567: T__105
                 {
                 mT__105(); 
 
                 }
                 break;
             case 94 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:574: T__106
+                // InternalCheck.g:1:574: T__106
                 {
                 mT__106(); 
 
                 }
                 break;
             case 95 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:581: T__107
+                // InternalCheck.g:1:581: T__107
                 {
                 mT__107(); 
 
                 }
                 break;
             case 96 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:588: T__108
+                // InternalCheck.g:1:588: T__108
                 {
                 mT__108(); 
 
                 }
                 break;
             case 97 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:595: RULE_HEX
+                // InternalCheck.g:1:595: RULE_HEX
                 {
                 mRULE_HEX(); 
 
                 }
                 break;
             case 98 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:604: RULE_INT
+                // InternalCheck.g:1:604: RULE_INT
                 {
                 mRULE_INT(); 
 
                 }
                 break;
             case 99 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:613: RULE_DECIMAL
+                // InternalCheck.g:1:613: RULE_DECIMAL
                 {
                 mRULE_DECIMAL(); 
 
                 }
                 break;
             case 100 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:626: RULE_ID
+                // InternalCheck.g:1:626: RULE_ID
                 {
                 mRULE_ID(); 
 
                 }
                 break;
             case 101 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:634: RULE_STRING
+                // InternalCheck.g:1:634: RULE_STRING
                 {
                 mRULE_STRING(); 
 
                 }
                 break;
             case 102 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:646: RULE_ML_COMMENT
+                // InternalCheck.g:1:646: RULE_ML_COMMENT
                 {
                 mRULE_ML_COMMENT(); 
 
                 }
                 break;
             case 103 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:662: RULE_SL_COMMENT
+                // InternalCheck.g:1:662: RULE_SL_COMMENT
                 {
                 mRULE_SL_COMMENT(); 
 
                 }
                 break;
             case 104 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:678: RULE_WS
+                // InternalCheck.g:1:678: RULE_WS
                 {
                 mRULE_WS(); 
 
                 }
                 break;
             case 105 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1:686: RULE_ANY_OTHER
+                // InternalCheck.g:1:686: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -3714,111 +3714,19 @@ public void mTokens() throws RecognitionException {
 
     protected DFA21 dfa21 = new DFA21(this);
     static final String DFA21_eotS =
-        "\1\uffff\4\65\2\uffff\1\65\4\uffff\1\65\1\uffff\1\65\1\113\1\65"+
-        "\1\121\3\uffff\6\65\1\144\1\150\1\153\1\157\1\161\1\163\1\165\1"+
-        "\167\1\171\1\173\1\176\1\65\1\u0081\4\65\2\u008b\1\63\5\uffff\1"+
-        "\65\1\uffff\6\65\2\uffff\4\65\1\u009c\4\uffff\1\65\1\uffff\1\65"+
-        "\1\u00a0\1\uffff\2\65\1\u00a3\1\u00a5\5\uffff\1\u00a8\14\65\30\uffff"+
-        "\1\u00b6\4\uffff\1\u00b7\2\uffff\7\65\1\uffff\1\u008b\4\uffff\2"+
-        "\65\1\u00c3\12\65\1\uffff\2\65\2\uffff\1\u00d3\1\65\3\uffff\2\65"+
-        "\1\uffff\14\65\3\uffff\1\u00e3\1\u00e4\1\u00e5\2\65\1\u00e8\5\65"+
-        "\1\uffff\4\65\1\u00f2\4\65\1\u00f7\5\65\1\uffff\1\u00fd\2\65\1\u0100"+
-        "\2\65\1\u0103\4\65\1\u0108\2\65\1\u010b\3\uffff\1\u010c\1\u010d"+
-        "\1\uffff\4\65\1\u0113\1\u0114\2\65\1\u0117\1\uffff\1\65\1\u0119"+
-        "\1\65\1\u011b\1\uffff\5\65\1\uffff\2\65\1\uffff\1\65\1\u0125\1\uffff"+
-        "\2\65\1\u0128\1\65\1\uffff\1\65\1\u012b\3\uffff\1\65\1\u012d\3\65"+
-        "\2\uffff\2\65\1\uffff\1\65\1\uffff\1\u0134\1\uffff\1\65\1\u0136"+
-        "\3\65\1\u013a\3\65\1\uffff\1\u013e\1\u013f\1\uffff\2\65\1\uffff"+
-        "\1\u0142\1\uffff\1\u0143\1\u0144\1\u0145\1\u0146\1\65\1\u0148\1"+
-        "\uffff\1\65\1\uffff\1\u014a\1\65\1\u014c\1\uffff\1\65\1\u014e\1"+
-        "\65\2\uffff\1\65\1\u0151\5\uffff\1\u0152\1\uffff\1\65\1\uffff\1"+
-        "\65\1\uffff\1\u0155\1\uffff\2\65\2\uffff\2\65\1\uffff\1\u015a\1"+
-        "\65\1\u015c\1\65\1\uffff\1\65\1\uffff\3\65\1\u0162\1\u0163\2\uffff";
+        "\1\uffff\4\65\2\uffff\1\65\4\uffff\1\65\1\uffff\1\65\1\113\1\65\1\121\3\uffff\6\65\1\144\1\150\1\153\1\157\1\161\1\163\1\165\1\167\1\171\1\173\1\176\1\65\1\u0081\4\65\2\u008b\1\63\5\uffff\1\65\1\uffff\6\65\2\uffff\4\65\1\u009c\4\uffff\1\65\1\uffff\1\65\1\u00a0\1\uffff\2\65\1\u00a3\1\u00a5\5\uffff\1\u00a8\14\65\30\uffff\1\u00b6\4\uffff\1\u00b7\2\uffff\7\65\1\uffff\1\u008b\4\uffff\2\65\1\u00c3\12\65\1\uffff\2\65\2\uffff\1\u00d3\1\65\3\uffff\2\65\1\uffff\14\65\3\uffff\1\u00e3\1\u00e4\1\u00e5\2\65\1\u00e8\5\65\1\uffff\4\65\1\u00f2\4\65\1\u00f7\5\65\1\uffff\1\u00fd\2\65\1\u0100\2\65\1\u0103\4\65\1\u0108\2\65\1\u010b\3\uffff\1\u010c\1\u010d\1\uffff\4\65\1\u0113\1\u0114\2\65\1\u0117\1\uffff\1\65\1\u0119\1\65\1\u011b\1\uffff\5\65\1\uffff\2\65\1\uffff\1\65\1\u0125\1\uffff\2\65\1\u0128\1\65\1\uffff\1\65\1\u012b\3\uffff\1\65\1\u012d\3\65\2\uffff\2\65\1\uffff\1\65\1\uffff\1\u0134\1\uffff\1\65\1\u0136\3\65\1\u013a\3\65\1\uffff\1\u013e\1\u013f\1\uffff\2\65\1\uffff\1\u0142\1\uffff\1\u0143\1\u0144\1\u0145\1\u0146\1\65\1\u0148\1\uffff\1\65\1\uffff\1\u014a\1\65\1\u014c\1\uffff\1\65\1\u014e\1\65\2\uffff\1\65\1\u0151\5\uffff\1\u0152\1\uffff\1\65\1\uffff\1\65\1\uffff\1\u0155\1\uffff\2\65\2\uffff\2\65\1\uffff\1\u015a\1\65\1\u015c\1\65\1\uffff\1\65\1\uffff\3\65\1\u0162\1\u0163\2\uffff";
     static final String DFA21_eofS =
         "\u0164\uffff";
     static final String DFA21_minS =
-        "\1\0\3\141\1\162\2\uffff\1\146\4\uffff\1\145\1\uffff\1\145\1\56"+
-        "\1\141\1\75\3\uffff\1\156\1\151\1\154\1\164\1\141\1\151\1\53\1\55"+
-        "\2\52\1\75\1\76\1\75\1\174\1\46\1\75\1\56\1\163\1\72\1\141\1\145"+
-        "\1\150\1\145\2\60\1\44\5\uffff\1\143\1\uffff\1\156\1\162\1\154\1"+
-        "\163\2\141\2\uffff\1\160\1\163\1\146\1\156\1\44\4\uffff\1\163\1"+
-        "\uffff\1\166\1\74\1\uffff\1\146\1\164\1\44\1\75\5\uffff\1\44\1\156"+
-        "\1\164\1\162\1\163\1\141\1\151\1\160\1\156\1\164\1\162\1\151\1\166"+
-        "\30\uffff\1\75\4\uffff\1\44\2\uffff\1\154\1\167\1\154\1\165\1\160"+
-        "\1\162\1\164\1\uffff\1\60\4\uffff\1\153\1\141\1\44\1\163\1\141\1"+
-        "\145\1\155\1\162\1\157\1\165\1\157\1\164\1\157\1\uffff\1\163\1\145"+
-        "\2\uffff\1\44\1\141\3\uffff\1\141\1\145\1\uffff\1\144\1\145\1\157"+
-        "\1\145\2\164\1\145\1\143\1\150\1\156\1\154\1\145\3\uffff\3\44\1"+
-        "\154\1\145\1\44\1\145\1\157\1\165\1\141\1\154\1\uffff\1\145\1\154"+
-        "\1\147\1\150\1\44\1\155\1\144\1\162\1\145\1\44\1\141\1\162\1\141"+
-        "\1\162\1\165\1\uffff\1\44\1\166\1\155\1\44\1\156\1\162\1\44\1\151"+
-        "\1\143\1\162\1\150\1\44\1\151\1\145\1\44\3\uffff\2\44\1\uffff\1"+
-        "\157\1\167\1\162\1\147\2\44\2\157\1\44\1\uffff\1\141\1\44\1\164"+
-        "\1\44\1\uffff\1\156\1\145\1\147\1\151\1\154\1\uffff\1\145\1\141"+
-        "\1\uffff\1\144\1\44\1\uffff\1\143\1\150\1\44\1\162\1\uffff\1\156"+
-        "\1\44\3\uffff\1\146\1\44\1\156\1\145\1\171\2\uffff\1\147\1\162\1"+
-        "\uffff\1\162\1\uffff\1\44\1\uffff\1\143\1\44\1\145\2\164\1\44\1"+
-        "\156\1\163\1\151\1\uffff\2\44\1\uffff\1\157\1\147\1\uffff\1\44\1"+
-        "\uffff\4\44\1\171\1\44\1\uffff\1\145\1\uffff\1\44\1\171\1\44\1\uffff"+
-        "\1\144\1\44\1\157\2\uffff\1\156\1\44\5\uffff\1\44\1\uffff\1\157"+
-        "\1\uffff\1\122\1\uffff\1\44\1\uffff\1\156\1\151\2\uffff\1\146\1"+
-        "\141\1\uffff\1\44\1\172\1\44\1\156\1\uffff\1\145\1\uffff\1\147\1"+
-        "\144\1\145\2\44\2\uffff";
+        "\1\0\3\141\1\162\2\uffff\1\146\4\uffff\1\145\1\uffff\1\145\1\56\1\141\1\75\3\uffff\1\156\1\151\1\154\1\164\1\141\1\151\1\53\1\55\2\52\1\75\1\76\1\75\1\174\1\46\1\75\1\56\1\163\1\72\1\141\1\145\1\150\1\145\2\60\1\44\5\uffff\1\143\1\uffff\1\156\1\162\1\154\1\163\2\141\2\uffff\1\160\1\163\1\146\1\156\1\44\4\uffff\1\163\1\uffff\1\166\1\74\1\uffff\1\146\1\164\1\44\1\75\5\uffff\1\44\1\156\1\164\1\162\1\163\1\141\1\151\1\160\1\156\1\164\1\162\1\151\1\166\30\uffff\1\75\4\uffff\1\44\2\uffff\1\154\1\167\1\154\1\165\1\160\1\162\1\164\1\uffff\1\60\4\uffff\1\153\1\141\1\44\1\163\1\141\1\145\1\155\1\162\1\157\1\165\1\157\1\164\1\157\1\uffff\1\163\1\145\2\uffff\1\44\1\141\3\uffff\1\141\1\145\1\uffff\1\144\1\145\1\157\1\145\2\164\1\145\1\143\1\150\1\156\1\154\1\145\3\uffff\3\44\1\154\1\145\1\44\1\145\1\157\1\165\1\141\1\154\1\uffff\1\145\1\154\1\147\1\150\1\44\1\155\1\144\1\162\1\145\1\44\1\141\1\162\1\141\1\162\1\165\1\uffff\1\44\1\166\1\155\1\44\1\156\1\162\1\44\1\151\1\143\1\162\1\150\1\44\1\151\1\145\1\44\3\uffff\2\44\1\uffff\1\157\1\167\1\162\1\147\2\44\2\157\1\44\1\uffff\1\141\1\44\1\164\1\44\1\uffff\1\156\1\145\1\147\1\151\1\154\1\uffff\1\145\1\141\1\uffff\1\144\1\44\1\uffff\1\143\1\150\1\44\1\162\1\uffff\1\156\1\44\3\uffff\1\146\1\44\1\156\1\145\1\171\2\uffff\1\147\1\162\1\uffff\1\162\1\uffff\1\44\1\uffff\1\143\1\44\1\145\2\164\1\44\1\156\1\163\1\151\1\uffff\2\44\1\uffff\1\157\1\147\1\uffff\1\44\1\uffff\4\44\1\171\1\44\1\uffff\1\145\1\uffff\1\44\1\171\1\44\1\uffff\1\144\1\44\1\157\2\uffff\1\156\1\44\5\uffff\1\44\1\uffff\1\157\1\uffff\1\122\1\uffff\1\44\1\uffff\1\156\1\151\2\uffff\1\146\1\141\1\uffff\1\44\1\172\1\44\1\156\1\uffff\1\145\1\uffff\1\147\1\144\1\145\2\44\2\uffff";
     static final String DFA21_maxS =
-        "\1\uffff\1\141\1\157\1\141\1\165\2\uffff\1\163\4\uffff\1\145\1"+
-        "\uffff\1\145\1\56\1\157\1\76\3\uffff\1\156\1\151\1\170\1\171\2\151"+
-        "\1\75\1\76\3\75\1\76\1\75\1\174\1\46\1\75\1\72\1\163\1\72\1\141"+
-        "\1\165\1\171\1\145\1\170\1\154\1\172\5\uffff\1\143\1\uffff\1\156"+
-        "\1\162\1\154\1\164\2\141\2\uffff\1\160\2\163\1\156\1\172\4\uffff"+
-        "\1\163\1\uffff\1\166\1\74\1\uffff\1\146\1\164\1\172\1\75\5\uffff"+
-        "\1\172\1\156\1\164\1\162\1\163\1\141\1\151\1\160\1\156\1\164\1\162"+
-        "\1\151\1\166\30\uffff\1\75\4\uffff\1\172\2\uffff\1\162\1\167\1\154"+
-        "\1\171\1\160\1\162\1\164\1\uffff\1\154\4\uffff\1\153\1\141\1\172"+
-        "\1\163\2\145\1\155\1\162\1\157\1\165\1\157\1\164\1\157\1\uffff\1"+
-        "\163\1\145\2\uffff\1\172\1\141\3\uffff\1\141\1\145\1\uffff\1\144"+
-        "\1\145\1\157\1\145\2\164\1\145\1\143\1\150\1\156\1\154\1\145\3\uffff"+
-        "\3\172\1\154\1\145\1\172\1\145\1\157\1\165\1\141\1\154\1\uffff\1"+
-        "\145\1\154\1\147\1\150\1\172\1\155\1\144\1\162\1\145\1\172\1\141"+
-        "\1\162\1\141\1\162\1\165\1\uffff\1\172\1\166\1\155\1\172\1\156\1"+
-        "\162\1\172\1\151\1\143\1\162\1\150\1\172\1\151\1\145\1\172\3\uffff"+
-        "\2\172\1\uffff\1\157\1\167\1\162\1\147\2\172\2\157\1\172\1\uffff"+
-        "\1\141\1\172\1\164\1\172\1\uffff\1\156\1\145\1\147\1\151\1\154\1"+
-        "\uffff\1\145\1\141\1\uffff\1\163\1\172\1\uffff\1\143\1\150\1\172"+
-        "\1\162\1\uffff\1\156\1\172\3\uffff\1\146\1\172\1\156\1\145\1\171"+
-        "\2\uffff\1\147\1\162\1\uffff\1\162\1\uffff\1\172\1\uffff\1\143\1"+
-        "\172\1\145\2\164\1\172\1\156\1\163\1\151\1\uffff\2\172\1\uffff\1"+
-        "\157\1\147\1\uffff\1\172\1\uffff\4\172\1\171\1\172\1\uffff\1\145"+
-        "\1\uffff\1\172\1\171\1\172\1\uffff\1\144\1\172\1\157\2\uffff\1\156"+
-        "\1\172\5\uffff\1\172\1\uffff\1\157\1\uffff\1\122\1\uffff\1\172\1"+
-        "\uffff\1\156\1\151\2\uffff\1\146\1\141\1\uffff\3\172\1\156\1\uffff"+
-        "\1\145\1\uffff\1\147\1\144\1\145\2\172\2\uffff";
+        "\1\uffff\1\141\1\157\1\141\1\165\2\uffff\1\163\4\uffff\1\145\1\uffff\1\145\1\56\1\157\1\76\3\uffff\1\156\1\151\1\170\1\171\2\151\1\75\1\76\3\75\1\76\1\75\1\174\1\46\1\75\1\72\1\163\1\72\1\141\1\165\1\171\1\145\1\170\1\154\1\172\5\uffff\1\143\1\uffff\1\156\1\162\1\154\1\164\2\141\2\uffff\1\160\2\163\1\156\1\172\4\uffff\1\163\1\uffff\1\166\1\74\1\uffff\1\146\1\164\1\172\1\75\5\uffff\1\172\1\156\1\164\1\162\1\163\1\141\1\151\1\160\1\156\1\164\1\162\1\151\1\166\30\uffff\1\75\4\uffff\1\172\2\uffff\1\162\1\167\1\154\1\171\1\160\1\162\1\164\1\uffff\1\154\4\uffff\1\153\1\141\1\172\1\163\2\145\1\155\1\162\1\157\1\165\1\157\1\164\1\157\1\uffff\1\163\1\145\2\uffff\1\172\1\141\3\uffff\1\141\1\145\1\uffff\1\144\1\145\1\157\1\145\2\164\1\145\1\143\1\150\1\156\1\154\1\145\3\uffff\3\172\1\154\1\145\1\172\1\145\1\157\1\165\1\141\1\154\1\uffff\1\145\1\154\1\147\1\150\1\172\1\155\1\144\1\162\1\145\1\172\1\141\1\162\1\141\1\162\1\165\1\uffff\1\172\1\166\1\155\1\172\1\156\1\162\1\172\1\151\1\143\1\162\1\150\1\172\1\151\1\145\1\172\3\uffff\2\172\1\uffff\1\157\1\167\1\162\1\147\2\172\2\157\1\172\1\uffff\1\141\1\172\1\164\1\172\1\uffff\1\156\1\145\1\147\1\151\1\154\1\uffff\1\145\1\141\1\uffff\1\163\1\172\1\uffff\1\143\1\150\1\172\1\162\1\uffff\1\156\1\172\3\uffff\1\146\1\172\1\156\1\145\1\171\2\uffff\1\147\1\162\1\uffff\1\162\1\uffff\1\172\1\uffff\1\143\1\172\1\145\2\164\1\172\1\156\1\163\1\151\1\uffff\2\172\1\uffff\1\157\1\147\1\uffff\1\172\1\uffff\4\172\1\171\1\172\1\uffff\1\145\1\uffff\1\172\1\171\1\172\1\uffff\1\144\1\172\1\157\2\uffff\1\156\1\172\5\uffff\1\172\1\uffff\1\157\1\uffff\1\122\1\uffff\1\172\1\uffff\1\156\1\151\2\uffff\1\146\1\141\1\uffff\3\172\1\156\1\uffff\1\145\1\uffff\1\147\1\144\1\145\2\172\2\uffff";
     static final String DFA21_acceptS =
-        "\5\uffff\1\6\1\7\1\uffff\1\11\1\13\1\14\1\15\1\uffff\1\17\4\uffff"+
-        "\1\24\1\25\1\26\32\uffff\1\144\2\145\1\150\1\151\1\uffff\1\144\6"+
-        "\uffff\1\6\1\7\5\uffff\1\11\1\13\1\14\1\15\1\uffff\1\17\2\uffff"+
-        "\1\105\4\uffff\1\70\1\23\1\24\1\25\1\26\15\uffff\1\47\1\103\1\73"+
-        "\1\50\1\66\1\104\1\74\1\51\1\76\1\75\1\52\1\146\1\147\1\77\1\53"+
-        "\1\100\1\71\1\54\1\56\1\55\1\57\1\110\1\60\1\140\1\uffff\1\101\1"+
-        "\72\1\107\1\137\1\uffff\1\106\1\114\7\uffff\1\141\1\uffff\1\142"+
-        "\1\143\1\145\1\150\15\uffff\1\111\2\uffff\1\67\1\21\2\uffff\1\120"+
-        "\1\63\1\61\2\uffff\1\31\14\uffff\1\64\1\62\1\102\13\uffff\1\4\17"+
-        "\uffff\1\22\17\uffff\1\121\1\122\1\124\2\uffff\1\133\11\uffff\1"+
-        "\116\4\uffff\1\42\5\uffff\1\33\2\uffff\1\32\2\uffff\1\112\4\uffff"+
-        "\1\37\2\uffff\1\44\1\127\1\126\5\uffff\1\2\1\125\2\uffff\1\136\1"+
-        "\uffff\1\27\1\uffff\1\30\11\uffff\1\40\2\uffff\1\123\2\uffff\1\117"+
-        "\1\uffff\1\131\6\uffff\1\10\1\uffff\1\43\3\uffff\1\45\3\uffff\1"+
-        "\35\1\113\2\uffff\1\130\1\132\1\1\1\134\1\3\1\uffff\1\5\1\uffff"+
-        "\1\16\1\uffff\1\115\1\uffff\1\34\2\uffff\1\41\1\12\2\uffff\1\46"+
-        "\4\uffff\1\36\1\uffff\1\65\5\uffff\1\135\1\20";
+        "\5\uffff\1\6\1\7\1\uffff\1\11\1\13\1\14\1\15\1\uffff\1\17\4\uffff\1\24\1\25\1\26\32\uffff\1\144\2\145\1\150\1\151\1\uffff\1\144\6\uffff\1\6\1\7\5\uffff\1\11\1\13\1\14\1\15\1\uffff\1\17\2\uffff\1\105\4\uffff\1\70\1\23\1\24\1\25\1\26\15\uffff\1\47\1\103\1\73\1\50\1\66\1\104\1\74\1\51\1\76\1\75\1\52\1\146\1\147\1\77\1\53\1\100\1\71\1\54\1\56\1\55\1\57\1\110\1\60\1\140\1\uffff\1\101\1\72\1\107\1\137\1\uffff\1\106\1\114\7\uffff\1\141\1\uffff\1\142\1\143\1\145\1\150\15\uffff\1\111\2\uffff\1\67\1\21\2\uffff\1\120\1\63\1\61\2\uffff\1\31\14\uffff\1\64\1\62\1\102\13\uffff\1\4\17\uffff\1\22\17\uffff\1\121\1\122\1\124\2\uffff\1\133\11\uffff\1\116\4\uffff\1\42\5\uffff\1\33\2\uffff\1\32\2\uffff\1\112\4\uffff\1\37\2\uffff\1\44\1\127\1\126\5\uffff\1\2\1\125\2\uffff\1\136\1\uffff\1\27\1\uffff\1\30\11\uffff\1\40\2\uffff\1\123\2\uffff\1\117\1\uffff\1\131\6\uffff\1\10\1\uffff\1\43\3\uffff\1\45\3\uffff\1\35\1\113\2\uffff\1\130\1\132\1\1\1\134\1\3\1\uffff\1\5\1\uffff\1\16\1\uffff\1\115\1\uffff\1\34\2\uffff\1\41\1\12\2\uffff\1\46\4\uffff\1\36\1\uffff\1\65\5\uffff\1\135\1\20";
     static final String DFA21_specialS =
         "\1\0\u0163\uffff}>";
     static final String[] DFA21_transitionS = {
-            "\11\63\2\62\2\63\1\62\22\63\1\62\1\44\1\60\1\22\1\57\1\37\1"+
-            "\43\1\61\1\11\1\13\1\35\1\33\1\12\1\34\1\17\1\36\1\54\11\55"+
-            "\1\47\1\10\1\40\1\21\1\41\1\45\1\15\22\57\1\16\7\57\1\23\1\63"+
-            "\1\24\1\56\1\57\1\63\1\46\1\26\1\3\1\20\1\27\1\2\1\4\1\57\1"+
-            "\7\2\57\1\32\1\14\1\51\1\25\1\1\1\57\1\53\1\30\1\52\1\57\1\50"+
-            "\1\31\3\57\1\5\1\42\1\6\uff82\63",
+            "\11\63\2\62\2\63\1\62\22\63\1\62\1\44\1\60\1\22\1\57\1\37\1\43\1\61\1\11\1\13\1\35\1\33\1\12\1\34\1\17\1\36\1\54\11\55\1\47\1\10\1\40\1\21\1\41\1\45\1\15\22\57\1\16\7\57\1\23\1\63\1\24\1\56\1\57\1\63\1\46\1\26\1\3\1\20\1\27\1\2\1\4\1\57\1\7\2\57\1\32\1\14\1\51\1\25\1\1\1\57\1\53\1\30\1\52\1\57\1\50\1\31\3\57\1\5\1\42\1\6\uff82\63",
             "\1\64",
             "\1\70\7\uffff\1\66\5\uffff\1\67",
             "\1\71",
@@ -3862,12 +3770,8 @@ public void mTokens() throws RecognitionException {
             "\1\u0083\17\uffff\1\u0084",
             "\1\u0087\11\uffff\1\u0085\6\uffff\1\u0086",
             "\1\u0088",
-            "\12\u008a\10\uffff\1\u008c\1\uffff\3\u008c\5\uffff\1\u008c"+
-            "\13\uffff\1\u0089\6\uffff\1\u008a\2\uffff\1\u008c\1\uffff\3"+
-            "\u008c\5\uffff\1\u008c\13\uffff\1\u0089",
-            "\12\u008a\10\uffff\1\u008c\1\uffff\3\u008c\5\uffff\1\u008c"+
-            "\22\uffff\1\u008a\2\uffff\1\u008c\1\uffff\3\u008c\5\uffff\1"+
-            "\u008c",
+            "\12\u008a\10\uffff\1\u008c\1\uffff\3\u008c\5\uffff\1\u008c\13\uffff\1\u0089\6\uffff\1\u008a\2\uffff\1\u008c\1\uffff\3\u008c\5\uffff\1\u008c\13\uffff\1\u0089",
+            "\12\u008a\10\uffff\1\u008c\1\uffff\3\u008c\5\uffff\1\u008c\22\uffff\1\u008a\2\uffff\1\u008c\1\uffff\3\u008c\5\uffff\1\u008c",
             "\1\65\34\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "",
             "",
@@ -3888,8 +3792,7 @@ public void mTokens() throws RecognitionException {
             "\1\u0098",
             "\1\u0099\14\uffff\1\u009a",
             "\1\u009b",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "",
             "",
             "",
@@ -3901,16 +3804,14 @@ public void mTokens() throws RecognitionException {
             "",
             "\1\u00a1",
             "\1\u00a2",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u00a4",
             "",
             "",
             "",
             "",
             "",
-            "\1\65\13\uffff\12\65\7\uffff\3\65\1\u00a7\16\65\1\u00a6\7"+
-            "\65\4\uffff\1\65\1\uffff\32\65",
+            "\1\65\13\uffff\12\65\7\uffff\3\65\1\u00a7\16\65\1\u00a6\7\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u00a9",
             "\1\u00aa",
             "\1\u00ab",
@@ -3952,8 +3853,7 @@ public void mTokens() throws RecognitionException {
             "",
             "",
             "",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "",
             "",
             "\1\u00b9\5\uffff\1\u00b8",
@@ -3964,17 +3864,14 @@ public void mTokens() throws RecognitionException {
             "\1\u00bf",
             "\1\u00c0",
             "",
-            "\12\u008a\10\uffff\1\u008c\1\uffff\3\u008c\5\uffff\1\u008c"+
-            "\22\uffff\1\u008a\2\uffff\1\u008c\1\uffff\3\u008c\5\uffff\1"+
-            "\u008c",
+            "\12\u008a\10\uffff\1\u008c\1\uffff\3\u008c\5\uffff\1\u008c\22\uffff\1\u008a\2\uffff\1\u008c\1\uffff\3\u008c\5\uffff\1\u008c",
             "",
             "",
             "",
             "",
             "\1\u00c1",
             "\1\u00c2",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u00c4",
             "\1\u00c5\1\uffff\1\u00c7\1\uffff\1\u00c6",
             "\1\u00c8",
@@ -3990,8 +3887,7 @@ public void mTokens() throws RecognitionException {
             "\1\u00d1",
             "",
             "",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\1"+
-            "\u00d2\31\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\1\u00d2\31\65",
             "\1\u00d4",
             "",
             "",
@@ -4014,16 +3910,12 @@ public void mTokens() throws RecognitionException {
             "",
             "",
             "",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u00e6",
             "\1\u00e7",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u00e9",
             "\1\u00ea",
             "\1\u00eb",
@@ -4034,67 +3926,53 @@ public void mTokens() throws RecognitionException {
             "\1\u00ef",
             "\1\u00f0",
             "\1\u00f1",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u00f3",
             "\1\u00f4",
             "\1\u00f5",
             "\1\u00f6",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u00f8",
             "\1\u00f9",
             "\1\u00fa",
             "\1\u00fb",
             "\1\u00fc",
             "",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u00fe",
             "\1\u00ff",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u0101",
             "\1\u0102",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u0104",
             "\1\u0105",
             "\1\u0106",
             "\1\u0107",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u0109",
             "\1\u010a",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "",
             "",
             "",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "",
             "\1\u010e",
             "\1\u010f",
             "\1\u0110",
             "\1\u0111",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\13"+
-            "\65\1\u0112\16\65",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\13\65\1\u0112\16\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u0115",
             "\1\u0116",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "",
             "\1\u0118",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u011a",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "",
             "\1\u011c",
             "\1\u011d",
@@ -4106,24 +3984,20 @@ public void mTokens() throws RecognitionException {
             "\1\u0122",
             "",
             "\1\u0123\16\uffff\1\u0124",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "",
             "\1\u0126",
             "\1\u0127",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u0129",
             "",
             "\1\u012a",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "",
             "",
             "",
             "\1\u012c",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u012e",
             "\1\u012f",
             "\1\u0130",
@@ -4134,75 +4008,58 @@ public void mTokens() throws RecognitionException {
             "",
             "\1\u0133",
             "",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "",
             "\1\u0135",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u0137",
             "\1\u0138",
             "\1\u0139",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u013b",
             "\1\u013c",
             "\1\u013d",
             "",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "",
             "\1\u0140",
             "\1\u0141",
             "",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u0147",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "",
             "\1\u0149",
             "",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u014b",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "",
             "\1\u014d",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u014f",
             "",
             "",
             "\1\u0150",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "",
             "",
             "",
             "",
             "",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "",
             "\1\u0153",
             "",
             "\1\u0154",
             "",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "",
             "\1\u0156",
             "\1\u0157",
@@ -4211,11 +4068,9 @@ public void mTokens() throws RecognitionException {
             "\1\u0158",
             "\1\u0159",
             "",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u015b",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u015d",
             "",
             "\1\u015e",
@@ -4223,10 +4078,8 @@ public void mTokens() throws RecognitionException {
             "\1\u015f",
             "\1\u0160",
             "\1\u0161",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "",
             ""
     };
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheckParser.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheckParser.java
index 8d4f0c044..6526ea1e4 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheckParser.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheckParser.java
@@ -146,7 +146,7 @@ public InternalCheckParser(TokenStream input, RecognizerSharedState state) {
         
 
     public String[] getTokenNames() { return InternalCheckParser.tokenNames; }
-    public String getGrammarFileName() { return "../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g"; }
+    public String getGrammarFileName() { return "InternalCheck.g"; }
 
 
 
@@ -171,7 +171,7 @@ protected CheckGrammarAccess getGrammarAccess() {
 
 
     // $ANTLR start "entryRuleCheckCatalog"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:68:1: entryRuleCheckCatalog returns [EObject current=null] : iv_ruleCheckCatalog= ruleCheckCatalog EOF ;
+    // InternalCheck.g:68:1: entryRuleCheckCatalog returns [EObject current=null] : iv_ruleCheckCatalog= ruleCheckCatalog EOF ;
     public final EObject entryRuleCheckCatalog() throws RecognitionException {
         EObject current = null;
 
@@ -179,13 +179,13 @@ public final EObject entryRuleCheckCatalog() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:69:2: (iv_ruleCheckCatalog= ruleCheckCatalog EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:70:2: iv_ruleCheckCatalog= ruleCheckCatalog EOF
+            // InternalCheck.g:69:2: (iv_ruleCheckCatalog= ruleCheckCatalog EOF )
+            // InternalCheck.g:70:2: iv_ruleCheckCatalog= ruleCheckCatalog EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getCheckCatalogRule()); 
             }
-            pushFollow(FOLLOW_ruleCheckCatalog_in_entryRuleCheckCatalog75);
+            pushFollow(FOLLOW_1);
             iv_ruleCheckCatalog=ruleCheckCatalog();
 
             state._fsp--;
@@ -193,7 +193,7 @@ public final EObject entryRuleCheckCatalog() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleCheckCatalog; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleCheckCatalog85); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -211,7 +211,7 @@ public final EObject entryRuleCheckCatalog() throws RecognitionException {
 
 
     // $ANTLR start "ruleCheckCatalog"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:77:1: ruleCheckCatalog returns [EObject current=null] : ( () otherlv_1= 'package' ( (lv_packageName_2_0= ruleQualifiedName ) ) ( (lv_imports_3_0= ruleXImportSection ) ) ( (lv_final_4_0= 'final' ) )? otherlv_5= 'catalog' ( (lv_name_6_0= ruleValidID ) ) (otherlv_7= 'for' otherlv_8= 'grammar' ( ( ruleQualifiedName ) ) )? otherlv_10= '{' ( ( (lv_categories_11_0= ruleCategory ) ) | ( (lv_implementations_12_0= ruleImplementation ) ) | ( (lv_checks_13_0= ruleCheck ) ) | ( (lv_members_14_0= ruleMember ) ) )* otherlv_15= '}' ) ;
+    // InternalCheck.g:77:1: ruleCheckCatalog returns [EObject current=null] : ( () otherlv_1= 'package' ( (lv_packageName_2_0= ruleQualifiedName ) ) ( (lv_imports_3_0= ruleXImportSection ) ) ( (lv_final_4_0= 'final' ) )? otherlv_5= 'catalog' ( (lv_name_6_0= ruleValidID ) ) (otherlv_7= 'for' otherlv_8= 'grammar' ( ( ruleQualifiedName ) ) )? otherlv_10= '{' ( ( (lv_categories_11_0= ruleCategory ) ) | ( (lv_implementations_12_0= ruleImplementation ) ) | ( (lv_checks_13_0= ruleCheck ) ) | ( (lv_members_14_0= ruleMember ) ) )* otherlv_15= '}' ) ;
     public final EObject ruleCheckCatalog() throws RecognitionException {
         EObject current = null;
 
@@ -240,14 +240,14 @@ public final EObject ruleCheckCatalog() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:80:28: ( ( () otherlv_1= 'package' ( (lv_packageName_2_0= ruleQualifiedName ) ) ( (lv_imports_3_0= ruleXImportSection ) ) ( (lv_final_4_0= 'final' ) )? otherlv_5= 'catalog' ( (lv_name_6_0= ruleValidID ) ) (otherlv_7= 'for' otherlv_8= 'grammar' ( ( ruleQualifiedName ) ) )? otherlv_10= '{' ( ( (lv_categories_11_0= ruleCategory ) ) | ( (lv_implementations_12_0= ruleImplementation ) ) | ( (lv_checks_13_0= ruleCheck ) ) | ( (lv_members_14_0= ruleMember ) ) )* otherlv_15= '}' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:81:1: ( () otherlv_1= 'package' ( (lv_packageName_2_0= ruleQualifiedName ) ) ( (lv_imports_3_0= ruleXImportSection ) ) ( (lv_final_4_0= 'final' ) )? otherlv_5= 'catalog' ( (lv_name_6_0= ruleValidID ) ) (otherlv_7= 'for' otherlv_8= 'grammar' ( ( ruleQualifiedName ) ) )? otherlv_10= '{' ( ( (lv_categories_11_0= ruleCategory ) ) | ( (lv_implementations_12_0= ruleImplementation ) ) | ( (lv_checks_13_0= ruleCheck ) ) | ( (lv_members_14_0= ruleMember ) ) )* otherlv_15= '}' )
+            // InternalCheck.g:80:28: ( ( () otherlv_1= 'package' ( (lv_packageName_2_0= ruleQualifiedName ) ) ( (lv_imports_3_0= ruleXImportSection ) ) ( (lv_final_4_0= 'final' ) )? otherlv_5= 'catalog' ( (lv_name_6_0= ruleValidID ) ) (otherlv_7= 'for' otherlv_8= 'grammar' ( ( ruleQualifiedName ) ) )? otherlv_10= '{' ( ( (lv_categories_11_0= ruleCategory ) ) | ( (lv_implementations_12_0= ruleImplementation ) ) | ( (lv_checks_13_0= ruleCheck ) ) | ( (lv_members_14_0= ruleMember ) ) )* otherlv_15= '}' ) )
+            // InternalCheck.g:81:1: ( () otherlv_1= 'package' ( (lv_packageName_2_0= ruleQualifiedName ) ) ( (lv_imports_3_0= ruleXImportSection ) ) ( (lv_final_4_0= 'final' ) )? otherlv_5= 'catalog' ( (lv_name_6_0= ruleValidID ) ) (otherlv_7= 'for' otherlv_8= 'grammar' ( ( ruleQualifiedName ) ) )? otherlv_10= '{' ( ( (lv_categories_11_0= ruleCategory ) ) | ( (lv_implementations_12_0= ruleImplementation ) ) | ( (lv_checks_13_0= ruleCheck ) ) | ( (lv_members_14_0= ruleMember ) ) )* otherlv_15= '}' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:81:1: ( () otherlv_1= 'package' ( (lv_packageName_2_0= ruleQualifiedName ) ) ( (lv_imports_3_0= ruleXImportSection ) ) ( (lv_final_4_0= 'final' ) )? otherlv_5= 'catalog' ( (lv_name_6_0= ruleValidID ) ) (otherlv_7= 'for' otherlv_8= 'grammar' ( ( ruleQualifiedName ) ) )? otherlv_10= '{' ( ( (lv_categories_11_0= ruleCategory ) ) | ( (lv_implementations_12_0= ruleImplementation ) ) | ( (lv_checks_13_0= ruleCheck ) ) | ( (lv_members_14_0= ruleMember ) ) )* otherlv_15= '}' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:81:2: () otherlv_1= 'package' ( (lv_packageName_2_0= ruleQualifiedName ) ) ( (lv_imports_3_0= ruleXImportSection ) ) ( (lv_final_4_0= 'final' ) )? otherlv_5= 'catalog' ( (lv_name_6_0= ruleValidID ) ) (otherlv_7= 'for' otherlv_8= 'grammar' ( ( ruleQualifiedName ) ) )? otherlv_10= '{' ( ( (lv_categories_11_0= ruleCategory ) ) | ( (lv_implementations_12_0= ruleImplementation ) ) | ( (lv_checks_13_0= ruleCheck ) ) | ( (lv_members_14_0= ruleMember ) ) )* otherlv_15= '}'
+            // InternalCheck.g:81:1: ( () otherlv_1= 'package' ( (lv_packageName_2_0= ruleQualifiedName ) ) ( (lv_imports_3_0= ruleXImportSection ) ) ( (lv_final_4_0= 'final' ) )? otherlv_5= 'catalog' ( (lv_name_6_0= ruleValidID ) ) (otherlv_7= 'for' otherlv_8= 'grammar' ( ( ruleQualifiedName ) ) )? otherlv_10= '{' ( ( (lv_categories_11_0= ruleCategory ) ) | ( (lv_implementations_12_0= ruleImplementation ) ) | ( (lv_checks_13_0= ruleCheck ) ) | ( (lv_members_14_0= ruleMember ) ) )* otherlv_15= '}' )
+            // InternalCheck.g:81:2: () otherlv_1= 'package' ( (lv_packageName_2_0= ruleQualifiedName ) ) ( (lv_imports_3_0= ruleXImportSection ) ) ( (lv_final_4_0= 'final' ) )? otherlv_5= 'catalog' ( (lv_name_6_0= ruleValidID ) ) (otherlv_7= 'for' otherlv_8= 'grammar' ( ( ruleQualifiedName ) ) )? otherlv_10= '{' ( ( (lv_categories_11_0= ruleCategory ) ) | ( (lv_implementations_12_0= ruleImplementation ) ) | ( (lv_checks_13_0= ruleCheck ) ) | ( (lv_members_14_0= ruleMember ) ) )* otherlv_15= '}'
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:81:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:82:5: 
+            // InternalCheck.g:81:2: ()
+            // InternalCheck.g:82:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -259,24 +259,24 @@ public final EObject ruleCheckCatalog() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,13,FOLLOW_13_in_ruleCheckCatalog131); if (state.failed) return current;
+            otherlv_1=(Token)match(input,13,FOLLOW_3); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getCheckCatalogAccess().getPackageKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:91:1: ( (lv_packageName_2_0= ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:92:1: (lv_packageName_2_0= ruleQualifiedName )
+            // InternalCheck.g:91:1: ( (lv_packageName_2_0= ruleQualifiedName ) )
+            // InternalCheck.g:92:1: (lv_packageName_2_0= ruleQualifiedName )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:92:1: (lv_packageName_2_0= ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:93:3: lv_packageName_2_0= ruleQualifiedName
+            // InternalCheck.g:92:1: (lv_packageName_2_0= ruleQualifiedName )
+            // InternalCheck.g:93:3: lv_packageName_2_0= ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getCheckCatalogAccess().getPackageNameQualifiedNameParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_ruleCheckCatalog152);
+            pushFollow(FOLLOW_4);
             lv_packageName_2_0=ruleQualifiedName();
 
             state._fsp--;
@@ -290,7 +290,7 @@ public final EObject ruleCheckCatalog() throws RecognitionException {
                      			current, 
                      			"packageName",
                       		lv_packageName_2_0, 
-                      		"QualifiedName");
+                      		"org.eclipse.xtext.xbase.Xbase.QualifiedName");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -300,18 +300,18 @@ public final EObject ruleCheckCatalog() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:109:2: ( (lv_imports_3_0= ruleXImportSection ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:110:1: (lv_imports_3_0= ruleXImportSection )
+            // InternalCheck.g:109:2: ( (lv_imports_3_0= ruleXImportSection ) )
+            // InternalCheck.g:110:1: (lv_imports_3_0= ruleXImportSection )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:110:1: (lv_imports_3_0= ruleXImportSection )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:111:3: lv_imports_3_0= ruleXImportSection
+            // InternalCheck.g:110:1: (lv_imports_3_0= ruleXImportSection )
+            // InternalCheck.g:111:3: lv_imports_3_0= ruleXImportSection
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getCheckCatalogAccess().getImportsXImportSectionParserRuleCall_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXImportSection_in_ruleCheckCatalog173);
+            pushFollow(FOLLOW_5);
             lv_imports_3_0=ruleXImportSection();
 
             state._fsp--;
@@ -325,7 +325,7 @@ public final EObject ruleCheckCatalog() throws RecognitionException {
                      			current, 
                      			"imports",
                       		lv_imports_3_0, 
-                      		"XImportSection");
+                      		"com.avaloq.tools.ddk.check.Check.XImportSection");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -335,7 +335,7 @@ public final EObject ruleCheckCatalog() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:127:2: ( (lv_final_4_0= 'final' ) )?
+            // InternalCheck.g:127:2: ( (lv_final_4_0= 'final' ) )?
             int alt1=2;
             int LA1_0 = input.LA(1);
 
@@ -344,12 +344,12 @@ public final EObject ruleCheckCatalog() throws RecognitionException {
             }
             switch (alt1) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:128:1: (lv_final_4_0= 'final' )
+                    // InternalCheck.g:128:1: (lv_final_4_0= 'final' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:128:1: (lv_final_4_0= 'final' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:129:3: lv_final_4_0= 'final'
+                    // InternalCheck.g:128:1: (lv_final_4_0= 'final' )
+                    // InternalCheck.g:129:3: lv_final_4_0= 'final'
                     {
-                    lv_final_4_0=(Token)match(input,14,FOLLOW_14_in_ruleCheckCatalog191); if (state.failed) return current;
+                    lv_final_4_0=(Token)match(input,14,FOLLOW_6); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_final_4_0, grammarAccess.getCheckCatalogAccess().getFinalFinalKeyword_4_0());
@@ -372,24 +372,24 @@ public final EObject ruleCheckCatalog() throws RecognitionException {
 
             }
 
-            otherlv_5=(Token)match(input,15,FOLLOW_15_in_ruleCheckCatalog217); if (state.failed) return current;
+            otherlv_5=(Token)match(input,15,FOLLOW_3); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_5, grammarAccess.getCheckCatalogAccess().getCatalogKeyword_5());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:146:1: ( (lv_name_6_0= ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:147:1: (lv_name_6_0= ruleValidID )
+            // InternalCheck.g:146:1: ( (lv_name_6_0= ruleValidID ) )
+            // InternalCheck.g:147:1: (lv_name_6_0= ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:147:1: (lv_name_6_0= ruleValidID )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:148:3: lv_name_6_0= ruleValidID
+            // InternalCheck.g:147:1: (lv_name_6_0= ruleValidID )
+            // InternalCheck.g:148:3: lv_name_6_0= ruleValidID
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getCheckCatalogAccess().getNameValidIDParserRuleCall_6_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleValidID_in_ruleCheckCatalog238);
+            pushFollow(FOLLOW_7);
             lv_name_6_0=ruleValidID();
 
             state._fsp--;
@@ -403,7 +403,7 @@ public final EObject ruleCheckCatalog() throws RecognitionException {
                      			current, 
                      			"name",
                       		lv_name_6_0, 
-                      		"ValidID");
+                      		"org.eclipse.xtext.xbase.Xtype.ValidID");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -413,7 +413,7 @@ public final EObject ruleCheckCatalog() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:164:2: (otherlv_7= 'for' otherlv_8= 'grammar' ( ( ruleQualifiedName ) ) )?
+            // InternalCheck.g:164:2: (otherlv_7= 'for' otherlv_8= 'grammar' ( ( ruleQualifiedName ) ) )?
             int alt2=2;
             int LA2_0 = input.LA(1);
 
@@ -422,25 +422,25 @@ public final EObject ruleCheckCatalog() throws RecognitionException {
             }
             switch (alt2) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:164:4: otherlv_7= 'for' otherlv_8= 'grammar' ( ( ruleQualifiedName ) )
+                    // InternalCheck.g:164:4: otherlv_7= 'for' otherlv_8= 'grammar' ( ( ruleQualifiedName ) )
                     {
-                    otherlv_7=(Token)match(input,16,FOLLOW_16_in_ruleCheckCatalog251); if (state.failed) return current;
+                    otherlv_7=(Token)match(input,16,FOLLOW_8); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_7, grammarAccess.getCheckCatalogAccess().getForKeyword_7_0());
                           
                     }
-                    otherlv_8=(Token)match(input,17,FOLLOW_17_in_ruleCheckCatalog263); if (state.failed) return current;
+                    otherlv_8=(Token)match(input,17,FOLLOW_3); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_8, grammarAccess.getCheckCatalogAccess().getGrammarKeyword_7_1());
                           
                     }
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:172:1: ( ( ruleQualifiedName ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:173:1: ( ruleQualifiedName )
+                    // InternalCheck.g:172:1: ( ( ruleQualifiedName ) )
+                    // InternalCheck.g:173:1: ( ruleQualifiedName )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:173:1: ( ruleQualifiedName )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:174:3: ruleQualifiedName
+                    // InternalCheck.g:173:1: ( ruleQualifiedName )
+                    // InternalCheck.g:174:3: ruleQualifiedName
                     {
                     if ( state.backtracking==0 ) {
 
@@ -454,7 +454,7 @@ public final EObject ruleCheckCatalog() throws RecognitionException {
                       	        newCompositeNode(grammarAccess.getCheckCatalogAccess().getGrammarGrammarCrossReference_7_2_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleQualifiedName_in_ruleCheckCatalog286);
+                    pushFollow(FOLLOW_9);
                     ruleQualifiedName();
 
                     state._fsp--;
@@ -476,13 +476,13 @@ public final EObject ruleCheckCatalog() throws RecognitionException {
 
             }
 
-            otherlv_10=(Token)match(input,18,FOLLOW_18_in_ruleCheckCatalog300); if (state.failed) return current;
+            otherlv_10=(Token)match(input,18,FOLLOW_10); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_10, grammarAccess.getCheckCatalogAccess().getLeftCurlyBracketKeyword_8());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:191:1: ( ( (lv_categories_11_0= ruleCategory ) ) | ( (lv_implementations_12_0= ruleImplementation ) ) | ( (lv_checks_13_0= ruleCheck ) ) | ( (lv_members_14_0= ruleMember ) ) )*
+            // InternalCheck.g:191:1: ( ( (lv_categories_11_0= ruleCategory ) ) | ( (lv_implementations_12_0= ruleImplementation ) ) | ( (lv_checks_13_0= ruleCheck ) ) | ( (lv_members_14_0= ruleMember ) ) )*
             loop3:
             do {
                 int alt3=5;
@@ -535,20 +535,20 @@ else if ( (LA3_4==RULE_ID) ) {
 
                 switch (alt3) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:191:2: ( (lv_categories_11_0= ruleCategory ) )
+            	    // InternalCheck.g:191:2: ( (lv_categories_11_0= ruleCategory ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:191:2: ( (lv_categories_11_0= ruleCategory ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:192:1: (lv_categories_11_0= ruleCategory )
+            	    // InternalCheck.g:191:2: ( (lv_categories_11_0= ruleCategory ) )
+            	    // InternalCheck.g:192:1: (lv_categories_11_0= ruleCategory )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:192:1: (lv_categories_11_0= ruleCategory )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:193:3: lv_categories_11_0= ruleCategory
+            	    // InternalCheck.g:192:1: (lv_categories_11_0= ruleCategory )
+            	    // InternalCheck.g:193:3: lv_categories_11_0= ruleCategory
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getCheckCatalogAccess().getCategoriesCategoryParserRuleCall_9_0_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleCategory_in_ruleCheckCatalog322);
+            	    pushFollow(FOLLOW_10);
             	    lv_categories_11_0=ruleCategory();
 
             	    state._fsp--;
@@ -562,7 +562,7 @@ else if ( (LA3_4==RULE_ID) ) {
             	             			current, 
             	             			"categories",
             	              		lv_categories_11_0, 
-            	              		"Category");
+            	              		"com.avaloq.tools.ddk.check.Check.Category");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -576,20 +576,20 @@ else if ( (LA3_4==RULE_ID) ) {
             	    }
             	    break;
             	case 2 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:210:6: ( (lv_implementations_12_0= ruleImplementation ) )
+            	    // InternalCheck.g:210:6: ( (lv_implementations_12_0= ruleImplementation ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:210:6: ( (lv_implementations_12_0= ruleImplementation ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:211:1: (lv_implementations_12_0= ruleImplementation )
+            	    // InternalCheck.g:210:6: ( (lv_implementations_12_0= ruleImplementation ) )
+            	    // InternalCheck.g:211:1: (lv_implementations_12_0= ruleImplementation )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:211:1: (lv_implementations_12_0= ruleImplementation )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:212:3: lv_implementations_12_0= ruleImplementation
+            	    // InternalCheck.g:211:1: (lv_implementations_12_0= ruleImplementation )
+            	    // InternalCheck.g:212:3: lv_implementations_12_0= ruleImplementation
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getCheckCatalogAccess().getImplementationsImplementationParserRuleCall_9_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleImplementation_in_ruleCheckCatalog349);
+            	    pushFollow(FOLLOW_10);
             	    lv_implementations_12_0=ruleImplementation();
 
             	    state._fsp--;
@@ -603,7 +603,7 @@ else if ( (LA3_4==RULE_ID) ) {
             	             			current, 
             	             			"implementations",
             	              		lv_implementations_12_0, 
-            	              		"Implementation");
+            	              		"com.avaloq.tools.ddk.check.Check.Implementation");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -617,20 +617,20 @@ else if ( (LA3_4==RULE_ID) ) {
             	    }
             	    break;
             	case 3 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:229:6: ( (lv_checks_13_0= ruleCheck ) )
+            	    // InternalCheck.g:229:6: ( (lv_checks_13_0= ruleCheck ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:229:6: ( (lv_checks_13_0= ruleCheck ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:230:1: (lv_checks_13_0= ruleCheck )
+            	    // InternalCheck.g:229:6: ( (lv_checks_13_0= ruleCheck ) )
+            	    // InternalCheck.g:230:1: (lv_checks_13_0= ruleCheck )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:230:1: (lv_checks_13_0= ruleCheck )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:231:3: lv_checks_13_0= ruleCheck
+            	    // InternalCheck.g:230:1: (lv_checks_13_0= ruleCheck )
+            	    // InternalCheck.g:231:3: lv_checks_13_0= ruleCheck
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getCheckCatalogAccess().getChecksCheckParserRuleCall_9_2_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleCheck_in_ruleCheckCatalog376);
+            	    pushFollow(FOLLOW_10);
             	    lv_checks_13_0=ruleCheck();
 
             	    state._fsp--;
@@ -644,7 +644,7 @@ else if ( (LA3_4==RULE_ID) ) {
             	             			current, 
             	             			"checks",
             	              		lv_checks_13_0, 
-            	              		"Check");
+            	              		"com.avaloq.tools.ddk.check.Check.Check");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -658,20 +658,20 @@ else if ( (LA3_4==RULE_ID) ) {
             	    }
             	    break;
             	case 4 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:248:6: ( (lv_members_14_0= ruleMember ) )
+            	    // InternalCheck.g:248:6: ( (lv_members_14_0= ruleMember ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:248:6: ( (lv_members_14_0= ruleMember ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:249:1: (lv_members_14_0= ruleMember )
+            	    // InternalCheck.g:248:6: ( (lv_members_14_0= ruleMember ) )
+            	    // InternalCheck.g:249:1: (lv_members_14_0= ruleMember )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:249:1: (lv_members_14_0= ruleMember )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:250:3: lv_members_14_0= ruleMember
+            	    // InternalCheck.g:249:1: (lv_members_14_0= ruleMember )
+            	    // InternalCheck.g:250:3: lv_members_14_0= ruleMember
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getCheckCatalogAccess().getMembersMemberParserRuleCall_9_3_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleMember_in_ruleCheckCatalog403);
+            	    pushFollow(FOLLOW_10);
             	    lv_members_14_0=ruleMember();
 
             	    state._fsp--;
@@ -685,7 +685,7 @@ else if ( (LA3_4==RULE_ID) ) {
             	             			current, 
             	             			"members",
             	              		lv_members_14_0, 
-            	              		"Member");
+            	              		"com.avaloq.tools.ddk.check.Check.Member");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -704,7 +704,7 @@ else if ( (LA3_4==RULE_ID) ) {
                 }
             } while (true);
 
-            otherlv_15=(Token)match(input,19,FOLLOW_19_in_ruleCheckCatalog417); if (state.failed) return current;
+            otherlv_15=(Token)match(input,19,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_15, grammarAccess.getCheckCatalogAccess().getRightCurlyBracketKeyword_10());
@@ -733,7 +733,7 @@ else if ( (LA3_4==RULE_ID) ) {
 
 
     // $ANTLR start "entryRuleXImportSection"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:278:1: entryRuleXImportSection returns [EObject current=null] : iv_ruleXImportSection= ruleXImportSection EOF ;
+    // InternalCheck.g:278:1: entryRuleXImportSection returns [EObject current=null] : iv_ruleXImportSection= ruleXImportSection EOF ;
     public final EObject entryRuleXImportSection() throws RecognitionException {
         EObject current = null;
 
@@ -741,13 +741,13 @@ public final EObject entryRuleXImportSection() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:279:2: (iv_ruleXImportSection= ruleXImportSection EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:280:2: iv_ruleXImportSection= ruleXImportSection EOF
+            // InternalCheck.g:279:2: (iv_ruleXImportSection= ruleXImportSection EOF )
+            // InternalCheck.g:280:2: iv_ruleXImportSection= ruleXImportSection EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXImportSectionRule()); 
             }
-            pushFollow(FOLLOW_ruleXImportSection_in_entryRuleXImportSection453);
+            pushFollow(FOLLOW_1);
             iv_ruleXImportSection=ruleXImportSection();
 
             state._fsp--;
@@ -755,7 +755,7 @@ public final EObject entryRuleXImportSection() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXImportSection; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXImportSection463); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -773,7 +773,7 @@ public final EObject entryRuleXImportSection() throws RecognitionException {
 
 
     // $ANTLR start "ruleXImportSection"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:287:1: ruleXImportSection returns [EObject current=null] : ( () ( (lv_importDeclarations_1_0= ruleXImportDeclaration ) )* ) ;
+    // InternalCheck.g:287:1: ruleXImportSection returns [EObject current=null] : ( () ( (lv_importDeclarations_1_0= ruleXImportDeclaration ) )* ) ;
     public final EObject ruleXImportSection() throws RecognitionException {
         EObject current = null;
 
@@ -783,14 +783,14 @@ public final EObject ruleXImportSection() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:290:28: ( ( () ( (lv_importDeclarations_1_0= ruleXImportDeclaration ) )* ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:291:1: ( () ( (lv_importDeclarations_1_0= ruleXImportDeclaration ) )* )
+            // InternalCheck.g:290:28: ( ( () ( (lv_importDeclarations_1_0= ruleXImportDeclaration ) )* ) )
+            // InternalCheck.g:291:1: ( () ( (lv_importDeclarations_1_0= ruleXImportDeclaration ) )* )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:291:1: ( () ( (lv_importDeclarations_1_0= ruleXImportDeclaration ) )* )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:291:2: () ( (lv_importDeclarations_1_0= ruleXImportDeclaration ) )*
+            // InternalCheck.g:291:1: ( () ( (lv_importDeclarations_1_0= ruleXImportDeclaration ) )* )
+            // InternalCheck.g:291:2: () ( (lv_importDeclarations_1_0= ruleXImportDeclaration ) )*
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:291:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:292:5: 
+            // InternalCheck.g:291:2: ()
+            // InternalCheck.g:292:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -802,7 +802,7 @@ public final EObject ruleXImportSection() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:297:2: ( (lv_importDeclarations_1_0= ruleXImportDeclaration ) )*
+            // InternalCheck.g:297:2: ( (lv_importDeclarations_1_0= ruleXImportDeclaration ) )*
             loop4:
             do {
                 int alt4=2;
@@ -815,17 +815,17 @@ public final EObject ruleXImportSection() throws RecognitionException {
 
                 switch (alt4) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:298:1: (lv_importDeclarations_1_0= ruleXImportDeclaration )
+            	    // InternalCheck.g:298:1: (lv_importDeclarations_1_0= ruleXImportDeclaration )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:298:1: (lv_importDeclarations_1_0= ruleXImportDeclaration )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:299:3: lv_importDeclarations_1_0= ruleXImportDeclaration
+            	    // InternalCheck.g:298:1: (lv_importDeclarations_1_0= ruleXImportDeclaration )
+            	    // InternalCheck.g:299:3: lv_importDeclarations_1_0= ruleXImportDeclaration
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXImportSectionAccess().getImportDeclarationsXImportDeclarationParserRuleCall_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXImportDeclaration_in_ruleXImportSection518);
+            	    pushFollow(FOLLOW_11);
             	    lv_importDeclarations_1_0=ruleXImportDeclaration();
 
             	    state._fsp--;
@@ -839,7 +839,7 @@ public final EObject ruleXImportSection() throws RecognitionException {
             	             			current, 
             	             			"importDeclarations",
             	              		lv_importDeclarations_1_0, 
-            	              		"XImportDeclaration");
+            	              		"com.avaloq.tools.ddk.check.Check.XImportDeclaration");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -878,7 +878,7 @@ public final EObject ruleXImportSection() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXImportDeclaration"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:323:1: entryRuleXImportDeclaration returns [EObject current=null] : iv_ruleXImportDeclaration= ruleXImportDeclaration EOF ;
+    // InternalCheck.g:323:1: entryRuleXImportDeclaration returns [EObject current=null] : iv_ruleXImportDeclaration= ruleXImportDeclaration EOF ;
     public final EObject entryRuleXImportDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -886,13 +886,13 @@ public final EObject entryRuleXImportDeclaration() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:324:2: (iv_ruleXImportDeclaration= ruleXImportDeclaration EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:325:2: iv_ruleXImportDeclaration= ruleXImportDeclaration EOF
+            // InternalCheck.g:324:2: (iv_ruleXImportDeclaration= ruleXImportDeclaration EOF )
+            // InternalCheck.g:325:2: iv_ruleXImportDeclaration= ruleXImportDeclaration EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXImportDeclarationRule()); 
             }
-            pushFollow(FOLLOW_ruleXImportDeclaration_in_entryRuleXImportDeclaration555);
+            pushFollow(FOLLOW_1);
             iv_ruleXImportDeclaration=ruleXImportDeclaration();
 
             state._fsp--;
@@ -900,7 +900,7 @@ public final EObject entryRuleXImportDeclaration() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXImportDeclaration; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXImportDeclaration565); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -918,7 +918,7 @@ public final EObject entryRuleXImportDeclaration() throws RecognitionException {
 
 
     // $ANTLR start "ruleXImportDeclaration"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:332:1: ruleXImportDeclaration returns [EObject current=null] : (otherlv_0= 'import' ( ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard ) ) ) (otherlv_3= ';' )? ) ;
+    // InternalCheck.g:332:1: ruleXImportDeclaration returns [EObject current=null] : (otherlv_0= 'import' ( ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard ) ) ) (otherlv_3= ';' )? ) ;
     public final EObject ruleXImportDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -930,30 +930,30 @@ public final EObject ruleXImportDeclaration() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:335:28: ( (otherlv_0= 'import' ( ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard ) ) ) (otherlv_3= ';' )? ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:336:1: (otherlv_0= 'import' ( ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard ) ) ) (otherlv_3= ';' )? )
+            // InternalCheck.g:335:28: ( (otherlv_0= 'import' ( ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard ) ) ) (otherlv_3= ';' )? ) )
+            // InternalCheck.g:336:1: (otherlv_0= 'import' ( ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard ) ) ) (otherlv_3= ';' )? )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:336:1: (otherlv_0= 'import' ( ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard ) ) ) (otherlv_3= ';' )? )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:336:3: otherlv_0= 'import' ( ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard ) ) ) (otherlv_3= ';' )?
+            // InternalCheck.g:336:1: (otherlv_0= 'import' ( ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard ) ) ) (otherlv_3= ';' )? )
+            // InternalCheck.g:336:3: otherlv_0= 'import' ( ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard ) ) ) (otherlv_3= ';' )?
             {
-            otherlv_0=(Token)match(input,20,FOLLOW_20_in_ruleXImportDeclaration602); if (state.failed) return current;
+            otherlv_0=(Token)match(input,20,FOLLOW_3); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getXImportDeclarationAccess().getImportKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:340:1: ( ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard ) ) )
+            // InternalCheck.g:340:1: ( ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard ) ) )
             int alt5=2;
             alt5 = dfa5.predict(input);
             switch (alt5) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:340:2: ( ( ruleQualifiedName ) )
+                    // InternalCheck.g:340:2: ( ( ruleQualifiedName ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:340:2: ( ( ruleQualifiedName ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:341:1: ( ruleQualifiedName )
+                    // InternalCheck.g:340:2: ( ( ruleQualifiedName ) )
+                    // InternalCheck.g:341:1: ( ruleQualifiedName )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:341:1: ( ruleQualifiedName )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:342:3: ruleQualifiedName
+                    // InternalCheck.g:341:1: ( ruleQualifiedName )
+                    // InternalCheck.g:342:3: ruleQualifiedName
                     {
                     if ( state.backtracking==0 ) {
 
@@ -967,7 +967,7 @@ public final EObject ruleXImportDeclaration() throws RecognitionException {
                       	        newCompositeNode(grammarAccess.getXImportDeclarationAccess().getImportedTypeJvmDeclaredTypeCrossReference_1_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleQualifiedName_in_ruleXImportDeclaration626);
+                    pushFollow(FOLLOW_12);
                     ruleQualifiedName();
 
                     state._fsp--;
@@ -987,20 +987,20 @@ public final EObject ruleXImportDeclaration() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:356:6: ( (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard ) )
+                    // InternalCheck.g:356:6: ( (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:356:6: ( (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:357:1: (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard )
+                    // InternalCheck.g:356:6: ( (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard ) )
+                    // InternalCheck.g:357:1: (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:357:1: (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:358:3: lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard
+                    // InternalCheck.g:357:1: (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard )
+                    // InternalCheck.g:358:3: lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXImportDeclarationAccess().getImportedNamespaceQualifiedNameWithWildcardParserRuleCall_1_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleQualifiedNameWithWildcard_in_ruleXImportDeclaration653);
+                    pushFollow(FOLLOW_12);
                     lv_importedNamespace_2_0=ruleQualifiedNameWithWildcard();
 
                     state._fsp--;
@@ -1014,7 +1014,7 @@ public final EObject ruleXImportDeclaration() throws RecognitionException {
                              			current, 
                              			"importedNamespace",
                               		lv_importedNamespace_2_0, 
-                              		"QualifiedNameWithWildcard");
+                              		"org.eclipse.xtext.xbase.Xtype.QualifiedNameWithWildcard");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -1030,7 +1030,7 @@ public final EObject ruleXImportDeclaration() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:374:3: (otherlv_3= ';' )?
+            // InternalCheck.g:374:3: (otherlv_3= ';' )?
             int alt6=2;
             int LA6_0 = input.LA(1);
 
@@ -1039,9 +1039,9 @@ public final EObject ruleXImportDeclaration() throws RecognitionException {
             }
             switch (alt6) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:374:5: otherlv_3= ';'
+                    // InternalCheck.g:374:5: otherlv_3= ';'
                     {
-                    otherlv_3=(Token)match(input,21,FOLLOW_21_in_ruleXImportDeclaration667); if (state.failed) return current;
+                    otherlv_3=(Token)match(input,21,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_3, grammarAccess.getXImportDeclarationAccess().getSemicolonKeyword_2());
@@ -1076,7 +1076,7 @@ public final EObject ruleXImportDeclaration() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleCategory"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:390:1: entryRuleCategory returns [EObject current=null] : iv_ruleCategory= ruleCategory EOF ;
+    // InternalCheck.g:390:1: entryRuleCategory returns [EObject current=null] : iv_ruleCategory= ruleCategory EOF ;
     public final EObject entryRuleCategory() throws RecognitionException {
         EObject current = null;
 
@@ -1084,13 +1084,13 @@ public final EObject entryRuleCategory() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:391:2: (iv_ruleCategory= ruleCategory EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:392:2: iv_ruleCategory= ruleCategory EOF
+            // InternalCheck.g:391:2: (iv_ruleCategory= ruleCategory EOF )
+            // InternalCheck.g:392:2: iv_ruleCategory= ruleCategory EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getCategoryRule()); 
             }
-            pushFollow(FOLLOW_ruleCategory_in_entryRuleCategory709);
+            pushFollow(FOLLOW_1);
             iv_ruleCategory=ruleCategory();
 
             state._fsp--;
@@ -1098,7 +1098,7 @@ public final EObject entryRuleCategory() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleCategory; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleCategory719); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -1116,7 +1116,7 @@ public final EObject entryRuleCategory() throws RecognitionException {
 
 
     // $ANTLR start "ruleCategory"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:399:1: ruleCategory returns [EObject current=null] : (otherlv_0= 'category' ( (lv_id_1_0= ruleValidID ) )? ( (lv_label_2_0= RULE_STRING ) ) otherlv_3= '{' ( (lv_checks_4_0= ruleCheck ) )* otherlv_5= '}' ) ;
+    // InternalCheck.g:399:1: ruleCategory returns [EObject current=null] : (otherlv_0= 'category' ( (lv_id_1_0= ruleValidID ) )? ( (lv_label_2_0= RULE_STRING ) ) otherlv_3= '{' ( (lv_checks_4_0= ruleCheck ) )* otherlv_5= '}' ) ;
     public final EObject ruleCategory() throws RecognitionException {
         EObject current = null;
 
@@ -1132,19 +1132,19 @@ public final EObject ruleCategory() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:402:28: ( (otherlv_0= 'category' ( (lv_id_1_0= ruleValidID ) )? ( (lv_label_2_0= RULE_STRING ) ) otherlv_3= '{' ( (lv_checks_4_0= ruleCheck ) )* otherlv_5= '}' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:403:1: (otherlv_0= 'category' ( (lv_id_1_0= ruleValidID ) )? ( (lv_label_2_0= RULE_STRING ) ) otherlv_3= '{' ( (lv_checks_4_0= ruleCheck ) )* otherlv_5= '}' )
+            // InternalCheck.g:402:28: ( (otherlv_0= 'category' ( (lv_id_1_0= ruleValidID ) )? ( (lv_label_2_0= RULE_STRING ) ) otherlv_3= '{' ( (lv_checks_4_0= ruleCheck ) )* otherlv_5= '}' ) )
+            // InternalCheck.g:403:1: (otherlv_0= 'category' ( (lv_id_1_0= ruleValidID ) )? ( (lv_label_2_0= RULE_STRING ) ) otherlv_3= '{' ( (lv_checks_4_0= ruleCheck ) )* otherlv_5= '}' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:403:1: (otherlv_0= 'category' ( (lv_id_1_0= ruleValidID ) )? ( (lv_label_2_0= RULE_STRING ) ) otherlv_3= '{' ( (lv_checks_4_0= ruleCheck ) )* otherlv_5= '}' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:403:3: otherlv_0= 'category' ( (lv_id_1_0= ruleValidID ) )? ( (lv_label_2_0= RULE_STRING ) ) otherlv_3= '{' ( (lv_checks_4_0= ruleCheck ) )* otherlv_5= '}'
+            // InternalCheck.g:403:1: (otherlv_0= 'category' ( (lv_id_1_0= ruleValidID ) )? ( (lv_label_2_0= RULE_STRING ) ) otherlv_3= '{' ( (lv_checks_4_0= ruleCheck ) )* otherlv_5= '}' )
+            // InternalCheck.g:403:3: otherlv_0= 'category' ( (lv_id_1_0= ruleValidID ) )? ( (lv_label_2_0= RULE_STRING ) ) otherlv_3= '{' ( (lv_checks_4_0= ruleCheck ) )* otherlv_5= '}'
             {
-            otherlv_0=(Token)match(input,22,FOLLOW_22_in_ruleCategory756); if (state.failed) return current;
+            otherlv_0=(Token)match(input,22,FOLLOW_13); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getCategoryAccess().getCategoryKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:407:1: ( (lv_id_1_0= ruleValidID ) )?
+            // InternalCheck.g:407:1: ( (lv_id_1_0= ruleValidID ) )?
             int alt7=2;
             int LA7_0 = input.LA(1);
 
@@ -1153,17 +1153,17 @@ public final EObject ruleCategory() throws RecognitionException {
             }
             switch (alt7) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:408:1: (lv_id_1_0= ruleValidID )
+                    // InternalCheck.g:408:1: (lv_id_1_0= ruleValidID )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:408:1: (lv_id_1_0= ruleValidID )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:409:3: lv_id_1_0= ruleValidID
+                    // InternalCheck.g:408:1: (lv_id_1_0= ruleValidID )
+                    // InternalCheck.g:409:3: lv_id_1_0= ruleValidID
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getCategoryAccess().getIdValidIDParserRuleCall_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleValidID_in_ruleCategory777);
+                    pushFollow(FOLLOW_14);
                     lv_id_1_0=ruleValidID();
 
                     state._fsp--;
@@ -1177,7 +1177,7 @@ public final EObject ruleCategory() throws RecognitionException {
                              			current, 
                              			"id",
                               		lv_id_1_0, 
-                              		"ValidID");
+                              		"org.eclipse.xtext.xbase.Xtype.ValidID");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -1190,13 +1190,13 @@ public final EObject ruleCategory() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:425:3: ( (lv_label_2_0= RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:426:1: (lv_label_2_0= RULE_STRING )
+            // InternalCheck.g:425:3: ( (lv_label_2_0= RULE_STRING ) )
+            // InternalCheck.g:426:1: (lv_label_2_0= RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:426:1: (lv_label_2_0= RULE_STRING )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:427:3: lv_label_2_0= RULE_STRING
+            // InternalCheck.g:426:1: (lv_label_2_0= RULE_STRING )
+            // InternalCheck.g:427:3: lv_label_2_0= RULE_STRING
             {
-            lv_label_2_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleCategory795); if (state.failed) return current;
+            lv_label_2_0=(Token)match(input,RULE_STRING,FOLLOW_9); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(lv_label_2_0, grammarAccess.getCategoryAccess().getLabelSTRINGTerminalRuleCall_2_0()); 
@@ -1211,7 +1211,7 @@ public final EObject ruleCategory() throws RecognitionException {
                      			current, 
                      			"label",
                       		lv_label_2_0, 
-                      		"STRING");
+                      		"org.eclipse.xtext.xbase.Xtype.STRING");
               	    
             }
 
@@ -1220,13 +1220,13 @@ public final EObject ruleCategory() throws RecognitionException {
 
             }
 
-            otherlv_3=(Token)match(input,18,FOLLOW_18_in_ruleCategory812); if (state.failed) return current;
+            otherlv_3=(Token)match(input,18,FOLLOW_15); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_3, grammarAccess.getCategoryAccess().getLeftCurlyBracketKeyword_3());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:447:1: ( (lv_checks_4_0= ruleCheck ) )*
+            // InternalCheck.g:447:1: ( (lv_checks_4_0= ruleCheck ) )*
             loop8:
             do {
                 int alt8=2;
@@ -1239,17 +1239,17 @@ public final EObject ruleCategory() throws RecognitionException {
 
                 switch (alt8) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:448:1: (lv_checks_4_0= ruleCheck )
+            	    // InternalCheck.g:448:1: (lv_checks_4_0= ruleCheck )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:448:1: (lv_checks_4_0= ruleCheck )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:449:3: lv_checks_4_0= ruleCheck
+            	    // InternalCheck.g:448:1: (lv_checks_4_0= ruleCheck )
+            	    // InternalCheck.g:449:3: lv_checks_4_0= ruleCheck
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getCategoryAccess().getChecksCheckParserRuleCall_4_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleCheck_in_ruleCategory833);
+            	    pushFollow(FOLLOW_15);
             	    lv_checks_4_0=ruleCheck();
 
             	    state._fsp--;
@@ -1263,7 +1263,7 @@ public final EObject ruleCategory() throws RecognitionException {
             	             			current, 
             	             			"checks",
             	              		lv_checks_4_0, 
-            	              		"Check");
+            	              		"com.avaloq.tools.ddk.check.Check.Check");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -1279,7 +1279,7 @@ public final EObject ruleCategory() throws RecognitionException {
                 }
             } while (true);
 
-            otherlv_5=(Token)match(input,19,FOLLOW_19_in_ruleCategory846); if (state.failed) return current;
+            otherlv_5=(Token)match(input,19,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_5, grammarAccess.getCategoryAccess().getRightCurlyBracketKeyword_5());
@@ -1308,7 +1308,7 @@ public final EObject ruleCategory() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleCheck"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:477:1: entryRuleCheck returns [EObject current=null] : iv_ruleCheck= ruleCheck EOF ;
+    // InternalCheck.g:477:1: entryRuleCheck returns [EObject current=null] : iv_ruleCheck= ruleCheck EOF ;
     public final EObject entryRuleCheck() throws RecognitionException {
         EObject current = null;
 
@@ -1316,13 +1316,13 @@ public final EObject entryRuleCheck() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:478:2: (iv_ruleCheck= ruleCheck EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:479:2: iv_ruleCheck= ruleCheck EOF
+            // InternalCheck.g:478:2: (iv_ruleCheck= ruleCheck EOF )
+            // InternalCheck.g:479:2: iv_ruleCheck= ruleCheck EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getCheckRule()); 
             }
-            pushFollow(FOLLOW_ruleCheck_in_entryRuleCheck882);
+            pushFollow(FOLLOW_1);
             iv_ruleCheck=ruleCheck();
 
             state._fsp--;
@@ -1330,7 +1330,7 @@ public final EObject entryRuleCheck() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleCheck; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleCheck892); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -1348,7 +1348,7 @@ public final EObject entryRuleCheck() throws RecognitionException {
 
 
     // $ANTLR start "ruleCheck"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:486:1: ruleCheck returns [EObject current=null] : ( ( (lv_severityRange_0_0= ruleSeverityRange ) )? ( (lv_final_1_0= 'final' ) )? ( (lv_kind_2_0= ruleTriggerKind ) )? ( (lv_defaultSeverity_3_0= ruleSeverityKind ) ) ( (lv_id_4_0= ruleValidID ) )? ( (lv_label_5_0= RULE_STRING ) ) ( ( ( '(' )=>otherlv_6= '(' ) ( ( (lv_formalParameters_7_0= ruleFormalParameter ) ) (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )* )? otherlv_10= ')' )? (otherlv_11= 'message' ( (lv_givenMessage_12_0= RULE_STRING ) ) )? ( ( ( ( '{' )=>otherlv_13= '{' ) ( (lv_contexts_14_0= ruleContext ) )* otherlv_15= '}' ) | ( (lv_contexts_16_0= ruleContext ) )? ) ) ;
+    // InternalCheck.g:486:1: ruleCheck returns [EObject current=null] : ( ( (lv_severityRange_0_0= ruleSeverityRange ) )? ( (lv_final_1_0= 'final' ) )? ( (lv_kind_2_0= ruleTriggerKind ) )? ( (lv_defaultSeverity_3_0= ruleSeverityKind ) ) ( (lv_id_4_0= ruleValidID ) )? ( (lv_label_5_0= RULE_STRING ) ) ( ( ( '(' )=>otherlv_6= '(' ) ( ( (lv_formalParameters_7_0= ruleFormalParameter ) ) (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )* )? otherlv_10= ')' )? (otherlv_11= 'message' ( (lv_givenMessage_12_0= RULE_STRING ) ) )? ( ( ( ( '{' )=>otherlv_13= '{' ) ( (lv_contexts_14_0= ruleContext ) )* otherlv_15= '}' ) | ( (lv_contexts_16_0= ruleContext ) )? ) ) ;
     public final EObject ruleCheck() throws RecognitionException {
         EObject current = null;
 
@@ -1381,13 +1381,13 @@ public final EObject ruleCheck() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:489:28: ( ( ( (lv_severityRange_0_0= ruleSeverityRange ) )? ( (lv_final_1_0= 'final' ) )? ( (lv_kind_2_0= ruleTriggerKind ) )? ( (lv_defaultSeverity_3_0= ruleSeverityKind ) ) ( (lv_id_4_0= ruleValidID ) )? ( (lv_label_5_0= RULE_STRING ) ) ( ( ( '(' )=>otherlv_6= '(' ) ( ( (lv_formalParameters_7_0= ruleFormalParameter ) ) (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )* )? otherlv_10= ')' )? (otherlv_11= 'message' ( (lv_givenMessage_12_0= RULE_STRING ) ) )? ( ( ( ( '{' )=>otherlv_13= '{' ) ( (lv_contexts_14_0= ruleContext ) )* otherlv_15= '}' ) | ( (lv_contexts_16_0= ruleContext ) )? ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:490:1: ( ( (lv_severityRange_0_0= ruleSeverityRange ) )? ( (lv_final_1_0= 'final' ) )? ( (lv_kind_2_0= ruleTriggerKind ) )? ( (lv_defaultSeverity_3_0= ruleSeverityKind ) ) ( (lv_id_4_0= ruleValidID ) )? ( (lv_label_5_0= RULE_STRING ) ) ( ( ( '(' )=>otherlv_6= '(' ) ( ( (lv_formalParameters_7_0= ruleFormalParameter ) ) (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )* )? otherlv_10= ')' )? (otherlv_11= 'message' ( (lv_givenMessage_12_0= RULE_STRING ) ) )? ( ( ( ( '{' )=>otherlv_13= '{' ) ( (lv_contexts_14_0= ruleContext ) )* otherlv_15= '}' ) | ( (lv_contexts_16_0= ruleContext ) )? ) )
+            // InternalCheck.g:489:28: ( ( ( (lv_severityRange_0_0= ruleSeverityRange ) )? ( (lv_final_1_0= 'final' ) )? ( (lv_kind_2_0= ruleTriggerKind ) )? ( (lv_defaultSeverity_3_0= ruleSeverityKind ) ) ( (lv_id_4_0= ruleValidID ) )? ( (lv_label_5_0= RULE_STRING ) ) ( ( ( '(' )=>otherlv_6= '(' ) ( ( (lv_formalParameters_7_0= ruleFormalParameter ) ) (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )* )? otherlv_10= ')' )? (otherlv_11= 'message' ( (lv_givenMessage_12_0= RULE_STRING ) ) )? ( ( ( ( '{' )=>otherlv_13= '{' ) ( (lv_contexts_14_0= ruleContext ) )* otherlv_15= '}' ) | ( (lv_contexts_16_0= ruleContext ) )? ) ) )
+            // InternalCheck.g:490:1: ( ( (lv_severityRange_0_0= ruleSeverityRange ) )? ( (lv_final_1_0= 'final' ) )? ( (lv_kind_2_0= ruleTriggerKind ) )? ( (lv_defaultSeverity_3_0= ruleSeverityKind ) ) ( (lv_id_4_0= ruleValidID ) )? ( (lv_label_5_0= RULE_STRING ) ) ( ( ( '(' )=>otherlv_6= '(' ) ( ( (lv_formalParameters_7_0= ruleFormalParameter ) ) (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )* )? otherlv_10= ')' )? (otherlv_11= 'message' ( (lv_givenMessage_12_0= RULE_STRING ) ) )? ( ( ( ( '{' )=>otherlv_13= '{' ) ( (lv_contexts_14_0= ruleContext ) )* otherlv_15= '}' ) | ( (lv_contexts_16_0= ruleContext ) )? ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:490:1: ( ( (lv_severityRange_0_0= ruleSeverityRange ) )? ( (lv_final_1_0= 'final' ) )? ( (lv_kind_2_0= ruleTriggerKind ) )? ( (lv_defaultSeverity_3_0= ruleSeverityKind ) ) ( (lv_id_4_0= ruleValidID ) )? ( (lv_label_5_0= RULE_STRING ) ) ( ( ( '(' )=>otherlv_6= '(' ) ( ( (lv_formalParameters_7_0= ruleFormalParameter ) ) (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )* )? otherlv_10= ')' )? (otherlv_11= 'message' ( (lv_givenMessage_12_0= RULE_STRING ) ) )? ( ( ( ( '{' )=>otherlv_13= '{' ) ( (lv_contexts_14_0= ruleContext ) )* otherlv_15= '}' ) | ( (lv_contexts_16_0= ruleContext ) )? ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:490:2: ( (lv_severityRange_0_0= ruleSeverityRange ) )? ( (lv_final_1_0= 'final' ) )? ( (lv_kind_2_0= ruleTriggerKind ) )? ( (lv_defaultSeverity_3_0= ruleSeverityKind ) ) ( (lv_id_4_0= ruleValidID ) )? ( (lv_label_5_0= RULE_STRING ) ) ( ( ( '(' )=>otherlv_6= '(' ) ( ( (lv_formalParameters_7_0= ruleFormalParameter ) ) (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )* )? otherlv_10= ')' )? (otherlv_11= 'message' ( (lv_givenMessage_12_0= RULE_STRING ) ) )? ( ( ( ( '{' )=>otherlv_13= '{' ) ( (lv_contexts_14_0= ruleContext ) )* otherlv_15= '}' ) | ( (lv_contexts_16_0= ruleContext ) )? )
+            // InternalCheck.g:490:1: ( ( (lv_severityRange_0_0= ruleSeverityRange ) )? ( (lv_final_1_0= 'final' ) )? ( (lv_kind_2_0= ruleTriggerKind ) )? ( (lv_defaultSeverity_3_0= ruleSeverityKind ) ) ( (lv_id_4_0= ruleValidID ) )? ( (lv_label_5_0= RULE_STRING ) ) ( ( ( '(' )=>otherlv_6= '(' ) ( ( (lv_formalParameters_7_0= ruleFormalParameter ) ) (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )* )? otherlv_10= ')' )? (otherlv_11= 'message' ( (lv_givenMessage_12_0= RULE_STRING ) ) )? ( ( ( ( '{' )=>otherlv_13= '{' ) ( (lv_contexts_14_0= ruleContext ) )* otherlv_15= '}' ) | ( (lv_contexts_16_0= ruleContext ) )? ) )
+            // InternalCheck.g:490:2: ( (lv_severityRange_0_0= ruleSeverityRange ) )? ( (lv_final_1_0= 'final' ) )? ( (lv_kind_2_0= ruleTriggerKind ) )? ( (lv_defaultSeverity_3_0= ruleSeverityKind ) ) ( (lv_id_4_0= ruleValidID ) )? ( (lv_label_5_0= RULE_STRING ) ) ( ( ( '(' )=>otherlv_6= '(' ) ( ( (lv_formalParameters_7_0= ruleFormalParameter ) ) (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )* )? otherlv_10= ')' )? (otherlv_11= 'message' ( (lv_givenMessage_12_0= RULE_STRING ) ) )? ( ( ( ( '{' )=>otherlv_13= '{' ) ( (lv_contexts_14_0= ruleContext ) )* otherlv_15= '}' ) | ( (lv_contexts_16_0= ruleContext ) )? )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:490:2: ( (lv_severityRange_0_0= ruleSeverityRange ) )?
+            // InternalCheck.g:490:2: ( (lv_severityRange_0_0= ruleSeverityRange ) )?
             int alt9=2;
             int LA9_0 = input.LA(1);
 
@@ -1396,17 +1396,17 @@ public final EObject ruleCheck() throws RecognitionException {
             }
             switch (alt9) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:491:1: (lv_severityRange_0_0= ruleSeverityRange )
+                    // InternalCheck.g:491:1: (lv_severityRange_0_0= ruleSeverityRange )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:491:1: (lv_severityRange_0_0= ruleSeverityRange )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:492:3: lv_severityRange_0_0= ruleSeverityRange
+                    // InternalCheck.g:491:1: (lv_severityRange_0_0= ruleSeverityRange )
+                    // InternalCheck.g:492:3: lv_severityRange_0_0= ruleSeverityRange
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getCheckAccess().getSeverityRangeSeverityRangeParserRuleCall_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleSeverityRange_in_ruleCheck938);
+                    pushFollow(FOLLOW_16);
                     lv_severityRange_0_0=ruleSeverityRange();
 
                     state._fsp--;
@@ -1420,7 +1420,7 @@ public final EObject ruleCheck() throws RecognitionException {
                              			current, 
                              			"severityRange",
                               		lv_severityRange_0_0, 
-                              		"SeverityRange");
+                              		"com.avaloq.tools.ddk.check.Check.SeverityRange");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -1433,7 +1433,7 @@ public final EObject ruleCheck() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:508:3: ( (lv_final_1_0= 'final' ) )?
+            // InternalCheck.g:508:3: ( (lv_final_1_0= 'final' ) )?
             int alt10=2;
             int LA10_0 = input.LA(1);
 
@@ -1442,12 +1442,12 @@ public final EObject ruleCheck() throws RecognitionException {
             }
             switch (alt10) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:509:1: (lv_final_1_0= 'final' )
+                    // InternalCheck.g:509:1: (lv_final_1_0= 'final' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:509:1: (lv_final_1_0= 'final' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:510:3: lv_final_1_0= 'final'
+                    // InternalCheck.g:509:1: (lv_final_1_0= 'final' )
+                    // InternalCheck.g:510:3: lv_final_1_0= 'final'
                     {
-                    lv_final_1_0=(Token)match(input,14,FOLLOW_14_in_ruleCheck957); if (state.failed) return current;
+                    lv_final_1_0=(Token)match(input,14,FOLLOW_16); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_final_1_0, grammarAccess.getCheckAccess().getFinalFinalKeyword_1_0());
@@ -1470,7 +1470,7 @@ public final EObject ruleCheck() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:523:3: ( (lv_kind_2_0= ruleTriggerKind ) )?
+            // InternalCheck.g:523:3: ( (lv_kind_2_0= ruleTriggerKind ) )?
             int alt11=2;
             int LA11_0 = input.LA(1);
 
@@ -1479,17 +1479,17 @@ public final EObject ruleCheck() throws RecognitionException {
             }
             switch (alt11) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:524:1: (lv_kind_2_0= ruleTriggerKind )
+                    // InternalCheck.g:524:1: (lv_kind_2_0= ruleTriggerKind )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:524:1: (lv_kind_2_0= ruleTriggerKind )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:525:3: lv_kind_2_0= ruleTriggerKind
+                    // InternalCheck.g:524:1: (lv_kind_2_0= ruleTriggerKind )
+                    // InternalCheck.g:525:3: lv_kind_2_0= ruleTriggerKind
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getCheckAccess().getKindTriggerKindEnumRuleCall_2_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleTriggerKind_in_ruleCheck992);
+                    pushFollow(FOLLOW_16);
                     lv_kind_2_0=ruleTriggerKind();
 
                     state._fsp--;
@@ -1503,7 +1503,7 @@ public final EObject ruleCheck() throws RecognitionException {
                              			current, 
                              			"kind",
                               		lv_kind_2_0, 
-                              		"TriggerKind");
+                              		"com.avaloq.tools.ddk.check.Check.TriggerKind");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -1516,18 +1516,18 @@ public final EObject ruleCheck() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:541:3: ( (lv_defaultSeverity_3_0= ruleSeverityKind ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:542:1: (lv_defaultSeverity_3_0= ruleSeverityKind )
+            // InternalCheck.g:541:3: ( (lv_defaultSeverity_3_0= ruleSeverityKind ) )
+            // InternalCheck.g:542:1: (lv_defaultSeverity_3_0= ruleSeverityKind )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:542:1: (lv_defaultSeverity_3_0= ruleSeverityKind )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:543:3: lv_defaultSeverity_3_0= ruleSeverityKind
+            // InternalCheck.g:542:1: (lv_defaultSeverity_3_0= ruleSeverityKind )
+            // InternalCheck.g:543:3: lv_defaultSeverity_3_0= ruleSeverityKind
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getCheckAccess().getDefaultSeveritySeverityKindEnumRuleCall_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleSeverityKind_in_ruleCheck1014);
+            pushFollow(FOLLOW_13);
             lv_defaultSeverity_3_0=ruleSeverityKind();
 
             state._fsp--;
@@ -1541,7 +1541,7 @@ public final EObject ruleCheck() throws RecognitionException {
                      			current, 
                      			"defaultSeverity",
                       		lv_defaultSeverity_3_0, 
-                      		"SeverityKind");
+                      		"com.avaloq.tools.ddk.check.Check.SeverityKind");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -1551,7 +1551,7 @@ public final EObject ruleCheck() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:559:2: ( (lv_id_4_0= ruleValidID ) )?
+            // InternalCheck.g:559:2: ( (lv_id_4_0= ruleValidID ) )?
             int alt12=2;
             int LA12_0 = input.LA(1);
 
@@ -1560,17 +1560,17 @@ public final EObject ruleCheck() throws RecognitionException {
             }
             switch (alt12) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:560:1: (lv_id_4_0= ruleValidID )
+                    // InternalCheck.g:560:1: (lv_id_4_0= ruleValidID )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:560:1: (lv_id_4_0= ruleValidID )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:561:3: lv_id_4_0= ruleValidID
+                    // InternalCheck.g:560:1: (lv_id_4_0= ruleValidID )
+                    // InternalCheck.g:561:3: lv_id_4_0= ruleValidID
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getCheckAccess().getIdValidIDParserRuleCall_4_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleValidID_in_ruleCheck1035);
+                    pushFollow(FOLLOW_14);
                     lv_id_4_0=ruleValidID();
 
                     state._fsp--;
@@ -1584,7 +1584,7 @@ public final EObject ruleCheck() throws RecognitionException {
                              			current, 
                              			"id",
                               		lv_id_4_0, 
-                              		"ValidID");
+                              		"org.eclipse.xtext.xbase.Xtype.ValidID");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -1597,13 +1597,13 @@ public final EObject ruleCheck() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:577:3: ( (lv_label_5_0= RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:578:1: (lv_label_5_0= RULE_STRING )
+            // InternalCheck.g:577:3: ( (lv_label_5_0= RULE_STRING ) )
+            // InternalCheck.g:578:1: (lv_label_5_0= RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:578:1: (lv_label_5_0= RULE_STRING )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:579:3: lv_label_5_0= RULE_STRING
+            // InternalCheck.g:578:1: (lv_label_5_0= RULE_STRING )
+            // InternalCheck.g:579:3: lv_label_5_0= RULE_STRING
             {
-            lv_label_5_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleCheck1053); if (state.failed) return current;
+            lv_label_5_0=(Token)match(input,RULE_STRING,FOLLOW_17); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(lv_label_5_0, grammarAccess.getCheckAccess().getLabelSTRINGTerminalRuleCall_5_0()); 
@@ -1618,7 +1618,7 @@ public final EObject ruleCheck() throws RecognitionException {
                      			current, 
                      			"label",
                       		lv_label_5_0, 
-                      		"STRING");
+                      		"org.eclipse.xtext.xbase.Xtype.STRING");
               	    
             }
 
@@ -1627,17 +1627,17 @@ public final EObject ruleCheck() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:595:2: ( ( ( '(' )=>otherlv_6= '(' ) ( ( (lv_formalParameters_7_0= ruleFormalParameter ) ) (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )* )? otherlv_10= ')' )?
+            // InternalCheck.g:595:2: ( ( ( '(' )=>otherlv_6= '(' ) ( ( (lv_formalParameters_7_0= ruleFormalParameter ) ) (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )* )? otherlv_10= ')' )?
             int alt15=2;
             alt15 = dfa15.predict(input);
             switch (alt15) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:595:3: ( ( '(' )=>otherlv_6= '(' ) ( ( (lv_formalParameters_7_0= ruleFormalParameter ) ) (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )* )? otherlv_10= ')'
+                    // InternalCheck.g:595:3: ( ( '(' )=>otherlv_6= '(' ) ( ( (lv_formalParameters_7_0= ruleFormalParameter ) ) (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )* )? otherlv_10= ')'
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:595:3: ( ( '(' )=>otherlv_6= '(' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:595:4: ( '(' )=>otherlv_6= '('
+                    // InternalCheck.g:595:3: ( ( '(' )=>otherlv_6= '(' )
+                    // InternalCheck.g:595:4: ( '(' )=>otherlv_6= '('
                     {
-                    otherlv_6=(Token)match(input,23,FOLLOW_23_in_ruleCheck1079); if (state.failed) return current;
+                    otherlv_6=(Token)match(input,23,FOLLOW_18); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_6, grammarAccess.getCheckAccess().getLeftParenthesisKeyword_6_0());
@@ -1646,7 +1646,7 @@ public final EObject ruleCheck() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:600:2: ( ( (lv_formalParameters_7_0= ruleFormalParameter ) ) (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )* )?
+                    // InternalCheck.g:600:2: ( ( (lv_formalParameters_7_0= ruleFormalParameter ) ) (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )* )?
                     int alt14=2;
                     int LA14_0 = input.LA(1);
 
@@ -1655,20 +1655,20 @@ public final EObject ruleCheck() throws RecognitionException {
                     }
                     switch (alt14) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:600:3: ( (lv_formalParameters_7_0= ruleFormalParameter ) ) (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )*
+                            // InternalCheck.g:600:3: ( (lv_formalParameters_7_0= ruleFormalParameter ) ) (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )*
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:600:3: ( (lv_formalParameters_7_0= ruleFormalParameter ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:601:1: (lv_formalParameters_7_0= ruleFormalParameter )
+                            // InternalCheck.g:600:3: ( (lv_formalParameters_7_0= ruleFormalParameter ) )
+                            // InternalCheck.g:601:1: (lv_formalParameters_7_0= ruleFormalParameter )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:601:1: (lv_formalParameters_7_0= ruleFormalParameter )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:602:3: lv_formalParameters_7_0= ruleFormalParameter
+                            // InternalCheck.g:601:1: (lv_formalParameters_7_0= ruleFormalParameter )
+                            // InternalCheck.g:602:3: lv_formalParameters_7_0= ruleFormalParameter
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getCheckAccess().getFormalParametersFormalParameterParserRuleCall_6_1_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleFormalParameter_in_ruleCheck1102);
+                            pushFollow(FOLLOW_19);
                             lv_formalParameters_7_0=ruleFormalParameter();
 
                             state._fsp--;
@@ -1682,7 +1682,7 @@ public final EObject ruleCheck() throws RecognitionException {
                                      			current, 
                                      			"formalParameters",
                                       		lv_formalParameters_7_0, 
-                                      		"FormalParameter");
+                                      		"com.avaloq.tools.ddk.check.Check.FormalParameter");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -1692,7 +1692,7 @@ public final EObject ruleCheck() throws RecognitionException {
 
                             }
 
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:618:2: (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )*
+                            // InternalCheck.g:618:2: (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )*
                             loop13:
                             do {
                                 int alt13=2;
@@ -1705,26 +1705,26 @@ public final EObject ruleCheck() throws RecognitionException {
 
                                 switch (alt13) {
                             	case 1 :
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:618:4: otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) )
+                            	    // InternalCheck.g:618:4: otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) )
                             	    {
-                            	    otherlv_8=(Token)match(input,24,FOLLOW_24_in_ruleCheck1115); if (state.failed) return current;
+                            	    otherlv_8=(Token)match(input,24,FOLLOW_3); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	          	newLeafNode(otherlv_8, grammarAccess.getCheckAccess().getCommaKeyword_6_1_1_0());
                             	          
                             	    }
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:622:1: ( (lv_formalParameters_9_0= ruleFormalParameter ) )
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:623:1: (lv_formalParameters_9_0= ruleFormalParameter )
+                            	    // InternalCheck.g:622:1: ( (lv_formalParameters_9_0= ruleFormalParameter ) )
+                            	    // InternalCheck.g:623:1: (lv_formalParameters_9_0= ruleFormalParameter )
                             	    {
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:623:1: (lv_formalParameters_9_0= ruleFormalParameter )
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:624:3: lv_formalParameters_9_0= ruleFormalParameter
+                            	    // InternalCheck.g:623:1: (lv_formalParameters_9_0= ruleFormalParameter )
+                            	    // InternalCheck.g:624:3: lv_formalParameters_9_0= ruleFormalParameter
                             	    {
                             	    if ( state.backtracking==0 ) {
                             	       
                             	      	        newCompositeNode(grammarAccess.getCheckAccess().getFormalParametersFormalParameterParserRuleCall_6_1_1_1_0()); 
                             	      	    
                             	    }
-                            	    pushFollow(FOLLOW_ruleFormalParameter_in_ruleCheck1136);
+                            	    pushFollow(FOLLOW_19);
                             	    lv_formalParameters_9_0=ruleFormalParameter();
 
                             	    state._fsp--;
@@ -1738,7 +1738,7 @@ public final EObject ruleCheck() throws RecognitionException {
                             	             			current, 
                             	             			"formalParameters",
                             	              		lv_formalParameters_9_0, 
-                            	              		"FormalParameter");
+                            	              		"com.avaloq.tools.ddk.check.Check.FormalParameter");
                             	      	        afterParserOrEnumRuleCall();
                             	      	    
                             	    }
@@ -1763,7 +1763,7 @@ public final EObject ruleCheck() throws RecognitionException {
 
                     }
 
-                    otherlv_10=(Token)match(input,25,FOLLOW_25_in_ruleCheck1152); if (state.failed) return current;
+                    otherlv_10=(Token)match(input,25,FOLLOW_20); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_10, grammarAccess.getCheckAccess().getRightParenthesisKeyword_6_2());
@@ -1775,7 +1775,7 @@ public final EObject ruleCheck() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:644:3: (otherlv_11= 'message' ( (lv_givenMessage_12_0= RULE_STRING ) ) )?
+            // InternalCheck.g:644:3: (otherlv_11= 'message' ( (lv_givenMessage_12_0= RULE_STRING ) ) )?
             int alt16=2;
             int LA16_0 = input.LA(1);
 
@@ -1784,21 +1784,21 @@ public final EObject ruleCheck() throws RecognitionException {
             }
             switch (alt16) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:644:5: otherlv_11= 'message' ( (lv_givenMessage_12_0= RULE_STRING ) )
+                    // InternalCheck.g:644:5: otherlv_11= 'message' ( (lv_givenMessage_12_0= RULE_STRING ) )
                     {
-                    otherlv_11=(Token)match(input,26,FOLLOW_26_in_ruleCheck1167); if (state.failed) return current;
+                    otherlv_11=(Token)match(input,26,FOLLOW_14); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_11, grammarAccess.getCheckAccess().getMessageKeyword_7_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:648:1: ( (lv_givenMessage_12_0= RULE_STRING ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:649:1: (lv_givenMessage_12_0= RULE_STRING )
+                    // InternalCheck.g:648:1: ( (lv_givenMessage_12_0= RULE_STRING ) )
+                    // InternalCheck.g:649:1: (lv_givenMessage_12_0= RULE_STRING )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:649:1: (lv_givenMessage_12_0= RULE_STRING )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:650:3: lv_givenMessage_12_0= RULE_STRING
+                    // InternalCheck.g:649:1: (lv_givenMessage_12_0= RULE_STRING )
+                    // InternalCheck.g:650:3: lv_givenMessage_12_0= RULE_STRING
                     {
-                    lv_givenMessage_12_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleCheck1184); if (state.failed) return current;
+                    lv_givenMessage_12_0=(Token)match(input,RULE_STRING,FOLLOW_21); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			newLeafNode(lv_givenMessage_12_0, grammarAccess.getCheckAccess().getGivenMessageSTRINGTerminalRuleCall_7_1_0()); 
@@ -1813,7 +1813,7 @@ public final EObject ruleCheck() throws RecognitionException {
                              			current, 
                              			"givenMessage",
                               		lv_givenMessage_12_0, 
-                              		"STRING");
+                              		"org.eclipse.xtext.xbase.Xtype.STRING");
                       	    
                     }
 
@@ -1828,7 +1828,7 @@ public final EObject ruleCheck() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:666:4: ( ( ( ( '{' )=>otherlv_13= '{' ) ( (lv_contexts_14_0= ruleContext ) )* otherlv_15= '}' ) | ( (lv_contexts_16_0= ruleContext ) )? )
+            // InternalCheck.g:666:4: ( ( ( ( '{' )=>otherlv_13= '{' ) ( (lv_contexts_14_0= ruleContext ) )* otherlv_15= '}' ) | ( (lv_contexts_16_0= ruleContext ) )? )
             int alt19=2;
             int LA19_0 = input.LA(1);
 
@@ -1847,15 +1847,15 @@ else if ( (LA19_0==EOF||LA19_0==RULE_ID||LA19_0==14||LA19_0==16||LA19_0==19||(LA
             }
             switch (alt19) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:666:5: ( ( ( '{' )=>otherlv_13= '{' ) ( (lv_contexts_14_0= ruleContext ) )* otherlv_15= '}' )
+                    // InternalCheck.g:666:5: ( ( ( '{' )=>otherlv_13= '{' ) ( (lv_contexts_14_0= ruleContext ) )* otherlv_15= '}' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:666:5: ( ( ( '{' )=>otherlv_13= '{' ) ( (lv_contexts_14_0= ruleContext ) )* otherlv_15= '}' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:666:6: ( ( '{' )=>otherlv_13= '{' ) ( (lv_contexts_14_0= ruleContext ) )* otherlv_15= '}'
+                    // InternalCheck.g:666:5: ( ( ( '{' )=>otherlv_13= '{' ) ( (lv_contexts_14_0= ruleContext ) )* otherlv_15= '}' )
+                    // InternalCheck.g:666:6: ( ( '{' )=>otherlv_13= '{' ) ( (lv_contexts_14_0= ruleContext ) )* otherlv_15= '}'
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:666:6: ( ( '{' )=>otherlv_13= '{' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:666:7: ( '{' )=>otherlv_13= '{'
+                    // InternalCheck.g:666:6: ( ( '{' )=>otherlv_13= '{' )
+                    // InternalCheck.g:666:7: ( '{' )=>otherlv_13= '{'
                     {
-                    otherlv_13=(Token)match(input,18,FOLLOW_18_in_ruleCheck1213); if (state.failed) return current;
+                    otherlv_13=(Token)match(input,18,FOLLOW_22); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_13, grammarAccess.getCheckAccess().getLeftCurlyBracketKeyword_8_0_0());
@@ -1864,7 +1864,7 @@ else if ( (LA19_0==EOF||LA19_0==RULE_ID||LA19_0==14||LA19_0==16||LA19_0==19||(LA
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:671:2: ( (lv_contexts_14_0= ruleContext ) )*
+                    // InternalCheck.g:671:2: ( (lv_contexts_14_0= ruleContext ) )*
                     loop17:
                     do {
                         int alt17=2;
@@ -1877,17 +1877,17 @@ else if ( (LA19_0==EOF||LA19_0==RULE_ID||LA19_0==14||LA19_0==16||LA19_0==19||(LA
 
                         switch (alt17) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:672:1: (lv_contexts_14_0= ruleContext )
+                    	    // InternalCheck.g:672:1: (lv_contexts_14_0= ruleContext )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:672:1: (lv_contexts_14_0= ruleContext )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:673:3: lv_contexts_14_0= ruleContext
+                    	    // InternalCheck.g:672:1: (lv_contexts_14_0= ruleContext )
+                    	    // InternalCheck.g:673:3: lv_contexts_14_0= ruleContext
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getCheckAccess().getContextsContextParserRuleCall_8_0_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleContext_in_ruleCheck1235);
+                    	    pushFollow(FOLLOW_22);
                     	    lv_contexts_14_0=ruleContext();
 
                     	    state._fsp--;
@@ -1901,7 +1901,7 @@ else if ( (LA19_0==EOF||LA19_0==RULE_ID||LA19_0==14||LA19_0==16||LA19_0==19||(LA
                     	             			current, 
                     	             			"contexts",
                     	              		lv_contexts_14_0, 
-                    	              		"Context");
+                    	              		"com.avaloq.tools.ddk.check.Check.Context");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -1917,7 +1917,7 @@ else if ( (LA19_0==EOF||LA19_0==RULE_ID||LA19_0==14||LA19_0==16||LA19_0==19||(LA
                         }
                     } while (true);
 
-                    otherlv_15=(Token)match(input,19,FOLLOW_19_in_ruleCheck1248); if (state.failed) return current;
+                    otherlv_15=(Token)match(input,19,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_15, grammarAccess.getCheckAccess().getRightCurlyBracketKeyword_8_0_2());
@@ -1930,9 +1930,9 @@ else if ( (LA19_0==EOF||LA19_0==RULE_ID||LA19_0==14||LA19_0==16||LA19_0==19||(LA
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:694:6: ( (lv_contexts_16_0= ruleContext ) )?
+                    // InternalCheck.g:694:6: ( (lv_contexts_16_0= ruleContext ) )?
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:694:6: ( (lv_contexts_16_0= ruleContext ) )?
+                    // InternalCheck.g:694:6: ( (lv_contexts_16_0= ruleContext ) )?
                     int alt18=2;
                     int LA18_0 = input.LA(1);
 
@@ -1941,17 +1941,17 @@ else if ( (LA19_0==EOF||LA19_0==RULE_ID||LA19_0==14||LA19_0==16||LA19_0==19||(LA
                     }
                     switch (alt18) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:695:1: (lv_contexts_16_0= ruleContext )
+                            // InternalCheck.g:695:1: (lv_contexts_16_0= ruleContext )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:695:1: (lv_contexts_16_0= ruleContext )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:696:3: lv_contexts_16_0= ruleContext
+                            // InternalCheck.g:695:1: (lv_contexts_16_0= ruleContext )
+                            // InternalCheck.g:696:3: lv_contexts_16_0= ruleContext
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getCheckAccess().getContextsContextParserRuleCall_8_1_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleContext_in_ruleCheck1276);
+                            pushFollow(FOLLOW_2);
                             lv_contexts_16_0=ruleContext();
 
                             state._fsp--;
@@ -1965,7 +1965,7 @@ else if ( (LA19_0==EOF||LA19_0==RULE_ID||LA19_0==14||LA19_0==16||LA19_0==19||(LA
                                      			current, 
                                      			"contexts",
                                       		lv_contexts_16_0, 
-                                      		"Context");
+                                      		"com.avaloq.tools.ddk.check.Check.Context");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -2007,7 +2007,7 @@ else if ( (LA19_0==EOF||LA19_0==RULE_ID||LA19_0==14||LA19_0==16||LA19_0==19||(LA
 
 
     // $ANTLR start "entryRuleSeverityRange"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:720:1: entryRuleSeverityRange returns [EObject current=null] : iv_ruleSeverityRange= ruleSeverityRange EOF ;
+    // InternalCheck.g:720:1: entryRuleSeverityRange returns [EObject current=null] : iv_ruleSeverityRange= ruleSeverityRange EOF ;
     public final EObject entryRuleSeverityRange() throws RecognitionException {
         EObject current = null;
 
@@ -2015,13 +2015,13 @@ public final EObject entryRuleSeverityRange() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:721:2: (iv_ruleSeverityRange= ruleSeverityRange EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:722:2: iv_ruleSeverityRange= ruleSeverityRange EOF
+            // InternalCheck.g:721:2: (iv_ruleSeverityRange= ruleSeverityRange EOF )
+            // InternalCheck.g:722:2: iv_ruleSeverityRange= ruleSeverityRange EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getSeverityRangeRule()); 
             }
-            pushFollow(FOLLOW_ruleSeverityRange_in_entryRuleSeverityRange1314);
+            pushFollow(FOLLOW_1);
             iv_ruleSeverityRange=ruleSeverityRange();
 
             state._fsp--;
@@ -2029,7 +2029,7 @@ public final EObject entryRuleSeverityRange() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleSeverityRange; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSeverityRange1324); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -2047,7 +2047,7 @@ public final EObject entryRuleSeverityRange() throws RecognitionException {
 
 
     // $ANTLR start "ruleSeverityRange"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:729:1: ruleSeverityRange returns [EObject current=null] : (otherlv_0= '@' otherlv_1= 'SeverityRange' otherlv_2= '(' ( (lv_minSeverity_3_0= ruleSeverityKind ) ) otherlv_4= '..' ( (lv_maxSeverity_5_0= ruleSeverityKind ) ) otherlv_6= ')' ) ;
+    // InternalCheck.g:729:1: ruleSeverityRange returns [EObject current=null] : (otherlv_0= '@' otherlv_1= 'SeverityRange' otherlv_2= '(' ( (lv_minSeverity_3_0= ruleSeverityKind ) ) otherlv_4= '..' ( (lv_maxSeverity_5_0= ruleSeverityKind ) ) otherlv_6= ')' ) ;
     public final EObject ruleSeverityRange() throws RecognitionException {
         EObject current = null;
 
@@ -2064,42 +2064,42 @@ public final EObject ruleSeverityRange() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:732:28: ( (otherlv_0= '@' otherlv_1= 'SeverityRange' otherlv_2= '(' ( (lv_minSeverity_3_0= ruleSeverityKind ) ) otherlv_4= '..' ( (lv_maxSeverity_5_0= ruleSeverityKind ) ) otherlv_6= ')' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:733:1: (otherlv_0= '@' otherlv_1= 'SeverityRange' otherlv_2= '(' ( (lv_minSeverity_3_0= ruleSeverityKind ) ) otherlv_4= '..' ( (lv_maxSeverity_5_0= ruleSeverityKind ) ) otherlv_6= ')' )
+            // InternalCheck.g:732:28: ( (otherlv_0= '@' otherlv_1= 'SeverityRange' otherlv_2= '(' ( (lv_minSeverity_3_0= ruleSeverityKind ) ) otherlv_4= '..' ( (lv_maxSeverity_5_0= ruleSeverityKind ) ) otherlv_6= ')' ) )
+            // InternalCheck.g:733:1: (otherlv_0= '@' otherlv_1= 'SeverityRange' otherlv_2= '(' ( (lv_minSeverity_3_0= ruleSeverityKind ) ) otherlv_4= '..' ( (lv_maxSeverity_5_0= ruleSeverityKind ) ) otherlv_6= ')' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:733:1: (otherlv_0= '@' otherlv_1= 'SeverityRange' otherlv_2= '(' ( (lv_minSeverity_3_0= ruleSeverityKind ) ) otherlv_4= '..' ( (lv_maxSeverity_5_0= ruleSeverityKind ) ) otherlv_6= ')' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:733:3: otherlv_0= '@' otherlv_1= 'SeverityRange' otherlv_2= '(' ( (lv_minSeverity_3_0= ruleSeverityKind ) ) otherlv_4= '..' ( (lv_maxSeverity_5_0= ruleSeverityKind ) ) otherlv_6= ')'
+            // InternalCheck.g:733:1: (otherlv_0= '@' otherlv_1= 'SeverityRange' otherlv_2= '(' ( (lv_minSeverity_3_0= ruleSeverityKind ) ) otherlv_4= '..' ( (lv_maxSeverity_5_0= ruleSeverityKind ) ) otherlv_6= ')' )
+            // InternalCheck.g:733:3: otherlv_0= '@' otherlv_1= 'SeverityRange' otherlv_2= '(' ( (lv_minSeverity_3_0= ruleSeverityKind ) ) otherlv_4= '..' ( (lv_maxSeverity_5_0= ruleSeverityKind ) ) otherlv_6= ')'
             {
-            otherlv_0=(Token)match(input,27,FOLLOW_27_in_ruleSeverityRange1361); if (state.failed) return current;
+            otherlv_0=(Token)match(input,27,FOLLOW_23); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getSeverityRangeAccess().getCommercialAtKeyword_0());
                   
             }
-            otherlv_1=(Token)match(input,28,FOLLOW_28_in_ruleSeverityRange1373); if (state.failed) return current;
+            otherlv_1=(Token)match(input,28,FOLLOW_24); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getSeverityRangeAccess().getSeverityRangeKeyword_1());
                   
             }
-            otherlv_2=(Token)match(input,23,FOLLOW_23_in_ruleSeverityRange1385); if (state.failed) return current;
+            otherlv_2=(Token)match(input,23,FOLLOW_16); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getSeverityRangeAccess().getLeftParenthesisKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:745:1: ( (lv_minSeverity_3_0= ruleSeverityKind ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:746:1: (lv_minSeverity_3_0= ruleSeverityKind )
+            // InternalCheck.g:745:1: ( (lv_minSeverity_3_0= ruleSeverityKind ) )
+            // InternalCheck.g:746:1: (lv_minSeverity_3_0= ruleSeverityKind )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:746:1: (lv_minSeverity_3_0= ruleSeverityKind )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:747:3: lv_minSeverity_3_0= ruleSeverityKind
+            // InternalCheck.g:746:1: (lv_minSeverity_3_0= ruleSeverityKind )
+            // InternalCheck.g:747:3: lv_minSeverity_3_0= ruleSeverityKind
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getSeverityRangeAccess().getMinSeveritySeverityKindEnumRuleCall_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleSeverityKind_in_ruleSeverityRange1406);
+            pushFollow(FOLLOW_25);
             lv_minSeverity_3_0=ruleSeverityKind();
 
             state._fsp--;
@@ -2113,7 +2113,7 @@ public final EObject ruleSeverityRange() throws RecognitionException {
                      			current, 
                      			"minSeverity",
                       		lv_minSeverity_3_0, 
-                      		"SeverityKind");
+                      		"com.avaloq.tools.ddk.check.Check.SeverityKind");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -2123,24 +2123,24 @@ public final EObject ruleSeverityRange() throws RecognitionException {
 
             }
 
-            otherlv_4=(Token)match(input,29,FOLLOW_29_in_ruleSeverityRange1418); if (state.failed) return current;
+            otherlv_4=(Token)match(input,29,FOLLOW_16); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_4, grammarAccess.getSeverityRangeAccess().getFullStopFullStopKeyword_4());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:767:1: ( (lv_maxSeverity_5_0= ruleSeverityKind ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:768:1: (lv_maxSeverity_5_0= ruleSeverityKind )
+            // InternalCheck.g:767:1: ( (lv_maxSeverity_5_0= ruleSeverityKind ) )
+            // InternalCheck.g:768:1: (lv_maxSeverity_5_0= ruleSeverityKind )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:768:1: (lv_maxSeverity_5_0= ruleSeverityKind )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:769:3: lv_maxSeverity_5_0= ruleSeverityKind
+            // InternalCheck.g:768:1: (lv_maxSeverity_5_0= ruleSeverityKind )
+            // InternalCheck.g:769:3: lv_maxSeverity_5_0= ruleSeverityKind
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getSeverityRangeAccess().getMaxSeveritySeverityKindEnumRuleCall_5_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleSeverityKind_in_ruleSeverityRange1439);
+            pushFollow(FOLLOW_26);
             lv_maxSeverity_5_0=ruleSeverityKind();
 
             state._fsp--;
@@ -2154,7 +2154,7 @@ public final EObject ruleSeverityRange() throws RecognitionException {
                      			current, 
                      			"maxSeverity",
                       		lv_maxSeverity_5_0, 
-                      		"SeverityKind");
+                      		"com.avaloq.tools.ddk.check.Check.SeverityKind");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -2164,7 +2164,7 @@ public final EObject ruleSeverityRange() throws RecognitionException {
 
             }
 
-            otherlv_6=(Token)match(input,25,FOLLOW_25_in_ruleSeverityRange1451); if (state.failed) return current;
+            otherlv_6=(Token)match(input,25,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_6, grammarAccess.getSeverityRangeAccess().getRightParenthesisKeyword_6());
@@ -2193,7 +2193,7 @@ public final EObject ruleSeverityRange() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleMember"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:797:1: entryRuleMember returns [EObject current=null] : iv_ruleMember= ruleMember EOF ;
+    // InternalCheck.g:797:1: entryRuleMember returns [EObject current=null] : iv_ruleMember= ruleMember EOF ;
     public final EObject entryRuleMember() throws RecognitionException {
         EObject current = null;
 
@@ -2201,13 +2201,13 @@ public final EObject entryRuleMember() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:798:2: (iv_ruleMember= ruleMember EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:799:2: iv_ruleMember= ruleMember EOF
+            // InternalCheck.g:798:2: (iv_ruleMember= ruleMember EOF )
+            // InternalCheck.g:799:2: iv_ruleMember= ruleMember EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getMemberRule()); 
             }
-            pushFollow(FOLLOW_ruleMember_in_entryRuleMember1487);
+            pushFollow(FOLLOW_1);
             iv_ruleMember=ruleMember();
 
             state._fsp--;
@@ -2215,7 +2215,7 @@ public final EObject entryRuleMember() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleMember; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleMember1497); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -2233,7 +2233,7 @@ public final EObject entryRuleMember() throws RecognitionException {
 
 
     // $ANTLR start "ruleMember"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:806:1: ruleMember returns [EObject current=null] : ( ( (lv_annotations_0_0= ruleXAnnotation ) )* ( (lv_type_1_0= ruleJvmTypeReference ) ) ( (lv_name_2_0= ruleValidID ) ) ( ruleOpSingleAssign ( (lv_value_4_0= ruleXOrExpression ) ) )? otherlv_5= ';' ) ;
+    // InternalCheck.g:806:1: ruleMember returns [EObject current=null] : ( ( (lv_annotations_0_0= ruleXAnnotation ) )* ( (lv_type_1_0= ruleJvmTypeReference ) ) ( (lv_name_2_0= ruleValidID ) ) ( ruleOpSingleAssign ( (lv_value_4_0= ruleXOrExpression ) ) )? otherlv_5= ';' ) ;
     public final EObject ruleMember() throws RecognitionException {
         EObject current = null;
 
@@ -2250,13 +2250,13 @@ public final EObject ruleMember() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:809:28: ( ( ( (lv_annotations_0_0= ruleXAnnotation ) )* ( (lv_type_1_0= ruleJvmTypeReference ) ) ( (lv_name_2_0= ruleValidID ) ) ( ruleOpSingleAssign ( (lv_value_4_0= ruleXOrExpression ) ) )? otherlv_5= ';' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:810:1: ( ( (lv_annotations_0_0= ruleXAnnotation ) )* ( (lv_type_1_0= ruleJvmTypeReference ) ) ( (lv_name_2_0= ruleValidID ) ) ( ruleOpSingleAssign ( (lv_value_4_0= ruleXOrExpression ) ) )? otherlv_5= ';' )
+            // InternalCheck.g:809:28: ( ( ( (lv_annotations_0_0= ruleXAnnotation ) )* ( (lv_type_1_0= ruleJvmTypeReference ) ) ( (lv_name_2_0= ruleValidID ) ) ( ruleOpSingleAssign ( (lv_value_4_0= ruleXOrExpression ) ) )? otherlv_5= ';' ) )
+            // InternalCheck.g:810:1: ( ( (lv_annotations_0_0= ruleXAnnotation ) )* ( (lv_type_1_0= ruleJvmTypeReference ) ) ( (lv_name_2_0= ruleValidID ) ) ( ruleOpSingleAssign ( (lv_value_4_0= ruleXOrExpression ) ) )? otherlv_5= ';' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:810:1: ( ( (lv_annotations_0_0= ruleXAnnotation ) )* ( (lv_type_1_0= ruleJvmTypeReference ) ) ( (lv_name_2_0= ruleValidID ) ) ( ruleOpSingleAssign ( (lv_value_4_0= ruleXOrExpression ) ) )? otherlv_5= ';' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:810:2: ( (lv_annotations_0_0= ruleXAnnotation ) )* ( (lv_type_1_0= ruleJvmTypeReference ) ) ( (lv_name_2_0= ruleValidID ) ) ( ruleOpSingleAssign ( (lv_value_4_0= ruleXOrExpression ) ) )? otherlv_5= ';'
+            // InternalCheck.g:810:1: ( ( (lv_annotations_0_0= ruleXAnnotation ) )* ( (lv_type_1_0= ruleJvmTypeReference ) ) ( (lv_name_2_0= ruleValidID ) ) ( ruleOpSingleAssign ( (lv_value_4_0= ruleXOrExpression ) ) )? otherlv_5= ';' )
+            // InternalCheck.g:810:2: ( (lv_annotations_0_0= ruleXAnnotation ) )* ( (lv_type_1_0= ruleJvmTypeReference ) ) ( (lv_name_2_0= ruleValidID ) ) ( ruleOpSingleAssign ( (lv_value_4_0= ruleXOrExpression ) ) )? otherlv_5= ';'
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:810:2: ( (lv_annotations_0_0= ruleXAnnotation ) )*
+            // InternalCheck.g:810:2: ( (lv_annotations_0_0= ruleXAnnotation ) )*
             loop20:
             do {
                 int alt20=2;
@@ -2269,17 +2269,17 @@ public final EObject ruleMember() throws RecognitionException {
 
                 switch (alt20) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:811:1: (lv_annotations_0_0= ruleXAnnotation )
+            	    // InternalCheck.g:811:1: (lv_annotations_0_0= ruleXAnnotation )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:811:1: (lv_annotations_0_0= ruleXAnnotation )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:812:3: lv_annotations_0_0= ruleXAnnotation
+            	    // InternalCheck.g:811:1: (lv_annotations_0_0= ruleXAnnotation )
+            	    // InternalCheck.g:812:3: lv_annotations_0_0= ruleXAnnotation
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getMemberAccess().getAnnotationsXAnnotationParserRuleCall_0_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXAnnotation_in_ruleMember1543);
+            	    pushFollow(FOLLOW_27);
             	    lv_annotations_0_0=ruleXAnnotation();
 
             	    state._fsp--;
@@ -2293,7 +2293,7 @@ public final EObject ruleMember() throws RecognitionException {
             	             			current, 
             	             			"annotations",
             	              		lv_annotations_0_0, 
-            	              		"XAnnotation");
+            	              		"org.eclipse.xtext.xbase.annotations.XbaseWithAnnotations.XAnnotation");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -2309,18 +2309,18 @@ public final EObject ruleMember() throws RecognitionException {
                 }
             } while (true);
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:828:3: ( (lv_type_1_0= ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:829:1: (lv_type_1_0= ruleJvmTypeReference )
+            // InternalCheck.g:828:3: ( (lv_type_1_0= ruleJvmTypeReference ) )
+            // InternalCheck.g:829:1: (lv_type_1_0= ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:829:1: (lv_type_1_0= ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:830:3: lv_type_1_0= ruleJvmTypeReference
+            // InternalCheck.g:829:1: (lv_type_1_0= ruleJvmTypeReference )
+            // InternalCheck.g:830:3: lv_type_1_0= ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getMemberAccess().getTypeJvmTypeReferenceParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleMember1565);
+            pushFollow(FOLLOW_3);
             lv_type_1_0=ruleJvmTypeReference();
 
             state._fsp--;
@@ -2334,7 +2334,7 @@ public final EObject ruleMember() throws RecognitionException {
                      			current, 
                      			"type",
                       		lv_type_1_0, 
-                      		"JvmTypeReference");
+                      		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -2344,18 +2344,18 @@ public final EObject ruleMember() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:846:2: ( (lv_name_2_0= ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:847:1: (lv_name_2_0= ruleValidID )
+            // InternalCheck.g:846:2: ( (lv_name_2_0= ruleValidID ) )
+            // InternalCheck.g:847:1: (lv_name_2_0= ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:847:1: (lv_name_2_0= ruleValidID )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:848:3: lv_name_2_0= ruleValidID
+            // InternalCheck.g:847:1: (lv_name_2_0= ruleValidID )
+            // InternalCheck.g:848:3: lv_name_2_0= ruleValidID
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getMemberAccess().getNameValidIDParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleValidID_in_ruleMember1586);
+            pushFollow(FOLLOW_28);
             lv_name_2_0=ruleValidID();
 
             state._fsp--;
@@ -2369,7 +2369,7 @@ public final EObject ruleMember() throws RecognitionException {
                      			current, 
                      			"name",
                       		lv_name_2_0, 
-                      		"ValidID");
+                      		"org.eclipse.xtext.xbase.Xtype.ValidID");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -2379,7 +2379,7 @@ public final EObject ruleMember() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:864:2: ( ruleOpSingleAssign ( (lv_value_4_0= ruleXOrExpression ) ) )?
+            // InternalCheck.g:864:2: ( ruleOpSingleAssign ( (lv_value_4_0= ruleXOrExpression ) ) )?
             int alt21=2;
             int LA21_0 = input.LA(1);
 
@@ -2388,14 +2388,14 @@ public final EObject ruleMember() throws RecognitionException {
             }
             switch (alt21) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:865:5: ruleOpSingleAssign ( (lv_value_4_0= ruleXOrExpression ) )
+                    // InternalCheck.g:865:5: ruleOpSingleAssign ( (lv_value_4_0= ruleXOrExpression ) )
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getMemberAccess().getOpSingleAssignParserRuleCall_3_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleOpSingleAssign_in_ruleMember1603);
+                    pushFollow(FOLLOW_29);
                     ruleOpSingleAssign();
 
                     state._fsp--;
@@ -2405,18 +2405,18 @@ public final EObject ruleMember() throws RecognitionException {
                               afterParserOrEnumRuleCall();
                           
                     }
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:872:1: ( (lv_value_4_0= ruleXOrExpression ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:873:1: (lv_value_4_0= ruleXOrExpression )
+                    // InternalCheck.g:872:1: ( (lv_value_4_0= ruleXOrExpression ) )
+                    // InternalCheck.g:873:1: (lv_value_4_0= ruleXOrExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:873:1: (lv_value_4_0= ruleXOrExpression )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:874:3: lv_value_4_0= ruleXOrExpression
+                    // InternalCheck.g:873:1: (lv_value_4_0= ruleXOrExpression )
+                    // InternalCheck.g:874:3: lv_value_4_0= ruleXOrExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getMemberAccess().getValueXOrExpressionParserRuleCall_3_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXOrExpression_in_ruleMember1623);
+                    pushFollow(FOLLOW_30);
                     lv_value_4_0=ruleXOrExpression();
 
                     state._fsp--;
@@ -2430,7 +2430,7 @@ public final EObject ruleMember() throws RecognitionException {
                              			current, 
                              			"value",
                               		lv_value_4_0, 
-                              		"XOrExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XOrExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -2446,7 +2446,7 @@ public final EObject ruleMember() throws RecognitionException {
 
             }
 
-            otherlv_5=(Token)match(input,21,FOLLOW_21_in_ruleMember1637); if (state.failed) return current;
+            otherlv_5=(Token)match(input,21,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_5, grammarAccess.getMemberAccess().getSemicolonKeyword_4());
@@ -2475,7 +2475,7 @@ public final EObject ruleMember() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleImplementation"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:902:1: entryRuleImplementation returns [EObject current=null] : iv_ruleImplementation= ruleImplementation EOF ;
+    // InternalCheck.g:902:1: entryRuleImplementation returns [EObject current=null] : iv_ruleImplementation= ruleImplementation EOF ;
     public final EObject entryRuleImplementation() throws RecognitionException {
         EObject current = null;
 
@@ -2483,13 +2483,13 @@ public final EObject entryRuleImplementation() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:903:2: (iv_ruleImplementation= ruleImplementation EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:904:2: iv_ruleImplementation= ruleImplementation EOF
+            // InternalCheck.g:903:2: (iv_ruleImplementation= ruleImplementation EOF )
+            // InternalCheck.g:904:2: iv_ruleImplementation= ruleImplementation EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getImplementationRule()); 
             }
-            pushFollow(FOLLOW_ruleImplementation_in_entryRuleImplementation1673);
+            pushFollow(FOLLOW_1);
             iv_ruleImplementation=ruleImplementation();
 
             state._fsp--;
@@ -2497,7 +2497,7 @@ public final EObject entryRuleImplementation() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleImplementation; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleImplementation1683); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -2515,7 +2515,7 @@ public final EObject entryRuleImplementation() throws RecognitionException {
 
 
     // $ANTLR start "ruleImplementation"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:911:1: ruleImplementation returns [EObject current=null] : (otherlv_0= 'def' ( (lv_name_1_0= ruleValidID ) ) ( (lv_context_2_0= ruleContext ) ) ) ;
+    // InternalCheck.g:911:1: ruleImplementation returns [EObject current=null] : (otherlv_0= 'def' ( (lv_name_1_0= ruleValidID ) ) ( (lv_context_2_0= ruleContext ) ) ) ;
     public final EObject ruleImplementation() throws RecognitionException {
         EObject current = null;
 
@@ -2528,30 +2528,30 @@ public final EObject ruleImplementation() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:914:28: ( (otherlv_0= 'def' ( (lv_name_1_0= ruleValidID ) ) ( (lv_context_2_0= ruleContext ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:915:1: (otherlv_0= 'def' ( (lv_name_1_0= ruleValidID ) ) ( (lv_context_2_0= ruleContext ) ) )
+            // InternalCheck.g:914:28: ( (otherlv_0= 'def' ( (lv_name_1_0= ruleValidID ) ) ( (lv_context_2_0= ruleContext ) ) ) )
+            // InternalCheck.g:915:1: (otherlv_0= 'def' ( (lv_name_1_0= ruleValidID ) ) ( (lv_context_2_0= ruleContext ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:915:1: (otherlv_0= 'def' ( (lv_name_1_0= ruleValidID ) ) ( (lv_context_2_0= ruleContext ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:915:3: otherlv_0= 'def' ( (lv_name_1_0= ruleValidID ) ) ( (lv_context_2_0= ruleContext ) )
+            // InternalCheck.g:915:1: (otherlv_0= 'def' ( (lv_name_1_0= ruleValidID ) ) ( (lv_context_2_0= ruleContext ) ) )
+            // InternalCheck.g:915:3: otherlv_0= 'def' ( (lv_name_1_0= ruleValidID ) ) ( (lv_context_2_0= ruleContext ) )
             {
-            otherlv_0=(Token)match(input,30,FOLLOW_30_in_ruleImplementation1720); if (state.failed) return current;
+            otherlv_0=(Token)match(input,30,FOLLOW_3); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getImplementationAccess().getDefKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:919:1: ( (lv_name_1_0= ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:920:1: (lv_name_1_0= ruleValidID )
+            // InternalCheck.g:919:1: ( (lv_name_1_0= ruleValidID ) )
+            // InternalCheck.g:920:1: (lv_name_1_0= ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:920:1: (lv_name_1_0= ruleValidID )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:921:3: lv_name_1_0= ruleValidID
+            // InternalCheck.g:920:1: (lv_name_1_0= ruleValidID )
+            // InternalCheck.g:921:3: lv_name_1_0= ruleValidID
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getImplementationAccess().getNameValidIDParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleValidID_in_ruleImplementation1741);
+            pushFollow(FOLLOW_31);
             lv_name_1_0=ruleValidID();
 
             state._fsp--;
@@ -2565,7 +2565,7 @@ public final EObject ruleImplementation() throws RecognitionException {
                      			current, 
                      			"name",
                       		lv_name_1_0, 
-                      		"ValidID");
+                      		"org.eclipse.xtext.xbase.Xtype.ValidID");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -2575,18 +2575,18 @@ public final EObject ruleImplementation() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:937:2: ( (lv_context_2_0= ruleContext ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:938:1: (lv_context_2_0= ruleContext )
+            // InternalCheck.g:937:2: ( (lv_context_2_0= ruleContext ) )
+            // InternalCheck.g:938:1: (lv_context_2_0= ruleContext )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:938:1: (lv_context_2_0= ruleContext )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:939:3: lv_context_2_0= ruleContext
+            // InternalCheck.g:938:1: (lv_context_2_0= ruleContext )
+            // InternalCheck.g:939:3: lv_context_2_0= ruleContext
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getImplementationAccess().getContextContextParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleContext_in_ruleImplementation1762);
+            pushFollow(FOLLOW_2);
             lv_context_2_0=ruleContext();
 
             state._fsp--;
@@ -2600,7 +2600,7 @@ public final EObject ruleImplementation() throws RecognitionException {
                      			current, 
                      			"context",
                       		lv_context_2_0, 
-                      		"Context");
+                      		"com.avaloq.tools.ddk.check.Check.Context");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -2633,7 +2633,7 @@ public final EObject ruleImplementation() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleFormalParameter"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:963:1: entryRuleFormalParameter returns [EObject current=null] : iv_ruleFormalParameter= ruleFormalParameter EOF ;
+    // InternalCheck.g:963:1: entryRuleFormalParameter returns [EObject current=null] : iv_ruleFormalParameter= ruleFormalParameter EOF ;
     public final EObject entryRuleFormalParameter() throws RecognitionException {
         EObject current = null;
 
@@ -2641,13 +2641,13 @@ public final EObject entryRuleFormalParameter() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:964:2: (iv_ruleFormalParameter= ruleFormalParameter EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:965:2: iv_ruleFormalParameter= ruleFormalParameter EOF
+            // InternalCheck.g:964:2: (iv_ruleFormalParameter= ruleFormalParameter EOF )
+            // InternalCheck.g:965:2: iv_ruleFormalParameter= ruleFormalParameter EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getFormalParameterRule()); 
             }
-            pushFollow(FOLLOW_ruleFormalParameter_in_entryRuleFormalParameter1798);
+            pushFollow(FOLLOW_1);
             iv_ruleFormalParameter=ruleFormalParameter();
 
             state._fsp--;
@@ -2655,7 +2655,7 @@ public final EObject entryRuleFormalParameter() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleFormalParameter; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFormalParameter1808); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -2673,7 +2673,7 @@ public final EObject entryRuleFormalParameter() throws RecognitionException {
 
 
     // $ANTLR start "ruleFormalParameter"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:972:1: ruleFormalParameter returns [EObject current=null] : ( ( (lv_type_0_0= ruleJvmParameterizedTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) otherlv_2= '=' ( (lv_right_3_0= ruleXFormalParameterDefaultValueLiteral ) ) ( (lv_label_4_0= RULE_STRING ) )? ) ;
+    // InternalCheck.g:972:1: ruleFormalParameter returns [EObject current=null] : ( ( (lv_type_0_0= ruleJvmParameterizedTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) otherlv_2= '=' ( (lv_right_3_0= ruleXFormalParameterDefaultValueLiteral ) ) ( (lv_label_4_0= RULE_STRING ) )? ) ;
     public final EObject ruleFormalParameter() throws RecognitionException {
         EObject current = null;
 
@@ -2689,24 +2689,24 @@ public final EObject ruleFormalParameter() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:975:28: ( ( ( (lv_type_0_0= ruleJvmParameterizedTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) otherlv_2= '=' ( (lv_right_3_0= ruleXFormalParameterDefaultValueLiteral ) ) ( (lv_label_4_0= RULE_STRING ) )? ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:976:1: ( ( (lv_type_0_0= ruleJvmParameterizedTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) otherlv_2= '=' ( (lv_right_3_0= ruleXFormalParameterDefaultValueLiteral ) ) ( (lv_label_4_0= RULE_STRING ) )? )
+            // InternalCheck.g:975:28: ( ( ( (lv_type_0_0= ruleJvmParameterizedTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) otherlv_2= '=' ( (lv_right_3_0= ruleXFormalParameterDefaultValueLiteral ) ) ( (lv_label_4_0= RULE_STRING ) )? ) )
+            // InternalCheck.g:976:1: ( ( (lv_type_0_0= ruleJvmParameterizedTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) otherlv_2= '=' ( (lv_right_3_0= ruleXFormalParameterDefaultValueLiteral ) ) ( (lv_label_4_0= RULE_STRING ) )? )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:976:1: ( ( (lv_type_0_0= ruleJvmParameterizedTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) otherlv_2= '=' ( (lv_right_3_0= ruleXFormalParameterDefaultValueLiteral ) ) ( (lv_label_4_0= RULE_STRING ) )? )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:976:2: ( (lv_type_0_0= ruleJvmParameterizedTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) otherlv_2= '=' ( (lv_right_3_0= ruleXFormalParameterDefaultValueLiteral ) ) ( (lv_label_4_0= RULE_STRING ) )?
+            // InternalCheck.g:976:1: ( ( (lv_type_0_0= ruleJvmParameterizedTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) otherlv_2= '=' ( (lv_right_3_0= ruleXFormalParameterDefaultValueLiteral ) ) ( (lv_label_4_0= RULE_STRING ) )? )
+            // InternalCheck.g:976:2: ( (lv_type_0_0= ruleJvmParameterizedTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) otherlv_2= '=' ( (lv_right_3_0= ruleXFormalParameterDefaultValueLiteral ) ) ( (lv_label_4_0= RULE_STRING ) )?
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:976:2: ( (lv_type_0_0= ruleJvmParameterizedTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:977:1: (lv_type_0_0= ruleJvmParameterizedTypeReference )
+            // InternalCheck.g:976:2: ( (lv_type_0_0= ruleJvmParameterizedTypeReference ) )
+            // InternalCheck.g:977:1: (lv_type_0_0= ruleJvmParameterizedTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:977:1: (lv_type_0_0= ruleJvmParameterizedTypeReference )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:978:3: lv_type_0_0= ruleJvmParameterizedTypeReference
+            // InternalCheck.g:977:1: (lv_type_0_0= ruleJvmParameterizedTypeReference )
+            // InternalCheck.g:978:3: lv_type_0_0= ruleJvmParameterizedTypeReference
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getFormalParameterAccess().getTypeJvmParameterizedTypeReferenceParserRuleCall_0_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleJvmParameterizedTypeReference_in_ruleFormalParameter1854);
+            pushFollow(FOLLOW_3);
             lv_type_0_0=ruleJvmParameterizedTypeReference();
 
             state._fsp--;
@@ -2720,7 +2720,7 @@ public final EObject ruleFormalParameter() throws RecognitionException {
                      			current, 
                      			"type",
                       		lv_type_0_0, 
-                      		"JvmParameterizedTypeReference");
+                      		"org.eclipse.xtext.xbase.Xtype.JvmParameterizedTypeReference");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -2730,18 +2730,18 @@ public final EObject ruleFormalParameter() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:994:2: ( (lv_name_1_0= ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:995:1: (lv_name_1_0= ruleValidID )
+            // InternalCheck.g:994:2: ( (lv_name_1_0= ruleValidID ) )
+            // InternalCheck.g:995:1: (lv_name_1_0= ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:995:1: (lv_name_1_0= ruleValidID )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:996:3: lv_name_1_0= ruleValidID
+            // InternalCheck.g:995:1: (lv_name_1_0= ruleValidID )
+            // InternalCheck.g:996:3: lv_name_1_0= ruleValidID
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getFormalParameterAccess().getNameValidIDParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleValidID_in_ruleFormalParameter1875);
+            pushFollow(FOLLOW_32);
             lv_name_1_0=ruleValidID();
 
             state._fsp--;
@@ -2755,7 +2755,7 @@ public final EObject ruleFormalParameter() throws RecognitionException {
                      			current, 
                      			"name",
                       		lv_name_1_0, 
-                      		"ValidID");
+                      		"org.eclipse.xtext.xbase.Xtype.ValidID");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -2765,24 +2765,24 @@ public final EObject ruleFormalParameter() throws RecognitionException {
 
             }
 
-            otherlv_2=(Token)match(input,31,FOLLOW_31_in_ruleFormalParameter1887); if (state.failed) return current;
+            otherlv_2=(Token)match(input,31,FOLLOW_33); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getFormalParameterAccess().getEqualsSignKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1016:1: ( (lv_right_3_0= ruleXFormalParameterDefaultValueLiteral ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1017:1: (lv_right_3_0= ruleXFormalParameterDefaultValueLiteral )
+            // InternalCheck.g:1016:1: ( (lv_right_3_0= ruleXFormalParameterDefaultValueLiteral ) )
+            // InternalCheck.g:1017:1: (lv_right_3_0= ruleXFormalParameterDefaultValueLiteral )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1017:1: (lv_right_3_0= ruleXFormalParameterDefaultValueLiteral )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1018:3: lv_right_3_0= ruleXFormalParameterDefaultValueLiteral
+            // InternalCheck.g:1017:1: (lv_right_3_0= ruleXFormalParameterDefaultValueLiteral )
+            // InternalCheck.g:1018:3: lv_right_3_0= ruleXFormalParameterDefaultValueLiteral
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getFormalParameterAccess().getRightXFormalParameterDefaultValueLiteralParserRuleCall_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXFormalParameterDefaultValueLiteral_in_ruleFormalParameter1908);
+            pushFollow(FOLLOW_34);
             lv_right_3_0=ruleXFormalParameterDefaultValueLiteral();
 
             state._fsp--;
@@ -2796,7 +2796,7 @@ public final EObject ruleFormalParameter() throws RecognitionException {
                      			current, 
                      			"right",
                       		lv_right_3_0, 
-                      		"XFormalParameterDefaultValueLiteral");
+                      		"com.avaloq.tools.ddk.check.Check.XFormalParameterDefaultValueLiteral");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -2806,7 +2806,7 @@ public final EObject ruleFormalParameter() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1034:2: ( (lv_label_4_0= RULE_STRING ) )?
+            // InternalCheck.g:1034:2: ( (lv_label_4_0= RULE_STRING ) )?
             int alt22=2;
             int LA22_0 = input.LA(1);
 
@@ -2815,12 +2815,12 @@ public final EObject ruleFormalParameter() throws RecognitionException {
             }
             switch (alt22) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1035:1: (lv_label_4_0= RULE_STRING )
+                    // InternalCheck.g:1035:1: (lv_label_4_0= RULE_STRING )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1035:1: (lv_label_4_0= RULE_STRING )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1036:3: lv_label_4_0= RULE_STRING
+                    // InternalCheck.g:1035:1: (lv_label_4_0= RULE_STRING )
+                    // InternalCheck.g:1036:3: lv_label_4_0= RULE_STRING
                     {
-                    lv_label_4_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleFormalParameter1925); if (state.failed) return current;
+                    lv_label_4_0=(Token)match(input,RULE_STRING,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			newLeafNode(lv_label_4_0, grammarAccess.getFormalParameterAccess().getLabelSTRINGTerminalRuleCall_4_0()); 
@@ -2835,7 +2835,7 @@ public final EObject ruleFormalParameter() throws RecognitionException {
                              			current, 
                              			"label",
                               		lv_label_4_0, 
-                              		"STRING");
+                              		"org.eclipse.xtext.xbase.Xtype.STRING");
                       	    
                     }
 
@@ -2870,7 +2870,7 @@ public final EObject ruleFormalParameter() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXSimpleFormalParameterDefaultValueLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1060:1: entryRuleXSimpleFormalParameterDefaultValueLiteral returns [EObject current=null] : iv_ruleXSimpleFormalParameterDefaultValueLiteral= ruleXSimpleFormalParameterDefaultValueLiteral EOF ;
+    // InternalCheck.g:1060:1: entryRuleXSimpleFormalParameterDefaultValueLiteral returns [EObject current=null] : iv_ruleXSimpleFormalParameterDefaultValueLiteral= ruleXSimpleFormalParameterDefaultValueLiteral EOF ;
     public final EObject entryRuleXSimpleFormalParameterDefaultValueLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2878,13 +2878,13 @@ public final EObject entryRuleXSimpleFormalParameterDefaultValueLiteral() throws
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1061:2: (iv_ruleXSimpleFormalParameterDefaultValueLiteral= ruleXSimpleFormalParameterDefaultValueLiteral EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1062:2: iv_ruleXSimpleFormalParameterDefaultValueLiteral= ruleXSimpleFormalParameterDefaultValueLiteral EOF
+            // InternalCheck.g:1061:2: (iv_ruleXSimpleFormalParameterDefaultValueLiteral= ruleXSimpleFormalParameterDefaultValueLiteral EOF )
+            // InternalCheck.g:1062:2: iv_ruleXSimpleFormalParameterDefaultValueLiteral= ruleXSimpleFormalParameterDefaultValueLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXSimpleFormalParameterDefaultValueLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXSimpleFormalParameterDefaultValueLiteral_in_entryRuleXSimpleFormalParameterDefaultValueLiteral1967);
+            pushFollow(FOLLOW_1);
             iv_ruleXSimpleFormalParameterDefaultValueLiteral=ruleXSimpleFormalParameterDefaultValueLiteral();
 
             state._fsp--;
@@ -2892,7 +2892,7 @@ public final EObject entryRuleXSimpleFormalParameterDefaultValueLiteral() throws
             if ( state.backtracking==0 ) {
                current =iv_ruleXSimpleFormalParameterDefaultValueLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXSimpleFormalParameterDefaultValueLiteral1977); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -2910,7 +2910,7 @@ public final EObject entryRuleXSimpleFormalParameterDefaultValueLiteral() throws
 
 
     // $ANTLR start "ruleXSimpleFormalParameterDefaultValueLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1069:1: ruleXSimpleFormalParameterDefaultValueLiteral returns [EObject current=null] : (this_XBooleanLiteral_0= ruleXBooleanLiteral | this_XNumberLiteral_1= ruleXNumberLiteral | this_XStringLiteral_2= ruleXStringLiteral ) ;
+    // InternalCheck.g:1069:1: ruleXSimpleFormalParameterDefaultValueLiteral returns [EObject current=null] : (this_XBooleanLiteral_0= ruleXBooleanLiteral | this_XNumberLiteral_1= ruleXNumberLiteral | this_XStringLiteral_2= ruleXStringLiteral ) ;
     public final EObject ruleXSimpleFormalParameterDefaultValueLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2924,10 +2924,10 @@ public final EObject ruleXSimpleFormalParameterDefaultValueLiteral() throws Reco
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1072:28: ( (this_XBooleanLiteral_0= ruleXBooleanLiteral | this_XNumberLiteral_1= ruleXNumberLiteral | this_XStringLiteral_2= ruleXStringLiteral ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1073:1: (this_XBooleanLiteral_0= ruleXBooleanLiteral | this_XNumberLiteral_1= ruleXNumberLiteral | this_XStringLiteral_2= ruleXStringLiteral )
+            // InternalCheck.g:1072:28: ( (this_XBooleanLiteral_0= ruleXBooleanLiteral | this_XNumberLiteral_1= ruleXNumberLiteral | this_XStringLiteral_2= ruleXStringLiteral ) )
+            // InternalCheck.g:1073:1: (this_XBooleanLiteral_0= ruleXBooleanLiteral | this_XNumberLiteral_1= ruleXNumberLiteral | this_XStringLiteral_2= ruleXStringLiteral )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1073:1: (this_XBooleanLiteral_0= ruleXBooleanLiteral | this_XNumberLiteral_1= ruleXNumberLiteral | this_XStringLiteral_2= ruleXStringLiteral )
+            // InternalCheck.g:1073:1: (this_XBooleanLiteral_0= ruleXBooleanLiteral | this_XNumberLiteral_1= ruleXNumberLiteral | this_XStringLiteral_2= ruleXStringLiteral )
             int alt23=3;
             switch ( input.LA(1) ) {
             case 97:
@@ -2958,14 +2958,14 @@ public final EObject ruleXSimpleFormalParameterDefaultValueLiteral() throws Reco
 
             switch (alt23) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1074:5: this_XBooleanLiteral_0= ruleXBooleanLiteral
+                    // InternalCheck.g:1074:5: this_XBooleanLiteral_0= ruleXBooleanLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXSimpleFormalParameterDefaultValueLiteralAccess().getXBooleanLiteralParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXBooleanLiteral_in_ruleXSimpleFormalParameterDefaultValueLiteral2024);
+                    pushFollow(FOLLOW_2);
                     this_XBooleanLiteral_0=ruleXBooleanLiteral();
 
                     state._fsp--;
@@ -2980,14 +2980,14 @@ public final EObject ruleXSimpleFormalParameterDefaultValueLiteral() throws Reco
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1084:5: this_XNumberLiteral_1= ruleXNumberLiteral
+                    // InternalCheck.g:1084:5: this_XNumberLiteral_1= ruleXNumberLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXSimpleFormalParameterDefaultValueLiteralAccess().getXNumberLiteralParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXNumberLiteral_in_ruleXSimpleFormalParameterDefaultValueLiteral2051);
+                    pushFollow(FOLLOW_2);
                     this_XNumberLiteral_1=ruleXNumberLiteral();
 
                     state._fsp--;
@@ -3002,14 +3002,14 @@ public final EObject ruleXSimpleFormalParameterDefaultValueLiteral() throws Reco
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1094:5: this_XStringLiteral_2= ruleXStringLiteral
+                    // InternalCheck.g:1094:5: this_XStringLiteral_2= ruleXStringLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXSimpleFormalParameterDefaultValueLiteralAccess().getXStringLiteralParserRuleCall_2()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXStringLiteral_in_ruleXSimpleFormalParameterDefaultValueLiteral2078);
+                    pushFollow(FOLLOW_2);
                     this_XStringLiteral_2=ruleXStringLiteral();
 
                     state._fsp--;
@@ -3046,7 +3046,7 @@ public final EObject ruleXSimpleFormalParameterDefaultValueLiteral() throws Reco
 
 
     // $ANTLR start "entryRuleXConstantUnaryOperation"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1110:1: entryRuleXConstantUnaryOperation returns [EObject current=null] : iv_ruleXConstantUnaryOperation= ruleXConstantUnaryOperation EOF ;
+    // InternalCheck.g:1110:1: entryRuleXConstantUnaryOperation returns [EObject current=null] : iv_ruleXConstantUnaryOperation= ruleXConstantUnaryOperation EOF ;
     public final EObject entryRuleXConstantUnaryOperation() throws RecognitionException {
         EObject current = null;
 
@@ -3054,13 +3054,13 @@ public final EObject entryRuleXConstantUnaryOperation() throws RecognitionExcept
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1111:2: (iv_ruleXConstantUnaryOperation= ruleXConstantUnaryOperation EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1112:2: iv_ruleXConstantUnaryOperation= ruleXConstantUnaryOperation EOF
+            // InternalCheck.g:1111:2: (iv_ruleXConstantUnaryOperation= ruleXConstantUnaryOperation EOF )
+            // InternalCheck.g:1112:2: iv_ruleXConstantUnaryOperation= ruleXConstantUnaryOperation EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXConstantUnaryOperationRule()); 
             }
-            pushFollow(FOLLOW_ruleXConstantUnaryOperation_in_entryRuleXConstantUnaryOperation2113);
+            pushFollow(FOLLOW_1);
             iv_ruleXConstantUnaryOperation=ruleXConstantUnaryOperation();
 
             state._fsp--;
@@ -3068,7 +3068,7 @@ public final EObject entryRuleXConstantUnaryOperation() throws RecognitionExcept
             if ( state.backtracking==0 ) {
                current =iv_ruleXConstantUnaryOperation; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXConstantUnaryOperation2123); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -3086,7 +3086,7 @@ public final EObject entryRuleXConstantUnaryOperation() throws RecognitionExcept
 
 
     // $ANTLR start "ruleXConstantUnaryOperation"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1119:1: ruleXConstantUnaryOperation returns [EObject current=null] : ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXConstantUnaryOperation ) ) ) | this_XSimpleFormalParameterDefaultValueLiteral_3= ruleXSimpleFormalParameterDefaultValueLiteral ) ;
+    // InternalCheck.g:1119:1: ruleXConstantUnaryOperation returns [EObject current=null] : ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXConstantUnaryOperation ) ) ) | this_XSimpleFormalParameterDefaultValueLiteral_3= ruleXSimpleFormalParameterDefaultValueLiteral ) ;
     public final EObject ruleXConstantUnaryOperation() throws RecognitionException {
         EObject current = null;
 
@@ -3098,10 +3098,10 @@ public final EObject ruleXConstantUnaryOperation() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1122:28: ( ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXConstantUnaryOperation ) ) ) | this_XSimpleFormalParameterDefaultValueLiteral_3= ruleXSimpleFormalParameterDefaultValueLiteral ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1123:1: ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXConstantUnaryOperation ) ) ) | this_XSimpleFormalParameterDefaultValueLiteral_3= ruleXSimpleFormalParameterDefaultValueLiteral )
+            // InternalCheck.g:1122:28: ( ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXConstantUnaryOperation ) ) ) | this_XSimpleFormalParameterDefaultValueLiteral_3= ruleXSimpleFormalParameterDefaultValueLiteral ) )
+            // InternalCheck.g:1123:1: ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXConstantUnaryOperation ) ) ) | this_XSimpleFormalParameterDefaultValueLiteral_3= ruleXSimpleFormalParameterDefaultValueLiteral )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1123:1: ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXConstantUnaryOperation ) ) ) | this_XSimpleFormalParameterDefaultValueLiteral_3= ruleXSimpleFormalParameterDefaultValueLiteral )
+            // InternalCheck.g:1123:1: ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXConstantUnaryOperation ) ) ) | this_XSimpleFormalParameterDefaultValueLiteral_3= ruleXSimpleFormalParameterDefaultValueLiteral )
             int alt24=2;
             int LA24_0 = input.LA(1);
 
@@ -3120,13 +3120,13 @@ else if ( ((LA24_0>=RULE_STRING && LA24_0<=RULE_DECIMAL)||(LA24_0>=97 && LA24_0<
             }
             switch (alt24) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1123:2: ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXConstantUnaryOperation ) ) )
+                    // InternalCheck.g:1123:2: ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXConstantUnaryOperation ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1123:2: ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXConstantUnaryOperation ) ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1123:3: () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXConstantUnaryOperation ) )
+                    // InternalCheck.g:1123:2: ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXConstantUnaryOperation ) ) )
+                    // InternalCheck.g:1123:3: () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXConstantUnaryOperation ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1123:3: ()
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1124:5: 
+                    // InternalCheck.g:1123:3: ()
+                    // InternalCheck.g:1124:5: 
                     {
                     if ( state.backtracking==0 ) {
 
@@ -3138,11 +3138,11 @@ else if ( ((LA24_0>=RULE_STRING && LA24_0<=RULE_DECIMAL)||(LA24_0>=97 && LA24_0<
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1129:2: ( ( ruleOpUnary ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1130:1: ( ruleOpUnary )
+                    // InternalCheck.g:1129:2: ( ( ruleOpUnary ) )
+                    // InternalCheck.g:1130:1: ( ruleOpUnary )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1130:1: ( ruleOpUnary )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1131:3: ruleOpUnary
+                    // InternalCheck.g:1130:1: ( ruleOpUnary )
+                    // InternalCheck.g:1131:3: ruleOpUnary
                     {
                     if ( state.backtracking==0 ) {
 
@@ -3156,7 +3156,7 @@ else if ( ((LA24_0>=RULE_STRING && LA24_0<=RULE_DECIMAL)||(LA24_0>=97 && LA24_0<
                       	        newCompositeNode(grammarAccess.getXConstantUnaryOperationAccess().getFeatureJvmIdentifiableElementCrossReference_0_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleOpUnary_in_ruleXConstantUnaryOperation2181);
+                    pushFollow(FOLLOW_35);
                     ruleOpUnary();
 
                     state._fsp--;
@@ -3172,18 +3172,18 @@ else if ( ((LA24_0>=RULE_STRING && LA24_0<=RULE_DECIMAL)||(LA24_0>=97 && LA24_0<
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1144:2: ( (lv_operand_2_0= ruleXConstantUnaryOperation ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1145:1: (lv_operand_2_0= ruleXConstantUnaryOperation )
+                    // InternalCheck.g:1144:2: ( (lv_operand_2_0= ruleXConstantUnaryOperation ) )
+                    // InternalCheck.g:1145:1: (lv_operand_2_0= ruleXConstantUnaryOperation )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1145:1: (lv_operand_2_0= ruleXConstantUnaryOperation )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1146:3: lv_operand_2_0= ruleXConstantUnaryOperation
+                    // InternalCheck.g:1145:1: (lv_operand_2_0= ruleXConstantUnaryOperation )
+                    // InternalCheck.g:1146:3: lv_operand_2_0= ruleXConstantUnaryOperation
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXConstantUnaryOperationAccess().getOperandXConstantUnaryOperationParserRuleCall_0_2_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXConstantUnaryOperation_in_ruleXConstantUnaryOperation2202);
+                    pushFollow(FOLLOW_2);
                     lv_operand_2_0=ruleXConstantUnaryOperation();
 
                     state._fsp--;
@@ -3197,7 +3197,7 @@ else if ( ((LA24_0>=RULE_STRING && LA24_0<=RULE_DECIMAL)||(LA24_0>=97 && LA24_0<
                              			current, 
                              			"operand",
                               		lv_operand_2_0, 
-                              		"XConstantUnaryOperation");
+                              		"com.avaloq.tools.ddk.check.Check.XConstantUnaryOperation");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -3214,14 +3214,14 @@ else if ( ((LA24_0>=RULE_STRING && LA24_0<=RULE_DECIMAL)||(LA24_0>=97 && LA24_0<
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1164:5: this_XSimpleFormalParameterDefaultValueLiteral_3= ruleXSimpleFormalParameterDefaultValueLiteral
+                    // InternalCheck.g:1164:5: this_XSimpleFormalParameterDefaultValueLiteral_3= ruleXSimpleFormalParameterDefaultValueLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXConstantUnaryOperationAccess().getXSimpleFormalParameterDefaultValueLiteralParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXSimpleFormalParameterDefaultValueLiteral_in_ruleXConstantUnaryOperation2231);
+                    pushFollow(FOLLOW_2);
                     this_XSimpleFormalParameterDefaultValueLiteral_3=ruleXSimpleFormalParameterDefaultValueLiteral();
 
                     state._fsp--;
@@ -3258,7 +3258,7 @@ else if ( ((LA24_0>=RULE_STRING && LA24_0<=RULE_DECIMAL)||(LA24_0>=97 && LA24_0<
 
 
     // $ANTLR start "entryRuleXFormalParameterDefaultValueLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1180:1: entryRuleXFormalParameterDefaultValueLiteral returns [EObject current=null] : iv_ruleXFormalParameterDefaultValueLiteral= ruleXFormalParameterDefaultValueLiteral EOF ;
+    // InternalCheck.g:1180:1: entryRuleXFormalParameterDefaultValueLiteral returns [EObject current=null] : iv_ruleXFormalParameterDefaultValueLiteral= ruleXFormalParameterDefaultValueLiteral EOF ;
     public final EObject entryRuleXFormalParameterDefaultValueLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -3266,13 +3266,13 @@ public final EObject entryRuleXFormalParameterDefaultValueLiteral() throws Recog
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1181:2: (iv_ruleXFormalParameterDefaultValueLiteral= ruleXFormalParameterDefaultValueLiteral EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1182:2: iv_ruleXFormalParameterDefaultValueLiteral= ruleXFormalParameterDefaultValueLiteral EOF
+            // InternalCheck.g:1181:2: (iv_ruleXFormalParameterDefaultValueLiteral= ruleXFormalParameterDefaultValueLiteral EOF )
+            // InternalCheck.g:1182:2: iv_ruleXFormalParameterDefaultValueLiteral= ruleXFormalParameterDefaultValueLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXFormalParameterDefaultValueLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXFormalParameterDefaultValueLiteral_in_entryRuleXFormalParameterDefaultValueLiteral2266);
+            pushFollow(FOLLOW_1);
             iv_ruleXFormalParameterDefaultValueLiteral=ruleXFormalParameterDefaultValueLiteral();
 
             state._fsp--;
@@ -3280,7 +3280,7 @@ public final EObject entryRuleXFormalParameterDefaultValueLiteral() throws Recog
             if ( state.backtracking==0 ) {
                current =iv_ruleXFormalParameterDefaultValueLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXFormalParameterDefaultValueLiteral2276); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -3298,7 +3298,7 @@ public final EObject entryRuleXFormalParameterDefaultValueLiteral() throws Recog
 
 
     // $ANTLR start "ruleXFormalParameterDefaultValueLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1189:1: ruleXFormalParameterDefaultValueLiteral returns [EObject current=null] : (this_XConstantUnaryOperation_0= ruleXConstantUnaryOperation | this_XConstantListLiteral_1= ruleXConstantListLiteral ) ;
+    // InternalCheck.g:1189:1: ruleXFormalParameterDefaultValueLiteral returns [EObject current=null] : (this_XConstantUnaryOperation_0= ruleXConstantUnaryOperation | this_XConstantListLiteral_1= ruleXConstantListLiteral ) ;
     public final EObject ruleXFormalParameterDefaultValueLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -3310,10 +3310,10 @@ public final EObject ruleXFormalParameterDefaultValueLiteral() throws Recognitio
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1192:28: ( (this_XConstantUnaryOperation_0= ruleXConstantUnaryOperation | this_XConstantListLiteral_1= ruleXConstantListLiteral ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1193:1: (this_XConstantUnaryOperation_0= ruleXConstantUnaryOperation | this_XConstantListLiteral_1= ruleXConstantListLiteral )
+            // InternalCheck.g:1192:28: ( (this_XConstantUnaryOperation_0= ruleXConstantUnaryOperation | this_XConstantListLiteral_1= ruleXConstantListLiteral ) )
+            // InternalCheck.g:1193:1: (this_XConstantUnaryOperation_0= ruleXConstantUnaryOperation | this_XConstantListLiteral_1= ruleXConstantListLiteral )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1193:1: (this_XConstantUnaryOperation_0= ruleXConstantUnaryOperation | this_XConstantListLiteral_1= ruleXConstantListLiteral )
+            // InternalCheck.g:1193:1: (this_XConstantUnaryOperation_0= ruleXConstantUnaryOperation | this_XConstantListLiteral_1= ruleXConstantListLiteral )
             int alt25=2;
             int LA25_0 = input.LA(1);
 
@@ -3332,14 +3332,14 @@ else if ( (LA25_0==32) ) {
             }
             switch (alt25) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1194:5: this_XConstantUnaryOperation_0= ruleXConstantUnaryOperation
+                    // InternalCheck.g:1194:5: this_XConstantUnaryOperation_0= ruleXConstantUnaryOperation
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXFormalParameterDefaultValueLiteralAccess().getXConstantUnaryOperationParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXConstantUnaryOperation_in_ruleXFormalParameterDefaultValueLiteral2323);
+                    pushFollow(FOLLOW_2);
                     this_XConstantUnaryOperation_0=ruleXConstantUnaryOperation();
 
                     state._fsp--;
@@ -3354,14 +3354,14 @@ else if ( (LA25_0==32) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1204:5: this_XConstantListLiteral_1= ruleXConstantListLiteral
+                    // InternalCheck.g:1204:5: this_XConstantListLiteral_1= ruleXConstantListLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXFormalParameterDefaultValueLiteralAccess().getXConstantListLiteralParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXConstantListLiteral_in_ruleXFormalParameterDefaultValueLiteral2350);
+                    pushFollow(FOLLOW_2);
                     this_XConstantListLiteral_1=ruleXConstantListLiteral();
 
                     state._fsp--;
@@ -3398,7 +3398,7 @@ else if ( (LA25_0==32) ) {
 
 
     // $ANTLR start "entryRuleXConstantListLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1220:1: entryRuleXConstantListLiteral returns [EObject current=null] : iv_ruleXConstantListLiteral= ruleXConstantListLiteral EOF ;
+    // InternalCheck.g:1220:1: entryRuleXConstantListLiteral returns [EObject current=null] : iv_ruleXConstantListLiteral= ruleXConstantListLiteral EOF ;
     public final EObject entryRuleXConstantListLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -3406,13 +3406,13 @@ public final EObject entryRuleXConstantListLiteral() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1221:2: (iv_ruleXConstantListLiteral= ruleXConstantListLiteral EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1222:2: iv_ruleXConstantListLiteral= ruleXConstantListLiteral EOF
+            // InternalCheck.g:1221:2: (iv_ruleXConstantListLiteral= ruleXConstantListLiteral EOF )
+            // InternalCheck.g:1222:2: iv_ruleXConstantListLiteral= ruleXConstantListLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXConstantListLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXConstantListLiteral_in_entryRuleXConstantListLiteral2385);
+            pushFollow(FOLLOW_1);
             iv_ruleXConstantListLiteral=ruleXConstantListLiteral();
 
             state._fsp--;
@@ -3420,7 +3420,7 @@ public final EObject entryRuleXConstantListLiteral() throws RecognitionException
             if ( state.backtracking==0 ) {
                current =iv_ruleXConstantListLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXConstantListLiteral2395); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -3438,7 +3438,7 @@ public final EObject entryRuleXConstantListLiteral() throws RecognitionException
 
 
     // $ANTLR start "ruleXConstantListLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1229:1: ruleXConstantListLiteral returns [EObject current=null] : ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXConstantUnaryOperation ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )* )? otherlv_6= ']' ) ;
+    // InternalCheck.g:1229:1: ruleXConstantListLiteral returns [EObject current=null] : ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXConstantUnaryOperation ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )* )? otherlv_6= ']' ) ;
     public final EObject ruleXConstantListLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -3454,14 +3454,14 @@ public final EObject ruleXConstantListLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1232:28: ( ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXConstantUnaryOperation ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )* )? otherlv_6= ']' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1233:1: ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXConstantUnaryOperation ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )* )? otherlv_6= ']' )
+            // InternalCheck.g:1232:28: ( ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXConstantUnaryOperation ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )* )? otherlv_6= ']' ) )
+            // InternalCheck.g:1233:1: ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXConstantUnaryOperation ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )* )? otherlv_6= ']' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1233:1: ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXConstantUnaryOperation ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )* )? otherlv_6= ']' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1233:2: () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXConstantUnaryOperation ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )* )? otherlv_6= ']'
+            // InternalCheck.g:1233:1: ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXConstantUnaryOperation ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )* )? otherlv_6= ']' )
+            // InternalCheck.g:1233:2: () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXConstantUnaryOperation ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )* )? otherlv_6= ']'
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1233:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1234:5: 
+            // InternalCheck.g:1233:2: ()
+            // InternalCheck.g:1234:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -3473,19 +3473,19 @@ public final EObject ruleXConstantListLiteral() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,32,FOLLOW_32_in_ruleXConstantListLiteral2441); if (state.failed) return current;
+            otherlv_1=(Token)match(input,32,FOLLOW_36); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXConstantListLiteralAccess().getNumberSignKeyword_1());
                   
             }
-            otherlv_2=(Token)match(input,33,FOLLOW_33_in_ruleXConstantListLiteral2453); if (state.failed) return current;
+            otherlv_2=(Token)match(input,33,FOLLOW_37); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getXConstantListLiteralAccess().getLeftSquareBracketKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1247:1: ( ( (lv_elements_3_0= ruleXConstantUnaryOperation ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )* )?
+            // InternalCheck.g:1247:1: ( ( (lv_elements_3_0= ruleXConstantUnaryOperation ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )* )?
             int alt27=2;
             int LA27_0 = input.LA(1);
 
@@ -3494,20 +3494,20 @@ public final EObject ruleXConstantListLiteral() throws RecognitionException {
             }
             switch (alt27) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1247:2: ( (lv_elements_3_0= ruleXConstantUnaryOperation ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )*
+                    // InternalCheck.g:1247:2: ( (lv_elements_3_0= ruleXConstantUnaryOperation ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )*
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1247:2: ( (lv_elements_3_0= ruleXConstantUnaryOperation ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1248:1: (lv_elements_3_0= ruleXConstantUnaryOperation )
+                    // InternalCheck.g:1247:2: ( (lv_elements_3_0= ruleXConstantUnaryOperation ) )
+                    // InternalCheck.g:1248:1: (lv_elements_3_0= ruleXConstantUnaryOperation )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1248:1: (lv_elements_3_0= ruleXConstantUnaryOperation )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1249:3: lv_elements_3_0= ruleXConstantUnaryOperation
+                    // InternalCheck.g:1248:1: (lv_elements_3_0= ruleXConstantUnaryOperation )
+                    // InternalCheck.g:1249:3: lv_elements_3_0= ruleXConstantUnaryOperation
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXConstantListLiteralAccess().getElementsXConstantUnaryOperationParserRuleCall_3_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXConstantUnaryOperation_in_ruleXConstantListLiteral2475);
+                    pushFollow(FOLLOW_38);
                     lv_elements_3_0=ruleXConstantUnaryOperation();
 
                     state._fsp--;
@@ -3521,7 +3521,7 @@ public final EObject ruleXConstantListLiteral() throws RecognitionException {
                              			current, 
                              			"elements",
                               		lv_elements_3_0, 
-                              		"XConstantUnaryOperation");
+                              		"com.avaloq.tools.ddk.check.Check.XConstantUnaryOperation");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -3531,7 +3531,7 @@ public final EObject ruleXConstantListLiteral() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1265:2: (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )*
+                    // InternalCheck.g:1265:2: (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )*
                     loop26:
                     do {
                         int alt26=2;
@@ -3544,26 +3544,26 @@ public final EObject ruleXConstantListLiteral() throws RecognitionException {
 
                         switch (alt26) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1265:4: otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) )
+                    	    // InternalCheck.g:1265:4: otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) )
                     	    {
-                    	    otherlv_4=(Token)match(input,24,FOLLOW_24_in_ruleXConstantListLiteral2488); if (state.failed) return current;
+                    	    otherlv_4=(Token)match(input,24,FOLLOW_35); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_4, grammarAccess.getXConstantListLiteralAccess().getCommaKeyword_3_1_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1269:1: ( (lv_elements_5_0= ruleXConstantUnaryOperation ) )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1270:1: (lv_elements_5_0= ruleXConstantUnaryOperation )
+                    	    // InternalCheck.g:1269:1: ( (lv_elements_5_0= ruleXConstantUnaryOperation ) )
+                    	    // InternalCheck.g:1270:1: (lv_elements_5_0= ruleXConstantUnaryOperation )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1270:1: (lv_elements_5_0= ruleXConstantUnaryOperation )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1271:3: lv_elements_5_0= ruleXConstantUnaryOperation
+                    	    // InternalCheck.g:1270:1: (lv_elements_5_0= ruleXConstantUnaryOperation )
+                    	    // InternalCheck.g:1271:3: lv_elements_5_0= ruleXConstantUnaryOperation
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getXConstantListLiteralAccess().getElementsXConstantUnaryOperationParserRuleCall_3_1_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleXConstantUnaryOperation_in_ruleXConstantListLiteral2509);
+                    	    pushFollow(FOLLOW_38);
                     	    lv_elements_5_0=ruleXConstantUnaryOperation();
 
                     	    state._fsp--;
@@ -3577,7 +3577,7 @@ public final EObject ruleXConstantListLiteral() throws RecognitionException {
                     	             			current, 
                     	             			"elements",
                     	              		lv_elements_5_0, 
-                    	              		"XConstantUnaryOperation");
+                    	              		"com.avaloq.tools.ddk.check.Check.XConstantUnaryOperation");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -3602,7 +3602,7 @@ public final EObject ruleXConstantListLiteral() throws RecognitionException {
 
             }
 
-            otherlv_6=(Token)match(input,34,FOLLOW_34_in_ruleXConstantListLiteral2525); if (state.failed) return current;
+            otherlv_6=(Token)match(input,34,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_6, grammarAccess.getXConstantListLiteralAccess().getRightSquareBracketKeyword_4());
@@ -3631,7 +3631,7 @@ public final EObject ruleXConstantListLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleContext"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1299:1: entryRuleContext returns [EObject current=null] : iv_ruleContext= ruleContext EOF ;
+    // InternalCheck.g:1299:1: entryRuleContext returns [EObject current=null] : iv_ruleContext= ruleContext EOF ;
     public final EObject entryRuleContext() throws RecognitionException {
         EObject current = null;
 
@@ -3639,13 +3639,13 @@ public final EObject entryRuleContext() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1300:2: (iv_ruleContext= ruleContext EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1301:2: iv_ruleContext= ruleContext EOF
+            // InternalCheck.g:1300:2: (iv_ruleContext= ruleContext EOF )
+            // InternalCheck.g:1301:2: iv_ruleContext= ruleContext EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getContextRule()); 
             }
-            pushFollow(FOLLOW_ruleContext_in_entryRuleContext2561);
+            pushFollow(FOLLOW_1);
             iv_ruleContext=ruleContext();
 
             state._fsp--;
@@ -3653,7 +3653,7 @@ public final EObject entryRuleContext() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleContext; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleContext2571); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -3671,7 +3671,7 @@ public final EObject entryRuleContext() throws RecognitionException {
 
 
     // $ANTLR start "ruleContext"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1308:1: ruleContext returns [EObject current=null] : (otherlv_0= 'for' ( (lv_contextVariable_1_0= ruleContextVariable ) ) ( (lv_constraint_2_0= ruleXBlockExpression ) ) ) ;
+    // InternalCheck.g:1308:1: ruleContext returns [EObject current=null] : (otherlv_0= 'for' ( (lv_contextVariable_1_0= ruleContextVariable ) ) ( (lv_constraint_2_0= ruleXBlockExpression ) ) ) ;
     public final EObject ruleContext() throws RecognitionException {
         EObject current = null;
 
@@ -3684,30 +3684,30 @@ public final EObject ruleContext() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1311:28: ( (otherlv_0= 'for' ( (lv_contextVariable_1_0= ruleContextVariable ) ) ( (lv_constraint_2_0= ruleXBlockExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1312:1: (otherlv_0= 'for' ( (lv_contextVariable_1_0= ruleContextVariable ) ) ( (lv_constraint_2_0= ruleXBlockExpression ) ) )
+            // InternalCheck.g:1311:28: ( (otherlv_0= 'for' ( (lv_contextVariable_1_0= ruleContextVariable ) ) ( (lv_constraint_2_0= ruleXBlockExpression ) ) ) )
+            // InternalCheck.g:1312:1: (otherlv_0= 'for' ( (lv_contextVariable_1_0= ruleContextVariable ) ) ( (lv_constraint_2_0= ruleXBlockExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1312:1: (otherlv_0= 'for' ( (lv_contextVariable_1_0= ruleContextVariable ) ) ( (lv_constraint_2_0= ruleXBlockExpression ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1312:3: otherlv_0= 'for' ( (lv_contextVariable_1_0= ruleContextVariable ) ) ( (lv_constraint_2_0= ruleXBlockExpression ) )
+            // InternalCheck.g:1312:1: (otherlv_0= 'for' ( (lv_contextVariable_1_0= ruleContextVariable ) ) ( (lv_constraint_2_0= ruleXBlockExpression ) ) )
+            // InternalCheck.g:1312:3: otherlv_0= 'for' ( (lv_contextVariable_1_0= ruleContextVariable ) ) ( (lv_constraint_2_0= ruleXBlockExpression ) )
             {
-            otherlv_0=(Token)match(input,16,FOLLOW_16_in_ruleContext2608); if (state.failed) return current;
+            otherlv_0=(Token)match(input,16,FOLLOW_27); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getContextAccess().getForKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1316:1: ( (lv_contextVariable_1_0= ruleContextVariable ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1317:1: (lv_contextVariable_1_0= ruleContextVariable )
+            // InternalCheck.g:1316:1: ( (lv_contextVariable_1_0= ruleContextVariable ) )
+            // InternalCheck.g:1317:1: (lv_contextVariable_1_0= ruleContextVariable )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1317:1: (lv_contextVariable_1_0= ruleContextVariable )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1318:3: lv_contextVariable_1_0= ruleContextVariable
+            // InternalCheck.g:1317:1: (lv_contextVariable_1_0= ruleContextVariable )
+            // InternalCheck.g:1318:3: lv_contextVariable_1_0= ruleContextVariable
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getContextAccess().getContextVariableContextVariableParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleContextVariable_in_ruleContext2629);
+            pushFollow(FOLLOW_9);
             lv_contextVariable_1_0=ruleContextVariable();
 
             state._fsp--;
@@ -3721,7 +3721,7 @@ public final EObject ruleContext() throws RecognitionException {
                      			current, 
                      			"contextVariable",
                       		lv_contextVariable_1_0, 
-                      		"ContextVariable");
+                      		"com.avaloq.tools.ddk.check.Check.ContextVariable");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -3731,18 +3731,18 @@ public final EObject ruleContext() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1334:2: ( (lv_constraint_2_0= ruleXBlockExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1335:1: (lv_constraint_2_0= ruleXBlockExpression )
+            // InternalCheck.g:1334:2: ( (lv_constraint_2_0= ruleXBlockExpression ) )
+            // InternalCheck.g:1335:1: (lv_constraint_2_0= ruleXBlockExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1335:1: (lv_constraint_2_0= ruleXBlockExpression )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1336:3: lv_constraint_2_0= ruleXBlockExpression
+            // InternalCheck.g:1335:1: (lv_constraint_2_0= ruleXBlockExpression )
+            // InternalCheck.g:1336:3: lv_constraint_2_0= ruleXBlockExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getContextAccess().getConstraintXBlockExpressionParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXBlockExpression_in_ruleContext2650);
+            pushFollow(FOLLOW_2);
             lv_constraint_2_0=ruleXBlockExpression();
 
             state._fsp--;
@@ -3756,7 +3756,7 @@ public final EObject ruleContext() throws RecognitionException {
                      			current, 
                      			"constraint",
                       		lv_constraint_2_0, 
-                      		"XBlockExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XBlockExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -3789,7 +3789,7 @@ public final EObject ruleContext() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleContextVariable"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1360:1: entryRuleContextVariable returns [EObject current=null] : iv_ruleContextVariable= ruleContextVariable EOF ;
+    // InternalCheck.g:1360:1: entryRuleContextVariable returns [EObject current=null] : iv_ruleContextVariable= ruleContextVariable EOF ;
     public final EObject entryRuleContextVariable() throws RecognitionException {
         EObject current = null;
 
@@ -3797,13 +3797,13 @@ public final EObject entryRuleContextVariable() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1361:2: (iv_ruleContextVariable= ruleContextVariable EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1362:2: iv_ruleContextVariable= ruleContextVariable EOF
+            // InternalCheck.g:1361:2: (iv_ruleContextVariable= ruleContextVariable EOF )
+            // InternalCheck.g:1362:2: iv_ruleContextVariable= ruleContextVariable EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getContextVariableRule()); 
             }
-            pushFollow(FOLLOW_ruleContextVariable_in_entryRuleContextVariable2686);
+            pushFollow(FOLLOW_1);
             iv_ruleContextVariable=ruleContextVariable();
 
             state._fsp--;
@@ -3811,7 +3811,7 @@ public final EObject entryRuleContextVariable() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleContextVariable; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleContextVariable2696); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -3829,7 +3829,7 @@ public final EObject entryRuleContextVariable() throws RecognitionException {
 
 
     // $ANTLR start "ruleContextVariable"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1369:1: ruleContextVariable returns [EObject current=null] : ( ( (lv_type_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) )? ) ;
+    // InternalCheck.g:1369:1: ruleContextVariable returns [EObject current=null] : ( ( (lv_type_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) )? ) ;
     public final EObject ruleContextVariable() throws RecognitionException {
         EObject current = null;
 
@@ -3841,24 +3841,24 @@ public final EObject ruleContextVariable() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1372:28: ( ( ( (lv_type_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) )? ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1373:1: ( ( (lv_type_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) )? )
+            // InternalCheck.g:1372:28: ( ( ( (lv_type_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) )? ) )
+            // InternalCheck.g:1373:1: ( ( (lv_type_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) )? )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1373:1: ( ( (lv_type_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) )? )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1373:2: ( (lv_type_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) )?
+            // InternalCheck.g:1373:1: ( ( (lv_type_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) )? )
+            // InternalCheck.g:1373:2: ( (lv_type_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) )?
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1373:2: ( (lv_type_0_0= ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1374:1: (lv_type_0_0= ruleJvmTypeReference )
+            // InternalCheck.g:1373:2: ( (lv_type_0_0= ruleJvmTypeReference ) )
+            // InternalCheck.g:1374:1: (lv_type_0_0= ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1374:1: (lv_type_0_0= ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1375:3: lv_type_0_0= ruleJvmTypeReference
+            // InternalCheck.g:1374:1: (lv_type_0_0= ruleJvmTypeReference )
+            // InternalCheck.g:1375:3: lv_type_0_0= ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getContextVariableAccess().getTypeJvmTypeReferenceParserRuleCall_0_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleContextVariable2742);
+            pushFollow(FOLLOW_39);
             lv_type_0_0=ruleJvmTypeReference();
 
             state._fsp--;
@@ -3872,7 +3872,7 @@ public final EObject ruleContextVariable() throws RecognitionException {
                      			current, 
                      			"type",
                       		lv_type_0_0, 
-                      		"JvmTypeReference");
+                      		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -3882,7 +3882,7 @@ public final EObject ruleContextVariable() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1391:2: ( (lv_name_1_0= ruleValidID ) )?
+            // InternalCheck.g:1391:2: ( (lv_name_1_0= ruleValidID ) )?
             int alt28=2;
             int LA28_0 = input.LA(1);
 
@@ -3891,17 +3891,17 @@ public final EObject ruleContextVariable() throws RecognitionException {
             }
             switch (alt28) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1392:1: (lv_name_1_0= ruleValidID )
+                    // InternalCheck.g:1392:1: (lv_name_1_0= ruleValidID )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1392:1: (lv_name_1_0= ruleValidID )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1393:3: lv_name_1_0= ruleValidID
+                    // InternalCheck.g:1392:1: (lv_name_1_0= ruleValidID )
+                    // InternalCheck.g:1393:3: lv_name_1_0= ruleValidID
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getContextVariableAccess().getNameValidIDParserRuleCall_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleValidID_in_ruleContextVariable2763);
+                    pushFollow(FOLLOW_2);
                     lv_name_1_0=ruleValidID();
 
                     state._fsp--;
@@ -3915,7 +3915,7 @@ public final EObject ruleContextVariable() throws RecognitionException {
                              			current, 
                              			"name",
                               		lv_name_1_0, 
-                              		"ValidID");
+                              		"org.eclipse.xtext.xbase.Xtype.ValidID");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -3951,7 +3951,7 @@ public final EObject ruleContextVariable() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXGuardExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1417:1: entryRuleXGuardExpression returns [EObject current=null] : iv_ruleXGuardExpression= ruleXGuardExpression EOF ;
+    // InternalCheck.g:1417:1: entryRuleXGuardExpression returns [EObject current=null] : iv_ruleXGuardExpression= ruleXGuardExpression EOF ;
     public final EObject entryRuleXGuardExpression() throws RecognitionException {
         EObject current = null;
 
@@ -3959,13 +3959,13 @@ public final EObject entryRuleXGuardExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1418:2: (iv_ruleXGuardExpression= ruleXGuardExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1419:2: iv_ruleXGuardExpression= ruleXGuardExpression EOF
+            // InternalCheck.g:1418:2: (iv_ruleXGuardExpression= ruleXGuardExpression EOF )
+            // InternalCheck.g:1419:2: iv_ruleXGuardExpression= ruleXGuardExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXGuardExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXGuardExpression_in_entryRuleXGuardExpression2800);
+            pushFollow(FOLLOW_1);
             iv_ruleXGuardExpression=ruleXGuardExpression();
 
             state._fsp--;
@@ -3973,7 +3973,7 @@ public final EObject entryRuleXGuardExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXGuardExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXGuardExpression2810); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -3991,7 +3991,7 @@ public final EObject entryRuleXGuardExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXGuardExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1426:1: ruleXGuardExpression returns [EObject current=null] : ( () otherlv_1= 'guard' ( (lv_guard_2_0= ruleXExpression ) ) ) ;
+    // InternalCheck.g:1426:1: ruleXGuardExpression returns [EObject current=null] : ( () otherlv_1= 'guard' ( (lv_guard_2_0= ruleXExpression ) ) ) ;
     public final EObject ruleXGuardExpression() throws RecognitionException {
         EObject current = null;
 
@@ -4002,14 +4002,14 @@ public final EObject ruleXGuardExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1429:28: ( ( () otherlv_1= 'guard' ( (lv_guard_2_0= ruleXExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1430:1: ( () otherlv_1= 'guard' ( (lv_guard_2_0= ruleXExpression ) ) )
+            // InternalCheck.g:1429:28: ( ( () otherlv_1= 'guard' ( (lv_guard_2_0= ruleXExpression ) ) ) )
+            // InternalCheck.g:1430:1: ( () otherlv_1= 'guard' ( (lv_guard_2_0= ruleXExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1430:1: ( () otherlv_1= 'guard' ( (lv_guard_2_0= ruleXExpression ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1430:2: () otherlv_1= 'guard' ( (lv_guard_2_0= ruleXExpression ) )
+            // InternalCheck.g:1430:1: ( () otherlv_1= 'guard' ( (lv_guard_2_0= ruleXExpression ) ) )
+            // InternalCheck.g:1430:2: () otherlv_1= 'guard' ( (lv_guard_2_0= ruleXExpression ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1430:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1431:5: 
+            // InternalCheck.g:1430:2: ()
+            // InternalCheck.g:1431:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -4021,24 +4021,24 @@ public final EObject ruleXGuardExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,35,FOLLOW_35_in_ruleXGuardExpression2856); if (state.failed) return current;
+            otherlv_1=(Token)match(input,35,FOLLOW_29); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXGuardExpressionAccess().getGuardKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1440:1: ( (lv_guard_2_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1441:1: (lv_guard_2_0= ruleXExpression )
+            // InternalCheck.g:1440:1: ( (lv_guard_2_0= ruleXExpression ) )
+            // InternalCheck.g:1441:1: (lv_guard_2_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1441:1: (lv_guard_2_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1442:3: lv_guard_2_0= ruleXExpression
+            // InternalCheck.g:1441:1: (lv_guard_2_0= ruleXExpression )
+            // InternalCheck.g:1442:3: lv_guard_2_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXGuardExpressionAccess().getGuardXExpressionParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXGuardExpression2877);
+            pushFollow(FOLLOW_2);
             lv_guard_2_0=ruleXExpression();
 
             state._fsp--;
@@ -4052,7 +4052,7 @@ public final EObject ruleXGuardExpression() throws RecognitionException {
                      			current, 
                      			"guard",
                       		lv_guard_2_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -4085,7 +4085,7 @@ public final EObject ruleXGuardExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXIssueExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1466:1: entryRuleXIssueExpression returns [EObject current=null] : iv_ruleXIssueExpression= ruleXIssueExpression EOF ;
+    // InternalCheck.g:1466:1: entryRuleXIssueExpression returns [EObject current=null] : iv_ruleXIssueExpression= ruleXIssueExpression EOF ;
     public final EObject entryRuleXIssueExpression() throws RecognitionException {
         EObject current = null;
 
@@ -4093,13 +4093,13 @@ public final EObject entryRuleXIssueExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1467:2: (iv_ruleXIssueExpression= ruleXIssueExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1468:2: iv_ruleXIssueExpression= ruleXIssueExpression EOF
+            // InternalCheck.g:1467:2: (iv_ruleXIssueExpression= ruleXIssueExpression EOF )
+            // InternalCheck.g:1468:2: iv_ruleXIssueExpression= ruleXIssueExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXIssueExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXIssueExpression_in_entryRuleXIssueExpression2913);
+            pushFollow(FOLLOW_1);
             iv_ruleXIssueExpression=ruleXIssueExpression();
 
             state._fsp--;
@@ -4107,7 +4107,7 @@ public final EObject entryRuleXIssueExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXIssueExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXIssueExpression2923); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -4125,7 +4125,7 @@ public final EObject entryRuleXIssueExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXIssueExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1475:1: ruleXIssueExpression returns [EObject current=null] : ( () otherlv_1= 'issue' ( ( ( ruleQualifiedName ) )=> ( ruleQualifiedName ) )? ( ( ( 'on' )=>otherlv_3= 'on' ) ( ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) ) | ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? ) ) ( ( ( '[' )=>otherlv_9= '[' ) ( (lv_markerIndex_10_0= ruleXExpression ) ) otherlv_11= ']' )? )? ( ( ( 'message' )=>otherlv_12= 'message' ) ( (lv_message_13_0= ruleXExpression ) ) )? ( ( ( 'bind' )=>otherlv_14= 'bind' ) otherlv_15= '(' ( (lv_messageParameters_16_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_17= ',' ) ( (lv_messageParameters_18_0= ruleXExpression ) ) )* otherlv_19= ')' )? ( ( ( 'data' )=>otherlv_20= 'data' ) ( (lv_issueCode_21_0= ruleValidID ) )? otherlv_22= '(' ( (lv_issueData_23_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_24= ',' ) ( (lv_issueData_25_0= ruleXExpression ) ) )* otherlv_26= ')' )? ) ;
+    // InternalCheck.g:1475:1: ruleXIssueExpression returns [EObject current=null] : ( () otherlv_1= 'issue' ( ( ( ruleQualifiedName ) )=> ( ruleQualifiedName ) )? ( ( ( 'on' )=>otherlv_3= 'on' ) ( ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) ) | ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? ) ) ( ( ( '[' )=>otherlv_9= '[' ) ( (lv_markerIndex_10_0= ruleXExpression ) ) otherlv_11= ']' )? )? ( ( ( 'message' )=>otherlv_12= 'message' ) ( (lv_message_13_0= ruleXExpression ) ) )? ( ( ( 'bind' )=>otherlv_14= 'bind' ) otherlv_15= '(' ( (lv_messageParameters_16_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_17= ',' ) ( (lv_messageParameters_18_0= ruleXExpression ) ) )* otherlv_19= ')' )? ( ( ( 'data' )=>otherlv_20= 'data' ) ( (lv_issueCode_21_0= ruleValidID ) )? otherlv_22= '(' ( (lv_issueData_23_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_24= ',' ) ( (lv_issueData_25_0= ruleXExpression ) ) )* otherlv_26= ')' )? ) ;
     public final EObject ruleXIssueExpression() throws RecognitionException {
         EObject current = null;
 
@@ -4164,14 +4164,14 @@ public final EObject ruleXIssueExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1478:28: ( ( () otherlv_1= 'issue' ( ( ( ruleQualifiedName ) )=> ( ruleQualifiedName ) )? ( ( ( 'on' )=>otherlv_3= 'on' ) ( ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) ) | ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? ) ) ( ( ( '[' )=>otherlv_9= '[' ) ( (lv_markerIndex_10_0= ruleXExpression ) ) otherlv_11= ']' )? )? ( ( ( 'message' )=>otherlv_12= 'message' ) ( (lv_message_13_0= ruleXExpression ) ) )? ( ( ( 'bind' )=>otherlv_14= 'bind' ) otherlv_15= '(' ( (lv_messageParameters_16_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_17= ',' ) ( (lv_messageParameters_18_0= ruleXExpression ) ) )* otherlv_19= ')' )? ( ( ( 'data' )=>otherlv_20= 'data' ) ( (lv_issueCode_21_0= ruleValidID ) )? otherlv_22= '(' ( (lv_issueData_23_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_24= ',' ) ( (lv_issueData_25_0= ruleXExpression ) ) )* otherlv_26= ')' )? ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1479:1: ( () otherlv_1= 'issue' ( ( ( ruleQualifiedName ) )=> ( ruleQualifiedName ) )? ( ( ( 'on' )=>otherlv_3= 'on' ) ( ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) ) | ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? ) ) ( ( ( '[' )=>otherlv_9= '[' ) ( (lv_markerIndex_10_0= ruleXExpression ) ) otherlv_11= ']' )? )? ( ( ( 'message' )=>otherlv_12= 'message' ) ( (lv_message_13_0= ruleXExpression ) ) )? ( ( ( 'bind' )=>otherlv_14= 'bind' ) otherlv_15= '(' ( (lv_messageParameters_16_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_17= ',' ) ( (lv_messageParameters_18_0= ruleXExpression ) ) )* otherlv_19= ')' )? ( ( ( 'data' )=>otherlv_20= 'data' ) ( (lv_issueCode_21_0= ruleValidID ) )? otherlv_22= '(' ( (lv_issueData_23_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_24= ',' ) ( (lv_issueData_25_0= ruleXExpression ) ) )* otherlv_26= ')' )? )
+            // InternalCheck.g:1478:28: ( ( () otherlv_1= 'issue' ( ( ( ruleQualifiedName ) )=> ( ruleQualifiedName ) )? ( ( ( 'on' )=>otherlv_3= 'on' ) ( ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) ) | ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? ) ) ( ( ( '[' )=>otherlv_9= '[' ) ( (lv_markerIndex_10_0= ruleXExpression ) ) otherlv_11= ']' )? )? ( ( ( 'message' )=>otherlv_12= 'message' ) ( (lv_message_13_0= ruleXExpression ) ) )? ( ( ( 'bind' )=>otherlv_14= 'bind' ) otherlv_15= '(' ( (lv_messageParameters_16_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_17= ',' ) ( (lv_messageParameters_18_0= ruleXExpression ) ) )* otherlv_19= ')' )? ( ( ( 'data' )=>otherlv_20= 'data' ) ( (lv_issueCode_21_0= ruleValidID ) )? otherlv_22= '(' ( (lv_issueData_23_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_24= ',' ) ( (lv_issueData_25_0= ruleXExpression ) ) )* otherlv_26= ')' )? ) )
+            // InternalCheck.g:1479:1: ( () otherlv_1= 'issue' ( ( ( ruleQualifiedName ) )=> ( ruleQualifiedName ) )? ( ( ( 'on' )=>otherlv_3= 'on' ) ( ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) ) | ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? ) ) ( ( ( '[' )=>otherlv_9= '[' ) ( (lv_markerIndex_10_0= ruleXExpression ) ) otherlv_11= ']' )? )? ( ( ( 'message' )=>otherlv_12= 'message' ) ( (lv_message_13_0= ruleXExpression ) ) )? ( ( ( 'bind' )=>otherlv_14= 'bind' ) otherlv_15= '(' ( (lv_messageParameters_16_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_17= ',' ) ( (lv_messageParameters_18_0= ruleXExpression ) ) )* otherlv_19= ')' )? ( ( ( 'data' )=>otherlv_20= 'data' ) ( (lv_issueCode_21_0= ruleValidID ) )? otherlv_22= '(' ( (lv_issueData_23_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_24= ',' ) ( (lv_issueData_25_0= ruleXExpression ) ) )* otherlv_26= ')' )? )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1479:1: ( () otherlv_1= 'issue' ( ( ( ruleQualifiedName ) )=> ( ruleQualifiedName ) )? ( ( ( 'on' )=>otherlv_3= 'on' ) ( ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) ) | ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? ) ) ( ( ( '[' )=>otherlv_9= '[' ) ( (lv_markerIndex_10_0= ruleXExpression ) ) otherlv_11= ']' )? )? ( ( ( 'message' )=>otherlv_12= 'message' ) ( (lv_message_13_0= ruleXExpression ) ) )? ( ( ( 'bind' )=>otherlv_14= 'bind' ) otherlv_15= '(' ( (lv_messageParameters_16_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_17= ',' ) ( (lv_messageParameters_18_0= ruleXExpression ) ) )* otherlv_19= ')' )? ( ( ( 'data' )=>otherlv_20= 'data' ) ( (lv_issueCode_21_0= ruleValidID ) )? otherlv_22= '(' ( (lv_issueData_23_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_24= ',' ) ( (lv_issueData_25_0= ruleXExpression ) ) )* otherlv_26= ')' )? )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1479:2: () otherlv_1= 'issue' ( ( ( ruleQualifiedName ) )=> ( ruleQualifiedName ) )? ( ( ( 'on' )=>otherlv_3= 'on' ) ( ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) ) | ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? ) ) ( ( ( '[' )=>otherlv_9= '[' ) ( (lv_markerIndex_10_0= ruleXExpression ) ) otherlv_11= ']' )? )? ( ( ( 'message' )=>otherlv_12= 'message' ) ( (lv_message_13_0= ruleXExpression ) ) )? ( ( ( 'bind' )=>otherlv_14= 'bind' ) otherlv_15= '(' ( (lv_messageParameters_16_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_17= ',' ) ( (lv_messageParameters_18_0= ruleXExpression ) ) )* otherlv_19= ')' )? ( ( ( 'data' )=>otherlv_20= 'data' ) ( (lv_issueCode_21_0= ruleValidID ) )? otherlv_22= '(' ( (lv_issueData_23_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_24= ',' ) ( (lv_issueData_25_0= ruleXExpression ) ) )* otherlv_26= ')' )?
+            // InternalCheck.g:1479:1: ( () otherlv_1= 'issue' ( ( ( ruleQualifiedName ) )=> ( ruleQualifiedName ) )? ( ( ( 'on' )=>otherlv_3= 'on' ) ( ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) ) | ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? ) ) ( ( ( '[' )=>otherlv_9= '[' ) ( (lv_markerIndex_10_0= ruleXExpression ) ) otherlv_11= ']' )? )? ( ( ( 'message' )=>otherlv_12= 'message' ) ( (lv_message_13_0= ruleXExpression ) ) )? ( ( ( 'bind' )=>otherlv_14= 'bind' ) otherlv_15= '(' ( (lv_messageParameters_16_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_17= ',' ) ( (lv_messageParameters_18_0= ruleXExpression ) ) )* otherlv_19= ')' )? ( ( ( 'data' )=>otherlv_20= 'data' ) ( (lv_issueCode_21_0= ruleValidID ) )? otherlv_22= '(' ( (lv_issueData_23_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_24= ',' ) ( (lv_issueData_25_0= ruleXExpression ) ) )* otherlv_26= ')' )? )
+            // InternalCheck.g:1479:2: () otherlv_1= 'issue' ( ( ( ruleQualifiedName ) )=> ( ruleQualifiedName ) )? ( ( ( 'on' )=>otherlv_3= 'on' ) ( ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) ) | ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? ) ) ( ( ( '[' )=>otherlv_9= '[' ) ( (lv_markerIndex_10_0= ruleXExpression ) ) otherlv_11= ']' )? )? ( ( ( 'message' )=>otherlv_12= 'message' ) ( (lv_message_13_0= ruleXExpression ) ) )? ( ( ( 'bind' )=>otherlv_14= 'bind' ) otherlv_15= '(' ( (lv_messageParameters_16_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_17= ',' ) ( (lv_messageParameters_18_0= ruleXExpression ) ) )* otherlv_19= ')' )? ( ( ( 'data' )=>otherlv_20= 'data' ) ( (lv_issueCode_21_0= ruleValidID ) )? otherlv_22= '(' ( (lv_issueData_23_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_24= ',' ) ( (lv_issueData_25_0= ruleXExpression ) ) )* otherlv_26= ')' )?
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1479:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1480:5: 
+            // InternalCheck.g:1479:2: ()
+            // InternalCheck.g:1480:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -4183,13 +4183,13 @@ public final EObject ruleXIssueExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,36,FOLLOW_36_in_ruleXIssueExpression2969); if (state.failed) return current;
+            otherlv_1=(Token)match(input,36,FOLLOW_40); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXIssueExpressionAccess().getIssueKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1489:1: ( ( ( ruleQualifiedName ) )=> ( ruleQualifiedName ) )?
+            // InternalCheck.g:1489:1: ( ( ( ruleQualifiedName ) )=> ( ruleQualifiedName ) )?
             int alt29=2;
             int LA29_0 = input.LA(1);
 
@@ -4202,10 +4202,10 @@ public final EObject ruleXIssueExpression() throws RecognitionException {
             }
             switch (alt29) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1489:2: ( ( ruleQualifiedName ) )=> ( ruleQualifiedName )
+                    // InternalCheck.g:1489:2: ( ( ruleQualifiedName ) )=> ( ruleQualifiedName )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1494:1: ( ruleQualifiedName )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1495:3: ruleQualifiedName
+                    // InternalCheck.g:1494:1: ( ruleQualifiedName )
+                    // InternalCheck.g:1495:3: ruleQualifiedName
                     {
                     if ( state.backtracking==0 ) {
 
@@ -4219,7 +4219,7 @@ public final EObject ruleXIssueExpression() throws RecognitionException {
                       	        newCompositeNode(grammarAccess.getXIssueExpressionAccess().getCheckCheckCrossReference_2_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleQualifiedName_in_ruleXIssueExpression3004);
+                    pushFollow(FOLLOW_41);
                     ruleQualifiedName();
 
                     state._fsp--;
@@ -4238,17 +4238,17 @@ public final EObject ruleXIssueExpression() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1508:3: ( ( ( 'on' )=>otherlv_3= 'on' ) ( ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) ) | ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? ) ) ( ( ( '[' )=>otherlv_9= '[' ) ( (lv_markerIndex_10_0= ruleXExpression ) ) otherlv_11= ']' )? )?
+            // InternalCheck.g:1508:3: ( ( ( 'on' )=>otherlv_3= 'on' ) ( ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) ) | ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? ) ) ( ( ( '[' )=>otherlv_9= '[' ) ( (lv_markerIndex_10_0= ruleXExpression ) ) otherlv_11= ']' )? )?
             int alt33=2;
             alt33 = dfa33.predict(input);
             switch (alt33) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1508:4: ( ( 'on' )=>otherlv_3= 'on' ) ( ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) ) | ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? ) ) ( ( ( '[' )=>otherlv_9= '[' ) ( (lv_markerIndex_10_0= ruleXExpression ) ) otherlv_11= ']' )?
+                    // InternalCheck.g:1508:4: ( ( 'on' )=>otherlv_3= 'on' ) ( ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) ) | ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? ) ) ( ( ( '[' )=>otherlv_9= '[' ) ( (lv_markerIndex_10_0= ruleXExpression ) ) otherlv_11= ']' )?
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1508:4: ( ( 'on' )=>otherlv_3= 'on' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1508:5: ( 'on' )=>otherlv_3= 'on'
+                    // InternalCheck.g:1508:4: ( ( 'on' )=>otherlv_3= 'on' )
+                    // InternalCheck.g:1508:5: ( 'on' )=>otherlv_3= 'on'
                     {
-                    otherlv_3=(Token)match(input,37,FOLLOW_37_in_ruleXIssueExpression3026); if (state.failed) return current;
+                    otherlv_3=(Token)match(input,37,FOLLOW_29); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_3, grammarAccess.getXIssueExpressionAccess().getOnKeyword_3_0());
@@ -4257,7 +4257,7 @@ public final EObject ruleXIssueExpression() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1513:2: ( ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) ) | ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? ) )
+                    // InternalCheck.g:1513:2: ( ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) ) | ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? ) )
                     int alt31=2;
                     int LA31_0 = input.LA(1);
 
@@ -4290,15 +4290,15 @@ else if ( ((LA31_0>=RULE_STRING && LA31_0<=RULE_ID)||(LA31_0>=15 && LA31_0<=18)|
                     }
                     switch (alt31) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1513:3: ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) )
+                            // InternalCheck.g:1513:3: ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1513:3: ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1513:4: ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) )
+                            // InternalCheck.g:1513:3: ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) )
+                            // InternalCheck.g:1513:4: ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1513:4: ( ( '#' )=>otherlv_4= '#' )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1513:5: ( '#' )=>otherlv_4= '#'
+                            // InternalCheck.g:1513:4: ( ( '#' )=>otherlv_4= '#' )
+                            // InternalCheck.g:1513:5: ( '#' )=>otherlv_4= '#'
                             {
-                            otherlv_4=(Token)match(input,32,FOLLOW_32_in_ruleXIssueExpression3049); if (state.failed) return current;
+                            otherlv_4=(Token)match(input,32,FOLLOW_3); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                   	newLeafNode(otherlv_4, grammarAccess.getXIssueExpressionAccess().getNumberSignKeyword_3_1_0_0());
@@ -4307,11 +4307,11 @@ else if ( ((LA31_0>=RULE_STRING && LA31_0<=RULE_ID)||(LA31_0>=15 && LA31_0<=18)|
 
                             }
 
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1518:2: ( ( ruleValidID ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1519:1: ( ruleValidID )
+                            // InternalCheck.g:1518:2: ( ( ruleValidID ) )
+                            // InternalCheck.g:1519:1: ( ruleValidID )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1519:1: ( ruleValidID )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1520:3: ruleValidID
+                            // InternalCheck.g:1519:1: ( ruleValidID )
+                            // InternalCheck.g:1520:3: ruleValidID
                             {
                             if ( state.backtracking==0 ) {
 
@@ -4325,7 +4325,7 @@ else if ( ((LA31_0>=RULE_STRING && LA31_0<=RULE_ID)||(LA31_0>=15 && LA31_0<=18)|
                               	        newCompositeNode(grammarAccess.getXIssueExpressionAccess().getMarkerFeatureEStructuralFeatureCrossReference_3_1_0_1_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleValidID_in_ruleXIssueExpression3073);
+                            pushFollow(FOLLOW_42);
                             ruleValidID();
 
                             state._fsp--;
@@ -4348,23 +4348,23 @@ else if ( ((LA31_0>=RULE_STRING && LA31_0<=RULE_ID)||(LA31_0>=15 && LA31_0<=18)|
                             }
                             break;
                         case 2 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1534:6: ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? )
+                            // InternalCheck.g:1534:6: ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1534:6: ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1534:7: ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )?
+                            // InternalCheck.g:1534:6: ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? )
+                            // InternalCheck.g:1534:7: ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )?
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1534:7: ( (lv_markerObject_6_0= ruleXExpression ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1535:1: (lv_markerObject_6_0= ruleXExpression )
+                            // InternalCheck.g:1534:7: ( (lv_markerObject_6_0= ruleXExpression ) )
+                            // InternalCheck.g:1535:1: (lv_markerObject_6_0= ruleXExpression )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1535:1: (lv_markerObject_6_0= ruleXExpression )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1536:3: lv_markerObject_6_0= ruleXExpression
+                            // InternalCheck.g:1535:1: (lv_markerObject_6_0= ruleXExpression )
+                            // InternalCheck.g:1536:3: lv_markerObject_6_0= ruleXExpression
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXIssueExpressionAccess().getMarkerObjectXExpressionParserRuleCall_3_1_1_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleXExpression_in_ruleXIssueExpression3102);
+                            pushFollow(FOLLOW_43);
                             lv_markerObject_6_0=ruleXExpression();
 
                             state._fsp--;
@@ -4378,7 +4378,7 @@ else if ( ((LA31_0>=RULE_STRING && LA31_0<=RULE_ID)||(LA31_0>=15 && LA31_0<=18)|
                                      			current, 
                                      			"markerObject",
                                       		lv_markerObject_6_0, 
-                                      		"XExpression");
+                                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -4388,7 +4388,7 @@ else if ( ((LA31_0>=RULE_STRING && LA31_0<=RULE_ID)||(LA31_0>=15 && LA31_0<=18)|
 
                             }
 
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1552:2: ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )?
+                            // InternalCheck.g:1552:2: ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )?
                             int alt30=2;
                             int LA30_0 = input.LA(1);
 
@@ -4401,12 +4401,12 @@ else if ( ((LA31_0>=RULE_STRING && LA31_0<=RULE_ID)||(LA31_0>=15 && LA31_0<=18)|
                             }
                             switch (alt30) {
                                 case 1 :
-                                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1552:3: ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) )
+                                    // InternalCheck.g:1552:3: ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) )
                                     {
-                                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1552:3: ( ( '#' )=>otherlv_7= '#' )
-                                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1552:4: ( '#' )=>otherlv_7= '#'
+                                    // InternalCheck.g:1552:3: ( ( '#' )=>otherlv_7= '#' )
+                                    // InternalCheck.g:1552:4: ( '#' )=>otherlv_7= '#'
                                     {
-                                    otherlv_7=(Token)match(input,32,FOLLOW_32_in_ruleXIssueExpression3123); if (state.failed) return current;
+                                    otherlv_7=(Token)match(input,32,FOLLOW_44); if (state.failed) return current;
                                     if ( state.backtracking==0 ) {
 
                                           	newLeafNode(otherlv_7, grammarAccess.getXIssueExpressionAccess().getNumberSignKeyword_3_1_1_1_0());
@@ -4415,11 +4415,11 @@ else if ( ((LA31_0>=RULE_STRING && LA31_0<=RULE_ID)||(LA31_0>=15 && LA31_0<=18)|
 
                                     }
 
-                                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1557:2: ( ( ruleFeatureCallID ) )
-                                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1558:1: ( ruleFeatureCallID )
+                                    // InternalCheck.g:1557:2: ( ( ruleFeatureCallID ) )
+                                    // InternalCheck.g:1558:1: ( ruleFeatureCallID )
                                     {
-                                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1558:1: ( ruleFeatureCallID )
-                                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1559:3: ruleFeatureCallID
+                                    // InternalCheck.g:1558:1: ( ruleFeatureCallID )
+                                    // InternalCheck.g:1559:3: ruleFeatureCallID
                                     {
                                     if ( state.backtracking==0 ) {
 
@@ -4433,7 +4433,7 @@ else if ( ((LA31_0>=RULE_STRING && LA31_0<=RULE_ID)||(LA31_0>=15 && LA31_0<=18)|
                                       	        newCompositeNode(grammarAccess.getXIssueExpressionAccess().getMarkerFeatureEStructuralFeatureCrossReference_3_1_1_1_1_0()); 
                                       	    
                                     }
-                                    pushFollow(FOLLOW_ruleFeatureCallID_in_ruleXIssueExpression3147);
+                                    pushFollow(FOLLOW_42);
                                     ruleFeatureCallID();
 
                                     state._fsp--;
@@ -4464,7 +4464,7 @@ else if ( ((LA31_0>=RULE_STRING && LA31_0<=RULE_ID)||(LA31_0>=15 && LA31_0<=18)|
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1572:6: ( ( ( '[' )=>otherlv_9= '[' ) ( (lv_markerIndex_10_0= ruleXExpression ) ) otherlv_11= ']' )?
+                    // InternalCheck.g:1572:6: ( ( ( '[' )=>otherlv_9= '[' ) ( (lv_markerIndex_10_0= ruleXExpression ) ) otherlv_11= ']' )?
                     int alt32=2;
                     int LA32_0 = input.LA(1);
 
@@ -4477,12 +4477,12 @@ else if ( ((LA31_0>=RULE_STRING && LA31_0<=RULE_ID)||(LA31_0>=15 && LA31_0<=18)|
                     }
                     switch (alt32) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1572:7: ( ( '[' )=>otherlv_9= '[' ) ( (lv_markerIndex_10_0= ruleXExpression ) ) otherlv_11= ']'
+                            // InternalCheck.g:1572:7: ( ( '[' )=>otherlv_9= '[' ) ( (lv_markerIndex_10_0= ruleXExpression ) ) otherlv_11= ']'
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1572:7: ( ( '[' )=>otherlv_9= '[' )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1572:8: ( '[' )=>otherlv_9= '['
+                            // InternalCheck.g:1572:7: ( ( '[' )=>otherlv_9= '[' )
+                            // InternalCheck.g:1572:8: ( '[' )=>otherlv_9= '['
                             {
-                            otherlv_9=(Token)match(input,33,FOLLOW_33_in_ruleXIssueExpression3172); if (state.failed) return current;
+                            otherlv_9=(Token)match(input,33,FOLLOW_29); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                   	newLeafNode(otherlv_9, grammarAccess.getXIssueExpressionAccess().getLeftSquareBracketKeyword_3_2_0());
@@ -4491,18 +4491,18 @@ else if ( ((LA31_0>=RULE_STRING && LA31_0<=RULE_ID)||(LA31_0>=15 && LA31_0<=18)|
 
                             }
 
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1577:2: ( (lv_markerIndex_10_0= ruleXExpression ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1578:1: (lv_markerIndex_10_0= ruleXExpression )
+                            // InternalCheck.g:1577:2: ( (lv_markerIndex_10_0= ruleXExpression ) )
+                            // InternalCheck.g:1578:1: (lv_markerIndex_10_0= ruleXExpression )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1578:1: (lv_markerIndex_10_0= ruleXExpression )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1579:3: lv_markerIndex_10_0= ruleXExpression
+                            // InternalCheck.g:1578:1: (lv_markerIndex_10_0= ruleXExpression )
+                            // InternalCheck.g:1579:3: lv_markerIndex_10_0= ruleXExpression
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXIssueExpressionAccess().getMarkerIndexXExpressionParserRuleCall_3_2_1_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleXExpression_in_ruleXIssueExpression3194);
+                            pushFollow(FOLLOW_45);
                             lv_markerIndex_10_0=ruleXExpression();
 
                             state._fsp--;
@@ -4516,7 +4516,7 @@ else if ( ((LA31_0>=RULE_STRING && LA31_0<=RULE_ID)||(LA31_0>=15 && LA31_0<=18)|
                                      			current, 
                                      			"markerIndex",
                                       		lv_markerIndex_10_0, 
-                                      		"XExpression");
+                                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -4526,7 +4526,7 @@ else if ( ((LA31_0>=RULE_STRING && LA31_0<=RULE_ID)||(LA31_0>=15 && LA31_0<=18)|
 
                             }
 
-                            otherlv_11=(Token)match(input,34,FOLLOW_34_in_ruleXIssueExpression3206); if (state.failed) return current;
+                            otherlv_11=(Token)match(input,34,FOLLOW_46); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                   	newLeafNode(otherlv_11, grammarAccess.getXIssueExpressionAccess().getRightSquareBracketKeyword_3_2_2());
@@ -4544,7 +4544,7 @@ else if ( ((LA31_0>=RULE_STRING && LA31_0<=RULE_ID)||(LA31_0>=15 && LA31_0<=18)|
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1599:5: ( ( ( 'message' )=>otherlv_12= 'message' ) ( (lv_message_13_0= ruleXExpression ) ) )?
+            // InternalCheck.g:1599:5: ( ( ( 'message' )=>otherlv_12= 'message' ) ( (lv_message_13_0= ruleXExpression ) ) )?
             int alt34=2;
             int LA34_0 = input.LA(1);
 
@@ -4557,12 +4557,12 @@ else if ( ((LA31_0>=RULE_STRING && LA31_0<=RULE_ID)||(LA31_0>=15 && LA31_0<=18)|
             }
             switch (alt34) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1599:6: ( ( 'message' )=>otherlv_12= 'message' ) ( (lv_message_13_0= ruleXExpression ) )
+                    // InternalCheck.g:1599:6: ( ( 'message' )=>otherlv_12= 'message' ) ( (lv_message_13_0= ruleXExpression ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1599:6: ( ( 'message' )=>otherlv_12= 'message' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1599:7: ( 'message' )=>otherlv_12= 'message'
+                    // InternalCheck.g:1599:6: ( ( 'message' )=>otherlv_12= 'message' )
+                    // InternalCheck.g:1599:7: ( 'message' )=>otherlv_12= 'message'
                     {
-                    otherlv_12=(Token)match(input,26,FOLLOW_26_in_ruleXIssueExpression3231); if (state.failed) return current;
+                    otherlv_12=(Token)match(input,26,FOLLOW_29); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_12, grammarAccess.getXIssueExpressionAccess().getMessageKeyword_4_0());
@@ -4571,18 +4571,18 @@ else if ( ((LA31_0>=RULE_STRING && LA31_0<=RULE_ID)||(LA31_0>=15 && LA31_0<=18)|
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1604:2: ( (lv_message_13_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1605:1: (lv_message_13_0= ruleXExpression )
+                    // InternalCheck.g:1604:2: ( (lv_message_13_0= ruleXExpression ) )
+                    // InternalCheck.g:1605:1: (lv_message_13_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1605:1: (lv_message_13_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1606:3: lv_message_13_0= ruleXExpression
+                    // InternalCheck.g:1605:1: (lv_message_13_0= ruleXExpression )
+                    // InternalCheck.g:1606:3: lv_message_13_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXIssueExpressionAccess().getMessageXExpressionParserRuleCall_4_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXIssueExpression3253);
+                    pushFollow(FOLLOW_47);
                     lv_message_13_0=ruleXExpression();
 
                     state._fsp--;
@@ -4596,7 +4596,7 @@ else if ( ((LA31_0>=RULE_STRING && LA31_0<=RULE_ID)||(LA31_0>=15 && LA31_0<=18)|
                              			current, 
                              			"message",
                               		lv_message_13_0, 
-                              		"XExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -4612,7 +4612,7 @@ else if ( ((LA31_0>=RULE_STRING && LA31_0<=RULE_ID)||(LA31_0>=15 && LA31_0<=18)|
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1622:4: ( ( ( 'bind' )=>otherlv_14= 'bind' ) otherlv_15= '(' ( (lv_messageParameters_16_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_17= ',' ) ( (lv_messageParameters_18_0= ruleXExpression ) ) )* otherlv_19= ')' )?
+            // InternalCheck.g:1622:4: ( ( ( 'bind' )=>otherlv_14= 'bind' ) otherlv_15= '(' ( (lv_messageParameters_16_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_17= ',' ) ( (lv_messageParameters_18_0= ruleXExpression ) ) )* otherlv_19= ')' )?
             int alt36=2;
             int LA36_0 = input.LA(1);
 
@@ -4625,12 +4625,12 @@ else if ( ((LA31_0>=RULE_STRING && LA31_0<=RULE_ID)||(LA31_0>=15 && LA31_0<=18)|
             }
             switch (alt36) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1622:5: ( ( 'bind' )=>otherlv_14= 'bind' ) otherlv_15= '(' ( (lv_messageParameters_16_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_17= ',' ) ( (lv_messageParameters_18_0= ruleXExpression ) ) )* otherlv_19= ')'
+                    // InternalCheck.g:1622:5: ( ( 'bind' )=>otherlv_14= 'bind' ) otherlv_15= '(' ( (lv_messageParameters_16_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_17= ',' ) ( (lv_messageParameters_18_0= ruleXExpression ) ) )* otherlv_19= ')'
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1622:5: ( ( 'bind' )=>otherlv_14= 'bind' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1622:6: ( 'bind' )=>otherlv_14= 'bind'
+                    // InternalCheck.g:1622:5: ( ( 'bind' )=>otherlv_14= 'bind' )
+                    // InternalCheck.g:1622:6: ( 'bind' )=>otherlv_14= 'bind'
                     {
-                    otherlv_14=(Token)match(input,38,FOLLOW_38_in_ruleXIssueExpression3276); if (state.failed) return current;
+                    otherlv_14=(Token)match(input,38,FOLLOW_24); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_14, grammarAccess.getXIssueExpressionAccess().getBindKeyword_5_0());
@@ -4639,24 +4639,24 @@ else if ( ((LA31_0>=RULE_STRING && LA31_0<=RULE_ID)||(LA31_0>=15 && LA31_0<=18)|
 
                     }
 
-                    otherlv_15=(Token)match(input,23,FOLLOW_23_in_ruleXIssueExpression3289); if (state.failed) return current;
+                    otherlv_15=(Token)match(input,23,FOLLOW_29); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_15, grammarAccess.getXIssueExpressionAccess().getLeftParenthesisKeyword_5_1());
                           
                     }
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1631:1: ( (lv_messageParameters_16_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1632:1: (lv_messageParameters_16_0= ruleXExpression )
+                    // InternalCheck.g:1631:1: ( (lv_messageParameters_16_0= ruleXExpression ) )
+                    // InternalCheck.g:1632:1: (lv_messageParameters_16_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1632:1: (lv_messageParameters_16_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1633:3: lv_messageParameters_16_0= ruleXExpression
+                    // InternalCheck.g:1632:1: (lv_messageParameters_16_0= ruleXExpression )
+                    // InternalCheck.g:1633:3: lv_messageParameters_16_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXIssueExpressionAccess().getMessageParametersXExpressionParserRuleCall_5_2_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXIssueExpression3310);
+                    pushFollow(FOLLOW_19);
                     lv_messageParameters_16_0=ruleXExpression();
 
                     state._fsp--;
@@ -4670,7 +4670,7 @@ else if ( ((LA31_0>=RULE_STRING && LA31_0<=RULE_ID)||(LA31_0>=15 && LA31_0<=18)|
                              			current, 
                              			"messageParameters",
                               		lv_messageParameters_16_0, 
-                              		"XExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -4680,7 +4680,7 @@ else if ( ((LA31_0>=RULE_STRING && LA31_0<=RULE_ID)||(LA31_0>=15 && LA31_0<=18)|
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1649:2: ( ( ( ',' )=>otherlv_17= ',' ) ( (lv_messageParameters_18_0= ruleXExpression ) ) )*
+                    // InternalCheck.g:1649:2: ( ( ( ',' )=>otherlv_17= ',' ) ( (lv_messageParameters_18_0= ruleXExpression ) ) )*
                     loop35:
                     do {
                         int alt35=2;
@@ -4693,12 +4693,12 @@ else if ( ((LA31_0>=RULE_STRING && LA31_0<=RULE_ID)||(LA31_0>=15 && LA31_0<=18)|
 
                         switch (alt35) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1649:3: ( ( ',' )=>otherlv_17= ',' ) ( (lv_messageParameters_18_0= ruleXExpression ) )
+                    	    // InternalCheck.g:1649:3: ( ( ',' )=>otherlv_17= ',' ) ( (lv_messageParameters_18_0= ruleXExpression ) )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1649:3: ( ( ',' )=>otherlv_17= ',' )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1649:4: ( ',' )=>otherlv_17= ','
+                    	    // InternalCheck.g:1649:3: ( ( ',' )=>otherlv_17= ',' )
+                    	    // InternalCheck.g:1649:4: ( ',' )=>otherlv_17= ','
                     	    {
-                    	    otherlv_17=(Token)match(input,24,FOLLOW_24_in_ruleXIssueExpression3331); if (state.failed) return current;
+                    	    otherlv_17=(Token)match(input,24,FOLLOW_29); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_17, grammarAccess.getXIssueExpressionAccess().getCommaKeyword_5_3_0());
@@ -4707,18 +4707,18 @@ else if ( ((LA31_0>=RULE_STRING && LA31_0<=RULE_ID)||(LA31_0>=15 && LA31_0<=18)|
 
                     	    }
 
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1654:2: ( (lv_messageParameters_18_0= ruleXExpression ) )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1655:1: (lv_messageParameters_18_0= ruleXExpression )
+                    	    // InternalCheck.g:1654:2: ( (lv_messageParameters_18_0= ruleXExpression ) )
+                    	    // InternalCheck.g:1655:1: (lv_messageParameters_18_0= ruleXExpression )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1655:1: (lv_messageParameters_18_0= ruleXExpression )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1656:3: lv_messageParameters_18_0= ruleXExpression
+                    	    // InternalCheck.g:1655:1: (lv_messageParameters_18_0= ruleXExpression )
+                    	    // InternalCheck.g:1656:3: lv_messageParameters_18_0= ruleXExpression
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getXIssueExpressionAccess().getMessageParametersXExpressionParserRuleCall_5_3_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleXExpression_in_ruleXIssueExpression3353);
+                    	    pushFollow(FOLLOW_19);
                     	    lv_messageParameters_18_0=ruleXExpression();
 
                     	    state._fsp--;
@@ -4732,7 +4732,7 @@ else if ( ((LA31_0>=RULE_STRING && LA31_0<=RULE_ID)||(LA31_0>=15 && LA31_0<=18)|
                     	             			current, 
                     	             			"messageParameters",
                     	              		lv_messageParameters_18_0, 
-                    	              		"XExpression");
+                    	              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -4751,7 +4751,7 @@ else if ( ((LA31_0>=RULE_STRING && LA31_0<=RULE_ID)||(LA31_0>=15 && LA31_0<=18)|
                         }
                     } while (true);
 
-                    otherlv_19=(Token)match(input,25,FOLLOW_25_in_ruleXIssueExpression3367); if (state.failed) return current;
+                    otherlv_19=(Token)match(input,25,FOLLOW_48); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_19, grammarAccess.getXIssueExpressionAccess().getRightParenthesisKeyword_5_4());
@@ -4763,7 +4763,7 @@ else if ( ((LA31_0>=RULE_STRING && LA31_0<=RULE_ID)||(LA31_0>=15 && LA31_0<=18)|
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1676:3: ( ( ( 'data' )=>otherlv_20= 'data' ) ( (lv_issueCode_21_0= ruleValidID ) )? otherlv_22= '(' ( (lv_issueData_23_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_24= ',' ) ( (lv_issueData_25_0= ruleXExpression ) ) )* otherlv_26= ')' )?
+            // InternalCheck.g:1676:3: ( ( ( 'data' )=>otherlv_20= 'data' ) ( (lv_issueCode_21_0= ruleValidID ) )? otherlv_22= '(' ( (lv_issueData_23_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_24= ',' ) ( (lv_issueData_25_0= ruleXExpression ) ) )* otherlv_26= ')' )?
             int alt39=2;
             int LA39_0 = input.LA(1);
 
@@ -4776,12 +4776,12 @@ else if ( ((LA31_0>=RULE_STRING && LA31_0<=RULE_ID)||(LA31_0>=15 && LA31_0<=18)|
             }
             switch (alt39) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1676:4: ( ( 'data' )=>otherlv_20= 'data' ) ( (lv_issueCode_21_0= ruleValidID ) )? otherlv_22= '(' ( (lv_issueData_23_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_24= ',' ) ( (lv_issueData_25_0= ruleXExpression ) ) )* otherlv_26= ')'
+                    // InternalCheck.g:1676:4: ( ( 'data' )=>otherlv_20= 'data' ) ( (lv_issueCode_21_0= ruleValidID ) )? otherlv_22= '(' ( (lv_issueData_23_0= ruleXExpression ) ) ( ( ( ',' )=>otherlv_24= ',' ) ( (lv_issueData_25_0= ruleXExpression ) ) )* otherlv_26= ')'
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1676:4: ( ( 'data' )=>otherlv_20= 'data' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1676:5: ( 'data' )=>otherlv_20= 'data'
+                    // InternalCheck.g:1676:4: ( ( 'data' )=>otherlv_20= 'data' )
+                    // InternalCheck.g:1676:5: ( 'data' )=>otherlv_20= 'data'
                     {
-                    otherlv_20=(Token)match(input,39,FOLLOW_39_in_ruleXIssueExpression3390); if (state.failed) return current;
+                    otherlv_20=(Token)match(input,39,FOLLOW_49); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_20, grammarAccess.getXIssueExpressionAccess().getDataKeyword_6_0());
@@ -4790,7 +4790,7 @@ else if ( ((LA31_0>=RULE_STRING && LA31_0<=RULE_ID)||(LA31_0>=15 && LA31_0<=18)|
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1681:2: ( (lv_issueCode_21_0= ruleValidID ) )?
+                    // InternalCheck.g:1681:2: ( (lv_issueCode_21_0= ruleValidID ) )?
                     int alt37=2;
                     int LA37_0 = input.LA(1);
 
@@ -4799,17 +4799,17 @@ else if ( ((LA31_0>=RULE_STRING && LA31_0<=RULE_ID)||(LA31_0>=15 && LA31_0<=18)|
                     }
                     switch (alt37) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1682:1: (lv_issueCode_21_0= ruleValidID )
+                            // InternalCheck.g:1682:1: (lv_issueCode_21_0= ruleValidID )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1682:1: (lv_issueCode_21_0= ruleValidID )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1683:3: lv_issueCode_21_0= ruleValidID
+                            // InternalCheck.g:1682:1: (lv_issueCode_21_0= ruleValidID )
+                            // InternalCheck.g:1683:3: lv_issueCode_21_0= ruleValidID
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXIssueExpressionAccess().getIssueCodeValidIDParserRuleCall_6_1_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleValidID_in_ruleXIssueExpression3412);
+                            pushFollow(FOLLOW_24);
                             lv_issueCode_21_0=ruleValidID();
 
                             state._fsp--;
@@ -4823,7 +4823,7 @@ else if ( ((LA31_0>=RULE_STRING && LA31_0<=RULE_ID)||(LA31_0>=15 && LA31_0<=18)|
                                      			current, 
                                      			"issueCode",
                                       		lv_issueCode_21_0, 
-                                      		"ValidID");
+                                      		"org.eclipse.xtext.xbase.Xtype.ValidID");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -4836,24 +4836,24 @@ else if ( ((LA31_0>=RULE_STRING && LA31_0<=RULE_ID)||(LA31_0>=15 && LA31_0<=18)|
 
                     }
 
-                    otherlv_22=(Token)match(input,23,FOLLOW_23_in_ruleXIssueExpression3425); if (state.failed) return current;
+                    otherlv_22=(Token)match(input,23,FOLLOW_29); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_22, grammarAccess.getXIssueExpressionAccess().getLeftParenthesisKeyword_6_2());
                           
                     }
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1703:1: ( (lv_issueData_23_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1704:1: (lv_issueData_23_0= ruleXExpression )
+                    // InternalCheck.g:1703:1: ( (lv_issueData_23_0= ruleXExpression ) )
+                    // InternalCheck.g:1704:1: (lv_issueData_23_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1704:1: (lv_issueData_23_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1705:3: lv_issueData_23_0= ruleXExpression
+                    // InternalCheck.g:1704:1: (lv_issueData_23_0= ruleXExpression )
+                    // InternalCheck.g:1705:3: lv_issueData_23_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXIssueExpressionAccess().getIssueDataXExpressionParserRuleCall_6_3_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXIssueExpression3446);
+                    pushFollow(FOLLOW_19);
                     lv_issueData_23_0=ruleXExpression();
 
                     state._fsp--;
@@ -4867,7 +4867,7 @@ else if ( ((LA31_0>=RULE_STRING && LA31_0<=RULE_ID)||(LA31_0>=15 && LA31_0<=18)|
                              			current, 
                              			"issueData",
                               		lv_issueData_23_0, 
-                              		"XExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -4877,7 +4877,7 @@ else if ( ((LA31_0>=RULE_STRING && LA31_0<=RULE_ID)||(LA31_0>=15 && LA31_0<=18)|
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1721:2: ( ( ( ',' )=>otherlv_24= ',' ) ( (lv_issueData_25_0= ruleXExpression ) ) )*
+                    // InternalCheck.g:1721:2: ( ( ( ',' )=>otherlv_24= ',' ) ( (lv_issueData_25_0= ruleXExpression ) ) )*
                     loop38:
                     do {
                         int alt38=2;
@@ -4890,12 +4890,12 @@ else if ( ((LA31_0>=RULE_STRING && LA31_0<=RULE_ID)||(LA31_0>=15 && LA31_0<=18)|
 
                         switch (alt38) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1721:3: ( ( ',' )=>otherlv_24= ',' ) ( (lv_issueData_25_0= ruleXExpression ) )
+                    	    // InternalCheck.g:1721:3: ( ( ',' )=>otherlv_24= ',' ) ( (lv_issueData_25_0= ruleXExpression ) )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1721:3: ( ( ',' )=>otherlv_24= ',' )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1721:4: ( ',' )=>otherlv_24= ','
+                    	    // InternalCheck.g:1721:3: ( ( ',' )=>otherlv_24= ',' )
+                    	    // InternalCheck.g:1721:4: ( ',' )=>otherlv_24= ','
                     	    {
-                    	    otherlv_24=(Token)match(input,24,FOLLOW_24_in_ruleXIssueExpression3467); if (state.failed) return current;
+                    	    otherlv_24=(Token)match(input,24,FOLLOW_29); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_24, grammarAccess.getXIssueExpressionAccess().getCommaKeyword_6_4_0());
@@ -4904,18 +4904,18 @@ else if ( ((LA31_0>=RULE_STRING && LA31_0<=RULE_ID)||(LA31_0>=15 && LA31_0<=18)|
 
                     	    }
 
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1726:2: ( (lv_issueData_25_0= ruleXExpression ) )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1727:1: (lv_issueData_25_0= ruleXExpression )
+                    	    // InternalCheck.g:1726:2: ( (lv_issueData_25_0= ruleXExpression ) )
+                    	    // InternalCheck.g:1727:1: (lv_issueData_25_0= ruleXExpression )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1727:1: (lv_issueData_25_0= ruleXExpression )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1728:3: lv_issueData_25_0= ruleXExpression
+                    	    // InternalCheck.g:1727:1: (lv_issueData_25_0= ruleXExpression )
+                    	    // InternalCheck.g:1728:3: lv_issueData_25_0= ruleXExpression
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getXIssueExpressionAccess().getIssueDataXExpressionParserRuleCall_6_4_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleXExpression_in_ruleXIssueExpression3489);
+                    	    pushFollow(FOLLOW_19);
                     	    lv_issueData_25_0=ruleXExpression();
 
                     	    state._fsp--;
@@ -4929,7 +4929,7 @@ else if ( ((LA31_0>=RULE_STRING && LA31_0<=RULE_ID)||(LA31_0>=15 && LA31_0<=18)|
                     	             			current, 
                     	             			"issueData",
                     	              		lv_issueData_25_0, 
-                    	              		"XExpression");
+                    	              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -4948,7 +4948,7 @@ else if ( ((LA31_0>=RULE_STRING && LA31_0<=RULE_ID)||(LA31_0>=15 && LA31_0<=18)|
                         }
                     } while (true);
 
-                    otherlv_26=(Token)match(input,25,FOLLOW_25_in_ruleXIssueExpression3503); if (state.failed) return current;
+                    otherlv_26=(Token)match(input,25,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_26, grammarAccess.getXIssueExpressionAccess().getRightParenthesisKeyword_6_5());
@@ -4983,7 +4983,7 @@ else if ( ((LA31_0>=RULE_STRING && LA31_0<=RULE_ID)||(LA31_0>=15 && LA31_0<=18)|
 
 
     // $ANTLR start "entryRuleXPrimaryExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1756:1: entryRuleXPrimaryExpression returns [EObject current=null] : iv_ruleXPrimaryExpression= ruleXPrimaryExpression EOF ;
+    // InternalCheck.g:1756:1: entryRuleXPrimaryExpression returns [EObject current=null] : iv_ruleXPrimaryExpression= ruleXPrimaryExpression EOF ;
     public final EObject entryRuleXPrimaryExpression() throws RecognitionException {
         EObject current = null;
 
@@ -4991,13 +4991,13 @@ public final EObject entryRuleXPrimaryExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1757:2: (iv_ruleXPrimaryExpression= ruleXPrimaryExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1758:2: iv_ruleXPrimaryExpression= ruleXPrimaryExpression EOF
+            // InternalCheck.g:1757:2: (iv_ruleXPrimaryExpression= ruleXPrimaryExpression EOF )
+            // InternalCheck.g:1758:2: iv_ruleXPrimaryExpression= ruleXPrimaryExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXPrimaryExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXPrimaryExpression_in_entryRuleXPrimaryExpression3541);
+            pushFollow(FOLLOW_1);
             iv_ruleXPrimaryExpression=ruleXPrimaryExpression();
 
             state._fsp--;
@@ -5005,7 +5005,7 @@ public final EObject entryRuleXPrimaryExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXPrimaryExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXPrimaryExpression3551); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -5023,7 +5023,7 @@ public final EObject entryRuleXPrimaryExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXPrimaryExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1765:1: ruleXPrimaryExpression returns [EObject current=null] : (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression | this_XGuardExpression_15= ruleXGuardExpression | this_XIssueExpression_16= ruleXIssueExpression ) ;
+    // InternalCheck.g:1765:1: ruleXPrimaryExpression returns [EObject current=null] : (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression | this_XGuardExpression_15= ruleXGuardExpression | this_XIssueExpression_16= ruleXIssueExpression ) ;
     public final EObject ruleXPrimaryExpression() throws RecognitionException {
         EObject current = null;
 
@@ -5065,22 +5065,22 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1768:28: ( (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression | this_XGuardExpression_15= ruleXGuardExpression | this_XIssueExpression_16= ruleXIssueExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1769:1: (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression | this_XGuardExpression_15= ruleXGuardExpression | this_XIssueExpression_16= ruleXIssueExpression )
+            // InternalCheck.g:1768:28: ( (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression | this_XGuardExpression_15= ruleXGuardExpression | this_XIssueExpression_16= ruleXIssueExpression ) )
+            // InternalCheck.g:1769:1: (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression | this_XGuardExpression_15= ruleXGuardExpression | this_XIssueExpression_16= ruleXIssueExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1769:1: (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression | this_XGuardExpression_15= ruleXGuardExpression | this_XIssueExpression_16= ruleXIssueExpression )
+            // InternalCheck.g:1769:1: (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression | this_XGuardExpression_15= ruleXGuardExpression | this_XIssueExpression_16= ruleXIssueExpression )
             int alt40=17;
             alt40 = dfa40.predict(input);
             switch (alt40) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1770:5: this_XConstructorCall_0= ruleXConstructorCall
+                    // InternalCheck.g:1770:5: this_XConstructorCall_0= ruleXConstructorCall
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXConstructorCallParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXConstructorCall_in_ruleXPrimaryExpression3598);
+                    pushFollow(FOLLOW_2);
                     this_XConstructorCall_0=ruleXConstructorCall();
 
                     state._fsp--;
@@ -5095,14 +5095,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1780:5: this_XBlockExpression_1= ruleXBlockExpression
+                    // InternalCheck.g:1780:5: this_XBlockExpression_1= ruleXBlockExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXBlockExpressionParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXBlockExpression_in_ruleXPrimaryExpression3625);
+                    pushFollow(FOLLOW_2);
                     this_XBlockExpression_1=ruleXBlockExpression();
 
                     state._fsp--;
@@ -5117,14 +5117,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1790:5: this_XSwitchExpression_2= ruleXSwitchExpression
+                    // InternalCheck.g:1790:5: this_XSwitchExpression_2= ruleXSwitchExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXSwitchExpressionParserRuleCall_2()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXSwitchExpression_in_ruleXPrimaryExpression3652);
+                    pushFollow(FOLLOW_2);
                     this_XSwitchExpression_2=ruleXSwitchExpression();
 
                     state._fsp--;
@@ -5139,17 +5139,17 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1799:6: ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression )
+                    // InternalCheck.g:1799:6: ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1799:6: ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1799:7: ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression
+                    // InternalCheck.g:1799:6: ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression )
+                    // InternalCheck.g:1799:7: ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXSynchronizedExpressionParserRuleCall_3()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXSynchronizedExpression_in_ruleXPrimaryExpression3696);
+                    pushFollow(FOLLOW_2);
                     this_XSynchronizedExpression_3=ruleXSynchronizedExpression();
 
                     state._fsp--;
@@ -5167,14 +5167,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1813:5: this_XFeatureCall_4= ruleXFeatureCall
+                    // InternalCheck.g:1813:5: this_XFeatureCall_4= ruleXFeatureCall
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXFeatureCallParserRuleCall_4()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXFeatureCall_in_ruleXPrimaryExpression3724);
+                    pushFollow(FOLLOW_2);
                     this_XFeatureCall_4=ruleXFeatureCall();
 
                     state._fsp--;
@@ -5189,14 +5189,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1823:5: this_XLiteral_5= ruleXLiteral
+                    // InternalCheck.g:1823:5: this_XLiteral_5= ruleXLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXLiteralParserRuleCall_5()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXLiteral_in_ruleXPrimaryExpression3751);
+                    pushFollow(FOLLOW_2);
                     this_XLiteral_5=ruleXLiteral();
 
                     state._fsp--;
@@ -5211,14 +5211,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1833:5: this_XIfExpression_6= ruleXIfExpression
+                    // InternalCheck.g:1833:5: this_XIfExpression_6= ruleXIfExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXIfExpressionParserRuleCall_6()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXIfExpression_in_ruleXPrimaryExpression3778);
+                    pushFollow(FOLLOW_2);
                     this_XIfExpression_6=ruleXIfExpression();
 
                     state._fsp--;
@@ -5233,17 +5233,17 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 8 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1842:6: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression )
+                    // InternalCheck.g:1842:6: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1842:6: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1842:7: ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression
+                    // InternalCheck.g:1842:6: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression )
+                    // InternalCheck.g:1842:7: ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXForLoopExpressionParserRuleCall_7()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXForLoopExpression_in_ruleXPrimaryExpression3835);
+                    pushFollow(FOLLOW_2);
                     this_XForLoopExpression_7=ruleXForLoopExpression();
 
                     state._fsp--;
@@ -5261,14 +5261,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 9 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1861:5: this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression
+                    // InternalCheck.g:1861:5: this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXBasicForLoopExpressionParserRuleCall_8()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXBasicForLoopExpression_in_ruleXPrimaryExpression3863);
+                    pushFollow(FOLLOW_2);
                     this_XBasicForLoopExpression_8=ruleXBasicForLoopExpression();
 
                     state._fsp--;
@@ -5283,14 +5283,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 10 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1871:5: this_XWhileExpression_9= ruleXWhileExpression
+                    // InternalCheck.g:1871:5: this_XWhileExpression_9= ruleXWhileExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXWhileExpressionParserRuleCall_9()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXWhileExpression_in_ruleXPrimaryExpression3890);
+                    pushFollow(FOLLOW_2);
                     this_XWhileExpression_9=ruleXWhileExpression();
 
                     state._fsp--;
@@ -5305,14 +5305,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 11 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1881:5: this_XDoWhileExpression_10= ruleXDoWhileExpression
+                    // InternalCheck.g:1881:5: this_XDoWhileExpression_10= ruleXDoWhileExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXDoWhileExpressionParserRuleCall_10()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXDoWhileExpression_in_ruleXPrimaryExpression3917);
+                    pushFollow(FOLLOW_2);
                     this_XDoWhileExpression_10=ruleXDoWhileExpression();
 
                     state._fsp--;
@@ -5327,14 +5327,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 12 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1891:5: this_XThrowExpression_11= ruleXThrowExpression
+                    // InternalCheck.g:1891:5: this_XThrowExpression_11= ruleXThrowExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXThrowExpressionParserRuleCall_11()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXThrowExpression_in_ruleXPrimaryExpression3944);
+                    pushFollow(FOLLOW_2);
                     this_XThrowExpression_11=ruleXThrowExpression();
 
                     state._fsp--;
@@ -5349,14 +5349,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 13 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1901:5: this_XReturnExpression_12= ruleXReturnExpression
+                    // InternalCheck.g:1901:5: this_XReturnExpression_12= ruleXReturnExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXReturnExpressionParserRuleCall_12()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXReturnExpression_in_ruleXPrimaryExpression3971);
+                    pushFollow(FOLLOW_2);
                     this_XReturnExpression_12=ruleXReturnExpression();
 
                     state._fsp--;
@@ -5371,14 +5371,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 14 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1911:5: this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression
+                    // InternalCheck.g:1911:5: this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXTryCatchFinallyExpressionParserRuleCall_13()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXTryCatchFinallyExpression_in_ruleXPrimaryExpression3998);
+                    pushFollow(FOLLOW_2);
                     this_XTryCatchFinallyExpression_13=ruleXTryCatchFinallyExpression();
 
                     state._fsp--;
@@ -5393,14 +5393,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 15 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1921:5: this_XParenthesizedExpression_14= ruleXParenthesizedExpression
+                    // InternalCheck.g:1921:5: this_XParenthesizedExpression_14= ruleXParenthesizedExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXParenthesizedExpressionParserRuleCall_14()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXParenthesizedExpression_in_ruleXPrimaryExpression4025);
+                    pushFollow(FOLLOW_2);
                     this_XParenthesizedExpression_14=ruleXParenthesizedExpression();
 
                     state._fsp--;
@@ -5415,14 +5415,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 16 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1931:5: this_XGuardExpression_15= ruleXGuardExpression
+                    // InternalCheck.g:1931:5: this_XGuardExpression_15= ruleXGuardExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXGuardExpressionParserRuleCall_15()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXGuardExpression_in_ruleXPrimaryExpression4052);
+                    pushFollow(FOLLOW_2);
                     this_XGuardExpression_15=ruleXGuardExpression();
 
                     state._fsp--;
@@ -5437,14 +5437,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 17 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1941:5: this_XIssueExpression_16= ruleXIssueExpression
+                    // InternalCheck.g:1941:5: this_XIssueExpression_16= ruleXIssueExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXIssueExpressionParserRuleCall_16()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXIssueExpression_in_ruleXPrimaryExpression4079);
+                    pushFollow(FOLLOW_2);
                     this_XIssueExpression_16=ruleXIssueExpression();
 
                     state._fsp--;
@@ -5481,7 +5481,7 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleFeatureCallID"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1957:1: entryRuleFeatureCallID returns [String current=null] : iv_ruleFeatureCallID= ruleFeatureCallID EOF ;
+    // InternalCheck.g:1957:1: entryRuleFeatureCallID returns [String current=null] : iv_ruleFeatureCallID= ruleFeatureCallID EOF ;
     public final String entryRuleFeatureCallID() throws RecognitionException {
         String current = null;
 
@@ -5489,13 +5489,13 @@ public final String entryRuleFeatureCallID() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1958:2: (iv_ruleFeatureCallID= ruleFeatureCallID EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1959:2: iv_ruleFeatureCallID= ruleFeatureCallID EOF
+            // InternalCheck.g:1958:2: (iv_ruleFeatureCallID= ruleFeatureCallID EOF )
+            // InternalCheck.g:1959:2: iv_ruleFeatureCallID= ruleFeatureCallID EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getFeatureCallIDRule()); 
             }
-            pushFollow(FOLLOW_ruleFeatureCallID_in_entryRuleFeatureCallID4115);
+            pushFollow(FOLLOW_1);
             iv_ruleFeatureCallID=ruleFeatureCallID();
 
             state._fsp--;
@@ -5503,7 +5503,7 @@ public final String entryRuleFeatureCallID() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleFeatureCallID.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFeatureCallID4126); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -5521,7 +5521,7 @@ public final String entryRuleFeatureCallID() throws RecognitionException {
 
 
     // $ANTLR start "ruleFeatureCallID"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1966:1: ruleFeatureCallID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' | kw= 'catalog' | kw= 'grammar' | kw= 'with' | kw= 'category' | kw= 'message' | kw= 'on' | kw= 'bind' | kw= 'data' | kw= 'SeverityRange' | kw= 'error' | kw= 'warning' | kw= 'info' | kw= 'ignore' | kw= 'live' | kw= 'onSave' | kw= 'onDemand' ) ;
+    // InternalCheck.g:1966:1: ruleFeatureCallID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' | kw= 'catalog' | kw= 'grammar' | kw= 'with' | kw= 'category' | kw= 'message' | kw= 'on' | kw= 'bind' | kw= 'data' | kw= 'SeverityRange' | kw= 'error' | kw= 'warning' | kw= 'info' | kw= 'ignore' | kw= 'live' | kw= 'onSave' | kw= 'onDemand' ) ;
     public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -5532,10 +5532,10 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1969:28: ( (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' | kw= 'catalog' | kw= 'grammar' | kw= 'with' | kw= 'category' | kw= 'message' | kw= 'on' | kw= 'bind' | kw= 'data' | kw= 'SeverityRange' | kw= 'error' | kw= 'warning' | kw= 'info' | kw= 'ignore' | kw= 'live' | kw= 'onSave' | kw= 'onDemand' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1970:1: (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' | kw= 'catalog' | kw= 'grammar' | kw= 'with' | kw= 'category' | kw= 'message' | kw= 'on' | kw= 'bind' | kw= 'data' | kw= 'SeverityRange' | kw= 'error' | kw= 'warning' | kw= 'info' | kw= 'ignore' | kw= 'live' | kw= 'onSave' | kw= 'onDemand' )
+            // InternalCheck.g:1969:28: ( (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' | kw= 'catalog' | kw= 'grammar' | kw= 'with' | kw= 'category' | kw= 'message' | kw= 'on' | kw= 'bind' | kw= 'data' | kw= 'SeverityRange' | kw= 'error' | kw= 'warning' | kw= 'info' | kw= 'ignore' | kw= 'live' | kw= 'onSave' | kw= 'onDemand' ) )
+            // InternalCheck.g:1970:1: (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' | kw= 'catalog' | kw= 'grammar' | kw= 'with' | kw= 'category' | kw= 'message' | kw= 'on' | kw= 'bind' | kw= 'data' | kw= 'SeverityRange' | kw= 'error' | kw= 'warning' | kw= 'info' | kw= 'ignore' | kw= 'live' | kw= 'onSave' | kw= 'onDemand' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1970:1: (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' | kw= 'catalog' | kw= 'grammar' | kw= 'with' | kw= 'category' | kw= 'message' | kw= 'on' | kw= 'bind' | kw= 'data' | kw= 'SeverityRange' | kw= 'error' | kw= 'warning' | kw= 'info' | kw= 'ignore' | kw= 'live' | kw= 'onSave' | kw= 'onDemand' )
+            // InternalCheck.g:1970:1: (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' | kw= 'catalog' | kw= 'grammar' | kw= 'with' | kw= 'category' | kw= 'message' | kw= 'on' | kw= 'bind' | kw= 'data' | kw= 'SeverityRange' | kw= 'error' | kw= 'warning' | kw= 'info' | kw= 'ignore' | kw= 'live' | kw= 'onSave' | kw= 'onDemand' )
             int alt41=21;
             switch ( input.LA(1) ) {
             case RULE_ID:
@@ -5653,14 +5653,14 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
 
             switch (alt41) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1971:5: this_ValidID_0= ruleValidID
+                    // InternalCheck.g:1971:5: this_ValidID_0= ruleValidID
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getFeatureCallIDAccess().getValidIDParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleValidID_in_ruleFeatureCallID4173);
+                    pushFollow(FOLLOW_2);
                     this_ValidID_0=ruleValidID();
 
                     state._fsp--;
@@ -5679,9 +5679,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1983:2: kw= 'extends'
+                    // InternalCheck.g:1983:2: kw= 'extends'
                     {
-                    kw=(Token)match(input,40,FOLLOW_40_in_ruleFeatureCallID4197); if (state.failed) return current;
+                    kw=(Token)match(input,40,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5692,9 +5692,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1990:2: kw= 'static'
+                    // InternalCheck.g:1990:2: kw= 'static'
                     {
-                    kw=(Token)match(input,41,FOLLOW_41_in_ruleFeatureCallID4216); if (state.failed) return current;
+                    kw=(Token)match(input,41,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5705,9 +5705,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1997:2: kw= 'import'
+                    // InternalCheck.g:1997:2: kw= 'import'
                     {
-                    kw=(Token)match(input,20,FOLLOW_20_in_ruleFeatureCallID4235); if (state.failed) return current;
+                    kw=(Token)match(input,20,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5718,9 +5718,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2004:2: kw= 'extension'
+                    // InternalCheck.g:2004:2: kw= 'extension'
                     {
-                    kw=(Token)match(input,42,FOLLOW_42_in_ruleFeatureCallID4254); if (state.failed) return current;
+                    kw=(Token)match(input,42,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5731,9 +5731,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2011:2: kw= 'catalog'
+                    // InternalCheck.g:2011:2: kw= 'catalog'
                     {
-                    kw=(Token)match(input,15,FOLLOW_15_in_ruleFeatureCallID4273); if (state.failed) return current;
+                    kw=(Token)match(input,15,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5744,9 +5744,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2018:2: kw= 'grammar'
+                    // InternalCheck.g:2018:2: kw= 'grammar'
                     {
-                    kw=(Token)match(input,17,FOLLOW_17_in_ruleFeatureCallID4292); if (state.failed) return current;
+                    kw=(Token)match(input,17,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5757,9 +5757,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 8 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2025:2: kw= 'with'
+                    // InternalCheck.g:2025:2: kw= 'with'
                     {
-                    kw=(Token)match(input,43,FOLLOW_43_in_ruleFeatureCallID4311); if (state.failed) return current;
+                    kw=(Token)match(input,43,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5770,9 +5770,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 9 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2032:2: kw= 'category'
+                    // InternalCheck.g:2032:2: kw= 'category'
                     {
-                    kw=(Token)match(input,22,FOLLOW_22_in_ruleFeatureCallID4330); if (state.failed) return current;
+                    kw=(Token)match(input,22,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5783,9 +5783,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 10 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2039:2: kw= 'message'
+                    // InternalCheck.g:2039:2: kw= 'message'
                     {
-                    kw=(Token)match(input,26,FOLLOW_26_in_ruleFeatureCallID4349); if (state.failed) return current;
+                    kw=(Token)match(input,26,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5796,9 +5796,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 11 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2046:2: kw= 'on'
+                    // InternalCheck.g:2046:2: kw= 'on'
                     {
-                    kw=(Token)match(input,37,FOLLOW_37_in_ruleFeatureCallID4368); if (state.failed) return current;
+                    kw=(Token)match(input,37,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5809,9 +5809,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 12 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2053:2: kw= 'bind'
+                    // InternalCheck.g:2053:2: kw= 'bind'
                     {
-                    kw=(Token)match(input,38,FOLLOW_38_in_ruleFeatureCallID4387); if (state.failed) return current;
+                    kw=(Token)match(input,38,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5822,9 +5822,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 13 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2060:2: kw= 'data'
+                    // InternalCheck.g:2060:2: kw= 'data'
                     {
-                    kw=(Token)match(input,39,FOLLOW_39_in_ruleFeatureCallID4406); if (state.failed) return current;
+                    kw=(Token)match(input,39,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5835,9 +5835,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 14 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2067:2: kw= 'SeverityRange'
+                    // InternalCheck.g:2067:2: kw= 'SeverityRange'
                     {
-                    kw=(Token)match(input,28,FOLLOW_28_in_ruleFeatureCallID4425); if (state.failed) return current;
+                    kw=(Token)match(input,28,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5848,9 +5848,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 15 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2074:2: kw= 'error'
+                    // InternalCheck.g:2074:2: kw= 'error'
                     {
-                    kw=(Token)match(input,44,FOLLOW_44_in_ruleFeatureCallID4444); if (state.failed) return current;
+                    kw=(Token)match(input,44,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5861,9 +5861,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 16 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2081:2: kw= 'warning'
+                    // InternalCheck.g:2081:2: kw= 'warning'
                     {
-                    kw=(Token)match(input,45,FOLLOW_45_in_ruleFeatureCallID4463); if (state.failed) return current;
+                    kw=(Token)match(input,45,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5874,9 +5874,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 17 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2088:2: kw= 'info'
+                    // InternalCheck.g:2088:2: kw= 'info'
                     {
-                    kw=(Token)match(input,46,FOLLOW_46_in_ruleFeatureCallID4482); if (state.failed) return current;
+                    kw=(Token)match(input,46,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5887,9 +5887,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 18 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2095:2: kw= 'ignore'
+                    // InternalCheck.g:2095:2: kw= 'ignore'
                     {
-                    kw=(Token)match(input,47,FOLLOW_47_in_ruleFeatureCallID4501); if (state.failed) return current;
+                    kw=(Token)match(input,47,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5900,9 +5900,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 19 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2102:2: kw= 'live'
+                    // InternalCheck.g:2102:2: kw= 'live'
                     {
-                    kw=(Token)match(input,48,FOLLOW_48_in_ruleFeatureCallID4520); if (state.failed) return current;
+                    kw=(Token)match(input,48,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5913,9 +5913,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 20 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2109:2: kw= 'onSave'
+                    // InternalCheck.g:2109:2: kw= 'onSave'
                     {
-                    kw=(Token)match(input,49,FOLLOW_49_in_ruleFeatureCallID4539); if (state.failed) return current;
+                    kw=(Token)match(input,49,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5926,9 +5926,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 21 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2116:2: kw= 'onDemand'
+                    // InternalCheck.g:2116:2: kw= 'onDemand'
                     {
-                    kw=(Token)match(input,50,FOLLOW_50_in_ruleFeatureCallID4558); if (state.failed) return current;
+                    kw=(Token)match(input,50,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5961,7 +5961,7 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
 
 
     // $ANTLR start "entryRuleXAnnotation"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2129:1: entryRuleXAnnotation returns [EObject current=null] : iv_ruleXAnnotation= ruleXAnnotation EOF ;
+    // InternalCheck.g:2129:1: entryRuleXAnnotation returns [EObject current=null] : iv_ruleXAnnotation= ruleXAnnotation EOF ;
     public final EObject entryRuleXAnnotation() throws RecognitionException {
         EObject current = null;
 
@@ -5969,13 +5969,13 @@ public final EObject entryRuleXAnnotation() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2130:2: (iv_ruleXAnnotation= ruleXAnnotation EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2131:2: iv_ruleXAnnotation= ruleXAnnotation EOF
+            // InternalCheck.g:2130:2: (iv_ruleXAnnotation= ruleXAnnotation EOF )
+            // InternalCheck.g:2131:2: iv_ruleXAnnotation= ruleXAnnotation EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAnnotationRule()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotation_in_entryRuleXAnnotation4598);
+            pushFollow(FOLLOW_1);
             iv_ruleXAnnotation=ruleXAnnotation();
 
             state._fsp--;
@@ -5983,7 +5983,7 @@ public final EObject entryRuleXAnnotation() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXAnnotation; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAnnotation4608); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -6001,7 +6001,7 @@ public final EObject entryRuleXAnnotation() throws RecognitionException {
 
 
     // $ANTLR start "ruleXAnnotation"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2138:1: ruleXAnnotation returns [EObject current=null] : ( () otherlv_1= '@' ( ( ruleQualifiedName ) ) ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )? ) ;
+    // InternalCheck.g:2138:1: ruleXAnnotation returns [EObject current=null] : ( () otherlv_1= '@' ( ( ruleQualifiedName ) ) ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )? ) ;
     public final EObject ruleXAnnotation() throws RecognitionException {
         EObject current = null;
 
@@ -6019,14 +6019,14 @@ public final EObject ruleXAnnotation() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2141:28: ( ( () otherlv_1= '@' ( ( ruleQualifiedName ) ) ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )? ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2142:1: ( () otherlv_1= '@' ( ( ruleQualifiedName ) ) ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )? )
+            // InternalCheck.g:2141:28: ( ( () otherlv_1= '@' ( ( ruleQualifiedName ) ) ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )? ) )
+            // InternalCheck.g:2142:1: ( () otherlv_1= '@' ( ( ruleQualifiedName ) ) ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )? )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2142:1: ( () otherlv_1= '@' ( ( ruleQualifiedName ) ) ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )? )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2142:2: () otherlv_1= '@' ( ( ruleQualifiedName ) ) ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )?
+            // InternalCheck.g:2142:1: ( () otherlv_1= '@' ( ( ruleQualifiedName ) ) ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )? )
+            // InternalCheck.g:2142:2: () otherlv_1= '@' ( ( ruleQualifiedName ) ) ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )?
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2142:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2143:5: 
+            // InternalCheck.g:2142:2: ()
+            // InternalCheck.g:2143:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -6038,17 +6038,17 @@ public final EObject ruleXAnnotation() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,27,FOLLOW_27_in_ruleXAnnotation4654); if (state.failed) return current;
+            otherlv_1=(Token)match(input,27,FOLLOW_3); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXAnnotationAccess().getCommercialAtKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2152:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2153:1: ( ruleQualifiedName )
+            // InternalCheck.g:2152:1: ( ( ruleQualifiedName ) )
+            // InternalCheck.g:2153:1: ( ruleQualifiedName )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2153:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2154:3: ruleQualifiedName
+            // InternalCheck.g:2153:1: ( ruleQualifiedName )
+            // InternalCheck.g:2154:3: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
 
@@ -6062,7 +6062,7 @@ public final EObject ruleXAnnotation() throws RecognitionException {
               	        newCompositeNode(grammarAccess.getXAnnotationAccess().getAnnotationTypeJvmAnnotationTypeCrossReference_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_ruleXAnnotation4677);
+            pushFollow(FOLLOW_50);
             ruleQualifiedName();
 
             state._fsp--;
@@ -6078,17 +6078,17 @@ public final EObject ruleXAnnotation() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2167:2: ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )?
+            // InternalCheck.g:2167:2: ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )?
             int alt44=2;
             alt44 = dfa44.predict(input);
             switch (alt44) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2167:3: ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')'
+                    // InternalCheck.g:2167:3: ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')'
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2167:3: ( ( '(' )=>otherlv_3= '(' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2167:4: ( '(' )=>otherlv_3= '('
+                    // InternalCheck.g:2167:3: ( ( '(' )=>otherlv_3= '(' )
+                    // InternalCheck.g:2167:4: ( '(' )=>otherlv_3= '('
                     {
-                    otherlv_3=(Token)match(input,23,FOLLOW_23_in_ruleXAnnotation4698); if (state.failed) return current;
+                    otherlv_3=(Token)match(input,23,FOLLOW_51); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_3, grammarAccess.getXAnnotationAccess().getLeftParenthesisKeyword_3_0());
@@ -6097,28 +6097,28 @@ public final EObject ruleXAnnotation() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2172:2: ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )?
+                    // InternalCheck.g:2172:2: ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )?
                     int alt43=3;
                     alt43 = dfa43.predict(input);
                     switch (alt43) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2172:3: ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* )
+                            // InternalCheck.g:2172:3: ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2172:3: ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2172:4: ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )*
+                            // InternalCheck.g:2172:3: ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* )
+                            // InternalCheck.g:2172:4: ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )*
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2172:4: ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2172:5: ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair )
+                            // InternalCheck.g:2172:4: ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) )
+                            // InternalCheck.g:2172:5: ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2178:1: (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2179:3: lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair
+                            // InternalCheck.g:2178:1: (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair )
+                            // InternalCheck.g:2179:3: lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXAnnotationAccess().getElementValuePairsXAnnotationElementValuePairParserRuleCall_3_1_0_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleXAnnotationElementValuePair_in_ruleXAnnotation4742);
+                            pushFollow(FOLLOW_19);
                             lv_elementValuePairs_4_0=ruleXAnnotationElementValuePair();
 
                             state._fsp--;
@@ -6132,7 +6132,7 @@ public final EObject ruleXAnnotation() throws RecognitionException {
                                      			current, 
                                      			"elementValuePairs",
                                       		lv_elementValuePairs_4_0, 
-                                      		"XAnnotationElementValuePair");
+                                      		"org.eclipse.xtext.xbase.annotations.XbaseWithAnnotations.XAnnotationElementValuePair");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -6142,7 +6142,7 @@ public final EObject ruleXAnnotation() throws RecognitionException {
 
                             }
 
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2195:2: (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )*
+                            // InternalCheck.g:2195:2: (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )*
                             loop42:
                             do {
                                 int alt42=2;
@@ -6155,26 +6155,26 @@ public final EObject ruleXAnnotation() throws RecognitionException {
 
                                 switch (alt42) {
                             	case 1 :
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2195:4: otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) )
+                            	    // InternalCheck.g:2195:4: otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) )
                             	    {
-                            	    otherlv_5=(Token)match(input,24,FOLLOW_24_in_ruleXAnnotation4755); if (state.failed) return current;
+                            	    otherlv_5=(Token)match(input,24,FOLLOW_3); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	          	newLeafNode(otherlv_5, grammarAccess.getXAnnotationAccess().getCommaKeyword_3_1_0_1_0());
                             	          
                             	    }
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2199:1: ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) )
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2199:2: ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair )
+                            	    // InternalCheck.g:2199:1: ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) )
+                            	    // InternalCheck.g:2199:2: ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair )
                             	    {
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2205:1: (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair )
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2206:3: lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair
+                            	    // InternalCheck.g:2205:1: (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair )
+                            	    // InternalCheck.g:2206:3: lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair
                             	    {
                             	    if ( state.backtracking==0 ) {
                             	       
                             	      	        newCompositeNode(grammarAccess.getXAnnotationAccess().getElementValuePairsXAnnotationElementValuePairParserRuleCall_3_1_0_1_1_0()); 
                             	      	    
                             	    }
-                            	    pushFollow(FOLLOW_ruleXAnnotationElementValuePair_in_ruleXAnnotation4796);
+                            	    pushFollow(FOLLOW_19);
                             	    lv_elementValuePairs_6_0=ruleXAnnotationElementValuePair();
 
                             	    state._fsp--;
@@ -6188,7 +6188,7 @@ public final EObject ruleXAnnotation() throws RecognitionException {
                             	             			current, 
                             	             			"elementValuePairs",
                             	              		lv_elementValuePairs_6_0, 
-                            	              		"XAnnotationElementValuePair");
+                            	              		"org.eclipse.xtext.xbase.annotations.XbaseWithAnnotations.XAnnotationElementValuePair");
                             	      	        afterParserOrEnumRuleCall();
                             	      	    
                             	    }
@@ -6214,20 +6214,20 @@ public final EObject ruleXAnnotation() throws RecognitionException {
                             }
                             break;
                         case 2 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2223:6: ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) )
+                            // InternalCheck.g:2223:6: ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2223:6: ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2224:1: (lv_value_7_0= ruleXAnnotationElementValueOrCommaList )
+                            // InternalCheck.g:2223:6: ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) )
+                            // InternalCheck.g:2224:1: (lv_value_7_0= ruleXAnnotationElementValueOrCommaList )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2224:1: (lv_value_7_0= ruleXAnnotationElementValueOrCommaList )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2225:3: lv_value_7_0= ruleXAnnotationElementValueOrCommaList
+                            // InternalCheck.g:2224:1: (lv_value_7_0= ruleXAnnotationElementValueOrCommaList )
+                            // InternalCheck.g:2225:3: lv_value_7_0= ruleXAnnotationElementValueOrCommaList
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXAnnotationAccess().getValueXAnnotationElementValueOrCommaListParserRuleCall_3_1_1_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleXAnnotationElementValueOrCommaList_in_ruleXAnnotation4826);
+                            pushFollow(FOLLOW_26);
                             lv_value_7_0=ruleXAnnotationElementValueOrCommaList();
 
                             state._fsp--;
@@ -6241,7 +6241,7 @@ public final EObject ruleXAnnotation() throws RecognitionException {
                                      			current, 
                                      			"value",
                                       		lv_value_7_0, 
-                                      		"XAnnotationElementValueOrCommaList");
+                                      		"org.eclipse.xtext.xbase.annotations.XbaseWithAnnotations.XAnnotationElementValueOrCommaList");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -6257,7 +6257,7 @@ public final EObject ruleXAnnotation() throws RecognitionException {
 
                     }
 
-                    otherlv_8=(Token)match(input,25,FOLLOW_25_in_ruleXAnnotation4840); if (state.failed) return current;
+                    otherlv_8=(Token)match(input,25,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_8, grammarAccess.getXAnnotationAccess().getRightParenthesisKeyword_3_2());
@@ -6292,7 +6292,7 @@ public final EObject ruleXAnnotation() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXAnnotationElementValuePair"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2253:1: entryRuleXAnnotationElementValuePair returns [EObject current=null] : iv_ruleXAnnotationElementValuePair= ruleXAnnotationElementValuePair EOF ;
+    // InternalCheck.g:2253:1: entryRuleXAnnotationElementValuePair returns [EObject current=null] : iv_ruleXAnnotationElementValuePair= ruleXAnnotationElementValuePair EOF ;
     public final EObject entryRuleXAnnotationElementValuePair() throws RecognitionException {
         EObject current = null;
 
@@ -6300,13 +6300,13 @@ public final EObject entryRuleXAnnotationElementValuePair() throws RecognitionEx
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2254:2: (iv_ruleXAnnotationElementValuePair= ruleXAnnotationElementValuePair EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2255:2: iv_ruleXAnnotationElementValuePair= ruleXAnnotationElementValuePair EOF
+            // InternalCheck.g:2254:2: (iv_ruleXAnnotationElementValuePair= ruleXAnnotationElementValuePair EOF )
+            // InternalCheck.g:2255:2: iv_ruleXAnnotationElementValuePair= ruleXAnnotationElementValuePair EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAnnotationElementValuePairRule()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationElementValuePair_in_entryRuleXAnnotationElementValuePair4878);
+            pushFollow(FOLLOW_1);
             iv_ruleXAnnotationElementValuePair=ruleXAnnotationElementValuePair();
 
             state._fsp--;
@@ -6314,7 +6314,7 @@ public final EObject entryRuleXAnnotationElementValuePair() throws RecognitionEx
             if ( state.backtracking==0 ) {
                current =iv_ruleXAnnotationElementValuePair; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAnnotationElementValuePair4888); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -6332,7 +6332,7 @@ public final EObject entryRuleXAnnotationElementValuePair() throws RecognitionEx
 
 
     // $ANTLR start "ruleXAnnotationElementValuePair"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2262:1: ruleXAnnotationElementValuePair returns [EObject current=null] : ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) ) ) ;
+    // InternalCheck.g:2262:1: ruleXAnnotationElementValuePair returns [EObject current=null] : ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) ) ) ;
     public final EObject ruleXAnnotationElementValuePair() throws RecognitionException {
         EObject current = null;
 
@@ -6343,23 +6343,23 @@ public final EObject ruleXAnnotationElementValuePair() throws RecognitionExcepti
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2265:28: ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2266:1: ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) ) )
+            // InternalCheck.g:2265:28: ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) ) ) )
+            // InternalCheck.g:2266:1: ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2266:1: ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2266:2: ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) )
+            // InternalCheck.g:2266:1: ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) ) )
+            // InternalCheck.g:2266:2: ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2266:2: ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2266:3: ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' )
+            // InternalCheck.g:2266:2: ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) )
+            // InternalCheck.g:2266:3: ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2271:5: ( ( ( ruleValidID ) ) otherlv_1= '=' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2271:6: ( ( ruleValidID ) ) otherlv_1= '='
+            // InternalCheck.g:2271:5: ( ( ( ruleValidID ) ) otherlv_1= '=' )
+            // InternalCheck.g:2271:6: ( ( ruleValidID ) ) otherlv_1= '='
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2271:6: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2272:1: ( ruleValidID )
+            // InternalCheck.g:2271:6: ( ( ruleValidID ) )
+            // InternalCheck.g:2272:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2272:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2273:3: ruleValidID
+            // InternalCheck.g:2272:1: ( ruleValidID )
+            // InternalCheck.g:2273:3: ruleValidID
             {
             if ( state.backtracking==0 ) {
 
@@ -6373,7 +6373,7 @@ public final EObject ruleXAnnotationElementValuePair() throws RecognitionExcepti
               	        newCompositeNode(grammarAccess.getXAnnotationElementValuePairAccess().getElementJvmOperationCrossReference_0_0_0_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleValidID_in_ruleXAnnotationElementValuePair4958);
+            pushFollow(FOLLOW_32);
             ruleValidID();
 
             state._fsp--;
@@ -6389,7 +6389,7 @@ public final EObject ruleXAnnotationElementValuePair() throws RecognitionExcepti
 
             }
 
-            otherlv_1=(Token)match(input,31,FOLLOW_31_in_ruleXAnnotationElementValuePair4970); if (state.failed) return current;
+            otherlv_1=(Token)match(input,31,FOLLOW_52); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXAnnotationElementValuePairAccess().getEqualsSignKeyword_0_0_1());
@@ -6401,18 +6401,18 @@ public final EObject ruleXAnnotationElementValuePair() throws RecognitionExcepti
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2290:3: ( (lv_value_2_0= ruleXAnnotationElementValue ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2291:1: (lv_value_2_0= ruleXAnnotationElementValue )
+            // InternalCheck.g:2290:3: ( (lv_value_2_0= ruleXAnnotationElementValue ) )
+            // InternalCheck.g:2291:1: (lv_value_2_0= ruleXAnnotationElementValue )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2291:1: (lv_value_2_0= ruleXAnnotationElementValue )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2292:3: lv_value_2_0= ruleXAnnotationElementValue
+            // InternalCheck.g:2291:1: (lv_value_2_0= ruleXAnnotationElementValue )
+            // InternalCheck.g:2292:3: lv_value_2_0= ruleXAnnotationElementValue
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXAnnotationElementValuePairAccess().getValueXAnnotationElementValueParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXAnnotationElementValue_in_ruleXAnnotationElementValuePair4993);
+            pushFollow(FOLLOW_2);
             lv_value_2_0=ruleXAnnotationElementValue();
 
             state._fsp--;
@@ -6426,7 +6426,7 @@ public final EObject ruleXAnnotationElementValuePair() throws RecognitionExcepti
                      			current, 
                      			"value",
                       		lv_value_2_0, 
-                      		"XAnnotationElementValue");
+                      		"org.eclipse.xtext.xbase.annotations.XbaseWithAnnotations.XAnnotationElementValue");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -6459,7 +6459,7 @@ public final EObject ruleXAnnotationElementValuePair() throws RecognitionExcepti
 
 
     // $ANTLR start "entryRuleXAnnotationElementValueOrCommaList"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2316:1: entryRuleXAnnotationElementValueOrCommaList returns [EObject current=null] : iv_ruleXAnnotationElementValueOrCommaList= ruleXAnnotationElementValueOrCommaList EOF ;
+    // InternalCheck.g:2316:1: entryRuleXAnnotationElementValueOrCommaList returns [EObject current=null] : iv_ruleXAnnotationElementValueOrCommaList= ruleXAnnotationElementValueOrCommaList EOF ;
     public final EObject entryRuleXAnnotationElementValueOrCommaList() throws RecognitionException {
         EObject current = null;
 
@@ -6467,13 +6467,13 @@ public final EObject entryRuleXAnnotationElementValueOrCommaList() throws Recogn
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2317:2: (iv_ruleXAnnotationElementValueOrCommaList= ruleXAnnotationElementValueOrCommaList EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2318:2: iv_ruleXAnnotationElementValueOrCommaList= ruleXAnnotationElementValueOrCommaList EOF
+            // InternalCheck.g:2317:2: (iv_ruleXAnnotationElementValueOrCommaList= ruleXAnnotationElementValueOrCommaList EOF )
+            // InternalCheck.g:2318:2: iv_ruleXAnnotationElementValueOrCommaList= ruleXAnnotationElementValueOrCommaList EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAnnotationElementValueOrCommaListRule()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationElementValueOrCommaList_in_entryRuleXAnnotationElementValueOrCommaList5029);
+            pushFollow(FOLLOW_1);
             iv_ruleXAnnotationElementValueOrCommaList=ruleXAnnotationElementValueOrCommaList();
 
             state._fsp--;
@@ -6481,7 +6481,7 @@ public final EObject entryRuleXAnnotationElementValueOrCommaList() throws Recogn
             if ( state.backtracking==0 ) {
                current =iv_ruleXAnnotationElementValueOrCommaList; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAnnotationElementValueOrCommaList5039); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -6499,7 +6499,7 @@ public final EObject entryRuleXAnnotationElementValueOrCommaList() throws Recogn
 
 
     // $ANTLR start "ruleXAnnotationElementValueOrCommaList"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2325:1: ruleXAnnotationElementValueOrCommaList returns [EObject current=null] : ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? ) ) ;
+    // InternalCheck.g:2325:1: ruleXAnnotationElementValueOrCommaList returns [EObject current=null] : ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? ) ) ;
     public final EObject ruleXAnnotationElementValueOrCommaList() throws RecognitionException {
         EObject current = null;
 
@@ -6520,27 +6520,27 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2328:28: ( ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2329:1: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? ) )
+            // InternalCheck.g:2328:28: ( ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? ) ) )
+            // InternalCheck.g:2329:1: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2329:1: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? ) )
+            // InternalCheck.g:2329:1: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? ) )
             int alt49=2;
             alt49 = dfa49.predict(input);
             switch (alt49) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2329:2: ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' )
+                    // InternalCheck.g:2329:2: ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2329:2: ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2329:3: ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']'
+                    // InternalCheck.g:2329:2: ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' )
+                    // InternalCheck.g:2329:3: ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']'
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2329:3: ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2329:4: ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' )
+                    // InternalCheck.g:2329:3: ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) )
+                    // InternalCheck.g:2329:4: ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2332:5: ( () otherlv_1= '#' otherlv_2= '[' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2332:6: () otherlv_1= '#' otherlv_2= '['
+                    // InternalCheck.g:2332:5: ( () otherlv_1= '#' otherlv_2= '[' )
+                    // InternalCheck.g:2332:6: () otherlv_1= '#' otherlv_2= '['
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2332:6: ()
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2333:5: 
+                    // InternalCheck.g:2332:6: ()
+                    // InternalCheck.g:2333:5: 
                     {
                     if ( state.backtracking==0 ) {
 
@@ -6552,13 +6552,13 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
 
                     }
 
-                    otherlv_1=(Token)match(input,32,FOLLOW_32_in_ruleXAnnotationElementValueOrCommaList5104); if (state.failed) return current;
+                    otherlv_1=(Token)match(input,32,FOLLOW_36); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_1, grammarAccess.getXAnnotationElementValueOrCommaListAccess().getNumberSignKeyword_0_0_0_1());
                           
                     }
-                    otherlv_2=(Token)match(input,33,FOLLOW_33_in_ruleXAnnotationElementValueOrCommaList5116); if (state.failed) return current;
+                    otherlv_2=(Token)match(input,33,FOLLOW_53); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_2, grammarAccess.getXAnnotationElementValueOrCommaListAccess().getLeftSquareBracketKeyword_0_0_0_2());
@@ -6570,7 +6570,7 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2346:3: ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )?
+                    // InternalCheck.g:2346:3: ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )?
                     int alt46=2;
                     int LA46_0 = input.LA(1);
 
@@ -6579,20 +6579,20 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
                     }
                     switch (alt46) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2346:4: ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )*
+                            // InternalCheck.g:2346:4: ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )*
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2346:4: ( (lv_elements_3_0= ruleXAnnotationOrExpression ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2347:1: (lv_elements_3_0= ruleXAnnotationOrExpression )
+                            // InternalCheck.g:2346:4: ( (lv_elements_3_0= ruleXAnnotationOrExpression ) )
+                            // InternalCheck.g:2347:1: (lv_elements_3_0= ruleXAnnotationOrExpression )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2347:1: (lv_elements_3_0= ruleXAnnotationOrExpression )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2348:3: lv_elements_3_0= ruleXAnnotationOrExpression
+                            // InternalCheck.g:2347:1: (lv_elements_3_0= ruleXAnnotationOrExpression )
+                            // InternalCheck.g:2348:3: lv_elements_3_0= ruleXAnnotationOrExpression
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsXAnnotationOrExpressionParserRuleCall_0_1_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValueOrCommaList5140);
+                            pushFollow(FOLLOW_38);
                             lv_elements_3_0=ruleXAnnotationOrExpression();
 
                             state._fsp--;
@@ -6606,7 +6606,7 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
                                      			current, 
                                      			"elements",
                                       		lv_elements_3_0, 
-                                      		"XAnnotationOrExpression");
+                                      		"org.eclipse.xtext.xbase.annotations.XbaseWithAnnotations.XAnnotationOrExpression");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -6616,7 +6616,7 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
 
                             }
 
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2364:2: (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )*
+                            // InternalCheck.g:2364:2: (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )*
                             loop45:
                             do {
                                 int alt45=2;
@@ -6629,26 +6629,26 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
 
                                 switch (alt45) {
                             	case 1 :
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2364:4: otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) )
+                            	    // InternalCheck.g:2364:4: otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) )
                             	    {
-                            	    otherlv_4=(Token)match(input,24,FOLLOW_24_in_ruleXAnnotationElementValueOrCommaList5153); if (state.failed) return current;
+                            	    otherlv_4=(Token)match(input,24,FOLLOW_52); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	          	newLeafNode(otherlv_4, grammarAccess.getXAnnotationElementValueOrCommaListAccess().getCommaKeyword_0_1_1_0());
                             	          
                             	    }
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2368:1: ( (lv_elements_5_0= ruleXAnnotationOrExpression ) )
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2369:1: (lv_elements_5_0= ruleXAnnotationOrExpression )
+                            	    // InternalCheck.g:2368:1: ( (lv_elements_5_0= ruleXAnnotationOrExpression ) )
+                            	    // InternalCheck.g:2369:1: (lv_elements_5_0= ruleXAnnotationOrExpression )
                             	    {
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2369:1: (lv_elements_5_0= ruleXAnnotationOrExpression )
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2370:3: lv_elements_5_0= ruleXAnnotationOrExpression
+                            	    // InternalCheck.g:2369:1: (lv_elements_5_0= ruleXAnnotationOrExpression )
+                            	    // InternalCheck.g:2370:3: lv_elements_5_0= ruleXAnnotationOrExpression
                             	    {
                             	    if ( state.backtracking==0 ) {
                             	       
                             	      	        newCompositeNode(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsXAnnotationOrExpressionParserRuleCall_0_1_1_1_0()); 
                             	      	    
                             	    }
-                            	    pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValueOrCommaList5174);
+                            	    pushFollow(FOLLOW_38);
                             	    lv_elements_5_0=ruleXAnnotationOrExpression();
 
                             	    state._fsp--;
@@ -6662,7 +6662,7 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
                             	             			current, 
                             	             			"elements",
                             	              		lv_elements_5_0, 
-                            	              		"XAnnotationOrExpression");
+                            	              		"org.eclipse.xtext.xbase.annotations.XbaseWithAnnotations.XAnnotationOrExpression");
                             	      	        afterParserOrEnumRuleCall();
                             	      	    
                             	    }
@@ -6687,7 +6687,7 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
 
                     }
 
-                    otherlv_6=(Token)match(input,34,FOLLOW_34_in_ruleXAnnotationElementValueOrCommaList5190); if (state.failed) return current;
+                    otherlv_6=(Token)match(input,34,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_6, grammarAccess.getXAnnotationElementValueOrCommaListAccess().getRightSquareBracketKeyword_0_2());
@@ -6700,17 +6700,17 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2391:6: (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? )
+                    // InternalCheck.g:2391:6: (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2391:6: (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2392:5: this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )?
+                    // InternalCheck.g:2391:6: (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? )
+                    // InternalCheck.g:2392:5: this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )?
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getXAnnotationOrExpressionParserRuleCall_1_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValueOrCommaList5220);
+                    pushFollow(FOLLOW_54);
                     this_XAnnotationOrExpression_7=ruleXAnnotationOrExpression();
 
                     state._fsp--;
@@ -6721,7 +6721,7 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
                               afterParserOrEnumRuleCall();
                           
                     }
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2400:1: ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )?
+                    // InternalCheck.g:2400:1: ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )?
                     int alt48=2;
                     int LA48_0 = input.LA(1);
 
@@ -6730,10 +6730,10 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
                     }
                     switch (alt48) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2400:2: () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+
+                            // InternalCheck.g:2400:2: () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2400:2: ()
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2401:5: 
+                            // InternalCheck.g:2400:2: ()
+                            // InternalCheck.g:2401:5: 
                             {
                             if ( state.backtracking==0 ) {
 
@@ -6745,7 +6745,7 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
 
                             }
 
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2406:2: (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+
+                            // InternalCheck.g:2406:2: (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+
                             int cnt47=0;
                             loop47:
                             do {
@@ -6759,26 +6759,26 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
 
                                 switch (alt47) {
                             	case 1 :
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2406:4: otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) )
+                            	    // InternalCheck.g:2406:4: otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) )
                             	    {
-                            	    otherlv_9=(Token)match(input,24,FOLLOW_24_in_ruleXAnnotationElementValueOrCommaList5242); if (state.failed) return current;
+                            	    otherlv_9=(Token)match(input,24,FOLLOW_52); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	          	newLeafNode(otherlv_9, grammarAccess.getXAnnotationElementValueOrCommaListAccess().getCommaKeyword_1_1_1_0());
                             	          
                             	    }
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2410:1: ( (lv_elements_10_0= ruleXAnnotationOrExpression ) )
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2411:1: (lv_elements_10_0= ruleXAnnotationOrExpression )
+                            	    // InternalCheck.g:2410:1: ( (lv_elements_10_0= ruleXAnnotationOrExpression ) )
+                            	    // InternalCheck.g:2411:1: (lv_elements_10_0= ruleXAnnotationOrExpression )
                             	    {
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2411:1: (lv_elements_10_0= ruleXAnnotationOrExpression )
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2412:3: lv_elements_10_0= ruleXAnnotationOrExpression
+                            	    // InternalCheck.g:2411:1: (lv_elements_10_0= ruleXAnnotationOrExpression )
+                            	    // InternalCheck.g:2412:3: lv_elements_10_0= ruleXAnnotationOrExpression
                             	    {
                             	    if ( state.backtracking==0 ) {
                             	       
                             	      	        newCompositeNode(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsXAnnotationOrExpressionParserRuleCall_1_1_1_1_0()); 
                             	      	    
                             	    }
-                            	    pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValueOrCommaList5263);
+                            	    pushFollow(FOLLOW_54);
                             	    lv_elements_10_0=ruleXAnnotationOrExpression();
 
                             	    state._fsp--;
@@ -6792,7 +6792,7 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
                             	             			current, 
                             	             			"elements",
                             	              		lv_elements_10_0, 
-                            	              		"XAnnotationOrExpression");
+                            	              		"org.eclipse.xtext.xbase.annotations.XbaseWithAnnotations.XAnnotationOrExpression");
                             	      	        afterParserOrEnumRuleCall();
                             	      	    
                             	    }
@@ -6851,7 +6851,7 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
 
 
     // $ANTLR start "entryRuleXAnnotationElementValue"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2436:1: entryRuleXAnnotationElementValue returns [EObject current=null] : iv_ruleXAnnotationElementValue= ruleXAnnotationElementValue EOF ;
+    // InternalCheck.g:2436:1: entryRuleXAnnotationElementValue returns [EObject current=null] : iv_ruleXAnnotationElementValue= ruleXAnnotationElementValue EOF ;
     public final EObject entryRuleXAnnotationElementValue() throws RecognitionException {
         EObject current = null;
 
@@ -6859,13 +6859,13 @@ public final EObject entryRuleXAnnotationElementValue() throws RecognitionExcept
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2437:2: (iv_ruleXAnnotationElementValue= ruleXAnnotationElementValue EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2438:2: iv_ruleXAnnotationElementValue= ruleXAnnotationElementValue EOF
+            // InternalCheck.g:2437:2: (iv_ruleXAnnotationElementValue= ruleXAnnotationElementValue EOF )
+            // InternalCheck.g:2438:2: iv_ruleXAnnotationElementValue= ruleXAnnotationElementValue EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAnnotationElementValueRule()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationElementValue_in_entryRuleXAnnotationElementValue5304);
+            pushFollow(FOLLOW_1);
             iv_ruleXAnnotationElementValue=ruleXAnnotationElementValue();
 
             state._fsp--;
@@ -6873,7 +6873,7 @@ public final EObject entryRuleXAnnotationElementValue() throws RecognitionExcept
             if ( state.backtracking==0 ) {
                current =iv_ruleXAnnotationElementValue; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAnnotationElementValue5314); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -6891,7 +6891,7 @@ public final EObject entryRuleXAnnotationElementValue() throws RecognitionExcept
 
 
     // $ANTLR start "ruleXAnnotationElementValue"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2445:1: ruleXAnnotationElementValue returns [EObject current=null] : ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ) ;
+    // InternalCheck.g:2445:1: ruleXAnnotationElementValue returns [EObject current=null] : ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ) ;
     public final EObject ruleXAnnotationElementValue() throws RecognitionException {
         EObject current = null;
 
@@ -6909,27 +6909,27 @@ public final EObject ruleXAnnotationElementValue() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2448:28: ( ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2449:1: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression )
+            // InternalCheck.g:2448:28: ( ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ) )
+            // InternalCheck.g:2449:1: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2449:1: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression )
+            // InternalCheck.g:2449:1: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression )
             int alt52=2;
             alt52 = dfa52.predict(input);
             switch (alt52) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2449:2: ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' )
+                    // InternalCheck.g:2449:2: ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2449:2: ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2449:3: ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']'
+                    // InternalCheck.g:2449:2: ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' )
+                    // InternalCheck.g:2449:3: ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']'
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2449:3: ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2449:4: ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' )
+                    // InternalCheck.g:2449:3: ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) )
+                    // InternalCheck.g:2449:4: ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2452:5: ( () otherlv_1= '#' otherlv_2= '[' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2452:6: () otherlv_1= '#' otherlv_2= '['
+                    // InternalCheck.g:2452:5: ( () otherlv_1= '#' otherlv_2= '[' )
+                    // InternalCheck.g:2452:6: () otherlv_1= '#' otherlv_2= '['
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2452:6: ()
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2453:5: 
+                    // InternalCheck.g:2452:6: ()
+                    // InternalCheck.g:2453:5: 
                     {
                     if ( state.backtracking==0 ) {
 
@@ -6941,13 +6941,13 @@ public final EObject ruleXAnnotationElementValue() throws RecognitionException {
 
                     }
 
-                    otherlv_1=(Token)match(input,32,FOLLOW_32_in_ruleXAnnotationElementValue5379); if (state.failed) return current;
+                    otherlv_1=(Token)match(input,32,FOLLOW_36); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_1, grammarAccess.getXAnnotationElementValueAccess().getNumberSignKeyword_0_0_0_1());
                           
                     }
-                    otherlv_2=(Token)match(input,33,FOLLOW_33_in_ruleXAnnotationElementValue5391); if (state.failed) return current;
+                    otherlv_2=(Token)match(input,33,FOLLOW_53); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_2, grammarAccess.getXAnnotationElementValueAccess().getLeftSquareBracketKeyword_0_0_0_2());
@@ -6959,7 +6959,7 @@ public final EObject ruleXAnnotationElementValue() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2466:3: ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )?
+                    // InternalCheck.g:2466:3: ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )?
                     int alt51=2;
                     int LA51_0 = input.LA(1);
 
@@ -6968,20 +6968,20 @@ public final EObject ruleXAnnotationElementValue() throws RecognitionException {
                     }
                     switch (alt51) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2466:4: ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )*
+                            // InternalCheck.g:2466:4: ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )*
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2466:4: ( (lv_elements_3_0= ruleXAnnotationOrExpression ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2467:1: (lv_elements_3_0= ruleXAnnotationOrExpression )
+                            // InternalCheck.g:2466:4: ( (lv_elements_3_0= ruleXAnnotationOrExpression ) )
+                            // InternalCheck.g:2467:1: (lv_elements_3_0= ruleXAnnotationOrExpression )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2467:1: (lv_elements_3_0= ruleXAnnotationOrExpression )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2468:3: lv_elements_3_0= ruleXAnnotationOrExpression
+                            // InternalCheck.g:2467:1: (lv_elements_3_0= ruleXAnnotationOrExpression )
+                            // InternalCheck.g:2468:3: lv_elements_3_0= ruleXAnnotationOrExpression
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXAnnotationElementValueAccess().getElementsXAnnotationOrExpressionParserRuleCall_0_1_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValue5415);
+                            pushFollow(FOLLOW_38);
                             lv_elements_3_0=ruleXAnnotationOrExpression();
 
                             state._fsp--;
@@ -6995,7 +6995,7 @@ public final EObject ruleXAnnotationElementValue() throws RecognitionException {
                                      			current, 
                                      			"elements",
                                       		lv_elements_3_0, 
-                                      		"XAnnotationOrExpression");
+                                      		"org.eclipse.xtext.xbase.annotations.XbaseWithAnnotations.XAnnotationOrExpression");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -7005,7 +7005,7 @@ public final EObject ruleXAnnotationElementValue() throws RecognitionException {
 
                             }
 
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2484:2: (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )*
+                            // InternalCheck.g:2484:2: (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )*
                             loop50:
                             do {
                                 int alt50=2;
@@ -7018,26 +7018,26 @@ public final EObject ruleXAnnotationElementValue() throws RecognitionException {
 
                                 switch (alt50) {
                             	case 1 :
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2484:4: otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) )
+                            	    // InternalCheck.g:2484:4: otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) )
                             	    {
-                            	    otherlv_4=(Token)match(input,24,FOLLOW_24_in_ruleXAnnotationElementValue5428); if (state.failed) return current;
+                            	    otherlv_4=(Token)match(input,24,FOLLOW_52); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	          	newLeafNode(otherlv_4, grammarAccess.getXAnnotationElementValueAccess().getCommaKeyword_0_1_1_0());
                             	          
                             	    }
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2488:1: ( (lv_elements_5_0= ruleXAnnotationOrExpression ) )
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2489:1: (lv_elements_5_0= ruleXAnnotationOrExpression )
+                            	    // InternalCheck.g:2488:1: ( (lv_elements_5_0= ruleXAnnotationOrExpression ) )
+                            	    // InternalCheck.g:2489:1: (lv_elements_5_0= ruleXAnnotationOrExpression )
                             	    {
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2489:1: (lv_elements_5_0= ruleXAnnotationOrExpression )
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2490:3: lv_elements_5_0= ruleXAnnotationOrExpression
+                            	    // InternalCheck.g:2489:1: (lv_elements_5_0= ruleXAnnotationOrExpression )
+                            	    // InternalCheck.g:2490:3: lv_elements_5_0= ruleXAnnotationOrExpression
                             	    {
                             	    if ( state.backtracking==0 ) {
                             	       
                             	      	        newCompositeNode(grammarAccess.getXAnnotationElementValueAccess().getElementsXAnnotationOrExpressionParserRuleCall_0_1_1_1_0()); 
                             	      	    
                             	    }
-                            	    pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValue5449);
+                            	    pushFollow(FOLLOW_38);
                             	    lv_elements_5_0=ruleXAnnotationOrExpression();
 
                             	    state._fsp--;
@@ -7051,7 +7051,7 @@ public final EObject ruleXAnnotationElementValue() throws RecognitionException {
                             	             			current, 
                             	             			"elements",
                             	              		lv_elements_5_0, 
-                            	              		"XAnnotationOrExpression");
+                            	              		"org.eclipse.xtext.xbase.annotations.XbaseWithAnnotations.XAnnotationOrExpression");
                             	      	        afterParserOrEnumRuleCall();
                             	      	    
                             	    }
@@ -7076,7 +7076,7 @@ public final EObject ruleXAnnotationElementValue() throws RecognitionException {
 
                     }
 
-                    otherlv_6=(Token)match(input,34,FOLLOW_34_in_ruleXAnnotationElementValue5465); if (state.failed) return current;
+                    otherlv_6=(Token)match(input,34,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_6, grammarAccess.getXAnnotationElementValueAccess().getRightSquareBracketKeyword_0_2());
@@ -7089,14 +7089,14 @@ public final EObject ruleXAnnotationElementValue() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2512:5: this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression
+                    // InternalCheck.g:2512:5: this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXAnnotationElementValueAccess().getXAnnotationOrExpressionParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValue5494);
+                    pushFollow(FOLLOW_2);
                     this_XAnnotationOrExpression_7=ruleXAnnotationOrExpression();
 
                     state._fsp--;
@@ -7133,7 +7133,7 @@ public final EObject ruleXAnnotationElementValue() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXAnnotationOrExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2528:1: entryRuleXAnnotationOrExpression returns [EObject current=null] : iv_ruleXAnnotationOrExpression= ruleXAnnotationOrExpression EOF ;
+    // InternalCheck.g:2528:1: entryRuleXAnnotationOrExpression returns [EObject current=null] : iv_ruleXAnnotationOrExpression= ruleXAnnotationOrExpression EOF ;
     public final EObject entryRuleXAnnotationOrExpression() throws RecognitionException {
         EObject current = null;
 
@@ -7141,13 +7141,13 @@ public final EObject entryRuleXAnnotationOrExpression() throws RecognitionExcept
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2529:2: (iv_ruleXAnnotationOrExpression= ruleXAnnotationOrExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2530:2: iv_ruleXAnnotationOrExpression= ruleXAnnotationOrExpression EOF
+            // InternalCheck.g:2529:2: (iv_ruleXAnnotationOrExpression= ruleXAnnotationOrExpression EOF )
+            // InternalCheck.g:2530:2: iv_ruleXAnnotationOrExpression= ruleXAnnotationOrExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAnnotationOrExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_entryRuleXAnnotationOrExpression5529);
+            pushFollow(FOLLOW_1);
             iv_ruleXAnnotationOrExpression=ruleXAnnotationOrExpression();
 
             state._fsp--;
@@ -7155,7 +7155,7 @@ public final EObject entryRuleXAnnotationOrExpression() throws RecognitionExcept
             if ( state.backtracking==0 ) {
                current =iv_ruleXAnnotationOrExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAnnotationOrExpression5539); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -7173,7 +7173,7 @@ public final EObject entryRuleXAnnotationOrExpression() throws RecognitionExcept
 
 
     // $ANTLR start "ruleXAnnotationOrExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2537:1: ruleXAnnotationOrExpression returns [EObject current=null] : (this_XAnnotation_0= ruleXAnnotation | this_XExpression_1= ruleXExpression ) ;
+    // InternalCheck.g:2537:1: ruleXAnnotationOrExpression returns [EObject current=null] : (this_XAnnotation_0= ruleXAnnotation | this_XExpression_1= ruleXExpression ) ;
     public final EObject ruleXAnnotationOrExpression() throws RecognitionException {
         EObject current = null;
 
@@ -7185,10 +7185,10 @@ public final EObject ruleXAnnotationOrExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2540:28: ( (this_XAnnotation_0= ruleXAnnotation | this_XExpression_1= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2541:1: (this_XAnnotation_0= ruleXAnnotation | this_XExpression_1= ruleXExpression )
+            // InternalCheck.g:2540:28: ( (this_XAnnotation_0= ruleXAnnotation | this_XExpression_1= ruleXExpression ) )
+            // InternalCheck.g:2541:1: (this_XAnnotation_0= ruleXAnnotation | this_XExpression_1= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2541:1: (this_XAnnotation_0= ruleXAnnotation | this_XExpression_1= ruleXExpression )
+            // InternalCheck.g:2541:1: (this_XAnnotation_0= ruleXAnnotation | this_XExpression_1= ruleXExpression )
             int alt53=2;
             int LA53_0 = input.LA(1);
 
@@ -7207,14 +7207,14 @@ else if ( ((LA53_0>=RULE_STRING && LA53_0<=RULE_ID)||(LA53_0>=15 && LA53_0<=18)|
             }
             switch (alt53) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2542:5: this_XAnnotation_0= ruleXAnnotation
+                    // InternalCheck.g:2542:5: this_XAnnotation_0= ruleXAnnotation
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXAnnotationOrExpressionAccess().getXAnnotationParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXAnnotation_in_ruleXAnnotationOrExpression5586);
+                    pushFollow(FOLLOW_2);
                     this_XAnnotation_0=ruleXAnnotation();
 
                     state._fsp--;
@@ -7229,14 +7229,14 @@ else if ( ((LA53_0>=RULE_STRING && LA53_0<=RULE_ID)||(LA53_0>=15 && LA53_0<=18)|
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2552:5: this_XExpression_1= ruleXExpression
+                    // InternalCheck.g:2552:5: this_XExpression_1= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXAnnotationOrExpressionAccess().getXExpressionParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXAnnotationOrExpression5613);
+                    pushFollow(FOLLOW_2);
                     this_XExpression_1=ruleXExpression();
 
                     state._fsp--;
@@ -7273,7 +7273,7 @@ else if ( ((LA53_0>=RULE_STRING && LA53_0<=RULE_ID)||(LA53_0>=15 && LA53_0<=18)|
 
 
     // $ANTLR start "entryRuleXExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2568:1: entryRuleXExpression returns [EObject current=null] : iv_ruleXExpression= ruleXExpression EOF ;
+    // InternalCheck.g:2568:1: entryRuleXExpression returns [EObject current=null] : iv_ruleXExpression= ruleXExpression EOF ;
     public final EObject entryRuleXExpression() throws RecognitionException {
         EObject current = null;
 
@@ -7281,13 +7281,13 @@ public final EObject entryRuleXExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2569:2: (iv_ruleXExpression= ruleXExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2570:2: iv_ruleXExpression= ruleXExpression EOF
+            // InternalCheck.g:2569:2: (iv_ruleXExpression= ruleXExpression EOF )
+            // InternalCheck.g:2570:2: iv_ruleXExpression= ruleXExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_entryRuleXExpression5648);
+            pushFollow(FOLLOW_1);
             iv_ruleXExpression=ruleXExpression();
 
             state._fsp--;
@@ -7295,7 +7295,7 @@ public final EObject entryRuleXExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXExpression5658); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -7313,7 +7313,7 @@ public final EObject entryRuleXExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2577:1: ruleXExpression returns [EObject current=null] : this_XAssignment_0= ruleXAssignment ;
+    // InternalCheck.g:2577:1: ruleXExpression returns [EObject current=null] : this_XAssignment_0= ruleXAssignment ;
     public final EObject ruleXExpression() throws RecognitionException {
         EObject current = null;
 
@@ -7323,15 +7323,15 @@ public final EObject ruleXExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2580:28: (this_XAssignment_0= ruleXAssignment )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2582:5: this_XAssignment_0= ruleXAssignment
+            // InternalCheck.g:2580:28: (this_XAssignment_0= ruleXAssignment )
+            // InternalCheck.g:2582:5: this_XAssignment_0= ruleXAssignment
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXExpressionAccess().getXAssignmentParserRuleCall()); 
                   
             }
-            pushFollow(FOLLOW_ruleXAssignment_in_ruleXExpression5704);
+            pushFollow(FOLLOW_2);
             this_XAssignment_0=ruleXAssignment();
 
             state._fsp--;
@@ -7362,7 +7362,7 @@ public final EObject ruleXExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXAssignment"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2598:1: entryRuleXAssignment returns [EObject current=null] : iv_ruleXAssignment= ruleXAssignment EOF ;
+    // InternalCheck.g:2598:1: entryRuleXAssignment returns [EObject current=null] : iv_ruleXAssignment= ruleXAssignment EOF ;
     public final EObject entryRuleXAssignment() throws RecognitionException {
         EObject current = null;
 
@@ -7370,13 +7370,13 @@ public final EObject entryRuleXAssignment() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2599:2: (iv_ruleXAssignment= ruleXAssignment EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2600:2: iv_ruleXAssignment= ruleXAssignment EOF
+            // InternalCheck.g:2599:2: (iv_ruleXAssignment= ruleXAssignment EOF )
+            // InternalCheck.g:2600:2: iv_ruleXAssignment= ruleXAssignment EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAssignmentRule()); 
             }
-            pushFollow(FOLLOW_ruleXAssignment_in_entryRuleXAssignment5738);
+            pushFollow(FOLLOW_1);
             iv_ruleXAssignment=ruleXAssignment();
 
             state._fsp--;
@@ -7384,7 +7384,7 @@ public final EObject entryRuleXAssignment() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXAssignment; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAssignment5748); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -7402,7 +7402,7 @@ public final EObject entryRuleXAssignment() throws RecognitionException {
 
 
     // $ANTLR start "ruleXAssignment"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2607:1: ruleXAssignment returns [EObject current=null] : ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) ) ;
+    // InternalCheck.g:2607:1: ruleXAssignment returns [EObject current=null] : ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) ) ;
     public final EObject ruleXAssignment() throws RecognitionException {
         EObject current = null;
 
@@ -7416,21 +7416,21 @@ public final EObject ruleXAssignment() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2610:28: ( ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2611:1: ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) )
+            // InternalCheck.g:2610:28: ( ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) ) )
+            // InternalCheck.g:2611:1: ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2611:1: ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) )
+            // InternalCheck.g:2611:1: ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) )
             int alt55=2;
             alt55 = dfa55.predict(input);
             switch (alt55) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2611:2: ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) )
+                    // InternalCheck.g:2611:2: ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2611:2: ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2611:3: () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) )
+                    // InternalCheck.g:2611:2: ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) )
+                    // InternalCheck.g:2611:3: () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2611:3: ()
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2612:5: 
+                    // InternalCheck.g:2611:3: ()
+                    // InternalCheck.g:2612:5: 
                     {
                     if ( state.backtracking==0 ) {
 
@@ -7442,11 +7442,11 @@ public final EObject ruleXAssignment() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2617:2: ( ( ruleFeatureCallID ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2618:1: ( ruleFeatureCallID )
+                    // InternalCheck.g:2617:2: ( ( ruleFeatureCallID ) )
+                    // InternalCheck.g:2618:1: ( ruleFeatureCallID )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2618:1: ( ruleFeatureCallID )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2619:3: ruleFeatureCallID
+                    // InternalCheck.g:2618:1: ( ruleFeatureCallID )
+                    // InternalCheck.g:2619:3: ruleFeatureCallID
                     {
                     if ( state.backtracking==0 ) {
 
@@ -7460,7 +7460,7 @@ public final EObject ruleXAssignment() throws RecognitionException {
                       	        newCompositeNode(grammarAccess.getXAssignmentAccess().getFeatureJvmIdentifiableElementCrossReference_0_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleFeatureCallID_in_ruleXAssignment5806);
+                    pushFollow(FOLLOW_32);
                     ruleFeatureCallID();
 
                     state._fsp--;
@@ -7481,7 +7481,7 @@ public final EObject ruleXAssignment() throws RecognitionException {
                               newCompositeNode(grammarAccess.getXAssignmentAccess().getOpSingleAssignParserRuleCall_0_2()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleOpSingleAssign_in_ruleXAssignment5822);
+                    pushFollow(FOLLOW_29);
                     ruleOpSingleAssign();
 
                     state._fsp--;
@@ -7491,18 +7491,18 @@ public final EObject ruleXAssignment() throws RecognitionException {
                               afterParserOrEnumRuleCall();
                           
                     }
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2640:1: ( (lv_value_3_0= ruleXAssignment ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2641:1: (lv_value_3_0= ruleXAssignment )
+                    // InternalCheck.g:2640:1: ( (lv_value_3_0= ruleXAssignment ) )
+                    // InternalCheck.g:2641:1: (lv_value_3_0= ruleXAssignment )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2641:1: (lv_value_3_0= ruleXAssignment )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2642:3: lv_value_3_0= ruleXAssignment
+                    // InternalCheck.g:2641:1: (lv_value_3_0= ruleXAssignment )
+                    // InternalCheck.g:2642:3: lv_value_3_0= ruleXAssignment
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXAssignmentAccess().getValueXAssignmentParserRuleCall_0_3_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXAssignment_in_ruleXAssignment5842);
+                    pushFollow(FOLLOW_2);
                     lv_value_3_0=ruleXAssignment();
 
                     state._fsp--;
@@ -7516,7 +7516,7 @@ public final EObject ruleXAssignment() throws RecognitionException {
                              			current, 
                              			"value",
                               		lv_value_3_0, 
-                              		"XAssignment");
+                              		"org.eclipse.xtext.xbase.Xbase.XAssignment");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -7533,17 +7533,17 @@ public final EObject ruleXAssignment() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2659:6: (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? )
+                    // InternalCheck.g:2659:6: (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2659:6: (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2660:5: this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )?
+                    // InternalCheck.g:2659:6: (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? )
+                    // InternalCheck.g:2660:5: this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )?
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXAssignmentAccess().getXOrExpressionParserRuleCall_1_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXOrExpression_in_ruleXAssignment5872);
+                    pushFollow(FOLLOW_55);
                     this_XOrExpression_4=ruleXOrExpression();
 
                     state._fsp--;
@@ -7554,21 +7554,21 @@ public final EObject ruleXAssignment() throws RecognitionException {
                               afterParserOrEnumRuleCall();
                           
                     }
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2668:1: ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )?
+                    // InternalCheck.g:2668:1: ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )?
                     int alt54=2;
                     alt54 = dfa54.predict(input);
                     switch (alt54) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2668:2: ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) )
+                            // InternalCheck.g:2668:2: ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2668:2: ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2668:3: ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) )
+                            // InternalCheck.g:2668:2: ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) )
+                            // InternalCheck.g:2668:3: ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2673:6: ( () ( ( ruleOpMultiAssign ) ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2673:7: () ( ( ruleOpMultiAssign ) )
+                            // InternalCheck.g:2673:6: ( () ( ( ruleOpMultiAssign ) ) )
+                            // InternalCheck.g:2673:7: () ( ( ruleOpMultiAssign ) )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2673:7: ()
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2674:5: 
+                            // InternalCheck.g:2673:7: ()
+                            // InternalCheck.g:2674:5: 
                             {
                             if ( state.backtracking==0 ) {
 
@@ -7580,11 +7580,11 @@ public final EObject ruleXAssignment() throws RecognitionException {
 
                             }
 
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2679:2: ( ( ruleOpMultiAssign ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2680:1: ( ruleOpMultiAssign )
+                            // InternalCheck.g:2679:2: ( ( ruleOpMultiAssign ) )
+                            // InternalCheck.g:2680:1: ( ruleOpMultiAssign )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2680:1: ( ruleOpMultiAssign )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2681:3: ruleOpMultiAssign
+                            // InternalCheck.g:2680:1: ( ruleOpMultiAssign )
+                            // InternalCheck.g:2681:3: ruleOpMultiAssign
                             {
                             if ( state.backtracking==0 ) {
 
@@ -7598,7 +7598,7 @@ public final EObject ruleXAssignment() throws RecognitionException {
                               	        newCompositeNode(grammarAccess.getXAssignmentAccess().getFeatureJvmIdentifiableElementCrossReference_1_1_0_0_1_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleOpMultiAssign_in_ruleXAssignment5925);
+                            pushFollow(FOLLOW_29);
                             ruleOpMultiAssign();
 
                             state._fsp--;
@@ -7620,18 +7620,18 @@ public final EObject ruleXAssignment() throws RecognitionException {
 
                             }
 
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2694:4: ( (lv_rightOperand_7_0= ruleXAssignment ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2695:1: (lv_rightOperand_7_0= ruleXAssignment )
+                            // InternalCheck.g:2694:4: ( (lv_rightOperand_7_0= ruleXAssignment ) )
+                            // InternalCheck.g:2695:1: (lv_rightOperand_7_0= ruleXAssignment )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2695:1: (lv_rightOperand_7_0= ruleXAssignment )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2696:3: lv_rightOperand_7_0= ruleXAssignment
+                            // InternalCheck.g:2695:1: (lv_rightOperand_7_0= ruleXAssignment )
+                            // InternalCheck.g:2696:3: lv_rightOperand_7_0= ruleXAssignment
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXAssignmentAccess().getRightOperandXAssignmentParserRuleCall_1_1_1_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleXAssignment_in_ruleXAssignment5948);
+                            pushFollow(FOLLOW_2);
                             lv_rightOperand_7_0=ruleXAssignment();
 
                             state._fsp--;
@@ -7645,7 +7645,7 @@ public final EObject ruleXAssignment() throws RecognitionException {
                                      			current, 
                                      			"rightOperand",
                                       		lv_rightOperand_7_0, 
-                                      		"XAssignment");
+                                      		"org.eclipse.xtext.xbase.Xbase.XAssignment");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -7690,7 +7690,7 @@ public final EObject ruleXAssignment() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpSingleAssign"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2720:1: entryRuleOpSingleAssign returns [String current=null] : iv_ruleOpSingleAssign= ruleOpSingleAssign EOF ;
+    // InternalCheck.g:2720:1: entryRuleOpSingleAssign returns [String current=null] : iv_ruleOpSingleAssign= ruleOpSingleAssign EOF ;
     public final String entryRuleOpSingleAssign() throws RecognitionException {
         String current = null;
 
@@ -7698,13 +7698,13 @@ public final String entryRuleOpSingleAssign() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2721:2: (iv_ruleOpSingleAssign= ruleOpSingleAssign EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2722:2: iv_ruleOpSingleAssign= ruleOpSingleAssign EOF
+            // InternalCheck.g:2721:2: (iv_ruleOpSingleAssign= ruleOpSingleAssign EOF )
+            // InternalCheck.g:2722:2: iv_ruleOpSingleAssign= ruleOpSingleAssign EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpSingleAssignRule()); 
             }
-            pushFollow(FOLLOW_ruleOpSingleAssign_in_entryRuleOpSingleAssign5988);
+            pushFollow(FOLLOW_1);
             iv_ruleOpSingleAssign=ruleOpSingleAssign();
 
             state._fsp--;
@@ -7712,7 +7712,7 @@ public final String entryRuleOpSingleAssign() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpSingleAssign.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpSingleAssign5999); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -7730,7 +7730,7 @@ public final String entryRuleOpSingleAssign() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpSingleAssign"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2729:1: ruleOpSingleAssign returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : kw= '=' ;
+    // InternalCheck.g:2729:1: ruleOpSingleAssign returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : kw= '=' ;
     public final AntlrDatatypeRuleToken ruleOpSingleAssign() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -7739,10 +7739,10 @@ public final AntlrDatatypeRuleToken ruleOpSingleAssign() throws RecognitionExcep
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2732:28: (kw= '=' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2734:2: kw= '='
+            // InternalCheck.g:2732:28: (kw= '=' )
+            // InternalCheck.g:2734:2: kw= '='
             {
-            kw=(Token)match(input,31,FOLLOW_31_in_ruleOpSingleAssign6036); if (state.failed) return current;
+            kw=(Token)match(input,31,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                       current.merge(kw);
@@ -7769,7 +7769,7 @@ public final AntlrDatatypeRuleToken ruleOpSingleAssign() throws RecognitionExcep
 
 
     // $ANTLR start "entryRuleOpMultiAssign"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2747:1: entryRuleOpMultiAssign returns [String current=null] : iv_ruleOpMultiAssign= ruleOpMultiAssign EOF ;
+    // InternalCheck.g:2747:1: entryRuleOpMultiAssign returns [String current=null] : iv_ruleOpMultiAssign= ruleOpMultiAssign EOF ;
     public final String entryRuleOpMultiAssign() throws RecognitionException {
         String current = null;
 
@@ -7777,13 +7777,13 @@ public final String entryRuleOpMultiAssign() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2748:2: (iv_ruleOpMultiAssign= ruleOpMultiAssign EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2749:2: iv_ruleOpMultiAssign= ruleOpMultiAssign EOF
+            // InternalCheck.g:2748:2: (iv_ruleOpMultiAssign= ruleOpMultiAssign EOF )
+            // InternalCheck.g:2749:2: iv_ruleOpMultiAssign= ruleOpMultiAssign EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpMultiAssignRule()); 
             }
-            pushFollow(FOLLOW_ruleOpMultiAssign_in_entryRuleOpMultiAssign6076);
+            pushFollow(FOLLOW_1);
             iv_ruleOpMultiAssign=ruleOpMultiAssign();
 
             state._fsp--;
@@ -7791,7 +7791,7 @@ public final String entryRuleOpMultiAssign() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpMultiAssign.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpMultiAssign6087); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -7809,7 +7809,7 @@ public final String entryRuleOpMultiAssign() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpMultiAssign"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2756:1: ruleOpMultiAssign returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) ) ;
+    // InternalCheck.g:2756:1: ruleOpMultiAssign returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) ) ;
     public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -7818,10 +7818,10 @@ public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionExcept
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2759:28: ( (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2760:1: (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) )
+            // InternalCheck.g:2759:28: ( (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) ) )
+            // InternalCheck.g:2760:1: (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2760:1: (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) )
+            // InternalCheck.g:2760:1: (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) )
             int alt57=7;
             switch ( input.LA(1) ) {
             case 51:
@@ -7869,9 +7869,9 @@ public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionExcept
 
             switch (alt57) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2761:2: kw= '+='
+                    // InternalCheck.g:2761:2: kw= '+='
                     {
-                    kw=(Token)match(input,51,FOLLOW_51_in_ruleOpMultiAssign6125); if (state.failed) return current;
+                    kw=(Token)match(input,51,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -7882,9 +7882,9 @@ public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionExcept
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2768:2: kw= '-='
+                    // InternalCheck.g:2768:2: kw= '-='
                     {
-                    kw=(Token)match(input,52,FOLLOW_52_in_ruleOpMultiAssign6144); if (state.failed) return current;
+                    kw=(Token)match(input,52,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -7895,9 +7895,9 @@ public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionExcept
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2775:2: kw= '*='
+                    // InternalCheck.g:2775:2: kw= '*='
                     {
-                    kw=(Token)match(input,53,FOLLOW_53_in_ruleOpMultiAssign6163); if (state.failed) return current;
+                    kw=(Token)match(input,53,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -7908,9 +7908,9 @@ public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionExcept
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2782:2: kw= '/='
+                    // InternalCheck.g:2782:2: kw= '/='
                     {
-                    kw=(Token)match(input,54,FOLLOW_54_in_ruleOpMultiAssign6182); if (state.failed) return current;
+                    kw=(Token)match(input,54,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -7921,9 +7921,9 @@ public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionExcept
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2789:2: kw= '%='
+                    // InternalCheck.g:2789:2: kw= '%='
                     {
-                    kw=(Token)match(input,55,FOLLOW_55_in_ruleOpMultiAssign6201); if (state.failed) return current;
+                    kw=(Token)match(input,55,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -7934,26 +7934,26 @@ public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionExcept
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2795:6: (kw= '<' kw= '<' kw= '=' )
+                    // InternalCheck.g:2795:6: (kw= '<' kw= '<' kw= '=' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2795:6: (kw= '<' kw= '<' kw= '=' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2796:2: kw= '<' kw= '<' kw= '='
+                    // InternalCheck.g:2795:6: (kw= '<' kw= '<' kw= '=' )
+                    // InternalCheck.g:2796:2: kw= '<' kw= '<' kw= '='
                     {
-                    kw=(Token)match(input,56,FOLLOW_56_in_ruleOpMultiAssign6221); if (state.failed) return current;
+                    kw=(Token)match(input,56,FOLLOW_56); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
                               newLeafNode(kw, grammarAccess.getOpMultiAssignAccess().getLessThanSignKeyword_5_0()); 
                           
                     }
-                    kw=(Token)match(input,56,FOLLOW_56_in_ruleOpMultiAssign6234); if (state.failed) return current;
+                    kw=(Token)match(input,56,FOLLOW_32); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
                               newLeafNode(kw, grammarAccess.getOpMultiAssignAccess().getLessThanSignKeyword_5_1()); 
                           
                     }
-                    kw=(Token)match(input,31,FOLLOW_31_in_ruleOpMultiAssign6247); if (state.failed) return current;
+                    kw=(Token)match(input,31,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -7967,19 +7967,19 @@ public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionExcept
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2814:6: (kw= '>' (kw= '>' )? kw= '>=' )
+                    // InternalCheck.g:2814:6: (kw= '>' (kw= '>' )? kw= '>=' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2814:6: (kw= '>' (kw= '>' )? kw= '>=' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2815:2: kw= '>' (kw= '>' )? kw= '>='
+                    // InternalCheck.g:2814:6: (kw= '>' (kw= '>' )? kw= '>=' )
+                    // InternalCheck.g:2815:2: kw= '>' (kw= '>' )? kw= '>='
                     {
-                    kw=(Token)match(input,57,FOLLOW_57_in_ruleOpMultiAssign6268); if (state.failed) return current;
+                    kw=(Token)match(input,57,FOLLOW_57); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
                               newLeafNode(kw, grammarAccess.getOpMultiAssignAccess().getGreaterThanSignKeyword_6_0()); 
                           
                     }
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2820:1: (kw= '>' )?
+                    // InternalCheck.g:2820:1: (kw= '>' )?
                     int alt56=2;
                     int LA56_0 = input.LA(1);
 
@@ -7988,9 +7988,9 @@ public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionExcept
                     }
                     switch (alt56) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2821:2: kw= '>'
+                            // InternalCheck.g:2821:2: kw= '>'
                             {
-                            kw=(Token)match(input,57,FOLLOW_57_in_ruleOpMultiAssign6282); if (state.failed) return current;
+                            kw=(Token)match(input,57,FOLLOW_58); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       current.merge(kw);
@@ -8003,7 +8003,7 @@ public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionExcept
 
                     }
 
-                    kw=(Token)match(input,58,FOLLOW_58_in_ruleOpMultiAssign6297); if (state.failed) return current;
+                    kw=(Token)match(input,58,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -8039,7 +8039,7 @@ public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionExcept
 
 
     // $ANTLR start "entryRuleXOrExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2840:1: entryRuleXOrExpression returns [EObject current=null] : iv_ruleXOrExpression= ruleXOrExpression EOF ;
+    // InternalCheck.g:2840:1: entryRuleXOrExpression returns [EObject current=null] : iv_ruleXOrExpression= ruleXOrExpression EOF ;
     public final EObject entryRuleXOrExpression() throws RecognitionException {
         EObject current = null;
 
@@ -8047,13 +8047,13 @@ public final EObject entryRuleXOrExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2841:2: (iv_ruleXOrExpression= ruleXOrExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2842:2: iv_ruleXOrExpression= ruleXOrExpression EOF
+            // InternalCheck.g:2841:2: (iv_ruleXOrExpression= ruleXOrExpression EOF )
+            // InternalCheck.g:2842:2: iv_ruleXOrExpression= ruleXOrExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXOrExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXOrExpression_in_entryRuleXOrExpression6338);
+            pushFollow(FOLLOW_1);
             iv_ruleXOrExpression=ruleXOrExpression();
 
             state._fsp--;
@@ -8061,7 +8061,7 @@ public final EObject entryRuleXOrExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXOrExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXOrExpression6348); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -8079,7 +8079,7 @@ public final EObject entryRuleXOrExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXOrExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2849:1: ruleXOrExpression returns [EObject current=null] : (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* ) ;
+    // InternalCheck.g:2849:1: ruleXOrExpression returns [EObject current=null] : (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* ) ;
     public final EObject ruleXOrExpression() throws RecognitionException {
         EObject current = null;
 
@@ -8091,18 +8091,18 @@ public final EObject ruleXOrExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2852:28: ( (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2853:1: (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* )
+            // InternalCheck.g:2852:28: ( (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* ) )
+            // InternalCheck.g:2853:1: (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2853:1: (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2854:5: this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )*
+            // InternalCheck.g:2853:1: (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* )
+            // InternalCheck.g:2854:5: this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXOrExpressionAccess().getXAndExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleXAndExpression_in_ruleXOrExpression6395);
+            pushFollow(FOLLOW_59);
             this_XAndExpression_0=ruleXAndExpression();
 
             state._fsp--;
@@ -8113,7 +8113,7 @@ public final EObject ruleXOrExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2862:1: ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )*
+            // InternalCheck.g:2862:1: ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )*
             loop58:
             do {
                 int alt58=2;
@@ -8132,16 +8132,16 @@ public final EObject ruleXOrExpression() throws RecognitionException {
 
                 switch (alt58) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2862:2: ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) )
+            	    // InternalCheck.g:2862:2: ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2862:2: ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2862:3: ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) )
+            	    // InternalCheck.g:2862:2: ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) )
+            	    // InternalCheck.g:2862:3: ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2867:6: ( () ( ( ruleOpOr ) ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2867:7: () ( ( ruleOpOr ) )
+            	    // InternalCheck.g:2867:6: ( () ( ( ruleOpOr ) ) )
+            	    // InternalCheck.g:2867:7: () ( ( ruleOpOr ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2867:7: ()
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2868:5: 
+            	    // InternalCheck.g:2867:7: ()
+            	    // InternalCheck.g:2868:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -8153,11 +8153,11 @@ public final EObject ruleXOrExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2873:2: ( ( ruleOpOr ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2874:1: ( ruleOpOr )
+            	    // InternalCheck.g:2873:2: ( ( ruleOpOr ) )
+            	    // InternalCheck.g:2874:1: ( ruleOpOr )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2874:1: ( ruleOpOr )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2875:3: ruleOpOr
+            	    // InternalCheck.g:2874:1: ( ruleOpOr )
+            	    // InternalCheck.g:2875:3: ruleOpOr
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -8171,7 +8171,7 @@ public final EObject ruleXOrExpression() throws RecognitionException {
             	      	        newCompositeNode(grammarAccess.getXOrExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleOpOr_in_ruleXOrExpression6448);
+            	    pushFollow(FOLLOW_29);
             	    ruleOpOr();
 
             	    state._fsp--;
@@ -8193,18 +8193,18 @@ public final EObject ruleXOrExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2888:4: ( (lv_rightOperand_3_0= ruleXAndExpression ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2889:1: (lv_rightOperand_3_0= ruleXAndExpression )
+            	    // InternalCheck.g:2888:4: ( (lv_rightOperand_3_0= ruleXAndExpression ) )
+            	    // InternalCheck.g:2889:1: (lv_rightOperand_3_0= ruleXAndExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2889:1: (lv_rightOperand_3_0= ruleXAndExpression )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2890:3: lv_rightOperand_3_0= ruleXAndExpression
+            	    // InternalCheck.g:2889:1: (lv_rightOperand_3_0= ruleXAndExpression )
+            	    // InternalCheck.g:2890:3: lv_rightOperand_3_0= ruleXAndExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXOrExpressionAccess().getRightOperandXAndExpressionParserRuleCall_1_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXAndExpression_in_ruleXOrExpression6471);
+            	    pushFollow(FOLLOW_59);
             	    lv_rightOperand_3_0=ruleXAndExpression();
 
             	    state._fsp--;
@@ -8218,7 +8218,7 @@ public final EObject ruleXOrExpression() throws RecognitionException {
             	             			current, 
             	             			"rightOperand",
             	              		lv_rightOperand_3_0, 
-            	              		"XAndExpression");
+            	              		"org.eclipse.xtext.xbase.Xbase.XAndExpression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -8260,7 +8260,7 @@ public final EObject ruleXOrExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpOr"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2914:1: entryRuleOpOr returns [String current=null] : iv_ruleOpOr= ruleOpOr EOF ;
+    // InternalCheck.g:2914:1: entryRuleOpOr returns [String current=null] : iv_ruleOpOr= ruleOpOr EOF ;
     public final String entryRuleOpOr() throws RecognitionException {
         String current = null;
 
@@ -8268,13 +8268,13 @@ public final String entryRuleOpOr() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2915:2: (iv_ruleOpOr= ruleOpOr EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2916:2: iv_ruleOpOr= ruleOpOr EOF
+            // InternalCheck.g:2915:2: (iv_ruleOpOr= ruleOpOr EOF )
+            // InternalCheck.g:2916:2: iv_ruleOpOr= ruleOpOr EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpOrRule()); 
             }
-            pushFollow(FOLLOW_ruleOpOr_in_entryRuleOpOr6510);
+            pushFollow(FOLLOW_1);
             iv_ruleOpOr=ruleOpOr();
 
             state._fsp--;
@@ -8282,7 +8282,7 @@ public final String entryRuleOpOr() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpOr.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpOr6521); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -8300,7 +8300,7 @@ public final String entryRuleOpOr() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpOr"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2923:1: ruleOpOr returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : kw= '||' ;
+    // InternalCheck.g:2923:1: ruleOpOr returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : kw= '||' ;
     public final AntlrDatatypeRuleToken ruleOpOr() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -8309,10 +8309,10 @@ public final AntlrDatatypeRuleToken ruleOpOr() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2926:28: (kw= '||' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2928:2: kw= '||'
+            // InternalCheck.g:2926:28: (kw= '||' )
+            // InternalCheck.g:2928:2: kw= '||'
             {
-            kw=(Token)match(input,59,FOLLOW_59_in_ruleOpOr6558); if (state.failed) return current;
+            kw=(Token)match(input,59,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                       current.merge(kw);
@@ -8339,7 +8339,7 @@ public final AntlrDatatypeRuleToken ruleOpOr() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXAndExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2941:1: entryRuleXAndExpression returns [EObject current=null] : iv_ruleXAndExpression= ruleXAndExpression EOF ;
+    // InternalCheck.g:2941:1: entryRuleXAndExpression returns [EObject current=null] : iv_ruleXAndExpression= ruleXAndExpression EOF ;
     public final EObject entryRuleXAndExpression() throws RecognitionException {
         EObject current = null;
 
@@ -8347,13 +8347,13 @@ public final EObject entryRuleXAndExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2942:2: (iv_ruleXAndExpression= ruleXAndExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2943:2: iv_ruleXAndExpression= ruleXAndExpression EOF
+            // InternalCheck.g:2942:2: (iv_ruleXAndExpression= ruleXAndExpression EOF )
+            // InternalCheck.g:2943:2: iv_ruleXAndExpression= ruleXAndExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAndExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXAndExpression_in_entryRuleXAndExpression6597);
+            pushFollow(FOLLOW_1);
             iv_ruleXAndExpression=ruleXAndExpression();
 
             state._fsp--;
@@ -8361,7 +8361,7 @@ public final EObject entryRuleXAndExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXAndExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAndExpression6607); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -8379,7 +8379,7 @@ public final EObject entryRuleXAndExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXAndExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2950:1: ruleXAndExpression returns [EObject current=null] : (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* ) ;
+    // InternalCheck.g:2950:1: ruleXAndExpression returns [EObject current=null] : (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* ) ;
     public final EObject ruleXAndExpression() throws RecognitionException {
         EObject current = null;
 
@@ -8391,18 +8391,18 @@ public final EObject ruleXAndExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2953:28: ( (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2954:1: (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* )
+            // InternalCheck.g:2953:28: ( (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* ) )
+            // InternalCheck.g:2954:1: (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2954:1: (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2955:5: this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )*
+            // InternalCheck.g:2954:1: (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* )
+            // InternalCheck.g:2955:5: this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXAndExpressionAccess().getXEqualityExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleXEqualityExpression_in_ruleXAndExpression6654);
+            pushFollow(FOLLOW_60);
             this_XEqualityExpression_0=ruleXEqualityExpression();
 
             state._fsp--;
@@ -8413,7 +8413,7 @@ public final EObject ruleXAndExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2963:1: ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )*
+            // InternalCheck.g:2963:1: ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )*
             loop59:
             do {
                 int alt59=2;
@@ -8432,16 +8432,16 @@ public final EObject ruleXAndExpression() throws RecognitionException {
 
                 switch (alt59) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2963:2: ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) )
+            	    // InternalCheck.g:2963:2: ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2963:2: ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2963:3: ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) )
+            	    // InternalCheck.g:2963:2: ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) )
+            	    // InternalCheck.g:2963:3: ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2968:6: ( () ( ( ruleOpAnd ) ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2968:7: () ( ( ruleOpAnd ) )
+            	    // InternalCheck.g:2968:6: ( () ( ( ruleOpAnd ) ) )
+            	    // InternalCheck.g:2968:7: () ( ( ruleOpAnd ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2968:7: ()
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2969:5: 
+            	    // InternalCheck.g:2968:7: ()
+            	    // InternalCheck.g:2969:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -8453,11 +8453,11 @@ public final EObject ruleXAndExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2974:2: ( ( ruleOpAnd ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2975:1: ( ruleOpAnd )
+            	    // InternalCheck.g:2974:2: ( ( ruleOpAnd ) )
+            	    // InternalCheck.g:2975:1: ( ruleOpAnd )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2975:1: ( ruleOpAnd )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2976:3: ruleOpAnd
+            	    // InternalCheck.g:2975:1: ( ruleOpAnd )
+            	    // InternalCheck.g:2976:3: ruleOpAnd
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -8471,7 +8471,7 @@ public final EObject ruleXAndExpression() throws RecognitionException {
             	      	        newCompositeNode(grammarAccess.getXAndExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleOpAnd_in_ruleXAndExpression6707);
+            	    pushFollow(FOLLOW_29);
             	    ruleOpAnd();
 
             	    state._fsp--;
@@ -8493,18 +8493,18 @@ public final EObject ruleXAndExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2989:4: ( (lv_rightOperand_3_0= ruleXEqualityExpression ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2990:1: (lv_rightOperand_3_0= ruleXEqualityExpression )
+            	    // InternalCheck.g:2989:4: ( (lv_rightOperand_3_0= ruleXEqualityExpression ) )
+            	    // InternalCheck.g:2990:1: (lv_rightOperand_3_0= ruleXEqualityExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2990:1: (lv_rightOperand_3_0= ruleXEqualityExpression )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2991:3: lv_rightOperand_3_0= ruleXEqualityExpression
+            	    // InternalCheck.g:2990:1: (lv_rightOperand_3_0= ruleXEqualityExpression )
+            	    // InternalCheck.g:2991:3: lv_rightOperand_3_0= ruleXEqualityExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXAndExpressionAccess().getRightOperandXEqualityExpressionParserRuleCall_1_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXEqualityExpression_in_ruleXAndExpression6730);
+            	    pushFollow(FOLLOW_60);
             	    lv_rightOperand_3_0=ruleXEqualityExpression();
 
             	    state._fsp--;
@@ -8518,7 +8518,7 @@ public final EObject ruleXAndExpression() throws RecognitionException {
             	             			current, 
             	             			"rightOperand",
             	              		lv_rightOperand_3_0, 
-            	              		"XEqualityExpression");
+            	              		"org.eclipse.xtext.xbase.Xbase.XEqualityExpression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -8560,7 +8560,7 @@ public final EObject ruleXAndExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpAnd"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3015:1: entryRuleOpAnd returns [String current=null] : iv_ruleOpAnd= ruleOpAnd EOF ;
+    // InternalCheck.g:3015:1: entryRuleOpAnd returns [String current=null] : iv_ruleOpAnd= ruleOpAnd EOF ;
     public final String entryRuleOpAnd() throws RecognitionException {
         String current = null;
 
@@ -8568,13 +8568,13 @@ public final String entryRuleOpAnd() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3016:2: (iv_ruleOpAnd= ruleOpAnd EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3017:2: iv_ruleOpAnd= ruleOpAnd EOF
+            // InternalCheck.g:3016:2: (iv_ruleOpAnd= ruleOpAnd EOF )
+            // InternalCheck.g:3017:2: iv_ruleOpAnd= ruleOpAnd EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpAndRule()); 
             }
-            pushFollow(FOLLOW_ruleOpAnd_in_entryRuleOpAnd6769);
+            pushFollow(FOLLOW_1);
             iv_ruleOpAnd=ruleOpAnd();
 
             state._fsp--;
@@ -8582,7 +8582,7 @@ public final String entryRuleOpAnd() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpAnd.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpAnd6780); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -8600,7 +8600,7 @@ public final String entryRuleOpAnd() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpAnd"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3024:1: ruleOpAnd returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : kw= '&&' ;
+    // InternalCheck.g:3024:1: ruleOpAnd returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : kw= '&&' ;
     public final AntlrDatatypeRuleToken ruleOpAnd() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -8609,10 +8609,10 @@ public final AntlrDatatypeRuleToken ruleOpAnd() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3027:28: (kw= '&&' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3029:2: kw= '&&'
+            // InternalCheck.g:3027:28: (kw= '&&' )
+            // InternalCheck.g:3029:2: kw= '&&'
             {
-            kw=(Token)match(input,60,FOLLOW_60_in_ruleOpAnd6817); if (state.failed) return current;
+            kw=(Token)match(input,60,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                       current.merge(kw);
@@ -8639,7 +8639,7 @@ public final AntlrDatatypeRuleToken ruleOpAnd() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXEqualityExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3042:1: entryRuleXEqualityExpression returns [EObject current=null] : iv_ruleXEqualityExpression= ruleXEqualityExpression EOF ;
+    // InternalCheck.g:3042:1: entryRuleXEqualityExpression returns [EObject current=null] : iv_ruleXEqualityExpression= ruleXEqualityExpression EOF ;
     public final EObject entryRuleXEqualityExpression() throws RecognitionException {
         EObject current = null;
 
@@ -8647,13 +8647,13 @@ public final EObject entryRuleXEqualityExpression() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3043:2: (iv_ruleXEqualityExpression= ruleXEqualityExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3044:2: iv_ruleXEqualityExpression= ruleXEqualityExpression EOF
+            // InternalCheck.g:3043:2: (iv_ruleXEqualityExpression= ruleXEqualityExpression EOF )
+            // InternalCheck.g:3044:2: iv_ruleXEqualityExpression= ruleXEqualityExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXEqualityExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXEqualityExpression_in_entryRuleXEqualityExpression6856);
+            pushFollow(FOLLOW_1);
             iv_ruleXEqualityExpression=ruleXEqualityExpression();
 
             state._fsp--;
@@ -8661,7 +8661,7 @@ public final EObject entryRuleXEqualityExpression() throws RecognitionException
             if ( state.backtracking==0 ) {
                current =iv_ruleXEqualityExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXEqualityExpression6866); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -8679,7 +8679,7 @@ public final EObject entryRuleXEqualityExpression() throws RecognitionException
 
 
     // $ANTLR start "ruleXEqualityExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3051:1: ruleXEqualityExpression returns [EObject current=null] : (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* ) ;
+    // InternalCheck.g:3051:1: ruleXEqualityExpression returns [EObject current=null] : (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* ) ;
     public final EObject ruleXEqualityExpression() throws RecognitionException {
         EObject current = null;
 
@@ -8691,18 +8691,18 @@ public final EObject ruleXEqualityExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3054:28: ( (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3055:1: (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* )
+            // InternalCheck.g:3054:28: ( (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* ) )
+            // InternalCheck.g:3055:1: (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3055:1: (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3056:5: this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )*
+            // InternalCheck.g:3055:1: (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* )
+            // InternalCheck.g:3056:5: this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXEqualityExpressionAccess().getXRelationalExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleXRelationalExpression_in_ruleXEqualityExpression6913);
+            pushFollow(FOLLOW_61);
             this_XRelationalExpression_0=ruleXRelationalExpression();
 
             state._fsp--;
@@ -8713,7 +8713,7 @@ public final EObject ruleXEqualityExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3064:1: ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )*
+            // InternalCheck.g:3064:1: ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )*
             loop60:
             do {
                 int alt60=2;
@@ -8767,16 +8767,16 @@ public final EObject ruleXEqualityExpression() throws RecognitionException {
 
                 switch (alt60) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3064:2: ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) )
+            	    // InternalCheck.g:3064:2: ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3064:2: ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3064:3: ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) )
+            	    // InternalCheck.g:3064:2: ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) )
+            	    // InternalCheck.g:3064:3: ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3069:6: ( () ( ( ruleOpEquality ) ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3069:7: () ( ( ruleOpEquality ) )
+            	    // InternalCheck.g:3069:6: ( () ( ( ruleOpEquality ) ) )
+            	    // InternalCheck.g:3069:7: () ( ( ruleOpEquality ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3069:7: ()
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3070:5: 
+            	    // InternalCheck.g:3069:7: ()
+            	    // InternalCheck.g:3070:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -8788,11 +8788,11 @@ public final EObject ruleXEqualityExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3075:2: ( ( ruleOpEquality ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3076:1: ( ruleOpEquality )
+            	    // InternalCheck.g:3075:2: ( ( ruleOpEquality ) )
+            	    // InternalCheck.g:3076:1: ( ruleOpEquality )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3076:1: ( ruleOpEquality )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3077:3: ruleOpEquality
+            	    // InternalCheck.g:3076:1: ( ruleOpEquality )
+            	    // InternalCheck.g:3077:3: ruleOpEquality
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -8806,7 +8806,7 @@ public final EObject ruleXEqualityExpression() throws RecognitionException {
             	      	        newCompositeNode(grammarAccess.getXEqualityExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleOpEquality_in_ruleXEqualityExpression6966);
+            	    pushFollow(FOLLOW_29);
             	    ruleOpEquality();
 
             	    state._fsp--;
@@ -8828,18 +8828,18 @@ public final EObject ruleXEqualityExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3090:4: ( (lv_rightOperand_3_0= ruleXRelationalExpression ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3091:1: (lv_rightOperand_3_0= ruleXRelationalExpression )
+            	    // InternalCheck.g:3090:4: ( (lv_rightOperand_3_0= ruleXRelationalExpression ) )
+            	    // InternalCheck.g:3091:1: (lv_rightOperand_3_0= ruleXRelationalExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3091:1: (lv_rightOperand_3_0= ruleXRelationalExpression )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3092:3: lv_rightOperand_3_0= ruleXRelationalExpression
+            	    // InternalCheck.g:3091:1: (lv_rightOperand_3_0= ruleXRelationalExpression )
+            	    // InternalCheck.g:3092:3: lv_rightOperand_3_0= ruleXRelationalExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXEqualityExpressionAccess().getRightOperandXRelationalExpressionParserRuleCall_1_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXRelationalExpression_in_ruleXEqualityExpression6989);
+            	    pushFollow(FOLLOW_61);
             	    lv_rightOperand_3_0=ruleXRelationalExpression();
 
             	    state._fsp--;
@@ -8853,7 +8853,7 @@ public final EObject ruleXEqualityExpression() throws RecognitionException {
             	             			current, 
             	             			"rightOperand",
             	              		lv_rightOperand_3_0, 
-            	              		"XRelationalExpression");
+            	              		"org.eclipse.xtext.xbase.Xbase.XRelationalExpression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -8895,7 +8895,7 @@ public final EObject ruleXEqualityExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpEquality"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3116:1: entryRuleOpEquality returns [String current=null] : iv_ruleOpEquality= ruleOpEquality EOF ;
+    // InternalCheck.g:3116:1: entryRuleOpEquality returns [String current=null] : iv_ruleOpEquality= ruleOpEquality EOF ;
     public final String entryRuleOpEquality() throws RecognitionException {
         String current = null;
 
@@ -8903,13 +8903,13 @@ public final String entryRuleOpEquality() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3117:2: (iv_ruleOpEquality= ruleOpEquality EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3118:2: iv_ruleOpEquality= ruleOpEquality EOF
+            // InternalCheck.g:3117:2: (iv_ruleOpEquality= ruleOpEquality EOF )
+            // InternalCheck.g:3118:2: iv_ruleOpEquality= ruleOpEquality EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpEqualityRule()); 
             }
-            pushFollow(FOLLOW_ruleOpEquality_in_entryRuleOpEquality7028);
+            pushFollow(FOLLOW_1);
             iv_ruleOpEquality=ruleOpEquality();
 
             state._fsp--;
@@ -8917,7 +8917,7 @@ public final String entryRuleOpEquality() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpEquality.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpEquality7039); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -8935,7 +8935,7 @@ public final String entryRuleOpEquality() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpEquality"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3125:1: ruleOpEquality returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' ) ;
+    // InternalCheck.g:3125:1: ruleOpEquality returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' ) ;
     public final AntlrDatatypeRuleToken ruleOpEquality() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -8944,10 +8944,10 @@ public final AntlrDatatypeRuleToken ruleOpEquality() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3128:28: ( (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3129:1: (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' )
+            // InternalCheck.g:3128:28: ( (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' ) )
+            // InternalCheck.g:3129:1: (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3129:1: (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' )
+            // InternalCheck.g:3129:1: (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' )
             int alt61=4;
             switch ( input.LA(1) ) {
             case 61:
@@ -8980,9 +8980,9 @@ public final AntlrDatatypeRuleToken ruleOpEquality() throws RecognitionException
 
             switch (alt61) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3130:2: kw= '=='
+                    // InternalCheck.g:3130:2: kw= '=='
                     {
-                    kw=(Token)match(input,61,FOLLOW_61_in_ruleOpEquality7077); if (state.failed) return current;
+                    kw=(Token)match(input,61,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -8993,9 +8993,9 @@ public final AntlrDatatypeRuleToken ruleOpEquality() throws RecognitionException
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3137:2: kw= '!='
+                    // InternalCheck.g:3137:2: kw= '!='
                     {
-                    kw=(Token)match(input,62,FOLLOW_62_in_ruleOpEquality7096); if (state.failed) return current;
+                    kw=(Token)match(input,62,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -9006,9 +9006,9 @@ public final AntlrDatatypeRuleToken ruleOpEquality() throws RecognitionException
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3144:2: kw= '==='
+                    // InternalCheck.g:3144:2: kw= '==='
                     {
-                    kw=(Token)match(input,63,FOLLOW_63_in_ruleOpEquality7115); if (state.failed) return current;
+                    kw=(Token)match(input,63,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -9019,9 +9019,9 @@ public final AntlrDatatypeRuleToken ruleOpEquality() throws RecognitionException
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3151:2: kw= '!=='
+                    // InternalCheck.g:3151:2: kw= '!=='
                     {
-                    kw=(Token)match(input,64,FOLLOW_64_in_ruleOpEquality7134); if (state.failed) return current;
+                    kw=(Token)match(input,64,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -9054,7 +9054,7 @@ public final AntlrDatatypeRuleToken ruleOpEquality() throws RecognitionException
 
 
     // $ANTLR start "entryRuleXRelationalExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3164:1: entryRuleXRelationalExpression returns [EObject current=null] : iv_ruleXRelationalExpression= ruleXRelationalExpression EOF ;
+    // InternalCheck.g:3164:1: entryRuleXRelationalExpression returns [EObject current=null] : iv_ruleXRelationalExpression= ruleXRelationalExpression EOF ;
     public final EObject entryRuleXRelationalExpression() throws RecognitionException {
         EObject current = null;
 
@@ -9062,13 +9062,13 @@ public final EObject entryRuleXRelationalExpression() throws RecognitionExceptio
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3165:2: (iv_ruleXRelationalExpression= ruleXRelationalExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3166:2: iv_ruleXRelationalExpression= ruleXRelationalExpression EOF
+            // InternalCheck.g:3165:2: (iv_ruleXRelationalExpression= ruleXRelationalExpression EOF )
+            // InternalCheck.g:3166:2: iv_ruleXRelationalExpression= ruleXRelationalExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXRelationalExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXRelationalExpression_in_entryRuleXRelationalExpression7174);
+            pushFollow(FOLLOW_1);
             iv_ruleXRelationalExpression=ruleXRelationalExpression();
 
             state._fsp--;
@@ -9076,7 +9076,7 @@ public final EObject entryRuleXRelationalExpression() throws RecognitionExceptio
             if ( state.backtracking==0 ) {
                current =iv_ruleXRelationalExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXRelationalExpression7184); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -9094,7 +9094,7 @@ public final EObject entryRuleXRelationalExpression() throws RecognitionExceptio
 
 
     // $ANTLR start "ruleXRelationalExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3173:1: ruleXRelationalExpression returns [EObject current=null] : (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* ) ;
+    // InternalCheck.g:3173:1: ruleXRelationalExpression returns [EObject current=null] : (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* ) ;
     public final EObject ruleXRelationalExpression() throws RecognitionException {
         EObject current = null;
 
@@ -9109,18 +9109,18 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3176:28: ( (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3177:1: (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* )
+            // InternalCheck.g:3176:28: ( (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* ) )
+            // InternalCheck.g:3177:1: (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3177:1: (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3178:5: this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )*
+            // InternalCheck.g:3177:1: (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* )
+            // InternalCheck.g:3178:5: this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXRelationalExpressionAccess().getXOtherOperatorExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleXOtherOperatorExpression_in_ruleXRelationalExpression7231);
+            pushFollow(FOLLOW_62);
             this_XOtherOperatorExpression_0=ruleXOtherOperatorExpression();
 
             state._fsp--;
@@ -9131,7 +9131,7 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3186:1: ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )*
+            // InternalCheck.g:3186:1: ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )*
             loop62:
             do {
                 int alt62=3;
@@ -9185,19 +9185,19 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
 
                 switch (alt62) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3186:2: ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )
+            	    // InternalCheck.g:3186:2: ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3186:2: ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3186:3: ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) )
+            	    // InternalCheck.g:3186:2: ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )
+            	    // InternalCheck.g:3186:3: ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3186:3: ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3186:4: ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' )
+            	    // InternalCheck.g:3186:3: ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) )
+            	    // InternalCheck.g:3186:4: ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3188:5: ( () otherlv_2= 'instanceof' )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3188:6: () otherlv_2= 'instanceof'
+            	    // InternalCheck.g:3188:5: ( () otherlv_2= 'instanceof' )
+            	    // InternalCheck.g:3188:6: () otherlv_2= 'instanceof'
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3188:6: ()
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3189:5: 
+            	    // InternalCheck.g:3188:6: ()
+            	    // InternalCheck.g:3189:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -9209,7 +9209,7 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
 
             	    }
 
-            	    otherlv_2=(Token)match(input,65,FOLLOW_65_in_ruleXRelationalExpression7267); if (state.failed) return current;
+            	    otherlv_2=(Token)match(input,65,FOLLOW_27); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_2, grammarAccess.getXRelationalExpressionAccess().getInstanceofKeyword_1_0_0_0_1());
@@ -9221,18 +9221,18 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3198:3: ( (lv_type_3_0= ruleJvmTypeReference ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3199:1: (lv_type_3_0= ruleJvmTypeReference )
+            	    // InternalCheck.g:3198:3: ( (lv_type_3_0= ruleJvmTypeReference ) )
+            	    // InternalCheck.g:3199:1: (lv_type_3_0= ruleJvmTypeReference )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3199:1: (lv_type_3_0= ruleJvmTypeReference )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3200:3: lv_type_3_0= ruleJvmTypeReference
+            	    // InternalCheck.g:3199:1: (lv_type_3_0= ruleJvmTypeReference )
+            	    // InternalCheck.g:3200:3: lv_type_3_0= ruleJvmTypeReference
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXRelationalExpressionAccess().getTypeJvmTypeReferenceParserRuleCall_1_0_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleXRelationalExpression7290);
+            	    pushFollow(FOLLOW_62);
             	    lv_type_3_0=ruleJvmTypeReference();
 
             	    state._fsp--;
@@ -9246,7 +9246,7 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
             	             			current, 
             	             			"type",
             	              		lv_type_3_0, 
-            	              		"JvmTypeReference");
+            	              		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -9263,19 +9263,19 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
             	    }
             	    break;
             	case 2 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3217:6: ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) )
+            	    // InternalCheck.g:3217:6: ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3217:6: ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3217:7: ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) )
+            	    // InternalCheck.g:3217:6: ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) )
+            	    // InternalCheck.g:3217:7: ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3217:7: ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3217:8: ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) )
+            	    // InternalCheck.g:3217:7: ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) )
+            	    // InternalCheck.g:3217:8: ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3222:6: ( () ( ( ruleOpCompare ) ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3222:7: () ( ( ruleOpCompare ) )
+            	    // InternalCheck.g:3222:6: ( () ( ( ruleOpCompare ) ) )
+            	    // InternalCheck.g:3222:7: () ( ( ruleOpCompare ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3222:7: ()
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3223:5: 
+            	    // InternalCheck.g:3222:7: ()
+            	    // InternalCheck.g:3223:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -9287,11 +9287,11 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3228:2: ( ( ruleOpCompare ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3229:1: ( ruleOpCompare )
+            	    // InternalCheck.g:3228:2: ( ( ruleOpCompare ) )
+            	    // InternalCheck.g:3229:1: ( ruleOpCompare )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3229:1: ( ruleOpCompare )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3230:3: ruleOpCompare
+            	    // InternalCheck.g:3229:1: ( ruleOpCompare )
+            	    // InternalCheck.g:3230:3: ruleOpCompare
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -9305,7 +9305,7 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
             	      	        newCompositeNode(grammarAccess.getXRelationalExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_1_0_0_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleOpCompare_in_ruleXRelationalExpression7351);
+            	    pushFollow(FOLLOW_29);
             	    ruleOpCompare();
 
             	    state._fsp--;
@@ -9327,18 +9327,18 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3243:4: ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3244:1: (lv_rightOperand_6_0= ruleXOtherOperatorExpression )
+            	    // InternalCheck.g:3243:4: ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) )
+            	    // InternalCheck.g:3244:1: (lv_rightOperand_6_0= ruleXOtherOperatorExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3244:1: (lv_rightOperand_6_0= ruleXOtherOperatorExpression )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3245:3: lv_rightOperand_6_0= ruleXOtherOperatorExpression
+            	    // InternalCheck.g:3244:1: (lv_rightOperand_6_0= ruleXOtherOperatorExpression )
+            	    // InternalCheck.g:3245:3: lv_rightOperand_6_0= ruleXOtherOperatorExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXRelationalExpressionAccess().getRightOperandXOtherOperatorExpressionParserRuleCall_1_1_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXOtherOperatorExpression_in_ruleXRelationalExpression7374);
+            	    pushFollow(FOLLOW_62);
             	    lv_rightOperand_6_0=ruleXOtherOperatorExpression();
 
             	    state._fsp--;
@@ -9352,7 +9352,7 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
             	             			current, 
             	             			"rightOperand",
             	              		lv_rightOperand_6_0, 
-            	              		"XOtherOperatorExpression");
+            	              		"org.eclipse.xtext.xbase.Xbase.XOtherOperatorExpression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -9397,7 +9397,7 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpCompare"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3269:1: entryRuleOpCompare returns [String current=null] : iv_ruleOpCompare= ruleOpCompare EOF ;
+    // InternalCheck.g:3269:1: entryRuleOpCompare returns [String current=null] : iv_ruleOpCompare= ruleOpCompare EOF ;
     public final String entryRuleOpCompare() throws RecognitionException {
         String current = null;
 
@@ -9405,13 +9405,13 @@ public final String entryRuleOpCompare() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3270:2: (iv_ruleOpCompare= ruleOpCompare EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3271:2: iv_ruleOpCompare= ruleOpCompare EOF
+            // InternalCheck.g:3270:2: (iv_ruleOpCompare= ruleOpCompare EOF )
+            // InternalCheck.g:3271:2: iv_ruleOpCompare= ruleOpCompare EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpCompareRule()); 
             }
-            pushFollow(FOLLOW_ruleOpCompare_in_entryRuleOpCompare7414);
+            pushFollow(FOLLOW_1);
             iv_ruleOpCompare=ruleOpCompare();
 
             state._fsp--;
@@ -9419,7 +9419,7 @@ public final String entryRuleOpCompare() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpCompare.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpCompare7425); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -9437,7 +9437,7 @@ public final String entryRuleOpCompare() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpCompare"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3278:1: ruleOpCompare returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' ) ;
+    // InternalCheck.g:3278:1: ruleOpCompare returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' ) ;
     public final AntlrDatatypeRuleToken ruleOpCompare() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -9446,10 +9446,10 @@ public final AntlrDatatypeRuleToken ruleOpCompare() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3281:28: ( (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3282:1: (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' )
+            // InternalCheck.g:3281:28: ( (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' ) )
+            // InternalCheck.g:3282:1: (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3282:1: (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' )
+            // InternalCheck.g:3282:1: (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' )
             int alt63=4;
             switch ( input.LA(1) ) {
             case 58:
@@ -9491,9 +9491,9 @@ else if ( (LA63_2==31) ) {
 
             switch (alt63) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3283:2: kw= '>='
+                    // InternalCheck.g:3283:2: kw= '>='
                     {
-                    kw=(Token)match(input,58,FOLLOW_58_in_ruleOpCompare7463); if (state.failed) return current;
+                    kw=(Token)match(input,58,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -9504,19 +9504,19 @@ else if ( (LA63_2==31) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3289:6: (kw= '<' kw= '=' )
+                    // InternalCheck.g:3289:6: (kw= '<' kw= '=' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3289:6: (kw= '<' kw= '=' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3290:2: kw= '<' kw= '='
+                    // InternalCheck.g:3289:6: (kw= '<' kw= '=' )
+                    // InternalCheck.g:3290:2: kw= '<' kw= '='
                     {
-                    kw=(Token)match(input,56,FOLLOW_56_in_ruleOpCompare7483); if (state.failed) return current;
+                    kw=(Token)match(input,56,FOLLOW_32); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
                               newLeafNode(kw, grammarAccess.getOpCompareAccess().getLessThanSignKeyword_1_0()); 
                           
                     }
-                    kw=(Token)match(input,31,FOLLOW_31_in_ruleOpCompare7496); if (state.failed) return current;
+                    kw=(Token)match(input,31,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -9530,9 +9530,9 @@ else if ( (LA63_2==31) ) {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3303:2: kw= '>'
+                    // InternalCheck.g:3303:2: kw= '>'
                     {
-                    kw=(Token)match(input,57,FOLLOW_57_in_ruleOpCompare7516); if (state.failed) return current;
+                    kw=(Token)match(input,57,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -9543,9 +9543,9 @@ else if ( (LA63_2==31) ) {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3310:2: kw= '<'
+                    // InternalCheck.g:3310:2: kw= '<'
                     {
-                    kw=(Token)match(input,56,FOLLOW_56_in_ruleOpCompare7535); if (state.failed) return current;
+                    kw=(Token)match(input,56,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -9578,7 +9578,7 @@ else if ( (LA63_2==31) ) {
 
 
     // $ANTLR start "entryRuleXOtherOperatorExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3323:1: entryRuleXOtherOperatorExpression returns [EObject current=null] : iv_ruleXOtherOperatorExpression= ruleXOtherOperatorExpression EOF ;
+    // InternalCheck.g:3323:1: entryRuleXOtherOperatorExpression returns [EObject current=null] : iv_ruleXOtherOperatorExpression= ruleXOtherOperatorExpression EOF ;
     public final EObject entryRuleXOtherOperatorExpression() throws RecognitionException {
         EObject current = null;
 
@@ -9586,13 +9586,13 @@ public final EObject entryRuleXOtherOperatorExpression() throws RecognitionExcep
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3324:2: (iv_ruleXOtherOperatorExpression= ruleXOtherOperatorExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3325:2: iv_ruleXOtherOperatorExpression= ruleXOtherOperatorExpression EOF
+            // InternalCheck.g:3324:2: (iv_ruleXOtherOperatorExpression= ruleXOtherOperatorExpression EOF )
+            // InternalCheck.g:3325:2: iv_ruleXOtherOperatorExpression= ruleXOtherOperatorExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXOtherOperatorExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXOtherOperatorExpression_in_entryRuleXOtherOperatorExpression7575);
+            pushFollow(FOLLOW_1);
             iv_ruleXOtherOperatorExpression=ruleXOtherOperatorExpression();
 
             state._fsp--;
@@ -9600,7 +9600,7 @@ public final EObject entryRuleXOtherOperatorExpression() throws RecognitionExcep
             if ( state.backtracking==0 ) {
                current =iv_ruleXOtherOperatorExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXOtherOperatorExpression7585); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -9618,7 +9618,7 @@ public final EObject entryRuleXOtherOperatorExpression() throws RecognitionExcep
 
 
     // $ANTLR start "ruleXOtherOperatorExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3332:1: ruleXOtherOperatorExpression returns [EObject current=null] : (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* ) ;
+    // InternalCheck.g:3332:1: ruleXOtherOperatorExpression returns [EObject current=null] : (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* ) ;
     public final EObject ruleXOtherOperatorExpression() throws RecognitionException {
         EObject current = null;
 
@@ -9630,18 +9630,18 @@ public final EObject ruleXOtherOperatorExpression() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3335:28: ( (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3336:1: (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* )
+            // InternalCheck.g:3335:28: ( (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* ) )
+            // InternalCheck.g:3336:1: (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3336:1: (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3337:5: this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )*
+            // InternalCheck.g:3336:1: (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* )
+            // InternalCheck.g:3337:5: this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXOtherOperatorExpressionAccess().getXAdditiveExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleXAdditiveExpression_in_ruleXOtherOperatorExpression7632);
+            pushFollow(FOLLOW_63);
             this_XAdditiveExpression_0=ruleXAdditiveExpression();
 
             state._fsp--;
@@ -9652,23 +9652,23 @@ public final EObject ruleXOtherOperatorExpression() throws RecognitionException
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3345:1: ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )*
+            // InternalCheck.g:3345:1: ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )*
             loop64:
             do {
                 int alt64=2;
                 alt64 = dfa64.predict(input);
                 switch (alt64) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3345:2: ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) )
+            	    // InternalCheck.g:3345:2: ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3345:2: ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3345:3: ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) )
+            	    // InternalCheck.g:3345:2: ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) )
+            	    // InternalCheck.g:3345:3: ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3350:6: ( () ( ( ruleOpOther ) ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3350:7: () ( ( ruleOpOther ) )
+            	    // InternalCheck.g:3350:6: ( () ( ( ruleOpOther ) ) )
+            	    // InternalCheck.g:3350:7: () ( ( ruleOpOther ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3350:7: ()
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3351:5: 
+            	    // InternalCheck.g:3350:7: ()
+            	    // InternalCheck.g:3351:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -9680,11 +9680,11 @@ public final EObject ruleXOtherOperatorExpression() throws RecognitionException
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3356:2: ( ( ruleOpOther ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3357:1: ( ruleOpOther )
+            	    // InternalCheck.g:3356:2: ( ( ruleOpOther ) )
+            	    // InternalCheck.g:3357:1: ( ruleOpOther )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3357:1: ( ruleOpOther )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3358:3: ruleOpOther
+            	    // InternalCheck.g:3357:1: ( ruleOpOther )
+            	    // InternalCheck.g:3358:3: ruleOpOther
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -9698,7 +9698,7 @@ public final EObject ruleXOtherOperatorExpression() throws RecognitionException
             	      	        newCompositeNode(grammarAccess.getXOtherOperatorExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleOpOther_in_ruleXOtherOperatorExpression7685);
+            	    pushFollow(FOLLOW_29);
             	    ruleOpOther();
 
             	    state._fsp--;
@@ -9720,18 +9720,18 @@ public final EObject ruleXOtherOperatorExpression() throws RecognitionException
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3371:4: ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3372:1: (lv_rightOperand_3_0= ruleXAdditiveExpression )
+            	    // InternalCheck.g:3371:4: ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) )
+            	    // InternalCheck.g:3372:1: (lv_rightOperand_3_0= ruleXAdditiveExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3372:1: (lv_rightOperand_3_0= ruleXAdditiveExpression )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3373:3: lv_rightOperand_3_0= ruleXAdditiveExpression
+            	    // InternalCheck.g:3372:1: (lv_rightOperand_3_0= ruleXAdditiveExpression )
+            	    // InternalCheck.g:3373:3: lv_rightOperand_3_0= ruleXAdditiveExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXOtherOperatorExpressionAccess().getRightOperandXAdditiveExpressionParserRuleCall_1_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXAdditiveExpression_in_ruleXOtherOperatorExpression7708);
+            	    pushFollow(FOLLOW_63);
             	    lv_rightOperand_3_0=ruleXAdditiveExpression();
 
             	    state._fsp--;
@@ -9745,7 +9745,7 @@ public final EObject ruleXOtherOperatorExpression() throws RecognitionException
             	             			current, 
             	             			"rightOperand",
             	              		lv_rightOperand_3_0, 
-            	              		"XAdditiveExpression");
+            	              		"org.eclipse.xtext.xbase.Xbase.XAdditiveExpression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -9787,7 +9787,7 @@ public final EObject ruleXOtherOperatorExpression() throws RecognitionException
 
 
     // $ANTLR start "entryRuleOpOther"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3397:1: entryRuleOpOther returns [String current=null] : iv_ruleOpOther= ruleOpOther EOF ;
+    // InternalCheck.g:3397:1: entryRuleOpOther returns [String current=null] : iv_ruleOpOther= ruleOpOther EOF ;
     public final String entryRuleOpOther() throws RecognitionException {
         String current = null;
 
@@ -9795,13 +9795,13 @@ public final String entryRuleOpOther() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3398:2: (iv_ruleOpOther= ruleOpOther EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3399:2: iv_ruleOpOther= ruleOpOther EOF
+            // InternalCheck.g:3398:2: (iv_ruleOpOther= ruleOpOther EOF )
+            // InternalCheck.g:3399:2: iv_ruleOpOther= ruleOpOther EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpOtherRule()); 
             }
-            pushFollow(FOLLOW_ruleOpOther_in_entryRuleOpOther7747);
+            pushFollow(FOLLOW_1);
             iv_ruleOpOther=ruleOpOther();
 
             state._fsp--;
@@ -9809,7 +9809,7 @@ public final String entryRuleOpOther() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpOther.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpOther7758); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -9827,7 +9827,7 @@ public final String entryRuleOpOther() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpOther"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3406:1: ruleOpOther returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' ) ;
+    // InternalCheck.g:3406:1: ruleOpOther returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' ) ;
     public final AntlrDatatypeRuleToken ruleOpOther() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -9836,17 +9836,17 @@ public final AntlrDatatypeRuleToken ruleOpOther() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3409:28: ( (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3410:1: (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' )
+            // InternalCheck.g:3409:28: ( (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' ) )
+            // InternalCheck.g:3410:1: (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3410:1: (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' )
+            // InternalCheck.g:3410:1: (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' )
             int alt67=9;
             alt67 = dfa67.predict(input);
             switch (alt67) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3411:2: kw= '->'
+                    // InternalCheck.g:3411:2: kw= '->'
                     {
-                    kw=(Token)match(input,66,FOLLOW_66_in_ruleOpOther7796); if (state.failed) return current;
+                    kw=(Token)match(input,66,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -9857,9 +9857,9 @@ public final AntlrDatatypeRuleToken ruleOpOther() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3418:2: kw= '..<'
+                    // InternalCheck.g:3418:2: kw= '..<'
                     {
-                    kw=(Token)match(input,67,FOLLOW_67_in_ruleOpOther7815); if (state.failed) return current;
+                    kw=(Token)match(input,67,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -9870,19 +9870,19 @@ public final AntlrDatatypeRuleToken ruleOpOther() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3424:6: (kw= '>' kw= '..' )
+                    // InternalCheck.g:3424:6: (kw= '>' kw= '..' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3424:6: (kw= '>' kw= '..' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3425:2: kw= '>' kw= '..'
+                    // InternalCheck.g:3424:6: (kw= '>' kw= '..' )
+                    // InternalCheck.g:3425:2: kw= '>' kw= '..'
                     {
-                    kw=(Token)match(input,57,FOLLOW_57_in_ruleOpOther7835); if (state.failed) return current;
+                    kw=(Token)match(input,57,FOLLOW_25); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
                               newLeafNode(kw, grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_2_0()); 
                           
                     }
-                    kw=(Token)match(input,29,FOLLOW_29_in_ruleOpOther7848); if (state.failed) return current;
+                    kw=(Token)match(input,29,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -9896,9 +9896,9 @@ public final AntlrDatatypeRuleToken ruleOpOther() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3438:2: kw= '..'
+                    // InternalCheck.g:3438:2: kw= '..'
                     {
-                    kw=(Token)match(input,29,FOLLOW_29_in_ruleOpOther7868); if (state.failed) return current;
+                    kw=(Token)match(input,29,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -9909,9 +9909,9 @@ public final AntlrDatatypeRuleToken ruleOpOther() throws RecognitionException {
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3445:2: kw= '=>'
+                    // InternalCheck.g:3445:2: kw= '=>'
                     {
-                    kw=(Token)match(input,68,FOLLOW_68_in_ruleOpOther7887); if (state.failed) return current;
+                    kw=(Token)match(input,68,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -9922,19 +9922,19 @@ public final AntlrDatatypeRuleToken ruleOpOther() throws RecognitionException {
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3451:6: (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) )
+                    // InternalCheck.g:3451:6: (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3451:6: (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3452:2: kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' )
+                    // InternalCheck.g:3451:6: (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) )
+                    // InternalCheck.g:3452:2: kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' )
                     {
-                    kw=(Token)match(input,57,FOLLOW_57_in_ruleOpOther7907); if (state.failed) return current;
+                    kw=(Token)match(input,57,FOLLOW_64); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
                               newLeafNode(kw, grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_0()); 
                           
                     }
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3457:1: ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' )
+                    // InternalCheck.g:3457:1: ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' )
                     int alt65=2;
                     int LA65_0 = input.LA(1);
 
@@ -9964,22 +9964,22 @@ else if ( (LA65_1==57) && (synpred28_InternalCheck())) {
                     }
                     switch (alt65) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3457:2: ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) )
+                            // InternalCheck.g:3457:2: ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3457:2: ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3457:3: ( ( '>' '>' ) )=> (kw= '>' kw= '>' )
+                            // InternalCheck.g:3457:2: ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) )
+                            // InternalCheck.g:3457:3: ( ( '>' '>' ) )=> (kw= '>' kw= '>' )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3461:5: (kw= '>' kw= '>' )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3462:2: kw= '>' kw= '>'
+                            // InternalCheck.g:3461:5: (kw= '>' kw= '>' )
+                            // InternalCheck.g:3462:2: kw= '>' kw= '>'
                             {
-                            kw=(Token)match(input,57,FOLLOW_57_in_ruleOpOther7938); if (state.failed) return current;
+                            kw=(Token)match(input,57,FOLLOW_64); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       current.merge(kw);
                                       newLeafNode(kw, grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_1_0_0_0()); 
                                   
                             }
-                            kw=(Token)match(input,57,FOLLOW_57_in_ruleOpOther7951); if (state.failed) return current;
+                            kw=(Token)match(input,57,FOLLOW_2); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       current.merge(kw);
@@ -9996,9 +9996,9 @@ else if ( (LA65_1==57) && (synpred28_InternalCheck())) {
                             }
                             break;
                         case 2 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3475:2: kw= '>'
+                            // InternalCheck.g:3475:2: kw= '>'
                             {
-                            kw=(Token)match(input,57,FOLLOW_57_in_ruleOpOther7972); if (state.failed) return current;
+                            kw=(Token)match(input,57,FOLLOW_2); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       current.merge(kw);
@@ -10018,19 +10018,19 @@ else if ( (LA65_1==57) && (synpred28_InternalCheck())) {
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3481:6: (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) )
+                    // InternalCheck.g:3481:6: (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3481:6: (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3482:2: kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' )
+                    // InternalCheck.g:3481:6: (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) )
+                    // InternalCheck.g:3482:2: kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' )
                     {
-                    kw=(Token)match(input,56,FOLLOW_56_in_ruleOpOther7994); if (state.failed) return current;
+                    kw=(Token)match(input,56,FOLLOW_65); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
                               newLeafNode(kw, grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_0()); 
                           
                     }
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3487:1: ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' )
+                    // InternalCheck.g:3487:1: ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' )
                     int alt66=3;
                     int LA66_0 = input.LA(1);
 
@@ -10063,22 +10063,22 @@ else if ( (LA66_0==68) ) {
                     }
                     switch (alt66) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3487:2: ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) )
+                            // InternalCheck.g:3487:2: ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3487:2: ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3487:3: ( ( '<' '<' ) )=> (kw= '<' kw= '<' )
+                            // InternalCheck.g:3487:2: ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) )
+                            // InternalCheck.g:3487:3: ( ( '<' '<' ) )=> (kw= '<' kw= '<' )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3491:5: (kw= '<' kw= '<' )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3492:2: kw= '<' kw= '<'
+                            // InternalCheck.g:3491:5: (kw= '<' kw= '<' )
+                            // InternalCheck.g:3492:2: kw= '<' kw= '<'
                             {
-                            kw=(Token)match(input,56,FOLLOW_56_in_ruleOpOther8025); if (state.failed) return current;
+                            kw=(Token)match(input,56,FOLLOW_56); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       current.merge(kw);
                                       newLeafNode(kw, grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_1_0_0_0()); 
                                   
                             }
-                            kw=(Token)match(input,56,FOLLOW_56_in_ruleOpOther8038); if (state.failed) return current;
+                            kw=(Token)match(input,56,FOLLOW_2); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       current.merge(kw);
@@ -10095,9 +10095,9 @@ else if ( (LA66_0==68) ) {
                             }
                             break;
                         case 2 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3505:2: kw= '<'
+                            // InternalCheck.g:3505:2: kw= '<'
                             {
-                            kw=(Token)match(input,56,FOLLOW_56_in_ruleOpOther8059); if (state.failed) return current;
+                            kw=(Token)match(input,56,FOLLOW_2); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       current.merge(kw);
@@ -10108,9 +10108,9 @@ else if ( (LA66_0==68) ) {
                             }
                             break;
                         case 3 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3512:2: kw= '=>'
+                            // InternalCheck.g:3512:2: kw= '=>'
                             {
-                            kw=(Token)match(input,68,FOLLOW_68_in_ruleOpOther8078); if (state.failed) return current;
+                            kw=(Token)match(input,68,FOLLOW_2); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       current.merge(kw);
@@ -10130,9 +10130,9 @@ else if ( (LA66_0==68) ) {
                     }
                     break;
                 case 8 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3519:2: kw= '<>'
+                    // InternalCheck.g:3519:2: kw= '<>'
                     {
-                    kw=(Token)match(input,69,FOLLOW_69_in_ruleOpOther8099); if (state.failed) return current;
+                    kw=(Token)match(input,69,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -10143,9 +10143,9 @@ else if ( (LA66_0==68) ) {
                     }
                     break;
                 case 9 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3526:2: kw= '?:'
+                    // InternalCheck.g:3526:2: kw= '?:'
                     {
-                    kw=(Token)match(input,70,FOLLOW_70_in_ruleOpOther8118); if (state.failed) return current;
+                    kw=(Token)match(input,70,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -10178,7 +10178,7 @@ else if ( (LA66_0==68) ) {
 
 
     // $ANTLR start "entryRuleXAdditiveExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3539:1: entryRuleXAdditiveExpression returns [EObject current=null] : iv_ruleXAdditiveExpression= ruleXAdditiveExpression EOF ;
+    // InternalCheck.g:3539:1: entryRuleXAdditiveExpression returns [EObject current=null] : iv_ruleXAdditiveExpression= ruleXAdditiveExpression EOF ;
     public final EObject entryRuleXAdditiveExpression() throws RecognitionException {
         EObject current = null;
 
@@ -10186,13 +10186,13 @@ public final EObject entryRuleXAdditiveExpression() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3540:2: (iv_ruleXAdditiveExpression= ruleXAdditiveExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3541:2: iv_ruleXAdditiveExpression= ruleXAdditiveExpression EOF
+            // InternalCheck.g:3540:2: (iv_ruleXAdditiveExpression= ruleXAdditiveExpression EOF )
+            // InternalCheck.g:3541:2: iv_ruleXAdditiveExpression= ruleXAdditiveExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAdditiveExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXAdditiveExpression_in_entryRuleXAdditiveExpression8158);
+            pushFollow(FOLLOW_1);
             iv_ruleXAdditiveExpression=ruleXAdditiveExpression();
 
             state._fsp--;
@@ -10200,7 +10200,7 @@ public final EObject entryRuleXAdditiveExpression() throws RecognitionException
             if ( state.backtracking==0 ) {
                current =iv_ruleXAdditiveExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAdditiveExpression8168); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -10218,7 +10218,7 @@ public final EObject entryRuleXAdditiveExpression() throws RecognitionException
 
 
     // $ANTLR start "ruleXAdditiveExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3548:1: ruleXAdditiveExpression returns [EObject current=null] : (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* ) ;
+    // InternalCheck.g:3548:1: ruleXAdditiveExpression returns [EObject current=null] : (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* ) ;
     public final EObject ruleXAdditiveExpression() throws RecognitionException {
         EObject current = null;
 
@@ -10230,18 +10230,18 @@ public final EObject ruleXAdditiveExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3551:28: ( (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3552:1: (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* )
+            // InternalCheck.g:3551:28: ( (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* ) )
+            // InternalCheck.g:3552:1: (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3552:1: (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3553:5: this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )*
+            // InternalCheck.g:3552:1: (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* )
+            // InternalCheck.g:3553:5: this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXAdditiveExpressionAccess().getXMultiplicativeExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleXMultiplicativeExpression_in_ruleXAdditiveExpression8215);
+            pushFollow(FOLLOW_66);
             this_XMultiplicativeExpression_0=ruleXMultiplicativeExpression();
 
             state._fsp--;
@@ -10252,7 +10252,7 @@ public final EObject ruleXAdditiveExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3561:1: ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )*
+            // InternalCheck.g:3561:1: ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )*
             loop68:
             do {
                 int alt68=2;
@@ -10280,16 +10280,16 @@ else if ( (LA68_0==72) ) {
 
                 switch (alt68) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3561:2: ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) )
+            	    // InternalCheck.g:3561:2: ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3561:2: ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3561:3: ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) )
+            	    // InternalCheck.g:3561:2: ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) )
+            	    // InternalCheck.g:3561:3: ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3566:6: ( () ( ( ruleOpAdd ) ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3566:7: () ( ( ruleOpAdd ) )
+            	    // InternalCheck.g:3566:6: ( () ( ( ruleOpAdd ) ) )
+            	    // InternalCheck.g:3566:7: () ( ( ruleOpAdd ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3566:7: ()
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3567:5: 
+            	    // InternalCheck.g:3566:7: ()
+            	    // InternalCheck.g:3567:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -10301,11 +10301,11 @@ else if ( (LA68_0==72) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3572:2: ( ( ruleOpAdd ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3573:1: ( ruleOpAdd )
+            	    // InternalCheck.g:3572:2: ( ( ruleOpAdd ) )
+            	    // InternalCheck.g:3573:1: ( ruleOpAdd )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3573:1: ( ruleOpAdd )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3574:3: ruleOpAdd
+            	    // InternalCheck.g:3573:1: ( ruleOpAdd )
+            	    // InternalCheck.g:3574:3: ruleOpAdd
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -10319,7 +10319,7 @@ else if ( (LA68_0==72) ) {
             	      	        newCompositeNode(grammarAccess.getXAdditiveExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleOpAdd_in_ruleXAdditiveExpression8268);
+            	    pushFollow(FOLLOW_29);
             	    ruleOpAdd();
 
             	    state._fsp--;
@@ -10341,18 +10341,18 @@ else if ( (LA68_0==72) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3587:4: ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3588:1: (lv_rightOperand_3_0= ruleXMultiplicativeExpression )
+            	    // InternalCheck.g:3587:4: ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) )
+            	    // InternalCheck.g:3588:1: (lv_rightOperand_3_0= ruleXMultiplicativeExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3588:1: (lv_rightOperand_3_0= ruleXMultiplicativeExpression )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3589:3: lv_rightOperand_3_0= ruleXMultiplicativeExpression
+            	    // InternalCheck.g:3588:1: (lv_rightOperand_3_0= ruleXMultiplicativeExpression )
+            	    // InternalCheck.g:3589:3: lv_rightOperand_3_0= ruleXMultiplicativeExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXAdditiveExpressionAccess().getRightOperandXMultiplicativeExpressionParserRuleCall_1_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXMultiplicativeExpression_in_ruleXAdditiveExpression8291);
+            	    pushFollow(FOLLOW_66);
             	    lv_rightOperand_3_0=ruleXMultiplicativeExpression();
 
             	    state._fsp--;
@@ -10366,7 +10366,7 @@ else if ( (LA68_0==72) ) {
             	             			current, 
             	             			"rightOperand",
             	              		lv_rightOperand_3_0, 
-            	              		"XMultiplicativeExpression");
+            	              		"org.eclipse.xtext.xbase.Xbase.XMultiplicativeExpression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -10408,7 +10408,7 @@ else if ( (LA68_0==72) ) {
 
 
     // $ANTLR start "entryRuleOpAdd"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3613:1: entryRuleOpAdd returns [String current=null] : iv_ruleOpAdd= ruleOpAdd EOF ;
+    // InternalCheck.g:3613:1: entryRuleOpAdd returns [String current=null] : iv_ruleOpAdd= ruleOpAdd EOF ;
     public final String entryRuleOpAdd() throws RecognitionException {
         String current = null;
 
@@ -10416,13 +10416,13 @@ public final String entryRuleOpAdd() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3614:2: (iv_ruleOpAdd= ruleOpAdd EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3615:2: iv_ruleOpAdd= ruleOpAdd EOF
+            // InternalCheck.g:3614:2: (iv_ruleOpAdd= ruleOpAdd EOF )
+            // InternalCheck.g:3615:2: iv_ruleOpAdd= ruleOpAdd EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpAddRule()); 
             }
-            pushFollow(FOLLOW_ruleOpAdd_in_entryRuleOpAdd8330);
+            pushFollow(FOLLOW_1);
             iv_ruleOpAdd=ruleOpAdd();
 
             state._fsp--;
@@ -10430,7 +10430,7 @@ public final String entryRuleOpAdd() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpAdd.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpAdd8341); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -10448,7 +10448,7 @@ public final String entryRuleOpAdd() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpAdd"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3622:1: ruleOpAdd returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '+' | kw= '-' ) ;
+    // InternalCheck.g:3622:1: ruleOpAdd returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '+' | kw= '-' ) ;
     public final AntlrDatatypeRuleToken ruleOpAdd() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -10457,10 +10457,10 @@ public final AntlrDatatypeRuleToken ruleOpAdd() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3625:28: ( (kw= '+' | kw= '-' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3626:1: (kw= '+' | kw= '-' )
+            // InternalCheck.g:3625:28: ( (kw= '+' | kw= '-' ) )
+            // InternalCheck.g:3626:1: (kw= '+' | kw= '-' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3626:1: (kw= '+' | kw= '-' )
+            // InternalCheck.g:3626:1: (kw= '+' | kw= '-' )
             int alt69=2;
             int LA69_0 = input.LA(1);
 
@@ -10479,9 +10479,9 @@ else if ( (LA69_0==72) ) {
             }
             switch (alt69) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3627:2: kw= '+'
+                    // InternalCheck.g:3627:2: kw= '+'
                     {
-                    kw=(Token)match(input,71,FOLLOW_71_in_ruleOpAdd8379); if (state.failed) return current;
+                    kw=(Token)match(input,71,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -10492,9 +10492,9 @@ else if ( (LA69_0==72) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3634:2: kw= '-'
+                    // InternalCheck.g:3634:2: kw= '-'
                     {
-                    kw=(Token)match(input,72,FOLLOW_72_in_ruleOpAdd8398); if (state.failed) return current;
+                    kw=(Token)match(input,72,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -10527,7 +10527,7 @@ else if ( (LA69_0==72) ) {
 
 
     // $ANTLR start "entryRuleXMultiplicativeExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3647:1: entryRuleXMultiplicativeExpression returns [EObject current=null] : iv_ruleXMultiplicativeExpression= ruleXMultiplicativeExpression EOF ;
+    // InternalCheck.g:3647:1: entryRuleXMultiplicativeExpression returns [EObject current=null] : iv_ruleXMultiplicativeExpression= ruleXMultiplicativeExpression EOF ;
     public final EObject entryRuleXMultiplicativeExpression() throws RecognitionException {
         EObject current = null;
 
@@ -10535,13 +10535,13 @@ public final EObject entryRuleXMultiplicativeExpression() throws RecognitionExce
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3648:2: (iv_ruleXMultiplicativeExpression= ruleXMultiplicativeExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3649:2: iv_ruleXMultiplicativeExpression= ruleXMultiplicativeExpression EOF
+            // InternalCheck.g:3648:2: (iv_ruleXMultiplicativeExpression= ruleXMultiplicativeExpression EOF )
+            // InternalCheck.g:3649:2: iv_ruleXMultiplicativeExpression= ruleXMultiplicativeExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXMultiplicativeExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXMultiplicativeExpression_in_entryRuleXMultiplicativeExpression8438);
+            pushFollow(FOLLOW_1);
             iv_ruleXMultiplicativeExpression=ruleXMultiplicativeExpression();
 
             state._fsp--;
@@ -10549,7 +10549,7 @@ public final EObject entryRuleXMultiplicativeExpression() throws RecognitionExce
             if ( state.backtracking==0 ) {
                current =iv_ruleXMultiplicativeExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXMultiplicativeExpression8448); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -10567,7 +10567,7 @@ public final EObject entryRuleXMultiplicativeExpression() throws RecognitionExce
 
 
     // $ANTLR start "ruleXMultiplicativeExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3656:1: ruleXMultiplicativeExpression returns [EObject current=null] : (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* ) ;
+    // InternalCheck.g:3656:1: ruleXMultiplicativeExpression returns [EObject current=null] : (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* ) ;
     public final EObject ruleXMultiplicativeExpression() throws RecognitionException {
         EObject current = null;
 
@@ -10579,18 +10579,18 @@ public final EObject ruleXMultiplicativeExpression() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3659:28: ( (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3660:1: (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* )
+            // InternalCheck.g:3659:28: ( (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* ) )
+            // InternalCheck.g:3660:1: (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3660:1: (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3661:5: this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )*
+            // InternalCheck.g:3660:1: (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* )
+            // InternalCheck.g:3661:5: this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXMultiplicativeExpressionAccess().getXUnaryOperationParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleXUnaryOperation_in_ruleXMultiplicativeExpression8495);
+            pushFollow(FOLLOW_67);
             this_XUnaryOperation_0=ruleXUnaryOperation();
 
             state._fsp--;
@@ -10601,7 +10601,7 @@ public final EObject ruleXMultiplicativeExpression() throws RecognitionException
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3669:1: ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )*
+            // InternalCheck.g:3669:1: ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )*
             loop70:
             do {
                 int alt70=2;
@@ -10655,16 +10655,16 @@ public final EObject ruleXMultiplicativeExpression() throws RecognitionException
 
                 switch (alt70) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3669:2: ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) )
+            	    // InternalCheck.g:3669:2: ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3669:2: ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3669:3: ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) )
+            	    // InternalCheck.g:3669:2: ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) )
+            	    // InternalCheck.g:3669:3: ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3674:6: ( () ( ( ruleOpMulti ) ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3674:7: () ( ( ruleOpMulti ) )
+            	    // InternalCheck.g:3674:6: ( () ( ( ruleOpMulti ) ) )
+            	    // InternalCheck.g:3674:7: () ( ( ruleOpMulti ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3674:7: ()
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3675:5: 
+            	    // InternalCheck.g:3674:7: ()
+            	    // InternalCheck.g:3675:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -10676,11 +10676,11 @@ public final EObject ruleXMultiplicativeExpression() throws RecognitionException
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3680:2: ( ( ruleOpMulti ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3681:1: ( ruleOpMulti )
+            	    // InternalCheck.g:3680:2: ( ( ruleOpMulti ) )
+            	    // InternalCheck.g:3681:1: ( ruleOpMulti )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3681:1: ( ruleOpMulti )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3682:3: ruleOpMulti
+            	    // InternalCheck.g:3681:1: ( ruleOpMulti )
+            	    // InternalCheck.g:3682:3: ruleOpMulti
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -10694,7 +10694,7 @@ public final EObject ruleXMultiplicativeExpression() throws RecognitionException
             	      	        newCompositeNode(grammarAccess.getXMultiplicativeExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleOpMulti_in_ruleXMultiplicativeExpression8548);
+            	    pushFollow(FOLLOW_29);
             	    ruleOpMulti();
 
             	    state._fsp--;
@@ -10716,18 +10716,18 @@ public final EObject ruleXMultiplicativeExpression() throws RecognitionException
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3695:4: ( (lv_rightOperand_3_0= ruleXUnaryOperation ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3696:1: (lv_rightOperand_3_0= ruleXUnaryOperation )
+            	    // InternalCheck.g:3695:4: ( (lv_rightOperand_3_0= ruleXUnaryOperation ) )
+            	    // InternalCheck.g:3696:1: (lv_rightOperand_3_0= ruleXUnaryOperation )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3696:1: (lv_rightOperand_3_0= ruleXUnaryOperation )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3697:3: lv_rightOperand_3_0= ruleXUnaryOperation
+            	    // InternalCheck.g:3696:1: (lv_rightOperand_3_0= ruleXUnaryOperation )
+            	    // InternalCheck.g:3697:3: lv_rightOperand_3_0= ruleXUnaryOperation
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXMultiplicativeExpressionAccess().getRightOperandXUnaryOperationParserRuleCall_1_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXUnaryOperation_in_ruleXMultiplicativeExpression8571);
+            	    pushFollow(FOLLOW_67);
             	    lv_rightOperand_3_0=ruleXUnaryOperation();
 
             	    state._fsp--;
@@ -10741,7 +10741,7 @@ public final EObject ruleXMultiplicativeExpression() throws RecognitionException
             	             			current, 
             	             			"rightOperand",
             	              		lv_rightOperand_3_0, 
-            	              		"XUnaryOperation");
+            	              		"org.eclipse.xtext.xbase.Xbase.XUnaryOperation");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -10783,7 +10783,7 @@ public final EObject ruleXMultiplicativeExpression() throws RecognitionException
 
 
     // $ANTLR start "entryRuleOpMulti"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3721:1: entryRuleOpMulti returns [String current=null] : iv_ruleOpMulti= ruleOpMulti EOF ;
+    // InternalCheck.g:3721:1: entryRuleOpMulti returns [String current=null] : iv_ruleOpMulti= ruleOpMulti EOF ;
     public final String entryRuleOpMulti() throws RecognitionException {
         String current = null;
 
@@ -10791,13 +10791,13 @@ public final String entryRuleOpMulti() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3722:2: (iv_ruleOpMulti= ruleOpMulti EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3723:2: iv_ruleOpMulti= ruleOpMulti EOF
+            // InternalCheck.g:3722:2: (iv_ruleOpMulti= ruleOpMulti EOF )
+            // InternalCheck.g:3723:2: iv_ruleOpMulti= ruleOpMulti EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpMultiRule()); 
             }
-            pushFollow(FOLLOW_ruleOpMulti_in_entryRuleOpMulti8610);
+            pushFollow(FOLLOW_1);
             iv_ruleOpMulti=ruleOpMulti();
 
             state._fsp--;
@@ -10805,7 +10805,7 @@ public final String entryRuleOpMulti() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpMulti.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpMulti8621); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -10823,7 +10823,7 @@ public final String entryRuleOpMulti() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpMulti"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3730:1: ruleOpMulti returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '*' | kw= '**' | kw= '/' | kw= '%' ) ;
+    // InternalCheck.g:3730:1: ruleOpMulti returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '*' | kw= '**' | kw= '/' | kw= '%' ) ;
     public final AntlrDatatypeRuleToken ruleOpMulti() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -10832,10 +10832,10 @@ public final AntlrDatatypeRuleToken ruleOpMulti() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3733:28: ( (kw= '*' | kw= '**' | kw= '/' | kw= '%' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3734:1: (kw= '*' | kw= '**' | kw= '/' | kw= '%' )
+            // InternalCheck.g:3733:28: ( (kw= '*' | kw= '**' | kw= '/' | kw= '%' ) )
+            // InternalCheck.g:3734:1: (kw= '*' | kw= '**' | kw= '/' | kw= '%' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3734:1: (kw= '*' | kw= '**' | kw= '/' | kw= '%' )
+            // InternalCheck.g:3734:1: (kw= '*' | kw= '**' | kw= '/' | kw= '%' )
             int alt71=4;
             switch ( input.LA(1) ) {
             case 73:
@@ -10868,9 +10868,9 @@ public final AntlrDatatypeRuleToken ruleOpMulti() throws RecognitionException {
 
             switch (alt71) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3735:2: kw= '*'
+                    // InternalCheck.g:3735:2: kw= '*'
                     {
-                    kw=(Token)match(input,73,FOLLOW_73_in_ruleOpMulti8659); if (state.failed) return current;
+                    kw=(Token)match(input,73,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -10881,9 +10881,9 @@ public final AntlrDatatypeRuleToken ruleOpMulti() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3742:2: kw= '**'
+                    // InternalCheck.g:3742:2: kw= '**'
                     {
-                    kw=(Token)match(input,74,FOLLOW_74_in_ruleOpMulti8678); if (state.failed) return current;
+                    kw=(Token)match(input,74,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -10894,9 +10894,9 @@ public final AntlrDatatypeRuleToken ruleOpMulti() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3749:2: kw= '/'
+                    // InternalCheck.g:3749:2: kw= '/'
                     {
-                    kw=(Token)match(input,75,FOLLOW_75_in_ruleOpMulti8697); if (state.failed) return current;
+                    kw=(Token)match(input,75,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -10907,9 +10907,9 @@ public final AntlrDatatypeRuleToken ruleOpMulti() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3756:2: kw= '%'
+                    // InternalCheck.g:3756:2: kw= '%'
                     {
-                    kw=(Token)match(input,76,FOLLOW_76_in_ruleOpMulti8716); if (state.failed) return current;
+                    kw=(Token)match(input,76,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -10942,7 +10942,7 @@ public final AntlrDatatypeRuleToken ruleOpMulti() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXUnaryOperation"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3769:1: entryRuleXUnaryOperation returns [EObject current=null] : iv_ruleXUnaryOperation= ruleXUnaryOperation EOF ;
+    // InternalCheck.g:3769:1: entryRuleXUnaryOperation returns [EObject current=null] : iv_ruleXUnaryOperation= ruleXUnaryOperation EOF ;
     public final EObject entryRuleXUnaryOperation() throws RecognitionException {
         EObject current = null;
 
@@ -10950,13 +10950,13 @@ public final EObject entryRuleXUnaryOperation() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3770:2: (iv_ruleXUnaryOperation= ruleXUnaryOperation EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3771:2: iv_ruleXUnaryOperation= ruleXUnaryOperation EOF
+            // InternalCheck.g:3770:2: (iv_ruleXUnaryOperation= ruleXUnaryOperation EOF )
+            // InternalCheck.g:3771:2: iv_ruleXUnaryOperation= ruleXUnaryOperation EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXUnaryOperationRule()); 
             }
-            pushFollow(FOLLOW_ruleXUnaryOperation_in_entryRuleXUnaryOperation8756);
+            pushFollow(FOLLOW_1);
             iv_ruleXUnaryOperation=ruleXUnaryOperation();
 
             state._fsp--;
@@ -10964,7 +10964,7 @@ public final EObject entryRuleXUnaryOperation() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXUnaryOperation; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXUnaryOperation8766); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -10982,7 +10982,7 @@ public final EObject entryRuleXUnaryOperation() throws RecognitionException {
 
 
     // $ANTLR start "ruleXUnaryOperation"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3778:1: ruleXUnaryOperation returns [EObject current=null] : ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression ) ;
+    // InternalCheck.g:3778:1: ruleXUnaryOperation returns [EObject current=null] : ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression ) ;
     public final EObject ruleXUnaryOperation() throws RecognitionException {
         EObject current = null;
 
@@ -10994,10 +10994,10 @@ public final EObject ruleXUnaryOperation() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3781:28: ( ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3782:1: ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression )
+            // InternalCheck.g:3781:28: ( ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression ) )
+            // InternalCheck.g:3782:1: ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3782:1: ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression )
+            // InternalCheck.g:3782:1: ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression )
             int alt72=2;
             int LA72_0 = input.LA(1);
 
@@ -11016,13 +11016,13 @@ else if ( ((LA72_0>=RULE_STRING && LA72_0<=RULE_ID)||(LA72_0>=15 && LA72_0<=18)|
             }
             switch (alt72) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3782:2: ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) )
+                    // InternalCheck.g:3782:2: ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3782:2: ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3782:3: () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) )
+                    // InternalCheck.g:3782:2: ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) )
+                    // InternalCheck.g:3782:3: () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3782:3: ()
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3783:5: 
+                    // InternalCheck.g:3782:3: ()
+                    // InternalCheck.g:3783:5: 
                     {
                     if ( state.backtracking==0 ) {
 
@@ -11034,11 +11034,11 @@ else if ( ((LA72_0>=RULE_STRING && LA72_0<=RULE_ID)||(LA72_0>=15 && LA72_0<=18)|
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3788:2: ( ( ruleOpUnary ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3789:1: ( ruleOpUnary )
+                    // InternalCheck.g:3788:2: ( ( ruleOpUnary ) )
+                    // InternalCheck.g:3789:1: ( ruleOpUnary )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3789:1: ( ruleOpUnary )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3790:3: ruleOpUnary
+                    // InternalCheck.g:3789:1: ( ruleOpUnary )
+                    // InternalCheck.g:3790:3: ruleOpUnary
                     {
                     if ( state.backtracking==0 ) {
 
@@ -11052,7 +11052,7 @@ else if ( ((LA72_0>=RULE_STRING && LA72_0<=RULE_ID)||(LA72_0>=15 && LA72_0<=18)|
                       	        newCompositeNode(grammarAccess.getXUnaryOperationAccess().getFeatureJvmIdentifiableElementCrossReference_0_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleOpUnary_in_ruleXUnaryOperation8824);
+                    pushFollow(FOLLOW_29);
                     ruleOpUnary();
 
                     state._fsp--;
@@ -11068,18 +11068,18 @@ else if ( ((LA72_0>=RULE_STRING && LA72_0<=RULE_ID)||(LA72_0>=15 && LA72_0<=18)|
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3803:2: ( (lv_operand_2_0= ruleXUnaryOperation ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3804:1: (lv_operand_2_0= ruleXUnaryOperation )
+                    // InternalCheck.g:3803:2: ( (lv_operand_2_0= ruleXUnaryOperation ) )
+                    // InternalCheck.g:3804:1: (lv_operand_2_0= ruleXUnaryOperation )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3804:1: (lv_operand_2_0= ruleXUnaryOperation )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3805:3: lv_operand_2_0= ruleXUnaryOperation
+                    // InternalCheck.g:3804:1: (lv_operand_2_0= ruleXUnaryOperation )
+                    // InternalCheck.g:3805:3: lv_operand_2_0= ruleXUnaryOperation
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXUnaryOperationAccess().getOperandXUnaryOperationParserRuleCall_0_2_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXUnaryOperation_in_ruleXUnaryOperation8845);
+                    pushFollow(FOLLOW_2);
                     lv_operand_2_0=ruleXUnaryOperation();
 
                     state._fsp--;
@@ -11093,7 +11093,7 @@ else if ( ((LA72_0>=RULE_STRING && LA72_0<=RULE_ID)||(LA72_0>=15 && LA72_0<=18)|
                              			current, 
                              			"operand",
                               		lv_operand_2_0, 
-                              		"XUnaryOperation");
+                              		"org.eclipse.xtext.xbase.Xbase.XUnaryOperation");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -11110,14 +11110,14 @@ else if ( ((LA72_0>=RULE_STRING && LA72_0<=RULE_ID)||(LA72_0>=15 && LA72_0<=18)|
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3823:5: this_XCastedExpression_3= ruleXCastedExpression
+                    // InternalCheck.g:3823:5: this_XCastedExpression_3= ruleXCastedExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXUnaryOperationAccess().getXCastedExpressionParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXCastedExpression_in_ruleXUnaryOperation8874);
+                    pushFollow(FOLLOW_2);
                     this_XCastedExpression_3=ruleXCastedExpression();
 
                     state._fsp--;
@@ -11154,7 +11154,7 @@ else if ( ((LA72_0>=RULE_STRING && LA72_0<=RULE_ID)||(LA72_0>=15 && LA72_0<=18)|
 
 
     // $ANTLR start "entryRuleOpUnary"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3839:1: entryRuleOpUnary returns [String current=null] : iv_ruleOpUnary= ruleOpUnary EOF ;
+    // InternalCheck.g:3839:1: entryRuleOpUnary returns [String current=null] : iv_ruleOpUnary= ruleOpUnary EOF ;
     public final String entryRuleOpUnary() throws RecognitionException {
         String current = null;
 
@@ -11162,13 +11162,13 @@ public final String entryRuleOpUnary() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3840:2: (iv_ruleOpUnary= ruleOpUnary EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3841:2: iv_ruleOpUnary= ruleOpUnary EOF
+            // InternalCheck.g:3840:2: (iv_ruleOpUnary= ruleOpUnary EOF )
+            // InternalCheck.g:3841:2: iv_ruleOpUnary= ruleOpUnary EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpUnaryRule()); 
             }
-            pushFollow(FOLLOW_ruleOpUnary_in_entryRuleOpUnary8910);
+            pushFollow(FOLLOW_1);
             iv_ruleOpUnary=ruleOpUnary();
 
             state._fsp--;
@@ -11176,7 +11176,7 @@ public final String entryRuleOpUnary() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpUnary.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpUnary8921); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -11194,7 +11194,7 @@ public final String entryRuleOpUnary() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpUnary"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3848:1: ruleOpUnary returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '!' | kw= '-' | kw= '+' ) ;
+    // InternalCheck.g:3848:1: ruleOpUnary returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '!' | kw= '-' | kw= '+' ) ;
     public final AntlrDatatypeRuleToken ruleOpUnary() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -11203,10 +11203,10 @@ public final AntlrDatatypeRuleToken ruleOpUnary() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3851:28: ( (kw= '!' | kw= '-' | kw= '+' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3852:1: (kw= '!' | kw= '-' | kw= '+' )
+            // InternalCheck.g:3851:28: ( (kw= '!' | kw= '-' | kw= '+' ) )
+            // InternalCheck.g:3852:1: (kw= '!' | kw= '-' | kw= '+' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3852:1: (kw= '!' | kw= '-' | kw= '+' )
+            // InternalCheck.g:3852:1: (kw= '!' | kw= '-' | kw= '+' )
             int alt73=3;
             switch ( input.LA(1) ) {
             case 77:
@@ -11234,9 +11234,9 @@ public final AntlrDatatypeRuleToken ruleOpUnary() throws RecognitionException {
 
             switch (alt73) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3853:2: kw= '!'
+                    // InternalCheck.g:3853:2: kw= '!'
                     {
-                    kw=(Token)match(input,77,FOLLOW_77_in_ruleOpUnary8959); if (state.failed) return current;
+                    kw=(Token)match(input,77,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -11247,9 +11247,9 @@ public final AntlrDatatypeRuleToken ruleOpUnary() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3860:2: kw= '-'
+                    // InternalCheck.g:3860:2: kw= '-'
                     {
-                    kw=(Token)match(input,72,FOLLOW_72_in_ruleOpUnary8978); if (state.failed) return current;
+                    kw=(Token)match(input,72,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -11260,9 +11260,9 @@ public final AntlrDatatypeRuleToken ruleOpUnary() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3867:2: kw= '+'
+                    // InternalCheck.g:3867:2: kw= '+'
                     {
-                    kw=(Token)match(input,71,FOLLOW_71_in_ruleOpUnary8997); if (state.failed) return current;
+                    kw=(Token)match(input,71,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -11295,7 +11295,7 @@ public final AntlrDatatypeRuleToken ruleOpUnary() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXCastedExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3880:1: entryRuleXCastedExpression returns [EObject current=null] : iv_ruleXCastedExpression= ruleXCastedExpression EOF ;
+    // InternalCheck.g:3880:1: entryRuleXCastedExpression returns [EObject current=null] : iv_ruleXCastedExpression= ruleXCastedExpression EOF ;
     public final EObject entryRuleXCastedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -11303,13 +11303,13 @@ public final EObject entryRuleXCastedExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3881:2: (iv_ruleXCastedExpression= ruleXCastedExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3882:2: iv_ruleXCastedExpression= ruleXCastedExpression EOF
+            // InternalCheck.g:3881:2: (iv_ruleXCastedExpression= ruleXCastedExpression EOF )
+            // InternalCheck.g:3882:2: iv_ruleXCastedExpression= ruleXCastedExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXCastedExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXCastedExpression_in_entryRuleXCastedExpression9037);
+            pushFollow(FOLLOW_1);
             iv_ruleXCastedExpression=ruleXCastedExpression();
 
             state._fsp--;
@@ -11317,7 +11317,7 @@ public final EObject entryRuleXCastedExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXCastedExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXCastedExpression9047); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -11335,7 +11335,7 @@ public final EObject entryRuleXCastedExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXCastedExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3889:1: ruleXCastedExpression returns [EObject current=null] : (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* ) ;
+    // InternalCheck.g:3889:1: ruleXCastedExpression returns [EObject current=null] : (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* ) ;
     public final EObject ruleXCastedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -11348,18 +11348,18 @@ public final EObject ruleXCastedExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3892:28: ( (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3893:1: (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* )
+            // InternalCheck.g:3892:28: ( (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* ) )
+            // InternalCheck.g:3893:1: (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3893:1: (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3894:5: this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )*
+            // InternalCheck.g:3893:1: (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* )
+            // InternalCheck.g:3894:5: this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXCastedExpressionAccess().getXPostfixOperationParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleXPostfixOperation_in_ruleXCastedExpression9094);
+            pushFollow(FOLLOW_68);
             this_XPostfixOperation_0=ruleXPostfixOperation();
 
             state._fsp--;
@@ -11370,7 +11370,7 @@ public final EObject ruleXCastedExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3902:1: ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )*
+            // InternalCheck.g:3902:1: ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )*
             loop74:
             do {
                 int alt74=2;
@@ -11389,16 +11389,16 @@ public final EObject ruleXCastedExpression() throws RecognitionException {
 
                 switch (alt74) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3902:2: ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) )
+            	    // InternalCheck.g:3902:2: ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3902:2: ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3902:3: ( ( () 'as' ) )=> ( () otherlv_2= 'as' )
+            	    // InternalCheck.g:3902:2: ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) )
+            	    // InternalCheck.g:3902:3: ( ( () 'as' ) )=> ( () otherlv_2= 'as' )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3904:5: ( () otherlv_2= 'as' )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3904:6: () otherlv_2= 'as'
+            	    // InternalCheck.g:3904:5: ( () otherlv_2= 'as' )
+            	    // InternalCheck.g:3904:6: () otherlv_2= 'as'
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3904:6: ()
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3905:5: 
+            	    // InternalCheck.g:3904:6: ()
+            	    // InternalCheck.g:3905:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -11410,7 +11410,7 @@ public final EObject ruleXCastedExpression() throws RecognitionException {
 
             	    }
 
-            	    otherlv_2=(Token)match(input,78,FOLLOW_78_in_ruleXCastedExpression9129); if (state.failed) return current;
+            	    otherlv_2=(Token)match(input,78,FOLLOW_27); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_2, grammarAccess.getXCastedExpressionAccess().getAsKeyword_1_0_0_1());
@@ -11422,18 +11422,18 @@ public final EObject ruleXCastedExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3914:3: ( (lv_type_3_0= ruleJvmTypeReference ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3915:1: (lv_type_3_0= ruleJvmTypeReference )
+            	    // InternalCheck.g:3914:3: ( (lv_type_3_0= ruleJvmTypeReference ) )
+            	    // InternalCheck.g:3915:1: (lv_type_3_0= ruleJvmTypeReference )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3915:1: (lv_type_3_0= ruleJvmTypeReference )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3916:3: lv_type_3_0= ruleJvmTypeReference
+            	    // InternalCheck.g:3915:1: (lv_type_3_0= ruleJvmTypeReference )
+            	    // InternalCheck.g:3916:3: lv_type_3_0= ruleJvmTypeReference
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXCastedExpressionAccess().getTypeJvmTypeReferenceParserRuleCall_1_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleXCastedExpression9152);
+            	    pushFollow(FOLLOW_68);
             	    lv_type_3_0=ruleJvmTypeReference();
 
             	    state._fsp--;
@@ -11447,7 +11447,7 @@ public final EObject ruleXCastedExpression() throws RecognitionException {
             	             			current, 
             	             			"type",
             	              		lv_type_3_0, 
-            	              		"JvmTypeReference");
+            	              		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -11489,7 +11489,7 @@ public final EObject ruleXCastedExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXPostfixOperation"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3940:1: entryRuleXPostfixOperation returns [EObject current=null] : iv_ruleXPostfixOperation= ruleXPostfixOperation EOF ;
+    // InternalCheck.g:3940:1: entryRuleXPostfixOperation returns [EObject current=null] : iv_ruleXPostfixOperation= ruleXPostfixOperation EOF ;
     public final EObject entryRuleXPostfixOperation() throws RecognitionException {
         EObject current = null;
 
@@ -11497,13 +11497,13 @@ public final EObject entryRuleXPostfixOperation() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3941:2: (iv_ruleXPostfixOperation= ruleXPostfixOperation EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3942:2: iv_ruleXPostfixOperation= ruleXPostfixOperation EOF
+            // InternalCheck.g:3941:2: (iv_ruleXPostfixOperation= ruleXPostfixOperation EOF )
+            // InternalCheck.g:3942:2: iv_ruleXPostfixOperation= ruleXPostfixOperation EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXPostfixOperationRule()); 
             }
-            pushFollow(FOLLOW_ruleXPostfixOperation_in_entryRuleXPostfixOperation9190);
+            pushFollow(FOLLOW_1);
             iv_ruleXPostfixOperation=ruleXPostfixOperation();
 
             state._fsp--;
@@ -11511,7 +11511,7 @@ public final EObject entryRuleXPostfixOperation() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXPostfixOperation; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXPostfixOperation9200); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -11529,7 +11529,7 @@ public final EObject entryRuleXPostfixOperation() throws RecognitionException {
 
 
     // $ANTLR start "ruleXPostfixOperation"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3949:1: ruleXPostfixOperation returns [EObject current=null] : (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? ) ;
+    // InternalCheck.g:3949:1: ruleXPostfixOperation returns [EObject current=null] : (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? ) ;
     public final EObject ruleXPostfixOperation() throws RecognitionException {
         EObject current = null;
 
@@ -11539,18 +11539,18 @@ public final EObject ruleXPostfixOperation() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3952:28: ( (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3953:1: (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? )
+            // InternalCheck.g:3952:28: ( (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? ) )
+            // InternalCheck.g:3953:1: (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3953:1: (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3954:5: this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )?
+            // InternalCheck.g:3953:1: (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? )
+            // InternalCheck.g:3954:5: this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )?
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXPostfixOperationAccess().getXMemberFeatureCallParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleXMemberFeatureCall_in_ruleXPostfixOperation9247);
+            pushFollow(FOLLOW_69);
             this_XMemberFeatureCall_0=ruleXMemberFeatureCall();
 
             state._fsp--;
@@ -11561,7 +11561,7 @@ public final EObject ruleXPostfixOperation() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3962:1: ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )?
+            // InternalCheck.g:3962:1: ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )?
             int alt75=2;
             int LA75_0 = input.LA(1);
 
@@ -11581,13 +11581,13 @@ else if ( (LA75_0==80) ) {
             }
             switch (alt75) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3962:2: ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) )
+                    // InternalCheck.g:3962:2: ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3967:6: ( () ( ( ruleOpPostfix ) ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3967:7: () ( ( ruleOpPostfix ) )
+                    // InternalCheck.g:3967:6: ( () ( ( ruleOpPostfix ) ) )
+                    // InternalCheck.g:3967:7: () ( ( ruleOpPostfix ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3967:7: ()
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3968:5: 
+                    // InternalCheck.g:3967:7: ()
+                    // InternalCheck.g:3968:5: 
                     {
                     if ( state.backtracking==0 ) {
 
@@ -11599,11 +11599,11 @@ else if ( (LA75_0==80) ) {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3973:2: ( ( ruleOpPostfix ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3974:1: ( ruleOpPostfix )
+                    // InternalCheck.g:3973:2: ( ( ruleOpPostfix ) )
+                    // InternalCheck.g:3974:1: ( ruleOpPostfix )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3974:1: ( ruleOpPostfix )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3975:3: ruleOpPostfix
+                    // InternalCheck.g:3974:1: ( ruleOpPostfix )
+                    // InternalCheck.g:3975:3: ruleOpPostfix
                     {
                     if ( state.backtracking==0 ) {
 
@@ -11617,7 +11617,7 @@ else if ( (LA75_0==80) ) {
                       	        newCompositeNode(grammarAccess.getXPostfixOperationAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleOpPostfix_in_ruleXPostfixOperation9299);
+                    pushFollow(FOLLOW_2);
                     ruleOpPostfix();
 
                     state._fsp--;
@@ -11665,7 +11665,7 @@ else if ( (LA75_0==80) ) {
 
 
     // $ANTLR start "entryRuleOpPostfix"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3996:1: entryRuleOpPostfix returns [String current=null] : iv_ruleOpPostfix= ruleOpPostfix EOF ;
+    // InternalCheck.g:3996:1: entryRuleOpPostfix returns [String current=null] : iv_ruleOpPostfix= ruleOpPostfix EOF ;
     public final String entryRuleOpPostfix() throws RecognitionException {
         String current = null;
 
@@ -11673,13 +11673,13 @@ public final String entryRuleOpPostfix() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3997:2: (iv_ruleOpPostfix= ruleOpPostfix EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3998:2: iv_ruleOpPostfix= ruleOpPostfix EOF
+            // InternalCheck.g:3997:2: (iv_ruleOpPostfix= ruleOpPostfix EOF )
+            // InternalCheck.g:3998:2: iv_ruleOpPostfix= ruleOpPostfix EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpPostfixRule()); 
             }
-            pushFollow(FOLLOW_ruleOpPostfix_in_entryRuleOpPostfix9339);
+            pushFollow(FOLLOW_1);
             iv_ruleOpPostfix=ruleOpPostfix();
 
             state._fsp--;
@@ -11687,7 +11687,7 @@ public final String entryRuleOpPostfix() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpPostfix.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpPostfix9350); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -11705,7 +11705,7 @@ public final String entryRuleOpPostfix() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpPostfix"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4005:1: ruleOpPostfix returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '++' | kw= '--' ) ;
+    // InternalCheck.g:4005:1: ruleOpPostfix returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '++' | kw= '--' ) ;
     public final AntlrDatatypeRuleToken ruleOpPostfix() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -11714,10 +11714,10 @@ public final AntlrDatatypeRuleToken ruleOpPostfix() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4008:28: ( (kw= '++' | kw= '--' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4009:1: (kw= '++' | kw= '--' )
+            // InternalCheck.g:4008:28: ( (kw= '++' | kw= '--' ) )
+            // InternalCheck.g:4009:1: (kw= '++' | kw= '--' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4009:1: (kw= '++' | kw= '--' )
+            // InternalCheck.g:4009:1: (kw= '++' | kw= '--' )
             int alt76=2;
             int LA76_0 = input.LA(1);
 
@@ -11736,9 +11736,9 @@ else if ( (LA76_0==80) ) {
             }
             switch (alt76) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4010:2: kw= '++'
+                    // InternalCheck.g:4010:2: kw= '++'
                     {
-                    kw=(Token)match(input,79,FOLLOW_79_in_ruleOpPostfix9388); if (state.failed) return current;
+                    kw=(Token)match(input,79,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -11749,9 +11749,9 @@ else if ( (LA76_0==80) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4017:2: kw= '--'
+                    // InternalCheck.g:4017:2: kw= '--'
                     {
-                    kw=(Token)match(input,80,FOLLOW_80_in_ruleOpPostfix9407); if (state.failed) return current;
+                    kw=(Token)match(input,80,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -11784,7 +11784,7 @@ else if ( (LA76_0==80) ) {
 
 
     // $ANTLR start "entryRuleXMemberFeatureCall"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4030:1: entryRuleXMemberFeatureCall returns [EObject current=null] : iv_ruleXMemberFeatureCall= ruleXMemberFeatureCall EOF ;
+    // InternalCheck.g:4030:1: entryRuleXMemberFeatureCall returns [EObject current=null] : iv_ruleXMemberFeatureCall= ruleXMemberFeatureCall EOF ;
     public final EObject entryRuleXMemberFeatureCall() throws RecognitionException {
         EObject current = null;
 
@@ -11792,13 +11792,13 @@ public final EObject entryRuleXMemberFeatureCall() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4031:2: (iv_ruleXMemberFeatureCall= ruleXMemberFeatureCall EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4032:2: iv_ruleXMemberFeatureCall= ruleXMemberFeatureCall EOF
+            // InternalCheck.g:4031:2: (iv_ruleXMemberFeatureCall= ruleXMemberFeatureCall EOF )
+            // InternalCheck.g:4032:2: iv_ruleXMemberFeatureCall= ruleXMemberFeatureCall EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXMemberFeatureCallRule()); 
             }
-            pushFollow(FOLLOW_ruleXMemberFeatureCall_in_entryRuleXMemberFeatureCall9447);
+            pushFollow(FOLLOW_1);
             iv_ruleXMemberFeatureCall=ruleXMemberFeatureCall();
 
             state._fsp--;
@@ -11806,7 +11806,7 @@ public final EObject entryRuleXMemberFeatureCall() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXMemberFeatureCall; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXMemberFeatureCall9457); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -11824,7 +11824,7 @@ public final EObject entryRuleXMemberFeatureCall() throws RecognitionException {
 
 
     // $ANTLR start "ruleXMemberFeatureCall"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4039:1: ruleXMemberFeatureCall returns [EObject current=null] : (this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )* ) ;
+    // InternalCheck.g:4039:1: ruleXMemberFeatureCall returns [EObject current=null] : (this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )* ) ;
     public final EObject ruleXMemberFeatureCall() throws RecognitionException {
         EObject current = null;
 
@@ -11859,18 +11859,18 @@ public final EObject ruleXMemberFeatureCall() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4042:28: ( (this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )* ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4043:1: (this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )* )
+            // InternalCheck.g:4042:28: ( (this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )* ) )
+            // InternalCheck.g:4043:1: (this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )* )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4043:1: (this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )* )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4044:5: this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )*
+            // InternalCheck.g:4043:1: (this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )* )
+            // InternalCheck.g:4044:5: this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getXPrimaryExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleXPrimaryExpression_in_ruleXMemberFeatureCall9504);
+            pushFollow(FOLLOW_70);
             this_XPrimaryExpression_0=ruleXPrimaryExpression();
 
             state._fsp--;
@@ -11881,7 +11881,7 @@ public final EObject ruleXMemberFeatureCall() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4052:1: ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )*
+            // InternalCheck.g:4052:1: ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )*
             loop85:
             do {
                 int alt85=3;
@@ -11930,19 +11930,19 @@ else if ( (synpred35_InternalCheck()) ) {
 
                 switch (alt85) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4052:2: ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) )
+            	    // InternalCheck.g:4052:2: ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4052:2: ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4052:3: ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) )
+            	    // InternalCheck.g:4052:2: ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) )
+            	    // InternalCheck.g:4052:3: ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4052:3: ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4052:4: ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
+            	    // InternalCheck.g:4052:3: ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )
+            	    // InternalCheck.g:4052:4: ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4065:25: ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4065:26: () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign
+            	    // InternalCheck.g:4065:25: ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
+            	    // InternalCheck.g:4065:26: () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4065:26: ()
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4066:5: 
+            	    // InternalCheck.g:4065:26: ()
+            	    // InternalCheck.g:4066:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -11954,7 +11954,7 @@ else if ( (synpred35_InternalCheck()) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4071:2: (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) )
+            	    // InternalCheck.g:4071:2: (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) )
             	    int alt77=2;
             	    int LA77_0 = input.LA(1);
 
@@ -11973,9 +11973,9 @@ else if ( (LA77_0==82) ) {
             	    }
             	    switch (alt77) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4071:4: otherlv_2= '.'
+            	            // InternalCheck.g:4071:4: otherlv_2= '.'
             	            {
-            	            otherlv_2=(Token)match(input,81,FOLLOW_81_in_ruleXMemberFeatureCall9576); if (state.failed) return current;
+            	            otherlv_2=(Token)match(input,81,FOLLOW_44); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                  	newLeafNode(otherlv_2, grammarAccess.getXMemberFeatureCallAccess().getFullStopKeyword_1_0_0_0_1_0());
@@ -11985,15 +11985,15 @@ else if ( (LA77_0==82) ) {
             	            }
             	            break;
             	        case 2 :
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4076:6: ( (lv_explicitStatic_3_0= '::' ) )
+            	            // InternalCheck.g:4076:6: ( (lv_explicitStatic_3_0= '::' ) )
             	            {
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4076:6: ( (lv_explicitStatic_3_0= '::' ) )
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4077:1: (lv_explicitStatic_3_0= '::' )
+            	            // InternalCheck.g:4076:6: ( (lv_explicitStatic_3_0= '::' ) )
+            	            // InternalCheck.g:4077:1: (lv_explicitStatic_3_0= '::' )
             	            {
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4077:1: (lv_explicitStatic_3_0= '::' )
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4078:3: lv_explicitStatic_3_0= '::'
+            	            // InternalCheck.g:4077:1: (lv_explicitStatic_3_0= '::' )
+            	            // InternalCheck.g:4078:3: lv_explicitStatic_3_0= '::'
             	            {
-            	            lv_explicitStatic_3_0=(Token)match(input,82,FOLLOW_82_in_ruleXMemberFeatureCall9600); if (state.failed) return current;
+            	            lv_explicitStatic_3_0=(Token)match(input,82,FOLLOW_44); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_explicitStatic_3_0, grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_0_0_0_1_1_0());
@@ -12019,11 +12019,11 @@ else if ( (LA77_0==82) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4091:3: ( ( ruleFeatureCallID ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4092:1: ( ruleFeatureCallID )
+            	    // InternalCheck.g:4091:3: ( ( ruleFeatureCallID ) )
+            	    // InternalCheck.g:4092:1: ( ruleFeatureCallID )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4092:1: ( ruleFeatureCallID )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4093:3: ruleFeatureCallID
+            	    // InternalCheck.g:4092:1: ( ruleFeatureCallID )
+            	    // InternalCheck.g:4093:3: ruleFeatureCallID
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -12037,7 +12037,7 @@ else if ( (LA77_0==82) ) {
             	      	        newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_0_2_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleFeatureCallID_in_ruleXMemberFeatureCall9637);
+            	    pushFollow(FOLLOW_32);
             	    ruleFeatureCallID();
 
             	    state._fsp--;
@@ -12058,7 +12058,7 @@ else if ( (LA77_0==82) ) {
             	              newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getOpSingleAssignParserRuleCall_1_0_0_0_3()); 
             	          
             	    }
-            	    pushFollow(FOLLOW_ruleOpSingleAssign_in_ruleXMemberFeatureCall9653);
+            	    pushFollow(FOLLOW_29);
             	    ruleOpSingleAssign();
 
             	    state._fsp--;
@@ -12074,18 +12074,18 @@ else if ( (LA77_0==82) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4114:3: ( (lv_value_6_0= ruleXAssignment ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4115:1: (lv_value_6_0= ruleXAssignment )
+            	    // InternalCheck.g:4114:3: ( (lv_value_6_0= ruleXAssignment ) )
+            	    // InternalCheck.g:4115:1: (lv_value_6_0= ruleXAssignment )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4115:1: (lv_value_6_0= ruleXAssignment )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4116:3: lv_value_6_0= ruleXAssignment
+            	    // InternalCheck.g:4115:1: (lv_value_6_0= ruleXAssignment )
+            	    // InternalCheck.g:4116:3: lv_value_6_0= ruleXAssignment
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getValueXAssignmentParserRuleCall_1_0_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXAssignment_in_ruleXMemberFeatureCall9675);
+            	    pushFollow(FOLLOW_70);
             	    lv_value_6_0=ruleXAssignment();
 
             	    state._fsp--;
@@ -12099,7 +12099,7 @@ else if ( (LA77_0==82) ) {
             	             			current, 
             	             			"value",
             	              		lv_value_6_0, 
-            	              		"XAssignment");
+            	              		"org.eclipse.xtext.xbase.Xbase.XAssignment");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -12116,19 +12116,19 @@ else if ( (LA77_0==82) ) {
             	    }
             	    break;
             	case 2 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4133:6: ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? )
+            	    // InternalCheck.g:4133:6: ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4133:6: ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4133:7: ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )?
+            	    // InternalCheck.g:4133:6: ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? )
+            	    // InternalCheck.g:4133:7: ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )?
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4133:7: ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4133:8: ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) )
+            	    // InternalCheck.g:4133:7: ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) )
+            	    // InternalCheck.g:4133:8: ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4149:7: ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4149:8: () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) )
+            	    // InternalCheck.g:4149:7: ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) )
+            	    // InternalCheck.g:4149:8: () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4149:8: ()
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4150:5: 
+            	    // InternalCheck.g:4149:8: ()
+            	    // InternalCheck.g:4150:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -12140,7 +12140,7 @@ else if ( (LA77_0==82) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4155:2: (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) )
+            	    // InternalCheck.g:4155:2: (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) )
             	    int alt78=3;
             	    switch ( input.LA(1) ) {
             	    case 81:
@@ -12168,9 +12168,9 @@ else if ( (LA77_0==82) ) {
 
             	    switch (alt78) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4155:4: otherlv_8= '.'
+            	            // InternalCheck.g:4155:4: otherlv_8= '.'
             	            {
-            	            otherlv_8=(Token)match(input,81,FOLLOW_81_in_ruleXMemberFeatureCall9761); if (state.failed) return current;
+            	            otherlv_8=(Token)match(input,81,FOLLOW_71); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                  	newLeafNode(otherlv_8, grammarAccess.getXMemberFeatureCallAccess().getFullStopKeyword_1_1_0_0_1_0());
@@ -12180,15 +12180,15 @@ else if ( (LA77_0==82) ) {
             	            }
             	            break;
             	        case 2 :
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4160:6: ( (lv_nullSafe_9_0= '?.' ) )
+            	            // InternalCheck.g:4160:6: ( (lv_nullSafe_9_0= '?.' ) )
             	            {
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4160:6: ( (lv_nullSafe_9_0= '?.' ) )
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4161:1: (lv_nullSafe_9_0= '?.' )
+            	            // InternalCheck.g:4160:6: ( (lv_nullSafe_9_0= '?.' ) )
+            	            // InternalCheck.g:4161:1: (lv_nullSafe_9_0= '?.' )
             	            {
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4161:1: (lv_nullSafe_9_0= '?.' )
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4162:3: lv_nullSafe_9_0= '?.'
+            	            // InternalCheck.g:4161:1: (lv_nullSafe_9_0= '?.' )
+            	            // InternalCheck.g:4162:3: lv_nullSafe_9_0= '?.'
             	            {
-            	            lv_nullSafe_9_0=(Token)match(input,83,FOLLOW_83_in_ruleXMemberFeatureCall9785); if (state.failed) return current;
+            	            lv_nullSafe_9_0=(Token)match(input,83,FOLLOW_71); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_nullSafe_9_0, grammarAccess.getXMemberFeatureCallAccess().getNullSafeQuestionMarkFullStopKeyword_1_1_0_0_1_1_0());
@@ -12212,15 +12212,15 @@ else if ( (LA77_0==82) ) {
             	            }
             	            break;
             	        case 3 :
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4176:6: ( (lv_explicitStatic_10_0= '::' ) )
+            	            // InternalCheck.g:4176:6: ( (lv_explicitStatic_10_0= '::' ) )
             	            {
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4176:6: ( (lv_explicitStatic_10_0= '::' ) )
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4177:1: (lv_explicitStatic_10_0= '::' )
+            	            // InternalCheck.g:4176:6: ( (lv_explicitStatic_10_0= '::' ) )
+            	            // InternalCheck.g:4177:1: (lv_explicitStatic_10_0= '::' )
             	            {
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4177:1: (lv_explicitStatic_10_0= '::' )
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4178:3: lv_explicitStatic_10_0= '::'
+            	            // InternalCheck.g:4177:1: (lv_explicitStatic_10_0= '::' )
+            	            // InternalCheck.g:4178:3: lv_explicitStatic_10_0= '::'
             	            {
-            	            lv_explicitStatic_10_0=(Token)match(input,82,FOLLOW_82_in_ruleXMemberFeatureCall9822); if (state.failed) return current;
+            	            lv_explicitStatic_10_0=(Token)match(input,82,FOLLOW_71); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_explicitStatic_10_0, grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_1_0_0_1_2_0());
@@ -12252,7 +12252,7 @@ else if ( (LA77_0==82) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4191:5: (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )?
+            	    // InternalCheck.g:4191:5: (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )?
             	    int alt80=2;
             	    int LA80_0 = input.LA(1);
 
@@ -12261,26 +12261,26 @@ else if ( (LA77_0==82) ) {
             	    }
             	    switch (alt80) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4191:7: otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>'
+            	            // InternalCheck.g:4191:7: otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>'
             	            {
-            	            otherlv_11=(Token)match(input,56,FOLLOW_56_in_ruleXMemberFeatureCall9851); if (state.failed) return current;
+            	            otherlv_11=(Token)match(input,56,FOLLOW_72); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                  	newLeafNode(otherlv_11, grammarAccess.getXMemberFeatureCallAccess().getLessThanSignKeyword_1_1_1_0());
             	                  
             	            }
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4195:1: ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) )
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4196:1: (lv_typeArguments_12_0= ruleJvmArgumentTypeReference )
+            	            // InternalCheck.g:4195:1: ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) )
+            	            // InternalCheck.g:4196:1: (lv_typeArguments_12_0= ruleJvmArgumentTypeReference )
             	            {
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4196:1: (lv_typeArguments_12_0= ruleJvmArgumentTypeReference )
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4197:3: lv_typeArguments_12_0= ruleJvmArgumentTypeReference
+            	            // InternalCheck.g:4196:1: (lv_typeArguments_12_0= ruleJvmArgumentTypeReference )
+            	            // InternalCheck.g:4197:3: lv_typeArguments_12_0= ruleJvmArgumentTypeReference
             	            {
             	            if ( state.backtracking==0 ) {
             	               
             	              	        newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_1_1_0()); 
             	              	    
             	            }
-            	            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleXMemberFeatureCall9872);
+            	            pushFollow(FOLLOW_73);
             	            lv_typeArguments_12_0=ruleJvmArgumentTypeReference();
 
             	            state._fsp--;
@@ -12294,7 +12294,7 @@ else if ( (LA77_0==82) ) {
             	                     			current, 
             	                     			"typeArguments",
             	                      		lv_typeArguments_12_0, 
-            	                      		"JvmArgumentTypeReference");
+            	                      		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
             	              	        afterParserOrEnumRuleCall();
             	              	    
             	            }
@@ -12304,7 +12304,7 @@ else if ( (LA77_0==82) ) {
 
             	            }
 
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4213:2: (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )*
+            	            // InternalCheck.g:4213:2: (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )*
             	            loop79:
             	            do {
             	                int alt79=2;
@@ -12317,26 +12317,26 @@ else if ( (LA77_0==82) ) {
 
             	                switch (alt79) {
             	            	case 1 :
-            	            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4213:4: otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) )
+            	            	    // InternalCheck.g:4213:4: otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) )
             	            	    {
-            	            	    otherlv_13=(Token)match(input,24,FOLLOW_24_in_ruleXMemberFeatureCall9885); if (state.failed) return current;
+            	            	    otherlv_13=(Token)match(input,24,FOLLOW_72); if (state.failed) return current;
             	            	    if ( state.backtracking==0 ) {
 
             	            	          	newLeafNode(otherlv_13, grammarAccess.getXMemberFeatureCallAccess().getCommaKeyword_1_1_1_2_0());
             	            	          
             	            	    }
-            	            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4217:1: ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) )
-            	            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4218:1: (lv_typeArguments_14_0= ruleJvmArgumentTypeReference )
+            	            	    // InternalCheck.g:4217:1: ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) )
+            	            	    // InternalCheck.g:4218:1: (lv_typeArguments_14_0= ruleJvmArgumentTypeReference )
             	            	    {
-            	            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4218:1: (lv_typeArguments_14_0= ruleJvmArgumentTypeReference )
-            	            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4219:3: lv_typeArguments_14_0= ruleJvmArgumentTypeReference
+            	            	    // InternalCheck.g:4218:1: (lv_typeArguments_14_0= ruleJvmArgumentTypeReference )
+            	            	    // InternalCheck.g:4219:3: lv_typeArguments_14_0= ruleJvmArgumentTypeReference
             	            	    {
             	            	    if ( state.backtracking==0 ) {
             	            	       
             	            	      	        newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_1_2_1_0()); 
             	            	      	    
             	            	    }
-            	            	    pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleXMemberFeatureCall9906);
+            	            	    pushFollow(FOLLOW_73);
             	            	    lv_typeArguments_14_0=ruleJvmArgumentTypeReference();
 
             	            	    state._fsp--;
@@ -12350,7 +12350,7 @@ else if ( (LA77_0==82) ) {
             	            	             			current, 
             	            	             			"typeArguments",
             	            	              		lv_typeArguments_14_0, 
-            	            	              		"JvmArgumentTypeReference");
+            	            	              		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
             	            	      	        afterParserOrEnumRuleCall();
             	            	      	    
             	            	    }
@@ -12369,7 +12369,7 @@ else if ( (LA77_0==82) ) {
             	                }
             	            } while (true);
 
-            	            otherlv_15=(Token)match(input,57,FOLLOW_57_in_ruleXMemberFeatureCall9920); if (state.failed) return current;
+            	            otherlv_15=(Token)match(input,57,FOLLOW_71); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                  	newLeafNode(otherlv_15, grammarAccess.getXMemberFeatureCallAccess().getGreaterThanSignKeyword_1_1_1_3());
@@ -12381,11 +12381,11 @@ else if ( (LA77_0==82) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4239:3: ( ( ruleIdOrSuper ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4240:1: ( ruleIdOrSuper )
+            	    // InternalCheck.g:4239:3: ( ( ruleIdOrSuper ) )
+            	    // InternalCheck.g:4240:1: ( ruleIdOrSuper )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4240:1: ( ruleIdOrSuper )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4241:3: ruleIdOrSuper
+            	    // InternalCheck.g:4240:1: ( ruleIdOrSuper )
+            	    // InternalCheck.g:4241:3: ruleIdOrSuper
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -12399,7 +12399,7 @@ else if ( (LA77_0==82) ) {
             	      	        newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getFeatureJvmIdentifiableElementCrossReference_1_1_2_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleIdOrSuper_in_ruleXMemberFeatureCall9945);
+            	    pushFollow(FOLLOW_74);
             	    ruleIdOrSuper();
 
             	    state._fsp--;
@@ -12415,20 +12415,20 @@ else if ( (LA77_0==82) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4254:2: ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )?
+            	    // InternalCheck.g:4254:2: ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )?
             	    int alt83=2;
             	    alt83 = dfa83.predict(input);
             	    switch (alt83) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4254:3: ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')'
+            	            // InternalCheck.g:4254:3: ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')'
             	            {
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4254:3: ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) )
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4254:4: ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' )
+            	            // InternalCheck.g:4254:3: ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) )
+            	            // InternalCheck.g:4254:4: ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' )
             	            {
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4261:1: (lv_explicitOperationCall_17_0= '(' )
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4262:3: lv_explicitOperationCall_17_0= '('
+            	            // InternalCheck.g:4261:1: (lv_explicitOperationCall_17_0= '(' )
+            	            // InternalCheck.g:4262:3: lv_explicitOperationCall_17_0= '('
             	            {
-            	            lv_explicitOperationCall_17_0=(Token)match(input,23,FOLLOW_23_in_ruleXMemberFeatureCall9979); if (state.failed) return current;
+            	            lv_explicitOperationCall_17_0=(Token)match(input,23,FOLLOW_75); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_explicitOperationCall_17_0, grammarAccess.getXMemberFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_1_1_3_0_0());
@@ -12448,25 +12448,25 @@ else if ( (LA77_0==82) ) {
 
             	            }
 
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4275:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )?
+            	            // InternalCheck.g:4275:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )?
             	            int alt82=3;
             	            alt82 = dfa82.predict(input);
             	            switch (alt82) {
             	                case 1 :
-            	                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4275:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) )
+            	                    // InternalCheck.g:4275:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) )
             	                    {
-            	                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4275:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) )
-            	                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4275:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure )
+            	                    // InternalCheck.g:4275:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) )
+            	                    // InternalCheck.g:4275:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure )
             	                    {
-            	                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4292:1: (lv_memberCallArguments_18_0= ruleXShortClosure )
-            	                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4293:3: lv_memberCallArguments_18_0= ruleXShortClosure
+            	                    // InternalCheck.g:4292:1: (lv_memberCallArguments_18_0= ruleXShortClosure )
+            	                    // InternalCheck.g:4293:3: lv_memberCallArguments_18_0= ruleXShortClosure
             	                    {
             	                    if ( state.backtracking==0 ) {
             	                       
             	                      	        newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXShortClosureParserRuleCall_1_1_3_1_0_0()); 
             	                      	    
             	                    }
-            	                    pushFollow(FOLLOW_ruleXShortClosure_in_ruleXMemberFeatureCall10064);
+            	                    pushFollow(FOLLOW_26);
             	                    lv_memberCallArguments_18_0=ruleXShortClosure();
 
             	                    state._fsp--;
@@ -12480,7 +12480,7 @@ else if ( (LA77_0==82) ) {
             	                             			current, 
             	                             			"memberCallArguments",
             	                              		lv_memberCallArguments_18_0, 
-            	                              		"XShortClosure");
+            	                              		"org.eclipse.xtext.xbase.Xbase.XShortClosure");
             	                      	        afterParserOrEnumRuleCall();
             	                      	    
             	                    }
@@ -12494,23 +12494,23 @@ else if ( (LA77_0==82) ) {
             	                    }
             	                    break;
             	                case 2 :
-            	                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4310:6: ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* )
+            	                    // InternalCheck.g:4310:6: ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* )
             	                    {
-            	                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4310:6: ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* )
-            	                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4310:7: ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )*
+            	                    // InternalCheck.g:4310:6: ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* )
+            	                    // InternalCheck.g:4310:7: ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )*
             	                    {
-            	                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4310:7: ( (lv_memberCallArguments_19_0= ruleXExpression ) )
-            	                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4311:1: (lv_memberCallArguments_19_0= ruleXExpression )
+            	                    // InternalCheck.g:4310:7: ( (lv_memberCallArguments_19_0= ruleXExpression ) )
+            	                    // InternalCheck.g:4311:1: (lv_memberCallArguments_19_0= ruleXExpression )
             	                    {
-            	                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4311:1: (lv_memberCallArguments_19_0= ruleXExpression )
-            	                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4312:3: lv_memberCallArguments_19_0= ruleXExpression
+            	                    // InternalCheck.g:4311:1: (lv_memberCallArguments_19_0= ruleXExpression )
+            	                    // InternalCheck.g:4312:3: lv_memberCallArguments_19_0= ruleXExpression
             	                    {
             	                    if ( state.backtracking==0 ) {
             	                       
             	                      	        newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXExpressionParserRuleCall_1_1_3_1_1_0_0()); 
             	                      	    
             	                    }
-            	                    pushFollow(FOLLOW_ruleXExpression_in_ruleXMemberFeatureCall10092);
+            	                    pushFollow(FOLLOW_19);
             	                    lv_memberCallArguments_19_0=ruleXExpression();
 
             	                    state._fsp--;
@@ -12524,7 +12524,7 @@ else if ( (LA77_0==82) ) {
             	                             			current, 
             	                             			"memberCallArguments",
             	                              		lv_memberCallArguments_19_0, 
-            	                              		"XExpression");
+            	                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
             	                      	        afterParserOrEnumRuleCall();
             	                      	    
             	                    }
@@ -12534,7 +12534,7 @@ else if ( (LA77_0==82) ) {
 
             	                    }
 
-            	                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4328:2: (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )*
+            	                    // InternalCheck.g:4328:2: (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )*
             	                    loop81:
             	                    do {
             	                        int alt81=2;
@@ -12547,26 +12547,26 @@ else if ( (LA77_0==82) ) {
 
             	                        switch (alt81) {
             	                    	case 1 :
-            	                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4328:4: otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) )
+            	                    	    // InternalCheck.g:4328:4: otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) )
             	                    	    {
-            	                    	    otherlv_20=(Token)match(input,24,FOLLOW_24_in_ruleXMemberFeatureCall10105); if (state.failed) return current;
+            	                    	    otherlv_20=(Token)match(input,24,FOLLOW_29); if (state.failed) return current;
             	                    	    if ( state.backtracking==0 ) {
 
             	                    	          	newLeafNode(otherlv_20, grammarAccess.getXMemberFeatureCallAccess().getCommaKeyword_1_1_3_1_1_1_0());
             	                    	          
             	                    	    }
-            	                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4332:1: ( (lv_memberCallArguments_21_0= ruleXExpression ) )
-            	                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4333:1: (lv_memberCallArguments_21_0= ruleXExpression )
+            	                    	    // InternalCheck.g:4332:1: ( (lv_memberCallArguments_21_0= ruleXExpression ) )
+            	                    	    // InternalCheck.g:4333:1: (lv_memberCallArguments_21_0= ruleXExpression )
             	                    	    {
-            	                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4333:1: (lv_memberCallArguments_21_0= ruleXExpression )
-            	                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4334:3: lv_memberCallArguments_21_0= ruleXExpression
+            	                    	    // InternalCheck.g:4333:1: (lv_memberCallArguments_21_0= ruleXExpression )
+            	                    	    // InternalCheck.g:4334:3: lv_memberCallArguments_21_0= ruleXExpression
             	                    	    {
             	                    	    if ( state.backtracking==0 ) {
             	                    	       
             	                    	      	        newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXExpressionParserRuleCall_1_1_3_1_1_1_1_0()); 
             	                    	      	    
             	                    	    }
-            	                    	    pushFollow(FOLLOW_ruleXExpression_in_ruleXMemberFeatureCall10126);
+            	                    	    pushFollow(FOLLOW_19);
             	                    	    lv_memberCallArguments_21_0=ruleXExpression();
 
             	                    	    state._fsp--;
@@ -12580,7 +12580,7 @@ else if ( (LA77_0==82) ) {
             	                    	             			current, 
             	                    	             			"memberCallArguments",
             	                    	              		lv_memberCallArguments_21_0, 
-            	                    	              		"XExpression");
+            	                    	              		"org.eclipse.xtext.xbase.Xbase.XExpression");
             	                    	      	        afterParserOrEnumRuleCall();
             	                    	      	    
             	                    	    }
@@ -12608,7 +12608,7 @@ else if ( (LA77_0==82) ) {
 
             	            }
 
-            	            otherlv_22=(Token)match(input,25,FOLLOW_25_in_ruleXMemberFeatureCall10143); if (state.failed) return current;
+            	            otherlv_22=(Token)match(input,25,FOLLOW_76); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                  	newLeafNode(otherlv_22, grammarAccess.getXMemberFeatureCallAccess().getRightParenthesisKeyword_1_1_3_2());
@@ -12620,22 +12620,22 @@ else if ( (LA77_0==82) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4354:3: ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )?
+            	    // InternalCheck.g:4354:3: ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )?
             	    int alt84=2;
             	    alt84 = dfa84.predict(input);
             	    switch (alt84) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4354:4: ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure )
+            	            // InternalCheck.g:4354:4: ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure )
             	            {
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4357:1: (lv_memberCallArguments_23_0= ruleXClosure )
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4358:3: lv_memberCallArguments_23_0= ruleXClosure
+            	            // InternalCheck.g:4357:1: (lv_memberCallArguments_23_0= ruleXClosure )
+            	            // InternalCheck.g:4358:3: lv_memberCallArguments_23_0= ruleXClosure
             	            {
             	            if ( state.backtracking==0 ) {
             	               
             	              	        newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXClosureParserRuleCall_1_1_4_0()); 
             	              	    
             	            }
-            	            pushFollow(FOLLOW_ruleXClosure_in_ruleXMemberFeatureCall10178);
+            	            pushFollow(FOLLOW_70);
             	            lv_memberCallArguments_23_0=ruleXClosure();
 
             	            state._fsp--;
@@ -12649,7 +12649,7 @@ else if ( (LA77_0==82) ) {
             	                     			current, 
             	                     			"memberCallArguments",
             	                      		lv_memberCallArguments_23_0, 
-            	                      		"XClosure");
+            	                      		"org.eclipse.xtext.xbase.Xbase.XClosure");
             	              	        afterParserOrEnumRuleCall();
             	              	    
             	            }
@@ -12697,7 +12697,7 @@ else if ( (LA77_0==82) ) {
 
 
     // $ANTLR start "entryRuleXLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4382:1: entryRuleXLiteral returns [EObject current=null] : iv_ruleXLiteral= ruleXLiteral EOF ;
+    // InternalCheck.g:4382:1: entryRuleXLiteral returns [EObject current=null] : iv_ruleXLiteral= ruleXLiteral EOF ;
     public final EObject entryRuleXLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -12705,13 +12705,13 @@ public final EObject entryRuleXLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4383:2: (iv_ruleXLiteral= ruleXLiteral EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4384:2: iv_ruleXLiteral= ruleXLiteral EOF
+            // InternalCheck.g:4383:2: (iv_ruleXLiteral= ruleXLiteral EOF )
+            // InternalCheck.g:4384:2: iv_ruleXLiteral= ruleXLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXLiteral_in_entryRuleXLiteral10218);
+            pushFollow(FOLLOW_1);
             iv_ruleXLiteral=ruleXLiteral();
 
             state._fsp--;
@@ -12719,7 +12719,7 @@ public final EObject entryRuleXLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXLiteral10228); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -12737,7 +12737,7 @@ public final EObject entryRuleXLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4391:1: ruleXLiteral returns [EObject current=null] : (this_XCollectionLiteral_0= ruleXCollectionLiteral | ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure ) | this_XBooleanLiteral_2= ruleXBooleanLiteral | this_XNumberLiteral_3= ruleXNumberLiteral | this_XNullLiteral_4= ruleXNullLiteral | this_XStringLiteral_5= ruleXStringLiteral | this_XTypeLiteral_6= ruleXTypeLiteral ) ;
+    // InternalCheck.g:4391:1: ruleXLiteral returns [EObject current=null] : (this_XCollectionLiteral_0= ruleXCollectionLiteral | ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure ) | this_XBooleanLiteral_2= ruleXBooleanLiteral | this_XNumberLiteral_3= ruleXNumberLiteral | this_XNullLiteral_4= ruleXNullLiteral | this_XStringLiteral_5= ruleXStringLiteral | this_XTypeLiteral_6= ruleXTypeLiteral ) ;
     public final EObject ruleXLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -12759,10 +12759,10 @@ public final EObject ruleXLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4394:28: ( (this_XCollectionLiteral_0= ruleXCollectionLiteral | ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure ) | this_XBooleanLiteral_2= ruleXBooleanLiteral | this_XNumberLiteral_3= ruleXNumberLiteral | this_XNullLiteral_4= ruleXNullLiteral | this_XStringLiteral_5= ruleXStringLiteral | this_XTypeLiteral_6= ruleXTypeLiteral ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4395:1: (this_XCollectionLiteral_0= ruleXCollectionLiteral | ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure ) | this_XBooleanLiteral_2= ruleXBooleanLiteral | this_XNumberLiteral_3= ruleXNumberLiteral | this_XNullLiteral_4= ruleXNullLiteral | this_XStringLiteral_5= ruleXStringLiteral | this_XTypeLiteral_6= ruleXTypeLiteral )
+            // InternalCheck.g:4394:28: ( (this_XCollectionLiteral_0= ruleXCollectionLiteral | ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure ) | this_XBooleanLiteral_2= ruleXBooleanLiteral | this_XNumberLiteral_3= ruleXNumberLiteral | this_XNullLiteral_4= ruleXNullLiteral | this_XStringLiteral_5= ruleXStringLiteral | this_XTypeLiteral_6= ruleXTypeLiteral ) )
+            // InternalCheck.g:4395:1: (this_XCollectionLiteral_0= ruleXCollectionLiteral | ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure ) | this_XBooleanLiteral_2= ruleXBooleanLiteral | this_XNumberLiteral_3= ruleXNumberLiteral | this_XNullLiteral_4= ruleXNullLiteral | this_XStringLiteral_5= ruleXStringLiteral | this_XTypeLiteral_6= ruleXTypeLiteral )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4395:1: (this_XCollectionLiteral_0= ruleXCollectionLiteral | ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure ) | this_XBooleanLiteral_2= ruleXBooleanLiteral | this_XNumberLiteral_3= ruleXNumberLiteral | this_XNullLiteral_4= ruleXNullLiteral | this_XStringLiteral_5= ruleXStringLiteral | this_XTypeLiteral_6= ruleXTypeLiteral )
+            // InternalCheck.g:4395:1: (this_XCollectionLiteral_0= ruleXCollectionLiteral | ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure ) | this_XBooleanLiteral_2= ruleXBooleanLiteral | this_XNumberLiteral_3= ruleXNumberLiteral | this_XNullLiteral_4= ruleXNullLiteral | this_XStringLiteral_5= ruleXStringLiteral | this_XTypeLiteral_6= ruleXTypeLiteral )
             int alt86=7;
             int LA86_0 = input.LA(1);
 
@@ -12796,14 +12796,14 @@ else if ( (LA86_0==100) ) {
             }
             switch (alt86) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4396:5: this_XCollectionLiteral_0= ruleXCollectionLiteral
+                    // InternalCheck.g:4396:5: this_XCollectionLiteral_0= ruleXCollectionLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXLiteralAccess().getXCollectionLiteralParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXCollectionLiteral_in_ruleXLiteral10275);
+                    pushFollow(FOLLOW_2);
                     this_XCollectionLiteral_0=ruleXCollectionLiteral();
 
                     state._fsp--;
@@ -12818,17 +12818,17 @@ else if ( (LA86_0==100) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4405:6: ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure )
+                    // InternalCheck.g:4405:6: ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4405:6: ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4405:7: ( ( () '[' ) )=>this_XClosure_1= ruleXClosure
+                    // InternalCheck.g:4405:6: ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure )
+                    // InternalCheck.g:4405:7: ( ( () '[' ) )=>this_XClosure_1= ruleXClosure
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXLiteralAccess().getXClosureParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXClosure_in_ruleXLiteral10315);
+                    pushFollow(FOLLOW_2);
                     this_XClosure_1=ruleXClosure();
 
                     state._fsp--;
@@ -12846,14 +12846,14 @@ else if ( (LA86_0==100) ) {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4418:5: this_XBooleanLiteral_2= ruleXBooleanLiteral
+                    // InternalCheck.g:4418:5: this_XBooleanLiteral_2= ruleXBooleanLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXLiteralAccess().getXBooleanLiteralParserRuleCall_2()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXBooleanLiteral_in_ruleXLiteral10343);
+                    pushFollow(FOLLOW_2);
                     this_XBooleanLiteral_2=ruleXBooleanLiteral();
 
                     state._fsp--;
@@ -12868,14 +12868,14 @@ else if ( (LA86_0==100) ) {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4428:5: this_XNumberLiteral_3= ruleXNumberLiteral
+                    // InternalCheck.g:4428:5: this_XNumberLiteral_3= ruleXNumberLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXLiteralAccess().getXNumberLiteralParserRuleCall_3()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXNumberLiteral_in_ruleXLiteral10370);
+                    pushFollow(FOLLOW_2);
                     this_XNumberLiteral_3=ruleXNumberLiteral();
 
                     state._fsp--;
@@ -12890,14 +12890,14 @@ else if ( (LA86_0==100) ) {
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4438:5: this_XNullLiteral_4= ruleXNullLiteral
+                    // InternalCheck.g:4438:5: this_XNullLiteral_4= ruleXNullLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXLiteralAccess().getXNullLiteralParserRuleCall_4()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXNullLiteral_in_ruleXLiteral10397);
+                    pushFollow(FOLLOW_2);
                     this_XNullLiteral_4=ruleXNullLiteral();
 
                     state._fsp--;
@@ -12912,14 +12912,14 @@ else if ( (LA86_0==100) ) {
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4448:5: this_XStringLiteral_5= ruleXStringLiteral
+                    // InternalCheck.g:4448:5: this_XStringLiteral_5= ruleXStringLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXLiteralAccess().getXStringLiteralParserRuleCall_5()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXStringLiteral_in_ruleXLiteral10424);
+                    pushFollow(FOLLOW_2);
                     this_XStringLiteral_5=ruleXStringLiteral();
 
                     state._fsp--;
@@ -12934,14 +12934,14 @@ else if ( (LA86_0==100) ) {
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4458:5: this_XTypeLiteral_6= ruleXTypeLiteral
+                    // InternalCheck.g:4458:5: this_XTypeLiteral_6= ruleXTypeLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXLiteralAccess().getXTypeLiteralParserRuleCall_6()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXTypeLiteral_in_ruleXLiteral10451);
+                    pushFollow(FOLLOW_2);
                     this_XTypeLiteral_6=ruleXTypeLiteral();
 
                     state._fsp--;
@@ -12978,7 +12978,7 @@ else if ( (LA86_0==100) ) {
 
 
     // $ANTLR start "entryRuleXCollectionLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4474:1: entryRuleXCollectionLiteral returns [EObject current=null] : iv_ruleXCollectionLiteral= ruleXCollectionLiteral EOF ;
+    // InternalCheck.g:4474:1: entryRuleXCollectionLiteral returns [EObject current=null] : iv_ruleXCollectionLiteral= ruleXCollectionLiteral EOF ;
     public final EObject entryRuleXCollectionLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -12986,13 +12986,13 @@ public final EObject entryRuleXCollectionLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4475:2: (iv_ruleXCollectionLiteral= ruleXCollectionLiteral EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4476:2: iv_ruleXCollectionLiteral= ruleXCollectionLiteral EOF
+            // InternalCheck.g:4475:2: (iv_ruleXCollectionLiteral= ruleXCollectionLiteral EOF )
+            // InternalCheck.g:4476:2: iv_ruleXCollectionLiteral= ruleXCollectionLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXCollectionLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXCollectionLiteral_in_entryRuleXCollectionLiteral10486);
+            pushFollow(FOLLOW_1);
             iv_ruleXCollectionLiteral=ruleXCollectionLiteral();
 
             state._fsp--;
@@ -13000,7 +13000,7 @@ public final EObject entryRuleXCollectionLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXCollectionLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXCollectionLiteral10496); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -13018,7 +13018,7 @@ public final EObject entryRuleXCollectionLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXCollectionLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4483:1: ruleXCollectionLiteral returns [EObject current=null] : (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral ) ;
+    // InternalCheck.g:4483:1: ruleXCollectionLiteral returns [EObject current=null] : (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral ) ;
     public final EObject ruleXCollectionLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -13030,10 +13030,10 @@ public final EObject ruleXCollectionLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4486:28: ( (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4487:1: (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral )
+            // InternalCheck.g:4486:28: ( (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral ) )
+            // InternalCheck.g:4487:1: (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4487:1: (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral )
+            // InternalCheck.g:4487:1: (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral )
             int alt87=2;
             int LA87_0 = input.LA(1);
 
@@ -13063,14 +13063,14 @@ else if ( (LA87_1==33) ) {
             }
             switch (alt87) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4488:5: this_XSetLiteral_0= ruleXSetLiteral
+                    // InternalCheck.g:4488:5: this_XSetLiteral_0= ruleXSetLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXCollectionLiteralAccess().getXSetLiteralParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXSetLiteral_in_ruleXCollectionLiteral10543);
+                    pushFollow(FOLLOW_2);
                     this_XSetLiteral_0=ruleXSetLiteral();
 
                     state._fsp--;
@@ -13085,14 +13085,14 @@ else if ( (LA87_1==33) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4498:5: this_XListLiteral_1= ruleXListLiteral
+                    // InternalCheck.g:4498:5: this_XListLiteral_1= ruleXListLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXCollectionLiteralAccess().getXListLiteralParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXListLiteral_in_ruleXCollectionLiteral10570);
+                    pushFollow(FOLLOW_2);
                     this_XListLiteral_1=ruleXListLiteral();
 
                     state._fsp--;
@@ -13129,7 +13129,7 @@ else if ( (LA87_1==33) ) {
 
 
     // $ANTLR start "entryRuleXSetLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4514:1: entryRuleXSetLiteral returns [EObject current=null] : iv_ruleXSetLiteral= ruleXSetLiteral EOF ;
+    // InternalCheck.g:4514:1: entryRuleXSetLiteral returns [EObject current=null] : iv_ruleXSetLiteral= ruleXSetLiteral EOF ;
     public final EObject entryRuleXSetLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -13137,13 +13137,13 @@ public final EObject entryRuleXSetLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4515:2: (iv_ruleXSetLiteral= ruleXSetLiteral EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4516:2: iv_ruleXSetLiteral= ruleXSetLiteral EOF
+            // InternalCheck.g:4515:2: (iv_ruleXSetLiteral= ruleXSetLiteral EOF )
+            // InternalCheck.g:4516:2: iv_ruleXSetLiteral= ruleXSetLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXSetLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXSetLiteral_in_entryRuleXSetLiteral10605);
+            pushFollow(FOLLOW_1);
             iv_ruleXSetLiteral=ruleXSetLiteral();
 
             state._fsp--;
@@ -13151,7 +13151,7 @@ public final EObject entryRuleXSetLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXSetLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXSetLiteral10615); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -13169,7 +13169,7 @@ public final EObject entryRuleXSetLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXSetLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4523:1: ruleXSetLiteral returns [EObject current=null] : ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' ) ;
+    // InternalCheck.g:4523:1: ruleXSetLiteral returns [EObject current=null] : ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' ) ;
     public final EObject ruleXSetLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -13185,14 +13185,14 @@ public final EObject ruleXSetLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4526:28: ( ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4527:1: ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' )
+            // InternalCheck.g:4526:28: ( ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' ) )
+            // InternalCheck.g:4527:1: ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4527:1: ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4527:2: () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}'
+            // InternalCheck.g:4527:1: ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' )
+            // InternalCheck.g:4527:2: () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}'
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4527:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4528:5: 
+            // InternalCheck.g:4527:2: ()
+            // InternalCheck.g:4528:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -13204,19 +13204,19 @@ public final EObject ruleXSetLiteral() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,32,FOLLOW_32_in_ruleXSetLiteral10661); if (state.failed) return current;
+            otherlv_1=(Token)match(input,32,FOLLOW_9); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXSetLiteralAccess().getNumberSignKeyword_1());
                   
             }
-            otherlv_2=(Token)match(input,18,FOLLOW_18_in_ruleXSetLiteral10673); if (state.failed) return current;
+            otherlv_2=(Token)match(input,18,FOLLOW_77); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getXSetLiteralAccess().getLeftCurlyBracketKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4541:1: ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )?
+            // InternalCheck.g:4541:1: ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )?
             int alt89=2;
             int LA89_0 = input.LA(1);
 
@@ -13225,20 +13225,20 @@ public final EObject ruleXSetLiteral() throws RecognitionException {
             }
             switch (alt89) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4541:2: ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
+                    // InternalCheck.g:4541:2: ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4541:2: ( (lv_elements_3_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4542:1: (lv_elements_3_0= ruleXExpression )
+                    // InternalCheck.g:4541:2: ( (lv_elements_3_0= ruleXExpression ) )
+                    // InternalCheck.g:4542:1: (lv_elements_3_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4542:1: (lv_elements_3_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4543:3: lv_elements_3_0= ruleXExpression
+                    // InternalCheck.g:4542:1: (lv_elements_3_0= ruleXExpression )
+                    // InternalCheck.g:4543:3: lv_elements_3_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXSetLiteralAccess().getElementsXExpressionParserRuleCall_3_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXSetLiteral10695);
+                    pushFollow(FOLLOW_78);
                     lv_elements_3_0=ruleXExpression();
 
                     state._fsp--;
@@ -13252,7 +13252,7 @@ public final EObject ruleXSetLiteral() throws RecognitionException {
                              			current, 
                              			"elements",
                               		lv_elements_3_0, 
-                              		"XExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -13262,7 +13262,7 @@ public final EObject ruleXSetLiteral() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4559:2: (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
+                    // InternalCheck.g:4559:2: (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
                     loop88:
                     do {
                         int alt88=2;
@@ -13275,26 +13275,26 @@ public final EObject ruleXSetLiteral() throws RecognitionException {
 
                         switch (alt88) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4559:4: otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) )
+                    	    // InternalCheck.g:4559:4: otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) )
                     	    {
-                    	    otherlv_4=(Token)match(input,24,FOLLOW_24_in_ruleXSetLiteral10708); if (state.failed) return current;
+                    	    otherlv_4=(Token)match(input,24,FOLLOW_29); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_4, grammarAccess.getXSetLiteralAccess().getCommaKeyword_3_1_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4563:1: ( (lv_elements_5_0= ruleXExpression ) )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4564:1: (lv_elements_5_0= ruleXExpression )
+                    	    // InternalCheck.g:4563:1: ( (lv_elements_5_0= ruleXExpression ) )
+                    	    // InternalCheck.g:4564:1: (lv_elements_5_0= ruleXExpression )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4564:1: (lv_elements_5_0= ruleXExpression )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4565:3: lv_elements_5_0= ruleXExpression
+                    	    // InternalCheck.g:4564:1: (lv_elements_5_0= ruleXExpression )
+                    	    // InternalCheck.g:4565:3: lv_elements_5_0= ruleXExpression
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getXSetLiteralAccess().getElementsXExpressionParserRuleCall_3_1_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleXExpression_in_ruleXSetLiteral10729);
+                    	    pushFollow(FOLLOW_78);
                     	    lv_elements_5_0=ruleXExpression();
 
                     	    state._fsp--;
@@ -13308,7 +13308,7 @@ public final EObject ruleXSetLiteral() throws RecognitionException {
                     	             			current, 
                     	             			"elements",
                     	              		lv_elements_5_0, 
-                    	              		"XExpression");
+                    	              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -13333,7 +13333,7 @@ public final EObject ruleXSetLiteral() throws RecognitionException {
 
             }
 
-            otherlv_6=(Token)match(input,19,FOLLOW_19_in_ruleXSetLiteral10745); if (state.failed) return current;
+            otherlv_6=(Token)match(input,19,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_6, grammarAccess.getXSetLiteralAccess().getRightCurlyBracketKeyword_4());
@@ -13362,7 +13362,7 @@ public final EObject ruleXSetLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXListLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4593:1: entryRuleXListLiteral returns [EObject current=null] : iv_ruleXListLiteral= ruleXListLiteral EOF ;
+    // InternalCheck.g:4593:1: entryRuleXListLiteral returns [EObject current=null] : iv_ruleXListLiteral= ruleXListLiteral EOF ;
     public final EObject entryRuleXListLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -13370,13 +13370,13 @@ public final EObject entryRuleXListLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4594:2: (iv_ruleXListLiteral= ruleXListLiteral EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4595:2: iv_ruleXListLiteral= ruleXListLiteral EOF
+            // InternalCheck.g:4594:2: (iv_ruleXListLiteral= ruleXListLiteral EOF )
+            // InternalCheck.g:4595:2: iv_ruleXListLiteral= ruleXListLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXListLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXListLiteral_in_entryRuleXListLiteral10781);
+            pushFollow(FOLLOW_1);
             iv_ruleXListLiteral=ruleXListLiteral();
 
             state._fsp--;
@@ -13384,7 +13384,7 @@ public final EObject entryRuleXListLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXListLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXListLiteral10791); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -13402,7 +13402,7 @@ public final EObject entryRuleXListLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXListLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4602:1: ruleXListLiteral returns [EObject current=null] : ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' ) ;
+    // InternalCheck.g:4602:1: ruleXListLiteral returns [EObject current=null] : ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' ) ;
     public final EObject ruleXListLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -13418,14 +13418,14 @@ public final EObject ruleXListLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4605:28: ( ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4606:1: ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' )
+            // InternalCheck.g:4605:28: ( ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' ) )
+            // InternalCheck.g:4606:1: ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4606:1: ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4606:2: () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']'
+            // InternalCheck.g:4606:1: ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' )
+            // InternalCheck.g:4606:2: () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']'
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4606:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4607:5: 
+            // InternalCheck.g:4606:2: ()
+            // InternalCheck.g:4607:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -13437,19 +13437,19 @@ public final EObject ruleXListLiteral() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,32,FOLLOW_32_in_ruleXListLiteral10837); if (state.failed) return current;
+            otherlv_1=(Token)match(input,32,FOLLOW_36); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXListLiteralAccess().getNumberSignKeyword_1());
                   
             }
-            otherlv_2=(Token)match(input,33,FOLLOW_33_in_ruleXListLiteral10849); if (state.failed) return current;
+            otherlv_2=(Token)match(input,33,FOLLOW_79); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getXListLiteralAccess().getLeftSquareBracketKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4620:1: ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )?
+            // InternalCheck.g:4620:1: ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )?
             int alt91=2;
             int LA91_0 = input.LA(1);
 
@@ -13458,20 +13458,20 @@ public final EObject ruleXListLiteral() throws RecognitionException {
             }
             switch (alt91) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4620:2: ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
+                    // InternalCheck.g:4620:2: ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4620:2: ( (lv_elements_3_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4621:1: (lv_elements_3_0= ruleXExpression )
+                    // InternalCheck.g:4620:2: ( (lv_elements_3_0= ruleXExpression ) )
+                    // InternalCheck.g:4621:1: (lv_elements_3_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4621:1: (lv_elements_3_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4622:3: lv_elements_3_0= ruleXExpression
+                    // InternalCheck.g:4621:1: (lv_elements_3_0= ruleXExpression )
+                    // InternalCheck.g:4622:3: lv_elements_3_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXListLiteralAccess().getElementsXExpressionParserRuleCall_3_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXListLiteral10871);
+                    pushFollow(FOLLOW_38);
                     lv_elements_3_0=ruleXExpression();
 
                     state._fsp--;
@@ -13485,7 +13485,7 @@ public final EObject ruleXListLiteral() throws RecognitionException {
                              			current, 
                              			"elements",
                               		lv_elements_3_0, 
-                              		"XExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -13495,7 +13495,7 @@ public final EObject ruleXListLiteral() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4638:2: (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
+                    // InternalCheck.g:4638:2: (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
                     loop90:
                     do {
                         int alt90=2;
@@ -13508,26 +13508,26 @@ public final EObject ruleXListLiteral() throws RecognitionException {
 
                         switch (alt90) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4638:4: otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) )
+                    	    // InternalCheck.g:4638:4: otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) )
                     	    {
-                    	    otherlv_4=(Token)match(input,24,FOLLOW_24_in_ruleXListLiteral10884); if (state.failed) return current;
+                    	    otherlv_4=(Token)match(input,24,FOLLOW_29); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_4, grammarAccess.getXListLiteralAccess().getCommaKeyword_3_1_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4642:1: ( (lv_elements_5_0= ruleXExpression ) )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4643:1: (lv_elements_5_0= ruleXExpression )
+                    	    // InternalCheck.g:4642:1: ( (lv_elements_5_0= ruleXExpression ) )
+                    	    // InternalCheck.g:4643:1: (lv_elements_5_0= ruleXExpression )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4643:1: (lv_elements_5_0= ruleXExpression )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4644:3: lv_elements_5_0= ruleXExpression
+                    	    // InternalCheck.g:4643:1: (lv_elements_5_0= ruleXExpression )
+                    	    // InternalCheck.g:4644:3: lv_elements_5_0= ruleXExpression
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getXListLiteralAccess().getElementsXExpressionParserRuleCall_3_1_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleXExpression_in_ruleXListLiteral10905);
+                    	    pushFollow(FOLLOW_38);
                     	    lv_elements_5_0=ruleXExpression();
 
                     	    state._fsp--;
@@ -13541,7 +13541,7 @@ public final EObject ruleXListLiteral() throws RecognitionException {
                     	             			current, 
                     	             			"elements",
                     	              		lv_elements_5_0, 
-                    	              		"XExpression");
+                    	              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -13566,7 +13566,7 @@ public final EObject ruleXListLiteral() throws RecognitionException {
 
             }
 
-            otherlv_6=(Token)match(input,34,FOLLOW_34_in_ruleXListLiteral10921); if (state.failed) return current;
+            otherlv_6=(Token)match(input,34,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_6, grammarAccess.getXListLiteralAccess().getRightSquareBracketKeyword_4());
@@ -13595,7 +13595,7 @@ public final EObject ruleXListLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXClosure"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4672:1: entryRuleXClosure returns [EObject current=null] : iv_ruleXClosure= ruleXClosure EOF ;
+    // InternalCheck.g:4672:1: entryRuleXClosure returns [EObject current=null] : iv_ruleXClosure= ruleXClosure EOF ;
     public final EObject entryRuleXClosure() throws RecognitionException {
         EObject current = null;
 
@@ -13603,13 +13603,13 @@ public final EObject entryRuleXClosure() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4673:2: (iv_ruleXClosure= ruleXClosure EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4674:2: iv_ruleXClosure= ruleXClosure EOF
+            // InternalCheck.g:4673:2: (iv_ruleXClosure= ruleXClosure EOF )
+            // InternalCheck.g:4674:2: iv_ruleXClosure= ruleXClosure EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXClosureRule()); 
             }
-            pushFollow(FOLLOW_ruleXClosure_in_entryRuleXClosure10957);
+            pushFollow(FOLLOW_1);
             iv_ruleXClosure=ruleXClosure();
 
             state._fsp--;
@@ -13617,7 +13617,7 @@ public final EObject entryRuleXClosure() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXClosure; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXClosure10967); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -13635,7 +13635,7 @@ public final EObject entryRuleXClosure() throws RecognitionException {
 
 
     // $ANTLR start "ruleXClosure"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4681:1: ruleXClosure returns [EObject current=null] : ( ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']' ) ;
+    // InternalCheck.g:4681:1: ruleXClosure returns [EObject current=null] : ( ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']' ) ;
     public final EObject ruleXClosure() throws RecognitionException {
         EObject current = null;
 
@@ -13653,20 +13653,20 @@ public final EObject ruleXClosure() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4684:28: ( ( ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4685:1: ( ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']' )
+            // InternalCheck.g:4684:28: ( ( ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']' ) )
+            // InternalCheck.g:4685:1: ( ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4685:1: ( ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4685:2: ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']'
+            // InternalCheck.g:4685:1: ( ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']' )
+            // InternalCheck.g:4685:2: ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']'
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4685:2: ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4685:3: ( ( () '[' ) )=> ( () otherlv_1= '[' )
+            // InternalCheck.g:4685:2: ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) )
+            // InternalCheck.g:4685:3: ( ( () '[' ) )=> ( () otherlv_1= '[' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4687:5: ( () otherlv_1= '[' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4687:6: () otherlv_1= '['
+            // InternalCheck.g:4687:5: ( () otherlv_1= '[' )
+            // InternalCheck.g:4687:6: () otherlv_1= '['
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4687:6: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4688:5: 
+            // InternalCheck.g:4687:6: ()
+            // InternalCheck.g:4688:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -13678,7 +13678,7 @@ public final EObject ruleXClosure() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,33,FOLLOW_33_in_ruleXClosure11027); if (state.failed) return current;
+            otherlv_1=(Token)match(input,33,FOLLOW_80); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXClosureAccess().getLeftSquareBracketKeyword_0_0_1());
@@ -13690,17 +13690,17 @@ public final EObject ruleXClosure() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4697:3: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )?
+            // InternalCheck.g:4697:3: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )?
             int alt94=2;
             alt94 = dfa94.predict(input);
             switch (alt94) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4697:4: ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) )
+                    // InternalCheck.g:4697:4: ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4712:6: ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4712:7: ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) )
+                    // InternalCheck.g:4712:6: ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) )
+                    // InternalCheck.g:4712:7: ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4712:7: ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )?
+                    // InternalCheck.g:4712:7: ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )?
                     int alt93=2;
                     int LA93_0 = input.LA(1);
 
@@ -13709,20 +13709,20 @@ public final EObject ruleXClosure() throws RecognitionException {
                     }
                     switch (alt93) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4712:8: ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )*
+                            // InternalCheck.g:4712:8: ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )*
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4712:8: ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4713:1: (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter )
+                            // InternalCheck.g:4712:8: ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) )
+                            // InternalCheck.g:4713:1: (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4713:1: (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4714:3: lv_declaredFormalParameters_2_0= ruleJvmFormalParameter
+                            // InternalCheck.g:4713:1: (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter )
+                            // InternalCheck.g:4714:3: lv_declaredFormalParameters_2_0= ruleJvmFormalParameter
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_1_0_0_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleJvmFormalParameter_in_ruleXClosure11100);
+                            pushFollow(FOLLOW_81);
                             lv_declaredFormalParameters_2_0=ruleJvmFormalParameter();
 
                             state._fsp--;
@@ -13736,7 +13736,7 @@ public final EObject ruleXClosure() throws RecognitionException {
                                      			current, 
                                      			"declaredFormalParameters",
                                       		lv_declaredFormalParameters_2_0, 
-                                      		"JvmFormalParameter");
+                                      		"org.eclipse.xtext.xbase.Xbase.JvmFormalParameter");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -13746,7 +13746,7 @@ public final EObject ruleXClosure() throws RecognitionException {
 
                             }
 
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4730:2: (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )*
+                            // InternalCheck.g:4730:2: (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )*
                             loop92:
                             do {
                                 int alt92=2;
@@ -13759,26 +13759,26 @@ public final EObject ruleXClosure() throws RecognitionException {
 
                                 switch (alt92) {
                             	case 1 :
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4730:4: otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) )
+                            	    // InternalCheck.g:4730:4: otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) )
                             	    {
-                            	    otherlv_3=(Token)match(input,24,FOLLOW_24_in_ruleXClosure11113); if (state.failed) return current;
+                            	    otherlv_3=(Token)match(input,24,FOLLOW_27); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	          	newLeafNode(otherlv_3, grammarAccess.getXClosureAccess().getCommaKeyword_1_0_0_1_0());
                             	          
                             	    }
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4734:1: ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) )
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4735:1: (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter )
+                            	    // InternalCheck.g:4734:1: ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) )
+                            	    // InternalCheck.g:4735:1: (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter )
                             	    {
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4735:1: (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter )
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4736:3: lv_declaredFormalParameters_4_0= ruleJvmFormalParameter
+                            	    // InternalCheck.g:4735:1: (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter )
+                            	    // InternalCheck.g:4736:3: lv_declaredFormalParameters_4_0= ruleJvmFormalParameter
                             	    {
                             	    if ( state.backtracking==0 ) {
                             	       
                             	      	        newCompositeNode(grammarAccess.getXClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_1_0_0_1_1_0()); 
                             	      	    
                             	    }
-                            	    pushFollow(FOLLOW_ruleJvmFormalParameter_in_ruleXClosure11134);
+                            	    pushFollow(FOLLOW_81);
                             	    lv_declaredFormalParameters_4_0=ruleJvmFormalParameter();
 
                             	    state._fsp--;
@@ -13792,7 +13792,7 @@ public final EObject ruleXClosure() throws RecognitionException {
                             	             			current, 
                             	             			"declaredFormalParameters",
                             	              		lv_declaredFormalParameters_4_0, 
-                            	              		"JvmFormalParameter");
+                            	              		"org.eclipse.xtext.xbase.Xbase.JvmFormalParameter");
                             	      	        afterParserOrEnumRuleCall();
                             	      	    
                             	    }
@@ -13817,13 +13817,13 @@ public final EObject ruleXClosure() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4752:6: ( (lv_explicitSyntax_5_0= '|' ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4753:1: (lv_explicitSyntax_5_0= '|' )
+                    // InternalCheck.g:4752:6: ( (lv_explicitSyntax_5_0= '|' ) )
+                    // InternalCheck.g:4753:1: (lv_explicitSyntax_5_0= '|' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4753:1: (lv_explicitSyntax_5_0= '|' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4754:3: lv_explicitSyntax_5_0= '|'
+                    // InternalCheck.g:4753:1: (lv_explicitSyntax_5_0= '|' )
+                    // InternalCheck.g:4754:3: lv_explicitSyntax_5_0= '|'
                     {
-                    lv_explicitSyntax_5_0=(Token)match(input,84,FOLLOW_84_in_ruleXClosure11156); if (state.failed) return current;
+                    lv_explicitSyntax_5_0=(Token)match(input,84,FOLLOW_82); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_explicitSyntax_5_0, grammarAccess.getXClosureAccess().getExplicitSyntaxVerticalLineKeyword_1_0_1_0());
@@ -13852,18 +13852,18 @@ public final EObject ruleXClosure() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4767:5: ( (lv_expression_6_0= ruleXExpressionInClosure ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4768:1: (lv_expression_6_0= ruleXExpressionInClosure )
+            // InternalCheck.g:4767:5: ( (lv_expression_6_0= ruleXExpressionInClosure ) )
+            // InternalCheck.g:4768:1: (lv_expression_6_0= ruleXExpressionInClosure )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4768:1: (lv_expression_6_0= ruleXExpressionInClosure )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4769:3: lv_expression_6_0= ruleXExpressionInClosure
+            // InternalCheck.g:4768:1: (lv_expression_6_0= ruleXExpressionInClosure )
+            // InternalCheck.g:4769:3: lv_expression_6_0= ruleXExpressionInClosure
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXClosureAccess().getExpressionXExpressionInClosureParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpressionInClosure_in_ruleXClosure11193);
+            pushFollow(FOLLOW_45);
             lv_expression_6_0=ruleXExpressionInClosure();
 
             state._fsp--;
@@ -13877,7 +13877,7 @@ public final EObject ruleXClosure() throws RecognitionException {
                      			current, 
                      			"expression",
                       		lv_expression_6_0, 
-                      		"XExpressionInClosure");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpressionInClosure");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -13887,7 +13887,7 @@ public final EObject ruleXClosure() throws RecognitionException {
 
             }
 
-            otherlv_7=(Token)match(input,34,FOLLOW_34_in_ruleXClosure11205); if (state.failed) return current;
+            otherlv_7=(Token)match(input,34,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_7, grammarAccess.getXClosureAccess().getRightSquareBracketKeyword_3());
@@ -13916,7 +13916,7 @@ public final EObject ruleXClosure() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXExpressionInClosure"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4797:1: entryRuleXExpressionInClosure returns [EObject current=null] : iv_ruleXExpressionInClosure= ruleXExpressionInClosure EOF ;
+    // InternalCheck.g:4797:1: entryRuleXExpressionInClosure returns [EObject current=null] : iv_ruleXExpressionInClosure= ruleXExpressionInClosure EOF ;
     public final EObject entryRuleXExpressionInClosure() throws RecognitionException {
         EObject current = null;
 
@@ -13924,13 +13924,13 @@ public final EObject entryRuleXExpressionInClosure() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4798:2: (iv_ruleXExpressionInClosure= ruleXExpressionInClosure EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4799:2: iv_ruleXExpressionInClosure= ruleXExpressionInClosure EOF
+            // InternalCheck.g:4798:2: (iv_ruleXExpressionInClosure= ruleXExpressionInClosure EOF )
+            // InternalCheck.g:4799:2: iv_ruleXExpressionInClosure= ruleXExpressionInClosure EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXExpressionInClosureRule()); 
             }
-            pushFollow(FOLLOW_ruleXExpressionInClosure_in_entryRuleXExpressionInClosure11241);
+            pushFollow(FOLLOW_1);
             iv_ruleXExpressionInClosure=ruleXExpressionInClosure();
 
             state._fsp--;
@@ -13938,7 +13938,7 @@ public final EObject entryRuleXExpressionInClosure() throws RecognitionException
             if ( state.backtracking==0 ) {
                current =iv_ruleXExpressionInClosure; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXExpressionInClosure11251); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -13956,7 +13956,7 @@ public final EObject entryRuleXExpressionInClosure() throws RecognitionException
 
 
     // $ANTLR start "ruleXExpressionInClosure"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4806:1: ruleXExpressionInClosure returns [EObject current=null] : ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* ) ;
+    // InternalCheck.g:4806:1: ruleXExpressionInClosure returns [EObject current=null] : ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* ) ;
     public final EObject ruleXExpressionInClosure() throws RecognitionException {
         EObject current = null;
 
@@ -13967,14 +13967,14 @@ public final EObject ruleXExpressionInClosure() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4809:28: ( ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4810:1: ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* )
+            // InternalCheck.g:4809:28: ( ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* ) )
+            // InternalCheck.g:4810:1: ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4810:1: ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4810:2: () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )*
+            // InternalCheck.g:4810:1: ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* )
+            // InternalCheck.g:4810:2: () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )*
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4810:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4811:5: 
+            // InternalCheck.g:4810:2: ()
+            // InternalCheck.g:4811:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -13986,7 +13986,7 @@ public final EObject ruleXExpressionInClosure() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4816:2: ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )*
+            // InternalCheck.g:4816:2: ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )*
             loop96:
             do {
                 int alt96=2;
@@ -13999,20 +13999,20 @@ public final EObject ruleXExpressionInClosure() throws RecognitionException {
 
                 switch (alt96) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4816:3: ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )?
+            	    // InternalCheck.g:4816:3: ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )?
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4816:3: ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4817:1: (lv_expressions_1_0= ruleXExpressionOrVarDeclaration )
+            	    // InternalCheck.g:4816:3: ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) )
+            	    // InternalCheck.g:4817:1: (lv_expressions_1_0= ruleXExpressionOrVarDeclaration )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4817:1: (lv_expressions_1_0= ruleXExpressionOrVarDeclaration )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4818:3: lv_expressions_1_0= ruleXExpressionOrVarDeclaration
+            	    // InternalCheck.g:4817:1: (lv_expressions_1_0= ruleXExpressionOrVarDeclaration )
+            	    // InternalCheck.g:4818:3: lv_expressions_1_0= ruleXExpressionOrVarDeclaration
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXExpressionInClosureAccess().getExpressionsXExpressionOrVarDeclarationParserRuleCall_1_0_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_ruleXExpressionInClosure11307);
+            	    pushFollow(FOLLOW_83);
             	    lv_expressions_1_0=ruleXExpressionOrVarDeclaration();
 
             	    state._fsp--;
@@ -14026,7 +14026,7 @@ public final EObject ruleXExpressionInClosure() throws RecognitionException {
             	             			current, 
             	             			"expressions",
             	              		lv_expressions_1_0, 
-            	              		"XExpressionOrVarDeclaration");
+            	              		"org.eclipse.xtext.xbase.Xbase.XExpressionOrVarDeclaration");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -14036,7 +14036,7 @@ public final EObject ruleXExpressionInClosure() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4834:2: (otherlv_2= ';' )?
+            	    // InternalCheck.g:4834:2: (otherlv_2= ';' )?
             	    int alt95=2;
             	    int LA95_0 = input.LA(1);
 
@@ -14045,9 +14045,9 @@ public final EObject ruleXExpressionInClosure() throws RecognitionException {
             	    }
             	    switch (alt95) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4834:4: otherlv_2= ';'
+            	            // InternalCheck.g:4834:4: otherlv_2= ';'
             	            {
-            	            otherlv_2=(Token)match(input,21,FOLLOW_21_in_ruleXExpressionInClosure11320); if (state.failed) return current;
+            	            otherlv_2=(Token)match(input,21,FOLLOW_84); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                  	newLeafNode(otherlv_2, grammarAccess.getXExpressionInClosureAccess().getSemicolonKeyword_1_1());
@@ -14091,7 +14091,7 @@ public final EObject ruleXExpressionInClosure() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXShortClosure"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4846:1: entryRuleXShortClosure returns [EObject current=null] : iv_ruleXShortClosure= ruleXShortClosure EOF ;
+    // InternalCheck.g:4846:1: entryRuleXShortClosure returns [EObject current=null] : iv_ruleXShortClosure= ruleXShortClosure EOF ;
     public final EObject entryRuleXShortClosure() throws RecognitionException {
         EObject current = null;
 
@@ -14099,13 +14099,13 @@ public final EObject entryRuleXShortClosure() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4847:2: (iv_ruleXShortClosure= ruleXShortClosure EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4848:2: iv_ruleXShortClosure= ruleXShortClosure EOF
+            // InternalCheck.g:4847:2: (iv_ruleXShortClosure= ruleXShortClosure EOF )
+            // InternalCheck.g:4848:2: iv_ruleXShortClosure= ruleXShortClosure EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXShortClosureRule()); 
             }
-            pushFollow(FOLLOW_ruleXShortClosure_in_entryRuleXShortClosure11360);
+            pushFollow(FOLLOW_1);
             iv_ruleXShortClosure=ruleXShortClosure();
 
             state._fsp--;
@@ -14113,7 +14113,7 @@ public final EObject entryRuleXShortClosure() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXShortClosure; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXShortClosure11370); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -14131,7 +14131,7 @@ public final EObject entryRuleXShortClosure() throws RecognitionException {
 
 
     // $ANTLR start "ruleXShortClosure"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4855:1: ruleXShortClosure returns [EObject current=null] : ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) ) ;
+    // InternalCheck.g:4855:1: ruleXShortClosure returns [EObject current=null] : ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) ) ;
     public final EObject ruleXShortClosure() throws RecognitionException {
         EObject current = null;
 
@@ -14147,20 +14147,20 @@ public final EObject ruleXShortClosure() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4858:28: ( ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4859:1: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) )
+            // InternalCheck.g:4858:28: ( ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) ) )
+            // InternalCheck.g:4859:1: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4859:1: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4859:2: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) )
+            // InternalCheck.g:4859:1: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) )
+            // InternalCheck.g:4859:2: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4859:2: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4859:3: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) )
+            // InternalCheck.g:4859:2: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) )
+            // InternalCheck.g:4859:3: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4875:6: ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4875:7: () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) )
+            // InternalCheck.g:4875:6: ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) )
+            // InternalCheck.g:4875:7: () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4875:7: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4876:5: 
+            // InternalCheck.g:4875:7: ()
+            // InternalCheck.g:4876:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -14172,7 +14172,7 @@ public final EObject ruleXShortClosure() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4881:2: ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )?
+            // InternalCheck.g:4881:2: ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )?
             int alt98=2;
             int LA98_0 = input.LA(1);
 
@@ -14181,20 +14181,20 @@ public final EObject ruleXShortClosure() throws RecognitionException {
             }
             switch (alt98) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4881:3: ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )*
+                    // InternalCheck.g:4881:3: ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )*
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4881:3: ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4882:1: (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter )
+                    // InternalCheck.g:4881:3: ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) )
+                    // InternalCheck.g:4882:1: (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4882:1: (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4883:3: lv_declaredFormalParameters_1_0= ruleJvmFormalParameter
+                    // InternalCheck.g:4882:1: (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter )
+                    // InternalCheck.g:4883:3: lv_declaredFormalParameters_1_0= ruleJvmFormalParameter
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXShortClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_0_0_1_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleJvmFormalParameter_in_ruleXShortClosure11478);
+                    pushFollow(FOLLOW_81);
                     lv_declaredFormalParameters_1_0=ruleJvmFormalParameter();
 
                     state._fsp--;
@@ -14208,7 +14208,7 @@ public final EObject ruleXShortClosure() throws RecognitionException {
                              			current, 
                              			"declaredFormalParameters",
                               		lv_declaredFormalParameters_1_0, 
-                              		"JvmFormalParameter");
+                              		"org.eclipse.xtext.xbase.Xbase.JvmFormalParameter");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -14218,7 +14218,7 @@ public final EObject ruleXShortClosure() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4899:2: (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )*
+                    // InternalCheck.g:4899:2: (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )*
                     loop97:
                     do {
                         int alt97=2;
@@ -14231,26 +14231,26 @@ public final EObject ruleXShortClosure() throws RecognitionException {
 
                         switch (alt97) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4899:4: otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) )
+                    	    // InternalCheck.g:4899:4: otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) )
                     	    {
-                    	    otherlv_2=(Token)match(input,24,FOLLOW_24_in_ruleXShortClosure11491); if (state.failed) return current;
+                    	    otherlv_2=(Token)match(input,24,FOLLOW_27); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_2, grammarAccess.getXShortClosureAccess().getCommaKeyword_0_0_1_1_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4903:1: ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4904:1: (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter )
+                    	    // InternalCheck.g:4903:1: ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) )
+                    	    // InternalCheck.g:4904:1: (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4904:1: (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4905:3: lv_declaredFormalParameters_3_0= ruleJvmFormalParameter
+                    	    // InternalCheck.g:4904:1: (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter )
+                    	    // InternalCheck.g:4905:3: lv_declaredFormalParameters_3_0= ruleJvmFormalParameter
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getXShortClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_0_0_1_1_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleJvmFormalParameter_in_ruleXShortClosure11512);
+                    	    pushFollow(FOLLOW_81);
                     	    lv_declaredFormalParameters_3_0=ruleJvmFormalParameter();
 
                     	    state._fsp--;
@@ -14264,7 +14264,7 @@ public final EObject ruleXShortClosure() throws RecognitionException {
                     	             			current, 
                     	             			"declaredFormalParameters",
                     	              		lv_declaredFormalParameters_3_0, 
-                    	              		"JvmFormalParameter");
+                    	              		"org.eclipse.xtext.xbase.Xbase.JvmFormalParameter");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -14289,13 +14289,13 @@ public final EObject ruleXShortClosure() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4921:6: ( (lv_explicitSyntax_4_0= '|' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4922:1: (lv_explicitSyntax_4_0= '|' )
+            // InternalCheck.g:4921:6: ( (lv_explicitSyntax_4_0= '|' ) )
+            // InternalCheck.g:4922:1: (lv_explicitSyntax_4_0= '|' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4922:1: (lv_explicitSyntax_4_0= '|' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4923:3: lv_explicitSyntax_4_0= '|'
+            // InternalCheck.g:4922:1: (lv_explicitSyntax_4_0= '|' )
+            // InternalCheck.g:4923:3: lv_explicitSyntax_4_0= '|'
             {
-            lv_explicitSyntax_4_0=(Token)match(input,84,FOLLOW_84_in_ruleXShortClosure11534); if (state.failed) return current;
+            lv_explicitSyntax_4_0=(Token)match(input,84,FOLLOW_29); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                       newLeafNode(lv_explicitSyntax_4_0, grammarAccess.getXShortClosureAccess().getExplicitSyntaxVerticalLineKeyword_0_0_2_0());
@@ -14321,18 +14321,18 @@ public final EObject ruleXShortClosure() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4936:4: ( (lv_expression_5_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4937:1: (lv_expression_5_0= ruleXExpression )
+            // InternalCheck.g:4936:4: ( (lv_expression_5_0= ruleXExpression ) )
+            // InternalCheck.g:4937:1: (lv_expression_5_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4937:1: (lv_expression_5_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4938:3: lv_expression_5_0= ruleXExpression
+            // InternalCheck.g:4937:1: (lv_expression_5_0= ruleXExpression )
+            // InternalCheck.g:4938:3: lv_expression_5_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXShortClosureAccess().getExpressionXExpressionParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXShortClosure11570);
+            pushFollow(FOLLOW_2);
             lv_expression_5_0=ruleXExpression();
 
             state._fsp--;
@@ -14346,7 +14346,7 @@ public final EObject ruleXShortClosure() throws RecognitionException {
                      			current, 
                      			"expression",
                       		lv_expression_5_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -14379,7 +14379,7 @@ public final EObject ruleXShortClosure() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXParenthesizedExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4962:1: entryRuleXParenthesizedExpression returns [EObject current=null] : iv_ruleXParenthesizedExpression= ruleXParenthesizedExpression EOF ;
+    // InternalCheck.g:4962:1: entryRuleXParenthesizedExpression returns [EObject current=null] : iv_ruleXParenthesizedExpression= ruleXParenthesizedExpression EOF ;
     public final EObject entryRuleXParenthesizedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -14387,13 +14387,13 @@ public final EObject entryRuleXParenthesizedExpression() throws RecognitionExcep
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4963:2: (iv_ruleXParenthesizedExpression= ruleXParenthesizedExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4964:2: iv_ruleXParenthesizedExpression= ruleXParenthesizedExpression EOF
+            // InternalCheck.g:4963:2: (iv_ruleXParenthesizedExpression= ruleXParenthesizedExpression EOF )
+            // InternalCheck.g:4964:2: iv_ruleXParenthesizedExpression= ruleXParenthesizedExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXParenthesizedExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXParenthesizedExpression_in_entryRuleXParenthesizedExpression11606);
+            pushFollow(FOLLOW_1);
             iv_ruleXParenthesizedExpression=ruleXParenthesizedExpression();
 
             state._fsp--;
@@ -14401,7 +14401,7 @@ public final EObject entryRuleXParenthesizedExpression() throws RecognitionExcep
             if ( state.backtracking==0 ) {
                current =iv_ruleXParenthesizedExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXParenthesizedExpression11616); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -14419,7 +14419,7 @@ public final EObject entryRuleXParenthesizedExpression() throws RecognitionExcep
 
 
     // $ANTLR start "ruleXParenthesizedExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4971:1: ruleXParenthesizedExpression returns [EObject current=null] : (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' ) ;
+    // InternalCheck.g:4971:1: ruleXParenthesizedExpression returns [EObject current=null] : (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' ) ;
     public final EObject ruleXParenthesizedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -14431,13 +14431,13 @@ public final EObject ruleXParenthesizedExpression() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4974:28: ( (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4975:1: (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' )
+            // InternalCheck.g:4974:28: ( (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' ) )
+            // InternalCheck.g:4975:1: (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4975:1: (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4975:3: otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')'
+            // InternalCheck.g:4975:1: (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' )
+            // InternalCheck.g:4975:3: otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')'
             {
-            otherlv_0=(Token)match(input,23,FOLLOW_23_in_ruleXParenthesizedExpression11653); if (state.failed) return current;
+            otherlv_0=(Token)match(input,23,FOLLOW_29); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getXParenthesizedExpressionAccess().getLeftParenthesisKeyword_0());
@@ -14448,7 +14448,7 @@ public final EObject ruleXParenthesizedExpression() throws RecognitionException
                       newCompositeNode(grammarAccess.getXParenthesizedExpressionAccess().getXExpressionParserRuleCall_1()); 
                   
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXParenthesizedExpression11675);
+            pushFollow(FOLLOW_26);
             this_XExpression_1=ruleXExpression();
 
             state._fsp--;
@@ -14459,7 +14459,7 @@ public final EObject ruleXParenthesizedExpression() throws RecognitionException
                       afterParserOrEnumRuleCall();
                   
             }
-            otherlv_2=(Token)match(input,25,FOLLOW_25_in_ruleXParenthesizedExpression11686); if (state.failed) return current;
+            otherlv_2=(Token)match(input,25,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getXParenthesizedExpressionAccess().getRightParenthesisKeyword_2());
@@ -14488,7 +14488,7 @@ public final EObject ruleXParenthesizedExpression() throws RecognitionException
 
 
     // $ANTLR start "entryRuleXIfExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5000:1: entryRuleXIfExpression returns [EObject current=null] : iv_ruleXIfExpression= ruleXIfExpression EOF ;
+    // InternalCheck.g:5000:1: entryRuleXIfExpression returns [EObject current=null] : iv_ruleXIfExpression= ruleXIfExpression EOF ;
     public final EObject entryRuleXIfExpression() throws RecognitionException {
         EObject current = null;
 
@@ -14496,13 +14496,13 @@ public final EObject entryRuleXIfExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5001:2: (iv_ruleXIfExpression= ruleXIfExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5002:2: iv_ruleXIfExpression= ruleXIfExpression EOF
+            // InternalCheck.g:5001:2: (iv_ruleXIfExpression= ruleXIfExpression EOF )
+            // InternalCheck.g:5002:2: iv_ruleXIfExpression= ruleXIfExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXIfExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXIfExpression_in_entryRuleXIfExpression11722);
+            pushFollow(FOLLOW_1);
             iv_ruleXIfExpression=ruleXIfExpression();
 
             state._fsp--;
@@ -14510,7 +14510,7 @@ public final EObject entryRuleXIfExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXIfExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXIfExpression11732); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -14528,7 +14528,7 @@ public final EObject entryRuleXIfExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXIfExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5009:1: ruleXIfExpression returns [EObject current=null] : ( () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )? ) ;
+    // InternalCheck.g:5009:1: ruleXIfExpression returns [EObject current=null] : ( () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )? ) ;
     public final EObject ruleXIfExpression() throws RecognitionException {
         EObject current = null;
 
@@ -14546,14 +14546,14 @@ public final EObject ruleXIfExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5012:28: ( ( () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )? ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5013:1: ( () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )? )
+            // InternalCheck.g:5012:28: ( ( () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )? ) )
+            // InternalCheck.g:5013:1: ( () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )? )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5013:1: ( () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )? )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5013:2: () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )?
+            // InternalCheck.g:5013:1: ( () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )? )
+            // InternalCheck.g:5013:2: () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )?
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5013:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5014:5: 
+            // InternalCheck.g:5013:2: ()
+            // InternalCheck.g:5014:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -14565,30 +14565,30 @@ public final EObject ruleXIfExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,85,FOLLOW_85_in_ruleXIfExpression11778); if (state.failed) return current;
+            otherlv_1=(Token)match(input,85,FOLLOW_24); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXIfExpressionAccess().getIfKeyword_1());
                   
             }
-            otherlv_2=(Token)match(input,23,FOLLOW_23_in_ruleXIfExpression11790); if (state.failed) return current;
+            otherlv_2=(Token)match(input,23,FOLLOW_29); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getXIfExpressionAccess().getLeftParenthesisKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5027:1: ( (lv_if_3_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5028:1: (lv_if_3_0= ruleXExpression )
+            // InternalCheck.g:5027:1: ( (lv_if_3_0= ruleXExpression ) )
+            // InternalCheck.g:5028:1: (lv_if_3_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5028:1: (lv_if_3_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5029:3: lv_if_3_0= ruleXExpression
+            // InternalCheck.g:5028:1: (lv_if_3_0= ruleXExpression )
+            // InternalCheck.g:5029:3: lv_if_3_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXIfExpressionAccess().getIfXExpressionParserRuleCall_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXIfExpression11811);
+            pushFollow(FOLLOW_26);
             lv_if_3_0=ruleXExpression();
 
             state._fsp--;
@@ -14602,7 +14602,7 @@ public final EObject ruleXIfExpression() throws RecognitionException {
                      			current, 
                      			"if",
                       		lv_if_3_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -14612,24 +14612,24 @@ public final EObject ruleXIfExpression() throws RecognitionException {
 
             }
 
-            otherlv_4=(Token)match(input,25,FOLLOW_25_in_ruleXIfExpression11823); if (state.failed) return current;
+            otherlv_4=(Token)match(input,25,FOLLOW_29); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_4, grammarAccess.getXIfExpressionAccess().getRightParenthesisKeyword_4());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5049:1: ( (lv_then_5_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5050:1: (lv_then_5_0= ruleXExpression )
+            // InternalCheck.g:5049:1: ( (lv_then_5_0= ruleXExpression ) )
+            // InternalCheck.g:5050:1: (lv_then_5_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5050:1: (lv_then_5_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5051:3: lv_then_5_0= ruleXExpression
+            // InternalCheck.g:5050:1: (lv_then_5_0= ruleXExpression )
+            // InternalCheck.g:5051:3: lv_then_5_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXIfExpressionAccess().getThenXExpressionParserRuleCall_5_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXIfExpression11844);
+            pushFollow(FOLLOW_85);
             lv_then_5_0=ruleXExpression();
 
             state._fsp--;
@@ -14643,7 +14643,7 @@ public final EObject ruleXIfExpression() throws RecognitionException {
                      			current, 
                      			"then",
                       		lv_then_5_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -14653,7 +14653,7 @@ public final EObject ruleXIfExpression() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5067:2: ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )?
+            // InternalCheck.g:5067:2: ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )?
             int alt99=2;
             int LA99_0 = input.LA(1);
 
@@ -14666,12 +14666,12 @@ public final EObject ruleXIfExpression() throws RecognitionException {
             }
             switch (alt99) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5067:3: ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) )
+                    // InternalCheck.g:5067:3: ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5067:3: ( ( 'else' )=>otherlv_6= 'else' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5067:4: ( 'else' )=>otherlv_6= 'else'
+                    // InternalCheck.g:5067:3: ( ( 'else' )=>otherlv_6= 'else' )
+                    // InternalCheck.g:5067:4: ( 'else' )=>otherlv_6= 'else'
                     {
-                    otherlv_6=(Token)match(input,86,FOLLOW_86_in_ruleXIfExpression11865); if (state.failed) return current;
+                    otherlv_6=(Token)match(input,86,FOLLOW_29); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_6, grammarAccess.getXIfExpressionAccess().getElseKeyword_6_0());
@@ -14680,18 +14680,18 @@ public final EObject ruleXIfExpression() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5072:2: ( (lv_else_7_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5073:1: (lv_else_7_0= ruleXExpression )
+                    // InternalCheck.g:5072:2: ( (lv_else_7_0= ruleXExpression ) )
+                    // InternalCheck.g:5073:1: (lv_else_7_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5073:1: (lv_else_7_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5074:3: lv_else_7_0= ruleXExpression
+                    // InternalCheck.g:5073:1: (lv_else_7_0= ruleXExpression )
+                    // InternalCheck.g:5074:3: lv_else_7_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXIfExpressionAccess().getElseXExpressionParserRuleCall_6_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXIfExpression11887);
+                    pushFollow(FOLLOW_2);
                     lv_else_7_0=ruleXExpression();
 
                     state._fsp--;
@@ -14705,7 +14705,7 @@ public final EObject ruleXIfExpression() throws RecognitionException {
                              			current, 
                              			"else",
                               		lv_else_7_0, 
-                              		"XExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -14744,7 +14744,7 @@ public final EObject ruleXIfExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXSwitchExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5098:1: entryRuleXSwitchExpression returns [EObject current=null] : iv_ruleXSwitchExpression= ruleXSwitchExpression EOF ;
+    // InternalCheck.g:5098:1: entryRuleXSwitchExpression returns [EObject current=null] : iv_ruleXSwitchExpression= ruleXSwitchExpression EOF ;
     public final EObject entryRuleXSwitchExpression() throws RecognitionException {
         EObject current = null;
 
@@ -14752,13 +14752,13 @@ public final EObject entryRuleXSwitchExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5099:2: (iv_ruleXSwitchExpression= ruleXSwitchExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5100:2: iv_ruleXSwitchExpression= ruleXSwitchExpression EOF
+            // InternalCheck.g:5099:2: (iv_ruleXSwitchExpression= ruleXSwitchExpression EOF )
+            // InternalCheck.g:5100:2: iv_ruleXSwitchExpression= ruleXSwitchExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXSwitchExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXSwitchExpression_in_entryRuleXSwitchExpression11925);
+            pushFollow(FOLLOW_1);
             iv_ruleXSwitchExpression=ruleXSwitchExpression();
 
             state._fsp--;
@@ -14766,7 +14766,7 @@ public final EObject entryRuleXSwitchExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXSwitchExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXSwitchExpression11935); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -14784,7 +14784,7 @@ public final EObject entryRuleXSwitchExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXSwitchExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5107:1: ruleXSwitchExpression returns [EObject current=null] : ( () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}' ) ;
+    // InternalCheck.g:5107:1: ruleXSwitchExpression returns [EObject current=null] : ( () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}' ) ;
     public final EObject ruleXSwitchExpression() throws RecognitionException {
         EObject current = null;
 
@@ -14813,14 +14813,14 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5110:28: ( ( () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5111:1: ( () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}' )
+            // InternalCheck.g:5110:28: ( ( () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}' ) )
+            // InternalCheck.g:5111:1: ( () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5111:1: ( () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5111:2: () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}'
+            // InternalCheck.g:5111:1: ( () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}' )
+            // InternalCheck.g:5111:2: () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}'
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5111:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5112:5: 
+            // InternalCheck.g:5111:2: ()
+            // InternalCheck.g:5112:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -14832,46 +14832,46 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,87,FOLLOW_87_in_ruleXSwitchExpression11981); if (state.failed) return current;
+            otherlv_1=(Token)match(input,87,FOLLOW_86); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXSwitchExpressionAccess().getSwitchKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5121:1: ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) )
+            // InternalCheck.g:5121:1: ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) )
             int alt101=2;
             alt101 = dfa101.predict(input);
             switch (alt101) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5121:2: ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' )
+                    // InternalCheck.g:5121:2: ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5121:2: ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5121:3: ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')'
+                    // InternalCheck.g:5121:2: ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' )
+                    // InternalCheck.g:5121:3: ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')'
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5121:3: ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5121:4: ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
+                    // InternalCheck.g:5121:3: ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) )
+                    // InternalCheck.g:5121:4: ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5127:5: (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5127:7: otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':'
+                    // InternalCheck.g:5127:5: (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
+                    // InternalCheck.g:5127:7: otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':'
                     {
-                    otherlv_2=(Token)match(input,23,FOLLOW_23_in_ruleXSwitchExpression12019); if (state.failed) return current;
+                    otherlv_2=(Token)match(input,23,FOLLOW_27); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_2, grammarAccess.getXSwitchExpressionAccess().getLeftParenthesisKeyword_2_0_0_0_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5131:1: ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5132:1: (lv_declaredParam_3_0= ruleJvmFormalParameter )
+                    // InternalCheck.g:5131:1: ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) )
+                    // InternalCheck.g:5132:1: (lv_declaredParam_3_0= ruleJvmFormalParameter )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5132:1: (lv_declaredParam_3_0= ruleJvmFormalParameter )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5133:3: lv_declaredParam_3_0= ruleJvmFormalParameter
+                    // InternalCheck.g:5132:1: (lv_declaredParam_3_0= ruleJvmFormalParameter )
+                    // InternalCheck.g:5133:3: lv_declaredParam_3_0= ruleJvmFormalParameter
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXSwitchExpressionAccess().getDeclaredParamJvmFormalParameterParserRuleCall_2_0_0_0_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleJvmFormalParameter_in_ruleXSwitchExpression12040);
+                    pushFollow(FOLLOW_87);
                     lv_declaredParam_3_0=ruleJvmFormalParameter();
 
                     state._fsp--;
@@ -14885,7 +14885,7 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
                              			current, 
                              			"declaredParam",
                               		lv_declaredParam_3_0, 
-                              		"JvmFormalParameter");
+                              		"org.eclipse.xtext.xbase.Xbase.JvmFormalParameter");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -14895,7 +14895,7 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
 
                     }
 
-                    otherlv_4=(Token)match(input,88,FOLLOW_88_in_ruleXSwitchExpression12052); if (state.failed) return current;
+                    otherlv_4=(Token)match(input,88,FOLLOW_29); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_4, grammarAccess.getXSwitchExpressionAccess().getColonKeyword_2_0_0_0_2());
@@ -14907,18 +14907,18 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5153:3: ( (lv_switch_5_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5154:1: (lv_switch_5_0= ruleXExpression )
+                    // InternalCheck.g:5153:3: ( (lv_switch_5_0= ruleXExpression ) )
+                    // InternalCheck.g:5154:1: (lv_switch_5_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5154:1: (lv_switch_5_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5155:3: lv_switch_5_0= ruleXExpression
+                    // InternalCheck.g:5154:1: (lv_switch_5_0= ruleXExpression )
+                    // InternalCheck.g:5155:3: lv_switch_5_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXSwitchExpressionAccess().getSwitchXExpressionParserRuleCall_2_0_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXSwitchExpression12075);
+                    pushFollow(FOLLOW_26);
                     lv_switch_5_0=ruleXExpression();
 
                     state._fsp--;
@@ -14932,7 +14932,7 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
                              			current, 
                              			"switch",
                               		lv_switch_5_0, 
-                              		"XExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -14942,7 +14942,7 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
 
                     }
 
-                    otherlv_6=(Token)match(input,25,FOLLOW_25_in_ruleXSwitchExpression12087); if (state.failed) return current;
+                    otherlv_6=(Token)match(input,25,FOLLOW_9); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_6, grammarAccess.getXSwitchExpressionAccess().getRightParenthesisKeyword_2_0_2());
@@ -14955,33 +14955,33 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5176:6: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) )
+                    // InternalCheck.g:5176:6: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5176:6: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5176:7: ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) )
+                    // InternalCheck.g:5176:6: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) )
+                    // InternalCheck.g:5176:7: ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5176:7: ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )?
+                    // InternalCheck.g:5176:7: ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )?
                     int alt100=2;
                     alt100 = dfa100.predict(input);
                     switch (alt100) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5176:8: ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' )
+                            // InternalCheck.g:5176:8: ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5181:5: ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5181:6: ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':'
+                            // InternalCheck.g:5181:5: ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' )
+                            // InternalCheck.g:5181:6: ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':'
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5181:6: ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5182:1: (lv_declaredParam_7_0= ruleJvmFormalParameter )
+                            // InternalCheck.g:5181:6: ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) )
+                            // InternalCheck.g:5182:1: (lv_declaredParam_7_0= ruleJvmFormalParameter )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5182:1: (lv_declaredParam_7_0= ruleJvmFormalParameter )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5183:3: lv_declaredParam_7_0= ruleJvmFormalParameter
+                            // InternalCheck.g:5182:1: (lv_declaredParam_7_0= ruleJvmFormalParameter )
+                            // InternalCheck.g:5183:3: lv_declaredParam_7_0= ruleJvmFormalParameter
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXSwitchExpressionAccess().getDeclaredParamJvmFormalParameterParserRuleCall_2_1_0_0_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleJvmFormalParameter_in_ruleXSwitchExpression12136);
+                            pushFollow(FOLLOW_87);
                             lv_declaredParam_7_0=ruleJvmFormalParameter();
 
                             state._fsp--;
@@ -14995,7 +14995,7 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
                                      			current, 
                                      			"declaredParam",
                                       		lv_declaredParam_7_0, 
-                                      		"JvmFormalParameter");
+                                      		"org.eclipse.xtext.xbase.Xbase.JvmFormalParameter");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -15005,7 +15005,7 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
 
                             }
 
-                            otherlv_8=(Token)match(input,88,FOLLOW_88_in_ruleXSwitchExpression12148); if (state.failed) return current;
+                            otherlv_8=(Token)match(input,88,FOLLOW_29); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                   	newLeafNode(otherlv_8, grammarAccess.getXSwitchExpressionAccess().getColonKeyword_2_1_0_0_1());
@@ -15020,18 +15020,18 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5203:4: ( (lv_switch_9_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5204:1: (lv_switch_9_0= ruleXExpression )
+                    // InternalCheck.g:5203:4: ( (lv_switch_9_0= ruleXExpression ) )
+                    // InternalCheck.g:5204:1: (lv_switch_9_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5204:1: (lv_switch_9_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5205:3: lv_switch_9_0= ruleXExpression
+                    // InternalCheck.g:5204:1: (lv_switch_9_0= ruleXExpression )
+                    // InternalCheck.g:5205:3: lv_switch_9_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXSwitchExpressionAccess().getSwitchXExpressionParserRuleCall_2_1_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXSwitchExpression12172);
+                    pushFollow(FOLLOW_9);
                     lv_switch_9_0=ruleXExpression();
 
                     state._fsp--;
@@ -15045,7 +15045,7 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
                              			current, 
                              			"switch",
                               		lv_switch_9_0, 
-                              		"XExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -15064,13 +15064,13 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
 
             }
 
-            otherlv_10=(Token)match(input,18,FOLLOW_18_in_ruleXSwitchExpression12186); if (state.failed) return current;
+            otherlv_10=(Token)match(input,18,FOLLOW_88); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_10, grammarAccess.getXSwitchExpressionAccess().getLeftCurlyBracketKeyword_3());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5225:1: ( (lv_cases_11_0= ruleXCasePart ) )*
+            // InternalCheck.g:5225:1: ( (lv_cases_11_0= ruleXCasePart ) )*
             loop102:
             do {
                 int alt102=2;
@@ -15083,17 +15083,17 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
 
                 switch (alt102) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5226:1: (lv_cases_11_0= ruleXCasePart )
+            	    // InternalCheck.g:5226:1: (lv_cases_11_0= ruleXCasePart )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5226:1: (lv_cases_11_0= ruleXCasePart )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5227:3: lv_cases_11_0= ruleXCasePart
+            	    // InternalCheck.g:5226:1: (lv_cases_11_0= ruleXCasePart )
+            	    // InternalCheck.g:5227:3: lv_cases_11_0= ruleXCasePart
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXSwitchExpressionAccess().getCasesXCasePartParserRuleCall_4_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXCasePart_in_ruleXSwitchExpression12207);
+            	    pushFollow(FOLLOW_88);
             	    lv_cases_11_0=ruleXCasePart();
 
             	    state._fsp--;
@@ -15107,7 +15107,7 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
             	             			current, 
             	             			"cases",
             	              		lv_cases_11_0, 
-            	              		"XCasePart");
+            	              		"org.eclipse.xtext.xbase.Xbase.XCasePart");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -15123,7 +15123,7 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
                 }
             } while (true);
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5243:3: (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )?
+            // InternalCheck.g:5243:3: (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )?
             int alt103=2;
             int LA103_0 = input.LA(1);
 
@@ -15132,32 +15132,32 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
             }
             switch (alt103) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5243:5: otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) )
+                    // InternalCheck.g:5243:5: otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) )
                     {
-                    otherlv_12=(Token)match(input,89,FOLLOW_89_in_ruleXSwitchExpression12221); if (state.failed) return current;
+                    otherlv_12=(Token)match(input,89,FOLLOW_87); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_12, grammarAccess.getXSwitchExpressionAccess().getDefaultKeyword_5_0());
                           
                     }
-                    otherlv_13=(Token)match(input,88,FOLLOW_88_in_ruleXSwitchExpression12233); if (state.failed) return current;
+                    otherlv_13=(Token)match(input,88,FOLLOW_29); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_13, grammarAccess.getXSwitchExpressionAccess().getColonKeyword_5_1());
                           
                     }
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5251:1: ( (lv_default_14_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5252:1: (lv_default_14_0= ruleXExpression )
+                    // InternalCheck.g:5251:1: ( (lv_default_14_0= ruleXExpression ) )
+                    // InternalCheck.g:5252:1: (lv_default_14_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5252:1: (lv_default_14_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5253:3: lv_default_14_0= ruleXExpression
+                    // InternalCheck.g:5252:1: (lv_default_14_0= ruleXExpression )
+                    // InternalCheck.g:5253:3: lv_default_14_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXSwitchExpressionAccess().getDefaultXExpressionParserRuleCall_5_2_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXSwitchExpression12254);
+                    pushFollow(FOLLOW_89);
                     lv_default_14_0=ruleXExpression();
 
                     state._fsp--;
@@ -15171,7 +15171,7 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
                              			current, 
                              			"default",
                               		lv_default_14_0, 
-                              		"XExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -15187,7 +15187,7 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
 
             }
 
-            otherlv_15=(Token)match(input,19,FOLLOW_19_in_ruleXSwitchExpression12268); if (state.failed) return current;
+            otherlv_15=(Token)match(input,19,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_15, grammarAccess.getXSwitchExpressionAccess().getRightCurlyBracketKeyword_6());
@@ -15216,7 +15216,7 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXCasePart"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5281:1: entryRuleXCasePart returns [EObject current=null] : iv_ruleXCasePart= ruleXCasePart EOF ;
+    // InternalCheck.g:5281:1: entryRuleXCasePart returns [EObject current=null] : iv_ruleXCasePart= ruleXCasePart EOF ;
     public final EObject entryRuleXCasePart() throws RecognitionException {
         EObject current = null;
 
@@ -15224,13 +15224,13 @@ public final EObject entryRuleXCasePart() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5282:2: (iv_ruleXCasePart= ruleXCasePart EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5283:2: iv_ruleXCasePart= ruleXCasePart EOF
+            // InternalCheck.g:5282:2: (iv_ruleXCasePart= ruleXCasePart EOF )
+            // InternalCheck.g:5283:2: iv_ruleXCasePart= ruleXCasePart EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXCasePartRule()); 
             }
-            pushFollow(FOLLOW_ruleXCasePart_in_entryRuleXCasePart12304);
+            pushFollow(FOLLOW_1);
             iv_ruleXCasePart=ruleXCasePart();
 
             state._fsp--;
@@ -15238,7 +15238,7 @@ public final EObject entryRuleXCasePart() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXCasePart; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXCasePart12314); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -15256,7 +15256,7 @@ public final EObject entryRuleXCasePart() throws RecognitionException {
 
 
     // $ANTLR start "ruleXCasePart"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5290:1: ruleXCasePart returns [EObject current=null] : ( () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) ) ) ;
+    // InternalCheck.g:5290:1: ruleXCasePart returns [EObject current=null] : ( () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) ) ) ;
     public final EObject ruleXCasePart() throws RecognitionException {
         EObject current = null;
 
@@ -15273,14 +15273,14 @@ public final EObject ruleXCasePart() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5293:28: ( ( () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5294:1: ( () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) ) )
+            // InternalCheck.g:5293:28: ( ( () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) ) ) )
+            // InternalCheck.g:5294:1: ( () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5294:1: ( () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5294:2: () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) )
+            // InternalCheck.g:5294:1: ( () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) ) )
+            // InternalCheck.g:5294:2: () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5294:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5295:5: 
+            // InternalCheck.g:5294:2: ()
+            // InternalCheck.g:5295:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -15292,7 +15292,7 @@ public final EObject ruleXCasePart() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5300:2: ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )?
+            // InternalCheck.g:5300:2: ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )?
             int alt104=2;
             int LA104_0 = input.LA(1);
 
@@ -15301,17 +15301,17 @@ public final EObject ruleXCasePart() throws RecognitionException {
             }
             switch (alt104) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5301:1: (lv_typeGuard_1_0= ruleJvmTypeReference )
+                    // InternalCheck.g:5301:1: (lv_typeGuard_1_0= ruleJvmTypeReference )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5301:1: (lv_typeGuard_1_0= ruleJvmTypeReference )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5302:3: lv_typeGuard_1_0= ruleJvmTypeReference
+                    // InternalCheck.g:5301:1: (lv_typeGuard_1_0= ruleJvmTypeReference )
+                    // InternalCheck.g:5302:3: lv_typeGuard_1_0= ruleJvmTypeReference
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXCasePartAccess().getTypeGuardJvmTypeReferenceParserRuleCall_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleXCasePart12369);
+                    pushFollow(FOLLOW_90);
                     lv_typeGuard_1_0=ruleJvmTypeReference();
 
                     state._fsp--;
@@ -15325,7 +15325,7 @@ public final EObject ruleXCasePart() throws RecognitionException {
                              			current, 
                              			"typeGuard",
                               		lv_typeGuard_1_0, 
-                              		"JvmTypeReference");
+                              		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -15338,7 +15338,7 @@ public final EObject ruleXCasePart() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5318:3: (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )?
+            // InternalCheck.g:5318:3: (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )?
             int alt105=2;
             int LA105_0 = input.LA(1);
 
@@ -15347,26 +15347,26 @@ public final EObject ruleXCasePart() throws RecognitionException {
             }
             switch (alt105) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5318:5: otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) )
+                    // InternalCheck.g:5318:5: otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) )
                     {
-                    otherlv_2=(Token)match(input,90,FOLLOW_90_in_ruleXCasePart12383); if (state.failed) return current;
+                    otherlv_2=(Token)match(input,90,FOLLOW_29); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_2, grammarAccess.getXCasePartAccess().getCaseKeyword_2_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5322:1: ( (lv_case_3_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5323:1: (lv_case_3_0= ruleXExpression )
+                    // InternalCheck.g:5322:1: ( (lv_case_3_0= ruleXExpression ) )
+                    // InternalCheck.g:5323:1: (lv_case_3_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5323:1: (lv_case_3_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5324:3: lv_case_3_0= ruleXExpression
+                    // InternalCheck.g:5323:1: (lv_case_3_0= ruleXExpression )
+                    // InternalCheck.g:5324:3: lv_case_3_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXCasePartAccess().getCaseXExpressionParserRuleCall_2_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXCasePart12404);
+                    pushFollow(FOLLOW_91);
                     lv_case_3_0=ruleXExpression();
 
                     state._fsp--;
@@ -15380,7 +15380,7 @@ public final EObject ruleXCasePart() throws RecognitionException {
                              			current, 
                              			"case",
                               		lv_case_3_0, 
-                              		"XExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -15396,7 +15396,7 @@ public final EObject ruleXCasePart() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5340:4: ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) )
+            // InternalCheck.g:5340:4: ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) )
             int alt106=2;
             int LA106_0 = input.LA(1);
 
@@ -15415,29 +15415,29 @@ else if ( (LA106_0==24) ) {
             }
             switch (alt106) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5340:5: (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) )
+                    // InternalCheck.g:5340:5: (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5340:5: (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5340:7: otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) )
+                    // InternalCheck.g:5340:5: (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) )
+                    // InternalCheck.g:5340:7: otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) )
                     {
-                    otherlv_4=(Token)match(input,88,FOLLOW_88_in_ruleXCasePart12420); if (state.failed) return current;
+                    otherlv_4=(Token)match(input,88,FOLLOW_29); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_4, grammarAccess.getXCasePartAccess().getColonKeyword_3_0_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5344:1: ( (lv_then_5_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5345:1: (lv_then_5_0= ruleXExpression )
+                    // InternalCheck.g:5344:1: ( (lv_then_5_0= ruleXExpression ) )
+                    // InternalCheck.g:5345:1: (lv_then_5_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5345:1: (lv_then_5_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5346:3: lv_then_5_0= ruleXExpression
+                    // InternalCheck.g:5345:1: (lv_then_5_0= ruleXExpression )
+                    // InternalCheck.g:5346:3: lv_then_5_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXCasePartAccess().getThenXExpressionParserRuleCall_3_0_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXCasePart12441);
+                    pushFollow(FOLLOW_2);
                     lv_then_5_0=ruleXExpression();
 
                     state._fsp--;
@@ -15451,7 +15451,7 @@ else if ( (LA106_0==24) ) {
                              			current, 
                              			"then",
                               		lv_then_5_0, 
-                              		"XExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -15468,15 +15468,15 @@ else if ( (LA106_0==24) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5363:6: ( (lv_fallThrough_6_0= ',' ) )
+                    // InternalCheck.g:5363:6: ( (lv_fallThrough_6_0= ',' ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5363:6: ( (lv_fallThrough_6_0= ',' ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5364:1: (lv_fallThrough_6_0= ',' )
+                    // InternalCheck.g:5363:6: ( (lv_fallThrough_6_0= ',' ) )
+                    // InternalCheck.g:5364:1: (lv_fallThrough_6_0= ',' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5364:1: (lv_fallThrough_6_0= ',' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5365:3: lv_fallThrough_6_0= ','
+                    // InternalCheck.g:5364:1: (lv_fallThrough_6_0= ',' )
+                    // InternalCheck.g:5365:3: lv_fallThrough_6_0= ','
                     {
-                    lv_fallThrough_6_0=(Token)match(input,24,FOLLOW_24_in_ruleXCasePart12466); if (state.failed) return current;
+                    lv_fallThrough_6_0=(Token)match(input,24,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_fallThrough_6_0, grammarAccess.getXCasePartAccess().getFallThroughCommaKeyword_3_1_0());
@@ -15525,7 +15525,7 @@ else if ( (LA106_0==24) ) {
 
 
     // $ANTLR start "entryRuleXForLoopExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5386:1: entryRuleXForLoopExpression returns [EObject current=null] : iv_ruleXForLoopExpression= ruleXForLoopExpression EOF ;
+    // InternalCheck.g:5386:1: entryRuleXForLoopExpression returns [EObject current=null] : iv_ruleXForLoopExpression= ruleXForLoopExpression EOF ;
     public final EObject entryRuleXForLoopExpression() throws RecognitionException {
         EObject current = null;
 
@@ -15533,13 +15533,13 @@ public final EObject entryRuleXForLoopExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5387:2: (iv_ruleXForLoopExpression= ruleXForLoopExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5388:2: iv_ruleXForLoopExpression= ruleXForLoopExpression EOF
+            // InternalCheck.g:5387:2: (iv_ruleXForLoopExpression= ruleXForLoopExpression EOF )
+            // InternalCheck.g:5388:2: iv_ruleXForLoopExpression= ruleXForLoopExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXForLoopExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXForLoopExpression_in_entryRuleXForLoopExpression12516);
+            pushFollow(FOLLOW_1);
             iv_ruleXForLoopExpression=ruleXForLoopExpression();
 
             state._fsp--;
@@ -15547,7 +15547,7 @@ public final EObject entryRuleXForLoopExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXForLoopExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXForLoopExpression12526); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -15565,7 +15565,7 @@ public final EObject entryRuleXForLoopExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXForLoopExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5395:1: ruleXForLoopExpression returns [EObject current=null] : ( ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) ) ) ;
+    // InternalCheck.g:5395:1: ruleXForLoopExpression returns [EObject current=null] : ( ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) ) ) ;
     public final EObject ruleXForLoopExpression() throws RecognitionException {
         EObject current = null;
 
@@ -15583,20 +15583,20 @@ public final EObject ruleXForLoopExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5398:28: ( ( ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5399:1: ( ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) ) )
+            // InternalCheck.g:5398:28: ( ( ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) ) ) )
+            // InternalCheck.g:5399:1: ( ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5399:1: ( ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5399:2: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) )
+            // InternalCheck.g:5399:1: ( ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) ) )
+            // InternalCheck.g:5399:2: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5399:2: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5399:3: ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
+            // InternalCheck.g:5399:2: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) )
+            // InternalCheck.g:5399:3: ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5407:5: ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5407:6: () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':'
+            // InternalCheck.g:5407:5: ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
+            // InternalCheck.g:5407:6: () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':'
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5407:6: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5408:5: 
+            // InternalCheck.g:5407:6: ()
+            // InternalCheck.g:5408:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -15608,30 +15608,30 @@ public final EObject ruleXForLoopExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,16,FOLLOW_16_in_ruleXForLoopExpression12603); if (state.failed) return current;
+            otherlv_1=(Token)match(input,16,FOLLOW_24); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXForLoopExpressionAccess().getForKeyword_0_0_1());
                   
             }
-            otherlv_2=(Token)match(input,23,FOLLOW_23_in_ruleXForLoopExpression12615); if (state.failed) return current;
+            otherlv_2=(Token)match(input,23,FOLLOW_27); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getXForLoopExpressionAccess().getLeftParenthesisKeyword_0_0_2());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5421:1: ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5422:1: (lv_declaredParam_3_0= ruleJvmFormalParameter )
+            // InternalCheck.g:5421:1: ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) )
+            // InternalCheck.g:5422:1: (lv_declaredParam_3_0= ruleJvmFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5422:1: (lv_declaredParam_3_0= ruleJvmFormalParameter )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5423:3: lv_declaredParam_3_0= ruleJvmFormalParameter
+            // InternalCheck.g:5422:1: (lv_declaredParam_3_0= ruleJvmFormalParameter )
+            // InternalCheck.g:5423:3: lv_declaredParam_3_0= ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXForLoopExpressionAccess().getDeclaredParamJvmFormalParameterParserRuleCall_0_0_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleJvmFormalParameter_in_ruleXForLoopExpression12636);
+            pushFollow(FOLLOW_87);
             lv_declaredParam_3_0=ruleJvmFormalParameter();
 
             state._fsp--;
@@ -15645,7 +15645,7 @@ public final EObject ruleXForLoopExpression() throws RecognitionException {
                      			current, 
                      			"declaredParam",
                       		lv_declaredParam_3_0, 
-                      		"JvmFormalParameter");
+                      		"org.eclipse.xtext.xbase.Xbase.JvmFormalParameter");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -15655,7 +15655,7 @@ public final EObject ruleXForLoopExpression() throws RecognitionException {
 
             }
 
-            otherlv_4=(Token)match(input,88,FOLLOW_88_in_ruleXForLoopExpression12648); if (state.failed) return current;
+            otherlv_4=(Token)match(input,88,FOLLOW_29); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_4, grammarAccess.getXForLoopExpressionAccess().getColonKeyword_0_0_4());
@@ -15667,18 +15667,18 @@ public final EObject ruleXForLoopExpression() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5443:3: ( (lv_forExpression_5_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5444:1: (lv_forExpression_5_0= ruleXExpression )
+            // InternalCheck.g:5443:3: ( (lv_forExpression_5_0= ruleXExpression ) )
+            // InternalCheck.g:5444:1: (lv_forExpression_5_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5444:1: (lv_forExpression_5_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5445:3: lv_forExpression_5_0= ruleXExpression
+            // InternalCheck.g:5444:1: (lv_forExpression_5_0= ruleXExpression )
+            // InternalCheck.g:5445:3: lv_forExpression_5_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXForLoopExpressionAccess().getForExpressionXExpressionParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXForLoopExpression12671);
+            pushFollow(FOLLOW_26);
             lv_forExpression_5_0=ruleXExpression();
 
             state._fsp--;
@@ -15692,7 +15692,7 @@ public final EObject ruleXForLoopExpression() throws RecognitionException {
                      			current, 
                      			"forExpression",
                       		lv_forExpression_5_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -15702,24 +15702,24 @@ public final EObject ruleXForLoopExpression() throws RecognitionException {
 
             }
 
-            otherlv_6=(Token)match(input,25,FOLLOW_25_in_ruleXForLoopExpression12683); if (state.failed) return current;
+            otherlv_6=(Token)match(input,25,FOLLOW_29); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_6, grammarAccess.getXForLoopExpressionAccess().getRightParenthesisKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5465:1: ( (lv_eachExpression_7_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5466:1: (lv_eachExpression_7_0= ruleXExpression )
+            // InternalCheck.g:5465:1: ( (lv_eachExpression_7_0= ruleXExpression ) )
+            // InternalCheck.g:5466:1: (lv_eachExpression_7_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5466:1: (lv_eachExpression_7_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5467:3: lv_eachExpression_7_0= ruleXExpression
+            // InternalCheck.g:5466:1: (lv_eachExpression_7_0= ruleXExpression )
+            // InternalCheck.g:5467:3: lv_eachExpression_7_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXForLoopExpressionAccess().getEachExpressionXExpressionParserRuleCall_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXForLoopExpression12704);
+            pushFollow(FOLLOW_2);
             lv_eachExpression_7_0=ruleXExpression();
 
             state._fsp--;
@@ -15733,7 +15733,7 @@ public final EObject ruleXForLoopExpression() throws RecognitionException {
                      			current, 
                      			"eachExpression",
                       		lv_eachExpression_7_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -15766,7 +15766,7 @@ public final EObject ruleXForLoopExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXBasicForLoopExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5491:1: entryRuleXBasicForLoopExpression returns [EObject current=null] : iv_ruleXBasicForLoopExpression= ruleXBasicForLoopExpression EOF ;
+    // InternalCheck.g:5491:1: entryRuleXBasicForLoopExpression returns [EObject current=null] : iv_ruleXBasicForLoopExpression= ruleXBasicForLoopExpression EOF ;
     public final EObject entryRuleXBasicForLoopExpression() throws RecognitionException {
         EObject current = null;
 
@@ -15774,13 +15774,13 @@ public final EObject entryRuleXBasicForLoopExpression() throws RecognitionExcept
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5492:2: (iv_ruleXBasicForLoopExpression= ruleXBasicForLoopExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5493:2: iv_ruleXBasicForLoopExpression= ruleXBasicForLoopExpression EOF
+            // InternalCheck.g:5492:2: (iv_ruleXBasicForLoopExpression= ruleXBasicForLoopExpression EOF )
+            // InternalCheck.g:5493:2: iv_ruleXBasicForLoopExpression= ruleXBasicForLoopExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXBasicForLoopExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXBasicForLoopExpression_in_entryRuleXBasicForLoopExpression12740);
+            pushFollow(FOLLOW_1);
             iv_ruleXBasicForLoopExpression=ruleXBasicForLoopExpression();
 
             state._fsp--;
@@ -15788,7 +15788,7 @@ public final EObject entryRuleXBasicForLoopExpression() throws RecognitionExcept
             if ( state.backtracking==0 ) {
                current =iv_ruleXBasicForLoopExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXBasicForLoopExpression12750); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -15806,7 +15806,7 @@ public final EObject entryRuleXBasicForLoopExpression() throws RecognitionExcept
 
 
     // $ANTLR start "ruleXBasicForLoopExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5500:1: ruleXBasicForLoopExpression returns [EObject current=null] : ( () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) ) ) ;
+    // InternalCheck.g:5500:1: ruleXBasicForLoopExpression returns [EObject current=null] : ( () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) ) ) ;
     public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
         EObject current = null;
 
@@ -15833,14 +15833,14 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5503:28: ( ( () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5504:1: ( () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) ) )
+            // InternalCheck.g:5503:28: ( ( () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) ) ) )
+            // InternalCheck.g:5504:1: ( () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5504:1: ( () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5504:2: () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) )
+            // InternalCheck.g:5504:1: ( () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) ) )
+            // InternalCheck.g:5504:2: () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5504:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5505:5: 
+            // InternalCheck.g:5504:2: ()
+            // InternalCheck.g:5505:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -15852,19 +15852,19 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,16,FOLLOW_16_in_ruleXBasicForLoopExpression12796); if (state.failed) return current;
+            otherlv_1=(Token)match(input,16,FOLLOW_24); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXBasicForLoopExpressionAccess().getForKeyword_1());
                   
             }
-            otherlv_2=(Token)match(input,23,FOLLOW_23_in_ruleXBasicForLoopExpression12808); if (state.failed) return current;
+            otherlv_2=(Token)match(input,23,FOLLOW_92); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getXBasicForLoopExpressionAccess().getLeftParenthesisKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5518:1: ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )?
+            // InternalCheck.g:5518:1: ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )?
             int alt108=2;
             int LA108_0 = input.LA(1);
 
@@ -15873,20 +15873,20 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
             }
             switch (alt108) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5518:2: ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )*
+                    // InternalCheck.g:5518:2: ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )*
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5518:2: ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5519:1: (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration )
+                    // InternalCheck.g:5518:2: ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) )
+                    // InternalCheck.g:5519:1: (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5519:1: (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5520:3: lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration
+                    // InternalCheck.g:5519:1: (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration )
+                    // InternalCheck.g:5520:3: lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXBasicForLoopExpressionAccess().getInitExpressionsXExpressionOrVarDeclarationParserRuleCall_3_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_ruleXBasicForLoopExpression12830);
+                    pushFollow(FOLLOW_93);
                     lv_initExpressions_3_0=ruleXExpressionOrVarDeclaration();
 
                     state._fsp--;
@@ -15900,7 +15900,7 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
                              			current, 
                              			"initExpressions",
                               		lv_initExpressions_3_0, 
-                              		"XExpressionOrVarDeclaration");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpressionOrVarDeclaration");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -15910,7 +15910,7 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5536:2: (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )*
+                    // InternalCheck.g:5536:2: (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )*
                     loop107:
                     do {
                         int alt107=2;
@@ -15923,26 +15923,26 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
 
                         switch (alt107) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5536:4: otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) )
+                    	    // InternalCheck.g:5536:4: otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) )
                     	    {
-                    	    otherlv_4=(Token)match(input,24,FOLLOW_24_in_ruleXBasicForLoopExpression12843); if (state.failed) return current;
+                    	    otherlv_4=(Token)match(input,24,FOLLOW_94); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_4, grammarAccess.getXBasicForLoopExpressionAccess().getCommaKeyword_3_1_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5540:1: ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5541:1: (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration )
+                    	    // InternalCheck.g:5540:1: ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) )
+                    	    // InternalCheck.g:5541:1: (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5541:1: (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5542:3: lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration
+                    	    // InternalCheck.g:5541:1: (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration )
+                    	    // InternalCheck.g:5542:3: lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getXBasicForLoopExpressionAccess().getInitExpressionsXExpressionOrVarDeclarationParserRuleCall_3_1_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_ruleXBasicForLoopExpression12864);
+                    	    pushFollow(FOLLOW_93);
                     	    lv_initExpressions_5_0=ruleXExpressionOrVarDeclaration();
 
                     	    state._fsp--;
@@ -15956,7 +15956,7 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
                     	             			current, 
                     	             			"initExpressions",
                     	              		lv_initExpressions_5_0, 
-                    	              		"XExpressionOrVarDeclaration");
+                    	              		"org.eclipse.xtext.xbase.Xbase.XExpressionOrVarDeclaration");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -15981,13 +15981,13 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
 
             }
 
-            otherlv_6=(Token)match(input,21,FOLLOW_21_in_ruleXBasicForLoopExpression12880); if (state.failed) return current;
+            otherlv_6=(Token)match(input,21,FOLLOW_95); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_6, grammarAccess.getXBasicForLoopExpressionAccess().getSemicolonKeyword_4());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5562:1: ( (lv_expression_7_0= ruleXExpression ) )?
+            // InternalCheck.g:5562:1: ( (lv_expression_7_0= ruleXExpression ) )?
             int alt109=2;
             int LA109_0 = input.LA(1);
 
@@ -15996,17 +15996,17 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
             }
             switch (alt109) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5563:1: (lv_expression_7_0= ruleXExpression )
+                    // InternalCheck.g:5563:1: (lv_expression_7_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5563:1: (lv_expression_7_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5564:3: lv_expression_7_0= ruleXExpression
+                    // InternalCheck.g:5563:1: (lv_expression_7_0= ruleXExpression )
+                    // InternalCheck.g:5564:3: lv_expression_7_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXBasicForLoopExpressionAccess().getExpressionXExpressionParserRuleCall_5_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXBasicForLoopExpression12901);
+                    pushFollow(FOLLOW_30);
                     lv_expression_7_0=ruleXExpression();
 
                     state._fsp--;
@@ -16020,7 +16020,7 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
                              			current, 
                              			"expression",
                               		lv_expression_7_0, 
-                              		"XExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -16033,13 +16033,13 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
 
             }
 
-            otherlv_8=(Token)match(input,21,FOLLOW_21_in_ruleXBasicForLoopExpression12914); if (state.failed) return current;
+            otherlv_8=(Token)match(input,21,FOLLOW_96); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_8, grammarAccess.getXBasicForLoopExpressionAccess().getSemicolonKeyword_6());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5584:1: ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )?
+            // InternalCheck.g:5584:1: ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )?
             int alt111=2;
             int LA111_0 = input.LA(1);
 
@@ -16048,20 +16048,20 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
             }
             switch (alt111) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5584:2: ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )*
+                    // InternalCheck.g:5584:2: ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )*
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5584:2: ( (lv_updateExpressions_9_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5585:1: (lv_updateExpressions_9_0= ruleXExpression )
+                    // InternalCheck.g:5584:2: ( (lv_updateExpressions_9_0= ruleXExpression ) )
+                    // InternalCheck.g:5585:1: (lv_updateExpressions_9_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5585:1: (lv_updateExpressions_9_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5586:3: lv_updateExpressions_9_0= ruleXExpression
+                    // InternalCheck.g:5585:1: (lv_updateExpressions_9_0= ruleXExpression )
+                    // InternalCheck.g:5586:3: lv_updateExpressions_9_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXBasicForLoopExpressionAccess().getUpdateExpressionsXExpressionParserRuleCall_7_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXBasicForLoopExpression12936);
+                    pushFollow(FOLLOW_19);
                     lv_updateExpressions_9_0=ruleXExpression();
 
                     state._fsp--;
@@ -16075,7 +16075,7 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
                              			current, 
                              			"updateExpressions",
                               		lv_updateExpressions_9_0, 
-                              		"XExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -16085,7 +16085,7 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5602:2: (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )*
+                    // InternalCheck.g:5602:2: (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )*
                     loop110:
                     do {
                         int alt110=2;
@@ -16098,26 +16098,26 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
 
                         switch (alt110) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5602:4: otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) )
+                    	    // InternalCheck.g:5602:4: otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) )
                     	    {
-                    	    otherlv_10=(Token)match(input,24,FOLLOW_24_in_ruleXBasicForLoopExpression12949); if (state.failed) return current;
+                    	    otherlv_10=(Token)match(input,24,FOLLOW_29); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_10, grammarAccess.getXBasicForLoopExpressionAccess().getCommaKeyword_7_1_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5606:1: ( (lv_updateExpressions_11_0= ruleXExpression ) )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5607:1: (lv_updateExpressions_11_0= ruleXExpression )
+                    	    // InternalCheck.g:5606:1: ( (lv_updateExpressions_11_0= ruleXExpression ) )
+                    	    // InternalCheck.g:5607:1: (lv_updateExpressions_11_0= ruleXExpression )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5607:1: (lv_updateExpressions_11_0= ruleXExpression )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5608:3: lv_updateExpressions_11_0= ruleXExpression
+                    	    // InternalCheck.g:5607:1: (lv_updateExpressions_11_0= ruleXExpression )
+                    	    // InternalCheck.g:5608:3: lv_updateExpressions_11_0= ruleXExpression
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getXBasicForLoopExpressionAccess().getUpdateExpressionsXExpressionParserRuleCall_7_1_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleXExpression_in_ruleXBasicForLoopExpression12970);
+                    	    pushFollow(FOLLOW_19);
                     	    lv_updateExpressions_11_0=ruleXExpression();
 
                     	    state._fsp--;
@@ -16131,7 +16131,7 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
                     	             			current, 
                     	             			"updateExpressions",
                     	              		lv_updateExpressions_11_0, 
-                    	              		"XExpression");
+                    	              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -16156,24 +16156,24 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
 
             }
 
-            otherlv_12=(Token)match(input,25,FOLLOW_25_in_ruleXBasicForLoopExpression12986); if (state.failed) return current;
+            otherlv_12=(Token)match(input,25,FOLLOW_29); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_12, grammarAccess.getXBasicForLoopExpressionAccess().getRightParenthesisKeyword_8());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5628:1: ( (lv_eachExpression_13_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5629:1: (lv_eachExpression_13_0= ruleXExpression )
+            // InternalCheck.g:5628:1: ( (lv_eachExpression_13_0= ruleXExpression ) )
+            // InternalCheck.g:5629:1: (lv_eachExpression_13_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5629:1: (lv_eachExpression_13_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5630:3: lv_eachExpression_13_0= ruleXExpression
+            // InternalCheck.g:5629:1: (lv_eachExpression_13_0= ruleXExpression )
+            // InternalCheck.g:5630:3: lv_eachExpression_13_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXBasicForLoopExpressionAccess().getEachExpressionXExpressionParserRuleCall_9_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXBasicForLoopExpression13007);
+            pushFollow(FOLLOW_2);
             lv_eachExpression_13_0=ruleXExpression();
 
             state._fsp--;
@@ -16187,7 +16187,7 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
                      			current, 
                      			"eachExpression",
                       		lv_eachExpression_13_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -16220,7 +16220,7 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXWhileExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5654:1: entryRuleXWhileExpression returns [EObject current=null] : iv_ruleXWhileExpression= ruleXWhileExpression EOF ;
+    // InternalCheck.g:5654:1: entryRuleXWhileExpression returns [EObject current=null] : iv_ruleXWhileExpression= ruleXWhileExpression EOF ;
     public final EObject entryRuleXWhileExpression() throws RecognitionException {
         EObject current = null;
 
@@ -16228,13 +16228,13 @@ public final EObject entryRuleXWhileExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5655:2: (iv_ruleXWhileExpression= ruleXWhileExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5656:2: iv_ruleXWhileExpression= ruleXWhileExpression EOF
+            // InternalCheck.g:5655:2: (iv_ruleXWhileExpression= ruleXWhileExpression EOF )
+            // InternalCheck.g:5656:2: iv_ruleXWhileExpression= ruleXWhileExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXWhileExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXWhileExpression_in_entryRuleXWhileExpression13043);
+            pushFollow(FOLLOW_1);
             iv_ruleXWhileExpression=ruleXWhileExpression();
 
             state._fsp--;
@@ -16242,7 +16242,7 @@ public final EObject entryRuleXWhileExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXWhileExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXWhileExpression13053); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -16260,7 +16260,7 @@ public final EObject entryRuleXWhileExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXWhileExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5663:1: ruleXWhileExpression returns [EObject current=null] : ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) ) ;
+    // InternalCheck.g:5663:1: ruleXWhileExpression returns [EObject current=null] : ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) ) ;
     public final EObject ruleXWhileExpression() throws RecognitionException {
         EObject current = null;
 
@@ -16275,14 +16275,14 @@ public final EObject ruleXWhileExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5666:28: ( ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5667:1: ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) )
+            // InternalCheck.g:5666:28: ( ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) ) )
+            // InternalCheck.g:5667:1: ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5667:1: ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5667:2: () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) )
+            // InternalCheck.g:5667:1: ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) )
+            // InternalCheck.g:5667:2: () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5667:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5668:5: 
+            // InternalCheck.g:5667:2: ()
+            // InternalCheck.g:5668:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -16294,30 +16294,30 @@ public final EObject ruleXWhileExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,91,FOLLOW_91_in_ruleXWhileExpression13099); if (state.failed) return current;
+            otherlv_1=(Token)match(input,91,FOLLOW_24); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXWhileExpressionAccess().getWhileKeyword_1());
                   
             }
-            otherlv_2=(Token)match(input,23,FOLLOW_23_in_ruleXWhileExpression13111); if (state.failed) return current;
+            otherlv_2=(Token)match(input,23,FOLLOW_29); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getXWhileExpressionAccess().getLeftParenthesisKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5681:1: ( (lv_predicate_3_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5682:1: (lv_predicate_3_0= ruleXExpression )
+            // InternalCheck.g:5681:1: ( (lv_predicate_3_0= ruleXExpression ) )
+            // InternalCheck.g:5682:1: (lv_predicate_3_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5682:1: (lv_predicate_3_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5683:3: lv_predicate_3_0= ruleXExpression
+            // InternalCheck.g:5682:1: (lv_predicate_3_0= ruleXExpression )
+            // InternalCheck.g:5683:3: lv_predicate_3_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXWhileExpressionAccess().getPredicateXExpressionParserRuleCall_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXWhileExpression13132);
+            pushFollow(FOLLOW_26);
             lv_predicate_3_0=ruleXExpression();
 
             state._fsp--;
@@ -16331,7 +16331,7 @@ public final EObject ruleXWhileExpression() throws RecognitionException {
                      			current, 
                      			"predicate",
                       		lv_predicate_3_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -16341,24 +16341,24 @@ public final EObject ruleXWhileExpression() throws RecognitionException {
 
             }
 
-            otherlv_4=(Token)match(input,25,FOLLOW_25_in_ruleXWhileExpression13144); if (state.failed) return current;
+            otherlv_4=(Token)match(input,25,FOLLOW_29); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_4, grammarAccess.getXWhileExpressionAccess().getRightParenthesisKeyword_4());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5703:1: ( (lv_body_5_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5704:1: (lv_body_5_0= ruleXExpression )
+            // InternalCheck.g:5703:1: ( (lv_body_5_0= ruleXExpression ) )
+            // InternalCheck.g:5704:1: (lv_body_5_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5704:1: (lv_body_5_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5705:3: lv_body_5_0= ruleXExpression
+            // InternalCheck.g:5704:1: (lv_body_5_0= ruleXExpression )
+            // InternalCheck.g:5705:3: lv_body_5_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXWhileExpressionAccess().getBodyXExpressionParserRuleCall_5_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXWhileExpression13165);
+            pushFollow(FOLLOW_2);
             lv_body_5_0=ruleXExpression();
 
             state._fsp--;
@@ -16372,7 +16372,7 @@ public final EObject ruleXWhileExpression() throws RecognitionException {
                      			current, 
                      			"body",
                       		lv_body_5_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -16405,7 +16405,7 @@ public final EObject ruleXWhileExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXDoWhileExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5729:1: entryRuleXDoWhileExpression returns [EObject current=null] : iv_ruleXDoWhileExpression= ruleXDoWhileExpression EOF ;
+    // InternalCheck.g:5729:1: entryRuleXDoWhileExpression returns [EObject current=null] : iv_ruleXDoWhileExpression= ruleXDoWhileExpression EOF ;
     public final EObject entryRuleXDoWhileExpression() throws RecognitionException {
         EObject current = null;
 
@@ -16413,13 +16413,13 @@ public final EObject entryRuleXDoWhileExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5730:2: (iv_ruleXDoWhileExpression= ruleXDoWhileExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5731:2: iv_ruleXDoWhileExpression= ruleXDoWhileExpression EOF
+            // InternalCheck.g:5730:2: (iv_ruleXDoWhileExpression= ruleXDoWhileExpression EOF )
+            // InternalCheck.g:5731:2: iv_ruleXDoWhileExpression= ruleXDoWhileExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXDoWhileExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXDoWhileExpression_in_entryRuleXDoWhileExpression13201);
+            pushFollow(FOLLOW_1);
             iv_ruleXDoWhileExpression=ruleXDoWhileExpression();
 
             state._fsp--;
@@ -16427,7 +16427,7 @@ public final EObject entryRuleXDoWhileExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXDoWhileExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXDoWhileExpression13211); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -16445,7 +16445,7 @@ public final EObject entryRuleXDoWhileExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXDoWhileExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5738:1: ruleXDoWhileExpression returns [EObject current=null] : ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' ) ;
+    // InternalCheck.g:5738:1: ruleXDoWhileExpression returns [EObject current=null] : ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' ) ;
     public final EObject ruleXDoWhileExpression() throws RecognitionException {
         EObject current = null;
 
@@ -16461,14 +16461,14 @@ public final EObject ruleXDoWhileExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5741:28: ( ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5742:1: ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' )
+            // InternalCheck.g:5741:28: ( ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' ) )
+            // InternalCheck.g:5742:1: ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5742:1: ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5742:2: () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')'
+            // InternalCheck.g:5742:1: ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' )
+            // InternalCheck.g:5742:2: () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')'
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5742:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5743:5: 
+            // InternalCheck.g:5742:2: ()
+            // InternalCheck.g:5743:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -16480,24 +16480,24 @@ public final EObject ruleXDoWhileExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,92,FOLLOW_92_in_ruleXDoWhileExpression13257); if (state.failed) return current;
+            otherlv_1=(Token)match(input,92,FOLLOW_29); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXDoWhileExpressionAccess().getDoKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5752:1: ( (lv_body_2_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5753:1: (lv_body_2_0= ruleXExpression )
+            // InternalCheck.g:5752:1: ( (lv_body_2_0= ruleXExpression ) )
+            // InternalCheck.g:5753:1: (lv_body_2_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5753:1: (lv_body_2_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5754:3: lv_body_2_0= ruleXExpression
+            // InternalCheck.g:5753:1: (lv_body_2_0= ruleXExpression )
+            // InternalCheck.g:5754:3: lv_body_2_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXDoWhileExpressionAccess().getBodyXExpressionParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXDoWhileExpression13278);
+            pushFollow(FOLLOW_97);
             lv_body_2_0=ruleXExpression();
 
             state._fsp--;
@@ -16511,7 +16511,7 @@ public final EObject ruleXDoWhileExpression() throws RecognitionException {
                      			current, 
                      			"body",
                       		lv_body_2_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -16521,30 +16521,30 @@ public final EObject ruleXDoWhileExpression() throws RecognitionException {
 
             }
 
-            otherlv_3=(Token)match(input,91,FOLLOW_91_in_ruleXDoWhileExpression13290); if (state.failed) return current;
+            otherlv_3=(Token)match(input,91,FOLLOW_24); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_3, grammarAccess.getXDoWhileExpressionAccess().getWhileKeyword_3());
                   
             }
-            otherlv_4=(Token)match(input,23,FOLLOW_23_in_ruleXDoWhileExpression13302); if (state.failed) return current;
+            otherlv_4=(Token)match(input,23,FOLLOW_29); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_4, grammarAccess.getXDoWhileExpressionAccess().getLeftParenthesisKeyword_4());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5778:1: ( (lv_predicate_5_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5779:1: (lv_predicate_5_0= ruleXExpression )
+            // InternalCheck.g:5778:1: ( (lv_predicate_5_0= ruleXExpression ) )
+            // InternalCheck.g:5779:1: (lv_predicate_5_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5779:1: (lv_predicate_5_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5780:3: lv_predicate_5_0= ruleXExpression
+            // InternalCheck.g:5779:1: (lv_predicate_5_0= ruleXExpression )
+            // InternalCheck.g:5780:3: lv_predicate_5_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXDoWhileExpressionAccess().getPredicateXExpressionParserRuleCall_5_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXDoWhileExpression13323);
+            pushFollow(FOLLOW_26);
             lv_predicate_5_0=ruleXExpression();
 
             state._fsp--;
@@ -16558,7 +16558,7 @@ public final EObject ruleXDoWhileExpression() throws RecognitionException {
                      			current, 
                      			"predicate",
                       		lv_predicate_5_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -16568,7 +16568,7 @@ public final EObject ruleXDoWhileExpression() throws RecognitionException {
 
             }
 
-            otherlv_6=(Token)match(input,25,FOLLOW_25_in_ruleXDoWhileExpression13335); if (state.failed) return current;
+            otherlv_6=(Token)match(input,25,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_6, grammarAccess.getXDoWhileExpressionAccess().getRightParenthesisKeyword_6());
@@ -16597,7 +16597,7 @@ public final EObject ruleXDoWhileExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXBlockExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5808:1: entryRuleXBlockExpression returns [EObject current=null] : iv_ruleXBlockExpression= ruleXBlockExpression EOF ;
+    // InternalCheck.g:5808:1: entryRuleXBlockExpression returns [EObject current=null] : iv_ruleXBlockExpression= ruleXBlockExpression EOF ;
     public final EObject entryRuleXBlockExpression() throws RecognitionException {
         EObject current = null;
 
@@ -16605,13 +16605,13 @@ public final EObject entryRuleXBlockExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5809:2: (iv_ruleXBlockExpression= ruleXBlockExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5810:2: iv_ruleXBlockExpression= ruleXBlockExpression EOF
+            // InternalCheck.g:5809:2: (iv_ruleXBlockExpression= ruleXBlockExpression EOF )
+            // InternalCheck.g:5810:2: iv_ruleXBlockExpression= ruleXBlockExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXBlockExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXBlockExpression_in_entryRuleXBlockExpression13371);
+            pushFollow(FOLLOW_1);
             iv_ruleXBlockExpression=ruleXBlockExpression();
 
             state._fsp--;
@@ -16619,7 +16619,7 @@ public final EObject entryRuleXBlockExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXBlockExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXBlockExpression13381); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -16637,7 +16637,7 @@ public final EObject entryRuleXBlockExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXBlockExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5817:1: ruleXBlockExpression returns [EObject current=null] : ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' ) ;
+    // InternalCheck.g:5817:1: ruleXBlockExpression returns [EObject current=null] : ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' ) ;
     public final EObject ruleXBlockExpression() throws RecognitionException {
         EObject current = null;
 
@@ -16650,14 +16650,14 @@ public final EObject ruleXBlockExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5820:28: ( ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5821:1: ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' )
+            // InternalCheck.g:5820:28: ( ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' ) )
+            // InternalCheck.g:5821:1: ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5821:1: ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5821:2: () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}'
+            // InternalCheck.g:5821:1: ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' )
+            // InternalCheck.g:5821:2: () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}'
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5821:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5822:5: 
+            // InternalCheck.g:5821:2: ()
+            // InternalCheck.g:5822:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -16669,13 +16669,13 @@ public final EObject ruleXBlockExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,18,FOLLOW_18_in_ruleXBlockExpression13427); if (state.failed) return current;
+            otherlv_1=(Token)match(input,18,FOLLOW_98); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXBlockExpressionAccess().getLeftCurlyBracketKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5831:1: ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )*
+            // InternalCheck.g:5831:1: ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )*
             loop113:
             do {
                 int alt113=2;
@@ -16688,20 +16688,20 @@ public final EObject ruleXBlockExpression() throws RecognitionException {
 
                 switch (alt113) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5831:2: ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )?
+            	    // InternalCheck.g:5831:2: ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )?
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5831:2: ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5832:1: (lv_expressions_2_0= ruleXExpressionOrVarDeclaration )
+            	    // InternalCheck.g:5831:2: ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) )
+            	    // InternalCheck.g:5832:1: (lv_expressions_2_0= ruleXExpressionOrVarDeclaration )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5832:1: (lv_expressions_2_0= ruleXExpressionOrVarDeclaration )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5833:3: lv_expressions_2_0= ruleXExpressionOrVarDeclaration
+            	    // InternalCheck.g:5832:1: (lv_expressions_2_0= ruleXExpressionOrVarDeclaration )
+            	    // InternalCheck.g:5833:3: lv_expressions_2_0= ruleXExpressionOrVarDeclaration
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXBlockExpressionAccess().getExpressionsXExpressionOrVarDeclarationParserRuleCall_2_0_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_ruleXBlockExpression13449);
+            	    pushFollow(FOLLOW_99);
             	    lv_expressions_2_0=ruleXExpressionOrVarDeclaration();
 
             	    state._fsp--;
@@ -16715,7 +16715,7 @@ public final EObject ruleXBlockExpression() throws RecognitionException {
             	             			current, 
             	             			"expressions",
             	              		lv_expressions_2_0, 
-            	              		"XExpressionOrVarDeclaration");
+            	              		"org.eclipse.xtext.xbase.Xbase.XExpressionOrVarDeclaration");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -16725,7 +16725,7 @@ public final EObject ruleXBlockExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5849:2: (otherlv_3= ';' )?
+            	    // InternalCheck.g:5849:2: (otherlv_3= ';' )?
             	    int alt112=2;
             	    int LA112_0 = input.LA(1);
 
@@ -16734,9 +16734,9 @@ public final EObject ruleXBlockExpression() throws RecognitionException {
             	    }
             	    switch (alt112) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5849:4: otherlv_3= ';'
+            	            // InternalCheck.g:5849:4: otherlv_3= ';'
             	            {
-            	            otherlv_3=(Token)match(input,21,FOLLOW_21_in_ruleXBlockExpression13462); if (state.failed) return current;
+            	            otherlv_3=(Token)match(input,21,FOLLOW_98); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                  	newLeafNode(otherlv_3, grammarAccess.getXBlockExpressionAccess().getSemicolonKeyword_2_1());
@@ -16757,7 +16757,7 @@ public final EObject ruleXBlockExpression() throws RecognitionException {
                 }
             } while (true);
 
-            otherlv_4=(Token)match(input,19,FOLLOW_19_in_ruleXBlockExpression13478); if (state.failed) return current;
+            otherlv_4=(Token)match(input,19,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_4, grammarAccess.getXBlockExpressionAccess().getRightCurlyBracketKeyword_3());
@@ -16786,7 +16786,7 @@ public final EObject ruleXBlockExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXExpressionOrVarDeclaration"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5865:1: entryRuleXExpressionOrVarDeclaration returns [EObject current=null] : iv_ruleXExpressionOrVarDeclaration= ruleXExpressionOrVarDeclaration EOF ;
+    // InternalCheck.g:5865:1: entryRuleXExpressionOrVarDeclaration returns [EObject current=null] : iv_ruleXExpressionOrVarDeclaration= ruleXExpressionOrVarDeclaration EOF ;
     public final EObject entryRuleXExpressionOrVarDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -16794,13 +16794,13 @@ public final EObject entryRuleXExpressionOrVarDeclaration() throws RecognitionEx
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5866:2: (iv_ruleXExpressionOrVarDeclaration= ruleXExpressionOrVarDeclaration EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5867:2: iv_ruleXExpressionOrVarDeclaration= ruleXExpressionOrVarDeclaration EOF
+            // InternalCheck.g:5866:2: (iv_ruleXExpressionOrVarDeclaration= ruleXExpressionOrVarDeclaration EOF )
+            // InternalCheck.g:5867:2: iv_ruleXExpressionOrVarDeclaration= ruleXExpressionOrVarDeclaration EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXExpressionOrVarDeclarationRule()); 
             }
-            pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_entryRuleXExpressionOrVarDeclaration13514);
+            pushFollow(FOLLOW_1);
             iv_ruleXExpressionOrVarDeclaration=ruleXExpressionOrVarDeclaration();
 
             state._fsp--;
@@ -16808,7 +16808,7 @@ public final EObject entryRuleXExpressionOrVarDeclaration() throws RecognitionEx
             if ( state.backtracking==0 ) {
                current =iv_ruleXExpressionOrVarDeclaration; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXExpressionOrVarDeclaration13524); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -16826,7 +16826,7 @@ public final EObject entryRuleXExpressionOrVarDeclaration() throws RecognitionEx
 
 
     // $ANTLR start "ruleXExpressionOrVarDeclaration"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5874:1: ruleXExpressionOrVarDeclaration returns [EObject current=null] : (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression ) ;
+    // InternalCheck.g:5874:1: ruleXExpressionOrVarDeclaration returns [EObject current=null] : (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression ) ;
     public final EObject ruleXExpressionOrVarDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -16838,10 +16838,10 @@ public final EObject ruleXExpressionOrVarDeclaration() throws RecognitionExcepti
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5877:28: ( (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5878:1: (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression )
+            // InternalCheck.g:5877:28: ( (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression ) )
+            // InternalCheck.g:5878:1: (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5878:1: (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression )
+            // InternalCheck.g:5878:1: (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression )
             int alt114=2;
             int LA114_0 = input.LA(1);
 
@@ -16860,14 +16860,14 @@ else if ( ((LA114_0>=RULE_STRING && LA114_0<=RULE_ID)||(LA114_0>=15 && LA114_0<=
             }
             switch (alt114) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5879:5: this_XVariableDeclaration_0= ruleXVariableDeclaration
+                    // InternalCheck.g:5879:5: this_XVariableDeclaration_0= ruleXVariableDeclaration
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXExpressionOrVarDeclarationAccess().getXVariableDeclarationParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXVariableDeclaration_in_ruleXExpressionOrVarDeclaration13571);
+                    pushFollow(FOLLOW_2);
                     this_XVariableDeclaration_0=ruleXVariableDeclaration();
 
                     state._fsp--;
@@ -16882,14 +16882,14 @@ else if ( ((LA114_0>=RULE_STRING && LA114_0<=RULE_ID)||(LA114_0>=15 && LA114_0<=
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5889:5: this_XExpression_1= ruleXExpression
+                    // InternalCheck.g:5889:5: this_XExpression_1= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXExpressionOrVarDeclarationAccess().getXExpressionParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXExpressionOrVarDeclaration13598);
+                    pushFollow(FOLLOW_2);
                     this_XExpression_1=ruleXExpression();
 
                     state._fsp--;
@@ -16926,7 +16926,7 @@ else if ( ((LA114_0>=RULE_STRING && LA114_0<=RULE_ID)||(LA114_0>=15 && LA114_0<=
 
 
     // $ANTLR start "entryRuleXVariableDeclaration"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5905:1: entryRuleXVariableDeclaration returns [EObject current=null] : iv_ruleXVariableDeclaration= ruleXVariableDeclaration EOF ;
+    // InternalCheck.g:5905:1: entryRuleXVariableDeclaration returns [EObject current=null] : iv_ruleXVariableDeclaration= ruleXVariableDeclaration EOF ;
     public final EObject entryRuleXVariableDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -16934,13 +16934,13 @@ public final EObject entryRuleXVariableDeclaration() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5906:2: (iv_ruleXVariableDeclaration= ruleXVariableDeclaration EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5907:2: iv_ruleXVariableDeclaration= ruleXVariableDeclaration EOF
+            // InternalCheck.g:5906:2: (iv_ruleXVariableDeclaration= ruleXVariableDeclaration EOF )
+            // InternalCheck.g:5907:2: iv_ruleXVariableDeclaration= ruleXVariableDeclaration EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXVariableDeclarationRule()); 
             }
-            pushFollow(FOLLOW_ruleXVariableDeclaration_in_entryRuleXVariableDeclaration13633);
+            pushFollow(FOLLOW_1);
             iv_ruleXVariableDeclaration=ruleXVariableDeclaration();
 
             state._fsp--;
@@ -16948,7 +16948,7 @@ public final EObject entryRuleXVariableDeclaration() throws RecognitionException
             if ( state.backtracking==0 ) {
                current =iv_ruleXVariableDeclaration; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXVariableDeclaration13643); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -16966,7 +16966,7 @@ public final EObject entryRuleXVariableDeclaration() throws RecognitionException
 
 
     // $ANTLR start "ruleXVariableDeclaration"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5914:1: ruleXVariableDeclaration returns [EObject current=null] : ( () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )? ) ;
+    // InternalCheck.g:5914:1: ruleXVariableDeclaration returns [EObject current=null] : ( () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )? ) ;
     public final EObject ruleXVariableDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -16985,14 +16985,14 @@ public final EObject ruleXVariableDeclaration() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5917:28: ( ( () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )? ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5918:1: ( () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )? )
+            // InternalCheck.g:5917:28: ( ( () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )? ) )
+            // InternalCheck.g:5918:1: ( () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )? )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5918:1: ( () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )? )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5918:2: () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )?
+            // InternalCheck.g:5918:1: ( () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )? )
+            // InternalCheck.g:5918:2: () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )?
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5918:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5919:5: 
+            // InternalCheck.g:5918:2: ()
+            // InternalCheck.g:5919:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -17004,7 +17004,7 @@ public final EObject ruleXVariableDeclaration() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5924:2: ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' )
+            // InternalCheck.g:5924:2: ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' )
             int alt115=2;
             int LA115_0 = input.LA(1);
 
@@ -17023,15 +17023,15 @@ else if ( (LA115_0==94) ) {
             }
             switch (alt115) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5924:3: ( (lv_writeable_1_0= 'var' ) )
+                    // InternalCheck.g:5924:3: ( (lv_writeable_1_0= 'var' ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5924:3: ( (lv_writeable_1_0= 'var' ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5925:1: (lv_writeable_1_0= 'var' )
+                    // InternalCheck.g:5924:3: ( (lv_writeable_1_0= 'var' ) )
+                    // InternalCheck.g:5925:1: (lv_writeable_1_0= 'var' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5925:1: (lv_writeable_1_0= 'var' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5926:3: lv_writeable_1_0= 'var'
+                    // InternalCheck.g:5925:1: (lv_writeable_1_0= 'var' )
+                    // InternalCheck.g:5926:3: lv_writeable_1_0= 'var'
                     {
-                    lv_writeable_1_0=(Token)match(input,93,FOLLOW_93_in_ruleXVariableDeclaration13696); if (state.failed) return current;
+                    lv_writeable_1_0=(Token)match(input,93,FOLLOW_27); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_writeable_1_0, grammarAccess.getXVariableDeclarationAccess().getWriteableVarKeyword_1_0_0());
@@ -17055,9 +17055,9 @@ else if ( (LA115_0==94) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5940:7: otherlv_2= 'val'
+                    // InternalCheck.g:5940:7: otherlv_2= 'val'
                     {
-                    otherlv_2=(Token)match(input,94,FOLLOW_94_in_ruleXVariableDeclaration13727); if (state.failed) return current;
+                    otherlv_2=(Token)match(input,94,FOLLOW_27); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_2, grammarAccess.getXVariableDeclarationAccess().getValKeyword_1_1());
@@ -17069,7 +17069,7 @@ else if ( (LA115_0==94) ) {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5944:2: ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) )
+            // InternalCheck.g:5944:2: ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) )
             int alt116=2;
             int LA116_0 = input.LA(1);
 
@@ -17105,26 +17105,26 @@ else if ( (LA116_0==68) && (synpred47_InternalCheck())) {
             }
             switch (alt116) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5944:3: ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) )
+                    // InternalCheck.g:5944:3: ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5944:3: ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5944:4: ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) )
+                    // InternalCheck.g:5944:3: ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) )
+                    // InternalCheck.g:5944:4: ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5952:6: ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5952:7: ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) )
+                    // InternalCheck.g:5952:6: ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) )
+                    // InternalCheck.g:5952:7: ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5952:7: ( (lv_type_3_0= ruleJvmTypeReference ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5953:1: (lv_type_3_0= ruleJvmTypeReference )
+                    // InternalCheck.g:5952:7: ( (lv_type_3_0= ruleJvmTypeReference ) )
+                    // InternalCheck.g:5953:1: (lv_type_3_0= ruleJvmTypeReference )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5953:1: (lv_type_3_0= ruleJvmTypeReference )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5954:3: lv_type_3_0= ruleJvmTypeReference
+                    // InternalCheck.g:5953:1: (lv_type_3_0= ruleJvmTypeReference )
+                    // InternalCheck.g:5954:3: lv_type_3_0= ruleJvmTypeReference
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXVariableDeclarationAccess().getTypeJvmTypeReferenceParserRuleCall_2_0_0_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleXVariableDeclaration13775);
+                    pushFollow(FOLLOW_3);
                     lv_type_3_0=ruleJvmTypeReference();
 
                     state._fsp--;
@@ -17138,7 +17138,7 @@ else if ( (LA116_0==68) && (synpred47_InternalCheck())) {
                              			current, 
                              			"type",
                               		lv_type_3_0, 
-                              		"JvmTypeReference");
+                              		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -17148,18 +17148,18 @@ else if ( (LA116_0==68) && (synpred47_InternalCheck())) {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5970:2: ( (lv_name_4_0= ruleValidID ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5971:1: (lv_name_4_0= ruleValidID )
+                    // InternalCheck.g:5970:2: ( (lv_name_4_0= ruleValidID ) )
+                    // InternalCheck.g:5971:1: (lv_name_4_0= ruleValidID )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5971:1: (lv_name_4_0= ruleValidID )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5972:3: lv_name_4_0= ruleValidID
+                    // InternalCheck.g:5971:1: (lv_name_4_0= ruleValidID )
+                    // InternalCheck.g:5972:3: lv_name_4_0= ruleValidID
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXVariableDeclarationAccess().getNameValidIDParserRuleCall_2_0_0_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleValidID_in_ruleXVariableDeclaration13796);
+                    pushFollow(FOLLOW_100);
                     lv_name_4_0=ruleValidID();
 
                     state._fsp--;
@@ -17173,7 +17173,7 @@ else if ( (LA116_0==68) && (synpred47_InternalCheck())) {
                              			current, 
                              			"name",
                               		lv_name_4_0, 
-                              		"ValidID");
+                              		"org.eclipse.xtext.xbase.Xtype.ValidID");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -17193,20 +17193,20 @@ else if ( (LA116_0==68) && (synpred47_InternalCheck())) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5989:6: ( (lv_name_5_0= ruleValidID ) )
+                    // InternalCheck.g:5989:6: ( (lv_name_5_0= ruleValidID ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5989:6: ( (lv_name_5_0= ruleValidID ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5990:1: (lv_name_5_0= ruleValidID )
+                    // InternalCheck.g:5989:6: ( (lv_name_5_0= ruleValidID ) )
+                    // InternalCheck.g:5990:1: (lv_name_5_0= ruleValidID )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5990:1: (lv_name_5_0= ruleValidID )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5991:3: lv_name_5_0= ruleValidID
+                    // InternalCheck.g:5990:1: (lv_name_5_0= ruleValidID )
+                    // InternalCheck.g:5991:3: lv_name_5_0= ruleValidID
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXVariableDeclarationAccess().getNameValidIDParserRuleCall_2_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleValidID_in_ruleXVariableDeclaration13825);
+                    pushFollow(FOLLOW_100);
                     lv_name_5_0=ruleValidID();
 
                     state._fsp--;
@@ -17220,7 +17220,7 @@ else if ( (LA116_0==68) && (synpred47_InternalCheck())) {
                              			current, 
                              			"name",
                               		lv_name_5_0, 
-                              		"ValidID");
+                              		"org.eclipse.xtext.xbase.Xtype.ValidID");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -17236,7 +17236,7 @@ else if ( (LA116_0==68) && (synpred47_InternalCheck())) {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6007:3: (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )?
+            // InternalCheck.g:6007:3: (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )?
             int alt117=2;
             int LA117_0 = input.LA(1);
 
@@ -17245,26 +17245,26 @@ else if ( (LA116_0==68) && (synpred47_InternalCheck())) {
             }
             switch (alt117) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6007:5: otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) )
+                    // InternalCheck.g:6007:5: otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) )
                     {
-                    otherlv_6=(Token)match(input,31,FOLLOW_31_in_ruleXVariableDeclaration13839); if (state.failed) return current;
+                    otherlv_6=(Token)match(input,31,FOLLOW_29); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_6, grammarAccess.getXVariableDeclarationAccess().getEqualsSignKeyword_3_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6011:1: ( (lv_right_7_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6012:1: (lv_right_7_0= ruleXExpression )
+                    // InternalCheck.g:6011:1: ( (lv_right_7_0= ruleXExpression ) )
+                    // InternalCheck.g:6012:1: (lv_right_7_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6012:1: (lv_right_7_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6013:3: lv_right_7_0= ruleXExpression
+                    // InternalCheck.g:6012:1: (lv_right_7_0= ruleXExpression )
+                    // InternalCheck.g:6013:3: lv_right_7_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXVariableDeclarationAccess().getRightXExpressionParserRuleCall_3_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXVariableDeclaration13860);
+                    pushFollow(FOLLOW_2);
                     lv_right_7_0=ruleXExpression();
 
                     state._fsp--;
@@ -17278,7 +17278,7 @@ else if ( (LA116_0==68) && (synpred47_InternalCheck())) {
                              			current, 
                              			"right",
                               		lv_right_7_0, 
-                              		"XExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -17317,7 +17317,7 @@ else if ( (LA116_0==68) && (synpred47_InternalCheck())) {
 
 
     // $ANTLR start "entryRuleJvmFormalParameter"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6037:1: entryRuleJvmFormalParameter returns [EObject current=null] : iv_ruleJvmFormalParameter= ruleJvmFormalParameter EOF ;
+    // InternalCheck.g:6037:1: entryRuleJvmFormalParameter returns [EObject current=null] : iv_ruleJvmFormalParameter= ruleJvmFormalParameter EOF ;
     public final EObject entryRuleJvmFormalParameter() throws RecognitionException {
         EObject current = null;
 
@@ -17325,13 +17325,13 @@ public final EObject entryRuleJvmFormalParameter() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6038:2: (iv_ruleJvmFormalParameter= ruleJvmFormalParameter EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6039:2: iv_ruleJvmFormalParameter= ruleJvmFormalParameter EOF
+            // InternalCheck.g:6038:2: (iv_ruleJvmFormalParameter= ruleJvmFormalParameter EOF )
+            // InternalCheck.g:6039:2: iv_ruleJvmFormalParameter= ruleJvmFormalParameter EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmFormalParameterRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmFormalParameter_in_entryRuleJvmFormalParameter13898);
+            pushFollow(FOLLOW_1);
             iv_ruleJvmFormalParameter=ruleJvmFormalParameter();
 
             state._fsp--;
@@ -17339,7 +17339,7 @@ public final EObject entryRuleJvmFormalParameter() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleJvmFormalParameter; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmFormalParameter13908); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -17357,7 +17357,7 @@ public final EObject entryRuleJvmFormalParameter() throws RecognitionException {
 
 
     // $ANTLR start "ruleJvmFormalParameter"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6046:1: ruleJvmFormalParameter returns [EObject current=null] : ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) ) ;
+    // InternalCheck.g:6046:1: ruleJvmFormalParameter returns [EObject current=null] : ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) ) ;
     public final EObject ruleJvmFormalParameter() throws RecognitionException {
         EObject current = null;
 
@@ -17369,13 +17369,13 @@ public final EObject ruleJvmFormalParameter() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6049:28: ( ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6050:1: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) )
+            // InternalCheck.g:6049:28: ( ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) ) )
+            // InternalCheck.g:6050:1: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6050:1: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6050:2: ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) )
+            // InternalCheck.g:6050:1: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) )
+            // InternalCheck.g:6050:2: ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6050:2: ( (lv_parameterType_0_0= ruleJvmTypeReference ) )?
+            // InternalCheck.g:6050:2: ( (lv_parameterType_0_0= ruleJvmTypeReference ) )?
             int alt118=2;
             int LA118_0 = input.LA(1);
 
@@ -17391,17 +17391,17 @@ else if ( (LA118_0==23||LA118_0==68) ) {
             }
             switch (alt118) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6051:1: (lv_parameterType_0_0= ruleJvmTypeReference )
+                    // InternalCheck.g:6051:1: (lv_parameterType_0_0= ruleJvmTypeReference )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6051:1: (lv_parameterType_0_0= ruleJvmTypeReference )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6052:3: lv_parameterType_0_0= ruleJvmTypeReference
+                    // InternalCheck.g:6051:1: (lv_parameterType_0_0= ruleJvmTypeReference )
+                    // InternalCheck.g:6052:3: lv_parameterType_0_0= ruleJvmTypeReference
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getJvmFormalParameterAccess().getParameterTypeJvmTypeReferenceParserRuleCall_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleJvmFormalParameter13954);
+                    pushFollow(FOLLOW_3);
                     lv_parameterType_0_0=ruleJvmTypeReference();
 
                     state._fsp--;
@@ -17415,7 +17415,7 @@ else if ( (LA118_0==23||LA118_0==68) ) {
                              			current, 
                              			"parameterType",
                               		lv_parameterType_0_0, 
-                              		"JvmTypeReference");
+                              		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -17428,18 +17428,18 @@ else if ( (LA118_0==23||LA118_0==68) ) {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6068:3: ( (lv_name_1_0= ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6069:1: (lv_name_1_0= ruleValidID )
+            // InternalCheck.g:6068:3: ( (lv_name_1_0= ruleValidID ) )
+            // InternalCheck.g:6069:1: (lv_name_1_0= ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6069:1: (lv_name_1_0= ruleValidID )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6070:3: lv_name_1_0= ruleValidID
+            // InternalCheck.g:6069:1: (lv_name_1_0= ruleValidID )
+            // InternalCheck.g:6070:3: lv_name_1_0= ruleValidID
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getJvmFormalParameterAccess().getNameValidIDParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleValidID_in_ruleJvmFormalParameter13976);
+            pushFollow(FOLLOW_2);
             lv_name_1_0=ruleValidID();
 
             state._fsp--;
@@ -17453,7 +17453,7 @@ else if ( (LA118_0==23||LA118_0==68) ) {
                      			current, 
                      			"name",
                       		lv_name_1_0, 
-                      		"ValidID");
+                      		"org.eclipse.xtext.xbase.Xtype.ValidID");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -17486,7 +17486,7 @@ else if ( (LA118_0==23||LA118_0==68) ) {
 
 
     // $ANTLR start "entryRuleFullJvmFormalParameter"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6094:1: entryRuleFullJvmFormalParameter returns [EObject current=null] : iv_ruleFullJvmFormalParameter= ruleFullJvmFormalParameter EOF ;
+    // InternalCheck.g:6094:1: entryRuleFullJvmFormalParameter returns [EObject current=null] : iv_ruleFullJvmFormalParameter= ruleFullJvmFormalParameter EOF ;
     public final EObject entryRuleFullJvmFormalParameter() throws RecognitionException {
         EObject current = null;
 
@@ -17494,13 +17494,13 @@ public final EObject entryRuleFullJvmFormalParameter() throws RecognitionExcepti
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6095:2: (iv_ruleFullJvmFormalParameter= ruleFullJvmFormalParameter EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6096:2: iv_ruleFullJvmFormalParameter= ruleFullJvmFormalParameter EOF
+            // InternalCheck.g:6095:2: (iv_ruleFullJvmFormalParameter= ruleFullJvmFormalParameter EOF )
+            // InternalCheck.g:6096:2: iv_ruleFullJvmFormalParameter= ruleFullJvmFormalParameter EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getFullJvmFormalParameterRule()); 
             }
-            pushFollow(FOLLOW_ruleFullJvmFormalParameter_in_entryRuleFullJvmFormalParameter14012);
+            pushFollow(FOLLOW_1);
             iv_ruleFullJvmFormalParameter=ruleFullJvmFormalParameter();
 
             state._fsp--;
@@ -17508,7 +17508,7 @@ public final EObject entryRuleFullJvmFormalParameter() throws RecognitionExcepti
             if ( state.backtracking==0 ) {
                current =iv_ruleFullJvmFormalParameter; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFullJvmFormalParameter14022); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -17526,7 +17526,7 @@ public final EObject entryRuleFullJvmFormalParameter() throws RecognitionExcepti
 
 
     // $ANTLR start "ruleFullJvmFormalParameter"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6103:1: ruleFullJvmFormalParameter returns [EObject current=null] : ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) ) ;
+    // InternalCheck.g:6103:1: ruleFullJvmFormalParameter returns [EObject current=null] : ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) ) ;
     public final EObject ruleFullJvmFormalParameter() throws RecognitionException {
         EObject current = null;
 
@@ -17538,24 +17538,24 @@ public final EObject ruleFullJvmFormalParameter() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6106:28: ( ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6107:1: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) )
+            // InternalCheck.g:6106:28: ( ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) ) )
+            // InternalCheck.g:6107:1: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6107:1: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6107:2: ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) )
+            // InternalCheck.g:6107:1: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) )
+            // InternalCheck.g:6107:2: ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6107:2: ( (lv_parameterType_0_0= ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6108:1: (lv_parameterType_0_0= ruleJvmTypeReference )
+            // InternalCheck.g:6107:2: ( (lv_parameterType_0_0= ruleJvmTypeReference ) )
+            // InternalCheck.g:6108:1: (lv_parameterType_0_0= ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6108:1: (lv_parameterType_0_0= ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6109:3: lv_parameterType_0_0= ruleJvmTypeReference
+            // InternalCheck.g:6108:1: (lv_parameterType_0_0= ruleJvmTypeReference )
+            // InternalCheck.g:6109:3: lv_parameterType_0_0= ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getFullJvmFormalParameterAccess().getParameterTypeJvmTypeReferenceParserRuleCall_0_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleFullJvmFormalParameter14068);
+            pushFollow(FOLLOW_3);
             lv_parameterType_0_0=ruleJvmTypeReference();
 
             state._fsp--;
@@ -17569,7 +17569,7 @@ public final EObject ruleFullJvmFormalParameter() throws RecognitionException {
                      			current, 
                      			"parameterType",
                       		lv_parameterType_0_0, 
-                      		"JvmTypeReference");
+                      		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -17579,18 +17579,18 @@ public final EObject ruleFullJvmFormalParameter() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6125:2: ( (lv_name_1_0= ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6126:1: (lv_name_1_0= ruleValidID )
+            // InternalCheck.g:6125:2: ( (lv_name_1_0= ruleValidID ) )
+            // InternalCheck.g:6126:1: (lv_name_1_0= ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6126:1: (lv_name_1_0= ruleValidID )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6127:3: lv_name_1_0= ruleValidID
+            // InternalCheck.g:6126:1: (lv_name_1_0= ruleValidID )
+            // InternalCheck.g:6127:3: lv_name_1_0= ruleValidID
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getFullJvmFormalParameterAccess().getNameValidIDParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleValidID_in_ruleFullJvmFormalParameter14089);
+            pushFollow(FOLLOW_2);
             lv_name_1_0=ruleValidID();
 
             state._fsp--;
@@ -17604,7 +17604,7 @@ public final EObject ruleFullJvmFormalParameter() throws RecognitionException {
                      			current, 
                      			"name",
                       		lv_name_1_0, 
-                      		"ValidID");
+                      		"org.eclipse.xtext.xbase.Xtype.ValidID");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -17637,7 +17637,7 @@ public final EObject ruleFullJvmFormalParameter() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXFeatureCall"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6151:1: entryRuleXFeatureCall returns [EObject current=null] : iv_ruleXFeatureCall= ruleXFeatureCall EOF ;
+    // InternalCheck.g:6151:1: entryRuleXFeatureCall returns [EObject current=null] : iv_ruleXFeatureCall= ruleXFeatureCall EOF ;
     public final EObject entryRuleXFeatureCall() throws RecognitionException {
         EObject current = null;
 
@@ -17645,13 +17645,13 @@ public final EObject entryRuleXFeatureCall() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6152:2: (iv_ruleXFeatureCall= ruleXFeatureCall EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6153:2: iv_ruleXFeatureCall= ruleXFeatureCall EOF
+            // InternalCheck.g:6152:2: (iv_ruleXFeatureCall= ruleXFeatureCall EOF )
+            // InternalCheck.g:6153:2: iv_ruleXFeatureCall= ruleXFeatureCall EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXFeatureCallRule()); 
             }
-            pushFollow(FOLLOW_ruleXFeatureCall_in_entryRuleXFeatureCall14125);
+            pushFollow(FOLLOW_1);
             iv_ruleXFeatureCall=ruleXFeatureCall();
 
             state._fsp--;
@@ -17659,7 +17659,7 @@ public final EObject entryRuleXFeatureCall() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXFeatureCall; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXFeatureCall14135); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -17677,7 +17677,7 @@ public final EObject entryRuleXFeatureCall() throws RecognitionException {
 
 
     // $ANTLR start "ruleXFeatureCall"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6160:1: ruleXFeatureCall returns [EObject current=null] : ( () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )? ) ;
+    // InternalCheck.g:6160:1: ruleXFeatureCall returns [EObject current=null] : ( () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )? ) ;
     public final EObject ruleXFeatureCall() throws RecognitionException {
         EObject current = null;
 
@@ -17703,14 +17703,14 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6163:28: ( ( () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )? ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6164:1: ( () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )? )
+            // InternalCheck.g:6163:28: ( ( () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )? ) )
+            // InternalCheck.g:6164:1: ( () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )? )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6164:1: ( () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )? )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6164:2: () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )?
+            // InternalCheck.g:6164:1: ( () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )? )
+            // InternalCheck.g:6164:2: () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )?
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6164:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6165:5: 
+            // InternalCheck.g:6164:2: ()
+            // InternalCheck.g:6165:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -17722,7 +17722,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6170:2: (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )?
+            // InternalCheck.g:6170:2: (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )?
             int alt120=2;
             int LA120_0 = input.LA(1);
 
@@ -17731,26 +17731,26 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
             }
             switch (alt120) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6170:4: otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>'
+                    // InternalCheck.g:6170:4: otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>'
                     {
-                    otherlv_1=(Token)match(input,56,FOLLOW_56_in_ruleXFeatureCall14182); if (state.failed) return current;
+                    otherlv_1=(Token)match(input,56,FOLLOW_72); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_1, grammarAccess.getXFeatureCallAccess().getLessThanSignKeyword_1_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6174:1: ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6175:1: (lv_typeArguments_2_0= ruleJvmArgumentTypeReference )
+                    // InternalCheck.g:6174:1: ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) )
+                    // InternalCheck.g:6175:1: (lv_typeArguments_2_0= ruleJvmArgumentTypeReference )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6175:1: (lv_typeArguments_2_0= ruleJvmArgumentTypeReference )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6176:3: lv_typeArguments_2_0= ruleJvmArgumentTypeReference
+                    // InternalCheck.g:6175:1: (lv_typeArguments_2_0= ruleJvmArgumentTypeReference )
+                    // InternalCheck.g:6176:3: lv_typeArguments_2_0= ruleJvmArgumentTypeReference
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleXFeatureCall14203);
+                    pushFollow(FOLLOW_73);
                     lv_typeArguments_2_0=ruleJvmArgumentTypeReference();
 
                     state._fsp--;
@@ -17764,7 +17764,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
                              			current, 
                              			"typeArguments",
                               		lv_typeArguments_2_0, 
-                              		"JvmArgumentTypeReference");
+                              		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -17774,7 +17774,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6192:2: (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )*
+                    // InternalCheck.g:6192:2: (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )*
                     loop119:
                     do {
                         int alt119=2;
@@ -17787,26 +17787,26 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
 
                         switch (alt119) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6192:4: otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) )
+                    	    // InternalCheck.g:6192:4: otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) )
                     	    {
-                    	    otherlv_3=(Token)match(input,24,FOLLOW_24_in_ruleXFeatureCall14216); if (state.failed) return current;
+                    	    otherlv_3=(Token)match(input,24,FOLLOW_72); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_3, grammarAccess.getXFeatureCallAccess().getCommaKeyword_1_2_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6196:1: ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6197:1: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
+                    	    // InternalCheck.g:6196:1: ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) )
+                    	    // InternalCheck.g:6197:1: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6197:1: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6198:3: lv_typeArguments_4_0= ruleJvmArgumentTypeReference
+                    	    // InternalCheck.g:6197:1: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
+                    	    // InternalCheck.g:6198:3: lv_typeArguments_4_0= ruleJvmArgumentTypeReference
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getXFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_2_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleXFeatureCall14237);
+                    	    pushFollow(FOLLOW_73);
                     	    lv_typeArguments_4_0=ruleJvmArgumentTypeReference();
 
                     	    state._fsp--;
@@ -17820,7 +17820,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
                     	             			current, 
                     	             			"typeArguments",
                     	              		lv_typeArguments_4_0, 
-                    	              		"JvmArgumentTypeReference");
+                    	              		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -17839,7 +17839,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
                         }
                     } while (true);
 
-                    otherlv_5=(Token)match(input,57,FOLLOW_57_in_ruleXFeatureCall14251); if (state.failed) return current;
+                    otherlv_5=(Token)match(input,57,FOLLOW_71); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_5, grammarAccess.getXFeatureCallAccess().getGreaterThanSignKeyword_1_3());
@@ -17851,11 +17851,11 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6218:3: ( ( ruleIdOrSuper ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6219:1: ( ruleIdOrSuper )
+            // InternalCheck.g:6218:3: ( ( ruleIdOrSuper ) )
+            // InternalCheck.g:6219:1: ( ruleIdOrSuper )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6219:1: ( ruleIdOrSuper )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6220:3: ruleIdOrSuper
+            // InternalCheck.g:6219:1: ( ruleIdOrSuper )
+            // InternalCheck.g:6220:3: ruleIdOrSuper
             {
             if ( state.backtracking==0 ) {
 
@@ -17869,7 +17869,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
               	        newCompositeNode(grammarAccess.getXFeatureCallAccess().getFeatureJvmIdentifiableElementCrossReference_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleIdOrSuper_in_ruleXFeatureCall14276);
+            pushFollow(FOLLOW_101);
             ruleIdOrSuper();
 
             state._fsp--;
@@ -17885,20 +17885,20 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6233:2: ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )?
+            // InternalCheck.g:6233:2: ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )?
             int alt123=2;
             alt123 = dfa123.predict(input);
             switch (alt123) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6233:3: ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')'
+                    // InternalCheck.g:6233:3: ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')'
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6233:3: ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6233:4: ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' )
+                    // InternalCheck.g:6233:3: ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) )
+                    // InternalCheck.g:6233:4: ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6240:1: (lv_explicitOperationCall_7_0= '(' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6241:3: lv_explicitOperationCall_7_0= '('
+                    // InternalCheck.g:6240:1: (lv_explicitOperationCall_7_0= '(' )
+                    // InternalCheck.g:6241:3: lv_explicitOperationCall_7_0= '('
                     {
-                    lv_explicitOperationCall_7_0=(Token)match(input,23,FOLLOW_23_in_ruleXFeatureCall14310); if (state.failed) return current;
+                    lv_explicitOperationCall_7_0=(Token)match(input,23,FOLLOW_75); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_explicitOperationCall_7_0, grammarAccess.getXFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_3_0_0());
@@ -17918,25 +17918,25 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6254:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )?
+                    // InternalCheck.g:6254:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )?
                     int alt122=3;
                     alt122 = dfa122.predict(input);
                     switch (alt122) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6254:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) )
+                            // InternalCheck.g:6254:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6254:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6254:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure )
+                            // InternalCheck.g:6254:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) )
+                            // InternalCheck.g:6254:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6271:1: (lv_featureCallArguments_8_0= ruleXShortClosure )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6272:3: lv_featureCallArguments_8_0= ruleXShortClosure
+                            // InternalCheck.g:6271:1: (lv_featureCallArguments_8_0= ruleXShortClosure )
+                            // InternalCheck.g:6272:3: lv_featureCallArguments_8_0= ruleXShortClosure
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXShortClosureParserRuleCall_3_1_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleXShortClosure_in_ruleXFeatureCall14395);
+                            pushFollow(FOLLOW_26);
                             lv_featureCallArguments_8_0=ruleXShortClosure();
 
                             state._fsp--;
@@ -17950,7 +17950,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
                                      			current, 
                                      			"featureCallArguments",
                                       		lv_featureCallArguments_8_0, 
-                                      		"XShortClosure");
+                                      		"org.eclipse.xtext.xbase.Xbase.XShortClosure");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -17964,23 +17964,23 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
                             }
                             break;
                         case 2 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6289:6: ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* )
+                            // InternalCheck.g:6289:6: ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6289:6: ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6289:7: ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )*
+                            // InternalCheck.g:6289:6: ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* )
+                            // InternalCheck.g:6289:7: ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )*
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6289:7: ( (lv_featureCallArguments_9_0= ruleXExpression ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6290:1: (lv_featureCallArguments_9_0= ruleXExpression )
+                            // InternalCheck.g:6289:7: ( (lv_featureCallArguments_9_0= ruleXExpression ) )
+                            // InternalCheck.g:6290:1: (lv_featureCallArguments_9_0= ruleXExpression )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6290:1: (lv_featureCallArguments_9_0= ruleXExpression )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6291:3: lv_featureCallArguments_9_0= ruleXExpression
+                            // InternalCheck.g:6290:1: (lv_featureCallArguments_9_0= ruleXExpression )
+                            // InternalCheck.g:6291:3: lv_featureCallArguments_9_0= ruleXExpression
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXExpressionParserRuleCall_3_1_1_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleXExpression_in_ruleXFeatureCall14423);
+                            pushFollow(FOLLOW_19);
                             lv_featureCallArguments_9_0=ruleXExpression();
 
                             state._fsp--;
@@ -17994,7 +17994,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
                                      			current, 
                                      			"featureCallArguments",
                                       		lv_featureCallArguments_9_0, 
-                                      		"XExpression");
+                                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -18004,7 +18004,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
 
                             }
 
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6307:2: (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )*
+                            // InternalCheck.g:6307:2: (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )*
                             loop121:
                             do {
                                 int alt121=2;
@@ -18017,26 +18017,26 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
 
                                 switch (alt121) {
                             	case 1 :
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6307:4: otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) )
+                            	    // InternalCheck.g:6307:4: otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) )
                             	    {
-                            	    otherlv_10=(Token)match(input,24,FOLLOW_24_in_ruleXFeatureCall14436); if (state.failed) return current;
+                            	    otherlv_10=(Token)match(input,24,FOLLOW_29); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	          	newLeafNode(otherlv_10, grammarAccess.getXFeatureCallAccess().getCommaKeyword_3_1_1_1_0());
                             	          
                             	    }
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6311:1: ( (lv_featureCallArguments_11_0= ruleXExpression ) )
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6312:1: (lv_featureCallArguments_11_0= ruleXExpression )
+                            	    // InternalCheck.g:6311:1: ( (lv_featureCallArguments_11_0= ruleXExpression ) )
+                            	    // InternalCheck.g:6312:1: (lv_featureCallArguments_11_0= ruleXExpression )
                             	    {
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6312:1: (lv_featureCallArguments_11_0= ruleXExpression )
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6313:3: lv_featureCallArguments_11_0= ruleXExpression
+                            	    // InternalCheck.g:6312:1: (lv_featureCallArguments_11_0= ruleXExpression )
+                            	    // InternalCheck.g:6313:3: lv_featureCallArguments_11_0= ruleXExpression
                             	    {
                             	    if ( state.backtracking==0 ) {
                             	       
                             	      	        newCompositeNode(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXExpressionParserRuleCall_3_1_1_1_1_0()); 
                             	      	    
                             	    }
-                            	    pushFollow(FOLLOW_ruleXExpression_in_ruleXFeatureCall14457);
+                            	    pushFollow(FOLLOW_19);
                             	    lv_featureCallArguments_11_0=ruleXExpression();
 
                             	    state._fsp--;
@@ -18050,7 +18050,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
                             	             			current, 
                             	             			"featureCallArguments",
                             	              		lv_featureCallArguments_11_0, 
-                            	              		"XExpression");
+                            	              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                             	      	        afterParserOrEnumRuleCall();
                             	      	    
                             	    }
@@ -18078,7 +18078,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
 
                     }
 
-                    otherlv_12=(Token)match(input,25,FOLLOW_25_in_ruleXFeatureCall14474); if (state.failed) return current;
+                    otherlv_12=(Token)match(input,25,FOLLOW_102); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_12, grammarAccess.getXFeatureCallAccess().getRightParenthesisKeyword_3_2());
@@ -18090,22 +18090,22 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6333:3: ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )?
+            // InternalCheck.g:6333:3: ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )?
             int alt124=2;
             alt124 = dfa124.predict(input);
             switch (alt124) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6333:4: ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure )
+                    // InternalCheck.g:6333:4: ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6336:1: (lv_featureCallArguments_13_0= ruleXClosure )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6337:3: lv_featureCallArguments_13_0= ruleXClosure
+                    // InternalCheck.g:6336:1: (lv_featureCallArguments_13_0= ruleXClosure )
+                    // InternalCheck.g:6337:3: lv_featureCallArguments_13_0= ruleXClosure
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXClosureParserRuleCall_4_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXClosure_in_ruleXFeatureCall14509);
+                    pushFollow(FOLLOW_2);
                     lv_featureCallArguments_13_0=ruleXClosure();
 
                     state._fsp--;
@@ -18119,7 +18119,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
                              			current, 
                              			"featureCallArguments",
                               		lv_featureCallArguments_13_0, 
-                              		"XClosure");
+                              		"org.eclipse.xtext.xbase.Xbase.XClosure");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -18155,7 +18155,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleIdOrSuper"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6361:1: entryRuleIdOrSuper returns [String current=null] : iv_ruleIdOrSuper= ruleIdOrSuper EOF ;
+    // InternalCheck.g:6361:1: entryRuleIdOrSuper returns [String current=null] : iv_ruleIdOrSuper= ruleIdOrSuper EOF ;
     public final String entryRuleIdOrSuper() throws RecognitionException {
         String current = null;
 
@@ -18163,13 +18163,13 @@ public final String entryRuleIdOrSuper() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6362:2: (iv_ruleIdOrSuper= ruleIdOrSuper EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6363:2: iv_ruleIdOrSuper= ruleIdOrSuper EOF
+            // InternalCheck.g:6362:2: (iv_ruleIdOrSuper= ruleIdOrSuper EOF )
+            // InternalCheck.g:6363:2: iv_ruleIdOrSuper= ruleIdOrSuper EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getIdOrSuperRule()); 
             }
-            pushFollow(FOLLOW_ruleIdOrSuper_in_entryRuleIdOrSuper14547);
+            pushFollow(FOLLOW_1);
             iv_ruleIdOrSuper=ruleIdOrSuper();
 
             state._fsp--;
@@ -18177,7 +18177,7 @@ public final String entryRuleIdOrSuper() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleIdOrSuper.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIdOrSuper14558); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -18195,7 +18195,7 @@ public final String entryRuleIdOrSuper() throws RecognitionException {
 
 
     // $ANTLR start "ruleIdOrSuper"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6370:1: ruleIdOrSuper returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' ) ;
+    // InternalCheck.g:6370:1: ruleIdOrSuper returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' ) ;
     public final AntlrDatatypeRuleToken ruleIdOrSuper() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -18206,10 +18206,10 @@ public final AntlrDatatypeRuleToken ruleIdOrSuper() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6373:28: ( (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6374:1: (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' )
+            // InternalCheck.g:6373:28: ( (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' ) )
+            // InternalCheck.g:6374:1: (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6374:1: (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' )
+            // InternalCheck.g:6374:1: (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' )
             int alt125=2;
             int LA125_0 = input.LA(1);
 
@@ -18228,14 +18228,14 @@ else if ( (LA125_0==95) ) {
             }
             switch (alt125) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6375:5: this_FeatureCallID_0= ruleFeatureCallID
+                    // InternalCheck.g:6375:5: this_FeatureCallID_0= ruleFeatureCallID
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getIdOrSuperAccess().getFeatureCallIDParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleFeatureCallID_in_ruleIdOrSuper14605);
+                    pushFollow(FOLLOW_2);
                     this_FeatureCallID_0=ruleFeatureCallID();
 
                     state._fsp--;
@@ -18254,9 +18254,9 @@ else if ( (LA125_0==95) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6387:2: kw= 'super'
+                    // InternalCheck.g:6387:2: kw= 'super'
                     {
-                    kw=(Token)match(input,95,FOLLOW_95_in_ruleIdOrSuper14629); if (state.failed) return current;
+                    kw=(Token)match(input,95,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -18289,7 +18289,7 @@ else if ( (LA125_0==95) ) {
 
 
     // $ANTLR start "entryRuleXConstructorCall"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6400:1: entryRuleXConstructorCall returns [EObject current=null] : iv_ruleXConstructorCall= ruleXConstructorCall EOF ;
+    // InternalCheck.g:6400:1: entryRuleXConstructorCall returns [EObject current=null] : iv_ruleXConstructorCall= ruleXConstructorCall EOF ;
     public final EObject entryRuleXConstructorCall() throws RecognitionException {
         EObject current = null;
 
@@ -18297,13 +18297,13 @@ public final EObject entryRuleXConstructorCall() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6401:2: (iv_ruleXConstructorCall= ruleXConstructorCall EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6402:2: iv_ruleXConstructorCall= ruleXConstructorCall EOF
+            // InternalCheck.g:6401:2: (iv_ruleXConstructorCall= ruleXConstructorCall EOF )
+            // InternalCheck.g:6402:2: iv_ruleXConstructorCall= ruleXConstructorCall EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXConstructorCallRule()); 
             }
-            pushFollow(FOLLOW_ruleXConstructorCall_in_entryRuleXConstructorCall14669);
+            pushFollow(FOLLOW_1);
             iv_ruleXConstructorCall=ruleXConstructorCall();
 
             state._fsp--;
@@ -18311,7 +18311,7 @@ public final EObject entryRuleXConstructorCall() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXConstructorCall; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXConstructorCall14679); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -18329,7 +18329,7 @@ public final EObject entryRuleXConstructorCall() throws RecognitionException {
 
 
     // $ANTLR start "ruleXConstructorCall"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6409:1: ruleXConstructorCall returns [EObject current=null] : ( () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )? ) ;
+    // InternalCheck.g:6409:1: ruleXConstructorCall returns [EObject current=null] : ( () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )? ) ;
     public final EObject ruleXConstructorCall() throws RecognitionException {
         EObject current = null;
 
@@ -18356,14 +18356,14 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6412:28: ( ( () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )? ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6413:1: ( () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )? )
+            // InternalCheck.g:6412:28: ( ( () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )? ) )
+            // InternalCheck.g:6413:1: ( () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )? )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6413:1: ( () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )? )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6413:2: () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )?
+            // InternalCheck.g:6413:1: ( () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )? )
+            // InternalCheck.g:6413:2: () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )?
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6413:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6414:5: 
+            // InternalCheck.g:6413:2: ()
+            // InternalCheck.g:6414:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -18375,17 +18375,17 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,96,FOLLOW_96_in_ruleXConstructorCall14725); if (state.failed) return current;
+            otherlv_1=(Token)match(input,96,FOLLOW_3); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXConstructorCallAccess().getNewKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6423:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6424:1: ( ruleQualifiedName )
+            // InternalCheck.g:6423:1: ( ( ruleQualifiedName ) )
+            // InternalCheck.g:6424:1: ( ruleQualifiedName )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6424:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6425:3: ruleQualifiedName
+            // InternalCheck.g:6424:1: ( ruleQualifiedName )
+            // InternalCheck.g:6425:3: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
 
@@ -18399,7 +18399,7 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
               	        newCompositeNode(grammarAccess.getXConstructorCallAccess().getConstructorJvmConstructorCrossReference_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_ruleXConstructorCall14748);
+            pushFollow(FOLLOW_103);
             ruleQualifiedName();
 
             state._fsp--;
@@ -18415,17 +18415,17 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6438:2: ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )?
+            // InternalCheck.g:6438:2: ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )?
             int alt127=2;
             alt127 = dfa127.predict(input);
             switch (alt127) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6438:3: ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>'
+                    // InternalCheck.g:6438:3: ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>'
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6438:3: ( ( '<' )=>otherlv_3= '<' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6438:4: ( '<' )=>otherlv_3= '<'
+                    // InternalCheck.g:6438:3: ( ( '<' )=>otherlv_3= '<' )
+                    // InternalCheck.g:6438:4: ( '<' )=>otherlv_3= '<'
                     {
-                    otherlv_3=(Token)match(input,56,FOLLOW_56_in_ruleXConstructorCall14769); if (state.failed) return current;
+                    otherlv_3=(Token)match(input,56,FOLLOW_72); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_3, grammarAccess.getXConstructorCallAccess().getLessThanSignKeyword_3_0());
@@ -18434,18 +18434,18 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6443:2: ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6444:1: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
+                    // InternalCheck.g:6443:2: ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) )
+                    // InternalCheck.g:6444:1: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6444:1: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6445:3: lv_typeArguments_4_0= ruleJvmArgumentTypeReference
+                    // InternalCheck.g:6444:1: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
+                    // InternalCheck.g:6445:3: lv_typeArguments_4_0= ruleJvmArgumentTypeReference
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXConstructorCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_3_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleXConstructorCall14791);
+                    pushFollow(FOLLOW_73);
                     lv_typeArguments_4_0=ruleJvmArgumentTypeReference();
 
                     state._fsp--;
@@ -18459,7 +18459,7 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
                              			current, 
                              			"typeArguments",
                               		lv_typeArguments_4_0, 
-                              		"JvmArgumentTypeReference");
+                              		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -18469,7 +18469,7 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6461:2: (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )*
+                    // InternalCheck.g:6461:2: (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )*
                     loop126:
                     do {
                         int alt126=2;
@@ -18482,26 +18482,26 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
                         switch (alt126) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6461:4: otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) )
+                    	    // InternalCheck.g:6461:4: otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) )
                     	    {
-                    	    otherlv_5=(Token)match(input,24,FOLLOW_24_in_ruleXConstructorCall14804); if (state.failed) return current;
+                    	    otherlv_5=(Token)match(input,24,FOLLOW_72); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_5, grammarAccess.getXConstructorCallAccess().getCommaKeyword_3_2_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6465:1: ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6466:1: (lv_typeArguments_6_0= ruleJvmArgumentTypeReference )
+                    	    // InternalCheck.g:6465:1: ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) )
+                    	    // InternalCheck.g:6466:1: (lv_typeArguments_6_0= ruleJvmArgumentTypeReference )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6466:1: (lv_typeArguments_6_0= ruleJvmArgumentTypeReference )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6467:3: lv_typeArguments_6_0= ruleJvmArgumentTypeReference
+                    	    // InternalCheck.g:6466:1: (lv_typeArguments_6_0= ruleJvmArgumentTypeReference )
+                    	    // InternalCheck.g:6467:3: lv_typeArguments_6_0= ruleJvmArgumentTypeReference
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getXConstructorCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_3_2_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleXConstructorCall14825);
+                    	    pushFollow(FOLLOW_73);
                     	    lv_typeArguments_6_0=ruleJvmArgumentTypeReference();
 
                     	    state._fsp--;
@@ -18515,7 +18515,7 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
                     	             			current, 
                     	             			"typeArguments",
                     	              		lv_typeArguments_6_0, 
-                    	              		"JvmArgumentTypeReference");
+                    	              		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -18534,7 +18534,7 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
                         }
                     } while (true);
 
-                    otherlv_7=(Token)match(input,57,FOLLOW_57_in_ruleXConstructorCall14839); if (state.failed) return current;
+                    otherlv_7=(Token)match(input,57,FOLLOW_101); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_7, grammarAccess.getXConstructorCallAccess().getGreaterThanSignKeyword_3_3());
@@ -18546,20 +18546,20 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6487:3: ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )?
+            // InternalCheck.g:6487:3: ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )?
             int alt130=2;
             alt130 = dfa130.predict(input);
             switch (alt130) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6487:4: ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')'
+                    // InternalCheck.g:6487:4: ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')'
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6487:4: ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6487:5: ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' )
+                    // InternalCheck.g:6487:4: ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) )
+                    // InternalCheck.g:6487:5: ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6494:1: (lv_explicitConstructorCall_8_0= '(' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6495:3: lv_explicitConstructorCall_8_0= '('
+                    // InternalCheck.g:6494:1: (lv_explicitConstructorCall_8_0= '(' )
+                    // InternalCheck.g:6495:3: lv_explicitConstructorCall_8_0= '('
                     {
-                    lv_explicitConstructorCall_8_0=(Token)match(input,23,FOLLOW_23_in_ruleXConstructorCall14875); if (state.failed) return current;
+                    lv_explicitConstructorCall_8_0=(Token)match(input,23,FOLLOW_75); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_explicitConstructorCall_8_0, grammarAccess.getXConstructorCallAccess().getExplicitConstructorCallLeftParenthesisKeyword_4_0_0());
@@ -18579,25 +18579,25 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6508:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )?
+                    // InternalCheck.g:6508:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )?
                     int alt129=3;
                     alt129 = dfa129.predict(input);
                     switch (alt129) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6508:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) )
+                            // InternalCheck.g:6508:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6508:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6508:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure )
+                            // InternalCheck.g:6508:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) )
+                            // InternalCheck.g:6508:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6525:1: (lv_arguments_9_0= ruleXShortClosure )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6526:3: lv_arguments_9_0= ruleXShortClosure
+                            // InternalCheck.g:6525:1: (lv_arguments_9_0= ruleXShortClosure )
+                            // InternalCheck.g:6526:3: lv_arguments_9_0= ruleXShortClosure
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXConstructorCallAccess().getArgumentsXShortClosureParserRuleCall_4_1_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleXShortClosure_in_ruleXConstructorCall14960);
+                            pushFollow(FOLLOW_26);
                             lv_arguments_9_0=ruleXShortClosure();
 
                             state._fsp--;
@@ -18611,7 +18611,7 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
                                      			current, 
                                      			"arguments",
                                       		lv_arguments_9_0, 
-                                      		"XShortClosure");
+                                      		"org.eclipse.xtext.xbase.Xbase.XShortClosure");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -18625,23 +18625,23 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
                             }
                             break;
                         case 2 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6543:6: ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* )
+                            // InternalCheck.g:6543:6: ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6543:6: ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6543:7: ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )*
+                            // InternalCheck.g:6543:6: ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* )
+                            // InternalCheck.g:6543:7: ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )*
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6543:7: ( (lv_arguments_10_0= ruleXExpression ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6544:1: (lv_arguments_10_0= ruleXExpression )
+                            // InternalCheck.g:6543:7: ( (lv_arguments_10_0= ruleXExpression ) )
+                            // InternalCheck.g:6544:1: (lv_arguments_10_0= ruleXExpression )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6544:1: (lv_arguments_10_0= ruleXExpression )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6545:3: lv_arguments_10_0= ruleXExpression
+                            // InternalCheck.g:6544:1: (lv_arguments_10_0= ruleXExpression )
+                            // InternalCheck.g:6545:3: lv_arguments_10_0= ruleXExpression
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXConstructorCallAccess().getArgumentsXExpressionParserRuleCall_4_1_1_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleXExpression_in_ruleXConstructorCall14988);
+                            pushFollow(FOLLOW_19);
                             lv_arguments_10_0=ruleXExpression();
 
                             state._fsp--;
@@ -18655,7 +18655,7 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
                                      			current, 
                                      			"arguments",
                                       		lv_arguments_10_0, 
-                                      		"XExpression");
+                                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -18665,7 +18665,7 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
                             }
 
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6561:2: (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )*
+                            // InternalCheck.g:6561:2: (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )*
                             loop128:
                             do {
                                 int alt128=2;
@@ -18678,26 +18678,26 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
                                 switch (alt128) {
                             	case 1 :
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6561:4: otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) )
+                            	    // InternalCheck.g:6561:4: otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) )
                             	    {
-                            	    otherlv_11=(Token)match(input,24,FOLLOW_24_in_ruleXConstructorCall15001); if (state.failed) return current;
+                            	    otherlv_11=(Token)match(input,24,FOLLOW_29); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	          	newLeafNode(otherlv_11, grammarAccess.getXConstructorCallAccess().getCommaKeyword_4_1_1_1_0());
                             	          
                             	    }
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6565:1: ( (lv_arguments_12_0= ruleXExpression ) )
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6566:1: (lv_arguments_12_0= ruleXExpression )
+                            	    // InternalCheck.g:6565:1: ( (lv_arguments_12_0= ruleXExpression ) )
+                            	    // InternalCheck.g:6566:1: (lv_arguments_12_0= ruleXExpression )
                             	    {
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6566:1: (lv_arguments_12_0= ruleXExpression )
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6567:3: lv_arguments_12_0= ruleXExpression
+                            	    // InternalCheck.g:6566:1: (lv_arguments_12_0= ruleXExpression )
+                            	    // InternalCheck.g:6567:3: lv_arguments_12_0= ruleXExpression
                             	    {
                             	    if ( state.backtracking==0 ) {
                             	       
                             	      	        newCompositeNode(grammarAccess.getXConstructorCallAccess().getArgumentsXExpressionParserRuleCall_4_1_1_1_1_0()); 
                             	      	    
                             	    }
-                            	    pushFollow(FOLLOW_ruleXExpression_in_ruleXConstructorCall15022);
+                            	    pushFollow(FOLLOW_19);
                             	    lv_arguments_12_0=ruleXExpression();
 
                             	    state._fsp--;
@@ -18711,7 +18711,7 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
                             	             			current, 
                             	             			"arguments",
                             	              		lv_arguments_12_0, 
-                            	              		"XExpression");
+                            	              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                             	      	        afterParserOrEnumRuleCall();
                             	      	    
                             	    }
@@ -18739,7 +18739,7 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
                     }
 
-                    otherlv_13=(Token)match(input,25,FOLLOW_25_in_ruleXConstructorCall15039); if (state.failed) return current;
+                    otherlv_13=(Token)match(input,25,FOLLOW_102); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_13, grammarAccess.getXConstructorCallAccess().getRightParenthesisKeyword_4_2());
@@ -18751,22 +18751,22 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6587:3: ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )?
+            // InternalCheck.g:6587:3: ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )?
             int alt131=2;
             alt131 = dfa131.predict(input);
             switch (alt131) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6587:4: ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure )
+                    // InternalCheck.g:6587:4: ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6590:1: (lv_arguments_14_0= ruleXClosure )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6591:3: lv_arguments_14_0= ruleXClosure
+                    // InternalCheck.g:6590:1: (lv_arguments_14_0= ruleXClosure )
+                    // InternalCheck.g:6591:3: lv_arguments_14_0= ruleXClosure
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXConstructorCallAccess().getArgumentsXClosureParserRuleCall_5_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXClosure_in_ruleXConstructorCall15074);
+                    pushFollow(FOLLOW_2);
                     lv_arguments_14_0=ruleXClosure();
 
                     state._fsp--;
@@ -18780,7 +18780,7 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
                              			current, 
                              			"arguments",
                               		lv_arguments_14_0, 
-                              		"XClosure");
+                              		"org.eclipse.xtext.xbase.Xbase.XClosure");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -18816,7 +18816,7 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXBooleanLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6615:1: entryRuleXBooleanLiteral returns [EObject current=null] : iv_ruleXBooleanLiteral= ruleXBooleanLiteral EOF ;
+    // InternalCheck.g:6615:1: entryRuleXBooleanLiteral returns [EObject current=null] : iv_ruleXBooleanLiteral= ruleXBooleanLiteral EOF ;
     public final EObject entryRuleXBooleanLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -18824,13 +18824,13 @@ public final EObject entryRuleXBooleanLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6616:2: (iv_ruleXBooleanLiteral= ruleXBooleanLiteral EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6617:2: iv_ruleXBooleanLiteral= ruleXBooleanLiteral EOF
+            // InternalCheck.g:6616:2: (iv_ruleXBooleanLiteral= ruleXBooleanLiteral EOF )
+            // InternalCheck.g:6617:2: iv_ruleXBooleanLiteral= ruleXBooleanLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXBooleanLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXBooleanLiteral_in_entryRuleXBooleanLiteral15111);
+            pushFollow(FOLLOW_1);
             iv_ruleXBooleanLiteral=ruleXBooleanLiteral();
 
             state._fsp--;
@@ -18838,7 +18838,7 @@ public final EObject entryRuleXBooleanLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXBooleanLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXBooleanLiteral15121); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -18856,7 +18856,7 @@ public final EObject entryRuleXBooleanLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXBooleanLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6624:1: ruleXBooleanLiteral returns [EObject current=null] : ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) ;
+    // InternalCheck.g:6624:1: ruleXBooleanLiteral returns [EObject current=null] : ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) ;
     public final EObject ruleXBooleanLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -18866,14 +18866,14 @@ public final EObject ruleXBooleanLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6627:28: ( ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6628:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
+            // InternalCheck.g:6627:28: ( ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) )
+            // InternalCheck.g:6628:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6628:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6628:2: () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
+            // InternalCheck.g:6628:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
+            // InternalCheck.g:6628:2: () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6628:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6629:5: 
+            // InternalCheck.g:6628:2: ()
+            // InternalCheck.g:6629:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -18885,7 +18885,7 @@ public final EObject ruleXBooleanLiteral() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6634:2: (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
+            // InternalCheck.g:6634:2: (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
             int alt132=2;
             int LA132_0 = input.LA(1);
 
@@ -18904,9 +18904,9 @@ else if ( (LA132_0==98) ) {
             }
             switch (alt132) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6634:4: otherlv_1= 'false'
+                    // InternalCheck.g:6634:4: otherlv_1= 'false'
                     {
-                    otherlv_1=(Token)match(input,97,FOLLOW_97_in_ruleXBooleanLiteral15168); if (state.failed) return current;
+                    otherlv_1=(Token)match(input,97,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_1, grammarAccess.getXBooleanLiteralAccess().getFalseKeyword_1_0());
@@ -18916,15 +18916,15 @@ else if ( (LA132_0==98) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6639:6: ( (lv_isTrue_2_0= 'true' ) )
+                    // InternalCheck.g:6639:6: ( (lv_isTrue_2_0= 'true' ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6639:6: ( (lv_isTrue_2_0= 'true' ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6640:1: (lv_isTrue_2_0= 'true' )
+                    // InternalCheck.g:6639:6: ( (lv_isTrue_2_0= 'true' ) )
+                    // InternalCheck.g:6640:1: (lv_isTrue_2_0= 'true' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6640:1: (lv_isTrue_2_0= 'true' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6641:3: lv_isTrue_2_0= 'true'
+                    // InternalCheck.g:6640:1: (lv_isTrue_2_0= 'true' )
+                    // InternalCheck.g:6641:3: lv_isTrue_2_0= 'true'
                     {
-                    lv_isTrue_2_0=(Token)match(input,98,FOLLOW_98_in_ruleXBooleanLiteral15192); if (state.failed) return current;
+                    lv_isTrue_2_0=(Token)match(input,98,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_isTrue_2_0, grammarAccess.getXBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0());
@@ -18973,7 +18973,7 @@ else if ( (LA132_0==98) ) {
 
 
     // $ANTLR start "entryRuleXNullLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6662:1: entryRuleXNullLiteral returns [EObject current=null] : iv_ruleXNullLiteral= ruleXNullLiteral EOF ;
+    // InternalCheck.g:6662:1: entryRuleXNullLiteral returns [EObject current=null] : iv_ruleXNullLiteral= ruleXNullLiteral EOF ;
     public final EObject entryRuleXNullLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -18981,13 +18981,13 @@ public final EObject entryRuleXNullLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6663:2: (iv_ruleXNullLiteral= ruleXNullLiteral EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6664:2: iv_ruleXNullLiteral= ruleXNullLiteral EOF
+            // InternalCheck.g:6663:2: (iv_ruleXNullLiteral= ruleXNullLiteral EOF )
+            // InternalCheck.g:6664:2: iv_ruleXNullLiteral= ruleXNullLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXNullLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXNullLiteral_in_entryRuleXNullLiteral15242);
+            pushFollow(FOLLOW_1);
             iv_ruleXNullLiteral=ruleXNullLiteral();
 
             state._fsp--;
@@ -18995,7 +18995,7 @@ public final EObject entryRuleXNullLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXNullLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXNullLiteral15252); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -19013,7 +19013,7 @@ public final EObject entryRuleXNullLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXNullLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6671:1: ruleXNullLiteral returns [EObject current=null] : ( () otherlv_1= 'null' ) ;
+    // InternalCheck.g:6671:1: ruleXNullLiteral returns [EObject current=null] : ( () otherlv_1= 'null' ) ;
     public final EObject ruleXNullLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -19022,14 +19022,14 @@ public final EObject ruleXNullLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6674:28: ( ( () otherlv_1= 'null' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6675:1: ( () otherlv_1= 'null' )
+            // InternalCheck.g:6674:28: ( ( () otherlv_1= 'null' ) )
+            // InternalCheck.g:6675:1: ( () otherlv_1= 'null' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6675:1: ( () otherlv_1= 'null' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6675:2: () otherlv_1= 'null'
+            // InternalCheck.g:6675:1: ( () otherlv_1= 'null' )
+            // InternalCheck.g:6675:2: () otherlv_1= 'null'
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6675:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6676:5: 
+            // InternalCheck.g:6675:2: ()
+            // InternalCheck.g:6676:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -19041,7 +19041,7 @@ public final EObject ruleXNullLiteral() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,99,FOLLOW_99_in_ruleXNullLiteral15298); if (state.failed) return current;
+            otherlv_1=(Token)match(input,99,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXNullLiteralAccess().getNullKeyword_1());
@@ -19070,7 +19070,7 @@ public final EObject ruleXNullLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXNumberLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6693:1: entryRuleXNumberLiteral returns [EObject current=null] : iv_ruleXNumberLiteral= ruleXNumberLiteral EOF ;
+    // InternalCheck.g:6693:1: entryRuleXNumberLiteral returns [EObject current=null] : iv_ruleXNumberLiteral= ruleXNumberLiteral EOF ;
     public final EObject entryRuleXNumberLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -19078,13 +19078,13 @@ public final EObject entryRuleXNumberLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6694:2: (iv_ruleXNumberLiteral= ruleXNumberLiteral EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6695:2: iv_ruleXNumberLiteral= ruleXNumberLiteral EOF
+            // InternalCheck.g:6694:2: (iv_ruleXNumberLiteral= ruleXNumberLiteral EOF )
+            // InternalCheck.g:6695:2: iv_ruleXNumberLiteral= ruleXNumberLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXNumberLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXNumberLiteral_in_entryRuleXNumberLiteral15334);
+            pushFollow(FOLLOW_1);
             iv_ruleXNumberLiteral=ruleXNumberLiteral();
 
             state._fsp--;
@@ -19092,7 +19092,7 @@ public final EObject entryRuleXNumberLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXNumberLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXNumberLiteral15344); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -19110,7 +19110,7 @@ public final EObject entryRuleXNumberLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXNumberLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6702:1: ruleXNumberLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= ruleNumber ) ) ) ;
+    // InternalCheck.g:6702:1: ruleXNumberLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= ruleNumber ) ) ) ;
     public final EObject ruleXNumberLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -19120,14 +19120,14 @@ public final EObject ruleXNumberLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6705:28: ( ( () ( (lv_value_1_0= ruleNumber ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6706:1: ( () ( (lv_value_1_0= ruleNumber ) ) )
+            // InternalCheck.g:6705:28: ( ( () ( (lv_value_1_0= ruleNumber ) ) ) )
+            // InternalCheck.g:6706:1: ( () ( (lv_value_1_0= ruleNumber ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6706:1: ( () ( (lv_value_1_0= ruleNumber ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6706:2: () ( (lv_value_1_0= ruleNumber ) )
+            // InternalCheck.g:6706:1: ( () ( (lv_value_1_0= ruleNumber ) ) )
+            // InternalCheck.g:6706:2: () ( (lv_value_1_0= ruleNumber ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6706:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6707:5: 
+            // InternalCheck.g:6706:2: ()
+            // InternalCheck.g:6707:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -19139,18 +19139,18 @@ public final EObject ruleXNumberLiteral() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6712:2: ( (lv_value_1_0= ruleNumber ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6713:1: (lv_value_1_0= ruleNumber )
+            // InternalCheck.g:6712:2: ( (lv_value_1_0= ruleNumber ) )
+            // InternalCheck.g:6713:1: (lv_value_1_0= ruleNumber )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6713:1: (lv_value_1_0= ruleNumber )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6714:3: lv_value_1_0= ruleNumber
+            // InternalCheck.g:6713:1: (lv_value_1_0= ruleNumber )
+            // InternalCheck.g:6714:3: lv_value_1_0= ruleNumber
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXNumberLiteralAccess().getValueNumberParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleNumber_in_ruleXNumberLiteral15399);
+            pushFollow(FOLLOW_2);
             lv_value_1_0=ruleNumber();
 
             state._fsp--;
@@ -19164,7 +19164,7 @@ public final EObject ruleXNumberLiteral() throws RecognitionException {
                      			current, 
                      			"value",
                       		lv_value_1_0, 
-                      		"Number");
+                      		"org.eclipse.xtext.xbase.Xbase.Number");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -19197,7 +19197,7 @@ public final EObject ruleXNumberLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXStringLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6738:1: entryRuleXStringLiteral returns [EObject current=null] : iv_ruleXStringLiteral= ruleXStringLiteral EOF ;
+    // InternalCheck.g:6738:1: entryRuleXStringLiteral returns [EObject current=null] : iv_ruleXStringLiteral= ruleXStringLiteral EOF ;
     public final EObject entryRuleXStringLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -19205,13 +19205,13 @@ public final EObject entryRuleXStringLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6739:2: (iv_ruleXStringLiteral= ruleXStringLiteral EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6740:2: iv_ruleXStringLiteral= ruleXStringLiteral EOF
+            // InternalCheck.g:6739:2: (iv_ruleXStringLiteral= ruleXStringLiteral EOF )
+            // InternalCheck.g:6740:2: iv_ruleXStringLiteral= ruleXStringLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXStringLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXStringLiteral_in_entryRuleXStringLiteral15435);
+            pushFollow(FOLLOW_1);
             iv_ruleXStringLiteral=ruleXStringLiteral();
 
             state._fsp--;
@@ -19219,7 +19219,7 @@ public final EObject entryRuleXStringLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXStringLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXStringLiteral15445); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -19237,7 +19237,7 @@ public final EObject entryRuleXStringLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXStringLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6747:1: ruleXStringLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= RULE_STRING ) ) ) ;
+    // InternalCheck.g:6747:1: ruleXStringLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= RULE_STRING ) ) ) ;
     public final EObject ruleXStringLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -19246,14 +19246,14 @@ public final EObject ruleXStringLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6750:28: ( ( () ( (lv_value_1_0= RULE_STRING ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6751:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
+            // InternalCheck.g:6750:28: ( ( () ( (lv_value_1_0= RULE_STRING ) ) ) )
+            // InternalCheck.g:6751:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6751:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6751:2: () ( (lv_value_1_0= RULE_STRING ) )
+            // InternalCheck.g:6751:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
+            // InternalCheck.g:6751:2: () ( (lv_value_1_0= RULE_STRING ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6751:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6752:5: 
+            // InternalCheck.g:6751:2: ()
+            // InternalCheck.g:6752:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -19265,13 +19265,13 @@ public final EObject ruleXStringLiteral() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6757:2: ( (lv_value_1_0= RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6758:1: (lv_value_1_0= RULE_STRING )
+            // InternalCheck.g:6757:2: ( (lv_value_1_0= RULE_STRING ) )
+            // InternalCheck.g:6758:1: (lv_value_1_0= RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6758:1: (lv_value_1_0= RULE_STRING )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6759:3: lv_value_1_0= RULE_STRING
+            // InternalCheck.g:6758:1: (lv_value_1_0= RULE_STRING )
+            // InternalCheck.g:6759:3: lv_value_1_0= RULE_STRING
             {
-            lv_value_1_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleXStringLiteral15496); if (state.failed) return current;
+            lv_value_1_0=(Token)match(input,RULE_STRING,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(lv_value_1_0, grammarAccess.getXStringLiteralAccess().getValueSTRINGTerminalRuleCall_1_0()); 
@@ -19286,7 +19286,7 @@ public final EObject ruleXStringLiteral() throws RecognitionException {
                      			current, 
                      			"value",
                       		lv_value_1_0, 
-                      		"STRING");
+                      		"org.eclipse.xtext.xbase.Xtype.STRING");
               	    
             }
 
@@ -19318,7 +19318,7 @@ public final EObject ruleXStringLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXTypeLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6783:1: entryRuleXTypeLiteral returns [EObject current=null] : iv_ruleXTypeLiteral= ruleXTypeLiteral EOF ;
+    // InternalCheck.g:6783:1: entryRuleXTypeLiteral returns [EObject current=null] : iv_ruleXTypeLiteral= ruleXTypeLiteral EOF ;
     public final EObject entryRuleXTypeLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -19326,13 +19326,13 @@ public final EObject entryRuleXTypeLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6784:2: (iv_ruleXTypeLiteral= ruleXTypeLiteral EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6785:2: iv_ruleXTypeLiteral= ruleXTypeLiteral EOF
+            // InternalCheck.g:6784:2: (iv_ruleXTypeLiteral= ruleXTypeLiteral EOF )
+            // InternalCheck.g:6785:2: iv_ruleXTypeLiteral= ruleXTypeLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXTypeLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXTypeLiteral_in_entryRuleXTypeLiteral15537);
+            pushFollow(FOLLOW_1);
             iv_ruleXTypeLiteral=ruleXTypeLiteral();
 
             state._fsp--;
@@ -19340,7 +19340,7 @@ public final EObject entryRuleXTypeLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXTypeLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXTypeLiteral15547); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -19358,7 +19358,7 @@ public final EObject entryRuleXTypeLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXTypeLiteral"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6792:1: ruleXTypeLiteral returns [EObject current=null] : ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' ) ;
+    // InternalCheck.g:6792:1: ruleXTypeLiteral returns [EObject current=null] : ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' ) ;
     public final EObject ruleXTypeLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -19371,14 +19371,14 @@ public final EObject ruleXTypeLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6795:28: ( ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6796:1: ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' )
+            // InternalCheck.g:6795:28: ( ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' ) )
+            // InternalCheck.g:6796:1: ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6796:1: ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6796:2: () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')'
+            // InternalCheck.g:6796:1: ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' )
+            // InternalCheck.g:6796:2: () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')'
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6796:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6797:5: 
+            // InternalCheck.g:6796:2: ()
+            // InternalCheck.g:6797:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -19390,23 +19390,23 @@ public final EObject ruleXTypeLiteral() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,100,FOLLOW_100_in_ruleXTypeLiteral15593); if (state.failed) return current;
+            otherlv_1=(Token)match(input,100,FOLLOW_24); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXTypeLiteralAccess().getTypeofKeyword_1());
                   
             }
-            otherlv_2=(Token)match(input,23,FOLLOW_23_in_ruleXTypeLiteral15605); if (state.failed) return current;
+            otherlv_2=(Token)match(input,23,FOLLOW_3); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getXTypeLiteralAccess().getLeftParenthesisKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6810:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6811:1: ( ruleQualifiedName )
+            // InternalCheck.g:6810:1: ( ( ruleQualifiedName ) )
+            // InternalCheck.g:6811:1: ( ruleQualifiedName )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6811:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6812:3: ruleQualifiedName
+            // InternalCheck.g:6811:1: ( ruleQualifiedName )
+            // InternalCheck.g:6812:3: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
 
@@ -19420,7 +19420,7 @@ public final EObject ruleXTypeLiteral() throws RecognitionException {
               	        newCompositeNode(grammarAccess.getXTypeLiteralAccess().getTypeJvmTypeCrossReference_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_ruleXTypeLiteral15628);
+            pushFollow(FOLLOW_104);
             ruleQualifiedName();
 
             state._fsp--;
@@ -19436,7 +19436,7 @@ public final EObject ruleXTypeLiteral() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6825:2: ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )*
+            // InternalCheck.g:6825:2: ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )*
             loop133:
             do {
                 int alt133=2;
@@ -19449,17 +19449,17 @@ public final EObject ruleXTypeLiteral() throws RecognitionException {
 
                 switch (alt133) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6826:1: (lv_arrayDimensions_4_0= ruleArrayBrackets )
+            	    // InternalCheck.g:6826:1: (lv_arrayDimensions_4_0= ruleArrayBrackets )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6826:1: (lv_arrayDimensions_4_0= ruleArrayBrackets )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6827:3: lv_arrayDimensions_4_0= ruleArrayBrackets
+            	    // InternalCheck.g:6826:1: (lv_arrayDimensions_4_0= ruleArrayBrackets )
+            	    // InternalCheck.g:6827:3: lv_arrayDimensions_4_0= ruleArrayBrackets
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXTypeLiteralAccess().getArrayDimensionsArrayBracketsParserRuleCall_4_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleArrayBrackets_in_ruleXTypeLiteral15649);
+            	    pushFollow(FOLLOW_104);
             	    lv_arrayDimensions_4_0=ruleArrayBrackets();
 
             	    state._fsp--;
@@ -19473,7 +19473,7 @@ public final EObject ruleXTypeLiteral() throws RecognitionException {
             	             			current, 
             	             			"arrayDimensions",
             	              		lv_arrayDimensions_4_0, 
-            	              		"ArrayBrackets");
+            	              		"org.eclipse.xtext.xbase.Xtype.ArrayBrackets");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -19489,7 +19489,7 @@ public final EObject ruleXTypeLiteral() throws RecognitionException {
                 }
             } while (true);
 
-            otherlv_5=(Token)match(input,25,FOLLOW_25_in_ruleXTypeLiteral15662); if (state.failed) return current;
+            otherlv_5=(Token)match(input,25,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_5, grammarAccess.getXTypeLiteralAccess().getRightParenthesisKeyword_5());
@@ -19518,7 +19518,7 @@ public final EObject ruleXTypeLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXThrowExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6855:1: entryRuleXThrowExpression returns [EObject current=null] : iv_ruleXThrowExpression= ruleXThrowExpression EOF ;
+    // InternalCheck.g:6855:1: entryRuleXThrowExpression returns [EObject current=null] : iv_ruleXThrowExpression= ruleXThrowExpression EOF ;
     public final EObject entryRuleXThrowExpression() throws RecognitionException {
         EObject current = null;
 
@@ -19526,13 +19526,13 @@ public final EObject entryRuleXThrowExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6856:2: (iv_ruleXThrowExpression= ruleXThrowExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6857:2: iv_ruleXThrowExpression= ruleXThrowExpression EOF
+            // InternalCheck.g:6856:2: (iv_ruleXThrowExpression= ruleXThrowExpression EOF )
+            // InternalCheck.g:6857:2: iv_ruleXThrowExpression= ruleXThrowExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXThrowExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXThrowExpression_in_entryRuleXThrowExpression15698);
+            pushFollow(FOLLOW_1);
             iv_ruleXThrowExpression=ruleXThrowExpression();
 
             state._fsp--;
@@ -19540,7 +19540,7 @@ public final EObject entryRuleXThrowExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXThrowExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXThrowExpression15708); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -19558,7 +19558,7 @@ public final EObject entryRuleXThrowExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXThrowExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6864:1: ruleXThrowExpression returns [EObject current=null] : ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) ) ;
+    // InternalCheck.g:6864:1: ruleXThrowExpression returns [EObject current=null] : ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) ) ;
     public final EObject ruleXThrowExpression() throws RecognitionException {
         EObject current = null;
 
@@ -19569,14 +19569,14 @@ public final EObject ruleXThrowExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6867:28: ( ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6868:1: ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) )
+            // InternalCheck.g:6867:28: ( ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) ) )
+            // InternalCheck.g:6868:1: ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6868:1: ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6868:2: () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) )
+            // InternalCheck.g:6868:1: ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) )
+            // InternalCheck.g:6868:2: () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6868:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6869:5: 
+            // InternalCheck.g:6868:2: ()
+            // InternalCheck.g:6869:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -19588,24 +19588,24 @@ public final EObject ruleXThrowExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,101,FOLLOW_101_in_ruleXThrowExpression15754); if (state.failed) return current;
+            otherlv_1=(Token)match(input,101,FOLLOW_29); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXThrowExpressionAccess().getThrowKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6878:1: ( (lv_expression_2_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6879:1: (lv_expression_2_0= ruleXExpression )
+            // InternalCheck.g:6878:1: ( (lv_expression_2_0= ruleXExpression ) )
+            // InternalCheck.g:6879:1: (lv_expression_2_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6879:1: (lv_expression_2_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6880:3: lv_expression_2_0= ruleXExpression
+            // InternalCheck.g:6879:1: (lv_expression_2_0= ruleXExpression )
+            // InternalCheck.g:6880:3: lv_expression_2_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXThrowExpressionAccess().getExpressionXExpressionParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXThrowExpression15775);
+            pushFollow(FOLLOW_2);
             lv_expression_2_0=ruleXExpression();
 
             state._fsp--;
@@ -19619,7 +19619,7 @@ public final EObject ruleXThrowExpression() throws RecognitionException {
                      			current, 
                      			"expression",
                       		lv_expression_2_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -19652,7 +19652,7 @@ public final EObject ruleXThrowExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXReturnExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6904:1: entryRuleXReturnExpression returns [EObject current=null] : iv_ruleXReturnExpression= ruleXReturnExpression EOF ;
+    // InternalCheck.g:6904:1: entryRuleXReturnExpression returns [EObject current=null] : iv_ruleXReturnExpression= ruleXReturnExpression EOF ;
     public final EObject entryRuleXReturnExpression() throws RecognitionException {
         EObject current = null;
 
@@ -19660,13 +19660,13 @@ public final EObject entryRuleXReturnExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6905:2: (iv_ruleXReturnExpression= ruleXReturnExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6906:2: iv_ruleXReturnExpression= ruleXReturnExpression EOF
+            // InternalCheck.g:6905:2: (iv_ruleXReturnExpression= ruleXReturnExpression EOF )
+            // InternalCheck.g:6906:2: iv_ruleXReturnExpression= ruleXReturnExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXReturnExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXReturnExpression_in_entryRuleXReturnExpression15811);
+            pushFollow(FOLLOW_1);
             iv_ruleXReturnExpression=ruleXReturnExpression();
 
             state._fsp--;
@@ -19674,7 +19674,7 @@ public final EObject entryRuleXReturnExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXReturnExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXReturnExpression15821); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -19692,7 +19692,7 @@ public final EObject entryRuleXReturnExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXReturnExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6913:1: ruleXReturnExpression returns [EObject current=null] : ( () otherlv_1= 'return' ( ( 'extends' | 'static' | 'import' | 'extension' | 'catalog' | 'grammar' | 'with' | 'category' | 'message' | 'on' | 'bind' | 'data' | 'SeverityRange' | 'error' | 'warning' | 'info' | 'ignore' | 'live' | 'onSave' | 'onDemand' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | 'guard' | 'issue' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )? ) ;
+    // InternalCheck.g:6913:1: ruleXReturnExpression returns [EObject current=null] : ( () otherlv_1= 'return' ( ( 'extends' | 'static' | 'import' | 'extension' | 'catalog' | 'grammar' | 'with' | 'category' | 'message' | 'on' | 'bind' | 'data' | 'SeverityRange' | 'error' | 'warning' | 'info' | 'ignore' | 'live' | 'onSave' | 'onDemand' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | 'guard' | 'issue' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )? ) ;
     public final EObject ruleXReturnExpression() throws RecognitionException {
         EObject current = null;
 
@@ -19703,14 +19703,14 @@ public final EObject ruleXReturnExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6916:28: ( ( () otherlv_1= 'return' ( ( 'extends' | 'static' | 'import' | 'extension' | 'catalog' | 'grammar' | 'with' | 'category' | 'message' | 'on' | 'bind' | 'data' | 'SeverityRange' | 'error' | 'warning' | 'info' | 'ignore' | 'live' | 'onSave' | 'onDemand' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | 'guard' | 'issue' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )? ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6917:1: ( () otherlv_1= 'return' ( ( 'extends' | 'static' | 'import' | 'extension' | 'catalog' | 'grammar' | 'with' | 'category' | 'message' | 'on' | 'bind' | 'data' | 'SeverityRange' | 'error' | 'warning' | 'info' | 'ignore' | 'live' | 'onSave' | 'onDemand' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | 'guard' | 'issue' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )? )
+            // InternalCheck.g:6916:28: ( ( () otherlv_1= 'return' ( ( 'extends' | 'static' | 'import' | 'extension' | 'catalog' | 'grammar' | 'with' | 'category' | 'message' | 'on' | 'bind' | 'data' | 'SeverityRange' | 'error' | 'warning' | 'info' | 'ignore' | 'live' | 'onSave' | 'onDemand' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | 'guard' | 'issue' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )? ) )
+            // InternalCheck.g:6917:1: ( () otherlv_1= 'return' ( ( 'extends' | 'static' | 'import' | 'extension' | 'catalog' | 'grammar' | 'with' | 'category' | 'message' | 'on' | 'bind' | 'data' | 'SeverityRange' | 'error' | 'warning' | 'info' | 'ignore' | 'live' | 'onSave' | 'onDemand' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | 'guard' | 'issue' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )? )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6917:1: ( () otherlv_1= 'return' ( ( 'extends' | 'static' | 'import' | 'extension' | 'catalog' | 'grammar' | 'with' | 'category' | 'message' | 'on' | 'bind' | 'data' | 'SeverityRange' | 'error' | 'warning' | 'info' | 'ignore' | 'live' | 'onSave' | 'onDemand' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | 'guard' | 'issue' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )? )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6917:2: () otherlv_1= 'return' ( ( 'extends' | 'static' | 'import' | 'extension' | 'catalog' | 'grammar' | 'with' | 'category' | 'message' | 'on' | 'bind' | 'data' | 'SeverityRange' | 'error' | 'warning' | 'info' | 'ignore' | 'live' | 'onSave' | 'onDemand' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | 'guard' | 'issue' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )?
+            // InternalCheck.g:6917:1: ( () otherlv_1= 'return' ( ( 'extends' | 'static' | 'import' | 'extension' | 'catalog' | 'grammar' | 'with' | 'category' | 'message' | 'on' | 'bind' | 'data' | 'SeverityRange' | 'error' | 'warning' | 'info' | 'ignore' | 'live' | 'onSave' | 'onDemand' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | 'guard' | 'issue' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )? )
+            // InternalCheck.g:6917:2: () otherlv_1= 'return' ( ( 'extends' | 'static' | 'import' | 'extension' | 'catalog' | 'grammar' | 'with' | 'category' | 'message' | 'on' | 'bind' | 'data' | 'SeverityRange' | 'error' | 'warning' | 'info' | 'ignore' | 'live' | 'onSave' | 'onDemand' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | 'guard' | 'issue' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )?
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6917:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6918:5: 
+            // InternalCheck.g:6917:2: ()
+            // InternalCheck.g:6918:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -19722,28 +19722,28 @@ public final EObject ruleXReturnExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,102,FOLLOW_102_in_ruleXReturnExpression15867); if (state.failed) return current;
+            otherlv_1=(Token)match(input,102,FOLLOW_105); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXReturnExpressionAccess().getReturnKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6927:1: ( ( 'extends' | 'static' | 'import' | 'extension' | 'catalog' | 'grammar' | 'with' | 'category' | 'message' | 'on' | 'bind' | 'data' | 'SeverityRange' | 'error' | 'warning' | 'info' | 'ignore' | 'live' | 'onSave' | 'onDemand' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | 'guard' | 'issue' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )?
+            // InternalCheck.g:6927:1: ( ( 'extends' | 'static' | 'import' | 'extension' | 'catalog' | 'grammar' | 'with' | 'category' | 'message' | 'on' | 'bind' | 'data' | 'SeverityRange' | 'error' | 'warning' | 'info' | 'ignore' | 'live' | 'onSave' | 'onDemand' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | 'guard' | 'issue' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )?
             int alt134=2;
             alt134 = dfa134.predict(input);
             switch (alt134) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6927:2: ( 'extends' | 'static' | 'import' | 'extension' | 'catalog' | 'grammar' | 'with' | 'category' | 'message' | 'on' | 'bind' | 'data' | 'SeverityRange' | 'error' | 'warning' | 'info' | 'ignore' | 'live' | 'onSave' | 'onDemand' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | 'guard' | 'issue' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression )
+                    // InternalCheck.g:6927:2: ( 'extends' | 'static' | 'import' | 'extension' | 'catalog' | 'grammar' | 'with' | 'category' | 'message' | 'on' | 'bind' | 'data' | 'SeverityRange' | 'error' | 'warning' | 'info' | 'ignore' | 'live' | 'onSave' | 'onDemand' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | 'guard' | 'issue' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6973:1: (lv_expression_2_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6974:3: lv_expression_2_0= ruleXExpression
+                    // InternalCheck.g:6973:1: (lv_expression_2_0= ruleXExpression )
+                    // InternalCheck.g:6974:3: lv_expression_2_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXReturnExpressionAccess().getExpressionXExpressionParserRuleCall_2_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXReturnExpression16228);
+                    pushFollow(FOLLOW_2);
                     lv_expression_2_0=ruleXExpression();
 
                     state._fsp--;
@@ -19757,7 +19757,7 @@ public final EObject ruleXReturnExpression() throws RecognitionException {
                              			current, 
                              			"expression",
                               		lv_expression_2_0, 
-                              		"XExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -19793,7 +19793,7 @@ public final EObject ruleXReturnExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXTryCatchFinallyExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6998:1: entryRuleXTryCatchFinallyExpression returns [EObject current=null] : iv_ruleXTryCatchFinallyExpression= ruleXTryCatchFinallyExpression EOF ;
+    // InternalCheck.g:6998:1: entryRuleXTryCatchFinallyExpression returns [EObject current=null] : iv_ruleXTryCatchFinallyExpression= ruleXTryCatchFinallyExpression EOF ;
     public final EObject entryRuleXTryCatchFinallyExpression() throws RecognitionException {
         EObject current = null;
 
@@ -19801,13 +19801,13 @@ public final EObject entryRuleXTryCatchFinallyExpression() throws RecognitionExc
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6999:2: (iv_ruleXTryCatchFinallyExpression= ruleXTryCatchFinallyExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7000:2: iv_ruleXTryCatchFinallyExpression= ruleXTryCatchFinallyExpression EOF
+            // InternalCheck.g:6999:2: (iv_ruleXTryCatchFinallyExpression= ruleXTryCatchFinallyExpression EOF )
+            // InternalCheck.g:7000:2: iv_ruleXTryCatchFinallyExpression= ruleXTryCatchFinallyExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXTryCatchFinallyExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXTryCatchFinallyExpression_in_entryRuleXTryCatchFinallyExpression16265);
+            pushFollow(FOLLOW_1);
             iv_ruleXTryCatchFinallyExpression=ruleXTryCatchFinallyExpression();
 
             state._fsp--;
@@ -19815,7 +19815,7 @@ public final EObject entryRuleXTryCatchFinallyExpression() throws RecognitionExc
             if ( state.backtracking==0 ) {
                current =iv_ruleXTryCatchFinallyExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXTryCatchFinallyExpression16275); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -19833,7 +19833,7 @@ public final EObject entryRuleXTryCatchFinallyExpression() throws RecognitionExc
 
 
     // $ANTLR start "ruleXTryCatchFinallyExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7007:1: ruleXTryCatchFinallyExpression returns [EObject current=null] : ( () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) ) ) ;
+    // InternalCheck.g:7007:1: ruleXTryCatchFinallyExpression returns [EObject current=null] : ( () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) ) ) ;
     public final EObject ruleXTryCatchFinallyExpression() throws RecognitionException {
         EObject current = null;
 
@@ -19852,14 +19852,14 @@ public final EObject ruleXTryCatchFinallyExpression() throws RecognitionExceptio
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7010:28: ( ( () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7011:1: ( () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) ) )
+            // InternalCheck.g:7010:28: ( ( () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) ) ) )
+            // InternalCheck.g:7011:1: ( () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7011:1: ( () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7011:2: () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) )
+            // InternalCheck.g:7011:1: ( () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) ) )
+            // InternalCheck.g:7011:2: () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7011:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7012:5: 
+            // InternalCheck.g:7011:2: ()
+            // InternalCheck.g:7012:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -19871,24 +19871,24 @@ public final EObject ruleXTryCatchFinallyExpression() throws RecognitionExceptio
 
             }
 
-            otherlv_1=(Token)match(input,103,FOLLOW_103_in_ruleXTryCatchFinallyExpression16321); if (state.failed) return current;
+            otherlv_1=(Token)match(input,103,FOLLOW_29); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXTryCatchFinallyExpressionAccess().getTryKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7021:1: ( (lv_expression_2_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7022:1: (lv_expression_2_0= ruleXExpression )
+            // InternalCheck.g:7021:1: ( (lv_expression_2_0= ruleXExpression ) )
+            // InternalCheck.g:7022:1: (lv_expression_2_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7022:1: (lv_expression_2_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7023:3: lv_expression_2_0= ruleXExpression
+            // InternalCheck.g:7022:1: (lv_expression_2_0= ruleXExpression )
+            // InternalCheck.g:7023:3: lv_expression_2_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXTryCatchFinallyExpressionAccess().getExpressionXExpressionParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXTryCatchFinallyExpression16342);
+            pushFollow(FOLLOW_106);
             lv_expression_2_0=ruleXExpression();
 
             state._fsp--;
@@ -19902,7 +19902,7 @@ public final EObject ruleXTryCatchFinallyExpression() throws RecognitionExceptio
                      			current, 
                      			"expression",
                       		lv_expression_2_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -19912,7 +19912,7 @@ public final EObject ruleXTryCatchFinallyExpression() throws RecognitionExceptio
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7039:2: ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) )
+            // InternalCheck.g:7039:2: ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) )
             int alt137=2;
             int LA137_0 = input.LA(1);
 
@@ -19931,12 +19931,12 @@ else if ( (LA137_0==104) ) {
             }
             switch (alt137) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7039:3: ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? )
+                    // InternalCheck.g:7039:3: ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7039:3: ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7039:4: ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )?
+                    // InternalCheck.g:7039:3: ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? )
+                    // InternalCheck.g:7039:4: ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )?
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7039:4: ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+
+                    // InternalCheck.g:7039:4: ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+
                     int cnt135=0;
                     loop135:
                     do {
@@ -19956,17 +19956,17 @@ else if ( (LA137_0==104) ) {
 
                         switch (alt135) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7039:5: ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause )
+                    	    // InternalCheck.g:7039:5: ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7041:1: (lv_catchClauses_3_0= ruleXCatchClause )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7042:3: lv_catchClauses_3_0= ruleXCatchClause
+                    	    // InternalCheck.g:7041:1: (lv_catchClauses_3_0= ruleXCatchClause )
+                    	    // InternalCheck.g:7042:3: lv_catchClauses_3_0= ruleXCatchClause
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getXTryCatchFinallyExpressionAccess().getCatchClausesXCatchClauseParserRuleCall_3_0_0_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleXCatchClause_in_ruleXTryCatchFinallyExpression16372);
+                    	    pushFollow(FOLLOW_107);
                     	    lv_catchClauses_3_0=ruleXCatchClause();
 
                     	    state._fsp--;
@@ -19980,7 +19980,7 @@ else if ( (LA137_0==104) ) {
                     	             			current, 
                     	             			"catchClauses",
                     	              		lv_catchClauses_3_0, 
-                    	              		"XCatchClause");
+                    	              		"org.eclipse.xtext.xbase.Xbase.XCatchClause");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -20001,7 +20001,7 @@ else if ( (LA137_0==104) ) {
                         cnt135++;
                     } while (true);
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7058:3: ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )?
+                    // InternalCheck.g:7058:3: ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )?
                     int alt136=2;
                     int LA136_0 = input.LA(1);
 
@@ -20014,12 +20014,12 @@ else if ( (LA137_0==104) ) {
                     }
                     switch (alt136) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7058:4: ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) )
+                            // InternalCheck.g:7058:4: ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7058:4: ( ( 'finally' )=>otherlv_4= 'finally' )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7058:5: ( 'finally' )=>otherlv_4= 'finally'
+                            // InternalCheck.g:7058:4: ( ( 'finally' )=>otherlv_4= 'finally' )
+                            // InternalCheck.g:7058:5: ( 'finally' )=>otherlv_4= 'finally'
                             {
-                            otherlv_4=(Token)match(input,104,FOLLOW_104_in_ruleXTryCatchFinallyExpression16394); if (state.failed) return current;
+                            otherlv_4=(Token)match(input,104,FOLLOW_29); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                   	newLeafNode(otherlv_4, grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyKeyword_3_0_1_0());
@@ -20028,18 +20028,18 @@ else if ( (LA137_0==104) ) {
 
                             }
 
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7063:2: ( (lv_finallyExpression_5_0= ruleXExpression ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7064:1: (lv_finallyExpression_5_0= ruleXExpression )
+                            // InternalCheck.g:7063:2: ( (lv_finallyExpression_5_0= ruleXExpression ) )
+                            // InternalCheck.g:7064:1: (lv_finallyExpression_5_0= ruleXExpression )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7064:1: (lv_finallyExpression_5_0= ruleXExpression )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7065:3: lv_finallyExpression_5_0= ruleXExpression
+                            // InternalCheck.g:7064:1: (lv_finallyExpression_5_0= ruleXExpression )
+                            // InternalCheck.g:7065:3: lv_finallyExpression_5_0= ruleXExpression
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyExpressionXExpressionParserRuleCall_3_0_1_1_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleXExpression_in_ruleXTryCatchFinallyExpression16416);
+                            pushFollow(FOLLOW_2);
                             lv_finallyExpression_5_0=ruleXExpression();
 
                             state._fsp--;
@@ -20053,7 +20053,7 @@ else if ( (LA137_0==104) ) {
                                      			current, 
                                      			"finallyExpression",
                                       		lv_finallyExpression_5_0, 
-                                      		"XExpression");
+                                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -20076,29 +20076,29 @@ else if ( (LA137_0==104) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7082:6: (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) )
+                    // InternalCheck.g:7082:6: (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7082:6: (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7082:8: otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) )
+                    // InternalCheck.g:7082:6: (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) )
+                    // InternalCheck.g:7082:8: otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) )
                     {
-                    otherlv_6=(Token)match(input,104,FOLLOW_104_in_ruleXTryCatchFinallyExpression16438); if (state.failed) return current;
+                    otherlv_6=(Token)match(input,104,FOLLOW_29); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_6, grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyKeyword_3_1_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7086:1: ( (lv_finallyExpression_7_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7087:1: (lv_finallyExpression_7_0= ruleXExpression )
+                    // InternalCheck.g:7086:1: ( (lv_finallyExpression_7_0= ruleXExpression ) )
+                    // InternalCheck.g:7087:1: (lv_finallyExpression_7_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7087:1: (lv_finallyExpression_7_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7088:3: lv_finallyExpression_7_0= ruleXExpression
+                    // InternalCheck.g:7087:1: (lv_finallyExpression_7_0= ruleXExpression )
+                    // InternalCheck.g:7088:3: lv_finallyExpression_7_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyExpressionXExpressionParserRuleCall_3_1_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXTryCatchFinallyExpression16459);
+                    pushFollow(FOLLOW_2);
                     lv_finallyExpression_7_0=ruleXExpression();
 
                     state._fsp--;
@@ -20112,7 +20112,7 @@ else if ( (LA137_0==104) ) {
                              			current, 
                              			"finallyExpression",
                               		lv_finallyExpression_7_0, 
-                              		"XExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -20154,7 +20154,7 @@ else if ( (LA137_0==104) ) {
 
 
     // $ANTLR start "entryRuleXSynchronizedExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7112:1: entryRuleXSynchronizedExpression returns [EObject current=null] : iv_ruleXSynchronizedExpression= ruleXSynchronizedExpression EOF ;
+    // InternalCheck.g:7112:1: entryRuleXSynchronizedExpression returns [EObject current=null] : iv_ruleXSynchronizedExpression= ruleXSynchronizedExpression EOF ;
     public final EObject entryRuleXSynchronizedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -20162,13 +20162,13 @@ public final EObject entryRuleXSynchronizedExpression() throws RecognitionExcept
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7113:2: (iv_ruleXSynchronizedExpression= ruleXSynchronizedExpression EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7114:2: iv_ruleXSynchronizedExpression= ruleXSynchronizedExpression EOF
+            // InternalCheck.g:7113:2: (iv_ruleXSynchronizedExpression= ruleXSynchronizedExpression EOF )
+            // InternalCheck.g:7114:2: iv_ruleXSynchronizedExpression= ruleXSynchronizedExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXSynchronizedExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXSynchronizedExpression_in_entryRuleXSynchronizedExpression16497);
+            pushFollow(FOLLOW_1);
             iv_ruleXSynchronizedExpression=ruleXSynchronizedExpression();
 
             state._fsp--;
@@ -20176,7 +20176,7 @@ public final EObject entryRuleXSynchronizedExpression() throws RecognitionExcept
             if ( state.backtracking==0 ) {
                current =iv_ruleXSynchronizedExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXSynchronizedExpression16507); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -20194,7 +20194,7 @@ public final EObject entryRuleXSynchronizedExpression() throws RecognitionExcept
 
 
     // $ANTLR start "ruleXSynchronizedExpression"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7121:1: ruleXSynchronizedExpression returns [EObject current=null] : ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) ) ;
+    // InternalCheck.g:7121:1: ruleXSynchronizedExpression returns [EObject current=null] : ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) ) ;
     public final EObject ruleXSynchronizedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -20209,20 +20209,20 @@ public final EObject ruleXSynchronizedExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7124:28: ( ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7125:1: ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) )
+            // InternalCheck.g:7124:28: ( ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) ) )
+            // InternalCheck.g:7125:1: ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7125:1: ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7125:2: ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) )
+            // InternalCheck.g:7125:1: ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) )
+            // InternalCheck.g:7125:2: ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7125:2: ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7125:3: ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' )
+            // InternalCheck.g:7125:2: ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) )
+            // InternalCheck.g:7125:3: ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7128:5: ( () otherlv_1= 'synchronized' otherlv_2= '(' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7128:6: () otherlv_1= 'synchronized' otherlv_2= '('
+            // InternalCheck.g:7128:5: ( () otherlv_1= 'synchronized' otherlv_2= '(' )
+            // InternalCheck.g:7128:6: () otherlv_1= 'synchronized' otherlv_2= '('
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7128:6: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7129:5: 
+            // InternalCheck.g:7128:6: ()
+            // InternalCheck.g:7129:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -20234,13 +20234,13 @@ public final EObject ruleXSynchronizedExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,105,FOLLOW_105_in_ruleXSynchronizedExpression16571); if (state.failed) return current;
+            otherlv_1=(Token)match(input,105,FOLLOW_24); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXSynchronizedExpressionAccess().getSynchronizedKeyword_0_0_1());
                   
             }
-            otherlv_2=(Token)match(input,23,FOLLOW_23_in_ruleXSynchronizedExpression16583); if (state.failed) return current;
+            otherlv_2=(Token)match(input,23,FOLLOW_29); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getXSynchronizedExpressionAccess().getLeftParenthesisKeyword_0_0_2());
@@ -20252,18 +20252,18 @@ public final EObject ruleXSynchronizedExpression() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7142:3: ( (lv_param_3_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7143:1: (lv_param_3_0= ruleXExpression )
+            // InternalCheck.g:7142:3: ( (lv_param_3_0= ruleXExpression ) )
+            // InternalCheck.g:7143:1: (lv_param_3_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7143:1: (lv_param_3_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7144:3: lv_param_3_0= ruleXExpression
+            // InternalCheck.g:7143:1: (lv_param_3_0= ruleXExpression )
+            // InternalCheck.g:7144:3: lv_param_3_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXSynchronizedExpressionAccess().getParamXExpressionParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXSynchronizedExpression16606);
+            pushFollow(FOLLOW_26);
             lv_param_3_0=ruleXExpression();
 
             state._fsp--;
@@ -20277,7 +20277,7 @@ public final EObject ruleXSynchronizedExpression() throws RecognitionException {
                      			current, 
                      			"param",
                       		lv_param_3_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -20287,24 +20287,24 @@ public final EObject ruleXSynchronizedExpression() throws RecognitionException {
 
             }
 
-            otherlv_4=(Token)match(input,25,FOLLOW_25_in_ruleXSynchronizedExpression16618); if (state.failed) return current;
+            otherlv_4=(Token)match(input,25,FOLLOW_29); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_4, grammarAccess.getXSynchronizedExpressionAccess().getRightParenthesisKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7164:1: ( (lv_expression_5_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7165:1: (lv_expression_5_0= ruleXExpression )
+            // InternalCheck.g:7164:1: ( (lv_expression_5_0= ruleXExpression ) )
+            // InternalCheck.g:7165:1: (lv_expression_5_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7165:1: (lv_expression_5_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7166:3: lv_expression_5_0= ruleXExpression
+            // InternalCheck.g:7165:1: (lv_expression_5_0= ruleXExpression )
+            // InternalCheck.g:7166:3: lv_expression_5_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXSynchronizedExpressionAccess().getExpressionXExpressionParserRuleCall_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXSynchronizedExpression16639);
+            pushFollow(FOLLOW_2);
             lv_expression_5_0=ruleXExpression();
 
             state._fsp--;
@@ -20318,7 +20318,7 @@ public final EObject ruleXSynchronizedExpression() throws RecognitionException {
                      			current, 
                      			"expression",
                       		lv_expression_5_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -20351,7 +20351,7 @@ public final EObject ruleXSynchronizedExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXCatchClause"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7190:1: entryRuleXCatchClause returns [EObject current=null] : iv_ruleXCatchClause= ruleXCatchClause EOF ;
+    // InternalCheck.g:7190:1: entryRuleXCatchClause returns [EObject current=null] : iv_ruleXCatchClause= ruleXCatchClause EOF ;
     public final EObject entryRuleXCatchClause() throws RecognitionException {
         EObject current = null;
 
@@ -20359,13 +20359,13 @@ public final EObject entryRuleXCatchClause() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7191:2: (iv_ruleXCatchClause= ruleXCatchClause EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7192:2: iv_ruleXCatchClause= ruleXCatchClause EOF
+            // InternalCheck.g:7191:2: (iv_ruleXCatchClause= ruleXCatchClause EOF )
+            // InternalCheck.g:7192:2: iv_ruleXCatchClause= ruleXCatchClause EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXCatchClauseRule()); 
             }
-            pushFollow(FOLLOW_ruleXCatchClause_in_entryRuleXCatchClause16675);
+            pushFollow(FOLLOW_1);
             iv_ruleXCatchClause=ruleXCatchClause();
 
             state._fsp--;
@@ -20373,7 +20373,7 @@ public final EObject entryRuleXCatchClause() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXCatchClause; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXCatchClause16685); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -20391,7 +20391,7 @@ public final EObject entryRuleXCatchClause() throws RecognitionException {
 
 
     // $ANTLR start "ruleXCatchClause"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7199:1: ruleXCatchClause returns [EObject current=null] : ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) ) ;
+    // InternalCheck.g:7199:1: ruleXCatchClause returns [EObject current=null] : ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) ) ;
     public final EObject ruleXCatchClause() throws RecognitionException {
         EObject current = null;
 
@@ -20406,16 +20406,16 @@ public final EObject ruleXCatchClause() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7202:28: ( ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7203:1: ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) )
+            // InternalCheck.g:7202:28: ( ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) ) )
+            // InternalCheck.g:7203:1: ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7203:1: ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7203:2: ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) )
+            // InternalCheck.g:7203:1: ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) )
+            // InternalCheck.g:7203:2: ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7203:2: ( ( 'catch' )=>otherlv_0= 'catch' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7203:3: ( 'catch' )=>otherlv_0= 'catch'
+            // InternalCheck.g:7203:2: ( ( 'catch' )=>otherlv_0= 'catch' )
+            // InternalCheck.g:7203:3: ( 'catch' )=>otherlv_0= 'catch'
             {
-            otherlv_0=(Token)match(input,106,FOLLOW_106_in_ruleXCatchClause16730); if (state.failed) return current;
+            otherlv_0=(Token)match(input,106,FOLLOW_24); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getXCatchClauseAccess().getCatchKeyword_0());
@@ -20424,24 +20424,24 @@ public final EObject ruleXCatchClause() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,23,FOLLOW_23_in_ruleXCatchClause16743); if (state.failed) return current;
+            otherlv_1=(Token)match(input,23,FOLLOW_27); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXCatchClauseAccess().getLeftParenthesisKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7212:1: ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7213:1: (lv_declaredParam_2_0= ruleFullJvmFormalParameter )
+            // InternalCheck.g:7212:1: ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) )
+            // InternalCheck.g:7213:1: (lv_declaredParam_2_0= ruleFullJvmFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7213:1: (lv_declaredParam_2_0= ruleFullJvmFormalParameter )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7214:3: lv_declaredParam_2_0= ruleFullJvmFormalParameter
+            // InternalCheck.g:7213:1: (lv_declaredParam_2_0= ruleFullJvmFormalParameter )
+            // InternalCheck.g:7214:3: lv_declaredParam_2_0= ruleFullJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXCatchClauseAccess().getDeclaredParamFullJvmFormalParameterParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleFullJvmFormalParameter_in_ruleXCatchClause16764);
+            pushFollow(FOLLOW_26);
             lv_declaredParam_2_0=ruleFullJvmFormalParameter();
 
             state._fsp--;
@@ -20455,7 +20455,7 @@ public final EObject ruleXCatchClause() throws RecognitionException {
                      			current, 
                      			"declaredParam",
                       		lv_declaredParam_2_0, 
-                      		"FullJvmFormalParameter");
+                      		"org.eclipse.xtext.xbase.Xbase.FullJvmFormalParameter");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -20465,24 +20465,24 @@ public final EObject ruleXCatchClause() throws RecognitionException {
 
             }
 
-            otherlv_3=(Token)match(input,25,FOLLOW_25_in_ruleXCatchClause16776); if (state.failed) return current;
+            otherlv_3=(Token)match(input,25,FOLLOW_29); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_3, grammarAccess.getXCatchClauseAccess().getRightParenthesisKeyword_3());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7234:1: ( (lv_expression_4_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7235:1: (lv_expression_4_0= ruleXExpression )
+            // InternalCheck.g:7234:1: ( (lv_expression_4_0= ruleXExpression ) )
+            // InternalCheck.g:7235:1: (lv_expression_4_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7235:1: (lv_expression_4_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7236:3: lv_expression_4_0= ruleXExpression
+            // InternalCheck.g:7235:1: (lv_expression_4_0= ruleXExpression )
+            // InternalCheck.g:7236:3: lv_expression_4_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXCatchClauseAccess().getExpressionXExpressionParserRuleCall_4_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXCatchClause16797);
+            pushFollow(FOLLOW_2);
             lv_expression_4_0=ruleXExpression();
 
             state._fsp--;
@@ -20496,7 +20496,7 @@ public final EObject ruleXCatchClause() throws RecognitionException {
                      			current, 
                      			"expression",
                       		lv_expression_4_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -20529,7 +20529,7 @@ public final EObject ruleXCatchClause() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleQualifiedName"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7260:1: entryRuleQualifiedName returns [String current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
+    // InternalCheck.g:7260:1: entryRuleQualifiedName returns [String current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
     public final String entryRuleQualifiedName() throws RecognitionException {
         String current = null;
 
@@ -20537,13 +20537,13 @@ public final String entryRuleQualifiedName() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7261:2: (iv_ruleQualifiedName= ruleQualifiedName EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7262:2: iv_ruleQualifiedName= ruleQualifiedName EOF
+            // InternalCheck.g:7261:2: (iv_ruleQualifiedName= ruleQualifiedName EOF )
+            // InternalCheck.g:7262:2: iv_ruleQualifiedName= ruleQualifiedName EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getQualifiedNameRule()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName16834);
+            pushFollow(FOLLOW_1);
             iv_ruleQualifiedName=ruleQualifiedName();
 
             state._fsp--;
@@ -20551,7 +20551,7 @@ public final String entryRuleQualifiedName() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleQualifiedName.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedName16845); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -20569,7 +20569,7 @@ public final String entryRuleQualifiedName() throws RecognitionException {
 
 
     // $ANTLR start "ruleQualifiedName"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7269:1: ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* ) ;
+    // InternalCheck.g:7269:1: ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* ) ;
     public final AntlrDatatypeRuleToken ruleQualifiedName() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -20582,18 +20582,18 @@ public final AntlrDatatypeRuleToken ruleQualifiedName() throws RecognitionExcept
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7272:28: ( (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7273:1: (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* )
+            // InternalCheck.g:7272:28: ( (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* ) )
+            // InternalCheck.g:7273:1: (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7273:1: (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7274:5: this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )*
+            // InternalCheck.g:7273:1: (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* )
+            // InternalCheck.g:7274:5: this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getQualifiedNameAccess().getValidIDParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleValidID_in_ruleQualifiedName16892);
+            pushFollow(FOLLOW_108);
             this_ValidID_0=ruleValidID();
 
             state._fsp--;
@@ -20608,7 +20608,7 @@ public final AntlrDatatypeRuleToken ruleQualifiedName() throws RecognitionExcept
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7284:1: ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )*
+            // InternalCheck.g:7284:1: ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )*
             loop138:
             do {
                 int alt138=2;
@@ -20633,12 +20633,12 @@ public final AntlrDatatypeRuleToken ruleQualifiedName() throws RecognitionExcept
 
                 switch (alt138) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7284:2: ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID
+            	    // InternalCheck.g:7284:2: ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID
             	    {
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7284:2: ( ( '.' )=>kw= '.' )
-            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7284:3: ( '.' )=>kw= '.'
+            	    // InternalCheck.g:7284:2: ( ( '.' )=>kw= '.' )
+            	    // InternalCheck.g:7284:3: ( '.' )=>kw= '.'
             	    {
-            	    kw=(Token)match(input,81,FOLLOW_81_in_ruleQualifiedName16920); if (state.failed) return current;
+            	    kw=(Token)match(input,81,FOLLOW_3); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	              current.merge(kw);
@@ -20653,7 +20653,7 @@ public final AntlrDatatypeRuleToken ruleQualifiedName() throws RecognitionExcept
             	              newCompositeNode(grammarAccess.getQualifiedNameAccess().getValidIDParserRuleCall_1_1()); 
             	          
             	    }
-            	    pushFollow(FOLLOW_ruleValidID_in_ruleQualifiedName16943);
+            	    pushFollow(FOLLOW_108);
             	    this_ValidID_2=ruleValidID();
 
             	    state._fsp--;
@@ -20700,7 +20700,7 @@ public final AntlrDatatypeRuleToken ruleQualifiedName() throws RecognitionExcept
 
 
     // $ANTLR start "entryRuleNumber"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7311:1: entryRuleNumber returns [String current=null] : iv_ruleNumber= ruleNumber EOF ;
+    // InternalCheck.g:7311:1: entryRuleNumber returns [String current=null] : iv_ruleNumber= ruleNumber EOF ;
     public final String entryRuleNumber() throws RecognitionException {
         String current = null;
 
@@ -20711,13 +20711,13 @@ public final String entryRuleNumber() throws RecognitionException {
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
         	
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7315:2: (iv_ruleNumber= ruleNumber EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7316:2: iv_ruleNumber= ruleNumber EOF
+            // InternalCheck.g:7315:2: (iv_ruleNumber= ruleNumber EOF )
+            // InternalCheck.g:7316:2: iv_ruleNumber= ruleNumber EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getNumberRule()); 
             }
-            pushFollow(FOLLOW_ruleNumber_in_entryRuleNumber16997);
+            pushFollow(FOLLOW_1);
             iv_ruleNumber=ruleNumber();
 
             state._fsp--;
@@ -20725,7 +20725,7 @@ public final String entryRuleNumber() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleNumber.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNumber17008); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -20746,7 +20746,7 @@ public final String entryRuleNumber() throws RecognitionException {
 
 
     // $ANTLR start "ruleNumber"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7326:1: ruleNumber returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_HEX_0= RULE_HEX | ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? ) ) ;
+    // InternalCheck.g:7326:1: ruleNumber returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_HEX_0= RULE_HEX | ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? ) ) ;
     public final AntlrDatatypeRuleToken ruleNumber() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -20761,10 +20761,10 @@ public final AntlrDatatypeRuleToken ruleNumber() throws RecognitionException {
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7330:28: ( (this_HEX_0= RULE_HEX | ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7331:1: (this_HEX_0= RULE_HEX | ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? ) )
+            // InternalCheck.g:7330:28: ( (this_HEX_0= RULE_HEX | ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? ) ) )
+            // InternalCheck.g:7331:1: (this_HEX_0= RULE_HEX | ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7331:1: (this_HEX_0= RULE_HEX | ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? ) )
+            // InternalCheck.g:7331:1: (this_HEX_0= RULE_HEX | ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? ) )
             int alt142=2;
             int LA142_0 = input.LA(1);
 
@@ -20783,9 +20783,9 @@ else if ( ((LA142_0>=RULE_INT && LA142_0<=RULE_DECIMAL)) ) {
             }
             switch (alt142) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7331:6: this_HEX_0= RULE_HEX
+                    // InternalCheck.g:7331:6: this_HEX_0= RULE_HEX
                     {
-                    this_HEX_0=(Token)match(input,RULE_HEX,FOLLOW_RULE_HEX_in_ruleNumber17052); if (state.failed) return current;
+                    this_HEX_0=(Token)match(input,RULE_HEX,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       		current.merge(this_HEX_0);
@@ -20800,12 +20800,12 @@ else if ( ((LA142_0>=RULE_INT && LA142_0<=RULE_DECIMAL)) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7339:6: ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? )
+                    // InternalCheck.g:7339:6: ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7339:6: ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7339:7: (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )?
+                    // InternalCheck.g:7339:6: ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? )
+                    // InternalCheck.g:7339:7: (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )?
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7339:7: (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL )
+                    // InternalCheck.g:7339:7: (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL )
                     int alt139=2;
                     int LA139_0 = input.LA(1);
 
@@ -20824,9 +20824,9 @@ else if ( (LA139_0==RULE_DECIMAL) ) {
                     }
                     switch (alt139) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7339:12: this_INT_1= RULE_INT
+                            // InternalCheck.g:7339:12: this_INT_1= RULE_INT
                             {
-                            this_INT_1=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleNumber17080); if (state.failed) return current;
+                            this_INT_1=(Token)match(input,RULE_INT,FOLLOW_108); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                               		current.merge(this_INT_1);
@@ -20841,9 +20841,9 @@ else if ( (LA139_0==RULE_DECIMAL) ) {
                             }
                             break;
                         case 2 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7347:10: this_DECIMAL_2= RULE_DECIMAL
+                            // InternalCheck.g:7347:10: this_DECIMAL_2= RULE_DECIMAL
                             {
-                            this_DECIMAL_2=(Token)match(input,RULE_DECIMAL,FOLLOW_RULE_DECIMAL_in_ruleNumber17106); if (state.failed) return current;
+                            this_DECIMAL_2=(Token)match(input,RULE_DECIMAL,FOLLOW_108); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                               		current.merge(this_DECIMAL_2);
@@ -20860,7 +20860,7 @@ else if ( (LA139_0==RULE_DECIMAL) ) {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7354:2: (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )?
+                    // InternalCheck.g:7354:2: (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )?
                     int alt141=2;
                     int LA141_0 = input.LA(1);
 
@@ -20873,16 +20873,16 @@ else if ( (LA139_0==RULE_DECIMAL) ) {
                     }
                     switch (alt141) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7355:2: kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL )
+                            // InternalCheck.g:7355:2: kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL )
                             {
-                            kw=(Token)match(input,81,FOLLOW_81_in_ruleNumber17126); if (state.failed) return current;
+                            kw=(Token)match(input,81,FOLLOW_109); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       current.merge(kw);
                                       newLeafNode(kw, grammarAccess.getNumberAccess().getFullStopKeyword_1_1_0()); 
                                   
                             }
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7360:1: (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL )
+                            // InternalCheck.g:7360:1: (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL )
                             int alt140=2;
                             int LA140_0 = input.LA(1);
 
@@ -20901,9 +20901,9 @@ else if ( (LA140_0==RULE_DECIMAL) ) {
                             }
                             switch (alt140) {
                                 case 1 :
-                                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7360:6: this_INT_4= RULE_INT
+                                    // InternalCheck.g:7360:6: this_INT_4= RULE_INT
                                     {
-                                    this_INT_4=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleNumber17142); if (state.failed) return current;
+                                    this_INT_4=(Token)match(input,RULE_INT,FOLLOW_2); if (state.failed) return current;
                                     if ( state.backtracking==0 ) {
 
                                       		current.merge(this_INT_4);
@@ -20918,9 +20918,9 @@ else if ( (LA140_0==RULE_DECIMAL) ) {
                                     }
                                     break;
                                 case 2 :
-                                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7368:10: this_DECIMAL_5= RULE_DECIMAL
+                                    // InternalCheck.g:7368:10: this_DECIMAL_5= RULE_DECIMAL
                                     {
-                                    this_DECIMAL_5=(Token)match(input,RULE_DECIMAL,FOLLOW_RULE_DECIMAL_in_ruleNumber17168); if (state.failed) return current;
+                                    this_DECIMAL_5=(Token)match(input,RULE_DECIMAL,FOLLOW_2); if (state.failed) return current;
                                     if ( state.backtracking==0 ) {
 
                                       		current.merge(this_DECIMAL_5);
@@ -20975,7 +20975,7 @@ else if ( (LA140_0==RULE_DECIMAL) ) {
 
 
     // $ANTLR start "entryRuleJvmTypeReference"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7388:1: entryRuleJvmTypeReference returns [EObject current=null] : iv_ruleJvmTypeReference= ruleJvmTypeReference EOF ;
+    // InternalCheck.g:7388:1: entryRuleJvmTypeReference returns [EObject current=null] : iv_ruleJvmTypeReference= ruleJvmTypeReference EOF ;
     public final EObject entryRuleJvmTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -20983,13 +20983,13 @@ public final EObject entryRuleJvmTypeReference() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7389:2: (iv_ruleJvmTypeReference= ruleJvmTypeReference EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7390:2: iv_ruleJvmTypeReference= ruleJvmTypeReference EOF
+            // InternalCheck.g:7389:2: (iv_ruleJvmTypeReference= ruleJvmTypeReference EOF )
+            // InternalCheck.g:7390:2: iv_ruleJvmTypeReference= ruleJvmTypeReference EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmTypeReferenceRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_entryRuleJvmTypeReference17223);
+            pushFollow(FOLLOW_1);
             iv_ruleJvmTypeReference=ruleJvmTypeReference();
 
             state._fsp--;
@@ -20997,7 +20997,7 @@ public final EObject entryRuleJvmTypeReference() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleJvmTypeReference; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmTypeReference17233); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -21015,7 +21015,7 @@ public final EObject entryRuleJvmTypeReference() throws RecognitionException {
 
 
     // $ANTLR start "ruleJvmTypeReference"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7397:1: ruleJvmTypeReference returns [EObject current=null] : ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef ) ;
+    // InternalCheck.g:7397:1: ruleJvmTypeReference returns [EObject current=null] : ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef ) ;
     public final EObject ruleJvmTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -21027,10 +21027,10 @@ public final EObject ruleJvmTypeReference() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7400:28: ( ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7401:1: ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef )
+            // InternalCheck.g:7400:28: ( ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef ) )
+            // InternalCheck.g:7401:1: ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7401:1: ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef )
+            // InternalCheck.g:7401:1: ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef )
             int alt144=2;
             int LA144_0 = input.LA(1);
 
@@ -21049,17 +21049,17 @@ else if ( (LA144_0==23||LA144_0==68) ) {
             }
             switch (alt144) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7401:2: (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* )
+                    // InternalCheck.g:7401:2: (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7401:2: (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7402:5: this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )*
+                    // InternalCheck.g:7401:2: (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* )
+                    // InternalCheck.g:7402:5: this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )*
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getJvmTypeReferenceAccess().getJvmParameterizedTypeReferenceParserRuleCall_0_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleJvmParameterizedTypeReference_in_ruleJvmTypeReference17281);
+                    pushFollow(FOLLOW_102);
                     this_JvmParameterizedTypeReference_0=ruleJvmParameterizedTypeReference();
 
                     state._fsp--;
@@ -21070,7 +21070,7 @@ else if ( (LA144_0==23||LA144_0==68) ) {
                               afterParserOrEnumRuleCall();
                           
                     }
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7410:1: ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )*
+                    // InternalCheck.g:7410:1: ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )*
                     loop143:
                     do {
                         int alt143=2;
@@ -21095,13 +21095,13 @@ else if ( (LA144_0==23||LA144_0==68) ) {
 
                         switch (alt143) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7410:2: ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets )
+                    	    // InternalCheck.g:7410:2: ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7411:24: ( () ruleArrayBrackets )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7411:25: () ruleArrayBrackets
+                    	    // InternalCheck.g:7411:24: ( () ruleArrayBrackets )
+                    	    // InternalCheck.g:7411:25: () ruleArrayBrackets
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7411:25: ()
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7412:5: 
+                    	    // InternalCheck.g:7411:25: ()
+                    	    // InternalCheck.g:7412:5: 
                     	    {
                     	    if ( state.backtracking==0 ) {
 
@@ -21118,7 +21118,7 @@ else if ( (LA144_0==23||LA144_0==68) ) {
                     	              newCompositeNode(grammarAccess.getJvmTypeReferenceAccess().getArrayBracketsParserRuleCall_0_1_0_1()); 
                     	          
                     	    }
-                    	    pushFollow(FOLLOW_ruleArrayBrackets_in_ruleJvmTypeReference17317);
+                    	    pushFollow(FOLLOW_102);
                     	    ruleArrayBrackets();
 
                     	    state._fsp--;
@@ -21147,14 +21147,14 @@ else if ( (LA144_0==23||LA144_0==68) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7427:5: this_XFunctionTypeRef_3= ruleXFunctionTypeRef
+                    // InternalCheck.g:7427:5: this_XFunctionTypeRef_3= ruleXFunctionTypeRef
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getJvmTypeReferenceAccess().getXFunctionTypeRefParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXFunctionTypeRef_in_ruleJvmTypeReference17348);
+                    pushFollow(FOLLOW_2);
                     this_XFunctionTypeRef_3=ruleXFunctionTypeRef();
 
                     state._fsp--;
@@ -21191,7 +21191,7 @@ else if ( (LA144_0==23||LA144_0==68) ) {
 
 
     // $ANTLR start "entryRuleArrayBrackets"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7443:1: entryRuleArrayBrackets returns [String current=null] : iv_ruleArrayBrackets= ruleArrayBrackets EOF ;
+    // InternalCheck.g:7443:1: entryRuleArrayBrackets returns [String current=null] : iv_ruleArrayBrackets= ruleArrayBrackets EOF ;
     public final String entryRuleArrayBrackets() throws RecognitionException {
         String current = null;
 
@@ -21199,13 +21199,13 @@ public final String entryRuleArrayBrackets() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7444:2: (iv_ruleArrayBrackets= ruleArrayBrackets EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7445:2: iv_ruleArrayBrackets= ruleArrayBrackets EOF
+            // InternalCheck.g:7444:2: (iv_ruleArrayBrackets= ruleArrayBrackets EOF )
+            // InternalCheck.g:7445:2: iv_ruleArrayBrackets= ruleArrayBrackets EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getArrayBracketsRule()); 
             }
-            pushFollow(FOLLOW_ruleArrayBrackets_in_entryRuleArrayBrackets17384);
+            pushFollow(FOLLOW_1);
             iv_ruleArrayBrackets=ruleArrayBrackets();
 
             state._fsp--;
@@ -21213,7 +21213,7 @@ public final String entryRuleArrayBrackets() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleArrayBrackets.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleArrayBrackets17395); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -21231,7 +21231,7 @@ public final String entryRuleArrayBrackets() throws RecognitionException {
 
 
     // $ANTLR start "ruleArrayBrackets"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7452:1: ruleArrayBrackets returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '[' kw= ']' ) ;
+    // InternalCheck.g:7452:1: ruleArrayBrackets returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '[' kw= ']' ) ;
     public final AntlrDatatypeRuleToken ruleArrayBrackets() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -21240,20 +21240,20 @@ public final AntlrDatatypeRuleToken ruleArrayBrackets() throws RecognitionExcept
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7455:28: ( (kw= '[' kw= ']' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7456:1: (kw= '[' kw= ']' )
+            // InternalCheck.g:7455:28: ( (kw= '[' kw= ']' ) )
+            // InternalCheck.g:7456:1: (kw= '[' kw= ']' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7456:1: (kw= '[' kw= ']' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7457:2: kw= '[' kw= ']'
+            // InternalCheck.g:7456:1: (kw= '[' kw= ']' )
+            // InternalCheck.g:7457:2: kw= '[' kw= ']'
             {
-            kw=(Token)match(input,33,FOLLOW_33_in_ruleArrayBrackets17433); if (state.failed) return current;
+            kw=(Token)match(input,33,FOLLOW_45); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                       current.merge(kw);
                       newLeafNode(kw, grammarAccess.getArrayBracketsAccess().getLeftSquareBracketKeyword_0()); 
                   
             }
-            kw=(Token)match(input,34,FOLLOW_34_in_ruleArrayBrackets17446); if (state.failed) return current;
+            kw=(Token)match(input,34,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                       current.merge(kw);
@@ -21283,7 +21283,7 @@ public final AntlrDatatypeRuleToken ruleArrayBrackets() throws RecognitionExcept
 
 
     // $ANTLR start "entryRuleXFunctionTypeRef"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7476:1: entryRuleXFunctionTypeRef returns [EObject current=null] : iv_ruleXFunctionTypeRef= ruleXFunctionTypeRef EOF ;
+    // InternalCheck.g:7476:1: entryRuleXFunctionTypeRef returns [EObject current=null] : iv_ruleXFunctionTypeRef= ruleXFunctionTypeRef EOF ;
     public final EObject entryRuleXFunctionTypeRef() throws RecognitionException {
         EObject current = null;
 
@@ -21291,13 +21291,13 @@ public final EObject entryRuleXFunctionTypeRef() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7477:2: (iv_ruleXFunctionTypeRef= ruleXFunctionTypeRef EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7478:2: iv_ruleXFunctionTypeRef= ruleXFunctionTypeRef EOF
+            // InternalCheck.g:7477:2: (iv_ruleXFunctionTypeRef= ruleXFunctionTypeRef EOF )
+            // InternalCheck.g:7478:2: iv_ruleXFunctionTypeRef= ruleXFunctionTypeRef EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXFunctionTypeRefRule()); 
             }
-            pushFollow(FOLLOW_ruleXFunctionTypeRef_in_entryRuleXFunctionTypeRef17486);
+            pushFollow(FOLLOW_1);
             iv_ruleXFunctionTypeRef=ruleXFunctionTypeRef();
 
             state._fsp--;
@@ -21305,7 +21305,7 @@ public final EObject entryRuleXFunctionTypeRef() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXFunctionTypeRef; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXFunctionTypeRef17496); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -21323,7 +21323,7 @@ public final EObject entryRuleXFunctionTypeRef() throws RecognitionException {
 
 
     // $ANTLR start "ruleXFunctionTypeRef"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7485:1: ruleXFunctionTypeRef returns [EObject current=null] : ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) ) ;
+    // InternalCheck.g:7485:1: ruleXFunctionTypeRef returns [EObject current=null] : ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) ) ;
     public final EObject ruleXFunctionTypeRef() throws RecognitionException {
         EObject current = null;
 
@@ -21341,13 +21341,13 @@ public final EObject ruleXFunctionTypeRef() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7488:28: ( ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7489:1: ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) )
+            // InternalCheck.g:7488:28: ( ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) ) )
+            // InternalCheck.g:7489:1: ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7489:1: ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7489:2: (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) )
+            // InternalCheck.g:7489:1: ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) )
+            // InternalCheck.g:7489:2: (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7489:2: (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )?
+            // InternalCheck.g:7489:2: (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )?
             int alt147=2;
             int LA147_0 = input.LA(1);
 
@@ -21356,15 +21356,15 @@ public final EObject ruleXFunctionTypeRef() throws RecognitionException {
             }
             switch (alt147) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7489:4: otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')'
+                    // InternalCheck.g:7489:4: otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')'
                     {
-                    otherlv_0=(Token)match(input,23,FOLLOW_23_in_ruleXFunctionTypeRef17534); if (state.failed) return current;
+                    otherlv_0=(Token)match(input,23,FOLLOW_110); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_0, grammarAccess.getXFunctionTypeRefAccess().getLeftParenthesisKeyword_0_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7493:1: ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )?
+                    // InternalCheck.g:7493:1: ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )?
                     int alt146=2;
                     int LA146_0 = input.LA(1);
 
@@ -21373,20 +21373,20 @@ public final EObject ruleXFunctionTypeRef() throws RecognitionException {
                     }
                     switch (alt146) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7493:2: ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )*
+                            // InternalCheck.g:7493:2: ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )*
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7493:2: ( (lv_paramTypes_1_0= ruleJvmTypeReference ) )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7494:1: (lv_paramTypes_1_0= ruleJvmTypeReference )
+                            // InternalCheck.g:7493:2: ( (lv_paramTypes_1_0= ruleJvmTypeReference ) )
+                            // InternalCheck.g:7494:1: (lv_paramTypes_1_0= ruleJvmTypeReference )
                             {
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7494:1: (lv_paramTypes_1_0= ruleJvmTypeReference )
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7495:3: lv_paramTypes_1_0= ruleJvmTypeReference
+                            // InternalCheck.g:7494:1: (lv_paramTypes_1_0= ruleJvmTypeReference )
+                            // InternalCheck.g:7495:3: lv_paramTypes_1_0= ruleJvmTypeReference
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXFunctionTypeRefAccess().getParamTypesJvmTypeReferenceParserRuleCall_0_1_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleXFunctionTypeRef17556);
+                            pushFollow(FOLLOW_19);
                             lv_paramTypes_1_0=ruleJvmTypeReference();
 
                             state._fsp--;
@@ -21400,7 +21400,7 @@ public final EObject ruleXFunctionTypeRef() throws RecognitionException {
                                      			current, 
                                      			"paramTypes",
                                       		lv_paramTypes_1_0, 
-                                      		"JvmTypeReference");
+                                      		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -21410,7 +21410,7 @@ public final EObject ruleXFunctionTypeRef() throws RecognitionException {
 
                             }
 
-                            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7511:2: (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )*
+                            // InternalCheck.g:7511:2: (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )*
                             loop145:
                             do {
                                 int alt145=2;
@@ -21423,26 +21423,26 @@ public final EObject ruleXFunctionTypeRef() throws RecognitionException {
 
                                 switch (alt145) {
                             	case 1 :
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7511:4: otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) )
+                            	    // InternalCheck.g:7511:4: otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) )
                             	    {
-                            	    otherlv_2=(Token)match(input,24,FOLLOW_24_in_ruleXFunctionTypeRef17569); if (state.failed) return current;
+                            	    otherlv_2=(Token)match(input,24,FOLLOW_27); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	          	newLeafNode(otherlv_2, grammarAccess.getXFunctionTypeRefAccess().getCommaKeyword_0_1_1_0());
                             	          
                             	    }
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7515:1: ( (lv_paramTypes_3_0= ruleJvmTypeReference ) )
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7516:1: (lv_paramTypes_3_0= ruleJvmTypeReference )
+                            	    // InternalCheck.g:7515:1: ( (lv_paramTypes_3_0= ruleJvmTypeReference ) )
+                            	    // InternalCheck.g:7516:1: (lv_paramTypes_3_0= ruleJvmTypeReference )
                             	    {
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7516:1: (lv_paramTypes_3_0= ruleJvmTypeReference )
-                            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7517:3: lv_paramTypes_3_0= ruleJvmTypeReference
+                            	    // InternalCheck.g:7516:1: (lv_paramTypes_3_0= ruleJvmTypeReference )
+                            	    // InternalCheck.g:7517:3: lv_paramTypes_3_0= ruleJvmTypeReference
                             	    {
                             	    if ( state.backtracking==0 ) {
                             	       
                             	      	        newCompositeNode(grammarAccess.getXFunctionTypeRefAccess().getParamTypesJvmTypeReferenceParserRuleCall_0_1_1_1_0()); 
                             	      	    
                             	    }
-                            	    pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleXFunctionTypeRef17590);
+                            	    pushFollow(FOLLOW_19);
                             	    lv_paramTypes_3_0=ruleJvmTypeReference();
 
                             	    state._fsp--;
@@ -21456,7 +21456,7 @@ public final EObject ruleXFunctionTypeRef() throws RecognitionException {
                             	             			current, 
                             	             			"paramTypes",
                             	              		lv_paramTypes_3_0, 
-                            	              		"JvmTypeReference");
+                            	              		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
                             	      	        afterParserOrEnumRuleCall();
                             	      	    
                             	    }
@@ -21481,7 +21481,7 @@ public final EObject ruleXFunctionTypeRef() throws RecognitionException {
 
                     }
 
-                    otherlv_4=(Token)match(input,25,FOLLOW_25_in_ruleXFunctionTypeRef17606); if (state.failed) return current;
+                    otherlv_4=(Token)match(input,25,FOLLOW_111); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_4, grammarAccess.getXFunctionTypeRefAccess().getRightParenthesisKeyword_0_2());
@@ -21493,24 +21493,24 @@ public final EObject ruleXFunctionTypeRef() throws RecognitionException {
 
             }
 
-            otherlv_5=(Token)match(input,68,FOLLOW_68_in_ruleXFunctionTypeRef17620); if (state.failed) return current;
+            otherlv_5=(Token)match(input,68,FOLLOW_27); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_5, grammarAccess.getXFunctionTypeRefAccess().getEqualsSignGreaterThanSignKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7541:1: ( (lv_returnType_6_0= ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7542:1: (lv_returnType_6_0= ruleJvmTypeReference )
+            // InternalCheck.g:7541:1: ( (lv_returnType_6_0= ruleJvmTypeReference ) )
+            // InternalCheck.g:7542:1: (lv_returnType_6_0= ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7542:1: (lv_returnType_6_0= ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7543:3: lv_returnType_6_0= ruleJvmTypeReference
+            // InternalCheck.g:7542:1: (lv_returnType_6_0= ruleJvmTypeReference )
+            // InternalCheck.g:7543:3: lv_returnType_6_0= ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXFunctionTypeRefAccess().getReturnTypeJvmTypeReferenceParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleXFunctionTypeRef17641);
+            pushFollow(FOLLOW_2);
             lv_returnType_6_0=ruleJvmTypeReference();
 
             state._fsp--;
@@ -21524,7 +21524,7 @@ public final EObject ruleXFunctionTypeRef() throws RecognitionException {
                      			current, 
                      			"returnType",
                       		lv_returnType_6_0, 
-                      		"JvmTypeReference");
+                      		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -21557,7 +21557,7 @@ public final EObject ruleXFunctionTypeRef() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleJvmParameterizedTypeReference"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7567:1: entryRuleJvmParameterizedTypeReference returns [EObject current=null] : iv_ruleJvmParameterizedTypeReference= ruleJvmParameterizedTypeReference EOF ;
+    // InternalCheck.g:7567:1: entryRuleJvmParameterizedTypeReference returns [EObject current=null] : iv_ruleJvmParameterizedTypeReference= ruleJvmParameterizedTypeReference EOF ;
     public final EObject entryRuleJvmParameterizedTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -21565,13 +21565,13 @@ public final EObject entryRuleJvmParameterizedTypeReference() throws Recognition
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7568:2: (iv_ruleJvmParameterizedTypeReference= ruleJvmParameterizedTypeReference EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7569:2: iv_ruleJvmParameterizedTypeReference= ruleJvmParameterizedTypeReference EOF
+            // InternalCheck.g:7568:2: (iv_ruleJvmParameterizedTypeReference= ruleJvmParameterizedTypeReference EOF )
+            // InternalCheck.g:7569:2: iv_ruleJvmParameterizedTypeReference= ruleJvmParameterizedTypeReference EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmParameterizedTypeReferenceRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmParameterizedTypeReference_in_entryRuleJvmParameterizedTypeReference17677);
+            pushFollow(FOLLOW_1);
             iv_ruleJvmParameterizedTypeReference=ruleJvmParameterizedTypeReference();
 
             state._fsp--;
@@ -21579,7 +21579,7 @@ public final EObject entryRuleJvmParameterizedTypeReference() throws Recognition
             if ( state.backtracking==0 ) {
                current =iv_ruleJvmParameterizedTypeReference; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmParameterizedTypeReference17687); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -21597,7 +21597,7 @@ public final EObject entryRuleJvmParameterizedTypeReference() throws Recognition
 
 
     // $ANTLR start "ruleJvmParameterizedTypeReference"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7576:1: ruleJvmParameterizedTypeReference returns [EObject current=null] : ( ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )? ) ;
+    // InternalCheck.g:7576:1: ruleJvmParameterizedTypeReference returns [EObject current=null] : ( ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )? ) ;
     public final EObject ruleJvmParameterizedTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -21620,17 +21620,17 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7579:28: ( ( ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )? ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7580:1: ( ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )? )
+            // InternalCheck.g:7579:28: ( ( ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )? ) )
+            // InternalCheck.g:7580:1: ( ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )? )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7580:1: ( ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )? )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7580:2: ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )?
+            // InternalCheck.g:7580:1: ( ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )? )
+            // InternalCheck.g:7580:2: ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )?
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7580:2: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7581:1: ( ruleQualifiedName )
+            // InternalCheck.g:7580:2: ( ( ruleQualifiedName ) )
+            // InternalCheck.g:7581:1: ( ruleQualifiedName )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7581:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7582:3: ruleQualifiedName
+            // InternalCheck.g:7581:1: ( ruleQualifiedName )
+            // InternalCheck.g:7582:3: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
 
@@ -21644,7 +21644,7 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
               	        newCompositeNode(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeJvmTypeCrossReference_0_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_ruleJvmParameterizedTypeReference17735);
+            pushFollow(FOLLOW_112);
             ruleQualifiedName();
 
             state._fsp--;
@@ -21660,17 +21660,17 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
             }
 
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7595:2: ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )?
+            // InternalCheck.g:7595:2: ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )?
             int alt152=2;
             alt152 = dfa152.predict(input);
             switch (alt152) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7595:3: ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )*
+                    // InternalCheck.g:7595:3: ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )*
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7595:3: ( ( '<' )=>otherlv_1= '<' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7595:4: ( '<' )=>otherlv_1= '<'
+                    // InternalCheck.g:7595:3: ( ( '<' )=>otherlv_1= '<' )
+                    // InternalCheck.g:7595:4: ( '<' )=>otherlv_1= '<'
                     {
-                    otherlv_1=(Token)match(input,56,FOLLOW_56_in_ruleJvmParameterizedTypeReference17756); if (state.failed) return current;
+                    otherlv_1=(Token)match(input,56,FOLLOW_72); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_1, grammarAccess.getJvmParameterizedTypeReferenceAccess().getLessThanSignKeyword_1_0());
@@ -21679,18 +21679,18 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7600:2: ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7601:1: (lv_arguments_2_0= ruleJvmArgumentTypeReference )
+                    // InternalCheck.g:7600:2: ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) )
+                    // InternalCheck.g:7601:1: (lv_arguments_2_0= ruleJvmArgumentTypeReference )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7601:1: (lv_arguments_2_0= ruleJvmArgumentTypeReference )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7602:3: lv_arguments_2_0= ruleJvmArgumentTypeReference
+                    // InternalCheck.g:7601:1: (lv_arguments_2_0= ruleJvmArgumentTypeReference )
+                    // InternalCheck.g:7602:3: lv_arguments_2_0= ruleJvmArgumentTypeReference
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleJvmParameterizedTypeReference17778);
+                    pushFollow(FOLLOW_73);
                     lv_arguments_2_0=ruleJvmArgumentTypeReference();
 
                     state._fsp--;
@@ -21704,7 +21704,7 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
                              			current, 
                              			"arguments",
                               		lv_arguments_2_0, 
-                              		"JvmArgumentTypeReference");
+                              		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -21714,7 +21714,7 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7618:2: (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )*
+                    // InternalCheck.g:7618:2: (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )*
                     loop148:
                     do {
                         int alt148=2;
@@ -21727,26 +21727,26 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
                         switch (alt148) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7618:4: otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) )
+                    	    // InternalCheck.g:7618:4: otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) )
                     	    {
-                    	    otherlv_3=(Token)match(input,24,FOLLOW_24_in_ruleJvmParameterizedTypeReference17791); if (state.failed) return current;
+                    	    otherlv_3=(Token)match(input,24,FOLLOW_72); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_3, grammarAccess.getJvmParameterizedTypeReferenceAccess().getCommaKeyword_1_2_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7622:1: ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7623:1: (lv_arguments_4_0= ruleJvmArgumentTypeReference )
+                    	    // InternalCheck.g:7622:1: ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) )
+                    	    // InternalCheck.g:7623:1: (lv_arguments_4_0= ruleJvmArgumentTypeReference )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7623:1: (lv_arguments_4_0= ruleJvmArgumentTypeReference )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7624:3: lv_arguments_4_0= ruleJvmArgumentTypeReference
+                    	    // InternalCheck.g:7623:1: (lv_arguments_4_0= ruleJvmArgumentTypeReference )
+                    	    // InternalCheck.g:7624:3: lv_arguments_4_0= ruleJvmArgumentTypeReference
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_2_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleJvmParameterizedTypeReference17812);
+                    	    pushFollow(FOLLOW_73);
                     	    lv_arguments_4_0=ruleJvmArgumentTypeReference();
 
                     	    state._fsp--;
@@ -21760,7 +21760,7 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
                     	             			current, 
                     	             			"arguments",
                     	              		lv_arguments_4_0, 
-                    	              		"JvmArgumentTypeReference");
+                    	              		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -21779,13 +21779,13 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
                         }
                     } while (true);
 
-                    otherlv_5=(Token)match(input,57,FOLLOW_57_in_ruleJvmParameterizedTypeReference17826); if (state.failed) return current;
+                    otherlv_5=(Token)match(input,57,FOLLOW_108); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_5, grammarAccess.getJvmParameterizedTypeReferenceAccess().getGreaterThanSignKeyword_1_3());
                           
                     }
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7644:1: ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )*
+                    // InternalCheck.g:7644:1: ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )*
                     loop151:
                     do {
                         int alt151=2;
@@ -21810,16 +21810,16 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
                         switch (alt151) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7644:2: ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )?
+                    	    // InternalCheck.g:7644:2: ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )?
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7644:2: ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7644:3: ( ( () '.' ) )=> ( () otherlv_7= '.' )
+                    	    // InternalCheck.g:7644:2: ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) )
+                    	    // InternalCheck.g:7644:3: ( ( () '.' ) )=> ( () otherlv_7= '.' )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7646:5: ( () otherlv_7= '.' )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7646:6: () otherlv_7= '.'
+                    	    // InternalCheck.g:7646:5: ( () otherlv_7= '.' )
+                    	    // InternalCheck.g:7646:6: () otherlv_7= '.'
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7646:6: ()
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7647:5: 
+                    	    // InternalCheck.g:7646:6: ()
+                    	    // InternalCheck.g:7647:5: 
                     	    {
                     	    if ( state.backtracking==0 ) {
 
@@ -21831,7 +21831,7 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
                     	    }
 
-                    	    otherlv_7=(Token)match(input,81,FOLLOW_81_in_ruleJvmParameterizedTypeReference17862); if (state.failed) return current;
+                    	    otherlv_7=(Token)match(input,81,FOLLOW_3); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_7, grammarAccess.getJvmParameterizedTypeReferenceAccess().getFullStopKeyword_1_4_0_0_1());
@@ -21843,11 +21843,11 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
                     	    }
 
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7656:3: ( ( ruleValidID ) )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7657:1: ( ruleValidID )
+                    	    // InternalCheck.g:7656:3: ( ( ruleValidID ) )
+                    	    // InternalCheck.g:7657:1: ( ruleValidID )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7657:1: ( ruleValidID )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7658:3: ruleValidID
+                    	    // InternalCheck.g:7657:1: ( ruleValidID )
+                    	    // InternalCheck.g:7658:3: ruleValidID
                     	    {
                     	    if ( state.backtracking==0 ) {
 
@@ -21861,7 +21861,7 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
                     	      	        newCompositeNode(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeJvmTypeCrossReference_1_4_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleValidID_in_ruleJvmParameterizedTypeReference17887);
+                    	    pushFollow(FOLLOW_113);
                     	    ruleValidID();
 
                     	    state._fsp--;
@@ -21877,17 +21877,17 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
                     	    }
 
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7671:2: ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )?
+                    	    // InternalCheck.g:7671:2: ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )?
                     	    int alt150=2;
                     	    alt150 = dfa150.predict(input);
                     	    switch (alt150) {
                     	        case 1 :
-                    	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7671:3: ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>'
+                    	            // InternalCheck.g:7671:3: ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>'
                     	            {
-                    	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7671:3: ( ( '<' )=>otherlv_9= '<' )
-                    	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7671:4: ( '<' )=>otherlv_9= '<'
+                    	            // InternalCheck.g:7671:3: ( ( '<' )=>otherlv_9= '<' )
+                    	            // InternalCheck.g:7671:4: ( '<' )=>otherlv_9= '<'
                     	            {
-                    	            otherlv_9=(Token)match(input,56,FOLLOW_56_in_ruleJvmParameterizedTypeReference17908); if (state.failed) return current;
+                    	            otherlv_9=(Token)match(input,56,FOLLOW_72); if (state.failed) return current;
                     	            if ( state.backtracking==0 ) {
 
                     	                  	newLeafNode(otherlv_9, grammarAccess.getJvmParameterizedTypeReferenceAccess().getLessThanSignKeyword_1_4_2_0());
@@ -21896,18 +21896,18 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
                     	            }
 
-                    	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7676:2: ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) )
-                    	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7677:1: (lv_arguments_10_0= ruleJvmArgumentTypeReference )
+                    	            // InternalCheck.g:7676:2: ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) )
+                    	            // InternalCheck.g:7677:1: (lv_arguments_10_0= ruleJvmArgumentTypeReference )
                     	            {
-                    	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7677:1: (lv_arguments_10_0= ruleJvmArgumentTypeReference )
-                    	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7678:3: lv_arguments_10_0= ruleJvmArgumentTypeReference
+                    	            // InternalCheck.g:7677:1: (lv_arguments_10_0= ruleJvmArgumentTypeReference )
+                    	            // InternalCheck.g:7678:3: lv_arguments_10_0= ruleJvmArgumentTypeReference
                     	            {
                     	            if ( state.backtracking==0 ) {
                     	               
                     	              	        newCompositeNode(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_4_2_1_0()); 
                     	              	    
                     	            }
-                    	            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleJvmParameterizedTypeReference17930);
+                    	            pushFollow(FOLLOW_73);
                     	            lv_arguments_10_0=ruleJvmArgumentTypeReference();
 
                     	            state._fsp--;
@@ -21921,7 +21921,7 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
                     	                     			current, 
                     	                     			"arguments",
                     	                      		lv_arguments_10_0, 
-                    	                      		"JvmArgumentTypeReference");
+                    	                      		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
                     	              	        afterParserOrEnumRuleCall();
                     	              	    
                     	            }
@@ -21931,7 +21931,7 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
                     	            }
 
-                    	            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7694:2: (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )*
+                    	            // InternalCheck.g:7694:2: (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )*
                     	            loop149:
                     	            do {
                     	                int alt149=2;
@@ -21944,26 +21944,26 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
                     	                switch (alt149) {
                     	            	case 1 :
-                    	            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7694:4: otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) )
+                    	            	    // InternalCheck.g:7694:4: otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) )
                     	            	    {
-                    	            	    otherlv_11=(Token)match(input,24,FOLLOW_24_in_ruleJvmParameterizedTypeReference17943); if (state.failed) return current;
+                    	            	    otherlv_11=(Token)match(input,24,FOLLOW_72); if (state.failed) return current;
                     	            	    if ( state.backtracking==0 ) {
 
                     	            	          	newLeafNode(otherlv_11, grammarAccess.getJvmParameterizedTypeReferenceAccess().getCommaKeyword_1_4_2_2_0());
                     	            	          
                     	            	    }
-                    	            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7698:1: ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) )
-                    	            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7699:1: (lv_arguments_12_0= ruleJvmArgumentTypeReference )
+                    	            	    // InternalCheck.g:7698:1: ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) )
+                    	            	    // InternalCheck.g:7699:1: (lv_arguments_12_0= ruleJvmArgumentTypeReference )
                     	            	    {
-                    	            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7699:1: (lv_arguments_12_0= ruleJvmArgumentTypeReference )
-                    	            	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7700:3: lv_arguments_12_0= ruleJvmArgumentTypeReference
+                    	            	    // InternalCheck.g:7699:1: (lv_arguments_12_0= ruleJvmArgumentTypeReference )
+                    	            	    // InternalCheck.g:7700:3: lv_arguments_12_0= ruleJvmArgumentTypeReference
                     	            	    {
                     	            	    if ( state.backtracking==0 ) {
                     	            	       
                     	            	      	        newCompositeNode(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_4_2_2_1_0()); 
                     	            	      	    
                     	            	    }
-                    	            	    pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleJvmParameterizedTypeReference17964);
+                    	            	    pushFollow(FOLLOW_73);
                     	            	    lv_arguments_12_0=ruleJvmArgumentTypeReference();
 
                     	            	    state._fsp--;
@@ -21977,7 +21977,7 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
                     	            	             			current, 
                     	            	             			"arguments",
                     	            	              		lv_arguments_12_0, 
-                    	            	              		"JvmArgumentTypeReference");
+                    	            	              		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
                     	            	      	        afterParserOrEnumRuleCall();
                     	            	      	    
                     	            	    }
@@ -21996,7 +21996,7 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
                     	                }
                     	            } while (true);
 
-                    	            otherlv_13=(Token)match(input,57,FOLLOW_57_in_ruleJvmParameterizedTypeReference17978); if (state.failed) return current;
+                    	            otherlv_13=(Token)match(input,57,FOLLOW_108); if (state.failed) return current;
                     	            if ( state.backtracking==0 ) {
 
                     	                  	newLeafNode(otherlv_13, grammarAccess.getJvmParameterizedTypeReferenceAccess().getGreaterThanSignKeyword_1_4_2_3());
@@ -22046,7 +22046,7 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
 
     // $ANTLR start "entryRuleJvmArgumentTypeReference"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7728:1: entryRuleJvmArgumentTypeReference returns [EObject current=null] : iv_ruleJvmArgumentTypeReference= ruleJvmArgumentTypeReference EOF ;
+    // InternalCheck.g:7728:1: entryRuleJvmArgumentTypeReference returns [EObject current=null] : iv_ruleJvmArgumentTypeReference= ruleJvmArgumentTypeReference EOF ;
     public final EObject entryRuleJvmArgumentTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -22054,13 +22054,13 @@ public final EObject entryRuleJvmArgumentTypeReference() throws RecognitionExcep
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7729:2: (iv_ruleJvmArgumentTypeReference= ruleJvmArgumentTypeReference EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7730:2: iv_ruleJvmArgumentTypeReference= ruleJvmArgumentTypeReference EOF
+            // InternalCheck.g:7729:2: (iv_ruleJvmArgumentTypeReference= ruleJvmArgumentTypeReference EOF )
+            // InternalCheck.g:7730:2: iv_ruleJvmArgumentTypeReference= ruleJvmArgumentTypeReference EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmArgumentTypeReferenceRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_entryRuleJvmArgumentTypeReference18020);
+            pushFollow(FOLLOW_1);
             iv_ruleJvmArgumentTypeReference=ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -22068,7 +22068,7 @@ public final EObject entryRuleJvmArgumentTypeReference() throws RecognitionExcep
             if ( state.backtracking==0 ) {
                current =iv_ruleJvmArgumentTypeReference; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmArgumentTypeReference18030); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -22086,7 +22086,7 @@ public final EObject entryRuleJvmArgumentTypeReference() throws RecognitionExcep
 
 
     // $ANTLR start "ruleJvmArgumentTypeReference"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7737:1: ruleJvmArgumentTypeReference returns [EObject current=null] : (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference ) ;
+    // InternalCheck.g:7737:1: ruleJvmArgumentTypeReference returns [EObject current=null] : (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference ) ;
     public final EObject ruleJvmArgumentTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -22098,10 +22098,10 @@ public final EObject ruleJvmArgumentTypeReference() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7740:28: ( (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7741:1: (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference )
+            // InternalCheck.g:7740:28: ( (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference ) )
+            // InternalCheck.g:7741:1: (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7741:1: (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference )
+            // InternalCheck.g:7741:1: (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference )
             int alt153=2;
             int LA153_0 = input.LA(1);
 
@@ -22120,14 +22120,14 @@ else if ( (LA153_0==107) ) {
             }
             switch (alt153) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7742:5: this_JvmTypeReference_0= ruleJvmTypeReference
+                    // InternalCheck.g:7742:5: this_JvmTypeReference_0= ruleJvmTypeReference
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getJvmArgumentTypeReferenceAccess().getJvmTypeReferenceParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleJvmArgumentTypeReference18077);
+                    pushFollow(FOLLOW_2);
                     this_JvmTypeReference_0=ruleJvmTypeReference();
 
                     state._fsp--;
@@ -22142,14 +22142,14 @@ else if ( (LA153_0==107) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7752:5: this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference
+                    // InternalCheck.g:7752:5: this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getJvmArgumentTypeReferenceAccess().getJvmWildcardTypeReferenceParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleJvmWildcardTypeReference_in_ruleJvmArgumentTypeReference18104);
+                    pushFollow(FOLLOW_2);
                     this_JvmWildcardTypeReference_1=ruleJvmWildcardTypeReference();
 
                     state._fsp--;
@@ -22186,7 +22186,7 @@ else if ( (LA153_0==107) ) {
 
 
     // $ANTLR start "entryRuleJvmWildcardTypeReference"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7768:1: entryRuleJvmWildcardTypeReference returns [EObject current=null] : iv_ruleJvmWildcardTypeReference= ruleJvmWildcardTypeReference EOF ;
+    // InternalCheck.g:7768:1: entryRuleJvmWildcardTypeReference returns [EObject current=null] : iv_ruleJvmWildcardTypeReference= ruleJvmWildcardTypeReference EOF ;
     public final EObject entryRuleJvmWildcardTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -22194,13 +22194,13 @@ public final EObject entryRuleJvmWildcardTypeReference() throws RecognitionExcep
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7769:2: (iv_ruleJvmWildcardTypeReference= ruleJvmWildcardTypeReference EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7770:2: iv_ruleJvmWildcardTypeReference= ruleJvmWildcardTypeReference EOF
+            // InternalCheck.g:7769:2: (iv_ruleJvmWildcardTypeReference= ruleJvmWildcardTypeReference EOF )
+            // InternalCheck.g:7770:2: iv_ruleJvmWildcardTypeReference= ruleJvmWildcardTypeReference EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmWildcardTypeReferenceRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmWildcardTypeReference_in_entryRuleJvmWildcardTypeReference18139);
+            pushFollow(FOLLOW_1);
             iv_ruleJvmWildcardTypeReference=ruleJvmWildcardTypeReference();
 
             state._fsp--;
@@ -22208,7 +22208,7 @@ public final EObject entryRuleJvmWildcardTypeReference() throws RecognitionExcep
             if ( state.backtracking==0 ) {
                current =iv_ruleJvmWildcardTypeReference; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmWildcardTypeReference18149); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -22226,7 +22226,7 @@ public final EObject entryRuleJvmWildcardTypeReference() throws RecognitionExcep
 
 
     // $ANTLR start "ruleJvmWildcardTypeReference"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7777:1: ruleJvmWildcardTypeReference returns [EObject current=null] : ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? ) ;
+    // InternalCheck.g:7777:1: ruleJvmWildcardTypeReference returns [EObject current=null] : ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? ) ;
     public final EObject ruleJvmWildcardTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -22243,14 +22243,14 @@ public final EObject ruleJvmWildcardTypeReference() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7780:28: ( ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7781:1: ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? )
+            // InternalCheck.g:7780:28: ( ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? ) )
+            // InternalCheck.g:7781:1: ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7781:1: ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7781:2: () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )?
+            // InternalCheck.g:7781:1: ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? )
+            // InternalCheck.g:7781:2: () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )?
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7781:2: ()
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7782:5: 
+            // InternalCheck.g:7781:2: ()
+            // InternalCheck.g:7782:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -22262,13 +22262,13 @@ public final EObject ruleJvmWildcardTypeReference() throws RecognitionException
 
             }
 
-            otherlv_1=(Token)match(input,107,FOLLOW_107_in_ruleJvmWildcardTypeReference18195); if (state.failed) return current;
+            otherlv_1=(Token)match(input,107,FOLLOW_114); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getJvmWildcardTypeReferenceAccess().getQuestionMarkKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7791:1: ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )?
+            // InternalCheck.g:7791:1: ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )?
             int alt156=3;
             int LA156_0 = input.LA(1);
 
@@ -22280,23 +22280,23 @@ else if ( (LA156_0==95) ) {
             }
             switch (alt156) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7791:2: ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* )
+                    // InternalCheck.g:7791:2: ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7791:2: ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7791:3: ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )*
+                    // InternalCheck.g:7791:2: ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* )
+                    // InternalCheck.g:7791:3: ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )*
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7791:3: ( (lv_constraints_2_0= ruleJvmUpperBound ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7792:1: (lv_constraints_2_0= ruleJvmUpperBound )
+                    // InternalCheck.g:7791:3: ( (lv_constraints_2_0= ruleJvmUpperBound ) )
+                    // InternalCheck.g:7792:1: (lv_constraints_2_0= ruleJvmUpperBound )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7792:1: (lv_constraints_2_0= ruleJvmUpperBound )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7793:3: lv_constraints_2_0= ruleJvmUpperBound
+                    // InternalCheck.g:7792:1: (lv_constraints_2_0= ruleJvmUpperBound )
+                    // InternalCheck.g:7793:3: lv_constraints_2_0= ruleJvmUpperBound
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmUpperBoundParserRuleCall_2_0_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleJvmUpperBound_in_ruleJvmWildcardTypeReference18218);
+                    pushFollow(FOLLOW_115);
                     lv_constraints_2_0=ruleJvmUpperBound();
 
                     state._fsp--;
@@ -22310,7 +22310,7 @@ else if ( (LA156_0==95) ) {
                              			current, 
                              			"constraints",
                               		lv_constraints_2_0, 
-                              		"JvmUpperBound");
+                              		"org.eclipse.xtext.xbase.Xtype.JvmUpperBound");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -22320,7 +22320,7 @@ else if ( (LA156_0==95) ) {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7809:2: ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )*
+                    // InternalCheck.g:7809:2: ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )*
                     loop154:
                     do {
                         int alt154=2;
@@ -22333,17 +22333,17 @@ else if ( (LA156_0==95) ) {
 
                         switch (alt154) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7810:1: (lv_constraints_3_0= ruleJvmUpperBoundAnded )
+                    	    // InternalCheck.g:7810:1: (lv_constraints_3_0= ruleJvmUpperBoundAnded )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7810:1: (lv_constraints_3_0= ruleJvmUpperBoundAnded )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7811:3: lv_constraints_3_0= ruleJvmUpperBoundAnded
+                    	    // InternalCheck.g:7810:1: (lv_constraints_3_0= ruleJvmUpperBoundAnded )
+                    	    // InternalCheck.g:7811:3: lv_constraints_3_0= ruleJvmUpperBoundAnded
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmUpperBoundAndedParserRuleCall_2_0_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleJvmUpperBoundAnded_in_ruleJvmWildcardTypeReference18239);
+                    	    pushFollow(FOLLOW_115);
                     	    lv_constraints_3_0=ruleJvmUpperBoundAnded();
 
                     	    state._fsp--;
@@ -22357,7 +22357,7 @@ else if ( (LA156_0==95) ) {
                     	             			current, 
                     	             			"constraints",
                     	              		lv_constraints_3_0, 
-                    	              		"JvmUpperBoundAnded");
+                    	              		"org.eclipse.xtext.xbase.Xtype.JvmUpperBoundAnded");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -22380,23 +22380,23 @@ else if ( (LA156_0==95) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7828:6: ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* )
+                    // InternalCheck.g:7828:6: ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7828:6: ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7828:7: ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )*
+                    // InternalCheck.g:7828:6: ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* )
+                    // InternalCheck.g:7828:7: ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )*
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7828:7: ( (lv_constraints_4_0= ruleJvmLowerBound ) )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7829:1: (lv_constraints_4_0= ruleJvmLowerBound )
+                    // InternalCheck.g:7828:7: ( (lv_constraints_4_0= ruleJvmLowerBound ) )
+                    // InternalCheck.g:7829:1: (lv_constraints_4_0= ruleJvmLowerBound )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7829:1: (lv_constraints_4_0= ruleJvmLowerBound )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7830:3: lv_constraints_4_0= ruleJvmLowerBound
+                    // InternalCheck.g:7829:1: (lv_constraints_4_0= ruleJvmLowerBound )
+                    // InternalCheck.g:7830:3: lv_constraints_4_0= ruleJvmLowerBound
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmLowerBoundParserRuleCall_2_1_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleJvmLowerBound_in_ruleJvmWildcardTypeReference18269);
+                    pushFollow(FOLLOW_115);
                     lv_constraints_4_0=ruleJvmLowerBound();
 
                     state._fsp--;
@@ -22410,7 +22410,7 @@ else if ( (LA156_0==95) ) {
                              			current, 
                              			"constraints",
                               		lv_constraints_4_0, 
-                              		"JvmLowerBound");
+                              		"org.eclipse.xtext.xbase.Xtype.JvmLowerBound");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -22420,7 +22420,7 @@ else if ( (LA156_0==95) ) {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7846:2: ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )*
+                    // InternalCheck.g:7846:2: ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )*
                     loop155:
                     do {
                         int alt155=2;
@@ -22433,17 +22433,17 @@ else if ( (LA156_0==95) ) {
 
                         switch (alt155) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7847:1: (lv_constraints_5_0= ruleJvmLowerBoundAnded )
+                    	    // InternalCheck.g:7847:1: (lv_constraints_5_0= ruleJvmLowerBoundAnded )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7847:1: (lv_constraints_5_0= ruleJvmLowerBoundAnded )
-                    	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7848:3: lv_constraints_5_0= ruleJvmLowerBoundAnded
+                    	    // InternalCheck.g:7847:1: (lv_constraints_5_0= ruleJvmLowerBoundAnded )
+                    	    // InternalCheck.g:7848:3: lv_constraints_5_0= ruleJvmLowerBoundAnded
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmLowerBoundAndedParserRuleCall_2_1_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleJvmLowerBoundAnded_in_ruleJvmWildcardTypeReference18290);
+                    	    pushFollow(FOLLOW_115);
                     	    lv_constraints_5_0=ruleJvmLowerBoundAnded();
 
                     	    state._fsp--;
@@ -22457,7 +22457,7 @@ else if ( (LA156_0==95) ) {
                     	             			current, 
                     	             			"constraints",
                     	              		lv_constraints_5_0, 
-                    	              		"JvmLowerBoundAnded");
+                    	              		"org.eclipse.xtext.xbase.Xtype.JvmLowerBoundAnded");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -22505,7 +22505,7 @@ else if ( (LA156_0==95) ) {
 
 
     // $ANTLR start "entryRuleJvmUpperBound"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7872:1: entryRuleJvmUpperBound returns [EObject current=null] : iv_ruleJvmUpperBound= ruleJvmUpperBound EOF ;
+    // InternalCheck.g:7872:1: entryRuleJvmUpperBound returns [EObject current=null] : iv_ruleJvmUpperBound= ruleJvmUpperBound EOF ;
     public final EObject entryRuleJvmUpperBound() throws RecognitionException {
         EObject current = null;
 
@@ -22513,13 +22513,13 @@ public final EObject entryRuleJvmUpperBound() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7873:2: (iv_ruleJvmUpperBound= ruleJvmUpperBound EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7874:2: iv_ruleJvmUpperBound= ruleJvmUpperBound EOF
+            // InternalCheck.g:7873:2: (iv_ruleJvmUpperBound= ruleJvmUpperBound EOF )
+            // InternalCheck.g:7874:2: iv_ruleJvmUpperBound= ruleJvmUpperBound EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmUpperBoundRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmUpperBound_in_entryRuleJvmUpperBound18330);
+            pushFollow(FOLLOW_1);
             iv_ruleJvmUpperBound=ruleJvmUpperBound();
 
             state._fsp--;
@@ -22527,7 +22527,7 @@ public final EObject entryRuleJvmUpperBound() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleJvmUpperBound; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmUpperBound18340); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -22545,7 +22545,7 @@ public final EObject entryRuleJvmUpperBound() throws RecognitionException {
 
 
     // $ANTLR start "ruleJvmUpperBound"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7881:1: ruleJvmUpperBound returns [EObject current=null] : (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
+    // InternalCheck.g:7881:1: ruleJvmUpperBound returns [EObject current=null] : (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
     public final EObject ruleJvmUpperBound() throws RecognitionException {
         EObject current = null;
 
@@ -22556,30 +22556,30 @@ public final EObject ruleJvmUpperBound() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7884:28: ( (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7885:1: (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // InternalCheck.g:7884:28: ( (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
+            // InternalCheck.g:7885:1: (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7885:1: (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7885:3: otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // InternalCheck.g:7885:1: (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // InternalCheck.g:7885:3: otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
             {
-            otherlv_0=(Token)match(input,40,FOLLOW_40_in_ruleJvmUpperBound18377); if (state.failed) return current;
+            otherlv_0=(Token)match(input,40,FOLLOW_27); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getJvmUpperBoundAccess().getExtendsKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7889:1: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7890:1: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // InternalCheck.g:7889:1: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // InternalCheck.g:7890:1: (lv_typeReference_1_0= ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7890:1: (lv_typeReference_1_0= ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7891:3: lv_typeReference_1_0= ruleJvmTypeReference
+            // InternalCheck.g:7890:1: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // InternalCheck.g:7891:3: lv_typeReference_1_0= ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getJvmUpperBoundAccess().getTypeReferenceJvmTypeReferenceParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleJvmUpperBound18398);
+            pushFollow(FOLLOW_2);
             lv_typeReference_1_0=ruleJvmTypeReference();
 
             state._fsp--;
@@ -22593,7 +22593,7 @@ public final EObject ruleJvmUpperBound() throws RecognitionException {
                      			current, 
                      			"typeReference",
                       		lv_typeReference_1_0, 
-                      		"JvmTypeReference");
+                      		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -22626,7 +22626,7 @@ public final EObject ruleJvmUpperBound() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleJvmUpperBoundAnded"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7915:1: entryRuleJvmUpperBoundAnded returns [EObject current=null] : iv_ruleJvmUpperBoundAnded= ruleJvmUpperBoundAnded EOF ;
+    // InternalCheck.g:7915:1: entryRuleJvmUpperBoundAnded returns [EObject current=null] : iv_ruleJvmUpperBoundAnded= ruleJvmUpperBoundAnded EOF ;
     public final EObject entryRuleJvmUpperBoundAnded() throws RecognitionException {
         EObject current = null;
 
@@ -22634,13 +22634,13 @@ public final EObject entryRuleJvmUpperBoundAnded() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7916:2: (iv_ruleJvmUpperBoundAnded= ruleJvmUpperBoundAnded EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7917:2: iv_ruleJvmUpperBoundAnded= ruleJvmUpperBoundAnded EOF
+            // InternalCheck.g:7916:2: (iv_ruleJvmUpperBoundAnded= ruleJvmUpperBoundAnded EOF )
+            // InternalCheck.g:7917:2: iv_ruleJvmUpperBoundAnded= ruleJvmUpperBoundAnded EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmUpperBoundAndedRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmUpperBoundAnded_in_entryRuleJvmUpperBoundAnded18434);
+            pushFollow(FOLLOW_1);
             iv_ruleJvmUpperBoundAnded=ruleJvmUpperBoundAnded();
 
             state._fsp--;
@@ -22648,7 +22648,7 @@ public final EObject entryRuleJvmUpperBoundAnded() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleJvmUpperBoundAnded; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmUpperBoundAnded18444); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -22666,7 +22666,7 @@ public final EObject entryRuleJvmUpperBoundAnded() throws RecognitionException {
 
 
     // $ANTLR start "ruleJvmUpperBoundAnded"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7924:1: ruleJvmUpperBoundAnded returns [EObject current=null] : (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
+    // InternalCheck.g:7924:1: ruleJvmUpperBoundAnded returns [EObject current=null] : (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
     public final EObject ruleJvmUpperBoundAnded() throws RecognitionException {
         EObject current = null;
 
@@ -22677,30 +22677,30 @@ public final EObject ruleJvmUpperBoundAnded() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7927:28: ( (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7928:1: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // InternalCheck.g:7927:28: ( (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
+            // InternalCheck.g:7928:1: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7928:1: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7928:3: otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // InternalCheck.g:7928:1: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // InternalCheck.g:7928:3: otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
             {
-            otherlv_0=(Token)match(input,108,FOLLOW_108_in_ruleJvmUpperBoundAnded18481); if (state.failed) return current;
+            otherlv_0=(Token)match(input,108,FOLLOW_27); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getJvmUpperBoundAndedAccess().getAmpersandKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7932:1: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7933:1: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // InternalCheck.g:7932:1: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // InternalCheck.g:7933:1: (lv_typeReference_1_0= ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7933:1: (lv_typeReference_1_0= ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7934:3: lv_typeReference_1_0= ruleJvmTypeReference
+            // InternalCheck.g:7933:1: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // InternalCheck.g:7934:3: lv_typeReference_1_0= ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getJvmUpperBoundAndedAccess().getTypeReferenceJvmTypeReferenceParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleJvmUpperBoundAnded18502);
+            pushFollow(FOLLOW_2);
             lv_typeReference_1_0=ruleJvmTypeReference();
 
             state._fsp--;
@@ -22714,7 +22714,7 @@ public final EObject ruleJvmUpperBoundAnded() throws RecognitionException {
                      			current, 
                      			"typeReference",
                       		lv_typeReference_1_0, 
-                      		"JvmTypeReference");
+                      		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -22747,7 +22747,7 @@ public final EObject ruleJvmUpperBoundAnded() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleJvmLowerBound"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7958:1: entryRuleJvmLowerBound returns [EObject current=null] : iv_ruleJvmLowerBound= ruleJvmLowerBound EOF ;
+    // InternalCheck.g:7958:1: entryRuleJvmLowerBound returns [EObject current=null] : iv_ruleJvmLowerBound= ruleJvmLowerBound EOF ;
     public final EObject entryRuleJvmLowerBound() throws RecognitionException {
         EObject current = null;
 
@@ -22755,13 +22755,13 @@ public final EObject entryRuleJvmLowerBound() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7959:2: (iv_ruleJvmLowerBound= ruleJvmLowerBound EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7960:2: iv_ruleJvmLowerBound= ruleJvmLowerBound EOF
+            // InternalCheck.g:7959:2: (iv_ruleJvmLowerBound= ruleJvmLowerBound EOF )
+            // InternalCheck.g:7960:2: iv_ruleJvmLowerBound= ruleJvmLowerBound EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmLowerBoundRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmLowerBound_in_entryRuleJvmLowerBound18538);
+            pushFollow(FOLLOW_1);
             iv_ruleJvmLowerBound=ruleJvmLowerBound();
 
             state._fsp--;
@@ -22769,7 +22769,7 @@ public final EObject entryRuleJvmLowerBound() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleJvmLowerBound; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmLowerBound18548); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -22787,7 +22787,7 @@ public final EObject entryRuleJvmLowerBound() throws RecognitionException {
 
 
     // $ANTLR start "ruleJvmLowerBound"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7967:1: ruleJvmLowerBound returns [EObject current=null] : (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
+    // InternalCheck.g:7967:1: ruleJvmLowerBound returns [EObject current=null] : (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
     public final EObject ruleJvmLowerBound() throws RecognitionException {
         EObject current = null;
 
@@ -22798,30 +22798,30 @@ public final EObject ruleJvmLowerBound() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7970:28: ( (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7971:1: (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // InternalCheck.g:7970:28: ( (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
+            // InternalCheck.g:7971:1: (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7971:1: (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7971:3: otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // InternalCheck.g:7971:1: (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // InternalCheck.g:7971:3: otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
             {
-            otherlv_0=(Token)match(input,95,FOLLOW_95_in_ruleJvmLowerBound18585); if (state.failed) return current;
+            otherlv_0=(Token)match(input,95,FOLLOW_27); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getJvmLowerBoundAccess().getSuperKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7975:1: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7976:1: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // InternalCheck.g:7975:1: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // InternalCheck.g:7976:1: (lv_typeReference_1_0= ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7976:1: (lv_typeReference_1_0= ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7977:3: lv_typeReference_1_0= ruleJvmTypeReference
+            // InternalCheck.g:7976:1: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // InternalCheck.g:7977:3: lv_typeReference_1_0= ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getJvmLowerBoundAccess().getTypeReferenceJvmTypeReferenceParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleJvmLowerBound18606);
+            pushFollow(FOLLOW_2);
             lv_typeReference_1_0=ruleJvmTypeReference();
 
             state._fsp--;
@@ -22835,7 +22835,7 @@ public final EObject ruleJvmLowerBound() throws RecognitionException {
                      			current, 
                      			"typeReference",
                       		lv_typeReference_1_0, 
-                      		"JvmTypeReference");
+                      		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -22868,7 +22868,7 @@ public final EObject ruleJvmLowerBound() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleJvmLowerBoundAnded"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8001:1: entryRuleJvmLowerBoundAnded returns [EObject current=null] : iv_ruleJvmLowerBoundAnded= ruleJvmLowerBoundAnded EOF ;
+    // InternalCheck.g:8001:1: entryRuleJvmLowerBoundAnded returns [EObject current=null] : iv_ruleJvmLowerBoundAnded= ruleJvmLowerBoundAnded EOF ;
     public final EObject entryRuleJvmLowerBoundAnded() throws RecognitionException {
         EObject current = null;
 
@@ -22876,13 +22876,13 @@ public final EObject entryRuleJvmLowerBoundAnded() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8002:2: (iv_ruleJvmLowerBoundAnded= ruleJvmLowerBoundAnded EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8003:2: iv_ruleJvmLowerBoundAnded= ruleJvmLowerBoundAnded EOF
+            // InternalCheck.g:8002:2: (iv_ruleJvmLowerBoundAnded= ruleJvmLowerBoundAnded EOF )
+            // InternalCheck.g:8003:2: iv_ruleJvmLowerBoundAnded= ruleJvmLowerBoundAnded EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmLowerBoundAndedRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmLowerBoundAnded_in_entryRuleJvmLowerBoundAnded18642);
+            pushFollow(FOLLOW_1);
             iv_ruleJvmLowerBoundAnded=ruleJvmLowerBoundAnded();
 
             state._fsp--;
@@ -22890,7 +22890,7 @@ public final EObject entryRuleJvmLowerBoundAnded() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleJvmLowerBoundAnded; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmLowerBoundAnded18652); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -22908,7 +22908,7 @@ public final EObject entryRuleJvmLowerBoundAnded() throws RecognitionException {
 
 
     // $ANTLR start "ruleJvmLowerBoundAnded"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8010:1: ruleJvmLowerBoundAnded returns [EObject current=null] : (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
+    // InternalCheck.g:8010:1: ruleJvmLowerBoundAnded returns [EObject current=null] : (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
     public final EObject ruleJvmLowerBoundAnded() throws RecognitionException {
         EObject current = null;
 
@@ -22919,30 +22919,30 @@ public final EObject ruleJvmLowerBoundAnded() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8013:28: ( (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8014:1: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // InternalCheck.g:8013:28: ( (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
+            // InternalCheck.g:8014:1: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8014:1: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8014:3: otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // InternalCheck.g:8014:1: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // InternalCheck.g:8014:3: otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
             {
-            otherlv_0=(Token)match(input,108,FOLLOW_108_in_ruleJvmLowerBoundAnded18689); if (state.failed) return current;
+            otherlv_0=(Token)match(input,108,FOLLOW_27); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getJvmLowerBoundAndedAccess().getAmpersandKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8018:1: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8019:1: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // InternalCheck.g:8018:1: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // InternalCheck.g:8019:1: (lv_typeReference_1_0= ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8019:1: (lv_typeReference_1_0= ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8020:3: lv_typeReference_1_0= ruleJvmTypeReference
+            // InternalCheck.g:8019:1: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // InternalCheck.g:8020:3: lv_typeReference_1_0= ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getJvmLowerBoundAndedAccess().getTypeReferenceJvmTypeReferenceParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleJvmLowerBoundAnded18710);
+            pushFollow(FOLLOW_2);
             lv_typeReference_1_0=ruleJvmTypeReference();
 
             state._fsp--;
@@ -22956,7 +22956,7 @@ public final EObject ruleJvmLowerBoundAnded() throws RecognitionException {
                      			current, 
                      			"typeReference",
                       		lv_typeReference_1_0, 
-                      		"JvmTypeReference");
+                      		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -22989,7 +22989,7 @@ public final EObject ruleJvmLowerBoundAnded() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleQualifiedNameWithWildcard"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8046:1: entryRuleQualifiedNameWithWildcard returns [String current=null] : iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF ;
+    // InternalCheck.g:8046:1: entryRuleQualifiedNameWithWildcard returns [String current=null] : iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF ;
     public final String entryRuleQualifiedNameWithWildcard() throws RecognitionException {
         String current = null;
 
@@ -22997,13 +22997,13 @@ public final String entryRuleQualifiedNameWithWildcard() throws RecognitionExcep
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8047:2: (iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8048:2: iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF
+            // InternalCheck.g:8047:2: (iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF )
+            // InternalCheck.g:8048:2: iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getQualifiedNameWithWildcardRule()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedNameWithWildcard_in_entryRuleQualifiedNameWithWildcard18749);
+            pushFollow(FOLLOW_1);
             iv_ruleQualifiedNameWithWildcard=ruleQualifiedNameWithWildcard();
 
             state._fsp--;
@@ -23011,7 +23011,7 @@ public final String entryRuleQualifiedNameWithWildcard() throws RecognitionExcep
             if ( state.backtracking==0 ) {
                current =iv_ruleQualifiedNameWithWildcard.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedNameWithWildcard18760); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -23029,7 +23029,7 @@ public final String entryRuleQualifiedNameWithWildcard() throws RecognitionExcep
 
 
     // $ANTLR start "ruleQualifiedNameWithWildcard"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8055:1: ruleQualifiedNameWithWildcard returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' ) ;
+    // InternalCheck.g:8055:1: ruleQualifiedNameWithWildcard returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' ) ;
     public final AntlrDatatypeRuleToken ruleQualifiedNameWithWildcard() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -23040,18 +23040,18 @@ public final AntlrDatatypeRuleToken ruleQualifiedNameWithWildcard() throws Recog
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8058:28: ( (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8059:1: (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' )
+            // InternalCheck.g:8058:28: ( (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' ) )
+            // InternalCheck.g:8059:1: (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8059:1: (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8060:5: this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*'
+            // InternalCheck.g:8059:1: (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' )
+            // InternalCheck.g:8060:5: this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*'
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getQualifiedNameWithWildcardAccess().getQualifiedNameParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_ruleQualifiedNameWithWildcard18807);
+            pushFollow(FOLLOW_116);
             this_QualifiedName_0=ruleQualifiedName();
 
             state._fsp--;
@@ -23066,14 +23066,14 @@ public final AntlrDatatypeRuleToken ruleQualifiedNameWithWildcard() throws Recog
                       afterParserOrEnumRuleCall();
                   
             }
-            kw=(Token)match(input,81,FOLLOW_81_in_ruleQualifiedNameWithWildcard18825); if (state.failed) return current;
+            kw=(Token)match(input,81,FOLLOW_117); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                       current.merge(kw);
                       newLeafNode(kw, grammarAccess.getQualifiedNameWithWildcardAccess().getFullStopKeyword_1()); 
                   
             }
-            kw=(Token)match(input,73,FOLLOW_73_in_ruleQualifiedNameWithWildcard18838); if (state.failed) return current;
+            kw=(Token)match(input,73,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                       current.merge(kw);
@@ -23103,7 +23103,7 @@ public final AntlrDatatypeRuleToken ruleQualifiedNameWithWildcard() throws Recog
 
 
     // $ANTLR start "entryRuleValidID"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8090:1: entryRuleValidID returns [String current=null] : iv_ruleValidID= ruleValidID EOF ;
+    // InternalCheck.g:8090:1: entryRuleValidID returns [String current=null] : iv_ruleValidID= ruleValidID EOF ;
     public final String entryRuleValidID() throws RecognitionException {
         String current = null;
 
@@ -23111,13 +23111,13 @@ public final String entryRuleValidID() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8091:2: (iv_ruleValidID= ruleValidID EOF )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8092:2: iv_ruleValidID= ruleValidID EOF
+            // InternalCheck.g:8091:2: (iv_ruleValidID= ruleValidID EOF )
+            // InternalCheck.g:8092:2: iv_ruleValidID= ruleValidID EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getValidIDRule()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_entryRuleValidID18879);
+            pushFollow(FOLLOW_1);
             iv_ruleValidID=ruleValidID();
 
             state._fsp--;
@@ -23125,7 +23125,7 @@ public final String entryRuleValidID() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleValidID.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleValidID18890); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -23143,7 +23143,7 @@ public final String entryRuleValidID() throws RecognitionException {
 
 
     // $ANTLR start "ruleValidID"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8099:1: ruleValidID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_ID_0= RULE_ID ;
+    // InternalCheck.g:8099:1: ruleValidID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_ID_0= RULE_ID ;
     public final AntlrDatatypeRuleToken ruleValidID() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -23152,10 +23152,10 @@ public final AntlrDatatypeRuleToken ruleValidID() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8102:28: (this_ID_0= RULE_ID )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8103:5: this_ID_0= RULE_ID
+            // InternalCheck.g:8102:28: (this_ID_0= RULE_ID )
+            // InternalCheck.g:8103:5: this_ID_0= RULE_ID
             {
-            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleValidID18929); if (state.failed) return current;
+            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               		current.merge(this_ID_0);
@@ -23186,7 +23186,7 @@ public final AntlrDatatypeRuleToken ruleValidID() throws RecognitionException {
 
 
     // $ANTLR start "ruleSeverityKind"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8120:1: ruleSeverityKind returns [Enumerator current=null] : ( (enumLiteral_0= 'error' ) | (enumLiteral_1= 'warning' ) | (enumLiteral_2= 'info' ) | (enumLiteral_3= 'ignore' ) ) ;
+    // InternalCheck.g:8120:1: ruleSeverityKind returns [Enumerator current=null] : ( (enumLiteral_0= 'error' ) | (enumLiteral_1= 'warning' ) | (enumLiteral_2= 'info' ) | (enumLiteral_3= 'ignore' ) ) ;
     public final Enumerator ruleSeverityKind() throws RecognitionException {
         Enumerator current = null;
 
@@ -23197,10 +23197,10 @@ public final Enumerator ruleSeverityKind() throws RecognitionException {
 
          enterRule(); 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8122:28: ( ( (enumLiteral_0= 'error' ) | (enumLiteral_1= 'warning' ) | (enumLiteral_2= 'info' ) | (enumLiteral_3= 'ignore' ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8123:1: ( (enumLiteral_0= 'error' ) | (enumLiteral_1= 'warning' ) | (enumLiteral_2= 'info' ) | (enumLiteral_3= 'ignore' ) )
+            // InternalCheck.g:8122:28: ( ( (enumLiteral_0= 'error' ) | (enumLiteral_1= 'warning' ) | (enumLiteral_2= 'info' ) | (enumLiteral_3= 'ignore' ) ) )
+            // InternalCheck.g:8123:1: ( (enumLiteral_0= 'error' ) | (enumLiteral_1= 'warning' ) | (enumLiteral_2= 'info' ) | (enumLiteral_3= 'ignore' ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8123:1: ( (enumLiteral_0= 'error' ) | (enumLiteral_1= 'warning' ) | (enumLiteral_2= 'info' ) | (enumLiteral_3= 'ignore' ) )
+            // InternalCheck.g:8123:1: ( (enumLiteral_0= 'error' ) | (enumLiteral_1= 'warning' ) | (enumLiteral_2= 'info' ) | (enumLiteral_3= 'ignore' ) )
             int alt157=4;
             switch ( input.LA(1) ) {
             case 44:
@@ -23233,12 +23233,12 @@ public final Enumerator ruleSeverityKind() throws RecognitionException {
 
             switch (alt157) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8123:2: (enumLiteral_0= 'error' )
+                    // InternalCheck.g:8123:2: (enumLiteral_0= 'error' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8123:2: (enumLiteral_0= 'error' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8123:4: enumLiteral_0= 'error'
+                    // InternalCheck.g:8123:2: (enumLiteral_0= 'error' )
+                    // InternalCheck.g:8123:4: enumLiteral_0= 'error'
                     {
-                    enumLiteral_0=(Token)match(input,44,FOLLOW_44_in_ruleSeverityKind18989); if (state.failed) return current;
+                    enumLiteral_0=(Token)match(input,44,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current = grammarAccess.getSeverityKindAccess().getErrorEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
@@ -23252,12 +23252,12 @@ public final Enumerator ruleSeverityKind() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8129:6: (enumLiteral_1= 'warning' )
+                    // InternalCheck.g:8129:6: (enumLiteral_1= 'warning' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8129:6: (enumLiteral_1= 'warning' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8129:8: enumLiteral_1= 'warning'
+                    // InternalCheck.g:8129:6: (enumLiteral_1= 'warning' )
+                    // InternalCheck.g:8129:8: enumLiteral_1= 'warning'
                     {
-                    enumLiteral_1=(Token)match(input,45,FOLLOW_45_in_ruleSeverityKind19006); if (state.failed) return current;
+                    enumLiteral_1=(Token)match(input,45,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current = grammarAccess.getSeverityKindAccess().getWarningEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
@@ -23271,12 +23271,12 @@ public final Enumerator ruleSeverityKind() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8135:6: (enumLiteral_2= 'info' )
+                    // InternalCheck.g:8135:6: (enumLiteral_2= 'info' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8135:6: (enumLiteral_2= 'info' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8135:8: enumLiteral_2= 'info'
+                    // InternalCheck.g:8135:6: (enumLiteral_2= 'info' )
+                    // InternalCheck.g:8135:8: enumLiteral_2= 'info'
                     {
-                    enumLiteral_2=(Token)match(input,46,FOLLOW_46_in_ruleSeverityKind19023); if (state.failed) return current;
+                    enumLiteral_2=(Token)match(input,46,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current = grammarAccess.getSeverityKindAccess().getInfoEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
@@ -23290,12 +23290,12 @@ public final Enumerator ruleSeverityKind() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8141:6: (enumLiteral_3= 'ignore' )
+                    // InternalCheck.g:8141:6: (enumLiteral_3= 'ignore' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8141:6: (enumLiteral_3= 'ignore' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8141:8: enumLiteral_3= 'ignore'
+                    // InternalCheck.g:8141:6: (enumLiteral_3= 'ignore' )
+                    // InternalCheck.g:8141:8: enumLiteral_3= 'ignore'
                     {
-                    enumLiteral_3=(Token)match(input,47,FOLLOW_47_in_ruleSeverityKind19040); if (state.failed) return current;
+                    enumLiteral_3=(Token)match(input,47,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current = grammarAccess.getSeverityKindAccess().getIgnoreEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
@@ -23331,7 +23331,7 @@ public final Enumerator ruleSeverityKind() throws RecognitionException {
 
 
     // $ANTLR start "ruleTriggerKind"
-    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8151:1: ruleTriggerKind returns [Enumerator current=null] : ( (enumLiteral_0= 'live' ) | (enumLiteral_1= 'onSave' ) | (enumLiteral_2= 'onDemand' ) ) ;
+    // InternalCheck.g:8151:1: ruleTriggerKind returns [Enumerator current=null] : ( (enumLiteral_0= 'live' ) | (enumLiteral_1= 'onSave' ) | (enumLiteral_2= 'onDemand' ) ) ;
     public final Enumerator ruleTriggerKind() throws RecognitionException {
         Enumerator current = null;
 
@@ -23341,10 +23341,10 @@ public final Enumerator ruleTriggerKind() throws RecognitionException {
 
          enterRule(); 
         try {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8153:28: ( ( (enumLiteral_0= 'live' ) | (enumLiteral_1= 'onSave' ) | (enumLiteral_2= 'onDemand' ) ) )
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8154:1: ( (enumLiteral_0= 'live' ) | (enumLiteral_1= 'onSave' ) | (enumLiteral_2= 'onDemand' ) )
+            // InternalCheck.g:8153:28: ( ( (enumLiteral_0= 'live' ) | (enumLiteral_1= 'onSave' ) | (enumLiteral_2= 'onDemand' ) ) )
+            // InternalCheck.g:8154:1: ( (enumLiteral_0= 'live' ) | (enumLiteral_1= 'onSave' ) | (enumLiteral_2= 'onDemand' ) )
             {
-            // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8154:1: ( (enumLiteral_0= 'live' ) | (enumLiteral_1= 'onSave' ) | (enumLiteral_2= 'onDemand' ) )
+            // InternalCheck.g:8154:1: ( (enumLiteral_0= 'live' ) | (enumLiteral_1= 'onSave' ) | (enumLiteral_2= 'onDemand' ) )
             int alt158=3;
             switch ( input.LA(1) ) {
             case 48:
@@ -23372,12 +23372,12 @@ public final Enumerator ruleTriggerKind() throws RecognitionException {
 
             switch (alt158) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8154:2: (enumLiteral_0= 'live' )
+                    // InternalCheck.g:8154:2: (enumLiteral_0= 'live' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8154:2: (enumLiteral_0= 'live' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8154:4: enumLiteral_0= 'live'
+                    // InternalCheck.g:8154:2: (enumLiteral_0= 'live' )
+                    // InternalCheck.g:8154:4: enumLiteral_0= 'live'
                     {
-                    enumLiteral_0=(Token)match(input,48,FOLLOW_48_in_ruleTriggerKind19085); if (state.failed) return current;
+                    enumLiteral_0=(Token)match(input,48,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current = grammarAccess.getTriggerKindAccess().getFastEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
@@ -23391,12 +23391,12 @@ public final Enumerator ruleTriggerKind() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8160:6: (enumLiteral_1= 'onSave' )
+                    // InternalCheck.g:8160:6: (enumLiteral_1= 'onSave' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8160:6: (enumLiteral_1= 'onSave' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8160:8: enumLiteral_1= 'onSave'
+                    // InternalCheck.g:8160:6: (enumLiteral_1= 'onSave' )
+                    // InternalCheck.g:8160:8: enumLiteral_1= 'onSave'
                     {
-                    enumLiteral_1=(Token)match(input,49,FOLLOW_49_in_ruleTriggerKind19102); if (state.failed) return current;
+                    enumLiteral_1=(Token)match(input,49,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current = grammarAccess.getTriggerKindAccess().getNormalEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
@@ -23410,12 +23410,12 @@ public final Enumerator ruleTriggerKind() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8166:6: (enumLiteral_2= 'onDemand' )
+                    // InternalCheck.g:8166:6: (enumLiteral_2= 'onDemand' )
                     {
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8166:6: (enumLiteral_2= 'onDemand' )
-                    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:8166:8: enumLiteral_2= 'onDemand'
+                    // InternalCheck.g:8166:6: (enumLiteral_2= 'onDemand' )
+                    // InternalCheck.g:8166:8: enumLiteral_2= 'onDemand'
                     {
-                    enumLiteral_2=(Token)match(input,50,FOLLOW_50_in_ruleTriggerKind19119); if (state.failed) return current;
+                    enumLiteral_2=(Token)match(input,50,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current = grammarAccess.getTriggerKindAccess().getExpensiveEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
@@ -23451,10 +23451,10 @@ public final Enumerator ruleTriggerKind() throws RecognitionException {
 
     // $ANTLR start synpred1_InternalCheck
     public final void synpred1_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:595:4: ( '(' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:595:6: '('
+        // InternalCheck.g:595:4: ( '(' )
+        // InternalCheck.g:595:6: '('
         {
-        match(input,23,FOLLOW_23_in_synpred1_InternalCheck1071); if (state.failed) return ;
+        match(input,23,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -23462,10 +23462,10 @@ public final void synpred1_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred2_InternalCheck
     public final void synpred2_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:666:7: ( '{' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:666:9: '{'
+        // InternalCheck.g:666:7: ( '{' )
+        // InternalCheck.g:666:9: '{'
         {
-        match(input,18,FOLLOW_18_in_synpred2_InternalCheck1205); if (state.failed) return ;
+        match(input,18,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -23473,13 +23473,13 @@ public final void synpred2_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred3_InternalCheck
     public final void synpred3_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1489:2: ( ( ruleQualifiedName ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1490:1: ( ruleQualifiedName )
+        // InternalCheck.g:1489:2: ( ( ruleQualifiedName ) )
+        // InternalCheck.g:1490:1: ( ruleQualifiedName )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1490:1: ( ruleQualifiedName )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1491:3: ruleQualifiedName
+        // InternalCheck.g:1490:1: ( ruleQualifiedName )
+        // InternalCheck.g:1491:3: ruleQualifiedName
         {
-        pushFollow(FOLLOW_ruleQualifiedName_in_synpred3_InternalCheck2985);
+        pushFollow(FOLLOW_2);
         ruleQualifiedName();
 
         state._fsp--;
@@ -23494,10 +23494,10 @@ public final void synpred3_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred4_InternalCheck
     public final void synpred4_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1508:5: ( 'on' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1508:7: 'on'
+        // InternalCheck.g:1508:5: ( 'on' )
+        // InternalCheck.g:1508:7: 'on'
         {
-        match(input,37,FOLLOW_37_in_synpred4_InternalCheck3018); if (state.failed) return ;
+        match(input,37,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -23505,10 +23505,10 @@ public final void synpred4_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred5_InternalCheck
     public final void synpred5_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1513:5: ( '#' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1513:7: '#'
+        // InternalCheck.g:1513:5: ( '#' )
+        // InternalCheck.g:1513:7: '#'
         {
-        match(input,32,FOLLOW_32_in_synpred5_InternalCheck3041); if (state.failed) return ;
+        match(input,32,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -23516,10 +23516,10 @@ public final void synpred5_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred6_InternalCheck
     public final void synpred6_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1552:4: ( '#' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1552:6: '#'
+        // InternalCheck.g:1552:4: ( '#' )
+        // InternalCheck.g:1552:6: '#'
         {
-        match(input,32,FOLLOW_32_in_synpred6_InternalCheck3115); if (state.failed) return ;
+        match(input,32,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -23527,10 +23527,10 @@ public final void synpred6_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred7_InternalCheck
     public final void synpred7_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1572:8: ( '[' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1572:10: '['
+        // InternalCheck.g:1572:8: ( '[' )
+        // InternalCheck.g:1572:10: '['
         {
-        match(input,33,FOLLOW_33_in_synpred7_InternalCheck3164); if (state.failed) return ;
+        match(input,33,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -23538,10 +23538,10 @@ public final void synpred7_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred8_InternalCheck
     public final void synpred8_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1599:7: ( 'message' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1599:9: 'message'
+        // InternalCheck.g:1599:7: ( 'message' )
+        // InternalCheck.g:1599:9: 'message'
         {
-        match(input,26,FOLLOW_26_in_synpred8_InternalCheck3223); if (state.failed) return ;
+        match(input,26,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -23549,10 +23549,10 @@ public final void synpred8_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred9_InternalCheck
     public final void synpred9_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1622:6: ( 'bind' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1622:8: 'bind'
+        // InternalCheck.g:1622:6: ( 'bind' )
+        // InternalCheck.g:1622:8: 'bind'
         {
-        match(input,38,FOLLOW_38_in_synpred9_InternalCheck3268); if (state.failed) return ;
+        match(input,38,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -23560,10 +23560,10 @@ public final void synpred9_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred10_InternalCheck
     public final void synpred10_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1649:4: ( ',' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1649:6: ','
+        // InternalCheck.g:1649:4: ( ',' )
+        // InternalCheck.g:1649:6: ','
         {
-        match(input,24,FOLLOW_24_in_synpred10_InternalCheck3323); if (state.failed) return ;
+        match(input,24,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -23571,10 +23571,10 @@ public final void synpred10_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred11_InternalCheck
     public final void synpred11_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1676:5: ( 'data' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1676:7: 'data'
+        // InternalCheck.g:1676:5: ( 'data' )
+        // InternalCheck.g:1676:7: 'data'
         {
-        match(input,39,FOLLOW_39_in_synpred11_InternalCheck3382); if (state.failed) return ;
+        match(input,39,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -23582,10 +23582,10 @@ public final void synpred11_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred12_InternalCheck
     public final void synpred12_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1721:4: ( ',' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1721:6: ','
+        // InternalCheck.g:1721:4: ( ',' )
+        // InternalCheck.g:1721:6: ','
         {
-        match(input,24,FOLLOW_24_in_synpred12_InternalCheck3459); if (state.failed) return ;
+        match(input,24,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -23593,19 +23593,19 @@ public final void synpred12_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred13_InternalCheck
     public final void synpred13_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1799:7: ( ( () 'synchronized' '(' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1799:8: ( () 'synchronized' '(' )
+        // InternalCheck.g:1799:7: ( ( () 'synchronized' '(' ) )
+        // InternalCheck.g:1799:8: ( () 'synchronized' '(' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1799:8: ( () 'synchronized' '(' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1799:9: () 'synchronized' '('
+        // InternalCheck.g:1799:8: ( () 'synchronized' '(' )
+        // InternalCheck.g:1799:9: () 'synchronized' '('
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1799:9: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1800:1: 
+        // InternalCheck.g:1799:9: ()
+        // InternalCheck.g:1800:1: 
         {
         }
 
-        match(input,105,FOLLOW_105_in_synpred13_InternalCheck3673); if (state.failed) return ;
-        match(input,23,FOLLOW_23_in_synpred13_InternalCheck3677); if (state.failed) return ;
+        match(input,105,FOLLOW_24); if (state.failed) return ;
+        match(input,23,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -23616,26 +23616,26 @@ public final void synpred13_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred14_InternalCheck
     public final void synpred14_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1842:7: ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1842:8: ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' )
+        // InternalCheck.g:1842:7: ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )
+        // InternalCheck.g:1842:8: ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1842:8: ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1842:9: () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':'
+        // InternalCheck.g:1842:8: ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' )
+        // InternalCheck.g:1842:9: () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':'
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1842:9: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1843:1: 
+        // InternalCheck.g:1842:9: ()
+        // InternalCheck.g:1843:1: 
         {
         }
 
-        match(input,16,FOLLOW_16_in_synpred14_InternalCheck3799); if (state.failed) return ;
-        match(input,23,FOLLOW_23_in_synpred14_InternalCheck3803); if (state.failed) return ;
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1845:1: ( ( ruleJvmFormalParameter ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1846:1: ( ruleJvmFormalParameter )
+        match(input,16,FOLLOW_24); if (state.failed) return ;
+        match(input,23,FOLLOW_27); if (state.failed) return ;
+        // InternalCheck.g:1845:1: ( ( ruleJvmFormalParameter ) )
+        // InternalCheck.g:1846:1: ( ruleJvmFormalParameter )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1846:1: ( ruleJvmFormalParameter )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:1847:1: ruleJvmFormalParameter
+        // InternalCheck.g:1846:1: ( ruleJvmFormalParameter )
+        // InternalCheck.g:1847:1: ruleJvmFormalParameter
         {
-        pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred14_InternalCheck3810);
+        pushFollow(FOLLOW_87);
         ruleJvmFormalParameter();
 
         state._fsp--;
@@ -23646,7 +23646,7 @@ public final void synpred14_InternalCheck_fragment() throws RecognitionException
 
         }
 
-        match(input,88,FOLLOW_88_in_synpred14_InternalCheck3816); if (state.failed) return ;
+        match(input,88,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -23657,10 +23657,10 @@ public final void synpred14_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred15_InternalCheck
     public final void synpred15_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2167:4: ( '(' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2167:6: '('
+        // InternalCheck.g:2167:4: ( '(' )
+        // InternalCheck.g:2167:6: '('
         {
-        match(input,23,FOLLOW_23_in_synpred15_InternalCheck4690); if (state.failed) return ;
+        match(input,23,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -23668,19 +23668,19 @@ public final void synpred15_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred16_InternalCheck
     public final void synpred16_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2172:5: ( ( ( ( ruleValidID ) ) '=' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2172:6: ( ( ( ruleValidID ) ) '=' )
+        // InternalCheck.g:2172:5: ( ( ( ( ruleValidID ) ) '=' ) )
+        // InternalCheck.g:2172:6: ( ( ( ruleValidID ) ) '=' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2172:6: ( ( ( ruleValidID ) ) '=' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2172:7: ( ( ruleValidID ) ) '='
+        // InternalCheck.g:2172:6: ( ( ( ruleValidID ) ) '=' )
+        // InternalCheck.g:2172:7: ( ( ruleValidID ) ) '='
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2172:7: ( ( ruleValidID ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2173:1: ( ruleValidID )
+        // InternalCheck.g:2172:7: ( ( ruleValidID ) )
+        // InternalCheck.g:2173:1: ( ruleValidID )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2173:1: ( ruleValidID )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2174:3: ruleValidID
+        // InternalCheck.g:2173:1: ( ruleValidID )
+        // InternalCheck.g:2174:3: ruleValidID
         {
-        pushFollow(FOLLOW_ruleValidID_in_synpred16_InternalCheck4719);
+        pushFollow(FOLLOW_32);
         ruleValidID();
 
         state._fsp--;
@@ -23691,7 +23691,7 @@ public final void synpred16_InternalCheck_fragment() throws RecognitionException
 
         }
 
-        match(input,31,FOLLOW_31_in_synpred16_InternalCheck4725); if (state.failed) return ;
+        match(input,31,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -23702,19 +23702,19 @@ public final void synpred16_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred19_InternalCheck
     public final void synpred19_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2329:4: ( ( () '#' '[' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2329:5: ( () '#' '[' )
+        // InternalCheck.g:2329:4: ( ( () '#' '[' ) )
+        // InternalCheck.g:2329:5: ( () '#' '[' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2329:5: ( () '#' '[' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2329:6: () '#' '['
+        // InternalCheck.g:2329:5: ( () '#' '[' )
+        // InternalCheck.g:2329:6: () '#' '['
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2329:6: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2330:1: 
+        // InternalCheck.g:2329:6: ()
+        // InternalCheck.g:2330:1: 
         {
         }
 
-        match(input,32,FOLLOW_32_in_synpred19_InternalCheck5081); if (state.failed) return ;
-        match(input,33,FOLLOW_33_in_synpred19_InternalCheck5085); if (state.failed) return ;
+        match(input,32,FOLLOW_36); if (state.failed) return ;
+        match(input,33,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -23725,19 +23725,19 @@ public final void synpred19_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred20_InternalCheck
     public final void synpred20_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2449:4: ( ( () '#' '[' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2449:5: ( () '#' '[' )
+        // InternalCheck.g:2449:4: ( ( () '#' '[' ) )
+        // InternalCheck.g:2449:5: ( () '#' '[' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2449:5: ( () '#' '[' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2449:6: () '#' '['
+        // InternalCheck.g:2449:5: ( () '#' '[' )
+        // InternalCheck.g:2449:6: () '#' '['
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2449:6: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2450:1: 
+        // InternalCheck.g:2449:6: ()
+        // InternalCheck.g:2450:1: 
         {
         }
 
-        match(input,32,FOLLOW_32_in_synpred20_InternalCheck5356); if (state.failed) return ;
-        match(input,33,FOLLOW_33_in_synpred20_InternalCheck5360); if (state.failed) return ;
+        match(input,32,FOLLOW_36); if (state.failed) return ;
+        match(input,33,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -23748,24 +23748,24 @@ public final void synpred20_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred21_InternalCheck
     public final void synpred21_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2668:3: ( ( () ( ( ruleOpMultiAssign ) ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2668:4: ( () ( ( ruleOpMultiAssign ) ) )
+        // InternalCheck.g:2668:3: ( ( () ( ( ruleOpMultiAssign ) ) ) )
+        // InternalCheck.g:2668:4: ( () ( ( ruleOpMultiAssign ) ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2668:4: ( () ( ( ruleOpMultiAssign ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2668:5: () ( ( ruleOpMultiAssign ) )
+        // InternalCheck.g:2668:4: ( () ( ( ruleOpMultiAssign ) ) )
+        // InternalCheck.g:2668:5: () ( ( ruleOpMultiAssign ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2668:5: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2669:1: 
+        // InternalCheck.g:2668:5: ()
+        // InternalCheck.g:2669:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2669:2: ( ( ruleOpMultiAssign ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2670:1: ( ruleOpMultiAssign )
+        // InternalCheck.g:2669:2: ( ( ruleOpMultiAssign ) )
+        // InternalCheck.g:2670:1: ( ruleOpMultiAssign )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2670:1: ( ruleOpMultiAssign )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2671:3: ruleOpMultiAssign
+        // InternalCheck.g:2670:1: ( ruleOpMultiAssign )
+        // InternalCheck.g:2671:3: ruleOpMultiAssign
         {
-        pushFollow(FOLLOW_ruleOpMultiAssign_in_synpred21_InternalCheck5893);
+        pushFollow(FOLLOW_2);
         ruleOpMultiAssign();
 
         state._fsp--;
@@ -23786,24 +23786,24 @@ public final void synpred21_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred22_InternalCheck
     public final void synpred22_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2862:3: ( ( () ( ( ruleOpOr ) ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2862:4: ( () ( ( ruleOpOr ) ) )
+        // InternalCheck.g:2862:3: ( ( () ( ( ruleOpOr ) ) ) )
+        // InternalCheck.g:2862:4: ( () ( ( ruleOpOr ) ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2862:4: ( () ( ( ruleOpOr ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2862:5: () ( ( ruleOpOr ) )
+        // InternalCheck.g:2862:4: ( () ( ( ruleOpOr ) ) )
+        // InternalCheck.g:2862:5: () ( ( ruleOpOr ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2862:5: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2863:1: 
+        // InternalCheck.g:2862:5: ()
+        // InternalCheck.g:2863:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2863:2: ( ( ruleOpOr ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2864:1: ( ruleOpOr )
+        // InternalCheck.g:2863:2: ( ( ruleOpOr ) )
+        // InternalCheck.g:2864:1: ( ruleOpOr )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2864:1: ( ruleOpOr )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2865:3: ruleOpOr
+        // InternalCheck.g:2864:1: ( ruleOpOr )
+        // InternalCheck.g:2865:3: ruleOpOr
         {
-        pushFollow(FOLLOW_ruleOpOr_in_synpred22_InternalCheck6416);
+        pushFollow(FOLLOW_2);
         ruleOpOr();
 
         state._fsp--;
@@ -23824,24 +23824,24 @@ public final void synpred22_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred23_InternalCheck
     public final void synpred23_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2963:3: ( ( () ( ( ruleOpAnd ) ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2963:4: ( () ( ( ruleOpAnd ) ) )
+        // InternalCheck.g:2963:3: ( ( () ( ( ruleOpAnd ) ) ) )
+        // InternalCheck.g:2963:4: ( () ( ( ruleOpAnd ) ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2963:4: ( () ( ( ruleOpAnd ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2963:5: () ( ( ruleOpAnd ) )
+        // InternalCheck.g:2963:4: ( () ( ( ruleOpAnd ) ) )
+        // InternalCheck.g:2963:5: () ( ( ruleOpAnd ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2963:5: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2964:1: 
+        // InternalCheck.g:2963:5: ()
+        // InternalCheck.g:2964:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2964:2: ( ( ruleOpAnd ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2965:1: ( ruleOpAnd )
+        // InternalCheck.g:2964:2: ( ( ruleOpAnd ) )
+        // InternalCheck.g:2965:1: ( ruleOpAnd )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2965:1: ( ruleOpAnd )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:2966:3: ruleOpAnd
+        // InternalCheck.g:2965:1: ( ruleOpAnd )
+        // InternalCheck.g:2966:3: ruleOpAnd
         {
-        pushFollow(FOLLOW_ruleOpAnd_in_synpred23_InternalCheck6675);
+        pushFollow(FOLLOW_2);
         ruleOpAnd();
 
         state._fsp--;
@@ -23862,24 +23862,24 @@ public final void synpred23_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred24_InternalCheck
     public final void synpred24_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3064:3: ( ( () ( ( ruleOpEquality ) ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3064:4: ( () ( ( ruleOpEquality ) ) )
+        // InternalCheck.g:3064:3: ( ( () ( ( ruleOpEquality ) ) ) )
+        // InternalCheck.g:3064:4: ( () ( ( ruleOpEquality ) ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3064:4: ( () ( ( ruleOpEquality ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3064:5: () ( ( ruleOpEquality ) )
+        // InternalCheck.g:3064:4: ( () ( ( ruleOpEquality ) ) )
+        // InternalCheck.g:3064:5: () ( ( ruleOpEquality ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3064:5: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3065:1: 
+        // InternalCheck.g:3064:5: ()
+        // InternalCheck.g:3065:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3065:2: ( ( ruleOpEquality ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3066:1: ( ruleOpEquality )
+        // InternalCheck.g:3065:2: ( ( ruleOpEquality ) )
+        // InternalCheck.g:3066:1: ( ruleOpEquality )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3066:1: ( ruleOpEquality )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3067:3: ruleOpEquality
+        // InternalCheck.g:3066:1: ( ruleOpEquality )
+        // InternalCheck.g:3067:3: ruleOpEquality
         {
-        pushFollow(FOLLOW_ruleOpEquality_in_synpred24_InternalCheck6934);
+        pushFollow(FOLLOW_2);
         ruleOpEquality();
 
         state._fsp--;
@@ -23900,18 +23900,18 @@ public final void synpred24_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred25_InternalCheck
     public final void synpred25_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3186:4: ( ( () 'instanceof' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3186:5: ( () 'instanceof' )
+        // InternalCheck.g:3186:4: ( ( () 'instanceof' ) )
+        // InternalCheck.g:3186:5: ( () 'instanceof' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3186:5: ( () 'instanceof' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3186:6: () 'instanceof'
+        // InternalCheck.g:3186:5: ( () 'instanceof' )
+        // InternalCheck.g:3186:6: () 'instanceof'
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3186:6: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3187:1: 
+        // InternalCheck.g:3186:6: ()
+        // InternalCheck.g:3187:1: 
         {
         }
 
-        match(input,65,FOLLOW_65_in_synpred25_InternalCheck7248); if (state.failed) return ;
+        match(input,65,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -23922,24 +23922,24 @@ public final void synpred25_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred26_InternalCheck
     public final void synpred26_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3217:8: ( ( () ( ( ruleOpCompare ) ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3217:9: ( () ( ( ruleOpCompare ) ) )
+        // InternalCheck.g:3217:8: ( ( () ( ( ruleOpCompare ) ) ) )
+        // InternalCheck.g:3217:9: ( () ( ( ruleOpCompare ) ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3217:9: ( () ( ( ruleOpCompare ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3217:10: () ( ( ruleOpCompare ) )
+        // InternalCheck.g:3217:9: ( () ( ( ruleOpCompare ) ) )
+        // InternalCheck.g:3217:10: () ( ( ruleOpCompare ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3217:10: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3218:1: 
+        // InternalCheck.g:3217:10: ()
+        // InternalCheck.g:3218:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3218:2: ( ( ruleOpCompare ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3219:1: ( ruleOpCompare )
+        // InternalCheck.g:3218:2: ( ( ruleOpCompare ) )
+        // InternalCheck.g:3219:1: ( ruleOpCompare )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3219:1: ( ruleOpCompare )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3220:3: ruleOpCompare
+        // InternalCheck.g:3219:1: ( ruleOpCompare )
+        // InternalCheck.g:3220:3: ruleOpCompare
         {
-        pushFollow(FOLLOW_ruleOpCompare_in_synpred26_InternalCheck7319);
+        pushFollow(FOLLOW_2);
         ruleOpCompare();
 
         state._fsp--;
@@ -23960,24 +23960,24 @@ public final void synpred26_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred27_InternalCheck
     public final void synpred27_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3345:3: ( ( () ( ( ruleOpOther ) ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3345:4: ( () ( ( ruleOpOther ) ) )
+        // InternalCheck.g:3345:3: ( ( () ( ( ruleOpOther ) ) ) )
+        // InternalCheck.g:3345:4: ( () ( ( ruleOpOther ) ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3345:4: ( () ( ( ruleOpOther ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3345:5: () ( ( ruleOpOther ) )
+        // InternalCheck.g:3345:4: ( () ( ( ruleOpOther ) ) )
+        // InternalCheck.g:3345:5: () ( ( ruleOpOther ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3345:5: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3346:1: 
+        // InternalCheck.g:3345:5: ()
+        // InternalCheck.g:3346:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3346:2: ( ( ruleOpOther ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3347:1: ( ruleOpOther )
+        // InternalCheck.g:3346:2: ( ( ruleOpOther ) )
+        // InternalCheck.g:3347:1: ( ruleOpOther )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3347:1: ( ruleOpOther )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3348:3: ruleOpOther
+        // InternalCheck.g:3347:1: ( ruleOpOther )
+        // InternalCheck.g:3348:3: ruleOpOther
         {
-        pushFollow(FOLLOW_ruleOpOther_in_synpred27_InternalCheck7653);
+        pushFollow(FOLLOW_2);
         ruleOpOther();
 
         state._fsp--;
@@ -23998,14 +23998,14 @@ public final void synpred27_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred28_InternalCheck
     public final void synpred28_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3457:3: ( ( '>' '>' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3457:4: ( '>' '>' )
+        // InternalCheck.g:3457:3: ( ( '>' '>' ) )
+        // InternalCheck.g:3457:4: ( '>' '>' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3457:4: ( '>' '>' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3458:2: '>' '>'
+        // InternalCheck.g:3457:4: ( '>' '>' )
+        // InternalCheck.g:3458:2: '>' '>'
         {
-        match(input,57,FOLLOW_57_in_synpred28_InternalCheck7922); if (state.failed) return ;
-        match(input,57,FOLLOW_57_in_synpred28_InternalCheck7927); if (state.failed) return ;
+        match(input,57,FOLLOW_64); if (state.failed) return ;
+        match(input,57,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -24016,14 +24016,14 @@ public final void synpred28_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred29_InternalCheck
     public final void synpred29_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3487:3: ( ( '<' '<' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3487:4: ( '<' '<' )
+        // InternalCheck.g:3487:3: ( ( '<' '<' ) )
+        // InternalCheck.g:3487:4: ( '<' '<' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3487:4: ( '<' '<' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3488:2: '<' '<'
+        // InternalCheck.g:3487:4: ( '<' '<' )
+        // InternalCheck.g:3488:2: '<' '<'
         {
-        match(input,56,FOLLOW_56_in_synpred29_InternalCheck8009); if (state.failed) return ;
-        match(input,56,FOLLOW_56_in_synpred29_InternalCheck8014); if (state.failed) return ;
+        match(input,56,FOLLOW_56); if (state.failed) return ;
+        match(input,56,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -24034,24 +24034,24 @@ public final void synpred29_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred30_InternalCheck
     public final void synpred30_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3561:3: ( ( () ( ( ruleOpAdd ) ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3561:4: ( () ( ( ruleOpAdd ) ) )
+        // InternalCheck.g:3561:3: ( ( () ( ( ruleOpAdd ) ) ) )
+        // InternalCheck.g:3561:4: ( () ( ( ruleOpAdd ) ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3561:4: ( () ( ( ruleOpAdd ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3561:5: () ( ( ruleOpAdd ) )
+        // InternalCheck.g:3561:4: ( () ( ( ruleOpAdd ) ) )
+        // InternalCheck.g:3561:5: () ( ( ruleOpAdd ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3561:5: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3562:1: 
+        // InternalCheck.g:3561:5: ()
+        // InternalCheck.g:3562:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3562:2: ( ( ruleOpAdd ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3563:1: ( ruleOpAdd )
+        // InternalCheck.g:3562:2: ( ( ruleOpAdd ) )
+        // InternalCheck.g:3563:1: ( ruleOpAdd )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3563:1: ( ruleOpAdd )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3564:3: ruleOpAdd
+        // InternalCheck.g:3563:1: ( ruleOpAdd )
+        // InternalCheck.g:3564:3: ruleOpAdd
         {
-        pushFollow(FOLLOW_ruleOpAdd_in_synpred30_InternalCheck8236);
+        pushFollow(FOLLOW_2);
         ruleOpAdd();
 
         state._fsp--;
@@ -24072,24 +24072,24 @@ public final void synpred30_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred31_InternalCheck
     public final void synpred31_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3669:3: ( ( () ( ( ruleOpMulti ) ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3669:4: ( () ( ( ruleOpMulti ) ) )
+        // InternalCheck.g:3669:3: ( ( () ( ( ruleOpMulti ) ) ) )
+        // InternalCheck.g:3669:4: ( () ( ( ruleOpMulti ) ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3669:4: ( () ( ( ruleOpMulti ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3669:5: () ( ( ruleOpMulti ) )
+        // InternalCheck.g:3669:4: ( () ( ( ruleOpMulti ) ) )
+        // InternalCheck.g:3669:5: () ( ( ruleOpMulti ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3669:5: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3670:1: 
+        // InternalCheck.g:3669:5: ()
+        // InternalCheck.g:3670:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3670:2: ( ( ruleOpMulti ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3671:1: ( ruleOpMulti )
+        // InternalCheck.g:3670:2: ( ( ruleOpMulti ) )
+        // InternalCheck.g:3671:1: ( ruleOpMulti )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3671:1: ( ruleOpMulti )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3672:3: ruleOpMulti
+        // InternalCheck.g:3671:1: ( ruleOpMulti )
+        // InternalCheck.g:3672:3: ruleOpMulti
         {
-        pushFollow(FOLLOW_ruleOpMulti_in_synpred31_InternalCheck8516);
+        pushFollow(FOLLOW_2);
         ruleOpMulti();
 
         state._fsp--;
@@ -24110,18 +24110,18 @@ public final void synpred31_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred32_InternalCheck
     public final void synpred32_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3902:3: ( ( () 'as' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3902:4: ( () 'as' )
+        // InternalCheck.g:3902:3: ( ( () 'as' ) )
+        // InternalCheck.g:3902:4: ( () 'as' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3902:4: ( () 'as' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3902:5: () 'as'
+        // InternalCheck.g:3902:4: ( () 'as' )
+        // InternalCheck.g:3902:5: () 'as'
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3902:5: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3903:1: 
+        // InternalCheck.g:3902:5: ()
+        // InternalCheck.g:3903:1: 
         {
         }
 
-        match(input,78,FOLLOW_78_in_synpred32_InternalCheck9110); if (state.failed) return ;
+        match(input,78,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -24132,24 +24132,24 @@ public final void synpred32_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred33_InternalCheck
     public final void synpred33_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3962:2: ( ( () ( ( ruleOpPostfix ) ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3962:3: ( () ( ( ruleOpPostfix ) ) )
+        // InternalCheck.g:3962:2: ( ( () ( ( ruleOpPostfix ) ) ) )
+        // InternalCheck.g:3962:3: ( () ( ( ruleOpPostfix ) ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3962:3: ( () ( ( ruleOpPostfix ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3962:4: () ( ( ruleOpPostfix ) )
+        // InternalCheck.g:3962:3: ( () ( ( ruleOpPostfix ) ) )
+        // InternalCheck.g:3962:4: () ( ( ruleOpPostfix ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3962:4: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3963:1: 
+        // InternalCheck.g:3962:4: ()
+        // InternalCheck.g:3963:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3963:2: ( ( ruleOpPostfix ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3964:1: ( ruleOpPostfix )
+        // InternalCheck.g:3963:2: ( ( ruleOpPostfix ) )
+        // InternalCheck.g:3964:1: ( ruleOpPostfix )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3964:1: ( ruleOpPostfix )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:3965:3: ruleOpPostfix
+        // InternalCheck.g:3964:1: ( ruleOpPostfix )
+        // InternalCheck.g:3965:3: ruleOpPostfix
         {
-        pushFollow(FOLLOW_ruleOpPostfix_in_synpred33_InternalCheck9267);
+        pushFollow(FOLLOW_2);
         ruleOpPostfix();
 
         state._fsp--;
@@ -24170,18 +24170,18 @@ public final void synpred33_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred34_InternalCheck
     public final void synpred34_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4052:4: ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4052:5: ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
+        // InternalCheck.g:4052:4: ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )
+        // InternalCheck.g:4052:5: ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4052:5: ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4052:6: () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign
+        // InternalCheck.g:4052:5: ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
+        // InternalCheck.g:4052:6: () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4052:6: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4053:1: 
+        // InternalCheck.g:4052:6: ()
+        // InternalCheck.g:4053:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4053:2: ( '.' | ( ( '::' ) ) )
+        // InternalCheck.g:4053:2: ( '.' | ( ( '::' ) ) )
         int alt159=2;
         int LA159_0 = input.LA(1);
 
@@ -24200,22 +24200,22 @@ else if ( (LA159_0==82) ) {
         }
         switch (alt159) {
             case 1 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4053:4: '.'
+                // InternalCheck.g:4053:4: '.'
                 {
-                match(input,81,FOLLOW_81_in_synpred34_InternalCheck9522); if (state.failed) return ;
+                match(input,81,FOLLOW_44); if (state.failed) return ;
 
                 }
                 break;
             case 2 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4055:6: ( ( '::' ) )
+                // InternalCheck.g:4055:6: ( ( '::' ) )
                 {
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4055:6: ( ( '::' ) )
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4056:1: ( '::' )
+                // InternalCheck.g:4055:6: ( ( '::' ) )
+                // InternalCheck.g:4056:1: ( '::' )
                 {
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4056:1: ( '::' )
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4057:2: '::'
+                // InternalCheck.g:4056:1: ( '::' )
+                // InternalCheck.g:4057:2: '::'
                 {
-                match(input,82,FOLLOW_82_in_synpred34_InternalCheck9536); if (state.failed) return ;
+                match(input,82,FOLLOW_44); if (state.failed) return ;
 
                 }
 
@@ -24228,13 +24228,13 @@ else if ( (LA159_0==82) ) {
 
         }
 
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4061:3: ( ( ruleFeatureCallID ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4062:1: ( ruleFeatureCallID )
+        // InternalCheck.g:4061:3: ( ( ruleFeatureCallID ) )
+        // InternalCheck.g:4062:1: ( ruleFeatureCallID )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4062:1: ( ruleFeatureCallID )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4063:3: ruleFeatureCallID
+        // InternalCheck.g:4062:1: ( ruleFeatureCallID )
+        // InternalCheck.g:4063:3: ruleFeatureCallID
         {
-        pushFollow(FOLLOW_ruleFeatureCallID_in_synpred34_InternalCheck9552);
+        pushFollow(FOLLOW_32);
         ruleFeatureCallID();
 
         state._fsp--;
@@ -24245,7 +24245,7 @@ else if ( (LA159_0==82) ) {
 
         }
 
-        pushFollow(FOLLOW_ruleOpSingleAssign_in_synpred34_InternalCheck9558);
+        pushFollow(FOLLOW_2);
         ruleOpSingleAssign();
 
         state._fsp--;
@@ -24260,18 +24260,18 @@ else if ( (LA159_0==82) ) {
 
     // $ANTLR start synpred35_InternalCheck
     public final void synpred35_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4133:8: ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4133:9: ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) )
+        // InternalCheck.g:4133:8: ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )
+        // InternalCheck.g:4133:9: ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4133:9: ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4133:10: () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) )
+        // InternalCheck.g:4133:9: ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) )
+        // InternalCheck.g:4133:10: () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4133:10: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4134:1: 
+        // InternalCheck.g:4133:10: ()
+        // InternalCheck.g:4134:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4134:2: ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) )
+        // InternalCheck.g:4134:2: ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) )
         int alt160=3;
         switch ( input.LA(1) ) {
         case 81:
@@ -24299,22 +24299,22 @@ public final void synpred35_InternalCheck_fragment() throws RecognitionException
 
         switch (alt160) {
             case 1 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4134:4: '.'
+                // InternalCheck.g:4134:4: '.'
                 {
-                match(input,81,FOLLOW_81_in_synpred35_InternalCheck9700); if (state.failed) return ;
+                match(input,81,FOLLOW_2); if (state.failed) return ;
 
                 }
                 break;
             case 2 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4136:6: ( ( '?.' ) )
+                // InternalCheck.g:4136:6: ( ( '?.' ) )
                 {
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4136:6: ( ( '?.' ) )
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4137:1: ( '?.' )
+                // InternalCheck.g:4136:6: ( ( '?.' ) )
+                // InternalCheck.g:4137:1: ( '?.' )
                 {
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4137:1: ( '?.' )
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4138:2: '?.'
+                // InternalCheck.g:4137:1: ( '?.' )
+                // InternalCheck.g:4138:2: '?.'
                 {
-                match(input,83,FOLLOW_83_in_synpred35_InternalCheck9714); if (state.failed) return ;
+                match(input,83,FOLLOW_2); if (state.failed) return ;
 
                 }
 
@@ -24325,15 +24325,15 @@ public final void synpred35_InternalCheck_fragment() throws RecognitionException
                 }
                 break;
             case 3 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4143:6: ( ( '::' ) )
+                // InternalCheck.g:4143:6: ( ( '::' ) )
                 {
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4143:6: ( ( '::' ) )
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4144:1: ( '::' )
+                // InternalCheck.g:4143:6: ( ( '::' ) )
+                // InternalCheck.g:4144:1: ( '::' )
                 {
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4144:1: ( '::' )
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4145:2: '::'
+                // InternalCheck.g:4144:1: ( '::' )
+                // InternalCheck.g:4145:2: '::'
                 {
-                match(input,82,FOLLOW_82_in_synpred35_InternalCheck9734); if (state.failed) return ;
+                match(input,82,FOLLOW_2); if (state.failed) return ;
 
                 }
 
@@ -24356,13 +24356,13 @@ public final void synpred35_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred36_InternalCheck
     public final void synpred36_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4254:4: ( ( '(' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4255:1: ( '(' )
+        // InternalCheck.g:4254:4: ( ( '(' ) )
+        // InternalCheck.g:4255:1: ( '(' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4255:1: ( '(' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4256:2: '('
+        // InternalCheck.g:4255:1: ( '(' )
+        // InternalCheck.g:4256:2: '('
         {
-        match(input,23,FOLLOW_23_in_synpred36_InternalCheck9961); if (state.failed) return ;
+        match(input,23,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -24373,18 +24373,18 @@ public final void synpred36_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred37_InternalCheck
     public final void synpred37_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4275:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4275:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // InternalCheck.g:4275:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
+        // InternalCheck.g:4275:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4275:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4275:6: () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
+        // InternalCheck.g:4275:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // InternalCheck.g:4275:6: () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4275:6: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4276:1: 
+        // InternalCheck.g:4275:6: ()
+        // InternalCheck.g:4276:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4276:2: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
+        // InternalCheck.g:4276:2: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
         int alt162=2;
         int LA162_0 = input.LA(1);
 
@@ -24393,15 +24393,15 @@ public final void synpred37_InternalCheck_fragment() throws RecognitionException
         }
         switch (alt162) {
             case 1 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4276:3: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                // InternalCheck.g:4276:3: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
                 {
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4276:3: ( ( ruleJvmFormalParameter ) )
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4277:1: ( ruleJvmFormalParameter )
+                // InternalCheck.g:4276:3: ( ( ruleJvmFormalParameter ) )
+                // InternalCheck.g:4277:1: ( ruleJvmFormalParameter )
                 {
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4277:1: ( ruleJvmFormalParameter )
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4278:1: ruleJvmFormalParameter
+                // InternalCheck.g:4277:1: ( ruleJvmFormalParameter )
+                // InternalCheck.g:4278:1: ruleJvmFormalParameter
                 {
-                pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred37_InternalCheck10013);
+                pushFollow(FOLLOW_81);
                 ruleJvmFormalParameter();
 
                 state._fsp--;
@@ -24412,7 +24412,7 @@ public final void synpred37_InternalCheck_fragment() throws RecognitionException
 
                 }
 
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4280:2: ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                // InternalCheck.g:4280:2: ( ',' ( ( ruleJvmFormalParameter ) ) )*
                 loop161:
                 do {
                     int alt161=2;
@@ -24425,16 +24425,16 @@ public final void synpred37_InternalCheck_fragment() throws RecognitionException
 
                     switch (alt161) {
                 	case 1 :
-                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4280:4: ',' ( ( ruleJvmFormalParameter ) )
+                	    // InternalCheck.g:4280:4: ',' ( ( ruleJvmFormalParameter ) )
                 	    {
-                	    match(input,24,FOLLOW_24_in_synpred37_InternalCheck10020); if (state.failed) return ;
-                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4281:1: ( ( ruleJvmFormalParameter ) )
-                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4282:1: ( ruleJvmFormalParameter )
+                	    match(input,24,FOLLOW_27); if (state.failed) return ;
+                	    // InternalCheck.g:4281:1: ( ( ruleJvmFormalParameter ) )
+                	    // InternalCheck.g:4282:1: ( ruleJvmFormalParameter )
                 	    {
-                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4282:1: ( ruleJvmFormalParameter )
-                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4283:1: ruleJvmFormalParameter
+                	    // InternalCheck.g:4282:1: ( ruleJvmFormalParameter )
+                	    // InternalCheck.g:4283:1: ruleJvmFormalParameter
                 	    {
-                	    pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred37_InternalCheck10027);
+                	    pushFollow(FOLLOW_81);
                 	    ruleJvmFormalParameter();
 
                 	    state._fsp--;
@@ -24460,13 +24460,13 @@ public final void synpred37_InternalCheck_fragment() throws RecognitionException
 
         }
 
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4285:6: ( ( '|' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4286:1: ( '|' )
+        // InternalCheck.g:4285:6: ( ( '|' ) )
+        // InternalCheck.g:4286:1: ( '|' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4286:1: ( '|' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4287:2: '|'
+        // InternalCheck.g:4286:1: ( '|' )
+        // InternalCheck.g:4287:2: '|'
         {
-        match(input,84,FOLLOW_84_in_synpred37_InternalCheck10041); if (state.failed) return ;
+        match(input,84,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -24483,18 +24483,18 @@ public final void synpred37_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred38_InternalCheck
     public final void synpred38_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4354:4: ( ( () '[' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4354:5: ( () '[' )
+        // InternalCheck.g:4354:4: ( ( () '[' ) )
+        // InternalCheck.g:4354:5: ( () '[' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4354:5: ( () '[' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4354:6: () '['
+        // InternalCheck.g:4354:5: ( () '[' )
+        // InternalCheck.g:4354:6: () '['
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4354:6: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4355:1: 
+        // InternalCheck.g:4354:6: ()
+        // InternalCheck.g:4355:1: 
         {
         }
 
-        match(input,33,FOLLOW_33_in_synpred38_InternalCheck10161); if (state.failed) return ;
+        match(input,33,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -24505,18 +24505,18 @@ public final void synpred38_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred39_InternalCheck
     public final void synpred39_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4405:7: ( ( () '[' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4405:8: ( () '[' )
+        // InternalCheck.g:4405:7: ( ( () '[' ) )
+        // InternalCheck.g:4405:8: ( () '[' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4405:8: ( () '[' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4405:9: () '['
+        // InternalCheck.g:4405:8: ( () '[' )
+        // InternalCheck.g:4405:9: () '['
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4405:9: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4406:1: 
+        // InternalCheck.g:4405:9: ()
+        // InternalCheck.g:4406:1: 
         {
         }
 
-        match(input,33,FOLLOW_33_in_synpred39_InternalCheck10296); if (state.failed) return ;
+        match(input,33,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -24527,13 +24527,13 @@ public final void synpred39_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred41_InternalCheck
     public final void synpred41_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4697:4: ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4697:5: ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // InternalCheck.g:4697:4: ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
+        // InternalCheck.g:4697:5: ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4697:5: ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4697:6: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
+        // InternalCheck.g:4697:5: ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // InternalCheck.g:4697:6: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4697:6: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
+        // InternalCheck.g:4697:6: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
         int alt164=2;
         int LA164_0 = input.LA(1);
 
@@ -24542,15 +24542,15 @@ public final void synpred41_InternalCheck_fragment() throws RecognitionException
         }
         switch (alt164) {
             case 1 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4697:7: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                // InternalCheck.g:4697:7: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
                 {
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4697:7: ( ( ruleJvmFormalParameter ) )
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4698:1: ( ruleJvmFormalParameter )
+                // InternalCheck.g:4697:7: ( ( ruleJvmFormalParameter ) )
+                // InternalCheck.g:4698:1: ( ruleJvmFormalParameter )
                 {
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4698:1: ( ruleJvmFormalParameter )
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4699:1: ruleJvmFormalParameter
+                // InternalCheck.g:4698:1: ( ruleJvmFormalParameter )
+                // InternalCheck.g:4699:1: ruleJvmFormalParameter
                 {
-                pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred41_InternalCheck11046);
+                pushFollow(FOLLOW_81);
                 ruleJvmFormalParameter();
 
                 state._fsp--;
@@ -24561,7 +24561,7 @@ public final void synpred41_InternalCheck_fragment() throws RecognitionException
 
                 }
 
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4701:2: ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                // InternalCheck.g:4701:2: ( ',' ( ( ruleJvmFormalParameter ) ) )*
                 loop163:
                 do {
                     int alt163=2;
@@ -24574,16 +24574,16 @@ public final void synpred41_InternalCheck_fragment() throws RecognitionException
 
                     switch (alt163) {
                 	case 1 :
-                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4701:4: ',' ( ( ruleJvmFormalParameter ) )
+                	    // InternalCheck.g:4701:4: ',' ( ( ruleJvmFormalParameter ) )
                 	    {
-                	    match(input,24,FOLLOW_24_in_synpred41_InternalCheck11053); if (state.failed) return ;
-                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4702:1: ( ( ruleJvmFormalParameter ) )
-                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4703:1: ( ruleJvmFormalParameter )
+                	    match(input,24,FOLLOW_27); if (state.failed) return ;
+                	    // InternalCheck.g:4702:1: ( ( ruleJvmFormalParameter ) )
+                	    // InternalCheck.g:4703:1: ( ruleJvmFormalParameter )
                 	    {
-                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4703:1: ( ruleJvmFormalParameter )
-                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4704:1: ruleJvmFormalParameter
+                	    // InternalCheck.g:4703:1: ( ruleJvmFormalParameter )
+                	    // InternalCheck.g:4704:1: ruleJvmFormalParameter
                 	    {
-                	    pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred41_InternalCheck11060);
+                	    pushFollow(FOLLOW_81);
                 	    ruleJvmFormalParameter();
 
                 	    state._fsp--;
@@ -24609,13 +24609,13 @@ public final void synpred41_InternalCheck_fragment() throws RecognitionException
 
         }
 
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4706:6: ( ( '|' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4707:1: ( '|' )
+        // InternalCheck.g:4706:6: ( ( '|' ) )
+        // InternalCheck.g:4707:1: ( '|' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4707:1: ( '|' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:4708:2: '|'
+        // InternalCheck.g:4707:1: ( '|' )
+        // InternalCheck.g:4708:2: '|'
         {
-        match(input,84,FOLLOW_84_in_synpred41_InternalCheck11074); if (state.failed) return ;
+        match(input,84,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -24632,10 +24632,10 @@ public final void synpred41_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred43_InternalCheck
     public final void synpred43_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5067:4: ( 'else' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5067:6: 'else'
+        // InternalCheck.g:5067:4: ( 'else' )
+        // InternalCheck.g:5067:6: 'else'
         {
-        match(input,86,FOLLOW_86_in_synpred43_InternalCheck11857); if (state.failed) return ;
+        match(input,86,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -24643,20 +24643,20 @@ public final void synpred43_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred44_InternalCheck
     public final void synpred44_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5121:4: ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5121:5: ( '(' ( ( ruleJvmFormalParameter ) ) ':' )
+        // InternalCheck.g:5121:4: ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )
+        // InternalCheck.g:5121:5: ( '(' ( ( ruleJvmFormalParameter ) ) ':' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5121:5: ( '(' ( ( ruleJvmFormalParameter ) ) ':' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5121:7: '(' ( ( ruleJvmFormalParameter ) ) ':'
+        // InternalCheck.g:5121:5: ( '(' ( ( ruleJvmFormalParameter ) ) ':' )
+        // InternalCheck.g:5121:7: '(' ( ( ruleJvmFormalParameter ) ) ':'
         {
-        match(input,23,FOLLOW_23_in_synpred44_InternalCheck11996); if (state.failed) return ;
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5122:1: ( ( ruleJvmFormalParameter ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5123:1: ( ruleJvmFormalParameter )
+        match(input,23,FOLLOW_27); if (state.failed) return ;
+        // InternalCheck.g:5122:1: ( ( ruleJvmFormalParameter ) )
+        // InternalCheck.g:5123:1: ( ruleJvmFormalParameter )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5123:1: ( ruleJvmFormalParameter )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5124:1: ruleJvmFormalParameter
+        // InternalCheck.g:5123:1: ( ruleJvmFormalParameter )
+        // InternalCheck.g:5124:1: ruleJvmFormalParameter
         {
-        pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred44_InternalCheck12003);
+        pushFollow(FOLLOW_87);
         ruleJvmFormalParameter();
 
         state._fsp--;
@@ -24667,7 +24667,7 @@ public final void synpred44_InternalCheck_fragment() throws RecognitionException
 
         }
 
-        match(input,88,FOLLOW_88_in_synpred44_InternalCheck12009); if (state.failed) return ;
+        match(input,88,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -24678,19 +24678,19 @@ public final void synpred44_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred45_InternalCheck
     public final void synpred45_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5176:8: ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5176:9: ( ( ( ruleJvmFormalParameter ) ) ':' )
+        // InternalCheck.g:5176:8: ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )
+        // InternalCheck.g:5176:9: ( ( ( ruleJvmFormalParameter ) ) ':' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5176:9: ( ( ( ruleJvmFormalParameter ) ) ':' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5176:10: ( ( ruleJvmFormalParameter ) ) ':'
+        // InternalCheck.g:5176:9: ( ( ( ruleJvmFormalParameter ) ) ':' )
+        // InternalCheck.g:5176:10: ( ( ruleJvmFormalParameter ) ) ':'
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5176:10: ( ( ruleJvmFormalParameter ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5177:1: ( ruleJvmFormalParameter )
+        // InternalCheck.g:5176:10: ( ( ruleJvmFormalParameter ) )
+        // InternalCheck.g:5177:1: ( ruleJvmFormalParameter )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5177:1: ( ruleJvmFormalParameter )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5178:1: ruleJvmFormalParameter
+        // InternalCheck.g:5177:1: ( ruleJvmFormalParameter )
+        // InternalCheck.g:5178:1: ruleJvmFormalParameter
         {
-        pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred45_InternalCheck12111);
+        pushFollow(FOLLOW_87);
         ruleJvmFormalParameter();
 
         state._fsp--;
@@ -24701,7 +24701,7 @@ public final void synpred45_InternalCheck_fragment() throws RecognitionException
 
         }
 
-        match(input,88,FOLLOW_88_in_synpred45_InternalCheck12117); if (state.failed) return ;
+        match(input,88,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -24712,19 +24712,19 @@ public final void synpred45_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred47_InternalCheck
     public final void synpred47_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5944:4: ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5944:5: ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) )
+        // InternalCheck.g:5944:4: ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )
+        // InternalCheck.g:5944:5: ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5944:5: ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5944:6: ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) )
+        // InternalCheck.g:5944:5: ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) )
+        // InternalCheck.g:5944:6: ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5944:6: ( ( ruleJvmTypeReference ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5945:1: ( ruleJvmTypeReference )
+        // InternalCheck.g:5944:6: ( ( ruleJvmTypeReference ) )
+        // InternalCheck.g:5945:1: ( ruleJvmTypeReference )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5945:1: ( ruleJvmTypeReference )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5946:1: ruleJvmTypeReference
+        // InternalCheck.g:5945:1: ( ruleJvmTypeReference )
+        // InternalCheck.g:5946:1: ruleJvmTypeReference
         {
-        pushFollow(FOLLOW_ruleJvmTypeReference_in_synpred47_InternalCheck13745);
+        pushFollow(FOLLOW_3);
         ruleJvmTypeReference();
 
         state._fsp--;
@@ -24735,13 +24735,13 @@ public final void synpred47_InternalCheck_fragment() throws RecognitionException
 
         }
 
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5948:2: ( ( ruleValidID ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5949:1: ( ruleValidID )
+        // InternalCheck.g:5948:2: ( ( ruleValidID ) )
+        // InternalCheck.g:5949:1: ( ruleValidID )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5949:1: ( ruleValidID )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:5950:1: ruleValidID
+        // InternalCheck.g:5949:1: ( ruleValidID )
+        // InternalCheck.g:5950:1: ruleValidID
         {
-        pushFollow(FOLLOW_ruleValidID_in_synpred47_InternalCheck13754);
+        pushFollow(FOLLOW_2);
         ruleValidID();
 
         state._fsp--;
@@ -24762,13 +24762,13 @@ public final void synpred47_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred48_InternalCheck
     public final void synpred48_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6233:4: ( ( '(' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6234:1: ( '(' )
+        // InternalCheck.g:6233:4: ( ( '(' ) )
+        // InternalCheck.g:6234:1: ( '(' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6234:1: ( '(' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6235:2: '('
+        // InternalCheck.g:6234:1: ( '(' )
+        // InternalCheck.g:6235:2: '('
         {
-        match(input,23,FOLLOW_23_in_synpred48_InternalCheck14292); if (state.failed) return ;
+        match(input,23,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -24779,18 +24779,18 @@ public final void synpred48_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred49_InternalCheck
     public final void synpred49_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6254:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6254:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // InternalCheck.g:6254:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
+        // InternalCheck.g:6254:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6254:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6254:6: () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
+        // InternalCheck.g:6254:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // InternalCheck.g:6254:6: () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6254:6: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6255:1: 
+        // InternalCheck.g:6254:6: ()
+        // InternalCheck.g:6255:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6255:2: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
+        // InternalCheck.g:6255:2: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
         int alt168=2;
         int LA168_0 = input.LA(1);
 
@@ -24799,15 +24799,15 @@ public final void synpred49_InternalCheck_fragment() throws RecognitionException
         }
         switch (alt168) {
             case 1 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6255:3: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                // InternalCheck.g:6255:3: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
                 {
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6255:3: ( ( ruleJvmFormalParameter ) )
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6256:1: ( ruleJvmFormalParameter )
+                // InternalCheck.g:6255:3: ( ( ruleJvmFormalParameter ) )
+                // InternalCheck.g:6256:1: ( ruleJvmFormalParameter )
                 {
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6256:1: ( ruleJvmFormalParameter )
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6257:1: ruleJvmFormalParameter
+                // InternalCheck.g:6256:1: ( ruleJvmFormalParameter )
+                // InternalCheck.g:6257:1: ruleJvmFormalParameter
                 {
-                pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred49_InternalCheck14344);
+                pushFollow(FOLLOW_81);
                 ruleJvmFormalParameter();
 
                 state._fsp--;
@@ -24818,7 +24818,7 @@ public final void synpred49_InternalCheck_fragment() throws RecognitionException
 
                 }
 
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6259:2: ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                // InternalCheck.g:6259:2: ( ',' ( ( ruleJvmFormalParameter ) ) )*
                 loop167:
                 do {
                     int alt167=2;
@@ -24831,16 +24831,16 @@ public final void synpred49_InternalCheck_fragment() throws RecognitionException
 
                     switch (alt167) {
                 	case 1 :
-                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6259:4: ',' ( ( ruleJvmFormalParameter ) )
+                	    // InternalCheck.g:6259:4: ',' ( ( ruleJvmFormalParameter ) )
                 	    {
-                	    match(input,24,FOLLOW_24_in_synpred49_InternalCheck14351); if (state.failed) return ;
-                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6260:1: ( ( ruleJvmFormalParameter ) )
-                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6261:1: ( ruleJvmFormalParameter )
+                	    match(input,24,FOLLOW_27); if (state.failed) return ;
+                	    // InternalCheck.g:6260:1: ( ( ruleJvmFormalParameter ) )
+                	    // InternalCheck.g:6261:1: ( ruleJvmFormalParameter )
                 	    {
-                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6261:1: ( ruleJvmFormalParameter )
-                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6262:1: ruleJvmFormalParameter
+                	    // InternalCheck.g:6261:1: ( ruleJvmFormalParameter )
+                	    // InternalCheck.g:6262:1: ruleJvmFormalParameter
                 	    {
-                	    pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred49_InternalCheck14358);
+                	    pushFollow(FOLLOW_81);
                 	    ruleJvmFormalParameter();
 
                 	    state._fsp--;
@@ -24866,13 +24866,13 @@ public final void synpred49_InternalCheck_fragment() throws RecognitionException
 
         }
 
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6264:6: ( ( '|' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6265:1: ( '|' )
+        // InternalCheck.g:6264:6: ( ( '|' ) )
+        // InternalCheck.g:6265:1: ( '|' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6265:1: ( '|' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6266:2: '|'
+        // InternalCheck.g:6265:1: ( '|' )
+        // InternalCheck.g:6266:2: '|'
         {
-        match(input,84,FOLLOW_84_in_synpred49_InternalCheck14372); if (state.failed) return ;
+        match(input,84,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -24889,18 +24889,18 @@ public final void synpred49_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred50_InternalCheck
     public final void synpred50_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6333:4: ( ( () '[' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6333:5: ( () '[' )
+        // InternalCheck.g:6333:4: ( ( () '[' ) )
+        // InternalCheck.g:6333:5: ( () '[' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6333:5: ( () '[' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6333:6: () '['
+        // InternalCheck.g:6333:5: ( () '[' )
+        // InternalCheck.g:6333:6: () '['
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6333:6: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6334:1: 
+        // InternalCheck.g:6333:6: ()
+        // InternalCheck.g:6334:1: 
         {
         }
 
-        match(input,33,FOLLOW_33_in_synpred50_InternalCheck14492); if (state.failed) return ;
+        match(input,33,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -24911,10 +24911,10 @@ public final void synpred50_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred51_InternalCheck
     public final void synpred51_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6438:4: ( '<' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6438:6: '<'
+        // InternalCheck.g:6438:4: ( '<' )
+        // InternalCheck.g:6438:6: '<'
         {
-        match(input,56,FOLLOW_56_in_synpred51_InternalCheck14761); if (state.failed) return ;
+        match(input,56,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -24922,13 +24922,13 @@ public final void synpred51_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred52_InternalCheck
     public final void synpred52_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6487:5: ( ( '(' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6488:1: ( '(' )
+        // InternalCheck.g:6487:5: ( ( '(' ) )
+        // InternalCheck.g:6488:1: ( '(' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6488:1: ( '(' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6489:2: '('
+        // InternalCheck.g:6488:1: ( '(' )
+        // InternalCheck.g:6489:2: '('
         {
-        match(input,23,FOLLOW_23_in_synpred52_InternalCheck14857); if (state.failed) return ;
+        match(input,23,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -24939,18 +24939,18 @@ public final void synpred52_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred53_InternalCheck
     public final void synpred53_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6508:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6508:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // InternalCheck.g:6508:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
+        // InternalCheck.g:6508:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6508:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6508:6: () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
+        // InternalCheck.g:6508:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // InternalCheck.g:6508:6: () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6508:6: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6509:1: 
+        // InternalCheck.g:6508:6: ()
+        // InternalCheck.g:6509:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6509:2: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
+        // InternalCheck.g:6509:2: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
         int alt170=2;
         int LA170_0 = input.LA(1);
 
@@ -24959,15 +24959,15 @@ public final void synpred53_InternalCheck_fragment() throws RecognitionException
         }
         switch (alt170) {
             case 1 :
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6509:3: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                // InternalCheck.g:6509:3: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
                 {
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6509:3: ( ( ruleJvmFormalParameter ) )
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6510:1: ( ruleJvmFormalParameter )
+                // InternalCheck.g:6509:3: ( ( ruleJvmFormalParameter ) )
+                // InternalCheck.g:6510:1: ( ruleJvmFormalParameter )
                 {
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6510:1: ( ruleJvmFormalParameter )
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6511:1: ruleJvmFormalParameter
+                // InternalCheck.g:6510:1: ( ruleJvmFormalParameter )
+                // InternalCheck.g:6511:1: ruleJvmFormalParameter
                 {
-                pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred53_InternalCheck14909);
+                pushFollow(FOLLOW_81);
                 ruleJvmFormalParameter();
 
                 state._fsp--;
@@ -24978,7 +24978,7 @@ public final void synpred53_InternalCheck_fragment() throws RecognitionException
 
                 }
 
-                // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6513:2: ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                // InternalCheck.g:6513:2: ( ',' ( ( ruleJvmFormalParameter ) ) )*
                 loop169:
                 do {
                     int alt169=2;
@@ -24991,16 +24991,16 @@ public final void synpred53_InternalCheck_fragment() throws RecognitionException
 
                     switch (alt169) {
                 	case 1 :
-                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6513:4: ',' ( ( ruleJvmFormalParameter ) )
+                	    // InternalCheck.g:6513:4: ',' ( ( ruleJvmFormalParameter ) )
                 	    {
-                	    match(input,24,FOLLOW_24_in_synpred53_InternalCheck14916); if (state.failed) return ;
-                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6514:1: ( ( ruleJvmFormalParameter ) )
-                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6515:1: ( ruleJvmFormalParameter )
+                	    match(input,24,FOLLOW_27); if (state.failed) return ;
+                	    // InternalCheck.g:6514:1: ( ( ruleJvmFormalParameter ) )
+                	    // InternalCheck.g:6515:1: ( ruleJvmFormalParameter )
                 	    {
-                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6515:1: ( ruleJvmFormalParameter )
-                	    // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6516:1: ruleJvmFormalParameter
+                	    // InternalCheck.g:6515:1: ( ruleJvmFormalParameter )
+                	    // InternalCheck.g:6516:1: ruleJvmFormalParameter
                 	    {
-                	    pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred53_InternalCheck14923);
+                	    pushFollow(FOLLOW_81);
                 	    ruleJvmFormalParameter();
 
                 	    state._fsp--;
@@ -25026,13 +25026,13 @@ public final void synpred53_InternalCheck_fragment() throws RecognitionException
 
         }
 
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6518:6: ( ( '|' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6519:1: ( '|' )
+        // InternalCheck.g:6518:6: ( ( '|' ) )
+        // InternalCheck.g:6519:1: ( '|' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6519:1: ( '|' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6520:2: '|'
+        // InternalCheck.g:6519:1: ( '|' )
+        // InternalCheck.g:6520:2: '|'
         {
-        match(input,84,FOLLOW_84_in_synpred53_InternalCheck14937); if (state.failed) return ;
+        match(input,84,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -25049,18 +25049,18 @@ public final void synpred53_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred54_InternalCheck
     public final void synpred54_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6587:4: ( ( () '[' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6587:5: ( () '[' )
+        // InternalCheck.g:6587:4: ( ( () '[' ) )
+        // InternalCheck.g:6587:5: ( () '[' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6587:5: ( () '[' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6587:6: () '['
+        // InternalCheck.g:6587:5: ( () '[' )
+        // InternalCheck.g:6587:6: () '['
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6587:6: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6588:1: 
+        // InternalCheck.g:6587:6: ()
+        // InternalCheck.g:6588:1: 
         {
         }
 
-        match(input,33,FOLLOW_33_in_synpred54_InternalCheck15057); if (state.failed) return ;
+        match(input,33,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -25071,8 +25071,8 @@ public final void synpred54_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred55_InternalCheck
     public final void synpred55_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:6927:2: ( 'extends' | 'static' | 'import' | 'extension' | 'catalog' | 'grammar' | 'with' | 'category' | 'message' | 'on' | 'bind' | 'data' | 'SeverityRange' | 'error' | 'warning' | 'info' | 'ignore' | 'live' | 'onSave' | 'onDemand' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | 'guard' | 'issue' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:
+        // InternalCheck.g:6927:2: ( 'extends' | 'static' | 'import' | 'extension' | 'catalog' | 'grammar' | 'with' | 'category' | 'message' | 'on' | 'bind' | 'data' | 'SeverityRange' | 'error' | 'warning' | 'info' | 'ignore' | 'live' | 'onSave' | 'onDemand' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | 'guard' | 'issue' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )
+        // InternalCheck.g:
         {
         if ( (input.LA(1)>=RULE_STRING && input.LA(1)<=RULE_ID)||(input.LA(1)>=15 && input.LA(1)<=18)||input.LA(1)==20||(input.LA(1)>=22 && input.LA(1)<=23)||input.LA(1)==26||input.LA(1)==28||(input.LA(1)>=32 && input.LA(1)<=33)||(input.LA(1)>=35 && input.LA(1)<=50)||input.LA(1)==56||(input.LA(1)>=71 && input.LA(1)<=72)||input.LA(1)==77||input.LA(1)==85||input.LA(1)==87||(input.LA(1)>=91 && input.LA(1)<=92)||(input.LA(1)>=95 && input.LA(1)<=103)||input.LA(1)==105 ) {
             input.consume();
@@ -25091,10 +25091,10 @@ public final void synpred55_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred56_InternalCheck
     public final void synpred56_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7039:5: ( 'catch' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7039:7: 'catch'
+        // InternalCheck.g:7039:5: ( 'catch' )
+        // InternalCheck.g:7039:7: 'catch'
         {
-        match(input,106,FOLLOW_106_in_synpred56_InternalCheck16356); if (state.failed) return ;
+        match(input,106,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -25102,10 +25102,10 @@ public final void synpred56_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred57_InternalCheck
     public final void synpred57_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7058:5: ( 'finally' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7058:7: 'finally'
+        // InternalCheck.g:7058:5: ( 'finally' )
+        // InternalCheck.g:7058:7: 'finally'
         {
-        match(input,104,FOLLOW_104_in_synpred57_InternalCheck16386); if (state.failed) return ;
+        match(input,104,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -25113,10 +25113,10 @@ public final void synpred57_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred60_InternalCheck
     public final void synpred60_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7284:3: ( '.' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7285:2: '.'
+        // InternalCheck.g:7284:3: ( '.' )
+        // InternalCheck.g:7285:2: '.'
         {
-        match(input,81,FOLLOW_81_in_synpred60_InternalCheck16911); if (state.failed) return ;
+        match(input,81,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -25124,18 +25124,18 @@ public final void synpred60_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred61_InternalCheck
     public final void synpred61_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7410:2: ( ( () ruleArrayBrackets ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7410:3: ( () ruleArrayBrackets )
+        // InternalCheck.g:7410:2: ( ( () ruleArrayBrackets ) )
+        // InternalCheck.g:7410:3: ( () ruleArrayBrackets )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7410:3: ( () ruleArrayBrackets )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7410:4: () ruleArrayBrackets
+        // InternalCheck.g:7410:3: ( () ruleArrayBrackets )
+        // InternalCheck.g:7410:4: () ruleArrayBrackets
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7410:4: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7411:1: 
+        // InternalCheck.g:7410:4: ()
+        // InternalCheck.g:7411:1: 
         {
         }
 
-        pushFollow(FOLLOW_ruleArrayBrackets_in_synpred61_InternalCheck17296);
+        pushFollow(FOLLOW_2);
         ruleArrayBrackets();
 
         state._fsp--;
@@ -25150,10 +25150,10 @@ public final void synpred61_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred62_InternalCheck
     public final void synpred62_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7595:4: ( '<' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7595:6: '<'
+        // InternalCheck.g:7595:4: ( '<' )
+        // InternalCheck.g:7595:6: '<'
         {
-        match(input,56,FOLLOW_56_in_synpred62_InternalCheck17748); if (state.failed) return ;
+        match(input,56,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -25161,18 +25161,18 @@ public final void synpred62_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred63_InternalCheck
     public final void synpred63_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7644:3: ( ( () '.' ) )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7644:4: ( () '.' )
+        // InternalCheck.g:7644:3: ( ( () '.' ) )
+        // InternalCheck.g:7644:4: ( () '.' )
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7644:4: ( () '.' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7644:5: () '.'
+        // InternalCheck.g:7644:4: ( () '.' )
+        // InternalCheck.g:7644:5: () '.'
         {
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7644:5: ()
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7645:1: 
+        // InternalCheck.g:7644:5: ()
+        // InternalCheck.g:7645:1: 
         {
         }
 
-        match(input,81,FOLLOW_81_in_synpred63_InternalCheck17843); if (state.failed) return ;
+        match(input,81,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -25183,10 +25183,10 @@ public final void synpred63_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred64_InternalCheck
     public final void synpred64_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7671:4: ( '<' )
-        // ../com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalCheck.g:7671:6: '<'
+        // InternalCheck.g:7671:4: ( '<' )
+        // InternalCheck.g:7671:6: '<'
         {
-        match(input,56,FOLLOW_56_in_synpred64_InternalCheck17900); if (state.failed) return ;
+        match(input,56,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -26022,19 +26022,13 @@ public final boolean synpred14_InternalCheck() {
     protected DFA134 dfa134 = new DFA134(this);
     protected DFA152 dfa152 = new DFA152(this);
     protected DFA150 dfa150 = new DFA150(this);
-    static final String DFA5_eotS =
-        "\6\uffff";
-    static final String DFA5_eofS =
-        "\1\uffff\1\3\2\uffff\1\3\1\uffff";
-    static final String DFA5_minS =
-        "\1\10\1\16\1\10\1\uffff\1\16\1\uffff";
-    static final String DFA5_maxS =
-        "\1\10\1\121\1\111\1\uffff\1\121\1\uffff";
-    static final String DFA5_acceptS =
-        "\3\uffff\1\1\1\uffff\1\2";
-    static final String DFA5_specialS =
-        "\6\uffff}>";
-    static final String[] DFA5_transitionS = {
+    static final String dfa_1s = "\6\uffff";
+    static final String dfa_2s = "\1\uffff\1\3\2\uffff\1\3\1\uffff";
+    static final String dfa_3s = "\1\10\1\16\1\10\1\uffff\1\16\1\uffff";
+    static final String dfa_4s = "\1\10\1\121\1\111\1\uffff\1\121\1\uffff";
+    static final String dfa_5s = "\3\uffff\1\1\1\uffff\1\2";
+    static final String dfa_6s = "\6\uffff}>";
+    static final String[] dfa_7s = {
             "\1\1",
             "\2\3\4\uffff\2\3\73\uffff\1\2",
             "\1\4\100\uffff\1\5",
@@ -26043,54 +26037,39 @@ public final boolean synpred14_InternalCheck() {
             ""
     };
 
-    static final short[] DFA5_eot = DFA.unpackEncodedString(DFA5_eotS);
-    static final short[] DFA5_eof = DFA.unpackEncodedString(DFA5_eofS);
-    static final char[] DFA5_min = DFA.unpackEncodedStringToUnsignedChars(DFA5_minS);
-    static final char[] DFA5_max = DFA.unpackEncodedStringToUnsignedChars(DFA5_maxS);
-    static final short[] DFA5_accept = DFA.unpackEncodedString(DFA5_acceptS);
-    static final short[] DFA5_special = DFA.unpackEncodedString(DFA5_specialS);
-    static final short[][] DFA5_transition;
-
-    static {
-        int numStates = DFA5_transitionS.length;
-        DFA5_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA5_transition[i] = DFA.unpackEncodedString(DFA5_transitionS[i]);
-        }
-    }
+    static final short[] dfa_1 = DFA.unpackEncodedString(dfa_1s);
+    static final short[] dfa_2 = DFA.unpackEncodedString(dfa_2s);
+    static final char[] dfa_3 = DFA.unpackEncodedStringToUnsignedChars(dfa_3s);
+    static final char[] dfa_4 = DFA.unpackEncodedStringToUnsignedChars(dfa_4s);
+    static final short[] dfa_5 = DFA.unpackEncodedString(dfa_5s);
+    static final short[] dfa_6 = DFA.unpackEncodedString(dfa_6s);
+    static final short[][] dfa_7 = unpackEncodedStringArray(dfa_7s);
 
     class DFA5 extends DFA {
 
         public DFA5(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 5;
-            this.eot = DFA5_eot;
-            this.eof = DFA5_eof;
-            this.min = DFA5_min;
-            this.max = DFA5_max;
-            this.accept = DFA5_accept;
-            this.special = DFA5_special;
-            this.transition = DFA5_transition;
+            this.eot = dfa_1;
+            this.eof = dfa_2;
+            this.min = dfa_3;
+            this.max = dfa_4;
+            this.accept = dfa_5;
+            this.special = dfa_6;
+            this.transition = dfa_7;
         }
         public String getDescription() {
             return "340:1: ( ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_2_0= ruleQualifiedNameWithWildcard ) ) )";
         }
     }
-    static final String DFA15_eotS =
-        "\25\uffff";
-    static final String DFA15_eofS =
-        "\1\2\24\uffff";
-    static final String DFA15_minS =
-        "\1\10\1\0\23\uffff";
-    static final String DFA15_maxS =
-        "\1\104\1\0\23\uffff";
-    static final String DFA15_acceptS =
-        "\2\uffff\1\2\21\uffff\1\1";
-    static final String DFA15_specialS =
-        "\1\uffff\1\0\23\uffff}>";
-    static final String[] DFA15_transitionS = {
-            "\1\2\5\uffff\1\2\1\uffff\1\2\1\uffff\2\2\2\uffff\1\2\1\1\2"+
-            "\uffff\2\2\2\uffff\1\2\15\uffff\7\2\21\uffff\1\2",
+    static final String dfa_8s = "\25\uffff";
+    static final String dfa_9s = "\1\2\24\uffff";
+    static final String dfa_10s = "\1\10\1\0\23\uffff";
+    static final String dfa_11s = "\1\104\1\0\23\uffff";
+    static final String dfa_12s = "\2\uffff\1\2\21\uffff\1\1";
+    static final String dfa_13s = "\1\uffff\1\0\23\uffff}>";
+    static final String[] dfa_14s = {
+            "\1\2\5\uffff\1\2\1\uffff\1\2\1\uffff\2\2\2\uffff\1\2\1\1\2\uffff\2\2\2\uffff\1\2\15\uffff\7\2\21\uffff\1\2",
             "\1\uffff",
             "",
             "",
@@ -26113,34 +26092,26 @@ public String getDescription() {
             ""
     };
 
-    static final short[] DFA15_eot = DFA.unpackEncodedString(DFA15_eotS);
-    static final short[] DFA15_eof = DFA.unpackEncodedString(DFA15_eofS);
-    static final char[] DFA15_min = DFA.unpackEncodedStringToUnsignedChars(DFA15_minS);
-    static final char[] DFA15_max = DFA.unpackEncodedStringToUnsignedChars(DFA15_maxS);
-    static final short[] DFA15_accept = DFA.unpackEncodedString(DFA15_acceptS);
-    static final short[] DFA15_special = DFA.unpackEncodedString(DFA15_specialS);
-    static final short[][] DFA15_transition;
-
-    static {
-        int numStates = DFA15_transitionS.length;
-        DFA15_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA15_transition[i] = DFA.unpackEncodedString(DFA15_transitionS[i]);
-        }
-    }
+    static final short[] dfa_8 = DFA.unpackEncodedString(dfa_8s);
+    static final short[] dfa_9 = DFA.unpackEncodedString(dfa_9s);
+    static final char[] dfa_10 = DFA.unpackEncodedStringToUnsignedChars(dfa_10s);
+    static final char[] dfa_11 = DFA.unpackEncodedStringToUnsignedChars(dfa_11s);
+    static final short[] dfa_12 = DFA.unpackEncodedString(dfa_12s);
+    static final short[] dfa_13 = DFA.unpackEncodedString(dfa_13s);
+    static final short[][] dfa_14 = unpackEncodedStringArray(dfa_14s);
 
     class DFA15 extends DFA {
 
         public DFA15(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 15;
-            this.eot = DFA15_eot;
-            this.eof = DFA15_eof;
-            this.min = DFA15_min;
-            this.max = DFA15_max;
-            this.accept = DFA15_accept;
-            this.special = DFA15_special;
-            this.transition = DFA15_transition;
+            this.eot = dfa_8;
+            this.eof = dfa_9;
+            this.min = dfa_10;
+            this.max = dfa_11;
+            this.accept = dfa_12;
+            this.special = dfa_13;
+            this.transition = dfa_14;
         }
         public String getDescription() {
             return "595:2: ( ( ( '(' )=>otherlv_6= '(' ) ( ( (lv_formalParameters_7_0= ruleFormalParameter ) ) (otherlv_8= ',' ( (lv_formalParameters_9_0= ruleFormalParameter ) ) )* )? otherlv_10= ')' )?";
@@ -26172,21 +26143,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA33_eotS =
-        "\140\uffff";
-    static final String DFA33_eofS =
-        "\1\2\137\uffff";
-    static final String DFA33_minS =
-        "\1\4\1\0\136\uffff";
-    static final String DFA33_maxS =
-        "\1\152\1\0\136\uffff";
-    static final String DFA33_acceptS =
-        "\2\uffff\1\2\134\uffff\1\1";
-    static final String DFA33_specialS =
-        "\1\uffff\1\0\136\uffff}>";
-    static final String[] DFA33_transitionS = {
-            "\5\2\6\uffff\14\2\1\uffff\2\2\2\uffff\5\2\1\1\56\2\1\uffff"+
-            "\26\2",
+    static final String dfa_15s = "\140\uffff";
+    static final String dfa_16s = "\1\2\137\uffff";
+    static final String dfa_17s = "\1\4\1\0\136\uffff";
+    static final String dfa_18s = "\1\152\1\0\136\uffff";
+    static final String dfa_19s = "\2\uffff\1\2\134\uffff\1\1";
+    static final String dfa_20s = "\1\uffff\1\0\136\uffff}>";
+    static final String[] dfa_21s = {
+            "\5\2\6\uffff\14\2\1\uffff\2\2\2\uffff\5\2\1\1\56\2\1\uffff\26\2",
             "\1\uffff",
             "",
             "",
@@ -26284,34 +26248,26 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA33_eot = DFA.unpackEncodedString(DFA33_eotS);
-    static final short[] DFA33_eof = DFA.unpackEncodedString(DFA33_eofS);
-    static final char[] DFA33_min = DFA.unpackEncodedStringToUnsignedChars(DFA33_minS);
-    static final char[] DFA33_max = DFA.unpackEncodedStringToUnsignedChars(DFA33_maxS);
-    static final short[] DFA33_accept = DFA.unpackEncodedString(DFA33_acceptS);
-    static final short[] DFA33_special = DFA.unpackEncodedString(DFA33_specialS);
-    static final short[][] DFA33_transition;
-
-    static {
-        int numStates = DFA33_transitionS.length;
-        DFA33_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA33_transition[i] = DFA.unpackEncodedString(DFA33_transitionS[i]);
-        }
-    }
+    static final short[] dfa_15 = DFA.unpackEncodedString(dfa_15s);
+    static final short[] dfa_16 = DFA.unpackEncodedString(dfa_16s);
+    static final char[] dfa_17 = DFA.unpackEncodedStringToUnsignedChars(dfa_17s);
+    static final char[] dfa_18 = DFA.unpackEncodedStringToUnsignedChars(dfa_18s);
+    static final short[] dfa_19 = DFA.unpackEncodedString(dfa_19s);
+    static final short[] dfa_20 = DFA.unpackEncodedString(dfa_20s);
+    static final short[][] dfa_21 = unpackEncodedStringArray(dfa_21s);
 
     class DFA33 extends DFA {
 
         public DFA33(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 33;
-            this.eot = DFA33_eot;
-            this.eof = DFA33_eof;
-            this.min = DFA33_min;
-            this.max = DFA33_max;
-            this.accept = DFA33_accept;
-            this.special = DFA33_special;
-            this.transition = DFA33_transition;
+            this.eot = dfa_15;
+            this.eof = dfa_16;
+            this.min = dfa_17;
+            this.max = dfa_18;
+            this.accept = dfa_19;
+            this.special = dfa_20;
+            this.transition = dfa_21;
         }
         public String getDescription() {
             return "1508:3: ( ( ( 'on' )=>otherlv_3= 'on' ) ( ( ( ( '#' )=>otherlv_4= '#' ) ( ( ruleValidID ) ) ) | ( ( (lv_markerObject_6_0= ruleXExpression ) ) ( ( ( '#' )=>otherlv_7= '#' ) ( ( ruleFeatureCallID ) ) )? ) ) ( ( ( '[' )=>otherlv_9= '[' ) ( (lv_markerIndex_10_0= ruleXExpression ) ) otherlv_11= ']' )? )?";
@@ -26343,24 +26299,13 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA40_eotS =
-        "\62\uffff";
-    static final String DFA40_eofS =
-        "\62\uffff";
-    static final String DFA40_minS =
-        "\1\4\46\uffff\1\0\12\uffff";
-    static final String DFA40_maxS =
-        "\1\151\46\uffff\1\0\12\uffff";
-    static final String DFA40_acceptS =
-        "\1\uffff\1\1\1\2\1\3\1\4\1\5\26\uffff\1\6\11\uffff\1\7\1\uffff"+
-        "\1\12\1\13\1\14\1\15\1\16\1\17\1\20\1\21\1\10\1\11";
-    static final String DFA40_specialS =
-        "\1\0\46\uffff\1\1\12\uffff}>";
-    static final String[] DFA40_transitionS = {
-            "\4\34\1\5\6\uffff\1\5\1\47\1\5\1\2\1\uffff\1\5\1\uffff\1\5"+
-            "\1\55\2\uffff\1\5\1\uffff\1\5\3\uffff\2\34\1\uffff\1\56\1\57"+
-            "\16\5\5\uffff\1\5\34\uffff\1\46\1\uffff\1\3\3\uffff\1\50\1\51"+
-            "\2\uffff\1\5\1\1\4\34\1\52\1\53\1\54\1\uffff\1\4",
+    static final String dfa_22s = "\62\uffff";
+    static final String dfa_23s = "\1\4\46\uffff\1\0\12\uffff";
+    static final String dfa_24s = "\1\151\46\uffff\1\0\12\uffff";
+    static final String dfa_25s = "\1\uffff\1\1\1\2\1\3\1\4\1\5\26\uffff\1\6\11\uffff\1\7\1\uffff\1\12\1\13\1\14\1\15\1\16\1\17\1\20\1\21\1\10\1\11";
+    static final String dfa_26s = "\1\0\46\uffff\1\1\12\uffff}>";
+    static final String[] dfa_27s = {
+            "\4\34\1\5\6\uffff\1\5\1\47\1\5\1\2\1\uffff\1\5\1\uffff\1\5\1\55\2\uffff\1\5\1\uffff\1\5\3\uffff\2\34\1\uffff\1\56\1\57\16\5\5\uffff\1\5\34\uffff\1\46\1\uffff\1\3\3\uffff\1\50\1\51\2\uffff\1\5\1\1\4\34\1\52\1\53\1\54\1\uffff\1\4",
             "",
             "",
             "",
@@ -26412,34 +26357,25 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA40_eot = DFA.unpackEncodedString(DFA40_eotS);
-    static final short[] DFA40_eof = DFA.unpackEncodedString(DFA40_eofS);
-    static final char[] DFA40_min = DFA.unpackEncodedStringToUnsignedChars(DFA40_minS);
-    static final char[] DFA40_max = DFA.unpackEncodedStringToUnsignedChars(DFA40_maxS);
-    static final short[] DFA40_accept = DFA.unpackEncodedString(DFA40_acceptS);
-    static final short[] DFA40_special = DFA.unpackEncodedString(DFA40_specialS);
-    static final short[][] DFA40_transition;
-
-    static {
-        int numStates = DFA40_transitionS.length;
-        DFA40_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA40_transition[i] = DFA.unpackEncodedString(DFA40_transitionS[i]);
-        }
-    }
+    static final short[] dfa_22 = DFA.unpackEncodedString(dfa_22s);
+    static final char[] dfa_23 = DFA.unpackEncodedStringToUnsignedChars(dfa_23s);
+    static final char[] dfa_24 = DFA.unpackEncodedStringToUnsignedChars(dfa_24s);
+    static final short[] dfa_25 = DFA.unpackEncodedString(dfa_25s);
+    static final short[] dfa_26 = DFA.unpackEncodedString(dfa_26s);
+    static final short[][] dfa_27 = unpackEncodedStringArray(dfa_27s);
 
     class DFA40 extends DFA {
 
         public DFA40(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 40;
-            this.eot = DFA40_eot;
-            this.eof = DFA40_eof;
-            this.min = DFA40_min;
-            this.max = DFA40_max;
-            this.accept = DFA40_accept;
-            this.special = DFA40_special;
-            this.transition = DFA40_transition;
+            this.eot = dfa_22;
+            this.eof = dfa_22;
+            this.min = dfa_23;
+            this.max = dfa_24;
+            this.accept = dfa_25;
+            this.special = dfa_26;
+            this.transition = dfa_27;
         }
         public String getDescription() {
             return "1769:1: (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression | this_XGuardExpression_15= ruleXGuardExpression | this_XIssueExpression_16= ruleXIssueExpression )";
@@ -26514,19 +26450,13 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA44_eotS =
-        "\12\uffff";
-    static final String DFA44_eofS =
-        "\1\2\11\uffff";
-    static final String DFA44_minS =
-        "\1\10\1\0\10\uffff";
-    static final String DFA44_maxS =
-        "\1\104\1\0\10\uffff";
-    static final String DFA44_acceptS =
-        "\2\uffff\1\2\6\uffff\1\1";
-    static final String DFA44_specialS =
-        "\1\uffff\1\0\10\uffff}>";
-    static final String[] DFA44_transitionS = {
+    static final String dfa_28s = "\12\uffff";
+    static final String dfa_29s = "\1\2\11\uffff";
+    static final String dfa_30s = "\1\10\1\0\10\uffff";
+    static final String dfa_31s = "\1\104\1\0\10\uffff";
+    static final String dfa_32s = "\2\uffff\1\2\6\uffff\1\1";
+    static final String dfa_33s = "\1\uffff\1\0\10\uffff}>";
+    static final String[] dfa_34s = {
             "\1\2\16\uffff\1\1\2\2\1\uffff\1\2\6\uffff\1\2\41\uffff\1\2",
             "\1\uffff",
             "",
@@ -26539,34 +26469,26 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA44_eot = DFA.unpackEncodedString(DFA44_eotS);
-    static final short[] DFA44_eof = DFA.unpackEncodedString(DFA44_eofS);
-    static final char[] DFA44_min = DFA.unpackEncodedStringToUnsignedChars(DFA44_minS);
-    static final char[] DFA44_max = DFA.unpackEncodedStringToUnsignedChars(DFA44_maxS);
-    static final short[] DFA44_accept = DFA.unpackEncodedString(DFA44_acceptS);
-    static final short[] DFA44_special = DFA.unpackEncodedString(DFA44_specialS);
-    static final short[][] DFA44_transition;
-
-    static {
-        int numStates = DFA44_transitionS.length;
-        DFA44_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA44_transition[i] = DFA.unpackEncodedString(DFA44_transitionS[i]);
-        }
-    }
+    static final short[] dfa_28 = DFA.unpackEncodedString(dfa_28s);
+    static final short[] dfa_29 = DFA.unpackEncodedString(dfa_29s);
+    static final char[] dfa_30 = DFA.unpackEncodedStringToUnsignedChars(dfa_30s);
+    static final char[] dfa_31 = DFA.unpackEncodedStringToUnsignedChars(dfa_31s);
+    static final short[] dfa_32 = DFA.unpackEncodedString(dfa_32s);
+    static final short[] dfa_33 = DFA.unpackEncodedString(dfa_33s);
+    static final short[][] dfa_34 = unpackEncodedStringArray(dfa_34s);
 
     class DFA44 extends DFA {
 
         public DFA44(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 44;
-            this.eot = DFA44_eot;
-            this.eof = DFA44_eof;
-            this.min = DFA44_min;
-            this.max = DFA44_max;
-            this.accept = DFA44_accept;
-            this.special = DFA44_special;
-            this.transition = DFA44_transition;
+            this.eot = dfa_28;
+            this.eof = dfa_29;
+            this.min = dfa_30;
+            this.max = dfa_31;
+            this.accept = dfa_32;
+            this.special = dfa_33;
+            this.transition = dfa_34;
         }
         public String getDescription() {
             return "2167:2: ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )?";
@@ -26598,23 +26520,13 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA43_eotS =
-        "\66\uffff";
-    static final String DFA43_eofS =
-        "\66\uffff";
-    static final String DFA43_minS =
-        "\1\4\1\0\64\uffff";
-    static final String DFA43_maxS =
-        "\1\151\1\0\64\uffff";
-    static final String DFA43_acceptS =
-        "\2\uffff\1\2\61\uffff\1\3\1\1";
-    static final String DFA43_specialS =
-        "\1\uffff\1\0\64\uffff}>";
-    static final String[] DFA43_transitionS = {
-            "\4\2\1\1\6\uffff\4\2\1\uffff\1\2\1\uffff\2\2\1\uffff\1\64\3"+
-            "\2\3\uffff\2\2\1\uffff\20\2\5\uffff\1\2\16\uffff\2\2\4\uffff"+
-            "\1\2\7\uffff\1\2\1\uffff\1\2\3\uffff\2\2\2\uffff\11\2\1\uffff"+
-            "\1\2",
+    static final String dfa_35s = "\66\uffff";
+    static final String dfa_36s = "\1\4\1\0\64\uffff";
+    static final String dfa_37s = "\1\151\1\0\64\uffff";
+    static final String dfa_38s = "\2\uffff\1\2\61\uffff\1\3\1\1";
+    static final String dfa_39s = "\1\uffff\1\0\64\uffff}>";
+    static final String[] dfa_40s = {
+            "\4\2\1\1\6\uffff\4\2\1\uffff\1\2\1\uffff\2\2\1\uffff\1\64\3\2\3\uffff\2\2\1\uffff\20\2\5\uffff\1\2\16\uffff\2\2\4\uffff\1\2\7\uffff\1\2\1\uffff\1\2\3\uffff\2\2\2\uffff\11\2\1\uffff\1\2",
             "\1\uffff",
             "",
             "",
@@ -26670,34 +26582,25 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA43_eot = DFA.unpackEncodedString(DFA43_eotS);
-    static final short[] DFA43_eof = DFA.unpackEncodedString(DFA43_eofS);
-    static final char[] DFA43_min = DFA.unpackEncodedStringToUnsignedChars(DFA43_minS);
-    static final char[] DFA43_max = DFA.unpackEncodedStringToUnsignedChars(DFA43_maxS);
-    static final short[] DFA43_accept = DFA.unpackEncodedString(DFA43_acceptS);
-    static final short[] DFA43_special = DFA.unpackEncodedString(DFA43_specialS);
-    static final short[][] DFA43_transition;
-
-    static {
-        int numStates = DFA43_transitionS.length;
-        DFA43_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA43_transition[i] = DFA.unpackEncodedString(DFA43_transitionS[i]);
-        }
-    }
+    static final short[] dfa_35 = DFA.unpackEncodedString(dfa_35s);
+    static final char[] dfa_36 = DFA.unpackEncodedStringToUnsignedChars(dfa_36s);
+    static final char[] dfa_37 = DFA.unpackEncodedStringToUnsignedChars(dfa_37s);
+    static final short[] dfa_38 = DFA.unpackEncodedString(dfa_38s);
+    static final short[] dfa_39 = DFA.unpackEncodedString(dfa_39s);
+    static final short[][] dfa_40 = unpackEncodedStringArray(dfa_40s);
 
     class DFA43 extends DFA {
 
         public DFA43(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 43;
-            this.eot = DFA43_eot;
-            this.eof = DFA43_eof;
-            this.min = DFA43_min;
-            this.max = DFA43_max;
-            this.accept = DFA43_accept;
-            this.special = DFA43_special;
-            this.transition = DFA43_transition;
+            this.eot = dfa_35;
+            this.eof = dfa_35;
+            this.min = dfa_36;
+            this.max = dfa_37;
+            this.accept = dfa_38;
+            this.special = dfa_39;
+            this.transition = dfa_40;
         }
         public String getDescription() {
             return "2172:2: ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )?";
@@ -26729,22 +26632,13 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA49_eotS =
-        "\65\uffff";
-    static final String DFA49_eofS =
-        "\65\uffff";
-    static final String DFA49_minS =
-        "\1\4\1\0\63\uffff";
-    static final String DFA49_maxS =
-        "\1\151\1\0\63\uffff";
-    static final String DFA49_acceptS =
-        "\2\uffff\1\2\61\uffff\1\1";
-    static final String DFA49_specialS =
-        "\1\uffff\1\0\63\uffff}>";
-    static final String[] DFA49_transitionS = {
-            "\5\2\6\uffff\4\2\1\uffff\1\2\1\uffff\2\2\2\uffff\3\2\3\uffff"+
-            "\1\1\1\2\1\uffff\20\2\5\uffff\1\2\16\uffff\2\2\4\uffff\1\2\7"+
-            "\uffff\1\2\1\uffff\1\2\3\uffff\2\2\2\uffff\11\2\1\uffff\1\2",
+    static final String dfa_41s = "\65\uffff";
+    static final String dfa_42s = "\1\4\1\0\63\uffff";
+    static final String dfa_43s = "\1\151\1\0\63\uffff";
+    static final String dfa_44s = "\2\uffff\1\2\61\uffff\1\1";
+    static final String dfa_45s = "\1\uffff\1\0\63\uffff}>";
+    static final String[] dfa_46s = {
+            "\5\2\6\uffff\4\2\1\uffff\1\2\1\uffff\2\2\2\uffff\3\2\3\uffff\1\1\1\2\1\uffff\20\2\5\uffff\1\2\16\uffff\2\2\4\uffff\1\2\7\uffff\1\2\1\uffff\1\2\3\uffff\2\2\2\uffff\11\2\1\uffff\1\2",
             "\1\uffff",
             "",
             "",
@@ -26799,34 +26693,25 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA49_eot = DFA.unpackEncodedString(DFA49_eotS);
-    static final short[] DFA49_eof = DFA.unpackEncodedString(DFA49_eofS);
-    static final char[] DFA49_min = DFA.unpackEncodedStringToUnsignedChars(DFA49_minS);
-    static final char[] DFA49_max = DFA.unpackEncodedStringToUnsignedChars(DFA49_maxS);
-    static final short[] DFA49_accept = DFA.unpackEncodedString(DFA49_acceptS);
-    static final short[] DFA49_special = DFA.unpackEncodedString(DFA49_specialS);
-    static final short[][] DFA49_transition;
-
-    static {
-        int numStates = DFA49_transitionS.length;
-        DFA49_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA49_transition[i] = DFA.unpackEncodedString(DFA49_transitionS[i]);
-        }
-    }
+    static final short[] dfa_41 = DFA.unpackEncodedString(dfa_41s);
+    static final char[] dfa_42 = DFA.unpackEncodedStringToUnsignedChars(dfa_42s);
+    static final char[] dfa_43 = DFA.unpackEncodedStringToUnsignedChars(dfa_43s);
+    static final short[] dfa_44 = DFA.unpackEncodedString(dfa_44s);
+    static final short[] dfa_45 = DFA.unpackEncodedString(dfa_45s);
+    static final short[][] dfa_46 = unpackEncodedStringArray(dfa_46s);
 
     class DFA49 extends DFA {
 
         public DFA49(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 49;
-            this.eot = DFA49_eot;
-            this.eof = DFA49_eof;
-            this.min = DFA49_min;
-            this.max = DFA49_max;
-            this.accept = DFA49_accept;
-            this.special = DFA49_special;
-            this.transition = DFA49_transition;
+            this.eot = dfa_41;
+            this.eof = dfa_41;
+            this.min = dfa_42;
+            this.max = dfa_43;
+            this.accept = dfa_44;
+            this.special = dfa_45;
+            this.transition = dfa_46;
         }
         public String getDescription() {
             return "2329:1: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? ) )";
@@ -26858,104 +26743,19 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA52_eotS =
-        "\65\uffff";
-    static final String DFA52_eofS =
-        "\65\uffff";
-    static final String DFA52_minS =
-        "\1\4\1\0\63\uffff";
-    static final String DFA52_maxS =
-        "\1\151\1\0\63\uffff";
-    static final String DFA52_acceptS =
-        "\2\uffff\1\2\61\uffff\1\1";
-    static final String DFA52_specialS =
-        "\1\uffff\1\0\63\uffff}>";
-    static final String[] DFA52_transitionS = {
-            "\5\2\6\uffff\4\2\1\uffff\1\2\1\uffff\2\2\2\uffff\3\2\3\uffff"+
-            "\1\1\1\2\1\uffff\20\2\5\uffff\1\2\16\uffff\2\2\4\uffff\1\2\7"+
-            "\uffff\1\2\1\uffff\1\2\3\uffff\2\2\2\uffff\11\2\1\uffff\1\2",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA52_eot = DFA.unpackEncodedString(DFA52_eotS);
-    static final short[] DFA52_eof = DFA.unpackEncodedString(DFA52_eofS);
-    static final char[] DFA52_min = DFA.unpackEncodedStringToUnsignedChars(DFA52_minS);
-    static final char[] DFA52_max = DFA.unpackEncodedStringToUnsignedChars(DFA52_maxS);
-    static final short[] DFA52_accept = DFA.unpackEncodedString(DFA52_acceptS);
-    static final short[] DFA52_special = DFA.unpackEncodedString(DFA52_specialS);
-    static final short[][] DFA52_transition;
-
-    static {
-        int numStates = DFA52_transitionS.length;
-        DFA52_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA52_transition[i] = DFA.unpackEncodedString(DFA52_transitionS[i]);
-        }
-    }
 
     class DFA52 extends DFA {
 
         public DFA52(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 52;
-            this.eot = DFA52_eot;
-            this.eof = DFA52_eof;
-            this.min = DFA52_min;
-            this.max = DFA52_max;
-            this.accept = DFA52_accept;
-            this.special = DFA52_special;
-            this.transition = DFA52_transition;
+            this.eot = dfa_41;
+            this.eof = dfa_41;
+            this.min = dfa_42;
+            this.max = dfa_43;
+            this.accept = dfa_44;
+            this.special = dfa_45;
+            this.transition = dfa_46;
         }
         public String getDescription() {
             return "2449:1: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression )";
@@ -26987,118 +26787,71 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA55_eotS =
-        "\30\uffff";
-    static final String DFA55_eofS =
-        "\1\uffff\25\26\2\uffff";
-    static final String DFA55_minS =
-        "\26\4\2\uffff";
-    static final String DFA55_maxS =
-        "\1\151\25\152\2\uffff";
-    static final String DFA55_acceptS =
-        "\26\uffff\1\2\1\1";
-    static final String DFA55_specialS =
-        "\30\uffff}>";
-    static final String[] DFA55_transitionS = {
-            "\4\26\1\1\6\uffff\1\6\1\26\1\7\1\26\1\uffff\1\4\1\uffff\1\11"+
-            "\1\26\2\uffff\1\12\1\uffff\1\16\3\uffff\2\26\1\uffff\2\26\1"+
-            "\13\1\14\1\15\1\2\1\3\1\5\1\10\1\17\1\20\1\21\1\22\1\23\1\24"+
-            "\1\25\5\uffff\1\26\16\uffff\2\26\4\uffff\1\26\7\uffff\1\26\1"+
-            "\uffff\1\26\3\uffff\2\26\2\uffff\11\26\1\uffff\1\26",
-            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff"+
-            "\26\26",
-            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff"+
-            "\26\26",
-            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff"+
-            "\26\26",
-            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff"+
-            "\26\26",
-            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff"+
-            "\26\26",
-            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff"+
-            "\26\26",
-            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff"+
-            "\26\26",
-            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff"+
-            "\26\26",
-            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff"+
-            "\26\26",
-            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff"+
-            "\26\26",
-            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff"+
-            "\26\26",
-            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff"+
-            "\26\26",
-            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff"+
-            "\26\26",
-            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff"+
-            "\26\26",
-            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff"+
-            "\26\26",
-            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff"+
-            "\26\26",
-            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff"+
-            "\26\26",
-            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff"+
-            "\26\26",
-            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff"+
-            "\26\26",
-            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff"+
-            "\26\26",
-            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff"+
-            "\26\26",
+    static final String dfa_47s = "\30\uffff";
+    static final String dfa_48s = "\1\uffff\25\26\2\uffff";
+    static final String dfa_49s = "\26\4\2\uffff";
+    static final String dfa_50s = "\1\151\25\152\2\uffff";
+    static final String dfa_51s = "\26\uffff\1\2\1\1";
+    static final String dfa_52s = "\30\uffff}>";
+    static final String[] dfa_53s = {
+            "\4\26\1\1\6\uffff\1\6\1\26\1\7\1\26\1\uffff\1\4\1\uffff\1\11\1\26\2\uffff\1\12\1\uffff\1\16\3\uffff\2\26\1\uffff\2\26\1\13\1\14\1\15\1\2\1\3\1\5\1\10\1\17\1\20\1\21\1\22\1\23\1\24\1\25\5\uffff\1\26\16\uffff\2\26\4\uffff\1\26\7\uffff\1\26\1\uffff\1\26\3\uffff\2\26\2\uffff\11\26\1\uffff\1\26",
+            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff\26\26",
+            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff\26\26",
+            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff\26\26",
+            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff\26\26",
+            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff\26\26",
+            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff\26\26",
+            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff\26\26",
+            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff\26\26",
+            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff\26\26",
+            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff\26\26",
+            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff\26\26",
+            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff\26\26",
+            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff\26\26",
+            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff\26\26",
+            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff\26\26",
+            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff\26\26",
+            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff\26\26",
+            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff\26\26",
+            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff\26\26",
+            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff\26\26",
+            "\5\26\6\uffff\14\26\1\uffff\2\26\1\uffff\1\27\64\26\1\uffff\26\26",
             "",
             ""
     };
 
-    static final short[] DFA55_eot = DFA.unpackEncodedString(DFA55_eotS);
-    static final short[] DFA55_eof = DFA.unpackEncodedString(DFA55_eofS);
-    static final char[] DFA55_min = DFA.unpackEncodedStringToUnsignedChars(DFA55_minS);
-    static final char[] DFA55_max = DFA.unpackEncodedStringToUnsignedChars(DFA55_maxS);
-    static final short[] DFA55_accept = DFA.unpackEncodedString(DFA55_acceptS);
-    static final short[] DFA55_special = DFA.unpackEncodedString(DFA55_specialS);
-    static final short[][] DFA55_transition;
-
-    static {
-        int numStates = DFA55_transitionS.length;
-        DFA55_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA55_transition[i] = DFA.unpackEncodedString(DFA55_transitionS[i]);
-        }
-    }
+    static final short[] dfa_47 = DFA.unpackEncodedString(dfa_47s);
+    static final short[] dfa_48 = DFA.unpackEncodedString(dfa_48s);
+    static final char[] dfa_49 = DFA.unpackEncodedStringToUnsignedChars(dfa_49s);
+    static final char[] dfa_50 = DFA.unpackEncodedStringToUnsignedChars(dfa_50s);
+    static final short[] dfa_51 = DFA.unpackEncodedString(dfa_51s);
+    static final short[] dfa_52 = DFA.unpackEncodedString(dfa_52s);
+    static final short[][] dfa_53 = unpackEncodedStringArray(dfa_53s);
 
     class DFA55 extends DFA {
 
         public DFA55(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 55;
-            this.eot = DFA55_eot;
-            this.eof = DFA55_eof;
-            this.min = DFA55_min;
-            this.max = DFA55_max;
-            this.accept = DFA55_accept;
-            this.special = DFA55_special;
-            this.transition = DFA55_transition;
+            this.eot = dfa_47;
+            this.eof = dfa_48;
+            this.min = dfa_49;
+            this.max = dfa_50;
+            this.accept = dfa_51;
+            this.special = dfa_52;
+            this.transition = dfa_53;
         }
         public String getDescription() {
             return "2611:1: ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) )";
         }
     }
-    static final String DFA54_eotS =
-        "\12\uffff";
-    static final String DFA54_eofS =
-        "\1\10\11\uffff";
-    static final String DFA54_minS =
-        "\1\4\7\0\2\uffff";
-    static final String DFA54_maxS =
-        "\1\152\7\0\2\uffff";
-    static final String DFA54_acceptS =
-        "\10\uffff\1\2\1\1";
-    static final String DFA54_specialS =
-        "\1\uffff\1\2\1\3\1\4\1\5\1\6\1\1\1\0\2\uffff}>";
-    static final String[] DFA54_transitionS = {
-            "\5\10\6\uffff\14\10\1\uffff\2\10\2\uffff\23\10\1\1\1\2\1\3"+
-            "\1\4\1\5\1\6\1\7\32\10\1\uffff\26\10",
+    static final String dfa_54s = "\1\10\11\uffff";
+    static final String dfa_55s = "\1\4\7\0\2\uffff";
+    static final String dfa_56s = "\1\152\7\0\2\uffff";
+    static final String dfa_57s = "\10\uffff\1\2\1\1";
+    static final String dfa_58s = "\1\uffff\1\2\1\3\1\4\1\5\1\6\1\1\1\0\2\uffff}>";
+    static final String[] dfa_59s = {
+            "\5\10\6\uffff\14\10\1\uffff\2\10\2\uffff\23\10\1\1\1\2\1\3\1\4\1\5\1\6\1\7\32\10\1\uffff\26\10",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -27109,35 +26862,25 @@ public String getDescription() {
             "",
             ""
     };
-
-    static final short[] DFA54_eot = DFA.unpackEncodedString(DFA54_eotS);
-    static final short[] DFA54_eof = DFA.unpackEncodedString(DFA54_eofS);
-    static final char[] DFA54_min = DFA.unpackEncodedStringToUnsignedChars(DFA54_minS);
-    static final char[] DFA54_max = DFA.unpackEncodedStringToUnsignedChars(DFA54_maxS);
-    static final short[] DFA54_accept = DFA.unpackEncodedString(DFA54_acceptS);
-    static final short[] DFA54_special = DFA.unpackEncodedString(DFA54_specialS);
-    static final short[][] DFA54_transition;
-
-    static {
-        int numStates = DFA54_transitionS.length;
-        DFA54_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA54_transition[i] = DFA.unpackEncodedString(DFA54_transitionS[i]);
-        }
-    }
+    static final short[] dfa_54 = DFA.unpackEncodedString(dfa_54s);
+    static final char[] dfa_55 = DFA.unpackEncodedStringToUnsignedChars(dfa_55s);
+    static final char[] dfa_56 = DFA.unpackEncodedStringToUnsignedChars(dfa_56s);
+    static final short[] dfa_57 = DFA.unpackEncodedString(dfa_57s);
+    static final short[] dfa_58 = DFA.unpackEncodedString(dfa_58s);
+    static final short[][] dfa_59 = unpackEncodedStringArray(dfa_59s);
 
     class DFA54 extends DFA {
 
         public DFA54(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 54;
-            this.eot = DFA54_eot;
-            this.eof = DFA54_eof;
-            this.min = DFA54_min;
-            this.max = DFA54_max;
-            this.accept = DFA54_accept;
-            this.special = DFA54_special;
-            this.transition = DFA54_transition;
+            this.eot = dfa_28;
+            this.eof = dfa_54;
+            this.min = dfa_55;
+            this.max = dfa_56;
+            this.accept = dfa_57;
+            this.special = dfa_58;
+            this.transition = dfa_59;
         }
         public String getDescription() {
             return "2668:1: ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )?";
@@ -27259,21 +27002,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA64_eotS =
-        "\13\uffff";
-    static final String DFA64_eofS =
-        "\1\1\12\uffff";
-    static final String DFA64_minS =
-        "\1\4\1\uffff\10\0\1\uffff";
-    static final String DFA64_maxS =
-        "\1\152\1\uffff\10\0\1\uffff";
-    static final String DFA64_acceptS =
-        "\1\uffff\1\2\10\uffff\1\1";
-    static final String DFA64_specialS =
-        "\2\uffff\1\5\1\2\1\3\1\4\1\7\1\6\1\0\1\1\1\uffff}>";
-    static final String[] DFA64_transitionS = {
-            "\5\1\6\uffff\14\1\1\uffff\1\1\1\6\2\uffff\30\1\1\2\1\3\10\1"+
-            "\1\4\1\5\1\7\1\10\1\11\15\1\1\uffff\26\1",
+    static final String dfa_60s = "\13\uffff";
+    static final String dfa_61s = "\1\1\12\uffff";
+    static final String dfa_62s = "\1\4\1\uffff\10\0\1\uffff";
+    static final String dfa_63s = "\1\152\1\uffff\10\0\1\uffff";
+    static final String dfa_64s = "\1\uffff\1\2\10\uffff\1\1";
+    static final String dfa_65s = "\2\uffff\1\5\1\2\1\3\1\4\1\7\1\6\1\0\1\1\1\uffff}>";
+    static final String[] dfa_66s = {
+            "\5\1\6\uffff\14\1\1\uffff\1\1\1\6\2\uffff\30\1\1\2\1\3\10\1\1\4\1\5\1\7\1\10\1\11\15\1\1\uffff\26\1",
             "",
             "\1\uffff",
             "\1\uffff",
@@ -27286,34 +27022,26 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA64_eot = DFA.unpackEncodedString(DFA64_eotS);
-    static final short[] DFA64_eof = DFA.unpackEncodedString(DFA64_eofS);
-    static final char[] DFA64_min = DFA.unpackEncodedStringToUnsignedChars(DFA64_minS);
-    static final char[] DFA64_max = DFA.unpackEncodedStringToUnsignedChars(DFA64_maxS);
-    static final short[] DFA64_accept = DFA.unpackEncodedString(DFA64_acceptS);
-    static final short[] DFA64_special = DFA.unpackEncodedString(DFA64_specialS);
-    static final short[][] DFA64_transition;
-
-    static {
-        int numStates = DFA64_transitionS.length;
-        DFA64_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA64_transition[i] = DFA.unpackEncodedString(DFA64_transitionS[i]);
-        }
-    }
+    static final short[] dfa_60 = DFA.unpackEncodedString(dfa_60s);
+    static final short[] dfa_61 = DFA.unpackEncodedString(dfa_61s);
+    static final char[] dfa_62 = DFA.unpackEncodedStringToUnsignedChars(dfa_62s);
+    static final char[] dfa_63 = DFA.unpackEncodedStringToUnsignedChars(dfa_63s);
+    static final short[] dfa_64 = DFA.unpackEncodedString(dfa_64s);
+    static final short[] dfa_65 = DFA.unpackEncodedString(dfa_65s);
+    static final short[][] dfa_66 = unpackEncodedStringArray(dfa_66s);
 
     class DFA64 extends DFA {
 
         public DFA64(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 64;
-            this.eot = DFA64_eot;
-            this.eof = DFA64_eof;
-            this.min = DFA64_min;
-            this.max = DFA64_max;
-            this.accept = DFA64_accept;
-            this.special = DFA64_special;
-            this.transition = DFA64_transition;
+            this.eot = dfa_60;
+            this.eof = dfa_61;
+            this.min = dfa_62;
+            this.max = dfa_63;
+            this.accept = dfa_64;
+            this.special = dfa_65;
+            this.transition = dfa_66;
         }
         public String getDescription() {
             return "()* loopback of 3345:1: ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )*";
@@ -27450,19 +27178,11 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA67_eotS =
-        "\13\uffff";
-    static final String DFA67_eofS =
-        "\13\uffff";
-    static final String DFA67_minS =
-        "\1\35\2\uffff\1\35\7\uffff";
-    static final String DFA67_maxS =
-        "\1\106\2\uffff\1\71\7\uffff";
-    static final String DFA67_acceptS =
-        "\1\uffff\1\1\1\2\1\uffff\1\4\1\5\1\7\1\10\1\11\1\3\1\6";
-    static final String DFA67_specialS =
-        "\13\uffff}>";
-    static final String[] DFA67_transitionS = {
+    static final String dfa_67s = "\1\35\2\uffff\1\35\7\uffff";
+    static final String dfa_68s = "\1\106\2\uffff\1\71\7\uffff";
+    static final String dfa_69s = "\1\uffff\1\1\1\2\1\uffff\1\4\1\5\1\7\1\10\1\11\1\3\1\6";
+    static final String dfa_70s = "\13\uffff}>";
+    static final String[] dfa_71s = {
             "\1\4\32\uffff\1\6\1\3\10\uffff\1\1\1\2\1\5\1\7\1\10",
             "",
             "",
@@ -27475,55 +27195,31 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             "",
             ""
     };
-
-    static final short[] DFA67_eot = DFA.unpackEncodedString(DFA67_eotS);
-    static final short[] DFA67_eof = DFA.unpackEncodedString(DFA67_eofS);
-    static final char[] DFA67_min = DFA.unpackEncodedStringToUnsignedChars(DFA67_minS);
-    static final char[] DFA67_max = DFA.unpackEncodedStringToUnsignedChars(DFA67_maxS);
-    static final short[] DFA67_accept = DFA.unpackEncodedString(DFA67_acceptS);
-    static final short[] DFA67_special = DFA.unpackEncodedString(DFA67_specialS);
-    static final short[][] DFA67_transition;
-
-    static {
-        int numStates = DFA67_transitionS.length;
-        DFA67_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA67_transition[i] = DFA.unpackEncodedString(DFA67_transitionS[i]);
-        }
-    }
+    static final char[] dfa_67 = DFA.unpackEncodedStringToUnsignedChars(dfa_67s);
+    static final char[] dfa_68 = DFA.unpackEncodedStringToUnsignedChars(dfa_68s);
+    static final short[] dfa_69 = DFA.unpackEncodedString(dfa_69s);
+    static final short[] dfa_70 = DFA.unpackEncodedString(dfa_70s);
+    static final short[][] dfa_71 = unpackEncodedStringArray(dfa_71s);
 
     class DFA67 extends DFA {
 
         public DFA67(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 67;
-            this.eot = DFA67_eot;
-            this.eof = DFA67_eof;
-            this.min = DFA67_min;
-            this.max = DFA67_max;
-            this.accept = DFA67_accept;
-            this.special = DFA67_special;
-            this.transition = DFA67_transition;
+            this.eot = dfa_60;
+            this.eof = dfa_60;
+            this.min = dfa_67;
+            this.max = dfa_68;
+            this.accept = dfa_69;
+            this.special = dfa_70;
+            this.transition = dfa_71;
         }
         public String getDescription() {
             return "3410:1: (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' )";
         }
     }
-    static final String DFA83_eotS =
-        "\140\uffff";
-    static final String DFA83_eofS =
-        "\1\2\137\uffff";
-    static final String DFA83_minS =
-        "\1\4\1\0\136\uffff";
-    static final String DFA83_maxS =
-        "\1\152\1\0\136\uffff";
-    static final String DFA83_acceptS =
-        "\2\uffff\1\2\134\uffff\1\1";
-    static final String DFA83_specialS =
-        "\1\uffff\1\0\136\uffff}>";
-    static final String[] DFA83_transitionS = {
-            "\5\2\6\uffff\10\2\1\1\3\2\1\uffff\2\2\2\uffff\64\2\1\uffff"+
-            "\26\2",
+    static final String[] dfa_72s = {
+            "\5\2\6\uffff\10\2\1\1\3\2\1\uffff\2\2\2\uffff\64\2\1\uffff\26\2",
             "\1\uffff",
             "",
             "",
@@ -27620,35 +27316,20 @@ public String getDescription() {
             "",
             ""
     };
-
-    static final short[] DFA83_eot = DFA.unpackEncodedString(DFA83_eotS);
-    static final short[] DFA83_eof = DFA.unpackEncodedString(DFA83_eofS);
-    static final char[] DFA83_min = DFA.unpackEncodedStringToUnsignedChars(DFA83_minS);
-    static final char[] DFA83_max = DFA.unpackEncodedStringToUnsignedChars(DFA83_maxS);
-    static final short[] DFA83_accept = DFA.unpackEncodedString(DFA83_acceptS);
-    static final short[] DFA83_special = DFA.unpackEncodedString(DFA83_specialS);
-    static final short[][] DFA83_transition;
-
-    static {
-        int numStates = DFA83_transitionS.length;
-        DFA83_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA83_transition[i] = DFA.unpackEncodedString(DFA83_transitionS[i]);
-        }
-    }
+    static final short[][] dfa_72 = unpackEncodedStringArray(dfa_72s);
 
     class DFA83 extends DFA {
 
         public DFA83(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 83;
-            this.eot = DFA83_eot;
-            this.eof = DFA83_eof;
-            this.min = DFA83_min;
-            this.max = DFA83_max;
-            this.accept = DFA83_accept;
-            this.special = DFA83_special;
-            this.transition = DFA83_transition;
+            this.eot = dfa_15;
+            this.eof = dfa_16;
+            this.min = dfa_17;
+            this.max = dfa_18;
+            this.accept = dfa_19;
+            this.special = dfa_20;
+            this.transition = dfa_72;
         }
         public String getDescription() {
             return "4254:2: ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )?";
@@ -27680,23 +27361,12 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA82_eotS =
-        "\66\uffff";
-    static final String DFA82_eofS =
-        "\66\uffff";
-    static final String DFA82_minS =
-        "\1\4\2\0\63\uffff";
-    static final String DFA82_maxS =
-        "\1\151\2\0\63\uffff";
-    static final String DFA82_acceptS =
-        "\3\uffff\2\1\1\2\57\uffff\1\3";
-    static final String DFA82_specialS =
-        "\1\0\1\1\1\2\63\uffff}>";
-    static final String[] DFA82_transitionS = {
-            "\4\5\1\1\6\uffff\4\5\1\uffff\1\5\1\uffff\1\5\1\2\1\uffff\1"+
-            "\65\1\5\1\uffff\1\5\3\uffff\2\5\1\uffff\20\5\5\uffff\1\5\13"+
-            "\uffff\1\3\2\uffff\2\5\4\uffff\1\5\6\uffff\1\4\1\5\1\uffff\1"+
-            "\5\3\uffff\2\5\2\uffff\11\5\1\uffff\1\5",
+    static final String dfa_73s = "\1\4\2\0\63\uffff";
+    static final String dfa_74s = "\1\151\2\0\63\uffff";
+    static final String dfa_75s = "\3\uffff\2\1\1\2\57\uffff\1\3";
+    static final String dfa_76s = "\1\0\1\1\1\2\63\uffff}>";
+    static final String[] dfa_77s = {
+            "\4\5\1\1\6\uffff\4\5\1\uffff\1\5\1\uffff\1\5\1\2\1\uffff\1\65\1\5\1\uffff\1\5\3\uffff\2\5\1\uffff\20\5\5\uffff\1\5\13\uffff\1\3\2\uffff\2\5\4\uffff\1\5\6\uffff\1\4\1\5\1\uffff\1\5\3\uffff\2\5\2\uffff\11\5\1\uffff\1\5",
             "\1\uffff",
             "\1\uffff",
             "",
@@ -27751,35 +27421,24 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             "",
             ""
     };
-
-    static final short[] DFA82_eot = DFA.unpackEncodedString(DFA82_eotS);
-    static final short[] DFA82_eof = DFA.unpackEncodedString(DFA82_eofS);
-    static final char[] DFA82_min = DFA.unpackEncodedStringToUnsignedChars(DFA82_minS);
-    static final char[] DFA82_max = DFA.unpackEncodedStringToUnsignedChars(DFA82_maxS);
-    static final short[] DFA82_accept = DFA.unpackEncodedString(DFA82_acceptS);
-    static final short[] DFA82_special = DFA.unpackEncodedString(DFA82_specialS);
-    static final short[][] DFA82_transition;
-
-    static {
-        int numStates = DFA82_transitionS.length;
-        DFA82_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA82_transition[i] = DFA.unpackEncodedString(DFA82_transitionS[i]);
-        }
-    }
+    static final char[] dfa_73 = DFA.unpackEncodedStringToUnsignedChars(dfa_73s);
+    static final char[] dfa_74 = DFA.unpackEncodedStringToUnsignedChars(dfa_74s);
+    static final short[] dfa_75 = DFA.unpackEncodedString(dfa_75s);
+    static final short[] dfa_76 = DFA.unpackEncodedString(dfa_76s);
+    static final short[][] dfa_77 = unpackEncodedStringArray(dfa_77s);
 
     class DFA82 extends DFA {
 
         public DFA82(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 82;
-            this.eot = DFA82_eot;
-            this.eof = DFA82_eof;
-            this.min = DFA82_min;
-            this.max = DFA82_max;
-            this.accept = DFA82_accept;
-            this.special = DFA82_special;
-            this.transition = DFA82_transition;
+            this.eot = dfa_35;
+            this.eof = dfa_35;
+            this.min = dfa_73;
+            this.max = dfa_74;
+            this.accept = dfa_75;
+            this.special = dfa_76;
+            this.transition = dfa_77;
         }
         public String getDescription() {
             return "4275:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )?";
@@ -27849,21 +27508,8 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA84_eotS =
-        "\140\uffff";
-    static final String DFA84_eofS =
-        "\1\2\137\uffff";
-    static final String DFA84_minS =
-        "\1\4\1\0\136\uffff";
-    static final String DFA84_maxS =
-        "\1\152\1\0\136\uffff";
-    static final String DFA84_acceptS =
-        "\2\uffff\1\2\134\uffff\1\1";
-    static final String DFA84_specialS =
-        "\1\uffff\1\0\136\uffff}>";
-    static final String[] DFA84_transitionS = {
-            "\5\2\6\uffff\14\2\1\uffff\2\2\2\uffff\1\2\1\1\62\2\1\uffff"+
-            "\26\2",
+    static final String[] dfa_78s = {
+            "\5\2\6\uffff\14\2\1\uffff\2\2\2\uffff\1\2\1\1\62\2\1\uffff\26\2",
             "\1\uffff",
             "",
             "",
@@ -27960,35 +27606,20 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             "",
             ""
     };
-
-    static final short[] DFA84_eot = DFA.unpackEncodedString(DFA84_eotS);
-    static final short[] DFA84_eof = DFA.unpackEncodedString(DFA84_eofS);
-    static final char[] DFA84_min = DFA.unpackEncodedStringToUnsignedChars(DFA84_minS);
-    static final char[] DFA84_max = DFA.unpackEncodedStringToUnsignedChars(DFA84_maxS);
-    static final short[] DFA84_accept = DFA.unpackEncodedString(DFA84_acceptS);
-    static final short[] DFA84_special = DFA.unpackEncodedString(DFA84_specialS);
-    static final short[][] DFA84_transition;
-
-    static {
-        int numStates = DFA84_transitionS.length;
-        DFA84_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA84_transition[i] = DFA.unpackEncodedString(DFA84_transitionS[i]);
-        }
-    }
+    static final short[][] dfa_78 = unpackEncodedStringArray(dfa_78s);
 
     class DFA84 extends DFA {
 
         public DFA84(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 84;
-            this.eot = DFA84_eot;
-            this.eof = DFA84_eof;
-            this.min = DFA84_min;
-            this.max = DFA84_max;
-            this.accept = DFA84_accept;
-            this.special = DFA84_special;
-            this.transition = DFA84_transition;
+            this.eot = dfa_15;
+            this.eof = dfa_16;
+            this.min = dfa_17;
+            this.max = dfa_18;
+            this.accept = dfa_19;
+            this.special = dfa_20;
+            this.transition = dfa_78;
         }
         public String getDescription() {
             return "4354:3: ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )?";
@@ -28020,23 +27651,13 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA94_eotS =
-        "\70\uffff";
-    static final String DFA94_eofS =
-        "\70\uffff";
-    static final String DFA94_minS =
-        "\1\4\2\0\65\uffff";
-    static final String DFA94_maxS =
-        "\1\151\2\0\65\uffff";
-    static final String DFA94_acceptS =
-        "\3\uffff\2\1\1\2\62\uffff";
-    static final String DFA94_specialS =
-        "\1\0\1\1\1\2\65\uffff}>";
-    static final String[] DFA94_transitionS = {
-            "\4\5\1\1\6\uffff\4\5\1\uffff\1\5\1\uffff\1\5\1\2\2\uffff\1"+
-            "\5\1\uffff\1\5\3\uffff\23\5\5\uffff\1\5\13\uffff\1\3\2\uffff"+
-            "\2\5\4\uffff\1\5\6\uffff\1\4\1\5\1\uffff\1\5\3\uffff\15\5\1"+
-            "\uffff\1\5",
+    static final String dfa_79s = "\70\uffff";
+    static final String dfa_80s = "\1\4\2\0\65\uffff";
+    static final String dfa_81s = "\1\151\2\0\65\uffff";
+    static final String dfa_82s = "\3\uffff\2\1\1\2\62\uffff";
+    static final String dfa_83s = "\1\0\1\1\1\2\65\uffff}>";
+    static final String[] dfa_84s = {
+            "\4\5\1\1\6\uffff\4\5\1\uffff\1\5\1\uffff\1\5\1\2\2\uffff\1\5\1\uffff\1\5\3\uffff\23\5\5\uffff\1\5\13\uffff\1\3\2\uffff\2\5\4\uffff\1\5\6\uffff\1\4\1\5\1\uffff\1\5\3\uffff\15\5\1\uffff\1\5",
             "\1\uffff",
             "\1\uffff",
             "",
@@ -28094,34 +27715,25 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA94_eot = DFA.unpackEncodedString(DFA94_eotS);
-    static final short[] DFA94_eof = DFA.unpackEncodedString(DFA94_eofS);
-    static final char[] DFA94_min = DFA.unpackEncodedStringToUnsignedChars(DFA94_minS);
-    static final char[] DFA94_max = DFA.unpackEncodedStringToUnsignedChars(DFA94_maxS);
-    static final short[] DFA94_accept = DFA.unpackEncodedString(DFA94_acceptS);
-    static final short[] DFA94_special = DFA.unpackEncodedString(DFA94_specialS);
-    static final short[][] DFA94_transition;
-
-    static {
-        int numStates = DFA94_transitionS.length;
-        DFA94_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA94_transition[i] = DFA.unpackEncodedString(DFA94_transitionS[i]);
-        }
-    }
+    static final short[] dfa_79 = DFA.unpackEncodedString(dfa_79s);
+    static final char[] dfa_80 = DFA.unpackEncodedStringToUnsignedChars(dfa_80s);
+    static final char[] dfa_81 = DFA.unpackEncodedStringToUnsignedChars(dfa_81s);
+    static final short[] dfa_82 = DFA.unpackEncodedString(dfa_82s);
+    static final short[] dfa_83 = DFA.unpackEncodedString(dfa_83s);
+    static final short[][] dfa_84 = unpackEncodedStringArray(dfa_84s);
 
     class DFA94 extends DFA {
 
         public DFA94(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 94;
-            this.eot = DFA94_eot;
-            this.eof = DFA94_eof;
-            this.min = DFA94_min;
-            this.max = DFA94_max;
-            this.accept = DFA94_accept;
-            this.special = DFA94_special;
-            this.transition = DFA94_transition;
+            this.eot = dfa_79;
+            this.eof = dfa_79;
+            this.min = dfa_80;
+            this.max = dfa_81;
+            this.accept = dfa_82;
+            this.special = dfa_83;
+            this.transition = dfa_84;
         }
         public String getDescription() {
             return "4697:3: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )?";
@@ -28189,23 +27801,8 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA101_eotS =
-        "\65\uffff";
-    static final String DFA101_eofS =
-        "\65\uffff";
-    static final String DFA101_minS =
-        "\1\4\1\0\63\uffff";
-    static final String DFA101_maxS =
-        "\1\151\1\0\63\uffff";
-    static final String DFA101_acceptS =
-        "\2\uffff\1\2\61\uffff\1\1";
-    static final String DFA101_specialS =
-        "\1\uffff\1\0\63\uffff}>";
-    static final String[] DFA101_transitionS = {
-            "\5\2\6\uffff\4\2\1\uffff\1\2\1\uffff\1\2\1\1\2\uffff\1\2\1"+
-            "\uffff\1\2\3\uffff\2\2\1\uffff\20\2\5\uffff\1\2\13\uffff\1\2"+
-            "\2\uffff\2\2\4\uffff\1\2\7\uffff\1\2\1\uffff\1\2\3\uffff\2\2"+
-            "\2\uffff\11\2\1\uffff\1\2",
+    static final String[] dfa_85s = {
+            "\5\2\6\uffff\4\2\1\uffff\1\2\1\uffff\1\2\1\1\2\uffff\1\2\1\uffff\1\2\3\uffff\2\2\1\uffff\20\2\5\uffff\1\2\13\uffff\1\2\2\uffff\2\2\4\uffff\1\2\7\uffff\1\2\1\uffff\1\2\3\uffff\2\2\2\uffff\11\2\1\uffff\1\2",
             "\1\uffff",
             "",
             "",
@@ -28259,35 +27856,20 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             "",
             ""
     };
-
-    static final short[] DFA101_eot = DFA.unpackEncodedString(DFA101_eotS);
-    static final short[] DFA101_eof = DFA.unpackEncodedString(DFA101_eofS);
-    static final char[] DFA101_min = DFA.unpackEncodedStringToUnsignedChars(DFA101_minS);
-    static final char[] DFA101_max = DFA.unpackEncodedStringToUnsignedChars(DFA101_maxS);
-    static final short[] DFA101_accept = DFA.unpackEncodedString(DFA101_acceptS);
-    static final short[] DFA101_special = DFA.unpackEncodedString(DFA101_specialS);
-    static final short[][] DFA101_transition;
-
-    static {
-        int numStates = DFA101_transitionS.length;
-        DFA101_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA101_transition[i] = DFA.unpackEncodedString(DFA101_transitionS[i]);
-        }
-    }
+    static final short[][] dfa_85 = unpackEncodedStringArray(dfa_85s);
 
     class DFA101 extends DFA {
 
         public DFA101(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 101;
-            this.eot = DFA101_eot;
-            this.eof = DFA101_eof;
-            this.min = DFA101_min;
-            this.max = DFA101_max;
-            this.accept = DFA101_accept;
-            this.special = DFA101_special;
-            this.transition = DFA101_transition;
+            this.eot = dfa_41;
+            this.eof = dfa_41;
+            this.min = dfa_42;
+            this.max = dfa_43;
+            this.accept = dfa_44;
+            this.special = dfa_45;
+            this.transition = dfa_85;
         }
         public String getDescription() {
             return "5121:1: ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) )";
@@ -28319,23 +27901,13 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA100_eotS =
-        "\64\uffff";
-    static final String DFA100_eofS =
-        "\64\uffff";
-    static final String DFA100_minS =
-        "\1\4\2\0\61\uffff";
-    static final String DFA100_maxS =
-        "\1\151\2\0\61\uffff";
-    static final String DFA100_acceptS =
-        "\3\uffff\1\1\1\2\57\uffff";
-    static final String DFA100_specialS =
-        "\1\0\1\1\1\2\61\uffff}>";
-    static final String[] DFA100_transitionS = {
-            "\4\4\1\1\6\uffff\4\4\1\uffff\1\4\1\uffff\1\4\1\2\2\uffff\1"+
-            "\4\1\uffff\1\4\3\uffff\2\4\1\uffff\20\4\5\uffff\1\4\13\uffff"+
-            "\1\3\2\uffff\2\4\4\uffff\1\4\7\uffff\1\4\1\uffff\1\4\3\uffff"+
-            "\2\4\2\uffff\11\4\1\uffff\1\4",
+    static final String dfa_86s = "\64\uffff";
+    static final String dfa_87s = "\1\4\2\0\61\uffff";
+    static final String dfa_88s = "\1\151\2\0\61\uffff";
+    static final String dfa_89s = "\3\uffff\1\1\1\2\57\uffff";
+    static final String dfa_90s = "\1\0\1\1\1\2\61\uffff}>";
+    static final String[] dfa_91s = {
+            "\4\4\1\1\6\uffff\4\4\1\uffff\1\4\1\uffff\1\4\1\2\2\uffff\1\4\1\uffff\1\4\3\uffff\2\4\1\uffff\20\4\5\uffff\1\4\13\uffff\1\3\2\uffff\2\4\4\uffff\1\4\7\uffff\1\4\1\uffff\1\4\3\uffff\2\4\2\uffff\11\4\1\uffff\1\4",
             "\1\uffff",
             "\1\uffff",
             "",
@@ -28389,34 +27961,25 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA100_eot = DFA.unpackEncodedString(DFA100_eotS);
-    static final short[] DFA100_eof = DFA.unpackEncodedString(DFA100_eofS);
-    static final char[] DFA100_min = DFA.unpackEncodedStringToUnsignedChars(DFA100_minS);
-    static final char[] DFA100_max = DFA.unpackEncodedStringToUnsignedChars(DFA100_maxS);
-    static final short[] DFA100_accept = DFA.unpackEncodedString(DFA100_acceptS);
-    static final short[] DFA100_special = DFA.unpackEncodedString(DFA100_specialS);
-    static final short[][] DFA100_transition;
-
-    static {
-        int numStates = DFA100_transitionS.length;
-        DFA100_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA100_transition[i] = DFA.unpackEncodedString(DFA100_transitionS[i]);
-        }
-    }
+    static final short[] dfa_86 = DFA.unpackEncodedString(dfa_86s);
+    static final char[] dfa_87 = DFA.unpackEncodedStringToUnsignedChars(dfa_87s);
+    static final char[] dfa_88 = DFA.unpackEncodedStringToUnsignedChars(dfa_88s);
+    static final short[] dfa_89 = DFA.unpackEncodedString(dfa_89s);
+    static final short[] dfa_90 = DFA.unpackEncodedString(dfa_90s);
+    static final short[][] dfa_91 = unpackEncodedStringArray(dfa_91s);
 
     class DFA100 extends DFA {
 
         public DFA100(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 100;
-            this.eot = DFA100_eot;
-            this.eof = DFA100_eof;
-            this.min = DFA100_min;
-            this.max = DFA100_max;
-            this.accept = DFA100_accept;
-            this.special = DFA100_special;
-            this.transition = DFA100_transition;
+            this.eot = dfa_86;
+            this.eof = dfa_86;
+            this.min = dfa_87;
+            this.max = dfa_88;
+            this.accept = dfa_89;
+            this.special = dfa_90;
+            this.transition = dfa_91;
         }
         public String getDescription() {
             return "5176:7: ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )?";
@@ -28482,146 +28045,19 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA123_eotS =
-        "\140\uffff";
-    static final String DFA123_eofS =
-        "\1\2\137\uffff";
-    static final String DFA123_minS =
-        "\1\4\1\0\136\uffff";
-    static final String DFA123_maxS =
-        "\1\152\1\0\136\uffff";
-    static final String DFA123_acceptS =
-        "\2\uffff\1\2\134\uffff\1\1";
-    static final String DFA123_specialS =
-        "\1\uffff\1\0\136\uffff}>";
-    static final String[] DFA123_transitionS = {
-            "\5\2\6\uffff\10\2\1\1\3\2\1\uffff\2\2\2\uffff\64\2\1\uffff"+
-            "\26\2",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA123_eot = DFA.unpackEncodedString(DFA123_eotS);
-    static final short[] DFA123_eof = DFA.unpackEncodedString(DFA123_eofS);
-    static final char[] DFA123_min = DFA.unpackEncodedStringToUnsignedChars(DFA123_minS);
-    static final char[] DFA123_max = DFA.unpackEncodedStringToUnsignedChars(DFA123_maxS);
-    static final short[] DFA123_accept = DFA.unpackEncodedString(DFA123_acceptS);
-    static final short[] DFA123_special = DFA.unpackEncodedString(DFA123_specialS);
-    static final short[][] DFA123_transition;
-
-    static {
-        int numStates = DFA123_transitionS.length;
-        DFA123_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA123_transition[i] = DFA.unpackEncodedString(DFA123_transitionS[i]);
-        }
-    }
 
     class DFA123 extends DFA {
 
         public DFA123(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 123;
-            this.eot = DFA123_eot;
-            this.eof = DFA123_eof;
-            this.min = DFA123_min;
-            this.max = DFA123_max;
-            this.accept = DFA123_accept;
-            this.special = DFA123_special;
-            this.transition = DFA123_transition;
+            this.eot = dfa_15;
+            this.eof = dfa_16;
+            this.min = dfa_17;
+            this.max = dfa_18;
+            this.accept = dfa_19;
+            this.special = dfa_20;
+            this.transition = dfa_72;
         }
         public String getDescription() {
             return "6233:2: ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )?";
@@ -28653,106 +28089,19 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA122_eotS =
-        "\66\uffff";
-    static final String DFA122_eofS =
-        "\66\uffff";
-    static final String DFA122_minS =
-        "\1\4\2\0\63\uffff";
-    static final String DFA122_maxS =
-        "\1\151\2\0\63\uffff";
-    static final String DFA122_acceptS =
-        "\3\uffff\2\1\1\2\57\uffff\1\3";
-    static final String DFA122_specialS =
-        "\1\0\1\1\1\2\63\uffff}>";
-    static final String[] DFA122_transitionS = {
-            "\4\5\1\1\6\uffff\4\5\1\uffff\1\5\1\uffff\1\5\1\2\1\uffff\1"+
-            "\65\1\5\1\uffff\1\5\3\uffff\2\5\1\uffff\20\5\5\uffff\1\5\13"+
-            "\uffff\1\3\2\uffff\2\5\4\uffff\1\5\6\uffff\1\4\1\5\1\uffff\1"+
-            "\5\3\uffff\2\5\2\uffff\11\5\1\uffff\1\5",
-            "\1\uffff",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA122_eot = DFA.unpackEncodedString(DFA122_eotS);
-    static final short[] DFA122_eof = DFA.unpackEncodedString(DFA122_eofS);
-    static final char[] DFA122_min = DFA.unpackEncodedStringToUnsignedChars(DFA122_minS);
-    static final char[] DFA122_max = DFA.unpackEncodedStringToUnsignedChars(DFA122_maxS);
-    static final short[] DFA122_accept = DFA.unpackEncodedString(DFA122_acceptS);
-    static final short[] DFA122_special = DFA.unpackEncodedString(DFA122_specialS);
-    static final short[][] DFA122_transition;
-
-    static {
-        int numStates = DFA122_transitionS.length;
-        DFA122_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA122_transition[i] = DFA.unpackEncodedString(DFA122_transitionS[i]);
-        }
-    }
 
     class DFA122 extends DFA {
 
         public DFA122(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 122;
-            this.eot = DFA122_eot;
-            this.eof = DFA122_eof;
-            this.min = DFA122_min;
-            this.max = DFA122_max;
-            this.accept = DFA122_accept;
-            this.special = DFA122_special;
-            this.transition = DFA122_transition;
+            this.eot = dfa_35;
+            this.eof = dfa_35;
+            this.min = dfa_73;
+            this.max = dfa_74;
+            this.accept = dfa_75;
+            this.special = dfa_76;
+            this.transition = dfa_77;
         }
         public String getDescription() {
             return "6254:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )?";
@@ -28822,146 +28171,19 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA124_eotS =
-        "\140\uffff";
-    static final String DFA124_eofS =
-        "\1\2\137\uffff";
-    static final String DFA124_minS =
-        "\1\4\1\0\136\uffff";
-    static final String DFA124_maxS =
-        "\1\152\1\0\136\uffff";
-    static final String DFA124_acceptS =
-        "\2\uffff\1\2\134\uffff\1\1";
-    static final String DFA124_specialS =
-        "\1\uffff\1\0\136\uffff}>";
-    static final String[] DFA124_transitionS = {
-            "\5\2\6\uffff\14\2\1\uffff\2\2\2\uffff\1\2\1\1\62\2\1\uffff"+
-            "\26\2",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA124_eot = DFA.unpackEncodedString(DFA124_eotS);
-    static final short[] DFA124_eof = DFA.unpackEncodedString(DFA124_eofS);
-    static final char[] DFA124_min = DFA.unpackEncodedStringToUnsignedChars(DFA124_minS);
-    static final char[] DFA124_max = DFA.unpackEncodedStringToUnsignedChars(DFA124_maxS);
-    static final short[] DFA124_accept = DFA.unpackEncodedString(DFA124_acceptS);
-    static final short[] DFA124_special = DFA.unpackEncodedString(DFA124_specialS);
-    static final short[][] DFA124_transition;
-
-    static {
-        int numStates = DFA124_transitionS.length;
-        DFA124_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA124_transition[i] = DFA.unpackEncodedString(DFA124_transitionS[i]);
-        }
-    }
 
     class DFA124 extends DFA {
 
         public DFA124(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 124;
-            this.eot = DFA124_eot;
-            this.eof = DFA124_eof;
-            this.min = DFA124_min;
-            this.max = DFA124_max;
-            this.accept = DFA124_accept;
-            this.special = DFA124_special;
-            this.transition = DFA124_transition;
+            this.eot = dfa_15;
+            this.eof = dfa_16;
+            this.min = dfa_17;
+            this.max = dfa_18;
+            this.accept = dfa_19;
+            this.special = dfa_20;
+            this.transition = dfa_78;
         }
         public String getDescription() {
             return "6333:3: ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )?";
@@ -28993,21 +28215,8 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA127_eotS =
-        "\140\uffff";
-    static final String DFA127_eofS =
-        "\1\2\137\uffff";
-    static final String DFA127_minS =
-        "\1\4\1\0\136\uffff";
-    static final String DFA127_maxS =
-        "\1\152\1\0\136\uffff";
-    static final String DFA127_acceptS =
-        "\2\uffff\1\2\134\uffff\1\1";
-    static final String DFA127_specialS =
-        "\1\uffff\1\0\136\uffff}>";
-    static final String[] DFA127_transitionS = {
-            "\5\2\6\uffff\14\2\1\uffff\2\2\2\uffff\30\2\1\1\33\2\1\uffff"+
-            "\26\2",
+    static final String[] dfa_92s = {
+            "\5\2\6\uffff\14\2\1\uffff\2\2\2\uffff\30\2\1\1\33\2\1\uffff\26\2",
             "\1\uffff",
             "",
             "",
@@ -29104,35 +28313,20 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             "",
             ""
     };
-
-    static final short[] DFA127_eot = DFA.unpackEncodedString(DFA127_eotS);
-    static final short[] DFA127_eof = DFA.unpackEncodedString(DFA127_eofS);
-    static final char[] DFA127_min = DFA.unpackEncodedStringToUnsignedChars(DFA127_minS);
-    static final char[] DFA127_max = DFA.unpackEncodedStringToUnsignedChars(DFA127_maxS);
-    static final short[] DFA127_accept = DFA.unpackEncodedString(DFA127_acceptS);
-    static final short[] DFA127_special = DFA.unpackEncodedString(DFA127_specialS);
-    static final short[][] DFA127_transition;
-
-    static {
-        int numStates = DFA127_transitionS.length;
-        DFA127_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA127_transition[i] = DFA.unpackEncodedString(DFA127_transitionS[i]);
-        }
-    }
+    static final short[][] dfa_92 = unpackEncodedStringArray(dfa_92s);
 
     class DFA127 extends DFA {
 
         public DFA127(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 127;
-            this.eot = DFA127_eot;
-            this.eof = DFA127_eof;
-            this.min = DFA127_min;
-            this.max = DFA127_max;
-            this.accept = DFA127_accept;
-            this.special = DFA127_special;
-            this.transition = DFA127_transition;
+            this.eot = dfa_15;
+            this.eof = dfa_16;
+            this.min = dfa_17;
+            this.max = dfa_18;
+            this.accept = dfa_19;
+            this.special = dfa_20;
+            this.transition = dfa_92;
         }
         public String getDescription() {
             return "6438:2: ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )?";
@@ -29164,146 +28358,19 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA130_eotS =
-        "\140\uffff";
-    static final String DFA130_eofS =
-        "\1\2\137\uffff";
-    static final String DFA130_minS =
-        "\1\4\1\0\136\uffff";
-    static final String DFA130_maxS =
-        "\1\152\1\0\136\uffff";
-    static final String DFA130_acceptS =
-        "\2\uffff\1\2\134\uffff\1\1";
-    static final String DFA130_specialS =
-        "\1\uffff\1\0\136\uffff}>";
-    static final String[] DFA130_transitionS = {
-            "\5\2\6\uffff\10\2\1\1\3\2\1\uffff\2\2\2\uffff\64\2\1\uffff"+
-            "\26\2",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA130_eot = DFA.unpackEncodedString(DFA130_eotS);
-    static final short[] DFA130_eof = DFA.unpackEncodedString(DFA130_eofS);
-    static final char[] DFA130_min = DFA.unpackEncodedStringToUnsignedChars(DFA130_minS);
-    static final char[] DFA130_max = DFA.unpackEncodedStringToUnsignedChars(DFA130_maxS);
-    static final short[] DFA130_accept = DFA.unpackEncodedString(DFA130_acceptS);
-    static final short[] DFA130_special = DFA.unpackEncodedString(DFA130_specialS);
-    static final short[][] DFA130_transition;
-
-    static {
-        int numStates = DFA130_transitionS.length;
-        DFA130_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA130_transition[i] = DFA.unpackEncodedString(DFA130_transitionS[i]);
-        }
-    }
 
     class DFA130 extends DFA {
 
         public DFA130(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 130;
-            this.eot = DFA130_eot;
-            this.eof = DFA130_eof;
-            this.min = DFA130_min;
-            this.max = DFA130_max;
-            this.accept = DFA130_accept;
-            this.special = DFA130_special;
-            this.transition = DFA130_transition;
+            this.eot = dfa_15;
+            this.eof = dfa_16;
+            this.min = dfa_17;
+            this.max = dfa_18;
+            this.accept = dfa_19;
+            this.special = dfa_20;
+            this.transition = dfa_72;
         }
         public String getDescription() {
             return "6487:3: ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )?";
@@ -29335,106 +28402,19 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA129_eotS =
-        "\66\uffff";
-    static final String DFA129_eofS =
-        "\66\uffff";
-    static final String DFA129_minS =
-        "\1\4\2\0\63\uffff";
-    static final String DFA129_maxS =
-        "\1\151\2\0\63\uffff";
-    static final String DFA129_acceptS =
-        "\3\uffff\2\1\1\2\57\uffff\1\3";
-    static final String DFA129_specialS =
-        "\1\0\1\1\1\2\63\uffff}>";
-    static final String[] DFA129_transitionS = {
-            "\4\5\1\1\6\uffff\4\5\1\uffff\1\5\1\uffff\1\5\1\2\1\uffff\1"+
-            "\65\1\5\1\uffff\1\5\3\uffff\2\5\1\uffff\20\5\5\uffff\1\5\13"+
-            "\uffff\1\3\2\uffff\2\5\4\uffff\1\5\6\uffff\1\4\1\5\1\uffff\1"+
-            "\5\3\uffff\2\5\2\uffff\11\5\1\uffff\1\5",
-            "\1\uffff",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA129_eot = DFA.unpackEncodedString(DFA129_eotS);
-    static final short[] DFA129_eof = DFA.unpackEncodedString(DFA129_eofS);
-    static final char[] DFA129_min = DFA.unpackEncodedStringToUnsignedChars(DFA129_minS);
-    static final char[] DFA129_max = DFA.unpackEncodedStringToUnsignedChars(DFA129_maxS);
-    static final short[] DFA129_accept = DFA.unpackEncodedString(DFA129_acceptS);
-    static final short[] DFA129_special = DFA.unpackEncodedString(DFA129_specialS);
-    static final short[][] DFA129_transition;
-
-    static {
-        int numStates = DFA129_transitionS.length;
-        DFA129_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA129_transition[i] = DFA.unpackEncodedString(DFA129_transitionS[i]);
-        }
-    }
 
     class DFA129 extends DFA {
 
         public DFA129(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 129;
-            this.eot = DFA129_eot;
-            this.eof = DFA129_eof;
-            this.min = DFA129_min;
-            this.max = DFA129_max;
-            this.accept = DFA129_accept;
-            this.special = DFA129_special;
-            this.transition = DFA129_transition;
+            this.eot = dfa_35;
+            this.eof = dfa_35;
+            this.min = dfa_73;
+            this.max = dfa_74;
+            this.accept = dfa_75;
+            this.special = dfa_76;
+            this.transition = dfa_77;
         }
         public String getDescription() {
             return "6508:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )?";
@@ -29504,146 +28484,19 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA131_eotS =
-        "\140\uffff";
-    static final String DFA131_eofS =
-        "\1\2\137\uffff";
-    static final String DFA131_minS =
-        "\1\4\1\0\136\uffff";
-    static final String DFA131_maxS =
-        "\1\152\1\0\136\uffff";
-    static final String DFA131_acceptS =
-        "\2\uffff\1\2\134\uffff\1\1";
-    static final String DFA131_specialS =
-        "\1\uffff\1\0\136\uffff}>";
-    static final String[] DFA131_transitionS = {
-            "\5\2\6\uffff\14\2\1\uffff\2\2\2\uffff\1\2\1\1\62\2\1\uffff"+
-            "\26\2",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA131_eot = DFA.unpackEncodedString(DFA131_eotS);
-    static final short[] DFA131_eof = DFA.unpackEncodedString(DFA131_eofS);
-    static final char[] DFA131_min = DFA.unpackEncodedStringToUnsignedChars(DFA131_minS);
-    static final char[] DFA131_max = DFA.unpackEncodedStringToUnsignedChars(DFA131_maxS);
-    static final short[] DFA131_accept = DFA.unpackEncodedString(DFA131_acceptS);
-    static final short[] DFA131_special = DFA.unpackEncodedString(DFA131_specialS);
-    static final short[][] DFA131_transition;
-
-    static {
-        int numStates = DFA131_transitionS.length;
-        DFA131_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA131_transition[i] = DFA.unpackEncodedString(DFA131_transitionS[i]);
-        }
-    }
 
     class DFA131 extends DFA {
 
         public DFA131(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 131;
-            this.eot = DFA131_eot;
-            this.eof = DFA131_eof;
-            this.min = DFA131_min;
-            this.max = DFA131_max;
-            this.accept = DFA131_accept;
-            this.special = DFA131_special;
-            this.transition = DFA131_transition;
+            this.eot = dfa_15;
+            this.eof = dfa_16;
+            this.min = dfa_17;
+            this.max = dfa_18;
+            this.accept = dfa_19;
+            this.special = dfa_20;
+            this.transition = dfa_78;
         }
         public String getDescription() {
             return "6587:3: ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )?";
@@ -29675,29 +28528,13 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA134_eotS =
-        "\140\uffff";
-    static final String DFA134_eofS =
-        "\1\63\137\uffff";
-    static final String DFA134_minS =
-        "\1\4\62\0\55\uffff";
-    static final String DFA134_maxS =
-        "\1\152\62\0\55\uffff";
-    static final String DFA134_acceptS =
-        "\63\uffff\1\2\53\uffff\1\1";
-    static final String DFA134_specialS =
-        "\1\uffff\1\0\1\1\1\2\1\3\1\4\1\5\1\6\1\7\1\10\1\11\1\12\1\13\1"+
-        "\14\1\15\1\16\1\17\1\20\1\21\1\22\1\23\1\24\1\25\1\26\1\27\1\30"+
-        "\1\31\1\32\1\33\1\34\1\35\1\36\1\37\1\40\1\41\1\42\1\43\1\44\1\45"+
-        "\1\46\1\47\1\50\1\51\1\52\1\53\1\54\1\55\1\56\1\57\1\60\1\61\55"+
-        "\uffff}>";
-    static final String[] DFA134_transitionS = {
-            "\1\47\1\43\1\44\1\45\1\1\6\uffff\1\6\1\52\1\7\1\32\1\63\1\4"+
-            "\1\63\1\11\1\60\2\63\1\12\1\uffff\1\16\1\63\2\uffff\1\37\1\40"+
-            "\1\63\1\61\1\62\1\13\1\14\1\15\1\2\1\3\1\5\1\10\1\17\1\20\1"+
-            "\21\1\22\1\23\1\24\1\25\5\63\1\35\16\63\1\30\1\27\4\63\1\26"+
-            "\6\63\1\uffff\1\51\1\63\1\33\3\63\1\53\1\54\2\63\1\36\1\31\1"+
-            "\41\1\42\1\46\1\50\1\55\1\56\1\57\1\63\1\34\1\63",
+    static final String dfa_93s = "\1\63\137\uffff";
+    static final String dfa_94s = "\1\4\62\0\55\uffff";
+    static final String dfa_95s = "\1\152\62\0\55\uffff";
+    static final String dfa_96s = "\63\uffff\1\2\53\uffff\1\1";
+    static final String dfa_97s = "\1\uffff\1\0\1\1\1\2\1\3\1\4\1\5\1\6\1\7\1\10\1\11\1\12\1\13\1\14\1\15\1\16\1\17\1\20\1\21\1\22\1\23\1\24\1\25\1\26\1\27\1\30\1\31\1\32\1\33\1\34\1\35\1\36\1\37\1\40\1\41\1\42\1\43\1\44\1\45\1\46\1\47\1\50\1\51\1\52\1\53\1\54\1\55\1\56\1\57\1\60\1\61\55\uffff}>";
+    static final String[] dfa_98s = {
+            "\1\47\1\43\1\44\1\45\1\1\6\uffff\1\6\1\52\1\7\1\32\1\63\1\4\1\63\1\11\1\60\2\63\1\12\1\uffff\1\16\1\63\2\uffff\1\37\1\40\1\63\1\61\1\62\1\13\1\14\1\15\1\2\1\3\1\5\1\10\1\17\1\20\1\21\1\22\1\23\1\24\1\25\5\63\1\35\16\63\1\30\1\27\4\63\1\26\6\63\1\uffff\1\51\1\63\1\33\3\63\1\53\1\54\2\63\1\36\1\31\1\41\1\42\1\46\1\50\1\55\1\56\1\57\1\63\1\34\1\63",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -29794,35 +28631,25 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             "",
             ""
     };
-
-    static final short[] DFA134_eot = DFA.unpackEncodedString(DFA134_eotS);
-    static final short[] DFA134_eof = DFA.unpackEncodedString(DFA134_eofS);
-    static final char[] DFA134_min = DFA.unpackEncodedStringToUnsignedChars(DFA134_minS);
-    static final char[] DFA134_max = DFA.unpackEncodedStringToUnsignedChars(DFA134_maxS);
-    static final short[] DFA134_accept = DFA.unpackEncodedString(DFA134_acceptS);
-    static final short[] DFA134_special = DFA.unpackEncodedString(DFA134_specialS);
-    static final short[][] DFA134_transition;
-
-    static {
-        int numStates = DFA134_transitionS.length;
-        DFA134_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA134_transition[i] = DFA.unpackEncodedString(DFA134_transitionS[i]);
-        }
-    }
+    static final short[] dfa_93 = DFA.unpackEncodedString(dfa_93s);
+    static final char[] dfa_94 = DFA.unpackEncodedStringToUnsignedChars(dfa_94s);
+    static final char[] dfa_95 = DFA.unpackEncodedStringToUnsignedChars(dfa_95s);
+    static final short[] dfa_96 = DFA.unpackEncodedString(dfa_96s);
+    static final short[] dfa_97 = DFA.unpackEncodedString(dfa_97s);
+    static final short[][] dfa_98 = unpackEncodedStringArray(dfa_98s);
 
     class DFA134 extends DFA {
 
         public DFA134(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 134;
-            this.eot = DFA134_eot;
-            this.eof = DFA134_eof;
-            this.min = DFA134_min;
-            this.max = DFA134_max;
-            this.accept = DFA134_accept;
-            this.special = DFA134_special;
-            this.transition = DFA134_transition;
+            this.eot = dfa_15;
+            this.eof = dfa_93;
+            this.min = dfa_94;
+            this.max = dfa_95;
+            this.accept = dfa_96;
+            this.special = dfa_97;
+            this.transition = dfa_98;
         }
         public String getDescription() {
             return "6927:1: ( ( 'extends' | 'static' | 'import' | 'extension' | 'catalog' | 'grammar' | 'with' | 'category' | 'message' | 'on' | 'bind' | 'data' | 'SeverityRange' | 'error' | 'warning' | 'info' | 'ignore' | 'live' | 'onSave' | 'onDemand' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | 'guard' | 'issue' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )?";
@@ -30589,21 +29416,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA152_eotS =
-        "\141\uffff";
-    static final String DFA152_eofS =
-        "\1\2\140\uffff";
-    static final String DFA152_minS =
-        "\1\4\1\0\137\uffff";
-    static final String DFA152_maxS =
-        "\1\154\1\0\137\uffff";
-    static final String DFA152_acceptS =
-        "\2\uffff\1\2\135\uffff\1\1";
-    static final String DFA152_specialS =
-        "\1\uffff\1\0\137\uffff}>";
-    static final String[] DFA152_transitionS = {
-            "\5\2\6\uffff\14\2\1\uffff\2\2\2\uffff\30\2\1\1\33\2\1\uffff"+
-            "\26\2\1\uffff\1\2",
+    static final String dfa_99s = "\141\uffff";
+    static final String dfa_100s = "\1\2\140\uffff";
+    static final String dfa_101s = "\1\4\1\0\137\uffff";
+    static final String dfa_102s = "\1\154\1\0\137\uffff";
+    static final String dfa_103s = "\2\uffff\1\2\135\uffff\1\1";
+    static final String dfa_104s = "\1\uffff\1\0\137\uffff}>";
+    static final String[] dfa_105s = {
+            "\5\2\6\uffff\14\2\1\uffff\2\2\2\uffff\30\2\1\1\33\2\1\uffff\26\2\1\uffff\1\2",
             "\1\uffff",
             "",
             "",
@@ -30702,34 +29522,26 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA152_eot = DFA.unpackEncodedString(DFA152_eotS);
-    static final short[] DFA152_eof = DFA.unpackEncodedString(DFA152_eofS);
-    static final char[] DFA152_min = DFA.unpackEncodedStringToUnsignedChars(DFA152_minS);
-    static final char[] DFA152_max = DFA.unpackEncodedStringToUnsignedChars(DFA152_maxS);
-    static final short[] DFA152_accept = DFA.unpackEncodedString(DFA152_acceptS);
-    static final short[] DFA152_special = DFA.unpackEncodedString(DFA152_specialS);
-    static final short[][] DFA152_transition;
-
-    static {
-        int numStates = DFA152_transitionS.length;
-        DFA152_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA152_transition[i] = DFA.unpackEncodedString(DFA152_transitionS[i]);
-        }
-    }
+    static final short[] dfa_99 = DFA.unpackEncodedString(dfa_99s);
+    static final short[] dfa_100 = DFA.unpackEncodedString(dfa_100s);
+    static final char[] dfa_101 = DFA.unpackEncodedStringToUnsignedChars(dfa_101s);
+    static final char[] dfa_102 = DFA.unpackEncodedStringToUnsignedChars(dfa_102s);
+    static final short[] dfa_103 = DFA.unpackEncodedString(dfa_103s);
+    static final short[] dfa_104 = DFA.unpackEncodedString(dfa_104s);
+    static final short[][] dfa_105 = unpackEncodedStringArray(dfa_105s);
 
     class DFA152 extends DFA {
 
         public DFA152(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 152;
-            this.eot = DFA152_eot;
-            this.eof = DFA152_eof;
-            this.min = DFA152_min;
-            this.max = DFA152_max;
-            this.accept = DFA152_accept;
-            this.special = DFA152_special;
-            this.transition = DFA152_transition;
+            this.eot = dfa_99;
+            this.eof = dfa_100;
+            this.min = dfa_101;
+            this.max = dfa_102;
+            this.accept = dfa_103;
+            this.special = dfa_104;
+            this.transition = dfa_105;
         }
         public String getDescription() {
             return "7595:2: ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )?";
@@ -30761,147 +29573,19 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA150_eotS =
-        "\141\uffff";
-    static final String DFA150_eofS =
-        "\1\2\140\uffff";
-    static final String DFA150_minS =
-        "\1\4\1\0\137\uffff";
-    static final String DFA150_maxS =
-        "\1\154\1\0\137\uffff";
-    static final String DFA150_acceptS =
-        "\2\uffff\1\2\135\uffff\1\1";
-    static final String DFA150_specialS =
-        "\1\uffff\1\0\137\uffff}>";
-    static final String[] DFA150_transitionS = {
-            "\5\2\6\uffff\14\2\1\uffff\2\2\2\uffff\30\2\1\1\33\2\1\uffff"+
-            "\26\2\1\uffff\1\2",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA150_eot = DFA.unpackEncodedString(DFA150_eotS);
-    static final short[] DFA150_eof = DFA.unpackEncodedString(DFA150_eofS);
-    static final char[] DFA150_min = DFA.unpackEncodedStringToUnsignedChars(DFA150_minS);
-    static final char[] DFA150_max = DFA.unpackEncodedStringToUnsignedChars(DFA150_maxS);
-    static final short[] DFA150_accept = DFA.unpackEncodedString(DFA150_acceptS);
-    static final short[] DFA150_special = DFA.unpackEncodedString(DFA150_specialS);
-    static final short[][] DFA150_transition;
-
-    static {
-        int numStates = DFA150_transitionS.length;
-        DFA150_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA150_transition[i] = DFA.unpackEncodedString(DFA150_transitionS[i]);
-        }
-    }
 
     class DFA150 extends DFA {
 
         public DFA150(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 150;
-            this.eot = DFA150_eot;
-            this.eof = DFA150_eof;
-            this.min = DFA150_min;
-            this.max = DFA150_max;
-            this.accept = DFA150_accept;
-            this.special = DFA150_special;
-            this.transition = DFA150_transition;
+            this.eot = dfa_99;
+            this.eof = dfa_100;
+            this.min = dfa_101;
+            this.max = dfa_102;
+            this.accept = dfa_103;
+            this.special = dfa_104;
+            this.transition = dfa_105;
         }
         public String getDescription() {
             return "7671:2: ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )?";
@@ -30935,805 +29619,122 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
     }
  
 
-    public static final BitSet FOLLOW_ruleCheckCatalog_in_entryRuleCheckCatalog75 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleCheckCatalog85 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_13_in_ruleCheckCatalog131 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleCheckCatalog152 = new BitSet(new long[]{0x000000000010C000L});
-    public static final BitSet FOLLOW_ruleXImportSection_in_ruleCheckCatalog173 = new BitSet(new long[]{0x000000000000C000L});
-    public static final BitSet FOLLOW_14_in_ruleCheckCatalog191 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleCheckCatalog217 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleCheckCatalog238 = new BitSet(new long[]{0x0000000000050000L});
-    public static final BitSet FOLLOW_16_in_ruleCheckCatalog251 = new BitSet(new long[]{0x0000000000020000L});
-    public static final BitSet FOLLOW_17_in_ruleCheckCatalog263 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleCheckCatalog286 = new BitSet(new long[]{0x0000000000040000L});
-    public static final BitSet FOLLOW_18_in_ruleCheckCatalog300 = new BitSet(new long[]{0x0007F00048C84100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleCategory_in_ruleCheckCatalog322 = new BitSet(new long[]{0x0007F00048C84100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleImplementation_in_ruleCheckCatalog349 = new BitSet(new long[]{0x0007F00048C84100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleCheck_in_ruleCheckCatalog376 = new BitSet(new long[]{0x0007F00048C84100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleMember_in_ruleCheckCatalog403 = new BitSet(new long[]{0x0007F00048C84100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_19_in_ruleCheckCatalog417 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXImportSection_in_entryRuleXImportSection453 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXImportSection463 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXImportDeclaration_in_ruleXImportSection518 = new BitSet(new long[]{0x0000000000100002L});
-    public static final BitSet FOLLOW_ruleXImportDeclaration_in_entryRuleXImportDeclaration555 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXImportDeclaration565 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_20_in_ruleXImportDeclaration602 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleXImportDeclaration626 = new BitSet(new long[]{0x0000000000200002L});
-    public static final BitSet FOLLOW_ruleQualifiedNameWithWildcard_in_ruleXImportDeclaration653 = new BitSet(new long[]{0x0000000000200002L});
-    public static final BitSet FOLLOW_21_in_ruleXImportDeclaration667 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCategory_in_entryRuleCategory709 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleCategory719 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_22_in_ruleCategory756 = new BitSet(new long[]{0x0000000000000110L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleCategory777 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleCategory795 = new BitSet(new long[]{0x0000000000040000L});
-    public static final BitSet FOLLOW_18_in_ruleCategory812 = new BitSet(new long[]{0x0007F00008084000L});
-    public static final BitSet FOLLOW_ruleCheck_in_ruleCategory833 = new BitSet(new long[]{0x0007F00008084000L});
-    public static final BitSet FOLLOW_19_in_ruleCategory846 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCheck_in_entryRuleCheck882 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleCheck892 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSeverityRange_in_ruleCheck938 = new BitSet(new long[]{0x0007F00008004000L});
-    public static final BitSet FOLLOW_14_in_ruleCheck957 = new BitSet(new long[]{0x0007F00008004000L});
-    public static final BitSet FOLLOW_ruleTriggerKind_in_ruleCheck992 = new BitSet(new long[]{0x0007F00008004000L});
-    public static final BitSet FOLLOW_ruleSeverityKind_in_ruleCheck1014 = new BitSet(new long[]{0x0000000000000110L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleCheck1035 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleCheck1053 = new BitSet(new long[]{0x0000000004850002L});
-    public static final BitSet FOLLOW_23_in_ruleCheck1079 = new BitSet(new long[]{0x0000000002000100L});
-    public static final BitSet FOLLOW_ruleFormalParameter_in_ruleCheck1102 = new BitSet(new long[]{0x0000000003000000L});
-    public static final BitSet FOLLOW_24_in_ruleCheck1115 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleFormalParameter_in_ruleCheck1136 = new BitSet(new long[]{0x0000000003000000L});
-    public static final BitSet FOLLOW_25_in_ruleCheck1152 = new BitSet(new long[]{0x0000000004050002L});
-    public static final BitSet FOLLOW_26_in_ruleCheck1167 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleCheck1184 = new BitSet(new long[]{0x0000000000050002L});
-    public static final BitSet FOLLOW_18_in_ruleCheck1213 = new BitSet(new long[]{0x0000000000090000L});
-    public static final BitSet FOLLOW_ruleContext_in_ruleCheck1235 = new BitSet(new long[]{0x0000000000090000L});
-    public static final BitSet FOLLOW_19_in_ruleCheck1248 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleContext_in_ruleCheck1276 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSeverityRange_in_entryRuleSeverityRange1314 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSeverityRange1324 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_ruleSeverityRange1361 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_28_in_ruleSeverityRange1373 = new BitSet(new long[]{0x0000000000800000L});
-    public static final BitSet FOLLOW_23_in_ruleSeverityRange1385 = new BitSet(new long[]{0x0007F00008004000L});
-    public static final BitSet FOLLOW_ruleSeverityKind_in_ruleSeverityRange1406 = new BitSet(new long[]{0x0000000020000000L});
-    public static final BitSet FOLLOW_29_in_ruleSeverityRange1418 = new BitSet(new long[]{0x0007F00008004000L});
-    public static final BitSet FOLLOW_ruleSeverityKind_in_ruleSeverityRange1439 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_ruleSeverityRange1451 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMember_in_entryRuleMember1487 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleMember1497 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotation_in_ruleMember1543 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleMember1565 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleMember1586 = new BitSet(new long[]{0x0000000080200000L});
-    public static final BitSet FOLLOW_ruleOpSingleAssign_in_ruleMember1603 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXOrExpression_in_ruleMember1623 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_21_in_ruleMember1637 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImplementation_in_entryRuleImplementation1673 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleImplementation1683 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_ruleImplementation1720 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleImplementation1741 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_ruleContext_in_ruleImplementation1762 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFormalParameter_in_entryRuleFormalParameter1798 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFormalParameter1808 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmParameterizedTypeReference_in_ruleFormalParameter1854 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleFormalParameter1875 = new BitSet(new long[]{0x0000000080000000L});
-    public static final BitSet FOLLOW_31_in_ruleFormalParameter1887 = new BitSet(new long[]{0x00000001000000F0L,0x0000000600002180L});
-    public static final BitSet FOLLOW_ruleXFormalParameterDefaultValueLiteral_in_ruleFormalParameter1908 = new BitSet(new long[]{0x0000000000000012L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleFormalParameter1925 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSimpleFormalParameterDefaultValueLiteral_in_entryRuleXSimpleFormalParameterDefaultValueLiteral1967 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXSimpleFormalParameterDefaultValueLiteral1977 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBooleanLiteral_in_ruleXSimpleFormalParameterDefaultValueLiteral2024 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXNumberLiteral_in_ruleXSimpleFormalParameterDefaultValueLiteral2051 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXStringLiteral_in_ruleXSimpleFormalParameterDefaultValueLiteral2078 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstantUnaryOperation_in_entryRuleXConstantUnaryOperation2113 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXConstantUnaryOperation2123 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpUnary_in_ruleXConstantUnaryOperation2181 = new BitSet(new long[]{0x00000000000000F0L,0x0000000600002180L});
-    public static final BitSet FOLLOW_ruleXConstantUnaryOperation_in_ruleXConstantUnaryOperation2202 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSimpleFormalParameterDefaultValueLiteral_in_ruleXConstantUnaryOperation2231 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXFormalParameterDefaultValueLiteral_in_entryRuleXFormalParameterDefaultValueLiteral2266 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXFormalParameterDefaultValueLiteral2276 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstantUnaryOperation_in_ruleXFormalParameterDefaultValueLiteral2323 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstantListLiteral_in_ruleXFormalParameterDefaultValueLiteral2350 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstantListLiteral_in_entryRuleXConstantListLiteral2385 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXConstantListLiteral2395 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_ruleXConstantListLiteral2441 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_33_in_ruleXConstantListLiteral2453 = new BitSet(new long[]{0x00000004000000F0L,0x0000000600002180L});
-    public static final BitSet FOLLOW_ruleXConstantUnaryOperation_in_ruleXConstantListLiteral2475 = new BitSet(new long[]{0x0000000401000000L});
-    public static final BitSet FOLLOW_24_in_ruleXConstantListLiteral2488 = new BitSet(new long[]{0x00000000000000F0L,0x0000000600002180L});
-    public static final BitSet FOLLOW_ruleXConstantUnaryOperation_in_ruleXConstantListLiteral2509 = new BitSet(new long[]{0x0000000401000000L});
-    public static final BitSet FOLLOW_34_in_ruleXConstantListLiteral2525 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleContext_in_entryRuleContext2561 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleContext2571 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_16_in_ruleContext2608 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleContextVariable_in_ruleContext2629 = new BitSet(new long[]{0x0000000000040000L});
-    public static final BitSet FOLLOW_ruleXBlockExpression_in_ruleContext2650 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleContextVariable_in_entryRuleContextVariable2686 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleContextVariable2696 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleContextVariable2742 = new BitSet(new long[]{0x0000000000000102L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleContextVariable2763 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXGuardExpression_in_entryRuleXGuardExpression2800 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXGuardExpression2810 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_35_in_ruleXGuardExpression2856 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXGuardExpression2877 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXIssueExpression_in_entryRuleXIssueExpression2913 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXIssueExpression2923 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_ruleXIssueExpression2969 = new BitSet(new long[]{0x000000E004000102L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleXIssueExpression3004 = new BitSet(new long[]{0x000000E004000002L});
-    public static final BitSet FOLLOW_37_in_ruleXIssueExpression3026 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_32_in_ruleXIssueExpression3049 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleXIssueExpression3073 = new BitSet(new long[]{0x000000C204000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXIssueExpression3102 = new BitSet(new long[]{0x000000C304000002L});
-    public static final BitSet FOLLOW_32_in_ruleXIssueExpression3123 = new BitSet(new long[]{0x0007FFE014528100L});
-    public static final BitSet FOLLOW_ruleFeatureCallID_in_ruleXIssueExpression3147 = new BitSet(new long[]{0x000000C204000002L});
-    public static final BitSet FOLLOW_33_in_ruleXIssueExpression3172 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXIssueExpression3194 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_34_in_ruleXIssueExpression3206 = new BitSet(new long[]{0x000000C004000002L});
-    public static final BitSet FOLLOW_26_in_ruleXIssueExpression3231 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXIssueExpression3253 = new BitSet(new long[]{0x000000C000000002L});
-    public static final BitSet FOLLOW_38_in_ruleXIssueExpression3276 = new BitSet(new long[]{0x0000000000800000L});
-    public static final BitSet FOLLOW_23_in_ruleXIssueExpression3289 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXIssueExpression3310 = new BitSet(new long[]{0x0000000003000000L});
-    public static final BitSet FOLLOW_24_in_ruleXIssueExpression3331 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXIssueExpression3353 = new BitSet(new long[]{0x0000000003000000L});
-    public static final BitSet FOLLOW_25_in_ruleXIssueExpression3367 = new BitSet(new long[]{0x0000008000000002L});
-    public static final BitSet FOLLOW_39_in_ruleXIssueExpression3390 = new BitSet(new long[]{0x0000000000800100L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleXIssueExpression3412 = new BitSet(new long[]{0x0000000000800000L});
-    public static final BitSet FOLLOW_23_in_ruleXIssueExpression3425 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXIssueExpression3446 = new BitSet(new long[]{0x0000000003000000L});
-    public static final BitSet FOLLOW_24_in_ruleXIssueExpression3467 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXIssueExpression3489 = new BitSet(new long[]{0x0000000003000000L});
-    public static final BitSet FOLLOW_25_in_ruleXIssueExpression3503 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXPrimaryExpression_in_entryRuleXPrimaryExpression3541 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXPrimaryExpression3551 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstructorCall_in_ruleXPrimaryExpression3598 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBlockExpression_in_ruleXPrimaryExpression3625 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSwitchExpression_in_ruleXPrimaryExpression3652 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSynchronizedExpression_in_ruleXPrimaryExpression3696 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXFeatureCall_in_ruleXPrimaryExpression3724 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXLiteral_in_ruleXPrimaryExpression3751 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXIfExpression_in_ruleXPrimaryExpression3778 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXForLoopExpression_in_ruleXPrimaryExpression3835 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBasicForLoopExpression_in_ruleXPrimaryExpression3863 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXWhileExpression_in_ruleXPrimaryExpression3890 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXDoWhileExpression_in_ruleXPrimaryExpression3917 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXThrowExpression_in_ruleXPrimaryExpression3944 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXReturnExpression_in_ruleXPrimaryExpression3971 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXTryCatchFinallyExpression_in_ruleXPrimaryExpression3998 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXParenthesizedExpression_in_ruleXPrimaryExpression4025 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXGuardExpression_in_ruleXPrimaryExpression4052 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXIssueExpression_in_ruleXPrimaryExpression4079 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFeatureCallID_in_entryRuleFeatureCallID4115 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFeatureCallID4126 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleFeatureCallID4173 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_40_in_ruleFeatureCallID4197 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_ruleFeatureCallID4216 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_20_in_ruleFeatureCallID4235 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_ruleFeatureCallID4254 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_15_in_ruleFeatureCallID4273 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_17_in_ruleFeatureCallID4292 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_ruleFeatureCallID4311 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_22_in_ruleFeatureCallID4330 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_ruleFeatureCallID4349 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_37_in_ruleFeatureCallID4368 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_38_in_ruleFeatureCallID4387 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_39_in_ruleFeatureCallID4406 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_ruleFeatureCallID4425 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_44_in_ruleFeatureCallID4444 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_45_in_ruleFeatureCallID4463 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_ruleFeatureCallID4482 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_ruleFeatureCallID4501 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_ruleFeatureCallID4520 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_49_in_ruleFeatureCallID4539 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_50_in_ruleFeatureCallID4558 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotation_in_entryRuleXAnnotation4598 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAnnotation4608 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_ruleXAnnotation4654 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleXAnnotation4677 = new BitSet(new long[]{0x0000000000800002L});
-    public static final BitSet FOLLOW_23_in_ruleXAnnotation4698 = new BitSet(new long[]{0x0107FFFB1ED781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXAnnotationElementValuePair_in_ruleXAnnotation4742 = new BitSet(new long[]{0x0000000003000000L});
-    public static final BitSet FOLLOW_24_in_ruleXAnnotation4755 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleXAnnotationElementValuePair_in_ruleXAnnotation4796 = new BitSet(new long[]{0x0000000003000000L});
-    public static final BitSet FOLLOW_ruleXAnnotationElementValueOrCommaList_in_ruleXAnnotation4826 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_ruleXAnnotation4840 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationElementValuePair_in_entryRuleXAnnotationElementValuePair4878 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAnnotationElementValuePair4888 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleXAnnotationElementValuePair4958 = new BitSet(new long[]{0x0000000080000000L});
-    public static final BitSet FOLLOW_31_in_ruleXAnnotationElementValuePair4970 = new BitSet(new long[]{0x0107FFFB1CD781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXAnnotationElementValue_in_ruleXAnnotationElementValuePair4993 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationElementValueOrCommaList_in_entryRuleXAnnotationElementValueOrCommaList5029 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAnnotationElementValueOrCommaList5039 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_ruleXAnnotationElementValueOrCommaList5104 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_33_in_ruleXAnnotationElementValueOrCommaList5116 = new BitSet(new long[]{0x0107FFFF1CD781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValueOrCommaList5140 = new BitSet(new long[]{0x0000000401000000L});
-    public static final BitSet FOLLOW_24_in_ruleXAnnotationElementValueOrCommaList5153 = new BitSet(new long[]{0x0107FFFB1CD781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValueOrCommaList5174 = new BitSet(new long[]{0x0000000401000000L});
-    public static final BitSet FOLLOW_34_in_ruleXAnnotationElementValueOrCommaList5190 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValueOrCommaList5220 = new BitSet(new long[]{0x0000000001000002L});
-    public static final BitSet FOLLOW_24_in_ruleXAnnotationElementValueOrCommaList5242 = new BitSet(new long[]{0x0107FFFB1CD781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValueOrCommaList5263 = new BitSet(new long[]{0x0000000001000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationElementValue_in_entryRuleXAnnotationElementValue5304 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAnnotationElementValue5314 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_ruleXAnnotationElementValue5379 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_33_in_ruleXAnnotationElementValue5391 = new BitSet(new long[]{0x0107FFFF1CD781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValue5415 = new BitSet(new long[]{0x0000000401000000L});
-    public static final BitSet FOLLOW_24_in_ruleXAnnotationElementValue5428 = new BitSet(new long[]{0x0107FFFB1CD781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValue5449 = new BitSet(new long[]{0x0000000401000000L});
-    public static final BitSet FOLLOW_34_in_ruleXAnnotationElementValue5465 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValue5494 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_entryRuleXAnnotationOrExpression5529 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAnnotationOrExpression5539 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotation_in_ruleXAnnotationOrExpression5586 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXAnnotationOrExpression5613 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_entryRuleXExpression5648 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXExpression5658 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAssignment_in_ruleXExpression5704 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAssignment_in_entryRuleXAssignment5738 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAssignment5748 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFeatureCallID_in_ruleXAssignment5806 = new BitSet(new long[]{0x0000000080000000L});
-    public static final BitSet FOLLOW_ruleOpSingleAssign_in_ruleXAssignment5822 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXAssignment_in_ruleXAssignment5842 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXOrExpression_in_ruleXAssignment5872 = new BitSet(new long[]{0x03F8000000000002L});
-    public static final BitSet FOLLOW_ruleOpMultiAssign_in_ruleXAssignment5925 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXAssignment_in_ruleXAssignment5948 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpSingleAssign_in_entryRuleOpSingleAssign5988 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpSingleAssign5999 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_ruleOpSingleAssign6036 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpMultiAssign_in_entryRuleOpMultiAssign6076 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpMultiAssign6087 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_ruleOpMultiAssign6125 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_ruleOpMultiAssign6144 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_53_in_ruleOpMultiAssign6163 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_54_in_ruleOpMultiAssign6182 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_55_in_ruleOpMultiAssign6201 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_ruleOpMultiAssign6221 = new BitSet(new long[]{0x0100000000000000L});
-    public static final BitSet FOLLOW_56_in_ruleOpMultiAssign6234 = new BitSet(new long[]{0x0000000080000000L});
-    public static final BitSet FOLLOW_31_in_ruleOpMultiAssign6247 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_57_in_ruleOpMultiAssign6268 = new BitSet(new long[]{0x0600000000000000L});
-    public static final BitSet FOLLOW_57_in_ruleOpMultiAssign6282 = new BitSet(new long[]{0x0400000000000000L});
-    public static final BitSet FOLLOW_58_in_ruleOpMultiAssign6297 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXOrExpression_in_entryRuleXOrExpression6338 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXOrExpression6348 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAndExpression_in_ruleXOrExpression6395 = new BitSet(new long[]{0x0800000000000002L});
-    public static final BitSet FOLLOW_ruleOpOr_in_ruleXOrExpression6448 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXAndExpression_in_ruleXOrExpression6471 = new BitSet(new long[]{0x0800000000000002L});
-    public static final BitSet FOLLOW_ruleOpOr_in_entryRuleOpOr6510 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpOr6521 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_59_in_ruleOpOr6558 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAndExpression_in_entryRuleXAndExpression6597 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAndExpression6607 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXEqualityExpression_in_ruleXAndExpression6654 = new BitSet(new long[]{0x1000000000000002L});
-    public static final BitSet FOLLOW_ruleOpAnd_in_ruleXAndExpression6707 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXEqualityExpression_in_ruleXAndExpression6730 = new BitSet(new long[]{0x1000000000000002L});
-    public static final BitSet FOLLOW_ruleOpAnd_in_entryRuleOpAnd6769 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpAnd6780 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_60_in_ruleOpAnd6817 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXEqualityExpression_in_entryRuleXEqualityExpression6856 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXEqualityExpression6866 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXRelationalExpression_in_ruleXEqualityExpression6913 = new BitSet(new long[]{0xE000000000000002L,0x0000000000000001L});
-    public static final BitSet FOLLOW_ruleOpEquality_in_ruleXEqualityExpression6966 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXRelationalExpression_in_ruleXEqualityExpression6989 = new BitSet(new long[]{0xE000000000000002L,0x0000000000000001L});
-    public static final BitSet FOLLOW_ruleOpEquality_in_entryRuleOpEquality7028 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpEquality7039 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_61_in_ruleOpEquality7077 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_62_in_ruleOpEquality7096 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_ruleOpEquality7115 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_64_in_ruleOpEquality7134 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXRelationalExpression_in_entryRuleXRelationalExpression7174 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXRelationalExpression7184 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXOtherOperatorExpression_in_ruleXRelationalExpression7231 = new BitSet(new long[]{0x0700000000000002L,0x0000000000000002L});
-    public static final BitSet FOLLOW_65_in_ruleXRelationalExpression7267 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleXRelationalExpression7290 = new BitSet(new long[]{0x0700000000000002L,0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpCompare_in_ruleXRelationalExpression7351 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXOtherOperatorExpression_in_ruleXRelationalExpression7374 = new BitSet(new long[]{0x0700000000000002L,0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpCompare_in_entryRuleOpCompare7414 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpCompare7425 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_58_in_ruleOpCompare7463 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_ruleOpCompare7483 = new BitSet(new long[]{0x0000000080000000L});
-    public static final BitSet FOLLOW_31_in_ruleOpCompare7496 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_57_in_ruleOpCompare7516 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_ruleOpCompare7535 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXOtherOperatorExpression_in_entryRuleXOtherOperatorExpression7575 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXOtherOperatorExpression7585 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAdditiveExpression_in_ruleXOtherOperatorExpression7632 = new BitSet(new long[]{0x0300000020000002L,0x000000000000007CL});
-    public static final BitSet FOLLOW_ruleOpOther_in_ruleXOtherOperatorExpression7685 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXAdditiveExpression_in_ruleXOtherOperatorExpression7708 = new BitSet(new long[]{0x0300000020000002L,0x000000000000007CL});
-    public static final BitSet FOLLOW_ruleOpOther_in_entryRuleOpOther7747 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpOther7758 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_66_in_ruleOpOther7796 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_67_in_ruleOpOther7815 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_57_in_ruleOpOther7835 = new BitSet(new long[]{0x0000000020000000L});
-    public static final BitSet FOLLOW_29_in_ruleOpOther7848 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_ruleOpOther7868 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_68_in_ruleOpOther7887 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_57_in_ruleOpOther7907 = new BitSet(new long[]{0x0200000000000000L});
-    public static final BitSet FOLLOW_57_in_ruleOpOther7938 = new BitSet(new long[]{0x0200000000000000L});
-    public static final BitSet FOLLOW_57_in_ruleOpOther7951 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_57_in_ruleOpOther7972 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_ruleOpOther7994 = new BitSet(new long[]{0x0100000000000000L,0x0000000000000010L});
-    public static final BitSet FOLLOW_56_in_ruleOpOther8025 = new BitSet(new long[]{0x0100000000000000L});
-    public static final BitSet FOLLOW_56_in_ruleOpOther8038 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_ruleOpOther8059 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_68_in_ruleOpOther8078 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_69_in_ruleOpOther8099 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_70_in_ruleOpOther8118 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAdditiveExpression_in_entryRuleXAdditiveExpression8158 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAdditiveExpression8168 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXMultiplicativeExpression_in_ruleXAdditiveExpression8215 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000180L});
-    public static final BitSet FOLLOW_ruleOpAdd_in_ruleXAdditiveExpression8268 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXMultiplicativeExpression_in_ruleXAdditiveExpression8291 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000180L});
-    public static final BitSet FOLLOW_ruleOpAdd_in_entryRuleOpAdd8330 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpAdd8341 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_ruleOpAdd8379 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_ruleOpAdd8398 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXMultiplicativeExpression_in_entryRuleXMultiplicativeExpression8438 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXMultiplicativeExpression8448 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXUnaryOperation_in_ruleXMultiplicativeExpression8495 = new BitSet(new long[]{0x0000000000000002L,0x0000000000001E00L});
-    public static final BitSet FOLLOW_ruleOpMulti_in_ruleXMultiplicativeExpression8548 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXUnaryOperation_in_ruleXMultiplicativeExpression8571 = new BitSet(new long[]{0x0000000000000002L,0x0000000000001E00L});
-    public static final BitSet FOLLOW_ruleOpMulti_in_entryRuleOpMulti8610 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpMulti8621 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_ruleOpMulti8659 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_ruleOpMulti8678 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_75_in_ruleOpMulti8697 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_76_in_ruleOpMulti8716 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXUnaryOperation_in_entryRuleXUnaryOperation8756 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXUnaryOperation8766 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpUnary_in_ruleXUnaryOperation8824 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXUnaryOperation_in_ruleXUnaryOperation8845 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCastedExpression_in_ruleXUnaryOperation8874 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpUnary_in_entryRuleOpUnary8910 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpUnary8921 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_77_in_ruleOpUnary8959 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_ruleOpUnary8978 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_ruleOpUnary8997 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCastedExpression_in_entryRuleXCastedExpression9037 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXCastedExpression9047 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXPostfixOperation_in_ruleXCastedExpression9094 = new BitSet(new long[]{0x0000000000000002L,0x0000000000004000L});
-    public static final BitSet FOLLOW_78_in_ruleXCastedExpression9129 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleXCastedExpression9152 = new BitSet(new long[]{0x0000000000000002L,0x0000000000004000L});
-    public static final BitSet FOLLOW_ruleXPostfixOperation_in_entryRuleXPostfixOperation9190 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXPostfixOperation9200 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXMemberFeatureCall_in_ruleXPostfixOperation9247 = new BitSet(new long[]{0x0000000000000002L,0x0000000000018000L});
-    public static final BitSet FOLLOW_ruleOpPostfix_in_ruleXPostfixOperation9299 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpPostfix_in_entryRuleOpPostfix9339 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpPostfix9350 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_79_in_ruleOpPostfix9388 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_80_in_ruleOpPostfix9407 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXMemberFeatureCall_in_entryRuleXMemberFeatureCall9447 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXMemberFeatureCall9457 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXPrimaryExpression_in_ruleXMemberFeatureCall9504 = new BitSet(new long[]{0x0000000000000002L,0x00000000000E0000L});
-    public static final BitSet FOLLOW_81_in_ruleXMemberFeatureCall9576 = new BitSet(new long[]{0x0007FFE014528100L});
-    public static final BitSet FOLLOW_82_in_ruleXMemberFeatureCall9600 = new BitSet(new long[]{0x0007FFE014528100L});
-    public static final BitSet FOLLOW_ruleFeatureCallID_in_ruleXMemberFeatureCall9637 = new BitSet(new long[]{0x0000000080000000L});
-    public static final BitSet FOLLOW_ruleOpSingleAssign_in_ruleXMemberFeatureCall9653 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXAssignment_in_ruleXMemberFeatureCall9675 = new BitSet(new long[]{0x0000000000000002L,0x00000000000E0000L});
-    public static final BitSet FOLLOW_81_in_ruleXMemberFeatureCall9761 = new BitSet(new long[]{0x0107FFE014528100L,0x0000000080000000L});
-    public static final BitSet FOLLOW_83_in_ruleXMemberFeatureCall9785 = new BitSet(new long[]{0x0107FFE014528100L,0x0000000080000000L});
-    public static final BitSet FOLLOW_82_in_ruleXMemberFeatureCall9822 = new BitSet(new long[]{0x0107FFE014528100L,0x0000000080000000L});
-    public static final BitSet FOLLOW_56_in_ruleXMemberFeatureCall9851 = new BitSet(new long[]{0x0007F00048C04100L,0x0000080000000010L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleXMemberFeatureCall9872 = new BitSet(new long[]{0x0200000001000000L});
-    public static final BitSet FOLLOW_24_in_ruleXMemberFeatureCall9885 = new BitSet(new long[]{0x0007F00048C04100L,0x0000080000000010L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleXMemberFeatureCall9906 = new BitSet(new long[]{0x0200000001000000L});
-    public static final BitSet FOLLOW_57_in_ruleXMemberFeatureCall9920 = new BitSet(new long[]{0x0107FFE014528100L,0x0000000080000000L});
-    public static final BitSet FOLLOW_ruleIdOrSuper_in_ruleXMemberFeatureCall9945 = new BitSet(new long[]{0x0000000200800002L,0x00000000000E0000L});
-    public static final BitSet FOLLOW_23_in_ruleXMemberFeatureCall9979 = new BitSet(new long[]{0x0107FFFB5ED7C1F0L,0x000002FF98B02190L});
-    public static final BitSet FOLLOW_ruleXShortClosure_in_ruleXMemberFeatureCall10064 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXMemberFeatureCall10092 = new BitSet(new long[]{0x0000000003000000L});
-    public static final BitSet FOLLOW_24_in_ruleXMemberFeatureCall10105 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXMemberFeatureCall10126 = new BitSet(new long[]{0x0000000003000000L});
-    public static final BitSet FOLLOW_25_in_ruleXMemberFeatureCall10143 = new BitSet(new long[]{0x0000000200000002L,0x00000000000E0000L});
-    public static final BitSet FOLLOW_ruleXClosure_in_ruleXMemberFeatureCall10178 = new BitSet(new long[]{0x0000000000000002L,0x00000000000E0000L});
-    public static final BitSet FOLLOW_ruleXLiteral_in_entryRuleXLiteral10218 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXLiteral10228 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCollectionLiteral_in_ruleXLiteral10275 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXClosure_in_ruleXLiteral10315 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBooleanLiteral_in_ruleXLiteral10343 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXNumberLiteral_in_ruleXLiteral10370 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXNullLiteral_in_ruleXLiteral10397 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXStringLiteral_in_ruleXLiteral10424 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXTypeLiteral_in_ruleXLiteral10451 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCollectionLiteral_in_entryRuleXCollectionLiteral10486 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXCollectionLiteral10496 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSetLiteral_in_ruleXCollectionLiteral10543 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXListLiteral_in_ruleXCollectionLiteral10570 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSetLiteral_in_entryRuleXSetLiteral10605 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXSetLiteral10615 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_ruleXSetLiteral10661 = new BitSet(new long[]{0x0000000000040000L});
-    public static final BitSet FOLLOW_18_in_ruleXSetLiteral10673 = new BitSet(new long[]{0x0107FFFB14DF81F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXSetLiteral10695 = new BitSet(new long[]{0x0000000001080000L});
-    public static final BitSet FOLLOW_24_in_ruleXSetLiteral10708 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXSetLiteral10729 = new BitSet(new long[]{0x0000000001080000L});
-    public static final BitSet FOLLOW_19_in_ruleXSetLiteral10745 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXListLiteral_in_entryRuleXListLiteral10781 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXListLiteral10791 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_ruleXListLiteral10837 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_33_in_ruleXListLiteral10849 = new BitSet(new long[]{0x0107FFFF14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXListLiteral10871 = new BitSet(new long[]{0x0000000401000000L});
-    public static final BitSet FOLLOW_24_in_ruleXListLiteral10884 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXListLiteral10905 = new BitSet(new long[]{0x0000000401000000L});
-    public static final BitSet FOLLOW_34_in_ruleXListLiteral10921 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXClosure_in_entryRuleXClosure10957 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXClosure10967 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_ruleXClosure11027 = new BitSet(new long[]{0x0107FFFF5CD7C1F0L,0x000002FFF8B02190L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_ruleXClosure11100 = new BitSet(new long[]{0x0000000001000000L,0x0000000000100000L});
-    public static final BitSet FOLLOW_24_in_ruleXClosure11113 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_ruleXClosure11134 = new BitSet(new long[]{0x0000000001000000L,0x0000000000100000L});
-    public static final BitSet FOLLOW_84_in_ruleXClosure11156 = new BitSet(new long[]{0x0107FFFF14D781F0L,0x000002FFF8A02180L});
-    public static final BitSet FOLLOW_ruleXExpressionInClosure_in_ruleXClosure11193 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_34_in_ruleXClosure11205 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpressionInClosure_in_entryRuleXExpressionInClosure11241 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXExpressionInClosure11251 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_ruleXExpressionInClosure11307 = new BitSet(new long[]{0x0107FFFB14F781F2L,0x000002FFF8A02180L});
-    public static final BitSet FOLLOW_21_in_ruleXExpressionInClosure11320 = new BitSet(new long[]{0x0107FFFB14D781F2L,0x000002FFF8A02180L});
-    public static final BitSet FOLLOW_ruleXShortClosure_in_entryRuleXShortClosure11360 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXShortClosure11370 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_ruleXShortClosure11478 = new BitSet(new long[]{0x0000000001000000L,0x0000000000100000L});
-    public static final BitSet FOLLOW_24_in_ruleXShortClosure11491 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_ruleXShortClosure11512 = new BitSet(new long[]{0x0000000001000000L,0x0000000000100000L});
-    public static final BitSet FOLLOW_84_in_ruleXShortClosure11534 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXShortClosure11570 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXParenthesizedExpression_in_entryRuleXParenthesizedExpression11606 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXParenthesizedExpression11616 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_ruleXParenthesizedExpression11653 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXParenthesizedExpression11675 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_ruleXParenthesizedExpression11686 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXIfExpression_in_entryRuleXIfExpression11722 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXIfExpression11732 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_85_in_ruleXIfExpression11778 = new BitSet(new long[]{0x0000000000800000L});
-    public static final BitSet FOLLOW_23_in_ruleXIfExpression11790 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXIfExpression11811 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_ruleXIfExpression11823 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXIfExpression11844 = new BitSet(new long[]{0x0000000000000002L,0x0000000000400000L});
-    public static final BitSet FOLLOW_86_in_ruleXIfExpression11865 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXIfExpression11887 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSwitchExpression_in_entryRuleXSwitchExpression11925 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXSwitchExpression11935 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_87_in_ruleXSwitchExpression11981 = new BitSet(new long[]{0x0107FFFB5CD7C1F0L,0x000002FF98A02190L});
-    public static final BitSet FOLLOW_23_in_ruleXSwitchExpression12019 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_ruleXSwitchExpression12040 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_88_in_ruleXSwitchExpression12052 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXSwitchExpression12075 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_ruleXSwitchExpression12087 = new BitSet(new long[]{0x0000000000040000L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_ruleXSwitchExpression12136 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_88_in_ruleXSwitchExpression12148 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXSwitchExpression12172 = new BitSet(new long[]{0x0000000000040000L});
-    public static final BitSet FOLLOW_18_in_ruleXSwitchExpression12186 = new BitSet(new long[]{0x0007F00049C84100L,0x0000000007000010L});
-    public static final BitSet FOLLOW_ruleXCasePart_in_ruleXSwitchExpression12207 = new BitSet(new long[]{0x0007F00049C84100L,0x0000000007000010L});
-    public static final BitSet FOLLOW_89_in_ruleXSwitchExpression12221 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_88_in_ruleXSwitchExpression12233 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXSwitchExpression12254 = new BitSet(new long[]{0x0000000000080000L});
-    public static final BitSet FOLLOW_19_in_ruleXSwitchExpression12268 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCasePart_in_entryRuleXCasePart12304 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXCasePart12314 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleXCasePart12369 = new BitSet(new long[]{0x0000000001000000L,0x0000000005000000L});
-    public static final BitSet FOLLOW_90_in_ruleXCasePart12383 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXCasePart12404 = new BitSet(new long[]{0x0000000001000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_88_in_ruleXCasePart12420 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXCasePart12441 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_ruleXCasePart12466 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXForLoopExpression_in_entryRuleXForLoopExpression12516 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXForLoopExpression12526 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_16_in_ruleXForLoopExpression12603 = new BitSet(new long[]{0x0000000000800000L});
-    public static final BitSet FOLLOW_23_in_ruleXForLoopExpression12615 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_ruleXForLoopExpression12636 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_88_in_ruleXForLoopExpression12648 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXForLoopExpression12671 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_ruleXForLoopExpression12683 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXForLoopExpression12704 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBasicForLoopExpression_in_entryRuleXBasicForLoopExpression12740 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXBasicForLoopExpression12750 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_16_in_ruleXBasicForLoopExpression12796 = new BitSet(new long[]{0x0000000000800000L});
-    public static final BitSet FOLLOW_23_in_ruleXBasicForLoopExpression12808 = new BitSet(new long[]{0x0107FFFB14F781F0L,0x000002FFF8A02180L});
-    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_ruleXBasicForLoopExpression12830 = new BitSet(new long[]{0x0000000001200000L});
-    public static final BitSet FOLLOW_24_in_ruleXBasicForLoopExpression12843 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FFF8A02180L});
-    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_ruleXBasicForLoopExpression12864 = new BitSet(new long[]{0x0000000001200000L});
-    public static final BitSet FOLLOW_21_in_ruleXBasicForLoopExpression12880 = new BitSet(new long[]{0x0107FFFB14F781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXBasicForLoopExpression12901 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_21_in_ruleXBasicForLoopExpression12914 = new BitSet(new long[]{0x0107FFFB16D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXBasicForLoopExpression12936 = new BitSet(new long[]{0x0000000003000000L});
-    public static final BitSet FOLLOW_24_in_ruleXBasicForLoopExpression12949 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXBasicForLoopExpression12970 = new BitSet(new long[]{0x0000000003000000L});
-    public static final BitSet FOLLOW_25_in_ruleXBasicForLoopExpression12986 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXBasicForLoopExpression13007 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXWhileExpression_in_entryRuleXWhileExpression13043 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXWhileExpression13053 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_91_in_ruleXWhileExpression13099 = new BitSet(new long[]{0x0000000000800000L});
-    public static final BitSet FOLLOW_23_in_ruleXWhileExpression13111 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXWhileExpression13132 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_ruleXWhileExpression13144 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXWhileExpression13165 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXDoWhileExpression_in_entryRuleXDoWhileExpression13201 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXDoWhileExpression13211 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_92_in_ruleXDoWhileExpression13257 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXDoWhileExpression13278 = new BitSet(new long[]{0x0000000000000000L,0x0000000008000000L});
-    public static final BitSet FOLLOW_91_in_ruleXDoWhileExpression13290 = new BitSet(new long[]{0x0000000000800000L});
-    public static final BitSet FOLLOW_23_in_ruleXDoWhileExpression13302 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXDoWhileExpression13323 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_ruleXDoWhileExpression13335 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBlockExpression_in_entryRuleXBlockExpression13371 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXBlockExpression13381 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_18_in_ruleXBlockExpression13427 = new BitSet(new long[]{0x0107FFFB14DF81F0L,0x000002FFF8A02180L});
-    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_ruleXBlockExpression13449 = new BitSet(new long[]{0x0107FFFB14FF81F0L,0x000002FFF8A02180L});
-    public static final BitSet FOLLOW_21_in_ruleXBlockExpression13462 = new BitSet(new long[]{0x0107FFFB14DF81F0L,0x000002FFF8A02180L});
-    public static final BitSet FOLLOW_19_in_ruleXBlockExpression13478 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_entryRuleXExpressionOrVarDeclaration13514 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXExpressionOrVarDeclaration13524 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXVariableDeclaration_in_ruleXExpressionOrVarDeclaration13571 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXExpressionOrVarDeclaration13598 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXVariableDeclaration_in_entryRuleXVariableDeclaration13633 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXVariableDeclaration13643 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_93_in_ruleXVariableDeclaration13696 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_94_in_ruleXVariableDeclaration13727 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleXVariableDeclaration13775 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleXVariableDeclaration13796 = new BitSet(new long[]{0x0000000080000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleXVariableDeclaration13825 = new BitSet(new long[]{0x0000000080000002L});
-    public static final BitSet FOLLOW_31_in_ruleXVariableDeclaration13839 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXVariableDeclaration13860 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_entryRuleJvmFormalParameter13898 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmFormalParameter13908 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleJvmFormalParameter13954 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleJvmFormalParameter13976 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFullJvmFormalParameter_in_entryRuleFullJvmFormalParameter14012 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFullJvmFormalParameter14022 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleFullJvmFormalParameter14068 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleFullJvmFormalParameter14089 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXFeatureCall_in_entryRuleXFeatureCall14125 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXFeatureCall14135 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_ruleXFeatureCall14182 = new BitSet(new long[]{0x0007F00048C04100L,0x0000080000000010L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleXFeatureCall14203 = new BitSet(new long[]{0x0200000001000000L});
-    public static final BitSet FOLLOW_24_in_ruleXFeatureCall14216 = new BitSet(new long[]{0x0007F00048C04100L,0x0000080000000010L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleXFeatureCall14237 = new BitSet(new long[]{0x0200000001000000L});
-    public static final BitSet FOLLOW_57_in_ruleXFeatureCall14251 = new BitSet(new long[]{0x0107FFE014528100L,0x0000000080000000L});
-    public static final BitSet FOLLOW_ruleIdOrSuper_in_ruleXFeatureCall14276 = new BitSet(new long[]{0x0000000200800002L});
-    public static final BitSet FOLLOW_23_in_ruleXFeatureCall14310 = new BitSet(new long[]{0x0107FFFB5ED7C1F0L,0x000002FF98B02190L});
-    public static final BitSet FOLLOW_ruleXShortClosure_in_ruleXFeatureCall14395 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXFeatureCall14423 = new BitSet(new long[]{0x0000000003000000L});
-    public static final BitSet FOLLOW_24_in_ruleXFeatureCall14436 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXFeatureCall14457 = new BitSet(new long[]{0x0000000003000000L});
-    public static final BitSet FOLLOW_25_in_ruleXFeatureCall14474 = new BitSet(new long[]{0x0000000200000002L});
-    public static final BitSet FOLLOW_ruleXClosure_in_ruleXFeatureCall14509 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdOrSuper_in_entryRuleIdOrSuper14547 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIdOrSuper14558 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFeatureCallID_in_ruleIdOrSuper14605 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_95_in_ruleIdOrSuper14629 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstructorCall_in_entryRuleXConstructorCall14669 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXConstructorCall14679 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_96_in_ruleXConstructorCall14725 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleXConstructorCall14748 = new BitSet(new long[]{0x0100000200800002L});
-    public static final BitSet FOLLOW_56_in_ruleXConstructorCall14769 = new BitSet(new long[]{0x0007F00048C04100L,0x0000080000000010L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleXConstructorCall14791 = new BitSet(new long[]{0x0200000001000000L});
-    public static final BitSet FOLLOW_24_in_ruleXConstructorCall14804 = new BitSet(new long[]{0x0007F00048C04100L,0x0000080000000010L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleXConstructorCall14825 = new BitSet(new long[]{0x0200000001000000L});
-    public static final BitSet FOLLOW_57_in_ruleXConstructorCall14839 = new BitSet(new long[]{0x0000000200800002L});
-    public static final BitSet FOLLOW_23_in_ruleXConstructorCall14875 = new BitSet(new long[]{0x0107FFFB5ED7C1F0L,0x000002FF98B02190L});
-    public static final BitSet FOLLOW_ruleXShortClosure_in_ruleXConstructorCall14960 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXConstructorCall14988 = new BitSet(new long[]{0x0000000003000000L});
-    public static final BitSet FOLLOW_24_in_ruleXConstructorCall15001 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXConstructorCall15022 = new BitSet(new long[]{0x0000000003000000L});
-    public static final BitSet FOLLOW_25_in_ruleXConstructorCall15039 = new BitSet(new long[]{0x0000000200000002L});
-    public static final BitSet FOLLOW_ruleXClosure_in_ruleXConstructorCall15074 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBooleanLiteral_in_entryRuleXBooleanLiteral15111 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXBooleanLiteral15121 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_97_in_ruleXBooleanLiteral15168 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_98_in_ruleXBooleanLiteral15192 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXNullLiteral_in_entryRuleXNullLiteral15242 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXNullLiteral15252 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_99_in_ruleXNullLiteral15298 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXNumberLiteral_in_entryRuleXNumberLiteral15334 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXNumberLiteral15344 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNumber_in_ruleXNumberLiteral15399 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXStringLiteral_in_entryRuleXStringLiteral15435 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXStringLiteral15445 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleXStringLiteral15496 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXTypeLiteral_in_entryRuleXTypeLiteral15537 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXTypeLiteral15547 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_100_in_ruleXTypeLiteral15593 = new BitSet(new long[]{0x0000000000800000L});
-    public static final BitSet FOLLOW_23_in_ruleXTypeLiteral15605 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleXTypeLiteral15628 = new BitSet(new long[]{0x0000000202000000L});
-    public static final BitSet FOLLOW_ruleArrayBrackets_in_ruleXTypeLiteral15649 = new BitSet(new long[]{0x0000000202000000L});
-    public static final BitSet FOLLOW_25_in_ruleXTypeLiteral15662 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXThrowExpression_in_entryRuleXThrowExpression15698 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXThrowExpression15708 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_101_in_ruleXThrowExpression15754 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXThrowExpression15775 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXReturnExpression_in_entryRuleXReturnExpression15811 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXReturnExpression15821 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_102_in_ruleXReturnExpression15867 = new BitSet(new long[]{0x0107FFFB14D781F2L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXReturnExpression16228 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXTryCatchFinallyExpression_in_entryRuleXTryCatchFinallyExpression16265 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXTryCatchFinallyExpression16275 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_103_in_ruleXTryCatchFinallyExpression16321 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXTryCatchFinallyExpression16342 = new BitSet(new long[]{0x0000000000000000L,0x0000050000000000L});
-    public static final BitSet FOLLOW_ruleXCatchClause_in_ruleXTryCatchFinallyExpression16372 = new BitSet(new long[]{0x0000000000000002L,0x0000050000000000L});
-    public static final BitSet FOLLOW_104_in_ruleXTryCatchFinallyExpression16394 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXTryCatchFinallyExpression16416 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_104_in_ruleXTryCatchFinallyExpression16438 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXTryCatchFinallyExpression16459 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSynchronizedExpression_in_entryRuleXSynchronizedExpression16497 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXSynchronizedExpression16507 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_105_in_ruleXSynchronizedExpression16571 = new BitSet(new long[]{0x0000000000800000L});
-    public static final BitSet FOLLOW_23_in_ruleXSynchronizedExpression16583 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXSynchronizedExpression16606 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_ruleXSynchronizedExpression16618 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXSynchronizedExpression16639 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCatchClause_in_entryRuleXCatchClause16675 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXCatchClause16685 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_106_in_ruleXCatchClause16730 = new BitSet(new long[]{0x0000000000800000L});
-    public static final BitSet FOLLOW_23_in_ruleXCatchClause16743 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleFullJvmFormalParameter_in_ruleXCatchClause16764 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_ruleXCatchClause16776 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXCatchClause16797 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName16834 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedName16845 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleQualifiedName16892 = new BitSet(new long[]{0x0000000000000002L,0x0000000000020000L});
-    public static final BitSet FOLLOW_81_in_ruleQualifiedName16920 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleQualifiedName16943 = new BitSet(new long[]{0x0000000000000002L,0x0000000000020000L});
-    public static final BitSet FOLLOW_ruleNumber_in_entryRuleNumber16997 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNumber17008 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_HEX_in_ruleNumber17052 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleNumber17080 = new BitSet(new long[]{0x0000000000000002L,0x0000000000020000L});
-    public static final BitSet FOLLOW_RULE_DECIMAL_in_ruleNumber17106 = new BitSet(new long[]{0x0000000000000002L,0x0000000000020000L});
-    public static final BitSet FOLLOW_81_in_ruleNumber17126 = new BitSet(new long[]{0x00000000000000C0L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleNumber17142 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_DECIMAL_in_ruleNumber17168 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_entryRuleJvmTypeReference17223 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmTypeReference17233 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmParameterizedTypeReference_in_ruleJvmTypeReference17281 = new BitSet(new long[]{0x0000000200000002L});
-    public static final BitSet FOLLOW_ruleArrayBrackets_in_ruleJvmTypeReference17317 = new BitSet(new long[]{0x0000000200000002L});
-    public static final BitSet FOLLOW_ruleXFunctionTypeRef_in_ruleJvmTypeReference17348 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleArrayBrackets_in_entryRuleArrayBrackets17384 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleArrayBrackets17395 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_ruleArrayBrackets17433 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_34_in_ruleArrayBrackets17446 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXFunctionTypeRef_in_entryRuleXFunctionTypeRef17486 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXFunctionTypeRef17496 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_ruleXFunctionTypeRef17534 = new BitSet(new long[]{0x0007F0004AC04100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleXFunctionTypeRef17556 = new BitSet(new long[]{0x0000000003000000L});
-    public static final BitSet FOLLOW_24_in_ruleXFunctionTypeRef17569 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleXFunctionTypeRef17590 = new BitSet(new long[]{0x0000000003000000L});
-    public static final BitSet FOLLOW_25_in_ruleXFunctionTypeRef17606 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
-    public static final BitSet FOLLOW_68_in_ruleXFunctionTypeRef17620 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleXFunctionTypeRef17641 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmParameterizedTypeReference_in_entryRuleJvmParameterizedTypeReference17677 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmParameterizedTypeReference17687 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleJvmParameterizedTypeReference17735 = new BitSet(new long[]{0x0100000000000002L});
-    public static final BitSet FOLLOW_56_in_ruleJvmParameterizedTypeReference17756 = new BitSet(new long[]{0x0007F00048C04100L,0x0000080000000010L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleJvmParameterizedTypeReference17778 = new BitSet(new long[]{0x0200000001000000L});
-    public static final BitSet FOLLOW_24_in_ruleJvmParameterizedTypeReference17791 = new BitSet(new long[]{0x0007F00048C04100L,0x0000080000000010L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleJvmParameterizedTypeReference17812 = new BitSet(new long[]{0x0200000001000000L});
-    public static final BitSet FOLLOW_57_in_ruleJvmParameterizedTypeReference17826 = new BitSet(new long[]{0x0000000000000002L,0x0000000000020000L});
-    public static final BitSet FOLLOW_81_in_ruleJvmParameterizedTypeReference17862 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleJvmParameterizedTypeReference17887 = new BitSet(new long[]{0x0100000000000002L,0x0000000000020000L});
-    public static final BitSet FOLLOW_56_in_ruleJvmParameterizedTypeReference17908 = new BitSet(new long[]{0x0007F00048C04100L,0x0000080000000010L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleJvmParameterizedTypeReference17930 = new BitSet(new long[]{0x0200000001000000L});
-    public static final BitSet FOLLOW_24_in_ruleJvmParameterizedTypeReference17943 = new BitSet(new long[]{0x0007F00048C04100L,0x0000080000000010L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleJvmParameterizedTypeReference17964 = new BitSet(new long[]{0x0200000001000000L});
-    public static final BitSet FOLLOW_57_in_ruleJvmParameterizedTypeReference17978 = new BitSet(new long[]{0x0000000000000002L,0x0000000000020000L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_entryRuleJvmArgumentTypeReference18020 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmArgumentTypeReference18030 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleJvmArgumentTypeReference18077 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmWildcardTypeReference_in_ruleJvmArgumentTypeReference18104 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmWildcardTypeReference_in_entryRuleJvmWildcardTypeReference18139 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmWildcardTypeReference18149 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_107_in_ruleJvmWildcardTypeReference18195 = new BitSet(new long[]{0x0000010000000002L,0x0000000080000000L});
-    public static final BitSet FOLLOW_ruleJvmUpperBound_in_ruleJvmWildcardTypeReference18218 = new BitSet(new long[]{0x0000000000000002L,0x0000100000000000L});
-    public static final BitSet FOLLOW_ruleJvmUpperBoundAnded_in_ruleJvmWildcardTypeReference18239 = new BitSet(new long[]{0x0000000000000002L,0x0000100000000000L});
-    public static final BitSet FOLLOW_ruleJvmLowerBound_in_ruleJvmWildcardTypeReference18269 = new BitSet(new long[]{0x0000000000000002L,0x0000100000000000L});
-    public static final BitSet FOLLOW_ruleJvmLowerBoundAnded_in_ruleJvmWildcardTypeReference18290 = new BitSet(new long[]{0x0000000000000002L,0x0000100000000000L});
-    public static final BitSet FOLLOW_ruleJvmUpperBound_in_entryRuleJvmUpperBound18330 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmUpperBound18340 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_40_in_ruleJvmUpperBound18377 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleJvmUpperBound18398 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmUpperBoundAnded_in_entryRuleJvmUpperBoundAnded18434 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmUpperBoundAnded18444 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_108_in_ruleJvmUpperBoundAnded18481 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleJvmUpperBoundAnded18502 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmLowerBound_in_entryRuleJvmLowerBound18538 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmLowerBound18548 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_95_in_ruleJvmLowerBound18585 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleJvmLowerBound18606 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmLowerBoundAnded_in_entryRuleJvmLowerBoundAnded18642 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmLowerBoundAnded18652 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_108_in_ruleJvmLowerBoundAnded18689 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleJvmLowerBoundAnded18710 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedNameWithWildcard_in_entryRuleQualifiedNameWithWildcard18749 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedNameWithWildcard18760 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleQualifiedNameWithWildcard18807 = new BitSet(new long[]{0x0000000000000000L,0x0000000000020000L});
-    public static final BitSet FOLLOW_81_in_ruleQualifiedNameWithWildcard18825 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000200L});
-    public static final BitSet FOLLOW_73_in_ruleQualifiedNameWithWildcard18838 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_entryRuleValidID18879 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleValidID18890 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleValidID18929 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_44_in_ruleSeverityKind18989 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_45_in_ruleSeverityKind19006 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_ruleSeverityKind19023 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_ruleSeverityKind19040 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_ruleTriggerKind19085 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_49_in_ruleTriggerKind19102 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_50_in_ruleTriggerKind19119 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_synpred1_InternalCheck1071 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_18_in_synpred2_InternalCheck1205 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_synpred3_InternalCheck2985 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_37_in_synpred4_InternalCheck3018 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_synpred5_InternalCheck3041 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_synpred6_InternalCheck3115 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_synpred7_InternalCheck3164 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_synpred8_InternalCheck3223 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_38_in_synpred9_InternalCheck3268 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_synpred10_InternalCheck3323 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_39_in_synpred11_InternalCheck3382 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_synpred12_InternalCheck3459 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_105_in_synpred13_InternalCheck3673 = new BitSet(new long[]{0x0000000000800000L});
-    public static final BitSet FOLLOW_23_in_synpred13_InternalCheck3677 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_16_in_synpred14_InternalCheck3799 = new BitSet(new long[]{0x0000000000800000L});
-    public static final BitSet FOLLOW_23_in_synpred14_InternalCheck3803 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred14_InternalCheck3810 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_88_in_synpred14_InternalCheck3816 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_synpred15_InternalCheck4690 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_synpred16_InternalCheck4719 = new BitSet(new long[]{0x0000000080000000L});
-    public static final BitSet FOLLOW_31_in_synpred16_InternalCheck4725 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_synpred19_InternalCheck5081 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_33_in_synpred19_InternalCheck5085 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_synpred20_InternalCheck5356 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_33_in_synpred20_InternalCheck5360 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpMultiAssign_in_synpred21_InternalCheck5893 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpOr_in_synpred22_InternalCheck6416 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpAnd_in_synpred23_InternalCheck6675 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpEquality_in_synpred24_InternalCheck6934 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_65_in_synpred25_InternalCheck7248 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpCompare_in_synpred26_InternalCheck7319 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpOther_in_synpred27_InternalCheck7653 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_57_in_synpred28_InternalCheck7922 = new BitSet(new long[]{0x0200000000000000L});
-    public static final BitSet FOLLOW_57_in_synpred28_InternalCheck7927 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_synpred29_InternalCheck8009 = new BitSet(new long[]{0x0100000000000000L});
-    public static final BitSet FOLLOW_56_in_synpred29_InternalCheck8014 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpAdd_in_synpred30_InternalCheck8236 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpMulti_in_synpred31_InternalCheck8516 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_78_in_synpred32_InternalCheck9110 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpPostfix_in_synpred33_InternalCheck9267 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_81_in_synpred34_InternalCheck9522 = new BitSet(new long[]{0x0007FFE014528100L});
-    public static final BitSet FOLLOW_82_in_synpred34_InternalCheck9536 = new BitSet(new long[]{0x0007FFE014528100L});
-    public static final BitSet FOLLOW_ruleFeatureCallID_in_synpred34_InternalCheck9552 = new BitSet(new long[]{0x0000000080000000L});
-    public static final BitSet FOLLOW_ruleOpSingleAssign_in_synpred34_InternalCheck9558 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_81_in_synpred35_InternalCheck9700 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_83_in_synpred35_InternalCheck9714 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_82_in_synpred35_InternalCheck9734 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_synpred36_InternalCheck9961 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred37_InternalCheck10013 = new BitSet(new long[]{0x0000000001000000L,0x0000000000100000L});
-    public static final BitSet FOLLOW_24_in_synpred37_InternalCheck10020 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred37_InternalCheck10027 = new BitSet(new long[]{0x0000000001000000L,0x0000000000100000L});
-    public static final BitSet FOLLOW_84_in_synpred37_InternalCheck10041 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_synpred38_InternalCheck10161 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_synpred39_InternalCheck10296 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred41_InternalCheck11046 = new BitSet(new long[]{0x0000000001000000L,0x0000000000100000L});
-    public static final BitSet FOLLOW_24_in_synpred41_InternalCheck11053 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred41_InternalCheck11060 = new BitSet(new long[]{0x0000000001000000L,0x0000000000100000L});
-    public static final BitSet FOLLOW_84_in_synpred41_InternalCheck11074 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_86_in_synpred43_InternalCheck11857 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_synpred44_InternalCheck11996 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred44_InternalCheck12003 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_88_in_synpred44_InternalCheck12009 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred45_InternalCheck12111 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_88_in_synpred45_InternalCheck12117 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_synpred47_InternalCheck13745 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleValidID_in_synpred47_InternalCheck13754 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_synpred48_InternalCheck14292 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred49_InternalCheck14344 = new BitSet(new long[]{0x0000000001000000L,0x0000000000100000L});
-    public static final BitSet FOLLOW_24_in_synpred49_InternalCheck14351 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred49_InternalCheck14358 = new BitSet(new long[]{0x0000000001000000L,0x0000000000100000L});
-    public static final BitSet FOLLOW_84_in_synpred49_InternalCheck14372 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_synpred50_InternalCheck14492 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_synpred51_InternalCheck14761 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_synpred52_InternalCheck14857 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred53_InternalCheck14909 = new BitSet(new long[]{0x0000000001000000L,0x0000000000100000L});
-    public static final BitSet FOLLOW_24_in_synpred53_InternalCheck14916 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred53_InternalCheck14923 = new BitSet(new long[]{0x0000000001000000L,0x0000000000100000L});
-    public static final BitSet FOLLOW_84_in_synpred53_InternalCheck14937 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_synpred54_InternalCheck15057 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_set_in_synpred55_InternalCheck15877 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_106_in_synpred56_InternalCheck16356 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_104_in_synpred57_InternalCheck16386 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_81_in_synpred60_InternalCheck16911 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleArrayBrackets_in_synpred61_InternalCheck17296 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_synpred62_InternalCheck17748 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_81_in_synpred63_InternalCheck17843 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_synpred64_InternalCheck17900 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_1 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_2 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x0000000000000100L});
+    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x000000000010C000L});
+    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x000000000000C000L});
+    public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000000008000L});
+    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000000000050000L});
+    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000000000020000L});
+    public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000000040000L});
+    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0007F00048C84100L,0x0000000000000010L});
+    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000000000100002L});
+    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000000200002L});
+    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000000110L});
+    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0007F00008084000L});
+    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0007F00008004000L});
+    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000004850002L});
+    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000002000100L});
+    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000003000000L});
+    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000000004050002L});
+    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000000000050002L});
+    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000000000090000L});
+    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000000010000000L});
+    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0000000000800000L});
+    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000000020000000L});
+    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0007F00048C04100L,0x0000000000000010L});
+    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0000000080200000L});
+    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000000000200000L});
+    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000000000010000L});
+    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0000000080000000L});
+    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x00000001000000F0L,0x0000000600002180L});
+    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0000000000000012L});
+    public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x00000000000000F0L,0x0000000600002180L});
+    public static final BitSet FOLLOW_36 = new BitSet(new long[]{0x0000000200000000L});
+    public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x00000004000000F0L,0x0000000600002180L});
+    public static final BitSet FOLLOW_38 = new BitSet(new long[]{0x0000000401000000L});
+    public static final BitSet FOLLOW_39 = new BitSet(new long[]{0x0000000000000102L});
+    public static final BitSet FOLLOW_40 = new BitSet(new long[]{0x000000E004000102L});
+    public static final BitSet FOLLOW_41 = new BitSet(new long[]{0x000000E004000002L});
+    public static final BitSet FOLLOW_42 = new BitSet(new long[]{0x000000C204000002L});
+    public static final BitSet FOLLOW_43 = new BitSet(new long[]{0x000000C304000002L});
+    public static final BitSet FOLLOW_44 = new BitSet(new long[]{0x0007FFE014528100L});
+    public static final BitSet FOLLOW_45 = new BitSet(new long[]{0x0000000400000000L});
+    public static final BitSet FOLLOW_46 = new BitSet(new long[]{0x000000C004000002L});
+    public static final BitSet FOLLOW_47 = new BitSet(new long[]{0x000000C000000002L});
+    public static final BitSet FOLLOW_48 = new BitSet(new long[]{0x0000008000000002L});
+    public static final BitSet FOLLOW_49 = new BitSet(new long[]{0x0000000000800100L});
+    public static final BitSet FOLLOW_50 = new BitSet(new long[]{0x0000000000800002L});
+    public static final BitSet FOLLOW_51 = new BitSet(new long[]{0x0107FFFB1ED781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_52 = new BitSet(new long[]{0x0107FFFB1CD781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_53 = new BitSet(new long[]{0x0107FFFF1CD781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_54 = new BitSet(new long[]{0x0000000001000002L});
+    public static final BitSet FOLLOW_55 = new BitSet(new long[]{0x03F8000000000002L});
+    public static final BitSet FOLLOW_56 = new BitSet(new long[]{0x0100000000000000L});
+    public static final BitSet FOLLOW_57 = new BitSet(new long[]{0x0600000000000000L});
+    public static final BitSet FOLLOW_58 = new BitSet(new long[]{0x0400000000000000L});
+    public static final BitSet FOLLOW_59 = new BitSet(new long[]{0x0800000000000002L});
+    public static final BitSet FOLLOW_60 = new BitSet(new long[]{0x1000000000000002L});
+    public static final BitSet FOLLOW_61 = new BitSet(new long[]{0xE000000000000002L,0x0000000000000001L});
+    public static final BitSet FOLLOW_62 = new BitSet(new long[]{0x0700000000000002L,0x0000000000000002L});
+    public static final BitSet FOLLOW_63 = new BitSet(new long[]{0x0300000020000002L,0x000000000000007CL});
+    public static final BitSet FOLLOW_64 = new BitSet(new long[]{0x0200000000000000L});
+    public static final BitSet FOLLOW_65 = new BitSet(new long[]{0x0100000000000000L,0x0000000000000010L});
+    public static final BitSet FOLLOW_66 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000180L});
+    public static final BitSet FOLLOW_67 = new BitSet(new long[]{0x0000000000000002L,0x0000000000001E00L});
+    public static final BitSet FOLLOW_68 = new BitSet(new long[]{0x0000000000000002L,0x0000000000004000L});
+    public static final BitSet FOLLOW_69 = new BitSet(new long[]{0x0000000000000002L,0x0000000000018000L});
+    public static final BitSet FOLLOW_70 = new BitSet(new long[]{0x0000000000000002L,0x00000000000E0000L});
+    public static final BitSet FOLLOW_71 = new BitSet(new long[]{0x0107FFE014528100L,0x0000000080000000L});
+    public static final BitSet FOLLOW_72 = new BitSet(new long[]{0x0007F00048C04100L,0x0000080000000010L});
+    public static final BitSet FOLLOW_73 = new BitSet(new long[]{0x0200000001000000L});
+    public static final BitSet FOLLOW_74 = new BitSet(new long[]{0x0000000200800002L,0x00000000000E0000L});
+    public static final BitSet FOLLOW_75 = new BitSet(new long[]{0x0107FFFB5ED7C1F0L,0x000002FF98B02190L});
+    public static final BitSet FOLLOW_76 = new BitSet(new long[]{0x0000000200000002L,0x00000000000E0000L});
+    public static final BitSet FOLLOW_77 = new BitSet(new long[]{0x0107FFFB14DF81F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_78 = new BitSet(new long[]{0x0000000001080000L});
+    public static final BitSet FOLLOW_79 = new BitSet(new long[]{0x0107FFFF14D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_80 = new BitSet(new long[]{0x0107FFFF5CD7C1F0L,0x000002FFF8B02190L});
+    public static final BitSet FOLLOW_81 = new BitSet(new long[]{0x0000000001000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_82 = new BitSet(new long[]{0x0107FFFF14D781F0L,0x000002FFF8A02180L});
+    public static final BitSet FOLLOW_83 = new BitSet(new long[]{0x0107FFFB14F781F2L,0x000002FFF8A02180L});
+    public static final BitSet FOLLOW_84 = new BitSet(new long[]{0x0107FFFB14D781F2L,0x000002FFF8A02180L});
+    public static final BitSet FOLLOW_85 = new BitSet(new long[]{0x0000000000000002L,0x0000000000400000L});
+    public static final BitSet FOLLOW_86 = new BitSet(new long[]{0x0107FFFB5CD7C1F0L,0x000002FF98A02190L});
+    public static final BitSet FOLLOW_87 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
+    public static final BitSet FOLLOW_88 = new BitSet(new long[]{0x0007F00049C84100L,0x0000000007000010L});
+    public static final BitSet FOLLOW_89 = new BitSet(new long[]{0x0000000000080000L});
+    public static final BitSet FOLLOW_90 = new BitSet(new long[]{0x0000000001000000L,0x0000000005000000L});
+    public static final BitSet FOLLOW_91 = new BitSet(new long[]{0x0000000001000000L,0x0000000001000000L});
+    public static final BitSet FOLLOW_92 = new BitSet(new long[]{0x0107FFFB14F781F0L,0x000002FFF8A02180L});
+    public static final BitSet FOLLOW_93 = new BitSet(new long[]{0x0000000001200000L});
+    public static final BitSet FOLLOW_94 = new BitSet(new long[]{0x0107FFFB14D781F0L,0x000002FFF8A02180L});
+    public static final BitSet FOLLOW_95 = new BitSet(new long[]{0x0107FFFB14F781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_96 = new BitSet(new long[]{0x0107FFFB16D781F0L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_97 = new BitSet(new long[]{0x0000000000000000L,0x0000000008000000L});
+    public static final BitSet FOLLOW_98 = new BitSet(new long[]{0x0107FFFB14DF81F0L,0x000002FFF8A02180L});
+    public static final BitSet FOLLOW_99 = new BitSet(new long[]{0x0107FFFB14FF81F0L,0x000002FFF8A02180L});
+    public static final BitSet FOLLOW_100 = new BitSet(new long[]{0x0000000080000002L});
+    public static final BitSet FOLLOW_101 = new BitSet(new long[]{0x0000000200800002L});
+    public static final BitSet FOLLOW_102 = new BitSet(new long[]{0x0000000200000002L});
+    public static final BitSet FOLLOW_103 = new BitSet(new long[]{0x0100000200800002L});
+    public static final BitSet FOLLOW_104 = new BitSet(new long[]{0x0000000202000000L});
+    public static final BitSet FOLLOW_105 = new BitSet(new long[]{0x0107FFFB14D781F2L,0x000002FF98A02180L});
+    public static final BitSet FOLLOW_106 = new BitSet(new long[]{0x0000000000000000L,0x0000050000000000L});
+    public static final BitSet FOLLOW_107 = new BitSet(new long[]{0x0000000000000002L,0x0000050000000000L});
+    public static final BitSet FOLLOW_108 = new BitSet(new long[]{0x0000000000000002L,0x0000000000020000L});
+    public static final BitSet FOLLOW_109 = new BitSet(new long[]{0x00000000000000C0L});
+    public static final BitSet FOLLOW_110 = new BitSet(new long[]{0x0007F0004AC04100L,0x0000000000000010L});
+    public static final BitSet FOLLOW_111 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
+    public static final BitSet FOLLOW_112 = new BitSet(new long[]{0x0100000000000002L});
+    public static final BitSet FOLLOW_113 = new BitSet(new long[]{0x0100000000000002L,0x0000000000020000L});
+    public static final BitSet FOLLOW_114 = new BitSet(new long[]{0x0000010000000002L,0x0000000080000000L});
+    public static final BitSet FOLLOW_115 = new BitSet(new long[]{0x0000000000000002L,0x0000100000000000L});
+    public static final BitSet FOLLOW_116 = new BitSet(new long[]{0x0000000000000000L,0x0000000000020000L});
+    public static final BitSet FOLLOW_117 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000200L});
 
 }
\ No newline at end of file
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/serializer/AbstractCheckSemanticSequencer.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/serializer/AbstractCheckSemanticSequencer.java
index 1af5cd6b1..8385eeacd 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/serializer/AbstractCheckSemanticSequencer.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/serializer/AbstractCheckSemanticSequencer.java
@@ -17,8 +17,12 @@
 import com.avaloq.tools.ddk.check.check.XIssueExpression;
 import com.avaloq.tools.ddk.check.services.CheckGrammarAccess;
 import com.google.inject.Inject;
-import com.google.inject.Provider;
+import java.util.Set;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.xtext.Action;
+import org.eclipse.xtext.Parameter;
+import org.eclipse.xtext.ParserRule;
 import org.eclipse.xtext.common.types.JvmFormalParameter;
 import org.eclipse.xtext.common.types.JvmGenericArrayTypeReference;
 import org.eclipse.xtext.common.types.JvmInnerTypeReference;
@@ -28,14 +32,8 @@
 import org.eclipse.xtext.common.types.JvmUpperBound;
 import org.eclipse.xtext.common.types.JvmWildcardTypeReference;
 import org.eclipse.xtext.common.types.TypesPackage;
-import org.eclipse.xtext.serializer.acceptor.ISemanticSequenceAcceptor;
+import org.eclipse.xtext.serializer.ISerializationContext;
 import org.eclipse.xtext.serializer.acceptor.SequenceFeeder;
-import org.eclipse.xtext.serializer.diagnostic.ISemanticSequencerDiagnosticProvider;
-import org.eclipse.xtext.serializer.diagnostic.ISerializationDiagnostic.Acceptor;
-import org.eclipse.xtext.serializer.sequencer.GenericSequencer;
-import org.eclipse.xtext.serializer.sequencer.ISemanticNodeProvider.INodesForEObjectProvider;
-import org.eclipse.xtext.serializer.sequencer.ISemanticSequencer;
-import org.eclipse.xtext.serializer.sequencer.ITransientValueService;
 import org.eclipse.xtext.serializer.sequencer.ITransientValueService.ValueTransient;
 import org.eclipse.xtext.xbase.XAssignment;
 import org.eclipse.xtext.xbase.XBasicForLoopExpression;
@@ -81,1048 +79,722 @@
 @SuppressWarnings("all")
 public abstract class AbstractCheckSemanticSequencer extends XbaseWithAnnotationsSemanticSequencer {
 
-  @Inject
-  private CheckGrammarAccess grammarAccess;
-
-  @Override
-  public void createSequence(EObject context, EObject semanticObject) {
-  	if(semanticObject.eClass().getEPackage() == CheckPackage.eINSTANCE) switch(semanticObject.eClass().getClassifierID()) {
-  		case CheckPackage.CATEGORY:
-  			sequence_Category(context, (Category) semanticObject); 
-  			return; 
-  		case CheckPackage.CHECK:
-  			sequence_Check(context, (Check) semanticObject); 
-  			return; 
-  		case CheckPackage.CHECK_CATALOG:
-  			sequence_CheckCatalog(context, (CheckCatalog) semanticObject); 
-  			return; 
-  		case CheckPackage.CONTEXT:
-  			sequence_Context(context, (Context) semanticObject); 
-  			return; 
-  		case CheckPackage.CONTEXT_VARIABLE:
-  			sequence_ContextVariable(context, (ContextVariable) semanticObject); 
-  			return; 
-  		case CheckPackage.FORMAL_PARAMETER:
-  			sequence_FormalParameter(context, (FormalParameter) semanticObject); 
-  			return; 
-  		case CheckPackage.IMPLEMENTATION:
-  			sequence_Implementation(context, (Implementation) semanticObject); 
-  			return; 
-  		case CheckPackage.MEMBER:
-  			sequence_Member(context, (Member) semanticObject); 
-  			return; 
-  		case CheckPackage.SEVERITY_RANGE:
-  			sequence_SeverityRange(context, (SeverityRange) semanticObject); 
-  			return; 
-  		case CheckPackage.XGUARD_EXPRESSION:
-  			sequence_XGuardExpression(context, (XGuardExpression) semanticObject); 
-  			return; 
-  		case CheckPackage.XISSUE_EXPRESSION:
-  			sequence_XIssueExpression(context, (XIssueExpression) semanticObject); 
-  			return; 
-  		}
-  	else if(semanticObject.eClass().getEPackage() == TypesPackage.eINSTANCE) switch(semanticObject.eClass().getClassifierID()) {
-  		case TypesPackage.JVM_FORMAL_PARAMETER:
-  			if(context == grammarAccess.getFullJvmFormalParameterRule()) {
-  				sequence_FullJvmFormalParameter(context, (JvmFormalParameter) semanticObject); 
-  				return; 
-  			}
-  			else if(context == grammarAccess.getJvmFormalParameterRule()) {
-  				sequence_JvmFormalParameter(context, (JvmFormalParameter) semanticObject); 
-  				return; 
-  			}
-  			else break;
-  		case TypesPackage.JVM_GENERIC_ARRAY_TYPE_REFERENCE:
-  			sequence_JvmTypeReference(context, (JvmGenericArrayTypeReference) semanticObject); 
-  			return; 
-  		case TypesPackage.JVM_INNER_TYPE_REFERENCE:
-  			sequence_JvmParameterizedTypeReference(context, (JvmInnerTypeReference) semanticObject); 
-  			return; 
-  		case TypesPackage.JVM_LOWER_BOUND:
-  			if(context == grammarAccess.getJvmLowerBoundAndedRule()) {
-  				sequence_JvmLowerBoundAnded(context, (JvmLowerBound) semanticObject); 
-  				return; 
-  			}
-  			else if(context == grammarAccess.getJvmLowerBoundRule()) {
-  				sequence_JvmLowerBound(context, (JvmLowerBound) semanticObject); 
-  				return; 
-  			}
-  			else break;
-  		case TypesPackage.JVM_PARAMETERIZED_TYPE_REFERENCE:
-  			sequence_JvmParameterizedTypeReference(context, (JvmParameterizedTypeReference) semanticObject); 
-  			return; 
-  		case TypesPackage.JVM_TYPE_PARAMETER:
-  			sequence_JvmTypeParameter(context, (JvmTypeParameter) semanticObject); 
-  			return; 
-  		case TypesPackage.JVM_UPPER_BOUND:
-  			if(context == grammarAccess.getJvmUpperBoundAndedRule()) {
-  				sequence_JvmUpperBoundAnded(context, (JvmUpperBound) semanticObject); 
-  				return; 
-  			}
-  			else if(context == grammarAccess.getJvmUpperBoundRule()) {
-  				sequence_JvmUpperBound(context, (JvmUpperBound) semanticObject); 
-  				return; 
-  			}
-  			else break;
-  		case TypesPackage.JVM_WILDCARD_TYPE_REFERENCE:
-  			sequence_JvmWildcardTypeReference(context, (JvmWildcardTypeReference) semanticObject); 
-  			return; 
-  		}
-  	else if(semanticObject.eClass().getEPackage() == XAnnotationsPackage.eINSTANCE) switch(semanticObject.eClass().getClassifierID()) {
-  		case XAnnotationsPackage.XANNOTATION:
-  			sequence_XAnnotation(context, (XAnnotation) semanticObject); 
-  			return; 
-  		case XAnnotationsPackage.XANNOTATION_ELEMENT_VALUE_PAIR:
-  			sequence_XAnnotationElementValuePair(context, (XAnnotationElementValuePair) semanticObject); 
-  			return; 
-  		}
-  	else if(semanticObject.eClass().getEPackage() == XbasePackage.eINSTANCE) switch(semanticObject.eClass().getClassifierID()) {
-  		case XbasePackage.XASSIGNMENT:
-  			sequence_XAssignment_XMemberFeatureCall(context, (XAssignment) semanticObject); 
-  			return; 
-  		case XbasePackage.XBASIC_FOR_LOOP_EXPRESSION:
-  			sequence_XBasicForLoopExpression(context, (XBasicForLoopExpression) semanticObject); 
-  			return; 
-  		case XbasePackage.XBINARY_OPERATION:
-  			sequence_XAdditiveExpression_XAndExpression_XAssignment_XEqualityExpression_XMultiplicativeExpression_XOrExpression_XOtherOperatorExpression_XRelationalExpression(context, (XBinaryOperation) semanticObject); 
-  			return; 
-  		case XbasePackage.XBLOCK_EXPRESSION:
-  			if(context == grammarAccess.getXAdditiveExpressionRule() ||
-  			   context == grammarAccess.getXAdditiveExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXAndExpressionRule() ||
-  			   context == grammarAccess.getXAndExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXAnnotationElementValueRule() ||
-  			   context == grammarAccess.getXAnnotationElementValueOrCommaListRule() ||
-  			   context == grammarAccess.getXAnnotationElementValueOrCommaListAccess().getXListLiteralElementsAction_1_1_0() ||
-  			   context == grammarAccess.getXAnnotationOrExpressionRule() ||
-  			   context == grammarAccess.getXAssignmentRule() ||
-  			   context == grammarAccess.getXAssignmentAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0() ||
-  			   context == grammarAccess.getXBlockExpressionRule() ||
-  			   context == grammarAccess.getXCastedExpressionRule() ||
-  			   context == grammarAccess.getXCastedExpressionAccess().getXCastedExpressionTargetAction_1_0_0_0() ||
-  			   context == grammarAccess.getXEqualityExpressionRule() ||
-  			   context == grammarAccess.getXEqualityExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXExpressionRule() ||
-  			   context == grammarAccess.getXExpressionOrVarDeclarationRule() ||
-  			   context == grammarAccess.getXMemberFeatureCallRule() ||
-  			   context == grammarAccess.getXMemberFeatureCallAccess().getXAssignmentAssignableAction_1_0_0_0_0() ||
-  			   context == grammarAccess.getXMemberFeatureCallAccess().getXMemberFeatureCallMemberCallTargetAction_1_1_0_0_0() ||
-  			   context == grammarAccess.getXMultiplicativeExpressionRule() ||
-  			   context == grammarAccess.getXMultiplicativeExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXOrExpressionRule() ||
-  			   context == grammarAccess.getXOrExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXOtherOperatorExpressionRule() ||
-  			   context == grammarAccess.getXOtherOperatorExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXParenthesizedExpressionRule() ||
-  			   context == grammarAccess.getXPostfixOperationRule() ||
-  			   context == grammarAccess.getXPostfixOperationAccess().getXPostfixOperationOperandAction_1_0_0() ||
-  			   context == grammarAccess.getXPrimaryExpressionRule() ||
-  			   context == grammarAccess.getXRelationalExpressionRule() ||
-  			   context == grammarAccess.getXRelationalExpressionAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0() ||
-  			   context == grammarAccess.getXRelationalExpressionAccess().getXInstanceOfExpressionExpressionAction_1_0_0_0_0() ||
-  			   context == grammarAccess.getXUnaryOperationRule()) {
-  				sequence_XBlockExpression(context, (XBlockExpression) semanticObject); 
-  				return; 
-  			}
-  			else if(context == grammarAccess.getXExpressionInClosureRule()) {
-  				sequence_XExpressionInClosure(context, (XBlockExpression) semanticObject); 
-  				return; 
-  			}
-  			else break;
-  		case XbasePackage.XBOOLEAN_LITERAL:
-  			sequence_XBooleanLiteral(context, (XBooleanLiteral) semanticObject); 
-  			return; 
-  		case XbasePackage.XCASE_PART:
-  			sequence_XCasePart(context, (XCasePart) semanticObject); 
-  			return; 
-  		case XbasePackage.XCASTED_EXPRESSION:
-  			sequence_XCastedExpression(context, (XCastedExpression) semanticObject); 
-  			return; 
-  		case XbasePackage.XCATCH_CLAUSE:
-  			sequence_XCatchClause(context, (XCatchClause) semanticObject); 
-  			return; 
-  		case XbasePackage.XCLOSURE:
-  			if(context == grammarAccess.getXAdditiveExpressionRule() ||
-  			   context == grammarAccess.getXAdditiveExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXAndExpressionRule() ||
-  			   context == grammarAccess.getXAndExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXAnnotationElementValueRule() ||
-  			   context == grammarAccess.getXAnnotationElementValueOrCommaListRule() ||
-  			   context == grammarAccess.getXAnnotationElementValueOrCommaListAccess().getXListLiteralElementsAction_1_1_0() ||
-  			   context == grammarAccess.getXAnnotationOrExpressionRule() ||
-  			   context == grammarAccess.getXAssignmentRule() ||
-  			   context == grammarAccess.getXAssignmentAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0() ||
-  			   context == grammarAccess.getXCastedExpressionRule() ||
-  			   context == grammarAccess.getXCastedExpressionAccess().getXCastedExpressionTargetAction_1_0_0_0() ||
-  			   context == grammarAccess.getXClosureRule() ||
-  			   context == grammarAccess.getXEqualityExpressionRule() ||
-  			   context == grammarAccess.getXEqualityExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXExpressionRule() ||
-  			   context == grammarAccess.getXExpressionOrVarDeclarationRule() ||
-  			   context == grammarAccess.getXLiteralRule() ||
-  			   context == grammarAccess.getXMemberFeatureCallRule() ||
-  			   context == grammarAccess.getXMemberFeatureCallAccess().getXAssignmentAssignableAction_1_0_0_0_0() ||
-  			   context == grammarAccess.getXMemberFeatureCallAccess().getXMemberFeatureCallMemberCallTargetAction_1_1_0_0_0() ||
-  			   context == grammarAccess.getXMultiplicativeExpressionRule() ||
-  			   context == grammarAccess.getXMultiplicativeExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXOrExpressionRule() ||
-  			   context == grammarAccess.getXOrExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXOtherOperatorExpressionRule() ||
-  			   context == grammarAccess.getXOtherOperatorExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXParenthesizedExpressionRule() ||
-  			   context == grammarAccess.getXPostfixOperationRule() ||
-  			   context == grammarAccess.getXPostfixOperationAccess().getXPostfixOperationOperandAction_1_0_0() ||
-  			   context == grammarAccess.getXPrimaryExpressionRule() ||
-  			   context == grammarAccess.getXRelationalExpressionRule() ||
-  			   context == grammarAccess.getXRelationalExpressionAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0() ||
-  			   context == grammarAccess.getXRelationalExpressionAccess().getXInstanceOfExpressionExpressionAction_1_0_0_0_0() ||
-  			   context == grammarAccess.getXUnaryOperationRule()) {
-  				sequence_XClosure(context, (XClosure) semanticObject); 
-  				return; 
-  			}
-  			else if(context == grammarAccess.getXShortClosureRule()) {
-  				sequence_XShortClosure(context, (XClosure) semanticObject); 
-  				return; 
-  			}
-  			else break;
-  		case XbasePackage.XCONSTRUCTOR_CALL:
-  			sequence_XConstructorCall(context, (XConstructorCall) semanticObject); 
-  			return; 
-  		case XbasePackage.XDO_WHILE_EXPRESSION:
-  			sequence_XDoWhileExpression(context, (XDoWhileExpression) semanticObject); 
-  			return; 
-  		case XbasePackage.XFEATURE_CALL:
-  			sequence_XFeatureCall(context, (XFeatureCall) semanticObject); 
-  			return; 
-  		case XbasePackage.XFOR_LOOP_EXPRESSION:
-  			sequence_XForLoopExpression(context, (XForLoopExpression) semanticObject); 
-  			return; 
-  		case XbasePackage.XIF_EXPRESSION:
-  			sequence_XIfExpression(context, (XIfExpression) semanticObject); 
-  			return; 
-  		case XbasePackage.XINSTANCE_OF_EXPRESSION:
-  			sequence_XRelationalExpression(context, (XInstanceOfExpression) semanticObject); 
-  			return; 
-  		case XbasePackage.XLIST_LITERAL:
-  			if(context == grammarAccess.getXAnnotationElementValueOrCommaListRule()) {
-  				sequence_XAnnotationElementValueOrCommaList_XListLiteral(context, (XListLiteral) semanticObject); 
-  				return; 
-  			}
-  			else if(context == grammarAccess.getXAnnotationElementValueRule()) {
-  				sequence_XAnnotationElementValue_XListLiteral(context, (XListLiteral) semanticObject); 
-  				return; 
-  			}
-  			else if(context == grammarAccess.getXConstantListLiteralRule() ||
-  			   context == grammarAccess.getXFormalParameterDefaultValueLiteralRule()) {
-  				sequence_XConstantListLiteral(context, (XListLiteral) semanticObject); 
-  				return; 
-  			}
-  			else if(context == grammarAccess.getXAdditiveExpressionRule() ||
-  			   context == grammarAccess.getXAdditiveExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXAndExpressionRule() ||
-  			   context == grammarAccess.getXAndExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXAnnotationElementValueOrCommaListAccess().getXListLiteralElementsAction_1_1_0() ||
-  			   context == grammarAccess.getXAnnotationOrExpressionRule() ||
-  			   context == grammarAccess.getXAssignmentRule() ||
-  			   context == grammarAccess.getXAssignmentAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0() ||
-  			   context == grammarAccess.getXCastedExpressionRule() ||
-  			   context == grammarAccess.getXCastedExpressionAccess().getXCastedExpressionTargetAction_1_0_0_0() ||
-  			   context == grammarAccess.getXCollectionLiteralRule() ||
-  			   context == grammarAccess.getXEqualityExpressionRule() ||
-  			   context == grammarAccess.getXEqualityExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXExpressionRule() ||
-  			   context == grammarAccess.getXExpressionOrVarDeclarationRule() ||
-  			   context == grammarAccess.getXListLiteralRule() ||
-  			   context == grammarAccess.getXLiteralRule() ||
-  			   context == grammarAccess.getXMemberFeatureCallRule() ||
-  			   context == grammarAccess.getXMemberFeatureCallAccess().getXAssignmentAssignableAction_1_0_0_0_0() ||
-  			   context == grammarAccess.getXMemberFeatureCallAccess().getXMemberFeatureCallMemberCallTargetAction_1_1_0_0_0() ||
-  			   context == grammarAccess.getXMultiplicativeExpressionRule() ||
-  			   context == grammarAccess.getXMultiplicativeExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXOrExpressionRule() ||
-  			   context == grammarAccess.getXOrExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXOtherOperatorExpressionRule() ||
-  			   context == grammarAccess.getXOtherOperatorExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXParenthesizedExpressionRule() ||
-  			   context == grammarAccess.getXPostfixOperationRule() ||
-  			   context == grammarAccess.getXPostfixOperationAccess().getXPostfixOperationOperandAction_1_0_0() ||
-  			   context == grammarAccess.getXPrimaryExpressionRule() ||
-  			   context == grammarAccess.getXRelationalExpressionRule() ||
-  			   context == grammarAccess.getXRelationalExpressionAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0() ||
-  			   context == grammarAccess.getXRelationalExpressionAccess().getXInstanceOfExpressionExpressionAction_1_0_0_0_0() ||
-  			   context == grammarAccess.getXUnaryOperationRule()) {
-  				sequence_XListLiteral(context, (XListLiteral) semanticObject); 
-  				return; 
-  			}
-  			else break;
-  		case XbasePackage.XMEMBER_FEATURE_CALL:
-  			sequence_XMemberFeatureCall(context, (XMemberFeatureCall) semanticObject); 
-  			return; 
-  		case XbasePackage.XNULL_LITERAL:
-  			sequence_XNullLiteral(context, (XNullLiteral) semanticObject); 
-  			return; 
-  		case XbasePackage.XNUMBER_LITERAL:
-  			sequence_XNumberLiteral(context, (XNumberLiteral) semanticObject); 
-  			return; 
-  		case XbasePackage.XPOSTFIX_OPERATION:
-  			sequence_XPostfixOperation(context, (XPostfixOperation) semanticObject); 
-  			return; 
-  		case XbasePackage.XRETURN_EXPRESSION:
-  			sequence_XReturnExpression(context, (XReturnExpression) semanticObject); 
-  			return; 
-  		case XbasePackage.XSET_LITERAL:
-  			sequence_XSetLiteral(context, (XSetLiteral) semanticObject); 
-  			return; 
-  		case XbasePackage.XSTRING_LITERAL:
-  			sequence_XStringLiteral(context, (XStringLiteral) semanticObject); 
-  			return; 
-  		case XbasePackage.XSWITCH_EXPRESSION:
-  			sequence_XSwitchExpression(context, (XSwitchExpression) semanticObject); 
-  			return; 
-  		case XbasePackage.XSYNCHRONIZED_EXPRESSION:
-  			sequence_XSynchronizedExpression(context, (XSynchronizedExpression) semanticObject); 
-  			return; 
-  		case XbasePackage.XTHROW_EXPRESSION:
-  			sequence_XThrowExpression(context, (XThrowExpression) semanticObject); 
-  			return; 
-  		case XbasePackage.XTRY_CATCH_FINALLY_EXPRESSION:
-  			sequence_XTryCatchFinallyExpression(context, (XTryCatchFinallyExpression) semanticObject); 
-  			return; 
-  		case XbasePackage.XTYPE_LITERAL:
-  			sequence_XTypeLiteral(context, (XTypeLiteral) semanticObject); 
-  			return; 
-  		case XbasePackage.XUNARY_OPERATION:
-  			if(context == grammarAccess.getXConstantUnaryOperationRule() ||
-  			   context == grammarAccess.getXFormalParameterDefaultValueLiteralRule()) {
-  				sequence_XConstantUnaryOperation(context, (XUnaryOperation) semanticObject); 
-  				return; 
-  			}
-  			else if(context == grammarAccess.getXAdditiveExpressionRule() ||
-  			   context == grammarAccess.getXAdditiveExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXAndExpressionRule() ||
-  			   context == grammarAccess.getXAndExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXAnnotationElementValueRule() ||
-  			   context == grammarAccess.getXAnnotationElementValueOrCommaListRule() ||
-  			   context == grammarAccess.getXAnnotationElementValueOrCommaListAccess().getXListLiteralElementsAction_1_1_0() ||
-  			   context == grammarAccess.getXAnnotationOrExpressionRule() ||
-  			   context == grammarAccess.getXAssignmentRule() ||
-  			   context == grammarAccess.getXAssignmentAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0() ||
-  			   context == grammarAccess.getXCastedExpressionRule() ||
-  			   context == grammarAccess.getXCastedExpressionAccess().getXCastedExpressionTargetAction_1_0_0_0() ||
-  			   context == grammarAccess.getXEqualityExpressionRule() ||
-  			   context == grammarAccess.getXEqualityExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXExpressionRule() ||
-  			   context == grammarAccess.getXExpressionOrVarDeclarationRule() ||
-  			   context == grammarAccess.getXMemberFeatureCallRule() ||
-  			   context == grammarAccess.getXMemberFeatureCallAccess().getXAssignmentAssignableAction_1_0_0_0_0() ||
-  			   context == grammarAccess.getXMemberFeatureCallAccess().getXMemberFeatureCallMemberCallTargetAction_1_1_0_0_0() ||
-  			   context == grammarAccess.getXMultiplicativeExpressionRule() ||
-  			   context == grammarAccess.getXMultiplicativeExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXOrExpressionRule() ||
-  			   context == grammarAccess.getXOrExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXOtherOperatorExpressionRule() ||
-  			   context == grammarAccess.getXOtherOperatorExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXParenthesizedExpressionRule() ||
-  			   context == grammarAccess.getXPostfixOperationRule() ||
-  			   context == grammarAccess.getXPostfixOperationAccess().getXPostfixOperationOperandAction_1_0_0() ||
-  			   context == grammarAccess.getXPrimaryExpressionRule() ||
-  			   context == grammarAccess.getXRelationalExpressionRule() ||
-  			   context == grammarAccess.getXRelationalExpressionAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0() ||
-  			   context == grammarAccess.getXRelationalExpressionAccess().getXInstanceOfExpressionExpressionAction_1_0_0_0_0() ||
-  			   context == grammarAccess.getXUnaryOperationRule()) {
-  				sequence_XUnaryOperation(context, (XUnaryOperation) semanticObject); 
-  				return; 
-  			}
-  			else break;
-  		case XbasePackage.XVARIABLE_DECLARATION:
-  			sequence_XVariableDeclaration(context, (XVariableDeclaration) semanticObject); 
-  			return; 
-  		case XbasePackage.XWHILE_EXPRESSION:
-  			sequence_XWhileExpression(context, (XWhileExpression) semanticObject); 
-  			return; 
-  		}
-  	else if(semanticObject.eClass().getEPackage() == XtypePackage.eINSTANCE) switch(semanticObject.eClass().getClassifierID()) {
-  		case XtypePackage.XFUNCTION_TYPE_REF:
-  			sequence_XFunctionTypeRef(context, (XFunctionTypeRef) semanticObject); 
-  			return; 
-  		case XtypePackage.XIMPORT_DECLARATION:
-  			sequence_XImportDeclaration(context, (XImportDeclaration) semanticObject); 
-  			return; 
-  		case XtypePackage.XIMPORT_SECTION:
-  			sequence_XImportSection(context, (XImportSection) semanticObject); 
-  			return; 
-  		}
-  	if (errorAcceptor != null) errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
-  }
-
-  /**
-   * Constraint:
-   *     (id=ValidID? label=STRING checks+=Check*)
-   */
-  protected void sequence_Category(EObject context, Category semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (
-   *         packageName=QualifiedName 
-   *         imports=XImportSection 
-   *         final?='final'? 
-   *         name=ValidID 
-   *         grammar=[Grammar|QualifiedName]? 
-   *         (categories+=Category | implementations+=Implementation | checks+=Check | members+=Member)*
-   *     )
-   */
-  protected void sequence_CheckCatalog(EObject context, CheckCatalog semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (
-   *         severityRange=SeverityRange? 
-   *         final?='final'? 
-   *         kind=TriggerKind? 
-   *         defaultSeverity=SeverityKind 
-   *         id=ValidID? 
-   *         label=STRING 
-   *         (formalParameters+=FormalParameter formalParameters+=FormalParameter*)? 
-   *         givenMessage=STRING? 
-   *         (contexts+=Context* | contexts+=Context?)
-   *     )
-   */
-  protected void sequence_Check(EObject context, Check semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (type=JvmTypeReference name=ValidID?)
-   */
-  protected void sequence_ContextVariable(EObject context, ContextVariable semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (contextVariable=ContextVariable constraint=XBlockExpression)
-   */
-  protected void sequence_Context(EObject context, Context semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (type=JvmParameterizedTypeReference name=ValidID right=XFormalParameterDefaultValueLiteral label=STRING?)
-   */
-  protected void sequence_FormalParameter(EObject context, FormalParameter semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (name=ValidID context=Context)
-   */
-  protected void sequence_Implementation(EObject context, Implementation semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (annotations+=XAnnotation* type=JvmTypeReference name=ValidID value=XOrExpression?)
-   */
-  protected void sequence_Member(EObject context, Member semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (minSeverity=SeverityKind maxSeverity=SeverityKind)
-   */
-  protected void sequence_SeverityRange(EObject context, SeverityRange semanticObject) {
-  	if(errorAcceptor != null) {
-  		if(transientValues.isValueTransient(semanticObject, CheckPackage.Literals.SEVERITY_RANGE__MIN_SEVERITY) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CheckPackage.Literals.SEVERITY_RANGE__MIN_SEVERITY));
-  		if(transientValues.isValueTransient(semanticObject, CheckPackage.Literals.SEVERITY_RANGE__MAX_SEVERITY) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CheckPackage.Literals.SEVERITY_RANGE__MAX_SEVERITY));
-  	}
-  	INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-  	SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-  	feeder.accept(grammarAccess.getSeverityRangeAccess().getMinSeveritySeverityKindEnumRuleCall_3_0(), semanticObject.getMinSeverity());
-  	feeder.accept(grammarAccess.getSeverityRangeAccess().getMaxSeveritySeverityKindEnumRuleCall_5_0(), semanticObject.getMaxSeverity());
-  	feeder.finish();
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (
-   *         (leftOperand=XAdditiveExpression_XBinaryOperation_1_0_0_0 feature=[JvmIdentifiableElement|OpAdd] rightOperand=XMultiplicativeExpression) | 
-   *         (leftOperand=XMultiplicativeExpression_XBinaryOperation_1_0_0_0 feature=[JvmIdentifiableElement|OpMulti] rightOperand=XUnaryOperation) | 
-   *         (leftOperand=XOtherOperatorExpression_XBinaryOperation_1_0_0_0 feature=[JvmIdentifiableElement|OpOther] rightOperand=XAdditiveExpression) | 
-   *         (leftOperand=XRelationalExpression_XBinaryOperation_1_1_0_0_0 feature=[JvmIdentifiableElement|OpCompare] rightOperand=XOtherOperatorExpression) | 
-   *         (leftOperand=XEqualityExpression_XBinaryOperation_1_0_0_0 feature=[JvmIdentifiableElement|OpEquality] rightOperand=XRelationalExpression) | 
-   *         (leftOperand=XAndExpression_XBinaryOperation_1_0_0_0 feature=[JvmIdentifiableElement|OpAnd] rightOperand=XEqualityExpression) | 
-   *         (leftOperand=XOrExpression_XBinaryOperation_1_0_0_0 feature=[JvmIdentifiableElement|OpOr] rightOperand=XAndExpression) | 
-   *         (leftOperand=XAssignment_XBinaryOperation_1_1_0_0_0 feature=[JvmIdentifiableElement|OpMultiAssign] rightOperand=XAssignment)
-   *     )
-   */
-  protected void sequence_XAdditiveExpression_XAndExpression_XAssignment_XEqualityExpression_XMultiplicativeExpression_XOrExpression_XOtherOperatorExpression_XRelationalExpression(EObject context, XBinaryOperation semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (
-   *         ((elements+=XAnnotationOrExpression elements+=XAnnotationOrExpression*)?) | 
-   *         (elements+=XAnnotationElementValueOrCommaList_XListLiteral_1_1_0 elements+=XAnnotationOrExpression+) | 
-   *         ((elements+=XExpression elements+=XExpression*)?)
-   *     )
-   */
-  protected void sequence_XAnnotationElementValueOrCommaList_XListLiteral(EObject context, XListLiteral semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (element=[JvmOperation|ValidID] value=XAnnotationElementValue)
-   */
-  protected void sequence_XAnnotationElementValuePair(EObject context, XAnnotationElementValuePair semanticObject) {
-  	if(errorAcceptor != null) {
-  		if(transientValues.isValueTransient(semanticObject, XAnnotationsPackage.Literals.XANNOTATION_ELEMENT_VALUE_PAIR__VALUE) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, XAnnotationsPackage.Literals.XANNOTATION_ELEMENT_VALUE_PAIR__VALUE));
-  		if(transientValues.isValueTransient(semanticObject, XAnnotationsPackage.Literals.XANNOTATION_ELEMENT_VALUE_PAIR__ELEMENT) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, XAnnotationsPackage.Literals.XANNOTATION_ELEMENT_VALUE_PAIR__ELEMENT));
-  	}
-  	INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-  	SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-  	feeder.accept(grammarAccess.getXAnnotationElementValuePairAccess().getElementJvmOperationValidIDParserRuleCall_0_0_0_0_1(), semanticObject.getElement());
-  	feeder.accept(grammarAccess.getXAnnotationElementValuePairAccess().getValueXAnnotationElementValueParserRuleCall_1_0(), semanticObject.getValue());
-  	feeder.finish();
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (((elements+=XAnnotationOrExpression elements+=XAnnotationOrExpression*)?) | ((elements+=XExpression elements+=XExpression*)?))
-   */
-  protected void sequence_XAnnotationElementValue_XListLiteral(EObject context, XListLiteral semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (
-   *         annotationType=[JvmAnnotationType|QualifiedName] 
-   *         ((elementValuePairs+=XAnnotationElementValuePair elementValuePairs+=XAnnotationElementValuePair*) | value=XAnnotationElementValueOrCommaList)?
-   *     )
-   */
-  protected void sequence_XAnnotation(EObject context, XAnnotation semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (
-   *         (feature=[JvmIdentifiableElement|FeatureCallID] value=XAssignment) | 
-   *         (assignable=XMemberFeatureCall_XAssignment_1_0_0_0_0 explicitStatic?='::'? feature=[JvmIdentifiableElement|FeatureCallID] value=XAssignment)
-   *     )
-   */
-  protected void sequence_XAssignment_XMemberFeatureCall(EObject context, XAssignment semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (
-   *         (initExpressions+=XExpressionOrVarDeclaration initExpressions+=XExpressionOrVarDeclaration*)? 
-   *         expression=XExpression? 
-   *         (updateExpressions+=XExpression updateExpressions+=XExpression*)? 
-   *         eachExpression=XExpression
-   *     )
-   */
-  protected void sequence_XBasicForLoopExpression(EObject context, XBasicForLoopExpression semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (expressions+=XExpressionOrVarDeclaration*)
-   */
-  protected void sequence_XBlockExpression(EObject context, XBlockExpression semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (isTrue?='true'?)
-   */
-  protected void sequence_XBooleanLiteral(EObject context, XBooleanLiteral semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (typeGuard=JvmTypeReference? case=XExpression? (then=XExpression | fallThrough?=','))
-   */
-  protected void sequence_XCasePart(EObject context, XCasePart semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (target=XCastedExpression_XCastedExpression_1_0_0_0 type=JvmTypeReference)
-   */
-  protected void sequence_XCastedExpression(EObject context, XCastedExpression semanticObject) {
-  	if(errorAcceptor != null) {
-  		if(transientValues.isValueTransient(semanticObject, XbasePackage.Literals.XCASTED_EXPRESSION__TYPE) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, XbasePackage.Literals.XCASTED_EXPRESSION__TYPE));
-  		if(transientValues.isValueTransient(semanticObject, XbasePackage.Literals.XCASTED_EXPRESSION__TARGET) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, XbasePackage.Literals.XCASTED_EXPRESSION__TARGET));
-  	}
-  	INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-  	SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-  	feeder.accept(grammarAccess.getXCastedExpressionAccess().getXCastedExpressionTargetAction_1_0_0_0(), semanticObject.getTarget());
-  	feeder.accept(grammarAccess.getXCastedExpressionAccess().getTypeJvmTypeReferenceParserRuleCall_1_1_0(), semanticObject.getType());
-  	feeder.finish();
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (declaredParam=FullJvmFormalParameter expression=XExpression)
-   */
-  protected void sequence_XCatchClause(EObject context, XCatchClause semanticObject) {
-  	if(errorAcceptor != null) {
-  		if(transientValues.isValueTransient(semanticObject, XbasePackage.Literals.XCATCH_CLAUSE__EXPRESSION) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, XbasePackage.Literals.XCATCH_CLAUSE__EXPRESSION));
-  		if(transientValues.isValueTransient(semanticObject, XbasePackage.Literals.XCATCH_CLAUSE__DECLARED_PARAM) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, XbasePackage.Literals.XCATCH_CLAUSE__DECLARED_PARAM));
-  	}
-  	INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-  	SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-  	feeder.accept(grammarAccess.getXCatchClauseAccess().getDeclaredParamFullJvmFormalParameterParserRuleCall_2_0(), semanticObject.getDeclaredParam());
-  	feeder.accept(grammarAccess.getXCatchClauseAccess().getExpressionXExpressionParserRuleCall_4_0(), semanticObject.getExpression());
-  	feeder.finish();
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (
-   *         ((declaredFormalParameters+=JvmFormalParameter declaredFormalParameters+=JvmFormalParameter*)? explicitSyntax?='|')? 
-   *         expression=XExpressionInClosure
-   *     )
-   */
-  protected void sequence_XClosure(EObject context, XClosure semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     ((elements+=XConstantUnaryOperation elements+=XConstantUnaryOperation*)?)
-   */
-  protected void sequence_XConstantListLiteral(EObject context, XListLiteral semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (feature=[JvmIdentifiableElement|OpUnary] operand=XConstantUnaryOperation)
-   */
-  protected void sequence_XConstantUnaryOperation(EObject context, XUnaryOperation semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (
-   *         constructor=[JvmConstructor|QualifiedName] 
-   *         (typeArguments+=JvmArgumentTypeReference typeArguments+=JvmArgumentTypeReference*)? 
-   *         (explicitConstructorCall?='(' (arguments+=XShortClosure | (arguments+=XExpression arguments+=XExpression*))?)? 
-   *         arguments+=XClosure?
-   *     )
-   */
-  protected void sequence_XConstructorCall(EObject context, XConstructorCall semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (body=XExpression predicate=XExpression)
-   */
-  protected void sequence_XDoWhileExpression(EObject context, XDoWhileExpression semanticObject) {
-  	if(errorAcceptor != null) {
-  		if(transientValues.isValueTransient(semanticObject, XbasePackage.Literals.XABSTRACT_WHILE_EXPRESSION__PREDICATE) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, XbasePackage.Literals.XABSTRACT_WHILE_EXPRESSION__PREDICATE));
-  		if(transientValues.isValueTransient(semanticObject, XbasePackage.Literals.XABSTRACT_WHILE_EXPRESSION__BODY) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, XbasePackage.Literals.XABSTRACT_WHILE_EXPRESSION__BODY));
-  	}
-  	INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-  	SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-  	feeder.accept(grammarAccess.getXDoWhileExpressionAccess().getBodyXExpressionParserRuleCall_2_0(), semanticObject.getBody());
-  	feeder.accept(grammarAccess.getXDoWhileExpressionAccess().getPredicateXExpressionParserRuleCall_5_0(), semanticObject.getPredicate());
-  	feeder.finish();
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (expressions+=XExpressionOrVarDeclaration*)
-   */
-  protected void sequence_XExpressionInClosure(EObject context, XBlockExpression semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (
-   *         (typeArguments+=JvmArgumentTypeReference typeArguments+=JvmArgumentTypeReference*)? 
-   *         feature=[JvmIdentifiableElement|IdOrSuper] 
-   *         (explicitOperationCall?='(' (featureCallArguments+=XShortClosure | (featureCallArguments+=XExpression featureCallArguments+=XExpression*))?)? 
-   *         featureCallArguments+=XClosure?
-   *     )
-   */
-  protected void sequence_XFeatureCall(EObject context, XFeatureCall semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (declaredParam=JvmFormalParameter forExpression=XExpression eachExpression=XExpression)
-   */
-  protected void sequence_XForLoopExpression(EObject context, XForLoopExpression semanticObject) {
-  	if(errorAcceptor != null) {
-  		if(transientValues.isValueTransient(semanticObject, XbasePackage.Literals.XFOR_LOOP_EXPRESSION__FOR_EXPRESSION) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, XbasePackage.Literals.XFOR_LOOP_EXPRESSION__FOR_EXPRESSION));
-  		if(transientValues.isValueTransient(semanticObject, XbasePackage.Literals.XFOR_LOOP_EXPRESSION__EACH_EXPRESSION) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, XbasePackage.Literals.XFOR_LOOP_EXPRESSION__EACH_EXPRESSION));
-  		if(transientValues.isValueTransient(semanticObject, XbasePackage.Literals.XFOR_LOOP_EXPRESSION__DECLARED_PARAM) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, XbasePackage.Literals.XFOR_LOOP_EXPRESSION__DECLARED_PARAM));
-  	}
-  	INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-  	SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-  	feeder.accept(grammarAccess.getXForLoopExpressionAccess().getDeclaredParamJvmFormalParameterParserRuleCall_0_0_3_0(), semanticObject.getDeclaredParam());
-  	feeder.accept(grammarAccess.getXForLoopExpressionAccess().getForExpressionXExpressionParserRuleCall_1_0(), semanticObject.getForExpression());
-  	feeder.accept(grammarAccess.getXForLoopExpressionAccess().getEachExpressionXExpressionParserRuleCall_3_0(), semanticObject.getEachExpression());
-  	feeder.finish();
-  }
-  
-  
-  /**
-   * Constraint:
-   *     ((paramTypes+=JvmTypeReference paramTypes+=JvmTypeReference*)? returnType=JvmTypeReference)
-   */
-  protected void sequence_XFunctionTypeRef(EObject context, XFunctionTypeRef semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     guard=XExpression
-   */
-  protected void sequence_XGuardExpression(EObject context, XGuardExpression semanticObject) {
-  	if(errorAcceptor != null) {
-  		if(transientValues.isValueTransient(semanticObject, CheckPackage.Literals.XGUARD_EXPRESSION__GUARD) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CheckPackage.Literals.XGUARD_EXPRESSION__GUARD));
-  	}
-  	INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-  	SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-  	feeder.accept(grammarAccess.getXGuardExpressionAccess().getGuardXExpressionParserRuleCall_2_0(), semanticObject.getGuard());
-  	feeder.finish();
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (if=XExpression then=XExpression else=XExpression?)
-   */
-  protected void sequence_XIfExpression(EObject context, XIfExpression semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (importedType=[JvmDeclaredType|QualifiedName] | importedNamespace=QualifiedNameWithWildcard)
-   */
-  protected void sequence_XImportDeclaration(EObject context, XImportDeclaration semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (importDeclarations+=XImportDeclaration*)
-   */
-  protected void sequence_XImportSection(EObject context, XImportSection semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (
-   *         check=[Check|QualifiedName]? 
-   *         (
-   *             (markerFeature=[EStructuralFeature|ValidID] | (markerObject=XExpression markerFeature=[EStructuralFeature|FeatureCallID]?)) 
-   *             markerIndex=XExpression?
-   *         )? 
-   *         message=XExpression? 
-   *         (messageParameters+=XExpression messageParameters+=XExpression*)? 
-   *         (issueCode=ValidID? issueData+=XExpression issueData+=XExpression*)?
-   *     )
-   */
-  protected void sequence_XIssueExpression(EObject context, XIssueExpression semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     ((elements+=XExpression elements+=XExpression*)?)
-   */
-  protected void sequence_XListLiteral(EObject context, XListLiteral semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (
-   *         memberCallTarget=XMemberFeatureCall_XMemberFeatureCall_1_1_0_0_0 
-   *         (nullSafe?='?.' | explicitStatic?='::')? 
-   *         (typeArguments+=JvmArgumentTypeReference typeArguments+=JvmArgumentTypeReference*)? 
-   *         feature=[JvmIdentifiableElement|IdOrSuper] 
-   *         (explicitOperationCall?='(' (memberCallArguments+=XShortClosure | (memberCallArguments+=XExpression memberCallArguments+=XExpression*))?)? 
-   *         memberCallArguments+=XClosure?
-   *     )
-   */
-  protected void sequence_XMemberFeatureCall(EObject context, XMemberFeatureCall semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     {XNullLiteral}
-   */
-  protected void sequence_XNullLiteral(EObject context, XNullLiteral semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     value=Number
-   */
-  protected void sequence_XNumberLiteral(EObject context, XNumberLiteral semanticObject) {
-  	if(errorAcceptor != null) {
-  		if(transientValues.isValueTransient(semanticObject, XbasePackage.Literals.XNUMBER_LITERAL__VALUE) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, XbasePackage.Literals.XNUMBER_LITERAL__VALUE));
-  	}
-  	INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-  	SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-  	feeder.accept(grammarAccess.getXNumberLiteralAccess().getValueNumberParserRuleCall_1_0(), semanticObject.getValue());
-  	feeder.finish();
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (operand=XPostfixOperation_XPostfixOperation_1_0_0 feature=[JvmIdentifiableElement|OpPostfix])
-   */
-  protected void sequence_XPostfixOperation(EObject context, XPostfixOperation semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (expression=XRelationalExpression_XInstanceOfExpression_1_0_0_0_0 type=JvmTypeReference)
-   */
-  protected void sequence_XRelationalExpression(EObject context, XInstanceOfExpression semanticObject) {
-  	if(errorAcceptor != null) {
-  		if(transientValues.isValueTransient(semanticObject, XbasePackage.Literals.XINSTANCE_OF_EXPRESSION__TYPE) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, XbasePackage.Literals.XINSTANCE_OF_EXPRESSION__TYPE));
-  		if(transientValues.isValueTransient(semanticObject, XbasePackage.Literals.XINSTANCE_OF_EXPRESSION__EXPRESSION) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, XbasePackage.Literals.XINSTANCE_OF_EXPRESSION__EXPRESSION));
-  	}
-  	INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-  	SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-  	feeder.accept(grammarAccess.getXRelationalExpressionAccess().getXInstanceOfExpressionExpressionAction_1_0_0_0_0(), semanticObject.getExpression());
-  	feeder.accept(grammarAccess.getXRelationalExpressionAccess().getTypeJvmTypeReferenceParserRuleCall_1_0_1_0(), semanticObject.getType());
-  	feeder.finish();
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (expression=XExpression?)
-   */
-  protected void sequence_XReturnExpression(EObject context, XReturnExpression semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     ((elements+=XExpression elements+=XExpression*)?)
-   */
-  protected void sequence_XSetLiteral(EObject context, XSetLiteral semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     ((declaredFormalParameters+=JvmFormalParameter declaredFormalParameters+=JvmFormalParameter*)? explicitSyntax?='|' expression=XExpression)
-   */
-  protected void sequence_XShortClosure(EObject context, XClosure semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     value=STRING
-   */
-  protected void sequence_XStringLiteral(EObject context, XStringLiteral semanticObject) {
-  	if(errorAcceptor != null) {
-  		if(transientValues.isValueTransient(semanticObject, XbasePackage.Literals.XSTRING_LITERAL__VALUE) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, XbasePackage.Literals.XSTRING_LITERAL__VALUE));
-  	}
-  	INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-  	SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-  	feeder.accept(grammarAccess.getXStringLiteralAccess().getValueSTRINGTerminalRuleCall_1_0(), semanticObject.getValue());
-  	feeder.finish();
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (
-   *         ((declaredParam=JvmFormalParameter switch=XExpression) | (declaredParam=JvmFormalParameter? switch=XExpression)) 
-   *         cases+=XCasePart* 
-   *         default=XExpression?
-   *     )
-   */
-  protected void sequence_XSwitchExpression(EObject context, XSwitchExpression semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (param=XExpression expression=XExpression)
-   */
-  protected void sequence_XSynchronizedExpression(EObject context, XSynchronizedExpression semanticObject) {
-  	if(errorAcceptor != null) {
-  		if(transientValues.isValueTransient(semanticObject, XbasePackage.Literals.XSYNCHRONIZED_EXPRESSION__PARAM) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, XbasePackage.Literals.XSYNCHRONIZED_EXPRESSION__PARAM));
-  		if(transientValues.isValueTransient(semanticObject, XbasePackage.Literals.XSYNCHRONIZED_EXPRESSION__EXPRESSION) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, XbasePackage.Literals.XSYNCHRONIZED_EXPRESSION__EXPRESSION));
-  	}
-  	INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-  	SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-  	feeder.accept(grammarAccess.getXSynchronizedExpressionAccess().getParamXExpressionParserRuleCall_1_0(), semanticObject.getParam());
-  	feeder.accept(grammarAccess.getXSynchronizedExpressionAccess().getExpressionXExpressionParserRuleCall_3_0(), semanticObject.getExpression());
-  	feeder.finish();
-  }
-  
-  
-  /**
-   * Constraint:
-   *     expression=XExpression
-   */
-  protected void sequence_XThrowExpression(EObject context, XThrowExpression semanticObject) {
-  	if(errorAcceptor != null) {
-  		if(transientValues.isValueTransient(semanticObject, XbasePackage.Literals.XTHROW_EXPRESSION__EXPRESSION) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, XbasePackage.Literals.XTHROW_EXPRESSION__EXPRESSION));
-  	}
-  	INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-  	SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-  	feeder.accept(grammarAccess.getXThrowExpressionAccess().getExpressionXExpressionParserRuleCall_2_0(), semanticObject.getExpression());
-  	feeder.finish();
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (expression=XExpression ((catchClauses+=XCatchClause+ finallyExpression=XExpression?) | finallyExpression=XExpression))
-   */
-  protected void sequence_XTryCatchFinallyExpression(EObject context, XTryCatchFinallyExpression semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (type=[JvmType|QualifiedName] arrayDimensions+=ArrayBrackets*)
-   */
-  protected void sequence_XTypeLiteral(EObject context, XTypeLiteral semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (feature=[JvmIdentifiableElement|OpUnary] operand=XUnaryOperation)
-   */
-  protected void sequence_XUnaryOperation(EObject context, XUnaryOperation semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (writeable?='var'? ((type=JvmTypeReference name=ValidID) | name=ValidID) right=XExpression?)
-   */
-  protected void sequence_XVariableDeclaration(EObject context, XVariableDeclaration semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (predicate=XExpression body=XExpression)
-   */
-  protected void sequence_XWhileExpression(EObject context, XWhileExpression semanticObject) {
-  	if(errorAcceptor != null) {
-  		if(transientValues.isValueTransient(semanticObject, XbasePackage.Literals.XABSTRACT_WHILE_EXPRESSION__PREDICATE) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, XbasePackage.Literals.XABSTRACT_WHILE_EXPRESSION__PREDICATE));
-  		if(transientValues.isValueTransient(semanticObject, XbasePackage.Literals.XABSTRACT_WHILE_EXPRESSION__BODY) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, XbasePackage.Literals.XABSTRACT_WHILE_EXPRESSION__BODY));
-  	}
-  	INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-  	SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-  	feeder.accept(grammarAccess.getXWhileExpressionAccess().getPredicateXExpressionParserRuleCall_3_0(), semanticObject.getPredicate());
-  	feeder.accept(grammarAccess.getXWhileExpressionAccess().getBodyXExpressionParserRuleCall_5_0(), semanticObject.getBody());
-  	feeder.finish();
-  }
+	@Inject
+	private CheckGrammarAccess grammarAccess;
+	
+	@Override
+	public void sequence(ISerializationContext context, EObject semanticObject) {
+		EPackage epackage = semanticObject.eClass().getEPackage();
+		ParserRule rule = context.getParserRule();
+		Action action = context.getAssignedAction();
+		Set<Parameter> parameters = context.getEnabledBooleanParameters();
+		if (epackage == CheckPackage.eINSTANCE)
+			switch (semanticObject.eClass().getClassifierID()) {
+			case CheckPackage.CATEGORY:
+				sequence_Category(context, (Category) semanticObject); 
+				return; 
+			case CheckPackage.CHECK:
+				sequence_Check(context, (Check) semanticObject); 
+				return; 
+			case CheckPackage.CHECK_CATALOG:
+				sequence_CheckCatalog(context, (CheckCatalog) semanticObject); 
+				return; 
+			case CheckPackage.CONTEXT:
+				sequence_Context(context, (Context) semanticObject); 
+				return; 
+			case CheckPackage.CONTEXT_VARIABLE:
+				sequence_ContextVariable(context, (ContextVariable) semanticObject); 
+				return; 
+			case CheckPackage.FORMAL_PARAMETER:
+				sequence_FormalParameter(context, (FormalParameter) semanticObject); 
+				return; 
+			case CheckPackage.IMPLEMENTATION:
+				sequence_Implementation(context, (Implementation) semanticObject); 
+				return; 
+			case CheckPackage.MEMBER:
+				sequence_Member(context, (Member) semanticObject); 
+				return; 
+			case CheckPackage.SEVERITY_RANGE:
+				sequence_SeverityRange(context, (SeverityRange) semanticObject); 
+				return; 
+			case CheckPackage.XGUARD_EXPRESSION:
+				sequence_XGuardExpression(context, (XGuardExpression) semanticObject); 
+				return; 
+			case CheckPackage.XISSUE_EXPRESSION:
+				sequence_XIssueExpression(context, (XIssueExpression) semanticObject); 
+				return; 
+			}
+		else if (epackage == TypesPackage.eINSTANCE)
+			switch (semanticObject.eClass().getClassifierID()) {
+			case TypesPackage.JVM_FORMAL_PARAMETER:
+				if (rule == grammarAccess.getFullJvmFormalParameterRule()) {
+					sequence_FullJvmFormalParameter(context, (JvmFormalParameter) semanticObject); 
+					return; 
+				}
+				else if (rule == grammarAccess.getJvmFormalParameterRule()) {
+					sequence_JvmFormalParameter(context, (JvmFormalParameter) semanticObject); 
+					return; 
+				}
+				else break;
+			case TypesPackage.JVM_GENERIC_ARRAY_TYPE_REFERENCE:
+				sequence_JvmTypeReference(context, (JvmGenericArrayTypeReference) semanticObject); 
+				return; 
+			case TypesPackage.JVM_INNER_TYPE_REFERENCE:
+				sequence_JvmParameterizedTypeReference(context, (JvmInnerTypeReference) semanticObject); 
+				return; 
+			case TypesPackage.JVM_LOWER_BOUND:
+				if (rule == grammarAccess.getJvmLowerBoundAndedRule()) {
+					sequence_JvmLowerBoundAnded(context, (JvmLowerBound) semanticObject); 
+					return; 
+				}
+				else if (rule == grammarAccess.getJvmLowerBoundRule()) {
+					sequence_JvmLowerBound(context, (JvmLowerBound) semanticObject); 
+					return; 
+				}
+				else break;
+			case TypesPackage.JVM_PARAMETERIZED_TYPE_REFERENCE:
+				if (action == grammarAccess.getJvmParameterizedTypeReferenceAccess().getJvmInnerTypeReferenceOuterAction_1_4_0_0_0()) {
+					sequence_JvmParameterizedTypeReference_JvmInnerTypeReference_1_4_0_0_0(context, (JvmParameterizedTypeReference) semanticObject); 
+					return; 
+				}
+				else if (rule == grammarAccess.getJvmTypeReferenceRule()
+						|| action == grammarAccess.getJvmTypeReferenceAccess().getJvmGenericArrayTypeReferenceComponentTypeAction_0_1_0_0()
+						|| rule == grammarAccess.getJvmParameterizedTypeReferenceRule()
+						|| rule == grammarAccess.getJvmArgumentTypeReferenceRule()) {
+					sequence_JvmParameterizedTypeReference(context, (JvmParameterizedTypeReference) semanticObject); 
+					return; 
+				}
+				else break;
+			case TypesPackage.JVM_TYPE_PARAMETER:
+				sequence_JvmTypeParameter(context, (JvmTypeParameter) semanticObject); 
+				return; 
+			case TypesPackage.JVM_UPPER_BOUND:
+				if (rule == grammarAccess.getJvmUpperBoundAndedRule()) {
+					sequence_JvmUpperBoundAnded(context, (JvmUpperBound) semanticObject); 
+					return; 
+				}
+				else if (rule == grammarAccess.getJvmUpperBoundRule()) {
+					sequence_JvmUpperBound(context, (JvmUpperBound) semanticObject); 
+					return; 
+				}
+				else break;
+			case TypesPackage.JVM_WILDCARD_TYPE_REFERENCE:
+				sequence_JvmWildcardTypeReference(context, (JvmWildcardTypeReference) semanticObject); 
+				return; 
+			}
+		else if (epackage == XAnnotationsPackage.eINSTANCE)
+			switch (semanticObject.eClass().getClassifierID()) {
+			case XAnnotationsPackage.XANNOTATION:
+				sequence_XAnnotation(context, (XAnnotation) semanticObject); 
+				return; 
+			case XAnnotationsPackage.XANNOTATION_ELEMENT_VALUE_PAIR:
+				sequence_XAnnotationElementValuePair(context, (XAnnotationElementValuePair) semanticObject); 
+				return; 
+			}
+		else if (epackage == XbasePackage.eINSTANCE)
+			switch (semanticObject.eClass().getClassifierID()) {
+			case XbasePackage.XASSIGNMENT:
+				sequence_XAssignment_XMemberFeatureCall(context, (XAssignment) semanticObject); 
+				return; 
+			case XbasePackage.XBASIC_FOR_LOOP_EXPRESSION:
+				sequence_XBasicForLoopExpression(context, (XBasicForLoopExpression) semanticObject); 
+				return; 
+			case XbasePackage.XBINARY_OPERATION:
+				sequence_XAdditiveExpression_XAndExpression_XAssignment_XEqualityExpression_XMultiplicativeExpression_XOrExpression_XOtherOperatorExpression_XRelationalExpression(context, (XBinaryOperation) semanticObject); 
+				return; 
+			case XbasePackage.XBLOCK_EXPRESSION:
+				if (rule == grammarAccess.getXPrimaryExpressionRule()
+						|| rule == grammarAccess.getXAnnotationElementValueOrCommaListRule()
+						|| action == grammarAccess.getXAnnotationElementValueOrCommaListAccess().getXListLiteralElementsAction_1_1_0()
+						|| rule == grammarAccess.getXAnnotationElementValueRule()
+						|| rule == grammarAccess.getXAnnotationOrExpressionRule()
+						|| rule == grammarAccess.getXExpressionRule()
+						|| rule == grammarAccess.getXAssignmentRule()
+						|| action == grammarAccess.getXAssignmentAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0()
+						|| rule == grammarAccess.getXOrExpressionRule()
+						|| action == grammarAccess.getXOrExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXAndExpressionRule()
+						|| action == grammarAccess.getXAndExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXEqualityExpressionRule()
+						|| action == grammarAccess.getXEqualityExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXRelationalExpressionRule()
+						|| action == grammarAccess.getXRelationalExpressionAccess().getXInstanceOfExpressionExpressionAction_1_0_0_0_0()
+						|| action == grammarAccess.getXRelationalExpressionAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0()
+						|| rule == grammarAccess.getXOtherOperatorExpressionRule()
+						|| action == grammarAccess.getXOtherOperatorExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXAdditiveExpressionRule()
+						|| action == grammarAccess.getXAdditiveExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXMultiplicativeExpressionRule()
+						|| action == grammarAccess.getXMultiplicativeExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXUnaryOperationRule()
+						|| rule == grammarAccess.getXCastedExpressionRule()
+						|| action == grammarAccess.getXCastedExpressionAccess().getXCastedExpressionTargetAction_1_0_0_0()
+						|| rule == grammarAccess.getXPostfixOperationRule()
+						|| action == grammarAccess.getXPostfixOperationAccess().getXPostfixOperationOperandAction_1_0_0()
+						|| rule == grammarAccess.getXMemberFeatureCallRule()
+						|| action == grammarAccess.getXMemberFeatureCallAccess().getXAssignmentAssignableAction_1_0_0_0_0()
+						|| action == grammarAccess.getXMemberFeatureCallAccess().getXMemberFeatureCallMemberCallTargetAction_1_1_0_0_0()
+						|| rule == grammarAccess.getXParenthesizedExpressionRule()
+						|| rule == grammarAccess.getXBlockExpressionRule()
+						|| rule == grammarAccess.getXExpressionOrVarDeclarationRule()) {
+					sequence_XBlockExpression(context, (XBlockExpression) semanticObject); 
+					return; 
+				}
+				else if (rule == grammarAccess.getXExpressionInClosureRule()) {
+					sequence_XExpressionInClosure(context, (XBlockExpression) semanticObject); 
+					return; 
+				}
+				else break;
+			case XbasePackage.XBOOLEAN_LITERAL:
+				sequence_XBooleanLiteral(context, (XBooleanLiteral) semanticObject); 
+				return; 
+			case XbasePackage.XCASE_PART:
+				sequence_XCasePart(context, (XCasePart) semanticObject); 
+				return; 
+			case XbasePackage.XCASTED_EXPRESSION:
+				sequence_XCastedExpression(context, (XCastedExpression) semanticObject); 
+				return; 
+			case XbasePackage.XCATCH_CLAUSE:
+				sequence_XCatchClause(context, (XCatchClause) semanticObject); 
+				return; 
+			case XbasePackage.XCLOSURE:
+				if (rule == grammarAccess.getXPrimaryExpressionRule()
+						|| rule == grammarAccess.getXAnnotationElementValueOrCommaListRule()
+						|| action == grammarAccess.getXAnnotationElementValueOrCommaListAccess().getXListLiteralElementsAction_1_1_0()
+						|| rule == grammarAccess.getXAnnotationElementValueRule()
+						|| rule == grammarAccess.getXAnnotationOrExpressionRule()
+						|| rule == grammarAccess.getXExpressionRule()
+						|| rule == grammarAccess.getXAssignmentRule()
+						|| action == grammarAccess.getXAssignmentAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0()
+						|| rule == grammarAccess.getXOrExpressionRule()
+						|| action == grammarAccess.getXOrExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXAndExpressionRule()
+						|| action == grammarAccess.getXAndExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXEqualityExpressionRule()
+						|| action == grammarAccess.getXEqualityExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXRelationalExpressionRule()
+						|| action == grammarAccess.getXRelationalExpressionAccess().getXInstanceOfExpressionExpressionAction_1_0_0_0_0()
+						|| action == grammarAccess.getXRelationalExpressionAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0()
+						|| rule == grammarAccess.getXOtherOperatorExpressionRule()
+						|| action == grammarAccess.getXOtherOperatorExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXAdditiveExpressionRule()
+						|| action == grammarAccess.getXAdditiveExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXMultiplicativeExpressionRule()
+						|| action == grammarAccess.getXMultiplicativeExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXUnaryOperationRule()
+						|| rule == grammarAccess.getXCastedExpressionRule()
+						|| action == grammarAccess.getXCastedExpressionAccess().getXCastedExpressionTargetAction_1_0_0_0()
+						|| rule == grammarAccess.getXPostfixOperationRule()
+						|| action == grammarAccess.getXPostfixOperationAccess().getXPostfixOperationOperandAction_1_0_0()
+						|| rule == grammarAccess.getXMemberFeatureCallRule()
+						|| action == grammarAccess.getXMemberFeatureCallAccess().getXAssignmentAssignableAction_1_0_0_0_0()
+						|| action == grammarAccess.getXMemberFeatureCallAccess().getXMemberFeatureCallMemberCallTargetAction_1_1_0_0_0()
+						|| rule == grammarAccess.getXLiteralRule()
+						|| rule == grammarAccess.getXClosureRule()
+						|| rule == grammarAccess.getXParenthesizedExpressionRule()
+						|| rule == grammarAccess.getXExpressionOrVarDeclarationRule()) {
+					sequence_XClosure(context, (XClosure) semanticObject); 
+					return; 
+				}
+				else if (rule == grammarAccess.getXShortClosureRule()) {
+					sequence_XShortClosure(context, (XClosure) semanticObject); 
+					return; 
+				}
+				else break;
+			case XbasePackage.XCONSTRUCTOR_CALL:
+				sequence_XConstructorCall(context, (XConstructorCall) semanticObject); 
+				return; 
+			case XbasePackage.XDO_WHILE_EXPRESSION:
+				sequence_XDoWhileExpression(context, (XDoWhileExpression) semanticObject); 
+				return; 
+			case XbasePackage.XFEATURE_CALL:
+				sequence_XFeatureCall(context, (XFeatureCall) semanticObject); 
+				return; 
+			case XbasePackage.XFOR_LOOP_EXPRESSION:
+				sequence_XForLoopExpression(context, (XForLoopExpression) semanticObject); 
+				return; 
+			case XbasePackage.XIF_EXPRESSION:
+				sequence_XIfExpression(context, (XIfExpression) semanticObject); 
+				return; 
+			case XbasePackage.XINSTANCE_OF_EXPRESSION:
+				sequence_XRelationalExpression(context, (XInstanceOfExpression) semanticObject); 
+				return; 
+			case XbasePackage.XLIST_LITERAL:
+				if (rule == grammarAccess.getXAnnotationElementValueOrCommaListRule()) {
+					sequence_XAnnotationElementValueOrCommaList_XListLiteral(context, (XListLiteral) semanticObject); 
+					return; 
+				}
+				else if (rule == grammarAccess.getXAnnotationElementValueRule()) {
+					sequence_XAnnotationElementValue_XListLiteral(context, (XListLiteral) semanticObject); 
+					return; 
+				}
+				else if (rule == grammarAccess.getXFormalParameterDefaultValueLiteralRule()
+						|| rule == grammarAccess.getXConstantListLiteralRule()) {
+					sequence_XConstantListLiteral(context, (XListLiteral) semanticObject); 
+					return; 
+				}
+				else if (rule == grammarAccess.getXPrimaryExpressionRule()
+						|| action == grammarAccess.getXAnnotationElementValueOrCommaListAccess().getXListLiteralElementsAction_1_1_0()
+						|| rule == grammarAccess.getXAnnotationOrExpressionRule()
+						|| rule == grammarAccess.getXExpressionRule()
+						|| rule == grammarAccess.getXAssignmentRule()
+						|| action == grammarAccess.getXAssignmentAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0()
+						|| rule == grammarAccess.getXOrExpressionRule()
+						|| action == grammarAccess.getXOrExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXAndExpressionRule()
+						|| action == grammarAccess.getXAndExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXEqualityExpressionRule()
+						|| action == grammarAccess.getXEqualityExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXRelationalExpressionRule()
+						|| action == grammarAccess.getXRelationalExpressionAccess().getXInstanceOfExpressionExpressionAction_1_0_0_0_0()
+						|| action == grammarAccess.getXRelationalExpressionAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0()
+						|| rule == grammarAccess.getXOtherOperatorExpressionRule()
+						|| action == grammarAccess.getXOtherOperatorExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXAdditiveExpressionRule()
+						|| action == grammarAccess.getXAdditiveExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXMultiplicativeExpressionRule()
+						|| action == grammarAccess.getXMultiplicativeExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXUnaryOperationRule()
+						|| rule == grammarAccess.getXCastedExpressionRule()
+						|| action == grammarAccess.getXCastedExpressionAccess().getXCastedExpressionTargetAction_1_0_0_0()
+						|| rule == grammarAccess.getXPostfixOperationRule()
+						|| action == grammarAccess.getXPostfixOperationAccess().getXPostfixOperationOperandAction_1_0_0()
+						|| rule == grammarAccess.getXMemberFeatureCallRule()
+						|| action == grammarAccess.getXMemberFeatureCallAccess().getXAssignmentAssignableAction_1_0_0_0_0()
+						|| action == grammarAccess.getXMemberFeatureCallAccess().getXMemberFeatureCallMemberCallTargetAction_1_1_0_0_0()
+						|| rule == grammarAccess.getXLiteralRule()
+						|| rule == grammarAccess.getXCollectionLiteralRule()
+						|| rule == grammarAccess.getXListLiteralRule()
+						|| rule == grammarAccess.getXParenthesizedExpressionRule()
+						|| rule == grammarAccess.getXExpressionOrVarDeclarationRule()) {
+					sequence_XListLiteral(context, (XListLiteral) semanticObject); 
+					return; 
+				}
+				else break;
+			case XbasePackage.XMEMBER_FEATURE_CALL:
+				sequence_XMemberFeatureCall(context, (XMemberFeatureCall) semanticObject); 
+				return; 
+			case XbasePackage.XNULL_LITERAL:
+				sequence_XNullLiteral(context, (XNullLiteral) semanticObject); 
+				return; 
+			case XbasePackage.XNUMBER_LITERAL:
+				sequence_XNumberLiteral(context, (XNumberLiteral) semanticObject); 
+				return; 
+			case XbasePackage.XPOSTFIX_OPERATION:
+				sequence_XPostfixOperation(context, (XPostfixOperation) semanticObject); 
+				return; 
+			case XbasePackage.XRETURN_EXPRESSION:
+				sequence_XReturnExpression(context, (XReturnExpression) semanticObject); 
+				return; 
+			case XbasePackage.XSET_LITERAL:
+				sequence_XSetLiteral(context, (XSetLiteral) semanticObject); 
+				return; 
+			case XbasePackage.XSTRING_LITERAL:
+				sequence_XStringLiteral(context, (XStringLiteral) semanticObject); 
+				return; 
+			case XbasePackage.XSWITCH_EXPRESSION:
+				sequence_XSwitchExpression(context, (XSwitchExpression) semanticObject); 
+				return; 
+			case XbasePackage.XSYNCHRONIZED_EXPRESSION:
+				sequence_XSynchronizedExpression(context, (XSynchronizedExpression) semanticObject); 
+				return; 
+			case XbasePackage.XTHROW_EXPRESSION:
+				sequence_XThrowExpression(context, (XThrowExpression) semanticObject); 
+				return; 
+			case XbasePackage.XTRY_CATCH_FINALLY_EXPRESSION:
+				sequence_XTryCatchFinallyExpression(context, (XTryCatchFinallyExpression) semanticObject); 
+				return; 
+			case XbasePackage.XTYPE_LITERAL:
+				sequence_XTypeLiteral(context, (XTypeLiteral) semanticObject); 
+				return; 
+			case XbasePackage.XUNARY_OPERATION:
+				if (rule == grammarAccess.getXConstantUnaryOperationRule()
+						|| rule == grammarAccess.getXFormalParameterDefaultValueLiteralRule()) {
+					sequence_XConstantUnaryOperation(context, (XUnaryOperation) semanticObject); 
+					return; 
+				}
+				else if (rule == grammarAccess.getXPrimaryExpressionRule()
+						|| rule == grammarAccess.getXAnnotationElementValueOrCommaListRule()
+						|| action == grammarAccess.getXAnnotationElementValueOrCommaListAccess().getXListLiteralElementsAction_1_1_0()
+						|| rule == grammarAccess.getXAnnotationElementValueRule()
+						|| rule == grammarAccess.getXAnnotationOrExpressionRule()
+						|| rule == grammarAccess.getXExpressionRule()
+						|| rule == grammarAccess.getXAssignmentRule()
+						|| action == grammarAccess.getXAssignmentAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0()
+						|| rule == grammarAccess.getXOrExpressionRule()
+						|| action == grammarAccess.getXOrExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXAndExpressionRule()
+						|| action == grammarAccess.getXAndExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXEqualityExpressionRule()
+						|| action == grammarAccess.getXEqualityExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXRelationalExpressionRule()
+						|| action == grammarAccess.getXRelationalExpressionAccess().getXInstanceOfExpressionExpressionAction_1_0_0_0_0()
+						|| action == grammarAccess.getXRelationalExpressionAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0()
+						|| rule == grammarAccess.getXOtherOperatorExpressionRule()
+						|| action == grammarAccess.getXOtherOperatorExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXAdditiveExpressionRule()
+						|| action == grammarAccess.getXAdditiveExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXMultiplicativeExpressionRule()
+						|| action == grammarAccess.getXMultiplicativeExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXUnaryOperationRule()
+						|| rule == grammarAccess.getXCastedExpressionRule()
+						|| action == grammarAccess.getXCastedExpressionAccess().getXCastedExpressionTargetAction_1_0_0_0()
+						|| rule == grammarAccess.getXPostfixOperationRule()
+						|| action == grammarAccess.getXPostfixOperationAccess().getXPostfixOperationOperandAction_1_0_0()
+						|| rule == grammarAccess.getXMemberFeatureCallRule()
+						|| action == grammarAccess.getXMemberFeatureCallAccess().getXAssignmentAssignableAction_1_0_0_0_0()
+						|| action == grammarAccess.getXMemberFeatureCallAccess().getXMemberFeatureCallMemberCallTargetAction_1_1_0_0_0()
+						|| rule == grammarAccess.getXParenthesizedExpressionRule()
+						|| rule == grammarAccess.getXExpressionOrVarDeclarationRule()) {
+					sequence_XUnaryOperation(context, (XUnaryOperation) semanticObject); 
+					return; 
+				}
+				else break;
+			case XbasePackage.XVARIABLE_DECLARATION:
+				sequence_XVariableDeclaration(context, (XVariableDeclaration) semanticObject); 
+				return; 
+			case XbasePackage.XWHILE_EXPRESSION:
+				sequence_XWhileExpression(context, (XWhileExpression) semanticObject); 
+				return; 
+			}
+		else if (epackage == XtypePackage.eINSTANCE)
+			switch (semanticObject.eClass().getClassifierID()) {
+			case XtypePackage.XFUNCTION_TYPE_REF:
+				sequence_XFunctionTypeRef(context, (XFunctionTypeRef) semanticObject); 
+				return; 
+			case XtypePackage.XIMPORT_DECLARATION:
+				sequence_XImportDeclaration(context, (XImportDeclaration) semanticObject); 
+				return; 
+			case XtypePackage.XIMPORT_SECTION:
+				sequence_XImportSection(context, (XImportSection) semanticObject); 
+				return; 
+			}
+		if (errorAcceptor != null)
+			errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
+	}
+	
+	/**
+	 * Contexts:
+	 *     Documented returns Category
+	 *     ImplicitlyNamed returns Category
+	 *     Category returns Category
+	 *
+	 * Constraint:
+	 *     (id=ValidID? label=STRING checks+=Check*)
+	 */
+	protected void sequence_Category(ISerializationContext context, Category semanticObject) {
+		genericSequencer.createSequence(context, semanticObject);
+	}
+	
+	
+	/**
+	 * Contexts:
+	 *     CheckCatalog returns CheckCatalog
+	 *     Documented returns CheckCatalog
+	 *
+	 * Constraint:
+	 *     (
+	 *         packageName=QualifiedName 
+	 *         imports=XImportSection 
+	 *         final?='final'? 
+	 *         name=ValidID 
+	 *         grammar=[Grammar|QualifiedName]? 
+	 *         (categories+=Category | implementations+=Implementation | checks+=Check | members+=Member)*
+	 *     )
+	 */
+	protected void sequence_CheckCatalog(ISerializationContext context, CheckCatalog semanticObject) {
+		genericSequencer.createSequence(context, semanticObject);
+	}
+	
+	
+	/**
+	 * Contexts:
+	 *     Documented returns Check
+	 *     ImplicitlyNamed returns Check
+	 *     Check returns Check
+	 *
+	 * Constraint:
+	 *     (
+	 *         severityRange=SeverityRange? 
+	 *         final?='final'? 
+	 *         kind=TriggerKind? 
+	 *         defaultSeverity=SeverityKind 
+	 *         id=ValidID? 
+	 *         label=STRING 
+	 *         (formalParameters+=FormalParameter formalParameters+=FormalParameter*)? 
+	 *         givenMessage=STRING? 
+	 *         (contexts+=Context+ | contexts+=Context)?
+	 *     )
+	 */
+	protected void sequence_Check(ISerializationContext context, Check semanticObject) {
+		genericSequencer.createSequence(context, semanticObject);
+	}
+	
+	
+	/**
+	 * Contexts:
+	 *     ContextVariable returns ContextVariable
+	 *
+	 * Constraint:
+	 *     (type=JvmTypeReference name=ValidID?)
+	 */
+	protected void sequence_ContextVariable(ISerializationContext context, ContextVariable semanticObject) {
+		genericSequencer.createSequence(context, semanticObject);
+	}
+	
+	
+	/**
+	 * Contexts:
+	 *     Documented returns Context
+	 *     Context returns Context
+	 *
+	 * Constraint:
+	 *     (contextVariable=ContextVariable constraint=XBlockExpression)
+	 */
+	protected void sequence_Context(ISerializationContext context, Context semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, CheckPackage.Literals.CONTEXT__CONTEXT_VARIABLE) == ValueTransient.YES)
+				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CheckPackage.Literals.CONTEXT__CONTEXT_VARIABLE));
+			if (transientValues.isValueTransient(semanticObject, CheckPackage.Literals.CONTEXT__CONSTRAINT) == ValueTransient.YES)
+				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CheckPackage.Literals.CONTEXT__CONSTRAINT));
+		}
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
+		feeder.accept(grammarAccess.getContextAccess().getContextVariableContextVariableParserRuleCall_1_0(), semanticObject.getContextVariable());
+		feeder.accept(grammarAccess.getContextAccess().getConstraintXBlockExpressionParserRuleCall_2_0(), semanticObject.getConstraint());
+		feeder.finish();
+	}
+	
+	
+	/**
+	 * Contexts:
+	 *     FormalParameter returns FormalParameter
+	 *
+	 * Constraint:
+	 *     (type=JvmParameterizedTypeReference name=ValidID right=XFormalParameterDefaultValueLiteral label=STRING?)
+	 */
+	protected void sequence_FormalParameter(ISerializationContext context, FormalParameter semanticObject) {
+		genericSequencer.createSequence(context, semanticObject);
+	}
+	
+	
+	/**
+	 * Contexts:
+	 *     Documented returns Implementation
+	 *     Implementation returns Implementation
+	 *
+	 * Constraint:
+	 *     (name=ValidID context=Context)
+	 */
+	protected void sequence_Implementation(ISerializationContext context, Implementation semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, CheckPackage.Literals.IMPLEMENTATION__NAME) == ValueTransient.YES)
+				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CheckPackage.Literals.IMPLEMENTATION__NAME));
+			if (transientValues.isValueTransient(semanticObject, CheckPackage.Literals.IMPLEMENTATION__CONTEXT) == ValueTransient.YES)
+				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CheckPackage.Literals.IMPLEMENTATION__CONTEXT));
+		}
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
+		feeder.accept(grammarAccess.getImplementationAccess().getNameValidIDParserRuleCall_1_0(), semanticObject.getName());
+		feeder.accept(grammarAccess.getImplementationAccess().getContextContextParserRuleCall_2_0(), semanticObject.getContext());
+		feeder.finish();
+	}
+	
+	
+	/**
+	 * Contexts:
+	 *     Documented returns Member
+	 *     Member returns Member
+	 *
+	 * Constraint:
+	 *     (annotations+=XAnnotation* type=JvmTypeReference name=ValidID value=XOrExpression?)
+	 */
+	protected void sequence_Member(ISerializationContext context, Member semanticObject) {
+		genericSequencer.createSequence(context, semanticObject);
+	}
+	
+	
+	/**
+	 * Contexts:
+	 *     SeverityRange returns SeverityRange
+	 *
+	 * Constraint:
+	 *     (minSeverity=SeverityKind maxSeverity=SeverityKind)
+	 */
+	protected void sequence_SeverityRange(ISerializationContext context, SeverityRange semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, CheckPackage.Literals.SEVERITY_RANGE__MIN_SEVERITY) == ValueTransient.YES)
+				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CheckPackage.Literals.SEVERITY_RANGE__MIN_SEVERITY));
+			if (transientValues.isValueTransient(semanticObject, CheckPackage.Literals.SEVERITY_RANGE__MAX_SEVERITY) == ValueTransient.YES)
+				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CheckPackage.Literals.SEVERITY_RANGE__MAX_SEVERITY));
+		}
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
+		feeder.accept(grammarAccess.getSeverityRangeAccess().getMinSeveritySeverityKindEnumRuleCall_3_0(), semanticObject.getMinSeverity());
+		feeder.accept(grammarAccess.getSeverityRangeAccess().getMaxSeveritySeverityKindEnumRuleCall_5_0(), semanticObject.getMaxSeverity());
+		feeder.finish();
+	}
+	
+	
+	/**
+	 * Contexts:
+	 *     XFormalParameterDefaultValueLiteral returns XListLiteral
+	 *     XConstantListLiteral returns XListLiteral
+	 *
+	 * Constraint:
+	 *     (elements+=XConstantUnaryOperation elements+=XConstantUnaryOperation*)?
+	 */
+	protected void sequence_XConstantListLiteral(ISerializationContext context, XListLiteral semanticObject) {
+		genericSequencer.createSequence(context, semanticObject);
+	}
+	
+	
+	/**
+	 * Contexts:
+	 *     XConstantUnaryOperation returns XUnaryOperation
+	 *     XFormalParameterDefaultValueLiteral returns XUnaryOperation
+	 *
+	 * Constraint:
+	 *     (feature=[JvmIdentifiableElement|OpUnary] operand=XConstantUnaryOperation)
+	 */
+	protected void sequence_XConstantUnaryOperation(ISerializationContext context, XUnaryOperation semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, XbasePackage.Literals.XABSTRACT_FEATURE_CALL__FEATURE) == ValueTransient.YES)
+				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, XbasePackage.Literals.XABSTRACT_FEATURE_CALL__FEATURE));
+			if (transientValues.isValueTransient(semanticObject, XbasePackage.Literals.XUNARY_OPERATION__OPERAND) == ValueTransient.YES)
+				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, XbasePackage.Literals.XUNARY_OPERATION__OPERAND));
+		}
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
+		feeder.accept(grammarAccess.getXConstantUnaryOperationAccess().getFeatureJvmIdentifiableElementOpUnaryParserRuleCall_0_1_0_1(), semanticObject.eGet(XbasePackage.Literals.XABSTRACT_FEATURE_CALL__FEATURE, false));
+		feeder.accept(grammarAccess.getXConstantUnaryOperationAccess().getOperandXConstantUnaryOperationParserRuleCall_0_2_0(), semanticObject.getOperand());
+		feeder.finish();
+	}
+	
+	
+	/**
+	 * Contexts:
+	 *     XGuardExpression returns XGuardExpression
+	 *     XPrimaryExpression returns XGuardExpression
+	 *     XAnnotationElementValueOrCommaList returns XGuardExpression
+	 *     XAnnotationElementValueOrCommaList.XListLiteral_1_1_0 returns XGuardExpression
+	 *     XAnnotationElementValue returns XGuardExpression
+	 *     XAnnotationOrExpression returns XGuardExpression
+	 *     XExpression returns XGuardExpression
+	 *     XAssignment returns XGuardExpression
+	 *     XAssignment.XBinaryOperation_1_1_0_0_0 returns XGuardExpression
+	 *     XOrExpression returns XGuardExpression
+	 *     XOrExpression.XBinaryOperation_1_0_0_0 returns XGuardExpression
+	 *     XAndExpression returns XGuardExpression
+	 *     XAndExpression.XBinaryOperation_1_0_0_0 returns XGuardExpression
+	 *     XEqualityExpression returns XGuardExpression
+	 *     XEqualityExpression.XBinaryOperation_1_0_0_0 returns XGuardExpression
+	 *     XRelationalExpression returns XGuardExpression
+	 *     XRelationalExpression.XInstanceOfExpression_1_0_0_0_0 returns XGuardExpression
+	 *     XRelationalExpression.XBinaryOperation_1_1_0_0_0 returns XGuardExpression
+	 *     XOtherOperatorExpression returns XGuardExpression
+	 *     XOtherOperatorExpression.XBinaryOperation_1_0_0_0 returns XGuardExpression
+	 *     XAdditiveExpression returns XGuardExpression
+	 *     XAdditiveExpression.XBinaryOperation_1_0_0_0 returns XGuardExpression
+	 *     XMultiplicativeExpression returns XGuardExpression
+	 *     XMultiplicativeExpression.XBinaryOperation_1_0_0_0 returns XGuardExpression
+	 *     XUnaryOperation returns XGuardExpression
+	 *     XCastedExpression returns XGuardExpression
+	 *     XCastedExpression.XCastedExpression_1_0_0_0 returns XGuardExpression
+	 *     XPostfixOperation returns XGuardExpression
+	 *     XPostfixOperation.XPostfixOperation_1_0_0 returns XGuardExpression
+	 *     XMemberFeatureCall returns XGuardExpression
+	 *     XMemberFeatureCall.XAssignment_1_0_0_0_0 returns XGuardExpression
+	 *     XMemberFeatureCall.XMemberFeatureCall_1_1_0_0_0 returns XGuardExpression
+	 *     XParenthesizedExpression returns XGuardExpression
+	 *     XExpressionOrVarDeclaration returns XGuardExpression
+	 *
+	 * Constraint:
+	 *     guard=XExpression
+	 */
+	protected void sequence_XGuardExpression(ISerializationContext context, XGuardExpression semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, CheckPackage.Literals.XGUARD_EXPRESSION__GUARD) == ValueTransient.YES)
+				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CheckPackage.Literals.XGUARD_EXPRESSION__GUARD));
+		}
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
+		feeder.accept(grammarAccess.getXGuardExpressionAccess().getGuardXExpressionParserRuleCall_2_0(), semanticObject.getGuard());
+		feeder.finish();
+	}
+	
+	
+	/**
+	 * Contexts:
+	 *     XImportDeclaration returns XImportDeclaration
+	 *
+	 * Constraint:
+	 *     (importedType=[JvmDeclaredType|QualifiedName] | importedNamespace=QualifiedNameWithWildcard)
+	 */
+	protected void sequence_XImportDeclaration(ISerializationContext context, XImportDeclaration semanticObject) {
+		genericSequencer.createSequence(context, semanticObject);
+	}
+	
+	
+	/**
+	 * Contexts:
+	 *     XImportSection returns XImportSection
+	 *
+	 * Constraint:
+	 *     importDeclarations+=XImportDeclaration*
+	 */
+	protected void sequence_XImportSection(ISerializationContext context, XImportSection semanticObject) {
+		genericSequencer.createSequence(context, semanticObject);
+	}
+	
+	
+	/**
+	 * Contexts:
+	 *     XIssueExpression returns XIssueExpression
+	 *     XPrimaryExpression returns XIssueExpression
+	 *     XAnnotationElementValueOrCommaList returns XIssueExpression
+	 *     XAnnotationElementValueOrCommaList.XListLiteral_1_1_0 returns XIssueExpression
+	 *     XAnnotationElementValue returns XIssueExpression
+	 *     XAnnotationOrExpression returns XIssueExpression
+	 *     XExpression returns XIssueExpression
+	 *     XAssignment returns XIssueExpression
+	 *     XAssignment.XBinaryOperation_1_1_0_0_0 returns XIssueExpression
+	 *     XOrExpression returns XIssueExpression
+	 *     XOrExpression.XBinaryOperation_1_0_0_0 returns XIssueExpression
+	 *     XAndExpression returns XIssueExpression
+	 *     XAndExpression.XBinaryOperation_1_0_0_0 returns XIssueExpression
+	 *     XEqualityExpression returns XIssueExpression
+	 *     XEqualityExpression.XBinaryOperation_1_0_0_0 returns XIssueExpression
+	 *     XRelationalExpression returns XIssueExpression
+	 *     XRelationalExpression.XInstanceOfExpression_1_0_0_0_0 returns XIssueExpression
+	 *     XRelationalExpression.XBinaryOperation_1_1_0_0_0 returns XIssueExpression
+	 *     XOtherOperatorExpression returns XIssueExpression
+	 *     XOtherOperatorExpression.XBinaryOperation_1_0_0_0 returns XIssueExpression
+	 *     XAdditiveExpression returns XIssueExpression
+	 *     XAdditiveExpression.XBinaryOperation_1_0_0_0 returns XIssueExpression
+	 *     XMultiplicativeExpression returns XIssueExpression
+	 *     XMultiplicativeExpression.XBinaryOperation_1_0_0_0 returns XIssueExpression
+	 *     XUnaryOperation returns XIssueExpression
+	 *     XCastedExpression returns XIssueExpression
+	 *     XCastedExpression.XCastedExpression_1_0_0_0 returns XIssueExpression
+	 *     XPostfixOperation returns XIssueExpression
+	 *     XPostfixOperation.XPostfixOperation_1_0_0 returns XIssueExpression
+	 *     XMemberFeatureCall returns XIssueExpression
+	 *     XMemberFeatureCall.XAssignment_1_0_0_0_0 returns XIssueExpression
+	 *     XMemberFeatureCall.XMemberFeatureCall_1_1_0_0_0 returns XIssueExpression
+	 *     XParenthesizedExpression returns XIssueExpression
+	 *     XExpressionOrVarDeclaration returns XIssueExpression
+	 *
+	 * Constraint:
+	 *     (
+	 *         check=[Check|QualifiedName]? 
+	 *         (
+	 *             (markerFeature=[EStructuralFeature|ValidID] | (markerObject=XExpression markerFeature=[EStructuralFeature|FeatureCallID]?)) 
+	 *             markerIndex=XExpression?
+	 *         )? 
+	 *         message=XExpression? 
+	 *         (messageParameters+=XExpression messageParameters+=XExpression*)? 
+	 *         (issueCode=ValidID? issueData+=XExpression issueData+=XExpression*)?
+	 *     )
+	 */
+	protected void sequence_XIssueExpression(ISerializationContext context, XIssueExpression semanticObject) {
+		genericSequencer.createSequence(context, semanticObject);
+	}
+	
+	
 }
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/serializer/AbstractCheckSyntacticSequencer.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/serializer/AbstractCheckSyntacticSequencer.java
index 862949549..3ba331f2d 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/serializer/AbstractCheckSyntacticSequencer.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/serializer/AbstractCheckSyntacticSequencer.java
@@ -47,9 +47,9 @@ protected void init(IGrammarAccess access) {
 	
 	@Override
 	protected String getUnassignedRuleCallToken(EObject semanticObject, RuleCall ruleCall, INode node) {
-		if(ruleCall.getRule() == grammarAccess.getArrayBracketsRule())
+		if (ruleCall.getRule() == grammarAccess.getArrayBracketsRule())
 			return getArrayBracketsToken(semanticObject, ruleCall, node);
-		else if(ruleCall.getRule() == grammarAccess.getOpSingleAssignRule())
+		else if (ruleCall.getRule() == grammarAccess.getOpSingleAssignRule())
 			return getOpSingleAssignToken(semanticObject, ruleCall, node);
 		return "";
 	}
@@ -82,23 +82,23 @@ protected void emitUnassignedTokens(EObject semanticObject, ISynTransition trans
 		List<INode> transitionNodes = collectNodes(fromNode, toNode);
 		for (AbstractElementAlias syntax : transition.getAmbiguousSyntaxes()) {
 			List<INode> syntaxNodes = getNodesFor(transitionNodes, syntax);
-			if(match_Check___LeftCurlyBracketKeyword_8_0_0_RightCurlyBracketKeyword_8_0_2__q.equals(syntax))
+			if (match_Check___LeftCurlyBracketKeyword_8_0_0_RightCurlyBracketKeyword_8_0_2__q.equals(syntax))
 				emit_Check___LeftCurlyBracketKeyword_8_0_0_RightCurlyBracketKeyword_8_0_2__q(semanticObject, getLastNavigableState(), syntaxNodes);
-			else if(match_Check___LeftParenthesisKeyword_6_0_RightParenthesisKeyword_6_2__q.equals(syntax))
+			else if (match_Check___LeftParenthesisKeyword_6_0_RightParenthesisKeyword_6_2__q.equals(syntax))
 				emit_Check___LeftParenthesisKeyword_6_0_RightParenthesisKeyword_6_2__q(semanticObject, getLastNavigableState(), syntaxNodes);
-			else if(match_XAnnotation___LeftParenthesisKeyword_3_0_RightParenthesisKeyword_3_2__q.equals(syntax))
+			else if (match_XAnnotation___LeftParenthesisKeyword_3_0_RightParenthesisKeyword_3_2__q.equals(syntax))
 				emit_XAnnotation___LeftParenthesisKeyword_3_0_RightParenthesisKeyword_3_2__q(semanticObject, getLastNavigableState(), syntaxNodes);
-			else if(match_XBlockExpression_SemicolonKeyword_2_1_q.equals(syntax))
+			else if (match_XBlockExpression_SemicolonKeyword_2_1_q.equals(syntax))
 				emit_XBlockExpression_SemicolonKeyword_2_1_q(semanticObject, getLastNavigableState(), syntaxNodes);
-			else if(match_XExpressionInClosure_SemicolonKeyword_1_1_q.equals(syntax))
+			else if (match_XExpressionInClosure_SemicolonKeyword_1_1_q.equals(syntax))
 				emit_XExpressionInClosure_SemicolonKeyword_1_1_q(semanticObject, getLastNavigableState(), syntaxNodes);
-			else if(match_XFunctionTypeRef___LeftParenthesisKeyword_0_0_RightParenthesisKeyword_0_2__q.equals(syntax))
+			else if (match_XFunctionTypeRef___LeftParenthesisKeyword_0_0_RightParenthesisKeyword_0_2__q.equals(syntax))
 				emit_XFunctionTypeRef___LeftParenthesisKeyword_0_0_RightParenthesisKeyword_0_2__q(semanticObject, getLastNavigableState(), syntaxNodes);
-			else if(match_XImportDeclaration_SemicolonKeyword_2_q.equals(syntax))
+			else if (match_XImportDeclaration_SemicolonKeyword_2_q.equals(syntax))
 				emit_XImportDeclaration_SemicolonKeyword_2_q(semanticObject, getLastNavigableState(), syntaxNodes);
-			else if(match_XParenthesizedExpression_LeftParenthesisKeyword_0_a.equals(syntax))
+			else if (match_XParenthesizedExpression_LeftParenthesisKeyword_0_a.equals(syntax))
 				emit_XParenthesizedExpression_LeftParenthesisKeyword_0_a(semanticObject, getLastNavigableState(), syntaxNodes);
-			else if(match_XParenthesizedExpression_LeftParenthesisKeyword_0_p.equals(syntax))
+			else if (match_XParenthesizedExpression_LeftParenthesisKeyword_0_p.equals(syntax))
 				emit_XParenthesizedExpression_LeftParenthesisKeyword_0_p(semanticObject, getLastNavigableState(), syntaxNodes);
 			else acceptNodes(getLastNavigableState(), syntaxNodes);
 		}
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/services/CheckGrammarAccess.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/services/CheckGrammarAccess.java
index 2af4606d9..691c6998d 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/services/CheckGrammarAccess.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/services/CheckGrammarAccess.java
@@ -21,7 +21,7 @@ public class CheckGrammarAccess extends AbstractGrammarElementFinder {
 	
 	
 	public class CheckCatalogElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "CheckCatalog");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.check.Check.CheckCatalog");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Action cCheckCatalogAction_0 = (Action)cGroup.eContents().get(0);
 		private final Keyword cPackageKeyword_1 = (Keyword)cGroup.eContents().get(1);
@@ -53,20 +53,23 @@ public class CheckCatalogElements extends AbstractParserRuleElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_10 = (Keyword)cGroup.eContents().get(10);
 		
 		//CheckCatalog:
-		//	{CheckCatalog} "package" packageName=QualifiedName imports=XImportSection final?="final"? "catalog" name=ValidID
-		//	("for" "grammar" ^grammar=[xtext::Grammar|QualifiedName])? "{" (categories+=Category |
-		//	implementations+=Implementation | checks+=Check | members+=Member)* "}";
+		//	{CheckCatalog}
+		//	'package' packageName=QualifiedName
+		//	imports=XImportSection
+		//	final?='final'? 'catalog' name=ValidID ('for' 'grammar' ^grammar=[xtext::Grammar|QualifiedName])?
+		//	'{' (categories+=Category | implementations+=Implementation | checks+=Check | members+=Member)*
+		//	'}';
 		@Override public ParserRule getRule() { return rule; }
 
-		//{CheckCatalog} "package" packageName=QualifiedName imports=XImportSection final?="final"? "catalog" name=ValidID ("for"
-		//"grammar" ^grammar=[xtext::Grammar|QualifiedName])? "{" (categories+=Category | implementations+=Implementation |
-		//checks+=Check | members+=Member)* "}"
+		//{CheckCatalog} 'package' packageName=QualifiedName imports=XImportSection final?='final'? 'catalog' name=ValidID ('for'
+		//'grammar' ^grammar=[xtext::Grammar|QualifiedName])? '{' (categories+=Category | implementations+=Implementation |
+		//checks+=Check | members+=Member)* '}'
 		public Group getGroup() { return cGroup; }
 
 		//{CheckCatalog}
 		public Action getCheckCatalogAction_0() { return cCheckCatalogAction_0; }
 
-		//"package"
+		//'package'
 		public Keyword getPackageKeyword_1() { return cPackageKeyword_1; }
 
 		//packageName=QualifiedName
@@ -81,13 +84,13 @@ public class CheckCatalogElements extends AbstractParserRuleElementFinder {
 		//XImportSection
 		public RuleCall getImportsXImportSectionParserRuleCall_3_0() { return cImportsXImportSectionParserRuleCall_3_0; }
 
-		//final?="final"?
+		//final?='final'?
 		public Assignment getFinalAssignment_4() { return cFinalAssignment_4; }
 
-		//"final"
+		//'final'
 		public Keyword getFinalFinalKeyword_4_0() { return cFinalFinalKeyword_4_0; }
 
-		//"catalog"
+		//'catalog'
 		public Keyword getCatalogKeyword_5() { return cCatalogKeyword_5; }
 
 		//name=ValidID
@@ -96,13 +99,13 @@ public class CheckCatalogElements extends AbstractParserRuleElementFinder {
 		//ValidID
 		public RuleCall getNameValidIDParserRuleCall_6_0() { return cNameValidIDParserRuleCall_6_0; }
 
-		//("for" "grammar" ^grammar=[xtext::Grammar|QualifiedName])?
+		//('for' 'grammar' ^grammar=[xtext::Grammar|QualifiedName])?
 		public Group getGroup_7() { return cGroup_7; }
 
-		//"for"
+		//'for'
 		public Keyword getForKeyword_7_0() { return cForKeyword_7_0; }
 
-		//"grammar"
+		//'grammar'
 		public Keyword getGrammarKeyword_7_1() { return cGrammarKeyword_7_1; }
 
 		//^grammar=[xtext::Grammar|QualifiedName]
@@ -114,7 +117,7 @@ public class CheckCatalogElements extends AbstractParserRuleElementFinder {
 		//QualifiedName
 		public RuleCall getGrammarGrammarQualifiedNameParserRuleCall_7_2_0_1() { return cGrammarGrammarQualifiedNameParserRuleCall_7_2_0_1; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_8() { return cLeftCurlyBracketKeyword_8; }
 
 		//(categories+=Category | implementations+=Implementation | checks+=Check | members+=Member)*
@@ -144,19 +147,19 @@ public class CheckCatalogElements extends AbstractParserRuleElementFinder {
 		//Member
 		public RuleCall getMembersMemberParserRuleCall_9_3_0() { return cMembersMemberParserRuleCall_9_3_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_10() { return cRightCurlyBracketKeyword_10; }
 	}
 
 	public class XImportSectionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "XImportSection");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.check.Check.XImportSection");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Action cXImportSectionAction_0 = (Action)cGroup.eContents().get(0);
 		private final Assignment cImportDeclarationsAssignment_1 = (Assignment)cGroup.eContents().get(1);
 		private final RuleCall cImportDeclarationsXImportDeclarationParserRuleCall_1_0 = (RuleCall)cImportDeclarationsAssignment_1.eContents().get(0);
 		
 		//// Override (inherited via xbase->xtype) to force creation of a (possibly empty) XImportSection
-		//XImportSection returns xtype::XImportSection:
+		//XImportSection xtype::XImportSection:
 		//	{xtype::XImportSection} importDeclarations+=XImportDeclaration*;
 		@Override public ParserRule getRule() { return rule; }
 
@@ -174,7 +177,7 @@ public class XImportSectionElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class XImportDeclarationElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "XImportDeclaration");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.check.Check.XImportDeclaration");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cImportKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Alternatives cAlternatives_1 = (Alternatives)cGroup.eContents().get(1);
@@ -186,14 +189,14 @@ public class XImportDeclarationElements extends AbstractParserRuleElementFinder
 		private final Keyword cSemicolonKeyword_2 = (Keyword)cGroup.eContents().get(2);
 		
 		//// Override (inherited via xbase->xtype) to restrict to our syntax. No static imports. (Backwards compatibility; would introduce a new keyword)
-		//XImportDeclaration returns xtype::XImportDeclaration:
-		//	"import" (importedType=[types::JvmDeclaredType|QualifiedName] | importedNamespace=QualifiedNameWithWildcard) ";"?;
+		//XImportDeclaration xtype::XImportDeclaration:
+		//	'import' (importedType=[types::JvmDeclaredType|QualifiedName] | importedNamespace=QualifiedNameWithWildcard) ';'?;
 		@Override public ParserRule getRule() { return rule; }
 
-		//"import" (importedType=[types::JvmDeclaredType|QualifiedName] | importedNamespace=QualifiedNameWithWildcard) ";"?
+		//'import' (importedType=[types::JvmDeclaredType|QualifiedName] | importedNamespace=QualifiedNameWithWildcard) ';'?
 		public Group getGroup() { return cGroup; }
 
-		//"import"
+		//'import'
 		public Keyword getImportKeyword_0() { return cImportKeyword_0; }
 
 		//importedType=[types::JvmDeclaredType|QualifiedName] | importedNamespace=QualifiedNameWithWildcard
@@ -214,12 +217,12 @@ public class XImportDeclarationElements extends AbstractParserRuleElementFinder
 		//QualifiedNameWithWildcard
 		public RuleCall getImportedNamespaceQualifiedNameWithWildcardParserRuleCall_1_1_0() { return cImportedNamespaceQualifiedNameWithWildcardParserRuleCall_1_1_0; }
 
-		//";"?
+		//';'?
 		public Keyword getSemicolonKeyword_2() { return cSemicolonKeyword_2; }
 	}
 
 	public class DocumentedElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Documented");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.check.Check.Documented");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cCheckCatalogParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cCheckParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
@@ -255,7 +258,7 @@ public class DocumentedElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class ImplicitlyNamedElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ImplicitlyNamed");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.check.Check.ImplicitlyNamed");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cCheckParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cCategoryParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
@@ -275,7 +278,7 @@ public class ImplicitlyNamedElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class CategoryElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Category");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.check.Check.Category");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cCategoryKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -288,13 +291,15 @@ public class CategoryElements extends AbstractParserRuleElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_5 = (Keyword)cGroup.eContents().get(5);
 		
 		//Category:
-		//	"category" id=ValidID? label=STRING "{" checks+=Check* "}";
+		//	'category' id=ValidID? label=STRING '{'
+		//	checks+=Check*
+		//	'}';
 		@Override public ParserRule getRule() { return rule; }
 
-		//"category" id=ValidID? label=STRING "{" checks+=Check* "}"
+		//'category' id=ValidID? label=STRING '{' checks+=Check* '}'
 		public Group getGroup() { return cGroup; }
 
-		//"category"
+		//'category'
 		public Keyword getCategoryKeyword_0() { return cCategoryKeyword_0; }
 
 		//id=ValidID?
@@ -309,7 +314,7 @@ public class CategoryElements extends AbstractParserRuleElementFinder {
 		//STRING
 		public RuleCall getLabelSTRINGTerminalRuleCall_2_0() { return cLabelSTRINGTerminalRuleCall_2_0; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_3() { return cLeftCurlyBracketKeyword_3; }
 
 		//checks+=Check*
@@ -318,12 +323,12 @@ public class CategoryElements extends AbstractParserRuleElementFinder {
 		//Check
 		public RuleCall getChecksCheckParserRuleCall_4_0() { return cChecksCheckParserRuleCall_4_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_5() { return cRightCurlyBracketKeyword_5; }
 	}
 
 	public class CheckElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Check");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.check.Check.Check");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cSeverityRangeAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final RuleCall cSeverityRangeSeverityRangeParserRuleCall_0_0 = (RuleCall)cSeverityRangeAssignment_0.eContents().get(0);
@@ -361,14 +366,17 @@ public class CheckElements extends AbstractParserRuleElementFinder {
 		private final RuleCall cContextsContextParserRuleCall_8_1_0 = (RuleCall)cContextsAssignment_8_1.eContents().get(0);
 		
 		//Check:
-		//	severityRange=SeverityRange? final?="final"? kind=TriggerKind? defaultSeverity=SeverityKind id=ValidID? label=STRING
-		//	("(" (formalParameters+=FormalParameter ("," formalParameters+=FormalParameter)*)? ")")? ("message"
-		//	givenMessage=STRING)? ("{" contexts+=Context* "}" | contexts+=Context?);
+		//	severityRange=SeverityRange?
+		//	final?='final'?
+		//	kind=TriggerKind?
+		//	defaultSeverity=SeverityKind
+		//	id=ValidID? label=STRING (=> '(' (formalParameters+=FormalParameter (',' formalParameters+=FormalParameter)*)? ')')?
+		//	('message' givenMessage=STRING)? (=> '{' contexts+=Context* '}' | contexts+=Context?);
 		@Override public ParserRule getRule() { return rule; }
 
-		//severityRange=SeverityRange? final?="final"? kind=TriggerKind? defaultSeverity=SeverityKind id=ValidID? label=STRING
-		//("(" (formalParameters+=FormalParameter ("," formalParameters+=FormalParameter)*)? ")")? ("message"
-		//givenMessage=STRING)? ("{" contexts+=Context* "}" | contexts+=Context?)
+		//severityRange=SeverityRange? final?='final'? kind=TriggerKind? defaultSeverity=SeverityKind id=ValidID? label=STRING (=>
+		//'(' (formalParameters+=FormalParameter (',' formalParameters+=FormalParameter)*)? ')')? ('message'
+		//givenMessage=STRING)? (=> '{' contexts+=Context* '}' | contexts+=Context?)
 		public Group getGroup() { return cGroup; }
 
 		//severityRange=SeverityRange?
@@ -377,10 +385,10 @@ public class CheckElements extends AbstractParserRuleElementFinder {
 		//SeverityRange
 		public RuleCall getSeverityRangeSeverityRangeParserRuleCall_0_0() { return cSeverityRangeSeverityRangeParserRuleCall_0_0; }
 
-		//final?="final"?
+		//final?='final'?
 		public Assignment getFinalAssignment_1() { return cFinalAssignment_1; }
 
-		//"final"
+		//'final'
 		public Keyword getFinalFinalKeyword_1_0() { return cFinalFinalKeyword_1_0; }
 
 		//kind=TriggerKind?
@@ -407,13 +415,13 @@ public class CheckElements extends AbstractParserRuleElementFinder {
 		//STRING
 		public RuleCall getLabelSTRINGTerminalRuleCall_5_0() { return cLabelSTRINGTerminalRuleCall_5_0; }
 
-		//(=> "(" (formalParameters+=FormalParameter ("," formalParameters+=FormalParameter)*)? ")")?
+		//(=> '(' (formalParameters+=FormalParameter (',' formalParameters+=FormalParameter)*)? ')')?
 		public Group getGroup_6() { return cGroup_6; }
 
-		//=> "("
+		//=> '('
 		public Keyword getLeftParenthesisKeyword_6_0() { return cLeftParenthesisKeyword_6_0; }
 
-		//(formalParameters+=FormalParameter ("," formalParameters+=FormalParameter)*)?
+		//(formalParameters+=FormalParameter (',' formalParameters+=FormalParameter)*)?
 		public Group getGroup_6_1() { return cGroup_6_1; }
 
 		//formalParameters+=FormalParameter
@@ -422,10 +430,10 @@ public class CheckElements extends AbstractParserRuleElementFinder {
 		//FormalParameter
 		public RuleCall getFormalParametersFormalParameterParserRuleCall_6_1_0_0() { return cFormalParametersFormalParameterParserRuleCall_6_1_0_0; }
 
-		//("," formalParameters+=FormalParameter)*
+		//(',' formalParameters+=FormalParameter)*
 		public Group getGroup_6_1_1() { return cGroup_6_1_1; }
 
-		//","
+		//','
 		public Keyword getCommaKeyword_6_1_1_0() { return cCommaKeyword_6_1_1_0; }
 
 		//formalParameters+=FormalParameter
@@ -434,13 +442,13 @@ public class CheckElements extends AbstractParserRuleElementFinder {
 		//FormalParameter
 		public RuleCall getFormalParametersFormalParameterParserRuleCall_6_1_1_1_0() { return cFormalParametersFormalParameterParserRuleCall_6_1_1_1_0; }
 
-		//")"
+		//')'
 		public Keyword getRightParenthesisKeyword_6_2() { return cRightParenthesisKeyword_6_2; }
 
-		//("message" givenMessage=STRING)?
+		//('message' givenMessage=STRING)?
 		public Group getGroup_7() { return cGroup_7; }
 
-		//"message"
+		//'message'
 		public Keyword getMessageKeyword_7_0() { return cMessageKeyword_7_0; }
 
 		//givenMessage=STRING
@@ -449,13 +457,13 @@ public class CheckElements extends AbstractParserRuleElementFinder {
 		//STRING
 		public RuleCall getGivenMessageSTRINGTerminalRuleCall_7_1_0() { return cGivenMessageSTRINGTerminalRuleCall_7_1_0; }
 
-		//=> "{" contexts+=Context* "}" | contexts+=Context?
+		//=> '{' contexts+=Context* '}' | contexts+=Context?
 		public Alternatives getAlternatives_8() { return cAlternatives_8; }
 
-		//=> "{" contexts+=Context* "}"
+		//=> '{' contexts+=Context* '}'
 		public Group getGroup_8_0() { return cGroup_8_0; }
 
-		//=> "{"
+		//=> '{'
 		public Keyword getLeftCurlyBracketKeyword_8_0_0() { return cLeftCurlyBracketKeyword_8_0_0; }
 
 		//contexts+=Context*
@@ -464,7 +472,7 @@ public class CheckElements extends AbstractParserRuleElementFinder {
 		//Context
 		public RuleCall getContextsContextParserRuleCall_8_0_1_0() { return cContextsContextParserRuleCall_8_0_1_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_8_0_2() { return cRightCurlyBracketKeyword_8_0_2; }
 
 		//contexts+=Context?
@@ -475,7 +483,7 @@ public class CheckElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class SeverityRangeElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "SeverityRange");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.check.Check.SeverityRange");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cCommercialAtKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Keyword cSeverityRangeKeyword_1 = (Keyword)cGroup.eContents().get(1);
@@ -489,21 +497,20 @@ public class SeverityRangeElements extends AbstractParserRuleElementFinder {
 		
 		////TODO check duplicate names, qualified names don't include category
 		//SeverityRange:
-		//	"@" "SeverityRange" "(" minSeverity=SeverityKind ".." maxSeverity=SeverityKind //TODO  verification not allowed for final
-		//	")";
+		//	'@' 'SeverityRange' '(' minSeverity=SeverityKind '..' maxSeverity=SeverityKind ')' //TODO  verification not allowed for final
+		//;
 		@Override public ParserRule getRule() { return rule; }
 
-		//"@" "SeverityRange" "(" minSeverity=SeverityKind ".." maxSeverity=SeverityKind //TODO  verification not allowed for final
-		//")"
+		//'@' 'SeverityRange' '(' minSeverity=SeverityKind '..' maxSeverity=SeverityKind ')'
 		public Group getGroup() { return cGroup; }
 
-		//"@"
+		//'@'
 		public Keyword getCommercialAtKeyword_0() { return cCommercialAtKeyword_0; }
 
-		//"SeverityRange"
+		//'SeverityRange'
 		public Keyword getSeverityRangeKeyword_1() { return cSeverityRangeKeyword_1; }
 
-		//"("
+		//'('
 		public Keyword getLeftParenthesisKeyword_2() { return cLeftParenthesisKeyword_2; }
 
 		//minSeverity=SeverityKind
@@ -512,7 +519,7 @@ public class SeverityRangeElements extends AbstractParserRuleElementFinder {
 		//SeverityKind
 		public RuleCall getMinSeveritySeverityKindEnumRuleCall_3_0() { return cMinSeveritySeverityKindEnumRuleCall_3_0; }
 
-		//".."
+		//'..'
 		public Keyword getFullStopFullStopKeyword_4() { return cFullStopFullStopKeyword_4; }
 
 		//maxSeverity=SeverityKind
@@ -521,13 +528,12 @@ public class SeverityRangeElements extends AbstractParserRuleElementFinder {
 		//SeverityKind
 		public RuleCall getMaxSeveritySeverityKindEnumRuleCall_5_0() { return cMaxSeveritySeverityKindEnumRuleCall_5_0; }
 
-		////TODO  verification not allowed for final
-		//")"
+		//')'
 		public Keyword getRightParenthesisKeyword_6() { return cRightParenthesisKeyword_6; }
 	}
 
 	public class MemberElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Member");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.check.Check.Member");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cAnnotationsAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final RuleCall cAnnotationsXAnnotationParserRuleCall_0_0 = (RuleCall)cAnnotationsAssignment_0.eContents().get(0);
@@ -542,12 +548,12 @@ public class MemberElements extends AbstractParserRuleElementFinder {
 		private final Keyword cSemicolonKeyword_4 = (Keyword)cGroup.eContents().get(4);
 		
 		//Member:
-		//	annotations+=XAnnotation* type=JvmTypeReference name=ValidID (OpSingleAssign value=XOrExpression)? // TODO: check if semicolon necessary?
-		//	";";
+		//	annotations+=XAnnotation*
+		//	type=JvmTypeReference name=ValidID (OpSingleAssign value=XOrExpression)? ';' // TODO: check if semicolon necessary?
+		//;
 		@Override public ParserRule getRule() { return rule; }
 
-		//annotations+=XAnnotation* type=JvmTypeReference name=ValidID (OpSingleAssign value=XOrExpression)? // TODO: check if semicolon necessary?
-		//";"
+		//annotations+=XAnnotation* type=JvmTypeReference name=ValidID (OpSingleAssign value=XOrExpression)? ';'
 		public Group getGroup() { return cGroup; }
 
 		//annotations+=XAnnotation*
@@ -580,13 +586,12 @@ public class MemberElements extends AbstractParserRuleElementFinder {
 		//XOrExpression
 		public RuleCall getValueXOrExpressionParserRuleCall_3_1_0() { return cValueXOrExpressionParserRuleCall_3_1_0; }
 
-		//// TODO: check if semicolon necessary?
-		//";"
+		//';'
 		public Keyword getSemicolonKeyword_4() { return cSemicolonKeyword_4; }
 	}
 
 	public class ImplementationElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Implementation");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.check.Check.Implementation");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cDefKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -595,13 +600,13 @@ public class ImplementationElements extends AbstractParserRuleElementFinder {
 		private final RuleCall cContextContextParserRuleCall_2_0 = (RuleCall)cContextAssignment_2.eContents().get(0);
 		
 		//Implementation:
-		//	"def" name=ValidID context=Context;
+		//	'def' name=ValidID context=Context;
 		@Override public ParserRule getRule() { return rule; }
 
-		//"def" name=ValidID context=Context
+		//'def' name=ValidID context=Context
 		public Group getGroup() { return cGroup; }
 
-		//"def"
+		//'def'
 		public Keyword getDefKeyword_0() { return cDefKeyword_0; }
 
 		//name=ValidID
@@ -618,7 +623,7 @@ public class ImplementationElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class FormalParameterElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "FormalParameter");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.check.Check.FormalParameter");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cTypeAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final RuleCall cTypeJvmParameterizedTypeReferenceParserRuleCall_0_0 = (RuleCall)cTypeAssignment_0.eContents().get(0);
@@ -630,14 +635,15 @@ public class FormalParameterElements extends AbstractParserRuleElementFinder {
 		private final Assignment cLabelAssignment_4 = (Assignment)cGroup.eContents().get(4);
 		private final RuleCall cLabelSTRINGTerminalRuleCall_4_0 = (RuleCall)cLabelAssignment_4.eContents().get(0);
 		
-		/// *
+		///*
 		// *   Parameter Description (incl type and default values)
-		// * / // TODO how can formal parameters be referenced from within a 'def' Implementation clause?
+		// */ // TODO how can formal parameters be referenced from within a 'def' Implementation clause?
 		//FormalParameter:
-		//	type=JvmParameterizedTypeReference name=ValidID "=" right=XFormalParameterDefaultValueLiteral label=STRING?;
+		//	type=JvmParameterizedTypeReference name=ValidID '=' right=XFormalParameterDefaultValueLiteral
+		//	label=STRING?;
 		@Override public ParserRule getRule() { return rule; }
 
-		//type=JvmParameterizedTypeReference name=ValidID "=" right=XFormalParameterDefaultValueLiteral label=STRING?
+		//type=JvmParameterizedTypeReference name=ValidID '=' right=XFormalParameterDefaultValueLiteral label=STRING?
 		public Group getGroup() { return cGroup; }
 
 		//type=JvmParameterizedTypeReference
@@ -652,7 +658,7 @@ public class FormalParameterElements extends AbstractParserRuleElementFinder {
 		//ValidID
 		public RuleCall getNameValidIDParserRuleCall_1_0() { return cNameValidIDParserRuleCall_1_0; }
 
-		//"="
+		//'='
 		public Keyword getEqualsSignKeyword_2() { return cEqualsSignKeyword_2; }
 
 		//right=XFormalParameterDefaultValueLiteral
@@ -669,7 +675,7 @@ public class FormalParameterElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class XSimpleFormalParameterDefaultValueLiteralElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "XSimpleFormalParameterDefaultValueLiteral");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.check.Check.XSimpleFormalParameterDefaultValueLiteral");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cXBooleanLiteralParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cXNumberLiteralParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
@@ -677,7 +683,7 @@ public class XSimpleFormalParameterDefaultValueLiteralElements extends AbstractP
 		
 		////TODO resolve the allowed types either in scopes or in validations
 		////TODO validate the default values according to the type.
-		//XSimpleFormalParameterDefaultValueLiteral returns xbase::XExpression:
+		//XSimpleFormalParameterDefaultValueLiteral xbase::XExpression:
 		//	XBooleanLiteral | XNumberLiteral | XStringLiteral;
 		@Override public ParserRule getRule() { return rule; }
 
@@ -695,7 +701,7 @@ public class XSimpleFormalParameterDefaultValueLiteralElements extends AbstractP
 	}
 
 	public class XConstantUnaryOperationElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "XConstantUnaryOperation");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.check.Check.XConstantUnaryOperation");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final Group cGroup_0 = (Group)cAlternatives.eContents().get(0);
 		private final Action cXUnaryOperationAction_0_0 = (Action)cGroup_0.eContents().get(0);
@@ -706,9 +712,9 @@ public class XConstantUnaryOperationElements extends AbstractParserRuleElementFi
 		private final RuleCall cOperandXConstantUnaryOperationParserRuleCall_0_2_0 = (RuleCall)cOperandAssignment_0_2.eContents().get(0);
 		private final RuleCall cXSimpleFormalParameterDefaultValueLiteralParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
 		
-		//XConstantUnaryOperation returns xbase::XExpression:
-		//	{xbase::XUnaryOperation} feature=[types::JvmIdentifiableElement|OpUnary] operand=XConstantUnaryOperation |
-		//	XSimpleFormalParameterDefaultValueLiteral;
+		//XConstantUnaryOperation xbase::XExpression:
+		//	{xbase::XUnaryOperation} feature=[types::JvmIdentifiableElement|OpUnary] operand=XConstantUnaryOperation
+		//	| XSimpleFormalParameterDefaultValueLiteral;
 		@Override public ParserRule getRule() { return rule; }
 
 		//{xbase::XUnaryOperation} feature=[types::JvmIdentifiableElement|OpUnary] operand=XConstantUnaryOperation |
@@ -741,14 +747,15 @@ public class XConstantUnaryOperationElements extends AbstractParserRuleElementFi
 	}
 
 	public class XFormalParameterDefaultValueLiteralElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "XFormalParameterDefaultValueLiteral");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.check.Check.XFormalParameterDefaultValueLiteral");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cXConstantUnaryOperationParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cXConstantListLiteralParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
 		
-		//// todo add support for enumerations
-		//XFormalParameterDefaultValueLiteral returns xbase::XExpression:
-		//	XConstantUnaryOperation | XConstantListLiteral;
+		//XFormalParameterDefaultValueLiteral xbase::XExpression:
+		//	XConstantUnaryOperation | XConstantListLiteral
+		//	// todo add support for enumerations
+		//;
 		@Override public ParserRule getRule() { return rule; }
 
 		//XConstantUnaryOperation | XConstantListLiteral
@@ -762,7 +769,7 @@ public class XFormalParameterDefaultValueLiteralElements extends AbstractParserR
 	}
 
 	public class XConstantListLiteralElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "XConstantListLiteral");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.check.Check.XConstantListLiteral");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Action cXListLiteralAction_0 = (Action)cGroup.eContents().get(0);
 		private final Keyword cNumberSignKeyword_1 = (Keyword)cGroup.eContents().get(1);
@@ -776,23 +783,23 @@ public class XConstantListLiteralElements extends AbstractParserRuleElementFinde
 		private final RuleCall cElementsXConstantUnaryOperationParserRuleCall_3_1_1_0 = (RuleCall)cElementsAssignment_3_1_1.eContents().get(0);
 		private final Keyword cRightSquareBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);
 		
-		//XConstantListLiteral returns xbase::XListLiteral:
-		//	{xbase::XListLiteral} "#" "[" (elements+=XConstantUnaryOperation ("," elements+=XConstantUnaryOperation)*)? "]";
+		//XConstantListLiteral xbase::XListLiteral:
+		//	{xbase::XListLiteral} '#' '[' (elements+=XConstantUnaryOperation (',' elements+=XConstantUnaryOperation)*)? ']';
 		@Override public ParserRule getRule() { return rule; }
 
-		//{xbase::XListLiteral} "#" "[" (elements+=XConstantUnaryOperation ("," elements+=XConstantUnaryOperation)*)? "]"
+		//{xbase::XListLiteral} '#' '[' (elements+=XConstantUnaryOperation (',' elements+=XConstantUnaryOperation)*)? ']'
 		public Group getGroup() { return cGroup; }
 
 		//{xbase::XListLiteral}
 		public Action getXListLiteralAction_0() { return cXListLiteralAction_0; }
 
-		//"#"
+		//'#'
 		public Keyword getNumberSignKeyword_1() { return cNumberSignKeyword_1; }
 
-		//"["
+		//'['
 		public Keyword getLeftSquareBracketKeyword_2() { return cLeftSquareBracketKeyword_2; }
 
-		//(elements+=XConstantUnaryOperation ("," elements+=XConstantUnaryOperation)*)?
+		//(elements+=XConstantUnaryOperation (',' elements+=XConstantUnaryOperation)*)?
 		public Group getGroup_3() { return cGroup_3; }
 
 		//elements+=XConstantUnaryOperation
@@ -801,10 +808,10 @@ public class XConstantListLiteralElements extends AbstractParserRuleElementFinde
 		//XConstantUnaryOperation
 		public RuleCall getElementsXConstantUnaryOperationParserRuleCall_3_0_0() { return cElementsXConstantUnaryOperationParserRuleCall_3_0_0; }
 
-		//("," elements+=XConstantUnaryOperation)*
+		//(',' elements+=XConstantUnaryOperation)*
 		public Group getGroup_3_1() { return cGroup_3_1; }
 
-		//","
+		//','
 		public Keyword getCommaKeyword_3_1_0() { return cCommaKeyword_3_1_0; }
 
 		//elements+=XConstantUnaryOperation
@@ -813,12 +820,12 @@ public class XConstantListLiteralElements extends AbstractParserRuleElementFinde
 		//XConstantUnaryOperation
 		public RuleCall getElementsXConstantUnaryOperationParserRuleCall_3_1_1_0() { return cElementsXConstantUnaryOperationParserRuleCall_3_1_1_0; }
 
-		//"]"
+		//']'
 		public Keyword getRightSquareBracketKeyword_4() { return cRightSquareBracketKeyword_4; }
 	}
 
 	public class ContextElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Context");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.check.Check.Context");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cForKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cContextVariableAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -826,16 +833,16 @@ public class ContextElements extends AbstractParserRuleElementFinder {
 		private final Assignment cConstraintAssignment_2 = (Assignment)cGroup.eContents().get(2);
 		private final RuleCall cConstraintXBlockExpressionParserRuleCall_2_0 = (RuleCall)cConstraintAssignment_2.eContents().get(0);
 		
-		/// *
+		///*
 		// *   Context Description (incl constraint?)
-		// * / Context:
-		//	"for" contextVariable=ContextVariable constraint=XBlockExpression;
+		// */ Context:
+		//	'for' contextVariable=ContextVariable constraint=XBlockExpression;
 		@Override public ParserRule getRule() { return rule; }
 
-		//"for" contextVariable=ContextVariable constraint=XBlockExpression
+		//'for' contextVariable=ContextVariable constraint=XBlockExpression
 		public Group getGroup() { return cGroup; }
 
-		//"for"
+		//'for'
 		public Keyword getForKeyword_0() { return cForKeyword_0; }
 
 		//contextVariable=ContextVariable
@@ -852,7 +859,7 @@ public class ContextElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class ContextVariableElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ContextVariable");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.check.Check.ContextVariable");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cTypeAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final RuleCall cTypeJvmTypeReferenceParserRuleCall_0_0 = (RuleCall)cTypeAssignment_0.eContents().get(0);
@@ -880,25 +887,25 @@ public class ContextVariableElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class XGuardExpressionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "XGuardExpression");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.check.Check.XGuardExpression");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Action cXGuardExpressionAction_0 = (Action)cGroup.eContents().get(0);
 		private final Keyword cGuardKeyword_1 = (Keyword)cGroup.eContents().get(1);
 		private final Assignment cGuardAssignment_2 = (Assignment)cGroup.eContents().get(2);
 		private final RuleCall cGuardXExpressionParserRuleCall_2_0 = (RuleCall)cGuardAssignment_2.eContents().get(0);
 		
-		///// * Adding Guards and Issues to the possible expressions * /
-		//XGuardExpression returns xbase::XExpression:
-		//	{XGuardExpression} "guard" guard=XExpression;
+		/////* Adding Guards and Issues to the possible expressions */
+		//XGuardExpression xbase::XExpression:
+		//	{XGuardExpression} 'guard' guard=XExpression;
 		@Override public ParserRule getRule() { return rule; }
 
-		//{XGuardExpression} "guard" guard=XExpression
+		//{XGuardExpression} 'guard' guard=XExpression
 		public Group getGroup() { return cGroup; }
 
 		//{XGuardExpression}
 		public Action getXGuardExpressionAction_0() { return cXGuardExpressionAction_0; }
 
-		//"guard"
+		//'guard'
 		public Keyword getGuardKeyword_1() { return cGuardKeyword_1; }
 
 		//guard=XExpression
@@ -909,7 +916,7 @@ public class XGuardExpressionElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class XIssueExpressionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "XIssueExpression");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.check.Check.XIssueExpression");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Action cXIssueExpressionAction_0 = (Action)cGroup.eContents().get(0);
 		private final Keyword cIssueKeyword_1 = (Keyword)cGroup.eContents().get(1);
@@ -964,26 +971,27 @@ public class XIssueExpressionElements extends AbstractParserRuleElementFinder {
 		private final RuleCall cIssueDataXExpressionParserRuleCall_6_4_1_0 = (RuleCall)cIssueDataAssignment_6_4_1.eContents().get(0);
 		private final Keyword cRightParenthesisKeyword_6_5 = (Keyword)cGroup_6.eContents().get(5);
 		
-		//XIssueExpression returns xbase::XExpression:
-		//	{XIssueExpression} "issue" => check=[Check|QualifiedName]? ("on" ("#"
-		//	markerFeature=[ecore::EStructuralFeature|ValidID] // we list the possible choices to help antlr
-		//	| markerObject=XExpression ("#" markerFeature=[ecore::EStructuralFeature|FeatureCallID])?) ("[" markerIndex=XExpression
-		//	"]")?)? ("message" message=XExpression)? ("bind" "(" messageParameters+=XExpression (","
-		//	messageParameters+=XExpression)* ")")? //TODO rename as bindings
-		//	("data" issueCode=ValidID? "(" issueData+=XExpression ("," issueData+=XExpression)* ")")?;
+		//XIssueExpression xbase::XExpression:
+		//	{XIssueExpression}
+		//	'issue'
+		//	=> check=[Check|QualifiedName]? (=> 'on' (=> '#' markerFeature=[ecore::EStructuralFeature|ValidID] |
+		//	markerObject=XExpression (=> '#' markerFeature=[ecore::EStructuralFeature|FeatureCallID])?) (=> '['
+		//	markerIndex=XExpression ']')?)? (=> 'message' message=XExpression)? (=> 'bind' '(' messageParameters+=XExpression (=>
+		//	',' messageParameters+=XExpression)* ')')? (=> 'data' issueCode=ValidID? '(' issueData+=XExpression (=> ','
+		//	issueData+=XExpression)* ')')?;
 		@Override public ParserRule getRule() { return rule; }
 
-		//{XIssueExpression} "issue" => check=[Check|QualifiedName]? ("on" ("#" markerFeature=[ecore::EStructuralFeature|ValidID] // we list the possible choices to help antlr
-		//| markerObject=XExpression ("#" markerFeature=[ecore::EStructuralFeature|FeatureCallID])?) ("[" markerIndex=XExpression
-		//"]")?)? ("message" message=XExpression)? ("bind" "(" messageParameters+=XExpression (","
-		//messageParameters+=XExpression)* ")")? //TODO rename as bindings
-		//("data" issueCode=ValidID? "(" issueData+=XExpression ("," issueData+=XExpression)* ")")?
+		//{XIssueExpression} 'issue' => check=[Check|QualifiedName]? (=> 'on' (=> '#'
+		//markerFeature=[ecore::EStructuralFeature|ValidID] | markerObject=XExpression (=> '#'
+		//markerFeature=[ecore::EStructuralFeature|FeatureCallID])?) (=> '[' markerIndex=XExpression ']')?)? (=> 'message'
+		//message=XExpression)? (=> 'bind' '(' messageParameters+=XExpression (=> ',' messageParameters+=XExpression)* ')')? (=>
+		//'data' issueCode=ValidID? '(' issueData+=XExpression (=> ',' issueData+=XExpression)* ')')?
 		public Group getGroup() { return cGroup; }
 
 		//{XIssueExpression}
 		public Action getXIssueExpressionAction_0() { return cXIssueExpressionAction_0; }
 
-		//"issue"
+		//'issue'
 		public Keyword getIssueKeyword_1() { return cIssueKeyword_1; }
 
 		//=> check=[Check|QualifiedName]?
@@ -995,22 +1003,22 @@ public class XIssueExpressionElements extends AbstractParserRuleElementFinder {
 		//QualifiedName
 		public RuleCall getCheckCheckQualifiedNameParserRuleCall_2_0_1() { return cCheckCheckQualifiedNameParserRuleCall_2_0_1; }
 
-		//(=> "on" ("#" markerFeature=[ecore::EStructuralFeature|ValidID] // we list the possible choices to help antlr
-		//| markerObject=XExpression ("#" markerFeature=[ecore::EStructuralFeature|FeatureCallID])?) ("[" markerIndex=XExpression
-		//"]")?)?
+		//(=> 'on' (=> '#' markerFeature=[ecore::EStructuralFeature|ValidID] | markerObject=XExpression (=> '#'
+		//markerFeature=[ecore::EStructuralFeature|FeatureCallID])?) (=> '[' markerIndex=XExpression ']')?)?
 		public Group getGroup_3() { return cGroup_3; }
 
-		//=> "on"
+		//=> 'on'
 		public Keyword getOnKeyword_3_0() { return cOnKeyword_3_0; }
 
-		//=> "#" markerFeature=[ecore::EStructuralFeature|ValidID] // we list the possible choices to help antlr
-		//| markerObject=XExpression ("#" markerFeature=[ecore::EStructuralFeature|FeatureCallID])?
+		//// we list the possible choices to help antlr
+		//=> '#' markerFeature=[ecore::EStructuralFeature|ValidID] | markerObject=XExpression (=> '#'
+		//markerFeature=[ecore::EStructuralFeature|FeatureCallID])?
 		public Alternatives getAlternatives_3_1() { return cAlternatives_3_1; }
 
-		//=> "#" markerFeature=[ecore::EStructuralFeature|ValidID]
+		//=> '#' markerFeature=[ecore::EStructuralFeature|ValidID]
 		public Group getGroup_3_1_0() { return cGroup_3_1_0; }
 
-		//=> "#"
+		//=> '#'
 		public Keyword getNumberSignKeyword_3_1_0_0() { return cNumberSignKeyword_3_1_0_0; }
 
 		//markerFeature=[ecore::EStructuralFeature|ValidID]
@@ -1022,7 +1030,7 @@ public class XIssueExpressionElements extends AbstractParserRuleElementFinder {
 		//ValidID
 		public RuleCall getMarkerFeatureEStructuralFeatureValidIDParserRuleCall_3_1_0_1_0_1() { return cMarkerFeatureEStructuralFeatureValidIDParserRuleCall_3_1_0_1_0_1; }
 
-		//markerObject=XExpression ("#" markerFeature=[ecore::EStructuralFeature|FeatureCallID])?
+		//markerObject=XExpression (=> '#' markerFeature=[ecore::EStructuralFeature|FeatureCallID])?
 		public Group getGroup_3_1_1() { return cGroup_3_1_1; }
 
 		//markerObject=XExpression
@@ -1031,10 +1039,10 @@ public class XIssueExpressionElements extends AbstractParserRuleElementFinder {
 		//XExpression
 		public RuleCall getMarkerObjectXExpressionParserRuleCall_3_1_1_0_0() { return cMarkerObjectXExpressionParserRuleCall_3_1_1_0_0; }
 
-		//(=> "#" markerFeature=[ecore::EStructuralFeature|FeatureCallID])?
+		//(=> '#' markerFeature=[ecore::EStructuralFeature|FeatureCallID])?
 		public Group getGroup_3_1_1_1() { return cGroup_3_1_1_1; }
 
-		//=> "#"
+		//=> '#'
 		public Keyword getNumberSignKeyword_3_1_1_1_0() { return cNumberSignKeyword_3_1_1_1_0; }
 
 		//markerFeature=[ecore::EStructuralFeature|FeatureCallID]
@@ -1046,10 +1054,10 @@ public class XIssueExpressionElements extends AbstractParserRuleElementFinder {
 		//FeatureCallID
 		public RuleCall getMarkerFeatureEStructuralFeatureFeatureCallIDParserRuleCall_3_1_1_1_1_0_1() { return cMarkerFeatureEStructuralFeatureFeatureCallIDParserRuleCall_3_1_1_1_1_0_1; }
 
-		//(=> "[" markerIndex=XExpression "]")?
+		//(=> '[' markerIndex=XExpression ']')?
 		public Group getGroup_3_2() { return cGroup_3_2; }
 
-		//=> "["
+		//=> '['
 		public Keyword getLeftSquareBracketKeyword_3_2_0() { return cLeftSquareBracketKeyword_3_2_0; }
 
 		//markerIndex=XExpression
@@ -1058,13 +1066,13 @@ public class XIssueExpressionElements extends AbstractParserRuleElementFinder {
 		//XExpression
 		public RuleCall getMarkerIndexXExpressionParserRuleCall_3_2_1_0() { return cMarkerIndexXExpressionParserRuleCall_3_2_1_0; }
 
-		//"]"
+		//']'
 		public Keyword getRightSquareBracketKeyword_3_2_2() { return cRightSquareBracketKeyword_3_2_2; }
 
-		//(=> "message" message=XExpression)?
+		//(=> 'message' message=XExpression)?
 		public Group getGroup_4() { return cGroup_4; }
 
-		//=> "message"
+		//=> 'message'
 		public Keyword getMessageKeyword_4_0() { return cMessageKeyword_4_0; }
 
 		//message=XExpression
@@ -1073,13 +1081,13 @@ public class XIssueExpressionElements extends AbstractParserRuleElementFinder {
 		//XExpression
 		public RuleCall getMessageXExpressionParserRuleCall_4_1_0() { return cMessageXExpressionParserRuleCall_4_1_0; }
 
-		//(=> "bind" "(" messageParameters+=XExpression ("," messageParameters+=XExpression)* ")")?
+		//(=> 'bind' '(' messageParameters+=XExpression (=> ',' messageParameters+=XExpression)* ')')?
 		public Group getGroup_5() { return cGroup_5; }
 
-		//=> "bind"
+		//=> 'bind'
 		public Keyword getBindKeyword_5_0() { return cBindKeyword_5_0; }
 
-		//"("
+		//'('
 		public Keyword getLeftParenthesisKeyword_5_1() { return cLeftParenthesisKeyword_5_1; }
 
 		//messageParameters+=XExpression
@@ -1088,10 +1096,10 @@ public class XIssueExpressionElements extends AbstractParserRuleElementFinder {
 		//XExpression
 		public RuleCall getMessageParametersXExpressionParserRuleCall_5_2_0() { return cMessageParametersXExpressionParserRuleCall_5_2_0; }
 
-		//(=> "," messageParameters+=XExpression)*
+		//(=> ',' messageParameters+=XExpression)*
 		public Group getGroup_5_3() { return cGroup_5_3; }
 
-		//=> ","
+		//=> ','
 		public Keyword getCommaKeyword_5_3_0() { return cCommaKeyword_5_3_0; }
 
 		//messageParameters+=XExpression
@@ -1100,13 +1108,13 @@ public class XIssueExpressionElements extends AbstractParserRuleElementFinder {
 		//XExpression
 		public RuleCall getMessageParametersXExpressionParserRuleCall_5_3_1_0() { return cMessageParametersXExpressionParserRuleCall_5_3_1_0; }
 
-		//")"
+		//')'
 		public Keyword getRightParenthesisKeyword_5_4() { return cRightParenthesisKeyword_5_4; }
 
-		//(=> "data" issueCode=ValidID? "(" issueData+=XExpression ("," issueData+=XExpression)* ")")?
+		//(=> 'data' issueCode=ValidID? '(' issueData+=XExpression (=> ',' issueData+=XExpression)* ')')?
 		public Group getGroup_6() { return cGroup_6; }
 
-		//=> "data"
+		//=> 'data'
 		public Keyword getDataKeyword_6_0() { return cDataKeyword_6_0; }
 
 		//issueCode=ValidID?
@@ -1115,7 +1123,7 @@ public class XIssueExpressionElements extends AbstractParserRuleElementFinder {
 		//ValidID
 		public RuleCall getIssueCodeValidIDParserRuleCall_6_1_0() { return cIssueCodeValidIDParserRuleCall_6_1_0; }
 
-		//"("
+		//'('
 		public Keyword getLeftParenthesisKeyword_6_2() { return cLeftParenthesisKeyword_6_2; }
 
 		//issueData+=XExpression
@@ -1124,10 +1132,10 @@ public class XIssueExpressionElements extends AbstractParserRuleElementFinder {
 		//XExpression
 		public RuleCall getIssueDataXExpressionParserRuleCall_6_3_0() { return cIssueDataXExpressionParserRuleCall_6_3_0; }
 
-		//(=> "," issueData+=XExpression)*
+		//(=> ',' issueData+=XExpression)*
 		public Group getGroup_6_4() { return cGroup_6_4; }
 
-		//=> ","
+		//=> ','
 		public Keyword getCommaKeyword_6_4_0() { return cCommaKeyword_6_4_0; }
 
 		//issueData+=XExpression
@@ -1136,12 +1144,12 @@ public class XIssueExpressionElements extends AbstractParserRuleElementFinder {
 		//XExpression
 		public RuleCall getIssueDataXExpressionParserRuleCall_6_4_1_0() { return cIssueDataXExpressionParserRuleCall_6_4_1_0; }
 
-		//")"
+		//')'
 		public Keyword getRightParenthesisKeyword_6_5() { return cRightParenthesisKeyword_6_5; }
 	}
 
 	public class XPrimaryExpressionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "XPrimaryExpression");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.check.Check.XPrimaryExpression");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cXConstructorCallParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cXBlockExpressionParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
@@ -1161,19 +1169,31 @@ public class XPrimaryExpressionElements extends AbstractParserRuleElementFinder
 		private final RuleCall cXGuardExpressionParserRuleCall_15 = (RuleCall)cAlternatives.eContents().get(15);
 		private final RuleCall cXIssueExpressionParserRuleCall_16 = (RuleCall)cAlternatives.eContents().get(16);
 		
-		//XPrimaryExpression returns xbase::XExpression:
-		//	XConstructorCall | XBlockExpression | XSwitchExpression | XSynchronizedExpression | XFeatureCall | XLiteral |
-		//	XIfExpression | XForLoopExpression | XBasicForLoopExpression | XWhileExpression | XDoWhileExpression |
-		//	XThrowExpression | XReturnExpression | XTryCatchFinallyExpression | XParenthesizedExpression | // <-new
-		//	XGuardExpression | // <-new
-		//	XIssueExpression;
+		//XPrimaryExpression xbase::XExpression:
+		//	XConstructorCall
+		//	| XBlockExpression
+		//	| XSwitchExpression
+		//	| XSynchronizedExpression
+		//	| XFeatureCall
+		//	| XLiteral
+		//	| XIfExpression
+		//	| XForLoopExpression
+		//	| XBasicForLoopExpression
+		//	| XWhileExpression
+		//	| XDoWhileExpression
+		//	| XThrowExpression
+		//	| XReturnExpression
+		//	| XTryCatchFinallyExpression
+		//	| XParenthesizedExpression
+		//	| XGuardExpression // <-new
+		//	| XIssueExpression // <-new
+		//;
 		@Override public ParserRule getRule() { return rule; }
 
 		//XConstructorCall | XBlockExpression | XSwitchExpression | XSynchronizedExpression | XFeatureCall | XLiteral |
 		//XIfExpression | XForLoopExpression | XBasicForLoopExpression | XWhileExpression | XDoWhileExpression |
-		//XThrowExpression | XReturnExpression | XTryCatchFinallyExpression | XParenthesizedExpression | // <-new
-		//XGuardExpression | // <-new
-		//XIssueExpression
+		//XThrowExpression | XReturnExpression | XTryCatchFinallyExpression | XParenthesizedExpression | XGuardExpression // <-new
+		//| XIssueExpression
 		public Alternatives getAlternatives() { return cAlternatives; }
 
 		//XConstructorCall
@@ -1221,17 +1241,15 @@ public class XPrimaryExpressionElements extends AbstractParserRuleElementFinder
 		//XParenthesizedExpression
 		public RuleCall getXParenthesizedExpressionParserRuleCall_14() { return cXParenthesizedExpressionParserRuleCall_14; }
 
-		//// <-new
 		//XGuardExpression
 		public RuleCall getXGuardExpressionParserRuleCall_15() { return cXGuardExpressionParserRuleCall_15; }
 
-		//// <-new
 		//XIssueExpression
 		public RuleCall getXIssueExpressionParserRuleCall_16() { return cXIssueExpressionParserRuleCall_16; }
 	}
 
 	public class FeatureCallIDElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "FeatureCallID");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.check.Check.FeatureCallID");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cValidIDParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final Keyword cExtendsKeyword_1 = (Keyword)cAlternatives.eContents().get(1);
@@ -1258,90 +1276,88 @@ public class FeatureCallIDElements extends AbstractParserRuleElementFinder {
 		//// We cannot add any identifier here that also starts an XPrimaryExpression. ('for', 'guard', 'issue'). Also, don't add the Java keywords
 		//// 'package' or 'final'. Let's at least allow all other keywords as member IDs in a chained feature call.
 		//FeatureCallID:
-		//	ValidID | "extends" | "static" | "import" | // Inherited from xbase
-		//	"extension" | "catalog" | "grammar" | "with" | "category" | "message" | "on" | "bind" | "data" | "SeverityRange" |
-		//	"error" | "warning" | "info" | // SeverityKind
-		//	"ignore" | "live" | "onSave" | // TriggerKind
-		//	"onDemand";
+		//	ValidID
+		//	| 'extends' | 'static' | 'import' | 'extension' // Inherited from xbase
+		//	| 'catalog' | 'grammar' | 'with' | 'category' | 'message'
+		//	| 'on' | 'bind' | 'data' | 'SeverityRange'
+		//	| 'error' | 'warning' | 'info' | 'ignore' // SeverityKind
+		//	| 'live' | 'onSave' | 'onDemand' // TriggerKind
+		//;
 		@Override public ParserRule getRule() { return rule; }
 
-		//ValidID | "extends" | "static" | "import" | // Inherited from xbase
-		//"extension" | "catalog" | "grammar" | "with" | "category" | "message" | "on" | "bind" | "data" | "SeverityRange" |
-		//"error" | "warning" | "info" | // SeverityKind
-		//"ignore" | "live" | "onSave" | // TriggerKind
-		//"onDemand"
+		//ValidID | 'extends' | 'static' | 'import' | 'extension' // Inherited from xbase
+		//| 'catalog' | 'grammar' | 'with' | 'category' | 'message' | 'on' | 'bind' | 'data' | 'SeverityRange' | 'error' |
+		//'warning' | 'info' | 'ignore' // SeverityKind
+		//| 'live' | 'onSave' | 'onDemand'
 		public Alternatives getAlternatives() { return cAlternatives; }
 
 		//ValidID
 		public RuleCall getValidIDParserRuleCall_0() { return cValidIDParserRuleCall_0; }
 
-		//"extends"
+		//'extends'
 		public Keyword getExtendsKeyword_1() { return cExtendsKeyword_1; }
 
-		//"static"
+		//'static'
 		public Keyword getStaticKeyword_2() { return cStaticKeyword_2; }
 
-		//"import"
+		//'import'
 		public Keyword getImportKeyword_3() { return cImportKeyword_3; }
 
-		//// Inherited from xbase
-		//"extension"
+		//'extension'
 		public Keyword getExtensionKeyword_4() { return cExtensionKeyword_4; }
 
-		//"catalog"
+		//'catalog'
 		public Keyword getCatalogKeyword_5() { return cCatalogKeyword_5; }
 
-		//"grammar"
+		//'grammar'
 		public Keyword getGrammarKeyword_6() { return cGrammarKeyword_6; }
 
-		//"with"
+		//'with'
 		public Keyword getWithKeyword_7() { return cWithKeyword_7; }
 
-		//"category"
+		//'category'
 		public Keyword getCategoryKeyword_8() { return cCategoryKeyword_8; }
 
-		//"message"
+		//'message'
 		public Keyword getMessageKeyword_9() { return cMessageKeyword_9; }
 
-		//"on"
+		//'on'
 		public Keyword getOnKeyword_10() { return cOnKeyword_10; }
 
-		//"bind"
+		//'bind'
 		public Keyword getBindKeyword_11() { return cBindKeyword_11; }
 
-		//"data"
+		//'data'
 		public Keyword getDataKeyword_12() { return cDataKeyword_12; }
 
-		//"SeverityRange"
+		//'SeverityRange'
 		public Keyword getSeverityRangeKeyword_13() { return cSeverityRangeKeyword_13; }
 
-		//"error"
+		//'error'
 		public Keyword getErrorKeyword_14() { return cErrorKeyword_14; }
 
-		//"warning"
+		//'warning'
 		public Keyword getWarningKeyword_15() { return cWarningKeyword_15; }
 
-		//"info"
+		//'info'
 		public Keyword getInfoKeyword_16() { return cInfoKeyword_16; }
 
-		//// SeverityKind
-		//"ignore"
+		//'ignore'
 		public Keyword getIgnoreKeyword_17() { return cIgnoreKeyword_17; }
 
-		//"live"
+		//'live'
 		public Keyword getLiveKeyword_18() { return cLiveKeyword_18; }
 
-		//"onSave"
+		//'onSave'
 		public Keyword getOnSaveKeyword_19() { return cOnSaveKeyword_19; }
 
-		//// TriggerKind
-		//"onDemand"
+		//'onDemand'
 		public Keyword getOnDemandKeyword_20() { return cOnDemandKeyword_20; }
 	}
 	
 	
 	public class SeverityKindElements extends AbstractEnumRuleElementFinder {
-		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "SeverityKind");
+		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.check.Check.SeverityKind");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final EnumLiteralDeclaration cErrorEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0);
 		private final Keyword cErrorErrorKeyword_0_0 = (Keyword)cErrorEnumLiteralDeclaration_0.eContents().get(0);
@@ -1362,30 +1378,30 @@ public class SeverityKindElements extends AbstractEnumRuleElementFinder {
 		//error
 		public EnumLiteralDeclaration getErrorEnumLiteralDeclaration_0() { return cErrorEnumLiteralDeclaration_0; }
 
-		//"error"
+		//'error'
 		public Keyword getErrorErrorKeyword_0_0() { return cErrorErrorKeyword_0_0; }
 
 		//warning
 		public EnumLiteralDeclaration getWarningEnumLiteralDeclaration_1() { return cWarningEnumLiteralDeclaration_1; }
 
-		//"warning"
+		//'warning'
 		public Keyword getWarningWarningKeyword_1_0() { return cWarningWarningKeyword_1_0; }
 
 		//info
 		public EnumLiteralDeclaration getInfoEnumLiteralDeclaration_2() { return cInfoEnumLiteralDeclaration_2; }
 
-		//"info"
+		//'info'
 		public Keyword getInfoInfoKeyword_2_0() { return cInfoInfoKeyword_2_0; }
 
 		//ignore
 		public EnumLiteralDeclaration getIgnoreEnumLiteralDeclaration_3() { return cIgnoreEnumLiteralDeclaration_3; }
 
-		//"ignore"
+		//'ignore'
 		public Keyword getIgnoreIgnoreKeyword_3_0() { return cIgnoreIgnoreKeyword_3_0; }
 	}
 
 	public class TriggerKindElements extends AbstractEnumRuleElementFinder {
-		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "TriggerKind");
+		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.check.Check.TriggerKind");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final EnumLiteralDeclaration cFastEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0);
 		private final Keyword cFastLiveKeyword_0_0 = (Keyword)cFastEnumLiteralDeclaration_0.eContents().get(0);
@@ -1394,30 +1410,31 @@ public class TriggerKindElements extends AbstractEnumRuleElementFinder {
 		private final EnumLiteralDeclaration cExpensiveEnumLiteralDeclaration_2 = (EnumLiteralDeclaration)cAlternatives.eContents().get(2);
 		private final Keyword cExpensiveOnDemandKeyword_2_0 = (Keyword)cExpensiveEnumLiteralDeclaration_2.eContents().get(0);
 		
-		//// we avoid using CheckKind to simplify writing expressions...
-		//enum TriggerKind:
-		//	fast="live" | normal="onSave" | expensive="onDemand";
+		//enum TriggerKind: // we avoid using CheckKind to simplify writing expressions...
+		//	fast='live' | normal='onSave' | expensive='onDemand';
 		public EnumRule getRule() { return rule; }
 
-		//fast="live" | normal="onSave" | expensive="onDemand"
+		//// we avoid using CheckKind to simplify writing expressions...
+		//fast='live' | normal='onSave' | expensive='onDemand'
 		public Alternatives getAlternatives() { return cAlternatives; }
 
-		//fast="live"
+		//// we avoid using CheckKind to simplify writing expressions...
+		//fast='live'
 		public EnumLiteralDeclaration getFastEnumLiteralDeclaration_0() { return cFastEnumLiteralDeclaration_0; }
 
-		//"live"
+		//'live'
 		public Keyword getFastLiveKeyword_0_0() { return cFastLiveKeyword_0_0; }
 
-		//normal="onSave"
+		//normal='onSave'
 		public EnumLiteralDeclaration getNormalEnumLiteralDeclaration_1() { return cNormalEnumLiteralDeclaration_1; }
 
-		//"onSave"
+		//'onSave'
 		public Keyword getNormalOnSaveKeyword_1_0() { return cNormalOnSaveKeyword_1_0; }
 
-		//expensive="onDemand"
+		//expensive='onDemand'
 		public EnumLiteralDeclaration getExpensiveEnumLiteralDeclaration_2() { return cExpensiveEnumLiteralDeclaration_2; }
 
-		//"onDemand"
+		//'onDemand'
 		public Keyword getExpensiveOnDemandKeyword_2_0() { return cExpensiveOnDemandKeyword_2_0; }
 	}
 	
@@ -1442,18 +1459,26 @@ public class TriggerKindElements extends AbstractEnumRuleElementFinder {
 	private final XIssueExpressionElements pXIssueExpression;
 	private final XPrimaryExpressionElements pXPrimaryExpression;
 	private final FeatureCallIDElements pFeatureCallID;
-	private final SeverityKindElements unknownRuleSeverityKind;
-	private final TriggerKindElements unknownRuleTriggerKind;
+	private final SeverityKindElements eSeverityKind;
+	private final TriggerKindElements eTriggerKind;
 	
 	private final Grammar grammar;
 
 	private final XbaseWithAnnotationsGrammarAccess gaXbaseWithAnnotations;
 
+	private final XbaseGrammarAccess gaXbase;
+
+	private final XtypeGrammarAccess gaXtype;
+
 	@Inject
 	public CheckGrammarAccess(GrammarProvider grammarProvider,
-		XbaseWithAnnotationsGrammarAccess gaXbaseWithAnnotations) {
+		XbaseWithAnnotationsGrammarAccess gaXbaseWithAnnotations,
+		XbaseGrammarAccess gaXbase,
+		XtypeGrammarAccess gaXtype) {
 		this.grammar = internalFindGrammar(grammarProvider);
 		this.gaXbaseWithAnnotations = gaXbaseWithAnnotations;
+		this.gaXbase = gaXbase;
+		this.gaXtype = gaXtype;
 		this.pCheckCatalog = new CheckCatalogElements();
 		this.pXImportSection = new XImportSectionElements();
 		this.pXImportDeclaration = new XImportDeclarationElements();
@@ -1475,8 +1500,8 @@ public CheckGrammarAccess(GrammarProvider grammarProvider,
 		this.pXIssueExpression = new XIssueExpressionElements();
 		this.pXPrimaryExpression = new XPrimaryExpressionElements();
 		this.pFeatureCallID = new FeatureCallIDElements();
-		this.unknownRuleSeverityKind = new SeverityKindElements();
-		this.unknownRuleTriggerKind = new TriggerKindElements();
+		this.eSeverityKind = new SeverityKindElements();
+		this.eTriggerKind = new TriggerKindElements();
 	}
 	
 	protected Grammar internalFindGrammar(GrammarProvider grammarProvider) {
@@ -1505,11 +1530,22 @@ public XbaseWithAnnotationsGrammarAccess getXbaseWithAnnotationsGrammarAccess()
 		return gaXbaseWithAnnotations;
 	}
 
+	public XbaseGrammarAccess getXbaseGrammarAccess() {
+		return gaXbase;
+	}
+
+	public XtypeGrammarAccess getXtypeGrammarAccess() {
+		return gaXtype;
+	}
+
 	
 	//CheckCatalog:
-	//	{CheckCatalog} "package" packageName=QualifiedName imports=XImportSection final?="final"? "catalog" name=ValidID
-	//	("for" "grammar" ^grammar=[xtext::Grammar|QualifiedName])? "{" (categories+=Category |
-	//	implementations+=Implementation | checks+=Check | members+=Member)* "}";
+	//	{CheckCatalog}
+	//	'package' packageName=QualifiedName
+	//	imports=XImportSection
+	//	final?='final'? 'catalog' name=ValidID ('for' 'grammar' ^grammar=[xtext::Grammar|QualifiedName])?
+	//	'{' (categories+=Category | implementations+=Implementation | checks+=Check | members+=Member)*
+	//	'}';
 	public CheckCatalogElements getCheckCatalogAccess() {
 		return pCheckCatalog;
 	}
@@ -1519,7 +1555,7 @@ public ParserRule getCheckCatalogRule() {
 	}
 
 	//// Override (inherited via xbase->xtype) to force creation of a (possibly empty) XImportSection
-	//XImportSection returns xtype::XImportSection:
+	//XImportSection xtype::XImportSection:
 	//	{xtype::XImportSection} importDeclarations+=XImportDeclaration*;
 	public XImportSectionElements getXImportSectionAccess() {
 		return pXImportSection;
@@ -1530,8 +1566,8 @@ public ParserRule getXImportSectionRule() {
 	}
 
 	//// Override (inherited via xbase->xtype) to restrict to our syntax. No static imports. (Backwards compatibility; would introduce a new keyword)
-	//XImportDeclaration returns xtype::XImportDeclaration:
-	//	"import" (importedType=[types::JvmDeclaredType|QualifiedName] | importedNamespace=QualifiedNameWithWildcard) ";"?;
+	//XImportDeclaration xtype::XImportDeclaration:
+	//	'import' (importedType=[types::JvmDeclaredType|QualifiedName] | importedNamespace=QualifiedNameWithWildcard) ';'?;
 	public XImportDeclarationElements getXImportDeclarationAccess() {
 		return pXImportDeclaration;
 	}
@@ -1561,7 +1597,9 @@ public ParserRule getImplicitlyNamedRule() {
 	}
 
 	//Category:
-	//	"category" id=ValidID? label=STRING "{" checks+=Check* "}";
+	//	'category' id=ValidID? label=STRING '{'
+	//	checks+=Check*
+	//	'}';
 	public CategoryElements getCategoryAccess() {
 		return pCategory;
 	}
@@ -1571,9 +1609,12 @@ public ParserRule getCategoryRule() {
 	}
 
 	//Check:
-	//	severityRange=SeverityRange? final?="final"? kind=TriggerKind? defaultSeverity=SeverityKind id=ValidID? label=STRING
-	//	("(" (formalParameters+=FormalParameter ("," formalParameters+=FormalParameter)*)? ")")? ("message"
-	//	givenMessage=STRING)? ("{" contexts+=Context* "}" | contexts+=Context?);
+	//	severityRange=SeverityRange?
+	//	final?='final'?
+	//	kind=TriggerKind?
+	//	defaultSeverity=SeverityKind
+	//	id=ValidID? label=STRING (=> '(' (formalParameters+=FormalParameter (',' formalParameters+=FormalParameter)*)? ')')?
+	//	('message' givenMessage=STRING)? (=> '{' contexts+=Context* '}' | contexts+=Context?);
 	public CheckElements getCheckAccess() {
 		return pCheck;
 	}
@@ -1584,8 +1625,8 @@ public ParserRule getCheckRule() {
 
 	////TODO check duplicate names, qualified names don't include category
 	//SeverityRange:
-	//	"@" "SeverityRange" "(" minSeverity=SeverityKind ".." maxSeverity=SeverityKind //TODO  verification not allowed for final
-	//	")";
+	//	'@' 'SeverityRange' '(' minSeverity=SeverityKind '..' maxSeverity=SeverityKind ')' //TODO  verification not allowed for final
+	//;
 	public SeverityRangeElements getSeverityRangeAccess() {
 		return pSeverityRange;
 	}
@@ -1595,8 +1636,9 @@ public ParserRule getSeverityRangeRule() {
 	}
 
 	//Member:
-	//	annotations+=XAnnotation* type=JvmTypeReference name=ValidID (OpSingleAssign value=XOrExpression)? // TODO: check if semicolon necessary?
-	//	";";
+	//	annotations+=XAnnotation*
+	//	type=JvmTypeReference name=ValidID (OpSingleAssign value=XOrExpression)? ';' // TODO: check if semicolon necessary?
+	//;
 	public MemberElements getMemberAccess() {
 		return pMember;
 	}
@@ -1606,7 +1648,7 @@ public ParserRule getMemberRule() {
 	}
 
 	//Implementation:
-	//	"def" name=ValidID context=Context;
+	//	'def' name=ValidID context=Context;
 	public ImplementationElements getImplementationAccess() {
 		return pImplementation;
 	}
@@ -1615,11 +1657,12 @@ public ParserRule getImplementationRule() {
 		return getImplementationAccess().getRule();
 	}
 
-	/// *
+	///*
 	// *   Parameter Description (incl type and default values)
-	// * / // TODO how can formal parameters be referenced from within a 'def' Implementation clause?
+	// */ // TODO how can formal parameters be referenced from within a 'def' Implementation clause?
 	//FormalParameter:
-	//	type=JvmParameterizedTypeReference name=ValidID "=" right=XFormalParameterDefaultValueLiteral label=STRING?;
+	//	type=JvmParameterizedTypeReference name=ValidID '=' right=XFormalParameterDefaultValueLiteral
+	//	label=STRING?;
 	public FormalParameterElements getFormalParameterAccess() {
 		return pFormalParameter;
 	}
@@ -1630,7 +1673,7 @@ public ParserRule getFormalParameterRule() {
 
 	////TODO resolve the allowed types either in scopes or in validations
 	////TODO validate the default values according to the type.
-	//XSimpleFormalParameterDefaultValueLiteral returns xbase::XExpression:
+	//XSimpleFormalParameterDefaultValueLiteral xbase::XExpression:
 	//	XBooleanLiteral | XNumberLiteral | XStringLiteral;
 	public XSimpleFormalParameterDefaultValueLiteralElements getXSimpleFormalParameterDefaultValueLiteralAccess() {
 		return pXSimpleFormalParameterDefaultValueLiteral;
@@ -1640,9 +1683,9 @@ public ParserRule getXSimpleFormalParameterDefaultValueLiteralRule() {
 		return getXSimpleFormalParameterDefaultValueLiteralAccess().getRule();
 	}
 
-	//XConstantUnaryOperation returns xbase::XExpression:
-	//	{xbase::XUnaryOperation} feature=[types::JvmIdentifiableElement|OpUnary] operand=XConstantUnaryOperation |
-	//	XSimpleFormalParameterDefaultValueLiteral;
+	//XConstantUnaryOperation xbase::XExpression:
+	//	{xbase::XUnaryOperation} feature=[types::JvmIdentifiableElement|OpUnary] operand=XConstantUnaryOperation
+	//	| XSimpleFormalParameterDefaultValueLiteral;
 	public XConstantUnaryOperationElements getXConstantUnaryOperationAccess() {
 		return pXConstantUnaryOperation;
 	}
@@ -1651,9 +1694,10 @@ public ParserRule getXConstantUnaryOperationRule() {
 		return getXConstantUnaryOperationAccess().getRule();
 	}
 
-	//// todo add support for enumerations
-	//XFormalParameterDefaultValueLiteral returns xbase::XExpression:
-	//	XConstantUnaryOperation | XConstantListLiteral;
+	//XFormalParameterDefaultValueLiteral xbase::XExpression:
+	//	XConstantUnaryOperation | XConstantListLiteral
+	//	// todo add support for enumerations
+	//;
 	public XFormalParameterDefaultValueLiteralElements getXFormalParameterDefaultValueLiteralAccess() {
 		return pXFormalParameterDefaultValueLiteral;
 	}
@@ -1662,8 +1706,8 @@ public ParserRule getXFormalParameterDefaultValueLiteralRule() {
 		return getXFormalParameterDefaultValueLiteralAccess().getRule();
 	}
 
-	//XConstantListLiteral returns xbase::XListLiteral:
-	//	{xbase::XListLiteral} "#" "[" (elements+=XConstantUnaryOperation ("," elements+=XConstantUnaryOperation)*)? "]";
+	//XConstantListLiteral xbase::XListLiteral:
+	//	{xbase::XListLiteral} '#' '[' (elements+=XConstantUnaryOperation (',' elements+=XConstantUnaryOperation)*)? ']';
 	public XConstantListLiteralElements getXConstantListLiteralAccess() {
 		return pXConstantListLiteral;
 	}
@@ -1672,10 +1716,10 @@ public ParserRule getXConstantListLiteralRule() {
 		return getXConstantListLiteralAccess().getRule();
 	}
 
-	/// *
+	///*
 	// *   Context Description (incl constraint?)
-	// * / Context:
-	//	"for" contextVariable=ContextVariable constraint=XBlockExpression;
+	// */ Context:
+	//	'for' contextVariable=ContextVariable constraint=XBlockExpression;
 	public ContextElements getContextAccess() {
 		return pContext;
 	}
@@ -1694,9 +1738,9 @@ public ParserRule getContextVariableRule() {
 		return getContextVariableAccess().getRule();
 	}
 
-	///// * Adding Guards and Issues to the possible expressions * /
-	//XGuardExpression returns xbase::XExpression:
-	//	{XGuardExpression} "guard" guard=XExpression;
+	/////* Adding Guards and Issues to the possible expressions */
+	//XGuardExpression xbase::XExpression:
+	//	{XGuardExpression} 'guard' guard=XExpression;
 	public XGuardExpressionElements getXGuardExpressionAccess() {
 		return pXGuardExpression;
 	}
@@ -1705,13 +1749,14 @@ public ParserRule getXGuardExpressionRule() {
 		return getXGuardExpressionAccess().getRule();
 	}
 
-	//XIssueExpression returns xbase::XExpression:
-	//	{XIssueExpression} "issue" => check=[Check|QualifiedName]? ("on" ("#"
-	//	markerFeature=[ecore::EStructuralFeature|ValidID] // we list the possible choices to help antlr
-	//	| markerObject=XExpression ("#" markerFeature=[ecore::EStructuralFeature|FeatureCallID])?) ("[" markerIndex=XExpression
-	//	"]")?)? ("message" message=XExpression)? ("bind" "(" messageParameters+=XExpression (","
-	//	messageParameters+=XExpression)* ")")? //TODO rename as bindings
-	//	("data" issueCode=ValidID? "(" issueData+=XExpression ("," issueData+=XExpression)* ")")?;
+	//XIssueExpression xbase::XExpression:
+	//	{XIssueExpression}
+	//	'issue'
+	//	=> check=[Check|QualifiedName]? (=> 'on' (=> '#' markerFeature=[ecore::EStructuralFeature|ValidID] |
+	//	markerObject=XExpression (=> '#' markerFeature=[ecore::EStructuralFeature|FeatureCallID])?) (=> '['
+	//	markerIndex=XExpression ']')?)? (=> 'message' message=XExpression)? (=> 'bind' '(' messageParameters+=XExpression (=>
+	//	',' messageParameters+=XExpression)* ')')? (=> 'data' issueCode=ValidID? '(' issueData+=XExpression (=> ','
+	//	issueData+=XExpression)* ')')?;
 	public XIssueExpressionElements getXIssueExpressionAccess() {
 		return pXIssueExpression;
 	}
@@ -1720,12 +1765,25 @@ public ParserRule getXIssueExpressionRule() {
 		return getXIssueExpressionAccess().getRule();
 	}
 
-	//XPrimaryExpression returns xbase::XExpression:
-	//	XConstructorCall | XBlockExpression | XSwitchExpression | XSynchronizedExpression | XFeatureCall | XLiteral |
-	//	XIfExpression | XForLoopExpression | XBasicForLoopExpression | XWhileExpression | XDoWhileExpression |
-	//	XThrowExpression | XReturnExpression | XTryCatchFinallyExpression | XParenthesizedExpression | // <-new
-	//	XGuardExpression | // <-new
-	//	XIssueExpression;
+	//XPrimaryExpression xbase::XExpression:
+	//	XConstructorCall
+	//	| XBlockExpression
+	//	| XSwitchExpression
+	//	| XSynchronizedExpression
+	//	| XFeatureCall
+	//	| XLiteral
+	//	| XIfExpression
+	//	| XForLoopExpression
+	//	| XBasicForLoopExpression
+	//	| XWhileExpression
+	//	| XDoWhileExpression
+	//	| XThrowExpression
+	//	| XReturnExpression
+	//	| XTryCatchFinallyExpression
+	//	| XParenthesizedExpression
+	//	| XGuardExpression // <-new
+	//	| XIssueExpression // <-new
+	//;
 	public XPrimaryExpressionElements getXPrimaryExpressionAccess() {
 		return pXPrimaryExpression;
 	}
@@ -1737,11 +1795,13 @@ public ParserRule getXPrimaryExpressionRule() {
 	//// We cannot add any identifier here that also starts an XPrimaryExpression. ('for', 'guard', 'issue'). Also, don't add the Java keywords
 	//// 'package' or 'final'. Let's at least allow all other keywords as member IDs in a chained feature call.
 	//FeatureCallID:
-	//	ValidID | "extends" | "static" | "import" | // Inherited from xbase
-	//	"extension" | "catalog" | "grammar" | "with" | "category" | "message" | "on" | "bind" | "data" | "SeverityRange" |
-	//	"error" | "warning" | "info" | // SeverityKind
-	//	"ignore" | "live" | "onSave" | // TriggerKind
-	//	"onDemand";
+	//	ValidID
+	//	| 'extends' | 'static' | 'import' | 'extension' // Inherited from xbase
+	//	| 'catalog' | 'grammar' | 'with' | 'category' | 'message'
+	//	| 'on' | 'bind' | 'data' | 'SeverityRange'
+	//	| 'error' | 'warning' | 'info' | 'ignore' // SeverityKind
+	//	| 'live' | 'onSave' | 'onDemand' // TriggerKind
+	//;
 	public FeatureCallIDElements getFeatureCallIDAccess() {
 		return pFeatureCallID;
 	}
@@ -1753,18 +1813,17 @@ public ParserRule getFeatureCallIDRule() {
 	//enum SeverityKind:
 	//	error | warning | info | ignore;
 	public SeverityKindElements getSeverityKindAccess() {
-		return unknownRuleSeverityKind;
+		return eSeverityKind;
 	}
 	
 	public EnumRule getSeverityKindRule() {
 		return getSeverityKindAccess().getRule();
 	}
 
-	//// we avoid using CheckKind to simplify writing expressions...
-	//enum TriggerKind:
-	//	fast="live" | normal="onSave" | expensive="onDemand";
+	//enum TriggerKind: // we avoid using CheckKind to simplify writing expressions...
+	//	fast='live' | normal='onSave' | expensive='onDemand';
 	public TriggerKindElements getTriggerKindAccess() {
-		return unknownRuleTriggerKind;
+		return eTriggerKind;
 	}
 	
 	public EnumRule getTriggerKindRule() {
@@ -1772,9 +1831,9 @@ public EnumRule getTriggerKindRule() {
 	}
 
 	//XAnnotation:
-	//	{XAnnotation} "@" annotationType=[types::JvmAnnotationType|QualifiedName] ("("
-	//	(elementValuePairs+=XAnnotationElementValuePair ("," elementValuePairs+=XAnnotationElementValuePair)* |
-	//	value=XAnnotationElementValueOrCommaList)? ")")?;
+	//	{XAnnotation} '@' annotationType=[types::JvmAnnotationType|QualifiedName] (=> '('
+	//	(elementValuePairs+=XAnnotationElementValuePair (',' elementValuePairs+=XAnnotationElementValuePair)* |
+	//	value=XAnnotationElementValueOrCommaList)? ')')?;
 	public XbaseWithAnnotationsGrammarAccess.XAnnotationElements getXAnnotationAccess() {
 		return gaXbaseWithAnnotations.getXAnnotationAccess();
 	}
@@ -1784,7 +1843,7 @@ public ParserRule getXAnnotationRule() {
 	}
 
 	//XAnnotationElementValuePair:
-	//	=> (element=[types::JvmOperation|ValidID] "=") value=XAnnotationElementValue;
+	//	=> (element=[types::JvmOperation|ValidID] '=') value=XAnnotationElementValue;
 	public XbaseWithAnnotationsGrammarAccess.XAnnotationElementValuePairElements getXAnnotationElementValuePairAccess() {
 		return gaXbaseWithAnnotations.getXAnnotationElementValuePairAccess();
 	}
@@ -1793,9 +1852,9 @@ public ParserRule getXAnnotationElementValuePairRule() {
 		return getXAnnotationElementValuePairAccess().getRule();
 	}
 
-	//XAnnotationElementValueOrCommaList returns xbase::XExpression:
-	//	=> ({xbase::XListLiteral} "#" "[") (elements+=XAnnotationOrExpression ("," elements+=XAnnotationOrExpression)*)? "]"
-	//	| XAnnotationOrExpression ({xbase::XListLiteral.elements+=current} ("," elements+=XAnnotationOrExpression)+)?;
+	//XAnnotationElementValueOrCommaList xbase::XExpression:
+	//	=> ({xbase::XListLiteral} '#' '[') (elements+=XAnnotationOrExpression (',' elements+=XAnnotationOrExpression)*)? ']'
+	//	| XAnnotationOrExpression ({xbase::XListLiteral.elements+=current} (',' elements+=XAnnotationOrExpression)+)?;
 	public XbaseWithAnnotationsGrammarAccess.XAnnotationElementValueOrCommaListElements getXAnnotationElementValueOrCommaListAccess() {
 		return gaXbaseWithAnnotations.getXAnnotationElementValueOrCommaListAccess();
 	}
@@ -1804,8 +1863,8 @@ public ParserRule getXAnnotationElementValueOrCommaListRule() {
 		return getXAnnotationElementValueOrCommaListAccess().getRule();
 	}
 
-	//XAnnotationElementValue returns xbase::XExpression:
-	//	=> ({xbase::XListLiteral} "#" "[") (elements+=XAnnotationOrExpression ("," elements+=XAnnotationOrExpression)*)? "]"
+	//XAnnotationElementValue xbase::XExpression:
+	//	=> ({xbase::XListLiteral} '#' '[') (elements+=XAnnotationOrExpression (',' elements+=XAnnotationOrExpression)*)? ']'
 	//	| XAnnotationOrExpression;
 	public XbaseWithAnnotationsGrammarAccess.XAnnotationElementValueElements getXAnnotationElementValueAccess() {
 		return gaXbaseWithAnnotations.getXAnnotationElementValueAccess();
@@ -1815,7 +1874,7 @@ public ParserRule getXAnnotationElementValueRule() {
 		return getXAnnotationElementValueAccess().getRule();
 	}
 
-	//XAnnotationOrExpression returns xbase::XExpression:
+	//XAnnotationOrExpression xbase::XExpression:
 	//	XAnnotation | XExpression;
 	public XbaseWithAnnotationsGrammarAccess.XAnnotationOrExpressionElements getXAnnotationOrExpressionAccess() {
 		return gaXbaseWithAnnotations.getXAnnotationOrExpressionAccess();
@@ -1828,19 +1887,19 @@ public ParserRule getXAnnotationOrExpressionRule() {
 	//XExpression:
 	//	XAssignment;
 	public XbaseGrammarAccess.XExpressionElements getXExpressionAccess() {
-		return gaXbaseWithAnnotations.getXExpressionAccess();
+		return gaXbase.getXExpressionAccess();
 	}
 	
 	public ParserRule getXExpressionRule() {
 		return getXExpressionAccess().getRule();
 	}
 
-	//XAssignment returns XExpression:
-	//	{XAssignment} feature=[types::JvmIdentifiableElement|FeatureCallID] OpSingleAssign value=XAssignment | XOrExpression
-	//	(=> ({XBinaryOperation.leftOperand=current} feature=[types::JvmIdentifiableElement|OpMultiAssign])
+	//XAssignment XExpression:
+	//	{XAssignment} feature=[types::JvmIdentifiableElement|super::FeatureCallID] OpSingleAssign value=XAssignment |
+	//	XOrExpression (=> ({XBinaryOperation.leftOperand=current} feature=[types::JvmIdentifiableElement|OpMultiAssign])
 	//	rightOperand=XAssignment)?;
 	public XbaseGrammarAccess.XAssignmentElements getXAssignmentAccess() {
-		return gaXbaseWithAnnotations.getXAssignmentAccess();
+		return gaXbase.getXAssignmentAccess();
 	}
 	
 	public ParserRule getXAssignmentRule() {
@@ -1848,9 +1907,9 @@ public ParserRule getXAssignmentRule() {
 	}
 
 	//OpSingleAssign:
-	//	"=";
+	//	'=';
 	public XbaseGrammarAccess.OpSingleAssignElements getOpSingleAssignAccess() {
-		return gaXbaseWithAnnotations.getOpSingleAssignAccess();
+		return gaXbase.getOpSingleAssignAccess();
 	}
 	
 	public ParserRule getOpSingleAssignRule() {
@@ -1858,20 +1917,20 @@ public ParserRule getOpSingleAssignRule() {
 	}
 
 	//OpMultiAssign:
-	//	"+=" | "-=" | "*=" | "/=" | "%=" | "<" "<" "=" | ">" ">"? ">=";
+	//	'+=' | '-=' | '*=' | '/=' | '%=' | '<' '<' '=' | '>' '>'? '>=';
 	public XbaseGrammarAccess.OpMultiAssignElements getOpMultiAssignAccess() {
-		return gaXbaseWithAnnotations.getOpMultiAssignAccess();
+		return gaXbase.getOpMultiAssignAccess();
 	}
 	
 	public ParserRule getOpMultiAssignRule() {
 		return getOpMultiAssignAccess().getRule();
 	}
 
-	//XOrExpression returns XExpression:
+	//XOrExpression XExpression:
 	//	XAndExpression (=> ({XBinaryOperation.leftOperand=current} feature=[types::JvmIdentifiableElement|OpOr])
 	//	rightOperand=XAndExpression)*;
 	public XbaseGrammarAccess.XOrExpressionElements getXOrExpressionAccess() {
-		return gaXbaseWithAnnotations.getXOrExpressionAccess();
+		return gaXbase.getXOrExpressionAccess();
 	}
 	
 	public ParserRule getXOrExpressionRule() {
@@ -1879,20 +1938,20 @@ public ParserRule getXOrExpressionRule() {
 	}
 
 	//OpOr:
-	//	"||";
+	//	'||';
 	public XbaseGrammarAccess.OpOrElements getOpOrAccess() {
-		return gaXbaseWithAnnotations.getOpOrAccess();
+		return gaXbase.getOpOrAccess();
 	}
 	
 	public ParserRule getOpOrRule() {
 		return getOpOrAccess().getRule();
 	}
 
-	//XAndExpression returns XExpression:
+	//XAndExpression XExpression:
 	//	XEqualityExpression (=> ({XBinaryOperation.leftOperand=current} feature=[types::JvmIdentifiableElement|OpAnd])
 	//	rightOperand=XEqualityExpression)*;
 	public XbaseGrammarAccess.XAndExpressionElements getXAndExpressionAccess() {
-		return gaXbaseWithAnnotations.getXAndExpressionAccess();
+		return gaXbase.getXAndExpressionAccess();
 	}
 	
 	public ParserRule getXAndExpressionRule() {
@@ -1900,20 +1959,20 @@ public ParserRule getXAndExpressionRule() {
 	}
 
 	//OpAnd:
-	//	"&&";
+	//	'&&';
 	public XbaseGrammarAccess.OpAndElements getOpAndAccess() {
-		return gaXbaseWithAnnotations.getOpAndAccess();
+		return gaXbase.getOpAndAccess();
 	}
 	
 	public ParserRule getOpAndRule() {
 		return getOpAndAccess().getRule();
 	}
 
-	//XEqualityExpression returns XExpression:
+	//XEqualityExpression XExpression:
 	//	XRelationalExpression (=> ({XBinaryOperation.leftOperand=current} feature=[types::JvmIdentifiableElement|OpEquality])
 	//	rightOperand=XRelationalExpression)*;
 	public XbaseGrammarAccess.XEqualityExpressionElements getXEqualityExpressionAccess() {
-		return gaXbaseWithAnnotations.getXEqualityExpressionAccess();
+		return gaXbase.getXEqualityExpressionAccess();
 	}
 	
 	public ParserRule getXEqualityExpressionRule() {
@@ -1921,21 +1980,21 @@ public ParserRule getXEqualityExpressionRule() {
 	}
 
 	//OpEquality:
-	//	"==" | "!=" | "===" | "!==";
+	//	'==' | '!=' | '===' | '!==';
 	public XbaseGrammarAccess.OpEqualityElements getOpEqualityAccess() {
-		return gaXbaseWithAnnotations.getOpEqualityAccess();
+		return gaXbase.getOpEqualityAccess();
 	}
 	
 	public ParserRule getOpEqualityRule() {
 		return getOpEqualityAccess().getRule();
 	}
 
-	//XRelationalExpression returns XExpression:
-	//	XOtherOperatorExpression (=> ({XInstanceOfExpression.expression=current} "instanceof") type=JvmTypeReference | =>
+	//XRelationalExpression XExpression:
+	//	XOtherOperatorExpression (=> ({XInstanceOfExpression.expression=current} 'instanceof') type=JvmTypeReference | =>
 	//	({XBinaryOperation.leftOperand=current} feature=[types::JvmIdentifiableElement|OpCompare])
 	//	rightOperand=XOtherOperatorExpression)*;
 	public XbaseGrammarAccess.XRelationalExpressionElements getXRelationalExpressionAccess() {
-		return gaXbaseWithAnnotations.getXRelationalExpressionAccess();
+		return gaXbase.getXRelationalExpressionAccess();
 	}
 	
 	public ParserRule getXRelationalExpressionRule() {
@@ -1943,20 +2002,20 @@ public ParserRule getXRelationalExpressionRule() {
 	}
 
 	//OpCompare:
-	//	">=" | "<" "=" | ">" | "<";
+	//	'>=' | '<' '=' | '>' | '<';
 	public XbaseGrammarAccess.OpCompareElements getOpCompareAccess() {
-		return gaXbaseWithAnnotations.getOpCompareAccess();
+		return gaXbase.getOpCompareAccess();
 	}
 	
 	public ParserRule getOpCompareRule() {
 		return getOpCompareAccess().getRule();
 	}
 
-	//XOtherOperatorExpression returns XExpression:
+	//XOtherOperatorExpression XExpression:
 	//	XAdditiveExpression (=> ({XBinaryOperation.leftOperand=current} feature=[types::JvmIdentifiableElement|OpOther])
 	//	rightOperand=XAdditiveExpression)*;
 	public XbaseGrammarAccess.XOtherOperatorExpressionElements getXOtherOperatorExpressionAccess() {
-		return gaXbaseWithAnnotations.getXOtherOperatorExpressionAccess();
+		return gaXbase.getXOtherOperatorExpressionAccess();
 	}
 	
 	public ParserRule getXOtherOperatorExpressionRule() {
@@ -1964,20 +2023,20 @@ public ParserRule getXOtherOperatorExpressionRule() {
 	}
 
 	//OpOther:
-	//	"->" | "..<" | ">" ".." | ".." | "=>" | ">" (=> (">" ">") | ">") | "<" (=> ("<" "<") | "<" | "=>") | "<>" | "?:";
+	//	'->' | '..<' | '>' '..' | '..' | '=>' | '>' (=> ('>' '>') | '>') | '<' (=> ('<' '<') | '<' | '=>') | '<>' | '?:';
 	public XbaseGrammarAccess.OpOtherElements getOpOtherAccess() {
-		return gaXbaseWithAnnotations.getOpOtherAccess();
+		return gaXbase.getOpOtherAccess();
 	}
 	
 	public ParserRule getOpOtherRule() {
 		return getOpOtherAccess().getRule();
 	}
 
-	//XAdditiveExpression returns XExpression:
+	//XAdditiveExpression XExpression:
 	//	XMultiplicativeExpression (=> ({XBinaryOperation.leftOperand=current} feature=[types::JvmIdentifiableElement|OpAdd])
 	//	rightOperand=XMultiplicativeExpression)*;
 	public XbaseGrammarAccess.XAdditiveExpressionElements getXAdditiveExpressionAccess() {
-		return gaXbaseWithAnnotations.getXAdditiveExpressionAccess();
+		return gaXbase.getXAdditiveExpressionAccess();
 	}
 	
 	public ParserRule getXAdditiveExpressionRule() {
@@ -1985,20 +2044,20 @@ public ParserRule getXAdditiveExpressionRule() {
 	}
 
 	//OpAdd:
-	//	"+" | "-";
+	//	'+' | '-';
 	public XbaseGrammarAccess.OpAddElements getOpAddAccess() {
-		return gaXbaseWithAnnotations.getOpAddAccess();
+		return gaXbase.getOpAddAccess();
 	}
 	
 	public ParserRule getOpAddRule() {
 		return getOpAddAccess().getRule();
 	}
 
-	//XMultiplicativeExpression returns XExpression:
+	//XMultiplicativeExpression XExpression:
 	//	XUnaryOperation (=> ({XBinaryOperation.leftOperand=current} feature=[types::JvmIdentifiableElement|OpMulti])
 	//	rightOperand=XUnaryOperation)*;
 	public XbaseGrammarAccess.XMultiplicativeExpressionElements getXMultiplicativeExpressionAccess() {
-		return gaXbaseWithAnnotations.getXMultiplicativeExpressionAccess();
+		return gaXbase.getXMultiplicativeExpressionAccess();
 	}
 	
 	public ParserRule getXMultiplicativeExpressionRule() {
@@ -2006,19 +2065,19 @@ public ParserRule getXMultiplicativeExpressionRule() {
 	}
 
 	//OpMulti:
-	//	"*" | "**" | "/" | "%";
+	//	'*' | '**' | '/' | '%';
 	public XbaseGrammarAccess.OpMultiElements getOpMultiAccess() {
-		return gaXbaseWithAnnotations.getOpMultiAccess();
+		return gaXbase.getOpMultiAccess();
 	}
 	
 	public ParserRule getOpMultiRule() {
 		return getOpMultiAccess().getRule();
 	}
 
-	//XUnaryOperation returns XExpression:
+	//XUnaryOperation XExpression:
 	//	{XUnaryOperation} feature=[types::JvmIdentifiableElement|OpUnary] operand=XUnaryOperation | XCastedExpression;
 	public XbaseGrammarAccess.XUnaryOperationElements getXUnaryOperationAccess() {
-		return gaXbaseWithAnnotations.getXUnaryOperationAccess();
+		return gaXbase.getXUnaryOperationAccess();
 	}
 	
 	public ParserRule getXUnaryOperationRule() {
@@ -2028,27 +2087,27 @@ public ParserRule getXUnaryOperationRule() {
 	//OpUnary:
 	//	"!" | "-" | "+";
 	public XbaseGrammarAccess.OpUnaryElements getOpUnaryAccess() {
-		return gaXbaseWithAnnotations.getOpUnaryAccess();
+		return gaXbase.getOpUnaryAccess();
 	}
 	
 	public ParserRule getOpUnaryRule() {
 		return getOpUnaryAccess().getRule();
 	}
 
-	//XCastedExpression returns XExpression:
-	//	XPostfixOperation (=> ({XCastedExpression.target=current} "as") type=JvmTypeReference)*;
+	//XCastedExpression XExpression:
+	//	XPostfixOperation (=> ({XCastedExpression.target=current} 'as') type=JvmTypeReference)*;
 	public XbaseGrammarAccess.XCastedExpressionElements getXCastedExpressionAccess() {
-		return gaXbaseWithAnnotations.getXCastedExpressionAccess();
+		return gaXbase.getXCastedExpressionAccess();
 	}
 	
 	public ParserRule getXCastedExpressionRule() {
 		return getXCastedExpressionAccess().getRule();
 	}
 
-	//XPostfixOperation returns XExpression:
+	//XPostfixOperation XExpression:
 	//	XMemberFeatureCall => ({XPostfixOperation.operand=current} feature=[types::JvmIdentifiableElement|OpPostfix])?;
 	public XbaseGrammarAccess.XPostfixOperationElements getXPostfixOperationAccess() {
-		return gaXbaseWithAnnotations.getXPostfixOperationAccess();
+		return gaXbase.getXPostfixOperationAccess();
 	}
 	
 	public ParserRule getXPostfixOperationRule() {
@@ -2058,32 +2117,32 @@ public ParserRule getXPostfixOperationRule() {
 	//OpPostfix:
 	//	"++" | "--";
 	public XbaseGrammarAccess.OpPostfixElements getOpPostfixAccess() {
-		return gaXbaseWithAnnotations.getOpPostfixAccess();
+		return gaXbase.getOpPostfixAccess();
 	}
 	
 	public ParserRule getOpPostfixRule() {
 		return getOpPostfixAccess().getRule();
 	}
 
-	//XMemberFeatureCall returns XExpression:
-	//	XPrimaryExpression (=> ({XAssignment.assignable=current} ("." | explicitStatic?="::")
-	//	feature=[types::JvmIdentifiableElement|FeatureCallID] OpSingleAssign) value=XAssignment | =>
-	//	({XMemberFeatureCall.memberCallTarget=current} ("." | nullSafe?="?." | explicitStatic?="::")) ("<"
-	//	typeArguments+=JvmArgumentTypeReference ("," typeArguments+=JvmArgumentTypeReference)* ">")?
-	//	feature=[types::JvmIdentifiableElement|IdOrSuper] (=> explicitOperationCall?="(" (memberCallArguments+=XShortClosure
-	//	| memberCallArguments+=XExpression ("," memberCallArguments+=XExpression)*)? ")")? memberCallArguments+=XClosure?)*;
+	//XMemberFeatureCall XExpression:
+	//	super::XPrimaryExpression (=> ({XAssignment.assignable=current} ('.' | explicitStatic?="::")
+	//	feature=[types::JvmIdentifiableElement|super::FeatureCallID] OpSingleAssign) value=XAssignment | =>
+	//	({XMemberFeatureCall.memberCallTarget=current} ("." | nullSafe?="?." | explicitStatic?="::")) ('<'
+	//	typeArguments+=JvmArgumentTypeReference (',' typeArguments+=JvmArgumentTypeReference)* '>')?
+	//	feature=[types::JvmIdentifiableElement|IdOrSuper] (=> explicitOperationCall?='(' (memberCallArguments+=XShortClosure
+	//	| memberCallArguments+=XExpression (',' memberCallArguments+=XExpression)*)? ')')? memberCallArguments+=XClosure?)*;
 	public XbaseGrammarAccess.XMemberFeatureCallElements getXMemberFeatureCallAccess() {
-		return gaXbaseWithAnnotations.getXMemberFeatureCallAccess();
+		return gaXbase.getXMemberFeatureCallAccess();
 	}
 	
 	public ParserRule getXMemberFeatureCallRule() {
 		return getXMemberFeatureCallAccess().getRule();
 	}
 
-	//XLiteral returns XExpression:
+	//XLiteral XExpression:
 	//	XCollectionLiteral | XClosure | XBooleanLiteral | XNumberLiteral | XNullLiteral | XStringLiteral | XTypeLiteral;
 	public XbaseGrammarAccess.XLiteralElements getXLiteralAccess() {
-		return gaXbaseWithAnnotations.getXLiteralAccess();
+		return gaXbase.getXLiteralAccess();
 	}
 	
 	public ParserRule getXLiteralRule() {
@@ -2093,7 +2152,7 @@ public ParserRule getXLiteralRule() {
 	//XCollectionLiteral:
 	//	XSetLiteral | XListLiteral;
 	public XbaseGrammarAccess.XCollectionLiteralElements getXCollectionLiteralAccess() {
-		return gaXbaseWithAnnotations.getXCollectionLiteralAccess();
+		return gaXbase.getXCollectionLiteralAccess();
 	}
 	
 	public ParserRule getXCollectionLiteralRule() {
@@ -2101,9 +2160,9 @@ public ParserRule getXCollectionLiteralRule() {
 	}
 
 	//XSetLiteral:
-	//	{XSetLiteral} "#" "{" (elements+=XExpression ("," elements+=XExpression)*)? "}";
+	//	{XSetLiteral} '#' '{' (elements+=XExpression (',' elements+=XExpression)*)? '}';
 	public XbaseGrammarAccess.XSetLiteralElements getXSetLiteralAccess() {
-		return gaXbaseWithAnnotations.getXSetLiteralAccess();
+		return gaXbase.getXSetLiteralAccess();
 	}
 	
 	public ParserRule getXSetLiteralRule() {
@@ -2111,73 +2170,73 @@ public ParserRule getXSetLiteralRule() {
 	}
 
 	//XListLiteral:
-	//	{XListLiteral} "#" "[" (elements+=XExpression ("," elements+=XExpression)*)? "]";
+	//	{XListLiteral} '#' '[' (elements+=XExpression (',' elements+=XExpression)*)? ']';
 	public XbaseGrammarAccess.XListLiteralElements getXListLiteralAccess() {
-		return gaXbaseWithAnnotations.getXListLiteralAccess();
+		return gaXbase.getXListLiteralAccess();
 	}
 	
 	public ParserRule getXListLiteralRule() {
 		return getXListLiteralAccess().getRule();
 	}
 
-	//XClosure returns XExpression:
-	//	=> ({XClosure} "[") => ((declaredFormalParameters+=JvmFormalParameter (","
-	//	declaredFormalParameters+=JvmFormalParameter)*)? explicitSyntax?="|")? expression=XExpressionInClosure "]";
+	//XClosure XExpression:
+	//	=> ({XClosure} '[') => ((declaredFormalParameters+=JvmFormalParameter (','
+	//	declaredFormalParameters+=JvmFormalParameter)*)? explicitSyntax?='|')? expression=XExpressionInClosure ']';
 	public XbaseGrammarAccess.XClosureElements getXClosureAccess() {
-		return gaXbaseWithAnnotations.getXClosureAccess();
+		return gaXbase.getXClosureAccess();
 	}
 	
 	public ParserRule getXClosureRule() {
 		return getXClosureAccess().getRule();
 	}
 
-	//XExpressionInClosure returns XExpression:
-	//	{XBlockExpression} (expressions+=XExpressionOrVarDeclaration ";"?)*;
+	//XExpressionInClosure XExpression:
+	//	{XBlockExpression} (expressions+=XExpressionOrVarDeclaration ';'?)*;
 	public XbaseGrammarAccess.XExpressionInClosureElements getXExpressionInClosureAccess() {
-		return gaXbaseWithAnnotations.getXExpressionInClosureAccess();
+		return gaXbase.getXExpressionInClosureAccess();
 	}
 	
 	public ParserRule getXExpressionInClosureRule() {
 		return getXExpressionInClosureAccess().getRule();
 	}
 
-	//XShortClosure returns XExpression:
-	//	=> ({XClosure} (declaredFormalParameters+=JvmFormalParameter ("," declaredFormalParameters+=JvmFormalParameter)*)?
-	//	explicitSyntax?="|") expression=XExpression;
+	//XShortClosure XExpression:
+	//	=> ({XClosure} (declaredFormalParameters+=JvmFormalParameter (',' declaredFormalParameters+=JvmFormalParameter)*)?
+	//	explicitSyntax?='|') expression=XExpression;
 	public XbaseGrammarAccess.XShortClosureElements getXShortClosureAccess() {
-		return gaXbaseWithAnnotations.getXShortClosureAccess();
+		return gaXbase.getXShortClosureAccess();
 	}
 	
 	public ParserRule getXShortClosureRule() {
 		return getXShortClosureAccess().getRule();
 	}
 
-	//XParenthesizedExpression returns XExpression:
-	//	"(" XExpression ")";
+	//XParenthesizedExpression XExpression:
+	//	'(' XExpression ')';
 	public XbaseGrammarAccess.XParenthesizedExpressionElements getXParenthesizedExpressionAccess() {
-		return gaXbaseWithAnnotations.getXParenthesizedExpressionAccess();
+		return gaXbase.getXParenthesizedExpressionAccess();
 	}
 	
 	public ParserRule getXParenthesizedExpressionRule() {
 		return getXParenthesizedExpressionAccess().getRule();
 	}
 
-	//XIfExpression returns XExpression:
-	//	{XIfExpression} "if" "(" if=XExpression ")" then=XExpression ("else" else=XExpression)?;
+	//XIfExpression XExpression:
+	//	{XIfExpression} 'if' '(' if=XExpression ')' then=XExpression (=> 'else' else=XExpression)?;
 	public XbaseGrammarAccess.XIfExpressionElements getXIfExpressionAccess() {
-		return gaXbaseWithAnnotations.getXIfExpressionAccess();
+		return gaXbase.getXIfExpressionAccess();
 	}
 	
 	public ParserRule getXIfExpressionRule() {
 		return getXIfExpressionAccess().getRule();
 	}
 
-	//XSwitchExpression returns XExpression:
-	//	{XSwitchExpression} "switch" (=> ("(" declaredParam=JvmFormalParameter ":") switch=XExpression ")" | =>
-	//	(declaredParam=JvmFormalParameter ":")? switch=XExpression) "{" cases+=XCasePart* ("default" ":"
-	//	default=XExpression)? "}";
+	//XSwitchExpression XExpression:
+	//	{XSwitchExpression} 'switch' (=> ('(' declaredParam=JvmFormalParameter ':') switch=XExpression ')' | =>
+	//	(declaredParam=JvmFormalParameter ':')? switch=XExpression) '{' cases+=XCasePart* ('default' ':'
+	//	default=XExpression)? '}';
 	public XbaseGrammarAccess.XSwitchExpressionElements getXSwitchExpressionAccess() {
-		return gaXbaseWithAnnotations.getXSwitchExpressionAccess();
+		return gaXbase.getXSwitchExpressionAccess();
 	}
 	
 	public ParserRule getXSwitchExpressionRule() {
@@ -2185,115 +2244,115 @@ public ParserRule getXSwitchExpressionRule() {
 	}
 
 	//XCasePart:
-	//	{XCasePart} typeGuard=JvmTypeReference? ("case" case=XExpression)? (":" then=XExpression | fallThrough?=",");
+	//	{XCasePart} typeGuard=JvmTypeReference? ('case' case=XExpression)? (':' then=XExpression | fallThrough?=',');
 	public XbaseGrammarAccess.XCasePartElements getXCasePartAccess() {
-		return gaXbaseWithAnnotations.getXCasePartAccess();
+		return gaXbase.getXCasePartAccess();
 	}
 	
 	public ParserRule getXCasePartRule() {
 		return getXCasePartAccess().getRule();
 	}
 
-	//XForLoopExpression returns XExpression:
-	//	=> ({XForLoopExpression} "for" "(" declaredParam=JvmFormalParameter ":") forExpression=XExpression ")"
+	//XForLoopExpression XExpression:
+	//	=> ({XForLoopExpression} 'for' '(' declaredParam=JvmFormalParameter ':') forExpression=XExpression ')'
 	//	eachExpression=XExpression;
 	public XbaseGrammarAccess.XForLoopExpressionElements getXForLoopExpressionAccess() {
-		return gaXbaseWithAnnotations.getXForLoopExpressionAccess();
+		return gaXbase.getXForLoopExpressionAccess();
 	}
 	
 	public ParserRule getXForLoopExpressionRule() {
 		return getXForLoopExpressionAccess().getRule();
 	}
 
-	//XBasicForLoopExpression returns XExpression:
-	//	{XBasicForLoopExpression} "for" "(" (initExpressions+=XExpressionOrVarDeclaration (","
-	//	initExpressions+=XExpressionOrVarDeclaration)*)? ";" expression=XExpression? ";" (updateExpressions+=XExpression (","
-	//	updateExpressions+=XExpression)*)? ")" eachExpression=XExpression;
+	//XBasicForLoopExpression XExpression:
+	//	{XBasicForLoopExpression} 'for' '(' (initExpressions+=XExpressionOrVarDeclaration (','
+	//	initExpressions+=XExpressionOrVarDeclaration)*)? ';' expression=XExpression? ';' (updateExpressions+=XExpression (','
+	//	updateExpressions+=XExpression)*)? ')' eachExpression=XExpression;
 	public XbaseGrammarAccess.XBasicForLoopExpressionElements getXBasicForLoopExpressionAccess() {
-		return gaXbaseWithAnnotations.getXBasicForLoopExpressionAccess();
+		return gaXbase.getXBasicForLoopExpressionAccess();
 	}
 	
 	public ParserRule getXBasicForLoopExpressionRule() {
 		return getXBasicForLoopExpressionAccess().getRule();
 	}
 
-	//XWhileExpression returns XExpression:
-	//	{XWhileExpression} "while" "(" predicate=XExpression ")" body=XExpression;
+	//XWhileExpression XExpression:
+	//	{XWhileExpression} 'while' '(' predicate=XExpression ')' body=XExpression;
 	public XbaseGrammarAccess.XWhileExpressionElements getXWhileExpressionAccess() {
-		return gaXbaseWithAnnotations.getXWhileExpressionAccess();
+		return gaXbase.getXWhileExpressionAccess();
 	}
 	
 	public ParserRule getXWhileExpressionRule() {
 		return getXWhileExpressionAccess().getRule();
 	}
 
-	//XDoWhileExpression returns XExpression:
-	//	{XDoWhileExpression} "do" body=XExpression "while" "(" predicate=XExpression ")";
+	//XDoWhileExpression XExpression:
+	//	{XDoWhileExpression} 'do' body=XExpression 'while' '(' predicate=XExpression ')';
 	public XbaseGrammarAccess.XDoWhileExpressionElements getXDoWhileExpressionAccess() {
-		return gaXbaseWithAnnotations.getXDoWhileExpressionAccess();
+		return gaXbase.getXDoWhileExpressionAccess();
 	}
 	
 	public ParserRule getXDoWhileExpressionRule() {
 		return getXDoWhileExpressionAccess().getRule();
 	}
 
-	//XBlockExpression returns XExpression:
-	//	{XBlockExpression} "{" (expressions+=XExpressionOrVarDeclaration ";"?)* "}";
+	//XBlockExpression XExpression:
+	//	{XBlockExpression} '{' (expressions+=XExpressionOrVarDeclaration ';'?)* '}';
 	public XbaseGrammarAccess.XBlockExpressionElements getXBlockExpressionAccess() {
-		return gaXbaseWithAnnotations.getXBlockExpressionAccess();
+		return gaXbase.getXBlockExpressionAccess();
 	}
 	
 	public ParserRule getXBlockExpressionRule() {
 		return getXBlockExpressionAccess().getRule();
 	}
 
-	//XExpressionOrVarDeclaration returns XExpression:
+	//XExpressionOrVarDeclaration XExpression:
 	//	XVariableDeclaration | XExpression;
 	public XbaseGrammarAccess.XExpressionOrVarDeclarationElements getXExpressionOrVarDeclarationAccess() {
-		return gaXbaseWithAnnotations.getXExpressionOrVarDeclarationAccess();
+		return gaXbase.getXExpressionOrVarDeclarationAccess();
 	}
 	
 	public ParserRule getXExpressionOrVarDeclarationRule() {
 		return getXExpressionOrVarDeclarationAccess().getRule();
 	}
 
-	//XVariableDeclaration returns XExpression:
-	//	{XVariableDeclaration} (writeable?="var" | "val") (=> (type=JvmTypeReference name=ValidID) | name=ValidID) ("="
+	//XVariableDeclaration XExpression:
+	//	{XVariableDeclaration} (writeable?='var' | 'val') (=> (type=JvmTypeReference name=ValidID) | name=ValidID) ('='
 	//	right=XExpression)?;
 	public XbaseGrammarAccess.XVariableDeclarationElements getXVariableDeclarationAccess() {
-		return gaXbaseWithAnnotations.getXVariableDeclarationAccess();
+		return gaXbase.getXVariableDeclarationAccess();
 	}
 	
 	public ParserRule getXVariableDeclarationRule() {
 		return getXVariableDeclarationAccess().getRule();
 	}
 
-	//JvmFormalParameter returns types::JvmFormalParameter:
+	//JvmFormalParameter types::JvmFormalParameter:
 	//	parameterType=JvmTypeReference? name=ValidID;
 	public XbaseGrammarAccess.JvmFormalParameterElements getJvmFormalParameterAccess() {
-		return gaXbaseWithAnnotations.getJvmFormalParameterAccess();
+		return gaXbase.getJvmFormalParameterAccess();
 	}
 	
 	public ParserRule getJvmFormalParameterRule() {
 		return getJvmFormalParameterAccess().getRule();
 	}
 
-	//FullJvmFormalParameter returns types::JvmFormalParameter:
+	//FullJvmFormalParameter types::JvmFormalParameter:
 	//	parameterType=JvmTypeReference name=ValidID;
 	public XbaseGrammarAccess.FullJvmFormalParameterElements getFullJvmFormalParameterAccess() {
-		return gaXbaseWithAnnotations.getFullJvmFormalParameterAccess();
+		return gaXbase.getFullJvmFormalParameterAccess();
 	}
 	
 	public ParserRule getFullJvmFormalParameterRule() {
 		return getFullJvmFormalParameterAccess().getRule();
 	}
 
-	//XFeatureCall returns XExpression:
-	//	{XFeatureCall} ("<" typeArguments+=JvmArgumentTypeReference ("," typeArguments+=JvmArgumentTypeReference)* ">")?
-	//	feature=[types::JvmIdentifiableElement|IdOrSuper] (=> explicitOperationCall?="(" (featureCallArguments+=XShortClosure
-	//	| featureCallArguments+=XExpression ("," featureCallArguments+=XExpression)*)? ")")? featureCallArguments+=XClosure?;
+	//XFeatureCall XExpression:
+	//	{XFeatureCall} ('<' typeArguments+=JvmArgumentTypeReference (',' typeArguments+=JvmArgumentTypeReference)* '>')?
+	//	feature=[types::JvmIdentifiableElement|IdOrSuper] (=> explicitOperationCall?='(' (featureCallArguments+=XShortClosure
+	//	| featureCallArguments+=XExpression (',' featureCallArguments+=XExpression)*)? ')')? featureCallArguments+=XClosure?;
 	public XbaseGrammarAccess.XFeatureCallElements getXFeatureCallAccess() {
-		return gaXbaseWithAnnotations.getXFeatureCallAccess();
+		return gaXbase.getXFeatureCallAccess();
 	}
 	
 	public ParserRule getXFeatureCallRule() {
@@ -2301,113 +2360,113 @@ public ParserRule getXFeatureCallRule() {
 	}
 
 	//IdOrSuper:
-	//	FeatureCallID | "super";
+	//	super::FeatureCallID | 'super';
 	public XbaseGrammarAccess.IdOrSuperElements getIdOrSuperAccess() {
-		return gaXbaseWithAnnotations.getIdOrSuperAccess();
+		return gaXbase.getIdOrSuperAccess();
 	}
 	
 	public ParserRule getIdOrSuperRule() {
 		return getIdOrSuperAccess().getRule();
 	}
 
-	//XConstructorCall returns XExpression:
-	//	{XConstructorCall} "new" constructor=[types::JvmConstructor|QualifiedName] ("<"
-	//	typeArguments+=JvmArgumentTypeReference ("," typeArguments+=JvmArgumentTypeReference)* ">")? (=>
-	//	explicitConstructorCall?="(" (arguments+=XShortClosure | arguments+=XExpression ("," arguments+=XExpression)*)? ")")?
+	//XConstructorCall XExpression:
+	//	{XConstructorCall} 'new' constructor=[types::JvmConstructor|QualifiedName] (=> '<'
+	//	typeArguments+=JvmArgumentTypeReference (',' typeArguments+=JvmArgumentTypeReference)* '>')? (=>
+	//	explicitConstructorCall?='(' (arguments+=XShortClosure | arguments+=XExpression (',' arguments+=XExpression)*)? ')')?
 	//	arguments+=XClosure?;
 	public XbaseGrammarAccess.XConstructorCallElements getXConstructorCallAccess() {
-		return gaXbaseWithAnnotations.getXConstructorCallAccess();
+		return gaXbase.getXConstructorCallAccess();
 	}
 	
 	public ParserRule getXConstructorCallRule() {
 		return getXConstructorCallAccess().getRule();
 	}
 
-	//XBooleanLiteral returns XExpression:
-	//	{XBooleanLiteral} ("false" | isTrue?="true");
+	//XBooleanLiteral XExpression:
+	//	{XBooleanLiteral} ('false' | isTrue?='true');
 	public XbaseGrammarAccess.XBooleanLiteralElements getXBooleanLiteralAccess() {
-		return gaXbaseWithAnnotations.getXBooleanLiteralAccess();
+		return gaXbase.getXBooleanLiteralAccess();
 	}
 	
 	public ParserRule getXBooleanLiteralRule() {
 		return getXBooleanLiteralAccess().getRule();
 	}
 
-	//XNullLiteral returns XExpression:
-	//	{XNullLiteral} "null";
+	//XNullLiteral XExpression:
+	//	{XNullLiteral} 'null';
 	public XbaseGrammarAccess.XNullLiteralElements getXNullLiteralAccess() {
-		return gaXbaseWithAnnotations.getXNullLiteralAccess();
+		return gaXbase.getXNullLiteralAccess();
 	}
 	
 	public ParserRule getXNullLiteralRule() {
 		return getXNullLiteralAccess().getRule();
 	}
 
-	//XNumberLiteral returns XExpression:
+	//XNumberLiteral XExpression:
 	//	{XNumberLiteral} value=Number;
 	public XbaseGrammarAccess.XNumberLiteralElements getXNumberLiteralAccess() {
-		return gaXbaseWithAnnotations.getXNumberLiteralAccess();
+		return gaXbase.getXNumberLiteralAccess();
 	}
 	
 	public ParserRule getXNumberLiteralRule() {
 		return getXNumberLiteralAccess().getRule();
 	}
 
-	//XStringLiteral returns XExpression:
+	//XStringLiteral XExpression:
 	//	{XStringLiteral} value=STRING;
 	public XbaseGrammarAccess.XStringLiteralElements getXStringLiteralAccess() {
-		return gaXbaseWithAnnotations.getXStringLiteralAccess();
+		return gaXbase.getXStringLiteralAccess();
 	}
 	
 	public ParserRule getXStringLiteralRule() {
 		return getXStringLiteralAccess().getRule();
 	}
 
-	//XTypeLiteral returns XExpression:
-	//	{XTypeLiteral} "typeof" "(" type=[types::JvmType|QualifiedName] arrayDimensions+=ArrayBrackets* ")";
+	//XTypeLiteral XExpression:
+	//	{XTypeLiteral} 'typeof' '(' type=[types::JvmType|QualifiedName] arrayDimensions+=ArrayBrackets* ')';
 	public XbaseGrammarAccess.XTypeLiteralElements getXTypeLiteralAccess() {
-		return gaXbaseWithAnnotations.getXTypeLiteralAccess();
+		return gaXbase.getXTypeLiteralAccess();
 	}
 	
 	public ParserRule getXTypeLiteralRule() {
 		return getXTypeLiteralAccess().getRule();
 	}
 
-	//XThrowExpression returns XExpression:
-	//	{XThrowExpression} "throw" expression=XExpression;
+	//XThrowExpression XExpression:
+	//	{XThrowExpression} 'throw' expression=XExpression;
 	public XbaseGrammarAccess.XThrowExpressionElements getXThrowExpressionAccess() {
-		return gaXbaseWithAnnotations.getXThrowExpressionAccess();
+		return gaXbase.getXThrowExpressionAccess();
 	}
 	
 	public ParserRule getXThrowExpressionRule() {
 		return getXThrowExpressionAccess().getRule();
 	}
 
-	//XReturnExpression returns XExpression:
-	//	{XReturnExpression} "return" -> expression=XExpression?;
+	//XReturnExpression XExpression:
+	//	{XReturnExpression} 'return' -> expression=XExpression?;
 	public XbaseGrammarAccess.XReturnExpressionElements getXReturnExpressionAccess() {
-		return gaXbaseWithAnnotations.getXReturnExpressionAccess();
+		return gaXbase.getXReturnExpressionAccess();
 	}
 	
 	public ParserRule getXReturnExpressionRule() {
 		return getXReturnExpressionAccess().getRule();
 	}
 
-	//XTryCatchFinallyExpression returns XExpression:
-	//	{XTryCatchFinallyExpression} "try" expression=XExpression (catchClauses+=XCatchClause+ ("finally"
-	//	finallyExpression=XExpression)? | "finally" finallyExpression=XExpression);
+	//XTryCatchFinallyExpression XExpression:
+	//	{XTryCatchFinallyExpression} 'try' expression=XExpression (catchClauses+=XCatchClause+ (=> 'finally'
+	//	finallyExpression=XExpression)? | 'finally' finallyExpression=XExpression);
 	public XbaseGrammarAccess.XTryCatchFinallyExpressionElements getXTryCatchFinallyExpressionAccess() {
-		return gaXbaseWithAnnotations.getXTryCatchFinallyExpressionAccess();
+		return gaXbase.getXTryCatchFinallyExpressionAccess();
 	}
 	
 	public ParserRule getXTryCatchFinallyExpressionRule() {
 		return getXTryCatchFinallyExpressionAccess().getRule();
 	}
 
-	//XSynchronizedExpression returns XExpression:
-	//	=> ({XSynchronizedExpression} "synchronized" "(") param=XExpression ")" expression=XExpression;
+	//XSynchronizedExpression XExpression:
+	//	=> ({XSynchronizedExpression} 'synchronized' '(') param=XExpression ')' expression=XExpression;
 	public XbaseGrammarAccess.XSynchronizedExpressionElements getXSynchronizedExpressionAccess() {
-		return gaXbaseWithAnnotations.getXSynchronizedExpressionAccess();
+		return gaXbase.getXSynchronizedExpressionAccess();
 	}
 	
 	public ParserRule getXSynchronizedExpressionRule() {
@@ -2415,19 +2474,20 @@ public ParserRule getXSynchronizedExpressionRule() {
 	}
 
 	//XCatchClause:
-	//	"catch" "(" declaredParam=FullJvmFormalParameter ")" expression=XExpression;
+	//	=> 'catch' '(' declaredParam=FullJvmFormalParameter ')' expression=XExpression;
 	public XbaseGrammarAccess.XCatchClauseElements getXCatchClauseAccess() {
-		return gaXbaseWithAnnotations.getXCatchClauseAccess();
+		return gaXbase.getXCatchClauseAccess();
 	}
 	
 	public ParserRule getXCatchClauseRule() {
 		return getXCatchClauseAccess().getRule();
 	}
 
+	//@Override
 	//QualifiedName:
-	//	ValidID ("." ValidID)*;
+	//	ValidID (=> '.' ValidID)*;
 	public XbaseGrammarAccess.QualifiedNameElements getQualifiedNameAccess() {
-		return gaXbaseWithAnnotations.getQualifiedNameAccess();
+		return gaXbase.getQualifiedNameAccess();
 	}
 	
 	public ParserRule getQualifiedNameRule() {
@@ -2435,52 +2495,52 @@ public ParserRule getQualifiedNameRule() {
 	}
 
 	//Number hidden():
-	//	HEX | (INT | DECIMAL) ("." (INT | DECIMAL))?;
+	//	HEX | (INT | DECIMAL) ('.' (INT | DECIMAL))?;
 	public XbaseGrammarAccess.NumberElements getNumberAccess() {
-		return gaXbaseWithAnnotations.getNumberAccess();
+		return gaXbase.getNumberAccess();
 	}
 	
 	public ParserRule getNumberRule() {
 		return getNumberAccess().getRule();
 	}
 
-	/// **
-	// * Dummy rule, for "better" downwards compatibility, since GrammarAccess generates non-static inner classes, 
+	///**
+	// * Dummy rule, for "better" downwards compatibility, since GrammarAccess generates non-static inner classes,
 	// * which makes downstream grammars break on classloading, when a rule is removed.
-	// * /
+	// */
 	//StaticQualifier:
-	//	(ValidID "::")+;
+	//	(ValidID '::')+;
 	public XbaseGrammarAccess.StaticQualifierElements getStaticQualifierAccess() {
-		return gaXbaseWithAnnotations.getStaticQualifierAccess();
+		return gaXbase.getStaticQualifierAccess();
 	}
 	
 	public ParserRule getStaticQualifierRule() {
 		return getStaticQualifierAccess().getRule();
 	}
 
-	//terminal HEX returns ecore::EString:
-	//	("0x" | "0X") ("0".."9" | "a".."f" | "A".."F" | "_")+ ("#" (("b" | "B") ("i" | "I") | ("l" | "L")))?;
+	//terminal HEX:
+	//	('0x' | '0X') ('0'..'9' | 'a'..'f' | 'A'..'F' | '_')+ ('#' (('b' | 'B') ('i' | 'I') | ('l' | 'L')))?;
 	public TerminalRule getHEXRule() {
-		return gaXbaseWithAnnotations.getHEXRule();
+		return gaXbase.getHEXRule();
 	} 
 
 	//terminal INT returns ecore::EInt:
-	//	"0".."9" ("0".."9" | "_")*;
+	//	'0'..'9' ('0'..'9' | '_')*;
 	public TerminalRule getINTRule() {
-		return gaXbaseWithAnnotations.getINTRule();
+		return gaXbase.getINTRule();
 	} 
 
-	//terminal DECIMAL returns ecore::EString:
-	//	INT (("e" | "E") ("+" | "-")? INT)? (("b" | "B") ("i" | "I" | "d" | "D") | ("l" | "L" | "d" | "D" | "f" | "F"))?;
+	//terminal DECIMAL:
+	//	INT (('e' | 'E') ('+' | '-')? INT)? (('b' | 'B') ('i' | 'I' | 'd' | 'D') | ('l' | 'L' | 'd' | 'D' | 'f' | 'F'))?;
 	public TerminalRule getDECIMALRule() {
-		return gaXbaseWithAnnotations.getDECIMALRule();
+		return gaXbase.getDECIMALRule();
 	} 
 
 	//JvmTypeReference:
 	//	JvmParameterizedTypeReference => ({JvmGenericArrayTypeReference.componentType=current} ArrayBrackets)* |
 	//	XFunctionTypeRef;
 	public XtypeGrammarAccess.JvmTypeReferenceElements getJvmTypeReferenceAccess() {
-		return gaXbaseWithAnnotations.getJvmTypeReferenceAccess();
+		return gaXtype.getJvmTypeReferenceAccess();
 	}
 	
 	public ParserRule getJvmTypeReferenceRule() {
@@ -2488,9 +2548,9 @@ public ParserRule getJvmTypeReferenceRule() {
 	}
 
 	//ArrayBrackets:
-	//	"[" "]";
+	//	'[' ']';
 	public XtypeGrammarAccess.ArrayBracketsElements getArrayBracketsAccess() {
-		return gaXbaseWithAnnotations.getArrayBracketsAccess();
+		return gaXtype.getArrayBracketsAccess();
 	}
 	
 	public ParserRule getArrayBracketsRule() {
@@ -2498,9 +2558,9 @@ public ParserRule getArrayBracketsRule() {
 	}
 
 	//XFunctionTypeRef:
-	//	("(" (paramTypes+=JvmTypeReference ("," paramTypes+=JvmTypeReference)*)? ")")? "=>" returnType=JvmTypeReference;
+	//	('(' (paramTypes+=JvmTypeReference (',' paramTypes+=JvmTypeReference)*)? ')')? '=>' returnType=JvmTypeReference;
 	public XtypeGrammarAccess.XFunctionTypeRefElements getXFunctionTypeRefAccess() {
-		return gaXbaseWithAnnotations.getXFunctionTypeRefAccess();
+		return gaXtype.getXFunctionTypeRefAccess();
 	}
 	
 	public ParserRule getXFunctionTypeRefRule() {
@@ -2508,21 +2568,21 @@ public ParserRule getXFunctionTypeRefRule() {
 	}
 
 	//JvmParameterizedTypeReference:
-	//	type=[JvmType|QualifiedName] ("<" arguments+=JvmArgumentTypeReference ("," arguments+=JvmArgumentTypeReference)* ">"
-	//	(=> ({JvmInnerTypeReference.outer=current} ".") type=[JvmType|ValidID] ("<" arguments+=JvmArgumentTypeReference (","
-	//	arguments+=JvmArgumentTypeReference)* ">")?)*)?;
+	//	type=[JvmType|super::QualifiedName] (=> '<' arguments+=JvmArgumentTypeReference (','
+	//	arguments+=JvmArgumentTypeReference)* '>' (=> ({JvmInnerTypeReference.outer=current} '.') type=[JvmType|ValidID] (=>
+	//	'<' arguments+=JvmArgumentTypeReference (',' arguments+=JvmArgumentTypeReference)* '>')?)*)?;
 	public XtypeGrammarAccess.JvmParameterizedTypeReferenceElements getJvmParameterizedTypeReferenceAccess() {
-		return gaXbaseWithAnnotations.getJvmParameterizedTypeReferenceAccess();
+		return gaXtype.getJvmParameterizedTypeReferenceAccess();
 	}
 	
 	public ParserRule getJvmParameterizedTypeReferenceRule() {
 		return getJvmParameterizedTypeReferenceAccess().getRule();
 	}
 
-	//JvmArgumentTypeReference returns JvmTypeReference:
+	//JvmArgumentTypeReference JvmTypeReference:
 	//	JvmTypeReference | JvmWildcardTypeReference;
 	public XtypeGrammarAccess.JvmArgumentTypeReferenceElements getJvmArgumentTypeReferenceAccess() {
-		return gaXbaseWithAnnotations.getJvmArgumentTypeReferenceAccess();
+		return gaXtype.getJvmArgumentTypeReferenceAccess();
 	}
 	
 	public ParserRule getJvmArgumentTypeReferenceRule() {
@@ -2530,10 +2590,10 @@ public ParserRule getJvmArgumentTypeReferenceRule() {
 	}
 
 	//JvmWildcardTypeReference:
-	//	{JvmWildcardTypeReference} "?" (constraints+=JvmUpperBound constraints+=JvmUpperBoundAnded* |
+	//	{JvmWildcardTypeReference} '?' (constraints+=JvmUpperBound constraints+=JvmUpperBoundAnded* |
 	//	constraints+=JvmLowerBound constraints+=JvmLowerBoundAnded*)?;
 	public XtypeGrammarAccess.JvmWildcardTypeReferenceElements getJvmWildcardTypeReferenceAccess() {
-		return gaXbaseWithAnnotations.getJvmWildcardTypeReferenceAccess();
+		return gaXtype.getJvmWildcardTypeReferenceAccess();
 	}
 	
 	public ParserRule getJvmWildcardTypeReferenceRule() {
@@ -2541,19 +2601,19 @@ public ParserRule getJvmWildcardTypeReferenceRule() {
 	}
 
 	//JvmUpperBound:
-	//	"extends" typeReference=JvmTypeReference;
+	//	'extends' typeReference=JvmTypeReference;
 	public XtypeGrammarAccess.JvmUpperBoundElements getJvmUpperBoundAccess() {
-		return gaXbaseWithAnnotations.getJvmUpperBoundAccess();
+		return gaXtype.getJvmUpperBoundAccess();
 	}
 	
 	public ParserRule getJvmUpperBoundRule() {
 		return getJvmUpperBoundAccess().getRule();
 	}
 
-	//JvmUpperBoundAnded returns JvmUpperBound:
-	//	"&" typeReference=JvmTypeReference;
+	//JvmUpperBoundAnded JvmUpperBound:
+	//	'&' typeReference=JvmTypeReference;
 	public XtypeGrammarAccess.JvmUpperBoundAndedElements getJvmUpperBoundAndedAccess() {
-		return gaXbaseWithAnnotations.getJvmUpperBoundAndedAccess();
+		return gaXtype.getJvmUpperBoundAndedAccess();
 	}
 	
 	public ParserRule getJvmUpperBoundAndedRule() {
@@ -2561,19 +2621,19 @@ public ParserRule getJvmUpperBoundAndedRule() {
 	}
 
 	//JvmLowerBound:
-	//	"super" typeReference=JvmTypeReference;
+	//	'super' typeReference=JvmTypeReference;
 	public XtypeGrammarAccess.JvmLowerBoundElements getJvmLowerBoundAccess() {
-		return gaXbaseWithAnnotations.getJvmLowerBoundAccess();
+		return gaXtype.getJvmLowerBoundAccess();
 	}
 	
 	public ParserRule getJvmLowerBoundRule() {
 		return getJvmLowerBoundAccess().getRule();
 	}
 
-	//JvmLowerBoundAnded returns JvmLowerBound:
-	//	"&" typeReference=JvmTypeReference;
+	//JvmLowerBoundAnded JvmLowerBound:
+	//	'&' typeReference=JvmTypeReference;
 	public XtypeGrammarAccess.JvmLowerBoundAndedElements getJvmLowerBoundAndedAccess() {
-		return gaXbaseWithAnnotations.getJvmLowerBoundAndedAccess();
+		return gaXtype.getJvmLowerBoundAndedAccess();
 	}
 	
 	public ParserRule getJvmLowerBoundAndedRule() {
@@ -2583,7 +2643,7 @@ public ParserRule getJvmLowerBoundAndedRule() {
 	//JvmTypeParameter:
 	//	name=ValidID (constraints+=JvmUpperBound constraints+=JvmUpperBoundAnded*)?;
 	public XtypeGrammarAccess.JvmTypeParameterElements getJvmTypeParameterAccess() {
-		return gaXbaseWithAnnotations.getJvmTypeParameterAccess();
+		return gaXtype.getJvmTypeParameterAccess();
 	}
 	
 	public ParserRule getJvmTypeParameterRule() {
@@ -2591,9 +2651,9 @@ public ParserRule getJvmTypeParameterRule() {
 	}
 
 	//QualifiedNameWithWildcard:
-	//	QualifiedName "." "*";
+	//	super::QualifiedName '.' '*';
 	public XtypeGrammarAccess.QualifiedNameWithWildcardElements getQualifiedNameWithWildcardAccess() {
-		return gaXbaseWithAnnotations.getQualifiedNameWithWildcardAccess();
+		return gaXtype.getQualifiedNameWithWildcardAccess();
 	}
 	
 	public ParserRule getQualifiedNameWithWildcardRule() {
@@ -2603,7 +2663,7 @@ public ParserRule getQualifiedNameWithWildcardRule() {
 	//ValidID:
 	//	ID;
 	public XtypeGrammarAccess.ValidIDElements getValidIDAccess() {
-		return gaXbaseWithAnnotations.getValidIDAccess();
+		return gaXtype.getValidIDAccess();
 	}
 	
 	public ParserRule getValidIDRule() {
@@ -2611,49 +2671,48 @@ public ParserRule getValidIDRule() {
 	}
 
 	//QualifiedNameInStaticImport:
-	//	(ValidID ".")+;
+	//	(ValidID '.')+;
 	public XtypeGrammarAccess.QualifiedNameInStaticImportElements getQualifiedNameInStaticImportAccess() {
-		return gaXbaseWithAnnotations.getQualifiedNameInStaticImportAccess();
+		return gaXtype.getQualifiedNameInStaticImportAccess();
 	}
 	
 	public ParserRule getQualifiedNameInStaticImportRule() {
 		return getQualifiedNameInStaticImportAccess().getRule();
 	}
 
-	//terminal ID returns ecore::EString:
-	//	"^"? ("a".."z" | "A".."Z" | "$" | "_") ("a".."z" | "A".."Z" | "$" | "_" | "0".."9")*;
+	//terminal ID:
+	//	'^'? ('a'..'z' | 'A'..'Z' | '$' | '_') ('a'..'z' | 'A'..'Z' | '$' | '_' | '0'..'9')*;
 	public TerminalRule getIDRule() {
-		return gaXbaseWithAnnotations.getIDRule();
+		return gaXtype.getIDRule();
 	} 
 
-	//terminal STRING returns ecore::EString:
-	//	"\"" ("\\" . / * ('b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\') * / | !("\\" | "\""))* "\""? | "\'" ("\\" .
-	//	/ * ('b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\') * / | !("\\" | "\'"))* "\'"?;
+	//terminal STRING:
+	//	'"' ('\\' . | !('\\' | '"'))* '"'? | "'" ('\\' . | !('\\' | "'"))* "'"?;
 	public TerminalRule getSTRINGRule() {
-		return gaXbaseWithAnnotations.getSTRINGRule();
+		return gaXtype.getSTRINGRule();
 	} 
 
-	//terminal ML_COMMENT returns ecore::EString:
-	//	"/ *"->"* /";
+	//terminal ML_COMMENT:
+	//	'/*'->'*/';
 	public TerminalRule getML_COMMENTRule() {
-		return gaXbaseWithAnnotations.getML_COMMENTRule();
+		return gaXtype.getML_COMMENTRule();
 	} 
 
-	//terminal SL_COMMENT returns ecore::EString:
-	//	"//" !("\n" | "\r")* ("\r"? "\n")?;
+	//terminal SL_COMMENT:
+	//	'//' !('\n' | '\r')* ('\r'? '\n')?;
 	public TerminalRule getSL_COMMENTRule() {
-		return gaXbaseWithAnnotations.getSL_COMMENTRule();
+		return gaXtype.getSL_COMMENTRule();
 	} 
 
-	//terminal WS returns ecore::EString:
-	//	(" " | "\t" | "\r" | "\n")+;
+	//terminal WS:
+	//	' ' | '\t' | '\r' | '\n'+;
 	public TerminalRule getWSRule() {
-		return gaXbaseWithAnnotations.getWSRule();
+		return gaXtype.getWSRule();
 	} 
 
-	//terminal ANY_OTHER returns ecore::EString:
+	//terminal ANY_OTHER:
 	//	.;
 	public TerminalRule getANY_OTHERRule() {
-		return gaXbaseWithAnnotations.getANY_OTHERRule();
+		return gaXtype.getANY_OTHERRule();
 	} 
 }
diff --git a/com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF
index e2d992c2c..5fc7e003b 100644
--- a/com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF
@@ -8,7 +8,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit,
  com.avaloq.tools.ddk.check.ui,
  com.avaloq.tools.ddk.xtext.test.core,
- com.avaloq.tools.ddk.check.ui,
  com.avaloq.tools.ddk.test.core,
  com.avaloq.tools.ddk.test.ui,
  com.avaloq.tools.ddk.check.core.test,
@@ -18,9 +17,17 @@ Require-Bundle: org.junit,
  org.eclipse.xtext.common.types.ui,
  org.eclipse.jdt.core,
  org.eclipse.ui.ide,
- com.avaloq.tools.ddk.xtext.test.core,
- org.apache.log4j
+ org.apache.log4j,
+ org.eclipse.xtext.junit4,
+ org.eclipse.xtext.xbase.lib,
+ org.eclipse.core.runtime,
+ org.eclipse.ui.workbench;resolution:=optional,
+ org.objectweb.asm;bundle-version="[6.1.1,6.2.0)";resolution:=optional
 Export-Package: com.avaloq.tools.ddk.check.ui.test,
  com.avaloq.tools.ddk.check.ui.test.util
 Import-Package: org.junit.runner;version="4.5.0",
- org.junit.runners;version="4.5.0"
+ org.junit.runners;version="4.5.0",
+ org.junit.runner.manipulation;version="4.5.0",
+ org.junit.runner.notification;version="4.5.0",
+ org.junit.runners.model;version="4.5.0",
+ org.hamcrest.core
diff --git a/com.avaloq.tools.ddk.check.ui.test/src-gen/com/avaloq/tools/ddk/check/CheckInjectorProvider.java b/com.avaloq.tools.ddk.check.ui.test/src-gen/com/avaloq/tools/ddk/check/CheckInjectorProvider.java
index f7723ce5b..6710c027a 100644
--- a/com.avaloq.tools.ddk.check.ui.test/src-gen/com/avaloq/tools/ddk/check/CheckInjectorProvider.java
+++ b/com.avaloq.tools.ddk.check.ui.test/src-gen/com/avaloq/tools/ddk/check/CheckInjectorProvider.java
@@ -3,16 +3,16 @@
  */
 package com.avaloq.tools.ddk.check;
 
+import com.google.inject.Guice;
+import com.google.inject.Injector;
 import org.eclipse.xtext.junit4.GlobalRegistries;
 import org.eclipse.xtext.junit4.GlobalRegistries.GlobalStateMemento;
 import org.eclipse.xtext.junit4.IInjectorProvider;
 import org.eclipse.xtext.junit4.IRegistryConfigurator;
 
-import com.google.inject.Injector;
-
 public class CheckInjectorProvider implements IInjectorProvider, IRegistryConfigurator {
-	
-    protected GlobalStateMemento stateBeforeInjectorCreation;
+
+	protected GlobalStateMemento stateBeforeInjectorCreation;
 	protected GlobalStateMemento stateAfterInjectorCreation;
 	protected Injector injector;
 
@@ -30,9 +30,26 @@ public Injector getInjector()
 		}
 		return injector;
 	}
-	
+
 	protected Injector internalCreateInjector() {
-	    return new CheckStandaloneSetup().createInjectorAndDoEMFRegistration();
+		return new CheckStandaloneSetup() {
+			@Override
+			public Injector createInjector() {
+				return Guice.createInjector(createRuntimeModule());
+			}
+		}.createInjectorAndDoEMFRegistration();
+	}
+
+	protected CheckRuntimeModule createRuntimeModule() {
+		// make it work also with Maven/Tycho and OSGI
+		// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=493672
+		return new CheckRuntimeModule() {
+			@Override
+			public ClassLoader bindClassLoaderToInstance() {
+				return CheckInjectorProvider.class
+						.getClassLoader();
+			}
+		};
 	}
 
 	@Override
diff --git a/com.avaloq.tools.ddk.check.ui.test/src-gen/com/avaloq/tools/ddk/check/CheckUiInjectorProvider.java b/com.avaloq.tools.ddk.check.ui.test/src-gen/com/avaloq/tools/ddk/check/CheckUiInjectorProvider.java
index 60398c2e1..67cbce916 100644
--- a/com.avaloq.tools.ddk.check.ui.test/src-gen/com/avaloq/tools/ddk/check/CheckUiInjectorProvider.java
+++ b/com.avaloq.tools.ddk.check.ui.test/src-gen/com/avaloq/tools/ddk/check/CheckUiInjectorProvider.java
@@ -8,10 +8,10 @@
 import com.google.inject.Injector;
 
 public class CheckUiInjectorProvider implements IInjectorProvider {
-	
+
 	@Override
 	public Injector getInjector() {
 		return com.avaloq.tools.ddk.check.ui.internal.CheckActivator.getInstance().getInjector("com.avaloq.tools.ddk.check.Check");
 	}
-	
+
 }
diff --git a/com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF
index 116678dcf..7b11de526 100644
--- a/com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF
@@ -38,5 +38,6 @@ Export-Package: com.avaloq.tools.ddk.check.ui;x-friends:="com.avaloq.tools.ddk.c
  com.avaloq.tools.ddk.check.ui.internal;x-friends:="com.avaloq.tools.ddk.check.ui.test",
  com.avaloq.tools.ddk.check.ui.util,
  com.avaloq.tools.ddk.check.ui.wizard,
- com.avaloq.tools.ddk.check.ui.quickfix
+ com.avaloq.tools.ddk.check.ui.quickfix,
+ com.avaloq.tools.ddk.check.ui.contentassist.antlr.internal
 Import-Package: org.apache.log4j
diff --git a/com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/AbstractCheckUiModule.java b/com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/AbstractCheckUiModule.java
index 8f4c13d56..36b8e4133 100644
--- a/com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/AbstractCheckUiModule.java
+++ b/com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/AbstractCheckUiModule.java
@@ -152,6 +152,11 @@ public Class<? extends org.eclipse.compare.IViewerCreator> bindIViewerCreator()
 		return org.eclipse.xtext.ui.compare.DefaultViewerCreator.class;
 	}
 
+	// contributed by org.eclipse.xtext.ui.generator.compare.CompareFragment
+	public void configureCompareViewerTitle(com.google.inject.Binder binder) {
+		binder.bind(String.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.UIBindings.COMPARE_VIEWER_TITLE)).toInstance("Check Compare");
+	}
+
 	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
 	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.PrefixMatcher> bindPrefixMatcher() {
 		return org.eclipse.xtext.ui.editor.contentassist.FQNPrefixMatcher.class;
diff --git a/com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/AbstractCheckProposalProvider.java b/com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/AbstractCheckProposalProvider.java
index 71867915a..4928adebb 100644
--- a/com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/AbstractCheckProposalProvider.java
+++ b/com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/AbstractCheckProposalProvider.java
@@ -43,15 +43,6 @@ public void completeCheckCatalog_Checks(EObject model, Assignment assignment, Co
 	public void completeCheckCatalog_Members(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
 	}
-	public void completeXImportSection_ImportDeclarations(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeXImportDeclaration_ImportedType(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeXImportDeclaration_ImportedNamespace(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
 	public void completeCategory_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
 	}
@@ -176,12 +167,6 @@ public void completeXIssueExpression_IssueData(EObject model, Assignment assignm
 	public void complete_CheckCatalog(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
-	public void complete_XImportSection(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_XImportDeclaration(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
 	public void complete_Documented(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
@@ -230,12 +215,6 @@ public void complete_XGuardExpression(EObject model, RuleCall ruleCall, ContentA
 	public void complete_XIssueExpression(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
-	public void complete_XPrimaryExpression(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_FeatureCallID(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
 	public void complete_SeverityKind(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
diff --git a/com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheckLexer.java b/com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheckLexer.java
index 2f3a22cc7..7d184f5e1 100644
--- a/com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheckLexer.java
+++ b/com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheckLexer.java
@@ -130,15 +130,15 @@ public InternalCheckLexer(CharStream input, RecognizerSharedState state) {
         super(input,state);
 
     }
-    public String getGrammarFileName() { return "../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g"; }
+    public String getGrammarFileName() { return "InternalCheck.g"; }
 
     // $ANTLR start "T__13"
     public final void mT__13() throws RecognitionException {
         try {
             int _type = T__13;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11:7: ( '=' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11:9: '='
+            // InternalCheck.g:11:7: ( '=' )
+            // InternalCheck.g:11:9: '='
             {
             match('='); 
 
@@ -157,8 +157,8 @@ public final void mT__14() throws RecognitionException {
         try {
             int _type = T__14;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12:7: ( '||' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12:9: '||'
+            // InternalCheck.g:12:7: ( '||' )
+            // InternalCheck.g:12:9: '||'
             {
             match("||"); 
 
@@ -178,8 +178,8 @@ public final void mT__15() throws RecognitionException {
         try {
             int _type = T__15;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13:7: ( '&&' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13:9: '&&'
+            // InternalCheck.g:13:7: ( '&&' )
+            // InternalCheck.g:13:9: '&&'
             {
             match("&&"); 
 
@@ -199,8 +199,8 @@ public final void mT__16() throws RecognitionException {
         try {
             int _type = T__16;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14:7: ( 'extends' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14:9: 'extends'
+            // InternalCheck.g:14:7: ( 'extends' )
+            // InternalCheck.g:14:9: 'extends'
             {
             match("extends"); 
 
@@ -220,8 +220,8 @@ public final void mT__17() throws RecognitionException {
         try {
             int _type = T__17;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15:7: ( 'static' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15:9: 'static'
+            // InternalCheck.g:15:7: ( 'static' )
+            // InternalCheck.g:15:9: 'static'
             {
             match("static"); 
 
@@ -241,8 +241,8 @@ public final void mT__18() throws RecognitionException {
         try {
             int _type = T__18;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16:7: ( 'import' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16:9: 'import'
+            // InternalCheck.g:16:7: ( 'import' )
+            // InternalCheck.g:16:9: 'import'
             {
             match("import"); 
 
@@ -262,8 +262,8 @@ public final void mT__19() throws RecognitionException {
         try {
             int _type = T__19;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17:7: ( 'extension' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17:9: 'extension'
+            // InternalCheck.g:17:7: ( 'extension' )
+            // InternalCheck.g:17:9: 'extension'
             {
             match("extension"); 
 
@@ -283,8 +283,8 @@ public final void mT__20() throws RecognitionException {
         try {
             int _type = T__20;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18:7: ( 'catalog' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18:9: 'catalog'
+            // InternalCheck.g:18:7: ( 'catalog' )
+            // InternalCheck.g:18:9: 'catalog'
             {
             match("catalog"); 
 
@@ -304,8 +304,8 @@ public final void mT__21() throws RecognitionException {
         try {
             int _type = T__21;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19:7: ( 'grammar' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19:9: 'grammar'
+            // InternalCheck.g:19:7: ( 'grammar' )
+            // InternalCheck.g:19:9: 'grammar'
             {
             match("grammar"); 
 
@@ -325,8 +325,8 @@ public final void mT__22() throws RecognitionException {
         try {
             int _type = T__22;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20:7: ( 'with' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20:9: 'with'
+            // InternalCheck.g:20:7: ( 'with' )
+            // InternalCheck.g:20:9: 'with'
             {
             match("with"); 
 
@@ -346,8 +346,8 @@ public final void mT__23() throws RecognitionException {
         try {
             int _type = T__23;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21:7: ( 'category' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21:9: 'category'
+            // InternalCheck.g:21:7: ( 'category' )
+            // InternalCheck.g:21:9: 'category'
             {
             match("category"); 
 
@@ -367,8 +367,8 @@ public final void mT__24() throws RecognitionException {
         try {
             int _type = T__24;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22:7: ( 'message' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22:9: 'message'
+            // InternalCheck.g:22:7: ( 'message' )
+            // InternalCheck.g:22:9: 'message'
             {
             match("message"); 
 
@@ -388,8 +388,8 @@ public final void mT__25() throws RecognitionException {
         try {
             int _type = T__25;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23:7: ( 'on' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23:9: 'on'
+            // InternalCheck.g:23:7: ( 'on' )
+            // InternalCheck.g:23:9: 'on'
             {
             match("on"); 
 
@@ -409,8 +409,8 @@ public final void mT__26() throws RecognitionException {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24:7: ( 'bind' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24:9: 'bind'
+            // InternalCheck.g:24:7: ( 'bind' )
+            // InternalCheck.g:24:9: 'bind'
             {
             match("bind"); 
 
@@ -430,8 +430,8 @@ public final void mT__27() throws RecognitionException {
         try {
             int _type = T__27;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25:7: ( 'data' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25:9: 'data'
+            // InternalCheck.g:25:7: ( 'data' )
+            // InternalCheck.g:25:9: 'data'
             {
             match("data"); 
 
@@ -451,8 +451,8 @@ public final void mT__28() throws RecognitionException {
         try {
             int _type = T__28;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26:7: ( 'SeverityRange' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26:9: 'SeverityRange'
+            // InternalCheck.g:26:7: ( 'SeverityRange' )
+            // InternalCheck.g:26:9: 'SeverityRange'
             {
             match("SeverityRange"); 
 
@@ -472,8 +472,8 @@ public final void mT__29() throws RecognitionException {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:27:7: ( 'error' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:27:9: 'error'
+            // InternalCheck.g:27:7: ( 'error' )
+            // InternalCheck.g:27:9: 'error'
             {
             match("error"); 
 
@@ -493,8 +493,8 @@ public final void mT__30() throws RecognitionException {
         try {
             int _type = T__30;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:28:7: ( 'warning' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:28:9: 'warning'
+            // InternalCheck.g:28:7: ( 'warning' )
+            // InternalCheck.g:28:9: 'warning'
             {
             match("warning"); 
 
@@ -514,8 +514,8 @@ public final void mT__31() throws RecognitionException {
         try {
             int _type = T__31;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:29:7: ( 'info' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:29:9: 'info'
+            // InternalCheck.g:29:7: ( 'info' )
+            // InternalCheck.g:29:9: 'info'
             {
             match("info"); 
 
@@ -535,8 +535,8 @@ public final void mT__32() throws RecognitionException {
         try {
             int _type = T__32;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:30:7: ( 'ignore' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:30:9: 'ignore'
+            // InternalCheck.g:30:7: ( 'ignore' )
+            // InternalCheck.g:30:9: 'ignore'
             {
             match("ignore"); 
 
@@ -556,8 +556,8 @@ public final void mT__33() throws RecognitionException {
         try {
             int _type = T__33;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:31:7: ( 'live' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:31:9: 'live'
+            // InternalCheck.g:31:7: ( 'live' )
+            // InternalCheck.g:31:9: 'live'
             {
             match("live"); 
 
@@ -577,8 +577,8 @@ public final void mT__34() throws RecognitionException {
         try {
             int _type = T__34;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:32:7: ( 'onSave' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:32:9: 'onSave'
+            // InternalCheck.g:32:7: ( 'onSave' )
+            // InternalCheck.g:32:9: 'onSave'
             {
             match("onSave"); 
 
@@ -598,8 +598,8 @@ public final void mT__35() throws RecognitionException {
         try {
             int _type = T__35;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:33:7: ( 'onDemand' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:33:9: 'onDemand'
+            // InternalCheck.g:33:7: ( 'onDemand' )
+            // InternalCheck.g:33:9: 'onDemand'
             {
             match("onDemand"); 
 
@@ -619,8 +619,8 @@ public final void mT__36() throws RecognitionException {
         try {
             int _type = T__36;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:34:7: ( '+=' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:34:9: '+='
+            // InternalCheck.g:34:7: ( '+=' )
+            // InternalCheck.g:34:9: '+='
             {
             match("+="); 
 
@@ -640,8 +640,8 @@ public final void mT__37() throws RecognitionException {
         try {
             int _type = T__37;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:35:7: ( '-=' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:35:9: '-='
+            // InternalCheck.g:35:7: ( '-=' )
+            // InternalCheck.g:35:9: '-='
             {
             match("-="); 
 
@@ -661,8 +661,8 @@ public final void mT__38() throws RecognitionException {
         try {
             int _type = T__38;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:36:7: ( '*=' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:36:9: '*='
+            // InternalCheck.g:36:7: ( '*=' )
+            // InternalCheck.g:36:9: '*='
             {
             match("*="); 
 
@@ -682,8 +682,8 @@ public final void mT__39() throws RecognitionException {
         try {
             int _type = T__39;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:37:7: ( '/=' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:37:9: '/='
+            // InternalCheck.g:37:7: ( '/=' )
+            // InternalCheck.g:37:9: '/='
             {
             match("/="); 
 
@@ -703,8 +703,8 @@ public final void mT__40() throws RecognitionException {
         try {
             int _type = T__40;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:38:7: ( '%=' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:38:9: '%='
+            // InternalCheck.g:38:7: ( '%=' )
+            // InternalCheck.g:38:9: '%='
             {
             match("%="); 
 
@@ -724,8 +724,8 @@ public final void mT__41() throws RecognitionException {
         try {
             int _type = T__41;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:39:7: ( '==' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:39:9: '=='
+            // InternalCheck.g:39:7: ( '==' )
+            // InternalCheck.g:39:9: '=='
             {
             match("=="); 
 
@@ -745,8 +745,8 @@ public final void mT__42() throws RecognitionException {
         try {
             int _type = T__42;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:40:7: ( '!=' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:40:9: '!='
+            // InternalCheck.g:40:7: ( '!=' )
+            // InternalCheck.g:40:9: '!='
             {
             match("!="); 
 
@@ -766,8 +766,8 @@ public final void mT__43() throws RecognitionException {
         try {
             int _type = T__43;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:41:7: ( '===' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:41:9: '==='
+            // InternalCheck.g:41:7: ( '===' )
+            // InternalCheck.g:41:9: '==='
             {
             match("==="); 
 
@@ -787,8 +787,8 @@ public final void mT__44() throws RecognitionException {
         try {
             int _type = T__44;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:42:7: ( '!==' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:42:9: '!=='
+            // InternalCheck.g:42:7: ( '!==' )
+            // InternalCheck.g:42:9: '!=='
             {
             match("!=="); 
 
@@ -808,8 +808,8 @@ public final void mT__45() throws RecognitionException {
         try {
             int _type = T__45;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:43:7: ( '>=' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:43:9: '>='
+            // InternalCheck.g:43:7: ( '>=' )
+            // InternalCheck.g:43:9: '>='
             {
             match(">="); 
 
@@ -829,8 +829,8 @@ public final void mT__46() throws RecognitionException {
         try {
             int _type = T__46;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:44:7: ( '>' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:44:9: '>'
+            // InternalCheck.g:44:7: ( '>' )
+            // InternalCheck.g:44:9: '>'
             {
             match('>'); 
 
@@ -849,8 +849,8 @@ public final void mT__47() throws RecognitionException {
         try {
             int _type = T__47;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:45:7: ( '<' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:45:9: '<'
+            // InternalCheck.g:45:7: ( '<' )
+            // InternalCheck.g:45:9: '<'
             {
             match('<'); 
 
@@ -869,8 +869,8 @@ public final void mT__48() throws RecognitionException {
         try {
             int _type = T__48;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:46:7: ( '->' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:46:9: '->'
+            // InternalCheck.g:46:7: ( '->' )
+            // InternalCheck.g:46:9: '->'
             {
             match("->"); 
 
@@ -890,8 +890,8 @@ public final void mT__49() throws RecognitionException {
         try {
             int _type = T__49;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:47:7: ( '..<' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:47:9: '..<'
+            // InternalCheck.g:47:7: ( '..<' )
+            // InternalCheck.g:47:9: '..<'
             {
             match("..<"); 
 
@@ -911,8 +911,8 @@ public final void mT__50() throws RecognitionException {
         try {
             int _type = T__50;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:48:7: ( '..' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:48:9: '..'
+            // InternalCheck.g:48:7: ( '..' )
+            // InternalCheck.g:48:9: '..'
             {
             match(".."); 
 
@@ -932,8 +932,8 @@ public final void mT__51() throws RecognitionException {
         try {
             int _type = T__51;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:49:7: ( '=>' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:49:9: '=>'
+            // InternalCheck.g:49:7: ( '=>' )
+            // InternalCheck.g:49:9: '=>'
             {
             match("=>"); 
 
@@ -953,8 +953,8 @@ public final void mT__52() throws RecognitionException {
         try {
             int _type = T__52;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:50:7: ( '<>' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:50:9: '<>'
+            // InternalCheck.g:50:7: ( '<>' )
+            // InternalCheck.g:50:9: '<>'
             {
             match("<>"); 
 
@@ -974,8 +974,8 @@ public final void mT__53() throws RecognitionException {
         try {
             int _type = T__53;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:51:7: ( '?:' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:51:9: '?:'
+            // InternalCheck.g:51:7: ( '?:' )
+            // InternalCheck.g:51:9: '?:'
             {
             match("?:"); 
 
@@ -995,8 +995,8 @@ public final void mT__54() throws RecognitionException {
         try {
             int _type = T__54;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:52:7: ( '+' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:52:9: '+'
+            // InternalCheck.g:52:7: ( '+' )
+            // InternalCheck.g:52:9: '+'
             {
             match('+'); 
 
@@ -1015,8 +1015,8 @@ public final void mT__55() throws RecognitionException {
         try {
             int _type = T__55;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:53:7: ( '-' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:53:9: '-'
+            // InternalCheck.g:53:7: ( '-' )
+            // InternalCheck.g:53:9: '-'
             {
             match('-'); 
 
@@ -1035,8 +1035,8 @@ public final void mT__56() throws RecognitionException {
         try {
             int _type = T__56;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:54:7: ( '*' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:54:9: '*'
+            // InternalCheck.g:54:7: ( '*' )
+            // InternalCheck.g:54:9: '*'
             {
             match('*'); 
 
@@ -1055,8 +1055,8 @@ public final void mT__57() throws RecognitionException {
         try {
             int _type = T__57;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:55:7: ( '**' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:55:9: '**'
+            // InternalCheck.g:55:7: ( '**' )
+            // InternalCheck.g:55:9: '**'
             {
             match("**"); 
 
@@ -1076,8 +1076,8 @@ public final void mT__58() throws RecognitionException {
         try {
             int _type = T__58;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:56:7: ( '/' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:56:9: '/'
+            // InternalCheck.g:56:7: ( '/' )
+            // InternalCheck.g:56:9: '/'
             {
             match('/'); 
 
@@ -1096,8 +1096,8 @@ public final void mT__59() throws RecognitionException {
         try {
             int _type = T__59;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:57:7: ( '%' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:57:9: '%'
+            // InternalCheck.g:57:7: ( '%' )
+            // InternalCheck.g:57:9: '%'
             {
             match('%'); 
 
@@ -1116,8 +1116,8 @@ public final void mT__60() throws RecognitionException {
         try {
             int _type = T__60;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:58:7: ( '!' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:58:9: '!'
+            // InternalCheck.g:58:7: ( '!' )
+            // InternalCheck.g:58:9: '!'
             {
             match('!'); 
 
@@ -1136,8 +1136,8 @@ public final void mT__61() throws RecognitionException {
         try {
             int _type = T__61;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:59:7: ( '++' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:59:9: '++'
+            // InternalCheck.g:59:7: ( '++' )
+            // InternalCheck.g:59:9: '++'
             {
             match("++"); 
 
@@ -1157,8 +1157,8 @@ public final void mT__62() throws RecognitionException {
         try {
             int _type = T__62;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:60:7: ( '--' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:60:9: '--'
+            // InternalCheck.g:60:7: ( '--' )
+            // InternalCheck.g:60:9: '--'
             {
             match("--"); 
 
@@ -1178,8 +1178,8 @@ public final void mT__63() throws RecognitionException {
         try {
             int _type = T__63;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:61:7: ( '.' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:61:9: '.'
+            // InternalCheck.g:61:7: ( '.' )
+            // InternalCheck.g:61:9: '.'
             {
             match('.'); 
 
@@ -1198,8 +1198,8 @@ public final void mT__64() throws RecognitionException {
         try {
             int _type = T__64;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:62:7: ( 'val' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:62:9: 'val'
+            // InternalCheck.g:62:7: ( 'val' )
+            // InternalCheck.g:62:9: 'val'
             {
             match("val"); 
 
@@ -1219,8 +1219,8 @@ public final void mT__65() throws RecognitionException {
         try {
             int _type = T__65;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:63:7: ( 'super' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:63:9: 'super'
+            // InternalCheck.g:63:7: ( 'super' )
+            // InternalCheck.g:63:9: 'super'
             {
             match("super"); 
 
@@ -1240,8 +1240,8 @@ public final void mT__66() throws RecognitionException {
         try {
             int _type = T__66;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:64:7: ( 'false' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:64:9: 'false'
+            // InternalCheck.g:64:7: ( 'false' )
+            // InternalCheck.g:64:9: 'false'
             {
             match("false"); 
 
@@ -1261,8 +1261,8 @@ public final void mT__67() throws RecognitionException {
         try {
             int _type = T__67;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:65:7: ( 'package' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:65:9: 'package'
+            // InternalCheck.g:65:7: ( 'package' )
+            // InternalCheck.g:65:9: 'package'
             {
             match("package"); 
 
@@ -1282,8 +1282,8 @@ public final void mT__68() throws RecognitionException {
         try {
             int _type = T__68;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:66:7: ( '{' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:66:9: '{'
+            // InternalCheck.g:66:7: ( '{' )
+            // InternalCheck.g:66:9: '{'
             {
             match('{'); 
 
@@ -1302,8 +1302,8 @@ public final void mT__69() throws RecognitionException {
         try {
             int _type = T__69;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:67:7: ( '}' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:67:9: '}'
+            // InternalCheck.g:67:7: ( '}' )
+            // InternalCheck.g:67:9: '}'
             {
             match('}'); 
 
@@ -1322,8 +1322,8 @@ public final void mT__70() throws RecognitionException {
         try {
             int _type = T__70;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:68:7: ( 'for' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:68:9: 'for'
+            // InternalCheck.g:68:7: ( 'for' )
+            // InternalCheck.g:68:9: 'for'
             {
             match("for"); 
 
@@ -1343,8 +1343,8 @@ public final void mT__71() throws RecognitionException {
         try {
             int _type = T__71;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:69:7: ( ';' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:69:9: ';'
+            // InternalCheck.g:69:7: ( ';' )
+            // InternalCheck.g:69:9: ';'
             {
             match(';'); 
 
@@ -1363,8 +1363,8 @@ public final void mT__72() throws RecognitionException {
         try {
             int _type = T__72;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:70:7: ( '(' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:70:9: '('
+            // InternalCheck.g:70:7: ( '(' )
+            // InternalCheck.g:70:9: '('
             {
             match('('); 
 
@@ -1383,8 +1383,8 @@ public final void mT__73() throws RecognitionException {
         try {
             int _type = T__73;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:71:7: ( ')' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:71:9: ')'
+            // InternalCheck.g:71:7: ( ')' )
+            // InternalCheck.g:71:9: ')'
             {
             match(')'); 
 
@@ -1403,8 +1403,8 @@ public final void mT__74() throws RecognitionException {
         try {
             int _type = T__74;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:72:7: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:72:9: ','
+            // InternalCheck.g:72:7: ( ',' )
+            // InternalCheck.g:72:9: ','
             {
             match(','); 
 
@@ -1423,8 +1423,8 @@ public final void mT__75() throws RecognitionException {
         try {
             int _type = T__75;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:73:7: ( '@' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:73:9: '@'
+            // InternalCheck.g:73:7: ( '@' )
+            // InternalCheck.g:73:9: '@'
             {
             match('@'); 
 
@@ -1443,8 +1443,8 @@ public final void mT__76() throws RecognitionException {
         try {
             int _type = T__76;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:74:7: ( 'def' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:74:9: 'def'
+            // InternalCheck.g:74:7: ( 'def' )
+            // InternalCheck.g:74:9: 'def'
             {
             match("def"); 
 
@@ -1464,8 +1464,8 @@ public final void mT__77() throws RecognitionException {
         try {
             int _type = T__77;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:75:7: ( '#' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:75:9: '#'
+            // InternalCheck.g:75:7: ( '#' )
+            // InternalCheck.g:75:9: '#'
             {
             match('#'); 
 
@@ -1484,8 +1484,8 @@ public final void mT__78() throws RecognitionException {
         try {
             int _type = T__78;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:76:7: ( '[' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:76:9: '['
+            // InternalCheck.g:76:7: ( '[' )
+            // InternalCheck.g:76:9: '['
             {
             match('['); 
 
@@ -1504,8 +1504,8 @@ public final void mT__79() throws RecognitionException {
         try {
             int _type = T__79;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:77:7: ( ']' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:77:9: ']'
+            // InternalCheck.g:77:7: ( ']' )
+            // InternalCheck.g:77:9: ']'
             {
             match(']'); 
 
@@ -1524,8 +1524,8 @@ public final void mT__80() throws RecognitionException {
         try {
             int _type = T__80;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:78:7: ( 'guard' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:78:9: 'guard'
+            // InternalCheck.g:78:7: ( 'guard' )
+            // InternalCheck.g:78:9: 'guard'
             {
             match("guard"); 
 
@@ -1545,8 +1545,8 @@ public final void mT__81() throws RecognitionException {
         try {
             int _type = T__81;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:79:7: ( 'issue' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:79:9: 'issue'
+            // InternalCheck.g:79:7: ( 'issue' )
+            // InternalCheck.g:79:9: 'issue'
             {
             match("issue"); 
 
@@ -1566,8 +1566,8 @@ public final void mT__82() throws RecognitionException {
         try {
             int _type = T__82;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:80:7: ( 'instanceof' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:80:9: 'instanceof'
+            // InternalCheck.g:80:7: ( 'instanceof' )
+            // InternalCheck.g:80:9: 'instanceof'
             {
             match("instanceof"); 
 
@@ -1587,8 +1587,8 @@ public final void mT__83() throws RecognitionException {
         try {
             int _type = T__83;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:81:7: ( 'as' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:81:9: 'as'
+            // InternalCheck.g:81:7: ( 'as' )
+            // InternalCheck.g:81:9: 'as'
             {
             match("as"); 
 
@@ -1608,8 +1608,8 @@ public final void mT__84() throws RecognitionException {
         try {
             int _type = T__84;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:82:7: ( 'if' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:82:9: 'if'
+            // InternalCheck.g:82:7: ( 'if' )
+            // InternalCheck.g:82:9: 'if'
             {
             match("if"); 
 
@@ -1629,8 +1629,8 @@ public final void mT__85() throws RecognitionException {
         try {
             int _type = T__85;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:83:7: ( 'else' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:83:9: 'else'
+            // InternalCheck.g:83:7: ( 'else' )
+            // InternalCheck.g:83:9: 'else'
             {
             match("else"); 
 
@@ -1650,8 +1650,8 @@ public final void mT__86() throws RecognitionException {
         try {
             int _type = T__86;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:84:7: ( 'switch' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:84:9: 'switch'
+            // InternalCheck.g:84:7: ( 'switch' )
+            // InternalCheck.g:84:9: 'switch'
             {
             match("switch"); 
 
@@ -1671,8 +1671,8 @@ public final void mT__87() throws RecognitionException {
         try {
             int _type = T__87;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:85:7: ( ':' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:85:9: ':'
+            // InternalCheck.g:85:7: ( ':' )
+            // InternalCheck.g:85:9: ':'
             {
             match(':'); 
 
@@ -1691,8 +1691,8 @@ public final void mT__88() throws RecognitionException {
         try {
             int _type = T__88;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:86:7: ( 'default' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:86:9: 'default'
+            // InternalCheck.g:86:7: ( 'default' )
+            // InternalCheck.g:86:9: 'default'
             {
             match("default"); 
 
@@ -1712,8 +1712,8 @@ public final void mT__89() throws RecognitionException {
         try {
             int _type = T__89;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:87:7: ( 'case' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:87:9: 'case'
+            // InternalCheck.g:87:7: ( 'case' )
+            // InternalCheck.g:87:9: 'case'
             {
             match("case"); 
 
@@ -1733,8 +1733,8 @@ public final void mT__90() throws RecognitionException {
         try {
             int _type = T__90;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:88:7: ( 'while' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:88:9: 'while'
+            // InternalCheck.g:88:7: ( 'while' )
+            // InternalCheck.g:88:9: 'while'
             {
             match("while"); 
 
@@ -1754,8 +1754,8 @@ public final void mT__91() throws RecognitionException {
         try {
             int _type = T__91;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:89:7: ( 'do' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:89:9: 'do'
+            // InternalCheck.g:89:7: ( 'do' )
+            // InternalCheck.g:89:9: 'do'
             {
             match("do"); 
 
@@ -1775,8 +1775,8 @@ public final void mT__92() throws RecognitionException {
         try {
             int _type = T__92;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:90:7: ( 'new' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:90:9: 'new'
+            // InternalCheck.g:90:7: ( 'new' )
+            // InternalCheck.g:90:9: 'new'
             {
             match("new"); 
 
@@ -1796,8 +1796,8 @@ public final void mT__93() throws RecognitionException {
         try {
             int _type = T__93;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:91:7: ( 'null' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:91:9: 'null'
+            // InternalCheck.g:91:7: ( 'null' )
+            // InternalCheck.g:91:9: 'null'
             {
             match("null"); 
 
@@ -1817,8 +1817,8 @@ public final void mT__94() throws RecognitionException {
         try {
             int _type = T__94;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:92:7: ( 'typeof' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:92:9: 'typeof'
+            // InternalCheck.g:92:7: ( 'typeof' )
+            // InternalCheck.g:92:9: 'typeof'
             {
             match("typeof"); 
 
@@ -1838,8 +1838,8 @@ public final void mT__95() throws RecognitionException {
         try {
             int _type = T__95;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:93:7: ( 'throw' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:93:9: 'throw'
+            // InternalCheck.g:93:7: ( 'throw' )
+            // InternalCheck.g:93:9: 'throw'
             {
             match("throw"); 
 
@@ -1859,8 +1859,8 @@ public final void mT__96() throws RecognitionException {
         try {
             int _type = T__96;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:94:7: ( 'return' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:94:9: 'return'
+            // InternalCheck.g:94:7: ( 'return' )
+            // InternalCheck.g:94:9: 'return'
             {
             match("return"); 
 
@@ -1880,8 +1880,8 @@ public final void mT__97() throws RecognitionException {
         try {
             int _type = T__97;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:95:7: ( 'try' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:95:9: 'try'
+            // InternalCheck.g:95:7: ( 'try' )
+            // InternalCheck.g:95:9: 'try'
             {
             match("try"); 
 
@@ -1901,8 +1901,8 @@ public final void mT__98() throws RecognitionException {
         try {
             int _type = T__98;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:96:7: ( 'finally' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:96:9: 'finally'
+            // InternalCheck.g:96:7: ( 'finally' )
+            // InternalCheck.g:96:9: 'finally'
             {
             match("finally"); 
 
@@ -1922,8 +1922,8 @@ public final void mT__99() throws RecognitionException {
         try {
             int _type = T__99;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:97:7: ( 'synchronized' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:97:9: 'synchronized'
+            // InternalCheck.g:97:7: ( 'synchronized' )
+            // InternalCheck.g:97:9: 'synchronized'
             {
             match("synchronized"); 
 
@@ -1943,8 +1943,8 @@ public final void mT__100() throws RecognitionException {
         try {
             int _type = T__100;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:98:8: ( 'catch' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:98:10: 'catch'
+            // InternalCheck.g:98:8: ( 'catch' )
+            // InternalCheck.g:98:10: 'catch'
             {
             match("catch"); 
 
@@ -1964,8 +1964,8 @@ public final void mT__101() throws RecognitionException {
         try {
             int _type = T__101;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:99:8: ( '?' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:99:10: '?'
+            // InternalCheck.g:99:8: ( '?' )
+            // InternalCheck.g:99:10: '?'
             {
             match('?'); 
 
@@ -1984,8 +1984,8 @@ public final void mT__102() throws RecognitionException {
         try {
             int _type = T__102;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:100:8: ( '&' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:100:10: '&'
+            // InternalCheck.g:100:8: ( '&' )
+            // InternalCheck.g:100:10: '&'
             {
             match('&'); 
 
@@ -2004,8 +2004,8 @@ public final void mT__103() throws RecognitionException {
         try {
             int _type = T__103;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:101:8: ( 'final' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:101:10: 'final'
+            // InternalCheck.g:101:8: ( 'final' )
+            // InternalCheck.g:101:10: 'final'
             {
             match("final"); 
 
@@ -2025,8 +2025,8 @@ public final void mT__104() throws RecognitionException {
         try {
             int _type = T__104;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:102:8: ( '::' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:102:10: '::'
+            // InternalCheck.g:102:8: ( '::' )
+            // InternalCheck.g:102:10: '::'
             {
             match("::"); 
 
@@ -2046,8 +2046,8 @@ public final void mT__105() throws RecognitionException {
         try {
             int _type = T__105;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:103:8: ( '?.' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:103:10: '?.'
+            // InternalCheck.g:103:8: ( '?.' )
+            // InternalCheck.g:103:10: '?.'
             {
             match("?."); 
 
@@ -2067,8 +2067,8 @@ public final void mT__106() throws RecognitionException {
         try {
             int _type = T__106;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:104:8: ( '|' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:104:10: '|'
+            // InternalCheck.g:104:8: ( '|' )
+            // InternalCheck.g:104:10: '|'
             {
             match('|'); 
 
@@ -2087,8 +2087,8 @@ public final void mT__107() throws RecognitionException {
         try {
             int _type = T__107;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:105:8: ( 'var' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:105:10: 'var'
+            // InternalCheck.g:105:8: ( 'var' )
+            // InternalCheck.g:105:10: 'var'
             {
             match("var"); 
 
@@ -2108,8 +2108,8 @@ public final void mT__108() throws RecognitionException {
         try {
             int _type = T__108;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:106:8: ( 'true' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:106:10: 'true'
+            // InternalCheck.g:106:8: ( 'true' )
+            // InternalCheck.g:106:10: 'true'
             {
             match("true"); 
 
@@ -2129,10 +2129,10 @@ public final void mRULE_HEX() throws RecognitionException {
         try {
             int _type = RULE_HEX;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26200:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26200:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
+            // InternalCheck.g:26200:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )? )
+            // InternalCheck.g:26200:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26200:12: ( '0x' | '0X' )
+            // InternalCheck.g:26200:12: ( '0x' | '0X' )
             int alt1=2;
             int LA1_0 = input.LA(1);
 
@@ -2160,7 +2160,7 @@ else if ( (LA1_1=='X') ) {
             }
             switch (alt1) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26200:13: '0x'
+                    // InternalCheck.g:26200:13: '0x'
                     {
                     match("0x"); 
 
@@ -2168,7 +2168,7 @@ else if ( (LA1_1=='X') ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26200:18: '0X'
+                    // InternalCheck.g:26200:18: '0X'
                     {
                     match("0X"); 
 
@@ -2178,7 +2178,7 @@ else if ( (LA1_1=='X') ) {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26200:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+
+            // InternalCheck.g:26200:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+
             int cnt2=0;
             loop2:
             do {
@@ -2192,7 +2192,7 @@ else if ( (LA1_1=='X') ) {
 
                 switch (alt2) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:
+            	    // InternalCheck.g:
             	    {
             	    if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='F')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='f') ) {
             	        input.consume();
@@ -2216,7 +2216,7 @@ else if ( (LA1_1=='X') ) {
                 cnt2++;
             } while (true);
 
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26200:58: ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
+            // InternalCheck.g:26200:58: ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
             int alt4=2;
             int LA4_0 = input.LA(1);
 
@@ -2225,10 +2225,10 @@ else if ( (LA1_1=='X') ) {
             }
             switch (alt4) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26200:59: '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
+                    // InternalCheck.g:26200:59: '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
                     {
                     match('#'); 
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26200:63: ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
+                    // InternalCheck.g:26200:63: ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
                     int alt3=2;
                     int LA3_0 = input.LA(1);
 
@@ -2246,7 +2246,7 @@ else if ( (LA3_0=='L'||LA3_0=='l') ) {
                     }
                     switch (alt3) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26200:64: ( 'b' | 'B' ) ( 'i' | 'I' )
+                            // InternalCheck.g:26200:64: ( 'b' | 'B' ) ( 'i' | 'I' )
                             {
                             if ( input.LA(1)=='B'||input.LA(1)=='b' ) {
                                 input.consume();
@@ -2270,7 +2270,7 @@ else if ( (LA3_0=='L'||LA3_0=='l') ) {
                             }
                             break;
                         case 2 :
-                            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26200:84: ( 'l' | 'L' )
+                            // InternalCheck.g:26200:84: ( 'l' | 'L' )
                             {
                             if ( input.LA(1)=='L'||input.LA(1)=='l' ) {
                                 input.consume();
@@ -2309,11 +2309,11 @@ public final void mRULE_INT() throws RecognitionException {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26202:10: ( '0' .. '9' ( '0' .. '9' | '_' )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26202:12: '0' .. '9' ( '0' .. '9' | '_' )*
+            // InternalCheck.g:26202:10: ( '0' .. '9' ( '0' .. '9' | '_' )* )
+            // InternalCheck.g:26202:12: '0' .. '9' ( '0' .. '9' | '_' )*
             {
             matchRange('0','9'); 
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26202:21: ( '0' .. '9' | '_' )*
+            // InternalCheck.g:26202:21: ( '0' .. '9' | '_' )*
             loop5:
             do {
                 int alt5=2;
@@ -2326,7 +2326,7 @@ public final void mRULE_INT() throws RecognitionException {
 
                 switch (alt5) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:
+            	    // InternalCheck.g:
             	    {
             	    if ( (input.LA(1)>='0' && input.LA(1)<='9')||input.LA(1)=='_' ) {
             	        input.consume();
@@ -2362,11 +2362,11 @@ public final void mRULE_DECIMAL() throws RecognitionException {
         try {
             int _type = RULE_DECIMAL;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26204:14: ( RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26204:16: RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
+            // InternalCheck.g:26204:14: ( RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )? )
+            // InternalCheck.g:26204:16: RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
             {
             mRULE_INT(); 
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26204:25: ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )?
+            // InternalCheck.g:26204:25: ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )?
             int alt7=2;
             int LA7_0 = input.LA(1);
 
@@ -2375,7 +2375,7 @@ public final void mRULE_DECIMAL() throws RecognitionException {
             }
             switch (alt7) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26204:26: ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT
+                    // InternalCheck.g:26204:26: ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT
                     {
                     if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
                         input.consume();
@@ -2386,7 +2386,7 @@ public final void mRULE_DECIMAL() throws RecognitionException {
                         recover(mse);
                         throw mse;}
 
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26204:36: ( '+' | '-' )?
+                    // InternalCheck.g:26204:36: ( '+' | '-' )?
                     int alt6=2;
                     int LA6_0 = input.LA(1);
 
@@ -2395,7 +2395,7 @@ public final void mRULE_DECIMAL() throws RecognitionException {
                     }
                     switch (alt6) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:
+                            // InternalCheck.g:
                             {
                             if ( input.LA(1)=='+'||input.LA(1)=='-' ) {
                                 input.consume();
@@ -2419,7 +2419,7 @@ public final void mRULE_DECIMAL() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26204:58: ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
+            // InternalCheck.g:26204:58: ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
             int alt8=3;
             int LA8_0 = input.LA(1);
 
@@ -2431,7 +2431,7 @@ else if ( (LA8_0=='D'||LA8_0=='F'||LA8_0=='L'||LA8_0=='d'||LA8_0=='f'||LA8_0=='l
             }
             switch (alt8) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26204:59: ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' )
+                    // InternalCheck.g:26204:59: ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' )
                     {
                     if ( input.LA(1)=='B'||input.LA(1)=='b' ) {
                         input.consume();
@@ -2455,7 +2455,7 @@ else if ( (LA8_0=='D'||LA8_0=='F'||LA8_0=='L'||LA8_0=='d'||LA8_0=='f'||LA8_0=='l
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26204:87: ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' )
+                    // InternalCheck.g:26204:87: ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' )
                     {
                     if ( input.LA(1)=='D'||input.LA(1)=='F'||input.LA(1)=='L'||input.LA(1)=='d'||input.LA(1)=='f'||input.LA(1)=='l' ) {
                         input.consume();
@@ -2488,10 +2488,10 @@ public final void mRULE_ID() throws RecognitionException {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26206:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26206:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
+            // InternalCheck.g:26206:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )* )
+            // InternalCheck.g:26206:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26206:11: ( '^' )?
+            // InternalCheck.g:26206:11: ( '^' )?
             int alt9=2;
             int LA9_0 = input.LA(1);
 
@@ -2500,7 +2500,7 @@ public final void mRULE_ID() throws RecognitionException {
             }
             switch (alt9) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26206:11: '^'
+                    // InternalCheck.g:26206:11: '^'
                     {
                     match('^'); 
 
@@ -2518,7 +2518,7 @@ public final void mRULE_ID() throws RecognitionException {
                 recover(mse);
                 throw mse;}
 
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26206:44: ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
+            // InternalCheck.g:26206:44: ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
             loop10:
             do {
                 int alt10=2;
@@ -2531,7 +2531,7 @@ public final void mRULE_ID() throws RecognitionException {
 
                 switch (alt10) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:
+            	    // InternalCheck.g:
             	    {
             	    if ( input.LA(1)=='$'||(input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
             	        input.consume();
@@ -2567,10 +2567,10 @@ public final void mRULE_STRING() throws RecognitionException {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26208:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26208:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
+            // InternalCheck.g:26208:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? ) )
+            // InternalCheck.g:26208:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26208:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
+            // InternalCheck.g:26208:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
             int alt15=2;
             int LA15_0 = input.LA(1);
 
@@ -2588,10 +2588,10 @@ else if ( (LA15_0=='\'') ) {
             }
             switch (alt15) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26208:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )?
+                    // InternalCheck.g:26208:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )?
                     {
                     match('\"'); 
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26208:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // InternalCheck.g:26208:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop11:
                     do {
                         int alt11=3;
@@ -2607,7 +2607,7 @@ else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA1
 
                         switch (alt11) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26208:21: '\\\\' .
+                    	    // InternalCheck.g:26208:21: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -2615,7 +2615,7 @@ else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA1
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26208:28: ~ ( ( '\\\\' | '\"' ) )
+                    	    // InternalCheck.g:26208:28: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -2635,7 +2635,7 @@ else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA1
                         }
                     } while (true);
 
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26208:44: ( '\"' )?
+                    // InternalCheck.g:26208:44: ( '\"' )?
                     int alt12=2;
                     int LA12_0 = input.LA(1);
 
@@ -2644,7 +2644,7 @@ else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA1
                     }
                     switch (alt12) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26208:44: '\"'
+                            // InternalCheck.g:26208:44: '\"'
                             {
                             match('\"'); 
 
@@ -2657,10 +2657,10 @@ else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA1
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26208:49: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )?
+                    // InternalCheck.g:26208:49: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )?
                     {
                     match('\''); 
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26208:54: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // InternalCheck.g:26208:54: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop13:
                     do {
                         int alt13=3;
@@ -2676,7 +2676,7 @@ else if ( ((LA13_0>='\u0000' && LA13_0<='&')||(LA13_0>='(' && LA13_0<='[')||(LA1
 
                         switch (alt13) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26208:55: '\\\\' .
+                    	    // InternalCheck.g:26208:55: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -2684,7 +2684,7 @@ else if ( ((LA13_0>='\u0000' && LA13_0<='&')||(LA13_0>='(' && LA13_0<='[')||(LA1
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26208:62: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // InternalCheck.g:26208:62: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -2704,7 +2704,7 @@ else if ( ((LA13_0>='\u0000' && LA13_0<='&')||(LA13_0>='(' && LA13_0<='[')||(LA1
                         }
                     } while (true);
 
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26208:79: ( '\\'' )?
+                    // InternalCheck.g:26208:79: ( '\\'' )?
                     int alt14=2;
                     int LA14_0 = input.LA(1);
 
@@ -2713,7 +2713,7 @@ else if ( ((LA13_0>='\u0000' && LA13_0<='&')||(LA13_0>='(' && LA13_0<='[')||(LA1
                     }
                     switch (alt14) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26208:79: '\\''
+                            // InternalCheck.g:26208:79: '\\''
                             {
                             match('\''); 
 
@@ -2744,12 +2744,12 @@ public final void mRULE_ML_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26210:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26210:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalCheck.g:26210:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalCheck.g:26210:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26210:24: ( options {greedy=false; } : . )*
+            // InternalCheck.g:26210:24: ( options {greedy=false; } : . )*
             loop16:
             do {
                 int alt16=2;
@@ -2774,7 +2774,7 @@ else if ( ((LA16_0>='\u0000' && LA16_0<=')')||(LA16_0>='+' && LA16_0<='\uFFFF'))
 
                 switch (alt16) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26210:52: .
+            	    // InternalCheck.g:26210:52: .
             	    {
             	    matchAny(); 
 
@@ -2804,12 +2804,12 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26212:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26212:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalCheck.g:26212:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalCheck.g:26212:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26212:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // InternalCheck.g:26212:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop17:
             do {
                 int alt17=2;
@@ -2822,7 +2822,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
 
                 switch (alt17) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26212:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // InternalCheck.g:26212:24: ~ ( ( '\\n' | '\\r' ) )
             	    {
             	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
             	        input.consume();
@@ -2842,7 +2842,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
                 }
             } while (true);
 
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26212:40: ( ( '\\r' )? '\\n' )?
+            // InternalCheck.g:26212:40: ( ( '\\r' )? '\\n' )?
             int alt19=2;
             int LA19_0 = input.LA(1);
 
@@ -2851,9 +2851,9 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
             }
             switch (alt19) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26212:41: ( '\\r' )? '\\n'
+                    // InternalCheck.g:26212:41: ( '\\r' )? '\\n'
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26212:41: ( '\\r' )?
+                    // InternalCheck.g:26212:41: ( '\\r' )?
                     int alt18=2;
                     int LA18_0 = input.LA(1);
 
@@ -2862,7 +2862,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
                     }
                     switch (alt18) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26212:41: '\\r'
+                            // InternalCheck.g:26212:41: '\\r'
                             {
                             match('\r'); 
 
@@ -2894,10 +2894,10 @@ public final void mRULE_WS() throws RecognitionException {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26214:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26214:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalCheck.g:26214:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalCheck.g:26214:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26214:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalCheck.g:26214:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt20=0;
             loop20:
             do {
@@ -2911,7 +2911,7 @@ public final void mRULE_WS() throws RecognitionException {
 
                 switch (alt20) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:
+            	    // InternalCheck.g:
             	    {
             	    if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
             	        input.consume();
@@ -2951,8 +2951,8 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26216:16: ( . )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26216:18: .
+            // InternalCheck.g:26216:16: ( . )
+            // InternalCheck.g:26216:18: .
             {
             matchAny(); 
 
@@ -2967,740 +2967,740 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:8: ( T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | T__97 | T__98 | T__99 | T__100 | T__101 | T__102 | T__103 | T__104 | T__105 | T__106 | T__107 | T__108 | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        // InternalCheck.g:1:8: ( T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | T__97 | T__98 | T__99 | T__100 | T__101 | T__102 | T__103 | T__104 | T__105 | T__106 | T__107 | T__108 | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
         int alt21=105;
         alt21 = dfa21.predict(input);
         switch (alt21) {
             case 1 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:10: T__13
+                // InternalCheck.g:1:10: T__13
                 {
                 mT__13(); 
 
                 }
                 break;
             case 2 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:16: T__14
+                // InternalCheck.g:1:16: T__14
                 {
                 mT__14(); 
 
                 }
                 break;
             case 3 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:22: T__15
+                // InternalCheck.g:1:22: T__15
                 {
                 mT__15(); 
 
                 }
                 break;
             case 4 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:28: T__16
+                // InternalCheck.g:1:28: T__16
                 {
                 mT__16(); 
 
                 }
                 break;
             case 5 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:34: T__17
+                // InternalCheck.g:1:34: T__17
                 {
                 mT__17(); 
 
                 }
                 break;
             case 6 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:40: T__18
+                // InternalCheck.g:1:40: T__18
                 {
                 mT__18(); 
 
                 }
                 break;
             case 7 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:46: T__19
+                // InternalCheck.g:1:46: T__19
                 {
                 mT__19(); 
 
                 }
                 break;
             case 8 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:52: T__20
+                // InternalCheck.g:1:52: T__20
                 {
                 mT__20(); 
 
                 }
                 break;
             case 9 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:58: T__21
+                // InternalCheck.g:1:58: T__21
                 {
                 mT__21(); 
 
                 }
                 break;
             case 10 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:64: T__22
+                // InternalCheck.g:1:64: T__22
                 {
                 mT__22(); 
 
                 }
                 break;
             case 11 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:70: T__23
+                // InternalCheck.g:1:70: T__23
                 {
                 mT__23(); 
 
                 }
                 break;
             case 12 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:76: T__24
+                // InternalCheck.g:1:76: T__24
                 {
                 mT__24(); 
 
                 }
                 break;
             case 13 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:82: T__25
+                // InternalCheck.g:1:82: T__25
                 {
                 mT__25(); 
 
                 }
                 break;
             case 14 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:88: T__26
+                // InternalCheck.g:1:88: T__26
                 {
                 mT__26(); 
 
                 }
                 break;
             case 15 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:94: T__27
+                // InternalCheck.g:1:94: T__27
                 {
                 mT__27(); 
 
                 }
                 break;
             case 16 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:100: T__28
+                // InternalCheck.g:1:100: T__28
                 {
                 mT__28(); 
 
                 }
                 break;
             case 17 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:106: T__29
+                // InternalCheck.g:1:106: T__29
                 {
                 mT__29(); 
 
                 }
                 break;
             case 18 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:112: T__30
+                // InternalCheck.g:1:112: T__30
                 {
                 mT__30(); 
 
                 }
                 break;
             case 19 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:118: T__31
+                // InternalCheck.g:1:118: T__31
                 {
                 mT__31(); 
 
                 }
                 break;
             case 20 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:124: T__32
+                // InternalCheck.g:1:124: T__32
                 {
                 mT__32(); 
 
                 }
                 break;
             case 21 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:130: T__33
+                // InternalCheck.g:1:130: T__33
                 {
                 mT__33(); 
 
                 }
                 break;
             case 22 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:136: T__34
+                // InternalCheck.g:1:136: T__34
                 {
                 mT__34(); 
 
                 }
                 break;
             case 23 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:142: T__35
+                // InternalCheck.g:1:142: T__35
                 {
                 mT__35(); 
 
                 }
                 break;
             case 24 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:148: T__36
+                // InternalCheck.g:1:148: T__36
                 {
                 mT__36(); 
 
                 }
                 break;
             case 25 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:154: T__37
+                // InternalCheck.g:1:154: T__37
                 {
                 mT__37(); 
 
                 }
                 break;
             case 26 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:160: T__38
+                // InternalCheck.g:1:160: T__38
                 {
                 mT__38(); 
 
                 }
                 break;
             case 27 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:166: T__39
+                // InternalCheck.g:1:166: T__39
                 {
                 mT__39(); 
 
                 }
                 break;
             case 28 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:172: T__40
+                // InternalCheck.g:1:172: T__40
                 {
                 mT__40(); 
 
                 }
                 break;
             case 29 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:178: T__41
+                // InternalCheck.g:1:178: T__41
                 {
                 mT__41(); 
 
                 }
                 break;
             case 30 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:184: T__42
+                // InternalCheck.g:1:184: T__42
                 {
                 mT__42(); 
 
                 }
                 break;
             case 31 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:190: T__43
+                // InternalCheck.g:1:190: T__43
                 {
                 mT__43(); 
 
                 }
                 break;
             case 32 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:196: T__44
+                // InternalCheck.g:1:196: T__44
                 {
                 mT__44(); 
 
                 }
                 break;
             case 33 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:202: T__45
+                // InternalCheck.g:1:202: T__45
                 {
                 mT__45(); 
 
                 }
                 break;
             case 34 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:208: T__46
+                // InternalCheck.g:1:208: T__46
                 {
                 mT__46(); 
 
                 }
                 break;
             case 35 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:214: T__47
+                // InternalCheck.g:1:214: T__47
                 {
                 mT__47(); 
 
                 }
                 break;
             case 36 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:220: T__48
+                // InternalCheck.g:1:220: T__48
                 {
                 mT__48(); 
 
                 }
                 break;
             case 37 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:226: T__49
+                // InternalCheck.g:1:226: T__49
                 {
                 mT__49(); 
 
                 }
                 break;
             case 38 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:232: T__50
+                // InternalCheck.g:1:232: T__50
                 {
                 mT__50(); 
 
                 }
                 break;
             case 39 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:238: T__51
+                // InternalCheck.g:1:238: T__51
                 {
                 mT__51(); 
 
                 }
                 break;
             case 40 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:244: T__52
+                // InternalCheck.g:1:244: T__52
                 {
                 mT__52(); 
 
                 }
                 break;
             case 41 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:250: T__53
+                // InternalCheck.g:1:250: T__53
                 {
                 mT__53(); 
 
                 }
                 break;
             case 42 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:256: T__54
+                // InternalCheck.g:1:256: T__54
                 {
                 mT__54(); 
 
                 }
                 break;
             case 43 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:262: T__55
+                // InternalCheck.g:1:262: T__55
                 {
                 mT__55(); 
 
                 }
                 break;
             case 44 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:268: T__56
+                // InternalCheck.g:1:268: T__56
                 {
                 mT__56(); 
 
                 }
                 break;
             case 45 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:274: T__57
+                // InternalCheck.g:1:274: T__57
                 {
                 mT__57(); 
 
                 }
                 break;
             case 46 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:280: T__58
+                // InternalCheck.g:1:280: T__58
                 {
                 mT__58(); 
 
                 }
                 break;
             case 47 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:286: T__59
+                // InternalCheck.g:1:286: T__59
                 {
                 mT__59(); 
 
                 }
                 break;
             case 48 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:292: T__60
+                // InternalCheck.g:1:292: T__60
                 {
                 mT__60(); 
 
                 }
                 break;
             case 49 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:298: T__61
+                // InternalCheck.g:1:298: T__61
                 {
                 mT__61(); 
 
                 }
                 break;
             case 50 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:304: T__62
+                // InternalCheck.g:1:304: T__62
                 {
                 mT__62(); 
 
                 }
                 break;
             case 51 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:310: T__63
+                // InternalCheck.g:1:310: T__63
                 {
                 mT__63(); 
 
                 }
                 break;
             case 52 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:316: T__64
+                // InternalCheck.g:1:316: T__64
                 {
                 mT__64(); 
 
                 }
                 break;
             case 53 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:322: T__65
+                // InternalCheck.g:1:322: T__65
                 {
                 mT__65(); 
 
                 }
                 break;
             case 54 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:328: T__66
+                // InternalCheck.g:1:328: T__66
                 {
                 mT__66(); 
 
                 }
                 break;
             case 55 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:334: T__67
+                // InternalCheck.g:1:334: T__67
                 {
                 mT__67(); 
 
                 }
                 break;
             case 56 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:340: T__68
+                // InternalCheck.g:1:340: T__68
                 {
                 mT__68(); 
 
                 }
                 break;
             case 57 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:346: T__69
+                // InternalCheck.g:1:346: T__69
                 {
                 mT__69(); 
 
                 }
                 break;
             case 58 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:352: T__70
+                // InternalCheck.g:1:352: T__70
                 {
                 mT__70(); 
 
                 }
                 break;
             case 59 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:358: T__71
+                // InternalCheck.g:1:358: T__71
                 {
                 mT__71(); 
 
                 }
                 break;
             case 60 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:364: T__72
+                // InternalCheck.g:1:364: T__72
                 {
                 mT__72(); 
 
                 }
                 break;
             case 61 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:370: T__73
+                // InternalCheck.g:1:370: T__73
                 {
                 mT__73(); 
 
                 }
                 break;
             case 62 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:376: T__74
+                // InternalCheck.g:1:376: T__74
                 {
                 mT__74(); 
 
                 }
                 break;
             case 63 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:382: T__75
+                // InternalCheck.g:1:382: T__75
                 {
                 mT__75(); 
 
                 }
                 break;
             case 64 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:388: T__76
+                // InternalCheck.g:1:388: T__76
                 {
                 mT__76(); 
 
                 }
                 break;
             case 65 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:394: T__77
+                // InternalCheck.g:1:394: T__77
                 {
                 mT__77(); 
 
                 }
                 break;
             case 66 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:400: T__78
+                // InternalCheck.g:1:400: T__78
                 {
                 mT__78(); 
 
                 }
                 break;
             case 67 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:406: T__79
+                // InternalCheck.g:1:406: T__79
                 {
                 mT__79(); 
 
                 }
                 break;
             case 68 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:412: T__80
+                // InternalCheck.g:1:412: T__80
                 {
                 mT__80(); 
 
                 }
                 break;
             case 69 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:418: T__81
+                // InternalCheck.g:1:418: T__81
                 {
                 mT__81(); 
 
                 }
                 break;
             case 70 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:424: T__82
+                // InternalCheck.g:1:424: T__82
                 {
                 mT__82(); 
 
                 }
                 break;
             case 71 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:430: T__83
+                // InternalCheck.g:1:430: T__83
                 {
                 mT__83(); 
 
                 }
                 break;
             case 72 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:436: T__84
+                // InternalCheck.g:1:436: T__84
                 {
                 mT__84(); 
 
                 }
                 break;
             case 73 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:442: T__85
+                // InternalCheck.g:1:442: T__85
                 {
                 mT__85(); 
 
                 }
                 break;
             case 74 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:448: T__86
+                // InternalCheck.g:1:448: T__86
                 {
                 mT__86(); 
 
                 }
                 break;
             case 75 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:454: T__87
+                // InternalCheck.g:1:454: T__87
                 {
                 mT__87(); 
 
                 }
                 break;
             case 76 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:460: T__88
+                // InternalCheck.g:1:460: T__88
                 {
                 mT__88(); 
 
                 }
                 break;
             case 77 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:466: T__89
+                // InternalCheck.g:1:466: T__89
                 {
                 mT__89(); 
 
                 }
                 break;
             case 78 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:472: T__90
+                // InternalCheck.g:1:472: T__90
                 {
                 mT__90(); 
 
                 }
                 break;
             case 79 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:478: T__91
+                // InternalCheck.g:1:478: T__91
                 {
                 mT__91(); 
 
                 }
                 break;
             case 80 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:484: T__92
+                // InternalCheck.g:1:484: T__92
                 {
                 mT__92(); 
 
                 }
                 break;
             case 81 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:490: T__93
+                // InternalCheck.g:1:490: T__93
                 {
                 mT__93(); 
 
                 }
                 break;
             case 82 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:496: T__94
+                // InternalCheck.g:1:496: T__94
                 {
                 mT__94(); 
 
                 }
                 break;
             case 83 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:502: T__95
+                // InternalCheck.g:1:502: T__95
                 {
                 mT__95(); 
 
                 }
                 break;
             case 84 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:508: T__96
+                // InternalCheck.g:1:508: T__96
                 {
                 mT__96(); 
 
                 }
                 break;
             case 85 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:514: T__97
+                // InternalCheck.g:1:514: T__97
                 {
                 mT__97(); 
 
                 }
                 break;
             case 86 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:520: T__98
+                // InternalCheck.g:1:520: T__98
                 {
                 mT__98(); 
 
                 }
                 break;
             case 87 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:526: T__99
+                // InternalCheck.g:1:526: T__99
                 {
                 mT__99(); 
 
                 }
                 break;
             case 88 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:532: T__100
+                // InternalCheck.g:1:532: T__100
                 {
                 mT__100(); 
 
                 }
                 break;
             case 89 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:539: T__101
+                // InternalCheck.g:1:539: T__101
                 {
                 mT__101(); 
 
                 }
                 break;
             case 90 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:546: T__102
+                // InternalCheck.g:1:546: T__102
                 {
                 mT__102(); 
 
                 }
                 break;
             case 91 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:553: T__103
+                // InternalCheck.g:1:553: T__103
                 {
                 mT__103(); 
 
                 }
                 break;
             case 92 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:560: T__104
+                // InternalCheck.g:1:560: T__104
                 {
                 mT__104(); 
 
                 }
                 break;
             case 93 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:567: T__105
+                // InternalCheck.g:1:567: T__105
                 {
                 mT__105(); 
 
                 }
                 break;
             case 94 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:574: T__106
+                // InternalCheck.g:1:574: T__106
                 {
                 mT__106(); 
 
                 }
                 break;
             case 95 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:581: T__107
+                // InternalCheck.g:1:581: T__107
                 {
                 mT__107(); 
 
                 }
                 break;
             case 96 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:588: T__108
+                // InternalCheck.g:1:588: T__108
                 {
                 mT__108(); 
 
                 }
                 break;
             case 97 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:595: RULE_HEX
+                // InternalCheck.g:1:595: RULE_HEX
                 {
                 mRULE_HEX(); 
 
                 }
                 break;
             case 98 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:604: RULE_INT
+                // InternalCheck.g:1:604: RULE_INT
                 {
                 mRULE_INT(); 
 
                 }
                 break;
             case 99 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:613: RULE_DECIMAL
+                // InternalCheck.g:1:613: RULE_DECIMAL
                 {
                 mRULE_DECIMAL(); 
 
                 }
                 break;
             case 100 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:626: RULE_ID
+                // InternalCheck.g:1:626: RULE_ID
                 {
                 mRULE_ID(); 
 
                 }
                 break;
             case 101 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:634: RULE_STRING
+                // InternalCheck.g:1:634: RULE_STRING
                 {
                 mRULE_STRING(); 
 
                 }
                 break;
             case 102 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:646: RULE_ML_COMMENT
+                // InternalCheck.g:1:646: RULE_ML_COMMENT
                 {
                 mRULE_ML_COMMENT(); 
 
                 }
                 break;
             case 103 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:662: RULE_SL_COMMENT
+                // InternalCheck.g:1:662: RULE_SL_COMMENT
                 {
                 mRULE_SL_COMMENT(); 
 
                 }
                 break;
             case 104 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:678: RULE_WS
+                // InternalCheck.g:1:678: RULE_WS
                 {
                 mRULE_WS(); 
 
                 }
                 break;
             case 105 :
-                // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1:686: RULE_ANY_OTHER
+                // InternalCheck.g:1:686: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -3714,110 +3714,19 @@ public void mTokens() throws RecognitionException {
 
     protected DFA21 dfa21 = new DFA21(this);
     static final String DFA21_eotS =
-        "\1\uffff\1\66\1\70\1\72\14\76\1\130\1\134\1\137\1\143\1\145\1\147"+
-        "\1\151\1\153\1\155\1\160\3\76\12\uffff\1\76\1\u0082\3\76\2\u008b"+
-        "\1\63\5\uffff\1\u0090\6\uffff\3\76\1\uffff\10\76\1\u009d\7\76\1"+
-        "\u00a8\3\76\1\u00ac\2\76\20\uffff\1\u00b0\5\uffff\1\u00b2\4\uffff"+
-        "\5\76\12\uffff\1\u00b9\2\uffff\6\76\1\uffff\1\u008b\6\uffff\14\76"+
-        "\1\uffff\12\76\1\uffff\2\76\1\u00dc\1\uffff\2\76\4\uffff\1\u00df"+
-        "\1\u00e0\1\76\1\u00e2\2\76\1\uffff\1\u00e5\3\76\1\u00e9\4\76\1\u00ee"+
-        "\5\76\1\u00f4\6\76\1\u00fb\2\76\1\u00fe\5\76\1\u0104\1\u0105\1\76"+
-        "\1\uffff\1\76\1\u0108\2\uffff\1\76\1\uffff\2\76\1\uffff\1\u010c"+
-        "\2\76\1\uffff\1\u010f\2\76\1\u0113\1\uffff\1\76\1\u0115\3\76\1\uffff"+
-        "\2\76\1\u011b\2\76\1\u011e\1\uffff\1\76\1\u0120\1\uffff\1\76\1\u0122"+
-        "\3\76\2\uffff\2\76\1\uffff\1\u0128\1\u012a\1\76\1\uffff\1\76\1\u012d"+
-        "\1\uffff\3\76\1\uffff\1\u0131\1\uffff\1\u0132\1\76\1\u0134\1\76"+
-        "\1\u0136\1\uffff\2\76\1\uffff\1\76\1\uffff\1\76\1\uffff\1\76\1\u013c"+
-        "\3\76\1\uffff\1\76\1\uffff\1\76\1\u0142\1\uffff\1\u0143\1\u0144"+
-        "\1\76\2\uffff\1\76\1\uffff\1\76\1\uffff\1\u0148\1\76\1\u014a\1\u014b"+
-        "\1\u014c\1\uffff\1\76\1\u014e\1\76\1\u0150\1\u0151\3\uffff\3\76"+
-        "\1\uffff\1\u0155\3\uffff\1\u0156\1\uffff\1\76\2\uffff\1\u0158\2"+
-        "\76\2\uffff\1\76\1\uffff\1\76\1\u015d\2\76\1\uffff\1\76\1\u0161"+
-        "\1\76\1\uffff\1\u0163\1\uffff";
+        "\1\uffff\1\66\1\70\1\72\14\76\1\130\1\134\1\137\1\143\1\145\1\147\1\151\1\153\1\155\1\160\3\76\12\uffff\1\76\1\u0082\3\76\2\u008b\1\63\5\uffff\1\u0090\6\uffff\3\76\1\uffff\10\76\1\u009d\7\76\1\u00a8\3\76\1\u00ac\2\76\20\uffff\1\u00b0\5\uffff\1\u00b2\4\uffff\5\76\12\uffff\1\u00b9\2\uffff\6\76\1\uffff\1\u008b\6\uffff\14\76\1\uffff\12\76\1\uffff\2\76\1\u00dc\1\uffff\2\76\4\uffff\1\u00df\1\u00e0\1\76\1\u00e2\2\76\1\uffff\1\u00e5\3\76\1\u00e9\4\76\1\u00ee\5\76\1\u00f4\6\76\1\u00fb\2\76\1\u00fe\5\76\1\u0104\1\u0105\1\76\1\uffff\1\76\1\u0108\2\uffff\1\76\1\uffff\2\76\1\uffff\1\u010c\2\76\1\uffff\1\u010f\2\76\1\u0113\1\uffff\1\76\1\u0115\3\76\1\uffff\2\76\1\u011b\2\76\1\u011e\1\uffff\1\76\1\u0120\1\uffff\1\76\1\u0122\3\76\2\uffff\2\76\1\uffff\1\u0128\1\u012a\1\76\1\uffff\1\76\1\u012d\1\uffff\3\76\1\uffff\1\u0131\1\uffff\1\u0132\1\76\1\u0134\1\76\1\u0136\1\uffff\2\76\1\uffff\1\76\1\uffff\1\76\1\uffff\1\76\1\u013c\3\76\1\uffff\1\76\1\uffff\1\76\1\u0142\1\uffff\1\u0143\1\u0144\1\76\2\uffff\1\76\1\uffff\1\76\1\uffff\1\u0148\1\76\1\u014a\1\u014b\1\u014c\1\uffff\1\76\1\u014e\1\76\1\u0150\1\u0151\3\uffff\3\76\1\uffff\1\u0155\3\uffff\1\u0156\1\uffff\1\76\2\uffff\1\u0158\2\76\2\uffff\1\76\1\uffff\1\76\1\u015d\2\76\1\uffff\1\76\1\u0161\1\76\1\uffff\1\u0163\1\uffff";
     static final String DFA21_eofS =
         "\u0164\uffff";
     static final String DFA21_minS =
-        "\1\0\1\75\1\174\1\46\1\154\1\164\1\146\1\141\1\162\1\141\1\145"+
-        "\1\156\1\151\1\141\1\145\1\151\1\53\1\55\2\52\3\75\1\76\2\56\3\141"+
-        "\12\uffff\1\163\1\72\1\145\1\150\1\145\2\60\1\44\5\uffff\1\75\6"+
-        "\uffff\1\164\1\162\1\163\1\uffff\1\141\1\160\1\151\1\156\1\160\1"+
-        "\146\1\156\1\163\1\44\1\163\2\141\1\164\1\162\1\151\1\163\1\44\1"+
-        "\156\1\164\1\146\1\44\2\166\20\uffff\1\75\5\uffff\1\74\4\uffff\2"+
-        "\154\1\162\1\156\1\143\12\uffff\1\44\2\uffff\1\167\1\154\1\160\1"+
-        "\162\1\165\1\164\1\uffff\1\60\6\uffff\1\145\1\157\1\145\1\164\1"+
-        "\145\1\164\1\143\2\157\1\164\1\157\1\165\1\uffff\1\141\1\145\1\155"+
-        "\1\162\1\150\1\156\1\154\1\163\1\141\1\145\1\uffff\1\144\1\141\1"+
-        "\44\1\uffff\2\145\4\uffff\2\44\1\163\1\44\1\141\1\153\1\uffff\1"+
-        "\44\1\154\1\145\1\157\1\44\1\145\1\165\1\156\1\162\1\44\1\151\1"+
-        "\162\1\143\1\150\1\162\1\44\1\141\1\162\1\145\1\154\1\147\1\150"+
-        "\1\44\1\155\1\144\1\44\1\151\1\145\1\141\1\166\1\155\2\44\1\165"+
-        "\1\uffff\1\162\1\44\2\uffff\1\145\1\uffff\1\154\1\141\1\uffff\1"+
-        "\44\1\157\1\167\1\uffff\1\44\1\162\1\144\1\44\1\uffff\1\143\1\44"+
-        "\1\150\1\162\1\164\1\uffff\1\156\1\145\1\44\2\157\1\44\1\uffff\1"+
-        "\141\1\44\1\uffff\1\156\1\44\1\147\1\145\1\141\2\uffff\1\154\1\151"+
-        "\1\uffff\2\44\1\147\1\uffff\1\146\1\44\1\uffff\1\156\1\163\1\151"+
-        "\1\uffff\1\44\1\uffff\1\44\1\157\1\44\1\143\1\44\1\uffff\1\147\1"+
-        "\162\1\uffff\1\162\1\uffff\1\147\1\uffff\1\145\1\44\1\156\2\164"+
-        "\1\uffff\1\171\1\uffff\1\145\1\44\1\uffff\2\44\1\157\2\uffff\1\156"+
-        "\1\uffff\1\145\1\uffff\1\44\1\171\3\44\1\uffff\1\144\1\44\1\171"+
-        "\2\44\3\uffff\1\156\1\151\1\157\1\uffff\1\44\3\uffff\1\44\1\uffff"+
-        "\1\122\2\uffff\1\44\1\172\1\146\2\uffff\1\141\1\uffff\1\145\1\44"+
-        "\1\156\1\144\1\uffff\1\147\1\44\1\145\1\uffff\1\44\1\uffff";
+        "\1\0\1\75\1\174\1\46\1\154\1\164\1\146\1\141\1\162\1\141\1\145\1\156\1\151\1\141\1\145\1\151\1\53\1\55\2\52\3\75\1\76\2\56\3\141\12\uffff\1\163\1\72\1\145\1\150\1\145\2\60\1\44\5\uffff\1\75\6\uffff\1\164\1\162\1\163\1\uffff\1\141\1\160\1\151\1\156\1\160\1\146\1\156\1\163\1\44\1\163\2\141\1\164\1\162\1\151\1\163\1\44\1\156\1\164\1\146\1\44\2\166\20\uffff\1\75\5\uffff\1\74\4\uffff\2\154\1\162\1\156\1\143\12\uffff\1\44\2\uffff\1\167\1\154\1\160\1\162\1\165\1\164\1\uffff\1\60\6\uffff\1\145\1\157\1\145\1\164\1\145\1\164\1\143\2\157\1\164\1\157\1\165\1\uffff\1\141\1\145\1\155\1\162\1\150\1\156\1\154\1\163\1\141\1\145\1\uffff\1\144\1\141\1\44\1\uffff\2\145\4\uffff\2\44\1\163\1\44\1\141\1\153\1\uffff\1\44\1\154\1\145\1\157\1\44\1\145\1\165\1\156\1\162\1\44\1\151\1\162\1\143\1\150\1\162\1\44\1\141\1\162\1\145\1\154\1\147\1\150\1\44\1\155\1\144\1\44\1\151\1\145\1\141\1\166\1\155\2\44\1\165\1\uffff\1\162\1\44\2\uffff\1\145\1\uffff\1\154\1\141\1\uffff\1\44\1\157\1\167\1\uffff\1\44\1\162\1\144\1\44\1\uffff\1\143\1\44\1\150\1\162\1\164\1\uffff\1\156\1\145\1\44\2\157\1\44\1\uffff\1\141\1\44\1\uffff\1\156\1\44\1\147\1\145\1\141\2\uffff\1\154\1\151\1\uffff\2\44\1\147\1\uffff\1\146\1\44\1\uffff\1\156\1\163\1\151\1\uffff\1\44\1\uffff\1\44\1\157\1\44\1\143\1\44\1\uffff\1\147\1\162\1\uffff\1\162\1\uffff\1\147\1\uffff\1\145\1\44\1\156\2\164\1\uffff\1\171\1\uffff\1\145\1\44\1\uffff\2\44\1\157\2\uffff\1\156\1\uffff\1\145\1\uffff\1\44\1\171\3\44\1\uffff\1\144\1\44\1\171\2\44\3\uffff\1\156\1\151\1\157\1\uffff\1\44\3\uffff\1\44\1\uffff\1\122\2\uffff\1\44\1\172\1\146\2\uffff\1\141\1\uffff\1\145\1\44\1\156\1\144\1\uffff\1\147\1\44\1\145\1\uffff\1\44\1\uffff";
     static final String DFA21_maxS =
-        "\1\uffff\1\76\1\174\1\46\1\170\1\171\1\163\1\141\1\165\1\151\1"+
-        "\145\1\156\1\151\1\157\1\145\1\151\1\75\1\76\5\75\1\76\1\56\1\72"+
-        "\1\141\1\157\1\141\12\uffff\1\163\1\72\1\165\1\171\1\145\1\170\1"+
-        "\154\1\172\5\uffff\1\75\6\uffff\1\164\1\162\1\163\1\uffff\1\141"+
-        "\1\160\1\151\1\156\1\160\1\163\1\156\1\163\1\172\1\164\2\141\1\164"+
-        "\1\162\1\151\1\163\1\172\1\156\1\164\1\146\1\172\2\166\20\uffff"+
-        "\1\75\5\uffff\1\74\4\uffff\1\162\1\154\1\162\1\156\1\143\12\uffff"+
-        "\1\172\2\uffff\1\167\1\154\1\160\1\162\1\171\1\164\1\uffff\1\154"+
-        "\6\uffff\1\145\1\157\1\145\1\164\1\145\1\164\1\143\2\157\1\164\1"+
-        "\157\1\165\1\uffff\2\145\1\155\1\162\1\150\1\156\1\154\1\163\1\141"+
-        "\1\145\1\uffff\1\144\1\141\1\172\1\uffff\2\145\4\uffff\2\172\1\163"+
-        "\1\172\1\141\1\153\1\uffff\1\172\1\154\1\145\1\157\1\172\1\145\1"+
-        "\165\1\156\1\162\1\172\1\151\1\162\1\143\1\150\1\162\1\172\1\141"+
-        "\1\162\1\145\1\154\1\147\1\150\1\172\1\155\1\144\1\172\1\151\1\145"+
-        "\1\141\1\166\1\155\2\172\1\165\1\uffff\1\162\1\172\2\uffff\1\145"+
-        "\1\uffff\1\154\1\141\1\uffff\1\172\1\157\1\167\1\uffff\1\172\1\162"+
-        "\1\163\1\172\1\uffff\1\143\1\172\1\150\1\162\1\164\1\uffff\1\156"+
-        "\1\145\1\172\2\157\1\172\1\uffff\1\141\1\172\1\uffff\1\156\1\172"+
-        "\1\147\1\145\1\141\2\uffff\1\154\1\151\1\uffff\2\172\1\147\1\uffff"+
-        "\1\146\1\172\1\uffff\1\156\1\163\1\151\1\uffff\1\172\1\uffff\1\172"+
-        "\1\157\1\172\1\143\1\172\1\uffff\1\147\1\162\1\uffff\1\162\1\uffff"+
-        "\1\147\1\uffff\1\145\1\172\1\156\2\164\1\uffff\1\171\1\uffff\1\145"+
-        "\1\172\1\uffff\2\172\1\157\2\uffff\1\156\1\uffff\1\145\1\uffff\1"+
-        "\172\1\171\3\172\1\uffff\1\144\1\172\1\171\2\172\3\uffff\1\156\1"+
-        "\151\1\157\1\uffff\1\172\3\uffff\1\172\1\uffff\1\122\2\uffff\2\172"+
-        "\1\146\2\uffff\1\141\1\uffff\1\145\1\172\1\156\1\144\1\uffff\1\147"+
-        "\1\172\1\145\1\uffff\1\172\1\uffff";
+        "\1\uffff\1\76\1\174\1\46\1\170\1\171\1\163\1\141\1\165\1\151\1\145\1\156\1\151\1\157\1\145\1\151\1\75\1\76\5\75\1\76\1\56\1\72\1\141\1\157\1\141\12\uffff\1\163\1\72\1\165\1\171\1\145\1\170\1\154\1\172\5\uffff\1\75\6\uffff\1\164\1\162\1\163\1\uffff\1\141\1\160\1\151\1\156\1\160\1\163\1\156\1\163\1\172\1\164\2\141\1\164\1\162\1\151\1\163\1\172\1\156\1\164\1\146\1\172\2\166\20\uffff\1\75\5\uffff\1\74\4\uffff\1\162\1\154\1\162\1\156\1\143\12\uffff\1\172\2\uffff\1\167\1\154\1\160\1\162\1\171\1\164\1\uffff\1\154\6\uffff\1\145\1\157\1\145\1\164\1\145\1\164\1\143\2\157\1\164\1\157\1\165\1\uffff\2\145\1\155\1\162\1\150\1\156\1\154\1\163\1\141\1\145\1\uffff\1\144\1\141\1\172\1\uffff\2\145\4\uffff\2\172\1\163\1\172\1\141\1\153\1\uffff\1\172\1\154\1\145\1\157\1\172\1\145\1\165\1\156\1\162\1\172\1\151\1\162\1\143\1\150\1\162\1\172\1\141\1\162\1\145\1\154\1\147\1\150\1\172\1\155\1\144\1\172\1\151\1\145\1\141\1\166\1\155\2\172\1\165\1\uffff\1\162\1\172\2\uffff\1\145\1\uffff\1\154\1\141\1\uffff\1\172\1\157\1\167\1\uffff\1\172\1\162\1\163\1\172\1\uffff\1\143\1\172\1\150\1\162\1\164\1\uffff\1\156\1\145\1\172\2\157\1\172\1\uffff\1\141\1\172\1\uffff\1\156\1\172\1\147\1\145\1\141\2\uffff\1\154\1\151\1\uffff\2\172\1\147\1\uffff\1\146\1\172\1\uffff\1\156\1\163\1\151\1\uffff\1\172\1\uffff\1\172\1\157\1\172\1\143\1\172\1\uffff\1\147\1\162\1\uffff\1\162\1\uffff\1\147\1\uffff\1\145\1\172\1\156\2\164\1\uffff\1\171\1\uffff\1\145\1\172\1\uffff\2\172\1\157\2\uffff\1\156\1\uffff\1\145\1\uffff\1\172\1\171\3\172\1\uffff\1\144\1\172\1\171\2\172\3\uffff\1\156\1\151\1\157\1\uffff\1\172\3\uffff\1\172\1\uffff\1\122\2\uffff\2\172\1\146\2\uffff\1\141\1\uffff\1\145\1\172\1\156\1\144\1\uffff\1\147\1\172\1\145\1\uffff\1\172\1\uffff";
     static final String DFA21_acceptS =
-        "\35\uffff\1\70\1\71\1\73\1\74\1\75\1\76\1\77\1\101\1\102\1\103"+
-        "\10\uffff\1\144\2\145\1\150\1\151\1\uffff\1\47\1\1\1\2\1\136\1\3"+
-        "\1\132\3\uffff\1\144\27\uffff\1\30\1\61\1\52\1\31\1\44\1\62\1\53"+
-        "\1\32\1\55\1\54\1\33\1\146\1\147\1\56\1\34\1\57\1\uffff\1\60\1\41"+
-        "\1\42\1\50\1\43\1\uffff\1\63\1\51\1\135\1\131\5\uffff\1\70\1\71"+
-        "\1\73\1\74\1\75\1\76\1\77\1\101\1\102\1\103\1\uffff\1\134\1\113"+
-        "\6\uffff\1\141\1\uffff\1\142\1\143\1\145\1\150\1\37\1\35\14\uffff"+
-        "\1\110\12\uffff\1\15\3\uffff\1\117\2\uffff\1\40\1\36\1\45\1\46\6"+
-        "\uffff\1\107\42\uffff\1\100\2\uffff\1\64\1\137\1\uffff\1\72\2\uffff"+
-        "\1\120\3\uffff\1\125\4\uffff\1\111\5\uffff\1\23\6\uffff\1\115\2"+
-        "\uffff\1\12\5\uffff\1\16\1\17\2\uffff\1\25\3\uffff\1\121\2\uffff"+
-        "\1\140\3\uffff\1\21\1\uffff\1\65\5\uffff\1\105\2\uffff\1\130\1\uffff"+
-        "\1\104\1\uffff\1\116\5\uffff\1\66\1\uffff\1\133\2\uffff\1\123\3"+
-        "\uffff\1\5\1\112\1\uffff\1\6\1\uffff\1\24\5\uffff\1\26\5\uffff\1"+
-        "\122\1\124\1\4\3\uffff\1\10\1\uffff\1\11\1\22\1\14\1\uffff\1\114"+
-        "\1\uffff\1\126\1\67\3\uffff\1\13\1\27\1\uffff\1\7\4\uffff\1\106"+
-        "\3\uffff\1\127\1\uffff\1\20";
+        "\35\uffff\1\70\1\71\1\73\1\74\1\75\1\76\1\77\1\101\1\102\1\103\10\uffff\1\144\2\145\1\150\1\151\1\uffff\1\47\1\1\1\2\1\136\1\3\1\132\3\uffff\1\144\27\uffff\1\30\1\61\1\52\1\31\1\44\1\62\1\53\1\32\1\55\1\54\1\33\1\146\1\147\1\56\1\34\1\57\1\uffff\1\60\1\41\1\42\1\50\1\43\1\uffff\1\63\1\51\1\135\1\131\5\uffff\1\70\1\71\1\73\1\74\1\75\1\76\1\77\1\101\1\102\1\103\1\uffff\1\134\1\113\6\uffff\1\141\1\uffff\1\142\1\143\1\145\1\150\1\37\1\35\14\uffff\1\110\12\uffff\1\15\3\uffff\1\117\2\uffff\1\40\1\36\1\45\1\46\6\uffff\1\107\42\uffff\1\100\2\uffff\1\64\1\137\1\uffff\1\72\2\uffff\1\120\3\uffff\1\125\4\uffff\1\111\5\uffff\1\23\6\uffff\1\115\2\uffff\1\12\5\uffff\1\16\1\17\2\uffff\1\25\3\uffff\1\121\2\uffff\1\140\3\uffff\1\21\1\uffff\1\65\5\uffff\1\105\2\uffff\1\130\1\uffff\1\104\1\uffff\1\116\5\uffff\1\66\1\uffff\1\133\2\uffff\1\123\3\uffff\1\5\1\112\1\uffff\1\6\1\uffff\1\24\5\uffff\1\26\5\uffff\1\122\1\124\1\4\3\uffff\1\10\1\uffff\1\11\1\22\1\14\1\uffff\1\114\1\uffff\1\126\1\67\3\uffff\1\13\1\27\1\uffff\1\7\4\uffff\1\106\3\uffff\1\127\1\uffff\1\20";
     static final String DFA21_specialS =
         "\1\0\u0163\uffff}>";
     static final String[] DFA21_transitionS = {
-            "\11\63\2\62\2\63\1\62\22\63\1\62\1\25\1\60\1\44\1\57\1\24\1"+
-            "\3\1\61\1\40\1\41\1\22\1\20\1\42\1\21\1\30\1\23\1\54\11\55\1"+
-            "\50\1\37\1\27\1\1\1\26\1\31\1\43\22\57\1\16\7\57\1\45\1\63\1"+
-            "\46\1\56\1\57\1\63\1\47\1\14\1\7\1\15\1\4\1\33\1\10\1\57\1\6"+
-            "\2\57\1\17\1\12\1\51\1\13\1\34\1\57\1\53\1\5\1\52\1\57\1\32"+
-            "\1\11\3\57\1\35\1\2\1\36\uff82\63",
+            "\11\63\2\62\2\63\1\62\22\63\1\62\1\25\1\60\1\44\1\57\1\24\1\3\1\61\1\40\1\41\1\22\1\20\1\42\1\21\1\30\1\23\1\54\11\55\1\50\1\37\1\27\1\1\1\26\1\31\1\43\22\57\1\16\7\57\1\45\1\63\1\46\1\56\1\57\1\63\1\47\1\14\1\7\1\15\1\4\1\33\1\10\1\57\1\6\2\57\1\17\1\12\1\51\1\13\1\34\1\57\1\53\1\5\1\52\1\57\1\32\1\11\3\57\1\35\1\2\1\36\uff82\63",
             "\1\64\1\65",
             "\1\67",
             "\1\71",
@@ -3861,12 +3770,8 @@ public void mTokens() throws RecognitionException {
             "\1\u0083\17\uffff\1\u0084",
             "\1\u0086\11\uffff\1\u0087\6\uffff\1\u0085",
             "\1\u0088",
-            "\12\u008a\10\uffff\1\u008c\1\uffff\3\u008c\5\uffff\1\u008c"+
-            "\13\uffff\1\u0089\6\uffff\1\u008a\2\uffff\1\u008c\1\uffff\3"+
-            "\u008c\5\uffff\1\u008c\13\uffff\1\u0089",
-            "\12\u008a\10\uffff\1\u008c\1\uffff\3\u008c\5\uffff\1\u008c"+
-            "\22\uffff\1\u008a\2\uffff\1\u008c\1\uffff\3\u008c\5\uffff\1"+
-            "\u008c",
+            "\12\u008a\10\uffff\1\u008c\1\uffff\3\u008c\5\uffff\1\u008c\13\uffff\1\u0089\6\uffff\1\u008a\2\uffff\1\u008c\1\uffff\3\u008c\5\uffff\1\u008c\13\uffff\1\u0089",
+            "\12\u008a\10\uffff\1\u008c\1\uffff\3\u008c\5\uffff\1\u008c\22\uffff\1\u008a\2\uffff\1\u008c\1\uffff\3\u008c\5\uffff\1\u008c",
             "\1\76\34\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
             "",
             "",
@@ -3892,8 +3797,7 @@ public void mTokens() throws RecognitionException {
             "\1\u0099\14\uffff\1\u009a",
             "\1\u009b",
             "\1\u009c",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
             "\1\u009f\1\u009e",
             "\1\u00a0",
             "\1\u00a1",
@@ -3901,13 +3805,11 @@ public void mTokens() throws RecognitionException {
             "\1\u00a3",
             "\1\u00a4",
             "\1\u00a5",
-            "\1\76\13\uffff\12\76\7\uffff\3\76\1\u00a7\16\76\1\u00a6\7"+
-            "\76\4\uffff\1\76\1\uffff\32\76",
+            "\1\76\13\uffff\12\76\7\uffff\3\76\1\u00a7\16\76\1\u00a6\7\76\4\uffff\1\76\1\uffff\32\76",
             "\1\u00a9",
             "\1\u00aa",
             "\1\u00ab",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
             "\1\u00ad",
             "\1\u00ae",
             "",
@@ -3952,8 +3854,7 @@ public void mTokens() throws RecognitionException {
             "",
             "",
             "",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
             "",
             "",
             "\1\u00ba",
@@ -3963,9 +3864,7 @@ public void mTokens() throws RecognitionException {
             "\1\u00bf\3\uffff\1\u00be",
             "\1\u00c0",
             "",
-            "\12\u008a\10\uffff\1\u008c\1\uffff\3\u008c\5\uffff\1\u008c"+
-            "\22\uffff\1\u008a\2\uffff\1\u008c\1\uffff\3\u008c\5\uffff\1"+
-            "\u008c",
+            "\12\u008a\10\uffff\1\u008c\1\uffff\3\u008c\5\uffff\1\u008c\22\uffff\1\u008a\2\uffff\1\u008c\1\uffff\3\u008c\5\uffff\1\u008c",
             "",
             "",
             "",
@@ -3998,8 +3897,7 @@ public void mTokens() throws RecognitionException {
             "",
             "\1\u00d9",
             "\1\u00da",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\1"+
-            "\u00db\31\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\1\u00db\31\76",
             "",
             "\1\u00dd",
             "\1\u00de",
@@ -4007,62 +3905,50 @@ public void mTokens() throws RecognitionException {
             "",
             "",
             "",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
             "\1\u00e1",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
             "\1\u00e3",
             "\1\u00e4",
             "",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
             "\1\u00e6",
             "\1\u00e7",
             "\1\u00e8",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
             "\1\u00ea",
             "\1\u00eb",
             "\1\u00ec",
             "\1\u00ed",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
             "\1\u00ef",
             "\1\u00f0",
             "\1\u00f1",
             "\1\u00f2",
             "\1\u00f3",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
             "\1\u00f5",
             "\1\u00f6",
             "\1\u00f7",
             "\1\u00f8",
             "\1\u00f9",
             "\1\u00fa",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
             "\1\u00fc",
             "\1\u00fd",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
             "\1\u00ff",
             "\1\u0100",
             "\1\u0101",
             "\1\u0102",
             "\1\u0103",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
             "\1\u0106",
             "",
             "\1\u0107",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
             "",
             "",
             "\1\u0109",
@@ -4070,41 +3956,33 @@ public void mTokens() throws RecognitionException {
             "\1\u010a",
             "\1\u010b",
             "",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
             "\1\u010d",
             "\1\u010e",
             "",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
             "\1\u0110",
             "\1\u0111\16\uffff\1\u0112",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
             "",
             "\1\u0114",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
             "\1\u0116",
             "\1\u0117",
             "\1\u0118",
             "",
             "\1\u0119",
             "\1\u011a",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
             "\1\u011c",
             "\1\u011d",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
             "",
             "\1\u011f",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
             "",
             "\1\u0121",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
             "\1\u0123",
             "\1\u0124",
             "\1\u0125",
@@ -4113,31 +3991,24 @@ public void mTokens() throws RecognitionException {
             "\1\u0126",
             "\1\u0127",
             "",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\13"+
-            "\76\1\u0129\16\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\13\76\1\u0129\16\76",
             "\1\u012b",
             "",
             "\1\u012c",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
             "",
             "\1\u012e",
             "\1\u012f",
             "\1\u0130",
             "",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
             "",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
             "\1\u0133",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
             "\1\u0135",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
             "",
             "\1\u0137",
             "\1\u0138",
@@ -4147,8 +4018,7 @@ public void mTokens() throws RecognitionException {
             "\1\u013a",
             "",
             "\1\u013b",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
             "\1\u013d",
             "\1\u013e",
             "\1\u013f",
@@ -4156,13 +4026,10 @@ public void mTokens() throws RecognitionException {
             "\1\u0140",
             "",
             "\1\u0141",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
             "",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
             "\1\u0145",
             "",
             "",
@@ -4170,24 +4037,17 @@ public void mTokens() throws RecognitionException {
             "",
             "\1\u0147",
             "",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
             "\1\u0149",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
             "",
             "\1\u014d",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
             "\1\u014f",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
             "",
             "",
             "",
@@ -4195,19 +4055,16 @@ public void mTokens() throws RecognitionException {
             "\1\u0153",
             "\1\u0154",
             "",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
             "",
             "",
             "",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
             "",
             "\1\u0157",
             "",
             "",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
             "\1\u0159",
             "\1\u015a",
             "",
@@ -4215,18 +4072,15 @@ public void mTokens() throws RecognitionException {
             "\1\u015b",
             "",
             "\1\u015c",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
             "\1\u015e",
             "\1\u015f",
             "",
             "\1\u0160",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
             "\1\u0162",
             "",
-            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32"+
-            "\76",
+            "\1\76\13\uffff\12\76\7\uffff\32\76\4\uffff\1\76\1\uffff\32\76",
             ""
     };
 
diff --git a/com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheckParser.java b/com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheckParser.java
index 79e6a5bec..c982f3118 100644
--- a/com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheckParser.java
+++ b/com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheckParser.java
@@ -146,7 +146,7 @@ public InternalCheckParser(TokenStream input, RecognizerSharedState state) {
         
 
     public String[] getTokenNames() { return InternalCheckParser.tokenNames; }
-    public String getGrammarFileName() { return "../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g"; }
+    public String getGrammarFileName() { return "InternalCheck.g"; }
 
 
      
@@ -170,16 +170,16 @@ protected String getValueForTokenName(String tokenName) {
 
 
     // $ANTLR start "entryRuleCheckCatalog"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:61:1: entryRuleCheckCatalog : ruleCheckCatalog EOF ;
+    // InternalCheck.g:61:1: entryRuleCheckCatalog : ruleCheckCatalog EOF ;
     public final void entryRuleCheckCatalog() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:62:1: ( ruleCheckCatalog EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:63:1: ruleCheckCatalog EOF
+            // InternalCheck.g:62:1: ( ruleCheckCatalog EOF )
+            // InternalCheck.g:63:1: ruleCheckCatalog EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckCatalogRule()); 
             }
-            pushFollow(FOLLOW_ruleCheckCatalog_in_entryRuleCheckCatalog67);
+            pushFollow(FOLLOW_1);
             ruleCheckCatalog();
 
             state._fsp--;
@@ -187,7 +187,7 @@ public final void entryRuleCheckCatalog() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCheckCatalogRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleCheckCatalog74); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -204,25 +204,25 @@ public final void entryRuleCheckCatalog() throws RecognitionException {
 
 
     // $ANTLR start "ruleCheckCatalog"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:70:1: ruleCheckCatalog : ( ( rule__CheckCatalog__Group__0 ) ) ;
+    // InternalCheck.g:70:1: ruleCheckCatalog : ( ( rule__CheckCatalog__Group__0 ) ) ;
     public final void ruleCheckCatalog() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:74:2: ( ( ( rule__CheckCatalog__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:75:1: ( ( rule__CheckCatalog__Group__0 ) )
+            // InternalCheck.g:74:2: ( ( ( rule__CheckCatalog__Group__0 ) ) )
+            // InternalCheck.g:75:1: ( ( rule__CheckCatalog__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:75:1: ( ( rule__CheckCatalog__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:76:1: ( rule__CheckCatalog__Group__0 )
+            // InternalCheck.g:75:1: ( ( rule__CheckCatalog__Group__0 ) )
+            // InternalCheck.g:76:1: ( rule__CheckCatalog__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckCatalogAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:77:1: ( rule__CheckCatalog__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:77:2: rule__CheckCatalog__Group__0
+            // InternalCheck.g:77:1: ( rule__CheckCatalog__Group__0 )
+            // InternalCheck.g:77:2: rule__CheckCatalog__Group__0
             {
-            pushFollow(FOLLOW_rule__CheckCatalog__Group__0_in_ruleCheckCatalog100);
+            pushFollow(FOLLOW_2);
             rule__CheckCatalog__Group__0();
 
             state._fsp--;
@@ -255,16 +255,16 @@ public final void ruleCheckCatalog() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXImportSection"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:89:1: entryRuleXImportSection : ruleXImportSection EOF ;
+    // InternalCheck.g:89:1: entryRuleXImportSection : ruleXImportSection EOF ;
     public final void entryRuleXImportSection() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:90:1: ( ruleXImportSection EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:91:1: ruleXImportSection EOF
+            // InternalCheck.g:90:1: ( ruleXImportSection EOF )
+            // InternalCheck.g:91:1: ruleXImportSection EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportSectionRule()); 
             }
-            pushFollow(FOLLOW_ruleXImportSection_in_entryRuleXImportSection127);
+            pushFollow(FOLLOW_1);
             ruleXImportSection();
 
             state._fsp--;
@@ -272,7 +272,7 @@ public final void entryRuleXImportSection() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXImportSectionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXImportSection134); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -289,25 +289,25 @@ public final void entryRuleXImportSection() throws RecognitionException {
 
 
     // $ANTLR start "ruleXImportSection"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:98:1: ruleXImportSection : ( ( rule__XImportSection__Group__0 ) ) ;
+    // InternalCheck.g:98:1: ruleXImportSection : ( ( rule__XImportSection__Group__0 ) ) ;
     public final void ruleXImportSection() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:102:2: ( ( ( rule__XImportSection__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:103:1: ( ( rule__XImportSection__Group__0 ) )
+            // InternalCheck.g:102:2: ( ( ( rule__XImportSection__Group__0 ) ) )
+            // InternalCheck.g:103:1: ( ( rule__XImportSection__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:103:1: ( ( rule__XImportSection__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:104:1: ( rule__XImportSection__Group__0 )
+            // InternalCheck.g:103:1: ( ( rule__XImportSection__Group__0 ) )
+            // InternalCheck.g:104:1: ( rule__XImportSection__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportSectionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:105:1: ( rule__XImportSection__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:105:2: rule__XImportSection__Group__0
+            // InternalCheck.g:105:1: ( rule__XImportSection__Group__0 )
+            // InternalCheck.g:105:2: rule__XImportSection__Group__0
             {
-            pushFollow(FOLLOW_rule__XImportSection__Group__0_in_ruleXImportSection160);
+            pushFollow(FOLLOW_2);
             rule__XImportSection__Group__0();
 
             state._fsp--;
@@ -340,16 +340,16 @@ public final void ruleXImportSection() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXImportDeclaration"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:117:1: entryRuleXImportDeclaration : ruleXImportDeclaration EOF ;
+    // InternalCheck.g:117:1: entryRuleXImportDeclaration : ruleXImportDeclaration EOF ;
     public final void entryRuleXImportDeclaration() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:118:1: ( ruleXImportDeclaration EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:119:1: ruleXImportDeclaration EOF
+            // InternalCheck.g:118:1: ( ruleXImportDeclaration EOF )
+            // InternalCheck.g:119:1: ruleXImportDeclaration EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationRule()); 
             }
-            pushFollow(FOLLOW_ruleXImportDeclaration_in_entryRuleXImportDeclaration187);
+            pushFollow(FOLLOW_1);
             ruleXImportDeclaration();
 
             state._fsp--;
@@ -357,7 +357,7 @@ public final void entryRuleXImportDeclaration() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXImportDeclarationRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXImportDeclaration194); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -374,25 +374,25 @@ public final void entryRuleXImportDeclaration() throws RecognitionException {
 
 
     // $ANTLR start "ruleXImportDeclaration"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:126:1: ruleXImportDeclaration : ( ( rule__XImportDeclaration__Group__0 ) ) ;
+    // InternalCheck.g:126:1: ruleXImportDeclaration : ( ( rule__XImportDeclaration__Group__0 ) ) ;
     public final void ruleXImportDeclaration() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:130:2: ( ( ( rule__XImportDeclaration__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:131:1: ( ( rule__XImportDeclaration__Group__0 ) )
+            // InternalCheck.g:130:2: ( ( ( rule__XImportDeclaration__Group__0 ) ) )
+            // InternalCheck.g:131:1: ( ( rule__XImportDeclaration__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:131:1: ( ( rule__XImportDeclaration__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:132:1: ( rule__XImportDeclaration__Group__0 )
+            // InternalCheck.g:131:1: ( ( rule__XImportDeclaration__Group__0 ) )
+            // InternalCheck.g:132:1: ( rule__XImportDeclaration__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:133:1: ( rule__XImportDeclaration__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:133:2: rule__XImportDeclaration__Group__0
+            // InternalCheck.g:133:1: ( rule__XImportDeclaration__Group__0 )
+            // InternalCheck.g:133:2: rule__XImportDeclaration__Group__0
             {
-            pushFollow(FOLLOW_rule__XImportDeclaration__Group__0_in_ruleXImportDeclaration220);
+            pushFollow(FOLLOW_2);
             rule__XImportDeclaration__Group__0();
 
             state._fsp--;
@@ -425,16 +425,16 @@ public final void ruleXImportDeclaration() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleCategory"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:149:1: entryRuleCategory : ruleCategory EOF ;
+    // InternalCheck.g:149:1: entryRuleCategory : ruleCategory EOF ;
     public final void entryRuleCategory() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:150:1: ( ruleCategory EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:151:1: ruleCategory EOF
+            // InternalCheck.g:150:1: ( ruleCategory EOF )
+            // InternalCheck.g:151:1: ruleCategory EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCategoryRule()); 
             }
-            pushFollow(FOLLOW_ruleCategory_in_entryRuleCategory251);
+            pushFollow(FOLLOW_1);
             ruleCategory();
 
             state._fsp--;
@@ -442,7 +442,7 @@ public final void entryRuleCategory() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCategoryRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleCategory258); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -459,25 +459,25 @@ public final void entryRuleCategory() throws RecognitionException {
 
 
     // $ANTLR start "ruleCategory"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:158:1: ruleCategory : ( ( rule__Category__Group__0 ) ) ;
+    // InternalCheck.g:158:1: ruleCategory : ( ( rule__Category__Group__0 ) ) ;
     public final void ruleCategory() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:162:2: ( ( ( rule__Category__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:163:1: ( ( rule__Category__Group__0 ) )
+            // InternalCheck.g:162:2: ( ( ( rule__Category__Group__0 ) ) )
+            // InternalCheck.g:163:1: ( ( rule__Category__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:163:1: ( ( rule__Category__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:164:1: ( rule__Category__Group__0 )
+            // InternalCheck.g:163:1: ( ( rule__Category__Group__0 ) )
+            // InternalCheck.g:164:1: ( rule__Category__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCategoryAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:165:1: ( rule__Category__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:165:2: rule__Category__Group__0
+            // InternalCheck.g:165:1: ( rule__Category__Group__0 )
+            // InternalCheck.g:165:2: rule__Category__Group__0
             {
-            pushFollow(FOLLOW_rule__Category__Group__0_in_ruleCategory284);
+            pushFollow(FOLLOW_2);
             rule__Category__Group__0();
 
             state._fsp--;
@@ -510,16 +510,16 @@ public final void ruleCategory() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleCheck"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:177:1: entryRuleCheck : ruleCheck EOF ;
+    // InternalCheck.g:177:1: entryRuleCheck : ruleCheck EOF ;
     public final void entryRuleCheck() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:178:1: ( ruleCheck EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:179:1: ruleCheck EOF
+            // InternalCheck.g:178:1: ( ruleCheck EOF )
+            // InternalCheck.g:179:1: ruleCheck EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckRule()); 
             }
-            pushFollow(FOLLOW_ruleCheck_in_entryRuleCheck311);
+            pushFollow(FOLLOW_1);
             ruleCheck();
 
             state._fsp--;
@@ -527,7 +527,7 @@ public final void entryRuleCheck() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCheckRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleCheck318); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -544,25 +544,25 @@ public final void entryRuleCheck() throws RecognitionException {
 
 
     // $ANTLR start "ruleCheck"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:186:1: ruleCheck : ( ( rule__Check__Group__0 ) ) ;
+    // InternalCheck.g:186:1: ruleCheck : ( ( rule__Check__Group__0 ) ) ;
     public final void ruleCheck() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:190:2: ( ( ( rule__Check__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:191:1: ( ( rule__Check__Group__0 ) )
+            // InternalCheck.g:190:2: ( ( ( rule__Check__Group__0 ) ) )
+            // InternalCheck.g:191:1: ( ( rule__Check__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:191:1: ( ( rule__Check__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:192:1: ( rule__Check__Group__0 )
+            // InternalCheck.g:191:1: ( ( rule__Check__Group__0 ) )
+            // InternalCheck.g:192:1: ( rule__Check__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:193:1: ( rule__Check__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:193:2: rule__Check__Group__0
+            // InternalCheck.g:193:1: ( rule__Check__Group__0 )
+            // InternalCheck.g:193:2: rule__Check__Group__0
             {
-            pushFollow(FOLLOW_rule__Check__Group__0_in_ruleCheck344);
+            pushFollow(FOLLOW_2);
             rule__Check__Group__0();
 
             state._fsp--;
@@ -595,16 +595,16 @@ public final void ruleCheck() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleSeverityRange"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:205:1: entryRuleSeverityRange : ruleSeverityRange EOF ;
+    // InternalCheck.g:205:1: entryRuleSeverityRange : ruleSeverityRange EOF ;
     public final void entryRuleSeverityRange() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:206:1: ( ruleSeverityRange EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:207:1: ruleSeverityRange EOF
+            // InternalCheck.g:206:1: ( ruleSeverityRange EOF )
+            // InternalCheck.g:207:1: ruleSeverityRange EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSeverityRangeRule()); 
             }
-            pushFollow(FOLLOW_ruleSeverityRange_in_entryRuleSeverityRange371);
+            pushFollow(FOLLOW_1);
             ruleSeverityRange();
 
             state._fsp--;
@@ -612,7 +612,7 @@ public final void entryRuleSeverityRange() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSeverityRangeRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSeverityRange378); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -629,25 +629,25 @@ public final void entryRuleSeverityRange() throws RecognitionException {
 
 
     // $ANTLR start "ruleSeverityRange"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:214:1: ruleSeverityRange : ( ( rule__SeverityRange__Group__0 ) ) ;
+    // InternalCheck.g:214:1: ruleSeverityRange : ( ( rule__SeverityRange__Group__0 ) ) ;
     public final void ruleSeverityRange() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:218:2: ( ( ( rule__SeverityRange__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:219:1: ( ( rule__SeverityRange__Group__0 ) )
+            // InternalCheck.g:218:2: ( ( ( rule__SeverityRange__Group__0 ) ) )
+            // InternalCheck.g:219:1: ( ( rule__SeverityRange__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:219:1: ( ( rule__SeverityRange__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:220:1: ( rule__SeverityRange__Group__0 )
+            // InternalCheck.g:219:1: ( ( rule__SeverityRange__Group__0 ) )
+            // InternalCheck.g:220:1: ( rule__SeverityRange__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSeverityRangeAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:221:1: ( rule__SeverityRange__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:221:2: rule__SeverityRange__Group__0
+            // InternalCheck.g:221:1: ( rule__SeverityRange__Group__0 )
+            // InternalCheck.g:221:2: rule__SeverityRange__Group__0
             {
-            pushFollow(FOLLOW_rule__SeverityRange__Group__0_in_ruleSeverityRange404);
+            pushFollow(FOLLOW_2);
             rule__SeverityRange__Group__0();
 
             state._fsp--;
@@ -680,16 +680,16 @@ public final void ruleSeverityRange() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleMember"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:233:1: entryRuleMember : ruleMember EOF ;
+    // InternalCheck.g:233:1: entryRuleMember : ruleMember EOF ;
     public final void entryRuleMember() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:234:1: ( ruleMember EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:235:1: ruleMember EOF
+            // InternalCheck.g:234:1: ( ruleMember EOF )
+            // InternalCheck.g:235:1: ruleMember EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMemberRule()); 
             }
-            pushFollow(FOLLOW_ruleMember_in_entryRuleMember431);
+            pushFollow(FOLLOW_1);
             ruleMember();
 
             state._fsp--;
@@ -697,7 +697,7 @@ public final void entryRuleMember() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getMemberRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleMember438); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -714,25 +714,25 @@ public final void entryRuleMember() throws RecognitionException {
 
 
     // $ANTLR start "ruleMember"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:242:1: ruleMember : ( ( rule__Member__Group__0 ) ) ;
+    // InternalCheck.g:242:1: ruleMember : ( ( rule__Member__Group__0 ) ) ;
     public final void ruleMember() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:246:2: ( ( ( rule__Member__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:247:1: ( ( rule__Member__Group__0 ) )
+            // InternalCheck.g:246:2: ( ( ( rule__Member__Group__0 ) ) )
+            // InternalCheck.g:247:1: ( ( rule__Member__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:247:1: ( ( rule__Member__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:248:1: ( rule__Member__Group__0 )
+            // InternalCheck.g:247:1: ( ( rule__Member__Group__0 ) )
+            // InternalCheck.g:248:1: ( rule__Member__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMemberAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:249:1: ( rule__Member__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:249:2: rule__Member__Group__0
+            // InternalCheck.g:249:1: ( rule__Member__Group__0 )
+            // InternalCheck.g:249:2: rule__Member__Group__0
             {
-            pushFollow(FOLLOW_rule__Member__Group__0_in_ruleMember464);
+            pushFollow(FOLLOW_2);
             rule__Member__Group__0();
 
             state._fsp--;
@@ -765,16 +765,16 @@ public final void ruleMember() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleImplementation"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:261:1: entryRuleImplementation : ruleImplementation EOF ;
+    // InternalCheck.g:261:1: entryRuleImplementation : ruleImplementation EOF ;
     public final void entryRuleImplementation() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:262:1: ( ruleImplementation EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:263:1: ruleImplementation EOF
+            // InternalCheck.g:262:1: ( ruleImplementation EOF )
+            // InternalCheck.g:263:1: ruleImplementation EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImplementationRule()); 
             }
-            pushFollow(FOLLOW_ruleImplementation_in_entryRuleImplementation491);
+            pushFollow(FOLLOW_1);
             ruleImplementation();
 
             state._fsp--;
@@ -782,7 +782,7 @@ public final void entryRuleImplementation() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getImplementationRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleImplementation498); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -799,25 +799,25 @@ public final void entryRuleImplementation() throws RecognitionException {
 
 
     // $ANTLR start "ruleImplementation"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:270:1: ruleImplementation : ( ( rule__Implementation__Group__0 ) ) ;
+    // InternalCheck.g:270:1: ruleImplementation : ( ( rule__Implementation__Group__0 ) ) ;
     public final void ruleImplementation() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:274:2: ( ( ( rule__Implementation__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:275:1: ( ( rule__Implementation__Group__0 ) )
+            // InternalCheck.g:274:2: ( ( ( rule__Implementation__Group__0 ) ) )
+            // InternalCheck.g:275:1: ( ( rule__Implementation__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:275:1: ( ( rule__Implementation__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:276:1: ( rule__Implementation__Group__0 )
+            // InternalCheck.g:275:1: ( ( rule__Implementation__Group__0 ) )
+            // InternalCheck.g:276:1: ( rule__Implementation__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImplementationAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:277:1: ( rule__Implementation__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:277:2: rule__Implementation__Group__0
+            // InternalCheck.g:277:1: ( rule__Implementation__Group__0 )
+            // InternalCheck.g:277:2: rule__Implementation__Group__0
             {
-            pushFollow(FOLLOW_rule__Implementation__Group__0_in_ruleImplementation524);
+            pushFollow(FOLLOW_2);
             rule__Implementation__Group__0();
 
             state._fsp--;
@@ -850,16 +850,16 @@ public final void ruleImplementation() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleFormalParameter"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:289:1: entryRuleFormalParameter : ruleFormalParameter EOF ;
+    // InternalCheck.g:289:1: entryRuleFormalParameter : ruleFormalParameter EOF ;
     public final void entryRuleFormalParameter() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:290:1: ( ruleFormalParameter EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:291:1: ruleFormalParameter EOF
+            // InternalCheck.g:290:1: ( ruleFormalParameter EOF )
+            // InternalCheck.g:291:1: ruleFormalParameter EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormalParameterRule()); 
             }
-            pushFollow(FOLLOW_ruleFormalParameter_in_entryRuleFormalParameter551);
+            pushFollow(FOLLOW_1);
             ruleFormalParameter();
 
             state._fsp--;
@@ -867,7 +867,7 @@ public final void entryRuleFormalParameter() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getFormalParameterRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFormalParameter558); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -884,25 +884,25 @@ public final void entryRuleFormalParameter() throws RecognitionException {
 
 
     // $ANTLR start "ruleFormalParameter"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:298:1: ruleFormalParameter : ( ( rule__FormalParameter__Group__0 ) ) ;
+    // InternalCheck.g:298:1: ruleFormalParameter : ( ( rule__FormalParameter__Group__0 ) ) ;
     public final void ruleFormalParameter() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:302:2: ( ( ( rule__FormalParameter__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:303:1: ( ( rule__FormalParameter__Group__0 ) )
+            // InternalCheck.g:302:2: ( ( ( rule__FormalParameter__Group__0 ) ) )
+            // InternalCheck.g:303:1: ( ( rule__FormalParameter__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:303:1: ( ( rule__FormalParameter__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:304:1: ( rule__FormalParameter__Group__0 )
+            // InternalCheck.g:303:1: ( ( rule__FormalParameter__Group__0 ) )
+            // InternalCheck.g:304:1: ( rule__FormalParameter__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormalParameterAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:305:1: ( rule__FormalParameter__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:305:2: rule__FormalParameter__Group__0
+            // InternalCheck.g:305:1: ( rule__FormalParameter__Group__0 )
+            // InternalCheck.g:305:2: rule__FormalParameter__Group__0
             {
-            pushFollow(FOLLOW_rule__FormalParameter__Group__0_in_ruleFormalParameter584);
+            pushFollow(FOLLOW_2);
             rule__FormalParameter__Group__0();
 
             state._fsp--;
@@ -935,16 +935,16 @@ public final void ruleFormalParameter() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXSimpleFormalParameterDefaultValueLiteral"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:317:1: entryRuleXSimpleFormalParameterDefaultValueLiteral : ruleXSimpleFormalParameterDefaultValueLiteral EOF ;
+    // InternalCheck.g:317:1: entryRuleXSimpleFormalParameterDefaultValueLiteral : ruleXSimpleFormalParameterDefaultValueLiteral EOF ;
     public final void entryRuleXSimpleFormalParameterDefaultValueLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:318:1: ( ruleXSimpleFormalParameterDefaultValueLiteral EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:319:1: ruleXSimpleFormalParameterDefaultValueLiteral EOF
+            // InternalCheck.g:318:1: ( ruleXSimpleFormalParameterDefaultValueLiteral EOF )
+            // InternalCheck.g:319:1: ruleXSimpleFormalParameterDefaultValueLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSimpleFormalParameterDefaultValueLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXSimpleFormalParameterDefaultValueLiteral_in_entryRuleXSimpleFormalParameterDefaultValueLiteral611);
+            pushFollow(FOLLOW_1);
             ruleXSimpleFormalParameterDefaultValueLiteral();
 
             state._fsp--;
@@ -952,7 +952,7 @@ public final void entryRuleXSimpleFormalParameterDefaultValueLiteral() throws Re
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSimpleFormalParameterDefaultValueLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXSimpleFormalParameterDefaultValueLiteral618); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -969,25 +969,25 @@ public final void entryRuleXSimpleFormalParameterDefaultValueLiteral() throws Re
 
 
     // $ANTLR start "ruleXSimpleFormalParameterDefaultValueLiteral"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:326:1: ruleXSimpleFormalParameterDefaultValueLiteral : ( ( rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives ) ) ;
+    // InternalCheck.g:326:1: ruleXSimpleFormalParameterDefaultValueLiteral : ( ( rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives ) ) ;
     public final void ruleXSimpleFormalParameterDefaultValueLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:330:2: ( ( ( rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:331:1: ( ( rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives ) )
+            // InternalCheck.g:330:2: ( ( ( rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives ) ) )
+            // InternalCheck.g:331:1: ( ( rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:331:1: ( ( rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:332:1: ( rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives )
+            // InternalCheck.g:331:1: ( ( rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives ) )
+            // InternalCheck.g:332:1: ( rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSimpleFormalParameterDefaultValueLiteralAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:333:1: ( rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:333:2: rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives
+            // InternalCheck.g:333:1: ( rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives )
+            // InternalCheck.g:333:2: rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives
             {
-            pushFollow(FOLLOW_rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives_in_ruleXSimpleFormalParameterDefaultValueLiteral644);
+            pushFollow(FOLLOW_2);
             rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives();
 
             state._fsp--;
@@ -1020,16 +1020,16 @@ public final void ruleXSimpleFormalParameterDefaultValueLiteral() throws Recogni
 
 
     // $ANTLR start "entryRuleXConstantUnaryOperation"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:345:1: entryRuleXConstantUnaryOperation : ruleXConstantUnaryOperation EOF ;
+    // InternalCheck.g:345:1: entryRuleXConstantUnaryOperation : ruleXConstantUnaryOperation EOF ;
     public final void entryRuleXConstantUnaryOperation() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:346:1: ( ruleXConstantUnaryOperation EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:347:1: ruleXConstantUnaryOperation EOF
+            // InternalCheck.g:346:1: ( ruleXConstantUnaryOperation EOF )
+            // InternalCheck.g:347:1: ruleXConstantUnaryOperation EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantUnaryOperationRule()); 
             }
-            pushFollow(FOLLOW_ruleXConstantUnaryOperation_in_entryRuleXConstantUnaryOperation671);
+            pushFollow(FOLLOW_1);
             ruleXConstantUnaryOperation();
 
             state._fsp--;
@@ -1037,7 +1037,7 @@ public final void entryRuleXConstantUnaryOperation() throws RecognitionException
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstantUnaryOperationRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXConstantUnaryOperation678); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1054,25 +1054,25 @@ public final void entryRuleXConstantUnaryOperation() throws RecognitionException
 
 
     // $ANTLR start "ruleXConstantUnaryOperation"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:354:1: ruleXConstantUnaryOperation : ( ( rule__XConstantUnaryOperation__Alternatives ) ) ;
+    // InternalCheck.g:354:1: ruleXConstantUnaryOperation : ( ( rule__XConstantUnaryOperation__Alternatives ) ) ;
     public final void ruleXConstantUnaryOperation() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:358:2: ( ( ( rule__XConstantUnaryOperation__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:359:1: ( ( rule__XConstantUnaryOperation__Alternatives ) )
+            // InternalCheck.g:358:2: ( ( ( rule__XConstantUnaryOperation__Alternatives ) ) )
+            // InternalCheck.g:359:1: ( ( rule__XConstantUnaryOperation__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:359:1: ( ( rule__XConstantUnaryOperation__Alternatives ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:360:1: ( rule__XConstantUnaryOperation__Alternatives )
+            // InternalCheck.g:359:1: ( ( rule__XConstantUnaryOperation__Alternatives ) )
+            // InternalCheck.g:360:1: ( rule__XConstantUnaryOperation__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantUnaryOperationAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:361:1: ( rule__XConstantUnaryOperation__Alternatives )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:361:2: rule__XConstantUnaryOperation__Alternatives
+            // InternalCheck.g:361:1: ( rule__XConstantUnaryOperation__Alternatives )
+            // InternalCheck.g:361:2: rule__XConstantUnaryOperation__Alternatives
             {
-            pushFollow(FOLLOW_rule__XConstantUnaryOperation__Alternatives_in_ruleXConstantUnaryOperation704);
+            pushFollow(FOLLOW_2);
             rule__XConstantUnaryOperation__Alternatives();
 
             state._fsp--;
@@ -1105,16 +1105,16 @@ public final void ruleXConstantUnaryOperation() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXFormalParameterDefaultValueLiteral"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:373:1: entryRuleXFormalParameterDefaultValueLiteral : ruleXFormalParameterDefaultValueLiteral EOF ;
+    // InternalCheck.g:373:1: entryRuleXFormalParameterDefaultValueLiteral : ruleXFormalParameterDefaultValueLiteral EOF ;
     public final void entryRuleXFormalParameterDefaultValueLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:374:1: ( ruleXFormalParameterDefaultValueLiteral EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:375:1: ruleXFormalParameterDefaultValueLiteral EOF
+            // InternalCheck.g:374:1: ( ruleXFormalParameterDefaultValueLiteral EOF )
+            // InternalCheck.g:375:1: ruleXFormalParameterDefaultValueLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFormalParameterDefaultValueLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXFormalParameterDefaultValueLiteral_in_entryRuleXFormalParameterDefaultValueLiteral731);
+            pushFollow(FOLLOW_1);
             ruleXFormalParameterDefaultValueLiteral();
 
             state._fsp--;
@@ -1122,7 +1122,7 @@ public final void entryRuleXFormalParameterDefaultValueLiteral() throws Recognit
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFormalParameterDefaultValueLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXFormalParameterDefaultValueLiteral738); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1139,25 +1139,25 @@ public final void entryRuleXFormalParameterDefaultValueLiteral() throws Recognit
 
 
     // $ANTLR start "ruleXFormalParameterDefaultValueLiteral"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:382:1: ruleXFormalParameterDefaultValueLiteral : ( ( rule__XFormalParameterDefaultValueLiteral__Alternatives ) ) ;
+    // InternalCheck.g:382:1: ruleXFormalParameterDefaultValueLiteral : ( ( rule__XFormalParameterDefaultValueLiteral__Alternatives ) ) ;
     public final void ruleXFormalParameterDefaultValueLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:386:2: ( ( ( rule__XFormalParameterDefaultValueLiteral__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:387:1: ( ( rule__XFormalParameterDefaultValueLiteral__Alternatives ) )
+            // InternalCheck.g:386:2: ( ( ( rule__XFormalParameterDefaultValueLiteral__Alternatives ) ) )
+            // InternalCheck.g:387:1: ( ( rule__XFormalParameterDefaultValueLiteral__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:387:1: ( ( rule__XFormalParameterDefaultValueLiteral__Alternatives ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:388:1: ( rule__XFormalParameterDefaultValueLiteral__Alternatives )
+            // InternalCheck.g:387:1: ( ( rule__XFormalParameterDefaultValueLiteral__Alternatives ) )
+            // InternalCheck.g:388:1: ( rule__XFormalParameterDefaultValueLiteral__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFormalParameterDefaultValueLiteralAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:389:1: ( rule__XFormalParameterDefaultValueLiteral__Alternatives )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:389:2: rule__XFormalParameterDefaultValueLiteral__Alternatives
+            // InternalCheck.g:389:1: ( rule__XFormalParameterDefaultValueLiteral__Alternatives )
+            // InternalCheck.g:389:2: rule__XFormalParameterDefaultValueLiteral__Alternatives
             {
-            pushFollow(FOLLOW_rule__XFormalParameterDefaultValueLiteral__Alternatives_in_ruleXFormalParameterDefaultValueLiteral764);
+            pushFollow(FOLLOW_2);
             rule__XFormalParameterDefaultValueLiteral__Alternatives();
 
             state._fsp--;
@@ -1190,16 +1190,16 @@ public final void ruleXFormalParameterDefaultValueLiteral() throws RecognitionEx
 
 
     // $ANTLR start "entryRuleXConstantListLiteral"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:401:1: entryRuleXConstantListLiteral : ruleXConstantListLiteral EOF ;
+    // InternalCheck.g:401:1: entryRuleXConstantListLiteral : ruleXConstantListLiteral EOF ;
     public final void entryRuleXConstantListLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:402:1: ( ruleXConstantListLiteral EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:403:1: ruleXConstantListLiteral EOF
+            // InternalCheck.g:402:1: ( ruleXConstantListLiteral EOF )
+            // InternalCheck.g:403:1: ruleXConstantListLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantListLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXConstantListLiteral_in_entryRuleXConstantListLiteral791);
+            pushFollow(FOLLOW_1);
             ruleXConstantListLiteral();
 
             state._fsp--;
@@ -1207,7 +1207,7 @@ public final void entryRuleXConstantListLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstantListLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXConstantListLiteral798); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1224,25 +1224,25 @@ public final void entryRuleXConstantListLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXConstantListLiteral"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:410:1: ruleXConstantListLiteral : ( ( rule__XConstantListLiteral__Group__0 ) ) ;
+    // InternalCheck.g:410:1: ruleXConstantListLiteral : ( ( rule__XConstantListLiteral__Group__0 ) ) ;
     public final void ruleXConstantListLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:414:2: ( ( ( rule__XConstantListLiteral__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:415:1: ( ( rule__XConstantListLiteral__Group__0 ) )
+            // InternalCheck.g:414:2: ( ( ( rule__XConstantListLiteral__Group__0 ) ) )
+            // InternalCheck.g:415:1: ( ( rule__XConstantListLiteral__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:415:1: ( ( rule__XConstantListLiteral__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:416:1: ( rule__XConstantListLiteral__Group__0 )
+            // InternalCheck.g:415:1: ( ( rule__XConstantListLiteral__Group__0 ) )
+            // InternalCheck.g:416:1: ( rule__XConstantListLiteral__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantListLiteralAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:417:1: ( rule__XConstantListLiteral__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:417:2: rule__XConstantListLiteral__Group__0
+            // InternalCheck.g:417:1: ( rule__XConstantListLiteral__Group__0 )
+            // InternalCheck.g:417:2: rule__XConstantListLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group__0_in_ruleXConstantListLiteral824);
+            pushFollow(FOLLOW_2);
             rule__XConstantListLiteral__Group__0();
 
             state._fsp--;
@@ -1275,16 +1275,16 @@ public final void ruleXConstantListLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleContext"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:429:1: entryRuleContext : ruleContext EOF ;
+    // InternalCheck.g:429:1: entryRuleContext : ruleContext EOF ;
     public final void entryRuleContext() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:430:1: ( ruleContext EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:431:1: ruleContext EOF
+            // InternalCheck.g:430:1: ( ruleContext EOF )
+            // InternalCheck.g:431:1: ruleContext EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getContextRule()); 
             }
-            pushFollow(FOLLOW_ruleContext_in_entryRuleContext851);
+            pushFollow(FOLLOW_1);
             ruleContext();
 
             state._fsp--;
@@ -1292,7 +1292,7 @@ public final void entryRuleContext() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getContextRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleContext858); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1309,25 +1309,25 @@ public final void entryRuleContext() throws RecognitionException {
 
 
     // $ANTLR start "ruleContext"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:438:1: ruleContext : ( ( rule__Context__Group__0 ) ) ;
+    // InternalCheck.g:438:1: ruleContext : ( ( rule__Context__Group__0 ) ) ;
     public final void ruleContext() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:442:2: ( ( ( rule__Context__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:443:1: ( ( rule__Context__Group__0 ) )
+            // InternalCheck.g:442:2: ( ( ( rule__Context__Group__0 ) ) )
+            // InternalCheck.g:443:1: ( ( rule__Context__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:443:1: ( ( rule__Context__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:444:1: ( rule__Context__Group__0 )
+            // InternalCheck.g:443:1: ( ( rule__Context__Group__0 ) )
+            // InternalCheck.g:444:1: ( rule__Context__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getContextAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:445:1: ( rule__Context__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:445:2: rule__Context__Group__0
+            // InternalCheck.g:445:1: ( rule__Context__Group__0 )
+            // InternalCheck.g:445:2: rule__Context__Group__0
             {
-            pushFollow(FOLLOW_rule__Context__Group__0_in_ruleContext884);
+            pushFollow(FOLLOW_2);
             rule__Context__Group__0();
 
             state._fsp--;
@@ -1360,16 +1360,16 @@ public final void ruleContext() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleContextVariable"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:457:1: entryRuleContextVariable : ruleContextVariable EOF ;
+    // InternalCheck.g:457:1: entryRuleContextVariable : ruleContextVariable EOF ;
     public final void entryRuleContextVariable() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:458:1: ( ruleContextVariable EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:459:1: ruleContextVariable EOF
+            // InternalCheck.g:458:1: ( ruleContextVariable EOF )
+            // InternalCheck.g:459:1: ruleContextVariable EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getContextVariableRule()); 
             }
-            pushFollow(FOLLOW_ruleContextVariable_in_entryRuleContextVariable911);
+            pushFollow(FOLLOW_1);
             ruleContextVariable();
 
             state._fsp--;
@@ -1377,7 +1377,7 @@ public final void entryRuleContextVariable() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getContextVariableRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleContextVariable918); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1394,25 +1394,25 @@ public final void entryRuleContextVariable() throws RecognitionException {
 
 
     // $ANTLR start "ruleContextVariable"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:466:1: ruleContextVariable : ( ( rule__ContextVariable__Group__0 ) ) ;
+    // InternalCheck.g:466:1: ruleContextVariable : ( ( rule__ContextVariable__Group__0 ) ) ;
     public final void ruleContextVariable() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:470:2: ( ( ( rule__ContextVariable__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:471:1: ( ( rule__ContextVariable__Group__0 ) )
+            // InternalCheck.g:470:2: ( ( ( rule__ContextVariable__Group__0 ) ) )
+            // InternalCheck.g:471:1: ( ( rule__ContextVariable__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:471:1: ( ( rule__ContextVariable__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:472:1: ( rule__ContextVariable__Group__0 )
+            // InternalCheck.g:471:1: ( ( rule__ContextVariable__Group__0 ) )
+            // InternalCheck.g:472:1: ( rule__ContextVariable__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getContextVariableAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:473:1: ( rule__ContextVariable__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:473:2: rule__ContextVariable__Group__0
+            // InternalCheck.g:473:1: ( rule__ContextVariable__Group__0 )
+            // InternalCheck.g:473:2: rule__ContextVariable__Group__0
             {
-            pushFollow(FOLLOW_rule__ContextVariable__Group__0_in_ruleContextVariable944);
+            pushFollow(FOLLOW_2);
             rule__ContextVariable__Group__0();
 
             state._fsp--;
@@ -1445,16 +1445,16 @@ public final void ruleContextVariable() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXGuardExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:485:1: entryRuleXGuardExpression : ruleXGuardExpression EOF ;
+    // InternalCheck.g:485:1: entryRuleXGuardExpression : ruleXGuardExpression EOF ;
     public final void entryRuleXGuardExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:486:1: ( ruleXGuardExpression EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:487:1: ruleXGuardExpression EOF
+            // InternalCheck.g:486:1: ( ruleXGuardExpression EOF )
+            // InternalCheck.g:487:1: ruleXGuardExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXGuardExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXGuardExpression_in_entryRuleXGuardExpression971);
+            pushFollow(FOLLOW_1);
             ruleXGuardExpression();
 
             state._fsp--;
@@ -1462,7 +1462,7 @@ public final void entryRuleXGuardExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXGuardExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXGuardExpression978); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1479,25 +1479,25 @@ public final void entryRuleXGuardExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXGuardExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:494:1: ruleXGuardExpression : ( ( rule__XGuardExpression__Group__0 ) ) ;
+    // InternalCheck.g:494:1: ruleXGuardExpression : ( ( rule__XGuardExpression__Group__0 ) ) ;
     public final void ruleXGuardExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:498:2: ( ( ( rule__XGuardExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:499:1: ( ( rule__XGuardExpression__Group__0 ) )
+            // InternalCheck.g:498:2: ( ( ( rule__XGuardExpression__Group__0 ) ) )
+            // InternalCheck.g:499:1: ( ( rule__XGuardExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:499:1: ( ( rule__XGuardExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:500:1: ( rule__XGuardExpression__Group__0 )
+            // InternalCheck.g:499:1: ( ( rule__XGuardExpression__Group__0 ) )
+            // InternalCheck.g:500:1: ( rule__XGuardExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXGuardExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:501:1: ( rule__XGuardExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:501:2: rule__XGuardExpression__Group__0
+            // InternalCheck.g:501:1: ( rule__XGuardExpression__Group__0 )
+            // InternalCheck.g:501:2: rule__XGuardExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XGuardExpression__Group__0_in_ruleXGuardExpression1004);
+            pushFollow(FOLLOW_2);
             rule__XGuardExpression__Group__0();
 
             state._fsp--;
@@ -1530,16 +1530,16 @@ public final void ruleXGuardExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXIssueExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:513:1: entryRuleXIssueExpression : ruleXIssueExpression EOF ;
+    // InternalCheck.g:513:1: entryRuleXIssueExpression : ruleXIssueExpression EOF ;
     public final void entryRuleXIssueExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:514:1: ( ruleXIssueExpression EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:515:1: ruleXIssueExpression EOF
+            // InternalCheck.g:514:1: ( ruleXIssueExpression EOF )
+            // InternalCheck.g:515:1: ruleXIssueExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXIssueExpression_in_entryRuleXIssueExpression1031);
+            pushFollow(FOLLOW_1);
             ruleXIssueExpression();
 
             state._fsp--;
@@ -1547,7 +1547,7 @@ public final void entryRuleXIssueExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXIssueExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXIssueExpression1038); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1564,25 +1564,25 @@ public final void entryRuleXIssueExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXIssueExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:522:1: ruleXIssueExpression : ( ( rule__XIssueExpression__Group__0 ) ) ;
+    // InternalCheck.g:522:1: ruleXIssueExpression : ( ( rule__XIssueExpression__Group__0 ) ) ;
     public final void ruleXIssueExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:526:2: ( ( ( rule__XIssueExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:527:1: ( ( rule__XIssueExpression__Group__0 ) )
+            // InternalCheck.g:526:2: ( ( ( rule__XIssueExpression__Group__0 ) ) )
+            // InternalCheck.g:527:1: ( ( rule__XIssueExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:527:1: ( ( rule__XIssueExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:528:1: ( rule__XIssueExpression__Group__0 )
+            // InternalCheck.g:527:1: ( ( rule__XIssueExpression__Group__0 ) )
+            // InternalCheck.g:528:1: ( rule__XIssueExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:529:1: ( rule__XIssueExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:529:2: rule__XIssueExpression__Group__0
+            // InternalCheck.g:529:1: ( rule__XIssueExpression__Group__0 )
+            // InternalCheck.g:529:2: rule__XIssueExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group__0_in_ruleXIssueExpression1064);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__Group__0();
 
             state._fsp--;
@@ -1615,16 +1615,16 @@ public final void ruleXIssueExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXPrimaryExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:541:1: entryRuleXPrimaryExpression : ruleXPrimaryExpression EOF ;
+    // InternalCheck.g:541:1: entryRuleXPrimaryExpression : ruleXPrimaryExpression EOF ;
     public final void entryRuleXPrimaryExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:542:1: ( ruleXPrimaryExpression EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:543:1: ruleXPrimaryExpression EOF
+            // InternalCheck.g:542:1: ( ruleXPrimaryExpression EOF )
+            // InternalCheck.g:543:1: ruleXPrimaryExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPrimaryExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXPrimaryExpression_in_entryRuleXPrimaryExpression1091);
+            pushFollow(FOLLOW_1);
             ruleXPrimaryExpression();
 
             state._fsp--;
@@ -1632,7 +1632,7 @@ public final void entryRuleXPrimaryExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXPrimaryExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXPrimaryExpression1098); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1649,25 +1649,25 @@ public final void entryRuleXPrimaryExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXPrimaryExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:550:1: ruleXPrimaryExpression : ( ( rule__XPrimaryExpression__Alternatives ) ) ;
+    // InternalCheck.g:550:1: ruleXPrimaryExpression : ( ( rule__XPrimaryExpression__Alternatives ) ) ;
     public final void ruleXPrimaryExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:554:2: ( ( ( rule__XPrimaryExpression__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:555:1: ( ( rule__XPrimaryExpression__Alternatives ) )
+            // InternalCheck.g:554:2: ( ( ( rule__XPrimaryExpression__Alternatives ) ) )
+            // InternalCheck.g:555:1: ( ( rule__XPrimaryExpression__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:555:1: ( ( rule__XPrimaryExpression__Alternatives ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:556:1: ( rule__XPrimaryExpression__Alternatives )
+            // InternalCheck.g:555:1: ( ( rule__XPrimaryExpression__Alternatives ) )
+            // InternalCheck.g:556:1: ( rule__XPrimaryExpression__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPrimaryExpressionAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:557:1: ( rule__XPrimaryExpression__Alternatives )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:557:2: rule__XPrimaryExpression__Alternatives
+            // InternalCheck.g:557:1: ( rule__XPrimaryExpression__Alternatives )
+            // InternalCheck.g:557:2: rule__XPrimaryExpression__Alternatives
             {
-            pushFollow(FOLLOW_rule__XPrimaryExpression__Alternatives_in_ruleXPrimaryExpression1124);
+            pushFollow(FOLLOW_2);
             rule__XPrimaryExpression__Alternatives();
 
             state._fsp--;
@@ -1700,16 +1700,16 @@ public final void ruleXPrimaryExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleFeatureCallID"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:569:1: entryRuleFeatureCallID : ruleFeatureCallID EOF ;
+    // InternalCheck.g:569:1: entryRuleFeatureCallID : ruleFeatureCallID EOF ;
     public final void entryRuleFeatureCallID() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:570:1: ( ruleFeatureCallID EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:571:1: ruleFeatureCallID EOF
+            // InternalCheck.g:570:1: ( ruleFeatureCallID EOF )
+            // InternalCheck.g:571:1: ruleFeatureCallID EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFeatureCallIDRule()); 
             }
-            pushFollow(FOLLOW_ruleFeatureCallID_in_entryRuleFeatureCallID1151);
+            pushFollow(FOLLOW_1);
             ruleFeatureCallID();
 
             state._fsp--;
@@ -1717,7 +1717,7 @@ public final void entryRuleFeatureCallID() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getFeatureCallIDRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFeatureCallID1158); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1734,25 +1734,25 @@ public final void entryRuleFeatureCallID() throws RecognitionException {
 
 
     // $ANTLR start "ruleFeatureCallID"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:578:1: ruleFeatureCallID : ( ( rule__FeatureCallID__Alternatives ) ) ;
+    // InternalCheck.g:578:1: ruleFeatureCallID : ( ( rule__FeatureCallID__Alternatives ) ) ;
     public final void ruleFeatureCallID() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:582:2: ( ( ( rule__FeatureCallID__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:583:1: ( ( rule__FeatureCallID__Alternatives ) )
+            // InternalCheck.g:582:2: ( ( ( rule__FeatureCallID__Alternatives ) ) )
+            // InternalCheck.g:583:1: ( ( rule__FeatureCallID__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:583:1: ( ( rule__FeatureCallID__Alternatives ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:584:1: ( rule__FeatureCallID__Alternatives )
+            // InternalCheck.g:583:1: ( ( rule__FeatureCallID__Alternatives ) )
+            // InternalCheck.g:584:1: ( rule__FeatureCallID__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFeatureCallIDAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:585:1: ( rule__FeatureCallID__Alternatives )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:585:2: rule__FeatureCallID__Alternatives
+            // InternalCheck.g:585:1: ( rule__FeatureCallID__Alternatives )
+            // InternalCheck.g:585:2: rule__FeatureCallID__Alternatives
             {
-            pushFollow(FOLLOW_rule__FeatureCallID__Alternatives_in_ruleFeatureCallID1184);
+            pushFollow(FOLLOW_2);
             rule__FeatureCallID__Alternatives();
 
             state._fsp--;
@@ -1785,16 +1785,16 @@ public final void ruleFeatureCallID() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXAnnotation"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:597:1: entryRuleXAnnotation : ruleXAnnotation EOF ;
+    // InternalCheck.g:597:1: entryRuleXAnnotation : ruleXAnnotation EOF ;
     public final void entryRuleXAnnotation() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:598:1: ( ruleXAnnotation EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:599:1: ruleXAnnotation EOF
+            // InternalCheck.g:598:1: ( ruleXAnnotation EOF )
+            // InternalCheck.g:599:1: ruleXAnnotation EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationRule()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotation_in_entryRuleXAnnotation1211);
+            pushFollow(FOLLOW_1);
             ruleXAnnotation();
 
             state._fsp--;
@@ -1802,7 +1802,7 @@ public final void entryRuleXAnnotation() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAnnotation1218); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1819,25 +1819,25 @@ public final void entryRuleXAnnotation() throws RecognitionException {
 
 
     // $ANTLR start "ruleXAnnotation"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:606:1: ruleXAnnotation : ( ( rule__XAnnotation__Group__0 ) ) ;
+    // InternalCheck.g:606:1: ruleXAnnotation : ( ( rule__XAnnotation__Group__0 ) ) ;
     public final void ruleXAnnotation() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:610:2: ( ( ( rule__XAnnotation__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:611:1: ( ( rule__XAnnotation__Group__0 ) )
+            // InternalCheck.g:610:2: ( ( ( rule__XAnnotation__Group__0 ) ) )
+            // InternalCheck.g:611:1: ( ( rule__XAnnotation__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:611:1: ( ( rule__XAnnotation__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:612:1: ( rule__XAnnotation__Group__0 )
+            // InternalCheck.g:611:1: ( ( rule__XAnnotation__Group__0 ) )
+            // InternalCheck.g:612:1: ( rule__XAnnotation__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:613:1: ( rule__XAnnotation__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:613:2: rule__XAnnotation__Group__0
+            // InternalCheck.g:613:1: ( rule__XAnnotation__Group__0 )
+            // InternalCheck.g:613:2: rule__XAnnotation__Group__0
             {
-            pushFollow(FOLLOW_rule__XAnnotation__Group__0_in_ruleXAnnotation1244);
+            pushFollow(FOLLOW_2);
             rule__XAnnotation__Group__0();
 
             state._fsp--;
@@ -1870,16 +1870,16 @@ public final void ruleXAnnotation() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXAnnotationElementValuePair"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:625:1: entryRuleXAnnotationElementValuePair : ruleXAnnotationElementValuePair EOF ;
+    // InternalCheck.g:625:1: entryRuleXAnnotationElementValuePair : ruleXAnnotationElementValuePair EOF ;
     public final void entryRuleXAnnotationElementValuePair() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:626:1: ( ruleXAnnotationElementValuePair EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:627:1: ruleXAnnotationElementValuePair EOF
+            // InternalCheck.g:626:1: ( ruleXAnnotationElementValuePair EOF )
+            // InternalCheck.g:627:1: ruleXAnnotationElementValuePair EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairRule()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationElementValuePair_in_entryRuleXAnnotationElementValuePair1271);
+            pushFollow(FOLLOW_1);
             ruleXAnnotationElementValuePair();
 
             state._fsp--;
@@ -1887,7 +1887,7 @@ public final void entryRuleXAnnotationElementValuePair() throws RecognitionExcep
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValuePairRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAnnotationElementValuePair1278); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1904,25 +1904,25 @@ public final void entryRuleXAnnotationElementValuePair() throws RecognitionExcep
 
 
     // $ANTLR start "ruleXAnnotationElementValuePair"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:634:1: ruleXAnnotationElementValuePair : ( ( rule__XAnnotationElementValuePair__Group__0 ) ) ;
+    // InternalCheck.g:634:1: ruleXAnnotationElementValuePair : ( ( rule__XAnnotationElementValuePair__Group__0 ) ) ;
     public final void ruleXAnnotationElementValuePair() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:638:2: ( ( ( rule__XAnnotationElementValuePair__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:639:1: ( ( rule__XAnnotationElementValuePair__Group__0 ) )
+            // InternalCheck.g:638:2: ( ( ( rule__XAnnotationElementValuePair__Group__0 ) ) )
+            // InternalCheck.g:639:1: ( ( rule__XAnnotationElementValuePair__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:639:1: ( ( rule__XAnnotationElementValuePair__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:640:1: ( rule__XAnnotationElementValuePair__Group__0 )
+            // InternalCheck.g:639:1: ( ( rule__XAnnotationElementValuePair__Group__0 ) )
+            // InternalCheck.g:640:1: ( rule__XAnnotationElementValuePair__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:641:1: ( rule__XAnnotationElementValuePair__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:641:2: rule__XAnnotationElementValuePair__Group__0
+            // InternalCheck.g:641:1: ( rule__XAnnotationElementValuePair__Group__0 )
+            // InternalCheck.g:641:2: rule__XAnnotationElementValuePair__Group__0
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__Group__0_in_ruleXAnnotationElementValuePair1304);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValuePair__Group__0();
 
             state._fsp--;
@@ -1955,16 +1955,16 @@ public final void ruleXAnnotationElementValuePair() throws RecognitionException
 
 
     // $ANTLR start "entryRuleXAnnotationElementValueOrCommaList"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:653:1: entryRuleXAnnotationElementValueOrCommaList : ruleXAnnotationElementValueOrCommaList EOF ;
+    // InternalCheck.g:653:1: entryRuleXAnnotationElementValueOrCommaList : ruleXAnnotationElementValueOrCommaList EOF ;
     public final void entryRuleXAnnotationElementValueOrCommaList() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:654:1: ( ruleXAnnotationElementValueOrCommaList EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:655:1: ruleXAnnotationElementValueOrCommaList EOF
+            // InternalCheck.g:654:1: ( ruleXAnnotationElementValueOrCommaList EOF )
+            // InternalCheck.g:655:1: ruleXAnnotationElementValueOrCommaList EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListRule()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationElementValueOrCommaList_in_entryRuleXAnnotationElementValueOrCommaList1331);
+            pushFollow(FOLLOW_1);
             ruleXAnnotationElementValueOrCommaList();
 
             state._fsp--;
@@ -1972,7 +1972,7 @@ public final void entryRuleXAnnotationElementValueOrCommaList() throws Recogniti
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValueOrCommaListRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAnnotationElementValueOrCommaList1338); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1989,25 +1989,25 @@ public final void entryRuleXAnnotationElementValueOrCommaList() throws Recogniti
 
 
     // $ANTLR start "ruleXAnnotationElementValueOrCommaList"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:662:1: ruleXAnnotationElementValueOrCommaList : ( ( rule__XAnnotationElementValueOrCommaList__Alternatives ) ) ;
+    // InternalCheck.g:662:1: ruleXAnnotationElementValueOrCommaList : ( ( rule__XAnnotationElementValueOrCommaList__Alternatives ) ) ;
     public final void ruleXAnnotationElementValueOrCommaList() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:666:2: ( ( ( rule__XAnnotationElementValueOrCommaList__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:667:1: ( ( rule__XAnnotationElementValueOrCommaList__Alternatives ) )
+            // InternalCheck.g:666:2: ( ( ( rule__XAnnotationElementValueOrCommaList__Alternatives ) ) )
+            // InternalCheck.g:667:1: ( ( rule__XAnnotationElementValueOrCommaList__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:667:1: ( ( rule__XAnnotationElementValueOrCommaList__Alternatives ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:668:1: ( rule__XAnnotationElementValueOrCommaList__Alternatives )
+            // InternalCheck.g:667:1: ( ( rule__XAnnotationElementValueOrCommaList__Alternatives ) )
+            // InternalCheck.g:668:1: ( rule__XAnnotationElementValueOrCommaList__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:669:1: ( rule__XAnnotationElementValueOrCommaList__Alternatives )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:669:2: rule__XAnnotationElementValueOrCommaList__Alternatives
+            // InternalCheck.g:669:1: ( rule__XAnnotationElementValueOrCommaList__Alternatives )
+            // InternalCheck.g:669:2: rule__XAnnotationElementValueOrCommaList__Alternatives
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Alternatives_in_ruleXAnnotationElementValueOrCommaList1364);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Alternatives();
 
             state._fsp--;
@@ -2040,16 +2040,16 @@ public final void ruleXAnnotationElementValueOrCommaList() throws RecognitionExc
 
 
     // $ANTLR start "entryRuleXAnnotationElementValue"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:681:1: entryRuleXAnnotationElementValue : ruleXAnnotationElementValue EOF ;
+    // InternalCheck.g:681:1: entryRuleXAnnotationElementValue : ruleXAnnotationElementValue EOF ;
     public final void entryRuleXAnnotationElementValue() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:682:1: ( ruleXAnnotationElementValue EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:683:1: ruleXAnnotationElementValue EOF
+            // InternalCheck.g:682:1: ( ruleXAnnotationElementValue EOF )
+            // InternalCheck.g:683:1: ruleXAnnotationElementValue EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueRule()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationElementValue_in_entryRuleXAnnotationElementValue1391);
+            pushFollow(FOLLOW_1);
             ruleXAnnotationElementValue();
 
             state._fsp--;
@@ -2057,7 +2057,7 @@ public final void entryRuleXAnnotationElementValue() throws RecognitionException
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValueRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAnnotationElementValue1398); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2074,25 +2074,25 @@ public final void entryRuleXAnnotationElementValue() throws RecognitionException
 
 
     // $ANTLR start "ruleXAnnotationElementValue"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:690:1: ruleXAnnotationElementValue : ( ( rule__XAnnotationElementValue__Alternatives ) ) ;
+    // InternalCheck.g:690:1: ruleXAnnotationElementValue : ( ( rule__XAnnotationElementValue__Alternatives ) ) ;
     public final void ruleXAnnotationElementValue() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:694:2: ( ( ( rule__XAnnotationElementValue__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:695:1: ( ( rule__XAnnotationElementValue__Alternatives ) )
+            // InternalCheck.g:694:2: ( ( ( rule__XAnnotationElementValue__Alternatives ) ) )
+            // InternalCheck.g:695:1: ( ( rule__XAnnotationElementValue__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:695:1: ( ( rule__XAnnotationElementValue__Alternatives ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:696:1: ( rule__XAnnotationElementValue__Alternatives )
+            // InternalCheck.g:695:1: ( ( rule__XAnnotationElementValue__Alternatives ) )
+            // InternalCheck.g:696:1: ( rule__XAnnotationElementValue__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:697:1: ( rule__XAnnotationElementValue__Alternatives )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:697:2: rule__XAnnotationElementValue__Alternatives
+            // InternalCheck.g:697:1: ( rule__XAnnotationElementValue__Alternatives )
+            // InternalCheck.g:697:2: rule__XAnnotationElementValue__Alternatives
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Alternatives_in_ruleXAnnotationElementValue1424);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Alternatives();
 
             state._fsp--;
@@ -2125,16 +2125,16 @@ public final void ruleXAnnotationElementValue() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXAnnotationOrExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:709:1: entryRuleXAnnotationOrExpression : ruleXAnnotationOrExpression EOF ;
+    // InternalCheck.g:709:1: entryRuleXAnnotationOrExpression : ruleXAnnotationOrExpression EOF ;
     public final void entryRuleXAnnotationOrExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:710:1: ( ruleXAnnotationOrExpression EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:711:1: ruleXAnnotationOrExpression EOF
+            // InternalCheck.g:710:1: ( ruleXAnnotationOrExpression EOF )
+            // InternalCheck.g:711:1: ruleXAnnotationOrExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationOrExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_entryRuleXAnnotationOrExpression1451);
+            pushFollow(FOLLOW_1);
             ruleXAnnotationOrExpression();
 
             state._fsp--;
@@ -2142,7 +2142,7 @@ public final void entryRuleXAnnotationOrExpression() throws RecognitionException
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationOrExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAnnotationOrExpression1458); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2159,25 +2159,25 @@ public final void entryRuleXAnnotationOrExpression() throws RecognitionException
 
 
     // $ANTLR start "ruleXAnnotationOrExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:718:1: ruleXAnnotationOrExpression : ( ( rule__XAnnotationOrExpression__Alternatives ) ) ;
+    // InternalCheck.g:718:1: ruleXAnnotationOrExpression : ( ( rule__XAnnotationOrExpression__Alternatives ) ) ;
     public final void ruleXAnnotationOrExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:722:2: ( ( ( rule__XAnnotationOrExpression__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:723:1: ( ( rule__XAnnotationOrExpression__Alternatives ) )
+            // InternalCheck.g:722:2: ( ( ( rule__XAnnotationOrExpression__Alternatives ) ) )
+            // InternalCheck.g:723:1: ( ( rule__XAnnotationOrExpression__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:723:1: ( ( rule__XAnnotationOrExpression__Alternatives ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:724:1: ( rule__XAnnotationOrExpression__Alternatives )
+            // InternalCheck.g:723:1: ( ( rule__XAnnotationOrExpression__Alternatives ) )
+            // InternalCheck.g:724:1: ( rule__XAnnotationOrExpression__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationOrExpressionAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:725:1: ( rule__XAnnotationOrExpression__Alternatives )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:725:2: rule__XAnnotationOrExpression__Alternatives
+            // InternalCheck.g:725:1: ( rule__XAnnotationOrExpression__Alternatives )
+            // InternalCheck.g:725:2: rule__XAnnotationOrExpression__Alternatives
             {
-            pushFollow(FOLLOW_rule__XAnnotationOrExpression__Alternatives_in_ruleXAnnotationOrExpression1484);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationOrExpression__Alternatives();
 
             state._fsp--;
@@ -2210,16 +2210,16 @@ public final void ruleXAnnotationOrExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:737:1: entryRuleXExpression : ruleXExpression EOF ;
+    // InternalCheck.g:737:1: entryRuleXExpression : ruleXExpression EOF ;
     public final void entryRuleXExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:738:1: ( ruleXExpression EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:739:1: ruleXExpression EOF
+            // InternalCheck.g:738:1: ( ruleXExpression EOF )
+            // InternalCheck.g:739:1: ruleXExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_entryRuleXExpression1511);
+            pushFollow(FOLLOW_1);
             ruleXExpression();
 
             state._fsp--;
@@ -2227,7 +2227,7 @@ public final void entryRuleXExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXExpression1518); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2244,22 +2244,22 @@ public final void entryRuleXExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:746:1: ruleXExpression : ( ruleXAssignment ) ;
+    // InternalCheck.g:746:1: ruleXExpression : ( ruleXAssignment ) ;
     public final void ruleXExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:750:2: ( ( ruleXAssignment ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:751:1: ( ruleXAssignment )
+            // InternalCheck.g:750:2: ( ( ruleXAssignment ) )
+            // InternalCheck.g:751:1: ( ruleXAssignment )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:751:1: ( ruleXAssignment )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:752:1: ruleXAssignment
+            // InternalCheck.g:751:1: ( ruleXAssignment )
+            // InternalCheck.g:752:1: ruleXAssignment
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionAccess().getXAssignmentParserRuleCall()); 
             }
-            pushFollow(FOLLOW_ruleXAssignment_in_ruleXExpression1544);
+            pushFollow(FOLLOW_2);
             ruleXAssignment();
 
             state._fsp--;
@@ -2289,16 +2289,16 @@ public final void ruleXExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXAssignment"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:765:1: entryRuleXAssignment : ruleXAssignment EOF ;
+    // InternalCheck.g:765:1: entryRuleXAssignment : ruleXAssignment EOF ;
     public final void entryRuleXAssignment() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:766:1: ( ruleXAssignment EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:767:1: ruleXAssignment EOF
+            // InternalCheck.g:766:1: ( ruleXAssignment EOF )
+            // InternalCheck.g:767:1: ruleXAssignment EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentRule()); 
             }
-            pushFollow(FOLLOW_ruleXAssignment_in_entryRuleXAssignment1570);
+            pushFollow(FOLLOW_1);
             ruleXAssignment();
 
             state._fsp--;
@@ -2306,7 +2306,7 @@ public final void entryRuleXAssignment() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAssignmentRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAssignment1577); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2323,25 +2323,25 @@ public final void entryRuleXAssignment() throws RecognitionException {
 
 
     // $ANTLR start "ruleXAssignment"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:774:1: ruleXAssignment : ( ( rule__XAssignment__Alternatives ) ) ;
+    // InternalCheck.g:774:1: ruleXAssignment : ( ( rule__XAssignment__Alternatives ) ) ;
     public final void ruleXAssignment() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:778:2: ( ( ( rule__XAssignment__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:779:1: ( ( rule__XAssignment__Alternatives ) )
+            // InternalCheck.g:778:2: ( ( ( rule__XAssignment__Alternatives ) ) )
+            // InternalCheck.g:779:1: ( ( rule__XAssignment__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:779:1: ( ( rule__XAssignment__Alternatives ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:780:1: ( rule__XAssignment__Alternatives )
+            // InternalCheck.g:779:1: ( ( rule__XAssignment__Alternatives ) )
+            // InternalCheck.g:780:1: ( rule__XAssignment__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:781:1: ( rule__XAssignment__Alternatives )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:781:2: rule__XAssignment__Alternatives
+            // InternalCheck.g:781:1: ( rule__XAssignment__Alternatives )
+            // InternalCheck.g:781:2: rule__XAssignment__Alternatives
             {
-            pushFollow(FOLLOW_rule__XAssignment__Alternatives_in_ruleXAssignment1603);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__Alternatives();
 
             state._fsp--;
@@ -2374,16 +2374,16 @@ public final void ruleXAssignment() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpSingleAssign"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:793:1: entryRuleOpSingleAssign : ruleOpSingleAssign EOF ;
+    // InternalCheck.g:793:1: entryRuleOpSingleAssign : ruleOpSingleAssign EOF ;
     public final void entryRuleOpSingleAssign() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:794:1: ( ruleOpSingleAssign EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:795:1: ruleOpSingleAssign EOF
+            // InternalCheck.g:794:1: ( ruleOpSingleAssign EOF )
+            // InternalCheck.g:795:1: ruleOpSingleAssign EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpSingleAssignRule()); 
             }
-            pushFollow(FOLLOW_ruleOpSingleAssign_in_entryRuleOpSingleAssign1630);
+            pushFollow(FOLLOW_1);
             ruleOpSingleAssign();
 
             state._fsp--;
@@ -2391,7 +2391,7 @@ public final void entryRuleOpSingleAssign() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpSingleAssignRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpSingleAssign1637); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2408,22 +2408,22 @@ public final void entryRuleOpSingleAssign() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpSingleAssign"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:802:1: ruleOpSingleAssign : ( '=' ) ;
+    // InternalCheck.g:802:1: ruleOpSingleAssign : ( '=' ) ;
     public final void ruleOpSingleAssign() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:806:2: ( ( '=' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:807:1: ( '=' )
+            // InternalCheck.g:806:2: ( ( '=' ) )
+            // InternalCheck.g:807:1: ( '=' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:807:1: ( '=' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:808:1: '='
+            // InternalCheck.g:807:1: ( '=' )
+            // InternalCheck.g:808:1: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpSingleAssignAccess().getEqualsSignKeyword()); 
             }
-            match(input,13,FOLLOW_13_in_ruleOpSingleAssign1664); if (state.failed) return ;
+            match(input,13,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpSingleAssignAccess().getEqualsSignKeyword()); 
             }
@@ -2449,16 +2449,16 @@ public final void ruleOpSingleAssign() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpMultiAssign"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:823:1: entryRuleOpMultiAssign : ruleOpMultiAssign EOF ;
+    // InternalCheck.g:823:1: entryRuleOpMultiAssign : ruleOpMultiAssign EOF ;
     public final void entryRuleOpMultiAssign() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:824:1: ( ruleOpMultiAssign EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:825:1: ruleOpMultiAssign EOF
+            // InternalCheck.g:824:1: ( ruleOpMultiAssign EOF )
+            // InternalCheck.g:825:1: ruleOpMultiAssign EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignRule()); 
             }
-            pushFollow(FOLLOW_ruleOpMultiAssign_in_entryRuleOpMultiAssign1692);
+            pushFollow(FOLLOW_1);
             ruleOpMultiAssign();
 
             state._fsp--;
@@ -2466,7 +2466,7 @@ public final void entryRuleOpMultiAssign() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpMultiAssignRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpMultiAssign1699); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2483,25 +2483,25 @@ public final void entryRuleOpMultiAssign() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpMultiAssign"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:832:1: ruleOpMultiAssign : ( ( rule__OpMultiAssign__Alternatives ) ) ;
+    // InternalCheck.g:832:1: ruleOpMultiAssign : ( ( rule__OpMultiAssign__Alternatives ) ) ;
     public final void ruleOpMultiAssign() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:836:2: ( ( ( rule__OpMultiAssign__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:837:1: ( ( rule__OpMultiAssign__Alternatives ) )
+            // InternalCheck.g:836:2: ( ( ( rule__OpMultiAssign__Alternatives ) ) )
+            // InternalCheck.g:837:1: ( ( rule__OpMultiAssign__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:837:1: ( ( rule__OpMultiAssign__Alternatives ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:838:1: ( rule__OpMultiAssign__Alternatives )
+            // InternalCheck.g:837:1: ( ( rule__OpMultiAssign__Alternatives ) )
+            // InternalCheck.g:838:1: ( rule__OpMultiAssign__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:839:1: ( rule__OpMultiAssign__Alternatives )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:839:2: rule__OpMultiAssign__Alternatives
+            // InternalCheck.g:839:1: ( rule__OpMultiAssign__Alternatives )
+            // InternalCheck.g:839:2: rule__OpMultiAssign__Alternatives
             {
-            pushFollow(FOLLOW_rule__OpMultiAssign__Alternatives_in_ruleOpMultiAssign1725);
+            pushFollow(FOLLOW_2);
             rule__OpMultiAssign__Alternatives();
 
             state._fsp--;
@@ -2534,16 +2534,16 @@ public final void ruleOpMultiAssign() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXOrExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:851:1: entryRuleXOrExpression : ruleXOrExpression EOF ;
+    // InternalCheck.g:851:1: entryRuleXOrExpression : ruleXOrExpression EOF ;
     public final void entryRuleXOrExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:852:1: ( ruleXOrExpression EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:853:1: ruleXOrExpression EOF
+            // InternalCheck.g:852:1: ( ruleXOrExpression EOF )
+            // InternalCheck.g:853:1: ruleXOrExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXOrExpression_in_entryRuleXOrExpression1752);
+            pushFollow(FOLLOW_1);
             ruleXOrExpression();
 
             state._fsp--;
@@ -2551,7 +2551,7 @@ public final void entryRuleXOrExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXOrExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXOrExpression1759); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2568,25 +2568,25 @@ public final void entryRuleXOrExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXOrExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:860:1: ruleXOrExpression : ( ( rule__XOrExpression__Group__0 ) ) ;
+    // InternalCheck.g:860:1: ruleXOrExpression : ( ( rule__XOrExpression__Group__0 ) ) ;
     public final void ruleXOrExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:864:2: ( ( ( rule__XOrExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:865:1: ( ( rule__XOrExpression__Group__0 ) )
+            // InternalCheck.g:864:2: ( ( ( rule__XOrExpression__Group__0 ) ) )
+            // InternalCheck.g:865:1: ( ( rule__XOrExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:865:1: ( ( rule__XOrExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:866:1: ( rule__XOrExpression__Group__0 )
+            // InternalCheck.g:865:1: ( ( rule__XOrExpression__Group__0 ) )
+            // InternalCheck.g:866:1: ( rule__XOrExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:867:1: ( rule__XOrExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:867:2: rule__XOrExpression__Group__0
+            // InternalCheck.g:867:1: ( rule__XOrExpression__Group__0 )
+            // InternalCheck.g:867:2: rule__XOrExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XOrExpression__Group__0_in_ruleXOrExpression1785);
+            pushFollow(FOLLOW_2);
             rule__XOrExpression__Group__0();
 
             state._fsp--;
@@ -2619,16 +2619,16 @@ public final void ruleXOrExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpOr"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:879:1: entryRuleOpOr : ruleOpOr EOF ;
+    // InternalCheck.g:879:1: entryRuleOpOr : ruleOpOr EOF ;
     public final void entryRuleOpOr() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:880:1: ( ruleOpOr EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:881:1: ruleOpOr EOF
+            // InternalCheck.g:880:1: ( ruleOpOr EOF )
+            // InternalCheck.g:881:1: ruleOpOr EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOrRule()); 
             }
-            pushFollow(FOLLOW_ruleOpOr_in_entryRuleOpOr1812);
+            pushFollow(FOLLOW_1);
             ruleOpOr();
 
             state._fsp--;
@@ -2636,7 +2636,7 @@ public final void entryRuleOpOr() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpOrRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpOr1819); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2653,22 +2653,22 @@ public final void entryRuleOpOr() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpOr"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:888:1: ruleOpOr : ( '||' ) ;
+    // InternalCheck.g:888:1: ruleOpOr : ( '||' ) ;
     public final void ruleOpOr() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:892:2: ( ( '||' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:893:1: ( '||' )
+            // InternalCheck.g:892:2: ( ( '||' ) )
+            // InternalCheck.g:893:1: ( '||' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:893:1: ( '||' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:894:1: '||'
+            // InternalCheck.g:893:1: ( '||' )
+            // InternalCheck.g:894:1: '||'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOrAccess().getVerticalLineVerticalLineKeyword()); 
             }
-            match(input,14,FOLLOW_14_in_ruleOpOr1846); if (state.failed) return ;
+            match(input,14,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpOrAccess().getVerticalLineVerticalLineKeyword()); 
             }
@@ -2694,16 +2694,16 @@ public final void ruleOpOr() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXAndExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:909:1: entryRuleXAndExpression : ruleXAndExpression EOF ;
+    // InternalCheck.g:909:1: entryRuleXAndExpression : ruleXAndExpression EOF ;
     public final void entryRuleXAndExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:910:1: ( ruleXAndExpression EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:911:1: ruleXAndExpression EOF
+            // InternalCheck.g:910:1: ( ruleXAndExpression EOF )
+            // InternalCheck.g:911:1: ruleXAndExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXAndExpression_in_entryRuleXAndExpression1874);
+            pushFollow(FOLLOW_1);
             ruleXAndExpression();
 
             state._fsp--;
@@ -2711,7 +2711,7 @@ public final void entryRuleXAndExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAndExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAndExpression1881); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2728,25 +2728,25 @@ public final void entryRuleXAndExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXAndExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:918:1: ruleXAndExpression : ( ( rule__XAndExpression__Group__0 ) ) ;
+    // InternalCheck.g:918:1: ruleXAndExpression : ( ( rule__XAndExpression__Group__0 ) ) ;
     public final void ruleXAndExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:922:2: ( ( ( rule__XAndExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:923:1: ( ( rule__XAndExpression__Group__0 ) )
+            // InternalCheck.g:922:2: ( ( ( rule__XAndExpression__Group__0 ) ) )
+            // InternalCheck.g:923:1: ( ( rule__XAndExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:923:1: ( ( rule__XAndExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:924:1: ( rule__XAndExpression__Group__0 )
+            // InternalCheck.g:923:1: ( ( rule__XAndExpression__Group__0 ) )
+            // InternalCheck.g:924:1: ( rule__XAndExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:925:1: ( rule__XAndExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:925:2: rule__XAndExpression__Group__0
+            // InternalCheck.g:925:1: ( rule__XAndExpression__Group__0 )
+            // InternalCheck.g:925:2: rule__XAndExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XAndExpression__Group__0_in_ruleXAndExpression1907);
+            pushFollow(FOLLOW_2);
             rule__XAndExpression__Group__0();
 
             state._fsp--;
@@ -2779,16 +2779,16 @@ public final void ruleXAndExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpAnd"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:937:1: entryRuleOpAnd : ruleOpAnd EOF ;
+    // InternalCheck.g:937:1: entryRuleOpAnd : ruleOpAnd EOF ;
     public final void entryRuleOpAnd() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:938:1: ( ruleOpAnd EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:939:1: ruleOpAnd EOF
+            // InternalCheck.g:938:1: ( ruleOpAnd EOF )
+            // InternalCheck.g:939:1: ruleOpAnd EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpAndRule()); 
             }
-            pushFollow(FOLLOW_ruleOpAnd_in_entryRuleOpAnd1934);
+            pushFollow(FOLLOW_1);
             ruleOpAnd();
 
             state._fsp--;
@@ -2796,7 +2796,7 @@ public final void entryRuleOpAnd() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpAndRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpAnd1941); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2813,22 +2813,22 @@ public final void entryRuleOpAnd() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpAnd"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:946:1: ruleOpAnd : ( '&&' ) ;
+    // InternalCheck.g:946:1: ruleOpAnd : ( '&&' ) ;
     public final void ruleOpAnd() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:950:2: ( ( '&&' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:951:1: ( '&&' )
+            // InternalCheck.g:950:2: ( ( '&&' ) )
+            // InternalCheck.g:951:1: ( '&&' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:951:1: ( '&&' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:952:1: '&&'
+            // InternalCheck.g:951:1: ( '&&' )
+            // InternalCheck.g:952:1: '&&'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpAndAccess().getAmpersandAmpersandKeyword()); 
             }
-            match(input,15,FOLLOW_15_in_ruleOpAnd1968); if (state.failed) return ;
+            match(input,15,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpAndAccess().getAmpersandAmpersandKeyword()); 
             }
@@ -2854,16 +2854,16 @@ public final void ruleOpAnd() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXEqualityExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:967:1: entryRuleXEqualityExpression : ruleXEqualityExpression EOF ;
+    // InternalCheck.g:967:1: entryRuleXEqualityExpression : ruleXEqualityExpression EOF ;
     public final void entryRuleXEqualityExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:968:1: ( ruleXEqualityExpression EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:969:1: ruleXEqualityExpression EOF
+            // InternalCheck.g:968:1: ( ruleXEqualityExpression EOF )
+            // InternalCheck.g:969:1: ruleXEqualityExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXEqualityExpression_in_entryRuleXEqualityExpression1996);
+            pushFollow(FOLLOW_1);
             ruleXEqualityExpression();
 
             state._fsp--;
@@ -2871,7 +2871,7 @@ public final void entryRuleXEqualityExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXEqualityExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXEqualityExpression2003); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2888,25 +2888,25 @@ public final void entryRuleXEqualityExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXEqualityExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:976:1: ruleXEqualityExpression : ( ( rule__XEqualityExpression__Group__0 ) ) ;
+    // InternalCheck.g:976:1: ruleXEqualityExpression : ( ( rule__XEqualityExpression__Group__0 ) ) ;
     public final void ruleXEqualityExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:980:2: ( ( ( rule__XEqualityExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:981:1: ( ( rule__XEqualityExpression__Group__0 ) )
+            // InternalCheck.g:980:2: ( ( ( rule__XEqualityExpression__Group__0 ) ) )
+            // InternalCheck.g:981:1: ( ( rule__XEqualityExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:981:1: ( ( rule__XEqualityExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:982:1: ( rule__XEqualityExpression__Group__0 )
+            // InternalCheck.g:981:1: ( ( rule__XEqualityExpression__Group__0 ) )
+            // InternalCheck.g:982:1: ( rule__XEqualityExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:983:1: ( rule__XEqualityExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:983:2: rule__XEqualityExpression__Group__0
+            // InternalCheck.g:983:1: ( rule__XEqualityExpression__Group__0 )
+            // InternalCheck.g:983:2: rule__XEqualityExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group__0_in_ruleXEqualityExpression2029);
+            pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group__0();
 
             state._fsp--;
@@ -2939,16 +2939,16 @@ public final void ruleXEqualityExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpEquality"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:995:1: entryRuleOpEquality : ruleOpEquality EOF ;
+    // InternalCheck.g:995:1: entryRuleOpEquality : ruleOpEquality EOF ;
     public final void entryRuleOpEquality() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:996:1: ( ruleOpEquality EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:997:1: ruleOpEquality EOF
+            // InternalCheck.g:996:1: ( ruleOpEquality EOF )
+            // InternalCheck.g:997:1: ruleOpEquality EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpEqualityRule()); 
             }
-            pushFollow(FOLLOW_ruleOpEquality_in_entryRuleOpEquality2056);
+            pushFollow(FOLLOW_1);
             ruleOpEquality();
 
             state._fsp--;
@@ -2956,7 +2956,7 @@ public final void entryRuleOpEquality() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpEqualityRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpEquality2063); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2973,25 +2973,25 @@ public final void entryRuleOpEquality() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpEquality"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1004:1: ruleOpEquality : ( ( rule__OpEquality__Alternatives ) ) ;
+    // InternalCheck.g:1004:1: ruleOpEquality : ( ( rule__OpEquality__Alternatives ) ) ;
     public final void ruleOpEquality() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1008:2: ( ( ( rule__OpEquality__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1009:1: ( ( rule__OpEquality__Alternatives ) )
+            // InternalCheck.g:1008:2: ( ( ( rule__OpEquality__Alternatives ) ) )
+            // InternalCheck.g:1009:1: ( ( rule__OpEquality__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1009:1: ( ( rule__OpEquality__Alternatives ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1010:1: ( rule__OpEquality__Alternatives )
+            // InternalCheck.g:1009:1: ( ( rule__OpEquality__Alternatives ) )
+            // InternalCheck.g:1010:1: ( rule__OpEquality__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpEqualityAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1011:1: ( rule__OpEquality__Alternatives )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1011:2: rule__OpEquality__Alternatives
+            // InternalCheck.g:1011:1: ( rule__OpEquality__Alternatives )
+            // InternalCheck.g:1011:2: rule__OpEquality__Alternatives
             {
-            pushFollow(FOLLOW_rule__OpEquality__Alternatives_in_ruleOpEquality2089);
+            pushFollow(FOLLOW_2);
             rule__OpEquality__Alternatives();
 
             state._fsp--;
@@ -3024,16 +3024,16 @@ public final void ruleOpEquality() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXRelationalExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1023:1: entryRuleXRelationalExpression : ruleXRelationalExpression EOF ;
+    // InternalCheck.g:1023:1: entryRuleXRelationalExpression : ruleXRelationalExpression EOF ;
     public final void entryRuleXRelationalExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1024:1: ( ruleXRelationalExpression EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1025:1: ruleXRelationalExpression EOF
+            // InternalCheck.g:1024:1: ( ruleXRelationalExpression EOF )
+            // InternalCheck.g:1025:1: ruleXRelationalExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXRelationalExpression_in_entryRuleXRelationalExpression2116);
+            pushFollow(FOLLOW_1);
             ruleXRelationalExpression();
 
             state._fsp--;
@@ -3041,7 +3041,7 @@ public final void entryRuleXRelationalExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXRelationalExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXRelationalExpression2123); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3058,25 +3058,25 @@ public final void entryRuleXRelationalExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXRelationalExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1032:1: ruleXRelationalExpression : ( ( rule__XRelationalExpression__Group__0 ) ) ;
+    // InternalCheck.g:1032:1: ruleXRelationalExpression : ( ( rule__XRelationalExpression__Group__0 ) ) ;
     public final void ruleXRelationalExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1036:2: ( ( ( rule__XRelationalExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1037:1: ( ( rule__XRelationalExpression__Group__0 ) )
+            // InternalCheck.g:1036:2: ( ( ( rule__XRelationalExpression__Group__0 ) ) )
+            // InternalCheck.g:1037:1: ( ( rule__XRelationalExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1037:1: ( ( rule__XRelationalExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1038:1: ( rule__XRelationalExpression__Group__0 )
+            // InternalCheck.g:1037:1: ( ( rule__XRelationalExpression__Group__0 ) )
+            // InternalCheck.g:1038:1: ( rule__XRelationalExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1039:1: ( rule__XRelationalExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1039:2: rule__XRelationalExpression__Group__0
+            // InternalCheck.g:1039:1: ( rule__XRelationalExpression__Group__0 )
+            // InternalCheck.g:1039:2: rule__XRelationalExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group__0_in_ruleXRelationalExpression2149);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group__0();
 
             state._fsp--;
@@ -3109,16 +3109,16 @@ public final void ruleXRelationalExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpCompare"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1051:1: entryRuleOpCompare : ruleOpCompare EOF ;
+    // InternalCheck.g:1051:1: entryRuleOpCompare : ruleOpCompare EOF ;
     public final void entryRuleOpCompare() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1052:1: ( ruleOpCompare EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1053:1: ruleOpCompare EOF
+            // InternalCheck.g:1052:1: ( ruleOpCompare EOF )
+            // InternalCheck.g:1053:1: ruleOpCompare EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpCompareRule()); 
             }
-            pushFollow(FOLLOW_ruleOpCompare_in_entryRuleOpCompare2176);
+            pushFollow(FOLLOW_1);
             ruleOpCompare();
 
             state._fsp--;
@@ -3126,7 +3126,7 @@ public final void entryRuleOpCompare() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpCompareRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpCompare2183); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3143,25 +3143,25 @@ public final void entryRuleOpCompare() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpCompare"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1060:1: ruleOpCompare : ( ( rule__OpCompare__Alternatives ) ) ;
+    // InternalCheck.g:1060:1: ruleOpCompare : ( ( rule__OpCompare__Alternatives ) ) ;
     public final void ruleOpCompare() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1064:2: ( ( ( rule__OpCompare__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1065:1: ( ( rule__OpCompare__Alternatives ) )
+            // InternalCheck.g:1064:2: ( ( ( rule__OpCompare__Alternatives ) ) )
+            // InternalCheck.g:1065:1: ( ( rule__OpCompare__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1065:1: ( ( rule__OpCompare__Alternatives ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1066:1: ( rule__OpCompare__Alternatives )
+            // InternalCheck.g:1065:1: ( ( rule__OpCompare__Alternatives ) )
+            // InternalCheck.g:1066:1: ( rule__OpCompare__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpCompareAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1067:1: ( rule__OpCompare__Alternatives )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1067:2: rule__OpCompare__Alternatives
+            // InternalCheck.g:1067:1: ( rule__OpCompare__Alternatives )
+            // InternalCheck.g:1067:2: rule__OpCompare__Alternatives
             {
-            pushFollow(FOLLOW_rule__OpCompare__Alternatives_in_ruleOpCompare2209);
+            pushFollow(FOLLOW_2);
             rule__OpCompare__Alternatives();
 
             state._fsp--;
@@ -3194,16 +3194,16 @@ public final void ruleOpCompare() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXOtherOperatorExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1079:1: entryRuleXOtherOperatorExpression : ruleXOtherOperatorExpression EOF ;
+    // InternalCheck.g:1079:1: entryRuleXOtherOperatorExpression : ruleXOtherOperatorExpression EOF ;
     public final void entryRuleXOtherOperatorExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1080:1: ( ruleXOtherOperatorExpression EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1081:1: ruleXOtherOperatorExpression EOF
+            // InternalCheck.g:1080:1: ( ruleXOtherOperatorExpression EOF )
+            // InternalCheck.g:1081:1: ruleXOtherOperatorExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXOtherOperatorExpression_in_entryRuleXOtherOperatorExpression2236);
+            pushFollow(FOLLOW_1);
             ruleXOtherOperatorExpression();
 
             state._fsp--;
@@ -3211,7 +3211,7 @@ public final void entryRuleXOtherOperatorExpression() throws RecognitionExceptio
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXOtherOperatorExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXOtherOperatorExpression2243); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3228,25 +3228,25 @@ public final void entryRuleXOtherOperatorExpression() throws RecognitionExceptio
 
 
     // $ANTLR start "ruleXOtherOperatorExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1088:1: ruleXOtherOperatorExpression : ( ( rule__XOtherOperatorExpression__Group__0 ) ) ;
+    // InternalCheck.g:1088:1: ruleXOtherOperatorExpression : ( ( rule__XOtherOperatorExpression__Group__0 ) ) ;
     public final void ruleXOtherOperatorExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1092:2: ( ( ( rule__XOtherOperatorExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1093:1: ( ( rule__XOtherOperatorExpression__Group__0 ) )
+            // InternalCheck.g:1092:2: ( ( ( rule__XOtherOperatorExpression__Group__0 ) ) )
+            // InternalCheck.g:1093:1: ( ( rule__XOtherOperatorExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1093:1: ( ( rule__XOtherOperatorExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1094:1: ( rule__XOtherOperatorExpression__Group__0 )
+            // InternalCheck.g:1093:1: ( ( rule__XOtherOperatorExpression__Group__0 ) )
+            // InternalCheck.g:1094:1: ( rule__XOtherOperatorExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1095:1: ( rule__XOtherOperatorExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1095:2: rule__XOtherOperatorExpression__Group__0
+            // InternalCheck.g:1095:1: ( rule__XOtherOperatorExpression__Group__0 )
+            // InternalCheck.g:1095:2: rule__XOtherOperatorExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group__0_in_ruleXOtherOperatorExpression2269);
+            pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group__0();
 
             state._fsp--;
@@ -3279,16 +3279,16 @@ public final void ruleXOtherOperatorExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpOther"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1107:1: entryRuleOpOther : ruleOpOther EOF ;
+    // InternalCheck.g:1107:1: entryRuleOpOther : ruleOpOther EOF ;
     public final void entryRuleOpOther() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1108:1: ( ruleOpOther EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1109:1: ruleOpOther EOF
+            // InternalCheck.g:1108:1: ( ruleOpOther EOF )
+            // InternalCheck.g:1109:1: ruleOpOther EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherRule()); 
             }
-            pushFollow(FOLLOW_ruleOpOther_in_entryRuleOpOther2296);
+            pushFollow(FOLLOW_1);
             ruleOpOther();
 
             state._fsp--;
@@ -3296,7 +3296,7 @@ public final void entryRuleOpOther() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpOtherRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpOther2303); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3313,25 +3313,25 @@ public final void entryRuleOpOther() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpOther"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1116:1: ruleOpOther : ( ( rule__OpOther__Alternatives ) ) ;
+    // InternalCheck.g:1116:1: ruleOpOther : ( ( rule__OpOther__Alternatives ) ) ;
     public final void ruleOpOther() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1120:2: ( ( ( rule__OpOther__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1121:1: ( ( rule__OpOther__Alternatives ) )
+            // InternalCheck.g:1120:2: ( ( ( rule__OpOther__Alternatives ) ) )
+            // InternalCheck.g:1121:1: ( ( rule__OpOther__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1121:1: ( ( rule__OpOther__Alternatives ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1122:1: ( rule__OpOther__Alternatives )
+            // InternalCheck.g:1121:1: ( ( rule__OpOther__Alternatives ) )
+            // InternalCheck.g:1122:1: ( rule__OpOther__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1123:1: ( rule__OpOther__Alternatives )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1123:2: rule__OpOther__Alternatives
+            // InternalCheck.g:1123:1: ( rule__OpOther__Alternatives )
+            // InternalCheck.g:1123:2: rule__OpOther__Alternatives
             {
-            pushFollow(FOLLOW_rule__OpOther__Alternatives_in_ruleOpOther2329);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Alternatives();
 
             state._fsp--;
@@ -3364,16 +3364,16 @@ public final void ruleOpOther() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXAdditiveExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1135:1: entryRuleXAdditiveExpression : ruleXAdditiveExpression EOF ;
+    // InternalCheck.g:1135:1: entryRuleXAdditiveExpression : ruleXAdditiveExpression EOF ;
     public final void entryRuleXAdditiveExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1136:1: ( ruleXAdditiveExpression EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1137:1: ruleXAdditiveExpression EOF
+            // InternalCheck.g:1136:1: ( ruleXAdditiveExpression EOF )
+            // InternalCheck.g:1137:1: ruleXAdditiveExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXAdditiveExpression_in_entryRuleXAdditiveExpression2356);
+            pushFollow(FOLLOW_1);
             ruleXAdditiveExpression();
 
             state._fsp--;
@@ -3381,7 +3381,7 @@ public final void entryRuleXAdditiveExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAdditiveExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAdditiveExpression2363); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3398,25 +3398,25 @@ public final void entryRuleXAdditiveExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXAdditiveExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1144:1: ruleXAdditiveExpression : ( ( rule__XAdditiveExpression__Group__0 ) ) ;
+    // InternalCheck.g:1144:1: ruleXAdditiveExpression : ( ( rule__XAdditiveExpression__Group__0 ) ) ;
     public final void ruleXAdditiveExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1148:2: ( ( ( rule__XAdditiveExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1149:1: ( ( rule__XAdditiveExpression__Group__0 ) )
+            // InternalCheck.g:1148:2: ( ( ( rule__XAdditiveExpression__Group__0 ) ) )
+            // InternalCheck.g:1149:1: ( ( rule__XAdditiveExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1149:1: ( ( rule__XAdditiveExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1150:1: ( rule__XAdditiveExpression__Group__0 )
+            // InternalCheck.g:1149:1: ( ( rule__XAdditiveExpression__Group__0 ) )
+            // InternalCheck.g:1150:1: ( rule__XAdditiveExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1151:1: ( rule__XAdditiveExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1151:2: rule__XAdditiveExpression__Group__0
+            // InternalCheck.g:1151:1: ( rule__XAdditiveExpression__Group__0 )
+            // InternalCheck.g:1151:2: rule__XAdditiveExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group__0_in_ruleXAdditiveExpression2389);
+            pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group__0();
 
             state._fsp--;
@@ -3449,16 +3449,16 @@ public final void ruleXAdditiveExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpAdd"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1163:1: entryRuleOpAdd : ruleOpAdd EOF ;
+    // InternalCheck.g:1163:1: entryRuleOpAdd : ruleOpAdd EOF ;
     public final void entryRuleOpAdd() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1164:1: ( ruleOpAdd EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1165:1: ruleOpAdd EOF
+            // InternalCheck.g:1164:1: ( ruleOpAdd EOF )
+            // InternalCheck.g:1165:1: ruleOpAdd EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpAddRule()); 
             }
-            pushFollow(FOLLOW_ruleOpAdd_in_entryRuleOpAdd2416);
+            pushFollow(FOLLOW_1);
             ruleOpAdd();
 
             state._fsp--;
@@ -3466,7 +3466,7 @@ public final void entryRuleOpAdd() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpAddRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpAdd2423); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3483,25 +3483,25 @@ public final void entryRuleOpAdd() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpAdd"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1172:1: ruleOpAdd : ( ( rule__OpAdd__Alternatives ) ) ;
+    // InternalCheck.g:1172:1: ruleOpAdd : ( ( rule__OpAdd__Alternatives ) ) ;
     public final void ruleOpAdd() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1176:2: ( ( ( rule__OpAdd__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1177:1: ( ( rule__OpAdd__Alternatives ) )
+            // InternalCheck.g:1176:2: ( ( ( rule__OpAdd__Alternatives ) ) )
+            // InternalCheck.g:1177:1: ( ( rule__OpAdd__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1177:1: ( ( rule__OpAdd__Alternatives ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1178:1: ( rule__OpAdd__Alternatives )
+            // InternalCheck.g:1177:1: ( ( rule__OpAdd__Alternatives ) )
+            // InternalCheck.g:1178:1: ( rule__OpAdd__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpAddAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1179:1: ( rule__OpAdd__Alternatives )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1179:2: rule__OpAdd__Alternatives
+            // InternalCheck.g:1179:1: ( rule__OpAdd__Alternatives )
+            // InternalCheck.g:1179:2: rule__OpAdd__Alternatives
             {
-            pushFollow(FOLLOW_rule__OpAdd__Alternatives_in_ruleOpAdd2449);
+            pushFollow(FOLLOW_2);
             rule__OpAdd__Alternatives();
 
             state._fsp--;
@@ -3534,16 +3534,16 @@ public final void ruleOpAdd() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXMultiplicativeExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1191:1: entryRuleXMultiplicativeExpression : ruleXMultiplicativeExpression EOF ;
+    // InternalCheck.g:1191:1: entryRuleXMultiplicativeExpression : ruleXMultiplicativeExpression EOF ;
     public final void entryRuleXMultiplicativeExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1192:1: ( ruleXMultiplicativeExpression EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1193:1: ruleXMultiplicativeExpression EOF
+            // InternalCheck.g:1192:1: ( ruleXMultiplicativeExpression EOF )
+            // InternalCheck.g:1193:1: ruleXMultiplicativeExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXMultiplicativeExpression_in_entryRuleXMultiplicativeExpression2476);
+            pushFollow(FOLLOW_1);
             ruleXMultiplicativeExpression();
 
             state._fsp--;
@@ -3551,7 +3551,7 @@ public final void entryRuleXMultiplicativeExpression() throws RecognitionExcepti
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMultiplicativeExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXMultiplicativeExpression2483); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3568,25 +3568,25 @@ public final void entryRuleXMultiplicativeExpression() throws RecognitionExcepti
 
 
     // $ANTLR start "ruleXMultiplicativeExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1200:1: ruleXMultiplicativeExpression : ( ( rule__XMultiplicativeExpression__Group__0 ) ) ;
+    // InternalCheck.g:1200:1: ruleXMultiplicativeExpression : ( ( rule__XMultiplicativeExpression__Group__0 ) ) ;
     public final void ruleXMultiplicativeExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1204:2: ( ( ( rule__XMultiplicativeExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1205:1: ( ( rule__XMultiplicativeExpression__Group__0 ) )
+            // InternalCheck.g:1204:2: ( ( ( rule__XMultiplicativeExpression__Group__0 ) ) )
+            // InternalCheck.g:1205:1: ( ( rule__XMultiplicativeExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1205:1: ( ( rule__XMultiplicativeExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1206:1: ( rule__XMultiplicativeExpression__Group__0 )
+            // InternalCheck.g:1205:1: ( ( rule__XMultiplicativeExpression__Group__0 ) )
+            // InternalCheck.g:1206:1: ( rule__XMultiplicativeExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1207:1: ( rule__XMultiplicativeExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1207:2: rule__XMultiplicativeExpression__Group__0
+            // InternalCheck.g:1207:1: ( rule__XMultiplicativeExpression__Group__0 )
+            // InternalCheck.g:1207:2: rule__XMultiplicativeExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group__0_in_ruleXMultiplicativeExpression2509);
+            pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group__0();
 
             state._fsp--;
@@ -3619,16 +3619,16 @@ public final void ruleXMultiplicativeExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpMulti"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1219:1: entryRuleOpMulti : ruleOpMulti EOF ;
+    // InternalCheck.g:1219:1: entryRuleOpMulti : ruleOpMulti EOF ;
     public final void entryRuleOpMulti() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1220:1: ( ruleOpMulti EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1221:1: ruleOpMulti EOF
+            // InternalCheck.g:1220:1: ( ruleOpMulti EOF )
+            // InternalCheck.g:1221:1: ruleOpMulti EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiRule()); 
             }
-            pushFollow(FOLLOW_ruleOpMulti_in_entryRuleOpMulti2536);
+            pushFollow(FOLLOW_1);
             ruleOpMulti();
 
             state._fsp--;
@@ -3636,7 +3636,7 @@ public final void entryRuleOpMulti() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpMultiRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpMulti2543); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3653,25 +3653,25 @@ public final void entryRuleOpMulti() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpMulti"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1228:1: ruleOpMulti : ( ( rule__OpMulti__Alternatives ) ) ;
+    // InternalCheck.g:1228:1: ruleOpMulti : ( ( rule__OpMulti__Alternatives ) ) ;
     public final void ruleOpMulti() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1232:2: ( ( ( rule__OpMulti__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1233:1: ( ( rule__OpMulti__Alternatives ) )
+            // InternalCheck.g:1232:2: ( ( ( rule__OpMulti__Alternatives ) ) )
+            // InternalCheck.g:1233:1: ( ( rule__OpMulti__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1233:1: ( ( rule__OpMulti__Alternatives ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1234:1: ( rule__OpMulti__Alternatives )
+            // InternalCheck.g:1233:1: ( ( rule__OpMulti__Alternatives ) )
+            // InternalCheck.g:1234:1: ( rule__OpMulti__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1235:1: ( rule__OpMulti__Alternatives )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1235:2: rule__OpMulti__Alternatives
+            // InternalCheck.g:1235:1: ( rule__OpMulti__Alternatives )
+            // InternalCheck.g:1235:2: rule__OpMulti__Alternatives
             {
-            pushFollow(FOLLOW_rule__OpMulti__Alternatives_in_ruleOpMulti2569);
+            pushFollow(FOLLOW_2);
             rule__OpMulti__Alternatives();
 
             state._fsp--;
@@ -3704,16 +3704,16 @@ public final void ruleOpMulti() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXUnaryOperation"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1247:1: entryRuleXUnaryOperation : ruleXUnaryOperation EOF ;
+    // InternalCheck.g:1247:1: entryRuleXUnaryOperation : ruleXUnaryOperation EOF ;
     public final void entryRuleXUnaryOperation() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1248:1: ( ruleXUnaryOperation EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1249:1: ruleXUnaryOperation EOF
+            // InternalCheck.g:1248:1: ( ruleXUnaryOperation EOF )
+            // InternalCheck.g:1249:1: ruleXUnaryOperation EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationRule()); 
             }
-            pushFollow(FOLLOW_ruleXUnaryOperation_in_entryRuleXUnaryOperation2596);
+            pushFollow(FOLLOW_1);
             ruleXUnaryOperation();
 
             state._fsp--;
@@ -3721,7 +3721,7 @@ public final void entryRuleXUnaryOperation() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXUnaryOperationRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXUnaryOperation2603); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3738,25 +3738,25 @@ public final void entryRuleXUnaryOperation() throws RecognitionException {
 
 
     // $ANTLR start "ruleXUnaryOperation"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1256:1: ruleXUnaryOperation : ( ( rule__XUnaryOperation__Alternatives ) ) ;
+    // InternalCheck.g:1256:1: ruleXUnaryOperation : ( ( rule__XUnaryOperation__Alternatives ) ) ;
     public final void ruleXUnaryOperation() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1260:2: ( ( ( rule__XUnaryOperation__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1261:1: ( ( rule__XUnaryOperation__Alternatives ) )
+            // InternalCheck.g:1260:2: ( ( ( rule__XUnaryOperation__Alternatives ) ) )
+            // InternalCheck.g:1261:1: ( ( rule__XUnaryOperation__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1261:1: ( ( rule__XUnaryOperation__Alternatives ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1262:1: ( rule__XUnaryOperation__Alternatives )
+            // InternalCheck.g:1261:1: ( ( rule__XUnaryOperation__Alternatives ) )
+            // InternalCheck.g:1262:1: ( rule__XUnaryOperation__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1263:1: ( rule__XUnaryOperation__Alternatives )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1263:2: rule__XUnaryOperation__Alternatives
+            // InternalCheck.g:1263:1: ( rule__XUnaryOperation__Alternatives )
+            // InternalCheck.g:1263:2: rule__XUnaryOperation__Alternatives
             {
-            pushFollow(FOLLOW_rule__XUnaryOperation__Alternatives_in_ruleXUnaryOperation2629);
+            pushFollow(FOLLOW_2);
             rule__XUnaryOperation__Alternatives();
 
             state._fsp--;
@@ -3789,16 +3789,16 @@ public final void ruleXUnaryOperation() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpUnary"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1275:1: entryRuleOpUnary : ruleOpUnary EOF ;
+    // InternalCheck.g:1275:1: entryRuleOpUnary : ruleOpUnary EOF ;
     public final void entryRuleOpUnary() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1276:1: ( ruleOpUnary EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1277:1: ruleOpUnary EOF
+            // InternalCheck.g:1276:1: ( ruleOpUnary EOF )
+            // InternalCheck.g:1277:1: ruleOpUnary EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpUnaryRule()); 
             }
-            pushFollow(FOLLOW_ruleOpUnary_in_entryRuleOpUnary2656);
+            pushFollow(FOLLOW_1);
             ruleOpUnary();
 
             state._fsp--;
@@ -3806,7 +3806,7 @@ public final void entryRuleOpUnary() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpUnaryRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpUnary2663); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3823,25 +3823,25 @@ public final void entryRuleOpUnary() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpUnary"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1284:1: ruleOpUnary : ( ( rule__OpUnary__Alternatives ) ) ;
+    // InternalCheck.g:1284:1: ruleOpUnary : ( ( rule__OpUnary__Alternatives ) ) ;
     public final void ruleOpUnary() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1288:2: ( ( ( rule__OpUnary__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1289:1: ( ( rule__OpUnary__Alternatives ) )
+            // InternalCheck.g:1288:2: ( ( ( rule__OpUnary__Alternatives ) ) )
+            // InternalCheck.g:1289:1: ( ( rule__OpUnary__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1289:1: ( ( rule__OpUnary__Alternatives ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1290:1: ( rule__OpUnary__Alternatives )
+            // InternalCheck.g:1289:1: ( ( rule__OpUnary__Alternatives ) )
+            // InternalCheck.g:1290:1: ( rule__OpUnary__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpUnaryAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1291:1: ( rule__OpUnary__Alternatives )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1291:2: rule__OpUnary__Alternatives
+            // InternalCheck.g:1291:1: ( rule__OpUnary__Alternatives )
+            // InternalCheck.g:1291:2: rule__OpUnary__Alternatives
             {
-            pushFollow(FOLLOW_rule__OpUnary__Alternatives_in_ruleOpUnary2689);
+            pushFollow(FOLLOW_2);
             rule__OpUnary__Alternatives();
 
             state._fsp--;
@@ -3874,16 +3874,16 @@ public final void ruleOpUnary() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXCastedExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1303:1: entryRuleXCastedExpression : ruleXCastedExpression EOF ;
+    // InternalCheck.g:1303:1: entryRuleXCastedExpression : ruleXCastedExpression EOF ;
     public final void entryRuleXCastedExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1304:1: ( ruleXCastedExpression EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1305:1: ruleXCastedExpression EOF
+            // InternalCheck.g:1304:1: ( ruleXCastedExpression EOF )
+            // InternalCheck.g:1305:1: ruleXCastedExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXCastedExpression_in_entryRuleXCastedExpression2716);
+            pushFollow(FOLLOW_1);
             ruleXCastedExpression();
 
             state._fsp--;
@@ -3891,7 +3891,7 @@ public final void entryRuleXCastedExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXCastedExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXCastedExpression2723); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3908,25 +3908,25 @@ public final void entryRuleXCastedExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXCastedExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1312:1: ruleXCastedExpression : ( ( rule__XCastedExpression__Group__0 ) ) ;
+    // InternalCheck.g:1312:1: ruleXCastedExpression : ( ( rule__XCastedExpression__Group__0 ) ) ;
     public final void ruleXCastedExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1316:2: ( ( ( rule__XCastedExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1317:1: ( ( rule__XCastedExpression__Group__0 ) )
+            // InternalCheck.g:1316:2: ( ( ( rule__XCastedExpression__Group__0 ) ) )
+            // InternalCheck.g:1317:1: ( ( rule__XCastedExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1317:1: ( ( rule__XCastedExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1318:1: ( rule__XCastedExpression__Group__0 )
+            // InternalCheck.g:1317:1: ( ( rule__XCastedExpression__Group__0 ) )
+            // InternalCheck.g:1318:1: ( rule__XCastedExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1319:1: ( rule__XCastedExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1319:2: rule__XCastedExpression__Group__0
+            // InternalCheck.g:1319:1: ( rule__XCastedExpression__Group__0 )
+            // InternalCheck.g:1319:2: rule__XCastedExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__Group__0_in_ruleXCastedExpression2749);
+            pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group__0();
 
             state._fsp--;
@@ -3959,16 +3959,16 @@ public final void ruleXCastedExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXPostfixOperation"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1331:1: entryRuleXPostfixOperation : ruleXPostfixOperation EOF ;
+    // InternalCheck.g:1331:1: entryRuleXPostfixOperation : ruleXPostfixOperation EOF ;
     public final void entryRuleXPostfixOperation() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1332:1: ( ruleXPostfixOperation EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1333:1: ruleXPostfixOperation EOF
+            // InternalCheck.g:1332:1: ( ruleXPostfixOperation EOF )
+            // InternalCheck.g:1333:1: ruleXPostfixOperation EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationRule()); 
             }
-            pushFollow(FOLLOW_ruleXPostfixOperation_in_entryRuleXPostfixOperation2776);
+            pushFollow(FOLLOW_1);
             ruleXPostfixOperation();
 
             state._fsp--;
@@ -3976,7 +3976,7 @@ public final void entryRuleXPostfixOperation() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXPostfixOperationRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXPostfixOperation2783); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3993,25 +3993,25 @@ public final void entryRuleXPostfixOperation() throws RecognitionException {
 
 
     // $ANTLR start "ruleXPostfixOperation"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1340:1: ruleXPostfixOperation : ( ( rule__XPostfixOperation__Group__0 ) ) ;
+    // InternalCheck.g:1340:1: ruleXPostfixOperation : ( ( rule__XPostfixOperation__Group__0 ) ) ;
     public final void ruleXPostfixOperation() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1344:2: ( ( ( rule__XPostfixOperation__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1345:1: ( ( rule__XPostfixOperation__Group__0 ) )
+            // InternalCheck.g:1344:2: ( ( ( rule__XPostfixOperation__Group__0 ) ) )
+            // InternalCheck.g:1345:1: ( ( rule__XPostfixOperation__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1345:1: ( ( rule__XPostfixOperation__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1346:1: ( rule__XPostfixOperation__Group__0 )
+            // InternalCheck.g:1345:1: ( ( rule__XPostfixOperation__Group__0 ) )
+            // InternalCheck.g:1346:1: ( rule__XPostfixOperation__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1347:1: ( rule__XPostfixOperation__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1347:2: rule__XPostfixOperation__Group__0
+            // InternalCheck.g:1347:1: ( rule__XPostfixOperation__Group__0 )
+            // InternalCheck.g:1347:2: rule__XPostfixOperation__Group__0
             {
-            pushFollow(FOLLOW_rule__XPostfixOperation__Group__0_in_ruleXPostfixOperation2809);
+            pushFollow(FOLLOW_2);
             rule__XPostfixOperation__Group__0();
 
             state._fsp--;
@@ -4044,16 +4044,16 @@ public final void ruleXPostfixOperation() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpPostfix"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1359:1: entryRuleOpPostfix : ruleOpPostfix EOF ;
+    // InternalCheck.g:1359:1: entryRuleOpPostfix : ruleOpPostfix EOF ;
     public final void entryRuleOpPostfix() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1360:1: ( ruleOpPostfix EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1361:1: ruleOpPostfix EOF
+            // InternalCheck.g:1360:1: ( ruleOpPostfix EOF )
+            // InternalCheck.g:1361:1: ruleOpPostfix EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpPostfixRule()); 
             }
-            pushFollow(FOLLOW_ruleOpPostfix_in_entryRuleOpPostfix2836);
+            pushFollow(FOLLOW_1);
             ruleOpPostfix();
 
             state._fsp--;
@@ -4061,7 +4061,7 @@ public final void entryRuleOpPostfix() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpPostfixRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpPostfix2843); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4078,25 +4078,25 @@ public final void entryRuleOpPostfix() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpPostfix"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1368:1: ruleOpPostfix : ( ( rule__OpPostfix__Alternatives ) ) ;
+    // InternalCheck.g:1368:1: ruleOpPostfix : ( ( rule__OpPostfix__Alternatives ) ) ;
     public final void ruleOpPostfix() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1372:2: ( ( ( rule__OpPostfix__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1373:1: ( ( rule__OpPostfix__Alternatives ) )
+            // InternalCheck.g:1372:2: ( ( ( rule__OpPostfix__Alternatives ) ) )
+            // InternalCheck.g:1373:1: ( ( rule__OpPostfix__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1373:1: ( ( rule__OpPostfix__Alternatives ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1374:1: ( rule__OpPostfix__Alternatives )
+            // InternalCheck.g:1373:1: ( ( rule__OpPostfix__Alternatives ) )
+            // InternalCheck.g:1374:1: ( rule__OpPostfix__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpPostfixAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1375:1: ( rule__OpPostfix__Alternatives )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1375:2: rule__OpPostfix__Alternatives
+            // InternalCheck.g:1375:1: ( rule__OpPostfix__Alternatives )
+            // InternalCheck.g:1375:2: rule__OpPostfix__Alternatives
             {
-            pushFollow(FOLLOW_rule__OpPostfix__Alternatives_in_ruleOpPostfix2869);
+            pushFollow(FOLLOW_2);
             rule__OpPostfix__Alternatives();
 
             state._fsp--;
@@ -4129,16 +4129,16 @@ public final void ruleOpPostfix() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXMemberFeatureCall"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1387:1: entryRuleXMemberFeatureCall : ruleXMemberFeatureCall EOF ;
+    // InternalCheck.g:1387:1: entryRuleXMemberFeatureCall : ruleXMemberFeatureCall EOF ;
     public final void entryRuleXMemberFeatureCall() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1388:1: ( ruleXMemberFeatureCall EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1389:1: ruleXMemberFeatureCall EOF
+            // InternalCheck.g:1388:1: ( ruleXMemberFeatureCall EOF )
+            // InternalCheck.g:1389:1: ruleXMemberFeatureCall EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallRule()); 
             }
-            pushFollow(FOLLOW_ruleXMemberFeatureCall_in_entryRuleXMemberFeatureCall2896);
+            pushFollow(FOLLOW_1);
             ruleXMemberFeatureCall();
 
             state._fsp--;
@@ -4146,7 +4146,7 @@ public final void entryRuleXMemberFeatureCall() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXMemberFeatureCall2903); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4163,25 +4163,25 @@ public final void entryRuleXMemberFeatureCall() throws RecognitionException {
 
 
     // $ANTLR start "ruleXMemberFeatureCall"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1396:1: ruleXMemberFeatureCall : ( ( rule__XMemberFeatureCall__Group__0 ) ) ;
+    // InternalCheck.g:1396:1: ruleXMemberFeatureCall : ( ( rule__XMemberFeatureCall__Group__0 ) ) ;
     public final void ruleXMemberFeatureCall() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1400:2: ( ( ( rule__XMemberFeatureCall__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1401:1: ( ( rule__XMemberFeatureCall__Group__0 ) )
+            // InternalCheck.g:1400:2: ( ( ( rule__XMemberFeatureCall__Group__0 ) ) )
+            // InternalCheck.g:1401:1: ( ( rule__XMemberFeatureCall__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1401:1: ( ( rule__XMemberFeatureCall__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1402:1: ( rule__XMemberFeatureCall__Group__0 )
+            // InternalCheck.g:1401:1: ( ( rule__XMemberFeatureCall__Group__0 ) )
+            // InternalCheck.g:1402:1: ( rule__XMemberFeatureCall__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1403:1: ( rule__XMemberFeatureCall__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1403:2: rule__XMemberFeatureCall__Group__0
+            // InternalCheck.g:1403:1: ( rule__XMemberFeatureCall__Group__0 )
+            // InternalCheck.g:1403:2: rule__XMemberFeatureCall__Group__0
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group__0_in_ruleXMemberFeatureCall2929);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group__0();
 
             state._fsp--;
@@ -4214,16 +4214,16 @@ public final void ruleXMemberFeatureCall() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXLiteral"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1415:1: entryRuleXLiteral : ruleXLiteral EOF ;
+    // InternalCheck.g:1415:1: entryRuleXLiteral : ruleXLiteral EOF ;
     public final void entryRuleXLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1416:1: ( ruleXLiteral EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1417:1: ruleXLiteral EOF
+            // InternalCheck.g:1416:1: ( ruleXLiteral EOF )
+            // InternalCheck.g:1417:1: ruleXLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXLiteral_in_entryRuleXLiteral2956);
+            pushFollow(FOLLOW_1);
             ruleXLiteral();
 
             state._fsp--;
@@ -4231,7 +4231,7 @@ public final void entryRuleXLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXLiteral2963); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4248,25 +4248,25 @@ public final void entryRuleXLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXLiteral"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1424:1: ruleXLiteral : ( ( rule__XLiteral__Alternatives ) ) ;
+    // InternalCheck.g:1424:1: ruleXLiteral : ( ( rule__XLiteral__Alternatives ) ) ;
     public final void ruleXLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1428:2: ( ( ( rule__XLiteral__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1429:1: ( ( rule__XLiteral__Alternatives ) )
+            // InternalCheck.g:1428:2: ( ( ( rule__XLiteral__Alternatives ) ) )
+            // InternalCheck.g:1429:1: ( ( rule__XLiteral__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1429:1: ( ( rule__XLiteral__Alternatives ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1430:1: ( rule__XLiteral__Alternatives )
+            // InternalCheck.g:1429:1: ( ( rule__XLiteral__Alternatives ) )
+            // InternalCheck.g:1430:1: ( rule__XLiteral__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXLiteralAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1431:1: ( rule__XLiteral__Alternatives )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1431:2: rule__XLiteral__Alternatives
+            // InternalCheck.g:1431:1: ( rule__XLiteral__Alternatives )
+            // InternalCheck.g:1431:2: rule__XLiteral__Alternatives
             {
-            pushFollow(FOLLOW_rule__XLiteral__Alternatives_in_ruleXLiteral2989);
+            pushFollow(FOLLOW_2);
             rule__XLiteral__Alternatives();
 
             state._fsp--;
@@ -4299,16 +4299,16 @@ public final void ruleXLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXCollectionLiteral"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1443:1: entryRuleXCollectionLiteral : ruleXCollectionLiteral EOF ;
+    // InternalCheck.g:1443:1: entryRuleXCollectionLiteral : ruleXCollectionLiteral EOF ;
     public final void entryRuleXCollectionLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1444:1: ( ruleXCollectionLiteral EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1445:1: ruleXCollectionLiteral EOF
+            // InternalCheck.g:1444:1: ( ruleXCollectionLiteral EOF )
+            // InternalCheck.g:1445:1: ruleXCollectionLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCollectionLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXCollectionLiteral_in_entryRuleXCollectionLiteral3016);
+            pushFollow(FOLLOW_1);
             ruleXCollectionLiteral();
 
             state._fsp--;
@@ -4316,7 +4316,7 @@ public final void entryRuleXCollectionLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXCollectionLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXCollectionLiteral3023); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4333,25 +4333,25 @@ public final void entryRuleXCollectionLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXCollectionLiteral"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1452:1: ruleXCollectionLiteral : ( ( rule__XCollectionLiteral__Alternatives ) ) ;
+    // InternalCheck.g:1452:1: ruleXCollectionLiteral : ( ( rule__XCollectionLiteral__Alternatives ) ) ;
     public final void ruleXCollectionLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1456:2: ( ( ( rule__XCollectionLiteral__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1457:1: ( ( rule__XCollectionLiteral__Alternatives ) )
+            // InternalCheck.g:1456:2: ( ( ( rule__XCollectionLiteral__Alternatives ) ) )
+            // InternalCheck.g:1457:1: ( ( rule__XCollectionLiteral__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1457:1: ( ( rule__XCollectionLiteral__Alternatives ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1458:1: ( rule__XCollectionLiteral__Alternatives )
+            // InternalCheck.g:1457:1: ( ( rule__XCollectionLiteral__Alternatives ) )
+            // InternalCheck.g:1458:1: ( rule__XCollectionLiteral__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCollectionLiteralAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1459:1: ( rule__XCollectionLiteral__Alternatives )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1459:2: rule__XCollectionLiteral__Alternatives
+            // InternalCheck.g:1459:1: ( rule__XCollectionLiteral__Alternatives )
+            // InternalCheck.g:1459:2: rule__XCollectionLiteral__Alternatives
             {
-            pushFollow(FOLLOW_rule__XCollectionLiteral__Alternatives_in_ruleXCollectionLiteral3049);
+            pushFollow(FOLLOW_2);
             rule__XCollectionLiteral__Alternatives();
 
             state._fsp--;
@@ -4384,16 +4384,16 @@ public final void ruleXCollectionLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXSetLiteral"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1471:1: entryRuleXSetLiteral : ruleXSetLiteral EOF ;
+    // InternalCheck.g:1471:1: entryRuleXSetLiteral : ruleXSetLiteral EOF ;
     public final void entryRuleXSetLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1472:1: ( ruleXSetLiteral EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1473:1: ruleXSetLiteral EOF
+            // InternalCheck.g:1472:1: ( ruleXSetLiteral EOF )
+            // InternalCheck.g:1473:1: ruleXSetLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXSetLiteral_in_entryRuleXSetLiteral3076);
+            pushFollow(FOLLOW_1);
             ruleXSetLiteral();
 
             state._fsp--;
@@ -4401,7 +4401,7 @@ public final void entryRuleXSetLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSetLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXSetLiteral3083); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4418,25 +4418,25 @@ public final void entryRuleXSetLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXSetLiteral"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1480:1: ruleXSetLiteral : ( ( rule__XSetLiteral__Group__0 ) ) ;
+    // InternalCheck.g:1480:1: ruleXSetLiteral : ( ( rule__XSetLiteral__Group__0 ) ) ;
     public final void ruleXSetLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1484:2: ( ( ( rule__XSetLiteral__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1485:1: ( ( rule__XSetLiteral__Group__0 ) )
+            // InternalCheck.g:1484:2: ( ( ( rule__XSetLiteral__Group__0 ) ) )
+            // InternalCheck.g:1485:1: ( ( rule__XSetLiteral__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1485:1: ( ( rule__XSetLiteral__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1486:1: ( rule__XSetLiteral__Group__0 )
+            // InternalCheck.g:1485:1: ( ( rule__XSetLiteral__Group__0 ) )
+            // InternalCheck.g:1486:1: ( rule__XSetLiteral__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1487:1: ( rule__XSetLiteral__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1487:2: rule__XSetLiteral__Group__0
+            // InternalCheck.g:1487:1: ( rule__XSetLiteral__Group__0 )
+            // InternalCheck.g:1487:2: rule__XSetLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__Group__0_in_ruleXSetLiteral3109);
+            pushFollow(FOLLOW_2);
             rule__XSetLiteral__Group__0();
 
             state._fsp--;
@@ -4469,16 +4469,16 @@ public final void ruleXSetLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXListLiteral"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1499:1: entryRuleXListLiteral : ruleXListLiteral EOF ;
+    // InternalCheck.g:1499:1: entryRuleXListLiteral : ruleXListLiteral EOF ;
     public final void entryRuleXListLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1500:1: ( ruleXListLiteral EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1501:1: ruleXListLiteral EOF
+            // InternalCheck.g:1500:1: ( ruleXListLiteral EOF )
+            // InternalCheck.g:1501:1: ruleXListLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXListLiteral_in_entryRuleXListLiteral3136);
+            pushFollow(FOLLOW_1);
             ruleXListLiteral();
 
             state._fsp--;
@@ -4486,7 +4486,7 @@ public final void entryRuleXListLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXListLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXListLiteral3143); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4503,25 +4503,25 @@ public final void entryRuleXListLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXListLiteral"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1508:1: ruleXListLiteral : ( ( rule__XListLiteral__Group__0 ) ) ;
+    // InternalCheck.g:1508:1: ruleXListLiteral : ( ( rule__XListLiteral__Group__0 ) ) ;
     public final void ruleXListLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1512:2: ( ( ( rule__XListLiteral__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1513:1: ( ( rule__XListLiteral__Group__0 ) )
+            // InternalCheck.g:1512:2: ( ( ( rule__XListLiteral__Group__0 ) ) )
+            // InternalCheck.g:1513:1: ( ( rule__XListLiteral__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1513:1: ( ( rule__XListLiteral__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1514:1: ( rule__XListLiteral__Group__0 )
+            // InternalCheck.g:1513:1: ( ( rule__XListLiteral__Group__0 ) )
+            // InternalCheck.g:1514:1: ( rule__XListLiteral__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1515:1: ( rule__XListLiteral__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1515:2: rule__XListLiteral__Group__0
+            // InternalCheck.g:1515:1: ( rule__XListLiteral__Group__0 )
+            // InternalCheck.g:1515:2: rule__XListLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__XListLiteral__Group__0_in_ruleXListLiteral3169);
+            pushFollow(FOLLOW_2);
             rule__XListLiteral__Group__0();
 
             state._fsp--;
@@ -4554,16 +4554,16 @@ public final void ruleXListLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXClosure"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1527:1: entryRuleXClosure : ruleXClosure EOF ;
+    // InternalCheck.g:1527:1: entryRuleXClosure : ruleXClosure EOF ;
     public final void entryRuleXClosure() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1528:1: ( ruleXClosure EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1529:1: ruleXClosure EOF
+            // InternalCheck.g:1528:1: ( ruleXClosure EOF )
+            // InternalCheck.g:1529:1: ruleXClosure EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureRule()); 
             }
-            pushFollow(FOLLOW_ruleXClosure_in_entryRuleXClosure3196);
+            pushFollow(FOLLOW_1);
             ruleXClosure();
 
             state._fsp--;
@@ -4571,7 +4571,7 @@ public final void entryRuleXClosure() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXClosureRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXClosure3203); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4588,25 +4588,25 @@ public final void entryRuleXClosure() throws RecognitionException {
 
 
     // $ANTLR start "ruleXClosure"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1536:1: ruleXClosure : ( ( rule__XClosure__Group__0 ) ) ;
+    // InternalCheck.g:1536:1: ruleXClosure : ( ( rule__XClosure__Group__0 ) ) ;
     public final void ruleXClosure() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1540:2: ( ( ( rule__XClosure__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1541:1: ( ( rule__XClosure__Group__0 ) )
+            // InternalCheck.g:1540:2: ( ( ( rule__XClosure__Group__0 ) ) )
+            // InternalCheck.g:1541:1: ( ( rule__XClosure__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1541:1: ( ( rule__XClosure__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1542:1: ( rule__XClosure__Group__0 )
+            // InternalCheck.g:1541:1: ( ( rule__XClosure__Group__0 ) )
+            // InternalCheck.g:1542:1: ( rule__XClosure__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1543:1: ( rule__XClosure__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1543:2: rule__XClosure__Group__0
+            // InternalCheck.g:1543:1: ( rule__XClosure__Group__0 )
+            // InternalCheck.g:1543:2: rule__XClosure__Group__0
             {
-            pushFollow(FOLLOW_rule__XClosure__Group__0_in_ruleXClosure3229);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group__0();
 
             state._fsp--;
@@ -4639,16 +4639,16 @@ public final void ruleXClosure() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXExpressionInClosure"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1555:1: entryRuleXExpressionInClosure : ruleXExpressionInClosure EOF ;
+    // InternalCheck.g:1555:1: entryRuleXExpressionInClosure : ruleXExpressionInClosure EOF ;
     public final void entryRuleXExpressionInClosure() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1556:1: ( ruleXExpressionInClosure EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1557:1: ruleXExpressionInClosure EOF
+            // InternalCheck.g:1556:1: ( ruleXExpressionInClosure EOF )
+            // InternalCheck.g:1557:1: ruleXExpressionInClosure EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionInClosureRule()); 
             }
-            pushFollow(FOLLOW_ruleXExpressionInClosure_in_entryRuleXExpressionInClosure3256);
+            pushFollow(FOLLOW_1);
             ruleXExpressionInClosure();
 
             state._fsp--;
@@ -4656,7 +4656,7 @@ public final void entryRuleXExpressionInClosure() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXExpressionInClosureRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXExpressionInClosure3263); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4673,25 +4673,25 @@ public final void entryRuleXExpressionInClosure() throws RecognitionException {
 
 
     // $ANTLR start "ruleXExpressionInClosure"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1564:1: ruleXExpressionInClosure : ( ( rule__XExpressionInClosure__Group__0 ) ) ;
+    // InternalCheck.g:1564:1: ruleXExpressionInClosure : ( ( rule__XExpressionInClosure__Group__0 ) ) ;
     public final void ruleXExpressionInClosure() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1568:2: ( ( ( rule__XExpressionInClosure__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1569:1: ( ( rule__XExpressionInClosure__Group__0 ) )
+            // InternalCheck.g:1568:2: ( ( ( rule__XExpressionInClosure__Group__0 ) ) )
+            // InternalCheck.g:1569:1: ( ( rule__XExpressionInClosure__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1569:1: ( ( rule__XExpressionInClosure__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1570:1: ( rule__XExpressionInClosure__Group__0 )
+            // InternalCheck.g:1569:1: ( ( rule__XExpressionInClosure__Group__0 ) )
+            // InternalCheck.g:1570:1: ( rule__XExpressionInClosure__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionInClosureAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1571:1: ( rule__XExpressionInClosure__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1571:2: rule__XExpressionInClosure__Group__0
+            // InternalCheck.g:1571:1: ( rule__XExpressionInClosure__Group__0 )
+            // InternalCheck.g:1571:2: rule__XExpressionInClosure__Group__0
             {
-            pushFollow(FOLLOW_rule__XExpressionInClosure__Group__0_in_ruleXExpressionInClosure3289);
+            pushFollow(FOLLOW_2);
             rule__XExpressionInClosure__Group__0();
 
             state._fsp--;
@@ -4724,16 +4724,16 @@ public final void ruleXExpressionInClosure() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXShortClosure"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1583:1: entryRuleXShortClosure : ruleXShortClosure EOF ;
+    // InternalCheck.g:1583:1: entryRuleXShortClosure : ruleXShortClosure EOF ;
     public final void entryRuleXShortClosure() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1584:1: ( ruleXShortClosure EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1585:1: ruleXShortClosure EOF
+            // InternalCheck.g:1584:1: ( ruleXShortClosure EOF )
+            // InternalCheck.g:1585:1: ruleXShortClosure EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureRule()); 
             }
-            pushFollow(FOLLOW_ruleXShortClosure_in_entryRuleXShortClosure3316);
+            pushFollow(FOLLOW_1);
             ruleXShortClosure();
 
             state._fsp--;
@@ -4741,7 +4741,7 @@ public final void entryRuleXShortClosure() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXShortClosureRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXShortClosure3323); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4758,25 +4758,25 @@ public final void entryRuleXShortClosure() throws RecognitionException {
 
 
     // $ANTLR start "ruleXShortClosure"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1592:1: ruleXShortClosure : ( ( rule__XShortClosure__Group__0 ) ) ;
+    // InternalCheck.g:1592:1: ruleXShortClosure : ( ( rule__XShortClosure__Group__0 ) ) ;
     public final void ruleXShortClosure() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1596:2: ( ( ( rule__XShortClosure__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1597:1: ( ( rule__XShortClosure__Group__0 ) )
+            // InternalCheck.g:1596:2: ( ( ( rule__XShortClosure__Group__0 ) ) )
+            // InternalCheck.g:1597:1: ( ( rule__XShortClosure__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1597:1: ( ( rule__XShortClosure__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1598:1: ( rule__XShortClosure__Group__0 )
+            // InternalCheck.g:1597:1: ( ( rule__XShortClosure__Group__0 ) )
+            // InternalCheck.g:1598:1: ( rule__XShortClosure__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1599:1: ( rule__XShortClosure__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1599:2: rule__XShortClosure__Group__0
+            // InternalCheck.g:1599:1: ( rule__XShortClosure__Group__0 )
+            // InternalCheck.g:1599:2: rule__XShortClosure__Group__0
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group__0_in_ruleXShortClosure3349);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__Group__0();
 
             state._fsp--;
@@ -4809,16 +4809,16 @@ public final void ruleXShortClosure() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXParenthesizedExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1611:1: entryRuleXParenthesizedExpression : ruleXParenthesizedExpression EOF ;
+    // InternalCheck.g:1611:1: entryRuleXParenthesizedExpression : ruleXParenthesizedExpression EOF ;
     public final void entryRuleXParenthesizedExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1612:1: ( ruleXParenthesizedExpression EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1613:1: ruleXParenthesizedExpression EOF
+            // InternalCheck.g:1612:1: ( ruleXParenthesizedExpression EOF )
+            // InternalCheck.g:1613:1: ruleXParenthesizedExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXParenthesizedExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXParenthesizedExpression_in_entryRuleXParenthesizedExpression3376);
+            pushFollow(FOLLOW_1);
             ruleXParenthesizedExpression();
 
             state._fsp--;
@@ -4826,7 +4826,7 @@ public final void entryRuleXParenthesizedExpression() throws RecognitionExceptio
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXParenthesizedExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXParenthesizedExpression3383); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4843,25 +4843,25 @@ public final void entryRuleXParenthesizedExpression() throws RecognitionExceptio
 
 
     // $ANTLR start "ruleXParenthesizedExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1620:1: ruleXParenthesizedExpression : ( ( rule__XParenthesizedExpression__Group__0 ) ) ;
+    // InternalCheck.g:1620:1: ruleXParenthesizedExpression : ( ( rule__XParenthesizedExpression__Group__0 ) ) ;
     public final void ruleXParenthesizedExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1624:2: ( ( ( rule__XParenthesizedExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1625:1: ( ( rule__XParenthesizedExpression__Group__0 ) )
+            // InternalCheck.g:1624:2: ( ( ( rule__XParenthesizedExpression__Group__0 ) ) )
+            // InternalCheck.g:1625:1: ( ( rule__XParenthesizedExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1625:1: ( ( rule__XParenthesizedExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1626:1: ( rule__XParenthesizedExpression__Group__0 )
+            // InternalCheck.g:1625:1: ( ( rule__XParenthesizedExpression__Group__0 ) )
+            // InternalCheck.g:1626:1: ( rule__XParenthesizedExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXParenthesizedExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1627:1: ( rule__XParenthesizedExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1627:2: rule__XParenthesizedExpression__Group__0
+            // InternalCheck.g:1627:1: ( rule__XParenthesizedExpression__Group__0 )
+            // InternalCheck.g:1627:2: rule__XParenthesizedExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XParenthesizedExpression__Group__0_in_ruleXParenthesizedExpression3409);
+            pushFollow(FOLLOW_2);
             rule__XParenthesizedExpression__Group__0();
 
             state._fsp--;
@@ -4894,16 +4894,16 @@ public final void ruleXParenthesizedExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXIfExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1639:1: entryRuleXIfExpression : ruleXIfExpression EOF ;
+    // InternalCheck.g:1639:1: entryRuleXIfExpression : ruleXIfExpression EOF ;
     public final void entryRuleXIfExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1640:1: ( ruleXIfExpression EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1641:1: ruleXIfExpression EOF
+            // InternalCheck.g:1640:1: ( ruleXIfExpression EOF )
+            // InternalCheck.g:1641:1: ruleXIfExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXIfExpression_in_entryRuleXIfExpression3436);
+            pushFollow(FOLLOW_1);
             ruleXIfExpression();
 
             state._fsp--;
@@ -4911,7 +4911,7 @@ public final void entryRuleXIfExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXIfExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXIfExpression3443); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4928,25 +4928,25 @@ public final void entryRuleXIfExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXIfExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1648:1: ruleXIfExpression : ( ( rule__XIfExpression__Group__0 ) ) ;
+    // InternalCheck.g:1648:1: ruleXIfExpression : ( ( rule__XIfExpression__Group__0 ) ) ;
     public final void ruleXIfExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1652:2: ( ( ( rule__XIfExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1653:1: ( ( rule__XIfExpression__Group__0 ) )
+            // InternalCheck.g:1652:2: ( ( ( rule__XIfExpression__Group__0 ) ) )
+            // InternalCheck.g:1653:1: ( ( rule__XIfExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1653:1: ( ( rule__XIfExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1654:1: ( rule__XIfExpression__Group__0 )
+            // InternalCheck.g:1653:1: ( ( rule__XIfExpression__Group__0 ) )
+            // InternalCheck.g:1654:1: ( rule__XIfExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1655:1: ( rule__XIfExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1655:2: rule__XIfExpression__Group__0
+            // InternalCheck.g:1655:1: ( rule__XIfExpression__Group__0 )
+            // InternalCheck.g:1655:2: rule__XIfExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XIfExpression__Group__0_in_ruleXIfExpression3469);
+            pushFollow(FOLLOW_2);
             rule__XIfExpression__Group__0();
 
             state._fsp--;
@@ -4979,16 +4979,16 @@ public final void ruleXIfExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXSwitchExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1667:1: entryRuleXSwitchExpression : ruleXSwitchExpression EOF ;
+    // InternalCheck.g:1667:1: entryRuleXSwitchExpression : ruleXSwitchExpression EOF ;
     public final void entryRuleXSwitchExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1668:1: ( ruleXSwitchExpression EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1669:1: ruleXSwitchExpression EOF
+            // InternalCheck.g:1668:1: ( ruleXSwitchExpression EOF )
+            // InternalCheck.g:1669:1: ruleXSwitchExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXSwitchExpression_in_entryRuleXSwitchExpression3496);
+            pushFollow(FOLLOW_1);
             ruleXSwitchExpression();
 
             state._fsp--;
@@ -4996,7 +4996,7 @@ public final void entryRuleXSwitchExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXSwitchExpression3503); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -5013,25 +5013,25 @@ public final void entryRuleXSwitchExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXSwitchExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1676:1: ruleXSwitchExpression : ( ( rule__XSwitchExpression__Group__0 ) ) ;
+    // InternalCheck.g:1676:1: ruleXSwitchExpression : ( ( rule__XSwitchExpression__Group__0 ) ) ;
     public final void ruleXSwitchExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1680:2: ( ( ( rule__XSwitchExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1681:1: ( ( rule__XSwitchExpression__Group__0 ) )
+            // InternalCheck.g:1680:2: ( ( ( rule__XSwitchExpression__Group__0 ) ) )
+            // InternalCheck.g:1681:1: ( ( rule__XSwitchExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1681:1: ( ( rule__XSwitchExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1682:1: ( rule__XSwitchExpression__Group__0 )
+            // InternalCheck.g:1681:1: ( ( rule__XSwitchExpression__Group__0 ) )
+            // InternalCheck.g:1682:1: ( rule__XSwitchExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1683:1: ( rule__XSwitchExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1683:2: rule__XSwitchExpression__Group__0
+            // InternalCheck.g:1683:1: ( rule__XSwitchExpression__Group__0 )
+            // InternalCheck.g:1683:2: rule__XSwitchExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__0_in_ruleXSwitchExpression3529);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group__0();
 
             state._fsp--;
@@ -5064,16 +5064,16 @@ public final void ruleXSwitchExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXCasePart"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1695:1: entryRuleXCasePart : ruleXCasePart EOF ;
+    // InternalCheck.g:1695:1: entryRuleXCasePart : ruleXCasePart EOF ;
     public final void entryRuleXCasePart() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1696:1: ( ruleXCasePart EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1697:1: ruleXCasePart EOF
+            // InternalCheck.g:1696:1: ( ruleXCasePart EOF )
+            // InternalCheck.g:1697:1: ruleXCasePart EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartRule()); 
             }
-            pushFollow(FOLLOW_ruleXCasePart_in_entryRuleXCasePart3556);
+            pushFollow(FOLLOW_1);
             ruleXCasePart();
 
             state._fsp--;
@@ -5081,7 +5081,7 @@ public final void entryRuleXCasePart() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXCasePartRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXCasePart3563); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -5098,25 +5098,25 @@ public final void entryRuleXCasePart() throws RecognitionException {
 
 
     // $ANTLR start "ruleXCasePart"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1704:1: ruleXCasePart : ( ( rule__XCasePart__Group__0 ) ) ;
+    // InternalCheck.g:1704:1: ruleXCasePart : ( ( rule__XCasePart__Group__0 ) ) ;
     public final void ruleXCasePart() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1708:2: ( ( ( rule__XCasePart__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1709:1: ( ( rule__XCasePart__Group__0 ) )
+            // InternalCheck.g:1708:2: ( ( ( rule__XCasePart__Group__0 ) ) )
+            // InternalCheck.g:1709:1: ( ( rule__XCasePart__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1709:1: ( ( rule__XCasePart__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1710:1: ( rule__XCasePart__Group__0 )
+            // InternalCheck.g:1709:1: ( ( rule__XCasePart__Group__0 ) )
+            // InternalCheck.g:1710:1: ( rule__XCasePart__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1711:1: ( rule__XCasePart__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1711:2: rule__XCasePart__Group__0
+            // InternalCheck.g:1711:1: ( rule__XCasePart__Group__0 )
+            // InternalCheck.g:1711:2: rule__XCasePart__Group__0
             {
-            pushFollow(FOLLOW_rule__XCasePart__Group__0_in_ruleXCasePart3589);
+            pushFollow(FOLLOW_2);
             rule__XCasePart__Group__0();
 
             state._fsp--;
@@ -5149,16 +5149,16 @@ public final void ruleXCasePart() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXForLoopExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1723:1: entryRuleXForLoopExpression : ruleXForLoopExpression EOF ;
+    // InternalCheck.g:1723:1: entryRuleXForLoopExpression : ruleXForLoopExpression EOF ;
     public final void entryRuleXForLoopExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1724:1: ( ruleXForLoopExpression EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1725:1: ruleXForLoopExpression EOF
+            // InternalCheck.g:1724:1: ( ruleXForLoopExpression EOF )
+            // InternalCheck.g:1725:1: ruleXForLoopExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXForLoopExpression_in_entryRuleXForLoopExpression3616);
+            pushFollow(FOLLOW_1);
             ruleXForLoopExpression();
 
             state._fsp--;
@@ -5166,7 +5166,7 @@ public final void entryRuleXForLoopExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXForLoopExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXForLoopExpression3623); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -5183,25 +5183,25 @@ public final void entryRuleXForLoopExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXForLoopExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1732:1: ruleXForLoopExpression : ( ( rule__XForLoopExpression__Group__0 ) ) ;
+    // InternalCheck.g:1732:1: ruleXForLoopExpression : ( ( rule__XForLoopExpression__Group__0 ) ) ;
     public final void ruleXForLoopExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1736:2: ( ( ( rule__XForLoopExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1737:1: ( ( rule__XForLoopExpression__Group__0 ) )
+            // InternalCheck.g:1736:2: ( ( ( rule__XForLoopExpression__Group__0 ) ) )
+            // InternalCheck.g:1737:1: ( ( rule__XForLoopExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1737:1: ( ( rule__XForLoopExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1738:1: ( rule__XForLoopExpression__Group__0 )
+            // InternalCheck.g:1737:1: ( ( rule__XForLoopExpression__Group__0 ) )
+            // InternalCheck.g:1738:1: ( rule__XForLoopExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1739:1: ( rule__XForLoopExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1739:2: rule__XForLoopExpression__Group__0
+            // InternalCheck.g:1739:1: ( rule__XForLoopExpression__Group__0 )
+            // InternalCheck.g:1739:2: rule__XForLoopExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group__0_in_ruleXForLoopExpression3649);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group__0();
 
             state._fsp--;
@@ -5234,16 +5234,16 @@ public final void ruleXForLoopExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXBasicForLoopExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1751:1: entryRuleXBasicForLoopExpression : ruleXBasicForLoopExpression EOF ;
+    // InternalCheck.g:1751:1: entryRuleXBasicForLoopExpression : ruleXBasicForLoopExpression EOF ;
     public final void entryRuleXBasicForLoopExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1752:1: ( ruleXBasicForLoopExpression EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1753:1: ruleXBasicForLoopExpression EOF
+            // InternalCheck.g:1752:1: ( ruleXBasicForLoopExpression EOF )
+            // InternalCheck.g:1753:1: ruleXBasicForLoopExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXBasicForLoopExpression_in_entryRuleXBasicForLoopExpression3676);
+            pushFollow(FOLLOW_1);
             ruleXBasicForLoopExpression();
 
             state._fsp--;
@@ -5251,7 +5251,7 @@ public final void entryRuleXBasicForLoopExpression() throws RecognitionException
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBasicForLoopExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXBasicForLoopExpression3683); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -5268,25 +5268,25 @@ public final void entryRuleXBasicForLoopExpression() throws RecognitionException
 
 
     // $ANTLR start "ruleXBasicForLoopExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1760:1: ruleXBasicForLoopExpression : ( ( rule__XBasicForLoopExpression__Group__0 ) ) ;
+    // InternalCheck.g:1760:1: ruleXBasicForLoopExpression : ( ( rule__XBasicForLoopExpression__Group__0 ) ) ;
     public final void ruleXBasicForLoopExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1764:2: ( ( ( rule__XBasicForLoopExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1765:1: ( ( rule__XBasicForLoopExpression__Group__0 ) )
+            // InternalCheck.g:1764:2: ( ( ( rule__XBasicForLoopExpression__Group__0 ) ) )
+            // InternalCheck.g:1765:1: ( ( rule__XBasicForLoopExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1765:1: ( ( rule__XBasicForLoopExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1766:1: ( rule__XBasicForLoopExpression__Group__0 )
+            // InternalCheck.g:1765:1: ( ( rule__XBasicForLoopExpression__Group__0 ) )
+            // InternalCheck.g:1766:1: ( rule__XBasicForLoopExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1767:1: ( rule__XBasicForLoopExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1767:2: rule__XBasicForLoopExpression__Group__0
+            // InternalCheck.g:1767:1: ( rule__XBasicForLoopExpression__Group__0 )
+            // InternalCheck.g:1767:2: rule__XBasicForLoopExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__0_in_ruleXBasicForLoopExpression3709);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group__0();
 
             state._fsp--;
@@ -5319,16 +5319,16 @@ public final void ruleXBasicForLoopExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXWhileExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1779:1: entryRuleXWhileExpression : ruleXWhileExpression EOF ;
+    // InternalCheck.g:1779:1: entryRuleXWhileExpression : ruleXWhileExpression EOF ;
     public final void entryRuleXWhileExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1780:1: ( ruleXWhileExpression EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1781:1: ruleXWhileExpression EOF
+            // InternalCheck.g:1780:1: ( ruleXWhileExpression EOF )
+            // InternalCheck.g:1781:1: ruleXWhileExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXWhileExpression_in_entryRuleXWhileExpression3736);
+            pushFollow(FOLLOW_1);
             ruleXWhileExpression();
 
             state._fsp--;
@@ -5336,7 +5336,7 @@ public final void entryRuleXWhileExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXWhileExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXWhileExpression3743); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -5353,25 +5353,25 @@ public final void entryRuleXWhileExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXWhileExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1788:1: ruleXWhileExpression : ( ( rule__XWhileExpression__Group__0 ) ) ;
+    // InternalCheck.g:1788:1: ruleXWhileExpression : ( ( rule__XWhileExpression__Group__0 ) ) ;
     public final void ruleXWhileExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1792:2: ( ( ( rule__XWhileExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1793:1: ( ( rule__XWhileExpression__Group__0 ) )
+            // InternalCheck.g:1792:2: ( ( ( rule__XWhileExpression__Group__0 ) ) )
+            // InternalCheck.g:1793:1: ( ( rule__XWhileExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1793:1: ( ( rule__XWhileExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1794:1: ( rule__XWhileExpression__Group__0 )
+            // InternalCheck.g:1793:1: ( ( rule__XWhileExpression__Group__0 ) )
+            // InternalCheck.g:1794:1: ( rule__XWhileExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1795:1: ( rule__XWhileExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1795:2: rule__XWhileExpression__Group__0
+            // InternalCheck.g:1795:1: ( rule__XWhileExpression__Group__0 )
+            // InternalCheck.g:1795:2: rule__XWhileExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__0_in_ruleXWhileExpression3769);
+            pushFollow(FOLLOW_2);
             rule__XWhileExpression__Group__0();
 
             state._fsp--;
@@ -5404,16 +5404,16 @@ public final void ruleXWhileExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXDoWhileExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1807:1: entryRuleXDoWhileExpression : ruleXDoWhileExpression EOF ;
+    // InternalCheck.g:1807:1: entryRuleXDoWhileExpression : ruleXDoWhileExpression EOF ;
     public final void entryRuleXDoWhileExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1808:1: ( ruleXDoWhileExpression EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1809:1: ruleXDoWhileExpression EOF
+            // InternalCheck.g:1808:1: ( ruleXDoWhileExpression EOF )
+            // InternalCheck.g:1809:1: ruleXDoWhileExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXDoWhileExpression_in_entryRuleXDoWhileExpression3796);
+            pushFollow(FOLLOW_1);
             ruleXDoWhileExpression();
 
             state._fsp--;
@@ -5421,7 +5421,7 @@ public final void entryRuleXDoWhileExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXDoWhileExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXDoWhileExpression3803); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -5438,25 +5438,25 @@ public final void entryRuleXDoWhileExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXDoWhileExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1816:1: ruleXDoWhileExpression : ( ( rule__XDoWhileExpression__Group__0 ) ) ;
+    // InternalCheck.g:1816:1: ruleXDoWhileExpression : ( ( rule__XDoWhileExpression__Group__0 ) ) ;
     public final void ruleXDoWhileExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1820:2: ( ( ( rule__XDoWhileExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1821:1: ( ( rule__XDoWhileExpression__Group__0 ) )
+            // InternalCheck.g:1820:2: ( ( ( rule__XDoWhileExpression__Group__0 ) ) )
+            // InternalCheck.g:1821:1: ( ( rule__XDoWhileExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1821:1: ( ( rule__XDoWhileExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1822:1: ( rule__XDoWhileExpression__Group__0 )
+            // InternalCheck.g:1821:1: ( ( rule__XDoWhileExpression__Group__0 ) )
+            // InternalCheck.g:1822:1: ( rule__XDoWhileExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1823:1: ( rule__XDoWhileExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1823:2: rule__XDoWhileExpression__Group__0
+            // InternalCheck.g:1823:1: ( rule__XDoWhileExpression__Group__0 )
+            // InternalCheck.g:1823:2: rule__XDoWhileExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__0_in_ruleXDoWhileExpression3829);
+            pushFollow(FOLLOW_2);
             rule__XDoWhileExpression__Group__0();
 
             state._fsp--;
@@ -5489,16 +5489,16 @@ public final void ruleXDoWhileExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXBlockExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1835:1: entryRuleXBlockExpression : ruleXBlockExpression EOF ;
+    // InternalCheck.g:1835:1: entryRuleXBlockExpression : ruleXBlockExpression EOF ;
     public final void entryRuleXBlockExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1836:1: ( ruleXBlockExpression EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1837:1: ruleXBlockExpression EOF
+            // InternalCheck.g:1836:1: ( ruleXBlockExpression EOF )
+            // InternalCheck.g:1837:1: ruleXBlockExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXBlockExpression_in_entryRuleXBlockExpression3856);
+            pushFollow(FOLLOW_1);
             ruleXBlockExpression();
 
             state._fsp--;
@@ -5506,7 +5506,7 @@ public final void entryRuleXBlockExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBlockExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXBlockExpression3863); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -5523,25 +5523,25 @@ public final void entryRuleXBlockExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXBlockExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1844:1: ruleXBlockExpression : ( ( rule__XBlockExpression__Group__0 ) ) ;
+    // InternalCheck.g:1844:1: ruleXBlockExpression : ( ( rule__XBlockExpression__Group__0 ) ) ;
     public final void ruleXBlockExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1848:2: ( ( ( rule__XBlockExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1849:1: ( ( rule__XBlockExpression__Group__0 ) )
+            // InternalCheck.g:1848:2: ( ( ( rule__XBlockExpression__Group__0 ) ) )
+            // InternalCheck.g:1849:1: ( ( rule__XBlockExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1849:1: ( ( rule__XBlockExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1850:1: ( rule__XBlockExpression__Group__0 )
+            // InternalCheck.g:1849:1: ( ( rule__XBlockExpression__Group__0 ) )
+            // InternalCheck.g:1850:1: ( rule__XBlockExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1851:1: ( rule__XBlockExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1851:2: rule__XBlockExpression__Group__0
+            // InternalCheck.g:1851:1: ( rule__XBlockExpression__Group__0 )
+            // InternalCheck.g:1851:2: rule__XBlockExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XBlockExpression__Group__0_in_ruleXBlockExpression3889);
+            pushFollow(FOLLOW_2);
             rule__XBlockExpression__Group__0();
 
             state._fsp--;
@@ -5574,16 +5574,16 @@ public final void ruleXBlockExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXExpressionOrVarDeclaration"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1863:1: entryRuleXExpressionOrVarDeclaration : ruleXExpressionOrVarDeclaration EOF ;
+    // InternalCheck.g:1863:1: entryRuleXExpressionOrVarDeclaration : ruleXExpressionOrVarDeclaration EOF ;
     public final void entryRuleXExpressionOrVarDeclaration() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1864:1: ( ruleXExpressionOrVarDeclaration EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1865:1: ruleXExpressionOrVarDeclaration EOF
+            // InternalCheck.g:1864:1: ( ruleXExpressionOrVarDeclaration EOF )
+            // InternalCheck.g:1865:1: ruleXExpressionOrVarDeclaration EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionOrVarDeclarationRule()); 
             }
-            pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_entryRuleXExpressionOrVarDeclaration3916);
+            pushFollow(FOLLOW_1);
             ruleXExpressionOrVarDeclaration();
 
             state._fsp--;
@@ -5591,7 +5591,7 @@ public final void entryRuleXExpressionOrVarDeclaration() throws RecognitionExcep
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXExpressionOrVarDeclarationRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXExpressionOrVarDeclaration3923); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -5608,25 +5608,25 @@ public final void entryRuleXExpressionOrVarDeclaration() throws RecognitionExcep
 
 
     // $ANTLR start "ruleXExpressionOrVarDeclaration"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1872:1: ruleXExpressionOrVarDeclaration : ( ( rule__XExpressionOrVarDeclaration__Alternatives ) ) ;
+    // InternalCheck.g:1872:1: ruleXExpressionOrVarDeclaration : ( ( rule__XExpressionOrVarDeclaration__Alternatives ) ) ;
     public final void ruleXExpressionOrVarDeclaration() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1876:2: ( ( ( rule__XExpressionOrVarDeclaration__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1877:1: ( ( rule__XExpressionOrVarDeclaration__Alternatives ) )
+            // InternalCheck.g:1876:2: ( ( ( rule__XExpressionOrVarDeclaration__Alternatives ) ) )
+            // InternalCheck.g:1877:1: ( ( rule__XExpressionOrVarDeclaration__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1877:1: ( ( rule__XExpressionOrVarDeclaration__Alternatives ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1878:1: ( rule__XExpressionOrVarDeclaration__Alternatives )
+            // InternalCheck.g:1877:1: ( ( rule__XExpressionOrVarDeclaration__Alternatives ) )
+            // InternalCheck.g:1878:1: ( rule__XExpressionOrVarDeclaration__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionOrVarDeclarationAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1879:1: ( rule__XExpressionOrVarDeclaration__Alternatives )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1879:2: rule__XExpressionOrVarDeclaration__Alternatives
+            // InternalCheck.g:1879:1: ( rule__XExpressionOrVarDeclaration__Alternatives )
+            // InternalCheck.g:1879:2: rule__XExpressionOrVarDeclaration__Alternatives
             {
-            pushFollow(FOLLOW_rule__XExpressionOrVarDeclaration__Alternatives_in_ruleXExpressionOrVarDeclaration3949);
+            pushFollow(FOLLOW_2);
             rule__XExpressionOrVarDeclaration__Alternatives();
 
             state._fsp--;
@@ -5659,16 +5659,16 @@ public final void ruleXExpressionOrVarDeclaration() throws RecognitionException
 
 
     // $ANTLR start "entryRuleXVariableDeclaration"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1891:1: entryRuleXVariableDeclaration : ruleXVariableDeclaration EOF ;
+    // InternalCheck.g:1891:1: entryRuleXVariableDeclaration : ruleXVariableDeclaration EOF ;
     public final void entryRuleXVariableDeclaration() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1892:1: ( ruleXVariableDeclaration EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1893:1: ruleXVariableDeclaration EOF
+            // InternalCheck.g:1892:1: ( ruleXVariableDeclaration EOF )
+            // InternalCheck.g:1893:1: ruleXVariableDeclaration EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationRule()); 
             }
-            pushFollow(FOLLOW_ruleXVariableDeclaration_in_entryRuleXVariableDeclaration3976);
+            pushFollow(FOLLOW_1);
             ruleXVariableDeclaration();
 
             state._fsp--;
@@ -5676,7 +5676,7 @@ public final void entryRuleXVariableDeclaration() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXVariableDeclarationRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXVariableDeclaration3983); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -5693,25 +5693,25 @@ public final void entryRuleXVariableDeclaration() throws RecognitionException {
 
 
     // $ANTLR start "ruleXVariableDeclaration"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1900:1: ruleXVariableDeclaration : ( ( rule__XVariableDeclaration__Group__0 ) ) ;
+    // InternalCheck.g:1900:1: ruleXVariableDeclaration : ( ( rule__XVariableDeclaration__Group__0 ) ) ;
     public final void ruleXVariableDeclaration() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1904:2: ( ( ( rule__XVariableDeclaration__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1905:1: ( ( rule__XVariableDeclaration__Group__0 ) )
+            // InternalCheck.g:1904:2: ( ( ( rule__XVariableDeclaration__Group__0 ) ) )
+            // InternalCheck.g:1905:1: ( ( rule__XVariableDeclaration__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1905:1: ( ( rule__XVariableDeclaration__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1906:1: ( rule__XVariableDeclaration__Group__0 )
+            // InternalCheck.g:1905:1: ( ( rule__XVariableDeclaration__Group__0 ) )
+            // InternalCheck.g:1906:1: ( rule__XVariableDeclaration__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1907:1: ( rule__XVariableDeclaration__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1907:2: rule__XVariableDeclaration__Group__0
+            // InternalCheck.g:1907:1: ( rule__XVariableDeclaration__Group__0 )
+            // InternalCheck.g:1907:2: rule__XVariableDeclaration__Group__0
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group__0_in_ruleXVariableDeclaration4009);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group__0();
 
             state._fsp--;
@@ -5744,16 +5744,16 @@ public final void ruleXVariableDeclaration() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleJvmFormalParameter"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1919:1: entryRuleJvmFormalParameter : ruleJvmFormalParameter EOF ;
+    // InternalCheck.g:1919:1: entryRuleJvmFormalParameter : ruleJvmFormalParameter EOF ;
     public final void entryRuleJvmFormalParameter() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1920:1: ( ruleJvmFormalParameter EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1921:1: ruleJvmFormalParameter EOF
+            // InternalCheck.g:1920:1: ( ruleJvmFormalParameter EOF )
+            // InternalCheck.g:1921:1: ruleJvmFormalParameter EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmFormalParameterRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmFormalParameter_in_entryRuleJvmFormalParameter4036);
+            pushFollow(FOLLOW_1);
             ruleJvmFormalParameter();
 
             state._fsp--;
@@ -5761,7 +5761,7 @@ public final void entryRuleJvmFormalParameter() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmFormalParameterRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmFormalParameter4043); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -5778,25 +5778,25 @@ public final void entryRuleJvmFormalParameter() throws RecognitionException {
 
 
     // $ANTLR start "ruleJvmFormalParameter"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1928:1: ruleJvmFormalParameter : ( ( rule__JvmFormalParameter__Group__0 ) ) ;
+    // InternalCheck.g:1928:1: ruleJvmFormalParameter : ( ( rule__JvmFormalParameter__Group__0 ) ) ;
     public final void ruleJvmFormalParameter() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1932:2: ( ( ( rule__JvmFormalParameter__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1933:1: ( ( rule__JvmFormalParameter__Group__0 ) )
+            // InternalCheck.g:1932:2: ( ( ( rule__JvmFormalParameter__Group__0 ) ) )
+            // InternalCheck.g:1933:1: ( ( rule__JvmFormalParameter__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1933:1: ( ( rule__JvmFormalParameter__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1934:1: ( rule__JvmFormalParameter__Group__0 )
+            // InternalCheck.g:1933:1: ( ( rule__JvmFormalParameter__Group__0 ) )
+            // InternalCheck.g:1934:1: ( rule__JvmFormalParameter__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmFormalParameterAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1935:1: ( rule__JvmFormalParameter__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1935:2: rule__JvmFormalParameter__Group__0
+            // InternalCheck.g:1935:1: ( rule__JvmFormalParameter__Group__0 )
+            // InternalCheck.g:1935:2: rule__JvmFormalParameter__Group__0
             {
-            pushFollow(FOLLOW_rule__JvmFormalParameter__Group__0_in_ruleJvmFormalParameter4069);
+            pushFollow(FOLLOW_2);
             rule__JvmFormalParameter__Group__0();
 
             state._fsp--;
@@ -5829,16 +5829,16 @@ public final void ruleJvmFormalParameter() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleFullJvmFormalParameter"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1947:1: entryRuleFullJvmFormalParameter : ruleFullJvmFormalParameter EOF ;
+    // InternalCheck.g:1947:1: entryRuleFullJvmFormalParameter : ruleFullJvmFormalParameter EOF ;
     public final void entryRuleFullJvmFormalParameter() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1948:1: ( ruleFullJvmFormalParameter EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1949:1: ruleFullJvmFormalParameter EOF
+            // InternalCheck.g:1948:1: ( ruleFullJvmFormalParameter EOF )
+            // InternalCheck.g:1949:1: ruleFullJvmFormalParameter EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFullJvmFormalParameterRule()); 
             }
-            pushFollow(FOLLOW_ruleFullJvmFormalParameter_in_entryRuleFullJvmFormalParameter4096);
+            pushFollow(FOLLOW_1);
             ruleFullJvmFormalParameter();
 
             state._fsp--;
@@ -5846,7 +5846,7 @@ public final void entryRuleFullJvmFormalParameter() throws RecognitionException
             if ( state.backtracking==0 ) {
                after(grammarAccess.getFullJvmFormalParameterRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFullJvmFormalParameter4103); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -5863,25 +5863,25 @@ public final void entryRuleFullJvmFormalParameter() throws RecognitionException
 
 
     // $ANTLR start "ruleFullJvmFormalParameter"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1956:1: ruleFullJvmFormalParameter : ( ( rule__FullJvmFormalParameter__Group__0 ) ) ;
+    // InternalCheck.g:1956:1: ruleFullJvmFormalParameter : ( ( rule__FullJvmFormalParameter__Group__0 ) ) ;
     public final void ruleFullJvmFormalParameter() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1960:2: ( ( ( rule__FullJvmFormalParameter__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1961:1: ( ( rule__FullJvmFormalParameter__Group__0 ) )
+            // InternalCheck.g:1960:2: ( ( ( rule__FullJvmFormalParameter__Group__0 ) ) )
+            // InternalCheck.g:1961:1: ( ( rule__FullJvmFormalParameter__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1961:1: ( ( rule__FullJvmFormalParameter__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1962:1: ( rule__FullJvmFormalParameter__Group__0 )
+            // InternalCheck.g:1961:1: ( ( rule__FullJvmFormalParameter__Group__0 ) )
+            // InternalCheck.g:1962:1: ( rule__FullJvmFormalParameter__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFullJvmFormalParameterAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1963:1: ( rule__FullJvmFormalParameter__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1963:2: rule__FullJvmFormalParameter__Group__0
+            // InternalCheck.g:1963:1: ( rule__FullJvmFormalParameter__Group__0 )
+            // InternalCheck.g:1963:2: rule__FullJvmFormalParameter__Group__0
             {
-            pushFollow(FOLLOW_rule__FullJvmFormalParameter__Group__0_in_ruleFullJvmFormalParameter4129);
+            pushFollow(FOLLOW_2);
             rule__FullJvmFormalParameter__Group__0();
 
             state._fsp--;
@@ -5914,16 +5914,16 @@ public final void ruleFullJvmFormalParameter() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXFeatureCall"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1975:1: entryRuleXFeatureCall : ruleXFeatureCall EOF ;
+    // InternalCheck.g:1975:1: entryRuleXFeatureCall : ruleXFeatureCall EOF ;
     public final void entryRuleXFeatureCall() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1976:1: ( ruleXFeatureCall EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1977:1: ruleXFeatureCall EOF
+            // InternalCheck.g:1976:1: ( ruleXFeatureCall EOF )
+            // InternalCheck.g:1977:1: ruleXFeatureCall EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallRule()); 
             }
-            pushFollow(FOLLOW_ruleXFeatureCall_in_entryRuleXFeatureCall4156);
+            pushFollow(FOLLOW_1);
             ruleXFeatureCall();
 
             state._fsp--;
@@ -5931,7 +5931,7 @@ public final void entryRuleXFeatureCall() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFeatureCallRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXFeatureCall4163); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -5948,25 +5948,25 @@ public final void entryRuleXFeatureCall() throws RecognitionException {
 
 
     // $ANTLR start "ruleXFeatureCall"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1984:1: ruleXFeatureCall : ( ( rule__XFeatureCall__Group__0 ) ) ;
+    // InternalCheck.g:1984:1: ruleXFeatureCall : ( ( rule__XFeatureCall__Group__0 ) ) ;
     public final void ruleXFeatureCall() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1988:2: ( ( ( rule__XFeatureCall__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1989:1: ( ( rule__XFeatureCall__Group__0 ) )
+            // InternalCheck.g:1988:2: ( ( ( rule__XFeatureCall__Group__0 ) ) )
+            // InternalCheck.g:1989:1: ( ( rule__XFeatureCall__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1989:1: ( ( rule__XFeatureCall__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1990:1: ( rule__XFeatureCall__Group__0 )
+            // InternalCheck.g:1989:1: ( ( rule__XFeatureCall__Group__0 ) )
+            // InternalCheck.g:1990:1: ( rule__XFeatureCall__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1991:1: ( rule__XFeatureCall__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:1991:2: rule__XFeatureCall__Group__0
+            // InternalCheck.g:1991:1: ( rule__XFeatureCall__Group__0 )
+            // InternalCheck.g:1991:2: rule__XFeatureCall__Group__0
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group__0_in_ruleXFeatureCall4189);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group__0();
 
             state._fsp--;
@@ -5999,16 +5999,16 @@ public final void ruleXFeatureCall() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleIdOrSuper"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2003:1: entryRuleIdOrSuper : ruleIdOrSuper EOF ;
+    // InternalCheck.g:2003:1: entryRuleIdOrSuper : ruleIdOrSuper EOF ;
     public final void entryRuleIdOrSuper() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2004:1: ( ruleIdOrSuper EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2005:1: ruleIdOrSuper EOF
+            // InternalCheck.g:2004:1: ( ruleIdOrSuper EOF )
+            // InternalCheck.g:2005:1: ruleIdOrSuper EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIdOrSuperRule()); 
             }
-            pushFollow(FOLLOW_ruleIdOrSuper_in_entryRuleIdOrSuper4216);
+            pushFollow(FOLLOW_1);
             ruleIdOrSuper();
 
             state._fsp--;
@@ -6016,7 +6016,7 @@ public final void entryRuleIdOrSuper() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIdOrSuperRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIdOrSuper4223); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -6033,25 +6033,25 @@ public final void entryRuleIdOrSuper() throws RecognitionException {
 
 
     // $ANTLR start "ruleIdOrSuper"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2012:1: ruleIdOrSuper : ( ( rule__IdOrSuper__Alternatives ) ) ;
+    // InternalCheck.g:2012:1: ruleIdOrSuper : ( ( rule__IdOrSuper__Alternatives ) ) ;
     public final void ruleIdOrSuper() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2016:2: ( ( ( rule__IdOrSuper__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2017:1: ( ( rule__IdOrSuper__Alternatives ) )
+            // InternalCheck.g:2016:2: ( ( ( rule__IdOrSuper__Alternatives ) ) )
+            // InternalCheck.g:2017:1: ( ( rule__IdOrSuper__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2017:1: ( ( rule__IdOrSuper__Alternatives ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2018:1: ( rule__IdOrSuper__Alternatives )
+            // InternalCheck.g:2017:1: ( ( rule__IdOrSuper__Alternatives ) )
+            // InternalCheck.g:2018:1: ( rule__IdOrSuper__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIdOrSuperAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2019:1: ( rule__IdOrSuper__Alternatives )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2019:2: rule__IdOrSuper__Alternatives
+            // InternalCheck.g:2019:1: ( rule__IdOrSuper__Alternatives )
+            // InternalCheck.g:2019:2: rule__IdOrSuper__Alternatives
             {
-            pushFollow(FOLLOW_rule__IdOrSuper__Alternatives_in_ruleIdOrSuper4249);
+            pushFollow(FOLLOW_2);
             rule__IdOrSuper__Alternatives();
 
             state._fsp--;
@@ -6084,16 +6084,16 @@ public final void ruleIdOrSuper() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXConstructorCall"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2031:1: entryRuleXConstructorCall : ruleXConstructorCall EOF ;
+    // InternalCheck.g:2031:1: entryRuleXConstructorCall : ruleXConstructorCall EOF ;
     public final void entryRuleXConstructorCall() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2032:1: ( ruleXConstructorCall EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2033:1: ruleXConstructorCall EOF
+            // InternalCheck.g:2032:1: ( ruleXConstructorCall EOF )
+            // InternalCheck.g:2033:1: ruleXConstructorCall EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallRule()); 
             }
-            pushFollow(FOLLOW_ruleXConstructorCall_in_entryRuleXConstructorCall4276);
+            pushFollow(FOLLOW_1);
             ruleXConstructorCall();
 
             state._fsp--;
@@ -6101,7 +6101,7 @@ public final void entryRuleXConstructorCall() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstructorCallRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXConstructorCall4283); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -6118,25 +6118,25 @@ public final void entryRuleXConstructorCall() throws RecognitionException {
 
 
     // $ANTLR start "ruleXConstructorCall"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2040:1: ruleXConstructorCall : ( ( rule__XConstructorCall__Group__0 ) ) ;
+    // InternalCheck.g:2040:1: ruleXConstructorCall : ( ( rule__XConstructorCall__Group__0 ) ) ;
     public final void ruleXConstructorCall() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2044:2: ( ( ( rule__XConstructorCall__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2045:1: ( ( rule__XConstructorCall__Group__0 ) )
+            // InternalCheck.g:2044:2: ( ( ( rule__XConstructorCall__Group__0 ) ) )
+            // InternalCheck.g:2045:1: ( ( rule__XConstructorCall__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2045:1: ( ( rule__XConstructorCall__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2046:1: ( rule__XConstructorCall__Group__0 )
+            // InternalCheck.g:2045:1: ( ( rule__XConstructorCall__Group__0 ) )
+            // InternalCheck.g:2046:1: ( rule__XConstructorCall__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2047:1: ( rule__XConstructorCall__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2047:2: rule__XConstructorCall__Group__0
+            // InternalCheck.g:2047:1: ( rule__XConstructorCall__Group__0 )
+            // InternalCheck.g:2047:2: rule__XConstructorCall__Group__0
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__0_in_ruleXConstructorCall4309);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group__0();
 
             state._fsp--;
@@ -6169,16 +6169,16 @@ public final void ruleXConstructorCall() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXBooleanLiteral"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2059:1: entryRuleXBooleanLiteral : ruleXBooleanLiteral EOF ;
+    // InternalCheck.g:2059:1: entryRuleXBooleanLiteral : ruleXBooleanLiteral EOF ;
     public final void entryRuleXBooleanLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2060:1: ( ruleXBooleanLiteral EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2061:1: ruleXBooleanLiteral EOF
+            // InternalCheck.g:2060:1: ( ruleXBooleanLiteral EOF )
+            // InternalCheck.g:2061:1: ruleXBooleanLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBooleanLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXBooleanLiteral_in_entryRuleXBooleanLiteral4336);
+            pushFollow(FOLLOW_1);
             ruleXBooleanLiteral();
 
             state._fsp--;
@@ -6186,7 +6186,7 @@ public final void entryRuleXBooleanLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBooleanLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXBooleanLiteral4343); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -6203,25 +6203,25 @@ public final void entryRuleXBooleanLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXBooleanLiteral"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2068:1: ruleXBooleanLiteral : ( ( rule__XBooleanLiteral__Group__0 ) ) ;
+    // InternalCheck.g:2068:1: ruleXBooleanLiteral : ( ( rule__XBooleanLiteral__Group__0 ) ) ;
     public final void ruleXBooleanLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2072:2: ( ( ( rule__XBooleanLiteral__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2073:1: ( ( rule__XBooleanLiteral__Group__0 ) )
+            // InternalCheck.g:2072:2: ( ( ( rule__XBooleanLiteral__Group__0 ) ) )
+            // InternalCheck.g:2073:1: ( ( rule__XBooleanLiteral__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2073:1: ( ( rule__XBooleanLiteral__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2074:1: ( rule__XBooleanLiteral__Group__0 )
+            // InternalCheck.g:2073:1: ( ( rule__XBooleanLiteral__Group__0 ) )
+            // InternalCheck.g:2074:1: ( rule__XBooleanLiteral__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBooleanLiteralAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2075:1: ( rule__XBooleanLiteral__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2075:2: rule__XBooleanLiteral__Group__0
+            // InternalCheck.g:2075:1: ( rule__XBooleanLiteral__Group__0 )
+            // InternalCheck.g:2075:2: rule__XBooleanLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__XBooleanLiteral__Group__0_in_ruleXBooleanLiteral4369);
+            pushFollow(FOLLOW_2);
             rule__XBooleanLiteral__Group__0();
 
             state._fsp--;
@@ -6254,16 +6254,16 @@ public final void ruleXBooleanLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXNullLiteral"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2087:1: entryRuleXNullLiteral : ruleXNullLiteral EOF ;
+    // InternalCheck.g:2087:1: entryRuleXNullLiteral : ruleXNullLiteral EOF ;
     public final void entryRuleXNullLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2088:1: ( ruleXNullLiteral EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2089:1: ruleXNullLiteral EOF
+            // InternalCheck.g:2088:1: ( ruleXNullLiteral EOF )
+            // InternalCheck.g:2089:1: ruleXNullLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNullLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXNullLiteral_in_entryRuleXNullLiteral4396);
+            pushFollow(FOLLOW_1);
             ruleXNullLiteral();
 
             state._fsp--;
@@ -6271,7 +6271,7 @@ public final void entryRuleXNullLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXNullLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXNullLiteral4403); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -6288,25 +6288,25 @@ public final void entryRuleXNullLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXNullLiteral"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2096:1: ruleXNullLiteral : ( ( rule__XNullLiteral__Group__0 ) ) ;
+    // InternalCheck.g:2096:1: ruleXNullLiteral : ( ( rule__XNullLiteral__Group__0 ) ) ;
     public final void ruleXNullLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2100:2: ( ( ( rule__XNullLiteral__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2101:1: ( ( rule__XNullLiteral__Group__0 ) )
+            // InternalCheck.g:2100:2: ( ( ( rule__XNullLiteral__Group__0 ) ) )
+            // InternalCheck.g:2101:1: ( ( rule__XNullLiteral__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2101:1: ( ( rule__XNullLiteral__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2102:1: ( rule__XNullLiteral__Group__0 )
+            // InternalCheck.g:2101:1: ( ( rule__XNullLiteral__Group__0 ) )
+            // InternalCheck.g:2102:1: ( rule__XNullLiteral__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNullLiteralAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2103:1: ( rule__XNullLiteral__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2103:2: rule__XNullLiteral__Group__0
+            // InternalCheck.g:2103:1: ( rule__XNullLiteral__Group__0 )
+            // InternalCheck.g:2103:2: rule__XNullLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__XNullLiteral__Group__0_in_ruleXNullLiteral4429);
+            pushFollow(FOLLOW_2);
             rule__XNullLiteral__Group__0();
 
             state._fsp--;
@@ -6339,16 +6339,16 @@ public final void ruleXNullLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXNumberLiteral"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2115:1: entryRuleXNumberLiteral : ruleXNumberLiteral EOF ;
+    // InternalCheck.g:2115:1: entryRuleXNumberLiteral : ruleXNumberLiteral EOF ;
     public final void entryRuleXNumberLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2116:1: ( ruleXNumberLiteral EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2117:1: ruleXNumberLiteral EOF
+            // InternalCheck.g:2116:1: ( ruleXNumberLiteral EOF )
+            // InternalCheck.g:2117:1: ruleXNumberLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNumberLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXNumberLiteral_in_entryRuleXNumberLiteral4456);
+            pushFollow(FOLLOW_1);
             ruleXNumberLiteral();
 
             state._fsp--;
@@ -6356,7 +6356,7 @@ public final void entryRuleXNumberLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXNumberLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXNumberLiteral4463); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -6373,25 +6373,25 @@ public final void entryRuleXNumberLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXNumberLiteral"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2124:1: ruleXNumberLiteral : ( ( rule__XNumberLiteral__Group__0 ) ) ;
+    // InternalCheck.g:2124:1: ruleXNumberLiteral : ( ( rule__XNumberLiteral__Group__0 ) ) ;
     public final void ruleXNumberLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2128:2: ( ( ( rule__XNumberLiteral__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2129:1: ( ( rule__XNumberLiteral__Group__0 ) )
+            // InternalCheck.g:2128:2: ( ( ( rule__XNumberLiteral__Group__0 ) ) )
+            // InternalCheck.g:2129:1: ( ( rule__XNumberLiteral__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2129:1: ( ( rule__XNumberLiteral__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2130:1: ( rule__XNumberLiteral__Group__0 )
+            // InternalCheck.g:2129:1: ( ( rule__XNumberLiteral__Group__0 ) )
+            // InternalCheck.g:2130:1: ( rule__XNumberLiteral__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNumberLiteralAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2131:1: ( rule__XNumberLiteral__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2131:2: rule__XNumberLiteral__Group__0
+            // InternalCheck.g:2131:1: ( rule__XNumberLiteral__Group__0 )
+            // InternalCheck.g:2131:2: rule__XNumberLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__XNumberLiteral__Group__0_in_ruleXNumberLiteral4489);
+            pushFollow(FOLLOW_2);
             rule__XNumberLiteral__Group__0();
 
             state._fsp--;
@@ -6424,16 +6424,16 @@ public final void ruleXNumberLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXStringLiteral"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2143:1: entryRuleXStringLiteral : ruleXStringLiteral EOF ;
+    // InternalCheck.g:2143:1: entryRuleXStringLiteral : ruleXStringLiteral EOF ;
     public final void entryRuleXStringLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2144:1: ( ruleXStringLiteral EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2145:1: ruleXStringLiteral EOF
+            // InternalCheck.g:2144:1: ( ruleXStringLiteral EOF )
+            // InternalCheck.g:2145:1: ruleXStringLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXStringLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXStringLiteral_in_entryRuleXStringLiteral4516);
+            pushFollow(FOLLOW_1);
             ruleXStringLiteral();
 
             state._fsp--;
@@ -6441,7 +6441,7 @@ public final void entryRuleXStringLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXStringLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXStringLiteral4523); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -6458,25 +6458,25 @@ public final void entryRuleXStringLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXStringLiteral"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2152:1: ruleXStringLiteral : ( ( rule__XStringLiteral__Group__0 ) ) ;
+    // InternalCheck.g:2152:1: ruleXStringLiteral : ( ( rule__XStringLiteral__Group__0 ) ) ;
     public final void ruleXStringLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2156:2: ( ( ( rule__XStringLiteral__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2157:1: ( ( rule__XStringLiteral__Group__0 ) )
+            // InternalCheck.g:2156:2: ( ( ( rule__XStringLiteral__Group__0 ) ) )
+            // InternalCheck.g:2157:1: ( ( rule__XStringLiteral__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2157:1: ( ( rule__XStringLiteral__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2158:1: ( rule__XStringLiteral__Group__0 )
+            // InternalCheck.g:2157:1: ( ( rule__XStringLiteral__Group__0 ) )
+            // InternalCheck.g:2158:1: ( rule__XStringLiteral__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXStringLiteralAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2159:1: ( rule__XStringLiteral__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2159:2: rule__XStringLiteral__Group__0
+            // InternalCheck.g:2159:1: ( rule__XStringLiteral__Group__0 )
+            // InternalCheck.g:2159:2: rule__XStringLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__XStringLiteral__Group__0_in_ruleXStringLiteral4549);
+            pushFollow(FOLLOW_2);
             rule__XStringLiteral__Group__0();
 
             state._fsp--;
@@ -6509,16 +6509,16 @@ public final void ruleXStringLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXTypeLiteral"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2171:1: entryRuleXTypeLiteral : ruleXTypeLiteral EOF ;
+    // InternalCheck.g:2171:1: entryRuleXTypeLiteral : ruleXTypeLiteral EOF ;
     public final void entryRuleXTypeLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2172:1: ( ruleXTypeLiteral EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2173:1: ruleXTypeLiteral EOF
+            // InternalCheck.g:2172:1: ( ruleXTypeLiteral EOF )
+            // InternalCheck.g:2173:1: ruleXTypeLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXTypeLiteral_in_entryRuleXTypeLiteral4576);
+            pushFollow(FOLLOW_1);
             ruleXTypeLiteral();
 
             state._fsp--;
@@ -6526,7 +6526,7 @@ public final void entryRuleXTypeLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXTypeLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXTypeLiteral4583); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -6543,25 +6543,25 @@ public final void entryRuleXTypeLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXTypeLiteral"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2180:1: ruleXTypeLiteral : ( ( rule__XTypeLiteral__Group__0 ) ) ;
+    // InternalCheck.g:2180:1: ruleXTypeLiteral : ( ( rule__XTypeLiteral__Group__0 ) ) ;
     public final void ruleXTypeLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2184:2: ( ( ( rule__XTypeLiteral__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2185:1: ( ( rule__XTypeLiteral__Group__0 ) )
+            // InternalCheck.g:2184:2: ( ( ( rule__XTypeLiteral__Group__0 ) ) )
+            // InternalCheck.g:2185:1: ( ( rule__XTypeLiteral__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2185:1: ( ( rule__XTypeLiteral__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2186:1: ( rule__XTypeLiteral__Group__0 )
+            // InternalCheck.g:2185:1: ( ( rule__XTypeLiteral__Group__0 ) )
+            // InternalCheck.g:2186:1: ( rule__XTypeLiteral__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2187:1: ( rule__XTypeLiteral__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2187:2: rule__XTypeLiteral__Group__0
+            // InternalCheck.g:2187:1: ( rule__XTypeLiteral__Group__0 )
+            // InternalCheck.g:2187:2: rule__XTypeLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__0_in_ruleXTypeLiteral4609);
+            pushFollow(FOLLOW_2);
             rule__XTypeLiteral__Group__0();
 
             state._fsp--;
@@ -6594,16 +6594,16 @@ public final void ruleXTypeLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXThrowExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2199:1: entryRuleXThrowExpression : ruleXThrowExpression EOF ;
+    // InternalCheck.g:2199:1: entryRuleXThrowExpression : ruleXThrowExpression EOF ;
     public final void entryRuleXThrowExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2200:1: ( ruleXThrowExpression EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2201:1: ruleXThrowExpression EOF
+            // InternalCheck.g:2200:1: ( ruleXThrowExpression EOF )
+            // InternalCheck.g:2201:1: ruleXThrowExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXThrowExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXThrowExpression_in_entryRuleXThrowExpression4636);
+            pushFollow(FOLLOW_1);
             ruleXThrowExpression();
 
             state._fsp--;
@@ -6611,7 +6611,7 @@ public final void entryRuleXThrowExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXThrowExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXThrowExpression4643); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -6628,25 +6628,25 @@ public final void entryRuleXThrowExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXThrowExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2208:1: ruleXThrowExpression : ( ( rule__XThrowExpression__Group__0 ) ) ;
+    // InternalCheck.g:2208:1: ruleXThrowExpression : ( ( rule__XThrowExpression__Group__0 ) ) ;
     public final void ruleXThrowExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2212:2: ( ( ( rule__XThrowExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2213:1: ( ( rule__XThrowExpression__Group__0 ) )
+            // InternalCheck.g:2212:2: ( ( ( rule__XThrowExpression__Group__0 ) ) )
+            // InternalCheck.g:2213:1: ( ( rule__XThrowExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2213:1: ( ( rule__XThrowExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2214:1: ( rule__XThrowExpression__Group__0 )
+            // InternalCheck.g:2213:1: ( ( rule__XThrowExpression__Group__0 ) )
+            // InternalCheck.g:2214:1: ( rule__XThrowExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXThrowExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2215:1: ( rule__XThrowExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2215:2: rule__XThrowExpression__Group__0
+            // InternalCheck.g:2215:1: ( rule__XThrowExpression__Group__0 )
+            // InternalCheck.g:2215:2: rule__XThrowExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XThrowExpression__Group__0_in_ruleXThrowExpression4669);
+            pushFollow(FOLLOW_2);
             rule__XThrowExpression__Group__0();
 
             state._fsp--;
@@ -6679,16 +6679,16 @@ public final void ruleXThrowExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXReturnExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2227:1: entryRuleXReturnExpression : ruleXReturnExpression EOF ;
+    // InternalCheck.g:2227:1: entryRuleXReturnExpression : ruleXReturnExpression EOF ;
     public final void entryRuleXReturnExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2228:1: ( ruleXReturnExpression EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2229:1: ruleXReturnExpression EOF
+            // InternalCheck.g:2228:1: ( ruleXReturnExpression EOF )
+            // InternalCheck.g:2229:1: ruleXReturnExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXReturnExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXReturnExpression_in_entryRuleXReturnExpression4696);
+            pushFollow(FOLLOW_1);
             ruleXReturnExpression();
 
             state._fsp--;
@@ -6696,7 +6696,7 @@ public final void entryRuleXReturnExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXReturnExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXReturnExpression4703); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -6713,25 +6713,25 @@ public final void entryRuleXReturnExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXReturnExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2236:1: ruleXReturnExpression : ( ( rule__XReturnExpression__Group__0 ) ) ;
+    // InternalCheck.g:2236:1: ruleXReturnExpression : ( ( rule__XReturnExpression__Group__0 ) ) ;
     public final void ruleXReturnExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2240:2: ( ( ( rule__XReturnExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2241:1: ( ( rule__XReturnExpression__Group__0 ) )
+            // InternalCheck.g:2240:2: ( ( ( rule__XReturnExpression__Group__0 ) ) )
+            // InternalCheck.g:2241:1: ( ( rule__XReturnExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2241:1: ( ( rule__XReturnExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2242:1: ( rule__XReturnExpression__Group__0 )
+            // InternalCheck.g:2241:1: ( ( rule__XReturnExpression__Group__0 ) )
+            // InternalCheck.g:2242:1: ( rule__XReturnExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXReturnExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2243:1: ( rule__XReturnExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2243:2: rule__XReturnExpression__Group__0
+            // InternalCheck.g:2243:1: ( rule__XReturnExpression__Group__0 )
+            // InternalCheck.g:2243:2: rule__XReturnExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XReturnExpression__Group__0_in_ruleXReturnExpression4729);
+            pushFollow(FOLLOW_2);
             rule__XReturnExpression__Group__0();
 
             state._fsp--;
@@ -6764,16 +6764,16 @@ public final void ruleXReturnExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXTryCatchFinallyExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2255:1: entryRuleXTryCatchFinallyExpression : ruleXTryCatchFinallyExpression EOF ;
+    // InternalCheck.g:2255:1: entryRuleXTryCatchFinallyExpression : ruleXTryCatchFinallyExpression EOF ;
     public final void entryRuleXTryCatchFinallyExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2256:1: ( ruleXTryCatchFinallyExpression EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2257:1: ruleXTryCatchFinallyExpression EOF
+            // InternalCheck.g:2256:1: ( ruleXTryCatchFinallyExpression EOF )
+            // InternalCheck.g:2257:1: ruleXTryCatchFinallyExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXTryCatchFinallyExpression_in_entryRuleXTryCatchFinallyExpression4756);
+            pushFollow(FOLLOW_1);
             ruleXTryCatchFinallyExpression();
 
             state._fsp--;
@@ -6781,7 +6781,7 @@ public final void entryRuleXTryCatchFinallyExpression() throws RecognitionExcept
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXTryCatchFinallyExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXTryCatchFinallyExpression4763); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -6798,25 +6798,25 @@ public final void entryRuleXTryCatchFinallyExpression() throws RecognitionExcept
 
 
     // $ANTLR start "ruleXTryCatchFinallyExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2264:1: ruleXTryCatchFinallyExpression : ( ( rule__XTryCatchFinallyExpression__Group__0 ) ) ;
+    // InternalCheck.g:2264:1: ruleXTryCatchFinallyExpression : ( ( rule__XTryCatchFinallyExpression__Group__0 ) ) ;
     public final void ruleXTryCatchFinallyExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2268:2: ( ( ( rule__XTryCatchFinallyExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2269:1: ( ( rule__XTryCatchFinallyExpression__Group__0 ) )
+            // InternalCheck.g:2268:2: ( ( ( rule__XTryCatchFinallyExpression__Group__0 ) ) )
+            // InternalCheck.g:2269:1: ( ( rule__XTryCatchFinallyExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2269:1: ( ( rule__XTryCatchFinallyExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2270:1: ( rule__XTryCatchFinallyExpression__Group__0 )
+            // InternalCheck.g:2269:1: ( ( rule__XTryCatchFinallyExpression__Group__0 ) )
+            // InternalCheck.g:2270:1: ( rule__XTryCatchFinallyExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2271:1: ( rule__XTryCatchFinallyExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2271:2: rule__XTryCatchFinallyExpression__Group__0
+            // InternalCheck.g:2271:1: ( rule__XTryCatchFinallyExpression__Group__0 )
+            // InternalCheck.g:2271:2: rule__XTryCatchFinallyExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group__0_in_ruleXTryCatchFinallyExpression4789);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Group__0();
 
             state._fsp--;
@@ -6849,16 +6849,16 @@ public final void ruleXTryCatchFinallyExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXSynchronizedExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2283:1: entryRuleXSynchronizedExpression : ruleXSynchronizedExpression EOF ;
+    // InternalCheck.g:2283:1: entryRuleXSynchronizedExpression : ruleXSynchronizedExpression EOF ;
     public final void entryRuleXSynchronizedExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2284:1: ( ruleXSynchronizedExpression EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2285:1: ruleXSynchronizedExpression EOF
+            // InternalCheck.g:2284:1: ( ruleXSynchronizedExpression EOF )
+            // InternalCheck.g:2285:1: ruleXSynchronizedExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXSynchronizedExpression_in_entryRuleXSynchronizedExpression4816);
+            pushFollow(FOLLOW_1);
             ruleXSynchronizedExpression();
 
             state._fsp--;
@@ -6866,7 +6866,7 @@ public final void entryRuleXSynchronizedExpression() throws RecognitionException
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSynchronizedExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXSynchronizedExpression4823); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -6883,25 +6883,25 @@ public final void entryRuleXSynchronizedExpression() throws RecognitionException
 
 
     // $ANTLR start "ruleXSynchronizedExpression"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2292:1: ruleXSynchronizedExpression : ( ( rule__XSynchronizedExpression__Group__0 ) ) ;
+    // InternalCheck.g:2292:1: ruleXSynchronizedExpression : ( ( rule__XSynchronizedExpression__Group__0 ) ) ;
     public final void ruleXSynchronizedExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2296:2: ( ( ( rule__XSynchronizedExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2297:1: ( ( rule__XSynchronizedExpression__Group__0 ) )
+            // InternalCheck.g:2296:2: ( ( ( rule__XSynchronizedExpression__Group__0 ) ) )
+            // InternalCheck.g:2297:1: ( ( rule__XSynchronizedExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2297:1: ( ( rule__XSynchronizedExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2298:1: ( rule__XSynchronizedExpression__Group__0 )
+            // InternalCheck.g:2297:1: ( ( rule__XSynchronizedExpression__Group__0 ) )
+            // InternalCheck.g:2298:1: ( rule__XSynchronizedExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2299:1: ( rule__XSynchronizedExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2299:2: rule__XSynchronizedExpression__Group__0
+            // InternalCheck.g:2299:1: ( rule__XSynchronizedExpression__Group__0 )
+            // InternalCheck.g:2299:2: rule__XSynchronizedExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group__0_in_ruleXSynchronizedExpression4849);
+            pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group__0();
 
             state._fsp--;
@@ -6934,16 +6934,16 @@ public final void ruleXSynchronizedExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXCatchClause"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2311:1: entryRuleXCatchClause : ruleXCatchClause EOF ;
+    // InternalCheck.g:2311:1: entryRuleXCatchClause : ruleXCatchClause EOF ;
     public final void entryRuleXCatchClause() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2312:1: ( ruleXCatchClause EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2313:1: ruleXCatchClause EOF
+            // InternalCheck.g:2312:1: ( ruleXCatchClause EOF )
+            // InternalCheck.g:2313:1: ruleXCatchClause EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseRule()); 
             }
-            pushFollow(FOLLOW_ruleXCatchClause_in_entryRuleXCatchClause4876);
+            pushFollow(FOLLOW_1);
             ruleXCatchClause();
 
             state._fsp--;
@@ -6951,7 +6951,7 @@ public final void entryRuleXCatchClause() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXCatchClauseRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXCatchClause4883); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -6968,25 +6968,25 @@ public final void entryRuleXCatchClause() throws RecognitionException {
 
 
     // $ANTLR start "ruleXCatchClause"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2320:1: ruleXCatchClause : ( ( rule__XCatchClause__Group__0 ) ) ;
+    // InternalCheck.g:2320:1: ruleXCatchClause : ( ( rule__XCatchClause__Group__0 ) ) ;
     public final void ruleXCatchClause() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2324:2: ( ( ( rule__XCatchClause__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2325:1: ( ( rule__XCatchClause__Group__0 ) )
+            // InternalCheck.g:2324:2: ( ( ( rule__XCatchClause__Group__0 ) ) )
+            // InternalCheck.g:2325:1: ( ( rule__XCatchClause__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2325:1: ( ( rule__XCatchClause__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2326:1: ( rule__XCatchClause__Group__0 )
+            // InternalCheck.g:2325:1: ( ( rule__XCatchClause__Group__0 ) )
+            // InternalCheck.g:2326:1: ( rule__XCatchClause__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2327:1: ( rule__XCatchClause__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2327:2: rule__XCatchClause__Group__0
+            // InternalCheck.g:2327:1: ( rule__XCatchClause__Group__0 )
+            // InternalCheck.g:2327:2: rule__XCatchClause__Group__0
             {
-            pushFollow(FOLLOW_rule__XCatchClause__Group__0_in_ruleXCatchClause4909);
+            pushFollow(FOLLOW_2);
             rule__XCatchClause__Group__0();
 
             state._fsp--;
@@ -7019,16 +7019,16 @@ public final void ruleXCatchClause() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleQualifiedName"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2339:1: entryRuleQualifiedName : ruleQualifiedName EOF ;
+    // InternalCheck.g:2339:1: entryRuleQualifiedName : ruleQualifiedName EOF ;
     public final void entryRuleQualifiedName() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2340:1: ( ruleQualifiedName EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2341:1: ruleQualifiedName EOF
+            // InternalCheck.g:2340:1: ( ruleQualifiedName EOF )
+            // InternalCheck.g:2341:1: ruleQualifiedName EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameRule()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName4936);
+            pushFollow(FOLLOW_1);
             ruleQualifiedName();
 
             state._fsp--;
@@ -7036,7 +7036,7 @@ public final void entryRuleQualifiedName() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getQualifiedNameRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedName4943); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -7053,25 +7053,25 @@ public final void entryRuleQualifiedName() throws RecognitionException {
 
 
     // $ANTLR start "ruleQualifiedName"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2348:1: ruleQualifiedName : ( ( rule__QualifiedName__Group__0 ) ) ;
+    // InternalCheck.g:2348:1: ruleQualifiedName : ( ( rule__QualifiedName__Group__0 ) ) ;
     public final void ruleQualifiedName() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2352:2: ( ( ( rule__QualifiedName__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2353:1: ( ( rule__QualifiedName__Group__0 ) )
+            // InternalCheck.g:2352:2: ( ( ( rule__QualifiedName__Group__0 ) ) )
+            // InternalCheck.g:2353:1: ( ( rule__QualifiedName__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2353:1: ( ( rule__QualifiedName__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2354:1: ( rule__QualifiedName__Group__0 )
+            // InternalCheck.g:2353:1: ( ( rule__QualifiedName__Group__0 ) )
+            // InternalCheck.g:2354:1: ( rule__QualifiedName__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2355:1: ( rule__QualifiedName__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2355:2: rule__QualifiedName__Group__0
+            // InternalCheck.g:2355:1: ( rule__QualifiedName__Group__0 )
+            // InternalCheck.g:2355:2: rule__QualifiedName__Group__0
             {
-            pushFollow(FOLLOW_rule__QualifiedName__Group__0_in_ruleQualifiedName4969);
+            pushFollow(FOLLOW_2);
             rule__QualifiedName__Group__0();
 
             state._fsp--;
@@ -7104,19 +7104,19 @@ public final void ruleQualifiedName() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleNumber"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2367:1: entryRuleNumber : ruleNumber EOF ;
+    // InternalCheck.g:2367:1: entryRuleNumber : ruleNumber EOF ;
     public final void entryRuleNumber() throws RecognitionException {
 
         	HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
 
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2371:1: ( ruleNumber EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2372:1: ruleNumber EOF
+            // InternalCheck.g:2371:1: ( ruleNumber EOF )
+            // InternalCheck.g:2372:1: ruleNumber EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNumberRule()); 
             }
-            pushFollow(FOLLOW_ruleNumber_in_entryRuleNumber5001);
+            pushFollow(FOLLOW_1);
             ruleNumber();
 
             state._fsp--;
@@ -7124,7 +7124,7 @@ public final void entryRuleNumber() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getNumberRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNumber5008); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -7144,26 +7144,26 @@ public final void entryRuleNumber() throws RecognitionException {
 
 
     // $ANTLR start "ruleNumber"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2382:1: ruleNumber : ( ( rule__Number__Alternatives ) ) ;
+    // InternalCheck.g:2382:1: ruleNumber : ( ( rule__Number__Alternatives ) ) ;
     public final void ruleNumber() throws RecognitionException {
 
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2387:2: ( ( ( rule__Number__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2388:1: ( ( rule__Number__Alternatives ) )
+            // InternalCheck.g:2387:2: ( ( ( rule__Number__Alternatives ) ) )
+            // InternalCheck.g:2388:1: ( ( rule__Number__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2388:1: ( ( rule__Number__Alternatives ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2389:1: ( rule__Number__Alternatives )
+            // InternalCheck.g:2388:1: ( ( rule__Number__Alternatives ) )
+            // InternalCheck.g:2389:1: ( rule__Number__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNumberAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2390:1: ( rule__Number__Alternatives )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2390:2: rule__Number__Alternatives
+            // InternalCheck.g:2390:1: ( rule__Number__Alternatives )
+            // InternalCheck.g:2390:2: rule__Number__Alternatives
             {
-            pushFollow(FOLLOW_rule__Number__Alternatives_in_ruleNumber5038);
+            pushFollow(FOLLOW_2);
             rule__Number__Alternatives();
 
             state._fsp--;
@@ -7197,16 +7197,16 @@ public final void ruleNumber() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleJvmTypeReference"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2405:1: entryRuleJvmTypeReference : ruleJvmTypeReference EOF ;
+    // InternalCheck.g:2405:1: entryRuleJvmTypeReference : ruleJvmTypeReference EOF ;
     public final void entryRuleJvmTypeReference() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2406:1: ( ruleJvmTypeReference EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2407:1: ruleJvmTypeReference EOF
+            // InternalCheck.g:2406:1: ( ruleJvmTypeReference EOF )
+            // InternalCheck.g:2407:1: ruleJvmTypeReference EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmTypeReferenceRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_entryRuleJvmTypeReference5067);
+            pushFollow(FOLLOW_1);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -7214,7 +7214,7 @@ public final void entryRuleJvmTypeReference() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmTypeReferenceRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmTypeReference5074); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -7231,25 +7231,25 @@ public final void entryRuleJvmTypeReference() throws RecognitionException {
 
 
     // $ANTLR start "ruleJvmTypeReference"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2414:1: ruleJvmTypeReference : ( ( rule__JvmTypeReference__Alternatives ) ) ;
+    // InternalCheck.g:2414:1: ruleJvmTypeReference : ( ( rule__JvmTypeReference__Alternatives ) ) ;
     public final void ruleJvmTypeReference() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2418:2: ( ( ( rule__JvmTypeReference__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2419:1: ( ( rule__JvmTypeReference__Alternatives ) )
+            // InternalCheck.g:2418:2: ( ( ( rule__JvmTypeReference__Alternatives ) ) )
+            // InternalCheck.g:2419:1: ( ( rule__JvmTypeReference__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2419:1: ( ( rule__JvmTypeReference__Alternatives ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2420:1: ( rule__JvmTypeReference__Alternatives )
+            // InternalCheck.g:2419:1: ( ( rule__JvmTypeReference__Alternatives ) )
+            // InternalCheck.g:2420:1: ( rule__JvmTypeReference__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmTypeReferenceAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2421:1: ( rule__JvmTypeReference__Alternatives )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2421:2: rule__JvmTypeReference__Alternatives
+            // InternalCheck.g:2421:1: ( rule__JvmTypeReference__Alternatives )
+            // InternalCheck.g:2421:2: rule__JvmTypeReference__Alternatives
             {
-            pushFollow(FOLLOW_rule__JvmTypeReference__Alternatives_in_ruleJvmTypeReference5100);
+            pushFollow(FOLLOW_2);
             rule__JvmTypeReference__Alternatives();
 
             state._fsp--;
@@ -7282,16 +7282,16 @@ public final void ruleJvmTypeReference() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleArrayBrackets"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2433:1: entryRuleArrayBrackets : ruleArrayBrackets EOF ;
+    // InternalCheck.g:2433:1: entryRuleArrayBrackets : ruleArrayBrackets EOF ;
     public final void entryRuleArrayBrackets() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2434:1: ( ruleArrayBrackets EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2435:1: ruleArrayBrackets EOF
+            // InternalCheck.g:2434:1: ( ruleArrayBrackets EOF )
+            // InternalCheck.g:2435:1: ruleArrayBrackets EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getArrayBracketsRule()); 
             }
-            pushFollow(FOLLOW_ruleArrayBrackets_in_entryRuleArrayBrackets5127);
+            pushFollow(FOLLOW_1);
             ruleArrayBrackets();
 
             state._fsp--;
@@ -7299,7 +7299,7 @@ public final void entryRuleArrayBrackets() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getArrayBracketsRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleArrayBrackets5134); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -7316,25 +7316,25 @@ public final void entryRuleArrayBrackets() throws RecognitionException {
 
 
     // $ANTLR start "ruleArrayBrackets"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2442:1: ruleArrayBrackets : ( ( rule__ArrayBrackets__Group__0 ) ) ;
+    // InternalCheck.g:2442:1: ruleArrayBrackets : ( ( rule__ArrayBrackets__Group__0 ) ) ;
     public final void ruleArrayBrackets() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2446:2: ( ( ( rule__ArrayBrackets__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2447:1: ( ( rule__ArrayBrackets__Group__0 ) )
+            // InternalCheck.g:2446:2: ( ( ( rule__ArrayBrackets__Group__0 ) ) )
+            // InternalCheck.g:2447:1: ( ( rule__ArrayBrackets__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2447:1: ( ( rule__ArrayBrackets__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2448:1: ( rule__ArrayBrackets__Group__0 )
+            // InternalCheck.g:2447:1: ( ( rule__ArrayBrackets__Group__0 ) )
+            // InternalCheck.g:2448:1: ( rule__ArrayBrackets__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getArrayBracketsAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2449:1: ( rule__ArrayBrackets__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2449:2: rule__ArrayBrackets__Group__0
+            // InternalCheck.g:2449:1: ( rule__ArrayBrackets__Group__0 )
+            // InternalCheck.g:2449:2: rule__ArrayBrackets__Group__0
             {
-            pushFollow(FOLLOW_rule__ArrayBrackets__Group__0_in_ruleArrayBrackets5160);
+            pushFollow(FOLLOW_2);
             rule__ArrayBrackets__Group__0();
 
             state._fsp--;
@@ -7367,16 +7367,16 @@ public final void ruleArrayBrackets() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXFunctionTypeRef"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2461:1: entryRuleXFunctionTypeRef : ruleXFunctionTypeRef EOF ;
+    // InternalCheck.g:2461:1: entryRuleXFunctionTypeRef : ruleXFunctionTypeRef EOF ;
     public final void entryRuleXFunctionTypeRef() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2462:1: ( ruleXFunctionTypeRef EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2463:1: ruleXFunctionTypeRef EOF
+            // InternalCheck.g:2462:1: ( ruleXFunctionTypeRef EOF )
+            // InternalCheck.g:2463:1: ruleXFunctionTypeRef EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefRule()); 
             }
-            pushFollow(FOLLOW_ruleXFunctionTypeRef_in_entryRuleXFunctionTypeRef5187);
+            pushFollow(FOLLOW_1);
             ruleXFunctionTypeRef();
 
             state._fsp--;
@@ -7384,7 +7384,7 @@ public final void entryRuleXFunctionTypeRef() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFunctionTypeRefRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXFunctionTypeRef5194); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -7401,25 +7401,25 @@ public final void entryRuleXFunctionTypeRef() throws RecognitionException {
 
 
     // $ANTLR start "ruleXFunctionTypeRef"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2470:1: ruleXFunctionTypeRef : ( ( rule__XFunctionTypeRef__Group__0 ) ) ;
+    // InternalCheck.g:2470:1: ruleXFunctionTypeRef : ( ( rule__XFunctionTypeRef__Group__0 ) ) ;
     public final void ruleXFunctionTypeRef() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2474:2: ( ( ( rule__XFunctionTypeRef__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2475:1: ( ( rule__XFunctionTypeRef__Group__0 ) )
+            // InternalCheck.g:2474:2: ( ( ( rule__XFunctionTypeRef__Group__0 ) ) )
+            // InternalCheck.g:2475:1: ( ( rule__XFunctionTypeRef__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2475:1: ( ( rule__XFunctionTypeRef__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2476:1: ( rule__XFunctionTypeRef__Group__0 )
+            // InternalCheck.g:2475:1: ( ( rule__XFunctionTypeRef__Group__0 ) )
+            // InternalCheck.g:2476:1: ( rule__XFunctionTypeRef__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2477:1: ( rule__XFunctionTypeRef__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2477:2: rule__XFunctionTypeRef__Group__0
+            // InternalCheck.g:2477:1: ( rule__XFunctionTypeRef__Group__0 )
+            // InternalCheck.g:2477:2: rule__XFunctionTypeRef__Group__0
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group__0_in_ruleXFunctionTypeRef5220);
+            pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__Group__0();
 
             state._fsp--;
@@ -7452,16 +7452,16 @@ public final void ruleXFunctionTypeRef() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleJvmParameterizedTypeReference"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2489:1: entryRuleJvmParameterizedTypeReference : ruleJvmParameterizedTypeReference EOF ;
+    // InternalCheck.g:2489:1: entryRuleJvmParameterizedTypeReference : ruleJvmParameterizedTypeReference EOF ;
     public final void entryRuleJvmParameterizedTypeReference() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2490:1: ( ruleJvmParameterizedTypeReference EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2491:1: ruleJvmParameterizedTypeReference EOF
+            // InternalCheck.g:2490:1: ( ruleJvmParameterizedTypeReference EOF )
+            // InternalCheck.g:2491:1: ruleJvmParameterizedTypeReference EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmParameterizedTypeReference_in_entryRuleJvmParameterizedTypeReference5247);
+            pushFollow(FOLLOW_1);
             ruleJvmParameterizedTypeReference();
 
             state._fsp--;
@@ -7469,7 +7469,7 @@ public final void entryRuleJvmParameterizedTypeReference() throws RecognitionExc
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmParameterizedTypeReferenceRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmParameterizedTypeReference5254); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -7486,25 +7486,25 @@ public final void entryRuleJvmParameterizedTypeReference() throws RecognitionExc
 
 
     // $ANTLR start "ruleJvmParameterizedTypeReference"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2498:1: ruleJvmParameterizedTypeReference : ( ( rule__JvmParameterizedTypeReference__Group__0 ) ) ;
+    // InternalCheck.g:2498:1: ruleJvmParameterizedTypeReference : ( ( rule__JvmParameterizedTypeReference__Group__0 ) ) ;
     public final void ruleJvmParameterizedTypeReference() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2502:2: ( ( ( rule__JvmParameterizedTypeReference__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2503:1: ( ( rule__JvmParameterizedTypeReference__Group__0 ) )
+            // InternalCheck.g:2502:2: ( ( ( rule__JvmParameterizedTypeReference__Group__0 ) ) )
+            // InternalCheck.g:2503:1: ( ( rule__JvmParameterizedTypeReference__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2503:1: ( ( rule__JvmParameterizedTypeReference__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2504:1: ( rule__JvmParameterizedTypeReference__Group__0 )
+            // InternalCheck.g:2503:1: ( ( rule__JvmParameterizedTypeReference__Group__0 ) )
+            // InternalCheck.g:2504:1: ( rule__JvmParameterizedTypeReference__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2505:1: ( rule__JvmParameterizedTypeReference__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2505:2: rule__JvmParameterizedTypeReference__Group__0
+            // InternalCheck.g:2505:1: ( rule__JvmParameterizedTypeReference__Group__0 )
+            // InternalCheck.g:2505:2: rule__JvmParameterizedTypeReference__Group__0
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group__0_in_ruleJvmParameterizedTypeReference5280);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group__0();
 
             state._fsp--;
@@ -7537,16 +7537,16 @@ public final void ruleJvmParameterizedTypeReference() throws RecognitionExceptio
 
 
     // $ANTLR start "entryRuleJvmArgumentTypeReference"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2517:1: entryRuleJvmArgumentTypeReference : ruleJvmArgumentTypeReference EOF ;
+    // InternalCheck.g:2517:1: entryRuleJvmArgumentTypeReference : ruleJvmArgumentTypeReference EOF ;
     public final void entryRuleJvmArgumentTypeReference() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2518:1: ( ruleJvmArgumentTypeReference EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2519:1: ruleJvmArgumentTypeReference EOF
+            // InternalCheck.g:2518:1: ( ruleJvmArgumentTypeReference EOF )
+            // InternalCheck.g:2519:1: ruleJvmArgumentTypeReference EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmArgumentTypeReferenceRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_entryRuleJvmArgumentTypeReference5307);
+            pushFollow(FOLLOW_1);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -7554,7 +7554,7 @@ public final void entryRuleJvmArgumentTypeReference() throws RecognitionExceptio
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmArgumentTypeReferenceRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmArgumentTypeReference5314); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -7571,25 +7571,25 @@ public final void entryRuleJvmArgumentTypeReference() throws RecognitionExceptio
 
 
     // $ANTLR start "ruleJvmArgumentTypeReference"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2526:1: ruleJvmArgumentTypeReference : ( ( rule__JvmArgumentTypeReference__Alternatives ) ) ;
+    // InternalCheck.g:2526:1: ruleJvmArgumentTypeReference : ( ( rule__JvmArgumentTypeReference__Alternatives ) ) ;
     public final void ruleJvmArgumentTypeReference() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2530:2: ( ( ( rule__JvmArgumentTypeReference__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2531:1: ( ( rule__JvmArgumentTypeReference__Alternatives ) )
+            // InternalCheck.g:2530:2: ( ( ( rule__JvmArgumentTypeReference__Alternatives ) ) )
+            // InternalCheck.g:2531:1: ( ( rule__JvmArgumentTypeReference__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2531:1: ( ( rule__JvmArgumentTypeReference__Alternatives ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2532:1: ( rule__JvmArgumentTypeReference__Alternatives )
+            // InternalCheck.g:2531:1: ( ( rule__JvmArgumentTypeReference__Alternatives ) )
+            // InternalCheck.g:2532:1: ( rule__JvmArgumentTypeReference__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmArgumentTypeReferenceAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2533:1: ( rule__JvmArgumentTypeReference__Alternatives )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2533:2: rule__JvmArgumentTypeReference__Alternatives
+            // InternalCheck.g:2533:1: ( rule__JvmArgumentTypeReference__Alternatives )
+            // InternalCheck.g:2533:2: rule__JvmArgumentTypeReference__Alternatives
             {
-            pushFollow(FOLLOW_rule__JvmArgumentTypeReference__Alternatives_in_ruleJvmArgumentTypeReference5340);
+            pushFollow(FOLLOW_2);
             rule__JvmArgumentTypeReference__Alternatives();
 
             state._fsp--;
@@ -7622,16 +7622,16 @@ public final void ruleJvmArgumentTypeReference() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleJvmWildcardTypeReference"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2545:1: entryRuleJvmWildcardTypeReference : ruleJvmWildcardTypeReference EOF ;
+    // InternalCheck.g:2545:1: entryRuleJvmWildcardTypeReference : ruleJvmWildcardTypeReference EOF ;
     public final void entryRuleJvmWildcardTypeReference() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2546:1: ( ruleJvmWildcardTypeReference EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2547:1: ruleJvmWildcardTypeReference EOF
+            // InternalCheck.g:2546:1: ( ruleJvmWildcardTypeReference EOF )
+            // InternalCheck.g:2547:1: ruleJvmWildcardTypeReference EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmWildcardTypeReference_in_entryRuleJvmWildcardTypeReference5367);
+            pushFollow(FOLLOW_1);
             ruleJvmWildcardTypeReference();
 
             state._fsp--;
@@ -7639,7 +7639,7 @@ public final void entryRuleJvmWildcardTypeReference() throws RecognitionExceptio
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmWildcardTypeReferenceRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmWildcardTypeReference5374); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -7656,25 +7656,25 @@ public final void entryRuleJvmWildcardTypeReference() throws RecognitionExceptio
 
 
     // $ANTLR start "ruleJvmWildcardTypeReference"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2554:1: ruleJvmWildcardTypeReference : ( ( rule__JvmWildcardTypeReference__Group__0 ) ) ;
+    // InternalCheck.g:2554:1: ruleJvmWildcardTypeReference : ( ( rule__JvmWildcardTypeReference__Group__0 ) ) ;
     public final void ruleJvmWildcardTypeReference() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2558:2: ( ( ( rule__JvmWildcardTypeReference__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2559:1: ( ( rule__JvmWildcardTypeReference__Group__0 ) )
+            // InternalCheck.g:2558:2: ( ( ( rule__JvmWildcardTypeReference__Group__0 ) ) )
+            // InternalCheck.g:2559:1: ( ( rule__JvmWildcardTypeReference__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2559:1: ( ( rule__JvmWildcardTypeReference__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2560:1: ( rule__JvmWildcardTypeReference__Group__0 )
+            // InternalCheck.g:2559:1: ( ( rule__JvmWildcardTypeReference__Group__0 ) )
+            // InternalCheck.g:2560:1: ( rule__JvmWildcardTypeReference__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2561:1: ( rule__JvmWildcardTypeReference__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2561:2: rule__JvmWildcardTypeReference__Group__0
+            // InternalCheck.g:2561:1: ( rule__JvmWildcardTypeReference__Group__0 )
+            // InternalCheck.g:2561:2: rule__JvmWildcardTypeReference__Group__0
             {
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group__0_in_ruleJvmWildcardTypeReference5400);
+            pushFollow(FOLLOW_2);
             rule__JvmWildcardTypeReference__Group__0();
 
             state._fsp--;
@@ -7707,16 +7707,16 @@ public final void ruleJvmWildcardTypeReference() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleJvmUpperBound"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2573:1: entryRuleJvmUpperBound : ruleJvmUpperBound EOF ;
+    // InternalCheck.g:2573:1: entryRuleJvmUpperBound : ruleJvmUpperBound EOF ;
     public final void entryRuleJvmUpperBound() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2574:1: ( ruleJvmUpperBound EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2575:1: ruleJvmUpperBound EOF
+            // InternalCheck.g:2574:1: ( ruleJvmUpperBound EOF )
+            // InternalCheck.g:2575:1: ruleJvmUpperBound EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmUpperBound_in_entryRuleJvmUpperBound5427);
+            pushFollow(FOLLOW_1);
             ruleJvmUpperBound();
 
             state._fsp--;
@@ -7724,7 +7724,7 @@ public final void entryRuleJvmUpperBound() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmUpperBoundRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmUpperBound5434); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -7741,25 +7741,25 @@ public final void entryRuleJvmUpperBound() throws RecognitionException {
 
 
     // $ANTLR start "ruleJvmUpperBound"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2582:1: ruleJvmUpperBound : ( ( rule__JvmUpperBound__Group__0 ) ) ;
+    // InternalCheck.g:2582:1: ruleJvmUpperBound : ( ( rule__JvmUpperBound__Group__0 ) ) ;
     public final void ruleJvmUpperBound() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2586:2: ( ( ( rule__JvmUpperBound__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2587:1: ( ( rule__JvmUpperBound__Group__0 ) )
+            // InternalCheck.g:2586:2: ( ( ( rule__JvmUpperBound__Group__0 ) ) )
+            // InternalCheck.g:2587:1: ( ( rule__JvmUpperBound__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2587:1: ( ( rule__JvmUpperBound__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2588:1: ( rule__JvmUpperBound__Group__0 )
+            // InternalCheck.g:2587:1: ( ( rule__JvmUpperBound__Group__0 ) )
+            // InternalCheck.g:2588:1: ( rule__JvmUpperBound__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2589:1: ( rule__JvmUpperBound__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2589:2: rule__JvmUpperBound__Group__0
+            // InternalCheck.g:2589:1: ( rule__JvmUpperBound__Group__0 )
+            // InternalCheck.g:2589:2: rule__JvmUpperBound__Group__0
             {
-            pushFollow(FOLLOW_rule__JvmUpperBound__Group__0_in_ruleJvmUpperBound5460);
+            pushFollow(FOLLOW_2);
             rule__JvmUpperBound__Group__0();
 
             state._fsp--;
@@ -7792,16 +7792,16 @@ public final void ruleJvmUpperBound() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleJvmUpperBoundAnded"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2601:1: entryRuleJvmUpperBoundAnded : ruleJvmUpperBoundAnded EOF ;
+    // InternalCheck.g:2601:1: entryRuleJvmUpperBoundAnded : ruleJvmUpperBoundAnded EOF ;
     public final void entryRuleJvmUpperBoundAnded() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2602:1: ( ruleJvmUpperBoundAnded EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2603:1: ruleJvmUpperBoundAnded EOF
+            // InternalCheck.g:2602:1: ( ruleJvmUpperBoundAnded EOF )
+            // InternalCheck.g:2603:1: ruleJvmUpperBoundAnded EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAndedRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmUpperBoundAnded_in_entryRuleJvmUpperBoundAnded5487);
+            pushFollow(FOLLOW_1);
             ruleJvmUpperBoundAnded();
 
             state._fsp--;
@@ -7809,7 +7809,7 @@ public final void entryRuleJvmUpperBoundAnded() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmUpperBoundAndedRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmUpperBoundAnded5494); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -7826,25 +7826,25 @@ public final void entryRuleJvmUpperBoundAnded() throws RecognitionException {
 
 
     // $ANTLR start "ruleJvmUpperBoundAnded"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2610:1: ruleJvmUpperBoundAnded : ( ( rule__JvmUpperBoundAnded__Group__0 ) ) ;
+    // InternalCheck.g:2610:1: ruleJvmUpperBoundAnded : ( ( rule__JvmUpperBoundAnded__Group__0 ) ) ;
     public final void ruleJvmUpperBoundAnded() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2614:2: ( ( ( rule__JvmUpperBoundAnded__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2615:1: ( ( rule__JvmUpperBoundAnded__Group__0 ) )
+            // InternalCheck.g:2614:2: ( ( ( rule__JvmUpperBoundAnded__Group__0 ) ) )
+            // InternalCheck.g:2615:1: ( ( rule__JvmUpperBoundAnded__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2615:1: ( ( rule__JvmUpperBoundAnded__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2616:1: ( rule__JvmUpperBoundAnded__Group__0 )
+            // InternalCheck.g:2615:1: ( ( rule__JvmUpperBoundAnded__Group__0 ) )
+            // InternalCheck.g:2616:1: ( rule__JvmUpperBoundAnded__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAndedAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2617:1: ( rule__JvmUpperBoundAnded__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2617:2: rule__JvmUpperBoundAnded__Group__0
+            // InternalCheck.g:2617:1: ( rule__JvmUpperBoundAnded__Group__0 )
+            // InternalCheck.g:2617:2: rule__JvmUpperBoundAnded__Group__0
             {
-            pushFollow(FOLLOW_rule__JvmUpperBoundAnded__Group__0_in_ruleJvmUpperBoundAnded5520);
+            pushFollow(FOLLOW_2);
             rule__JvmUpperBoundAnded__Group__0();
 
             state._fsp--;
@@ -7877,16 +7877,16 @@ public final void ruleJvmUpperBoundAnded() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleJvmLowerBound"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2629:1: entryRuleJvmLowerBound : ruleJvmLowerBound EOF ;
+    // InternalCheck.g:2629:1: entryRuleJvmLowerBound : ruleJvmLowerBound EOF ;
     public final void entryRuleJvmLowerBound() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2630:1: ( ruleJvmLowerBound EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2631:1: ruleJvmLowerBound EOF
+            // InternalCheck.g:2630:1: ( ruleJvmLowerBound EOF )
+            // InternalCheck.g:2631:1: ruleJvmLowerBound EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmLowerBound_in_entryRuleJvmLowerBound5547);
+            pushFollow(FOLLOW_1);
             ruleJvmLowerBound();
 
             state._fsp--;
@@ -7894,7 +7894,7 @@ public final void entryRuleJvmLowerBound() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmLowerBoundRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmLowerBound5554); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -7911,25 +7911,25 @@ public final void entryRuleJvmLowerBound() throws RecognitionException {
 
 
     // $ANTLR start "ruleJvmLowerBound"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2638:1: ruleJvmLowerBound : ( ( rule__JvmLowerBound__Group__0 ) ) ;
+    // InternalCheck.g:2638:1: ruleJvmLowerBound : ( ( rule__JvmLowerBound__Group__0 ) ) ;
     public final void ruleJvmLowerBound() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2642:2: ( ( ( rule__JvmLowerBound__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2643:1: ( ( rule__JvmLowerBound__Group__0 ) )
+            // InternalCheck.g:2642:2: ( ( ( rule__JvmLowerBound__Group__0 ) ) )
+            // InternalCheck.g:2643:1: ( ( rule__JvmLowerBound__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2643:1: ( ( rule__JvmLowerBound__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2644:1: ( rule__JvmLowerBound__Group__0 )
+            // InternalCheck.g:2643:1: ( ( rule__JvmLowerBound__Group__0 ) )
+            // InternalCheck.g:2644:1: ( rule__JvmLowerBound__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2645:1: ( rule__JvmLowerBound__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2645:2: rule__JvmLowerBound__Group__0
+            // InternalCheck.g:2645:1: ( rule__JvmLowerBound__Group__0 )
+            // InternalCheck.g:2645:2: rule__JvmLowerBound__Group__0
             {
-            pushFollow(FOLLOW_rule__JvmLowerBound__Group__0_in_ruleJvmLowerBound5580);
+            pushFollow(FOLLOW_2);
             rule__JvmLowerBound__Group__0();
 
             state._fsp--;
@@ -7962,16 +7962,16 @@ public final void ruleJvmLowerBound() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleJvmLowerBoundAnded"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2657:1: entryRuleJvmLowerBoundAnded : ruleJvmLowerBoundAnded EOF ;
+    // InternalCheck.g:2657:1: entryRuleJvmLowerBoundAnded : ruleJvmLowerBoundAnded EOF ;
     public final void entryRuleJvmLowerBoundAnded() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2658:1: ( ruleJvmLowerBoundAnded EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2659:1: ruleJvmLowerBoundAnded EOF
+            // InternalCheck.g:2658:1: ( ruleJvmLowerBoundAnded EOF )
+            // InternalCheck.g:2659:1: ruleJvmLowerBoundAnded EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAndedRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmLowerBoundAnded_in_entryRuleJvmLowerBoundAnded5607);
+            pushFollow(FOLLOW_1);
             ruleJvmLowerBoundAnded();
 
             state._fsp--;
@@ -7979,7 +7979,7 @@ public final void entryRuleJvmLowerBoundAnded() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmLowerBoundAndedRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmLowerBoundAnded5614); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -7996,25 +7996,25 @@ public final void entryRuleJvmLowerBoundAnded() throws RecognitionException {
 
 
     // $ANTLR start "ruleJvmLowerBoundAnded"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2666:1: ruleJvmLowerBoundAnded : ( ( rule__JvmLowerBoundAnded__Group__0 ) ) ;
+    // InternalCheck.g:2666:1: ruleJvmLowerBoundAnded : ( ( rule__JvmLowerBoundAnded__Group__0 ) ) ;
     public final void ruleJvmLowerBoundAnded() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2670:2: ( ( ( rule__JvmLowerBoundAnded__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2671:1: ( ( rule__JvmLowerBoundAnded__Group__0 ) )
+            // InternalCheck.g:2670:2: ( ( ( rule__JvmLowerBoundAnded__Group__0 ) ) )
+            // InternalCheck.g:2671:1: ( ( rule__JvmLowerBoundAnded__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2671:1: ( ( rule__JvmLowerBoundAnded__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2672:1: ( rule__JvmLowerBoundAnded__Group__0 )
+            // InternalCheck.g:2671:1: ( ( rule__JvmLowerBoundAnded__Group__0 ) )
+            // InternalCheck.g:2672:1: ( rule__JvmLowerBoundAnded__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAndedAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2673:1: ( rule__JvmLowerBoundAnded__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2673:2: rule__JvmLowerBoundAnded__Group__0
+            // InternalCheck.g:2673:1: ( rule__JvmLowerBoundAnded__Group__0 )
+            // InternalCheck.g:2673:2: rule__JvmLowerBoundAnded__Group__0
             {
-            pushFollow(FOLLOW_rule__JvmLowerBoundAnded__Group__0_in_ruleJvmLowerBoundAnded5640);
+            pushFollow(FOLLOW_2);
             rule__JvmLowerBoundAnded__Group__0();
 
             state._fsp--;
@@ -8047,16 +8047,16 @@ public final void ruleJvmLowerBoundAnded() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleQualifiedNameWithWildcard"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2687:1: entryRuleQualifiedNameWithWildcard : ruleQualifiedNameWithWildcard EOF ;
+    // InternalCheck.g:2687:1: entryRuleQualifiedNameWithWildcard : ruleQualifiedNameWithWildcard EOF ;
     public final void entryRuleQualifiedNameWithWildcard() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2688:1: ( ruleQualifiedNameWithWildcard EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2689:1: ruleQualifiedNameWithWildcard EOF
+            // InternalCheck.g:2688:1: ( ruleQualifiedNameWithWildcard EOF )
+            // InternalCheck.g:2689:1: ruleQualifiedNameWithWildcard EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameWithWildcardRule()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedNameWithWildcard_in_entryRuleQualifiedNameWithWildcard5669);
+            pushFollow(FOLLOW_1);
             ruleQualifiedNameWithWildcard();
 
             state._fsp--;
@@ -8064,7 +8064,7 @@ public final void entryRuleQualifiedNameWithWildcard() throws RecognitionExcepti
             if ( state.backtracking==0 ) {
                after(grammarAccess.getQualifiedNameWithWildcardRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedNameWithWildcard5676); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -8081,25 +8081,25 @@ public final void entryRuleQualifiedNameWithWildcard() throws RecognitionExcepti
 
 
     // $ANTLR start "ruleQualifiedNameWithWildcard"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2696:1: ruleQualifiedNameWithWildcard : ( ( rule__QualifiedNameWithWildcard__Group__0 ) ) ;
+    // InternalCheck.g:2696:1: ruleQualifiedNameWithWildcard : ( ( rule__QualifiedNameWithWildcard__Group__0 ) ) ;
     public final void ruleQualifiedNameWithWildcard() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2700:2: ( ( ( rule__QualifiedNameWithWildcard__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2701:1: ( ( rule__QualifiedNameWithWildcard__Group__0 ) )
+            // InternalCheck.g:2700:2: ( ( ( rule__QualifiedNameWithWildcard__Group__0 ) ) )
+            // InternalCheck.g:2701:1: ( ( rule__QualifiedNameWithWildcard__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2701:1: ( ( rule__QualifiedNameWithWildcard__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2702:1: ( rule__QualifiedNameWithWildcard__Group__0 )
+            // InternalCheck.g:2701:1: ( ( rule__QualifiedNameWithWildcard__Group__0 ) )
+            // InternalCheck.g:2702:1: ( rule__QualifiedNameWithWildcard__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameWithWildcardAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2703:1: ( rule__QualifiedNameWithWildcard__Group__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2703:2: rule__QualifiedNameWithWildcard__Group__0
+            // InternalCheck.g:2703:1: ( rule__QualifiedNameWithWildcard__Group__0 )
+            // InternalCheck.g:2703:2: rule__QualifiedNameWithWildcard__Group__0
             {
-            pushFollow(FOLLOW_rule__QualifiedNameWithWildcard__Group__0_in_ruleQualifiedNameWithWildcard5702);
+            pushFollow(FOLLOW_2);
             rule__QualifiedNameWithWildcard__Group__0();
 
             state._fsp--;
@@ -8132,16 +8132,16 @@ public final void ruleQualifiedNameWithWildcard() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleValidID"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2715:1: entryRuleValidID : ruleValidID EOF ;
+    // InternalCheck.g:2715:1: entryRuleValidID : ruleValidID EOF ;
     public final void entryRuleValidID() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2716:1: ( ruleValidID EOF )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2717:1: ruleValidID EOF
+            // InternalCheck.g:2716:1: ( ruleValidID EOF )
+            // InternalCheck.g:2717:1: ruleValidID EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getValidIDRule()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_entryRuleValidID5729);
+            pushFollow(FOLLOW_1);
             ruleValidID();
 
             state._fsp--;
@@ -8149,7 +8149,7 @@ public final void entryRuleValidID() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getValidIDRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleValidID5736); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -8166,22 +8166,22 @@ public final void entryRuleValidID() throws RecognitionException {
 
 
     // $ANTLR start "ruleValidID"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2724:1: ruleValidID : ( RULE_ID ) ;
+    // InternalCheck.g:2724:1: ruleValidID : ( RULE_ID ) ;
     public final void ruleValidID() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2728:2: ( ( RULE_ID ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2729:1: ( RULE_ID )
+            // InternalCheck.g:2728:2: ( ( RULE_ID ) )
+            // InternalCheck.g:2729:1: ( RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2729:1: ( RULE_ID )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2730:1: RULE_ID
+            // InternalCheck.g:2729:1: ( RULE_ID )
+            // InternalCheck.g:2730:1: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getValidIDAccess().getIDTerminalRuleCall()); 
             }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleValidID5762); if (state.failed) return ;
+            match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getValidIDAccess().getIDTerminalRuleCall()); 
             }
@@ -8207,25 +8207,25 @@ public final void ruleValidID() throws RecognitionException {
 
 
     // $ANTLR start "ruleSeverityKind"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2746:1: ruleSeverityKind : ( ( rule__SeverityKind__Alternatives ) ) ;
+    // InternalCheck.g:2746:1: ruleSeverityKind : ( ( rule__SeverityKind__Alternatives ) ) ;
     public final void ruleSeverityKind() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2750:1: ( ( ( rule__SeverityKind__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2751:1: ( ( rule__SeverityKind__Alternatives ) )
+            // InternalCheck.g:2750:1: ( ( ( rule__SeverityKind__Alternatives ) ) )
+            // InternalCheck.g:2751:1: ( ( rule__SeverityKind__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2751:1: ( ( rule__SeverityKind__Alternatives ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2752:1: ( rule__SeverityKind__Alternatives )
+            // InternalCheck.g:2751:1: ( ( rule__SeverityKind__Alternatives ) )
+            // InternalCheck.g:2752:1: ( rule__SeverityKind__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSeverityKindAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2753:1: ( rule__SeverityKind__Alternatives )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2753:2: rule__SeverityKind__Alternatives
+            // InternalCheck.g:2753:1: ( rule__SeverityKind__Alternatives )
+            // InternalCheck.g:2753:2: rule__SeverityKind__Alternatives
             {
-            pushFollow(FOLLOW_rule__SeverityKind__Alternatives_in_ruleSeverityKind5800);
+            pushFollow(FOLLOW_2);
             rule__SeverityKind__Alternatives();
 
             state._fsp--;
@@ -8258,25 +8258,25 @@ public final void ruleSeverityKind() throws RecognitionException {
 
 
     // $ANTLR start "ruleTriggerKind"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2765:1: ruleTriggerKind : ( ( rule__TriggerKind__Alternatives ) ) ;
+    // InternalCheck.g:2765:1: ruleTriggerKind : ( ( rule__TriggerKind__Alternatives ) ) ;
     public final void ruleTriggerKind() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2769:1: ( ( ( rule__TriggerKind__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2770:1: ( ( rule__TriggerKind__Alternatives ) )
+            // InternalCheck.g:2769:1: ( ( ( rule__TriggerKind__Alternatives ) ) )
+            // InternalCheck.g:2770:1: ( ( rule__TriggerKind__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2770:1: ( ( rule__TriggerKind__Alternatives ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2771:1: ( rule__TriggerKind__Alternatives )
+            // InternalCheck.g:2770:1: ( ( rule__TriggerKind__Alternatives ) )
+            // InternalCheck.g:2771:1: ( rule__TriggerKind__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTriggerKindAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2772:1: ( rule__TriggerKind__Alternatives )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2772:2: rule__TriggerKind__Alternatives
+            // InternalCheck.g:2772:1: ( rule__TriggerKind__Alternatives )
+            // InternalCheck.g:2772:2: rule__TriggerKind__Alternatives
             {
-            pushFollow(FOLLOW_rule__TriggerKind__Alternatives_in_ruleTriggerKind5836);
+            pushFollow(FOLLOW_2);
             rule__TriggerKind__Alternatives();
 
             state._fsp--;
@@ -8309,13 +8309,13 @@ public final void ruleTriggerKind() throws RecognitionException {
 
 
     // $ANTLR start "rule__CheckCatalog__Alternatives_9"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2783:1: rule__CheckCatalog__Alternatives_9 : ( ( ( rule__CheckCatalog__CategoriesAssignment_9_0 ) ) | ( ( rule__CheckCatalog__ImplementationsAssignment_9_1 ) ) | ( ( rule__CheckCatalog__ChecksAssignment_9_2 ) ) | ( ( rule__CheckCatalog__MembersAssignment_9_3 ) ) );
+    // InternalCheck.g:2783:1: rule__CheckCatalog__Alternatives_9 : ( ( ( rule__CheckCatalog__CategoriesAssignment_9_0 ) ) | ( ( rule__CheckCatalog__ImplementationsAssignment_9_1 ) ) | ( ( rule__CheckCatalog__ChecksAssignment_9_2 ) ) | ( ( rule__CheckCatalog__MembersAssignment_9_3 ) ) );
     public final void rule__CheckCatalog__Alternatives_9() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2787:1: ( ( ( rule__CheckCatalog__CategoriesAssignment_9_0 ) ) | ( ( rule__CheckCatalog__ImplementationsAssignment_9_1 ) ) | ( ( rule__CheckCatalog__ChecksAssignment_9_2 ) ) | ( ( rule__CheckCatalog__MembersAssignment_9_3 ) ) )
+            // InternalCheck.g:2787:1: ( ( ( rule__CheckCatalog__CategoriesAssignment_9_0 ) ) | ( ( rule__CheckCatalog__ImplementationsAssignment_9_1 ) ) | ( ( rule__CheckCatalog__ChecksAssignment_9_2 ) ) | ( ( rule__CheckCatalog__MembersAssignment_9_3 ) ) )
             int alt1=4;
             switch ( input.LA(1) ) {
             case 23:
@@ -8376,18 +8376,18 @@ else if ( (LA1_3==28) ) {
 
             switch (alt1) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2788:1: ( ( rule__CheckCatalog__CategoriesAssignment_9_0 ) )
+                    // InternalCheck.g:2788:1: ( ( rule__CheckCatalog__CategoriesAssignment_9_0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2788:1: ( ( rule__CheckCatalog__CategoriesAssignment_9_0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2789:1: ( rule__CheckCatalog__CategoriesAssignment_9_0 )
+                    // InternalCheck.g:2788:1: ( ( rule__CheckCatalog__CategoriesAssignment_9_0 ) )
+                    // InternalCheck.g:2789:1: ( rule__CheckCatalog__CategoriesAssignment_9_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getCheckCatalogAccess().getCategoriesAssignment_9_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2790:1: ( rule__CheckCatalog__CategoriesAssignment_9_0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2790:2: rule__CheckCatalog__CategoriesAssignment_9_0
+                    // InternalCheck.g:2790:1: ( rule__CheckCatalog__CategoriesAssignment_9_0 )
+                    // InternalCheck.g:2790:2: rule__CheckCatalog__CategoriesAssignment_9_0
                     {
-                    pushFollow(FOLLOW_rule__CheckCatalog__CategoriesAssignment_9_0_in_rule__CheckCatalog__Alternatives_95871);
+                    pushFollow(FOLLOW_2);
                     rule__CheckCatalog__CategoriesAssignment_9_0();
 
                     state._fsp--;
@@ -8405,18 +8405,18 @@ else if ( (LA1_3==28) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2794:6: ( ( rule__CheckCatalog__ImplementationsAssignment_9_1 ) )
+                    // InternalCheck.g:2794:6: ( ( rule__CheckCatalog__ImplementationsAssignment_9_1 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2794:6: ( ( rule__CheckCatalog__ImplementationsAssignment_9_1 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2795:1: ( rule__CheckCatalog__ImplementationsAssignment_9_1 )
+                    // InternalCheck.g:2794:6: ( ( rule__CheckCatalog__ImplementationsAssignment_9_1 ) )
+                    // InternalCheck.g:2795:1: ( rule__CheckCatalog__ImplementationsAssignment_9_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getCheckCatalogAccess().getImplementationsAssignment_9_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2796:1: ( rule__CheckCatalog__ImplementationsAssignment_9_1 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2796:2: rule__CheckCatalog__ImplementationsAssignment_9_1
+                    // InternalCheck.g:2796:1: ( rule__CheckCatalog__ImplementationsAssignment_9_1 )
+                    // InternalCheck.g:2796:2: rule__CheckCatalog__ImplementationsAssignment_9_1
                     {
-                    pushFollow(FOLLOW_rule__CheckCatalog__ImplementationsAssignment_9_1_in_rule__CheckCatalog__Alternatives_95889);
+                    pushFollow(FOLLOW_2);
                     rule__CheckCatalog__ImplementationsAssignment_9_1();
 
                     state._fsp--;
@@ -8434,18 +8434,18 @@ else if ( (LA1_3==28) ) {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2800:6: ( ( rule__CheckCatalog__ChecksAssignment_9_2 ) )
+                    // InternalCheck.g:2800:6: ( ( rule__CheckCatalog__ChecksAssignment_9_2 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2800:6: ( ( rule__CheckCatalog__ChecksAssignment_9_2 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2801:1: ( rule__CheckCatalog__ChecksAssignment_9_2 )
+                    // InternalCheck.g:2800:6: ( ( rule__CheckCatalog__ChecksAssignment_9_2 ) )
+                    // InternalCheck.g:2801:1: ( rule__CheckCatalog__ChecksAssignment_9_2 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getCheckCatalogAccess().getChecksAssignment_9_2()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2802:1: ( rule__CheckCatalog__ChecksAssignment_9_2 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2802:2: rule__CheckCatalog__ChecksAssignment_9_2
+                    // InternalCheck.g:2802:1: ( rule__CheckCatalog__ChecksAssignment_9_2 )
+                    // InternalCheck.g:2802:2: rule__CheckCatalog__ChecksAssignment_9_2
                     {
-                    pushFollow(FOLLOW_rule__CheckCatalog__ChecksAssignment_9_2_in_rule__CheckCatalog__Alternatives_95907);
+                    pushFollow(FOLLOW_2);
                     rule__CheckCatalog__ChecksAssignment_9_2();
 
                     state._fsp--;
@@ -8463,18 +8463,18 @@ else if ( (LA1_3==28) ) {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2806:6: ( ( rule__CheckCatalog__MembersAssignment_9_3 ) )
+                    // InternalCheck.g:2806:6: ( ( rule__CheckCatalog__MembersAssignment_9_3 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2806:6: ( ( rule__CheckCatalog__MembersAssignment_9_3 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2807:1: ( rule__CheckCatalog__MembersAssignment_9_3 )
+                    // InternalCheck.g:2806:6: ( ( rule__CheckCatalog__MembersAssignment_9_3 ) )
+                    // InternalCheck.g:2807:1: ( rule__CheckCatalog__MembersAssignment_9_3 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getCheckCatalogAccess().getMembersAssignment_9_3()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2808:1: ( rule__CheckCatalog__MembersAssignment_9_3 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2808:2: rule__CheckCatalog__MembersAssignment_9_3
+                    // InternalCheck.g:2808:1: ( rule__CheckCatalog__MembersAssignment_9_3 )
+                    // InternalCheck.g:2808:2: rule__CheckCatalog__MembersAssignment_9_3
                     {
-                    pushFollow(FOLLOW_rule__CheckCatalog__MembersAssignment_9_3_in_rule__CheckCatalog__Alternatives_95925);
+                    pushFollow(FOLLOW_2);
                     rule__CheckCatalog__MembersAssignment_9_3();
 
                     state._fsp--;
@@ -8509,29 +8509,29 @@ else if ( (LA1_3==28) ) {
 
 
     // $ANTLR start "rule__XImportDeclaration__Alternatives_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2817:1: rule__XImportDeclaration__Alternatives_1 : ( ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_0 ) ) | ( ( rule__XImportDeclaration__ImportedNamespaceAssignment_1_1 ) ) );
+    // InternalCheck.g:2817:1: rule__XImportDeclaration__Alternatives_1 : ( ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_0 ) ) | ( ( rule__XImportDeclaration__ImportedNamespaceAssignment_1_1 ) ) );
     public final void rule__XImportDeclaration__Alternatives_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2821:1: ( ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_0 ) ) | ( ( rule__XImportDeclaration__ImportedNamespaceAssignment_1_1 ) ) )
+            // InternalCheck.g:2821:1: ( ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_0 ) ) | ( ( rule__XImportDeclaration__ImportedNamespaceAssignment_1_1 ) ) )
             int alt2=2;
             alt2 = dfa2.predict(input);
             switch (alt2) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2822:1: ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_0 ) )
+                    // InternalCheck.g:2822:1: ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2822:1: ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2823:1: ( rule__XImportDeclaration__ImportedTypeAssignment_1_0 )
+                    // InternalCheck.g:2822:1: ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_0 ) )
+                    // InternalCheck.g:2823:1: ( rule__XImportDeclaration__ImportedTypeAssignment_1_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXImportDeclarationAccess().getImportedTypeAssignment_1_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2824:1: ( rule__XImportDeclaration__ImportedTypeAssignment_1_0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2824:2: rule__XImportDeclaration__ImportedTypeAssignment_1_0
+                    // InternalCheck.g:2824:1: ( rule__XImportDeclaration__ImportedTypeAssignment_1_0 )
+                    // InternalCheck.g:2824:2: rule__XImportDeclaration__ImportedTypeAssignment_1_0
                     {
-                    pushFollow(FOLLOW_rule__XImportDeclaration__ImportedTypeAssignment_1_0_in_rule__XImportDeclaration__Alternatives_15958);
+                    pushFollow(FOLLOW_2);
                     rule__XImportDeclaration__ImportedTypeAssignment_1_0();
 
                     state._fsp--;
@@ -8549,18 +8549,18 @@ public final void rule__XImportDeclaration__Alternatives_1() throws RecognitionE
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2828:6: ( ( rule__XImportDeclaration__ImportedNamespaceAssignment_1_1 ) )
+                    // InternalCheck.g:2828:6: ( ( rule__XImportDeclaration__ImportedNamespaceAssignment_1_1 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2828:6: ( ( rule__XImportDeclaration__ImportedNamespaceAssignment_1_1 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2829:1: ( rule__XImportDeclaration__ImportedNamespaceAssignment_1_1 )
+                    // InternalCheck.g:2828:6: ( ( rule__XImportDeclaration__ImportedNamespaceAssignment_1_1 ) )
+                    // InternalCheck.g:2829:1: ( rule__XImportDeclaration__ImportedNamespaceAssignment_1_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXImportDeclarationAccess().getImportedNamespaceAssignment_1_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2830:1: ( rule__XImportDeclaration__ImportedNamespaceAssignment_1_1 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2830:2: rule__XImportDeclaration__ImportedNamespaceAssignment_1_1
+                    // InternalCheck.g:2830:1: ( rule__XImportDeclaration__ImportedNamespaceAssignment_1_1 )
+                    // InternalCheck.g:2830:2: rule__XImportDeclaration__ImportedNamespaceAssignment_1_1
                     {
-                    pushFollow(FOLLOW_rule__XImportDeclaration__ImportedNamespaceAssignment_1_1_in_rule__XImportDeclaration__Alternatives_15976);
+                    pushFollow(FOLLOW_2);
                     rule__XImportDeclaration__ImportedNamespaceAssignment_1_1();
 
                     state._fsp--;
@@ -8595,13 +8595,13 @@ public final void rule__XImportDeclaration__Alternatives_1() throws RecognitionE
 
 
     // $ANTLR start "rule__Check__Alternatives_8"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2841:1: rule__Check__Alternatives_8 : ( ( ( rule__Check__Group_8_0__0 ) ) | ( ( rule__Check__ContextsAssignment_8_1 )? ) );
+    // InternalCheck.g:2841:1: rule__Check__Alternatives_8 : ( ( ( rule__Check__Group_8_0__0 ) ) | ( ( rule__Check__ContextsAssignment_8_1 )? ) );
     public final void rule__Check__Alternatives_8() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2845:1: ( ( ( rule__Check__Group_8_0__0 ) ) | ( ( rule__Check__ContextsAssignment_8_1 )? ) )
+            // InternalCheck.g:2845:1: ( ( ( rule__Check__Group_8_0__0 ) ) | ( ( rule__Check__ContextsAssignment_8_1 )? ) )
             int alt4=2;
             int LA4_0 = input.LA(1);
 
@@ -8620,18 +8620,18 @@ else if ( (LA4_0==EOF||LA4_0==RULE_ID||LA4_0==23||(LA4_0>=29 && LA4_0<=35)||LA4_
             }
             switch (alt4) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2846:1: ( ( rule__Check__Group_8_0__0 ) )
+                    // InternalCheck.g:2846:1: ( ( rule__Check__Group_8_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2846:1: ( ( rule__Check__Group_8_0__0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2847:1: ( rule__Check__Group_8_0__0 )
+                    // InternalCheck.g:2846:1: ( ( rule__Check__Group_8_0__0 ) )
+                    // InternalCheck.g:2847:1: ( rule__Check__Group_8_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getCheckAccess().getGroup_8_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2848:1: ( rule__Check__Group_8_0__0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2848:2: rule__Check__Group_8_0__0
+                    // InternalCheck.g:2848:1: ( rule__Check__Group_8_0__0 )
+                    // InternalCheck.g:2848:2: rule__Check__Group_8_0__0
                     {
-                    pushFollow(FOLLOW_rule__Check__Group_8_0__0_in_rule__Check__Alternatives_86011);
+                    pushFollow(FOLLOW_2);
                     rule__Check__Group_8_0__0();
 
                     state._fsp--;
@@ -8649,15 +8649,15 @@ else if ( (LA4_0==EOF||LA4_0==RULE_ID||LA4_0==23||(LA4_0>=29 && LA4_0<=35)||LA4_
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2852:6: ( ( rule__Check__ContextsAssignment_8_1 )? )
+                    // InternalCheck.g:2852:6: ( ( rule__Check__ContextsAssignment_8_1 )? )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2852:6: ( ( rule__Check__ContextsAssignment_8_1 )? )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2853:1: ( rule__Check__ContextsAssignment_8_1 )?
+                    // InternalCheck.g:2852:6: ( ( rule__Check__ContextsAssignment_8_1 )? )
+                    // InternalCheck.g:2853:1: ( rule__Check__ContextsAssignment_8_1 )?
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getCheckAccess().getContextsAssignment_8_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2854:1: ( rule__Check__ContextsAssignment_8_1 )?
+                    // InternalCheck.g:2854:1: ( rule__Check__ContextsAssignment_8_1 )?
                     int alt3=2;
                     int LA3_0 = input.LA(1);
 
@@ -8666,9 +8666,9 @@ else if ( (LA4_0==EOF||LA4_0==RULE_ID||LA4_0==23||(LA4_0>=29 && LA4_0<=35)||LA4_
                     }
                     switch (alt3) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2854:2: rule__Check__ContextsAssignment_8_1
+                            // InternalCheck.g:2854:2: rule__Check__ContextsAssignment_8_1
                             {
-                            pushFollow(FOLLOW_rule__Check__ContextsAssignment_8_1_in_rule__Check__Alternatives_86029);
+                            pushFollow(FOLLOW_2);
                             rule__Check__ContextsAssignment_8_1();
 
                             state._fsp--;
@@ -8706,13 +8706,13 @@ else if ( (LA4_0==EOF||LA4_0==RULE_ID||LA4_0==23||(LA4_0>=29 && LA4_0<=35)||LA4_
 
 
     // $ANTLR start "rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2863:1: rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives : ( ( ruleXBooleanLiteral ) | ( ruleXNumberLiteral ) | ( ruleXStringLiteral ) );
+    // InternalCheck.g:2863:1: rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives : ( ( ruleXBooleanLiteral ) | ( ruleXNumberLiteral ) | ( ruleXStringLiteral ) );
     public final void rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2867:1: ( ( ruleXBooleanLiteral ) | ( ruleXNumberLiteral ) | ( ruleXStringLiteral ) )
+            // InternalCheck.g:2867:1: ( ( ruleXBooleanLiteral ) | ( ruleXNumberLiteral ) | ( ruleXStringLiteral ) )
             int alt5=3;
             switch ( input.LA(1) ) {
             case 66:
@@ -8743,15 +8743,15 @@ public final void rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives(
 
             switch (alt5) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2868:1: ( ruleXBooleanLiteral )
+                    // InternalCheck.g:2868:1: ( ruleXBooleanLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2868:1: ( ruleXBooleanLiteral )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2869:1: ruleXBooleanLiteral
+                    // InternalCheck.g:2868:1: ( ruleXBooleanLiteral )
+                    // InternalCheck.g:2869:1: ruleXBooleanLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXSimpleFormalParameterDefaultValueLiteralAccess().getXBooleanLiteralParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleXBooleanLiteral_in_rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives6063);
+                    pushFollow(FOLLOW_2);
                     ruleXBooleanLiteral();
 
                     state._fsp--;
@@ -8766,15 +8766,15 @@ public final void rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives(
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2874:6: ( ruleXNumberLiteral )
+                    // InternalCheck.g:2874:6: ( ruleXNumberLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2874:6: ( ruleXNumberLiteral )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2875:1: ruleXNumberLiteral
+                    // InternalCheck.g:2874:6: ( ruleXNumberLiteral )
+                    // InternalCheck.g:2875:1: ruleXNumberLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXSimpleFormalParameterDefaultValueLiteralAccess().getXNumberLiteralParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleXNumberLiteral_in_rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives6080);
+                    pushFollow(FOLLOW_2);
                     ruleXNumberLiteral();
 
                     state._fsp--;
@@ -8789,15 +8789,15 @@ public final void rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives(
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2880:6: ( ruleXStringLiteral )
+                    // InternalCheck.g:2880:6: ( ruleXStringLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2880:6: ( ruleXStringLiteral )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2881:1: ruleXStringLiteral
+                    // InternalCheck.g:2880:6: ( ruleXStringLiteral )
+                    // InternalCheck.g:2881:1: ruleXStringLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXSimpleFormalParameterDefaultValueLiteralAccess().getXStringLiteralParserRuleCall_2()); 
                     }
-                    pushFollow(FOLLOW_ruleXStringLiteral_in_rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives6097);
+                    pushFollow(FOLLOW_2);
                     ruleXStringLiteral();
 
                     state._fsp--;
@@ -8829,13 +8829,13 @@ public final void rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives(
 
 
     // $ANTLR start "rule__XConstantUnaryOperation__Alternatives"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2891:1: rule__XConstantUnaryOperation__Alternatives : ( ( ( rule__XConstantUnaryOperation__Group_0__0 ) ) | ( ruleXSimpleFormalParameterDefaultValueLiteral ) );
+    // InternalCheck.g:2891:1: rule__XConstantUnaryOperation__Alternatives : ( ( ( rule__XConstantUnaryOperation__Group_0__0 ) ) | ( ruleXSimpleFormalParameterDefaultValueLiteral ) );
     public final void rule__XConstantUnaryOperation__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2895:1: ( ( ( rule__XConstantUnaryOperation__Group_0__0 ) ) | ( ruleXSimpleFormalParameterDefaultValueLiteral ) )
+            // InternalCheck.g:2895:1: ( ( ( rule__XConstantUnaryOperation__Group_0__0 ) ) | ( ruleXSimpleFormalParameterDefaultValueLiteral ) )
             int alt6=2;
             int LA6_0 = input.LA(1);
 
@@ -8854,18 +8854,18 @@ else if ( ((LA6_0>=RULE_HEX && LA6_0<=RULE_STRING)||LA6_0==66||LA6_0==108) ) {
             }
             switch (alt6) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2896:1: ( ( rule__XConstantUnaryOperation__Group_0__0 ) )
+                    // InternalCheck.g:2896:1: ( ( rule__XConstantUnaryOperation__Group_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2896:1: ( ( rule__XConstantUnaryOperation__Group_0__0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2897:1: ( rule__XConstantUnaryOperation__Group_0__0 )
+                    // InternalCheck.g:2896:1: ( ( rule__XConstantUnaryOperation__Group_0__0 ) )
+                    // InternalCheck.g:2897:1: ( rule__XConstantUnaryOperation__Group_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXConstantUnaryOperationAccess().getGroup_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2898:1: ( rule__XConstantUnaryOperation__Group_0__0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2898:2: rule__XConstantUnaryOperation__Group_0__0
+                    // InternalCheck.g:2898:1: ( rule__XConstantUnaryOperation__Group_0__0 )
+                    // InternalCheck.g:2898:2: rule__XConstantUnaryOperation__Group_0__0
                     {
-                    pushFollow(FOLLOW_rule__XConstantUnaryOperation__Group_0__0_in_rule__XConstantUnaryOperation__Alternatives6129);
+                    pushFollow(FOLLOW_2);
                     rule__XConstantUnaryOperation__Group_0__0();
 
                     state._fsp--;
@@ -8883,15 +8883,15 @@ else if ( ((LA6_0>=RULE_HEX && LA6_0<=RULE_STRING)||LA6_0==66||LA6_0==108) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2902:6: ( ruleXSimpleFormalParameterDefaultValueLiteral )
+                    // InternalCheck.g:2902:6: ( ruleXSimpleFormalParameterDefaultValueLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2902:6: ( ruleXSimpleFormalParameterDefaultValueLiteral )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2903:1: ruleXSimpleFormalParameterDefaultValueLiteral
+                    // InternalCheck.g:2902:6: ( ruleXSimpleFormalParameterDefaultValueLiteral )
+                    // InternalCheck.g:2903:1: ruleXSimpleFormalParameterDefaultValueLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXConstantUnaryOperationAccess().getXSimpleFormalParameterDefaultValueLiteralParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleXSimpleFormalParameterDefaultValueLiteral_in_rule__XConstantUnaryOperation__Alternatives6147);
+                    pushFollow(FOLLOW_2);
                     ruleXSimpleFormalParameterDefaultValueLiteral();
 
                     state._fsp--;
@@ -8923,13 +8923,13 @@ else if ( ((LA6_0>=RULE_HEX && LA6_0<=RULE_STRING)||LA6_0==66||LA6_0==108) ) {
 
 
     // $ANTLR start "rule__XFormalParameterDefaultValueLiteral__Alternatives"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2913:1: rule__XFormalParameterDefaultValueLiteral__Alternatives : ( ( ruleXConstantUnaryOperation ) | ( ruleXConstantListLiteral ) );
+    // InternalCheck.g:2913:1: rule__XFormalParameterDefaultValueLiteral__Alternatives : ( ( ruleXConstantUnaryOperation ) | ( ruleXConstantListLiteral ) );
     public final void rule__XFormalParameterDefaultValueLiteral__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2917:1: ( ( ruleXConstantUnaryOperation ) | ( ruleXConstantListLiteral ) )
+            // InternalCheck.g:2917:1: ( ( ruleXConstantUnaryOperation ) | ( ruleXConstantListLiteral ) )
             int alt7=2;
             int LA7_0 = input.LA(1);
 
@@ -8948,15 +8948,15 @@ else if ( (LA7_0==77) ) {
             }
             switch (alt7) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2918:1: ( ruleXConstantUnaryOperation )
+                    // InternalCheck.g:2918:1: ( ruleXConstantUnaryOperation )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2918:1: ( ruleXConstantUnaryOperation )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2919:1: ruleXConstantUnaryOperation
+                    // InternalCheck.g:2918:1: ( ruleXConstantUnaryOperation )
+                    // InternalCheck.g:2919:1: ruleXConstantUnaryOperation
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXFormalParameterDefaultValueLiteralAccess().getXConstantUnaryOperationParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleXConstantUnaryOperation_in_rule__XFormalParameterDefaultValueLiteral__Alternatives6179);
+                    pushFollow(FOLLOW_2);
                     ruleXConstantUnaryOperation();
 
                     state._fsp--;
@@ -8971,15 +8971,15 @@ else if ( (LA7_0==77) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2924:6: ( ruleXConstantListLiteral )
+                    // InternalCheck.g:2924:6: ( ruleXConstantListLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2924:6: ( ruleXConstantListLiteral )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2925:1: ruleXConstantListLiteral
+                    // InternalCheck.g:2924:6: ( ruleXConstantListLiteral )
+                    // InternalCheck.g:2925:1: ruleXConstantListLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXFormalParameterDefaultValueLiteralAccess().getXConstantListLiteralParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleXConstantListLiteral_in_rule__XFormalParameterDefaultValueLiteral__Alternatives6196);
+                    pushFollow(FOLLOW_2);
                     ruleXConstantListLiteral();
 
                     state._fsp--;
@@ -9011,13 +9011,13 @@ else if ( (LA7_0==77) ) {
 
 
     // $ANTLR start "rule__XIssueExpression__Alternatives_3_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2935:1: rule__XIssueExpression__Alternatives_3_1 : ( ( ( rule__XIssueExpression__Group_3_1_0__0 ) ) | ( ( rule__XIssueExpression__Group_3_1_1__0 ) ) );
+    // InternalCheck.g:2935:1: rule__XIssueExpression__Alternatives_3_1 : ( ( ( rule__XIssueExpression__Group_3_1_0__0 ) ) | ( ( rule__XIssueExpression__Group_3_1_1__0 ) ) );
     public final void rule__XIssueExpression__Alternatives_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2939:1: ( ( ( rule__XIssueExpression__Group_3_1_0__0 ) ) | ( ( rule__XIssueExpression__Group_3_1_1__0 ) ) )
+            // InternalCheck.g:2939:1: ( ( ( rule__XIssueExpression__Group_3_1_0__0 ) ) | ( ( rule__XIssueExpression__Group_3_1_1__0 ) ) )
             int alt8=2;
             int LA8_0 = input.LA(1);
 
@@ -9050,18 +9050,18 @@ else if ( ((LA8_0>=RULE_ID && LA8_0<=RULE_STRING)||(LA8_0>=16 && LA8_0<=35)||LA8
             }
             switch (alt8) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2940:1: ( ( rule__XIssueExpression__Group_3_1_0__0 ) )
+                    // InternalCheck.g:2940:1: ( ( rule__XIssueExpression__Group_3_1_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2940:1: ( ( rule__XIssueExpression__Group_3_1_0__0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2941:1: ( rule__XIssueExpression__Group_3_1_0__0 )
+                    // InternalCheck.g:2940:1: ( ( rule__XIssueExpression__Group_3_1_0__0 ) )
+                    // InternalCheck.g:2941:1: ( rule__XIssueExpression__Group_3_1_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXIssueExpressionAccess().getGroup_3_1_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2942:1: ( rule__XIssueExpression__Group_3_1_0__0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2942:2: rule__XIssueExpression__Group_3_1_0__0
+                    // InternalCheck.g:2942:1: ( rule__XIssueExpression__Group_3_1_0__0 )
+                    // InternalCheck.g:2942:2: rule__XIssueExpression__Group_3_1_0__0
                     {
-                    pushFollow(FOLLOW_rule__XIssueExpression__Group_3_1_0__0_in_rule__XIssueExpression__Alternatives_3_16228);
+                    pushFollow(FOLLOW_2);
                     rule__XIssueExpression__Group_3_1_0__0();
 
                     state._fsp--;
@@ -9079,18 +9079,18 @@ else if ( ((LA8_0>=RULE_ID && LA8_0<=RULE_STRING)||(LA8_0>=16 && LA8_0<=35)||LA8
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2946:6: ( ( rule__XIssueExpression__Group_3_1_1__0 ) )
+                    // InternalCheck.g:2946:6: ( ( rule__XIssueExpression__Group_3_1_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2946:6: ( ( rule__XIssueExpression__Group_3_1_1__0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2947:1: ( rule__XIssueExpression__Group_3_1_1__0 )
+                    // InternalCheck.g:2946:6: ( ( rule__XIssueExpression__Group_3_1_1__0 ) )
+                    // InternalCheck.g:2947:1: ( rule__XIssueExpression__Group_3_1_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXIssueExpressionAccess().getGroup_3_1_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2948:1: ( rule__XIssueExpression__Group_3_1_1__0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2948:2: rule__XIssueExpression__Group_3_1_1__0
+                    // InternalCheck.g:2948:1: ( rule__XIssueExpression__Group_3_1_1__0 )
+                    // InternalCheck.g:2948:2: rule__XIssueExpression__Group_3_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__XIssueExpression__Group_3_1_1__0_in_rule__XIssueExpression__Alternatives_3_16246);
+                    pushFollow(FOLLOW_2);
                     rule__XIssueExpression__Group_3_1_1__0();
 
                     state._fsp--;
@@ -9125,26 +9125,26 @@ else if ( ((LA8_0>=RULE_ID && LA8_0<=RULE_STRING)||(LA8_0>=16 && LA8_0<=35)||LA8
 
 
     // $ANTLR start "rule__XPrimaryExpression__Alternatives"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2957:1: rule__XPrimaryExpression__Alternatives : ( ( ruleXConstructorCall ) | ( ruleXBlockExpression ) | ( ruleXSwitchExpression ) | ( ( ruleXSynchronizedExpression ) ) | ( ruleXFeatureCall ) | ( ruleXLiteral ) | ( ruleXIfExpression ) | ( ( ruleXForLoopExpression ) ) | ( ruleXBasicForLoopExpression ) | ( ruleXWhileExpression ) | ( ruleXDoWhileExpression ) | ( ruleXThrowExpression ) | ( ruleXReturnExpression ) | ( ruleXTryCatchFinallyExpression ) | ( ruleXParenthesizedExpression ) | ( ruleXGuardExpression ) | ( ruleXIssueExpression ) );
+    // InternalCheck.g:2957:1: rule__XPrimaryExpression__Alternatives : ( ( ruleXConstructorCall ) | ( ruleXBlockExpression ) | ( ruleXSwitchExpression ) | ( ( ruleXSynchronizedExpression ) ) | ( ruleXFeatureCall ) | ( ruleXLiteral ) | ( ruleXIfExpression ) | ( ( ruleXForLoopExpression ) ) | ( ruleXBasicForLoopExpression ) | ( ruleXWhileExpression ) | ( ruleXDoWhileExpression ) | ( ruleXThrowExpression ) | ( ruleXReturnExpression ) | ( ruleXTryCatchFinallyExpression ) | ( ruleXParenthesizedExpression ) | ( ruleXGuardExpression ) | ( ruleXIssueExpression ) );
     public final void rule__XPrimaryExpression__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2961:1: ( ( ruleXConstructorCall ) | ( ruleXBlockExpression ) | ( ruleXSwitchExpression ) | ( ( ruleXSynchronizedExpression ) ) | ( ruleXFeatureCall ) | ( ruleXLiteral ) | ( ruleXIfExpression ) | ( ( ruleXForLoopExpression ) ) | ( ruleXBasicForLoopExpression ) | ( ruleXWhileExpression ) | ( ruleXDoWhileExpression ) | ( ruleXThrowExpression ) | ( ruleXReturnExpression ) | ( ruleXTryCatchFinallyExpression ) | ( ruleXParenthesizedExpression ) | ( ruleXGuardExpression ) | ( ruleXIssueExpression ) )
+            // InternalCheck.g:2961:1: ( ( ruleXConstructorCall ) | ( ruleXBlockExpression ) | ( ruleXSwitchExpression ) | ( ( ruleXSynchronizedExpression ) ) | ( ruleXFeatureCall ) | ( ruleXLiteral ) | ( ruleXIfExpression ) | ( ( ruleXForLoopExpression ) ) | ( ruleXBasicForLoopExpression ) | ( ruleXWhileExpression ) | ( ruleXDoWhileExpression ) | ( ruleXThrowExpression ) | ( ruleXReturnExpression ) | ( ruleXTryCatchFinallyExpression ) | ( ruleXParenthesizedExpression ) | ( ruleXGuardExpression ) | ( ruleXIssueExpression ) )
             int alt9=17;
             alt9 = dfa9.predict(input);
             switch (alt9) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2962:1: ( ruleXConstructorCall )
+                    // InternalCheck.g:2962:1: ( ruleXConstructorCall )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2962:1: ( ruleXConstructorCall )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2963:1: ruleXConstructorCall
+                    // InternalCheck.g:2962:1: ( ruleXConstructorCall )
+                    // InternalCheck.g:2963:1: ruleXConstructorCall
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXConstructorCallParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleXConstructorCall_in_rule__XPrimaryExpression__Alternatives6279);
+                    pushFollow(FOLLOW_2);
                     ruleXConstructorCall();
 
                     state._fsp--;
@@ -9159,15 +9159,15 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2968:6: ( ruleXBlockExpression )
+                    // InternalCheck.g:2968:6: ( ruleXBlockExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2968:6: ( ruleXBlockExpression )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2969:1: ruleXBlockExpression
+                    // InternalCheck.g:2968:6: ( ruleXBlockExpression )
+                    // InternalCheck.g:2969:1: ruleXBlockExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXBlockExpressionParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleXBlockExpression_in_rule__XPrimaryExpression__Alternatives6296);
+                    pushFollow(FOLLOW_2);
                     ruleXBlockExpression();
 
                     state._fsp--;
@@ -9182,15 +9182,15 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2974:6: ( ruleXSwitchExpression )
+                    // InternalCheck.g:2974:6: ( ruleXSwitchExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2974:6: ( ruleXSwitchExpression )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2975:1: ruleXSwitchExpression
+                    // InternalCheck.g:2974:6: ( ruleXSwitchExpression )
+                    // InternalCheck.g:2975:1: ruleXSwitchExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXSwitchExpressionParserRuleCall_2()); 
                     }
-                    pushFollow(FOLLOW_ruleXSwitchExpression_in_rule__XPrimaryExpression__Alternatives6313);
+                    pushFollow(FOLLOW_2);
                     ruleXSwitchExpression();
 
                     state._fsp--;
@@ -9205,18 +9205,18 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2980:6: ( ( ruleXSynchronizedExpression ) )
+                    // InternalCheck.g:2980:6: ( ( ruleXSynchronizedExpression ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2980:6: ( ( ruleXSynchronizedExpression ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2981:1: ( ruleXSynchronizedExpression )
+                    // InternalCheck.g:2980:6: ( ( ruleXSynchronizedExpression ) )
+                    // InternalCheck.g:2981:1: ( ruleXSynchronizedExpression )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXSynchronizedExpressionParserRuleCall_3()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2982:1: ( ruleXSynchronizedExpression )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2982:3: ruleXSynchronizedExpression
+                    // InternalCheck.g:2982:1: ( ruleXSynchronizedExpression )
+                    // InternalCheck.g:2982:3: ruleXSynchronizedExpression
                     {
-                    pushFollow(FOLLOW_ruleXSynchronizedExpression_in_rule__XPrimaryExpression__Alternatives6331);
+                    pushFollow(FOLLOW_2);
                     ruleXSynchronizedExpression();
 
                     state._fsp--;
@@ -9234,15 +9234,15 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2986:6: ( ruleXFeatureCall )
+                    // InternalCheck.g:2986:6: ( ruleXFeatureCall )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2986:6: ( ruleXFeatureCall )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2987:1: ruleXFeatureCall
+                    // InternalCheck.g:2986:6: ( ruleXFeatureCall )
+                    // InternalCheck.g:2987:1: ruleXFeatureCall
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXFeatureCallParserRuleCall_4()); 
                     }
-                    pushFollow(FOLLOW_ruleXFeatureCall_in_rule__XPrimaryExpression__Alternatives6349);
+                    pushFollow(FOLLOW_2);
                     ruleXFeatureCall();
 
                     state._fsp--;
@@ -9257,15 +9257,15 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2992:6: ( ruleXLiteral )
+                    // InternalCheck.g:2992:6: ( ruleXLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2992:6: ( ruleXLiteral )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2993:1: ruleXLiteral
+                    // InternalCheck.g:2992:6: ( ruleXLiteral )
+                    // InternalCheck.g:2993:1: ruleXLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXLiteralParserRuleCall_5()); 
                     }
-                    pushFollow(FOLLOW_ruleXLiteral_in_rule__XPrimaryExpression__Alternatives6366);
+                    pushFollow(FOLLOW_2);
                     ruleXLiteral();
 
                     state._fsp--;
@@ -9280,15 +9280,15 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2998:6: ( ruleXIfExpression )
+                    // InternalCheck.g:2998:6: ( ruleXIfExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2998:6: ( ruleXIfExpression )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:2999:1: ruleXIfExpression
+                    // InternalCheck.g:2998:6: ( ruleXIfExpression )
+                    // InternalCheck.g:2999:1: ruleXIfExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXIfExpressionParserRuleCall_6()); 
                     }
-                    pushFollow(FOLLOW_ruleXIfExpression_in_rule__XPrimaryExpression__Alternatives6383);
+                    pushFollow(FOLLOW_2);
                     ruleXIfExpression();
 
                     state._fsp--;
@@ -9303,18 +9303,18 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 8 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3004:6: ( ( ruleXForLoopExpression ) )
+                    // InternalCheck.g:3004:6: ( ( ruleXForLoopExpression ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3004:6: ( ( ruleXForLoopExpression ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3005:1: ( ruleXForLoopExpression )
+                    // InternalCheck.g:3004:6: ( ( ruleXForLoopExpression ) )
+                    // InternalCheck.g:3005:1: ( ruleXForLoopExpression )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXForLoopExpressionParserRuleCall_7()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3006:1: ( ruleXForLoopExpression )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3006:3: ruleXForLoopExpression
+                    // InternalCheck.g:3006:1: ( ruleXForLoopExpression )
+                    // InternalCheck.g:3006:3: ruleXForLoopExpression
                     {
-                    pushFollow(FOLLOW_ruleXForLoopExpression_in_rule__XPrimaryExpression__Alternatives6401);
+                    pushFollow(FOLLOW_2);
                     ruleXForLoopExpression();
 
                     state._fsp--;
@@ -9332,15 +9332,15 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 9 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3010:6: ( ruleXBasicForLoopExpression )
+                    // InternalCheck.g:3010:6: ( ruleXBasicForLoopExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3010:6: ( ruleXBasicForLoopExpression )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3011:1: ruleXBasicForLoopExpression
+                    // InternalCheck.g:3010:6: ( ruleXBasicForLoopExpression )
+                    // InternalCheck.g:3011:1: ruleXBasicForLoopExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXBasicForLoopExpressionParserRuleCall_8()); 
                     }
-                    pushFollow(FOLLOW_ruleXBasicForLoopExpression_in_rule__XPrimaryExpression__Alternatives6419);
+                    pushFollow(FOLLOW_2);
                     ruleXBasicForLoopExpression();
 
                     state._fsp--;
@@ -9355,15 +9355,15 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 10 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3016:6: ( ruleXWhileExpression )
+                    // InternalCheck.g:3016:6: ( ruleXWhileExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3016:6: ( ruleXWhileExpression )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3017:1: ruleXWhileExpression
+                    // InternalCheck.g:3016:6: ( ruleXWhileExpression )
+                    // InternalCheck.g:3017:1: ruleXWhileExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXWhileExpressionParserRuleCall_9()); 
                     }
-                    pushFollow(FOLLOW_ruleXWhileExpression_in_rule__XPrimaryExpression__Alternatives6436);
+                    pushFollow(FOLLOW_2);
                     ruleXWhileExpression();
 
                     state._fsp--;
@@ -9378,15 +9378,15 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 11 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3022:6: ( ruleXDoWhileExpression )
+                    // InternalCheck.g:3022:6: ( ruleXDoWhileExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3022:6: ( ruleXDoWhileExpression )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3023:1: ruleXDoWhileExpression
+                    // InternalCheck.g:3022:6: ( ruleXDoWhileExpression )
+                    // InternalCheck.g:3023:1: ruleXDoWhileExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXDoWhileExpressionParserRuleCall_10()); 
                     }
-                    pushFollow(FOLLOW_ruleXDoWhileExpression_in_rule__XPrimaryExpression__Alternatives6453);
+                    pushFollow(FOLLOW_2);
                     ruleXDoWhileExpression();
 
                     state._fsp--;
@@ -9401,15 +9401,15 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 12 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3028:6: ( ruleXThrowExpression )
+                    // InternalCheck.g:3028:6: ( ruleXThrowExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3028:6: ( ruleXThrowExpression )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3029:1: ruleXThrowExpression
+                    // InternalCheck.g:3028:6: ( ruleXThrowExpression )
+                    // InternalCheck.g:3029:1: ruleXThrowExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXThrowExpressionParserRuleCall_11()); 
                     }
-                    pushFollow(FOLLOW_ruleXThrowExpression_in_rule__XPrimaryExpression__Alternatives6470);
+                    pushFollow(FOLLOW_2);
                     ruleXThrowExpression();
 
                     state._fsp--;
@@ -9424,15 +9424,15 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 13 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3034:6: ( ruleXReturnExpression )
+                    // InternalCheck.g:3034:6: ( ruleXReturnExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3034:6: ( ruleXReturnExpression )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3035:1: ruleXReturnExpression
+                    // InternalCheck.g:3034:6: ( ruleXReturnExpression )
+                    // InternalCheck.g:3035:1: ruleXReturnExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXReturnExpressionParserRuleCall_12()); 
                     }
-                    pushFollow(FOLLOW_ruleXReturnExpression_in_rule__XPrimaryExpression__Alternatives6487);
+                    pushFollow(FOLLOW_2);
                     ruleXReturnExpression();
 
                     state._fsp--;
@@ -9447,15 +9447,15 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 14 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3040:6: ( ruleXTryCatchFinallyExpression )
+                    // InternalCheck.g:3040:6: ( ruleXTryCatchFinallyExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3040:6: ( ruleXTryCatchFinallyExpression )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3041:1: ruleXTryCatchFinallyExpression
+                    // InternalCheck.g:3040:6: ( ruleXTryCatchFinallyExpression )
+                    // InternalCheck.g:3041:1: ruleXTryCatchFinallyExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXTryCatchFinallyExpressionParserRuleCall_13()); 
                     }
-                    pushFollow(FOLLOW_ruleXTryCatchFinallyExpression_in_rule__XPrimaryExpression__Alternatives6504);
+                    pushFollow(FOLLOW_2);
                     ruleXTryCatchFinallyExpression();
 
                     state._fsp--;
@@ -9470,15 +9470,15 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 15 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3046:6: ( ruleXParenthesizedExpression )
+                    // InternalCheck.g:3046:6: ( ruleXParenthesizedExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3046:6: ( ruleXParenthesizedExpression )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3047:1: ruleXParenthesizedExpression
+                    // InternalCheck.g:3046:6: ( ruleXParenthesizedExpression )
+                    // InternalCheck.g:3047:1: ruleXParenthesizedExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXParenthesizedExpressionParserRuleCall_14()); 
                     }
-                    pushFollow(FOLLOW_ruleXParenthesizedExpression_in_rule__XPrimaryExpression__Alternatives6521);
+                    pushFollow(FOLLOW_2);
                     ruleXParenthesizedExpression();
 
                     state._fsp--;
@@ -9493,15 +9493,15 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 16 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3052:6: ( ruleXGuardExpression )
+                    // InternalCheck.g:3052:6: ( ruleXGuardExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3052:6: ( ruleXGuardExpression )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3053:1: ruleXGuardExpression
+                    // InternalCheck.g:3052:6: ( ruleXGuardExpression )
+                    // InternalCheck.g:3053:1: ruleXGuardExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXGuardExpressionParserRuleCall_15()); 
                     }
-                    pushFollow(FOLLOW_ruleXGuardExpression_in_rule__XPrimaryExpression__Alternatives6538);
+                    pushFollow(FOLLOW_2);
                     ruleXGuardExpression();
 
                     state._fsp--;
@@ -9516,15 +9516,15 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 17 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3058:6: ( ruleXIssueExpression )
+                    // InternalCheck.g:3058:6: ( ruleXIssueExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3058:6: ( ruleXIssueExpression )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3059:1: ruleXIssueExpression
+                    // InternalCheck.g:3058:6: ( ruleXIssueExpression )
+                    // InternalCheck.g:3059:1: ruleXIssueExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXIssueExpressionParserRuleCall_16()); 
                     }
-                    pushFollow(FOLLOW_ruleXIssueExpression_in_rule__XPrimaryExpression__Alternatives6555);
+                    pushFollow(FOLLOW_2);
                     ruleXIssueExpression();
 
                     state._fsp--;
@@ -9556,13 +9556,13 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
 
 
     // $ANTLR start "rule__FeatureCallID__Alternatives"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3069:1: rule__FeatureCallID__Alternatives : ( ( ruleValidID ) | ( 'extends' ) | ( 'static' ) | ( 'import' ) | ( 'extension' ) | ( 'catalog' ) | ( 'grammar' ) | ( 'with' ) | ( 'category' ) | ( 'message' ) | ( 'on' ) | ( 'bind' ) | ( 'data' ) | ( 'SeverityRange' ) | ( 'error' ) | ( 'warning' ) | ( 'info' ) | ( 'ignore' ) | ( 'live' ) | ( 'onSave' ) | ( 'onDemand' ) );
+    // InternalCheck.g:3069:1: rule__FeatureCallID__Alternatives : ( ( ruleValidID ) | ( 'extends' ) | ( 'static' ) | ( 'import' ) | ( 'extension' ) | ( 'catalog' ) | ( 'grammar' ) | ( 'with' ) | ( 'category' ) | ( 'message' ) | ( 'on' ) | ( 'bind' ) | ( 'data' ) | ( 'SeverityRange' ) | ( 'error' ) | ( 'warning' ) | ( 'info' ) | ( 'ignore' ) | ( 'live' ) | ( 'onSave' ) | ( 'onDemand' ) );
     public final void rule__FeatureCallID__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3073:1: ( ( ruleValidID ) | ( 'extends' ) | ( 'static' ) | ( 'import' ) | ( 'extension' ) | ( 'catalog' ) | ( 'grammar' ) | ( 'with' ) | ( 'category' ) | ( 'message' ) | ( 'on' ) | ( 'bind' ) | ( 'data' ) | ( 'SeverityRange' ) | ( 'error' ) | ( 'warning' ) | ( 'info' ) | ( 'ignore' ) | ( 'live' ) | ( 'onSave' ) | ( 'onDemand' ) )
+            // InternalCheck.g:3073:1: ( ( ruleValidID ) | ( 'extends' ) | ( 'static' ) | ( 'import' ) | ( 'extension' ) | ( 'catalog' ) | ( 'grammar' ) | ( 'with' ) | ( 'category' ) | ( 'message' ) | ( 'on' ) | ( 'bind' ) | ( 'data' ) | ( 'SeverityRange' ) | ( 'error' ) | ( 'warning' ) | ( 'info' ) | ( 'ignore' ) | ( 'live' ) | ( 'onSave' ) | ( 'onDemand' ) )
             int alt10=21;
             switch ( input.LA(1) ) {
             case RULE_ID:
@@ -9680,15 +9680,15 @@ public final void rule__FeatureCallID__Alternatives() throws RecognitionExceptio
 
             switch (alt10) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3074:1: ( ruleValidID )
+                    // InternalCheck.g:3074:1: ( ruleValidID )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3074:1: ( ruleValidID )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3075:1: ruleValidID
+                    // InternalCheck.g:3074:1: ( ruleValidID )
+                    // InternalCheck.g:3075:1: ruleValidID
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallIDAccess().getValidIDParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleValidID_in_rule__FeatureCallID__Alternatives6587);
+                    pushFollow(FOLLOW_2);
                     ruleValidID();
 
                     state._fsp--;
@@ -9703,15 +9703,15 @@ public final void rule__FeatureCallID__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3080:6: ( 'extends' )
+                    // InternalCheck.g:3080:6: ( 'extends' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3080:6: ( 'extends' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3081:1: 'extends'
+                    // InternalCheck.g:3080:6: ( 'extends' )
+                    // InternalCheck.g:3081:1: 'extends'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallIDAccess().getExtendsKeyword_1()); 
                     }
-                    match(input,16,FOLLOW_16_in_rule__FeatureCallID__Alternatives6605); if (state.failed) return ;
+                    match(input,16,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getFeatureCallIDAccess().getExtendsKeyword_1()); 
                     }
@@ -9722,15 +9722,15 @@ public final void rule__FeatureCallID__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3088:6: ( 'static' )
+                    // InternalCheck.g:3088:6: ( 'static' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3088:6: ( 'static' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3089:1: 'static'
+                    // InternalCheck.g:3088:6: ( 'static' )
+                    // InternalCheck.g:3089:1: 'static'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallIDAccess().getStaticKeyword_2()); 
                     }
-                    match(input,17,FOLLOW_17_in_rule__FeatureCallID__Alternatives6625); if (state.failed) return ;
+                    match(input,17,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getFeatureCallIDAccess().getStaticKeyword_2()); 
                     }
@@ -9741,15 +9741,15 @@ public final void rule__FeatureCallID__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3096:6: ( 'import' )
+                    // InternalCheck.g:3096:6: ( 'import' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3096:6: ( 'import' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3097:1: 'import'
+                    // InternalCheck.g:3096:6: ( 'import' )
+                    // InternalCheck.g:3097:1: 'import'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallIDAccess().getImportKeyword_3()); 
                     }
-                    match(input,18,FOLLOW_18_in_rule__FeatureCallID__Alternatives6645); if (state.failed) return ;
+                    match(input,18,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getFeatureCallIDAccess().getImportKeyword_3()); 
                     }
@@ -9760,15 +9760,15 @@ public final void rule__FeatureCallID__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3104:6: ( 'extension' )
+                    // InternalCheck.g:3104:6: ( 'extension' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3104:6: ( 'extension' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3105:1: 'extension'
+                    // InternalCheck.g:3104:6: ( 'extension' )
+                    // InternalCheck.g:3105:1: 'extension'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallIDAccess().getExtensionKeyword_4()); 
                     }
-                    match(input,19,FOLLOW_19_in_rule__FeatureCallID__Alternatives6665); if (state.failed) return ;
+                    match(input,19,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getFeatureCallIDAccess().getExtensionKeyword_4()); 
                     }
@@ -9779,15 +9779,15 @@ public final void rule__FeatureCallID__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3112:6: ( 'catalog' )
+                    // InternalCheck.g:3112:6: ( 'catalog' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3112:6: ( 'catalog' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3113:1: 'catalog'
+                    // InternalCheck.g:3112:6: ( 'catalog' )
+                    // InternalCheck.g:3113:1: 'catalog'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallIDAccess().getCatalogKeyword_5()); 
                     }
-                    match(input,20,FOLLOW_20_in_rule__FeatureCallID__Alternatives6685); if (state.failed) return ;
+                    match(input,20,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getFeatureCallIDAccess().getCatalogKeyword_5()); 
                     }
@@ -9798,15 +9798,15 @@ public final void rule__FeatureCallID__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3120:6: ( 'grammar' )
+                    // InternalCheck.g:3120:6: ( 'grammar' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3120:6: ( 'grammar' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3121:1: 'grammar'
+                    // InternalCheck.g:3120:6: ( 'grammar' )
+                    // InternalCheck.g:3121:1: 'grammar'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallIDAccess().getGrammarKeyword_6()); 
                     }
-                    match(input,21,FOLLOW_21_in_rule__FeatureCallID__Alternatives6705); if (state.failed) return ;
+                    match(input,21,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getFeatureCallIDAccess().getGrammarKeyword_6()); 
                     }
@@ -9817,15 +9817,15 @@ public final void rule__FeatureCallID__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 8 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3128:6: ( 'with' )
+                    // InternalCheck.g:3128:6: ( 'with' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3128:6: ( 'with' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3129:1: 'with'
+                    // InternalCheck.g:3128:6: ( 'with' )
+                    // InternalCheck.g:3129:1: 'with'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallIDAccess().getWithKeyword_7()); 
                     }
-                    match(input,22,FOLLOW_22_in_rule__FeatureCallID__Alternatives6725); if (state.failed) return ;
+                    match(input,22,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getFeatureCallIDAccess().getWithKeyword_7()); 
                     }
@@ -9836,15 +9836,15 @@ public final void rule__FeatureCallID__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 9 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3136:6: ( 'category' )
+                    // InternalCheck.g:3136:6: ( 'category' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3136:6: ( 'category' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3137:1: 'category'
+                    // InternalCheck.g:3136:6: ( 'category' )
+                    // InternalCheck.g:3137:1: 'category'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallIDAccess().getCategoryKeyword_8()); 
                     }
-                    match(input,23,FOLLOW_23_in_rule__FeatureCallID__Alternatives6745); if (state.failed) return ;
+                    match(input,23,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getFeatureCallIDAccess().getCategoryKeyword_8()); 
                     }
@@ -9855,15 +9855,15 @@ public final void rule__FeatureCallID__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 10 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3144:6: ( 'message' )
+                    // InternalCheck.g:3144:6: ( 'message' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3144:6: ( 'message' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3145:1: 'message'
+                    // InternalCheck.g:3144:6: ( 'message' )
+                    // InternalCheck.g:3145:1: 'message'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallIDAccess().getMessageKeyword_9()); 
                     }
-                    match(input,24,FOLLOW_24_in_rule__FeatureCallID__Alternatives6765); if (state.failed) return ;
+                    match(input,24,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getFeatureCallIDAccess().getMessageKeyword_9()); 
                     }
@@ -9874,15 +9874,15 @@ public final void rule__FeatureCallID__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 11 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3152:6: ( 'on' )
+                    // InternalCheck.g:3152:6: ( 'on' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3152:6: ( 'on' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3153:1: 'on'
+                    // InternalCheck.g:3152:6: ( 'on' )
+                    // InternalCheck.g:3153:1: 'on'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallIDAccess().getOnKeyword_10()); 
                     }
-                    match(input,25,FOLLOW_25_in_rule__FeatureCallID__Alternatives6785); if (state.failed) return ;
+                    match(input,25,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getFeatureCallIDAccess().getOnKeyword_10()); 
                     }
@@ -9893,15 +9893,15 @@ public final void rule__FeatureCallID__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 12 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3160:6: ( 'bind' )
+                    // InternalCheck.g:3160:6: ( 'bind' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3160:6: ( 'bind' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3161:1: 'bind'
+                    // InternalCheck.g:3160:6: ( 'bind' )
+                    // InternalCheck.g:3161:1: 'bind'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallIDAccess().getBindKeyword_11()); 
                     }
-                    match(input,26,FOLLOW_26_in_rule__FeatureCallID__Alternatives6805); if (state.failed) return ;
+                    match(input,26,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getFeatureCallIDAccess().getBindKeyword_11()); 
                     }
@@ -9912,15 +9912,15 @@ public final void rule__FeatureCallID__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 13 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3168:6: ( 'data' )
+                    // InternalCheck.g:3168:6: ( 'data' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3168:6: ( 'data' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3169:1: 'data'
+                    // InternalCheck.g:3168:6: ( 'data' )
+                    // InternalCheck.g:3169:1: 'data'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallIDAccess().getDataKeyword_12()); 
                     }
-                    match(input,27,FOLLOW_27_in_rule__FeatureCallID__Alternatives6825); if (state.failed) return ;
+                    match(input,27,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getFeatureCallIDAccess().getDataKeyword_12()); 
                     }
@@ -9931,15 +9931,15 @@ public final void rule__FeatureCallID__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 14 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3176:6: ( 'SeverityRange' )
+                    // InternalCheck.g:3176:6: ( 'SeverityRange' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3176:6: ( 'SeverityRange' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3177:1: 'SeverityRange'
+                    // InternalCheck.g:3176:6: ( 'SeverityRange' )
+                    // InternalCheck.g:3177:1: 'SeverityRange'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallIDAccess().getSeverityRangeKeyword_13()); 
                     }
-                    match(input,28,FOLLOW_28_in_rule__FeatureCallID__Alternatives6845); if (state.failed) return ;
+                    match(input,28,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getFeatureCallIDAccess().getSeverityRangeKeyword_13()); 
                     }
@@ -9950,15 +9950,15 @@ public final void rule__FeatureCallID__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 15 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3184:6: ( 'error' )
+                    // InternalCheck.g:3184:6: ( 'error' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3184:6: ( 'error' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3185:1: 'error'
+                    // InternalCheck.g:3184:6: ( 'error' )
+                    // InternalCheck.g:3185:1: 'error'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallIDAccess().getErrorKeyword_14()); 
                     }
-                    match(input,29,FOLLOW_29_in_rule__FeatureCallID__Alternatives6865); if (state.failed) return ;
+                    match(input,29,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getFeatureCallIDAccess().getErrorKeyword_14()); 
                     }
@@ -9969,15 +9969,15 @@ public final void rule__FeatureCallID__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 16 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3192:6: ( 'warning' )
+                    // InternalCheck.g:3192:6: ( 'warning' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3192:6: ( 'warning' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3193:1: 'warning'
+                    // InternalCheck.g:3192:6: ( 'warning' )
+                    // InternalCheck.g:3193:1: 'warning'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallIDAccess().getWarningKeyword_15()); 
                     }
-                    match(input,30,FOLLOW_30_in_rule__FeatureCallID__Alternatives6885); if (state.failed) return ;
+                    match(input,30,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getFeatureCallIDAccess().getWarningKeyword_15()); 
                     }
@@ -9988,15 +9988,15 @@ public final void rule__FeatureCallID__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 17 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3200:6: ( 'info' )
+                    // InternalCheck.g:3200:6: ( 'info' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3200:6: ( 'info' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3201:1: 'info'
+                    // InternalCheck.g:3200:6: ( 'info' )
+                    // InternalCheck.g:3201:1: 'info'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallIDAccess().getInfoKeyword_16()); 
                     }
-                    match(input,31,FOLLOW_31_in_rule__FeatureCallID__Alternatives6905); if (state.failed) return ;
+                    match(input,31,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getFeatureCallIDAccess().getInfoKeyword_16()); 
                     }
@@ -10007,15 +10007,15 @@ public final void rule__FeatureCallID__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 18 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3208:6: ( 'ignore' )
+                    // InternalCheck.g:3208:6: ( 'ignore' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3208:6: ( 'ignore' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3209:1: 'ignore'
+                    // InternalCheck.g:3208:6: ( 'ignore' )
+                    // InternalCheck.g:3209:1: 'ignore'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallIDAccess().getIgnoreKeyword_17()); 
                     }
-                    match(input,32,FOLLOW_32_in_rule__FeatureCallID__Alternatives6925); if (state.failed) return ;
+                    match(input,32,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getFeatureCallIDAccess().getIgnoreKeyword_17()); 
                     }
@@ -10026,15 +10026,15 @@ public final void rule__FeatureCallID__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 19 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3216:6: ( 'live' )
+                    // InternalCheck.g:3216:6: ( 'live' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3216:6: ( 'live' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3217:1: 'live'
+                    // InternalCheck.g:3216:6: ( 'live' )
+                    // InternalCheck.g:3217:1: 'live'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallIDAccess().getLiveKeyword_18()); 
                     }
-                    match(input,33,FOLLOW_33_in_rule__FeatureCallID__Alternatives6945); if (state.failed) return ;
+                    match(input,33,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getFeatureCallIDAccess().getLiveKeyword_18()); 
                     }
@@ -10045,15 +10045,15 @@ public final void rule__FeatureCallID__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 20 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3224:6: ( 'onSave' )
+                    // InternalCheck.g:3224:6: ( 'onSave' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3224:6: ( 'onSave' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3225:1: 'onSave'
+                    // InternalCheck.g:3224:6: ( 'onSave' )
+                    // InternalCheck.g:3225:1: 'onSave'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallIDAccess().getOnSaveKeyword_19()); 
                     }
-                    match(input,34,FOLLOW_34_in_rule__FeatureCallID__Alternatives6965); if (state.failed) return ;
+                    match(input,34,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getFeatureCallIDAccess().getOnSaveKeyword_19()); 
                     }
@@ -10064,15 +10064,15 @@ public final void rule__FeatureCallID__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 21 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3232:6: ( 'onDemand' )
+                    // InternalCheck.g:3232:6: ( 'onDemand' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3232:6: ( 'onDemand' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3233:1: 'onDemand'
+                    // InternalCheck.g:3232:6: ( 'onDemand' )
+                    // InternalCheck.g:3233:1: 'onDemand'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallIDAccess().getOnDemandKeyword_20()); 
                     }
-                    match(input,35,FOLLOW_35_in_rule__FeatureCallID__Alternatives6985); if (state.failed) return ;
+                    match(input,35,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getFeatureCallIDAccess().getOnDemandKeyword_20()); 
                     }
@@ -10100,29 +10100,29 @@ public final void rule__FeatureCallID__Alternatives() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XAnnotation__Alternatives_3_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3245:1: rule__XAnnotation__Alternatives_3_1 : ( ( ( rule__XAnnotation__Group_3_1_0__0 ) ) | ( ( rule__XAnnotation__ValueAssignment_3_1_1 ) ) );
+    // InternalCheck.g:3245:1: rule__XAnnotation__Alternatives_3_1 : ( ( ( rule__XAnnotation__Group_3_1_0__0 ) ) | ( ( rule__XAnnotation__ValueAssignment_3_1_1 ) ) );
     public final void rule__XAnnotation__Alternatives_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3249:1: ( ( ( rule__XAnnotation__Group_3_1_0__0 ) ) | ( ( rule__XAnnotation__ValueAssignment_3_1_1 ) ) )
+            // InternalCheck.g:3249:1: ( ( ( rule__XAnnotation__Group_3_1_0__0 ) ) | ( ( rule__XAnnotation__ValueAssignment_3_1_1 ) ) )
             int alt11=2;
             alt11 = dfa11.predict(input);
             switch (alt11) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3250:1: ( ( rule__XAnnotation__Group_3_1_0__0 ) )
+                    // InternalCheck.g:3250:1: ( ( rule__XAnnotation__Group_3_1_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3250:1: ( ( rule__XAnnotation__Group_3_1_0__0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3251:1: ( rule__XAnnotation__Group_3_1_0__0 )
+                    // InternalCheck.g:3250:1: ( ( rule__XAnnotation__Group_3_1_0__0 ) )
+                    // InternalCheck.g:3251:1: ( rule__XAnnotation__Group_3_1_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXAnnotationAccess().getGroup_3_1_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3252:1: ( rule__XAnnotation__Group_3_1_0__0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3252:2: rule__XAnnotation__Group_3_1_0__0
+                    // InternalCheck.g:3252:1: ( rule__XAnnotation__Group_3_1_0__0 )
+                    // InternalCheck.g:3252:2: rule__XAnnotation__Group_3_1_0__0
                     {
-                    pushFollow(FOLLOW_rule__XAnnotation__Group_3_1_0__0_in_rule__XAnnotation__Alternatives_3_17019);
+                    pushFollow(FOLLOW_2);
                     rule__XAnnotation__Group_3_1_0__0();
 
                     state._fsp--;
@@ -10140,18 +10140,18 @@ public final void rule__XAnnotation__Alternatives_3_1() throws RecognitionExcept
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3256:6: ( ( rule__XAnnotation__ValueAssignment_3_1_1 ) )
+                    // InternalCheck.g:3256:6: ( ( rule__XAnnotation__ValueAssignment_3_1_1 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3256:6: ( ( rule__XAnnotation__ValueAssignment_3_1_1 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3257:1: ( rule__XAnnotation__ValueAssignment_3_1_1 )
+                    // InternalCheck.g:3256:6: ( ( rule__XAnnotation__ValueAssignment_3_1_1 ) )
+                    // InternalCheck.g:3257:1: ( rule__XAnnotation__ValueAssignment_3_1_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXAnnotationAccess().getValueAssignment_3_1_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3258:1: ( rule__XAnnotation__ValueAssignment_3_1_1 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3258:2: rule__XAnnotation__ValueAssignment_3_1_1
+                    // InternalCheck.g:3258:1: ( rule__XAnnotation__ValueAssignment_3_1_1 )
+                    // InternalCheck.g:3258:2: rule__XAnnotation__ValueAssignment_3_1_1
                     {
-                    pushFollow(FOLLOW_rule__XAnnotation__ValueAssignment_3_1_1_in_rule__XAnnotation__Alternatives_3_17037);
+                    pushFollow(FOLLOW_2);
                     rule__XAnnotation__ValueAssignment_3_1_1();
 
                     state._fsp--;
@@ -10186,29 +10186,29 @@ public final void rule__XAnnotation__Alternatives_3_1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Alternatives"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3267:1: rule__XAnnotationElementValueOrCommaList__Alternatives : ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) ) | ( ( rule__XAnnotationElementValueOrCommaList__Group_1__0 ) ) );
+    // InternalCheck.g:3267:1: rule__XAnnotationElementValueOrCommaList__Alternatives : ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) ) | ( ( rule__XAnnotationElementValueOrCommaList__Group_1__0 ) ) );
     public final void rule__XAnnotationElementValueOrCommaList__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3271:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) ) | ( ( rule__XAnnotationElementValueOrCommaList__Group_1__0 ) ) )
+            // InternalCheck.g:3271:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) ) | ( ( rule__XAnnotationElementValueOrCommaList__Group_1__0 ) ) )
             int alt12=2;
             alt12 = dfa12.predict(input);
             switch (alt12) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3272:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) )
+                    // InternalCheck.g:3272:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3272:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3273:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__0 )
+                    // InternalCheck.g:3272:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) )
+                    // InternalCheck.g:3273:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3274:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3274:2: rule__XAnnotationElementValueOrCommaList__Group_0__0
+                    // InternalCheck.g:3274:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__0 )
+                    // InternalCheck.g:3274:2: rule__XAnnotationElementValueOrCommaList__Group_0__0
                     {
-                    pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__0_in_rule__XAnnotationElementValueOrCommaList__Alternatives7070);
+                    pushFollow(FOLLOW_2);
                     rule__XAnnotationElementValueOrCommaList__Group_0__0();
 
                     state._fsp--;
@@ -10226,18 +10226,18 @@ public final void rule__XAnnotationElementValueOrCommaList__Alternatives() throw
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3278:6: ( ( rule__XAnnotationElementValueOrCommaList__Group_1__0 ) )
+                    // InternalCheck.g:3278:6: ( ( rule__XAnnotationElementValueOrCommaList__Group_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3278:6: ( ( rule__XAnnotationElementValueOrCommaList__Group_1__0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3279:1: ( rule__XAnnotationElementValueOrCommaList__Group_1__0 )
+                    // InternalCheck.g:3278:6: ( ( rule__XAnnotationElementValueOrCommaList__Group_1__0 ) )
+                    // InternalCheck.g:3279:1: ( rule__XAnnotationElementValueOrCommaList__Group_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3280:1: ( rule__XAnnotationElementValueOrCommaList__Group_1__0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3280:2: rule__XAnnotationElementValueOrCommaList__Group_1__0
+                    // InternalCheck.g:3280:1: ( rule__XAnnotationElementValueOrCommaList__Group_1__0 )
+                    // InternalCheck.g:3280:2: rule__XAnnotationElementValueOrCommaList__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1__0_in_rule__XAnnotationElementValueOrCommaList__Alternatives7088);
+                    pushFollow(FOLLOW_2);
                     rule__XAnnotationElementValueOrCommaList__Group_1__0();
 
                     state._fsp--;
@@ -10272,29 +10272,29 @@ public final void rule__XAnnotationElementValueOrCommaList__Alternatives() throw
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Alternatives"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3289:1: rule__XAnnotationElementValue__Alternatives : ( ( ( rule__XAnnotationElementValue__Group_0__0 ) ) | ( ruleXAnnotationOrExpression ) );
+    // InternalCheck.g:3289:1: rule__XAnnotationElementValue__Alternatives : ( ( ( rule__XAnnotationElementValue__Group_0__0 ) ) | ( ruleXAnnotationOrExpression ) );
     public final void rule__XAnnotationElementValue__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3293:1: ( ( ( rule__XAnnotationElementValue__Group_0__0 ) ) | ( ruleXAnnotationOrExpression ) )
+            // InternalCheck.g:3293:1: ( ( ( rule__XAnnotationElementValue__Group_0__0 ) ) | ( ruleXAnnotationOrExpression ) )
             int alt13=2;
             alt13 = dfa13.predict(input);
             switch (alt13) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3294:1: ( ( rule__XAnnotationElementValue__Group_0__0 ) )
+                    // InternalCheck.g:3294:1: ( ( rule__XAnnotationElementValue__Group_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3294:1: ( ( rule__XAnnotationElementValue__Group_0__0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3295:1: ( rule__XAnnotationElementValue__Group_0__0 )
+                    // InternalCheck.g:3294:1: ( ( rule__XAnnotationElementValue__Group_0__0 ) )
+                    // InternalCheck.g:3295:1: ( rule__XAnnotationElementValue__Group_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXAnnotationElementValueAccess().getGroup_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3296:1: ( rule__XAnnotationElementValue__Group_0__0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3296:2: rule__XAnnotationElementValue__Group_0__0
+                    // InternalCheck.g:3296:1: ( rule__XAnnotationElementValue__Group_0__0 )
+                    // InternalCheck.g:3296:2: rule__XAnnotationElementValue__Group_0__0
                     {
-                    pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0__0_in_rule__XAnnotationElementValue__Alternatives7121);
+                    pushFollow(FOLLOW_2);
                     rule__XAnnotationElementValue__Group_0__0();
 
                     state._fsp--;
@@ -10312,15 +10312,15 @@ public final void rule__XAnnotationElementValue__Alternatives() throws Recogniti
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3300:6: ( ruleXAnnotationOrExpression )
+                    // InternalCheck.g:3300:6: ( ruleXAnnotationOrExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3300:6: ( ruleXAnnotationOrExpression )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3301:1: ruleXAnnotationOrExpression
+                    // InternalCheck.g:3300:6: ( ruleXAnnotationOrExpression )
+                    // InternalCheck.g:3301:1: ruleXAnnotationOrExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXAnnotationElementValueAccess().getXAnnotationOrExpressionParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValue__Alternatives7139);
+                    pushFollow(FOLLOW_2);
                     ruleXAnnotationOrExpression();
 
                     state._fsp--;
@@ -10352,13 +10352,13 @@ public final void rule__XAnnotationElementValue__Alternatives() throws Recogniti
 
 
     // $ANTLR start "rule__XAnnotationOrExpression__Alternatives"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3311:1: rule__XAnnotationOrExpression__Alternatives : ( ( ruleXAnnotation ) | ( ruleXExpression ) );
+    // InternalCheck.g:3311:1: rule__XAnnotationOrExpression__Alternatives : ( ( ruleXAnnotation ) | ( ruleXExpression ) );
     public final void rule__XAnnotationOrExpression__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3315:1: ( ( ruleXAnnotation ) | ( ruleXExpression ) )
+            // InternalCheck.g:3315:1: ( ( ruleXAnnotation ) | ( ruleXExpression ) )
             int alt14=2;
             int LA14_0 = input.LA(1);
 
@@ -10377,15 +10377,15 @@ else if ( ((LA14_0>=RULE_ID && LA14_0<=RULE_STRING)||(LA14_0>=16 && LA14_0<=35)|
             }
             switch (alt14) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3316:1: ( ruleXAnnotation )
+                    // InternalCheck.g:3316:1: ( ruleXAnnotation )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3316:1: ( ruleXAnnotation )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3317:1: ruleXAnnotation
+                    // InternalCheck.g:3316:1: ( ruleXAnnotation )
+                    // InternalCheck.g:3317:1: ruleXAnnotation
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXAnnotationOrExpressionAccess().getXAnnotationParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleXAnnotation_in_rule__XAnnotationOrExpression__Alternatives7171);
+                    pushFollow(FOLLOW_2);
                     ruleXAnnotation();
 
                     state._fsp--;
@@ -10400,15 +10400,15 @@ else if ( ((LA14_0>=RULE_ID && LA14_0<=RULE_STRING)||(LA14_0>=16 && LA14_0<=35)|
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3322:6: ( ruleXExpression )
+                    // InternalCheck.g:3322:6: ( ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3322:6: ( ruleXExpression )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3323:1: ruleXExpression
+                    // InternalCheck.g:3322:6: ( ruleXExpression )
+                    // InternalCheck.g:3323:1: ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXAnnotationOrExpressionAccess().getXExpressionParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_rule__XAnnotationOrExpression__Alternatives7188);
+                    pushFollow(FOLLOW_2);
                     ruleXExpression();
 
                     state._fsp--;
@@ -10440,29 +10440,29 @@ else if ( ((LA14_0>=RULE_ID && LA14_0<=RULE_STRING)||(LA14_0>=16 && LA14_0<=35)|
 
 
     // $ANTLR start "rule__XAssignment__Alternatives"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3333:1: rule__XAssignment__Alternatives : ( ( ( rule__XAssignment__Group_0__0 ) ) | ( ( rule__XAssignment__Group_1__0 ) ) );
+    // InternalCheck.g:3333:1: rule__XAssignment__Alternatives : ( ( ( rule__XAssignment__Group_0__0 ) ) | ( ( rule__XAssignment__Group_1__0 ) ) );
     public final void rule__XAssignment__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3337:1: ( ( ( rule__XAssignment__Group_0__0 ) ) | ( ( rule__XAssignment__Group_1__0 ) ) )
+            // InternalCheck.g:3337:1: ( ( ( rule__XAssignment__Group_0__0 ) ) | ( ( rule__XAssignment__Group_1__0 ) ) )
             int alt15=2;
             alt15 = dfa15.predict(input);
             switch (alt15) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3338:1: ( ( rule__XAssignment__Group_0__0 ) )
+                    // InternalCheck.g:3338:1: ( ( rule__XAssignment__Group_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3338:1: ( ( rule__XAssignment__Group_0__0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3339:1: ( rule__XAssignment__Group_0__0 )
+                    // InternalCheck.g:3338:1: ( ( rule__XAssignment__Group_0__0 ) )
+                    // InternalCheck.g:3339:1: ( rule__XAssignment__Group_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXAssignmentAccess().getGroup_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3340:1: ( rule__XAssignment__Group_0__0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3340:2: rule__XAssignment__Group_0__0
+                    // InternalCheck.g:3340:1: ( rule__XAssignment__Group_0__0 )
+                    // InternalCheck.g:3340:2: rule__XAssignment__Group_0__0
                     {
-                    pushFollow(FOLLOW_rule__XAssignment__Group_0__0_in_rule__XAssignment__Alternatives7220);
+                    pushFollow(FOLLOW_2);
                     rule__XAssignment__Group_0__0();
 
                     state._fsp--;
@@ -10480,18 +10480,18 @@ public final void rule__XAssignment__Alternatives() throws RecognitionException
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3344:6: ( ( rule__XAssignment__Group_1__0 ) )
+                    // InternalCheck.g:3344:6: ( ( rule__XAssignment__Group_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3344:6: ( ( rule__XAssignment__Group_1__0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3345:1: ( rule__XAssignment__Group_1__0 )
+                    // InternalCheck.g:3344:6: ( ( rule__XAssignment__Group_1__0 ) )
+                    // InternalCheck.g:3345:1: ( rule__XAssignment__Group_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXAssignmentAccess().getGroup_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3346:1: ( rule__XAssignment__Group_1__0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3346:2: rule__XAssignment__Group_1__0
+                    // InternalCheck.g:3346:1: ( rule__XAssignment__Group_1__0 )
+                    // InternalCheck.g:3346:2: rule__XAssignment__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__XAssignment__Group_1__0_in_rule__XAssignment__Alternatives7238);
+                    pushFollow(FOLLOW_2);
                     rule__XAssignment__Group_1__0();
 
                     state._fsp--;
@@ -10526,13 +10526,13 @@ public final void rule__XAssignment__Alternatives() throws RecognitionException
 
 
     // $ANTLR start "rule__OpMultiAssign__Alternatives"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3355:1: rule__OpMultiAssign__Alternatives : ( ( '+=' ) | ( '-=' ) | ( '*=' ) | ( '/=' ) | ( '%=' ) | ( ( rule__OpMultiAssign__Group_5__0 ) ) | ( ( rule__OpMultiAssign__Group_6__0 ) ) );
+    // InternalCheck.g:3355:1: rule__OpMultiAssign__Alternatives : ( ( '+=' ) | ( '-=' ) | ( '*=' ) | ( '/=' ) | ( '%=' ) | ( ( rule__OpMultiAssign__Group_5__0 ) ) | ( ( rule__OpMultiAssign__Group_6__0 ) ) );
     public final void rule__OpMultiAssign__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3359:1: ( ( '+=' ) | ( '-=' ) | ( '*=' ) | ( '/=' ) | ( '%=' ) | ( ( rule__OpMultiAssign__Group_5__0 ) ) | ( ( rule__OpMultiAssign__Group_6__0 ) ) )
+            // InternalCheck.g:3359:1: ( ( '+=' ) | ( '-=' ) | ( '*=' ) | ( '/=' ) | ( '%=' ) | ( ( rule__OpMultiAssign__Group_5__0 ) ) | ( ( rule__OpMultiAssign__Group_6__0 ) ) )
             int alt16=7;
             switch ( input.LA(1) ) {
             case 36:
@@ -10580,15 +10580,15 @@ public final void rule__OpMultiAssign__Alternatives() throws RecognitionExceptio
 
             switch (alt16) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3360:1: ( '+=' )
+                    // InternalCheck.g:3360:1: ( '+=' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3360:1: ( '+=' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3361:1: '+='
+                    // InternalCheck.g:3360:1: ( '+=' )
+                    // InternalCheck.g:3361:1: '+='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAssignAccess().getPlusSignEqualsSignKeyword_0()); 
                     }
-                    match(input,36,FOLLOW_36_in_rule__OpMultiAssign__Alternatives7272); if (state.failed) return ;
+                    match(input,36,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpMultiAssignAccess().getPlusSignEqualsSignKeyword_0()); 
                     }
@@ -10599,15 +10599,15 @@ public final void rule__OpMultiAssign__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3368:6: ( '-=' )
+                    // InternalCheck.g:3368:6: ( '-=' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3368:6: ( '-=' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3369:1: '-='
+                    // InternalCheck.g:3368:6: ( '-=' )
+                    // InternalCheck.g:3369:1: '-='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAssignAccess().getHyphenMinusEqualsSignKeyword_1()); 
                     }
-                    match(input,37,FOLLOW_37_in_rule__OpMultiAssign__Alternatives7292); if (state.failed) return ;
+                    match(input,37,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpMultiAssignAccess().getHyphenMinusEqualsSignKeyword_1()); 
                     }
@@ -10618,15 +10618,15 @@ public final void rule__OpMultiAssign__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3376:6: ( '*=' )
+                    // InternalCheck.g:3376:6: ( '*=' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3376:6: ( '*=' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3377:1: '*='
+                    // InternalCheck.g:3376:6: ( '*=' )
+                    // InternalCheck.g:3377:1: '*='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAssignAccess().getAsteriskEqualsSignKeyword_2()); 
                     }
-                    match(input,38,FOLLOW_38_in_rule__OpMultiAssign__Alternatives7312); if (state.failed) return ;
+                    match(input,38,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpMultiAssignAccess().getAsteriskEqualsSignKeyword_2()); 
                     }
@@ -10637,15 +10637,15 @@ public final void rule__OpMultiAssign__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3384:6: ( '/=' )
+                    // InternalCheck.g:3384:6: ( '/=' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3384:6: ( '/=' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3385:1: '/='
+                    // InternalCheck.g:3384:6: ( '/=' )
+                    // InternalCheck.g:3385:1: '/='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAssignAccess().getSolidusEqualsSignKeyword_3()); 
                     }
-                    match(input,39,FOLLOW_39_in_rule__OpMultiAssign__Alternatives7332); if (state.failed) return ;
+                    match(input,39,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpMultiAssignAccess().getSolidusEqualsSignKeyword_3()); 
                     }
@@ -10656,15 +10656,15 @@ public final void rule__OpMultiAssign__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3392:6: ( '%=' )
+                    // InternalCheck.g:3392:6: ( '%=' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3392:6: ( '%=' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3393:1: '%='
+                    // InternalCheck.g:3392:6: ( '%=' )
+                    // InternalCheck.g:3393:1: '%='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAssignAccess().getPercentSignEqualsSignKeyword_4()); 
                     }
-                    match(input,40,FOLLOW_40_in_rule__OpMultiAssign__Alternatives7352); if (state.failed) return ;
+                    match(input,40,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpMultiAssignAccess().getPercentSignEqualsSignKeyword_4()); 
                     }
@@ -10675,18 +10675,18 @@ public final void rule__OpMultiAssign__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3400:6: ( ( rule__OpMultiAssign__Group_5__0 ) )
+                    // InternalCheck.g:3400:6: ( ( rule__OpMultiAssign__Group_5__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3400:6: ( ( rule__OpMultiAssign__Group_5__0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3401:1: ( rule__OpMultiAssign__Group_5__0 )
+                    // InternalCheck.g:3400:6: ( ( rule__OpMultiAssign__Group_5__0 ) )
+                    // InternalCheck.g:3401:1: ( rule__OpMultiAssign__Group_5__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAssignAccess().getGroup_5()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3402:1: ( rule__OpMultiAssign__Group_5__0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3402:2: rule__OpMultiAssign__Group_5__0
+                    // InternalCheck.g:3402:1: ( rule__OpMultiAssign__Group_5__0 )
+                    // InternalCheck.g:3402:2: rule__OpMultiAssign__Group_5__0
                     {
-                    pushFollow(FOLLOW_rule__OpMultiAssign__Group_5__0_in_rule__OpMultiAssign__Alternatives7371);
+                    pushFollow(FOLLOW_2);
                     rule__OpMultiAssign__Group_5__0();
 
                     state._fsp--;
@@ -10704,18 +10704,18 @@ public final void rule__OpMultiAssign__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3406:6: ( ( rule__OpMultiAssign__Group_6__0 ) )
+                    // InternalCheck.g:3406:6: ( ( rule__OpMultiAssign__Group_6__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3406:6: ( ( rule__OpMultiAssign__Group_6__0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3407:1: ( rule__OpMultiAssign__Group_6__0 )
+                    // InternalCheck.g:3406:6: ( ( rule__OpMultiAssign__Group_6__0 ) )
+                    // InternalCheck.g:3407:1: ( rule__OpMultiAssign__Group_6__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAssignAccess().getGroup_6()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3408:1: ( rule__OpMultiAssign__Group_6__0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3408:2: rule__OpMultiAssign__Group_6__0
+                    // InternalCheck.g:3408:1: ( rule__OpMultiAssign__Group_6__0 )
+                    // InternalCheck.g:3408:2: rule__OpMultiAssign__Group_6__0
                     {
-                    pushFollow(FOLLOW_rule__OpMultiAssign__Group_6__0_in_rule__OpMultiAssign__Alternatives7389);
+                    pushFollow(FOLLOW_2);
                     rule__OpMultiAssign__Group_6__0();
 
                     state._fsp--;
@@ -10750,13 +10750,13 @@ public final void rule__OpMultiAssign__Alternatives() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__OpEquality__Alternatives"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3417:1: rule__OpEquality__Alternatives : ( ( '==' ) | ( '!=' ) | ( '===' ) | ( '!==' ) );
+    // InternalCheck.g:3417:1: rule__OpEquality__Alternatives : ( ( '==' ) | ( '!=' ) | ( '===' ) | ( '!==' ) );
     public final void rule__OpEquality__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3421:1: ( ( '==' ) | ( '!=' ) | ( '===' ) | ( '!==' ) )
+            // InternalCheck.g:3421:1: ( ( '==' ) | ( '!=' ) | ( '===' ) | ( '!==' ) )
             int alt17=4;
             switch ( input.LA(1) ) {
             case 41:
@@ -10789,15 +10789,15 @@ public final void rule__OpEquality__Alternatives() throws RecognitionException {
 
             switch (alt17) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3422:1: ( '==' )
+                    // InternalCheck.g:3422:1: ( '==' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3422:1: ( '==' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3423:1: '=='
+                    // InternalCheck.g:3422:1: ( '==' )
+                    // InternalCheck.g:3423:1: '=='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpEqualityAccess().getEqualsSignEqualsSignKeyword_0()); 
                     }
-                    match(input,41,FOLLOW_41_in_rule__OpEquality__Alternatives7423); if (state.failed) return ;
+                    match(input,41,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpEqualityAccess().getEqualsSignEqualsSignKeyword_0()); 
                     }
@@ -10808,15 +10808,15 @@ public final void rule__OpEquality__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3430:6: ( '!=' )
+                    // InternalCheck.g:3430:6: ( '!=' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3430:6: ( '!=' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3431:1: '!='
+                    // InternalCheck.g:3430:6: ( '!=' )
+                    // InternalCheck.g:3431:1: '!='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpEqualityAccess().getExclamationMarkEqualsSignKeyword_1()); 
                     }
-                    match(input,42,FOLLOW_42_in_rule__OpEquality__Alternatives7443); if (state.failed) return ;
+                    match(input,42,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpEqualityAccess().getExclamationMarkEqualsSignKeyword_1()); 
                     }
@@ -10827,15 +10827,15 @@ public final void rule__OpEquality__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3438:6: ( '===' )
+                    // InternalCheck.g:3438:6: ( '===' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3438:6: ( '===' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3439:1: '==='
+                    // InternalCheck.g:3438:6: ( '===' )
+                    // InternalCheck.g:3439:1: '==='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpEqualityAccess().getEqualsSignEqualsSignEqualsSignKeyword_2()); 
                     }
-                    match(input,43,FOLLOW_43_in_rule__OpEquality__Alternatives7463); if (state.failed) return ;
+                    match(input,43,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpEqualityAccess().getEqualsSignEqualsSignEqualsSignKeyword_2()); 
                     }
@@ -10846,15 +10846,15 @@ public final void rule__OpEquality__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3446:6: ( '!==' )
+                    // InternalCheck.g:3446:6: ( '!==' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3446:6: ( '!==' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3447:1: '!=='
+                    // InternalCheck.g:3446:6: ( '!==' )
+                    // InternalCheck.g:3447:1: '!=='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpEqualityAccess().getExclamationMarkEqualsSignEqualsSignKeyword_3()); 
                     }
-                    match(input,44,FOLLOW_44_in_rule__OpEquality__Alternatives7483); if (state.failed) return ;
+                    match(input,44,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpEqualityAccess().getExclamationMarkEqualsSignEqualsSignKeyword_3()); 
                     }
@@ -10882,13 +10882,13 @@ public final void rule__OpEquality__Alternatives() throws RecognitionException {
 
 
     // $ANTLR start "rule__XRelationalExpression__Alternatives_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3459:1: rule__XRelationalExpression__Alternatives_1 : ( ( ( rule__XRelationalExpression__Group_1_0__0 ) ) | ( ( rule__XRelationalExpression__Group_1_1__0 ) ) );
+    // InternalCheck.g:3459:1: rule__XRelationalExpression__Alternatives_1 : ( ( ( rule__XRelationalExpression__Group_1_0__0 ) ) | ( ( rule__XRelationalExpression__Group_1_1__0 ) ) );
     public final void rule__XRelationalExpression__Alternatives_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3463:1: ( ( ( rule__XRelationalExpression__Group_1_0__0 ) ) | ( ( rule__XRelationalExpression__Group_1_1__0 ) ) )
+            // InternalCheck.g:3463:1: ( ( ( rule__XRelationalExpression__Group_1_0__0 ) ) | ( ( rule__XRelationalExpression__Group_1_1__0 ) ) )
             int alt18=2;
             int LA18_0 = input.LA(1);
 
@@ -10907,18 +10907,18 @@ else if ( ((LA18_0>=45 && LA18_0<=47)) ) {
             }
             switch (alt18) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3464:1: ( ( rule__XRelationalExpression__Group_1_0__0 ) )
+                    // InternalCheck.g:3464:1: ( ( rule__XRelationalExpression__Group_1_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3464:1: ( ( rule__XRelationalExpression__Group_1_0__0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3465:1: ( rule__XRelationalExpression__Group_1_0__0 )
+                    // InternalCheck.g:3464:1: ( ( rule__XRelationalExpression__Group_1_0__0 ) )
+                    // InternalCheck.g:3465:1: ( rule__XRelationalExpression__Group_1_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXRelationalExpressionAccess().getGroup_1_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3466:1: ( rule__XRelationalExpression__Group_1_0__0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3466:2: rule__XRelationalExpression__Group_1_0__0
+                    // InternalCheck.g:3466:1: ( rule__XRelationalExpression__Group_1_0__0 )
+                    // InternalCheck.g:3466:2: rule__XRelationalExpression__Group_1_0__0
                     {
-                    pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0__0_in_rule__XRelationalExpression__Alternatives_17517);
+                    pushFollow(FOLLOW_2);
                     rule__XRelationalExpression__Group_1_0__0();
 
                     state._fsp--;
@@ -10936,18 +10936,18 @@ else if ( ((LA18_0>=45 && LA18_0<=47)) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3470:6: ( ( rule__XRelationalExpression__Group_1_1__0 ) )
+                    // InternalCheck.g:3470:6: ( ( rule__XRelationalExpression__Group_1_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3470:6: ( ( rule__XRelationalExpression__Group_1_1__0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3471:1: ( rule__XRelationalExpression__Group_1_1__0 )
+                    // InternalCheck.g:3470:6: ( ( rule__XRelationalExpression__Group_1_1__0 ) )
+                    // InternalCheck.g:3471:1: ( rule__XRelationalExpression__Group_1_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXRelationalExpressionAccess().getGroup_1_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3472:1: ( rule__XRelationalExpression__Group_1_1__0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3472:2: rule__XRelationalExpression__Group_1_1__0
+                    // InternalCheck.g:3472:1: ( rule__XRelationalExpression__Group_1_1__0 )
+                    // InternalCheck.g:3472:2: rule__XRelationalExpression__Group_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1__0_in_rule__XRelationalExpression__Alternatives_17535);
+                    pushFollow(FOLLOW_2);
                     rule__XRelationalExpression__Group_1_1__0();
 
                     state._fsp--;
@@ -10982,13 +10982,13 @@ else if ( ((LA18_0>=45 && LA18_0<=47)) ) {
 
 
     // $ANTLR start "rule__OpCompare__Alternatives"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3481:1: rule__OpCompare__Alternatives : ( ( '>=' ) | ( ( rule__OpCompare__Group_1__0 ) ) | ( '>' ) | ( '<' ) );
+    // InternalCheck.g:3481:1: rule__OpCompare__Alternatives : ( ( '>=' ) | ( ( rule__OpCompare__Group_1__0 ) ) | ( '>' ) | ( '<' ) );
     public final void rule__OpCompare__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3485:1: ( ( '>=' ) | ( ( rule__OpCompare__Group_1__0 ) ) | ( '>' ) | ( '<' ) )
+            // InternalCheck.g:3485:1: ( ( '>=' ) | ( ( rule__OpCompare__Group_1__0 ) ) | ( '>' ) | ( '<' ) )
             int alt19=4;
             switch ( input.LA(1) ) {
             case 45:
@@ -11030,15 +11030,15 @@ else if ( (LA19_2==13) ) {
 
             switch (alt19) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3486:1: ( '>=' )
+                    // InternalCheck.g:3486:1: ( '>=' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3486:1: ( '>=' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3487:1: '>='
+                    // InternalCheck.g:3486:1: ( '>=' )
+                    // InternalCheck.g:3487:1: '>='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpCompareAccess().getGreaterThanSignEqualsSignKeyword_0()); 
                     }
-                    match(input,45,FOLLOW_45_in_rule__OpCompare__Alternatives7569); if (state.failed) return ;
+                    match(input,45,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpCompareAccess().getGreaterThanSignEqualsSignKeyword_0()); 
                     }
@@ -11049,18 +11049,18 @@ else if ( (LA19_2==13) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3494:6: ( ( rule__OpCompare__Group_1__0 ) )
+                    // InternalCheck.g:3494:6: ( ( rule__OpCompare__Group_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3494:6: ( ( rule__OpCompare__Group_1__0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3495:1: ( rule__OpCompare__Group_1__0 )
+                    // InternalCheck.g:3494:6: ( ( rule__OpCompare__Group_1__0 ) )
+                    // InternalCheck.g:3495:1: ( rule__OpCompare__Group_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpCompareAccess().getGroup_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3496:1: ( rule__OpCompare__Group_1__0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3496:2: rule__OpCompare__Group_1__0
+                    // InternalCheck.g:3496:1: ( rule__OpCompare__Group_1__0 )
+                    // InternalCheck.g:3496:2: rule__OpCompare__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__OpCompare__Group_1__0_in_rule__OpCompare__Alternatives7588);
+                    pushFollow(FOLLOW_2);
                     rule__OpCompare__Group_1__0();
 
                     state._fsp--;
@@ -11078,15 +11078,15 @@ else if ( (LA19_2==13) ) {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3500:6: ( '>' )
+                    // InternalCheck.g:3500:6: ( '>' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3500:6: ( '>' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3501:1: '>'
+                    // InternalCheck.g:3500:6: ( '>' )
+                    // InternalCheck.g:3501:1: '>'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpCompareAccess().getGreaterThanSignKeyword_2()); 
                     }
-                    match(input,46,FOLLOW_46_in_rule__OpCompare__Alternatives7607); if (state.failed) return ;
+                    match(input,46,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpCompareAccess().getGreaterThanSignKeyword_2()); 
                     }
@@ -11097,15 +11097,15 @@ else if ( (LA19_2==13) ) {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3508:6: ( '<' )
+                    // InternalCheck.g:3508:6: ( '<' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3508:6: ( '<' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3509:1: '<'
+                    // InternalCheck.g:3508:6: ( '<' )
+                    // InternalCheck.g:3509:1: '<'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpCompareAccess().getLessThanSignKeyword_3()); 
                     }
-                    match(input,47,FOLLOW_47_in_rule__OpCompare__Alternatives7627); if (state.failed) return ;
+                    match(input,47,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpCompareAccess().getLessThanSignKeyword_3()); 
                     }
@@ -11133,26 +11133,26 @@ else if ( (LA19_2==13) ) {
 
 
     // $ANTLR start "rule__OpOther__Alternatives"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3521:1: rule__OpOther__Alternatives : ( ( '->' ) | ( '..<' ) | ( ( rule__OpOther__Group_2__0 ) ) | ( '..' ) | ( '=>' ) | ( ( rule__OpOther__Group_5__0 ) ) | ( ( rule__OpOther__Group_6__0 ) ) | ( '<>' ) | ( '?:' ) );
+    // InternalCheck.g:3521:1: rule__OpOther__Alternatives : ( ( '->' ) | ( '..<' ) | ( ( rule__OpOther__Group_2__0 ) ) | ( '..' ) | ( '=>' ) | ( ( rule__OpOther__Group_5__0 ) ) | ( ( rule__OpOther__Group_6__0 ) ) | ( '<>' ) | ( '?:' ) );
     public final void rule__OpOther__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3525:1: ( ( '->' ) | ( '..<' ) | ( ( rule__OpOther__Group_2__0 ) ) | ( '..' ) | ( '=>' ) | ( ( rule__OpOther__Group_5__0 ) ) | ( ( rule__OpOther__Group_6__0 ) ) | ( '<>' ) | ( '?:' ) )
+            // InternalCheck.g:3525:1: ( ( '->' ) | ( '..<' ) | ( ( rule__OpOther__Group_2__0 ) ) | ( '..' ) | ( '=>' ) | ( ( rule__OpOther__Group_5__0 ) ) | ( ( rule__OpOther__Group_6__0 ) ) | ( '<>' ) | ( '?:' ) )
             int alt20=9;
             alt20 = dfa20.predict(input);
             switch (alt20) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3526:1: ( '->' )
+                    // InternalCheck.g:3526:1: ( '->' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3526:1: ( '->' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3527:1: '->'
+                    // InternalCheck.g:3526:1: ( '->' )
+                    // InternalCheck.g:3527:1: '->'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getHyphenMinusGreaterThanSignKeyword_0()); 
                     }
-                    match(input,48,FOLLOW_48_in_rule__OpOther__Alternatives7662); if (state.failed) return ;
+                    match(input,48,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpOtherAccess().getHyphenMinusGreaterThanSignKeyword_0()); 
                     }
@@ -11163,15 +11163,15 @@ public final void rule__OpOther__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3534:6: ( '..<' )
+                    // InternalCheck.g:3534:6: ( '..<' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3534:6: ( '..<' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3535:1: '..<'
+                    // InternalCheck.g:3534:6: ( '..<' )
+                    // InternalCheck.g:3535:1: '..<'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getFullStopFullStopLessThanSignKeyword_1()); 
                     }
-                    match(input,49,FOLLOW_49_in_rule__OpOther__Alternatives7682); if (state.failed) return ;
+                    match(input,49,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpOtherAccess().getFullStopFullStopLessThanSignKeyword_1()); 
                     }
@@ -11182,18 +11182,18 @@ public final void rule__OpOther__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3542:6: ( ( rule__OpOther__Group_2__0 ) )
+                    // InternalCheck.g:3542:6: ( ( rule__OpOther__Group_2__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3542:6: ( ( rule__OpOther__Group_2__0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3543:1: ( rule__OpOther__Group_2__0 )
+                    // InternalCheck.g:3542:6: ( ( rule__OpOther__Group_2__0 ) )
+                    // InternalCheck.g:3543:1: ( rule__OpOther__Group_2__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getGroup_2()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3544:1: ( rule__OpOther__Group_2__0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3544:2: rule__OpOther__Group_2__0
+                    // InternalCheck.g:3544:1: ( rule__OpOther__Group_2__0 )
+                    // InternalCheck.g:3544:2: rule__OpOther__Group_2__0
                     {
-                    pushFollow(FOLLOW_rule__OpOther__Group_2__0_in_rule__OpOther__Alternatives7701);
+                    pushFollow(FOLLOW_2);
                     rule__OpOther__Group_2__0();
 
                     state._fsp--;
@@ -11211,15 +11211,15 @@ public final void rule__OpOther__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3548:6: ( '..' )
+                    // InternalCheck.g:3548:6: ( '..' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3548:6: ( '..' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3549:1: '..'
+                    // InternalCheck.g:3548:6: ( '..' )
+                    // InternalCheck.g:3549:1: '..'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getFullStopFullStopKeyword_3()); 
                     }
-                    match(input,50,FOLLOW_50_in_rule__OpOther__Alternatives7720); if (state.failed) return ;
+                    match(input,50,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpOtherAccess().getFullStopFullStopKeyword_3()); 
                     }
@@ -11230,15 +11230,15 @@ public final void rule__OpOther__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3556:6: ( '=>' )
+                    // InternalCheck.g:3556:6: ( '=>' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3556:6: ( '=>' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3557:1: '=>'
+                    // InternalCheck.g:3556:6: ( '=>' )
+                    // InternalCheck.g:3557:1: '=>'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getEqualsSignGreaterThanSignKeyword_4()); 
                     }
-                    match(input,51,FOLLOW_51_in_rule__OpOther__Alternatives7740); if (state.failed) return ;
+                    match(input,51,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpOtherAccess().getEqualsSignGreaterThanSignKeyword_4()); 
                     }
@@ -11249,18 +11249,18 @@ public final void rule__OpOther__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3564:6: ( ( rule__OpOther__Group_5__0 ) )
+                    // InternalCheck.g:3564:6: ( ( rule__OpOther__Group_5__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3564:6: ( ( rule__OpOther__Group_5__0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3565:1: ( rule__OpOther__Group_5__0 )
+                    // InternalCheck.g:3564:6: ( ( rule__OpOther__Group_5__0 ) )
+                    // InternalCheck.g:3565:1: ( rule__OpOther__Group_5__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getGroup_5()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3566:1: ( rule__OpOther__Group_5__0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3566:2: rule__OpOther__Group_5__0
+                    // InternalCheck.g:3566:1: ( rule__OpOther__Group_5__0 )
+                    // InternalCheck.g:3566:2: rule__OpOther__Group_5__0
                     {
-                    pushFollow(FOLLOW_rule__OpOther__Group_5__0_in_rule__OpOther__Alternatives7759);
+                    pushFollow(FOLLOW_2);
                     rule__OpOther__Group_5__0();
 
                     state._fsp--;
@@ -11278,18 +11278,18 @@ public final void rule__OpOther__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3570:6: ( ( rule__OpOther__Group_6__0 ) )
+                    // InternalCheck.g:3570:6: ( ( rule__OpOther__Group_6__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3570:6: ( ( rule__OpOther__Group_6__0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3571:1: ( rule__OpOther__Group_6__0 )
+                    // InternalCheck.g:3570:6: ( ( rule__OpOther__Group_6__0 ) )
+                    // InternalCheck.g:3571:1: ( rule__OpOther__Group_6__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getGroup_6()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3572:1: ( rule__OpOther__Group_6__0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3572:2: rule__OpOther__Group_6__0
+                    // InternalCheck.g:3572:1: ( rule__OpOther__Group_6__0 )
+                    // InternalCheck.g:3572:2: rule__OpOther__Group_6__0
                     {
-                    pushFollow(FOLLOW_rule__OpOther__Group_6__0_in_rule__OpOther__Alternatives7777);
+                    pushFollow(FOLLOW_2);
                     rule__OpOther__Group_6__0();
 
                     state._fsp--;
@@ -11307,15 +11307,15 @@ public final void rule__OpOther__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 8 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3576:6: ( '<>' )
+                    // InternalCheck.g:3576:6: ( '<>' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3576:6: ( '<>' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3577:1: '<>'
+                    // InternalCheck.g:3576:6: ( '<>' )
+                    // InternalCheck.g:3577:1: '<>'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getLessThanSignGreaterThanSignKeyword_7()); 
                     }
-                    match(input,52,FOLLOW_52_in_rule__OpOther__Alternatives7796); if (state.failed) return ;
+                    match(input,52,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpOtherAccess().getLessThanSignGreaterThanSignKeyword_7()); 
                     }
@@ -11326,15 +11326,15 @@ public final void rule__OpOther__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 9 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3584:6: ( '?:' )
+                    // InternalCheck.g:3584:6: ( '?:' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3584:6: ( '?:' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3585:1: '?:'
+                    // InternalCheck.g:3584:6: ( '?:' )
+                    // InternalCheck.g:3585:1: '?:'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getQuestionMarkColonKeyword_8()); 
                     }
-                    match(input,53,FOLLOW_53_in_rule__OpOther__Alternatives7816); if (state.failed) return ;
+                    match(input,53,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpOtherAccess().getQuestionMarkColonKeyword_8()); 
                     }
@@ -11362,13 +11362,13 @@ public final void rule__OpOther__Alternatives() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpOther__Alternatives_5_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3597:1: rule__OpOther__Alternatives_5_1 : ( ( ( rule__OpOther__Group_5_1_0__0 ) ) | ( '>' ) );
+    // InternalCheck.g:3597:1: rule__OpOther__Alternatives_5_1 : ( ( ( rule__OpOther__Group_5_1_0__0 ) ) | ( '>' ) );
     public final void rule__OpOther__Alternatives_5_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3601:1: ( ( ( rule__OpOther__Group_5_1_0__0 ) ) | ( '>' ) )
+            // InternalCheck.g:3601:1: ( ( ( rule__OpOther__Group_5_1_0__0 ) ) | ( '>' ) )
             int alt21=2;
             int LA21_0 = input.LA(1);
 
@@ -11398,18 +11398,18 @@ else if ( (LA21_1==46) ) {
             }
             switch (alt21) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3602:1: ( ( rule__OpOther__Group_5_1_0__0 ) )
+                    // InternalCheck.g:3602:1: ( ( rule__OpOther__Group_5_1_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3602:1: ( ( rule__OpOther__Group_5_1_0__0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3603:1: ( rule__OpOther__Group_5_1_0__0 )
+                    // InternalCheck.g:3602:1: ( ( rule__OpOther__Group_5_1_0__0 ) )
+                    // InternalCheck.g:3603:1: ( rule__OpOther__Group_5_1_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getGroup_5_1_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3604:1: ( rule__OpOther__Group_5_1_0__0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3604:2: rule__OpOther__Group_5_1_0__0
+                    // InternalCheck.g:3604:1: ( rule__OpOther__Group_5_1_0__0 )
+                    // InternalCheck.g:3604:2: rule__OpOther__Group_5_1_0__0
                     {
-                    pushFollow(FOLLOW_rule__OpOther__Group_5_1_0__0_in_rule__OpOther__Alternatives_5_17850);
+                    pushFollow(FOLLOW_2);
                     rule__OpOther__Group_5_1_0__0();
 
                     state._fsp--;
@@ -11427,15 +11427,15 @@ else if ( (LA21_1==46) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3608:6: ( '>' )
+                    // InternalCheck.g:3608:6: ( '>' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3608:6: ( '>' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3609:1: '>'
+                    // InternalCheck.g:3608:6: ( '>' )
+                    // InternalCheck.g:3609:1: '>'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_1_1()); 
                     }
-                    match(input,46,FOLLOW_46_in_rule__OpOther__Alternatives_5_17869); if (state.failed) return ;
+                    match(input,46,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_1_1()); 
                     }
@@ -11463,13 +11463,13 @@ else if ( (LA21_1==46) ) {
 
 
     // $ANTLR start "rule__OpOther__Alternatives_6_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3621:1: rule__OpOther__Alternatives_6_1 : ( ( ( rule__OpOther__Group_6_1_0__0 ) ) | ( '<' ) | ( '=>' ) );
+    // InternalCheck.g:3621:1: rule__OpOther__Alternatives_6_1 : ( ( ( rule__OpOther__Group_6_1_0__0 ) ) | ( '<' ) | ( '=>' ) );
     public final void rule__OpOther__Alternatives_6_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3625:1: ( ( ( rule__OpOther__Group_6_1_0__0 ) ) | ( '<' ) | ( '=>' ) )
+            // InternalCheck.g:3625:1: ( ( ( rule__OpOther__Group_6_1_0__0 ) ) | ( '<' ) | ( '=>' ) )
             int alt22=3;
             int LA22_0 = input.LA(1);
 
@@ -11502,18 +11502,18 @@ else if ( (LA22_0==51) ) {
             }
             switch (alt22) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3626:1: ( ( rule__OpOther__Group_6_1_0__0 ) )
+                    // InternalCheck.g:3626:1: ( ( rule__OpOther__Group_6_1_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3626:1: ( ( rule__OpOther__Group_6_1_0__0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3627:1: ( rule__OpOther__Group_6_1_0__0 )
+                    // InternalCheck.g:3626:1: ( ( rule__OpOther__Group_6_1_0__0 ) )
+                    // InternalCheck.g:3627:1: ( rule__OpOther__Group_6_1_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getGroup_6_1_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3628:1: ( rule__OpOther__Group_6_1_0__0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3628:2: rule__OpOther__Group_6_1_0__0
+                    // InternalCheck.g:3628:1: ( rule__OpOther__Group_6_1_0__0 )
+                    // InternalCheck.g:3628:2: rule__OpOther__Group_6_1_0__0
                     {
-                    pushFollow(FOLLOW_rule__OpOther__Group_6_1_0__0_in_rule__OpOther__Alternatives_6_17903);
+                    pushFollow(FOLLOW_2);
                     rule__OpOther__Group_6_1_0__0();
 
                     state._fsp--;
@@ -11531,15 +11531,15 @@ else if ( (LA22_0==51) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3632:6: ( '<' )
+                    // InternalCheck.g:3632:6: ( '<' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3632:6: ( '<' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3633:1: '<'
+                    // InternalCheck.g:3632:6: ( '<' )
+                    // InternalCheck.g:3633:1: '<'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_1_1()); 
                     }
-                    match(input,47,FOLLOW_47_in_rule__OpOther__Alternatives_6_17922); if (state.failed) return ;
+                    match(input,47,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_1_1()); 
                     }
@@ -11550,15 +11550,15 @@ else if ( (LA22_0==51) ) {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3640:6: ( '=>' )
+                    // InternalCheck.g:3640:6: ( '=>' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3640:6: ( '=>' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3641:1: '=>'
+                    // InternalCheck.g:3640:6: ( '=>' )
+                    // InternalCheck.g:3641:1: '=>'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getEqualsSignGreaterThanSignKeyword_6_1_2()); 
                     }
-                    match(input,51,FOLLOW_51_in_rule__OpOther__Alternatives_6_17942); if (state.failed) return ;
+                    match(input,51,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpOtherAccess().getEqualsSignGreaterThanSignKeyword_6_1_2()); 
                     }
@@ -11586,13 +11586,13 @@ else if ( (LA22_0==51) ) {
 
 
     // $ANTLR start "rule__OpAdd__Alternatives"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3653:1: rule__OpAdd__Alternatives : ( ( '+' ) | ( '-' ) );
+    // InternalCheck.g:3653:1: rule__OpAdd__Alternatives : ( ( '+' ) | ( '-' ) );
     public final void rule__OpAdd__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3657:1: ( ( '+' ) | ( '-' ) )
+            // InternalCheck.g:3657:1: ( ( '+' ) | ( '-' ) )
             int alt23=2;
             int LA23_0 = input.LA(1);
 
@@ -11611,15 +11611,15 @@ else if ( (LA23_0==55) ) {
             }
             switch (alt23) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3658:1: ( '+' )
+                    // InternalCheck.g:3658:1: ( '+' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3658:1: ( '+' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3659:1: '+'
+                    // InternalCheck.g:3658:1: ( '+' )
+                    // InternalCheck.g:3659:1: '+'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpAddAccess().getPlusSignKeyword_0()); 
                     }
-                    match(input,54,FOLLOW_54_in_rule__OpAdd__Alternatives7977); if (state.failed) return ;
+                    match(input,54,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpAddAccess().getPlusSignKeyword_0()); 
                     }
@@ -11630,15 +11630,15 @@ else if ( (LA23_0==55) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3666:6: ( '-' )
+                    // InternalCheck.g:3666:6: ( '-' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3666:6: ( '-' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3667:1: '-'
+                    // InternalCheck.g:3666:6: ( '-' )
+                    // InternalCheck.g:3667:1: '-'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpAddAccess().getHyphenMinusKeyword_1()); 
                     }
-                    match(input,55,FOLLOW_55_in_rule__OpAdd__Alternatives7997); if (state.failed) return ;
+                    match(input,55,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpAddAccess().getHyphenMinusKeyword_1()); 
                     }
@@ -11666,13 +11666,13 @@ else if ( (LA23_0==55) ) {
 
 
     // $ANTLR start "rule__OpMulti__Alternatives"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3679:1: rule__OpMulti__Alternatives : ( ( '*' ) | ( '**' ) | ( '/' ) | ( '%' ) );
+    // InternalCheck.g:3679:1: rule__OpMulti__Alternatives : ( ( '*' ) | ( '**' ) | ( '/' ) | ( '%' ) );
     public final void rule__OpMulti__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3683:1: ( ( '*' ) | ( '**' ) | ( '/' ) | ( '%' ) )
+            // InternalCheck.g:3683:1: ( ( '*' ) | ( '**' ) | ( '/' ) | ( '%' ) )
             int alt24=4;
             switch ( input.LA(1) ) {
             case 56:
@@ -11705,15 +11705,15 @@ public final void rule__OpMulti__Alternatives() throws RecognitionException {
 
             switch (alt24) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3684:1: ( '*' )
+                    // InternalCheck.g:3684:1: ( '*' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3684:1: ( '*' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3685:1: '*'
+                    // InternalCheck.g:3684:1: ( '*' )
+                    // InternalCheck.g:3685:1: '*'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAccess().getAsteriskKeyword_0()); 
                     }
-                    match(input,56,FOLLOW_56_in_rule__OpMulti__Alternatives8032); if (state.failed) return ;
+                    match(input,56,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpMultiAccess().getAsteriskKeyword_0()); 
                     }
@@ -11724,15 +11724,15 @@ public final void rule__OpMulti__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3692:6: ( '**' )
+                    // InternalCheck.g:3692:6: ( '**' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3692:6: ( '**' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3693:1: '**'
+                    // InternalCheck.g:3692:6: ( '**' )
+                    // InternalCheck.g:3693:1: '**'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAccess().getAsteriskAsteriskKeyword_1()); 
                     }
-                    match(input,57,FOLLOW_57_in_rule__OpMulti__Alternatives8052); if (state.failed) return ;
+                    match(input,57,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpMultiAccess().getAsteriskAsteriskKeyword_1()); 
                     }
@@ -11743,15 +11743,15 @@ public final void rule__OpMulti__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3700:6: ( '/' )
+                    // InternalCheck.g:3700:6: ( '/' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3700:6: ( '/' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3701:1: '/'
+                    // InternalCheck.g:3700:6: ( '/' )
+                    // InternalCheck.g:3701:1: '/'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAccess().getSolidusKeyword_2()); 
                     }
-                    match(input,58,FOLLOW_58_in_rule__OpMulti__Alternatives8072); if (state.failed) return ;
+                    match(input,58,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpMultiAccess().getSolidusKeyword_2()); 
                     }
@@ -11762,15 +11762,15 @@ public final void rule__OpMulti__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3708:6: ( '%' )
+                    // InternalCheck.g:3708:6: ( '%' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3708:6: ( '%' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3709:1: '%'
+                    // InternalCheck.g:3708:6: ( '%' )
+                    // InternalCheck.g:3709:1: '%'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAccess().getPercentSignKeyword_3()); 
                     }
-                    match(input,59,FOLLOW_59_in_rule__OpMulti__Alternatives8092); if (state.failed) return ;
+                    match(input,59,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpMultiAccess().getPercentSignKeyword_3()); 
                     }
@@ -11798,13 +11798,13 @@ public final void rule__OpMulti__Alternatives() throws RecognitionException {
 
 
     // $ANTLR start "rule__XUnaryOperation__Alternatives"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3721:1: rule__XUnaryOperation__Alternatives : ( ( ( rule__XUnaryOperation__Group_0__0 ) ) | ( ruleXCastedExpression ) );
+    // InternalCheck.g:3721:1: rule__XUnaryOperation__Alternatives : ( ( ( rule__XUnaryOperation__Group_0__0 ) ) | ( ruleXCastedExpression ) );
     public final void rule__XUnaryOperation__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3725:1: ( ( ( rule__XUnaryOperation__Group_0__0 ) ) | ( ruleXCastedExpression ) )
+            // InternalCheck.g:3725:1: ( ( ( rule__XUnaryOperation__Group_0__0 ) ) | ( ruleXCastedExpression ) )
             int alt25=2;
             int LA25_0 = input.LA(1);
 
@@ -11823,18 +11823,18 @@ else if ( ((LA25_0>=RULE_ID && LA25_0<=RULE_STRING)||(LA25_0>=16 && LA25_0<=35)|
             }
             switch (alt25) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3726:1: ( ( rule__XUnaryOperation__Group_0__0 ) )
+                    // InternalCheck.g:3726:1: ( ( rule__XUnaryOperation__Group_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3726:1: ( ( rule__XUnaryOperation__Group_0__0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3727:1: ( rule__XUnaryOperation__Group_0__0 )
+                    // InternalCheck.g:3726:1: ( ( rule__XUnaryOperation__Group_0__0 ) )
+                    // InternalCheck.g:3727:1: ( rule__XUnaryOperation__Group_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXUnaryOperationAccess().getGroup_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3728:1: ( rule__XUnaryOperation__Group_0__0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3728:2: rule__XUnaryOperation__Group_0__0
+                    // InternalCheck.g:3728:1: ( rule__XUnaryOperation__Group_0__0 )
+                    // InternalCheck.g:3728:2: rule__XUnaryOperation__Group_0__0
                     {
-                    pushFollow(FOLLOW_rule__XUnaryOperation__Group_0__0_in_rule__XUnaryOperation__Alternatives8126);
+                    pushFollow(FOLLOW_2);
                     rule__XUnaryOperation__Group_0__0();
 
                     state._fsp--;
@@ -11852,15 +11852,15 @@ else if ( ((LA25_0>=RULE_ID && LA25_0<=RULE_STRING)||(LA25_0>=16 && LA25_0<=35)|
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3732:6: ( ruleXCastedExpression )
+                    // InternalCheck.g:3732:6: ( ruleXCastedExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3732:6: ( ruleXCastedExpression )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3733:1: ruleXCastedExpression
+                    // InternalCheck.g:3732:6: ( ruleXCastedExpression )
+                    // InternalCheck.g:3733:1: ruleXCastedExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXUnaryOperationAccess().getXCastedExpressionParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleXCastedExpression_in_rule__XUnaryOperation__Alternatives8144);
+                    pushFollow(FOLLOW_2);
                     ruleXCastedExpression();
 
                     state._fsp--;
@@ -11892,13 +11892,13 @@ else if ( ((LA25_0>=RULE_ID && LA25_0<=RULE_STRING)||(LA25_0>=16 && LA25_0<=35)|
 
 
     // $ANTLR start "rule__OpUnary__Alternatives"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3743:1: rule__OpUnary__Alternatives : ( ( '!' ) | ( '-' ) | ( '+' ) );
+    // InternalCheck.g:3743:1: rule__OpUnary__Alternatives : ( ( '!' ) | ( '-' ) | ( '+' ) );
     public final void rule__OpUnary__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3747:1: ( ( '!' ) | ( '-' ) | ( '+' ) )
+            // InternalCheck.g:3747:1: ( ( '!' ) | ( '-' ) | ( '+' ) )
             int alt26=3;
             switch ( input.LA(1) ) {
             case 60:
@@ -11926,15 +11926,15 @@ public final void rule__OpUnary__Alternatives() throws RecognitionException {
 
             switch (alt26) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3748:1: ( '!' )
+                    // InternalCheck.g:3748:1: ( '!' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3748:1: ( '!' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3749:1: '!'
+                    // InternalCheck.g:3748:1: ( '!' )
+                    // InternalCheck.g:3749:1: '!'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpUnaryAccess().getExclamationMarkKeyword_0()); 
                     }
-                    match(input,60,FOLLOW_60_in_rule__OpUnary__Alternatives8177); if (state.failed) return ;
+                    match(input,60,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpUnaryAccess().getExclamationMarkKeyword_0()); 
                     }
@@ -11945,15 +11945,15 @@ public final void rule__OpUnary__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3756:6: ( '-' )
+                    // InternalCheck.g:3756:6: ( '-' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3756:6: ( '-' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3757:1: '-'
+                    // InternalCheck.g:3756:6: ( '-' )
+                    // InternalCheck.g:3757:1: '-'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpUnaryAccess().getHyphenMinusKeyword_1()); 
                     }
-                    match(input,55,FOLLOW_55_in_rule__OpUnary__Alternatives8197); if (state.failed) return ;
+                    match(input,55,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpUnaryAccess().getHyphenMinusKeyword_1()); 
                     }
@@ -11964,15 +11964,15 @@ public final void rule__OpUnary__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3764:6: ( '+' )
+                    // InternalCheck.g:3764:6: ( '+' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3764:6: ( '+' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3765:1: '+'
+                    // InternalCheck.g:3764:6: ( '+' )
+                    // InternalCheck.g:3765:1: '+'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpUnaryAccess().getPlusSignKeyword_2()); 
                     }
-                    match(input,54,FOLLOW_54_in_rule__OpUnary__Alternatives8217); if (state.failed) return ;
+                    match(input,54,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpUnaryAccess().getPlusSignKeyword_2()); 
                     }
@@ -12000,13 +12000,13 @@ public final void rule__OpUnary__Alternatives() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpPostfix__Alternatives"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3777:1: rule__OpPostfix__Alternatives : ( ( '++' ) | ( '--' ) );
+    // InternalCheck.g:3777:1: rule__OpPostfix__Alternatives : ( ( '++' ) | ( '--' ) );
     public final void rule__OpPostfix__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3781:1: ( ( '++' ) | ( '--' ) )
+            // InternalCheck.g:3781:1: ( ( '++' ) | ( '--' ) )
             int alt27=2;
             int LA27_0 = input.LA(1);
 
@@ -12025,15 +12025,15 @@ else if ( (LA27_0==62) ) {
             }
             switch (alt27) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3782:1: ( '++' )
+                    // InternalCheck.g:3782:1: ( '++' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3782:1: ( '++' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3783:1: '++'
+                    // InternalCheck.g:3782:1: ( '++' )
+                    // InternalCheck.g:3783:1: '++'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpPostfixAccess().getPlusSignPlusSignKeyword_0()); 
                     }
-                    match(input,61,FOLLOW_61_in_rule__OpPostfix__Alternatives8252); if (state.failed) return ;
+                    match(input,61,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpPostfixAccess().getPlusSignPlusSignKeyword_0()); 
                     }
@@ -12044,15 +12044,15 @@ else if ( (LA27_0==62) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3790:6: ( '--' )
+                    // InternalCheck.g:3790:6: ( '--' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3790:6: ( '--' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3791:1: '--'
+                    // InternalCheck.g:3790:6: ( '--' )
+                    // InternalCheck.g:3791:1: '--'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpPostfixAccess().getHyphenMinusHyphenMinusKeyword_1()); 
                     }
-                    match(input,62,FOLLOW_62_in_rule__OpPostfix__Alternatives8272); if (state.failed) return ;
+                    match(input,62,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpPostfixAccess().getHyphenMinusHyphenMinusKeyword_1()); 
                     }
@@ -12080,29 +12080,29 @@ else if ( (LA27_0==62) ) {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Alternatives_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3803:1: rule__XMemberFeatureCall__Alternatives_1 : ( ( ( rule__XMemberFeatureCall__Group_1_0__0 ) ) | ( ( rule__XMemberFeatureCall__Group_1_1__0 ) ) );
+    // InternalCheck.g:3803:1: rule__XMemberFeatureCall__Alternatives_1 : ( ( ( rule__XMemberFeatureCall__Group_1_0__0 ) ) | ( ( rule__XMemberFeatureCall__Group_1_1__0 ) ) );
     public final void rule__XMemberFeatureCall__Alternatives_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3807:1: ( ( ( rule__XMemberFeatureCall__Group_1_0__0 ) ) | ( ( rule__XMemberFeatureCall__Group_1_1__0 ) ) )
+            // InternalCheck.g:3807:1: ( ( ( rule__XMemberFeatureCall__Group_1_0__0 ) ) | ( ( rule__XMemberFeatureCall__Group_1_1__0 ) ) )
             int alt28=2;
             alt28 = dfa28.predict(input);
             switch (alt28) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3808:1: ( ( rule__XMemberFeatureCall__Group_1_0__0 ) )
+                    // InternalCheck.g:3808:1: ( ( rule__XMemberFeatureCall__Group_1_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3808:1: ( ( rule__XMemberFeatureCall__Group_1_0__0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3809:1: ( rule__XMemberFeatureCall__Group_1_0__0 )
+                    // InternalCheck.g:3808:1: ( ( rule__XMemberFeatureCall__Group_1_0__0 ) )
+                    // InternalCheck.g:3809:1: ( rule__XMemberFeatureCall__Group_1_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3810:1: ( rule__XMemberFeatureCall__Group_1_0__0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3810:2: rule__XMemberFeatureCall__Group_1_0__0
+                    // InternalCheck.g:3810:1: ( rule__XMemberFeatureCall__Group_1_0__0 )
+                    // InternalCheck.g:3810:2: rule__XMemberFeatureCall__Group_1_0__0
                     {
-                    pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0__0_in_rule__XMemberFeatureCall__Alternatives_18306);
+                    pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__Group_1_0__0();
 
                     state._fsp--;
@@ -12120,18 +12120,18 @@ public final void rule__XMemberFeatureCall__Alternatives_1() throws RecognitionE
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3814:6: ( ( rule__XMemberFeatureCall__Group_1_1__0 ) )
+                    // InternalCheck.g:3814:6: ( ( rule__XMemberFeatureCall__Group_1_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3814:6: ( ( rule__XMemberFeatureCall__Group_1_1__0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3815:1: ( rule__XMemberFeatureCall__Group_1_1__0 )
+                    // InternalCheck.g:3814:6: ( ( rule__XMemberFeatureCall__Group_1_1__0 ) )
+                    // InternalCheck.g:3815:1: ( rule__XMemberFeatureCall__Group_1_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3816:1: ( rule__XMemberFeatureCall__Group_1_1__0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3816:2: rule__XMemberFeatureCall__Group_1_1__0
+                    // InternalCheck.g:3816:1: ( rule__XMemberFeatureCall__Group_1_1__0 )
+                    // InternalCheck.g:3816:2: rule__XMemberFeatureCall__Group_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__0_in_rule__XMemberFeatureCall__Alternatives_18324);
+                    pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__Group_1_1__0();
 
                     state._fsp--;
@@ -12166,13 +12166,13 @@ public final void rule__XMemberFeatureCall__Alternatives_1() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Alternatives_1_0_0_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3825:1: rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 : ( ( '.' ) | ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 ) ) );
+    // InternalCheck.g:3825:1: rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 : ( ( '.' ) | ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 ) ) );
     public final void rule__XMemberFeatureCall__Alternatives_1_0_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3829:1: ( ( '.' ) | ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 ) ) )
+            // InternalCheck.g:3829:1: ( ( '.' ) | ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 ) ) )
             int alt29=2;
             int LA29_0 = input.LA(1);
 
@@ -12191,15 +12191,15 @@ else if ( (LA29_0==104) ) {
             }
             switch (alt29) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3830:1: ( '.' )
+                    // InternalCheck.g:3830:1: ( '.' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3830:1: ( '.' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3831:1: '.'
+                    // InternalCheck.g:3830:1: ( '.' )
+                    // InternalCheck.g:3831:1: '.'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXMemberFeatureCallAccess().getFullStopKeyword_1_0_0_0_1_0()); 
                     }
-                    match(input,63,FOLLOW_63_in_rule__XMemberFeatureCall__Alternatives_1_0_0_0_18358); if (state.failed) return ;
+                    match(input,63,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getXMemberFeatureCallAccess().getFullStopKeyword_1_0_0_0_1_0()); 
                     }
@@ -12210,18 +12210,18 @@ else if ( (LA29_0==104) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3838:6: ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 ) )
+                    // InternalCheck.g:3838:6: ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3838:6: ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3839:1: ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 )
+                    // InternalCheck.g:3838:6: ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 ) )
+                    // InternalCheck.g:3839:1: ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticAssignment_1_0_0_0_1_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3840:1: ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3840:2: rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1
+                    // InternalCheck.g:3840:1: ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 )
+                    // InternalCheck.g:3840:2: rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1
                     {
-                    pushFollow(FOLLOW_rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1_in_rule__XMemberFeatureCall__Alternatives_1_0_0_0_18377);
+                    pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1();
 
                     state._fsp--;
@@ -12256,13 +12256,13 @@ else if ( (LA29_0==104) ) {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Alternatives_1_1_0_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3849:1: rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 : ( ( '.' ) | ( ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 ) ) | ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 ) ) );
+    // InternalCheck.g:3849:1: rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 : ( ( '.' ) | ( ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 ) ) | ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 ) ) );
     public final void rule__XMemberFeatureCall__Alternatives_1_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3853:1: ( ( '.' ) | ( ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 ) ) | ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 ) ) )
+            // InternalCheck.g:3853:1: ( ( '.' ) | ( ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 ) ) | ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 ) ) )
             int alt30=3;
             switch ( input.LA(1) ) {
             case 63:
@@ -12290,15 +12290,15 @@ public final void rule__XMemberFeatureCall__Alternatives_1_1_0_0_1() throws Reco
 
             switch (alt30) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3854:1: ( '.' )
+                    // InternalCheck.g:3854:1: ( '.' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3854:1: ( '.' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3855:1: '.'
+                    // InternalCheck.g:3854:1: ( '.' )
+                    // InternalCheck.g:3855:1: '.'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXMemberFeatureCallAccess().getFullStopKeyword_1_1_0_0_1_0()); 
                     }
-                    match(input,63,FOLLOW_63_in_rule__XMemberFeatureCall__Alternatives_1_1_0_0_18411); if (state.failed) return ;
+                    match(input,63,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getXMemberFeatureCallAccess().getFullStopKeyword_1_1_0_0_1_0()); 
                     }
@@ -12309,18 +12309,18 @@ public final void rule__XMemberFeatureCall__Alternatives_1_1_0_0_1() throws Reco
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3862:6: ( ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 ) )
+                    // InternalCheck.g:3862:6: ( ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3862:6: ( ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3863:1: ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 )
+                    // InternalCheck.g:3862:6: ( ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 ) )
+                    // InternalCheck.g:3863:1: ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXMemberFeatureCallAccess().getNullSafeAssignment_1_1_0_0_1_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3864:1: ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3864:2: rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1
+                    // InternalCheck.g:3864:1: ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 )
+                    // InternalCheck.g:3864:2: rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1
                     {
-                    pushFollow(FOLLOW_rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1_in_rule__XMemberFeatureCall__Alternatives_1_1_0_0_18430);
+                    pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1();
 
                     state._fsp--;
@@ -12338,18 +12338,18 @@ public final void rule__XMemberFeatureCall__Alternatives_1_1_0_0_1() throws Reco
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3868:6: ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 ) )
+                    // InternalCheck.g:3868:6: ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3868:6: ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3869:1: ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 )
+                    // InternalCheck.g:3868:6: ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 ) )
+                    // InternalCheck.g:3869:1: ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticAssignment_1_1_0_0_1_2()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3870:1: ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3870:2: rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2
+                    // InternalCheck.g:3870:1: ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 )
+                    // InternalCheck.g:3870:2: rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2
                     {
-                    pushFollow(FOLLOW_rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2_in_rule__XMemberFeatureCall__Alternatives_1_1_0_0_18448);
+                    pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2();
 
                     state._fsp--;
@@ -12384,29 +12384,29 @@ public final void rule__XMemberFeatureCall__Alternatives_1_1_0_0_1() throws Reco
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Alternatives_1_1_3_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3879:1: rule__XMemberFeatureCall__Alternatives_1_1_3_1 : ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) ) | ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 ) ) );
+    // InternalCheck.g:3879:1: rule__XMemberFeatureCall__Alternatives_1_1_3_1 : ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) ) | ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 ) ) );
     public final void rule__XMemberFeatureCall__Alternatives_1_1_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3883:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) ) | ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 ) ) )
+            // InternalCheck.g:3883:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) ) | ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 ) ) )
             int alt31=2;
             alt31 = dfa31.predict(input);
             switch (alt31) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3884:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) )
+                    // InternalCheck.g:3884:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3884:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3885:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 )
+                    // InternalCheck.g:3884:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) )
+                    // InternalCheck.g:3885:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsAssignment_1_1_3_1_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3886:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3886:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0
+                    // InternalCheck.g:3886:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 )
+                    // InternalCheck.g:3886:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0
                     {
-                    pushFollow(FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0_in_rule__XMemberFeatureCall__Alternatives_1_1_3_18481);
+                    pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0();
 
                     state._fsp--;
@@ -12424,18 +12424,18 @@ public final void rule__XMemberFeatureCall__Alternatives_1_1_3_1() throws Recogn
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3890:6: ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 ) )
+                    // InternalCheck.g:3890:6: ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3890:6: ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3891:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 )
+                    // InternalCheck.g:3890:6: ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 ) )
+                    // InternalCheck.g:3891:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1_3_1_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3892:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3892:2: rule__XMemberFeatureCall__Group_1_1_3_1_1__0
+                    // InternalCheck.g:3892:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 )
+                    // InternalCheck.g:3892:2: rule__XMemberFeatureCall__Group_1_1_3_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1__0_in_rule__XMemberFeatureCall__Alternatives_1_1_3_18499);
+                    pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__Group_1_1_3_1_1__0();
 
                     state._fsp--;
@@ -12470,13 +12470,13 @@ public final void rule__XMemberFeatureCall__Alternatives_1_1_3_1() throws Recogn
 
 
     // $ANTLR start "rule__XLiteral__Alternatives"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3901:1: rule__XLiteral__Alternatives : ( ( ruleXCollectionLiteral ) | ( ( ruleXClosure ) ) | ( ruleXBooleanLiteral ) | ( ruleXNumberLiteral ) | ( ruleXNullLiteral ) | ( ruleXStringLiteral ) | ( ruleXTypeLiteral ) );
+    // InternalCheck.g:3901:1: rule__XLiteral__Alternatives : ( ( ruleXCollectionLiteral ) | ( ( ruleXClosure ) ) | ( ruleXBooleanLiteral ) | ( ruleXNumberLiteral ) | ( ruleXNullLiteral ) | ( ruleXStringLiteral ) | ( ruleXTypeLiteral ) );
     public final void rule__XLiteral__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3905:1: ( ( ruleXCollectionLiteral ) | ( ( ruleXClosure ) ) | ( ruleXBooleanLiteral ) | ( ruleXNumberLiteral ) | ( ruleXNullLiteral ) | ( ruleXStringLiteral ) | ( ruleXTypeLiteral ) )
+            // InternalCheck.g:3905:1: ( ( ruleXCollectionLiteral ) | ( ( ruleXClosure ) ) | ( ruleXBooleanLiteral ) | ( ruleXNumberLiteral ) | ( ruleXNullLiteral ) | ( ruleXStringLiteral ) | ( ruleXTypeLiteral ) )
             int alt32=7;
             switch ( input.LA(1) ) {
             case 77:
@@ -12527,15 +12527,15 @@ public final void rule__XLiteral__Alternatives() throws RecognitionException {
 
             switch (alt32) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3906:1: ( ruleXCollectionLiteral )
+                    // InternalCheck.g:3906:1: ( ruleXCollectionLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3906:1: ( ruleXCollectionLiteral )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3907:1: ruleXCollectionLiteral
+                    // InternalCheck.g:3906:1: ( ruleXCollectionLiteral )
+                    // InternalCheck.g:3907:1: ruleXCollectionLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXLiteralAccess().getXCollectionLiteralParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleXCollectionLiteral_in_rule__XLiteral__Alternatives8532);
+                    pushFollow(FOLLOW_2);
                     ruleXCollectionLiteral();
 
                     state._fsp--;
@@ -12550,18 +12550,18 @@ public final void rule__XLiteral__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3912:6: ( ( ruleXClosure ) )
+                    // InternalCheck.g:3912:6: ( ( ruleXClosure ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3912:6: ( ( ruleXClosure ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3913:1: ( ruleXClosure )
+                    // InternalCheck.g:3912:6: ( ( ruleXClosure ) )
+                    // InternalCheck.g:3913:1: ( ruleXClosure )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXLiteralAccess().getXClosureParserRuleCall_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3914:1: ( ruleXClosure )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3914:3: ruleXClosure
+                    // InternalCheck.g:3914:1: ( ruleXClosure )
+                    // InternalCheck.g:3914:3: ruleXClosure
                     {
-                    pushFollow(FOLLOW_ruleXClosure_in_rule__XLiteral__Alternatives8550);
+                    pushFollow(FOLLOW_2);
                     ruleXClosure();
 
                     state._fsp--;
@@ -12579,15 +12579,15 @@ public final void rule__XLiteral__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3918:6: ( ruleXBooleanLiteral )
+                    // InternalCheck.g:3918:6: ( ruleXBooleanLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3918:6: ( ruleXBooleanLiteral )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3919:1: ruleXBooleanLiteral
+                    // InternalCheck.g:3918:6: ( ruleXBooleanLiteral )
+                    // InternalCheck.g:3919:1: ruleXBooleanLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXLiteralAccess().getXBooleanLiteralParserRuleCall_2()); 
                     }
-                    pushFollow(FOLLOW_ruleXBooleanLiteral_in_rule__XLiteral__Alternatives8568);
+                    pushFollow(FOLLOW_2);
                     ruleXBooleanLiteral();
 
                     state._fsp--;
@@ -12602,15 +12602,15 @@ public final void rule__XLiteral__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3924:6: ( ruleXNumberLiteral )
+                    // InternalCheck.g:3924:6: ( ruleXNumberLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3924:6: ( ruleXNumberLiteral )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3925:1: ruleXNumberLiteral
+                    // InternalCheck.g:3924:6: ( ruleXNumberLiteral )
+                    // InternalCheck.g:3925:1: ruleXNumberLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXLiteralAccess().getXNumberLiteralParserRuleCall_3()); 
                     }
-                    pushFollow(FOLLOW_ruleXNumberLiteral_in_rule__XLiteral__Alternatives8585);
+                    pushFollow(FOLLOW_2);
                     ruleXNumberLiteral();
 
                     state._fsp--;
@@ -12625,15 +12625,15 @@ public final void rule__XLiteral__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3930:6: ( ruleXNullLiteral )
+                    // InternalCheck.g:3930:6: ( ruleXNullLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3930:6: ( ruleXNullLiteral )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3931:1: ruleXNullLiteral
+                    // InternalCheck.g:3930:6: ( ruleXNullLiteral )
+                    // InternalCheck.g:3931:1: ruleXNullLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXLiteralAccess().getXNullLiteralParserRuleCall_4()); 
                     }
-                    pushFollow(FOLLOW_ruleXNullLiteral_in_rule__XLiteral__Alternatives8602);
+                    pushFollow(FOLLOW_2);
                     ruleXNullLiteral();
 
                     state._fsp--;
@@ -12648,15 +12648,15 @@ public final void rule__XLiteral__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3936:6: ( ruleXStringLiteral )
+                    // InternalCheck.g:3936:6: ( ruleXStringLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3936:6: ( ruleXStringLiteral )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3937:1: ruleXStringLiteral
+                    // InternalCheck.g:3936:6: ( ruleXStringLiteral )
+                    // InternalCheck.g:3937:1: ruleXStringLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXLiteralAccess().getXStringLiteralParserRuleCall_5()); 
                     }
-                    pushFollow(FOLLOW_ruleXStringLiteral_in_rule__XLiteral__Alternatives8619);
+                    pushFollow(FOLLOW_2);
                     ruleXStringLiteral();
 
                     state._fsp--;
@@ -12671,15 +12671,15 @@ public final void rule__XLiteral__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3942:6: ( ruleXTypeLiteral )
+                    // InternalCheck.g:3942:6: ( ruleXTypeLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3942:6: ( ruleXTypeLiteral )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3943:1: ruleXTypeLiteral
+                    // InternalCheck.g:3942:6: ( ruleXTypeLiteral )
+                    // InternalCheck.g:3943:1: ruleXTypeLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXLiteralAccess().getXTypeLiteralParserRuleCall_6()); 
                     }
-                    pushFollow(FOLLOW_ruleXTypeLiteral_in_rule__XLiteral__Alternatives8636);
+                    pushFollow(FOLLOW_2);
                     ruleXTypeLiteral();
 
                     state._fsp--;
@@ -12711,13 +12711,13 @@ public final void rule__XLiteral__Alternatives() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCollectionLiteral__Alternatives"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3953:1: rule__XCollectionLiteral__Alternatives : ( ( ruleXSetLiteral ) | ( ruleXListLiteral ) );
+    // InternalCheck.g:3953:1: rule__XCollectionLiteral__Alternatives : ( ( ruleXSetLiteral ) | ( ruleXListLiteral ) );
     public final void rule__XCollectionLiteral__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3957:1: ( ( ruleXSetLiteral ) | ( ruleXListLiteral ) )
+            // InternalCheck.g:3957:1: ( ( ruleXSetLiteral ) | ( ruleXListLiteral ) )
             int alt33=2;
             int LA33_0 = input.LA(1);
 
@@ -12747,15 +12747,15 @@ else if ( (LA33_1==68) ) {
             }
             switch (alt33) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3958:1: ( ruleXSetLiteral )
+                    // InternalCheck.g:3958:1: ( ruleXSetLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3958:1: ( ruleXSetLiteral )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3959:1: ruleXSetLiteral
+                    // InternalCheck.g:3958:1: ( ruleXSetLiteral )
+                    // InternalCheck.g:3959:1: ruleXSetLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXCollectionLiteralAccess().getXSetLiteralParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleXSetLiteral_in_rule__XCollectionLiteral__Alternatives8668);
+                    pushFollow(FOLLOW_2);
                     ruleXSetLiteral();
 
                     state._fsp--;
@@ -12770,15 +12770,15 @@ else if ( (LA33_1==68) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3964:6: ( ruleXListLiteral )
+                    // InternalCheck.g:3964:6: ( ruleXListLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3964:6: ( ruleXListLiteral )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3965:1: ruleXListLiteral
+                    // InternalCheck.g:3964:6: ( ruleXListLiteral )
+                    // InternalCheck.g:3965:1: ruleXListLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXCollectionLiteralAccess().getXListLiteralParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleXListLiteral_in_rule__XCollectionLiteral__Alternatives8685);
+                    pushFollow(FOLLOW_2);
                     ruleXListLiteral();
 
                     state._fsp--;
@@ -12810,29 +12810,29 @@ else if ( (LA33_1==68) ) {
 
 
     // $ANTLR start "rule__XSwitchExpression__Alternatives_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3975:1: rule__XSwitchExpression__Alternatives_2 : ( ( ( rule__XSwitchExpression__Group_2_0__0 ) ) | ( ( rule__XSwitchExpression__Group_2_1__0 ) ) );
+    // InternalCheck.g:3975:1: rule__XSwitchExpression__Alternatives_2 : ( ( ( rule__XSwitchExpression__Group_2_0__0 ) ) | ( ( rule__XSwitchExpression__Group_2_1__0 ) ) );
     public final void rule__XSwitchExpression__Alternatives_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3979:1: ( ( ( rule__XSwitchExpression__Group_2_0__0 ) ) | ( ( rule__XSwitchExpression__Group_2_1__0 ) ) )
+            // InternalCheck.g:3979:1: ( ( ( rule__XSwitchExpression__Group_2_0__0 ) ) | ( ( rule__XSwitchExpression__Group_2_1__0 ) ) )
             int alt34=2;
             alt34 = dfa34.predict(input);
             switch (alt34) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3980:1: ( ( rule__XSwitchExpression__Group_2_0__0 ) )
+                    // InternalCheck.g:3980:1: ( ( rule__XSwitchExpression__Group_2_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3980:1: ( ( rule__XSwitchExpression__Group_2_0__0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3981:1: ( rule__XSwitchExpression__Group_2_0__0 )
+                    // InternalCheck.g:3980:1: ( ( rule__XSwitchExpression__Group_2_0__0 ) )
+                    // InternalCheck.g:3981:1: ( rule__XSwitchExpression__Group_2_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXSwitchExpressionAccess().getGroup_2_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3982:1: ( rule__XSwitchExpression__Group_2_0__0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3982:2: rule__XSwitchExpression__Group_2_0__0
+                    // InternalCheck.g:3982:1: ( rule__XSwitchExpression__Group_2_0__0 )
+                    // InternalCheck.g:3982:2: rule__XSwitchExpression__Group_2_0__0
                     {
-                    pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0__0_in_rule__XSwitchExpression__Alternatives_28717);
+                    pushFollow(FOLLOW_2);
                     rule__XSwitchExpression__Group_2_0__0();
 
                     state._fsp--;
@@ -12850,18 +12850,18 @@ public final void rule__XSwitchExpression__Alternatives_2() throws RecognitionEx
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3986:6: ( ( rule__XSwitchExpression__Group_2_1__0 ) )
+                    // InternalCheck.g:3986:6: ( ( rule__XSwitchExpression__Group_2_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3986:6: ( ( rule__XSwitchExpression__Group_2_1__0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3987:1: ( rule__XSwitchExpression__Group_2_1__0 )
+                    // InternalCheck.g:3986:6: ( ( rule__XSwitchExpression__Group_2_1__0 ) )
+                    // InternalCheck.g:3987:1: ( rule__XSwitchExpression__Group_2_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXSwitchExpressionAccess().getGroup_2_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3988:1: ( rule__XSwitchExpression__Group_2_1__0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3988:2: rule__XSwitchExpression__Group_2_1__0
+                    // InternalCheck.g:3988:1: ( rule__XSwitchExpression__Group_2_1__0 )
+                    // InternalCheck.g:3988:2: rule__XSwitchExpression__Group_2_1__0
                     {
-                    pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1__0_in_rule__XSwitchExpression__Alternatives_28735);
+                    pushFollow(FOLLOW_2);
                     rule__XSwitchExpression__Group_2_1__0();
 
                     state._fsp--;
@@ -12896,13 +12896,13 @@ public final void rule__XSwitchExpression__Alternatives_2() throws RecognitionEx
 
 
     // $ANTLR start "rule__XCasePart__Alternatives_3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3997:1: rule__XCasePart__Alternatives_3 : ( ( ( rule__XCasePart__Group_3_0__0 ) ) | ( ( rule__XCasePart__FallThroughAssignment_3_1 ) ) );
+    // InternalCheck.g:3997:1: rule__XCasePart__Alternatives_3 : ( ( ( rule__XCasePart__Group_3_0__0 ) ) | ( ( rule__XCasePart__FallThroughAssignment_3_1 ) ) );
     public final void rule__XCasePart__Alternatives_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4001:1: ( ( ( rule__XCasePart__Group_3_0__0 ) ) | ( ( rule__XCasePart__FallThroughAssignment_3_1 ) ) )
+            // InternalCheck.g:4001:1: ( ( ( rule__XCasePart__Group_3_0__0 ) ) | ( ( rule__XCasePart__FallThroughAssignment_3_1 ) ) )
             int alt35=2;
             int LA35_0 = input.LA(1);
 
@@ -12921,18 +12921,18 @@ else if ( (LA35_0==74) ) {
             }
             switch (alt35) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4002:1: ( ( rule__XCasePart__Group_3_0__0 ) )
+                    // InternalCheck.g:4002:1: ( ( rule__XCasePart__Group_3_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4002:1: ( ( rule__XCasePart__Group_3_0__0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4003:1: ( rule__XCasePart__Group_3_0__0 )
+                    // InternalCheck.g:4002:1: ( ( rule__XCasePart__Group_3_0__0 ) )
+                    // InternalCheck.g:4003:1: ( rule__XCasePart__Group_3_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXCasePartAccess().getGroup_3_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4004:1: ( rule__XCasePart__Group_3_0__0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4004:2: rule__XCasePart__Group_3_0__0
+                    // InternalCheck.g:4004:1: ( rule__XCasePart__Group_3_0__0 )
+                    // InternalCheck.g:4004:2: rule__XCasePart__Group_3_0__0
                     {
-                    pushFollow(FOLLOW_rule__XCasePart__Group_3_0__0_in_rule__XCasePart__Alternatives_38768);
+                    pushFollow(FOLLOW_2);
                     rule__XCasePart__Group_3_0__0();
 
                     state._fsp--;
@@ -12950,18 +12950,18 @@ else if ( (LA35_0==74) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4008:6: ( ( rule__XCasePart__FallThroughAssignment_3_1 ) )
+                    // InternalCheck.g:4008:6: ( ( rule__XCasePart__FallThroughAssignment_3_1 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4008:6: ( ( rule__XCasePart__FallThroughAssignment_3_1 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4009:1: ( rule__XCasePart__FallThroughAssignment_3_1 )
+                    // InternalCheck.g:4008:6: ( ( rule__XCasePart__FallThroughAssignment_3_1 ) )
+                    // InternalCheck.g:4009:1: ( rule__XCasePart__FallThroughAssignment_3_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXCasePartAccess().getFallThroughAssignment_3_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4010:1: ( rule__XCasePart__FallThroughAssignment_3_1 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4010:2: rule__XCasePart__FallThroughAssignment_3_1
+                    // InternalCheck.g:4010:1: ( rule__XCasePart__FallThroughAssignment_3_1 )
+                    // InternalCheck.g:4010:2: rule__XCasePart__FallThroughAssignment_3_1
                     {
-                    pushFollow(FOLLOW_rule__XCasePart__FallThroughAssignment_3_1_in_rule__XCasePart__Alternatives_38786);
+                    pushFollow(FOLLOW_2);
                     rule__XCasePart__FallThroughAssignment_3_1();
 
                     state._fsp--;
@@ -12996,13 +12996,13 @@ else if ( (LA35_0==74) ) {
 
 
     // $ANTLR start "rule__XExpressionOrVarDeclaration__Alternatives"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4019:1: rule__XExpressionOrVarDeclaration__Alternatives : ( ( ruleXVariableDeclaration ) | ( ruleXExpression ) );
+    // InternalCheck.g:4019:1: rule__XExpressionOrVarDeclaration__Alternatives : ( ( ruleXVariableDeclaration ) | ( ruleXExpression ) );
     public final void rule__XExpressionOrVarDeclaration__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4023:1: ( ( ruleXVariableDeclaration ) | ( ruleXExpression ) )
+            // InternalCheck.g:4023:1: ( ( ruleXVariableDeclaration ) | ( ruleXExpression ) )
             int alt36=2;
             int LA36_0 = input.LA(1);
 
@@ -13021,15 +13021,15 @@ else if ( ((LA36_0>=RULE_ID && LA36_0<=RULE_STRING)||(LA36_0>=16 && LA36_0<=35)|
             }
             switch (alt36) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4024:1: ( ruleXVariableDeclaration )
+                    // InternalCheck.g:4024:1: ( ruleXVariableDeclaration )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4024:1: ( ruleXVariableDeclaration )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4025:1: ruleXVariableDeclaration
+                    // InternalCheck.g:4024:1: ( ruleXVariableDeclaration )
+                    // InternalCheck.g:4025:1: ruleXVariableDeclaration
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXExpressionOrVarDeclarationAccess().getXVariableDeclarationParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleXVariableDeclaration_in_rule__XExpressionOrVarDeclaration__Alternatives8819);
+                    pushFollow(FOLLOW_2);
                     ruleXVariableDeclaration();
 
                     state._fsp--;
@@ -13044,15 +13044,15 @@ else if ( ((LA36_0>=RULE_ID && LA36_0<=RULE_STRING)||(LA36_0>=16 && LA36_0<=35)|
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4030:6: ( ruleXExpression )
+                    // InternalCheck.g:4030:6: ( ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4030:6: ( ruleXExpression )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4031:1: ruleXExpression
+                    // InternalCheck.g:4030:6: ( ruleXExpression )
+                    // InternalCheck.g:4031:1: ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXExpressionOrVarDeclarationAccess().getXExpressionParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_rule__XExpressionOrVarDeclaration__Alternatives8836);
+                    pushFollow(FOLLOW_2);
                     ruleXExpression();
 
                     state._fsp--;
@@ -13084,13 +13084,13 @@ else if ( ((LA36_0>=RULE_ID && LA36_0<=RULE_STRING)||(LA36_0>=16 && LA36_0<=35)|
 
 
     // $ANTLR start "rule__XVariableDeclaration__Alternatives_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4041:1: rule__XVariableDeclaration__Alternatives_1 : ( ( ( rule__XVariableDeclaration__WriteableAssignment_1_0 ) ) | ( 'val' ) );
+    // InternalCheck.g:4041:1: rule__XVariableDeclaration__Alternatives_1 : ( ( ( rule__XVariableDeclaration__WriteableAssignment_1_0 ) ) | ( 'val' ) );
     public final void rule__XVariableDeclaration__Alternatives_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4045:1: ( ( ( rule__XVariableDeclaration__WriteableAssignment_1_0 ) ) | ( 'val' ) )
+            // InternalCheck.g:4045:1: ( ( ( rule__XVariableDeclaration__WriteableAssignment_1_0 ) ) | ( 'val' ) )
             int alt37=2;
             int LA37_0 = input.LA(1);
 
@@ -13109,18 +13109,18 @@ else if ( (LA37_0==64) ) {
             }
             switch (alt37) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4046:1: ( ( rule__XVariableDeclaration__WriteableAssignment_1_0 ) )
+                    // InternalCheck.g:4046:1: ( ( rule__XVariableDeclaration__WriteableAssignment_1_0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4046:1: ( ( rule__XVariableDeclaration__WriteableAssignment_1_0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4047:1: ( rule__XVariableDeclaration__WriteableAssignment_1_0 )
+                    // InternalCheck.g:4046:1: ( ( rule__XVariableDeclaration__WriteableAssignment_1_0 ) )
+                    // InternalCheck.g:4047:1: ( rule__XVariableDeclaration__WriteableAssignment_1_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXVariableDeclarationAccess().getWriteableAssignment_1_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4048:1: ( rule__XVariableDeclaration__WriteableAssignment_1_0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4048:2: rule__XVariableDeclaration__WriteableAssignment_1_0
+                    // InternalCheck.g:4048:1: ( rule__XVariableDeclaration__WriteableAssignment_1_0 )
+                    // InternalCheck.g:4048:2: rule__XVariableDeclaration__WriteableAssignment_1_0
                     {
-                    pushFollow(FOLLOW_rule__XVariableDeclaration__WriteableAssignment_1_0_in_rule__XVariableDeclaration__Alternatives_18868);
+                    pushFollow(FOLLOW_2);
                     rule__XVariableDeclaration__WriteableAssignment_1_0();
 
                     state._fsp--;
@@ -13138,15 +13138,15 @@ else if ( (LA37_0==64) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4052:6: ( 'val' )
+                    // InternalCheck.g:4052:6: ( 'val' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4052:6: ( 'val' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4053:1: 'val'
+                    // InternalCheck.g:4052:6: ( 'val' )
+                    // InternalCheck.g:4053:1: 'val'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXVariableDeclarationAccess().getValKeyword_1_1()); 
                     }
-                    match(input,64,FOLLOW_64_in_rule__XVariableDeclaration__Alternatives_18887); if (state.failed) return ;
+                    match(input,64,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getXVariableDeclarationAccess().getValKeyword_1_1()); 
                     }
@@ -13174,13 +13174,13 @@ else if ( (LA37_0==64) ) {
 
 
     // $ANTLR start "rule__XVariableDeclaration__Alternatives_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4065:1: rule__XVariableDeclaration__Alternatives_2 : ( ( ( rule__XVariableDeclaration__Group_2_0__0 ) ) | ( ( rule__XVariableDeclaration__NameAssignment_2_1 ) ) );
+    // InternalCheck.g:4065:1: rule__XVariableDeclaration__Alternatives_2 : ( ( ( rule__XVariableDeclaration__Group_2_0__0 ) ) | ( ( rule__XVariableDeclaration__NameAssignment_2_1 ) ) );
     public final void rule__XVariableDeclaration__Alternatives_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4069:1: ( ( ( rule__XVariableDeclaration__Group_2_0__0 ) ) | ( ( rule__XVariableDeclaration__NameAssignment_2_1 ) ) )
+            // InternalCheck.g:4069:1: ( ( ( rule__XVariableDeclaration__Group_2_0__0 ) ) | ( ( rule__XVariableDeclaration__NameAssignment_2_1 ) ) )
             int alt38=2;
             int LA38_0 = input.LA(1);
 
@@ -13213,18 +13213,18 @@ else if ( (LA38_0==51||LA38_0==72) ) {
             }
             switch (alt38) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4070:1: ( ( rule__XVariableDeclaration__Group_2_0__0 ) )
+                    // InternalCheck.g:4070:1: ( ( rule__XVariableDeclaration__Group_2_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4070:1: ( ( rule__XVariableDeclaration__Group_2_0__0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4071:1: ( rule__XVariableDeclaration__Group_2_0__0 )
+                    // InternalCheck.g:4070:1: ( ( rule__XVariableDeclaration__Group_2_0__0 ) )
+                    // InternalCheck.g:4071:1: ( rule__XVariableDeclaration__Group_2_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXVariableDeclarationAccess().getGroup_2_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4072:1: ( rule__XVariableDeclaration__Group_2_0__0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4072:2: rule__XVariableDeclaration__Group_2_0__0
+                    // InternalCheck.g:4072:1: ( rule__XVariableDeclaration__Group_2_0__0 )
+                    // InternalCheck.g:4072:2: rule__XVariableDeclaration__Group_2_0__0
                     {
-                    pushFollow(FOLLOW_rule__XVariableDeclaration__Group_2_0__0_in_rule__XVariableDeclaration__Alternatives_28921);
+                    pushFollow(FOLLOW_2);
                     rule__XVariableDeclaration__Group_2_0__0();
 
                     state._fsp--;
@@ -13242,18 +13242,18 @@ else if ( (LA38_0==51||LA38_0==72) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4076:6: ( ( rule__XVariableDeclaration__NameAssignment_2_1 ) )
+                    // InternalCheck.g:4076:6: ( ( rule__XVariableDeclaration__NameAssignment_2_1 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4076:6: ( ( rule__XVariableDeclaration__NameAssignment_2_1 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4077:1: ( rule__XVariableDeclaration__NameAssignment_2_1 )
+                    // InternalCheck.g:4076:6: ( ( rule__XVariableDeclaration__NameAssignment_2_1 ) )
+                    // InternalCheck.g:4077:1: ( rule__XVariableDeclaration__NameAssignment_2_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXVariableDeclarationAccess().getNameAssignment_2_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4078:1: ( rule__XVariableDeclaration__NameAssignment_2_1 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4078:2: rule__XVariableDeclaration__NameAssignment_2_1
+                    // InternalCheck.g:4078:1: ( rule__XVariableDeclaration__NameAssignment_2_1 )
+                    // InternalCheck.g:4078:2: rule__XVariableDeclaration__NameAssignment_2_1
                     {
-                    pushFollow(FOLLOW_rule__XVariableDeclaration__NameAssignment_2_1_in_rule__XVariableDeclaration__Alternatives_28939);
+                    pushFollow(FOLLOW_2);
                     rule__XVariableDeclaration__NameAssignment_2_1();
 
                     state._fsp--;
@@ -13288,29 +13288,29 @@ else if ( (LA38_0==51||LA38_0==72) ) {
 
 
     // $ANTLR start "rule__XFeatureCall__Alternatives_3_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4087:1: rule__XFeatureCall__Alternatives_3_1 : ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) ) | ( ( rule__XFeatureCall__Group_3_1_1__0 ) ) );
+    // InternalCheck.g:4087:1: rule__XFeatureCall__Alternatives_3_1 : ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) ) | ( ( rule__XFeatureCall__Group_3_1_1__0 ) ) );
     public final void rule__XFeatureCall__Alternatives_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4091:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) ) | ( ( rule__XFeatureCall__Group_3_1_1__0 ) ) )
+            // InternalCheck.g:4091:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) ) | ( ( rule__XFeatureCall__Group_3_1_1__0 ) ) )
             int alt39=2;
             alt39 = dfa39.predict(input);
             switch (alt39) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4092:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) )
+                    // InternalCheck.g:4092:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4092:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4093:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 )
+                    // InternalCheck.g:4092:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) )
+                    // InternalCheck.g:4093:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsAssignment_3_1_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4094:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4094:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0
+                    // InternalCheck.g:4094:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 )
+                    // InternalCheck.g:4094:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0
                     {
-                    pushFollow(FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0_in_rule__XFeatureCall__Alternatives_3_18972);
+                    pushFollow(FOLLOW_2);
                     rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0();
 
                     state._fsp--;
@@ -13328,18 +13328,18 @@ public final void rule__XFeatureCall__Alternatives_3_1() throws RecognitionExcep
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4098:6: ( ( rule__XFeatureCall__Group_3_1_1__0 ) )
+                    // InternalCheck.g:4098:6: ( ( rule__XFeatureCall__Group_3_1_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4098:6: ( ( rule__XFeatureCall__Group_3_1_1__0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4099:1: ( rule__XFeatureCall__Group_3_1_1__0 )
+                    // InternalCheck.g:4098:6: ( ( rule__XFeatureCall__Group_3_1_1__0 ) )
+                    // InternalCheck.g:4099:1: ( rule__XFeatureCall__Group_3_1_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXFeatureCallAccess().getGroup_3_1_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4100:1: ( rule__XFeatureCall__Group_3_1_1__0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4100:2: rule__XFeatureCall__Group_3_1_1__0
+                    // InternalCheck.g:4100:1: ( rule__XFeatureCall__Group_3_1_1__0 )
+                    // InternalCheck.g:4100:2: rule__XFeatureCall__Group_3_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__XFeatureCall__Group_3_1_1__0_in_rule__XFeatureCall__Alternatives_3_18990);
+                    pushFollow(FOLLOW_2);
                     rule__XFeatureCall__Group_3_1_1__0();
 
                     state._fsp--;
@@ -13374,13 +13374,13 @@ public final void rule__XFeatureCall__Alternatives_3_1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__IdOrSuper__Alternatives"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4109:1: rule__IdOrSuper__Alternatives : ( ( ruleFeatureCallID ) | ( 'super' ) );
+    // InternalCheck.g:4109:1: rule__IdOrSuper__Alternatives : ( ( ruleFeatureCallID ) | ( 'super' ) );
     public final void rule__IdOrSuper__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4113:1: ( ( ruleFeatureCallID ) | ( 'super' ) )
+            // InternalCheck.g:4113:1: ( ( ruleFeatureCallID ) | ( 'super' ) )
             int alt40=2;
             int LA40_0 = input.LA(1);
 
@@ -13399,15 +13399,15 @@ else if ( (LA40_0==65) ) {
             }
             switch (alt40) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4114:1: ( ruleFeatureCallID )
+                    // InternalCheck.g:4114:1: ( ruleFeatureCallID )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4114:1: ( ruleFeatureCallID )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4115:1: ruleFeatureCallID
+                    // InternalCheck.g:4114:1: ( ruleFeatureCallID )
+                    // InternalCheck.g:4115:1: ruleFeatureCallID
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getIdOrSuperAccess().getFeatureCallIDParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleFeatureCallID_in_rule__IdOrSuper__Alternatives9023);
+                    pushFollow(FOLLOW_2);
                     ruleFeatureCallID();
 
                     state._fsp--;
@@ -13422,15 +13422,15 @@ else if ( (LA40_0==65) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4120:6: ( 'super' )
+                    // InternalCheck.g:4120:6: ( 'super' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4120:6: ( 'super' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4121:1: 'super'
+                    // InternalCheck.g:4120:6: ( 'super' )
+                    // InternalCheck.g:4121:1: 'super'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getIdOrSuperAccess().getSuperKeyword_1()); 
                     }
-                    match(input,65,FOLLOW_65_in_rule__IdOrSuper__Alternatives9041); if (state.failed) return ;
+                    match(input,65,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getIdOrSuperAccess().getSuperKeyword_1()); 
                     }
@@ -13458,29 +13458,29 @@ else if ( (LA40_0==65) ) {
 
 
     // $ANTLR start "rule__XConstructorCall__Alternatives_4_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4133:1: rule__XConstructorCall__Alternatives_4_1 : ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) ) | ( ( rule__XConstructorCall__Group_4_1_1__0 ) ) );
+    // InternalCheck.g:4133:1: rule__XConstructorCall__Alternatives_4_1 : ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) ) | ( ( rule__XConstructorCall__Group_4_1_1__0 ) ) );
     public final void rule__XConstructorCall__Alternatives_4_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4137:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) ) | ( ( rule__XConstructorCall__Group_4_1_1__0 ) ) )
+            // InternalCheck.g:4137:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) ) | ( ( rule__XConstructorCall__Group_4_1_1__0 ) ) )
             int alt41=2;
             alt41 = dfa41.predict(input);
             switch (alt41) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4138:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) )
+                    // InternalCheck.g:4138:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4138:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4139:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 )
+                    // InternalCheck.g:4138:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) )
+                    // InternalCheck.g:4139:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXConstructorCallAccess().getArgumentsAssignment_4_1_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4140:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4140:2: rule__XConstructorCall__ArgumentsAssignment_4_1_0
+                    // InternalCheck.g:4140:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 )
+                    // InternalCheck.g:4140:2: rule__XConstructorCall__ArgumentsAssignment_4_1_0
                     {
-                    pushFollow(FOLLOW_rule__XConstructorCall__ArgumentsAssignment_4_1_0_in_rule__XConstructorCall__Alternatives_4_19075);
+                    pushFollow(FOLLOW_2);
                     rule__XConstructorCall__ArgumentsAssignment_4_1_0();
 
                     state._fsp--;
@@ -13498,18 +13498,18 @@ public final void rule__XConstructorCall__Alternatives_4_1() throws RecognitionE
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4144:6: ( ( rule__XConstructorCall__Group_4_1_1__0 ) )
+                    // InternalCheck.g:4144:6: ( ( rule__XConstructorCall__Group_4_1_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4144:6: ( ( rule__XConstructorCall__Group_4_1_1__0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4145:1: ( rule__XConstructorCall__Group_4_1_1__0 )
+                    // InternalCheck.g:4144:6: ( ( rule__XConstructorCall__Group_4_1_1__0 ) )
+                    // InternalCheck.g:4145:1: ( rule__XConstructorCall__Group_4_1_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXConstructorCallAccess().getGroup_4_1_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4146:1: ( rule__XConstructorCall__Group_4_1_1__0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4146:2: rule__XConstructorCall__Group_4_1_1__0
+                    // InternalCheck.g:4146:1: ( rule__XConstructorCall__Group_4_1_1__0 )
+                    // InternalCheck.g:4146:2: rule__XConstructorCall__Group_4_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__XConstructorCall__Group_4_1_1__0_in_rule__XConstructorCall__Alternatives_4_19093);
+                    pushFollow(FOLLOW_2);
                     rule__XConstructorCall__Group_4_1_1__0();
 
                     state._fsp--;
@@ -13544,13 +13544,13 @@ public final void rule__XConstructorCall__Alternatives_4_1() throws RecognitionE
 
 
     // $ANTLR start "rule__XBooleanLiteral__Alternatives_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4155:1: rule__XBooleanLiteral__Alternatives_1 : ( ( 'false' ) | ( ( rule__XBooleanLiteral__IsTrueAssignment_1_1 ) ) );
+    // InternalCheck.g:4155:1: rule__XBooleanLiteral__Alternatives_1 : ( ( 'false' ) | ( ( rule__XBooleanLiteral__IsTrueAssignment_1_1 ) ) );
     public final void rule__XBooleanLiteral__Alternatives_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4159:1: ( ( 'false' ) | ( ( rule__XBooleanLiteral__IsTrueAssignment_1_1 ) ) )
+            // InternalCheck.g:4159:1: ( ( 'false' ) | ( ( rule__XBooleanLiteral__IsTrueAssignment_1_1 ) ) )
             int alt42=2;
             int LA42_0 = input.LA(1);
 
@@ -13569,15 +13569,15 @@ else if ( (LA42_0==108) ) {
             }
             switch (alt42) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4160:1: ( 'false' )
+                    // InternalCheck.g:4160:1: ( 'false' )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4160:1: ( 'false' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4161:1: 'false'
+                    // InternalCheck.g:4160:1: ( 'false' )
+                    // InternalCheck.g:4161:1: 'false'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXBooleanLiteralAccess().getFalseKeyword_1_0()); 
                     }
-                    match(input,66,FOLLOW_66_in_rule__XBooleanLiteral__Alternatives_19127); if (state.failed) return ;
+                    match(input,66,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getXBooleanLiteralAccess().getFalseKeyword_1_0()); 
                     }
@@ -13588,18 +13588,18 @@ else if ( (LA42_0==108) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4168:6: ( ( rule__XBooleanLiteral__IsTrueAssignment_1_1 ) )
+                    // InternalCheck.g:4168:6: ( ( rule__XBooleanLiteral__IsTrueAssignment_1_1 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4168:6: ( ( rule__XBooleanLiteral__IsTrueAssignment_1_1 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4169:1: ( rule__XBooleanLiteral__IsTrueAssignment_1_1 )
+                    // InternalCheck.g:4168:6: ( ( rule__XBooleanLiteral__IsTrueAssignment_1_1 ) )
+                    // InternalCheck.g:4169:1: ( rule__XBooleanLiteral__IsTrueAssignment_1_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXBooleanLiteralAccess().getIsTrueAssignment_1_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4170:1: ( rule__XBooleanLiteral__IsTrueAssignment_1_1 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4170:2: rule__XBooleanLiteral__IsTrueAssignment_1_1
+                    // InternalCheck.g:4170:1: ( rule__XBooleanLiteral__IsTrueAssignment_1_1 )
+                    // InternalCheck.g:4170:2: rule__XBooleanLiteral__IsTrueAssignment_1_1
                     {
-                    pushFollow(FOLLOW_rule__XBooleanLiteral__IsTrueAssignment_1_1_in_rule__XBooleanLiteral__Alternatives_19146);
+                    pushFollow(FOLLOW_2);
                     rule__XBooleanLiteral__IsTrueAssignment_1_1();
 
                     state._fsp--;
@@ -13634,13 +13634,13 @@ else if ( (LA42_0==108) ) {
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Alternatives_3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4179:1: rule__XTryCatchFinallyExpression__Alternatives_3 : ( ( ( rule__XTryCatchFinallyExpression__Group_3_0__0 ) ) | ( ( rule__XTryCatchFinallyExpression__Group_3_1__0 ) ) );
+    // InternalCheck.g:4179:1: rule__XTryCatchFinallyExpression__Alternatives_3 : ( ( ( rule__XTryCatchFinallyExpression__Group_3_0__0 ) ) | ( ( rule__XTryCatchFinallyExpression__Group_3_1__0 ) ) );
     public final void rule__XTryCatchFinallyExpression__Alternatives_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4183:1: ( ( ( rule__XTryCatchFinallyExpression__Group_3_0__0 ) ) | ( ( rule__XTryCatchFinallyExpression__Group_3_1__0 ) ) )
+            // InternalCheck.g:4183:1: ( ( ( rule__XTryCatchFinallyExpression__Group_3_0__0 ) ) | ( ( rule__XTryCatchFinallyExpression__Group_3_1__0 ) ) )
             int alt43=2;
             int LA43_0 = input.LA(1);
 
@@ -13659,18 +13659,18 @@ else if ( (LA43_0==98) ) {
             }
             switch (alt43) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4184:1: ( ( rule__XTryCatchFinallyExpression__Group_3_0__0 ) )
+                    // InternalCheck.g:4184:1: ( ( rule__XTryCatchFinallyExpression__Group_3_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4184:1: ( ( rule__XTryCatchFinallyExpression__Group_3_0__0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4185:1: ( rule__XTryCatchFinallyExpression__Group_3_0__0 )
+                    // InternalCheck.g:4184:1: ( ( rule__XTryCatchFinallyExpression__Group_3_0__0 ) )
+                    // InternalCheck.g:4185:1: ( rule__XTryCatchFinallyExpression__Group_3_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXTryCatchFinallyExpressionAccess().getGroup_3_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4186:1: ( rule__XTryCatchFinallyExpression__Group_3_0__0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4186:2: rule__XTryCatchFinallyExpression__Group_3_0__0
+                    // InternalCheck.g:4186:1: ( rule__XTryCatchFinallyExpression__Group_3_0__0 )
+                    // InternalCheck.g:4186:2: rule__XTryCatchFinallyExpression__Group_3_0__0
                     {
-                    pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0__0_in_rule__XTryCatchFinallyExpression__Alternatives_39179);
+                    pushFollow(FOLLOW_2);
                     rule__XTryCatchFinallyExpression__Group_3_0__0();
 
                     state._fsp--;
@@ -13688,18 +13688,18 @@ else if ( (LA43_0==98) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4190:6: ( ( rule__XTryCatchFinallyExpression__Group_3_1__0 ) )
+                    // InternalCheck.g:4190:6: ( ( rule__XTryCatchFinallyExpression__Group_3_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4190:6: ( ( rule__XTryCatchFinallyExpression__Group_3_1__0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4191:1: ( rule__XTryCatchFinallyExpression__Group_3_1__0 )
+                    // InternalCheck.g:4190:6: ( ( rule__XTryCatchFinallyExpression__Group_3_1__0 ) )
+                    // InternalCheck.g:4191:1: ( rule__XTryCatchFinallyExpression__Group_3_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXTryCatchFinallyExpressionAccess().getGroup_3_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4192:1: ( rule__XTryCatchFinallyExpression__Group_3_1__0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4192:2: rule__XTryCatchFinallyExpression__Group_3_1__0
+                    // InternalCheck.g:4192:1: ( rule__XTryCatchFinallyExpression__Group_3_1__0 )
+                    // InternalCheck.g:4192:2: rule__XTryCatchFinallyExpression__Group_3_1__0
                     {
-                    pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_1__0_in_rule__XTryCatchFinallyExpression__Alternatives_39197);
+                    pushFollow(FOLLOW_2);
                     rule__XTryCatchFinallyExpression__Group_3_1__0();
 
                     state._fsp--;
@@ -13734,13 +13734,13 @@ else if ( (LA43_0==98) ) {
 
 
     // $ANTLR start "rule__Number__Alternatives"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4201:1: rule__Number__Alternatives : ( ( RULE_HEX ) | ( ( rule__Number__Group_1__0 ) ) );
+    // InternalCheck.g:4201:1: rule__Number__Alternatives : ( ( RULE_HEX ) | ( ( rule__Number__Group_1__0 ) ) );
     public final void rule__Number__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4205:1: ( ( RULE_HEX ) | ( ( rule__Number__Group_1__0 ) ) )
+            // InternalCheck.g:4205:1: ( ( RULE_HEX ) | ( ( rule__Number__Group_1__0 ) ) )
             int alt44=2;
             int LA44_0 = input.LA(1);
 
@@ -13759,15 +13759,15 @@ else if ( ((LA44_0>=RULE_INT && LA44_0<=RULE_DECIMAL)) ) {
             }
             switch (alt44) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4206:1: ( RULE_HEX )
+                    // InternalCheck.g:4206:1: ( RULE_HEX )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4206:1: ( RULE_HEX )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4207:1: RULE_HEX
+                    // InternalCheck.g:4206:1: ( RULE_HEX )
+                    // InternalCheck.g:4207:1: RULE_HEX
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getNumberAccess().getHEXTerminalRuleCall_0()); 
                     }
-                    match(input,RULE_HEX,FOLLOW_RULE_HEX_in_rule__Number__Alternatives9230); if (state.failed) return ;
+                    match(input,RULE_HEX,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getNumberAccess().getHEXTerminalRuleCall_0()); 
                     }
@@ -13778,18 +13778,18 @@ else if ( ((LA44_0>=RULE_INT && LA44_0<=RULE_DECIMAL)) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4212:6: ( ( rule__Number__Group_1__0 ) )
+                    // InternalCheck.g:4212:6: ( ( rule__Number__Group_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4212:6: ( ( rule__Number__Group_1__0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4213:1: ( rule__Number__Group_1__0 )
+                    // InternalCheck.g:4212:6: ( ( rule__Number__Group_1__0 ) )
+                    // InternalCheck.g:4213:1: ( rule__Number__Group_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getNumberAccess().getGroup_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4214:1: ( rule__Number__Group_1__0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4214:2: rule__Number__Group_1__0
+                    // InternalCheck.g:4214:1: ( rule__Number__Group_1__0 )
+                    // InternalCheck.g:4214:2: rule__Number__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__Number__Group_1__0_in_rule__Number__Alternatives9247);
+                    pushFollow(FOLLOW_2);
                     rule__Number__Group_1__0();
 
                     state._fsp--;
@@ -13824,13 +13824,13 @@ else if ( ((LA44_0>=RULE_INT && LA44_0<=RULE_DECIMAL)) ) {
 
 
     // $ANTLR start "rule__Number__Alternatives_1_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4223:1: rule__Number__Alternatives_1_0 : ( ( RULE_INT ) | ( RULE_DECIMAL ) );
+    // InternalCheck.g:4223:1: rule__Number__Alternatives_1_0 : ( ( RULE_INT ) | ( RULE_DECIMAL ) );
     public final void rule__Number__Alternatives_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4227:1: ( ( RULE_INT ) | ( RULE_DECIMAL ) )
+            // InternalCheck.g:4227:1: ( ( RULE_INT ) | ( RULE_DECIMAL ) )
             int alt45=2;
             int LA45_0 = input.LA(1);
 
@@ -13849,15 +13849,15 @@ else if ( (LA45_0==RULE_DECIMAL) ) {
             }
             switch (alt45) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4228:1: ( RULE_INT )
+                    // InternalCheck.g:4228:1: ( RULE_INT )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4228:1: ( RULE_INT )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4229:1: RULE_INT
+                    // InternalCheck.g:4228:1: ( RULE_INT )
+                    // InternalCheck.g:4229:1: RULE_INT
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getNumberAccess().getINTTerminalRuleCall_1_0_0()); 
                     }
-                    match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__Number__Alternatives_1_09280); if (state.failed) return ;
+                    match(input,RULE_INT,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getNumberAccess().getINTTerminalRuleCall_1_0_0()); 
                     }
@@ -13868,15 +13868,15 @@ else if ( (LA45_0==RULE_DECIMAL) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4234:6: ( RULE_DECIMAL )
+                    // InternalCheck.g:4234:6: ( RULE_DECIMAL )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4234:6: ( RULE_DECIMAL )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4235:1: RULE_DECIMAL
+                    // InternalCheck.g:4234:6: ( RULE_DECIMAL )
+                    // InternalCheck.g:4235:1: RULE_DECIMAL
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getNumberAccess().getDECIMALTerminalRuleCall_1_0_1()); 
                     }
-                    match(input,RULE_DECIMAL,FOLLOW_RULE_DECIMAL_in_rule__Number__Alternatives_1_09297); if (state.failed) return ;
+                    match(input,RULE_DECIMAL,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getNumberAccess().getDECIMALTerminalRuleCall_1_0_1()); 
                     }
@@ -13904,13 +13904,13 @@ else if ( (LA45_0==RULE_DECIMAL) ) {
 
 
     // $ANTLR start "rule__Number__Alternatives_1_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4245:1: rule__Number__Alternatives_1_1_1 : ( ( RULE_INT ) | ( RULE_DECIMAL ) );
+    // InternalCheck.g:4245:1: rule__Number__Alternatives_1_1_1 : ( ( RULE_INT ) | ( RULE_DECIMAL ) );
     public final void rule__Number__Alternatives_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4249:1: ( ( RULE_INT ) | ( RULE_DECIMAL ) )
+            // InternalCheck.g:4249:1: ( ( RULE_INT ) | ( RULE_DECIMAL ) )
             int alt46=2;
             int LA46_0 = input.LA(1);
 
@@ -13929,15 +13929,15 @@ else if ( (LA46_0==RULE_DECIMAL) ) {
             }
             switch (alt46) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4250:1: ( RULE_INT )
+                    // InternalCheck.g:4250:1: ( RULE_INT )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4250:1: ( RULE_INT )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4251:1: RULE_INT
+                    // InternalCheck.g:4250:1: ( RULE_INT )
+                    // InternalCheck.g:4251:1: RULE_INT
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getNumberAccess().getINTTerminalRuleCall_1_1_1_0()); 
                     }
-                    match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__Number__Alternatives_1_1_19329); if (state.failed) return ;
+                    match(input,RULE_INT,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getNumberAccess().getINTTerminalRuleCall_1_1_1_0()); 
                     }
@@ -13948,15 +13948,15 @@ else if ( (LA46_0==RULE_DECIMAL) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4256:6: ( RULE_DECIMAL )
+                    // InternalCheck.g:4256:6: ( RULE_DECIMAL )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4256:6: ( RULE_DECIMAL )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4257:1: RULE_DECIMAL
+                    // InternalCheck.g:4256:6: ( RULE_DECIMAL )
+                    // InternalCheck.g:4257:1: RULE_DECIMAL
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getNumberAccess().getDECIMALTerminalRuleCall_1_1_1_1()); 
                     }
-                    match(input,RULE_DECIMAL,FOLLOW_RULE_DECIMAL_in_rule__Number__Alternatives_1_1_19346); if (state.failed) return ;
+                    match(input,RULE_DECIMAL,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getNumberAccess().getDECIMALTerminalRuleCall_1_1_1_1()); 
                     }
@@ -13984,13 +13984,13 @@ else if ( (LA46_0==RULE_DECIMAL) ) {
 
 
     // $ANTLR start "rule__JvmTypeReference__Alternatives"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4267:1: rule__JvmTypeReference__Alternatives : ( ( ( rule__JvmTypeReference__Group_0__0 ) ) | ( ruleXFunctionTypeRef ) );
+    // InternalCheck.g:4267:1: rule__JvmTypeReference__Alternatives : ( ( ( rule__JvmTypeReference__Group_0__0 ) ) | ( ruleXFunctionTypeRef ) );
     public final void rule__JvmTypeReference__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4271:1: ( ( ( rule__JvmTypeReference__Group_0__0 ) ) | ( ruleXFunctionTypeRef ) )
+            // InternalCheck.g:4271:1: ( ( ( rule__JvmTypeReference__Group_0__0 ) ) | ( ruleXFunctionTypeRef ) )
             int alt47=2;
             int LA47_0 = input.LA(1);
 
@@ -14009,18 +14009,18 @@ else if ( (LA47_0==51||LA47_0==72) ) {
             }
             switch (alt47) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4272:1: ( ( rule__JvmTypeReference__Group_0__0 ) )
+                    // InternalCheck.g:4272:1: ( ( rule__JvmTypeReference__Group_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4272:1: ( ( rule__JvmTypeReference__Group_0__0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4273:1: ( rule__JvmTypeReference__Group_0__0 )
+                    // InternalCheck.g:4272:1: ( ( rule__JvmTypeReference__Group_0__0 ) )
+                    // InternalCheck.g:4273:1: ( rule__JvmTypeReference__Group_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getJvmTypeReferenceAccess().getGroup_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4274:1: ( rule__JvmTypeReference__Group_0__0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4274:2: rule__JvmTypeReference__Group_0__0
+                    // InternalCheck.g:4274:1: ( rule__JvmTypeReference__Group_0__0 )
+                    // InternalCheck.g:4274:2: rule__JvmTypeReference__Group_0__0
                     {
-                    pushFollow(FOLLOW_rule__JvmTypeReference__Group_0__0_in_rule__JvmTypeReference__Alternatives9378);
+                    pushFollow(FOLLOW_2);
                     rule__JvmTypeReference__Group_0__0();
 
                     state._fsp--;
@@ -14038,15 +14038,15 @@ else if ( (LA47_0==51||LA47_0==72) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4278:6: ( ruleXFunctionTypeRef )
+                    // InternalCheck.g:4278:6: ( ruleXFunctionTypeRef )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4278:6: ( ruleXFunctionTypeRef )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4279:1: ruleXFunctionTypeRef
+                    // InternalCheck.g:4278:6: ( ruleXFunctionTypeRef )
+                    // InternalCheck.g:4279:1: ruleXFunctionTypeRef
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getJvmTypeReferenceAccess().getXFunctionTypeRefParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleXFunctionTypeRef_in_rule__JvmTypeReference__Alternatives9396);
+                    pushFollow(FOLLOW_2);
                     ruleXFunctionTypeRef();
 
                     state._fsp--;
@@ -14078,13 +14078,13 @@ else if ( (LA47_0==51||LA47_0==72) ) {
 
 
     // $ANTLR start "rule__JvmArgumentTypeReference__Alternatives"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4289:1: rule__JvmArgumentTypeReference__Alternatives : ( ( ruleJvmTypeReference ) | ( ruleJvmWildcardTypeReference ) );
+    // InternalCheck.g:4289:1: rule__JvmArgumentTypeReference__Alternatives : ( ( ruleJvmTypeReference ) | ( ruleJvmWildcardTypeReference ) );
     public final void rule__JvmArgumentTypeReference__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4293:1: ( ( ruleJvmTypeReference ) | ( ruleJvmWildcardTypeReference ) )
+            // InternalCheck.g:4293:1: ( ( ruleJvmTypeReference ) | ( ruleJvmWildcardTypeReference ) )
             int alt48=2;
             int LA48_0 = input.LA(1);
 
@@ -14103,15 +14103,15 @@ else if ( (LA48_0==101) ) {
             }
             switch (alt48) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4294:1: ( ruleJvmTypeReference )
+                    // InternalCheck.g:4294:1: ( ruleJvmTypeReference )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4294:1: ( ruleJvmTypeReference )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4295:1: ruleJvmTypeReference
+                    // InternalCheck.g:4294:1: ( ruleJvmTypeReference )
+                    // InternalCheck.g:4295:1: ruleJvmTypeReference
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getJvmArgumentTypeReferenceAccess().getJvmTypeReferenceParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__JvmArgumentTypeReference__Alternatives9428);
+                    pushFollow(FOLLOW_2);
                     ruleJvmTypeReference();
 
                     state._fsp--;
@@ -14126,15 +14126,15 @@ else if ( (LA48_0==101) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4300:6: ( ruleJvmWildcardTypeReference )
+                    // InternalCheck.g:4300:6: ( ruleJvmWildcardTypeReference )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4300:6: ( ruleJvmWildcardTypeReference )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4301:1: ruleJvmWildcardTypeReference
+                    // InternalCheck.g:4300:6: ( ruleJvmWildcardTypeReference )
+                    // InternalCheck.g:4301:1: ruleJvmWildcardTypeReference
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getJvmArgumentTypeReferenceAccess().getJvmWildcardTypeReferenceParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleJvmWildcardTypeReference_in_rule__JvmArgumentTypeReference__Alternatives9445);
+                    pushFollow(FOLLOW_2);
                     ruleJvmWildcardTypeReference();
 
                     state._fsp--;
@@ -14166,13 +14166,13 @@ else if ( (LA48_0==101) ) {
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Alternatives_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4311:1: rule__JvmWildcardTypeReference__Alternatives_2 : ( ( ( rule__JvmWildcardTypeReference__Group_2_0__0 ) ) | ( ( rule__JvmWildcardTypeReference__Group_2_1__0 ) ) );
+    // InternalCheck.g:4311:1: rule__JvmWildcardTypeReference__Alternatives_2 : ( ( ( rule__JvmWildcardTypeReference__Group_2_0__0 ) ) | ( ( rule__JvmWildcardTypeReference__Group_2_1__0 ) ) );
     public final void rule__JvmWildcardTypeReference__Alternatives_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4315:1: ( ( ( rule__JvmWildcardTypeReference__Group_2_0__0 ) ) | ( ( rule__JvmWildcardTypeReference__Group_2_1__0 ) ) )
+            // InternalCheck.g:4315:1: ( ( ( rule__JvmWildcardTypeReference__Group_2_0__0 ) ) | ( ( rule__JvmWildcardTypeReference__Group_2_1__0 ) ) )
             int alt49=2;
             int LA49_0 = input.LA(1);
 
@@ -14191,18 +14191,18 @@ else if ( (LA49_0==65) ) {
             }
             switch (alt49) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4316:1: ( ( rule__JvmWildcardTypeReference__Group_2_0__0 ) )
+                    // InternalCheck.g:4316:1: ( ( rule__JvmWildcardTypeReference__Group_2_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4316:1: ( ( rule__JvmWildcardTypeReference__Group_2_0__0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4317:1: ( rule__JvmWildcardTypeReference__Group_2_0__0 )
+                    // InternalCheck.g:4316:1: ( ( rule__JvmWildcardTypeReference__Group_2_0__0 ) )
+                    // InternalCheck.g:4317:1: ( rule__JvmWildcardTypeReference__Group_2_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getJvmWildcardTypeReferenceAccess().getGroup_2_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4318:1: ( rule__JvmWildcardTypeReference__Group_2_0__0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4318:2: rule__JvmWildcardTypeReference__Group_2_0__0
+                    // InternalCheck.g:4318:1: ( rule__JvmWildcardTypeReference__Group_2_0__0 )
+                    // InternalCheck.g:4318:2: rule__JvmWildcardTypeReference__Group_2_0__0
                     {
-                    pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group_2_0__0_in_rule__JvmWildcardTypeReference__Alternatives_29477);
+                    pushFollow(FOLLOW_2);
                     rule__JvmWildcardTypeReference__Group_2_0__0();
 
                     state._fsp--;
@@ -14220,18 +14220,18 @@ else if ( (LA49_0==65) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4322:6: ( ( rule__JvmWildcardTypeReference__Group_2_1__0 ) )
+                    // InternalCheck.g:4322:6: ( ( rule__JvmWildcardTypeReference__Group_2_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4322:6: ( ( rule__JvmWildcardTypeReference__Group_2_1__0 ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4323:1: ( rule__JvmWildcardTypeReference__Group_2_1__0 )
+                    // InternalCheck.g:4322:6: ( ( rule__JvmWildcardTypeReference__Group_2_1__0 ) )
+                    // InternalCheck.g:4323:1: ( rule__JvmWildcardTypeReference__Group_2_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getJvmWildcardTypeReferenceAccess().getGroup_2_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4324:1: ( rule__JvmWildcardTypeReference__Group_2_1__0 )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4324:2: rule__JvmWildcardTypeReference__Group_2_1__0
+                    // InternalCheck.g:4324:1: ( rule__JvmWildcardTypeReference__Group_2_1__0 )
+                    // InternalCheck.g:4324:2: rule__JvmWildcardTypeReference__Group_2_1__0
                     {
-                    pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group_2_1__0_in_rule__JvmWildcardTypeReference__Alternatives_29495);
+                    pushFollow(FOLLOW_2);
                     rule__JvmWildcardTypeReference__Group_2_1__0();
 
                     state._fsp--;
@@ -14266,13 +14266,13 @@ else if ( (LA49_0==65) ) {
 
 
     // $ANTLR start "rule__SeverityKind__Alternatives"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4333:1: rule__SeverityKind__Alternatives : ( ( ( 'error' ) ) | ( ( 'warning' ) ) | ( ( 'info' ) ) | ( ( 'ignore' ) ) );
+    // InternalCheck.g:4333:1: rule__SeverityKind__Alternatives : ( ( ( 'error' ) ) | ( ( 'warning' ) ) | ( ( 'info' ) ) | ( ( 'ignore' ) ) );
     public final void rule__SeverityKind__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4337:1: ( ( ( 'error' ) ) | ( ( 'warning' ) ) | ( ( 'info' ) ) | ( ( 'ignore' ) ) )
+            // InternalCheck.g:4337:1: ( ( ( 'error' ) ) | ( ( 'warning' ) ) | ( ( 'info' ) ) | ( ( 'ignore' ) ) )
             int alt50=4;
             switch ( input.LA(1) ) {
             case 29:
@@ -14305,18 +14305,18 @@ public final void rule__SeverityKind__Alternatives() throws RecognitionException
 
             switch (alt50) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4338:1: ( ( 'error' ) )
+                    // InternalCheck.g:4338:1: ( ( 'error' ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4338:1: ( ( 'error' ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4339:1: ( 'error' )
+                    // InternalCheck.g:4338:1: ( ( 'error' ) )
+                    // InternalCheck.g:4339:1: ( 'error' )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getSeverityKindAccess().getErrorEnumLiteralDeclaration_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4340:1: ( 'error' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4340:3: 'error'
+                    // InternalCheck.g:4340:1: ( 'error' )
+                    // InternalCheck.g:4340:3: 'error'
                     {
-                    match(input,29,FOLLOW_29_in_rule__SeverityKind__Alternatives9529); if (state.failed) return ;
+                    match(input,29,FOLLOW_2); if (state.failed) return ;
 
                     }
 
@@ -14330,18 +14330,18 @@ public final void rule__SeverityKind__Alternatives() throws RecognitionException
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4345:6: ( ( 'warning' ) )
+                    // InternalCheck.g:4345:6: ( ( 'warning' ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4345:6: ( ( 'warning' ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4346:1: ( 'warning' )
+                    // InternalCheck.g:4345:6: ( ( 'warning' ) )
+                    // InternalCheck.g:4346:1: ( 'warning' )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getSeverityKindAccess().getWarningEnumLiteralDeclaration_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4347:1: ( 'warning' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4347:3: 'warning'
+                    // InternalCheck.g:4347:1: ( 'warning' )
+                    // InternalCheck.g:4347:3: 'warning'
                     {
-                    match(input,30,FOLLOW_30_in_rule__SeverityKind__Alternatives9550); if (state.failed) return ;
+                    match(input,30,FOLLOW_2); if (state.failed) return ;
 
                     }
 
@@ -14355,18 +14355,18 @@ public final void rule__SeverityKind__Alternatives() throws RecognitionException
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4352:6: ( ( 'info' ) )
+                    // InternalCheck.g:4352:6: ( ( 'info' ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4352:6: ( ( 'info' ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4353:1: ( 'info' )
+                    // InternalCheck.g:4352:6: ( ( 'info' ) )
+                    // InternalCheck.g:4353:1: ( 'info' )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getSeverityKindAccess().getInfoEnumLiteralDeclaration_2()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4354:1: ( 'info' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4354:3: 'info'
+                    // InternalCheck.g:4354:1: ( 'info' )
+                    // InternalCheck.g:4354:3: 'info'
                     {
-                    match(input,31,FOLLOW_31_in_rule__SeverityKind__Alternatives9571); if (state.failed) return ;
+                    match(input,31,FOLLOW_2); if (state.failed) return ;
 
                     }
 
@@ -14380,18 +14380,18 @@ public final void rule__SeverityKind__Alternatives() throws RecognitionException
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4359:6: ( ( 'ignore' ) )
+                    // InternalCheck.g:4359:6: ( ( 'ignore' ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4359:6: ( ( 'ignore' ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4360:1: ( 'ignore' )
+                    // InternalCheck.g:4359:6: ( ( 'ignore' ) )
+                    // InternalCheck.g:4360:1: ( 'ignore' )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getSeverityKindAccess().getIgnoreEnumLiteralDeclaration_3()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4361:1: ( 'ignore' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4361:3: 'ignore'
+                    // InternalCheck.g:4361:1: ( 'ignore' )
+                    // InternalCheck.g:4361:3: 'ignore'
                     {
-                    match(input,32,FOLLOW_32_in_rule__SeverityKind__Alternatives9592); if (state.failed) return ;
+                    match(input,32,FOLLOW_2); if (state.failed) return ;
 
                     }
 
@@ -14422,13 +14422,13 @@ public final void rule__SeverityKind__Alternatives() throws RecognitionException
 
 
     // $ANTLR start "rule__TriggerKind__Alternatives"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4371:1: rule__TriggerKind__Alternatives : ( ( ( 'live' ) ) | ( ( 'onSave' ) ) | ( ( 'onDemand' ) ) );
+    // InternalCheck.g:4371:1: rule__TriggerKind__Alternatives : ( ( ( 'live' ) ) | ( ( 'onSave' ) ) | ( ( 'onDemand' ) ) );
     public final void rule__TriggerKind__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4375:1: ( ( ( 'live' ) ) | ( ( 'onSave' ) ) | ( ( 'onDemand' ) ) )
+            // InternalCheck.g:4375:1: ( ( ( 'live' ) ) | ( ( 'onSave' ) ) | ( ( 'onDemand' ) ) )
             int alt51=3;
             switch ( input.LA(1) ) {
             case 33:
@@ -14456,18 +14456,18 @@ public final void rule__TriggerKind__Alternatives() throws RecognitionException
 
             switch (alt51) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4376:1: ( ( 'live' ) )
+                    // InternalCheck.g:4376:1: ( ( 'live' ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4376:1: ( ( 'live' ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4377:1: ( 'live' )
+                    // InternalCheck.g:4376:1: ( ( 'live' ) )
+                    // InternalCheck.g:4377:1: ( 'live' )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTriggerKindAccess().getFastEnumLiteralDeclaration_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4378:1: ( 'live' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4378:3: 'live'
+                    // InternalCheck.g:4378:1: ( 'live' )
+                    // InternalCheck.g:4378:3: 'live'
                     {
-                    match(input,33,FOLLOW_33_in_rule__TriggerKind__Alternatives9628); if (state.failed) return ;
+                    match(input,33,FOLLOW_2); if (state.failed) return ;
 
                     }
 
@@ -14481,18 +14481,18 @@ public final void rule__TriggerKind__Alternatives() throws RecognitionException
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4383:6: ( ( 'onSave' ) )
+                    // InternalCheck.g:4383:6: ( ( 'onSave' ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4383:6: ( ( 'onSave' ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4384:1: ( 'onSave' )
+                    // InternalCheck.g:4383:6: ( ( 'onSave' ) )
+                    // InternalCheck.g:4384:1: ( 'onSave' )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTriggerKindAccess().getNormalEnumLiteralDeclaration_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4385:1: ( 'onSave' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4385:3: 'onSave'
+                    // InternalCheck.g:4385:1: ( 'onSave' )
+                    // InternalCheck.g:4385:3: 'onSave'
                     {
-                    match(input,34,FOLLOW_34_in_rule__TriggerKind__Alternatives9649); if (state.failed) return ;
+                    match(input,34,FOLLOW_2); if (state.failed) return ;
 
                     }
 
@@ -14506,18 +14506,18 @@ public final void rule__TriggerKind__Alternatives() throws RecognitionException
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4390:6: ( ( 'onDemand' ) )
+                    // InternalCheck.g:4390:6: ( ( 'onDemand' ) )
                     {
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4390:6: ( ( 'onDemand' ) )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4391:1: ( 'onDemand' )
+                    // InternalCheck.g:4390:6: ( ( 'onDemand' ) )
+                    // InternalCheck.g:4391:1: ( 'onDemand' )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTriggerKindAccess().getExpensiveEnumLiteralDeclaration_2()); 
                     }
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4392:1: ( 'onDemand' )
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4392:3: 'onDemand'
+                    // InternalCheck.g:4392:1: ( 'onDemand' )
+                    // InternalCheck.g:4392:3: 'onDemand'
                     {
-                    match(input,35,FOLLOW_35_in_rule__TriggerKind__Alternatives9670); if (state.failed) return ;
+                    match(input,35,FOLLOW_2); if (state.failed) return ;
 
                     }
 
@@ -14548,21 +14548,21 @@ public final void rule__TriggerKind__Alternatives() throws RecognitionException
 
 
     // $ANTLR start "rule__CheckCatalog__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4404:1: rule__CheckCatalog__Group__0 : rule__CheckCatalog__Group__0__Impl rule__CheckCatalog__Group__1 ;
+    // InternalCheck.g:4404:1: rule__CheckCatalog__Group__0 : rule__CheckCatalog__Group__0__Impl rule__CheckCatalog__Group__1 ;
     public final void rule__CheckCatalog__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4408:1: ( rule__CheckCatalog__Group__0__Impl rule__CheckCatalog__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4409:2: rule__CheckCatalog__Group__0__Impl rule__CheckCatalog__Group__1
+            // InternalCheck.g:4408:1: ( rule__CheckCatalog__Group__0__Impl rule__CheckCatalog__Group__1 )
+            // InternalCheck.g:4409:2: rule__CheckCatalog__Group__0__Impl rule__CheckCatalog__Group__1
             {
-            pushFollow(FOLLOW_rule__CheckCatalog__Group__0__Impl_in_rule__CheckCatalog__Group__09703);
+            pushFollow(FOLLOW_3);
             rule__CheckCatalog__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CheckCatalog__Group__1_in_rule__CheckCatalog__Group__09706);
+            pushFollow(FOLLOW_2);
             rule__CheckCatalog__Group__1();
 
             state._fsp--;
@@ -14586,23 +14586,23 @@ public final void rule__CheckCatalog__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__CheckCatalog__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4416:1: rule__CheckCatalog__Group__0__Impl : ( () ) ;
+    // InternalCheck.g:4416:1: rule__CheckCatalog__Group__0__Impl : ( () ) ;
     public final void rule__CheckCatalog__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4420:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4421:1: ( () )
+            // InternalCheck.g:4420:1: ( ( () ) )
+            // InternalCheck.g:4421:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4421:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4422:1: ()
+            // InternalCheck.g:4421:1: ( () )
+            // InternalCheck.g:4422:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckCatalogAccess().getCheckCatalogAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4423:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4425:1: 
+            // InternalCheck.g:4423:1: ()
+            // InternalCheck.g:4425:1: 
             {
             }
 
@@ -14627,21 +14627,21 @@ public final void rule__CheckCatalog__Group__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__CheckCatalog__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4435:1: rule__CheckCatalog__Group__1 : rule__CheckCatalog__Group__1__Impl rule__CheckCatalog__Group__2 ;
+    // InternalCheck.g:4435:1: rule__CheckCatalog__Group__1 : rule__CheckCatalog__Group__1__Impl rule__CheckCatalog__Group__2 ;
     public final void rule__CheckCatalog__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4439:1: ( rule__CheckCatalog__Group__1__Impl rule__CheckCatalog__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4440:2: rule__CheckCatalog__Group__1__Impl rule__CheckCatalog__Group__2
+            // InternalCheck.g:4439:1: ( rule__CheckCatalog__Group__1__Impl rule__CheckCatalog__Group__2 )
+            // InternalCheck.g:4440:2: rule__CheckCatalog__Group__1__Impl rule__CheckCatalog__Group__2
             {
-            pushFollow(FOLLOW_rule__CheckCatalog__Group__1__Impl_in_rule__CheckCatalog__Group__19764);
+            pushFollow(FOLLOW_4);
             rule__CheckCatalog__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CheckCatalog__Group__2_in_rule__CheckCatalog__Group__19767);
+            pushFollow(FOLLOW_2);
             rule__CheckCatalog__Group__2();
 
             state._fsp--;
@@ -14665,22 +14665,22 @@ public final void rule__CheckCatalog__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__CheckCatalog__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4447:1: rule__CheckCatalog__Group__1__Impl : ( 'package' ) ;
+    // InternalCheck.g:4447:1: rule__CheckCatalog__Group__1__Impl : ( 'package' ) ;
     public final void rule__CheckCatalog__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4451:1: ( ( 'package' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4452:1: ( 'package' )
+            // InternalCheck.g:4451:1: ( ( 'package' ) )
+            // InternalCheck.g:4452:1: ( 'package' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4452:1: ( 'package' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4453:1: 'package'
+            // InternalCheck.g:4452:1: ( 'package' )
+            // InternalCheck.g:4453:1: 'package'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckCatalogAccess().getPackageKeyword_1()); 
             }
-            match(input,67,FOLLOW_67_in_rule__CheckCatalog__Group__1__Impl9795); if (state.failed) return ;
+            match(input,67,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCheckCatalogAccess().getPackageKeyword_1()); 
             }
@@ -14706,21 +14706,21 @@ public final void rule__CheckCatalog__Group__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__CheckCatalog__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4466:1: rule__CheckCatalog__Group__2 : rule__CheckCatalog__Group__2__Impl rule__CheckCatalog__Group__3 ;
+    // InternalCheck.g:4466:1: rule__CheckCatalog__Group__2 : rule__CheckCatalog__Group__2__Impl rule__CheckCatalog__Group__3 ;
     public final void rule__CheckCatalog__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4470:1: ( rule__CheckCatalog__Group__2__Impl rule__CheckCatalog__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4471:2: rule__CheckCatalog__Group__2__Impl rule__CheckCatalog__Group__3
+            // InternalCheck.g:4470:1: ( rule__CheckCatalog__Group__2__Impl rule__CheckCatalog__Group__3 )
+            // InternalCheck.g:4471:2: rule__CheckCatalog__Group__2__Impl rule__CheckCatalog__Group__3
             {
-            pushFollow(FOLLOW_rule__CheckCatalog__Group__2__Impl_in_rule__CheckCatalog__Group__29826);
+            pushFollow(FOLLOW_5);
             rule__CheckCatalog__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CheckCatalog__Group__3_in_rule__CheckCatalog__Group__29829);
+            pushFollow(FOLLOW_2);
             rule__CheckCatalog__Group__3();
 
             state._fsp--;
@@ -14744,25 +14744,25 @@ public final void rule__CheckCatalog__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__CheckCatalog__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4478:1: rule__CheckCatalog__Group__2__Impl : ( ( rule__CheckCatalog__PackageNameAssignment_2 ) ) ;
+    // InternalCheck.g:4478:1: rule__CheckCatalog__Group__2__Impl : ( ( rule__CheckCatalog__PackageNameAssignment_2 ) ) ;
     public final void rule__CheckCatalog__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4482:1: ( ( ( rule__CheckCatalog__PackageNameAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4483:1: ( ( rule__CheckCatalog__PackageNameAssignment_2 ) )
+            // InternalCheck.g:4482:1: ( ( ( rule__CheckCatalog__PackageNameAssignment_2 ) ) )
+            // InternalCheck.g:4483:1: ( ( rule__CheckCatalog__PackageNameAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4483:1: ( ( rule__CheckCatalog__PackageNameAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4484:1: ( rule__CheckCatalog__PackageNameAssignment_2 )
+            // InternalCheck.g:4483:1: ( ( rule__CheckCatalog__PackageNameAssignment_2 ) )
+            // InternalCheck.g:4484:1: ( rule__CheckCatalog__PackageNameAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckCatalogAccess().getPackageNameAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4485:1: ( rule__CheckCatalog__PackageNameAssignment_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4485:2: rule__CheckCatalog__PackageNameAssignment_2
+            // InternalCheck.g:4485:1: ( rule__CheckCatalog__PackageNameAssignment_2 )
+            // InternalCheck.g:4485:2: rule__CheckCatalog__PackageNameAssignment_2
             {
-            pushFollow(FOLLOW_rule__CheckCatalog__PackageNameAssignment_2_in_rule__CheckCatalog__Group__2__Impl9856);
+            pushFollow(FOLLOW_2);
             rule__CheckCatalog__PackageNameAssignment_2();
 
             state._fsp--;
@@ -14795,21 +14795,21 @@ public final void rule__CheckCatalog__Group__2__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__CheckCatalog__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4495:1: rule__CheckCatalog__Group__3 : rule__CheckCatalog__Group__3__Impl rule__CheckCatalog__Group__4 ;
+    // InternalCheck.g:4495:1: rule__CheckCatalog__Group__3 : rule__CheckCatalog__Group__3__Impl rule__CheckCatalog__Group__4 ;
     public final void rule__CheckCatalog__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4499:1: ( rule__CheckCatalog__Group__3__Impl rule__CheckCatalog__Group__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4500:2: rule__CheckCatalog__Group__3__Impl rule__CheckCatalog__Group__4
+            // InternalCheck.g:4499:1: ( rule__CheckCatalog__Group__3__Impl rule__CheckCatalog__Group__4 )
+            // InternalCheck.g:4500:2: rule__CheckCatalog__Group__3__Impl rule__CheckCatalog__Group__4
             {
-            pushFollow(FOLLOW_rule__CheckCatalog__Group__3__Impl_in_rule__CheckCatalog__Group__39886);
+            pushFollow(FOLLOW_6);
             rule__CheckCatalog__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CheckCatalog__Group__4_in_rule__CheckCatalog__Group__39889);
+            pushFollow(FOLLOW_2);
             rule__CheckCatalog__Group__4();
 
             state._fsp--;
@@ -14833,25 +14833,25 @@ public final void rule__CheckCatalog__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__CheckCatalog__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4507:1: rule__CheckCatalog__Group__3__Impl : ( ( rule__CheckCatalog__ImportsAssignment_3 ) ) ;
+    // InternalCheck.g:4507:1: rule__CheckCatalog__Group__3__Impl : ( ( rule__CheckCatalog__ImportsAssignment_3 ) ) ;
     public final void rule__CheckCatalog__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4511:1: ( ( ( rule__CheckCatalog__ImportsAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4512:1: ( ( rule__CheckCatalog__ImportsAssignment_3 ) )
+            // InternalCheck.g:4511:1: ( ( ( rule__CheckCatalog__ImportsAssignment_3 ) ) )
+            // InternalCheck.g:4512:1: ( ( rule__CheckCatalog__ImportsAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4512:1: ( ( rule__CheckCatalog__ImportsAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4513:1: ( rule__CheckCatalog__ImportsAssignment_3 )
+            // InternalCheck.g:4512:1: ( ( rule__CheckCatalog__ImportsAssignment_3 ) )
+            // InternalCheck.g:4513:1: ( rule__CheckCatalog__ImportsAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckCatalogAccess().getImportsAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4514:1: ( rule__CheckCatalog__ImportsAssignment_3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4514:2: rule__CheckCatalog__ImportsAssignment_3
+            // InternalCheck.g:4514:1: ( rule__CheckCatalog__ImportsAssignment_3 )
+            // InternalCheck.g:4514:2: rule__CheckCatalog__ImportsAssignment_3
             {
-            pushFollow(FOLLOW_rule__CheckCatalog__ImportsAssignment_3_in_rule__CheckCatalog__Group__3__Impl9916);
+            pushFollow(FOLLOW_2);
             rule__CheckCatalog__ImportsAssignment_3();
 
             state._fsp--;
@@ -14884,21 +14884,21 @@ public final void rule__CheckCatalog__Group__3__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__CheckCatalog__Group__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4524:1: rule__CheckCatalog__Group__4 : rule__CheckCatalog__Group__4__Impl rule__CheckCatalog__Group__5 ;
+    // InternalCheck.g:4524:1: rule__CheckCatalog__Group__4 : rule__CheckCatalog__Group__4__Impl rule__CheckCatalog__Group__5 ;
     public final void rule__CheckCatalog__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4528:1: ( rule__CheckCatalog__Group__4__Impl rule__CheckCatalog__Group__5 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4529:2: rule__CheckCatalog__Group__4__Impl rule__CheckCatalog__Group__5
+            // InternalCheck.g:4528:1: ( rule__CheckCatalog__Group__4__Impl rule__CheckCatalog__Group__5 )
+            // InternalCheck.g:4529:2: rule__CheckCatalog__Group__4__Impl rule__CheckCatalog__Group__5
             {
-            pushFollow(FOLLOW_rule__CheckCatalog__Group__4__Impl_in_rule__CheckCatalog__Group__49946);
+            pushFollow(FOLLOW_6);
             rule__CheckCatalog__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CheckCatalog__Group__5_in_rule__CheckCatalog__Group__49949);
+            pushFollow(FOLLOW_2);
             rule__CheckCatalog__Group__5();
 
             state._fsp--;
@@ -14922,22 +14922,22 @@ public final void rule__CheckCatalog__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__CheckCatalog__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4536:1: rule__CheckCatalog__Group__4__Impl : ( ( rule__CheckCatalog__FinalAssignment_4 )? ) ;
+    // InternalCheck.g:4536:1: rule__CheckCatalog__Group__4__Impl : ( ( rule__CheckCatalog__FinalAssignment_4 )? ) ;
     public final void rule__CheckCatalog__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4540:1: ( ( ( rule__CheckCatalog__FinalAssignment_4 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4541:1: ( ( rule__CheckCatalog__FinalAssignment_4 )? )
+            // InternalCheck.g:4540:1: ( ( ( rule__CheckCatalog__FinalAssignment_4 )? ) )
+            // InternalCheck.g:4541:1: ( ( rule__CheckCatalog__FinalAssignment_4 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4541:1: ( ( rule__CheckCatalog__FinalAssignment_4 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4542:1: ( rule__CheckCatalog__FinalAssignment_4 )?
+            // InternalCheck.g:4541:1: ( ( rule__CheckCatalog__FinalAssignment_4 )? )
+            // InternalCheck.g:4542:1: ( rule__CheckCatalog__FinalAssignment_4 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckCatalogAccess().getFinalAssignment_4()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4543:1: ( rule__CheckCatalog__FinalAssignment_4 )?
+            // InternalCheck.g:4543:1: ( rule__CheckCatalog__FinalAssignment_4 )?
             int alt52=2;
             int LA52_0 = input.LA(1);
 
@@ -14946,9 +14946,9 @@ public final void rule__CheckCatalog__Group__4__Impl() throws RecognitionExcepti
             }
             switch (alt52) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4543:2: rule__CheckCatalog__FinalAssignment_4
+                    // InternalCheck.g:4543:2: rule__CheckCatalog__FinalAssignment_4
                     {
-                    pushFollow(FOLLOW_rule__CheckCatalog__FinalAssignment_4_in_rule__CheckCatalog__Group__4__Impl9976);
+                    pushFollow(FOLLOW_2);
                     rule__CheckCatalog__FinalAssignment_4();
 
                     state._fsp--;
@@ -14984,21 +14984,21 @@ public final void rule__CheckCatalog__Group__4__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__CheckCatalog__Group__5"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4553:1: rule__CheckCatalog__Group__5 : rule__CheckCatalog__Group__5__Impl rule__CheckCatalog__Group__6 ;
+    // InternalCheck.g:4553:1: rule__CheckCatalog__Group__5 : rule__CheckCatalog__Group__5__Impl rule__CheckCatalog__Group__6 ;
     public final void rule__CheckCatalog__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4557:1: ( rule__CheckCatalog__Group__5__Impl rule__CheckCatalog__Group__6 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4558:2: rule__CheckCatalog__Group__5__Impl rule__CheckCatalog__Group__6
+            // InternalCheck.g:4557:1: ( rule__CheckCatalog__Group__5__Impl rule__CheckCatalog__Group__6 )
+            // InternalCheck.g:4558:2: rule__CheckCatalog__Group__5__Impl rule__CheckCatalog__Group__6
             {
-            pushFollow(FOLLOW_rule__CheckCatalog__Group__5__Impl_in_rule__CheckCatalog__Group__510007);
+            pushFollow(FOLLOW_4);
             rule__CheckCatalog__Group__5__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CheckCatalog__Group__6_in_rule__CheckCatalog__Group__510010);
+            pushFollow(FOLLOW_2);
             rule__CheckCatalog__Group__6();
 
             state._fsp--;
@@ -15022,22 +15022,22 @@ public final void rule__CheckCatalog__Group__5() throws RecognitionException {
 
 
     // $ANTLR start "rule__CheckCatalog__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4565:1: rule__CheckCatalog__Group__5__Impl : ( 'catalog' ) ;
+    // InternalCheck.g:4565:1: rule__CheckCatalog__Group__5__Impl : ( 'catalog' ) ;
     public final void rule__CheckCatalog__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4569:1: ( ( 'catalog' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4570:1: ( 'catalog' )
+            // InternalCheck.g:4569:1: ( ( 'catalog' ) )
+            // InternalCheck.g:4570:1: ( 'catalog' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4570:1: ( 'catalog' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4571:1: 'catalog'
+            // InternalCheck.g:4570:1: ( 'catalog' )
+            // InternalCheck.g:4571:1: 'catalog'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckCatalogAccess().getCatalogKeyword_5()); 
             }
-            match(input,20,FOLLOW_20_in_rule__CheckCatalog__Group__5__Impl10038); if (state.failed) return ;
+            match(input,20,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCheckCatalogAccess().getCatalogKeyword_5()); 
             }
@@ -15063,21 +15063,21 @@ public final void rule__CheckCatalog__Group__5__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__CheckCatalog__Group__6"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4584:1: rule__CheckCatalog__Group__6 : rule__CheckCatalog__Group__6__Impl rule__CheckCatalog__Group__7 ;
+    // InternalCheck.g:4584:1: rule__CheckCatalog__Group__6 : rule__CheckCatalog__Group__6__Impl rule__CheckCatalog__Group__7 ;
     public final void rule__CheckCatalog__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4588:1: ( rule__CheckCatalog__Group__6__Impl rule__CheckCatalog__Group__7 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4589:2: rule__CheckCatalog__Group__6__Impl rule__CheckCatalog__Group__7
+            // InternalCheck.g:4588:1: ( rule__CheckCatalog__Group__6__Impl rule__CheckCatalog__Group__7 )
+            // InternalCheck.g:4589:2: rule__CheckCatalog__Group__6__Impl rule__CheckCatalog__Group__7
             {
-            pushFollow(FOLLOW_rule__CheckCatalog__Group__6__Impl_in_rule__CheckCatalog__Group__610069);
+            pushFollow(FOLLOW_7);
             rule__CheckCatalog__Group__6__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CheckCatalog__Group__7_in_rule__CheckCatalog__Group__610072);
+            pushFollow(FOLLOW_2);
             rule__CheckCatalog__Group__7();
 
             state._fsp--;
@@ -15101,25 +15101,25 @@ public final void rule__CheckCatalog__Group__6() throws RecognitionException {
 
 
     // $ANTLR start "rule__CheckCatalog__Group__6__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4596:1: rule__CheckCatalog__Group__6__Impl : ( ( rule__CheckCatalog__NameAssignment_6 ) ) ;
+    // InternalCheck.g:4596:1: rule__CheckCatalog__Group__6__Impl : ( ( rule__CheckCatalog__NameAssignment_6 ) ) ;
     public final void rule__CheckCatalog__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4600:1: ( ( ( rule__CheckCatalog__NameAssignment_6 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4601:1: ( ( rule__CheckCatalog__NameAssignment_6 ) )
+            // InternalCheck.g:4600:1: ( ( ( rule__CheckCatalog__NameAssignment_6 ) ) )
+            // InternalCheck.g:4601:1: ( ( rule__CheckCatalog__NameAssignment_6 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4601:1: ( ( rule__CheckCatalog__NameAssignment_6 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4602:1: ( rule__CheckCatalog__NameAssignment_6 )
+            // InternalCheck.g:4601:1: ( ( rule__CheckCatalog__NameAssignment_6 ) )
+            // InternalCheck.g:4602:1: ( rule__CheckCatalog__NameAssignment_6 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckCatalogAccess().getNameAssignment_6()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4603:1: ( rule__CheckCatalog__NameAssignment_6 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4603:2: rule__CheckCatalog__NameAssignment_6
+            // InternalCheck.g:4603:1: ( rule__CheckCatalog__NameAssignment_6 )
+            // InternalCheck.g:4603:2: rule__CheckCatalog__NameAssignment_6
             {
-            pushFollow(FOLLOW_rule__CheckCatalog__NameAssignment_6_in_rule__CheckCatalog__Group__6__Impl10099);
+            pushFollow(FOLLOW_2);
             rule__CheckCatalog__NameAssignment_6();
 
             state._fsp--;
@@ -15152,21 +15152,21 @@ public final void rule__CheckCatalog__Group__6__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__CheckCatalog__Group__7"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4613:1: rule__CheckCatalog__Group__7 : rule__CheckCatalog__Group__7__Impl rule__CheckCatalog__Group__8 ;
+    // InternalCheck.g:4613:1: rule__CheckCatalog__Group__7 : rule__CheckCatalog__Group__7__Impl rule__CheckCatalog__Group__8 ;
     public final void rule__CheckCatalog__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4617:1: ( rule__CheckCatalog__Group__7__Impl rule__CheckCatalog__Group__8 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4618:2: rule__CheckCatalog__Group__7__Impl rule__CheckCatalog__Group__8
+            // InternalCheck.g:4617:1: ( rule__CheckCatalog__Group__7__Impl rule__CheckCatalog__Group__8 )
+            // InternalCheck.g:4618:2: rule__CheckCatalog__Group__7__Impl rule__CheckCatalog__Group__8
             {
-            pushFollow(FOLLOW_rule__CheckCatalog__Group__7__Impl_in_rule__CheckCatalog__Group__710129);
+            pushFollow(FOLLOW_7);
             rule__CheckCatalog__Group__7__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CheckCatalog__Group__8_in_rule__CheckCatalog__Group__710132);
+            pushFollow(FOLLOW_2);
             rule__CheckCatalog__Group__8();
 
             state._fsp--;
@@ -15190,22 +15190,22 @@ public final void rule__CheckCatalog__Group__7() throws RecognitionException {
 
 
     // $ANTLR start "rule__CheckCatalog__Group__7__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4625:1: rule__CheckCatalog__Group__7__Impl : ( ( rule__CheckCatalog__Group_7__0 )? ) ;
+    // InternalCheck.g:4625:1: rule__CheckCatalog__Group__7__Impl : ( ( rule__CheckCatalog__Group_7__0 )? ) ;
     public final void rule__CheckCatalog__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4629:1: ( ( ( rule__CheckCatalog__Group_7__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4630:1: ( ( rule__CheckCatalog__Group_7__0 )? )
+            // InternalCheck.g:4629:1: ( ( ( rule__CheckCatalog__Group_7__0 )? ) )
+            // InternalCheck.g:4630:1: ( ( rule__CheckCatalog__Group_7__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4630:1: ( ( rule__CheckCatalog__Group_7__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4631:1: ( rule__CheckCatalog__Group_7__0 )?
+            // InternalCheck.g:4630:1: ( ( rule__CheckCatalog__Group_7__0 )? )
+            // InternalCheck.g:4631:1: ( rule__CheckCatalog__Group_7__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckCatalogAccess().getGroup_7()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4632:1: ( rule__CheckCatalog__Group_7__0 )?
+            // InternalCheck.g:4632:1: ( rule__CheckCatalog__Group_7__0 )?
             int alt53=2;
             int LA53_0 = input.LA(1);
 
@@ -15214,9 +15214,9 @@ public final void rule__CheckCatalog__Group__7__Impl() throws RecognitionExcepti
             }
             switch (alt53) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4632:2: rule__CheckCatalog__Group_7__0
+                    // InternalCheck.g:4632:2: rule__CheckCatalog__Group_7__0
                     {
-                    pushFollow(FOLLOW_rule__CheckCatalog__Group_7__0_in_rule__CheckCatalog__Group__7__Impl10159);
+                    pushFollow(FOLLOW_2);
                     rule__CheckCatalog__Group_7__0();
 
                     state._fsp--;
@@ -15252,21 +15252,21 @@ public final void rule__CheckCatalog__Group__7__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__CheckCatalog__Group__8"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4642:1: rule__CheckCatalog__Group__8 : rule__CheckCatalog__Group__8__Impl rule__CheckCatalog__Group__9 ;
+    // InternalCheck.g:4642:1: rule__CheckCatalog__Group__8 : rule__CheckCatalog__Group__8__Impl rule__CheckCatalog__Group__9 ;
     public final void rule__CheckCatalog__Group__8() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4646:1: ( rule__CheckCatalog__Group__8__Impl rule__CheckCatalog__Group__9 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4647:2: rule__CheckCatalog__Group__8__Impl rule__CheckCatalog__Group__9
+            // InternalCheck.g:4646:1: ( rule__CheckCatalog__Group__8__Impl rule__CheckCatalog__Group__9 )
+            // InternalCheck.g:4647:2: rule__CheckCatalog__Group__8__Impl rule__CheckCatalog__Group__9
             {
-            pushFollow(FOLLOW_rule__CheckCatalog__Group__8__Impl_in_rule__CheckCatalog__Group__810190);
+            pushFollow(FOLLOW_8);
             rule__CheckCatalog__Group__8__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CheckCatalog__Group__9_in_rule__CheckCatalog__Group__810193);
+            pushFollow(FOLLOW_2);
             rule__CheckCatalog__Group__9();
 
             state._fsp--;
@@ -15290,22 +15290,22 @@ public final void rule__CheckCatalog__Group__8() throws RecognitionException {
 
 
     // $ANTLR start "rule__CheckCatalog__Group__8__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4654:1: rule__CheckCatalog__Group__8__Impl : ( '{' ) ;
+    // InternalCheck.g:4654:1: rule__CheckCatalog__Group__8__Impl : ( '{' ) ;
     public final void rule__CheckCatalog__Group__8__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4658:1: ( ( '{' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4659:1: ( '{' )
+            // InternalCheck.g:4658:1: ( ( '{' ) )
+            // InternalCheck.g:4659:1: ( '{' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4659:1: ( '{' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4660:1: '{'
+            // InternalCheck.g:4659:1: ( '{' )
+            // InternalCheck.g:4660:1: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckCatalogAccess().getLeftCurlyBracketKeyword_8()); 
             }
-            match(input,68,FOLLOW_68_in_rule__CheckCatalog__Group__8__Impl10221); if (state.failed) return ;
+            match(input,68,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCheckCatalogAccess().getLeftCurlyBracketKeyword_8()); 
             }
@@ -15331,21 +15331,21 @@ public final void rule__CheckCatalog__Group__8__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__CheckCatalog__Group__9"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4673:1: rule__CheckCatalog__Group__9 : rule__CheckCatalog__Group__9__Impl rule__CheckCatalog__Group__10 ;
+    // InternalCheck.g:4673:1: rule__CheckCatalog__Group__9 : rule__CheckCatalog__Group__9__Impl rule__CheckCatalog__Group__10 ;
     public final void rule__CheckCatalog__Group__9() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4677:1: ( rule__CheckCatalog__Group__9__Impl rule__CheckCatalog__Group__10 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4678:2: rule__CheckCatalog__Group__9__Impl rule__CheckCatalog__Group__10
+            // InternalCheck.g:4677:1: ( rule__CheckCatalog__Group__9__Impl rule__CheckCatalog__Group__10 )
+            // InternalCheck.g:4678:2: rule__CheckCatalog__Group__9__Impl rule__CheckCatalog__Group__10
             {
-            pushFollow(FOLLOW_rule__CheckCatalog__Group__9__Impl_in_rule__CheckCatalog__Group__910252);
+            pushFollow(FOLLOW_8);
             rule__CheckCatalog__Group__9__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CheckCatalog__Group__10_in_rule__CheckCatalog__Group__910255);
+            pushFollow(FOLLOW_2);
             rule__CheckCatalog__Group__10();
 
             state._fsp--;
@@ -15369,22 +15369,22 @@ public final void rule__CheckCatalog__Group__9() throws RecognitionException {
 
 
     // $ANTLR start "rule__CheckCatalog__Group__9__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4685:1: rule__CheckCatalog__Group__9__Impl : ( ( rule__CheckCatalog__Alternatives_9 )* ) ;
+    // InternalCheck.g:4685:1: rule__CheckCatalog__Group__9__Impl : ( ( rule__CheckCatalog__Alternatives_9 )* ) ;
     public final void rule__CheckCatalog__Group__9__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4689:1: ( ( ( rule__CheckCatalog__Alternatives_9 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4690:1: ( ( rule__CheckCatalog__Alternatives_9 )* )
+            // InternalCheck.g:4689:1: ( ( ( rule__CheckCatalog__Alternatives_9 )* ) )
+            // InternalCheck.g:4690:1: ( ( rule__CheckCatalog__Alternatives_9 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4690:1: ( ( rule__CheckCatalog__Alternatives_9 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4691:1: ( rule__CheckCatalog__Alternatives_9 )*
+            // InternalCheck.g:4690:1: ( ( rule__CheckCatalog__Alternatives_9 )* )
+            // InternalCheck.g:4691:1: ( rule__CheckCatalog__Alternatives_9 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckCatalogAccess().getAlternatives_9()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4692:1: ( rule__CheckCatalog__Alternatives_9 )*
+            // InternalCheck.g:4692:1: ( rule__CheckCatalog__Alternatives_9 )*
             loop54:
             do {
                 int alt54=2;
@@ -15397,9 +15397,9 @@ public final void rule__CheckCatalog__Group__9__Impl() throws RecognitionExcepti
 
                 switch (alt54) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4692:2: rule__CheckCatalog__Alternatives_9
+            	    // InternalCheck.g:4692:2: rule__CheckCatalog__Alternatives_9
             	    {
-            	    pushFollow(FOLLOW_rule__CheckCatalog__Alternatives_9_in_rule__CheckCatalog__Group__9__Impl10282);
+            	    pushFollow(FOLLOW_9);
             	    rule__CheckCatalog__Alternatives_9();
 
             	    state._fsp--;
@@ -15438,16 +15438,16 @@ public final void rule__CheckCatalog__Group__9__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__CheckCatalog__Group__10"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4702:1: rule__CheckCatalog__Group__10 : rule__CheckCatalog__Group__10__Impl ;
+    // InternalCheck.g:4702:1: rule__CheckCatalog__Group__10 : rule__CheckCatalog__Group__10__Impl ;
     public final void rule__CheckCatalog__Group__10() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4706:1: ( rule__CheckCatalog__Group__10__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4707:2: rule__CheckCatalog__Group__10__Impl
+            // InternalCheck.g:4706:1: ( rule__CheckCatalog__Group__10__Impl )
+            // InternalCheck.g:4707:2: rule__CheckCatalog__Group__10__Impl
             {
-            pushFollow(FOLLOW_rule__CheckCatalog__Group__10__Impl_in_rule__CheckCatalog__Group__1010313);
+            pushFollow(FOLLOW_2);
             rule__CheckCatalog__Group__10__Impl();
 
             state._fsp--;
@@ -15471,22 +15471,22 @@ public final void rule__CheckCatalog__Group__10() throws RecognitionException {
 
 
     // $ANTLR start "rule__CheckCatalog__Group__10__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4713:1: rule__CheckCatalog__Group__10__Impl : ( '}' ) ;
+    // InternalCheck.g:4713:1: rule__CheckCatalog__Group__10__Impl : ( '}' ) ;
     public final void rule__CheckCatalog__Group__10__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4717:1: ( ( '}' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4718:1: ( '}' )
+            // InternalCheck.g:4717:1: ( ( '}' ) )
+            // InternalCheck.g:4718:1: ( '}' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4718:1: ( '}' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4719:1: '}'
+            // InternalCheck.g:4718:1: ( '}' )
+            // InternalCheck.g:4719:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckCatalogAccess().getRightCurlyBracketKeyword_10()); 
             }
-            match(input,69,FOLLOW_69_in_rule__CheckCatalog__Group__10__Impl10341); if (state.failed) return ;
+            match(input,69,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCheckCatalogAccess().getRightCurlyBracketKeyword_10()); 
             }
@@ -15512,21 +15512,21 @@ public final void rule__CheckCatalog__Group__10__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__CheckCatalog__Group_7__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4754:1: rule__CheckCatalog__Group_7__0 : rule__CheckCatalog__Group_7__0__Impl rule__CheckCatalog__Group_7__1 ;
+    // InternalCheck.g:4754:1: rule__CheckCatalog__Group_7__0 : rule__CheckCatalog__Group_7__0__Impl rule__CheckCatalog__Group_7__1 ;
     public final void rule__CheckCatalog__Group_7__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4758:1: ( rule__CheckCatalog__Group_7__0__Impl rule__CheckCatalog__Group_7__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4759:2: rule__CheckCatalog__Group_7__0__Impl rule__CheckCatalog__Group_7__1
+            // InternalCheck.g:4758:1: ( rule__CheckCatalog__Group_7__0__Impl rule__CheckCatalog__Group_7__1 )
+            // InternalCheck.g:4759:2: rule__CheckCatalog__Group_7__0__Impl rule__CheckCatalog__Group_7__1
             {
-            pushFollow(FOLLOW_rule__CheckCatalog__Group_7__0__Impl_in_rule__CheckCatalog__Group_7__010394);
+            pushFollow(FOLLOW_10);
             rule__CheckCatalog__Group_7__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CheckCatalog__Group_7__1_in_rule__CheckCatalog__Group_7__010397);
+            pushFollow(FOLLOW_2);
             rule__CheckCatalog__Group_7__1();
 
             state._fsp--;
@@ -15550,22 +15550,22 @@ public final void rule__CheckCatalog__Group_7__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__CheckCatalog__Group_7__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4766:1: rule__CheckCatalog__Group_7__0__Impl : ( 'for' ) ;
+    // InternalCheck.g:4766:1: rule__CheckCatalog__Group_7__0__Impl : ( 'for' ) ;
     public final void rule__CheckCatalog__Group_7__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4770:1: ( ( 'for' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4771:1: ( 'for' )
+            // InternalCheck.g:4770:1: ( ( 'for' ) )
+            // InternalCheck.g:4771:1: ( 'for' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4771:1: ( 'for' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4772:1: 'for'
+            // InternalCheck.g:4771:1: ( 'for' )
+            // InternalCheck.g:4772:1: 'for'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckCatalogAccess().getForKeyword_7_0()); 
             }
-            match(input,70,FOLLOW_70_in_rule__CheckCatalog__Group_7__0__Impl10425); if (state.failed) return ;
+            match(input,70,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCheckCatalogAccess().getForKeyword_7_0()); 
             }
@@ -15591,21 +15591,21 @@ public final void rule__CheckCatalog__Group_7__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__CheckCatalog__Group_7__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4785:1: rule__CheckCatalog__Group_7__1 : rule__CheckCatalog__Group_7__1__Impl rule__CheckCatalog__Group_7__2 ;
+    // InternalCheck.g:4785:1: rule__CheckCatalog__Group_7__1 : rule__CheckCatalog__Group_7__1__Impl rule__CheckCatalog__Group_7__2 ;
     public final void rule__CheckCatalog__Group_7__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4789:1: ( rule__CheckCatalog__Group_7__1__Impl rule__CheckCatalog__Group_7__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4790:2: rule__CheckCatalog__Group_7__1__Impl rule__CheckCatalog__Group_7__2
+            // InternalCheck.g:4789:1: ( rule__CheckCatalog__Group_7__1__Impl rule__CheckCatalog__Group_7__2 )
+            // InternalCheck.g:4790:2: rule__CheckCatalog__Group_7__1__Impl rule__CheckCatalog__Group_7__2
             {
-            pushFollow(FOLLOW_rule__CheckCatalog__Group_7__1__Impl_in_rule__CheckCatalog__Group_7__110456);
+            pushFollow(FOLLOW_4);
             rule__CheckCatalog__Group_7__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CheckCatalog__Group_7__2_in_rule__CheckCatalog__Group_7__110459);
+            pushFollow(FOLLOW_2);
             rule__CheckCatalog__Group_7__2();
 
             state._fsp--;
@@ -15629,22 +15629,22 @@ public final void rule__CheckCatalog__Group_7__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__CheckCatalog__Group_7__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4797:1: rule__CheckCatalog__Group_7__1__Impl : ( 'grammar' ) ;
+    // InternalCheck.g:4797:1: rule__CheckCatalog__Group_7__1__Impl : ( 'grammar' ) ;
     public final void rule__CheckCatalog__Group_7__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4801:1: ( ( 'grammar' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4802:1: ( 'grammar' )
+            // InternalCheck.g:4801:1: ( ( 'grammar' ) )
+            // InternalCheck.g:4802:1: ( 'grammar' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4802:1: ( 'grammar' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4803:1: 'grammar'
+            // InternalCheck.g:4802:1: ( 'grammar' )
+            // InternalCheck.g:4803:1: 'grammar'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckCatalogAccess().getGrammarKeyword_7_1()); 
             }
-            match(input,21,FOLLOW_21_in_rule__CheckCatalog__Group_7__1__Impl10487); if (state.failed) return ;
+            match(input,21,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCheckCatalogAccess().getGrammarKeyword_7_1()); 
             }
@@ -15670,16 +15670,16 @@ public final void rule__CheckCatalog__Group_7__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__CheckCatalog__Group_7__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4816:1: rule__CheckCatalog__Group_7__2 : rule__CheckCatalog__Group_7__2__Impl ;
+    // InternalCheck.g:4816:1: rule__CheckCatalog__Group_7__2 : rule__CheckCatalog__Group_7__2__Impl ;
     public final void rule__CheckCatalog__Group_7__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4820:1: ( rule__CheckCatalog__Group_7__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4821:2: rule__CheckCatalog__Group_7__2__Impl
+            // InternalCheck.g:4820:1: ( rule__CheckCatalog__Group_7__2__Impl )
+            // InternalCheck.g:4821:2: rule__CheckCatalog__Group_7__2__Impl
             {
-            pushFollow(FOLLOW_rule__CheckCatalog__Group_7__2__Impl_in_rule__CheckCatalog__Group_7__210518);
+            pushFollow(FOLLOW_2);
             rule__CheckCatalog__Group_7__2__Impl();
 
             state._fsp--;
@@ -15703,25 +15703,25 @@ public final void rule__CheckCatalog__Group_7__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__CheckCatalog__Group_7__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4827:1: rule__CheckCatalog__Group_7__2__Impl : ( ( rule__CheckCatalog__GrammarAssignment_7_2 ) ) ;
+    // InternalCheck.g:4827:1: rule__CheckCatalog__Group_7__2__Impl : ( ( rule__CheckCatalog__GrammarAssignment_7_2 ) ) ;
     public final void rule__CheckCatalog__Group_7__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4831:1: ( ( ( rule__CheckCatalog__GrammarAssignment_7_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4832:1: ( ( rule__CheckCatalog__GrammarAssignment_7_2 ) )
+            // InternalCheck.g:4831:1: ( ( ( rule__CheckCatalog__GrammarAssignment_7_2 ) ) )
+            // InternalCheck.g:4832:1: ( ( rule__CheckCatalog__GrammarAssignment_7_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4832:1: ( ( rule__CheckCatalog__GrammarAssignment_7_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4833:1: ( rule__CheckCatalog__GrammarAssignment_7_2 )
+            // InternalCheck.g:4832:1: ( ( rule__CheckCatalog__GrammarAssignment_7_2 ) )
+            // InternalCheck.g:4833:1: ( rule__CheckCatalog__GrammarAssignment_7_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckCatalogAccess().getGrammarAssignment_7_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4834:1: ( rule__CheckCatalog__GrammarAssignment_7_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4834:2: rule__CheckCatalog__GrammarAssignment_7_2
+            // InternalCheck.g:4834:1: ( rule__CheckCatalog__GrammarAssignment_7_2 )
+            // InternalCheck.g:4834:2: rule__CheckCatalog__GrammarAssignment_7_2
             {
-            pushFollow(FOLLOW_rule__CheckCatalog__GrammarAssignment_7_2_in_rule__CheckCatalog__Group_7__2__Impl10545);
+            pushFollow(FOLLOW_2);
             rule__CheckCatalog__GrammarAssignment_7_2();
 
             state._fsp--;
@@ -15754,21 +15754,21 @@ public final void rule__CheckCatalog__Group_7__2__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XImportSection__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4850:1: rule__XImportSection__Group__0 : rule__XImportSection__Group__0__Impl rule__XImportSection__Group__1 ;
+    // InternalCheck.g:4850:1: rule__XImportSection__Group__0 : rule__XImportSection__Group__0__Impl rule__XImportSection__Group__1 ;
     public final void rule__XImportSection__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4854:1: ( rule__XImportSection__Group__0__Impl rule__XImportSection__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4855:2: rule__XImportSection__Group__0__Impl rule__XImportSection__Group__1
+            // InternalCheck.g:4854:1: ( rule__XImportSection__Group__0__Impl rule__XImportSection__Group__1 )
+            // InternalCheck.g:4855:2: rule__XImportSection__Group__0__Impl rule__XImportSection__Group__1
             {
-            pushFollow(FOLLOW_rule__XImportSection__Group__0__Impl_in_rule__XImportSection__Group__010581);
+            pushFollow(FOLLOW_5);
             rule__XImportSection__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XImportSection__Group__1_in_rule__XImportSection__Group__010584);
+            pushFollow(FOLLOW_2);
             rule__XImportSection__Group__1();
 
             state._fsp--;
@@ -15792,23 +15792,23 @@ public final void rule__XImportSection__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XImportSection__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4862:1: rule__XImportSection__Group__0__Impl : ( () ) ;
+    // InternalCheck.g:4862:1: rule__XImportSection__Group__0__Impl : ( () ) ;
     public final void rule__XImportSection__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4866:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4867:1: ( () )
+            // InternalCheck.g:4866:1: ( ( () ) )
+            // InternalCheck.g:4867:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4867:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4868:1: ()
+            // InternalCheck.g:4867:1: ( () )
+            // InternalCheck.g:4868:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportSectionAccess().getXImportSectionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4869:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4871:1: 
+            // InternalCheck.g:4869:1: ()
+            // InternalCheck.g:4871:1: 
             {
             }
 
@@ -15833,16 +15833,16 @@ public final void rule__XImportSection__Group__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XImportSection__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4881:1: rule__XImportSection__Group__1 : rule__XImportSection__Group__1__Impl ;
+    // InternalCheck.g:4881:1: rule__XImportSection__Group__1 : rule__XImportSection__Group__1__Impl ;
     public final void rule__XImportSection__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4885:1: ( rule__XImportSection__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4886:2: rule__XImportSection__Group__1__Impl
+            // InternalCheck.g:4885:1: ( rule__XImportSection__Group__1__Impl )
+            // InternalCheck.g:4886:2: rule__XImportSection__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XImportSection__Group__1__Impl_in_rule__XImportSection__Group__110642);
+            pushFollow(FOLLOW_2);
             rule__XImportSection__Group__1__Impl();
 
             state._fsp--;
@@ -15866,22 +15866,22 @@ public final void rule__XImportSection__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XImportSection__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4892:1: rule__XImportSection__Group__1__Impl : ( ( rule__XImportSection__ImportDeclarationsAssignment_1 )* ) ;
+    // InternalCheck.g:4892:1: rule__XImportSection__Group__1__Impl : ( ( rule__XImportSection__ImportDeclarationsAssignment_1 )* ) ;
     public final void rule__XImportSection__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4896:1: ( ( ( rule__XImportSection__ImportDeclarationsAssignment_1 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4897:1: ( ( rule__XImportSection__ImportDeclarationsAssignment_1 )* )
+            // InternalCheck.g:4896:1: ( ( ( rule__XImportSection__ImportDeclarationsAssignment_1 )* ) )
+            // InternalCheck.g:4897:1: ( ( rule__XImportSection__ImportDeclarationsAssignment_1 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4897:1: ( ( rule__XImportSection__ImportDeclarationsAssignment_1 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4898:1: ( rule__XImportSection__ImportDeclarationsAssignment_1 )*
+            // InternalCheck.g:4897:1: ( ( rule__XImportSection__ImportDeclarationsAssignment_1 )* )
+            // InternalCheck.g:4898:1: ( rule__XImportSection__ImportDeclarationsAssignment_1 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportSectionAccess().getImportDeclarationsAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4899:1: ( rule__XImportSection__ImportDeclarationsAssignment_1 )*
+            // InternalCheck.g:4899:1: ( rule__XImportSection__ImportDeclarationsAssignment_1 )*
             loop55:
             do {
                 int alt55=2;
@@ -15894,9 +15894,9 @@ public final void rule__XImportSection__Group__1__Impl() throws RecognitionExcep
 
                 switch (alt55) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4899:2: rule__XImportSection__ImportDeclarationsAssignment_1
+            	    // InternalCheck.g:4899:2: rule__XImportSection__ImportDeclarationsAssignment_1
             	    {
-            	    pushFollow(FOLLOW_rule__XImportSection__ImportDeclarationsAssignment_1_in_rule__XImportSection__Group__1__Impl10669);
+            	    pushFollow(FOLLOW_11);
             	    rule__XImportSection__ImportDeclarationsAssignment_1();
 
             	    state._fsp--;
@@ -15935,21 +15935,21 @@ public final void rule__XImportSection__Group__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XImportDeclaration__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4913:1: rule__XImportDeclaration__Group__0 : rule__XImportDeclaration__Group__0__Impl rule__XImportDeclaration__Group__1 ;
+    // InternalCheck.g:4913:1: rule__XImportDeclaration__Group__0 : rule__XImportDeclaration__Group__0__Impl rule__XImportDeclaration__Group__1 ;
     public final void rule__XImportDeclaration__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4917:1: ( rule__XImportDeclaration__Group__0__Impl rule__XImportDeclaration__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4918:2: rule__XImportDeclaration__Group__0__Impl rule__XImportDeclaration__Group__1
+            // InternalCheck.g:4917:1: ( rule__XImportDeclaration__Group__0__Impl rule__XImportDeclaration__Group__1 )
+            // InternalCheck.g:4918:2: rule__XImportDeclaration__Group__0__Impl rule__XImportDeclaration__Group__1
             {
-            pushFollow(FOLLOW_rule__XImportDeclaration__Group__0__Impl_in_rule__XImportDeclaration__Group__010704);
+            pushFollow(FOLLOW_4);
             rule__XImportDeclaration__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XImportDeclaration__Group__1_in_rule__XImportDeclaration__Group__010707);
+            pushFollow(FOLLOW_2);
             rule__XImportDeclaration__Group__1();
 
             state._fsp--;
@@ -15973,22 +15973,22 @@ public final void rule__XImportDeclaration__Group__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XImportDeclaration__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4925:1: rule__XImportDeclaration__Group__0__Impl : ( 'import' ) ;
+    // InternalCheck.g:4925:1: rule__XImportDeclaration__Group__0__Impl : ( 'import' ) ;
     public final void rule__XImportDeclaration__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4929:1: ( ( 'import' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4930:1: ( 'import' )
+            // InternalCheck.g:4929:1: ( ( 'import' ) )
+            // InternalCheck.g:4930:1: ( 'import' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4930:1: ( 'import' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4931:1: 'import'
+            // InternalCheck.g:4930:1: ( 'import' )
+            // InternalCheck.g:4931:1: 'import'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getImportKeyword_0()); 
             }
-            match(input,18,FOLLOW_18_in_rule__XImportDeclaration__Group__0__Impl10735); if (state.failed) return ;
+            match(input,18,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXImportDeclarationAccess().getImportKeyword_0()); 
             }
@@ -16014,21 +16014,21 @@ public final void rule__XImportDeclaration__Group__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XImportDeclaration__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4944:1: rule__XImportDeclaration__Group__1 : rule__XImportDeclaration__Group__1__Impl rule__XImportDeclaration__Group__2 ;
+    // InternalCheck.g:4944:1: rule__XImportDeclaration__Group__1 : rule__XImportDeclaration__Group__1__Impl rule__XImportDeclaration__Group__2 ;
     public final void rule__XImportDeclaration__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4948:1: ( rule__XImportDeclaration__Group__1__Impl rule__XImportDeclaration__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4949:2: rule__XImportDeclaration__Group__1__Impl rule__XImportDeclaration__Group__2
+            // InternalCheck.g:4948:1: ( rule__XImportDeclaration__Group__1__Impl rule__XImportDeclaration__Group__2 )
+            // InternalCheck.g:4949:2: rule__XImportDeclaration__Group__1__Impl rule__XImportDeclaration__Group__2
             {
-            pushFollow(FOLLOW_rule__XImportDeclaration__Group__1__Impl_in_rule__XImportDeclaration__Group__110766);
+            pushFollow(FOLLOW_12);
             rule__XImportDeclaration__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XImportDeclaration__Group__2_in_rule__XImportDeclaration__Group__110769);
+            pushFollow(FOLLOW_2);
             rule__XImportDeclaration__Group__2();
 
             state._fsp--;
@@ -16052,25 +16052,25 @@ public final void rule__XImportDeclaration__Group__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XImportDeclaration__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4956:1: rule__XImportDeclaration__Group__1__Impl : ( ( rule__XImportDeclaration__Alternatives_1 ) ) ;
+    // InternalCheck.g:4956:1: rule__XImportDeclaration__Group__1__Impl : ( ( rule__XImportDeclaration__Alternatives_1 ) ) ;
     public final void rule__XImportDeclaration__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4960:1: ( ( ( rule__XImportDeclaration__Alternatives_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4961:1: ( ( rule__XImportDeclaration__Alternatives_1 ) )
+            // InternalCheck.g:4960:1: ( ( ( rule__XImportDeclaration__Alternatives_1 ) ) )
+            // InternalCheck.g:4961:1: ( ( rule__XImportDeclaration__Alternatives_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4961:1: ( ( rule__XImportDeclaration__Alternatives_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4962:1: ( rule__XImportDeclaration__Alternatives_1 )
+            // InternalCheck.g:4961:1: ( ( rule__XImportDeclaration__Alternatives_1 ) )
+            // InternalCheck.g:4962:1: ( rule__XImportDeclaration__Alternatives_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getAlternatives_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4963:1: ( rule__XImportDeclaration__Alternatives_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4963:2: rule__XImportDeclaration__Alternatives_1
+            // InternalCheck.g:4963:1: ( rule__XImportDeclaration__Alternatives_1 )
+            // InternalCheck.g:4963:2: rule__XImportDeclaration__Alternatives_1
             {
-            pushFollow(FOLLOW_rule__XImportDeclaration__Alternatives_1_in_rule__XImportDeclaration__Group__1__Impl10796);
+            pushFollow(FOLLOW_2);
             rule__XImportDeclaration__Alternatives_1();
 
             state._fsp--;
@@ -16103,16 +16103,16 @@ public final void rule__XImportDeclaration__Group__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XImportDeclaration__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4973:1: rule__XImportDeclaration__Group__2 : rule__XImportDeclaration__Group__2__Impl ;
+    // InternalCheck.g:4973:1: rule__XImportDeclaration__Group__2 : rule__XImportDeclaration__Group__2__Impl ;
     public final void rule__XImportDeclaration__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4977:1: ( rule__XImportDeclaration__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4978:2: rule__XImportDeclaration__Group__2__Impl
+            // InternalCheck.g:4977:1: ( rule__XImportDeclaration__Group__2__Impl )
+            // InternalCheck.g:4978:2: rule__XImportDeclaration__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__XImportDeclaration__Group__2__Impl_in_rule__XImportDeclaration__Group__210826);
+            pushFollow(FOLLOW_2);
             rule__XImportDeclaration__Group__2__Impl();
 
             state._fsp--;
@@ -16136,22 +16136,22 @@ public final void rule__XImportDeclaration__Group__2() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XImportDeclaration__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4984:1: rule__XImportDeclaration__Group__2__Impl : ( ( ';' )? ) ;
+    // InternalCheck.g:4984:1: rule__XImportDeclaration__Group__2__Impl : ( ( ';' )? ) ;
     public final void rule__XImportDeclaration__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4988:1: ( ( ( ';' )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4989:1: ( ( ';' )? )
+            // InternalCheck.g:4988:1: ( ( ( ';' )? ) )
+            // InternalCheck.g:4989:1: ( ( ';' )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4989:1: ( ( ';' )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4990:1: ( ';' )?
+            // InternalCheck.g:4989:1: ( ( ';' )? )
+            // InternalCheck.g:4990:1: ( ';' )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getSemicolonKeyword_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4991:1: ( ';' )?
+            // InternalCheck.g:4991:1: ( ';' )?
             int alt56=2;
             int LA56_0 = input.LA(1);
 
@@ -16160,9 +16160,9 @@ public final void rule__XImportDeclaration__Group__2__Impl() throws RecognitionE
             }
             switch (alt56) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4992:2: ';'
+                    // InternalCheck.g:4992:2: ';'
                     {
-                    match(input,71,FOLLOW_71_in_rule__XImportDeclaration__Group__2__Impl10855); if (state.failed) return ;
+                    match(input,71,FOLLOW_2); if (state.failed) return ;
 
                     }
                     break;
@@ -16194,21 +16194,21 @@ public final void rule__XImportDeclaration__Group__2__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__Category__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5009:1: rule__Category__Group__0 : rule__Category__Group__0__Impl rule__Category__Group__1 ;
+    // InternalCheck.g:5009:1: rule__Category__Group__0 : rule__Category__Group__0__Impl rule__Category__Group__1 ;
     public final void rule__Category__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5013:1: ( rule__Category__Group__0__Impl rule__Category__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5014:2: rule__Category__Group__0__Impl rule__Category__Group__1
+            // InternalCheck.g:5013:1: ( rule__Category__Group__0__Impl rule__Category__Group__1 )
+            // InternalCheck.g:5014:2: rule__Category__Group__0__Impl rule__Category__Group__1
             {
-            pushFollow(FOLLOW_rule__Category__Group__0__Impl_in_rule__Category__Group__010894);
+            pushFollow(FOLLOW_13);
             rule__Category__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Category__Group__1_in_rule__Category__Group__010897);
+            pushFollow(FOLLOW_2);
             rule__Category__Group__1();
 
             state._fsp--;
@@ -16232,22 +16232,22 @@ public final void rule__Category__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5021:1: rule__Category__Group__0__Impl : ( 'category' ) ;
+    // InternalCheck.g:5021:1: rule__Category__Group__0__Impl : ( 'category' ) ;
     public final void rule__Category__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5025:1: ( ( 'category' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5026:1: ( 'category' )
+            // InternalCheck.g:5025:1: ( ( 'category' ) )
+            // InternalCheck.g:5026:1: ( 'category' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5026:1: ( 'category' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5027:1: 'category'
+            // InternalCheck.g:5026:1: ( 'category' )
+            // InternalCheck.g:5027:1: 'category'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCategoryAccess().getCategoryKeyword_0()); 
             }
-            match(input,23,FOLLOW_23_in_rule__Category__Group__0__Impl10925); if (state.failed) return ;
+            match(input,23,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCategoryAccess().getCategoryKeyword_0()); 
             }
@@ -16273,21 +16273,21 @@ public final void rule__Category__Group__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5040:1: rule__Category__Group__1 : rule__Category__Group__1__Impl rule__Category__Group__2 ;
+    // InternalCheck.g:5040:1: rule__Category__Group__1 : rule__Category__Group__1__Impl rule__Category__Group__2 ;
     public final void rule__Category__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5044:1: ( rule__Category__Group__1__Impl rule__Category__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5045:2: rule__Category__Group__1__Impl rule__Category__Group__2
+            // InternalCheck.g:5044:1: ( rule__Category__Group__1__Impl rule__Category__Group__2 )
+            // InternalCheck.g:5045:2: rule__Category__Group__1__Impl rule__Category__Group__2
             {
-            pushFollow(FOLLOW_rule__Category__Group__1__Impl_in_rule__Category__Group__110956);
+            pushFollow(FOLLOW_13);
             rule__Category__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Category__Group__2_in_rule__Category__Group__110959);
+            pushFollow(FOLLOW_2);
             rule__Category__Group__2();
 
             state._fsp--;
@@ -16311,22 +16311,22 @@ public final void rule__Category__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5052:1: rule__Category__Group__1__Impl : ( ( rule__Category__IdAssignment_1 )? ) ;
+    // InternalCheck.g:5052:1: rule__Category__Group__1__Impl : ( ( rule__Category__IdAssignment_1 )? ) ;
     public final void rule__Category__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5056:1: ( ( ( rule__Category__IdAssignment_1 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5057:1: ( ( rule__Category__IdAssignment_1 )? )
+            // InternalCheck.g:5056:1: ( ( ( rule__Category__IdAssignment_1 )? ) )
+            // InternalCheck.g:5057:1: ( ( rule__Category__IdAssignment_1 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5057:1: ( ( rule__Category__IdAssignment_1 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5058:1: ( rule__Category__IdAssignment_1 )?
+            // InternalCheck.g:5057:1: ( ( rule__Category__IdAssignment_1 )? )
+            // InternalCheck.g:5058:1: ( rule__Category__IdAssignment_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCategoryAccess().getIdAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5059:1: ( rule__Category__IdAssignment_1 )?
+            // InternalCheck.g:5059:1: ( rule__Category__IdAssignment_1 )?
             int alt57=2;
             int LA57_0 = input.LA(1);
 
@@ -16335,9 +16335,9 @@ public final void rule__Category__Group__1__Impl() throws RecognitionException {
             }
             switch (alt57) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5059:2: rule__Category__IdAssignment_1
+                    // InternalCheck.g:5059:2: rule__Category__IdAssignment_1
                     {
-                    pushFollow(FOLLOW_rule__Category__IdAssignment_1_in_rule__Category__Group__1__Impl10986);
+                    pushFollow(FOLLOW_2);
                     rule__Category__IdAssignment_1();
 
                     state._fsp--;
@@ -16373,21 +16373,21 @@ public final void rule__Category__Group__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5069:1: rule__Category__Group__2 : rule__Category__Group__2__Impl rule__Category__Group__3 ;
+    // InternalCheck.g:5069:1: rule__Category__Group__2 : rule__Category__Group__2__Impl rule__Category__Group__3 ;
     public final void rule__Category__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5073:1: ( rule__Category__Group__2__Impl rule__Category__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5074:2: rule__Category__Group__2__Impl rule__Category__Group__3
+            // InternalCheck.g:5073:1: ( rule__Category__Group__2__Impl rule__Category__Group__3 )
+            // InternalCheck.g:5074:2: rule__Category__Group__2__Impl rule__Category__Group__3
             {
-            pushFollow(FOLLOW_rule__Category__Group__2__Impl_in_rule__Category__Group__211017);
+            pushFollow(FOLLOW_14);
             rule__Category__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Category__Group__3_in_rule__Category__Group__211020);
+            pushFollow(FOLLOW_2);
             rule__Category__Group__3();
 
             state._fsp--;
@@ -16411,25 +16411,25 @@ public final void rule__Category__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5081:1: rule__Category__Group__2__Impl : ( ( rule__Category__LabelAssignment_2 ) ) ;
+    // InternalCheck.g:5081:1: rule__Category__Group__2__Impl : ( ( rule__Category__LabelAssignment_2 ) ) ;
     public final void rule__Category__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5085:1: ( ( ( rule__Category__LabelAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5086:1: ( ( rule__Category__LabelAssignment_2 ) )
+            // InternalCheck.g:5085:1: ( ( ( rule__Category__LabelAssignment_2 ) ) )
+            // InternalCheck.g:5086:1: ( ( rule__Category__LabelAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5086:1: ( ( rule__Category__LabelAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5087:1: ( rule__Category__LabelAssignment_2 )
+            // InternalCheck.g:5086:1: ( ( rule__Category__LabelAssignment_2 ) )
+            // InternalCheck.g:5087:1: ( rule__Category__LabelAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCategoryAccess().getLabelAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5088:1: ( rule__Category__LabelAssignment_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5088:2: rule__Category__LabelAssignment_2
+            // InternalCheck.g:5088:1: ( rule__Category__LabelAssignment_2 )
+            // InternalCheck.g:5088:2: rule__Category__LabelAssignment_2
             {
-            pushFollow(FOLLOW_rule__Category__LabelAssignment_2_in_rule__Category__Group__2__Impl11047);
+            pushFollow(FOLLOW_2);
             rule__Category__LabelAssignment_2();
 
             state._fsp--;
@@ -16462,21 +16462,21 @@ public final void rule__Category__Group__2__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5098:1: rule__Category__Group__3 : rule__Category__Group__3__Impl rule__Category__Group__4 ;
+    // InternalCheck.g:5098:1: rule__Category__Group__3 : rule__Category__Group__3__Impl rule__Category__Group__4 ;
     public final void rule__Category__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5102:1: ( rule__Category__Group__3__Impl rule__Category__Group__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5103:2: rule__Category__Group__3__Impl rule__Category__Group__4
+            // InternalCheck.g:5102:1: ( rule__Category__Group__3__Impl rule__Category__Group__4 )
+            // InternalCheck.g:5103:2: rule__Category__Group__3__Impl rule__Category__Group__4
             {
-            pushFollow(FOLLOW_rule__Category__Group__3__Impl_in_rule__Category__Group__311077);
+            pushFollow(FOLLOW_15);
             rule__Category__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Category__Group__4_in_rule__Category__Group__311080);
+            pushFollow(FOLLOW_2);
             rule__Category__Group__4();
 
             state._fsp--;
@@ -16500,22 +16500,22 @@ public final void rule__Category__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5110:1: rule__Category__Group__3__Impl : ( '{' ) ;
+    // InternalCheck.g:5110:1: rule__Category__Group__3__Impl : ( '{' ) ;
     public final void rule__Category__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5114:1: ( ( '{' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5115:1: ( '{' )
+            // InternalCheck.g:5114:1: ( ( '{' ) )
+            // InternalCheck.g:5115:1: ( '{' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5115:1: ( '{' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5116:1: '{'
+            // InternalCheck.g:5115:1: ( '{' )
+            // InternalCheck.g:5116:1: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCategoryAccess().getLeftCurlyBracketKeyword_3()); 
             }
-            match(input,68,FOLLOW_68_in_rule__Category__Group__3__Impl11108); if (state.failed) return ;
+            match(input,68,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCategoryAccess().getLeftCurlyBracketKeyword_3()); 
             }
@@ -16541,21 +16541,21 @@ public final void rule__Category__Group__3__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__Group__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5129:1: rule__Category__Group__4 : rule__Category__Group__4__Impl rule__Category__Group__5 ;
+    // InternalCheck.g:5129:1: rule__Category__Group__4 : rule__Category__Group__4__Impl rule__Category__Group__5 ;
     public final void rule__Category__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5133:1: ( rule__Category__Group__4__Impl rule__Category__Group__5 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5134:2: rule__Category__Group__4__Impl rule__Category__Group__5
+            // InternalCheck.g:5133:1: ( rule__Category__Group__4__Impl rule__Category__Group__5 )
+            // InternalCheck.g:5134:2: rule__Category__Group__4__Impl rule__Category__Group__5
             {
-            pushFollow(FOLLOW_rule__Category__Group__4__Impl_in_rule__Category__Group__411139);
+            pushFollow(FOLLOW_15);
             rule__Category__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Category__Group__5_in_rule__Category__Group__411142);
+            pushFollow(FOLLOW_2);
             rule__Category__Group__5();
 
             state._fsp--;
@@ -16579,22 +16579,22 @@ public final void rule__Category__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5141:1: rule__Category__Group__4__Impl : ( ( rule__Category__ChecksAssignment_4 )* ) ;
+    // InternalCheck.g:5141:1: rule__Category__Group__4__Impl : ( ( rule__Category__ChecksAssignment_4 )* ) ;
     public final void rule__Category__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5145:1: ( ( ( rule__Category__ChecksAssignment_4 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5146:1: ( ( rule__Category__ChecksAssignment_4 )* )
+            // InternalCheck.g:5145:1: ( ( ( rule__Category__ChecksAssignment_4 )* ) )
+            // InternalCheck.g:5146:1: ( ( rule__Category__ChecksAssignment_4 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5146:1: ( ( rule__Category__ChecksAssignment_4 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5147:1: ( rule__Category__ChecksAssignment_4 )*
+            // InternalCheck.g:5146:1: ( ( rule__Category__ChecksAssignment_4 )* )
+            // InternalCheck.g:5147:1: ( rule__Category__ChecksAssignment_4 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCategoryAccess().getChecksAssignment_4()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5148:1: ( rule__Category__ChecksAssignment_4 )*
+            // InternalCheck.g:5148:1: ( rule__Category__ChecksAssignment_4 )*
             loop58:
             do {
                 int alt58=2;
@@ -16607,9 +16607,9 @@ public final void rule__Category__Group__4__Impl() throws RecognitionException {
 
                 switch (alt58) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5148:2: rule__Category__ChecksAssignment_4
+            	    // InternalCheck.g:5148:2: rule__Category__ChecksAssignment_4
             	    {
-            	    pushFollow(FOLLOW_rule__Category__ChecksAssignment_4_in_rule__Category__Group__4__Impl11169);
+            	    pushFollow(FOLLOW_16);
             	    rule__Category__ChecksAssignment_4();
 
             	    state._fsp--;
@@ -16648,16 +16648,16 @@ public final void rule__Category__Group__4__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__Group__5"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5158:1: rule__Category__Group__5 : rule__Category__Group__5__Impl ;
+    // InternalCheck.g:5158:1: rule__Category__Group__5 : rule__Category__Group__5__Impl ;
     public final void rule__Category__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5162:1: ( rule__Category__Group__5__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5163:2: rule__Category__Group__5__Impl
+            // InternalCheck.g:5162:1: ( rule__Category__Group__5__Impl )
+            // InternalCheck.g:5163:2: rule__Category__Group__5__Impl
             {
-            pushFollow(FOLLOW_rule__Category__Group__5__Impl_in_rule__Category__Group__511200);
+            pushFollow(FOLLOW_2);
             rule__Category__Group__5__Impl();
 
             state._fsp--;
@@ -16681,22 +16681,22 @@ public final void rule__Category__Group__5() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5169:1: rule__Category__Group__5__Impl : ( '}' ) ;
+    // InternalCheck.g:5169:1: rule__Category__Group__5__Impl : ( '}' ) ;
     public final void rule__Category__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5173:1: ( ( '}' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5174:1: ( '}' )
+            // InternalCheck.g:5173:1: ( ( '}' ) )
+            // InternalCheck.g:5174:1: ( '}' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5174:1: ( '}' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5175:1: '}'
+            // InternalCheck.g:5174:1: ( '}' )
+            // InternalCheck.g:5175:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCategoryAccess().getRightCurlyBracketKeyword_5()); 
             }
-            match(input,69,FOLLOW_69_in_rule__Category__Group__5__Impl11228); if (state.failed) return ;
+            match(input,69,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCategoryAccess().getRightCurlyBracketKeyword_5()); 
             }
@@ -16722,21 +16722,21 @@ public final void rule__Category__Group__5__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5200:1: rule__Check__Group__0 : rule__Check__Group__0__Impl rule__Check__Group__1 ;
+    // InternalCheck.g:5200:1: rule__Check__Group__0 : rule__Check__Group__0__Impl rule__Check__Group__1 ;
     public final void rule__Check__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5204:1: ( rule__Check__Group__0__Impl rule__Check__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5205:2: rule__Check__Group__0__Impl rule__Check__Group__1
+            // InternalCheck.g:5204:1: ( rule__Check__Group__0__Impl rule__Check__Group__1 )
+            // InternalCheck.g:5205:2: rule__Check__Group__0__Impl rule__Check__Group__1
             {
-            pushFollow(FOLLOW_rule__Check__Group__0__Impl_in_rule__Check__Group__011271);
+            pushFollow(FOLLOW_17);
             rule__Check__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Check__Group__1_in_rule__Check__Group__011274);
+            pushFollow(FOLLOW_2);
             rule__Check__Group__1();
 
             state._fsp--;
@@ -16760,22 +16760,22 @@ public final void rule__Check__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5212:1: rule__Check__Group__0__Impl : ( ( rule__Check__SeverityRangeAssignment_0 )? ) ;
+    // InternalCheck.g:5212:1: rule__Check__Group__0__Impl : ( ( rule__Check__SeverityRangeAssignment_0 )? ) ;
     public final void rule__Check__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5216:1: ( ( ( rule__Check__SeverityRangeAssignment_0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5217:1: ( ( rule__Check__SeverityRangeAssignment_0 )? )
+            // InternalCheck.g:5216:1: ( ( ( rule__Check__SeverityRangeAssignment_0 )? ) )
+            // InternalCheck.g:5217:1: ( ( rule__Check__SeverityRangeAssignment_0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5217:1: ( ( rule__Check__SeverityRangeAssignment_0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5218:1: ( rule__Check__SeverityRangeAssignment_0 )?
+            // InternalCheck.g:5217:1: ( ( rule__Check__SeverityRangeAssignment_0 )? )
+            // InternalCheck.g:5218:1: ( rule__Check__SeverityRangeAssignment_0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getSeverityRangeAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5219:1: ( rule__Check__SeverityRangeAssignment_0 )?
+            // InternalCheck.g:5219:1: ( rule__Check__SeverityRangeAssignment_0 )?
             int alt59=2;
             int LA59_0 = input.LA(1);
 
@@ -16784,9 +16784,9 @@ public final void rule__Check__Group__0__Impl() throws RecognitionException {
             }
             switch (alt59) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5219:2: rule__Check__SeverityRangeAssignment_0
+                    // InternalCheck.g:5219:2: rule__Check__SeverityRangeAssignment_0
                     {
-                    pushFollow(FOLLOW_rule__Check__SeverityRangeAssignment_0_in_rule__Check__Group__0__Impl11301);
+                    pushFollow(FOLLOW_2);
                     rule__Check__SeverityRangeAssignment_0();
 
                     state._fsp--;
@@ -16822,21 +16822,21 @@ public final void rule__Check__Group__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5229:1: rule__Check__Group__1 : rule__Check__Group__1__Impl rule__Check__Group__2 ;
+    // InternalCheck.g:5229:1: rule__Check__Group__1 : rule__Check__Group__1__Impl rule__Check__Group__2 ;
     public final void rule__Check__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5233:1: ( rule__Check__Group__1__Impl rule__Check__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5234:2: rule__Check__Group__1__Impl rule__Check__Group__2
+            // InternalCheck.g:5233:1: ( rule__Check__Group__1__Impl rule__Check__Group__2 )
+            // InternalCheck.g:5234:2: rule__Check__Group__1__Impl rule__Check__Group__2
             {
-            pushFollow(FOLLOW_rule__Check__Group__1__Impl_in_rule__Check__Group__111332);
+            pushFollow(FOLLOW_17);
             rule__Check__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Check__Group__2_in_rule__Check__Group__111335);
+            pushFollow(FOLLOW_2);
             rule__Check__Group__2();
 
             state._fsp--;
@@ -16860,22 +16860,22 @@ public final void rule__Check__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5241:1: rule__Check__Group__1__Impl : ( ( rule__Check__FinalAssignment_1 )? ) ;
+    // InternalCheck.g:5241:1: rule__Check__Group__1__Impl : ( ( rule__Check__FinalAssignment_1 )? ) ;
     public final void rule__Check__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5245:1: ( ( ( rule__Check__FinalAssignment_1 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5246:1: ( ( rule__Check__FinalAssignment_1 )? )
+            // InternalCheck.g:5245:1: ( ( ( rule__Check__FinalAssignment_1 )? ) )
+            // InternalCheck.g:5246:1: ( ( rule__Check__FinalAssignment_1 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5246:1: ( ( rule__Check__FinalAssignment_1 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5247:1: ( rule__Check__FinalAssignment_1 )?
+            // InternalCheck.g:5246:1: ( ( rule__Check__FinalAssignment_1 )? )
+            // InternalCheck.g:5247:1: ( rule__Check__FinalAssignment_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getFinalAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5248:1: ( rule__Check__FinalAssignment_1 )?
+            // InternalCheck.g:5248:1: ( rule__Check__FinalAssignment_1 )?
             int alt60=2;
             int LA60_0 = input.LA(1);
 
@@ -16884,9 +16884,9 @@ public final void rule__Check__Group__1__Impl() throws RecognitionException {
             }
             switch (alt60) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5248:2: rule__Check__FinalAssignment_1
+                    // InternalCheck.g:5248:2: rule__Check__FinalAssignment_1
                     {
-                    pushFollow(FOLLOW_rule__Check__FinalAssignment_1_in_rule__Check__Group__1__Impl11362);
+                    pushFollow(FOLLOW_2);
                     rule__Check__FinalAssignment_1();
 
                     state._fsp--;
@@ -16922,21 +16922,21 @@ public final void rule__Check__Group__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5258:1: rule__Check__Group__2 : rule__Check__Group__2__Impl rule__Check__Group__3 ;
+    // InternalCheck.g:5258:1: rule__Check__Group__2 : rule__Check__Group__2__Impl rule__Check__Group__3 ;
     public final void rule__Check__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5262:1: ( rule__Check__Group__2__Impl rule__Check__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5263:2: rule__Check__Group__2__Impl rule__Check__Group__3
+            // InternalCheck.g:5262:1: ( rule__Check__Group__2__Impl rule__Check__Group__3 )
+            // InternalCheck.g:5263:2: rule__Check__Group__2__Impl rule__Check__Group__3
             {
-            pushFollow(FOLLOW_rule__Check__Group__2__Impl_in_rule__Check__Group__211393);
+            pushFollow(FOLLOW_17);
             rule__Check__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Check__Group__3_in_rule__Check__Group__211396);
+            pushFollow(FOLLOW_2);
             rule__Check__Group__3();
 
             state._fsp--;
@@ -16960,22 +16960,22 @@ public final void rule__Check__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5270:1: rule__Check__Group__2__Impl : ( ( rule__Check__KindAssignment_2 )? ) ;
+    // InternalCheck.g:5270:1: rule__Check__Group__2__Impl : ( ( rule__Check__KindAssignment_2 )? ) ;
     public final void rule__Check__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5274:1: ( ( ( rule__Check__KindAssignment_2 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5275:1: ( ( rule__Check__KindAssignment_2 )? )
+            // InternalCheck.g:5274:1: ( ( ( rule__Check__KindAssignment_2 )? ) )
+            // InternalCheck.g:5275:1: ( ( rule__Check__KindAssignment_2 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5275:1: ( ( rule__Check__KindAssignment_2 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5276:1: ( rule__Check__KindAssignment_2 )?
+            // InternalCheck.g:5275:1: ( ( rule__Check__KindAssignment_2 )? )
+            // InternalCheck.g:5276:1: ( rule__Check__KindAssignment_2 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getKindAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5277:1: ( rule__Check__KindAssignment_2 )?
+            // InternalCheck.g:5277:1: ( rule__Check__KindAssignment_2 )?
             int alt61=2;
             int LA61_0 = input.LA(1);
 
@@ -16984,9 +16984,9 @@ public final void rule__Check__Group__2__Impl() throws RecognitionException {
             }
             switch (alt61) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5277:2: rule__Check__KindAssignment_2
+                    // InternalCheck.g:5277:2: rule__Check__KindAssignment_2
                     {
-                    pushFollow(FOLLOW_rule__Check__KindAssignment_2_in_rule__Check__Group__2__Impl11423);
+                    pushFollow(FOLLOW_2);
                     rule__Check__KindAssignment_2();
 
                     state._fsp--;
@@ -17022,21 +17022,21 @@ public final void rule__Check__Group__2__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5287:1: rule__Check__Group__3 : rule__Check__Group__3__Impl rule__Check__Group__4 ;
+    // InternalCheck.g:5287:1: rule__Check__Group__3 : rule__Check__Group__3__Impl rule__Check__Group__4 ;
     public final void rule__Check__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5291:1: ( rule__Check__Group__3__Impl rule__Check__Group__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5292:2: rule__Check__Group__3__Impl rule__Check__Group__4
+            // InternalCheck.g:5291:1: ( rule__Check__Group__3__Impl rule__Check__Group__4 )
+            // InternalCheck.g:5292:2: rule__Check__Group__3__Impl rule__Check__Group__4
             {
-            pushFollow(FOLLOW_rule__Check__Group__3__Impl_in_rule__Check__Group__311454);
+            pushFollow(FOLLOW_13);
             rule__Check__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Check__Group__4_in_rule__Check__Group__311457);
+            pushFollow(FOLLOW_2);
             rule__Check__Group__4();
 
             state._fsp--;
@@ -17060,25 +17060,25 @@ public final void rule__Check__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5299:1: rule__Check__Group__3__Impl : ( ( rule__Check__DefaultSeverityAssignment_3 ) ) ;
+    // InternalCheck.g:5299:1: rule__Check__Group__3__Impl : ( ( rule__Check__DefaultSeverityAssignment_3 ) ) ;
     public final void rule__Check__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5303:1: ( ( ( rule__Check__DefaultSeverityAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5304:1: ( ( rule__Check__DefaultSeverityAssignment_3 ) )
+            // InternalCheck.g:5303:1: ( ( ( rule__Check__DefaultSeverityAssignment_3 ) ) )
+            // InternalCheck.g:5304:1: ( ( rule__Check__DefaultSeverityAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5304:1: ( ( rule__Check__DefaultSeverityAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5305:1: ( rule__Check__DefaultSeverityAssignment_3 )
+            // InternalCheck.g:5304:1: ( ( rule__Check__DefaultSeverityAssignment_3 ) )
+            // InternalCheck.g:5305:1: ( rule__Check__DefaultSeverityAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getDefaultSeverityAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5306:1: ( rule__Check__DefaultSeverityAssignment_3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5306:2: rule__Check__DefaultSeverityAssignment_3
+            // InternalCheck.g:5306:1: ( rule__Check__DefaultSeverityAssignment_3 )
+            // InternalCheck.g:5306:2: rule__Check__DefaultSeverityAssignment_3
             {
-            pushFollow(FOLLOW_rule__Check__DefaultSeverityAssignment_3_in_rule__Check__Group__3__Impl11484);
+            pushFollow(FOLLOW_2);
             rule__Check__DefaultSeverityAssignment_3();
 
             state._fsp--;
@@ -17111,21 +17111,21 @@ public final void rule__Check__Group__3__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5316:1: rule__Check__Group__4 : rule__Check__Group__4__Impl rule__Check__Group__5 ;
+    // InternalCheck.g:5316:1: rule__Check__Group__4 : rule__Check__Group__4__Impl rule__Check__Group__5 ;
     public final void rule__Check__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5320:1: ( rule__Check__Group__4__Impl rule__Check__Group__5 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5321:2: rule__Check__Group__4__Impl rule__Check__Group__5
+            // InternalCheck.g:5320:1: ( rule__Check__Group__4__Impl rule__Check__Group__5 )
+            // InternalCheck.g:5321:2: rule__Check__Group__4__Impl rule__Check__Group__5
             {
-            pushFollow(FOLLOW_rule__Check__Group__4__Impl_in_rule__Check__Group__411514);
+            pushFollow(FOLLOW_13);
             rule__Check__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Check__Group__5_in_rule__Check__Group__411517);
+            pushFollow(FOLLOW_2);
             rule__Check__Group__5();
 
             state._fsp--;
@@ -17149,22 +17149,22 @@ public final void rule__Check__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5328:1: rule__Check__Group__4__Impl : ( ( rule__Check__IdAssignment_4 )? ) ;
+    // InternalCheck.g:5328:1: rule__Check__Group__4__Impl : ( ( rule__Check__IdAssignment_4 )? ) ;
     public final void rule__Check__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5332:1: ( ( ( rule__Check__IdAssignment_4 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5333:1: ( ( rule__Check__IdAssignment_4 )? )
+            // InternalCheck.g:5332:1: ( ( ( rule__Check__IdAssignment_4 )? ) )
+            // InternalCheck.g:5333:1: ( ( rule__Check__IdAssignment_4 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5333:1: ( ( rule__Check__IdAssignment_4 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5334:1: ( rule__Check__IdAssignment_4 )?
+            // InternalCheck.g:5333:1: ( ( rule__Check__IdAssignment_4 )? )
+            // InternalCheck.g:5334:1: ( rule__Check__IdAssignment_4 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getIdAssignment_4()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5335:1: ( rule__Check__IdAssignment_4 )?
+            // InternalCheck.g:5335:1: ( rule__Check__IdAssignment_4 )?
             int alt62=2;
             int LA62_0 = input.LA(1);
 
@@ -17173,9 +17173,9 @@ public final void rule__Check__Group__4__Impl() throws RecognitionException {
             }
             switch (alt62) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5335:2: rule__Check__IdAssignment_4
+                    // InternalCheck.g:5335:2: rule__Check__IdAssignment_4
                     {
-                    pushFollow(FOLLOW_rule__Check__IdAssignment_4_in_rule__Check__Group__4__Impl11544);
+                    pushFollow(FOLLOW_2);
                     rule__Check__IdAssignment_4();
 
                     state._fsp--;
@@ -17211,21 +17211,21 @@ public final void rule__Check__Group__4__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group__5"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5345:1: rule__Check__Group__5 : rule__Check__Group__5__Impl rule__Check__Group__6 ;
+    // InternalCheck.g:5345:1: rule__Check__Group__5 : rule__Check__Group__5__Impl rule__Check__Group__6 ;
     public final void rule__Check__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5349:1: ( rule__Check__Group__5__Impl rule__Check__Group__6 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5350:2: rule__Check__Group__5__Impl rule__Check__Group__6
+            // InternalCheck.g:5349:1: ( rule__Check__Group__5__Impl rule__Check__Group__6 )
+            // InternalCheck.g:5350:2: rule__Check__Group__5__Impl rule__Check__Group__6
             {
-            pushFollow(FOLLOW_rule__Check__Group__5__Impl_in_rule__Check__Group__511575);
+            pushFollow(FOLLOW_18);
             rule__Check__Group__5__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Check__Group__6_in_rule__Check__Group__511578);
+            pushFollow(FOLLOW_2);
             rule__Check__Group__6();
 
             state._fsp--;
@@ -17249,25 +17249,25 @@ public final void rule__Check__Group__5() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5357:1: rule__Check__Group__5__Impl : ( ( rule__Check__LabelAssignment_5 ) ) ;
+    // InternalCheck.g:5357:1: rule__Check__Group__5__Impl : ( ( rule__Check__LabelAssignment_5 ) ) ;
     public final void rule__Check__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5361:1: ( ( ( rule__Check__LabelAssignment_5 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5362:1: ( ( rule__Check__LabelAssignment_5 ) )
+            // InternalCheck.g:5361:1: ( ( ( rule__Check__LabelAssignment_5 ) ) )
+            // InternalCheck.g:5362:1: ( ( rule__Check__LabelAssignment_5 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5362:1: ( ( rule__Check__LabelAssignment_5 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5363:1: ( rule__Check__LabelAssignment_5 )
+            // InternalCheck.g:5362:1: ( ( rule__Check__LabelAssignment_5 ) )
+            // InternalCheck.g:5363:1: ( rule__Check__LabelAssignment_5 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getLabelAssignment_5()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5364:1: ( rule__Check__LabelAssignment_5 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5364:2: rule__Check__LabelAssignment_5
+            // InternalCheck.g:5364:1: ( rule__Check__LabelAssignment_5 )
+            // InternalCheck.g:5364:2: rule__Check__LabelAssignment_5
             {
-            pushFollow(FOLLOW_rule__Check__LabelAssignment_5_in_rule__Check__Group__5__Impl11605);
+            pushFollow(FOLLOW_2);
             rule__Check__LabelAssignment_5();
 
             state._fsp--;
@@ -17300,21 +17300,21 @@ public final void rule__Check__Group__5__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group__6"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5374:1: rule__Check__Group__6 : rule__Check__Group__6__Impl rule__Check__Group__7 ;
+    // InternalCheck.g:5374:1: rule__Check__Group__6 : rule__Check__Group__6__Impl rule__Check__Group__7 ;
     public final void rule__Check__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5378:1: ( rule__Check__Group__6__Impl rule__Check__Group__7 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5379:2: rule__Check__Group__6__Impl rule__Check__Group__7
+            // InternalCheck.g:5378:1: ( rule__Check__Group__6__Impl rule__Check__Group__7 )
+            // InternalCheck.g:5379:2: rule__Check__Group__6__Impl rule__Check__Group__7
             {
-            pushFollow(FOLLOW_rule__Check__Group__6__Impl_in_rule__Check__Group__611635);
+            pushFollow(FOLLOW_18);
             rule__Check__Group__6__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Check__Group__7_in_rule__Check__Group__611638);
+            pushFollow(FOLLOW_2);
             rule__Check__Group__7();
 
             state._fsp--;
@@ -17338,29 +17338,29 @@ public final void rule__Check__Group__6() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group__6__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5386:1: rule__Check__Group__6__Impl : ( ( rule__Check__Group_6__0 )? ) ;
+    // InternalCheck.g:5386:1: rule__Check__Group__6__Impl : ( ( rule__Check__Group_6__0 )? ) ;
     public final void rule__Check__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5390:1: ( ( ( rule__Check__Group_6__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5391:1: ( ( rule__Check__Group_6__0 )? )
+            // InternalCheck.g:5390:1: ( ( ( rule__Check__Group_6__0 )? ) )
+            // InternalCheck.g:5391:1: ( ( rule__Check__Group_6__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5391:1: ( ( rule__Check__Group_6__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5392:1: ( rule__Check__Group_6__0 )?
+            // InternalCheck.g:5391:1: ( ( rule__Check__Group_6__0 )? )
+            // InternalCheck.g:5392:1: ( rule__Check__Group_6__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getGroup_6()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5393:1: ( rule__Check__Group_6__0 )?
+            // InternalCheck.g:5393:1: ( rule__Check__Group_6__0 )?
             int alt63=2;
             alt63 = dfa63.predict(input);
             switch (alt63) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5393:2: rule__Check__Group_6__0
+                    // InternalCheck.g:5393:2: rule__Check__Group_6__0
                     {
-                    pushFollow(FOLLOW_rule__Check__Group_6__0_in_rule__Check__Group__6__Impl11665);
+                    pushFollow(FOLLOW_2);
                     rule__Check__Group_6__0();
 
                     state._fsp--;
@@ -17396,21 +17396,21 @@ public final void rule__Check__Group__6__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group__7"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5403:1: rule__Check__Group__7 : rule__Check__Group__7__Impl rule__Check__Group__8 ;
+    // InternalCheck.g:5403:1: rule__Check__Group__7 : rule__Check__Group__7__Impl rule__Check__Group__8 ;
     public final void rule__Check__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5407:1: ( rule__Check__Group__7__Impl rule__Check__Group__8 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5408:2: rule__Check__Group__7__Impl rule__Check__Group__8
+            // InternalCheck.g:5407:1: ( rule__Check__Group__7__Impl rule__Check__Group__8 )
+            // InternalCheck.g:5408:2: rule__Check__Group__7__Impl rule__Check__Group__8
             {
-            pushFollow(FOLLOW_rule__Check__Group__7__Impl_in_rule__Check__Group__711696);
+            pushFollow(FOLLOW_18);
             rule__Check__Group__7__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Check__Group__8_in_rule__Check__Group__711699);
+            pushFollow(FOLLOW_2);
             rule__Check__Group__8();
 
             state._fsp--;
@@ -17434,22 +17434,22 @@ public final void rule__Check__Group__7() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group__7__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5415:1: rule__Check__Group__7__Impl : ( ( rule__Check__Group_7__0 )? ) ;
+    // InternalCheck.g:5415:1: rule__Check__Group__7__Impl : ( ( rule__Check__Group_7__0 )? ) ;
     public final void rule__Check__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5419:1: ( ( ( rule__Check__Group_7__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5420:1: ( ( rule__Check__Group_7__0 )? )
+            // InternalCheck.g:5419:1: ( ( ( rule__Check__Group_7__0 )? ) )
+            // InternalCheck.g:5420:1: ( ( rule__Check__Group_7__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5420:1: ( ( rule__Check__Group_7__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5421:1: ( rule__Check__Group_7__0 )?
+            // InternalCheck.g:5420:1: ( ( rule__Check__Group_7__0 )? )
+            // InternalCheck.g:5421:1: ( rule__Check__Group_7__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getGroup_7()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5422:1: ( rule__Check__Group_7__0 )?
+            // InternalCheck.g:5422:1: ( rule__Check__Group_7__0 )?
             int alt64=2;
             int LA64_0 = input.LA(1);
 
@@ -17458,9 +17458,9 @@ public final void rule__Check__Group__7__Impl() throws RecognitionException {
             }
             switch (alt64) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5422:2: rule__Check__Group_7__0
+                    // InternalCheck.g:5422:2: rule__Check__Group_7__0
                     {
-                    pushFollow(FOLLOW_rule__Check__Group_7__0_in_rule__Check__Group__7__Impl11726);
+                    pushFollow(FOLLOW_2);
                     rule__Check__Group_7__0();
 
                     state._fsp--;
@@ -17496,16 +17496,16 @@ public final void rule__Check__Group__7__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group__8"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5432:1: rule__Check__Group__8 : rule__Check__Group__8__Impl ;
+    // InternalCheck.g:5432:1: rule__Check__Group__8 : rule__Check__Group__8__Impl ;
     public final void rule__Check__Group__8() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5436:1: ( rule__Check__Group__8__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5437:2: rule__Check__Group__8__Impl
+            // InternalCheck.g:5436:1: ( rule__Check__Group__8__Impl )
+            // InternalCheck.g:5437:2: rule__Check__Group__8__Impl
             {
-            pushFollow(FOLLOW_rule__Check__Group__8__Impl_in_rule__Check__Group__811757);
+            pushFollow(FOLLOW_2);
             rule__Check__Group__8__Impl();
 
             state._fsp--;
@@ -17529,25 +17529,25 @@ public final void rule__Check__Group__8() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group__8__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5443:1: rule__Check__Group__8__Impl : ( ( rule__Check__Alternatives_8 ) ) ;
+    // InternalCheck.g:5443:1: rule__Check__Group__8__Impl : ( ( rule__Check__Alternatives_8 ) ) ;
     public final void rule__Check__Group__8__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5447:1: ( ( ( rule__Check__Alternatives_8 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5448:1: ( ( rule__Check__Alternatives_8 ) )
+            // InternalCheck.g:5447:1: ( ( ( rule__Check__Alternatives_8 ) ) )
+            // InternalCheck.g:5448:1: ( ( rule__Check__Alternatives_8 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5448:1: ( ( rule__Check__Alternatives_8 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5449:1: ( rule__Check__Alternatives_8 )
+            // InternalCheck.g:5448:1: ( ( rule__Check__Alternatives_8 ) )
+            // InternalCheck.g:5449:1: ( rule__Check__Alternatives_8 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getAlternatives_8()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5450:1: ( rule__Check__Alternatives_8 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5450:2: rule__Check__Alternatives_8
+            // InternalCheck.g:5450:1: ( rule__Check__Alternatives_8 )
+            // InternalCheck.g:5450:2: rule__Check__Alternatives_8
             {
-            pushFollow(FOLLOW_rule__Check__Alternatives_8_in_rule__Check__Group__8__Impl11784);
+            pushFollow(FOLLOW_2);
             rule__Check__Alternatives_8();
 
             state._fsp--;
@@ -17580,21 +17580,21 @@ public final void rule__Check__Group__8__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group_6__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5478:1: rule__Check__Group_6__0 : rule__Check__Group_6__0__Impl rule__Check__Group_6__1 ;
+    // InternalCheck.g:5478:1: rule__Check__Group_6__0 : rule__Check__Group_6__0__Impl rule__Check__Group_6__1 ;
     public final void rule__Check__Group_6__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5482:1: ( rule__Check__Group_6__0__Impl rule__Check__Group_6__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5483:2: rule__Check__Group_6__0__Impl rule__Check__Group_6__1
+            // InternalCheck.g:5482:1: ( rule__Check__Group_6__0__Impl rule__Check__Group_6__1 )
+            // InternalCheck.g:5483:2: rule__Check__Group_6__0__Impl rule__Check__Group_6__1
             {
-            pushFollow(FOLLOW_rule__Check__Group_6__0__Impl_in_rule__Check__Group_6__011832);
+            pushFollow(FOLLOW_19);
             rule__Check__Group_6__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Check__Group_6__1_in_rule__Check__Group_6__011835);
+            pushFollow(FOLLOW_2);
             rule__Check__Group_6__1();
 
             state._fsp--;
@@ -17618,25 +17618,25 @@ public final void rule__Check__Group_6__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group_6__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5490:1: rule__Check__Group_6__0__Impl : ( ( '(' ) ) ;
+    // InternalCheck.g:5490:1: rule__Check__Group_6__0__Impl : ( ( '(' ) ) ;
     public final void rule__Check__Group_6__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5494:1: ( ( ( '(' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5495:1: ( ( '(' ) )
+            // InternalCheck.g:5494:1: ( ( ( '(' ) ) )
+            // InternalCheck.g:5495:1: ( ( '(' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5495:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5496:1: ( '(' )
+            // InternalCheck.g:5495:1: ( ( '(' ) )
+            // InternalCheck.g:5496:1: ( '(' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getLeftParenthesisKeyword_6_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5497:1: ( '(' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5498:2: '('
+            // InternalCheck.g:5497:1: ( '(' )
+            // InternalCheck.g:5498:2: '('
             {
-            match(input,72,FOLLOW_72_in_rule__Check__Group_6__0__Impl11864); if (state.failed) return ;
+            match(input,72,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -17665,21 +17665,21 @@ public final void rule__Check__Group_6__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group_6__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5509:1: rule__Check__Group_6__1 : rule__Check__Group_6__1__Impl rule__Check__Group_6__2 ;
+    // InternalCheck.g:5509:1: rule__Check__Group_6__1 : rule__Check__Group_6__1__Impl rule__Check__Group_6__2 ;
     public final void rule__Check__Group_6__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5513:1: ( rule__Check__Group_6__1__Impl rule__Check__Group_6__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5514:2: rule__Check__Group_6__1__Impl rule__Check__Group_6__2
+            // InternalCheck.g:5513:1: ( rule__Check__Group_6__1__Impl rule__Check__Group_6__2 )
+            // InternalCheck.g:5514:2: rule__Check__Group_6__1__Impl rule__Check__Group_6__2
             {
-            pushFollow(FOLLOW_rule__Check__Group_6__1__Impl_in_rule__Check__Group_6__111896);
+            pushFollow(FOLLOW_19);
             rule__Check__Group_6__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Check__Group_6__2_in_rule__Check__Group_6__111899);
+            pushFollow(FOLLOW_2);
             rule__Check__Group_6__2();
 
             state._fsp--;
@@ -17703,22 +17703,22 @@ public final void rule__Check__Group_6__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group_6__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5521:1: rule__Check__Group_6__1__Impl : ( ( rule__Check__Group_6_1__0 )? ) ;
+    // InternalCheck.g:5521:1: rule__Check__Group_6__1__Impl : ( ( rule__Check__Group_6_1__0 )? ) ;
     public final void rule__Check__Group_6__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5525:1: ( ( ( rule__Check__Group_6_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5526:1: ( ( rule__Check__Group_6_1__0 )? )
+            // InternalCheck.g:5525:1: ( ( ( rule__Check__Group_6_1__0 )? ) )
+            // InternalCheck.g:5526:1: ( ( rule__Check__Group_6_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5526:1: ( ( rule__Check__Group_6_1__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5527:1: ( rule__Check__Group_6_1__0 )?
+            // InternalCheck.g:5526:1: ( ( rule__Check__Group_6_1__0 )? )
+            // InternalCheck.g:5527:1: ( rule__Check__Group_6_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getGroup_6_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5528:1: ( rule__Check__Group_6_1__0 )?
+            // InternalCheck.g:5528:1: ( rule__Check__Group_6_1__0 )?
             int alt65=2;
             int LA65_0 = input.LA(1);
 
@@ -17727,9 +17727,9 @@ public final void rule__Check__Group_6__1__Impl() throws RecognitionException {
             }
             switch (alt65) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5528:2: rule__Check__Group_6_1__0
+                    // InternalCheck.g:5528:2: rule__Check__Group_6_1__0
                     {
-                    pushFollow(FOLLOW_rule__Check__Group_6_1__0_in_rule__Check__Group_6__1__Impl11926);
+                    pushFollow(FOLLOW_2);
                     rule__Check__Group_6_1__0();
 
                     state._fsp--;
@@ -17765,16 +17765,16 @@ public final void rule__Check__Group_6__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group_6__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5538:1: rule__Check__Group_6__2 : rule__Check__Group_6__2__Impl ;
+    // InternalCheck.g:5538:1: rule__Check__Group_6__2 : rule__Check__Group_6__2__Impl ;
     public final void rule__Check__Group_6__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5542:1: ( rule__Check__Group_6__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5543:2: rule__Check__Group_6__2__Impl
+            // InternalCheck.g:5542:1: ( rule__Check__Group_6__2__Impl )
+            // InternalCheck.g:5543:2: rule__Check__Group_6__2__Impl
             {
-            pushFollow(FOLLOW_rule__Check__Group_6__2__Impl_in_rule__Check__Group_6__211957);
+            pushFollow(FOLLOW_2);
             rule__Check__Group_6__2__Impl();
 
             state._fsp--;
@@ -17798,22 +17798,22 @@ public final void rule__Check__Group_6__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group_6__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5549:1: rule__Check__Group_6__2__Impl : ( ')' ) ;
+    // InternalCheck.g:5549:1: rule__Check__Group_6__2__Impl : ( ')' ) ;
     public final void rule__Check__Group_6__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5553:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5554:1: ( ')' )
+            // InternalCheck.g:5553:1: ( ( ')' ) )
+            // InternalCheck.g:5554:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5554:1: ( ')' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5555:1: ')'
+            // InternalCheck.g:5554:1: ( ')' )
+            // InternalCheck.g:5555:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getRightParenthesisKeyword_6_2()); 
             }
-            match(input,73,FOLLOW_73_in_rule__Check__Group_6__2__Impl11985); if (state.failed) return ;
+            match(input,73,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCheckAccess().getRightParenthesisKeyword_6_2()); 
             }
@@ -17839,21 +17839,21 @@ public final void rule__Check__Group_6__2__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group_6_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5574:1: rule__Check__Group_6_1__0 : rule__Check__Group_6_1__0__Impl rule__Check__Group_6_1__1 ;
+    // InternalCheck.g:5574:1: rule__Check__Group_6_1__0 : rule__Check__Group_6_1__0__Impl rule__Check__Group_6_1__1 ;
     public final void rule__Check__Group_6_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5578:1: ( rule__Check__Group_6_1__0__Impl rule__Check__Group_6_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5579:2: rule__Check__Group_6_1__0__Impl rule__Check__Group_6_1__1
+            // InternalCheck.g:5578:1: ( rule__Check__Group_6_1__0__Impl rule__Check__Group_6_1__1 )
+            // InternalCheck.g:5579:2: rule__Check__Group_6_1__0__Impl rule__Check__Group_6_1__1
             {
-            pushFollow(FOLLOW_rule__Check__Group_6_1__0__Impl_in_rule__Check__Group_6_1__012022);
+            pushFollow(FOLLOW_20);
             rule__Check__Group_6_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Check__Group_6_1__1_in_rule__Check__Group_6_1__012025);
+            pushFollow(FOLLOW_2);
             rule__Check__Group_6_1__1();
 
             state._fsp--;
@@ -17877,25 +17877,25 @@ public final void rule__Check__Group_6_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group_6_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5586:1: rule__Check__Group_6_1__0__Impl : ( ( rule__Check__FormalParametersAssignment_6_1_0 ) ) ;
+    // InternalCheck.g:5586:1: rule__Check__Group_6_1__0__Impl : ( ( rule__Check__FormalParametersAssignment_6_1_0 ) ) ;
     public final void rule__Check__Group_6_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5590:1: ( ( ( rule__Check__FormalParametersAssignment_6_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5591:1: ( ( rule__Check__FormalParametersAssignment_6_1_0 ) )
+            // InternalCheck.g:5590:1: ( ( ( rule__Check__FormalParametersAssignment_6_1_0 ) ) )
+            // InternalCheck.g:5591:1: ( ( rule__Check__FormalParametersAssignment_6_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5591:1: ( ( rule__Check__FormalParametersAssignment_6_1_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5592:1: ( rule__Check__FormalParametersAssignment_6_1_0 )
+            // InternalCheck.g:5591:1: ( ( rule__Check__FormalParametersAssignment_6_1_0 ) )
+            // InternalCheck.g:5592:1: ( rule__Check__FormalParametersAssignment_6_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getFormalParametersAssignment_6_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5593:1: ( rule__Check__FormalParametersAssignment_6_1_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5593:2: rule__Check__FormalParametersAssignment_6_1_0
+            // InternalCheck.g:5593:1: ( rule__Check__FormalParametersAssignment_6_1_0 )
+            // InternalCheck.g:5593:2: rule__Check__FormalParametersAssignment_6_1_0
             {
-            pushFollow(FOLLOW_rule__Check__FormalParametersAssignment_6_1_0_in_rule__Check__Group_6_1__0__Impl12052);
+            pushFollow(FOLLOW_2);
             rule__Check__FormalParametersAssignment_6_1_0();
 
             state._fsp--;
@@ -17928,16 +17928,16 @@ public final void rule__Check__Group_6_1__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__Check__Group_6_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5603:1: rule__Check__Group_6_1__1 : rule__Check__Group_6_1__1__Impl ;
+    // InternalCheck.g:5603:1: rule__Check__Group_6_1__1 : rule__Check__Group_6_1__1__Impl ;
     public final void rule__Check__Group_6_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5607:1: ( rule__Check__Group_6_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5608:2: rule__Check__Group_6_1__1__Impl
+            // InternalCheck.g:5607:1: ( rule__Check__Group_6_1__1__Impl )
+            // InternalCheck.g:5608:2: rule__Check__Group_6_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__Check__Group_6_1__1__Impl_in_rule__Check__Group_6_1__112082);
+            pushFollow(FOLLOW_2);
             rule__Check__Group_6_1__1__Impl();
 
             state._fsp--;
@@ -17961,22 +17961,22 @@ public final void rule__Check__Group_6_1__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group_6_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5614:1: rule__Check__Group_6_1__1__Impl : ( ( rule__Check__Group_6_1_1__0 )* ) ;
+    // InternalCheck.g:5614:1: rule__Check__Group_6_1__1__Impl : ( ( rule__Check__Group_6_1_1__0 )* ) ;
     public final void rule__Check__Group_6_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5618:1: ( ( ( rule__Check__Group_6_1_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5619:1: ( ( rule__Check__Group_6_1_1__0 )* )
+            // InternalCheck.g:5618:1: ( ( ( rule__Check__Group_6_1_1__0 )* ) )
+            // InternalCheck.g:5619:1: ( ( rule__Check__Group_6_1_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5619:1: ( ( rule__Check__Group_6_1_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5620:1: ( rule__Check__Group_6_1_1__0 )*
+            // InternalCheck.g:5619:1: ( ( rule__Check__Group_6_1_1__0 )* )
+            // InternalCheck.g:5620:1: ( rule__Check__Group_6_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getGroup_6_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5621:1: ( rule__Check__Group_6_1_1__0 )*
+            // InternalCheck.g:5621:1: ( rule__Check__Group_6_1_1__0 )*
             loop66:
             do {
                 int alt66=2;
@@ -17989,9 +17989,9 @@ public final void rule__Check__Group_6_1__1__Impl() throws RecognitionException
 
                 switch (alt66) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5621:2: rule__Check__Group_6_1_1__0
+            	    // InternalCheck.g:5621:2: rule__Check__Group_6_1_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__Check__Group_6_1_1__0_in_rule__Check__Group_6_1__1__Impl12109);
+            	    pushFollow(FOLLOW_21);
             	    rule__Check__Group_6_1_1__0();
 
             	    state._fsp--;
@@ -18030,21 +18030,21 @@ public final void rule__Check__Group_6_1__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__Check__Group_6_1_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5635:1: rule__Check__Group_6_1_1__0 : rule__Check__Group_6_1_1__0__Impl rule__Check__Group_6_1_1__1 ;
+    // InternalCheck.g:5635:1: rule__Check__Group_6_1_1__0 : rule__Check__Group_6_1_1__0__Impl rule__Check__Group_6_1_1__1 ;
     public final void rule__Check__Group_6_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5639:1: ( rule__Check__Group_6_1_1__0__Impl rule__Check__Group_6_1_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5640:2: rule__Check__Group_6_1_1__0__Impl rule__Check__Group_6_1_1__1
+            // InternalCheck.g:5639:1: ( rule__Check__Group_6_1_1__0__Impl rule__Check__Group_6_1_1__1 )
+            // InternalCheck.g:5640:2: rule__Check__Group_6_1_1__0__Impl rule__Check__Group_6_1_1__1
             {
-            pushFollow(FOLLOW_rule__Check__Group_6_1_1__0__Impl_in_rule__Check__Group_6_1_1__012144);
+            pushFollow(FOLLOW_4);
             rule__Check__Group_6_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Check__Group_6_1_1__1_in_rule__Check__Group_6_1_1__012147);
+            pushFollow(FOLLOW_2);
             rule__Check__Group_6_1_1__1();
 
             state._fsp--;
@@ -18068,22 +18068,22 @@ public final void rule__Check__Group_6_1_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group_6_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5647:1: rule__Check__Group_6_1_1__0__Impl : ( ',' ) ;
+    // InternalCheck.g:5647:1: rule__Check__Group_6_1_1__0__Impl : ( ',' ) ;
     public final void rule__Check__Group_6_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5651:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5652:1: ( ',' )
+            // InternalCheck.g:5651:1: ( ( ',' ) )
+            // InternalCheck.g:5652:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5652:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5653:1: ','
+            // InternalCheck.g:5652:1: ( ',' )
+            // InternalCheck.g:5653:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getCommaKeyword_6_1_1_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__Check__Group_6_1_1__0__Impl12175); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCheckAccess().getCommaKeyword_6_1_1_0()); 
             }
@@ -18109,16 +18109,16 @@ public final void rule__Check__Group_6_1_1__0__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__Check__Group_6_1_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5666:1: rule__Check__Group_6_1_1__1 : rule__Check__Group_6_1_1__1__Impl ;
+    // InternalCheck.g:5666:1: rule__Check__Group_6_1_1__1 : rule__Check__Group_6_1_1__1__Impl ;
     public final void rule__Check__Group_6_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5670:1: ( rule__Check__Group_6_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5671:2: rule__Check__Group_6_1_1__1__Impl
+            // InternalCheck.g:5670:1: ( rule__Check__Group_6_1_1__1__Impl )
+            // InternalCheck.g:5671:2: rule__Check__Group_6_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__Check__Group_6_1_1__1__Impl_in_rule__Check__Group_6_1_1__112206);
+            pushFollow(FOLLOW_2);
             rule__Check__Group_6_1_1__1__Impl();
 
             state._fsp--;
@@ -18142,25 +18142,25 @@ public final void rule__Check__Group_6_1_1__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group_6_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5677:1: rule__Check__Group_6_1_1__1__Impl : ( ( rule__Check__FormalParametersAssignment_6_1_1_1 ) ) ;
+    // InternalCheck.g:5677:1: rule__Check__Group_6_1_1__1__Impl : ( ( rule__Check__FormalParametersAssignment_6_1_1_1 ) ) ;
     public final void rule__Check__Group_6_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5681:1: ( ( ( rule__Check__FormalParametersAssignment_6_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5682:1: ( ( rule__Check__FormalParametersAssignment_6_1_1_1 ) )
+            // InternalCheck.g:5681:1: ( ( ( rule__Check__FormalParametersAssignment_6_1_1_1 ) ) )
+            // InternalCheck.g:5682:1: ( ( rule__Check__FormalParametersAssignment_6_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5682:1: ( ( rule__Check__FormalParametersAssignment_6_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5683:1: ( rule__Check__FormalParametersAssignment_6_1_1_1 )
+            // InternalCheck.g:5682:1: ( ( rule__Check__FormalParametersAssignment_6_1_1_1 ) )
+            // InternalCheck.g:5683:1: ( rule__Check__FormalParametersAssignment_6_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getFormalParametersAssignment_6_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5684:1: ( rule__Check__FormalParametersAssignment_6_1_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5684:2: rule__Check__FormalParametersAssignment_6_1_1_1
+            // InternalCheck.g:5684:1: ( rule__Check__FormalParametersAssignment_6_1_1_1 )
+            // InternalCheck.g:5684:2: rule__Check__FormalParametersAssignment_6_1_1_1
             {
-            pushFollow(FOLLOW_rule__Check__FormalParametersAssignment_6_1_1_1_in_rule__Check__Group_6_1_1__1__Impl12233);
+            pushFollow(FOLLOW_2);
             rule__Check__FormalParametersAssignment_6_1_1_1();
 
             state._fsp--;
@@ -18193,21 +18193,21 @@ public final void rule__Check__Group_6_1_1__1__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__Check__Group_7__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5698:1: rule__Check__Group_7__0 : rule__Check__Group_7__0__Impl rule__Check__Group_7__1 ;
+    // InternalCheck.g:5698:1: rule__Check__Group_7__0 : rule__Check__Group_7__0__Impl rule__Check__Group_7__1 ;
     public final void rule__Check__Group_7__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5702:1: ( rule__Check__Group_7__0__Impl rule__Check__Group_7__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5703:2: rule__Check__Group_7__0__Impl rule__Check__Group_7__1
+            // InternalCheck.g:5702:1: ( rule__Check__Group_7__0__Impl rule__Check__Group_7__1 )
+            // InternalCheck.g:5703:2: rule__Check__Group_7__0__Impl rule__Check__Group_7__1
             {
-            pushFollow(FOLLOW_rule__Check__Group_7__0__Impl_in_rule__Check__Group_7__012267);
+            pushFollow(FOLLOW_22);
             rule__Check__Group_7__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Check__Group_7__1_in_rule__Check__Group_7__012270);
+            pushFollow(FOLLOW_2);
             rule__Check__Group_7__1();
 
             state._fsp--;
@@ -18231,22 +18231,22 @@ public final void rule__Check__Group_7__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group_7__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5710:1: rule__Check__Group_7__0__Impl : ( 'message' ) ;
+    // InternalCheck.g:5710:1: rule__Check__Group_7__0__Impl : ( 'message' ) ;
     public final void rule__Check__Group_7__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5714:1: ( ( 'message' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5715:1: ( 'message' )
+            // InternalCheck.g:5714:1: ( ( 'message' ) )
+            // InternalCheck.g:5715:1: ( 'message' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5715:1: ( 'message' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5716:1: 'message'
+            // InternalCheck.g:5715:1: ( 'message' )
+            // InternalCheck.g:5716:1: 'message'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getMessageKeyword_7_0()); 
             }
-            match(input,24,FOLLOW_24_in_rule__Check__Group_7__0__Impl12298); if (state.failed) return ;
+            match(input,24,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCheckAccess().getMessageKeyword_7_0()); 
             }
@@ -18272,16 +18272,16 @@ public final void rule__Check__Group_7__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group_7__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5729:1: rule__Check__Group_7__1 : rule__Check__Group_7__1__Impl ;
+    // InternalCheck.g:5729:1: rule__Check__Group_7__1 : rule__Check__Group_7__1__Impl ;
     public final void rule__Check__Group_7__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5733:1: ( rule__Check__Group_7__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5734:2: rule__Check__Group_7__1__Impl
+            // InternalCheck.g:5733:1: ( rule__Check__Group_7__1__Impl )
+            // InternalCheck.g:5734:2: rule__Check__Group_7__1__Impl
             {
-            pushFollow(FOLLOW_rule__Check__Group_7__1__Impl_in_rule__Check__Group_7__112329);
+            pushFollow(FOLLOW_2);
             rule__Check__Group_7__1__Impl();
 
             state._fsp--;
@@ -18305,25 +18305,25 @@ public final void rule__Check__Group_7__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group_7__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5740:1: rule__Check__Group_7__1__Impl : ( ( rule__Check__GivenMessageAssignment_7_1 ) ) ;
+    // InternalCheck.g:5740:1: rule__Check__Group_7__1__Impl : ( ( rule__Check__GivenMessageAssignment_7_1 ) ) ;
     public final void rule__Check__Group_7__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5744:1: ( ( ( rule__Check__GivenMessageAssignment_7_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5745:1: ( ( rule__Check__GivenMessageAssignment_7_1 ) )
+            // InternalCheck.g:5744:1: ( ( ( rule__Check__GivenMessageAssignment_7_1 ) ) )
+            // InternalCheck.g:5745:1: ( ( rule__Check__GivenMessageAssignment_7_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5745:1: ( ( rule__Check__GivenMessageAssignment_7_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5746:1: ( rule__Check__GivenMessageAssignment_7_1 )
+            // InternalCheck.g:5745:1: ( ( rule__Check__GivenMessageAssignment_7_1 ) )
+            // InternalCheck.g:5746:1: ( rule__Check__GivenMessageAssignment_7_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getGivenMessageAssignment_7_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5747:1: ( rule__Check__GivenMessageAssignment_7_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5747:2: rule__Check__GivenMessageAssignment_7_1
+            // InternalCheck.g:5747:1: ( rule__Check__GivenMessageAssignment_7_1 )
+            // InternalCheck.g:5747:2: rule__Check__GivenMessageAssignment_7_1
             {
-            pushFollow(FOLLOW_rule__Check__GivenMessageAssignment_7_1_in_rule__Check__Group_7__1__Impl12356);
+            pushFollow(FOLLOW_2);
             rule__Check__GivenMessageAssignment_7_1();
 
             state._fsp--;
@@ -18356,21 +18356,21 @@ public final void rule__Check__Group_7__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group_8_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5761:1: rule__Check__Group_8_0__0 : rule__Check__Group_8_0__0__Impl rule__Check__Group_8_0__1 ;
+    // InternalCheck.g:5761:1: rule__Check__Group_8_0__0 : rule__Check__Group_8_0__0__Impl rule__Check__Group_8_0__1 ;
     public final void rule__Check__Group_8_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5765:1: ( rule__Check__Group_8_0__0__Impl rule__Check__Group_8_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5766:2: rule__Check__Group_8_0__0__Impl rule__Check__Group_8_0__1
+            // InternalCheck.g:5765:1: ( rule__Check__Group_8_0__0__Impl rule__Check__Group_8_0__1 )
+            // InternalCheck.g:5766:2: rule__Check__Group_8_0__0__Impl rule__Check__Group_8_0__1
             {
-            pushFollow(FOLLOW_rule__Check__Group_8_0__0__Impl_in_rule__Check__Group_8_0__012390);
+            pushFollow(FOLLOW_23);
             rule__Check__Group_8_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Check__Group_8_0__1_in_rule__Check__Group_8_0__012393);
+            pushFollow(FOLLOW_2);
             rule__Check__Group_8_0__1();
 
             state._fsp--;
@@ -18394,25 +18394,25 @@ public final void rule__Check__Group_8_0__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group_8_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5773:1: rule__Check__Group_8_0__0__Impl : ( ( '{' ) ) ;
+    // InternalCheck.g:5773:1: rule__Check__Group_8_0__0__Impl : ( ( '{' ) ) ;
     public final void rule__Check__Group_8_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5777:1: ( ( ( '{' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5778:1: ( ( '{' ) )
+            // InternalCheck.g:5777:1: ( ( ( '{' ) ) )
+            // InternalCheck.g:5778:1: ( ( '{' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5778:1: ( ( '{' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5779:1: ( '{' )
+            // InternalCheck.g:5778:1: ( ( '{' ) )
+            // InternalCheck.g:5779:1: ( '{' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getLeftCurlyBracketKeyword_8_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5780:1: ( '{' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5781:2: '{'
+            // InternalCheck.g:5780:1: ( '{' )
+            // InternalCheck.g:5781:2: '{'
             {
-            match(input,68,FOLLOW_68_in_rule__Check__Group_8_0__0__Impl12422); if (state.failed) return ;
+            match(input,68,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -18441,21 +18441,21 @@ public final void rule__Check__Group_8_0__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__Check__Group_8_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5792:1: rule__Check__Group_8_0__1 : rule__Check__Group_8_0__1__Impl rule__Check__Group_8_0__2 ;
+    // InternalCheck.g:5792:1: rule__Check__Group_8_0__1 : rule__Check__Group_8_0__1__Impl rule__Check__Group_8_0__2 ;
     public final void rule__Check__Group_8_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5796:1: ( rule__Check__Group_8_0__1__Impl rule__Check__Group_8_0__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5797:2: rule__Check__Group_8_0__1__Impl rule__Check__Group_8_0__2
+            // InternalCheck.g:5796:1: ( rule__Check__Group_8_0__1__Impl rule__Check__Group_8_0__2 )
+            // InternalCheck.g:5797:2: rule__Check__Group_8_0__1__Impl rule__Check__Group_8_0__2
             {
-            pushFollow(FOLLOW_rule__Check__Group_8_0__1__Impl_in_rule__Check__Group_8_0__112454);
+            pushFollow(FOLLOW_23);
             rule__Check__Group_8_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Check__Group_8_0__2_in_rule__Check__Group_8_0__112457);
+            pushFollow(FOLLOW_2);
             rule__Check__Group_8_0__2();
 
             state._fsp--;
@@ -18479,22 +18479,22 @@ public final void rule__Check__Group_8_0__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group_8_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5804:1: rule__Check__Group_8_0__1__Impl : ( ( rule__Check__ContextsAssignment_8_0_1 )* ) ;
+    // InternalCheck.g:5804:1: rule__Check__Group_8_0__1__Impl : ( ( rule__Check__ContextsAssignment_8_0_1 )* ) ;
     public final void rule__Check__Group_8_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5808:1: ( ( ( rule__Check__ContextsAssignment_8_0_1 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5809:1: ( ( rule__Check__ContextsAssignment_8_0_1 )* )
+            // InternalCheck.g:5808:1: ( ( ( rule__Check__ContextsAssignment_8_0_1 )* ) )
+            // InternalCheck.g:5809:1: ( ( rule__Check__ContextsAssignment_8_0_1 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5809:1: ( ( rule__Check__ContextsAssignment_8_0_1 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5810:1: ( rule__Check__ContextsAssignment_8_0_1 )*
+            // InternalCheck.g:5809:1: ( ( rule__Check__ContextsAssignment_8_0_1 )* )
+            // InternalCheck.g:5810:1: ( rule__Check__ContextsAssignment_8_0_1 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getContextsAssignment_8_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5811:1: ( rule__Check__ContextsAssignment_8_0_1 )*
+            // InternalCheck.g:5811:1: ( rule__Check__ContextsAssignment_8_0_1 )*
             loop67:
             do {
                 int alt67=2;
@@ -18507,9 +18507,9 @@ public final void rule__Check__Group_8_0__1__Impl() throws RecognitionException
 
                 switch (alt67) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5811:2: rule__Check__ContextsAssignment_8_0_1
+            	    // InternalCheck.g:5811:2: rule__Check__ContextsAssignment_8_0_1
             	    {
-            	    pushFollow(FOLLOW_rule__Check__ContextsAssignment_8_0_1_in_rule__Check__Group_8_0__1__Impl12484);
+            	    pushFollow(FOLLOW_24);
             	    rule__Check__ContextsAssignment_8_0_1();
 
             	    state._fsp--;
@@ -18548,16 +18548,16 @@ public final void rule__Check__Group_8_0__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__Check__Group_8_0__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5821:1: rule__Check__Group_8_0__2 : rule__Check__Group_8_0__2__Impl ;
+    // InternalCheck.g:5821:1: rule__Check__Group_8_0__2 : rule__Check__Group_8_0__2__Impl ;
     public final void rule__Check__Group_8_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5825:1: ( rule__Check__Group_8_0__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5826:2: rule__Check__Group_8_0__2__Impl
+            // InternalCheck.g:5825:1: ( rule__Check__Group_8_0__2__Impl )
+            // InternalCheck.g:5826:2: rule__Check__Group_8_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__Check__Group_8_0__2__Impl_in_rule__Check__Group_8_0__212515);
+            pushFollow(FOLLOW_2);
             rule__Check__Group_8_0__2__Impl();
 
             state._fsp--;
@@ -18581,22 +18581,22 @@ public final void rule__Check__Group_8_0__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__Group_8_0__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5832:1: rule__Check__Group_8_0__2__Impl : ( '}' ) ;
+    // InternalCheck.g:5832:1: rule__Check__Group_8_0__2__Impl : ( '}' ) ;
     public final void rule__Check__Group_8_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5836:1: ( ( '}' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5837:1: ( '}' )
+            // InternalCheck.g:5836:1: ( ( '}' ) )
+            // InternalCheck.g:5837:1: ( '}' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5837:1: ( '}' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5838:1: '}'
+            // InternalCheck.g:5837:1: ( '}' )
+            // InternalCheck.g:5838:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getRightCurlyBracketKeyword_8_0_2()); 
             }
-            match(input,69,FOLLOW_69_in_rule__Check__Group_8_0__2__Impl12543); if (state.failed) return ;
+            match(input,69,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCheckAccess().getRightCurlyBracketKeyword_8_0_2()); 
             }
@@ -18622,21 +18622,21 @@ public final void rule__Check__Group_8_0__2__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__SeverityRange__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5857:1: rule__SeverityRange__Group__0 : rule__SeverityRange__Group__0__Impl rule__SeverityRange__Group__1 ;
+    // InternalCheck.g:5857:1: rule__SeverityRange__Group__0 : rule__SeverityRange__Group__0__Impl rule__SeverityRange__Group__1 ;
     public final void rule__SeverityRange__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5861:1: ( rule__SeverityRange__Group__0__Impl rule__SeverityRange__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5862:2: rule__SeverityRange__Group__0__Impl rule__SeverityRange__Group__1
+            // InternalCheck.g:5861:1: ( rule__SeverityRange__Group__0__Impl rule__SeverityRange__Group__1 )
+            // InternalCheck.g:5862:2: rule__SeverityRange__Group__0__Impl rule__SeverityRange__Group__1
             {
-            pushFollow(FOLLOW_rule__SeverityRange__Group__0__Impl_in_rule__SeverityRange__Group__012580);
+            pushFollow(FOLLOW_25);
             rule__SeverityRange__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SeverityRange__Group__1_in_rule__SeverityRange__Group__012583);
+            pushFollow(FOLLOW_2);
             rule__SeverityRange__Group__1();
 
             state._fsp--;
@@ -18660,22 +18660,22 @@ public final void rule__SeverityRange__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__SeverityRange__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5869:1: rule__SeverityRange__Group__0__Impl : ( '@' ) ;
+    // InternalCheck.g:5869:1: rule__SeverityRange__Group__0__Impl : ( '@' ) ;
     public final void rule__SeverityRange__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5873:1: ( ( '@' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5874:1: ( '@' )
+            // InternalCheck.g:5873:1: ( ( '@' ) )
+            // InternalCheck.g:5874:1: ( '@' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5874:1: ( '@' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5875:1: '@'
+            // InternalCheck.g:5874:1: ( '@' )
+            // InternalCheck.g:5875:1: '@'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSeverityRangeAccess().getCommercialAtKeyword_0()); 
             }
-            match(input,75,FOLLOW_75_in_rule__SeverityRange__Group__0__Impl12611); if (state.failed) return ;
+            match(input,75,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSeverityRangeAccess().getCommercialAtKeyword_0()); 
             }
@@ -18701,21 +18701,21 @@ public final void rule__SeverityRange__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__SeverityRange__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5888:1: rule__SeverityRange__Group__1 : rule__SeverityRange__Group__1__Impl rule__SeverityRange__Group__2 ;
+    // InternalCheck.g:5888:1: rule__SeverityRange__Group__1 : rule__SeverityRange__Group__1__Impl rule__SeverityRange__Group__2 ;
     public final void rule__SeverityRange__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5892:1: ( rule__SeverityRange__Group__1__Impl rule__SeverityRange__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5893:2: rule__SeverityRange__Group__1__Impl rule__SeverityRange__Group__2
+            // InternalCheck.g:5892:1: ( rule__SeverityRange__Group__1__Impl rule__SeverityRange__Group__2 )
+            // InternalCheck.g:5893:2: rule__SeverityRange__Group__1__Impl rule__SeverityRange__Group__2
             {
-            pushFollow(FOLLOW_rule__SeverityRange__Group__1__Impl_in_rule__SeverityRange__Group__112642);
+            pushFollow(FOLLOW_26);
             rule__SeverityRange__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SeverityRange__Group__2_in_rule__SeverityRange__Group__112645);
+            pushFollow(FOLLOW_2);
             rule__SeverityRange__Group__2();
 
             state._fsp--;
@@ -18739,22 +18739,22 @@ public final void rule__SeverityRange__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__SeverityRange__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5900:1: rule__SeverityRange__Group__1__Impl : ( 'SeverityRange' ) ;
+    // InternalCheck.g:5900:1: rule__SeverityRange__Group__1__Impl : ( 'SeverityRange' ) ;
     public final void rule__SeverityRange__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5904:1: ( ( 'SeverityRange' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5905:1: ( 'SeverityRange' )
+            // InternalCheck.g:5904:1: ( ( 'SeverityRange' ) )
+            // InternalCheck.g:5905:1: ( 'SeverityRange' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5905:1: ( 'SeverityRange' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5906:1: 'SeverityRange'
+            // InternalCheck.g:5905:1: ( 'SeverityRange' )
+            // InternalCheck.g:5906:1: 'SeverityRange'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSeverityRangeAccess().getSeverityRangeKeyword_1()); 
             }
-            match(input,28,FOLLOW_28_in_rule__SeverityRange__Group__1__Impl12673); if (state.failed) return ;
+            match(input,28,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSeverityRangeAccess().getSeverityRangeKeyword_1()); 
             }
@@ -18780,21 +18780,21 @@ public final void rule__SeverityRange__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__SeverityRange__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5919:1: rule__SeverityRange__Group__2 : rule__SeverityRange__Group__2__Impl rule__SeverityRange__Group__3 ;
+    // InternalCheck.g:5919:1: rule__SeverityRange__Group__2 : rule__SeverityRange__Group__2__Impl rule__SeverityRange__Group__3 ;
     public final void rule__SeverityRange__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5923:1: ( rule__SeverityRange__Group__2__Impl rule__SeverityRange__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5924:2: rule__SeverityRange__Group__2__Impl rule__SeverityRange__Group__3
+            // InternalCheck.g:5923:1: ( rule__SeverityRange__Group__2__Impl rule__SeverityRange__Group__3 )
+            // InternalCheck.g:5924:2: rule__SeverityRange__Group__2__Impl rule__SeverityRange__Group__3
             {
-            pushFollow(FOLLOW_rule__SeverityRange__Group__2__Impl_in_rule__SeverityRange__Group__212704);
+            pushFollow(FOLLOW_17);
             rule__SeverityRange__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SeverityRange__Group__3_in_rule__SeverityRange__Group__212707);
+            pushFollow(FOLLOW_2);
             rule__SeverityRange__Group__3();
 
             state._fsp--;
@@ -18818,22 +18818,22 @@ public final void rule__SeverityRange__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__SeverityRange__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5931:1: rule__SeverityRange__Group__2__Impl : ( '(' ) ;
+    // InternalCheck.g:5931:1: rule__SeverityRange__Group__2__Impl : ( '(' ) ;
     public final void rule__SeverityRange__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5935:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5936:1: ( '(' )
+            // InternalCheck.g:5935:1: ( ( '(' ) )
+            // InternalCheck.g:5936:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5936:1: ( '(' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5937:1: '('
+            // InternalCheck.g:5936:1: ( '(' )
+            // InternalCheck.g:5937:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSeverityRangeAccess().getLeftParenthesisKeyword_2()); 
             }
-            match(input,72,FOLLOW_72_in_rule__SeverityRange__Group__2__Impl12735); if (state.failed) return ;
+            match(input,72,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSeverityRangeAccess().getLeftParenthesisKeyword_2()); 
             }
@@ -18859,21 +18859,21 @@ public final void rule__SeverityRange__Group__2__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__SeverityRange__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5950:1: rule__SeverityRange__Group__3 : rule__SeverityRange__Group__3__Impl rule__SeverityRange__Group__4 ;
+    // InternalCheck.g:5950:1: rule__SeverityRange__Group__3 : rule__SeverityRange__Group__3__Impl rule__SeverityRange__Group__4 ;
     public final void rule__SeverityRange__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5954:1: ( rule__SeverityRange__Group__3__Impl rule__SeverityRange__Group__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5955:2: rule__SeverityRange__Group__3__Impl rule__SeverityRange__Group__4
+            // InternalCheck.g:5954:1: ( rule__SeverityRange__Group__3__Impl rule__SeverityRange__Group__4 )
+            // InternalCheck.g:5955:2: rule__SeverityRange__Group__3__Impl rule__SeverityRange__Group__4
             {
-            pushFollow(FOLLOW_rule__SeverityRange__Group__3__Impl_in_rule__SeverityRange__Group__312766);
+            pushFollow(FOLLOW_27);
             rule__SeverityRange__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SeverityRange__Group__4_in_rule__SeverityRange__Group__312769);
+            pushFollow(FOLLOW_2);
             rule__SeverityRange__Group__4();
 
             state._fsp--;
@@ -18897,25 +18897,25 @@ public final void rule__SeverityRange__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__SeverityRange__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5962:1: rule__SeverityRange__Group__3__Impl : ( ( rule__SeverityRange__MinSeverityAssignment_3 ) ) ;
+    // InternalCheck.g:5962:1: rule__SeverityRange__Group__3__Impl : ( ( rule__SeverityRange__MinSeverityAssignment_3 ) ) ;
     public final void rule__SeverityRange__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5966:1: ( ( ( rule__SeverityRange__MinSeverityAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5967:1: ( ( rule__SeverityRange__MinSeverityAssignment_3 ) )
+            // InternalCheck.g:5966:1: ( ( ( rule__SeverityRange__MinSeverityAssignment_3 ) ) )
+            // InternalCheck.g:5967:1: ( ( rule__SeverityRange__MinSeverityAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5967:1: ( ( rule__SeverityRange__MinSeverityAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5968:1: ( rule__SeverityRange__MinSeverityAssignment_3 )
+            // InternalCheck.g:5967:1: ( ( rule__SeverityRange__MinSeverityAssignment_3 ) )
+            // InternalCheck.g:5968:1: ( rule__SeverityRange__MinSeverityAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSeverityRangeAccess().getMinSeverityAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5969:1: ( rule__SeverityRange__MinSeverityAssignment_3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5969:2: rule__SeverityRange__MinSeverityAssignment_3
+            // InternalCheck.g:5969:1: ( rule__SeverityRange__MinSeverityAssignment_3 )
+            // InternalCheck.g:5969:2: rule__SeverityRange__MinSeverityAssignment_3
             {
-            pushFollow(FOLLOW_rule__SeverityRange__MinSeverityAssignment_3_in_rule__SeverityRange__Group__3__Impl12796);
+            pushFollow(FOLLOW_2);
             rule__SeverityRange__MinSeverityAssignment_3();
 
             state._fsp--;
@@ -18948,21 +18948,21 @@ public final void rule__SeverityRange__Group__3__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__SeverityRange__Group__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5979:1: rule__SeverityRange__Group__4 : rule__SeverityRange__Group__4__Impl rule__SeverityRange__Group__5 ;
+    // InternalCheck.g:5979:1: rule__SeverityRange__Group__4 : rule__SeverityRange__Group__4__Impl rule__SeverityRange__Group__5 ;
     public final void rule__SeverityRange__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5983:1: ( rule__SeverityRange__Group__4__Impl rule__SeverityRange__Group__5 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5984:2: rule__SeverityRange__Group__4__Impl rule__SeverityRange__Group__5
+            // InternalCheck.g:5983:1: ( rule__SeverityRange__Group__4__Impl rule__SeverityRange__Group__5 )
+            // InternalCheck.g:5984:2: rule__SeverityRange__Group__4__Impl rule__SeverityRange__Group__5
             {
-            pushFollow(FOLLOW_rule__SeverityRange__Group__4__Impl_in_rule__SeverityRange__Group__412826);
+            pushFollow(FOLLOW_17);
             rule__SeverityRange__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SeverityRange__Group__5_in_rule__SeverityRange__Group__412829);
+            pushFollow(FOLLOW_2);
             rule__SeverityRange__Group__5();
 
             state._fsp--;
@@ -18986,22 +18986,22 @@ public final void rule__SeverityRange__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__SeverityRange__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5991:1: rule__SeverityRange__Group__4__Impl : ( '..' ) ;
+    // InternalCheck.g:5991:1: rule__SeverityRange__Group__4__Impl : ( '..' ) ;
     public final void rule__SeverityRange__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5995:1: ( ( '..' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5996:1: ( '..' )
+            // InternalCheck.g:5995:1: ( ( '..' ) )
+            // InternalCheck.g:5996:1: ( '..' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5996:1: ( '..' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5997:1: '..'
+            // InternalCheck.g:5996:1: ( '..' )
+            // InternalCheck.g:5997:1: '..'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSeverityRangeAccess().getFullStopFullStopKeyword_4()); 
             }
-            match(input,50,FOLLOW_50_in_rule__SeverityRange__Group__4__Impl12857); if (state.failed) return ;
+            match(input,50,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSeverityRangeAccess().getFullStopFullStopKeyword_4()); 
             }
@@ -19027,21 +19027,21 @@ public final void rule__SeverityRange__Group__4__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__SeverityRange__Group__5"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6010:1: rule__SeverityRange__Group__5 : rule__SeverityRange__Group__5__Impl rule__SeverityRange__Group__6 ;
+    // InternalCheck.g:6010:1: rule__SeverityRange__Group__5 : rule__SeverityRange__Group__5__Impl rule__SeverityRange__Group__6 ;
     public final void rule__SeverityRange__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6014:1: ( rule__SeverityRange__Group__5__Impl rule__SeverityRange__Group__6 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6015:2: rule__SeverityRange__Group__5__Impl rule__SeverityRange__Group__6
+            // InternalCheck.g:6014:1: ( rule__SeverityRange__Group__5__Impl rule__SeverityRange__Group__6 )
+            // InternalCheck.g:6015:2: rule__SeverityRange__Group__5__Impl rule__SeverityRange__Group__6
             {
-            pushFollow(FOLLOW_rule__SeverityRange__Group__5__Impl_in_rule__SeverityRange__Group__512888);
+            pushFollow(FOLLOW_28);
             rule__SeverityRange__Group__5__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SeverityRange__Group__6_in_rule__SeverityRange__Group__512891);
+            pushFollow(FOLLOW_2);
             rule__SeverityRange__Group__6();
 
             state._fsp--;
@@ -19065,25 +19065,25 @@ public final void rule__SeverityRange__Group__5() throws RecognitionException {
 
 
     // $ANTLR start "rule__SeverityRange__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6022:1: rule__SeverityRange__Group__5__Impl : ( ( rule__SeverityRange__MaxSeverityAssignment_5 ) ) ;
+    // InternalCheck.g:6022:1: rule__SeverityRange__Group__5__Impl : ( ( rule__SeverityRange__MaxSeverityAssignment_5 ) ) ;
     public final void rule__SeverityRange__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6026:1: ( ( ( rule__SeverityRange__MaxSeverityAssignment_5 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6027:1: ( ( rule__SeverityRange__MaxSeverityAssignment_5 ) )
+            // InternalCheck.g:6026:1: ( ( ( rule__SeverityRange__MaxSeverityAssignment_5 ) ) )
+            // InternalCheck.g:6027:1: ( ( rule__SeverityRange__MaxSeverityAssignment_5 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6027:1: ( ( rule__SeverityRange__MaxSeverityAssignment_5 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6028:1: ( rule__SeverityRange__MaxSeverityAssignment_5 )
+            // InternalCheck.g:6027:1: ( ( rule__SeverityRange__MaxSeverityAssignment_5 ) )
+            // InternalCheck.g:6028:1: ( rule__SeverityRange__MaxSeverityAssignment_5 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSeverityRangeAccess().getMaxSeverityAssignment_5()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6029:1: ( rule__SeverityRange__MaxSeverityAssignment_5 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6029:2: rule__SeverityRange__MaxSeverityAssignment_5
+            // InternalCheck.g:6029:1: ( rule__SeverityRange__MaxSeverityAssignment_5 )
+            // InternalCheck.g:6029:2: rule__SeverityRange__MaxSeverityAssignment_5
             {
-            pushFollow(FOLLOW_rule__SeverityRange__MaxSeverityAssignment_5_in_rule__SeverityRange__Group__5__Impl12918);
+            pushFollow(FOLLOW_2);
             rule__SeverityRange__MaxSeverityAssignment_5();
 
             state._fsp--;
@@ -19116,16 +19116,16 @@ public final void rule__SeverityRange__Group__5__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__SeverityRange__Group__6"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6039:1: rule__SeverityRange__Group__6 : rule__SeverityRange__Group__6__Impl ;
+    // InternalCheck.g:6039:1: rule__SeverityRange__Group__6 : rule__SeverityRange__Group__6__Impl ;
     public final void rule__SeverityRange__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6043:1: ( rule__SeverityRange__Group__6__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6044:2: rule__SeverityRange__Group__6__Impl
+            // InternalCheck.g:6043:1: ( rule__SeverityRange__Group__6__Impl )
+            // InternalCheck.g:6044:2: rule__SeverityRange__Group__6__Impl
             {
-            pushFollow(FOLLOW_rule__SeverityRange__Group__6__Impl_in_rule__SeverityRange__Group__612948);
+            pushFollow(FOLLOW_2);
             rule__SeverityRange__Group__6__Impl();
 
             state._fsp--;
@@ -19149,22 +19149,22 @@ public final void rule__SeverityRange__Group__6() throws RecognitionException {
 
 
     // $ANTLR start "rule__SeverityRange__Group__6__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6050:1: rule__SeverityRange__Group__6__Impl : ( ')' ) ;
+    // InternalCheck.g:6050:1: rule__SeverityRange__Group__6__Impl : ( ')' ) ;
     public final void rule__SeverityRange__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6054:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6055:1: ( ')' )
+            // InternalCheck.g:6054:1: ( ( ')' ) )
+            // InternalCheck.g:6055:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6055:1: ( ')' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6056:1: ')'
+            // InternalCheck.g:6055:1: ( ')' )
+            // InternalCheck.g:6056:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSeverityRangeAccess().getRightParenthesisKeyword_6()); 
             }
-            match(input,73,FOLLOW_73_in_rule__SeverityRange__Group__6__Impl12976); if (state.failed) return ;
+            match(input,73,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSeverityRangeAccess().getRightParenthesisKeyword_6()); 
             }
@@ -19190,21 +19190,21 @@ public final void rule__SeverityRange__Group__6__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__Member__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6083:1: rule__Member__Group__0 : rule__Member__Group__0__Impl rule__Member__Group__1 ;
+    // InternalCheck.g:6083:1: rule__Member__Group__0 : rule__Member__Group__0__Impl rule__Member__Group__1 ;
     public final void rule__Member__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6087:1: ( rule__Member__Group__0__Impl rule__Member__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6088:2: rule__Member__Group__0__Impl rule__Member__Group__1
+            // InternalCheck.g:6087:1: ( rule__Member__Group__0__Impl rule__Member__Group__1 )
+            // InternalCheck.g:6088:2: rule__Member__Group__0__Impl rule__Member__Group__1
             {
-            pushFollow(FOLLOW_rule__Member__Group__0__Impl_in_rule__Member__Group__013021);
+            pushFollow(FOLLOW_29);
             rule__Member__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Member__Group__1_in_rule__Member__Group__013024);
+            pushFollow(FOLLOW_2);
             rule__Member__Group__1();
 
             state._fsp--;
@@ -19228,22 +19228,22 @@ public final void rule__Member__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Member__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6095:1: rule__Member__Group__0__Impl : ( ( rule__Member__AnnotationsAssignment_0 )* ) ;
+    // InternalCheck.g:6095:1: rule__Member__Group__0__Impl : ( ( rule__Member__AnnotationsAssignment_0 )* ) ;
     public final void rule__Member__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6099:1: ( ( ( rule__Member__AnnotationsAssignment_0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6100:1: ( ( rule__Member__AnnotationsAssignment_0 )* )
+            // InternalCheck.g:6099:1: ( ( ( rule__Member__AnnotationsAssignment_0 )* ) )
+            // InternalCheck.g:6100:1: ( ( rule__Member__AnnotationsAssignment_0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6100:1: ( ( rule__Member__AnnotationsAssignment_0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6101:1: ( rule__Member__AnnotationsAssignment_0 )*
+            // InternalCheck.g:6100:1: ( ( rule__Member__AnnotationsAssignment_0 )* )
+            // InternalCheck.g:6101:1: ( rule__Member__AnnotationsAssignment_0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMemberAccess().getAnnotationsAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6102:1: ( rule__Member__AnnotationsAssignment_0 )*
+            // InternalCheck.g:6102:1: ( rule__Member__AnnotationsAssignment_0 )*
             loop68:
             do {
                 int alt68=2;
@@ -19256,9 +19256,9 @@ public final void rule__Member__Group__0__Impl() throws RecognitionException {
 
                 switch (alt68) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6102:2: rule__Member__AnnotationsAssignment_0
+            	    // InternalCheck.g:6102:2: rule__Member__AnnotationsAssignment_0
             	    {
-            	    pushFollow(FOLLOW_rule__Member__AnnotationsAssignment_0_in_rule__Member__Group__0__Impl13051);
+            	    pushFollow(FOLLOW_30);
             	    rule__Member__AnnotationsAssignment_0();
 
             	    state._fsp--;
@@ -19297,21 +19297,21 @@ public final void rule__Member__Group__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Member__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6112:1: rule__Member__Group__1 : rule__Member__Group__1__Impl rule__Member__Group__2 ;
+    // InternalCheck.g:6112:1: rule__Member__Group__1 : rule__Member__Group__1__Impl rule__Member__Group__2 ;
     public final void rule__Member__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6116:1: ( rule__Member__Group__1__Impl rule__Member__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6117:2: rule__Member__Group__1__Impl rule__Member__Group__2
+            // InternalCheck.g:6116:1: ( rule__Member__Group__1__Impl rule__Member__Group__2 )
+            // InternalCheck.g:6117:2: rule__Member__Group__1__Impl rule__Member__Group__2
             {
-            pushFollow(FOLLOW_rule__Member__Group__1__Impl_in_rule__Member__Group__113082);
+            pushFollow(FOLLOW_4);
             rule__Member__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Member__Group__2_in_rule__Member__Group__113085);
+            pushFollow(FOLLOW_2);
             rule__Member__Group__2();
 
             state._fsp--;
@@ -19335,25 +19335,25 @@ public final void rule__Member__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Member__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6124:1: rule__Member__Group__1__Impl : ( ( rule__Member__TypeAssignment_1 ) ) ;
+    // InternalCheck.g:6124:1: rule__Member__Group__1__Impl : ( ( rule__Member__TypeAssignment_1 ) ) ;
     public final void rule__Member__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6128:1: ( ( ( rule__Member__TypeAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6129:1: ( ( rule__Member__TypeAssignment_1 ) )
+            // InternalCheck.g:6128:1: ( ( ( rule__Member__TypeAssignment_1 ) ) )
+            // InternalCheck.g:6129:1: ( ( rule__Member__TypeAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6129:1: ( ( rule__Member__TypeAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6130:1: ( rule__Member__TypeAssignment_1 )
+            // InternalCheck.g:6129:1: ( ( rule__Member__TypeAssignment_1 ) )
+            // InternalCheck.g:6130:1: ( rule__Member__TypeAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMemberAccess().getTypeAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6131:1: ( rule__Member__TypeAssignment_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6131:2: rule__Member__TypeAssignment_1
+            // InternalCheck.g:6131:1: ( rule__Member__TypeAssignment_1 )
+            // InternalCheck.g:6131:2: rule__Member__TypeAssignment_1
             {
-            pushFollow(FOLLOW_rule__Member__TypeAssignment_1_in_rule__Member__Group__1__Impl13112);
+            pushFollow(FOLLOW_2);
             rule__Member__TypeAssignment_1();
 
             state._fsp--;
@@ -19386,21 +19386,21 @@ public final void rule__Member__Group__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Member__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6141:1: rule__Member__Group__2 : rule__Member__Group__2__Impl rule__Member__Group__3 ;
+    // InternalCheck.g:6141:1: rule__Member__Group__2 : rule__Member__Group__2__Impl rule__Member__Group__3 ;
     public final void rule__Member__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6145:1: ( rule__Member__Group__2__Impl rule__Member__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6146:2: rule__Member__Group__2__Impl rule__Member__Group__3
+            // InternalCheck.g:6145:1: ( rule__Member__Group__2__Impl rule__Member__Group__3 )
+            // InternalCheck.g:6146:2: rule__Member__Group__2__Impl rule__Member__Group__3
             {
-            pushFollow(FOLLOW_rule__Member__Group__2__Impl_in_rule__Member__Group__213142);
+            pushFollow(FOLLOW_31);
             rule__Member__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Member__Group__3_in_rule__Member__Group__213145);
+            pushFollow(FOLLOW_2);
             rule__Member__Group__3();
 
             state._fsp--;
@@ -19424,25 +19424,25 @@ public final void rule__Member__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__Member__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6153:1: rule__Member__Group__2__Impl : ( ( rule__Member__NameAssignment_2 ) ) ;
+    // InternalCheck.g:6153:1: rule__Member__Group__2__Impl : ( ( rule__Member__NameAssignment_2 ) ) ;
     public final void rule__Member__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6157:1: ( ( ( rule__Member__NameAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6158:1: ( ( rule__Member__NameAssignment_2 ) )
+            // InternalCheck.g:6157:1: ( ( ( rule__Member__NameAssignment_2 ) ) )
+            // InternalCheck.g:6158:1: ( ( rule__Member__NameAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6158:1: ( ( rule__Member__NameAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6159:1: ( rule__Member__NameAssignment_2 )
+            // InternalCheck.g:6158:1: ( ( rule__Member__NameAssignment_2 ) )
+            // InternalCheck.g:6159:1: ( rule__Member__NameAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMemberAccess().getNameAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6160:1: ( rule__Member__NameAssignment_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6160:2: rule__Member__NameAssignment_2
+            // InternalCheck.g:6160:1: ( rule__Member__NameAssignment_2 )
+            // InternalCheck.g:6160:2: rule__Member__NameAssignment_2
             {
-            pushFollow(FOLLOW_rule__Member__NameAssignment_2_in_rule__Member__Group__2__Impl13172);
+            pushFollow(FOLLOW_2);
             rule__Member__NameAssignment_2();
 
             state._fsp--;
@@ -19475,21 +19475,21 @@ public final void rule__Member__Group__2__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Member__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6170:1: rule__Member__Group__3 : rule__Member__Group__3__Impl rule__Member__Group__4 ;
+    // InternalCheck.g:6170:1: rule__Member__Group__3 : rule__Member__Group__3__Impl rule__Member__Group__4 ;
     public final void rule__Member__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6174:1: ( rule__Member__Group__3__Impl rule__Member__Group__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6175:2: rule__Member__Group__3__Impl rule__Member__Group__4
+            // InternalCheck.g:6174:1: ( rule__Member__Group__3__Impl rule__Member__Group__4 )
+            // InternalCheck.g:6175:2: rule__Member__Group__3__Impl rule__Member__Group__4
             {
-            pushFollow(FOLLOW_rule__Member__Group__3__Impl_in_rule__Member__Group__313202);
+            pushFollow(FOLLOW_31);
             rule__Member__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Member__Group__4_in_rule__Member__Group__313205);
+            pushFollow(FOLLOW_2);
             rule__Member__Group__4();
 
             state._fsp--;
@@ -19513,22 +19513,22 @@ public final void rule__Member__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__Member__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6182:1: rule__Member__Group__3__Impl : ( ( rule__Member__Group_3__0 )? ) ;
+    // InternalCheck.g:6182:1: rule__Member__Group__3__Impl : ( ( rule__Member__Group_3__0 )? ) ;
     public final void rule__Member__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6186:1: ( ( ( rule__Member__Group_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6187:1: ( ( rule__Member__Group_3__0 )? )
+            // InternalCheck.g:6186:1: ( ( ( rule__Member__Group_3__0 )? ) )
+            // InternalCheck.g:6187:1: ( ( rule__Member__Group_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6187:1: ( ( rule__Member__Group_3__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6188:1: ( rule__Member__Group_3__0 )?
+            // InternalCheck.g:6187:1: ( ( rule__Member__Group_3__0 )? )
+            // InternalCheck.g:6188:1: ( rule__Member__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMemberAccess().getGroup_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6189:1: ( rule__Member__Group_3__0 )?
+            // InternalCheck.g:6189:1: ( rule__Member__Group_3__0 )?
             int alt69=2;
             int LA69_0 = input.LA(1);
 
@@ -19537,9 +19537,9 @@ public final void rule__Member__Group__3__Impl() throws RecognitionException {
             }
             switch (alt69) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6189:2: rule__Member__Group_3__0
+                    // InternalCheck.g:6189:2: rule__Member__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__Member__Group_3__0_in_rule__Member__Group__3__Impl13232);
+                    pushFollow(FOLLOW_2);
                     rule__Member__Group_3__0();
 
                     state._fsp--;
@@ -19575,16 +19575,16 @@ public final void rule__Member__Group__3__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Member__Group__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6199:1: rule__Member__Group__4 : rule__Member__Group__4__Impl ;
+    // InternalCheck.g:6199:1: rule__Member__Group__4 : rule__Member__Group__4__Impl ;
     public final void rule__Member__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6203:1: ( rule__Member__Group__4__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6204:2: rule__Member__Group__4__Impl
+            // InternalCheck.g:6203:1: ( rule__Member__Group__4__Impl )
+            // InternalCheck.g:6204:2: rule__Member__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__Member__Group__4__Impl_in_rule__Member__Group__413263);
+            pushFollow(FOLLOW_2);
             rule__Member__Group__4__Impl();
 
             state._fsp--;
@@ -19608,22 +19608,22 @@ public final void rule__Member__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__Member__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6210:1: rule__Member__Group__4__Impl : ( ';' ) ;
+    // InternalCheck.g:6210:1: rule__Member__Group__4__Impl : ( ';' ) ;
     public final void rule__Member__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6214:1: ( ( ';' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6215:1: ( ';' )
+            // InternalCheck.g:6214:1: ( ( ';' ) )
+            // InternalCheck.g:6215:1: ( ';' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6215:1: ( ';' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6216:1: ';'
+            // InternalCheck.g:6215:1: ( ';' )
+            // InternalCheck.g:6216:1: ';'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMemberAccess().getSemicolonKeyword_4()); 
             }
-            match(input,71,FOLLOW_71_in_rule__Member__Group__4__Impl13291); if (state.failed) return ;
+            match(input,71,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getMemberAccess().getSemicolonKeyword_4()); 
             }
@@ -19649,21 +19649,21 @@ public final void rule__Member__Group__4__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Member__Group_3__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6239:1: rule__Member__Group_3__0 : rule__Member__Group_3__0__Impl rule__Member__Group_3__1 ;
+    // InternalCheck.g:6239:1: rule__Member__Group_3__0 : rule__Member__Group_3__0__Impl rule__Member__Group_3__1 ;
     public final void rule__Member__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6243:1: ( rule__Member__Group_3__0__Impl rule__Member__Group_3__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6244:2: rule__Member__Group_3__0__Impl rule__Member__Group_3__1
+            // InternalCheck.g:6243:1: ( rule__Member__Group_3__0__Impl rule__Member__Group_3__1 )
+            // InternalCheck.g:6244:2: rule__Member__Group_3__0__Impl rule__Member__Group_3__1
             {
-            pushFollow(FOLLOW_rule__Member__Group_3__0__Impl_in_rule__Member__Group_3__013332);
+            pushFollow(FOLLOW_32);
             rule__Member__Group_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Member__Group_3__1_in_rule__Member__Group_3__013335);
+            pushFollow(FOLLOW_2);
             rule__Member__Group_3__1();
 
             state._fsp--;
@@ -19687,22 +19687,22 @@ public final void rule__Member__Group_3__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Member__Group_3__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6251:1: rule__Member__Group_3__0__Impl : ( ruleOpSingleAssign ) ;
+    // InternalCheck.g:6251:1: rule__Member__Group_3__0__Impl : ( ruleOpSingleAssign ) ;
     public final void rule__Member__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6255:1: ( ( ruleOpSingleAssign ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6256:1: ( ruleOpSingleAssign )
+            // InternalCheck.g:6255:1: ( ( ruleOpSingleAssign ) )
+            // InternalCheck.g:6256:1: ( ruleOpSingleAssign )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6256:1: ( ruleOpSingleAssign )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6257:1: ruleOpSingleAssign
+            // InternalCheck.g:6256:1: ( ruleOpSingleAssign )
+            // InternalCheck.g:6257:1: ruleOpSingleAssign
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMemberAccess().getOpSingleAssignParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleOpSingleAssign_in_rule__Member__Group_3__0__Impl13362);
+            pushFollow(FOLLOW_2);
             ruleOpSingleAssign();
 
             state._fsp--;
@@ -19732,16 +19732,16 @@ public final void rule__Member__Group_3__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Member__Group_3__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6268:1: rule__Member__Group_3__1 : rule__Member__Group_3__1__Impl ;
+    // InternalCheck.g:6268:1: rule__Member__Group_3__1 : rule__Member__Group_3__1__Impl ;
     public final void rule__Member__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6272:1: ( rule__Member__Group_3__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6273:2: rule__Member__Group_3__1__Impl
+            // InternalCheck.g:6272:1: ( rule__Member__Group_3__1__Impl )
+            // InternalCheck.g:6273:2: rule__Member__Group_3__1__Impl
             {
-            pushFollow(FOLLOW_rule__Member__Group_3__1__Impl_in_rule__Member__Group_3__113391);
+            pushFollow(FOLLOW_2);
             rule__Member__Group_3__1__Impl();
 
             state._fsp--;
@@ -19765,25 +19765,25 @@ public final void rule__Member__Group_3__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Member__Group_3__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6279:1: rule__Member__Group_3__1__Impl : ( ( rule__Member__ValueAssignment_3_1 ) ) ;
+    // InternalCheck.g:6279:1: rule__Member__Group_3__1__Impl : ( ( rule__Member__ValueAssignment_3_1 ) ) ;
     public final void rule__Member__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6283:1: ( ( ( rule__Member__ValueAssignment_3_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6284:1: ( ( rule__Member__ValueAssignment_3_1 ) )
+            // InternalCheck.g:6283:1: ( ( ( rule__Member__ValueAssignment_3_1 ) ) )
+            // InternalCheck.g:6284:1: ( ( rule__Member__ValueAssignment_3_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6284:1: ( ( rule__Member__ValueAssignment_3_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6285:1: ( rule__Member__ValueAssignment_3_1 )
+            // InternalCheck.g:6284:1: ( ( rule__Member__ValueAssignment_3_1 ) )
+            // InternalCheck.g:6285:1: ( rule__Member__ValueAssignment_3_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMemberAccess().getValueAssignment_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6286:1: ( rule__Member__ValueAssignment_3_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6286:2: rule__Member__ValueAssignment_3_1
+            // InternalCheck.g:6286:1: ( rule__Member__ValueAssignment_3_1 )
+            // InternalCheck.g:6286:2: rule__Member__ValueAssignment_3_1
             {
-            pushFollow(FOLLOW_rule__Member__ValueAssignment_3_1_in_rule__Member__Group_3__1__Impl13418);
+            pushFollow(FOLLOW_2);
             rule__Member__ValueAssignment_3_1();
 
             state._fsp--;
@@ -19816,21 +19816,21 @@ public final void rule__Member__Group_3__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Implementation__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6300:1: rule__Implementation__Group__0 : rule__Implementation__Group__0__Impl rule__Implementation__Group__1 ;
+    // InternalCheck.g:6300:1: rule__Implementation__Group__0 : rule__Implementation__Group__0__Impl rule__Implementation__Group__1 ;
     public final void rule__Implementation__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6304:1: ( rule__Implementation__Group__0__Impl rule__Implementation__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6305:2: rule__Implementation__Group__0__Impl rule__Implementation__Group__1
+            // InternalCheck.g:6304:1: ( rule__Implementation__Group__0__Impl rule__Implementation__Group__1 )
+            // InternalCheck.g:6305:2: rule__Implementation__Group__0__Impl rule__Implementation__Group__1
             {
-            pushFollow(FOLLOW_rule__Implementation__Group__0__Impl_in_rule__Implementation__Group__013452);
+            pushFollow(FOLLOW_4);
             rule__Implementation__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Implementation__Group__1_in_rule__Implementation__Group__013455);
+            pushFollow(FOLLOW_2);
             rule__Implementation__Group__1();
 
             state._fsp--;
@@ -19854,22 +19854,22 @@ public final void rule__Implementation__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Implementation__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6312:1: rule__Implementation__Group__0__Impl : ( 'def' ) ;
+    // InternalCheck.g:6312:1: rule__Implementation__Group__0__Impl : ( 'def' ) ;
     public final void rule__Implementation__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6316:1: ( ( 'def' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6317:1: ( 'def' )
+            // InternalCheck.g:6316:1: ( ( 'def' ) )
+            // InternalCheck.g:6317:1: ( 'def' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6317:1: ( 'def' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6318:1: 'def'
+            // InternalCheck.g:6317:1: ( 'def' )
+            // InternalCheck.g:6318:1: 'def'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImplementationAccess().getDefKeyword_0()); 
             }
-            match(input,76,FOLLOW_76_in_rule__Implementation__Group__0__Impl13483); if (state.failed) return ;
+            match(input,76,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getImplementationAccess().getDefKeyword_0()); 
             }
@@ -19895,21 +19895,21 @@ public final void rule__Implementation__Group__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__Implementation__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6331:1: rule__Implementation__Group__1 : rule__Implementation__Group__1__Impl rule__Implementation__Group__2 ;
+    // InternalCheck.g:6331:1: rule__Implementation__Group__1 : rule__Implementation__Group__1__Impl rule__Implementation__Group__2 ;
     public final void rule__Implementation__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6335:1: ( rule__Implementation__Group__1__Impl rule__Implementation__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6336:2: rule__Implementation__Group__1__Impl rule__Implementation__Group__2
+            // InternalCheck.g:6335:1: ( rule__Implementation__Group__1__Impl rule__Implementation__Group__2 )
+            // InternalCheck.g:6336:2: rule__Implementation__Group__1__Impl rule__Implementation__Group__2
             {
-            pushFollow(FOLLOW_rule__Implementation__Group__1__Impl_in_rule__Implementation__Group__113514);
+            pushFollow(FOLLOW_33);
             rule__Implementation__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Implementation__Group__2_in_rule__Implementation__Group__113517);
+            pushFollow(FOLLOW_2);
             rule__Implementation__Group__2();
 
             state._fsp--;
@@ -19933,25 +19933,25 @@ public final void rule__Implementation__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Implementation__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6343:1: rule__Implementation__Group__1__Impl : ( ( rule__Implementation__NameAssignment_1 ) ) ;
+    // InternalCheck.g:6343:1: rule__Implementation__Group__1__Impl : ( ( rule__Implementation__NameAssignment_1 ) ) ;
     public final void rule__Implementation__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6347:1: ( ( ( rule__Implementation__NameAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6348:1: ( ( rule__Implementation__NameAssignment_1 ) )
+            // InternalCheck.g:6347:1: ( ( ( rule__Implementation__NameAssignment_1 ) ) )
+            // InternalCheck.g:6348:1: ( ( rule__Implementation__NameAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6348:1: ( ( rule__Implementation__NameAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6349:1: ( rule__Implementation__NameAssignment_1 )
+            // InternalCheck.g:6348:1: ( ( rule__Implementation__NameAssignment_1 ) )
+            // InternalCheck.g:6349:1: ( rule__Implementation__NameAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImplementationAccess().getNameAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6350:1: ( rule__Implementation__NameAssignment_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6350:2: rule__Implementation__NameAssignment_1
+            // InternalCheck.g:6350:1: ( rule__Implementation__NameAssignment_1 )
+            // InternalCheck.g:6350:2: rule__Implementation__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__Implementation__NameAssignment_1_in_rule__Implementation__Group__1__Impl13544);
+            pushFollow(FOLLOW_2);
             rule__Implementation__NameAssignment_1();
 
             state._fsp--;
@@ -19984,16 +19984,16 @@ public final void rule__Implementation__Group__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__Implementation__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6360:1: rule__Implementation__Group__2 : rule__Implementation__Group__2__Impl ;
+    // InternalCheck.g:6360:1: rule__Implementation__Group__2 : rule__Implementation__Group__2__Impl ;
     public final void rule__Implementation__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6364:1: ( rule__Implementation__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6365:2: rule__Implementation__Group__2__Impl
+            // InternalCheck.g:6364:1: ( rule__Implementation__Group__2__Impl )
+            // InternalCheck.g:6365:2: rule__Implementation__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__Implementation__Group__2__Impl_in_rule__Implementation__Group__213574);
+            pushFollow(FOLLOW_2);
             rule__Implementation__Group__2__Impl();
 
             state._fsp--;
@@ -20017,25 +20017,25 @@ public final void rule__Implementation__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__Implementation__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6371:1: rule__Implementation__Group__2__Impl : ( ( rule__Implementation__ContextAssignment_2 ) ) ;
+    // InternalCheck.g:6371:1: rule__Implementation__Group__2__Impl : ( ( rule__Implementation__ContextAssignment_2 ) ) ;
     public final void rule__Implementation__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6375:1: ( ( ( rule__Implementation__ContextAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6376:1: ( ( rule__Implementation__ContextAssignment_2 ) )
+            // InternalCheck.g:6375:1: ( ( ( rule__Implementation__ContextAssignment_2 ) ) )
+            // InternalCheck.g:6376:1: ( ( rule__Implementation__ContextAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6376:1: ( ( rule__Implementation__ContextAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6377:1: ( rule__Implementation__ContextAssignment_2 )
+            // InternalCheck.g:6376:1: ( ( rule__Implementation__ContextAssignment_2 ) )
+            // InternalCheck.g:6377:1: ( rule__Implementation__ContextAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImplementationAccess().getContextAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6378:1: ( rule__Implementation__ContextAssignment_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6378:2: rule__Implementation__ContextAssignment_2
+            // InternalCheck.g:6378:1: ( rule__Implementation__ContextAssignment_2 )
+            // InternalCheck.g:6378:2: rule__Implementation__ContextAssignment_2
             {
-            pushFollow(FOLLOW_rule__Implementation__ContextAssignment_2_in_rule__Implementation__Group__2__Impl13601);
+            pushFollow(FOLLOW_2);
             rule__Implementation__ContextAssignment_2();
 
             state._fsp--;
@@ -20068,21 +20068,21 @@ public final void rule__Implementation__Group__2__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__FormalParameter__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6394:1: rule__FormalParameter__Group__0 : rule__FormalParameter__Group__0__Impl rule__FormalParameter__Group__1 ;
+    // InternalCheck.g:6394:1: rule__FormalParameter__Group__0 : rule__FormalParameter__Group__0__Impl rule__FormalParameter__Group__1 ;
     public final void rule__FormalParameter__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6398:1: ( rule__FormalParameter__Group__0__Impl rule__FormalParameter__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6399:2: rule__FormalParameter__Group__0__Impl rule__FormalParameter__Group__1
+            // InternalCheck.g:6398:1: ( rule__FormalParameter__Group__0__Impl rule__FormalParameter__Group__1 )
+            // InternalCheck.g:6399:2: rule__FormalParameter__Group__0__Impl rule__FormalParameter__Group__1
             {
-            pushFollow(FOLLOW_rule__FormalParameter__Group__0__Impl_in_rule__FormalParameter__Group__013637);
+            pushFollow(FOLLOW_4);
             rule__FormalParameter__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__FormalParameter__Group__1_in_rule__FormalParameter__Group__013640);
+            pushFollow(FOLLOW_2);
             rule__FormalParameter__Group__1();
 
             state._fsp--;
@@ -20106,25 +20106,25 @@ public final void rule__FormalParameter__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__FormalParameter__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6406:1: rule__FormalParameter__Group__0__Impl : ( ( rule__FormalParameter__TypeAssignment_0 ) ) ;
+    // InternalCheck.g:6406:1: rule__FormalParameter__Group__0__Impl : ( ( rule__FormalParameter__TypeAssignment_0 ) ) ;
     public final void rule__FormalParameter__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6410:1: ( ( ( rule__FormalParameter__TypeAssignment_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6411:1: ( ( rule__FormalParameter__TypeAssignment_0 ) )
+            // InternalCheck.g:6410:1: ( ( ( rule__FormalParameter__TypeAssignment_0 ) ) )
+            // InternalCheck.g:6411:1: ( ( rule__FormalParameter__TypeAssignment_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6411:1: ( ( rule__FormalParameter__TypeAssignment_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6412:1: ( rule__FormalParameter__TypeAssignment_0 )
+            // InternalCheck.g:6411:1: ( ( rule__FormalParameter__TypeAssignment_0 ) )
+            // InternalCheck.g:6412:1: ( rule__FormalParameter__TypeAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormalParameterAccess().getTypeAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6413:1: ( rule__FormalParameter__TypeAssignment_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6413:2: rule__FormalParameter__TypeAssignment_0
+            // InternalCheck.g:6413:1: ( rule__FormalParameter__TypeAssignment_0 )
+            // InternalCheck.g:6413:2: rule__FormalParameter__TypeAssignment_0
             {
-            pushFollow(FOLLOW_rule__FormalParameter__TypeAssignment_0_in_rule__FormalParameter__Group__0__Impl13667);
+            pushFollow(FOLLOW_2);
             rule__FormalParameter__TypeAssignment_0();
 
             state._fsp--;
@@ -20157,21 +20157,21 @@ public final void rule__FormalParameter__Group__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__FormalParameter__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6423:1: rule__FormalParameter__Group__1 : rule__FormalParameter__Group__1__Impl rule__FormalParameter__Group__2 ;
+    // InternalCheck.g:6423:1: rule__FormalParameter__Group__1 : rule__FormalParameter__Group__1__Impl rule__FormalParameter__Group__2 ;
     public final void rule__FormalParameter__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6427:1: ( rule__FormalParameter__Group__1__Impl rule__FormalParameter__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6428:2: rule__FormalParameter__Group__1__Impl rule__FormalParameter__Group__2
+            // InternalCheck.g:6427:1: ( rule__FormalParameter__Group__1__Impl rule__FormalParameter__Group__2 )
+            // InternalCheck.g:6428:2: rule__FormalParameter__Group__1__Impl rule__FormalParameter__Group__2
             {
-            pushFollow(FOLLOW_rule__FormalParameter__Group__1__Impl_in_rule__FormalParameter__Group__113697);
+            pushFollow(FOLLOW_34);
             rule__FormalParameter__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__FormalParameter__Group__2_in_rule__FormalParameter__Group__113700);
+            pushFollow(FOLLOW_2);
             rule__FormalParameter__Group__2();
 
             state._fsp--;
@@ -20195,25 +20195,25 @@ public final void rule__FormalParameter__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__FormalParameter__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6435:1: rule__FormalParameter__Group__1__Impl : ( ( rule__FormalParameter__NameAssignment_1 ) ) ;
+    // InternalCheck.g:6435:1: rule__FormalParameter__Group__1__Impl : ( ( rule__FormalParameter__NameAssignment_1 ) ) ;
     public final void rule__FormalParameter__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6439:1: ( ( ( rule__FormalParameter__NameAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6440:1: ( ( rule__FormalParameter__NameAssignment_1 ) )
+            // InternalCheck.g:6439:1: ( ( ( rule__FormalParameter__NameAssignment_1 ) ) )
+            // InternalCheck.g:6440:1: ( ( rule__FormalParameter__NameAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6440:1: ( ( rule__FormalParameter__NameAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6441:1: ( rule__FormalParameter__NameAssignment_1 )
+            // InternalCheck.g:6440:1: ( ( rule__FormalParameter__NameAssignment_1 ) )
+            // InternalCheck.g:6441:1: ( rule__FormalParameter__NameAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormalParameterAccess().getNameAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6442:1: ( rule__FormalParameter__NameAssignment_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6442:2: rule__FormalParameter__NameAssignment_1
+            // InternalCheck.g:6442:1: ( rule__FormalParameter__NameAssignment_1 )
+            // InternalCheck.g:6442:2: rule__FormalParameter__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__FormalParameter__NameAssignment_1_in_rule__FormalParameter__Group__1__Impl13727);
+            pushFollow(FOLLOW_2);
             rule__FormalParameter__NameAssignment_1();
 
             state._fsp--;
@@ -20246,21 +20246,21 @@ public final void rule__FormalParameter__Group__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__FormalParameter__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6452:1: rule__FormalParameter__Group__2 : rule__FormalParameter__Group__2__Impl rule__FormalParameter__Group__3 ;
+    // InternalCheck.g:6452:1: rule__FormalParameter__Group__2 : rule__FormalParameter__Group__2__Impl rule__FormalParameter__Group__3 ;
     public final void rule__FormalParameter__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6456:1: ( rule__FormalParameter__Group__2__Impl rule__FormalParameter__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6457:2: rule__FormalParameter__Group__2__Impl rule__FormalParameter__Group__3
+            // InternalCheck.g:6456:1: ( rule__FormalParameter__Group__2__Impl rule__FormalParameter__Group__3 )
+            // InternalCheck.g:6457:2: rule__FormalParameter__Group__2__Impl rule__FormalParameter__Group__3
             {
-            pushFollow(FOLLOW_rule__FormalParameter__Group__2__Impl_in_rule__FormalParameter__Group__213757);
+            pushFollow(FOLLOW_35);
             rule__FormalParameter__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__FormalParameter__Group__3_in_rule__FormalParameter__Group__213760);
+            pushFollow(FOLLOW_2);
             rule__FormalParameter__Group__3();
 
             state._fsp--;
@@ -20284,22 +20284,22 @@ public final void rule__FormalParameter__Group__2() throws RecognitionException
 
 
     // $ANTLR start "rule__FormalParameter__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6464:1: rule__FormalParameter__Group__2__Impl : ( '=' ) ;
+    // InternalCheck.g:6464:1: rule__FormalParameter__Group__2__Impl : ( '=' ) ;
     public final void rule__FormalParameter__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6468:1: ( ( '=' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6469:1: ( '=' )
+            // InternalCheck.g:6468:1: ( ( '=' ) )
+            // InternalCheck.g:6469:1: ( '=' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6469:1: ( '=' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6470:1: '='
+            // InternalCheck.g:6469:1: ( '=' )
+            // InternalCheck.g:6470:1: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormalParameterAccess().getEqualsSignKeyword_2()); 
             }
-            match(input,13,FOLLOW_13_in_rule__FormalParameter__Group__2__Impl13788); if (state.failed) return ;
+            match(input,13,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getFormalParameterAccess().getEqualsSignKeyword_2()); 
             }
@@ -20325,21 +20325,21 @@ public final void rule__FormalParameter__Group__2__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__FormalParameter__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6483:1: rule__FormalParameter__Group__3 : rule__FormalParameter__Group__3__Impl rule__FormalParameter__Group__4 ;
+    // InternalCheck.g:6483:1: rule__FormalParameter__Group__3 : rule__FormalParameter__Group__3__Impl rule__FormalParameter__Group__4 ;
     public final void rule__FormalParameter__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6487:1: ( rule__FormalParameter__Group__3__Impl rule__FormalParameter__Group__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6488:2: rule__FormalParameter__Group__3__Impl rule__FormalParameter__Group__4
+            // InternalCheck.g:6487:1: ( rule__FormalParameter__Group__3__Impl rule__FormalParameter__Group__4 )
+            // InternalCheck.g:6488:2: rule__FormalParameter__Group__3__Impl rule__FormalParameter__Group__4
             {
-            pushFollow(FOLLOW_rule__FormalParameter__Group__3__Impl_in_rule__FormalParameter__Group__313819);
+            pushFollow(FOLLOW_22);
             rule__FormalParameter__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__FormalParameter__Group__4_in_rule__FormalParameter__Group__313822);
+            pushFollow(FOLLOW_2);
             rule__FormalParameter__Group__4();
 
             state._fsp--;
@@ -20363,25 +20363,25 @@ public final void rule__FormalParameter__Group__3() throws RecognitionException
 
 
     // $ANTLR start "rule__FormalParameter__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6495:1: rule__FormalParameter__Group__3__Impl : ( ( rule__FormalParameter__RightAssignment_3 ) ) ;
+    // InternalCheck.g:6495:1: rule__FormalParameter__Group__3__Impl : ( ( rule__FormalParameter__RightAssignment_3 ) ) ;
     public final void rule__FormalParameter__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6499:1: ( ( ( rule__FormalParameter__RightAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6500:1: ( ( rule__FormalParameter__RightAssignment_3 ) )
+            // InternalCheck.g:6499:1: ( ( ( rule__FormalParameter__RightAssignment_3 ) ) )
+            // InternalCheck.g:6500:1: ( ( rule__FormalParameter__RightAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6500:1: ( ( rule__FormalParameter__RightAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6501:1: ( rule__FormalParameter__RightAssignment_3 )
+            // InternalCheck.g:6500:1: ( ( rule__FormalParameter__RightAssignment_3 ) )
+            // InternalCheck.g:6501:1: ( rule__FormalParameter__RightAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormalParameterAccess().getRightAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6502:1: ( rule__FormalParameter__RightAssignment_3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6502:2: rule__FormalParameter__RightAssignment_3
+            // InternalCheck.g:6502:1: ( rule__FormalParameter__RightAssignment_3 )
+            // InternalCheck.g:6502:2: rule__FormalParameter__RightAssignment_3
             {
-            pushFollow(FOLLOW_rule__FormalParameter__RightAssignment_3_in_rule__FormalParameter__Group__3__Impl13849);
+            pushFollow(FOLLOW_2);
             rule__FormalParameter__RightAssignment_3();
 
             state._fsp--;
@@ -20414,16 +20414,16 @@ public final void rule__FormalParameter__Group__3__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__FormalParameter__Group__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6512:1: rule__FormalParameter__Group__4 : rule__FormalParameter__Group__4__Impl ;
+    // InternalCheck.g:6512:1: rule__FormalParameter__Group__4 : rule__FormalParameter__Group__4__Impl ;
     public final void rule__FormalParameter__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6516:1: ( rule__FormalParameter__Group__4__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6517:2: rule__FormalParameter__Group__4__Impl
+            // InternalCheck.g:6516:1: ( rule__FormalParameter__Group__4__Impl )
+            // InternalCheck.g:6517:2: rule__FormalParameter__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__FormalParameter__Group__4__Impl_in_rule__FormalParameter__Group__413879);
+            pushFollow(FOLLOW_2);
             rule__FormalParameter__Group__4__Impl();
 
             state._fsp--;
@@ -20447,22 +20447,22 @@ public final void rule__FormalParameter__Group__4() throws RecognitionException
 
 
     // $ANTLR start "rule__FormalParameter__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6523:1: rule__FormalParameter__Group__4__Impl : ( ( rule__FormalParameter__LabelAssignment_4 )? ) ;
+    // InternalCheck.g:6523:1: rule__FormalParameter__Group__4__Impl : ( ( rule__FormalParameter__LabelAssignment_4 )? ) ;
     public final void rule__FormalParameter__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6527:1: ( ( ( rule__FormalParameter__LabelAssignment_4 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6528:1: ( ( rule__FormalParameter__LabelAssignment_4 )? )
+            // InternalCheck.g:6527:1: ( ( ( rule__FormalParameter__LabelAssignment_4 )? ) )
+            // InternalCheck.g:6528:1: ( ( rule__FormalParameter__LabelAssignment_4 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6528:1: ( ( rule__FormalParameter__LabelAssignment_4 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6529:1: ( rule__FormalParameter__LabelAssignment_4 )?
+            // InternalCheck.g:6528:1: ( ( rule__FormalParameter__LabelAssignment_4 )? )
+            // InternalCheck.g:6529:1: ( rule__FormalParameter__LabelAssignment_4 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormalParameterAccess().getLabelAssignment_4()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6530:1: ( rule__FormalParameter__LabelAssignment_4 )?
+            // InternalCheck.g:6530:1: ( rule__FormalParameter__LabelAssignment_4 )?
             int alt70=2;
             int LA70_0 = input.LA(1);
 
@@ -20471,9 +20471,9 @@ public final void rule__FormalParameter__Group__4__Impl() throws RecognitionExce
             }
             switch (alt70) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6530:2: rule__FormalParameter__LabelAssignment_4
+                    // InternalCheck.g:6530:2: rule__FormalParameter__LabelAssignment_4
                     {
-                    pushFollow(FOLLOW_rule__FormalParameter__LabelAssignment_4_in_rule__FormalParameter__Group__4__Impl13906);
+                    pushFollow(FOLLOW_2);
                     rule__FormalParameter__LabelAssignment_4();
 
                     state._fsp--;
@@ -20509,21 +20509,21 @@ public final void rule__FormalParameter__Group__4__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XConstantUnaryOperation__Group_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6550:1: rule__XConstantUnaryOperation__Group_0__0 : rule__XConstantUnaryOperation__Group_0__0__Impl rule__XConstantUnaryOperation__Group_0__1 ;
+    // InternalCheck.g:6550:1: rule__XConstantUnaryOperation__Group_0__0 : rule__XConstantUnaryOperation__Group_0__0__Impl rule__XConstantUnaryOperation__Group_0__1 ;
     public final void rule__XConstantUnaryOperation__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6554:1: ( rule__XConstantUnaryOperation__Group_0__0__Impl rule__XConstantUnaryOperation__Group_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6555:2: rule__XConstantUnaryOperation__Group_0__0__Impl rule__XConstantUnaryOperation__Group_0__1
+            // InternalCheck.g:6554:1: ( rule__XConstantUnaryOperation__Group_0__0__Impl rule__XConstantUnaryOperation__Group_0__1 )
+            // InternalCheck.g:6555:2: rule__XConstantUnaryOperation__Group_0__0__Impl rule__XConstantUnaryOperation__Group_0__1
             {
-            pushFollow(FOLLOW_rule__XConstantUnaryOperation__Group_0__0__Impl_in_rule__XConstantUnaryOperation__Group_0__013947);
+            pushFollow(FOLLOW_36);
             rule__XConstantUnaryOperation__Group_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstantUnaryOperation__Group_0__1_in_rule__XConstantUnaryOperation__Group_0__013950);
+            pushFollow(FOLLOW_2);
             rule__XConstantUnaryOperation__Group_0__1();
 
             state._fsp--;
@@ -20547,23 +20547,23 @@ public final void rule__XConstantUnaryOperation__Group_0__0() throws Recognition
 
 
     // $ANTLR start "rule__XConstantUnaryOperation__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6562:1: rule__XConstantUnaryOperation__Group_0__0__Impl : ( () ) ;
+    // InternalCheck.g:6562:1: rule__XConstantUnaryOperation__Group_0__0__Impl : ( () ) ;
     public final void rule__XConstantUnaryOperation__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6566:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6567:1: ( () )
+            // InternalCheck.g:6566:1: ( ( () ) )
+            // InternalCheck.g:6567:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6567:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6568:1: ()
+            // InternalCheck.g:6567:1: ( () )
+            // InternalCheck.g:6568:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantUnaryOperationAccess().getXUnaryOperationAction_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6569:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6571:1: 
+            // InternalCheck.g:6569:1: ()
+            // InternalCheck.g:6571:1: 
             {
             }
 
@@ -20588,21 +20588,21 @@ public final void rule__XConstantUnaryOperation__Group_0__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XConstantUnaryOperation__Group_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6581:1: rule__XConstantUnaryOperation__Group_0__1 : rule__XConstantUnaryOperation__Group_0__1__Impl rule__XConstantUnaryOperation__Group_0__2 ;
+    // InternalCheck.g:6581:1: rule__XConstantUnaryOperation__Group_0__1 : rule__XConstantUnaryOperation__Group_0__1__Impl rule__XConstantUnaryOperation__Group_0__2 ;
     public final void rule__XConstantUnaryOperation__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6585:1: ( rule__XConstantUnaryOperation__Group_0__1__Impl rule__XConstantUnaryOperation__Group_0__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6586:2: rule__XConstantUnaryOperation__Group_0__1__Impl rule__XConstantUnaryOperation__Group_0__2
+            // InternalCheck.g:6585:1: ( rule__XConstantUnaryOperation__Group_0__1__Impl rule__XConstantUnaryOperation__Group_0__2 )
+            // InternalCheck.g:6586:2: rule__XConstantUnaryOperation__Group_0__1__Impl rule__XConstantUnaryOperation__Group_0__2
             {
-            pushFollow(FOLLOW_rule__XConstantUnaryOperation__Group_0__1__Impl_in_rule__XConstantUnaryOperation__Group_0__114008);
+            pushFollow(FOLLOW_37);
             rule__XConstantUnaryOperation__Group_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstantUnaryOperation__Group_0__2_in_rule__XConstantUnaryOperation__Group_0__114011);
+            pushFollow(FOLLOW_2);
             rule__XConstantUnaryOperation__Group_0__2();
 
             state._fsp--;
@@ -20626,25 +20626,25 @@ public final void rule__XConstantUnaryOperation__Group_0__1() throws Recognition
 
 
     // $ANTLR start "rule__XConstantUnaryOperation__Group_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6593:1: rule__XConstantUnaryOperation__Group_0__1__Impl : ( ( rule__XConstantUnaryOperation__FeatureAssignment_0_1 ) ) ;
+    // InternalCheck.g:6593:1: rule__XConstantUnaryOperation__Group_0__1__Impl : ( ( rule__XConstantUnaryOperation__FeatureAssignment_0_1 ) ) ;
     public final void rule__XConstantUnaryOperation__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6597:1: ( ( ( rule__XConstantUnaryOperation__FeatureAssignment_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6598:1: ( ( rule__XConstantUnaryOperation__FeatureAssignment_0_1 ) )
+            // InternalCheck.g:6597:1: ( ( ( rule__XConstantUnaryOperation__FeatureAssignment_0_1 ) ) )
+            // InternalCheck.g:6598:1: ( ( rule__XConstantUnaryOperation__FeatureAssignment_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6598:1: ( ( rule__XConstantUnaryOperation__FeatureAssignment_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6599:1: ( rule__XConstantUnaryOperation__FeatureAssignment_0_1 )
+            // InternalCheck.g:6598:1: ( ( rule__XConstantUnaryOperation__FeatureAssignment_0_1 ) )
+            // InternalCheck.g:6599:1: ( rule__XConstantUnaryOperation__FeatureAssignment_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantUnaryOperationAccess().getFeatureAssignment_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6600:1: ( rule__XConstantUnaryOperation__FeatureAssignment_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6600:2: rule__XConstantUnaryOperation__FeatureAssignment_0_1
+            // InternalCheck.g:6600:1: ( rule__XConstantUnaryOperation__FeatureAssignment_0_1 )
+            // InternalCheck.g:6600:2: rule__XConstantUnaryOperation__FeatureAssignment_0_1
             {
-            pushFollow(FOLLOW_rule__XConstantUnaryOperation__FeatureAssignment_0_1_in_rule__XConstantUnaryOperation__Group_0__1__Impl14038);
+            pushFollow(FOLLOW_2);
             rule__XConstantUnaryOperation__FeatureAssignment_0_1();
 
             state._fsp--;
@@ -20677,16 +20677,16 @@ public final void rule__XConstantUnaryOperation__Group_0__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__XConstantUnaryOperation__Group_0__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6610:1: rule__XConstantUnaryOperation__Group_0__2 : rule__XConstantUnaryOperation__Group_0__2__Impl ;
+    // InternalCheck.g:6610:1: rule__XConstantUnaryOperation__Group_0__2 : rule__XConstantUnaryOperation__Group_0__2__Impl ;
     public final void rule__XConstantUnaryOperation__Group_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6614:1: ( rule__XConstantUnaryOperation__Group_0__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6615:2: rule__XConstantUnaryOperation__Group_0__2__Impl
+            // InternalCheck.g:6614:1: ( rule__XConstantUnaryOperation__Group_0__2__Impl )
+            // InternalCheck.g:6615:2: rule__XConstantUnaryOperation__Group_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__XConstantUnaryOperation__Group_0__2__Impl_in_rule__XConstantUnaryOperation__Group_0__214068);
+            pushFollow(FOLLOW_2);
             rule__XConstantUnaryOperation__Group_0__2__Impl();
 
             state._fsp--;
@@ -20710,25 +20710,25 @@ public final void rule__XConstantUnaryOperation__Group_0__2() throws Recognition
 
 
     // $ANTLR start "rule__XConstantUnaryOperation__Group_0__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6621:1: rule__XConstantUnaryOperation__Group_0__2__Impl : ( ( rule__XConstantUnaryOperation__OperandAssignment_0_2 ) ) ;
+    // InternalCheck.g:6621:1: rule__XConstantUnaryOperation__Group_0__2__Impl : ( ( rule__XConstantUnaryOperation__OperandAssignment_0_2 ) ) ;
     public final void rule__XConstantUnaryOperation__Group_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6625:1: ( ( ( rule__XConstantUnaryOperation__OperandAssignment_0_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6626:1: ( ( rule__XConstantUnaryOperation__OperandAssignment_0_2 ) )
+            // InternalCheck.g:6625:1: ( ( ( rule__XConstantUnaryOperation__OperandAssignment_0_2 ) ) )
+            // InternalCheck.g:6626:1: ( ( rule__XConstantUnaryOperation__OperandAssignment_0_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6626:1: ( ( rule__XConstantUnaryOperation__OperandAssignment_0_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6627:1: ( rule__XConstantUnaryOperation__OperandAssignment_0_2 )
+            // InternalCheck.g:6626:1: ( ( rule__XConstantUnaryOperation__OperandAssignment_0_2 ) )
+            // InternalCheck.g:6627:1: ( rule__XConstantUnaryOperation__OperandAssignment_0_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantUnaryOperationAccess().getOperandAssignment_0_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6628:1: ( rule__XConstantUnaryOperation__OperandAssignment_0_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6628:2: rule__XConstantUnaryOperation__OperandAssignment_0_2
+            // InternalCheck.g:6628:1: ( rule__XConstantUnaryOperation__OperandAssignment_0_2 )
+            // InternalCheck.g:6628:2: rule__XConstantUnaryOperation__OperandAssignment_0_2
             {
-            pushFollow(FOLLOW_rule__XConstantUnaryOperation__OperandAssignment_0_2_in_rule__XConstantUnaryOperation__Group_0__2__Impl14095);
+            pushFollow(FOLLOW_2);
             rule__XConstantUnaryOperation__OperandAssignment_0_2();
 
             state._fsp--;
@@ -20761,21 +20761,21 @@ public final void rule__XConstantUnaryOperation__Group_0__2__Impl() throws Recog
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6644:1: rule__XConstantListLiteral__Group__0 : rule__XConstantListLiteral__Group__0__Impl rule__XConstantListLiteral__Group__1 ;
+    // InternalCheck.g:6644:1: rule__XConstantListLiteral__Group__0 : rule__XConstantListLiteral__Group__0__Impl rule__XConstantListLiteral__Group__1 ;
     public final void rule__XConstantListLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6648:1: ( rule__XConstantListLiteral__Group__0__Impl rule__XConstantListLiteral__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6649:2: rule__XConstantListLiteral__Group__0__Impl rule__XConstantListLiteral__Group__1
+            // InternalCheck.g:6648:1: ( rule__XConstantListLiteral__Group__0__Impl rule__XConstantListLiteral__Group__1 )
+            // InternalCheck.g:6649:2: rule__XConstantListLiteral__Group__0__Impl rule__XConstantListLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group__0__Impl_in_rule__XConstantListLiteral__Group__014131);
+            pushFollow(FOLLOW_35);
             rule__XConstantListLiteral__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group__1_in_rule__XConstantListLiteral__Group__014134);
+            pushFollow(FOLLOW_2);
             rule__XConstantListLiteral__Group__1();
 
             state._fsp--;
@@ -20799,23 +20799,23 @@ public final void rule__XConstantListLiteral__Group__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6656:1: rule__XConstantListLiteral__Group__0__Impl : ( () ) ;
+    // InternalCheck.g:6656:1: rule__XConstantListLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XConstantListLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6660:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6661:1: ( () )
+            // InternalCheck.g:6660:1: ( ( () ) )
+            // InternalCheck.g:6661:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6661:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6662:1: ()
+            // InternalCheck.g:6661:1: ( () )
+            // InternalCheck.g:6662:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantListLiteralAccess().getXListLiteralAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6663:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6665:1: 
+            // InternalCheck.g:6663:1: ()
+            // InternalCheck.g:6665:1: 
             {
             }
 
@@ -20840,21 +20840,21 @@ public final void rule__XConstantListLiteral__Group__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6675:1: rule__XConstantListLiteral__Group__1 : rule__XConstantListLiteral__Group__1__Impl rule__XConstantListLiteral__Group__2 ;
+    // InternalCheck.g:6675:1: rule__XConstantListLiteral__Group__1 : rule__XConstantListLiteral__Group__1__Impl rule__XConstantListLiteral__Group__2 ;
     public final void rule__XConstantListLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6679:1: ( rule__XConstantListLiteral__Group__1__Impl rule__XConstantListLiteral__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6680:2: rule__XConstantListLiteral__Group__1__Impl rule__XConstantListLiteral__Group__2
+            // InternalCheck.g:6679:1: ( rule__XConstantListLiteral__Group__1__Impl rule__XConstantListLiteral__Group__2 )
+            // InternalCheck.g:6680:2: rule__XConstantListLiteral__Group__1__Impl rule__XConstantListLiteral__Group__2
             {
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group__1__Impl_in_rule__XConstantListLiteral__Group__114192);
+            pushFollow(FOLLOW_38);
             rule__XConstantListLiteral__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group__2_in_rule__XConstantListLiteral__Group__114195);
+            pushFollow(FOLLOW_2);
             rule__XConstantListLiteral__Group__2();
 
             state._fsp--;
@@ -20878,22 +20878,22 @@ public final void rule__XConstantListLiteral__Group__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6687:1: rule__XConstantListLiteral__Group__1__Impl : ( '#' ) ;
+    // InternalCheck.g:6687:1: rule__XConstantListLiteral__Group__1__Impl : ( '#' ) ;
     public final void rule__XConstantListLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6691:1: ( ( '#' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6692:1: ( '#' )
+            // InternalCheck.g:6691:1: ( ( '#' ) )
+            // InternalCheck.g:6692:1: ( '#' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6692:1: ( '#' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6693:1: '#'
+            // InternalCheck.g:6692:1: ( '#' )
+            // InternalCheck.g:6693:1: '#'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantListLiteralAccess().getNumberSignKeyword_1()); 
             }
-            match(input,77,FOLLOW_77_in_rule__XConstantListLiteral__Group__1__Impl14223); if (state.failed) return ;
+            match(input,77,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstantListLiteralAccess().getNumberSignKeyword_1()); 
             }
@@ -20919,21 +20919,21 @@ public final void rule__XConstantListLiteral__Group__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6706:1: rule__XConstantListLiteral__Group__2 : rule__XConstantListLiteral__Group__2__Impl rule__XConstantListLiteral__Group__3 ;
+    // InternalCheck.g:6706:1: rule__XConstantListLiteral__Group__2 : rule__XConstantListLiteral__Group__2__Impl rule__XConstantListLiteral__Group__3 ;
     public final void rule__XConstantListLiteral__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6710:1: ( rule__XConstantListLiteral__Group__2__Impl rule__XConstantListLiteral__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6711:2: rule__XConstantListLiteral__Group__2__Impl rule__XConstantListLiteral__Group__3
+            // InternalCheck.g:6710:1: ( rule__XConstantListLiteral__Group__2__Impl rule__XConstantListLiteral__Group__3 )
+            // InternalCheck.g:6711:2: rule__XConstantListLiteral__Group__2__Impl rule__XConstantListLiteral__Group__3
             {
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group__2__Impl_in_rule__XConstantListLiteral__Group__214254);
+            pushFollow(FOLLOW_39);
             rule__XConstantListLiteral__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group__3_in_rule__XConstantListLiteral__Group__214257);
+            pushFollow(FOLLOW_2);
             rule__XConstantListLiteral__Group__3();
 
             state._fsp--;
@@ -20957,22 +20957,22 @@ public final void rule__XConstantListLiteral__Group__2() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6718:1: rule__XConstantListLiteral__Group__2__Impl : ( '[' ) ;
+    // InternalCheck.g:6718:1: rule__XConstantListLiteral__Group__2__Impl : ( '[' ) ;
     public final void rule__XConstantListLiteral__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6722:1: ( ( '[' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6723:1: ( '[' )
+            // InternalCheck.g:6722:1: ( ( '[' ) )
+            // InternalCheck.g:6723:1: ( '[' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6723:1: ( '[' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6724:1: '['
+            // InternalCheck.g:6723:1: ( '[' )
+            // InternalCheck.g:6724:1: '['
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantListLiteralAccess().getLeftSquareBracketKeyword_2()); 
             }
-            match(input,78,FOLLOW_78_in_rule__XConstantListLiteral__Group__2__Impl14285); if (state.failed) return ;
+            match(input,78,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstantListLiteralAccess().getLeftSquareBracketKeyword_2()); 
             }
@@ -20998,21 +20998,21 @@ public final void rule__XConstantListLiteral__Group__2__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6737:1: rule__XConstantListLiteral__Group__3 : rule__XConstantListLiteral__Group__3__Impl rule__XConstantListLiteral__Group__4 ;
+    // InternalCheck.g:6737:1: rule__XConstantListLiteral__Group__3 : rule__XConstantListLiteral__Group__3__Impl rule__XConstantListLiteral__Group__4 ;
     public final void rule__XConstantListLiteral__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6741:1: ( rule__XConstantListLiteral__Group__3__Impl rule__XConstantListLiteral__Group__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6742:2: rule__XConstantListLiteral__Group__3__Impl rule__XConstantListLiteral__Group__4
+            // InternalCheck.g:6741:1: ( rule__XConstantListLiteral__Group__3__Impl rule__XConstantListLiteral__Group__4 )
+            // InternalCheck.g:6742:2: rule__XConstantListLiteral__Group__3__Impl rule__XConstantListLiteral__Group__4
             {
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group__3__Impl_in_rule__XConstantListLiteral__Group__314316);
+            pushFollow(FOLLOW_39);
             rule__XConstantListLiteral__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group__4_in_rule__XConstantListLiteral__Group__314319);
+            pushFollow(FOLLOW_2);
             rule__XConstantListLiteral__Group__4();
 
             state._fsp--;
@@ -21036,22 +21036,22 @@ public final void rule__XConstantListLiteral__Group__3() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6749:1: rule__XConstantListLiteral__Group__3__Impl : ( ( rule__XConstantListLiteral__Group_3__0 )? ) ;
+    // InternalCheck.g:6749:1: rule__XConstantListLiteral__Group__3__Impl : ( ( rule__XConstantListLiteral__Group_3__0 )? ) ;
     public final void rule__XConstantListLiteral__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6753:1: ( ( ( rule__XConstantListLiteral__Group_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6754:1: ( ( rule__XConstantListLiteral__Group_3__0 )? )
+            // InternalCheck.g:6753:1: ( ( ( rule__XConstantListLiteral__Group_3__0 )? ) )
+            // InternalCheck.g:6754:1: ( ( rule__XConstantListLiteral__Group_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6754:1: ( ( rule__XConstantListLiteral__Group_3__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6755:1: ( rule__XConstantListLiteral__Group_3__0 )?
+            // InternalCheck.g:6754:1: ( ( rule__XConstantListLiteral__Group_3__0 )? )
+            // InternalCheck.g:6755:1: ( rule__XConstantListLiteral__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantListLiteralAccess().getGroup_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6756:1: ( rule__XConstantListLiteral__Group_3__0 )?
+            // InternalCheck.g:6756:1: ( rule__XConstantListLiteral__Group_3__0 )?
             int alt71=2;
             int LA71_0 = input.LA(1);
 
@@ -21060,9 +21060,9 @@ public final void rule__XConstantListLiteral__Group__3__Impl() throws Recognitio
             }
             switch (alt71) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6756:2: rule__XConstantListLiteral__Group_3__0
+                    // InternalCheck.g:6756:2: rule__XConstantListLiteral__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__XConstantListLiteral__Group_3__0_in_rule__XConstantListLiteral__Group__3__Impl14346);
+                    pushFollow(FOLLOW_2);
                     rule__XConstantListLiteral__Group_3__0();
 
                     state._fsp--;
@@ -21098,16 +21098,16 @@ public final void rule__XConstantListLiteral__Group__3__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6766:1: rule__XConstantListLiteral__Group__4 : rule__XConstantListLiteral__Group__4__Impl ;
+    // InternalCheck.g:6766:1: rule__XConstantListLiteral__Group__4 : rule__XConstantListLiteral__Group__4__Impl ;
     public final void rule__XConstantListLiteral__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6770:1: ( rule__XConstantListLiteral__Group__4__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6771:2: rule__XConstantListLiteral__Group__4__Impl
+            // InternalCheck.g:6770:1: ( rule__XConstantListLiteral__Group__4__Impl )
+            // InternalCheck.g:6771:2: rule__XConstantListLiteral__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group__4__Impl_in_rule__XConstantListLiteral__Group__414377);
+            pushFollow(FOLLOW_2);
             rule__XConstantListLiteral__Group__4__Impl();
 
             state._fsp--;
@@ -21131,22 +21131,22 @@ public final void rule__XConstantListLiteral__Group__4() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6777:1: rule__XConstantListLiteral__Group__4__Impl : ( ']' ) ;
+    // InternalCheck.g:6777:1: rule__XConstantListLiteral__Group__4__Impl : ( ']' ) ;
     public final void rule__XConstantListLiteral__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6781:1: ( ( ']' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6782:1: ( ']' )
+            // InternalCheck.g:6781:1: ( ( ']' ) )
+            // InternalCheck.g:6782:1: ( ']' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6782:1: ( ']' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6783:1: ']'
+            // InternalCheck.g:6782:1: ( ']' )
+            // InternalCheck.g:6783:1: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantListLiteralAccess().getRightSquareBracketKeyword_4()); 
             }
-            match(input,79,FOLLOW_79_in_rule__XConstantListLiteral__Group__4__Impl14405); if (state.failed) return ;
+            match(input,79,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstantListLiteralAccess().getRightSquareBracketKeyword_4()); 
             }
@@ -21172,21 +21172,21 @@ public final void rule__XConstantListLiteral__Group__4__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group_3__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6806:1: rule__XConstantListLiteral__Group_3__0 : rule__XConstantListLiteral__Group_3__0__Impl rule__XConstantListLiteral__Group_3__1 ;
+    // InternalCheck.g:6806:1: rule__XConstantListLiteral__Group_3__0 : rule__XConstantListLiteral__Group_3__0__Impl rule__XConstantListLiteral__Group_3__1 ;
     public final void rule__XConstantListLiteral__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6810:1: ( rule__XConstantListLiteral__Group_3__0__Impl rule__XConstantListLiteral__Group_3__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6811:2: rule__XConstantListLiteral__Group_3__0__Impl rule__XConstantListLiteral__Group_3__1
+            // InternalCheck.g:6810:1: ( rule__XConstantListLiteral__Group_3__0__Impl rule__XConstantListLiteral__Group_3__1 )
+            // InternalCheck.g:6811:2: rule__XConstantListLiteral__Group_3__0__Impl rule__XConstantListLiteral__Group_3__1
             {
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group_3__0__Impl_in_rule__XConstantListLiteral__Group_3__014446);
+            pushFollow(FOLLOW_20);
             rule__XConstantListLiteral__Group_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group_3__1_in_rule__XConstantListLiteral__Group_3__014449);
+            pushFollow(FOLLOW_2);
             rule__XConstantListLiteral__Group_3__1();
 
             state._fsp--;
@@ -21210,25 +21210,25 @@ public final void rule__XConstantListLiteral__Group_3__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group_3__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6818:1: rule__XConstantListLiteral__Group_3__0__Impl : ( ( rule__XConstantListLiteral__ElementsAssignment_3_0 ) ) ;
+    // InternalCheck.g:6818:1: rule__XConstantListLiteral__Group_3__0__Impl : ( ( rule__XConstantListLiteral__ElementsAssignment_3_0 ) ) ;
     public final void rule__XConstantListLiteral__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6822:1: ( ( ( rule__XConstantListLiteral__ElementsAssignment_3_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6823:1: ( ( rule__XConstantListLiteral__ElementsAssignment_3_0 ) )
+            // InternalCheck.g:6822:1: ( ( ( rule__XConstantListLiteral__ElementsAssignment_3_0 ) ) )
+            // InternalCheck.g:6823:1: ( ( rule__XConstantListLiteral__ElementsAssignment_3_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6823:1: ( ( rule__XConstantListLiteral__ElementsAssignment_3_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6824:1: ( rule__XConstantListLiteral__ElementsAssignment_3_0 )
+            // InternalCheck.g:6823:1: ( ( rule__XConstantListLiteral__ElementsAssignment_3_0 ) )
+            // InternalCheck.g:6824:1: ( rule__XConstantListLiteral__ElementsAssignment_3_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantListLiteralAccess().getElementsAssignment_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6825:1: ( rule__XConstantListLiteral__ElementsAssignment_3_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6825:2: rule__XConstantListLiteral__ElementsAssignment_3_0
+            // InternalCheck.g:6825:1: ( rule__XConstantListLiteral__ElementsAssignment_3_0 )
+            // InternalCheck.g:6825:2: rule__XConstantListLiteral__ElementsAssignment_3_0
             {
-            pushFollow(FOLLOW_rule__XConstantListLiteral__ElementsAssignment_3_0_in_rule__XConstantListLiteral__Group_3__0__Impl14476);
+            pushFollow(FOLLOW_2);
             rule__XConstantListLiteral__ElementsAssignment_3_0();
 
             state._fsp--;
@@ -21261,16 +21261,16 @@ public final void rule__XConstantListLiteral__Group_3__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group_3__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6835:1: rule__XConstantListLiteral__Group_3__1 : rule__XConstantListLiteral__Group_3__1__Impl ;
+    // InternalCheck.g:6835:1: rule__XConstantListLiteral__Group_3__1 : rule__XConstantListLiteral__Group_3__1__Impl ;
     public final void rule__XConstantListLiteral__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6839:1: ( rule__XConstantListLiteral__Group_3__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6840:2: rule__XConstantListLiteral__Group_3__1__Impl
+            // InternalCheck.g:6839:1: ( rule__XConstantListLiteral__Group_3__1__Impl )
+            // InternalCheck.g:6840:2: rule__XConstantListLiteral__Group_3__1__Impl
             {
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group_3__1__Impl_in_rule__XConstantListLiteral__Group_3__114506);
+            pushFollow(FOLLOW_2);
             rule__XConstantListLiteral__Group_3__1__Impl();
 
             state._fsp--;
@@ -21294,22 +21294,22 @@ public final void rule__XConstantListLiteral__Group_3__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group_3__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6846:1: rule__XConstantListLiteral__Group_3__1__Impl : ( ( rule__XConstantListLiteral__Group_3_1__0 )* ) ;
+    // InternalCheck.g:6846:1: rule__XConstantListLiteral__Group_3__1__Impl : ( ( rule__XConstantListLiteral__Group_3_1__0 )* ) ;
     public final void rule__XConstantListLiteral__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6850:1: ( ( ( rule__XConstantListLiteral__Group_3_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6851:1: ( ( rule__XConstantListLiteral__Group_3_1__0 )* )
+            // InternalCheck.g:6850:1: ( ( ( rule__XConstantListLiteral__Group_3_1__0 )* ) )
+            // InternalCheck.g:6851:1: ( ( rule__XConstantListLiteral__Group_3_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6851:1: ( ( rule__XConstantListLiteral__Group_3_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6852:1: ( rule__XConstantListLiteral__Group_3_1__0 )*
+            // InternalCheck.g:6851:1: ( ( rule__XConstantListLiteral__Group_3_1__0 )* )
+            // InternalCheck.g:6852:1: ( rule__XConstantListLiteral__Group_3_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantListLiteralAccess().getGroup_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6853:1: ( rule__XConstantListLiteral__Group_3_1__0 )*
+            // InternalCheck.g:6853:1: ( rule__XConstantListLiteral__Group_3_1__0 )*
             loop72:
             do {
                 int alt72=2;
@@ -21322,9 +21322,9 @@ public final void rule__XConstantListLiteral__Group_3__1__Impl() throws Recognit
 
                 switch (alt72) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6853:2: rule__XConstantListLiteral__Group_3_1__0
+            	    // InternalCheck.g:6853:2: rule__XConstantListLiteral__Group_3_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XConstantListLiteral__Group_3_1__0_in_rule__XConstantListLiteral__Group_3__1__Impl14533);
+            	    pushFollow(FOLLOW_21);
             	    rule__XConstantListLiteral__Group_3_1__0();
 
             	    state._fsp--;
@@ -21363,21 +21363,21 @@ public final void rule__XConstantListLiteral__Group_3__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group_3_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6867:1: rule__XConstantListLiteral__Group_3_1__0 : rule__XConstantListLiteral__Group_3_1__0__Impl rule__XConstantListLiteral__Group_3_1__1 ;
+    // InternalCheck.g:6867:1: rule__XConstantListLiteral__Group_3_1__0 : rule__XConstantListLiteral__Group_3_1__0__Impl rule__XConstantListLiteral__Group_3_1__1 ;
     public final void rule__XConstantListLiteral__Group_3_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6871:1: ( rule__XConstantListLiteral__Group_3_1__0__Impl rule__XConstantListLiteral__Group_3_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6872:2: rule__XConstantListLiteral__Group_3_1__0__Impl rule__XConstantListLiteral__Group_3_1__1
+            // InternalCheck.g:6871:1: ( rule__XConstantListLiteral__Group_3_1__0__Impl rule__XConstantListLiteral__Group_3_1__1 )
+            // InternalCheck.g:6872:2: rule__XConstantListLiteral__Group_3_1__0__Impl rule__XConstantListLiteral__Group_3_1__1
             {
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group_3_1__0__Impl_in_rule__XConstantListLiteral__Group_3_1__014568);
+            pushFollow(FOLLOW_37);
             rule__XConstantListLiteral__Group_3_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group_3_1__1_in_rule__XConstantListLiteral__Group_3_1__014571);
+            pushFollow(FOLLOW_2);
             rule__XConstantListLiteral__Group_3_1__1();
 
             state._fsp--;
@@ -21401,22 +21401,22 @@ public final void rule__XConstantListLiteral__Group_3_1__0() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group_3_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6879:1: rule__XConstantListLiteral__Group_3_1__0__Impl : ( ',' ) ;
+    // InternalCheck.g:6879:1: rule__XConstantListLiteral__Group_3_1__0__Impl : ( ',' ) ;
     public final void rule__XConstantListLiteral__Group_3_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6883:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6884:1: ( ',' )
+            // InternalCheck.g:6883:1: ( ( ',' ) )
+            // InternalCheck.g:6884:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6884:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6885:1: ','
+            // InternalCheck.g:6884:1: ( ',' )
+            // InternalCheck.g:6885:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantListLiteralAccess().getCommaKeyword_3_1_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XConstantListLiteral__Group_3_1__0__Impl14599); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstantListLiteralAccess().getCommaKeyword_3_1_0()); 
             }
@@ -21442,16 +21442,16 @@ public final void rule__XConstantListLiteral__Group_3_1__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group_3_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6898:1: rule__XConstantListLiteral__Group_3_1__1 : rule__XConstantListLiteral__Group_3_1__1__Impl ;
+    // InternalCheck.g:6898:1: rule__XConstantListLiteral__Group_3_1__1 : rule__XConstantListLiteral__Group_3_1__1__Impl ;
     public final void rule__XConstantListLiteral__Group_3_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6902:1: ( rule__XConstantListLiteral__Group_3_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6903:2: rule__XConstantListLiteral__Group_3_1__1__Impl
+            // InternalCheck.g:6902:1: ( rule__XConstantListLiteral__Group_3_1__1__Impl )
+            // InternalCheck.g:6903:2: rule__XConstantListLiteral__Group_3_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group_3_1__1__Impl_in_rule__XConstantListLiteral__Group_3_1__114630);
+            pushFollow(FOLLOW_2);
             rule__XConstantListLiteral__Group_3_1__1__Impl();
 
             state._fsp--;
@@ -21475,25 +21475,25 @@ public final void rule__XConstantListLiteral__Group_3_1__1() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group_3_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6909:1: rule__XConstantListLiteral__Group_3_1__1__Impl : ( ( rule__XConstantListLiteral__ElementsAssignment_3_1_1 ) ) ;
+    // InternalCheck.g:6909:1: rule__XConstantListLiteral__Group_3_1__1__Impl : ( ( rule__XConstantListLiteral__ElementsAssignment_3_1_1 ) ) ;
     public final void rule__XConstantListLiteral__Group_3_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6913:1: ( ( ( rule__XConstantListLiteral__ElementsAssignment_3_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6914:1: ( ( rule__XConstantListLiteral__ElementsAssignment_3_1_1 ) )
+            // InternalCheck.g:6913:1: ( ( ( rule__XConstantListLiteral__ElementsAssignment_3_1_1 ) ) )
+            // InternalCheck.g:6914:1: ( ( rule__XConstantListLiteral__ElementsAssignment_3_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6914:1: ( ( rule__XConstantListLiteral__ElementsAssignment_3_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6915:1: ( rule__XConstantListLiteral__ElementsAssignment_3_1_1 )
+            // InternalCheck.g:6914:1: ( ( rule__XConstantListLiteral__ElementsAssignment_3_1_1 ) )
+            // InternalCheck.g:6915:1: ( rule__XConstantListLiteral__ElementsAssignment_3_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantListLiteralAccess().getElementsAssignment_3_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6916:1: ( rule__XConstantListLiteral__ElementsAssignment_3_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6916:2: rule__XConstantListLiteral__ElementsAssignment_3_1_1
+            // InternalCheck.g:6916:1: ( rule__XConstantListLiteral__ElementsAssignment_3_1_1 )
+            // InternalCheck.g:6916:2: rule__XConstantListLiteral__ElementsAssignment_3_1_1
             {
-            pushFollow(FOLLOW_rule__XConstantListLiteral__ElementsAssignment_3_1_1_in_rule__XConstantListLiteral__Group_3_1__1__Impl14657);
+            pushFollow(FOLLOW_2);
             rule__XConstantListLiteral__ElementsAssignment_3_1_1();
 
             state._fsp--;
@@ -21526,21 +21526,21 @@ public final void rule__XConstantListLiteral__Group_3_1__1__Impl() throws Recogn
 
 
     // $ANTLR start "rule__Context__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6930:1: rule__Context__Group__0 : rule__Context__Group__0__Impl rule__Context__Group__1 ;
+    // InternalCheck.g:6930:1: rule__Context__Group__0 : rule__Context__Group__0__Impl rule__Context__Group__1 ;
     public final void rule__Context__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6934:1: ( rule__Context__Group__0__Impl rule__Context__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6935:2: rule__Context__Group__0__Impl rule__Context__Group__1
+            // InternalCheck.g:6934:1: ( rule__Context__Group__0__Impl rule__Context__Group__1 )
+            // InternalCheck.g:6935:2: rule__Context__Group__0__Impl rule__Context__Group__1
             {
-            pushFollow(FOLLOW_rule__Context__Group__0__Impl_in_rule__Context__Group__014691);
+            pushFollow(FOLLOW_29);
             rule__Context__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Context__Group__1_in_rule__Context__Group__014694);
+            pushFollow(FOLLOW_2);
             rule__Context__Group__1();
 
             state._fsp--;
@@ -21564,22 +21564,22 @@ public final void rule__Context__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Context__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6942:1: rule__Context__Group__0__Impl : ( 'for' ) ;
+    // InternalCheck.g:6942:1: rule__Context__Group__0__Impl : ( 'for' ) ;
     public final void rule__Context__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6946:1: ( ( 'for' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6947:1: ( 'for' )
+            // InternalCheck.g:6946:1: ( ( 'for' ) )
+            // InternalCheck.g:6947:1: ( 'for' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6947:1: ( 'for' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6948:1: 'for'
+            // InternalCheck.g:6947:1: ( 'for' )
+            // InternalCheck.g:6948:1: 'for'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getContextAccess().getForKeyword_0()); 
             }
-            match(input,70,FOLLOW_70_in_rule__Context__Group__0__Impl14722); if (state.failed) return ;
+            match(input,70,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getContextAccess().getForKeyword_0()); 
             }
@@ -21605,21 +21605,21 @@ public final void rule__Context__Group__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Context__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6961:1: rule__Context__Group__1 : rule__Context__Group__1__Impl rule__Context__Group__2 ;
+    // InternalCheck.g:6961:1: rule__Context__Group__1 : rule__Context__Group__1__Impl rule__Context__Group__2 ;
     public final void rule__Context__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6965:1: ( rule__Context__Group__1__Impl rule__Context__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6966:2: rule__Context__Group__1__Impl rule__Context__Group__2
+            // InternalCheck.g:6965:1: ( rule__Context__Group__1__Impl rule__Context__Group__2 )
+            // InternalCheck.g:6966:2: rule__Context__Group__1__Impl rule__Context__Group__2
             {
-            pushFollow(FOLLOW_rule__Context__Group__1__Impl_in_rule__Context__Group__114753);
+            pushFollow(FOLLOW_14);
             rule__Context__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Context__Group__2_in_rule__Context__Group__114756);
+            pushFollow(FOLLOW_2);
             rule__Context__Group__2();
 
             state._fsp--;
@@ -21643,25 +21643,25 @@ public final void rule__Context__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Context__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6973:1: rule__Context__Group__1__Impl : ( ( rule__Context__ContextVariableAssignment_1 ) ) ;
+    // InternalCheck.g:6973:1: rule__Context__Group__1__Impl : ( ( rule__Context__ContextVariableAssignment_1 ) ) ;
     public final void rule__Context__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6977:1: ( ( ( rule__Context__ContextVariableAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6978:1: ( ( rule__Context__ContextVariableAssignment_1 ) )
+            // InternalCheck.g:6977:1: ( ( ( rule__Context__ContextVariableAssignment_1 ) ) )
+            // InternalCheck.g:6978:1: ( ( rule__Context__ContextVariableAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6978:1: ( ( rule__Context__ContextVariableAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6979:1: ( rule__Context__ContextVariableAssignment_1 )
+            // InternalCheck.g:6978:1: ( ( rule__Context__ContextVariableAssignment_1 ) )
+            // InternalCheck.g:6979:1: ( rule__Context__ContextVariableAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getContextAccess().getContextVariableAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6980:1: ( rule__Context__ContextVariableAssignment_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6980:2: rule__Context__ContextVariableAssignment_1
+            // InternalCheck.g:6980:1: ( rule__Context__ContextVariableAssignment_1 )
+            // InternalCheck.g:6980:2: rule__Context__ContextVariableAssignment_1
             {
-            pushFollow(FOLLOW_rule__Context__ContextVariableAssignment_1_in_rule__Context__Group__1__Impl14783);
+            pushFollow(FOLLOW_2);
             rule__Context__ContextVariableAssignment_1();
 
             state._fsp--;
@@ -21694,16 +21694,16 @@ public final void rule__Context__Group__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Context__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6990:1: rule__Context__Group__2 : rule__Context__Group__2__Impl ;
+    // InternalCheck.g:6990:1: rule__Context__Group__2 : rule__Context__Group__2__Impl ;
     public final void rule__Context__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6994:1: ( rule__Context__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:6995:2: rule__Context__Group__2__Impl
+            // InternalCheck.g:6994:1: ( rule__Context__Group__2__Impl )
+            // InternalCheck.g:6995:2: rule__Context__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__Context__Group__2__Impl_in_rule__Context__Group__214813);
+            pushFollow(FOLLOW_2);
             rule__Context__Group__2__Impl();
 
             state._fsp--;
@@ -21727,25 +21727,25 @@ public final void rule__Context__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__Context__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7001:1: rule__Context__Group__2__Impl : ( ( rule__Context__ConstraintAssignment_2 ) ) ;
+    // InternalCheck.g:7001:1: rule__Context__Group__2__Impl : ( ( rule__Context__ConstraintAssignment_2 ) ) ;
     public final void rule__Context__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7005:1: ( ( ( rule__Context__ConstraintAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7006:1: ( ( rule__Context__ConstraintAssignment_2 ) )
+            // InternalCheck.g:7005:1: ( ( ( rule__Context__ConstraintAssignment_2 ) ) )
+            // InternalCheck.g:7006:1: ( ( rule__Context__ConstraintAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7006:1: ( ( rule__Context__ConstraintAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7007:1: ( rule__Context__ConstraintAssignment_2 )
+            // InternalCheck.g:7006:1: ( ( rule__Context__ConstraintAssignment_2 ) )
+            // InternalCheck.g:7007:1: ( rule__Context__ConstraintAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getContextAccess().getConstraintAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7008:1: ( rule__Context__ConstraintAssignment_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7008:2: rule__Context__ConstraintAssignment_2
+            // InternalCheck.g:7008:1: ( rule__Context__ConstraintAssignment_2 )
+            // InternalCheck.g:7008:2: rule__Context__ConstraintAssignment_2
             {
-            pushFollow(FOLLOW_rule__Context__ConstraintAssignment_2_in_rule__Context__Group__2__Impl14840);
+            pushFollow(FOLLOW_2);
             rule__Context__ConstraintAssignment_2();
 
             state._fsp--;
@@ -21778,21 +21778,21 @@ public final void rule__Context__Group__2__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__ContextVariable__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7024:1: rule__ContextVariable__Group__0 : rule__ContextVariable__Group__0__Impl rule__ContextVariable__Group__1 ;
+    // InternalCheck.g:7024:1: rule__ContextVariable__Group__0 : rule__ContextVariable__Group__0__Impl rule__ContextVariable__Group__1 ;
     public final void rule__ContextVariable__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7028:1: ( rule__ContextVariable__Group__0__Impl rule__ContextVariable__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7029:2: rule__ContextVariable__Group__0__Impl rule__ContextVariable__Group__1
+            // InternalCheck.g:7028:1: ( rule__ContextVariable__Group__0__Impl rule__ContextVariable__Group__1 )
+            // InternalCheck.g:7029:2: rule__ContextVariable__Group__0__Impl rule__ContextVariable__Group__1
             {
-            pushFollow(FOLLOW_rule__ContextVariable__Group__0__Impl_in_rule__ContextVariable__Group__014876);
+            pushFollow(FOLLOW_4);
             rule__ContextVariable__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ContextVariable__Group__1_in_rule__ContextVariable__Group__014879);
+            pushFollow(FOLLOW_2);
             rule__ContextVariable__Group__1();
 
             state._fsp--;
@@ -21816,25 +21816,25 @@ public final void rule__ContextVariable__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__ContextVariable__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7036:1: rule__ContextVariable__Group__0__Impl : ( ( rule__ContextVariable__TypeAssignment_0 ) ) ;
+    // InternalCheck.g:7036:1: rule__ContextVariable__Group__0__Impl : ( ( rule__ContextVariable__TypeAssignment_0 ) ) ;
     public final void rule__ContextVariable__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7040:1: ( ( ( rule__ContextVariable__TypeAssignment_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7041:1: ( ( rule__ContextVariable__TypeAssignment_0 ) )
+            // InternalCheck.g:7040:1: ( ( ( rule__ContextVariable__TypeAssignment_0 ) ) )
+            // InternalCheck.g:7041:1: ( ( rule__ContextVariable__TypeAssignment_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7041:1: ( ( rule__ContextVariable__TypeAssignment_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7042:1: ( rule__ContextVariable__TypeAssignment_0 )
+            // InternalCheck.g:7041:1: ( ( rule__ContextVariable__TypeAssignment_0 ) )
+            // InternalCheck.g:7042:1: ( rule__ContextVariable__TypeAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getContextVariableAccess().getTypeAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7043:1: ( rule__ContextVariable__TypeAssignment_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7043:2: rule__ContextVariable__TypeAssignment_0
+            // InternalCheck.g:7043:1: ( rule__ContextVariable__TypeAssignment_0 )
+            // InternalCheck.g:7043:2: rule__ContextVariable__TypeAssignment_0
             {
-            pushFollow(FOLLOW_rule__ContextVariable__TypeAssignment_0_in_rule__ContextVariable__Group__0__Impl14906);
+            pushFollow(FOLLOW_2);
             rule__ContextVariable__TypeAssignment_0();
 
             state._fsp--;
@@ -21867,16 +21867,16 @@ public final void rule__ContextVariable__Group__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__ContextVariable__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7053:1: rule__ContextVariable__Group__1 : rule__ContextVariable__Group__1__Impl ;
+    // InternalCheck.g:7053:1: rule__ContextVariable__Group__1 : rule__ContextVariable__Group__1__Impl ;
     public final void rule__ContextVariable__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7057:1: ( rule__ContextVariable__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7058:2: rule__ContextVariable__Group__1__Impl
+            // InternalCheck.g:7057:1: ( rule__ContextVariable__Group__1__Impl )
+            // InternalCheck.g:7058:2: rule__ContextVariable__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__ContextVariable__Group__1__Impl_in_rule__ContextVariable__Group__114936);
+            pushFollow(FOLLOW_2);
             rule__ContextVariable__Group__1__Impl();
 
             state._fsp--;
@@ -21900,22 +21900,22 @@ public final void rule__ContextVariable__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__ContextVariable__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7064:1: rule__ContextVariable__Group__1__Impl : ( ( rule__ContextVariable__NameAssignment_1 )? ) ;
+    // InternalCheck.g:7064:1: rule__ContextVariable__Group__1__Impl : ( ( rule__ContextVariable__NameAssignment_1 )? ) ;
     public final void rule__ContextVariable__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7068:1: ( ( ( rule__ContextVariable__NameAssignment_1 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7069:1: ( ( rule__ContextVariable__NameAssignment_1 )? )
+            // InternalCheck.g:7068:1: ( ( ( rule__ContextVariable__NameAssignment_1 )? ) )
+            // InternalCheck.g:7069:1: ( ( rule__ContextVariable__NameAssignment_1 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7069:1: ( ( rule__ContextVariable__NameAssignment_1 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7070:1: ( rule__ContextVariable__NameAssignment_1 )?
+            // InternalCheck.g:7069:1: ( ( rule__ContextVariable__NameAssignment_1 )? )
+            // InternalCheck.g:7070:1: ( rule__ContextVariable__NameAssignment_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getContextVariableAccess().getNameAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7071:1: ( rule__ContextVariable__NameAssignment_1 )?
+            // InternalCheck.g:7071:1: ( rule__ContextVariable__NameAssignment_1 )?
             int alt73=2;
             int LA73_0 = input.LA(1);
 
@@ -21924,9 +21924,9 @@ public final void rule__ContextVariable__Group__1__Impl() throws RecognitionExce
             }
             switch (alt73) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7071:2: rule__ContextVariable__NameAssignment_1
+                    // InternalCheck.g:7071:2: rule__ContextVariable__NameAssignment_1
                     {
-                    pushFollow(FOLLOW_rule__ContextVariable__NameAssignment_1_in_rule__ContextVariable__Group__1__Impl14963);
+                    pushFollow(FOLLOW_2);
                     rule__ContextVariable__NameAssignment_1();
 
                     state._fsp--;
@@ -21962,21 +21962,21 @@ public final void rule__ContextVariable__Group__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XGuardExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7085:1: rule__XGuardExpression__Group__0 : rule__XGuardExpression__Group__0__Impl rule__XGuardExpression__Group__1 ;
+    // InternalCheck.g:7085:1: rule__XGuardExpression__Group__0 : rule__XGuardExpression__Group__0__Impl rule__XGuardExpression__Group__1 ;
     public final void rule__XGuardExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7089:1: ( rule__XGuardExpression__Group__0__Impl rule__XGuardExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7090:2: rule__XGuardExpression__Group__0__Impl rule__XGuardExpression__Group__1
+            // InternalCheck.g:7089:1: ( rule__XGuardExpression__Group__0__Impl rule__XGuardExpression__Group__1 )
+            // InternalCheck.g:7090:2: rule__XGuardExpression__Group__0__Impl rule__XGuardExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XGuardExpression__Group__0__Impl_in_rule__XGuardExpression__Group__014998);
+            pushFollow(FOLLOW_40);
             rule__XGuardExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XGuardExpression__Group__1_in_rule__XGuardExpression__Group__015001);
+            pushFollow(FOLLOW_2);
             rule__XGuardExpression__Group__1();
 
             state._fsp--;
@@ -22000,23 +22000,23 @@ public final void rule__XGuardExpression__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XGuardExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7097:1: rule__XGuardExpression__Group__0__Impl : ( () ) ;
+    // InternalCheck.g:7097:1: rule__XGuardExpression__Group__0__Impl : ( () ) ;
     public final void rule__XGuardExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7101:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7102:1: ( () )
+            // InternalCheck.g:7101:1: ( ( () ) )
+            // InternalCheck.g:7102:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7102:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7103:1: ()
+            // InternalCheck.g:7102:1: ( () )
+            // InternalCheck.g:7103:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXGuardExpressionAccess().getXGuardExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7104:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7106:1: 
+            // InternalCheck.g:7104:1: ()
+            // InternalCheck.g:7106:1: 
             {
             }
 
@@ -22041,21 +22041,21 @@ public final void rule__XGuardExpression__Group__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XGuardExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7116:1: rule__XGuardExpression__Group__1 : rule__XGuardExpression__Group__1__Impl rule__XGuardExpression__Group__2 ;
+    // InternalCheck.g:7116:1: rule__XGuardExpression__Group__1 : rule__XGuardExpression__Group__1__Impl rule__XGuardExpression__Group__2 ;
     public final void rule__XGuardExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7120:1: ( rule__XGuardExpression__Group__1__Impl rule__XGuardExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7121:2: rule__XGuardExpression__Group__1__Impl rule__XGuardExpression__Group__2
+            // InternalCheck.g:7120:1: ( rule__XGuardExpression__Group__1__Impl rule__XGuardExpression__Group__2 )
+            // InternalCheck.g:7121:2: rule__XGuardExpression__Group__1__Impl rule__XGuardExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XGuardExpression__Group__1__Impl_in_rule__XGuardExpression__Group__115059);
+            pushFollow(FOLLOW_32);
             rule__XGuardExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XGuardExpression__Group__2_in_rule__XGuardExpression__Group__115062);
+            pushFollow(FOLLOW_2);
             rule__XGuardExpression__Group__2();
 
             state._fsp--;
@@ -22079,22 +22079,22 @@ public final void rule__XGuardExpression__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XGuardExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7128:1: rule__XGuardExpression__Group__1__Impl : ( 'guard' ) ;
+    // InternalCheck.g:7128:1: rule__XGuardExpression__Group__1__Impl : ( 'guard' ) ;
     public final void rule__XGuardExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7132:1: ( ( 'guard' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7133:1: ( 'guard' )
+            // InternalCheck.g:7132:1: ( ( 'guard' ) )
+            // InternalCheck.g:7133:1: ( 'guard' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7133:1: ( 'guard' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7134:1: 'guard'
+            // InternalCheck.g:7133:1: ( 'guard' )
+            // InternalCheck.g:7134:1: 'guard'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXGuardExpressionAccess().getGuardKeyword_1()); 
             }
-            match(input,80,FOLLOW_80_in_rule__XGuardExpression__Group__1__Impl15090); if (state.failed) return ;
+            match(input,80,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXGuardExpressionAccess().getGuardKeyword_1()); 
             }
@@ -22120,16 +22120,16 @@ public final void rule__XGuardExpression__Group__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XGuardExpression__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7147:1: rule__XGuardExpression__Group__2 : rule__XGuardExpression__Group__2__Impl ;
+    // InternalCheck.g:7147:1: rule__XGuardExpression__Group__2 : rule__XGuardExpression__Group__2__Impl ;
     public final void rule__XGuardExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7151:1: ( rule__XGuardExpression__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7152:2: rule__XGuardExpression__Group__2__Impl
+            // InternalCheck.g:7151:1: ( rule__XGuardExpression__Group__2__Impl )
+            // InternalCheck.g:7152:2: rule__XGuardExpression__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__XGuardExpression__Group__2__Impl_in_rule__XGuardExpression__Group__215121);
+            pushFollow(FOLLOW_2);
             rule__XGuardExpression__Group__2__Impl();
 
             state._fsp--;
@@ -22153,25 +22153,25 @@ public final void rule__XGuardExpression__Group__2() throws RecognitionException
 
 
     // $ANTLR start "rule__XGuardExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7158:1: rule__XGuardExpression__Group__2__Impl : ( ( rule__XGuardExpression__GuardAssignment_2 ) ) ;
+    // InternalCheck.g:7158:1: rule__XGuardExpression__Group__2__Impl : ( ( rule__XGuardExpression__GuardAssignment_2 ) ) ;
     public final void rule__XGuardExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7162:1: ( ( ( rule__XGuardExpression__GuardAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7163:1: ( ( rule__XGuardExpression__GuardAssignment_2 ) )
+            // InternalCheck.g:7162:1: ( ( ( rule__XGuardExpression__GuardAssignment_2 ) ) )
+            // InternalCheck.g:7163:1: ( ( rule__XGuardExpression__GuardAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7163:1: ( ( rule__XGuardExpression__GuardAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7164:1: ( rule__XGuardExpression__GuardAssignment_2 )
+            // InternalCheck.g:7163:1: ( ( rule__XGuardExpression__GuardAssignment_2 ) )
+            // InternalCheck.g:7164:1: ( rule__XGuardExpression__GuardAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXGuardExpressionAccess().getGuardAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7165:1: ( rule__XGuardExpression__GuardAssignment_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7165:2: rule__XGuardExpression__GuardAssignment_2
+            // InternalCheck.g:7165:1: ( rule__XGuardExpression__GuardAssignment_2 )
+            // InternalCheck.g:7165:2: rule__XGuardExpression__GuardAssignment_2
             {
-            pushFollow(FOLLOW_rule__XGuardExpression__GuardAssignment_2_in_rule__XGuardExpression__Group__2__Impl15148);
+            pushFollow(FOLLOW_2);
             rule__XGuardExpression__GuardAssignment_2();
 
             state._fsp--;
@@ -22204,21 +22204,21 @@ public final void rule__XGuardExpression__Group__2__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XIssueExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7181:1: rule__XIssueExpression__Group__0 : rule__XIssueExpression__Group__0__Impl rule__XIssueExpression__Group__1 ;
+    // InternalCheck.g:7181:1: rule__XIssueExpression__Group__0 : rule__XIssueExpression__Group__0__Impl rule__XIssueExpression__Group__1 ;
     public final void rule__XIssueExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7185:1: ( rule__XIssueExpression__Group__0__Impl rule__XIssueExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7186:2: rule__XIssueExpression__Group__0__Impl rule__XIssueExpression__Group__1
+            // InternalCheck.g:7185:1: ( rule__XIssueExpression__Group__0__Impl rule__XIssueExpression__Group__1 )
+            // InternalCheck.g:7186:2: rule__XIssueExpression__Group__0__Impl rule__XIssueExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group__0__Impl_in_rule__XIssueExpression__Group__015184);
+            pushFollow(FOLLOW_32);
             rule__XIssueExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group__1_in_rule__XIssueExpression__Group__015187);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__Group__1();
 
             state._fsp--;
@@ -22242,23 +22242,23 @@ public final void rule__XIssueExpression__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XIssueExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7193:1: rule__XIssueExpression__Group__0__Impl : ( () ) ;
+    // InternalCheck.g:7193:1: rule__XIssueExpression__Group__0__Impl : ( () ) ;
     public final void rule__XIssueExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7197:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7198:1: ( () )
+            // InternalCheck.g:7197:1: ( ( () ) )
+            // InternalCheck.g:7198:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7198:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7199:1: ()
+            // InternalCheck.g:7198:1: ( () )
+            // InternalCheck.g:7199:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getXIssueExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7200:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7202:1: 
+            // InternalCheck.g:7200:1: ()
+            // InternalCheck.g:7202:1: 
             {
             }
 
@@ -22283,21 +22283,21 @@ public final void rule__XIssueExpression__Group__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XIssueExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7212:1: rule__XIssueExpression__Group__1 : rule__XIssueExpression__Group__1__Impl rule__XIssueExpression__Group__2 ;
+    // InternalCheck.g:7212:1: rule__XIssueExpression__Group__1 : rule__XIssueExpression__Group__1__Impl rule__XIssueExpression__Group__2 ;
     public final void rule__XIssueExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7216:1: ( rule__XIssueExpression__Group__1__Impl rule__XIssueExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7217:2: rule__XIssueExpression__Group__1__Impl rule__XIssueExpression__Group__2
+            // InternalCheck.g:7216:1: ( rule__XIssueExpression__Group__1__Impl rule__XIssueExpression__Group__2 )
+            // InternalCheck.g:7217:2: rule__XIssueExpression__Group__1__Impl rule__XIssueExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group__1__Impl_in_rule__XIssueExpression__Group__115245);
+            pushFollow(FOLLOW_41);
             rule__XIssueExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group__2_in_rule__XIssueExpression__Group__115248);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__Group__2();
 
             state._fsp--;
@@ -22321,22 +22321,22 @@ public final void rule__XIssueExpression__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XIssueExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7224:1: rule__XIssueExpression__Group__1__Impl : ( 'issue' ) ;
+    // InternalCheck.g:7224:1: rule__XIssueExpression__Group__1__Impl : ( 'issue' ) ;
     public final void rule__XIssueExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7228:1: ( ( 'issue' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7229:1: ( 'issue' )
+            // InternalCheck.g:7228:1: ( ( 'issue' ) )
+            // InternalCheck.g:7229:1: ( 'issue' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7229:1: ( 'issue' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7230:1: 'issue'
+            // InternalCheck.g:7229:1: ( 'issue' )
+            // InternalCheck.g:7230:1: 'issue'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getIssueKeyword_1()); 
             }
-            match(input,81,FOLLOW_81_in_rule__XIssueExpression__Group__1__Impl15276); if (state.failed) return ;
+            match(input,81,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXIssueExpressionAccess().getIssueKeyword_1()); 
             }
@@ -22362,21 +22362,21 @@ public final void rule__XIssueExpression__Group__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XIssueExpression__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7243:1: rule__XIssueExpression__Group__2 : rule__XIssueExpression__Group__2__Impl rule__XIssueExpression__Group__3 ;
+    // InternalCheck.g:7243:1: rule__XIssueExpression__Group__2 : rule__XIssueExpression__Group__2__Impl rule__XIssueExpression__Group__3 ;
     public final void rule__XIssueExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7247:1: ( rule__XIssueExpression__Group__2__Impl rule__XIssueExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7248:2: rule__XIssueExpression__Group__2__Impl rule__XIssueExpression__Group__3
+            // InternalCheck.g:7247:1: ( rule__XIssueExpression__Group__2__Impl rule__XIssueExpression__Group__3 )
+            // InternalCheck.g:7248:2: rule__XIssueExpression__Group__2__Impl rule__XIssueExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group__2__Impl_in_rule__XIssueExpression__Group__215307);
+            pushFollow(FOLLOW_41);
             rule__XIssueExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group__3_in_rule__XIssueExpression__Group__215310);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__Group__3();
 
             state._fsp--;
@@ -22400,22 +22400,22 @@ public final void rule__XIssueExpression__Group__2() throws RecognitionException
 
 
     // $ANTLR start "rule__XIssueExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7255:1: rule__XIssueExpression__Group__2__Impl : ( ( rule__XIssueExpression__CheckAssignment_2 )? ) ;
+    // InternalCheck.g:7255:1: rule__XIssueExpression__Group__2__Impl : ( ( rule__XIssueExpression__CheckAssignment_2 )? ) ;
     public final void rule__XIssueExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7259:1: ( ( ( rule__XIssueExpression__CheckAssignment_2 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7260:1: ( ( rule__XIssueExpression__CheckAssignment_2 )? )
+            // InternalCheck.g:7259:1: ( ( ( rule__XIssueExpression__CheckAssignment_2 )? ) )
+            // InternalCheck.g:7260:1: ( ( rule__XIssueExpression__CheckAssignment_2 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7260:1: ( ( rule__XIssueExpression__CheckAssignment_2 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7261:1: ( rule__XIssueExpression__CheckAssignment_2 )?
+            // InternalCheck.g:7260:1: ( ( rule__XIssueExpression__CheckAssignment_2 )? )
+            // InternalCheck.g:7261:1: ( rule__XIssueExpression__CheckAssignment_2 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getCheckAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7262:1: ( rule__XIssueExpression__CheckAssignment_2 )?
+            // InternalCheck.g:7262:1: ( rule__XIssueExpression__CheckAssignment_2 )?
             int alt74=2;
             int LA74_0 = input.LA(1);
 
@@ -22428,9 +22428,9 @@ public final void rule__XIssueExpression__Group__2__Impl() throws RecognitionExc
             }
             switch (alt74) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7262:2: rule__XIssueExpression__CheckAssignment_2
+                    // InternalCheck.g:7262:2: rule__XIssueExpression__CheckAssignment_2
                     {
-                    pushFollow(FOLLOW_rule__XIssueExpression__CheckAssignment_2_in_rule__XIssueExpression__Group__2__Impl15337);
+                    pushFollow(FOLLOW_2);
                     rule__XIssueExpression__CheckAssignment_2();
 
                     state._fsp--;
@@ -22466,21 +22466,21 @@ public final void rule__XIssueExpression__Group__2__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XIssueExpression__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7272:1: rule__XIssueExpression__Group__3 : rule__XIssueExpression__Group__3__Impl rule__XIssueExpression__Group__4 ;
+    // InternalCheck.g:7272:1: rule__XIssueExpression__Group__3 : rule__XIssueExpression__Group__3__Impl rule__XIssueExpression__Group__4 ;
     public final void rule__XIssueExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7276:1: ( rule__XIssueExpression__Group__3__Impl rule__XIssueExpression__Group__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7277:2: rule__XIssueExpression__Group__3__Impl rule__XIssueExpression__Group__4
+            // InternalCheck.g:7276:1: ( rule__XIssueExpression__Group__3__Impl rule__XIssueExpression__Group__4 )
+            // InternalCheck.g:7277:2: rule__XIssueExpression__Group__3__Impl rule__XIssueExpression__Group__4
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group__3__Impl_in_rule__XIssueExpression__Group__315368);
+            pushFollow(FOLLOW_41);
             rule__XIssueExpression__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group__4_in_rule__XIssueExpression__Group__315371);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__Group__4();
 
             state._fsp--;
@@ -22504,29 +22504,29 @@ public final void rule__XIssueExpression__Group__3() throws RecognitionException
 
 
     // $ANTLR start "rule__XIssueExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7284:1: rule__XIssueExpression__Group__3__Impl : ( ( rule__XIssueExpression__Group_3__0 )? ) ;
+    // InternalCheck.g:7284:1: rule__XIssueExpression__Group__3__Impl : ( ( rule__XIssueExpression__Group_3__0 )? ) ;
     public final void rule__XIssueExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7288:1: ( ( ( rule__XIssueExpression__Group_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7289:1: ( ( rule__XIssueExpression__Group_3__0 )? )
+            // InternalCheck.g:7288:1: ( ( ( rule__XIssueExpression__Group_3__0 )? ) )
+            // InternalCheck.g:7289:1: ( ( rule__XIssueExpression__Group_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7289:1: ( ( rule__XIssueExpression__Group_3__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7290:1: ( rule__XIssueExpression__Group_3__0 )?
+            // InternalCheck.g:7289:1: ( ( rule__XIssueExpression__Group_3__0 )? )
+            // InternalCheck.g:7290:1: ( rule__XIssueExpression__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getGroup_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7291:1: ( rule__XIssueExpression__Group_3__0 )?
+            // InternalCheck.g:7291:1: ( rule__XIssueExpression__Group_3__0 )?
             int alt75=2;
             alt75 = dfa75.predict(input);
             switch (alt75) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7291:2: rule__XIssueExpression__Group_3__0
+                    // InternalCheck.g:7291:2: rule__XIssueExpression__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__XIssueExpression__Group_3__0_in_rule__XIssueExpression__Group__3__Impl15398);
+                    pushFollow(FOLLOW_2);
                     rule__XIssueExpression__Group_3__0();
 
                     state._fsp--;
@@ -22562,21 +22562,21 @@ public final void rule__XIssueExpression__Group__3__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XIssueExpression__Group__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7301:1: rule__XIssueExpression__Group__4 : rule__XIssueExpression__Group__4__Impl rule__XIssueExpression__Group__5 ;
+    // InternalCheck.g:7301:1: rule__XIssueExpression__Group__4 : rule__XIssueExpression__Group__4__Impl rule__XIssueExpression__Group__5 ;
     public final void rule__XIssueExpression__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7305:1: ( rule__XIssueExpression__Group__4__Impl rule__XIssueExpression__Group__5 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7306:2: rule__XIssueExpression__Group__4__Impl rule__XIssueExpression__Group__5
+            // InternalCheck.g:7305:1: ( rule__XIssueExpression__Group__4__Impl rule__XIssueExpression__Group__5 )
+            // InternalCheck.g:7306:2: rule__XIssueExpression__Group__4__Impl rule__XIssueExpression__Group__5
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group__4__Impl_in_rule__XIssueExpression__Group__415429);
+            pushFollow(FOLLOW_41);
             rule__XIssueExpression__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group__5_in_rule__XIssueExpression__Group__415432);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__Group__5();
 
             state._fsp--;
@@ -22600,22 +22600,22 @@ public final void rule__XIssueExpression__Group__4() throws RecognitionException
 
 
     // $ANTLR start "rule__XIssueExpression__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7313:1: rule__XIssueExpression__Group__4__Impl : ( ( rule__XIssueExpression__Group_4__0 )? ) ;
+    // InternalCheck.g:7313:1: rule__XIssueExpression__Group__4__Impl : ( ( rule__XIssueExpression__Group_4__0 )? ) ;
     public final void rule__XIssueExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7317:1: ( ( ( rule__XIssueExpression__Group_4__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7318:1: ( ( rule__XIssueExpression__Group_4__0 )? )
+            // InternalCheck.g:7317:1: ( ( ( rule__XIssueExpression__Group_4__0 )? ) )
+            // InternalCheck.g:7318:1: ( ( rule__XIssueExpression__Group_4__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7318:1: ( ( rule__XIssueExpression__Group_4__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7319:1: ( rule__XIssueExpression__Group_4__0 )?
+            // InternalCheck.g:7318:1: ( ( rule__XIssueExpression__Group_4__0 )? )
+            // InternalCheck.g:7319:1: ( rule__XIssueExpression__Group_4__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getGroup_4()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7320:1: ( rule__XIssueExpression__Group_4__0 )?
+            // InternalCheck.g:7320:1: ( rule__XIssueExpression__Group_4__0 )?
             int alt76=2;
             int LA76_0 = input.LA(1);
 
@@ -22628,9 +22628,9 @@ public final void rule__XIssueExpression__Group__4__Impl() throws RecognitionExc
             }
             switch (alt76) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7320:2: rule__XIssueExpression__Group_4__0
+                    // InternalCheck.g:7320:2: rule__XIssueExpression__Group_4__0
                     {
-                    pushFollow(FOLLOW_rule__XIssueExpression__Group_4__0_in_rule__XIssueExpression__Group__4__Impl15459);
+                    pushFollow(FOLLOW_2);
                     rule__XIssueExpression__Group_4__0();
 
                     state._fsp--;
@@ -22666,21 +22666,21 @@ public final void rule__XIssueExpression__Group__4__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XIssueExpression__Group__5"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7330:1: rule__XIssueExpression__Group__5 : rule__XIssueExpression__Group__5__Impl rule__XIssueExpression__Group__6 ;
+    // InternalCheck.g:7330:1: rule__XIssueExpression__Group__5 : rule__XIssueExpression__Group__5__Impl rule__XIssueExpression__Group__6 ;
     public final void rule__XIssueExpression__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7334:1: ( rule__XIssueExpression__Group__5__Impl rule__XIssueExpression__Group__6 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7335:2: rule__XIssueExpression__Group__5__Impl rule__XIssueExpression__Group__6
+            // InternalCheck.g:7334:1: ( rule__XIssueExpression__Group__5__Impl rule__XIssueExpression__Group__6 )
+            // InternalCheck.g:7335:2: rule__XIssueExpression__Group__5__Impl rule__XIssueExpression__Group__6
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group__5__Impl_in_rule__XIssueExpression__Group__515490);
+            pushFollow(FOLLOW_41);
             rule__XIssueExpression__Group__5__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group__6_in_rule__XIssueExpression__Group__515493);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__Group__6();
 
             state._fsp--;
@@ -22704,22 +22704,22 @@ public final void rule__XIssueExpression__Group__5() throws RecognitionException
 
 
     // $ANTLR start "rule__XIssueExpression__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7342:1: rule__XIssueExpression__Group__5__Impl : ( ( rule__XIssueExpression__Group_5__0 )? ) ;
+    // InternalCheck.g:7342:1: rule__XIssueExpression__Group__5__Impl : ( ( rule__XIssueExpression__Group_5__0 )? ) ;
     public final void rule__XIssueExpression__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7346:1: ( ( ( rule__XIssueExpression__Group_5__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7347:1: ( ( rule__XIssueExpression__Group_5__0 )? )
+            // InternalCheck.g:7346:1: ( ( ( rule__XIssueExpression__Group_5__0 )? ) )
+            // InternalCheck.g:7347:1: ( ( rule__XIssueExpression__Group_5__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7347:1: ( ( rule__XIssueExpression__Group_5__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7348:1: ( rule__XIssueExpression__Group_5__0 )?
+            // InternalCheck.g:7347:1: ( ( rule__XIssueExpression__Group_5__0 )? )
+            // InternalCheck.g:7348:1: ( rule__XIssueExpression__Group_5__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getGroup_5()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7349:1: ( rule__XIssueExpression__Group_5__0 )?
+            // InternalCheck.g:7349:1: ( rule__XIssueExpression__Group_5__0 )?
             int alt77=2;
             int LA77_0 = input.LA(1);
 
@@ -22732,9 +22732,9 @@ public final void rule__XIssueExpression__Group__5__Impl() throws RecognitionExc
             }
             switch (alt77) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7349:2: rule__XIssueExpression__Group_5__0
+                    // InternalCheck.g:7349:2: rule__XIssueExpression__Group_5__0
                     {
-                    pushFollow(FOLLOW_rule__XIssueExpression__Group_5__0_in_rule__XIssueExpression__Group__5__Impl15520);
+                    pushFollow(FOLLOW_2);
                     rule__XIssueExpression__Group_5__0();
 
                     state._fsp--;
@@ -22770,16 +22770,16 @@ public final void rule__XIssueExpression__Group__5__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XIssueExpression__Group__6"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7359:1: rule__XIssueExpression__Group__6 : rule__XIssueExpression__Group__6__Impl ;
+    // InternalCheck.g:7359:1: rule__XIssueExpression__Group__6 : rule__XIssueExpression__Group__6__Impl ;
     public final void rule__XIssueExpression__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7363:1: ( rule__XIssueExpression__Group__6__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7364:2: rule__XIssueExpression__Group__6__Impl
+            // InternalCheck.g:7363:1: ( rule__XIssueExpression__Group__6__Impl )
+            // InternalCheck.g:7364:2: rule__XIssueExpression__Group__6__Impl
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group__6__Impl_in_rule__XIssueExpression__Group__615551);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__Group__6__Impl();
 
             state._fsp--;
@@ -22803,22 +22803,22 @@ public final void rule__XIssueExpression__Group__6() throws RecognitionException
 
 
     // $ANTLR start "rule__XIssueExpression__Group__6__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7370:1: rule__XIssueExpression__Group__6__Impl : ( ( rule__XIssueExpression__Group_6__0 )? ) ;
+    // InternalCheck.g:7370:1: rule__XIssueExpression__Group__6__Impl : ( ( rule__XIssueExpression__Group_6__0 )? ) ;
     public final void rule__XIssueExpression__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7374:1: ( ( ( rule__XIssueExpression__Group_6__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7375:1: ( ( rule__XIssueExpression__Group_6__0 )? )
+            // InternalCheck.g:7374:1: ( ( ( rule__XIssueExpression__Group_6__0 )? ) )
+            // InternalCheck.g:7375:1: ( ( rule__XIssueExpression__Group_6__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7375:1: ( ( rule__XIssueExpression__Group_6__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7376:1: ( rule__XIssueExpression__Group_6__0 )?
+            // InternalCheck.g:7375:1: ( ( rule__XIssueExpression__Group_6__0 )? )
+            // InternalCheck.g:7376:1: ( rule__XIssueExpression__Group_6__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getGroup_6()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7377:1: ( rule__XIssueExpression__Group_6__0 )?
+            // InternalCheck.g:7377:1: ( rule__XIssueExpression__Group_6__0 )?
             int alt78=2;
             int LA78_0 = input.LA(1);
 
@@ -22831,9 +22831,9 @@ public final void rule__XIssueExpression__Group__6__Impl() throws RecognitionExc
             }
             switch (alt78) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7377:2: rule__XIssueExpression__Group_6__0
+                    // InternalCheck.g:7377:2: rule__XIssueExpression__Group_6__0
                     {
-                    pushFollow(FOLLOW_rule__XIssueExpression__Group_6__0_in_rule__XIssueExpression__Group__6__Impl15578);
+                    pushFollow(FOLLOW_2);
                     rule__XIssueExpression__Group_6__0();
 
                     state._fsp--;
@@ -22869,21 +22869,21 @@ public final void rule__XIssueExpression__Group__6__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7401:1: rule__XIssueExpression__Group_3__0 : rule__XIssueExpression__Group_3__0__Impl rule__XIssueExpression__Group_3__1 ;
+    // InternalCheck.g:7401:1: rule__XIssueExpression__Group_3__0 : rule__XIssueExpression__Group_3__0__Impl rule__XIssueExpression__Group_3__1 ;
     public final void rule__XIssueExpression__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7405:1: ( rule__XIssueExpression__Group_3__0__Impl rule__XIssueExpression__Group_3__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7406:2: rule__XIssueExpression__Group_3__0__Impl rule__XIssueExpression__Group_3__1
+            // InternalCheck.g:7405:1: ( rule__XIssueExpression__Group_3__0__Impl rule__XIssueExpression__Group_3__1 )
+            // InternalCheck.g:7406:2: rule__XIssueExpression__Group_3__0__Impl rule__XIssueExpression__Group_3__1
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_3__0__Impl_in_rule__XIssueExpression__Group_3__015623);
+            pushFollow(FOLLOW_32);
             rule__XIssueExpression__Group_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_3__1_in_rule__XIssueExpression__Group_3__015626);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__Group_3__1();
 
             state._fsp--;
@@ -22907,25 +22907,25 @@ public final void rule__XIssueExpression__Group_3__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7413:1: rule__XIssueExpression__Group_3__0__Impl : ( ( 'on' ) ) ;
+    // InternalCheck.g:7413:1: rule__XIssueExpression__Group_3__0__Impl : ( ( 'on' ) ) ;
     public final void rule__XIssueExpression__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7417:1: ( ( ( 'on' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7418:1: ( ( 'on' ) )
+            // InternalCheck.g:7417:1: ( ( ( 'on' ) ) )
+            // InternalCheck.g:7418:1: ( ( 'on' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7418:1: ( ( 'on' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7419:1: ( 'on' )
+            // InternalCheck.g:7418:1: ( ( 'on' ) )
+            // InternalCheck.g:7419:1: ( 'on' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getOnKeyword_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7420:1: ( 'on' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7421:2: 'on'
+            // InternalCheck.g:7420:1: ( 'on' )
+            // InternalCheck.g:7421:2: 'on'
             {
-            match(input,25,FOLLOW_25_in_rule__XIssueExpression__Group_3__0__Impl15655); if (state.failed) return ;
+            match(input,25,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -22954,21 +22954,21 @@ public final void rule__XIssueExpression__Group_3__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7432:1: rule__XIssueExpression__Group_3__1 : rule__XIssueExpression__Group_3__1__Impl rule__XIssueExpression__Group_3__2 ;
+    // InternalCheck.g:7432:1: rule__XIssueExpression__Group_3__1 : rule__XIssueExpression__Group_3__1__Impl rule__XIssueExpression__Group_3__2 ;
     public final void rule__XIssueExpression__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7436:1: ( rule__XIssueExpression__Group_3__1__Impl rule__XIssueExpression__Group_3__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7437:2: rule__XIssueExpression__Group_3__1__Impl rule__XIssueExpression__Group_3__2
+            // InternalCheck.g:7436:1: ( rule__XIssueExpression__Group_3__1__Impl rule__XIssueExpression__Group_3__2 )
+            // InternalCheck.g:7437:2: rule__XIssueExpression__Group_3__1__Impl rule__XIssueExpression__Group_3__2
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_3__1__Impl_in_rule__XIssueExpression__Group_3__115687);
+            pushFollow(FOLLOW_38);
             rule__XIssueExpression__Group_3__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_3__2_in_rule__XIssueExpression__Group_3__115690);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__Group_3__2();
 
             state._fsp--;
@@ -22992,25 +22992,25 @@ public final void rule__XIssueExpression__Group_3__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7444:1: rule__XIssueExpression__Group_3__1__Impl : ( ( rule__XIssueExpression__Alternatives_3_1 ) ) ;
+    // InternalCheck.g:7444:1: rule__XIssueExpression__Group_3__1__Impl : ( ( rule__XIssueExpression__Alternatives_3_1 ) ) ;
     public final void rule__XIssueExpression__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7448:1: ( ( ( rule__XIssueExpression__Alternatives_3_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7449:1: ( ( rule__XIssueExpression__Alternatives_3_1 ) )
+            // InternalCheck.g:7448:1: ( ( ( rule__XIssueExpression__Alternatives_3_1 ) ) )
+            // InternalCheck.g:7449:1: ( ( rule__XIssueExpression__Alternatives_3_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7449:1: ( ( rule__XIssueExpression__Alternatives_3_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7450:1: ( rule__XIssueExpression__Alternatives_3_1 )
+            // InternalCheck.g:7449:1: ( ( rule__XIssueExpression__Alternatives_3_1 ) )
+            // InternalCheck.g:7450:1: ( rule__XIssueExpression__Alternatives_3_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getAlternatives_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7451:1: ( rule__XIssueExpression__Alternatives_3_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7451:2: rule__XIssueExpression__Alternatives_3_1
+            // InternalCheck.g:7451:1: ( rule__XIssueExpression__Alternatives_3_1 )
+            // InternalCheck.g:7451:2: rule__XIssueExpression__Alternatives_3_1
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Alternatives_3_1_in_rule__XIssueExpression__Group_3__1__Impl15717);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__Alternatives_3_1();
 
             state._fsp--;
@@ -23043,16 +23043,16 @@ public final void rule__XIssueExpression__Group_3__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7461:1: rule__XIssueExpression__Group_3__2 : rule__XIssueExpression__Group_3__2__Impl ;
+    // InternalCheck.g:7461:1: rule__XIssueExpression__Group_3__2 : rule__XIssueExpression__Group_3__2__Impl ;
     public final void rule__XIssueExpression__Group_3__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7465:1: ( rule__XIssueExpression__Group_3__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7466:2: rule__XIssueExpression__Group_3__2__Impl
+            // InternalCheck.g:7465:1: ( rule__XIssueExpression__Group_3__2__Impl )
+            // InternalCheck.g:7466:2: rule__XIssueExpression__Group_3__2__Impl
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_3__2__Impl_in_rule__XIssueExpression__Group_3__215747);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__Group_3__2__Impl();
 
             state._fsp--;
@@ -23076,22 +23076,22 @@ public final void rule__XIssueExpression__Group_3__2() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7472:1: rule__XIssueExpression__Group_3__2__Impl : ( ( rule__XIssueExpression__Group_3_2__0 )? ) ;
+    // InternalCheck.g:7472:1: rule__XIssueExpression__Group_3__2__Impl : ( ( rule__XIssueExpression__Group_3_2__0 )? ) ;
     public final void rule__XIssueExpression__Group_3__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7476:1: ( ( ( rule__XIssueExpression__Group_3_2__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7477:1: ( ( rule__XIssueExpression__Group_3_2__0 )? )
+            // InternalCheck.g:7476:1: ( ( ( rule__XIssueExpression__Group_3_2__0 )? ) )
+            // InternalCheck.g:7477:1: ( ( rule__XIssueExpression__Group_3_2__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7477:1: ( ( rule__XIssueExpression__Group_3_2__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7478:1: ( rule__XIssueExpression__Group_3_2__0 )?
+            // InternalCheck.g:7477:1: ( ( rule__XIssueExpression__Group_3_2__0 )? )
+            // InternalCheck.g:7478:1: ( rule__XIssueExpression__Group_3_2__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getGroup_3_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7479:1: ( rule__XIssueExpression__Group_3_2__0 )?
+            // InternalCheck.g:7479:1: ( rule__XIssueExpression__Group_3_2__0 )?
             int alt79=2;
             int LA79_0 = input.LA(1);
 
@@ -23104,9 +23104,9 @@ public final void rule__XIssueExpression__Group_3__2__Impl() throws RecognitionE
             }
             switch (alt79) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7479:2: rule__XIssueExpression__Group_3_2__0
+                    // InternalCheck.g:7479:2: rule__XIssueExpression__Group_3_2__0
                     {
-                    pushFollow(FOLLOW_rule__XIssueExpression__Group_3_2__0_in_rule__XIssueExpression__Group_3__2__Impl15774);
+                    pushFollow(FOLLOW_2);
                     rule__XIssueExpression__Group_3_2__0();
 
                     state._fsp--;
@@ -23142,21 +23142,21 @@ public final void rule__XIssueExpression__Group_3__2__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3_1_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7495:1: rule__XIssueExpression__Group_3_1_0__0 : rule__XIssueExpression__Group_3_1_0__0__Impl rule__XIssueExpression__Group_3_1_0__1 ;
+    // InternalCheck.g:7495:1: rule__XIssueExpression__Group_3_1_0__0 : rule__XIssueExpression__Group_3_1_0__0__Impl rule__XIssueExpression__Group_3_1_0__1 ;
     public final void rule__XIssueExpression__Group_3_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7499:1: ( rule__XIssueExpression__Group_3_1_0__0__Impl rule__XIssueExpression__Group_3_1_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7500:2: rule__XIssueExpression__Group_3_1_0__0__Impl rule__XIssueExpression__Group_3_1_0__1
+            // InternalCheck.g:7499:1: ( rule__XIssueExpression__Group_3_1_0__0__Impl rule__XIssueExpression__Group_3_1_0__1 )
+            // InternalCheck.g:7500:2: rule__XIssueExpression__Group_3_1_0__0__Impl rule__XIssueExpression__Group_3_1_0__1
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_3_1_0__0__Impl_in_rule__XIssueExpression__Group_3_1_0__015811);
+            pushFollow(FOLLOW_4);
             rule__XIssueExpression__Group_3_1_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_3_1_0__1_in_rule__XIssueExpression__Group_3_1_0__015814);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__Group_3_1_0__1();
 
             state._fsp--;
@@ -23180,25 +23180,25 @@ public final void rule__XIssueExpression__Group_3_1_0__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7507:1: rule__XIssueExpression__Group_3_1_0__0__Impl : ( ( '#' ) ) ;
+    // InternalCheck.g:7507:1: rule__XIssueExpression__Group_3_1_0__0__Impl : ( ( '#' ) ) ;
     public final void rule__XIssueExpression__Group_3_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7511:1: ( ( ( '#' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7512:1: ( ( '#' ) )
+            // InternalCheck.g:7511:1: ( ( ( '#' ) ) )
+            // InternalCheck.g:7512:1: ( ( '#' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7512:1: ( ( '#' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7513:1: ( '#' )
+            // InternalCheck.g:7512:1: ( ( '#' ) )
+            // InternalCheck.g:7513:1: ( '#' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getNumberSignKeyword_3_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7514:1: ( '#' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7515:2: '#'
+            // InternalCheck.g:7514:1: ( '#' )
+            // InternalCheck.g:7515:2: '#'
             {
-            match(input,77,FOLLOW_77_in_rule__XIssueExpression__Group_3_1_0__0__Impl15843); if (state.failed) return ;
+            match(input,77,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -23227,16 +23227,16 @@ public final void rule__XIssueExpression__Group_3_1_0__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3_1_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7526:1: rule__XIssueExpression__Group_3_1_0__1 : rule__XIssueExpression__Group_3_1_0__1__Impl ;
+    // InternalCheck.g:7526:1: rule__XIssueExpression__Group_3_1_0__1 : rule__XIssueExpression__Group_3_1_0__1__Impl ;
     public final void rule__XIssueExpression__Group_3_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7530:1: ( rule__XIssueExpression__Group_3_1_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7531:2: rule__XIssueExpression__Group_3_1_0__1__Impl
+            // InternalCheck.g:7530:1: ( rule__XIssueExpression__Group_3_1_0__1__Impl )
+            // InternalCheck.g:7531:2: rule__XIssueExpression__Group_3_1_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_3_1_0__1__Impl_in_rule__XIssueExpression__Group_3_1_0__115875);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__Group_3_1_0__1__Impl();
 
             state._fsp--;
@@ -23260,25 +23260,25 @@ public final void rule__XIssueExpression__Group_3_1_0__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3_1_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7537:1: rule__XIssueExpression__Group_3_1_0__1__Impl : ( ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1 ) ) ;
+    // InternalCheck.g:7537:1: rule__XIssueExpression__Group_3_1_0__1__Impl : ( ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1 ) ) ;
     public final void rule__XIssueExpression__Group_3_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7541:1: ( ( ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7542:1: ( ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1 ) )
+            // InternalCheck.g:7541:1: ( ( ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1 ) ) )
+            // InternalCheck.g:7542:1: ( ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7542:1: ( ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7543:1: ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1 )
+            // InternalCheck.g:7542:1: ( ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1 ) )
+            // InternalCheck.g:7543:1: ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getMarkerFeatureAssignment_3_1_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7544:1: ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7544:2: rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1
+            // InternalCheck.g:7544:1: ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1 )
+            // InternalCheck.g:7544:2: rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1_in_rule__XIssueExpression__Group_3_1_0__1__Impl15902);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1();
 
             state._fsp--;
@@ -23311,21 +23311,21 @@ public final void rule__XIssueExpression__Group_3_1_0__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3_1_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7558:1: rule__XIssueExpression__Group_3_1_1__0 : rule__XIssueExpression__Group_3_1_1__0__Impl rule__XIssueExpression__Group_3_1_1__1 ;
+    // InternalCheck.g:7558:1: rule__XIssueExpression__Group_3_1_1__0 : rule__XIssueExpression__Group_3_1_1__0__Impl rule__XIssueExpression__Group_3_1_1__1 ;
     public final void rule__XIssueExpression__Group_3_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7562:1: ( rule__XIssueExpression__Group_3_1_1__0__Impl rule__XIssueExpression__Group_3_1_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7563:2: rule__XIssueExpression__Group_3_1_1__0__Impl rule__XIssueExpression__Group_3_1_1__1
+            // InternalCheck.g:7562:1: ( rule__XIssueExpression__Group_3_1_1__0__Impl rule__XIssueExpression__Group_3_1_1__1 )
+            // InternalCheck.g:7563:2: rule__XIssueExpression__Group_3_1_1__0__Impl rule__XIssueExpression__Group_3_1_1__1
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_3_1_1__0__Impl_in_rule__XIssueExpression__Group_3_1_1__015936);
+            pushFollow(FOLLOW_42);
             rule__XIssueExpression__Group_3_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_3_1_1__1_in_rule__XIssueExpression__Group_3_1_1__015939);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__Group_3_1_1__1();
 
             state._fsp--;
@@ -23349,25 +23349,25 @@ public final void rule__XIssueExpression__Group_3_1_1__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7570:1: rule__XIssueExpression__Group_3_1_1__0__Impl : ( ( rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0 ) ) ;
+    // InternalCheck.g:7570:1: rule__XIssueExpression__Group_3_1_1__0__Impl : ( ( rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0 ) ) ;
     public final void rule__XIssueExpression__Group_3_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7574:1: ( ( ( rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7575:1: ( ( rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0 ) )
+            // InternalCheck.g:7574:1: ( ( ( rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0 ) ) )
+            // InternalCheck.g:7575:1: ( ( rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7575:1: ( ( rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7576:1: ( rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0 )
+            // InternalCheck.g:7575:1: ( ( rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0 ) )
+            // InternalCheck.g:7576:1: ( rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getMarkerObjectAssignment_3_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7577:1: ( rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7577:2: rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0
+            // InternalCheck.g:7577:1: ( rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0 )
+            // InternalCheck.g:7577:2: rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0_in_rule__XIssueExpression__Group_3_1_1__0__Impl15966);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0();
 
             state._fsp--;
@@ -23400,16 +23400,16 @@ public final void rule__XIssueExpression__Group_3_1_1__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3_1_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7587:1: rule__XIssueExpression__Group_3_1_1__1 : rule__XIssueExpression__Group_3_1_1__1__Impl ;
+    // InternalCheck.g:7587:1: rule__XIssueExpression__Group_3_1_1__1 : rule__XIssueExpression__Group_3_1_1__1__Impl ;
     public final void rule__XIssueExpression__Group_3_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7591:1: ( rule__XIssueExpression__Group_3_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7592:2: rule__XIssueExpression__Group_3_1_1__1__Impl
+            // InternalCheck.g:7591:1: ( rule__XIssueExpression__Group_3_1_1__1__Impl )
+            // InternalCheck.g:7592:2: rule__XIssueExpression__Group_3_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_3_1_1__1__Impl_in_rule__XIssueExpression__Group_3_1_1__115996);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__Group_3_1_1__1__Impl();
 
             state._fsp--;
@@ -23433,22 +23433,22 @@ public final void rule__XIssueExpression__Group_3_1_1__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7598:1: rule__XIssueExpression__Group_3_1_1__1__Impl : ( ( rule__XIssueExpression__Group_3_1_1_1__0 )? ) ;
+    // InternalCheck.g:7598:1: rule__XIssueExpression__Group_3_1_1__1__Impl : ( ( rule__XIssueExpression__Group_3_1_1_1__0 )? ) ;
     public final void rule__XIssueExpression__Group_3_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7602:1: ( ( ( rule__XIssueExpression__Group_3_1_1_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7603:1: ( ( rule__XIssueExpression__Group_3_1_1_1__0 )? )
+            // InternalCheck.g:7602:1: ( ( ( rule__XIssueExpression__Group_3_1_1_1__0 )? ) )
+            // InternalCheck.g:7603:1: ( ( rule__XIssueExpression__Group_3_1_1_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7603:1: ( ( rule__XIssueExpression__Group_3_1_1_1__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7604:1: ( rule__XIssueExpression__Group_3_1_1_1__0 )?
+            // InternalCheck.g:7603:1: ( ( rule__XIssueExpression__Group_3_1_1_1__0 )? )
+            // InternalCheck.g:7604:1: ( rule__XIssueExpression__Group_3_1_1_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getGroup_3_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7605:1: ( rule__XIssueExpression__Group_3_1_1_1__0 )?
+            // InternalCheck.g:7605:1: ( rule__XIssueExpression__Group_3_1_1_1__0 )?
             int alt80=2;
             int LA80_0 = input.LA(1);
 
@@ -23461,9 +23461,9 @@ public final void rule__XIssueExpression__Group_3_1_1__1__Impl() throws Recognit
             }
             switch (alt80) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7605:2: rule__XIssueExpression__Group_3_1_1_1__0
+                    // InternalCheck.g:7605:2: rule__XIssueExpression__Group_3_1_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__XIssueExpression__Group_3_1_1_1__0_in_rule__XIssueExpression__Group_3_1_1__1__Impl16023);
+                    pushFollow(FOLLOW_2);
                     rule__XIssueExpression__Group_3_1_1_1__0();
 
                     state._fsp--;
@@ -23499,21 +23499,21 @@ public final void rule__XIssueExpression__Group_3_1_1__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3_1_1_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7619:1: rule__XIssueExpression__Group_3_1_1_1__0 : rule__XIssueExpression__Group_3_1_1_1__0__Impl rule__XIssueExpression__Group_3_1_1_1__1 ;
+    // InternalCheck.g:7619:1: rule__XIssueExpression__Group_3_1_1_1__0 : rule__XIssueExpression__Group_3_1_1_1__0__Impl rule__XIssueExpression__Group_3_1_1_1__1 ;
     public final void rule__XIssueExpression__Group_3_1_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7623:1: ( rule__XIssueExpression__Group_3_1_1_1__0__Impl rule__XIssueExpression__Group_3_1_1_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7624:2: rule__XIssueExpression__Group_3_1_1_1__0__Impl rule__XIssueExpression__Group_3_1_1_1__1
+            // InternalCheck.g:7623:1: ( rule__XIssueExpression__Group_3_1_1_1__0__Impl rule__XIssueExpression__Group_3_1_1_1__1 )
+            // InternalCheck.g:7624:2: rule__XIssueExpression__Group_3_1_1_1__0__Impl rule__XIssueExpression__Group_3_1_1_1__1
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_3_1_1_1__0__Impl_in_rule__XIssueExpression__Group_3_1_1_1__016058);
+            pushFollow(FOLLOW_43);
             rule__XIssueExpression__Group_3_1_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_3_1_1_1__1_in_rule__XIssueExpression__Group_3_1_1_1__016061);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__Group_3_1_1_1__1();
 
             state._fsp--;
@@ -23537,25 +23537,25 @@ public final void rule__XIssueExpression__Group_3_1_1_1__0() throws RecognitionE
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3_1_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7631:1: rule__XIssueExpression__Group_3_1_1_1__0__Impl : ( ( '#' ) ) ;
+    // InternalCheck.g:7631:1: rule__XIssueExpression__Group_3_1_1_1__0__Impl : ( ( '#' ) ) ;
     public final void rule__XIssueExpression__Group_3_1_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7635:1: ( ( ( '#' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7636:1: ( ( '#' ) )
+            // InternalCheck.g:7635:1: ( ( ( '#' ) ) )
+            // InternalCheck.g:7636:1: ( ( '#' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7636:1: ( ( '#' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7637:1: ( '#' )
+            // InternalCheck.g:7636:1: ( ( '#' ) )
+            // InternalCheck.g:7637:1: ( '#' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getNumberSignKeyword_3_1_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7638:1: ( '#' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7639:2: '#'
+            // InternalCheck.g:7638:1: ( '#' )
+            // InternalCheck.g:7639:2: '#'
             {
-            match(input,77,FOLLOW_77_in_rule__XIssueExpression__Group_3_1_1_1__0__Impl16090); if (state.failed) return ;
+            match(input,77,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -23584,16 +23584,16 @@ public final void rule__XIssueExpression__Group_3_1_1_1__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3_1_1_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7650:1: rule__XIssueExpression__Group_3_1_1_1__1 : rule__XIssueExpression__Group_3_1_1_1__1__Impl ;
+    // InternalCheck.g:7650:1: rule__XIssueExpression__Group_3_1_1_1__1 : rule__XIssueExpression__Group_3_1_1_1__1__Impl ;
     public final void rule__XIssueExpression__Group_3_1_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7654:1: ( rule__XIssueExpression__Group_3_1_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7655:2: rule__XIssueExpression__Group_3_1_1_1__1__Impl
+            // InternalCheck.g:7654:1: ( rule__XIssueExpression__Group_3_1_1_1__1__Impl )
+            // InternalCheck.g:7655:2: rule__XIssueExpression__Group_3_1_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_3_1_1_1__1__Impl_in_rule__XIssueExpression__Group_3_1_1_1__116122);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__Group_3_1_1_1__1__Impl();
 
             state._fsp--;
@@ -23617,25 +23617,25 @@ public final void rule__XIssueExpression__Group_3_1_1_1__1() throws RecognitionE
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3_1_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7661:1: rule__XIssueExpression__Group_3_1_1_1__1__Impl : ( ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1 ) ) ;
+    // InternalCheck.g:7661:1: rule__XIssueExpression__Group_3_1_1_1__1__Impl : ( ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1 ) ) ;
     public final void rule__XIssueExpression__Group_3_1_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7665:1: ( ( ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7666:1: ( ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1 ) )
+            // InternalCheck.g:7665:1: ( ( ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1 ) ) )
+            // InternalCheck.g:7666:1: ( ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7666:1: ( ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7667:1: ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1 )
+            // InternalCheck.g:7666:1: ( ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1 ) )
+            // InternalCheck.g:7667:1: ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getMarkerFeatureAssignment_3_1_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7668:1: ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7668:2: rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1
+            // InternalCheck.g:7668:1: ( rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1 )
+            // InternalCheck.g:7668:2: rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1_in_rule__XIssueExpression__Group_3_1_1_1__1__Impl16149);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1();
 
             state._fsp--;
@@ -23668,21 +23668,21 @@ public final void rule__XIssueExpression__Group_3_1_1_1__1__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3_2__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7682:1: rule__XIssueExpression__Group_3_2__0 : rule__XIssueExpression__Group_3_2__0__Impl rule__XIssueExpression__Group_3_2__1 ;
+    // InternalCheck.g:7682:1: rule__XIssueExpression__Group_3_2__0 : rule__XIssueExpression__Group_3_2__0__Impl rule__XIssueExpression__Group_3_2__1 ;
     public final void rule__XIssueExpression__Group_3_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7686:1: ( rule__XIssueExpression__Group_3_2__0__Impl rule__XIssueExpression__Group_3_2__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7687:2: rule__XIssueExpression__Group_3_2__0__Impl rule__XIssueExpression__Group_3_2__1
+            // InternalCheck.g:7686:1: ( rule__XIssueExpression__Group_3_2__0__Impl rule__XIssueExpression__Group_3_2__1 )
+            // InternalCheck.g:7687:2: rule__XIssueExpression__Group_3_2__0__Impl rule__XIssueExpression__Group_3_2__1
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_3_2__0__Impl_in_rule__XIssueExpression__Group_3_2__016183);
+            pushFollow(FOLLOW_32);
             rule__XIssueExpression__Group_3_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_3_2__1_in_rule__XIssueExpression__Group_3_2__016186);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__Group_3_2__1();
 
             state._fsp--;
@@ -23706,25 +23706,25 @@ public final void rule__XIssueExpression__Group_3_2__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3_2__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7694:1: rule__XIssueExpression__Group_3_2__0__Impl : ( ( '[' ) ) ;
+    // InternalCheck.g:7694:1: rule__XIssueExpression__Group_3_2__0__Impl : ( ( '[' ) ) ;
     public final void rule__XIssueExpression__Group_3_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7698:1: ( ( ( '[' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7699:1: ( ( '[' ) )
+            // InternalCheck.g:7698:1: ( ( ( '[' ) ) )
+            // InternalCheck.g:7699:1: ( ( '[' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7699:1: ( ( '[' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7700:1: ( '[' )
+            // InternalCheck.g:7699:1: ( ( '[' ) )
+            // InternalCheck.g:7700:1: ( '[' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getLeftSquareBracketKeyword_3_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7701:1: ( '[' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7702:2: '['
+            // InternalCheck.g:7701:1: ( '[' )
+            // InternalCheck.g:7702:2: '['
             {
-            match(input,78,FOLLOW_78_in_rule__XIssueExpression__Group_3_2__0__Impl16215); if (state.failed) return ;
+            match(input,78,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -23753,21 +23753,21 @@ public final void rule__XIssueExpression__Group_3_2__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3_2__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7713:1: rule__XIssueExpression__Group_3_2__1 : rule__XIssueExpression__Group_3_2__1__Impl rule__XIssueExpression__Group_3_2__2 ;
+    // InternalCheck.g:7713:1: rule__XIssueExpression__Group_3_2__1 : rule__XIssueExpression__Group_3_2__1__Impl rule__XIssueExpression__Group_3_2__2 ;
     public final void rule__XIssueExpression__Group_3_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7717:1: ( rule__XIssueExpression__Group_3_2__1__Impl rule__XIssueExpression__Group_3_2__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7718:2: rule__XIssueExpression__Group_3_2__1__Impl rule__XIssueExpression__Group_3_2__2
+            // InternalCheck.g:7717:1: ( rule__XIssueExpression__Group_3_2__1__Impl rule__XIssueExpression__Group_3_2__2 )
+            // InternalCheck.g:7718:2: rule__XIssueExpression__Group_3_2__1__Impl rule__XIssueExpression__Group_3_2__2
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_3_2__1__Impl_in_rule__XIssueExpression__Group_3_2__116247);
+            pushFollow(FOLLOW_44);
             rule__XIssueExpression__Group_3_2__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_3_2__2_in_rule__XIssueExpression__Group_3_2__116250);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__Group_3_2__2();
 
             state._fsp--;
@@ -23791,25 +23791,25 @@ public final void rule__XIssueExpression__Group_3_2__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3_2__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7725:1: rule__XIssueExpression__Group_3_2__1__Impl : ( ( rule__XIssueExpression__MarkerIndexAssignment_3_2_1 ) ) ;
+    // InternalCheck.g:7725:1: rule__XIssueExpression__Group_3_2__1__Impl : ( ( rule__XIssueExpression__MarkerIndexAssignment_3_2_1 ) ) ;
     public final void rule__XIssueExpression__Group_3_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7729:1: ( ( ( rule__XIssueExpression__MarkerIndexAssignment_3_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7730:1: ( ( rule__XIssueExpression__MarkerIndexAssignment_3_2_1 ) )
+            // InternalCheck.g:7729:1: ( ( ( rule__XIssueExpression__MarkerIndexAssignment_3_2_1 ) ) )
+            // InternalCheck.g:7730:1: ( ( rule__XIssueExpression__MarkerIndexAssignment_3_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7730:1: ( ( rule__XIssueExpression__MarkerIndexAssignment_3_2_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7731:1: ( rule__XIssueExpression__MarkerIndexAssignment_3_2_1 )
+            // InternalCheck.g:7730:1: ( ( rule__XIssueExpression__MarkerIndexAssignment_3_2_1 ) )
+            // InternalCheck.g:7731:1: ( rule__XIssueExpression__MarkerIndexAssignment_3_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getMarkerIndexAssignment_3_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7732:1: ( rule__XIssueExpression__MarkerIndexAssignment_3_2_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7732:2: rule__XIssueExpression__MarkerIndexAssignment_3_2_1
+            // InternalCheck.g:7732:1: ( rule__XIssueExpression__MarkerIndexAssignment_3_2_1 )
+            // InternalCheck.g:7732:2: rule__XIssueExpression__MarkerIndexAssignment_3_2_1
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__MarkerIndexAssignment_3_2_1_in_rule__XIssueExpression__Group_3_2__1__Impl16277);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__MarkerIndexAssignment_3_2_1();
 
             state._fsp--;
@@ -23842,16 +23842,16 @@ public final void rule__XIssueExpression__Group_3_2__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3_2__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7742:1: rule__XIssueExpression__Group_3_2__2 : rule__XIssueExpression__Group_3_2__2__Impl ;
+    // InternalCheck.g:7742:1: rule__XIssueExpression__Group_3_2__2 : rule__XIssueExpression__Group_3_2__2__Impl ;
     public final void rule__XIssueExpression__Group_3_2__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7746:1: ( rule__XIssueExpression__Group_3_2__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7747:2: rule__XIssueExpression__Group_3_2__2__Impl
+            // InternalCheck.g:7746:1: ( rule__XIssueExpression__Group_3_2__2__Impl )
+            // InternalCheck.g:7747:2: rule__XIssueExpression__Group_3_2__2__Impl
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_3_2__2__Impl_in_rule__XIssueExpression__Group_3_2__216307);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__Group_3_2__2__Impl();
 
             state._fsp--;
@@ -23875,22 +23875,22 @@ public final void rule__XIssueExpression__Group_3_2__2() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XIssueExpression__Group_3_2__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7753:1: rule__XIssueExpression__Group_3_2__2__Impl : ( ']' ) ;
+    // InternalCheck.g:7753:1: rule__XIssueExpression__Group_3_2__2__Impl : ( ']' ) ;
     public final void rule__XIssueExpression__Group_3_2__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7757:1: ( ( ']' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7758:1: ( ']' )
+            // InternalCheck.g:7757:1: ( ( ']' ) )
+            // InternalCheck.g:7758:1: ( ']' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7758:1: ( ']' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7759:1: ']'
+            // InternalCheck.g:7758:1: ( ']' )
+            // InternalCheck.g:7759:1: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getRightSquareBracketKeyword_3_2_2()); 
             }
-            match(input,79,FOLLOW_79_in_rule__XIssueExpression__Group_3_2__2__Impl16335); if (state.failed) return ;
+            match(input,79,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXIssueExpressionAccess().getRightSquareBracketKeyword_3_2_2()); 
             }
@@ -23916,21 +23916,21 @@ public final void rule__XIssueExpression__Group_3_2__2__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XIssueExpression__Group_4__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7778:1: rule__XIssueExpression__Group_4__0 : rule__XIssueExpression__Group_4__0__Impl rule__XIssueExpression__Group_4__1 ;
+    // InternalCheck.g:7778:1: rule__XIssueExpression__Group_4__0 : rule__XIssueExpression__Group_4__0__Impl rule__XIssueExpression__Group_4__1 ;
     public final void rule__XIssueExpression__Group_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7782:1: ( rule__XIssueExpression__Group_4__0__Impl rule__XIssueExpression__Group_4__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7783:2: rule__XIssueExpression__Group_4__0__Impl rule__XIssueExpression__Group_4__1
+            // InternalCheck.g:7782:1: ( rule__XIssueExpression__Group_4__0__Impl rule__XIssueExpression__Group_4__1 )
+            // InternalCheck.g:7783:2: rule__XIssueExpression__Group_4__0__Impl rule__XIssueExpression__Group_4__1
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_4__0__Impl_in_rule__XIssueExpression__Group_4__016372);
+            pushFollow(FOLLOW_32);
             rule__XIssueExpression__Group_4__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_4__1_in_rule__XIssueExpression__Group_4__016375);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__Group_4__1();
 
             state._fsp--;
@@ -23954,25 +23954,25 @@ public final void rule__XIssueExpression__Group_4__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XIssueExpression__Group_4__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7790:1: rule__XIssueExpression__Group_4__0__Impl : ( ( 'message' ) ) ;
+    // InternalCheck.g:7790:1: rule__XIssueExpression__Group_4__0__Impl : ( ( 'message' ) ) ;
     public final void rule__XIssueExpression__Group_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7794:1: ( ( ( 'message' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7795:1: ( ( 'message' ) )
+            // InternalCheck.g:7794:1: ( ( ( 'message' ) ) )
+            // InternalCheck.g:7795:1: ( ( 'message' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7795:1: ( ( 'message' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7796:1: ( 'message' )
+            // InternalCheck.g:7795:1: ( ( 'message' ) )
+            // InternalCheck.g:7796:1: ( 'message' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getMessageKeyword_4_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7797:1: ( 'message' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7798:2: 'message'
+            // InternalCheck.g:7797:1: ( 'message' )
+            // InternalCheck.g:7798:2: 'message'
             {
-            match(input,24,FOLLOW_24_in_rule__XIssueExpression__Group_4__0__Impl16404); if (state.failed) return ;
+            match(input,24,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -24001,16 +24001,16 @@ public final void rule__XIssueExpression__Group_4__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XIssueExpression__Group_4__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7809:1: rule__XIssueExpression__Group_4__1 : rule__XIssueExpression__Group_4__1__Impl ;
+    // InternalCheck.g:7809:1: rule__XIssueExpression__Group_4__1 : rule__XIssueExpression__Group_4__1__Impl ;
     public final void rule__XIssueExpression__Group_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7813:1: ( rule__XIssueExpression__Group_4__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7814:2: rule__XIssueExpression__Group_4__1__Impl
+            // InternalCheck.g:7813:1: ( rule__XIssueExpression__Group_4__1__Impl )
+            // InternalCheck.g:7814:2: rule__XIssueExpression__Group_4__1__Impl
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_4__1__Impl_in_rule__XIssueExpression__Group_4__116436);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__Group_4__1__Impl();
 
             state._fsp--;
@@ -24034,25 +24034,25 @@ public final void rule__XIssueExpression__Group_4__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XIssueExpression__Group_4__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7820:1: rule__XIssueExpression__Group_4__1__Impl : ( ( rule__XIssueExpression__MessageAssignment_4_1 ) ) ;
+    // InternalCheck.g:7820:1: rule__XIssueExpression__Group_4__1__Impl : ( ( rule__XIssueExpression__MessageAssignment_4_1 ) ) ;
     public final void rule__XIssueExpression__Group_4__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7824:1: ( ( ( rule__XIssueExpression__MessageAssignment_4_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7825:1: ( ( rule__XIssueExpression__MessageAssignment_4_1 ) )
+            // InternalCheck.g:7824:1: ( ( ( rule__XIssueExpression__MessageAssignment_4_1 ) ) )
+            // InternalCheck.g:7825:1: ( ( rule__XIssueExpression__MessageAssignment_4_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7825:1: ( ( rule__XIssueExpression__MessageAssignment_4_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7826:1: ( rule__XIssueExpression__MessageAssignment_4_1 )
+            // InternalCheck.g:7825:1: ( ( rule__XIssueExpression__MessageAssignment_4_1 ) )
+            // InternalCheck.g:7826:1: ( rule__XIssueExpression__MessageAssignment_4_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getMessageAssignment_4_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7827:1: ( rule__XIssueExpression__MessageAssignment_4_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7827:2: rule__XIssueExpression__MessageAssignment_4_1
+            // InternalCheck.g:7827:1: ( rule__XIssueExpression__MessageAssignment_4_1 )
+            // InternalCheck.g:7827:2: rule__XIssueExpression__MessageAssignment_4_1
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__MessageAssignment_4_1_in_rule__XIssueExpression__Group_4__1__Impl16463);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__MessageAssignment_4_1();
 
             state._fsp--;
@@ -24085,21 +24085,21 @@ public final void rule__XIssueExpression__Group_4__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XIssueExpression__Group_5__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7841:1: rule__XIssueExpression__Group_5__0 : rule__XIssueExpression__Group_5__0__Impl rule__XIssueExpression__Group_5__1 ;
+    // InternalCheck.g:7841:1: rule__XIssueExpression__Group_5__0 : rule__XIssueExpression__Group_5__0__Impl rule__XIssueExpression__Group_5__1 ;
     public final void rule__XIssueExpression__Group_5__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7845:1: ( rule__XIssueExpression__Group_5__0__Impl rule__XIssueExpression__Group_5__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7846:2: rule__XIssueExpression__Group_5__0__Impl rule__XIssueExpression__Group_5__1
+            // InternalCheck.g:7845:1: ( rule__XIssueExpression__Group_5__0__Impl rule__XIssueExpression__Group_5__1 )
+            // InternalCheck.g:7846:2: rule__XIssueExpression__Group_5__0__Impl rule__XIssueExpression__Group_5__1
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_5__0__Impl_in_rule__XIssueExpression__Group_5__016497);
+            pushFollow(FOLLOW_26);
             rule__XIssueExpression__Group_5__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_5__1_in_rule__XIssueExpression__Group_5__016500);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__Group_5__1();
 
             state._fsp--;
@@ -24123,25 +24123,25 @@ public final void rule__XIssueExpression__Group_5__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XIssueExpression__Group_5__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7853:1: rule__XIssueExpression__Group_5__0__Impl : ( ( 'bind' ) ) ;
+    // InternalCheck.g:7853:1: rule__XIssueExpression__Group_5__0__Impl : ( ( 'bind' ) ) ;
     public final void rule__XIssueExpression__Group_5__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7857:1: ( ( ( 'bind' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7858:1: ( ( 'bind' ) )
+            // InternalCheck.g:7857:1: ( ( ( 'bind' ) ) )
+            // InternalCheck.g:7858:1: ( ( 'bind' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7858:1: ( ( 'bind' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7859:1: ( 'bind' )
+            // InternalCheck.g:7858:1: ( ( 'bind' ) )
+            // InternalCheck.g:7859:1: ( 'bind' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getBindKeyword_5_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7860:1: ( 'bind' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7861:2: 'bind'
+            // InternalCheck.g:7860:1: ( 'bind' )
+            // InternalCheck.g:7861:2: 'bind'
             {
-            match(input,26,FOLLOW_26_in_rule__XIssueExpression__Group_5__0__Impl16529); if (state.failed) return ;
+            match(input,26,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -24170,21 +24170,21 @@ public final void rule__XIssueExpression__Group_5__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XIssueExpression__Group_5__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7872:1: rule__XIssueExpression__Group_5__1 : rule__XIssueExpression__Group_5__1__Impl rule__XIssueExpression__Group_5__2 ;
+    // InternalCheck.g:7872:1: rule__XIssueExpression__Group_5__1 : rule__XIssueExpression__Group_5__1__Impl rule__XIssueExpression__Group_5__2 ;
     public final void rule__XIssueExpression__Group_5__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7876:1: ( rule__XIssueExpression__Group_5__1__Impl rule__XIssueExpression__Group_5__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7877:2: rule__XIssueExpression__Group_5__1__Impl rule__XIssueExpression__Group_5__2
+            // InternalCheck.g:7876:1: ( rule__XIssueExpression__Group_5__1__Impl rule__XIssueExpression__Group_5__2 )
+            // InternalCheck.g:7877:2: rule__XIssueExpression__Group_5__1__Impl rule__XIssueExpression__Group_5__2
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_5__1__Impl_in_rule__XIssueExpression__Group_5__116561);
+            pushFollow(FOLLOW_32);
             rule__XIssueExpression__Group_5__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_5__2_in_rule__XIssueExpression__Group_5__116564);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__Group_5__2();
 
             state._fsp--;
@@ -24208,22 +24208,22 @@ public final void rule__XIssueExpression__Group_5__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XIssueExpression__Group_5__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7884:1: rule__XIssueExpression__Group_5__1__Impl : ( '(' ) ;
+    // InternalCheck.g:7884:1: rule__XIssueExpression__Group_5__1__Impl : ( '(' ) ;
     public final void rule__XIssueExpression__Group_5__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7888:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7889:1: ( '(' )
+            // InternalCheck.g:7888:1: ( ( '(' ) )
+            // InternalCheck.g:7889:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7889:1: ( '(' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7890:1: '('
+            // InternalCheck.g:7889:1: ( '(' )
+            // InternalCheck.g:7890:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getLeftParenthesisKeyword_5_1()); 
             }
-            match(input,72,FOLLOW_72_in_rule__XIssueExpression__Group_5__1__Impl16592); if (state.failed) return ;
+            match(input,72,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXIssueExpressionAccess().getLeftParenthesisKeyword_5_1()); 
             }
@@ -24249,21 +24249,21 @@ public final void rule__XIssueExpression__Group_5__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XIssueExpression__Group_5__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7903:1: rule__XIssueExpression__Group_5__2 : rule__XIssueExpression__Group_5__2__Impl rule__XIssueExpression__Group_5__3 ;
+    // InternalCheck.g:7903:1: rule__XIssueExpression__Group_5__2 : rule__XIssueExpression__Group_5__2__Impl rule__XIssueExpression__Group_5__3 ;
     public final void rule__XIssueExpression__Group_5__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7907:1: ( rule__XIssueExpression__Group_5__2__Impl rule__XIssueExpression__Group_5__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7908:2: rule__XIssueExpression__Group_5__2__Impl rule__XIssueExpression__Group_5__3
+            // InternalCheck.g:7907:1: ( rule__XIssueExpression__Group_5__2__Impl rule__XIssueExpression__Group_5__3 )
+            // InternalCheck.g:7908:2: rule__XIssueExpression__Group_5__2__Impl rule__XIssueExpression__Group_5__3
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_5__2__Impl_in_rule__XIssueExpression__Group_5__216623);
+            pushFollow(FOLLOW_45);
             rule__XIssueExpression__Group_5__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_5__3_in_rule__XIssueExpression__Group_5__216626);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__Group_5__3();
 
             state._fsp--;
@@ -24287,25 +24287,25 @@ public final void rule__XIssueExpression__Group_5__2() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XIssueExpression__Group_5__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7915:1: rule__XIssueExpression__Group_5__2__Impl : ( ( rule__XIssueExpression__MessageParametersAssignment_5_2 ) ) ;
+    // InternalCheck.g:7915:1: rule__XIssueExpression__Group_5__2__Impl : ( ( rule__XIssueExpression__MessageParametersAssignment_5_2 ) ) ;
     public final void rule__XIssueExpression__Group_5__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7919:1: ( ( ( rule__XIssueExpression__MessageParametersAssignment_5_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7920:1: ( ( rule__XIssueExpression__MessageParametersAssignment_5_2 ) )
+            // InternalCheck.g:7919:1: ( ( ( rule__XIssueExpression__MessageParametersAssignment_5_2 ) ) )
+            // InternalCheck.g:7920:1: ( ( rule__XIssueExpression__MessageParametersAssignment_5_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7920:1: ( ( rule__XIssueExpression__MessageParametersAssignment_5_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7921:1: ( rule__XIssueExpression__MessageParametersAssignment_5_2 )
+            // InternalCheck.g:7920:1: ( ( rule__XIssueExpression__MessageParametersAssignment_5_2 ) )
+            // InternalCheck.g:7921:1: ( rule__XIssueExpression__MessageParametersAssignment_5_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getMessageParametersAssignment_5_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7922:1: ( rule__XIssueExpression__MessageParametersAssignment_5_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7922:2: rule__XIssueExpression__MessageParametersAssignment_5_2
+            // InternalCheck.g:7922:1: ( rule__XIssueExpression__MessageParametersAssignment_5_2 )
+            // InternalCheck.g:7922:2: rule__XIssueExpression__MessageParametersAssignment_5_2
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__MessageParametersAssignment_5_2_in_rule__XIssueExpression__Group_5__2__Impl16653);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__MessageParametersAssignment_5_2();
 
             state._fsp--;
@@ -24338,21 +24338,21 @@ public final void rule__XIssueExpression__Group_5__2__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XIssueExpression__Group_5__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7932:1: rule__XIssueExpression__Group_5__3 : rule__XIssueExpression__Group_5__3__Impl rule__XIssueExpression__Group_5__4 ;
+    // InternalCheck.g:7932:1: rule__XIssueExpression__Group_5__3 : rule__XIssueExpression__Group_5__3__Impl rule__XIssueExpression__Group_5__4 ;
     public final void rule__XIssueExpression__Group_5__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7936:1: ( rule__XIssueExpression__Group_5__3__Impl rule__XIssueExpression__Group_5__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7937:2: rule__XIssueExpression__Group_5__3__Impl rule__XIssueExpression__Group_5__4
+            // InternalCheck.g:7936:1: ( rule__XIssueExpression__Group_5__3__Impl rule__XIssueExpression__Group_5__4 )
+            // InternalCheck.g:7937:2: rule__XIssueExpression__Group_5__3__Impl rule__XIssueExpression__Group_5__4
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_5__3__Impl_in_rule__XIssueExpression__Group_5__316683);
+            pushFollow(FOLLOW_45);
             rule__XIssueExpression__Group_5__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_5__4_in_rule__XIssueExpression__Group_5__316686);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__Group_5__4();
 
             state._fsp--;
@@ -24376,22 +24376,22 @@ public final void rule__XIssueExpression__Group_5__3() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XIssueExpression__Group_5__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7944:1: rule__XIssueExpression__Group_5__3__Impl : ( ( rule__XIssueExpression__Group_5_3__0 )* ) ;
+    // InternalCheck.g:7944:1: rule__XIssueExpression__Group_5__3__Impl : ( ( rule__XIssueExpression__Group_5_3__0 )* ) ;
     public final void rule__XIssueExpression__Group_5__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7948:1: ( ( ( rule__XIssueExpression__Group_5_3__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7949:1: ( ( rule__XIssueExpression__Group_5_3__0 )* )
+            // InternalCheck.g:7948:1: ( ( ( rule__XIssueExpression__Group_5_3__0 )* ) )
+            // InternalCheck.g:7949:1: ( ( rule__XIssueExpression__Group_5_3__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7949:1: ( ( rule__XIssueExpression__Group_5_3__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7950:1: ( rule__XIssueExpression__Group_5_3__0 )*
+            // InternalCheck.g:7949:1: ( ( rule__XIssueExpression__Group_5_3__0 )* )
+            // InternalCheck.g:7950:1: ( rule__XIssueExpression__Group_5_3__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getGroup_5_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7951:1: ( rule__XIssueExpression__Group_5_3__0 )*
+            // InternalCheck.g:7951:1: ( rule__XIssueExpression__Group_5_3__0 )*
             loop81:
             do {
                 int alt81=2;
@@ -24404,9 +24404,9 @@ public final void rule__XIssueExpression__Group_5__3__Impl() throws RecognitionE
 
                 switch (alt81) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7951:2: rule__XIssueExpression__Group_5_3__0
+            	    // InternalCheck.g:7951:2: rule__XIssueExpression__Group_5_3__0
             	    {
-            	    pushFollow(FOLLOW_rule__XIssueExpression__Group_5_3__0_in_rule__XIssueExpression__Group_5__3__Impl16713);
+            	    pushFollow(FOLLOW_21);
             	    rule__XIssueExpression__Group_5_3__0();
 
             	    state._fsp--;
@@ -24445,16 +24445,16 @@ public final void rule__XIssueExpression__Group_5__3__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XIssueExpression__Group_5__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7961:1: rule__XIssueExpression__Group_5__4 : rule__XIssueExpression__Group_5__4__Impl ;
+    // InternalCheck.g:7961:1: rule__XIssueExpression__Group_5__4 : rule__XIssueExpression__Group_5__4__Impl ;
     public final void rule__XIssueExpression__Group_5__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7965:1: ( rule__XIssueExpression__Group_5__4__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7966:2: rule__XIssueExpression__Group_5__4__Impl
+            // InternalCheck.g:7965:1: ( rule__XIssueExpression__Group_5__4__Impl )
+            // InternalCheck.g:7966:2: rule__XIssueExpression__Group_5__4__Impl
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_5__4__Impl_in_rule__XIssueExpression__Group_5__416744);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__Group_5__4__Impl();
 
             state._fsp--;
@@ -24478,22 +24478,22 @@ public final void rule__XIssueExpression__Group_5__4() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XIssueExpression__Group_5__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7972:1: rule__XIssueExpression__Group_5__4__Impl : ( ')' ) ;
+    // InternalCheck.g:7972:1: rule__XIssueExpression__Group_5__4__Impl : ( ')' ) ;
     public final void rule__XIssueExpression__Group_5__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7976:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7977:1: ( ')' )
+            // InternalCheck.g:7976:1: ( ( ')' ) )
+            // InternalCheck.g:7977:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7977:1: ( ')' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7978:1: ')'
+            // InternalCheck.g:7977:1: ( ')' )
+            // InternalCheck.g:7978:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getRightParenthesisKeyword_5_4()); 
             }
-            match(input,73,FOLLOW_73_in_rule__XIssueExpression__Group_5__4__Impl16772); if (state.failed) return ;
+            match(input,73,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXIssueExpressionAccess().getRightParenthesisKeyword_5_4()); 
             }
@@ -24519,21 +24519,21 @@ public final void rule__XIssueExpression__Group_5__4__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XIssueExpression__Group_5_3__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8001:1: rule__XIssueExpression__Group_5_3__0 : rule__XIssueExpression__Group_5_3__0__Impl rule__XIssueExpression__Group_5_3__1 ;
+    // InternalCheck.g:8001:1: rule__XIssueExpression__Group_5_3__0 : rule__XIssueExpression__Group_5_3__0__Impl rule__XIssueExpression__Group_5_3__1 ;
     public final void rule__XIssueExpression__Group_5_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8005:1: ( rule__XIssueExpression__Group_5_3__0__Impl rule__XIssueExpression__Group_5_3__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8006:2: rule__XIssueExpression__Group_5_3__0__Impl rule__XIssueExpression__Group_5_3__1
+            // InternalCheck.g:8005:1: ( rule__XIssueExpression__Group_5_3__0__Impl rule__XIssueExpression__Group_5_3__1 )
+            // InternalCheck.g:8006:2: rule__XIssueExpression__Group_5_3__0__Impl rule__XIssueExpression__Group_5_3__1
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_5_3__0__Impl_in_rule__XIssueExpression__Group_5_3__016813);
+            pushFollow(FOLLOW_32);
             rule__XIssueExpression__Group_5_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_5_3__1_in_rule__XIssueExpression__Group_5_3__016816);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__Group_5_3__1();
 
             state._fsp--;
@@ -24557,25 +24557,25 @@ public final void rule__XIssueExpression__Group_5_3__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XIssueExpression__Group_5_3__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8013:1: rule__XIssueExpression__Group_5_3__0__Impl : ( ( ',' ) ) ;
+    // InternalCheck.g:8013:1: rule__XIssueExpression__Group_5_3__0__Impl : ( ( ',' ) ) ;
     public final void rule__XIssueExpression__Group_5_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8017:1: ( ( ( ',' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8018:1: ( ( ',' ) )
+            // InternalCheck.g:8017:1: ( ( ( ',' ) ) )
+            // InternalCheck.g:8018:1: ( ( ',' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8018:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8019:1: ( ',' )
+            // InternalCheck.g:8018:1: ( ( ',' ) )
+            // InternalCheck.g:8019:1: ( ',' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getCommaKeyword_5_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8020:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8021:2: ','
+            // InternalCheck.g:8020:1: ( ',' )
+            // InternalCheck.g:8021:2: ','
             {
-            match(input,74,FOLLOW_74_in_rule__XIssueExpression__Group_5_3__0__Impl16845); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -24604,16 +24604,16 @@ public final void rule__XIssueExpression__Group_5_3__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XIssueExpression__Group_5_3__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8032:1: rule__XIssueExpression__Group_5_3__1 : rule__XIssueExpression__Group_5_3__1__Impl ;
+    // InternalCheck.g:8032:1: rule__XIssueExpression__Group_5_3__1 : rule__XIssueExpression__Group_5_3__1__Impl ;
     public final void rule__XIssueExpression__Group_5_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8036:1: ( rule__XIssueExpression__Group_5_3__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8037:2: rule__XIssueExpression__Group_5_3__1__Impl
+            // InternalCheck.g:8036:1: ( rule__XIssueExpression__Group_5_3__1__Impl )
+            // InternalCheck.g:8037:2: rule__XIssueExpression__Group_5_3__1__Impl
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_5_3__1__Impl_in_rule__XIssueExpression__Group_5_3__116877);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__Group_5_3__1__Impl();
 
             state._fsp--;
@@ -24637,25 +24637,25 @@ public final void rule__XIssueExpression__Group_5_3__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XIssueExpression__Group_5_3__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8043:1: rule__XIssueExpression__Group_5_3__1__Impl : ( ( rule__XIssueExpression__MessageParametersAssignment_5_3_1 ) ) ;
+    // InternalCheck.g:8043:1: rule__XIssueExpression__Group_5_3__1__Impl : ( ( rule__XIssueExpression__MessageParametersAssignment_5_3_1 ) ) ;
     public final void rule__XIssueExpression__Group_5_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8047:1: ( ( ( rule__XIssueExpression__MessageParametersAssignment_5_3_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8048:1: ( ( rule__XIssueExpression__MessageParametersAssignment_5_3_1 ) )
+            // InternalCheck.g:8047:1: ( ( ( rule__XIssueExpression__MessageParametersAssignment_5_3_1 ) ) )
+            // InternalCheck.g:8048:1: ( ( rule__XIssueExpression__MessageParametersAssignment_5_3_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8048:1: ( ( rule__XIssueExpression__MessageParametersAssignment_5_3_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8049:1: ( rule__XIssueExpression__MessageParametersAssignment_5_3_1 )
+            // InternalCheck.g:8048:1: ( ( rule__XIssueExpression__MessageParametersAssignment_5_3_1 ) )
+            // InternalCheck.g:8049:1: ( rule__XIssueExpression__MessageParametersAssignment_5_3_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getMessageParametersAssignment_5_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8050:1: ( rule__XIssueExpression__MessageParametersAssignment_5_3_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8050:2: rule__XIssueExpression__MessageParametersAssignment_5_3_1
+            // InternalCheck.g:8050:1: ( rule__XIssueExpression__MessageParametersAssignment_5_3_1 )
+            // InternalCheck.g:8050:2: rule__XIssueExpression__MessageParametersAssignment_5_3_1
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__MessageParametersAssignment_5_3_1_in_rule__XIssueExpression__Group_5_3__1__Impl16904);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__MessageParametersAssignment_5_3_1();
 
             state._fsp--;
@@ -24688,21 +24688,21 @@ public final void rule__XIssueExpression__Group_5_3__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XIssueExpression__Group_6__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8064:1: rule__XIssueExpression__Group_6__0 : rule__XIssueExpression__Group_6__0__Impl rule__XIssueExpression__Group_6__1 ;
+    // InternalCheck.g:8064:1: rule__XIssueExpression__Group_6__0 : rule__XIssueExpression__Group_6__0__Impl rule__XIssueExpression__Group_6__1 ;
     public final void rule__XIssueExpression__Group_6__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8068:1: ( rule__XIssueExpression__Group_6__0__Impl rule__XIssueExpression__Group_6__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8069:2: rule__XIssueExpression__Group_6__0__Impl rule__XIssueExpression__Group_6__1
+            // InternalCheck.g:8068:1: ( rule__XIssueExpression__Group_6__0__Impl rule__XIssueExpression__Group_6__1 )
+            // InternalCheck.g:8069:2: rule__XIssueExpression__Group_6__0__Impl rule__XIssueExpression__Group_6__1
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_6__0__Impl_in_rule__XIssueExpression__Group_6__016938);
+            pushFollow(FOLLOW_46);
             rule__XIssueExpression__Group_6__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_6__1_in_rule__XIssueExpression__Group_6__016941);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__Group_6__1();
 
             state._fsp--;
@@ -24726,25 +24726,25 @@ public final void rule__XIssueExpression__Group_6__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XIssueExpression__Group_6__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8076:1: rule__XIssueExpression__Group_6__0__Impl : ( ( 'data' ) ) ;
+    // InternalCheck.g:8076:1: rule__XIssueExpression__Group_6__0__Impl : ( ( 'data' ) ) ;
     public final void rule__XIssueExpression__Group_6__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8080:1: ( ( ( 'data' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8081:1: ( ( 'data' ) )
+            // InternalCheck.g:8080:1: ( ( ( 'data' ) ) )
+            // InternalCheck.g:8081:1: ( ( 'data' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8081:1: ( ( 'data' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8082:1: ( 'data' )
+            // InternalCheck.g:8081:1: ( ( 'data' ) )
+            // InternalCheck.g:8082:1: ( 'data' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getDataKeyword_6_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8083:1: ( 'data' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8084:2: 'data'
+            // InternalCheck.g:8083:1: ( 'data' )
+            // InternalCheck.g:8084:2: 'data'
             {
-            match(input,27,FOLLOW_27_in_rule__XIssueExpression__Group_6__0__Impl16970); if (state.failed) return ;
+            match(input,27,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -24773,21 +24773,21 @@ public final void rule__XIssueExpression__Group_6__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XIssueExpression__Group_6__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8095:1: rule__XIssueExpression__Group_6__1 : rule__XIssueExpression__Group_6__1__Impl rule__XIssueExpression__Group_6__2 ;
+    // InternalCheck.g:8095:1: rule__XIssueExpression__Group_6__1 : rule__XIssueExpression__Group_6__1__Impl rule__XIssueExpression__Group_6__2 ;
     public final void rule__XIssueExpression__Group_6__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8099:1: ( rule__XIssueExpression__Group_6__1__Impl rule__XIssueExpression__Group_6__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8100:2: rule__XIssueExpression__Group_6__1__Impl rule__XIssueExpression__Group_6__2
+            // InternalCheck.g:8099:1: ( rule__XIssueExpression__Group_6__1__Impl rule__XIssueExpression__Group_6__2 )
+            // InternalCheck.g:8100:2: rule__XIssueExpression__Group_6__1__Impl rule__XIssueExpression__Group_6__2
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_6__1__Impl_in_rule__XIssueExpression__Group_6__117002);
+            pushFollow(FOLLOW_46);
             rule__XIssueExpression__Group_6__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_6__2_in_rule__XIssueExpression__Group_6__117005);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__Group_6__2();
 
             state._fsp--;
@@ -24811,22 +24811,22 @@ public final void rule__XIssueExpression__Group_6__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XIssueExpression__Group_6__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8107:1: rule__XIssueExpression__Group_6__1__Impl : ( ( rule__XIssueExpression__IssueCodeAssignment_6_1 )? ) ;
+    // InternalCheck.g:8107:1: rule__XIssueExpression__Group_6__1__Impl : ( ( rule__XIssueExpression__IssueCodeAssignment_6_1 )? ) ;
     public final void rule__XIssueExpression__Group_6__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8111:1: ( ( ( rule__XIssueExpression__IssueCodeAssignment_6_1 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8112:1: ( ( rule__XIssueExpression__IssueCodeAssignment_6_1 )? )
+            // InternalCheck.g:8111:1: ( ( ( rule__XIssueExpression__IssueCodeAssignment_6_1 )? ) )
+            // InternalCheck.g:8112:1: ( ( rule__XIssueExpression__IssueCodeAssignment_6_1 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8112:1: ( ( rule__XIssueExpression__IssueCodeAssignment_6_1 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8113:1: ( rule__XIssueExpression__IssueCodeAssignment_6_1 )?
+            // InternalCheck.g:8112:1: ( ( rule__XIssueExpression__IssueCodeAssignment_6_1 )? )
+            // InternalCheck.g:8113:1: ( rule__XIssueExpression__IssueCodeAssignment_6_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getIssueCodeAssignment_6_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8114:1: ( rule__XIssueExpression__IssueCodeAssignment_6_1 )?
+            // InternalCheck.g:8114:1: ( rule__XIssueExpression__IssueCodeAssignment_6_1 )?
             int alt82=2;
             int LA82_0 = input.LA(1);
 
@@ -24835,9 +24835,9 @@ public final void rule__XIssueExpression__Group_6__1__Impl() throws RecognitionE
             }
             switch (alt82) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8114:2: rule__XIssueExpression__IssueCodeAssignment_6_1
+                    // InternalCheck.g:8114:2: rule__XIssueExpression__IssueCodeAssignment_6_1
                     {
-                    pushFollow(FOLLOW_rule__XIssueExpression__IssueCodeAssignment_6_1_in_rule__XIssueExpression__Group_6__1__Impl17032);
+                    pushFollow(FOLLOW_2);
                     rule__XIssueExpression__IssueCodeAssignment_6_1();
 
                     state._fsp--;
@@ -24873,21 +24873,21 @@ public final void rule__XIssueExpression__Group_6__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XIssueExpression__Group_6__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8124:1: rule__XIssueExpression__Group_6__2 : rule__XIssueExpression__Group_6__2__Impl rule__XIssueExpression__Group_6__3 ;
+    // InternalCheck.g:8124:1: rule__XIssueExpression__Group_6__2 : rule__XIssueExpression__Group_6__2__Impl rule__XIssueExpression__Group_6__3 ;
     public final void rule__XIssueExpression__Group_6__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8128:1: ( rule__XIssueExpression__Group_6__2__Impl rule__XIssueExpression__Group_6__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8129:2: rule__XIssueExpression__Group_6__2__Impl rule__XIssueExpression__Group_6__3
+            // InternalCheck.g:8128:1: ( rule__XIssueExpression__Group_6__2__Impl rule__XIssueExpression__Group_6__3 )
+            // InternalCheck.g:8129:2: rule__XIssueExpression__Group_6__2__Impl rule__XIssueExpression__Group_6__3
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_6__2__Impl_in_rule__XIssueExpression__Group_6__217063);
+            pushFollow(FOLLOW_32);
             rule__XIssueExpression__Group_6__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_6__3_in_rule__XIssueExpression__Group_6__217066);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__Group_6__3();
 
             state._fsp--;
@@ -24911,22 +24911,22 @@ public final void rule__XIssueExpression__Group_6__2() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XIssueExpression__Group_6__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8136:1: rule__XIssueExpression__Group_6__2__Impl : ( '(' ) ;
+    // InternalCheck.g:8136:1: rule__XIssueExpression__Group_6__2__Impl : ( '(' ) ;
     public final void rule__XIssueExpression__Group_6__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8140:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8141:1: ( '(' )
+            // InternalCheck.g:8140:1: ( ( '(' ) )
+            // InternalCheck.g:8141:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8141:1: ( '(' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8142:1: '('
+            // InternalCheck.g:8141:1: ( '(' )
+            // InternalCheck.g:8142:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getLeftParenthesisKeyword_6_2()); 
             }
-            match(input,72,FOLLOW_72_in_rule__XIssueExpression__Group_6__2__Impl17094); if (state.failed) return ;
+            match(input,72,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXIssueExpressionAccess().getLeftParenthesisKeyword_6_2()); 
             }
@@ -24952,21 +24952,21 @@ public final void rule__XIssueExpression__Group_6__2__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XIssueExpression__Group_6__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8155:1: rule__XIssueExpression__Group_6__3 : rule__XIssueExpression__Group_6__3__Impl rule__XIssueExpression__Group_6__4 ;
+    // InternalCheck.g:8155:1: rule__XIssueExpression__Group_6__3 : rule__XIssueExpression__Group_6__3__Impl rule__XIssueExpression__Group_6__4 ;
     public final void rule__XIssueExpression__Group_6__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8159:1: ( rule__XIssueExpression__Group_6__3__Impl rule__XIssueExpression__Group_6__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8160:2: rule__XIssueExpression__Group_6__3__Impl rule__XIssueExpression__Group_6__4
+            // InternalCheck.g:8159:1: ( rule__XIssueExpression__Group_6__3__Impl rule__XIssueExpression__Group_6__4 )
+            // InternalCheck.g:8160:2: rule__XIssueExpression__Group_6__3__Impl rule__XIssueExpression__Group_6__4
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_6__3__Impl_in_rule__XIssueExpression__Group_6__317125);
+            pushFollow(FOLLOW_45);
             rule__XIssueExpression__Group_6__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_6__4_in_rule__XIssueExpression__Group_6__317128);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__Group_6__4();
 
             state._fsp--;
@@ -24990,25 +24990,25 @@ public final void rule__XIssueExpression__Group_6__3() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XIssueExpression__Group_6__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8167:1: rule__XIssueExpression__Group_6__3__Impl : ( ( rule__XIssueExpression__IssueDataAssignment_6_3 ) ) ;
+    // InternalCheck.g:8167:1: rule__XIssueExpression__Group_6__3__Impl : ( ( rule__XIssueExpression__IssueDataAssignment_6_3 ) ) ;
     public final void rule__XIssueExpression__Group_6__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8171:1: ( ( ( rule__XIssueExpression__IssueDataAssignment_6_3 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8172:1: ( ( rule__XIssueExpression__IssueDataAssignment_6_3 ) )
+            // InternalCheck.g:8171:1: ( ( ( rule__XIssueExpression__IssueDataAssignment_6_3 ) ) )
+            // InternalCheck.g:8172:1: ( ( rule__XIssueExpression__IssueDataAssignment_6_3 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8172:1: ( ( rule__XIssueExpression__IssueDataAssignment_6_3 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8173:1: ( rule__XIssueExpression__IssueDataAssignment_6_3 )
+            // InternalCheck.g:8172:1: ( ( rule__XIssueExpression__IssueDataAssignment_6_3 ) )
+            // InternalCheck.g:8173:1: ( rule__XIssueExpression__IssueDataAssignment_6_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getIssueDataAssignment_6_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8174:1: ( rule__XIssueExpression__IssueDataAssignment_6_3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8174:2: rule__XIssueExpression__IssueDataAssignment_6_3
+            // InternalCheck.g:8174:1: ( rule__XIssueExpression__IssueDataAssignment_6_3 )
+            // InternalCheck.g:8174:2: rule__XIssueExpression__IssueDataAssignment_6_3
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__IssueDataAssignment_6_3_in_rule__XIssueExpression__Group_6__3__Impl17155);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__IssueDataAssignment_6_3();
 
             state._fsp--;
@@ -25041,21 +25041,21 @@ public final void rule__XIssueExpression__Group_6__3__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XIssueExpression__Group_6__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8184:1: rule__XIssueExpression__Group_6__4 : rule__XIssueExpression__Group_6__4__Impl rule__XIssueExpression__Group_6__5 ;
+    // InternalCheck.g:8184:1: rule__XIssueExpression__Group_6__4 : rule__XIssueExpression__Group_6__4__Impl rule__XIssueExpression__Group_6__5 ;
     public final void rule__XIssueExpression__Group_6__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8188:1: ( rule__XIssueExpression__Group_6__4__Impl rule__XIssueExpression__Group_6__5 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8189:2: rule__XIssueExpression__Group_6__4__Impl rule__XIssueExpression__Group_6__5
+            // InternalCheck.g:8188:1: ( rule__XIssueExpression__Group_6__4__Impl rule__XIssueExpression__Group_6__5 )
+            // InternalCheck.g:8189:2: rule__XIssueExpression__Group_6__4__Impl rule__XIssueExpression__Group_6__5
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_6__4__Impl_in_rule__XIssueExpression__Group_6__417185);
+            pushFollow(FOLLOW_45);
             rule__XIssueExpression__Group_6__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_6__5_in_rule__XIssueExpression__Group_6__417188);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__Group_6__5();
 
             state._fsp--;
@@ -25079,22 +25079,22 @@ public final void rule__XIssueExpression__Group_6__4() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XIssueExpression__Group_6__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8196:1: rule__XIssueExpression__Group_6__4__Impl : ( ( rule__XIssueExpression__Group_6_4__0 )* ) ;
+    // InternalCheck.g:8196:1: rule__XIssueExpression__Group_6__4__Impl : ( ( rule__XIssueExpression__Group_6_4__0 )* ) ;
     public final void rule__XIssueExpression__Group_6__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8200:1: ( ( ( rule__XIssueExpression__Group_6_4__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8201:1: ( ( rule__XIssueExpression__Group_6_4__0 )* )
+            // InternalCheck.g:8200:1: ( ( ( rule__XIssueExpression__Group_6_4__0 )* ) )
+            // InternalCheck.g:8201:1: ( ( rule__XIssueExpression__Group_6_4__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8201:1: ( ( rule__XIssueExpression__Group_6_4__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8202:1: ( rule__XIssueExpression__Group_6_4__0 )*
+            // InternalCheck.g:8201:1: ( ( rule__XIssueExpression__Group_6_4__0 )* )
+            // InternalCheck.g:8202:1: ( rule__XIssueExpression__Group_6_4__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getGroup_6_4()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8203:1: ( rule__XIssueExpression__Group_6_4__0 )*
+            // InternalCheck.g:8203:1: ( rule__XIssueExpression__Group_6_4__0 )*
             loop83:
             do {
                 int alt83=2;
@@ -25107,9 +25107,9 @@ public final void rule__XIssueExpression__Group_6__4__Impl() throws RecognitionE
 
                 switch (alt83) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8203:2: rule__XIssueExpression__Group_6_4__0
+            	    // InternalCheck.g:8203:2: rule__XIssueExpression__Group_6_4__0
             	    {
-            	    pushFollow(FOLLOW_rule__XIssueExpression__Group_6_4__0_in_rule__XIssueExpression__Group_6__4__Impl17215);
+            	    pushFollow(FOLLOW_21);
             	    rule__XIssueExpression__Group_6_4__0();
 
             	    state._fsp--;
@@ -25148,16 +25148,16 @@ public final void rule__XIssueExpression__Group_6__4__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XIssueExpression__Group_6__5"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8213:1: rule__XIssueExpression__Group_6__5 : rule__XIssueExpression__Group_6__5__Impl ;
+    // InternalCheck.g:8213:1: rule__XIssueExpression__Group_6__5 : rule__XIssueExpression__Group_6__5__Impl ;
     public final void rule__XIssueExpression__Group_6__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8217:1: ( rule__XIssueExpression__Group_6__5__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8218:2: rule__XIssueExpression__Group_6__5__Impl
+            // InternalCheck.g:8217:1: ( rule__XIssueExpression__Group_6__5__Impl )
+            // InternalCheck.g:8218:2: rule__XIssueExpression__Group_6__5__Impl
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_6__5__Impl_in_rule__XIssueExpression__Group_6__517246);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__Group_6__5__Impl();
 
             state._fsp--;
@@ -25181,22 +25181,22 @@ public final void rule__XIssueExpression__Group_6__5() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XIssueExpression__Group_6__5__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8224:1: rule__XIssueExpression__Group_6__5__Impl : ( ')' ) ;
+    // InternalCheck.g:8224:1: rule__XIssueExpression__Group_6__5__Impl : ( ')' ) ;
     public final void rule__XIssueExpression__Group_6__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8228:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8229:1: ( ')' )
+            // InternalCheck.g:8228:1: ( ( ')' ) )
+            // InternalCheck.g:8229:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8229:1: ( ')' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8230:1: ')'
+            // InternalCheck.g:8229:1: ( ')' )
+            // InternalCheck.g:8230:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getRightParenthesisKeyword_6_5()); 
             }
-            match(input,73,FOLLOW_73_in_rule__XIssueExpression__Group_6__5__Impl17274); if (state.failed) return ;
+            match(input,73,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXIssueExpressionAccess().getRightParenthesisKeyword_6_5()); 
             }
@@ -25222,21 +25222,21 @@ public final void rule__XIssueExpression__Group_6__5__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XIssueExpression__Group_6_4__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8255:1: rule__XIssueExpression__Group_6_4__0 : rule__XIssueExpression__Group_6_4__0__Impl rule__XIssueExpression__Group_6_4__1 ;
+    // InternalCheck.g:8255:1: rule__XIssueExpression__Group_6_4__0 : rule__XIssueExpression__Group_6_4__0__Impl rule__XIssueExpression__Group_6_4__1 ;
     public final void rule__XIssueExpression__Group_6_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8259:1: ( rule__XIssueExpression__Group_6_4__0__Impl rule__XIssueExpression__Group_6_4__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8260:2: rule__XIssueExpression__Group_6_4__0__Impl rule__XIssueExpression__Group_6_4__1
+            // InternalCheck.g:8259:1: ( rule__XIssueExpression__Group_6_4__0__Impl rule__XIssueExpression__Group_6_4__1 )
+            // InternalCheck.g:8260:2: rule__XIssueExpression__Group_6_4__0__Impl rule__XIssueExpression__Group_6_4__1
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_6_4__0__Impl_in_rule__XIssueExpression__Group_6_4__017317);
+            pushFollow(FOLLOW_32);
             rule__XIssueExpression__Group_6_4__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_6_4__1_in_rule__XIssueExpression__Group_6_4__017320);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__Group_6_4__1();
 
             state._fsp--;
@@ -25260,25 +25260,25 @@ public final void rule__XIssueExpression__Group_6_4__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XIssueExpression__Group_6_4__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8267:1: rule__XIssueExpression__Group_6_4__0__Impl : ( ( ',' ) ) ;
+    // InternalCheck.g:8267:1: rule__XIssueExpression__Group_6_4__0__Impl : ( ( ',' ) ) ;
     public final void rule__XIssueExpression__Group_6_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8271:1: ( ( ( ',' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8272:1: ( ( ',' ) )
+            // InternalCheck.g:8271:1: ( ( ( ',' ) ) )
+            // InternalCheck.g:8272:1: ( ( ',' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8272:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8273:1: ( ',' )
+            // InternalCheck.g:8272:1: ( ( ',' ) )
+            // InternalCheck.g:8273:1: ( ',' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getCommaKeyword_6_4_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8274:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8275:2: ','
+            // InternalCheck.g:8274:1: ( ',' )
+            // InternalCheck.g:8275:2: ','
             {
-            match(input,74,FOLLOW_74_in_rule__XIssueExpression__Group_6_4__0__Impl17349); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -25307,16 +25307,16 @@ public final void rule__XIssueExpression__Group_6_4__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XIssueExpression__Group_6_4__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8286:1: rule__XIssueExpression__Group_6_4__1 : rule__XIssueExpression__Group_6_4__1__Impl ;
+    // InternalCheck.g:8286:1: rule__XIssueExpression__Group_6_4__1 : rule__XIssueExpression__Group_6_4__1__Impl ;
     public final void rule__XIssueExpression__Group_6_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8290:1: ( rule__XIssueExpression__Group_6_4__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8291:2: rule__XIssueExpression__Group_6_4__1__Impl
+            // InternalCheck.g:8290:1: ( rule__XIssueExpression__Group_6_4__1__Impl )
+            // InternalCheck.g:8291:2: rule__XIssueExpression__Group_6_4__1__Impl
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__Group_6_4__1__Impl_in_rule__XIssueExpression__Group_6_4__117381);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__Group_6_4__1__Impl();
 
             state._fsp--;
@@ -25340,25 +25340,25 @@ public final void rule__XIssueExpression__Group_6_4__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XIssueExpression__Group_6_4__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8297:1: rule__XIssueExpression__Group_6_4__1__Impl : ( ( rule__XIssueExpression__IssueDataAssignment_6_4_1 ) ) ;
+    // InternalCheck.g:8297:1: rule__XIssueExpression__Group_6_4__1__Impl : ( ( rule__XIssueExpression__IssueDataAssignment_6_4_1 ) ) ;
     public final void rule__XIssueExpression__Group_6_4__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8301:1: ( ( ( rule__XIssueExpression__IssueDataAssignment_6_4_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8302:1: ( ( rule__XIssueExpression__IssueDataAssignment_6_4_1 ) )
+            // InternalCheck.g:8301:1: ( ( ( rule__XIssueExpression__IssueDataAssignment_6_4_1 ) ) )
+            // InternalCheck.g:8302:1: ( ( rule__XIssueExpression__IssueDataAssignment_6_4_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8302:1: ( ( rule__XIssueExpression__IssueDataAssignment_6_4_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8303:1: ( rule__XIssueExpression__IssueDataAssignment_6_4_1 )
+            // InternalCheck.g:8302:1: ( ( rule__XIssueExpression__IssueDataAssignment_6_4_1 ) )
+            // InternalCheck.g:8303:1: ( rule__XIssueExpression__IssueDataAssignment_6_4_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getIssueDataAssignment_6_4_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8304:1: ( rule__XIssueExpression__IssueDataAssignment_6_4_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8304:2: rule__XIssueExpression__IssueDataAssignment_6_4_1
+            // InternalCheck.g:8304:1: ( rule__XIssueExpression__IssueDataAssignment_6_4_1 )
+            // InternalCheck.g:8304:2: rule__XIssueExpression__IssueDataAssignment_6_4_1
             {
-            pushFollow(FOLLOW_rule__XIssueExpression__IssueDataAssignment_6_4_1_in_rule__XIssueExpression__Group_6_4__1__Impl17408);
+            pushFollow(FOLLOW_2);
             rule__XIssueExpression__IssueDataAssignment_6_4_1();
 
             state._fsp--;
@@ -25391,21 +25391,21 @@ public final void rule__XIssueExpression__Group_6_4__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XAnnotation__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8318:1: rule__XAnnotation__Group__0 : rule__XAnnotation__Group__0__Impl rule__XAnnotation__Group__1 ;
+    // InternalCheck.g:8318:1: rule__XAnnotation__Group__0 : rule__XAnnotation__Group__0__Impl rule__XAnnotation__Group__1 ;
     public final void rule__XAnnotation__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8322:1: ( rule__XAnnotation__Group__0__Impl rule__XAnnotation__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8323:2: rule__XAnnotation__Group__0__Impl rule__XAnnotation__Group__1
+            // InternalCheck.g:8322:1: ( rule__XAnnotation__Group__0__Impl rule__XAnnotation__Group__1 )
+            // InternalCheck.g:8323:2: rule__XAnnotation__Group__0__Impl rule__XAnnotation__Group__1
             {
-            pushFollow(FOLLOW_rule__XAnnotation__Group__0__Impl_in_rule__XAnnotation__Group__017442);
+            pushFollow(FOLLOW_47);
             rule__XAnnotation__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotation__Group__1_in_rule__XAnnotation__Group__017445);
+            pushFollow(FOLLOW_2);
             rule__XAnnotation__Group__1();
 
             state._fsp--;
@@ -25429,23 +25429,23 @@ public final void rule__XAnnotation__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAnnotation__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8330:1: rule__XAnnotation__Group__0__Impl : ( () ) ;
+    // InternalCheck.g:8330:1: rule__XAnnotation__Group__0__Impl : ( () ) ;
     public final void rule__XAnnotation__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8334:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8335:1: ( () )
+            // InternalCheck.g:8334:1: ( ( () ) )
+            // InternalCheck.g:8335:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8335:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8336:1: ()
+            // InternalCheck.g:8335:1: ( () )
+            // InternalCheck.g:8336:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getXAnnotationAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8337:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8339:1: 
+            // InternalCheck.g:8337:1: ()
+            // InternalCheck.g:8339:1: 
             {
             }
 
@@ -25470,21 +25470,21 @@ public final void rule__XAnnotation__Group__0__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XAnnotation__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8349:1: rule__XAnnotation__Group__1 : rule__XAnnotation__Group__1__Impl rule__XAnnotation__Group__2 ;
+    // InternalCheck.g:8349:1: rule__XAnnotation__Group__1 : rule__XAnnotation__Group__1__Impl rule__XAnnotation__Group__2 ;
     public final void rule__XAnnotation__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8353:1: ( rule__XAnnotation__Group__1__Impl rule__XAnnotation__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8354:2: rule__XAnnotation__Group__1__Impl rule__XAnnotation__Group__2
+            // InternalCheck.g:8353:1: ( rule__XAnnotation__Group__1__Impl rule__XAnnotation__Group__2 )
+            // InternalCheck.g:8354:2: rule__XAnnotation__Group__1__Impl rule__XAnnotation__Group__2
             {
-            pushFollow(FOLLOW_rule__XAnnotation__Group__1__Impl_in_rule__XAnnotation__Group__117503);
+            pushFollow(FOLLOW_4);
             rule__XAnnotation__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotation__Group__2_in_rule__XAnnotation__Group__117506);
+            pushFollow(FOLLOW_2);
             rule__XAnnotation__Group__2();
 
             state._fsp--;
@@ -25508,22 +25508,22 @@ public final void rule__XAnnotation__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAnnotation__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8361:1: rule__XAnnotation__Group__1__Impl : ( '@' ) ;
+    // InternalCheck.g:8361:1: rule__XAnnotation__Group__1__Impl : ( '@' ) ;
     public final void rule__XAnnotation__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8365:1: ( ( '@' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8366:1: ( '@' )
+            // InternalCheck.g:8365:1: ( ( '@' ) )
+            // InternalCheck.g:8366:1: ( '@' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8366:1: ( '@' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8367:1: '@'
+            // InternalCheck.g:8366:1: ( '@' )
+            // InternalCheck.g:8367:1: '@'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getCommercialAtKeyword_1()); 
             }
-            match(input,75,FOLLOW_75_in_rule__XAnnotation__Group__1__Impl17534); if (state.failed) return ;
+            match(input,75,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationAccess().getCommercialAtKeyword_1()); 
             }
@@ -25549,21 +25549,21 @@ public final void rule__XAnnotation__Group__1__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XAnnotation__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8380:1: rule__XAnnotation__Group__2 : rule__XAnnotation__Group__2__Impl rule__XAnnotation__Group__3 ;
+    // InternalCheck.g:8380:1: rule__XAnnotation__Group__2 : rule__XAnnotation__Group__2__Impl rule__XAnnotation__Group__3 ;
     public final void rule__XAnnotation__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8384:1: ( rule__XAnnotation__Group__2__Impl rule__XAnnotation__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8385:2: rule__XAnnotation__Group__2__Impl rule__XAnnotation__Group__3
+            // InternalCheck.g:8384:1: ( rule__XAnnotation__Group__2__Impl rule__XAnnotation__Group__3 )
+            // InternalCheck.g:8385:2: rule__XAnnotation__Group__2__Impl rule__XAnnotation__Group__3
             {
-            pushFollow(FOLLOW_rule__XAnnotation__Group__2__Impl_in_rule__XAnnotation__Group__217565);
+            pushFollow(FOLLOW_26);
             rule__XAnnotation__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotation__Group__3_in_rule__XAnnotation__Group__217568);
+            pushFollow(FOLLOW_2);
             rule__XAnnotation__Group__3();
 
             state._fsp--;
@@ -25587,25 +25587,25 @@ public final void rule__XAnnotation__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAnnotation__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8392:1: rule__XAnnotation__Group__2__Impl : ( ( rule__XAnnotation__AnnotationTypeAssignment_2 ) ) ;
+    // InternalCheck.g:8392:1: rule__XAnnotation__Group__2__Impl : ( ( rule__XAnnotation__AnnotationTypeAssignment_2 ) ) ;
     public final void rule__XAnnotation__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8396:1: ( ( ( rule__XAnnotation__AnnotationTypeAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8397:1: ( ( rule__XAnnotation__AnnotationTypeAssignment_2 ) )
+            // InternalCheck.g:8396:1: ( ( ( rule__XAnnotation__AnnotationTypeAssignment_2 ) ) )
+            // InternalCheck.g:8397:1: ( ( rule__XAnnotation__AnnotationTypeAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8397:1: ( ( rule__XAnnotation__AnnotationTypeAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8398:1: ( rule__XAnnotation__AnnotationTypeAssignment_2 )
+            // InternalCheck.g:8397:1: ( ( rule__XAnnotation__AnnotationTypeAssignment_2 ) )
+            // InternalCheck.g:8398:1: ( rule__XAnnotation__AnnotationTypeAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getAnnotationTypeAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8399:1: ( rule__XAnnotation__AnnotationTypeAssignment_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8399:2: rule__XAnnotation__AnnotationTypeAssignment_2
+            // InternalCheck.g:8399:1: ( rule__XAnnotation__AnnotationTypeAssignment_2 )
+            // InternalCheck.g:8399:2: rule__XAnnotation__AnnotationTypeAssignment_2
             {
-            pushFollow(FOLLOW_rule__XAnnotation__AnnotationTypeAssignment_2_in_rule__XAnnotation__Group__2__Impl17595);
+            pushFollow(FOLLOW_2);
             rule__XAnnotation__AnnotationTypeAssignment_2();
 
             state._fsp--;
@@ -25638,16 +25638,16 @@ public final void rule__XAnnotation__Group__2__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XAnnotation__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8409:1: rule__XAnnotation__Group__3 : rule__XAnnotation__Group__3__Impl ;
+    // InternalCheck.g:8409:1: rule__XAnnotation__Group__3 : rule__XAnnotation__Group__3__Impl ;
     public final void rule__XAnnotation__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8413:1: ( rule__XAnnotation__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8414:2: rule__XAnnotation__Group__3__Impl
+            // InternalCheck.g:8413:1: ( rule__XAnnotation__Group__3__Impl )
+            // InternalCheck.g:8414:2: rule__XAnnotation__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotation__Group__3__Impl_in_rule__XAnnotation__Group__317625);
+            pushFollow(FOLLOW_2);
             rule__XAnnotation__Group__3__Impl();
 
             state._fsp--;
@@ -25671,29 +25671,29 @@ public final void rule__XAnnotation__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAnnotation__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8420:1: rule__XAnnotation__Group__3__Impl : ( ( rule__XAnnotation__Group_3__0 )? ) ;
+    // InternalCheck.g:8420:1: rule__XAnnotation__Group__3__Impl : ( ( rule__XAnnotation__Group_3__0 )? ) ;
     public final void rule__XAnnotation__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8424:1: ( ( ( rule__XAnnotation__Group_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8425:1: ( ( rule__XAnnotation__Group_3__0 )? )
+            // InternalCheck.g:8424:1: ( ( ( rule__XAnnotation__Group_3__0 )? ) )
+            // InternalCheck.g:8425:1: ( ( rule__XAnnotation__Group_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8425:1: ( ( rule__XAnnotation__Group_3__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8426:1: ( rule__XAnnotation__Group_3__0 )?
+            // InternalCheck.g:8425:1: ( ( rule__XAnnotation__Group_3__0 )? )
+            // InternalCheck.g:8426:1: ( rule__XAnnotation__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getGroup_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8427:1: ( rule__XAnnotation__Group_3__0 )?
+            // InternalCheck.g:8427:1: ( rule__XAnnotation__Group_3__0 )?
             int alt84=2;
             alt84 = dfa84.predict(input);
             switch (alt84) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8427:2: rule__XAnnotation__Group_3__0
+                    // InternalCheck.g:8427:2: rule__XAnnotation__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__XAnnotation__Group_3__0_in_rule__XAnnotation__Group__3__Impl17652);
+                    pushFollow(FOLLOW_2);
                     rule__XAnnotation__Group_3__0();
 
                     state._fsp--;
@@ -25729,21 +25729,21 @@ public final void rule__XAnnotation__Group__3__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XAnnotation__Group_3__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8445:1: rule__XAnnotation__Group_3__0 : rule__XAnnotation__Group_3__0__Impl rule__XAnnotation__Group_3__1 ;
+    // InternalCheck.g:8445:1: rule__XAnnotation__Group_3__0 : rule__XAnnotation__Group_3__0__Impl rule__XAnnotation__Group_3__1 ;
     public final void rule__XAnnotation__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8449:1: ( rule__XAnnotation__Group_3__0__Impl rule__XAnnotation__Group_3__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8450:2: rule__XAnnotation__Group_3__0__Impl rule__XAnnotation__Group_3__1
+            // InternalCheck.g:8449:1: ( rule__XAnnotation__Group_3__0__Impl rule__XAnnotation__Group_3__1 )
+            // InternalCheck.g:8450:2: rule__XAnnotation__Group_3__0__Impl rule__XAnnotation__Group_3__1
             {
-            pushFollow(FOLLOW_rule__XAnnotation__Group_3__0__Impl_in_rule__XAnnotation__Group_3__017691);
+            pushFollow(FOLLOW_48);
             rule__XAnnotation__Group_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotation__Group_3__1_in_rule__XAnnotation__Group_3__017694);
+            pushFollow(FOLLOW_2);
             rule__XAnnotation__Group_3__1();
 
             state._fsp--;
@@ -25767,25 +25767,25 @@ public final void rule__XAnnotation__Group_3__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAnnotation__Group_3__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8457:1: rule__XAnnotation__Group_3__0__Impl : ( ( '(' ) ) ;
+    // InternalCheck.g:8457:1: rule__XAnnotation__Group_3__0__Impl : ( ( '(' ) ) ;
     public final void rule__XAnnotation__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8461:1: ( ( ( '(' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8462:1: ( ( '(' ) )
+            // InternalCheck.g:8461:1: ( ( ( '(' ) ) )
+            // InternalCheck.g:8462:1: ( ( '(' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8462:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8463:1: ( '(' )
+            // InternalCheck.g:8462:1: ( ( '(' ) )
+            // InternalCheck.g:8463:1: ( '(' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getLeftParenthesisKeyword_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8464:1: ( '(' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8465:2: '('
+            // InternalCheck.g:8464:1: ( '(' )
+            // InternalCheck.g:8465:2: '('
             {
-            match(input,72,FOLLOW_72_in_rule__XAnnotation__Group_3__0__Impl17723); if (state.failed) return ;
+            match(input,72,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -25814,21 +25814,21 @@ public final void rule__XAnnotation__Group_3__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAnnotation__Group_3__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8476:1: rule__XAnnotation__Group_3__1 : rule__XAnnotation__Group_3__1__Impl rule__XAnnotation__Group_3__2 ;
+    // InternalCheck.g:8476:1: rule__XAnnotation__Group_3__1 : rule__XAnnotation__Group_3__1__Impl rule__XAnnotation__Group_3__2 ;
     public final void rule__XAnnotation__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8480:1: ( rule__XAnnotation__Group_3__1__Impl rule__XAnnotation__Group_3__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8481:2: rule__XAnnotation__Group_3__1__Impl rule__XAnnotation__Group_3__2
+            // InternalCheck.g:8480:1: ( rule__XAnnotation__Group_3__1__Impl rule__XAnnotation__Group_3__2 )
+            // InternalCheck.g:8481:2: rule__XAnnotation__Group_3__1__Impl rule__XAnnotation__Group_3__2
             {
-            pushFollow(FOLLOW_rule__XAnnotation__Group_3__1__Impl_in_rule__XAnnotation__Group_3__117755);
+            pushFollow(FOLLOW_48);
             rule__XAnnotation__Group_3__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotation__Group_3__2_in_rule__XAnnotation__Group_3__117758);
+            pushFollow(FOLLOW_2);
             rule__XAnnotation__Group_3__2();
 
             state._fsp--;
@@ -25852,22 +25852,22 @@ public final void rule__XAnnotation__Group_3__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAnnotation__Group_3__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8488:1: rule__XAnnotation__Group_3__1__Impl : ( ( rule__XAnnotation__Alternatives_3_1 )? ) ;
+    // InternalCheck.g:8488:1: rule__XAnnotation__Group_3__1__Impl : ( ( rule__XAnnotation__Alternatives_3_1 )? ) ;
     public final void rule__XAnnotation__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8492:1: ( ( ( rule__XAnnotation__Alternatives_3_1 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8493:1: ( ( rule__XAnnotation__Alternatives_3_1 )? )
+            // InternalCheck.g:8492:1: ( ( ( rule__XAnnotation__Alternatives_3_1 )? ) )
+            // InternalCheck.g:8493:1: ( ( rule__XAnnotation__Alternatives_3_1 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8493:1: ( ( rule__XAnnotation__Alternatives_3_1 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8494:1: ( rule__XAnnotation__Alternatives_3_1 )?
+            // InternalCheck.g:8493:1: ( ( rule__XAnnotation__Alternatives_3_1 )? )
+            // InternalCheck.g:8494:1: ( rule__XAnnotation__Alternatives_3_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getAlternatives_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8495:1: ( rule__XAnnotation__Alternatives_3_1 )?
+            // InternalCheck.g:8495:1: ( rule__XAnnotation__Alternatives_3_1 )?
             int alt85=2;
             int LA85_0 = input.LA(1);
 
@@ -25876,9 +25876,9 @@ public final void rule__XAnnotation__Group_3__1__Impl() throws RecognitionExcept
             }
             switch (alt85) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8495:2: rule__XAnnotation__Alternatives_3_1
+                    // InternalCheck.g:8495:2: rule__XAnnotation__Alternatives_3_1
                     {
-                    pushFollow(FOLLOW_rule__XAnnotation__Alternatives_3_1_in_rule__XAnnotation__Group_3__1__Impl17785);
+                    pushFollow(FOLLOW_2);
                     rule__XAnnotation__Alternatives_3_1();
 
                     state._fsp--;
@@ -25914,16 +25914,16 @@ public final void rule__XAnnotation__Group_3__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAnnotation__Group_3__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8505:1: rule__XAnnotation__Group_3__2 : rule__XAnnotation__Group_3__2__Impl ;
+    // InternalCheck.g:8505:1: rule__XAnnotation__Group_3__2 : rule__XAnnotation__Group_3__2__Impl ;
     public final void rule__XAnnotation__Group_3__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8509:1: ( rule__XAnnotation__Group_3__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8510:2: rule__XAnnotation__Group_3__2__Impl
+            // InternalCheck.g:8509:1: ( rule__XAnnotation__Group_3__2__Impl )
+            // InternalCheck.g:8510:2: rule__XAnnotation__Group_3__2__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotation__Group_3__2__Impl_in_rule__XAnnotation__Group_3__217816);
+            pushFollow(FOLLOW_2);
             rule__XAnnotation__Group_3__2__Impl();
 
             state._fsp--;
@@ -25947,22 +25947,22 @@ public final void rule__XAnnotation__Group_3__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAnnotation__Group_3__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8516:1: rule__XAnnotation__Group_3__2__Impl : ( ')' ) ;
+    // InternalCheck.g:8516:1: rule__XAnnotation__Group_3__2__Impl : ( ')' ) ;
     public final void rule__XAnnotation__Group_3__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8520:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8521:1: ( ')' )
+            // InternalCheck.g:8520:1: ( ( ')' ) )
+            // InternalCheck.g:8521:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8521:1: ( ')' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8522:1: ')'
+            // InternalCheck.g:8521:1: ( ')' )
+            // InternalCheck.g:8522:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getRightParenthesisKeyword_3_2()); 
             }
-            match(input,73,FOLLOW_73_in_rule__XAnnotation__Group_3__2__Impl17844); if (state.failed) return ;
+            match(input,73,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationAccess().getRightParenthesisKeyword_3_2()); 
             }
@@ -25988,21 +25988,21 @@ public final void rule__XAnnotation__Group_3__2__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAnnotation__Group_3_1_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8541:1: rule__XAnnotation__Group_3_1_0__0 : rule__XAnnotation__Group_3_1_0__0__Impl rule__XAnnotation__Group_3_1_0__1 ;
+    // InternalCheck.g:8541:1: rule__XAnnotation__Group_3_1_0__0 : rule__XAnnotation__Group_3_1_0__0__Impl rule__XAnnotation__Group_3_1_0__1 ;
     public final void rule__XAnnotation__Group_3_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8545:1: ( rule__XAnnotation__Group_3_1_0__0__Impl rule__XAnnotation__Group_3_1_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8546:2: rule__XAnnotation__Group_3_1_0__0__Impl rule__XAnnotation__Group_3_1_0__1
+            // InternalCheck.g:8545:1: ( rule__XAnnotation__Group_3_1_0__0__Impl rule__XAnnotation__Group_3_1_0__1 )
+            // InternalCheck.g:8546:2: rule__XAnnotation__Group_3_1_0__0__Impl rule__XAnnotation__Group_3_1_0__1
             {
-            pushFollow(FOLLOW_rule__XAnnotation__Group_3_1_0__0__Impl_in_rule__XAnnotation__Group_3_1_0__017881);
+            pushFollow(FOLLOW_20);
             rule__XAnnotation__Group_3_1_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotation__Group_3_1_0__1_in_rule__XAnnotation__Group_3_1_0__017884);
+            pushFollow(FOLLOW_2);
             rule__XAnnotation__Group_3_1_0__1();
 
             state._fsp--;
@@ -26026,25 +26026,25 @@ public final void rule__XAnnotation__Group_3_1_0__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XAnnotation__Group_3_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8553:1: rule__XAnnotation__Group_3_1_0__0__Impl : ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 ) ) ;
+    // InternalCheck.g:8553:1: rule__XAnnotation__Group_3_1_0__0__Impl : ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 ) ) ;
     public final void rule__XAnnotation__Group_3_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8557:1: ( ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8558:1: ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 ) )
+            // InternalCheck.g:8557:1: ( ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 ) ) )
+            // InternalCheck.g:8558:1: ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8558:1: ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8559:1: ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 )
+            // InternalCheck.g:8558:1: ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 ) )
+            // InternalCheck.g:8559:1: ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getElementValuePairsAssignment_3_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8560:1: ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8560:2: rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0
+            // InternalCheck.g:8560:1: ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 )
+            // InternalCheck.g:8560:2: rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0
             {
-            pushFollow(FOLLOW_rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0_in_rule__XAnnotation__Group_3_1_0__0__Impl17911);
+            pushFollow(FOLLOW_2);
             rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0();
 
             state._fsp--;
@@ -26077,16 +26077,16 @@ public final void rule__XAnnotation__Group_3_1_0__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XAnnotation__Group_3_1_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8570:1: rule__XAnnotation__Group_3_1_0__1 : rule__XAnnotation__Group_3_1_0__1__Impl ;
+    // InternalCheck.g:8570:1: rule__XAnnotation__Group_3_1_0__1 : rule__XAnnotation__Group_3_1_0__1__Impl ;
     public final void rule__XAnnotation__Group_3_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8574:1: ( rule__XAnnotation__Group_3_1_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8575:2: rule__XAnnotation__Group_3_1_0__1__Impl
+            // InternalCheck.g:8574:1: ( rule__XAnnotation__Group_3_1_0__1__Impl )
+            // InternalCheck.g:8575:2: rule__XAnnotation__Group_3_1_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotation__Group_3_1_0__1__Impl_in_rule__XAnnotation__Group_3_1_0__117941);
+            pushFollow(FOLLOW_2);
             rule__XAnnotation__Group_3_1_0__1__Impl();
 
             state._fsp--;
@@ -26110,22 +26110,22 @@ public final void rule__XAnnotation__Group_3_1_0__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XAnnotation__Group_3_1_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8581:1: rule__XAnnotation__Group_3_1_0__1__Impl : ( ( rule__XAnnotation__Group_3_1_0_1__0 )* ) ;
+    // InternalCheck.g:8581:1: rule__XAnnotation__Group_3_1_0__1__Impl : ( ( rule__XAnnotation__Group_3_1_0_1__0 )* ) ;
     public final void rule__XAnnotation__Group_3_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8585:1: ( ( ( rule__XAnnotation__Group_3_1_0_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8586:1: ( ( rule__XAnnotation__Group_3_1_0_1__0 )* )
+            // InternalCheck.g:8585:1: ( ( ( rule__XAnnotation__Group_3_1_0_1__0 )* ) )
+            // InternalCheck.g:8586:1: ( ( rule__XAnnotation__Group_3_1_0_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8586:1: ( ( rule__XAnnotation__Group_3_1_0_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8587:1: ( rule__XAnnotation__Group_3_1_0_1__0 )*
+            // InternalCheck.g:8586:1: ( ( rule__XAnnotation__Group_3_1_0_1__0 )* )
+            // InternalCheck.g:8587:1: ( rule__XAnnotation__Group_3_1_0_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getGroup_3_1_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8588:1: ( rule__XAnnotation__Group_3_1_0_1__0 )*
+            // InternalCheck.g:8588:1: ( rule__XAnnotation__Group_3_1_0_1__0 )*
             loop86:
             do {
                 int alt86=2;
@@ -26138,9 +26138,9 @@ public final void rule__XAnnotation__Group_3_1_0__1__Impl() throws RecognitionEx
 
                 switch (alt86) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8588:2: rule__XAnnotation__Group_3_1_0_1__0
+            	    // InternalCheck.g:8588:2: rule__XAnnotation__Group_3_1_0_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XAnnotation__Group_3_1_0_1__0_in_rule__XAnnotation__Group_3_1_0__1__Impl17968);
+            	    pushFollow(FOLLOW_21);
             	    rule__XAnnotation__Group_3_1_0_1__0();
 
             	    state._fsp--;
@@ -26179,21 +26179,21 @@ public final void rule__XAnnotation__Group_3_1_0__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XAnnotation__Group_3_1_0_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8602:1: rule__XAnnotation__Group_3_1_0_1__0 : rule__XAnnotation__Group_3_1_0_1__0__Impl rule__XAnnotation__Group_3_1_0_1__1 ;
+    // InternalCheck.g:8602:1: rule__XAnnotation__Group_3_1_0_1__0 : rule__XAnnotation__Group_3_1_0_1__0__Impl rule__XAnnotation__Group_3_1_0_1__1 ;
     public final void rule__XAnnotation__Group_3_1_0_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8606:1: ( rule__XAnnotation__Group_3_1_0_1__0__Impl rule__XAnnotation__Group_3_1_0_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8607:2: rule__XAnnotation__Group_3_1_0_1__0__Impl rule__XAnnotation__Group_3_1_0_1__1
+            // InternalCheck.g:8606:1: ( rule__XAnnotation__Group_3_1_0_1__0__Impl rule__XAnnotation__Group_3_1_0_1__1 )
+            // InternalCheck.g:8607:2: rule__XAnnotation__Group_3_1_0_1__0__Impl rule__XAnnotation__Group_3_1_0_1__1
             {
-            pushFollow(FOLLOW_rule__XAnnotation__Group_3_1_0_1__0__Impl_in_rule__XAnnotation__Group_3_1_0_1__018003);
+            pushFollow(FOLLOW_4);
             rule__XAnnotation__Group_3_1_0_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotation__Group_3_1_0_1__1_in_rule__XAnnotation__Group_3_1_0_1__018006);
+            pushFollow(FOLLOW_2);
             rule__XAnnotation__Group_3_1_0_1__1();
 
             state._fsp--;
@@ -26217,22 +26217,22 @@ public final void rule__XAnnotation__Group_3_1_0_1__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAnnotation__Group_3_1_0_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8614:1: rule__XAnnotation__Group_3_1_0_1__0__Impl : ( ',' ) ;
+    // InternalCheck.g:8614:1: rule__XAnnotation__Group_3_1_0_1__0__Impl : ( ',' ) ;
     public final void rule__XAnnotation__Group_3_1_0_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8618:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8619:1: ( ',' )
+            // InternalCheck.g:8618:1: ( ( ',' ) )
+            // InternalCheck.g:8619:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8619:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8620:1: ','
+            // InternalCheck.g:8619:1: ( ',' )
+            // InternalCheck.g:8620:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getCommaKeyword_3_1_0_1_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XAnnotation__Group_3_1_0_1__0__Impl18034); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationAccess().getCommaKeyword_3_1_0_1_0()); 
             }
@@ -26258,16 +26258,16 @@ public final void rule__XAnnotation__Group_3_1_0_1__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XAnnotation__Group_3_1_0_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8633:1: rule__XAnnotation__Group_3_1_0_1__1 : rule__XAnnotation__Group_3_1_0_1__1__Impl ;
+    // InternalCheck.g:8633:1: rule__XAnnotation__Group_3_1_0_1__1 : rule__XAnnotation__Group_3_1_0_1__1__Impl ;
     public final void rule__XAnnotation__Group_3_1_0_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8637:1: ( rule__XAnnotation__Group_3_1_0_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8638:2: rule__XAnnotation__Group_3_1_0_1__1__Impl
+            // InternalCheck.g:8637:1: ( rule__XAnnotation__Group_3_1_0_1__1__Impl )
+            // InternalCheck.g:8638:2: rule__XAnnotation__Group_3_1_0_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotation__Group_3_1_0_1__1__Impl_in_rule__XAnnotation__Group_3_1_0_1__118065);
+            pushFollow(FOLLOW_2);
             rule__XAnnotation__Group_3_1_0_1__1__Impl();
 
             state._fsp--;
@@ -26291,25 +26291,25 @@ public final void rule__XAnnotation__Group_3_1_0_1__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAnnotation__Group_3_1_0_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8644:1: rule__XAnnotation__Group_3_1_0_1__1__Impl : ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 ) ) ;
+    // InternalCheck.g:8644:1: rule__XAnnotation__Group_3_1_0_1__1__Impl : ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 ) ) ;
     public final void rule__XAnnotation__Group_3_1_0_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8648:1: ( ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8649:1: ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 ) )
+            // InternalCheck.g:8648:1: ( ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 ) ) )
+            // InternalCheck.g:8649:1: ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8649:1: ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8650:1: ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 )
+            // InternalCheck.g:8649:1: ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 ) )
+            // InternalCheck.g:8650:1: ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getElementValuePairsAssignment_3_1_0_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8651:1: ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8651:2: rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1
+            // InternalCheck.g:8651:1: ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 )
+            // InternalCheck.g:8651:2: rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1
             {
-            pushFollow(FOLLOW_rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1_in_rule__XAnnotation__Group_3_1_0_1__1__Impl18092);
+            pushFollow(FOLLOW_2);
             rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1();
 
             state._fsp--;
@@ -26342,21 +26342,21 @@ public final void rule__XAnnotation__Group_3_1_0_1__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8665:1: rule__XAnnotationElementValuePair__Group__0 : rule__XAnnotationElementValuePair__Group__0__Impl rule__XAnnotationElementValuePair__Group__1 ;
+    // InternalCheck.g:8665:1: rule__XAnnotationElementValuePair__Group__0 : rule__XAnnotationElementValuePair__Group__0__Impl rule__XAnnotationElementValuePair__Group__1 ;
     public final void rule__XAnnotationElementValuePair__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8669:1: ( rule__XAnnotationElementValuePair__Group__0__Impl rule__XAnnotationElementValuePair__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8670:2: rule__XAnnotationElementValuePair__Group__0__Impl rule__XAnnotationElementValuePair__Group__1
+            // InternalCheck.g:8669:1: ( rule__XAnnotationElementValuePair__Group__0__Impl rule__XAnnotationElementValuePair__Group__1 )
+            // InternalCheck.g:8670:2: rule__XAnnotationElementValuePair__Group__0__Impl rule__XAnnotationElementValuePair__Group__1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__Group__0__Impl_in_rule__XAnnotationElementValuePair__Group__018126);
+            pushFollow(FOLLOW_49);
             rule__XAnnotationElementValuePair__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__Group__1_in_rule__XAnnotationElementValuePair__Group__018129);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValuePair__Group__1();
 
             state._fsp--;
@@ -26380,25 +26380,25 @@ public final void rule__XAnnotationElementValuePair__Group__0() throws Recogniti
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8677:1: rule__XAnnotationElementValuePair__Group__0__Impl : ( ( rule__XAnnotationElementValuePair__Group_0__0 ) ) ;
+    // InternalCheck.g:8677:1: rule__XAnnotationElementValuePair__Group__0__Impl : ( ( rule__XAnnotationElementValuePair__Group_0__0 ) ) ;
     public final void rule__XAnnotationElementValuePair__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8681:1: ( ( ( rule__XAnnotationElementValuePair__Group_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8682:1: ( ( rule__XAnnotationElementValuePair__Group_0__0 ) )
+            // InternalCheck.g:8681:1: ( ( ( rule__XAnnotationElementValuePair__Group_0__0 ) ) )
+            // InternalCheck.g:8682:1: ( ( rule__XAnnotationElementValuePair__Group_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8682:1: ( ( rule__XAnnotationElementValuePair__Group_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8683:1: ( rule__XAnnotationElementValuePair__Group_0__0 )
+            // InternalCheck.g:8682:1: ( ( rule__XAnnotationElementValuePair__Group_0__0 ) )
+            // InternalCheck.g:8683:1: ( rule__XAnnotationElementValuePair__Group_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getGroup_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8684:1: ( rule__XAnnotationElementValuePair__Group_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8684:2: rule__XAnnotationElementValuePair__Group_0__0
+            // InternalCheck.g:8684:1: ( rule__XAnnotationElementValuePair__Group_0__0 )
+            // InternalCheck.g:8684:2: rule__XAnnotationElementValuePair__Group_0__0
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__Group_0__0_in_rule__XAnnotationElementValuePair__Group__0__Impl18156);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValuePair__Group_0__0();
 
             state._fsp--;
@@ -26431,16 +26431,16 @@ public final void rule__XAnnotationElementValuePair__Group__0__Impl() throws Rec
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8694:1: rule__XAnnotationElementValuePair__Group__1 : rule__XAnnotationElementValuePair__Group__1__Impl ;
+    // InternalCheck.g:8694:1: rule__XAnnotationElementValuePair__Group__1 : rule__XAnnotationElementValuePair__Group__1__Impl ;
     public final void rule__XAnnotationElementValuePair__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8698:1: ( rule__XAnnotationElementValuePair__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8699:2: rule__XAnnotationElementValuePair__Group__1__Impl
+            // InternalCheck.g:8698:1: ( rule__XAnnotationElementValuePair__Group__1__Impl )
+            // InternalCheck.g:8699:2: rule__XAnnotationElementValuePair__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__Group__1__Impl_in_rule__XAnnotationElementValuePair__Group__118186);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValuePair__Group__1__Impl();
 
             state._fsp--;
@@ -26464,25 +26464,25 @@ public final void rule__XAnnotationElementValuePair__Group__1() throws Recogniti
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8705:1: rule__XAnnotationElementValuePair__Group__1__Impl : ( ( rule__XAnnotationElementValuePair__ValueAssignment_1 ) ) ;
+    // InternalCheck.g:8705:1: rule__XAnnotationElementValuePair__Group__1__Impl : ( ( rule__XAnnotationElementValuePair__ValueAssignment_1 ) ) ;
     public final void rule__XAnnotationElementValuePair__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8709:1: ( ( ( rule__XAnnotationElementValuePair__ValueAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8710:1: ( ( rule__XAnnotationElementValuePair__ValueAssignment_1 ) )
+            // InternalCheck.g:8709:1: ( ( ( rule__XAnnotationElementValuePair__ValueAssignment_1 ) ) )
+            // InternalCheck.g:8710:1: ( ( rule__XAnnotationElementValuePair__ValueAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8710:1: ( ( rule__XAnnotationElementValuePair__ValueAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8711:1: ( rule__XAnnotationElementValuePair__ValueAssignment_1 )
+            // InternalCheck.g:8710:1: ( ( rule__XAnnotationElementValuePair__ValueAssignment_1 ) )
+            // InternalCheck.g:8711:1: ( rule__XAnnotationElementValuePair__ValueAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getValueAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8712:1: ( rule__XAnnotationElementValuePair__ValueAssignment_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8712:2: rule__XAnnotationElementValuePair__ValueAssignment_1
+            // InternalCheck.g:8712:1: ( rule__XAnnotationElementValuePair__ValueAssignment_1 )
+            // InternalCheck.g:8712:2: rule__XAnnotationElementValuePair__ValueAssignment_1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__ValueAssignment_1_in_rule__XAnnotationElementValuePair__Group__1__Impl18213);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValuePair__ValueAssignment_1();
 
             state._fsp--;
@@ -26515,16 +26515,16 @@ public final void rule__XAnnotationElementValuePair__Group__1__Impl() throws Rec
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8726:1: rule__XAnnotationElementValuePair__Group_0__0 : rule__XAnnotationElementValuePair__Group_0__0__Impl ;
+    // InternalCheck.g:8726:1: rule__XAnnotationElementValuePair__Group_0__0 : rule__XAnnotationElementValuePair__Group_0__0__Impl ;
     public final void rule__XAnnotationElementValuePair__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8730:1: ( rule__XAnnotationElementValuePair__Group_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8731:2: rule__XAnnotationElementValuePair__Group_0__0__Impl
+            // InternalCheck.g:8730:1: ( rule__XAnnotationElementValuePair__Group_0__0__Impl )
+            // InternalCheck.g:8731:2: rule__XAnnotationElementValuePair__Group_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__Group_0__0__Impl_in_rule__XAnnotationElementValuePair__Group_0__018247);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValuePair__Group_0__0__Impl();
 
             state._fsp--;
@@ -26548,25 +26548,25 @@ public final void rule__XAnnotationElementValuePair__Group_0__0() throws Recogni
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8737:1: rule__XAnnotationElementValuePair__Group_0__0__Impl : ( ( rule__XAnnotationElementValuePair__Group_0_0__0 ) ) ;
+    // InternalCheck.g:8737:1: rule__XAnnotationElementValuePair__Group_0__0__Impl : ( ( rule__XAnnotationElementValuePair__Group_0_0__0 ) ) ;
     public final void rule__XAnnotationElementValuePair__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8741:1: ( ( ( rule__XAnnotationElementValuePair__Group_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8742:1: ( ( rule__XAnnotationElementValuePair__Group_0_0__0 ) )
+            // InternalCheck.g:8741:1: ( ( ( rule__XAnnotationElementValuePair__Group_0_0__0 ) ) )
+            // InternalCheck.g:8742:1: ( ( rule__XAnnotationElementValuePair__Group_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8742:1: ( ( rule__XAnnotationElementValuePair__Group_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8743:1: ( rule__XAnnotationElementValuePair__Group_0_0__0 )
+            // InternalCheck.g:8742:1: ( ( rule__XAnnotationElementValuePair__Group_0_0__0 ) )
+            // InternalCheck.g:8743:1: ( rule__XAnnotationElementValuePair__Group_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getGroup_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8744:1: ( rule__XAnnotationElementValuePair__Group_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8744:2: rule__XAnnotationElementValuePair__Group_0_0__0
+            // InternalCheck.g:8744:1: ( rule__XAnnotationElementValuePair__Group_0_0__0 )
+            // InternalCheck.g:8744:2: rule__XAnnotationElementValuePair__Group_0_0__0
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__Group_0_0__0_in_rule__XAnnotationElementValuePair__Group_0__0__Impl18274);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValuePair__Group_0_0__0();
 
             state._fsp--;
@@ -26599,21 +26599,21 @@ public final void rule__XAnnotationElementValuePair__Group_0__0__Impl() throws R
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8756:1: rule__XAnnotationElementValuePair__Group_0_0__0 : rule__XAnnotationElementValuePair__Group_0_0__0__Impl rule__XAnnotationElementValuePair__Group_0_0__1 ;
+    // InternalCheck.g:8756:1: rule__XAnnotationElementValuePair__Group_0_0__0 : rule__XAnnotationElementValuePair__Group_0_0__0__Impl rule__XAnnotationElementValuePair__Group_0_0__1 ;
     public final void rule__XAnnotationElementValuePair__Group_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8760:1: ( rule__XAnnotationElementValuePair__Group_0_0__0__Impl rule__XAnnotationElementValuePair__Group_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8761:2: rule__XAnnotationElementValuePair__Group_0_0__0__Impl rule__XAnnotationElementValuePair__Group_0_0__1
+            // InternalCheck.g:8760:1: ( rule__XAnnotationElementValuePair__Group_0_0__0__Impl rule__XAnnotationElementValuePair__Group_0_0__1 )
+            // InternalCheck.g:8761:2: rule__XAnnotationElementValuePair__Group_0_0__0__Impl rule__XAnnotationElementValuePair__Group_0_0__1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__Group_0_0__0__Impl_in_rule__XAnnotationElementValuePair__Group_0_0__018306);
+            pushFollow(FOLLOW_34);
             rule__XAnnotationElementValuePair__Group_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__Group_0_0__1_in_rule__XAnnotationElementValuePair__Group_0_0__018309);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValuePair__Group_0_0__1();
 
             state._fsp--;
@@ -26637,25 +26637,25 @@ public final void rule__XAnnotationElementValuePair__Group_0_0__0() throws Recog
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8768:1: rule__XAnnotationElementValuePair__Group_0_0__0__Impl : ( ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 ) ) ;
+    // InternalCheck.g:8768:1: rule__XAnnotationElementValuePair__Group_0_0__0__Impl : ( ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 ) ) ;
     public final void rule__XAnnotationElementValuePair__Group_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8772:1: ( ( ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8773:1: ( ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 ) )
+            // InternalCheck.g:8772:1: ( ( ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 ) ) )
+            // InternalCheck.g:8773:1: ( ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8773:1: ( ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8774:1: ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 )
+            // InternalCheck.g:8773:1: ( ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 ) )
+            // InternalCheck.g:8774:1: ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getElementAssignment_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8775:1: ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8775:2: rule__XAnnotationElementValuePair__ElementAssignment_0_0_0
+            // InternalCheck.g:8775:1: ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 )
+            // InternalCheck.g:8775:2: rule__XAnnotationElementValuePair__ElementAssignment_0_0_0
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__ElementAssignment_0_0_0_in_rule__XAnnotationElementValuePair__Group_0_0__0__Impl18336);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValuePair__ElementAssignment_0_0_0();
 
             state._fsp--;
@@ -26688,16 +26688,16 @@ public final void rule__XAnnotationElementValuePair__Group_0_0__0__Impl() throws
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8785:1: rule__XAnnotationElementValuePair__Group_0_0__1 : rule__XAnnotationElementValuePair__Group_0_0__1__Impl ;
+    // InternalCheck.g:8785:1: rule__XAnnotationElementValuePair__Group_0_0__1 : rule__XAnnotationElementValuePair__Group_0_0__1__Impl ;
     public final void rule__XAnnotationElementValuePair__Group_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8789:1: ( rule__XAnnotationElementValuePair__Group_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8790:2: rule__XAnnotationElementValuePair__Group_0_0__1__Impl
+            // InternalCheck.g:8789:1: ( rule__XAnnotationElementValuePair__Group_0_0__1__Impl )
+            // InternalCheck.g:8790:2: rule__XAnnotationElementValuePair__Group_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__Group_0_0__1__Impl_in_rule__XAnnotationElementValuePair__Group_0_0__118366);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValuePair__Group_0_0__1__Impl();
 
             state._fsp--;
@@ -26721,22 +26721,22 @@ public final void rule__XAnnotationElementValuePair__Group_0_0__1() throws Recog
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8796:1: rule__XAnnotationElementValuePair__Group_0_0__1__Impl : ( '=' ) ;
+    // InternalCheck.g:8796:1: rule__XAnnotationElementValuePair__Group_0_0__1__Impl : ( '=' ) ;
     public final void rule__XAnnotationElementValuePair__Group_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8800:1: ( ( '=' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8801:1: ( '=' )
+            // InternalCheck.g:8800:1: ( ( '=' ) )
+            // InternalCheck.g:8801:1: ( '=' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8801:1: ( '=' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8802:1: '='
+            // InternalCheck.g:8801:1: ( '=' )
+            // InternalCheck.g:8802:1: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getEqualsSignKeyword_0_0_1()); 
             }
-            match(input,13,FOLLOW_13_in_rule__XAnnotationElementValuePair__Group_0_0__1__Impl18394); if (state.failed) return ;
+            match(input,13,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValuePairAccess().getEqualsSignKeyword_0_0_1()); 
             }
@@ -26762,21 +26762,21 @@ public final void rule__XAnnotationElementValuePair__Group_0_0__1__Impl() throws
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8819:1: rule__XAnnotationElementValueOrCommaList__Group_0__0 : rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0__1 ;
+    // InternalCheck.g:8819:1: rule__XAnnotationElementValueOrCommaList__Group_0__0 : rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0__1 ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8823:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8824:2: rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0__1
+            // InternalCheck.g:8823:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0__1 )
+            // InternalCheck.g:8824:2: rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0__1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0__018429);
+            pushFollow(FOLLOW_50);
             rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__1_in_rule__XAnnotationElementValueOrCommaList__Group_0__018432);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_0__1();
 
             state._fsp--;
@@ -26800,25 +26800,25 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0__0() throws
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8831:1: rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 ) ) ;
+    // InternalCheck.g:8831:1: rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 ) ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8835:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8836:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 ) )
+            // InternalCheck.g:8835:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 ) ) )
+            // InternalCheck.g:8836:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8836:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8837:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 )
+            // InternalCheck.g:8836:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 ) )
+            // InternalCheck.g:8837:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8838:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8838:2: rule__XAnnotationElementValueOrCommaList__Group_0_0__0
+            // InternalCheck.g:8838:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 )
+            // InternalCheck.g:8838:2: rule__XAnnotationElementValueOrCommaList__Group_0_0__0
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0__0_in_rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl18459);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_0_0__0();
 
             state._fsp--;
@@ -26851,21 +26851,21 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl() t
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8848:1: rule__XAnnotationElementValueOrCommaList__Group_0__1 : rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0__2 ;
+    // InternalCheck.g:8848:1: rule__XAnnotationElementValueOrCommaList__Group_0__1 : rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0__2 ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8852:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8853:2: rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0__2
+            // InternalCheck.g:8852:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0__2 )
+            // InternalCheck.g:8853:2: rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0__2
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0__118489);
+            pushFollow(FOLLOW_50);
             rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__2_in_rule__XAnnotationElementValueOrCommaList__Group_0__118492);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_0__2();
 
             state._fsp--;
@@ -26889,22 +26889,22 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0__1() throws
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8860:1: rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )? ) ;
+    // InternalCheck.g:8860:1: rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )? ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8864:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8865:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )? )
+            // InternalCheck.g:8864:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )? ) )
+            // InternalCheck.g:8865:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8865:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8866:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )?
+            // InternalCheck.g:8865:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )? )
+            // InternalCheck.g:8866:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8867:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )?
+            // InternalCheck.g:8867:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )?
             int alt87=2;
             int LA87_0 = input.LA(1);
 
@@ -26913,9 +26913,9 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl() t
             }
             switch (alt87) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8867:2: rule__XAnnotationElementValueOrCommaList__Group_0_1__0
+                    // InternalCheck.g:8867:2: rule__XAnnotationElementValueOrCommaList__Group_0_1__0
                     {
-                    pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1__0_in_rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl18519);
+                    pushFollow(FOLLOW_2);
                     rule__XAnnotationElementValueOrCommaList__Group_0_1__0();
 
                     state._fsp--;
@@ -26951,16 +26951,16 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl() t
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8877:1: rule__XAnnotationElementValueOrCommaList__Group_0__2 : rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl ;
+    // InternalCheck.g:8877:1: rule__XAnnotationElementValueOrCommaList__Group_0__2 : rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8881:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8882:2: rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl
+            // InternalCheck.g:8881:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl )
+            // InternalCheck.g:8882:2: rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0__218550);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl();
 
             state._fsp--;
@@ -26984,22 +26984,22 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0__2() throws
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8888:1: rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl : ( ']' ) ;
+    // InternalCheck.g:8888:1: rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl : ( ']' ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8892:1: ( ( ']' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8893:1: ( ']' )
+            // InternalCheck.g:8892:1: ( ( ']' ) )
+            // InternalCheck.g:8893:1: ( ']' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8893:1: ( ']' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8894:1: ']'
+            // InternalCheck.g:8893:1: ( ']' )
+            // InternalCheck.g:8894:1: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getRightSquareBracketKeyword_0_2()); 
             }
-            match(input,79,FOLLOW_79_in_rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl18578); if (state.failed) return ;
+            match(input,79,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getRightSquareBracketKeyword_0_2()); 
             }
@@ -27025,16 +27025,16 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl() t
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8913:1: rule__XAnnotationElementValueOrCommaList__Group_0_0__0 : rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl ;
+    // InternalCheck.g:8913:1: rule__XAnnotationElementValueOrCommaList__Group_0_0__0 : rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8917:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8918:2: rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl
+            // InternalCheck.g:8917:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl )
+            // InternalCheck.g:8918:2: rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_0__018615);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl();
 
             state._fsp--;
@@ -27058,25 +27058,25 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_0__0() throw
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8924:1: rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 ) ) ;
+    // InternalCheck.g:8924:1: rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 ) ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8928:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8929:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 ) )
+            // InternalCheck.g:8928:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 ) ) )
+            // InternalCheck.g:8929:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8929:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8930:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 )
+            // InternalCheck.g:8929:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 ) )
+            // InternalCheck.g:8930:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8931:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8931:2: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0
+            // InternalCheck.g:8931:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 )
+            // InternalCheck.g:8931:2: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0_in_rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl18642);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0();
 
             state._fsp--;
@@ -27109,21 +27109,21 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl()
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8943:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 : rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1 ;
+    // InternalCheck.g:8943:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 : rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1 ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8947:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8948:2: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1
+            // InternalCheck.g:8947:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1 )
+            // InternalCheck.g:8948:2: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__018674);
+            pushFollow(FOLLOW_42);
             rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__018677);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1();
 
             state._fsp--;
@@ -27147,23 +27147,23 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0() thr
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8955:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl : ( () ) ;
+    // InternalCheck.g:8955:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl : ( () ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8959:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8960:1: ( () )
+            // InternalCheck.g:8959:1: ( ( () ) )
+            // InternalCheck.g:8960:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8960:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8961:1: ()
+            // InternalCheck.g:8960:1: ( () )
+            // InternalCheck.g:8961:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getXListLiteralAction_0_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8962:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8964:1: 
+            // InternalCheck.g:8962:1: ()
+            // InternalCheck.g:8964:1: 
             {
             }
 
@@ -27188,21 +27188,21 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8974:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1 : rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2 ;
+    // InternalCheck.g:8974:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1 : rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2 ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8978:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8979:2: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2
+            // InternalCheck.g:8978:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2 )
+            // InternalCheck.g:8979:2: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__118735);
+            pushFollow(FOLLOW_38);
             rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__118738);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2();
 
             state._fsp--;
@@ -27226,22 +27226,22 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1() thr
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8986:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl : ( '#' ) ;
+    // InternalCheck.g:8986:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl : ( '#' ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8990:1: ( ( '#' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8991:1: ( '#' )
+            // InternalCheck.g:8990:1: ( ( '#' ) )
+            // InternalCheck.g:8991:1: ( '#' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8991:1: ( '#' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8992:1: '#'
+            // InternalCheck.g:8991:1: ( '#' )
+            // InternalCheck.g:8992:1: '#'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getNumberSignKeyword_0_0_0_1()); 
             }
-            match(input,77,FOLLOW_77_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl18766); if (state.failed) return ;
+            match(input,77,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getNumberSignKeyword_0_0_0_1()); 
             }
@@ -27267,16 +27267,16 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9005:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2 : rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl ;
+    // InternalCheck.g:9005:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2 : rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9009:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9010:2: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl
+            // InternalCheck.g:9009:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl )
+            // InternalCheck.g:9010:2: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__218797);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl();
 
             state._fsp--;
@@ -27300,22 +27300,22 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2() thr
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9016:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl : ( '[' ) ;
+    // InternalCheck.g:9016:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl : ( '[' ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9020:1: ( ( '[' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9021:1: ( '[' )
+            // InternalCheck.g:9020:1: ( ( '[' ) )
+            // InternalCheck.g:9021:1: ( '[' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9021:1: ( '[' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9022:1: '['
+            // InternalCheck.g:9021:1: ( '[' )
+            // InternalCheck.g:9022:1: '['
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getLeftSquareBracketKeyword_0_0_0_2()); 
             }
-            match(input,78,FOLLOW_78_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl18825); if (state.failed) return ;
+            match(input,78,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getLeftSquareBracketKeyword_0_0_0_2()); 
             }
@@ -27341,21 +27341,21 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9041:1: rule__XAnnotationElementValueOrCommaList__Group_0_1__0 : rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1__1 ;
+    // InternalCheck.g:9041:1: rule__XAnnotationElementValueOrCommaList__Group_0_1__0 : rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1__1 ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9045:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9046:2: rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1__1
+            // InternalCheck.g:9045:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1__1 )
+            // InternalCheck.g:9046:2: rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1__1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_1__018862);
+            pushFollow(FOLLOW_20);
             rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1__1_in_rule__XAnnotationElementValueOrCommaList__Group_0_1__018865);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_0_1__1();
 
             state._fsp--;
@@ -27379,25 +27379,25 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_1__0() throw
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9053:1: rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl : ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 ) ) ;
+    // InternalCheck.g:9053:1: rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl : ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 ) ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9057:1: ( ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9058:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 ) )
+            // InternalCheck.g:9057:1: ( ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 ) ) )
+            // InternalCheck.g:9058:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9058:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9059:1: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 )
+            // InternalCheck.g:9058:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 ) )
+            // InternalCheck.g:9059:1: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsAssignment_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9060:1: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9060:2: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0
+            // InternalCheck.g:9060:1: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 )
+            // InternalCheck.g:9060:2: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0_in_rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl18892);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0();
 
             state._fsp--;
@@ -27430,16 +27430,16 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl()
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9070:1: rule__XAnnotationElementValueOrCommaList__Group_0_1__1 : rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl ;
+    // InternalCheck.g:9070:1: rule__XAnnotationElementValueOrCommaList__Group_0_1__1 : rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9074:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9075:2: rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl
+            // InternalCheck.g:9074:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl )
+            // InternalCheck.g:9075:2: rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_1__118922);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl();
 
             state._fsp--;
@@ -27463,22 +27463,22 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_1__1() throw
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9081:1: rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )* ) ;
+    // InternalCheck.g:9081:1: rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )* ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9085:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9086:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )* )
+            // InternalCheck.g:9085:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )* ) )
+            // InternalCheck.g:9086:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9086:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9087:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )*
+            // InternalCheck.g:9086:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )* )
+            // InternalCheck.g:9087:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_0_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9088:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )*
+            // InternalCheck.g:9088:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )*
             loop88:
             do {
                 int alt88=2;
@@ -27491,9 +27491,9 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl()
 
                 switch (alt88) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9088:2: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0
+            	    // InternalCheck.g:9088:2: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0_in_rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl18949);
+            	    pushFollow(FOLLOW_21);
             	    rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0();
 
             	    state._fsp--;
@@ -27532,21 +27532,21 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl()
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9102:1: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 : rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1 ;
+    // InternalCheck.g:9102:1: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 : rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1 ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9106:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9107:2: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1
+            // InternalCheck.g:9106:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1 )
+            // InternalCheck.g:9107:2: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__018984);
+            pushFollow(FOLLOW_49);
             rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1_in_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__018987);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1();
 
             state._fsp--;
@@ -27570,22 +27570,22 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0() thr
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9114:1: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl : ( ',' ) ;
+    // InternalCheck.g:9114:1: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl : ( ',' ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9118:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9119:1: ( ',' )
+            // InternalCheck.g:9118:1: ( ( ',' ) )
+            // InternalCheck.g:9119:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9119:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9120:1: ','
+            // InternalCheck.g:9119:1: ( ',' )
+            // InternalCheck.g:9120:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getCommaKeyword_0_1_1_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl19015); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getCommaKeyword_0_1_1_0()); 
             }
@@ -27611,16 +27611,16 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9133:1: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1 : rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl ;
+    // InternalCheck.g:9133:1: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1 : rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9137:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9138:2: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl
+            // InternalCheck.g:9137:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl )
+            // InternalCheck.g:9138:2: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__119046);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl();
 
             state._fsp--;
@@ -27644,25 +27644,25 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1() thr
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9144:1: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 ) ) ;
+    // InternalCheck.g:9144:1: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 ) ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9148:1: ( ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9149:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 ) )
+            // InternalCheck.g:9148:1: ( ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 ) ) )
+            // InternalCheck.g:9149:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9149:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9150:1: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 )
+            // InternalCheck.g:9149:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 ) )
+            // InternalCheck.g:9150:1: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsAssignment_0_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9151:1: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9151:2: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1
+            // InternalCheck.g:9151:1: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 )
+            // InternalCheck.g:9151:2: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1_in_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl19073);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1();
 
             state._fsp--;
@@ -27695,21 +27695,21 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9165:1: rule__XAnnotationElementValueOrCommaList__Group_1__0 : rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1__1 ;
+    // InternalCheck.g:9165:1: rule__XAnnotationElementValueOrCommaList__Group_1__0 : rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1__1 ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9169:1: ( rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9170:2: rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1__1
+            // InternalCheck.g:9169:1: ( rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1__1 )
+            // InternalCheck.g:9170:2: rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1__019107);
+            pushFollow(FOLLOW_20);
             rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1__1_in_rule__XAnnotationElementValueOrCommaList__Group_1__019110);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_1__1();
 
             state._fsp--;
@@ -27733,22 +27733,22 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1__0() throws
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9177:1: rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl : ( ruleXAnnotationOrExpression ) ;
+    // InternalCheck.g:9177:1: rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl : ( ruleXAnnotationOrExpression ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9181:1: ( ( ruleXAnnotationOrExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9182:1: ( ruleXAnnotationOrExpression )
+            // InternalCheck.g:9181:1: ( ( ruleXAnnotationOrExpression ) )
+            // InternalCheck.g:9182:1: ( ruleXAnnotationOrExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9182:1: ( ruleXAnnotationOrExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9183:1: ruleXAnnotationOrExpression
+            // InternalCheck.g:9182:1: ( ruleXAnnotationOrExpression )
+            // InternalCheck.g:9183:1: ruleXAnnotationOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getXAnnotationOrExpressionParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl19137);
+            pushFollow(FOLLOW_2);
             ruleXAnnotationOrExpression();
 
             state._fsp--;
@@ -27778,16 +27778,16 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl() t
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9194:1: rule__XAnnotationElementValueOrCommaList__Group_1__1 : rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl ;
+    // InternalCheck.g:9194:1: rule__XAnnotationElementValueOrCommaList__Group_1__1 : rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9198:1: ( rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9199:2: rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl
+            // InternalCheck.g:9198:1: ( rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl )
+            // InternalCheck.g:9199:2: rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1__119166);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl();
 
             state._fsp--;
@@ -27811,22 +27811,22 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1__1() throws
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9205:1: rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )? ) ;
+    // InternalCheck.g:9205:1: rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )? ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9209:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9210:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )? )
+            // InternalCheck.g:9209:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )? ) )
+            // InternalCheck.g:9210:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9210:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9211:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )?
+            // InternalCheck.g:9210:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )? )
+            // InternalCheck.g:9211:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9212:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )?
+            // InternalCheck.g:9212:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )?
             int alt89=2;
             int LA89_0 = input.LA(1);
 
@@ -27835,9 +27835,9 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl() t
             }
             switch (alt89) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9212:2: rule__XAnnotationElementValueOrCommaList__Group_1_1__0
+                    // InternalCheck.g:9212:2: rule__XAnnotationElementValueOrCommaList__Group_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1__0_in_rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl19193);
+                    pushFollow(FOLLOW_2);
                     rule__XAnnotationElementValueOrCommaList__Group_1_1__0();
 
                     state._fsp--;
@@ -27873,21 +27873,21 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl() t
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9226:1: rule__XAnnotationElementValueOrCommaList__Group_1_1__0 : rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1__1 ;
+    // InternalCheck.g:9226:1: rule__XAnnotationElementValueOrCommaList__Group_1_1__0 : rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1__1 ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9230:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9231:2: rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1__1
+            // InternalCheck.g:9230:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1__1 )
+            // InternalCheck.g:9231:2: rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1__1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1_1__019228);
+            pushFollow(FOLLOW_20);
             rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1__1_in_rule__XAnnotationElementValueOrCommaList__Group_1_1__019231);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_1_1__1();
 
             state._fsp--;
@@ -27911,23 +27911,23 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1_1__0() throw
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9238:1: rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl : ( () ) ;
+    // InternalCheck.g:9238:1: rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl : ( () ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9242:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9243:1: ( () )
+            // InternalCheck.g:9242:1: ( ( () ) )
+            // InternalCheck.g:9243:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9243:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9244:1: ()
+            // InternalCheck.g:9243:1: ( () )
+            // InternalCheck.g:9244:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getXListLiteralElementsAction_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9245:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9247:1: 
+            // InternalCheck.g:9245:1: ()
+            // InternalCheck.g:9247:1: 
             {
             }
 
@@ -27952,16 +27952,16 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl()
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9257:1: rule__XAnnotationElementValueOrCommaList__Group_1_1__1 : rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl ;
+    // InternalCheck.g:9257:1: rule__XAnnotationElementValueOrCommaList__Group_1_1__1 : rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9261:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9262:2: rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl
+            // InternalCheck.g:9261:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl )
+            // InternalCheck.g:9262:2: rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1_1__119289);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl();
 
             state._fsp--;
@@ -27985,28 +27985,28 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1_1__1() throw
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9268:1: rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl : ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* ) ) ;
+    // InternalCheck.g:9268:1: rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl : ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* ) ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9272:1: ( ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9273:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* ) )
+            // InternalCheck.g:9272:1: ( ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* ) ) )
+            // InternalCheck.g:9273:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9273:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9274:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* )
+            // InternalCheck.g:9273:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* ) )
+            // InternalCheck.g:9274:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9274:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9275:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )
+            // InternalCheck.g:9274:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) )
+            // InternalCheck.g:9275:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9276:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9276:2: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0
+            // InternalCheck.g:9276:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )
+            // InternalCheck.g:9276:2: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0_in_rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl19318);
+            pushFollow(FOLLOW_21);
             rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0();
 
             state._fsp--;
@@ -28020,13 +28020,13 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl()
 
             }
 
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9279:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9280:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )*
+            // InternalCheck.g:9279:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* )
+            // InternalCheck.g:9280:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9281:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )*
+            // InternalCheck.g:9281:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )*
             loop90:
             do {
                 int alt90=2;
@@ -28039,9 +28039,9 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl()
 
                 switch (alt90) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9281:2: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0
+            	    // InternalCheck.g:9281:2: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0_in_rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl19330);
+            	    pushFollow(FOLLOW_21);
             	    rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0();
 
             	    state._fsp--;
@@ -28083,21 +28083,21 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl()
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9296:1: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 : rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1 ;
+    // InternalCheck.g:9296:1: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 : rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1 ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9300:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9301:2: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1
+            // InternalCheck.g:9300:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1 )
+            // InternalCheck.g:9301:2: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__019367);
+            pushFollow(FOLLOW_49);
             rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1_in_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__019370);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1();
 
             state._fsp--;
@@ -28121,22 +28121,22 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0() thr
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9308:1: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl : ( ',' ) ;
+    // InternalCheck.g:9308:1: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl : ( ',' ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9312:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9313:1: ( ',' )
+            // InternalCheck.g:9312:1: ( ( ',' ) )
+            // InternalCheck.g:9313:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9313:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9314:1: ','
+            // InternalCheck.g:9313:1: ( ',' )
+            // InternalCheck.g:9314:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getCommaKeyword_1_1_1_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl19398); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getCommaKeyword_1_1_1_0()); 
             }
@@ -28162,16 +28162,16 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9327:1: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1 : rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl ;
+    // InternalCheck.g:9327:1: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1 : rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9331:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9332:2: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl
+            // InternalCheck.g:9331:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl )
+            // InternalCheck.g:9332:2: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__119429);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl();
 
             state._fsp--;
@@ -28195,25 +28195,25 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1() thr
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9338:1: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 ) ) ;
+    // InternalCheck.g:9338:1: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 ) ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9342:1: ( ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9343:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 ) )
+            // InternalCheck.g:9342:1: ( ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 ) ) )
+            // InternalCheck.g:9343:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9343:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9344:1: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 )
+            // InternalCheck.g:9343:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 ) )
+            // InternalCheck.g:9344:1: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsAssignment_1_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9345:1: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9345:2: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1
+            // InternalCheck.g:9345:1: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 )
+            // InternalCheck.g:9345:2: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1_in_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl19456);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1();
 
             state._fsp--;
@@ -28246,21 +28246,21 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9359:1: rule__XAnnotationElementValue__Group_0__0 : rule__XAnnotationElementValue__Group_0__0__Impl rule__XAnnotationElementValue__Group_0__1 ;
+    // InternalCheck.g:9359:1: rule__XAnnotationElementValue__Group_0__0 : rule__XAnnotationElementValue__Group_0__0__Impl rule__XAnnotationElementValue__Group_0__1 ;
     public final void rule__XAnnotationElementValue__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9363:1: ( rule__XAnnotationElementValue__Group_0__0__Impl rule__XAnnotationElementValue__Group_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9364:2: rule__XAnnotationElementValue__Group_0__0__Impl rule__XAnnotationElementValue__Group_0__1
+            // InternalCheck.g:9363:1: ( rule__XAnnotationElementValue__Group_0__0__Impl rule__XAnnotationElementValue__Group_0__1 )
+            // InternalCheck.g:9364:2: rule__XAnnotationElementValue__Group_0__0__Impl rule__XAnnotationElementValue__Group_0__1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0__0__Impl_in_rule__XAnnotationElementValue__Group_0__019490);
+            pushFollow(FOLLOW_50);
             rule__XAnnotationElementValue__Group_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0__1_in_rule__XAnnotationElementValue__Group_0__019493);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Group_0__1();
 
             state._fsp--;
@@ -28284,25 +28284,25 @@ public final void rule__XAnnotationElementValue__Group_0__0() throws Recognition
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9371:1: rule__XAnnotationElementValue__Group_0__0__Impl : ( ( rule__XAnnotationElementValue__Group_0_0__0 ) ) ;
+    // InternalCheck.g:9371:1: rule__XAnnotationElementValue__Group_0__0__Impl : ( ( rule__XAnnotationElementValue__Group_0_0__0 ) ) ;
     public final void rule__XAnnotationElementValue__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9375:1: ( ( ( rule__XAnnotationElementValue__Group_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9376:1: ( ( rule__XAnnotationElementValue__Group_0_0__0 ) )
+            // InternalCheck.g:9375:1: ( ( ( rule__XAnnotationElementValue__Group_0_0__0 ) ) )
+            // InternalCheck.g:9376:1: ( ( rule__XAnnotationElementValue__Group_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9376:1: ( ( rule__XAnnotationElementValue__Group_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9377:1: ( rule__XAnnotationElementValue__Group_0_0__0 )
+            // InternalCheck.g:9376:1: ( ( rule__XAnnotationElementValue__Group_0_0__0 ) )
+            // InternalCheck.g:9377:1: ( rule__XAnnotationElementValue__Group_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getGroup_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9378:1: ( rule__XAnnotationElementValue__Group_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9378:2: rule__XAnnotationElementValue__Group_0_0__0
+            // InternalCheck.g:9378:1: ( rule__XAnnotationElementValue__Group_0_0__0 )
+            // InternalCheck.g:9378:2: rule__XAnnotationElementValue__Group_0_0__0
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_0__0_in_rule__XAnnotationElementValue__Group_0__0__Impl19520);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Group_0_0__0();
 
             state._fsp--;
@@ -28335,21 +28335,21 @@ public final void rule__XAnnotationElementValue__Group_0__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9388:1: rule__XAnnotationElementValue__Group_0__1 : rule__XAnnotationElementValue__Group_0__1__Impl rule__XAnnotationElementValue__Group_0__2 ;
+    // InternalCheck.g:9388:1: rule__XAnnotationElementValue__Group_0__1 : rule__XAnnotationElementValue__Group_0__1__Impl rule__XAnnotationElementValue__Group_0__2 ;
     public final void rule__XAnnotationElementValue__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9392:1: ( rule__XAnnotationElementValue__Group_0__1__Impl rule__XAnnotationElementValue__Group_0__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9393:2: rule__XAnnotationElementValue__Group_0__1__Impl rule__XAnnotationElementValue__Group_0__2
+            // InternalCheck.g:9392:1: ( rule__XAnnotationElementValue__Group_0__1__Impl rule__XAnnotationElementValue__Group_0__2 )
+            // InternalCheck.g:9393:2: rule__XAnnotationElementValue__Group_0__1__Impl rule__XAnnotationElementValue__Group_0__2
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0__1__Impl_in_rule__XAnnotationElementValue__Group_0__119550);
+            pushFollow(FOLLOW_50);
             rule__XAnnotationElementValue__Group_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0__2_in_rule__XAnnotationElementValue__Group_0__119553);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Group_0__2();
 
             state._fsp--;
@@ -28373,22 +28373,22 @@ public final void rule__XAnnotationElementValue__Group_0__1() throws Recognition
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9400:1: rule__XAnnotationElementValue__Group_0__1__Impl : ( ( rule__XAnnotationElementValue__Group_0_1__0 )? ) ;
+    // InternalCheck.g:9400:1: rule__XAnnotationElementValue__Group_0__1__Impl : ( ( rule__XAnnotationElementValue__Group_0_1__0 )? ) ;
     public final void rule__XAnnotationElementValue__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9404:1: ( ( ( rule__XAnnotationElementValue__Group_0_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9405:1: ( ( rule__XAnnotationElementValue__Group_0_1__0 )? )
+            // InternalCheck.g:9404:1: ( ( ( rule__XAnnotationElementValue__Group_0_1__0 )? ) )
+            // InternalCheck.g:9405:1: ( ( rule__XAnnotationElementValue__Group_0_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9405:1: ( ( rule__XAnnotationElementValue__Group_0_1__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9406:1: ( rule__XAnnotationElementValue__Group_0_1__0 )?
+            // InternalCheck.g:9405:1: ( ( rule__XAnnotationElementValue__Group_0_1__0 )? )
+            // InternalCheck.g:9406:1: ( rule__XAnnotationElementValue__Group_0_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getGroup_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9407:1: ( rule__XAnnotationElementValue__Group_0_1__0 )?
+            // InternalCheck.g:9407:1: ( rule__XAnnotationElementValue__Group_0_1__0 )?
             int alt91=2;
             int LA91_0 = input.LA(1);
 
@@ -28397,9 +28397,9 @@ public final void rule__XAnnotationElementValue__Group_0__1__Impl() throws Recog
             }
             switch (alt91) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9407:2: rule__XAnnotationElementValue__Group_0_1__0
+                    // InternalCheck.g:9407:2: rule__XAnnotationElementValue__Group_0_1__0
                     {
-                    pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_1__0_in_rule__XAnnotationElementValue__Group_0__1__Impl19580);
+                    pushFollow(FOLLOW_2);
                     rule__XAnnotationElementValue__Group_0_1__0();
 
                     state._fsp--;
@@ -28435,16 +28435,16 @@ public final void rule__XAnnotationElementValue__Group_0__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9417:1: rule__XAnnotationElementValue__Group_0__2 : rule__XAnnotationElementValue__Group_0__2__Impl ;
+    // InternalCheck.g:9417:1: rule__XAnnotationElementValue__Group_0__2 : rule__XAnnotationElementValue__Group_0__2__Impl ;
     public final void rule__XAnnotationElementValue__Group_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9421:1: ( rule__XAnnotationElementValue__Group_0__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9422:2: rule__XAnnotationElementValue__Group_0__2__Impl
+            // InternalCheck.g:9421:1: ( rule__XAnnotationElementValue__Group_0__2__Impl )
+            // InternalCheck.g:9422:2: rule__XAnnotationElementValue__Group_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0__2__Impl_in_rule__XAnnotationElementValue__Group_0__219611);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Group_0__2__Impl();
 
             state._fsp--;
@@ -28468,22 +28468,22 @@ public final void rule__XAnnotationElementValue__Group_0__2() throws Recognition
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9428:1: rule__XAnnotationElementValue__Group_0__2__Impl : ( ']' ) ;
+    // InternalCheck.g:9428:1: rule__XAnnotationElementValue__Group_0__2__Impl : ( ']' ) ;
     public final void rule__XAnnotationElementValue__Group_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9432:1: ( ( ']' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9433:1: ( ']' )
+            // InternalCheck.g:9432:1: ( ( ']' ) )
+            // InternalCheck.g:9433:1: ( ']' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9433:1: ( ']' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9434:1: ']'
+            // InternalCheck.g:9433:1: ( ']' )
+            // InternalCheck.g:9434:1: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getRightSquareBracketKeyword_0_2()); 
             }
-            match(input,79,FOLLOW_79_in_rule__XAnnotationElementValue__Group_0__2__Impl19639); if (state.failed) return ;
+            match(input,79,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValueAccess().getRightSquareBracketKeyword_0_2()); 
             }
@@ -28509,16 +28509,16 @@ public final void rule__XAnnotationElementValue__Group_0__2__Impl() throws Recog
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9453:1: rule__XAnnotationElementValue__Group_0_0__0 : rule__XAnnotationElementValue__Group_0_0__0__Impl ;
+    // InternalCheck.g:9453:1: rule__XAnnotationElementValue__Group_0_0__0 : rule__XAnnotationElementValue__Group_0_0__0__Impl ;
     public final void rule__XAnnotationElementValue__Group_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9457:1: ( rule__XAnnotationElementValue__Group_0_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9458:2: rule__XAnnotationElementValue__Group_0_0__0__Impl
+            // InternalCheck.g:9457:1: ( rule__XAnnotationElementValue__Group_0_0__0__Impl )
+            // InternalCheck.g:9458:2: rule__XAnnotationElementValue__Group_0_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_0__0__Impl_in_rule__XAnnotationElementValue__Group_0_0__019676);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Group_0_0__0__Impl();
 
             state._fsp--;
@@ -28542,25 +28542,25 @@ public final void rule__XAnnotationElementValue__Group_0_0__0() throws Recogniti
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9464:1: rule__XAnnotationElementValue__Group_0_0__0__Impl : ( ( rule__XAnnotationElementValue__Group_0_0_0__0 ) ) ;
+    // InternalCheck.g:9464:1: rule__XAnnotationElementValue__Group_0_0__0__Impl : ( ( rule__XAnnotationElementValue__Group_0_0_0__0 ) ) ;
     public final void rule__XAnnotationElementValue__Group_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9468:1: ( ( ( rule__XAnnotationElementValue__Group_0_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9469:1: ( ( rule__XAnnotationElementValue__Group_0_0_0__0 ) )
+            // InternalCheck.g:9468:1: ( ( ( rule__XAnnotationElementValue__Group_0_0_0__0 ) ) )
+            // InternalCheck.g:9469:1: ( ( rule__XAnnotationElementValue__Group_0_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9469:1: ( ( rule__XAnnotationElementValue__Group_0_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9470:1: ( rule__XAnnotationElementValue__Group_0_0_0__0 )
+            // InternalCheck.g:9469:1: ( ( rule__XAnnotationElementValue__Group_0_0_0__0 ) )
+            // InternalCheck.g:9470:1: ( rule__XAnnotationElementValue__Group_0_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getGroup_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9471:1: ( rule__XAnnotationElementValue__Group_0_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9471:2: rule__XAnnotationElementValue__Group_0_0_0__0
+            // InternalCheck.g:9471:1: ( rule__XAnnotationElementValue__Group_0_0_0__0 )
+            // InternalCheck.g:9471:2: rule__XAnnotationElementValue__Group_0_0_0__0
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__0_in_rule__XAnnotationElementValue__Group_0_0__0__Impl19703);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Group_0_0_0__0();
 
             state._fsp--;
@@ -28593,21 +28593,21 @@ public final void rule__XAnnotationElementValue__Group_0_0__0__Impl() throws Rec
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9483:1: rule__XAnnotationElementValue__Group_0_0_0__0 : rule__XAnnotationElementValue__Group_0_0_0__0__Impl rule__XAnnotationElementValue__Group_0_0_0__1 ;
+    // InternalCheck.g:9483:1: rule__XAnnotationElementValue__Group_0_0_0__0 : rule__XAnnotationElementValue__Group_0_0_0__0__Impl rule__XAnnotationElementValue__Group_0_0_0__1 ;
     public final void rule__XAnnotationElementValue__Group_0_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9487:1: ( rule__XAnnotationElementValue__Group_0_0_0__0__Impl rule__XAnnotationElementValue__Group_0_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9488:2: rule__XAnnotationElementValue__Group_0_0_0__0__Impl rule__XAnnotationElementValue__Group_0_0_0__1
+            // InternalCheck.g:9487:1: ( rule__XAnnotationElementValue__Group_0_0_0__0__Impl rule__XAnnotationElementValue__Group_0_0_0__1 )
+            // InternalCheck.g:9488:2: rule__XAnnotationElementValue__Group_0_0_0__0__Impl rule__XAnnotationElementValue__Group_0_0_0__1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__0__Impl_in_rule__XAnnotationElementValue__Group_0_0_0__019735);
+            pushFollow(FOLLOW_42);
             rule__XAnnotationElementValue__Group_0_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__1_in_rule__XAnnotationElementValue__Group_0_0_0__019738);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Group_0_0_0__1();
 
             state._fsp--;
@@ -28631,23 +28631,23 @@ public final void rule__XAnnotationElementValue__Group_0_0_0__0() throws Recogni
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9495:1: rule__XAnnotationElementValue__Group_0_0_0__0__Impl : ( () ) ;
+    // InternalCheck.g:9495:1: rule__XAnnotationElementValue__Group_0_0_0__0__Impl : ( () ) ;
     public final void rule__XAnnotationElementValue__Group_0_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9499:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9500:1: ( () )
+            // InternalCheck.g:9499:1: ( ( () ) )
+            // InternalCheck.g:9500:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9500:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9501:1: ()
+            // InternalCheck.g:9500:1: ( () )
+            // InternalCheck.g:9501:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getXListLiteralAction_0_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9502:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9504:1: 
+            // InternalCheck.g:9502:1: ()
+            // InternalCheck.g:9504:1: 
             {
             }
 
@@ -28672,21 +28672,21 @@ public final void rule__XAnnotationElementValue__Group_0_0_0__0__Impl() throws R
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9514:1: rule__XAnnotationElementValue__Group_0_0_0__1 : rule__XAnnotationElementValue__Group_0_0_0__1__Impl rule__XAnnotationElementValue__Group_0_0_0__2 ;
+    // InternalCheck.g:9514:1: rule__XAnnotationElementValue__Group_0_0_0__1 : rule__XAnnotationElementValue__Group_0_0_0__1__Impl rule__XAnnotationElementValue__Group_0_0_0__2 ;
     public final void rule__XAnnotationElementValue__Group_0_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9518:1: ( rule__XAnnotationElementValue__Group_0_0_0__1__Impl rule__XAnnotationElementValue__Group_0_0_0__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9519:2: rule__XAnnotationElementValue__Group_0_0_0__1__Impl rule__XAnnotationElementValue__Group_0_0_0__2
+            // InternalCheck.g:9518:1: ( rule__XAnnotationElementValue__Group_0_0_0__1__Impl rule__XAnnotationElementValue__Group_0_0_0__2 )
+            // InternalCheck.g:9519:2: rule__XAnnotationElementValue__Group_0_0_0__1__Impl rule__XAnnotationElementValue__Group_0_0_0__2
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__1__Impl_in_rule__XAnnotationElementValue__Group_0_0_0__119796);
+            pushFollow(FOLLOW_38);
             rule__XAnnotationElementValue__Group_0_0_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__2_in_rule__XAnnotationElementValue__Group_0_0_0__119799);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Group_0_0_0__2();
 
             state._fsp--;
@@ -28710,22 +28710,22 @@ public final void rule__XAnnotationElementValue__Group_0_0_0__1() throws Recogni
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9526:1: rule__XAnnotationElementValue__Group_0_0_0__1__Impl : ( '#' ) ;
+    // InternalCheck.g:9526:1: rule__XAnnotationElementValue__Group_0_0_0__1__Impl : ( '#' ) ;
     public final void rule__XAnnotationElementValue__Group_0_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9530:1: ( ( '#' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9531:1: ( '#' )
+            // InternalCheck.g:9530:1: ( ( '#' ) )
+            // InternalCheck.g:9531:1: ( '#' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9531:1: ( '#' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9532:1: '#'
+            // InternalCheck.g:9531:1: ( '#' )
+            // InternalCheck.g:9532:1: '#'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getNumberSignKeyword_0_0_0_1()); 
             }
-            match(input,77,FOLLOW_77_in_rule__XAnnotationElementValue__Group_0_0_0__1__Impl19827); if (state.failed) return ;
+            match(input,77,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValueAccess().getNumberSignKeyword_0_0_0_1()); 
             }
@@ -28751,16 +28751,16 @@ public final void rule__XAnnotationElementValue__Group_0_0_0__1__Impl() throws R
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_0_0__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9545:1: rule__XAnnotationElementValue__Group_0_0_0__2 : rule__XAnnotationElementValue__Group_0_0_0__2__Impl ;
+    // InternalCheck.g:9545:1: rule__XAnnotationElementValue__Group_0_0_0__2 : rule__XAnnotationElementValue__Group_0_0_0__2__Impl ;
     public final void rule__XAnnotationElementValue__Group_0_0_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9549:1: ( rule__XAnnotationElementValue__Group_0_0_0__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9550:2: rule__XAnnotationElementValue__Group_0_0_0__2__Impl
+            // InternalCheck.g:9549:1: ( rule__XAnnotationElementValue__Group_0_0_0__2__Impl )
+            // InternalCheck.g:9550:2: rule__XAnnotationElementValue__Group_0_0_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__2__Impl_in_rule__XAnnotationElementValue__Group_0_0_0__219858);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Group_0_0_0__2__Impl();
 
             state._fsp--;
@@ -28784,22 +28784,22 @@ public final void rule__XAnnotationElementValue__Group_0_0_0__2() throws Recogni
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_0_0__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9556:1: rule__XAnnotationElementValue__Group_0_0_0__2__Impl : ( '[' ) ;
+    // InternalCheck.g:9556:1: rule__XAnnotationElementValue__Group_0_0_0__2__Impl : ( '[' ) ;
     public final void rule__XAnnotationElementValue__Group_0_0_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9560:1: ( ( '[' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9561:1: ( '[' )
+            // InternalCheck.g:9560:1: ( ( '[' ) )
+            // InternalCheck.g:9561:1: ( '[' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9561:1: ( '[' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9562:1: '['
+            // InternalCheck.g:9561:1: ( '[' )
+            // InternalCheck.g:9562:1: '['
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getLeftSquareBracketKeyword_0_0_0_2()); 
             }
-            match(input,78,FOLLOW_78_in_rule__XAnnotationElementValue__Group_0_0_0__2__Impl19886); if (state.failed) return ;
+            match(input,78,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValueAccess().getLeftSquareBracketKeyword_0_0_0_2()); 
             }
@@ -28825,21 +28825,21 @@ public final void rule__XAnnotationElementValue__Group_0_0_0__2__Impl() throws R
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9581:1: rule__XAnnotationElementValue__Group_0_1__0 : rule__XAnnotationElementValue__Group_0_1__0__Impl rule__XAnnotationElementValue__Group_0_1__1 ;
+    // InternalCheck.g:9581:1: rule__XAnnotationElementValue__Group_0_1__0 : rule__XAnnotationElementValue__Group_0_1__0__Impl rule__XAnnotationElementValue__Group_0_1__1 ;
     public final void rule__XAnnotationElementValue__Group_0_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9585:1: ( rule__XAnnotationElementValue__Group_0_1__0__Impl rule__XAnnotationElementValue__Group_0_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9586:2: rule__XAnnotationElementValue__Group_0_1__0__Impl rule__XAnnotationElementValue__Group_0_1__1
+            // InternalCheck.g:9585:1: ( rule__XAnnotationElementValue__Group_0_1__0__Impl rule__XAnnotationElementValue__Group_0_1__1 )
+            // InternalCheck.g:9586:2: rule__XAnnotationElementValue__Group_0_1__0__Impl rule__XAnnotationElementValue__Group_0_1__1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_1__0__Impl_in_rule__XAnnotationElementValue__Group_0_1__019923);
+            pushFollow(FOLLOW_20);
             rule__XAnnotationElementValue__Group_0_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_1__1_in_rule__XAnnotationElementValue__Group_0_1__019926);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Group_0_1__1();
 
             state._fsp--;
@@ -28863,25 +28863,25 @@ public final void rule__XAnnotationElementValue__Group_0_1__0() throws Recogniti
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9593:1: rule__XAnnotationElementValue__Group_0_1__0__Impl : ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 ) ) ;
+    // InternalCheck.g:9593:1: rule__XAnnotationElementValue__Group_0_1__0__Impl : ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 ) ) ;
     public final void rule__XAnnotationElementValue__Group_0_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9597:1: ( ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9598:1: ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 ) )
+            // InternalCheck.g:9597:1: ( ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 ) ) )
+            // InternalCheck.g:9598:1: ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9598:1: ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9599:1: ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 )
+            // InternalCheck.g:9598:1: ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 ) )
+            // InternalCheck.g:9599:1: ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getElementsAssignment_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9600:1: ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9600:2: rule__XAnnotationElementValue__ElementsAssignment_0_1_0
+            // InternalCheck.g:9600:1: ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 )
+            // InternalCheck.g:9600:2: rule__XAnnotationElementValue__ElementsAssignment_0_1_0
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__ElementsAssignment_0_1_0_in_rule__XAnnotationElementValue__Group_0_1__0__Impl19953);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__ElementsAssignment_0_1_0();
 
             state._fsp--;
@@ -28914,16 +28914,16 @@ public final void rule__XAnnotationElementValue__Group_0_1__0__Impl() throws Rec
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9610:1: rule__XAnnotationElementValue__Group_0_1__1 : rule__XAnnotationElementValue__Group_0_1__1__Impl ;
+    // InternalCheck.g:9610:1: rule__XAnnotationElementValue__Group_0_1__1 : rule__XAnnotationElementValue__Group_0_1__1__Impl ;
     public final void rule__XAnnotationElementValue__Group_0_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9614:1: ( rule__XAnnotationElementValue__Group_0_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9615:2: rule__XAnnotationElementValue__Group_0_1__1__Impl
+            // InternalCheck.g:9614:1: ( rule__XAnnotationElementValue__Group_0_1__1__Impl )
+            // InternalCheck.g:9615:2: rule__XAnnotationElementValue__Group_0_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_1__1__Impl_in_rule__XAnnotationElementValue__Group_0_1__119983);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Group_0_1__1__Impl();
 
             state._fsp--;
@@ -28947,22 +28947,22 @@ public final void rule__XAnnotationElementValue__Group_0_1__1() throws Recogniti
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9621:1: rule__XAnnotationElementValue__Group_0_1__1__Impl : ( ( rule__XAnnotationElementValue__Group_0_1_1__0 )* ) ;
+    // InternalCheck.g:9621:1: rule__XAnnotationElementValue__Group_0_1__1__Impl : ( ( rule__XAnnotationElementValue__Group_0_1_1__0 )* ) ;
     public final void rule__XAnnotationElementValue__Group_0_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9625:1: ( ( ( rule__XAnnotationElementValue__Group_0_1_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9626:1: ( ( rule__XAnnotationElementValue__Group_0_1_1__0 )* )
+            // InternalCheck.g:9625:1: ( ( ( rule__XAnnotationElementValue__Group_0_1_1__0 )* ) )
+            // InternalCheck.g:9626:1: ( ( rule__XAnnotationElementValue__Group_0_1_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9626:1: ( ( rule__XAnnotationElementValue__Group_0_1_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9627:1: ( rule__XAnnotationElementValue__Group_0_1_1__0 )*
+            // InternalCheck.g:9626:1: ( ( rule__XAnnotationElementValue__Group_0_1_1__0 )* )
+            // InternalCheck.g:9627:1: ( rule__XAnnotationElementValue__Group_0_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getGroup_0_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9628:1: ( rule__XAnnotationElementValue__Group_0_1_1__0 )*
+            // InternalCheck.g:9628:1: ( rule__XAnnotationElementValue__Group_0_1_1__0 )*
             loop92:
             do {
                 int alt92=2;
@@ -28975,9 +28975,9 @@ public final void rule__XAnnotationElementValue__Group_0_1__1__Impl() throws Rec
 
                 switch (alt92) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9628:2: rule__XAnnotationElementValue__Group_0_1_1__0
+            	    // InternalCheck.g:9628:2: rule__XAnnotationElementValue__Group_0_1_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_1_1__0_in_rule__XAnnotationElementValue__Group_0_1__1__Impl20010);
+            	    pushFollow(FOLLOW_21);
             	    rule__XAnnotationElementValue__Group_0_1_1__0();
 
             	    state._fsp--;
@@ -29016,21 +29016,21 @@ public final void rule__XAnnotationElementValue__Group_0_1__1__Impl() throws Rec
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_1_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9642:1: rule__XAnnotationElementValue__Group_0_1_1__0 : rule__XAnnotationElementValue__Group_0_1_1__0__Impl rule__XAnnotationElementValue__Group_0_1_1__1 ;
+    // InternalCheck.g:9642:1: rule__XAnnotationElementValue__Group_0_1_1__0 : rule__XAnnotationElementValue__Group_0_1_1__0__Impl rule__XAnnotationElementValue__Group_0_1_1__1 ;
     public final void rule__XAnnotationElementValue__Group_0_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9646:1: ( rule__XAnnotationElementValue__Group_0_1_1__0__Impl rule__XAnnotationElementValue__Group_0_1_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9647:2: rule__XAnnotationElementValue__Group_0_1_1__0__Impl rule__XAnnotationElementValue__Group_0_1_1__1
+            // InternalCheck.g:9646:1: ( rule__XAnnotationElementValue__Group_0_1_1__0__Impl rule__XAnnotationElementValue__Group_0_1_1__1 )
+            // InternalCheck.g:9647:2: rule__XAnnotationElementValue__Group_0_1_1__0__Impl rule__XAnnotationElementValue__Group_0_1_1__1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_1_1__0__Impl_in_rule__XAnnotationElementValue__Group_0_1_1__020045);
+            pushFollow(FOLLOW_49);
             rule__XAnnotationElementValue__Group_0_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_1_1__1_in_rule__XAnnotationElementValue__Group_0_1_1__020048);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Group_0_1_1__1();
 
             state._fsp--;
@@ -29054,22 +29054,22 @@ public final void rule__XAnnotationElementValue__Group_0_1_1__0() throws Recogni
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9654:1: rule__XAnnotationElementValue__Group_0_1_1__0__Impl : ( ',' ) ;
+    // InternalCheck.g:9654:1: rule__XAnnotationElementValue__Group_0_1_1__0__Impl : ( ',' ) ;
     public final void rule__XAnnotationElementValue__Group_0_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9658:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9659:1: ( ',' )
+            // InternalCheck.g:9658:1: ( ( ',' ) )
+            // InternalCheck.g:9659:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9659:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9660:1: ','
+            // InternalCheck.g:9659:1: ( ',' )
+            // InternalCheck.g:9660:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getCommaKeyword_0_1_1_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XAnnotationElementValue__Group_0_1_1__0__Impl20076); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValueAccess().getCommaKeyword_0_1_1_0()); 
             }
@@ -29095,16 +29095,16 @@ public final void rule__XAnnotationElementValue__Group_0_1_1__0__Impl() throws R
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_1_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9673:1: rule__XAnnotationElementValue__Group_0_1_1__1 : rule__XAnnotationElementValue__Group_0_1_1__1__Impl ;
+    // InternalCheck.g:9673:1: rule__XAnnotationElementValue__Group_0_1_1__1 : rule__XAnnotationElementValue__Group_0_1_1__1__Impl ;
     public final void rule__XAnnotationElementValue__Group_0_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9677:1: ( rule__XAnnotationElementValue__Group_0_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9678:2: rule__XAnnotationElementValue__Group_0_1_1__1__Impl
+            // InternalCheck.g:9677:1: ( rule__XAnnotationElementValue__Group_0_1_1__1__Impl )
+            // InternalCheck.g:9678:2: rule__XAnnotationElementValue__Group_0_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_1_1__1__Impl_in_rule__XAnnotationElementValue__Group_0_1_1__120107);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Group_0_1_1__1__Impl();
 
             state._fsp--;
@@ -29128,25 +29128,25 @@ public final void rule__XAnnotationElementValue__Group_0_1_1__1() throws Recogni
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9684:1: rule__XAnnotationElementValue__Group_0_1_1__1__Impl : ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 ) ) ;
+    // InternalCheck.g:9684:1: rule__XAnnotationElementValue__Group_0_1_1__1__Impl : ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 ) ) ;
     public final void rule__XAnnotationElementValue__Group_0_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9688:1: ( ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9689:1: ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 ) )
+            // InternalCheck.g:9688:1: ( ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 ) ) )
+            // InternalCheck.g:9689:1: ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9689:1: ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9690:1: ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 )
+            // InternalCheck.g:9689:1: ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 ) )
+            // InternalCheck.g:9690:1: ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getElementsAssignment_0_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9691:1: ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9691:2: rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1
+            // InternalCheck.g:9691:1: ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 )
+            // InternalCheck.g:9691:2: rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1_in_rule__XAnnotationElementValue__Group_0_1_1__1__Impl20134);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1();
 
             state._fsp--;
@@ -29179,21 +29179,21 @@ public final void rule__XAnnotationElementValue__Group_0_1_1__1__Impl() throws R
 
 
     // $ANTLR start "rule__XAssignment__Group_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9705:1: rule__XAssignment__Group_0__0 : rule__XAssignment__Group_0__0__Impl rule__XAssignment__Group_0__1 ;
+    // InternalCheck.g:9705:1: rule__XAssignment__Group_0__0 : rule__XAssignment__Group_0__0__Impl rule__XAssignment__Group_0__1 ;
     public final void rule__XAssignment__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9709:1: ( rule__XAssignment__Group_0__0__Impl rule__XAssignment__Group_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9710:2: rule__XAssignment__Group_0__0__Impl rule__XAssignment__Group_0__1
+            // InternalCheck.g:9709:1: ( rule__XAssignment__Group_0__0__Impl rule__XAssignment__Group_0__1 )
+            // InternalCheck.g:9710:2: rule__XAssignment__Group_0__0__Impl rule__XAssignment__Group_0__1
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_0__0__Impl_in_rule__XAssignment__Group_0__020168);
+            pushFollow(FOLLOW_43);
             rule__XAssignment__Group_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAssignment__Group_0__1_in_rule__XAssignment__Group_0__020171);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__Group_0__1();
 
             state._fsp--;
@@ -29217,23 +29217,23 @@ public final void rule__XAssignment__Group_0__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAssignment__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9717:1: rule__XAssignment__Group_0__0__Impl : ( () ) ;
+    // InternalCheck.g:9717:1: rule__XAssignment__Group_0__0__Impl : ( () ) ;
     public final void rule__XAssignment__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9721:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9722:1: ( () )
+            // InternalCheck.g:9721:1: ( ( () ) )
+            // InternalCheck.g:9722:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9722:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9723:1: ()
+            // InternalCheck.g:9722:1: ( () )
+            // InternalCheck.g:9723:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getXAssignmentAction_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9724:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9726:1: 
+            // InternalCheck.g:9724:1: ()
+            // InternalCheck.g:9726:1: 
             {
             }
 
@@ -29258,21 +29258,21 @@ public final void rule__XAssignment__Group_0__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAssignment__Group_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9736:1: rule__XAssignment__Group_0__1 : rule__XAssignment__Group_0__1__Impl rule__XAssignment__Group_0__2 ;
+    // InternalCheck.g:9736:1: rule__XAssignment__Group_0__1 : rule__XAssignment__Group_0__1__Impl rule__XAssignment__Group_0__2 ;
     public final void rule__XAssignment__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9740:1: ( rule__XAssignment__Group_0__1__Impl rule__XAssignment__Group_0__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9741:2: rule__XAssignment__Group_0__1__Impl rule__XAssignment__Group_0__2
+            // InternalCheck.g:9740:1: ( rule__XAssignment__Group_0__1__Impl rule__XAssignment__Group_0__2 )
+            // InternalCheck.g:9741:2: rule__XAssignment__Group_0__1__Impl rule__XAssignment__Group_0__2
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_0__1__Impl_in_rule__XAssignment__Group_0__120229);
+            pushFollow(FOLLOW_34);
             rule__XAssignment__Group_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAssignment__Group_0__2_in_rule__XAssignment__Group_0__120232);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__Group_0__2();
 
             state._fsp--;
@@ -29296,25 +29296,25 @@ public final void rule__XAssignment__Group_0__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAssignment__Group_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9748:1: rule__XAssignment__Group_0__1__Impl : ( ( rule__XAssignment__FeatureAssignment_0_1 ) ) ;
+    // InternalCheck.g:9748:1: rule__XAssignment__Group_0__1__Impl : ( ( rule__XAssignment__FeatureAssignment_0_1 ) ) ;
     public final void rule__XAssignment__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9752:1: ( ( ( rule__XAssignment__FeatureAssignment_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9753:1: ( ( rule__XAssignment__FeatureAssignment_0_1 ) )
+            // InternalCheck.g:9752:1: ( ( ( rule__XAssignment__FeatureAssignment_0_1 ) ) )
+            // InternalCheck.g:9753:1: ( ( rule__XAssignment__FeatureAssignment_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9753:1: ( ( rule__XAssignment__FeatureAssignment_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9754:1: ( rule__XAssignment__FeatureAssignment_0_1 )
+            // InternalCheck.g:9753:1: ( ( rule__XAssignment__FeatureAssignment_0_1 ) )
+            // InternalCheck.g:9754:1: ( rule__XAssignment__FeatureAssignment_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getFeatureAssignment_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9755:1: ( rule__XAssignment__FeatureAssignment_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9755:2: rule__XAssignment__FeatureAssignment_0_1
+            // InternalCheck.g:9755:1: ( rule__XAssignment__FeatureAssignment_0_1 )
+            // InternalCheck.g:9755:2: rule__XAssignment__FeatureAssignment_0_1
             {
-            pushFollow(FOLLOW_rule__XAssignment__FeatureAssignment_0_1_in_rule__XAssignment__Group_0__1__Impl20259);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__FeatureAssignment_0_1();
 
             state._fsp--;
@@ -29347,21 +29347,21 @@ public final void rule__XAssignment__Group_0__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAssignment__Group_0__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9765:1: rule__XAssignment__Group_0__2 : rule__XAssignment__Group_0__2__Impl rule__XAssignment__Group_0__3 ;
+    // InternalCheck.g:9765:1: rule__XAssignment__Group_0__2 : rule__XAssignment__Group_0__2__Impl rule__XAssignment__Group_0__3 ;
     public final void rule__XAssignment__Group_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9769:1: ( rule__XAssignment__Group_0__2__Impl rule__XAssignment__Group_0__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9770:2: rule__XAssignment__Group_0__2__Impl rule__XAssignment__Group_0__3
+            // InternalCheck.g:9769:1: ( rule__XAssignment__Group_0__2__Impl rule__XAssignment__Group_0__3 )
+            // InternalCheck.g:9770:2: rule__XAssignment__Group_0__2__Impl rule__XAssignment__Group_0__3
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_0__2__Impl_in_rule__XAssignment__Group_0__220289);
+            pushFollow(FOLLOW_32);
             rule__XAssignment__Group_0__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAssignment__Group_0__3_in_rule__XAssignment__Group_0__220292);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__Group_0__3();
 
             state._fsp--;
@@ -29385,22 +29385,22 @@ public final void rule__XAssignment__Group_0__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAssignment__Group_0__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9777:1: rule__XAssignment__Group_0__2__Impl : ( ruleOpSingleAssign ) ;
+    // InternalCheck.g:9777:1: rule__XAssignment__Group_0__2__Impl : ( ruleOpSingleAssign ) ;
     public final void rule__XAssignment__Group_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9781:1: ( ( ruleOpSingleAssign ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9782:1: ( ruleOpSingleAssign )
+            // InternalCheck.g:9781:1: ( ( ruleOpSingleAssign ) )
+            // InternalCheck.g:9782:1: ( ruleOpSingleAssign )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9782:1: ( ruleOpSingleAssign )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9783:1: ruleOpSingleAssign
+            // InternalCheck.g:9782:1: ( ruleOpSingleAssign )
+            // InternalCheck.g:9783:1: ruleOpSingleAssign
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getOpSingleAssignParserRuleCall_0_2()); 
             }
-            pushFollow(FOLLOW_ruleOpSingleAssign_in_rule__XAssignment__Group_0__2__Impl20319);
+            pushFollow(FOLLOW_2);
             ruleOpSingleAssign();
 
             state._fsp--;
@@ -29430,16 +29430,16 @@ public final void rule__XAssignment__Group_0__2__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAssignment__Group_0__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9794:1: rule__XAssignment__Group_0__3 : rule__XAssignment__Group_0__3__Impl ;
+    // InternalCheck.g:9794:1: rule__XAssignment__Group_0__3 : rule__XAssignment__Group_0__3__Impl ;
     public final void rule__XAssignment__Group_0__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9798:1: ( rule__XAssignment__Group_0__3__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9799:2: rule__XAssignment__Group_0__3__Impl
+            // InternalCheck.g:9798:1: ( rule__XAssignment__Group_0__3__Impl )
+            // InternalCheck.g:9799:2: rule__XAssignment__Group_0__3__Impl
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_0__3__Impl_in_rule__XAssignment__Group_0__320348);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__Group_0__3__Impl();
 
             state._fsp--;
@@ -29463,25 +29463,25 @@ public final void rule__XAssignment__Group_0__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAssignment__Group_0__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9805:1: rule__XAssignment__Group_0__3__Impl : ( ( rule__XAssignment__ValueAssignment_0_3 ) ) ;
+    // InternalCheck.g:9805:1: rule__XAssignment__Group_0__3__Impl : ( ( rule__XAssignment__ValueAssignment_0_3 ) ) ;
     public final void rule__XAssignment__Group_0__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9809:1: ( ( ( rule__XAssignment__ValueAssignment_0_3 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9810:1: ( ( rule__XAssignment__ValueAssignment_0_3 ) )
+            // InternalCheck.g:9809:1: ( ( ( rule__XAssignment__ValueAssignment_0_3 ) ) )
+            // InternalCheck.g:9810:1: ( ( rule__XAssignment__ValueAssignment_0_3 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9810:1: ( ( rule__XAssignment__ValueAssignment_0_3 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9811:1: ( rule__XAssignment__ValueAssignment_0_3 )
+            // InternalCheck.g:9810:1: ( ( rule__XAssignment__ValueAssignment_0_3 ) )
+            // InternalCheck.g:9811:1: ( rule__XAssignment__ValueAssignment_0_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getValueAssignment_0_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9812:1: ( rule__XAssignment__ValueAssignment_0_3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9812:2: rule__XAssignment__ValueAssignment_0_3
+            // InternalCheck.g:9812:1: ( rule__XAssignment__ValueAssignment_0_3 )
+            // InternalCheck.g:9812:2: rule__XAssignment__ValueAssignment_0_3
             {
-            pushFollow(FOLLOW_rule__XAssignment__ValueAssignment_0_3_in_rule__XAssignment__Group_0__3__Impl20375);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__ValueAssignment_0_3();
 
             state._fsp--;
@@ -29514,21 +29514,21 @@ public final void rule__XAssignment__Group_0__3__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAssignment__Group_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9830:1: rule__XAssignment__Group_1__0 : rule__XAssignment__Group_1__0__Impl rule__XAssignment__Group_1__1 ;
+    // InternalCheck.g:9830:1: rule__XAssignment__Group_1__0 : rule__XAssignment__Group_1__0__Impl rule__XAssignment__Group_1__1 ;
     public final void rule__XAssignment__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9834:1: ( rule__XAssignment__Group_1__0__Impl rule__XAssignment__Group_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9835:2: rule__XAssignment__Group_1__0__Impl rule__XAssignment__Group_1__1
+            // InternalCheck.g:9834:1: ( rule__XAssignment__Group_1__0__Impl rule__XAssignment__Group_1__1 )
+            // InternalCheck.g:9835:2: rule__XAssignment__Group_1__0__Impl rule__XAssignment__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_1__0__Impl_in_rule__XAssignment__Group_1__020413);
+            pushFollow(FOLLOW_51);
             rule__XAssignment__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAssignment__Group_1__1_in_rule__XAssignment__Group_1__020416);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__Group_1__1();
 
             state._fsp--;
@@ -29552,22 +29552,22 @@ public final void rule__XAssignment__Group_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAssignment__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9842:1: rule__XAssignment__Group_1__0__Impl : ( ruleXOrExpression ) ;
+    // InternalCheck.g:9842:1: rule__XAssignment__Group_1__0__Impl : ( ruleXOrExpression ) ;
     public final void rule__XAssignment__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9846:1: ( ( ruleXOrExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9847:1: ( ruleXOrExpression )
+            // InternalCheck.g:9846:1: ( ( ruleXOrExpression ) )
+            // InternalCheck.g:9847:1: ( ruleXOrExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9847:1: ( ruleXOrExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9848:1: ruleXOrExpression
+            // InternalCheck.g:9847:1: ( ruleXOrExpression )
+            // InternalCheck.g:9848:1: ruleXOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getXOrExpressionParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXOrExpression_in_rule__XAssignment__Group_1__0__Impl20443);
+            pushFollow(FOLLOW_2);
             ruleXOrExpression();
 
             state._fsp--;
@@ -29597,16 +29597,16 @@ public final void rule__XAssignment__Group_1__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAssignment__Group_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9859:1: rule__XAssignment__Group_1__1 : rule__XAssignment__Group_1__1__Impl ;
+    // InternalCheck.g:9859:1: rule__XAssignment__Group_1__1 : rule__XAssignment__Group_1__1__Impl ;
     public final void rule__XAssignment__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9863:1: ( rule__XAssignment__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9864:2: rule__XAssignment__Group_1__1__Impl
+            // InternalCheck.g:9863:1: ( rule__XAssignment__Group_1__1__Impl )
+            // InternalCheck.g:9864:2: rule__XAssignment__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_1__1__Impl_in_rule__XAssignment__Group_1__120472);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__Group_1__1__Impl();
 
             state._fsp--;
@@ -29630,29 +29630,29 @@ public final void rule__XAssignment__Group_1__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAssignment__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9870:1: rule__XAssignment__Group_1__1__Impl : ( ( rule__XAssignment__Group_1_1__0 )? ) ;
+    // InternalCheck.g:9870:1: rule__XAssignment__Group_1__1__Impl : ( ( rule__XAssignment__Group_1_1__0 )? ) ;
     public final void rule__XAssignment__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9874:1: ( ( ( rule__XAssignment__Group_1_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9875:1: ( ( rule__XAssignment__Group_1_1__0 )? )
+            // InternalCheck.g:9874:1: ( ( ( rule__XAssignment__Group_1_1__0 )? ) )
+            // InternalCheck.g:9875:1: ( ( rule__XAssignment__Group_1_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9875:1: ( ( rule__XAssignment__Group_1_1__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9876:1: ( rule__XAssignment__Group_1_1__0 )?
+            // InternalCheck.g:9875:1: ( ( rule__XAssignment__Group_1_1__0 )? )
+            // InternalCheck.g:9876:1: ( rule__XAssignment__Group_1_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getGroup_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9877:1: ( rule__XAssignment__Group_1_1__0 )?
+            // InternalCheck.g:9877:1: ( rule__XAssignment__Group_1_1__0 )?
             int alt93=2;
             alt93 = dfa93.predict(input);
             switch (alt93) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9877:2: rule__XAssignment__Group_1_1__0
+                    // InternalCheck.g:9877:2: rule__XAssignment__Group_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__XAssignment__Group_1_1__0_in_rule__XAssignment__Group_1__1__Impl20499);
+                    pushFollow(FOLLOW_2);
                     rule__XAssignment__Group_1_1__0();
 
                     state._fsp--;
@@ -29688,21 +29688,21 @@ public final void rule__XAssignment__Group_1__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9891:1: rule__XAssignment__Group_1_1__0 : rule__XAssignment__Group_1_1__0__Impl rule__XAssignment__Group_1_1__1 ;
+    // InternalCheck.g:9891:1: rule__XAssignment__Group_1_1__0 : rule__XAssignment__Group_1_1__0__Impl rule__XAssignment__Group_1_1__1 ;
     public final void rule__XAssignment__Group_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9895:1: ( rule__XAssignment__Group_1_1__0__Impl rule__XAssignment__Group_1_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9896:2: rule__XAssignment__Group_1_1__0__Impl rule__XAssignment__Group_1_1__1
+            // InternalCheck.g:9895:1: ( rule__XAssignment__Group_1_1__0__Impl rule__XAssignment__Group_1_1__1 )
+            // InternalCheck.g:9896:2: rule__XAssignment__Group_1_1__0__Impl rule__XAssignment__Group_1_1__1
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_1_1__0__Impl_in_rule__XAssignment__Group_1_1__020534);
+            pushFollow(FOLLOW_32);
             rule__XAssignment__Group_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAssignment__Group_1_1__1_in_rule__XAssignment__Group_1_1__020537);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__Group_1_1__1();
 
             state._fsp--;
@@ -29726,25 +29726,25 @@ public final void rule__XAssignment__Group_1_1__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9903:1: rule__XAssignment__Group_1_1__0__Impl : ( ( rule__XAssignment__Group_1_1_0__0 ) ) ;
+    // InternalCheck.g:9903:1: rule__XAssignment__Group_1_1__0__Impl : ( ( rule__XAssignment__Group_1_1_0__0 ) ) ;
     public final void rule__XAssignment__Group_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9907:1: ( ( ( rule__XAssignment__Group_1_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9908:1: ( ( rule__XAssignment__Group_1_1_0__0 ) )
+            // InternalCheck.g:9907:1: ( ( ( rule__XAssignment__Group_1_1_0__0 ) ) )
+            // InternalCheck.g:9908:1: ( ( rule__XAssignment__Group_1_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9908:1: ( ( rule__XAssignment__Group_1_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9909:1: ( rule__XAssignment__Group_1_1_0__0 )
+            // InternalCheck.g:9908:1: ( ( rule__XAssignment__Group_1_1_0__0 ) )
+            // InternalCheck.g:9909:1: ( rule__XAssignment__Group_1_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getGroup_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9910:1: ( rule__XAssignment__Group_1_1_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9910:2: rule__XAssignment__Group_1_1_0__0
+            // InternalCheck.g:9910:1: ( rule__XAssignment__Group_1_1_0__0 )
+            // InternalCheck.g:9910:2: rule__XAssignment__Group_1_1_0__0
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_1_1_0__0_in_rule__XAssignment__Group_1_1__0__Impl20564);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__Group_1_1_0__0();
 
             state._fsp--;
@@ -29777,16 +29777,16 @@ public final void rule__XAssignment__Group_1_1__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9920:1: rule__XAssignment__Group_1_1__1 : rule__XAssignment__Group_1_1__1__Impl ;
+    // InternalCheck.g:9920:1: rule__XAssignment__Group_1_1__1 : rule__XAssignment__Group_1_1__1__Impl ;
     public final void rule__XAssignment__Group_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9924:1: ( rule__XAssignment__Group_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9925:2: rule__XAssignment__Group_1_1__1__Impl
+            // InternalCheck.g:9924:1: ( rule__XAssignment__Group_1_1__1__Impl )
+            // InternalCheck.g:9925:2: rule__XAssignment__Group_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_1_1__1__Impl_in_rule__XAssignment__Group_1_1__120594);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__Group_1_1__1__Impl();
 
             state._fsp--;
@@ -29810,25 +29810,25 @@ public final void rule__XAssignment__Group_1_1__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9931:1: rule__XAssignment__Group_1_1__1__Impl : ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) ) ;
+    // InternalCheck.g:9931:1: rule__XAssignment__Group_1_1__1__Impl : ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) ) ;
     public final void rule__XAssignment__Group_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9935:1: ( ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9936:1: ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) )
+            // InternalCheck.g:9935:1: ( ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) ) )
+            // InternalCheck.g:9936:1: ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9936:1: ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9937:1: ( rule__XAssignment__RightOperandAssignment_1_1_1 )
+            // InternalCheck.g:9936:1: ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) )
+            // InternalCheck.g:9937:1: ( rule__XAssignment__RightOperandAssignment_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getRightOperandAssignment_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9938:1: ( rule__XAssignment__RightOperandAssignment_1_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9938:2: rule__XAssignment__RightOperandAssignment_1_1_1
+            // InternalCheck.g:9938:1: ( rule__XAssignment__RightOperandAssignment_1_1_1 )
+            // InternalCheck.g:9938:2: rule__XAssignment__RightOperandAssignment_1_1_1
             {
-            pushFollow(FOLLOW_rule__XAssignment__RightOperandAssignment_1_1_1_in_rule__XAssignment__Group_1_1__1__Impl20621);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__RightOperandAssignment_1_1_1();
 
             state._fsp--;
@@ -29861,16 +29861,16 @@ public final void rule__XAssignment__Group_1_1__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9952:1: rule__XAssignment__Group_1_1_0__0 : rule__XAssignment__Group_1_1_0__0__Impl ;
+    // InternalCheck.g:9952:1: rule__XAssignment__Group_1_1_0__0 : rule__XAssignment__Group_1_1_0__0__Impl ;
     public final void rule__XAssignment__Group_1_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9956:1: ( rule__XAssignment__Group_1_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9957:2: rule__XAssignment__Group_1_1_0__0__Impl
+            // InternalCheck.g:9956:1: ( rule__XAssignment__Group_1_1_0__0__Impl )
+            // InternalCheck.g:9957:2: rule__XAssignment__Group_1_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_1_1_0__0__Impl_in_rule__XAssignment__Group_1_1_0__020655);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__Group_1_1_0__0__Impl();
 
             state._fsp--;
@@ -29894,25 +29894,25 @@ public final void rule__XAssignment__Group_1_1_0__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9963:1: rule__XAssignment__Group_1_1_0__0__Impl : ( ( rule__XAssignment__Group_1_1_0_0__0 ) ) ;
+    // InternalCheck.g:9963:1: rule__XAssignment__Group_1_1_0__0__Impl : ( ( rule__XAssignment__Group_1_1_0_0__0 ) ) ;
     public final void rule__XAssignment__Group_1_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9967:1: ( ( ( rule__XAssignment__Group_1_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9968:1: ( ( rule__XAssignment__Group_1_1_0_0__0 ) )
+            // InternalCheck.g:9967:1: ( ( ( rule__XAssignment__Group_1_1_0_0__0 ) ) )
+            // InternalCheck.g:9968:1: ( ( rule__XAssignment__Group_1_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9968:1: ( ( rule__XAssignment__Group_1_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9969:1: ( rule__XAssignment__Group_1_1_0_0__0 )
+            // InternalCheck.g:9968:1: ( ( rule__XAssignment__Group_1_1_0_0__0 ) )
+            // InternalCheck.g:9969:1: ( rule__XAssignment__Group_1_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getGroup_1_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9970:1: ( rule__XAssignment__Group_1_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9970:2: rule__XAssignment__Group_1_1_0_0__0
+            // InternalCheck.g:9970:1: ( rule__XAssignment__Group_1_1_0_0__0 )
+            // InternalCheck.g:9970:2: rule__XAssignment__Group_1_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_1_1_0_0__0_in_rule__XAssignment__Group_1_1_0__0__Impl20682);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__Group_1_1_0_0__0();
 
             state._fsp--;
@@ -29945,21 +29945,21 @@ public final void rule__XAssignment__Group_1_1_0__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9982:1: rule__XAssignment__Group_1_1_0_0__0 : rule__XAssignment__Group_1_1_0_0__0__Impl rule__XAssignment__Group_1_1_0_0__1 ;
+    // InternalCheck.g:9982:1: rule__XAssignment__Group_1_1_0_0__0 : rule__XAssignment__Group_1_1_0_0__0__Impl rule__XAssignment__Group_1_1_0_0__1 ;
     public final void rule__XAssignment__Group_1_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9986:1: ( rule__XAssignment__Group_1_1_0_0__0__Impl rule__XAssignment__Group_1_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9987:2: rule__XAssignment__Group_1_1_0_0__0__Impl rule__XAssignment__Group_1_1_0_0__1
+            // InternalCheck.g:9986:1: ( rule__XAssignment__Group_1_1_0_0__0__Impl rule__XAssignment__Group_1_1_0_0__1 )
+            // InternalCheck.g:9987:2: rule__XAssignment__Group_1_1_0_0__0__Impl rule__XAssignment__Group_1_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_1_1_0_0__0__Impl_in_rule__XAssignment__Group_1_1_0_0__020714);
+            pushFollow(FOLLOW_51);
             rule__XAssignment__Group_1_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAssignment__Group_1_1_0_0__1_in_rule__XAssignment__Group_1_1_0_0__020717);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__Group_1_1_0_0__1();
 
             state._fsp--;
@@ -29983,23 +29983,23 @@ public final void rule__XAssignment__Group_1_1_0_0__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9994:1: rule__XAssignment__Group_1_1_0_0__0__Impl : ( () ) ;
+    // InternalCheck.g:9994:1: rule__XAssignment__Group_1_1_0_0__0__Impl : ( () ) ;
     public final void rule__XAssignment__Group_1_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9998:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9999:1: ( () )
+            // InternalCheck.g:9998:1: ( ( () ) )
+            // InternalCheck.g:9999:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9999:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10000:1: ()
+            // InternalCheck.g:9999:1: ( () )
+            // InternalCheck.g:10000:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10001:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10003:1: 
+            // InternalCheck.g:10001:1: ()
+            // InternalCheck.g:10003:1: 
             {
             }
 
@@ -30024,16 +30024,16 @@ public final void rule__XAssignment__Group_1_1_0_0__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10013:1: rule__XAssignment__Group_1_1_0_0__1 : rule__XAssignment__Group_1_1_0_0__1__Impl ;
+    // InternalCheck.g:10013:1: rule__XAssignment__Group_1_1_0_0__1 : rule__XAssignment__Group_1_1_0_0__1__Impl ;
     public final void rule__XAssignment__Group_1_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10017:1: ( rule__XAssignment__Group_1_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10018:2: rule__XAssignment__Group_1_1_0_0__1__Impl
+            // InternalCheck.g:10017:1: ( rule__XAssignment__Group_1_1_0_0__1__Impl )
+            // InternalCheck.g:10018:2: rule__XAssignment__Group_1_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_1_1_0_0__1__Impl_in_rule__XAssignment__Group_1_1_0_0__120775);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__Group_1_1_0_0__1__Impl();
 
             state._fsp--;
@@ -30057,25 +30057,25 @@ public final void rule__XAssignment__Group_1_1_0_0__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10024:1: rule__XAssignment__Group_1_1_0_0__1__Impl : ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) ) ;
+    // InternalCheck.g:10024:1: rule__XAssignment__Group_1_1_0_0__1__Impl : ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) ) ;
     public final void rule__XAssignment__Group_1_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10028:1: ( ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10029:1: ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) )
+            // InternalCheck.g:10028:1: ( ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) ) )
+            // InternalCheck.g:10029:1: ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10029:1: ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10030:1: ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 )
+            // InternalCheck.g:10029:1: ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) )
+            // InternalCheck.g:10030:1: ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getFeatureAssignment_1_1_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10031:1: ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10031:2: rule__XAssignment__FeatureAssignment_1_1_0_0_1
+            // InternalCheck.g:10031:1: ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 )
+            // InternalCheck.g:10031:2: rule__XAssignment__FeatureAssignment_1_1_0_0_1
             {
-            pushFollow(FOLLOW_rule__XAssignment__FeatureAssignment_1_1_0_0_1_in_rule__XAssignment__Group_1_1_0_0__1__Impl20802);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__FeatureAssignment_1_1_0_0_1();
 
             state._fsp--;
@@ -30108,21 +30108,21 @@ public final void rule__XAssignment__Group_1_1_0_0__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_5__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10045:1: rule__OpMultiAssign__Group_5__0 : rule__OpMultiAssign__Group_5__0__Impl rule__OpMultiAssign__Group_5__1 ;
+    // InternalCheck.g:10045:1: rule__OpMultiAssign__Group_5__0 : rule__OpMultiAssign__Group_5__0__Impl rule__OpMultiAssign__Group_5__1 ;
     public final void rule__OpMultiAssign__Group_5__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10049:1: ( rule__OpMultiAssign__Group_5__0__Impl rule__OpMultiAssign__Group_5__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10050:2: rule__OpMultiAssign__Group_5__0__Impl rule__OpMultiAssign__Group_5__1
+            // InternalCheck.g:10049:1: ( rule__OpMultiAssign__Group_5__0__Impl rule__OpMultiAssign__Group_5__1 )
+            // InternalCheck.g:10050:2: rule__OpMultiAssign__Group_5__0__Impl rule__OpMultiAssign__Group_5__1
             {
-            pushFollow(FOLLOW_rule__OpMultiAssign__Group_5__0__Impl_in_rule__OpMultiAssign__Group_5__020836);
+            pushFollow(FOLLOW_52);
             rule__OpMultiAssign__Group_5__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OpMultiAssign__Group_5__1_in_rule__OpMultiAssign__Group_5__020839);
+            pushFollow(FOLLOW_2);
             rule__OpMultiAssign__Group_5__1();
 
             state._fsp--;
@@ -30146,22 +30146,22 @@ public final void rule__OpMultiAssign__Group_5__0() throws RecognitionException
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_5__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10057:1: rule__OpMultiAssign__Group_5__0__Impl : ( '<' ) ;
+    // InternalCheck.g:10057:1: rule__OpMultiAssign__Group_5__0__Impl : ( '<' ) ;
     public final void rule__OpMultiAssign__Group_5__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10061:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10062:1: ( '<' )
+            // InternalCheck.g:10061:1: ( ( '<' ) )
+            // InternalCheck.g:10062:1: ( '<' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10062:1: ( '<' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10063:1: '<'
+            // InternalCheck.g:10062:1: ( '<' )
+            // InternalCheck.g:10063:1: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignAccess().getLessThanSignKeyword_5_0()); 
             }
-            match(input,47,FOLLOW_47_in_rule__OpMultiAssign__Group_5__0__Impl20867); if (state.failed) return ;
+            match(input,47,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpMultiAssignAccess().getLessThanSignKeyword_5_0()); 
             }
@@ -30187,21 +30187,21 @@ public final void rule__OpMultiAssign__Group_5__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_5__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10076:1: rule__OpMultiAssign__Group_5__1 : rule__OpMultiAssign__Group_5__1__Impl rule__OpMultiAssign__Group_5__2 ;
+    // InternalCheck.g:10076:1: rule__OpMultiAssign__Group_5__1 : rule__OpMultiAssign__Group_5__1__Impl rule__OpMultiAssign__Group_5__2 ;
     public final void rule__OpMultiAssign__Group_5__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10080:1: ( rule__OpMultiAssign__Group_5__1__Impl rule__OpMultiAssign__Group_5__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10081:2: rule__OpMultiAssign__Group_5__1__Impl rule__OpMultiAssign__Group_5__2
+            // InternalCheck.g:10080:1: ( rule__OpMultiAssign__Group_5__1__Impl rule__OpMultiAssign__Group_5__2 )
+            // InternalCheck.g:10081:2: rule__OpMultiAssign__Group_5__1__Impl rule__OpMultiAssign__Group_5__2
             {
-            pushFollow(FOLLOW_rule__OpMultiAssign__Group_5__1__Impl_in_rule__OpMultiAssign__Group_5__120898);
+            pushFollow(FOLLOW_34);
             rule__OpMultiAssign__Group_5__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OpMultiAssign__Group_5__2_in_rule__OpMultiAssign__Group_5__120901);
+            pushFollow(FOLLOW_2);
             rule__OpMultiAssign__Group_5__2();
 
             state._fsp--;
@@ -30225,22 +30225,22 @@ public final void rule__OpMultiAssign__Group_5__1() throws RecognitionException
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_5__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10088:1: rule__OpMultiAssign__Group_5__1__Impl : ( '<' ) ;
+    // InternalCheck.g:10088:1: rule__OpMultiAssign__Group_5__1__Impl : ( '<' ) ;
     public final void rule__OpMultiAssign__Group_5__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10092:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10093:1: ( '<' )
+            // InternalCheck.g:10092:1: ( ( '<' ) )
+            // InternalCheck.g:10093:1: ( '<' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10093:1: ( '<' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10094:1: '<'
+            // InternalCheck.g:10093:1: ( '<' )
+            // InternalCheck.g:10094:1: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignAccess().getLessThanSignKeyword_5_1()); 
             }
-            match(input,47,FOLLOW_47_in_rule__OpMultiAssign__Group_5__1__Impl20929); if (state.failed) return ;
+            match(input,47,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpMultiAssignAccess().getLessThanSignKeyword_5_1()); 
             }
@@ -30266,16 +30266,16 @@ public final void rule__OpMultiAssign__Group_5__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_5__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10107:1: rule__OpMultiAssign__Group_5__2 : rule__OpMultiAssign__Group_5__2__Impl ;
+    // InternalCheck.g:10107:1: rule__OpMultiAssign__Group_5__2 : rule__OpMultiAssign__Group_5__2__Impl ;
     public final void rule__OpMultiAssign__Group_5__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10111:1: ( rule__OpMultiAssign__Group_5__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10112:2: rule__OpMultiAssign__Group_5__2__Impl
+            // InternalCheck.g:10111:1: ( rule__OpMultiAssign__Group_5__2__Impl )
+            // InternalCheck.g:10112:2: rule__OpMultiAssign__Group_5__2__Impl
             {
-            pushFollow(FOLLOW_rule__OpMultiAssign__Group_5__2__Impl_in_rule__OpMultiAssign__Group_5__220960);
+            pushFollow(FOLLOW_2);
             rule__OpMultiAssign__Group_5__2__Impl();
 
             state._fsp--;
@@ -30299,22 +30299,22 @@ public final void rule__OpMultiAssign__Group_5__2() throws RecognitionException
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_5__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10118:1: rule__OpMultiAssign__Group_5__2__Impl : ( '=' ) ;
+    // InternalCheck.g:10118:1: rule__OpMultiAssign__Group_5__2__Impl : ( '=' ) ;
     public final void rule__OpMultiAssign__Group_5__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10122:1: ( ( '=' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10123:1: ( '=' )
+            // InternalCheck.g:10122:1: ( ( '=' ) )
+            // InternalCheck.g:10123:1: ( '=' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10123:1: ( '=' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10124:1: '='
+            // InternalCheck.g:10123:1: ( '=' )
+            // InternalCheck.g:10124:1: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignAccess().getEqualsSignKeyword_5_2()); 
             }
-            match(input,13,FOLLOW_13_in_rule__OpMultiAssign__Group_5__2__Impl20988); if (state.failed) return ;
+            match(input,13,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpMultiAssignAccess().getEqualsSignKeyword_5_2()); 
             }
@@ -30340,21 +30340,21 @@ public final void rule__OpMultiAssign__Group_5__2__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_6__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10143:1: rule__OpMultiAssign__Group_6__0 : rule__OpMultiAssign__Group_6__0__Impl rule__OpMultiAssign__Group_6__1 ;
+    // InternalCheck.g:10143:1: rule__OpMultiAssign__Group_6__0 : rule__OpMultiAssign__Group_6__0__Impl rule__OpMultiAssign__Group_6__1 ;
     public final void rule__OpMultiAssign__Group_6__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10147:1: ( rule__OpMultiAssign__Group_6__0__Impl rule__OpMultiAssign__Group_6__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10148:2: rule__OpMultiAssign__Group_6__0__Impl rule__OpMultiAssign__Group_6__1
+            // InternalCheck.g:10147:1: ( rule__OpMultiAssign__Group_6__0__Impl rule__OpMultiAssign__Group_6__1 )
+            // InternalCheck.g:10148:2: rule__OpMultiAssign__Group_6__0__Impl rule__OpMultiAssign__Group_6__1
             {
-            pushFollow(FOLLOW_rule__OpMultiAssign__Group_6__0__Impl_in_rule__OpMultiAssign__Group_6__021025);
+            pushFollow(FOLLOW_53);
             rule__OpMultiAssign__Group_6__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OpMultiAssign__Group_6__1_in_rule__OpMultiAssign__Group_6__021028);
+            pushFollow(FOLLOW_2);
             rule__OpMultiAssign__Group_6__1();
 
             state._fsp--;
@@ -30378,22 +30378,22 @@ public final void rule__OpMultiAssign__Group_6__0() throws RecognitionException
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_6__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10155:1: rule__OpMultiAssign__Group_6__0__Impl : ( '>' ) ;
+    // InternalCheck.g:10155:1: rule__OpMultiAssign__Group_6__0__Impl : ( '>' ) ;
     public final void rule__OpMultiAssign__Group_6__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10159:1: ( ( '>' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10160:1: ( '>' )
+            // InternalCheck.g:10159:1: ( ( '>' ) )
+            // InternalCheck.g:10160:1: ( '>' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10160:1: ( '>' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10161:1: '>'
+            // InternalCheck.g:10160:1: ( '>' )
+            // InternalCheck.g:10161:1: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignAccess().getGreaterThanSignKeyword_6_0()); 
             }
-            match(input,46,FOLLOW_46_in_rule__OpMultiAssign__Group_6__0__Impl21056); if (state.failed) return ;
+            match(input,46,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpMultiAssignAccess().getGreaterThanSignKeyword_6_0()); 
             }
@@ -30419,21 +30419,21 @@ public final void rule__OpMultiAssign__Group_6__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_6__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10174:1: rule__OpMultiAssign__Group_6__1 : rule__OpMultiAssign__Group_6__1__Impl rule__OpMultiAssign__Group_6__2 ;
+    // InternalCheck.g:10174:1: rule__OpMultiAssign__Group_6__1 : rule__OpMultiAssign__Group_6__1__Impl rule__OpMultiAssign__Group_6__2 ;
     public final void rule__OpMultiAssign__Group_6__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10178:1: ( rule__OpMultiAssign__Group_6__1__Impl rule__OpMultiAssign__Group_6__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10179:2: rule__OpMultiAssign__Group_6__1__Impl rule__OpMultiAssign__Group_6__2
+            // InternalCheck.g:10178:1: ( rule__OpMultiAssign__Group_6__1__Impl rule__OpMultiAssign__Group_6__2 )
+            // InternalCheck.g:10179:2: rule__OpMultiAssign__Group_6__1__Impl rule__OpMultiAssign__Group_6__2
             {
-            pushFollow(FOLLOW_rule__OpMultiAssign__Group_6__1__Impl_in_rule__OpMultiAssign__Group_6__121087);
+            pushFollow(FOLLOW_53);
             rule__OpMultiAssign__Group_6__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OpMultiAssign__Group_6__2_in_rule__OpMultiAssign__Group_6__121090);
+            pushFollow(FOLLOW_2);
             rule__OpMultiAssign__Group_6__2();
 
             state._fsp--;
@@ -30457,22 +30457,22 @@ public final void rule__OpMultiAssign__Group_6__1() throws RecognitionException
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_6__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10186:1: rule__OpMultiAssign__Group_6__1__Impl : ( ( '>' )? ) ;
+    // InternalCheck.g:10186:1: rule__OpMultiAssign__Group_6__1__Impl : ( ( '>' )? ) ;
     public final void rule__OpMultiAssign__Group_6__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10190:1: ( ( ( '>' )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10191:1: ( ( '>' )? )
+            // InternalCheck.g:10190:1: ( ( ( '>' )? ) )
+            // InternalCheck.g:10191:1: ( ( '>' )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10191:1: ( ( '>' )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10192:1: ( '>' )?
+            // InternalCheck.g:10191:1: ( ( '>' )? )
+            // InternalCheck.g:10192:1: ( '>' )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignAccess().getGreaterThanSignKeyword_6_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10193:1: ( '>' )?
+            // InternalCheck.g:10193:1: ( '>' )?
             int alt94=2;
             int LA94_0 = input.LA(1);
 
@@ -30481,9 +30481,9 @@ public final void rule__OpMultiAssign__Group_6__1__Impl() throws RecognitionExce
             }
             switch (alt94) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10194:2: '>'
+                    // InternalCheck.g:10194:2: '>'
                     {
-                    match(input,46,FOLLOW_46_in_rule__OpMultiAssign__Group_6__1__Impl21119); if (state.failed) return ;
+                    match(input,46,FOLLOW_2); if (state.failed) return ;
 
                     }
                     break;
@@ -30515,16 +30515,16 @@ public final void rule__OpMultiAssign__Group_6__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_6__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10205:1: rule__OpMultiAssign__Group_6__2 : rule__OpMultiAssign__Group_6__2__Impl ;
+    // InternalCheck.g:10205:1: rule__OpMultiAssign__Group_6__2 : rule__OpMultiAssign__Group_6__2__Impl ;
     public final void rule__OpMultiAssign__Group_6__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10209:1: ( rule__OpMultiAssign__Group_6__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10210:2: rule__OpMultiAssign__Group_6__2__Impl
+            // InternalCheck.g:10209:1: ( rule__OpMultiAssign__Group_6__2__Impl )
+            // InternalCheck.g:10210:2: rule__OpMultiAssign__Group_6__2__Impl
             {
-            pushFollow(FOLLOW_rule__OpMultiAssign__Group_6__2__Impl_in_rule__OpMultiAssign__Group_6__221152);
+            pushFollow(FOLLOW_2);
             rule__OpMultiAssign__Group_6__2__Impl();
 
             state._fsp--;
@@ -30548,22 +30548,22 @@ public final void rule__OpMultiAssign__Group_6__2() throws RecognitionException
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_6__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10216:1: rule__OpMultiAssign__Group_6__2__Impl : ( '>=' ) ;
+    // InternalCheck.g:10216:1: rule__OpMultiAssign__Group_6__2__Impl : ( '>=' ) ;
     public final void rule__OpMultiAssign__Group_6__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10220:1: ( ( '>=' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10221:1: ( '>=' )
+            // InternalCheck.g:10220:1: ( ( '>=' ) )
+            // InternalCheck.g:10221:1: ( '>=' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10221:1: ( '>=' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10222:1: '>='
+            // InternalCheck.g:10221:1: ( '>=' )
+            // InternalCheck.g:10222:1: '>='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignAccess().getGreaterThanSignEqualsSignKeyword_6_2()); 
             }
-            match(input,45,FOLLOW_45_in_rule__OpMultiAssign__Group_6__2__Impl21180); if (state.failed) return ;
+            match(input,45,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpMultiAssignAccess().getGreaterThanSignEqualsSignKeyword_6_2()); 
             }
@@ -30589,21 +30589,21 @@ public final void rule__OpMultiAssign__Group_6__2__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XOrExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10241:1: rule__XOrExpression__Group__0 : rule__XOrExpression__Group__0__Impl rule__XOrExpression__Group__1 ;
+    // InternalCheck.g:10241:1: rule__XOrExpression__Group__0 : rule__XOrExpression__Group__0__Impl rule__XOrExpression__Group__1 ;
     public final void rule__XOrExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10245:1: ( rule__XOrExpression__Group__0__Impl rule__XOrExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10246:2: rule__XOrExpression__Group__0__Impl rule__XOrExpression__Group__1
+            // InternalCheck.g:10245:1: ( rule__XOrExpression__Group__0__Impl rule__XOrExpression__Group__1 )
+            // InternalCheck.g:10246:2: rule__XOrExpression__Group__0__Impl rule__XOrExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XOrExpression__Group__0__Impl_in_rule__XOrExpression__Group__021217);
+            pushFollow(FOLLOW_54);
             rule__XOrExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XOrExpression__Group__1_in_rule__XOrExpression__Group__021220);
+            pushFollow(FOLLOW_2);
             rule__XOrExpression__Group__1();
 
             state._fsp--;
@@ -30627,22 +30627,22 @@ public final void rule__XOrExpression__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XOrExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10253:1: rule__XOrExpression__Group__0__Impl : ( ruleXAndExpression ) ;
+    // InternalCheck.g:10253:1: rule__XOrExpression__Group__0__Impl : ( ruleXAndExpression ) ;
     public final void rule__XOrExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10257:1: ( ( ruleXAndExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10258:1: ( ruleXAndExpression )
+            // InternalCheck.g:10257:1: ( ( ruleXAndExpression ) )
+            // InternalCheck.g:10258:1: ( ruleXAndExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10258:1: ( ruleXAndExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10259:1: ruleXAndExpression
+            // InternalCheck.g:10258:1: ( ruleXAndExpression )
+            // InternalCheck.g:10259:1: ruleXAndExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getXAndExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleXAndExpression_in_rule__XOrExpression__Group__0__Impl21247);
+            pushFollow(FOLLOW_2);
             ruleXAndExpression();
 
             state._fsp--;
@@ -30672,16 +30672,16 @@ public final void rule__XOrExpression__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XOrExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10270:1: rule__XOrExpression__Group__1 : rule__XOrExpression__Group__1__Impl ;
+    // InternalCheck.g:10270:1: rule__XOrExpression__Group__1 : rule__XOrExpression__Group__1__Impl ;
     public final void rule__XOrExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10274:1: ( rule__XOrExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10275:2: rule__XOrExpression__Group__1__Impl
+            // InternalCheck.g:10274:1: ( rule__XOrExpression__Group__1__Impl )
+            // InternalCheck.g:10275:2: rule__XOrExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XOrExpression__Group__1__Impl_in_rule__XOrExpression__Group__121276);
+            pushFollow(FOLLOW_2);
             rule__XOrExpression__Group__1__Impl();
 
             state._fsp--;
@@ -30705,22 +30705,22 @@ public final void rule__XOrExpression__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XOrExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10281:1: rule__XOrExpression__Group__1__Impl : ( ( rule__XOrExpression__Group_1__0 )* ) ;
+    // InternalCheck.g:10281:1: rule__XOrExpression__Group__1__Impl : ( ( rule__XOrExpression__Group_1__0 )* ) ;
     public final void rule__XOrExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10285:1: ( ( ( rule__XOrExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10286:1: ( ( rule__XOrExpression__Group_1__0 )* )
+            // InternalCheck.g:10285:1: ( ( ( rule__XOrExpression__Group_1__0 )* ) )
+            // InternalCheck.g:10286:1: ( ( rule__XOrExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10286:1: ( ( rule__XOrExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10287:1: ( rule__XOrExpression__Group_1__0 )*
+            // InternalCheck.g:10286:1: ( ( rule__XOrExpression__Group_1__0 )* )
+            // InternalCheck.g:10287:1: ( rule__XOrExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10288:1: ( rule__XOrExpression__Group_1__0 )*
+            // InternalCheck.g:10288:1: ( rule__XOrExpression__Group_1__0 )*
             loop95:
             do {
                 int alt95=2;
@@ -30739,9 +30739,9 @@ public final void rule__XOrExpression__Group__1__Impl() throws RecognitionExcept
 
                 switch (alt95) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10288:2: rule__XOrExpression__Group_1__0
+            	    // InternalCheck.g:10288:2: rule__XOrExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XOrExpression__Group_1__0_in_rule__XOrExpression__Group__1__Impl21303);
+            	    pushFollow(FOLLOW_55);
             	    rule__XOrExpression__Group_1__0();
 
             	    state._fsp--;
@@ -30780,21 +30780,21 @@ public final void rule__XOrExpression__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XOrExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10302:1: rule__XOrExpression__Group_1__0 : rule__XOrExpression__Group_1__0__Impl rule__XOrExpression__Group_1__1 ;
+    // InternalCheck.g:10302:1: rule__XOrExpression__Group_1__0 : rule__XOrExpression__Group_1__0__Impl rule__XOrExpression__Group_1__1 ;
     public final void rule__XOrExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10306:1: ( rule__XOrExpression__Group_1__0__Impl rule__XOrExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10307:2: rule__XOrExpression__Group_1__0__Impl rule__XOrExpression__Group_1__1
+            // InternalCheck.g:10306:1: ( rule__XOrExpression__Group_1__0__Impl rule__XOrExpression__Group_1__1 )
+            // InternalCheck.g:10307:2: rule__XOrExpression__Group_1__0__Impl rule__XOrExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XOrExpression__Group_1__0__Impl_in_rule__XOrExpression__Group_1__021338);
+            pushFollow(FOLLOW_32);
             rule__XOrExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XOrExpression__Group_1__1_in_rule__XOrExpression__Group_1__021341);
+            pushFollow(FOLLOW_2);
             rule__XOrExpression__Group_1__1();
 
             state._fsp--;
@@ -30818,25 +30818,25 @@ public final void rule__XOrExpression__Group_1__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XOrExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10314:1: rule__XOrExpression__Group_1__0__Impl : ( ( rule__XOrExpression__Group_1_0__0 ) ) ;
+    // InternalCheck.g:10314:1: rule__XOrExpression__Group_1__0__Impl : ( ( rule__XOrExpression__Group_1_0__0 ) ) ;
     public final void rule__XOrExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10318:1: ( ( ( rule__XOrExpression__Group_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10319:1: ( ( rule__XOrExpression__Group_1_0__0 ) )
+            // InternalCheck.g:10318:1: ( ( ( rule__XOrExpression__Group_1_0__0 ) ) )
+            // InternalCheck.g:10319:1: ( ( rule__XOrExpression__Group_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10319:1: ( ( rule__XOrExpression__Group_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10320:1: ( rule__XOrExpression__Group_1_0__0 )
+            // InternalCheck.g:10319:1: ( ( rule__XOrExpression__Group_1_0__0 ) )
+            // InternalCheck.g:10320:1: ( rule__XOrExpression__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getGroup_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10321:1: ( rule__XOrExpression__Group_1_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10321:2: rule__XOrExpression__Group_1_0__0
+            // InternalCheck.g:10321:1: ( rule__XOrExpression__Group_1_0__0 )
+            // InternalCheck.g:10321:2: rule__XOrExpression__Group_1_0__0
             {
-            pushFollow(FOLLOW_rule__XOrExpression__Group_1_0__0_in_rule__XOrExpression__Group_1__0__Impl21368);
+            pushFollow(FOLLOW_2);
             rule__XOrExpression__Group_1_0__0();
 
             state._fsp--;
@@ -30869,16 +30869,16 @@ public final void rule__XOrExpression__Group_1__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XOrExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10331:1: rule__XOrExpression__Group_1__1 : rule__XOrExpression__Group_1__1__Impl ;
+    // InternalCheck.g:10331:1: rule__XOrExpression__Group_1__1 : rule__XOrExpression__Group_1__1__Impl ;
     public final void rule__XOrExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10335:1: ( rule__XOrExpression__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10336:2: rule__XOrExpression__Group_1__1__Impl
+            // InternalCheck.g:10335:1: ( rule__XOrExpression__Group_1__1__Impl )
+            // InternalCheck.g:10336:2: rule__XOrExpression__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XOrExpression__Group_1__1__Impl_in_rule__XOrExpression__Group_1__121398);
+            pushFollow(FOLLOW_2);
             rule__XOrExpression__Group_1__1__Impl();
 
             state._fsp--;
@@ -30902,25 +30902,25 @@ public final void rule__XOrExpression__Group_1__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XOrExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10342:1: rule__XOrExpression__Group_1__1__Impl : ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) ) ;
+    // InternalCheck.g:10342:1: rule__XOrExpression__Group_1__1__Impl : ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) ) ;
     public final void rule__XOrExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10346:1: ( ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10347:1: ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) )
+            // InternalCheck.g:10346:1: ( ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) ) )
+            // InternalCheck.g:10347:1: ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10347:1: ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10348:1: ( rule__XOrExpression__RightOperandAssignment_1_1 )
+            // InternalCheck.g:10347:1: ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) )
+            // InternalCheck.g:10348:1: ( rule__XOrExpression__RightOperandAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getRightOperandAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10349:1: ( rule__XOrExpression__RightOperandAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10349:2: rule__XOrExpression__RightOperandAssignment_1_1
+            // InternalCheck.g:10349:1: ( rule__XOrExpression__RightOperandAssignment_1_1 )
+            // InternalCheck.g:10349:2: rule__XOrExpression__RightOperandAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__XOrExpression__RightOperandAssignment_1_1_in_rule__XOrExpression__Group_1__1__Impl21425);
+            pushFollow(FOLLOW_2);
             rule__XOrExpression__RightOperandAssignment_1_1();
 
             state._fsp--;
@@ -30953,16 +30953,16 @@ public final void rule__XOrExpression__Group_1__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XOrExpression__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10363:1: rule__XOrExpression__Group_1_0__0 : rule__XOrExpression__Group_1_0__0__Impl ;
+    // InternalCheck.g:10363:1: rule__XOrExpression__Group_1_0__0 : rule__XOrExpression__Group_1_0__0__Impl ;
     public final void rule__XOrExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10367:1: ( rule__XOrExpression__Group_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10368:2: rule__XOrExpression__Group_1_0__0__Impl
+            // InternalCheck.g:10367:1: ( rule__XOrExpression__Group_1_0__0__Impl )
+            // InternalCheck.g:10368:2: rule__XOrExpression__Group_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XOrExpression__Group_1_0__0__Impl_in_rule__XOrExpression__Group_1_0__021459);
+            pushFollow(FOLLOW_2);
             rule__XOrExpression__Group_1_0__0__Impl();
 
             state._fsp--;
@@ -30986,25 +30986,25 @@ public final void rule__XOrExpression__Group_1_0__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XOrExpression__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10374:1: rule__XOrExpression__Group_1_0__0__Impl : ( ( rule__XOrExpression__Group_1_0_0__0 ) ) ;
+    // InternalCheck.g:10374:1: rule__XOrExpression__Group_1_0__0__Impl : ( ( rule__XOrExpression__Group_1_0_0__0 ) ) ;
     public final void rule__XOrExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10378:1: ( ( ( rule__XOrExpression__Group_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10379:1: ( ( rule__XOrExpression__Group_1_0_0__0 ) )
+            // InternalCheck.g:10378:1: ( ( ( rule__XOrExpression__Group_1_0_0__0 ) ) )
+            // InternalCheck.g:10379:1: ( ( rule__XOrExpression__Group_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10379:1: ( ( rule__XOrExpression__Group_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10380:1: ( rule__XOrExpression__Group_1_0_0__0 )
+            // InternalCheck.g:10379:1: ( ( rule__XOrExpression__Group_1_0_0__0 ) )
+            // InternalCheck.g:10380:1: ( rule__XOrExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getGroup_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10381:1: ( rule__XOrExpression__Group_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10381:2: rule__XOrExpression__Group_1_0_0__0
+            // InternalCheck.g:10381:1: ( rule__XOrExpression__Group_1_0_0__0 )
+            // InternalCheck.g:10381:2: rule__XOrExpression__Group_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XOrExpression__Group_1_0_0__0_in_rule__XOrExpression__Group_1_0__0__Impl21486);
+            pushFollow(FOLLOW_2);
             rule__XOrExpression__Group_1_0_0__0();
 
             state._fsp--;
@@ -31037,21 +31037,21 @@ public final void rule__XOrExpression__Group_1_0__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XOrExpression__Group_1_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10393:1: rule__XOrExpression__Group_1_0_0__0 : rule__XOrExpression__Group_1_0_0__0__Impl rule__XOrExpression__Group_1_0_0__1 ;
+    // InternalCheck.g:10393:1: rule__XOrExpression__Group_1_0_0__0 : rule__XOrExpression__Group_1_0_0__0__Impl rule__XOrExpression__Group_1_0_0__1 ;
     public final void rule__XOrExpression__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10397:1: ( rule__XOrExpression__Group_1_0_0__0__Impl rule__XOrExpression__Group_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10398:2: rule__XOrExpression__Group_1_0_0__0__Impl rule__XOrExpression__Group_1_0_0__1
+            // InternalCheck.g:10397:1: ( rule__XOrExpression__Group_1_0_0__0__Impl rule__XOrExpression__Group_1_0_0__1 )
+            // InternalCheck.g:10398:2: rule__XOrExpression__Group_1_0_0__0__Impl rule__XOrExpression__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XOrExpression__Group_1_0_0__0__Impl_in_rule__XOrExpression__Group_1_0_0__021518);
+            pushFollow(FOLLOW_54);
             rule__XOrExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XOrExpression__Group_1_0_0__1_in_rule__XOrExpression__Group_1_0_0__021521);
+            pushFollow(FOLLOW_2);
             rule__XOrExpression__Group_1_0_0__1();
 
             state._fsp--;
@@ -31075,23 +31075,23 @@ public final void rule__XOrExpression__Group_1_0_0__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XOrExpression__Group_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10405:1: rule__XOrExpression__Group_1_0_0__0__Impl : ( () ) ;
+    // InternalCheck.g:10405:1: rule__XOrExpression__Group_1_0_0__0__Impl : ( () ) ;
     public final void rule__XOrExpression__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10409:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10410:1: ( () )
+            // InternalCheck.g:10409:1: ( ( () ) )
+            // InternalCheck.g:10410:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10410:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10411:1: ()
+            // InternalCheck.g:10410:1: ( () )
+            // InternalCheck.g:10411:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10412:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10414:1: 
+            // InternalCheck.g:10412:1: ()
+            // InternalCheck.g:10414:1: 
             {
             }
 
@@ -31116,16 +31116,16 @@ public final void rule__XOrExpression__Group_1_0_0__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XOrExpression__Group_1_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10424:1: rule__XOrExpression__Group_1_0_0__1 : rule__XOrExpression__Group_1_0_0__1__Impl ;
+    // InternalCheck.g:10424:1: rule__XOrExpression__Group_1_0_0__1 : rule__XOrExpression__Group_1_0_0__1__Impl ;
     public final void rule__XOrExpression__Group_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10428:1: ( rule__XOrExpression__Group_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10429:2: rule__XOrExpression__Group_1_0_0__1__Impl
+            // InternalCheck.g:10428:1: ( rule__XOrExpression__Group_1_0_0__1__Impl )
+            // InternalCheck.g:10429:2: rule__XOrExpression__Group_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XOrExpression__Group_1_0_0__1__Impl_in_rule__XOrExpression__Group_1_0_0__121579);
+            pushFollow(FOLLOW_2);
             rule__XOrExpression__Group_1_0_0__1__Impl();
 
             state._fsp--;
@@ -31149,25 +31149,25 @@ public final void rule__XOrExpression__Group_1_0_0__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XOrExpression__Group_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10435:1: rule__XOrExpression__Group_1_0_0__1__Impl : ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) ) ;
+    // InternalCheck.g:10435:1: rule__XOrExpression__Group_1_0_0__1__Impl : ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) ) ;
     public final void rule__XOrExpression__Group_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10439:1: ( ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10440:1: ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalCheck.g:10439:1: ( ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) ) )
+            // InternalCheck.g:10440:1: ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10440:1: ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10441:1: ( rule__XOrExpression__FeatureAssignment_1_0_0_1 )
+            // InternalCheck.g:10440:1: ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalCheck.g:10441:1: ( rule__XOrExpression__FeatureAssignment_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getFeatureAssignment_1_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10442:1: ( rule__XOrExpression__FeatureAssignment_1_0_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10442:2: rule__XOrExpression__FeatureAssignment_1_0_0_1
+            // InternalCheck.g:10442:1: ( rule__XOrExpression__FeatureAssignment_1_0_0_1 )
+            // InternalCheck.g:10442:2: rule__XOrExpression__FeatureAssignment_1_0_0_1
             {
-            pushFollow(FOLLOW_rule__XOrExpression__FeatureAssignment_1_0_0_1_in_rule__XOrExpression__Group_1_0_0__1__Impl21606);
+            pushFollow(FOLLOW_2);
             rule__XOrExpression__FeatureAssignment_1_0_0_1();
 
             state._fsp--;
@@ -31200,21 +31200,21 @@ public final void rule__XOrExpression__Group_1_0_0__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XAndExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10456:1: rule__XAndExpression__Group__0 : rule__XAndExpression__Group__0__Impl rule__XAndExpression__Group__1 ;
+    // InternalCheck.g:10456:1: rule__XAndExpression__Group__0 : rule__XAndExpression__Group__0__Impl rule__XAndExpression__Group__1 ;
     public final void rule__XAndExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10460:1: ( rule__XAndExpression__Group__0__Impl rule__XAndExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10461:2: rule__XAndExpression__Group__0__Impl rule__XAndExpression__Group__1
+            // InternalCheck.g:10460:1: ( rule__XAndExpression__Group__0__Impl rule__XAndExpression__Group__1 )
+            // InternalCheck.g:10461:2: rule__XAndExpression__Group__0__Impl rule__XAndExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XAndExpression__Group__0__Impl_in_rule__XAndExpression__Group__021640);
+            pushFollow(FOLLOW_56);
             rule__XAndExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAndExpression__Group__1_in_rule__XAndExpression__Group__021643);
+            pushFollow(FOLLOW_2);
             rule__XAndExpression__Group__1();
 
             state._fsp--;
@@ -31238,22 +31238,22 @@ public final void rule__XAndExpression__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAndExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10468:1: rule__XAndExpression__Group__0__Impl : ( ruleXEqualityExpression ) ;
+    // InternalCheck.g:10468:1: rule__XAndExpression__Group__0__Impl : ( ruleXEqualityExpression ) ;
     public final void rule__XAndExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10472:1: ( ( ruleXEqualityExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10473:1: ( ruleXEqualityExpression )
+            // InternalCheck.g:10472:1: ( ( ruleXEqualityExpression ) )
+            // InternalCheck.g:10473:1: ( ruleXEqualityExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10473:1: ( ruleXEqualityExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10474:1: ruleXEqualityExpression
+            // InternalCheck.g:10473:1: ( ruleXEqualityExpression )
+            // InternalCheck.g:10474:1: ruleXEqualityExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getXEqualityExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleXEqualityExpression_in_rule__XAndExpression__Group__0__Impl21670);
+            pushFollow(FOLLOW_2);
             ruleXEqualityExpression();
 
             state._fsp--;
@@ -31283,16 +31283,16 @@ public final void rule__XAndExpression__Group__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XAndExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10485:1: rule__XAndExpression__Group__1 : rule__XAndExpression__Group__1__Impl ;
+    // InternalCheck.g:10485:1: rule__XAndExpression__Group__1 : rule__XAndExpression__Group__1__Impl ;
     public final void rule__XAndExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10489:1: ( rule__XAndExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10490:2: rule__XAndExpression__Group__1__Impl
+            // InternalCheck.g:10489:1: ( rule__XAndExpression__Group__1__Impl )
+            // InternalCheck.g:10490:2: rule__XAndExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAndExpression__Group__1__Impl_in_rule__XAndExpression__Group__121699);
+            pushFollow(FOLLOW_2);
             rule__XAndExpression__Group__1__Impl();
 
             state._fsp--;
@@ -31316,22 +31316,22 @@ public final void rule__XAndExpression__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAndExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10496:1: rule__XAndExpression__Group__1__Impl : ( ( rule__XAndExpression__Group_1__0 )* ) ;
+    // InternalCheck.g:10496:1: rule__XAndExpression__Group__1__Impl : ( ( rule__XAndExpression__Group_1__0 )* ) ;
     public final void rule__XAndExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10500:1: ( ( ( rule__XAndExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10501:1: ( ( rule__XAndExpression__Group_1__0 )* )
+            // InternalCheck.g:10500:1: ( ( ( rule__XAndExpression__Group_1__0 )* ) )
+            // InternalCheck.g:10501:1: ( ( rule__XAndExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10501:1: ( ( rule__XAndExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10502:1: ( rule__XAndExpression__Group_1__0 )*
+            // InternalCheck.g:10501:1: ( ( rule__XAndExpression__Group_1__0 )* )
+            // InternalCheck.g:10502:1: ( rule__XAndExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10503:1: ( rule__XAndExpression__Group_1__0 )*
+            // InternalCheck.g:10503:1: ( rule__XAndExpression__Group_1__0 )*
             loop96:
             do {
                 int alt96=2;
@@ -31350,9 +31350,9 @@ public final void rule__XAndExpression__Group__1__Impl() throws RecognitionExcep
 
                 switch (alt96) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10503:2: rule__XAndExpression__Group_1__0
+            	    // InternalCheck.g:10503:2: rule__XAndExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XAndExpression__Group_1__0_in_rule__XAndExpression__Group__1__Impl21726);
+            	    pushFollow(FOLLOW_57);
             	    rule__XAndExpression__Group_1__0();
 
             	    state._fsp--;
@@ -31391,21 +31391,21 @@ public final void rule__XAndExpression__Group__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XAndExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10517:1: rule__XAndExpression__Group_1__0 : rule__XAndExpression__Group_1__0__Impl rule__XAndExpression__Group_1__1 ;
+    // InternalCheck.g:10517:1: rule__XAndExpression__Group_1__0 : rule__XAndExpression__Group_1__0__Impl rule__XAndExpression__Group_1__1 ;
     public final void rule__XAndExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10521:1: ( rule__XAndExpression__Group_1__0__Impl rule__XAndExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10522:2: rule__XAndExpression__Group_1__0__Impl rule__XAndExpression__Group_1__1
+            // InternalCheck.g:10521:1: ( rule__XAndExpression__Group_1__0__Impl rule__XAndExpression__Group_1__1 )
+            // InternalCheck.g:10522:2: rule__XAndExpression__Group_1__0__Impl rule__XAndExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XAndExpression__Group_1__0__Impl_in_rule__XAndExpression__Group_1__021761);
+            pushFollow(FOLLOW_32);
             rule__XAndExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAndExpression__Group_1__1_in_rule__XAndExpression__Group_1__021764);
+            pushFollow(FOLLOW_2);
             rule__XAndExpression__Group_1__1();
 
             state._fsp--;
@@ -31429,25 +31429,25 @@ public final void rule__XAndExpression__Group_1__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XAndExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10529:1: rule__XAndExpression__Group_1__0__Impl : ( ( rule__XAndExpression__Group_1_0__0 ) ) ;
+    // InternalCheck.g:10529:1: rule__XAndExpression__Group_1__0__Impl : ( ( rule__XAndExpression__Group_1_0__0 ) ) ;
     public final void rule__XAndExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10533:1: ( ( ( rule__XAndExpression__Group_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10534:1: ( ( rule__XAndExpression__Group_1_0__0 ) )
+            // InternalCheck.g:10533:1: ( ( ( rule__XAndExpression__Group_1_0__0 ) ) )
+            // InternalCheck.g:10534:1: ( ( rule__XAndExpression__Group_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10534:1: ( ( rule__XAndExpression__Group_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10535:1: ( rule__XAndExpression__Group_1_0__0 )
+            // InternalCheck.g:10534:1: ( ( rule__XAndExpression__Group_1_0__0 ) )
+            // InternalCheck.g:10535:1: ( rule__XAndExpression__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getGroup_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10536:1: ( rule__XAndExpression__Group_1_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10536:2: rule__XAndExpression__Group_1_0__0
+            // InternalCheck.g:10536:1: ( rule__XAndExpression__Group_1_0__0 )
+            // InternalCheck.g:10536:2: rule__XAndExpression__Group_1_0__0
             {
-            pushFollow(FOLLOW_rule__XAndExpression__Group_1_0__0_in_rule__XAndExpression__Group_1__0__Impl21791);
+            pushFollow(FOLLOW_2);
             rule__XAndExpression__Group_1_0__0();
 
             state._fsp--;
@@ -31480,16 +31480,16 @@ public final void rule__XAndExpression__Group_1__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XAndExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10546:1: rule__XAndExpression__Group_1__1 : rule__XAndExpression__Group_1__1__Impl ;
+    // InternalCheck.g:10546:1: rule__XAndExpression__Group_1__1 : rule__XAndExpression__Group_1__1__Impl ;
     public final void rule__XAndExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10550:1: ( rule__XAndExpression__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10551:2: rule__XAndExpression__Group_1__1__Impl
+            // InternalCheck.g:10550:1: ( rule__XAndExpression__Group_1__1__Impl )
+            // InternalCheck.g:10551:2: rule__XAndExpression__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAndExpression__Group_1__1__Impl_in_rule__XAndExpression__Group_1__121821);
+            pushFollow(FOLLOW_2);
             rule__XAndExpression__Group_1__1__Impl();
 
             state._fsp--;
@@ -31513,25 +31513,25 @@ public final void rule__XAndExpression__Group_1__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XAndExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10557:1: rule__XAndExpression__Group_1__1__Impl : ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) ) ;
+    // InternalCheck.g:10557:1: rule__XAndExpression__Group_1__1__Impl : ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) ) ;
     public final void rule__XAndExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10561:1: ( ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10562:1: ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) )
+            // InternalCheck.g:10561:1: ( ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) ) )
+            // InternalCheck.g:10562:1: ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10562:1: ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10563:1: ( rule__XAndExpression__RightOperandAssignment_1_1 )
+            // InternalCheck.g:10562:1: ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) )
+            // InternalCheck.g:10563:1: ( rule__XAndExpression__RightOperandAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getRightOperandAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10564:1: ( rule__XAndExpression__RightOperandAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10564:2: rule__XAndExpression__RightOperandAssignment_1_1
+            // InternalCheck.g:10564:1: ( rule__XAndExpression__RightOperandAssignment_1_1 )
+            // InternalCheck.g:10564:2: rule__XAndExpression__RightOperandAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__XAndExpression__RightOperandAssignment_1_1_in_rule__XAndExpression__Group_1__1__Impl21848);
+            pushFollow(FOLLOW_2);
             rule__XAndExpression__RightOperandAssignment_1_1();
 
             state._fsp--;
@@ -31564,16 +31564,16 @@ public final void rule__XAndExpression__Group_1__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XAndExpression__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10578:1: rule__XAndExpression__Group_1_0__0 : rule__XAndExpression__Group_1_0__0__Impl ;
+    // InternalCheck.g:10578:1: rule__XAndExpression__Group_1_0__0 : rule__XAndExpression__Group_1_0__0__Impl ;
     public final void rule__XAndExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10582:1: ( rule__XAndExpression__Group_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10583:2: rule__XAndExpression__Group_1_0__0__Impl
+            // InternalCheck.g:10582:1: ( rule__XAndExpression__Group_1_0__0__Impl )
+            // InternalCheck.g:10583:2: rule__XAndExpression__Group_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XAndExpression__Group_1_0__0__Impl_in_rule__XAndExpression__Group_1_0__021882);
+            pushFollow(FOLLOW_2);
             rule__XAndExpression__Group_1_0__0__Impl();
 
             state._fsp--;
@@ -31597,25 +31597,25 @@ public final void rule__XAndExpression__Group_1_0__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XAndExpression__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10589:1: rule__XAndExpression__Group_1_0__0__Impl : ( ( rule__XAndExpression__Group_1_0_0__0 ) ) ;
+    // InternalCheck.g:10589:1: rule__XAndExpression__Group_1_0__0__Impl : ( ( rule__XAndExpression__Group_1_0_0__0 ) ) ;
     public final void rule__XAndExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10593:1: ( ( ( rule__XAndExpression__Group_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10594:1: ( ( rule__XAndExpression__Group_1_0_0__0 ) )
+            // InternalCheck.g:10593:1: ( ( ( rule__XAndExpression__Group_1_0_0__0 ) ) )
+            // InternalCheck.g:10594:1: ( ( rule__XAndExpression__Group_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10594:1: ( ( rule__XAndExpression__Group_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10595:1: ( rule__XAndExpression__Group_1_0_0__0 )
+            // InternalCheck.g:10594:1: ( ( rule__XAndExpression__Group_1_0_0__0 ) )
+            // InternalCheck.g:10595:1: ( rule__XAndExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getGroup_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10596:1: ( rule__XAndExpression__Group_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10596:2: rule__XAndExpression__Group_1_0_0__0
+            // InternalCheck.g:10596:1: ( rule__XAndExpression__Group_1_0_0__0 )
+            // InternalCheck.g:10596:2: rule__XAndExpression__Group_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XAndExpression__Group_1_0_0__0_in_rule__XAndExpression__Group_1_0__0__Impl21909);
+            pushFollow(FOLLOW_2);
             rule__XAndExpression__Group_1_0_0__0();
 
             state._fsp--;
@@ -31648,21 +31648,21 @@ public final void rule__XAndExpression__Group_1_0__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XAndExpression__Group_1_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10608:1: rule__XAndExpression__Group_1_0_0__0 : rule__XAndExpression__Group_1_0_0__0__Impl rule__XAndExpression__Group_1_0_0__1 ;
+    // InternalCheck.g:10608:1: rule__XAndExpression__Group_1_0_0__0 : rule__XAndExpression__Group_1_0_0__0__Impl rule__XAndExpression__Group_1_0_0__1 ;
     public final void rule__XAndExpression__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10612:1: ( rule__XAndExpression__Group_1_0_0__0__Impl rule__XAndExpression__Group_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10613:2: rule__XAndExpression__Group_1_0_0__0__Impl rule__XAndExpression__Group_1_0_0__1
+            // InternalCheck.g:10612:1: ( rule__XAndExpression__Group_1_0_0__0__Impl rule__XAndExpression__Group_1_0_0__1 )
+            // InternalCheck.g:10613:2: rule__XAndExpression__Group_1_0_0__0__Impl rule__XAndExpression__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XAndExpression__Group_1_0_0__0__Impl_in_rule__XAndExpression__Group_1_0_0__021941);
+            pushFollow(FOLLOW_56);
             rule__XAndExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAndExpression__Group_1_0_0__1_in_rule__XAndExpression__Group_1_0_0__021944);
+            pushFollow(FOLLOW_2);
             rule__XAndExpression__Group_1_0_0__1();
 
             state._fsp--;
@@ -31686,23 +31686,23 @@ public final void rule__XAndExpression__Group_1_0_0__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XAndExpression__Group_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10620:1: rule__XAndExpression__Group_1_0_0__0__Impl : ( () ) ;
+    // InternalCheck.g:10620:1: rule__XAndExpression__Group_1_0_0__0__Impl : ( () ) ;
     public final void rule__XAndExpression__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10624:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10625:1: ( () )
+            // InternalCheck.g:10624:1: ( ( () ) )
+            // InternalCheck.g:10625:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10625:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10626:1: ()
+            // InternalCheck.g:10625:1: ( () )
+            // InternalCheck.g:10626:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10627:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10629:1: 
+            // InternalCheck.g:10627:1: ()
+            // InternalCheck.g:10629:1: 
             {
             }
 
@@ -31727,16 +31727,16 @@ public final void rule__XAndExpression__Group_1_0_0__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XAndExpression__Group_1_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10639:1: rule__XAndExpression__Group_1_0_0__1 : rule__XAndExpression__Group_1_0_0__1__Impl ;
+    // InternalCheck.g:10639:1: rule__XAndExpression__Group_1_0_0__1 : rule__XAndExpression__Group_1_0_0__1__Impl ;
     public final void rule__XAndExpression__Group_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10643:1: ( rule__XAndExpression__Group_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10644:2: rule__XAndExpression__Group_1_0_0__1__Impl
+            // InternalCheck.g:10643:1: ( rule__XAndExpression__Group_1_0_0__1__Impl )
+            // InternalCheck.g:10644:2: rule__XAndExpression__Group_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAndExpression__Group_1_0_0__1__Impl_in_rule__XAndExpression__Group_1_0_0__122002);
+            pushFollow(FOLLOW_2);
             rule__XAndExpression__Group_1_0_0__1__Impl();
 
             state._fsp--;
@@ -31760,25 +31760,25 @@ public final void rule__XAndExpression__Group_1_0_0__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XAndExpression__Group_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10650:1: rule__XAndExpression__Group_1_0_0__1__Impl : ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) ) ;
+    // InternalCheck.g:10650:1: rule__XAndExpression__Group_1_0_0__1__Impl : ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) ) ;
     public final void rule__XAndExpression__Group_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10654:1: ( ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10655:1: ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalCheck.g:10654:1: ( ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) ) )
+            // InternalCheck.g:10655:1: ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10655:1: ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10656:1: ( rule__XAndExpression__FeatureAssignment_1_0_0_1 )
+            // InternalCheck.g:10655:1: ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalCheck.g:10656:1: ( rule__XAndExpression__FeatureAssignment_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getFeatureAssignment_1_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10657:1: ( rule__XAndExpression__FeatureAssignment_1_0_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10657:2: rule__XAndExpression__FeatureAssignment_1_0_0_1
+            // InternalCheck.g:10657:1: ( rule__XAndExpression__FeatureAssignment_1_0_0_1 )
+            // InternalCheck.g:10657:2: rule__XAndExpression__FeatureAssignment_1_0_0_1
             {
-            pushFollow(FOLLOW_rule__XAndExpression__FeatureAssignment_1_0_0_1_in_rule__XAndExpression__Group_1_0_0__1__Impl22029);
+            pushFollow(FOLLOW_2);
             rule__XAndExpression__FeatureAssignment_1_0_0_1();
 
             state._fsp--;
@@ -31811,21 +31811,21 @@ public final void rule__XAndExpression__Group_1_0_0__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XEqualityExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10671:1: rule__XEqualityExpression__Group__0 : rule__XEqualityExpression__Group__0__Impl rule__XEqualityExpression__Group__1 ;
+    // InternalCheck.g:10671:1: rule__XEqualityExpression__Group__0 : rule__XEqualityExpression__Group__0__Impl rule__XEqualityExpression__Group__1 ;
     public final void rule__XEqualityExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10675:1: ( rule__XEqualityExpression__Group__0__Impl rule__XEqualityExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10676:2: rule__XEqualityExpression__Group__0__Impl rule__XEqualityExpression__Group__1
+            // InternalCheck.g:10675:1: ( rule__XEqualityExpression__Group__0__Impl rule__XEqualityExpression__Group__1 )
+            // InternalCheck.g:10676:2: rule__XEqualityExpression__Group__0__Impl rule__XEqualityExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group__0__Impl_in_rule__XEqualityExpression__Group__022063);
+            pushFollow(FOLLOW_58);
             rule__XEqualityExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group__1_in_rule__XEqualityExpression__Group__022066);
+            pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group__1();
 
             state._fsp--;
@@ -31849,22 +31849,22 @@ public final void rule__XEqualityExpression__Group__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XEqualityExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10683:1: rule__XEqualityExpression__Group__0__Impl : ( ruleXRelationalExpression ) ;
+    // InternalCheck.g:10683:1: rule__XEqualityExpression__Group__0__Impl : ( ruleXRelationalExpression ) ;
     public final void rule__XEqualityExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10687:1: ( ( ruleXRelationalExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10688:1: ( ruleXRelationalExpression )
+            // InternalCheck.g:10687:1: ( ( ruleXRelationalExpression ) )
+            // InternalCheck.g:10688:1: ( ruleXRelationalExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10688:1: ( ruleXRelationalExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10689:1: ruleXRelationalExpression
+            // InternalCheck.g:10688:1: ( ruleXRelationalExpression )
+            // InternalCheck.g:10689:1: ruleXRelationalExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getXRelationalExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleXRelationalExpression_in_rule__XEqualityExpression__Group__0__Impl22093);
+            pushFollow(FOLLOW_2);
             ruleXRelationalExpression();
 
             state._fsp--;
@@ -31894,16 +31894,16 @@ public final void rule__XEqualityExpression__Group__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XEqualityExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10700:1: rule__XEqualityExpression__Group__1 : rule__XEqualityExpression__Group__1__Impl ;
+    // InternalCheck.g:10700:1: rule__XEqualityExpression__Group__1 : rule__XEqualityExpression__Group__1__Impl ;
     public final void rule__XEqualityExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10704:1: ( rule__XEqualityExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10705:2: rule__XEqualityExpression__Group__1__Impl
+            // InternalCheck.g:10704:1: ( rule__XEqualityExpression__Group__1__Impl )
+            // InternalCheck.g:10705:2: rule__XEqualityExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group__1__Impl_in_rule__XEqualityExpression__Group__122122);
+            pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group__1__Impl();
 
             state._fsp--;
@@ -31927,22 +31927,22 @@ public final void rule__XEqualityExpression__Group__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XEqualityExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10711:1: rule__XEqualityExpression__Group__1__Impl : ( ( rule__XEqualityExpression__Group_1__0 )* ) ;
+    // InternalCheck.g:10711:1: rule__XEqualityExpression__Group__1__Impl : ( ( rule__XEqualityExpression__Group_1__0 )* ) ;
     public final void rule__XEqualityExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10715:1: ( ( ( rule__XEqualityExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10716:1: ( ( rule__XEqualityExpression__Group_1__0 )* )
+            // InternalCheck.g:10715:1: ( ( ( rule__XEqualityExpression__Group_1__0 )* ) )
+            // InternalCheck.g:10716:1: ( ( rule__XEqualityExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10716:1: ( ( rule__XEqualityExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10717:1: ( rule__XEqualityExpression__Group_1__0 )*
+            // InternalCheck.g:10716:1: ( ( rule__XEqualityExpression__Group_1__0 )* )
+            // InternalCheck.g:10717:1: ( rule__XEqualityExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10718:1: ( rule__XEqualityExpression__Group_1__0 )*
+            // InternalCheck.g:10718:1: ( rule__XEqualityExpression__Group_1__0 )*
             loop97:
             do {
                 int alt97=2;
@@ -31996,9 +31996,9 @@ public final void rule__XEqualityExpression__Group__1__Impl() throws Recognition
 
                 switch (alt97) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10718:2: rule__XEqualityExpression__Group_1__0
+            	    // InternalCheck.g:10718:2: rule__XEqualityExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XEqualityExpression__Group_1__0_in_rule__XEqualityExpression__Group__1__Impl22149);
+            	    pushFollow(FOLLOW_59);
             	    rule__XEqualityExpression__Group_1__0();
 
             	    state._fsp--;
@@ -32037,21 +32037,21 @@ public final void rule__XEqualityExpression__Group__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10732:1: rule__XEqualityExpression__Group_1__0 : rule__XEqualityExpression__Group_1__0__Impl rule__XEqualityExpression__Group_1__1 ;
+    // InternalCheck.g:10732:1: rule__XEqualityExpression__Group_1__0 : rule__XEqualityExpression__Group_1__0__Impl rule__XEqualityExpression__Group_1__1 ;
     public final void rule__XEqualityExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10736:1: ( rule__XEqualityExpression__Group_1__0__Impl rule__XEqualityExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10737:2: rule__XEqualityExpression__Group_1__0__Impl rule__XEqualityExpression__Group_1__1
+            // InternalCheck.g:10736:1: ( rule__XEqualityExpression__Group_1__0__Impl rule__XEqualityExpression__Group_1__1 )
+            // InternalCheck.g:10737:2: rule__XEqualityExpression__Group_1__0__Impl rule__XEqualityExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1__0__Impl_in_rule__XEqualityExpression__Group_1__022184);
+            pushFollow(FOLLOW_32);
             rule__XEqualityExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1__1_in_rule__XEqualityExpression__Group_1__022187);
+            pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group_1__1();
 
             state._fsp--;
@@ -32075,25 +32075,25 @@ public final void rule__XEqualityExpression__Group_1__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10744:1: rule__XEqualityExpression__Group_1__0__Impl : ( ( rule__XEqualityExpression__Group_1_0__0 ) ) ;
+    // InternalCheck.g:10744:1: rule__XEqualityExpression__Group_1__0__Impl : ( ( rule__XEqualityExpression__Group_1_0__0 ) ) ;
     public final void rule__XEqualityExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10748:1: ( ( ( rule__XEqualityExpression__Group_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10749:1: ( ( rule__XEqualityExpression__Group_1_0__0 ) )
+            // InternalCheck.g:10748:1: ( ( ( rule__XEqualityExpression__Group_1_0__0 ) ) )
+            // InternalCheck.g:10749:1: ( ( rule__XEqualityExpression__Group_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10749:1: ( ( rule__XEqualityExpression__Group_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10750:1: ( rule__XEqualityExpression__Group_1_0__0 )
+            // InternalCheck.g:10749:1: ( ( rule__XEqualityExpression__Group_1_0__0 ) )
+            // InternalCheck.g:10750:1: ( rule__XEqualityExpression__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getGroup_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10751:1: ( rule__XEqualityExpression__Group_1_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10751:2: rule__XEqualityExpression__Group_1_0__0
+            // InternalCheck.g:10751:1: ( rule__XEqualityExpression__Group_1_0__0 )
+            // InternalCheck.g:10751:2: rule__XEqualityExpression__Group_1_0__0
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1_0__0_in_rule__XEqualityExpression__Group_1__0__Impl22214);
+            pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group_1_0__0();
 
             state._fsp--;
@@ -32126,16 +32126,16 @@ public final void rule__XEqualityExpression__Group_1__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10761:1: rule__XEqualityExpression__Group_1__1 : rule__XEqualityExpression__Group_1__1__Impl ;
+    // InternalCheck.g:10761:1: rule__XEqualityExpression__Group_1__1 : rule__XEqualityExpression__Group_1__1__Impl ;
     public final void rule__XEqualityExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10765:1: ( rule__XEqualityExpression__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10766:2: rule__XEqualityExpression__Group_1__1__Impl
+            // InternalCheck.g:10765:1: ( rule__XEqualityExpression__Group_1__1__Impl )
+            // InternalCheck.g:10766:2: rule__XEqualityExpression__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1__1__Impl_in_rule__XEqualityExpression__Group_1__122244);
+            pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group_1__1__Impl();
 
             state._fsp--;
@@ -32159,25 +32159,25 @@ public final void rule__XEqualityExpression__Group_1__1() throws RecognitionExce
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10772:1: rule__XEqualityExpression__Group_1__1__Impl : ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) ) ;
+    // InternalCheck.g:10772:1: rule__XEqualityExpression__Group_1__1__Impl : ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) ) ;
     public final void rule__XEqualityExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10776:1: ( ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10777:1: ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) )
+            // InternalCheck.g:10776:1: ( ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) ) )
+            // InternalCheck.g:10777:1: ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10777:1: ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10778:1: ( rule__XEqualityExpression__RightOperandAssignment_1_1 )
+            // InternalCheck.g:10777:1: ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) )
+            // InternalCheck.g:10778:1: ( rule__XEqualityExpression__RightOperandAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getRightOperandAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10779:1: ( rule__XEqualityExpression__RightOperandAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10779:2: rule__XEqualityExpression__RightOperandAssignment_1_1
+            // InternalCheck.g:10779:1: ( rule__XEqualityExpression__RightOperandAssignment_1_1 )
+            // InternalCheck.g:10779:2: rule__XEqualityExpression__RightOperandAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__RightOperandAssignment_1_1_in_rule__XEqualityExpression__Group_1__1__Impl22271);
+            pushFollow(FOLLOW_2);
             rule__XEqualityExpression__RightOperandAssignment_1_1();
 
             state._fsp--;
@@ -32210,16 +32210,16 @@ public final void rule__XEqualityExpression__Group_1__1__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10793:1: rule__XEqualityExpression__Group_1_0__0 : rule__XEqualityExpression__Group_1_0__0__Impl ;
+    // InternalCheck.g:10793:1: rule__XEqualityExpression__Group_1_0__0 : rule__XEqualityExpression__Group_1_0__0__Impl ;
     public final void rule__XEqualityExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10797:1: ( rule__XEqualityExpression__Group_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10798:2: rule__XEqualityExpression__Group_1_0__0__Impl
+            // InternalCheck.g:10797:1: ( rule__XEqualityExpression__Group_1_0__0__Impl )
+            // InternalCheck.g:10798:2: rule__XEqualityExpression__Group_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1_0__0__Impl_in_rule__XEqualityExpression__Group_1_0__022305);
+            pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group_1_0__0__Impl();
 
             state._fsp--;
@@ -32243,25 +32243,25 @@ public final void rule__XEqualityExpression__Group_1_0__0() throws RecognitionEx
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10804:1: rule__XEqualityExpression__Group_1_0__0__Impl : ( ( rule__XEqualityExpression__Group_1_0_0__0 ) ) ;
+    // InternalCheck.g:10804:1: rule__XEqualityExpression__Group_1_0__0__Impl : ( ( rule__XEqualityExpression__Group_1_0_0__0 ) ) ;
     public final void rule__XEqualityExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10808:1: ( ( ( rule__XEqualityExpression__Group_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10809:1: ( ( rule__XEqualityExpression__Group_1_0_0__0 ) )
+            // InternalCheck.g:10808:1: ( ( ( rule__XEqualityExpression__Group_1_0_0__0 ) ) )
+            // InternalCheck.g:10809:1: ( ( rule__XEqualityExpression__Group_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10809:1: ( ( rule__XEqualityExpression__Group_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10810:1: ( rule__XEqualityExpression__Group_1_0_0__0 )
+            // InternalCheck.g:10809:1: ( ( rule__XEqualityExpression__Group_1_0_0__0 ) )
+            // InternalCheck.g:10810:1: ( rule__XEqualityExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getGroup_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10811:1: ( rule__XEqualityExpression__Group_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10811:2: rule__XEqualityExpression__Group_1_0_0__0
+            // InternalCheck.g:10811:1: ( rule__XEqualityExpression__Group_1_0_0__0 )
+            // InternalCheck.g:10811:2: rule__XEqualityExpression__Group_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1_0_0__0_in_rule__XEqualityExpression__Group_1_0__0__Impl22332);
+            pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group_1_0_0__0();
 
             state._fsp--;
@@ -32294,21 +32294,21 @@ public final void rule__XEqualityExpression__Group_1_0__0__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10823:1: rule__XEqualityExpression__Group_1_0_0__0 : rule__XEqualityExpression__Group_1_0_0__0__Impl rule__XEqualityExpression__Group_1_0_0__1 ;
+    // InternalCheck.g:10823:1: rule__XEqualityExpression__Group_1_0_0__0 : rule__XEqualityExpression__Group_1_0_0__0__Impl rule__XEqualityExpression__Group_1_0_0__1 ;
     public final void rule__XEqualityExpression__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10827:1: ( rule__XEqualityExpression__Group_1_0_0__0__Impl rule__XEqualityExpression__Group_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10828:2: rule__XEqualityExpression__Group_1_0_0__0__Impl rule__XEqualityExpression__Group_1_0_0__1
+            // InternalCheck.g:10827:1: ( rule__XEqualityExpression__Group_1_0_0__0__Impl rule__XEqualityExpression__Group_1_0_0__1 )
+            // InternalCheck.g:10828:2: rule__XEqualityExpression__Group_1_0_0__0__Impl rule__XEqualityExpression__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1_0_0__0__Impl_in_rule__XEqualityExpression__Group_1_0_0__022364);
+            pushFollow(FOLLOW_58);
             rule__XEqualityExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1_0_0__1_in_rule__XEqualityExpression__Group_1_0_0__022367);
+            pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group_1_0_0__1();
 
             state._fsp--;
@@ -32332,23 +32332,23 @@ public final void rule__XEqualityExpression__Group_1_0_0__0() throws Recognition
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10835:1: rule__XEqualityExpression__Group_1_0_0__0__Impl : ( () ) ;
+    // InternalCheck.g:10835:1: rule__XEqualityExpression__Group_1_0_0__0__Impl : ( () ) ;
     public final void rule__XEqualityExpression__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10839:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10840:1: ( () )
+            // InternalCheck.g:10839:1: ( ( () ) )
+            // InternalCheck.g:10840:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10840:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10841:1: ()
+            // InternalCheck.g:10840:1: ( () )
+            // InternalCheck.g:10841:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10842:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10844:1: 
+            // InternalCheck.g:10842:1: ()
+            // InternalCheck.g:10844:1: 
             {
             }
 
@@ -32373,16 +32373,16 @@ public final void rule__XEqualityExpression__Group_1_0_0__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10854:1: rule__XEqualityExpression__Group_1_0_0__1 : rule__XEqualityExpression__Group_1_0_0__1__Impl ;
+    // InternalCheck.g:10854:1: rule__XEqualityExpression__Group_1_0_0__1 : rule__XEqualityExpression__Group_1_0_0__1__Impl ;
     public final void rule__XEqualityExpression__Group_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10858:1: ( rule__XEqualityExpression__Group_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10859:2: rule__XEqualityExpression__Group_1_0_0__1__Impl
+            // InternalCheck.g:10858:1: ( rule__XEqualityExpression__Group_1_0_0__1__Impl )
+            // InternalCheck.g:10859:2: rule__XEqualityExpression__Group_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1_0_0__1__Impl_in_rule__XEqualityExpression__Group_1_0_0__122425);
+            pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group_1_0_0__1__Impl();
 
             state._fsp--;
@@ -32406,25 +32406,25 @@ public final void rule__XEqualityExpression__Group_1_0_0__1() throws Recognition
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10865:1: rule__XEqualityExpression__Group_1_0_0__1__Impl : ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) ) ;
+    // InternalCheck.g:10865:1: rule__XEqualityExpression__Group_1_0_0__1__Impl : ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) ) ;
     public final void rule__XEqualityExpression__Group_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10869:1: ( ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10870:1: ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalCheck.g:10869:1: ( ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) ) )
+            // InternalCheck.g:10870:1: ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10870:1: ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10871:1: ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 )
+            // InternalCheck.g:10870:1: ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalCheck.g:10871:1: ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getFeatureAssignment_1_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10872:1: ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10872:2: rule__XEqualityExpression__FeatureAssignment_1_0_0_1
+            // InternalCheck.g:10872:1: ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 )
+            // InternalCheck.g:10872:2: rule__XEqualityExpression__FeatureAssignment_1_0_0_1
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__FeatureAssignment_1_0_0_1_in_rule__XEqualityExpression__Group_1_0_0__1__Impl22452);
+            pushFollow(FOLLOW_2);
             rule__XEqualityExpression__FeatureAssignment_1_0_0_1();
 
             state._fsp--;
@@ -32457,21 +32457,21 @@ public final void rule__XEqualityExpression__Group_1_0_0__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__XRelationalExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10886:1: rule__XRelationalExpression__Group__0 : rule__XRelationalExpression__Group__0__Impl rule__XRelationalExpression__Group__1 ;
+    // InternalCheck.g:10886:1: rule__XRelationalExpression__Group__0 : rule__XRelationalExpression__Group__0__Impl rule__XRelationalExpression__Group__1 ;
     public final void rule__XRelationalExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10890:1: ( rule__XRelationalExpression__Group__0__Impl rule__XRelationalExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10891:2: rule__XRelationalExpression__Group__0__Impl rule__XRelationalExpression__Group__1
+            // InternalCheck.g:10890:1: ( rule__XRelationalExpression__Group__0__Impl rule__XRelationalExpression__Group__1 )
+            // InternalCheck.g:10891:2: rule__XRelationalExpression__Group__0__Impl rule__XRelationalExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group__0__Impl_in_rule__XRelationalExpression__Group__022486);
+            pushFollow(FOLLOW_60);
             rule__XRelationalExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group__1_in_rule__XRelationalExpression__Group__022489);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group__1();
 
             state._fsp--;
@@ -32495,22 +32495,22 @@ public final void rule__XRelationalExpression__Group__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__XRelationalExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10898:1: rule__XRelationalExpression__Group__0__Impl : ( ruleXOtherOperatorExpression ) ;
+    // InternalCheck.g:10898:1: rule__XRelationalExpression__Group__0__Impl : ( ruleXOtherOperatorExpression ) ;
     public final void rule__XRelationalExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10902:1: ( ( ruleXOtherOperatorExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10903:1: ( ruleXOtherOperatorExpression )
+            // InternalCheck.g:10902:1: ( ( ruleXOtherOperatorExpression ) )
+            // InternalCheck.g:10903:1: ( ruleXOtherOperatorExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10903:1: ( ruleXOtherOperatorExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10904:1: ruleXOtherOperatorExpression
+            // InternalCheck.g:10903:1: ( ruleXOtherOperatorExpression )
+            // InternalCheck.g:10904:1: ruleXOtherOperatorExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getXOtherOperatorExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleXOtherOperatorExpression_in_rule__XRelationalExpression__Group__0__Impl22516);
+            pushFollow(FOLLOW_2);
             ruleXOtherOperatorExpression();
 
             state._fsp--;
@@ -32540,16 +32540,16 @@ public final void rule__XRelationalExpression__Group__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XRelationalExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10915:1: rule__XRelationalExpression__Group__1 : rule__XRelationalExpression__Group__1__Impl ;
+    // InternalCheck.g:10915:1: rule__XRelationalExpression__Group__1 : rule__XRelationalExpression__Group__1__Impl ;
     public final void rule__XRelationalExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10919:1: ( rule__XRelationalExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10920:2: rule__XRelationalExpression__Group__1__Impl
+            // InternalCheck.g:10919:1: ( rule__XRelationalExpression__Group__1__Impl )
+            // InternalCheck.g:10920:2: rule__XRelationalExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group__1__Impl_in_rule__XRelationalExpression__Group__122545);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group__1__Impl();
 
             state._fsp--;
@@ -32573,22 +32573,22 @@ public final void rule__XRelationalExpression__Group__1() throws RecognitionExce
 
 
     // $ANTLR start "rule__XRelationalExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10926:1: rule__XRelationalExpression__Group__1__Impl : ( ( rule__XRelationalExpression__Alternatives_1 )* ) ;
+    // InternalCheck.g:10926:1: rule__XRelationalExpression__Group__1__Impl : ( ( rule__XRelationalExpression__Alternatives_1 )* ) ;
     public final void rule__XRelationalExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10930:1: ( ( ( rule__XRelationalExpression__Alternatives_1 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10931:1: ( ( rule__XRelationalExpression__Alternatives_1 )* )
+            // InternalCheck.g:10930:1: ( ( ( rule__XRelationalExpression__Alternatives_1 )* ) )
+            // InternalCheck.g:10931:1: ( ( rule__XRelationalExpression__Alternatives_1 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10931:1: ( ( rule__XRelationalExpression__Alternatives_1 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10932:1: ( rule__XRelationalExpression__Alternatives_1 )*
+            // InternalCheck.g:10931:1: ( ( rule__XRelationalExpression__Alternatives_1 )* )
+            // InternalCheck.g:10932:1: ( rule__XRelationalExpression__Alternatives_1 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getAlternatives_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10933:1: ( rule__XRelationalExpression__Alternatives_1 )*
+            // InternalCheck.g:10933:1: ( rule__XRelationalExpression__Alternatives_1 )*
             loop98:
             do {
                 int alt98=2;
@@ -32642,9 +32642,9 @@ public final void rule__XRelationalExpression__Group__1__Impl() throws Recogniti
 
                 switch (alt98) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10933:2: rule__XRelationalExpression__Alternatives_1
+            	    // InternalCheck.g:10933:2: rule__XRelationalExpression__Alternatives_1
             	    {
-            	    pushFollow(FOLLOW_rule__XRelationalExpression__Alternatives_1_in_rule__XRelationalExpression__Group__1__Impl22572);
+            	    pushFollow(FOLLOW_61);
             	    rule__XRelationalExpression__Alternatives_1();
 
             	    state._fsp--;
@@ -32683,21 +32683,21 @@ public final void rule__XRelationalExpression__Group__1__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10947:1: rule__XRelationalExpression__Group_1_0__0 : rule__XRelationalExpression__Group_1_0__0__Impl rule__XRelationalExpression__Group_1_0__1 ;
+    // InternalCheck.g:10947:1: rule__XRelationalExpression__Group_1_0__0 : rule__XRelationalExpression__Group_1_0__0__Impl rule__XRelationalExpression__Group_1_0__1 ;
     public final void rule__XRelationalExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10951:1: ( rule__XRelationalExpression__Group_1_0__0__Impl rule__XRelationalExpression__Group_1_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10952:2: rule__XRelationalExpression__Group_1_0__0__Impl rule__XRelationalExpression__Group_1_0__1
+            // InternalCheck.g:10951:1: ( rule__XRelationalExpression__Group_1_0__0__Impl rule__XRelationalExpression__Group_1_0__1 )
+            // InternalCheck.g:10952:2: rule__XRelationalExpression__Group_1_0__0__Impl rule__XRelationalExpression__Group_1_0__1
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0__0__Impl_in_rule__XRelationalExpression__Group_1_0__022607);
+            pushFollow(FOLLOW_29);
             rule__XRelationalExpression__Group_1_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0__1_in_rule__XRelationalExpression__Group_1_0__022610);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_0__1();
 
             state._fsp--;
@@ -32721,25 +32721,25 @@ public final void rule__XRelationalExpression__Group_1_0__0() throws Recognition
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10959:1: rule__XRelationalExpression__Group_1_0__0__Impl : ( ( rule__XRelationalExpression__Group_1_0_0__0 ) ) ;
+    // InternalCheck.g:10959:1: rule__XRelationalExpression__Group_1_0__0__Impl : ( ( rule__XRelationalExpression__Group_1_0_0__0 ) ) ;
     public final void rule__XRelationalExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10963:1: ( ( ( rule__XRelationalExpression__Group_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10964:1: ( ( rule__XRelationalExpression__Group_1_0_0__0 ) )
+            // InternalCheck.g:10963:1: ( ( ( rule__XRelationalExpression__Group_1_0_0__0 ) ) )
+            // InternalCheck.g:10964:1: ( ( rule__XRelationalExpression__Group_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10964:1: ( ( rule__XRelationalExpression__Group_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10965:1: ( rule__XRelationalExpression__Group_1_0_0__0 )
+            // InternalCheck.g:10964:1: ( ( rule__XRelationalExpression__Group_1_0_0__0 ) )
+            // InternalCheck.g:10965:1: ( rule__XRelationalExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getGroup_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10966:1: ( rule__XRelationalExpression__Group_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10966:2: rule__XRelationalExpression__Group_1_0_0__0
+            // InternalCheck.g:10966:1: ( rule__XRelationalExpression__Group_1_0_0__0 )
+            // InternalCheck.g:10966:2: rule__XRelationalExpression__Group_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0_0__0_in_rule__XRelationalExpression__Group_1_0__0__Impl22637);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_0_0__0();
 
             state._fsp--;
@@ -32772,16 +32772,16 @@ public final void rule__XRelationalExpression__Group_1_0__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10976:1: rule__XRelationalExpression__Group_1_0__1 : rule__XRelationalExpression__Group_1_0__1__Impl ;
+    // InternalCheck.g:10976:1: rule__XRelationalExpression__Group_1_0__1 : rule__XRelationalExpression__Group_1_0__1__Impl ;
     public final void rule__XRelationalExpression__Group_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10980:1: ( rule__XRelationalExpression__Group_1_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10981:2: rule__XRelationalExpression__Group_1_0__1__Impl
+            // InternalCheck.g:10980:1: ( rule__XRelationalExpression__Group_1_0__1__Impl )
+            // InternalCheck.g:10981:2: rule__XRelationalExpression__Group_1_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0__1__Impl_in_rule__XRelationalExpression__Group_1_0__122667);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_0__1__Impl();
 
             state._fsp--;
@@ -32805,25 +32805,25 @@ public final void rule__XRelationalExpression__Group_1_0__1() throws Recognition
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10987:1: rule__XRelationalExpression__Group_1_0__1__Impl : ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) ) ;
+    // InternalCheck.g:10987:1: rule__XRelationalExpression__Group_1_0__1__Impl : ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) ) ;
     public final void rule__XRelationalExpression__Group_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10991:1: ( ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10992:1: ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) )
+            // InternalCheck.g:10991:1: ( ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) ) )
+            // InternalCheck.g:10992:1: ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10992:1: ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10993:1: ( rule__XRelationalExpression__TypeAssignment_1_0_1 )
+            // InternalCheck.g:10992:1: ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) )
+            // InternalCheck.g:10993:1: ( rule__XRelationalExpression__TypeAssignment_1_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getTypeAssignment_1_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10994:1: ( rule__XRelationalExpression__TypeAssignment_1_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10994:2: rule__XRelationalExpression__TypeAssignment_1_0_1
+            // InternalCheck.g:10994:1: ( rule__XRelationalExpression__TypeAssignment_1_0_1 )
+            // InternalCheck.g:10994:2: rule__XRelationalExpression__TypeAssignment_1_0_1
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__TypeAssignment_1_0_1_in_rule__XRelationalExpression__Group_1_0__1__Impl22694);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__TypeAssignment_1_0_1();
 
             state._fsp--;
@@ -32856,16 +32856,16 @@ public final void rule__XRelationalExpression__Group_1_0__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11008:1: rule__XRelationalExpression__Group_1_0_0__0 : rule__XRelationalExpression__Group_1_0_0__0__Impl ;
+    // InternalCheck.g:11008:1: rule__XRelationalExpression__Group_1_0_0__0 : rule__XRelationalExpression__Group_1_0_0__0__Impl ;
     public final void rule__XRelationalExpression__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11012:1: ( rule__XRelationalExpression__Group_1_0_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11013:2: rule__XRelationalExpression__Group_1_0_0__0__Impl
+            // InternalCheck.g:11012:1: ( rule__XRelationalExpression__Group_1_0_0__0__Impl )
+            // InternalCheck.g:11013:2: rule__XRelationalExpression__Group_1_0_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0_0__0__Impl_in_rule__XRelationalExpression__Group_1_0_0__022728);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
@@ -32889,25 +32889,25 @@ public final void rule__XRelationalExpression__Group_1_0_0__0() throws Recogniti
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11019:1: rule__XRelationalExpression__Group_1_0_0__0__Impl : ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) ) ;
+    // InternalCheck.g:11019:1: rule__XRelationalExpression__Group_1_0_0__0__Impl : ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) ) ;
     public final void rule__XRelationalExpression__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11023:1: ( ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11024:1: ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) )
+            // InternalCheck.g:11023:1: ( ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) ) )
+            // InternalCheck.g:11024:1: ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11024:1: ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11025:1: ( rule__XRelationalExpression__Group_1_0_0_0__0 )
+            // InternalCheck.g:11024:1: ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) )
+            // InternalCheck.g:11025:1: ( rule__XRelationalExpression__Group_1_0_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getGroup_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11026:1: ( rule__XRelationalExpression__Group_1_0_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11026:2: rule__XRelationalExpression__Group_1_0_0_0__0
+            // InternalCheck.g:11026:1: ( rule__XRelationalExpression__Group_1_0_0_0__0 )
+            // InternalCheck.g:11026:2: rule__XRelationalExpression__Group_1_0_0_0__0
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0_0_0__0_in_rule__XRelationalExpression__Group_1_0_0__0__Impl22755);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_0_0_0__0();
 
             state._fsp--;
@@ -32940,21 +32940,21 @@ public final void rule__XRelationalExpression__Group_1_0_0__0__Impl() throws Rec
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11038:1: rule__XRelationalExpression__Group_1_0_0_0__0 : rule__XRelationalExpression__Group_1_0_0_0__0__Impl rule__XRelationalExpression__Group_1_0_0_0__1 ;
+    // InternalCheck.g:11038:1: rule__XRelationalExpression__Group_1_0_0_0__0 : rule__XRelationalExpression__Group_1_0_0_0__0__Impl rule__XRelationalExpression__Group_1_0_0_0__1 ;
     public final void rule__XRelationalExpression__Group_1_0_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11042:1: ( rule__XRelationalExpression__Group_1_0_0_0__0__Impl rule__XRelationalExpression__Group_1_0_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11043:2: rule__XRelationalExpression__Group_1_0_0_0__0__Impl rule__XRelationalExpression__Group_1_0_0_0__1
+            // InternalCheck.g:11042:1: ( rule__XRelationalExpression__Group_1_0_0_0__0__Impl rule__XRelationalExpression__Group_1_0_0_0__1 )
+            // InternalCheck.g:11043:2: rule__XRelationalExpression__Group_1_0_0_0__0__Impl rule__XRelationalExpression__Group_1_0_0_0__1
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0_0_0__0__Impl_in_rule__XRelationalExpression__Group_1_0_0_0__022787);
+            pushFollow(FOLLOW_62);
             rule__XRelationalExpression__Group_1_0_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0_0_0__1_in_rule__XRelationalExpression__Group_1_0_0_0__022790);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_0_0_0__1();
 
             state._fsp--;
@@ -32978,23 +32978,23 @@ public final void rule__XRelationalExpression__Group_1_0_0_0__0() throws Recogni
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11050:1: rule__XRelationalExpression__Group_1_0_0_0__0__Impl : ( () ) ;
+    // InternalCheck.g:11050:1: rule__XRelationalExpression__Group_1_0_0_0__0__Impl : ( () ) ;
     public final void rule__XRelationalExpression__Group_1_0_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11054:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11055:1: ( () )
+            // InternalCheck.g:11054:1: ( ( () ) )
+            // InternalCheck.g:11055:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11055:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11056:1: ()
+            // InternalCheck.g:11055:1: ( () )
+            // InternalCheck.g:11056:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getXInstanceOfExpressionExpressionAction_1_0_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11057:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11059:1: 
+            // InternalCheck.g:11057:1: ()
+            // InternalCheck.g:11059:1: 
             {
             }
 
@@ -33019,16 +33019,16 @@ public final void rule__XRelationalExpression__Group_1_0_0_0__0__Impl() throws R
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11069:1: rule__XRelationalExpression__Group_1_0_0_0__1 : rule__XRelationalExpression__Group_1_0_0_0__1__Impl ;
+    // InternalCheck.g:11069:1: rule__XRelationalExpression__Group_1_0_0_0__1 : rule__XRelationalExpression__Group_1_0_0_0__1__Impl ;
     public final void rule__XRelationalExpression__Group_1_0_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11073:1: ( rule__XRelationalExpression__Group_1_0_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11074:2: rule__XRelationalExpression__Group_1_0_0_0__1__Impl
+            // InternalCheck.g:11073:1: ( rule__XRelationalExpression__Group_1_0_0_0__1__Impl )
+            // InternalCheck.g:11074:2: rule__XRelationalExpression__Group_1_0_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0_0_0__1__Impl_in_rule__XRelationalExpression__Group_1_0_0_0__122848);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_0_0_0__1__Impl();
 
             state._fsp--;
@@ -33052,22 +33052,22 @@ public final void rule__XRelationalExpression__Group_1_0_0_0__1() throws Recogni
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11080:1: rule__XRelationalExpression__Group_1_0_0_0__1__Impl : ( 'instanceof' ) ;
+    // InternalCheck.g:11080:1: rule__XRelationalExpression__Group_1_0_0_0__1__Impl : ( 'instanceof' ) ;
     public final void rule__XRelationalExpression__Group_1_0_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11084:1: ( ( 'instanceof' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11085:1: ( 'instanceof' )
+            // InternalCheck.g:11084:1: ( ( 'instanceof' ) )
+            // InternalCheck.g:11085:1: ( 'instanceof' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11085:1: ( 'instanceof' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11086:1: 'instanceof'
+            // InternalCheck.g:11085:1: ( 'instanceof' )
+            // InternalCheck.g:11086:1: 'instanceof'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getInstanceofKeyword_1_0_0_0_1()); 
             }
-            match(input,82,FOLLOW_82_in_rule__XRelationalExpression__Group_1_0_0_0__1__Impl22876); if (state.failed) return ;
+            match(input,82,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXRelationalExpressionAccess().getInstanceofKeyword_1_0_0_0_1()); 
             }
@@ -33093,21 +33093,21 @@ public final void rule__XRelationalExpression__Group_1_0_0_0__1__Impl() throws R
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11103:1: rule__XRelationalExpression__Group_1_1__0 : rule__XRelationalExpression__Group_1_1__0__Impl rule__XRelationalExpression__Group_1_1__1 ;
+    // InternalCheck.g:11103:1: rule__XRelationalExpression__Group_1_1__0 : rule__XRelationalExpression__Group_1_1__0__Impl rule__XRelationalExpression__Group_1_1__1 ;
     public final void rule__XRelationalExpression__Group_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11107:1: ( rule__XRelationalExpression__Group_1_1__0__Impl rule__XRelationalExpression__Group_1_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11108:2: rule__XRelationalExpression__Group_1_1__0__Impl rule__XRelationalExpression__Group_1_1__1
+            // InternalCheck.g:11107:1: ( rule__XRelationalExpression__Group_1_1__0__Impl rule__XRelationalExpression__Group_1_1__1 )
+            // InternalCheck.g:11108:2: rule__XRelationalExpression__Group_1_1__0__Impl rule__XRelationalExpression__Group_1_1__1
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1__0__Impl_in_rule__XRelationalExpression__Group_1_1__022911);
+            pushFollow(FOLLOW_32);
             rule__XRelationalExpression__Group_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1__1_in_rule__XRelationalExpression__Group_1_1__022914);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_1__1();
 
             state._fsp--;
@@ -33131,25 +33131,25 @@ public final void rule__XRelationalExpression__Group_1_1__0() throws Recognition
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11115:1: rule__XRelationalExpression__Group_1_1__0__Impl : ( ( rule__XRelationalExpression__Group_1_1_0__0 ) ) ;
+    // InternalCheck.g:11115:1: rule__XRelationalExpression__Group_1_1__0__Impl : ( ( rule__XRelationalExpression__Group_1_1_0__0 ) ) ;
     public final void rule__XRelationalExpression__Group_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11119:1: ( ( ( rule__XRelationalExpression__Group_1_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11120:1: ( ( rule__XRelationalExpression__Group_1_1_0__0 ) )
+            // InternalCheck.g:11119:1: ( ( ( rule__XRelationalExpression__Group_1_1_0__0 ) ) )
+            // InternalCheck.g:11120:1: ( ( rule__XRelationalExpression__Group_1_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11120:1: ( ( rule__XRelationalExpression__Group_1_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11121:1: ( rule__XRelationalExpression__Group_1_1_0__0 )
+            // InternalCheck.g:11120:1: ( ( rule__XRelationalExpression__Group_1_1_0__0 ) )
+            // InternalCheck.g:11121:1: ( rule__XRelationalExpression__Group_1_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getGroup_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11122:1: ( rule__XRelationalExpression__Group_1_1_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11122:2: rule__XRelationalExpression__Group_1_1_0__0
+            // InternalCheck.g:11122:1: ( rule__XRelationalExpression__Group_1_1_0__0 )
+            // InternalCheck.g:11122:2: rule__XRelationalExpression__Group_1_1_0__0
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1_0__0_in_rule__XRelationalExpression__Group_1_1__0__Impl22941);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_1_0__0();
 
             state._fsp--;
@@ -33182,16 +33182,16 @@ public final void rule__XRelationalExpression__Group_1_1__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11132:1: rule__XRelationalExpression__Group_1_1__1 : rule__XRelationalExpression__Group_1_1__1__Impl ;
+    // InternalCheck.g:11132:1: rule__XRelationalExpression__Group_1_1__1 : rule__XRelationalExpression__Group_1_1__1__Impl ;
     public final void rule__XRelationalExpression__Group_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11136:1: ( rule__XRelationalExpression__Group_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11137:2: rule__XRelationalExpression__Group_1_1__1__Impl
+            // InternalCheck.g:11136:1: ( rule__XRelationalExpression__Group_1_1__1__Impl )
+            // InternalCheck.g:11137:2: rule__XRelationalExpression__Group_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1__1__Impl_in_rule__XRelationalExpression__Group_1_1__122971);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_1__1__Impl();
 
             state._fsp--;
@@ -33215,25 +33215,25 @@ public final void rule__XRelationalExpression__Group_1_1__1() throws Recognition
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11143:1: rule__XRelationalExpression__Group_1_1__1__Impl : ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) ) ;
+    // InternalCheck.g:11143:1: rule__XRelationalExpression__Group_1_1__1__Impl : ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) ) ;
     public final void rule__XRelationalExpression__Group_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11147:1: ( ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11148:1: ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) )
+            // InternalCheck.g:11147:1: ( ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) ) )
+            // InternalCheck.g:11148:1: ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11148:1: ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11149:1: ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 )
+            // InternalCheck.g:11148:1: ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) )
+            // InternalCheck.g:11149:1: ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getRightOperandAssignment_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11150:1: ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11150:2: rule__XRelationalExpression__RightOperandAssignment_1_1_1
+            // InternalCheck.g:11150:1: ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 )
+            // InternalCheck.g:11150:2: rule__XRelationalExpression__RightOperandAssignment_1_1_1
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__RightOperandAssignment_1_1_1_in_rule__XRelationalExpression__Group_1_1__1__Impl22998);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__RightOperandAssignment_1_1_1();
 
             state._fsp--;
@@ -33266,16 +33266,16 @@ public final void rule__XRelationalExpression__Group_1_1__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11164:1: rule__XRelationalExpression__Group_1_1_0__0 : rule__XRelationalExpression__Group_1_1_0__0__Impl ;
+    // InternalCheck.g:11164:1: rule__XRelationalExpression__Group_1_1_0__0 : rule__XRelationalExpression__Group_1_1_0__0__Impl ;
     public final void rule__XRelationalExpression__Group_1_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11168:1: ( rule__XRelationalExpression__Group_1_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11169:2: rule__XRelationalExpression__Group_1_1_0__0__Impl
+            // InternalCheck.g:11168:1: ( rule__XRelationalExpression__Group_1_1_0__0__Impl )
+            // InternalCheck.g:11169:2: rule__XRelationalExpression__Group_1_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1_0__0__Impl_in_rule__XRelationalExpression__Group_1_1_0__023032);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_1_0__0__Impl();
 
             state._fsp--;
@@ -33299,25 +33299,25 @@ public final void rule__XRelationalExpression__Group_1_1_0__0() throws Recogniti
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11175:1: rule__XRelationalExpression__Group_1_1_0__0__Impl : ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) ) ;
+    // InternalCheck.g:11175:1: rule__XRelationalExpression__Group_1_1_0__0__Impl : ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) ) ;
     public final void rule__XRelationalExpression__Group_1_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11179:1: ( ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11180:1: ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) )
+            // InternalCheck.g:11179:1: ( ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) ) )
+            // InternalCheck.g:11180:1: ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11180:1: ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11181:1: ( rule__XRelationalExpression__Group_1_1_0_0__0 )
+            // InternalCheck.g:11180:1: ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) )
+            // InternalCheck.g:11181:1: ( rule__XRelationalExpression__Group_1_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getGroup_1_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11182:1: ( rule__XRelationalExpression__Group_1_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11182:2: rule__XRelationalExpression__Group_1_1_0_0__0
+            // InternalCheck.g:11182:1: ( rule__XRelationalExpression__Group_1_1_0_0__0 )
+            // InternalCheck.g:11182:2: rule__XRelationalExpression__Group_1_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1_0_0__0_in_rule__XRelationalExpression__Group_1_1_0__0__Impl23059);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_1_0_0__0();
 
             state._fsp--;
@@ -33350,21 +33350,21 @@ public final void rule__XRelationalExpression__Group_1_1_0__0__Impl() throws Rec
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11194:1: rule__XRelationalExpression__Group_1_1_0_0__0 : rule__XRelationalExpression__Group_1_1_0_0__0__Impl rule__XRelationalExpression__Group_1_1_0_0__1 ;
+    // InternalCheck.g:11194:1: rule__XRelationalExpression__Group_1_1_0_0__0 : rule__XRelationalExpression__Group_1_1_0_0__0__Impl rule__XRelationalExpression__Group_1_1_0_0__1 ;
     public final void rule__XRelationalExpression__Group_1_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11198:1: ( rule__XRelationalExpression__Group_1_1_0_0__0__Impl rule__XRelationalExpression__Group_1_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11199:2: rule__XRelationalExpression__Group_1_1_0_0__0__Impl rule__XRelationalExpression__Group_1_1_0_0__1
+            // InternalCheck.g:11198:1: ( rule__XRelationalExpression__Group_1_1_0_0__0__Impl rule__XRelationalExpression__Group_1_1_0_0__1 )
+            // InternalCheck.g:11199:2: rule__XRelationalExpression__Group_1_1_0_0__0__Impl rule__XRelationalExpression__Group_1_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1_0_0__0__Impl_in_rule__XRelationalExpression__Group_1_1_0_0__023091);
+            pushFollow(FOLLOW_60);
             rule__XRelationalExpression__Group_1_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1_0_0__1_in_rule__XRelationalExpression__Group_1_1_0_0__023094);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_1_0_0__1();
 
             state._fsp--;
@@ -33388,23 +33388,23 @@ public final void rule__XRelationalExpression__Group_1_1_0_0__0() throws Recogni
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11206:1: rule__XRelationalExpression__Group_1_1_0_0__0__Impl : ( () ) ;
+    // InternalCheck.g:11206:1: rule__XRelationalExpression__Group_1_1_0_0__0__Impl : ( () ) ;
     public final void rule__XRelationalExpression__Group_1_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11210:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11211:1: ( () )
+            // InternalCheck.g:11210:1: ( ( () ) )
+            // InternalCheck.g:11211:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11211:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11212:1: ()
+            // InternalCheck.g:11211:1: ( () )
+            // InternalCheck.g:11212:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11213:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11215:1: 
+            // InternalCheck.g:11213:1: ()
+            // InternalCheck.g:11215:1: 
             {
             }
 
@@ -33429,16 +33429,16 @@ public final void rule__XRelationalExpression__Group_1_1_0_0__0__Impl() throws R
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11225:1: rule__XRelationalExpression__Group_1_1_0_0__1 : rule__XRelationalExpression__Group_1_1_0_0__1__Impl ;
+    // InternalCheck.g:11225:1: rule__XRelationalExpression__Group_1_1_0_0__1 : rule__XRelationalExpression__Group_1_1_0_0__1__Impl ;
     public final void rule__XRelationalExpression__Group_1_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11229:1: ( rule__XRelationalExpression__Group_1_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11230:2: rule__XRelationalExpression__Group_1_1_0_0__1__Impl
+            // InternalCheck.g:11229:1: ( rule__XRelationalExpression__Group_1_1_0_0__1__Impl )
+            // InternalCheck.g:11230:2: rule__XRelationalExpression__Group_1_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1_0_0__1__Impl_in_rule__XRelationalExpression__Group_1_1_0_0__123152);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_1_0_0__1__Impl();
 
             state._fsp--;
@@ -33462,25 +33462,25 @@ public final void rule__XRelationalExpression__Group_1_1_0_0__1() throws Recogni
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11236:1: rule__XRelationalExpression__Group_1_1_0_0__1__Impl : ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) ) ;
+    // InternalCheck.g:11236:1: rule__XRelationalExpression__Group_1_1_0_0__1__Impl : ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) ) ;
     public final void rule__XRelationalExpression__Group_1_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11240:1: ( ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11241:1: ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) )
+            // InternalCheck.g:11240:1: ( ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) ) )
+            // InternalCheck.g:11241:1: ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11241:1: ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11242:1: ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 )
+            // InternalCheck.g:11241:1: ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) )
+            // InternalCheck.g:11242:1: ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getFeatureAssignment_1_1_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11243:1: ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11243:2: rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1
+            // InternalCheck.g:11243:1: ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 )
+            // InternalCheck.g:11243:2: rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1_in_rule__XRelationalExpression__Group_1_1_0_0__1__Impl23179);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1();
 
             state._fsp--;
@@ -33513,21 +33513,21 @@ public final void rule__XRelationalExpression__Group_1_1_0_0__1__Impl() throws R
 
 
     // $ANTLR start "rule__OpCompare__Group_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11257:1: rule__OpCompare__Group_1__0 : rule__OpCompare__Group_1__0__Impl rule__OpCompare__Group_1__1 ;
+    // InternalCheck.g:11257:1: rule__OpCompare__Group_1__0 : rule__OpCompare__Group_1__0__Impl rule__OpCompare__Group_1__1 ;
     public final void rule__OpCompare__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11261:1: ( rule__OpCompare__Group_1__0__Impl rule__OpCompare__Group_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11262:2: rule__OpCompare__Group_1__0__Impl rule__OpCompare__Group_1__1
+            // InternalCheck.g:11261:1: ( rule__OpCompare__Group_1__0__Impl rule__OpCompare__Group_1__1 )
+            // InternalCheck.g:11262:2: rule__OpCompare__Group_1__0__Impl rule__OpCompare__Group_1__1
             {
-            pushFollow(FOLLOW_rule__OpCompare__Group_1__0__Impl_in_rule__OpCompare__Group_1__023213);
+            pushFollow(FOLLOW_34);
             rule__OpCompare__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OpCompare__Group_1__1_in_rule__OpCompare__Group_1__023216);
+            pushFollow(FOLLOW_2);
             rule__OpCompare__Group_1__1();
 
             state._fsp--;
@@ -33551,22 +33551,22 @@ public final void rule__OpCompare__Group_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpCompare__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11269:1: rule__OpCompare__Group_1__0__Impl : ( '<' ) ;
+    // InternalCheck.g:11269:1: rule__OpCompare__Group_1__0__Impl : ( '<' ) ;
     public final void rule__OpCompare__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11273:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11274:1: ( '<' )
+            // InternalCheck.g:11273:1: ( ( '<' ) )
+            // InternalCheck.g:11274:1: ( '<' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11274:1: ( '<' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11275:1: '<'
+            // InternalCheck.g:11274:1: ( '<' )
+            // InternalCheck.g:11275:1: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpCompareAccess().getLessThanSignKeyword_1_0()); 
             }
-            match(input,47,FOLLOW_47_in_rule__OpCompare__Group_1__0__Impl23244); if (state.failed) return ;
+            match(input,47,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpCompareAccess().getLessThanSignKeyword_1_0()); 
             }
@@ -33592,16 +33592,16 @@ public final void rule__OpCompare__Group_1__0__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__OpCompare__Group_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11288:1: rule__OpCompare__Group_1__1 : rule__OpCompare__Group_1__1__Impl ;
+    // InternalCheck.g:11288:1: rule__OpCompare__Group_1__1 : rule__OpCompare__Group_1__1__Impl ;
     public final void rule__OpCompare__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11292:1: ( rule__OpCompare__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11293:2: rule__OpCompare__Group_1__1__Impl
+            // InternalCheck.g:11292:1: ( rule__OpCompare__Group_1__1__Impl )
+            // InternalCheck.g:11293:2: rule__OpCompare__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__OpCompare__Group_1__1__Impl_in_rule__OpCompare__Group_1__123275);
+            pushFollow(FOLLOW_2);
             rule__OpCompare__Group_1__1__Impl();
 
             state._fsp--;
@@ -33625,22 +33625,22 @@ public final void rule__OpCompare__Group_1__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpCompare__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11299:1: rule__OpCompare__Group_1__1__Impl : ( '=' ) ;
+    // InternalCheck.g:11299:1: rule__OpCompare__Group_1__1__Impl : ( '=' ) ;
     public final void rule__OpCompare__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11303:1: ( ( '=' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11304:1: ( '=' )
+            // InternalCheck.g:11303:1: ( ( '=' ) )
+            // InternalCheck.g:11304:1: ( '=' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11304:1: ( '=' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11305:1: '='
+            // InternalCheck.g:11304:1: ( '=' )
+            // InternalCheck.g:11305:1: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpCompareAccess().getEqualsSignKeyword_1_1()); 
             }
-            match(input,13,FOLLOW_13_in_rule__OpCompare__Group_1__1__Impl23303); if (state.failed) return ;
+            match(input,13,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpCompareAccess().getEqualsSignKeyword_1_1()); 
             }
@@ -33666,21 +33666,21 @@ public final void rule__OpCompare__Group_1__1__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11322:1: rule__XOtherOperatorExpression__Group__0 : rule__XOtherOperatorExpression__Group__0__Impl rule__XOtherOperatorExpression__Group__1 ;
+    // InternalCheck.g:11322:1: rule__XOtherOperatorExpression__Group__0 : rule__XOtherOperatorExpression__Group__0__Impl rule__XOtherOperatorExpression__Group__1 ;
     public final void rule__XOtherOperatorExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11326:1: ( rule__XOtherOperatorExpression__Group__0__Impl rule__XOtherOperatorExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11327:2: rule__XOtherOperatorExpression__Group__0__Impl rule__XOtherOperatorExpression__Group__1
+            // InternalCheck.g:11326:1: ( rule__XOtherOperatorExpression__Group__0__Impl rule__XOtherOperatorExpression__Group__1 )
+            // InternalCheck.g:11327:2: rule__XOtherOperatorExpression__Group__0__Impl rule__XOtherOperatorExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group__0__Impl_in_rule__XOtherOperatorExpression__Group__023338);
+            pushFollow(FOLLOW_63);
             rule__XOtherOperatorExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group__1_in_rule__XOtherOperatorExpression__Group__023341);
+            pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group__1();
 
             state._fsp--;
@@ -33704,22 +33704,22 @@ public final void rule__XOtherOperatorExpression__Group__0() throws RecognitionE
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11334:1: rule__XOtherOperatorExpression__Group__0__Impl : ( ruleXAdditiveExpression ) ;
+    // InternalCheck.g:11334:1: rule__XOtherOperatorExpression__Group__0__Impl : ( ruleXAdditiveExpression ) ;
     public final void rule__XOtherOperatorExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11338:1: ( ( ruleXAdditiveExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11339:1: ( ruleXAdditiveExpression )
+            // InternalCheck.g:11338:1: ( ( ruleXAdditiveExpression ) )
+            // InternalCheck.g:11339:1: ( ruleXAdditiveExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11339:1: ( ruleXAdditiveExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11340:1: ruleXAdditiveExpression
+            // InternalCheck.g:11339:1: ( ruleXAdditiveExpression )
+            // InternalCheck.g:11340:1: ruleXAdditiveExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getXAdditiveExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleXAdditiveExpression_in_rule__XOtherOperatorExpression__Group__0__Impl23368);
+            pushFollow(FOLLOW_2);
             ruleXAdditiveExpression();
 
             state._fsp--;
@@ -33749,16 +33749,16 @@ public final void rule__XOtherOperatorExpression__Group__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11351:1: rule__XOtherOperatorExpression__Group__1 : rule__XOtherOperatorExpression__Group__1__Impl ;
+    // InternalCheck.g:11351:1: rule__XOtherOperatorExpression__Group__1 : rule__XOtherOperatorExpression__Group__1__Impl ;
     public final void rule__XOtherOperatorExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11355:1: ( rule__XOtherOperatorExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11356:2: rule__XOtherOperatorExpression__Group__1__Impl
+            // InternalCheck.g:11355:1: ( rule__XOtherOperatorExpression__Group__1__Impl )
+            // InternalCheck.g:11356:2: rule__XOtherOperatorExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group__1__Impl_in_rule__XOtherOperatorExpression__Group__123397);
+            pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group__1__Impl();
 
             state._fsp--;
@@ -33782,31 +33782,31 @@ public final void rule__XOtherOperatorExpression__Group__1() throws RecognitionE
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11362:1: rule__XOtherOperatorExpression__Group__1__Impl : ( ( rule__XOtherOperatorExpression__Group_1__0 )* ) ;
+    // InternalCheck.g:11362:1: rule__XOtherOperatorExpression__Group__1__Impl : ( ( rule__XOtherOperatorExpression__Group_1__0 )* ) ;
     public final void rule__XOtherOperatorExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11366:1: ( ( ( rule__XOtherOperatorExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11367:1: ( ( rule__XOtherOperatorExpression__Group_1__0 )* )
+            // InternalCheck.g:11366:1: ( ( ( rule__XOtherOperatorExpression__Group_1__0 )* ) )
+            // InternalCheck.g:11367:1: ( ( rule__XOtherOperatorExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11367:1: ( ( rule__XOtherOperatorExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11368:1: ( rule__XOtherOperatorExpression__Group_1__0 )*
+            // InternalCheck.g:11367:1: ( ( rule__XOtherOperatorExpression__Group_1__0 )* )
+            // InternalCheck.g:11368:1: ( rule__XOtherOperatorExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11369:1: ( rule__XOtherOperatorExpression__Group_1__0 )*
+            // InternalCheck.g:11369:1: ( rule__XOtherOperatorExpression__Group_1__0 )*
             loop99:
             do {
                 int alt99=2;
                 alt99 = dfa99.predict(input);
                 switch (alt99) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11369:2: rule__XOtherOperatorExpression__Group_1__0
+            	    // InternalCheck.g:11369:2: rule__XOtherOperatorExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1__0_in_rule__XOtherOperatorExpression__Group__1__Impl23424);
+            	    pushFollow(FOLLOW_64);
             	    rule__XOtherOperatorExpression__Group_1__0();
 
             	    state._fsp--;
@@ -33845,21 +33845,21 @@ public final void rule__XOtherOperatorExpression__Group__1__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11383:1: rule__XOtherOperatorExpression__Group_1__0 : rule__XOtherOperatorExpression__Group_1__0__Impl rule__XOtherOperatorExpression__Group_1__1 ;
+    // InternalCheck.g:11383:1: rule__XOtherOperatorExpression__Group_1__0 : rule__XOtherOperatorExpression__Group_1__0__Impl rule__XOtherOperatorExpression__Group_1__1 ;
     public final void rule__XOtherOperatorExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11387:1: ( rule__XOtherOperatorExpression__Group_1__0__Impl rule__XOtherOperatorExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11388:2: rule__XOtherOperatorExpression__Group_1__0__Impl rule__XOtherOperatorExpression__Group_1__1
+            // InternalCheck.g:11387:1: ( rule__XOtherOperatorExpression__Group_1__0__Impl rule__XOtherOperatorExpression__Group_1__1 )
+            // InternalCheck.g:11388:2: rule__XOtherOperatorExpression__Group_1__0__Impl rule__XOtherOperatorExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1__0__Impl_in_rule__XOtherOperatorExpression__Group_1__023459);
+            pushFollow(FOLLOW_32);
             rule__XOtherOperatorExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1__1_in_rule__XOtherOperatorExpression__Group_1__023462);
+            pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group_1__1();
 
             state._fsp--;
@@ -33883,25 +33883,25 @@ public final void rule__XOtherOperatorExpression__Group_1__0() throws Recognitio
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11395:1: rule__XOtherOperatorExpression__Group_1__0__Impl : ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) ) ;
+    // InternalCheck.g:11395:1: rule__XOtherOperatorExpression__Group_1__0__Impl : ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) ) ;
     public final void rule__XOtherOperatorExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11399:1: ( ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11400:1: ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) )
+            // InternalCheck.g:11399:1: ( ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) ) )
+            // InternalCheck.g:11400:1: ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11400:1: ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11401:1: ( rule__XOtherOperatorExpression__Group_1_0__0 )
+            // InternalCheck.g:11400:1: ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) )
+            // InternalCheck.g:11401:1: ( rule__XOtherOperatorExpression__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getGroup_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11402:1: ( rule__XOtherOperatorExpression__Group_1_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11402:2: rule__XOtherOperatorExpression__Group_1_0__0
+            // InternalCheck.g:11402:1: ( rule__XOtherOperatorExpression__Group_1_0__0 )
+            // InternalCheck.g:11402:2: rule__XOtherOperatorExpression__Group_1_0__0
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1_0__0_in_rule__XOtherOperatorExpression__Group_1__0__Impl23489);
+            pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group_1_0__0();
 
             state._fsp--;
@@ -33934,16 +33934,16 @@ public final void rule__XOtherOperatorExpression__Group_1__0__Impl() throws Reco
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11412:1: rule__XOtherOperatorExpression__Group_1__1 : rule__XOtherOperatorExpression__Group_1__1__Impl ;
+    // InternalCheck.g:11412:1: rule__XOtherOperatorExpression__Group_1__1 : rule__XOtherOperatorExpression__Group_1__1__Impl ;
     public final void rule__XOtherOperatorExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11416:1: ( rule__XOtherOperatorExpression__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11417:2: rule__XOtherOperatorExpression__Group_1__1__Impl
+            // InternalCheck.g:11416:1: ( rule__XOtherOperatorExpression__Group_1__1__Impl )
+            // InternalCheck.g:11417:2: rule__XOtherOperatorExpression__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1__1__Impl_in_rule__XOtherOperatorExpression__Group_1__123519);
+            pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group_1__1__Impl();
 
             state._fsp--;
@@ -33967,25 +33967,25 @@ public final void rule__XOtherOperatorExpression__Group_1__1() throws Recognitio
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11423:1: rule__XOtherOperatorExpression__Group_1__1__Impl : ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) ) ;
+    // InternalCheck.g:11423:1: rule__XOtherOperatorExpression__Group_1__1__Impl : ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) ) ;
     public final void rule__XOtherOperatorExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11427:1: ( ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11428:1: ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) )
+            // InternalCheck.g:11427:1: ( ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) ) )
+            // InternalCheck.g:11428:1: ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11428:1: ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11429:1: ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 )
+            // InternalCheck.g:11428:1: ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) )
+            // InternalCheck.g:11429:1: ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getRightOperandAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11430:1: ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11430:2: rule__XOtherOperatorExpression__RightOperandAssignment_1_1
+            // InternalCheck.g:11430:1: ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 )
+            // InternalCheck.g:11430:2: rule__XOtherOperatorExpression__RightOperandAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__RightOperandAssignment_1_1_in_rule__XOtherOperatorExpression__Group_1__1__Impl23546);
+            pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__RightOperandAssignment_1_1();
 
             state._fsp--;
@@ -34018,16 +34018,16 @@ public final void rule__XOtherOperatorExpression__Group_1__1__Impl() throws Reco
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11444:1: rule__XOtherOperatorExpression__Group_1_0__0 : rule__XOtherOperatorExpression__Group_1_0__0__Impl ;
+    // InternalCheck.g:11444:1: rule__XOtherOperatorExpression__Group_1_0__0 : rule__XOtherOperatorExpression__Group_1_0__0__Impl ;
     public final void rule__XOtherOperatorExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11448:1: ( rule__XOtherOperatorExpression__Group_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11449:2: rule__XOtherOperatorExpression__Group_1_0__0__Impl
+            // InternalCheck.g:11448:1: ( rule__XOtherOperatorExpression__Group_1_0__0__Impl )
+            // InternalCheck.g:11449:2: rule__XOtherOperatorExpression__Group_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1_0__0__Impl_in_rule__XOtherOperatorExpression__Group_1_0__023580);
+            pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group_1_0__0__Impl();
 
             state._fsp--;
@@ -34051,25 +34051,25 @@ public final void rule__XOtherOperatorExpression__Group_1_0__0() throws Recognit
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11455:1: rule__XOtherOperatorExpression__Group_1_0__0__Impl : ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) ) ;
+    // InternalCheck.g:11455:1: rule__XOtherOperatorExpression__Group_1_0__0__Impl : ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) ) ;
     public final void rule__XOtherOperatorExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11459:1: ( ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11460:1: ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) )
+            // InternalCheck.g:11459:1: ( ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) ) )
+            // InternalCheck.g:11460:1: ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11460:1: ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11461:1: ( rule__XOtherOperatorExpression__Group_1_0_0__0 )
+            // InternalCheck.g:11460:1: ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) )
+            // InternalCheck.g:11461:1: ( rule__XOtherOperatorExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getGroup_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11462:1: ( rule__XOtherOperatorExpression__Group_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11462:2: rule__XOtherOperatorExpression__Group_1_0_0__0
+            // InternalCheck.g:11462:1: ( rule__XOtherOperatorExpression__Group_1_0_0__0 )
+            // InternalCheck.g:11462:2: rule__XOtherOperatorExpression__Group_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1_0_0__0_in_rule__XOtherOperatorExpression__Group_1_0__0__Impl23607);
+            pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group_1_0_0__0();
 
             state._fsp--;
@@ -34102,21 +34102,21 @@ public final void rule__XOtherOperatorExpression__Group_1_0__0__Impl() throws Re
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11474:1: rule__XOtherOperatorExpression__Group_1_0_0__0 : rule__XOtherOperatorExpression__Group_1_0_0__0__Impl rule__XOtherOperatorExpression__Group_1_0_0__1 ;
+    // InternalCheck.g:11474:1: rule__XOtherOperatorExpression__Group_1_0_0__0 : rule__XOtherOperatorExpression__Group_1_0_0__0__Impl rule__XOtherOperatorExpression__Group_1_0_0__1 ;
     public final void rule__XOtherOperatorExpression__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11478:1: ( rule__XOtherOperatorExpression__Group_1_0_0__0__Impl rule__XOtherOperatorExpression__Group_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11479:2: rule__XOtherOperatorExpression__Group_1_0_0__0__Impl rule__XOtherOperatorExpression__Group_1_0_0__1
+            // InternalCheck.g:11478:1: ( rule__XOtherOperatorExpression__Group_1_0_0__0__Impl rule__XOtherOperatorExpression__Group_1_0_0__1 )
+            // InternalCheck.g:11479:2: rule__XOtherOperatorExpression__Group_1_0_0__0__Impl rule__XOtherOperatorExpression__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1_0_0__0__Impl_in_rule__XOtherOperatorExpression__Group_1_0_0__023639);
+            pushFollow(FOLLOW_63);
             rule__XOtherOperatorExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1_0_0__1_in_rule__XOtherOperatorExpression__Group_1_0_0__023642);
+            pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group_1_0_0__1();
 
             state._fsp--;
@@ -34140,23 +34140,23 @@ public final void rule__XOtherOperatorExpression__Group_1_0_0__0() throws Recogn
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11486:1: rule__XOtherOperatorExpression__Group_1_0_0__0__Impl : ( () ) ;
+    // InternalCheck.g:11486:1: rule__XOtherOperatorExpression__Group_1_0_0__0__Impl : ( () ) ;
     public final void rule__XOtherOperatorExpression__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11490:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11491:1: ( () )
+            // InternalCheck.g:11490:1: ( ( () ) )
+            // InternalCheck.g:11491:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11491:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11492:1: ()
+            // InternalCheck.g:11491:1: ( () )
+            // InternalCheck.g:11492:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11493:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11495:1: 
+            // InternalCheck.g:11493:1: ()
+            // InternalCheck.g:11495:1: 
             {
             }
 
@@ -34181,16 +34181,16 @@ public final void rule__XOtherOperatorExpression__Group_1_0_0__0__Impl() throws
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11505:1: rule__XOtherOperatorExpression__Group_1_0_0__1 : rule__XOtherOperatorExpression__Group_1_0_0__1__Impl ;
+    // InternalCheck.g:11505:1: rule__XOtherOperatorExpression__Group_1_0_0__1 : rule__XOtherOperatorExpression__Group_1_0_0__1__Impl ;
     public final void rule__XOtherOperatorExpression__Group_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11509:1: ( rule__XOtherOperatorExpression__Group_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11510:2: rule__XOtherOperatorExpression__Group_1_0_0__1__Impl
+            // InternalCheck.g:11509:1: ( rule__XOtherOperatorExpression__Group_1_0_0__1__Impl )
+            // InternalCheck.g:11510:2: rule__XOtherOperatorExpression__Group_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1_0_0__1__Impl_in_rule__XOtherOperatorExpression__Group_1_0_0__123700);
+            pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group_1_0_0__1__Impl();
 
             state._fsp--;
@@ -34214,25 +34214,25 @@ public final void rule__XOtherOperatorExpression__Group_1_0_0__1() throws Recogn
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11516:1: rule__XOtherOperatorExpression__Group_1_0_0__1__Impl : ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) ) ;
+    // InternalCheck.g:11516:1: rule__XOtherOperatorExpression__Group_1_0_0__1__Impl : ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) ) ;
     public final void rule__XOtherOperatorExpression__Group_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11520:1: ( ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11521:1: ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalCheck.g:11520:1: ( ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) ) )
+            // InternalCheck.g:11521:1: ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11521:1: ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11522:1: ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 )
+            // InternalCheck.g:11521:1: ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalCheck.g:11522:1: ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getFeatureAssignment_1_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11523:1: ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11523:2: rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1
+            // InternalCheck.g:11523:1: ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 )
+            // InternalCheck.g:11523:2: rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1_in_rule__XOtherOperatorExpression__Group_1_0_0__1__Impl23727);
+            pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1();
 
             state._fsp--;
@@ -34265,21 +34265,21 @@ public final void rule__XOtherOperatorExpression__Group_1_0_0__1__Impl() throws
 
 
     // $ANTLR start "rule__OpOther__Group_2__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11537:1: rule__OpOther__Group_2__0 : rule__OpOther__Group_2__0__Impl rule__OpOther__Group_2__1 ;
+    // InternalCheck.g:11537:1: rule__OpOther__Group_2__0 : rule__OpOther__Group_2__0__Impl rule__OpOther__Group_2__1 ;
     public final void rule__OpOther__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11541:1: ( rule__OpOther__Group_2__0__Impl rule__OpOther__Group_2__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11542:2: rule__OpOther__Group_2__0__Impl rule__OpOther__Group_2__1
+            // InternalCheck.g:11541:1: ( rule__OpOther__Group_2__0__Impl rule__OpOther__Group_2__1 )
+            // InternalCheck.g:11542:2: rule__OpOther__Group_2__0__Impl rule__OpOther__Group_2__1
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_2__0__Impl_in_rule__OpOther__Group_2__023761);
+            pushFollow(FOLLOW_27);
             rule__OpOther__Group_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OpOther__Group_2__1_in_rule__OpOther__Group_2__023764);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Group_2__1();
 
             state._fsp--;
@@ -34303,22 +34303,22 @@ public final void rule__OpOther__Group_2__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpOther__Group_2__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11549:1: rule__OpOther__Group_2__0__Impl : ( '>' ) ;
+    // InternalCheck.g:11549:1: rule__OpOther__Group_2__0__Impl : ( '>' ) ;
     public final void rule__OpOther__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11553:1: ( ( '>' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11554:1: ( '>' )
+            // InternalCheck.g:11553:1: ( ( '>' ) )
+            // InternalCheck.g:11554:1: ( '>' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11554:1: ( '>' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11555:1: '>'
+            // InternalCheck.g:11554:1: ( '>' )
+            // InternalCheck.g:11555:1: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_2_0()); 
             }
-            match(input,46,FOLLOW_46_in_rule__OpOther__Group_2__0__Impl23792); if (state.failed) return ;
+            match(input,46,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_2_0()); 
             }
@@ -34344,16 +34344,16 @@ public final void rule__OpOther__Group_2__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__OpOther__Group_2__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11568:1: rule__OpOther__Group_2__1 : rule__OpOther__Group_2__1__Impl ;
+    // InternalCheck.g:11568:1: rule__OpOther__Group_2__1 : rule__OpOther__Group_2__1__Impl ;
     public final void rule__OpOther__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11572:1: ( rule__OpOther__Group_2__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11573:2: rule__OpOther__Group_2__1__Impl
+            // InternalCheck.g:11572:1: ( rule__OpOther__Group_2__1__Impl )
+            // InternalCheck.g:11573:2: rule__OpOther__Group_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_2__1__Impl_in_rule__OpOther__Group_2__123823);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Group_2__1__Impl();
 
             state._fsp--;
@@ -34377,22 +34377,22 @@ public final void rule__OpOther__Group_2__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpOther__Group_2__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11579:1: rule__OpOther__Group_2__1__Impl : ( '..' ) ;
+    // InternalCheck.g:11579:1: rule__OpOther__Group_2__1__Impl : ( '..' ) ;
     public final void rule__OpOther__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11583:1: ( ( '..' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11584:1: ( '..' )
+            // InternalCheck.g:11583:1: ( ( '..' ) )
+            // InternalCheck.g:11584:1: ( '..' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11584:1: ( '..' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11585:1: '..'
+            // InternalCheck.g:11584:1: ( '..' )
+            // InternalCheck.g:11585:1: '..'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getFullStopFullStopKeyword_2_1()); 
             }
-            match(input,50,FOLLOW_50_in_rule__OpOther__Group_2__1__Impl23851); if (state.failed) return ;
+            match(input,50,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpOtherAccess().getFullStopFullStopKeyword_2_1()); 
             }
@@ -34418,21 +34418,21 @@ public final void rule__OpOther__Group_2__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__OpOther__Group_5__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11602:1: rule__OpOther__Group_5__0 : rule__OpOther__Group_5__0__Impl rule__OpOther__Group_5__1 ;
+    // InternalCheck.g:11602:1: rule__OpOther__Group_5__0 : rule__OpOther__Group_5__0__Impl rule__OpOther__Group_5__1 ;
     public final void rule__OpOther__Group_5__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11606:1: ( rule__OpOther__Group_5__0__Impl rule__OpOther__Group_5__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11607:2: rule__OpOther__Group_5__0__Impl rule__OpOther__Group_5__1
+            // InternalCheck.g:11606:1: ( rule__OpOther__Group_5__0__Impl rule__OpOther__Group_5__1 )
+            // InternalCheck.g:11607:2: rule__OpOther__Group_5__0__Impl rule__OpOther__Group_5__1
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_5__0__Impl_in_rule__OpOther__Group_5__023886);
+            pushFollow(FOLLOW_65);
             rule__OpOther__Group_5__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OpOther__Group_5__1_in_rule__OpOther__Group_5__023889);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Group_5__1();
 
             state._fsp--;
@@ -34456,22 +34456,22 @@ public final void rule__OpOther__Group_5__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpOther__Group_5__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11614:1: rule__OpOther__Group_5__0__Impl : ( '>' ) ;
+    // InternalCheck.g:11614:1: rule__OpOther__Group_5__0__Impl : ( '>' ) ;
     public final void rule__OpOther__Group_5__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11618:1: ( ( '>' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11619:1: ( '>' )
+            // InternalCheck.g:11618:1: ( ( '>' ) )
+            // InternalCheck.g:11619:1: ( '>' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11619:1: ( '>' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11620:1: '>'
+            // InternalCheck.g:11619:1: ( '>' )
+            // InternalCheck.g:11620:1: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_0()); 
             }
-            match(input,46,FOLLOW_46_in_rule__OpOther__Group_5__0__Impl23917); if (state.failed) return ;
+            match(input,46,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_0()); 
             }
@@ -34497,16 +34497,16 @@ public final void rule__OpOther__Group_5__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__OpOther__Group_5__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11633:1: rule__OpOther__Group_5__1 : rule__OpOther__Group_5__1__Impl ;
+    // InternalCheck.g:11633:1: rule__OpOther__Group_5__1 : rule__OpOther__Group_5__1__Impl ;
     public final void rule__OpOther__Group_5__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11637:1: ( rule__OpOther__Group_5__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11638:2: rule__OpOther__Group_5__1__Impl
+            // InternalCheck.g:11637:1: ( rule__OpOther__Group_5__1__Impl )
+            // InternalCheck.g:11638:2: rule__OpOther__Group_5__1__Impl
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_5__1__Impl_in_rule__OpOther__Group_5__123948);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Group_5__1__Impl();
 
             state._fsp--;
@@ -34530,25 +34530,25 @@ public final void rule__OpOther__Group_5__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpOther__Group_5__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11644:1: rule__OpOther__Group_5__1__Impl : ( ( rule__OpOther__Alternatives_5_1 ) ) ;
+    // InternalCheck.g:11644:1: rule__OpOther__Group_5__1__Impl : ( ( rule__OpOther__Alternatives_5_1 ) ) ;
     public final void rule__OpOther__Group_5__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11648:1: ( ( ( rule__OpOther__Alternatives_5_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11649:1: ( ( rule__OpOther__Alternatives_5_1 ) )
+            // InternalCheck.g:11648:1: ( ( ( rule__OpOther__Alternatives_5_1 ) ) )
+            // InternalCheck.g:11649:1: ( ( rule__OpOther__Alternatives_5_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11649:1: ( ( rule__OpOther__Alternatives_5_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11650:1: ( rule__OpOther__Alternatives_5_1 )
+            // InternalCheck.g:11649:1: ( ( rule__OpOther__Alternatives_5_1 ) )
+            // InternalCheck.g:11650:1: ( rule__OpOther__Alternatives_5_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getAlternatives_5_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11651:1: ( rule__OpOther__Alternatives_5_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11651:2: rule__OpOther__Alternatives_5_1
+            // InternalCheck.g:11651:1: ( rule__OpOther__Alternatives_5_1 )
+            // InternalCheck.g:11651:2: rule__OpOther__Alternatives_5_1
             {
-            pushFollow(FOLLOW_rule__OpOther__Alternatives_5_1_in_rule__OpOther__Group_5__1__Impl23975);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Alternatives_5_1();
 
             state._fsp--;
@@ -34581,16 +34581,16 @@ public final void rule__OpOther__Group_5__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__OpOther__Group_5_1_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11665:1: rule__OpOther__Group_5_1_0__0 : rule__OpOther__Group_5_1_0__0__Impl ;
+    // InternalCheck.g:11665:1: rule__OpOther__Group_5_1_0__0 : rule__OpOther__Group_5_1_0__0__Impl ;
     public final void rule__OpOther__Group_5_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11669:1: ( rule__OpOther__Group_5_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11670:2: rule__OpOther__Group_5_1_0__0__Impl
+            // InternalCheck.g:11669:1: ( rule__OpOther__Group_5_1_0__0__Impl )
+            // InternalCheck.g:11670:2: rule__OpOther__Group_5_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_5_1_0__0__Impl_in_rule__OpOther__Group_5_1_0__024009);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Group_5_1_0__0__Impl();
 
             state._fsp--;
@@ -34614,25 +34614,25 @@ public final void rule__OpOther__Group_5_1_0__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpOther__Group_5_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11676:1: rule__OpOther__Group_5_1_0__0__Impl : ( ( rule__OpOther__Group_5_1_0_0__0 ) ) ;
+    // InternalCheck.g:11676:1: rule__OpOther__Group_5_1_0__0__Impl : ( ( rule__OpOther__Group_5_1_0_0__0 ) ) ;
     public final void rule__OpOther__Group_5_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11680:1: ( ( ( rule__OpOther__Group_5_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11681:1: ( ( rule__OpOther__Group_5_1_0_0__0 ) )
+            // InternalCheck.g:11680:1: ( ( ( rule__OpOther__Group_5_1_0_0__0 ) ) )
+            // InternalCheck.g:11681:1: ( ( rule__OpOther__Group_5_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11681:1: ( ( rule__OpOther__Group_5_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11682:1: ( rule__OpOther__Group_5_1_0_0__0 )
+            // InternalCheck.g:11681:1: ( ( rule__OpOther__Group_5_1_0_0__0 ) )
+            // InternalCheck.g:11682:1: ( rule__OpOther__Group_5_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getGroup_5_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11683:1: ( rule__OpOther__Group_5_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11683:2: rule__OpOther__Group_5_1_0_0__0
+            // InternalCheck.g:11683:1: ( rule__OpOther__Group_5_1_0_0__0 )
+            // InternalCheck.g:11683:2: rule__OpOther__Group_5_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_5_1_0_0__0_in_rule__OpOther__Group_5_1_0__0__Impl24036);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Group_5_1_0_0__0();
 
             state._fsp--;
@@ -34665,21 +34665,21 @@ public final void rule__OpOther__Group_5_1_0__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__OpOther__Group_5_1_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11695:1: rule__OpOther__Group_5_1_0_0__0 : rule__OpOther__Group_5_1_0_0__0__Impl rule__OpOther__Group_5_1_0_0__1 ;
+    // InternalCheck.g:11695:1: rule__OpOther__Group_5_1_0_0__0 : rule__OpOther__Group_5_1_0_0__0__Impl rule__OpOther__Group_5_1_0_0__1 ;
     public final void rule__OpOther__Group_5_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11699:1: ( rule__OpOther__Group_5_1_0_0__0__Impl rule__OpOther__Group_5_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11700:2: rule__OpOther__Group_5_1_0_0__0__Impl rule__OpOther__Group_5_1_0_0__1
+            // InternalCheck.g:11699:1: ( rule__OpOther__Group_5_1_0_0__0__Impl rule__OpOther__Group_5_1_0_0__1 )
+            // InternalCheck.g:11700:2: rule__OpOther__Group_5_1_0_0__0__Impl rule__OpOther__Group_5_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_5_1_0_0__0__Impl_in_rule__OpOther__Group_5_1_0_0__024068);
+            pushFollow(FOLLOW_65);
             rule__OpOther__Group_5_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OpOther__Group_5_1_0_0__1_in_rule__OpOther__Group_5_1_0_0__024071);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Group_5_1_0_0__1();
 
             state._fsp--;
@@ -34703,22 +34703,22 @@ public final void rule__OpOther__Group_5_1_0_0__0() throws RecognitionException
 
 
     // $ANTLR start "rule__OpOther__Group_5_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11707:1: rule__OpOther__Group_5_1_0_0__0__Impl : ( '>' ) ;
+    // InternalCheck.g:11707:1: rule__OpOther__Group_5_1_0_0__0__Impl : ( '>' ) ;
     public final void rule__OpOther__Group_5_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11711:1: ( ( '>' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11712:1: ( '>' )
+            // InternalCheck.g:11711:1: ( ( '>' ) )
+            // InternalCheck.g:11712:1: ( '>' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11712:1: ( '>' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11713:1: '>'
+            // InternalCheck.g:11712:1: ( '>' )
+            // InternalCheck.g:11713:1: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_1_0_0_0()); 
             }
-            match(input,46,FOLLOW_46_in_rule__OpOther__Group_5_1_0_0__0__Impl24099); if (state.failed) return ;
+            match(input,46,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_1_0_0_0()); 
             }
@@ -34744,16 +34744,16 @@ public final void rule__OpOther__Group_5_1_0_0__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__OpOther__Group_5_1_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11726:1: rule__OpOther__Group_5_1_0_0__1 : rule__OpOther__Group_5_1_0_0__1__Impl ;
+    // InternalCheck.g:11726:1: rule__OpOther__Group_5_1_0_0__1 : rule__OpOther__Group_5_1_0_0__1__Impl ;
     public final void rule__OpOther__Group_5_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11730:1: ( rule__OpOther__Group_5_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11731:2: rule__OpOther__Group_5_1_0_0__1__Impl
+            // InternalCheck.g:11730:1: ( rule__OpOther__Group_5_1_0_0__1__Impl )
+            // InternalCheck.g:11731:2: rule__OpOther__Group_5_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_5_1_0_0__1__Impl_in_rule__OpOther__Group_5_1_0_0__124130);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Group_5_1_0_0__1__Impl();
 
             state._fsp--;
@@ -34777,22 +34777,22 @@ public final void rule__OpOther__Group_5_1_0_0__1() throws RecognitionException
 
 
     // $ANTLR start "rule__OpOther__Group_5_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11737:1: rule__OpOther__Group_5_1_0_0__1__Impl : ( '>' ) ;
+    // InternalCheck.g:11737:1: rule__OpOther__Group_5_1_0_0__1__Impl : ( '>' ) ;
     public final void rule__OpOther__Group_5_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11741:1: ( ( '>' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11742:1: ( '>' )
+            // InternalCheck.g:11741:1: ( ( '>' ) )
+            // InternalCheck.g:11742:1: ( '>' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11742:1: ( '>' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11743:1: '>'
+            // InternalCheck.g:11742:1: ( '>' )
+            // InternalCheck.g:11743:1: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_1_0_0_1()); 
             }
-            match(input,46,FOLLOW_46_in_rule__OpOther__Group_5_1_0_0__1__Impl24158); if (state.failed) return ;
+            match(input,46,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_1_0_0_1()); 
             }
@@ -34818,21 +34818,21 @@ public final void rule__OpOther__Group_5_1_0_0__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__OpOther__Group_6__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11760:1: rule__OpOther__Group_6__0 : rule__OpOther__Group_6__0__Impl rule__OpOther__Group_6__1 ;
+    // InternalCheck.g:11760:1: rule__OpOther__Group_6__0 : rule__OpOther__Group_6__0__Impl rule__OpOther__Group_6__1 ;
     public final void rule__OpOther__Group_6__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11764:1: ( rule__OpOther__Group_6__0__Impl rule__OpOther__Group_6__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11765:2: rule__OpOther__Group_6__0__Impl rule__OpOther__Group_6__1
+            // InternalCheck.g:11764:1: ( rule__OpOther__Group_6__0__Impl rule__OpOther__Group_6__1 )
+            // InternalCheck.g:11765:2: rule__OpOther__Group_6__0__Impl rule__OpOther__Group_6__1
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_6__0__Impl_in_rule__OpOther__Group_6__024193);
+            pushFollow(FOLLOW_66);
             rule__OpOther__Group_6__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OpOther__Group_6__1_in_rule__OpOther__Group_6__024196);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Group_6__1();
 
             state._fsp--;
@@ -34856,22 +34856,22 @@ public final void rule__OpOther__Group_6__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpOther__Group_6__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11772:1: rule__OpOther__Group_6__0__Impl : ( '<' ) ;
+    // InternalCheck.g:11772:1: rule__OpOther__Group_6__0__Impl : ( '<' ) ;
     public final void rule__OpOther__Group_6__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11776:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11777:1: ( '<' )
+            // InternalCheck.g:11776:1: ( ( '<' ) )
+            // InternalCheck.g:11777:1: ( '<' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11777:1: ( '<' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11778:1: '<'
+            // InternalCheck.g:11777:1: ( '<' )
+            // InternalCheck.g:11778:1: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_0()); 
             }
-            match(input,47,FOLLOW_47_in_rule__OpOther__Group_6__0__Impl24224); if (state.failed) return ;
+            match(input,47,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_0()); 
             }
@@ -34897,16 +34897,16 @@ public final void rule__OpOther__Group_6__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__OpOther__Group_6__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11791:1: rule__OpOther__Group_6__1 : rule__OpOther__Group_6__1__Impl ;
+    // InternalCheck.g:11791:1: rule__OpOther__Group_6__1 : rule__OpOther__Group_6__1__Impl ;
     public final void rule__OpOther__Group_6__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11795:1: ( rule__OpOther__Group_6__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11796:2: rule__OpOther__Group_6__1__Impl
+            // InternalCheck.g:11795:1: ( rule__OpOther__Group_6__1__Impl )
+            // InternalCheck.g:11796:2: rule__OpOther__Group_6__1__Impl
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_6__1__Impl_in_rule__OpOther__Group_6__124255);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Group_6__1__Impl();
 
             state._fsp--;
@@ -34930,25 +34930,25 @@ public final void rule__OpOther__Group_6__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpOther__Group_6__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11802:1: rule__OpOther__Group_6__1__Impl : ( ( rule__OpOther__Alternatives_6_1 ) ) ;
+    // InternalCheck.g:11802:1: rule__OpOther__Group_6__1__Impl : ( ( rule__OpOther__Alternatives_6_1 ) ) ;
     public final void rule__OpOther__Group_6__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11806:1: ( ( ( rule__OpOther__Alternatives_6_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11807:1: ( ( rule__OpOther__Alternatives_6_1 ) )
+            // InternalCheck.g:11806:1: ( ( ( rule__OpOther__Alternatives_6_1 ) ) )
+            // InternalCheck.g:11807:1: ( ( rule__OpOther__Alternatives_6_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11807:1: ( ( rule__OpOther__Alternatives_6_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11808:1: ( rule__OpOther__Alternatives_6_1 )
+            // InternalCheck.g:11807:1: ( ( rule__OpOther__Alternatives_6_1 ) )
+            // InternalCheck.g:11808:1: ( rule__OpOther__Alternatives_6_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getAlternatives_6_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11809:1: ( rule__OpOther__Alternatives_6_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11809:2: rule__OpOther__Alternatives_6_1
+            // InternalCheck.g:11809:1: ( rule__OpOther__Alternatives_6_1 )
+            // InternalCheck.g:11809:2: rule__OpOther__Alternatives_6_1
             {
-            pushFollow(FOLLOW_rule__OpOther__Alternatives_6_1_in_rule__OpOther__Group_6__1__Impl24282);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Alternatives_6_1();
 
             state._fsp--;
@@ -34981,16 +34981,16 @@ public final void rule__OpOther__Group_6__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__OpOther__Group_6_1_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11823:1: rule__OpOther__Group_6_1_0__0 : rule__OpOther__Group_6_1_0__0__Impl ;
+    // InternalCheck.g:11823:1: rule__OpOther__Group_6_1_0__0 : rule__OpOther__Group_6_1_0__0__Impl ;
     public final void rule__OpOther__Group_6_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11827:1: ( rule__OpOther__Group_6_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11828:2: rule__OpOther__Group_6_1_0__0__Impl
+            // InternalCheck.g:11827:1: ( rule__OpOther__Group_6_1_0__0__Impl )
+            // InternalCheck.g:11828:2: rule__OpOther__Group_6_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_6_1_0__0__Impl_in_rule__OpOther__Group_6_1_0__024316);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Group_6_1_0__0__Impl();
 
             state._fsp--;
@@ -35014,25 +35014,25 @@ public final void rule__OpOther__Group_6_1_0__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpOther__Group_6_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11834:1: rule__OpOther__Group_6_1_0__0__Impl : ( ( rule__OpOther__Group_6_1_0_0__0 ) ) ;
+    // InternalCheck.g:11834:1: rule__OpOther__Group_6_1_0__0__Impl : ( ( rule__OpOther__Group_6_1_0_0__0 ) ) ;
     public final void rule__OpOther__Group_6_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11838:1: ( ( ( rule__OpOther__Group_6_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11839:1: ( ( rule__OpOther__Group_6_1_0_0__0 ) )
+            // InternalCheck.g:11838:1: ( ( ( rule__OpOther__Group_6_1_0_0__0 ) ) )
+            // InternalCheck.g:11839:1: ( ( rule__OpOther__Group_6_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11839:1: ( ( rule__OpOther__Group_6_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11840:1: ( rule__OpOther__Group_6_1_0_0__0 )
+            // InternalCheck.g:11839:1: ( ( rule__OpOther__Group_6_1_0_0__0 ) )
+            // InternalCheck.g:11840:1: ( rule__OpOther__Group_6_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getGroup_6_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11841:1: ( rule__OpOther__Group_6_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11841:2: rule__OpOther__Group_6_1_0_0__0
+            // InternalCheck.g:11841:1: ( rule__OpOther__Group_6_1_0_0__0 )
+            // InternalCheck.g:11841:2: rule__OpOther__Group_6_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_6_1_0_0__0_in_rule__OpOther__Group_6_1_0__0__Impl24343);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Group_6_1_0_0__0();
 
             state._fsp--;
@@ -35065,21 +35065,21 @@ public final void rule__OpOther__Group_6_1_0__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__OpOther__Group_6_1_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11853:1: rule__OpOther__Group_6_1_0_0__0 : rule__OpOther__Group_6_1_0_0__0__Impl rule__OpOther__Group_6_1_0_0__1 ;
+    // InternalCheck.g:11853:1: rule__OpOther__Group_6_1_0_0__0 : rule__OpOther__Group_6_1_0_0__0__Impl rule__OpOther__Group_6_1_0_0__1 ;
     public final void rule__OpOther__Group_6_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11857:1: ( rule__OpOther__Group_6_1_0_0__0__Impl rule__OpOther__Group_6_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11858:2: rule__OpOther__Group_6_1_0_0__0__Impl rule__OpOther__Group_6_1_0_0__1
+            // InternalCheck.g:11857:1: ( rule__OpOther__Group_6_1_0_0__0__Impl rule__OpOther__Group_6_1_0_0__1 )
+            // InternalCheck.g:11858:2: rule__OpOther__Group_6_1_0_0__0__Impl rule__OpOther__Group_6_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_6_1_0_0__0__Impl_in_rule__OpOther__Group_6_1_0_0__024375);
+            pushFollow(FOLLOW_52);
             rule__OpOther__Group_6_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OpOther__Group_6_1_0_0__1_in_rule__OpOther__Group_6_1_0_0__024378);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Group_6_1_0_0__1();
 
             state._fsp--;
@@ -35103,22 +35103,22 @@ public final void rule__OpOther__Group_6_1_0_0__0() throws RecognitionException
 
 
     // $ANTLR start "rule__OpOther__Group_6_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11865:1: rule__OpOther__Group_6_1_0_0__0__Impl : ( '<' ) ;
+    // InternalCheck.g:11865:1: rule__OpOther__Group_6_1_0_0__0__Impl : ( '<' ) ;
     public final void rule__OpOther__Group_6_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11869:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11870:1: ( '<' )
+            // InternalCheck.g:11869:1: ( ( '<' ) )
+            // InternalCheck.g:11870:1: ( '<' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11870:1: ( '<' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11871:1: '<'
+            // InternalCheck.g:11870:1: ( '<' )
+            // InternalCheck.g:11871:1: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_1_0_0_0()); 
             }
-            match(input,47,FOLLOW_47_in_rule__OpOther__Group_6_1_0_0__0__Impl24406); if (state.failed) return ;
+            match(input,47,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_1_0_0_0()); 
             }
@@ -35144,16 +35144,16 @@ public final void rule__OpOther__Group_6_1_0_0__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__OpOther__Group_6_1_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11884:1: rule__OpOther__Group_6_1_0_0__1 : rule__OpOther__Group_6_1_0_0__1__Impl ;
+    // InternalCheck.g:11884:1: rule__OpOther__Group_6_1_0_0__1 : rule__OpOther__Group_6_1_0_0__1__Impl ;
     public final void rule__OpOther__Group_6_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11888:1: ( rule__OpOther__Group_6_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11889:2: rule__OpOther__Group_6_1_0_0__1__Impl
+            // InternalCheck.g:11888:1: ( rule__OpOther__Group_6_1_0_0__1__Impl )
+            // InternalCheck.g:11889:2: rule__OpOther__Group_6_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_6_1_0_0__1__Impl_in_rule__OpOther__Group_6_1_0_0__124437);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Group_6_1_0_0__1__Impl();
 
             state._fsp--;
@@ -35177,22 +35177,22 @@ public final void rule__OpOther__Group_6_1_0_0__1() throws RecognitionException
 
 
     // $ANTLR start "rule__OpOther__Group_6_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11895:1: rule__OpOther__Group_6_1_0_0__1__Impl : ( '<' ) ;
+    // InternalCheck.g:11895:1: rule__OpOther__Group_6_1_0_0__1__Impl : ( '<' ) ;
     public final void rule__OpOther__Group_6_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11899:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11900:1: ( '<' )
+            // InternalCheck.g:11899:1: ( ( '<' ) )
+            // InternalCheck.g:11900:1: ( '<' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11900:1: ( '<' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11901:1: '<'
+            // InternalCheck.g:11900:1: ( '<' )
+            // InternalCheck.g:11901:1: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_1_0_0_1()); 
             }
-            match(input,47,FOLLOW_47_in_rule__OpOther__Group_6_1_0_0__1__Impl24465); if (state.failed) return ;
+            match(input,47,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_1_0_0_1()); 
             }
@@ -35218,21 +35218,21 @@ public final void rule__OpOther__Group_6_1_0_0__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11918:1: rule__XAdditiveExpression__Group__0 : rule__XAdditiveExpression__Group__0__Impl rule__XAdditiveExpression__Group__1 ;
+    // InternalCheck.g:11918:1: rule__XAdditiveExpression__Group__0 : rule__XAdditiveExpression__Group__0__Impl rule__XAdditiveExpression__Group__1 ;
     public final void rule__XAdditiveExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11922:1: ( rule__XAdditiveExpression__Group__0__Impl rule__XAdditiveExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11923:2: rule__XAdditiveExpression__Group__0__Impl rule__XAdditiveExpression__Group__1
+            // InternalCheck.g:11922:1: ( rule__XAdditiveExpression__Group__0__Impl rule__XAdditiveExpression__Group__1 )
+            // InternalCheck.g:11923:2: rule__XAdditiveExpression__Group__0__Impl rule__XAdditiveExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group__0__Impl_in_rule__XAdditiveExpression__Group__024500);
+            pushFollow(FOLLOW_67);
             rule__XAdditiveExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group__1_in_rule__XAdditiveExpression__Group__024503);
+            pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group__1();
 
             state._fsp--;
@@ -35256,22 +35256,22 @@ public final void rule__XAdditiveExpression__Group__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11930:1: rule__XAdditiveExpression__Group__0__Impl : ( ruleXMultiplicativeExpression ) ;
+    // InternalCheck.g:11930:1: rule__XAdditiveExpression__Group__0__Impl : ( ruleXMultiplicativeExpression ) ;
     public final void rule__XAdditiveExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11934:1: ( ( ruleXMultiplicativeExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11935:1: ( ruleXMultiplicativeExpression )
+            // InternalCheck.g:11934:1: ( ( ruleXMultiplicativeExpression ) )
+            // InternalCheck.g:11935:1: ( ruleXMultiplicativeExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11935:1: ( ruleXMultiplicativeExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11936:1: ruleXMultiplicativeExpression
+            // InternalCheck.g:11935:1: ( ruleXMultiplicativeExpression )
+            // InternalCheck.g:11936:1: ruleXMultiplicativeExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getXMultiplicativeExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleXMultiplicativeExpression_in_rule__XAdditiveExpression__Group__0__Impl24530);
+            pushFollow(FOLLOW_2);
             ruleXMultiplicativeExpression();
 
             state._fsp--;
@@ -35301,16 +35301,16 @@ public final void rule__XAdditiveExpression__Group__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11947:1: rule__XAdditiveExpression__Group__1 : rule__XAdditiveExpression__Group__1__Impl ;
+    // InternalCheck.g:11947:1: rule__XAdditiveExpression__Group__1 : rule__XAdditiveExpression__Group__1__Impl ;
     public final void rule__XAdditiveExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11951:1: ( rule__XAdditiveExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11952:2: rule__XAdditiveExpression__Group__1__Impl
+            // InternalCheck.g:11951:1: ( rule__XAdditiveExpression__Group__1__Impl )
+            // InternalCheck.g:11952:2: rule__XAdditiveExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group__1__Impl_in_rule__XAdditiveExpression__Group__124559);
+            pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group__1__Impl();
 
             state._fsp--;
@@ -35334,22 +35334,22 @@ public final void rule__XAdditiveExpression__Group__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11958:1: rule__XAdditiveExpression__Group__1__Impl : ( ( rule__XAdditiveExpression__Group_1__0 )* ) ;
+    // InternalCheck.g:11958:1: rule__XAdditiveExpression__Group__1__Impl : ( ( rule__XAdditiveExpression__Group_1__0 )* ) ;
     public final void rule__XAdditiveExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11962:1: ( ( ( rule__XAdditiveExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11963:1: ( ( rule__XAdditiveExpression__Group_1__0 )* )
+            // InternalCheck.g:11962:1: ( ( ( rule__XAdditiveExpression__Group_1__0 )* ) )
+            // InternalCheck.g:11963:1: ( ( rule__XAdditiveExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11963:1: ( ( rule__XAdditiveExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11964:1: ( rule__XAdditiveExpression__Group_1__0 )*
+            // InternalCheck.g:11963:1: ( ( rule__XAdditiveExpression__Group_1__0 )* )
+            // InternalCheck.g:11964:1: ( rule__XAdditiveExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11965:1: ( rule__XAdditiveExpression__Group_1__0 )*
+            // InternalCheck.g:11965:1: ( rule__XAdditiveExpression__Group_1__0 )*
             loop100:
             do {
                 int alt100=2;
@@ -35377,9 +35377,9 @@ else if ( (LA100_0==54) ) {
 
                 switch (alt100) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11965:2: rule__XAdditiveExpression__Group_1__0
+            	    // InternalCheck.g:11965:2: rule__XAdditiveExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1__0_in_rule__XAdditiveExpression__Group__1__Impl24586);
+            	    pushFollow(FOLLOW_68);
             	    rule__XAdditiveExpression__Group_1__0();
 
             	    state._fsp--;
@@ -35418,21 +35418,21 @@ else if ( (LA100_0==54) ) {
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11979:1: rule__XAdditiveExpression__Group_1__0 : rule__XAdditiveExpression__Group_1__0__Impl rule__XAdditiveExpression__Group_1__1 ;
+    // InternalCheck.g:11979:1: rule__XAdditiveExpression__Group_1__0 : rule__XAdditiveExpression__Group_1__0__Impl rule__XAdditiveExpression__Group_1__1 ;
     public final void rule__XAdditiveExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11983:1: ( rule__XAdditiveExpression__Group_1__0__Impl rule__XAdditiveExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11984:2: rule__XAdditiveExpression__Group_1__0__Impl rule__XAdditiveExpression__Group_1__1
+            // InternalCheck.g:11983:1: ( rule__XAdditiveExpression__Group_1__0__Impl rule__XAdditiveExpression__Group_1__1 )
+            // InternalCheck.g:11984:2: rule__XAdditiveExpression__Group_1__0__Impl rule__XAdditiveExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1__0__Impl_in_rule__XAdditiveExpression__Group_1__024621);
+            pushFollow(FOLLOW_32);
             rule__XAdditiveExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1__1_in_rule__XAdditiveExpression__Group_1__024624);
+            pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group_1__1();
 
             state._fsp--;
@@ -35456,25 +35456,25 @@ public final void rule__XAdditiveExpression__Group_1__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11991:1: rule__XAdditiveExpression__Group_1__0__Impl : ( ( rule__XAdditiveExpression__Group_1_0__0 ) ) ;
+    // InternalCheck.g:11991:1: rule__XAdditiveExpression__Group_1__0__Impl : ( ( rule__XAdditiveExpression__Group_1_0__0 ) ) ;
     public final void rule__XAdditiveExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11995:1: ( ( ( rule__XAdditiveExpression__Group_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11996:1: ( ( rule__XAdditiveExpression__Group_1_0__0 ) )
+            // InternalCheck.g:11995:1: ( ( ( rule__XAdditiveExpression__Group_1_0__0 ) ) )
+            // InternalCheck.g:11996:1: ( ( rule__XAdditiveExpression__Group_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11996:1: ( ( rule__XAdditiveExpression__Group_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11997:1: ( rule__XAdditiveExpression__Group_1_0__0 )
+            // InternalCheck.g:11996:1: ( ( rule__XAdditiveExpression__Group_1_0__0 ) )
+            // InternalCheck.g:11997:1: ( rule__XAdditiveExpression__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getGroup_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11998:1: ( rule__XAdditiveExpression__Group_1_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11998:2: rule__XAdditiveExpression__Group_1_0__0
+            // InternalCheck.g:11998:1: ( rule__XAdditiveExpression__Group_1_0__0 )
+            // InternalCheck.g:11998:2: rule__XAdditiveExpression__Group_1_0__0
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1_0__0_in_rule__XAdditiveExpression__Group_1__0__Impl24651);
+            pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group_1_0__0();
 
             state._fsp--;
@@ -35507,16 +35507,16 @@ public final void rule__XAdditiveExpression__Group_1__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12008:1: rule__XAdditiveExpression__Group_1__1 : rule__XAdditiveExpression__Group_1__1__Impl ;
+    // InternalCheck.g:12008:1: rule__XAdditiveExpression__Group_1__1 : rule__XAdditiveExpression__Group_1__1__Impl ;
     public final void rule__XAdditiveExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12012:1: ( rule__XAdditiveExpression__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12013:2: rule__XAdditiveExpression__Group_1__1__Impl
+            // InternalCheck.g:12012:1: ( rule__XAdditiveExpression__Group_1__1__Impl )
+            // InternalCheck.g:12013:2: rule__XAdditiveExpression__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1__1__Impl_in_rule__XAdditiveExpression__Group_1__124681);
+            pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group_1__1__Impl();
 
             state._fsp--;
@@ -35540,25 +35540,25 @@ public final void rule__XAdditiveExpression__Group_1__1() throws RecognitionExce
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12019:1: rule__XAdditiveExpression__Group_1__1__Impl : ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) ) ;
+    // InternalCheck.g:12019:1: rule__XAdditiveExpression__Group_1__1__Impl : ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) ) ;
     public final void rule__XAdditiveExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12023:1: ( ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12024:1: ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) )
+            // InternalCheck.g:12023:1: ( ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) ) )
+            // InternalCheck.g:12024:1: ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12024:1: ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12025:1: ( rule__XAdditiveExpression__RightOperandAssignment_1_1 )
+            // InternalCheck.g:12024:1: ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) )
+            // InternalCheck.g:12025:1: ( rule__XAdditiveExpression__RightOperandAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getRightOperandAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12026:1: ( rule__XAdditiveExpression__RightOperandAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12026:2: rule__XAdditiveExpression__RightOperandAssignment_1_1
+            // InternalCheck.g:12026:1: ( rule__XAdditiveExpression__RightOperandAssignment_1_1 )
+            // InternalCheck.g:12026:2: rule__XAdditiveExpression__RightOperandAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__RightOperandAssignment_1_1_in_rule__XAdditiveExpression__Group_1__1__Impl24708);
+            pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__RightOperandAssignment_1_1();
 
             state._fsp--;
@@ -35591,16 +35591,16 @@ public final void rule__XAdditiveExpression__Group_1__1__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12040:1: rule__XAdditiveExpression__Group_1_0__0 : rule__XAdditiveExpression__Group_1_0__0__Impl ;
+    // InternalCheck.g:12040:1: rule__XAdditiveExpression__Group_1_0__0 : rule__XAdditiveExpression__Group_1_0__0__Impl ;
     public final void rule__XAdditiveExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12044:1: ( rule__XAdditiveExpression__Group_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12045:2: rule__XAdditiveExpression__Group_1_0__0__Impl
+            // InternalCheck.g:12044:1: ( rule__XAdditiveExpression__Group_1_0__0__Impl )
+            // InternalCheck.g:12045:2: rule__XAdditiveExpression__Group_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1_0__0__Impl_in_rule__XAdditiveExpression__Group_1_0__024742);
+            pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group_1_0__0__Impl();
 
             state._fsp--;
@@ -35624,25 +35624,25 @@ public final void rule__XAdditiveExpression__Group_1_0__0() throws RecognitionEx
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12051:1: rule__XAdditiveExpression__Group_1_0__0__Impl : ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) ) ;
+    // InternalCheck.g:12051:1: rule__XAdditiveExpression__Group_1_0__0__Impl : ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) ) ;
     public final void rule__XAdditiveExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12055:1: ( ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12056:1: ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) )
+            // InternalCheck.g:12055:1: ( ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) ) )
+            // InternalCheck.g:12056:1: ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12056:1: ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12057:1: ( rule__XAdditiveExpression__Group_1_0_0__0 )
+            // InternalCheck.g:12056:1: ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) )
+            // InternalCheck.g:12057:1: ( rule__XAdditiveExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getGroup_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12058:1: ( rule__XAdditiveExpression__Group_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12058:2: rule__XAdditiveExpression__Group_1_0_0__0
+            // InternalCheck.g:12058:1: ( rule__XAdditiveExpression__Group_1_0_0__0 )
+            // InternalCheck.g:12058:2: rule__XAdditiveExpression__Group_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1_0_0__0_in_rule__XAdditiveExpression__Group_1_0__0__Impl24769);
+            pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group_1_0_0__0();
 
             state._fsp--;
@@ -35675,21 +35675,21 @@ public final void rule__XAdditiveExpression__Group_1_0__0__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12070:1: rule__XAdditiveExpression__Group_1_0_0__0 : rule__XAdditiveExpression__Group_1_0_0__0__Impl rule__XAdditiveExpression__Group_1_0_0__1 ;
+    // InternalCheck.g:12070:1: rule__XAdditiveExpression__Group_1_0_0__0 : rule__XAdditiveExpression__Group_1_0_0__0__Impl rule__XAdditiveExpression__Group_1_0_0__1 ;
     public final void rule__XAdditiveExpression__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12074:1: ( rule__XAdditiveExpression__Group_1_0_0__0__Impl rule__XAdditiveExpression__Group_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12075:2: rule__XAdditiveExpression__Group_1_0_0__0__Impl rule__XAdditiveExpression__Group_1_0_0__1
+            // InternalCheck.g:12074:1: ( rule__XAdditiveExpression__Group_1_0_0__0__Impl rule__XAdditiveExpression__Group_1_0_0__1 )
+            // InternalCheck.g:12075:2: rule__XAdditiveExpression__Group_1_0_0__0__Impl rule__XAdditiveExpression__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1_0_0__0__Impl_in_rule__XAdditiveExpression__Group_1_0_0__024801);
+            pushFollow(FOLLOW_67);
             rule__XAdditiveExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1_0_0__1_in_rule__XAdditiveExpression__Group_1_0_0__024804);
+            pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group_1_0_0__1();
 
             state._fsp--;
@@ -35713,23 +35713,23 @@ public final void rule__XAdditiveExpression__Group_1_0_0__0() throws Recognition
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12082:1: rule__XAdditiveExpression__Group_1_0_0__0__Impl : ( () ) ;
+    // InternalCheck.g:12082:1: rule__XAdditiveExpression__Group_1_0_0__0__Impl : ( () ) ;
     public final void rule__XAdditiveExpression__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12086:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12087:1: ( () )
+            // InternalCheck.g:12086:1: ( ( () ) )
+            // InternalCheck.g:12087:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12087:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12088:1: ()
+            // InternalCheck.g:12087:1: ( () )
+            // InternalCheck.g:12088:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12089:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12091:1: 
+            // InternalCheck.g:12089:1: ()
+            // InternalCheck.g:12091:1: 
             {
             }
 
@@ -35754,16 +35754,16 @@ public final void rule__XAdditiveExpression__Group_1_0_0__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12101:1: rule__XAdditiveExpression__Group_1_0_0__1 : rule__XAdditiveExpression__Group_1_0_0__1__Impl ;
+    // InternalCheck.g:12101:1: rule__XAdditiveExpression__Group_1_0_0__1 : rule__XAdditiveExpression__Group_1_0_0__1__Impl ;
     public final void rule__XAdditiveExpression__Group_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12105:1: ( rule__XAdditiveExpression__Group_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12106:2: rule__XAdditiveExpression__Group_1_0_0__1__Impl
+            // InternalCheck.g:12105:1: ( rule__XAdditiveExpression__Group_1_0_0__1__Impl )
+            // InternalCheck.g:12106:2: rule__XAdditiveExpression__Group_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1_0_0__1__Impl_in_rule__XAdditiveExpression__Group_1_0_0__124862);
+            pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group_1_0_0__1__Impl();
 
             state._fsp--;
@@ -35787,25 +35787,25 @@ public final void rule__XAdditiveExpression__Group_1_0_0__1() throws Recognition
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12112:1: rule__XAdditiveExpression__Group_1_0_0__1__Impl : ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) ) ;
+    // InternalCheck.g:12112:1: rule__XAdditiveExpression__Group_1_0_0__1__Impl : ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) ) ;
     public final void rule__XAdditiveExpression__Group_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12116:1: ( ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12117:1: ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalCheck.g:12116:1: ( ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) ) )
+            // InternalCheck.g:12117:1: ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12117:1: ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12118:1: ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 )
+            // InternalCheck.g:12117:1: ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalCheck.g:12118:1: ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getFeatureAssignment_1_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12119:1: ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12119:2: rule__XAdditiveExpression__FeatureAssignment_1_0_0_1
+            // InternalCheck.g:12119:1: ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 )
+            // InternalCheck.g:12119:2: rule__XAdditiveExpression__FeatureAssignment_1_0_0_1
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__FeatureAssignment_1_0_0_1_in_rule__XAdditiveExpression__Group_1_0_0__1__Impl24889);
+            pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__FeatureAssignment_1_0_0_1();
 
             state._fsp--;
@@ -35838,21 +35838,21 @@ public final void rule__XAdditiveExpression__Group_1_0_0__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12133:1: rule__XMultiplicativeExpression__Group__0 : rule__XMultiplicativeExpression__Group__0__Impl rule__XMultiplicativeExpression__Group__1 ;
+    // InternalCheck.g:12133:1: rule__XMultiplicativeExpression__Group__0 : rule__XMultiplicativeExpression__Group__0__Impl rule__XMultiplicativeExpression__Group__1 ;
     public final void rule__XMultiplicativeExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12137:1: ( rule__XMultiplicativeExpression__Group__0__Impl rule__XMultiplicativeExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12138:2: rule__XMultiplicativeExpression__Group__0__Impl rule__XMultiplicativeExpression__Group__1
+            // InternalCheck.g:12137:1: ( rule__XMultiplicativeExpression__Group__0__Impl rule__XMultiplicativeExpression__Group__1 )
+            // InternalCheck.g:12138:2: rule__XMultiplicativeExpression__Group__0__Impl rule__XMultiplicativeExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group__0__Impl_in_rule__XMultiplicativeExpression__Group__024923);
+            pushFollow(FOLLOW_69);
             rule__XMultiplicativeExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group__1_in_rule__XMultiplicativeExpression__Group__024926);
+            pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group__1();
 
             state._fsp--;
@@ -35876,22 +35876,22 @@ public final void rule__XMultiplicativeExpression__Group__0() throws Recognition
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12145:1: rule__XMultiplicativeExpression__Group__0__Impl : ( ruleXUnaryOperation ) ;
+    // InternalCheck.g:12145:1: rule__XMultiplicativeExpression__Group__0__Impl : ( ruleXUnaryOperation ) ;
     public final void rule__XMultiplicativeExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12149:1: ( ( ruleXUnaryOperation ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12150:1: ( ruleXUnaryOperation )
+            // InternalCheck.g:12149:1: ( ( ruleXUnaryOperation ) )
+            // InternalCheck.g:12150:1: ( ruleXUnaryOperation )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12150:1: ( ruleXUnaryOperation )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12151:1: ruleXUnaryOperation
+            // InternalCheck.g:12150:1: ( ruleXUnaryOperation )
+            // InternalCheck.g:12151:1: ruleXUnaryOperation
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getXUnaryOperationParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleXUnaryOperation_in_rule__XMultiplicativeExpression__Group__0__Impl24953);
+            pushFollow(FOLLOW_2);
             ruleXUnaryOperation();
 
             state._fsp--;
@@ -35921,16 +35921,16 @@ public final void rule__XMultiplicativeExpression__Group__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12162:1: rule__XMultiplicativeExpression__Group__1 : rule__XMultiplicativeExpression__Group__1__Impl ;
+    // InternalCheck.g:12162:1: rule__XMultiplicativeExpression__Group__1 : rule__XMultiplicativeExpression__Group__1__Impl ;
     public final void rule__XMultiplicativeExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12166:1: ( rule__XMultiplicativeExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12167:2: rule__XMultiplicativeExpression__Group__1__Impl
+            // InternalCheck.g:12166:1: ( rule__XMultiplicativeExpression__Group__1__Impl )
+            // InternalCheck.g:12167:2: rule__XMultiplicativeExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group__1__Impl_in_rule__XMultiplicativeExpression__Group__124982);
+            pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group__1__Impl();
 
             state._fsp--;
@@ -35954,22 +35954,22 @@ public final void rule__XMultiplicativeExpression__Group__1() throws Recognition
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12173:1: rule__XMultiplicativeExpression__Group__1__Impl : ( ( rule__XMultiplicativeExpression__Group_1__0 )* ) ;
+    // InternalCheck.g:12173:1: rule__XMultiplicativeExpression__Group__1__Impl : ( ( rule__XMultiplicativeExpression__Group_1__0 )* ) ;
     public final void rule__XMultiplicativeExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12177:1: ( ( ( rule__XMultiplicativeExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12178:1: ( ( rule__XMultiplicativeExpression__Group_1__0 )* )
+            // InternalCheck.g:12177:1: ( ( ( rule__XMultiplicativeExpression__Group_1__0 )* ) )
+            // InternalCheck.g:12178:1: ( ( rule__XMultiplicativeExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12178:1: ( ( rule__XMultiplicativeExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12179:1: ( rule__XMultiplicativeExpression__Group_1__0 )*
+            // InternalCheck.g:12178:1: ( ( rule__XMultiplicativeExpression__Group_1__0 )* )
+            // InternalCheck.g:12179:1: ( rule__XMultiplicativeExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12180:1: ( rule__XMultiplicativeExpression__Group_1__0 )*
+            // InternalCheck.g:12180:1: ( rule__XMultiplicativeExpression__Group_1__0 )*
             loop101:
             do {
                 int alt101=2;
@@ -36023,9 +36023,9 @@ public final void rule__XMultiplicativeExpression__Group__1__Impl() throws Recog
 
                 switch (alt101) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12180:2: rule__XMultiplicativeExpression__Group_1__0
+            	    // InternalCheck.g:12180:2: rule__XMultiplicativeExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1__0_in_rule__XMultiplicativeExpression__Group__1__Impl25009);
+            	    pushFollow(FOLLOW_70);
             	    rule__XMultiplicativeExpression__Group_1__0();
 
             	    state._fsp--;
@@ -36064,21 +36064,21 @@ public final void rule__XMultiplicativeExpression__Group__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12194:1: rule__XMultiplicativeExpression__Group_1__0 : rule__XMultiplicativeExpression__Group_1__0__Impl rule__XMultiplicativeExpression__Group_1__1 ;
+    // InternalCheck.g:12194:1: rule__XMultiplicativeExpression__Group_1__0 : rule__XMultiplicativeExpression__Group_1__0__Impl rule__XMultiplicativeExpression__Group_1__1 ;
     public final void rule__XMultiplicativeExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12198:1: ( rule__XMultiplicativeExpression__Group_1__0__Impl rule__XMultiplicativeExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12199:2: rule__XMultiplicativeExpression__Group_1__0__Impl rule__XMultiplicativeExpression__Group_1__1
+            // InternalCheck.g:12198:1: ( rule__XMultiplicativeExpression__Group_1__0__Impl rule__XMultiplicativeExpression__Group_1__1 )
+            // InternalCheck.g:12199:2: rule__XMultiplicativeExpression__Group_1__0__Impl rule__XMultiplicativeExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1__0__Impl_in_rule__XMultiplicativeExpression__Group_1__025044);
+            pushFollow(FOLLOW_32);
             rule__XMultiplicativeExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1__1_in_rule__XMultiplicativeExpression__Group_1__025047);
+            pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group_1__1();
 
             state._fsp--;
@@ -36102,25 +36102,25 @@ public final void rule__XMultiplicativeExpression__Group_1__0() throws Recogniti
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12206:1: rule__XMultiplicativeExpression__Group_1__0__Impl : ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) ) ;
+    // InternalCheck.g:12206:1: rule__XMultiplicativeExpression__Group_1__0__Impl : ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) ) ;
     public final void rule__XMultiplicativeExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12210:1: ( ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12211:1: ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) )
+            // InternalCheck.g:12210:1: ( ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) ) )
+            // InternalCheck.g:12211:1: ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12211:1: ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12212:1: ( rule__XMultiplicativeExpression__Group_1_0__0 )
+            // InternalCheck.g:12211:1: ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) )
+            // InternalCheck.g:12212:1: ( rule__XMultiplicativeExpression__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getGroup_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12213:1: ( rule__XMultiplicativeExpression__Group_1_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12213:2: rule__XMultiplicativeExpression__Group_1_0__0
+            // InternalCheck.g:12213:1: ( rule__XMultiplicativeExpression__Group_1_0__0 )
+            // InternalCheck.g:12213:2: rule__XMultiplicativeExpression__Group_1_0__0
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1_0__0_in_rule__XMultiplicativeExpression__Group_1__0__Impl25074);
+            pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group_1_0__0();
 
             state._fsp--;
@@ -36153,16 +36153,16 @@ public final void rule__XMultiplicativeExpression__Group_1__0__Impl() throws Rec
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12223:1: rule__XMultiplicativeExpression__Group_1__1 : rule__XMultiplicativeExpression__Group_1__1__Impl ;
+    // InternalCheck.g:12223:1: rule__XMultiplicativeExpression__Group_1__1 : rule__XMultiplicativeExpression__Group_1__1__Impl ;
     public final void rule__XMultiplicativeExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12227:1: ( rule__XMultiplicativeExpression__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12228:2: rule__XMultiplicativeExpression__Group_1__1__Impl
+            // InternalCheck.g:12227:1: ( rule__XMultiplicativeExpression__Group_1__1__Impl )
+            // InternalCheck.g:12228:2: rule__XMultiplicativeExpression__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1__1__Impl_in_rule__XMultiplicativeExpression__Group_1__125104);
+            pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group_1__1__Impl();
 
             state._fsp--;
@@ -36186,25 +36186,25 @@ public final void rule__XMultiplicativeExpression__Group_1__1() throws Recogniti
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12234:1: rule__XMultiplicativeExpression__Group_1__1__Impl : ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) ) ;
+    // InternalCheck.g:12234:1: rule__XMultiplicativeExpression__Group_1__1__Impl : ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) ) ;
     public final void rule__XMultiplicativeExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12238:1: ( ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12239:1: ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) )
+            // InternalCheck.g:12238:1: ( ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) ) )
+            // InternalCheck.g:12239:1: ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12239:1: ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12240:1: ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 )
+            // InternalCheck.g:12239:1: ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) )
+            // InternalCheck.g:12240:1: ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getRightOperandAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12241:1: ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12241:2: rule__XMultiplicativeExpression__RightOperandAssignment_1_1
+            // InternalCheck.g:12241:1: ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 )
+            // InternalCheck.g:12241:2: rule__XMultiplicativeExpression__RightOperandAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__RightOperandAssignment_1_1_in_rule__XMultiplicativeExpression__Group_1__1__Impl25131);
+            pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__RightOperandAssignment_1_1();
 
             state._fsp--;
@@ -36237,16 +36237,16 @@ public final void rule__XMultiplicativeExpression__Group_1__1__Impl() throws Rec
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12255:1: rule__XMultiplicativeExpression__Group_1_0__0 : rule__XMultiplicativeExpression__Group_1_0__0__Impl ;
+    // InternalCheck.g:12255:1: rule__XMultiplicativeExpression__Group_1_0__0 : rule__XMultiplicativeExpression__Group_1_0__0__Impl ;
     public final void rule__XMultiplicativeExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12259:1: ( rule__XMultiplicativeExpression__Group_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12260:2: rule__XMultiplicativeExpression__Group_1_0__0__Impl
+            // InternalCheck.g:12259:1: ( rule__XMultiplicativeExpression__Group_1_0__0__Impl )
+            // InternalCheck.g:12260:2: rule__XMultiplicativeExpression__Group_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1_0__0__Impl_in_rule__XMultiplicativeExpression__Group_1_0__025165);
+            pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group_1_0__0__Impl();
 
             state._fsp--;
@@ -36270,25 +36270,25 @@ public final void rule__XMultiplicativeExpression__Group_1_0__0() throws Recogni
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12266:1: rule__XMultiplicativeExpression__Group_1_0__0__Impl : ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) ) ;
+    // InternalCheck.g:12266:1: rule__XMultiplicativeExpression__Group_1_0__0__Impl : ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) ) ;
     public final void rule__XMultiplicativeExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12270:1: ( ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12271:1: ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) )
+            // InternalCheck.g:12270:1: ( ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) ) )
+            // InternalCheck.g:12271:1: ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12271:1: ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12272:1: ( rule__XMultiplicativeExpression__Group_1_0_0__0 )
+            // InternalCheck.g:12271:1: ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) )
+            // InternalCheck.g:12272:1: ( rule__XMultiplicativeExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getGroup_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12273:1: ( rule__XMultiplicativeExpression__Group_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12273:2: rule__XMultiplicativeExpression__Group_1_0_0__0
+            // InternalCheck.g:12273:1: ( rule__XMultiplicativeExpression__Group_1_0_0__0 )
+            // InternalCheck.g:12273:2: rule__XMultiplicativeExpression__Group_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1_0_0__0_in_rule__XMultiplicativeExpression__Group_1_0__0__Impl25192);
+            pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group_1_0_0__0();
 
             state._fsp--;
@@ -36321,21 +36321,21 @@ public final void rule__XMultiplicativeExpression__Group_1_0__0__Impl() throws R
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12285:1: rule__XMultiplicativeExpression__Group_1_0_0__0 : rule__XMultiplicativeExpression__Group_1_0_0__0__Impl rule__XMultiplicativeExpression__Group_1_0_0__1 ;
+    // InternalCheck.g:12285:1: rule__XMultiplicativeExpression__Group_1_0_0__0 : rule__XMultiplicativeExpression__Group_1_0_0__0__Impl rule__XMultiplicativeExpression__Group_1_0_0__1 ;
     public final void rule__XMultiplicativeExpression__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12289:1: ( rule__XMultiplicativeExpression__Group_1_0_0__0__Impl rule__XMultiplicativeExpression__Group_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12290:2: rule__XMultiplicativeExpression__Group_1_0_0__0__Impl rule__XMultiplicativeExpression__Group_1_0_0__1
+            // InternalCheck.g:12289:1: ( rule__XMultiplicativeExpression__Group_1_0_0__0__Impl rule__XMultiplicativeExpression__Group_1_0_0__1 )
+            // InternalCheck.g:12290:2: rule__XMultiplicativeExpression__Group_1_0_0__0__Impl rule__XMultiplicativeExpression__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1_0_0__0__Impl_in_rule__XMultiplicativeExpression__Group_1_0_0__025224);
+            pushFollow(FOLLOW_69);
             rule__XMultiplicativeExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1_0_0__1_in_rule__XMultiplicativeExpression__Group_1_0_0__025227);
+            pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group_1_0_0__1();
 
             state._fsp--;
@@ -36359,23 +36359,23 @@ public final void rule__XMultiplicativeExpression__Group_1_0_0__0() throws Recog
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12297:1: rule__XMultiplicativeExpression__Group_1_0_0__0__Impl : ( () ) ;
+    // InternalCheck.g:12297:1: rule__XMultiplicativeExpression__Group_1_0_0__0__Impl : ( () ) ;
     public final void rule__XMultiplicativeExpression__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12301:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12302:1: ( () )
+            // InternalCheck.g:12301:1: ( ( () ) )
+            // InternalCheck.g:12302:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12302:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12303:1: ()
+            // InternalCheck.g:12302:1: ( () )
+            // InternalCheck.g:12303:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12304:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12306:1: 
+            // InternalCheck.g:12304:1: ()
+            // InternalCheck.g:12306:1: 
             {
             }
 
@@ -36400,16 +36400,16 @@ public final void rule__XMultiplicativeExpression__Group_1_0_0__0__Impl() throws
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12316:1: rule__XMultiplicativeExpression__Group_1_0_0__1 : rule__XMultiplicativeExpression__Group_1_0_0__1__Impl ;
+    // InternalCheck.g:12316:1: rule__XMultiplicativeExpression__Group_1_0_0__1 : rule__XMultiplicativeExpression__Group_1_0_0__1__Impl ;
     public final void rule__XMultiplicativeExpression__Group_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12320:1: ( rule__XMultiplicativeExpression__Group_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12321:2: rule__XMultiplicativeExpression__Group_1_0_0__1__Impl
+            // InternalCheck.g:12320:1: ( rule__XMultiplicativeExpression__Group_1_0_0__1__Impl )
+            // InternalCheck.g:12321:2: rule__XMultiplicativeExpression__Group_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1_0_0__1__Impl_in_rule__XMultiplicativeExpression__Group_1_0_0__125285);
+            pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group_1_0_0__1__Impl();
 
             state._fsp--;
@@ -36433,25 +36433,25 @@ public final void rule__XMultiplicativeExpression__Group_1_0_0__1() throws Recog
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12327:1: rule__XMultiplicativeExpression__Group_1_0_0__1__Impl : ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) ) ;
+    // InternalCheck.g:12327:1: rule__XMultiplicativeExpression__Group_1_0_0__1__Impl : ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) ) ;
     public final void rule__XMultiplicativeExpression__Group_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12331:1: ( ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12332:1: ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalCheck.g:12331:1: ( ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) ) )
+            // InternalCheck.g:12332:1: ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12332:1: ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12333:1: ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 )
+            // InternalCheck.g:12332:1: ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalCheck.g:12333:1: ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getFeatureAssignment_1_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12334:1: ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12334:2: rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1
+            // InternalCheck.g:12334:1: ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 )
+            // InternalCheck.g:12334:2: rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1_in_rule__XMultiplicativeExpression__Group_1_0_0__1__Impl25312);
+            pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1();
 
             state._fsp--;
@@ -36484,21 +36484,21 @@ public final void rule__XMultiplicativeExpression__Group_1_0_0__1__Impl() throws
 
 
     // $ANTLR start "rule__XUnaryOperation__Group_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12348:1: rule__XUnaryOperation__Group_0__0 : rule__XUnaryOperation__Group_0__0__Impl rule__XUnaryOperation__Group_0__1 ;
+    // InternalCheck.g:12348:1: rule__XUnaryOperation__Group_0__0 : rule__XUnaryOperation__Group_0__0__Impl rule__XUnaryOperation__Group_0__1 ;
     public final void rule__XUnaryOperation__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12352:1: ( rule__XUnaryOperation__Group_0__0__Impl rule__XUnaryOperation__Group_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12353:2: rule__XUnaryOperation__Group_0__0__Impl rule__XUnaryOperation__Group_0__1
+            // InternalCheck.g:12352:1: ( rule__XUnaryOperation__Group_0__0__Impl rule__XUnaryOperation__Group_0__1 )
+            // InternalCheck.g:12353:2: rule__XUnaryOperation__Group_0__0__Impl rule__XUnaryOperation__Group_0__1
             {
-            pushFollow(FOLLOW_rule__XUnaryOperation__Group_0__0__Impl_in_rule__XUnaryOperation__Group_0__025346);
+            pushFollow(FOLLOW_36);
             rule__XUnaryOperation__Group_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XUnaryOperation__Group_0__1_in_rule__XUnaryOperation__Group_0__025349);
+            pushFollow(FOLLOW_2);
             rule__XUnaryOperation__Group_0__1();
 
             state._fsp--;
@@ -36522,23 +36522,23 @@ public final void rule__XUnaryOperation__Group_0__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XUnaryOperation__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12360:1: rule__XUnaryOperation__Group_0__0__Impl : ( () ) ;
+    // InternalCheck.g:12360:1: rule__XUnaryOperation__Group_0__0__Impl : ( () ) ;
     public final void rule__XUnaryOperation__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12364:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12365:1: ( () )
+            // InternalCheck.g:12364:1: ( ( () ) )
+            // InternalCheck.g:12365:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12365:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12366:1: ()
+            // InternalCheck.g:12365:1: ( () )
+            // InternalCheck.g:12366:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationAccess().getXUnaryOperationAction_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12367:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12369:1: 
+            // InternalCheck.g:12367:1: ()
+            // InternalCheck.g:12369:1: 
             {
             }
 
@@ -36563,21 +36563,21 @@ public final void rule__XUnaryOperation__Group_0__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XUnaryOperation__Group_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12379:1: rule__XUnaryOperation__Group_0__1 : rule__XUnaryOperation__Group_0__1__Impl rule__XUnaryOperation__Group_0__2 ;
+    // InternalCheck.g:12379:1: rule__XUnaryOperation__Group_0__1 : rule__XUnaryOperation__Group_0__1__Impl rule__XUnaryOperation__Group_0__2 ;
     public final void rule__XUnaryOperation__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12383:1: ( rule__XUnaryOperation__Group_0__1__Impl rule__XUnaryOperation__Group_0__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12384:2: rule__XUnaryOperation__Group_0__1__Impl rule__XUnaryOperation__Group_0__2
+            // InternalCheck.g:12383:1: ( rule__XUnaryOperation__Group_0__1__Impl rule__XUnaryOperation__Group_0__2 )
+            // InternalCheck.g:12384:2: rule__XUnaryOperation__Group_0__1__Impl rule__XUnaryOperation__Group_0__2
             {
-            pushFollow(FOLLOW_rule__XUnaryOperation__Group_0__1__Impl_in_rule__XUnaryOperation__Group_0__125407);
+            pushFollow(FOLLOW_32);
             rule__XUnaryOperation__Group_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XUnaryOperation__Group_0__2_in_rule__XUnaryOperation__Group_0__125410);
+            pushFollow(FOLLOW_2);
             rule__XUnaryOperation__Group_0__2();
 
             state._fsp--;
@@ -36601,25 +36601,25 @@ public final void rule__XUnaryOperation__Group_0__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XUnaryOperation__Group_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12391:1: rule__XUnaryOperation__Group_0__1__Impl : ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) ) ;
+    // InternalCheck.g:12391:1: rule__XUnaryOperation__Group_0__1__Impl : ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) ) ;
     public final void rule__XUnaryOperation__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12395:1: ( ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12396:1: ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) )
+            // InternalCheck.g:12395:1: ( ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) ) )
+            // InternalCheck.g:12396:1: ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12396:1: ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12397:1: ( rule__XUnaryOperation__FeatureAssignment_0_1 )
+            // InternalCheck.g:12396:1: ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) )
+            // InternalCheck.g:12397:1: ( rule__XUnaryOperation__FeatureAssignment_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationAccess().getFeatureAssignment_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12398:1: ( rule__XUnaryOperation__FeatureAssignment_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12398:2: rule__XUnaryOperation__FeatureAssignment_0_1
+            // InternalCheck.g:12398:1: ( rule__XUnaryOperation__FeatureAssignment_0_1 )
+            // InternalCheck.g:12398:2: rule__XUnaryOperation__FeatureAssignment_0_1
             {
-            pushFollow(FOLLOW_rule__XUnaryOperation__FeatureAssignment_0_1_in_rule__XUnaryOperation__Group_0__1__Impl25437);
+            pushFollow(FOLLOW_2);
             rule__XUnaryOperation__FeatureAssignment_0_1();
 
             state._fsp--;
@@ -36652,16 +36652,16 @@ public final void rule__XUnaryOperation__Group_0__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XUnaryOperation__Group_0__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12408:1: rule__XUnaryOperation__Group_0__2 : rule__XUnaryOperation__Group_0__2__Impl ;
+    // InternalCheck.g:12408:1: rule__XUnaryOperation__Group_0__2 : rule__XUnaryOperation__Group_0__2__Impl ;
     public final void rule__XUnaryOperation__Group_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12412:1: ( rule__XUnaryOperation__Group_0__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12413:2: rule__XUnaryOperation__Group_0__2__Impl
+            // InternalCheck.g:12412:1: ( rule__XUnaryOperation__Group_0__2__Impl )
+            // InternalCheck.g:12413:2: rule__XUnaryOperation__Group_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__XUnaryOperation__Group_0__2__Impl_in_rule__XUnaryOperation__Group_0__225467);
+            pushFollow(FOLLOW_2);
             rule__XUnaryOperation__Group_0__2__Impl();
 
             state._fsp--;
@@ -36685,25 +36685,25 @@ public final void rule__XUnaryOperation__Group_0__2() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XUnaryOperation__Group_0__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12419:1: rule__XUnaryOperation__Group_0__2__Impl : ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) ) ;
+    // InternalCheck.g:12419:1: rule__XUnaryOperation__Group_0__2__Impl : ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) ) ;
     public final void rule__XUnaryOperation__Group_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12423:1: ( ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12424:1: ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) )
+            // InternalCheck.g:12423:1: ( ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) ) )
+            // InternalCheck.g:12424:1: ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12424:1: ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12425:1: ( rule__XUnaryOperation__OperandAssignment_0_2 )
+            // InternalCheck.g:12424:1: ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) )
+            // InternalCheck.g:12425:1: ( rule__XUnaryOperation__OperandAssignment_0_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationAccess().getOperandAssignment_0_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12426:1: ( rule__XUnaryOperation__OperandAssignment_0_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12426:2: rule__XUnaryOperation__OperandAssignment_0_2
+            // InternalCheck.g:12426:1: ( rule__XUnaryOperation__OperandAssignment_0_2 )
+            // InternalCheck.g:12426:2: rule__XUnaryOperation__OperandAssignment_0_2
             {
-            pushFollow(FOLLOW_rule__XUnaryOperation__OperandAssignment_0_2_in_rule__XUnaryOperation__Group_0__2__Impl25494);
+            pushFollow(FOLLOW_2);
             rule__XUnaryOperation__OperandAssignment_0_2();
 
             state._fsp--;
@@ -36736,21 +36736,21 @@ public final void rule__XUnaryOperation__Group_0__2__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XCastedExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12442:1: rule__XCastedExpression__Group__0 : rule__XCastedExpression__Group__0__Impl rule__XCastedExpression__Group__1 ;
+    // InternalCheck.g:12442:1: rule__XCastedExpression__Group__0 : rule__XCastedExpression__Group__0__Impl rule__XCastedExpression__Group__1 ;
     public final void rule__XCastedExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12446:1: ( rule__XCastedExpression__Group__0__Impl rule__XCastedExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12447:2: rule__XCastedExpression__Group__0__Impl rule__XCastedExpression__Group__1
+            // InternalCheck.g:12446:1: ( rule__XCastedExpression__Group__0__Impl rule__XCastedExpression__Group__1 )
+            // InternalCheck.g:12447:2: rule__XCastedExpression__Group__0__Impl rule__XCastedExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__Group__0__Impl_in_rule__XCastedExpression__Group__025530);
+            pushFollow(FOLLOW_71);
             rule__XCastedExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCastedExpression__Group__1_in_rule__XCastedExpression__Group__025533);
+            pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group__1();
 
             state._fsp--;
@@ -36774,22 +36774,22 @@ public final void rule__XCastedExpression__Group__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XCastedExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12454:1: rule__XCastedExpression__Group__0__Impl : ( ruleXPostfixOperation ) ;
+    // InternalCheck.g:12454:1: rule__XCastedExpression__Group__0__Impl : ( ruleXPostfixOperation ) ;
     public final void rule__XCastedExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12458:1: ( ( ruleXPostfixOperation ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12459:1: ( ruleXPostfixOperation )
+            // InternalCheck.g:12458:1: ( ( ruleXPostfixOperation ) )
+            // InternalCheck.g:12459:1: ( ruleXPostfixOperation )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12459:1: ( ruleXPostfixOperation )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12460:1: ruleXPostfixOperation
+            // InternalCheck.g:12459:1: ( ruleXPostfixOperation )
+            // InternalCheck.g:12460:1: ruleXPostfixOperation
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getXPostfixOperationParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleXPostfixOperation_in_rule__XCastedExpression__Group__0__Impl25560);
+            pushFollow(FOLLOW_2);
             ruleXPostfixOperation();
 
             state._fsp--;
@@ -36819,16 +36819,16 @@ public final void rule__XCastedExpression__Group__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XCastedExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12471:1: rule__XCastedExpression__Group__1 : rule__XCastedExpression__Group__1__Impl ;
+    // InternalCheck.g:12471:1: rule__XCastedExpression__Group__1 : rule__XCastedExpression__Group__1__Impl ;
     public final void rule__XCastedExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12475:1: ( rule__XCastedExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12476:2: rule__XCastedExpression__Group__1__Impl
+            // InternalCheck.g:12475:1: ( rule__XCastedExpression__Group__1__Impl )
+            // InternalCheck.g:12476:2: rule__XCastedExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__Group__1__Impl_in_rule__XCastedExpression__Group__125589);
+            pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group__1__Impl();
 
             state._fsp--;
@@ -36852,22 +36852,22 @@ public final void rule__XCastedExpression__Group__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XCastedExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12482:1: rule__XCastedExpression__Group__1__Impl : ( ( rule__XCastedExpression__Group_1__0 )* ) ;
+    // InternalCheck.g:12482:1: rule__XCastedExpression__Group__1__Impl : ( ( rule__XCastedExpression__Group_1__0 )* ) ;
     public final void rule__XCastedExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12486:1: ( ( ( rule__XCastedExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12487:1: ( ( rule__XCastedExpression__Group_1__0 )* )
+            // InternalCheck.g:12486:1: ( ( ( rule__XCastedExpression__Group_1__0 )* ) )
+            // InternalCheck.g:12487:1: ( ( rule__XCastedExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12487:1: ( ( rule__XCastedExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12488:1: ( rule__XCastedExpression__Group_1__0 )*
+            // InternalCheck.g:12487:1: ( ( rule__XCastedExpression__Group_1__0 )* )
+            // InternalCheck.g:12488:1: ( rule__XCastedExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12489:1: ( rule__XCastedExpression__Group_1__0 )*
+            // InternalCheck.g:12489:1: ( rule__XCastedExpression__Group_1__0 )*
             loop102:
             do {
                 int alt102=2;
@@ -36886,9 +36886,9 @@ public final void rule__XCastedExpression__Group__1__Impl() throws RecognitionEx
 
                 switch (alt102) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12489:2: rule__XCastedExpression__Group_1__0
+            	    // InternalCheck.g:12489:2: rule__XCastedExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XCastedExpression__Group_1__0_in_rule__XCastedExpression__Group__1__Impl25616);
+            	    pushFollow(FOLLOW_72);
             	    rule__XCastedExpression__Group_1__0();
 
             	    state._fsp--;
@@ -36927,21 +36927,21 @@ public final void rule__XCastedExpression__Group__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12503:1: rule__XCastedExpression__Group_1__0 : rule__XCastedExpression__Group_1__0__Impl rule__XCastedExpression__Group_1__1 ;
+    // InternalCheck.g:12503:1: rule__XCastedExpression__Group_1__0 : rule__XCastedExpression__Group_1__0__Impl rule__XCastedExpression__Group_1__1 ;
     public final void rule__XCastedExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12507:1: ( rule__XCastedExpression__Group_1__0__Impl rule__XCastedExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12508:2: rule__XCastedExpression__Group_1__0__Impl rule__XCastedExpression__Group_1__1
+            // InternalCheck.g:12507:1: ( rule__XCastedExpression__Group_1__0__Impl rule__XCastedExpression__Group_1__1 )
+            // InternalCheck.g:12508:2: rule__XCastedExpression__Group_1__0__Impl rule__XCastedExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__Group_1__0__Impl_in_rule__XCastedExpression__Group_1__025651);
+            pushFollow(FOLLOW_29);
             rule__XCastedExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCastedExpression__Group_1__1_in_rule__XCastedExpression__Group_1__025654);
+            pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group_1__1();
 
             state._fsp--;
@@ -36965,25 +36965,25 @@ public final void rule__XCastedExpression__Group_1__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12515:1: rule__XCastedExpression__Group_1__0__Impl : ( ( rule__XCastedExpression__Group_1_0__0 ) ) ;
+    // InternalCheck.g:12515:1: rule__XCastedExpression__Group_1__0__Impl : ( ( rule__XCastedExpression__Group_1_0__0 ) ) ;
     public final void rule__XCastedExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12519:1: ( ( ( rule__XCastedExpression__Group_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12520:1: ( ( rule__XCastedExpression__Group_1_0__0 ) )
+            // InternalCheck.g:12519:1: ( ( ( rule__XCastedExpression__Group_1_0__0 ) ) )
+            // InternalCheck.g:12520:1: ( ( rule__XCastedExpression__Group_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12520:1: ( ( rule__XCastedExpression__Group_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12521:1: ( rule__XCastedExpression__Group_1_0__0 )
+            // InternalCheck.g:12520:1: ( ( rule__XCastedExpression__Group_1_0__0 ) )
+            // InternalCheck.g:12521:1: ( rule__XCastedExpression__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getGroup_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12522:1: ( rule__XCastedExpression__Group_1_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12522:2: rule__XCastedExpression__Group_1_0__0
+            // InternalCheck.g:12522:1: ( rule__XCastedExpression__Group_1_0__0 )
+            // InternalCheck.g:12522:2: rule__XCastedExpression__Group_1_0__0
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__Group_1_0__0_in_rule__XCastedExpression__Group_1__0__Impl25681);
+            pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group_1_0__0();
 
             state._fsp--;
@@ -37016,16 +37016,16 @@ public final void rule__XCastedExpression__Group_1__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12532:1: rule__XCastedExpression__Group_1__1 : rule__XCastedExpression__Group_1__1__Impl ;
+    // InternalCheck.g:12532:1: rule__XCastedExpression__Group_1__1 : rule__XCastedExpression__Group_1__1__Impl ;
     public final void rule__XCastedExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12536:1: ( rule__XCastedExpression__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12537:2: rule__XCastedExpression__Group_1__1__Impl
+            // InternalCheck.g:12536:1: ( rule__XCastedExpression__Group_1__1__Impl )
+            // InternalCheck.g:12537:2: rule__XCastedExpression__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__Group_1__1__Impl_in_rule__XCastedExpression__Group_1__125711);
+            pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group_1__1__Impl();
 
             state._fsp--;
@@ -37049,25 +37049,25 @@ public final void rule__XCastedExpression__Group_1__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12543:1: rule__XCastedExpression__Group_1__1__Impl : ( ( rule__XCastedExpression__TypeAssignment_1_1 ) ) ;
+    // InternalCheck.g:12543:1: rule__XCastedExpression__Group_1__1__Impl : ( ( rule__XCastedExpression__TypeAssignment_1_1 ) ) ;
     public final void rule__XCastedExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12547:1: ( ( ( rule__XCastedExpression__TypeAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12548:1: ( ( rule__XCastedExpression__TypeAssignment_1_1 ) )
+            // InternalCheck.g:12547:1: ( ( ( rule__XCastedExpression__TypeAssignment_1_1 ) ) )
+            // InternalCheck.g:12548:1: ( ( rule__XCastedExpression__TypeAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12548:1: ( ( rule__XCastedExpression__TypeAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12549:1: ( rule__XCastedExpression__TypeAssignment_1_1 )
+            // InternalCheck.g:12548:1: ( ( rule__XCastedExpression__TypeAssignment_1_1 ) )
+            // InternalCheck.g:12549:1: ( rule__XCastedExpression__TypeAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getTypeAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12550:1: ( rule__XCastedExpression__TypeAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12550:2: rule__XCastedExpression__TypeAssignment_1_1
+            // InternalCheck.g:12550:1: ( rule__XCastedExpression__TypeAssignment_1_1 )
+            // InternalCheck.g:12550:2: rule__XCastedExpression__TypeAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__TypeAssignment_1_1_in_rule__XCastedExpression__Group_1__1__Impl25738);
+            pushFollow(FOLLOW_2);
             rule__XCastedExpression__TypeAssignment_1_1();
 
             state._fsp--;
@@ -37100,16 +37100,16 @@ public final void rule__XCastedExpression__Group_1__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12564:1: rule__XCastedExpression__Group_1_0__0 : rule__XCastedExpression__Group_1_0__0__Impl ;
+    // InternalCheck.g:12564:1: rule__XCastedExpression__Group_1_0__0 : rule__XCastedExpression__Group_1_0__0__Impl ;
     public final void rule__XCastedExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12568:1: ( rule__XCastedExpression__Group_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12569:2: rule__XCastedExpression__Group_1_0__0__Impl
+            // InternalCheck.g:12568:1: ( rule__XCastedExpression__Group_1_0__0__Impl )
+            // InternalCheck.g:12569:2: rule__XCastedExpression__Group_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__Group_1_0__0__Impl_in_rule__XCastedExpression__Group_1_0__025772);
+            pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group_1_0__0__Impl();
 
             state._fsp--;
@@ -37133,25 +37133,25 @@ public final void rule__XCastedExpression__Group_1_0__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12575:1: rule__XCastedExpression__Group_1_0__0__Impl : ( ( rule__XCastedExpression__Group_1_0_0__0 ) ) ;
+    // InternalCheck.g:12575:1: rule__XCastedExpression__Group_1_0__0__Impl : ( ( rule__XCastedExpression__Group_1_0_0__0 ) ) ;
     public final void rule__XCastedExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12579:1: ( ( ( rule__XCastedExpression__Group_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12580:1: ( ( rule__XCastedExpression__Group_1_0_0__0 ) )
+            // InternalCheck.g:12579:1: ( ( ( rule__XCastedExpression__Group_1_0_0__0 ) ) )
+            // InternalCheck.g:12580:1: ( ( rule__XCastedExpression__Group_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12580:1: ( ( rule__XCastedExpression__Group_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12581:1: ( rule__XCastedExpression__Group_1_0_0__0 )
+            // InternalCheck.g:12580:1: ( ( rule__XCastedExpression__Group_1_0_0__0 ) )
+            // InternalCheck.g:12581:1: ( rule__XCastedExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getGroup_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12582:1: ( rule__XCastedExpression__Group_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12582:2: rule__XCastedExpression__Group_1_0_0__0
+            // InternalCheck.g:12582:1: ( rule__XCastedExpression__Group_1_0_0__0 )
+            // InternalCheck.g:12582:2: rule__XCastedExpression__Group_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__Group_1_0_0__0_in_rule__XCastedExpression__Group_1_0__0__Impl25799);
+            pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group_1_0_0__0();
 
             state._fsp--;
@@ -37184,21 +37184,21 @@ public final void rule__XCastedExpression__Group_1_0__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12594:1: rule__XCastedExpression__Group_1_0_0__0 : rule__XCastedExpression__Group_1_0_0__0__Impl rule__XCastedExpression__Group_1_0_0__1 ;
+    // InternalCheck.g:12594:1: rule__XCastedExpression__Group_1_0_0__0 : rule__XCastedExpression__Group_1_0_0__0__Impl rule__XCastedExpression__Group_1_0_0__1 ;
     public final void rule__XCastedExpression__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12598:1: ( rule__XCastedExpression__Group_1_0_0__0__Impl rule__XCastedExpression__Group_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12599:2: rule__XCastedExpression__Group_1_0_0__0__Impl rule__XCastedExpression__Group_1_0_0__1
+            // InternalCheck.g:12598:1: ( rule__XCastedExpression__Group_1_0_0__0__Impl rule__XCastedExpression__Group_1_0_0__1 )
+            // InternalCheck.g:12599:2: rule__XCastedExpression__Group_1_0_0__0__Impl rule__XCastedExpression__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__Group_1_0_0__0__Impl_in_rule__XCastedExpression__Group_1_0_0__025831);
+            pushFollow(FOLLOW_71);
             rule__XCastedExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCastedExpression__Group_1_0_0__1_in_rule__XCastedExpression__Group_1_0_0__025834);
+            pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group_1_0_0__1();
 
             state._fsp--;
@@ -37222,23 +37222,23 @@ public final void rule__XCastedExpression__Group_1_0_0__0() throws RecognitionEx
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12606:1: rule__XCastedExpression__Group_1_0_0__0__Impl : ( () ) ;
+    // InternalCheck.g:12606:1: rule__XCastedExpression__Group_1_0_0__0__Impl : ( () ) ;
     public final void rule__XCastedExpression__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12610:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12611:1: ( () )
+            // InternalCheck.g:12610:1: ( ( () ) )
+            // InternalCheck.g:12611:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12611:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12612:1: ()
+            // InternalCheck.g:12611:1: ( () )
+            // InternalCheck.g:12612:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getXCastedExpressionTargetAction_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12613:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12615:1: 
+            // InternalCheck.g:12613:1: ()
+            // InternalCheck.g:12615:1: 
             {
             }
 
@@ -37263,16 +37263,16 @@ public final void rule__XCastedExpression__Group_1_0_0__0__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12625:1: rule__XCastedExpression__Group_1_0_0__1 : rule__XCastedExpression__Group_1_0_0__1__Impl ;
+    // InternalCheck.g:12625:1: rule__XCastedExpression__Group_1_0_0__1 : rule__XCastedExpression__Group_1_0_0__1__Impl ;
     public final void rule__XCastedExpression__Group_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12629:1: ( rule__XCastedExpression__Group_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12630:2: rule__XCastedExpression__Group_1_0_0__1__Impl
+            // InternalCheck.g:12629:1: ( rule__XCastedExpression__Group_1_0_0__1__Impl )
+            // InternalCheck.g:12630:2: rule__XCastedExpression__Group_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__Group_1_0_0__1__Impl_in_rule__XCastedExpression__Group_1_0_0__125892);
+            pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group_1_0_0__1__Impl();
 
             state._fsp--;
@@ -37296,22 +37296,22 @@ public final void rule__XCastedExpression__Group_1_0_0__1() throws RecognitionEx
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12636:1: rule__XCastedExpression__Group_1_0_0__1__Impl : ( 'as' ) ;
+    // InternalCheck.g:12636:1: rule__XCastedExpression__Group_1_0_0__1__Impl : ( 'as' ) ;
     public final void rule__XCastedExpression__Group_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12640:1: ( ( 'as' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12641:1: ( 'as' )
+            // InternalCheck.g:12640:1: ( ( 'as' ) )
+            // InternalCheck.g:12641:1: ( 'as' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12641:1: ( 'as' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12642:1: 'as'
+            // InternalCheck.g:12641:1: ( 'as' )
+            // InternalCheck.g:12642:1: 'as'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getAsKeyword_1_0_0_1()); 
             }
-            match(input,83,FOLLOW_83_in_rule__XCastedExpression__Group_1_0_0__1__Impl25920); if (state.failed) return ;
+            match(input,83,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXCastedExpressionAccess().getAsKeyword_1_0_0_1()); 
             }
@@ -37337,21 +37337,21 @@ public final void rule__XCastedExpression__Group_1_0_0__1__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XPostfixOperation__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12659:1: rule__XPostfixOperation__Group__0 : rule__XPostfixOperation__Group__0__Impl rule__XPostfixOperation__Group__1 ;
+    // InternalCheck.g:12659:1: rule__XPostfixOperation__Group__0 : rule__XPostfixOperation__Group__0__Impl rule__XPostfixOperation__Group__1 ;
     public final void rule__XPostfixOperation__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12663:1: ( rule__XPostfixOperation__Group__0__Impl rule__XPostfixOperation__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12664:2: rule__XPostfixOperation__Group__0__Impl rule__XPostfixOperation__Group__1
+            // InternalCheck.g:12663:1: ( rule__XPostfixOperation__Group__0__Impl rule__XPostfixOperation__Group__1 )
+            // InternalCheck.g:12664:2: rule__XPostfixOperation__Group__0__Impl rule__XPostfixOperation__Group__1
             {
-            pushFollow(FOLLOW_rule__XPostfixOperation__Group__0__Impl_in_rule__XPostfixOperation__Group__025955);
+            pushFollow(FOLLOW_73);
             rule__XPostfixOperation__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XPostfixOperation__Group__1_in_rule__XPostfixOperation__Group__025958);
+            pushFollow(FOLLOW_2);
             rule__XPostfixOperation__Group__1();
 
             state._fsp--;
@@ -37375,22 +37375,22 @@ public final void rule__XPostfixOperation__Group__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XPostfixOperation__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12671:1: rule__XPostfixOperation__Group__0__Impl : ( ruleXMemberFeatureCall ) ;
+    // InternalCheck.g:12671:1: rule__XPostfixOperation__Group__0__Impl : ( ruleXMemberFeatureCall ) ;
     public final void rule__XPostfixOperation__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12675:1: ( ( ruleXMemberFeatureCall ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12676:1: ( ruleXMemberFeatureCall )
+            // InternalCheck.g:12675:1: ( ( ruleXMemberFeatureCall ) )
+            // InternalCheck.g:12676:1: ( ruleXMemberFeatureCall )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12676:1: ( ruleXMemberFeatureCall )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12677:1: ruleXMemberFeatureCall
+            // InternalCheck.g:12676:1: ( ruleXMemberFeatureCall )
+            // InternalCheck.g:12677:1: ruleXMemberFeatureCall
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getXMemberFeatureCallParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleXMemberFeatureCall_in_rule__XPostfixOperation__Group__0__Impl25985);
+            pushFollow(FOLLOW_2);
             ruleXMemberFeatureCall();
 
             state._fsp--;
@@ -37420,16 +37420,16 @@ public final void rule__XPostfixOperation__Group__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XPostfixOperation__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12688:1: rule__XPostfixOperation__Group__1 : rule__XPostfixOperation__Group__1__Impl ;
+    // InternalCheck.g:12688:1: rule__XPostfixOperation__Group__1 : rule__XPostfixOperation__Group__1__Impl ;
     public final void rule__XPostfixOperation__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12692:1: ( rule__XPostfixOperation__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12693:2: rule__XPostfixOperation__Group__1__Impl
+            // InternalCheck.g:12692:1: ( rule__XPostfixOperation__Group__1__Impl )
+            // InternalCheck.g:12693:2: rule__XPostfixOperation__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XPostfixOperation__Group__1__Impl_in_rule__XPostfixOperation__Group__126014);
+            pushFollow(FOLLOW_2);
             rule__XPostfixOperation__Group__1__Impl();
 
             state._fsp--;
@@ -37453,22 +37453,22 @@ public final void rule__XPostfixOperation__Group__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XPostfixOperation__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12699:1: rule__XPostfixOperation__Group__1__Impl : ( ( rule__XPostfixOperation__Group_1__0 )? ) ;
+    // InternalCheck.g:12699:1: rule__XPostfixOperation__Group__1__Impl : ( ( rule__XPostfixOperation__Group_1__0 )? ) ;
     public final void rule__XPostfixOperation__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12703:1: ( ( ( rule__XPostfixOperation__Group_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12704:1: ( ( rule__XPostfixOperation__Group_1__0 )? )
+            // InternalCheck.g:12703:1: ( ( ( rule__XPostfixOperation__Group_1__0 )? ) )
+            // InternalCheck.g:12704:1: ( ( rule__XPostfixOperation__Group_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12704:1: ( ( rule__XPostfixOperation__Group_1__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12705:1: ( rule__XPostfixOperation__Group_1__0 )?
+            // InternalCheck.g:12704:1: ( ( rule__XPostfixOperation__Group_1__0 )? )
+            // InternalCheck.g:12705:1: ( rule__XPostfixOperation__Group_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12706:1: ( rule__XPostfixOperation__Group_1__0 )?
+            // InternalCheck.g:12706:1: ( rule__XPostfixOperation__Group_1__0 )?
             int alt103=2;
             int LA103_0 = input.LA(1);
 
@@ -37488,9 +37488,9 @@ else if ( (LA103_0==62) ) {
             }
             switch (alt103) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12706:2: rule__XPostfixOperation__Group_1__0
+                    // InternalCheck.g:12706:2: rule__XPostfixOperation__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__XPostfixOperation__Group_1__0_in_rule__XPostfixOperation__Group__1__Impl26041);
+                    pushFollow(FOLLOW_2);
                     rule__XPostfixOperation__Group_1__0();
 
                     state._fsp--;
@@ -37526,16 +37526,16 @@ else if ( (LA103_0==62) ) {
 
 
     // $ANTLR start "rule__XPostfixOperation__Group_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12720:1: rule__XPostfixOperation__Group_1__0 : rule__XPostfixOperation__Group_1__0__Impl ;
+    // InternalCheck.g:12720:1: rule__XPostfixOperation__Group_1__0 : rule__XPostfixOperation__Group_1__0__Impl ;
     public final void rule__XPostfixOperation__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12724:1: ( rule__XPostfixOperation__Group_1__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12725:2: rule__XPostfixOperation__Group_1__0__Impl
+            // InternalCheck.g:12724:1: ( rule__XPostfixOperation__Group_1__0__Impl )
+            // InternalCheck.g:12725:2: rule__XPostfixOperation__Group_1__0__Impl
             {
-            pushFollow(FOLLOW_rule__XPostfixOperation__Group_1__0__Impl_in_rule__XPostfixOperation__Group_1__026076);
+            pushFollow(FOLLOW_2);
             rule__XPostfixOperation__Group_1__0__Impl();
 
             state._fsp--;
@@ -37559,25 +37559,25 @@ public final void rule__XPostfixOperation__Group_1__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XPostfixOperation__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12731:1: rule__XPostfixOperation__Group_1__0__Impl : ( ( rule__XPostfixOperation__Group_1_0__0 ) ) ;
+    // InternalCheck.g:12731:1: rule__XPostfixOperation__Group_1__0__Impl : ( ( rule__XPostfixOperation__Group_1_0__0 ) ) ;
     public final void rule__XPostfixOperation__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12735:1: ( ( ( rule__XPostfixOperation__Group_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12736:1: ( ( rule__XPostfixOperation__Group_1_0__0 ) )
+            // InternalCheck.g:12735:1: ( ( ( rule__XPostfixOperation__Group_1_0__0 ) ) )
+            // InternalCheck.g:12736:1: ( ( rule__XPostfixOperation__Group_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12736:1: ( ( rule__XPostfixOperation__Group_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12737:1: ( rule__XPostfixOperation__Group_1_0__0 )
+            // InternalCheck.g:12736:1: ( ( rule__XPostfixOperation__Group_1_0__0 ) )
+            // InternalCheck.g:12737:1: ( rule__XPostfixOperation__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getGroup_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12738:1: ( rule__XPostfixOperation__Group_1_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12738:2: rule__XPostfixOperation__Group_1_0__0
+            // InternalCheck.g:12738:1: ( rule__XPostfixOperation__Group_1_0__0 )
+            // InternalCheck.g:12738:2: rule__XPostfixOperation__Group_1_0__0
             {
-            pushFollow(FOLLOW_rule__XPostfixOperation__Group_1_0__0_in_rule__XPostfixOperation__Group_1__0__Impl26103);
+            pushFollow(FOLLOW_2);
             rule__XPostfixOperation__Group_1_0__0();
 
             state._fsp--;
@@ -37610,21 +37610,21 @@ public final void rule__XPostfixOperation__Group_1__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XPostfixOperation__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12750:1: rule__XPostfixOperation__Group_1_0__0 : rule__XPostfixOperation__Group_1_0__0__Impl rule__XPostfixOperation__Group_1_0__1 ;
+    // InternalCheck.g:12750:1: rule__XPostfixOperation__Group_1_0__0 : rule__XPostfixOperation__Group_1_0__0__Impl rule__XPostfixOperation__Group_1_0__1 ;
     public final void rule__XPostfixOperation__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12754:1: ( rule__XPostfixOperation__Group_1_0__0__Impl rule__XPostfixOperation__Group_1_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12755:2: rule__XPostfixOperation__Group_1_0__0__Impl rule__XPostfixOperation__Group_1_0__1
+            // InternalCheck.g:12754:1: ( rule__XPostfixOperation__Group_1_0__0__Impl rule__XPostfixOperation__Group_1_0__1 )
+            // InternalCheck.g:12755:2: rule__XPostfixOperation__Group_1_0__0__Impl rule__XPostfixOperation__Group_1_0__1
             {
-            pushFollow(FOLLOW_rule__XPostfixOperation__Group_1_0__0__Impl_in_rule__XPostfixOperation__Group_1_0__026135);
+            pushFollow(FOLLOW_73);
             rule__XPostfixOperation__Group_1_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XPostfixOperation__Group_1_0__1_in_rule__XPostfixOperation__Group_1_0__026138);
+            pushFollow(FOLLOW_2);
             rule__XPostfixOperation__Group_1_0__1();
 
             state._fsp--;
@@ -37648,23 +37648,23 @@ public final void rule__XPostfixOperation__Group_1_0__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__XPostfixOperation__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12762:1: rule__XPostfixOperation__Group_1_0__0__Impl : ( () ) ;
+    // InternalCheck.g:12762:1: rule__XPostfixOperation__Group_1_0__0__Impl : ( () ) ;
     public final void rule__XPostfixOperation__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12766:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12767:1: ( () )
+            // InternalCheck.g:12766:1: ( ( () ) )
+            // InternalCheck.g:12767:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12767:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12768:1: ()
+            // InternalCheck.g:12767:1: ( () )
+            // InternalCheck.g:12768:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getXPostfixOperationOperandAction_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12769:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12771:1: 
+            // InternalCheck.g:12769:1: ()
+            // InternalCheck.g:12771:1: 
             {
             }
 
@@ -37689,16 +37689,16 @@ public final void rule__XPostfixOperation__Group_1_0__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XPostfixOperation__Group_1_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12781:1: rule__XPostfixOperation__Group_1_0__1 : rule__XPostfixOperation__Group_1_0__1__Impl ;
+    // InternalCheck.g:12781:1: rule__XPostfixOperation__Group_1_0__1 : rule__XPostfixOperation__Group_1_0__1__Impl ;
     public final void rule__XPostfixOperation__Group_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12785:1: ( rule__XPostfixOperation__Group_1_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12786:2: rule__XPostfixOperation__Group_1_0__1__Impl
+            // InternalCheck.g:12785:1: ( rule__XPostfixOperation__Group_1_0__1__Impl )
+            // InternalCheck.g:12786:2: rule__XPostfixOperation__Group_1_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XPostfixOperation__Group_1_0__1__Impl_in_rule__XPostfixOperation__Group_1_0__126196);
+            pushFollow(FOLLOW_2);
             rule__XPostfixOperation__Group_1_0__1__Impl();
 
             state._fsp--;
@@ -37722,25 +37722,25 @@ public final void rule__XPostfixOperation__Group_1_0__1() throws RecognitionExce
 
 
     // $ANTLR start "rule__XPostfixOperation__Group_1_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12792:1: rule__XPostfixOperation__Group_1_0__1__Impl : ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) ) ;
+    // InternalCheck.g:12792:1: rule__XPostfixOperation__Group_1_0__1__Impl : ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) ) ;
     public final void rule__XPostfixOperation__Group_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12796:1: ( ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12797:1: ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) )
+            // InternalCheck.g:12796:1: ( ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) ) )
+            // InternalCheck.g:12797:1: ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12797:1: ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12798:1: ( rule__XPostfixOperation__FeatureAssignment_1_0_1 )
+            // InternalCheck.g:12797:1: ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) )
+            // InternalCheck.g:12798:1: ( rule__XPostfixOperation__FeatureAssignment_1_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getFeatureAssignment_1_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12799:1: ( rule__XPostfixOperation__FeatureAssignment_1_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12799:2: rule__XPostfixOperation__FeatureAssignment_1_0_1
+            // InternalCheck.g:12799:1: ( rule__XPostfixOperation__FeatureAssignment_1_0_1 )
+            // InternalCheck.g:12799:2: rule__XPostfixOperation__FeatureAssignment_1_0_1
             {
-            pushFollow(FOLLOW_rule__XPostfixOperation__FeatureAssignment_1_0_1_in_rule__XPostfixOperation__Group_1_0__1__Impl26223);
+            pushFollow(FOLLOW_2);
             rule__XPostfixOperation__FeatureAssignment_1_0_1();
 
             state._fsp--;
@@ -37773,21 +37773,21 @@ public final void rule__XPostfixOperation__Group_1_0__1__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12813:1: rule__XMemberFeatureCall__Group__0 : rule__XMemberFeatureCall__Group__0__Impl rule__XMemberFeatureCall__Group__1 ;
+    // InternalCheck.g:12813:1: rule__XMemberFeatureCall__Group__0 : rule__XMemberFeatureCall__Group__0__Impl rule__XMemberFeatureCall__Group__1 ;
     public final void rule__XMemberFeatureCall__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12817:1: ( rule__XMemberFeatureCall__Group__0__Impl rule__XMemberFeatureCall__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12818:2: rule__XMemberFeatureCall__Group__0__Impl rule__XMemberFeatureCall__Group__1
+            // InternalCheck.g:12817:1: ( rule__XMemberFeatureCall__Group__0__Impl rule__XMemberFeatureCall__Group__1 )
+            // InternalCheck.g:12818:2: rule__XMemberFeatureCall__Group__0__Impl rule__XMemberFeatureCall__Group__1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group__0__Impl_in_rule__XMemberFeatureCall__Group__026257);
+            pushFollow(FOLLOW_74);
             rule__XMemberFeatureCall__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group__1_in_rule__XMemberFeatureCall__Group__026260);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group__1();
 
             state._fsp--;
@@ -37811,22 +37811,22 @@ public final void rule__XMemberFeatureCall__Group__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12825:1: rule__XMemberFeatureCall__Group__0__Impl : ( ruleXPrimaryExpression ) ;
+    // InternalCheck.g:12825:1: rule__XMemberFeatureCall__Group__0__Impl : ( ruleXPrimaryExpression ) ;
     public final void rule__XMemberFeatureCall__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12829:1: ( ( ruleXPrimaryExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12830:1: ( ruleXPrimaryExpression )
+            // InternalCheck.g:12829:1: ( ( ruleXPrimaryExpression ) )
+            // InternalCheck.g:12830:1: ( ruleXPrimaryExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12830:1: ( ruleXPrimaryExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12831:1: ruleXPrimaryExpression
+            // InternalCheck.g:12830:1: ( ruleXPrimaryExpression )
+            // InternalCheck.g:12831:1: ruleXPrimaryExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getXPrimaryExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleXPrimaryExpression_in_rule__XMemberFeatureCall__Group__0__Impl26287);
+            pushFollow(FOLLOW_2);
             ruleXPrimaryExpression();
 
             state._fsp--;
@@ -37856,16 +37856,16 @@ public final void rule__XMemberFeatureCall__Group__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12842:1: rule__XMemberFeatureCall__Group__1 : rule__XMemberFeatureCall__Group__1__Impl ;
+    // InternalCheck.g:12842:1: rule__XMemberFeatureCall__Group__1 : rule__XMemberFeatureCall__Group__1__Impl ;
     public final void rule__XMemberFeatureCall__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12846:1: ( rule__XMemberFeatureCall__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12847:2: rule__XMemberFeatureCall__Group__1__Impl
+            // InternalCheck.g:12846:1: ( rule__XMemberFeatureCall__Group__1__Impl )
+            // InternalCheck.g:12847:2: rule__XMemberFeatureCall__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group__1__Impl_in_rule__XMemberFeatureCall__Group__126316);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group__1__Impl();
 
             state._fsp--;
@@ -37889,22 +37889,22 @@ public final void rule__XMemberFeatureCall__Group__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12853:1: rule__XMemberFeatureCall__Group__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1 )* ) ;
+    // InternalCheck.g:12853:1: rule__XMemberFeatureCall__Group__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1 )* ) ;
     public final void rule__XMemberFeatureCall__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12857:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12858:1: ( ( rule__XMemberFeatureCall__Alternatives_1 )* )
+            // InternalCheck.g:12857:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1 )* ) )
+            // InternalCheck.g:12858:1: ( ( rule__XMemberFeatureCall__Alternatives_1 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12858:1: ( ( rule__XMemberFeatureCall__Alternatives_1 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12859:1: ( rule__XMemberFeatureCall__Alternatives_1 )*
+            // InternalCheck.g:12858:1: ( ( rule__XMemberFeatureCall__Alternatives_1 )* )
+            // InternalCheck.g:12859:1: ( rule__XMemberFeatureCall__Alternatives_1 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getAlternatives_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12860:1: ( rule__XMemberFeatureCall__Alternatives_1 )*
+            // InternalCheck.g:12860:1: ( rule__XMemberFeatureCall__Alternatives_1 )*
             loop104:
             do {
                 int alt104=2;
@@ -37947,9 +37947,9 @@ public final void rule__XMemberFeatureCall__Group__1__Impl() throws RecognitionE
 
                 switch (alt104) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12860:2: rule__XMemberFeatureCall__Alternatives_1
+            	    // InternalCheck.g:12860:2: rule__XMemberFeatureCall__Alternatives_1
             	    {
-            	    pushFollow(FOLLOW_rule__XMemberFeatureCall__Alternatives_1_in_rule__XMemberFeatureCall__Group__1__Impl26343);
+            	    pushFollow(FOLLOW_75);
             	    rule__XMemberFeatureCall__Alternatives_1();
 
             	    state._fsp--;
@@ -37988,21 +37988,21 @@ public final void rule__XMemberFeatureCall__Group__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12874:1: rule__XMemberFeatureCall__Group_1_0__0 : rule__XMemberFeatureCall__Group_1_0__0__Impl rule__XMemberFeatureCall__Group_1_0__1 ;
+    // InternalCheck.g:12874:1: rule__XMemberFeatureCall__Group_1_0__0 : rule__XMemberFeatureCall__Group_1_0__0__Impl rule__XMemberFeatureCall__Group_1_0__1 ;
     public final void rule__XMemberFeatureCall__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12878:1: ( rule__XMemberFeatureCall__Group_1_0__0__Impl rule__XMemberFeatureCall__Group_1_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12879:2: rule__XMemberFeatureCall__Group_1_0__0__Impl rule__XMemberFeatureCall__Group_1_0__1
+            // InternalCheck.g:12878:1: ( rule__XMemberFeatureCall__Group_1_0__0__Impl rule__XMemberFeatureCall__Group_1_0__1 )
+            // InternalCheck.g:12879:2: rule__XMemberFeatureCall__Group_1_0__0__Impl rule__XMemberFeatureCall__Group_1_0__1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_0__026378);
+            pushFollow(FOLLOW_32);
             rule__XMemberFeatureCall__Group_1_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0__1_in_rule__XMemberFeatureCall__Group_1_0__026381);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_0__1();
 
             state._fsp--;
@@ -38026,25 +38026,25 @@ public final void rule__XMemberFeatureCall__Group_1_0__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12886:1: rule__XMemberFeatureCall__Group_1_0__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) ) ;
+    // InternalCheck.g:12886:1: rule__XMemberFeatureCall__Group_1_0__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12890:1: ( ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12891:1: ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) )
+            // InternalCheck.g:12890:1: ( ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) ) )
+            // InternalCheck.g:12891:1: ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12891:1: ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12892:1: ( rule__XMemberFeatureCall__Group_1_0_0__0 )
+            // InternalCheck.g:12891:1: ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) )
+            // InternalCheck.g:12892:1: ( rule__XMemberFeatureCall__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12893:1: ( rule__XMemberFeatureCall__Group_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12893:2: rule__XMemberFeatureCall__Group_1_0_0__0
+            // InternalCheck.g:12893:1: ( rule__XMemberFeatureCall__Group_1_0_0__0 )
+            // InternalCheck.g:12893:2: rule__XMemberFeatureCall__Group_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0__0_in_rule__XMemberFeatureCall__Group_1_0__0__Impl26408);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_0_0__0();
 
             state._fsp--;
@@ -38077,16 +38077,16 @@ public final void rule__XMemberFeatureCall__Group_1_0__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12903:1: rule__XMemberFeatureCall__Group_1_0__1 : rule__XMemberFeatureCall__Group_1_0__1__Impl ;
+    // InternalCheck.g:12903:1: rule__XMemberFeatureCall__Group_1_0__1 : rule__XMemberFeatureCall__Group_1_0__1__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12907:1: ( rule__XMemberFeatureCall__Group_1_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12908:2: rule__XMemberFeatureCall__Group_1_0__1__Impl
+            // InternalCheck.g:12907:1: ( rule__XMemberFeatureCall__Group_1_0__1__Impl )
+            // InternalCheck.g:12908:2: rule__XMemberFeatureCall__Group_1_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0__1__Impl_in_rule__XMemberFeatureCall__Group_1_0__126438);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_0__1__Impl();
 
             state._fsp--;
@@ -38110,25 +38110,25 @@ public final void rule__XMemberFeatureCall__Group_1_0__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12914:1: rule__XMemberFeatureCall__Group_1_0__1__Impl : ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) ) ;
+    // InternalCheck.g:12914:1: rule__XMemberFeatureCall__Group_1_0__1__Impl : ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12918:1: ( ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12919:1: ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) )
+            // InternalCheck.g:12918:1: ( ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) ) )
+            // InternalCheck.g:12919:1: ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12919:1: ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12920:1: ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 )
+            // InternalCheck.g:12919:1: ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) )
+            // InternalCheck.g:12920:1: ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getValueAssignment_1_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12921:1: ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12921:2: rule__XMemberFeatureCall__ValueAssignment_1_0_1
+            // InternalCheck.g:12921:1: ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 )
+            // InternalCheck.g:12921:2: rule__XMemberFeatureCall__ValueAssignment_1_0_1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__ValueAssignment_1_0_1_in_rule__XMemberFeatureCall__Group_1_0__1__Impl26465);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__ValueAssignment_1_0_1();
 
             state._fsp--;
@@ -38161,16 +38161,16 @@ public final void rule__XMemberFeatureCall__Group_1_0__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12935:1: rule__XMemberFeatureCall__Group_1_0_0__0 : rule__XMemberFeatureCall__Group_1_0_0__0__Impl ;
+    // InternalCheck.g:12935:1: rule__XMemberFeatureCall__Group_1_0_0__0 : rule__XMemberFeatureCall__Group_1_0_0__0__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12939:1: ( rule__XMemberFeatureCall__Group_1_0_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12940:2: rule__XMemberFeatureCall__Group_1_0_0__0__Impl
+            // InternalCheck.g:12939:1: ( rule__XMemberFeatureCall__Group_1_0_0__0__Impl )
+            // InternalCheck.g:12940:2: rule__XMemberFeatureCall__Group_1_0_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_0_0__026499);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_0_0__0__Impl();
 
             state._fsp--;
@@ -38194,25 +38194,25 @@ public final void rule__XMemberFeatureCall__Group_1_0_0__0() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12946:1: rule__XMemberFeatureCall__Group_1_0_0__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) ) ;
+    // InternalCheck.g:12946:1: rule__XMemberFeatureCall__Group_1_0_0__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12950:1: ( ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12951:1: ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) )
+            // InternalCheck.g:12950:1: ( ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) ) )
+            // InternalCheck.g:12951:1: ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12951:1: ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12952:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__0 )
+            // InternalCheck.g:12951:1: ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) )
+            // InternalCheck.g:12952:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12953:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12953:2: rule__XMemberFeatureCall__Group_1_0_0_0__0
+            // InternalCheck.g:12953:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__0 )
+            // InternalCheck.g:12953:2: rule__XMemberFeatureCall__Group_1_0_0_0__0
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__0_in_rule__XMemberFeatureCall__Group_1_0_0__0__Impl26526);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_0_0_0__0();
 
             state._fsp--;
@@ -38245,21 +38245,21 @@ public final void rule__XMemberFeatureCall__Group_1_0_0__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12965:1: rule__XMemberFeatureCall__Group_1_0_0_0__0 : rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl rule__XMemberFeatureCall__Group_1_0_0_0__1 ;
+    // InternalCheck.g:12965:1: rule__XMemberFeatureCall__Group_1_0_0_0__0 : rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl rule__XMemberFeatureCall__Group_1_0_0_0__1 ;
     public final void rule__XMemberFeatureCall__Group_1_0_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12969:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl rule__XMemberFeatureCall__Group_1_0_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12970:2: rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl rule__XMemberFeatureCall__Group_1_0_0_0__1
+            // InternalCheck.g:12969:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl rule__XMemberFeatureCall__Group_1_0_0_0__1 )
+            // InternalCheck.g:12970:2: rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl rule__XMemberFeatureCall__Group_1_0_0_0__1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_0_0_0__026558);
+            pushFollow(FOLLOW_76);
             rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__1_in_rule__XMemberFeatureCall__Group_1_0_0_0__026561);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_0_0_0__1();
 
             state._fsp--;
@@ -38283,23 +38283,23 @@ public final void rule__XMemberFeatureCall__Group_1_0_0_0__0() throws Recognitio
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12977:1: rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl : ( () ) ;
+    // InternalCheck.g:12977:1: rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl : ( () ) ;
     public final void rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12981:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12982:1: ( () )
+            // InternalCheck.g:12981:1: ( ( () ) )
+            // InternalCheck.g:12982:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12982:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12983:1: ()
+            // InternalCheck.g:12982:1: ( () )
+            // InternalCheck.g:12983:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getXAssignmentAssignableAction_1_0_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12984:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12986:1: 
+            // InternalCheck.g:12984:1: ()
+            // InternalCheck.g:12986:1: 
             {
             }
 
@@ -38324,21 +38324,21 @@ public final void rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl() throws Reco
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12996:1: rule__XMemberFeatureCall__Group_1_0_0_0__1 : rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl rule__XMemberFeatureCall__Group_1_0_0_0__2 ;
+    // InternalCheck.g:12996:1: rule__XMemberFeatureCall__Group_1_0_0_0__1 : rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl rule__XMemberFeatureCall__Group_1_0_0_0__2 ;
     public final void rule__XMemberFeatureCall__Group_1_0_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13000:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl rule__XMemberFeatureCall__Group_1_0_0_0__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13001:2: rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl rule__XMemberFeatureCall__Group_1_0_0_0__2
+            // InternalCheck.g:13000:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl rule__XMemberFeatureCall__Group_1_0_0_0__2 )
+            // InternalCheck.g:13001:2: rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl rule__XMemberFeatureCall__Group_1_0_0_0__2
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl_in_rule__XMemberFeatureCall__Group_1_0_0_0__126619);
+            pushFollow(FOLLOW_43);
             rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__2_in_rule__XMemberFeatureCall__Group_1_0_0_0__126622);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_0_0_0__2();
 
             state._fsp--;
@@ -38362,25 +38362,25 @@ public final void rule__XMemberFeatureCall__Group_1_0_0_0__1() throws Recognitio
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13008:1: rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) ) ;
+    // InternalCheck.g:13008:1: rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13012:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13013:1: ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) )
+            // InternalCheck.g:13012:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) ) )
+            // InternalCheck.g:13013:1: ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13013:1: ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13014:1: ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 )
+            // InternalCheck.g:13013:1: ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) )
+            // InternalCheck.g:13014:1: ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getAlternatives_1_0_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13015:1: ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13015:2: rule__XMemberFeatureCall__Alternatives_1_0_0_0_1
+            // InternalCheck.g:13015:1: ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 )
+            // InternalCheck.g:13015:2: rule__XMemberFeatureCall__Alternatives_1_0_0_0_1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Alternatives_1_0_0_0_1_in_rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl26649);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Alternatives_1_0_0_0_1();
 
             state._fsp--;
@@ -38413,21 +38413,21 @@ public final void rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl() throws Reco
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13025:1: rule__XMemberFeatureCall__Group_1_0_0_0__2 : rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl rule__XMemberFeatureCall__Group_1_0_0_0__3 ;
+    // InternalCheck.g:13025:1: rule__XMemberFeatureCall__Group_1_0_0_0__2 : rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl rule__XMemberFeatureCall__Group_1_0_0_0__3 ;
     public final void rule__XMemberFeatureCall__Group_1_0_0_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13029:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl rule__XMemberFeatureCall__Group_1_0_0_0__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13030:2: rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl rule__XMemberFeatureCall__Group_1_0_0_0__3
+            // InternalCheck.g:13029:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl rule__XMemberFeatureCall__Group_1_0_0_0__3 )
+            // InternalCheck.g:13030:2: rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl rule__XMemberFeatureCall__Group_1_0_0_0__3
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl_in_rule__XMemberFeatureCall__Group_1_0_0_0__226679);
+            pushFollow(FOLLOW_34);
             rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__3_in_rule__XMemberFeatureCall__Group_1_0_0_0__226682);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_0_0_0__3();
 
             state._fsp--;
@@ -38451,25 +38451,25 @@ public final void rule__XMemberFeatureCall__Group_1_0_0_0__2() throws Recognitio
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13037:1: rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl : ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) ) ;
+    // InternalCheck.g:13037:1: rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl : ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13041:1: ( ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13042:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) )
+            // InternalCheck.g:13041:1: ( ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) ) )
+            // InternalCheck.g:13042:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13042:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13043:1: ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 )
+            // InternalCheck.g:13042:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) )
+            // InternalCheck.g:13043:1: ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getFeatureAssignment_1_0_0_0_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13044:1: ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13044:2: rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2
+            // InternalCheck.g:13044:1: ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 )
+            // InternalCheck.g:13044:2: rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2_in_rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl26709);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2();
 
             state._fsp--;
@@ -38502,16 +38502,16 @@ public final void rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl() throws Reco
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13054:1: rule__XMemberFeatureCall__Group_1_0_0_0__3 : rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl ;
+    // InternalCheck.g:13054:1: rule__XMemberFeatureCall__Group_1_0_0_0__3 : rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_0_0_0__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13058:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13059:2: rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl
+            // InternalCheck.g:13058:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl )
+            // InternalCheck.g:13059:2: rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl_in_rule__XMemberFeatureCall__Group_1_0_0_0__326739);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl();
 
             state._fsp--;
@@ -38535,22 +38535,22 @@ public final void rule__XMemberFeatureCall__Group_1_0_0_0__3() throws Recognitio
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13065:1: rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl : ( ruleOpSingleAssign ) ;
+    // InternalCheck.g:13065:1: rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl : ( ruleOpSingleAssign ) ;
     public final void rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13069:1: ( ( ruleOpSingleAssign ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13070:1: ( ruleOpSingleAssign )
+            // InternalCheck.g:13069:1: ( ( ruleOpSingleAssign ) )
+            // InternalCheck.g:13070:1: ( ruleOpSingleAssign )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13070:1: ( ruleOpSingleAssign )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13071:1: ruleOpSingleAssign
+            // InternalCheck.g:13070:1: ( ruleOpSingleAssign )
+            // InternalCheck.g:13071:1: ruleOpSingleAssign
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getOpSingleAssignParserRuleCall_1_0_0_0_3()); 
             }
-            pushFollow(FOLLOW_ruleOpSingleAssign_in_rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl26766);
+            pushFollow(FOLLOW_2);
             ruleOpSingleAssign();
 
             state._fsp--;
@@ -38580,21 +38580,21 @@ public final void rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl() throws Reco
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13090:1: rule__XMemberFeatureCall__Group_1_1__0 : rule__XMemberFeatureCall__Group_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1__1 ;
+    // InternalCheck.g:13090:1: rule__XMemberFeatureCall__Group_1_1__0 : rule__XMemberFeatureCall__Group_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1__1 ;
     public final void rule__XMemberFeatureCall__Group_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13094:1: ( rule__XMemberFeatureCall__Group_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13095:2: rule__XMemberFeatureCall__Group_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1__1
+            // InternalCheck.g:13094:1: ( rule__XMemberFeatureCall__Group_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1__1 )
+            // InternalCheck.g:13095:2: rule__XMemberFeatureCall__Group_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1__1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__0__Impl_in_rule__XMemberFeatureCall__Group_1_1__026803);
+            pushFollow(FOLLOW_77);
             rule__XMemberFeatureCall__Group_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__1_in_rule__XMemberFeatureCall__Group_1_1__026806);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1__1();
 
             state._fsp--;
@@ -38618,25 +38618,25 @@ public final void rule__XMemberFeatureCall__Group_1_1__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13102:1: rule__XMemberFeatureCall__Group_1_1__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) ) ;
+    // InternalCheck.g:13102:1: rule__XMemberFeatureCall__Group_1_1__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13106:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13107:1: ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) )
+            // InternalCheck.g:13106:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) ) )
+            // InternalCheck.g:13107:1: ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13107:1: ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13108:1: ( rule__XMemberFeatureCall__Group_1_1_0__0 )
+            // InternalCheck.g:13107:1: ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) )
+            // InternalCheck.g:13108:1: ( rule__XMemberFeatureCall__Group_1_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13109:1: ( rule__XMemberFeatureCall__Group_1_1_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13109:2: rule__XMemberFeatureCall__Group_1_1_0__0
+            // InternalCheck.g:13109:1: ( rule__XMemberFeatureCall__Group_1_1_0__0 )
+            // InternalCheck.g:13109:2: rule__XMemberFeatureCall__Group_1_1_0__0
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_0__0_in_rule__XMemberFeatureCall__Group_1_1__0__Impl26833);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_0__0();
 
             state._fsp--;
@@ -38669,21 +38669,21 @@ public final void rule__XMemberFeatureCall__Group_1_1__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13119:1: rule__XMemberFeatureCall__Group_1_1__1 : rule__XMemberFeatureCall__Group_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1__2 ;
+    // InternalCheck.g:13119:1: rule__XMemberFeatureCall__Group_1_1__1 : rule__XMemberFeatureCall__Group_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1__2 ;
     public final void rule__XMemberFeatureCall__Group_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13123:1: ( rule__XMemberFeatureCall__Group_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13124:2: rule__XMemberFeatureCall__Group_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1__2
+            // InternalCheck.g:13123:1: ( rule__XMemberFeatureCall__Group_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1__2 )
+            // InternalCheck.g:13124:2: rule__XMemberFeatureCall__Group_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1__2
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__1__Impl_in_rule__XMemberFeatureCall__Group_1_1__126863);
+            pushFollow(FOLLOW_77);
             rule__XMemberFeatureCall__Group_1_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__2_in_rule__XMemberFeatureCall__Group_1_1__126866);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1__2();
 
             state._fsp--;
@@ -38707,22 +38707,22 @@ public final void rule__XMemberFeatureCall__Group_1_1__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13131:1: rule__XMemberFeatureCall__Group_1_1__1__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? ) ;
+    // InternalCheck.g:13131:1: rule__XMemberFeatureCall__Group_1_1__1__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? ) ;
     public final void rule__XMemberFeatureCall__Group_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13135:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13136:1: ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? )
+            // InternalCheck.g:13135:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? ) )
+            // InternalCheck.g:13136:1: ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13136:1: ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13137:1: ( rule__XMemberFeatureCall__Group_1_1_1__0 )?
+            // InternalCheck.g:13136:1: ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? )
+            // InternalCheck.g:13137:1: ( rule__XMemberFeatureCall__Group_1_1_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13138:1: ( rule__XMemberFeatureCall__Group_1_1_1__0 )?
+            // InternalCheck.g:13138:1: ( rule__XMemberFeatureCall__Group_1_1_1__0 )?
             int alt105=2;
             int LA105_0 = input.LA(1);
 
@@ -38731,9 +38731,9 @@ public final void rule__XMemberFeatureCall__Group_1_1__1__Impl() throws Recognit
             }
             switch (alt105) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13138:2: rule__XMemberFeatureCall__Group_1_1_1__0
+                    // InternalCheck.g:13138:2: rule__XMemberFeatureCall__Group_1_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__0_in_rule__XMemberFeatureCall__Group_1_1__1__Impl26893);
+                    pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__Group_1_1_1__0();
 
                     state._fsp--;
@@ -38769,21 +38769,21 @@ public final void rule__XMemberFeatureCall__Group_1_1__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13148:1: rule__XMemberFeatureCall__Group_1_1__2 : rule__XMemberFeatureCall__Group_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1__3 ;
+    // InternalCheck.g:13148:1: rule__XMemberFeatureCall__Group_1_1__2 : rule__XMemberFeatureCall__Group_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1__3 ;
     public final void rule__XMemberFeatureCall__Group_1_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13152:1: ( rule__XMemberFeatureCall__Group_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13153:2: rule__XMemberFeatureCall__Group_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1__3
+            // InternalCheck.g:13152:1: ( rule__XMemberFeatureCall__Group_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1__3 )
+            // InternalCheck.g:13153:2: rule__XMemberFeatureCall__Group_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1__3
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__2__Impl_in_rule__XMemberFeatureCall__Group_1_1__226924);
+            pushFollow(FOLLOW_78);
             rule__XMemberFeatureCall__Group_1_1__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__3_in_rule__XMemberFeatureCall__Group_1_1__226927);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1__3();
 
             state._fsp--;
@@ -38807,25 +38807,25 @@ public final void rule__XMemberFeatureCall__Group_1_1__2() throws RecognitionExc
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13160:1: rule__XMemberFeatureCall__Group_1_1__2__Impl : ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) ) ;
+    // InternalCheck.g:13160:1: rule__XMemberFeatureCall__Group_1_1__2__Impl : ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13164:1: ( ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13165:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) )
+            // InternalCheck.g:13164:1: ( ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) ) )
+            // InternalCheck.g:13165:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13165:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13166:1: ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 )
+            // InternalCheck.g:13165:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) )
+            // InternalCheck.g:13166:1: ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getFeatureAssignment_1_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13167:1: ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13167:2: rule__XMemberFeatureCall__FeatureAssignment_1_1_2
+            // InternalCheck.g:13167:1: ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 )
+            // InternalCheck.g:13167:2: rule__XMemberFeatureCall__FeatureAssignment_1_1_2
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__FeatureAssignment_1_1_2_in_rule__XMemberFeatureCall__Group_1_1__2__Impl26954);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__FeatureAssignment_1_1_2();
 
             state._fsp--;
@@ -38858,21 +38858,21 @@ public final void rule__XMemberFeatureCall__Group_1_1__2__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13177:1: rule__XMemberFeatureCall__Group_1_1__3 : rule__XMemberFeatureCall__Group_1_1__3__Impl rule__XMemberFeatureCall__Group_1_1__4 ;
+    // InternalCheck.g:13177:1: rule__XMemberFeatureCall__Group_1_1__3 : rule__XMemberFeatureCall__Group_1_1__3__Impl rule__XMemberFeatureCall__Group_1_1__4 ;
     public final void rule__XMemberFeatureCall__Group_1_1__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13181:1: ( rule__XMemberFeatureCall__Group_1_1__3__Impl rule__XMemberFeatureCall__Group_1_1__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13182:2: rule__XMemberFeatureCall__Group_1_1__3__Impl rule__XMemberFeatureCall__Group_1_1__4
+            // InternalCheck.g:13181:1: ( rule__XMemberFeatureCall__Group_1_1__3__Impl rule__XMemberFeatureCall__Group_1_1__4 )
+            // InternalCheck.g:13182:2: rule__XMemberFeatureCall__Group_1_1__3__Impl rule__XMemberFeatureCall__Group_1_1__4
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__3__Impl_in_rule__XMemberFeatureCall__Group_1_1__326984);
+            pushFollow(FOLLOW_78);
             rule__XMemberFeatureCall__Group_1_1__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__4_in_rule__XMemberFeatureCall__Group_1_1__326987);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1__4();
 
             state._fsp--;
@@ -38896,29 +38896,29 @@ public final void rule__XMemberFeatureCall__Group_1_1__3() throws RecognitionExc
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13189:1: rule__XMemberFeatureCall__Group_1_1__3__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? ) ;
+    // InternalCheck.g:13189:1: rule__XMemberFeatureCall__Group_1_1__3__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? ) ;
     public final void rule__XMemberFeatureCall__Group_1_1__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13193:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13194:1: ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? )
+            // InternalCheck.g:13193:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? ) )
+            // InternalCheck.g:13194:1: ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13194:1: ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13195:1: ( rule__XMemberFeatureCall__Group_1_1_3__0 )?
+            // InternalCheck.g:13194:1: ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? )
+            // InternalCheck.g:13195:1: ( rule__XMemberFeatureCall__Group_1_1_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13196:1: ( rule__XMemberFeatureCall__Group_1_1_3__0 )?
+            // InternalCheck.g:13196:1: ( rule__XMemberFeatureCall__Group_1_1_3__0 )?
             int alt106=2;
             alt106 = dfa106.predict(input);
             switch (alt106) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13196:2: rule__XMemberFeatureCall__Group_1_1_3__0
+                    // InternalCheck.g:13196:2: rule__XMemberFeatureCall__Group_1_1_3__0
                     {
-                    pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__0_in_rule__XMemberFeatureCall__Group_1_1__3__Impl27014);
+                    pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__Group_1_1_3__0();
 
                     state._fsp--;
@@ -38954,16 +38954,16 @@ public final void rule__XMemberFeatureCall__Group_1_1__3__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13206:1: rule__XMemberFeatureCall__Group_1_1__4 : rule__XMemberFeatureCall__Group_1_1__4__Impl ;
+    // InternalCheck.g:13206:1: rule__XMemberFeatureCall__Group_1_1__4 : rule__XMemberFeatureCall__Group_1_1__4__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_1__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13210:1: ( rule__XMemberFeatureCall__Group_1_1__4__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13211:2: rule__XMemberFeatureCall__Group_1_1__4__Impl
+            // InternalCheck.g:13210:1: ( rule__XMemberFeatureCall__Group_1_1__4__Impl )
+            // InternalCheck.g:13211:2: rule__XMemberFeatureCall__Group_1_1__4__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__4__Impl_in_rule__XMemberFeatureCall__Group_1_1__427045);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1__4__Impl();
 
             state._fsp--;
@@ -38987,29 +38987,29 @@ public final void rule__XMemberFeatureCall__Group_1_1__4() throws RecognitionExc
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13217:1: rule__XMemberFeatureCall__Group_1_1__4__Impl : ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? ) ;
+    // InternalCheck.g:13217:1: rule__XMemberFeatureCall__Group_1_1__4__Impl : ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? ) ;
     public final void rule__XMemberFeatureCall__Group_1_1__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13221:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13222:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? )
+            // InternalCheck.g:13221:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? ) )
+            // InternalCheck.g:13222:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13222:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13223:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )?
+            // InternalCheck.g:13222:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? )
+            // InternalCheck.g:13223:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsAssignment_1_1_4()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13224:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )?
+            // InternalCheck.g:13224:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )?
             int alt107=2;
             alt107 = dfa107.predict(input);
             switch (alt107) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13224:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4
+                    // InternalCheck.g:13224:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4
                     {
-                    pushFollow(FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4_in_rule__XMemberFeatureCall__Group_1_1__4__Impl27072);
+                    pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4();
 
                     state._fsp--;
@@ -39045,16 +39045,16 @@ public final void rule__XMemberFeatureCall__Group_1_1__4__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13244:1: rule__XMemberFeatureCall__Group_1_1_0__0 : rule__XMemberFeatureCall__Group_1_1_0__0__Impl ;
+    // InternalCheck.g:13244:1: rule__XMemberFeatureCall__Group_1_1_0__0 : rule__XMemberFeatureCall__Group_1_1_0__0__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13248:1: ( rule__XMemberFeatureCall__Group_1_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13249:2: rule__XMemberFeatureCall__Group_1_1_0__0__Impl
+            // InternalCheck.g:13248:1: ( rule__XMemberFeatureCall__Group_1_1_0__0__Impl )
+            // InternalCheck.g:13249:2: rule__XMemberFeatureCall__Group_1_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_0__027113);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_0__0__Impl();
 
             state._fsp--;
@@ -39078,25 +39078,25 @@ public final void rule__XMemberFeatureCall__Group_1_1_0__0() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13255:1: rule__XMemberFeatureCall__Group_1_1_0__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) ) ;
+    // InternalCheck.g:13255:1: rule__XMemberFeatureCall__Group_1_1_0__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13259:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13260:1: ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) )
+            // InternalCheck.g:13259:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) ) )
+            // InternalCheck.g:13260:1: ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13260:1: ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13261:1: ( rule__XMemberFeatureCall__Group_1_1_0_0__0 )
+            // InternalCheck.g:13260:1: ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) )
+            // InternalCheck.g:13261:1: ( rule__XMemberFeatureCall__Group_1_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13262:1: ( rule__XMemberFeatureCall__Group_1_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13262:2: rule__XMemberFeatureCall__Group_1_1_0_0__0
+            // InternalCheck.g:13262:1: ( rule__XMemberFeatureCall__Group_1_1_0_0__0 )
+            // InternalCheck.g:13262:2: rule__XMemberFeatureCall__Group_1_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_0_0__0_in_rule__XMemberFeatureCall__Group_1_1_0__0__Impl27140);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_0_0__0();
 
             state._fsp--;
@@ -39129,21 +39129,21 @@ public final void rule__XMemberFeatureCall__Group_1_1_0__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13274:1: rule__XMemberFeatureCall__Group_1_1_0_0__0 : rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl rule__XMemberFeatureCall__Group_1_1_0_0__1 ;
+    // InternalCheck.g:13274:1: rule__XMemberFeatureCall__Group_1_1_0_0__0 : rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl rule__XMemberFeatureCall__Group_1_1_0_0__1 ;
     public final void rule__XMemberFeatureCall__Group_1_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13278:1: ( rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl rule__XMemberFeatureCall__Group_1_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13279:2: rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl rule__XMemberFeatureCall__Group_1_1_0_0__1
+            // InternalCheck.g:13278:1: ( rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl rule__XMemberFeatureCall__Group_1_1_0_0__1 )
+            // InternalCheck.g:13279:2: rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl rule__XMemberFeatureCall__Group_1_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_0_0__027172);
+            pushFollow(FOLLOW_74);
             rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_0_0__1_in_rule__XMemberFeatureCall__Group_1_1_0_0__027175);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_0_0__1();
 
             state._fsp--;
@@ -39167,23 +39167,23 @@ public final void rule__XMemberFeatureCall__Group_1_1_0_0__0() throws Recognitio
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13286:1: rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl : ( () ) ;
+    // InternalCheck.g:13286:1: rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl : ( () ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13290:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13291:1: ( () )
+            // InternalCheck.g:13290:1: ( ( () ) )
+            // InternalCheck.g:13291:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13291:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13292:1: ()
+            // InternalCheck.g:13291:1: ( () )
+            // InternalCheck.g:13292:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getXMemberFeatureCallMemberCallTargetAction_1_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13293:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13295:1: 
+            // InternalCheck.g:13293:1: ()
+            // InternalCheck.g:13295:1: 
             {
             }
 
@@ -39208,16 +39208,16 @@ public final void rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl() throws Reco
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13305:1: rule__XMemberFeatureCall__Group_1_1_0_0__1 : rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl ;
+    // InternalCheck.g:13305:1: rule__XMemberFeatureCall__Group_1_1_0_0__1 : rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13309:1: ( rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13310:2: rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl
+            // InternalCheck.g:13309:1: ( rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl )
+            // InternalCheck.g:13310:2: rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_0_0__127233);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl();
 
             state._fsp--;
@@ -39241,25 +39241,25 @@ public final void rule__XMemberFeatureCall__Group_1_1_0_0__1() throws Recognitio
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13316:1: rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) ) ;
+    // InternalCheck.g:13316:1: rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13320:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13321:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) )
+            // InternalCheck.g:13320:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) ) )
+            // InternalCheck.g:13321:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13321:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13322:1: ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 )
+            // InternalCheck.g:13321:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) )
+            // InternalCheck.g:13322:1: ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getAlternatives_1_1_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13323:1: ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13323:2: rule__XMemberFeatureCall__Alternatives_1_1_0_0_1
+            // InternalCheck.g:13323:1: ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 )
+            // InternalCheck.g:13323:2: rule__XMemberFeatureCall__Alternatives_1_1_0_0_1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Alternatives_1_1_0_0_1_in_rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl27260);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Alternatives_1_1_0_0_1();
 
             state._fsp--;
@@ -39292,21 +39292,21 @@ public final void rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl() throws Reco
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13337:1: rule__XMemberFeatureCall__Group_1_1_1__0 : rule__XMemberFeatureCall__Group_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_1__1 ;
+    // InternalCheck.g:13337:1: rule__XMemberFeatureCall__Group_1_1_1__0 : rule__XMemberFeatureCall__Group_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_1__1 ;
     public final void rule__XMemberFeatureCall__Group_1_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13341:1: ( rule__XMemberFeatureCall__Group_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13342:2: rule__XMemberFeatureCall__Group_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_1__1
+            // InternalCheck.g:13341:1: ( rule__XMemberFeatureCall__Group_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_1__1 )
+            // InternalCheck.g:13342:2: rule__XMemberFeatureCall__Group_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_1__1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_1__027294);
+            pushFollow(FOLLOW_79);
             rule__XMemberFeatureCall__Group_1_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__1_in_rule__XMemberFeatureCall__Group_1_1_1__027297);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_1__1();
 
             state._fsp--;
@@ -39330,22 +39330,22 @@ public final void rule__XMemberFeatureCall__Group_1_1_1__0() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13349:1: rule__XMemberFeatureCall__Group_1_1_1__0__Impl : ( '<' ) ;
+    // InternalCheck.g:13349:1: rule__XMemberFeatureCall__Group_1_1_1__0__Impl : ( '<' ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13353:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13354:1: ( '<' )
+            // InternalCheck.g:13353:1: ( ( '<' ) )
+            // InternalCheck.g:13354:1: ( '<' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13354:1: ( '<' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13355:1: '<'
+            // InternalCheck.g:13354:1: ( '<' )
+            // InternalCheck.g:13355:1: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getLessThanSignKeyword_1_1_1_0()); 
             }
-            match(input,47,FOLLOW_47_in_rule__XMemberFeatureCall__Group_1_1_1__0__Impl27325); if (state.failed) return ;
+            match(input,47,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getLessThanSignKeyword_1_1_1_0()); 
             }
@@ -39371,21 +39371,21 @@ public final void rule__XMemberFeatureCall__Group_1_1_1__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13368:1: rule__XMemberFeatureCall__Group_1_1_1__1 : rule__XMemberFeatureCall__Group_1_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1_1__2 ;
+    // InternalCheck.g:13368:1: rule__XMemberFeatureCall__Group_1_1_1__1 : rule__XMemberFeatureCall__Group_1_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1_1__2 ;
     public final void rule__XMemberFeatureCall__Group_1_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13372:1: ( rule__XMemberFeatureCall__Group_1_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1_1__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13373:2: rule__XMemberFeatureCall__Group_1_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1_1__2
+            // InternalCheck.g:13372:1: ( rule__XMemberFeatureCall__Group_1_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1_1__2 )
+            // InternalCheck.g:13373:2: rule__XMemberFeatureCall__Group_1_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1_1__2
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_1__127356);
+            pushFollow(FOLLOW_80);
             rule__XMemberFeatureCall__Group_1_1_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__2_in_rule__XMemberFeatureCall__Group_1_1_1__127359);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_1__2();
 
             state._fsp--;
@@ -39409,25 +39409,25 @@ public final void rule__XMemberFeatureCall__Group_1_1_1__1() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13380:1: rule__XMemberFeatureCall__Group_1_1_1__1__Impl : ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) ) ;
+    // InternalCheck.g:13380:1: rule__XMemberFeatureCall__Group_1_1_1__1__Impl : ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13384:1: ( ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13385:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) )
+            // InternalCheck.g:13384:1: ( ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) ) )
+            // InternalCheck.g:13385:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13385:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13386:1: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 )
+            // InternalCheck.g:13385:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) )
+            // InternalCheck.g:13386:1: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getTypeArgumentsAssignment_1_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13387:1: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13387:2: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1
+            // InternalCheck.g:13387:1: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 )
+            // InternalCheck.g:13387:2: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1_in_rule__XMemberFeatureCall__Group_1_1_1__1__Impl27386);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1();
 
             state._fsp--;
@@ -39460,21 +39460,21 @@ public final void rule__XMemberFeatureCall__Group_1_1_1__1__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13397:1: rule__XMemberFeatureCall__Group_1_1_1__2 : rule__XMemberFeatureCall__Group_1_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1_1__3 ;
+    // InternalCheck.g:13397:1: rule__XMemberFeatureCall__Group_1_1_1__2 : rule__XMemberFeatureCall__Group_1_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1_1__3 ;
     public final void rule__XMemberFeatureCall__Group_1_1_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13401:1: ( rule__XMemberFeatureCall__Group_1_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1_1__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13402:2: rule__XMemberFeatureCall__Group_1_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1_1__3
+            // InternalCheck.g:13401:1: ( rule__XMemberFeatureCall__Group_1_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1_1__3 )
+            // InternalCheck.g:13402:2: rule__XMemberFeatureCall__Group_1_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1_1__3
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__2__Impl_in_rule__XMemberFeatureCall__Group_1_1_1__227416);
+            pushFollow(FOLLOW_80);
             rule__XMemberFeatureCall__Group_1_1_1__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__3_in_rule__XMemberFeatureCall__Group_1_1_1__227419);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_1__3();
 
             state._fsp--;
@@ -39498,22 +39498,22 @@ public final void rule__XMemberFeatureCall__Group_1_1_1__2() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13409:1: rule__XMemberFeatureCall__Group_1_1_1__2__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* ) ;
+    // InternalCheck.g:13409:1: rule__XMemberFeatureCall__Group_1_1_1__2__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13413:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13414:1: ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* )
+            // InternalCheck.g:13413:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* ) )
+            // InternalCheck.g:13414:1: ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13414:1: ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13415:1: ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )*
+            // InternalCheck.g:13414:1: ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* )
+            // InternalCheck.g:13415:1: ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13416:1: ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )*
+            // InternalCheck.g:13416:1: ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )*
             loop108:
             do {
                 int alt108=2;
@@ -39526,9 +39526,9 @@ public final void rule__XMemberFeatureCall__Group_1_1_1__2__Impl() throws Recogn
 
                 switch (alt108) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13416:2: rule__XMemberFeatureCall__Group_1_1_1_2__0
+            	    // InternalCheck.g:13416:2: rule__XMemberFeatureCall__Group_1_1_1_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1_2__0_in_rule__XMemberFeatureCall__Group_1_1_1__2__Impl27446);
+            	    pushFollow(FOLLOW_21);
             	    rule__XMemberFeatureCall__Group_1_1_1_2__0();
 
             	    state._fsp--;
@@ -39567,16 +39567,16 @@ public final void rule__XMemberFeatureCall__Group_1_1_1__2__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13426:1: rule__XMemberFeatureCall__Group_1_1_1__3 : rule__XMemberFeatureCall__Group_1_1_1__3__Impl ;
+    // InternalCheck.g:13426:1: rule__XMemberFeatureCall__Group_1_1_1__3 : rule__XMemberFeatureCall__Group_1_1_1__3__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_1_1__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13430:1: ( rule__XMemberFeatureCall__Group_1_1_1__3__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13431:2: rule__XMemberFeatureCall__Group_1_1_1__3__Impl
+            // InternalCheck.g:13430:1: ( rule__XMemberFeatureCall__Group_1_1_1__3__Impl )
+            // InternalCheck.g:13431:2: rule__XMemberFeatureCall__Group_1_1_1__3__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__3__Impl_in_rule__XMemberFeatureCall__Group_1_1_1__327477);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_1__3__Impl();
 
             state._fsp--;
@@ -39600,22 +39600,22 @@ public final void rule__XMemberFeatureCall__Group_1_1_1__3() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13437:1: rule__XMemberFeatureCall__Group_1_1_1__3__Impl : ( '>' ) ;
+    // InternalCheck.g:13437:1: rule__XMemberFeatureCall__Group_1_1_1__3__Impl : ( '>' ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_1__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13441:1: ( ( '>' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13442:1: ( '>' )
+            // InternalCheck.g:13441:1: ( ( '>' ) )
+            // InternalCheck.g:13442:1: ( '>' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13442:1: ( '>' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13443:1: '>'
+            // InternalCheck.g:13442:1: ( '>' )
+            // InternalCheck.g:13443:1: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGreaterThanSignKeyword_1_1_1_3()); 
             }
-            match(input,46,FOLLOW_46_in_rule__XMemberFeatureCall__Group_1_1_1__3__Impl27505); if (state.failed) return ;
+            match(input,46,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getGreaterThanSignKeyword_1_1_1_3()); 
             }
@@ -39641,21 +39641,21 @@ public final void rule__XMemberFeatureCall__Group_1_1_1__3__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1_2__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13464:1: rule__XMemberFeatureCall__Group_1_1_1_2__0 : rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl rule__XMemberFeatureCall__Group_1_1_1_2__1 ;
+    // InternalCheck.g:13464:1: rule__XMemberFeatureCall__Group_1_1_1_2__0 : rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl rule__XMemberFeatureCall__Group_1_1_1_2__1 ;
     public final void rule__XMemberFeatureCall__Group_1_1_1_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13468:1: ( rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl rule__XMemberFeatureCall__Group_1_1_1_2__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13469:2: rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl rule__XMemberFeatureCall__Group_1_1_1_2__1
+            // InternalCheck.g:13468:1: ( rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl rule__XMemberFeatureCall__Group_1_1_1_2__1 )
+            // InternalCheck.g:13469:2: rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl rule__XMemberFeatureCall__Group_1_1_1_2__1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_1_2__027544);
+            pushFollow(FOLLOW_79);
             rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1_2__1_in_rule__XMemberFeatureCall__Group_1_1_1_2__027547);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_1_2__1();
 
             state._fsp--;
@@ -39679,22 +39679,22 @@ public final void rule__XMemberFeatureCall__Group_1_1_1_2__0() throws Recognitio
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13476:1: rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl : ( ',' ) ;
+    // InternalCheck.g:13476:1: rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl : ( ',' ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13480:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13481:1: ( ',' )
+            // InternalCheck.g:13480:1: ( ( ',' ) )
+            // InternalCheck.g:13481:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13481:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13482:1: ','
+            // InternalCheck.g:13481:1: ( ',' )
+            // InternalCheck.g:13482:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getCommaKeyword_1_1_1_2_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl27575); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getCommaKeyword_1_1_1_2_0()); 
             }
@@ -39720,16 +39720,16 @@ public final void rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl() throws Reco
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1_2__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13495:1: rule__XMemberFeatureCall__Group_1_1_1_2__1 : rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl ;
+    // InternalCheck.g:13495:1: rule__XMemberFeatureCall__Group_1_1_1_2__1 : rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_1_1_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13499:1: ( rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13500:2: rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl
+            // InternalCheck.g:13499:1: ( rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl )
+            // InternalCheck.g:13500:2: rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_1_2__127606);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl();
 
             state._fsp--;
@@ -39753,25 +39753,25 @@ public final void rule__XMemberFeatureCall__Group_1_1_1_2__1() throws Recognitio
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13506:1: rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl : ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) ) ;
+    // InternalCheck.g:13506:1: rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl : ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13510:1: ( ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13511:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) )
+            // InternalCheck.g:13510:1: ( ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) ) )
+            // InternalCheck.g:13511:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13511:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13512:1: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 )
+            // InternalCheck.g:13511:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) )
+            // InternalCheck.g:13512:1: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getTypeArgumentsAssignment_1_1_1_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13513:1: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13513:2: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1
+            // InternalCheck.g:13513:1: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 )
+            // InternalCheck.g:13513:2: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1_in_rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl27633);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1();
 
             state._fsp--;
@@ -39804,21 +39804,21 @@ public final void rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl() throws Reco
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13527:1: rule__XMemberFeatureCall__Group_1_1_3__0 : rule__XMemberFeatureCall__Group_1_1_3__0__Impl rule__XMemberFeatureCall__Group_1_1_3__1 ;
+    // InternalCheck.g:13527:1: rule__XMemberFeatureCall__Group_1_1_3__0 : rule__XMemberFeatureCall__Group_1_1_3__0__Impl rule__XMemberFeatureCall__Group_1_1_3__1 ;
     public final void rule__XMemberFeatureCall__Group_1_1_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13531:1: ( rule__XMemberFeatureCall__Group_1_1_3__0__Impl rule__XMemberFeatureCall__Group_1_1_3__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13532:2: rule__XMemberFeatureCall__Group_1_1_3__0__Impl rule__XMemberFeatureCall__Group_1_1_3__1
+            // InternalCheck.g:13531:1: ( rule__XMemberFeatureCall__Group_1_1_3__0__Impl rule__XMemberFeatureCall__Group_1_1_3__1 )
+            // InternalCheck.g:13532:2: rule__XMemberFeatureCall__Group_1_1_3__0__Impl rule__XMemberFeatureCall__Group_1_1_3__1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_3__027667);
+            pushFollow(FOLLOW_81);
             rule__XMemberFeatureCall__Group_1_1_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__1_in_rule__XMemberFeatureCall__Group_1_1_3__027670);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_3__1();
 
             state._fsp--;
@@ -39842,25 +39842,25 @@ public final void rule__XMemberFeatureCall__Group_1_1_3__0() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13539:1: rule__XMemberFeatureCall__Group_1_1_3__0__Impl : ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) ) ;
+    // InternalCheck.g:13539:1: rule__XMemberFeatureCall__Group_1_1_3__0__Impl : ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13543:1: ( ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13544:1: ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) )
+            // InternalCheck.g:13543:1: ( ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) ) )
+            // InternalCheck.g:13544:1: ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13544:1: ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13545:1: ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 )
+            // InternalCheck.g:13544:1: ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) )
+            // InternalCheck.g:13545:1: ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getExplicitOperationCallAssignment_1_1_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13546:1: ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13546:2: rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0
+            // InternalCheck.g:13546:1: ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 )
+            // InternalCheck.g:13546:2: rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0_in_rule__XMemberFeatureCall__Group_1_1_3__0__Impl27697);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0();
 
             state._fsp--;
@@ -39893,21 +39893,21 @@ public final void rule__XMemberFeatureCall__Group_1_1_3__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13556:1: rule__XMemberFeatureCall__Group_1_1_3__1 : rule__XMemberFeatureCall__Group_1_1_3__1__Impl rule__XMemberFeatureCall__Group_1_1_3__2 ;
+    // InternalCheck.g:13556:1: rule__XMemberFeatureCall__Group_1_1_3__1 : rule__XMemberFeatureCall__Group_1_1_3__1__Impl rule__XMemberFeatureCall__Group_1_1_3__2 ;
     public final void rule__XMemberFeatureCall__Group_1_1_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13560:1: ( rule__XMemberFeatureCall__Group_1_1_3__1__Impl rule__XMemberFeatureCall__Group_1_1_3__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13561:2: rule__XMemberFeatureCall__Group_1_1_3__1__Impl rule__XMemberFeatureCall__Group_1_1_3__2
+            // InternalCheck.g:13560:1: ( rule__XMemberFeatureCall__Group_1_1_3__1__Impl rule__XMemberFeatureCall__Group_1_1_3__2 )
+            // InternalCheck.g:13561:2: rule__XMemberFeatureCall__Group_1_1_3__1__Impl rule__XMemberFeatureCall__Group_1_1_3__2
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_3__127727);
+            pushFollow(FOLLOW_81);
             rule__XMemberFeatureCall__Group_1_1_3__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__2_in_rule__XMemberFeatureCall__Group_1_1_3__127730);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_3__2();
 
             state._fsp--;
@@ -39931,22 +39931,22 @@ public final void rule__XMemberFeatureCall__Group_1_1_3__1() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13568:1: rule__XMemberFeatureCall__Group_1_1_3__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? ) ;
+    // InternalCheck.g:13568:1: rule__XMemberFeatureCall__Group_1_1_3__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13572:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13573:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? )
+            // InternalCheck.g:13572:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? ) )
+            // InternalCheck.g:13573:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13573:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13574:1: ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )?
+            // InternalCheck.g:13573:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? )
+            // InternalCheck.g:13574:1: ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getAlternatives_1_1_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13575:1: ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )?
+            // InternalCheck.g:13575:1: ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )?
             int alt109=2;
             int LA109_0 = input.LA(1);
 
@@ -39955,9 +39955,9 @@ public final void rule__XMemberFeatureCall__Group_1_1_3__1__Impl() throws Recogn
             }
             switch (alt109) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13575:2: rule__XMemberFeatureCall__Alternatives_1_1_3_1
+                    // InternalCheck.g:13575:2: rule__XMemberFeatureCall__Alternatives_1_1_3_1
                     {
-                    pushFollow(FOLLOW_rule__XMemberFeatureCall__Alternatives_1_1_3_1_in_rule__XMemberFeatureCall__Group_1_1_3__1__Impl27757);
+                    pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__Alternatives_1_1_3_1();
 
                     state._fsp--;
@@ -39993,16 +39993,16 @@ public final void rule__XMemberFeatureCall__Group_1_1_3__1__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13585:1: rule__XMemberFeatureCall__Group_1_1_3__2 : rule__XMemberFeatureCall__Group_1_1_3__2__Impl ;
+    // InternalCheck.g:13585:1: rule__XMemberFeatureCall__Group_1_1_3__2 : rule__XMemberFeatureCall__Group_1_1_3__2__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_1_3__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13589:1: ( rule__XMemberFeatureCall__Group_1_1_3__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13590:2: rule__XMemberFeatureCall__Group_1_1_3__2__Impl
+            // InternalCheck.g:13589:1: ( rule__XMemberFeatureCall__Group_1_1_3__2__Impl )
+            // InternalCheck.g:13590:2: rule__XMemberFeatureCall__Group_1_1_3__2__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__2__Impl_in_rule__XMemberFeatureCall__Group_1_1_3__227788);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_3__2__Impl();
 
             state._fsp--;
@@ -40026,22 +40026,22 @@ public final void rule__XMemberFeatureCall__Group_1_1_3__2() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13596:1: rule__XMemberFeatureCall__Group_1_1_3__2__Impl : ( ')' ) ;
+    // InternalCheck.g:13596:1: rule__XMemberFeatureCall__Group_1_1_3__2__Impl : ( ')' ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_3__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13600:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13601:1: ( ')' )
+            // InternalCheck.g:13600:1: ( ( ')' ) )
+            // InternalCheck.g:13601:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13601:1: ( ')' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13602:1: ')'
+            // InternalCheck.g:13601:1: ( ')' )
+            // InternalCheck.g:13602:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getRightParenthesisKeyword_1_1_3_2()); 
             }
-            match(input,73,FOLLOW_73_in_rule__XMemberFeatureCall__Group_1_1_3__2__Impl27816); if (state.failed) return ;
+            match(input,73,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getRightParenthesisKeyword_1_1_3_2()); 
             }
@@ -40067,21 +40067,21 @@ public final void rule__XMemberFeatureCall__Group_1_1_3__2__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13621:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__0 : rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1__1 ;
+    // InternalCheck.g:13621:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__0 : rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1__1 ;
     public final void rule__XMemberFeatureCall__Group_1_1_3_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13625:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13626:2: rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1__1
+            // InternalCheck.g:13625:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1__1 )
+            // InternalCheck.g:13626:2: rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1__1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__027853);
+            pushFollow(FOLLOW_20);
             rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1__1_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__027856);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_3_1_1__1();
 
             state._fsp--;
@@ -40105,25 +40105,25 @@ public final void rule__XMemberFeatureCall__Group_1_1_3_1_1__0() throws Recognit
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13633:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl : ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) ) ;
+    // InternalCheck.g:13633:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl : ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13637:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13638:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) )
+            // InternalCheck.g:13637:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) ) )
+            // InternalCheck.g:13638:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13638:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13639:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 )
+            // InternalCheck.g:13638:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) )
+            // InternalCheck.g:13639:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsAssignment_1_1_3_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13640:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13640:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0
+            // InternalCheck.g:13640:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 )
+            // InternalCheck.g:13640:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl27883);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0();
 
             state._fsp--;
@@ -40156,16 +40156,16 @@ public final void rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl() throws Re
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13650:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__1 : rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl ;
+    // InternalCheck.g:13650:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__1 : rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_1_3_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13654:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13655:2: rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl
+            // InternalCheck.g:13654:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl )
+            // InternalCheck.g:13655:2: rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__127913);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl();
 
             state._fsp--;
@@ -40189,22 +40189,22 @@ public final void rule__XMemberFeatureCall__Group_1_1_3_1_1__1() throws Recognit
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13661:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* ) ;
+    // InternalCheck.g:13661:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13665:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13666:1: ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* )
+            // InternalCheck.g:13665:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* ) )
+            // InternalCheck.g:13666:1: ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13666:1: ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13667:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )*
+            // InternalCheck.g:13666:1: ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* )
+            // InternalCheck.g:13667:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1_3_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13668:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )*
+            // InternalCheck.g:13668:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )*
             loop110:
             do {
                 int alt110=2;
@@ -40217,9 +40217,9 @@ public final void rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl() throws Re
 
                 switch (alt110) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13668:2: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0
+            	    // InternalCheck.g:13668:2: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl27940);
+            	    pushFollow(FOLLOW_21);
             	    rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0();
 
             	    state._fsp--;
@@ -40258,21 +40258,21 @@ public final void rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl() throws Re
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13682:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 : rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1 ;
+    // InternalCheck.g:13682:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 : rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1 ;
     public final void rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13686:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13687:2: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1
+            // InternalCheck.g:13686:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1 )
+            // InternalCheck.g:13687:2: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__027975);
+            pushFollow(FOLLOW_32);
             rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__027978);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1();
 
             state._fsp--;
@@ -40296,22 +40296,22 @@ public final void rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13694:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl : ( ',' ) ;
+    // InternalCheck.g:13694:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl : ( ',' ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13698:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13699:1: ( ',' )
+            // InternalCheck.g:13698:1: ( ( ',' ) )
+            // InternalCheck.g:13699:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13699:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13700:1: ','
+            // InternalCheck.g:13699:1: ( ',' )
+            // InternalCheck.g:13700:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getCommaKeyword_1_1_3_1_1_1_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl28006); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getCommaKeyword_1_1_3_1_1_1_0()); 
             }
@@ -40337,16 +40337,16 @@ public final void rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl() throws
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13713:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1 : rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl ;
+    // InternalCheck.g:13713:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1 : rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13717:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13718:2: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl
+            // InternalCheck.g:13717:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl )
+            // InternalCheck.g:13718:2: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__128037);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl();
 
             state._fsp--;
@@ -40370,25 +40370,25 @@ public final void rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13724:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl : ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) ) ;
+    // InternalCheck.g:13724:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl : ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13728:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13729:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) )
+            // InternalCheck.g:13728:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) ) )
+            // InternalCheck.g:13729:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13729:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13730:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 )
+            // InternalCheck.g:13729:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) )
+            // InternalCheck.g:13730:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsAssignment_1_1_3_1_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13731:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13731:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1
+            // InternalCheck.g:13731:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 )
+            // InternalCheck.g:13731:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl28064);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1();
 
             state._fsp--;
@@ -40421,21 +40421,21 @@ public final void rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl() throws
 
 
     // $ANTLR start "rule__XSetLiteral__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13745:1: rule__XSetLiteral__Group__0 : rule__XSetLiteral__Group__0__Impl rule__XSetLiteral__Group__1 ;
+    // InternalCheck.g:13745:1: rule__XSetLiteral__Group__0 : rule__XSetLiteral__Group__0__Impl rule__XSetLiteral__Group__1 ;
     public final void rule__XSetLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13749:1: ( rule__XSetLiteral__Group__0__Impl rule__XSetLiteral__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13750:2: rule__XSetLiteral__Group__0__Impl rule__XSetLiteral__Group__1
+            // InternalCheck.g:13749:1: ( rule__XSetLiteral__Group__0__Impl rule__XSetLiteral__Group__1 )
+            // InternalCheck.g:13750:2: rule__XSetLiteral__Group__0__Impl rule__XSetLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__Group__0__Impl_in_rule__XSetLiteral__Group__028098);
+            pushFollow(FOLLOW_42);
             rule__XSetLiteral__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSetLiteral__Group__1_in_rule__XSetLiteral__Group__028101);
+            pushFollow(FOLLOW_2);
             rule__XSetLiteral__Group__1();
 
             state._fsp--;
@@ -40459,23 +40459,23 @@ public final void rule__XSetLiteral__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XSetLiteral__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13757:1: rule__XSetLiteral__Group__0__Impl : ( () ) ;
+    // InternalCheck.g:13757:1: rule__XSetLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XSetLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13761:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13762:1: ( () )
+            // InternalCheck.g:13761:1: ( ( () ) )
+            // InternalCheck.g:13762:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13762:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13763:1: ()
+            // InternalCheck.g:13762:1: ( () )
+            // InternalCheck.g:13763:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getXSetLiteralAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13764:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13766:1: 
+            // InternalCheck.g:13764:1: ()
+            // InternalCheck.g:13766:1: 
             {
             }
 
@@ -40500,21 +40500,21 @@ public final void rule__XSetLiteral__Group__0__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSetLiteral__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13776:1: rule__XSetLiteral__Group__1 : rule__XSetLiteral__Group__1__Impl rule__XSetLiteral__Group__2 ;
+    // InternalCheck.g:13776:1: rule__XSetLiteral__Group__1 : rule__XSetLiteral__Group__1__Impl rule__XSetLiteral__Group__2 ;
     public final void rule__XSetLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13780:1: ( rule__XSetLiteral__Group__1__Impl rule__XSetLiteral__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13781:2: rule__XSetLiteral__Group__1__Impl rule__XSetLiteral__Group__2
+            // InternalCheck.g:13780:1: ( rule__XSetLiteral__Group__1__Impl rule__XSetLiteral__Group__2 )
+            // InternalCheck.g:13781:2: rule__XSetLiteral__Group__1__Impl rule__XSetLiteral__Group__2
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__Group__1__Impl_in_rule__XSetLiteral__Group__128159);
+            pushFollow(FOLLOW_14);
             rule__XSetLiteral__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSetLiteral__Group__2_in_rule__XSetLiteral__Group__128162);
+            pushFollow(FOLLOW_2);
             rule__XSetLiteral__Group__2();
 
             state._fsp--;
@@ -40538,22 +40538,22 @@ public final void rule__XSetLiteral__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XSetLiteral__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13788:1: rule__XSetLiteral__Group__1__Impl : ( '#' ) ;
+    // InternalCheck.g:13788:1: rule__XSetLiteral__Group__1__Impl : ( '#' ) ;
     public final void rule__XSetLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13792:1: ( ( '#' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13793:1: ( '#' )
+            // InternalCheck.g:13792:1: ( ( '#' ) )
+            // InternalCheck.g:13793:1: ( '#' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13793:1: ( '#' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13794:1: '#'
+            // InternalCheck.g:13793:1: ( '#' )
+            // InternalCheck.g:13794:1: '#'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getNumberSignKeyword_1()); 
             }
-            match(input,77,FOLLOW_77_in_rule__XSetLiteral__Group__1__Impl28190); if (state.failed) return ;
+            match(input,77,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSetLiteralAccess().getNumberSignKeyword_1()); 
             }
@@ -40579,21 +40579,21 @@ public final void rule__XSetLiteral__Group__1__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSetLiteral__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13807:1: rule__XSetLiteral__Group__2 : rule__XSetLiteral__Group__2__Impl rule__XSetLiteral__Group__3 ;
+    // InternalCheck.g:13807:1: rule__XSetLiteral__Group__2 : rule__XSetLiteral__Group__2__Impl rule__XSetLiteral__Group__3 ;
     public final void rule__XSetLiteral__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13811:1: ( rule__XSetLiteral__Group__2__Impl rule__XSetLiteral__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13812:2: rule__XSetLiteral__Group__2__Impl rule__XSetLiteral__Group__3
+            // InternalCheck.g:13811:1: ( rule__XSetLiteral__Group__2__Impl rule__XSetLiteral__Group__3 )
+            // InternalCheck.g:13812:2: rule__XSetLiteral__Group__2__Impl rule__XSetLiteral__Group__3
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__Group__2__Impl_in_rule__XSetLiteral__Group__228221);
+            pushFollow(FOLLOW_82);
             rule__XSetLiteral__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSetLiteral__Group__3_in_rule__XSetLiteral__Group__228224);
+            pushFollow(FOLLOW_2);
             rule__XSetLiteral__Group__3();
 
             state._fsp--;
@@ -40617,22 +40617,22 @@ public final void rule__XSetLiteral__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XSetLiteral__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13819:1: rule__XSetLiteral__Group__2__Impl : ( '{' ) ;
+    // InternalCheck.g:13819:1: rule__XSetLiteral__Group__2__Impl : ( '{' ) ;
     public final void rule__XSetLiteral__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13823:1: ( ( '{' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13824:1: ( '{' )
+            // InternalCheck.g:13823:1: ( ( '{' ) )
+            // InternalCheck.g:13824:1: ( '{' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13824:1: ( '{' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13825:1: '{'
+            // InternalCheck.g:13824:1: ( '{' )
+            // InternalCheck.g:13825:1: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getLeftCurlyBracketKeyword_2()); 
             }
-            match(input,68,FOLLOW_68_in_rule__XSetLiteral__Group__2__Impl28252); if (state.failed) return ;
+            match(input,68,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSetLiteralAccess().getLeftCurlyBracketKeyword_2()); 
             }
@@ -40658,21 +40658,21 @@ public final void rule__XSetLiteral__Group__2__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSetLiteral__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13838:1: rule__XSetLiteral__Group__3 : rule__XSetLiteral__Group__3__Impl rule__XSetLiteral__Group__4 ;
+    // InternalCheck.g:13838:1: rule__XSetLiteral__Group__3 : rule__XSetLiteral__Group__3__Impl rule__XSetLiteral__Group__4 ;
     public final void rule__XSetLiteral__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13842:1: ( rule__XSetLiteral__Group__3__Impl rule__XSetLiteral__Group__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13843:2: rule__XSetLiteral__Group__3__Impl rule__XSetLiteral__Group__4
+            // InternalCheck.g:13842:1: ( rule__XSetLiteral__Group__3__Impl rule__XSetLiteral__Group__4 )
+            // InternalCheck.g:13843:2: rule__XSetLiteral__Group__3__Impl rule__XSetLiteral__Group__4
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__Group__3__Impl_in_rule__XSetLiteral__Group__328283);
+            pushFollow(FOLLOW_82);
             rule__XSetLiteral__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSetLiteral__Group__4_in_rule__XSetLiteral__Group__328286);
+            pushFollow(FOLLOW_2);
             rule__XSetLiteral__Group__4();
 
             state._fsp--;
@@ -40696,22 +40696,22 @@ public final void rule__XSetLiteral__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XSetLiteral__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13850:1: rule__XSetLiteral__Group__3__Impl : ( ( rule__XSetLiteral__Group_3__0 )? ) ;
+    // InternalCheck.g:13850:1: rule__XSetLiteral__Group__3__Impl : ( ( rule__XSetLiteral__Group_3__0 )? ) ;
     public final void rule__XSetLiteral__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13854:1: ( ( ( rule__XSetLiteral__Group_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13855:1: ( ( rule__XSetLiteral__Group_3__0 )? )
+            // InternalCheck.g:13854:1: ( ( ( rule__XSetLiteral__Group_3__0 )? ) )
+            // InternalCheck.g:13855:1: ( ( rule__XSetLiteral__Group_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13855:1: ( ( rule__XSetLiteral__Group_3__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13856:1: ( rule__XSetLiteral__Group_3__0 )?
+            // InternalCheck.g:13855:1: ( ( rule__XSetLiteral__Group_3__0 )? )
+            // InternalCheck.g:13856:1: ( rule__XSetLiteral__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getGroup_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13857:1: ( rule__XSetLiteral__Group_3__0 )?
+            // InternalCheck.g:13857:1: ( rule__XSetLiteral__Group_3__0 )?
             int alt111=2;
             int LA111_0 = input.LA(1);
 
@@ -40720,9 +40720,9 @@ public final void rule__XSetLiteral__Group__3__Impl() throws RecognitionExceptio
             }
             switch (alt111) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13857:2: rule__XSetLiteral__Group_3__0
+                    // InternalCheck.g:13857:2: rule__XSetLiteral__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__XSetLiteral__Group_3__0_in_rule__XSetLiteral__Group__3__Impl28313);
+                    pushFollow(FOLLOW_2);
                     rule__XSetLiteral__Group_3__0();
 
                     state._fsp--;
@@ -40758,16 +40758,16 @@ public final void rule__XSetLiteral__Group__3__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSetLiteral__Group__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13867:1: rule__XSetLiteral__Group__4 : rule__XSetLiteral__Group__4__Impl ;
+    // InternalCheck.g:13867:1: rule__XSetLiteral__Group__4 : rule__XSetLiteral__Group__4__Impl ;
     public final void rule__XSetLiteral__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13871:1: ( rule__XSetLiteral__Group__4__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13872:2: rule__XSetLiteral__Group__4__Impl
+            // InternalCheck.g:13871:1: ( rule__XSetLiteral__Group__4__Impl )
+            // InternalCheck.g:13872:2: rule__XSetLiteral__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__Group__4__Impl_in_rule__XSetLiteral__Group__428344);
+            pushFollow(FOLLOW_2);
             rule__XSetLiteral__Group__4__Impl();
 
             state._fsp--;
@@ -40791,22 +40791,22 @@ public final void rule__XSetLiteral__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__XSetLiteral__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13878:1: rule__XSetLiteral__Group__4__Impl : ( '}' ) ;
+    // InternalCheck.g:13878:1: rule__XSetLiteral__Group__4__Impl : ( '}' ) ;
     public final void rule__XSetLiteral__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13882:1: ( ( '}' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13883:1: ( '}' )
+            // InternalCheck.g:13882:1: ( ( '}' ) )
+            // InternalCheck.g:13883:1: ( '}' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13883:1: ( '}' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13884:1: '}'
+            // InternalCheck.g:13883:1: ( '}' )
+            // InternalCheck.g:13884:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getRightCurlyBracketKeyword_4()); 
             }
-            match(input,69,FOLLOW_69_in_rule__XSetLiteral__Group__4__Impl28372); if (state.failed) return ;
+            match(input,69,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSetLiteralAccess().getRightCurlyBracketKeyword_4()); 
             }
@@ -40832,21 +40832,21 @@ public final void rule__XSetLiteral__Group__4__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13907:1: rule__XSetLiteral__Group_3__0 : rule__XSetLiteral__Group_3__0__Impl rule__XSetLiteral__Group_3__1 ;
+    // InternalCheck.g:13907:1: rule__XSetLiteral__Group_3__0 : rule__XSetLiteral__Group_3__0__Impl rule__XSetLiteral__Group_3__1 ;
     public final void rule__XSetLiteral__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13911:1: ( rule__XSetLiteral__Group_3__0__Impl rule__XSetLiteral__Group_3__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13912:2: rule__XSetLiteral__Group_3__0__Impl rule__XSetLiteral__Group_3__1
+            // InternalCheck.g:13911:1: ( rule__XSetLiteral__Group_3__0__Impl rule__XSetLiteral__Group_3__1 )
+            // InternalCheck.g:13912:2: rule__XSetLiteral__Group_3__0__Impl rule__XSetLiteral__Group_3__1
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__Group_3__0__Impl_in_rule__XSetLiteral__Group_3__028413);
+            pushFollow(FOLLOW_20);
             rule__XSetLiteral__Group_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSetLiteral__Group_3__1_in_rule__XSetLiteral__Group_3__028416);
+            pushFollow(FOLLOW_2);
             rule__XSetLiteral__Group_3__1();
 
             state._fsp--;
@@ -40870,25 +40870,25 @@ public final void rule__XSetLiteral__Group_3__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13919:1: rule__XSetLiteral__Group_3__0__Impl : ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) ) ;
+    // InternalCheck.g:13919:1: rule__XSetLiteral__Group_3__0__Impl : ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) ) ;
     public final void rule__XSetLiteral__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13923:1: ( ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13924:1: ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) )
+            // InternalCheck.g:13923:1: ( ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) ) )
+            // InternalCheck.g:13924:1: ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13924:1: ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13925:1: ( rule__XSetLiteral__ElementsAssignment_3_0 )
+            // InternalCheck.g:13924:1: ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) )
+            // InternalCheck.g:13925:1: ( rule__XSetLiteral__ElementsAssignment_3_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getElementsAssignment_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13926:1: ( rule__XSetLiteral__ElementsAssignment_3_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13926:2: rule__XSetLiteral__ElementsAssignment_3_0
+            // InternalCheck.g:13926:1: ( rule__XSetLiteral__ElementsAssignment_3_0 )
+            // InternalCheck.g:13926:2: rule__XSetLiteral__ElementsAssignment_3_0
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__ElementsAssignment_3_0_in_rule__XSetLiteral__Group_3__0__Impl28443);
+            pushFollow(FOLLOW_2);
             rule__XSetLiteral__ElementsAssignment_3_0();
 
             state._fsp--;
@@ -40921,16 +40921,16 @@ public final void rule__XSetLiteral__Group_3__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13936:1: rule__XSetLiteral__Group_3__1 : rule__XSetLiteral__Group_3__1__Impl ;
+    // InternalCheck.g:13936:1: rule__XSetLiteral__Group_3__1 : rule__XSetLiteral__Group_3__1__Impl ;
     public final void rule__XSetLiteral__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13940:1: ( rule__XSetLiteral__Group_3__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13941:2: rule__XSetLiteral__Group_3__1__Impl
+            // InternalCheck.g:13940:1: ( rule__XSetLiteral__Group_3__1__Impl )
+            // InternalCheck.g:13941:2: rule__XSetLiteral__Group_3__1__Impl
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__Group_3__1__Impl_in_rule__XSetLiteral__Group_3__128473);
+            pushFollow(FOLLOW_2);
             rule__XSetLiteral__Group_3__1__Impl();
 
             state._fsp--;
@@ -40954,22 +40954,22 @@ public final void rule__XSetLiteral__Group_3__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13947:1: rule__XSetLiteral__Group_3__1__Impl : ( ( rule__XSetLiteral__Group_3_1__0 )* ) ;
+    // InternalCheck.g:13947:1: rule__XSetLiteral__Group_3__1__Impl : ( ( rule__XSetLiteral__Group_3_1__0 )* ) ;
     public final void rule__XSetLiteral__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13951:1: ( ( ( rule__XSetLiteral__Group_3_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13952:1: ( ( rule__XSetLiteral__Group_3_1__0 )* )
+            // InternalCheck.g:13951:1: ( ( ( rule__XSetLiteral__Group_3_1__0 )* ) )
+            // InternalCheck.g:13952:1: ( ( rule__XSetLiteral__Group_3_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13952:1: ( ( rule__XSetLiteral__Group_3_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13953:1: ( rule__XSetLiteral__Group_3_1__0 )*
+            // InternalCheck.g:13952:1: ( ( rule__XSetLiteral__Group_3_1__0 )* )
+            // InternalCheck.g:13953:1: ( rule__XSetLiteral__Group_3_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getGroup_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13954:1: ( rule__XSetLiteral__Group_3_1__0 )*
+            // InternalCheck.g:13954:1: ( rule__XSetLiteral__Group_3_1__0 )*
             loop112:
             do {
                 int alt112=2;
@@ -40982,9 +40982,9 @@ public final void rule__XSetLiteral__Group_3__1__Impl() throws RecognitionExcept
 
                 switch (alt112) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13954:2: rule__XSetLiteral__Group_3_1__0
+            	    // InternalCheck.g:13954:2: rule__XSetLiteral__Group_3_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XSetLiteral__Group_3_1__0_in_rule__XSetLiteral__Group_3__1__Impl28500);
+            	    pushFollow(FOLLOW_21);
             	    rule__XSetLiteral__Group_3_1__0();
 
             	    state._fsp--;
@@ -41023,21 +41023,21 @@ public final void rule__XSetLiteral__Group_3__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13968:1: rule__XSetLiteral__Group_3_1__0 : rule__XSetLiteral__Group_3_1__0__Impl rule__XSetLiteral__Group_3_1__1 ;
+    // InternalCheck.g:13968:1: rule__XSetLiteral__Group_3_1__0 : rule__XSetLiteral__Group_3_1__0__Impl rule__XSetLiteral__Group_3_1__1 ;
     public final void rule__XSetLiteral__Group_3_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13972:1: ( rule__XSetLiteral__Group_3_1__0__Impl rule__XSetLiteral__Group_3_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13973:2: rule__XSetLiteral__Group_3_1__0__Impl rule__XSetLiteral__Group_3_1__1
+            // InternalCheck.g:13972:1: ( rule__XSetLiteral__Group_3_1__0__Impl rule__XSetLiteral__Group_3_1__1 )
+            // InternalCheck.g:13973:2: rule__XSetLiteral__Group_3_1__0__Impl rule__XSetLiteral__Group_3_1__1
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__Group_3_1__0__Impl_in_rule__XSetLiteral__Group_3_1__028535);
+            pushFollow(FOLLOW_32);
             rule__XSetLiteral__Group_3_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSetLiteral__Group_3_1__1_in_rule__XSetLiteral__Group_3_1__028538);
+            pushFollow(FOLLOW_2);
             rule__XSetLiteral__Group_3_1__1();
 
             state._fsp--;
@@ -41061,22 +41061,22 @@ public final void rule__XSetLiteral__Group_3_1__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13980:1: rule__XSetLiteral__Group_3_1__0__Impl : ( ',' ) ;
+    // InternalCheck.g:13980:1: rule__XSetLiteral__Group_3_1__0__Impl : ( ',' ) ;
     public final void rule__XSetLiteral__Group_3_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13984:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13985:1: ( ',' )
+            // InternalCheck.g:13984:1: ( ( ',' ) )
+            // InternalCheck.g:13985:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13985:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13986:1: ','
+            // InternalCheck.g:13985:1: ( ',' )
+            // InternalCheck.g:13986:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getCommaKeyword_3_1_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XSetLiteral__Group_3_1__0__Impl28566); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSetLiteralAccess().getCommaKeyword_3_1_0()); 
             }
@@ -41102,16 +41102,16 @@ public final void rule__XSetLiteral__Group_3_1__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13999:1: rule__XSetLiteral__Group_3_1__1 : rule__XSetLiteral__Group_3_1__1__Impl ;
+    // InternalCheck.g:13999:1: rule__XSetLiteral__Group_3_1__1 : rule__XSetLiteral__Group_3_1__1__Impl ;
     public final void rule__XSetLiteral__Group_3_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14003:1: ( rule__XSetLiteral__Group_3_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14004:2: rule__XSetLiteral__Group_3_1__1__Impl
+            // InternalCheck.g:14003:1: ( rule__XSetLiteral__Group_3_1__1__Impl )
+            // InternalCheck.g:14004:2: rule__XSetLiteral__Group_3_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__Group_3_1__1__Impl_in_rule__XSetLiteral__Group_3_1__128597);
+            pushFollow(FOLLOW_2);
             rule__XSetLiteral__Group_3_1__1__Impl();
 
             state._fsp--;
@@ -41135,25 +41135,25 @@ public final void rule__XSetLiteral__Group_3_1__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14010:1: rule__XSetLiteral__Group_3_1__1__Impl : ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) ) ;
+    // InternalCheck.g:14010:1: rule__XSetLiteral__Group_3_1__1__Impl : ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) ) ;
     public final void rule__XSetLiteral__Group_3_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14014:1: ( ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14015:1: ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) )
+            // InternalCheck.g:14014:1: ( ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) ) )
+            // InternalCheck.g:14015:1: ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14015:1: ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14016:1: ( rule__XSetLiteral__ElementsAssignment_3_1_1 )
+            // InternalCheck.g:14015:1: ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) )
+            // InternalCheck.g:14016:1: ( rule__XSetLiteral__ElementsAssignment_3_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getElementsAssignment_3_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14017:1: ( rule__XSetLiteral__ElementsAssignment_3_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14017:2: rule__XSetLiteral__ElementsAssignment_3_1_1
+            // InternalCheck.g:14017:1: ( rule__XSetLiteral__ElementsAssignment_3_1_1 )
+            // InternalCheck.g:14017:2: rule__XSetLiteral__ElementsAssignment_3_1_1
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__ElementsAssignment_3_1_1_in_rule__XSetLiteral__Group_3_1__1__Impl28624);
+            pushFollow(FOLLOW_2);
             rule__XSetLiteral__ElementsAssignment_3_1_1();
 
             state._fsp--;
@@ -41186,21 +41186,21 @@ public final void rule__XSetLiteral__Group_3_1__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XListLiteral__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14031:1: rule__XListLiteral__Group__0 : rule__XListLiteral__Group__0__Impl rule__XListLiteral__Group__1 ;
+    // InternalCheck.g:14031:1: rule__XListLiteral__Group__0 : rule__XListLiteral__Group__0__Impl rule__XListLiteral__Group__1 ;
     public final void rule__XListLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14035:1: ( rule__XListLiteral__Group__0__Impl rule__XListLiteral__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14036:2: rule__XListLiteral__Group__0__Impl rule__XListLiteral__Group__1
+            // InternalCheck.g:14035:1: ( rule__XListLiteral__Group__0__Impl rule__XListLiteral__Group__1 )
+            // InternalCheck.g:14036:2: rule__XListLiteral__Group__0__Impl rule__XListLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__XListLiteral__Group__0__Impl_in_rule__XListLiteral__Group__028658);
+            pushFollow(FOLLOW_42);
             rule__XListLiteral__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XListLiteral__Group__1_in_rule__XListLiteral__Group__028661);
+            pushFollow(FOLLOW_2);
             rule__XListLiteral__Group__1();
 
             state._fsp--;
@@ -41224,23 +41224,23 @@ public final void rule__XListLiteral__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XListLiteral__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14043:1: rule__XListLiteral__Group__0__Impl : ( () ) ;
+    // InternalCheck.g:14043:1: rule__XListLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XListLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14047:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14048:1: ( () )
+            // InternalCheck.g:14047:1: ( ( () ) )
+            // InternalCheck.g:14048:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14048:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14049:1: ()
+            // InternalCheck.g:14048:1: ( () )
+            // InternalCheck.g:14049:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getXListLiteralAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14050:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14052:1: 
+            // InternalCheck.g:14050:1: ()
+            // InternalCheck.g:14052:1: 
             {
             }
 
@@ -41265,21 +41265,21 @@ public final void rule__XListLiteral__Group__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XListLiteral__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14062:1: rule__XListLiteral__Group__1 : rule__XListLiteral__Group__1__Impl rule__XListLiteral__Group__2 ;
+    // InternalCheck.g:14062:1: rule__XListLiteral__Group__1 : rule__XListLiteral__Group__1__Impl rule__XListLiteral__Group__2 ;
     public final void rule__XListLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14066:1: ( rule__XListLiteral__Group__1__Impl rule__XListLiteral__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14067:2: rule__XListLiteral__Group__1__Impl rule__XListLiteral__Group__2
+            // InternalCheck.g:14066:1: ( rule__XListLiteral__Group__1__Impl rule__XListLiteral__Group__2 )
+            // InternalCheck.g:14067:2: rule__XListLiteral__Group__1__Impl rule__XListLiteral__Group__2
             {
-            pushFollow(FOLLOW_rule__XListLiteral__Group__1__Impl_in_rule__XListLiteral__Group__128719);
+            pushFollow(FOLLOW_38);
             rule__XListLiteral__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XListLiteral__Group__2_in_rule__XListLiteral__Group__128722);
+            pushFollow(FOLLOW_2);
             rule__XListLiteral__Group__2();
 
             state._fsp--;
@@ -41303,22 +41303,22 @@ public final void rule__XListLiteral__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XListLiteral__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14074:1: rule__XListLiteral__Group__1__Impl : ( '#' ) ;
+    // InternalCheck.g:14074:1: rule__XListLiteral__Group__1__Impl : ( '#' ) ;
     public final void rule__XListLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14078:1: ( ( '#' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14079:1: ( '#' )
+            // InternalCheck.g:14078:1: ( ( '#' ) )
+            // InternalCheck.g:14079:1: ( '#' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14079:1: ( '#' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14080:1: '#'
+            // InternalCheck.g:14079:1: ( '#' )
+            // InternalCheck.g:14080:1: '#'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getNumberSignKeyword_1()); 
             }
-            match(input,77,FOLLOW_77_in_rule__XListLiteral__Group__1__Impl28750); if (state.failed) return ;
+            match(input,77,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXListLiteralAccess().getNumberSignKeyword_1()); 
             }
@@ -41344,21 +41344,21 @@ public final void rule__XListLiteral__Group__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XListLiteral__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14093:1: rule__XListLiteral__Group__2 : rule__XListLiteral__Group__2__Impl rule__XListLiteral__Group__3 ;
+    // InternalCheck.g:14093:1: rule__XListLiteral__Group__2 : rule__XListLiteral__Group__2__Impl rule__XListLiteral__Group__3 ;
     public final void rule__XListLiteral__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14097:1: ( rule__XListLiteral__Group__2__Impl rule__XListLiteral__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14098:2: rule__XListLiteral__Group__2__Impl rule__XListLiteral__Group__3
+            // InternalCheck.g:14097:1: ( rule__XListLiteral__Group__2__Impl rule__XListLiteral__Group__3 )
+            // InternalCheck.g:14098:2: rule__XListLiteral__Group__2__Impl rule__XListLiteral__Group__3
             {
-            pushFollow(FOLLOW_rule__XListLiteral__Group__2__Impl_in_rule__XListLiteral__Group__228781);
+            pushFollow(FOLLOW_83);
             rule__XListLiteral__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XListLiteral__Group__3_in_rule__XListLiteral__Group__228784);
+            pushFollow(FOLLOW_2);
             rule__XListLiteral__Group__3();
 
             state._fsp--;
@@ -41382,22 +41382,22 @@ public final void rule__XListLiteral__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XListLiteral__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14105:1: rule__XListLiteral__Group__2__Impl : ( '[' ) ;
+    // InternalCheck.g:14105:1: rule__XListLiteral__Group__2__Impl : ( '[' ) ;
     public final void rule__XListLiteral__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14109:1: ( ( '[' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14110:1: ( '[' )
+            // InternalCheck.g:14109:1: ( ( '[' ) )
+            // InternalCheck.g:14110:1: ( '[' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14110:1: ( '[' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14111:1: '['
+            // InternalCheck.g:14110:1: ( '[' )
+            // InternalCheck.g:14111:1: '['
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getLeftSquareBracketKeyword_2()); 
             }
-            match(input,78,FOLLOW_78_in_rule__XListLiteral__Group__2__Impl28812); if (state.failed) return ;
+            match(input,78,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXListLiteralAccess().getLeftSquareBracketKeyword_2()); 
             }
@@ -41423,21 +41423,21 @@ public final void rule__XListLiteral__Group__2__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XListLiteral__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14124:1: rule__XListLiteral__Group__3 : rule__XListLiteral__Group__3__Impl rule__XListLiteral__Group__4 ;
+    // InternalCheck.g:14124:1: rule__XListLiteral__Group__3 : rule__XListLiteral__Group__3__Impl rule__XListLiteral__Group__4 ;
     public final void rule__XListLiteral__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14128:1: ( rule__XListLiteral__Group__3__Impl rule__XListLiteral__Group__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14129:2: rule__XListLiteral__Group__3__Impl rule__XListLiteral__Group__4
+            // InternalCheck.g:14128:1: ( rule__XListLiteral__Group__3__Impl rule__XListLiteral__Group__4 )
+            // InternalCheck.g:14129:2: rule__XListLiteral__Group__3__Impl rule__XListLiteral__Group__4
             {
-            pushFollow(FOLLOW_rule__XListLiteral__Group__3__Impl_in_rule__XListLiteral__Group__328843);
+            pushFollow(FOLLOW_83);
             rule__XListLiteral__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XListLiteral__Group__4_in_rule__XListLiteral__Group__328846);
+            pushFollow(FOLLOW_2);
             rule__XListLiteral__Group__4();
 
             state._fsp--;
@@ -41461,22 +41461,22 @@ public final void rule__XListLiteral__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XListLiteral__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14136:1: rule__XListLiteral__Group__3__Impl : ( ( rule__XListLiteral__Group_3__0 )? ) ;
+    // InternalCheck.g:14136:1: rule__XListLiteral__Group__3__Impl : ( ( rule__XListLiteral__Group_3__0 )? ) ;
     public final void rule__XListLiteral__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14140:1: ( ( ( rule__XListLiteral__Group_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14141:1: ( ( rule__XListLiteral__Group_3__0 )? )
+            // InternalCheck.g:14140:1: ( ( ( rule__XListLiteral__Group_3__0 )? ) )
+            // InternalCheck.g:14141:1: ( ( rule__XListLiteral__Group_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14141:1: ( ( rule__XListLiteral__Group_3__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14142:1: ( rule__XListLiteral__Group_3__0 )?
+            // InternalCheck.g:14141:1: ( ( rule__XListLiteral__Group_3__0 )? )
+            // InternalCheck.g:14142:1: ( rule__XListLiteral__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getGroup_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14143:1: ( rule__XListLiteral__Group_3__0 )?
+            // InternalCheck.g:14143:1: ( rule__XListLiteral__Group_3__0 )?
             int alt113=2;
             int LA113_0 = input.LA(1);
 
@@ -41485,9 +41485,9 @@ public final void rule__XListLiteral__Group__3__Impl() throws RecognitionExcepti
             }
             switch (alt113) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14143:2: rule__XListLiteral__Group_3__0
+                    // InternalCheck.g:14143:2: rule__XListLiteral__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__XListLiteral__Group_3__0_in_rule__XListLiteral__Group__3__Impl28873);
+                    pushFollow(FOLLOW_2);
                     rule__XListLiteral__Group_3__0();
 
                     state._fsp--;
@@ -41523,16 +41523,16 @@ public final void rule__XListLiteral__Group__3__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XListLiteral__Group__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14153:1: rule__XListLiteral__Group__4 : rule__XListLiteral__Group__4__Impl ;
+    // InternalCheck.g:14153:1: rule__XListLiteral__Group__4 : rule__XListLiteral__Group__4__Impl ;
     public final void rule__XListLiteral__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14157:1: ( rule__XListLiteral__Group__4__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14158:2: rule__XListLiteral__Group__4__Impl
+            // InternalCheck.g:14157:1: ( rule__XListLiteral__Group__4__Impl )
+            // InternalCheck.g:14158:2: rule__XListLiteral__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__XListLiteral__Group__4__Impl_in_rule__XListLiteral__Group__428904);
+            pushFollow(FOLLOW_2);
             rule__XListLiteral__Group__4__Impl();
 
             state._fsp--;
@@ -41556,22 +41556,22 @@ public final void rule__XListLiteral__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__XListLiteral__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14164:1: rule__XListLiteral__Group__4__Impl : ( ']' ) ;
+    // InternalCheck.g:14164:1: rule__XListLiteral__Group__4__Impl : ( ']' ) ;
     public final void rule__XListLiteral__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14168:1: ( ( ']' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14169:1: ( ']' )
+            // InternalCheck.g:14168:1: ( ( ']' ) )
+            // InternalCheck.g:14169:1: ( ']' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14169:1: ( ']' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14170:1: ']'
+            // InternalCheck.g:14169:1: ( ']' )
+            // InternalCheck.g:14170:1: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getRightSquareBracketKeyword_4()); 
             }
-            match(input,79,FOLLOW_79_in_rule__XListLiteral__Group__4__Impl28932); if (state.failed) return ;
+            match(input,79,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXListLiteralAccess().getRightSquareBracketKeyword_4()); 
             }
@@ -41597,21 +41597,21 @@ public final void rule__XListLiteral__Group__4__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XListLiteral__Group_3__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14193:1: rule__XListLiteral__Group_3__0 : rule__XListLiteral__Group_3__0__Impl rule__XListLiteral__Group_3__1 ;
+    // InternalCheck.g:14193:1: rule__XListLiteral__Group_3__0 : rule__XListLiteral__Group_3__0__Impl rule__XListLiteral__Group_3__1 ;
     public final void rule__XListLiteral__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14197:1: ( rule__XListLiteral__Group_3__0__Impl rule__XListLiteral__Group_3__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14198:2: rule__XListLiteral__Group_3__0__Impl rule__XListLiteral__Group_3__1
+            // InternalCheck.g:14197:1: ( rule__XListLiteral__Group_3__0__Impl rule__XListLiteral__Group_3__1 )
+            // InternalCheck.g:14198:2: rule__XListLiteral__Group_3__0__Impl rule__XListLiteral__Group_3__1
             {
-            pushFollow(FOLLOW_rule__XListLiteral__Group_3__0__Impl_in_rule__XListLiteral__Group_3__028973);
+            pushFollow(FOLLOW_20);
             rule__XListLiteral__Group_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XListLiteral__Group_3__1_in_rule__XListLiteral__Group_3__028976);
+            pushFollow(FOLLOW_2);
             rule__XListLiteral__Group_3__1();
 
             state._fsp--;
@@ -41635,25 +41635,25 @@ public final void rule__XListLiteral__Group_3__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XListLiteral__Group_3__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14205:1: rule__XListLiteral__Group_3__0__Impl : ( ( rule__XListLiteral__ElementsAssignment_3_0 ) ) ;
+    // InternalCheck.g:14205:1: rule__XListLiteral__Group_3__0__Impl : ( ( rule__XListLiteral__ElementsAssignment_3_0 ) ) ;
     public final void rule__XListLiteral__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14209:1: ( ( ( rule__XListLiteral__ElementsAssignment_3_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14210:1: ( ( rule__XListLiteral__ElementsAssignment_3_0 ) )
+            // InternalCheck.g:14209:1: ( ( ( rule__XListLiteral__ElementsAssignment_3_0 ) ) )
+            // InternalCheck.g:14210:1: ( ( rule__XListLiteral__ElementsAssignment_3_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14210:1: ( ( rule__XListLiteral__ElementsAssignment_3_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14211:1: ( rule__XListLiteral__ElementsAssignment_3_0 )
+            // InternalCheck.g:14210:1: ( ( rule__XListLiteral__ElementsAssignment_3_0 ) )
+            // InternalCheck.g:14211:1: ( rule__XListLiteral__ElementsAssignment_3_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getElementsAssignment_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14212:1: ( rule__XListLiteral__ElementsAssignment_3_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14212:2: rule__XListLiteral__ElementsAssignment_3_0
+            // InternalCheck.g:14212:1: ( rule__XListLiteral__ElementsAssignment_3_0 )
+            // InternalCheck.g:14212:2: rule__XListLiteral__ElementsAssignment_3_0
             {
-            pushFollow(FOLLOW_rule__XListLiteral__ElementsAssignment_3_0_in_rule__XListLiteral__Group_3__0__Impl29003);
+            pushFollow(FOLLOW_2);
             rule__XListLiteral__ElementsAssignment_3_0();
 
             state._fsp--;
@@ -41686,16 +41686,16 @@ public final void rule__XListLiteral__Group_3__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XListLiteral__Group_3__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14222:1: rule__XListLiteral__Group_3__1 : rule__XListLiteral__Group_3__1__Impl ;
+    // InternalCheck.g:14222:1: rule__XListLiteral__Group_3__1 : rule__XListLiteral__Group_3__1__Impl ;
     public final void rule__XListLiteral__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14226:1: ( rule__XListLiteral__Group_3__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14227:2: rule__XListLiteral__Group_3__1__Impl
+            // InternalCheck.g:14226:1: ( rule__XListLiteral__Group_3__1__Impl )
+            // InternalCheck.g:14227:2: rule__XListLiteral__Group_3__1__Impl
             {
-            pushFollow(FOLLOW_rule__XListLiteral__Group_3__1__Impl_in_rule__XListLiteral__Group_3__129033);
+            pushFollow(FOLLOW_2);
             rule__XListLiteral__Group_3__1__Impl();
 
             state._fsp--;
@@ -41719,22 +41719,22 @@ public final void rule__XListLiteral__Group_3__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XListLiteral__Group_3__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14233:1: rule__XListLiteral__Group_3__1__Impl : ( ( rule__XListLiteral__Group_3_1__0 )* ) ;
+    // InternalCheck.g:14233:1: rule__XListLiteral__Group_3__1__Impl : ( ( rule__XListLiteral__Group_3_1__0 )* ) ;
     public final void rule__XListLiteral__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14237:1: ( ( ( rule__XListLiteral__Group_3_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14238:1: ( ( rule__XListLiteral__Group_3_1__0 )* )
+            // InternalCheck.g:14237:1: ( ( ( rule__XListLiteral__Group_3_1__0 )* ) )
+            // InternalCheck.g:14238:1: ( ( rule__XListLiteral__Group_3_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14238:1: ( ( rule__XListLiteral__Group_3_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14239:1: ( rule__XListLiteral__Group_3_1__0 )*
+            // InternalCheck.g:14238:1: ( ( rule__XListLiteral__Group_3_1__0 )* )
+            // InternalCheck.g:14239:1: ( rule__XListLiteral__Group_3_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getGroup_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14240:1: ( rule__XListLiteral__Group_3_1__0 )*
+            // InternalCheck.g:14240:1: ( rule__XListLiteral__Group_3_1__0 )*
             loop114:
             do {
                 int alt114=2;
@@ -41747,9 +41747,9 @@ public final void rule__XListLiteral__Group_3__1__Impl() throws RecognitionExcep
 
                 switch (alt114) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14240:2: rule__XListLiteral__Group_3_1__0
+            	    // InternalCheck.g:14240:2: rule__XListLiteral__Group_3_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XListLiteral__Group_3_1__0_in_rule__XListLiteral__Group_3__1__Impl29060);
+            	    pushFollow(FOLLOW_21);
             	    rule__XListLiteral__Group_3_1__0();
 
             	    state._fsp--;
@@ -41788,21 +41788,21 @@ public final void rule__XListLiteral__Group_3__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XListLiteral__Group_3_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14254:1: rule__XListLiteral__Group_3_1__0 : rule__XListLiteral__Group_3_1__0__Impl rule__XListLiteral__Group_3_1__1 ;
+    // InternalCheck.g:14254:1: rule__XListLiteral__Group_3_1__0 : rule__XListLiteral__Group_3_1__0__Impl rule__XListLiteral__Group_3_1__1 ;
     public final void rule__XListLiteral__Group_3_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14258:1: ( rule__XListLiteral__Group_3_1__0__Impl rule__XListLiteral__Group_3_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14259:2: rule__XListLiteral__Group_3_1__0__Impl rule__XListLiteral__Group_3_1__1
+            // InternalCheck.g:14258:1: ( rule__XListLiteral__Group_3_1__0__Impl rule__XListLiteral__Group_3_1__1 )
+            // InternalCheck.g:14259:2: rule__XListLiteral__Group_3_1__0__Impl rule__XListLiteral__Group_3_1__1
             {
-            pushFollow(FOLLOW_rule__XListLiteral__Group_3_1__0__Impl_in_rule__XListLiteral__Group_3_1__029095);
+            pushFollow(FOLLOW_32);
             rule__XListLiteral__Group_3_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XListLiteral__Group_3_1__1_in_rule__XListLiteral__Group_3_1__029098);
+            pushFollow(FOLLOW_2);
             rule__XListLiteral__Group_3_1__1();
 
             state._fsp--;
@@ -41826,22 +41826,22 @@ public final void rule__XListLiteral__Group_3_1__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XListLiteral__Group_3_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14266:1: rule__XListLiteral__Group_3_1__0__Impl : ( ',' ) ;
+    // InternalCheck.g:14266:1: rule__XListLiteral__Group_3_1__0__Impl : ( ',' ) ;
     public final void rule__XListLiteral__Group_3_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14270:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14271:1: ( ',' )
+            // InternalCheck.g:14270:1: ( ( ',' ) )
+            // InternalCheck.g:14271:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14271:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14272:1: ','
+            // InternalCheck.g:14271:1: ( ',' )
+            // InternalCheck.g:14272:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getCommaKeyword_3_1_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XListLiteral__Group_3_1__0__Impl29126); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXListLiteralAccess().getCommaKeyword_3_1_0()); 
             }
@@ -41867,16 +41867,16 @@ public final void rule__XListLiteral__Group_3_1__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XListLiteral__Group_3_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14285:1: rule__XListLiteral__Group_3_1__1 : rule__XListLiteral__Group_3_1__1__Impl ;
+    // InternalCheck.g:14285:1: rule__XListLiteral__Group_3_1__1 : rule__XListLiteral__Group_3_1__1__Impl ;
     public final void rule__XListLiteral__Group_3_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14289:1: ( rule__XListLiteral__Group_3_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14290:2: rule__XListLiteral__Group_3_1__1__Impl
+            // InternalCheck.g:14289:1: ( rule__XListLiteral__Group_3_1__1__Impl )
+            // InternalCheck.g:14290:2: rule__XListLiteral__Group_3_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XListLiteral__Group_3_1__1__Impl_in_rule__XListLiteral__Group_3_1__129157);
+            pushFollow(FOLLOW_2);
             rule__XListLiteral__Group_3_1__1__Impl();
 
             state._fsp--;
@@ -41900,25 +41900,25 @@ public final void rule__XListLiteral__Group_3_1__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XListLiteral__Group_3_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14296:1: rule__XListLiteral__Group_3_1__1__Impl : ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) ) ;
+    // InternalCheck.g:14296:1: rule__XListLiteral__Group_3_1__1__Impl : ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) ) ;
     public final void rule__XListLiteral__Group_3_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14300:1: ( ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14301:1: ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) )
+            // InternalCheck.g:14300:1: ( ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) ) )
+            // InternalCheck.g:14301:1: ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14301:1: ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14302:1: ( rule__XListLiteral__ElementsAssignment_3_1_1 )
+            // InternalCheck.g:14301:1: ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) )
+            // InternalCheck.g:14302:1: ( rule__XListLiteral__ElementsAssignment_3_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getElementsAssignment_3_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14303:1: ( rule__XListLiteral__ElementsAssignment_3_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14303:2: rule__XListLiteral__ElementsAssignment_3_1_1
+            // InternalCheck.g:14303:1: ( rule__XListLiteral__ElementsAssignment_3_1_1 )
+            // InternalCheck.g:14303:2: rule__XListLiteral__ElementsAssignment_3_1_1
             {
-            pushFollow(FOLLOW_rule__XListLiteral__ElementsAssignment_3_1_1_in_rule__XListLiteral__Group_3_1__1__Impl29184);
+            pushFollow(FOLLOW_2);
             rule__XListLiteral__ElementsAssignment_3_1_1();
 
             state._fsp--;
@@ -41951,21 +41951,21 @@ public final void rule__XListLiteral__Group_3_1__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XClosure__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14317:1: rule__XClosure__Group__0 : rule__XClosure__Group__0__Impl rule__XClosure__Group__1 ;
+    // InternalCheck.g:14317:1: rule__XClosure__Group__0 : rule__XClosure__Group__0__Impl rule__XClosure__Group__1 ;
     public final void rule__XClosure__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14321:1: ( rule__XClosure__Group__0__Impl rule__XClosure__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14322:2: rule__XClosure__Group__0__Impl rule__XClosure__Group__1
+            // InternalCheck.g:14321:1: ( rule__XClosure__Group__0__Impl rule__XClosure__Group__1 )
+            // InternalCheck.g:14322:2: rule__XClosure__Group__0__Impl rule__XClosure__Group__1
             {
-            pushFollow(FOLLOW_rule__XClosure__Group__0__Impl_in_rule__XClosure__Group__029218);
+            pushFollow(FOLLOW_84);
             rule__XClosure__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XClosure__Group__1_in_rule__XClosure__Group__029221);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group__1();
 
             state._fsp--;
@@ -41989,25 +41989,25 @@ public final void rule__XClosure__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14329:1: rule__XClosure__Group__0__Impl : ( ( rule__XClosure__Group_0__0 ) ) ;
+    // InternalCheck.g:14329:1: rule__XClosure__Group__0__Impl : ( ( rule__XClosure__Group_0__0 ) ) ;
     public final void rule__XClosure__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14333:1: ( ( ( rule__XClosure__Group_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14334:1: ( ( rule__XClosure__Group_0__0 ) )
+            // InternalCheck.g:14333:1: ( ( ( rule__XClosure__Group_0__0 ) ) )
+            // InternalCheck.g:14334:1: ( ( rule__XClosure__Group_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14334:1: ( ( rule__XClosure__Group_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14335:1: ( rule__XClosure__Group_0__0 )
+            // InternalCheck.g:14334:1: ( ( rule__XClosure__Group_0__0 ) )
+            // InternalCheck.g:14335:1: ( rule__XClosure__Group_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getGroup_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14336:1: ( rule__XClosure__Group_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14336:2: rule__XClosure__Group_0__0
+            // InternalCheck.g:14336:1: ( rule__XClosure__Group_0__0 )
+            // InternalCheck.g:14336:2: rule__XClosure__Group_0__0
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_0__0_in_rule__XClosure__Group__0__Impl29248);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group_0__0();
 
             state._fsp--;
@@ -42040,21 +42040,21 @@ public final void rule__XClosure__Group__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14346:1: rule__XClosure__Group__1 : rule__XClosure__Group__1__Impl rule__XClosure__Group__2 ;
+    // InternalCheck.g:14346:1: rule__XClosure__Group__1 : rule__XClosure__Group__1__Impl rule__XClosure__Group__2 ;
     public final void rule__XClosure__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14350:1: ( rule__XClosure__Group__1__Impl rule__XClosure__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14351:2: rule__XClosure__Group__1__Impl rule__XClosure__Group__2
+            // InternalCheck.g:14350:1: ( rule__XClosure__Group__1__Impl rule__XClosure__Group__2 )
+            // InternalCheck.g:14351:2: rule__XClosure__Group__1__Impl rule__XClosure__Group__2
             {
-            pushFollow(FOLLOW_rule__XClosure__Group__1__Impl_in_rule__XClosure__Group__129278);
+            pushFollow(FOLLOW_84);
             rule__XClosure__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XClosure__Group__2_in_rule__XClosure__Group__129281);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group__2();
 
             state._fsp--;
@@ -42078,29 +42078,29 @@ public final void rule__XClosure__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14358:1: rule__XClosure__Group__1__Impl : ( ( rule__XClosure__Group_1__0 )? ) ;
+    // InternalCheck.g:14358:1: rule__XClosure__Group__1__Impl : ( ( rule__XClosure__Group_1__0 )? ) ;
     public final void rule__XClosure__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14362:1: ( ( ( rule__XClosure__Group_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14363:1: ( ( rule__XClosure__Group_1__0 )? )
+            // InternalCheck.g:14362:1: ( ( ( rule__XClosure__Group_1__0 )? ) )
+            // InternalCheck.g:14363:1: ( ( rule__XClosure__Group_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14363:1: ( ( rule__XClosure__Group_1__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14364:1: ( rule__XClosure__Group_1__0 )?
+            // InternalCheck.g:14363:1: ( ( rule__XClosure__Group_1__0 )? )
+            // InternalCheck.g:14364:1: ( rule__XClosure__Group_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14365:1: ( rule__XClosure__Group_1__0 )?
+            // InternalCheck.g:14365:1: ( rule__XClosure__Group_1__0 )?
             int alt115=2;
             alt115 = dfa115.predict(input);
             switch (alt115) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14365:2: rule__XClosure__Group_1__0
+                    // InternalCheck.g:14365:2: rule__XClosure__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__XClosure__Group_1__0_in_rule__XClosure__Group__1__Impl29308);
+                    pushFollow(FOLLOW_2);
                     rule__XClosure__Group_1__0();
 
                     state._fsp--;
@@ -42136,21 +42136,21 @@ public final void rule__XClosure__Group__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14375:1: rule__XClosure__Group__2 : rule__XClosure__Group__2__Impl rule__XClosure__Group__3 ;
+    // InternalCheck.g:14375:1: rule__XClosure__Group__2 : rule__XClosure__Group__2__Impl rule__XClosure__Group__3 ;
     public final void rule__XClosure__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14379:1: ( rule__XClosure__Group__2__Impl rule__XClosure__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14380:2: rule__XClosure__Group__2__Impl rule__XClosure__Group__3
+            // InternalCheck.g:14379:1: ( rule__XClosure__Group__2__Impl rule__XClosure__Group__3 )
+            // InternalCheck.g:14380:2: rule__XClosure__Group__2__Impl rule__XClosure__Group__3
             {
-            pushFollow(FOLLOW_rule__XClosure__Group__2__Impl_in_rule__XClosure__Group__229339);
+            pushFollow(FOLLOW_44);
             rule__XClosure__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XClosure__Group__3_in_rule__XClosure__Group__229342);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group__3();
 
             state._fsp--;
@@ -42174,25 +42174,25 @@ public final void rule__XClosure__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14387:1: rule__XClosure__Group__2__Impl : ( ( rule__XClosure__ExpressionAssignment_2 ) ) ;
+    // InternalCheck.g:14387:1: rule__XClosure__Group__2__Impl : ( ( rule__XClosure__ExpressionAssignment_2 ) ) ;
     public final void rule__XClosure__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14391:1: ( ( ( rule__XClosure__ExpressionAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14392:1: ( ( rule__XClosure__ExpressionAssignment_2 ) )
+            // InternalCheck.g:14391:1: ( ( ( rule__XClosure__ExpressionAssignment_2 ) ) )
+            // InternalCheck.g:14392:1: ( ( rule__XClosure__ExpressionAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14392:1: ( ( rule__XClosure__ExpressionAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14393:1: ( rule__XClosure__ExpressionAssignment_2 )
+            // InternalCheck.g:14392:1: ( ( rule__XClosure__ExpressionAssignment_2 ) )
+            // InternalCheck.g:14393:1: ( rule__XClosure__ExpressionAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getExpressionAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14394:1: ( rule__XClosure__ExpressionAssignment_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14394:2: rule__XClosure__ExpressionAssignment_2
+            // InternalCheck.g:14394:1: ( rule__XClosure__ExpressionAssignment_2 )
+            // InternalCheck.g:14394:2: rule__XClosure__ExpressionAssignment_2
             {
-            pushFollow(FOLLOW_rule__XClosure__ExpressionAssignment_2_in_rule__XClosure__Group__2__Impl29369);
+            pushFollow(FOLLOW_2);
             rule__XClosure__ExpressionAssignment_2();
 
             state._fsp--;
@@ -42225,16 +42225,16 @@ public final void rule__XClosure__Group__2__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14404:1: rule__XClosure__Group__3 : rule__XClosure__Group__3__Impl ;
+    // InternalCheck.g:14404:1: rule__XClosure__Group__3 : rule__XClosure__Group__3__Impl ;
     public final void rule__XClosure__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14408:1: ( rule__XClosure__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14409:2: rule__XClosure__Group__3__Impl
+            // InternalCheck.g:14408:1: ( rule__XClosure__Group__3__Impl )
+            // InternalCheck.g:14409:2: rule__XClosure__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__XClosure__Group__3__Impl_in_rule__XClosure__Group__329399);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group__3__Impl();
 
             state._fsp--;
@@ -42258,22 +42258,22 @@ public final void rule__XClosure__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14415:1: rule__XClosure__Group__3__Impl : ( ']' ) ;
+    // InternalCheck.g:14415:1: rule__XClosure__Group__3__Impl : ( ']' ) ;
     public final void rule__XClosure__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14419:1: ( ( ']' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14420:1: ( ']' )
+            // InternalCheck.g:14419:1: ( ( ']' ) )
+            // InternalCheck.g:14420:1: ( ']' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14420:1: ( ']' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14421:1: ']'
+            // InternalCheck.g:14420:1: ( ']' )
+            // InternalCheck.g:14421:1: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getRightSquareBracketKeyword_3()); 
             }
-            match(input,79,FOLLOW_79_in_rule__XClosure__Group__3__Impl29427); if (state.failed) return ;
+            match(input,79,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXClosureAccess().getRightSquareBracketKeyword_3()); 
             }
@@ -42299,16 +42299,16 @@ public final void rule__XClosure__Group__3__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14442:1: rule__XClosure__Group_0__0 : rule__XClosure__Group_0__0__Impl ;
+    // InternalCheck.g:14442:1: rule__XClosure__Group_0__0 : rule__XClosure__Group_0__0__Impl ;
     public final void rule__XClosure__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14446:1: ( rule__XClosure__Group_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14447:2: rule__XClosure__Group_0__0__Impl
+            // InternalCheck.g:14446:1: ( rule__XClosure__Group_0__0__Impl )
+            // InternalCheck.g:14447:2: rule__XClosure__Group_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_0__0__Impl_in_rule__XClosure__Group_0__029466);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group_0__0__Impl();
 
             state._fsp--;
@@ -42332,25 +42332,25 @@ public final void rule__XClosure__Group_0__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14453:1: rule__XClosure__Group_0__0__Impl : ( ( rule__XClosure__Group_0_0__0 ) ) ;
+    // InternalCheck.g:14453:1: rule__XClosure__Group_0__0__Impl : ( ( rule__XClosure__Group_0_0__0 ) ) ;
     public final void rule__XClosure__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14457:1: ( ( ( rule__XClosure__Group_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14458:1: ( ( rule__XClosure__Group_0_0__0 ) )
+            // InternalCheck.g:14457:1: ( ( ( rule__XClosure__Group_0_0__0 ) ) )
+            // InternalCheck.g:14458:1: ( ( rule__XClosure__Group_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14458:1: ( ( rule__XClosure__Group_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14459:1: ( rule__XClosure__Group_0_0__0 )
+            // InternalCheck.g:14458:1: ( ( rule__XClosure__Group_0_0__0 ) )
+            // InternalCheck.g:14459:1: ( rule__XClosure__Group_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getGroup_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14460:1: ( rule__XClosure__Group_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14460:2: rule__XClosure__Group_0_0__0
+            // InternalCheck.g:14460:1: ( rule__XClosure__Group_0_0__0 )
+            // InternalCheck.g:14460:2: rule__XClosure__Group_0_0__0
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_0_0__0_in_rule__XClosure__Group_0__0__Impl29493);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group_0_0__0();
 
             state._fsp--;
@@ -42383,21 +42383,21 @@ public final void rule__XClosure__Group_0__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__XClosure__Group_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14472:1: rule__XClosure__Group_0_0__0 : rule__XClosure__Group_0_0__0__Impl rule__XClosure__Group_0_0__1 ;
+    // InternalCheck.g:14472:1: rule__XClosure__Group_0_0__0 : rule__XClosure__Group_0_0__0__Impl rule__XClosure__Group_0_0__1 ;
     public final void rule__XClosure__Group_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14476:1: ( rule__XClosure__Group_0_0__0__Impl rule__XClosure__Group_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14477:2: rule__XClosure__Group_0_0__0__Impl rule__XClosure__Group_0_0__1
+            // InternalCheck.g:14476:1: ( rule__XClosure__Group_0_0__0__Impl rule__XClosure__Group_0_0__1 )
+            // InternalCheck.g:14477:2: rule__XClosure__Group_0_0__0__Impl rule__XClosure__Group_0_0__1
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_0_0__0__Impl_in_rule__XClosure__Group_0_0__029525);
+            pushFollow(FOLLOW_38);
             rule__XClosure__Group_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XClosure__Group_0_0__1_in_rule__XClosure__Group_0_0__029528);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group_0_0__1();
 
             state._fsp--;
@@ -42421,23 +42421,23 @@ public final void rule__XClosure__Group_0_0__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14484:1: rule__XClosure__Group_0_0__0__Impl : ( () ) ;
+    // InternalCheck.g:14484:1: rule__XClosure__Group_0_0__0__Impl : ( () ) ;
     public final void rule__XClosure__Group_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14488:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14489:1: ( () )
+            // InternalCheck.g:14488:1: ( ( () ) )
+            // InternalCheck.g:14489:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14489:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14490:1: ()
+            // InternalCheck.g:14489:1: ( () )
+            // InternalCheck.g:14490:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getXClosureAction_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14491:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14493:1: 
+            // InternalCheck.g:14491:1: ()
+            // InternalCheck.g:14493:1: 
             {
             }
 
@@ -42462,16 +42462,16 @@ public final void rule__XClosure__Group_0_0__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XClosure__Group_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14503:1: rule__XClosure__Group_0_0__1 : rule__XClosure__Group_0_0__1__Impl ;
+    // InternalCheck.g:14503:1: rule__XClosure__Group_0_0__1 : rule__XClosure__Group_0_0__1__Impl ;
     public final void rule__XClosure__Group_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14507:1: ( rule__XClosure__Group_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14508:2: rule__XClosure__Group_0_0__1__Impl
+            // InternalCheck.g:14507:1: ( rule__XClosure__Group_0_0__1__Impl )
+            // InternalCheck.g:14508:2: rule__XClosure__Group_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_0_0__1__Impl_in_rule__XClosure__Group_0_0__129586);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group_0_0__1__Impl();
 
             state._fsp--;
@@ -42495,22 +42495,22 @@ public final void rule__XClosure__Group_0_0__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14514:1: rule__XClosure__Group_0_0__1__Impl : ( '[' ) ;
+    // InternalCheck.g:14514:1: rule__XClosure__Group_0_0__1__Impl : ( '[' ) ;
     public final void rule__XClosure__Group_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14518:1: ( ( '[' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14519:1: ( '[' )
+            // InternalCheck.g:14518:1: ( ( '[' ) )
+            // InternalCheck.g:14519:1: ( '[' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14519:1: ( '[' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14520:1: '['
+            // InternalCheck.g:14519:1: ( '[' )
+            // InternalCheck.g:14520:1: '['
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getLeftSquareBracketKeyword_0_0_1()); 
             }
-            match(input,78,FOLLOW_78_in_rule__XClosure__Group_0_0__1__Impl29614); if (state.failed) return ;
+            match(input,78,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXClosureAccess().getLeftSquareBracketKeyword_0_0_1()); 
             }
@@ -42536,16 +42536,16 @@ public final void rule__XClosure__Group_0_0__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XClosure__Group_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14537:1: rule__XClosure__Group_1__0 : rule__XClosure__Group_1__0__Impl ;
+    // InternalCheck.g:14537:1: rule__XClosure__Group_1__0 : rule__XClosure__Group_1__0__Impl ;
     public final void rule__XClosure__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14541:1: ( rule__XClosure__Group_1__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14542:2: rule__XClosure__Group_1__0__Impl
+            // InternalCheck.g:14541:1: ( rule__XClosure__Group_1__0__Impl )
+            // InternalCheck.g:14542:2: rule__XClosure__Group_1__0__Impl
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_1__0__Impl_in_rule__XClosure__Group_1__029649);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group_1__0__Impl();
 
             state._fsp--;
@@ -42569,25 +42569,25 @@ public final void rule__XClosure__Group_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14548:1: rule__XClosure__Group_1__0__Impl : ( ( rule__XClosure__Group_1_0__0 ) ) ;
+    // InternalCheck.g:14548:1: rule__XClosure__Group_1__0__Impl : ( ( rule__XClosure__Group_1_0__0 ) ) ;
     public final void rule__XClosure__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14552:1: ( ( ( rule__XClosure__Group_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14553:1: ( ( rule__XClosure__Group_1_0__0 ) )
+            // InternalCheck.g:14552:1: ( ( ( rule__XClosure__Group_1_0__0 ) ) )
+            // InternalCheck.g:14553:1: ( ( rule__XClosure__Group_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14553:1: ( ( rule__XClosure__Group_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14554:1: ( rule__XClosure__Group_1_0__0 )
+            // InternalCheck.g:14553:1: ( ( rule__XClosure__Group_1_0__0 ) )
+            // InternalCheck.g:14554:1: ( rule__XClosure__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getGroup_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14555:1: ( rule__XClosure__Group_1_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14555:2: rule__XClosure__Group_1_0__0
+            // InternalCheck.g:14555:1: ( rule__XClosure__Group_1_0__0 )
+            // InternalCheck.g:14555:2: rule__XClosure__Group_1_0__0
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_1_0__0_in_rule__XClosure__Group_1__0__Impl29676);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group_1_0__0();
 
             state._fsp--;
@@ -42620,21 +42620,21 @@ public final void rule__XClosure__Group_1__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__XClosure__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14567:1: rule__XClosure__Group_1_0__0 : rule__XClosure__Group_1_0__0__Impl rule__XClosure__Group_1_0__1 ;
+    // InternalCheck.g:14567:1: rule__XClosure__Group_1_0__0 : rule__XClosure__Group_1_0__0__Impl rule__XClosure__Group_1_0__1 ;
     public final void rule__XClosure__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14571:1: ( rule__XClosure__Group_1_0__0__Impl rule__XClosure__Group_1_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14572:2: rule__XClosure__Group_1_0__0__Impl rule__XClosure__Group_1_0__1
+            // InternalCheck.g:14571:1: ( rule__XClosure__Group_1_0__0__Impl rule__XClosure__Group_1_0__1 )
+            // InternalCheck.g:14572:2: rule__XClosure__Group_1_0__0__Impl rule__XClosure__Group_1_0__1
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_1_0__0__Impl_in_rule__XClosure__Group_1_0__029708);
+            pushFollow(FOLLOW_85);
             rule__XClosure__Group_1_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XClosure__Group_1_0__1_in_rule__XClosure__Group_1_0__029711);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group_1_0__1();
 
             state._fsp--;
@@ -42658,22 +42658,22 @@ public final void rule__XClosure__Group_1_0__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14579:1: rule__XClosure__Group_1_0__0__Impl : ( ( rule__XClosure__Group_1_0_0__0 )? ) ;
+    // InternalCheck.g:14579:1: rule__XClosure__Group_1_0__0__Impl : ( ( rule__XClosure__Group_1_0_0__0 )? ) ;
     public final void rule__XClosure__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14583:1: ( ( ( rule__XClosure__Group_1_0_0__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14584:1: ( ( rule__XClosure__Group_1_0_0__0 )? )
+            // InternalCheck.g:14583:1: ( ( ( rule__XClosure__Group_1_0_0__0 )? ) )
+            // InternalCheck.g:14584:1: ( ( rule__XClosure__Group_1_0_0__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14584:1: ( ( rule__XClosure__Group_1_0_0__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14585:1: ( rule__XClosure__Group_1_0_0__0 )?
+            // InternalCheck.g:14584:1: ( ( rule__XClosure__Group_1_0_0__0 )? )
+            // InternalCheck.g:14585:1: ( rule__XClosure__Group_1_0_0__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getGroup_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14586:1: ( rule__XClosure__Group_1_0_0__0 )?
+            // InternalCheck.g:14586:1: ( rule__XClosure__Group_1_0_0__0 )?
             int alt116=2;
             int LA116_0 = input.LA(1);
 
@@ -42682,9 +42682,9 @@ public final void rule__XClosure__Group_1_0__0__Impl() throws RecognitionExcepti
             }
             switch (alt116) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14586:2: rule__XClosure__Group_1_0_0__0
+                    // InternalCheck.g:14586:2: rule__XClosure__Group_1_0_0__0
                     {
-                    pushFollow(FOLLOW_rule__XClosure__Group_1_0_0__0_in_rule__XClosure__Group_1_0__0__Impl29738);
+                    pushFollow(FOLLOW_2);
                     rule__XClosure__Group_1_0_0__0();
 
                     state._fsp--;
@@ -42720,16 +42720,16 @@ public final void rule__XClosure__Group_1_0__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XClosure__Group_1_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14596:1: rule__XClosure__Group_1_0__1 : rule__XClosure__Group_1_0__1__Impl ;
+    // InternalCheck.g:14596:1: rule__XClosure__Group_1_0__1 : rule__XClosure__Group_1_0__1__Impl ;
     public final void rule__XClosure__Group_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14600:1: ( rule__XClosure__Group_1_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14601:2: rule__XClosure__Group_1_0__1__Impl
+            // InternalCheck.g:14600:1: ( rule__XClosure__Group_1_0__1__Impl )
+            // InternalCheck.g:14601:2: rule__XClosure__Group_1_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_1_0__1__Impl_in_rule__XClosure__Group_1_0__129769);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group_1_0__1__Impl();
 
             state._fsp--;
@@ -42753,25 +42753,25 @@ public final void rule__XClosure__Group_1_0__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group_1_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14607:1: rule__XClosure__Group_1_0__1__Impl : ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) ) ;
+    // InternalCheck.g:14607:1: rule__XClosure__Group_1_0__1__Impl : ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) ) ;
     public final void rule__XClosure__Group_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14611:1: ( ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14612:1: ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) )
+            // InternalCheck.g:14611:1: ( ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) ) )
+            // InternalCheck.g:14612:1: ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14612:1: ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14613:1: ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 )
+            // InternalCheck.g:14612:1: ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) )
+            // InternalCheck.g:14613:1: ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getExplicitSyntaxAssignment_1_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14614:1: ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14614:2: rule__XClosure__ExplicitSyntaxAssignment_1_0_1
+            // InternalCheck.g:14614:1: ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 )
+            // InternalCheck.g:14614:2: rule__XClosure__ExplicitSyntaxAssignment_1_0_1
             {
-            pushFollow(FOLLOW_rule__XClosure__ExplicitSyntaxAssignment_1_0_1_in_rule__XClosure__Group_1_0__1__Impl29796);
+            pushFollow(FOLLOW_2);
             rule__XClosure__ExplicitSyntaxAssignment_1_0_1();
 
             state._fsp--;
@@ -42804,21 +42804,21 @@ public final void rule__XClosure__Group_1_0__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14628:1: rule__XClosure__Group_1_0_0__0 : rule__XClosure__Group_1_0_0__0__Impl rule__XClosure__Group_1_0_0__1 ;
+    // InternalCheck.g:14628:1: rule__XClosure__Group_1_0_0__0 : rule__XClosure__Group_1_0_0__0__Impl rule__XClosure__Group_1_0_0__1 ;
     public final void rule__XClosure__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14632:1: ( rule__XClosure__Group_1_0_0__0__Impl rule__XClosure__Group_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14633:2: rule__XClosure__Group_1_0_0__0__Impl rule__XClosure__Group_1_0_0__1
+            // InternalCheck.g:14632:1: ( rule__XClosure__Group_1_0_0__0__Impl rule__XClosure__Group_1_0_0__1 )
+            // InternalCheck.g:14633:2: rule__XClosure__Group_1_0_0__0__Impl rule__XClosure__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_1_0_0__0__Impl_in_rule__XClosure__Group_1_0_0__029830);
+            pushFollow(FOLLOW_20);
             rule__XClosure__Group_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XClosure__Group_1_0_0__1_in_rule__XClosure__Group_1_0_0__029833);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group_1_0_0__1();
 
             state._fsp--;
@@ -42842,25 +42842,25 @@ public final void rule__XClosure__Group_1_0_0__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14640:1: rule__XClosure__Group_1_0_0__0__Impl : ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) ) ;
+    // InternalCheck.g:14640:1: rule__XClosure__Group_1_0_0__0__Impl : ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) ) ;
     public final void rule__XClosure__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14644:1: ( ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14645:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) )
+            // InternalCheck.g:14644:1: ( ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) ) )
+            // InternalCheck.g:14645:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14645:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14646:1: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 )
+            // InternalCheck.g:14645:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) )
+            // InternalCheck.g:14646:1: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getDeclaredFormalParametersAssignment_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14647:1: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14647:2: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0
+            // InternalCheck.g:14647:1: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 )
+            // InternalCheck.g:14647:2: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0
             {
-            pushFollow(FOLLOW_rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0_in_rule__XClosure__Group_1_0_0__0__Impl29860);
+            pushFollow(FOLLOW_2);
             rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0();
 
             state._fsp--;
@@ -42893,16 +42893,16 @@ public final void rule__XClosure__Group_1_0_0__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14657:1: rule__XClosure__Group_1_0_0__1 : rule__XClosure__Group_1_0_0__1__Impl ;
+    // InternalCheck.g:14657:1: rule__XClosure__Group_1_0_0__1 : rule__XClosure__Group_1_0_0__1__Impl ;
     public final void rule__XClosure__Group_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14661:1: ( rule__XClosure__Group_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14662:2: rule__XClosure__Group_1_0_0__1__Impl
+            // InternalCheck.g:14661:1: ( rule__XClosure__Group_1_0_0__1__Impl )
+            // InternalCheck.g:14662:2: rule__XClosure__Group_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_1_0_0__1__Impl_in_rule__XClosure__Group_1_0_0__129890);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group_1_0_0__1__Impl();
 
             state._fsp--;
@@ -42926,22 +42926,22 @@ public final void rule__XClosure__Group_1_0_0__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14668:1: rule__XClosure__Group_1_0_0__1__Impl : ( ( rule__XClosure__Group_1_0_0_1__0 )* ) ;
+    // InternalCheck.g:14668:1: rule__XClosure__Group_1_0_0__1__Impl : ( ( rule__XClosure__Group_1_0_0_1__0 )* ) ;
     public final void rule__XClosure__Group_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14672:1: ( ( ( rule__XClosure__Group_1_0_0_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14673:1: ( ( rule__XClosure__Group_1_0_0_1__0 )* )
+            // InternalCheck.g:14672:1: ( ( ( rule__XClosure__Group_1_0_0_1__0 )* ) )
+            // InternalCheck.g:14673:1: ( ( rule__XClosure__Group_1_0_0_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14673:1: ( ( rule__XClosure__Group_1_0_0_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14674:1: ( rule__XClosure__Group_1_0_0_1__0 )*
+            // InternalCheck.g:14673:1: ( ( rule__XClosure__Group_1_0_0_1__0 )* )
+            // InternalCheck.g:14674:1: ( rule__XClosure__Group_1_0_0_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getGroup_1_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14675:1: ( rule__XClosure__Group_1_0_0_1__0 )*
+            // InternalCheck.g:14675:1: ( rule__XClosure__Group_1_0_0_1__0 )*
             loop117:
             do {
                 int alt117=2;
@@ -42954,9 +42954,9 @@ public final void rule__XClosure__Group_1_0_0__1__Impl() throws RecognitionExcep
 
                 switch (alt117) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14675:2: rule__XClosure__Group_1_0_0_1__0
+            	    // InternalCheck.g:14675:2: rule__XClosure__Group_1_0_0_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XClosure__Group_1_0_0_1__0_in_rule__XClosure__Group_1_0_0__1__Impl29917);
+            	    pushFollow(FOLLOW_21);
             	    rule__XClosure__Group_1_0_0_1__0();
 
             	    state._fsp--;
@@ -42995,21 +42995,21 @@ public final void rule__XClosure__Group_1_0_0__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14689:1: rule__XClosure__Group_1_0_0_1__0 : rule__XClosure__Group_1_0_0_1__0__Impl rule__XClosure__Group_1_0_0_1__1 ;
+    // InternalCheck.g:14689:1: rule__XClosure__Group_1_0_0_1__0 : rule__XClosure__Group_1_0_0_1__0__Impl rule__XClosure__Group_1_0_0_1__1 ;
     public final void rule__XClosure__Group_1_0_0_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14693:1: ( rule__XClosure__Group_1_0_0_1__0__Impl rule__XClosure__Group_1_0_0_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14694:2: rule__XClosure__Group_1_0_0_1__0__Impl rule__XClosure__Group_1_0_0_1__1
+            // InternalCheck.g:14693:1: ( rule__XClosure__Group_1_0_0_1__0__Impl rule__XClosure__Group_1_0_0_1__1 )
+            // InternalCheck.g:14694:2: rule__XClosure__Group_1_0_0_1__0__Impl rule__XClosure__Group_1_0_0_1__1
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_1_0_0_1__0__Impl_in_rule__XClosure__Group_1_0_0_1__029952);
+            pushFollow(FOLLOW_29);
             rule__XClosure__Group_1_0_0_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XClosure__Group_1_0_0_1__1_in_rule__XClosure__Group_1_0_0_1__029955);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group_1_0_0_1__1();
 
             state._fsp--;
@@ -43033,22 +43033,22 @@ public final void rule__XClosure__Group_1_0_0_1__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14701:1: rule__XClosure__Group_1_0_0_1__0__Impl : ( ',' ) ;
+    // InternalCheck.g:14701:1: rule__XClosure__Group_1_0_0_1__0__Impl : ( ',' ) ;
     public final void rule__XClosure__Group_1_0_0_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14705:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14706:1: ( ',' )
+            // InternalCheck.g:14705:1: ( ( ',' ) )
+            // InternalCheck.g:14706:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14706:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14707:1: ','
+            // InternalCheck.g:14706:1: ( ',' )
+            // InternalCheck.g:14707:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getCommaKeyword_1_0_0_1_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XClosure__Group_1_0_0_1__0__Impl29983); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXClosureAccess().getCommaKeyword_1_0_0_1_0()); 
             }
@@ -43074,16 +43074,16 @@ public final void rule__XClosure__Group_1_0_0_1__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14720:1: rule__XClosure__Group_1_0_0_1__1 : rule__XClosure__Group_1_0_0_1__1__Impl ;
+    // InternalCheck.g:14720:1: rule__XClosure__Group_1_0_0_1__1 : rule__XClosure__Group_1_0_0_1__1__Impl ;
     public final void rule__XClosure__Group_1_0_0_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14724:1: ( rule__XClosure__Group_1_0_0_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14725:2: rule__XClosure__Group_1_0_0_1__1__Impl
+            // InternalCheck.g:14724:1: ( rule__XClosure__Group_1_0_0_1__1__Impl )
+            // InternalCheck.g:14725:2: rule__XClosure__Group_1_0_0_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_1_0_0_1__1__Impl_in_rule__XClosure__Group_1_0_0_1__130014);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group_1_0_0_1__1__Impl();
 
             state._fsp--;
@@ -43107,25 +43107,25 @@ public final void rule__XClosure__Group_1_0_0_1__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14731:1: rule__XClosure__Group_1_0_0_1__1__Impl : ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) ) ;
+    // InternalCheck.g:14731:1: rule__XClosure__Group_1_0_0_1__1__Impl : ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) ) ;
     public final void rule__XClosure__Group_1_0_0_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14735:1: ( ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14736:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) )
+            // InternalCheck.g:14735:1: ( ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) ) )
+            // InternalCheck.g:14736:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14736:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14737:1: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 )
+            // InternalCheck.g:14736:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) )
+            // InternalCheck.g:14737:1: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getDeclaredFormalParametersAssignment_1_0_0_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14738:1: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14738:2: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1
+            // InternalCheck.g:14738:1: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 )
+            // InternalCheck.g:14738:2: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1
             {
-            pushFollow(FOLLOW_rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1_in_rule__XClosure__Group_1_0_0_1__1__Impl30041);
+            pushFollow(FOLLOW_2);
             rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1();
 
             state._fsp--;
@@ -43158,21 +43158,21 @@ public final void rule__XClosure__Group_1_0_0_1__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14752:1: rule__XExpressionInClosure__Group__0 : rule__XExpressionInClosure__Group__0__Impl rule__XExpressionInClosure__Group__1 ;
+    // InternalCheck.g:14752:1: rule__XExpressionInClosure__Group__0 : rule__XExpressionInClosure__Group__0__Impl rule__XExpressionInClosure__Group__1 ;
     public final void rule__XExpressionInClosure__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14756:1: ( rule__XExpressionInClosure__Group__0__Impl rule__XExpressionInClosure__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14757:2: rule__XExpressionInClosure__Group__0__Impl rule__XExpressionInClosure__Group__1
+            // InternalCheck.g:14756:1: ( rule__XExpressionInClosure__Group__0__Impl rule__XExpressionInClosure__Group__1 )
+            // InternalCheck.g:14757:2: rule__XExpressionInClosure__Group__0__Impl rule__XExpressionInClosure__Group__1
             {
-            pushFollow(FOLLOW_rule__XExpressionInClosure__Group__0__Impl_in_rule__XExpressionInClosure__Group__030075);
+            pushFollow(FOLLOW_84);
             rule__XExpressionInClosure__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XExpressionInClosure__Group__1_in_rule__XExpressionInClosure__Group__030078);
+            pushFollow(FOLLOW_2);
             rule__XExpressionInClosure__Group__1();
 
             state._fsp--;
@@ -43196,23 +43196,23 @@ public final void rule__XExpressionInClosure__Group__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14764:1: rule__XExpressionInClosure__Group__0__Impl : ( () ) ;
+    // InternalCheck.g:14764:1: rule__XExpressionInClosure__Group__0__Impl : ( () ) ;
     public final void rule__XExpressionInClosure__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14768:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14769:1: ( () )
+            // InternalCheck.g:14768:1: ( ( () ) )
+            // InternalCheck.g:14769:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14769:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14770:1: ()
+            // InternalCheck.g:14769:1: ( () )
+            // InternalCheck.g:14770:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionInClosureAccess().getXBlockExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14771:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14773:1: 
+            // InternalCheck.g:14771:1: ()
+            // InternalCheck.g:14773:1: 
             {
             }
 
@@ -43237,16 +43237,16 @@ public final void rule__XExpressionInClosure__Group__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14783:1: rule__XExpressionInClosure__Group__1 : rule__XExpressionInClosure__Group__1__Impl ;
+    // InternalCheck.g:14783:1: rule__XExpressionInClosure__Group__1 : rule__XExpressionInClosure__Group__1__Impl ;
     public final void rule__XExpressionInClosure__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14787:1: ( rule__XExpressionInClosure__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14788:2: rule__XExpressionInClosure__Group__1__Impl
+            // InternalCheck.g:14787:1: ( rule__XExpressionInClosure__Group__1__Impl )
+            // InternalCheck.g:14788:2: rule__XExpressionInClosure__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XExpressionInClosure__Group__1__Impl_in_rule__XExpressionInClosure__Group__130136);
+            pushFollow(FOLLOW_2);
             rule__XExpressionInClosure__Group__1__Impl();
 
             state._fsp--;
@@ -43270,22 +43270,22 @@ public final void rule__XExpressionInClosure__Group__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14794:1: rule__XExpressionInClosure__Group__1__Impl : ( ( rule__XExpressionInClosure__Group_1__0 )* ) ;
+    // InternalCheck.g:14794:1: rule__XExpressionInClosure__Group__1__Impl : ( ( rule__XExpressionInClosure__Group_1__0 )* ) ;
     public final void rule__XExpressionInClosure__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14798:1: ( ( ( rule__XExpressionInClosure__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14799:1: ( ( rule__XExpressionInClosure__Group_1__0 )* )
+            // InternalCheck.g:14798:1: ( ( ( rule__XExpressionInClosure__Group_1__0 )* ) )
+            // InternalCheck.g:14799:1: ( ( rule__XExpressionInClosure__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14799:1: ( ( rule__XExpressionInClosure__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14800:1: ( rule__XExpressionInClosure__Group_1__0 )*
+            // InternalCheck.g:14799:1: ( ( rule__XExpressionInClosure__Group_1__0 )* )
+            // InternalCheck.g:14800:1: ( rule__XExpressionInClosure__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionInClosureAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14801:1: ( rule__XExpressionInClosure__Group_1__0 )*
+            // InternalCheck.g:14801:1: ( rule__XExpressionInClosure__Group_1__0 )*
             loop118:
             do {
                 int alt118=2;
@@ -43298,9 +43298,9 @@ public final void rule__XExpressionInClosure__Group__1__Impl() throws Recognitio
 
                 switch (alt118) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14801:2: rule__XExpressionInClosure__Group_1__0
+            	    // InternalCheck.g:14801:2: rule__XExpressionInClosure__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XExpressionInClosure__Group_1__0_in_rule__XExpressionInClosure__Group__1__Impl30163);
+            	    pushFollow(FOLLOW_86);
             	    rule__XExpressionInClosure__Group_1__0();
 
             	    state._fsp--;
@@ -43339,21 +43339,21 @@ public final void rule__XExpressionInClosure__Group__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14815:1: rule__XExpressionInClosure__Group_1__0 : rule__XExpressionInClosure__Group_1__0__Impl rule__XExpressionInClosure__Group_1__1 ;
+    // InternalCheck.g:14815:1: rule__XExpressionInClosure__Group_1__0 : rule__XExpressionInClosure__Group_1__0__Impl rule__XExpressionInClosure__Group_1__1 ;
     public final void rule__XExpressionInClosure__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14819:1: ( rule__XExpressionInClosure__Group_1__0__Impl rule__XExpressionInClosure__Group_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14820:2: rule__XExpressionInClosure__Group_1__0__Impl rule__XExpressionInClosure__Group_1__1
+            // InternalCheck.g:14819:1: ( rule__XExpressionInClosure__Group_1__0__Impl rule__XExpressionInClosure__Group_1__1 )
+            // InternalCheck.g:14820:2: rule__XExpressionInClosure__Group_1__0__Impl rule__XExpressionInClosure__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XExpressionInClosure__Group_1__0__Impl_in_rule__XExpressionInClosure__Group_1__030198);
+            pushFollow(FOLLOW_12);
             rule__XExpressionInClosure__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XExpressionInClosure__Group_1__1_in_rule__XExpressionInClosure__Group_1__030201);
+            pushFollow(FOLLOW_2);
             rule__XExpressionInClosure__Group_1__1();
 
             state._fsp--;
@@ -43377,25 +43377,25 @@ public final void rule__XExpressionInClosure__Group_1__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14827:1: rule__XExpressionInClosure__Group_1__0__Impl : ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) ) ;
+    // InternalCheck.g:14827:1: rule__XExpressionInClosure__Group_1__0__Impl : ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) ) ;
     public final void rule__XExpressionInClosure__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14831:1: ( ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14832:1: ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) )
+            // InternalCheck.g:14831:1: ( ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) ) )
+            // InternalCheck.g:14832:1: ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14832:1: ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14833:1: ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 )
+            // InternalCheck.g:14832:1: ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) )
+            // InternalCheck.g:14833:1: ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionInClosureAccess().getExpressionsAssignment_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14834:1: ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14834:2: rule__XExpressionInClosure__ExpressionsAssignment_1_0
+            // InternalCheck.g:14834:1: ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 )
+            // InternalCheck.g:14834:2: rule__XExpressionInClosure__ExpressionsAssignment_1_0
             {
-            pushFollow(FOLLOW_rule__XExpressionInClosure__ExpressionsAssignment_1_0_in_rule__XExpressionInClosure__Group_1__0__Impl30228);
+            pushFollow(FOLLOW_2);
             rule__XExpressionInClosure__ExpressionsAssignment_1_0();
 
             state._fsp--;
@@ -43428,16 +43428,16 @@ public final void rule__XExpressionInClosure__Group_1__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14844:1: rule__XExpressionInClosure__Group_1__1 : rule__XExpressionInClosure__Group_1__1__Impl ;
+    // InternalCheck.g:14844:1: rule__XExpressionInClosure__Group_1__1 : rule__XExpressionInClosure__Group_1__1__Impl ;
     public final void rule__XExpressionInClosure__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14848:1: ( rule__XExpressionInClosure__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14849:2: rule__XExpressionInClosure__Group_1__1__Impl
+            // InternalCheck.g:14848:1: ( rule__XExpressionInClosure__Group_1__1__Impl )
+            // InternalCheck.g:14849:2: rule__XExpressionInClosure__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XExpressionInClosure__Group_1__1__Impl_in_rule__XExpressionInClosure__Group_1__130258);
+            pushFollow(FOLLOW_2);
             rule__XExpressionInClosure__Group_1__1__Impl();
 
             state._fsp--;
@@ -43461,22 +43461,22 @@ public final void rule__XExpressionInClosure__Group_1__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14855:1: rule__XExpressionInClosure__Group_1__1__Impl : ( ( ';' )? ) ;
+    // InternalCheck.g:14855:1: rule__XExpressionInClosure__Group_1__1__Impl : ( ( ';' )? ) ;
     public final void rule__XExpressionInClosure__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14859:1: ( ( ( ';' )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14860:1: ( ( ';' )? )
+            // InternalCheck.g:14859:1: ( ( ( ';' )? ) )
+            // InternalCheck.g:14860:1: ( ( ';' )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14860:1: ( ( ';' )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14861:1: ( ';' )?
+            // InternalCheck.g:14860:1: ( ( ';' )? )
+            // InternalCheck.g:14861:1: ( ';' )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionInClosureAccess().getSemicolonKeyword_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14862:1: ( ';' )?
+            // InternalCheck.g:14862:1: ( ';' )?
             int alt119=2;
             int LA119_0 = input.LA(1);
 
@@ -43485,9 +43485,9 @@ public final void rule__XExpressionInClosure__Group_1__1__Impl() throws Recognit
             }
             switch (alt119) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14863:2: ';'
+                    // InternalCheck.g:14863:2: ';'
                     {
-                    match(input,71,FOLLOW_71_in_rule__XExpressionInClosure__Group_1__1__Impl30287); if (state.failed) return ;
+                    match(input,71,FOLLOW_2); if (state.failed) return ;
 
                     }
                     break;
@@ -43519,21 +43519,21 @@ public final void rule__XExpressionInClosure__Group_1__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XShortClosure__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14878:1: rule__XShortClosure__Group__0 : rule__XShortClosure__Group__0__Impl rule__XShortClosure__Group__1 ;
+    // InternalCheck.g:14878:1: rule__XShortClosure__Group__0 : rule__XShortClosure__Group__0__Impl rule__XShortClosure__Group__1 ;
     public final void rule__XShortClosure__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14882:1: ( rule__XShortClosure__Group__0__Impl rule__XShortClosure__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14883:2: rule__XShortClosure__Group__0__Impl rule__XShortClosure__Group__1
+            // InternalCheck.g:14882:1: ( rule__XShortClosure__Group__0__Impl rule__XShortClosure__Group__1 )
+            // InternalCheck.g:14883:2: rule__XShortClosure__Group__0__Impl rule__XShortClosure__Group__1
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group__0__Impl_in_rule__XShortClosure__Group__030324);
+            pushFollow(FOLLOW_32);
             rule__XShortClosure__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XShortClosure__Group__1_in_rule__XShortClosure__Group__030327);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__Group__1();
 
             state._fsp--;
@@ -43557,25 +43557,25 @@ public final void rule__XShortClosure__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XShortClosure__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14890:1: rule__XShortClosure__Group__0__Impl : ( ( rule__XShortClosure__Group_0__0 ) ) ;
+    // InternalCheck.g:14890:1: rule__XShortClosure__Group__0__Impl : ( ( rule__XShortClosure__Group_0__0 ) ) ;
     public final void rule__XShortClosure__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14894:1: ( ( ( rule__XShortClosure__Group_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14895:1: ( ( rule__XShortClosure__Group_0__0 ) )
+            // InternalCheck.g:14894:1: ( ( ( rule__XShortClosure__Group_0__0 ) ) )
+            // InternalCheck.g:14895:1: ( ( rule__XShortClosure__Group_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14895:1: ( ( rule__XShortClosure__Group_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14896:1: ( rule__XShortClosure__Group_0__0 )
+            // InternalCheck.g:14895:1: ( ( rule__XShortClosure__Group_0__0 ) )
+            // InternalCheck.g:14896:1: ( rule__XShortClosure__Group_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getGroup_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14897:1: ( rule__XShortClosure__Group_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14897:2: rule__XShortClosure__Group_0__0
+            // InternalCheck.g:14897:1: ( rule__XShortClosure__Group_0__0 )
+            // InternalCheck.g:14897:2: rule__XShortClosure__Group_0__0
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0__0_in_rule__XShortClosure__Group__0__Impl30354);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__Group_0__0();
 
             state._fsp--;
@@ -43608,16 +43608,16 @@ public final void rule__XShortClosure__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XShortClosure__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14907:1: rule__XShortClosure__Group__1 : rule__XShortClosure__Group__1__Impl ;
+    // InternalCheck.g:14907:1: rule__XShortClosure__Group__1 : rule__XShortClosure__Group__1__Impl ;
     public final void rule__XShortClosure__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14911:1: ( rule__XShortClosure__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14912:2: rule__XShortClosure__Group__1__Impl
+            // InternalCheck.g:14911:1: ( rule__XShortClosure__Group__1__Impl )
+            // InternalCheck.g:14912:2: rule__XShortClosure__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group__1__Impl_in_rule__XShortClosure__Group__130384);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__Group__1__Impl();
 
             state._fsp--;
@@ -43641,25 +43641,25 @@ public final void rule__XShortClosure__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XShortClosure__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14918:1: rule__XShortClosure__Group__1__Impl : ( ( rule__XShortClosure__ExpressionAssignment_1 ) ) ;
+    // InternalCheck.g:14918:1: rule__XShortClosure__Group__1__Impl : ( ( rule__XShortClosure__ExpressionAssignment_1 ) ) ;
     public final void rule__XShortClosure__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14922:1: ( ( ( rule__XShortClosure__ExpressionAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14923:1: ( ( rule__XShortClosure__ExpressionAssignment_1 ) )
+            // InternalCheck.g:14922:1: ( ( ( rule__XShortClosure__ExpressionAssignment_1 ) ) )
+            // InternalCheck.g:14923:1: ( ( rule__XShortClosure__ExpressionAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14923:1: ( ( rule__XShortClosure__ExpressionAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14924:1: ( rule__XShortClosure__ExpressionAssignment_1 )
+            // InternalCheck.g:14923:1: ( ( rule__XShortClosure__ExpressionAssignment_1 ) )
+            // InternalCheck.g:14924:1: ( rule__XShortClosure__ExpressionAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getExpressionAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14925:1: ( rule__XShortClosure__ExpressionAssignment_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14925:2: rule__XShortClosure__ExpressionAssignment_1
+            // InternalCheck.g:14925:1: ( rule__XShortClosure__ExpressionAssignment_1 )
+            // InternalCheck.g:14925:2: rule__XShortClosure__ExpressionAssignment_1
             {
-            pushFollow(FOLLOW_rule__XShortClosure__ExpressionAssignment_1_in_rule__XShortClosure__Group__1__Impl30411);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__ExpressionAssignment_1();
 
             state._fsp--;
@@ -43692,16 +43692,16 @@ public final void rule__XShortClosure__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XShortClosure__Group_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14939:1: rule__XShortClosure__Group_0__0 : rule__XShortClosure__Group_0__0__Impl ;
+    // InternalCheck.g:14939:1: rule__XShortClosure__Group_0__0 : rule__XShortClosure__Group_0__0__Impl ;
     public final void rule__XShortClosure__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14943:1: ( rule__XShortClosure__Group_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14944:2: rule__XShortClosure__Group_0__0__Impl
+            // InternalCheck.g:14943:1: ( rule__XShortClosure__Group_0__0__Impl )
+            // InternalCheck.g:14944:2: rule__XShortClosure__Group_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0__0__Impl_in_rule__XShortClosure__Group_0__030445);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__Group_0__0__Impl();
 
             state._fsp--;
@@ -43725,25 +43725,25 @@ public final void rule__XShortClosure__Group_0__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XShortClosure__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14950:1: rule__XShortClosure__Group_0__0__Impl : ( ( rule__XShortClosure__Group_0_0__0 ) ) ;
+    // InternalCheck.g:14950:1: rule__XShortClosure__Group_0__0__Impl : ( ( rule__XShortClosure__Group_0_0__0 ) ) ;
     public final void rule__XShortClosure__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14954:1: ( ( ( rule__XShortClosure__Group_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14955:1: ( ( rule__XShortClosure__Group_0_0__0 ) )
+            // InternalCheck.g:14954:1: ( ( ( rule__XShortClosure__Group_0_0__0 ) ) )
+            // InternalCheck.g:14955:1: ( ( rule__XShortClosure__Group_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14955:1: ( ( rule__XShortClosure__Group_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14956:1: ( rule__XShortClosure__Group_0_0__0 )
+            // InternalCheck.g:14955:1: ( ( rule__XShortClosure__Group_0_0__0 ) )
+            // InternalCheck.g:14956:1: ( rule__XShortClosure__Group_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getGroup_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14957:1: ( rule__XShortClosure__Group_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14957:2: rule__XShortClosure__Group_0_0__0
+            // InternalCheck.g:14957:1: ( rule__XShortClosure__Group_0_0__0 )
+            // InternalCheck.g:14957:2: rule__XShortClosure__Group_0_0__0
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0__0_in_rule__XShortClosure__Group_0__0__Impl30472);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__Group_0_0__0();
 
             state._fsp--;
@@ -43776,21 +43776,21 @@ public final void rule__XShortClosure__Group_0__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14969:1: rule__XShortClosure__Group_0_0__0 : rule__XShortClosure__Group_0_0__0__Impl rule__XShortClosure__Group_0_0__1 ;
+    // InternalCheck.g:14969:1: rule__XShortClosure__Group_0_0__0 : rule__XShortClosure__Group_0_0__0__Impl rule__XShortClosure__Group_0_0__1 ;
     public final void rule__XShortClosure__Group_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14973:1: ( rule__XShortClosure__Group_0_0__0__Impl rule__XShortClosure__Group_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14974:2: rule__XShortClosure__Group_0_0__0__Impl rule__XShortClosure__Group_0_0__1
+            // InternalCheck.g:14973:1: ( rule__XShortClosure__Group_0_0__0__Impl rule__XShortClosure__Group_0_0__1 )
+            // InternalCheck.g:14974:2: rule__XShortClosure__Group_0_0__0__Impl rule__XShortClosure__Group_0_0__1
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0__0__Impl_in_rule__XShortClosure__Group_0_0__030504);
+            pushFollow(FOLLOW_85);
             rule__XShortClosure__Group_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0__1_in_rule__XShortClosure__Group_0_0__030507);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__Group_0_0__1();
 
             state._fsp--;
@@ -43814,23 +43814,23 @@ public final void rule__XShortClosure__Group_0_0__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14981:1: rule__XShortClosure__Group_0_0__0__Impl : ( () ) ;
+    // InternalCheck.g:14981:1: rule__XShortClosure__Group_0_0__0__Impl : ( () ) ;
     public final void rule__XShortClosure__Group_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14985:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14986:1: ( () )
+            // InternalCheck.g:14985:1: ( ( () ) )
+            // InternalCheck.g:14986:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14986:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14987:1: ()
+            // InternalCheck.g:14986:1: ( () )
+            // InternalCheck.g:14987:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getXClosureAction_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14988:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14990:1: 
+            // InternalCheck.g:14988:1: ()
+            // InternalCheck.g:14990:1: 
             {
             }
 
@@ -43855,21 +43855,21 @@ public final void rule__XShortClosure__Group_0_0__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15000:1: rule__XShortClosure__Group_0_0__1 : rule__XShortClosure__Group_0_0__1__Impl rule__XShortClosure__Group_0_0__2 ;
+    // InternalCheck.g:15000:1: rule__XShortClosure__Group_0_0__1 : rule__XShortClosure__Group_0_0__1__Impl rule__XShortClosure__Group_0_0__2 ;
     public final void rule__XShortClosure__Group_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15004:1: ( rule__XShortClosure__Group_0_0__1__Impl rule__XShortClosure__Group_0_0__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15005:2: rule__XShortClosure__Group_0_0__1__Impl rule__XShortClosure__Group_0_0__2
+            // InternalCheck.g:15004:1: ( rule__XShortClosure__Group_0_0__1__Impl rule__XShortClosure__Group_0_0__2 )
+            // InternalCheck.g:15005:2: rule__XShortClosure__Group_0_0__1__Impl rule__XShortClosure__Group_0_0__2
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0__1__Impl_in_rule__XShortClosure__Group_0_0__130565);
+            pushFollow(FOLLOW_85);
             rule__XShortClosure__Group_0_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0__2_in_rule__XShortClosure__Group_0_0__130568);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__Group_0_0__2();
 
             state._fsp--;
@@ -43893,22 +43893,22 @@ public final void rule__XShortClosure__Group_0_0__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15012:1: rule__XShortClosure__Group_0_0__1__Impl : ( ( rule__XShortClosure__Group_0_0_1__0 )? ) ;
+    // InternalCheck.g:15012:1: rule__XShortClosure__Group_0_0__1__Impl : ( ( rule__XShortClosure__Group_0_0_1__0 )? ) ;
     public final void rule__XShortClosure__Group_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15016:1: ( ( ( rule__XShortClosure__Group_0_0_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15017:1: ( ( rule__XShortClosure__Group_0_0_1__0 )? )
+            // InternalCheck.g:15016:1: ( ( ( rule__XShortClosure__Group_0_0_1__0 )? ) )
+            // InternalCheck.g:15017:1: ( ( rule__XShortClosure__Group_0_0_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15017:1: ( ( rule__XShortClosure__Group_0_0_1__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15018:1: ( rule__XShortClosure__Group_0_0_1__0 )?
+            // InternalCheck.g:15017:1: ( ( rule__XShortClosure__Group_0_0_1__0 )? )
+            // InternalCheck.g:15018:1: ( rule__XShortClosure__Group_0_0_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getGroup_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15019:1: ( rule__XShortClosure__Group_0_0_1__0 )?
+            // InternalCheck.g:15019:1: ( rule__XShortClosure__Group_0_0_1__0 )?
             int alt120=2;
             int LA120_0 = input.LA(1);
 
@@ -43917,9 +43917,9 @@ public final void rule__XShortClosure__Group_0_0__1__Impl() throws RecognitionEx
             }
             switch (alt120) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15019:2: rule__XShortClosure__Group_0_0_1__0
+                    // InternalCheck.g:15019:2: rule__XShortClosure__Group_0_0_1__0
                     {
-                    pushFollow(FOLLOW_rule__XShortClosure__Group_0_0_1__0_in_rule__XShortClosure__Group_0_0__1__Impl30595);
+                    pushFollow(FOLLOW_2);
                     rule__XShortClosure__Group_0_0_1__0();
 
                     state._fsp--;
@@ -43955,16 +43955,16 @@ public final void rule__XShortClosure__Group_0_0__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15029:1: rule__XShortClosure__Group_0_0__2 : rule__XShortClosure__Group_0_0__2__Impl ;
+    // InternalCheck.g:15029:1: rule__XShortClosure__Group_0_0__2 : rule__XShortClosure__Group_0_0__2__Impl ;
     public final void rule__XShortClosure__Group_0_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15033:1: ( rule__XShortClosure__Group_0_0__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15034:2: rule__XShortClosure__Group_0_0__2__Impl
+            // InternalCheck.g:15033:1: ( rule__XShortClosure__Group_0_0__2__Impl )
+            // InternalCheck.g:15034:2: rule__XShortClosure__Group_0_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0__2__Impl_in_rule__XShortClosure__Group_0_0__230626);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__Group_0_0__2__Impl();
 
             state._fsp--;
@@ -43988,25 +43988,25 @@ public final void rule__XShortClosure__Group_0_0__2() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15040:1: rule__XShortClosure__Group_0_0__2__Impl : ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) ) ;
+    // InternalCheck.g:15040:1: rule__XShortClosure__Group_0_0__2__Impl : ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) ) ;
     public final void rule__XShortClosure__Group_0_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15044:1: ( ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15045:1: ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) )
+            // InternalCheck.g:15044:1: ( ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) ) )
+            // InternalCheck.g:15045:1: ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15045:1: ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15046:1: ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 )
+            // InternalCheck.g:15045:1: ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) )
+            // InternalCheck.g:15046:1: ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getExplicitSyntaxAssignment_0_0_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15047:1: ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15047:2: rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2
+            // InternalCheck.g:15047:1: ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 )
+            // InternalCheck.g:15047:2: rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2
             {
-            pushFollow(FOLLOW_rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2_in_rule__XShortClosure__Group_0_0__2__Impl30653);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2();
 
             state._fsp--;
@@ -44039,21 +44039,21 @@ public final void rule__XShortClosure__Group_0_0__2__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15063:1: rule__XShortClosure__Group_0_0_1__0 : rule__XShortClosure__Group_0_0_1__0__Impl rule__XShortClosure__Group_0_0_1__1 ;
+    // InternalCheck.g:15063:1: rule__XShortClosure__Group_0_0_1__0 : rule__XShortClosure__Group_0_0_1__0__Impl rule__XShortClosure__Group_0_0_1__1 ;
     public final void rule__XShortClosure__Group_0_0_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15067:1: ( rule__XShortClosure__Group_0_0_1__0__Impl rule__XShortClosure__Group_0_0_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15068:2: rule__XShortClosure__Group_0_0_1__0__Impl rule__XShortClosure__Group_0_0_1__1
+            // InternalCheck.g:15067:1: ( rule__XShortClosure__Group_0_0_1__0__Impl rule__XShortClosure__Group_0_0_1__1 )
+            // InternalCheck.g:15068:2: rule__XShortClosure__Group_0_0_1__0__Impl rule__XShortClosure__Group_0_0_1__1
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0_1__0__Impl_in_rule__XShortClosure__Group_0_0_1__030689);
+            pushFollow(FOLLOW_20);
             rule__XShortClosure__Group_0_0_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0_1__1_in_rule__XShortClosure__Group_0_0_1__030692);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__Group_0_0_1__1();
 
             state._fsp--;
@@ -44077,25 +44077,25 @@ public final void rule__XShortClosure__Group_0_0_1__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15075:1: rule__XShortClosure__Group_0_0_1__0__Impl : ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) ) ;
+    // InternalCheck.g:15075:1: rule__XShortClosure__Group_0_0_1__0__Impl : ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) ) ;
     public final void rule__XShortClosure__Group_0_0_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15079:1: ( ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15080:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) )
+            // InternalCheck.g:15079:1: ( ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) ) )
+            // InternalCheck.g:15080:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15080:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15081:1: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 )
+            // InternalCheck.g:15080:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) )
+            // InternalCheck.g:15081:1: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getDeclaredFormalParametersAssignment_0_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15082:1: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15082:2: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0
+            // InternalCheck.g:15082:1: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 )
+            // InternalCheck.g:15082:2: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0
             {
-            pushFollow(FOLLOW_rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0_in_rule__XShortClosure__Group_0_0_1__0__Impl30719);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0();
 
             state._fsp--;
@@ -44128,16 +44128,16 @@ public final void rule__XShortClosure__Group_0_0_1__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15092:1: rule__XShortClosure__Group_0_0_1__1 : rule__XShortClosure__Group_0_0_1__1__Impl ;
+    // InternalCheck.g:15092:1: rule__XShortClosure__Group_0_0_1__1 : rule__XShortClosure__Group_0_0_1__1__Impl ;
     public final void rule__XShortClosure__Group_0_0_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15096:1: ( rule__XShortClosure__Group_0_0_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15097:2: rule__XShortClosure__Group_0_0_1__1__Impl
+            // InternalCheck.g:15096:1: ( rule__XShortClosure__Group_0_0_1__1__Impl )
+            // InternalCheck.g:15097:2: rule__XShortClosure__Group_0_0_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0_1__1__Impl_in_rule__XShortClosure__Group_0_0_1__130749);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__Group_0_0_1__1__Impl();
 
             state._fsp--;
@@ -44161,22 +44161,22 @@ public final void rule__XShortClosure__Group_0_0_1__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15103:1: rule__XShortClosure__Group_0_0_1__1__Impl : ( ( rule__XShortClosure__Group_0_0_1_1__0 )* ) ;
+    // InternalCheck.g:15103:1: rule__XShortClosure__Group_0_0_1__1__Impl : ( ( rule__XShortClosure__Group_0_0_1_1__0 )* ) ;
     public final void rule__XShortClosure__Group_0_0_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15107:1: ( ( ( rule__XShortClosure__Group_0_0_1_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15108:1: ( ( rule__XShortClosure__Group_0_0_1_1__0 )* )
+            // InternalCheck.g:15107:1: ( ( ( rule__XShortClosure__Group_0_0_1_1__0 )* ) )
+            // InternalCheck.g:15108:1: ( ( rule__XShortClosure__Group_0_0_1_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15108:1: ( ( rule__XShortClosure__Group_0_0_1_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15109:1: ( rule__XShortClosure__Group_0_0_1_1__0 )*
+            // InternalCheck.g:15108:1: ( ( rule__XShortClosure__Group_0_0_1_1__0 )* )
+            // InternalCheck.g:15109:1: ( rule__XShortClosure__Group_0_0_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getGroup_0_0_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15110:1: ( rule__XShortClosure__Group_0_0_1_1__0 )*
+            // InternalCheck.g:15110:1: ( rule__XShortClosure__Group_0_0_1_1__0 )*
             loop121:
             do {
                 int alt121=2;
@@ -44189,9 +44189,9 @@ public final void rule__XShortClosure__Group_0_0_1__1__Impl() throws Recognition
 
                 switch (alt121) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15110:2: rule__XShortClosure__Group_0_0_1_1__0
+            	    // InternalCheck.g:15110:2: rule__XShortClosure__Group_0_0_1_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XShortClosure__Group_0_0_1_1__0_in_rule__XShortClosure__Group_0_0_1__1__Impl30776);
+            	    pushFollow(FOLLOW_21);
             	    rule__XShortClosure__Group_0_0_1_1__0();
 
             	    state._fsp--;
@@ -44230,21 +44230,21 @@ public final void rule__XShortClosure__Group_0_0_1__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15124:1: rule__XShortClosure__Group_0_0_1_1__0 : rule__XShortClosure__Group_0_0_1_1__0__Impl rule__XShortClosure__Group_0_0_1_1__1 ;
+    // InternalCheck.g:15124:1: rule__XShortClosure__Group_0_0_1_1__0 : rule__XShortClosure__Group_0_0_1_1__0__Impl rule__XShortClosure__Group_0_0_1_1__1 ;
     public final void rule__XShortClosure__Group_0_0_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15128:1: ( rule__XShortClosure__Group_0_0_1_1__0__Impl rule__XShortClosure__Group_0_0_1_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15129:2: rule__XShortClosure__Group_0_0_1_1__0__Impl rule__XShortClosure__Group_0_0_1_1__1
+            // InternalCheck.g:15128:1: ( rule__XShortClosure__Group_0_0_1_1__0__Impl rule__XShortClosure__Group_0_0_1_1__1 )
+            // InternalCheck.g:15129:2: rule__XShortClosure__Group_0_0_1_1__0__Impl rule__XShortClosure__Group_0_0_1_1__1
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0_1_1__0__Impl_in_rule__XShortClosure__Group_0_0_1_1__030811);
+            pushFollow(FOLLOW_29);
             rule__XShortClosure__Group_0_0_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0_1_1__1_in_rule__XShortClosure__Group_0_0_1_1__030814);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__Group_0_0_1_1__1();
 
             state._fsp--;
@@ -44268,22 +44268,22 @@ public final void rule__XShortClosure__Group_0_0_1_1__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15136:1: rule__XShortClosure__Group_0_0_1_1__0__Impl : ( ',' ) ;
+    // InternalCheck.g:15136:1: rule__XShortClosure__Group_0_0_1_1__0__Impl : ( ',' ) ;
     public final void rule__XShortClosure__Group_0_0_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15140:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15141:1: ( ',' )
+            // InternalCheck.g:15140:1: ( ( ',' ) )
+            // InternalCheck.g:15141:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15141:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15142:1: ','
+            // InternalCheck.g:15141:1: ( ',' )
+            // InternalCheck.g:15142:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getCommaKeyword_0_0_1_1_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XShortClosure__Group_0_0_1_1__0__Impl30842); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXShortClosureAccess().getCommaKeyword_0_0_1_1_0()); 
             }
@@ -44309,16 +44309,16 @@ public final void rule__XShortClosure__Group_0_0_1_1__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15155:1: rule__XShortClosure__Group_0_0_1_1__1 : rule__XShortClosure__Group_0_0_1_1__1__Impl ;
+    // InternalCheck.g:15155:1: rule__XShortClosure__Group_0_0_1_1__1 : rule__XShortClosure__Group_0_0_1_1__1__Impl ;
     public final void rule__XShortClosure__Group_0_0_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15159:1: ( rule__XShortClosure__Group_0_0_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15160:2: rule__XShortClosure__Group_0_0_1_1__1__Impl
+            // InternalCheck.g:15159:1: ( rule__XShortClosure__Group_0_0_1_1__1__Impl )
+            // InternalCheck.g:15160:2: rule__XShortClosure__Group_0_0_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0_1_1__1__Impl_in_rule__XShortClosure__Group_0_0_1_1__130873);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__Group_0_0_1_1__1__Impl();
 
             state._fsp--;
@@ -44342,25 +44342,25 @@ public final void rule__XShortClosure__Group_0_0_1_1__1() throws RecognitionExce
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15166:1: rule__XShortClosure__Group_0_0_1_1__1__Impl : ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) ) ;
+    // InternalCheck.g:15166:1: rule__XShortClosure__Group_0_0_1_1__1__Impl : ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) ) ;
     public final void rule__XShortClosure__Group_0_0_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15170:1: ( ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15171:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) )
+            // InternalCheck.g:15170:1: ( ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) ) )
+            // InternalCheck.g:15171:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15171:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15172:1: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 )
+            // InternalCheck.g:15171:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) )
+            // InternalCheck.g:15172:1: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getDeclaredFormalParametersAssignment_0_0_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15173:1: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15173:2: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1
+            // InternalCheck.g:15173:1: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 )
+            // InternalCheck.g:15173:2: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1
             {
-            pushFollow(FOLLOW_rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1_in_rule__XShortClosure__Group_0_0_1_1__1__Impl30900);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1();
 
             state._fsp--;
@@ -44393,21 +44393,21 @@ public final void rule__XShortClosure__Group_0_0_1_1__1__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XParenthesizedExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15187:1: rule__XParenthesizedExpression__Group__0 : rule__XParenthesizedExpression__Group__0__Impl rule__XParenthesizedExpression__Group__1 ;
+    // InternalCheck.g:15187:1: rule__XParenthesizedExpression__Group__0 : rule__XParenthesizedExpression__Group__0__Impl rule__XParenthesizedExpression__Group__1 ;
     public final void rule__XParenthesizedExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15191:1: ( rule__XParenthesizedExpression__Group__0__Impl rule__XParenthesizedExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15192:2: rule__XParenthesizedExpression__Group__0__Impl rule__XParenthesizedExpression__Group__1
+            // InternalCheck.g:15191:1: ( rule__XParenthesizedExpression__Group__0__Impl rule__XParenthesizedExpression__Group__1 )
+            // InternalCheck.g:15192:2: rule__XParenthesizedExpression__Group__0__Impl rule__XParenthesizedExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XParenthesizedExpression__Group__0__Impl_in_rule__XParenthesizedExpression__Group__030934);
+            pushFollow(FOLLOW_32);
             rule__XParenthesizedExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XParenthesizedExpression__Group__1_in_rule__XParenthesizedExpression__Group__030937);
+            pushFollow(FOLLOW_2);
             rule__XParenthesizedExpression__Group__1();
 
             state._fsp--;
@@ -44431,22 +44431,22 @@ public final void rule__XParenthesizedExpression__Group__0() throws RecognitionE
 
 
     // $ANTLR start "rule__XParenthesizedExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15199:1: rule__XParenthesizedExpression__Group__0__Impl : ( '(' ) ;
+    // InternalCheck.g:15199:1: rule__XParenthesizedExpression__Group__0__Impl : ( '(' ) ;
     public final void rule__XParenthesizedExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15203:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15204:1: ( '(' )
+            // InternalCheck.g:15203:1: ( ( '(' ) )
+            // InternalCheck.g:15204:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15204:1: ( '(' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15205:1: '('
+            // InternalCheck.g:15204:1: ( '(' )
+            // InternalCheck.g:15205:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXParenthesizedExpressionAccess().getLeftParenthesisKeyword_0()); 
             }
-            match(input,72,FOLLOW_72_in_rule__XParenthesizedExpression__Group__0__Impl30965); if (state.failed) return ;
+            match(input,72,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXParenthesizedExpressionAccess().getLeftParenthesisKeyword_0()); 
             }
@@ -44472,21 +44472,21 @@ public final void rule__XParenthesizedExpression__Group__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XParenthesizedExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15218:1: rule__XParenthesizedExpression__Group__1 : rule__XParenthesizedExpression__Group__1__Impl rule__XParenthesizedExpression__Group__2 ;
+    // InternalCheck.g:15218:1: rule__XParenthesizedExpression__Group__1 : rule__XParenthesizedExpression__Group__1__Impl rule__XParenthesizedExpression__Group__2 ;
     public final void rule__XParenthesizedExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15222:1: ( rule__XParenthesizedExpression__Group__1__Impl rule__XParenthesizedExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15223:2: rule__XParenthesizedExpression__Group__1__Impl rule__XParenthesizedExpression__Group__2
+            // InternalCheck.g:15222:1: ( rule__XParenthesizedExpression__Group__1__Impl rule__XParenthesizedExpression__Group__2 )
+            // InternalCheck.g:15223:2: rule__XParenthesizedExpression__Group__1__Impl rule__XParenthesizedExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XParenthesizedExpression__Group__1__Impl_in_rule__XParenthesizedExpression__Group__130996);
+            pushFollow(FOLLOW_28);
             rule__XParenthesizedExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XParenthesizedExpression__Group__2_in_rule__XParenthesizedExpression__Group__130999);
+            pushFollow(FOLLOW_2);
             rule__XParenthesizedExpression__Group__2();
 
             state._fsp--;
@@ -44510,22 +44510,22 @@ public final void rule__XParenthesizedExpression__Group__1() throws RecognitionE
 
 
     // $ANTLR start "rule__XParenthesizedExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15230:1: rule__XParenthesizedExpression__Group__1__Impl : ( ruleXExpression ) ;
+    // InternalCheck.g:15230:1: rule__XParenthesizedExpression__Group__1__Impl : ( ruleXExpression ) ;
     public final void rule__XParenthesizedExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15234:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15235:1: ( ruleXExpression )
+            // InternalCheck.g:15234:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:15235:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15235:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15236:1: ruleXExpression
+            // InternalCheck.g:15235:1: ( ruleXExpression )
+            // InternalCheck.g:15236:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXParenthesizedExpressionAccess().getXExpressionParserRuleCall_1()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XParenthesizedExpression__Group__1__Impl31026);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -44555,16 +44555,16 @@ public final void rule__XParenthesizedExpression__Group__1__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XParenthesizedExpression__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15247:1: rule__XParenthesizedExpression__Group__2 : rule__XParenthesizedExpression__Group__2__Impl ;
+    // InternalCheck.g:15247:1: rule__XParenthesizedExpression__Group__2 : rule__XParenthesizedExpression__Group__2__Impl ;
     public final void rule__XParenthesizedExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15251:1: ( rule__XParenthesizedExpression__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15252:2: rule__XParenthesizedExpression__Group__2__Impl
+            // InternalCheck.g:15251:1: ( rule__XParenthesizedExpression__Group__2__Impl )
+            // InternalCheck.g:15252:2: rule__XParenthesizedExpression__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__XParenthesizedExpression__Group__2__Impl_in_rule__XParenthesizedExpression__Group__231055);
+            pushFollow(FOLLOW_2);
             rule__XParenthesizedExpression__Group__2__Impl();
 
             state._fsp--;
@@ -44588,22 +44588,22 @@ public final void rule__XParenthesizedExpression__Group__2() throws RecognitionE
 
 
     // $ANTLR start "rule__XParenthesizedExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15258:1: rule__XParenthesizedExpression__Group__2__Impl : ( ')' ) ;
+    // InternalCheck.g:15258:1: rule__XParenthesizedExpression__Group__2__Impl : ( ')' ) ;
     public final void rule__XParenthesizedExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15262:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15263:1: ( ')' )
+            // InternalCheck.g:15262:1: ( ( ')' ) )
+            // InternalCheck.g:15263:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15263:1: ( ')' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15264:1: ')'
+            // InternalCheck.g:15263:1: ( ')' )
+            // InternalCheck.g:15264:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXParenthesizedExpressionAccess().getRightParenthesisKeyword_2()); 
             }
-            match(input,73,FOLLOW_73_in_rule__XParenthesizedExpression__Group__2__Impl31083); if (state.failed) return ;
+            match(input,73,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXParenthesizedExpressionAccess().getRightParenthesisKeyword_2()); 
             }
@@ -44629,21 +44629,21 @@ public final void rule__XParenthesizedExpression__Group__2__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XIfExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15283:1: rule__XIfExpression__Group__0 : rule__XIfExpression__Group__0__Impl rule__XIfExpression__Group__1 ;
+    // InternalCheck.g:15283:1: rule__XIfExpression__Group__0 : rule__XIfExpression__Group__0__Impl rule__XIfExpression__Group__1 ;
     public final void rule__XIfExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15287:1: ( rule__XIfExpression__Group__0__Impl rule__XIfExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15288:2: rule__XIfExpression__Group__0__Impl rule__XIfExpression__Group__1
+            // InternalCheck.g:15287:1: ( rule__XIfExpression__Group__0__Impl rule__XIfExpression__Group__1 )
+            // InternalCheck.g:15288:2: rule__XIfExpression__Group__0__Impl rule__XIfExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XIfExpression__Group__0__Impl_in_rule__XIfExpression__Group__031120);
+            pushFollow(FOLLOW_87);
             rule__XIfExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIfExpression__Group__1_in_rule__XIfExpression__Group__031123);
+            pushFollow(FOLLOW_2);
             rule__XIfExpression__Group__1();
 
             state._fsp--;
@@ -44667,23 +44667,23 @@ public final void rule__XIfExpression__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XIfExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15295:1: rule__XIfExpression__Group__0__Impl : ( () ) ;
+    // InternalCheck.g:15295:1: rule__XIfExpression__Group__0__Impl : ( () ) ;
     public final void rule__XIfExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15299:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15300:1: ( () )
+            // InternalCheck.g:15299:1: ( ( () ) )
+            // InternalCheck.g:15300:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15300:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15301:1: ()
+            // InternalCheck.g:15300:1: ( () )
+            // InternalCheck.g:15301:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getXIfExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15302:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15304:1: 
+            // InternalCheck.g:15302:1: ()
+            // InternalCheck.g:15304:1: 
             {
             }
 
@@ -44708,21 +44708,21 @@ public final void rule__XIfExpression__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XIfExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15314:1: rule__XIfExpression__Group__1 : rule__XIfExpression__Group__1__Impl rule__XIfExpression__Group__2 ;
+    // InternalCheck.g:15314:1: rule__XIfExpression__Group__1 : rule__XIfExpression__Group__1__Impl rule__XIfExpression__Group__2 ;
     public final void rule__XIfExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15318:1: ( rule__XIfExpression__Group__1__Impl rule__XIfExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15319:2: rule__XIfExpression__Group__1__Impl rule__XIfExpression__Group__2
+            // InternalCheck.g:15318:1: ( rule__XIfExpression__Group__1__Impl rule__XIfExpression__Group__2 )
+            // InternalCheck.g:15319:2: rule__XIfExpression__Group__1__Impl rule__XIfExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XIfExpression__Group__1__Impl_in_rule__XIfExpression__Group__131181);
+            pushFollow(FOLLOW_26);
             rule__XIfExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIfExpression__Group__2_in_rule__XIfExpression__Group__131184);
+            pushFollow(FOLLOW_2);
             rule__XIfExpression__Group__2();
 
             state._fsp--;
@@ -44746,22 +44746,22 @@ public final void rule__XIfExpression__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XIfExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15326:1: rule__XIfExpression__Group__1__Impl : ( 'if' ) ;
+    // InternalCheck.g:15326:1: rule__XIfExpression__Group__1__Impl : ( 'if' ) ;
     public final void rule__XIfExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15330:1: ( ( 'if' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15331:1: ( 'if' )
+            // InternalCheck.g:15330:1: ( ( 'if' ) )
+            // InternalCheck.g:15331:1: ( 'if' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15331:1: ( 'if' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15332:1: 'if'
+            // InternalCheck.g:15331:1: ( 'if' )
+            // InternalCheck.g:15332:1: 'if'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getIfKeyword_1()); 
             }
-            match(input,84,FOLLOW_84_in_rule__XIfExpression__Group__1__Impl31212); if (state.failed) return ;
+            match(input,84,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXIfExpressionAccess().getIfKeyword_1()); 
             }
@@ -44787,21 +44787,21 @@ public final void rule__XIfExpression__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XIfExpression__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15345:1: rule__XIfExpression__Group__2 : rule__XIfExpression__Group__2__Impl rule__XIfExpression__Group__3 ;
+    // InternalCheck.g:15345:1: rule__XIfExpression__Group__2 : rule__XIfExpression__Group__2__Impl rule__XIfExpression__Group__3 ;
     public final void rule__XIfExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15349:1: ( rule__XIfExpression__Group__2__Impl rule__XIfExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15350:2: rule__XIfExpression__Group__2__Impl rule__XIfExpression__Group__3
+            // InternalCheck.g:15349:1: ( rule__XIfExpression__Group__2__Impl rule__XIfExpression__Group__3 )
+            // InternalCheck.g:15350:2: rule__XIfExpression__Group__2__Impl rule__XIfExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__XIfExpression__Group__2__Impl_in_rule__XIfExpression__Group__231243);
+            pushFollow(FOLLOW_32);
             rule__XIfExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIfExpression__Group__3_in_rule__XIfExpression__Group__231246);
+            pushFollow(FOLLOW_2);
             rule__XIfExpression__Group__3();
 
             state._fsp--;
@@ -44825,22 +44825,22 @@ public final void rule__XIfExpression__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XIfExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15357:1: rule__XIfExpression__Group__2__Impl : ( '(' ) ;
+    // InternalCheck.g:15357:1: rule__XIfExpression__Group__2__Impl : ( '(' ) ;
     public final void rule__XIfExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15361:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15362:1: ( '(' )
+            // InternalCheck.g:15361:1: ( ( '(' ) )
+            // InternalCheck.g:15362:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15362:1: ( '(' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15363:1: '('
+            // InternalCheck.g:15362:1: ( '(' )
+            // InternalCheck.g:15363:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getLeftParenthesisKeyword_2()); 
             }
-            match(input,72,FOLLOW_72_in_rule__XIfExpression__Group__2__Impl31274); if (state.failed) return ;
+            match(input,72,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXIfExpressionAccess().getLeftParenthesisKeyword_2()); 
             }
@@ -44866,21 +44866,21 @@ public final void rule__XIfExpression__Group__2__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XIfExpression__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15376:1: rule__XIfExpression__Group__3 : rule__XIfExpression__Group__3__Impl rule__XIfExpression__Group__4 ;
+    // InternalCheck.g:15376:1: rule__XIfExpression__Group__3 : rule__XIfExpression__Group__3__Impl rule__XIfExpression__Group__4 ;
     public final void rule__XIfExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15380:1: ( rule__XIfExpression__Group__3__Impl rule__XIfExpression__Group__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15381:2: rule__XIfExpression__Group__3__Impl rule__XIfExpression__Group__4
+            // InternalCheck.g:15380:1: ( rule__XIfExpression__Group__3__Impl rule__XIfExpression__Group__4 )
+            // InternalCheck.g:15381:2: rule__XIfExpression__Group__3__Impl rule__XIfExpression__Group__4
             {
-            pushFollow(FOLLOW_rule__XIfExpression__Group__3__Impl_in_rule__XIfExpression__Group__331305);
+            pushFollow(FOLLOW_28);
             rule__XIfExpression__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIfExpression__Group__4_in_rule__XIfExpression__Group__331308);
+            pushFollow(FOLLOW_2);
             rule__XIfExpression__Group__4();
 
             state._fsp--;
@@ -44904,25 +44904,25 @@ public final void rule__XIfExpression__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XIfExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15388:1: rule__XIfExpression__Group__3__Impl : ( ( rule__XIfExpression__IfAssignment_3 ) ) ;
+    // InternalCheck.g:15388:1: rule__XIfExpression__Group__3__Impl : ( ( rule__XIfExpression__IfAssignment_3 ) ) ;
     public final void rule__XIfExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15392:1: ( ( ( rule__XIfExpression__IfAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15393:1: ( ( rule__XIfExpression__IfAssignment_3 ) )
+            // InternalCheck.g:15392:1: ( ( ( rule__XIfExpression__IfAssignment_3 ) ) )
+            // InternalCheck.g:15393:1: ( ( rule__XIfExpression__IfAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15393:1: ( ( rule__XIfExpression__IfAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15394:1: ( rule__XIfExpression__IfAssignment_3 )
+            // InternalCheck.g:15393:1: ( ( rule__XIfExpression__IfAssignment_3 ) )
+            // InternalCheck.g:15394:1: ( rule__XIfExpression__IfAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getIfAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15395:1: ( rule__XIfExpression__IfAssignment_3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15395:2: rule__XIfExpression__IfAssignment_3
+            // InternalCheck.g:15395:1: ( rule__XIfExpression__IfAssignment_3 )
+            // InternalCheck.g:15395:2: rule__XIfExpression__IfAssignment_3
             {
-            pushFollow(FOLLOW_rule__XIfExpression__IfAssignment_3_in_rule__XIfExpression__Group__3__Impl31335);
+            pushFollow(FOLLOW_2);
             rule__XIfExpression__IfAssignment_3();
 
             state._fsp--;
@@ -44955,21 +44955,21 @@ public final void rule__XIfExpression__Group__3__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XIfExpression__Group__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15405:1: rule__XIfExpression__Group__4 : rule__XIfExpression__Group__4__Impl rule__XIfExpression__Group__5 ;
+    // InternalCheck.g:15405:1: rule__XIfExpression__Group__4 : rule__XIfExpression__Group__4__Impl rule__XIfExpression__Group__5 ;
     public final void rule__XIfExpression__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15409:1: ( rule__XIfExpression__Group__4__Impl rule__XIfExpression__Group__5 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15410:2: rule__XIfExpression__Group__4__Impl rule__XIfExpression__Group__5
+            // InternalCheck.g:15409:1: ( rule__XIfExpression__Group__4__Impl rule__XIfExpression__Group__5 )
+            // InternalCheck.g:15410:2: rule__XIfExpression__Group__4__Impl rule__XIfExpression__Group__5
             {
-            pushFollow(FOLLOW_rule__XIfExpression__Group__4__Impl_in_rule__XIfExpression__Group__431365);
+            pushFollow(FOLLOW_32);
             rule__XIfExpression__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIfExpression__Group__5_in_rule__XIfExpression__Group__431368);
+            pushFollow(FOLLOW_2);
             rule__XIfExpression__Group__5();
 
             state._fsp--;
@@ -44993,22 +44993,22 @@ public final void rule__XIfExpression__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__XIfExpression__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15417:1: rule__XIfExpression__Group__4__Impl : ( ')' ) ;
+    // InternalCheck.g:15417:1: rule__XIfExpression__Group__4__Impl : ( ')' ) ;
     public final void rule__XIfExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15421:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15422:1: ( ')' )
+            // InternalCheck.g:15421:1: ( ( ')' ) )
+            // InternalCheck.g:15422:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15422:1: ( ')' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15423:1: ')'
+            // InternalCheck.g:15422:1: ( ')' )
+            // InternalCheck.g:15423:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getRightParenthesisKeyword_4()); 
             }
-            match(input,73,FOLLOW_73_in_rule__XIfExpression__Group__4__Impl31396); if (state.failed) return ;
+            match(input,73,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXIfExpressionAccess().getRightParenthesisKeyword_4()); 
             }
@@ -45034,21 +45034,21 @@ public final void rule__XIfExpression__Group__4__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XIfExpression__Group__5"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15436:1: rule__XIfExpression__Group__5 : rule__XIfExpression__Group__5__Impl rule__XIfExpression__Group__6 ;
+    // InternalCheck.g:15436:1: rule__XIfExpression__Group__5 : rule__XIfExpression__Group__5__Impl rule__XIfExpression__Group__6 ;
     public final void rule__XIfExpression__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15440:1: ( rule__XIfExpression__Group__5__Impl rule__XIfExpression__Group__6 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15441:2: rule__XIfExpression__Group__5__Impl rule__XIfExpression__Group__6
+            // InternalCheck.g:15440:1: ( rule__XIfExpression__Group__5__Impl rule__XIfExpression__Group__6 )
+            // InternalCheck.g:15441:2: rule__XIfExpression__Group__5__Impl rule__XIfExpression__Group__6
             {
-            pushFollow(FOLLOW_rule__XIfExpression__Group__5__Impl_in_rule__XIfExpression__Group__531427);
+            pushFollow(FOLLOW_88);
             rule__XIfExpression__Group__5__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIfExpression__Group__6_in_rule__XIfExpression__Group__531430);
+            pushFollow(FOLLOW_2);
             rule__XIfExpression__Group__6();
 
             state._fsp--;
@@ -45072,25 +45072,25 @@ public final void rule__XIfExpression__Group__5() throws RecognitionException {
 
 
     // $ANTLR start "rule__XIfExpression__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15448:1: rule__XIfExpression__Group__5__Impl : ( ( rule__XIfExpression__ThenAssignment_5 ) ) ;
+    // InternalCheck.g:15448:1: rule__XIfExpression__Group__5__Impl : ( ( rule__XIfExpression__ThenAssignment_5 ) ) ;
     public final void rule__XIfExpression__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15452:1: ( ( ( rule__XIfExpression__ThenAssignment_5 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15453:1: ( ( rule__XIfExpression__ThenAssignment_5 ) )
+            // InternalCheck.g:15452:1: ( ( ( rule__XIfExpression__ThenAssignment_5 ) ) )
+            // InternalCheck.g:15453:1: ( ( rule__XIfExpression__ThenAssignment_5 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15453:1: ( ( rule__XIfExpression__ThenAssignment_5 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15454:1: ( rule__XIfExpression__ThenAssignment_5 )
+            // InternalCheck.g:15453:1: ( ( rule__XIfExpression__ThenAssignment_5 ) )
+            // InternalCheck.g:15454:1: ( rule__XIfExpression__ThenAssignment_5 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getThenAssignment_5()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15455:1: ( rule__XIfExpression__ThenAssignment_5 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15455:2: rule__XIfExpression__ThenAssignment_5
+            // InternalCheck.g:15455:1: ( rule__XIfExpression__ThenAssignment_5 )
+            // InternalCheck.g:15455:2: rule__XIfExpression__ThenAssignment_5
             {
-            pushFollow(FOLLOW_rule__XIfExpression__ThenAssignment_5_in_rule__XIfExpression__Group__5__Impl31457);
+            pushFollow(FOLLOW_2);
             rule__XIfExpression__ThenAssignment_5();
 
             state._fsp--;
@@ -45123,16 +45123,16 @@ public final void rule__XIfExpression__Group__5__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XIfExpression__Group__6"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15465:1: rule__XIfExpression__Group__6 : rule__XIfExpression__Group__6__Impl ;
+    // InternalCheck.g:15465:1: rule__XIfExpression__Group__6 : rule__XIfExpression__Group__6__Impl ;
     public final void rule__XIfExpression__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15469:1: ( rule__XIfExpression__Group__6__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15470:2: rule__XIfExpression__Group__6__Impl
+            // InternalCheck.g:15469:1: ( rule__XIfExpression__Group__6__Impl )
+            // InternalCheck.g:15470:2: rule__XIfExpression__Group__6__Impl
             {
-            pushFollow(FOLLOW_rule__XIfExpression__Group__6__Impl_in_rule__XIfExpression__Group__631487);
+            pushFollow(FOLLOW_2);
             rule__XIfExpression__Group__6__Impl();
 
             state._fsp--;
@@ -45156,22 +45156,22 @@ public final void rule__XIfExpression__Group__6() throws RecognitionException {
 
 
     // $ANTLR start "rule__XIfExpression__Group__6__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15476:1: rule__XIfExpression__Group__6__Impl : ( ( rule__XIfExpression__Group_6__0 )? ) ;
+    // InternalCheck.g:15476:1: rule__XIfExpression__Group__6__Impl : ( ( rule__XIfExpression__Group_6__0 )? ) ;
     public final void rule__XIfExpression__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15480:1: ( ( ( rule__XIfExpression__Group_6__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15481:1: ( ( rule__XIfExpression__Group_6__0 )? )
+            // InternalCheck.g:15480:1: ( ( ( rule__XIfExpression__Group_6__0 )? ) )
+            // InternalCheck.g:15481:1: ( ( rule__XIfExpression__Group_6__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15481:1: ( ( rule__XIfExpression__Group_6__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15482:1: ( rule__XIfExpression__Group_6__0 )?
+            // InternalCheck.g:15481:1: ( ( rule__XIfExpression__Group_6__0 )? )
+            // InternalCheck.g:15482:1: ( rule__XIfExpression__Group_6__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getGroup_6()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15483:1: ( rule__XIfExpression__Group_6__0 )?
+            // InternalCheck.g:15483:1: ( rule__XIfExpression__Group_6__0 )?
             int alt122=2;
             int LA122_0 = input.LA(1);
 
@@ -45184,9 +45184,9 @@ public final void rule__XIfExpression__Group__6__Impl() throws RecognitionExcept
             }
             switch (alt122) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15483:2: rule__XIfExpression__Group_6__0
+                    // InternalCheck.g:15483:2: rule__XIfExpression__Group_6__0
                     {
-                    pushFollow(FOLLOW_rule__XIfExpression__Group_6__0_in_rule__XIfExpression__Group__6__Impl31514);
+                    pushFollow(FOLLOW_2);
                     rule__XIfExpression__Group_6__0();
 
                     state._fsp--;
@@ -45222,21 +45222,21 @@ public final void rule__XIfExpression__Group__6__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XIfExpression__Group_6__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15507:1: rule__XIfExpression__Group_6__0 : rule__XIfExpression__Group_6__0__Impl rule__XIfExpression__Group_6__1 ;
+    // InternalCheck.g:15507:1: rule__XIfExpression__Group_6__0 : rule__XIfExpression__Group_6__0__Impl rule__XIfExpression__Group_6__1 ;
     public final void rule__XIfExpression__Group_6__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15511:1: ( rule__XIfExpression__Group_6__0__Impl rule__XIfExpression__Group_6__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15512:2: rule__XIfExpression__Group_6__0__Impl rule__XIfExpression__Group_6__1
+            // InternalCheck.g:15511:1: ( rule__XIfExpression__Group_6__0__Impl rule__XIfExpression__Group_6__1 )
+            // InternalCheck.g:15512:2: rule__XIfExpression__Group_6__0__Impl rule__XIfExpression__Group_6__1
             {
-            pushFollow(FOLLOW_rule__XIfExpression__Group_6__0__Impl_in_rule__XIfExpression__Group_6__031559);
+            pushFollow(FOLLOW_32);
             rule__XIfExpression__Group_6__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIfExpression__Group_6__1_in_rule__XIfExpression__Group_6__031562);
+            pushFollow(FOLLOW_2);
             rule__XIfExpression__Group_6__1();
 
             state._fsp--;
@@ -45260,25 +45260,25 @@ public final void rule__XIfExpression__Group_6__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XIfExpression__Group_6__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15519:1: rule__XIfExpression__Group_6__0__Impl : ( ( 'else' ) ) ;
+    // InternalCheck.g:15519:1: rule__XIfExpression__Group_6__0__Impl : ( ( 'else' ) ) ;
     public final void rule__XIfExpression__Group_6__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15523:1: ( ( ( 'else' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15524:1: ( ( 'else' ) )
+            // InternalCheck.g:15523:1: ( ( ( 'else' ) ) )
+            // InternalCheck.g:15524:1: ( ( 'else' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15524:1: ( ( 'else' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15525:1: ( 'else' )
+            // InternalCheck.g:15524:1: ( ( 'else' ) )
+            // InternalCheck.g:15525:1: ( 'else' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getElseKeyword_6_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15526:1: ( 'else' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15527:2: 'else'
+            // InternalCheck.g:15526:1: ( 'else' )
+            // InternalCheck.g:15527:2: 'else'
             {
-            match(input,85,FOLLOW_85_in_rule__XIfExpression__Group_6__0__Impl31591); if (state.failed) return ;
+            match(input,85,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -45307,16 +45307,16 @@ public final void rule__XIfExpression__Group_6__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XIfExpression__Group_6__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15538:1: rule__XIfExpression__Group_6__1 : rule__XIfExpression__Group_6__1__Impl ;
+    // InternalCheck.g:15538:1: rule__XIfExpression__Group_6__1 : rule__XIfExpression__Group_6__1__Impl ;
     public final void rule__XIfExpression__Group_6__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15542:1: ( rule__XIfExpression__Group_6__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15543:2: rule__XIfExpression__Group_6__1__Impl
+            // InternalCheck.g:15542:1: ( rule__XIfExpression__Group_6__1__Impl )
+            // InternalCheck.g:15543:2: rule__XIfExpression__Group_6__1__Impl
             {
-            pushFollow(FOLLOW_rule__XIfExpression__Group_6__1__Impl_in_rule__XIfExpression__Group_6__131623);
+            pushFollow(FOLLOW_2);
             rule__XIfExpression__Group_6__1__Impl();
 
             state._fsp--;
@@ -45340,25 +45340,25 @@ public final void rule__XIfExpression__Group_6__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XIfExpression__Group_6__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15549:1: rule__XIfExpression__Group_6__1__Impl : ( ( rule__XIfExpression__ElseAssignment_6_1 ) ) ;
+    // InternalCheck.g:15549:1: rule__XIfExpression__Group_6__1__Impl : ( ( rule__XIfExpression__ElseAssignment_6_1 ) ) ;
     public final void rule__XIfExpression__Group_6__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15553:1: ( ( ( rule__XIfExpression__ElseAssignment_6_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15554:1: ( ( rule__XIfExpression__ElseAssignment_6_1 ) )
+            // InternalCheck.g:15553:1: ( ( ( rule__XIfExpression__ElseAssignment_6_1 ) ) )
+            // InternalCheck.g:15554:1: ( ( rule__XIfExpression__ElseAssignment_6_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15554:1: ( ( rule__XIfExpression__ElseAssignment_6_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15555:1: ( rule__XIfExpression__ElseAssignment_6_1 )
+            // InternalCheck.g:15554:1: ( ( rule__XIfExpression__ElseAssignment_6_1 ) )
+            // InternalCheck.g:15555:1: ( rule__XIfExpression__ElseAssignment_6_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getElseAssignment_6_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15556:1: ( rule__XIfExpression__ElseAssignment_6_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15556:2: rule__XIfExpression__ElseAssignment_6_1
+            // InternalCheck.g:15556:1: ( rule__XIfExpression__ElseAssignment_6_1 )
+            // InternalCheck.g:15556:2: rule__XIfExpression__ElseAssignment_6_1
             {
-            pushFollow(FOLLOW_rule__XIfExpression__ElseAssignment_6_1_in_rule__XIfExpression__Group_6__1__Impl31650);
+            pushFollow(FOLLOW_2);
             rule__XIfExpression__ElseAssignment_6_1();
 
             state._fsp--;
@@ -45391,21 +45391,21 @@ public final void rule__XIfExpression__Group_6__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15570:1: rule__XSwitchExpression__Group__0 : rule__XSwitchExpression__Group__0__Impl rule__XSwitchExpression__Group__1 ;
+    // InternalCheck.g:15570:1: rule__XSwitchExpression__Group__0 : rule__XSwitchExpression__Group__0__Impl rule__XSwitchExpression__Group__1 ;
     public final void rule__XSwitchExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15574:1: ( rule__XSwitchExpression__Group__0__Impl rule__XSwitchExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15575:2: rule__XSwitchExpression__Group__0__Impl rule__XSwitchExpression__Group__1
+            // InternalCheck.g:15574:1: ( rule__XSwitchExpression__Group__0__Impl rule__XSwitchExpression__Group__1 )
+            // InternalCheck.g:15575:2: rule__XSwitchExpression__Group__0__Impl rule__XSwitchExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__0__Impl_in_rule__XSwitchExpression__Group__031684);
+            pushFollow(FOLLOW_89);
             rule__XSwitchExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__1_in_rule__XSwitchExpression__Group__031687);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group__1();
 
             state._fsp--;
@@ -45429,23 +45429,23 @@ public final void rule__XSwitchExpression__Group__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15582:1: rule__XSwitchExpression__Group__0__Impl : ( () ) ;
+    // InternalCheck.g:15582:1: rule__XSwitchExpression__Group__0__Impl : ( () ) ;
     public final void rule__XSwitchExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15586:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15587:1: ( () )
+            // InternalCheck.g:15586:1: ( ( () ) )
+            // InternalCheck.g:15587:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15587:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15588:1: ()
+            // InternalCheck.g:15587:1: ( () )
+            // InternalCheck.g:15588:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getXSwitchExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15589:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15591:1: 
+            // InternalCheck.g:15589:1: ()
+            // InternalCheck.g:15591:1: 
             {
             }
 
@@ -45470,21 +45470,21 @@ public final void rule__XSwitchExpression__Group__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15601:1: rule__XSwitchExpression__Group__1 : rule__XSwitchExpression__Group__1__Impl rule__XSwitchExpression__Group__2 ;
+    // InternalCheck.g:15601:1: rule__XSwitchExpression__Group__1 : rule__XSwitchExpression__Group__1__Impl rule__XSwitchExpression__Group__2 ;
     public final void rule__XSwitchExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15605:1: ( rule__XSwitchExpression__Group__1__Impl rule__XSwitchExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15606:2: rule__XSwitchExpression__Group__1__Impl rule__XSwitchExpression__Group__2
+            // InternalCheck.g:15605:1: ( rule__XSwitchExpression__Group__1__Impl rule__XSwitchExpression__Group__2 )
+            // InternalCheck.g:15606:2: rule__XSwitchExpression__Group__1__Impl rule__XSwitchExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__1__Impl_in_rule__XSwitchExpression__Group__131745);
+            pushFollow(FOLLOW_90);
             rule__XSwitchExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__2_in_rule__XSwitchExpression__Group__131748);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group__2();
 
             state._fsp--;
@@ -45508,22 +45508,22 @@ public final void rule__XSwitchExpression__Group__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15613:1: rule__XSwitchExpression__Group__1__Impl : ( 'switch' ) ;
+    // InternalCheck.g:15613:1: rule__XSwitchExpression__Group__1__Impl : ( 'switch' ) ;
     public final void rule__XSwitchExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15617:1: ( ( 'switch' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15618:1: ( 'switch' )
+            // InternalCheck.g:15617:1: ( ( 'switch' ) )
+            // InternalCheck.g:15618:1: ( 'switch' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15618:1: ( 'switch' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15619:1: 'switch'
+            // InternalCheck.g:15618:1: ( 'switch' )
+            // InternalCheck.g:15619:1: 'switch'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getSwitchKeyword_1()); 
             }
-            match(input,86,FOLLOW_86_in_rule__XSwitchExpression__Group__1__Impl31776); if (state.failed) return ;
+            match(input,86,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getSwitchKeyword_1()); 
             }
@@ -45549,21 +45549,21 @@ public final void rule__XSwitchExpression__Group__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15632:1: rule__XSwitchExpression__Group__2 : rule__XSwitchExpression__Group__2__Impl rule__XSwitchExpression__Group__3 ;
+    // InternalCheck.g:15632:1: rule__XSwitchExpression__Group__2 : rule__XSwitchExpression__Group__2__Impl rule__XSwitchExpression__Group__3 ;
     public final void rule__XSwitchExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15636:1: ( rule__XSwitchExpression__Group__2__Impl rule__XSwitchExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15637:2: rule__XSwitchExpression__Group__2__Impl rule__XSwitchExpression__Group__3
+            // InternalCheck.g:15636:1: ( rule__XSwitchExpression__Group__2__Impl rule__XSwitchExpression__Group__3 )
+            // InternalCheck.g:15637:2: rule__XSwitchExpression__Group__2__Impl rule__XSwitchExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__2__Impl_in_rule__XSwitchExpression__Group__231807);
+            pushFollow(FOLLOW_14);
             rule__XSwitchExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__3_in_rule__XSwitchExpression__Group__231810);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group__3();
 
             state._fsp--;
@@ -45587,25 +45587,25 @@ public final void rule__XSwitchExpression__Group__2() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15644:1: rule__XSwitchExpression__Group__2__Impl : ( ( rule__XSwitchExpression__Alternatives_2 ) ) ;
+    // InternalCheck.g:15644:1: rule__XSwitchExpression__Group__2__Impl : ( ( rule__XSwitchExpression__Alternatives_2 ) ) ;
     public final void rule__XSwitchExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15648:1: ( ( ( rule__XSwitchExpression__Alternatives_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15649:1: ( ( rule__XSwitchExpression__Alternatives_2 ) )
+            // InternalCheck.g:15648:1: ( ( ( rule__XSwitchExpression__Alternatives_2 ) ) )
+            // InternalCheck.g:15649:1: ( ( rule__XSwitchExpression__Alternatives_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15649:1: ( ( rule__XSwitchExpression__Alternatives_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15650:1: ( rule__XSwitchExpression__Alternatives_2 )
+            // InternalCheck.g:15649:1: ( ( rule__XSwitchExpression__Alternatives_2 ) )
+            // InternalCheck.g:15650:1: ( rule__XSwitchExpression__Alternatives_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getAlternatives_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15651:1: ( rule__XSwitchExpression__Alternatives_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15651:2: rule__XSwitchExpression__Alternatives_2
+            // InternalCheck.g:15651:1: ( rule__XSwitchExpression__Alternatives_2 )
+            // InternalCheck.g:15651:2: rule__XSwitchExpression__Alternatives_2
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Alternatives_2_in_rule__XSwitchExpression__Group__2__Impl31837);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Alternatives_2();
 
             state._fsp--;
@@ -45638,21 +45638,21 @@ public final void rule__XSwitchExpression__Group__2__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15661:1: rule__XSwitchExpression__Group__3 : rule__XSwitchExpression__Group__3__Impl rule__XSwitchExpression__Group__4 ;
+    // InternalCheck.g:15661:1: rule__XSwitchExpression__Group__3 : rule__XSwitchExpression__Group__3__Impl rule__XSwitchExpression__Group__4 ;
     public final void rule__XSwitchExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15665:1: ( rule__XSwitchExpression__Group__3__Impl rule__XSwitchExpression__Group__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15666:2: rule__XSwitchExpression__Group__3__Impl rule__XSwitchExpression__Group__4
+            // InternalCheck.g:15665:1: ( rule__XSwitchExpression__Group__3__Impl rule__XSwitchExpression__Group__4 )
+            // InternalCheck.g:15666:2: rule__XSwitchExpression__Group__3__Impl rule__XSwitchExpression__Group__4
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__3__Impl_in_rule__XSwitchExpression__Group__331867);
+            pushFollow(FOLLOW_91);
             rule__XSwitchExpression__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__4_in_rule__XSwitchExpression__Group__331870);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group__4();
 
             state._fsp--;
@@ -45676,22 +45676,22 @@ public final void rule__XSwitchExpression__Group__3() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15673:1: rule__XSwitchExpression__Group__3__Impl : ( '{' ) ;
+    // InternalCheck.g:15673:1: rule__XSwitchExpression__Group__3__Impl : ( '{' ) ;
     public final void rule__XSwitchExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15677:1: ( ( '{' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15678:1: ( '{' )
+            // InternalCheck.g:15677:1: ( ( '{' ) )
+            // InternalCheck.g:15678:1: ( '{' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15678:1: ( '{' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15679:1: '{'
+            // InternalCheck.g:15678:1: ( '{' )
+            // InternalCheck.g:15679:1: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getLeftCurlyBracketKeyword_3()); 
             }
-            match(input,68,FOLLOW_68_in_rule__XSwitchExpression__Group__3__Impl31898); if (state.failed) return ;
+            match(input,68,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getLeftCurlyBracketKeyword_3()); 
             }
@@ -45717,21 +45717,21 @@ public final void rule__XSwitchExpression__Group__3__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15692:1: rule__XSwitchExpression__Group__4 : rule__XSwitchExpression__Group__4__Impl rule__XSwitchExpression__Group__5 ;
+    // InternalCheck.g:15692:1: rule__XSwitchExpression__Group__4 : rule__XSwitchExpression__Group__4__Impl rule__XSwitchExpression__Group__5 ;
     public final void rule__XSwitchExpression__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15696:1: ( rule__XSwitchExpression__Group__4__Impl rule__XSwitchExpression__Group__5 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15697:2: rule__XSwitchExpression__Group__4__Impl rule__XSwitchExpression__Group__5
+            // InternalCheck.g:15696:1: ( rule__XSwitchExpression__Group__4__Impl rule__XSwitchExpression__Group__5 )
+            // InternalCheck.g:15697:2: rule__XSwitchExpression__Group__4__Impl rule__XSwitchExpression__Group__5
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__4__Impl_in_rule__XSwitchExpression__Group__431929);
+            pushFollow(FOLLOW_91);
             rule__XSwitchExpression__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__5_in_rule__XSwitchExpression__Group__431932);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group__5();
 
             state._fsp--;
@@ -45755,22 +45755,22 @@ public final void rule__XSwitchExpression__Group__4() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15704:1: rule__XSwitchExpression__Group__4__Impl : ( ( rule__XSwitchExpression__CasesAssignment_4 )* ) ;
+    // InternalCheck.g:15704:1: rule__XSwitchExpression__Group__4__Impl : ( ( rule__XSwitchExpression__CasesAssignment_4 )* ) ;
     public final void rule__XSwitchExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15708:1: ( ( ( rule__XSwitchExpression__CasesAssignment_4 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15709:1: ( ( rule__XSwitchExpression__CasesAssignment_4 )* )
+            // InternalCheck.g:15708:1: ( ( ( rule__XSwitchExpression__CasesAssignment_4 )* ) )
+            // InternalCheck.g:15709:1: ( ( rule__XSwitchExpression__CasesAssignment_4 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15709:1: ( ( rule__XSwitchExpression__CasesAssignment_4 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15710:1: ( rule__XSwitchExpression__CasesAssignment_4 )*
+            // InternalCheck.g:15709:1: ( ( rule__XSwitchExpression__CasesAssignment_4 )* )
+            // InternalCheck.g:15710:1: ( rule__XSwitchExpression__CasesAssignment_4 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getCasesAssignment_4()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15711:1: ( rule__XSwitchExpression__CasesAssignment_4 )*
+            // InternalCheck.g:15711:1: ( rule__XSwitchExpression__CasesAssignment_4 )*
             loop123:
             do {
                 int alt123=2;
@@ -45783,9 +45783,9 @@ public final void rule__XSwitchExpression__Group__4__Impl() throws RecognitionEx
 
                 switch (alt123) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15711:2: rule__XSwitchExpression__CasesAssignment_4
+            	    // InternalCheck.g:15711:2: rule__XSwitchExpression__CasesAssignment_4
             	    {
-            	    pushFollow(FOLLOW_rule__XSwitchExpression__CasesAssignment_4_in_rule__XSwitchExpression__Group__4__Impl31959);
+            	    pushFollow(FOLLOW_92);
             	    rule__XSwitchExpression__CasesAssignment_4();
 
             	    state._fsp--;
@@ -45824,21 +45824,21 @@ public final void rule__XSwitchExpression__Group__4__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__5"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15721:1: rule__XSwitchExpression__Group__5 : rule__XSwitchExpression__Group__5__Impl rule__XSwitchExpression__Group__6 ;
+    // InternalCheck.g:15721:1: rule__XSwitchExpression__Group__5 : rule__XSwitchExpression__Group__5__Impl rule__XSwitchExpression__Group__6 ;
     public final void rule__XSwitchExpression__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15725:1: ( rule__XSwitchExpression__Group__5__Impl rule__XSwitchExpression__Group__6 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15726:2: rule__XSwitchExpression__Group__5__Impl rule__XSwitchExpression__Group__6
+            // InternalCheck.g:15725:1: ( rule__XSwitchExpression__Group__5__Impl rule__XSwitchExpression__Group__6 )
+            // InternalCheck.g:15726:2: rule__XSwitchExpression__Group__5__Impl rule__XSwitchExpression__Group__6
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__5__Impl_in_rule__XSwitchExpression__Group__531990);
+            pushFollow(FOLLOW_91);
             rule__XSwitchExpression__Group__5__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__6_in_rule__XSwitchExpression__Group__531993);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group__6();
 
             state._fsp--;
@@ -45862,22 +45862,22 @@ public final void rule__XSwitchExpression__Group__5() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15733:1: rule__XSwitchExpression__Group__5__Impl : ( ( rule__XSwitchExpression__Group_5__0 )? ) ;
+    // InternalCheck.g:15733:1: rule__XSwitchExpression__Group__5__Impl : ( ( rule__XSwitchExpression__Group_5__0 )? ) ;
     public final void rule__XSwitchExpression__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15737:1: ( ( ( rule__XSwitchExpression__Group_5__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15738:1: ( ( rule__XSwitchExpression__Group_5__0 )? )
+            // InternalCheck.g:15737:1: ( ( ( rule__XSwitchExpression__Group_5__0 )? ) )
+            // InternalCheck.g:15738:1: ( ( rule__XSwitchExpression__Group_5__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15738:1: ( ( rule__XSwitchExpression__Group_5__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15739:1: ( rule__XSwitchExpression__Group_5__0 )?
+            // InternalCheck.g:15738:1: ( ( rule__XSwitchExpression__Group_5__0 )? )
+            // InternalCheck.g:15739:1: ( rule__XSwitchExpression__Group_5__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getGroup_5()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15740:1: ( rule__XSwitchExpression__Group_5__0 )?
+            // InternalCheck.g:15740:1: ( rule__XSwitchExpression__Group_5__0 )?
             int alt124=2;
             int LA124_0 = input.LA(1);
 
@@ -45886,9 +45886,9 @@ public final void rule__XSwitchExpression__Group__5__Impl() throws RecognitionEx
             }
             switch (alt124) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15740:2: rule__XSwitchExpression__Group_5__0
+                    // InternalCheck.g:15740:2: rule__XSwitchExpression__Group_5__0
                     {
-                    pushFollow(FOLLOW_rule__XSwitchExpression__Group_5__0_in_rule__XSwitchExpression__Group__5__Impl32020);
+                    pushFollow(FOLLOW_2);
                     rule__XSwitchExpression__Group_5__0();
 
                     state._fsp--;
@@ -45924,16 +45924,16 @@ public final void rule__XSwitchExpression__Group__5__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__6"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15750:1: rule__XSwitchExpression__Group__6 : rule__XSwitchExpression__Group__6__Impl ;
+    // InternalCheck.g:15750:1: rule__XSwitchExpression__Group__6 : rule__XSwitchExpression__Group__6__Impl ;
     public final void rule__XSwitchExpression__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15754:1: ( rule__XSwitchExpression__Group__6__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15755:2: rule__XSwitchExpression__Group__6__Impl
+            // InternalCheck.g:15754:1: ( rule__XSwitchExpression__Group__6__Impl )
+            // InternalCheck.g:15755:2: rule__XSwitchExpression__Group__6__Impl
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__6__Impl_in_rule__XSwitchExpression__Group__632051);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group__6__Impl();
 
             state._fsp--;
@@ -45957,22 +45957,22 @@ public final void rule__XSwitchExpression__Group__6() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__6__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15761:1: rule__XSwitchExpression__Group__6__Impl : ( '}' ) ;
+    // InternalCheck.g:15761:1: rule__XSwitchExpression__Group__6__Impl : ( '}' ) ;
     public final void rule__XSwitchExpression__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15765:1: ( ( '}' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15766:1: ( '}' )
+            // InternalCheck.g:15765:1: ( ( '}' ) )
+            // InternalCheck.g:15766:1: ( '}' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15766:1: ( '}' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15767:1: '}'
+            // InternalCheck.g:15766:1: ( '}' )
+            // InternalCheck.g:15767:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getRightCurlyBracketKeyword_6()); 
             }
-            match(input,69,FOLLOW_69_in_rule__XSwitchExpression__Group__6__Impl32079); if (state.failed) return ;
+            match(input,69,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getRightCurlyBracketKeyword_6()); 
             }
@@ -45998,21 +45998,21 @@ public final void rule__XSwitchExpression__Group__6__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15794:1: rule__XSwitchExpression__Group_2_0__0 : rule__XSwitchExpression__Group_2_0__0__Impl rule__XSwitchExpression__Group_2_0__1 ;
+    // InternalCheck.g:15794:1: rule__XSwitchExpression__Group_2_0__0 : rule__XSwitchExpression__Group_2_0__0__Impl rule__XSwitchExpression__Group_2_0__1 ;
     public final void rule__XSwitchExpression__Group_2_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15798:1: ( rule__XSwitchExpression__Group_2_0__0__Impl rule__XSwitchExpression__Group_2_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15799:2: rule__XSwitchExpression__Group_2_0__0__Impl rule__XSwitchExpression__Group_2_0__1
+            // InternalCheck.g:15798:1: ( rule__XSwitchExpression__Group_2_0__0__Impl rule__XSwitchExpression__Group_2_0__1 )
+            // InternalCheck.g:15799:2: rule__XSwitchExpression__Group_2_0__0__Impl rule__XSwitchExpression__Group_2_0__1
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0__0__Impl_in_rule__XSwitchExpression__Group_2_0__032124);
+            pushFollow(FOLLOW_32);
             rule__XSwitchExpression__Group_2_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0__1_in_rule__XSwitchExpression__Group_2_0__032127);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_0__1();
 
             state._fsp--;
@@ -46036,25 +46036,25 @@ public final void rule__XSwitchExpression__Group_2_0__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15806:1: rule__XSwitchExpression__Group_2_0__0__Impl : ( ( rule__XSwitchExpression__Group_2_0_0__0 ) ) ;
+    // InternalCheck.g:15806:1: rule__XSwitchExpression__Group_2_0__0__Impl : ( ( rule__XSwitchExpression__Group_2_0_0__0 ) ) ;
     public final void rule__XSwitchExpression__Group_2_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15810:1: ( ( ( rule__XSwitchExpression__Group_2_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15811:1: ( ( rule__XSwitchExpression__Group_2_0_0__0 ) )
+            // InternalCheck.g:15810:1: ( ( ( rule__XSwitchExpression__Group_2_0_0__0 ) ) )
+            // InternalCheck.g:15811:1: ( ( rule__XSwitchExpression__Group_2_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15811:1: ( ( rule__XSwitchExpression__Group_2_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15812:1: ( rule__XSwitchExpression__Group_2_0_0__0 )
+            // InternalCheck.g:15811:1: ( ( rule__XSwitchExpression__Group_2_0_0__0 ) )
+            // InternalCheck.g:15812:1: ( rule__XSwitchExpression__Group_2_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getGroup_2_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15813:1: ( rule__XSwitchExpression__Group_2_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15813:2: rule__XSwitchExpression__Group_2_0_0__0
+            // InternalCheck.g:15813:1: ( rule__XSwitchExpression__Group_2_0_0__0 )
+            // InternalCheck.g:15813:2: rule__XSwitchExpression__Group_2_0_0__0
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0_0__0_in_rule__XSwitchExpression__Group_2_0__0__Impl32154);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_0_0__0();
 
             state._fsp--;
@@ -46087,21 +46087,21 @@ public final void rule__XSwitchExpression__Group_2_0__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15823:1: rule__XSwitchExpression__Group_2_0__1 : rule__XSwitchExpression__Group_2_0__1__Impl rule__XSwitchExpression__Group_2_0__2 ;
+    // InternalCheck.g:15823:1: rule__XSwitchExpression__Group_2_0__1 : rule__XSwitchExpression__Group_2_0__1__Impl rule__XSwitchExpression__Group_2_0__2 ;
     public final void rule__XSwitchExpression__Group_2_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15827:1: ( rule__XSwitchExpression__Group_2_0__1__Impl rule__XSwitchExpression__Group_2_0__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15828:2: rule__XSwitchExpression__Group_2_0__1__Impl rule__XSwitchExpression__Group_2_0__2
+            // InternalCheck.g:15827:1: ( rule__XSwitchExpression__Group_2_0__1__Impl rule__XSwitchExpression__Group_2_0__2 )
+            // InternalCheck.g:15828:2: rule__XSwitchExpression__Group_2_0__1__Impl rule__XSwitchExpression__Group_2_0__2
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0__1__Impl_in_rule__XSwitchExpression__Group_2_0__132184);
+            pushFollow(FOLLOW_28);
             rule__XSwitchExpression__Group_2_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0__2_in_rule__XSwitchExpression__Group_2_0__132187);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_0__2();
 
             state._fsp--;
@@ -46125,25 +46125,25 @@ public final void rule__XSwitchExpression__Group_2_0__1() throws RecognitionExce
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15835:1: rule__XSwitchExpression__Group_2_0__1__Impl : ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) ) ;
+    // InternalCheck.g:15835:1: rule__XSwitchExpression__Group_2_0__1__Impl : ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) ) ;
     public final void rule__XSwitchExpression__Group_2_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15839:1: ( ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15840:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) )
+            // InternalCheck.g:15839:1: ( ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) ) )
+            // InternalCheck.g:15840:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15840:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15841:1: ( rule__XSwitchExpression__SwitchAssignment_2_0_1 )
+            // InternalCheck.g:15840:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) )
+            // InternalCheck.g:15841:1: ( rule__XSwitchExpression__SwitchAssignment_2_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getSwitchAssignment_2_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15842:1: ( rule__XSwitchExpression__SwitchAssignment_2_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15842:2: rule__XSwitchExpression__SwitchAssignment_2_0_1
+            // InternalCheck.g:15842:1: ( rule__XSwitchExpression__SwitchAssignment_2_0_1 )
+            // InternalCheck.g:15842:2: rule__XSwitchExpression__SwitchAssignment_2_0_1
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__SwitchAssignment_2_0_1_in_rule__XSwitchExpression__Group_2_0__1__Impl32214);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__SwitchAssignment_2_0_1();
 
             state._fsp--;
@@ -46176,16 +46176,16 @@ public final void rule__XSwitchExpression__Group_2_0__1__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15852:1: rule__XSwitchExpression__Group_2_0__2 : rule__XSwitchExpression__Group_2_0__2__Impl ;
+    // InternalCheck.g:15852:1: rule__XSwitchExpression__Group_2_0__2 : rule__XSwitchExpression__Group_2_0__2__Impl ;
     public final void rule__XSwitchExpression__Group_2_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15856:1: ( rule__XSwitchExpression__Group_2_0__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15857:2: rule__XSwitchExpression__Group_2_0__2__Impl
+            // InternalCheck.g:15856:1: ( rule__XSwitchExpression__Group_2_0__2__Impl )
+            // InternalCheck.g:15857:2: rule__XSwitchExpression__Group_2_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0__2__Impl_in_rule__XSwitchExpression__Group_2_0__232244);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_0__2__Impl();
 
             state._fsp--;
@@ -46209,22 +46209,22 @@ public final void rule__XSwitchExpression__Group_2_0__2() throws RecognitionExce
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15863:1: rule__XSwitchExpression__Group_2_0__2__Impl : ( ')' ) ;
+    // InternalCheck.g:15863:1: rule__XSwitchExpression__Group_2_0__2__Impl : ( ')' ) ;
     public final void rule__XSwitchExpression__Group_2_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15867:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15868:1: ( ')' )
+            // InternalCheck.g:15867:1: ( ( ')' ) )
+            // InternalCheck.g:15868:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15868:1: ( ')' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15869:1: ')'
+            // InternalCheck.g:15868:1: ( ')' )
+            // InternalCheck.g:15869:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getRightParenthesisKeyword_2_0_2()); 
             }
-            match(input,73,FOLLOW_73_in_rule__XSwitchExpression__Group_2_0__2__Impl32272); if (state.failed) return ;
+            match(input,73,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getRightParenthesisKeyword_2_0_2()); 
             }
@@ -46250,16 +46250,16 @@ public final void rule__XSwitchExpression__Group_2_0__2__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15888:1: rule__XSwitchExpression__Group_2_0_0__0 : rule__XSwitchExpression__Group_2_0_0__0__Impl ;
+    // InternalCheck.g:15888:1: rule__XSwitchExpression__Group_2_0_0__0 : rule__XSwitchExpression__Group_2_0_0__0__Impl ;
     public final void rule__XSwitchExpression__Group_2_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15892:1: ( rule__XSwitchExpression__Group_2_0_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15893:2: rule__XSwitchExpression__Group_2_0_0__0__Impl
+            // InternalCheck.g:15892:1: ( rule__XSwitchExpression__Group_2_0_0__0__Impl )
+            // InternalCheck.g:15893:2: rule__XSwitchExpression__Group_2_0_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0_0__0__Impl_in_rule__XSwitchExpression__Group_2_0_0__032309);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_0_0__0__Impl();
 
             state._fsp--;
@@ -46283,25 +46283,25 @@ public final void rule__XSwitchExpression__Group_2_0_0__0() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15899:1: rule__XSwitchExpression__Group_2_0_0__0__Impl : ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) ) ;
+    // InternalCheck.g:15899:1: rule__XSwitchExpression__Group_2_0_0__0__Impl : ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) ) ;
     public final void rule__XSwitchExpression__Group_2_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15903:1: ( ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15904:1: ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) )
+            // InternalCheck.g:15903:1: ( ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) ) )
+            // InternalCheck.g:15904:1: ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15904:1: ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15905:1: ( rule__XSwitchExpression__Group_2_0_0_0__0 )
+            // InternalCheck.g:15904:1: ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) )
+            // InternalCheck.g:15905:1: ( rule__XSwitchExpression__Group_2_0_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getGroup_2_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15906:1: ( rule__XSwitchExpression__Group_2_0_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15906:2: rule__XSwitchExpression__Group_2_0_0_0__0
+            // InternalCheck.g:15906:1: ( rule__XSwitchExpression__Group_2_0_0_0__0 )
+            // InternalCheck.g:15906:2: rule__XSwitchExpression__Group_2_0_0_0__0
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__0_in_rule__XSwitchExpression__Group_2_0_0__0__Impl32336);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_0_0_0__0();
 
             state._fsp--;
@@ -46334,21 +46334,21 @@ public final void rule__XSwitchExpression__Group_2_0_0__0__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15918:1: rule__XSwitchExpression__Group_2_0_0_0__0 : rule__XSwitchExpression__Group_2_0_0_0__0__Impl rule__XSwitchExpression__Group_2_0_0_0__1 ;
+    // InternalCheck.g:15918:1: rule__XSwitchExpression__Group_2_0_0_0__0 : rule__XSwitchExpression__Group_2_0_0_0__0__Impl rule__XSwitchExpression__Group_2_0_0_0__1 ;
     public final void rule__XSwitchExpression__Group_2_0_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15922:1: ( rule__XSwitchExpression__Group_2_0_0_0__0__Impl rule__XSwitchExpression__Group_2_0_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15923:2: rule__XSwitchExpression__Group_2_0_0_0__0__Impl rule__XSwitchExpression__Group_2_0_0_0__1
+            // InternalCheck.g:15922:1: ( rule__XSwitchExpression__Group_2_0_0_0__0__Impl rule__XSwitchExpression__Group_2_0_0_0__1 )
+            // InternalCheck.g:15923:2: rule__XSwitchExpression__Group_2_0_0_0__0__Impl rule__XSwitchExpression__Group_2_0_0_0__1
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__0__Impl_in_rule__XSwitchExpression__Group_2_0_0_0__032368);
+            pushFollow(FOLLOW_29);
             rule__XSwitchExpression__Group_2_0_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__1_in_rule__XSwitchExpression__Group_2_0_0_0__032371);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_0_0_0__1();
 
             state._fsp--;
@@ -46372,22 +46372,22 @@ public final void rule__XSwitchExpression__Group_2_0_0_0__0() throws Recognition
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15930:1: rule__XSwitchExpression__Group_2_0_0_0__0__Impl : ( '(' ) ;
+    // InternalCheck.g:15930:1: rule__XSwitchExpression__Group_2_0_0_0__0__Impl : ( '(' ) ;
     public final void rule__XSwitchExpression__Group_2_0_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15934:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15935:1: ( '(' )
+            // InternalCheck.g:15934:1: ( ( '(' ) )
+            // InternalCheck.g:15935:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15935:1: ( '(' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15936:1: '('
+            // InternalCheck.g:15935:1: ( '(' )
+            // InternalCheck.g:15936:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getLeftParenthesisKeyword_2_0_0_0_0()); 
             }
-            match(input,72,FOLLOW_72_in_rule__XSwitchExpression__Group_2_0_0_0__0__Impl32399); if (state.failed) return ;
+            match(input,72,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getLeftParenthesisKeyword_2_0_0_0_0()); 
             }
@@ -46413,21 +46413,21 @@ public final void rule__XSwitchExpression__Group_2_0_0_0__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15949:1: rule__XSwitchExpression__Group_2_0_0_0__1 : rule__XSwitchExpression__Group_2_0_0_0__1__Impl rule__XSwitchExpression__Group_2_0_0_0__2 ;
+    // InternalCheck.g:15949:1: rule__XSwitchExpression__Group_2_0_0_0__1 : rule__XSwitchExpression__Group_2_0_0_0__1__Impl rule__XSwitchExpression__Group_2_0_0_0__2 ;
     public final void rule__XSwitchExpression__Group_2_0_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15953:1: ( rule__XSwitchExpression__Group_2_0_0_0__1__Impl rule__XSwitchExpression__Group_2_0_0_0__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15954:2: rule__XSwitchExpression__Group_2_0_0_0__1__Impl rule__XSwitchExpression__Group_2_0_0_0__2
+            // InternalCheck.g:15953:1: ( rule__XSwitchExpression__Group_2_0_0_0__1__Impl rule__XSwitchExpression__Group_2_0_0_0__2 )
+            // InternalCheck.g:15954:2: rule__XSwitchExpression__Group_2_0_0_0__1__Impl rule__XSwitchExpression__Group_2_0_0_0__2
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__1__Impl_in_rule__XSwitchExpression__Group_2_0_0_0__132430);
+            pushFollow(FOLLOW_93);
             rule__XSwitchExpression__Group_2_0_0_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__2_in_rule__XSwitchExpression__Group_2_0_0_0__132433);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_0_0_0__2();
 
             state._fsp--;
@@ -46451,25 +46451,25 @@ public final void rule__XSwitchExpression__Group_2_0_0_0__1() throws Recognition
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15961:1: rule__XSwitchExpression__Group_2_0_0_0__1__Impl : ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) ) ;
+    // InternalCheck.g:15961:1: rule__XSwitchExpression__Group_2_0_0_0__1__Impl : ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) ) ;
     public final void rule__XSwitchExpression__Group_2_0_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15965:1: ( ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15966:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) )
+            // InternalCheck.g:15965:1: ( ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) ) )
+            // InternalCheck.g:15966:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15966:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15967:1: ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 )
+            // InternalCheck.g:15966:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) )
+            // InternalCheck.g:15967:1: ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getDeclaredParamAssignment_2_0_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15968:1: ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15968:2: rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1
+            // InternalCheck.g:15968:1: ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 )
+            // InternalCheck.g:15968:2: rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1_in_rule__XSwitchExpression__Group_2_0_0_0__1__Impl32460);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1();
 
             state._fsp--;
@@ -46502,16 +46502,16 @@ public final void rule__XSwitchExpression__Group_2_0_0_0__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0_0__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15978:1: rule__XSwitchExpression__Group_2_0_0_0__2 : rule__XSwitchExpression__Group_2_0_0_0__2__Impl ;
+    // InternalCheck.g:15978:1: rule__XSwitchExpression__Group_2_0_0_0__2 : rule__XSwitchExpression__Group_2_0_0_0__2__Impl ;
     public final void rule__XSwitchExpression__Group_2_0_0_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15982:1: ( rule__XSwitchExpression__Group_2_0_0_0__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15983:2: rule__XSwitchExpression__Group_2_0_0_0__2__Impl
+            // InternalCheck.g:15982:1: ( rule__XSwitchExpression__Group_2_0_0_0__2__Impl )
+            // InternalCheck.g:15983:2: rule__XSwitchExpression__Group_2_0_0_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__2__Impl_in_rule__XSwitchExpression__Group_2_0_0_0__232490);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_0_0_0__2__Impl();
 
             state._fsp--;
@@ -46535,22 +46535,22 @@ public final void rule__XSwitchExpression__Group_2_0_0_0__2() throws Recognition
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0_0__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15989:1: rule__XSwitchExpression__Group_2_0_0_0__2__Impl : ( ':' ) ;
+    // InternalCheck.g:15989:1: rule__XSwitchExpression__Group_2_0_0_0__2__Impl : ( ':' ) ;
     public final void rule__XSwitchExpression__Group_2_0_0_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15993:1: ( ( ':' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15994:1: ( ':' )
+            // InternalCheck.g:15993:1: ( ( ':' ) )
+            // InternalCheck.g:15994:1: ( ':' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15994:1: ( ':' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15995:1: ':'
+            // InternalCheck.g:15994:1: ( ':' )
+            // InternalCheck.g:15995:1: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getColonKeyword_2_0_0_0_2()); 
             }
-            match(input,87,FOLLOW_87_in_rule__XSwitchExpression__Group_2_0_0_0__2__Impl32518); if (state.failed) return ;
+            match(input,87,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getColonKeyword_2_0_0_0_2()); 
             }
@@ -46576,21 +46576,21 @@ public final void rule__XSwitchExpression__Group_2_0_0_0__2__Impl() throws Recog
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16014:1: rule__XSwitchExpression__Group_2_1__0 : rule__XSwitchExpression__Group_2_1__0__Impl rule__XSwitchExpression__Group_2_1__1 ;
+    // InternalCheck.g:16014:1: rule__XSwitchExpression__Group_2_1__0 : rule__XSwitchExpression__Group_2_1__0__Impl rule__XSwitchExpression__Group_2_1__1 ;
     public final void rule__XSwitchExpression__Group_2_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16018:1: ( rule__XSwitchExpression__Group_2_1__0__Impl rule__XSwitchExpression__Group_2_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16019:2: rule__XSwitchExpression__Group_2_1__0__Impl rule__XSwitchExpression__Group_2_1__1
+            // InternalCheck.g:16018:1: ( rule__XSwitchExpression__Group_2_1__0__Impl rule__XSwitchExpression__Group_2_1__1 )
+            // InternalCheck.g:16019:2: rule__XSwitchExpression__Group_2_1__0__Impl rule__XSwitchExpression__Group_2_1__1
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1__0__Impl_in_rule__XSwitchExpression__Group_2_1__032555);
+            pushFollow(FOLLOW_90);
             rule__XSwitchExpression__Group_2_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1__1_in_rule__XSwitchExpression__Group_2_1__032558);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_1__1();
 
             state._fsp--;
@@ -46614,29 +46614,29 @@ public final void rule__XSwitchExpression__Group_2_1__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16026:1: rule__XSwitchExpression__Group_2_1__0__Impl : ( ( rule__XSwitchExpression__Group_2_1_0__0 )? ) ;
+    // InternalCheck.g:16026:1: rule__XSwitchExpression__Group_2_1__0__Impl : ( ( rule__XSwitchExpression__Group_2_1_0__0 )? ) ;
     public final void rule__XSwitchExpression__Group_2_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16030:1: ( ( ( rule__XSwitchExpression__Group_2_1_0__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16031:1: ( ( rule__XSwitchExpression__Group_2_1_0__0 )? )
+            // InternalCheck.g:16030:1: ( ( ( rule__XSwitchExpression__Group_2_1_0__0 )? ) )
+            // InternalCheck.g:16031:1: ( ( rule__XSwitchExpression__Group_2_1_0__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16031:1: ( ( rule__XSwitchExpression__Group_2_1_0__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16032:1: ( rule__XSwitchExpression__Group_2_1_0__0 )?
+            // InternalCheck.g:16031:1: ( ( rule__XSwitchExpression__Group_2_1_0__0 )? )
+            // InternalCheck.g:16032:1: ( rule__XSwitchExpression__Group_2_1_0__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getGroup_2_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16033:1: ( rule__XSwitchExpression__Group_2_1_0__0 )?
+            // InternalCheck.g:16033:1: ( rule__XSwitchExpression__Group_2_1_0__0 )?
             int alt125=2;
             alt125 = dfa125.predict(input);
             switch (alt125) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16033:2: rule__XSwitchExpression__Group_2_1_0__0
+                    // InternalCheck.g:16033:2: rule__XSwitchExpression__Group_2_1_0__0
                     {
-                    pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1_0__0_in_rule__XSwitchExpression__Group_2_1__0__Impl32585);
+                    pushFollow(FOLLOW_2);
                     rule__XSwitchExpression__Group_2_1_0__0();
 
                     state._fsp--;
@@ -46672,16 +46672,16 @@ public final void rule__XSwitchExpression__Group_2_1__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16043:1: rule__XSwitchExpression__Group_2_1__1 : rule__XSwitchExpression__Group_2_1__1__Impl ;
+    // InternalCheck.g:16043:1: rule__XSwitchExpression__Group_2_1__1 : rule__XSwitchExpression__Group_2_1__1__Impl ;
     public final void rule__XSwitchExpression__Group_2_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16047:1: ( rule__XSwitchExpression__Group_2_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16048:2: rule__XSwitchExpression__Group_2_1__1__Impl
+            // InternalCheck.g:16047:1: ( rule__XSwitchExpression__Group_2_1__1__Impl )
+            // InternalCheck.g:16048:2: rule__XSwitchExpression__Group_2_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1__1__Impl_in_rule__XSwitchExpression__Group_2_1__132616);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_1__1__Impl();
 
             state._fsp--;
@@ -46705,25 +46705,25 @@ public final void rule__XSwitchExpression__Group_2_1__1() throws RecognitionExce
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16054:1: rule__XSwitchExpression__Group_2_1__1__Impl : ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) ) ;
+    // InternalCheck.g:16054:1: rule__XSwitchExpression__Group_2_1__1__Impl : ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) ) ;
     public final void rule__XSwitchExpression__Group_2_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16058:1: ( ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16059:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) )
+            // InternalCheck.g:16058:1: ( ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) ) )
+            // InternalCheck.g:16059:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16059:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16060:1: ( rule__XSwitchExpression__SwitchAssignment_2_1_1 )
+            // InternalCheck.g:16059:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) )
+            // InternalCheck.g:16060:1: ( rule__XSwitchExpression__SwitchAssignment_2_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getSwitchAssignment_2_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16061:1: ( rule__XSwitchExpression__SwitchAssignment_2_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16061:2: rule__XSwitchExpression__SwitchAssignment_2_1_1
+            // InternalCheck.g:16061:1: ( rule__XSwitchExpression__SwitchAssignment_2_1_1 )
+            // InternalCheck.g:16061:2: rule__XSwitchExpression__SwitchAssignment_2_1_1
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__SwitchAssignment_2_1_1_in_rule__XSwitchExpression__Group_2_1__1__Impl32643);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__SwitchAssignment_2_1_1();
 
             state._fsp--;
@@ -46756,16 +46756,16 @@ public final void rule__XSwitchExpression__Group_2_1__1__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16075:1: rule__XSwitchExpression__Group_2_1_0__0 : rule__XSwitchExpression__Group_2_1_0__0__Impl ;
+    // InternalCheck.g:16075:1: rule__XSwitchExpression__Group_2_1_0__0 : rule__XSwitchExpression__Group_2_1_0__0__Impl ;
     public final void rule__XSwitchExpression__Group_2_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16079:1: ( rule__XSwitchExpression__Group_2_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16080:2: rule__XSwitchExpression__Group_2_1_0__0__Impl
+            // InternalCheck.g:16079:1: ( rule__XSwitchExpression__Group_2_1_0__0__Impl )
+            // InternalCheck.g:16080:2: rule__XSwitchExpression__Group_2_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1_0__0__Impl_in_rule__XSwitchExpression__Group_2_1_0__032677);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_1_0__0__Impl();
 
             state._fsp--;
@@ -46789,25 +46789,25 @@ public final void rule__XSwitchExpression__Group_2_1_0__0() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16086:1: rule__XSwitchExpression__Group_2_1_0__0__Impl : ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) ) ;
+    // InternalCheck.g:16086:1: rule__XSwitchExpression__Group_2_1_0__0__Impl : ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) ) ;
     public final void rule__XSwitchExpression__Group_2_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16090:1: ( ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16091:1: ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) )
+            // InternalCheck.g:16090:1: ( ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) ) )
+            // InternalCheck.g:16091:1: ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16091:1: ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16092:1: ( rule__XSwitchExpression__Group_2_1_0_0__0 )
+            // InternalCheck.g:16091:1: ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) )
+            // InternalCheck.g:16092:1: ( rule__XSwitchExpression__Group_2_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getGroup_2_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16093:1: ( rule__XSwitchExpression__Group_2_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16093:2: rule__XSwitchExpression__Group_2_1_0_0__0
+            // InternalCheck.g:16093:1: ( rule__XSwitchExpression__Group_2_1_0_0__0 )
+            // InternalCheck.g:16093:2: rule__XSwitchExpression__Group_2_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1_0_0__0_in_rule__XSwitchExpression__Group_2_1_0__0__Impl32704);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_1_0_0__0();
 
             state._fsp--;
@@ -46840,21 +46840,21 @@ public final void rule__XSwitchExpression__Group_2_1_0__0__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16105:1: rule__XSwitchExpression__Group_2_1_0_0__0 : rule__XSwitchExpression__Group_2_1_0_0__0__Impl rule__XSwitchExpression__Group_2_1_0_0__1 ;
+    // InternalCheck.g:16105:1: rule__XSwitchExpression__Group_2_1_0_0__0 : rule__XSwitchExpression__Group_2_1_0_0__0__Impl rule__XSwitchExpression__Group_2_1_0_0__1 ;
     public final void rule__XSwitchExpression__Group_2_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16109:1: ( rule__XSwitchExpression__Group_2_1_0_0__0__Impl rule__XSwitchExpression__Group_2_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16110:2: rule__XSwitchExpression__Group_2_1_0_0__0__Impl rule__XSwitchExpression__Group_2_1_0_0__1
+            // InternalCheck.g:16109:1: ( rule__XSwitchExpression__Group_2_1_0_0__0__Impl rule__XSwitchExpression__Group_2_1_0_0__1 )
+            // InternalCheck.g:16110:2: rule__XSwitchExpression__Group_2_1_0_0__0__Impl rule__XSwitchExpression__Group_2_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1_0_0__0__Impl_in_rule__XSwitchExpression__Group_2_1_0_0__032736);
+            pushFollow(FOLLOW_93);
             rule__XSwitchExpression__Group_2_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1_0_0__1_in_rule__XSwitchExpression__Group_2_1_0_0__032739);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_1_0_0__1();
 
             state._fsp--;
@@ -46878,25 +46878,25 @@ public final void rule__XSwitchExpression__Group_2_1_0_0__0() throws Recognition
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16117:1: rule__XSwitchExpression__Group_2_1_0_0__0__Impl : ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) ) ;
+    // InternalCheck.g:16117:1: rule__XSwitchExpression__Group_2_1_0_0__0__Impl : ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) ) ;
     public final void rule__XSwitchExpression__Group_2_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16121:1: ( ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16122:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) )
+            // InternalCheck.g:16121:1: ( ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) ) )
+            // InternalCheck.g:16122:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16122:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16123:1: ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 )
+            // InternalCheck.g:16122:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) )
+            // InternalCheck.g:16123:1: ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getDeclaredParamAssignment_2_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16124:1: ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16124:2: rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0
+            // InternalCheck.g:16124:1: ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 )
+            // InternalCheck.g:16124:2: rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0_in_rule__XSwitchExpression__Group_2_1_0_0__0__Impl32766);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0();
 
             state._fsp--;
@@ -46929,16 +46929,16 @@ public final void rule__XSwitchExpression__Group_2_1_0_0__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16134:1: rule__XSwitchExpression__Group_2_1_0_0__1 : rule__XSwitchExpression__Group_2_1_0_0__1__Impl ;
+    // InternalCheck.g:16134:1: rule__XSwitchExpression__Group_2_1_0_0__1 : rule__XSwitchExpression__Group_2_1_0_0__1__Impl ;
     public final void rule__XSwitchExpression__Group_2_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16138:1: ( rule__XSwitchExpression__Group_2_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16139:2: rule__XSwitchExpression__Group_2_1_0_0__1__Impl
+            // InternalCheck.g:16138:1: ( rule__XSwitchExpression__Group_2_1_0_0__1__Impl )
+            // InternalCheck.g:16139:2: rule__XSwitchExpression__Group_2_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1_0_0__1__Impl_in_rule__XSwitchExpression__Group_2_1_0_0__132796);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_1_0_0__1__Impl();
 
             state._fsp--;
@@ -46962,22 +46962,22 @@ public final void rule__XSwitchExpression__Group_2_1_0_0__1() throws Recognition
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16145:1: rule__XSwitchExpression__Group_2_1_0_0__1__Impl : ( ':' ) ;
+    // InternalCheck.g:16145:1: rule__XSwitchExpression__Group_2_1_0_0__1__Impl : ( ':' ) ;
     public final void rule__XSwitchExpression__Group_2_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16149:1: ( ( ':' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16150:1: ( ':' )
+            // InternalCheck.g:16149:1: ( ( ':' ) )
+            // InternalCheck.g:16150:1: ( ':' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16150:1: ( ':' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16151:1: ':'
+            // InternalCheck.g:16150:1: ( ':' )
+            // InternalCheck.g:16151:1: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getColonKeyword_2_1_0_0_1()); 
             }
-            match(input,87,FOLLOW_87_in_rule__XSwitchExpression__Group_2_1_0_0__1__Impl32824); if (state.failed) return ;
+            match(input,87,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getColonKeyword_2_1_0_0_1()); 
             }
@@ -47003,21 +47003,21 @@ public final void rule__XSwitchExpression__Group_2_1_0_0__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_5__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16168:1: rule__XSwitchExpression__Group_5__0 : rule__XSwitchExpression__Group_5__0__Impl rule__XSwitchExpression__Group_5__1 ;
+    // InternalCheck.g:16168:1: rule__XSwitchExpression__Group_5__0 : rule__XSwitchExpression__Group_5__0__Impl rule__XSwitchExpression__Group_5__1 ;
     public final void rule__XSwitchExpression__Group_5__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16172:1: ( rule__XSwitchExpression__Group_5__0__Impl rule__XSwitchExpression__Group_5__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16173:2: rule__XSwitchExpression__Group_5__0__Impl rule__XSwitchExpression__Group_5__1
+            // InternalCheck.g:16172:1: ( rule__XSwitchExpression__Group_5__0__Impl rule__XSwitchExpression__Group_5__1 )
+            // InternalCheck.g:16173:2: rule__XSwitchExpression__Group_5__0__Impl rule__XSwitchExpression__Group_5__1
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_5__0__Impl_in_rule__XSwitchExpression__Group_5__032859);
+            pushFollow(FOLLOW_93);
             rule__XSwitchExpression__Group_5__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_5__1_in_rule__XSwitchExpression__Group_5__032862);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_5__1();
 
             state._fsp--;
@@ -47041,22 +47041,22 @@ public final void rule__XSwitchExpression__Group_5__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_5__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16180:1: rule__XSwitchExpression__Group_5__0__Impl : ( 'default' ) ;
+    // InternalCheck.g:16180:1: rule__XSwitchExpression__Group_5__0__Impl : ( 'default' ) ;
     public final void rule__XSwitchExpression__Group_5__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16184:1: ( ( 'default' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16185:1: ( 'default' )
+            // InternalCheck.g:16184:1: ( ( 'default' ) )
+            // InternalCheck.g:16185:1: ( 'default' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16185:1: ( 'default' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16186:1: 'default'
+            // InternalCheck.g:16185:1: ( 'default' )
+            // InternalCheck.g:16186:1: 'default'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getDefaultKeyword_5_0()); 
             }
-            match(input,88,FOLLOW_88_in_rule__XSwitchExpression__Group_5__0__Impl32890); if (state.failed) return ;
+            match(input,88,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getDefaultKeyword_5_0()); 
             }
@@ -47082,21 +47082,21 @@ public final void rule__XSwitchExpression__Group_5__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_5__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16199:1: rule__XSwitchExpression__Group_5__1 : rule__XSwitchExpression__Group_5__1__Impl rule__XSwitchExpression__Group_5__2 ;
+    // InternalCheck.g:16199:1: rule__XSwitchExpression__Group_5__1 : rule__XSwitchExpression__Group_5__1__Impl rule__XSwitchExpression__Group_5__2 ;
     public final void rule__XSwitchExpression__Group_5__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16203:1: ( rule__XSwitchExpression__Group_5__1__Impl rule__XSwitchExpression__Group_5__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16204:2: rule__XSwitchExpression__Group_5__1__Impl rule__XSwitchExpression__Group_5__2
+            // InternalCheck.g:16203:1: ( rule__XSwitchExpression__Group_5__1__Impl rule__XSwitchExpression__Group_5__2 )
+            // InternalCheck.g:16204:2: rule__XSwitchExpression__Group_5__1__Impl rule__XSwitchExpression__Group_5__2
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_5__1__Impl_in_rule__XSwitchExpression__Group_5__132921);
+            pushFollow(FOLLOW_32);
             rule__XSwitchExpression__Group_5__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_5__2_in_rule__XSwitchExpression__Group_5__132924);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_5__2();
 
             state._fsp--;
@@ -47120,22 +47120,22 @@ public final void rule__XSwitchExpression__Group_5__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_5__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16211:1: rule__XSwitchExpression__Group_5__1__Impl : ( ':' ) ;
+    // InternalCheck.g:16211:1: rule__XSwitchExpression__Group_5__1__Impl : ( ':' ) ;
     public final void rule__XSwitchExpression__Group_5__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16215:1: ( ( ':' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16216:1: ( ':' )
+            // InternalCheck.g:16215:1: ( ( ':' ) )
+            // InternalCheck.g:16216:1: ( ':' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16216:1: ( ':' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16217:1: ':'
+            // InternalCheck.g:16216:1: ( ':' )
+            // InternalCheck.g:16217:1: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getColonKeyword_5_1()); 
             }
-            match(input,87,FOLLOW_87_in_rule__XSwitchExpression__Group_5__1__Impl32952); if (state.failed) return ;
+            match(input,87,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getColonKeyword_5_1()); 
             }
@@ -47161,16 +47161,16 @@ public final void rule__XSwitchExpression__Group_5__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_5__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16230:1: rule__XSwitchExpression__Group_5__2 : rule__XSwitchExpression__Group_5__2__Impl ;
+    // InternalCheck.g:16230:1: rule__XSwitchExpression__Group_5__2 : rule__XSwitchExpression__Group_5__2__Impl ;
     public final void rule__XSwitchExpression__Group_5__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16234:1: ( rule__XSwitchExpression__Group_5__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16235:2: rule__XSwitchExpression__Group_5__2__Impl
+            // InternalCheck.g:16234:1: ( rule__XSwitchExpression__Group_5__2__Impl )
+            // InternalCheck.g:16235:2: rule__XSwitchExpression__Group_5__2__Impl
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_5__2__Impl_in_rule__XSwitchExpression__Group_5__232983);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_5__2__Impl();
 
             state._fsp--;
@@ -47194,25 +47194,25 @@ public final void rule__XSwitchExpression__Group_5__2() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_5__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16241:1: rule__XSwitchExpression__Group_5__2__Impl : ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) ) ;
+    // InternalCheck.g:16241:1: rule__XSwitchExpression__Group_5__2__Impl : ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) ) ;
     public final void rule__XSwitchExpression__Group_5__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16245:1: ( ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16246:1: ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) )
+            // InternalCheck.g:16245:1: ( ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) ) )
+            // InternalCheck.g:16246:1: ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16246:1: ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16247:1: ( rule__XSwitchExpression__DefaultAssignment_5_2 )
+            // InternalCheck.g:16246:1: ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) )
+            // InternalCheck.g:16247:1: ( rule__XSwitchExpression__DefaultAssignment_5_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getDefaultAssignment_5_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16248:1: ( rule__XSwitchExpression__DefaultAssignment_5_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16248:2: rule__XSwitchExpression__DefaultAssignment_5_2
+            // InternalCheck.g:16248:1: ( rule__XSwitchExpression__DefaultAssignment_5_2 )
+            // InternalCheck.g:16248:2: rule__XSwitchExpression__DefaultAssignment_5_2
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__DefaultAssignment_5_2_in_rule__XSwitchExpression__Group_5__2__Impl33010);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__DefaultAssignment_5_2();
 
             state._fsp--;
@@ -47245,21 +47245,21 @@ public final void rule__XSwitchExpression__Group_5__2__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XCasePart__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16264:1: rule__XCasePart__Group__0 : rule__XCasePart__Group__0__Impl rule__XCasePart__Group__1 ;
+    // InternalCheck.g:16264:1: rule__XCasePart__Group__0 : rule__XCasePart__Group__0__Impl rule__XCasePart__Group__1 ;
     public final void rule__XCasePart__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16268:1: ( rule__XCasePart__Group__0__Impl rule__XCasePart__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16269:2: rule__XCasePart__Group__0__Impl rule__XCasePart__Group__1
+            // InternalCheck.g:16268:1: ( rule__XCasePart__Group__0__Impl rule__XCasePart__Group__1 )
+            // InternalCheck.g:16269:2: rule__XCasePart__Group__0__Impl rule__XCasePart__Group__1
             {
-            pushFollow(FOLLOW_rule__XCasePart__Group__0__Impl_in_rule__XCasePart__Group__033046);
+            pushFollow(FOLLOW_94);
             rule__XCasePart__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCasePart__Group__1_in_rule__XCasePart__Group__033049);
+            pushFollow(FOLLOW_2);
             rule__XCasePart__Group__1();
 
             state._fsp--;
@@ -47283,23 +47283,23 @@ public final void rule__XCasePart__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCasePart__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16276:1: rule__XCasePart__Group__0__Impl : ( () ) ;
+    // InternalCheck.g:16276:1: rule__XCasePart__Group__0__Impl : ( () ) ;
     public final void rule__XCasePart__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16280:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16281:1: ( () )
+            // InternalCheck.g:16280:1: ( ( () ) )
+            // InternalCheck.g:16281:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16281:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16282:1: ()
+            // InternalCheck.g:16281:1: ( () )
+            // InternalCheck.g:16282:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getXCasePartAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16283:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16285:1: 
+            // InternalCheck.g:16283:1: ()
+            // InternalCheck.g:16285:1: 
             {
             }
 
@@ -47324,21 +47324,21 @@ public final void rule__XCasePart__Group__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__XCasePart__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16295:1: rule__XCasePart__Group__1 : rule__XCasePart__Group__1__Impl rule__XCasePart__Group__2 ;
+    // InternalCheck.g:16295:1: rule__XCasePart__Group__1 : rule__XCasePart__Group__1__Impl rule__XCasePart__Group__2 ;
     public final void rule__XCasePart__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16299:1: ( rule__XCasePart__Group__1__Impl rule__XCasePart__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16300:2: rule__XCasePart__Group__1__Impl rule__XCasePart__Group__2
+            // InternalCheck.g:16299:1: ( rule__XCasePart__Group__1__Impl rule__XCasePart__Group__2 )
+            // InternalCheck.g:16300:2: rule__XCasePart__Group__1__Impl rule__XCasePart__Group__2
             {
-            pushFollow(FOLLOW_rule__XCasePart__Group__1__Impl_in_rule__XCasePart__Group__133107);
+            pushFollow(FOLLOW_94);
             rule__XCasePart__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCasePart__Group__2_in_rule__XCasePart__Group__133110);
+            pushFollow(FOLLOW_2);
             rule__XCasePart__Group__2();
 
             state._fsp--;
@@ -47362,22 +47362,22 @@ public final void rule__XCasePart__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCasePart__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16307:1: rule__XCasePart__Group__1__Impl : ( ( rule__XCasePart__TypeGuardAssignment_1 )? ) ;
+    // InternalCheck.g:16307:1: rule__XCasePart__Group__1__Impl : ( ( rule__XCasePart__TypeGuardAssignment_1 )? ) ;
     public final void rule__XCasePart__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16311:1: ( ( ( rule__XCasePart__TypeGuardAssignment_1 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16312:1: ( ( rule__XCasePart__TypeGuardAssignment_1 )? )
+            // InternalCheck.g:16311:1: ( ( ( rule__XCasePart__TypeGuardAssignment_1 )? ) )
+            // InternalCheck.g:16312:1: ( ( rule__XCasePart__TypeGuardAssignment_1 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16312:1: ( ( rule__XCasePart__TypeGuardAssignment_1 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16313:1: ( rule__XCasePart__TypeGuardAssignment_1 )?
+            // InternalCheck.g:16312:1: ( ( rule__XCasePart__TypeGuardAssignment_1 )? )
+            // InternalCheck.g:16313:1: ( rule__XCasePart__TypeGuardAssignment_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getTypeGuardAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16314:1: ( rule__XCasePart__TypeGuardAssignment_1 )?
+            // InternalCheck.g:16314:1: ( rule__XCasePart__TypeGuardAssignment_1 )?
             int alt126=2;
             int LA126_0 = input.LA(1);
 
@@ -47386,9 +47386,9 @@ public final void rule__XCasePart__Group__1__Impl() throws RecognitionException
             }
             switch (alt126) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16314:2: rule__XCasePart__TypeGuardAssignment_1
+                    // InternalCheck.g:16314:2: rule__XCasePart__TypeGuardAssignment_1
                     {
-                    pushFollow(FOLLOW_rule__XCasePart__TypeGuardAssignment_1_in_rule__XCasePart__Group__1__Impl33137);
+                    pushFollow(FOLLOW_2);
                     rule__XCasePart__TypeGuardAssignment_1();
 
                     state._fsp--;
@@ -47424,21 +47424,21 @@ public final void rule__XCasePart__Group__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__XCasePart__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16324:1: rule__XCasePart__Group__2 : rule__XCasePart__Group__2__Impl rule__XCasePart__Group__3 ;
+    // InternalCheck.g:16324:1: rule__XCasePart__Group__2 : rule__XCasePart__Group__2__Impl rule__XCasePart__Group__3 ;
     public final void rule__XCasePart__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16328:1: ( rule__XCasePart__Group__2__Impl rule__XCasePart__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16329:2: rule__XCasePart__Group__2__Impl rule__XCasePart__Group__3
+            // InternalCheck.g:16328:1: ( rule__XCasePart__Group__2__Impl rule__XCasePart__Group__3 )
+            // InternalCheck.g:16329:2: rule__XCasePart__Group__2__Impl rule__XCasePart__Group__3
             {
-            pushFollow(FOLLOW_rule__XCasePart__Group__2__Impl_in_rule__XCasePart__Group__233168);
+            pushFollow(FOLLOW_94);
             rule__XCasePart__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCasePart__Group__3_in_rule__XCasePart__Group__233171);
+            pushFollow(FOLLOW_2);
             rule__XCasePart__Group__3();
 
             state._fsp--;
@@ -47462,22 +47462,22 @@ public final void rule__XCasePart__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCasePart__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16336:1: rule__XCasePart__Group__2__Impl : ( ( rule__XCasePart__Group_2__0 )? ) ;
+    // InternalCheck.g:16336:1: rule__XCasePart__Group__2__Impl : ( ( rule__XCasePart__Group_2__0 )? ) ;
     public final void rule__XCasePart__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16340:1: ( ( ( rule__XCasePart__Group_2__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16341:1: ( ( rule__XCasePart__Group_2__0 )? )
+            // InternalCheck.g:16340:1: ( ( ( rule__XCasePart__Group_2__0 )? ) )
+            // InternalCheck.g:16341:1: ( ( rule__XCasePart__Group_2__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16341:1: ( ( rule__XCasePart__Group_2__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16342:1: ( rule__XCasePart__Group_2__0 )?
+            // InternalCheck.g:16341:1: ( ( rule__XCasePart__Group_2__0 )? )
+            // InternalCheck.g:16342:1: ( rule__XCasePart__Group_2__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getGroup_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16343:1: ( rule__XCasePart__Group_2__0 )?
+            // InternalCheck.g:16343:1: ( rule__XCasePart__Group_2__0 )?
             int alt127=2;
             int LA127_0 = input.LA(1);
 
@@ -47486,9 +47486,9 @@ public final void rule__XCasePart__Group__2__Impl() throws RecognitionException
             }
             switch (alt127) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16343:2: rule__XCasePart__Group_2__0
+                    // InternalCheck.g:16343:2: rule__XCasePart__Group_2__0
                     {
-                    pushFollow(FOLLOW_rule__XCasePart__Group_2__0_in_rule__XCasePart__Group__2__Impl33198);
+                    pushFollow(FOLLOW_2);
                     rule__XCasePart__Group_2__0();
 
                     state._fsp--;
@@ -47524,16 +47524,16 @@ public final void rule__XCasePart__Group__2__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__XCasePart__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16353:1: rule__XCasePart__Group__3 : rule__XCasePart__Group__3__Impl ;
+    // InternalCheck.g:16353:1: rule__XCasePart__Group__3 : rule__XCasePart__Group__3__Impl ;
     public final void rule__XCasePart__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16357:1: ( rule__XCasePart__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16358:2: rule__XCasePart__Group__3__Impl
+            // InternalCheck.g:16357:1: ( rule__XCasePart__Group__3__Impl )
+            // InternalCheck.g:16358:2: rule__XCasePart__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__XCasePart__Group__3__Impl_in_rule__XCasePart__Group__333229);
+            pushFollow(FOLLOW_2);
             rule__XCasePart__Group__3__Impl();
 
             state._fsp--;
@@ -47557,25 +47557,25 @@ public final void rule__XCasePart__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCasePart__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16364:1: rule__XCasePart__Group__3__Impl : ( ( rule__XCasePart__Alternatives_3 ) ) ;
+    // InternalCheck.g:16364:1: rule__XCasePart__Group__3__Impl : ( ( rule__XCasePart__Alternatives_3 ) ) ;
     public final void rule__XCasePart__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16368:1: ( ( ( rule__XCasePart__Alternatives_3 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16369:1: ( ( rule__XCasePart__Alternatives_3 ) )
+            // InternalCheck.g:16368:1: ( ( ( rule__XCasePart__Alternatives_3 ) ) )
+            // InternalCheck.g:16369:1: ( ( rule__XCasePart__Alternatives_3 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16369:1: ( ( rule__XCasePart__Alternatives_3 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16370:1: ( rule__XCasePart__Alternatives_3 )
+            // InternalCheck.g:16369:1: ( ( rule__XCasePart__Alternatives_3 ) )
+            // InternalCheck.g:16370:1: ( rule__XCasePart__Alternatives_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getAlternatives_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16371:1: ( rule__XCasePart__Alternatives_3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16371:2: rule__XCasePart__Alternatives_3
+            // InternalCheck.g:16371:1: ( rule__XCasePart__Alternatives_3 )
+            // InternalCheck.g:16371:2: rule__XCasePart__Alternatives_3
             {
-            pushFollow(FOLLOW_rule__XCasePart__Alternatives_3_in_rule__XCasePart__Group__3__Impl33256);
+            pushFollow(FOLLOW_2);
             rule__XCasePart__Alternatives_3();
 
             state._fsp--;
@@ -47608,21 +47608,21 @@ public final void rule__XCasePart__Group__3__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__XCasePart__Group_2__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16389:1: rule__XCasePart__Group_2__0 : rule__XCasePart__Group_2__0__Impl rule__XCasePart__Group_2__1 ;
+    // InternalCheck.g:16389:1: rule__XCasePart__Group_2__0 : rule__XCasePart__Group_2__0__Impl rule__XCasePart__Group_2__1 ;
     public final void rule__XCasePart__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16393:1: ( rule__XCasePart__Group_2__0__Impl rule__XCasePart__Group_2__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16394:2: rule__XCasePart__Group_2__0__Impl rule__XCasePart__Group_2__1
+            // InternalCheck.g:16393:1: ( rule__XCasePart__Group_2__0__Impl rule__XCasePart__Group_2__1 )
+            // InternalCheck.g:16394:2: rule__XCasePart__Group_2__0__Impl rule__XCasePart__Group_2__1
             {
-            pushFollow(FOLLOW_rule__XCasePart__Group_2__0__Impl_in_rule__XCasePart__Group_2__033294);
+            pushFollow(FOLLOW_32);
             rule__XCasePart__Group_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCasePart__Group_2__1_in_rule__XCasePart__Group_2__033297);
+            pushFollow(FOLLOW_2);
             rule__XCasePart__Group_2__1();
 
             state._fsp--;
@@ -47646,22 +47646,22 @@ public final void rule__XCasePart__Group_2__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCasePart__Group_2__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16401:1: rule__XCasePart__Group_2__0__Impl : ( 'case' ) ;
+    // InternalCheck.g:16401:1: rule__XCasePart__Group_2__0__Impl : ( 'case' ) ;
     public final void rule__XCasePart__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16405:1: ( ( 'case' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16406:1: ( 'case' )
+            // InternalCheck.g:16405:1: ( ( 'case' ) )
+            // InternalCheck.g:16406:1: ( 'case' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16406:1: ( 'case' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16407:1: 'case'
+            // InternalCheck.g:16406:1: ( 'case' )
+            // InternalCheck.g:16407:1: 'case'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getCaseKeyword_2_0()); 
             }
-            match(input,89,FOLLOW_89_in_rule__XCasePart__Group_2__0__Impl33325); if (state.failed) return ;
+            match(input,89,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXCasePartAccess().getCaseKeyword_2_0()); 
             }
@@ -47687,16 +47687,16 @@ public final void rule__XCasePart__Group_2__0__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XCasePart__Group_2__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16420:1: rule__XCasePart__Group_2__1 : rule__XCasePart__Group_2__1__Impl ;
+    // InternalCheck.g:16420:1: rule__XCasePart__Group_2__1 : rule__XCasePart__Group_2__1__Impl ;
     public final void rule__XCasePart__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16424:1: ( rule__XCasePart__Group_2__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16425:2: rule__XCasePart__Group_2__1__Impl
+            // InternalCheck.g:16424:1: ( rule__XCasePart__Group_2__1__Impl )
+            // InternalCheck.g:16425:2: rule__XCasePart__Group_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__XCasePart__Group_2__1__Impl_in_rule__XCasePart__Group_2__133356);
+            pushFollow(FOLLOW_2);
             rule__XCasePart__Group_2__1__Impl();
 
             state._fsp--;
@@ -47720,25 +47720,25 @@ public final void rule__XCasePart__Group_2__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCasePart__Group_2__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16431:1: rule__XCasePart__Group_2__1__Impl : ( ( rule__XCasePart__CaseAssignment_2_1 ) ) ;
+    // InternalCheck.g:16431:1: rule__XCasePart__Group_2__1__Impl : ( ( rule__XCasePart__CaseAssignment_2_1 ) ) ;
     public final void rule__XCasePart__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16435:1: ( ( ( rule__XCasePart__CaseAssignment_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16436:1: ( ( rule__XCasePart__CaseAssignment_2_1 ) )
+            // InternalCheck.g:16435:1: ( ( ( rule__XCasePart__CaseAssignment_2_1 ) ) )
+            // InternalCheck.g:16436:1: ( ( rule__XCasePart__CaseAssignment_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16436:1: ( ( rule__XCasePart__CaseAssignment_2_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16437:1: ( rule__XCasePart__CaseAssignment_2_1 )
+            // InternalCheck.g:16436:1: ( ( rule__XCasePart__CaseAssignment_2_1 ) )
+            // InternalCheck.g:16437:1: ( rule__XCasePart__CaseAssignment_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getCaseAssignment_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16438:1: ( rule__XCasePart__CaseAssignment_2_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16438:2: rule__XCasePart__CaseAssignment_2_1
+            // InternalCheck.g:16438:1: ( rule__XCasePart__CaseAssignment_2_1 )
+            // InternalCheck.g:16438:2: rule__XCasePart__CaseAssignment_2_1
             {
-            pushFollow(FOLLOW_rule__XCasePart__CaseAssignment_2_1_in_rule__XCasePart__Group_2__1__Impl33383);
+            pushFollow(FOLLOW_2);
             rule__XCasePart__CaseAssignment_2_1();
 
             state._fsp--;
@@ -47771,21 +47771,21 @@ public final void rule__XCasePart__Group_2__1__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XCasePart__Group_3_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16452:1: rule__XCasePart__Group_3_0__0 : rule__XCasePart__Group_3_0__0__Impl rule__XCasePart__Group_3_0__1 ;
+    // InternalCheck.g:16452:1: rule__XCasePart__Group_3_0__0 : rule__XCasePart__Group_3_0__0__Impl rule__XCasePart__Group_3_0__1 ;
     public final void rule__XCasePart__Group_3_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16456:1: ( rule__XCasePart__Group_3_0__0__Impl rule__XCasePart__Group_3_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16457:2: rule__XCasePart__Group_3_0__0__Impl rule__XCasePart__Group_3_0__1
+            // InternalCheck.g:16456:1: ( rule__XCasePart__Group_3_0__0__Impl rule__XCasePart__Group_3_0__1 )
+            // InternalCheck.g:16457:2: rule__XCasePart__Group_3_0__0__Impl rule__XCasePart__Group_3_0__1
             {
-            pushFollow(FOLLOW_rule__XCasePart__Group_3_0__0__Impl_in_rule__XCasePart__Group_3_0__033417);
+            pushFollow(FOLLOW_32);
             rule__XCasePart__Group_3_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCasePart__Group_3_0__1_in_rule__XCasePart__Group_3_0__033420);
+            pushFollow(FOLLOW_2);
             rule__XCasePart__Group_3_0__1();
 
             state._fsp--;
@@ -47809,22 +47809,22 @@ public final void rule__XCasePart__Group_3_0__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCasePart__Group_3_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16464:1: rule__XCasePart__Group_3_0__0__Impl : ( ':' ) ;
+    // InternalCheck.g:16464:1: rule__XCasePart__Group_3_0__0__Impl : ( ':' ) ;
     public final void rule__XCasePart__Group_3_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16468:1: ( ( ':' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16469:1: ( ':' )
+            // InternalCheck.g:16468:1: ( ( ':' ) )
+            // InternalCheck.g:16469:1: ( ':' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16469:1: ( ':' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16470:1: ':'
+            // InternalCheck.g:16469:1: ( ':' )
+            // InternalCheck.g:16470:1: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getColonKeyword_3_0_0()); 
             }
-            match(input,87,FOLLOW_87_in_rule__XCasePart__Group_3_0__0__Impl33448); if (state.failed) return ;
+            match(input,87,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXCasePartAccess().getColonKeyword_3_0_0()); 
             }
@@ -47850,16 +47850,16 @@ public final void rule__XCasePart__Group_3_0__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XCasePart__Group_3_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16483:1: rule__XCasePart__Group_3_0__1 : rule__XCasePart__Group_3_0__1__Impl ;
+    // InternalCheck.g:16483:1: rule__XCasePart__Group_3_0__1 : rule__XCasePart__Group_3_0__1__Impl ;
     public final void rule__XCasePart__Group_3_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16487:1: ( rule__XCasePart__Group_3_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16488:2: rule__XCasePart__Group_3_0__1__Impl
+            // InternalCheck.g:16487:1: ( rule__XCasePart__Group_3_0__1__Impl )
+            // InternalCheck.g:16488:2: rule__XCasePart__Group_3_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XCasePart__Group_3_0__1__Impl_in_rule__XCasePart__Group_3_0__133479);
+            pushFollow(FOLLOW_2);
             rule__XCasePart__Group_3_0__1__Impl();
 
             state._fsp--;
@@ -47883,25 +47883,25 @@ public final void rule__XCasePart__Group_3_0__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCasePart__Group_3_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16494:1: rule__XCasePart__Group_3_0__1__Impl : ( ( rule__XCasePart__ThenAssignment_3_0_1 ) ) ;
+    // InternalCheck.g:16494:1: rule__XCasePart__Group_3_0__1__Impl : ( ( rule__XCasePart__ThenAssignment_3_0_1 ) ) ;
     public final void rule__XCasePart__Group_3_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16498:1: ( ( ( rule__XCasePart__ThenAssignment_3_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16499:1: ( ( rule__XCasePart__ThenAssignment_3_0_1 ) )
+            // InternalCheck.g:16498:1: ( ( ( rule__XCasePart__ThenAssignment_3_0_1 ) ) )
+            // InternalCheck.g:16499:1: ( ( rule__XCasePart__ThenAssignment_3_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16499:1: ( ( rule__XCasePart__ThenAssignment_3_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16500:1: ( rule__XCasePart__ThenAssignment_3_0_1 )
+            // InternalCheck.g:16499:1: ( ( rule__XCasePart__ThenAssignment_3_0_1 ) )
+            // InternalCheck.g:16500:1: ( rule__XCasePart__ThenAssignment_3_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getThenAssignment_3_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16501:1: ( rule__XCasePart__ThenAssignment_3_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16501:2: rule__XCasePart__ThenAssignment_3_0_1
+            // InternalCheck.g:16501:1: ( rule__XCasePart__ThenAssignment_3_0_1 )
+            // InternalCheck.g:16501:2: rule__XCasePart__ThenAssignment_3_0_1
             {
-            pushFollow(FOLLOW_rule__XCasePart__ThenAssignment_3_0_1_in_rule__XCasePart__Group_3_0__1__Impl33506);
+            pushFollow(FOLLOW_2);
             rule__XCasePart__ThenAssignment_3_0_1();
 
             state._fsp--;
@@ -47934,21 +47934,21 @@ public final void rule__XCasePart__Group_3_0__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16515:1: rule__XForLoopExpression__Group__0 : rule__XForLoopExpression__Group__0__Impl rule__XForLoopExpression__Group__1 ;
+    // InternalCheck.g:16515:1: rule__XForLoopExpression__Group__0 : rule__XForLoopExpression__Group__0__Impl rule__XForLoopExpression__Group__1 ;
     public final void rule__XForLoopExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16519:1: ( rule__XForLoopExpression__Group__0__Impl rule__XForLoopExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16520:2: rule__XForLoopExpression__Group__0__Impl rule__XForLoopExpression__Group__1
+            // InternalCheck.g:16519:1: ( rule__XForLoopExpression__Group__0__Impl rule__XForLoopExpression__Group__1 )
+            // InternalCheck.g:16520:2: rule__XForLoopExpression__Group__0__Impl rule__XForLoopExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group__0__Impl_in_rule__XForLoopExpression__Group__033540);
+            pushFollow(FOLLOW_32);
             rule__XForLoopExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group__1_in_rule__XForLoopExpression__Group__033543);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group__1();
 
             state._fsp--;
@@ -47972,25 +47972,25 @@ public final void rule__XForLoopExpression__Group__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16527:1: rule__XForLoopExpression__Group__0__Impl : ( ( rule__XForLoopExpression__Group_0__0 ) ) ;
+    // InternalCheck.g:16527:1: rule__XForLoopExpression__Group__0__Impl : ( ( rule__XForLoopExpression__Group_0__0 ) ) ;
     public final void rule__XForLoopExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16531:1: ( ( ( rule__XForLoopExpression__Group_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16532:1: ( ( rule__XForLoopExpression__Group_0__0 ) )
+            // InternalCheck.g:16531:1: ( ( ( rule__XForLoopExpression__Group_0__0 ) ) )
+            // InternalCheck.g:16532:1: ( ( rule__XForLoopExpression__Group_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16532:1: ( ( rule__XForLoopExpression__Group_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16533:1: ( rule__XForLoopExpression__Group_0__0 )
+            // InternalCheck.g:16532:1: ( ( rule__XForLoopExpression__Group_0__0 ) )
+            // InternalCheck.g:16533:1: ( rule__XForLoopExpression__Group_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getGroup_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16534:1: ( rule__XForLoopExpression__Group_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16534:2: rule__XForLoopExpression__Group_0__0
+            // InternalCheck.g:16534:1: ( rule__XForLoopExpression__Group_0__0 )
+            // InternalCheck.g:16534:2: rule__XForLoopExpression__Group_0__0
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0__0_in_rule__XForLoopExpression__Group__0__Impl33570);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group_0__0();
 
             state._fsp--;
@@ -48023,21 +48023,21 @@ public final void rule__XForLoopExpression__Group__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16544:1: rule__XForLoopExpression__Group__1 : rule__XForLoopExpression__Group__1__Impl rule__XForLoopExpression__Group__2 ;
+    // InternalCheck.g:16544:1: rule__XForLoopExpression__Group__1 : rule__XForLoopExpression__Group__1__Impl rule__XForLoopExpression__Group__2 ;
     public final void rule__XForLoopExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16548:1: ( rule__XForLoopExpression__Group__1__Impl rule__XForLoopExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16549:2: rule__XForLoopExpression__Group__1__Impl rule__XForLoopExpression__Group__2
+            // InternalCheck.g:16548:1: ( rule__XForLoopExpression__Group__1__Impl rule__XForLoopExpression__Group__2 )
+            // InternalCheck.g:16549:2: rule__XForLoopExpression__Group__1__Impl rule__XForLoopExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group__1__Impl_in_rule__XForLoopExpression__Group__133600);
+            pushFollow(FOLLOW_28);
             rule__XForLoopExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group__2_in_rule__XForLoopExpression__Group__133603);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group__2();
 
             state._fsp--;
@@ -48061,25 +48061,25 @@ public final void rule__XForLoopExpression__Group__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16556:1: rule__XForLoopExpression__Group__1__Impl : ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) ) ;
+    // InternalCheck.g:16556:1: rule__XForLoopExpression__Group__1__Impl : ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) ) ;
     public final void rule__XForLoopExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16560:1: ( ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16561:1: ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) )
+            // InternalCheck.g:16560:1: ( ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) ) )
+            // InternalCheck.g:16561:1: ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16561:1: ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16562:1: ( rule__XForLoopExpression__ForExpressionAssignment_1 )
+            // InternalCheck.g:16561:1: ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) )
+            // InternalCheck.g:16562:1: ( rule__XForLoopExpression__ForExpressionAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getForExpressionAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16563:1: ( rule__XForLoopExpression__ForExpressionAssignment_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16563:2: rule__XForLoopExpression__ForExpressionAssignment_1
+            // InternalCheck.g:16563:1: ( rule__XForLoopExpression__ForExpressionAssignment_1 )
+            // InternalCheck.g:16563:2: rule__XForLoopExpression__ForExpressionAssignment_1
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__ForExpressionAssignment_1_in_rule__XForLoopExpression__Group__1__Impl33630);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__ForExpressionAssignment_1();
 
             state._fsp--;
@@ -48112,21 +48112,21 @@ public final void rule__XForLoopExpression__Group__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16573:1: rule__XForLoopExpression__Group__2 : rule__XForLoopExpression__Group__2__Impl rule__XForLoopExpression__Group__3 ;
+    // InternalCheck.g:16573:1: rule__XForLoopExpression__Group__2 : rule__XForLoopExpression__Group__2__Impl rule__XForLoopExpression__Group__3 ;
     public final void rule__XForLoopExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16577:1: ( rule__XForLoopExpression__Group__2__Impl rule__XForLoopExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16578:2: rule__XForLoopExpression__Group__2__Impl rule__XForLoopExpression__Group__3
+            // InternalCheck.g:16577:1: ( rule__XForLoopExpression__Group__2__Impl rule__XForLoopExpression__Group__3 )
+            // InternalCheck.g:16578:2: rule__XForLoopExpression__Group__2__Impl rule__XForLoopExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group__2__Impl_in_rule__XForLoopExpression__Group__233660);
+            pushFollow(FOLLOW_32);
             rule__XForLoopExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group__3_in_rule__XForLoopExpression__Group__233663);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group__3();
 
             state._fsp--;
@@ -48150,22 +48150,22 @@ public final void rule__XForLoopExpression__Group__2() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16585:1: rule__XForLoopExpression__Group__2__Impl : ( ')' ) ;
+    // InternalCheck.g:16585:1: rule__XForLoopExpression__Group__2__Impl : ( ')' ) ;
     public final void rule__XForLoopExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16589:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16590:1: ( ')' )
+            // InternalCheck.g:16589:1: ( ( ')' ) )
+            // InternalCheck.g:16590:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16590:1: ( ')' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16591:1: ')'
+            // InternalCheck.g:16590:1: ( ')' )
+            // InternalCheck.g:16591:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getRightParenthesisKeyword_2()); 
             }
-            match(input,73,FOLLOW_73_in_rule__XForLoopExpression__Group__2__Impl33691); if (state.failed) return ;
+            match(input,73,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXForLoopExpressionAccess().getRightParenthesisKeyword_2()); 
             }
@@ -48191,16 +48191,16 @@ public final void rule__XForLoopExpression__Group__2__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16604:1: rule__XForLoopExpression__Group__3 : rule__XForLoopExpression__Group__3__Impl ;
+    // InternalCheck.g:16604:1: rule__XForLoopExpression__Group__3 : rule__XForLoopExpression__Group__3__Impl ;
     public final void rule__XForLoopExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16608:1: ( rule__XForLoopExpression__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16609:2: rule__XForLoopExpression__Group__3__Impl
+            // InternalCheck.g:16608:1: ( rule__XForLoopExpression__Group__3__Impl )
+            // InternalCheck.g:16609:2: rule__XForLoopExpression__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group__3__Impl_in_rule__XForLoopExpression__Group__333722);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group__3__Impl();
 
             state._fsp--;
@@ -48224,25 +48224,25 @@ public final void rule__XForLoopExpression__Group__3() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16615:1: rule__XForLoopExpression__Group__3__Impl : ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) ) ;
+    // InternalCheck.g:16615:1: rule__XForLoopExpression__Group__3__Impl : ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) ) ;
     public final void rule__XForLoopExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16619:1: ( ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16620:1: ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) )
+            // InternalCheck.g:16619:1: ( ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) ) )
+            // InternalCheck.g:16620:1: ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16620:1: ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16621:1: ( rule__XForLoopExpression__EachExpressionAssignment_3 )
+            // InternalCheck.g:16620:1: ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) )
+            // InternalCheck.g:16621:1: ( rule__XForLoopExpression__EachExpressionAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getEachExpressionAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16622:1: ( rule__XForLoopExpression__EachExpressionAssignment_3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16622:2: rule__XForLoopExpression__EachExpressionAssignment_3
+            // InternalCheck.g:16622:1: ( rule__XForLoopExpression__EachExpressionAssignment_3 )
+            // InternalCheck.g:16622:2: rule__XForLoopExpression__EachExpressionAssignment_3
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__EachExpressionAssignment_3_in_rule__XForLoopExpression__Group__3__Impl33749);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__EachExpressionAssignment_3();
 
             state._fsp--;
@@ -48275,16 +48275,16 @@ public final void rule__XForLoopExpression__Group__3__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16640:1: rule__XForLoopExpression__Group_0__0 : rule__XForLoopExpression__Group_0__0__Impl ;
+    // InternalCheck.g:16640:1: rule__XForLoopExpression__Group_0__0 : rule__XForLoopExpression__Group_0__0__Impl ;
     public final void rule__XForLoopExpression__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16644:1: ( rule__XForLoopExpression__Group_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16645:2: rule__XForLoopExpression__Group_0__0__Impl
+            // InternalCheck.g:16644:1: ( rule__XForLoopExpression__Group_0__0__Impl )
+            // InternalCheck.g:16645:2: rule__XForLoopExpression__Group_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0__0__Impl_in_rule__XForLoopExpression__Group_0__033787);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group_0__0__Impl();
 
             state._fsp--;
@@ -48308,25 +48308,25 @@ public final void rule__XForLoopExpression__Group_0__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16651:1: rule__XForLoopExpression__Group_0__0__Impl : ( ( rule__XForLoopExpression__Group_0_0__0 ) ) ;
+    // InternalCheck.g:16651:1: rule__XForLoopExpression__Group_0__0__Impl : ( ( rule__XForLoopExpression__Group_0_0__0 ) ) ;
     public final void rule__XForLoopExpression__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16655:1: ( ( ( rule__XForLoopExpression__Group_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16656:1: ( ( rule__XForLoopExpression__Group_0_0__0 ) )
+            // InternalCheck.g:16655:1: ( ( ( rule__XForLoopExpression__Group_0_0__0 ) ) )
+            // InternalCheck.g:16656:1: ( ( rule__XForLoopExpression__Group_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16656:1: ( ( rule__XForLoopExpression__Group_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16657:1: ( rule__XForLoopExpression__Group_0_0__0 )
+            // InternalCheck.g:16656:1: ( ( rule__XForLoopExpression__Group_0_0__0 ) )
+            // InternalCheck.g:16657:1: ( rule__XForLoopExpression__Group_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getGroup_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16658:1: ( rule__XForLoopExpression__Group_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16658:2: rule__XForLoopExpression__Group_0_0__0
+            // InternalCheck.g:16658:1: ( rule__XForLoopExpression__Group_0_0__0 )
+            // InternalCheck.g:16658:2: rule__XForLoopExpression__Group_0_0__0
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__0_in_rule__XForLoopExpression__Group_0__0__Impl33814);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group_0_0__0();
 
             state._fsp--;
@@ -48359,21 +48359,21 @@ public final void rule__XForLoopExpression__Group_0__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16670:1: rule__XForLoopExpression__Group_0_0__0 : rule__XForLoopExpression__Group_0_0__0__Impl rule__XForLoopExpression__Group_0_0__1 ;
+    // InternalCheck.g:16670:1: rule__XForLoopExpression__Group_0_0__0 : rule__XForLoopExpression__Group_0_0__0__Impl rule__XForLoopExpression__Group_0_0__1 ;
     public final void rule__XForLoopExpression__Group_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16674:1: ( rule__XForLoopExpression__Group_0_0__0__Impl rule__XForLoopExpression__Group_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16675:2: rule__XForLoopExpression__Group_0_0__0__Impl rule__XForLoopExpression__Group_0_0__1
+            // InternalCheck.g:16674:1: ( rule__XForLoopExpression__Group_0_0__0__Impl rule__XForLoopExpression__Group_0_0__1 )
+            // InternalCheck.g:16675:2: rule__XForLoopExpression__Group_0_0__0__Impl rule__XForLoopExpression__Group_0_0__1
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__0__Impl_in_rule__XForLoopExpression__Group_0_0__033846);
+            pushFollow(FOLLOW_33);
             rule__XForLoopExpression__Group_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__1_in_rule__XForLoopExpression__Group_0_0__033849);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group_0_0__1();
 
             state._fsp--;
@@ -48397,23 +48397,23 @@ public final void rule__XForLoopExpression__Group_0_0__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16682:1: rule__XForLoopExpression__Group_0_0__0__Impl : ( () ) ;
+    // InternalCheck.g:16682:1: rule__XForLoopExpression__Group_0_0__0__Impl : ( () ) ;
     public final void rule__XForLoopExpression__Group_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16686:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16687:1: ( () )
+            // InternalCheck.g:16686:1: ( ( () ) )
+            // InternalCheck.g:16687:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16687:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16688:1: ()
+            // InternalCheck.g:16687:1: ( () )
+            // InternalCheck.g:16688:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getXForLoopExpressionAction_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16689:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16691:1: 
+            // InternalCheck.g:16689:1: ()
+            // InternalCheck.g:16691:1: 
             {
             }
 
@@ -48438,21 +48438,21 @@ public final void rule__XForLoopExpression__Group_0_0__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16701:1: rule__XForLoopExpression__Group_0_0__1 : rule__XForLoopExpression__Group_0_0__1__Impl rule__XForLoopExpression__Group_0_0__2 ;
+    // InternalCheck.g:16701:1: rule__XForLoopExpression__Group_0_0__1 : rule__XForLoopExpression__Group_0_0__1__Impl rule__XForLoopExpression__Group_0_0__2 ;
     public final void rule__XForLoopExpression__Group_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16705:1: ( rule__XForLoopExpression__Group_0_0__1__Impl rule__XForLoopExpression__Group_0_0__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16706:2: rule__XForLoopExpression__Group_0_0__1__Impl rule__XForLoopExpression__Group_0_0__2
+            // InternalCheck.g:16705:1: ( rule__XForLoopExpression__Group_0_0__1__Impl rule__XForLoopExpression__Group_0_0__2 )
+            // InternalCheck.g:16706:2: rule__XForLoopExpression__Group_0_0__1__Impl rule__XForLoopExpression__Group_0_0__2
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__1__Impl_in_rule__XForLoopExpression__Group_0_0__133907);
+            pushFollow(FOLLOW_26);
             rule__XForLoopExpression__Group_0_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__2_in_rule__XForLoopExpression__Group_0_0__133910);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group_0_0__2();
 
             state._fsp--;
@@ -48476,22 +48476,22 @@ public final void rule__XForLoopExpression__Group_0_0__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16713:1: rule__XForLoopExpression__Group_0_0__1__Impl : ( 'for' ) ;
+    // InternalCheck.g:16713:1: rule__XForLoopExpression__Group_0_0__1__Impl : ( 'for' ) ;
     public final void rule__XForLoopExpression__Group_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16717:1: ( ( 'for' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16718:1: ( 'for' )
+            // InternalCheck.g:16717:1: ( ( 'for' ) )
+            // InternalCheck.g:16718:1: ( 'for' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16718:1: ( 'for' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16719:1: 'for'
+            // InternalCheck.g:16718:1: ( 'for' )
+            // InternalCheck.g:16719:1: 'for'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getForKeyword_0_0_1()); 
             }
-            match(input,70,FOLLOW_70_in_rule__XForLoopExpression__Group_0_0__1__Impl33938); if (state.failed) return ;
+            match(input,70,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXForLoopExpressionAccess().getForKeyword_0_0_1()); 
             }
@@ -48517,21 +48517,21 @@ public final void rule__XForLoopExpression__Group_0_0__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16732:1: rule__XForLoopExpression__Group_0_0__2 : rule__XForLoopExpression__Group_0_0__2__Impl rule__XForLoopExpression__Group_0_0__3 ;
+    // InternalCheck.g:16732:1: rule__XForLoopExpression__Group_0_0__2 : rule__XForLoopExpression__Group_0_0__2__Impl rule__XForLoopExpression__Group_0_0__3 ;
     public final void rule__XForLoopExpression__Group_0_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16736:1: ( rule__XForLoopExpression__Group_0_0__2__Impl rule__XForLoopExpression__Group_0_0__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16737:2: rule__XForLoopExpression__Group_0_0__2__Impl rule__XForLoopExpression__Group_0_0__3
+            // InternalCheck.g:16736:1: ( rule__XForLoopExpression__Group_0_0__2__Impl rule__XForLoopExpression__Group_0_0__3 )
+            // InternalCheck.g:16737:2: rule__XForLoopExpression__Group_0_0__2__Impl rule__XForLoopExpression__Group_0_0__3
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__2__Impl_in_rule__XForLoopExpression__Group_0_0__233969);
+            pushFollow(FOLLOW_29);
             rule__XForLoopExpression__Group_0_0__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__3_in_rule__XForLoopExpression__Group_0_0__233972);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group_0_0__3();
 
             state._fsp--;
@@ -48555,22 +48555,22 @@ public final void rule__XForLoopExpression__Group_0_0__2() throws RecognitionExc
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16744:1: rule__XForLoopExpression__Group_0_0__2__Impl : ( '(' ) ;
+    // InternalCheck.g:16744:1: rule__XForLoopExpression__Group_0_0__2__Impl : ( '(' ) ;
     public final void rule__XForLoopExpression__Group_0_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16748:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16749:1: ( '(' )
+            // InternalCheck.g:16748:1: ( ( '(' ) )
+            // InternalCheck.g:16749:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16749:1: ( '(' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16750:1: '('
+            // InternalCheck.g:16749:1: ( '(' )
+            // InternalCheck.g:16750:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getLeftParenthesisKeyword_0_0_2()); 
             }
-            match(input,72,FOLLOW_72_in_rule__XForLoopExpression__Group_0_0__2__Impl34000); if (state.failed) return ;
+            match(input,72,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXForLoopExpressionAccess().getLeftParenthesisKeyword_0_0_2()); 
             }
@@ -48596,21 +48596,21 @@ public final void rule__XForLoopExpression__Group_0_0__2__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16763:1: rule__XForLoopExpression__Group_0_0__3 : rule__XForLoopExpression__Group_0_0__3__Impl rule__XForLoopExpression__Group_0_0__4 ;
+    // InternalCheck.g:16763:1: rule__XForLoopExpression__Group_0_0__3 : rule__XForLoopExpression__Group_0_0__3__Impl rule__XForLoopExpression__Group_0_0__4 ;
     public final void rule__XForLoopExpression__Group_0_0__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16767:1: ( rule__XForLoopExpression__Group_0_0__3__Impl rule__XForLoopExpression__Group_0_0__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16768:2: rule__XForLoopExpression__Group_0_0__3__Impl rule__XForLoopExpression__Group_0_0__4
+            // InternalCheck.g:16767:1: ( rule__XForLoopExpression__Group_0_0__3__Impl rule__XForLoopExpression__Group_0_0__4 )
+            // InternalCheck.g:16768:2: rule__XForLoopExpression__Group_0_0__3__Impl rule__XForLoopExpression__Group_0_0__4
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__3__Impl_in_rule__XForLoopExpression__Group_0_0__334031);
+            pushFollow(FOLLOW_93);
             rule__XForLoopExpression__Group_0_0__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__4_in_rule__XForLoopExpression__Group_0_0__334034);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group_0_0__4();
 
             state._fsp--;
@@ -48634,25 +48634,25 @@ public final void rule__XForLoopExpression__Group_0_0__3() throws RecognitionExc
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16775:1: rule__XForLoopExpression__Group_0_0__3__Impl : ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) ) ;
+    // InternalCheck.g:16775:1: rule__XForLoopExpression__Group_0_0__3__Impl : ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) ) ;
     public final void rule__XForLoopExpression__Group_0_0__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16779:1: ( ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16780:1: ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) )
+            // InternalCheck.g:16779:1: ( ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) ) )
+            // InternalCheck.g:16780:1: ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16780:1: ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16781:1: ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 )
+            // InternalCheck.g:16780:1: ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) )
+            // InternalCheck.g:16781:1: ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getDeclaredParamAssignment_0_0_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16782:1: ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16782:2: rule__XForLoopExpression__DeclaredParamAssignment_0_0_3
+            // InternalCheck.g:16782:1: ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 )
+            // InternalCheck.g:16782:2: rule__XForLoopExpression__DeclaredParamAssignment_0_0_3
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__DeclaredParamAssignment_0_0_3_in_rule__XForLoopExpression__Group_0_0__3__Impl34061);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__DeclaredParamAssignment_0_0_3();
 
             state._fsp--;
@@ -48685,16 +48685,16 @@ public final void rule__XForLoopExpression__Group_0_0__3__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16792:1: rule__XForLoopExpression__Group_0_0__4 : rule__XForLoopExpression__Group_0_0__4__Impl ;
+    // InternalCheck.g:16792:1: rule__XForLoopExpression__Group_0_0__4 : rule__XForLoopExpression__Group_0_0__4__Impl ;
     public final void rule__XForLoopExpression__Group_0_0__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16796:1: ( rule__XForLoopExpression__Group_0_0__4__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16797:2: rule__XForLoopExpression__Group_0_0__4__Impl
+            // InternalCheck.g:16796:1: ( rule__XForLoopExpression__Group_0_0__4__Impl )
+            // InternalCheck.g:16797:2: rule__XForLoopExpression__Group_0_0__4__Impl
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__4__Impl_in_rule__XForLoopExpression__Group_0_0__434091);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group_0_0__4__Impl();
 
             state._fsp--;
@@ -48718,22 +48718,22 @@ public final void rule__XForLoopExpression__Group_0_0__4() throws RecognitionExc
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16803:1: rule__XForLoopExpression__Group_0_0__4__Impl : ( ':' ) ;
+    // InternalCheck.g:16803:1: rule__XForLoopExpression__Group_0_0__4__Impl : ( ':' ) ;
     public final void rule__XForLoopExpression__Group_0_0__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16807:1: ( ( ':' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16808:1: ( ':' )
+            // InternalCheck.g:16807:1: ( ( ':' ) )
+            // InternalCheck.g:16808:1: ( ':' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16808:1: ( ':' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16809:1: ':'
+            // InternalCheck.g:16808:1: ( ':' )
+            // InternalCheck.g:16809:1: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getColonKeyword_0_0_4()); 
             }
-            match(input,87,FOLLOW_87_in_rule__XForLoopExpression__Group_0_0__4__Impl34119); if (state.failed) return ;
+            match(input,87,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXForLoopExpressionAccess().getColonKeyword_0_0_4()); 
             }
@@ -48759,21 +48759,21 @@ public final void rule__XForLoopExpression__Group_0_0__4__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16832:1: rule__XBasicForLoopExpression__Group__0 : rule__XBasicForLoopExpression__Group__0__Impl rule__XBasicForLoopExpression__Group__1 ;
+    // InternalCheck.g:16832:1: rule__XBasicForLoopExpression__Group__0 : rule__XBasicForLoopExpression__Group__0__Impl rule__XBasicForLoopExpression__Group__1 ;
     public final void rule__XBasicForLoopExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16836:1: ( rule__XBasicForLoopExpression__Group__0__Impl rule__XBasicForLoopExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16837:2: rule__XBasicForLoopExpression__Group__0__Impl rule__XBasicForLoopExpression__Group__1
+            // InternalCheck.g:16836:1: ( rule__XBasicForLoopExpression__Group__0__Impl rule__XBasicForLoopExpression__Group__1 )
+            // InternalCheck.g:16837:2: rule__XBasicForLoopExpression__Group__0__Impl rule__XBasicForLoopExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__0__Impl_in_rule__XBasicForLoopExpression__Group__034160);
+            pushFollow(FOLLOW_33);
             rule__XBasicForLoopExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__1_in_rule__XBasicForLoopExpression__Group__034163);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group__1();
 
             state._fsp--;
@@ -48797,23 +48797,23 @@ public final void rule__XBasicForLoopExpression__Group__0() throws RecognitionEx
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16844:1: rule__XBasicForLoopExpression__Group__0__Impl : ( () ) ;
+    // InternalCheck.g:16844:1: rule__XBasicForLoopExpression__Group__0__Impl : ( () ) ;
     public final void rule__XBasicForLoopExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16848:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16849:1: ( () )
+            // InternalCheck.g:16848:1: ( ( () ) )
+            // InternalCheck.g:16849:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16849:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16850:1: ()
+            // InternalCheck.g:16849:1: ( () )
+            // InternalCheck.g:16850:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getXBasicForLoopExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16851:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16853:1: 
+            // InternalCheck.g:16851:1: ()
+            // InternalCheck.g:16853:1: 
             {
             }
 
@@ -48838,21 +48838,21 @@ public final void rule__XBasicForLoopExpression__Group__0__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16863:1: rule__XBasicForLoopExpression__Group__1 : rule__XBasicForLoopExpression__Group__1__Impl rule__XBasicForLoopExpression__Group__2 ;
+    // InternalCheck.g:16863:1: rule__XBasicForLoopExpression__Group__1 : rule__XBasicForLoopExpression__Group__1__Impl rule__XBasicForLoopExpression__Group__2 ;
     public final void rule__XBasicForLoopExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16867:1: ( rule__XBasicForLoopExpression__Group__1__Impl rule__XBasicForLoopExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16868:2: rule__XBasicForLoopExpression__Group__1__Impl rule__XBasicForLoopExpression__Group__2
+            // InternalCheck.g:16867:1: ( rule__XBasicForLoopExpression__Group__1__Impl rule__XBasicForLoopExpression__Group__2 )
+            // InternalCheck.g:16868:2: rule__XBasicForLoopExpression__Group__1__Impl rule__XBasicForLoopExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__1__Impl_in_rule__XBasicForLoopExpression__Group__134221);
+            pushFollow(FOLLOW_26);
             rule__XBasicForLoopExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__2_in_rule__XBasicForLoopExpression__Group__134224);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group__2();
 
             state._fsp--;
@@ -48876,22 +48876,22 @@ public final void rule__XBasicForLoopExpression__Group__1() throws RecognitionEx
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16875:1: rule__XBasicForLoopExpression__Group__1__Impl : ( 'for' ) ;
+    // InternalCheck.g:16875:1: rule__XBasicForLoopExpression__Group__1__Impl : ( 'for' ) ;
     public final void rule__XBasicForLoopExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16879:1: ( ( 'for' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16880:1: ( 'for' )
+            // InternalCheck.g:16879:1: ( ( 'for' ) )
+            // InternalCheck.g:16880:1: ( 'for' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16880:1: ( 'for' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16881:1: 'for'
+            // InternalCheck.g:16880:1: ( 'for' )
+            // InternalCheck.g:16881:1: 'for'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getForKeyword_1()); 
             }
-            match(input,70,FOLLOW_70_in_rule__XBasicForLoopExpression__Group__1__Impl34252); if (state.failed) return ;
+            match(input,70,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBasicForLoopExpressionAccess().getForKeyword_1()); 
             }
@@ -48917,21 +48917,21 @@ public final void rule__XBasicForLoopExpression__Group__1__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16894:1: rule__XBasicForLoopExpression__Group__2 : rule__XBasicForLoopExpression__Group__2__Impl rule__XBasicForLoopExpression__Group__3 ;
+    // InternalCheck.g:16894:1: rule__XBasicForLoopExpression__Group__2 : rule__XBasicForLoopExpression__Group__2__Impl rule__XBasicForLoopExpression__Group__3 ;
     public final void rule__XBasicForLoopExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16898:1: ( rule__XBasicForLoopExpression__Group__2__Impl rule__XBasicForLoopExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16899:2: rule__XBasicForLoopExpression__Group__2__Impl rule__XBasicForLoopExpression__Group__3
+            // InternalCheck.g:16898:1: ( rule__XBasicForLoopExpression__Group__2__Impl rule__XBasicForLoopExpression__Group__3 )
+            // InternalCheck.g:16899:2: rule__XBasicForLoopExpression__Group__2__Impl rule__XBasicForLoopExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__2__Impl_in_rule__XBasicForLoopExpression__Group__234283);
+            pushFollow(FOLLOW_95);
             rule__XBasicForLoopExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__3_in_rule__XBasicForLoopExpression__Group__234286);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group__3();
 
             state._fsp--;
@@ -48955,22 +48955,22 @@ public final void rule__XBasicForLoopExpression__Group__2() throws RecognitionEx
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16906:1: rule__XBasicForLoopExpression__Group__2__Impl : ( '(' ) ;
+    // InternalCheck.g:16906:1: rule__XBasicForLoopExpression__Group__2__Impl : ( '(' ) ;
     public final void rule__XBasicForLoopExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16910:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16911:1: ( '(' )
+            // InternalCheck.g:16910:1: ( ( '(' ) )
+            // InternalCheck.g:16911:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16911:1: ( '(' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16912:1: '('
+            // InternalCheck.g:16911:1: ( '(' )
+            // InternalCheck.g:16912:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getLeftParenthesisKeyword_2()); 
             }
-            match(input,72,FOLLOW_72_in_rule__XBasicForLoopExpression__Group__2__Impl34314); if (state.failed) return ;
+            match(input,72,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBasicForLoopExpressionAccess().getLeftParenthesisKeyword_2()); 
             }
@@ -48996,21 +48996,21 @@ public final void rule__XBasicForLoopExpression__Group__2__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16925:1: rule__XBasicForLoopExpression__Group__3 : rule__XBasicForLoopExpression__Group__3__Impl rule__XBasicForLoopExpression__Group__4 ;
+    // InternalCheck.g:16925:1: rule__XBasicForLoopExpression__Group__3 : rule__XBasicForLoopExpression__Group__3__Impl rule__XBasicForLoopExpression__Group__4 ;
     public final void rule__XBasicForLoopExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16929:1: ( rule__XBasicForLoopExpression__Group__3__Impl rule__XBasicForLoopExpression__Group__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16930:2: rule__XBasicForLoopExpression__Group__3__Impl rule__XBasicForLoopExpression__Group__4
+            // InternalCheck.g:16929:1: ( rule__XBasicForLoopExpression__Group__3__Impl rule__XBasicForLoopExpression__Group__4 )
+            // InternalCheck.g:16930:2: rule__XBasicForLoopExpression__Group__3__Impl rule__XBasicForLoopExpression__Group__4
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__3__Impl_in_rule__XBasicForLoopExpression__Group__334345);
+            pushFollow(FOLLOW_95);
             rule__XBasicForLoopExpression__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__4_in_rule__XBasicForLoopExpression__Group__334348);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group__4();
 
             state._fsp--;
@@ -49034,22 +49034,22 @@ public final void rule__XBasicForLoopExpression__Group__3() throws RecognitionEx
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16937:1: rule__XBasicForLoopExpression__Group__3__Impl : ( ( rule__XBasicForLoopExpression__Group_3__0 )? ) ;
+    // InternalCheck.g:16937:1: rule__XBasicForLoopExpression__Group__3__Impl : ( ( rule__XBasicForLoopExpression__Group_3__0 )? ) ;
     public final void rule__XBasicForLoopExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16941:1: ( ( ( rule__XBasicForLoopExpression__Group_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16942:1: ( ( rule__XBasicForLoopExpression__Group_3__0 )? )
+            // InternalCheck.g:16941:1: ( ( ( rule__XBasicForLoopExpression__Group_3__0 )? ) )
+            // InternalCheck.g:16942:1: ( ( rule__XBasicForLoopExpression__Group_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16942:1: ( ( rule__XBasicForLoopExpression__Group_3__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16943:1: ( rule__XBasicForLoopExpression__Group_3__0 )?
+            // InternalCheck.g:16942:1: ( ( rule__XBasicForLoopExpression__Group_3__0 )? )
+            // InternalCheck.g:16943:1: ( rule__XBasicForLoopExpression__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getGroup_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16944:1: ( rule__XBasicForLoopExpression__Group_3__0 )?
+            // InternalCheck.g:16944:1: ( rule__XBasicForLoopExpression__Group_3__0 )?
             int alt128=2;
             int LA128_0 = input.LA(1);
 
@@ -49058,9 +49058,9 @@ public final void rule__XBasicForLoopExpression__Group__3__Impl() throws Recogni
             }
             switch (alt128) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16944:2: rule__XBasicForLoopExpression__Group_3__0
+                    // InternalCheck.g:16944:2: rule__XBasicForLoopExpression__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_3__0_in_rule__XBasicForLoopExpression__Group__3__Impl34375);
+                    pushFollow(FOLLOW_2);
                     rule__XBasicForLoopExpression__Group_3__0();
 
                     state._fsp--;
@@ -49096,21 +49096,21 @@ public final void rule__XBasicForLoopExpression__Group__3__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16954:1: rule__XBasicForLoopExpression__Group__4 : rule__XBasicForLoopExpression__Group__4__Impl rule__XBasicForLoopExpression__Group__5 ;
+    // InternalCheck.g:16954:1: rule__XBasicForLoopExpression__Group__4 : rule__XBasicForLoopExpression__Group__4__Impl rule__XBasicForLoopExpression__Group__5 ;
     public final void rule__XBasicForLoopExpression__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16958:1: ( rule__XBasicForLoopExpression__Group__4__Impl rule__XBasicForLoopExpression__Group__5 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16959:2: rule__XBasicForLoopExpression__Group__4__Impl rule__XBasicForLoopExpression__Group__5
+            // InternalCheck.g:16958:1: ( rule__XBasicForLoopExpression__Group__4__Impl rule__XBasicForLoopExpression__Group__5 )
+            // InternalCheck.g:16959:2: rule__XBasicForLoopExpression__Group__4__Impl rule__XBasicForLoopExpression__Group__5
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__4__Impl_in_rule__XBasicForLoopExpression__Group__434406);
+            pushFollow(FOLLOW_96);
             rule__XBasicForLoopExpression__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__5_in_rule__XBasicForLoopExpression__Group__434409);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group__5();
 
             state._fsp--;
@@ -49134,22 +49134,22 @@ public final void rule__XBasicForLoopExpression__Group__4() throws RecognitionEx
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16966:1: rule__XBasicForLoopExpression__Group__4__Impl : ( ';' ) ;
+    // InternalCheck.g:16966:1: rule__XBasicForLoopExpression__Group__4__Impl : ( ';' ) ;
     public final void rule__XBasicForLoopExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16970:1: ( ( ';' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16971:1: ( ';' )
+            // InternalCheck.g:16970:1: ( ( ';' ) )
+            // InternalCheck.g:16971:1: ( ';' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16971:1: ( ';' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16972:1: ';'
+            // InternalCheck.g:16971:1: ( ';' )
+            // InternalCheck.g:16972:1: ';'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getSemicolonKeyword_4()); 
             }
-            match(input,71,FOLLOW_71_in_rule__XBasicForLoopExpression__Group__4__Impl34437); if (state.failed) return ;
+            match(input,71,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBasicForLoopExpressionAccess().getSemicolonKeyword_4()); 
             }
@@ -49175,21 +49175,21 @@ public final void rule__XBasicForLoopExpression__Group__4__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__5"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16985:1: rule__XBasicForLoopExpression__Group__5 : rule__XBasicForLoopExpression__Group__5__Impl rule__XBasicForLoopExpression__Group__6 ;
+    // InternalCheck.g:16985:1: rule__XBasicForLoopExpression__Group__5 : rule__XBasicForLoopExpression__Group__5__Impl rule__XBasicForLoopExpression__Group__6 ;
     public final void rule__XBasicForLoopExpression__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16989:1: ( rule__XBasicForLoopExpression__Group__5__Impl rule__XBasicForLoopExpression__Group__6 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16990:2: rule__XBasicForLoopExpression__Group__5__Impl rule__XBasicForLoopExpression__Group__6
+            // InternalCheck.g:16989:1: ( rule__XBasicForLoopExpression__Group__5__Impl rule__XBasicForLoopExpression__Group__6 )
+            // InternalCheck.g:16990:2: rule__XBasicForLoopExpression__Group__5__Impl rule__XBasicForLoopExpression__Group__6
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__5__Impl_in_rule__XBasicForLoopExpression__Group__534468);
+            pushFollow(FOLLOW_96);
             rule__XBasicForLoopExpression__Group__5__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__6_in_rule__XBasicForLoopExpression__Group__534471);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group__6();
 
             state._fsp--;
@@ -49213,22 +49213,22 @@ public final void rule__XBasicForLoopExpression__Group__5() throws RecognitionEx
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16997:1: rule__XBasicForLoopExpression__Group__5__Impl : ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? ) ;
+    // InternalCheck.g:16997:1: rule__XBasicForLoopExpression__Group__5__Impl : ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? ) ;
     public final void rule__XBasicForLoopExpression__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17001:1: ( ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17002:1: ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? )
+            // InternalCheck.g:17001:1: ( ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? ) )
+            // InternalCheck.g:17002:1: ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17002:1: ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17003:1: ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )?
+            // InternalCheck.g:17002:1: ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? )
+            // InternalCheck.g:17003:1: ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getExpressionAssignment_5()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17004:1: ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )?
+            // InternalCheck.g:17004:1: ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )?
             int alt129=2;
             int LA129_0 = input.LA(1);
 
@@ -49237,9 +49237,9 @@ public final void rule__XBasicForLoopExpression__Group__5__Impl() throws Recogni
             }
             switch (alt129) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17004:2: rule__XBasicForLoopExpression__ExpressionAssignment_5
+                    // InternalCheck.g:17004:2: rule__XBasicForLoopExpression__ExpressionAssignment_5
                     {
-                    pushFollow(FOLLOW_rule__XBasicForLoopExpression__ExpressionAssignment_5_in_rule__XBasicForLoopExpression__Group__5__Impl34498);
+                    pushFollow(FOLLOW_2);
                     rule__XBasicForLoopExpression__ExpressionAssignment_5();
 
                     state._fsp--;
@@ -49275,21 +49275,21 @@ public final void rule__XBasicForLoopExpression__Group__5__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__6"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17014:1: rule__XBasicForLoopExpression__Group__6 : rule__XBasicForLoopExpression__Group__6__Impl rule__XBasicForLoopExpression__Group__7 ;
+    // InternalCheck.g:17014:1: rule__XBasicForLoopExpression__Group__6 : rule__XBasicForLoopExpression__Group__6__Impl rule__XBasicForLoopExpression__Group__7 ;
     public final void rule__XBasicForLoopExpression__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17018:1: ( rule__XBasicForLoopExpression__Group__6__Impl rule__XBasicForLoopExpression__Group__7 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17019:2: rule__XBasicForLoopExpression__Group__6__Impl rule__XBasicForLoopExpression__Group__7
+            // InternalCheck.g:17018:1: ( rule__XBasicForLoopExpression__Group__6__Impl rule__XBasicForLoopExpression__Group__7 )
+            // InternalCheck.g:17019:2: rule__XBasicForLoopExpression__Group__6__Impl rule__XBasicForLoopExpression__Group__7
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__6__Impl_in_rule__XBasicForLoopExpression__Group__634529);
+            pushFollow(FOLLOW_97);
             rule__XBasicForLoopExpression__Group__6__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__7_in_rule__XBasicForLoopExpression__Group__634532);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group__7();
 
             state._fsp--;
@@ -49313,22 +49313,22 @@ public final void rule__XBasicForLoopExpression__Group__6() throws RecognitionEx
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__6__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17026:1: rule__XBasicForLoopExpression__Group__6__Impl : ( ';' ) ;
+    // InternalCheck.g:17026:1: rule__XBasicForLoopExpression__Group__6__Impl : ( ';' ) ;
     public final void rule__XBasicForLoopExpression__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17030:1: ( ( ';' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17031:1: ( ';' )
+            // InternalCheck.g:17030:1: ( ( ';' ) )
+            // InternalCheck.g:17031:1: ( ';' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17031:1: ( ';' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17032:1: ';'
+            // InternalCheck.g:17031:1: ( ';' )
+            // InternalCheck.g:17032:1: ';'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getSemicolonKeyword_6()); 
             }
-            match(input,71,FOLLOW_71_in_rule__XBasicForLoopExpression__Group__6__Impl34560); if (state.failed) return ;
+            match(input,71,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBasicForLoopExpressionAccess().getSemicolonKeyword_6()); 
             }
@@ -49354,21 +49354,21 @@ public final void rule__XBasicForLoopExpression__Group__6__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__7"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17045:1: rule__XBasicForLoopExpression__Group__7 : rule__XBasicForLoopExpression__Group__7__Impl rule__XBasicForLoopExpression__Group__8 ;
+    // InternalCheck.g:17045:1: rule__XBasicForLoopExpression__Group__7 : rule__XBasicForLoopExpression__Group__7__Impl rule__XBasicForLoopExpression__Group__8 ;
     public final void rule__XBasicForLoopExpression__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17049:1: ( rule__XBasicForLoopExpression__Group__7__Impl rule__XBasicForLoopExpression__Group__8 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17050:2: rule__XBasicForLoopExpression__Group__7__Impl rule__XBasicForLoopExpression__Group__8
+            // InternalCheck.g:17049:1: ( rule__XBasicForLoopExpression__Group__7__Impl rule__XBasicForLoopExpression__Group__8 )
+            // InternalCheck.g:17050:2: rule__XBasicForLoopExpression__Group__7__Impl rule__XBasicForLoopExpression__Group__8
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__7__Impl_in_rule__XBasicForLoopExpression__Group__734591);
+            pushFollow(FOLLOW_97);
             rule__XBasicForLoopExpression__Group__7__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__8_in_rule__XBasicForLoopExpression__Group__734594);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group__8();
 
             state._fsp--;
@@ -49392,22 +49392,22 @@ public final void rule__XBasicForLoopExpression__Group__7() throws RecognitionEx
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__7__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17057:1: rule__XBasicForLoopExpression__Group__7__Impl : ( ( rule__XBasicForLoopExpression__Group_7__0 )? ) ;
+    // InternalCheck.g:17057:1: rule__XBasicForLoopExpression__Group__7__Impl : ( ( rule__XBasicForLoopExpression__Group_7__0 )? ) ;
     public final void rule__XBasicForLoopExpression__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17061:1: ( ( ( rule__XBasicForLoopExpression__Group_7__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17062:1: ( ( rule__XBasicForLoopExpression__Group_7__0 )? )
+            // InternalCheck.g:17061:1: ( ( ( rule__XBasicForLoopExpression__Group_7__0 )? ) )
+            // InternalCheck.g:17062:1: ( ( rule__XBasicForLoopExpression__Group_7__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17062:1: ( ( rule__XBasicForLoopExpression__Group_7__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17063:1: ( rule__XBasicForLoopExpression__Group_7__0 )?
+            // InternalCheck.g:17062:1: ( ( rule__XBasicForLoopExpression__Group_7__0 )? )
+            // InternalCheck.g:17063:1: ( rule__XBasicForLoopExpression__Group_7__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getGroup_7()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17064:1: ( rule__XBasicForLoopExpression__Group_7__0 )?
+            // InternalCheck.g:17064:1: ( rule__XBasicForLoopExpression__Group_7__0 )?
             int alt130=2;
             int LA130_0 = input.LA(1);
 
@@ -49416,9 +49416,9 @@ public final void rule__XBasicForLoopExpression__Group__7__Impl() throws Recogni
             }
             switch (alt130) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17064:2: rule__XBasicForLoopExpression__Group_7__0
+                    // InternalCheck.g:17064:2: rule__XBasicForLoopExpression__Group_7__0
                     {
-                    pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_7__0_in_rule__XBasicForLoopExpression__Group__7__Impl34621);
+                    pushFollow(FOLLOW_2);
                     rule__XBasicForLoopExpression__Group_7__0();
 
                     state._fsp--;
@@ -49454,21 +49454,21 @@ public final void rule__XBasicForLoopExpression__Group__7__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__8"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17074:1: rule__XBasicForLoopExpression__Group__8 : rule__XBasicForLoopExpression__Group__8__Impl rule__XBasicForLoopExpression__Group__9 ;
+    // InternalCheck.g:17074:1: rule__XBasicForLoopExpression__Group__8 : rule__XBasicForLoopExpression__Group__8__Impl rule__XBasicForLoopExpression__Group__9 ;
     public final void rule__XBasicForLoopExpression__Group__8() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17078:1: ( rule__XBasicForLoopExpression__Group__8__Impl rule__XBasicForLoopExpression__Group__9 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17079:2: rule__XBasicForLoopExpression__Group__8__Impl rule__XBasicForLoopExpression__Group__9
+            // InternalCheck.g:17078:1: ( rule__XBasicForLoopExpression__Group__8__Impl rule__XBasicForLoopExpression__Group__9 )
+            // InternalCheck.g:17079:2: rule__XBasicForLoopExpression__Group__8__Impl rule__XBasicForLoopExpression__Group__9
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__8__Impl_in_rule__XBasicForLoopExpression__Group__834652);
+            pushFollow(FOLLOW_32);
             rule__XBasicForLoopExpression__Group__8__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__9_in_rule__XBasicForLoopExpression__Group__834655);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group__9();
 
             state._fsp--;
@@ -49492,22 +49492,22 @@ public final void rule__XBasicForLoopExpression__Group__8() throws RecognitionEx
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__8__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17086:1: rule__XBasicForLoopExpression__Group__8__Impl : ( ')' ) ;
+    // InternalCheck.g:17086:1: rule__XBasicForLoopExpression__Group__8__Impl : ( ')' ) ;
     public final void rule__XBasicForLoopExpression__Group__8__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17090:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17091:1: ( ')' )
+            // InternalCheck.g:17090:1: ( ( ')' ) )
+            // InternalCheck.g:17091:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17091:1: ( ')' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17092:1: ')'
+            // InternalCheck.g:17091:1: ( ')' )
+            // InternalCheck.g:17092:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getRightParenthesisKeyword_8()); 
             }
-            match(input,73,FOLLOW_73_in_rule__XBasicForLoopExpression__Group__8__Impl34683); if (state.failed) return ;
+            match(input,73,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBasicForLoopExpressionAccess().getRightParenthesisKeyword_8()); 
             }
@@ -49533,16 +49533,16 @@ public final void rule__XBasicForLoopExpression__Group__8__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__9"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17105:1: rule__XBasicForLoopExpression__Group__9 : rule__XBasicForLoopExpression__Group__9__Impl ;
+    // InternalCheck.g:17105:1: rule__XBasicForLoopExpression__Group__9 : rule__XBasicForLoopExpression__Group__9__Impl ;
     public final void rule__XBasicForLoopExpression__Group__9() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17109:1: ( rule__XBasicForLoopExpression__Group__9__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17110:2: rule__XBasicForLoopExpression__Group__9__Impl
+            // InternalCheck.g:17109:1: ( rule__XBasicForLoopExpression__Group__9__Impl )
+            // InternalCheck.g:17110:2: rule__XBasicForLoopExpression__Group__9__Impl
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__9__Impl_in_rule__XBasicForLoopExpression__Group__934714);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group__9__Impl();
 
             state._fsp--;
@@ -49566,25 +49566,25 @@ public final void rule__XBasicForLoopExpression__Group__9() throws RecognitionEx
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__9__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17116:1: rule__XBasicForLoopExpression__Group__9__Impl : ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) ) ;
+    // InternalCheck.g:17116:1: rule__XBasicForLoopExpression__Group__9__Impl : ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) ) ;
     public final void rule__XBasicForLoopExpression__Group__9__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17120:1: ( ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17121:1: ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) )
+            // InternalCheck.g:17120:1: ( ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) ) )
+            // InternalCheck.g:17121:1: ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17121:1: ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17122:1: ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 )
+            // InternalCheck.g:17121:1: ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) )
+            // InternalCheck.g:17122:1: ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getEachExpressionAssignment_9()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17123:1: ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17123:2: rule__XBasicForLoopExpression__EachExpressionAssignment_9
+            // InternalCheck.g:17123:1: ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 )
+            // InternalCheck.g:17123:2: rule__XBasicForLoopExpression__EachExpressionAssignment_9
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__EachExpressionAssignment_9_in_rule__XBasicForLoopExpression__Group__9__Impl34741);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__EachExpressionAssignment_9();
 
             state._fsp--;
@@ -49617,21 +49617,21 @@ public final void rule__XBasicForLoopExpression__Group__9__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17153:1: rule__XBasicForLoopExpression__Group_3__0 : rule__XBasicForLoopExpression__Group_3__0__Impl rule__XBasicForLoopExpression__Group_3__1 ;
+    // InternalCheck.g:17153:1: rule__XBasicForLoopExpression__Group_3__0 : rule__XBasicForLoopExpression__Group_3__0__Impl rule__XBasicForLoopExpression__Group_3__1 ;
     public final void rule__XBasicForLoopExpression__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17157:1: ( rule__XBasicForLoopExpression__Group_3__0__Impl rule__XBasicForLoopExpression__Group_3__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17158:2: rule__XBasicForLoopExpression__Group_3__0__Impl rule__XBasicForLoopExpression__Group_3__1
+            // InternalCheck.g:17157:1: ( rule__XBasicForLoopExpression__Group_3__0__Impl rule__XBasicForLoopExpression__Group_3__1 )
+            // InternalCheck.g:17158:2: rule__XBasicForLoopExpression__Group_3__0__Impl rule__XBasicForLoopExpression__Group_3__1
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_3__0__Impl_in_rule__XBasicForLoopExpression__Group_3__034791);
+            pushFollow(FOLLOW_20);
             rule__XBasicForLoopExpression__Group_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_3__1_in_rule__XBasicForLoopExpression__Group_3__034794);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group_3__1();
 
             state._fsp--;
@@ -49655,25 +49655,25 @@ public final void rule__XBasicForLoopExpression__Group_3__0() throws Recognition
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17165:1: rule__XBasicForLoopExpression__Group_3__0__Impl : ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) ) ;
+    // InternalCheck.g:17165:1: rule__XBasicForLoopExpression__Group_3__0__Impl : ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) ) ;
     public final void rule__XBasicForLoopExpression__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17169:1: ( ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17170:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) )
+            // InternalCheck.g:17169:1: ( ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) ) )
+            // InternalCheck.g:17170:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17170:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17171:1: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 )
+            // InternalCheck.g:17170:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) )
+            // InternalCheck.g:17171:1: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getInitExpressionsAssignment_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17172:1: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17172:2: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0
+            // InternalCheck.g:17172:1: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 )
+            // InternalCheck.g:17172:2: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0_in_rule__XBasicForLoopExpression__Group_3__0__Impl34821);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0();
 
             state._fsp--;
@@ -49706,16 +49706,16 @@ public final void rule__XBasicForLoopExpression__Group_3__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17182:1: rule__XBasicForLoopExpression__Group_3__1 : rule__XBasicForLoopExpression__Group_3__1__Impl ;
+    // InternalCheck.g:17182:1: rule__XBasicForLoopExpression__Group_3__1 : rule__XBasicForLoopExpression__Group_3__1__Impl ;
     public final void rule__XBasicForLoopExpression__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17186:1: ( rule__XBasicForLoopExpression__Group_3__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17187:2: rule__XBasicForLoopExpression__Group_3__1__Impl
+            // InternalCheck.g:17186:1: ( rule__XBasicForLoopExpression__Group_3__1__Impl )
+            // InternalCheck.g:17187:2: rule__XBasicForLoopExpression__Group_3__1__Impl
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_3__1__Impl_in_rule__XBasicForLoopExpression__Group_3__134851);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group_3__1__Impl();
 
             state._fsp--;
@@ -49739,22 +49739,22 @@ public final void rule__XBasicForLoopExpression__Group_3__1() throws Recognition
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17193:1: rule__XBasicForLoopExpression__Group_3__1__Impl : ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* ) ;
+    // InternalCheck.g:17193:1: rule__XBasicForLoopExpression__Group_3__1__Impl : ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* ) ;
     public final void rule__XBasicForLoopExpression__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17197:1: ( ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17198:1: ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* )
+            // InternalCheck.g:17197:1: ( ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* ) )
+            // InternalCheck.g:17198:1: ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17198:1: ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17199:1: ( rule__XBasicForLoopExpression__Group_3_1__0 )*
+            // InternalCheck.g:17198:1: ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* )
+            // InternalCheck.g:17199:1: ( rule__XBasicForLoopExpression__Group_3_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getGroup_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17200:1: ( rule__XBasicForLoopExpression__Group_3_1__0 )*
+            // InternalCheck.g:17200:1: ( rule__XBasicForLoopExpression__Group_3_1__0 )*
             loop131:
             do {
                 int alt131=2;
@@ -49767,9 +49767,9 @@ public final void rule__XBasicForLoopExpression__Group_3__1__Impl() throws Recog
 
                 switch (alt131) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17200:2: rule__XBasicForLoopExpression__Group_3_1__0
+            	    // InternalCheck.g:17200:2: rule__XBasicForLoopExpression__Group_3_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_3_1__0_in_rule__XBasicForLoopExpression__Group_3__1__Impl34878);
+            	    pushFollow(FOLLOW_21);
             	    rule__XBasicForLoopExpression__Group_3_1__0();
 
             	    state._fsp--;
@@ -49808,21 +49808,21 @@ public final void rule__XBasicForLoopExpression__Group_3__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17214:1: rule__XBasicForLoopExpression__Group_3_1__0 : rule__XBasicForLoopExpression__Group_3_1__0__Impl rule__XBasicForLoopExpression__Group_3_1__1 ;
+    // InternalCheck.g:17214:1: rule__XBasicForLoopExpression__Group_3_1__0 : rule__XBasicForLoopExpression__Group_3_1__0__Impl rule__XBasicForLoopExpression__Group_3_1__1 ;
     public final void rule__XBasicForLoopExpression__Group_3_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17218:1: ( rule__XBasicForLoopExpression__Group_3_1__0__Impl rule__XBasicForLoopExpression__Group_3_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17219:2: rule__XBasicForLoopExpression__Group_3_1__0__Impl rule__XBasicForLoopExpression__Group_3_1__1
+            // InternalCheck.g:17218:1: ( rule__XBasicForLoopExpression__Group_3_1__0__Impl rule__XBasicForLoopExpression__Group_3_1__1 )
+            // InternalCheck.g:17219:2: rule__XBasicForLoopExpression__Group_3_1__0__Impl rule__XBasicForLoopExpression__Group_3_1__1
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_3_1__0__Impl_in_rule__XBasicForLoopExpression__Group_3_1__034913);
+            pushFollow(FOLLOW_98);
             rule__XBasicForLoopExpression__Group_3_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_3_1__1_in_rule__XBasicForLoopExpression__Group_3_1__034916);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group_3_1__1();
 
             state._fsp--;
@@ -49846,22 +49846,22 @@ public final void rule__XBasicForLoopExpression__Group_3_1__0() throws Recogniti
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17226:1: rule__XBasicForLoopExpression__Group_3_1__0__Impl : ( ',' ) ;
+    // InternalCheck.g:17226:1: rule__XBasicForLoopExpression__Group_3_1__0__Impl : ( ',' ) ;
     public final void rule__XBasicForLoopExpression__Group_3_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17230:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17231:1: ( ',' )
+            // InternalCheck.g:17230:1: ( ( ',' ) )
+            // InternalCheck.g:17231:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17231:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17232:1: ','
+            // InternalCheck.g:17231:1: ( ',' )
+            // InternalCheck.g:17232:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getCommaKeyword_3_1_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XBasicForLoopExpression__Group_3_1__0__Impl34944); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBasicForLoopExpressionAccess().getCommaKeyword_3_1_0()); 
             }
@@ -49887,16 +49887,16 @@ public final void rule__XBasicForLoopExpression__Group_3_1__0__Impl() throws Rec
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17245:1: rule__XBasicForLoopExpression__Group_3_1__1 : rule__XBasicForLoopExpression__Group_3_1__1__Impl ;
+    // InternalCheck.g:17245:1: rule__XBasicForLoopExpression__Group_3_1__1 : rule__XBasicForLoopExpression__Group_3_1__1__Impl ;
     public final void rule__XBasicForLoopExpression__Group_3_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17249:1: ( rule__XBasicForLoopExpression__Group_3_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17250:2: rule__XBasicForLoopExpression__Group_3_1__1__Impl
+            // InternalCheck.g:17249:1: ( rule__XBasicForLoopExpression__Group_3_1__1__Impl )
+            // InternalCheck.g:17250:2: rule__XBasicForLoopExpression__Group_3_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_3_1__1__Impl_in_rule__XBasicForLoopExpression__Group_3_1__134975);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group_3_1__1__Impl();
 
             state._fsp--;
@@ -49920,25 +49920,25 @@ public final void rule__XBasicForLoopExpression__Group_3_1__1() throws Recogniti
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17256:1: rule__XBasicForLoopExpression__Group_3_1__1__Impl : ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) ) ;
+    // InternalCheck.g:17256:1: rule__XBasicForLoopExpression__Group_3_1__1__Impl : ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) ) ;
     public final void rule__XBasicForLoopExpression__Group_3_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17260:1: ( ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17261:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) )
+            // InternalCheck.g:17260:1: ( ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) ) )
+            // InternalCheck.g:17261:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17261:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17262:1: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 )
+            // InternalCheck.g:17261:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) )
+            // InternalCheck.g:17262:1: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getInitExpressionsAssignment_3_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17263:1: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17263:2: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1
+            // InternalCheck.g:17263:1: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 )
+            // InternalCheck.g:17263:2: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1_in_rule__XBasicForLoopExpression__Group_3_1__1__Impl35002);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1();
 
             state._fsp--;
@@ -49971,21 +49971,21 @@ public final void rule__XBasicForLoopExpression__Group_3_1__1__Impl() throws Rec
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17277:1: rule__XBasicForLoopExpression__Group_7__0 : rule__XBasicForLoopExpression__Group_7__0__Impl rule__XBasicForLoopExpression__Group_7__1 ;
+    // InternalCheck.g:17277:1: rule__XBasicForLoopExpression__Group_7__0 : rule__XBasicForLoopExpression__Group_7__0__Impl rule__XBasicForLoopExpression__Group_7__1 ;
     public final void rule__XBasicForLoopExpression__Group_7__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17281:1: ( rule__XBasicForLoopExpression__Group_7__0__Impl rule__XBasicForLoopExpression__Group_7__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17282:2: rule__XBasicForLoopExpression__Group_7__0__Impl rule__XBasicForLoopExpression__Group_7__1
+            // InternalCheck.g:17281:1: ( rule__XBasicForLoopExpression__Group_7__0__Impl rule__XBasicForLoopExpression__Group_7__1 )
+            // InternalCheck.g:17282:2: rule__XBasicForLoopExpression__Group_7__0__Impl rule__XBasicForLoopExpression__Group_7__1
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_7__0__Impl_in_rule__XBasicForLoopExpression__Group_7__035036);
+            pushFollow(FOLLOW_20);
             rule__XBasicForLoopExpression__Group_7__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_7__1_in_rule__XBasicForLoopExpression__Group_7__035039);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group_7__1();
 
             state._fsp--;
@@ -50009,25 +50009,25 @@ public final void rule__XBasicForLoopExpression__Group_7__0() throws Recognition
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17289:1: rule__XBasicForLoopExpression__Group_7__0__Impl : ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) ) ;
+    // InternalCheck.g:17289:1: rule__XBasicForLoopExpression__Group_7__0__Impl : ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) ) ;
     public final void rule__XBasicForLoopExpression__Group_7__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17293:1: ( ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17294:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) )
+            // InternalCheck.g:17293:1: ( ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) ) )
+            // InternalCheck.g:17294:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17294:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17295:1: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 )
+            // InternalCheck.g:17294:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) )
+            // InternalCheck.g:17295:1: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getUpdateExpressionsAssignment_7_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17296:1: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17296:2: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0
+            // InternalCheck.g:17296:1: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 )
+            // InternalCheck.g:17296:2: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0_in_rule__XBasicForLoopExpression__Group_7__0__Impl35066);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0();
 
             state._fsp--;
@@ -50060,16 +50060,16 @@ public final void rule__XBasicForLoopExpression__Group_7__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17306:1: rule__XBasicForLoopExpression__Group_7__1 : rule__XBasicForLoopExpression__Group_7__1__Impl ;
+    // InternalCheck.g:17306:1: rule__XBasicForLoopExpression__Group_7__1 : rule__XBasicForLoopExpression__Group_7__1__Impl ;
     public final void rule__XBasicForLoopExpression__Group_7__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17310:1: ( rule__XBasicForLoopExpression__Group_7__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17311:2: rule__XBasicForLoopExpression__Group_7__1__Impl
+            // InternalCheck.g:17310:1: ( rule__XBasicForLoopExpression__Group_7__1__Impl )
+            // InternalCheck.g:17311:2: rule__XBasicForLoopExpression__Group_7__1__Impl
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_7__1__Impl_in_rule__XBasicForLoopExpression__Group_7__135096);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group_7__1__Impl();
 
             state._fsp--;
@@ -50093,22 +50093,22 @@ public final void rule__XBasicForLoopExpression__Group_7__1() throws Recognition
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17317:1: rule__XBasicForLoopExpression__Group_7__1__Impl : ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* ) ;
+    // InternalCheck.g:17317:1: rule__XBasicForLoopExpression__Group_7__1__Impl : ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* ) ;
     public final void rule__XBasicForLoopExpression__Group_7__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17321:1: ( ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17322:1: ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* )
+            // InternalCheck.g:17321:1: ( ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* ) )
+            // InternalCheck.g:17322:1: ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17322:1: ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17323:1: ( rule__XBasicForLoopExpression__Group_7_1__0 )*
+            // InternalCheck.g:17322:1: ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* )
+            // InternalCheck.g:17323:1: ( rule__XBasicForLoopExpression__Group_7_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getGroup_7_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17324:1: ( rule__XBasicForLoopExpression__Group_7_1__0 )*
+            // InternalCheck.g:17324:1: ( rule__XBasicForLoopExpression__Group_7_1__0 )*
             loop132:
             do {
                 int alt132=2;
@@ -50121,9 +50121,9 @@ public final void rule__XBasicForLoopExpression__Group_7__1__Impl() throws Recog
 
                 switch (alt132) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17324:2: rule__XBasicForLoopExpression__Group_7_1__0
+            	    // InternalCheck.g:17324:2: rule__XBasicForLoopExpression__Group_7_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_7_1__0_in_rule__XBasicForLoopExpression__Group_7__1__Impl35123);
+            	    pushFollow(FOLLOW_21);
             	    rule__XBasicForLoopExpression__Group_7_1__0();
 
             	    state._fsp--;
@@ -50162,21 +50162,21 @@ public final void rule__XBasicForLoopExpression__Group_7__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17338:1: rule__XBasicForLoopExpression__Group_7_1__0 : rule__XBasicForLoopExpression__Group_7_1__0__Impl rule__XBasicForLoopExpression__Group_7_1__1 ;
+    // InternalCheck.g:17338:1: rule__XBasicForLoopExpression__Group_7_1__0 : rule__XBasicForLoopExpression__Group_7_1__0__Impl rule__XBasicForLoopExpression__Group_7_1__1 ;
     public final void rule__XBasicForLoopExpression__Group_7_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17342:1: ( rule__XBasicForLoopExpression__Group_7_1__0__Impl rule__XBasicForLoopExpression__Group_7_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17343:2: rule__XBasicForLoopExpression__Group_7_1__0__Impl rule__XBasicForLoopExpression__Group_7_1__1
+            // InternalCheck.g:17342:1: ( rule__XBasicForLoopExpression__Group_7_1__0__Impl rule__XBasicForLoopExpression__Group_7_1__1 )
+            // InternalCheck.g:17343:2: rule__XBasicForLoopExpression__Group_7_1__0__Impl rule__XBasicForLoopExpression__Group_7_1__1
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_7_1__0__Impl_in_rule__XBasicForLoopExpression__Group_7_1__035158);
+            pushFollow(FOLLOW_32);
             rule__XBasicForLoopExpression__Group_7_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_7_1__1_in_rule__XBasicForLoopExpression__Group_7_1__035161);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group_7_1__1();
 
             state._fsp--;
@@ -50200,22 +50200,22 @@ public final void rule__XBasicForLoopExpression__Group_7_1__0() throws Recogniti
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17350:1: rule__XBasicForLoopExpression__Group_7_1__0__Impl : ( ',' ) ;
+    // InternalCheck.g:17350:1: rule__XBasicForLoopExpression__Group_7_1__0__Impl : ( ',' ) ;
     public final void rule__XBasicForLoopExpression__Group_7_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17354:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17355:1: ( ',' )
+            // InternalCheck.g:17354:1: ( ( ',' ) )
+            // InternalCheck.g:17355:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17355:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17356:1: ','
+            // InternalCheck.g:17355:1: ( ',' )
+            // InternalCheck.g:17356:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getCommaKeyword_7_1_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XBasicForLoopExpression__Group_7_1__0__Impl35189); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBasicForLoopExpressionAccess().getCommaKeyword_7_1_0()); 
             }
@@ -50241,16 +50241,16 @@ public final void rule__XBasicForLoopExpression__Group_7_1__0__Impl() throws Rec
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17369:1: rule__XBasicForLoopExpression__Group_7_1__1 : rule__XBasicForLoopExpression__Group_7_1__1__Impl ;
+    // InternalCheck.g:17369:1: rule__XBasicForLoopExpression__Group_7_1__1 : rule__XBasicForLoopExpression__Group_7_1__1__Impl ;
     public final void rule__XBasicForLoopExpression__Group_7_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17373:1: ( rule__XBasicForLoopExpression__Group_7_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17374:2: rule__XBasicForLoopExpression__Group_7_1__1__Impl
+            // InternalCheck.g:17373:1: ( rule__XBasicForLoopExpression__Group_7_1__1__Impl )
+            // InternalCheck.g:17374:2: rule__XBasicForLoopExpression__Group_7_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_7_1__1__Impl_in_rule__XBasicForLoopExpression__Group_7_1__135220);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group_7_1__1__Impl();
 
             state._fsp--;
@@ -50274,25 +50274,25 @@ public final void rule__XBasicForLoopExpression__Group_7_1__1() throws Recogniti
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17380:1: rule__XBasicForLoopExpression__Group_7_1__1__Impl : ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) ) ;
+    // InternalCheck.g:17380:1: rule__XBasicForLoopExpression__Group_7_1__1__Impl : ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) ) ;
     public final void rule__XBasicForLoopExpression__Group_7_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17384:1: ( ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17385:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) )
+            // InternalCheck.g:17384:1: ( ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) ) )
+            // InternalCheck.g:17385:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17385:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17386:1: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 )
+            // InternalCheck.g:17385:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) )
+            // InternalCheck.g:17386:1: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getUpdateExpressionsAssignment_7_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17387:1: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17387:2: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1
+            // InternalCheck.g:17387:1: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 )
+            // InternalCheck.g:17387:2: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1_in_rule__XBasicForLoopExpression__Group_7_1__1__Impl35247);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1();
 
             state._fsp--;
@@ -50325,21 +50325,21 @@ public final void rule__XBasicForLoopExpression__Group_7_1__1__Impl() throws Rec
 
 
     // $ANTLR start "rule__XWhileExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17401:1: rule__XWhileExpression__Group__0 : rule__XWhileExpression__Group__0__Impl rule__XWhileExpression__Group__1 ;
+    // InternalCheck.g:17401:1: rule__XWhileExpression__Group__0 : rule__XWhileExpression__Group__0__Impl rule__XWhileExpression__Group__1 ;
     public final void rule__XWhileExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17405:1: ( rule__XWhileExpression__Group__0__Impl rule__XWhileExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17406:2: rule__XWhileExpression__Group__0__Impl rule__XWhileExpression__Group__1
+            // InternalCheck.g:17405:1: ( rule__XWhileExpression__Group__0__Impl rule__XWhileExpression__Group__1 )
+            // InternalCheck.g:17406:2: rule__XWhileExpression__Group__0__Impl rule__XWhileExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__0__Impl_in_rule__XWhileExpression__Group__035281);
+            pushFollow(FOLLOW_99);
             rule__XWhileExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__1_in_rule__XWhileExpression__Group__035284);
+            pushFollow(FOLLOW_2);
             rule__XWhileExpression__Group__1();
 
             state._fsp--;
@@ -50363,23 +50363,23 @@ public final void rule__XWhileExpression__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XWhileExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17413:1: rule__XWhileExpression__Group__0__Impl : ( () ) ;
+    // InternalCheck.g:17413:1: rule__XWhileExpression__Group__0__Impl : ( () ) ;
     public final void rule__XWhileExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17417:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17418:1: ( () )
+            // InternalCheck.g:17417:1: ( ( () ) )
+            // InternalCheck.g:17418:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17418:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17419:1: ()
+            // InternalCheck.g:17418:1: ( () )
+            // InternalCheck.g:17419:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getXWhileExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17420:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17422:1: 
+            // InternalCheck.g:17420:1: ()
+            // InternalCheck.g:17422:1: 
             {
             }
 
@@ -50404,21 +50404,21 @@ public final void rule__XWhileExpression__Group__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XWhileExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17432:1: rule__XWhileExpression__Group__1 : rule__XWhileExpression__Group__1__Impl rule__XWhileExpression__Group__2 ;
+    // InternalCheck.g:17432:1: rule__XWhileExpression__Group__1 : rule__XWhileExpression__Group__1__Impl rule__XWhileExpression__Group__2 ;
     public final void rule__XWhileExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17436:1: ( rule__XWhileExpression__Group__1__Impl rule__XWhileExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17437:2: rule__XWhileExpression__Group__1__Impl rule__XWhileExpression__Group__2
+            // InternalCheck.g:17436:1: ( rule__XWhileExpression__Group__1__Impl rule__XWhileExpression__Group__2 )
+            // InternalCheck.g:17437:2: rule__XWhileExpression__Group__1__Impl rule__XWhileExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__1__Impl_in_rule__XWhileExpression__Group__135342);
+            pushFollow(FOLLOW_26);
             rule__XWhileExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__2_in_rule__XWhileExpression__Group__135345);
+            pushFollow(FOLLOW_2);
             rule__XWhileExpression__Group__2();
 
             state._fsp--;
@@ -50442,22 +50442,22 @@ public final void rule__XWhileExpression__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XWhileExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17444:1: rule__XWhileExpression__Group__1__Impl : ( 'while' ) ;
+    // InternalCheck.g:17444:1: rule__XWhileExpression__Group__1__Impl : ( 'while' ) ;
     public final void rule__XWhileExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17448:1: ( ( 'while' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17449:1: ( 'while' )
+            // InternalCheck.g:17448:1: ( ( 'while' ) )
+            // InternalCheck.g:17449:1: ( 'while' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17449:1: ( 'while' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17450:1: 'while'
+            // InternalCheck.g:17449:1: ( 'while' )
+            // InternalCheck.g:17450:1: 'while'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getWhileKeyword_1()); 
             }
-            match(input,90,FOLLOW_90_in_rule__XWhileExpression__Group__1__Impl35373); if (state.failed) return ;
+            match(input,90,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXWhileExpressionAccess().getWhileKeyword_1()); 
             }
@@ -50483,21 +50483,21 @@ public final void rule__XWhileExpression__Group__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XWhileExpression__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17463:1: rule__XWhileExpression__Group__2 : rule__XWhileExpression__Group__2__Impl rule__XWhileExpression__Group__3 ;
+    // InternalCheck.g:17463:1: rule__XWhileExpression__Group__2 : rule__XWhileExpression__Group__2__Impl rule__XWhileExpression__Group__3 ;
     public final void rule__XWhileExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17467:1: ( rule__XWhileExpression__Group__2__Impl rule__XWhileExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17468:2: rule__XWhileExpression__Group__2__Impl rule__XWhileExpression__Group__3
+            // InternalCheck.g:17467:1: ( rule__XWhileExpression__Group__2__Impl rule__XWhileExpression__Group__3 )
+            // InternalCheck.g:17468:2: rule__XWhileExpression__Group__2__Impl rule__XWhileExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__2__Impl_in_rule__XWhileExpression__Group__235404);
+            pushFollow(FOLLOW_32);
             rule__XWhileExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__3_in_rule__XWhileExpression__Group__235407);
+            pushFollow(FOLLOW_2);
             rule__XWhileExpression__Group__3();
 
             state._fsp--;
@@ -50521,22 +50521,22 @@ public final void rule__XWhileExpression__Group__2() throws RecognitionException
 
 
     // $ANTLR start "rule__XWhileExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17475:1: rule__XWhileExpression__Group__2__Impl : ( '(' ) ;
+    // InternalCheck.g:17475:1: rule__XWhileExpression__Group__2__Impl : ( '(' ) ;
     public final void rule__XWhileExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17479:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17480:1: ( '(' )
+            // InternalCheck.g:17479:1: ( ( '(' ) )
+            // InternalCheck.g:17480:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17480:1: ( '(' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17481:1: '('
+            // InternalCheck.g:17480:1: ( '(' )
+            // InternalCheck.g:17481:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getLeftParenthesisKeyword_2()); 
             }
-            match(input,72,FOLLOW_72_in_rule__XWhileExpression__Group__2__Impl35435); if (state.failed) return ;
+            match(input,72,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXWhileExpressionAccess().getLeftParenthesisKeyword_2()); 
             }
@@ -50562,21 +50562,21 @@ public final void rule__XWhileExpression__Group__2__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XWhileExpression__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17494:1: rule__XWhileExpression__Group__3 : rule__XWhileExpression__Group__3__Impl rule__XWhileExpression__Group__4 ;
+    // InternalCheck.g:17494:1: rule__XWhileExpression__Group__3 : rule__XWhileExpression__Group__3__Impl rule__XWhileExpression__Group__4 ;
     public final void rule__XWhileExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17498:1: ( rule__XWhileExpression__Group__3__Impl rule__XWhileExpression__Group__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17499:2: rule__XWhileExpression__Group__3__Impl rule__XWhileExpression__Group__4
+            // InternalCheck.g:17498:1: ( rule__XWhileExpression__Group__3__Impl rule__XWhileExpression__Group__4 )
+            // InternalCheck.g:17499:2: rule__XWhileExpression__Group__3__Impl rule__XWhileExpression__Group__4
             {
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__3__Impl_in_rule__XWhileExpression__Group__335466);
+            pushFollow(FOLLOW_28);
             rule__XWhileExpression__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__4_in_rule__XWhileExpression__Group__335469);
+            pushFollow(FOLLOW_2);
             rule__XWhileExpression__Group__4();
 
             state._fsp--;
@@ -50600,25 +50600,25 @@ public final void rule__XWhileExpression__Group__3() throws RecognitionException
 
 
     // $ANTLR start "rule__XWhileExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17506:1: rule__XWhileExpression__Group__3__Impl : ( ( rule__XWhileExpression__PredicateAssignment_3 ) ) ;
+    // InternalCheck.g:17506:1: rule__XWhileExpression__Group__3__Impl : ( ( rule__XWhileExpression__PredicateAssignment_3 ) ) ;
     public final void rule__XWhileExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17510:1: ( ( ( rule__XWhileExpression__PredicateAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17511:1: ( ( rule__XWhileExpression__PredicateAssignment_3 ) )
+            // InternalCheck.g:17510:1: ( ( ( rule__XWhileExpression__PredicateAssignment_3 ) ) )
+            // InternalCheck.g:17511:1: ( ( rule__XWhileExpression__PredicateAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17511:1: ( ( rule__XWhileExpression__PredicateAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17512:1: ( rule__XWhileExpression__PredicateAssignment_3 )
+            // InternalCheck.g:17511:1: ( ( rule__XWhileExpression__PredicateAssignment_3 ) )
+            // InternalCheck.g:17512:1: ( rule__XWhileExpression__PredicateAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getPredicateAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17513:1: ( rule__XWhileExpression__PredicateAssignment_3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17513:2: rule__XWhileExpression__PredicateAssignment_3
+            // InternalCheck.g:17513:1: ( rule__XWhileExpression__PredicateAssignment_3 )
+            // InternalCheck.g:17513:2: rule__XWhileExpression__PredicateAssignment_3
             {
-            pushFollow(FOLLOW_rule__XWhileExpression__PredicateAssignment_3_in_rule__XWhileExpression__Group__3__Impl35496);
+            pushFollow(FOLLOW_2);
             rule__XWhileExpression__PredicateAssignment_3();
 
             state._fsp--;
@@ -50651,21 +50651,21 @@ public final void rule__XWhileExpression__Group__3__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XWhileExpression__Group__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17523:1: rule__XWhileExpression__Group__4 : rule__XWhileExpression__Group__4__Impl rule__XWhileExpression__Group__5 ;
+    // InternalCheck.g:17523:1: rule__XWhileExpression__Group__4 : rule__XWhileExpression__Group__4__Impl rule__XWhileExpression__Group__5 ;
     public final void rule__XWhileExpression__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17527:1: ( rule__XWhileExpression__Group__4__Impl rule__XWhileExpression__Group__5 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17528:2: rule__XWhileExpression__Group__4__Impl rule__XWhileExpression__Group__5
+            // InternalCheck.g:17527:1: ( rule__XWhileExpression__Group__4__Impl rule__XWhileExpression__Group__5 )
+            // InternalCheck.g:17528:2: rule__XWhileExpression__Group__4__Impl rule__XWhileExpression__Group__5
             {
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__4__Impl_in_rule__XWhileExpression__Group__435526);
+            pushFollow(FOLLOW_32);
             rule__XWhileExpression__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__5_in_rule__XWhileExpression__Group__435529);
+            pushFollow(FOLLOW_2);
             rule__XWhileExpression__Group__5();
 
             state._fsp--;
@@ -50689,22 +50689,22 @@ public final void rule__XWhileExpression__Group__4() throws RecognitionException
 
 
     // $ANTLR start "rule__XWhileExpression__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17535:1: rule__XWhileExpression__Group__4__Impl : ( ')' ) ;
+    // InternalCheck.g:17535:1: rule__XWhileExpression__Group__4__Impl : ( ')' ) ;
     public final void rule__XWhileExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17539:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17540:1: ( ')' )
+            // InternalCheck.g:17539:1: ( ( ')' ) )
+            // InternalCheck.g:17540:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17540:1: ( ')' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17541:1: ')'
+            // InternalCheck.g:17540:1: ( ')' )
+            // InternalCheck.g:17541:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getRightParenthesisKeyword_4()); 
             }
-            match(input,73,FOLLOW_73_in_rule__XWhileExpression__Group__4__Impl35557); if (state.failed) return ;
+            match(input,73,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXWhileExpressionAccess().getRightParenthesisKeyword_4()); 
             }
@@ -50730,16 +50730,16 @@ public final void rule__XWhileExpression__Group__4__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XWhileExpression__Group__5"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17554:1: rule__XWhileExpression__Group__5 : rule__XWhileExpression__Group__5__Impl ;
+    // InternalCheck.g:17554:1: rule__XWhileExpression__Group__5 : rule__XWhileExpression__Group__5__Impl ;
     public final void rule__XWhileExpression__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17558:1: ( rule__XWhileExpression__Group__5__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17559:2: rule__XWhileExpression__Group__5__Impl
+            // InternalCheck.g:17558:1: ( rule__XWhileExpression__Group__5__Impl )
+            // InternalCheck.g:17559:2: rule__XWhileExpression__Group__5__Impl
             {
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__5__Impl_in_rule__XWhileExpression__Group__535588);
+            pushFollow(FOLLOW_2);
             rule__XWhileExpression__Group__5__Impl();
 
             state._fsp--;
@@ -50763,25 +50763,25 @@ public final void rule__XWhileExpression__Group__5() throws RecognitionException
 
 
     // $ANTLR start "rule__XWhileExpression__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17565:1: rule__XWhileExpression__Group__5__Impl : ( ( rule__XWhileExpression__BodyAssignment_5 ) ) ;
+    // InternalCheck.g:17565:1: rule__XWhileExpression__Group__5__Impl : ( ( rule__XWhileExpression__BodyAssignment_5 ) ) ;
     public final void rule__XWhileExpression__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17569:1: ( ( ( rule__XWhileExpression__BodyAssignment_5 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17570:1: ( ( rule__XWhileExpression__BodyAssignment_5 ) )
+            // InternalCheck.g:17569:1: ( ( ( rule__XWhileExpression__BodyAssignment_5 ) ) )
+            // InternalCheck.g:17570:1: ( ( rule__XWhileExpression__BodyAssignment_5 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17570:1: ( ( rule__XWhileExpression__BodyAssignment_5 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17571:1: ( rule__XWhileExpression__BodyAssignment_5 )
+            // InternalCheck.g:17570:1: ( ( rule__XWhileExpression__BodyAssignment_5 ) )
+            // InternalCheck.g:17571:1: ( rule__XWhileExpression__BodyAssignment_5 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getBodyAssignment_5()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17572:1: ( rule__XWhileExpression__BodyAssignment_5 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17572:2: rule__XWhileExpression__BodyAssignment_5
+            // InternalCheck.g:17572:1: ( rule__XWhileExpression__BodyAssignment_5 )
+            // InternalCheck.g:17572:2: rule__XWhileExpression__BodyAssignment_5
             {
-            pushFollow(FOLLOW_rule__XWhileExpression__BodyAssignment_5_in_rule__XWhileExpression__Group__5__Impl35615);
+            pushFollow(FOLLOW_2);
             rule__XWhileExpression__BodyAssignment_5();
 
             state._fsp--;
@@ -50814,21 +50814,21 @@ public final void rule__XWhileExpression__Group__5__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17594:1: rule__XDoWhileExpression__Group__0 : rule__XDoWhileExpression__Group__0__Impl rule__XDoWhileExpression__Group__1 ;
+    // InternalCheck.g:17594:1: rule__XDoWhileExpression__Group__0 : rule__XDoWhileExpression__Group__0__Impl rule__XDoWhileExpression__Group__1 ;
     public final void rule__XDoWhileExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17598:1: ( rule__XDoWhileExpression__Group__0__Impl rule__XDoWhileExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17599:2: rule__XDoWhileExpression__Group__0__Impl rule__XDoWhileExpression__Group__1
+            // InternalCheck.g:17598:1: ( rule__XDoWhileExpression__Group__0__Impl rule__XDoWhileExpression__Group__1 )
+            // InternalCheck.g:17599:2: rule__XDoWhileExpression__Group__0__Impl rule__XDoWhileExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__0__Impl_in_rule__XDoWhileExpression__Group__035657);
+            pushFollow(FOLLOW_100);
             rule__XDoWhileExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__1_in_rule__XDoWhileExpression__Group__035660);
+            pushFollow(FOLLOW_2);
             rule__XDoWhileExpression__Group__1();
 
             state._fsp--;
@@ -50852,23 +50852,23 @@ public final void rule__XDoWhileExpression__Group__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17606:1: rule__XDoWhileExpression__Group__0__Impl : ( () ) ;
+    // InternalCheck.g:17606:1: rule__XDoWhileExpression__Group__0__Impl : ( () ) ;
     public final void rule__XDoWhileExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17610:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17611:1: ( () )
+            // InternalCheck.g:17610:1: ( ( () ) )
+            // InternalCheck.g:17611:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17611:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17612:1: ()
+            // InternalCheck.g:17611:1: ( () )
+            // InternalCheck.g:17612:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getXDoWhileExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17613:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17615:1: 
+            // InternalCheck.g:17613:1: ()
+            // InternalCheck.g:17615:1: 
             {
             }
 
@@ -50893,21 +50893,21 @@ public final void rule__XDoWhileExpression__Group__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17625:1: rule__XDoWhileExpression__Group__1 : rule__XDoWhileExpression__Group__1__Impl rule__XDoWhileExpression__Group__2 ;
+    // InternalCheck.g:17625:1: rule__XDoWhileExpression__Group__1 : rule__XDoWhileExpression__Group__1__Impl rule__XDoWhileExpression__Group__2 ;
     public final void rule__XDoWhileExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17629:1: ( rule__XDoWhileExpression__Group__1__Impl rule__XDoWhileExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17630:2: rule__XDoWhileExpression__Group__1__Impl rule__XDoWhileExpression__Group__2
+            // InternalCheck.g:17629:1: ( rule__XDoWhileExpression__Group__1__Impl rule__XDoWhileExpression__Group__2 )
+            // InternalCheck.g:17630:2: rule__XDoWhileExpression__Group__1__Impl rule__XDoWhileExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__1__Impl_in_rule__XDoWhileExpression__Group__135718);
+            pushFollow(FOLLOW_32);
             rule__XDoWhileExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__2_in_rule__XDoWhileExpression__Group__135721);
+            pushFollow(FOLLOW_2);
             rule__XDoWhileExpression__Group__2();
 
             state._fsp--;
@@ -50931,22 +50931,22 @@ public final void rule__XDoWhileExpression__Group__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17637:1: rule__XDoWhileExpression__Group__1__Impl : ( 'do' ) ;
+    // InternalCheck.g:17637:1: rule__XDoWhileExpression__Group__1__Impl : ( 'do' ) ;
     public final void rule__XDoWhileExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17641:1: ( ( 'do' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17642:1: ( 'do' )
+            // InternalCheck.g:17641:1: ( ( 'do' ) )
+            // InternalCheck.g:17642:1: ( 'do' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17642:1: ( 'do' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17643:1: 'do'
+            // InternalCheck.g:17642:1: ( 'do' )
+            // InternalCheck.g:17643:1: 'do'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getDoKeyword_1()); 
             }
-            match(input,91,FOLLOW_91_in_rule__XDoWhileExpression__Group__1__Impl35749); if (state.failed) return ;
+            match(input,91,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXDoWhileExpressionAccess().getDoKeyword_1()); 
             }
@@ -50972,21 +50972,21 @@ public final void rule__XDoWhileExpression__Group__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17656:1: rule__XDoWhileExpression__Group__2 : rule__XDoWhileExpression__Group__2__Impl rule__XDoWhileExpression__Group__3 ;
+    // InternalCheck.g:17656:1: rule__XDoWhileExpression__Group__2 : rule__XDoWhileExpression__Group__2__Impl rule__XDoWhileExpression__Group__3 ;
     public final void rule__XDoWhileExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17660:1: ( rule__XDoWhileExpression__Group__2__Impl rule__XDoWhileExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17661:2: rule__XDoWhileExpression__Group__2__Impl rule__XDoWhileExpression__Group__3
+            // InternalCheck.g:17660:1: ( rule__XDoWhileExpression__Group__2__Impl rule__XDoWhileExpression__Group__3 )
+            // InternalCheck.g:17661:2: rule__XDoWhileExpression__Group__2__Impl rule__XDoWhileExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__2__Impl_in_rule__XDoWhileExpression__Group__235780);
+            pushFollow(FOLLOW_99);
             rule__XDoWhileExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__3_in_rule__XDoWhileExpression__Group__235783);
+            pushFollow(FOLLOW_2);
             rule__XDoWhileExpression__Group__3();
 
             state._fsp--;
@@ -51010,25 +51010,25 @@ public final void rule__XDoWhileExpression__Group__2() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17668:1: rule__XDoWhileExpression__Group__2__Impl : ( ( rule__XDoWhileExpression__BodyAssignment_2 ) ) ;
+    // InternalCheck.g:17668:1: rule__XDoWhileExpression__Group__2__Impl : ( ( rule__XDoWhileExpression__BodyAssignment_2 ) ) ;
     public final void rule__XDoWhileExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17672:1: ( ( ( rule__XDoWhileExpression__BodyAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17673:1: ( ( rule__XDoWhileExpression__BodyAssignment_2 ) )
+            // InternalCheck.g:17672:1: ( ( ( rule__XDoWhileExpression__BodyAssignment_2 ) ) )
+            // InternalCheck.g:17673:1: ( ( rule__XDoWhileExpression__BodyAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17673:1: ( ( rule__XDoWhileExpression__BodyAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17674:1: ( rule__XDoWhileExpression__BodyAssignment_2 )
+            // InternalCheck.g:17673:1: ( ( rule__XDoWhileExpression__BodyAssignment_2 ) )
+            // InternalCheck.g:17674:1: ( rule__XDoWhileExpression__BodyAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getBodyAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17675:1: ( rule__XDoWhileExpression__BodyAssignment_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17675:2: rule__XDoWhileExpression__BodyAssignment_2
+            // InternalCheck.g:17675:1: ( rule__XDoWhileExpression__BodyAssignment_2 )
+            // InternalCheck.g:17675:2: rule__XDoWhileExpression__BodyAssignment_2
             {
-            pushFollow(FOLLOW_rule__XDoWhileExpression__BodyAssignment_2_in_rule__XDoWhileExpression__Group__2__Impl35810);
+            pushFollow(FOLLOW_2);
             rule__XDoWhileExpression__BodyAssignment_2();
 
             state._fsp--;
@@ -51061,21 +51061,21 @@ public final void rule__XDoWhileExpression__Group__2__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17685:1: rule__XDoWhileExpression__Group__3 : rule__XDoWhileExpression__Group__3__Impl rule__XDoWhileExpression__Group__4 ;
+    // InternalCheck.g:17685:1: rule__XDoWhileExpression__Group__3 : rule__XDoWhileExpression__Group__3__Impl rule__XDoWhileExpression__Group__4 ;
     public final void rule__XDoWhileExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17689:1: ( rule__XDoWhileExpression__Group__3__Impl rule__XDoWhileExpression__Group__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17690:2: rule__XDoWhileExpression__Group__3__Impl rule__XDoWhileExpression__Group__4
+            // InternalCheck.g:17689:1: ( rule__XDoWhileExpression__Group__3__Impl rule__XDoWhileExpression__Group__4 )
+            // InternalCheck.g:17690:2: rule__XDoWhileExpression__Group__3__Impl rule__XDoWhileExpression__Group__4
             {
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__3__Impl_in_rule__XDoWhileExpression__Group__335840);
+            pushFollow(FOLLOW_26);
             rule__XDoWhileExpression__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__4_in_rule__XDoWhileExpression__Group__335843);
+            pushFollow(FOLLOW_2);
             rule__XDoWhileExpression__Group__4();
 
             state._fsp--;
@@ -51099,22 +51099,22 @@ public final void rule__XDoWhileExpression__Group__3() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17697:1: rule__XDoWhileExpression__Group__3__Impl : ( 'while' ) ;
+    // InternalCheck.g:17697:1: rule__XDoWhileExpression__Group__3__Impl : ( 'while' ) ;
     public final void rule__XDoWhileExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17701:1: ( ( 'while' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17702:1: ( 'while' )
+            // InternalCheck.g:17701:1: ( ( 'while' ) )
+            // InternalCheck.g:17702:1: ( 'while' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17702:1: ( 'while' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17703:1: 'while'
+            // InternalCheck.g:17702:1: ( 'while' )
+            // InternalCheck.g:17703:1: 'while'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getWhileKeyword_3()); 
             }
-            match(input,90,FOLLOW_90_in_rule__XDoWhileExpression__Group__3__Impl35871); if (state.failed) return ;
+            match(input,90,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXDoWhileExpressionAccess().getWhileKeyword_3()); 
             }
@@ -51140,21 +51140,21 @@ public final void rule__XDoWhileExpression__Group__3__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17716:1: rule__XDoWhileExpression__Group__4 : rule__XDoWhileExpression__Group__4__Impl rule__XDoWhileExpression__Group__5 ;
+    // InternalCheck.g:17716:1: rule__XDoWhileExpression__Group__4 : rule__XDoWhileExpression__Group__4__Impl rule__XDoWhileExpression__Group__5 ;
     public final void rule__XDoWhileExpression__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17720:1: ( rule__XDoWhileExpression__Group__4__Impl rule__XDoWhileExpression__Group__5 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17721:2: rule__XDoWhileExpression__Group__4__Impl rule__XDoWhileExpression__Group__5
+            // InternalCheck.g:17720:1: ( rule__XDoWhileExpression__Group__4__Impl rule__XDoWhileExpression__Group__5 )
+            // InternalCheck.g:17721:2: rule__XDoWhileExpression__Group__4__Impl rule__XDoWhileExpression__Group__5
             {
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__4__Impl_in_rule__XDoWhileExpression__Group__435902);
+            pushFollow(FOLLOW_32);
             rule__XDoWhileExpression__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__5_in_rule__XDoWhileExpression__Group__435905);
+            pushFollow(FOLLOW_2);
             rule__XDoWhileExpression__Group__5();
 
             state._fsp--;
@@ -51178,22 +51178,22 @@ public final void rule__XDoWhileExpression__Group__4() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17728:1: rule__XDoWhileExpression__Group__4__Impl : ( '(' ) ;
+    // InternalCheck.g:17728:1: rule__XDoWhileExpression__Group__4__Impl : ( '(' ) ;
     public final void rule__XDoWhileExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17732:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17733:1: ( '(' )
+            // InternalCheck.g:17732:1: ( ( '(' ) )
+            // InternalCheck.g:17733:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17733:1: ( '(' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17734:1: '('
+            // InternalCheck.g:17733:1: ( '(' )
+            // InternalCheck.g:17734:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getLeftParenthesisKeyword_4()); 
             }
-            match(input,72,FOLLOW_72_in_rule__XDoWhileExpression__Group__4__Impl35933); if (state.failed) return ;
+            match(input,72,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXDoWhileExpressionAccess().getLeftParenthesisKeyword_4()); 
             }
@@ -51219,21 +51219,21 @@ public final void rule__XDoWhileExpression__Group__4__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__5"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17747:1: rule__XDoWhileExpression__Group__5 : rule__XDoWhileExpression__Group__5__Impl rule__XDoWhileExpression__Group__6 ;
+    // InternalCheck.g:17747:1: rule__XDoWhileExpression__Group__5 : rule__XDoWhileExpression__Group__5__Impl rule__XDoWhileExpression__Group__6 ;
     public final void rule__XDoWhileExpression__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17751:1: ( rule__XDoWhileExpression__Group__5__Impl rule__XDoWhileExpression__Group__6 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17752:2: rule__XDoWhileExpression__Group__5__Impl rule__XDoWhileExpression__Group__6
+            // InternalCheck.g:17751:1: ( rule__XDoWhileExpression__Group__5__Impl rule__XDoWhileExpression__Group__6 )
+            // InternalCheck.g:17752:2: rule__XDoWhileExpression__Group__5__Impl rule__XDoWhileExpression__Group__6
             {
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__5__Impl_in_rule__XDoWhileExpression__Group__535964);
+            pushFollow(FOLLOW_28);
             rule__XDoWhileExpression__Group__5__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__6_in_rule__XDoWhileExpression__Group__535967);
+            pushFollow(FOLLOW_2);
             rule__XDoWhileExpression__Group__6();
 
             state._fsp--;
@@ -51257,25 +51257,25 @@ public final void rule__XDoWhileExpression__Group__5() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17759:1: rule__XDoWhileExpression__Group__5__Impl : ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) ) ;
+    // InternalCheck.g:17759:1: rule__XDoWhileExpression__Group__5__Impl : ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) ) ;
     public final void rule__XDoWhileExpression__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17763:1: ( ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17764:1: ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) )
+            // InternalCheck.g:17763:1: ( ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) ) )
+            // InternalCheck.g:17764:1: ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17764:1: ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17765:1: ( rule__XDoWhileExpression__PredicateAssignment_5 )
+            // InternalCheck.g:17764:1: ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) )
+            // InternalCheck.g:17765:1: ( rule__XDoWhileExpression__PredicateAssignment_5 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getPredicateAssignment_5()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17766:1: ( rule__XDoWhileExpression__PredicateAssignment_5 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17766:2: rule__XDoWhileExpression__PredicateAssignment_5
+            // InternalCheck.g:17766:1: ( rule__XDoWhileExpression__PredicateAssignment_5 )
+            // InternalCheck.g:17766:2: rule__XDoWhileExpression__PredicateAssignment_5
             {
-            pushFollow(FOLLOW_rule__XDoWhileExpression__PredicateAssignment_5_in_rule__XDoWhileExpression__Group__5__Impl35994);
+            pushFollow(FOLLOW_2);
             rule__XDoWhileExpression__PredicateAssignment_5();
 
             state._fsp--;
@@ -51308,16 +51308,16 @@ public final void rule__XDoWhileExpression__Group__5__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__6"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17776:1: rule__XDoWhileExpression__Group__6 : rule__XDoWhileExpression__Group__6__Impl ;
+    // InternalCheck.g:17776:1: rule__XDoWhileExpression__Group__6 : rule__XDoWhileExpression__Group__6__Impl ;
     public final void rule__XDoWhileExpression__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17780:1: ( rule__XDoWhileExpression__Group__6__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17781:2: rule__XDoWhileExpression__Group__6__Impl
+            // InternalCheck.g:17780:1: ( rule__XDoWhileExpression__Group__6__Impl )
+            // InternalCheck.g:17781:2: rule__XDoWhileExpression__Group__6__Impl
             {
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__6__Impl_in_rule__XDoWhileExpression__Group__636024);
+            pushFollow(FOLLOW_2);
             rule__XDoWhileExpression__Group__6__Impl();
 
             state._fsp--;
@@ -51341,22 +51341,22 @@ public final void rule__XDoWhileExpression__Group__6() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__6__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17787:1: rule__XDoWhileExpression__Group__6__Impl : ( ')' ) ;
+    // InternalCheck.g:17787:1: rule__XDoWhileExpression__Group__6__Impl : ( ')' ) ;
     public final void rule__XDoWhileExpression__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17791:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17792:1: ( ')' )
+            // InternalCheck.g:17791:1: ( ( ')' ) )
+            // InternalCheck.g:17792:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17792:1: ( ')' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17793:1: ')'
+            // InternalCheck.g:17792:1: ( ')' )
+            // InternalCheck.g:17793:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getRightParenthesisKeyword_6()); 
             }
-            match(input,73,FOLLOW_73_in_rule__XDoWhileExpression__Group__6__Impl36052); if (state.failed) return ;
+            match(input,73,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXDoWhileExpressionAccess().getRightParenthesisKeyword_6()); 
             }
@@ -51382,21 +51382,21 @@ public final void rule__XDoWhileExpression__Group__6__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XBlockExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17820:1: rule__XBlockExpression__Group__0 : rule__XBlockExpression__Group__0__Impl rule__XBlockExpression__Group__1 ;
+    // InternalCheck.g:17820:1: rule__XBlockExpression__Group__0 : rule__XBlockExpression__Group__0__Impl rule__XBlockExpression__Group__1 ;
     public final void rule__XBlockExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17824:1: ( rule__XBlockExpression__Group__0__Impl rule__XBlockExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17825:2: rule__XBlockExpression__Group__0__Impl rule__XBlockExpression__Group__1
+            // InternalCheck.g:17824:1: ( rule__XBlockExpression__Group__0__Impl rule__XBlockExpression__Group__1 )
+            // InternalCheck.g:17825:2: rule__XBlockExpression__Group__0__Impl rule__XBlockExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XBlockExpression__Group__0__Impl_in_rule__XBlockExpression__Group__036097);
+            pushFollow(FOLLOW_14);
             rule__XBlockExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBlockExpression__Group__1_in_rule__XBlockExpression__Group__036100);
+            pushFollow(FOLLOW_2);
             rule__XBlockExpression__Group__1();
 
             state._fsp--;
@@ -51420,23 +51420,23 @@ public final void rule__XBlockExpression__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XBlockExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17832:1: rule__XBlockExpression__Group__0__Impl : ( () ) ;
+    // InternalCheck.g:17832:1: rule__XBlockExpression__Group__0__Impl : ( () ) ;
     public final void rule__XBlockExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17836:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17837:1: ( () )
+            // InternalCheck.g:17836:1: ( ( () ) )
+            // InternalCheck.g:17837:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17837:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17838:1: ()
+            // InternalCheck.g:17837:1: ( () )
+            // InternalCheck.g:17838:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getXBlockExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17839:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17841:1: 
+            // InternalCheck.g:17839:1: ()
+            // InternalCheck.g:17841:1: 
             {
             }
 
@@ -51461,21 +51461,21 @@ public final void rule__XBlockExpression__Group__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XBlockExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17851:1: rule__XBlockExpression__Group__1 : rule__XBlockExpression__Group__1__Impl rule__XBlockExpression__Group__2 ;
+    // InternalCheck.g:17851:1: rule__XBlockExpression__Group__1 : rule__XBlockExpression__Group__1__Impl rule__XBlockExpression__Group__2 ;
     public final void rule__XBlockExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17855:1: ( rule__XBlockExpression__Group__1__Impl rule__XBlockExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17856:2: rule__XBlockExpression__Group__1__Impl rule__XBlockExpression__Group__2
+            // InternalCheck.g:17855:1: ( rule__XBlockExpression__Group__1__Impl rule__XBlockExpression__Group__2 )
+            // InternalCheck.g:17856:2: rule__XBlockExpression__Group__1__Impl rule__XBlockExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XBlockExpression__Group__1__Impl_in_rule__XBlockExpression__Group__136158);
+            pushFollow(FOLLOW_101);
             rule__XBlockExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBlockExpression__Group__2_in_rule__XBlockExpression__Group__136161);
+            pushFollow(FOLLOW_2);
             rule__XBlockExpression__Group__2();
 
             state._fsp--;
@@ -51499,22 +51499,22 @@ public final void rule__XBlockExpression__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XBlockExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17863:1: rule__XBlockExpression__Group__1__Impl : ( '{' ) ;
+    // InternalCheck.g:17863:1: rule__XBlockExpression__Group__1__Impl : ( '{' ) ;
     public final void rule__XBlockExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17867:1: ( ( '{' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17868:1: ( '{' )
+            // InternalCheck.g:17867:1: ( ( '{' ) )
+            // InternalCheck.g:17868:1: ( '{' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17868:1: ( '{' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17869:1: '{'
+            // InternalCheck.g:17868:1: ( '{' )
+            // InternalCheck.g:17869:1: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getLeftCurlyBracketKeyword_1()); 
             }
-            match(input,68,FOLLOW_68_in_rule__XBlockExpression__Group__1__Impl36189); if (state.failed) return ;
+            match(input,68,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBlockExpressionAccess().getLeftCurlyBracketKeyword_1()); 
             }
@@ -51540,21 +51540,21 @@ public final void rule__XBlockExpression__Group__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XBlockExpression__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17882:1: rule__XBlockExpression__Group__2 : rule__XBlockExpression__Group__2__Impl rule__XBlockExpression__Group__3 ;
+    // InternalCheck.g:17882:1: rule__XBlockExpression__Group__2 : rule__XBlockExpression__Group__2__Impl rule__XBlockExpression__Group__3 ;
     public final void rule__XBlockExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17886:1: ( rule__XBlockExpression__Group__2__Impl rule__XBlockExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17887:2: rule__XBlockExpression__Group__2__Impl rule__XBlockExpression__Group__3
+            // InternalCheck.g:17886:1: ( rule__XBlockExpression__Group__2__Impl rule__XBlockExpression__Group__3 )
+            // InternalCheck.g:17887:2: rule__XBlockExpression__Group__2__Impl rule__XBlockExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__XBlockExpression__Group__2__Impl_in_rule__XBlockExpression__Group__236220);
+            pushFollow(FOLLOW_101);
             rule__XBlockExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBlockExpression__Group__3_in_rule__XBlockExpression__Group__236223);
+            pushFollow(FOLLOW_2);
             rule__XBlockExpression__Group__3();
 
             state._fsp--;
@@ -51578,22 +51578,22 @@ public final void rule__XBlockExpression__Group__2() throws RecognitionException
 
 
     // $ANTLR start "rule__XBlockExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17894:1: rule__XBlockExpression__Group__2__Impl : ( ( rule__XBlockExpression__Group_2__0 )* ) ;
+    // InternalCheck.g:17894:1: rule__XBlockExpression__Group__2__Impl : ( ( rule__XBlockExpression__Group_2__0 )* ) ;
     public final void rule__XBlockExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17898:1: ( ( ( rule__XBlockExpression__Group_2__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17899:1: ( ( rule__XBlockExpression__Group_2__0 )* )
+            // InternalCheck.g:17898:1: ( ( ( rule__XBlockExpression__Group_2__0 )* ) )
+            // InternalCheck.g:17899:1: ( ( rule__XBlockExpression__Group_2__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17899:1: ( ( rule__XBlockExpression__Group_2__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17900:1: ( rule__XBlockExpression__Group_2__0 )*
+            // InternalCheck.g:17899:1: ( ( rule__XBlockExpression__Group_2__0 )* )
+            // InternalCheck.g:17900:1: ( rule__XBlockExpression__Group_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getGroup_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17901:1: ( rule__XBlockExpression__Group_2__0 )*
+            // InternalCheck.g:17901:1: ( rule__XBlockExpression__Group_2__0 )*
             loop133:
             do {
                 int alt133=2;
@@ -51606,9 +51606,9 @@ public final void rule__XBlockExpression__Group__2__Impl() throws RecognitionExc
 
                 switch (alt133) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17901:2: rule__XBlockExpression__Group_2__0
+            	    // InternalCheck.g:17901:2: rule__XBlockExpression__Group_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__XBlockExpression__Group_2__0_in_rule__XBlockExpression__Group__2__Impl36250);
+            	    pushFollow(FOLLOW_86);
             	    rule__XBlockExpression__Group_2__0();
 
             	    state._fsp--;
@@ -51647,16 +51647,16 @@ public final void rule__XBlockExpression__Group__2__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XBlockExpression__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17911:1: rule__XBlockExpression__Group__3 : rule__XBlockExpression__Group__3__Impl ;
+    // InternalCheck.g:17911:1: rule__XBlockExpression__Group__3 : rule__XBlockExpression__Group__3__Impl ;
     public final void rule__XBlockExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17915:1: ( rule__XBlockExpression__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17916:2: rule__XBlockExpression__Group__3__Impl
+            // InternalCheck.g:17915:1: ( rule__XBlockExpression__Group__3__Impl )
+            // InternalCheck.g:17916:2: rule__XBlockExpression__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__XBlockExpression__Group__3__Impl_in_rule__XBlockExpression__Group__336281);
+            pushFollow(FOLLOW_2);
             rule__XBlockExpression__Group__3__Impl();
 
             state._fsp--;
@@ -51680,22 +51680,22 @@ public final void rule__XBlockExpression__Group__3() throws RecognitionException
 
 
     // $ANTLR start "rule__XBlockExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17922:1: rule__XBlockExpression__Group__3__Impl : ( '}' ) ;
+    // InternalCheck.g:17922:1: rule__XBlockExpression__Group__3__Impl : ( '}' ) ;
     public final void rule__XBlockExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17926:1: ( ( '}' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17927:1: ( '}' )
+            // InternalCheck.g:17926:1: ( ( '}' ) )
+            // InternalCheck.g:17927:1: ( '}' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17927:1: ( '}' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17928:1: '}'
+            // InternalCheck.g:17927:1: ( '}' )
+            // InternalCheck.g:17928:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getRightCurlyBracketKeyword_3()); 
             }
-            match(input,69,FOLLOW_69_in_rule__XBlockExpression__Group__3__Impl36309); if (state.failed) return ;
+            match(input,69,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBlockExpressionAccess().getRightCurlyBracketKeyword_3()); 
             }
@@ -51721,21 +51721,21 @@ public final void rule__XBlockExpression__Group__3__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XBlockExpression__Group_2__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17949:1: rule__XBlockExpression__Group_2__0 : rule__XBlockExpression__Group_2__0__Impl rule__XBlockExpression__Group_2__1 ;
+    // InternalCheck.g:17949:1: rule__XBlockExpression__Group_2__0 : rule__XBlockExpression__Group_2__0__Impl rule__XBlockExpression__Group_2__1 ;
     public final void rule__XBlockExpression__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17953:1: ( rule__XBlockExpression__Group_2__0__Impl rule__XBlockExpression__Group_2__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17954:2: rule__XBlockExpression__Group_2__0__Impl rule__XBlockExpression__Group_2__1
+            // InternalCheck.g:17953:1: ( rule__XBlockExpression__Group_2__0__Impl rule__XBlockExpression__Group_2__1 )
+            // InternalCheck.g:17954:2: rule__XBlockExpression__Group_2__0__Impl rule__XBlockExpression__Group_2__1
             {
-            pushFollow(FOLLOW_rule__XBlockExpression__Group_2__0__Impl_in_rule__XBlockExpression__Group_2__036348);
+            pushFollow(FOLLOW_12);
             rule__XBlockExpression__Group_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBlockExpression__Group_2__1_in_rule__XBlockExpression__Group_2__036351);
+            pushFollow(FOLLOW_2);
             rule__XBlockExpression__Group_2__1();
 
             state._fsp--;
@@ -51759,25 +51759,25 @@ public final void rule__XBlockExpression__Group_2__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XBlockExpression__Group_2__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17961:1: rule__XBlockExpression__Group_2__0__Impl : ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) ) ;
+    // InternalCheck.g:17961:1: rule__XBlockExpression__Group_2__0__Impl : ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) ) ;
     public final void rule__XBlockExpression__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17965:1: ( ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17966:1: ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) )
+            // InternalCheck.g:17965:1: ( ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) ) )
+            // InternalCheck.g:17966:1: ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17966:1: ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17967:1: ( rule__XBlockExpression__ExpressionsAssignment_2_0 )
+            // InternalCheck.g:17966:1: ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) )
+            // InternalCheck.g:17967:1: ( rule__XBlockExpression__ExpressionsAssignment_2_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getExpressionsAssignment_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17968:1: ( rule__XBlockExpression__ExpressionsAssignment_2_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17968:2: rule__XBlockExpression__ExpressionsAssignment_2_0
+            // InternalCheck.g:17968:1: ( rule__XBlockExpression__ExpressionsAssignment_2_0 )
+            // InternalCheck.g:17968:2: rule__XBlockExpression__ExpressionsAssignment_2_0
             {
-            pushFollow(FOLLOW_rule__XBlockExpression__ExpressionsAssignment_2_0_in_rule__XBlockExpression__Group_2__0__Impl36378);
+            pushFollow(FOLLOW_2);
             rule__XBlockExpression__ExpressionsAssignment_2_0();
 
             state._fsp--;
@@ -51810,16 +51810,16 @@ public final void rule__XBlockExpression__Group_2__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XBlockExpression__Group_2__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17978:1: rule__XBlockExpression__Group_2__1 : rule__XBlockExpression__Group_2__1__Impl ;
+    // InternalCheck.g:17978:1: rule__XBlockExpression__Group_2__1 : rule__XBlockExpression__Group_2__1__Impl ;
     public final void rule__XBlockExpression__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17982:1: ( rule__XBlockExpression__Group_2__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17983:2: rule__XBlockExpression__Group_2__1__Impl
+            // InternalCheck.g:17982:1: ( rule__XBlockExpression__Group_2__1__Impl )
+            // InternalCheck.g:17983:2: rule__XBlockExpression__Group_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__XBlockExpression__Group_2__1__Impl_in_rule__XBlockExpression__Group_2__136408);
+            pushFollow(FOLLOW_2);
             rule__XBlockExpression__Group_2__1__Impl();
 
             state._fsp--;
@@ -51843,22 +51843,22 @@ public final void rule__XBlockExpression__Group_2__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XBlockExpression__Group_2__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17989:1: rule__XBlockExpression__Group_2__1__Impl : ( ( ';' )? ) ;
+    // InternalCheck.g:17989:1: rule__XBlockExpression__Group_2__1__Impl : ( ( ';' )? ) ;
     public final void rule__XBlockExpression__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17993:1: ( ( ( ';' )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17994:1: ( ( ';' )? )
+            // InternalCheck.g:17993:1: ( ( ( ';' )? ) )
+            // InternalCheck.g:17994:1: ( ( ';' )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17994:1: ( ( ';' )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17995:1: ( ';' )?
+            // InternalCheck.g:17994:1: ( ( ';' )? )
+            // InternalCheck.g:17995:1: ( ';' )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getSemicolonKeyword_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17996:1: ( ';' )?
+            // InternalCheck.g:17996:1: ( ';' )?
             int alt134=2;
             int LA134_0 = input.LA(1);
 
@@ -51867,9 +51867,9 @@ public final void rule__XBlockExpression__Group_2__1__Impl() throws RecognitionE
             }
             switch (alt134) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:17997:2: ';'
+                    // InternalCheck.g:17997:2: ';'
                     {
-                    match(input,71,FOLLOW_71_in_rule__XBlockExpression__Group_2__1__Impl36437); if (state.failed) return ;
+                    match(input,71,FOLLOW_2); if (state.failed) return ;
 
                     }
                     break;
@@ -51901,21 +51901,21 @@ public final void rule__XBlockExpression__Group_2__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18012:1: rule__XVariableDeclaration__Group__0 : rule__XVariableDeclaration__Group__0__Impl rule__XVariableDeclaration__Group__1 ;
+    // InternalCheck.g:18012:1: rule__XVariableDeclaration__Group__0 : rule__XVariableDeclaration__Group__0__Impl rule__XVariableDeclaration__Group__1 ;
     public final void rule__XVariableDeclaration__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18016:1: ( rule__XVariableDeclaration__Group__0__Impl rule__XVariableDeclaration__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18017:2: rule__XVariableDeclaration__Group__0__Impl rule__XVariableDeclaration__Group__1
+            // InternalCheck.g:18016:1: ( rule__XVariableDeclaration__Group__0__Impl rule__XVariableDeclaration__Group__1 )
+            // InternalCheck.g:18017:2: rule__XVariableDeclaration__Group__0__Impl rule__XVariableDeclaration__Group__1
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group__0__Impl_in_rule__XVariableDeclaration__Group__036474);
+            pushFollow(FOLLOW_102);
             rule__XVariableDeclaration__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group__1_in_rule__XVariableDeclaration__Group__036477);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group__1();
 
             state._fsp--;
@@ -51939,23 +51939,23 @@ public final void rule__XVariableDeclaration__Group__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18024:1: rule__XVariableDeclaration__Group__0__Impl : ( () ) ;
+    // InternalCheck.g:18024:1: rule__XVariableDeclaration__Group__0__Impl : ( () ) ;
     public final void rule__XVariableDeclaration__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18028:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18029:1: ( () )
+            // InternalCheck.g:18028:1: ( ( () ) )
+            // InternalCheck.g:18029:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18029:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18030:1: ()
+            // InternalCheck.g:18029:1: ( () )
+            // InternalCheck.g:18030:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getXVariableDeclarationAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18031:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18033:1: 
+            // InternalCheck.g:18031:1: ()
+            // InternalCheck.g:18033:1: 
             {
             }
 
@@ -51980,21 +51980,21 @@ public final void rule__XVariableDeclaration__Group__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18043:1: rule__XVariableDeclaration__Group__1 : rule__XVariableDeclaration__Group__1__Impl rule__XVariableDeclaration__Group__2 ;
+    // InternalCheck.g:18043:1: rule__XVariableDeclaration__Group__1 : rule__XVariableDeclaration__Group__1__Impl rule__XVariableDeclaration__Group__2 ;
     public final void rule__XVariableDeclaration__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18047:1: ( rule__XVariableDeclaration__Group__1__Impl rule__XVariableDeclaration__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18048:2: rule__XVariableDeclaration__Group__1__Impl rule__XVariableDeclaration__Group__2
+            // InternalCheck.g:18047:1: ( rule__XVariableDeclaration__Group__1__Impl rule__XVariableDeclaration__Group__2 )
+            // InternalCheck.g:18048:2: rule__XVariableDeclaration__Group__1__Impl rule__XVariableDeclaration__Group__2
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group__1__Impl_in_rule__XVariableDeclaration__Group__136535);
+            pushFollow(FOLLOW_29);
             rule__XVariableDeclaration__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group__2_in_rule__XVariableDeclaration__Group__136538);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group__2();
 
             state._fsp--;
@@ -52018,25 +52018,25 @@ public final void rule__XVariableDeclaration__Group__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18055:1: rule__XVariableDeclaration__Group__1__Impl : ( ( rule__XVariableDeclaration__Alternatives_1 ) ) ;
+    // InternalCheck.g:18055:1: rule__XVariableDeclaration__Group__1__Impl : ( ( rule__XVariableDeclaration__Alternatives_1 ) ) ;
     public final void rule__XVariableDeclaration__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18059:1: ( ( ( rule__XVariableDeclaration__Alternatives_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18060:1: ( ( rule__XVariableDeclaration__Alternatives_1 ) )
+            // InternalCheck.g:18059:1: ( ( ( rule__XVariableDeclaration__Alternatives_1 ) ) )
+            // InternalCheck.g:18060:1: ( ( rule__XVariableDeclaration__Alternatives_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18060:1: ( ( rule__XVariableDeclaration__Alternatives_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18061:1: ( rule__XVariableDeclaration__Alternatives_1 )
+            // InternalCheck.g:18060:1: ( ( rule__XVariableDeclaration__Alternatives_1 ) )
+            // InternalCheck.g:18061:1: ( rule__XVariableDeclaration__Alternatives_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getAlternatives_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18062:1: ( rule__XVariableDeclaration__Alternatives_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18062:2: rule__XVariableDeclaration__Alternatives_1
+            // InternalCheck.g:18062:1: ( rule__XVariableDeclaration__Alternatives_1 )
+            // InternalCheck.g:18062:2: rule__XVariableDeclaration__Alternatives_1
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Alternatives_1_in_rule__XVariableDeclaration__Group__1__Impl36565);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Alternatives_1();
 
             state._fsp--;
@@ -52069,21 +52069,21 @@ public final void rule__XVariableDeclaration__Group__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18072:1: rule__XVariableDeclaration__Group__2 : rule__XVariableDeclaration__Group__2__Impl rule__XVariableDeclaration__Group__3 ;
+    // InternalCheck.g:18072:1: rule__XVariableDeclaration__Group__2 : rule__XVariableDeclaration__Group__2__Impl rule__XVariableDeclaration__Group__3 ;
     public final void rule__XVariableDeclaration__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18076:1: ( rule__XVariableDeclaration__Group__2__Impl rule__XVariableDeclaration__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18077:2: rule__XVariableDeclaration__Group__2__Impl rule__XVariableDeclaration__Group__3
+            // InternalCheck.g:18076:1: ( rule__XVariableDeclaration__Group__2__Impl rule__XVariableDeclaration__Group__3 )
+            // InternalCheck.g:18077:2: rule__XVariableDeclaration__Group__2__Impl rule__XVariableDeclaration__Group__3
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group__2__Impl_in_rule__XVariableDeclaration__Group__236595);
+            pushFollow(FOLLOW_34);
             rule__XVariableDeclaration__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group__3_in_rule__XVariableDeclaration__Group__236598);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group__3();
 
             state._fsp--;
@@ -52107,25 +52107,25 @@ public final void rule__XVariableDeclaration__Group__2() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18084:1: rule__XVariableDeclaration__Group__2__Impl : ( ( rule__XVariableDeclaration__Alternatives_2 ) ) ;
+    // InternalCheck.g:18084:1: rule__XVariableDeclaration__Group__2__Impl : ( ( rule__XVariableDeclaration__Alternatives_2 ) ) ;
     public final void rule__XVariableDeclaration__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18088:1: ( ( ( rule__XVariableDeclaration__Alternatives_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18089:1: ( ( rule__XVariableDeclaration__Alternatives_2 ) )
+            // InternalCheck.g:18088:1: ( ( ( rule__XVariableDeclaration__Alternatives_2 ) ) )
+            // InternalCheck.g:18089:1: ( ( rule__XVariableDeclaration__Alternatives_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18089:1: ( ( rule__XVariableDeclaration__Alternatives_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18090:1: ( rule__XVariableDeclaration__Alternatives_2 )
+            // InternalCheck.g:18089:1: ( ( rule__XVariableDeclaration__Alternatives_2 ) )
+            // InternalCheck.g:18090:1: ( rule__XVariableDeclaration__Alternatives_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getAlternatives_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18091:1: ( rule__XVariableDeclaration__Alternatives_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18091:2: rule__XVariableDeclaration__Alternatives_2
+            // InternalCheck.g:18091:1: ( rule__XVariableDeclaration__Alternatives_2 )
+            // InternalCheck.g:18091:2: rule__XVariableDeclaration__Alternatives_2
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Alternatives_2_in_rule__XVariableDeclaration__Group__2__Impl36625);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Alternatives_2();
 
             state._fsp--;
@@ -52158,16 +52158,16 @@ public final void rule__XVariableDeclaration__Group__2__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18101:1: rule__XVariableDeclaration__Group__3 : rule__XVariableDeclaration__Group__3__Impl ;
+    // InternalCheck.g:18101:1: rule__XVariableDeclaration__Group__3 : rule__XVariableDeclaration__Group__3__Impl ;
     public final void rule__XVariableDeclaration__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18105:1: ( rule__XVariableDeclaration__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18106:2: rule__XVariableDeclaration__Group__3__Impl
+            // InternalCheck.g:18105:1: ( rule__XVariableDeclaration__Group__3__Impl )
+            // InternalCheck.g:18106:2: rule__XVariableDeclaration__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group__3__Impl_in_rule__XVariableDeclaration__Group__336655);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group__3__Impl();
 
             state._fsp--;
@@ -52191,22 +52191,22 @@ public final void rule__XVariableDeclaration__Group__3() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18112:1: rule__XVariableDeclaration__Group__3__Impl : ( ( rule__XVariableDeclaration__Group_3__0 )? ) ;
+    // InternalCheck.g:18112:1: rule__XVariableDeclaration__Group__3__Impl : ( ( rule__XVariableDeclaration__Group_3__0 )? ) ;
     public final void rule__XVariableDeclaration__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18116:1: ( ( ( rule__XVariableDeclaration__Group_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18117:1: ( ( rule__XVariableDeclaration__Group_3__0 )? )
+            // InternalCheck.g:18116:1: ( ( ( rule__XVariableDeclaration__Group_3__0 )? ) )
+            // InternalCheck.g:18117:1: ( ( rule__XVariableDeclaration__Group_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18117:1: ( ( rule__XVariableDeclaration__Group_3__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18118:1: ( rule__XVariableDeclaration__Group_3__0 )?
+            // InternalCheck.g:18117:1: ( ( rule__XVariableDeclaration__Group_3__0 )? )
+            // InternalCheck.g:18118:1: ( rule__XVariableDeclaration__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getGroup_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18119:1: ( rule__XVariableDeclaration__Group_3__0 )?
+            // InternalCheck.g:18119:1: ( rule__XVariableDeclaration__Group_3__0 )?
             int alt135=2;
             int LA135_0 = input.LA(1);
 
@@ -52215,9 +52215,9 @@ public final void rule__XVariableDeclaration__Group__3__Impl() throws Recognitio
             }
             switch (alt135) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18119:2: rule__XVariableDeclaration__Group_3__0
+                    // InternalCheck.g:18119:2: rule__XVariableDeclaration__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__XVariableDeclaration__Group_3__0_in_rule__XVariableDeclaration__Group__3__Impl36682);
+                    pushFollow(FOLLOW_2);
                     rule__XVariableDeclaration__Group_3__0();
 
                     state._fsp--;
@@ -52253,16 +52253,16 @@ public final void rule__XVariableDeclaration__Group__3__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_2_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18137:1: rule__XVariableDeclaration__Group_2_0__0 : rule__XVariableDeclaration__Group_2_0__0__Impl ;
+    // InternalCheck.g:18137:1: rule__XVariableDeclaration__Group_2_0__0 : rule__XVariableDeclaration__Group_2_0__0__Impl ;
     public final void rule__XVariableDeclaration__Group_2_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18141:1: ( rule__XVariableDeclaration__Group_2_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18142:2: rule__XVariableDeclaration__Group_2_0__0__Impl
+            // InternalCheck.g:18141:1: ( rule__XVariableDeclaration__Group_2_0__0__Impl )
+            // InternalCheck.g:18142:2: rule__XVariableDeclaration__Group_2_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group_2_0__0__Impl_in_rule__XVariableDeclaration__Group_2_0__036721);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group_2_0__0__Impl();
 
             state._fsp--;
@@ -52286,25 +52286,25 @@ public final void rule__XVariableDeclaration__Group_2_0__0() throws RecognitionE
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_2_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18148:1: rule__XVariableDeclaration__Group_2_0__0__Impl : ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) ) ;
+    // InternalCheck.g:18148:1: rule__XVariableDeclaration__Group_2_0__0__Impl : ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) ) ;
     public final void rule__XVariableDeclaration__Group_2_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18152:1: ( ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18153:1: ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) )
+            // InternalCheck.g:18152:1: ( ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) ) )
+            // InternalCheck.g:18153:1: ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18153:1: ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18154:1: ( rule__XVariableDeclaration__Group_2_0_0__0 )
+            // InternalCheck.g:18153:1: ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) )
+            // InternalCheck.g:18154:1: ( rule__XVariableDeclaration__Group_2_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getGroup_2_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18155:1: ( rule__XVariableDeclaration__Group_2_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18155:2: rule__XVariableDeclaration__Group_2_0_0__0
+            // InternalCheck.g:18155:1: ( rule__XVariableDeclaration__Group_2_0_0__0 )
+            // InternalCheck.g:18155:2: rule__XVariableDeclaration__Group_2_0_0__0
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group_2_0_0__0_in_rule__XVariableDeclaration__Group_2_0__0__Impl36748);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group_2_0_0__0();
 
             state._fsp--;
@@ -52337,21 +52337,21 @@ public final void rule__XVariableDeclaration__Group_2_0__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_2_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18167:1: rule__XVariableDeclaration__Group_2_0_0__0 : rule__XVariableDeclaration__Group_2_0_0__0__Impl rule__XVariableDeclaration__Group_2_0_0__1 ;
+    // InternalCheck.g:18167:1: rule__XVariableDeclaration__Group_2_0_0__0 : rule__XVariableDeclaration__Group_2_0_0__0__Impl rule__XVariableDeclaration__Group_2_0_0__1 ;
     public final void rule__XVariableDeclaration__Group_2_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18171:1: ( rule__XVariableDeclaration__Group_2_0_0__0__Impl rule__XVariableDeclaration__Group_2_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18172:2: rule__XVariableDeclaration__Group_2_0_0__0__Impl rule__XVariableDeclaration__Group_2_0_0__1
+            // InternalCheck.g:18171:1: ( rule__XVariableDeclaration__Group_2_0_0__0__Impl rule__XVariableDeclaration__Group_2_0_0__1 )
+            // InternalCheck.g:18172:2: rule__XVariableDeclaration__Group_2_0_0__0__Impl rule__XVariableDeclaration__Group_2_0_0__1
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group_2_0_0__0__Impl_in_rule__XVariableDeclaration__Group_2_0_0__036780);
+            pushFollow(FOLLOW_4);
             rule__XVariableDeclaration__Group_2_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group_2_0_0__1_in_rule__XVariableDeclaration__Group_2_0_0__036783);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group_2_0_0__1();
 
             state._fsp--;
@@ -52375,25 +52375,25 @@ public final void rule__XVariableDeclaration__Group_2_0_0__0() throws Recognitio
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_2_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18179:1: rule__XVariableDeclaration__Group_2_0_0__0__Impl : ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) ) ;
+    // InternalCheck.g:18179:1: rule__XVariableDeclaration__Group_2_0_0__0__Impl : ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) ) ;
     public final void rule__XVariableDeclaration__Group_2_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18183:1: ( ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18184:1: ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) )
+            // InternalCheck.g:18183:1: ( ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) ) )
+            // InternalCheck.g:18184:1: ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18184:1: ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18185:1: ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 )
+            // InternalCheck.g:18184:1: ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) )
+            // InternalCheck.g:18185:1: ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getTypeAssignment_2_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18186:1: ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18186:2: rule__XVariableDeclaration__TypeAssignment_2_0_0_0
+            // InternalCheck.g:18186:1: ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 )
+            // InternalCheck.g:18186:2: rule__XVariableDeclaration__TypeAssignment_2_0_0_0
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__TypeAssignment_2_0_0_0_in_rule__XVariableDeclaration__Group_2_0_0__0__Impl36810);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__TypeAssignment_2_0_0_0();
 
             state._fsp--;
@@ -52426,16 +52426,16 @@ public final void rule__XVariableDeclaration__Group_2_0_0__0__Impl() throws Reco
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_2_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18196:1: rule__XVariableDeclaration__Group_2_0_0__1 : rule__XVariableDeclaration__Group_2_0_0__1__Impl ;
+    // InternalCheck.g:18196:1: rule__XVariableDeclaration__Group_2_0_0__1 : rule__XVariableDeclaration__Group_2_0_0__1__Impl ;
     public final void rule__XVariableDeclaration__Group_2_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18200:1: ( rule__XVariableDeclaration__Group_2_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18201:2: rule__XVariableDeclaration__Group_2_0_0__1__Impl
+            // InternalCheck.g:18200:1: ( rule__XVariableDeclaration__Group_2_0_0__1__Impl )
+            // InternalCheck.g:18201:2: rule__XVariableDeclaration__Group_2_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group_2_0_0__1__Impl_in_rule__XVariableDeclaration__Group_2_0_0__136840);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group_2_0_0__1__Impl();
 
             state._fsp--;
@@ -52459,25 +52459,25 @@ public final void rule__XVariableDeclaration__Group_2_0_0__1() throws Recognitio
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_2_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18207:1: rule__XVariableDeclaration__Group_2_0_0__1__Impl : ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) ) ;
+    // InternalCheck.g:18207:1: rule__XVariableDeclaration__Group_2_0_0__1__Impl : ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) ) ;
     public final void rule__XVariableDeclaration__Group_2_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18211:1: ( ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18212:1: ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) )
+            // InternalCheck.g:18211:1: ( ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) ) )
+            // InternalCheck.g:18212:1: ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18212:1: ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18213:1: ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 )
+            // InternalCheck.g:18212:1: ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) )
+            // InternalCheck.g:18213:1: ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getNameAssignment_2_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18214:1: ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18214:2: rule__XVariableDeclaration__NameAssignment_2_0_0_1
+            // InternalCheck.g:18214:1: ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 )
+            // InternalCheck.g:18214:2: rule__XVariableDeclaration__NameAssignment_2_0_0_1
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__NameAssignment_2_0_0_1_in_rule__XVariableDeclaration__Group_2_0_0__1__Impl36867);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__NameAssignment_2_0_0_1();
 
             state._fsp--;
@@ -52510,21 +52510,21 @@ public final void rule__XVariableDeclaration__Group_2_0_0__1__Impl() throws Reco
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_3__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18228:1: rule__XVariableDeclaration__Group_3__0 : rule__XVariableDeclaration__Group_3__0__Impl rule__XVariableDeclaration__Group_3__1 ;
+    // InternalCheck.g:18228:1: rule__XVariableDeclaration__Group_3__0 : rule__XVariableDeclaration__Group_3__0__Impl rule__XVariableDeclaration__Group_3__1 ;
     public final void rule__XVariableDeclaration__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18232:1: ( rule__XVariableDeclaration__Group_3__0__Impl rule__XVariableDeclaration__Group_3__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18233:2: rule__XVariableDeclaration__Group_3__0__Impl rule__XVariableDeclaration__Group_3__1
+            // InternalCheck.g:18232:1: ( rule__XVariableDeclaration__Group_3__0__Impl rule__XVariableDeclaration__Group_3__1 )
+            // InternalCheck.g:18233:2: rule__XVariableDeclaration__Group_3__0__Impl rule__XVariableDeclaration__Group_3__1
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group_3__0__Impl_in_rule__XVariableDeclaration__Group_3__036901);
+            pushFollow(FOLLOW_32);
             rule__XVariableDeclaration__Group_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group_3__1_in_rule__XVariableDeclaration__Group_3__036904);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group_3__1();
 
             state._fsp--;
@@ -52548,22 +52548,22 @@ public final void rule__XVariableDeclaration__Group_3__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_3__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18240:1: rule__XVariableDeclaration__Group_3__0__Impl : ( '=' ) ;
+    // InternalCheck.g:18240:1: rule__XVariableDeclaration__Group_3__0__Impl : ( '=' ) ;
     public final void rule__XVariableDeclaration__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18244:1: ( ( '=' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18245:1: ( '=' )
+            // InternalCheck.g:18244:1: ( ( '=' ) )
+            // InternalCheck.g:18245:1: ( '=' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18245:1: ( '=' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18246:1: '='
+            // InternalCheck.g:18245:1: ( '=' )
+            // InternalCheck.g:18246:1: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getEqualsSignKeyword_3_0()); 
             }
-            match(input,13,FOLLOW_13_in_rule__XVariableDeclaration__Group_3__0__Impl36932); if (state.failed) return ;
+            match(input,13,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXVariableDeclarationAccess().getEqualsSignKeyword_3_0()); 
             }
@@ -52589,16 +52589,16 @@ public final void rule__XVariableDeclaration__Group_3__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_3__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18259:1: rule__XVariableDeclaration__Group_3__1 : rule__XVariableDeclaration__Group_3__1__Impl ;
+    // InternalCheck.g:18259:1: rule__XVariableDeclaration__Group_3__1 : rule__XVariableDeclaration__Group_3__1__Impl ;
     public final void rule__XVariableDeclaration__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18263:1: ( rule__XVariableDeclaration__Group_3__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18264:2: rule__XVariableDeclaration__Group_3__1__Impl
+            // InternalCheck.g:18263:1: ( rule__XVariableDeclaration__Group_3__1__Impl )
+            // InternalCheck.g:18264:2: rule__XVariableDeclaration__Group_3__1__Impl
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group_3__1__Impl_in_rule__XVariableDeclaration__Group_3__136963);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group_3__1__Impl();
 
             state._fsp--;
@@ -52622,25 +52622,25 @@ public final void rule__XVariableDeclaration__Group_3__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_3__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18270:1: rule__XVariableDeclaration__Group_3__1__Impl : ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) ) ;
+    // InternalCheck.g:18270:1: rule__XVariableDeclaration__Group_3__1__Impl : ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) ) ;
     public final void rule__XVariableDeclaration__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18274:1: ( ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18275:1: ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) )
+            // InternalCheck.g:18274:1: ( ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) ) )
+            // InternalCheck.g:18275:1: ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18275:1: ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18276:1: ( rule__XVariableDeclaration__RightAssignment_3_1 )
+            // InternalCheck.g:18275:1: ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) )
+            // InternalCheck.g:18276:1: ( rule__XVariableDeclaration__RightAssignment_3_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getRightAssignment_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18277:1: ( rule__XVariableDeclaration__RightAssignment_3_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18277:2: rule__XVariableDeclaration__RightAssignment_3_1
+            // InternalCheck.g:18277:1: ( rule__XVariableDeclaration__RightAssignment_3_1 )
+            // InternalCheck.g:18277:2: rule__XVariableDeclaration__RightAssignment_3_1
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__RightAssignment_3_1_in_rule__XVariableDeclaration__Group_3__1__Impl36990);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__RightAssignment_3_1();
 
             state._fsp--;
@@ -52673,21 +52673,21 @@ public final void rule__XVariableDeclaration__Group_3__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__JvmFormalParameter__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18291:1: rule__JvmFormalParameter__Group__0 : rule__JvmFormalParameter__Group__0__Impl rule__JvmFormalParameter__Group__1 ;
+    // InternalCheck.g:18291:1: rule__JvmFormalParameter__Group__0 : rule__JvmFormalParameter__Group__0__Impl rule__JvmFormalParameter__Group__1 ;
     public final void rule__JvmFormalParameter__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18295:1: ( rule__JvmFormalParameter__Group__0__Impl rule__JvmFormalParameter__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18296:2: rule__JvmFormalParameter__Group__0__Impl rule__JvmFormalParameter__Group__1
+            // InternalCheck.g:18295:1: ( rule__JvmFormalParameter__Group__0__Impl rule__JvmFormalParameter__Group__1 )
+            // InternalCheck.g:18296:2: rule__JvmFormalParameter__Group__0__Impl rule__JvmFormalParameter__Group__1
             {
-            pushFollow(FOLLOW_rule__JvmFormalParameter__Group__0__Impl_in_rule__JvmFormalParameter__Group__037024);
+            pushFollow(FOLLOW_29);
             rule__JvmFormalParameter__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmFormalParameter__Group__1_in_rule__JvmFormalParameter__Group__037027);
+            pushFollow(FOLLOW_2);
             rule__JvmFormalParameter__Group__1();
 
             state._fsp--;
@@ -52711,22 +52711,22 @@ public final void rule__JvmFormalParameter__Group__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__JvmFormalParameter__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18303:1: rule__JvmFormalParameter__Group__0__Impl : ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? ) ;
+    // InternalCheck.g:18303:1: rule__JvmFormalParameter__Group__0__Impl : ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? ) ;
     public final void rule__JvmFormalParameter__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18307:1: ( ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18308:1: ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? )
+            // InternalCheck.g:18307:1: ( ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? ) )
+            // InternalCheck.g:18308:1: ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18308:1: ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18309:1: ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )?
+            // InternalCheck.g:18308:1: ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? )
+            // InternalCheck.g:18309:1: ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmFormalParameterAccess().getParameterTypeAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18310:1: ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )?
+            // InternalCheck.g:18310:1: ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )?
             int alt136=2;
             int LA136_0 = input.LA(1);
 
@@ -52742,9 +52742,9 @@ else if ( (LA136_0==51||LA136_0==72) ) {
             }
             switch (alt136) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18310:2: rule__JvmFormalParameter__ParameterTypeAssignment_0
+                    // InternalCheck.g:18310:2: rule__JvmFormalParameter__ParameterTypeAssignment_0
                     {
-                    pushFollow(FOLLOW_rule__JvmFormalParameter__ParameterTypeAssignment_0_in_rule__JvmFormalParameter__Group__0__Impl37054);
+                    pushFollow(FOLLOW_2);
                     rule__JvmFormalParameter__ParameterTypeAssignment_0();
 
                     state._fsp--;
@@ -52780,16 +52780,16 @@ else if ( (LA136_0==51||LA136_0==72) ) {
 
 
     // $ANTLR start "rule__JvmFormalParameter__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18320:1: rule__JvmFormalParameter__Group__1 : rule__JvmFormalParameter__Group__1__Impl ;
+    // InternalCheck.g:18320:1: rule__JvmFormalParameter__Group__1 : rule__JvmFormalParameter__Group__1__Impl ;
     public final void rule__JvmFormalParameter__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18324:1: ( rule__JvmFormalParameter__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18325:2: rule__JvmFormalParameter__Group__1__Impl
+            // InternalCheck.g:18324:1: ( rule__JvmFormalParameter__Group__1__Impl )
+            // InternalCheck.g:18325:2: rule__JvmFormalParameter__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmFormalParameter__Group__1__Impl_in_rule__JvmFormalParameter__Group__137085);
+            pushFollow(FOLLOW_2);
             rule__JvmFormalParameter__Group__1__Impl();
 
             state._fsp--;
@@ -52813,25 +52813,25 @@ public final void rule__JvmFormalParameter__Group__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__JvmFormalParameter__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18331:1: rule__JvmFormalParameter__Group__1__Impl : ( ( rule__JvmFormalParameter__NameAssignment_1 ) ) ;
+    // InternalCheck.g:18331:1: rule__JvmFormalParameter__Group__1__Impl : ( ( rule__JvmFormalParameter__NameAssignment_1 ) ) ;
     public final void rule__JvmFormalParameter__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18335:1: ( ( ( rule__JvmFormalParameter__NameAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18336:1: ( ( rule__JvmFormalParameter__NameAssignment_1 ) )
+            // InternalCheck.g:18335:1: ( ( ( rule__JvmFormalParameter__NameAssignment_1 ) ) )
+            // InternalCheck.g:18336:1: ( ( rule__JvmFormalParameter__NameAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18336:1: ( ( rule__JvmFormalParameter__NameAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18337:1: ( rule__JvmFormalParameter__NameAssignment_1 )
+            // InternalCheck.g:18336:1: ( ( rule__JvmFormalParameter__NameAssignment_1 ) )
+            // InternalCheck.g:18337:1: ( rule__JvmFormalParameter__NameAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmFormalParameterAccess().getNameAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18338:1: ( rule__JvmFormalParameter__NameAssignment_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18338:2: rule__JvmFormalParameter__NameAssignment_1
+            // InternalCheck.g:18338:1: ( rule__JvmFormalParameter__NameAssignment_1 )
+            // InternalCheck.g:18338:2: rule__JvmFormalParameter__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__JvmFormalParameter__NameAssignment_1_in_rule__JvmFormalParameter__Group__1__Impl37112);
+            pushFollow(FOLLOW_2);
             rule__JvmFormalParameter__NameAssignment_1();
 
             state._fsp--;
@@ -52864,21 +52864,21 @@ public final void rule__JvmFormalParameter__Group__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__FullJvmFormalParameter__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18352:1: rule__FullJvmFormalParameter__Group__0 : rule__FullJvmFormalParameter__Group__0__Impl rule__FullJvmFormalParameter__Group__1 ;
+    // InternalCheck.g:18352:1: rule__FullJvmFormalParameter__Group__0 : rule__FullJvmFormalParameter__Group__0__Impl rule__FullJvmFormalParameter__Group__1 ;
     public final void rule__FullJvmFormalParameter__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18356:1: ( rule__FullJvmFormalParameter__Group__0__Impl rule__FullJvmFormalParameter__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18357:2: rule__FullJvmFormalParameter__Group__0__Impl rule__FullJvmFormalParameter__Group__1
+            // InternalCheck.g:18356:1: ( rule__FullJvmFormalParameter__Group__0__Impl rule__FullJvmFormalParameter__Group__1 )
+            // InternalCheck.g:18357:2: rule__FullJvmFormalParameter__Group__0__Impl rule__FullJvmFormalParameter__Group__1
             {
-            pushFollow(FOLLOW_rule__FullJvmFormalParameter__Group__0__Impl_in_rule__FullJvmFormalParameter__Group__037146);
+            pushFollow(FOLLOW_4);
             rule__FullJvmFormalParameter__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__FullJvmFormalParameter__Group__1_in_rule__FullJvmFormalParameter__Group__037149);
+            pushFollow(FOLLOW_2);
             rule__FullJvmFormalParameter__Group__1();
 
             state._fsp--;
@@ -52902,25 +52902,25 @@ public final void rule__FullJvmFormalParameter__Group__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__FullJvmFormalParameter__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18364:1: rule__FullJvmFormalParameter__Group__0__Impl : ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) ) ;
+    // InternalCheck.g:18364:1: rule__FullJvmFormalParameter__Group__0__Impl : ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) ) ;
     public final void rule__FullJvmFormalParameter__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18368:1: ( ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18369:1: ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) )
+            // InternalCheck.g:18368:1: ( ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) ) )
+            // InternalCheck.g:18369:1: ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18369:1: ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18370:1: ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 )
+            // InternalCheck.g:18369:1: ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) )
+            // InternalCheck.g:18370:1: ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFullJvmFormalParameterAccess().getParameterTypeAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18371:1: ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18371:2: rule__FullJvmFormalParameter__ParameterTypeAssignment_0
+            // InternalCheck.g:18371:1: ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 )
+            // InternalCheck.g:18371:2: rule__FullJvmFormalParameter__ParameterTypeAssignment_0
             {
-            pushFollow(FOLLOW_rule__FullJvmFormalParameter__ParameterTypeAssignment_0_in_rule__FullJvmFormalParameter__Group__0__Impl37176);
+            pushFollow(FOLLOW_2);
             rule__FullJvmFormalParameter__ParameterTypeAssignment_0();
 
             state._fsp--;
@@ -52953,16 +52953,16 @@ public final void rule__FullJvmFormalParameter__Group__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__FullJvmFormalParameter__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18381:1: rule__FullJvmFormalParameter__Group__1 : rule__FullJvmFormalParameter__Group__1__Impl ;
+    // InternalCheck.g:18381:1: rule__FullJvmFormalParameter__Group__1 : rule__FullJvmFormalParameter__Group__1__Impl ;
     public final void rule__FullJvmFormalParameter__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18385:1: ( rule__FullJvmFormalParameter__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18386:2: rule__FullJvmFormalParameter__Group__1__Impl
+            // InternalCheck.g:18385:1: ( rule__FullJvmFormalParameter__Group__1__Impl )
+            // InternalCheck.g:18386:2: rule__FullJvmFormalParameter__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__FullJvmFormalParameter__Group__1__Impl_in_rule__FullJvmFormalParameter__Group__137206);
+            pushFollow(FOLLOW_2);
             rule__FullJvmFormalParameter__Group__1__Impl();
 
             state._fsp--;
@@ -52986,25 +52986,25 @@ public final void rule__FullJvmFormalParameter__Group__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__FullJvmFormalParameter__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18392:1: rule__FullJvmFormalParameter__Group__1__Impl : ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) ) ;
+    // InternalCheck.g:18392:1: rule__FullJvmFormalParameter__Group__1__Impl : ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) ) ;
     public final void rule__FullJvmFormalParameter__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18396:1: ( ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18397:1: ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) )
+            // InternalCheck.g:18396:1: ( ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) ) )
+            // InternalCheck.g:18397:1: ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18397:1: ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18398:1: ( rule__FullJvmFormalParameter__NameAssignment_1 )
+            // InternalCheck.g:18397:1: ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) )
+            // InternalCheck.g:18398:1: ( rule__FullJvmFormalParameter__NameAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFullJvmFormalParameterAccess().getNameAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18399:1: ( rule__FullJvmFormalParameter__NameAssignment_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18399:2: rule__FullJvmFormalParameter__NameAssignment_1
+            // InternalCheck.g:18399:1: ( rule__FullJvmFormalParameter__NameAssignment_1 )
+            // InternalCheck.g:18399:2: rule__FullJvmFormalParameter__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__FullJvmFormalParameter__NameAssignment_1_in_rule__FullJvmFormalParameter__Group__1__Impl37233);
+            pushFollow(FOLLOW_2);
             rule__FullJvmFormalParameter__NameAssignment_1();
 
             state._fsp--;
@@ -53037,21 +53037,21 @@ public final void rule__FullJvmFormalParameter__Group__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XFeatureCall__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18413:1: rule__XFeatureCall__Group__0 : rule__XFeatureCall__Group__0__Impl rule__XFeatureCall__Group__1 ;
+    // InternalCheck.g:18413:1: rule__XFeatureCall__Group__0 : rule__XFeatureCall__Group__0__Impl rule__XFeatureCall__Group__1 ;
     public final void rule__XFeatureCall__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18417:1: ( rule__XFeatureCall__Group__0__Impl rule__XFeatureCall__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18418:2: rule__XFeatureCall__Group__0__Impl rule__XFeatureCall__Group__1
+            // InternalCheck.g:18417:1: ( rule__XFeatureCall__Group__0__Impl rule__XFeatureCall__Group__1 )
+            // InternalCheck.g:18418:2: rule__XFeatureCall__Group__0__Impl rule__XFeatureCall__Group__1
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group__0__Impl_in_rule__XFeatureCall__Group__037267);
+            pushFollow(FOLLOW_77);
             rule__XFeatureCall__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group__1_in_rule__XFeatureCall__Group__037270);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group__1();
 
             state._fsp--;
@@ -53075,23 +53075,23 @@ public final void rule__XFeatureCall__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18425:1: rule__XFeatureCall__Group__0__Impl : ( () ) ;
+    // InternalCheck.g:18425:1: rule__XFeatureCall__Group__0__Impl : ( () ) ;
     public final void rule__XFeatureCall__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18429:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18430:1: ( () )
+            // InternalCheck.g:18429:1: ( ( () ) )
+            // InternalCheck.g:18430:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18430:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18431:1: ()
+            // InternalCheck.g:18430:1: ( () )
+            // InternalCheck.g:18431:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getXFeatureCallAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18432:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18434:1: 
+            // InternalCheck.g:18432:1: ()
+            // InternalCheck.g:18434:1: 
             {
             }
 
@@ -53116,21 +53116,21 @@ public final void rule__XFeatureCall__Group__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XFeatureCall__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18444:1: rule__XFeatureCall__Group__1 : rule__XFeatureCall__Group__1__Impl rule__XFeatureCall__Group__2 ;
+    // InternalCheck.g:18444:1: rule__XFeatureCall__Group__1 : rule__XFeatureCall__Group__1__Impl rule__XFeatureCall__Group__2 ;
     public final void rule__XFeatureCall__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18448:1: ( rule__XFeatureCall__Group__1__Impl rule__XFeatureCall__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18449:2: rule__XFeatureCall__Group__1__Impl rule__XFeatureCall__Group__2
+            // InternalCheck.g:18448:1: ( rule__XFeatureCall__Group__1__Impl rule__XFeatureCall__Group__2 )
+            // InternalCheck.g:18449:2: rule__XFeatureCall__Group__1__Impl rule__XFeatureCall__Group__2
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group__1__Impl_in_rule__XFeatureCall__Group__137328);
+            pushFollow(FOLLOW_77);
             rule__XFeatureCall__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group__2_in_rule__XFeatureCall__Group__137331);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group__2();
 
             state._fsp--;
@@ -53154,22 +53154,22 @@ public final void rule__XFeatureCall__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18456:1: rule__XFeatureCall__Group__1__Impl : ( ( rule__XFeatureCall__Group_1__0 )? ) ;
+    // InternalCheck.g:18456:1: rule__XFeatureCall__Group__1__Impl : ( ( rule__XFeatureCall__Group_1__0 )? ) ;
     public final void rule__XFeatureCall__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18460:1: ( ( ( rule__XFeatureCall__Group_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18461:1: ( ( rule__XFeatureCall__Group_1__0 )? )
+            // InternalCheck.g:18460:1: ( ( ( rule__XFeatureCall__Group_1__0 )? ) )
+            // InternalCheck.g:18461:1: ( ( rule__XFeatureCall__Group_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18461:1: ( ( rule__XFeatureCall__Group_1__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18462:1: ( rule__XFeatureCall__Group_1__0 )?
+            // InternalCheck.g:18461:1: ( ( rule__XFeatureCall__Group_1__0 )? )
+            // InternalCheck.g:18462:1: ( rule__XFeatureCall__Group_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18463:1: ( rule__XFeatureCall__Group_1__0 )?
+            // InternalCheck.g:18463:1: ( rule__XFeatureCall__Group_1__0 )?
             int alt137=2;
             int LA137_0 = input.LA(1);
 
@@ -53178,9 +53178,9 @@ public final void rule__XFeatureCall__Group__1__Impl() throws RecognitionExcepti
             }
             switch (alt137) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18463:2: rule__XFeatureCall__Group_1__0
+                    // InternalCheck.g:18463:2: rule__XFeatureCall__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__XFeatureCall__Group_1__0_in_rule__XFeatureCall__Group__1__Impl37358);
+                    pushFollow(FOLLOW_2);
                     rule__XFeatureCall__Group_1__0();
 
                     state._fsp--;
@@ -53216,21 +53216,21 @@ public final void rule__XFeatureCall__Group__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XFeatureCall__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18473:1: rule__XFeatureCall__Group__2 : rule__XFeatureCall__Group__2__Impl rule__XFeatureCall__Group__3 ;
+    // InternalCheck.g:18473:1: rule__XFeatureCall__Group__2 : rule__XFeatureCall__Group__2__Impl rule__XFeatureCall__Group__3 ;
     public final void rule__XFeatureCall__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18477:1: ( rule__XFeatureCall__Group__2__Impl rule__XFeatureCall__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18478:2: rule__XFeatureCall__Group__2__Impl rule__XFeatureCall__Group__3
+            // InternalCheck.g:18477:1: ( rule__XFeatureCall__Group__2__Impl rule__XFeatureCall__Group__3 )
+            // InternalCheck.g:18478:2: rule__XFeatureCall__Group__2__Impl rule__XFeatureCall__Group__3
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group__2__Impl_in_rule__XFeatureCall__Group__237389);
+            pushFollow(FOLLOW_78);
             rule__XFeatureCall__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group__3_in_rule__XFeatureCall__Group__237392);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group__3();
 
             state._fsp--;
@@ -53254,25 +53254,25 @@ public final void rule__XFeatureCall__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18485:1: rule__XFeatureCall__Group__2__Impl : ( ( rule__XFeatureCall__FeatureAssignment_2 ) ) ;
+    // InternalCheck.g:18485:1: rule__XFeatureCall__Group__2__Impl : ( ( rule__XFeatureCall__FeatureAssignment_2 ) ) ;
     public final void rule__XFeatureCall__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18489:1: ( ( ( rule__XFeatureCall__FeatureAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18490:1: ( ( rule__XFeatureCall__FeatureAssignment_2 ) )
+            // InternalCheck.g:18489:1: ( ( ( rule__XFeatureCall__FeatureAssignment_2 ) ) )
+            // InternalCheck.g:18490:1: ( ( rule__XFeatureCall__FeatureAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18490:1: ( ( rule__XFeatureCall__FeatureAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18491:1: ( rule__XFeatureCall__FeatureAssignment_2 )
+            // InternalCheck.g:18490:1: ( ( rule__XFeatureCall__FeatureAssignment_2 ) )
+            // InternalCheck.g:18491:1: ( rule__XFeatureCall__FeatureAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18492:1: ( rule__XFeatureCall__FeatureAssignment_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18492:2: rule__XFeatureCall__FeatureAssignment_2
+            // InternalCheck.g:18492:1: ( rule__XFeatureCall__FeatureAssignment_2 )
+            // InternalCheck.g:18492:2: rule__XFeatureCall__FeatureAssignment_2
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__FeatureAssignment_2_in_rule__XFeatureCall__Group__2__Impl37419);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__FeatureAssignment_2();
 
             state._fsp--;
@@ -53305,21 +53305,21 @@ public final void rule__XFeatureCall__Group__2__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XFeatureCall__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18502:1: rule__XFeatureCall__Group__3 : rule__XFeatureCall__Group__3__Impl rule__XFeatureCall__Group__4 ;
+    // InternalCheck.g:18502:1: rule__XFeatureCall__Group__3 : rule__XFeatureCall__Group__3__Impl rule__XFeatureCall__Group__4 ;
     public final void rule__XFeatureCall__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18506:1: ( rule__XFeatureCall__Group__3__Impl rule__XFeatureCall__Group__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18507:2: rule__XFeatureCall__Group__3__Impl rule__XFeatureCall__Group__4
+            // InternalCheck.g:18506:1: ( rule__XFeatureCall__Group__3__Impl rule__XFeatureCall__Group__4 )
+            // InternalCheck.g:18507:2: rule__XFeatureCall__Group__3__Impl rule__XFeatureCall__Group__4
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group__3__Impl_in_rule__XFeatureCall__Group__337449);
+            pushFollow(FOLLOW_78);
             rule__XFeatureCall__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group__4_in_rule__XFeatureCall__Group__337452);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group__4();
 
             state._fsp--;
@@ -53343,29 +53343,29 @@ public final void rule__XFeatureCall__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18514:1: rule__XFeatureCall__Group__3__Impl : ( ( rule__XFeatureCall__Group_3__0 )? ) ;
+    // InternalCheck.g:18514:1: rule__XFeatureCall__Group__3__Impl : ( ( rule__XFeatureCall__Group_3__0 )? ) ;
     public final void rule__XFeatureCall__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18518:1: ( ( ( rule__XFeatureCall__Group_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18519:1: ( ( rule__XFeatureCall__Group_3__0 )? )
+            // InternalCheck.g:18518:1: ( ( ( rule__XFeatureCall__Group_3__0 )? ) )
+            // InternalCheck.g:18519:1: ( ( rule__XFeatureCall__Group_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18519:1: ( ( rule__XFeatureCall__Group_3__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18520:1: ( rule__XFeatureCall__Group_3__0 )?
+            // InternalCheck.g:18519:1: ( ( rule__XFeatureCall__Group_3__0 )? )
+            // InternalCheck.g:18520:1: ( rule__XFeatureCall__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getGroup_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18521:1: ( rule__XFeatureCall__Group_3__0 )?
+            // InternalCheck.g:18521:1: ( rule__XFeatureCall__Group_3__0 )?
             int alt138=2;
             alt138 = dfa138.predict(input);
             switch (alt138) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18521:2: rule__XFeatureCall__Group_3__0
+                    // InternalCheck.g:18521:2: rule__XFeatureCall__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__XFeatureCall__Group_3__0_in_rule__XFeatureCall__Group__3__Impl37479);
+                    pushFollow(FOLLOW_2);
                     rule__XFeatureCall__Group_3__0();
 
                     state._fsp--;
@@ -53401,16 +53401,16 @@ public final void rule__XFeatureCall__Group__3__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XFeatureCall__Group__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18531:1: rule__XFeatureCall__Group__4 : rule__XFeatureCall__Group__4__Impl ;
+    // InternalCheck.g:18531:1: rule__XFeatureCall__Group__4 : rule__XFeatureCall__Group__4__Impl ;
     public final void rule__XFeatureCall__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18535:1: ( rule__XFeatureCall__Group__4__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18536:2: rule__XFeatureCall__Group__4__Impl
+            // InternalCheck.g:18535:1: ( rule__XFeatureCall__Group__4__Impl )
+            // InternalCheck.g:18536:2: rule__XFeatureCall__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group__4__Impl_in_rule__XFeatureCall__Group__437510);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group__4__Impl();
 
             state._fsp--;
@@ -53434,29 +53434,29 @@ public final void rule__XFeatureCall__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18542:1: rule__XFeatureCall__Group__4__Impl : ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? ) ;
+    // InternalCheck.g:18542:1: rule__XFeatureCall__Group__4__Impl : ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? ) ;
     public final void rule__XFeatureCall__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18546:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18547:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? )
+            // InternalCheck.g:18546:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? ) )
+            // InternalCheck.g:18547:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18547:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18548:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )?
+            // InternalCheck.g:18547:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? )
+            // InternalCheck.g:18548:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsAssignment_4()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18549:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )?
+            // InternalCheck.g:18549:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )?
             int alt139=2;
             alt139 = dfa139.predict(input);
             switch (alt139) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18549:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_4
+                    // InternalCheck.g:18549:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_4
                     {
-                    pushFollow(FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_4_in_rule__XFeatureCall__Group__4__Impl37537);
+                    pushFollow(FOLLOW_2);
                     rule__XFeatureCall__FeatureCallArgumentsAssignment_4();
 
                     state._fsp--;
@@ -53492,21 +53492,21 @@ public final void rule__XFeatureCall__Group__4__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18569:1: rule__XFeatureCall__Group_1__0 : rule__XFeatureCall__Group_1__0__Impl rule__XFeatureCall__Group_1__1 ;
+    // InternalCheck.g:18569:1: rule__XFeatureCall__Group_1__0 : rule__XFeatureCall__Group_1__0__Impl rule__XFeatureCall__Group_1__1 ;
     public final void rule__XFeatureCall__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18573:1: ( rule__XFeatureCall__Group_1__0__Impl rule__XFeatureCall__Group_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18574:2: rule__XFeatureCall__Group_1__0__Impl rule__XFeatureCall__Group_1__1
+            // InternalCheck.g:18573:1: ( rule__XFeatureCall__Group_1__0__Impl rule__XFeatureCall__Group_1__1 )
+            // InternalCheck.g:18574:2: rule__XFeatureCall__Group_1__0__Impl rule__XFeatureCall__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_1__0__Impl_in_rule__XFeatureCall__Group_1__037578);
+            pushFollow(FOLLOW_79);
             rule__XFeatureCall__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_1__1_in_rule__XFeatureCall__Group_1__037581);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_1__1();
 
             state._fsp--;
@@ -53530,22 +53530,22 @@ public final void rule__XFeatureCall__Group_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18581:1: rule__XFeatureCall__Group_1__0__Impl : ( '<' ) ;
+    // InternalCheck.g:18581:1: rule__XFeatureCall__Group_1__0__Impl : ( '<' ) ;
     public final void rule__XFeatureCall__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18585:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18586:1: ( '<' )
+            // InternalCheck.g:18585:1: ( ( '<' ) )
+            // InternalCheck.g:18586:1: ( '<' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18586:1: ( '<' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18587:1: '<'
+            // InternalCheck.g:18586:1: ( '<' )
+            // InternalCheck.g:18587:1: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getLessThanSignKeyword_1_0()); 
             }
-            match(input,47,FOLLOW_47_in_rule__XFeatureCall__Group_1__0__Impl37609); if (state.failed) return ;
+            match(input,47,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFeatureCallAccess().getLessThanSignKeyword_1_0()); 
             }
@@ -53571,21 +53571,21 @@ public final void rule__XFeatureCall__Group_1__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18600:1: rule__XFeatureCall__Group_1__1 : rule__XFeatureCall__Group_1__1__Impl rule__XFeatureCall__Group_1__2 ;
+    // InternalCheck.g:18600:1: rule__XFeatureCall__Group_1__1 : rule__XFeatureCall__Group_1__1__Impl rule__XFeatureCall__Group_1__2 ;
     public final void rule__XFeatureCall__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18604:1: ( rule__XFeatureCall__Group_1__1__Impl rule__XFeatureCall__Group_1__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18605:2: rule__XFeatureCall__Group_1__1__Impl rule__XFeatureCall__Group_1__2
+            // InternalCheck.g:18604:1: ( rule__XFeatureCall__Group_1__1__Impl rule__XFeatureCall__Group_1__2 )
+            // InternalCheck.g:18605:2: rule__XFeatureCall__Group_1__1__Impl rule__XFeatureCall__Group_1__2
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_1__1__Impl_in_rule__XFeatureCall__Group_1__137640);
+            pushFollow(FOLLOW_80);
             rule__XFeatureCall__Group_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_1__2_in_rule__XFeatureCall__Group_1__137643);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_1__2();
 
             state._fsp--;
@@ -53609,25 +53609,25 @@ public final void rule__XFeatureCall__Group_1__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18612:1: rule__XFeatureCall__Group_1__1__Impl : ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) ) ;
+    // InternalCheck.g:18612:1: rule__XFeatureCall__Group_1__1__Impl : ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) ) ;
     public final void rule__XFeatureCall__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18616:1: ( ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18617:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) )
+            // InternalCheck.g:18616:1: ( ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) ) )
+            // InternalCheck.g:18617:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18617:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18618:1: ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 )
+            // InternalCheck.g:18617:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) )
+            // InternalCheck.g:18618:1: ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getTypeArgumentsAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18619:1: ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18619:2: rule__XFeatureCall__TypeArgumentsAssignment_1_1
+            // InternalCheck.g:18619:1: ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 )
+            // InternalCheck.g:18619:2: rule__XFeatureCall__TypeArgumentsAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__TypeArgumentsAssignment_1_1_in_rule__XFeatureCall__Group_1__1__Impl37670);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__TypeArgumentsAssignment_1_1();
 
             state._fsp--;
@@ -53660,21 +53660,21 @@ public final void rule__XFeatureCall__Group_1__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18629:1: rule__XFeatureCall__Group_1__2 : rule__XFeatureCall__Group_1__2__Impl rule__XFeatureCall__Group_1__3 ;
+    // InternalCheck.g:18629:1: rule__XFeatureCall__Group_1__2 : rule__XFeatureCall__Group_1__2__Impl rule__XFeatureCall__Group_1__3 ;
     public final void rule__XFeatureCall__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18633:1: ( rule__XFeatureCall__Group_1__2__Impl rule__XFeatureCall__Group_1__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18634:2: rule__XFeatureCall__Group_1__2__Impl rule__XFeatureCall__Group_1__3
+            // InternalCheck.g:18633:1: ( rule__XFeatureCall__Group_1__2__Impl rule__XFeatureCall__Group_1__3 )
+            // InternalCheck.g:18634:2: rule__XFeatureCall__Group_1__2__Impl rule__XFeatureCall__Group_1__3
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_1__2__Impl_in_rule__XFeatureCall__Group_1__237700);
+            pushFollow(FOLLOW_80);
             rule__XFeatureCall__Group_1__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_1__3_in_rule__XFeatureCall__Group_1__237703);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_1__3();
 
             state._fsp--;
@@ -53698,22 +53698,22 @@ public final void rule__XFeatureCall__Group_1__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18641:1: rule__XFeatureCall__Group_1__2__Impl : ( ( rule__XFeatureCall__Group_1_2__0 )* ) ;
+    // InternalCheck.g:18641:1: rule__XFeatureCall__Group_1__2__Impl : ( ( rule__XFeatureCall__Group_1_2__0 )* ) ;
     public final void rule__XFeatureCall__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18645:1: ( ( ( rule__XFeatureCall__Group_1_2__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18646:1: ( ( rule__XFeatureCall__Group_1_2__0 )* )
+            // InternalCheck.g:18645:1: ( ( ( rule__XFeatureCall__Group_1_2__0 )* ) )
+            // InternalCheck.g:18646:1: ( ( rule__XFeatureCall__Group_1_2__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18646:1: ( ( rule__XFeatureCall__Group_1_2__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18647:1: ( rule__XFeatureCall__Group_1_2__0 )*
+            // InternalCheck.g:18646:1: ( ( rule__XFeatureCall__Group_1_2__0 )* )
+            // InternalCheck.g:18647:1: ( rule__XFeatureCall__Group_1_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getGroup_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18648:1: ( rule__XFeatureCall__Group_1_2__0 )*
+            // InternalCheck.g:18648:1: ( rule__XFeatureCall__Group_1_2__0 )*
             loop140:
             do {
                 int alt140=2;
@@ -53726,9 +53726,9 @@ public final void rule__XFeatureCall__Group_1__2__Impl() throws RecognitionExcep
 
                 switch (alt140) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18648:2: rule__XFeatureCall__Group_1_2__0
+            	    // InternalCheck.g:18648:2: rule__XFeatureCall__Group_1_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__XFeatureCall__Group_1_2__0_in_rule__XFeatureCall__Group_1__2__Impl37730);
+            	    pushFollow(FOLLOW_21);
             	    rule__XFeatureCall__Group_1_2__0();
 
             	    state._fsp--;
@@ -53767,16 +53767,16 @@ public final void rule__XFeatureCall__Group_1__2__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18658:1: rule__XFeatureCall__Group_1__3 : rule__XFeatureCall__Group_1__3__Impl ;
+    // InternalCheck.g:18658:1: rule__XFeatureCall__Group_1__3 : rule__XFeatureCall__Group_1__3__Impl ;
     public final void rule__XFeatureCall__Group_1__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18662:1: ( rule__XFeatureCall__Group_1__3__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18663:2: rule__XFeatureCall__Group_1__3__Impl
+            // InternalCheck.g:18662:1: ( rule__XFeatureCall__Group_1__3__Impl )
+            // InternalCheck.g:18663:2: rule__XFeatureCall__Group_1__3__Impl
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_1__3__Impl_in_rule__XFeatureCall__Group_1__337761);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_1__3__Impl();
 
             state._fsp--;
@@ -53800,22 +53800,22 @@ public final void rule__XFeatureCall__Group_1__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18669:1: rule__XFeatureCall__Group_1__3__Impl : ( '>' ) ;
+    // InternalCheck.g:18669:1: rule__XFeatureCall__Group_1__3__Impl : ( '>' ) ;
     public final void rule__XFeatureCall__Group_1__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18673:1: ( ( '>' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18674:1: ( '>' )
+            // InternalCheck.g:18673:1: ( ( '>' ) )
+            // InternalCheck.g:18674:1: ( '>' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18674:1: ( '>' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18675:1: '>'
+            // InternalCheck.g:18674:1: ( '>' )
+            // InternalCheck.g:18675:1: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getGreaterThanSignKeyword_1_3()); 
             }
-            match(input,46,FOLLOW_46_in_rule__XFeatureCall__Group_1__3__Impl37789); if (state.failed) return ;
+            match(input,46,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFeatureCallAccess().getGreaterThanSignKeyword_1_3()); 
             }
@@ -53841,21 +53841,21 @@ public final void rule__XFeatureCall__Group_1__3__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1_2__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18696:1: rule__XFeatureCall__Group_1_2__0 : rule__XFeatureCall__Group_1_2__0__Impl rule__XFeatureCall__Group_1_2__1 ;
+    // InternalCheck.g:18696:1: rule__XFeatureCall__Group_1_2__0 : rule__XFeatureCall__Group_1_2__0__Impl rule__XFeatureCall__Group_1_2__1 ;
     public final void rule__XFeatureCall__Group_1_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18700:1: ( rule__XFeatureCall__Group_1_2__0__Impl rule__XFeatureCall__Group_1_2__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18701:2: rule__XFeatureCall__Group_1_2__0__Impl rule__XFeatureCall__Group_1_2__1
+            // InternalCheck.g:18700:1: ( rule__XFeatureCall__Group_1_2__0__Impl rule__XFeatureCall__Group_1_2__1 )
+            // InternalCheck.g:18701:2: rule__XFeatureCall__Group_1_2__0__Impl rule__XFeatureCall__Group_1_2__1
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_1_2__0__Impl_in_rule__XFeatureCall__Group_1_2__037828);
+            pushFollow(FOLLOW_79);
             rule__XFeatureCall__Group_1_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_1_2__1_in_rule__XFeatureCall__Group_1_2__037831);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_1_2__1();
 
             state._fsp--;
@@ -53879,22 +53879,22 @@ public final void rule__XFeatureCall__Group_1_2__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1_2__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18708:1: rule__XFeatureCall__Group_1_2__0__Impl : ( ',' ) ;
+    // InternalCheck.g:18708:1: rule__XFeatureCall__Group_1_2__0__Impl : ( ',' ) ;
     public final void rule__XFeatureCall__Group_1_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18712:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18713:1: ( ',' )
+            // InternalCheck.g:18712:1: ( ( ',' ) )
+            // InternalCheck.g:18713:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18713:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18714:1: ','
+            // InternalCheck.g:18713:1: ( ',' )
+            // InternalCheck.g:18714:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getCommaKeyword_1_2_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XFeatureCall__Group_1_2__0__Impl37859); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFeatureCallAccess().getCommaKeyword_1_2_0()); 
             }
@@ -53920,16 +53920,16 @@ public final void rule__XFeatureCall__Group_1_2__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1_2__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18727:1: rule__XFeatureCall__Group_1_2__1 : rule__XFeatureCall__Group_1_2__1__Impl ;
+    // InternalCheck.g:18727:1: rule__XFeatureCall__Group_1_2__1 : rule__XFeatureCall__Group_1_2__1__Impl ;
     public final void rule__XFeatureCall__Group_1_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18731:1: ( rule__XFeatureCall__Group_1_2__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18732:2: rule__XFeatureCall__Group_1_2__1__Impl
+            // InternalCheck.g:18731:1: ( rule__XFeatureCall__Group_1_2__1__Impl )
+            // InternalCheck.g:18732:2: rule__XFeatureCall__Group_1_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_1_2__1__Impl_in_rule__XFeatureCall__Group_1_2__137890);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_1_2__1__Impl();
 
             state._fsp--;
@@ -53953,25 +53953,25 @@ public final void rule__XFeatureCall__Group_1_2__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1_2__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18738:1: rule__XFeatureCall__Group_1_2__1__Impl : ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) ) ;
+    // InternalCheck.g:18738:1: rule__XFeatureCall__Group_1_2__1__Impl : ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) ) ;
     public final void rule__XFeatureCall__Group_1_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18742:1: ( ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18743:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) )
+            // InternalCheck.g:18742:1: ( ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) ) )
+            // InternalCheck.g:18743:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18743:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18744:1: ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 )
+            // InternalCheck.g:18743:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) )
+            // InternalCheck.g:18744:1: ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getTypeArgumentsAssignment_1_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18745:1: ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18745:2: rule__XFeatureCall__TypeArgumentsAssignment_1_2_1
+            // InternalCheck.g:18745:1: ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 )
+            // InternalCheck.g:18745:2: rule__XFeatureCall__TypeArgumentsAssignment_1_2_1
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__TypeArgumentsAssignment_1_2_1_in_rule__XFeatureCall__Group_1_2__1__Impl37917);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__TypeArgumentsAssignment_1_2_1();
 
             state._fsp--;
@@ -54004,21 +54004,21 @@ public final void rule__XFeatureCall__Group_1_2__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18759:1: rule__XFeatureCall__Group_3__0 : rule__XFeatureCall__Group_3__0__Impl rule__XFeatureCall__Group_3__1 ;
+    // InternalCheck.g:18759:1: rule__XFeatureCall__Group_3__0 : rule__XFeatureCall__Group_3__0__Impl rule__XFeatureCall__Group_3__1 ;
     public final void rule__XFeatureCall__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18763:1: ( rule__XFeatureCall__Group_3__0__Impl rule__XFeatureCall__Group_3__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18764:2: rule__XFeatureCall__Group_3__0__Impl rule__XFeatureCall__Group_3__1
+            // InternalCheck.g:18763:1: ( rule__XFeatureCall__Group_3__0__Impl rule__XFeatureCall__Group_3__1 )
+            // InternalCheck.g:18764:2: rule__XFeatureCall__Group_3__0__Impl rule__XFeatureCall__Group_3__1
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3__0__Impl_in_rule__XFeatureCall__Group_3__037951);
+            pushFollow(FOLLOW_81);
             rule__XFeatureCall__Group_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3__1_in_rule__XFeatureCall__Group_3__037954);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_3__1();
 
             state._fsp--;
@@ -54042,25 +54042,25 @@ public final void rule__XFeatureCall__Group_3__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18771:1: rule__XFeatureCall__Group_3__0__Impl : ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) ) ;
+    // InternalCheck.g:18771:1: rule__XFeatureCall__Group_3__0__Impl : ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) ) ;
     public final void rule__XFeatureCall__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18775:1: ( ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18776:1: ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) )
+            // InternalCheck.g:18775:1: ( ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) ) )
+            // InternalCheck.g:18776:1: ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18776:1: ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18777:1: ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 )
+            // InternalCheck.g:18776:1: ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) )
+            // InternalCheck.g:18777:1: ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getExplicitOperationCallAssignment_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18778:1: ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18778:2: rule__XFeatureCall__ExplicitOperationCallAssignment_3_0
+            // InternalCheck.g:18778:1: ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 )
+            // InternalCheck.g:18778:2: rule__XFeatureCall__ExplicitOperationCallAssignment_3_0
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__ExplicitOperationCallAssignment_3_0_in_rule__XFeatureCall__Group_3__0__Impl37981);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__ExplicitOperationCallAssignment_3_0();
 
             state._fsp--;
@@ -54093,21 +54093,21 @@ public final void rule__XFeatureCall__Group_3__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18788:1: rule__XFeatureCall__Group_3__1 : rule__XFeatureCall__Group_3__1__Impl rule__XFeatureCall__Group_3__2 ;
+    // InternalCheck.g:18788:1: rule__XFeatureCall__Group_3__1 : rule__XFeatureCall__Group_3__1__Impl rule__XFeatureCall__Group_3__2 ;
     public final void rule__XFeatureCall__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18792:1: ( rule__XFeatureCall__Group_3__1__Impl rule__XFeatureCall__Group_3__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18793:2: rule__XFeatureCall__Group_3__1__Impl rule__XFeatureCall__Group_3__2
+            // InternalCheck.g:18792:1: ( rule__XFeatureCall__Group_3__1__Impl rule__XFeatureCall__Group_3__2 )
+            // InternalCheck.g:18793:2: rule__XFeatureCall__Group_3__1__Impl rule__XFeatureCall__Group_3__2
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3__1__Impl_in_rule__XFeatureCall__Group_3__138011);
+            pushFollow(FOLLOW_81);
             rule__XFeatureCall__Group_3__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3__2_in_rule__XFeatureCall__Group_3__138014);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_3__2();
 
             state._fsp--;
@@ -54131,22 +54131,22 @@ public final void rule__XFeatureCall__Group_3__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18800:1: rule__XFeatureCall__Group_3__1__Impl : ( ( rule__XFeatureCall__Alternatives_3_1 )? ) ;
+    // InternalCheck.g:18800:1: rule__XFeatureCall__Group_3__1__Impl : ( ( rule__XFeatureCall__Alternatives_3_1 )? ) ;
     public final void rule__XFeatureCall__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18804:1: ( ( ( rule__XFeatureCall__Alternatives_3_1 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18805:1: ( ( rule__XFeatureCall__Alternatives_3_1 )? )
+            // InternalCheck.g:18804:1: ( ( ( rule__XFeatureCall__Alternatives_3_1 )? ) )
+            // InternalCheck.g:18805:1: ( ( rule__XFeatureCall__Alternatives_3_1 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18805:1: ( ( rule__XFeatureCall__Alternatives_3_1 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18806:1: ( rule__XFeatureCall__Alternatives_3_1 )?
+            // InternalCheck.g:18805:1: ( ( rule__XFeatureCall__Alternatives_3_1 )? )
+            // InternalCheck.g:18806:1: ( rule__XFeatureCall__Alternatives_3_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getAlternatives_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18807:1: ( rule__XFeatureCall__Alternatives_3_1 )?
+            // InternalCheck.g:18807:1: ( rule__XFeatureCall__Alternatives_3_1 )?
             int alt141=2;
             int LA141_0 = input.LA(1);
 
@@ -54155,9 +54155,9 @@ public final void rule__XFeatureCall__Group_3__1__Impl() throws RecognitionExcep
             }
             switch (alt141) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18807:2: rule__XFeatureCall__Alternatives_3_1
+                    // InternalCheck.g:18807:2: rule__XFeatureCall__Alternatives_3_1
                     {
-                    pushFollow(FOLLOW_rule__XFeatureCall__Alternatives_3_1_in_rule__XFeatureCall__Group_3__1__Impl38041);
+                    pushFollow(FOLLOW_2);
                     rule__XFeatureCall__Alternatives_3_1();
 
                     state._fsp--;
@@ -54193,16 +54193,16 @@ public final void rule__XFeatureCall__Group_3__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18817:1: rule__XFeatureCall__Group_3__2 : rule__XFeatureCall__Group_3__2__Impl ;
+    // InternalCheck.g:18817:1: rule__XFeatureCall__Group_3__2 : rule__XFeatureCall__Group_3__2__Impl ;
     public final void rule__XFeatureCall__Group_3__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18821:1: ( rule__XFeatureCall__Group_3__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18822:2: rule__XFeatureCall__Group_3__2__Impl
+            // InternalCheck.g:18821:1: ( rule__XFeatureCall__Group_3__2__Impl )
+            // InternalCheck.g:18822:2: rule__XFeatureCall__Group_3__2__Impl
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3__2__Impl_in_rule__XFeatureCall__Group_3__238072);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_3__2__Impl();
 
             state._fsp--;
@@ -54226,22 +54226,22 @@ public final void rule__XFeatureCall__Group_3__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18828:1: rule__XFeatureCall__Group_3__2__Impl : ( ')' ) ;
+    // InternalCheck.g:18828:1: rule__XFeatureCall__Group_3__2__Impl : ( ')' ) ;
     public final void rule__XFeatureCall__Group_3__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18832:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18833:1: ( ')' )
+            // InternalCheck.g:18832:1: ( ( ')' ) )
+            // InternalCheck.g:18833:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18833:1: ( ')' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18834:1: ')'
+            // InternalCheck.g:18833:1: ( ')' )
+            // InternalCheck.g:18834:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getRightParenthesisKeyword_3_2()); 
             }
-            match(input,73,FOLLOW_73_in_rule__XFeatureCall__Group_3__2__Impl38100); if (state.failed) return ;
+            match(input,73,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFeatureCallAccess().getRightParenthesisKeyword_3_2()); 
             }
@@ -54267,21 +54267,21 @@ public final void rule__XFeatureCall__Group_3__2__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18853:1: rule__XFeatureCall__Group_3_1_1__0 : rule__XFeatureCall__Group_3_1_1__0__Impl rule__XFeatureCall__Group_3_1_1__1 ;
+    // InternalCheck.g:18853:1: rule__XFeatureCall__Group_3_1_1__0 : rule__XFeatureCall__Group_3_1_1__0__Impl rule__XFeatureCall__Group_3_1_1__1 ;
     public final void rule__XFeatureCall__Group_3_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18857:1: ( rule__XFeatureCall__Group_3_1_1__0__Impl rule__XFeatureCall__Group_3_1_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18858:2: rule__XFeatureCall__Group_3_1_1__0__Impl rule__XFeatureCall__Group_3_1_1__1
+            // InternalCheck.g:18857:1: ( rule__XFeatureCall__Group_3_1_1__0__Impl rule__XFeatureCall__Group_3_1_1__1 )
+            // InternalCheck.g:18858:2: rule__XFeatureCall__Group_3_1_1__0__Impl rule__XFeatureCall__Group_3_1_1__1
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3_1_1__0__Impl_in_rule__XFeatureCall__Group_3_1_1__038137);
+            pushFollow(FOLLOW_20);
             rule__XFeatureCall__Group_3_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3_1_1__1_in_rule__XFeatureCall__Group_3_1_1__038140);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_3_1_1__1();
 
             state._fsp--;
@@ -54305,25 +54305,25 @@ public final void rule__XFeatureCall__Group_3_1_1__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18865:1: rule__XFeatureCall__Group_3_1_1__0__Impl : ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) ) ;
+    // InternalCheck.g:18865:1: rule__XFeatureCall__Group_3_1_1__0__Impl : ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) ) ;
     public final void rule__XFeatureCall__Group_3_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18869:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18870:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) )
+            // InternalCheck.g:18869:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) ) )
+            // InternalCheck.g:18870:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18870:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18871:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 )
+            // InternalCheck.g:18870:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) )
+            // InternalCheck.g:18871:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsAssignment_3_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18872:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18872:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0
+            // InternalCheck.g:18872:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 )
+            // InternalCheck.g:18872:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0_in_rule__XFeatureCall__Group_3_1_1__0__Impl38167);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0();
 
             state._fsp--;
@@ -54356,16 +54356,16 @@ public final void rule__XFeatureCall__Group_3_1_1__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18882:1: rule__XFeatureCall__Group_3_1_1__1 : rule__XFeatureCall__Group_3_1_1__1__Impl ;
+    // InternalCheck.g:18882:1: rule__XFeatureCall__Group_3_1_1__1 : rule__XFeatureCall__Group_3_1_1__1__Impl ;
     public final void rule__XFeatureCall__Group_3_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18886:1: ( rule__XFeatureCall__Group_3_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18887:2: rule__XFeatureCall__Group_3_1_1__1__Impl
+            // InternalCheck.g:18886:1: ( rule__XFeatureCall__Group_3_1_1__1__Impl )
+            // InternalCheck.g:18887:2: rule__XFeatureCall__Group_3_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3_1_1__1__Impl_in_rule__XFeatureCall__Group_3_1_1__138197);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_3_1_1__1__Impl();
 
             state._fsp--;
@@ -54389,22 +54389,22 @@ public final void rule__XFeatureCall__Group_3_1_1__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18893:1: rule__XFeatureCall__Group_3_1_1__1__Impl : ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* ) ;
+    // InternalCheck.g:18893:1: rule__XFeatureCall__Group_3_1_1__1__Impl : ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* ) ;
     public final void rule__XFeatureCall__Group_3_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18897:1: ( ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18898:1: ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* )
+            // InternalCheck.g:18897:1: ( ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* ) )
+            // InternalCheck.g:18898:1: ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18898:1: ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18899:1: ( rule__XFeatureCall__Group_3_1_1_1__0 )*
+            // InternalCheck.g:18898:1: ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* )
+            // InternalCheck.g:18899:1: ( rule__XFeatureCall__Group_3_1_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getGroup_3_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18900:1: ( rule__XFeatureCall__Group_3_1_1_1__0 )*
+            // InternalCheck.g:18900:1: ( rule__XFeatureCall__Group_3_1_1_1__0 )*
             loop142:
             do {
                 int alt142=2;
@@ -54417,9 +54417,9 @@ public final void rule__XFeatureCall__Group_3_1_1__1__Impl() throws RecognitionE
 
                 switch (alt142) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18900:2: rule__XFeatureCall__Group_3_1_1_1__0
+            	    // InternalCheck.g:18900:2: rule__XFeatureCall__Group_3_1_1_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XFeatureCall__Group_3_1_1_1__0_in_rule__XFeatureCall__Group_3_1_1__1__Impl38224);
+            	    pushFollow(FOLLOW_21);
             	    rule__XFeatureCall__Group_3_1_1_1__0();
 
             	    state._fsp--;
@@ -54458,21 +54458,21 @@ public final void rule__XFeatureCall__Group_3_1_1__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18914:1: rule__XFeatureCall__Group_3_1_1_1__0 : rule__XFeatureCall__Group_3_1_1_1__0__Impl rule__XFeatureCall__Group_3_1_1_1__1 ;
+    // InternalCheck.g:18914:1: rule__XFeatureCall__Group_3_1_1_1__0 : rule__XFeatureCall__Group_3_1_1_1__0__Impl rule__XFeatureCall__Group_3_1_1_1__1 ;
     public final void rule__XFeatureCall__Group_3_1_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18918:1: ( rule__XFeatureCall__Group_3_1_1_1__0__Impl rule__XFeatureCall__Group_3_1_1_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18919:2: rule__XFeatureCall__Group_3_1_1_1__0__Impl rule__XFeatureCall__Group_3_1_1_1__1
+            // InternalCheck.g:18918:1: ( rule__XFeatureCall__Group_3_1_1_1__0__Impl rule__XFeatureCall__Group_3_1_1_1__1 )
+            // InternalCheck.g:18919:2: rule__XFeatureCall__Group_3_1_1_1__0__Impl rule__XFeatureCall__Group_3_1_1_1__1
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3_1_1_1__0__Impl_in_rule__XFeatureCall__Group_3_1_1_1__038259);
+            pushFollow(FOLLOW_32);
             rule__XFeatureCall__Group_3_1_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3_1_1_1__1_in_rule__XFeatureCall__Group_3_1_1_1__038262);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_3_1_1_1__1();
 
             state._fsp--;
@@ -54496,22 +54496,22 @@ public final void rule__XFeatureCall__Group_3_1_1_1__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18926:1: rule__XFeatureCall__Group_3_1_1_1__0__Impl : ( ',' ) ;
+    // InternalCheck.g:18926:1: rule__XFeatureCall__Group_3_1_1_1__0__Impl : ( ',' ) ;
     public final void rule__XFeatureCall__Group_3_1_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18930:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18931:1: ( ',' )
+            // InternalCheck.g:18930:1: ( ( ',' ) )
+            // InternalCheck.g:18931:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18931:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18932:1: ','
+            // InternalCheck.g:18931:1: ( ',' )
+            // InternalCheck.g:18932:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getCommaKeyword_3_1_1_1_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XFeatureCall__Group_3_1_1_1__0__Impl38290); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFeatureCallAccess().getCommaKeyword_3_1_1_1_0()); 
             }
@@ -54537,16 +54537,16 @@ public final void rule__XFeatureCall__Group_3_1_1_1__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18945:1: rule__XFeatureCall__Group_3_1_1_1__1 : rule__XFeatureCall__Group_3_1_1_1__1__Impl ;
+    // InternalCheck.g:18945:1: rule__XFeatureCall__Group_3_1_1_1__1 : rule__XFeatureCall__Group_3_1_1_1__1__Impl ;
     public final void rule__XFeatureCall__Group_3_1_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18949:1: ( rule__XFeatureCall__Group_3_1_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18950:2: rule__XFeatureCall__Group_3_1_1_1__1__Impl
+            // InternalCheck.g:18949:1: ( rule__XFeatureCall__Group_3_1_1_1__1__Impl )
+            // InternalCheck.g:18950:2: rule__XFeatureCall__Group_3_1_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3_1_1_1__1__Impl_in_rule__XFeatureCall__Group_3_1_1_1__138321);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_3_1_1_1__1__Impl();
 
             state._fsp--;
@@ -54570,25 +54570,25 @@ public final void rule__XFeatureCall__Group_3_1_1_1__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18956:1: rule__XFeatureCall__Group_3_1_1_1__1__Impl : ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) ) ;
+    // InternalCheck.g:18956:1: rule__XFeatureCall__Group_3_1_1_1__1__Impl : ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) ) ;
     public final void rule__XFeatureCall__Group_3_1_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18960:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18961:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) )
+            // InternalCheck.g:18960:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) ) )
+            // InternalCheck.g:18961:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18961:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18962:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 )
+            // InternalCheck.g:18961:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) )
+            // InternalCheck.g:18962:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsAssignment_3_1_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18963:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18963:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1
+            // InternalCheck.g:18963:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 )
+            // InternalCheck.g:18963:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1_in_rule__XFeatureCall__Group_3_1_1_1__1__Impl38348);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1();
 
             state._fsp--;
@@ -54621,21 +54621,21 @@ public final void rule__XFeatureCall__Group_3_1_1_1__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XConstructorCall__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18977:1: rule__XConstructorCall__Group__0 : rule__XConstructorCall__Group__0__Impl rule__XConstructorCall__Group__1 ;
+    // InternalCheck.g:18977:1: rule__XConstructorCall__Group__0 : rule__XConstructorCall__Group__0__Impl rule__XConstructorCall__Group__1 ;
     public final void rule__XConstructorCall__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18981:1: ( rule__XConstructorCall__Group__0__Impl rule__XConstructorCall__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18982:2: rule__XConstructorCall__Group__0__Impl rule__XConstructorCall__Group__1
+            // InternalCheck.g:18981:1: ( rule__XConstructorCall__Group__0__Impl rule__XConstructorCall__Group__1 )
+            // InternalCheck.g:18982:2: rule__XConstructorCall__Group__0__Impl rule__XConstructorCall__Group__1
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__0__Impl_in_rule__XConstructorCall__Group__038382);
+            pushFollow(FOLLOW_103);
             rule__XConstructorCall__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__1_in_rule__XConstructorCall__Group__038385);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group__1();
 
             state._fsp--;
@@ -54659,23 +54659,23 @@ public final void rule__XConstructorCall__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XConstructorCall__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18989:1: rule__XConstructorCall__Group__0__Impl : ( () ) ;
+    // InternalCheck.g:18989:1: rule__XConstructorCall__Group__0__Impl : ( () ) ;
     public final void rule__XConstructorCall__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18993:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18994:1: ( () )
+            // InternalCheck.g:18993:1: ( ( () ) )
+            // InternalCheck.g:18994:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18994:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18995:1: ()
+            // InternalCheck.g:18994:1: ( () )
+            // InternalCheck.g:18995:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getXConstructorCallAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18996:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18998:1: 
+            // InternalCheck.g:18996:1: ()
+            // InternalCheck.g:18998:1: 
             {
             }
 
@@ -54700,21 +54700,21 @@ public final void rule__XConstructorCall__Group__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XConstructorCall__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19008:1: rule__XConstructorCall__Group__1 : rule__XConstructorCall__Group__1__Impl rule__XConstructorCall__Group__2 ;
+    // InternalCheck.g:19008:1: rule__XConstructorCall__Group__1 : rule__XConstructorCall__Group__1__Impl rule__XConstructorCall__Group__2 ;
     public final void rule__XConstructorCall__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19012:1: ( rule__XConstructorCall__Group__1__Impl rule__XConstructorCall__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19013:2: rule__XConstructorCall__Group__1__Impl rule__XConstructorCall__Group__2
+            // InternalCheck.g:19012:1: ( rule__XConstructorCall__Group__1__Impl rule__XConstructorCall__Group__2 )
+            // InternalCheck.g:19013:2: rule__XConstructorCall__Group__1__Impl rule__XConstructorCall__Group__2
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__1__Impl_in_rule__XConstructorCall__Group__138443);
+            pushFollow(FOLLOW_4);
             rule__XConstructorCall__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__2_in_rule__XConstructorCall__Group__138446);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group__2();
 
             state._fsp--;
@@ -54738,22 +54738,22 @@ public final void rule__XConstructorCall__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XConstructorCall__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19020:1: rule__XConstructorCall__Group__1__Impl : ( 'new' ) ;
+    // InternalCheck.g:19020:1: rule__XConstructorCall__Group__1__Impl : ( 'new' ) ;
     public final void rule__XConstructorCall__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19024:1: ( ( 'new' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19025:1: ( 'new' )
+            // InternalCheck.g:19024:1: ( ( 'new' ) )
+            // InternalCheck.g:19025:1: ( 'new' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19025:1: ( 'new' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19026:1: 'new'
+            // InternalCheck.g:19025:1: ( 'new' )
+            // InternalCheck.g:19026:1: 'new'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getNewKeyword_1()); 
             }
-            match(input,92,FOLLOW_92_in_rule__XConstructorCall__Group__1__Impl38474); if (state.failed) return ;
+            match(input,92,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstructorCallAccess().getNewKeyword_1()); 
             }
@@ -54779,21 +54779,21 @@ public final void rule__XConstructorCall__Group__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XConstructorCall__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19039:1: rule__XConstructorCall__Group__2 : rule__XConstructorCall__Group__2__Impl rule__XConstructorCall__Group__3 ;
+    // InternalCheck.g:19039:1: rule__XConstructorCall__Group__2 : rule__XConstructorCall__Group__2__Impl rule__XConstructorCall__Group__3 ;
     public final void rule__XConstructorCall__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19043:1: ( rule__XConstructorCall__Group__2__Impl rule__XConstructorCall__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19044:2: rule__XConstructorCall__Group__2__Impl rule__XConstructorCall__Group__3
+            // InternalCheck.g:19043:1: ( rule__XConstructorCall__Group__2__Impl rule__XConstructorCall__Group__3 )
+            // InternalCheck.g:19044:2: rule__XConstructorCall__Group__2__Impl rule__XConstructorCall__Group__3
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__2__Impl_in_rule__XConstructorCall__Group__238505);
+            pushFollow(FOLLOW_104);
             rule__XConstructorCall__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__3_in_rule__XConstructorCall__Group__238508);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group__3();
 
             state._fsp--;
@@ -54817,25 +54817,25 @@ public final void rule__XConstructorCall__Group__2() throws RecognitionException
 
 
     // $ANTLR start "rule__XConstructorCall__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19051:1: rule__XConstructorCall__Group__2__Impl : ( ( rule__XConstructorCall__ConstructorAssignment_2 ) ) ;
+    // InternalCheck.g:19051:1: rule__XConstructorCall__Group__2__Impl : ( ( rule__XConstructorCall__ConstructorAssignment_2 ) ) ;
     public final void rule__XConstructorCall__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19055:1: ( ( ( rule__XConstructorCall__ConstructorAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19056:1: ( ( rule__XConstructorCall__ConstructorAssignment_2 ) )
+            // InternalCheck.g:19055:1: ( ( ( rule__XConstructorCall__ConstructorAssignment_2 ) ) )
+            // InternalCheck.g:19056:1: ( ( rule__XConstructorCall__ConstructorAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19056:1: ( ( rule__XConstructorCall__ConstructorAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19057:1: ( rule__XConstructorCall__ConstructorAssignment_2 )
+            // InternalCheck.g:19056:1: ( ( rule__XConstructorCall__ConstructorAssignment_2 ) )
+            // InternalCheck.g:19057:1: ( rule__XConstructorCall__ConstructorAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getConstructorAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19058:1: ( rule__XConstructorCall__ConstructorAssignment_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19058:2: rule__XConstructorCall__ConstructorAssignment_2
+            // InternalCheck.g:19058:1: ( rule__XConstructorCall__ConstructorAssignment_2 )
+            // InternalCheck.g:19058:2: rule__XConstructorCall__ConstructorAssignment_2
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__ConstructorAssignment_2_in_rule__XConstructorCall__Group__2__Impl38535);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__ConstructorAssignment_2();
 
             state._fsp--;
@@ -54868,21 +54868,21 @@ public final void rule__XConstructorCall__Group__2__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XConstructorCall__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19068:1: rule__XConstructorCall__Group__3 : rule__XConstructorCall__Group__3__Impl rule__XConstructorCall__Group__4 ;
+    // InternalCheck.g:19068:1: rule__XConstructorCall__Group__3 : rule__XConstructorCall__Group__3__Impl rule__XConstructorCall__Group__4 ;
     public final void rule__XConstructorCall__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19072:1: ( rule__XConstructorCall__Group__3__Impl rule__XConstructorCall__Group__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19073:2: rule__XConstructorCall__Group__3__Impl rule__XConstructorCall__Group__4
+            // InternalCheck.g:19072:1: ( rule__XConstructorCall__Group__3__Impl rule__XConstructorCall__Group__4 )
+            // InternalCheck.g:19073:2: rule__XConstructorCall__Group__3__Impl rule__XConstructorCall__Group__4
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__3__Impl_in_rule__XConstructorCall__Group__338565);
+            pushFollow(FOLLOW_104);
             rule__XConstructorCall__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__4_in_rule__XConstructorCall__Group__338568);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group__4();
 
             state._fsp--;
@@ -54906,29 +54906,29 @@ public final void rule__XConstructorCall__Group__3() throws RecognitionException
 
 
     // $ANTLR start "rule__XConstructorCall__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19080:1: rule__XConstructorCall__Group__3__Impl : ( ( rule__XConstructorCall__Group_3__0 )? ) ;
+    // InternalCheck.g:19080:1: rule__XConstructorCall__Group__3__Impl : ( ( rule__XConstructorCall__Group_3__0 )? ) ;
     public final void rule__XConstructorCall__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19084:1: ( ( ( rule__XConstructorCall__Group_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19085:1: ( ( rule__XConstructorCall__Group_3__0 )? )
+            // InternalCheck.g:19084:1: ( ( ( rule__XConstructorCall__Group_3__0 )? ) )
+            // InternalCheck.g:19085:1: ( ( rule__XConstructorCall__Group_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19085:1: ( ( rule__XConstructorCall__Group_3__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19086:1: ( rule__XConstructorCall__Group_3__0 )?
+            // InternalCheck.g:19085:1: ( ( rule__XConstructorCall__Group_3__0 )? )
+            // InternalCheck.g:19086:1: ( rule__XConstructorCall__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getGroup_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19087:1: ( rule__XConstructorCall__Group_3__0 )?
+            // InternalCheck.g:19087:1: ( rule__XConstructorCall__Group_3__0 )?
             int alt143=2;
             alt143 = dfa143.predict(input);
             switch (alt143) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19087:2: rule__XConstructorCall__Group_3__0
+                    // InternalCheck.g:19087:2: rule__XConstructorCall__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__XConstructorCall__Group_3__0_in_rule__XConstructorCall__Group__3__Impl38595);
+                    pushFollow(FOLLOW_2);
                     rule__XConstructorCall__Group_3__0();
 
                     state._fsp--;
@@ -54964,21 +54964,21 @@ public final void rule__XConstructorCall__Group__3__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XConstructorCall__Group__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19097:1: rule__XConstructorCall__Group__4 : rule__XConstructorCall__Group__4__Impl rule__XConstructorCall__Group__5 ;
+    // InternalCheck.g:19097:1: rule__XConstructorCall__Group__4 : rule__XConstructorCall__Group__4__Impl rule__XConstructorCall__Group__5 ;
     public final void rule__XConstructorCall__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19101:1: ( rule__XConstructorCall__Group__4__Impl rule__XConstructorCall__Group__5 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19102:2: rule__XConstructorCall__Group__4__Impl rule__XConstructorCall__Group__5
+            // InternalCheck.g:19101:1: ( rule__XConstructorCall__Group__4__Impl rule__XConstructorCall__Group__5 )
+            // InternalCheck.g:19102:2: rule__XConstructorCall__Group__4__Impl rule__XConstructorCall__Group__5
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__4__Impl_in_rule__XConstructorCall__Group__438626);
+            pushFollow(FOLLOW_104);
             rule__XConstructorCall__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__5_in_rule__XConstructorCall__Group__438629);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group__5();
 
             state._fsp--;
@@ -55002,29 +55002,29 @@ public final void rule__XConstructorCall__Group__4() throws RecognitionException
 
 
     // $ANTLR start "rule__XConstructorCall__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19109:1: rule__XConstructorCall__Group__4__Impl : ( ( rule__XConstructorCall__Group_4__0 )? ) ;
+    // InternalCheck.g:19109:1: rule__XConstructorCall__Group__4__Impl : ( ( rule__XConstructorCall__Group_4__0 )? ) ;
     public final void rule__XConstructorCall__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19113:1: ( ( ( rule__XConstructorCall__Group_4__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19114:1: ( ( rule__XConstructorCall__Group_4__0 )? )
+            // InternalCheck.g:19113:1: ( ( ( rule__XConstructorCall__Group_4__0 )? ) )
+            // InternalCheck.g:19114:1: ( ( rule__XConstructorCall__Group_4__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19114:1: ( ( rule__XConstructorCall__Group_4__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19115:1: ( rule__XConstructorCall__Group_4__0 )?
+            // InternalCheck.g:19114:1: ( ( rule__XConstructorCall__Group_4__0 )? )
+            // InternalCheck.g:19115:1: ( rule__XConstructorCall__Group_4__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getGroup_4()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19116:1: ( rule__XConstructorCall__Group_4__0 )?
+            // InternalCheck.g:19116:1: ( rule__XConstructorCall__Group_4__0 )?
             int alt144=2;
             alt144 = dfa144.predict(input);
             switch (alt144) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19116:2: rule__XConstructorCall__Group_4__0
+                    // InternalCheck.g:19116:2: rule__XConstructorCall__Group_4__0
                     {
-                    pushFollow(FOLLOW_rule__XConstructorCall__Group_4__0_in_rule__XConstructorCall__Group__4__Impl38656);
+                    pushFollow(FOLLOW_2);
                     rule__XConstructorCall__Group_4__0();
 
                     state._fsp--;
@@ -55060,16 +55060,16 @@ public final void rule__XConstructorCall__Group__4__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XConstructorCall__Group__5"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19126:1: rule__XConstructorCall__Group__5 : rule__XConstructorCall__Group__5__Impl ;
+    // InternalCheck.g:19126:1: rule__XConstructorCall__Group__5 : rule__XConstructorCall__Group__5__Impl ;
     public final void rule__XConstructorCall__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19130:1: ( rule__XConstructorCall__Group__5__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19131:2: rule__XConstructorCall__Group__5__Impl
+            // InternalCheck.g:19130:1: ( rule__XConstructorCall__Group__5__Impl )
+            // InternalCheck.g:19131:2: rule__XConstructorCall__Group__5__Impl
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__5__Impl_in_rule__XConstructorCall__Group__538687);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group__5__Impl();
 
             state._fsp--;
@@ -55093,29 +55093,29 @@ public final void rule__XConstructorCall__Group__5() throws RecognitionException
 
 
     // $ANTLR start "rule__XConstructorCall__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19137:1: rule__XConstructorCall__Group__5__Impl : ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? ) ;
+    // InternalCheck.g:19137:1: rule__XConstructorCall__Group__5__Impl : ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? ) ;
     public final void rule__XConstructorCall__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19141:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19142:1: ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? )
+            // InternalCheck.g:19141:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? ) )
+            // InternalCheck.g:19142:1: ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19142:1: ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19143:1: ( rule__XConstructorCall__ArgumentsAssignment_5 )?
+            // InternalCheck.g:19142:1: ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? )
+            // InternalCheck.g:19143:1: ( rule__XConstructorCall__ArgumentsAssignment_5 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getArgumentsAssignment_5()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19144:1: ( rule__XConstructorCall__ArgumentsAssignment_5 )?
+            // InternalCheck.g:19144:1: ( rule__XConstructorCall__ArgumentsAssignment_5 )?
             int alt145=2;
             alt145 = dfa145.predict(input);
             switch (alt145) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19144:2: rule__XConstructorCall__ArgumentsAssignment_5
+                    // InternalCheck.g:19144:2: rule__XConstructorCall__ArgumentsAssignment_5
                     {
-                    pushFollow(FOLLOW_rule__XConstructorCall__ArgumentsAssignment_5_in_rule__XConstructorCall__Group__5__Impl38714);
+                    pushFollow(FOLLOW_2);
                     rule__XConstructorCall__ArgumentsAssignment_5();
 
                     state._fsp--;
@@ -55151,21 +55151,21 @@ public final void rule__XConstructorCall__Group__5__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19166:1: rule__XConstructorCall__Group_3__0 : rule__XConstructorCall__Group_3__0__Impl rule__XConstructorCall__Group_3__1 ;
+    // InternalCheck.g:19166:1: rule__XConstructorCall__Group_3__0 : rule__XConstructorCall__Group_3__0__Impl rule__XConstructorCall__Group_3__1 ;
     public final void rule__XConstructorCall__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19170:1: ( rule__XConstructorCall__Group_3__0__Impl rule__XConstructorCall__Group_3__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19171:2: rule__XConstructorCall__Group_3__0__Impl rule__XConstructorCall__Group_3__1
+            // InternalCheck.g:19170:1: ( rule__XConstructorCall__Group_3__0__Impl rule__XConstructorCall__Group_3__1 )
+            // InternalCheck.g:19171:2: rule__XConstructorCall__Group_3__0__Impl rule__XConstructorCall__Group_3__1
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_3__0__Impl_in_rule__XConstructorCall__Group_3__038757);
+            pushFollow(FOLLOW_79);
             rule__XConstructorCall__Group_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_3__1_in_rule__XConstructorCall__Group_3__038760);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_3__1();
 
             state._fsp--;
@@ -55189,25 +55189,25 @@ public final void rule__XConstructorCall__Group_3__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19178:1: rule__XConstructorCall__Group_3__0__Impl : ( ( '<' ) ) ;
+    // InternalCheck.g:19178:1: rule__XConstructorCall__Group_3__0__Impl : ( ( '<' ) ) ;
     public final void rule__XConstructorCall__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19182:1: ( ( ( '<' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19183:1: ( ( '<' ) )
+            // InternalCheck.g:19182:1: ( ( ( '<' ) ) )
+            // InternalCheck.g:19183:1: ( ( '<' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19183:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19184:1: ( '<' )
+            // InternalCheck.g:19183:1: ( ( '<' ) )
+            // InternalCheck.g:19184:1: ( '<' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getLessThanSignKeyword_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19185:1: ( '<' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19186:2: '<'
+            // InternalCheck.g:19185:1: ( '<' )
+            // InternalCheck.g:19186:2: '<'
             {
-            match(input,47,FOLLOW_47_in_rule__XConstructorCall__Group_3__0__Impl38789); if (state.failed) return ;
+            match(input,47,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -55236,21 +55236,21 @@ public final void rule__XConstructorCall__Group_3__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19197:1: rule__XConstructorCall__Group_3__1 : rule__XConstructorCall__Group_3__1__Impl rule__XConstructorCall__Group_3__2 ;
+    // InternalCheck.g:19197:1: rule__XConstructorCall__Group_3__1 : rule__XConstructorCall__Group_3__1__Impl rule__XConstructorCall__Group_3__2 ;
     public final void rule__XConstructorCall__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19201:1: ( rule__XConstructorCall__Group_3__1__Impl rule__XConstructorCall__Group_3__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19202:2: rule__XConstructorCall__Group_3__1__Impl rule__XConstructorCall__Group_3__2
+            // InternalCheck.g:19201:1: ( rule__XConstructorCall__Group_3__1__Impl rule__XConstructorCall__Group_3__2 )
+            // InternalCheck.g:19202:2: rule__XConstructorCall__Group_3__1__Impl rule__XConstructorCall__Group_3__2
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_3__1__Impl_in_rule__XConstructorCall__Group_3__138821);
+            pushFollow(FOLLOW_80);
             rule__XConstructorCall__Group_3__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_3__2_in_rule__XConstructorCall__Group_3__138824);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_3__2();
 
             state._fsp--;
@@ -55274,25 +55274,25 @@ public final void rule__XConstructorCall__Group_3__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19209:1: rule__XConstructorCall__Group_3__1__Impl : ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) ) ;
+    // InternalCheck.g:19209:1: rule__XConstructorCall__Group_3__1__Impl : ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) ) ;
     public final void rule__XConstructorCall__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19213:1: ( ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19214:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) )
+            // InternalCheck.g:19213:1: ( ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) ) )
+            // InternalCheck.g:19214:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19214:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19215:1: ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 )
+            // InternalCheck.g:19214:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) )
+            // InternalCheck.g:19215:1: ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getTypeArgumentsAssignment_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19216:1: ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19216:2: rule__XConstructorCall__TypeArgumentsAssignment_3_1
+            // InternalCheck.g:19216:1: ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 )
+            // InternalCheck.g:19216:2: rule__XConstructorCall__TypeArgumentsAssignment_3_1
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__TypeArgumentsAssignment_3_1_in_rule__XConstructorCall__Group_3__1__Impl38851);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__TypeArgumentsAssignment_3_1();
 
             state._fsp--;
@@ -55325,21 +55325,21 @@ public final void rule__XConstructorCall__Group_3__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19226:1: rule__XConstructorCall__Group_3__2 : rule__XConstructorCall__Group_3__2__Impl rule__XConstructorCall__Group_3__3 ;
+    // InternalCheck.g:19226:1: rule__XConstructorCall__Group_3__2 : rule__XConstructorCall__Group_3__2__Impl rule__XConstructorCall__Group_3__3 ;
     public final void rule__XConstructorCall__Group_3__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19230:1: ( rule__XConstructorCall__Group_3__2__Impl rule__XConstructorCall__Group_3__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19231:2: rule__XConstructorCall__Group_3__2__Impl rule__XConstructorCall__Group_3__3
+            // InternalCheck.g:19230:1: ( rule__XConstructorCall__Group_3__2__Impl rule__XConstructorCall__Group_3__3 )
+            // InternalCheck.g:19231:2: rule__XConstructorCall__Group_3__2__Impl rule__XConstructorCall__Group_3__3
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_3__2__Impl_in_rule__XConstructorCall__Group_3__238881);
+            pushFollow(FOLLOW_80);
             rule__XConstructorCall__Group_3__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_3__3_in_rule__XConstructorCall__Group_3__238884);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_3__3();
 
             state._fsp--;
@@ -55363,22 +55363,22 @@ public final void rule__XConstructorCall__Group_3__2() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19238:1: rule__XConstructorCall__Group_3__2__Impl : ( ( rule__XConstructorCall__Group_3_2__0 )* ) ;
+    // InternalCheck.g:19238:1: rule__XConstructorCall__Group_3__2__Impl : ( ( rule__XConstructorCall__Group_3_2__0 )* ) ;
     public final void rule__XConstructorCall__Group_3__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19242:1: ( ( ( rule__XConstructorCall__Group_3_2__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19243:1: ( ( rule__XConstructorCall__Group_3_2__0 )* )
+            // InternalCheck.g:19242:1: ( ( ( rule__XConstructorCall__Group_3_2__0 )* ) )
+            // InternalCheck.g:19243:1: ( ( rule__XConstructorCall__Group_3_2__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19243:1: ( ( rule__XConstructorCall__Group_3_2__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19244:1: ( rule__XConstructorCall__Group_3_2__0 )*
+            // InternalCheck.g:19243:1: ( ( rule__XConstructorCall__Group_3_2__0 )* )
+            // InternalCheck.g:19244:1: ( rule__XConstructorCall__Group_3_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getGroup_3_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19245:1: ( rule__XConstructorCall__Group_3_2__0 )*
+            // InternalCheck.g:19245:1: ( rule__XConstructorCall__Group_3_2__0 )*
             loop146:
             do {
                 int alt146=2;
@@ -55391,9 +55391,9 @@ public final void rule__XConstructorCall__Group_3__2__Impl() throws RecognitionE
 
                 switch (alt146) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19245:2: rule__XConstructorCall__Group_3_2__0
+            	    // InternalCheck.g:19245:2: rule__XConstructorCall__Group_3_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__XConstructorCall__Group_3_2__0_in_rule__XConstructorCall__Group_3__2__Impl38911);
+            	    pushFollow(FOLLOW_21);
             	    rule__XConstructorCall__Group_3_2__0();
 
             	    state._fsp--;
@@ -55432,16 +55432,16 @@ public final void rule__XConstructorCall__Group_3__2__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19255:1: rule__XConstructorCall__Group_3__3 : rule__XConstructorCall__Group_3__3__Impl ;
+    // InternalCheck.g:19255:1: rule__XConstructorCall__Group_3__3 : rule__XConstructorCall__Group_3__3__Impl ;
     public final void rule__XConstructorCall__Group_3__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19259:1: ( rule__XConstructorCall__Group_3__3__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19260:2: rule__XConstructorCall__Group_3__3__Impl
+            // InternalCheck.g:19259:1: ( rule__XConstructorCall__Group_3__3__Impl )
+            // InternalCheck.g:19260:2: rule__XConstructorCall__Group_3__3__Impl
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_3__3__Impl_in_rule__XConstructorCall__Group_3__338942);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_3__3__Impl();
 
             state._fsp--;
@@ -55465,22 +55465,22 @@ public final void rule__XConstructorCall__Group_3__3() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19266:1: rule__XConstructorCall__Group_3__3__Impl : ( '>' ) ;
+    // InternalCheck.g:19266:1: rule__XConstructorCall__Group_3__3__Impl : ( '>' ) ;
     public final void rule__XConstructorCall__Group_3__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19270:1: ( ( '>' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19271:1: ( '>' )
+            // InternalCheck.g:19270:1: ( ( '>' ) )
+            // InternalCheck.g:19271:1: ( '>' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19271:1: ( '>' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19272:1: '>'
+            // InternalCheck.g:19271:1: ( '>' )
+            // InternalCheck.g:19272:1: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getGreaterThanSignKeyword_3_3()); 
             }
-            match(input,46,FOLLOW_46_in_rule__XConstructorCall__Group_3__3__Impl38970); if (state.failed) return ;
+            match(input,46,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstructorCallAccess().getGreaterThanSignKeyword_3_3()); 
             }
@@ -55506,21 +55506,21 @@ public final void rule__XConstructorCall__Group_3__3__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3_2__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19293:1: rule__XConstructorCall__Group_3_2__0 : rule__XConstructorCall__Group_3_2__0__Impl rule__XConstructorCall__Group_3_2__1 ;
+    // InternalCheck.g:19293:1: rule__XConstructorCall__Group_3_2__0 : rule__XConstructorCall__Group_3_2__0__Impl rule__XConstructorCall__Group_3_2__1 ;
     public final void rule__XConstructorCall__Group_3_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19297:1: ( rule__XConstructorCall__Group_3_2__0__Impl rule__XConstructorCall__Group_3_2__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19298:2: rule__XConstructorCall__Group_3_2__0__Impl rule__XConstructorCall__Group_3_2__1
+            // InternalCheck.g:19297:1: ( rule__XConstructorCall__Group_3_2__0__Impl rule__XConstructorCall__Group_3_2__1 )
+            // InternalCheck.g:19298:2: rule__XConstructorCall__Group_3_2__0__Impl rule__XConstructorCall__Group_3_2__1
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_3_2__0__Impl_in_rule__XConstructorCall__Group_3_2__039009);
+            pushFollow(FOLLOW_79);
             rule__XConstructorCall__Group_3_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_3_2__1_in_rule__XConstructorCall__Group_3_2__039012);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_3_2__1();
 
             state._fsp--;
@@ -55544,22 +55544,22 @@ public final void rule__XConstructorCall__Group_3_2__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3_2__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19305:1: rule__XConstructorCall__Group_3_2__0__Impl : ( ',' ) ;
+    // InternalCheck.g:19305:1: rule__XConstructorCall__Group_3_2__0__Impl : ( ',' ) ;
     public final void rule__XConstructorCall__Group_3_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19309:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19310:1: ( ',' )
+            // InternalCheck.g:19309:1: ( ( ',' ) )
+            // InternalCheck.g:19310:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19310:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19311:1: ','
+            // InternalCheck.g:19310:1: ( ',' )
+            // InternalCheck.g:19311:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getCommaKeyword_3_2_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XConstructorCall__Group_3_2__0__Impl39040); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstructorCallAccess().getCommaKeyword_3_2_0()); 
             }
@@ -55585,16 +55585,16 @@ public final void rule__XConstructorCall__Group_3_2__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3_2__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19324:1: rule__XConstructorCall__Group_3_2__1 : rule__XConstructorCall__Group_3_2__1__Impl ;
+    // InternalCheck.g:19324:1: rule__XConstructorCall__Group_3_2__1 : rule__XConstructorCall__Group_3_2__1__Impl ;
     public final void rule__XConstructorCall__Group_3_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19328:1: ( rule__XConstructorCall__Group_3_2__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19329:2: rule__XConstructorCall__Group_3_2__1__Impl
+            // InternalCheck.g:19328:1: ( rule__XConstructorCall__Group_3_2__1__Impl )
+            // InternalCheck.g:19329:2: rule__XConstructorCall__Group_3_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_3_2__1__Impl_in_rule__XConstructorCall__Group_3_2__139071);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_3_2__1__Impl();
 
             state._fsp--;
@@ -55618,25 +55618,25 @@ public final void rule__XConstructorCall__Group_3_2__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3_2__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19335:1: rule__XConstructorCall__Group_3_2__1__Impl : ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) ) ;
+    // InternalCheck.g:19335:1: rule__XConstructorCall__Group_3_2__1__Impl : ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) ) ;
     public final void rule__XConstructorCall__Group_3_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19339:1: ( ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19340:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) )
+            // InternalCheck.g:19339:1: ( ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) ) )
+            // InternalCheck.g:19340:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19340:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19341:1: ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 )
+            // InternalCheck.g:19340:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) )
+            // InternalCheck.g:19341:1: ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getTypeArgumentsAssignment_3_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19342:1: ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19342:2: rule__XConstructorCall__TypeArgumentsAssignment_3_2_1
+            // InternalCheck.g:19342:1: ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 )
+            // InternalCheck.g:19342:2: rule__XConstructorCall__TypeArgumentsAssignment_3_2_1
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__TypeArgumentsAssignment_3_2_1_in_rule__XConstructorCall__Group_3_2__1__Impl39098);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__TypeArgumentsAssignment_3_2_1();
 
             state._fsp--;
@@ -55669,21 +55669,21 @@ public final void rule__XConstructorCall__Group_3_2__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19356:1: rule__XConstructorCall__Group_4__0 : rule__XConstructorCall__Group_4__0__Impl rule__XConstructorCall__Group_4__1 ;
+    // InternalCheck.g:19356:1: rule__XConstructorCall__Group_4__0 : rule__XConstructorCall__Group_4__0__Impl rule__XConstructorCall__Group_4__1 ;
     public final void rule__XConstructorCall__Group_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19360:1: ( rule__XConstructorCall__Group_4__0__Impl rule__XConstructorCall__Group_4__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19361:2: rule__XConstructorCall__Group_4__0__Impl rule__XConstructorCall__Group_4__1
+            // InternalCheck.g:19360:1: ( rule__XConstructorCall__Group_4__0__Impl rule__XConstructorCall__Group_4__1 )
+            // InternalCheck.g:19361:2: rule__XConstructorCall__Group_4__0__Impl rule__XConstructorCall__Group_4__1
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4__0__Impl_in_rule__XConstructorCall__Group_4__039132);
+            pushFollow(FOLLOW_81);
             rule__XConstructorCall__Group_4__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4__1_in_rule__XConstructorCall__Group_4__039135);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_4__1();
 
             state._fsp--;
@@ -55707,25 +55707,25 @@ public final void rule__XConstructorCall__Group_4__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19368:1: rule__XConstructorCall__Group_4__0__Impl : ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) ) ;
+    // InternalCheck.g:19368:1: rule__XConstructorCall__Group_4__0__Impl : ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) ) ;
     public final void rule__XConstructorCall__Group_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19372:1: ( ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19373:1: ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) )
+            // InternalCheck.g:19372:1: ( ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) ) )
+            // InternalCheck.g:19373:1: ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19373:1: ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19374:1: ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 )
+            // InternalCheck.g:19373:1: ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) )
+            // InternalCheck.g:19374:1: ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getExplicitConstructorCallAssignment_4_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19375:1: ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19375:2: rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0
+            // InternalCheck.g:19375:1: ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 )
+            // InternalCheck.g:19375:2: rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0_in_rule__XConstructorCall__Group_4__0__Impl39162);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0();
 
             state._fsp--;
@@ -55758,21 +55758,21 @@ public final void rule__XConstructorCall__Group_4__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19385:1: rule__XConstructorCall__Group_4__1 : rule__XConstructorCall__Group_4__1__Impl rule__XConstructorCall__Group_4__2 ;
+    // InternalCheck.g:19385:1: rule__XConstructorCall__Group_4__1 : rule__XConstructorCall__Group_4__1__Impl rule__XConstructorCall__Group_4__2 ;
     public final void rule__XConstructorCall__Group_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19389:1: ( rule__XConstructorCall__Group_4__1__Impl rule__XConstructorCall__Group_4__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19390:2: rule__XConstructorCall__Group_4__1__Impl rule__XConstructorCall__Group_4__2
+            // InternalCheck.g:19389:1: ( rule__XConstructorCall__Group_4__1__Impl rule__XConstructorCall__Group_4__2 )
+            // InternalCheck.g:19390:2: rule__XConstructorCall__Group_4__1__Impl rule__XConstructorCall__Group_4__2
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4__1__Impl_in_rule__XConstructorCall__Group_4__139192);
+            pushFollow(FOLLOW_81);
             rule__XConstructorCall__Group_4__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4__2_in_rule__XConstructorCall__Group_4__139195);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_4__2();
 
             state._fsp--;
@@ -55796,22 +55796,22 @@ public final void rule__XConstructorCall__Group_4__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19397:1: rule__XConstructorCall__Group_4__1__Impl : ( ( rule__XConstructorCall__Alternatives_4_1 )? ) ;
+    // InternalCheck.g:19397:1: rule__XConstructorCall__Group_4__1__Impl : ( ( rule__XConstructorCall__Alternatives_4_1 )? ) ;
     public final void rule__XConstructorCall__Group_4__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19401:1: ( ( ( rule__XConstructorCall__Alternatives_4_1 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19402:1: ( ( rule__XConstructorCall__Alternatives_4_1 )? )
+            // InternalCheck.g:19401:1: ( ( ( rule__XConstructorCall__Alternatives_4_1 )? ) )
+            // InternalCheck.g:19402:1: ( ( rule__XConstructorCall__Alternatives_4_1 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19402:1: ( ( rule__XConstructorCall__Alternatives_4_1 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19403:1: ( rule__XConstructorCall__Alternatives_4_1 )?
+            // InternalCheck.g:19402:1: ( ( rule__XConstructorCall__Alternatives_4_1 )? )
+            // InternalCheck.g:19403:1: ( rule__XConstructorCall__Alternatives_4_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getAlternatives_4_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19404:1: ( rule__XConstructorCall__Alternatives_4_1 )?
+            // InternalCheck.g:19404:1: ( rule__XConstructorCall__Alternatives_4_1 )?
             int alt147=2;
             int LA147_0 = input.LA(1);
 
@@ -55820,9 +55820,9 @@ public final void rule__XConstructorCall__Group_4__1__Impl() throws RecognitionE
             }
             switch (alt147) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19404:2: rule__XConstructorCall__Alternatives_4_1
+                    // InternalCheck.g:19404:2: rule__XConstructorCall__Alternatives_4_1
                     {
-                    pushFollow(FOLLOW_rule__XConstructorCall__Alternatives_4_1_in_rule__XConstructorCall__Group_4__1__Impl39222);
+                    pushFollow(FOLLOW_2);
                     rule__XConstructorCall__Alternatives_4_1();
 
                     state._fsp--;
@@ -55858,16 +55858,16 @@ public final void rule__XConstructorCall__Group_4__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19414:1: rule__XConstructorCall__Group_4__2 : rule__XConstructorCall__Group_4__2__Impl ;
+    // InternalCheck.g:19414:1: rule__XConstructorCall__Group_4__2 : rule__XConstructorCall__Group_4__2__Impl ;
     public final void rule__XConstructorCall__Group_4__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19418:1: ( rule__XConstructorCall__Group_4__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19419:2: rule__XConstructorCall__Group_4__2__Impl
+            // InternalCheck.g:19418:1: ( rule__XConstructorCall__Group_4__2__Impl )
+            // InternalCheck.g:19419:2: rule__XConstructorCall__Group_4__2__Impl
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4__2__Impl_in_rule__XConstructorCall__Group_4__239253);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_4__2__Impl();
 
             state._fsp--;
@@ -55891,22 +55891,22 @@ public final void rule__XConstructorCall__Group_4__2() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19425:1: rule__XConstructorCall__Group_4__2__Impl : ( ')' ) ;
+    // InternalCheck.g:19425:1: rule__XConstructorCall__Group_4__2__Impl : ( ')' ) ;
     public final void rule__XConstructorCall__Group_4__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19429:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19430:1: ( ')' )
+            // InternalCheck.g:19429:1: ( ( ')' ) )
+            // InternalCheck.g:19430:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19430:1: ( ')' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19431:1: ')'
+            // InternalCheck.g:19430:1: ( ')' )
+            // InternalCheck.g:19431:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getRightParenthesisKeyword_4_2()); 
             }
-            match(input,73,FOLLOW_73_in_rule__XConstructorCall__Group_4__2__Impl39281); if (state.failed) return ;
+            match(input,73,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstructorCallAccess().getRightParenthesisKeyword_4_2()); 
             }
@@ -55932,21 +55932,21 @@ public final void rule__XConstructorCall__Group_4__2__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19450:1: rule__XConstructorCall__Group_4_1_1__0 : rule__XConstructorCall__Group_4_1_1__0__Impl rule__XConstructorCall__Group_4_1_1__1 ;
+    // InternalCheck.g:19450:1: rule__XConstructorCall__Group_4_1_1__0 : rule__XConstructorCall__Group_4_1_1__0__Impl rule__XConstructorCall__Group_4_1_1__1 ;
     public final void rule__XConstructorCall__Group_4_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19454:1: ( rule__XConstructorCall__Group_4_1_1__0__Impl rule__XConstructorCall__Group_4_1_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19455:2: rule__XConstructorCall__Group_4_1_1__0__Impl rule__XConstructorCall__Group_4_1_1__1
+            // InternalCheck.g:19454:1: ( rule__XConstructorCall__Group_4_1_1__0__Impl rule__XConstructorCall__Group_4_1_1__1 )
+            // InternalCheck.g:19455:2: rule__XConstructorCall__Group_4_1_1__0__Impl rule__XConstructorCall__Group_4_1_1__1
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4_1_1__0__Impl_in_rule__XConstructorCall__Group_4_1_1__039318);
+            pushFollow(FOLLOW_20);
             rule__XConstructorCall__Group_4_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4_1_1__1_in_rule__XConstructorCall__Group_4_1_1__039321);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_4_1_1__1();
 
             state._fsp--;
@@ -55970,25 +55970,25 @@ public final void rule__XConstructorCall__Group_4_1_1__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19462:1: rule__XConstructorCall__Group_4_1_1__0__Impl : ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) ) ;
+    // InternalCheck.g:19462:1: rule__XConstructorCall__Group_4_1_1__0__Impl : ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) ) ;
     public final void rule__XConstructorCall__Group_4_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19466:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19467:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) )
+            // InternalCheck.g:19466:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) ) )
+            // InternalCheck.g:19467:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19467:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19468:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 )
+            // InternalCheck.g:19467:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) )
+            // InternalCheck.g:19468:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getArgumentsAssignment_4_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19469:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19469:2: rule__XConstructorCall__ArgumentsAssignment_4_1_1_0
+            // InternalCheck.g:19469:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 )
+            // InternalCheck.g:19469:2: rule__XConstructorCall__ArgumentsAssignment_4_1_1_0
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__ArgumentsAssignment_4_1_1_0_in_rule__XConstructorCall__Group_4_1_1__0__Impl39348);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__ArgumentsAssignment_4_1_1_0();
 
             state._fsp--;
@@ -56021,16 +56021,16 @@ public final void rule__XConstructorCall__Group_4_1_1__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19479:1: rule__XConstructorCall__Group_4_1_1__1 : rule__XConstructorCall__Group_4_1_1__1__Impl ;
+    // InternalCheck.g:19479:1: rule__XConstructorCall__Group_4_1_1__1 : rule__XConstructorCall__Group_4_1_1__1__Impl ;
     public final void rule__XConstructorCall__Group_4_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19483:1: ( rule__XConstructorCall__Group_4_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19484:2: rule__XConstructorCall__Group_4_1_1__1__Impl
+            // InternalCheck.g:19483:1: ( rule__XConstructorCall__Group_4_1_1__1__Impl )
+            // InternalCheck.g:19484:2: rule__XConstructorCall__Group_4_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4_1_1__1__Impl_in_rule__XConstructorCall__Group_4_1_1__139378);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_4_1_1__1__Impl();
 
             state._fsp--;
@@ -56054,22 +56054,22 @@ public final void rule__XConstructorCall__Group_4_1_1__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19490:1: rule__XConstructorCall__Group_4_1_1__1__Impl : ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* ) ;
+    // InternalCheck.g:19490:1: rule__XConstructorCall__Group_4_1_1__1__Impl : ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* ) ;
     public final void rule__XConstructorCall__Group_4_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19494:1: ( ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19495:1: ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* )
+            // InternalCheck.g:19494:1: ( ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* ) )
+            // InternalCheck.g:19495:1: ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19495:1: ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19496:1: ( rule__XConstructorCall__Group_4_1_1_1__0 )*
+            // InternalCheck.g:19495:1: ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* )
+            // InternalCheck.g:19496:1: ( rule__XConstructorCall__Group_4_1_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getGroup_4_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19497:1: ( rule__XConstructorCall__Group_4_1_1_1__0 )*
+            // InternalCheck.g:19497:1: ( rule__XConstructorCall__Group_4_1_1_1__0 )*
             loop148:
             do {
                 int alt148=2;
@@ -56082,9 +56082,9 @@ public final void rule__XConstructorCall__Group_4_1_1__1__Impl() throws Recognit
 
                 switch (alt148) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19497:2: rule__XConstructorCall__Group_4_1_1_1__0
+            	    // InternalCheck.g:19497:2: rule__XConstructorCall__Group_4_1_1_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XConstructorCall__Group_4_1_1_1__0_in_rule__XConstructorCall__Group_4_1_1__1__Impl39405);
+            	    pushFollow(FOLLOW_21);
             	    rule__XConstructorCall__Group_4_1_1_1__0();
 
             	    state._fsp--;
@@ -56123,21 +56123,21 @@ public final void rule__XConstructorCall__Group_4_1_1__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19511:1: rule__XConstructorCall__Group_4_1_1_1__0 : rule__XConstructorCall__Group_4_1_1_1__0__Impl rule__XConstructorCall__Group_4_1_1_1__1 ;
+    // InternalCheck.g:19511:1: rule__XConstructorCall__Group_4_1_1_1__0 : rule__XConstructorCall__Group_4_1_1_1__0__Impl rule__XConstructorCall__Group_4_1_1_1__1 ;
     public final void rule__XConstructorCall__Group_4_1_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19515:1: ( rule__XConstructorCall__Group_4_1_1_1__0__Impl rule__XConstructorCall__Group_4_1_1_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19516:2: rule__XConstructorCall__Group_4_1_1_1__0__Impl rule__XConstructorCall__Group_4_1_1_1__1
+            // InternalCheck.g:19515:1: ( rule__XConstructorCall__Group_4_1_1_1__0__Impl rule__XConstructorCall__Group_4_1_1_1__1 )
+            // InternalCheck.g:19516:2: rule__XConstructorCall__Group_4_1_1_1__0__Impl rule__XConstructorCall__Group_4_1_1_1__1
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4_1_1_1__0__Impl_in_rule__XConstructorCall__Group_4_1_1_1__039440);
+            pushFollow(FOLLOW_32);
             rule__XConstructorCall__Group_4_1_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4_1_1_1__1_in_rule__XConstructorCall__Group_4_1_1_1__039443);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_4_1_1_1__1();
 
             state._fsp--;
@@ -56161,22 +56161,22 @@ public final void rule__XConstructorCall__Group_4_1_1_1__0() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19523:1: rule__XConstructorCall__Group_4_1_1_1__0__Impl : ( ',' ) ;
+    // InternalCheck.g:19523:1: rule__XConstructorCall__Group_4_1_1_1__0__Impl : ( ',' ) ;
     public final void rule__XConstructorCall__Group_4_1_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19527:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19528:1: ( ',' )
+            // InternalCheck.g:19527:1: ( ( ',' ) )
+            // InternalCheck.g:19528:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19528:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19529:1: ','
+            // InternalCheck.g:19528:1: ( ',' )
+            // InternalCheck.g:19529:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getCommaKeyword_4_1_1_1_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XConstructorCall__Group_4_1_1_1__0__Impl39471); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstructorCallAccess().getCommaKeyword_4_1_1_1_0()); 
             }
@@ -56202,16 +56202,16 @@ public final void rule__XConstructorCall__Group_4_1_1_1__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19542:1: rule__XConstructorCall__Group_4_1_1_1__1 : rule__XConstructorCall__Group_4_1_1_1__1__Impl ;
+    // InternalCheck.g:19542:1: rule__XConstructorCall__Group_4_1_1_1__1 : rule__XConstructorCall__Group_4_1_1_1__1__Impl ;
     public final void rule__XConstructorCall__Group_4_1_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19546:1: ( rule__XConstructorCall__Group_4_1_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19547:2: rule__XConstructorCall__Group_4_1_1_1__1__Impl
+            // InternalCheck.g:19546:1: ( rule__XConstructorCall__Group_4_1_1_1__1__Impl )
+            // InternalCheck.g:19547:2: rule__XConstructorCall__Group_4_1_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4_1_1_1__1__Impl_in_rule__XConstructorCall__Group_4_1_1_1__139502);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_4_1_1_1__1__Impl();
 
             state._fsp--;
@@ -56235,25 +56235,25 @@ public final void rule__XConstructorCall__Group_4_1_1_1__1() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19553:1: rule__XConstructorCall__Group_4_1_1_1__1__Impl : ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) ) ;
+    // InternalCheck.g:19553:1: rule__XConstructorCall__Group_4_1_1_1__1__Impl : ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) ) ;
     public final void rule__XConstructorCall__Group_4_1_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19557:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19558:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) )
+            // InternalCheck.g:19557:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) ) )
+            // InternalCheck.g:19558:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19558:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19559:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 )
+            // InternalCheck.g:19558:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) )
+            // InternalCheck.g:19559:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getArgumentsAssignment_4_1_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19560:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19560:2: rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1
+            // InternalCheck.g:19560:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 )
+            // InternalCheck.g:19560:2: rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1_in_rule__XConstructorCall__Group_4_1_1_1__1__Impl39529);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1();
 
             state._fsp--;
@@ -56286,21 +56286,21 @@ public final void rule__XConstructorCall__Group_4_1_1_1__1__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XBooleanLiteral__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19574:1: rule__XBooleanLiteral__Group__0 : rule__XBooleanLiteral__Group__0__Impl rule__XBooleanLiteral__Group__1 ;
+    // InternalCheck.g:19574:1: rule__XBooleanLiteral__Group__0 : rule__XBooleanLiteral__Group__0__Impl rule__XBooleanLiteral__Group__1 ;
     public final void rule__XBooleanLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19578:1: ( rule__XBooleanLiteral__Group__0__Impl rule__XBooleanLiteral__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19579:2: rule__XBooleanLiteral__Group__0__Impl rule__XBooleanLiteral__Group__1
+            // InternalCheck.g:19578:1: ( rule__XBooleanLiteral__Group__0__Impl rule__XBooleanLiteral__Group__1 )
+            // InternalCheck.g:19579:2: rule__XBooleanLiteral__Group__0__Impl rule__XBooleanLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__XBooleanLiteral__Group__0__Impl_in_rule__XBooleanLiteral__Group__039563);
+            pushFollow(FOLLOW_105);
             rule__XBooleanLiteral__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBooleanLiteral__Group__1_in_rule__XBooleanLiteral__Group__039566);
+            pushFollow(FOLLOW_2);
             rule__XBooleanLiteral__Group__1();
 
             state._fsp--;
@@ -56324,23 +56324,23 @@ public final void rule__XBooleanLiteral__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XBooleanLiteral__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19586:1: rule__XBooleanLiteral__Group__0__Impl : ( () ) ;
+    // InternalCheck.g:19586:1: rule__XBooleanLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XBooleanLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19590:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19591:1: ( () )
+            // InternalCheck.g:19590:1: ( ( () ) )
+            // InternalCheck.g:19591:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19591:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19592:1: ()
+            // InternalCheck.g:19591:1: ( () )
+            // InternalCheck.g:19592:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBooleanLiteralAccess().getXBooleanLiteralAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19593:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19595:1: 
+            // InternalCheck.g:19593:1: ()
+            // InternalCheck.g:19595:1: 
             {
             }
 
@@ -56365,16 +56365,16 @@ public final void rule__XBooleanLiteral__Group__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XBooleanLiteral__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19605:1: rule__XBooleanLiteral__Group__1 : rule__XBooleanLiteral__Group__1__Impl ;
+    // InternalCheck.g:19605:1: rule__XBooleanLiteral__Group__1 : rule__XBooleanLiteral__Group__1__Impl ;
     public final void rule__XBooleanLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19609:1: ( rule__XBooleanLiteral__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19610:2: rule__XBooleanLiteral__Group__1__Impl
+            // InternalCheck.g:19609:1: ( rule__XBooleanLiteral__Group__1__Impl )
+            // InternalCheck.g:19610:2: rule__XBooleanLiteral__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XBooleanLiteral__Group__1__Impl_in_rule__XBooleanLiteral__Group__139624);
+            pushFollow(FOLLOW_2);
             rule__XBooleanLiteral__Group__1__Impl();
 
             state._fsp--;
@@ -56398,25 +56398,25 @@ public final void rule__XBooleanLiteral__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XBooleanLiteral__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19616:1: rule__XBooleanLiteral__Group__1__Impl : ( ( rule__XBooleanLiteral__Alternatives_1 ) ) ;
+    // InternalCheck.g:19616:1: rule__XBooleanLiteral__Group__1__Impl : ( ( rule__XBooleanLiteral__Alternatives_1 ) ) ;
     public final void rule__XBooleanLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19620:1: ( ( ( rule__XBooleanLiteral__Alternatives_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19621:1: ( ( rule__XBooleanLiteral__Alternatives_1 ) )
+            // InternalCheck.g:19620:1: ( ( ( rule__XBooleanLiteral__Alternatives_1 ) ) )
+            // InternalCheck.g:19621:1: ( ( rule__XBooleanLiteral__Alternatives_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19621:1: ( ( rule__XBooleanLiteral__Alternatives_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19622:1: ( rule__XBooleanLiteral__Alternatives_1 )
+            // InternalCheck.g:19621:1: ( ( rule__XBooleanLiteral__Alternatives_1 ) )
+            // InternalCheck.g:19622:1: ( rule__XBooleanLiteral__Alternatives_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBooleanLiteralAccess().getAlternatives_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19623:1: ( rule__XBooleanLiteral__Alternatives_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19623:2: rule__XBooleanLiteral__Alternatives_1
+            // InternalCheck.g:19623:1: ( rule__XBooleanLiteral__Alternatives_1 )
+            // InternalCheck.g:19623:2: rule__XBooleanLiteral__Alternatives_1
             {
-            pushFollow(FOLLOW_rule__XBooleanLiteral__Alternatives_1_in_rule__XBooleanLiteral__Group__1__Impl39651);
+            pushFollow(FOLLOW_2);
             rule__XBooleanLiteral__Alternatives_1();
 
             state._fsp--;
@@ -56449,21 +56449,21 @@ public final void rule__XBooleanLiteral__Group__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XNullLiteral__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19637:1: rule__XNullLiteral__Group__0 : rule__XNullLiteral__Group__0__Impl rule__XNullLiteral__Group__1 ;
+    // InternalCheck.g:19637:1: rule__XNullLiteral__Group__0 : rule__XNullLiteral__Group__0__Impl rule__XNullLiteral__Group__1 ;
     public final void rule__XNullLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19641:1: ( rule__XNullLiteral__Group__0__Impl rule__XNullLiteral__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19642:2: rule__XNullLiteral__Group__0__Impl rule__XNullLiteral__Group__1
+            // InternalCheck.g:19641:1: ( rule__XNullLiteral__Group__0__Impl rule__XNullLiteral__Group__1 )
+            // InternalCheck.g:19642:2: rule__XNullLiteral__Group__0__Impl rule__XNullLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__XNullLiteral__Group__0__Impl_in_rule__XNullLiteral__Group__039685);
+            pushFollow(FOLLOW_106);
             rule__XNullLiteral__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XNullLiteral__Group__1_in_rule__XNullLiteral__Group__039688);
+            pushFollow(FOLLOW_2);
             rule__XNullLiteral__Group__1();
 
             state._fsp--;
@@ -56487,23 +56487,23 @@ public final void rule__XNullLiteral__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XNullLiteral__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19649:1: rule__XNullLiteral__Group__0__Impl : ( () ) ;
+    // InternalCheck.g:19649:1: rule__XNullLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XNullLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19653:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19654:1: ( () )
+            // InternalCheck.g:19653:1: ( ( () ) )
+            // InternalCheck.g:19654:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19654:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19655:1: ()
+            // InternalCheck.g:19654:1: ( () )
+            // InternalCheck.g:19655:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNullLiteralAccess().getXNullLiteralAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19656:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19658:1: 
+            // InternalCheck.g:19656:1: ()
+            // InternalCheck.g:19658:1: 
             {
             }
 
@@ -56528,16 +56528,16 @@ public final void rule__XNullLiteral__Group__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XNullLiteral__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19668:1: rule__XNullLiteral__Group__1 : rule__XNullLiteral__Group__1__Impl ;
+    // InternalCheck.g:19668:1: rule__XNullLiteral__Group__1 : rule__XNullLiteral__Group__1__Impl ;
     public final void rule__XNullLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19672:1: ( rule__XNullLiteral__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19673:2: rule__XNullLiteral__Group__1__Impl
+            // InternalCheck.g:19672:1: ( rule__XNullLiteral__Group__1__Impl )
+            // InternalCheck.g:19673:2: rule__XNullLiteral__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XNullLiteral__Group__1__Impl_in_rule__XNullLiteral__Group__139746);
+            pushFollow(FOLLOW_2);
             rule__XNullLiteral__Group__1__Impl();
 
             state._fsp--;
@@ -56561,22 +56561,22 @@ public final void rule__XNullLiteral__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XNullLiteral__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19679:1: rule__XNullLiteral__Group__1__Impl : ( 'null' ) ;
+    // InternalCheck.g:19679:1: rule__XNullLiteral__Group__1__Impl : ( 'null' ) ;
     public final void rule__XNullLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19683:1: ( ( 'null' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19684:1: ( 'null' )
+            // InternalCheck.g:19683:1: ( ( 'null' ) )
+            // InternalCheck.g:19684:1: ( 'null' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19684:1: ( 'null' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19685:1: 'null'
+            // InternalCheck.g:19684:1: ( 'null' )
+            // InternalCheck.g:19685:1: 'null'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNullLiteralAccess().getNullKeyword_1()); 
             }
-            match(input,93,FOLLOW_93_in_rule__XNullLiteral__Group__1__Impl39774); if (state.failed) return ;
+            match(input,93,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXNullLiteralAccess().getNullKeyword_1()); 
             }
@@ -56602,21 +56602,21 @@ public final void rule__XNullLiteral__Group__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XNumberLiteral__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19702:1: rule__XNumberLiteral__Group__0 : rule__XNumberLiteral__Group__0__Impl rule__XNumberLiteral__Group__1 ;
+    // InternalCheck.g:19702:1: rule__XNumberLiteral__Group__0 : rule__XNumberLiteral__Group__0__Impl rule__XNumberLiteral__Group__1 ;
     public final void rule__XNumberLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19706:1: ( rule__XNumberLiteral__Group__0__Impl rule__XNumberLiteral__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19707:2: rule__XNumberLiteral__Group__0__Impl rule__XNumberLiteral__Group__1
+            // InternalCheck.g:19706:1: ( rule__XNumberLiteral__Group__0__Impl rule__XNumberLiteral__Group__1 )
+            // InternalCheck.g:19707:2: rule__XNumberLiteral__Group__0__Impl rule__XNumberLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__XNumberLiteral__Group__0__Impl_in_rule__XNumberLiteral__Group__039809);
+            pushFollow(FOLLOW_107);
             rule__XNumberLiteral__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XNumberLiteral__Group__1_in_rule__XNumberLiteral__Group__039812);
+            pushFollow(FOLLOW_2);
             rule__XNumberLiteral__Group__1();
 
             state._fsp--;
@@ -56640,23 +56640,23 @@ public final void rule__XNumberLiteral__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XNumberLiteral__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19714:1: rule__XNumberLiteral__Group__0__Impl : ( () ) ;
+    // InternalCheck.g:19714:1: rule__XNumberLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XNumberLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19718:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19719:1: ( () )
+            // InternalCheck.g:19718:1: ( ( () ) )
+            // InternalCheck.g:19719:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19719:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19720:1: ()
+            // InternalCheck.g:19719:1: ( () )
+            // InternalCheck.g:19720:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNumberLiteralAccess().getXNumberLiteralAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19721:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19723:1: 
+            // InternalCheck.g:19721:1: ()
+            // InternalCheck.g:19723:1: 
             {
             }
 
@@ -56681,16 +56681,16 @@ public final void rule__XNumberLiteral__Group__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XNumberLiteral__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19733:1: rule__XNumberLiteral__Group__1 : rule__XNumberLiteral__Group__1__Impl ;
+    // InternalCheck.g:19733:1: rule__XNumberLiteral__Group__1 : rule__XNumberLiteral__Group__1__Impl ;
     public final void rule__XNumberLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19737:1: ( rule__XNumberLiteral__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19738:2: rule__XNumberLiteral__Group__1__Impl
+            // InternalCheck.g:19737:1: ( rule__XNumberLiteral__Group__1__Impl )
+            // InternalCheck.g:19738:2: rule__XNumberLiteral__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XNumberLiteral__Group__1__Impl_in_rule__XNumberLiteral__Group__139870);
+            pushFollow(FOLLOW_2);
             rule__XNumberLiteral__Group__1__Impl();
 
             state._fsp--;
@@ -56714,25 +56714,25 @@ public final void rule__XNumberLiteral__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XNumberLiteral__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19744:1: rule__XNumberLiteral__Group__1__Impl : ( ( rule__XNumberLiteral__ValueAssignment_1 ) ) ;
+    // InternalCheck.g:19744:1: rule__XNumberLiteral__Group__1__Impl : ( ( rule__XNumberLiteral__ValueAssignment_1 ) ) ;
     public final void rule__XNumberLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19748:1: ( ( ( rule__XNumberLiteral__ValueAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19749:1: ( ( rule__XNumberLiteral__ValueAssignment_1 ) )
+            // InternalCheck.g:19748:1: ( ( ( rule__XNumberLiteral__ValueAssignment_1 ) ) )
+            // InternalCheck.g:19749:1: ( ( rule__XNumberLiteral__ValueAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19749:1: ( ( rule__XNumberLiteral__ValueAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19750:1: ( rule__XNumberLiteral__ValueAssignment_1 )
+            // InternalCheck.g:19749:1: ( ( rule__XNumberLiteral__ValueAssignment_1 ) )
+            // InternalCheck.g:19750:1: ( rule__XNumberLiteral__ValueAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNumberLiteralAccess().getValueAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19751:1: ( rule__XNumberLiteral__ValueAssignment_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19751:2: rule__XNumberLiteral__ValueAssignment_1
+            // InternalCheck.g:19751:1: ( rule__XNumberLiteral__ValueAssignment_1 )
+            // InternalCheck.g:19751:2: rule__XNumberLiteral__ValueAssignment_1
             {
-            pushFollow(FOLLOW_rule__XNumberLiteral__ValueAssignment_1_in_rule__XNumberLiteral__Group__1__Impl39897);
+            pushFollow(FOLLOW_2);
             rule__XNumberLiteral__ValueAssignment_1();
 
             state._fsp--;
@@ -56765,21 +56765,21 @@ public final void rule__XNumberLiteral__Group__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XStringLiteral__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19765:1: rule__XStringLiteral__Group__0 : rule__XStringLiteral__Group__0__Impl rule__XStringLiteral__Group__1 ;
+    // InternalCheck.g:19765:1: rule__XStringLiteral__Group__0 : rule__XStringLiteral__Group__0__Impl rule__XStringLiteral__Group__1 ;
     public final void rule__XStringLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19769:1: ( rule__XStringLiteral__Group__0__Impl rule__XStringLiteral__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19770:2: rule__XStringLiteral__Group__0__Impl rule__XStringLiteral__Group__1
+            // InternalCheck.g:19769:1: ( rule__XStringLiteral__Group__0__Impl rule__XStringLiteral__Group__1 )
+            // InternalCheck.g:19770:2: rule__XStringLiteral__Group__0__Impl rule__XStringLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__XStringLiteral__Group__0__Impl_in_rule__XStringLiteral__Group__039931);
+            pushFollow(FOLLOW_22);
             rule__XStringLiteral__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XStringLiteral__Group__1_in_rule__XStringLiteral__Group__039934);
+            pushFollow(FOLLOW_2);
             rule__XStringLiteral__Group__1();
 
             state._fsp--;
@@ -56803,23 +56803,23 @@ public final void rule__XStringLiteral__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XStringLiteral__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19777:1: rule__XStringLiteral__Group__0__Impl : ( () ) ;
+    // InternalCheck.g:19777:1: rule__XStringLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XStringLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19781:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19782:1: ( () )
+            // InternalCheck.g:19781:1: ( ( () ) )
+            // InternalCheck.g:19782:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19782:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19783:1: ()
+            // InternalCheck.g:19782:1: ( () )
+            // InternalCheck.g:19783:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXStringLiteralAccess().getXStringLiteralAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19784:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19786:1: 
+            // InternalCheck.g:19784:1: ()
+            // InternalCheck.g:19786:1: 
             {
             }
 
@@ -56844,16 +56844,16 @@ public final void rule__XStringLiteral__Group__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XStringLiteral__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19796:1: rule__XStringLiteral__Group__1 : rule__XStringLiteral__Group__1__Impl ;
+    // InternalCheck.g:19796:1: rule__XStringLiteral__Group__1 : rule__XStringLiteral__Group__1__Impl ;
     public final void rule__XStringLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19800:1: ( rule__XStringLiteral__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19801:2: rule__XStringLiteral__Group__1__Impl
+            // InternalCheck.g:19800:1: ( rule__XStringLiteral__Group__1__Impl )
+            // InternalCheck.g:19801:2: rule__XStringLiteral__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XStringLiteral__Group__1__Impl_in_rule__XStringLiteral__Group__139992);
+            pushFollow(FOLLOW_2);
             rule__XStringLiteral__Group__1__Impl();
 
             state._fsp--;
@@ -56877,25 +56877,25 @@ public final void rule__XStringLiteral__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XStringLiteral__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19807:1: rule__XStringLiteral__Group__1__Impl : ( ( rule__XStringLiteral__ValueAssignment_1 ) ) ;
+    // InternalCheck.g:19807:1: rule__XStringLiteral__Group__1__Impl : ( ( rule__XStringLiteral__ValueAssignment_1 ) ) ;
     public final void rule__XStringLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19811:1: ( ( ( rule__XStringLiteral__ValueAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19812:1: ( ( rule__XStringLiteral__ValueAssignment_1 ) )
+            // InternalCheck.g:19811:1: ( ( ( rule__XStringLiteral__ValueAssignment_1 ) ) )
+            // InternalCheck.g:19812:1: ( ( rule__XStringLiteral__ValueAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19812:1: ( ( rule__XStringLiteral__ValueAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19813:1: ( rule__XStringLiteral__ValueAssignment_1 )
+            // InternalCheck.g:19812:1: ( ( rule__XStringLiteral__ValueAssignment_1 ) )
+            // InternalCheck.g:19813:1: ( rule__XStringLiteral__ValueAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXStringLiteralAccess().getValueAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19814:1: ( rule__XStringLiteral__ValueAssignment_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19814:2: rule__XStringLiteral__ValueAssignment_1
+            // InternalCheck.g:19814:1: ( rule__XStringLiteral__ValueAssignment_1 )
+            // InternalCheck.g:19814:2: rule__XStringLiteral__ValueAssignment_1
             {
-            pushFollow(FOLLOW_rule__XStringLiteral__ValueAssignment_1_in_rule__XStringLiteral__Group__1__Impl40019);
+            pushFollow(FOLLOW_2);
             rule__XStringLiteral__ValueAssignment_1();
 
             state._fsp--;
@@ -56928,21 +56928,21 @@ public final void rule__XStringLiteral__Group__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19828:1: rule__XTypeLiteral__Group__0 : rule__XTypeLiteral__Group__0__Impl rule__XTypeLiteral__Group__1 ;
+    // InternalCheck.g:19828:1: rule__XTypeLiteral__Group__0 : rule__XTypeLiteral__Group__0__Impl rule__XTypeLiteral__Group__1 ;
     public final void rule__XTypeLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19832:1: ( rule__XTypeLiteral__Group__0__Impl rule__XTypeLiteral__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19833:2: rule__XTypeLiteral__Group__0__Impl rule__XTypeLiteral__Group__1
+            // InternalCheck.g:19832:1: ( rule__XTypeLiteral__Group__0__Impl rule__XTypeLiteral__Group__1 )
+            // InternalCheck.g:19833:2: rule__XTypeLiteral__Group__0__Impl rule__XTypeLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__0__Impl_in_rule__XTypeLiteral__Group__040053);
+            pushFollow(FOLLOW_108);
             rule__XTypeLiteral__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__1_in_rule__XTypeLiteral__Group__040056);
+            pushFollow(FOLLOW_2);
             rule__XTypeLiteral__Group__1();
 
             state._fsp--;
@@ -56966,23 +56966,23 @@ public final void rule__XTypeLiteral__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19840:1: rule__XTypeLiteral__Group__0__Impl : ( () ) ;
+    // InternalCheck.g:19840:1: rule__XTypeLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XTypeLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19844:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19845:1: ( () )
+            // InternalCheck.g:19844:1: ( ( () ) )
+            // InternalCheck.g:19845:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19845:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19846:1: ()
+            // InternalCheck.g:19845:1: ( () )
+            // InternalCheck.g:19846:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getXTypeLiteralAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19847:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19849:1: 
+            // InternalCheck.g:19847:1: ()
+            // InternalCheck.g:19849:1: 
             {
             }
 
@@ -57007,21 +57007,21 @@ public final void rule__XTypeLiteral__Group__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19859:1: rule__XTypeLiteral__Group__1 : rule__XTypeLiteral__Group__1__Impl rule__XTypeLiteral__Group__2 ;
+    // InternalCheck.g:19859:1: rule__XTypeLiteral__Group__1 : rule__XTypeLiteral__Group__1__Impl rule__XTypeLiteral__Group__2 ;
     public final void rule__XTypeLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19863:1: ( rule__XTypeLiteral__Group__1__Impl rule__XTypeLiteral__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19864:2: rule__XTypeLiteral__Group__1__Impl rule__XTypeLiteral__Group__2
+            // InternalCheck.g:19863:1: ( rule__XTypeLiteral__Group__1__Impl rule__XTypeLiteral__Group__2 )
+            // InternalCheck.g:19864:2: rule__XTypeLiteral__Group__1__Impl rule__XTypeLiteral__Group__2
             {
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__1__Impl_in_rule__XTypeLiteral__Group__140114);
+            pushFollow(FOLLOW_26);
             rule__XTypeLiteral__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__2_in_rule__XTypeLiteral__Group__140117);
+            pushFollow(FOLLOW_2);
             rule__XTypeLiteral__Group__2();
 
             state._fsp--;
@@ -57045,22 +57045,22 @@ public final void rule__XTypeLiteral__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19871:1: rule__XTypeLiteral__Group__1__Impl : ( 'typeof' ) ;
+    // InternalCheck.g:19871:1: rule__XTypeLiteral__Group__1__Impl : ( 'typeof' ) ;
     public final void rule__XTypeLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19875:1: ( ( 'typeof' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19876:1: ( 'typeof' )
+            // InternalCheck.g:19875:1: ( ( 'typeof' ) )
+            // InternalCheck.g:19876:1: ( 'typeof' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19876:1: ( 'typeof' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19877:1: 'typeof'
+            // InternalCheck.g:19876:1: ( 'typeof' )
+            // InternalCheck.g:19877:1: 'typeof'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getTypeofKeyword_1()); 
             }
-            match(input,94,FOLLOW_94_in_rule__XTypeLiteral__Group__1__Impl40145); if (state.failed) return ;
+            match(input,94,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXTypeLiteralAccess().getTypeofKeyword_1()); 
             }
@@ -57086,21 +57086,21 @@ public final void rule__XTypeLiteral__Group__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19890:1: rule__XTypeLiteral__Group__2 : rule__XTypeLiteral__Group__2__Impl rule__XTypeLiteral__Group__3 ;
+    // InternalCheck.g:19890:1: rule__XTypeLiteral__Group__2 : rule__XTypeLiteral__Group__2__Impl rule__XTypeLiteral__Group__3 ;
     public final void rule__XTypeLiteral__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19894:1: ( rule__XTypeLiteral__Group__2__Impl rule__XTypeLiteral__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19895:2: rule__XTypeLiteral__Group__2__Impl rule__XTypeLiteral__Group__3
+            // InternalCheck.g:19894:1: ( rule__XTypeLiteral__Group__2__Impl rule__XTypeLiteral__Group__3 )
+            // InternalCheck.g:19895:2: rule__XTypeLiteral__Group__2__Impl rule__XTypeLiteral__Group__3
             {
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__2__Impl_in_rule__XTypeLiteral__Group__240176);
+            pushFollow(FOLLOW_4);
             rule__XTypeLiteral__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__3_in_rule__XTypeLiteral__Group__240179);
+            pushFollow(FOLLOW_2);
             rule__XTypeLiteral__Group__3();
 
             state._fsp--;
@@ -57124,22 +57124,22 @@ public final void rule__XTypeLiteral__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19902:1: rule__XTypeLiteral__Group__2__Impl : ( '(' ) ;
+    // InternalCheck.g:19902:1: rule__XTypeLiteral__Group__2__Impl : ( '(' ) ;
     public final void rule__XTypeLiteral__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19906:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19907:1: ( '(' )
+            // InternalCheck.g:19906:1: ( ( '(' ) )
+            // InternalCheck.g:19907:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19907:1: ( '(' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19908:1: '('
+            // InternalCheck.g:19907:1: ( '(' )
+            // InternalCheck.g:19908:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getLeftParenthesisKeyword_2()); 
             }
-            match(input,72,FOLLOW_72_in_rule__XTypeLiteral__Group__2__Impl40207); if (state.failed) return ;
+            match(input,72,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXTypeLiteralAccess().getLeftParenthesisKeyword_2()); 
             }
@@ -57165,21 +57165,21 @@ public final void rule__XTypeLiteral__Group__2__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19921:1: rule__XTypeLiteral__Group__3 : rule__XTypeLiteral__Group__3__Impl rule__XTypeLiteral__Group__4 ;
+    // InternalCheck.g:19921:1: rule__XTypeLiteral__Group__3 : rule__XTypeLiteral__Group__3__Impl rule__XTypeLiteral__Group__4 ;
     public final void rule__XTypeLiteral__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19925:1: ( rule__XTypeLiteral__Group__3__Impl rule__XTypeLiteral__Group__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19926:2: rule__XTypeLiteral__Group__3__Impl rule__XTypeLiteral__Group__4
+            // InternalCheck.g:19925:1: ( rule__XTypeLiteral__Group__3__Impl rule__XTypeLiteral__Group__4 )
+            // InternalCheck.g:19926:2: rule__XTypeLiteral__Group__3__Impl rule__XTypeLiteral__Group__4
             {
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__3__Impl_in_rule__XTypeLiteral__Group__340238);
+            pushFollow(FOLLOW_109);
             rule__XTypeLiteral__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__4_in_rule__XTypeLiteral__Group__340241);
+            pushFollow(FOLLOW_2);
             rule__XTypeLiteral__Group__4();
 
             state._fsp--;
@@ -57203,25 +57203,25 @@ public final void rule__XTypeLiteral__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19933:1: rule__XTypeLiteral__Group__3__Impl : ( ( rule__XTypeLiteral__TypeAssignment_3 ) ) ;
+    // InternalCheck.g:19933:1: rule__XTypeLiteral__Group__3__Impl : ( ( rule__XTypeLiteral__TypeAssignment_3 ) ) ;
     public final void rule__XTypeLiteral__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19937:1: ( ( ( rule__XTypeLiteral__TypeAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19938:1: ( ( rule__XTypeLiteral__TypeAssignment_3 ) )
+            // InternalCheck.g:19937:1: ( ( ( rule__XTypeLiteral__TypeAssignment_3 ) ) )
+            // InternalCheck.g:19938:1: ( ( rule__XTypeLiteral__TypeAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19938:1: ( ( rule__XTypeLiteral__TypeAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19939:1: ( rule__XTypeLiteral__TypeAssignment_3 )
+            // InternalCheck.g:19938:1: ( ( rule__XTypeLiteral__TypeAssignment_3 ) )
+            // InternalCheck.g:19939:1: ( rule__XTypeLiteral__TypeAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getTypeAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19940:1: ( rule__XTypeLiteral__TypeAssignment_3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19940:2: rule__XTypeLiteral__TypeAssignment_3
+            // InternalCheck.g:19940:1: ( rule__XTypeLiteral__TypeAssignment_3 )
+            // InternalCheck.g:19940:2: rule__XTypeLiteral__TypeAssignment_3
             {
-            pushFollow(FOLLOW_rule__XTypeLiteral__TypeAssignment_3_in_rule__XTypeLiteral__Group__3__Impl40268);
+            pushFollow(FOLLOW_2);
             rule__XTypeLiteral__TypeAssignment_3();
 
             state._fsp--;
@@ -57254,21 +57254,21 @@ public final void rule__XTypeLiteral__Group__3__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19950:1: rule__XTypeLiteral__Group__4 : rule__XTypeLiteral__Group__4__Impl rule__XTypeLiteral__Group__5 ;
+    // InternalCheck.g:19950:1: rule__XTypeLiteral__Group__4 : rule__XTypeLiteral__Group__4__Impl rule__XTypeLiteral__Group__5 ;
     public final void rule__XTypeLiteral__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19954:1: ( rule__XTypeLiteral__Group__4__Impl rule__XTypeLiteral__Group__5 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19955:2: rule__XTypeLiteral__Group__4__Impl rule__XTypeLiteral__Group__5
+            // InternalCheck.g:19954:1: ( rule__XTypeLiteral__Group__4__Impl rule__XTypeLiteral__Group__5 )
+            // InternalCheck.g:19955:2: rule__XTypeLiteral__Group__4__Impl rule__XTypeLiteral__Group__5
             {
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__4__Impl_in_rule__XTypeLiteral__Group__440298);
+            pushFollow(FOLLOW_109);
             rule__XTypeLiteral__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__5_in_rule__XTypeLiteral__Group__440301);
+            pushFollow(FOLLOW_2);
             rule__XTypeLiteral__Group__5();
 
             state._fsp--;
@@ -57292,22 +57292,22 @@ public final void rule__XTypeLiteral__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19962:1: rule__XTypeLiteral__Group__4__Impl : ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* ) ;
+    // InternalCheck.g:19962:1: rule__XTypeLiteral__Group__4__Impl : ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* ) ;
     public final void rule__XTypeLiteral__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19966:1: ( ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19967:1: ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* )
+            // InternalCheck.g:19966:1: ( ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* ) )
+            // InternalCheck.g:19967:1: ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19967:1: ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19968:1: ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )*
+            // InternalCheck.g:19967:1: ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* )
+            // InternalCheck.g:19968:1: ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getArrayDimensionsAssignment_4()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19969:1: ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )*
+            // InternalCheck.g:19969:1: ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )*
             loop149:
             do {
                 int alt149=2;
@@ -57320,9 +57320,9 @@ public final void rule__XTypeLiteral__Group__4__Impl() throws RecognitionExcepti
 
                 switch (alt149) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19969:2: rule__XTypeLiteral__ArrayDimensionsAssignment_4
+            	    // InternalCheck.g:19969:2: rule__XTypeLiteral__ArrayDimensionsAssignment_4
             	    {
-            	    pushFollow(FOLLOW_rule__XTypeLiteral__ArrayDimensionsAssignment_4_in_rule__XTypeLiteral__Group__4__Impl40328);
+            	    pushFollow(FOLLOW_110);
             	    rule__XTypeLiteral__ArrayDimensionsAssignment_4();
 
             	    state._fsp--;
@@ -57361,16 +57361,16 @@ public final void rule__XTypeLiteral__Group__4__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__5"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19979:1: rule__XTypeLiteral__Group__5 : rule__XTypeLiteral__Group__5__Impl ;
+    // InternalCheck.g:19979:1: rule__XTypeLiteral__Group__5 : rule__XTypeLiteral__Group__5__Impl ;
     public final void rule__XTypeLiteral__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19983:1: ( rule__XTypeLiteral__Group__5__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19984:2: rule__XTypeLiteral__Group__5__Impl
+            // InternalCheck.g:19983:1: ( rule__XTypeLiteral__Group__5__Impl )
+            // InternalCheck.g:19984:2: rule__XTypeLiteral__Group__5__Impl
             {
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__5__Impl_in_rule__XTypeLiteral__Group__540359);
+            pushFollow(FOLLOW_2);
             rule__XTypeLiteral__Group__5__Impl();
 
             state._fsp--;
@@ -57394,22 +57394,22 @@ public final void rule__XTypeLiteral__Group__5() throws RecognitionException {
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19990:1: rule__XTypeLiteral__Group__5__Impl : ( ')' ) ;
+    // InternalCheck.g:19990:1: rule__XTypeLiteral__Group__5__Impl : ( ')' ) ;
     public final void rule__XTypeLiteral__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19994:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19995:1: ( ')' )
+            // InternalCheck.g:19994:1: ( ( ')' ) )
+            // InternalCheck.g:19995:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19995:1: ( ')' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19996:1: ')'
+            // InternalCheck.g:19995:1: ( ')' )
+            // InternalCheck.g:19996:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getRightParenthesisKeyword_5()); 
             }
-            match(input,73,FOLLOW_73_in_rule__XTypeLiteral__Group__5__Impl40387); if (state.failed) return ;
+            match(input,73,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXTypeLiteralAccess().getRightParenthesisKeyword_5()); 
             }
@@ -57435,21 +57435,21 @@ public final void rule__XTypeLiteral__Group__5__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XThrowExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20021:1: rule__XThrowExpression__Group__0 : rule__XThrowExpression__Group__0__Impl rule__XThrowExpression__Group__1 ;
+    // InternalCheck.g:20021:1: rule__XThrowExpression__Group__0 : rule__XThrowExpression__Group__0__Impl rule__XThrowExpression__Group__1 ;
     public final void rule__XThrowExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20025:1: ( rule__XThrowExpression__Group__0__Impl rule__XThrowExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20026:2: rule__XThrowExpression__Group__0__Impl rule__XThrowExpression__Group__1
+            // InternalCheck.g:20025:1: ( rule__XThrowExpression__Group__0__Impl rule__XThrowExpression__Group__1 )
+            // InternalCheck.g:20026:2: rule__XThrowExpression__Group__0__Impl rule__XThrowExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XThrowExpression__Group__0__Impl_in_rule__XThrowExpression__Group__040430);
+            pushFollow(FOLLOW_111);
             rule__XThrowExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XThrowExpression__Group__1_in_rule__XThrowExpression__Group__040433);
+            pushFollow(FOLLOW_2);
             rule__XThrowExpression__Group__1();
 
             state._fsp--;
@@ -57473,23 +57473,23 @@ public final void rule__XThrowExpression__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XThrowExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20033:1: rule__XThrowExpression__Group__0__Impl : ( () ) ;
+    // InternalCheck.g:20033:1: rule__XThrowExpression__Group__0__Impl : ( () ) ;
     public final void rule__XThrowExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20037:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20038:1: ( () )
+            // InternalCheck.g:20037:1: ( ( () ) )
+            // InternalCheck.g:20038:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20038:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20039:1: ()
+            // InternalCheck.g:20038:1: ( () )
+            // InternalCheck.g:20039:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXThrowExpressionAccess().getXThrowExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20040:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20042:1: 
+            // InternalCheck.g:20040:1: ()
+            // InternalCheck.g:20042:1: 
             {
             }
 
@@ -57514,21 +57514,21 @@ public final void rule__XThrowExpression__Group__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XThrowExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20052:1: rule__XThrowExpression__Group__1 : rule__XThrowExpression__Group__1__Impl rule__XThrowExpression__Group__2 ;
+    // InternalCheck.g:20052:1: rule__XThrowExpression__Group__1 : rule__XThrowExpression__Group__1__Impl rule__XThrowExpression__Group__2 ;
     public final void rule__XThrowExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20056:1: ( rule__XThrowExpression__Group__1__Impl rule__XThrowExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20057:2: rule__XThrowExpression__Group__1__Impl rule__XThrowExpression__Group__2
+            // InternalCheck.g:20056:1: ( rule__XThrowExpression__Group__1__Impl rule__XThrowExpression__Group__2 )
+            // InternalCheck.g:20057:2: rule__XThrowExpression__Group__1__Impl rule__XThrowExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XThrowExpression__Group__1__Impl_in_rule__XThrowExpression__Group__140491);
+            pushFollow(FOLLOW_32);
             rule__XThrowExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XThrowExpression__Group__2_in_rule__XThrowExpression__Group__140494);
+            pushFollow(FOLLOW_2);
             rule__XThrowExpression__Group__2();
 
             state._fsp--;
@@ -57552,22 +57552,22 @@ public final void rule__XThrowExpression__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XThrowExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20064:1: rule__XThrowExpression__Group__1__Impl : ( 'throw' ) ;
+    // InternalCheck.g:20064:1: rule__XThrowExpression__Group__1__Impl : ( 'throw' ) ;
     public final void rule__XThrowExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20068:1: ( ( 'throw' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20069:1: ( 'throw' )
+            // InternalCheck.g:20068:1: ( ( 'throw' ) )
+            // InternalCheck.g:20069:1: ( 'throw' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20069:1: ( 'throw' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20070:1: 'throw'
+            // InternalCheck.g:20069:1: ( 'throw' )
+            // InternalCheck.g:20070:1: 'throw'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXThrowExpressionAccess().getThrowKeyword_1()); 
             }
-            match(input,95,FOLLOW_95_in_rule__XThrowExpression__Group__1__Impl40522); if (state.failed) return ;
+            match(input,95,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXThrowExpressionAccess().getThrowKeyword_1()); 
             }
@@ -57593,16 +57593,16 @@ public final void rule__XThrowExpression__Group__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XThrowExpression__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20083:1: rule__XThrowExpression__Group__2 : rule__XThrowExpression__Group__2__Impl ;
+    // InternalCheck.g:20083:1: rule__XThrowExpression__Group__2 : rule__XThrowExpression__Group__2__Impl ;
     public final void rule__XThrowExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20087:1: ( rule__XThrowExpression__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20088:2: rule__XThrowExpression__Group__2__Impl
+            // InternalCheck.g:20087:1: ( rule__XThrowExpression__Group__2__Impl )
+            // InternalCheck.g:20088:2: rule__XThrowExpression__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__XThrowExpression__Group__2__Impl_in_rule__XThrowExpression__Group__240553);
+            pushFollow(FOLLOW_2);
             rule__XThrowExpression__Group__2__Impl();
 
             state._fsp--;
@@ -57626,25 +57626,25 @@ public final void rule__XThrowExpression__Group__2() throws RecognitionException
 
 
     // $ANTLR start "rule__XThrowExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20094:1: rule__XThrowExpression__Group__2__Impl : ( ( rule__XThrowExpression__ExpressionAssignment_2 ) ) ;
+    // InternalCheck.g:20094:1: rule__XThrowExpression__Group__2__Impl : ( ( rule__XThrowExpression__ExpressionAssignment_2 ) ) ;
     public final void rule__XThrowExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20098:1: ( ( ( rule__XThrowExpression__ExpressionAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20099:1: ( ( rule__XThrowExpression__ExpressionAssignment_2 ) )
+            // InternalCheck.g:20098:1: ( ( ( rule__XThrowExpression__ExpressionAssignment_2 ) ) )
+            // InternalCheck.g:20099:1: ( ( rule__XThrowExpression__ExpressionAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20099:1: ( ( rule__XThrowExpression__ExpressionAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20100:1: ( rule__XThrowExpression__ExpressionAssignment_2 )
+            // InternalCheck.g:20099:1: ( ( rule__XThrowExpression__ExpressionAssignment_2 ) )
+            // InternalCheck.g:20100:1: ( rule__XThrowExpression__ExpressionAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXThrowExpressionAccess().getExpressionAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20101:1: ( rule__XThrowExpression__ExpressionAssignment_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20101:2: rule__XThrowExpression__ExpressionAssignment_2
+            // InternalCheck.g:20101:1: ( rule__XThrowExpression__ExpressionAssignment_2 )
+            // InternalCheck.g:20101:2: rule__XThrowExpression__ExpressionAssignment_2
             {
-            pushFollow(FOLLOW_rule__XThrowExpression__ExpressionAssignment_2_in_rule__XThrowExpression__Group__2__Impl40580);
+            pushFollow(FOLLOW_2);
             rule__XThrowExpression__ExpressionAssignment_2();
 
             state._fsp--;
@@ -57677,21 +57677,21 @@ public final void rule__XThrowExpression__Group__2__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XReturnExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20117:1: rule__XReturnExpression__Group__0 : rule__XReturnExpression__Group__0__Impl rule__XReturnExpression__Group__1 ;
+    // InternalCheck.g:20117:1: rule__XReturnExpression__Group__0 : rule__XReturnExpression__Group__0__Impl rule__XReturnExpression__Group__1 ;
     public final void rule__XReturnExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20121:1: ( rule__XReturnExpression__Group__0__Impl rule__XReturnExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20122:2: rule__XReturnExpression__Group__0__Impl rule__XReturnExpression__Group__1
+            // InternalCheck.g:20121:1: ( rule__XReturnExpression__Group__0__Impl rule__XReturnExpression__Group__1 )
+            // InternalCheck.g:20122:2: rule__XReturnExpression__Group__0__Impl rule__XReturnExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XReturnExpression__Group__0__Impl_in_rule__XReturnExpression__Group__040616);
+            pushFollow(FOLLOW_112);
             rule__XReturnExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XReturnExpression__Group__1_in_rule__XReturnExpression__Group__040619);
+            pushFollow(FOLLOW_2);
             rule__XReturnExpression__Group__1();
 
             state._fsp--;
@@ -57715,23 +57715,23 @@ public final void rule__XReturnExpression__Group__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XReturnExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20129:1: rule__XReturnExpression__Group__0__Impl : ( () ) ;
+    // InternalCheck.g:20129:1: rule__XReturnExpression__Group__0__Impl : ( () ) ;
     public final void rule__XReturnExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20133:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20134:1: ( () )
+            // InternalCheck.g:20133:1: ( ( () ) )
+            // InternalCheck.g:20134:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20134:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20135:1: ()
+            // InternalCheck.g:20134:1: ( () )
+            // InternalCheck.g:20135:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXReturnExpressionAccess().getXReturnExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20136:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20138:1: 
+            // InternalCheck.g:20136:1: ()
+            // InternalCheck.g:20138:1: 
             {
             }
 
@@ -57756,21 +57756,21 @@ public final void rule__XReturnExpression__Group__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XReturnExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20148:1: rule__XReturnExpression__Group__1 : rule__XReturnExpression__Group__1__Impl rule__XReturnExpression__Group__2 ;
+    // InternalCheck.g:20148:1: rule__XReturnExpression__Group__1 : rule__XReturnExpression__Group__1__Impl rule__XReturnExpression__Group__2 ;
     public final void rule__XReturnExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20152:1: ( rule__XReturnExpression__Group__1__Impl rule__XReturnExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20153:2: rule__XReturnExpression__Group__1__Impl rule__XReturnExpression__Group__2
+            // InternalCheck.g:20152:1: ( rule__XReturnExpression__Group__1__Impl rule__XReturnExpression__Group__2 )
+            // InternalCheck.g:20153:2: rule__XReturnExpression__Group__1__Impl rule__XReturnExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XReturnExpression__Group__1__Impl_in_rule__XReturnExpression__Group__140677);
+            pushFollow(FOLLOW_32);
             rule__XReturnExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XReturnExpression__Group__2_in_rule__XReturnExpression__Group__140680);
+            pushFollow(FOLLOW_2);
             rule__XReturnExpression__Group__2();
 
             state._fsp--;
@@ -57794,22 +57794,22 @@ public final void rule__XReturnExpression__Group__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XReturnExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20160:1: rule__XReturnExpression__Group__1__Impl : ( 'return' ) ;
+    // InternalCheck.g:20160:1: rule__XReturnExpression__Group__1__Impl : ( 'return' ) ;
     public final void rule__XReturnExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20164:1: ( ( 'return' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20165:1: ( 'return' )
+            // InternalCheck.g:20164:1: ( ( 'return' ) )
+            // InternalCheck.g:20165:1: ( 'return' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20165:1: ( 'return' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20166:1: 'return'
+            // InternalCheck.g:20165:1: ( 'return' )
+            // InternalCheck.g:20166:1: 'return'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXReturnExpressionAccess().getReturnKeyword_1()); 
             }
-            match(input,96,FOLLOW_96_in_rule__XReturnExpression__Group__1__Impl40708); if (state.failed) return ;
+            match(input,96,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXReturnExpressionAccess().getReturnKeyword_1()); 
             }
@@ -57835,16 +57835,16 @@ public final void rule__XReturnExpression__Group__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XReturnExpression__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20179:1: rule__XReturnExpression__Group__2 : rule__XReturnExpression__Group__2__Impl ;
+    // InternalCheck.g:20179:1: rule__XReturnExpression__Group__2 : rule__XReturnExpression__Group__2__Impl ;
     public final void rule__XReturnExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20183:1: ( rule__XReturnExpression__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20184:2: rule__XReturnExpression__Group__2__Impl
+            // InternalCheck.g:20183:1: ( rule__XReturnExpression__Group__2__Impl )
+            // InternalCheck.g:20184:2: rule__XReturnExpression__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__XReturnExpression__Group__2__Impl_in_rule__XReturnExpression__Group__240739);
+            pushFollow(FOLLOW_2);
             rule__XReturnExpression__Group__2__Impl();
 
             state._fsp--;
@@ -57868,29 +57868,29 @@ public final void rule__XReturnExpression__Group__2() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XReturnExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20190:1: rule__XReturnExpression__Group__2__Impl : ( ( rule__XReturnExpression__ExpressionAssignment_2 )? ) ;
+    // InternalCheck.g:20190:1: rule__XReturnExpression__Group__2__Impl : ( ( rule__XReturnExpression__ExpressionAssignment_2 )? ) ;
     public final void rule__XReturnExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20194:1: ( ( ( rule__XReturnExpression__ExpressionAssignment_2 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20195:1: ( ( rule__XReturnExpression__ExpressionAssignment_2 )? )
+            // InternalCheck.g:20194:1: ( ( ( rule__XReturnExpression__ExpressionAssignment_2 )? ) )
+            // InternalCheck.g:20195:1: ( ( rule__XReturnExpression__ExpressionAssignment_2 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20195:1: ( ( rule__XReturnExpression__ExpressionAssignment_2 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20196:1: ( rule__XReturnExpression__ExpressionAssignment_2 )?
+            // InternalCheck.g:20195:1: ( ( rule__XReturnExpression__ExpressionAssignment_2 )? )
+            // InternalCheck.g:20196:1: ( rule__XReturnExpression__ExpressionAssignment_2 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXReturnExpressionAccess().getExpressionAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20197:1: ( rule__XReturnExpression__ExpressionAssignment_2 )?
+            // InternalCheck.g:20197:1: ( rule__XReturnExpression__ExpressionAssignment_2 )?
             int alt150=2;
             alt150 = dfa150.predict(input);
             switch (alt150) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20197:2: rule__XReturnExpression__ExpressionAssignment_2
+                    // InternalCheck.g:20197:2: rule__XReturnExpression__ExpressionAssignment_2
                     {
-                    pushFollow(FOLLOW_rule__XReturnExpression__ExpressionAssignment_2_in_rule__XReturnExpression__Group__2__Impl40766);
+                    pushFollow(FOLLOW_2);
                     rule__XReturnExpression__ExpressionAssignment_2();
 
                     state._fsp--;
@@ -57926,21 +57926,21 @@ public final void rule__XReturnExpression__Group__2__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20213:1: rule__XTryCatchFinallyExpression__Group__0 : rule__XTryCatchFinallyExpression__Group__0__Impl rule__XTryCatchFinallyExpression__Group__1 ;
+    // InternalCheck.g:20213:1: rule__XTryCatchFinallyExpression__Group__0 : rule__XTryCatchFinallyExpression__Group__0__Impl rule__XTryCatchFinallyExpression__Group__1 ;
     public final void rule__XTryCatchFinallyExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20217:1: ( rule__XTryCatchFinallyExpression__Group__0__Impl rule__XTryCatchFinallyExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20218:2: rule__XTryCatchFinallyExpression__Group__0__Impl rule__XTryCatchFinallyExpression__Group__1
+            // InternalCheck.g:20217:1: ( rule__XTryCatchFinallyExpression__Group__0__Impl rule__XTryCatchFinallyExpression__Group__1 )
+            // InternalCheck.g:20218:2: rule__XTryCatchFinallyExpression__Group__0__Impl rule__XTryCatchFinallyExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group__0__Impl_in_rule__XTryCatchFinallyExpression__Group__040803);
+            pushFollow(FOLLOW_113);
             rule__XTryCatchFinallyExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group__1_in_rule__XTryCatchFinallyExpression__Group__040806);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Group__1();
 
             state._fsp--;
@@ -57964,23 +57964,23 @@ public final void rule__XTryCatchFinallyExpression__Group__0() throws Recognitio
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20225:1: rule__XTryCatchFinallyExpression__Group__0__Impl : ( () ) ;
+    // InternalCheck.g:20225:1: rule__XTryCatchFinallyExpression__Group__0__Impl : ( () ) ;
     public final void rule__XTryCatchFinallyExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20229:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20230:1: ( () )
+            // InternalCheck.g:20229:1: ( ( () ) )
+            // InternalCheck.g:20230:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20230:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20231:1: ()
+            // InternalCheck.g:20230:1: ( () )
+            // InternalCheck.g:20231:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getXTryCatchFinallyExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20232:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20234:1: 
+            // InternalCheck.g:20232:1: ()
+            // InternalCheck.g:20234:1: 
             {
             }
 
@@ -58005,21 +58005,21 @@ public final void rule__XTryCatchFinallyExpression__Group__0__Impl() throws Reco
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20244:1: rule__XTryCatchFinallyExpression__Group__1 : rule__XTryCatchFinallyExpression__Group__1__Impl rule__XTryCatchFinallyExpression__Group__2 ;
+    // InternalCheck.g:20244:1: rule__XTryCatchFinallyExpression__Group__1 : rule__XTryCatchFinallyExpression__Group__1__Impl rule__XTryCatchFinallyExpression__Group__2 ;
     public final void rule__XTryCatchFinallyExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20248:1: ( rule__XTryCatchFinallyExpression__Group__1__Impl rule__XTryCatchFinallyExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20249:2: rule__XTryCatchFinallyExpression__Group__1__Impl rule__XTryCatchFinallyExpression__Group__2
+            // InternalCheck.g:20248:1: ( rule__XTryCatchFinallyExpression__Group__1__Impl rule__XTryCatchFinallyExpression__Group__2 )
+            // InternalCheck.g:20249:2: rule__XTryCatchFinallyExpression__Group__1__Impl rule__XTryCatchFinallyExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group__1__Impl_in_rule__XTryCatchFinallyExpression__Group__140864);
+            pushFollow(FOLLOW_32);
             rule__XTryCatchFinallyExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group__2_in_rule__XTryCatchFinallyExpression__Group__140867);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Group__2();
 
             state._fsp--;
@@ -58043,22 +58043,22 @@ public final void rule__XTryCatchFinallyExpression__Group__1() throws Recognitio
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20256:1: rule__XTryCatchFinallyExpression__Group__1__Impl : ( 'try' ) ;
+    // InternalCheck.g:20256:1: rule__XTryCatchFinallyExpression__Group__1__Impl : ( 'try' ) ;
     public final void rule__XTryCatchFinallyExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20260:1: ( ( 'try' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20261:1: ( 'try' )
+            // InternalCheck.g:20260:1: ( ( 'try' ) )
+            // InternalCheck.g:20261:1: ( 'try' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20261:1: ( 'try' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20262:1: 'try'
+            // InternalCheck.g:20261:1: ( 'try' )
+            // InternalCheck.g:20262:1: 'try'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getTryKeyword_1()); 
             }
-            match(input,97,FOLLOW_97_in_rule__XTryCatchFinallyExpression__Group__1__Impl40895); if (state.failed) return ;
+            match(input,97,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXTryCatchFinallyExpressionAccess().getTryKeyword_1()); 
             }
@@ -58084,21 +58084,21 @@ public final void rule__XTryCatchFinallyExpression__Group__1__Impl() throws Reco
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20275:1: rule__XTryCatchFinallyExpression__Group__2 : rule__XTryCatchFinallyExpression__Group__2__Impl rule__XTryCatchFinallyExpression__Group__3 ;
+    // InternalCheck.g:20275:1: rule__XTryCatchFinallyExpression__Group__2 : rule__XTryCatchFinallyExpression__Group__2__Impl rule__XTryCatchFinallyExpression__Group__3 ;
     public final void rule__XTryCatchFinallyExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20279:1: ( rule__XTryCatchFinallyExpression__Group__2__Impl rule__XTryCatchFinallyExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20280:2: rule__XTryCatchFinallyExpression__Group__2__Impl rule__XTryCatchFinallyExpression__Group__3
+            // InternalCheck.g:20279:1: ( rule__XTryCatchFinallyExpression__Group__2__Impl rule__XTryCatchFinallyExpression__Group__3 )
+            // InternalCheck.g:20280:2: rule__XTryCatchFinallyExpression__Group__2__Impl rule__XTryCatchFinallyExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group__2__Impl_in_rule__XTryCatchFinallyExpression__Group__240926);
+            pushFollow(FOLLOW_114);
             rule__XTryCatchFinallyExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group__3_in_rule__XTryCatchFinallyExpression__Group__240929);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Group__3();
 
             state._fsp--;
@@ -58122,25 +58122,25 @@ public final void rule__XTryCatchFinallyExpression__Group__2() throws Recognitio
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20287:1: rule__XTryCatchFinallyExpression__Group__2__Impl : ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) ) ;
+    // InternalCheck.g:20287:1: rule__XTryCatchFinallyExpression__Group__2__Impl : ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) ) ;
     public final void rule__XTryCatchFinallyExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20291:1: ( ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20292:1: ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) )
+            // InternalCheck.g:20291:1: ( ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) ) )
+            // InternalCheck.g:20292:1: ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20292:1: ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20293:1: ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 )
+            // InternalCheck.g:20292:1: ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) )
+            // InternalCheck.g:20293:1: ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getExpressionAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20294:1: ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20294:2: rule__XTryCatchFinallyExpression__ExpressionAssignment_2
+            // InternalCheck.g:20294:1: ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 )
+            // InternalCheck.g:20294:2: rule__XTryCatchFinallyExpression__ExpressionAssignment_2
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__ExpressionAssignment_2_in_rule__XTryCatchFinallyExpression__Group__2__Impl40956);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__ExpressionAssignment_2();
 
             state._fsp--;
@@ -58173,16 +58173,16 @@ public final void rule__XTryCatchFinallyExpression__Group__2__Impl() throws Reco
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20304:1: rule__XTryCatchFinallyExpression__Group__3 : rule__XTryCatchFinallyExpression__Group__3__Impl ;
+    // InternalCheck.g:20304:1: rule__XTryCatchFinallyExpression__Group__3 : rule__XTryCatchFinallyExpression__Group__3__Impl ;
     public final void rule__XTryCatchFinallyExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20308:1: ( rule__XTryCatchFinallyExpression__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20309:2: rule__XTryCatchFinallyExpression__Group__3__Impl
+            // InternalCheck.g:20308:1: ( rule__XTryCatchFinallyExpression__Group__3__Impl )
+            // InternalCheck.g:20309:2: rule__XTryCatchFinallyExpression__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group__3__Impl_in_rule__XTryCatchFinallyExpression__Group__340986);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Group__3__Impl();
 
             state._fsp--;
@@ -58206,25 +58206,25 @@ public final void rule__XTryCatchFinallyExpression__Group__3() throws Recognitio
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20315:1: rule__XTryCatchFinallyExpression__Group__3__Impl : ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) ) ;
+    // InternalCheck.g:20315:1: rule__XTryCatchFinallyExpression__Group__3__Impl : ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) ) ;
     public final void rule__XTryCatchFinallyExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20319:1: ( ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20320:1: ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) )
+            // InternalCheck.g:20319:1: ( ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) ) )
+            // InternalCheck.g:20320:1: ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20320:1: ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20321:1: ( rule__XTryCatchFinallyExpression__Alternatives_3 )
+            // InternalCheck.g:20320:1: ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) )
+            // InternalCheck.g:20321:1: ( rule__XTryCatchFinallyExpression__Alternatives_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getAlternatives_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20322:1: ( rule__XTryCatchFinallyExpression__Alternatives_3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20322:2: rule__XTryCatchFinallyExpression__Alternatives_3
+            // InternalCheck.g:20322:1: ( rule__XTryCatchFinallyExpression__Alternatives_3 )
+            // InternalCheck.g:20322:2: rule__XTryCatchFinallyExpression__Alternatives_3
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Alternatives_3_in_rule__XTryCatchFinallyExpression__Group__3__Impl41013);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Alternatives_3();
 
             state._fsp--;
@@ -58257,21 +58257,21 @@ public final void rule__XTryCatchFinallyExpression__Group__3__Impl() throws Reco
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20340:1: rule__XTryCatchFinallyExpression__Group_3_0__0 : rule__XTryCatchFinallyExpression__Group_3_0__0__Impl rule__XTryCatchFinallyExpression__Group_3_0__1 ;
+    // InternalCheck.g:20340:1: rule__XTryCatchFinallyExpression__Group_3_0__0 : rule__XTryCatchFinallyExpression__Group_3_0__0__Impl rule__XTryCatchFinallyExpression__Group_3_0__1 ;
     public final void rule__XTryCatchFinallyExpression__Group_3_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20344:1: ( rule__XTryCatchFinallyExpression__Group_3_0__0__Impl rule__XTryCatchFinallyExpression__Group_3_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20345:2: rule__XTryCatchFinallyExpression__Group_3_0__0__Impl rule__XTryCatchFinallyExpression__Group_3_0__1
+            // InternalCheck.g:20344:1: ( rule__XTryCatchFinallyExpression__Group_3_0__0__Impl rule__XTryCatchFinallyExpression__Group_3_0__1 )
+            // InternalCheck.g:20345:2: rule__XTryCatchFinallyExpression__Group_3_0__0__Impl rule__XTryCatchFinallyExpression__Group_3_0__1
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0__0__Impl_in_rule__XTryCatchFinallyExpression__Group_3_0__041051);
+            pushFollow(FOLLOW_115);
             rule__XTryCatchFinallyExpression__Group_3_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0__1_in_rule__XTryCatchFinallyExpression__Group_3_0__041054);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Group_3_0__1();
 
             state._fsp--;
@@ -58295,28 +58295,28 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0__0() throws Recogn
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20352:1: rule__XTryCatchFinallyExpression__Group_3_0__0__Impl : ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) ) ;
+    // InternalCheck.g:20352:1: rule__XTryCatchFinallyExpression__Group_3_0__0__Impl : ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) ) ;
     public final void rule__XTryCatchFinallyExpression__Group_3_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20356:1: ( ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20357:1: ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) )
+            // InternalCheck.g:20356:1: ( ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) ) )
+            // InternalCheck.g:20357:1: ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20357:1: ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20358:1: ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* )
+            // InternalCheck.g:20357:1: ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) )
+            // InternalCheck.g:20358:1: ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20358:1: ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20359:1: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )
+            // InternalCheck.g:20358:1: ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) )
+            // InternalCheck.g:20359:1: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getCatchClausesAssignment_3_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20360:1: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20360:2: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0
+            // InternalCheck.g:20360:1: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )
+            // InternalCheck.g:20360:2: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0_in_rule__XTryCatchFinallyExpression__Group_3_0__0__Impl41083);
+            pushFollow(FOLLOW_116);
             rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0();
 
             state._fsp--;
@@ -58330,13 +58330,13 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0__0__Impl() throws
 
             }
 
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20363:1: ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20364:1: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )*
+            // InternalCheck.g:20363:1: ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* )
+            // InternalCheck.g:20364:1: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getCatchClausesAssignment_3_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20365:1: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )*
+            // InternalCheck.g:20365:1: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )*
             loop151:
             do {
                 int alt151=2;
@@ -58355,9 +58355,9 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0__0__Impl() throws
 
                 switch (alt151) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20365:2: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0
+            	    // InternalCheck.g:20365:2: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0
             	    {
-            	    pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0_in_rule__XTryCatchFinallyExpression__Group_3_0__0__Impl41095);
+            	    pushFollow(FOLLOW_116);
             	    rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0();
 
             	    state._fsp--;
@@ -58399,16 +58399,16 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0__0__Impl() throws
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20376:1: rule__XTryCatchFinallyExpression__Group_3_0__1 : rule__XTryCatchFinallyExpression__Group_3_0__1__Impl ;
+    // InternalCheck.g:20376:1: rule__XTryCatchFinallyExpression__Group_3_0__1 : rule__XTryCatchFinallyExpression__Group_3_0__1__Impl ;
     public final void rule__XTryCatchFinallyExpression__Group_3_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20380:1: ( rule__XTryCatchFinallyExpression__Group_3_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20381:2: rule__XTryCatchFinallyExpression__Group_3_0__1__Impl
+            // InternalCheck.g:20380:1: ( rule__XTryCatchFinallyExpression__Group_3_0__1__Impl )
+            // InternalCheck.g:20381:2: rule__XTryCatchFinallyExpression__Group_3_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0__1__Impl_in_rule__XTryCatchFinallyExpression__Group_3_0__141128);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Group_3_0__1__Impl();
 
             state._fsp--;
@@ -58432,22 +58432,22 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0__1() throws Recogn
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20387:1: rule__XTryCatchFinallyExpression__Group_3_0__1__Impl : ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? ) ;
+    // InternalCheck.g:20387:1: rule__XTryCatchFinallyExpression__Group_3_0__1__Impl : ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? ) ;
     public final void rule__XTryCatchFinallyExpression__Group_3_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20391:1: ( ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20392:1: ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? )
+            // InternalCheck.g:20391:1: ( ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? ) )
+            // InternalCheck.g:20392:1: ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20392:1: ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20393:1: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )?
+            // InternalCheck.g:20392:1: ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? )
+            // InternalCheck.g:20393:1: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getGroup_3_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20394:1: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )?
+            // InternalCheck.g:20394:1: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )?
             int alt152=2;
             int LA152_0 = input.LA(1);
 
@@ -58460,9 +58460,9 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0__1__Impl() throws
             }
             switch (alt152) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20394:2: rule__XTryCatchFinallyExpression__Group_3_0_1__0
+                    // InternalCheck.g:20394:2: rule__XTryCatchFinallyExpression__Group_3_0_1__0
                     {
-                    pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__0_in_rule__XTryCatchFinallyExpression__Group_3_0__1__Impl41155);
+                    pushFollow(FOLLOW_2);
                     rule__XTryCatchFinallyExpression__Group_3_0_1__0();
 
                     state._fsp--;
@@ -58498,21 +58498,21 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0__1__Impl() throws
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20408:1: rule__XTryCatchFinallyExpression__Group_3_0_1__0 : rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_0_1__1 ;
+    // InternalCheck.g:20408:1: rule__XTryCatchFinallyExpression__Group_3_0_1__0 : rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_0_1__1 ;
     public final void rule__XTryCatchFinallyExpression__Group_3_0_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20412:1: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_0_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20413:2: rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_0_1__1
+            // InternalCheck.g:20412:1: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_0_1__1 )
+            // InternalCheck.g:20413:2: rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_0_1__1
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl_in_rule__XTryCatchFinallyExpression__Group_3_0_1__041190);
+            pushFollow(FOLLOW_32);
             rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__1_in_rule__XTryCatchFinallyExpression__Group_3_0_1__041193);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Group_3_0_1__1();
 
             state._fsp--;
@@ -58536,25 +58536,25 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0_1__0() throws Reco
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20420:1: rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl : ( ( 'finally' ) ) ;
+    // InternalCheck.g:20420:1: rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl : ( ( 'finally' ) ) ;
     public final void rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20424:1: ( ( ( 'finally' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20425:1: ( ( 'finally' ) )
+            // InternalCheck.g:20424:1: ( ( ( 'finally' ) ) )
+            // InternalCheck.g:20425:1: ( ( 'finally' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20425:1: ( ( 'finally' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20426:1: ( 'finally' )
+            // InternalCheck.g:20425:1: ( ( 'finally' ) )
+            // InternalCheck.g:20426:1: ( 'finally' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyKeyword_3_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20427:1: ( 'finally' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20428:2: 'finally'
+            // InternalCheck.g:20427:1: ( 'finally' )
+            // InternalCheck.g:20428:2: 'finally'
             {
-            match(input,98,FOLLOW_98_in_rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl41222); if (state.failed) return ;
+            match(input,98,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -58583,16 +58583,16 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl() throw
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20439:1: rule__XTryCatchFinallyExpression__Group_3_0_1__1 : rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl ;
+    // InternalCheck.g:20439:1: rule__XTryCatchFinallyExpression__Group_3_0_1__1 : rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl ;
     public final void rule__XTryCatchFinallyExpression__Group_3_0_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20443:1: ( rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20444:2: rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl
+            // InternalCheck.g:20443:1: ( rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl )
+            // InternalCheck.g:20444:2: rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl_in_rule__XTryCatchFinallyExpression__Group_3_0_1__141254);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl();
 
             state._fsp--;
@@ -58616,25 +58616,25 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0_1__1() throws Reco
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20450:1: rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl : ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) ) ;
+    // InternalCheck.g:20450:1: rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl : ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) ) ;
     public final void rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20454:1: ( ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20455:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) )
+            // InternalCheck.g:20454:1: ( ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) ) )
+            // InternalCheck.g:20455:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20455:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20456:1: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 )
+            // InternalCheck.g:20455:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) )
+            // InternalCheck.g:20456:1: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyExpressionAssignment_3_0_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20457:1: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20457:2: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1
+            // InternalCheck.g:20457:1: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 )
+            // InternalCheck.g:20457:2: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1_in_rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl41281);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1();
 
             state._fsp--;
@@ -58667,21 +58667,21 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl() throw
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20471:1: rule__XTryCatchFinallyExpression__Group_3_1__0 : rule__XTryCatchFinallyExpression__Group_3_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_1__1 ;
+    // InternalCheck.g:20471:1: rule__XTryCatchFinallyExpression__Group_3_1__0 : rule__XTryCatchFinallyExpression__Group_3_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_1__1 ;
     public final void rule__XTryCatchFinallyExpression__Group_3_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20475:1: ( rule__XTryCatchFinallyExpression__Group_3_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20476:2: rule__XTryCatchFinallyExpression__Group_3_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_1__1
+            // InternalCheck.g:20475:1: ( rule__XTryCatchFinallyExpression__Group_3_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_1__1 )
+            // InternalCheck.g:20476:2: rule__XTryCatchFinallyExpression__Group_3_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_1__1
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_1__0__Impl_in_rule__XTryCatchFinallyExpression__Group_3_1__041315);
+            pushFollow(FOLLOW_32);
             rule__XTryCatchFinallyExpression__Group_3_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_1__1_in_rule__XTryCatchFinallyExpression__Group_3_1__041318);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Group_3_1__1();
 
             state._fsp--;
@@ -58705,22 +58705,22 @@ public final void rule__XTryCatchFinallyExpression__Group_3_1__0() throws Recogn
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20483:1: rule__XTryCatchFinallyExpression__Group_3_1__0__Impl : ( 'finally' ) ;
+    // InternalCheck.g:20483:1: rule__XTryCatchFinallyExpression__Group_3_1__0__Impl : ( 'finally' ) ;
     public final void rule__XTryCatchFinallyExpression__Group_3_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20487:1: ( ( 'finally' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20488:1: ( 'finally' )
+            // InternalCheck.g:20487:1: ( ( 'finally' ) )
+            // InternalCheck.g:20488:1: ( 'finally' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20488:1: ( 'finally' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20489:1: 'finally'
+            // InternalCheck.g:20488:1: ( 'finally' )
+            // InternalCheck.g:20489:1: 'finally'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyKeyword_3_1_0()); 
             }
-            match(input,98,FOLLOW_98_in_rule__XTryCatchFinallyExpression__Group_3_1__0__Impl41346); if (state.failed) return ;
+            match(input,98,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyKeyword_3_1_0()); 
             }
@@ -58746,16 +58746,16 @@ public final void rule__XTryCatchFinallyExpression__Group_3_1__0__Impl() throws
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20502:1: rule__XTryCatchFinallyExpression__Group_3_1__1 : rule__XTryCatchFinallyExpression__Group_3_1__1__Impl ;
+    // InternalCheck.g:20502:1: rule__XTryCatchFinallyExpression__Group_3_1__1 : rule__XTryCatchFinallyExpression__Group_3_1__1__Impl ;
     public final void rule__XTryCatchFinallyExpression__Group_3_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20506:1: ( rule__XTryCatchFinallyExpression__Group_3_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20507:2: rule__XTryCatchFinallyExpression__Group_3_1__1__Impl
+            // InternalCheck.g:20506:1: ( rule__XTryCatchFinallyExpression__Group_3_1__1__Impl )
+            // InternalCheck.g:20507:2: rule__XTryCatchFinallyExpression__Group_3_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_1__1__Impl_in_rule__XTryCatchFinallyExpression__Group_3_1__141377);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Group_3_1__1__Impl();
 
             state._fsp--;
@@ -58779,25 +58779,25 @@ public final void rule__XTryCatchFinallyExpression__Group_3_1__1() throws Recogn
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20513:1: rule__XTryCatchFinallyExpression__Group_3_1__1__Impl : ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) ) ;
+    // InternalCheck.g:20513:1: rule__XTryCatchFinallyExpression__Group_3_1__1__Impl : ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) ) ;
     public final void rule__XTryCatchFinallyExpression__Group_3_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20517:1: ( ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20518:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) )
+            // InternalCheck.g:20517:1: ( ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) ) )
+            // InternalCheck.g:20518:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20518:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20519:1: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 )
+            // InternalCheck.g:20518:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) )
+            // InternalCheck.g:20519:1: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyExpressionAssignment_3_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20520:1: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20520:2: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1
+            // InternalCheck.g:20520:1: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 )
+            // InternalCheck.g:20520:2: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1_in_rule__XTryCatchFinallyExpression__Group_3_1__1__Impl41404);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1();
 
             state._fsp--;
@@ -58830,21 +58830,21 @@ public final void rule__XTryCatchFinallyExpression__Group_3_1__1__Impl() throws
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20534:1: rule__XSynchronizedExpression__Group__0 : rule__XSynchronizedExpression__Group__0__Impl rule__XSynchronizedExpression__Group__1 ;
+    // InternalCheck.g:20534:1: rule__XSynchronizedExpression__Group__0 : rule__XSynchronizedExpression__Group__0__Impl rule__XSynchronizedExpression__Group__1 ;
     public final void rule__XSynchronizedExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20538:1: ( rule__XSynchronizedExpression__Group__0__Impl rule__XSynchronizedExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20539:2: rule__XSynchronizedExpression__Group__0__Impl rule__XSynchronizedExpression__Group__1
+            // InternalCheck.g:20538:1: ( rule__XSynchronizedExpression__Group__0__Impl rule__XSynchronizedExpression__Group__1 )
+            // InternalCheck.g:20539:2: rule__XSynchronizedExpression__Group__0__Impl rule__XSynchronizedExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group__0__Impl_in_rule__XSynchronizedExpression__Group__041438);
+            pushFollow(FOLLOW_32);
             rule__XSynchronizedExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group__1_in_rule__XSynchronizedExpression__Group__041441);
+            pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group__1();
 
             state._fsp--;
@@ -58868,25 +58868,25 @@ public final void rule__XSynchronizedExpression__Group__0() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20546:1: rule__XSynchronizedExpression__Group__0__Impl : ( ( rule__XSynchronizedExpression__Group_0__0 ) ) ;
+    // InternalCheck.g:20546:1: rule__XSynchronizedExpression__Group__0__Impl : ( ( rule__XSynchronizedExpression__Group_0__0 ) ) ;
     public final void rule__XSynchronizedExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20550:1: ( ( ( rule__XSynchronizedExpression__Group_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20551:1: ( ( rule__XSynchronizedExpression__Group_0__0 ) )
+            // InternalCheck.g:20550:1: ( ( ( rule__XSynchronizedExpression__Group_0__0 ) ) )
+            // InternalCheck.g:20551:1: ( ( rule__XSynchronizedExpression__Group_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20551:1: ( ( rule__XSynchronizedExpression__Group_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20552:1: ( rule__XSynchronizedExpression__Group_0__0 )
+            // InternalCheck.g:20551:1: ( ( rule__XSynchronizedExpression__Group_0__0 ) )
+            // InternalCheck.g:20552:1: ( rule__XSynchronizedExpression__Group_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getGroup_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20553:1: ( rule__XSynchronizedExpression__Group_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20553:2: rule__XSynchronizedExpression__Group_0__0
+            // InternalCheck.g:20553:1: ( rule__XSynchronizedExpression__Group_0__0 )
+            // InternalCheck.g:20553:2: rule__XSynchronizedExpression__Group_0__0
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group_0__0_in_rule__XSynchronizedExpression__Group__0__Impl41468);
+            pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group_0__0();
 
             state._fsp--;
@@ -58919,21 +58919,21 @@ public final void rule__XSynchronizedExpression__Group__0__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20563:1: rule__XSynchronizedExpression__Group__1 : rule__XSynchronizedExpression__Group__1__Impl rule__XSynchronizedExpression__Group__2 ;
+    // InternalCheck.g:20563:1: rule__XSynchronizedExpression__Group__1 : rule__XSynchronizedExpression__Group__1__Impl rule__XSynchronizedExpression__Group__2 ;
     public final void rule__XSynchronizedExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20567:1: ( rule__XSynchronizedExpression__Group__1__Impl rule__XSynchronizedExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20568:2: rule__XSynchronizedExpression__Group__1__Impl rule__XSynchronizedExpression__Group__2
+            // InternalCheck.g:20567:1: ( rule__XSynchronizedExpression__Group__1__Impl rule__XSynchronizedExpression__Group__2 )
+            // InternalCheck.g:20568:2: rule__XSynchronizedExpression__Group__1__Impl rule__XSynchronizedExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group__1__Impl_in_rule__XSynchronizedExpression__Group__141498);
+            pushFollow(FOLLOW_28);
             rule__XSynchronizedExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group__2_in_rule__XSynchronizedExpression__Group__141501);
+            pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group__2();
 
             state._fsp--;
@@ -58957,25 +58957,25 @@ public final void rule__XSynchronizedExpression__Group__1() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20575:1: rule__XSynchronizedExpression__Group__1__Impl : ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) ) ;
+    // InternalCheck.g:20575:1: rule__XSynchronizedExpression__Group__1__Impl : ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) ) ;
     public final void rule__XSynchronizedExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20579:1: ( ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20580:1: ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) )
+            // InternalCheck.g:20579:1: ( ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) ) )
+            // InternalCheck.g:20580:1: ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20580:1: ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20581:1: ( rule__XSynchronizedExpression__ParamAssignment_1 )
+            // InternalCheck.g:20580:1: ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) )
+            // InternalCheck.g:20581:1: ( rule__XSynchronizedExpression__ParamAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getParamAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20582:1: ( rule__XSynchronizedExpression__ParamAssignment_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20582:2: rule__XSynchronizedExpression__ParamAssignment_1
+            // InternalCheck.g:20582:1: ( rule__XSynchronizedExpression__ParamAssignment_1 )
+            // InternalCheck.g:20582:2: rule__XSynchronizedExpression__ParamAssignment_1
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__ParamAssignment_1_in_rule__XSynchronizedExpression__Group__1__Impl41528);
+            pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__ParamAssignment_1();
 
             state._fsp--;
@@ -59008,21 +59008,21 @@ public final void rule__XSynchronizedExpression__Group__1__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20592:1: rule__XSynchronizedExpression__Group__2 : rule__XSynchronizedExpression__Group__2__Impl rule__XSynchronizedExpression__Group__3 ;
+    // InternalCheck.g:20592:1: rule__XSynchronizedExpression__Group__2 : rule__XSynchronizedExpression__Group__2__Impl rule__XSynchronizedExpression__Group__3 ;
     public final void rule__XSynchronizedExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20596:1: ( rule__XSynchronizedExpression__Group__2__Impl rule__XSynchronizedExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20597:2: rule__XSynchronizedExpression__Group__2__Impl rule__XSynchronizedExpression__Group__3
+            // InternalCheck.g:20596:1: ( rule__XSynchronizedExpression__Group__2__Impl rule__XSynchronizedExpression__Group__3 )
+            // InternalCheck.g:20597:2: rule__XSynchronizedExpression__Group__2__Impl rule__XSynchronizedExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group__2__Impl_in_rule__XSynchronizedExpression__Group__241558);
+            pushFollow(FOLLOW_32);
             rule__XSynchronizedExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group__3_in_rule__XSynchronizedExpression__Group__241561);
+            pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group__3();
 
             state._fsp--;
@@ -59046,22 +59046,22 @@ public final void rule__XSynchronizedExpression__Group__2() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20604:1: rule__XSynchronizedExpression__Group__2__Impl : ( ')' ) ;
+    // InternalCheck.g:20604:1: rule__XSynchronizedExpression__Group__2__Impl : ( ')' ) ;
     public final void rule__XSynchronizedExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20608:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20609:1: ( ')' )
+            // InternalCheck.g:20608:1: ( ( ')' ) )
+            // InternalCheck.g:20609:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20609:1: ( ')' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20610:1: ')'
+            // InternalCheck.g:20609:1: ( ')' )
+            // InternalCheck.g:20610:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getRightParenthesisKeyword_2()); 
             }
-            match(input,73,FOLLOW_73_in_rule__XSynchronizedExpression__Group__2__Impl41589); if (state.failed) return ;
+            match(input,73,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSynchronizedExpressionAccess().getRightParenthesisKeyword_2()); 
             }
@@ -59087,16 +59087,16 @@ public final void rule__XSynchronizedExpression__Group__2__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20623:1: rule__XSynchronizedExpression__Group__3 : rule__XSynchronizedExpression__Group__3__Impl ;
+    // InternalCheck.g:20623:1: rule__XSynchronizedExpression__Group__3 : rule__XSynchronizedExpression__Group__3__Impl ;
     public final void rule__XSynchronizedExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20627:1: ( rule__XSynchronizedExpression__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20628:2: rule__XSynchronizedExpression__Group__3__Impl
+            // InternalCheck.g:20627:1: ( rule__XSynchronizedExpression__Group__3__Impl )
+            // InternalCheck.g:20628:2: rule__XSynchronizedExpression__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group__3__Impl_in_rule__XSynchronizedExpression__Group__341620);
+            pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group__3__Impl();
 
             state._fsp--;
@@ -59120,25 +59120,25 @@ public final void rule__XSynchronizedExpression__Group__3() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20634:1: rule__XSynchronizedExpression__Group__3__Impl : ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) ) ;
+    // InternalCheck.g:20634:1: rule__XSynchronizedExpression__Group__3__Impl : ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) ) ;
     public final void rule__XSynchronizedExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20638:1: ( ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20639:1: ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) )
+            // InternalCheck.g:20638:1: ( ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) ) )
+            // InternalCheck.g:20639:1: ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20639:1: ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20640:1: ( rule__XSynchronizedExpression__ExpressionAssignment_3 )
+            // InternalCheck.g:20639:1: ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) )
+            // InternalCheck.g:20640:1: ( rule__XSynchronizedExpression__ExpressionAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getExpressionAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20641:1: ( rule__XSynchronizedExpression__ExpressionAssignment_3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20641:2: rule__XSynchronizedExpression__ExpressionAssignment_3
+            // InternalCheck.g:20641:1: ( rule__XSynchronizedExpression__ExpressionAssignment_3 )
+            // InternalCheck.g:20641:2: rule__XSynchronizedExpression__ExpressionAssignment_3
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__ExpressionAssignment_3_in_rule__XSynchronizedExpression__Group__3__Impl41647);
+            pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__ExpressionAssignment_3();
 
             state._fsp--;
@@ -59171,16 +59171,16 @@ public final void rule__XSynchronizedExpression__Group__3__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20659:1: rule__XSynchronizedExpression__Group_0__0 : rule__XSynchronizedExpression__Group_0__0__Impl ;
+    // InternalCheck.g:20659:1: rule__XSynchronizedExpression__Group_0__0 : rule__XSynchronizedExpression__Group_0__0__Impl ;
     public final void rule__XSynchronizedExpression__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20663:1: ( rule__XSynchronizedExpression__Group_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20664:2: rule__XSynchronizedExpression__Group_0__0__Impl
+            // InternalCheck.g:20663:1: ( rule__XSynchronizedExpression__Group_0__0__Impl )
+            // InternalCheck.g:20664:2: rule__XSynchronizedExpression__Group_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group_0__0__Impl_in_rule__XSynchronizedExpression__Group_0__041685);
+            pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group_0__0__Impl();
 
             state._fsp--;
@@ -59204,25 +59204,25 @@ public final void rule__XSynchronizedExpression__Group_0__0() throws Recognition
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20670:1: rule__XSynchronizedExpression__Group_0__0__Impl : ( ( rule__XSynchronizedExpression__Group_0_0__0 ) ) ;
+    // InternalCheck.g:20670:1: rule__XSynchronizedExpression__Group_0__0__Impl : ( ( rule__XSynchronizedExpression__Group_0_0__0 ) ) ;
     public final void rule__XSynchronizedExpression__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20674:1: ( ( ( rule__XSynchronizedExpression__Group_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20675:1: ( ( rule__XSynchronizedExpression__Group_0_0__0 ) )
+            // InternalCheck.g:20674:1: ( ( ( rule__XSynchronizedExpression__Group_0_0__0 ) ) )
+            // InternalCheck.g:20675:1: ( ( rule__XSynchronizedExpression__Group_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20675:1: ( ( rule__XSynchronizedExpression__Group_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20676:1: ( rule__XSynchronizedExpression__Group_0_0__0 )
+            // InternalCheck.g:20675:1: ( ( rule__XSynchronizedExpression__Group_0_0__0 ) )
+            // InternalCheck.g:20676:1: ( rule__XSynchronizedExpression__Group_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getGroup_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20677:1: ( rule__XSynchronizedExpression__Group_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20677:2: rule__XSynchronizedExpression__Group_0_0__0
+            // InternalCheck.g:20677:1: ( rule__XSynchronizedExpression__Group_0_0__0 )
+            // InternalCheck.g:20677:2: rule__XSynchronizedExpression__Group_0_0__0
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group_0_0__0_in_rule__XSynchronizedExpression__Group_0__0__Impl41712);
+            pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group_0_0__0();
 
             state._fsp--;
@@ -59255,21 +59255,21 @@ public final void rule__XSynchronizedExpression__Group_0__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20689:1: rule__XSynchronizedExpression__Group_0_0__0 : rule__XSynchronizedExpression__Group_0_0__0__Impl rule__XSynchronizedExpression__Group_0_0__1 ;
+    // InternalCheck.g:20689:1: rule__XSynchronizedExpression__Group_0_0__0 : rule__XSynchronizedExpression__Group_0_0__0__Impl rule__XSynchronizedExpression__Group_0_0__1 ;
     public final void rule__XSynchronizedExpression__Group_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20693:1: ( rule__XSynchronizedExpression__Group_0_0__0__Impl rule__XSynchronizedExpression__Group_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20694:2: rule__XSynchronizedExpression__Group_0_0__0__Impl rule__XSynchronizedExpression__Group_0_0__1
+            // InternalCheck.g:20693:1: ( rule__XSynchronizedExpression__Group_0_0__0__Impl rule__XSynchronizedExpression__Group_0_0__1 )
+            // InternalCheck.g:20694:2: rule__XSynchronizedExpression__Group_0_0__0__Impl rule__XSynchronizedExpression__Group_0_0__1
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group_0_0__0__Impl_in_rule__XSynchronizedExpression__Group_0_0__041744);
+            pushFollow(FOLLOW_117);
             rule__XSynchronizedExpression__Group_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group_0_0__1_in_rule__XSynchronizedExpression__Group_0_0__041747);
+            pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group_0_0__1();
 
             state._fsp--;
@@ -59293,23 +59293,23 @@ public final void rule__XSynchronizedExpression__Group_0_0__0() throws Recogniti
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20701:1: rule__XSynchronizedExpression__Group_0_0__0__Impl : ( () ) ;
+    // InternalCheck.g:20701:1: rule__XSynchronizedExpression__Group_0_0__0__Impl : ( () ) ;
     public final void rule__XSynchronizedExpression__Group_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20705:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20706:1: ( () )
+            // InternalCheck.g:20705:1: ( ( () ) )
+            // InternalCheck.g:20706:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20706:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20707:1: ()
+            // InternalCheck.g:20706:1: ( () )
+            // InternalCheck.g:20707:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getXSynchronizedExpressionAction_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20708:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20710:1: 
+            // InternalCheck.g:20708:1: ()
+            // InternalCheck.g:20710:1: 
             {
             }
 
@@ -59334,21 +59334,21 @@ public final void rule__XSynchronizedExpression__Group_0_0__0__Impl() throws Rec
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20720:1: rule__XSynchronizedExpression__Group_0_0__1 : rule__XSynchronizedExpression__Group_0_0__1__Impl rule__XSynchronizedExpression__Group_0_0__2 ;
+    // InternalCheck.g:20720:1: rule__XSynchronizedExpression__Group_0_0__1 : rule__XSynchronizedExpression__Group_0_0__1__Impl rule__XSynchronizedExpression__Group_0_0__2 ;
     public final void rule__XSynchronizedExpression__Group_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20724:1: ( rule__XSynchronizedExpression__Group_0_0__1__Impl rule__XSynchronizedExpression__Group_0_0__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20725:2: rule__XSynchronizedExpression__Group_0_0__1__Impl rule__XSynchronizedExpression__Group_0_0__2
+            // InternalCheck.g:20724:1: ( rule__XSynchronizedExpression__Group_0_0__1__Impl rule__XSynchronizedExpression__Group_0_0__2 )
+            // InternalCheck.g:20725:2: rule__XSynchronizedExpression__Group_0_0__1__Impl rule__XSynchronizedExpression__Group_0_0__2
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group_0_0__1__Impl_in_rule__XSynchronizedExpression__Group_0_0__141805);
+            pushFollow(FOLLOW_26);
             rule__XSynchronizedExpression__Group_0_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group_0_0__2_in_rule__XSynchronizedExpression__Group_0_0__141808);
+            pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group_0_0__2();
 
             state._fsp--;
@@ -59372,22 +59372,22 @@ public final void rule__XSynchronizedExpression__Group_0_0__1() throws Recogniti
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20732:1: rule__XSynchronizedExpression__Group_0_0__1__Impl : ( 'synchronized' ) ;
+    // InternalCheck.g:20732:1: rule__XSynchronizedExpression__Group_0_0__1__Impl : ( 'synchronized' ) ;
     public final void rule__XSynchronizedExpression__Group_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20736:1: ( ( 'synchronized' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20737:1: ( 'synchronized' )
+            // InternalCheck.g:20736:1: ( ( 'synchronized' ) )
+            // InternalCheck.g:20737:1: ( 'synchronized' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20737:1: ( 'synchronized' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20738:1: 'synchronized'
+            // InternalCheck.g:20737:1: ( 'synchronized' )
+            // InternalCheck.g:20738:1: 'synchronized'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getSynchronizedKeyword_0_0_1()); 
             }
-            match(input,99,FOLLOW_99_in_rule__XSynchronizedExpression__Group_0_0__1__Impl41836); if (state.failed) return ;
+            match(input,99,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSynchronizedExpressionAccess().getSynchronizedKeyword_0_0_1()); 
             }
@@ -59413,16 +59413,16 @@ public final void rule__XSynchronizedExpression__Group_0_0__1__Impl() throws Rec
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0_0__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20751:1: rule__XSynchronizedExpression__Group_0_0__2 : rule__XSynchronizedExpression__Group_0_0__2__Impl ;
+    // InternalCheck.g:20751:1: rule__XSynchronizedExpression__Group_0_0__2 : rule__XSynchronizedExpression__Group_0_0__2__Impl ;
     public final void rule__XSynchronizedExpression__Group_0_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20755:1: ( rule__XSynchronizedExpression__Group_0_0__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20756:2: rule__XSynchronizedExpression__Group_0_0__2__Impl
+            // InternalCheck.g:20755:1: ( rule__XSynchronizedExpression__Group_0_0__2__Impl )
+            // InternalCheck.g:20756:2: rule__XSynchronizedExpression__Group_0_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group_0_0__2__Impl_in_rule__XSynchronizedExpression__Group_0_0__241867);
+            pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group_0_0__2__Impl();
 
             state._fsp--;
@@ -59446,22 +59446,22 @@ public final void rule__XSynchronizedExpression__Group_0_0__2() throws Recogniti
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0_0__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20762:1: rule__XSynchronizedExpression__Group_0_0__2__Impl : ( '(' ) ;
+    // InternalCheck.g:20762:1: rule__XSynchronizedExpression__Group_0_0__2__Impl : ( '(' ) ;
     public final void rule__XSynchronizedExpression__Group_0_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20766:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20767:1: ( '(' )
+            // InternalCheck.g:20766:1: ( ( '(' ) )
+            // InternalCheck.g:20767:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20767:1: ( '(' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20768:1: '('
+            // InternalCheck.g:20767:1: ( '(' )
+            // InternalCheck.g:20768:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getLeftParenthesisKeyword_0_0_2()); 
             }
-            match(input,72,FOLLOW_72_in_rule__XSynchronizedExpression__Group_0_0__2__Impl41895); if (state.failed) return ;
+            match(input,72,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSynchronizedExpressionAccess().getLeftParenthesisKeyword_0_0_2()); 
             }
@@ -59487,21 +59487,21 @@ public final void rule__XSynchronizedExpression__Group_0_0__2__Impl() throws Rec
 
 
     // $ANTLR start "rule__XCatchClause__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20787:1: rule__XCatchClause__Group__0 : rule__XCatchClause__Group__0__Impl rule__XCatchClause__Group__1 ;
+    // InternalCheck.g:20787:1: rule__XCatchClause__Group__0 : rule__XCatchClause__Group__0__Impl rule__XCatchClause__Group__1 ;
     public final void rule__XCatchClause__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20791:1: ( rule__XCatchClause__Group__0__Impl rule__XCatchClause__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20792:2: rule__XCatchClause__Group__0__Impl rule__XCatchClause__Group__1
+            // InternalCheck.g:20791:1: ( rule__XCatchClause__Group__0__Impl rule__XCatchClause__Group__1 )
+            // InternalCheck.g:20792:2: rule__XCatchClause__Group__0__Impl rule__XCatchClause__Group__1
             {
-            pushFollow(FOLLOW_rule__XCatchClause__Group__0__Impl_in_rule__XCatchClause__Group__041932);
+            pushFollow(FOLLOW_26);
             rule__XCatchClause__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCatchClause__Group__1_in_rule__XCatchClause__Group__041935);
+            pushFollow(FOLLOW_2);
             rule__XCatchClause__Group__1();
 
             state._fsp--;
@@ -59525,25 +59525,25 @@ public final void rule__XCatchClause__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCatchClause__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20799:1: rule__XCatchClause__Group__0__Impl : ( ( 'catch' ) ) ;
+    // InternalCheck.g:20799:1: rule__XCatchClause__Group__0__Impl : ( ( 'catch' ) ) ;
     public final void rule__XCatchClause__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20803:1: ( ( ( 'catch' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20804:1: ( ( 'catch' ) )
+            // InternalCheck.g:20803:1: ( ( ( 'catch' ) ) )
+            // InternalCheck.g:20804:1: ( ( 'catch' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20804:1: ( ( 'catch' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20805:1: ( 'catch' )
+            // InternalCheck.g:20804:1: ( ( 'catch' ) )
+            // InternalCheck.g:20805:1: ( 'catch' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getCatchKeyword_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20806:1: ( 'catch' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20807:2: 'catch'
+            // InternalCheck.g:20806:1: ( 'catch' )
+            // InternalCheck.g:20807:2: 'catch'
             {
-            match(input,100,FOLLOW_100_in_rule__XCatchClause__Group__0__Impl41964); if (state.failed) return ;
+            match(input,100,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -59572,21 +59572,21 @@ public final void rule__XCatchClause__Group__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XCatchClause__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20818:1: rule__XCatchClause__Group__1 : rule__XCatchClause__Group__1__Impl rule__XCatchClause__Group__2 ;
+    // InternalCheck.g:20818:1: rule__XCatchClause__Group__1 : rule__XCatchClause__Group__1__Impl rule__XCatchClause__Group__2 ;
     public final void rule__XCatchClause__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20822:1: ( rule__XCatchClause__Group__1__Impl rule__XCatchClause__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20823:2: rule__XCatchClause__Group__1__Impl rule__XCatchClause__Group__2
+            // InternalCheck.g:20822:1: ( rule__XCatchClause__Group__1__Impl rule__XCatchClause__Group__2 )
+            // InternalCheck.g:20823:2: rule__XCatchClause__Group__1__Impl rule__XCatchClause__Group__2
             {
-            pushFollow(FOLLOW_rule__XCatchClause__Group__1__Impl_in_rule__XCatchClause__Group__141996);
+            pushFollow(FOLLOW_29);
             rule__XCatchClause__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCatchClause__Group__2_in_rule__XCatchClause__Group__141999);
+            pushFollow(FOLLOW_2);
             rule__XCatchClause__Group__2();
 
             state._fsp--;
@@ -59610,22 +59610,22 @@ public final void rule__XCatchClause__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCatchClause__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20830:1: rule__XCatchClause__Group__1__Impl : ( '(' ) ;
+    // InternalCheck.g:20830:1: rule__XCatchClause__Group__1__Impl : ( '(' ) ;
     public final void rule__XCatchClause__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20834:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20835:1: ( '(' )
+            // InternalCheck.g:20834:1: ( ( '(' ) )
+            // InternalCheck.g:20835:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20835:1: ( '(' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20836:1: '('
+            // InternalCheck.g:20835:1: ( '(' )
+            // InternalCheck.g:20836:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getLeftParenthesisKeyword_1()); 
             }
-            match(input,72,FOLLOW_72_in_rule__XCatchClause__Group__1__Impl42027); if (state.failed) return ;
+            match(input,72,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXCatchClauseAccess().getLeftParenthesisKeyword_1()); 
             }
@@ -59651,21 +59651,21 @@ public final void rule__XCatchClause__Group__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XCatchClause__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20849:1: rule__XCatchClause__Group__2 : rule__XCatchClause__Group__2__Impl rule__XCatchClause__Group__3 ;
+    // InternalCheck.g:20849:1: rule__XCatchClause__Group__2 : rule__XCatchClause__Group__2__Impl rule__XCatchClause__Group__3 ;
     public final void rule__XCatchClause__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20853:1: ( rule__XCatchClause__Group__2__Impl rule__XCatchClause__Group__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20854:2: rule__XCatchClause__Group__2__Impl rule__XCatchClause__Group__3
+            // InternalCheck.g:20853:1: ( rule__XCatchClause__Group__2__Impl rule__XCatchClause__Group__3 )
+            // InternalCheck.g:20854:2: rule__XCatchClause__Group__2__Impl rule__XCatchClause__Group__3
             {
-            pushFollow(FOLLOW_rule__XCatchClause__Group__2__Impl_in_rule__XCatchClause__Group__242058);
+            pushFollow(FOLLOW_28);
             rule__XCatchClause__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCatchClause__Group__3_in_rule__XCatchClause__Group__242061);
+            pushFollow(FOLLOW_2);
             rule__XCatchClause__Group__3();
 
             state._fsp--;
@@ -59689,25 +59689,25 @@ public final void rule__XCatchClause__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCatchClause__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20861:1: rule__XCatchClause__Group__2__Impl : ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) ) ;
+    // InternalCheck.g:20861:1: rule__XCatchClause__Group__2__Impl : ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) ) ;
     public final void rule__XCatchClause__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20865:1: ( ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20866:1: ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) )
+            // InternalCheck.g:20865:1: ( ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) ) )
+            // InternalCheck.g:20866:1: ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20866:1: ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20867:1: ( rule__XCatchClause__DeclaredParamAssignment_2 )
+            // InternalCheck.g:20866:1: ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) )
+            // InternalCheck.g:20867:1: ( rule__XCatchClause__DeclaredParamAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getDeclaredParamAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20868:1: ( rule__XCatchClause__DeclaredParamAssignment_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20868:2: rule__XCatchClause__DeclaredParamAssignment_2
+            // InternalCheck.g:20868:1: ( rule__XCatchClause__DeclaredParamAssignment_2 )
+            // InternalCheck.g:20868:2: rule__XCatchClause__DeclaredParamAssignment_2
             {
-            pushFollow(FOLLOW_rule__XCatchClause__DeclaredParamAssignment_2_in_rule__XCatchClause__Group__2__Impl42088);
+            pushFollow(FOLLOW_2);
             rule__XCatchClause__DeclaredParamAssignment_2();
 
             state._fsp--;
@@ -59740,21 +59740,21 @@ public final void rule__XCatchClause__Group__2__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XCatchClause__Group__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20878:1: rule__XCatchClause__Group__3 : rule__XCatchClause__Group__3__Impl rule__XCatchClause__Group__4 ;
+    // InternalCheck.g:20878:1: rule__XCatchClause__Group__3 : rule__XCatchClause__Group__3__Impl rule__XCatchClause__Group__4 ;
     public final void rule__XCatchClause__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20882:1: ( rule__XCatchClause__Group__3__Impl rule__XCatchClause__Group__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20883:2: rule__XCatchClause__Group__3__Impl rule__XCatchClause__Group__4
+            // InternalCheck.g:20882:1: ( rule__XCatchClause__Group__3__Impl rule__XCatchClause__Group__4 )
+            // InternalCheck.g:20883:2: rule__XCatchClause__Group__3__Impl rule__XCatchClause__Group__4
             {
-            pushFollow(FOLLOW_rule__XCatchClause__Group__3__Impl_in_rule__XCatchClause__Group__342118);
+            pushFollow(FOLLOW_32);
             rule__XCatchClause__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCatchClause__Group__4_in_rule__XCatchClause__Group__342121);
+            pushFollow(FOLLOW_2);
             rule__XCatchClause__Group__4();
 
             state._fsp--;
@@ -59778,22 +59778,22 @@ public final void rule__XCatchClause__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCatchClause__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20890:1: rule__XCatchClause__Group__3__Impl : ( ')' ) ;
+    // InternalCheck.g:20890:1: rule__XCatchClause__Group__3__Impl : ( ')' ) ;
     public final void rule__XCatchClause__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20894:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20895:1: ( ')' )
+            // InternalCheck.g:20894:1: ( ( ')' ) )
+            // InternalCheck.g:20895:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20895:1: ( ')' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20896:1: ')'
+            // InternalCheck.g:20895:1: ( ')' )
+            // InternalCheck.g:20896:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getRightParenthesisKeyword_3()); 
             }
-            match(input,73,FOLLOW_73_in_rule__XCatchClause__Group__3__Impl42149); if (state.failed) return ;
+            match(input,73,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXCatchClauseAccess().getRightParenthesisKeyword_3()); 
             }
@@ -59819,16 +59819,16 @@ public final void rule__XCatchClause__Group__3__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XCatchClause__Group__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20909:1: rule__XCatchClause__Group__4 : rule__XCatchClause__Group__4__Impl ;
+    // InternalCheck.g:20909:1: rule__XCatchClause__Group__4 : rule__XCatchClause__Group__4__Impl ;
     public final void rule__XCatchClause__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20913:1: ( rule__XCatchClause__Group__4__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20914:2: rule__XCatchClause__Group__4__Impl
+            // InternalCheck.g:20913:1: ( rule__XCatchClause__Group__4__Impl )
+            // InternalCheck.g:20914:2: rule__XCatchClause__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__XCatchClause__Group__4__Impl_in_rule__XCatchClause__Group__442180);
+            pushFollow(FOLLOW_2);
             rule__XCatchClause__Group__4__Impl();
 
             state._fsp--;
@@ -59852,25 +59852,25 @@ public final void rule__XCatchClause__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCatchClause__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20920:1: rule__XCatchClause__Group__4__Impl : ( ( rule__XCatchClause__ExpressionAssignment_4 ) ) ;
+    // InternalCheck.g:20920:1: rule__XCatchClause__Group__4__Impl : ( ( rule__XCatchClause__ExpressionAssignment_4 ) ) ;
     public final void rule__XCatchClause__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20924:1: ( ( ( rule__XCatchClause__ExpressionAssignment_4 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20925:1: ( ( rule__XCatchClause__ExpressionAssignment_4 ) )
+            // InternalCheck.g:20924:1: ( ( ( rule__XCatchClause__ExpressionAssignment_4 ) ) )
+            // InternalCheck.g:20925:1: ( ( rule__XCatchClause__ExpressionAssignment_4 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20925:1: ( ( rule__XCatchClause__ExpressionAssignment_4 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20926:1: ( rule__XCatchClause__ExpressionAssignment_4 )
+            // InternalCheck.g:20925:1: ( ( rule__XCatchClause__ExpressionAssignment_4 ) )
+            // InternalCheck.g:20926:1: ( rule__XCatchClause__ExpressionAssignment_4 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getExpressionAssignment_4()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20927:1: ( rule__XCatchClause__ExpressionAssignment_4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20927:2: rule__XCatchClause__ExpressionAssignment_4
+            // InternalCheck.g:20927:1: ( rule__XCatchClause__ExpressionAssignment_4 )
+            // InternalCheck.g:20927:2: rule__XCatchClause__ExpressionAssignment_4
             {
-            pushFollow(FOLLOW_rule__XCatchClause__ExpressionAssignment_4_in_rule__XCatchClause__Group__4__Impl42207);
+            pushFollow(FOLLOW_2);
             rule__XCatchClause__ExpressionAssignment_4();
 
             state._fsp--;
@@ -59903,21 +59903,21 @@ public final void rule__XCatchClause__Group__4__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__QualifiedName__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20947:1: rule__QualifiedName__Group__0 : rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 ;
+    // InternalCheck.g:20947:1: rule__QualifiedName__Group__0 : rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 ;
     public final void rule__QualifiedName__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20951:1: ( rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20952:2: rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1
+            // InternalCheck.g:20951:1: ( rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 )
+            // InternalCheck.g:20952:2: rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1
             {
-            pushFollow(FOLLOW_rule__QualifiedName__Group__0__Impl_in_rule__QualifiedName__Group__042247);
+            pushFollow(FOLLOW_118);
             rule__QualifiedName__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__QualifiedName__Group__1_in_rule__QualifiedName__Group__042250);
+            pushFollow(FOLLOW_2);
             rule__QualifiedName__Group__1();
 
             state._fsp--;
@@ -59941,22 +59941,22 @@ public final void rule__QualifiedName__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__QualifiedName__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20959:1: rule__QualifiedName__Group__0__Impl : ( ruleValidID ) ;
+    // InternalCheck.g:20959:1: rule__QualifiedName__Group__0__Impl : ( ruleValidID ) ;
     public final void rule__QualifiedName__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20963:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20964:1: ( ruleValidID )
+            // InternalCheck.g:20963:1: ( ( ruleValidID ) )
+            // InternalCheck.g:20964:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20964:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20965:1: ruleValidID
+            // InternalCheck.g:20964:1: ( ruleValidID )
+            // InternalCheck.g:20965:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameAccess().getValidIDParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__QualifiedName__Group__0__Impl42277);
+            pushFollow(FOLLOW_2);
             ruleValidID();
 
             state._fsp--;
@@ -59986,16 +59986,16 @@ public final void rule__QualifiedName__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__QualifiedName__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20976:1: rule__QualifiedName__Group__1 : rule__QualifiedName__Group__1__Impl ;
+    // InternalCheck.g:20976:1: rule__QualifiedName__Group__1 : rule__QualifiedName__Group__1__Impl ;
     public final void rule__QualifiedName__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20980:1: ( rule__QualifiedName__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20981:2: rule__QualifiedName__Group__1__Impl
+            // InternalCheck.g:20980:1: ( rule__QualifiedName__Group__1__Impl )
+            // InternalCheck.g:20981:2: rule__QualifiedName__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__QualifiedName__Group__1__Impl_in_rule__QualifiedName__Group__142306);
+            pushFollow(FOLLOW_2);
             rule__QualifiedName__Group__1__Impl();
 
             state._fsp--;
@@ -60019,22 +60019,22 @@ public final void rule__QualifiedName__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__QualifiedName__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20987:1: rule__QualifiedName__Group__1__Impl : ( ( rule__QualifiedName__Group_1__0 )* ) ;
+    // InternalCheck.g:20987:1: rule__QualifiedName__Group__1__Impl : ( ( rule__QualifiedName__Group_1__0 )* ) ;
     public final void rule__QualifiedName__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20991:1: ( ( ( rule__QualifiedName__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20992:1: ( ( rule__QualifiedName__Group_1__0 )* )
+            // InternalCheck.g:20991:1: ( ( ( rule__QualifiedName__Group_1__0 )* ) )
+            // InternalCheck.g:20992:1: ( ( rule__QualifiedName__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20992:1: ( ( rule__QualifiedName__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20993:1: ( rule__QualifiedName__Group_1__0 )*
+            // InternalCheck.g:20992:1: ( ( rule__QualifiedName__Group_1__0 )* )
+            // InternalCheck.g:20993:1: ( rule__QualifiedName__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20994:1: ( rule__QualifiedName__Group_1__0 )*
+            // InternalCheck.g:20994:1: ( rule__QualifiedName__Group_1__0 )*
             loop153:
             do {
                 int alt153=2;
@@ -60059,9 +60059,9 @@ public final void rule__QualifiedName__Group__1__Impl() throws RecognitionExcept
 
                 switch (alt153) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20994:2: rule__QualifiedName__Group_1__0
+            	    // InternalCheck.g:20994:2: rule__QualifiedName__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__QualifiedName__Group_1__0_in_rule__QualifiedName__Group__1__Impl42333);
+            	    pushFollow(FOLLOW_119);
             	    rule__QualifiedName__Group_1__0();
 
             	    state._fsp--;
@@ -60100,21 +60100,21 @@ public final void rule__QualifiedName__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21008:1: rule__QualifiedName__Group_1__0 : rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 ;
+    // InternalCheck.g:21008:1: rule__QualifiedName__Group_1__0 : rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 ;
     public final void rule__QualifiedName__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21012:1: ( rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21013:2: rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1
+            // InternalCheck.g:21012:1: ( rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 )
+            // InternalCheck.g:21013:2: rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1
             {
-            pushFollow(FOLLOW_rule__QualifiedName__Group_1__0__Impl_in_rule__QualifiedName__Group_1__042368);
+            pushFollow(FOLLOW_4);
             rule__QualifiedName__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__QualifiedName__Group_1__1_in_rule__QualifiedName__Group_1__042371);
+            pushFollow(FOLLOW_2);
             rule__QualifiedName__Group_1__1();
 
             state._fsp--;
@@ -60138,25 +60138,25 @@ public final void rule__QualifiedName__Group_1__0() throws RecognitionException
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21020:1: rule__QualifiedName__Group_1__0__Impl : ( ( '.' ) ) ;
+    // InternalCheck.g:21020:1: rule__QualifiedName__Group_1__0__Impl : ( ( '.' ) ) ;
     public final void rule__QualifiedName__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21024:1: ( ( ( '.' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21025:1: ( ( '.' ) )
+            // InternalCheck.g:21024:1: ( ( ( '.' ) ) )
+            // InternalCheck.g:21025:1: ( ( '.' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21025:1: ( ( '.' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21026:1: ( '.' )
+            // InternalCheck.g:21025:1: ( ( '.' ) )
+            // InternalCheck.g:21026:1: ( '.' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameAccess().getFullStopKeyword_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21027:1: ( '.' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21028:2: '.'
+            // InternalCheck.g:21027:1: ( '.' )
+            // InternalCheck.g:21028:2: '.'
             {
-            match(input,63,FOLLOW_63_in_rule__QualifiedName__Group_1__0__Impl42400); if (state.failed) return ;
+            match(input,63,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -60185,16 +60185,16 @@ public final void rule__QualifiedName__Group_1__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21039:1: rule__QualifiedName__Group_1__1 : rule__QualifiedName__Group_1__1__Impl ;
+    // InternalCheck.g:21039:1: rule__QualifiedName__Group_1__1 : rule__QualifiedName__Group_1__1__Impl ;
     public final void rule__QualifiedName__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21043:1: ( rule__QualifiedName__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21044:2: rule__QualifiedName__Group_1__1__Impl
+            // InternalCheck.g:21043:1: ( rule__QualifiedName__Group_1__1__Impl )
+            // InternalCheck.g:21044:2: rule__QualifiedName__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__QualifiedName__Group_1__1__Impl_in_rule__QualifiedName__Group_1__142432);
+            pushFollow(FOLLOW_2);
             rule__QualifiedName__Group_1__1__Impl();
 
             state._fsp--;
@@ -60218,22 +60218,22 @@ public final void rule__QualifiedName__Group_1__1() throws RecognitionException
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21050:1: rule__QualifiedName__Group_1__1__Impl : ( ruleValidID ) ;
+    // InternalCheck.g:21050:1: rule__QualifiedName__Group_1__1__Impl : ( ruleValidID ) ;
     public final void rule__QualifiedName__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21054:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21055:1: ( ruleValidID )
+            // InternalCheck.g:21054:1: ( ( ruleValidID ) )
+            // InternalCheck.g:21055:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21055:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21056:1: ruleValidID
+            // InternalCheck.g:21055:1: ( ruleValidID )
+            // InternalCheck.g:21056:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameAccess().getValidIDParserRuleCall_1_1()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__QualifiedName__Group_1__1__Impl42459);
+            pushFollow(FOLLOW_2);
             ruleValidID();
 
             state._fsp--;
@@ -60263,21 +60263,21 @@ public final void rule__QualifiedName__Group_1__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__Number__Group_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21071:1: rule__Number__Group_1__0 : rule__Number__Group_1__0__Impl rule__Number__Group_1__1 ;
+    // InternalCheck.g:21071:1: rule__Number__Group_1__0 : rule__Number__Group_1__0__Impl rule__Number__Group_1__1 ;
     public final void rule__Number__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21075:1: ( rule__Number__Group_1__0__Impl rule__Number__Group_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21076:2: rule__Number__Group_1__0__Impl rule__Number__Group_1__1
+            // InternalCheck.g:21075:1: ( rule__Number__Group_1__0__Impl rule__Number__Group_1__1 )
+            // InternalCheck.g:21076:2: rule__Number__Group_1__0__Impl rule__Number__Group_1__1
             {
-            pushFollow(FOLLOW_rule__Number__Group_1__0__Impl_in_rule__Number__Group_1__042492);
+            pushFollow(FOLLOW_118);
             rule__Number__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Number__Group_1__1_in_rule__Number__Group_1__042495);
+            pushFollow(FOLLOW_2);
             rule__Number__Group_1__1();
 
             state._fsp--;
@@ -60301,25 +60301,25 @@ public final void rule__Number__Group_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Number__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21083:1: rule__Number__Group_1__0__Impl : ( ( rule__Number__Alternatives_1_0 ) ) ;
+    // InternalCheck.g:21083:1: rule__Number__Group_1__0__Impl : ( ( rule__Number__Alternatives_1_0 ) ) ;
     public final void rule__Number__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21087:1: ( ( ( rule__Number__Alternatives_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21088:1: ( ( rule__Number__Alternatives_1_0 ) )
+            // InternalCheck.g:21087:1: ( ( ( rule__Number__Alternatives_1_0 ) ) )
+            // InternalCheck.g:21088:1: ( ( rule__Number__Alternatives_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21088:1: ( ( rule__Number__Alternatives_1_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21089:1: ( rule__Number__Alternatives_1_0 )
+            // InternalCheck.g:21088:1: ( ( rule__Number__Alternatives_1_0 ) )
+            // InternalCheck.g:21089:1: ( rule__Number__Alternatives_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNumberAccess().getAlternatives_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21090:1: ( rule__Number__Alternatives_1_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21090:2: rule__Number__Alternatives_1_0
+            // InternalCheck.g:21090:1: ( rule__Number__Alternatives_1_0 )
+            // InternalCheck.g:21090:2: rule__Number__Alternatives_1_0
             {
-            pushFollow(FOLLOW_rule__Number__Alternatives_1_0_in_rule__Number__Group_1__0__Impl42522);
+            pushFollow(FOLLOW_2);
             rule__Number__Alternatives_1_0();
 
             state._fsp--;
@@ -60352,16 +60352,16 @@ public final void rule__Number__Group_1__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Number__Group_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21100:1: rule__Number__Group_1__1 : rule__Number__Group_1__1__Impl ;
+    // InternalCheck.g:21100:1: rule__Number__Group_1__1 : rule__Number__Group_1__1__Impl ;
     public final void rule__Number__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21104:1: ( rule__Number__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21105:2: rule__Number__Group_1__1__Impl
+            // InternalCheck.g:21104:1: ( rule__Number__Group_1__1__Impl )
+            // InternalCheck.g:21105:2: rule__Number__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__Number__Group_1__1__Impl_in_rule__Number__Group_1__142552);
+            pushFollow(FOLLOW_2);
             rule__Number__Group_1__1__Impl();
 
             state._fsp--;
@@ -60385,22 +60385,22 @@ public final void rule__Number__Group_1__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Number__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21111:1: rule__Number__Group_1__1__Impl : ( ( rule__Number__Group_1_1__0 )? ) ;
+    // InternalCheck.g:21111:1: rule__Number__Group_1__1__Impl : ( ( rule__Number__Group_1_1__0 )? ) ;
     public final void rule__Number__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21115:1: ( ( ( rule__Number__Group_1_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21116:1: ( ( rule__Number__Group_1_1__0 )? )
+            // InternalCheck.g:21115:1: ( ( ( rule__Number__Group_1_1__0 )? ) )
+            // InternalCheck.g:21116:1: ( ( rule__Number__Group_1_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21116:1: ( ( rule__Number__Group_1_1__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21117:1: ( rule__Number__Group_1_1__0 )?
+            // InternalCheck.g:21116:1: ( ( rule__Number__Group_1_1__0 )? )
+            // InternalCheck.g:21117:1: ( rule__Number__Group_1_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNumberAccess().getGroup_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21118:1: ( rule__Number__Group_1_1__0 )?
+            // InternalCheck.g:21118:1: ( rule__Number__Group_1_1__0 )?
             int alt154=2;
             int LA154_0 = input.LA(1);
 
@@ -60413,9 +60413,9 @@ public final void rule__Number__Group_1__1__Impl() throws RecognitionException {
             }
             switch (alt154) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21118:2: rule__Number__Group_1_1__0
+                    // InternalCheck.g:21118:2: rule__Number__Group_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__Number__Group_1_1__0_in_rule__Number__Group_1__1__Impl42579);
+                    pushFollow(FOLLOW_2);
                     rule__Number__Group_1_1__0();
 
                     state._fsp--;
@@ -60451,21 +60451,21 @@ public final void rule__Number__Group_1__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Number__Group_1_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21132:1: rule__Number__Group_1_1__0 : rule__Number__Group_1_1__0__Impl rule__Number__Group_1_1__1 ;
+    // InternalCheck.g:21132:1: rule__Number__Group_1_1__0 : rule__Number__Group_1_1__0__Impl rule__Number__Group_1_1__1 ;
     public final void rule__Number__Group_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21136:1: ( rule__Number__Group_1_1__0__Impl rule__Number__Group_1_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21137:2: rule__Number__Group_1_1__0__Impl rule__Number__Group_1_1__1
+            // InternalCheck.g:21136:1: ( rule__Number__Group_1_1__0__Impl rule__Number__Group_1_1__1 )
+            // InternalCheck.g:21137:2: rule__Number__Group_1_1__0__Impl rule__Number__Group_1_1__1
             {
-            pushFollow(FOLLOW_rule__Number__Group_1_1__0__Impl_in_rule__Number__Group_1_1__042614);
+            pushFollow(FOLLOW_120);
             rule__Number__Group_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Number__Group_1_1__1_in_rule__Number__Group_1_1__042617);
+            pushFollow(FOLLOW_2);
             rule__Number__Group_1_1__1();
 
             state._fsp--;
@@ -60489,22 +60489,22 @@ public final void rule__Number__Group_1_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Number__Group_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21144:1: rule__Number__Group_1_1__0__Impl : ( '.' ) ;
+    // InternalCheck.g:21144:1: rule__Number__Group_1_1__0__Impl : ( '.' ) ;
     public final void rule__Number__Group_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21148:1: ( ( '.' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21149:1: ( '.' )
+            // InternalCheck.g:21148:1: ( ( '.' ) )
+            // InternalCheck.g:21149:1: ( '.' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21149:1: ( '.' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21150:1: '.'
+            // InternalCheck.g:21149:1: ( '.' )
+            // InternalCheck.g:21150:1: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNumberAccess().getFullStopKeyword_1_1_0()); 
             }
-            match(input,63,FOLLOW_63_in_rule__Number__Group_1_1__0__Impl42645); if (state.failed) return ;
+            match(input,63,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getNumberAccess().getFullStopKeyword_1_1_0()); 
             }
@@ -60530,16 +60530,16 @@ public final void rule__Number__Group_1_1__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__Number__Group_1_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21163:1: rule__Number__Group_1_1__1 : rule__Number__Group_1_1__1__Impl ;
+    // InternalCheck.g:21163:1: rule__Number__Group_1_1__1 : rule__Number__Group_1_1__1__Impl ;
     public final void rule__Number__Group_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21167:1: ( rule__Number__Group_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21168:2: rule__Number__Group_1_1__1__Impl
+            // InternalCheck.g:21167:1: ( rule__Number__Group_1_1__1__Impl )
+            // InternalCheck.g:21168:2: rule__Number__Group_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__Number__Group_1_1__1__Impl_in_rule__Number__Group_1_1__142676);
+            pushFollow(FOLLOW_2);
             rule__Number__Group_1_1__1__Impl();
 
             state._fsp--;
@@ -60563,25 +60563,25 @@ public final void rule__Number__Group_1_1__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Number__Group_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21174:1: rule__Number__Group_1_1__1__Impl : ( ( rule__Number__Alternatives_1_1_1 ) ) ;
+    // InternalCheck.g:21174:1: rule__Number__Group_1_1__1__Impl : ( ( rule__Number__Alternatives_1_1_1 ) ) ;
     public final void rule__Number__Group_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21178:1: ( ( ( rule__Number__Alternatives_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21179:1: ( ( rule__Number__Alternatives_1_1_1 ) )
+            // InternalCheck.g:21178:1: ( ( ( rule__Number__Alternatives_1_1_1 ) ) )
+            // InternalCheck.g:21179:1: ( ( rule__Number__Alternatives_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21179:1: ( ( rule__Number__Alternatives_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21180:1: ( rule__Number__Alternatives_1_1_1 )
+            // InternalCheck.g:21179:1: ( ( rule__Number__Alternatives_1_1_1 ) )
+            // InternalCheck.g:21180:1: ( rule__Number__Alternatives_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNumberAccess().getAlternatives_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21181:1: ( rule__Number__Alternatives_1_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21181:2: rule__Number__Alternatives_1_1_1
+            // InternalCheck.g:21181:1: ( rule__Number__Alternatives_1_1_1 )
+            // InternalCheck.g:21181:2: rule__Number__Alternatives_1_1_1
             {
-            pushFollow(FOLLOW_rule__Number__Alternatives_1_1_1_in_rule__Number__Group_1_1__1__Impl42703);
+            pushFollow(FOLLOW_2);
             rule__Number__Alternatives_1_1_1();
 
             state._fsp--;
@@ -60614,21 +60614,21 @@ public final void rule__Number__Group_1_1__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21196:1: rule__JvmTypeReference__Group_0__0 : rule__JvmTypeReference__Group_0__0__Impl rule__JvmTypeReference__Group_0__1 ;
+    // InternalCheck.g:21196:1: rule__JvmTypeReference__Group_0__0 : rule__JvmTypeReference__Group_0__0__Impl rule__JvmTypeReference__Group_0__1 ;
     public final void rule__JvmTypeReference__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21200:1: ( rule__JvmTypeReference__Group_0__0__Impl rule__JvmTypeReference__Group_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21201:2: rule__JvmTypeReference__Group_0__0__Impl rule__JvmTypeReference__Group_0__1
+            // InternalCheck.g:21200:1: ( rule__JvmTypeReference__Group_0__0__Impl rule__JvmTypeReference__Group_0__1 )
+            // InternalCheck.g:21201:2: rule__JvmTypeReference__Group_0__0__Impl rule__JvmTypeReference__Group_0__1
             {
-            pushFollow(FOLLOW_rule__JvmTypeReference__Group_0__0__Impl_in_rule__JvmTypeReference__Group_0__042738);
+            pushFollow(FOLLOW_38);
             rule__JvmTypeReference__Group_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmTypeReference__Group_0__1_in_rule__JvmTypeReference__Group_0__042741);
+            pushFollow(FOLLOW_2);
             rule__JvmTypeReference__Group_0__1();
 
             state._fsp--;
@@ -60652,22 +60652,22 @@ public final void rule__JvmTypeReference__Group_0__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21208:1: rule__JvmTypeReference__Group_0__0__Impl : ( ruleJvmParameterizedTypeReference ) ;
+    // InternalCheck.g:21208:1: rule__JvmTypeReference__Group_0__0__Impl : ( ruleJvmParameterizedTypeReference ) ;
     public final void rule__JvmTypeReference__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21212:1: ( ( ruleJvmParameterizedTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21213:1: ( ruleJvmParameterizedTypeReference )
+            // InternalCheck.g:21212:1: ( ( ruleJvmParameterizedTypeReference ) )
+            // InternalCheck.g:21213:1: ( ruleJvmParameterizedTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21213:1: ( ruleJvmParameterizedTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21214:1: ruleJvmParameterizedTypeReference
+            // InternalCheck.g:21213:1: ( ruleJvmParameterizedTypeReference )
+            // InternalCheck.g:21214:1: ruleJvmParameterizedTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmTypeReferenceAccess().getJvmParameterizedTypeReferenceParserRuleCall_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmParameterizedTypeReference_in_rule__JvmTypeReference__Group_0__0__Impl42768);
+            pushFollow(FOLLOW_2);
             ruleJvmParameterizedTypeReference();
 
             state._fsp--;
@@ -60697,16 +60697,16 @@ public final void rule__JvmTypeReference__Group_0__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21225:1: rule__JvmTypeReference__Group_0__1 : rule__JvmTypeReference__Group_0__1__Impl ;
+    // InternalCheck.g:21225:1: rule__JvmTypeReference__Group_0__1 : rule__JvmTypeReference__Group_0__1__Impl ;
     public final void rule__JvmTypeReference__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21229:1: ( rule__JvmTypeReference__Group_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21230:2: rule__JvmTypeReference__Group_0__1__Impl
+            // InternalCheck.g:21229:1: ( rule__JvmTypeReference__Group_0__1__Impl )
+            // InternalCheck.g:21230:2: rule__JvmTypeReference__Group_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmTypeReference__Group_0__1__Impl_in_rule__JvmTypeReference__Group_0__142797);
+            pushFollow(FOLLOW_2);
             rule__JvmTypeReference__Group_0__1__Impl();
 
             state._fsp--;
@@ -60730,22 +60730,22 @@ public final void rule__JvmTypeReference__Group_0__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21236:1: rule__JvmTypeReference__Group_0__1__Impl : ( ( rule__JvmTypeReference__Group_0_1__0 )* ) ;
+    // InternalCheck.g:21236:1: rule__JvmTypeReference__Group_0__1__Impl : ( ( rule__JvmTypeReference__Group_0_1__0 )* ) ;
     public final void rule__JvmTypeReference__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21240:1: ( ( ( rule__JvmTypeReference__Group_0_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21241:1: ( ( rule__JvmTypeReference__Group_0_1__0 )* )
+            // InternalCheck.g:21240:1: ( ( ( rule__JvmTypeReference__Group_0_1__0 )* ) )
+            // InternalCheck.g:21241:1: ( ( rule__JvmTypeReference__Group_0_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21241:1: ( ( rule__JvmTypeReference__Group_0_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21242:1: ( rule__JvmTypeReference__Group_0_1__0 )*
+            // InternalCheck.g:21241:1: ( ( rule__JvmTypeReference__Group_0_1__0 )* )
+            // InternalCheck.g:21242:1: ( rule__JvmTypeReference__Group_0_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmTypeReferenceAccess().getGroup_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21243:1: ( rule__JvmTypeReference__Group_0_1__0 )*
+            // InternalCheck.g:21243:1: ( rule__JvmTypeReference__Group_0_1__0 )*
             loop155:
             do {
                 int alt155=2;
@@ -60770,9 +60770,9 @@ public final void rule__JvmTypeReference__Group_0__1__Impl() throws RecognitionE
 
                 switch (alt155) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21243:2: rule__JvmTypeReference__Group_0_1__0
+            	    // InternalCheck.g:21243:2: rule__JvmTypeReference__Group_0_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__JvmTypeReference__Group_0_1__0_in_rule__JvmTypeReference__Group_0__1__Impl42824);
+            	    pushFollow(FOLLOW_110);
             	    rule__JvmTypeReference__Group_0_1__0();
 
             	    state._fsp--;
@@ -60811,16 +60811,16 @@ public final void rule__JvmTypeReference__Group_0__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21257:1: rule__JvmTypeReference__Group_0_1__0 : rule__JvmTypeReference__Group_0_1__0__Impl ;
+    // InternalCheck.g:21257:1: rule__JvmTypeReference__Group_0_1__0 : rule__JvmTypeReference__Group_0_1__0__Impl ;
     public final void rule__JvmTypeReference__Group_0_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21261:1: ( rule__JvmTypeReference__Group_0_1__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21262:2: rule__JvmTypeReference__Group_0_1__0__Impl
+            // InternalCheck.g:21261:1: ( rule__JvmTypeReference__Group_0_1__0__Impl )
+            // InternalCheck.g:21262:2: rule__JvmTypeReference__Group_0_1__0__Impl
             {
-            pushFollow(FOLLOW_rule__JvmTypeReference__Group_0_1__0__Impl_in_rule__JvmTypeReference__Group_0_1__042859);
+            pushFollow(FOLLOW_2);
             rule__JvmTypeReference__Group_0_1__0__Impl();
 
             state._fsp--;
@@ -60844,25 +60844,25 @@ public final void rule__JvmTypeReference__Group_0_1__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21268:1: rule__JvmTypeReference__Group_0_1__0__Impl : ( ( rule__JvmTypeReference__Group_0_1_0__0 ) ) ;
+    // InternalCheck.g:21268:1: rule__JvmTypeReference__Group_0_1__0__Impl : ( ( rule__JvmTypeReference__Group_0_1_0__0 ) ) ;
     public final void rule__JvmTypeReference__Group_0_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21272:1: ( ( ( rule__JvmTypeReference__Group_0_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21273:1: ( ( rule__JvmTypeReference__Group_0_1_0__0 ) )
+            // InternalCheck.g:21272:1: ( ( ( rule__JvmTypeReference__Group_0_1_0__0 ) ) )
+            // InternalCheck.g:21273:1: ( ( rule__JvmTypeReference__Group_0_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21273:1: ( ( rule__JvmTypeReference__Group_0_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21274:1: ( rule__JvmTypeReference__Group_0_1_0__0 )
+            // InternalCheck.g:21273:1: ( ( rule__JvmTypeReference__Group_0_1_0__0 ) )
+            // InternalCheck.g:21274:1: ( rule__JvmTypeReference__Group_0_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmTypeReferenceAccess().getGroup_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21275:1: ( rule__JvmTypeReference__Group_0_1_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21275:2: rule__JvmTypeReference__Group_0_1_0__0
+            // InternalCheck.g:21275:1: ( rule__JvmTypeReference__Group_0_1_0__0 )
+            // InternalCheck.g:21275:2: rule__JvmTypeReference__Group_0_1_0__0
             {
-            pushFollow(FOLLOW_rule__JvmTypeReference__Group_0_1_0__0_in_rule__JvmTypeReference__Group_0_1__0__Impl42886);
+            pushFollow(FOLLOW_2);
             rule__JvmTypeReference__Group_0_1_0__0();
 
             state._fsp--;
@@ -60895,21 +60895,21 @@ public final void rule__JvmTypeReference__Group_0_1__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0_1_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21287:1: rule__JvmTypeReference__Group_0_1_0__0 : rule__JvmTypeReference__Group_0_1_0__0__Impl rule__JvmTypeReference__Group_0_1_0__1 ;
+    // InternalCheck.g:21287:1: rule__JvmTypeReference__Group_0_1_0__0 : rule__JvmTypeReference__Group_0_1_0__0__Impl rule__JvmTypeReference__Group_0_1_0__1 ;
     public final void rule__JvmTypeReference__Group_0_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21291:1: ( rule__JvmTypeReference__Group_0_1_0__0__Impl rule__JvmTypeReference__Group_0_1_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21292:2: rule__JvmTypeReference__Group_0_1_0__0__Impl rule__JvmTypeReference__Group_0_1_0__1
+            // InternalCheck.g:21291:1: ( rule__JvmTypeReference__Group_0_1_0__0__Impl rule__JvmTypeReference__Group_0_1_0__1 )
+            // InternalCheck.g:21292:2: rule__JvmTypeReference__Group_0_1_0__0__Impl rule__JvmTypeReference__Group_0_1_0__1
             {
-            pushFollow(FOLLOW_rule__JvmTypeReference__Group_0_1_0__0__Impl_in_rule__JvmTypeReference__Group_0_1_0__042918);
+            pushFollow(FOLLOW_38);
             rule__JvmTypeReference__Group_0_1_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmTypeReference__Group_0_1_0__1_in_rule__JvmTypeReference__Group_0_1_0__042921);
+            pushFollow(FOLLOW_2);
             rule__JvmTypeReference__Group_0_1_0__1();
 
             state._fsp--;
@@ -60933,23 +60933,23 @@ public final void rule__JvmTypeReference__Group_0_1_0__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21299:1: rule__JvmTypeReference__Group_0_1_0__0__Impl : ( () ) ;
+    // InternalCheck.g:21299:1: rule__JvmTypeReference__Group_0_1_0__0__Impl : ( () ) ;
     public final void rule__JvmTypeReference__Group_0_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21303:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21304:1: ( () )
+            // InternalCheck.g:21303:1: ( ( () ) )
+            // InternalCheck.g:21304:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21304:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21305:1: ()
+            // InternalCheck.g:21304:1: ( () )
+            // InternalCheck.g:21305:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmTypeReferenceAccess().getJvmGenericArrayTypeReferenceComponentTypeAction_0_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21306:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21308:1: 
+            // InternalCheck.g:21306:1: ()
+            // InternalCheck.g:21308:1: 
             {
             }
 
@@ -60974,16 +60974,16 @@ public final void rule__JvmTypeReference__Group_0_1_0__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0_1_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21318:1: rule__JvmTypeReference__Group_0_1_0__1 : rule__JvmTypeReference__Group_0_1_0__1__Impl ;
+    // InternalCheck.g:21318:1: rule__JvmTypeReference__Group_0_1_0__1 : rule__JvmTypeReference__Group_0_1_0__1__Impl ;
     public final void rule__JvmTypeReference__Group_0_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21322:1: ( rule__JvmTypeReference__Group_0_1_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21323:2: rule__JvmTypeReference__Group_0_1_0__1__Impl
+            // InternalCheck.g:21322:1: ( rule__JvmTypeReference__Group_0_1_0__1__Impl )
+            // InternalCheck.g:21323:2: rule__JvmTypeReference__Group_0_1_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmTypeReference__Group_0_1_0__1__Impl_in_rule__JvmTypeReference__Group_0_1_0__142979);
+            pushFollow(FOLLOW_2);
             rule__JvmTypeReference__Group_0_1_0__1__Impl();
 
             state._fsp--;
@@ -61007,22 +61007,22 @@ public final void rule__JvmTypeReference__Group_0_1_0__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0_1_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21329:1: rule__JvmTypeReference__Group_0_1_0__1__Impl : ( ruleArrayBrackets ) ;
+    // InternalCheck.g:21329:1: rule__JvmTypeReference__Group_0_1_0__1__Impl : ( ruleArrayBrackets ) ;
     public final void rule__JvmTypeReference__Group_0_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21333:1: ( ( ruleArrayBrackets ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21334:1: ( ruleArrayBrackets )
+            // InternalCheck.g:21333:1: ( ( ruleArrayBrackets ) )
+            // InternalCheck.g:21334:1: ( ruleArrayBrackets )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21334:1: ( ruleArrayBrackets )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21335:1: ruleArrayBrackets
+            // InternalCheck.g:21334:1: ( ruleArrayBrackets )
+            // InternalCheck.g:21335:1: ruleArrayBrackets
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmTypeReferenceAccess().getArrayBracketsParserRuleCall_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleArrayBrackets_in_rule__JvmTypeReference__Group_0_1_0__1__Impl43006);
+            pushFollow(FOLLOW_2);
             ruleArrayBrackets();
 
             state._fsp--;
@@ -61052,21 +61052,21 @@ public final void rule__JvmTypeReference__Group_0_1_0__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__ArrayBrackets__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21350:1: rule__ArrayBrackets__Group__0 : rule__ArrayBrackets__Group__0__Impl rule__ArrayBrackets__Group__1 ;
+    // InternalCheck.g:21350:1: rule__ArrayBrackets__Group__0 : rule__ArrayBrackets__Group__0__Impl rule__ArrayBrackets__Group__1 ;
     public final void rule__ArrayBrackets__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21354:1: ( rule__ArrayBrackets__Group__0__Impl rule__ArrayBrackets__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21355:2: rule__ArrayBrackets__Group__0__Impl rule__ArrayBrackets__Group__1
+            // InternalCheck.g:21354:1: ( rule__ArrayBrackets__Group__0__Impl rule__ArrayBrackets__Group__1 )
+            // InternalCheck.g:21355:2: rule__ArrayBrackets__Group__0__Impl rule__ArrayBrackets__Group__1
             {
-            pushFollow(FOLLOW_rule__ArrayBrackets__Group__0__Impl_in_rule__ArrayBrackets__Group__043039);
+            pushFollow(FOLLOW_44);
             rule__ArrayBrackets__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ArrayBrackets__Group__1_in_rule__ArrayBrackets__Group__043042);
+            pushFollow(FOLLOW_2);
             rule__ArrayBrackets__Group__1();
 
             state._fsp--;
@@ -61090,22 +61090,22 @@ public final void rule__ArrayBrackets__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__ArrayBrackets__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21362:1: rule__ArrayBrackets__Group__0__Impl : ( '[' ) ;
+    // InternalCheck.g:21362:1: rule__ArrayBrackets__Group__0__Impl : ( '[' ) ;
     public final void rule__ArrayBrackets__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21366:1: ( ( '[' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21367:1: ( '[' )
+            // InternalCheck.g:21366:1: ( ( '[' ) )
+            // InternalCheck.g:21367:1: ( '[' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21367:1: ( '[' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21368:1: '['
+            // InternalCheck.g:21367:1: ( '[' )
+            // InternalCheck.g:21368:1: '['
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getArrayBracketsAccess().getLeftSquareBracketKeyword_0()); 
             }
-            match(input,78,FOLLOW_78_in_rule__ArrayBrackets__Group__0__Impl43070); if (state.failed) return ;
+            match(input,78,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getArrayBracketsAccess().getLeftSquareBracketKeyword_0()); 
             }
@@ -61131,16 +61131,16 @@ public final void rule__ArrayBrackets__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ArrayBrackets__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21381:1: rule__ArrayBrackets__Group__1 : rule__ArrayBrackets__Group__1__Impl ;
+    // InternalCheck.g:21381:1: rule__ArrayBrackets__Group__1 : rule__ArrayBrackets__Group__1__Impl ;
     public final void rule__ArrayBrackets__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21385:1: ( rule__ArrayBrackets__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21386:2: rule__ArrayBrackets__Group__1__Impl
+            // InternalCheck.g:21385:1: ( rule__ArrayBrackets__Group__1__Impl )
+            // InternalCheck.g:21386:2: rule__ArrayBrackets__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__ArrayBrackets__Group__1__Impl_in_rule__ArrayBrackets__Group__143101);
+            pushFollow(FOLLOW_2);
             rule__ArrayBrackets__Group__1__Impl();
 
             state._fsp--;
@@ -61164,22 +61164,22 @@ public final void rule__ArrayBrackets__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__ArrayBrackets__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21392:1: rule__ArrayBrackets__Group__1__Impl : ( ']' ) ;
+    // InternalCheck.g:21392:1: rule__ArrayBrackets__Group__1__Impl : ( ']' ) ;
     public final void rule__ArrayBrackets__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21396:1: ( ( ']' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21397:1: ( ']' )
+            // InternalCheck.g:21396:1: ( ( ']' ) )
+            // InternalCheck.g:21397:1: ( ']' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21397:1: ( ']' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21398:1: ']'
+            // InternalCheck.g:21397:1: ( ']' )
+            // InternalCheck.g:21398:1: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getArrayBracketsAccess().getRightSquareBracketKeyword_1()); 
             }
-            match(input,79,FOLLOW_79_in_rule__ArrayBrackets__Group__1__Impl43129); if (state.failed) return ;
+            match(input,79,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getArrayBracketsAccess().getRightSquareBracketKeyword_1()); 
             }
@@ -61205,21 +61205,21 @@ public final void rule__ArrayBrackets__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21415:1: rule__XFunctionTypeRef__Group__0 : rule__XFunctionTypeRef__Group__0__Impl rule__XFunctionTypeRef__Group__1 ;
+    // InternalCheck.g:21415:1: rule__XFunctionTypeRef__Group__0 : rule__XFunctionTypeRef__Group__0__Impl rule__XFunctionTypeRef__Group__1 ;
     public final void rule__XFunctionTypeRef__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21419:1: ( rule__XFunctionTypeRef__Group__0__Impl rule__XFunctionTypeRef__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21420:2: rule__XFunctionTypeRef__Group__0__Impl rule__XFunctionTypeRef__Group__1
+            // InternalCheck.g:21419:1: ( rule__XFunctionTypeRef__Group__0__Impl rule__XFunctionTypeRef__Group__1 )
+            // InternalCheck.g:21420:2: rule__XFunctionTypeRef__Group__0__Impl rule__XFunctionTypeRef__Group__1
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group__0__Impl_in_rule__XFunctionTypeRef__Group__043164);
+            pushFollow(FOLLOW_29);
             rule__XFunctionTypeRef__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group__1_in_rule__XFunctionTypeRef__Group__043167);
+            pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__Group__1();
 
             state._fsp--;
@@ -61243,22 +61243,22 @@ public final void rule__XFunctionTypeRef__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21427:1: rule__XFunctionTypeRef__Group__0__Impl : ( ( rule__XFunctionTypeRef__Group_0__0 )? ) ;
+    // InternalCheck.g:21427:1: rule__XFunctionTypeRef__Group__0__Impl : ( ( rule__XFunctionTypeRef__Group_0__0 )? ) ;
     public final void rule__XFunctionTypeRef__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21431:1: ( ( ( rule__XFunctionTypeRef__Group_0__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21432:1: ( ( rule__XFunctionTypeRef__Group_0__0 )? )
+            // InternalCheck.g:21431:1: ( ( ( rule__XFunctionTypeRef__Group_0__0 )? ) )
+            // InternalCheck.g:21432:1: ( ( rule__XFunctionTypeRef__Group_0__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21432:1: ( ( rule__XFunctionTypeRef__Group_0__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21433:1: ( rule__XFunctionTypeRef__Group_0__0 )?
+            // InternalCheck.g:21432:1: ( ( rule__XFunctionTypeRef__Group_0__0 )? )
+            // InternalCheck.g:21433:1: ( rule__XFunctionTypeRef__Group_0__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getGroup_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21434:1: ( rule__XFunctionTypeRef__Group_0__0 )?
+            // InternalCheck.g:21434:1: ( rule__XFunctionTypeRef__Group_0__0 )?
             int alt156=2;
             int LA156_0 = input.LA(1);
 
@@ -61267,9 +61267,9 @@ public final void rule__XFunctionTypeRef__Group__0__Impl() throws RecognitionExc
             }
             switch (alt156) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21434:2: rule__XFunctionTypeRef__Group_0__0
+                    // InternalCheck.g:21434:2: rule__XFunctionTypeRef__Group_0__0
                     {
-                    pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0__0_in_rule__XFunctionTypeRef__Group__0__Impl43194);
+                    pushFollow(FOLLOW_2);
                     rule__XFunctionTypeRef__Group_0__0();
 
                     state._fsp--;
@@ -61305,21 +61305,21 @@ public final void rule__XFunctionTypeRef__Group__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21444:1: rule__XFunctionTypeRef__Group__1 : rule__XFunctionTypeRef__Group__1__Impl rule__XFunctionTypeRef__Group__2 ;
+    // InternalCheck.g:21444:1: rule__XFunctionTypeRef__Group__1 : rule__XFunctionTypeRef__Group__1__Impl rule__XFunctionTypeRef__Group__2 ;
     public final void rule__XFunctionTypeRef__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21448:1: ( rule__XFunctionTypeRef__Group__1__Impl rule__XFunctionTypeRef__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21449:2: rule__XFunctionTypeRef__Group__1__Impl rule__XFunctionTypeRef__Group__2
+            // InternalCheck.g:21448:1: ( rule__XFunctionTypeRef__Group__1__Impl rule__XFunctionTypeRef__Group__2 )
+            // InternalCheck.g:21449:2: rule__XFunctionTypeRef__Group__1__Impl rule__XFunctionTypeRef__Group__2
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group__1__Impl_in_rule__XFunctionTypeRef__Group__143225);
+            pushFollow(FOLLOW_29);
             rule__XFunctionTypeRef__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group__2_in_rule__XFunctionTypeRef__Group__143228);
+            pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__Group__2();
 
             state._fsp--;
@@ -61343,22 +61343,22 @@ public final void rule__XFunctionTypeRef__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21456:1: rule__XFunctionTypeRef__Group__1__Impl : ( '=>' ) ;
+    // InternalCheck.g:21456:1: rule__XFunctionTypeRef__Group__1__Impl : ( '=>' ) ;
     public final void rule__XFunctionTypeRef__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21460:1: ( ( '=>' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21461:1: ( '=>' )
+            // InternalCheck.g:21460:1: ( ( '=>' ) )
+            // InternalCheck.g:21461:1: ( '=>' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21461:1: ( '=>' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21462:1: '=>'
+            // InternalCheck.g:21461:1: ( '=>' )
+            // InternalCheck.g:21462:1: '=>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getEqualsSignGreaterThanSignKeyword_1()); 
             }
-            match(input,51,FOLLOW_51_in_rule__XFunctionTypeRef__Group__1__Impl43256); if (state.failed) return ;
+            match(input,51,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFunctionTypeRefAccess().getEqualsSignGreaterThanSignKeyword_1()); 
             }
@@ -61384,16 +61384,16 @@ public final void rule__XFunctionTypeRef__Group__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21475:1: rule__XFunctionTypeRef__Group__2 : rule__XFunctionTypeRef__Group__2__Impl ;
+    // InternalCheck.g:21475:1: rule__XFunctionTypeRef__Group__2 : rule__XFunctionTypeRef__Group__2__Impl ;
     public final void rule__XFunctionTypeRef__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21479:1: ( rule__XFunctionTypeRef__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21480:2: rule__XFunctionTypeRef__Group__2__Impl
+            // InternalCheck.g:21479:1: ( rule__XFunctionTypeRef__Group__2__Impl )
+            // InternalCheck.g:21480:2: rule__XFunctionTypeRef__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group__2__Impl_in_rule__XFunctionTypeRef__Group__243287);
+            pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__Group__2__Impl();
 
             state._fsp--;
@@ -61417,25 +61417,25 @@ public final void rule__XFunctionTypeRef__Group__2() throws RecognitionException
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21486:1: rule__XFunctionTypeRef__Group__2__Impl : ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) ) ;
+    // InternalCheck.g:21486:1: rule__XFunctionTypeRef__Group__2__Impl : ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) ) ;
     public final void rule__XFunctionTypeRef__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21490:1: ( ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21491:1: ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) )
+            // InternalCheck.g:21490:1: ( ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) ) )
+            // InternalCheck.g:21491:1: ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21491:1: ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21492:1: ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 )
+            // InternalCheck.g:21491:1: ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) )
+            // InternalCheck.g:21492:1: ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getReturnTypeAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21493:1: ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21493:2: rule__XFunctionTypeRef__ReturnTypeAssignment_2
+            // InternalCheck.g:21493:1: ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 )
+            // InternalCheck.g:21493:2: rule__XFunctionTypeRef__ReturnTypeAssignment_2
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__ReturnTypeAssignment_2_in_rule__XFunctionTypeRef__Group__2__Impl43314);
+            pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__ReturnTypeAssignment_2();
 
             state._fsp--;
@@ -61468,21 +61468,21 @@ public final void rule__XFunctionTypeRef__Group__2__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21509:1: rule__XFunctionTypeRef__Group_0__0 : rule__XFunctionTypeRef__Group_0__0__Impl rule__XFunctionTypeRef__Group_0__1 ;
+    // InternalCheck.g:21509:1: rule__XFunctionTypeRef__Group_0__0 : rule__XFunctionTypeRef__Group_0__0__Impl rule__XFunctionTypeRef__Group_0__1 ;
     public final void rule__XFunctionTypeRef__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21513:1: ( rule__XFunctionTypeRef__Group_0__0__Impl rule__XFunctionTypeRef__Group_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21514:2: rule__XFunctionTypeRef__Group_0__0__Impl rule__XFunctionTypeRef__Group_0__1
+            // InternalCheck.g:21513:1: ( rule__XFunctionTypeRef__Group_0__0__Impl rule__XFunctionTypeRef__Group_0__1 )
+            // InternalCheck.g:21514:2: rule__XFunctionTypeRef__Group_0__0__Impl rule__XFunctionTypeRef__Group_0__1
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0__0__Impl_in_rule__XFunctionTypeRef__Group_0__043350);
+            pushFollow(FOLLOW_121);
             rule__XFunctionTypeRef__Group_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0__1_in_rule__XFunctionTypeRef__Group_0__043353);
+            pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__Group_0__1();
 
             state._fsp--;
@@ -61506,22 +61506,22 @@ public final void rule__XFunctionTypeRef__Group_0__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21521:1: rule__XFunctionTypeRef__Group_0__0__Impl : ( '(' ) ;
+    // InternalCheck.g:21521:1: rule__XFunctionTypeRef__Group_0__0__Impl : ( '(' ) ;
     public final void rule__XFunctionTypeRef__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21525:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21526:1: ( '(' )
+            // InternalCheck.g:21525:1: ( ( '(' ) )
+            // InternalCheck.g:21526:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21526:1: ( '(' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21527:1: '('
+            // InternalCheck.g:21526:1: ( '(' )
+            // InternalCheck.g:21527:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getLeftParenthesisKeyword_0_0()); 
             }
-            match(input,72,FOLLOW_72_in_rule__XFunctionTypeRef__Group_0__0__Impl43381); if (state.failed) return ;
+            match(input,72,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFunctionTypeRefAccess().getLeftParenthesisKeyword_0_0()); 
             }
@@ -61547,21 +61547,21 @@ public final void rule__XFunctionTypeRef__Group_0__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21540:1: rule__XFunctionTypeRef__Group_0__1 : rule__XFunctionTypeRef__Group_0__1__Impl rule__XFunctionTypeRef__Group_0__2 ;
+    // InternalCheck.g:21540:1: rule__XFunctionTypeRef__Group_0__1 : rule__XFunctionTypeRef__Group_0__1__Impl rule__XFunctionTypeRef__Group_0__2 ;
     public final void rule__XFunctionTypeRef__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21544:1: ( rule__XFunctionTypeRef__Group_0__1__Impl rule__XFunctionTypeRef__Group_0__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21545:2: rule__XFunctionTypeRef__Group_0__1__Impl rule__XFunctionTypeRef__Group_0__2
+            // InternalCheck.g:21544:1: ( rule__XFunctionTypeRef__Group_0__1__Impl rule__XFunctionTypeRef__Group_0__2 )
+            // InternalCheck.g:21545:2: rule__XFunctionTypeRef__Group_0__1__Impl rule__XFunctionTypeRef__Group_0__2
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0__1__Impl_in_rule__XFunctionTypeRef__Group_0__143412);
+            pushFollow(FOLLOW_121);
             rule__XFunctionTypeRef__Group_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0__2_in_rule__XFunctionTypeRef__Group_0__143415);
+            pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__Group_0__2();
 
             state._fsp--;
@@ -61585,22 +61585,22 @@ public final void rule__XFunctionTypeRef__Group_0__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21552:1: rule__XFunctionTypeRef__Group_0__1__Impl : ( ( rule__XFunctionTypeRef__Group_0_1__0 )? ) ;
+    // InternalCheck.g:21552:1: rule__XFunctionTypeRef__Group_0__1__Impl : ( ( rule__XFunctionTypeRef__Group_0_1__0 )? ) ;
     public final void rule__XFunctionTypeRef__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21556:1: ( ( ( rule__XFunctionTypeRef__Group_0_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21557:1: ( ( rule__XFunctionTypeRef__Group_0_1__0 )? )
+            // InternalCheck.g:21556:1: ( ( ( rule__XFunctionTypeRef__Group_0_1__0 )? ) )
+            // InternalCheck.g:21557:1: ( ( rule__XFunctionTypeRef__Group_0_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21557:1: ( ( rule__XFunctionTypeRef__Group_0_1__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21558:1: ( rule__XFunctionTypeRef__Group_0_1__0 )?
+            // InternalCheck.g:21557:1: ( ( rule__XFunctionTypeRef__Group_0_1__0 )? )
+            // InternalCheck.g:21558:1: ( rule__XFunctionTypeRef__Group_0_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getGroup_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21559:1: ( rule__XFunctionTypeRef__Group_0_1__0 )?
+            // InternalCheck.g:21559:1: ( rule__XFunctionTypeRef__Group_0_1__0 )?
             int alt157=2;
             int LA157_0 = input.LA(1);
 
@@ -61609,9 +61609,9 @@ public final void rule__XFunctionTypeRef__Group_0__1__Impl() throws RecognitionE
             }
             switch (alt157) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21559:2: rule__XFunctionTypeRef__Group_0_1__0
+                    // InternalCheck.g:21559:2: rule__XFunctionTypeRef__Group_0_1__0
                     {
-                    pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0_1__0_in_rule__XFunctionTypeRef__Group_0__1__Impl43442);
+                    pushFollow(FOLLOW_2);
                     rule__XFunctionTypeRef__Group_0_1__0();
 
                     state._fsp--;
@@ -61647,16 +61647,16 @@ public final void rule__XFunctionTypeRef__Group_0__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21569:1: rule__XFunctionTypeRef__Group_0__2 : rule__XFunctionTypeRef__Group_0__2__Impl ;
+    // InternalCheck.g:21569:1: rule__XFunctionTypeRef__Group_0__2 : rule__XFunctionTypeRef__Group_0__2__Impl ;
     public final void rule__XFunctionTypeRef__Group_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21573:1: ( rule__XFunctionTypeRef__Group_0__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21574:2: rule__XFunctionTypeRef__Group_0__2__Impl
+            // InternalCheck.g:21573:1: ( rule__XFunctionTypeRef__Group_0__2__Impl )
+            // InternalCheck.g:21574:2: rule__XFunctionTypeRef__Group_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0__2__Impl_in_rule__XFunctionTypeRef__Group_0__243473);
+            pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__Group_0__2__Impl();
 
             state._fsp--;
@@ -61680,22 +61680,22 @@ public final void rule__XFunctionTypeRef__Group_0__2() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21580:1: rule__XFunctionTypeRef__Group_0__2__Impl : ( ')' ) ;
+    // InternalCheck.g:21580:1: rule__XFunctionTypeRef__Group_0__2__Impl : ( ')' ) ;
     public final void rule__XFunctionTypeRef__Group_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21584:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21585:1: ( ')' )
+            // InternalCheck.g:21584:1: ( ( ')' ) )
+            // InternalCheck.g:21585:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21585:1: ( ')' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21586:1: ')'
+            // InternalCheck.g:21585:1: ( ')' )
+            // InternalCheck.g:21586:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getRightParenthesisKeyword_0_2()); 
             }
-            match(input,73,FOLLOW_73_in_rule__XFunctionTypeRef__Group_0__2__Impl43501); if (state.failed) return ;
+            match(input,73,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFunctionTypeRefAccess().getRightParenthesisKeyword_0_2()); 
             }
@@ -61721,21 +61721,21 @@ public final void rule__XFunctionTypeRef__Group_0__2__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21605:1: rule__XFunctionTypeRef__Group_0_1__0 : rule__XFunctionTypeRef__Group_0_1__0__Impl rule__XFunctionTypeRef__Group_0_1__1 ;
+    // InternalCheck.g:21605:1: rule__XFunctionTypeRef__Group_0_1__0 : rule__XFunctionTypeRef__Group_0_1__0__Impl rule__XFunctionTypeRef__Group_0_1__1 ;
     public final void rule__XFunctionTypeRef__Group_0_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21609:1: ( rule__XFunctionTypeRef__Group_0_1__0__Impl rule__XFunctionTypeRef__Group_0_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21610:2: rule__XFunctionTypeRef__Group_0_1__0__Impl rule__XFunctionTypeRef__Group_0_1__1
+            // InternalCheck.g:21609:1: ( rule__XFunctionTypeRef__Group_0_1__0__Impl rule__XFunctionTypeRef__Group_0_1__1 )
+            // InternalCheck.g:21610:2: rule__XFunctionTypeRef__Group_0_1__0__Impl rule__XFunctionTypeRef__Group_0_1__1
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0_1__0__Impl_in_rule__XFunctionTypeRef__Group_0_1__043538);
+            pushFollow(FOLLOW_20);
             rule__XFunctionTypeRef__Group_0_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0_1__1_in_rule__XFunctionTypeRef__Group_0_1__043541);
+            pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__Group_0_1__1();
 
             state._fsp--;
@@ -61759,25 +61759,25 @@ public final void rule__XFunctionTypeRef__Group_0_1__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21617:1: rule__XFunctionTypeRef__Group_0_1__0__Impl : ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) ) ;
+    // InternalCheck.g:21617:1: rule__XFunctionTypeRef__Group_0_1__0__Impl : ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) ) ;
     public final void rule__XFunctionTypeRef__Group_0_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21621:1: ( ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21622:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) )
+            // InternalCheck.g:21621:1: ( ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) ) )
+            // InternalCheck.g:21622:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21622:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21623:1: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 )
+            // InternalCheck.g:21622:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) )
+            // InternalCheck.g:21623:1: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getParamTypesAssignment_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21624:1: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21624:2: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0
+            // InternalCheck.g:21624:1: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 )
+            // InternalCheck.g:21624:2: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0_in_rule__XFunctionTypeRef__Group_0_1__0__Impl43568);
+            pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0();
 
             state._fsp--;
@@ -61810,16 +61810,16 @@ public final void rule__XFunctionTypeRef__Group_0_1__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21634:1: rule__XFunctionTypeRef__Group_0_1__1 : rule__XFunctionTypeRef__Group_0_1__1__Impl ;
+    // InternalCheck.g:21634:1: rule__XFunctionTypeRef__Group_0_1__1 : rule__XFunctionTypeRef__Group_0_1__1__Impl ;
     public final void rule__XFunctionTypeRef__Group_0_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21638:1: ( rule__XFunctionTypeRef__Group_0_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21639:2: rule__XFunctionTypeRef__Group_0_1__1__Impl
+            // InternalCheck.g:21638:1: ( rule__XFunctionTypeRef__Group_0_1__1__Impl )
+            // InternalCheck.g:21639:2: rule__XFunctionTypeRef__Group_0_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0_1__1__Impl_in_rule__XFunctionTypeRef__Group_0_1__143598);
+            pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__Group_0_1__1__Impl();
 
             state._fsp--;
@@ -61843,22 +61843,22 @@ public final void rule__XFunctionTypeRef__Group_0_1__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21645:1: rule__XFunctionTypeRef__Group_0_1__1__Impl : ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* ) ;
+    // InternalCheck.g:21645:1: rule__XFunctionTypeRef__Group_0_1__1__Impl : ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* ) ;
     public final void rule__XFunctionTypeRef__Group_0_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21649:1: ( ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21650:1: ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* )
+            // InternalCheck.g:21649:1: ( ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* ) )
+            // InternalCheck.g:21650:1: ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21650:1: ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21651:1: ( rule__XFunctionTypeRef__Group_0_1_1__0 )*
+            // InternalCheck.g:21650:1: ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* )
+            // InternalCheck.g:21651:1: ( rule__XFunctionTypeRef__Group_0_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getGroup_0_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21652:1: ( rule__XFunctionTypeRef__Group_0_1_1__0 )*
+            // InternalCheck.g:21652:1: ( rule__XFunctionTypeRef__Group_0_1_1__0 )*
             loop158:
             do {
                 int alt158=2;
@@ -61871,9 +61871,9 @@ public final void rule__XFunctionTypeRef__Group_0_1__1__Impl() throws Recognitio
 
                 switch (alt158) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21652:2: rule__XFunctionTypeRef__Group_0_1_1__0
+            	    // InternalCheck.g:21652:2: rule__XFunctionTypeRef__Group_0_1_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0_1_1__0_in_rule__XFunctionTypeRef__Group_0_1__1__Impl43625);
+            	    pushFollow(FOLLOW_21);
             	    rule__XFunctionTypeRef__Group_0_1_1__0();
 
             	    state._fsp--;
@@ -61912,21 +61912,21 @@ public final void rule__XFunctionTypeRef__Group_0_1__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21666:1: rule__XFunctionTypeRef__Group_0_1_1__0 : rule__XFunctionTypeRef__Group_0_1_1__0__Impl rule__XFunctionTypeRef__Group_0_1_1__1 ;
+    // InternalCheck.g:21666:1: rule__XFunctionTypeRef__Group_0_1_1__0 : rule__XFunctionTypeRef__Group_0_1_1__0__Impl rule__XFunctionTypeRef__Group_0_1_1__1 ;
     public final void rule__XFunctionTypeRef__Group_0_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21670:1: ( rule__XFunctionTypeRef__Group_0_1_1__0__Impl rule__XFunctionTypeRef__Group_0_1_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21671:2: rule__XFunctionTypeRef__Group_0_1_1__0__Impl rule__XFunctionTypeRef__Group_0_1_1__1
+            // InternalCheck.g:21670:1: ( rule__XFunctionTypeRef__Group_0_1_1__0__Impl rule__XFunctionTypeRef__Group_0_1_1__1 )
+            // InternalCheck.g:21671:2: rule__XFunctionTypeRef__Group_0_1_1__0__Impl rule__XFunctionTypeRef__Group_0_1_1__1
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0_1_1__0__Impl_in_rule__XFunctionTypeRef__Group_0_1_1__043660);
+            pushFollow(FOLLOW_29);
             rule__XFunctionTypeRef__Group_0_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0_1_1__1_in_rule__XFunctionTypeRef__Group_0_1_1__043663);
+            pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__Group_0_1_1__1();
 
             state._fsp--;
@@ -61950,22 +61950,22 @@ public final void rule__XFunctionTypeRef__Group_0_1_1__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21678:1: rule__XFunctionTypeRef__Group_0_1_1__0__Impl : ( ',' ) ;
+    // InternalCheck.g:21678:1: rule__XFunctionTypeRef__Group_0_1_1__0__Impl : ( ',' ) ;
     public final void rule__XFunctionTypeRef__Group_0_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21682:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21683:1: ( ',' )
+            // InternalCheck.g:21682:1: ( ( ',' ) )
+            // InternalCheck.g:21683:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21683:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21684:1: ','
+            // InternalCheck.g:21683:1: ( ',' )
+            // InternalCheck.g:21684:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getCommaKeyword_0_1_1_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XFunctionTypeRef__Group_0_1_1__0__Impl43691); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFunctionTypeRefAccess().getCommaKeyword_0_1_1_0()); 
             }
@@ -61991,16 +61991,16 @@ public final void rule__XFunctionTypeRef__Group_0_1_1__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21697:1: rule__XFunctionTypeRef__Group_0_1_1__1 : rule__XFunctionTypeRef__Group_0_1_1__1__Impl ;
+    // InternalCheck.g:21697:1: rule__XFunctionTypeRef__Group_0_1_1__1 : rule__XFunctionTypeRef__Group_0_1_1__1__Impl ;
     public final void rule__XFunctionTypeRef__Group_0_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21701:1: ( rule__XFunctionTypeRef__Group_0_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21702:2: rule__XFunctionTypeRef__Group_0_1_1__1__Impl
+            // InternalCheck.g:21701:1: ( rule__XFunctionTypeRef__Group_0_1_1__1__Impl )
+            // InternalCheck.g:21702:2: rule__XFunctionTypeRef__Group_0_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0_1_1__1__Impl_in_rule__XFunctionTypeRef__Group_0_1_1__143722);
+            pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__Group_0_1_1__1__Impl();
 
             state._fsp--;
@@ -62024,25 +62024,25 @@ public final void rule__XFunctionTypeRef__Group_0_1_1__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21708:1: rule__XFunctionTypeRef__Group_0_1_1__1__Impl : ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) ) ;
+    // InternalCheck.g:21708:1: rule__XFunctionTypeRef__Group_0_1_1__1__Impl : ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) ) ;
     public final void rule__XFunctionTypeRef__Group_0_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21712:1: ( ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21713:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) )
+            // InternalCheck.g:21712:1: ( ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) ) )
+            // InternalCheck.g:21713:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21713:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21714:1: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 )
+            // InternalCheck.g:21713:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) )
+            // InternalCheck.g:21714:1: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getParamTypesAssignment_0_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21715:1: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21715:2: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1
+            // InternalCheck.g:21715:1: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 )
+            // InternalCheck.g:21715:2: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1_in_rule__XFunctionTypeRef__Group_0_1_1__1__Impl43749);
+            pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1();
 
             state._fsp--;
@@ -62075,21 +62075,21 @@ public final void rule__XFunctionTypeRef__Group_0_1_1__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21729:1: rule__JvmParameterizedTypeReference__Group__0 : rule__JvmParameterizedTypeReference__Group__0__Impl rule__JvmParameterizedTypeReference__Group__1 ;
+    // InternalCheck.g:21729:1: rule__JvmParameterizedTypeReference__Group__0 : rule__JvmParameterizedTypeReference__Group__0__Impl rule__JvmParameterizedTypeReference__Group__1 ;
     public final void rule__JvmParameterizedTypeReference__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21733:1: ( rule__JvmParameterizedTypeReference__Group__0__Impl rule__JvmParameterizedTypeReference__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21734:2: rule__JvmParameterizedTypeReference__Group__0__Impl rule__JvmParameterizedTypeReference__Group__1
+            // InternalCheck.g:21733:1: ( rule__JvmParameterizedTypeReference__Group__0__Impl rule__JvmParameterizedTypeReference__Group__1 )
+            // InternalCheck.g:21734:2: rule__JvmParameterizedTypeReference__Group__0__Impl rule__JvmParameterizedTypeReference__Group__1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group__0__Impl_in_rule__JvmParameterizedTypeReference__Group__043783);
+            pushFollow(FOLLOW_52);
             rule__JvmParameterizedTypeReference__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group__1_in_rule__JvmParameterizedTypeReference__Group__043786);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group__1();
 
             state._fsp--;
@@ -62113,25 +62113,25 @@ public final void rule__JvmParameterizedTypeReference__Group__0() throws Recogni
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21741:1: rule__JvmParameterizedTypeReference__Group__0__Impl : ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) ) ;
+    // InternalCheck.g:21741:1: rule__JvmParameterizedTypeReference__Group__0__Impl : ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21745:1: ( ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21746:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) )
+            // InternalCheck.g:21745:1: ( ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) ) )
+            // InternalCheck.g:21746:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21746:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21747:1: ( rule__JvmParameterizedTypeReference__TypeAssignment_0 )
+            // InternalCheck.g:21746:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) )
+            // InternalCheck.g:21747:1: ( rule__JvmParameterizedTypeReference__TypeAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21748:1: ( rule__JvmParameterizedTypeReference__TypeAssignment_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21748:2: rule__JvmParameterizedTypeReference__TypeAssignment_0
+            // InternalCheck.g:21748:1: ( rule__JvmParameterizedTypeReference__TypeAssignment_0 )
+            // InternalCheck.g:21748:2: rule__JvmParameterizedTypeReference__TypeAssignment_0
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__TypeAssignment_0_in_rule__JvmParameterizedTypeReference__Group__0__Impl43813);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__TypeAssignment_0();
 
             state._fsp--;
@@ -62164,16 +62164,16 @@ public final void rule__JvmParameterizedTypeReference__Group__0__Impl() throws R
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21758:1: rule__JvmParameterizedTypeReference__Group__1 : rule__JvmParameterizedTypeReference__Group__1__Impl ;
+    // InternalCheck.g:21758:1: rule__JvmParameterizedTypeReference__Group__1 : rule__JvmParameterizedTypeReference__Group__1__Impl ;
     public final void rule__JvmParameterizedTypeReference__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21762:1: ( rule__JvmParameterizedTypeReference__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21763:2: rule__JvmParameterizedTypeReference__Group__1__Impl
+            // InternalCheck.g:21762:1: ( rule__JvmParameterizedTypeReference__Group__1__Impl )
+            // InternalCheck.g:21763:2: rule__JvmParameterizedTypeReference__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group__1__Impl_in_rule__JvmParameterizedTypeReference__Group__143843);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group__1__Impl();
 
             state._fsp--;
@@ -62197,29 +62197,29 @@ public final void rule__JvmParameterizedTypeReference__Group__1() throws Recogni
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21769:1: rule__JvmParameterizedTypeReference__Group__1__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? ) ;
+    // InternalCheck.g:21769:1: rule__JvmParameterizedTypeReference__Group__1__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? ) ;
     public final void rule__JvmParameterizedTypeReference__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21773:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21774:1: ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? )
+            // InternalCheck.g:21773:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? ) )
+            // InternalCheck.g:21774:1: ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21774:1: ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21775:1: ( rule__JvmParameterizedTypeReference__Group_1__0 )?
+            // InternalCheck.g:21774:1: ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? )
+            // InternalCheck.g:21775:1: ( rule__JvmParameterizedTypeReference__Group_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21776:1: ( rule__JvmParameterizedTypeReference__Group_1__0 )?
+            // InternalCheck.g:21776:1: ( rule__JvmParameterizedTypeReference__Group_1__0 )?
             int alt159=2;
             alt159 = dfa159.predict(input);
             switch (alt159) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21776:2: rule__JvmParameterizedTypeReference__Group_1__0
+                    // InternalCheck.g:21776:2: rule__JvmParameterizedTypeReference__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__0_in_rule__JvmParameterizedTypeReference__Group__1__Impl43870);
+                    pushFollow(FOLLOW_2);
                     rule__JvmParameterizedTypeReference__Group_1__0();
 
                     state._fsp--;
@@ -62255,21 +62255,21 @@ public final void rule__JvmParameterizedTypeReference__Group__1__Impl() throws R
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21790:1: rule__JvmParameterizedTypeReference__Group_1__0 : rule__JvmParameterizedTypeReference__Group_1__0__Impl rule__JvmParameterizedTypeReference__Group_1__1 ;
+    // InternalCheck.g:21790:1: rule__JvmParameterizedTypeReference__Group_1__0 : rule__JvmParameterizedTypeReference__Group_1__0__Impl rule__JvmParameterizedTypeReference__Group_1__1 ;
     public final void rule__JvmParameterizedTypeReference__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21794:1: ( rule__JvmParameterizedTypeReference__Group_1__0__Impl rule__JvmParameterizedTypeReference__Group_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21795:2: rule__JvmParameterizedTypeReference__Group_1__0__Impl rule__JvmParameterizedTypeReference__Group_1__1
+            // InternalCheck.g:21794:1: ( rule__JvmParameterizedTypeReference__Group_1__0__Impl rule__JvmParameterizedTypeReference__Group_1__1 )
+            // InternalCheck.g:21795:2: rule__JvmParameterizedTypeReference__Group_1__0__Impl rule__JvmParameterizedTypeReference__Group_1__1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1__043905);
+            pushFollow(FOLLOW_79);
             rule__JvmParameterizedTypeReference__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__1_in_rule__JvmParameterizedTypeReference__Group_1__043908);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1__1();
 
             state._fsp--;
@@ -62293,25 +62293,25 @@ public final void rule__JvmParameterizedTypeReference__Group_1__0() throws Recog
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21802:1: rule__JvmParameterizedTypeReference__Group_1__0__Impl : ( ( '<' ) ) ;
+    // InternalCheck.g:21802:1: rule__JvmParameterizedTypeReference__Group_1__0__Impl : ( ( '<' ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21806:1: ( ( ( '<' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21807:1: ( ( '<' ) )
+            // InternalCheck.g:21806:1: ( ( ( '<' ) ) )
+            // InternalCheck.g:21807:1: ( ( '<' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21807:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21808:1: ( '<' )
+            // InternalCheck.g:21807:1: ( ( '<' ) )
+            // InternalCheck.g:21808:1: ( '<' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getLessThanSignKeyword_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21809:1: ( '<' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21810:2: '<'
+            // InternalCheck.g:21809:1: ( '<' )
+            // InternalCheck.g:21810:2: '<'
             {
-            match(input,47,FOLLOW_47_in_rule__JvmParameterizedTypeReference__Group_1__0__Impl43937); if (state.failed) return ;
+            match(input,47,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -62340,21 +62340,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1__0__Impl() throws
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21821:1: rule__JvmParameterizedTypeReference__Group_1__1 : rule__JvmParameterizedTypeReference__Group_1__1__Impl rule__JvmParameterizedTypeReference__Group_1__2 ;
+    // InternalCheck.g:21821:1: rule__JvmParameterizedTypeReference__Group_1__1 : rule__JvmParameterizedTypeReference__Group_1__1__Impl rule__JvmParameterizedTypeReference__Group_1__2 ;
     public final void rule__JvmParameterizedTypeReference__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21825:1: ( rule__JvmParameterizedTypeReference__Group_1__1__Impl rule__JvmParameterizedTypeReference__Group_1__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21826:2: rule__JvmParameterizedTypeReference__Group_1__1__Impl rule__JvmParameterizedTypeReference__Group_1__2
+            // InternalCheck.g:21825:1: ( rule__JvmParameterizedTypeReference__Group_1__1__Impl rule__JvmParameterizedTypeReference__Group_1__2 )
+            // InternalCheck.g:21826:2: rule__JvmParameterizedTypeReference__Group_1__1__Impl rule__JvmParameterizedTypeReference__Group_1__2
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1__143969);
+            pushFollow(FOLLOW_80);
             rule__JvmParameterizedTypeReference__Group_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__2_in_rule__JvmParameterizedTypeReference__Group_1__143972);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1__2();
 
             state._fsp--;
@@ -62378,25 +62378,25 @@ public final void rule__JvmParameterizedTypeReference__Group_1__1() throws Recog
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21833:1: rule__JvmParameterizedTypeReference__Group_1__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) ) ;
+    // InternalCheck.g:21833:1: rule__JvmParameterizedTypeReference__Group_1__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21837:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21838:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) )
+            // InternalCheck.g:21837:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) ) )
+            // InternalCheck.g:21838:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21838:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21839:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 )
+            // InternalCheck.g:21838:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) )
+            // InternalCheck.g:21839:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21840:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21840:2: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1
+            // InternalCheck.g:21840:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 )
+            // InternalCheck.g:21840:2: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1_in_rule__JvmParameterizedTypeReference__Group_1__1__Impl43999);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1();
 
             state._fsp--;
@@ -62429,21 +62429,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1__1__Impl() throws
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21850:1: rule__JvmParameterizedTypeReference__Group_1__2 : rule__JvmParameterizedTypeReference__Group_1__2__Impl rule__JvmParameterizedTypeReference__Group_1__3 ;
+    // InternalCheck.g:21850:1: rule__JvmParameterizedTypeReference__Group_1__2 : rule__JvmParameterizedTypeReference__Group_1__2__Impl rule__JvmParameterizedTypeReference__Group_1__3 ;
     public final void rule__JvmParameterizedTypeReference__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21854:1: ( rule__JvmParameterizedTypeReference__Group_1__2__Impl rule__JvmParameterizedTypeReference__Group_1__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21855:2: rule__JvmParameterizedTypeReference__Group_1__2__Impl rule__JvmParameterizedTypeReference__Group_1__3
+            // InternalCheck.g:21854:1: ( rule__JvmParameterizedTypeReference__Group_1__2__Impl rule__JvmParameterizedTypeReference__Group_1__3 )
+            // InternalCheck.g:21855:2: rule__JvmParameterizedTypeReference__Group_1__2__Impl rule__JvmParameterizedTypeReference__Group_1__3
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__2__Impl_in_rule__JvmParameterizedTypeReference__Group_1__244029);
+            pushFollow(FOLLOW_80);
             rule__JvmParameterizedTypeReference__Group_1__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__3_in_rule__JvmParameterizedTypeReference__Group_1__244032);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1__3();
 
             state._fsp--;
@@ -62467,22 +62467,22 @@ public final void rule__JvmParameterizedTypeReference__Group_1__2() throws Recog
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21862:1: rule__JvmParameterizedTypeReference__Group_1__2__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* ) ;
+    // InternalCheck.g:21862:1: rule__JvmParameterizedTypeReference__Group_1__2__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21866:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21867:1: ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* )
+            // InternalCheck.g:21866:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* ) )
+            // InternalCheck.g:21867:1: ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21867:1: ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21868:1: ( rule__JvmParameterizedTypeReference__Group_1_2__0 )*
+            // InternalCheck.g:21867:1: ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* )
+            // InternalCheck.g:21868:1: ( rule__JvmParameterizedTypeReference__Group_1_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21869:1: ( rule__JvmParameterizedTypeReference__Group_1_2__0 )*
+            // InternalCheck.g:21869:1: ( rule__JvmParameterizedTypeReference__Group_1_2__0 )*
             loop160:
             do {
                 int alt160=2;
@@ -62495,9 +62495,9 @@ public final void rule__JvmParameterizedTypeReference__Group_1__2__Impl() throws
 
                 switch (alt160) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21869:2: rule__JvmParameterizedTypeReference__Group_1_2__0
+            	    // InternalCheck.g:21869:2: rule__JvmParameterizedTypeReference__Group_1_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_2__0_in_rule__JvmParameterizedTypeReference__Group_1__2__Impl44059);
+            	    pushFollow(FOLLOW_21);
             	    rule__JvmParameterizedTypeReference__Group_1_2__0();
 
             	    state._fsp--;
@@ -62536,21 +62536,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1__2__Impl() throws
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21879:1: rule__JvmParameterizedTypeReference__Group_1__3 : rule__JvmParameterizedTypeReference__Group_1__3__Impl rule__JvmParameterizedTypeReference__Group_1__4 ;
+    // InternalCheck.g:21879:1: rule__JvmParameterizedTypeReference__Group_1__3 : rule__JvmParameterizedTypeReference__Group_1__3__Impl rule__JvmParameterizedTypeReference__Group_1__4 ;
     public final void rule__JvmParameterizedTypeReference__Group_1__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21883:1: ( rule__JvmParameterizedTypeReference__Group_1__3__Impl rule__JvmParameterizedTypeReference__Group_1__4 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21884:2: rule__JvmParameterizedTypeReference__Group_1__3__Impl rule__JvmParameterizedTypeReference__Group_1__4
+            // InternalCheck.g:21883:1: ( rule__JvmParameterizedTypeReference__Group_1__3__Impl rule__JvmParameterizedTypeReference__Group_1__4 )
+            // InternalCheck.g:21884:2: rule__JvmParameterizedTypeReference__Group_1__3__Impl rule__JvmParameterizedTypeReference__Group_1__4
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__3__Impl_in_rule__JvmParameterizedTypeReference__Group_1__344090);
+            pushFollow(FOLLOW_118);
             rule__JvmParameterizedTypeReference__Group_1__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__4_in_rule__JvmParameterizedTypeReference__Group_1__344093);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1__4();
 
             state._fsp--;
@@ -62574,22 +62574,22 @@ public final void rule__JvmParameterizedTypeReference__Group_1__3() throws Recog
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21891:1: rule__JvmParameterizedTypeReference__Group_1__3__Impl : ( '>' ) ;
+    // InternalCheck.g:21891:1: rule__JvmParameterizedTypeReference__Group_1__3__Impl : ( '>' ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21895:1: ( ( '>' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21896:1: ( '>' )
+            // InternalCheck.g:21895:1: ( ( '>' ) )
+            // InternalCheck.g:21896:1: ( '>' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21896:1: ( '>' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21897:1: '>'
+            // InternalCheck.g:21896:1: ( '>' )
+            // InternalCheck.g:21897:1: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGreaterThanSignKeyword_1_3()); 
             }
-            match(input,46,FOLLOW_46_in_rule__JvmParameterizedTypeReference__Group_1__3__Impl44121); if (state.failed) return ;
+            match(input,46,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGreaterThanSignKeyword_1_3()); 
             }
@@ -62615,16 +62615,16 @@ public final void rule__JvmParameterizedTypeReference__Group_1__3__Impl() throws
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21910:1: rule__JvmParameterizedTypeReference__Group_1__4 : rule__JvmParameterizedTypeReference__Group_1__4__Impl ;
+    // InternalCheck.g:21910:1: rule__JvmParameterizedTypeReference__Group_1__4 : rule__JvmParameterizedTypeReference__Group_1__4__Impl ;
     public final void rule__JvmParameterizedTypeReference__Group_1__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21914:1: ( rule__JvmParameterizedTypeReference__Group_1__4__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21915:2: rule__JvmParameterizedTypeReference__Group_1__4__Impl
+            // InternalCheck.g:21914:1: ( rule__JvmParameterizedTypeReference__Group_1__4__Impl )
+            // InternalCheck.g:21915:2: rule__JvmParameterizedTypeReference__Group_1__4__Impl
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__4__Impl_in_rule__JvmParameterizedTypeReference__Group_1__444152);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1__4__Impl();
 
             state._fsp--;
@@ -62648,22 +62648,22 @@ public final void rule__JvmParameterizedTypeReference__Group_1__4() throws Recog
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__4__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21921:1: rule__JvmParameterizedTypeReference__Group_1__4__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* ) ;
+    // InternalCheck.g:21921:1: rule__JvmParameterizedTypeReference__Group_1__4__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21925:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21926:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* )
+            // InternalCheck.g:21925:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* ) )
+            // InternalCheck.g:21926:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21926:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21927:1: ( rule__JvmParameterizedTypeReference__Group_1_4__0 )*
+            // InternalCheck.g:21926:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* )
+            // InternalCheck.g:21927:1: ( rule__JvmParameterizedTypeReference__Group_1_4__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup_1_4()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21928:1: ( rule__JvmParameterizedTypeReference__Group_1_4__0 )*
+            // InternalCheck.g:21928:1: ( rule__JvmParameterizedTypeReference__Group_1_4__0 )*
             loop161:
             do {
                 int alt161=2;
@@ -62688,9 +62688,9 @@ public final void rule__JvmParameterizedTypeReference__Group_1__4__Impl() throws
 
                 switch (alt161) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21928:2: rule__JvmParameterizedTypeReference__Group_1_4__0
+            	    // InternalCheck.g:21928:2: rule__JvmParameterizedTypeReference__Group_1_4__0
             	    {
-            	    pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__0_in_rule__JvmParameterizedTypeReference__Group_1__4__Impl44179);
+            	    pushFollow(FOLLOW_119);
             	    rule__JvmParameterizedTypeReference__Group_1_4__0();
 
             	    state._fsp--;
@@ -62729,21 +62729,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1__4__Impl() throws
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_2__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21948:1: rule__JvmParameterizedTypeReference__Group_1_2__0 : rule__JvmParameterizedTypeReference__Group_1_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_2__1 ;
+    // InternalCheck.g:21948:1: rule__JvmParameterizedTypeReference__Group_1_2__0 : rule__JvmParameterizedTypeReference__Group_1_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_2__1 ;
     public final void rule__JvmParameterizedTypeReference__Group_1_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21952:1: ( rule__JvmParameterizedTypeReference__Group_1_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_2__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21953:2: rule__JvmParameterizedTypeReference__Group_1_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_2__1
+            // InternalCheck.g:21952:1: ( rule__JvmParameterizedTypeReference__Group_1_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_2__1 )
+            // InternalCheck.g:21953:2: rule__JvmParameterizedTypeReference__Group_1_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_2__1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_2__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_2__044220);
+            pushFollow(FOLLOW_79);
             rule__JvmParameterizedTypeReference__Group_1_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_2__1_in_rule__JvmParameterizedTypeReference__Group_1_2__044223);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_2__1();
 
             state._fsp--;
@@ -62767,22 +62767,22 @@ public final void rule__JvmParameterizedTypeReference__Group_1_2__0() throws Rec
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_2__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21960:1: rule__JvmParameterizedTypeReference__Group_1_2__0__Impl : ( ',' ) ;
+    // InternalCheck.g:21960:1: rule__JvmParameterizedTypeReference__Group_1_2__0__Impl : ( ',' ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21964:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21965:1: ( ',' )
+            // InternalCheck.g:21964:1: ( ( ',' ) )
+            // InternalCheck.g:21965:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21965:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21966:1: ','
+            // InternalCheck.g:21965:1: ( ',' )
+            // InternalCheck.g:21966:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getCommaKeyword_1_2_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__JvmParameterizedTypeReference__Group_1_2__0__Impl44251); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmParameterizedTypeReferenceAccess().getCommaKeyword_1_2_0()); 
             }
@@ -62808,16 +62808,16 @@ public final void rule__JvmParameterizedTypeReference__Group_1_2__0__Impl() thro
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_2__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21979:1: rule__JvmParameterizedTypeReference__Group_1_2__1 : rule__JvmParameterizedTypeReference__Group_1_2__1__Impl ;
+    // InternalCheck.g:21979:1: rule__JvmParameterizedTypeReference__Group_1_2__1 : rule__JvmParameterizedTypeReference__Group_1_2__1__Impl ;
     public final void rule__JvmParameterizedTypeReference__Group_1_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21983:1: ( rule__JvmParameterizedTypeReference__Group_1_2__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21984:2: rule__JvmParameterizedTypeReference__Group_1_2__1__Impl
+            // InternalCheck.g:21983:1: ( rule__JvmParameterizedTypeReference__Group_1_2__1__Impl )
+            // InternalCheck.g:21984:2: rule__JvmParameterizedTypeReference__Group_1_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_2__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_2__144282);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_2__1__Impl();
 
             state._fsp--;
@@ -62841,25 +62841,25 @@ public final void rule__JvmParameterizedTypeReference__Group_1_2__1() throws Rec
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_2__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21990:1: rule__JvmParameterizedTypeReference__Group_1_2__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) ) ;
+    // InternalCheck.g:21990:1: rule__JvmParameterizedTypeReference__Group_1_2__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21994:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21995:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) )
+            // InternalCheck.g:21994:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) ) )
+            // InternalCheck.g:21995:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21995:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21996:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 )
+            // InternalCheck.g:21995:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) )
+            // InternalCheck.g:21996:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsAssignment_1_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21997:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21997:2: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1
+            // InternalCheck.g:21997:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 )
+            // InternalCheck.g:21997:2: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1_in_rule__JvmParameterizedTypeReference__Group_1_2__1__Impl44309);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1();
 
             state._fsp--;
@@ -62892,21 +62892,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1_2__1__Impl() thro
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22011:1: rule__JvmParameterizedTypeReference__Group_1_4__0 : rule__JvmParameterizedTypeReference__Group_1_4__0__Impl rule__JvmParameterizedTypeReference__Group_1_4__1 ;
+    // InternalCheck.g:22011:1: rule__JvmParameterizedTypeReference__Group_1_4__0 : rule__JvmParameterizedTypeReference__Group_1_4__0__Impl rule__JvmParameterizedTypeReference__Group_1_4__1 ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22015:1: ( rule__JvmParameterizedTypeReference__Group_1_4__0__Impl rule__JvmParameterizedTypeReference__Group_1_4__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22016:2: rule__JvmParameterizedTypeReference__Group_1_4__0__Impl rule__JvmParameterizedTypeReference__Group_1_4__1
+            // InternalCheck.g:22015:1: ( rule__JvmParameterizedTypeReference__Group_1_4__0__Impl rule__JvmParameterizedTypeReference__Group_1_4__1 )
+            // InternalCheck.g:22016:2: rule__JvmParameterizedTypeReference__Group_1_4__0__Impl rule__JvmParameterizedTypeReference__Group_1_4__1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4__044343);
+            pushFollow(FOLLOW_4);
             rule__JvmParameterizedTypeReference__Group_1_4__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__1_in_rule__JvmParameterizedTypeReference__Group_1_4__044346);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4__1();
 
             state._fsp--;
@@ -62930,25 +62930,25 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4__0() throws Rec
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22023:1: rule__JvmParameterizedTypeReference__Group_1_4__0__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) ) ;
+    // InternalCheck.g:22023:1: rule__JvmParameterizedTypeReference__Group_1_4__0__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22027:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22028:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) )
+            // InternalCheck.g:22027:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) ) )
+            // InternalCheck.g:22028:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22028:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22029:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 )
+            // InternalCheck.g:22028:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) )
+            // InternalCheck.g:22029:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup_1_4_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22030:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22030:2: rule__JvmParameterizedTypeReference__Group_1_4_0__0
+            // InternalCheck.g:22030:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 )
+            // InternalCheck.g:22030:2: rule__JvmParameterizedTypeReference__Group_1_4_0__0
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0__0_in_rule__JvmParameterizedTypeReference__Group_1_4__0__Impl44373);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_0__0();
 
             state._fsp--;
@@ -62981,21 +62981,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4__0__Impl() thro
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22040:1: rule__JvmParameterizedTypeReference__Group_1_4__1 : rule__JvmParameterizedTypeReference__Group_1_4__1__Impl rule__JvmParameterizedTypeReference__Group_1_4__2 ;
+    // InternalCheck.g:22040:1: rule__JvmParameterizedTypeReference__Group_1_4__1 : rule__JvmParameterizedTypeReference__Group_1_4__1__Impl rule__JvmParameterizedTypeReference__Group_1_4__2 ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22044:1: ( rule__JvmParameterizedTypeReference__Group_1_4__1__Impl rule__JvmParameterizedTypeReference__Group_1_4__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22045:2: rule__JvmParameterizedTypeReference__Group_1_4__1__Impl rule__JvmParameterizedTypeReference__Group_1_4__2
+            // InternalCheck.g:22044:1: ( rule__JvmParameterizedTypeReference__Group_1_4__1__Impl rule__JvmParameterizedTypeReference__Group_1_4__2 )
+            // InternalCheck.g:22045:2: rule__JvmParameterizedTypeReference__Group_1_4__1__Impl rule__JvmParameterizedTypeReference__Group_1_4__2
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4__144403);
+            pushFollow(FOLLOW_52);
             rule__JvmParameterizedTypeReference__Group_1_4__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__2_in_rule__JvmParameterizedTypeReference__Group_1_4__144406);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4__2();
 
             state._fsp--;
@@ -63019,25 +63019,25 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4__1() throws Rec
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22052:1: rule__JvmParameterizedTypeReference__Group_1_4__1__Impl : ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) ) ;
+    // InternalCheck.g:22052:1: rule__JvmParameterizedTypeReference__Group_1_4__1__Impl : ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22056:1: ( ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22057:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) )
+            // InternalCheck.g:22056:1: ( ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) ) )
+            // InternalCheck.g:22057:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22057:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22058:1: ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 )
+            // InternalCheck.g:22057:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) )
+            // InternalCheck.g:22058:1: ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeAssignment_1_4_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22059:1: ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22059:2: rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1
+            // InternalCheck.g:22059:1: ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 )
+            // InternalCheck.g:22059:2: rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1_in_rule__JvmParameterizedTypeReference__Group_1_4__1__Impl44433);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1();
 
             state._fsp--;
@@ -63070,16 +63070,16 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4__1__Impl() thro
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22069:1: rule__JvmParameterizedTypeReference__Group_1_4__2 : rule__JvmParameterizedTypeReference__Group_1_4__2__Impl ;
+    // InternalCheck.g:22069:1: rule__JvmParameterizedTypeReference__Group_1_4__2 : rule__JvmParameterizedTypeReference__Group_1_4__2__Impl ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22073:1: ( rule__JvmParameterizedTypeReference__Group_1_4__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22074:2: rule__JvmParameterizedTypeReference__Group_1_4__2__Impl
+            // InternalCheck.g:22073:1: ( rule__JvmParameterizedTypeReference__Group_1_4__2__Impl )
+            // InternalCheck.g:22074:2: rule__JvmParameterizedTypeReference__Group_1_4__2__Impl
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__2__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4__244463);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4__2__Impl();
 
             state._fsp--;
@@ -63103,29 +63103,29 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4__2() throws Rec
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22080:1: rule__JvmParameterizedTypeReference__Group_1_4__2__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? ) ;
+    // InternalCheck.g:22080:1: rule__JvmParameterizedTypeReference__Group_1_4__2__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22084:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22085:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? )
+            // InternalCheck.g:22084:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? ) )
+            // InternalCheck.g:22085:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22085:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22086:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )?
+            // InternalCheck.g:22085:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? )
+            // InternalCheck.g:22086:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup_1_4_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22087:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )?
+            // InternalCheck.g:22087:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )?
             int alt162=2;
             alt162 = dfa162.predict(input);
             switch (alt162) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22087:2: rule__JvmParameterizedTypeReference__Group_1_4_2__0
+                    // InternalCheck.g:22087:2: rule__JvmParameterizedTypeReference__Group_1_4_2__0
                     {
-                    pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__0_in_rule__JvmParameterizedTypeReference__Group_1_4__2__Impl44490);
+                    pushFollow(FOLLOW_2);
                     rule__JvmParameterizedTypeReference__Group_1_4_2__0();
 
                     state._fsp--;
@@ -63161,16 +63161,16 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4__2__Impl() thro
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22103:1: rule__JvmParameterizedTypeReference__Group_1_4_0__0 : rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl ;
+    // InternalCheck.g:22103:1: rule__JvmParameterizedTypeReference__Group_1_4_0__0 : rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22107:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22108:2: rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl
+            // InternalCheck.g:22107:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl )
+            // InternalCheck.g:22108:2: rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_0__044527);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl();
 
             state._fsp--;
@@ -63194,25 +63194,25 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_0__0() throws R
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22114:1: rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) ) ;
+    // InternalCheck.g:22114:1: rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22118:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22119:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) )
+            // InternalCheck.g:22118:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) ) )
+            // InternalCheck.g:22119:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22119:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22120:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 )
+            // InternalCheck.g:22119:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) )
+            // InternalCheck.g:22120:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup_1_4_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22121:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22121:2: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0
+            // InternalCheck.g:22121:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 )
+            // InternalCheck.g:22121:2: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0_0__0_in_rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl44554);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_0_0__0();
 
             state._fsp--;
@@ -63245,21 +63245,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl() th
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_0_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22133:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 : rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_0_0__1 ;
+    // InternalCheck.g:22133:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 : rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_0_0__1 ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22137:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_0_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22138:2: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_0_0__1
+            // InternalCheck.g:22137:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_0_0__1 )
+            // InternalCheck.g:22138:2: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_0_0__1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_0_0__044586);
+            pushFollow(FOLLOW_118);
             rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0_0__1_in_rule__JvmParameterizedTypeReference__Group_1_4_0_0__044589);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_0_0__1();
 
             state._fsp--;
@@ -63283,23 +63283,23 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_0_0__0() throws
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22145:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl : ( () ) ;
+    // InternalCheck.g:22145:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl : ( () ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22149:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22150:1: ( () )
+            // InternalCheck.g:22149:1: ( ( () ) )
+            // InternalCheck.g:22150:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22150:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22151:1: ()
+            // InternalCheck.g:22150:1: ( () )
+            // InternalCheck.g:22151:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getJvmInnerTypeReferenceOuterAction_1_4_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22152:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22154:1: 
+            // InternalCheck.g:22152:1: ()
+            // InternalCheck.g:22154:1: 
             {
             }
 
@@ -63324,16 +63324,16 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl()
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_0_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22164:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__1 : rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl ;
+    // InternalCheck.g:22164:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__1 : rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22168:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22169:2: rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl
+            // InternalCheck.g:22168:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl )
+            // InternalCheck.g:22169:2: rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_0_0__144647);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl();
 
             state._fsp--;
@@ -63357,22 +63357,22 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_0_0__1() throws
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22175:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl : ( '.' ) ;
+    // InternalCheck.g:22175:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl : ( '.' ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22179:1: ( ( '.' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22180:1: ( '.' )
+            // InternalCheck.g:22179:1: ( ( '.' ) )
+            // InternalCheck.g:22180:1: ( '.' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22180:1: ( '.' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22181:1: '.'
+            // InternalCheck.g:22180:1: ( '.' )
+            // InternalCheck.g:22181:1: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getFullStopKeyword_1_4_0_0_1()); 
             }
-            match(input,63,FOLLOW_63_in_rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl44675); if (state.failed) return ;
+            match(input,63,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmParameterizedTypeReferenceAccess().getFullStopKeyword_1_4_0_0_1()); 
             }
@@ -63398,21 +63398,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl()
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22198:1: rule__JvmParameterizedTypeReference__Group_1_4_2__0 : rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__1 ;
+    // InternalCheck.g:22198:1: rule__JvmParameterizedTypeReference__Group_1_4_2__0 : rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__1 ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22202:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22203:2: rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__1
+            // InternalCheck.g:22202:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__1 )
+            // InternalCheck.g:22203:2: rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2__044710);
+            pushFollow(FOLLOW_79);
             rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__1_in_rule__JvmParameterizedTypeReference__Group_1_4_2__044713);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_2__1();
 
             state._fsp--;
@@ -63436,25 +63436,25 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2__0() throws R
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22210:1: rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl : ( ( '<' ) ) ;
+    // InternalCheck.g:22210:1: rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl : ( ( '<' ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22214:1: ( ( ( '<' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22215:1: ( ( '<' ) )
+            // InternalCheck.g:22214:1: ( ( ( '<' ) ) )
+            // InternalCheck.g:22215:1: ( ( '<' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22215:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22216:1: ( '<' )
+            // InternalCheck.g:22215:1: ( ( '<' ) )
+            // InternalCheck.g:22216:1: ( '<' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getLessThanSignKeyword_1_4_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22217:1: ( '<' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22218:2: '<'
+            // InternalCheck.g:22217:1: ( '<' )
+            // InternalCheck.g:22218:2: '<'
             {
-            match(input,47,FOLLOW_47_in_rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl44742); if (state.failed) return ;
+            match(input,47,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -63483,21 +63483,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl() th
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22229:1: rule__JvmParameterizedTypeReference__Group_1_4_2__1 : rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__2 ;
+    // InternalCheck.g:22229:1: rule__JvmParameterizedTypeReference__Group_1_4_2__1 : rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__2 ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22233:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22234:2: rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__2
+            // InternalCheck.g:22233:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__2 )
+            // InternalCheck.g:22234:2: rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__2
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2__144774);
+            pushFollow(FOLLOW_80);
             rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__2_in_rule__JvmParameterizedTypeReference__Group_1_4_2__144777);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_2__2();
 
             state._fsp--;
@@ -63521,25 +63521,25 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2__1() throws R
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22241:1: rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) ) ;
+    // InternalCheck.g:22241:1: rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22245:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22246:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) )
+            // InternalCheck.g:22245:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) ) )
+            // InternalCheck.g:22246:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22246:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22247:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 )
+            // InternalCheck.g:22246:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) )
+            // InternalCheck.g:22247:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsAssignment_1_4_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22248:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22248:2: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1
+            // InternalCheck.g:22248:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 )
+            // InternalCheck.g:22248:2: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1_in_rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl44804);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1();
 
             state._fsp--;
@@ -63572,21 +63572,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl() th
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22258:1: rule__JvmParameterizedTypeReference__Group_1_4_2__2 : rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__3 ;
+    // InternalCheck.g:22258:1: rule__JvmParameterizedTypeReference__Group_1_4_2__2 : rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__3 ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22262:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__3 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22263:2: rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__3
+            // InternalCheck.g:22262:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__3 )
+            // InternalCheck.g:22263:2: rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__3
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2__244834);
+            pushFollow(FOLLOW_80);
             rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__3_in_rule__JvmParameterizedTypeReference__Group_1_4_2__244837);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_2__3();
 
             state._fsp--;
@@ -63610,22 +63610,22 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2__2() throws R
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22270:1: rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* ) ;
+    // InternalCheck.g:22270:1: rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22274:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22275:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* )
+            // InternalCheck.g:22274:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* ) )
+            // InternalCheck.g:22275:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22275:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22276:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )*
+            // InternalCheck.g:22275:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* )
+            // InternalCheck.g:22276:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup_1_4_2_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22277:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )*
+            // InternalCheck.g:22277:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )*
             loop163:
             do {
                 int alt163=2;
@@ -63638,9 +63638,9 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl() th
 
                 switch (alt163) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22277:2: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0
+            	    // InternalCheck.g:22277:2: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2_2__0_in_rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl44864);
+            	    pushFollow(FOLLOW_21);
             	    rule__JvmParameterizedTypeReference__Group_1_4_2_2__0();
 
             	    state._fsp--;
@@ -63679,16 +63679,16 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl() th
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22287:1: rule__JvmParameterizedTypeReference__Group_1_4_2__3 : rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl ;
+    // InternalCheck.g:22287:1: rule__JvmParameterizedTypeReference__Group_1_4_2__3 : rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22291:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22292:2: rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl
+            // InternalCheck.g:22291:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl )
+            // InternalCheck.g:22292:2: rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2__344895);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl();
 
             state._fsp--;
@@ -63712,22 +63712,22 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2__3() throws R
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22298:1: rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl : ( '>' ) ;
+    // InternalCheck.g:22298:1: rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl : ( '>' ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22302:1: ( ( '>' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22303:1: ( '>' )
+            // InternalCheck.g:22302:1: ( ( '>' ) )
+            // InternalCheck.g:22303:1: ( '>' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22303:1: ( '>' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22304:1: '>'
+            // InternalCheck.g:22303:1: ( '>' )
+            // InternalCheck.g:22304:1: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGreaterThanSignKeyword_1_4_2_3()); 
             }
-            match(input,46,FOLLOW_46_in_rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl44923); if (state.failed) return ;
+            match(input,46,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGreaterThanSignKeyword_1_4_2_3()); 
             }
@@ -63753,21 +63753,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl() th
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2_2__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22325:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 : rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2_2__1 ;
+    // InternalCheck.g:22325:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 : rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2_2__1 ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22329:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2_2__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22330:2: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2_2__1
+            // InternalCheck.g:22329:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2_2__1 )
+            // InternalCheck.g:22330:2: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2_2__1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__044962);
+            pushFollow(FOLLOW_79);
             rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2_2__1_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__044965);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_2_2__1();
 
             state._fsp--;
@@ -63791,22 +63791,22 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2_2__0() throws
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22337:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl : ( ',' ) ;
+    // InternalCheck.g:22337:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl : ( ',' ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22341:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22342:1: ( ',' )
+            // InternalCheck.g:22341:1: ( ( ',' ) )
+            // InternalCheck.g:22342:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22342:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22343:1: ','
+            // InternalCheck.g:22342:1: ( ',' )
+            // InternalCheck.g:22343:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getCommaKeyword_1_4_2_2_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl44993); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmParameterizedTypeReferenceAccess().getCommaKeyword_1_4_2_2_0()); 
             }
@@ -63832,16 +63832,16 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl()
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2_2__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22356:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__1 : rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl ;
+    // InternalCheck.g:22356:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__1 : rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22360:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22361:2: rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl
+            // InternalCheck.g:22360:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl )
+            // InternalCheck.g:22361:2: rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__145024);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl();
 
             state._fsp--;
@@ -63865,25 +63865,25 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2_2__1() throws
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22367:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) ) ;
+    // InternalCheck.g:22367:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22371:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22372:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) )
+            // InternalCheck.g:22371:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) ) )
+            // InternalCheck.g:22372:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22372:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22373:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 )
+            // InternalCheck.g:22372:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) )
+            // InternalCheck.g:22373:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsAssignment_1_4_2_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22374:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22374:2: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1
+            // InternalCheck.g:22374:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 )
+            // InternalCheck.g:22374:2: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl45051);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1();
 
             state._fsp--;
@@ -63916,21 +63916,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl()
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22388:1: rule__JvmWildcardTypeReference__Group__0 : rule__JvmWildcardTypeReference__Group__0__Impl rule__JvmWildcardTypeReference__Group__1 ;
+    // InternalCheck.g:22388:1: rule__JvmWildcardTypeReference__Group__0 : rule__JvmWildcardTypeReference__Group__0__Impl rule__JvmWildcardTypeReference__Group__1 ;
     public final void rule__JvmWildcardTypeReference__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22392:1: ( rule__JvmWildcardTypeReference__Group__0__Impl rule__JvmWildcardTypeReference__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22393:2: rule__JvmWildcardTypeReference__Group__0__Impl rule__JvmWildcardTypeReference__Group__1
+            // InternalCheck.g:22392:1: ( rule__JvmWildcardTypeReference__Group__0__Impl rule__JvmWildcardTypeReference__Group__1 )
+            // InternalCheck.g:22393:2: rule__JvmWildcardTypeReference__Group__0__Impl rule__JvmWildcardTypeReference__Group__1
             {
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group__0__Impl_in_rule__JvmWildcardTypeReference__Group__045085);
+            pushFollow(FOLLOW_79);
             rule__JvmWildcardTypeReference__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group__1_in_rule__JvmWildcardTypeReference__Group__045088);
+            pushFollow(FOLLOW_2);
             rule__JvmWildcardTypeReference__Group__1();
 
             state._fsp--;
@@ -63954,23 +63954,23 @@ public final void rule__JvmWildcardTypeReference__Group__0() throws RecognitionE
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22400:1: rule__JvmWildcardTypeReference__Group__0__Impl : ( () ) ;
+    // InternalCheck.g:22400:1: rule__JvmWildcardTypeReference__Group__0__Impl : ( () ) ;
     public final void rule__JvmWildcardTypeReference__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22404:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22405:1: ( () )
+            // InternalCheck.g:22404:1: ( ( () ) )
+            // InternalCheck.g:22405:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22405:1: ( () )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22406:1: ()
+            // InternalCheck.g:22405:1: ( () )
+            // InternalCheck.g:22406:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getJvmWildcardTypeReferenceAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22407:1: ()
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22409:1: 
+            // InternalCheck.g:22407:1: ()
+            // InternalCheck.g:22409:1: 
             {
             }
 
@@ -63995,21 +63995,21 @@ public final void rule__JvmWildcardTypeReference__Group__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22419:1: rule__JvmWildcardTypeReference__Group__1 : rule__JvmWildcardTypeReference__Group__1__Impl rule__JvmWildcardTypeReference__Group__2 ;
+    // InternalCheck.g:22419:1: rule__JvmWildcardTypeReference__Group__1 : rule__JvmWildcardTypeReference__Group__1__Impl rule__JvmWildcardTypeReference__Group__2 ;
     public final void rule__JvmWildcardTypeReference__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22423:1: ( rule__JvmWildcardTypeReference__Group__1__Impl rule__JvmWildcardTypeReference__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22424:2: rule__JvmWildcardTypeReference__Group__1__Impl rule__JvmWildcardTypeReference__Group__2
+            // InternalCheck.g:22423:1: ( rule__JvmWildcardTypeReference__Group__1__Impl rule__JvmWildcardTypeReference__Group__2 )
+            // InternalCheck.g:22424:2: rule__JvmWildcardTypeReference__Group__1__Impl rule__JvmWildcardTypeReference__Group__2
             {
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group__1__Impl_in_rule__JvmWildcardTypeReference__Group__145146);
+            pushFollow(FOLLOW_122);
             rule__JvmWildcardTypeReference__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group__2_in_rule__JvmWildcardTypeReference__Group__145149);
+            pushFollow(FOLLOW_2);
             rule__JvmWildcardTypeReference__Group__2();
 
             state._fsp--;
@@ -64033,22 +64033,22 @@ public final void rule__JvmWildcardTypeReference__Group__1() throws RecognitionE
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22431:1: rule__JvmWildcardTypeReference__Group__1__Impl : ( '?' ) ;
+    // InternalCheck.g:22431:1: rule__JvmWildcardTypeReference__Group__1__Impl : ( '?' ) ;
     public final void rule__JvmWildcardTypeReference__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22435:1: ( ( '?' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22436:1: ( '?' )
+            // InternalCheck.g:22435:1: ( ( '?' ) )
+            // InternalCheck.g:22436:1: ( '?' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22436:1: ( '?' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22437:1: '?'
+            // InternalCheck.g:22436:1: ( '?' )
+            // InternalCheck.g:22437:1: '?'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getQuestionMarkKeyword_1()); 
             }
-            match(input,101,FOLLOW_101_in_rule__JvmWildcardTypeReference__Group__1__Impl45177); if (state.failed) return ;
+            match(input,101,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmWildcardTypeReferenceAccess().getQuestionMarkKeyword_1()); 
             }
@@ -64074,16 +64074,16 @@ public final void rule__JvmWildcardTypeReference__Group__1__Impl() throws Recogn
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22450:1: rule__JvmWildcardTypeReference__Group__2 : rule__JvmWildcardTypeReference__Group__2__Impl ;
+    // InternalCheck.g:22450:1: rule__JvmWildcardTypeReference__Group__2 : rule__JvmWildcardTypeReference__Group__2__Impl ;
     public final void rule__JvmWildcardTypeReference__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22454:1: ( rule__JvmWildcardTypeReference__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22455:2: rule__JvmWildcardTypeReference__Group__2__Impl
+            // InternalCheck.g:22454:1: ( rule__JvmWildcardTypeReference__Group__2__Impl )
+            // InternalCheck.g:22455:2: rule__JvmWildcardTypeReference__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group__2__Impl_in_rule__JvmWildcardTypeReference__Group__245208);
+            pushFollow(FOLLOW_2);
             rule__JvmWildcardTypeReference__Group__2__Impl();
 
             state._fsp--;
@@ -64107,22 +64107,22 @@ public final void rule__JvmWildcardTypeReference__Group__2() throws RecognitionE
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22461:1: rule__JvmWildcardTypeReference__Group__2__Impl : ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? ) ;
+    // InternalCheck.g:22461:1: rule__JvmWildcardTypeReference__Group__2__Impl : ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? ) ;
     public final void rule__JvmWildcardTypeReference__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22465:1: ( ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22466:1: ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? )
+            // InternalCheck.g:22465:1: ( ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? ) )
+            // InternalCheck.g:22466:1: ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22466:1: ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22467:1: ( rule__JvmWildcardTypeReference__Alternatives_2 )?
+            // InternalCheck.g:22466:1: ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? )
+            // InternalCheck.g:22467:1: ( rule__JvmWildcardTypeReference__Alternatives_2 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getAlternatives_2()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22468:1: ( rule__JvmWildcardTypeReference__Alternatives_2 )?
+            // InternalCheck.g:22468:1: ( rule__JvmWildcardTypeReference__Alternatives_2 )?
             int alt164=2;
             int LA164_0 = input.LA(1);
 
@@ -64131,9 +64131,9 @@ public final void rule__JvmWildcardTypeReference__Group__2__Impl() throws Recogn
             }
             switch (alt164) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22468:2: rule__JvmWildcardTypeReference__Alternatives_2
+                    // InternalCheck.g:22468:2: rule__JvmWildcardTypeReference__Alternatives_2
                     {
-                    pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Alternatives_2_in_rule__JvmWildcardTypeReference__Group__2__Impl45235);
+                    pushFollow(FOLLOW_2);
                     rule__JvmWildcardTypeReference__Alternatives_2();
 
                     state._fsp--;
@@ -64169,21 +64169,21 @@ public final void rule__JvmWildcardTypeReference__Group__2__Impl() throws Recogn
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_0__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22484:1: rule__JvmWildcardTypeReference__Group_2_0__0 : rule__JvmWildcardTypeReference__Group_2_0__0__Impl rule__JvmWildcardTypeReference__Group_2_0__1 ;
+    // InternalCheck.g:22484:1: rule__JvmWildcardTypeReference__Group_2_0__0 : rule__JvmWildcardTypeReference__Group_2_0__0__Impl rule__JvmWildcardTypeReference__Group_2_0__1 ;
     public final void rule__JvmWildcardTypeReference__Group_2_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22488:1: ( rule__JvmWildcardTypeReference__Group_2_0__0__Impl rule__JvmWildcardTypeReference__Group_2_0__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22489:2: rule__JvmWildcardTypeReference__Group_2_0__0__Impl rule__JvmWildcardTypeReference__Group_2_0__1
+            // InternalCheck.g:22488:1: ( rule__JvmWildcardTypeReference__Group_2_0__0__Impl rule__JvmWildcardTypeReference__Group_2_0__1 )
+            // InternalCheck.g:22489:2: rule__JvmWildcardTypeReference__Group_2_0__0__Impl rule__JvmWildcardTypeReference__Group_2_0__1
             {
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group_2_0__0__Impl_in_rule__JvmWildcardTypeReference__Group_2_0__045272);
+            pushFollow(FOLLOW_123);
             rule__JvmWildcardTypeReference__Group_2_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group_2_0__1_in_rule__JvmWildcardTypeReference__Group_2_0__045275);
+            pushFollow(FOLLOW_2);
             rule__JvmWildcardTypeReference__Group_2_0__1();
 
             state._fsp--;
@@ -64207,25 +64207,25 @@ public final void rule__JvmWildcardTypeReference__Group_2_0__0() throws Recognit
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_0__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22496:1: rule__JvmWildcardTypeReference__Group_2_0__0__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) ) ;
+    // InternalCheck.g:22496:1: rule__JvmWildcardTypeReference__Group_2_0__0__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) ) ;
     public final void rule__JvmWildcardTypeReference__Group_2_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22500:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22501:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) )
+            // InternalCheck.g:22500:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) ) )
+            // InternalCheck.g:22501:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22501:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22502:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 )
+            // InternalCheck.g:22501:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) )
+            // InternalCheck.g:22502:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsAssignment_2_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22503:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22503:2: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0
+            // InternalCheck.g:22503:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 )
+            // InternalCheck.g:22503:2: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0
             {
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0_in_rule__JvmWildcardTypeReference__Group_2_0__0__Impl45302);
+            pushFollow(FOLLOW_2);
             rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0();
 
             state._fsp--;
@@ -64258,16 +64258,16 @@ public final void rule__JvmWildcardTypeReference__Group_2_0__0__Impl() throws Re
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_0__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22513:1: rule__JvmWildcardTypeReference__Group_2_0__1 : rule__JvmWildcardTypeReference__Group_2_0__1__Impl ;
+    // InternalCheck.g:22513:1: rule__JvmWildcardTypeReference__Group_2_0__1 : rule__JvmWildcardTypeReference__Group_2_0__1__Impl ;
     public final void rule__JvmWildcardTypeReference__Group_2_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22517:1: ( rule__JvmWildcardTypeReference__Group_2_0__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22518:2: rule__JvmWildcardTypeReference__Group_2_0__1__Impl
+            // InternalCheck.g:22517:1: ( rule__JvmWildcardTypeReference__Group_2_0__1__Impl )
+            // InternalCheck.g:22518:2: rule__JvmWildcardTypeReference__Group_2_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group_2_0__1__Impl_in_rule__JvmWildcardTypeReference__Group_2_0__145332);
+            pushFollow(FOLLOW_2);
             rule__JvmWildcardTypeReference__Group_2_0__1__Impl();
 
             state._fsp--;
@@ -64291,22 +64291,22 @@ public final void rule__JvmWildcardTypeReference__Group_2_0__1() throws Recognit
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_0__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22524:1: rule__JvmWildcardTypeReference__Group_2_0__1__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* ) ;
+    // InternalCheck.g:22524:1: rule__JvmWildcardTypeReference__Group_2_0__1__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* ) ;
     public final void rule__JvmWildcardTypeReference__Group_2_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22528:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22529:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* )
+            // InternalCheck.g:22528:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* ) )
+            // InternalCheck.g:22529:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22529:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22530:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )*
+            // InternalCheck.g:22529:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* )
+            // InternalCheck.g:22530:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsAssignment_2_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22531:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )*
+            // InternalCheck.g:22531:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )*
             loop165:
             do {
                 int alt165=2;
@@ -64319,9 +64319,9 @@ public final void rule__JvmWildcardTypeReference__Group_2_0__1__Impl() throws Re
 
                 switch (alt165) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22531:2: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1
+            	    // InternalCheck.g:22531:2: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1
             	    {
-            	    pushFollow(FOLLOW_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1_in_rule__JvmWildcardTypeReference__Group_2_0__1__Impl45359);
+            	    pushFollow(FOLLOW_124);
             	    rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1();
 
             	    state._fsp--;
@@ -64360,21 +64360,21 @@ public final void rule__JvmWildcardTypeReference__Group_2_0__1__Impl() throws Re
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_1__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22545:1: rule__JvmWildcardTypeReference__Group_2_1__0 : rule__JvmWildcardTypeReference__Group_2_1__0__Impl rule__JvmWildcardTypeReference__Group_2_1__1 ;
+    // InternalCheck.g:22545:1: rule__JvmWildcardTypeReference__Group_2_1__0 : rule__JvmWildcardTypeReference__Group_2_1__0__Impl rule__JvmWildcardTypeReference__Group_2_1__1 ;
     public final void rule__JvmWildcardTypeReference__Group_2_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22549:1: ( rule__JvmWildcardTypeReference__Group_2_1__0__Impl rule__JvmWildcardTypeReference__Group_2_1__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22550:2: rule__JvmWildcardTypeReference__Group_2_1__0__Impl rule__JvmWildcardTypeReference__Group_2_1__1
+            // InternalCheck.g:22549:1: ( rule__JvmWildcardTypeReference__Group_2_1__0__Impl rule__JvmWildcardTypeReference__Group_2_1__1 )
+            // InternalCheck.g:22550:2: rule__JvmWildcardTypeReference__Group_2_1__0__Impl rule__JvmWildcardTypeReference__Group_2_1__1
             {
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group_2_1__0__Impl_in_rule__JvmWildcardTypeReference__Group_2_1__045394);
+            pushFollow(FOLLOW_123);
             rule__JvmWildcardTypeReference__Group_2_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group_2_1__1_in_rule__JvmWildcardTypeReference__Group_2_1__045397);
+            pushFollow(FOLLOW_2);
             rule__JvmWildcardTypeReference__Group_2_1__1();
 
             state._fsp--;
@@ -64398,25 +64398,25 @@ public final void rule__JvmWildcardTypeReference__Group_2_1__0() throws Recognit
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_1__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22557:1: rule__JvmWildcardTypeReference__Group_2_1__0__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) ) ;
+    // InternalCheck.g:22557:1: rule__JvmWildcardTypeReference__Group_2_1__0__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) ) ;
     public final void rule__JvmWildcardTypeReference__Group_2_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22561:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22562:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) )
+            // InternalCheck.g:22561:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) ) )
+            // InternalCheck.g:22562:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22562:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22563:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 )
+            // InternalCheck.g:22562:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) )
+            // InternalCheck.g:22563:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsAssignment_2_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22564:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22564:2: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0
+            // InternalCheck.g:22564:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 )
+            // InternalCheck.g:22564:2: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0
             {
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0_in_rule__JvmWildcardTypeReference__Group_2_1__0__Impl45424);
+            pushFollow(FOLLOW_2);
             rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0();
 
             state._fsp--;
@@ -64449,16 +64449,16 @@ public final void rule__JvmWildcardTypeReference__Group_2_1__0__Impl() throws Re
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_1__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22574:1: rule__JvmWildcardTypeReference__Group_2_1__1 : rule__JvmWildcardTypeReference__Group_2_1__1__Impl ;
+    // InternalCheck.g:22574:1: rule__JvmWildcardTypeReference__Group_2_1__1 : rule__JvmWildcardTypeReference__Group_2_1__1__Impl ;
     public final void rule__JvmWildcardTypeReference__Group_2_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22578:1: ( rule__JvmWildcardTypeReference__Group_2_1__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22579:2: rule__JvmWildcardTypeReference__Group_2_1__1__Impl
+            // InternalCheck.g:22578:1: ( rule__JvmWildcardTypeReference__Group_2_1__1__Impl )
+            // InternalCheck.g:22579:2: rule__JvmWildcardTypeReference__Group_2_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group_2_1__1__Impl_in_rule__JvmWildcardTypeReference__Group_2_1__145454);
+            pushFollow(FOLLOW_2);
             rule__JvmWildcardTypeReference__Group_2_1__1__Impl();
 
             state._fsp--;
@@ -64482,22 +64482,22 @@ public final void rule__JvmWildcardTypeReference__Group_2_1__1() throws Recognit
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_1__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22585:1: rule__JvmWildcardTypeReference__Group_2_1__1__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* ) ;
+    // InternalCheck.g:22585:1: rule__JvmWildcardTypeReference__Group_2_1__1__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* ) ;
     public final void rule__JvmWildcardTypeReference__Group_2_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22589:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22590:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* )
+            // InternalCheck.g:22589:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* ) )
+            // InternalCheck.g:22590:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22590:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22591:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )*
+            // InternalCheck.g:22590:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* )
+            // InternalCheck.g:22591:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsAssignment_2_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22592:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )*
+            // InternalCheck.g:22592:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )*
             loop166:
             do {
                 int alt166=2;
@@ -64510,9 +64510,9 @@ public final void rule__JvmWildcardTypeReference__Group_2_1__1__Impl() throws Re
 
                 switch (alt166) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22592:2: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1
+            	    // InternalCheck.g:22592:2: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1
             	    {
-            	    pushFollow(FOLLOW_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1_in_rule__JvmWildcardTypeReference__Group_2_1__1__Impl45481);
+            	    pushFollow(FOLLOW_124);
             	    rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1();
 
             	    state._fsp--;
@@ -64551,21 +64551,21 @@ public final void rule__JvmWildcardTypeReference__Group_2_1__1__Impl() throws Re
 
 
     // $ANTLR start "rule__JvmUpperBound__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22606:1: rule__JvmUpperBound__Group__0 : rule__JvmUpperBound__Group__0__Impl rule__JvmUpperBound__Group__1 ;
+    // InternalCheck.g:22606:1: rule__JvmUpperBound__Group__0 : rule__JvmUpperBound__Group__0__Impl rule__JvmUpperBound__Group__1 ;
     public final void rule__JvmUpperBound__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22610:1: ( rule__JvmUpperBound__Group__0__Impl rule__JvmUpperBound__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22611:2: rule__JvmUpperBound__Group__0__Impl rule__JvmUpperBound__Group__1
+            // InternalCheck.g:22610:1: ( rule__JvmUpperBound__Group__0__Impl rule__JvmUpperBound__Group__1 )
+            // InternalCheck.g:22611:2: rule__JvmUpperBound__Group__0__Impl rule__JvmUpperBound__Group__1
             {
-            pushFollow(FOLLOW_rule__JvmUpperBound__Group__0__Impl_in_rule__JvmUpperBound__Group__045516);
+            pushFollow(FOLLOW_29);
             rule__JvmUpperBound__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmUpperBound__Group__1_in_rule__JvmUpperBound__Group__045519);
+            pushFollow(FOLLOW_2);
             rule__JvmUpperBound__Group__1();
 
             state._fsp--;
@@ -64589,22 +64589,22 @@ public final void rule__JvmUpperBound__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__JvmUpperBound__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22618:1: rule__JvmUpperBound__Group__0__Impl : ( 'extends' ) ;
+    // InternalCheck.g:22618:1: rule__JvmUpperBound__Group__0__Impl : ( 'extends' ) ;
     public final void rule__JvmUpperBound__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22622:1: ( ( 'extends' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22623:1: ( 'extends' )
+            // InternalCheck.g:22622:1: ( ( 'extends' ) )
+            // InternalCheck.g:22623:1: ( 'extends' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22623:1: ( 'extends' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22624:1: 'extends'
+            // InternalCheck.g:22623:1: ( 'extends' )
+            // InternalCheck.g:22624:1: 'extends'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAccess().getExtendsKeyword_0()); 
             }
-            match(input,16,FOLLOW_16_in_rule__JvmUpperBound__Group__0__Impl45547); if (state.failed) return ;
+            match(input,16,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmUpperBoundAccess().getExtendsKeyword_0()); 
             }
@@ -64630,16 +64630,16 @@ public final void rule__JvmUpperBound__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__JvmUpperBound__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22637:1: rule__JvmUpperBound__Group__1 : rule__JvmUpperBound__Group__1__Impl ;
+    // InternalCheck.g:22637:1: rule__JvmUpperBound__Group__1 : rule__JvmUpperBound__Group__1__Impl ;
     public final void rule__JvmUpperBound__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22641:1: ( rule__JvmUpperBound__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22642:2: rule__JvmUpperBound__Group__1__Impl
+            // InternalCheck.g:22641:1: ( rule__JvmUpperBound__Group__1__Impl )
+            // InternalCheck.g:22642:2: rule__JvmUpperBound__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmUpperBound__Group__1__Impl_in_rule__JvmUpperBound__Group__145578);
+            pushFollow(FOLLOW_2);
             rule__JvmUpperBound__Group__1__Impl();
 
             state._fsp--;
@@ -64663,25 +64663,25 @@ public final void rule__JvmUpperBound__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__JvmUpperBound__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22648:1: rule__JvmUpperBound__Group__1__Impl : ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) ) ;
+    // InternalCheck.g:22648:1: rule__JvmUpperBound__Group__1__Impl : ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) ) ;
     public final void rule__JvmUpperBound__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22652:1: ( ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22653:1: ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) )
+            // InternalCheck.g:22652:1: ( ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) ) )
+            // InternalCheck.g:22653:1: ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22653:1: ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22654:1: ( rule__JvmUpperBound__TypeReferenceAssignment_1 )
+            // InternalCheck.g:22653:1: ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) )
+            // InternalCheck.g:22654:1: ( rule__JvmUpperBound__TypeReferenceAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAccess().getTypeReferenceAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22655:1: ( rule__JvmUpperBound__TypeReferenceAssignment_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22655:2: rule__JvmUpperBound__TypeReferenceAssignment_1
+            // InternalCheck.g:22655:1: ( rule__JvmUpperBound__TypeReferenceAssignment_1 )
+            // InternalCheck.g:22655:2: rule__JvmUpperBound__TypeReferenceAssignment_1
             {
-            pushFollow(FOLLOW_rule__JvmUpperBound__TypeReferenceAssignment_1_in_rule__JvmUpperBound__Group__1__Impl45605);
+            pushFollow(FOLLOW_2);
             rule__JvmUpperBound__TypeReferenceAssignment_1();
 
             state._fsp--;
@@ -64714,21 +64714,21 @@ public final void rule__JvmUpperBound__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__JvmUpperBoundAnded__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22669:1: rule__JvmUpperBoundAnded__Group__0 : rule__JvmUpperBoundAnded__Group__0__Impl rule__JvmUpperBoundAnded__Group__1 ;
+    // InternalCheck.g:22669:1: rule__JvmUpperBoundAnded__Group__0 : rule__JvmUpperBoundAnded__Group__0__Impl rule__JvmUpperBoundAnded__Group__1 ;
     public final void rule__JvmUpperBoundAnded__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22673:1: ( rule__JvmUpperBoundAnded__Group__0__Impl rule__JvmUpperBoundAnded__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22674:2: rule__JvmUpperBoundAnded__Group__0__Impl rule__JvmUpperBoundAnded__Group__1
+            // InternalCheck.g:22673:1: ( rule__JvmUpperBoundAnded__Group__0__Impl rule__JvmUpperBoundAnded__Group__1 )
+            // InternalCheck.g:22674:2: rule__JvmUpperBoundAnded__Group__0__Impl rule__JvmUpperBoundAnded__Group__1
             {
-            pushFollow(FOLLOW_rule__JvmUpperBoundAnded__Group__0__Impl_in_rule__JvmUpperBoundAnded__Group__045639);
+            pushFollow(FOLLOW_29);
             rule__JvmUpperBoundAnded__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmUpperBoundAnded__Group__1_in_rule__JvmUpperBoundAnded__Group__045642);
+            pushFollow(FOLLOW_2);
             rule__JvmUpperBoundAnded__Group__1();
 
             state._fsp--;
@@ -64752,22 +64752,22 @@ public final void rule__JvmUpperBoundAnded__Group__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__JvmUpperBoundAnded__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22681:1: rule__JvmUpperBoundAnded__Group__0__Impl : ( '&' ) ;
+    // InternalCheck.g:22681:1: rule__JvmUpperBoundAnded__Group__0__Impl : ( '&' ) ;
     public final void rule__JvmUpperBoundAnded__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22685:1: ( ( '&' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22686:1: ( '&' )
+            // InternalCheck.g:22685:1: ( ( '&' ) )
+            // InternalCheck.g:22686:1: ( '&' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22686:1: ( '&' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22687:1: '&'
+            // InternalCheck.g:22686:1: ( '&' )
+            // InternalCheck.g:22687:1: '&'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAndedAccess().getAmpersandKeyword_0()); 
             }
-            match(input,102,FOLLOW_102_in_rule__JvmUpperBoundAnded__Group__0__Impl45670); if (state.failed) return ;
+            match(input,102,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmUpperBoundAndedAccess().getAmpersandKeyword_0()); 
             }
@@ -64793,16 +64793,16 @@ public final void rule__JvmUpperBoundAnded__Group__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__JvmUpperBoundAnded__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22700:1: rule__JvmUpperBoundAnded__Group__1 : rule__JvmUpperBoundAnded__Group__1__Impl ;
+    // InternalCheck.g:22700:1: rule__JvmUpperBoundAnded__Group__1 : rule__JvmUpperBoundAnded__Group__1__Impl ;
     public final void rule__JvmUpperBoundAnded__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22704:1: ( rule__JvmUpperBoundAnded__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22705:2: rule__JvmUpperBoundAnded__Group__1__Impl
+            // InternalCheck.g:22704:1: ( rule__JvmUpperBoundAnded__Group__1__Impl )
+            // InternalCheck.g:22705:2: rule__JvmUpperBoundAnded__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmUpperBoundAnded__Group__1__Impl_in_rule__JvmUpperBoundAnded__Group__145701);
+            pushFollow(FOLLOW_2);
             rule__JvmUpperBoundAnded__Group__1__Impl();
 
             state._fsp--;
@@ -64826,25 +64826,25 @@ public final void rule__JvmUpperBoundAnded__Group__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__JvmUpperBoundAnded__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22711:1: rule__JvmUpperBoundAnded__Group__1__Impl : ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) ) ;
+    // InternalCheck.g:22711:1: rule__JvmUpperBoundAnded__Group__1__Impl : ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) ) ;
     public final void rule__JvmUpperBoundAnded__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22715:1: ( ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22716:1: ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) )
+            // InternalCheck.g:22715:1: ( ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) ) )
+            // InternalCheck.g:22716:1: ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22716:1: ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22717:1: ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 )
+            // InternalCheck.g:22716:1: ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) )
+            // InternalCheck.g:22717:1: ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAndedAccess().getTypeReferenceAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22718:1: ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22718:2: rule__JvmUpperBoundAnded__TypeReferenceAssignment_1
+            // InternalCheck.g:22718:1: ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 )
+            // InternalCheck.g:22718:2: rule__JvmUpperBoundAnded__TypeReferenceAssignment_1
             {
-            pushFollow(FOLLOW_rule__JvmUpperBoundAnded__TypeReferenceAssignment_1_in_rule__JvmUpperBoundAnded__Group__1__Impl45728);
+            pushFollow(FOLLOW_2);
             rule__JvmUpperBoundAnded__TypeReferenceAssignment_1();
 
             state._fsp--;
@@ -64877,21 +64877,21 @@ public final void rule__JvmUpperBoundAnded__Group__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__JvmLowerBound__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22732:1: rule__JvmLowerBound__Group__0 : rule__JvmLowerBound__Group__0__Impl rule__JvmLowerBound__Group__1 ;
+    // InternalCheck.g:22732:1: rule__JvmLowerBound__Group__0 : rule__JvmLowerBound__Group__0__Impl rule__JvmLowerBound__Group__1 ;
     public final void rule__JvmLowerBound__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22736:1: ( rule__JvmLowerBound__Group__0__Impl rule__JvmLowerBound__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22737:2: rule__JvmLowerBound__Group__0__Impl rule__JvmLowerBound__Group__1
+            // InternalCheck.g:22736:1: ( rule__JvmLowerBound__Group__0__Impl rule__JvmLowerBound__Group__1 )
+            // InternalCheck.g:22737:2: rule__JvmLowerBound__Group__0__Impl rule__JvmLowerBound__Group__1
             {
-            pushFollow(FOLLOW_rule__JvmLowerBound__Group__0__Impl_in_rule__JvmLowerBound__Group__045762);
+            pushFollow(FOLLOW_29);
             rule__JvmLowerBound__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmLowerBound__Group__1_in_rule__JvmLowerBound__Group__045765);
+            pushFollow(FOLLOW_2);
             rule__JvmLowerBound__Group__1();
 
             state._fsp--;
@@ -64915,22 +64915,22 @@ public final void rule__JvmLowerBound__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__JvmLowerBound__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22744:1: rule__JvmLowerBound__Group__0__Impl : ( 'super' ) ;
+    // InternalCheck.g:22744:1: rule__JvmLowerBound__Group__0__Impl : ( 'super' ) ;
     public final void rule__JvmLowerBound__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22748:1: ( ( 'super' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22749:1: ( 'super' )
+            // InternalCheck.g:22748:1: ( ( 'super' ) )
+            // InternalCheck.g:22749:1: ( 'super' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22749:1: ( 'super' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22750:1: 'super'
+            // InternalCheck.g:22749:1: ( 'super' )
+            // InternalCheck.g:22750:1: 'super'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAccess().getSuperKeyword_0()); 
             }
-            match(input,65,FOLLOW_65_in_rule__JvmLowerBound__Group__0__Impl45793); if (state.failed) return ;
+            match(input,65,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmLowerBoundAccess().getSuperKeyword_0()); 
             }
@@ -64956,16 +64956,16 @@ public final void rule__JvmLowerBound__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__JvmLowerBound__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22763:1: rule__JvmLowerBound__Group__1 : rule__JvmLowerBound__Group__1__Impl ;
+    // InternalCheck.g:22763:1: rule__JvmLowerBound__Group__1 : rule__JvmLowerBound__Group__1__Impl ;
     public final void rule__JvmLowerBound__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22767:1: ( rule__JvmLowerBound__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22768:2: rule__JvmLowerBound__Group__1__Impl
+            // InternalCheck.g:22767:1: ( rule__JvmLowerBound__Group__1__Impl )
+            // InternalCheck.g:22768:2: rule__JvmLowerBound__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmLowerBound__Group__1__Impl_in_rule__JvmLowerBound__Group__145824);
+            pushFollow(FOLLOW_2);
             rule__JvmLowerBound__Group__1__Impl();
 
             state._fsp--;
@@ -64989,25 +64989,25 @@ public final void rule__JvmLowerBound__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__JvmLowerBound__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22774:1: rule__JvmLowerBound__Group__1__Impl : ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) ) ;
+    // InternalCheck.g:22774:1: rule__JvmLowerBound__Group__1__Impl : ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) ) ;
     public final void rule__JvmLowerBound__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22778:1: ( ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22779:1: ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) )
+            // InternalCheck.g:22778:1: ( ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) ) )
+            // InternalCheck.g:22779:1: ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22779:1: ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22780:1: ( rule__JvmLowerBound__TypeReferenceAssignment_1 )
+            // InternalCheck.g:22779:1: ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) )
+            // InternalCheck.g:22780:1: ( rule__JvmLowerBound__TypeReferenceAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAccess().getTypeReferenceAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22781:1: ( rule__JvmLowerBound__TypeReferenceAssignment_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22781:2: rule__JvmLowerBound__TypeReferenceAssignment_1
+            // InternalCheck.g:22781:1: ( rule__JvmLowerBound__TypeReferenceAssignment_1 )
+            // InternalCheck.g:22781:2: rule__JvmLowerBound__TypeReferenceAssignment_1
             {
-            pushFollow(FOLLOW_rule__JvmLowerBound__TypeReferenceAssignment_1_in_rule__JvmLowerBound__Group__1__Impl45851);
+            pushFollow(FOLLOW_2);
             rule__JvmLowerBound__TypeReferenceAssignment_1();
 
             state._fsp--;
@@ -65040,21 +65040,21 @@ public final void rule__JvmLowerBound__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__JvmLowerBoundAnded__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22795:1: rule__JvmLowerBoundAnded__Group__0 : rule__JvmLowerBoundAnded__Group__0__Impl rule__JvmLowerBoundAnded__Group__1 ;
+    // InternalCheck.g:22795:1: rule__JvmLowerBoundAnded__Group__0 : rule__JvmLowerBoundAnded__Group__0__Impl rule__JvmLowerBoundAnded__Group__1 ;
     public final void rule__JvmLowerBoundAnded__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22799:1: ( rule__JvmLowerBoundAnded__Group__0__Impl rule__JvmLowerBoundAnded__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22800:2: rule__JvmLowerBoundAnded__Group__0__Impl rule__JvmLowerBoundAnded__Group__1
+            // InternalCheck.g:22799:1: ( rule__JvmLowerBoundAnded__Group__0__Impl rule__JvmLowerBoundAnded__Group__1 )
+            // InternalCheck.g:22800:2: rule__JvmLowerBoundAnded__Group__0__Impl rule__JvmLowerBoundAnded__Group__1
             {
-            pushFollow(FOLLOW_rule__JvmLowerBoundAnded__Group__0__Impl_in_rule__JvmLowerBoundAnded__Group__045885);
+            pushFollow(FOLLOW_29);
             rule__JvmLowerBoundAnded__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmLowerBoundAnded__Group__1_in_rule__JvmLowerBoundAnded__Group__045888);
+            pushFollow(FOLLOW_2);
             rule__JvmLowerBoundAnded__Group__1();
 
             state._fsp--;
@@ -65078,22 +65078,22 @@ public final void rule__JvmLowerBoundAnded__Group__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__JvmLowerBoundAnded__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22807:1: rule__JvmLowerBoundAnded__Group__0__Impl : ( '&' ) ;
+    // InternalCheck.g:22807:1: rule__JvmLowerBoundAnded__Group__0__Impl : ( '&' ) ;
     public final void rule__JvmLowerBoundAnded__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22811:1: ( ( '&' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22812:1: ( '&' )
+            // InternalCheck.g:22811:1: ( ( '&' ) )
+            // InternalCheck.g:22812:1: ( '&' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22812:1: ( '&' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22813:1: '&'
+            // InternalCheck.g:22812:1: ( '&' )
+            // InternalCheck.g:22813:1: '&'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAndedAccess().getAmpersandKeyword_0()); 
             }
-            match(input,102,FOLLOW_102_in_rule__JvmLowerBoundAnded__Group__0__Impl45916); if (state.failed) return ;
+            match(input,102,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmLowerBoundAndedAccess().getAmpersandKeyword_0()); 
             }
@@ -65119,16 +65119,16 @@ public final void rule__JvmLowerBoundAnded__Group__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__JvmLowerBoundAnded__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22826:1: rule__JvmLowerBoundAnded__Group__1 : rule__JvmLowerBoundAnded__Group__1__Impl ;
+    // InternalCheck.g:22826:1: rule__JvmLowerBoundAnded__Group__1 : rule__JvmLowerBoundAnded__Group__1__Impl ;
     public final void rule__JvmLowerBoundAnded__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22830:1: ( rule__JvmLowerBoundAnded__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22831:2: rule__JvmLowerBoundAnded__Group__1__Impl
+            // InternalCheck.g:22830:1: ( rule__JvmLowerBoundAnded__Group__1__Impl )
+            // InternalCheck.g:22831:2: rule__JvmLowerBoundAnded__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmLowerBoundAnded__Group__1__Impl_in_rule__JvmLowerBoundAnded__Group__145947);
+            pushFollow(FOLLOW_2);
             rule__JvmLowerBoundAnded__Group__1__Impl();
 
             state._fsp--;
@@ -65152,25 +65152,25 @@ public final void rule__JvmLowerBoundAnded__Group__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__JvmLowerBoundAnded__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22837:1: rule__JvmLowerBoundAnded__Group__1__Impl : ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) ) ;
+    // InternalCheck.g:22837:1: rule__JvmLowerBoundAnded__Group__1__Impl : ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) ) ;
     public final void rule__JvmLowerBoundAnded__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22841:1: ( ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22842:1: ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) )
+            // InternalCheck.g:22841:1: ( ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) ) )
+            // InternalCheck.g:22842:1: ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22842:1: ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22843:1: ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 )
+            // InternalCheck.g:22842:1: ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) )
+            // InternalCheck.g:22843:1: ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAndedAccess().getTypeReferenceAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22844:1: ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22844:2: rule__JvmLowerBoundAnded__TypeReferenceAssignment_1
+            // InternalCheck.g:22844:1: ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 )
+            // InternalCheck.g:22844:2: rule__JvmLowerBoundAnded__TypeReferenceAssignment_1
             {
-            pushFollow(FOLLOW_rule__JvmLowerBoundAnded__TypeReferenceAssignment_1_in_rule__JvmLowerBoundAnded__Group__1__Impl45974);
+            pushFollow(FOLLOW_2);
             rule__JvmLowerBoundAnded__TypeReferenceAssignment_1();
 
             state._fsp--;
@@ -65203,21 +65203,21 @@ public final void rule__JvmLowerBoundAnded__Group__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group__0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22860:1: rule__QualifiedNameWithWildcard__Group__0 : rule__QualifiedNameWithWildcard__Group__0__Impl rule__QualifiedNameWithWildcard__Group__1 ;
+    // InternalCheck.g:22860:1: rule__QualifiedNameWithWildcard__Group__0 : rule__QualifiedNameWithWildcard__Group__0__Impl rule__QualifiedNameWithWildcard__Group__1 ;
     public final void rule__QualifiedNameWithWildcard__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22864:1: ( rule__QualifiedNameWithWildcard__Group__0__Impl rule__QualifiedNameWithWildcard__Group__1 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22865:2: rule__QualifiedNameWithWildcard__Group__0__Impl rule__QualifiedNameWithWildcard__Group__1
+            // InternalCheck.g:22864:1: ( rule__QualifiedNameWithWildcard__Group__0__Impl rule__QualifiedNameWithWildcard__Group__1 )
+            // InternalCheck.g:22865:2: rule__QualifiedNameWithWildcard__Group__0__Impl rule__QualifiedNameWithWildcard__Group__1
             {
-            pushFollow(FOLLOW_rule__QualifiedNameWithWildcard__Group__0__Impl_in_rule__QualifiedNameWithWildcard__Group__046010);
+            pushFollow(FOLLOW_118);
             rule__QualifiedNameWithWildcard__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__QualifiedNameWithWildcard__Group__1_in_rule__QualifiedNameWithWildcard__Group__046013);
+            pushFollow(FOLLOW_2);
             rule__QualifiedNameWithWildcard__Group__1();
 
             state._fsp--;
@@ -65241,22 +65241,22 @@ public final void rule__QualifiedNameWithWildcard__Group__0() throws Recognition
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22872:1: rule__QualifiedNameWithWildcard__Group__0__Impl : ( ruleQualifiedName ) ;
+    // InternalCheck.g:22872:1: rule__QualifiedNameWithWildcard__Group__0__Impl : ( ruleQualifiedName ) ;
     public final void rule__QualifiedNameWithWildcard__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22876:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22877:1: ( ruleQualifiedName )
+            // InternalCheck.g:22876:1: ( ( ruleQualifiedName ) )
+            // InternalCheck.g:22877:1: ( ruleQualifiedName )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22877:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22878:1: ruleQualifiedName
+            // InternalCheck.g:22877:1: ( ruleQualifiedName )
+            // InternalCheck.g:22878:1: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameWithWildcardAccess().getQualifiedNameParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_rule__QualifiedNameWithWildcard__Group__0__Impl46040);
+            pushFollow(FOLLOW_2);
             ruleQualifiedName();
 
             state._fsp--;
@@ -65286,21 +65286,21 @@ public final void rule__QualifiedNameWithWildcard__Group__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group__1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22889:1: rule__QualifiedNameWithWildcard__Group__1 : rule__QualifiedNameWithWildcard__Group__1__Impl rule__QualifiedNameWithWildcard__Group__2 ;
+    // InternalCheck.g:22889:1: rule__QualifiedNameWithWildcard__Group__1 : rule__QualifiedNameWithWildcard__Group__1__Impl rule__QualifiedNameWithWildcard__Group__2 ;
     public final void rule__QualifiedNameWithWildcard__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22893:1: ( rule__QualifiedNameWithWildcard__Group__1__Impl rule__QualifiedNameWithWildcard__Group__2 )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22894:2: rule__QualifiedNameWithWildcard__Group__1__Impl rule__QualifiedNameWithWildcard__Group__2
+            // InternalCheck.g:22893:1: ( rule__QualifiedNameWithWildcard__Group__1__Impl rule__QualifiedNameWithWildcard__Group__2 )
+            // InternalCheck.g:22894:2: rule__QualifiedNameWithWildcard__Group__1__Impl rule__QualifiedNameWithWildcard__Group__2
             {
-            pushFollow(FOLLOW_rule__QualifiedNameWithWildcard__Group__1__Impl_in_rule__QualifiedNameWithWildcard__Group__146069);
+            pushFollow(FOLLOW_125);
             rule__QualifiedNameWithWildcard__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__QualifiedNameWithWildcard__Group__2_in_rule__QualifiedNameWithWildcard__Group__146072);
+            pushFollow(FOLLOW_2);
             rule__QualifiedNameWithWildcard__Group__2();
 
             state._fsp--;
@@ -65324,22 +65324,22 @@ public final void rule__QualifiedNameWithWildcard__Group__1() throws Recognition
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22901:1: rule__QualifiedNameWithWildcard__Group__1__Impl : ( '.' ) ;
+    // InternalCheck.g:22901:1: rule__QualifiedNameWithWildcard__Group__1__Impl : ( '.' ) ;
     public final void rule__QualifiedNameWithWildcard__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22905:1: ( ( '.' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22906:1: ( '.' )
+            // InternalCheck.g:22905:1: ( ( '.' ) )
+            // InternalCheck.g:22906:1: ( '.' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22906:1: ( '.' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22907:1: '.'
+            // InternalCheck.g:22906:1: ( '.' )
+            // InternalCheck.g:22907:1: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameWithWildcardAccess().getFullStopKeyword_1()); 
             }
-            match(input,63,FOLLOW_63_in_rule__QualifiedNameWithWildcard__Group__1__Impl46100); if (state.failed) return ;
+            match(input,63,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getQualifiedNameWithWildcardAccess().getFullStopKeyword_1()); 
             }
@@ -65365,16 +65365,16 @@ public final void rule__QualifiedNameWithWildcard__Group__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group__2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22920:1: rule__QualifiedNameWithWildcard__Group__2 : rule__QualifiedNameWithWildcard__Group__2__Impl ;
+    // InternalCheck.g:22920:1: rule__QualifiedNameWithWildcard__Group__2 : rule__QualifiedNameWithWildcard__Group__2__Impl ;
     public final void rule__QualifiedNameWithWildcard__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22924:1: ( rule__QualifiedNameWithWildcard__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22925:2: rule__QualifiedNameWithWildcard__Group__2__Impl
+            // InternalCheck.g:22924:1: ( rule__QualifiedNameWithWildcard__Group__2__Impl )
+            // InternalCheck.g:22925:2: rule__QualifiedNameWithWildcard__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__QualifiedNameWithWildcard__Group__2__Impl_in_rule__QualifiedNameWithWildcard__Group__246131);
+            pushFollow(FOLLOW_2);
             rule__QualifiedNameWithWildcard__Group__2__Impl();
 
             state._fsp--;
@@ -65398,22 +65398,22 @@ public final void rule__QualifiedNameWithWildcard__Group__2() throws Recognition
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22931:1: rule__QualifiedNameWithWildcard__Group__2__Impl : ( '*' ) ;
+    // InternalCheck.g:22931:1: rule__QualifiedNameWithWildcard__Group__2__Impl : ( '*' ) ;
     public final void rule__QualifiedNameWithWildcard__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22935:1: ( ( '*' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22936:1: ( '*' )
+            // InternalCheck.g:22935:1: ( ( '*' ) )
+            // InternalCheck.g:22936:1: ( '*' )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22936:1: ( '*' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22937:1: '*'
+            // InternalCheck.g:22936:1: ( '*' )
+            // InternalCheck.g:22937:1: '*'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameWithWildcardAccess().getAsteriskKeyword_2()); 
             }
-            match(input,56,FOLLOW_56_in_rule__QualifiedNameWithWildcard__Group__2__Impl46159); if (state.failed) return ;
+            match(input,56,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getQualifiedNameWithWildcardAccess().getAsteriskKeyword_2()); 
             }
@@ -65439,22 +65439,22 @@ public final void rule__QualifiedNameWithWildcard__Group__2__Impl() throws Recog
 
 
     // $ANTLR start "rule__CheckCatalog__PackageNameAssignment_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22958:1: rule__CheckCatalog__PackageNameAssignment_2 : ( ruleQualifiedName ) ;
+    // InternalCheck.g:22958:1: rule__CheckCatalog__PackageNameAssignment_2 : ( ruleQualifiedName ) ;
     public final void rule__CheckCatalog__PackageNameAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22962:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22963:1: ( ruleQualifiedName )
+            // InternalCheck.g:22962:1: ( ( ruleQualifiedName ) )
+            // InternalCheck.g:22963:1: ( ruleQualifiedName )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22963:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22964:1: ruleQualifiedName
+            // InternalCheck.g:22963:1: ( ruleQualifiedName )
+            // InternalCheck.g:22964:1: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckCatalogAccess().getPackageNameQualifiedNameParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_rule__CheckCatalog__PackageNameAssignment_246202);
+            pushFollow(FOLLOW_2);
             ruleQualifiedName();
 
             state._fsp--;
@@ -65484,22 +65484,22 @@ public final void rule__CheckCatalog__PackageNameAssignment_2() throws Recogniti
 
 
     // $ANTLR start "rule__CheckCatalog__ImportsAssignment_3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22973:1: rule__CheckCatalog__ImportsAssignment_3 : ( ruleXImportSection ) ;
+    // InternalCheck.g:22973:1: rule__CheckCatalog__ImportsAssignment_3 : ( ruleXImportSection ) ;
     public final void rule__CheckCatalog__ImportsAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22977:1: ( ( ruleXImportSection ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22978:1: ( ruleXImportSection )
+            // InternalCheck.g:22977:1: ( ( ruleXImportSection ) )
+            // InternalCheck.g:22978:1: ( ruleXImportSection )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22978:1: ( ruleXImportSection )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22979:1: ruleXImportSection
+            // InternalCheck.g:22978:1: ( ruleXImportSection )
+            // InternalCheck.g:22979:1: ruleXImportSection
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckCatalogAccess().getImportsXImportSectionParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleXImportSection_in_rule__CheckCatalog__ImportsAssignment_346233);
+            pushFollow(FOLLOW_2);
             ruleXImportSection();
 
             state._fsp--;
@@ -65529,28 +65529,28 @@ public final void rule__CheckCatalog__ImportsAssignment_3() throws RecognitionEx
 
 
     // $ANTLR start "rule__CheckCatalog__FinalAssignment_4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22988:1: rule__CheckCatalog__FinalAssignment_4 : ( ( 'final' ) ) ;
+    // InternalCheck.g:22988:1: rule__CheckCatalog__FinalAssignment_4 : ( ( 'final' ) ) ;
     public final void rule__CheckCatalog__FinalAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22992:1: ( ( ( 'final' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22993:1: ( ( 'final' ) )
+            // InternalCheck.g:22992:1: ( ( ( 'final' ) ) )
+            // InternalCheck.g:22993:1: ( ( 'final' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22993:1: ( ( 'final' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22994:1: ( 'final' )
+            // InternalCheck.g:22993:1: ( ( 'final' ) )
+            // InternalCheck.g:22994:1: ( 'final' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckCatalogAccess().getFinalFinalKeyword_4_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22995:1: ( 'final' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22996:1: 'final'
+            // InternalCheck.g:22995:1: ( 'final' )
+            // InternalCheck.g:22996:1: 'final'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckCatalogAccess().getFinalFinalKeyword_4_0()); 
             }
-            match(input,103,FOLLOW_103_in_rule__CheckCatalog__FinalAssignment_446269); if (state.failed) return ;
+            match(input,103,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCheckCatalogAccess().getFinalFinalKeyword_4_0()); 
             }
@@ -65582,22 +65582,22 @@ public final void rule__CheckCatalog__FinalAssignment_4() throws RecognitionExce
 
 
     // $ANTLR start "rule__CheckCatalog__NameAssignment_6"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23011:1: rule__CheckCatalog__NameAssignment_6 : ( ruleValidID ) ;
+    // InternalCheck.g:23011:1: rule__CheckCatalog__NameAssignment_6 : ( ruleValidID ) ;
     public final void rule__CheckCatalog__NameAssignment_6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23015:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23016:1: ( ruleValidID )
+            // InternalCheck.g:23015:1: ( ( ruleValidID ) )
+            // InternalCheck.g:23016:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23016:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23017:1: ruleValidID
+            // InternalCheck.g:23016:1: ( ruleValidID )
+            // InternalCheck.g:23017:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckCatalogAccess().getNameValidIDParserRuleCall_6_0()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__CheckCatalog__NameAssignment_646308);
+            pushFollow(FOLLOW_2);
             ruleValidID();
 
             state._fsp--;
@@ -65627,28 +65627,28 @@ public final void rule__CheckCatalog__NameAssignment_6() throws RecognitionExcep
 
 
     // $ANTLR start "rule__CheckCatalog__GrammarAssignment_7_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23026:1: rule__CheckCatalog__GrammarAssignment_7_2 : ( ( ruleQualifiedName ) ) ;
+    // InternalCheck.g:23026:1: rule__CheckCatalog__GrammarAssignment_7_2 : ( ( ruleQualifiedName ) ) ;
     public final void rule__CheckCatalog__GrammarAssignment_7_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23030:1: ( ( ( ruleQualifiedName ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23031:1: ( ( ruleQualifiedName ) )
+            // InternalCheck.g:23030:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalCheck.g:23031:1: ( ( ruleQualifiedName ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23031:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23032:1: ( ruleQualifiedName )
+            // InternalCheck.g:23031:1: ( ( ruleQualifiedName ) )
+            // InternalCheck.g:23032:1: ( ruleQualifiedName )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckCatalogAccess().getGrammarGrammarCrossReference_7_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23033:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23034:1: ruleQualifiedName
+            // InternalCheck.g:23033:1: ( ruleQualifiedName )
+            // InternalCheck.g:23034:1: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckCatalogAccess().getGrammarGrammarQualifiedNameParserRuleCall_7_2_0_1()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_rule__CheckCatalog__GrammarAssignment_7_246343);
+            pushFollow(FOLLOW_2);
             ruleQualifiedName();
 
             state._fsp--;
@@ -65684,22 +65684,22 @@ public final void rule__CheckCatalog__GrammarAssignment_7_2() throws Recognition
 
 
     // $ANTLR start "rule__CheckCatalog__CategoriesAssignment_9_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23045:1: rule__CheckCatalog__CategoriesAssignment_9_0 : ( ruleCategory ) ;
+    // InternalCheck.g:23045:1: rule__CheckCatalog__CategoriesAssignment_9_0 : ( ruleCategory ) ;
     public final void rule__CheckCatalog__CategoriesAssignment_9_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23049:1: ( ( ruleCategory ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23050:1: ( ruleCategory )
+            // InternalCheck.g:23049:1: ( ( ruleCategory ) )
+            // InternalCheck.g:23050:1: ( ruleCategory )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23050:1: ( ruleCategory )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23051:1: ruleCategory
+            // InternalCheck.g:23050:1: ( ruleCategory )
+            // InternalCheck.g:23051:1: ruleCategory
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckCatalogAccess().getCategoriesCategoryParserRuleCall_9_0_0()); 
             }
-            pushFollow(FOLLOW_ruleCategory_in_rule__CheckCatalog__CategoriesAssignment_9_046378);
+            pushFollow(FOLLOW_2);
             ruleCategory();
 
             state._fsp--;
@@ -65729,22 +65729,22 @@ public final void rule__CheckCatalog__CategoriesAssignment_9_0() throws Recognit
 
 
     // $ANTLR start "rule__CheckCatalog__ImplementationsAssignment_9_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23060:1: rule__CheckCatalog__ImplementationsAssignment_9_1 : ( ruleImplementation ) ;
+    // InternalCheck.g:23060:1: rule__CheckCatalog__ImplementationsAssignment_9_1 : ( ruleImplementation ) ;
     public final void rule__CheckCatalog__ImplementationsAssignment_9_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23064:1: ( ( ruleImplementation ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23065:1: ( ruleImplementation )
+            // InternalCheck.g:23064:1: ( ( ruleImplementation ) )
+            // InternalCheck.g:23065:1: ( ruleImplementation )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23065:1: ( ruleImplementation )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23066:1: ruleImplementation
+            // InternalCheck.g:23065:1: ( ruleImplementation )
+            // InternalCheck.g:23066:1: ruleImplementation
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckCatalogAccess().getImplementationsImplementationParserRuleCall_9_1_0()); 
             }
-            pushFollow(FOLLOW_ruleImplementation_in_rule__CheckCatalog__ImplementationsAssignment_9_146409);
+            pushFollow(FOLLOW_2);
             ruleImplementation();
 
             state._fsp--;
@@ -65774,22 +65774,22 @@ public final void rule__CheckCatalog__ImplementationsAssignment_9_1() throws Rec
 
 
     // $ANTLR start "rule__CheckCatalog__ChecksAssignment_9_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23075:1: rule__CheckCatalog__ChecksAssignment_9_2 : ( ruleCheck ) ;
+    // InternalCheck.g:23075:1: rule__CheckCatalog__ChecksAssignment_9_2 : ( ruleCheck ) ;
     public final void rule__CheckCatalog__ChecksAssignment_9_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23079:1: ( ( ruleCheck ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23080:1: ( ruleCheck )
+            // InternalCheck.g:23079:1: ( ( ruleCheck ) )
+            // InternalCheck.g:23080:1: ( ruleCheck )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23080:1: ( ruleCheck )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23081:1: ruleCheck
+            // InternalCheck.g:23080:1: ( ruleCheck )
+            // InternalCheck.g:23081:1: ruleCheck
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckCatalogAccess().getChecksCheckParserRuleCall_9_2_0()); 
             }
-            pushFollow(FOLLOW_ruleCheck_in_rule__CheckCatalog__ChecksAssignment_9_246440);
+            pushFollow(FOLLOW_2);
             ruleCheck();
 
             state._fsp--;
@@ -65819,22 +65819,22 @@ public final void rule__CheckCatalog__ChecksAssignment_9_2() throws RecognitionE
 
 
     // $ANTLR start "rule__CheckCatalog__MembersAssignment_9_3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23090:1: rule__CheckCatalog__MembersAssignment_9_3 : ( ruleMember ) ;
+    // InternalCheck.g:23090:1: rule__CheckCatalog__MembersAssignment_9_3 : ( ruleMember ) ;
     public final void rule__CheckCatalog__MembersAssignment_9_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23094:1: ( ( ruleMember ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23095:1: ( ruleMember )
+            // InternalCheck.g:23094:1: ( ( ruleMember ) )
+            // InternalCheck.g:23095:1: ( ruleMember )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23095:1: ( ruleMember )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23096:1: ruleMember
+            // InternalCheck.g:23095:1: ( ruleMember )
+            // InternalCheck.g:23096:1: ruleMember
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckCatalogAccess().getMembersMemberParserRuleCall_9_3_0()); 
             }
-            pushFollow(FOLLOW_ruleMember_in_rule__CheckCatalog__MembersAssignment_9_346471);
+            pushFollow(FOLLOW_2);
             ruleMember();
 
             state._fsp--;
@@ -65864,22 +65864,22 @@ public final void rule__CheckCatalog__MembersAssignment_9_3() throws Recognition
 
 
     // $ANTLR start "rule__XImportSection__ImportDeclarationsAssignment_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23105:1: rule__XImportSection__ImportDeclarationsAssignment_1 : ( ruleXImportDeclaration ) ;
+    // InternalCheck.g:23105:1: rule__XImportSection__ImportDeclarationsAssignment_1 : ( ruleXImportDeclaration ) ;
     public final void rule__XImportSection__ImportDeclarationsAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23109:1: ( ( ruleXImportDeclaration ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23110:1: ( ruleXImportDeclaration )
+            // InternalCheck.g:23109:1: ( ( ruleXImportDeclaration ) )
+            // InternalCheck.g:23110:1: ( ruleXImportDeclaration )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23110:1: ( ruleXImportDeclaration )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23111:1: ruleXImportDeclaration
+            // InternalCheck.g:23110:1: ( ruleXImportDeclaration )
+            // InternalCheck.g:23111:1: ruleXImportDeclaration
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportSectionAccess().getImportDeclarationsXImportDeclarationParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXImportDeclaration_in_rule__XImportSection__ImportDeclarationsAssignment_146502);
+            pushFollow(FOLLOW_2);
             ruleXImportDeclaration();
 
             state._fsp--;
@@ -65909,28 +65909,28 @@ public final void rule__XImportSection__ImportDeclarationsAssignment_1() throws
 
 
     // $ANTLR start "rule__XImportDeclaration__ImportedTypeAssignment_1_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23120:1: rule__XImportDeclaration__ImportedTypeAssignment_1_0 : ( ( ruleQualifiedName ) ) ;
+    // InternalCheck.g:23120:1: rule__XImportDeclaration__ImportedTypeAssignment_1_0 : ( ( ruleQualifiedName ) ) ;
     public final void rule__XImportDeclaration__ImportedTypeAssignment_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23124:1: ( ( ( ruleQualifiedName ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23125:1: ( ( ruleQualifiedName ) )
+            // InternalCheck.g:23124:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalCheck.g:23125:1: ( ( ruleQualifiedName ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23125:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23126:1: ( ruleQualifiedName )
+            // InternalCheck.g:23125:1: ( ( ruleQualifiedName ) )
+            // InternalCheck.g:23126:1: ( ruleQualifiedName )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getImportedTypeJvmDeclaredTypeCrossReference_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23127:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23128:1: ruleQualifiedName
+            // InternalCheck.g:23127:1: ( ruleQualifiedName )
+            // InternalCheck.g:23128:1: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getImportedTypeJvmDeclaredTypeQualifiedNameParserRuleCall_1_0_0_1()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_rule__XImportDeclaration__ImportedTypeAssignment_1_046537);
+            pushFollow(FOLLOW_2);
             ruleQualifiedName();
 
             state._fsp--;
@@ -65966,22 +65966,22 @@ public final void rule__XImportDeclaration__ImportedTypeAssignment_1_0() throws
 
 
     // $ANTLR start "rule__XImportDeclaration__ImportedNamespaceAssignment_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23139:1: rule__XImportDeclaration__ImportedNamespaceAssignment_1_1 : ( ruleQualifiedNameWithWildcard ) ;
+    // InternalCheck.g:23139:1: rule__XImportDeclaration__ImportedNamespaceAssignment_1_1 : ( ruleQualifiedNameWithWildcard ) ;
     public final void rule__XImportDeclaration__ImportedNamespaceAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23143:1: ( ( ruleQualifiedNameWithWildcard ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23144:1: ( ruleQualifiedNameWithWildcard )
+            // InternalCheck.g:23143:1: ( ( ruleQualifiedNameWithWildcard ) )
+            // InternalCheck.g:23144:1: ( ruleQualifiedNameWithWildcard )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23144:1: ( ruleQualifiedNameWithWildcard )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23145:1: ruleQualifiedNameWithWildcard
+            // InternalCheck.g:23144:1: ( ruleQualifiedNameWithWildcard )
+            // InternalCheck.g:23145:1: ruleQualifiedNameWithWildcard
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getImportedNamespaceQualifiedNameWithWildcardParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedNameWithWildcard_in_rule__XImportDeclaration__ImportedNamespaceAssignment_1_146572);
+            pushFollow(FOLLOW_2);
             ruleQualifiedNameWithWildcard();
 
             state._fsp--;
@@ -66011,22 +66011,22 @@ public final void rule__XImportDeclaration__ImportedNamespaceAssignment_1_1() th
 
 
     // $ANTLR start "rule__Category__IdAssignment_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23154:1: rule__Category__IdAssignment_1 : ( ruleValidID ) ;
+    // InternalCheck.g:23154:1: rule__Category__IdAssignment_1 : ( ruleValidID ) ;
     public final void rule__Category__IdAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23158:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23159:1: ( ruleValidID )
+            // InternalCheck.g:23158:1: ( ( ruleValidID ) )
+            // InternalCheck.g:23159:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23159:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23160:1: ruleValidID
+            // InternalCheck.g:23159:1: ( ruleValidID )
+            // InternalCheck.g:23160:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCategoryAccess().getIdValidIDParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__Category__IdAssignment_146603);
+            pushFollow(FOLLOW_2);
             ruleValidID();
 
             state._fsp--;
@@ -66056,22 +66056,22 @@ public final void rule__Category__IdAssignment_1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__LabelAssignment_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23169:1: rule__Category__LabelAssignment_2 : ( RULE_STRING ) ;
+    // InternalCheck.g:23169:1: rule__Category__LabelAssignment_2 : ( RULE_STRING ) ;
     public final void rule__Category__LabelAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23173:1: ( ( RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23174:1: ( RULE_STRING )
+            // InternalCheck.g:23173:1: ( ( RULE_STRING ) )
+            // InternalCheck.g:23174:1: ( RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23174:1: ( RULE_STRING )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23175:1: RULE_STRING
+            // InternalCheck.g:23174:1: ( RULE_STRING )
+            // InternalCheck.g:23175:1: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCategoryAccess().getLabelSTRINGTerminalRuleCall_2_0()); 
             }
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__Category__LabelAssignment_246634); if (state.failed) return ;
+            match(input,RULE_STRING,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCategoryAccess().getLabelSTRINGTerminalRuleCall_2_0()); 
             }
@@ -66097,22 +66097,22 @@ public final void rule__Category__LabelAssignment_2() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__Category__ChecksAssignment_4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23184:1: rule__Category__ChecksAssignment_4 : ( ruleCheck ) ;
+    // InternalCheck.g:23184:1: rule__Category__ChecksAssignment_4 : ( ruleCheck ) ;
     public final void rule__Category__ChecksAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23188:1: ( ( ruleCheck ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23189:1: ( ruleCheck )
+            // InternalCheck.g:23188:1: ( ( ruleCheck ) )
+            // InternalCheck.g:23189:1: ( ruleCheck )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23189:1: ( ruleCheck )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23190:1: ruleCheck
+            // InternalCheck.g:23189:1: ( ruleCheck )
+            // InternalCheck.g:23190:1: ruleCheck
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCategoryAccess().getChecksCheckParserRuleCall_4_0()); 
             }
-            pushFollow(FOLLOW_ruleCheck_in_rule__Category__ChecksAssignment_446665);
+            pushFollow(FOLLOW_2);
             ruleCheck();
 
             state._fsp--;
@@ -66142,22 +66142,22 @@ public final void rule__Category__ChecksAssignment_4() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__Check__SeverityRangeAssignment_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23199:1: rule__Check__SeverityRangeAssignment_0 : ( ruleSeverityRange ) ;
+    // InternalCheck.g:23199:1: rule__Check__SeverityRangeAssignment_0 : ( ruleSeverityRange ) ;
     public final void rule__Check__SeverityRangeAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23203:1: ( ( ruleSeverityRange ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23204:1: ( ruleSeverityRange )
+            // InternalCheck.g:23203:1: ( ( ruleSeverityRange ) )
+            // InternalCheck.g:23204:1: ( ruleSeverityRange )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23204:1: ( ruleSeverityRange )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23205:1: ruleSeverityRange
+            // InternalCheck.g:23204:1: ( ruleSeverityRange )
+            // InternalCheck.g:23205:1: ruleSeverityRange
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getSeverityRangeSeverityRangeParserRuleCall_0_0()); 
             }
-            pushFollow(FOLLOW_ruleSeverityRange_in_rule__Check__SeverityRangeAssignment_046696);
+            pushFollow(FOLLOW_2);
             ruleSeverityRange();
 
             state._fsp--;
@@ -66187,28 +66187,28 @@ public final void rule__Check__SeverityRangeAssignment_0() throws RecognitionExc
 
 
     // $ANTLR start "rule__Check__FinalAssignment_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23214:1: rule__Check__FinalAssignment_1 : ( ( 'final' ) ) ;
+    // InternalCheck.g:23214:1: rule__Check__FinalAssignment_1 : ( ( 'final' ) ) ;
     public final void rule__Check__FinalAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23218:1: ( ( ( 'final' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23219:1: ( ( 'final' ) )
+            // InternalCheck.g:23218:1: ( ( ( 'final' ) ) )
+            // InternalCheck.g:23219:1: ( ( 'final' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23219:1: ( ( 'final' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23220:1: ( 'final' )
+            // InternalCheck.g:23219:1: ( ( 'final' ) )
+            // InternalCheck.g:23220:1: ( 'final' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getFinalFinalKeyword_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23221:1: ( 'final' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23222:1: 'final'
+            // InternalCheck.g:23221:1: ( 'final' )
+            // InternalCheck.g:23222:1: 'final'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getFinalFinalKeyword_1_0()); 
             }
-            match(input,103,FOLLOW_103_in_rule__Check__FinalAssignment_146732); if (state.failed) return ;
+            match(input,103,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCheckAccess().getFinalFinalKeyword_1_0()); 
             }
@@ -66240,22 +66240,22 @@ public final void rule__Check__FinalAssignment_1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__KindAssignment_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23237:1: rule__Check__KindAssignment_2 : ( ruleTriggerKind ) ;
+    // InternalCheck.g:23237:1: rule__Check__KindAssignment_2 : ( ruleTriggerKind ) ;
     public final void rule__Check__KindAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23241:1: ( ( ruleTriggerKind ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23242:1: ( ruleTriggerKind )
+            // InternalCheck.g:23241:1: ( ( ruleTriggerKind ) )
+            // InternalCheck.g:23242:1: ( ruleTriggerKind )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23242:1: ( ruleTriggerKind )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23243:1: ruleTriggerKind
+            // InternalCheck.g:23242:1: ( ruleTriggerKind )
+            // InternalCheck.g:23243:1: ruleTriggerKind
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getKindTriggerKindEnumRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleTriggerKind_in_rule__Check__KindAssignment_246771);
+            pushFollow(FOLLOW_2);
             ruleTriggerKind();
 
             state._fsp--;
@@ -66285,22 +66285,22 @@ public final void rule__Check__KindAssignment_2() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__DefaultSeverityAssignment_3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23252:1: rule__Check__DefaultSeverityAssignment_3 : ( ruleSeverityKind ) ;
+    // InternalCheck.g:23252:1: rule__Check__DefaultSeverityAssignment_3 : ( ruleSeverityKind ) ;
     public final void rule__Check__DefaultSeverityAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23256:1: ( ( ruleSeverityKind ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23257:1: ( ruleSeverityKind )
+            // InternalCheck.g:23256:1: ( ( ruleSeverityKind ) )
+            // InternalCheck.g:23257:1: ( ruleSeverityKind )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23257:1: ( ruleSeverityKind )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23258:1: ruleSeverityKind
+            // InternalCheck.g:23257:1: ( ruleSeverityKind )
+            // InternalCheck.g:23258:1: ruleSeverityKind
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getDefaultSeveritySeverityKindEnumRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleSeverityKind_in_rule__Check__DefaultSeverityAssignment_346802);
+            pushFollow(FOLLOW_2);
             ruleSeverityKind();
 
             state._fsp--;
@@ -66330,22 +66330,22 @@ public final void rule__Check__DefaultSeverityAssignment_3() throws RecognitionE
 
 
     // $ANTLR start "rule__Check__IdAssignment_4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23267:1: rule__Check__IdAssignment_4 : ( ruleValidID ) ;
+    // InternalCheck.g:23267:1: rule__Check__IdAssignment_4 : ( ruleValidID ) ;
     public final void rule__Check__IdAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23271:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23272:1: ( ruleValidID )
+            // InternalCheck.g:23271:1: ( ( ruleValidID ) )
+            // InternalCheck.g:23272:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23272:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23273:1: ruleValidID
+            // InternalCheck.g:23272:1: ( ruleValidID )
+            // InternalCheck.g:23273:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getIdValidIDParserRuleCall_4_0()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__Check__IdAssignment_446833);
+            pushFollow(FOLLOW_2);
             ruleValidID();
 
             state._fsp--;
@@ -66375,22 +66375,22 @@ public final void rule__Check__IdAssignment_4() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__LabelAssignment_5"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23282:1: rule__Check__LabelAssignment_5 : ( RULE_STRING ) ;
+    // InternalCheck.g:23282:1: rule__Check__LabelAssignment_5 : ( RULE_STRING ) ;
     public final void rule__Check__LabelAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23286:1: ( ( RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23287:1: ( RULE_STRING )
+            // InternalCheck.g:23286:1: ( ( RULE_STRING ) )
+            // InternalCheck.g:23287:1: ( RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23287:1: ( RULE_STRING )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23288:1: RULE_STRING
+            // InternalCheck.g:23287:1: ( RULE_STRING )
+            // InternalCheck.g:23288:1: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getLabelSTRINGTerminalRuleCall_5_0()); 
             }
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__Check__LabelAssignment_546864); if (state.failed) return ;
+            match(input,RULE_STRING,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCheckAccess().getLabelSTRINGTerminalRuleCall_5_0()); 
             }
@@ -66416,22 +66416,22 @@ public final void rule__Check__LabelAssignment_5() throws RecognitionException {
 
 
     // $ANTLR start "rule__Check__FormalParametersAssignment_6_1_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23297:1: rule__Check__FormalParametersAssignment_6_1_0 : ( ruleFormalParameter ) ;
+    // InternalCheck.g:23297:1: rule__Check__FormalParametersAssignment_6_1_0 : ( ruleFormalParameter ) ;
     public final void rule__Check__FormalParametersAssignment_6_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23301:1: ( ( ruleFormalParameter ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23302:1: ( ruleFormalParameter )
+            // InternalCheck.g:23301:1: ( ( ruleFormalParameter ) )
+            // InternalCheck.g:23302:1: ( ruleFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23302:1: ( ruleFormalParameter )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23303:1: ruleFormalParameter
+            // InternalCheck.g:23302:1: ( ruleFormalParameter )
+            // InternalCheck.g:23303:1: ruleFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getFormalParametersFormalParameterParserRuleCall_6_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleFormalParameter_in_rule__Check__FormalParametersAssignment_6_1_046895);
+            pushFollow(FOLLOW_2);
             ruleFormalParameter();
 
             state._fsp--;
@@ -66461,22 +66461,22 @@ public final void rule__Check__FormalParametersAssignment_6_1_0() throws Recogni
 
 
     // $ANTLR start "rule__Check__FormalParametersAssignment_6_1_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23312:1: rule__Check__FormalParametersAssignment_6_1_1_1 : ( ruleFormalParameter ) ;
+    // InternalCheck.g:23312:1: rule__Check__FormalParametersAssignment_6_1_1_1 : ( ruleFormalParameter ) ;
     public final void rule__Check__FormalParametersAssignment_6_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23316:1: ( ( ruleFormalParameter ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23317:1: ( ruleFormalParameter )
+            // InternalCheck.g:23316:1: ( ( ruleFormalParameter ) )
+            // InternalCheck.g:23317:1: ( ruleFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23317:1: ( ruleFormalParameter )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23318:1: ruleFormalParameter
+            // InternalCheck.g:23317:1: ( ruleFormalParameter )
+            // InternalCheck.g:23318:1: ruleFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getFormalParametersFormalParameterParserRuleCall_6_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleFormalParameter_in_rule__Check__FormalParametersAssignment_6_1_1_146926);
+            pushFollow(FOLLOW_2);
             ruleFormalParameter();
 
             state._fsp--;
@@ -66506,22 +66506,22 @@ public final void rule__Check__FormalParametersAssignment_6_1_1_1() throws Recog
 
 
     // $ANTLR start "rule__Check__GivenMessageAssignment_7_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23327:1: rule__Check__GivenMessageAssignment_7_1 : ( RULE_STRING ) ;
+    // InternalCheck.g:23327:1: rule__Check__GivenMessageAssignment_7_1 : ( RULE_STRING ) ;
     public final void rule__Check__GivenMessageAssignment_7_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23331:1: ( ( RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23332:1: ( RULE_STRING )
+            // InternalCheck.g:23331:1: ( ( RULE_STRING ) )
+            // InternalCheck.g:23332:1: ( RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23332:1: ( RULE_STRING )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23333:1: RULE_STRING
+            // InternalCheck.g:23332:1: ( RULE_STRING )
+            // InternalCheck.g:23333:1: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getGivenMessageSTRINGTerminalRuleCall_7_1_0()); 
             }
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__Check__GivenMessageAssignment_7_146957); if (state.failed) return ;
+            match(input,RULE_STRING,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCheckAccess().getGivenMessageSTRINGTerminalRuleCall_7_1_0()); 
             }
@@ -66547,22 +66547,22 @@ public final void rule__Check__GivenMessageAssignment_7_1() throws RecognitionEx
 
 
     // $ANTLR start "rule__Check__ContextsAssignment_8_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23342:1: rule__Check__ContextsAssignment_8_0_1 : ( ruleContext ) ;
+    // InternalCheck.g:23342:1: rule__Check__ContextsAssignment_8_0_1 : ( ruleContext ) ;
     public final void rule__Check__ContextsAssignment_8_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23346:1: ( ( ruleContext ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23347:1: ( ruleContext )
+            // InternalCheck.g:23346:1: ( ( ruleContext ) )
+            // InternalCheck.g:23347:1: ( ruleContext )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23347:1: ( ruleContext )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23348:1: ruleContext
+            // InternalCheck.g:23347:1: ( ruleContext )
+            // InternalCheck.g:23348:1: ruleContext
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getContextsContextParserRuleCall_8_0_1_0()); 
             }
-            pushFollow(FOLLOW_ruleContext_in_rule__Check__ContextsAssignment_8_0_146988);
+            pushFollow(FOLLOW_2);
             ruleContext();
 
             state._fsp--;
@@ -66592,22 +66592,22 @@ public final void rule__Check__ContextsAssignment_8_0_1() throws RecognitionExce
 
 
     // $ANTLR start "rule__Check__ContextsAssignment_8_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23357:1: rule__Check__ContextsAssignment_8_1 : ( ruleContext ) ;
+    // InternalCheck.g:23357:1: rule__Check__ContextsAssignment_8_1 : ( ruleContext ) ;
     public final void rule__Check__ContextsAssignment_8_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23361:1: ( ( ruleContext ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23362:1: ( ruleContext )
+            // InternalCheck.g:23361:1: ( ( ruleContext ) )
+            // InternalCheck.g:23362:1: ( ruleContext )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23362:1: ( ruleContext )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23363:1: ruleContext
+            // InternalCheck.g:23362:1: ( ruleContext )
+            // InternalCheck.g:23363:1: ruleContext
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckAccess().getContextsContextParserRuleCall_8_1_0()); 
             }
-            pushFollow(FOLLOW_ruleContext_in_rule__Check__ContextsAssignment_8_147019);
+            pushFollow(FOLLOW_2);
             ruleContext();
 
             state._fsp--;
@@ -66637,22 +66637,22 @@ public final void rule__Check__ContextsAssignment_8_1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__SeverityRange__MinSeverityAssignment_3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23372:1: rule__SeverityRange__MinSeverityAssignment_3 : ( ruleSeverityKind ) ;
+    // InternalCheck.g:23372:1: rule__SeverityRange__MinSeverityAssignment_3 : ( ruleSeverityKind ) ;
     public final void rule__SeverityRange__MinSeverityAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23376:1: ( ( ruleSeverityKind ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23377:1: ( ruleSeverityKind )
+            // InternalCheck.g:23376:1: ( ( ruleSeverityKind ) )
+            // InternalCheck.g:23377:1: ( ruleSeverityKind )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23377:1: ( ruleSeverityKind )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23378:1: ruleSeverityKind
+            // InternalCheck.g:23377:1: ( ruleSeverityKind )
+            // InternalCheck.g:23378:1: ruleSeverityKind
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSeverityRangeAccess().getMinSeveritySeverityKindEnumRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleSeverityKind_in_rule__SeverityRange__MinSeverityAssignment_347050);
+            pushFollow(FOLLOW_2);
             ruleSeverityKind();
 
             state._fsp--;
@@ -66682,22 +66682,22 @@ public final void rule__SeverityRange__MinSeverityAssignment_3() throws Recognit
 
 
     // $ANTLR start "rule__SeverityRange__MaxSeverityAssignment_5"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23387:1: rule__SeverityRange__MaxSeverityAssignment_5 : ( ruleSeverityKind ) ;
+    // InternalCheck.g:23387:1: rule__SeverityRange__MaxSeverityAssignment_5 : ( ruleSeverityKind ) ;
     public final void rule__SeverityRange__MaxSeverityAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23391:1: ( ( ruleSeverityKind ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23392:1: ( ruleSeverityKind )
+            // InternalCheck.g:23391:1: ( ( ruleSeverityKind ) )
+            // InternalCheck.g:23392:1: ( ruleSeverityKind )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23392:1: ( ruleSeverityKind )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23393:1: ruleSeverityKind
+            // InternalCheck.g:23392:1: ( ruleSeverityKind )
+            // InternalCheck.g:23393:1: ruleSeverityKind
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSeverityRangeAccess().getMaxSeveritySeverityKindEnumRuleCall_5_0()); 
             }
-            pushFollow(FOLLOW_ruleSeverityKind_in_rule__SeverityRange__MaxSeverityAssignment_547081);
+            pushFollow(FOLLOW_2);
             ruleSeverityKind();
 
             state._fsp--;
@@ -66727,22 +66727,22 @@ public final void rule__SeverityRange__MaxSeverityAssignment_5() throws Recognit
 
 
     // $ANTLR start "rule__Member__AnnotationsAssignment_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23402:1: rule__Member__AnnotationsAssignment_0 : ( ruleXAnnotation ) ;
+    // InternalCheck.g:23402:1: rule__Member__AnnotationsAssignment_0 : ( ruleXAnnotation ) ;
     public final void rule__Member__AnnotationsAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23406:1: ( ( ruleXAnnotation ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23407:1: ( ruleXAnnotation )
+            // InternalCheck.g:23406:1: ( ( ruleXAnnotation ) )
+            // InternalCheck.g:23407:1: ( ruleXAnnotation )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23407:1: ( ruleXAnnotation )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23408:1: ruleXAnnotation
+            // InternalCheck.g:23407:1: ( ruleXAnnotation )
+            // InternalCheck.g:23408:1: ruleXAnnotation
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMemberAccess().getAnnotationsXAnnotationParserRuleCall_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotation_in_rule__Member__AnnotationsAssignment_047112);
+            pushFollow(FOLLOW_2);
             ruleXAnnotation();
 
             state._fsp--;
@@ -66772,22 +66772,22 @@ public final void rule__Member__AnnotationsAssignment_0() throws RecognitionExce
 
 
     // $ANTLR start "rule__Member__TypeAssignment_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23417:1: rule__Member__TypeAssignment_1 : ( ruleJvmTypeReference ) ;
+    // InternalCheck.g:23417:1: rule__Member__TypeAssignment_1 : ( ruleJvmTypeReference ) ;
     public final void rule__Member__TypeAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23421:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23422:1: ( ruleJvmTypeReference )
+            // InternalCheck.g:23421:1: ( ( ruleJvmTypeReference ) )
+            // InternalCheck.g:23422:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23422:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23423:1: ruleJvmTypeReference
+            // InternalCheck.g:23422:1: ( ruleJvmTypeReference )
+            // InternalCheck.g:23423:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMemberAccess().getTypeJvmTypeReferenceParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__Member__TypeAssignment_147143);
+            pushFollow(FOLLOW_2);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -66817,22 +66817,22 @@ public final void rule__Member__TypeAssignment_1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Member__NameAssignment_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23432:1: rule__Member__NameAssignment_2 : ( ruleValidID ) ;
+    // InternalCheck.g:23432:1: rule__Member__NameAssignment_2 : ( ruleValidID ) ;
     public final void rule__Member__NameAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23436:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23437:1: ( ruleValidID )
+            // InternalCheck.g:23436:1: ( ( ruleValidID ) )
+            // InternalCheck.g:23437:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23437:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23438:1: ruleValidID
+            // InternalCheck.g:23437:1: ( ruleValidID )
+            // InternalCheck.g:23438:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMemberAccess().getNameValidIDParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__Member__NameAssignment_247174);
+            pushFollow(FOLLOW_2);
             ruleValidID();
 
             state._fsp--;
@@ -66862,22 +66862,22 @@ public final void rule__Member__NameAssignment_2() throws RecognitionException {
 
 
     // $ANTLR start "rule__Member__ValueAssignment_3_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23447:1: rule__Member__ValueAssignment_3_1 : ( ruleXOrExpression ) ;
+    // InternalCheck.g:23447:1: rule__Member__ValueAssignment_3_1 : ( ruleXOrExpression ) ;
     public final void rule__Member__ValueAssignment_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23451:1: ( ( ruleXOrExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23452:1: ( ruleXOrExpression )
+            // InternalCheck.g:23451:1: ( ( ruleXOrExpression ) )
+            // InternalCheck.g:23452:1: ( ruleXOrExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23452:1: ( ruleXOrExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23453:1: ruleXOrExpression
+            // InternalCheck.g:23452:1: ( ruleXOrExpression )
+            // InternalCheck.g:23453:1: ruleXOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMemberAccess().getValueXOrExpressionParserRuleCall_3_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXOrExpression_in_rule__Member__ValueAssignment_3_147205);
+            pushFollow(FOLLOW_2);
             ruleXOrExpression();
 
             state._fsp--;
@@ -66907,22 +66907,22 @@ public final void rule__Member__ValueAssignment_3_1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__Implementation__NameAssignment_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23462:1: rule__Implementation__NameAssignment_1 : ( ruleValidID ) ;
+    // InternalCheck.g:23462:1: rule__Implementation__NameAssignment_1 : ( ruleValidID ) ;
     public final void rule__Implementation__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23466:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23467:1: ( ruleValidID )
+            // InternalCheck.g:23466:1: ( ( ruleValidID ) )
+            // InternalCheck.g:23467:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23467:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23468:1: ruleValidID
+            // InternalCheck.g:23467:1: ( ruleValidID )
+            // InternalCheck.g:23468:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImplementationAccess().getNameValidIDParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__Implementation__NameAssignment_147236);
+            pushFollow(FOLLOW_2);
             ruleValidID();
 
             state._fsp--;
@@ -66952,22 +66952,22 @@ public final void rule__Implementation__NameAssignment_1() throws RecognitionExc
 
 
     // $ANTLR start "rule__Implementation__ContextAssignment_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23477:1: rule__Implementation__ContextAssignment_2 : ( ruleContext ) ;
+    // InternalCheck.g:23477:1: rule__Implementation__ContextAssignment_2 : ( ruleContext ) ;
     public final void rule__Implementation__ContextAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23481:1: ( ( ruleContext ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23482:1: ( ruleContext )
+            // InternalCheck.g:23481:1: ( ( ruleContext ) )
+            // InternalCheck.g:23482:1: ( ruleContext )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23482:1: ( ruleContext )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23483:1: ruleContext
+            // InternalCheck.g:23482:1: ( ruleContext )
+            // InternalCheck.g:23483:1: ruleContext
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImplementationAccess().getContextContextParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleContext_in_rule__Implementation__ContextAssignment_247267);
+            pushFollow(FOLLOW_2);
             ruleContext();
 
             state._fsp--;
@@ -66997,22 +66997,22 @@ public final void rule__Implementation__ContextAssignment_2() throws Recognition
 
 
     // $ANTLR start "rule__FormalParameter__TypeAssignment_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23492:1: rule__FormalParameter__TypeAssignment_0 : ( ruleJvmParameterizedTypeReference ) ;
+    // InternalCheck.g:23492:1: rule__FormalParameter__TypeAssignment_0 : ( ruleJvmParameterizedTypeReference ) ;
     public final void rule__FormalParameter__TypeAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23496:1: ( ( ruleJvmParameterizedTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23497:1: ( ruleJvmParameterizedTypeReference )
+            // InternalCheck.g:23496:1: ( ( ruleJvmParameterizedTypeReference ) )
+            // InternalCheck.g:23497:1: ( ruleJvmParameterizedTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23497:1: ( ruleJvmParameterizedTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23498:1: ruleJvmParameterizedTypeReference
+            // InternalCheck.g:23497:1: ( ruleJvmParameterizedTypeReference )
+            // InternalCheck.g:23498:1: ruleJvmParameterizedTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormalParameterAccess().getTypeJvmParameterizedTypeReferenceParserRuleCall_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmParameterizedTypeReference_in_rule__FormalParameter__TypeAssignment_047298);
+            pushFollow(FOLLOW_2);
             ruleJvmParameterizedTypeReference();
 
             state._fsp--;
@@ -67042,22 +67042,22 @@ public final void rule__FormalParameter__TypeAssignment_0() throws RecognitionEx
 
 
     // $ANTLR start "rule__FormalParameter__NameAssignment_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23507:1: rule__FormalParameter__NameAssignment_1 : ( ruleValidID ) ;
+    // InternalCheck.g:23507:1: rule__FormalParameter__NameAssignment_1 : ( ruleValidID ) ;
     public final void rule__FormalParameter__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23511:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23512:1: ( ruleValidID )
+            // InternalCheck.g:23511:1: ( ( ruleValidID ) )
+            // InternalCheck.g:23512:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23512:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23513:1: ruleValidID
+            // InternalCheck.g:23512:1: ( ruleValidID )
+            // InternalCheck.g:23513:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormalParameterAccess().getNameValidIDParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__FormalParameter__NameAssignment_147329);
+            pushFollow(FOLLOW_2);
             ruleValidID();
 
             state._fsp--;
@@ -67087,22 +67087,22 @@ public final void rule__FormalParameter__NameAssignment_1() throws RecognitionEx
 
 
     // $ANTLR start "rule__FormalParameter__RightAssignment_3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23522:1: rule__FormalParameter__RightAssignment_3 : ( ruleXFormalParameterDefaultValueLiteral ) ;
+    // InternalCheck.g:23522:1: rule__FormalParameter__RightAssignment_3 : ( ruleXFormalParameterDefaultValueLiteral ) ;
     public final void rule__FormalParameter__RightAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23526:1: ( ( ruleXFormalParameterDefaultValueLiteral ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23527:1: ( ruleXFormalParameterDefaultValueLiteral )
+            // InternalCheck.g:23526:1: ( ( ruleXFormalParameterDefaultValueLiteral ) )
+            // InternalCheck.g:23527:1: ( ruleXFormalParameterDefaultValueLiteral )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23527:1: ( ruleXFormalParameterDefaultValueLiteral )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23528:1: ruleXFormalParameterDefaultValueLiteral
+            // InternalCheck.g:23527:1: ( ruleXFormalParameterDefaultValueLiteral )
+            // InternalCheck.g:23528:1: ruleXFormalParameterDefaultValueLiteral
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormalParameterAccess().getRightXFormalParameterDefaultValueLiteralParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleXFormalParameterDefaultValueLiteral_in_rule__FormalParameter__RightAssignment_347360);
+            pushFollow(FOLLOW_2);
             ruleXFormalParameterDefaultValueLiteral();
 
             state._fsp--;
@@ -67132,22 +67132,22 @@ public final void rule__FormalParameter__RightAssignment_3() throws RecognitionE
 
 
     // $ANTLR start "rule__FormalParameter__LabelAssignment_4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23537:1: rule__FormalParameter__LabelAssignment_4 : ( RULE_STRING ) ;
+    // InternalCheck.g:23537:1: rule__FormalParameter__LabelAssignment_4 : ( RULE_STRING ) ;
     public final void rule__FormalParameter__LabelAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23541:1: ( ( RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23542:1: ( RULE_STRING )
+            // InternalCheck.g:23541:1: ( ( RULE_STRING ) )
+            // InternalCheck.g:23542:1: ( RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23542:1: ( RULE_STRING )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23543:1: RULE_STRING
+            // InternalCheck.g:23542:1: ( RULE_STRING )
+            // InternalCheck.g:23543:1: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormalParameterAccess().getLabelSTRINGTerminalRuleCall_4_0()); 
             }
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__FormalParameter__LabelAssignment_447391); if (state.failed) return ;
+            match(input,RULE_STRING,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getFormalParameterAccess().getLabelSTRINGTerminalRuleCall_4_0()); 
             }
@@ -67173,28 +67173,28 @@ public final void rule__FormalParameter__LabelAssignment_4() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstantUnaryOperation__FeatureAssignment_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23552:1: rule__XConstantUnaryOperation__FeatureAssignment_0_1 : ( ( ruleOpUnary ) ) ;
+    // InternalCheck.g:23552:1: rule__XConstantUnaryOperation__FeatureAssignment_0_1 : ( ( ruleOpUnary ) ) ;
     public final void rule__XConstantUnaryOperation__FeatureAssignment_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23556:1: ( ( ( ruleOpUnary ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23557:1: ( ( ruleOpUnary ) )
+            // InternalCheck.g:23556:1: ( ( ( ruleOpUnary ) ) )
+            // InternalCheck.g:23557:1: ( ( ruleOpUnary ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23557:1: ( ( ruleOpUnary ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23558:1: ( ruleOpUnary )
+            // InternalCheck.g:23557:1: ( ( ruleOpUnary ) )
+            // InternalCheck.g:23558:1: ( ruleOpUnary )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantUnaryOperationAccess().getFeatureJvmIdentifiableElementCrossReference_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23559:1: ( ruleOpUnary )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23560:1: ruleOpUnary
+            // InternalCheck.g:23559:1: ( ruleOpUnary )
+            // InternalCheck.g:23560:1: ruleOpUnary
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantUnaryOperationAccess().getFeatureJvmIdentifiableElementOpUnaryParserRuleCall_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpUnary_in_rule__XConstantUnaryOperation__FeatureAssignment_0_147426);
+            pushFollow(FOLLOW_2);
             ruleOpUnary();
 
             state._fsp--;
@@ -67230,22 +67230,22 @@ public final void rule__XConstantUnaryOperation__FeatureAssignment_0_1() throws
 
 
     // $ANTLR start "rule__XConstantUnaryOperation__OperandAssignment_0_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23571:1: rule__XConstantUnaryOperation__OperandAssignment_0_2 : ( ruleXConstantUnaryOperation ) ;
+    // InternalCheck.g:23571:1: rule__XConstantUnaryOperation__OperandAssignment_0_2 : ( ruleXConstantUnaryOperation ) ;
     public final void rule__XConstantUnaryOperation__OperandAssignment_0_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23575:1: ( ( ruleXConstantUnaryOperation ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23576:1: ( ruleXConstantUnaryOperation )
+            // InternalCheck.g:23575:1: ( ( ruleXConstantUnaryOperation ) )
+            // InternalCheck.g:23576:1: ( ruleXConstantUnaryOperation )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23576:1: ( ruleXConstantUnaryOperation )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23577:1: ruleXConstantUnaryOperation
+            // InternalCheck.g:23576:1: ( ruleXConstantUnaryOperation )
+            // InternalCheck.g:23577:1: ruleXConstantUnaryOperation
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantUnaryOperationAccess().getOperandXConstantUnaryOperationParserRuleCall_0_2_0()); 
             }
-            pushFollow(FOLLOW_ruleXConstantUnaryOperation_in_rule__XConstantUnaryOperation__OperandAssignment_0_247461);
+            pushFollow(FOLLOW_2);
             ruleXConstantUnaryOperation();
 
             state._fsp--;
@@ -67275,22 +67275,22 @@ public final void rule__XConstantUnaryOperation__OperandAssignment_0_2() throws
 
 
     // $ANTLR start "rule__XConstantListLiteral__ElementsAssignment_3_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23586:1: rule__XConstantListLiteral__ElementsAssignment_3_0 : ( ruleXConstantUnaryOperation ) ;
+    // InternalCheck.g:23586:1: rule__XConstantListLiteral__ElementsAssignment_3_0 : ( ruleXConstantUnaryOperation ) ;
     public final void rule__XConstantListLiteral__ElementsAssignment_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23590:1: ( ( ruleXConstantUnaryOperation ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23591:1: ( ruleXConstantUnaryOperation )
+            // InternalCheck.g:23590:1: ( ( ruleXConstantUnaryOperation ) )
+            // InternalCheck.g:23591:1: ( ruleXConstantUnaryOperation )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23591:1: ( ruleXConstantUnaryOperation )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23592:1: ruleXConstantUnaryOperation
+            // InternalCheck.g:23591:1: ( ruleXConstantUnaryOperation )
+            // InternalCheck.g:23592:1: ruleXConstantUnaryOperation
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantListLiteralAccess().getElementsXConstantUnaryOperationParserRuleCall_3_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXConstantUnaryOperation_in_rule__XConstantListLiteral__ElementsAssignment_3_047492);
+            pushFollow(FOLLOW_2);
             ruleXConstantUnaryOperation();
 
             state._fsp--;
@@ -67320,22 +67320,22 @@ public final void rule__XConstantListLiteral__ElementsAssignment_3_0() throws Re
 
 
     // $ANTLR start "rule__XConstantListLiteral__ElementsAssignment_3_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23601:1: rule__XConstantListLiteral__ElementsAssignment_3_1_1 : ( ruleXConstantUnaryOperation ) ;
+    // InternalCheck.g:23601:1: rule__XConstantListLiteral__ElementsAssignment_3_1_1 : ( ruleXConstantUnaryOperation ) ;
     public final void rule__XConstantListLiteral__ElementsAssignment_3_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23605:1: ( ( ruleXConstantUnaryOperation ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23606:1: ( ruleXConstantUnaryOperation )
+            // InternalCheck.g:23605:1: ( ( ruleXConstantUnaryOperation ) )
+            // InternalCheck.g:23606:1: ( ruleXConstantUnaryOperation )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23606:1: ( ruleXConstantUnaryOperation )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23607:1: ruleXConstantUnaryOperation
+            // InternalCheck.g:23606:1: ( ruleXConstantUnaryOperation )
+            // InternalCheck.g:23607:1: ruleXConstantUnaryOperation
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantListLiteralAccess().getElementsXConstantUnaryOperationParserRuleCall_3_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXConstantUnaryOperation_in_rule__XConstantListLiteral__ElementsAssignment_3_1_147523);
+            pushFollow(FOLLOW_2);
             ruleXConstantUnaryOperation();
 
             state._fsp--;
@@ -67365,22 +67365,22 @@ public final void rule__XConstantListLiteral__ElementsAssignment_3_1_1() throws
 
 
     // $ANTLR start "rule__Context__ContextVariableAssignment_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23616:1: rule__Context__ContextVariableAssignment_1 : ( ruleContextVariable ) ;
+    // InternalCheck.g:23616:1: rule__Context__ContextVariableAssignment_1 : ( ruleContextVariable ) ;
     public final void rule__Context__ContextVariableAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23620:1: ( ( ruleContextVariable ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23621:1: ( ruleContextVariable )
+            // InternalCheck.g:23620:1: ( ( ruleContextVariable ) )
+            // InternalCheck.g:23621:1: ( ruleContextVariable )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23621:1: ( ruleContextVariable )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23622:1: ruleContextVariable
+            // InternalCheck.g:23621:1: ( ruleContextVariable )
+            // InternalCheck.g:23622:1: ruleContextVariable
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getContextAccess().getContextVariableContextVariableParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleContextVariable_in_rule__Context__ContextVariableAssignment_147554);
+            pushFollow(FOLLOW_2);
             ruleContextVariable();
 
             state._fsp--;
@@ -67410,22 +67410,22 @@ public final void rule__Context__ContextVariableAssignment_1() throws Recognitio
 
 
     // $ANTLR start "rule__Context__ConstraintAssignment_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23631:1: rule__Context__ConstraintAssignment_2 : ( ruleXBlockExpression ) ;
+    // InternalCheck.g:23631:1: rule__Context__ConstraintAssignment_2 : ( ruleXBlockExpression ) ;
     public final void rule__Context__ConstraintAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23635:1: ( ( ruleXBlockExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23636:1: ( ruleXBlockExpression )
+            // InternalCheck.g:23635:1: ( ( ruleXBlockExpression ) )
+            // InternalCheck.g:23636:1: ( ruleXBlockExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23636:1: ( ruleXBlockExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23637:1: ruleXBlockExpression
+            // InternalCheck.g:23636:1: ( ruleXBlockExpression )
+            // InternalCheck.g:23637:1: ruleXBlockExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getContextAccess().getConstraintXBlockExpressionParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleXBlockExpression_in_rule__Context__ConstraintAssignment_247585);
+            pushFollow(FOLLOW_2);
             ruleXBlockExpression();
 
             state._fsp--;
@@ -67455,22 +67455,22 @@ public final void rule__Context__ConstraintAssignment_2() throws RecognitionExce
 
 
     // $ANTLR start "rule__ContextVariable__TypeAssignment_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23646:1: rule__ContextVariable__TypeAssignment_0 : ( ruleJvmTypeReference ) ;
+    // InternalCheck.g:23646:1: rule__ContextVariable__TypeAssignment_0 : ( ruleJvmTypeReference ) ;
     public final void rule__ContextVariable__TypeAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23650:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23651:1: ( ruleJvmTypeReference )
+            // InternalCheck.g:23650:1: ( ( ruleJvmTypeReference ) )
+            // InternalCheck.g:23651:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23651:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23652:1: ruleJvmTypeReference
+            // InternalCheck.g:23651:1: ( ruleJvmTypeReference )
+            // InternalCheck.g:23652:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getContextVariableAccess().getTypeJvmTypeReferenceParserRuleCall_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__ContextVariable__TypeAssignment_047616);
+            pushFollow(FOLLOW_2);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -67500,22 +67500,22 @@ public final void rule__ContextVariable__TypeAssignment_0() throws RecognitionEx
 
 
     // $ANTLR start "rule__ContextVariable__NameAssignment_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23661:1: rule__ContextVariable__NameAssignment_1 : ( ruleValidID ) ;
+    // InternalCheck.g:23661:1: rule__ContextVariable__NameAssignment_1 : ( ruleValidID ) ;
     public final void rule__ContextVariable__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23665:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23666:1: ( ruleValidID )
+            // InternalCheck.g:23665:1: ( ( ruleValidID ) )
+            // InternalCheck.g:23666:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23666:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23667:1: ruleValidID
+            // InternalCheck.g:23666:1: ( ruleValidID )
+            // InternalCheck.g:23667:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getContextVariableAccess().getNameValidIDParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__ContextVariable__NameAssignment_147647);
+            pushFollow(FOLLOW_2);
             ruleValidID();
 
             state._fsp--;
@@ -67545,22 +67545,22 @@ public final void rule__ContextVariable__NameAssignment_1() throws RecognitionEx
 
 
     // $ANTLR start "rule__XGuardExpression__GuardAssignment_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23676:1: rule__XGuardExpression__GuardAssignment_2 : ( ruleXExpression ) ;
+    // InternalCheck.g:23676:1: rule__XGuardExpression__GuardAssignment_2 : ( ruleXExpression ) ;
     public final void rule__XGuardExpression__GuardAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23680:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23681:1: ( ruleXExpression )
+            // InternalCheck.g:23680:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:23681:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23681:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23682:1: ruleXExpression
+            // InternalCheck.g:23681:1: ( ruleXExpression )
+            // InternalCheck.g:23682:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXGuardExpressionAccess().getGuardXExpressionParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XGuardExpression__GuardAssignment_247678);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -67590,28 +67590,28 @@ public final void rule__XGuardExpression__GuardAssignment_2() throws Recognition
 
 
     // $ANTLR start "rule__XIssueExpression__CheckAssignment_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23691:1: rule__XIssueExpression__CheckAssignment_2 : ( ( ruleQualifiedName ) ) ;
+    // InternalCheck.g:23691:1: rule__XIssueExpression__CheckAssignment_2 : ( ( ruleQualifiedName ) ) ;
     public final void rule__XIssueExpression__CheckAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23695:1: ( ( ( ruleQualifiedName ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23696:1: ( ( ruleQualifiedName ) )
+            // InternalCheck.g:23695:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalCheck.g:23696:1: ( ( ruleQualifiedName ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23696:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23697:1: ( ruleQualifiedName )
+            // InternalCheck.g:23696:1: ( ( ruleQualifiedName ) )
+            // InternalCheck.g:23697:1: ( ruleQualifiedName )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getCheckCheckCrossReference_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23698:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23699:1: ruleQualifiedName
+            // InternalCheck.g:23698:1: ( ruleQualifiedName )
+            // InternalCheck.g:23699:1: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getCheckCheckQualifiedNameParserRuleCall_2_0_1()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_rule__XIssueExpression__CheckAssignment_247713);
+            pushFollow(FOLLOW_2);
             ruleQualifiedName();
 
             state._fsp--;
@@ -67647,28 +67647,28 @@ public final void rule__XIssueExpression__CheckAssignment_2() throws Recognition
 
 
     // $ANTLR start "rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23710:1: rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1 : ( ( ruleValidID ) ) ;
+    // InternalCheck.g:23710:1: rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1 : ( ( ruleValidID ) ) ;
     public final void rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23714:1: ( ( ( ruleValidID ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23715:1: ( ( ruleValidID ) )
+            // InternalCheck.g:23714:1: ( ( ( ruleValidID ) ) )
+            // InternalCheck.g:23715:1: ( ( ruleValidID ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23715:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23716:1: ( ruleValidID )
+            // InternalCheck.g:23715:1: ( ( ruleValidID ) )
+            // InternalCheck.g:23716:1: ( ruleValidID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getMarkerFeatureEStructuralFeatureCrossReference_3_1_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23717:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23718:1: ruleValidID
+            // InternalCheck.g:23717:1: ( ruleValidID )
+            // InternalCheck.g:23718:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getMarkerFeatureEStructuralFeatureValidIDParserRuleCall_3_1_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_147752);
+            pushFollow(FOLLOW_2);
             ruleValidID();
 
             state._fsp--;
@@ -67704,22 +67704,22 @@ public final void rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1() thro
 
 
     // $ANTLR start "rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23729:1: rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0 : ( ruleXExpression ) ;
+    // InternalCheck.g:23729:1: rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0 : ( ruleXExpression ) ;
     public final void rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23733:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23734:1: ( ruleXExpression )
+            // InternalCheck.g:23733:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:23734:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23734:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23735:1: ruleXExpression
+            // InternalCheck.g:23734:1: ( ruleXExpression )
+            // InternalCheck.g:23735:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getMarkerObjectXExpressionParserRuleCall_3_1_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XIssueExpression__MarkerObjectAssignment_3_1_1_047787);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -67749,28 +67749,28 @@ public final void rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0() throw
 
 
     // $ANTLR start "rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23744:1: rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1 : ( ( ruleFeatureCallID ) ) ;
+    // InternalCheck.g:23744:1: rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1 : ( ( ruleFeatureCallID ) ) ;
     public final void rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23748:1: ( ( ( ruleFeatureCallID ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23749:1: ( ( ruleFeatureCallID ) )
+            // InternalCheck.g:23748:1: ( ( ( ruleFeatureCallID ) ) )
+            // InternalCheck.g:23749:1: ( ( ruleFeatureCallID ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23749:1: ( ( ruleFeatureCallID ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23750:1: ( ruleFeatureCallID )
+            // InternalCheck.g:23749:1: ( ( ruleFeatureCallID ) )
+            // InternalCheck.g:23750:1: ( ruleFeatureCallID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getMarkerFeatureEStructuralFeatureCrossReference_3_1_1_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23751:1: ( ruleFeatureCallID )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23752:1: ruleFeatureCallID
+            // InternalCheck.g:23751:1: ( ruleFeatureCallID )
+            // InternalCheck.g:23752:1: ruleFeatureCallID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getMarkerFeatureEStructuralFeatureFeatureCallIDParserRuleCall_3_1_1_1_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleFeatureCallID_in_rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_147822);
+            pushFollow(FOLLOW_2);
             ruleFeatureCallID();
 
             state._fsp--;
@@ -67806,22 +67806,22 @@ public final void rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1() th
 
 
     // $ANTLR start "rule__XIssueExpression__MarkerIndexAssignment_3_2_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23763:1: rule__XIssueExpression__MarkerIndexAssignment_3_2_1 : ( ruleXExpression ) ;
+    // InternalCheck.g:23763:1: rule__XIssueExpression__MarkerIndexAssignment_3_2_1 : ( ruleXExpression ) ;
     public final void rule__XIssueExpression__MarkerIndexAssignment_3_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23767:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23768:1: ( ruleXExpression )
+            // InternalCheck.g:23767:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:23768:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23768:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23769:1: ruleXExpression
+            // InternalCheck.g:23768:1: ( ruleXExpression )
+            // InternalCheck.g:23769:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getMarkerIndexXExpressionParserRuleCall_3_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XIssueExpression__MarkerIndexAssignment_3_2_147857);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -67851,22 +67851,22 @@ public final void rule__XIssueExpression__MarkerIndexAssignment_3_2_1() throws R
 
 
     // $ANTLR start "rule__XIssueExpression__MessageAssignment_4_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23778:1: rule__XIssueExpression__MessageAssignment_4_1 : ( ruleXExpression ) ;
+    // InternalCheck.g:23778:1: rule__XIssueExpression__MessageAssignment_4_1 : ( ruleXExpression ) ;
     public final void rule__XIssueExpression__MessageAssignment_4_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23782:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23783:1: ( ruleXExpression )
+            // InternalCheck.g:23782:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:23783:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23783:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23784:1: ruleXExpression
+            // InternalCheck.g:23783:1: ( ruleXExpression )
+            // InternalCheck.g:23784:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getMessageXExpressionParserRuleCall_4_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XIssueExpression__MessageAssignment_4_147888);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -67896,22 +67896,22 @@ public final void rule__XIssueExpression__MessageAssignment_4_1() throws Recogni
 
 
     // $ANTLR start "rule__XIssueExpression__MessageParametersAssignment_5_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23793:1: rule__XIssueExpression__MessageParametersAssignment_5_2 : ( ruleXExpression ) ;
+    // InternalCheck.g:23793:1: rule__XIssueExpression__MessageParametersAssignment_5_2 : ( ruleXExpression ) ;
     public final void rule__XIssueExpression__MessageParametersAssignment_5_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23797:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23798:1: ( ruleXExpression )
+            // InternalCheck.g:23797:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:23798:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23798:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23799:1: ruleXExpression
+            // InternalCheck.g:23798:1: ( ruleXExpression )
+            // InternalCheck.g:23799:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getMessageParametersXExpressionParserRuleCall_5_2_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XIssueExpression__MessageParametersAssignment_5_247919);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -67941,22 +67941,22 @@ public final void rule__XIssueExpression__MessageParametersAssignment_5_2() thro
 
 
     // $ANTLR start "rule__XIssueExpression__MessageParametersAssignment_5_3_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23808:1: rule__XIssueExpression__MessageParametersAssignment_5_3_1 : ( ruleXExpression ) ;
+    // InternalCheck.g:23808:1: rule__XIssueExpression__MessageParametersAssignment_5_3_1 : ( ruleXExpression ) ;
     public final void rule__XIssueExpression__MessageParametersAssignment_5_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23812:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23813:1: ( ruleXExpression )
+            // InternalCheck.g:23812:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:23813:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23813:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23814:1: ruleXExpression
+            // InternalCheck.g:23813:1: ( ruleXExpression )
+            // InternalCheck.g:23814:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getMessageParametersXExpressionParserRuleCall_5_3_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XIssueExpression__MessageParametersAssignment_5_3_147950);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -67986,22 +67986,22 @@ public final void rule__XIssueExpression__MessageParametersAssignment_5_3_1() th
 
 
     // $ANTLR start "rule__XIssueExpression__IssueCodeAssignment_6_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23823:1: rule__XIssueExpression__IssueCodeAssignment_6_1 : ( ruleValidID ) ;
+    // InternalCheck.g:23823:1: rule__XIssueExpression__IssueCodeAssignment_6_1 : ( ruleValidID ) ;
     public final void rule__XIssueExpression__IssueCodeAssignment_6_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23827:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23828:1: ( ruleValidID )
+            // InternalCheck.g:23827:1: ( ( ruleValidID ) )
+            // InternalCheck.g:23828:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23828:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23829:1: ruleValidID
+            // InternalCheck.g:23828:1: ( ruleValidID )
+            // InternalCheck.g:23829:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getIssueCodeValidIDParserRuleCall_6_1_0()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__XIssueExpression__IssueCodeAssignment_6_147981);
+            pushFollow(FOLLOW_2);
             ruleValidID();
 
             state._fsp--;
@@ -68031,22 +68031,22 @@ public final void rule__XIssueExpression__IssueCodeAssignment_6_1() throws Recog
 
 
     // $ANTLR start "rule__XIssueExpression__IssueDataAssignment_6_3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23838:1: rule__XIssueExpression__IssueDataAssignment_6_3 : ( ruleXExpression ) ;
+    // InternalCheck.g:23838:1: rule__XIssueExpression__IssueDataAssignment_6_3 : ( ruleXExpression ) ;
     public final void rule__XIssueExpression__IssueDataAssignment_6_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23842:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23843:1: ( ruleXExpression )
+            // InternalCheck.g:23842:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:23843:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23843:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23844:1: ruleXExpression
+            // InternalCheck.g:23843:1: ( ruleXExpression )
+            // InternalCheck.g:23844:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getIssueDataXExpressionParserRuleCall_6_3_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XIssueExpression__IssueDataAssignment_6_348012);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -68076,22 +68076,22 @@ public final void rule__XIssueExpression__IssueDataAssignment_6_3() throws Recog
 
 
     // $ANTLR start "rule__XIssueExpression__IssueDataAssignment_6_4_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23853:1: rule__XIssueExpression__IssueDataAssignment_6_4_1 : ( ruleXExpression ) ;
+    // InternalCheck.g:23853:1: rule__XIssueExpression__IssueDataAssignment_6_4_1 : ( ruleXExpression ) ;
     public final void rule__XIssueExpression__IssueDataAssignment_6_4_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23857:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23858:1: ( ruleXExpression )
+            // InternalCheck.g:23857:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:23858:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23858:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23859:1: ruleXExpression
+            // InternalCheck.g:23858:1: ( ruleXExpression )
+            // InternalCheck.g:23859:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIssueExpressionAccess().getIssueDataXExpressionParserRuleCall_6_4_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XIssueExpression__IssueDataAssignment_6_4_148043);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -68121,28 +68121,28 @@ public final void rule__XIssueExpression__IssueDataAssignment_6_4_1() throws Rec
 
 
     // $ANTLR start "rule__XAnnotation__AnnotationTypeAssignment_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23868:1: rule__XAnnotation__AnnotationTypeAssignment_2 : ( ( ruleQualifiedName ) ) ;
+    // InternalCheck.g:23868:1: rule__XAnnotation__AnnotationTypeAssignment_2 : ( ( ruleQualifiedName ) ) ;
     public final void rule__XAnnotation__AnnotationTypeAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23872:1: ( ( ( ruleQualifiedName ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23873:1: ( ( ruleQualifiedName ) )
+            // InternalCheck.g:23872:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalCheck.g:23873:1: ( ( ruleQualifiedName ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23873:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23874:1: ( ruleQualifiedName )
+            // InternalCheck.g:23873:1: ( ( ruleQualifiedName ) )
+            // InternalCheck.g:23874:1: ( ruleQualifiedName )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getAnnotationTypeJvmAnnotationTypeCrossReference_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23875:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23876:1: ruleQualifiedName
+            // InternalCheck.g:23875:1: ( ruleQualifiedName )
+            // InternalCheck.g:23876:1: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getAnnotationTypeJvmAnnotationTypeQualifiedNameParserRuleCall_2_0_1()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_rule__XAnnotation__AnnotationTypeAssignment_248078);
+            pushFollow(FOLLOW_2);
             ruleQualifiedName();
 
             state._fsp--;
@@ -68178,22 +68178,22 @@ public final void rule__XAnnotation__AnnotationTypeAssignment_2() throws Recogni
 
 
     // $ANTLR start "rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23887:1: rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 : ( ruleXAnnotationElementValuePair ) ;
+    // InternalCheck.g:23887:1: rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 : ( ruleXAnnotationElementValuePair ) ;
     public final void rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23891:1: ( ( ruleXAnnotationElementValuePair ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23892:1: ( ruleXAnnotationElementValuePair )
+            // InternalCheck.g:23891:1: ( ( ruleXAnnotationElementValuePair ) )
+            // InternalCheck.g:23892:1: ( ruleXAnnotationElementValuePair )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23892:1: ( ruleXAnnotationElementValuePair )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23893:1: ruleXAnnotationElementValuePair
+            // InternalCheck.g:23892:1: ( ruleXAnnotationElementValuePair )
+            // InternalCheck.g:23893:1: ruleXAnnotationElementValuePair
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getElementValuePairsXAnnotationElementValuePairParserRuleCall_3_1_0_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationElementValuePair_in_rule__XAnnotation__ElementValuePairsAssignment_3_1_0_048113);
+            pushFollow(FOLLOW_2);
             ruleXAnnotationElementValuePair();
 
             state._fsp--;
@@ -68223,22 +68223,22 @@ public final void rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0() throw
 
 
     // $ANTLR start "rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23902:1: rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 : ( ruleXAnnotationElementValuePair ) ;
+    // InternalCheck.g:23902:1: rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 : ( ruleXAnnotationElementValuePair ) ;
     public final void rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23906:1: ( ( ruleXAnnotationElementValuePair ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23907:1: ( ruleXAnnotationElementValuePair )
+            // InternalCheck.g:23906:1: ( ( ruleXAnnotationElementValuePair ) )
+            // InternalCheck.g:23907:1: ( ruleXAnnotationElementValuePair )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23907:1: ( ruleXAnnotationElementValuePair )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23908:1: ruleXAnnotationElementValuePair
+            // InternalCheck.g:23907:1: ( ruleXAnnotationElementValuePair )
+            // InternalCheck.g:23908:1: ruleXAnnotationElementValuePair
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getElementValuePairsXAnnotationElementValuePairParserRuleCall_3_1_0_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationElementValuePair_in_rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_148144);
+            pushFollow(FOLLOW_2);
             ruleXAnnotationElementValuePair();
 
             state._fsp--;
@@ -68268,22 +68268,22 @@ public final void rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1() thr
 
 
     // $ANTLR start "rule__XAnnotation__ValueAssignment_3_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23917:1: rule__XAnnotation__ValueAssignment_3_1_1 : ( ruleXAnnotationElementValueOrCommaList ) ;
+    // InternalCheck.g:23917:1: rule__XAnnotation__ValueAssignment_3_1_1 : ( ruleXAnnotationElementValueOrCommaList ) ;
     public final void rule__XAnnotation__ValueAssignment_3_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23921:1: ( ( ruleXAnnotationElementValueOrCommaList ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23922:1: ( ruleXAnnotationElementValueOrCommaList )
+            // InternalCheck.g:23921:1: ( ( ruleXAnnotationElementValueOrCommaList ) )
+            // InternalCheck.g:23922:1: ( ruleXAnnotationElementValueOrCommaList )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23922:1: ( ruleXAnnotationElementValueOrCommaList )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23923:1: ruleXAnnotationElementValueOrCommaList
+            // InternalCheck.g:23922:1: ( ruleXAnnotationElementValueOrCommaList )
+            // InternalCheck.g:23923:1: ruleXAnnotationElementValueOrCommaList
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getValueXAnnotationElementValueOrCommaListParserRuleCall_3_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationElementValueOrCommaList_in_rule__XAnnotation__ValueAssignment_3_1_148175);
+            pushFollow(FOLLOW_2);
             ruleXAnnotationElementValueOrCommaList();
 
             state._fsp--;
@@ -68313,28 +68313,28 @@ public final void rule__XAnnotation__ValueAssignment_3_1_1() throws RecognitionE
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__ElementAssignment_0_0_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23932:1: rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 : ( ( ruleValidID ) ) ;
+    // InternalCheck.g:23932:1: rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 : ( ( ruleValidID ) ) ;
     public final void rule__XAnnotationElementValuePair__ElementAssignment_0_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23936:1: ( ( ( ruleValidID ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23937:1: ( ( ruleValidID ) )
+            // InternalCheck.g:23936:1: ( ( ( ruleValidID ) ) )
+            // InternalCheck.g:23937:1: ( ( ruleValidID ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23937:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23938:1: ( ruleValidID )
+            // InternalCheck.g:23937:1: ( ( ruleValidID ) )
+            // InternalCheck.g:23938:1: ( ruleValidID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getElementJvmOperationCrossReference_0_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23939:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23940:1: ruleValidID
+            // InternalCheck.g:23939:1: ( ruleValidID )
+            // InternalCheck.g:23940:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getElementJvmOperationValidIDParserRuleCall_0_0_0_0_1()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__XAnnotationElementValuePair__ElementAssignment_0_0_048210);
+            pushFollow(FOLLOW_2);
             ruleValidID();
 
             state._fsp--;
@@ -68370,22 +68370,22 @@ public final void rule__XAnnotationElementValuePair__ElementAssignment_0_0_0() t
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__ValueAssignment_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23951:1: rule__XAnnotationElementValuePair__ValueAssignment_1 : ( ruleXAnnotationElementValue ) ;
+    // InternalCheck.g:23951:1: rule__XAnnotationElementValuePair__ValueAssignment_1 : ( ruleXAnnotationElementValue ) ;
     public final void rule__XAnnotationElementValuePair__ValueAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23955:1: ( ( ruleXAnnotationElementValue ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23956:1: ( ruleXAnnotationElementValue )
+            // InternalCheck.g:23955:1: ( ( ruleXAnnotationElementValue ) )
+            // InternalCheck.g:23956:1: ( ruleXAnnotationElementValue )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23956:1: ( ruleXAnnotationElementValue )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23957:1: ruleXAnnotationElementValue
+            // InternalCheck.g:23956:1: ( ruleXAnnotationElementValue )
+            // InternalCheck.g:23957:1: ruleXAnnotationElementValue
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getValueXAnnotationElementValueParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationElementValue_in_rule__XAnnotationElementValuePair__ValueAssignment_148245);
+            pushFollow(FOLLOW_2);
             ruleXAnnotationElementValue();
 
             state._fsp--;
@@ -68415,22 +68415,22 @@ public final void rule__XAnnotationElementValuePair__ValueAssignment_1() throws
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23966:1: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 : ( ruleXAnnotationOrExpression ) ;
+    // InternalCheck.g:23966:1: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 : ( ruleXAnnotationOrExpression ) ;
     public final void rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23970:1: ( ( ruleXAnnotationOrExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23971:1: ( ruleXAnnotationOrExpression )
+            // InternalCheck.g:23970:1: ( ( ruleXAnnotationOrExpression ) )
+            // InternalCheck.g:23971:1: ( ruleXAnnotationOrExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23971:1: ( ruleXAnnotationOrExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23972:1: ruleXAnnotationOrExpression
+            // InternalCheck.g:23971:1: ( ruleXAnnotationOrExpression )
+            // InternalCheck.g:23972:1: ruleXAnnotationOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsXAnnotationOrExpressionParserRuleCall_0_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_048276);
+            pushFollow(FOLLOW_2);
             ruleXAnnotationOrExpression();
 
             state._fsp--;
@@ -68460,22 +68460,22 @@ public final void rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23981:1: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 : ( ruleXAnnotationOrExpression ) ;
+    // InternalCheck.g:23981:1: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 : ( ruleXAnnotationOrExpression ) ;
     public final void rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23985:1: ( ( ruleXAnnotationOrExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23986:1: ( ruleXAnnotationOrExpression )
+            // InternalCheck.g:23985:1: ( ( ruleXAnnotationOrExpression ) )
+            // InternalCheck.g:23986:1: ( ruleXAnnotationOrExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23986:1: ( ruleXAnnotationOrExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23987:1: ruleXAnnotationOrExpression
+            // InternalCheck.g:23986:1: ( ruleXAnnotationOrExpression )
+            // InternalCheck.g:23987:1: ruleXAnnotationOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsXAnnotationOrExpressionParserRuleCall_0_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_148307);
+            pushFollow(FOLLOW_2);
             ruleXAnnotationOrExpression();
 
             state._fsp--;
@@ -68505,22 +68505,22 @@ public final void rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:23996:1: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 : ( ruleXAnnotationOrExpression ) ;
+    // InternalCheck.g:23996:1: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 : ( ruleXAnnotationOrExpression ) ;
     public final void rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24000:1: ( ( ruleXAnnotationOrExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24001:1: ( ruleXAnnotationOrExpression )
+            // InternalCheck.g:24000:1: ( ( ruleXAnnotationOrExpression ) )
+            // InternalCheck.g:24001:1: ( ruleXAnnotationOrExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24001:1: ( ruleXAnnotationOrExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24002:1: ruleXAnnotationOrExpression
+            // InternalCheck.g:24001:1: ( ruleXAnnotationOrExpression )
+            // InternalCheck.g:24002:1: ruleXAnnotationOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsXAnnotationOrExpressionParserRuleCall_1_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_148338);
+            pushFollow(FOLLOW_2);
             ruleXAnnotationOrExpression();
 
             state._fsp--;
@@ -68550,22 +68550,22 @@ public final void rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1
 
 
     // $ANTLR start "rule__XAnnotationElementValue__ElementsAssignment_0_1_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24011:1: rule__XAnnotationElementValue__ElementsAssignment_0_1_0 : ( ruleXAnnotationOrExpression ) ;
+    // InternalCheck.g:24011:1: rule__XAnnotationElementValue__ElementsAssignment_0_1_0 : ( ruleXAnnotationOrExpression ) ;
     public final void rule__XAnnotationElementValue__ElementsAssignment_0_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24015:1: ( ( ruleXAnnotationOrExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24016:1: ( ruleXAnnotationOrExpression )
+            // InternalCheck.g:24015:1: ( ( ruleXAnnotationOrExpression ) )
+            // InternalCheck.g:24016:1: ( ruleXAnnotationOrExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24016:1: ( ruleXAnnotationOrExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24017:1: ruleXAnnotationOrExpression
+            // InternalCheck.g:24016:1: ( ruleXAnnotationOrExpression )
+            // InternalCheck.g:24017:1: ruleXAnnotationOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getElementsXAnnotationOrExpressionParserRuleCall_0_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValue__ElementsAssignment_0_1_048369);
+            pushFollow(FOLLOW_2);
             ruleXAnnotationOrExpression();
 
             state._fsp--;
@@ -68595,22 +68595,22 @@ public final void rule__XAnnotationElementValue__ElementsAssignment_0_1_0() thro
 
 
     // $ANTLR start "rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24026:1: rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 : ( ruleXAnnotationOrExpression ) ;
+    // InternalCheck.g:24026:1: rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 : ( ruleXAnnotationOrExpression ) ;
     public final void rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24030:1: ( ( ruleXAnnotationOrExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24031:1: ( ruleXAnnotationOrExpression )
+            // InternalCheck.g:24030:1: ( ( ruleXAnnotationOrExpression ) )
+            // InternalCheck.g:24031:1: ( ruleXAnnotationOrExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24031:1: ( ruleXAnnotationOrExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24032:1: ruleXAnnotationOrExpression
+            // InternalCheck.g:24031:1: ( ruleXAnnotationOrExpression )
+            // InternalCheck.g:24032:1: ruleXAnnotationOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getElementsXAnnotationOrExpressionParserRuleCall_0_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValue__ElementsAssignment_0_1_1_148400);
+            pushFollow(FOLLOW_2);
             ruleXAnnotationOrExpression();
 
             state._fsp--;
@@ -68640,28 +68640,28 @@ public final void rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1() th
 
 
     // $ANTLR start "rule__XAssignment__FeatureAssignment_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24041:1: rule__XAssignment__FeatureAssignment_0_1 : ( ( ruleFeatureCallID ) ) ;
+    // InternalCheck.g:24041:1: rule__XAssignment__FeatureAssignment_0_1 : ( ( ruleFeatureCallID ) ) ;
     public final void rule__XAssignment__FeatureAssignment_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24045:1: ( ( ( ruleFeatureCallID ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24046:1: ( ( ruleFeatureCallID ) )
+            // InternalCheck.g:24045:1: ( ( ( ruleFeatureCallID ) ) )
+            // InternalCheck.g:24046:1: ( ( ruleFeatureCallID ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24046:1: ( ( ruleFeatureCallID ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24047:1: ( ruleFeatureCallID )
+            // InternalCheck.g:24046:1: ( ( ruleFeatureCallID ) )
+            // InternalCheck.g:24047:1: ( ruleFeatureCallID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getFeatureJvmIdentifiableElementCrossReference_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24048:1: ( ruleFeatureCallID )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24049:1: ruleFeatureCallID
+            // InternalCheck.g:24048:1: ( ruleFeatureCallID )
+            // InternalCheck.g:24049:1: ruleFeatureCallID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getFeatureJvmIdentifiableElementFeatureCallIDParserRuleCall_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleFeatureCallID_in_rule__XAssignment__FeatureAssignment_0_148435);
+            pushFollow(FOLLOW_2);
             ruleFeatureCallID();
 
             state._fsp--;
@@ -68697,22 +68697,22 @@ public final void rule__XAssignment__FeatureAssignment_0_1() throws RecognitionE
 
 
     // $ANTLR start "rule__XAssignment__ValueAssignment_0_3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24060:1: rule__XAssignment__ValueAssignment_0_3 : ( ruleXAssignment ) ;
+    // InternalCheck.g:24060:1: rule__XAssignment__ValueAssignment_0_3 : ( ruleXAssignment ) ;
     public final void rule__XAssignment__ValueAssignment_0_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24064:1: ( ( ruleXAssignment ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24065:1: ( ruleXAssignment )
+            // InternalCheck.g:24064:1: ( ( ruleXAssignment ) )
+            // InternalCheck.g:24065:1: ( ruleXAssignment )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24065:1: ( ruleXAssignment )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24066:1: ruleXAssignment
+            // InternalCheck.g:24065:1: ( ruleXAssignment )
+            // InternalCheck.g:24066:1: ruleXAssignment
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getValueXAssignmentParserRuleCall_0_3_0()); 
             }
-            pushFollow(FOLLOW_ruleXAssignment_in_rule__XAssignment__ValueAssignment_0_348470);
+            pushFollow(FOLLOW_2);
             ruleXAssignment();
 
             state._fsp--;
@@ -68742,28 +68742,28 @@ public final void rule__XAssignment__ValueAssignment_0_3() throws RecognitionExc
 
 
     // $ANTLR start "rule__XAssignment__FeatureAssignment_1_1_0_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24075:1: rule__XAssignment__FeatureAssignment_1_1_0_0_1 : ( ( ruleOpMultiAssign ) ) ;
+    // InternalCheck.g:24075:1: rule__XAssignment__FeatureAssignment_1_1_0_0_1 : ( ( ruleOpMultiAssign ) ) ;
     public final void rule__XAssignment__FeatureAssignment_1_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24079:1: ( ( ( ruleOpMultiAssign ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24080:1: ( ( ruleOpMultiAssign ) )
+            // InternalCheck.g:24079:1: ( ( ( ruleOpMultiAssign ) ) )
+            // InternalCheck.g:24080:1: ( ( ruleOpMultiAssign ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24080:1: ( ( ruleOpMultiAssign ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24081:1: ( ruleOpMultiAssign )
+            // InternalCheck.g:24080:1: ( ( ruleOpMultiAssign ) )
+            // InternalCheck.g:24081:1: ( ruleOpMultiAssign )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getFeatureJvmIdentifiableElementCrossReference_1_1_0_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24082:1: ( ruleOpMultiAssign )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24083:1: ruleOpMultiAssign
+            // InternalCheck.g:24082:1: ( ruleOpMultiAssign )
+            // InternalCheck.g:24083:1: ruleOpMultiAssign
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getFeatureJvmIdentifiableElementOpMultiAssignParserRuleCall_1_1_0_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpMultiAssign_in_rule__XAssignment__FeatureAssignment_1_1_0_0_148505);
+            pushFollow(FOLLOW_2);
             ruleOpMultiAssign();
 
             state._fsp--;
@@ -68799,22 +68799,22 @@ public final void rule__XAssignment__FeatureAssignment_1_1_0_0_1() throws Recogn
 
 
     // $ANTLR start "rule__XAssignment__RightOperandAssignment_1_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24094:1: rule__XAssignment__RightOperandAssignment_1_1_1 : ( ruleXAssignment ) ;
+    // InternalCheck.g:24094:1: rule__XAssignment__RightOperandAssignment_1_1_1 : ( ruleXAssignment ) ;
     public final void rule__XAssignment__RightOperandAssignment_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24098:1: ( ( ruleXAssignment ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24099:1: ( ruleXAssignment )
+            // InternalCheck.g:24098:1: ( ( ruleXAssignment ) )
+            // InternalCheck.g:24099:1: ( ruleXAssignment )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24099:1: ( ruleXAssignment )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24100:1: ruleXAssignment
+            // InternalCheck.g:24099:1: ( ruleXAssignment )
+            // InternalCheck.g:24100:1: ruleXAssignment
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getRightOperandXAssignmentParserRuleCall_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXAssignment_in_rule__XAssignment__RightOperandAssignment_1_1_148540);
+            pushFollow(FOLLOW_2);
             ruleXAssignment();
 
             state._fsp--;
@@ -68844,28 +68844,28 @@ public final void rule__XAssignment__RightOperandAssignment_1_1_1() throws Recog
 
 
     // $ANTLR start "rule__XOrExpression__FeatureAssignment_1_0_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24109:1: rule__XOrExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpOr ) ) ;
+    // InternalCheck.g:24109:1: rule__XOrExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpOr ) ) ;
     public final void rule__XOrExpression__FeatureAssignment_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24113:1: ( ( ( ruleOpOr ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24114:1: ( ( ruleOpOr ) )
+            // InternalCheck.g:24113:1: ( ( ( ruleOpOr ) ) )
+            // InternalCheck.g:24114:1: ( ( ruleOpOr ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24114:1: ( ( ruleOpOr ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24115:1: ( ruleOpOr )
+            // InternalCheck.g:24114:1: ( ( ruleOpOr ) )
+            // InternalCheck.g:24115:1: ( ruleOpOr )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24116:1: ( ruleOpOr )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24117:1: ruleOpOr
+            // InternalCheck.g:24116:1: ( ruleOpOr )
+            // InternalCheck.g:24117:1: ruleOpOr
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getFeatureJvmIdentifiableElementOpOrParserRuleCall_1_0_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpOr_in_rule__XOrExpression__FeatureAssignment_1_0_0_148575);
+            pushFollow(FOLLOW_2);
             ruleOpOr();
 
             state._fsp--;
@@ -68901,22 +68901,22 @@ public final void rule__XOrExpression__FeatureAssignment_1_0_0_1() throws Recogn
 
 
     // $ANTLR start "rule__XOrExpression__RightOperandAssignment_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24128:1: rule__XOrExpression__RightOperandAssignment_1_1 : ( ruleXAndExpression ) ;
+    // InternalCheck.g:24128:1: rule__XOrExpression__RightOperandAssignment_1_1 : ( ruleXAndExpression ) ;
     public final void rule__XOrExpression__RightOperandAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24132:1: ( ( ruleXAndExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24133:1: ( ruleXAndExpression )
+            // InternalCheck.g:24132:1: ( ( ruleXAndExpression ) )
+            // InternalCheck.g:24133:1: ( ruleXAndExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24133:1: ( ruleXAndExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24134:1: ruleXAndExpression
+            // InternalCheck.g:24133:1: ( ruleXAndExpression )
+            // InternalCheck.g:24134:1: ruleXAndExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getRightOperandXAndExpressionParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXAndExpression_in_rule__XOrExpression__RightOperandAssignment_1_148610);
+            pushFollow(FOLLOW_2);
             ruleXAndExpression();
 
             state._fsp--;
@@ -68946,28 +68946,28 @@ public final void rule__XOrExpression__RightOperandAssignment_1_1() throws Recog
 
 
     // $ANTLR start "rule__XAndExpression__FeatureAssignment_1_0_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24143:1: rule__XAndExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpAnd ) ) ;
+    // InternalCheck.g:24143:1: rule__XAndExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpAnd ) ) ;
     public final void rule__XAndExpression__FeatureAssignment_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24147:1: ( ( ( ruleOpAnd ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24148:1: ( ( ruleOpAnd ) )
+            // InternalCheck.g:24147:1: ( ( ( ruleOpAnd ) ) )
+            // InternalCheck.g:24148:1: ( ( ruleOpAnd ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24148:1: ( ( ruleOpAnd ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24149:1: ( ruleOpAnd )
+            // InternalCheck.g:24148:1: ( ( ruleOpAnd ) )
+            // InternalCheck.g:24149:1: ( ruleOpAnd )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24150:1: ( ruleOpAnd )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24151:1: ruleOpAnd
+            // InternalCheck.g:24150:1: ( ruleOpAnd )
+            // InternalCheck.g:24151:1: ruleOpAnd
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getFeatureJvmIdentifiableElementOpAndParserRuleCall_1_0_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpAnd_in_rule__XAndExpression__FeatureAssignment_1_0_0_148645);
+            pushFollow(FOLLOW_2);
             ruleOpAnd();
 
             state._fsp--;
@@ -69003,22 +69003,22 @@ public final void rule__XAndExpression__FeatureAssignment_1_0_0_1() throws Recog
 
 
     // $ANTLR start "rule__XAndExpression__RightOperandAssignment_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24162:1: rule__XAndExpression__RightOperandAssignment_1_1 : ( ruleXEqualityExpression ) ;
+    // InternalCheck.g:24162:1: rule__XAndExpression__RightOperandAssignment_1_1 : ( ruleXEqualityExpression ) ;
     public final void rule__XAndExpression__RightOperandAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24166:1: ( ( ruleXEqualityExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24167:1: ( ruleXEqualityExpression )
+            // InternalCheck.g:24166:1: ( ( ruleXEqualityExpression ) )
+            // InternalCheck.g:24167:1: ( ruleXEqualityExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24167:1: ( ruleXEqualityExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24168:1: ruleXEqualityExpression
+            // InternalCheck.g:24167:1: ( ruleXEqualityExpression )
+            // InternalCheck.g:24168:1: ruleXEqualityExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getRightOperandXEqualityExpressionParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXEqualityExpression_in_rule__XAndExpression__RightOperandAssignment_1_148680);
+            pushFollow(FOLLOW_2);
             ruleXEqualityExpression();
 
             state._fsp--;
@@ -69048,28 +69048,28 @@ public final void rule__XAndExpression__RightOperandAssignment_1_1() throws Reco
 
 
     // $ANTLR start "rule__XEqualityExpression__FeatureAssignment_1_0_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24177:1: rule__XEqualityExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpEquality ) ) ;
+    // InternalCheck.g:24177:1: rule__XEqualityExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpEquality ) ) ;
     public final void rule__XEqualityExpression__FeatureAssignment_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24181:1: ( ( ( ruleOpEquality ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24182:1: ( ( ruleOpEquality ) )
+            // InternalCheck.g:24181:1: ( ( ( ruleOpEquality ) ) )
+            // InternalCheck.g:24182:1: ( ( ruleOpEquality ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24182:1: ( ( ruleOpEquality ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24183:1: ( ruleOpEquality )
+            // InternalCheck.g:24182:1: ( ( ruleOpEquality ) )
+            // InternalCheck.g:24183:1: ( ruleOpEquality )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24184:1: ( ruleOpEquality )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24185:1: ruleOpEquality
+            // InternalCheck.g:24184:1: ( ruleOpEquality )
+            // InternalCheck.g:24185:1: ruleOpEquality
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getFeatureJvmIdentifiableElementOpEqualityParserRuleCall_1_0_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpEquality_in_rule__XEqualityExpression__FeatureAssignment_1_0_0_148715);
+            pushFollow(FOLLOW_2);
             ruleOpEquality();
 
             state._fsp--;
@@ -69105,22 +69105,22 @@ public final void rule__XEqualityExpression__FeatureAssignment_1_0_0_1() throws
 
 
     // $ANTLR start "rule__XEqualityExpression__RightOperandAssignment_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24196:1: rule__XEqualityExpression__RightOperandAssignment_1_1 : ( ruleXRelationalExpression ) ;
+    // InternalCheck.g:24196:1: rule__XEqualityExpression__RightOperandAssignment_1_1 : ( ruleXRelationalExpression ) ;
     public final void rule__XEqualityExpression__RightOperandAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24200:1: ( ( ruleXRelationalExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24201:1: ( ruleXRelationalExpression )
+            // InternalCheck.g:24200:1: ( ( ruleXRelationalExpression ) )
+            // InternalCheck.g:24201:1: ( ruleXRelationalExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24201:1: ( ruleXRelationalExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24202:1: ruleXRelationalExpression
+            // InternalCheck.g:24201:1: ( ruleXRelationalExpression )
+            // InternalCheck.g:24202:1: ruleXRelationalExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getRightOperandXRelationalExpressionParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXRelationalExpression_in_rule__XEqualityExpression__RightOperandAssignment_1_148750);
+            pushFollow(FOLLOW_2);
             ruleXRelationalExpression();
 
             state._fsp--;
@@ -69150,22 +69150,22 @@ public final void rule__XEqualityExpression__RightOperandAssignment_1_1() throws
 
 
     // $ANTLR start "rule__XRelationalExpression__TypeAssignment_1_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24211:1: rule__XRelationalExpression__TypeAssignment_1_0_1 : ( ruleJvmTypeReference ) ;
+    // InternalCheck.g:24211:1: rule__XRelationalExpression__TypeAssignment_1_0_1 : ( ruleJvmTypeReference ) ;
     public final void rule__XRelationalExpression__TypeAssignment_1_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24215:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24216:1: ( ruleJvmTypeReference )
+            // InternalCheck.g:24215:1: ( ( ruleJvmTypeReference ) )
+            // InternalCheck.g:24216:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24216:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24217:1: ruleJvmTypeReference
+            // InternalCheck.g:24216:1: ( ruleJvmTypeReference )
+            // InternalCheck.g:24217:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getTypeJvmTypeReferenceParserRuleCall_1_0_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__XRelationalExpression__TypeAssignment_1_0_148781);
+            pushFollow(FOLLOW_2);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -69195,28 +69195,28 @@ public final void rule__XRelationalExpression__TypeAssignment_1_0_1() throws Rec
 
 
     // $ANTLR start "rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24226:1: rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 : ( ( ruleOpCompare ) ) ;
+    // InternalCheck.g:24226:1: rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 : ( ( ruleOpCompare ) ) ;
     public final void rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24230:1: ( ( ( ruleOpCompare ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24231:1: ( ( ruleOpCompare ) )
+            // InternalCheck.g:24230:1: ( ( ( ruleOpCompare ) ) )
+            // InternalCheck.g:24231:1: ( ( ruleOpCompare ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24231:1: ( ( ruleOpCompare ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24232:1: ( ruleOpCompare )
+            // InternalCheck.g:24231:1: ( ( ruleOpCompare ) )
+            // InternalCheck.g:24232:1: ( ruleOpCompare )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_1_0_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24233:1: ( ruleOpCompare )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24234:1: ruleOpCompare
+            // InternalCheck.g:24233:1: ( ruleOpCompare )
+            // InternalCheck.g:24234:1: ruleOpCompare
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getFeatureJvmIdentifiableElementOpCompareParserRuleCall_1_1_0_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpCompare_in_rule__XRelationalExpression__FeatureAssignment_1_1_0_0_148816);
+            pushFollow(FOLLOW_2);
             ruleOpCompare();
 
             state._fsp--;
@@ -69252,22 +69252,22 @@ public final void rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1() thr
 
 
     // $ANTLR start "rule__XRelationalExpression__RightOperandAssignment_1_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24245:1: rule__XRelationalExpression__RightOperandAssignment_1_1_1 : ( ruleXOtherOperatorExpression ) ;
+    // InternalCheck.g:24245:1: rule__XRelationalExpression__RightOperandAssignment_1_1_1 : ( ruleXOtherOperatorExpression ) ;
     public final void rule__XRelationalExpression__RightOperandAssignment_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24249:1: ( ( ruleXOtherOperatorExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24250:1: ( ruleXOtherOperatorExpression )
+            // InternalCheck.g:24249:1: ( ( ruleXOtherOperatorExpression ) )
+            // InternalCheck.g:24250:1: ( ruleXOtherOperatorExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24250:1: ( ruleXOtherOperatorExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24251:1: ruleXOtherOperatorExpression
+            // InternalCheck.g:24250:1: ( ruleXOtherOperatorExpression )
+            // InternalCheck.g:24251:1: ruleXOtherOperatorExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getRightOperandXOtherOperatorExpressionParserRuleCall_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXOtherOperatorExpression_in_rule__XRelationalExpression__RightOperandAssignment_1_1_148851);
+            pushFollow(FOLLOW_2);
             ruleXOtherOperatorExpression();
 
             state._fsp--;
@@ -69297,28 +69297,28 @@ public final void rule__XRelationalExpression__RightOperandAssignment_1_1_1() th
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24260:1: rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpOther ) ) ;
+    // InternalCheck.g:24260:1: rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpOther ) ) ;
     public final void rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24264:1: ( ( ( ruleOpOther ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24265:1: ( ( ruleOpOther ) )
+            // InternalCheck.g:24264:1: ( ( ( ruleOpOther ) ) )
+            // InternalCheck.g:24265:1: ( ( ruleOpOther ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24265:1: ( ( ruleOpOther ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24266:1: ( ruleOpOther )
+            // InternalCheck.g:24265:1: ( ( ruleOpOther ) )
+            // InternalCheck.g:24266:1: ( ruleOpOther )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24267:1: ( ruleOpOther )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24268:1: ruleOpOther
+            // InternalCheck.g:24267:1: ( ruleOpOther )
+            // InternalCheck.g:24268:1: ruleOpOther
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getFeatureJvmIdentifiableElementOpOtherParserRuleCall_1_0_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpOther_in_rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_148886);
+            pushFollow(FOLLOW_2);
             ruleOpOther();
 
             state._fsp--;
@@ -69354,22 +69354,22 @@ public final void rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1() th
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__RightOperandAssignment_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24279:1: rule__XOtherOperatorExpression__RightOperandAssignment_1_1 : ( ruleXAdditiveExpression ) ;
+    // InternalCheck.g:24279:1: rule__XOtherOperatorExpression__RightOperandAssignment_1_1 : ( ruleXAdditiveExpression ) ;
     public final void rule__XOtherOperatorExpression__RightOperandAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24283:1: ( ( ruleXAdditiveExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24284:1: ( ruleXAdditiveExpression )
+            // InternalCheck.g:24283:1: ( ( ruleXAdditiveExpression ) )
+            // InternalCheck.g:24284:1: ( ruleXAdditiveExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24284:1: ( ruleXAdditiveExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24285:1: ruleXAdditiveExpression
+            // InternalCheck.g:24284:1: ( ruleXAdditiveExpression )
+            // InternalCheck.g:24285:1: ruleXAdditiveExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getRightOperandXAdditiveExpressionParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXAdditiveExpression_in_rule__XOtherOperatorExpression__RightOperandAssignment_1_148921);
+            pushFollow(FOLLOW_2);
             ruleXAdditiveExpression();
 
             state._fsp--;
@@ -69399,28 +69399,28 @@ public final void rule__XOtherOperatorExpression__RightOperandAssignment_1_1() t
 
 
     // $ANTLR start "rule__XAdditiveExpression__FeatureAssignment_1_0_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24294:1: rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpAdd ) ) ;
+    // InternalCheck.g:24294:1: rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpAdd ) ) ;
     public final void rule__XAdditiveExpression__FeatureAssignment_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24298:1: ( ( ( ruleOpAdd ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24299:1: ( ( ruleOpAdd ) )
+            // InternalCheck.g:24298:1: ( ( ( ruleOpAdd ) ) )
+            // InternalCheck.g:24299:1: ( ( ruleOpAdd ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24299:1: ( ( ruleOpAdd ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24300:1: ( ruleOpAdd )
+            // InternalCheck.g:24299:1: ( ( ruleOpAdd ) )
+            // InternalCheck.g:24300:1: ( ruleOpAdd )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24301:1: ( ruleOpAdd )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24302:1: ruleOpAdd
+            // InternalCheck.g:24301:1: ( ruleOpAdd )
+            // InternalCheck.g:24302:1: ruleOpAdd
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getFeatureJvmIdentifiableElementOpAddParserRuleCall_1_0_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpAdd_in_rule__XAdditiveExpression__FeatureAssignment_1_0_0_148956);
+            pushFollow(FOLLOW_2);
             ruleOpAdd();
 
             state._fsp--;
@@ -69456,22 +69456,22 @@ public final void rule__XAdditiveExpression__FeatureAssignment_1_0_0_1() throws
 
 
     // $ANTLR start "rule__XAdditiveExpression__RightOperandAssignment_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24313:1: rule__XAdditiveExpression__RightOperandAssignment_1_1 : ( ruleXMultiplicativeExpression ) ;
+    // InternalCheck.g:24313:1: rule__XAdditiveExpression__RightOperandAssignment_1_1 : ( ruleXMultiplicativeExpression ) ;
     public final void rule__XAdditiveExpression__RightOperandAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24317:1: ( ( ruleXMultiplicativeExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24318:1: ( ruleXMultiplicativeExpression )
+            // InternalCheck.g:24317:1: ( ( ruleXMultiplicativeExpression ) )
+            // InternalCheck.g:24318:1: ( ruleXMultiplicativeExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24318:1: ( ruleXMultiplicativeExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24319:1: ruleXMultiplicativeExpression
+            // InternalCheck.g:24318:1: ( ruleXMultiplicativeExpression )
+            // InternalCheck.g:24319:1: ruleXMultiplicativeExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getRightOperandXMultiplicativeExpressionParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXMultiplicativeExpression_in_rule__XAdditiveExpression__RightOperandAssignment_1_148991);
+            pushFollow(FOLLOW_2);
             ruleXMultiplicativeExpression();
 
             state._fsp--;
@@ -69501,28 +69501,28 @@ public final void rule__XAdditiveExpression__RightOperandAssignment_1_1() throws
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24328:1: rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpMulti ) ) ;
+    // InternalCheck.g:24328:1: rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpMulti ) ) ;
     public final void rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24332:1: ( ( ( ruleOpMulti ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24333:1: ( ( ruleOpMulti ) )
+            // InternalCheck.g:24332:1: ( ( ( ruleOpMulti ) ) )
+            // InternalCheck.g:24333:1: ( ( ruleOpMulti ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24333:1: ( ( ruleOpMulti ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24334:1: ( ruleOpMulti )
+            // InternalCheck.g:24333:1: ( ( ruleOpMulti ) )
+            // InternalCheck.g:24334:1: ( ruleOpMulti )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24335:1: ( ruleOpMulti )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24336:1: ruleOpMulti
+            // InternalCheck.g:24335:1: ( ruleOpMulti )
+            // InternalCheck.g:24336:1: ruleOpMulti
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getFeatureJvmIdentifiableElementOpMultiParserRuleCall_1_0_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpMulti_in_rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_149026);
+            pushFollow(FOLLOW_2);
             ruleOpMulti();
 
             state._fsp--;
@@ -69558,22 +69558,22 @@ public final void rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1() t
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__RightOperandAssignment_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24347:1: rule__XMultiplicativeExpression__RightOperandAssignment_1_1 : ( ruleXUnaryOperation ) ;
+    // InternalCheck.g:24347:1: rule__XMultiplicativeExpression__RightOperandAssignment_1_1 : ( ruleXUnaryOperation ) ;
     public final void rule__XMultiplicativeExpression__RightOperandAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24351:1: ( ( ruleXUnaryOperation ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24352:1: ( ruleXUnaryOperation )
+            // InternalCheck.g:24351:1: ( ( ruleXUnaryOperation ) )
+            // InternalCheck.g:24352:1: ( ruleXUnaryOperation )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24352:1: ( ruleXUnaryOperation )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24353:1: ruleXUnaryOperation
+            // InternalCheck.g:24352:1: ( ruleXUnaryOperation )
+            // InternalCheck.g:24353:1: ruleXUnaryOperation
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getRightOperandXUnaryOperationParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXUnaryOperation_in_rule__XMultiplicativeExpression__RightOperandAssignment_1_149061);
+            pushFollow(FOLLOW_2);
             ruleXUnaryOperation();
 
             state._fsp--;
@@ -69603,28 +69603,28 @@ public final void rule__XMultiplicativeExpression__RightOperandAssignment_1_1()
 
 
     // $ANTLR start "rule__XUnaryOperation__FeatureAssignment_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24362:1: rule__XUnaryOperation__FeatureAssignment_0_1 : ( ( ruleOpUnary ) ) ;
+    // InternalCheck.g:24362:1: rule__XUnaryOperation__FeatureAssignment_0_1 : ( ( ruleOpUnary ) ) ;
     public final void rule__XUnaryOperation__FeatureAssignment_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24366:1: ( ( ( ruleOpUnary ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24367:1: ( ( ruleOpUnary ) )
+            // InternalCheck.g:24366:1: ( ( ( ruleOpUnary ) ) )
+            // InternalCheck.g:24367:1: ( ( ruleOpUnary ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24367:1: ( ( ruleOpUnary ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24368:1: ( ruleOpUnary )
+            // InternalCheck.g:24367:1: ( ( ruleOpUnary ) )
+            // InternalCheck.g:24368:1: ( ruleOpUnary )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationAccess().getFeatureJvmIdentifiableElementCrossReference_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24369:1: ( ruleOpUnary )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24370:1: ruleOpUnary
+            // InternalCheck.g:24369:1: ( ruleOpUnary )
+            // InternalCheck.g:24370:1: ruleOpUnary
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationAccess().getFeatureJvmIdentifiableElementOpUnaryParserRuleCall_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpUnary_in_rule__XUnaryOperation__FeatureAssignment_0_149096);
+            pushFollow(FOLLOW_2);
             ruleOpUnary();
 
             state._fsp--;
@@ -69660,22 +69660,22 @@ public final void rule__XUnaryOperation__FeatureAssignment_0_1() throws Recognit
 
 
     // $ANTLR start "rule__XUnaryOperation__OperandAssignment_0_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24381:1: rule__XUnaryOperation__OperandAssignment_0_2 : ( ruleXUnaryOperation ) ;
+    // InternalCheck.g:24381:1: rule__XUnaryOperation__OperandAssignment_0_2 : ( ruleXUnaryOperation ) ;
     public final void rule__XUnaryOperation__OperandAssignment_0_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24385:1: ( ( ruleXUnaryOperation ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24386:1: ( ruleXUnaryOperation )
+            // InternalCheck.g:24385:1: ( ( ruleXUnaryOperation ) )
+            // InternalCheck.g:24386:1: ( ruleXUnaryOperation )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24386:1: ( ruleXUnaryOperation )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24387:1: ruleXUnaryOperation
+            // InternalCheck.g:24386:1: ( ruleXUnaryOperation )
+            // InternalCheck.g:24387:1: ruleXUnaryOperation
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationAccess().getOperandXUnaryOperationParserRuleCall_0_2_0()); 
             }
-            pushFollow(FOLLOW_ruleXUnaryOperation_in_rule__XUnaryOperation__OperandAssignment_0_249131);
+            pushFollow(FOLLOW_2);
             ruleXUnaryOperation();
 
             state._fsp--;
@@ -69705,22 +69705,22 @@ public final void rule__XUnaryOperation__OperandAssignment_0_2() throws Recognit
 
 
     // $ANTLR start "rule__XCastedExpression__TypeAssignment_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24396:1: rule__XCastedExpression__TypeAssignment_1_1 : ( ruleJvmTypeReference ) ;
+    // InternalCheck.g:24396:1: rule__XCastedExpression__TypeAssignment_1_1 : ( ruleJvmTypeReference ) ;
     public final void rule__XCastedExpression__TypeAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24400:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24401:1: ( ruleJvmTypeReference )
+            // InternalCheck.g:24400:1: ( ( ruleJvmTypeReference ) )
+            // InternalCheck.g:24401:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24401:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24402:1: ruleJvmTypeReference
+            // InternalCheck.g:24401:1: ( ruleJvmTypeReference )
+            // InternalCheck.g:24402:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getTypeJvmTypeReferenceParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__XCastedExpression__TypeAssignment_1_149162);
+            pushFollow(FOLLOW_2);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -69750,28 +69750,28 @@ public final void rule__XCastedExpression__TypeAssignment_1_1() throws Recogniti
 
 
     // $ANTLR start "rule__XPostfixOperation__FeatureAssignment_1_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24411:1: rule__XPostfixOperation__FeatureAssignment_1_0_1 : ( ( ruleOpPostfix ) ) ;
+    // InternalCheck.g:24411:1: rule__XPostfixOperation__FeatureAssignment_1_0_1 : ( ( ruleOpPostfix ) ) ;
     public final void rule__XPostfixOperation__FeatureAssignment_1_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24415:1: ( ( ( ruleOpPostfix ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24416:1: ( ( ruleOpPostfix ) )
+            // InternalCheck.g:24415:1: ( ( ( ruleOpPostfix ) ) )
+            // InternalCheck.g:24416:1: ( ( ruleOpPostfix ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24416:1: ( ( ruleOpPostfix ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24417:1: ( ruleOpPostfix )
+            // InternalCheck.g:24416:1: ( ( ruleOpPostfix ) )
+            // InternalCheck.g:24417:1: ( ruleOpPostfix )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24418:1: ( ruleOpPostfix )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24419:1: ruleOpPostfix
+            // InternalCheck.g:24418:1: ( ruleOpPostfix )
+            // InternalCheck.g:24419:1: ruleOpPostfix
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getFeatureJvmIdentifiableElementOpPostfixParserRuleCall_1_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpPostfix_in_rule__XPostfixOperation__FeatureAssignment_1_0_149197);
+            pushFollow(FOLLOW_2);
             ruleOpPostfix();
 
             state._fsp--;
@@ -69807,28 +69807,28 @@ public final void rule__XPostfixOperation__FeatureAssignment_1_0_1() throws Reco
 
 
     // $ANTLR start "rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24430:1: rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 : ( ( '::' ) ) ;
+    // InternalCheck.g:24430:1: rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 : ( ( '::' ) ) ;
     public final void rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24434:1: ( ( ( '::' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24435:1: ( ( '::' ) )
+            // InternalCheck.g:24434:1: ( ( ( '::' ) ) )
+            // InternalCheck.g:24435:1: ( ( '::' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24435:1: ( ( '::' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24436:1: ( '::' )
+            // InternalCheck.g:24435:1: ( ( '::' ) )
+            // InternalCheck.g:24436:1: ( '::' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_0_0_0_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24437:1: ( '::' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24438:1: '::'
+            // InternalCheck.g:24437:1: ( '::' )
+            // InternalCheck.g:24438:1: '::'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_0_0_0_1_1_0()); 
             }
-            match(input,104,FOLLOW_104_in_rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_149237); if (state.failed) return ;
+            match(input,104,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_0_0_0_1_1_0()); 
             }
@@ -69860,28 +69860,28 @@ public final void rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1
 
 
     // $ANTLR start "rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24453:1: rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 : ( ( ruleFeatureCallID ) ) ;
+    // InternalCheck.g:24453:1: rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 : ( ( ruleFeatureCallID ) ) ;
     public final void rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24457:1: ( ( ( ruleFeatureCallID ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24458:1: ( ( ruleFeatureCallID ) )
+            // InternalCheck.g:24457:1: ( ( ( ruleFeatureCallID ) ) )
+            // InternalCheck.g:24458:1: ( ( ruleFeatureCallID ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24458:1: ( ( ruleFeatureCallID ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24459:1: ( ruleFeatureCallID )
+            // InternalCheck.g:24458:1: ( ( ruleFeatureCallID ) )
+            // InternalCheck.g:24459:1: ( ruleFeatureCallID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_0_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24460:1: ( ruleFeatureCallID )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24461:1: ruleFeatureCallID
+            // InternalCheck.g:24460:1: ( ruleFeatureCallID )
+            // InternalCheck.g:24461:1: ruleFeatureCallID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getFeatureJvmIdentifiableElementFeatureCallIDParserRuleCall_1_0_0_0_2_0_1()); 
             }
-            pushFollow(FOLLOW_ruleFeatureCallID_in_rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_249280);
+            pushFollow(FOLLOW_2);
             ruleFeatureCallID();
 
             state._fsp--;
@@ -69917,22 +69917,22 @@ public final void rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2() throws
 
 
     // $ANTLR start "rule__XMemberFeatureCall__ValueAssignment_1_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24472:1: rule__XMemberFeatureCall__ValueAssignment_1_0_1 : ( ruleXAssignment ) ;
+    // InternalCheck.g:24472:1: rule__XMemberFeatureCall__ValueAssignment_1_0_1 : ( ruleXAssignment ) ;
     public final void rule__XMemberFeatureCall__ValueAssignment_1_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24476:1: ( ( ruleXAssignment ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24477:1: ( ruleXAssignment )
+            // InternalCheck.g:24476:1: ( ( ruleXAssignment ) )
+            // InternalCheck.g:24477:1: ( ruleXAssignment )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24477:1: ( ruleXAssignment )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24478:1: ruleXAssignment
+            // InternalCheck.g:24477:1: ( ruleXAssignment )
+            // InternalCheck.g:24478:1: ruleXAssignment
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getValueXAssignmentParserRuleCall_1_0_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXAssignment_in_rule__XMemberFeatureCall__ValueAssignment_1_0_149315);
+            pushFollow(FOLLOW_2);
             ruleXAssignment();
 
             state._fsp--;
@@ -69962,28 +69962,28 @@ public final void rule__XMemberFeatureCall__ValueAssignment_1_0_1() throws Recog
 
 
     // $ANTLR start "rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24487:1: rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 : ( ( '?.' ) ) ;
+    // InternalCheck.g:24487:1: rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 : ( ( '?.' ) ) ;
     public final void rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24491:1: ( ( ( '?.' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24492:1: ( ( '?.' ) )
+            // InternalCheck.g:24491:1: ( ( ( '?.' ) ) )
+            // InternalCheck.g:24492:1: ( ( '?.' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24492:1: ( ( '?.' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24493:1: ( '?.' )
+            // InternalCheck.g:24492:1: ( ( '?.' ) )
+            // InternalCheck.g:24493:1: ( '?.' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getNullSafeQuestionMarkFullStopKeyword_1_1_0_0_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24494:1: ( '?.' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24495:1: '?.'
+            // InternalCheck.g:24494:1: ( '?.' )
+            // InternalCheck.g:24495:1: '?.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getNullSafeQuestionMarkFullStopKeyword_1_1_0_0_1_1_0()); 
             }
-            match(input,105,FOLLOW_105_in_rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_149351); if (state.failed) return ;
+            match(input,105,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getNullSafeQuestionMarkFullStopKeyword_1_1_0_0_1_1_0()); 
             }
@@ -70015,28 +70015,28 @@ public final void rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1() thr
 
 
     // $ANTLR start "rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24510:1: rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 : ( ( '::' ) ) ;
+    // InternalCheck.g:24510:1: rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 : ( ( '::' ) ) ;
     public final void rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24514:1: ( ( ( '::' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24515:1: ( ( '::' ) )
+            // InternalCheck.g:24514:1: ( ( ( '::' ) ) )
+            // InternalCheck.g:24515:1: ( ( '::' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24515:1: ( ( '::' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24516:1: ( '::' )
+            // InternalCheck.g:24515:1: ( ( '::' ) )
+            // InternalCheck.g:24516:1: ( '::' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_1_0_0_1_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24517:1: ( '::' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24518:1: '::'
+            // InternalCheck.g:24517:1: ( '::' )
+            // InternalCheck.g:24518:1: '::'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_1_0_0_1_2_0()); 
             }
-            match(input,104,FOLLOW_104_in_rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_249395); if (state.failed) return ;
+            match(input,104,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_1_0_0_1_2_0()); 
             }
@@ -70068,22 +70068,22 @@ public final void rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2
 
 
     // $ANTLR start "rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24533:1: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalCheck.g:24533:1: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24537:1: ( ( ruleJvmArgumentTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24538:1: ( ruleJvmArgumentTypeReference )
+            // InternalCheck.g:24537:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalCheck.g:24538:1: ( ruleJvmArgumentTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24538:1: ( ruleJvmArgumentTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24539:1: ruleJvmArgumentTypeReference
+            // InternalCheck.g:24538:1: ( ruleJvmArgumentTypeReference )
+            // InternalCheck.g:24539:1: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_149434);
+            pushFollow(FOLLOW_2);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -70113,22 +70113,22 @@ public final void rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1() th
 
 
     // $ANTLR start "rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24548:1: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalCheck.g:24548:1: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24552:1: ( ( ruleJvmArgumentTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24553:1: ( ruleJvmArgumentTypeReference )
+            // InternalCheck.g:24552:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalCheck.g:24553:1: ( ruleJvmArgumentTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24553:1: ( ruleJvmArgumentTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24554:1: ruleJvmArgumentTypeReference
+            // InternalCheck.g:24553:1: ( ruleJvmArgumentTypeReference )
+            // InternalCheck.g:24554:1: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_1_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_149465);
+            pushFollow(FOLLOW_2);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -70158,28 +70158,28 @@ public final void rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1()
 
 
     // $ANTLR start "rule__XMemberFeatureCall__FeatureAssignment_1_1_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24563:1: rule__XMemberFeatureCall__FeatureAssignment_1_1_2 : ( ( ruleIdOrSuper ) ) ;
+    // InternalCheck.g:24563:1: rule__XMemberFeatureCall__FeatureAssignment_1_1_2 : ( ( ruleIdOrSuper ) ) ;
     public final void rule__XMemberFeatureCall__FeatureAssignment_1_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24567:1: ( ( ( ruleIdOrSuper ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24568:1: ( ( ruleIdOrSuper ) )
+            // InternalCheck.g:24567:1: ( ( ( ruleIdOrSuper ) ) )
+            // InternalCheck.g:24568:1: ( ( ruleIdOrSuper ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24568:1: ( ( ruleIdOrSuper ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24569:1: ( ruleIdOrSuper )
+            // InternalCheck.g:24568:1: ( ( ruleIdOrSuper ) )
+            // InternalCheck.g:24569:1: ( ruleIdOrSuper )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getFeatureJvmIdentifiableElementCrossReference_1_1_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24570:1: ( ruleIdOrSuper )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24571:1: ruleIdOrSuper
+            // InternalCheck.g:24570:1: ( ruleIdOrSuper )
+            // InternalCheck.g:24571:1: ruleIdOrSuper
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getFeatureJvmIdentifiableElementIdOrSuperParserRuleCall_1_1_2_0_1()); 
             }
-            pushFollow(FOLLOW_ruleIdOrSuper_in_rule__XMemberFeatureCall__FeatureAssignment_1_1_249500);
+            pushFollow(FOLLOW_2);
             ruleIdOrSuper();
 
             state._fsp--;
@@ -70215,28 +70215,28 @@ public final void rule__XMemberFeatureCall__FeatureAssignment_1_1_2() throws Rec
 
 
     // $ANTLR start "rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24582:1: rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 : ( ( '(' ) ) ;
+    // InternalCheck.g:24582:1: rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 : ( ( '(' ) ) ;
     public final void rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24586:1: ( ( ( '(' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24587:1: ( ( '(' ) )
+            // InternalCheck.g:24586:1: ( ( ( '(' ) ) )
+            // InternalCheck.g:24587:1: ( ( '(' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24587:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24588:1: ( '(' )
+            // InternalCheck.g:24587:1: ( ( '(' ) )
+            // InternalCheck.g:24588:1: ( '(' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_1_1_3_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24589:1: ( '(' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24590:1: '('
+            // InternalCheck.g:24589:1: ( '(' )
+            // InternalCheck.g:24590:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_1_1_3_0_0()); 
             }
-            match(input,72,FOLLOW_72_in_rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_049540); if (state.failed) return ;
+            match(input,72,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_1_1_3_0_0()); 
             }
@@ -70268,22 +70268,22 @@ public final void rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_
 
 
     // $ANTLR start "rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24605:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 : ( ruleXShortClosure ) ;
+    // InternalCheck.g:24605:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 : ( ruleXShortClosure ) ;
     public final void rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24609:1: ( ( ruleXShortClosure ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24610:1: ( ruleXShortClosure )
+            // InternalCheck.g:24609:1: ( ( ruleXShortClosure ) )
+            // InternalCheck.g:24610:1: ( ruleXShortClosure )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24610:1: ( ruleXShortClosure )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24611:1: ruleXShortClosure
+            // InternalCheck.g:24610:1: ( ruleXShortClosure )
+            // InternalCheck.g:24611:1: ruleXShortClosure
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXShortClosureParserRuleCall_1_1_3_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXShortClosure_in_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_049579);
+            pushFollow(FOLLOW_2);
             ruleXShortClosure();
 
             state._fsp--;
@@ -70313,22 +70313,22 @@ public final void rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_
 
 
     // $ANTLR start "rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24620:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 : ( ruleXExpression ) ;
+    // InternalCheck.g:24620:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 : ( ruleXExpression ) ;
     public final void rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24624:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24625:1: ( ruleXExpression )
+            // InternalCheck.g:24624:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:24625:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24625:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24626:1: ruleXExpression
+            // InternalCheck.g:24625:1: ( ruleXExpression )
+            // InternalCheck.g:24626:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXExpressionParserRuleCall_1_1_3_1_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_049610);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -70358,22 +70358,22 @@ public final void rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_
 
 
     // $ANTLR start "rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24635:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 : ( ruleXExpression ) ;
+    // InternalCheck.g:24635:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 : ( ruleXExpression ) ;
     public final void rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24639:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24640:1: ( ruleXExpression )
+            // InternalCheck.g:24639:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:24640:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24640:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24641:1: ruleXExpression
+            // InternalCheck.g:24640:1: ( ruleXExpression )
+            // InternalCheck.g:24641:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXExpressionParserRuleCall_1_1_3_1_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_149641);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -70403,22 +70403,22 @@ public final void rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_
 
 
     // $ANTLR start "rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24650:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 : ( ruleXClosure ) ;
+    // InternalCheck.g:24650:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 : ( ruleXClosure ) ;
     public final void rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24654:1: ( ( ruleXClosure ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24655:1: ( ruleXClosure )
+            // InternalCheck.g:24654:1: ( ( ruleXClosure ) )
+            // InternalCheck.g:24655:1: ( ruleXClosure )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24655:1: ( ruleXClosure )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24656:1: ruleXClosure
+            // InternalCheck.g:24655:1: ( ruleXClosure )
+            // InternalCheck.g:24656:1: ruleXClosure
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXClosureParserRuleCall_1_1_4_0()); 
             }
-            pushFollow(FOLLOW_ruleXClosure_in_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_449672);
+            pushFollow(FOLLOW_2);
             ruleXClosure();
 
             state._fsp--;
@@ -70448,22 +70448,22 @@ public final void rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4(
 
 
     // $ANTLR start "rule__XSetLiteral__ElementsAssignment_3_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24665:1: rule__XSetLiteral__ElementsAssignment_3_0 : ( ruleXExpression ) ;
+    // InternalCheck.g:24665:1: rule__XSetLiteral__ElementsAssignment_3_0 : ( ruleXExpression ) ;
     public final void rule__XSetLiteral__ElementsAssignment_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24669:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24670:1: ( ruleXExpression )
+            // InternalCheck.g:24669:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:24670:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24670:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24671:1: ruleXExpression
+            // InternalCheck.g:24670:1: ( ruleXExpression )
+            // InternalCheck.g:24671:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getElementsXExpressionParserRuleCall_3_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XSetLiteral__ElementsAssignment_3_049703);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -70493,22 +70493,22 @@ public final void rule__XSetLiteral__ElementsAssignment_3_0() throws Recognition
 
 
     // $ANTLR start "rule__XSetLiteral__ElementsAssignment_3_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24680:1: rule__XSetLiteral__ElementsAssignment_3_1_1 : ( ruleXExpression ) ;
+    // InternalCheck.g:24680:1: rule__XSetLiteral__ElementsAssignment_3_1_1 : ( ruleXExpression ) ;
     public final void rule__XSetLiteral__ElementsAssignment_3_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24684:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24685:1: ( ruleXExpression )
+            // InternalCheck.g:24684:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:24685:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24685:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24686:1: ruleXExpression
+            // InternalCheck.g:24685:1: ( ruleXExpression )
+            // InternalCheck.g:24686:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getElementsXExpressionParserRuleCall_3_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XSetLiteral__ElementsAssignment_3_1_149734);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -70538,22 +70538,22 @@ public final void rule__XSetLiteral__ElementsAssignment_3_1_1() throws Recogniti
 
 
     // $ANTLR start "rule__XListLiteral__ElementsAssignment_3_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24695:1: rule__XListLiteral__ElementsAssignment_3_0 : ( ruleXExpression ) ;
+    // InternalCheck.g:24695:1: rule__XListLiteral__ElementsAssignment_3_0 : ( ruleXExpression ) ;
     public final void rule__XListLiteral__ElementsAssignment_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24699:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24700:1: ( ruleXExpression )
+            // InternalCheck.g:24699:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:24700:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24700:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24701:1: ruleXExpression
+            // InternalCheck.g:24700:1: ( ruleXExpression )
+            // InternalCheck.g:24701:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getElementsXExpressionParserRuleCall_3_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XListLiteral__ElementsAssignment_3_049765);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -70583,22 +70583,22 @@ public final void rule__XListLiteral__ElementsAssignment_3_0() throws Recognitio
 
 
     // $ANTLR start "rule__XListLiteral__ElementsAssignment_3_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24710:1: rule__XListLiteral__ElementsAssignment_3_1_1 : ( ruleXExpression ) ;
+    // InternalCheck.g:24710:1: rule__XListLiteral__ElementsAssignment_3_1_1 : ( ruleXExpression ) ;
     public final void rule__XListLiteral__ElementsAssignment_3_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24714:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24715:1: ( ruleXExpression )
+            // InternalCheck.g:24714:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:24715:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24715:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24716:1: ruleXExpression
+            // InternalCheck.g:24715:1: ( ruleXExpression )
+            // InternalCheck.g:24716:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getElementsXExpressionParserRuleCall_3_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XListLiteral__ElementsAssignment_3_1_149796);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -70628,22 +70628,22 @@ public final void rule__XListLiteral__ElementsAssignment_3_1_1() throws Recognit
 
 
     // $ANTLR start "rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24725:1: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 : ( ruleJvmFormalParameter ) ;
+    // InternalCheck.g:24725:1: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 : ( ruleJvmFormalParameter ) ;
     public final void rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24729:1: ( ( ruleJvmFormalParameter ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24730:1: ( ruleJvmFormalParameter )
+            // InternalCheck.g:24729:1: ( ( ruleJvmFormalParameter ) )
+            // InternalCheck.g:24730:1: ( ruleJvmFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24730:1: ( ruleJvmFormalParameter )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24731:1: ruleJvmFormalParameter
+            // InternalCheck.g:24730:1: ( ruleJvmFormalParameter )
+            // InternalCheck.g:24731:1: ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_1_0_0_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmFormalParameter_in_rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_049827);
+            pushFollow(FOLLOW_2);
             ruleJvmFormalParameter();
 
             state._fsp--;
@@ -70673,22 +70673,22 @@ public final void rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0() t
 
 
     // $ANTLR start "rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24740:1: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 : ( ruleJvmFormalParameter ) ;
+    // InternalCheck.g:24740:1: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 : ( ruleJvmFormalParameter ) ;
     public final void rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24744:1: ( ( ruleJvmFormalParameter ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24745:1: ( ruleJvmFormalParameter )
+            // InternalCheck.g:24744:1: ( ( ruleJvmFormalParameter ) )
+            // InternalCheck.g:24745:1: ( ruleJvmFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24745:1: ( ruleJvmFormalParameter )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24746:1: ruleJvmFormalParameter
+            // InternalCheck.g:24745:1: ( ruleJvmFormalParameter )
+            // InternalCheck.g:24746:1: ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_1_0_0_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmFormalParameter_in_rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_149858);
+            pushFollow(FOLLOW_2);
             ruleJvmFormalParameter();
 
             state._fsp--;
@@ -70718,28 +70718,28 @@ public final void rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1()
 
 
     // $ANTLR start "rule__XClosure__ExplicitSyntaxAssignment_1_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24755:1: rule__XClosure__ExplicitSyntaxAssignment_1_0_1 : ( ( '|' ) ) ;
+    // InternalCheck.g:24755:1: rule__XClosure__ExplicitSyntaxAssignment_1_0_1 : ( ( '|' ) ) ;
     public final void rule__XClosure__ExplicitSyntaxAssignment_1_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24759:1: ( ( ( '|' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24760:1: ( ( '|' ) )
+            // InternalCheck.g:24759:1: ( ( ( '|' ) ) )
+            // InternalCheck.g:24760:1: ( ( '|' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24760:1: ( ( '|' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24761:1: ( '|' )
+            // InternalCheck.g:24760:1: ( ( '|' ) )
+            // InternalCheck.g:24761:1: ( '|' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getExplicitSyntaxVerticalLineKeyword_1_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24762:1: ( '|' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24763:1: '|'
+            // InternalCheck.g:24762:1: ( '|' )
+            // InternalCheck.g:24763:1: '|'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getExplicitSyntaxVerticalLineKeyword_1_0_1_0()); 
             }
-            match(input,106,FOLLOW_106_in_rule__XClosure__ExplicitSyntaxAssignment_1_0_149894); if (state.failed) return ;
+            match(input,106,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXClosureAccess().getExplicitSyntaxVerticalLineKeyword_1_0_1_0()); 
             }
@@ -70771,22 +70771,22 @@ public final void rule__XClosure__ExplicitSyntaxAssignment_1_0_1() throws Recogn
 
 
     // $ANTLR start "rule__XClosure__ExpressionAssignment_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24778:1: rule__XClosure__ExpressionAssignment_2 : ( ruleXExpressionInClosure ) ;
+    // InternalCheck.g:24778:1: rule__XClosure__ExpressionAssignment_2 : ( ruleXExpressionInClosure ) ;
     public final void rule__XClosure__ExpressionAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24782:1: ( ( ruleXExpressionInClosure ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24783:1: ( ruleXExpressionInClosure )
+            // InternalCheck.g:24782:1: ( ( ruleXExpressionInClosure ) )
+            // InternalCheck.g:24783:1: ( ruleXExpressionInClosure )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24783:1: ( ruleXExpressionInClosure )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24784:1: ruleXExpressionInClosure
+            // InternalCheck.g:24783:1: ( ruleXExpressionInClosure )
+            // InternalCheck.g:24784:1: ruleXExpressionInClosure
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getExpressionXExpressionInClosureParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpressionInClosure_in_rule__XClosure__ExpressionAssignment_249933);
+            pushFollow(FOLLOW_2);
             ruleXExpressionInClosure();
 
             state._fsp--;
@@ -70816,22 +70816,22 @@ public final void rule__XClosure__ExpressionAssignment_2() throws RecognitionExc
 
 
     // $ANTLR start "rule__XExpressionInClosure__ExpressionsAssignment_1_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24793:1: rule__XExpressionInClosure__ExpressionsAssignment_1_0 : ( ruleXExpressionOrVarDeclaration ) ;
+    // InternalCheck.g:24793:1: rule__XExpressionInClosure__ExpressionsAssignment_1_0 : ( ruleXExpressionOrVarDeclaration ) ;
     public final void rule__XExpressionInClosure__ExpressionsAssignment_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24797:1: ( ( ruleXExpressionOrVarDeclaration ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24798:1: ( ruleXExpressionOrVarDeclaration )
+            // InternalCheck.g:24797:1: ( ( ruleXExpressionOrVarDeclaration ) )
+            // InternalCheck.g:24798:1: ( ruleXExpressionOrVarDeclaration )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24798:1: ( ruleXExpressionOrVarDeclaration )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24799:1: ruleXExpressionOrVarDeclaration
+            // InternalCheck.g:24798:1: ( ruleXExpressionOrVarDeclaration )
+            // InternalCheck.g:24799:1: ruleXExpressionOrVarDeclaration
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionInClosureAccess().getExpressionsXExpressionOrVarDeclarationParserRuleCall_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_rule__XExpressionInClosure__ExpressionsAssignment_1_049964);
+            pushFollow(FOLLOW_2);
             ruleXExpressionOrVarDeclaration();
 
             state._fsp--;
@@ -70861,22 +70861,22 @@ public final void rule__XExpressionInClosure__ExpressionsAssignment_1_0() throws
 
 
     // $ANTLR start "rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24808:1: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 : ( ruleJvmFormalParameter ) ;
+    // InternalCheck.g:24808:1: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 : ( ruleJvmFormalParameter ) ;
     public final void rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24812:1: ( ( ruleJvmFormalParameter ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24813:1: ( ruleJvmFormalParameter )
+            // InternalCheck.g:24812:1: ( ( ruleJvmFormalParameter ) )
+            // InternalCheck.g:24813:1: ( ruleJvmFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24813:1: ( ruleJvmFormalParameter )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24814:1: ruleJvmFormalParameter
+            // InternalCheck.g:24813:1: ( ruleJvmFormalParameter )
+            // InternalCheck.g:24814:1: ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_0_0_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmFormalParameter_in_rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_049995);
+            pushFollow(FOLLOW_2);
             ruleJvmFormalParameter();
 
             state._fsp--;
@@ -70906,22 +70906,22 @@ public final void rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_
 
 
     // $ANTLR start "rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24823:1: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 : ( ruleJvmFormalParameter ) ;
+    // InternalCheck.g:24823:1: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 : ( ruleJvmFormalParameter ) ;
     public final void rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24827:1: ( ( ruleJvmFormalParameter ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24828:1: ( ruleJvmFormalParameter )
+            // InternalCheck.g:24827:1: ( ( ruleJvmFormalParameter ) )
+            // InternalCheck.g:24828:1: ( ruleJvmFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24828:1: ( ruleJvmFormalParameter )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24829:1: ruleJvmFormalParameter
+            // InternalCheck.g:24828:1: ( ruleJvmFormalParameter )
+            // InternalCheck.g:24829:1: ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_0_0_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmFormalParameter_in_rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_150026);
+            pushFollow(FOLLOW_2);
             ruleJvmFormalParameter();
 
             state._fsp--;
@@ -70951,28 +70951,28 @@ public final void rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_
 
 
     // $ANTLR start "rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24838:1: rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 : ( ( '|' ) ) ;
+    // InternalCheck.g:24838:1: rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 : ( ( '|' ) ) ;
     public final void rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24842:1: ( ( ( '|' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24843:1: ( ( '|' ) )
+            // InternalCheck.g:24842:1: ( ( ( '|' ) ) )
+            // InternalCheck.g:24843:1: ( ( '|' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24843:1: ( ( '|' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24844:1: ( '|' )
+            // InternalCheck.g:24843:1: ( ( '|' ) )
+            // InternalCheck.g:24844:1: ( '|' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getExplicitSyntaxVerticalLineKeyword_0_0_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24845:1: ( '|' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24846:1: '|'
+            // InternalCheck.g:24845:1: ( '|' )
+            // InternalCheck.g:24846:1: '|'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getExplicitSyntaxVerticalLineKeyword_0_0_2_0()); 
             }
-            match(input,106,FOLLOW_106_in_rule__XShortClosure__ExplicitSyntaxAssignment_0_0_250062); if (state.failed) return ;
+            match(input,106,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXShortClosureAccess().getExplicitSyntaxVerticalLineKeyword_0_0_2_0()); 
             }
@@ -71004,22 +71004,22 @@ public final void rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2() throws R
 
 
     // $ANTLR start "rule__XShortClosure__ExpressionAssignment_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24861:1: rule__XShortClosure__ExpressionAssignment_1 : ( ruleXExpression ) ;
+    // InternalCheck.g:24861:1: rule__XShortClosure__ExpressionAssignment_1 : ( ruleXExpression ) ;
     public final void rule__XShortClosure__ExpressionAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24865:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24866:1: ( ruleXExpression )
+            // InternalCheck.g:24865:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:24866:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24866:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24867:1: ruleXExpression
+            // InternalCheck.g:24866:1: ( ruleXExpression )
+            // InternalCheck.g:24867:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getExpressionXExpressionParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XShortClosure__ExpressionAssignment_150101);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -71049,22 +71049,22 @@ public final void rule__XShortClosure__ExpressionAssignment_1() throws Recogniti
 
 
     // $ANTLR start "rule__XIfExpression__IfAssignment_3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24876:1: rule__XIfExpression__IfAssignment_3 : ( ruleXExpression ) ;
+    // InternalCheck.g:24876:1: rule__XIfExpression__IfAssignment_3 : ( ruleXExpression ) ;
     public final void rule__XIfExpression__IfAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24880:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24881:1: ( ruleXExpression )
+            // InternalCheck.g:24880:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:24881:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24881:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24882:1: ruleXExpression
+            // InternalCheck.g:24881:1: ( ruleXExpression )
+            // InternalCheck.g:24882:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getIfXExpressionParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XIfExpression__IfAssignment_350132);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -71094,22 +71094,22 @@ public final void rule__XIfExpression__IfAssignment_3() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XIfExpression__ThenAssignment_5"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24891:1: rule__XIfExpression__ThenAssignment_5 : ( ruleXExpression ) ;
+    // InternalCheck.g:24891:1: rule__XIfExpression__ThenAssignment_5 : ( ruleXExpression ) ;
     public final void rule__XIfExpression__ThenAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24895:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24896:1: ( ruleXExpression )
+            // InternalCheck.g:24895:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:24896:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24896:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24897:1: ruleXExpression
+            // InternalCheck.g:24896:1: ( ruleXExpression )
+            // InternalCheck.g:24897:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getThenXExpressionParserRuleCall_5_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XIfExpression__ThenAssignment_550163);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -71139,22 +71139,22 @@ public final void rule__XIfExpression__ThenAssignment_5() throws RecognitionExce
 
 
     // $ANTLR start "rule__XIfExpression__ElseAssignment_6_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24906:1: rule__XIfExpression__ElseAssignment_6_1 : ( ruleXExpression ) ;
+    // InternalCheck.g:24906:1: rule__XIfExpression__ElseAssignment_6_1 : ( ruleXExpression ) ;
     public final void rule__XIfExpression__ElseAssignment_6_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24910:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24911:1: ( ruleXExpression )
+            // InternalCheck.g:24910:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:24911:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24911:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24912:1: ruleXExpression
+            // InternalCheck.g:24911:1: ( ruleXExpression )
+            // InternalCheck.g:24912:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getElseXExpressionParserRuleCall_6_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XIfExpression__ElseAssignment_6_150194);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -71184,22 +71184,22 @@ public final void rule__XIfExpression__ElseAssignment_6_1() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24921:1: rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 : ( ruleJvmFormalParameter ) ;
+    // InternalCheck.g:24921:1: rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 : ( ruleJvmFormalParameter ) ;
     public final void rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24925:1: ( ( ruleJvmFormalParameter ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24926:1: ( ruleJvmFormalParameter )
+            // InternalCheck.g:24925:1: ( ( ruleJvmFormalParameter ) )
+            // InternalCheck.g:24926:1: ( ruleJvmFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24926:1: ( ruleJvmFormalParameter )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24927:1: ruleJvmFormalParameter
+            // InternalCheck.g:24926:1: ( ruleJvmFormalParameter )
+            // InternalCheck.g:24927:1: ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getDeclaredParamJvmFormalParameterParserRuleCall_2_0_0_0_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmFormalParameter_in_rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_150225);
+            pushFollow(FOLLOW_2);
             ruleJvmFormalParameter();
 
             state._fsp--;
@@ -71229,22 +71229,22 @@ public final void rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1() t
 
 
     // $ANTLR start "rule__XSwitchExpression__SwitchAssignment_2_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24936:1: rule__XSwitchExpression__SwitchAssignment_2_0_1 : ( ruleXExpression ) ;
+    // InternalCheck.g:24936:1: rule__XSwitchExpression__SwitchAssignment_2_0_1 : ( ruleXExpression ) ;
     public final void rule__XSwitchExpression__SwitchAssignment_2_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24940:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24941:1: ( ruleXExpression )
+            // InternalCheck.g:24940:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:24941:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24941:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24942:1: ruleXExpression
+            // InternalCheck.g:24941:1: ( ruleXExpression )
+            // InternalCheck.g:24942:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getSwitchXExpressionParserRuleCall_2_0_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XSwitchExpression__SwitchAssignment_2_0_150256);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -71274,22 +71274,22 @@ public final void rule__XSwitchExpression__SwitchAssignment_2_0_1() throws Recog
 
 
     // $ANTLR start "rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24951:1: rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 : ( ruleJvmFormalParameter ) ;
+    // InternalCheck.g:24951:1: rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 : ( ruleJvmFormalParameter ) ;
     public final void rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24955:1: ( ( ruleJvmFormalParameter ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24956:1: ( ruleJvmFormalParameter )
+            // InternalCheck.g:24955:1: ( ( ruleJvmFormalParameter ) )
+            // InternalCheck.g:24956:1: ( ruleJvmFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24956:1: ( ruleJvmFormalParameter )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24957:1: ruleJvmFormalParameter
+            // InternalCheck.g:24956:1: ( ruleJvmFormalParameter )
+            // InternalCheck.g:24957:1: ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getDeclaredParamJvmFormalParameterParserRuleCall_2_1_0_0_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmFormalParameter_in_rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_050287);
+            pushFollow(FOLLOW_2);
             ruleJvmFormalParameter();
 
             state._fsp--;
@@ -71319,22 +71319,22 @@ public final void rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0() t
 
 
     // $ANTLR start "rule__XSwitchExpression__SwitchAssignment_2_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24966:1: rule__XSwitchExpression__SwitchAssignment_2_1_1 : ( ruleXExpression ) ;
+    // InternalCheck.g:24966:1: rule__XSwitchExpression__SwitchAssignment_2_1_1 : ( ruleXExpression ) ;
     public final void rule__XSwitchExpression__SwitchAssignment_2_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24970:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24971:1: ( ruleXExpression )
+            // InternalCheck.g:24970:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:24971:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24971:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24972:1: ruleXExpression
+            // InternalCheck.g:24971:1: ( ruleXExpression )
+            // InternalCheck.g:24972:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getSwitchXExpressionParserRuleCall_2_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XSwitchExpression__SwitchAssignment_2_1_150318);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -71364,22 +71364,22 @@ public final void rule__XSwitchExpression__SwitchAssignment_2_1_1() throws Recog
 
 
     // $ANTLR start "rule__XSwitchExpression__CasesAssignment_4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24981:1: rule__XSwitchExpression__CasesAssignment_4 : ( ruleXCasePart ) ;
+    // InternalCheck.g:24981:1: rule__XSwitchExpression__CasesAssignment_4 : ( ruleXCasePart ) ;
     public final void rule__XSwitchExpression__CasesAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24985:1: ( ( ruleXCasePart ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24986:1: ( ruleXCasePart )
+            // InternalCheck.g:24985:1: ( ( ruleXCasePart ) )
+            // InternalCheck.g:24986:1: ( ruleXCasePart )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24986:1: ( ruleXCasePart )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24987:1: ruleXCasePart
+            // InternalCheck.g:24986:1: ( ruleXCasePart )
+            // InternalCheck.g:24987:1: ruleXCasePart
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getCasesXCasePartParserRuleCall_4_0()); 
             }
-            pushFollow(FOLLOW_ruleXCasePart_in_rule__XSwitchExpression__CasesAssignment_450349);
+            pushFollow(FOLLOW_2);
             ruleXCasePart();
 
             state._fsp--;
@@ -71409,22 +71409,22 @@ public final void rule__XSwitchExpression__CasesAssignment_4() throws Recognitio
 
 
     // $ANTLR start "rule__XSwitchExpression__DefaultAssignment_5_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:24996:1: rule__XSwitchExpression__DefaultAssignment_5_2 : ( ruleXExpression ) ;
+    // InternalCheck.g:24996:1: rule__XSwitchExpression__DefaultAssignment_5_2 : ( ruleXExpression ) ;
     public final void rule__XSwitchExpression__DefaultAssignment_5_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25000:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25001:1: ( ruleXExpression )
+            // InternalCheck.g:25000:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:25001:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25001:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25002:1: ruleXExpression
+            // InternalCheck.g:25001:1: ( ruleXExpression )
+            // InternalCheck.g:25002:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getDefaultXExpressionParserRuleCall_5_2_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XSwitchExpression__DefaultAssignment_5_250380);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -71454,22 +71454,22 @@ public final void rule__XSwitchExpression__DefaultAssignment_5_2() throws Recogn
 
 
     // $ANTLR start "rule__XCasePart__TypeGuardAssignment_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25011:1: rule__XCasePart__TypeGuardAssignment_1 : ( ruleJvmTypeReference ) ;
+    // InternalCheck.g:25011:1: rule__XCasePart__TypeGuardAssignment_1 : ( ruleJvmTypeReference ) ;
     public final void rule__XCasePart__TypeGuardAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25015:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25016:1: ( ruleJvmTypeReference )
+            // InternalCheck.g:25015:1: ( ( ruleJvmTypeReference ) )
+            // InternalCheck.g:25016:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25016:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25017:1: ruleJvmTypeReference
+            // InternalCheck.g:25016:1: ( ruleJvmTypeReference )
+            // InternalCheck.g:25017:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getTypeGuardJvmTypeReferenceParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__XCasePart__TypeGuardAssignment_150411);
+            pushFollow(FOLLOW_2);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -71499,22 +71499,22 @@ public final void rule__XCasePart__TypeGuardAssignment_1() throws RecognitionExc
 
 
     // $ANTLR start "rule__XCasePart__CaseAssignment_2_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25026:1: rule__XCasePart__CaseAssignment_2_1 : ( ruleXExpression ) ;
+    // InternalCheck.g:25026:1: rule__XCasePart__CaseAssignment_2_1 : ( ruleXExpression ) ;
     public final void rule__XCasePart__CaseAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25030:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25031:1: ( ruleXExpression )
+            // InternalCheck.g:25030:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:25031:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25031:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25032:1: ruleXExpression
+            // InternalCheck.g:25031:1: ( ruleXExpression )
+            // InternalCheck.g:25032:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getCaseXExpressionParserRuleCall_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XCasePart__CaseAssignment_2_150442);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -71544,22 +71544,22 @@ public final void rule__XCasePart__CaseAssignment_2_1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XCasePart__ThenAssignment_3_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25041:1: rule__XCasePart__ThenAssignment_3_0_1 : ( ruleXExpression ) ;
+    // InternalCheck.g:25041:1: rule__XCasePart__ThenAssignment_3_0_1 : ( ruleXExpression ) ;
     public final void rule__XCasePart__ThenAssignment_3_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25045:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25046:1: ( ruleXExpression )
+            // InternalCheck.g:25045:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:25046:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25046:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25047:1: ruleXExpression
+            // InternalCheck.g:25046:1: ( ruleXExpression )
+            // InternalCheck.g:25047:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getThenXExpressionParserRuleCall_3_0_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XCasePart__ThenAssignment_3_0_150473);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -71589,28 +71589,28 @@ public final void rule__XCasePart__ThenAssignment_3_0_1() throws RecognitionExce
 
 
     // $ANTLR start "rule__XCasePart__FallThroughAssignment_3_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25056:1: rule__XCasePart__FallThroughAssignment_3_1 : ( ( ',' ) ) ;
+    // InternalCheck.g:25056:1: rule__XCasePart__FallThroughAssignment_3_1 : ( ( ',' ) ) ;
     public final void rule__XCasePart__FallThroughAssignment_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25060:1: ( ( ( ',' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25061:1: ( ( ',' ) )
+            // InternalCheck.g:25060:1: ( ( ( ',' ) ) )
+            // InternalCheck.g:25061:1: ( ( ',' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25061:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25062:1: ( ',' )
+            // InternalCheck.g:25061:1: ( ( ',' ) )
+            // InternalCheck.g:25062:1: ( ',' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getFallThroughCommaKeyword_3_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25063:1: ( ',' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25064:1: ','
+            // InternalCheck.g:25063:1: ( ',' )
+            // InternalCheck.g:25064:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getFallThroughCommaKeyword_3_1_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XCasePart__FallThroughAssignment_3_150509); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXCasePartAccess().getFallThroughCommaKeyword_3_1_0()); 
             }
@@ -71642,22 +71642,22 @@ public final void rule__XCasePart__FallThroughAssignment_3_1() throws Recognitio
 
 
     // $ANTLR start "rule__XForLoopExpression__DeclaredParamAssignment_0_0_3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25079:1: rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 : ( ruleJvmFormalParameter ) ;
+    // InternalCheck.g:25079:1: rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 : ( ruleJvmFormalParameter ) ;
     public final void rule__XForLoopExpression__DeclaredParamAssignment_0_0_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25083:1: ( ( ruleJvmFormalParameter ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25084:1: ( ruleJvmFormalParameter )
+            // InternalCheck.g:25083:1: ( ( ruleJvmFormalParameter ) )
+            // InternalCheck.g:25084:1: ( ruleJvmFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25084:1: ( ruleJvmFormalParameter )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25085:1: ruleJvmFormalParameter
+            // InternalCheck.g:25084:1: ( ruleJvmFormalParameter )
+            // InternalCheck.g:25085:1: ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getDeclaredParamJvmFormalParameterParserRuleCall_0_0_3_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmFormalParameter_in_rule__XForLoopExpression__DeclaredParamAssignment_0_0_350548);
+            pushFollow(FOLLOW_2);
             ruleJvmFormalParameter();
 
             state._fsp--;
@@ -71687,22 +71687,22 @@ public final void rule__XForLoopExpression__DeclaredParamAssignment_0_0_3() thro
 
 
     // $ANTLR start "rule__XForLoopExpression__ForExpressionAssignment_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25094:1: rule__XForLoopExpression__ForExpressionAssignment_1 : ( ruleXExpression ) ;
+    // InternalCheck.g:25094:1: rule__XForLoopExpression__ForExpressionAssignment_1 : ( ruleXExpression ) ;
     public final void rule__XForLoopExpression__ForExpressionAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25098:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25099:1: ( ruleXExpression )
+            // InternalCheck.g:25098:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:25099:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25099:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25100:1: ruleXExpression
+            // InternalCheck.g:25099:1: ( ruleXExpression )
+            // InternalCheck.g:25100:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getForExpressionXExpressionParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XForLoopExpression__ForExpressionAssignment_150579);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -71732,22 +71732,22 @@ public final void rule__XForLoopExpression__ForExpressionAssignment_1() throws R
 
 
     // $ANTLR start "rule__XForLoopExpression__EachExpressionAssignment_3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25109:1: rule__XForLoopExpression__EachExpressionAssignment_3 : ( ruleXExpression ) ;
+    // InternalCheck.g:25109:1: rule__XForLoopExpression__EachExpressionAssignment_3 : ( ruleXExpression ) ;
     public final void rule__XForLoopExpression__EachExpressionAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25113:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25114:1: ( ruleXExpression )
+            // InternalCheck.g:25113:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:25114:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25114:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25115:1: ruleXExpression
+            // InternalCheck.g:25114:1: ( ruleXExpression )
+            // InternalCheck.g:25115:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getEachExpressionXExpressionParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XForLoopExpression__EachExpressionAssignment_350610);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -71777,22 +71777,22 @@ public final void rule__XForLoopExpression__EachExpressionAssignment_3() throws
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25124:1: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 : ( ruleXExpressionOrVarDeclaration ) ;
+    // InternalCheck.g:25124:1: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 : ( ruleXExpressionOrVarDeclaration ) ;
     public final void rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25128:1: ( ( ruleXExpressionOrVarDeclaration ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25129:1: ( ruleXExpressionOrVarDeclaration )
+            // InternalCheck.g:25128:1: ( ( ruleXExpressionOrVarDeclaration ) )
+            // InternalCheck.g:25129:1: ( ruleXExpressionOrVarDeclaration )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25129:1: ( ruleXExpressionOrVarDeclaration )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25130:1: ruleXExpressionOrVarDeclaration
+            // InternalCheck.g:25129:1: ( ruleXExpressionOrVarDeclaration )
+            // InternalCheck.g:25130:1: ruleXExpressionOrVarDeclaration
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getInitExpressionsXExpressionOrVarDeclarationParserRuleCall_3_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_rule__XBasicForLoopExpression__InitExpressionsAssignment_3_050641);
+            pushFollow(FOLLOW_2);
             ruleXExpressionOrVarDeclaration();
 
             state._fsp--;
@@ -71822,22 +71822,22 @@ public final void rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0()
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25139:1: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 : ( ruleXExpressionOrVarDeclaration ) ;
+    // InternalCheck.g:25139:1: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 : ( ruleXExpressionOrVarDeclaration ) ;
     public final void rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25143:1: ( ( ruleXExpressionOrVarDeclaration ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25144:1: ( ruleXExpressionOrVarDeclaration )
+            // InternalCheck.g:25143:1: ( ( ruleXExpressionOrVarDeclaration ) )
+            // InternalCheck.g:25144:1: ( ruleXExpressionOrVarDeclaration )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25144:1: ( ruleXExpressionOrVarDeclaration )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25145:1: ruleXExpressionOrVarDeclaration
+            // InternalCheck.g:25144:1: ( ruleXExpressionOrVarDeclaration )
+            // InternalCheck.g:25145:1: ruleXExpressionOrVarDeclaration
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getInitExpressionsXExpressionOrVarDeclarationParserRuleCall_3_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_150672);
+            pushFollow(FOLLOW_2);
             ruleXExpressionOrVarDeclaration();
 
             state._fsp--;
@@ -71867,22 +71867,22 @@ public final void rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__ExpressionAssignment_5"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25154:1: rule__XBasicForLoopExpression__ExpressionAssignment_5 : ( ruleXExpression ) ;
+    // InternalCheck.g:25154:1: rule__XBasicForLoopExpression__ExpressionAssignment_5 : ( ruleXExpression ) ;
     public final void rule__XBasicForLoopExpression__ExpressionAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25158:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25159:1: ( ruleXExpression )
+            // InternalCheck.g:25158:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:25159:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25159:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25160:1: ruleXExpression
+            // InternalCheck.g:25159:1: ( ruleXExpression )
+            // InternalCheck.g:25160:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getExpressionXExpressionParserRuleCall_5_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XBasicForLoopExpression__ExpressionAssignment_550703);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -71912,22 +71912,22 @@ public final void rule__XBasicForLoopExpression__ExpressionAssignment_5() throws
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25169:1: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 : ( ruleXExpression ) ;
+    // InternalCheck.g:25169:1: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 : ( ruleXExpression ) ;
     public final void rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25173:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25174:1: ( ruleXExpression )
+            // InternalCheck.g:25173:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:25174:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25174:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25175:1: ruleXExpression
+            // InternalCheck.g:25174:1: ( ruleXExpression )
+            // InternalCheck.g:25175:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getUpdateExpressionsXExpressionParserRuleCall_7_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_050734);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -71957,22 +71957,22 @@ public final void rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25184:1: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 : ( ruleXExpression ) ;
+    // InternalCheck.g:25184:1: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 : ( ruleXExpression ) ;
     public final void rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25188:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25189:1: ( ruleXExpression )
+            // InternalCheck.g:25188:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:25189:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25189:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25190:1: ruleXExpression
+            // InternalCheck.g:25189:1: ( ruleXExpression )
+            // InternalCheck.g:25190:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getUpdateExpressionsXExpressionParserRuleCall_7_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_150765);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -72002,22 +72002,22 @@ public final void rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__EachExpressionAssignment_9"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25199:1: rule__XBasicForLoopExpression__EachExpressionAssignment_9 : ( ruleXExpression ) ;
+    // InternalCheck.g:25199:1: rule__XBasicForLoopExpression__EachExpressionAssignment_9 : ( ruleXExpression ) ;
     public final void rule__XBasicForLoopExpression__EachExpressionAssignment_9() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25203:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25204:1: ( ruleXExpression )
+            // InternalCheck.g:25203:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:25204:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25204:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25205:1: ruleXExpression
+            // InternalCheck.g:25204:1: ( ruleXExpression )
+            // InternalCheck.g:25205:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getEachExpressionXExpressionParserRuleCall_9_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XBasicForLoopExpression__EachExpressionAssignment_950796);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -72047,22 +72047,22 @@ public final void rule__XBasicForLoopExpression__EachExpressionAssignment_9() th
 
 
     // $ANTLR start "rule__XWhileExpression__PredicateAssignment_3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25214:1: rule__XWhileExpression__PredicateAssignment_3 : ( ruleXExpression ) ;
+    // InternalCheck.g:25214:1: rule__XWhileExpression__PredicateAssignment_3 : ( ruleXExpression ) ;
     public final void rule__XWhileExpression__PredicateAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25218:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25219:1: ( ruleXExpression )
+            // InternalCheck.g:25218:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:25219:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25219:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25220:1: ruleXExpression
+            // InternalCheck.g:25219:1: ( ruleXExpression )
+            // InternalCheck.g:25220:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getPredicateXExpressionParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XWhileExpression__PredicateAssignment_350827);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -72092,22 +72092,22 @@ public final void rule__XWhileExpression__PredicateAssignment_3() throws Recogni
 
 
     // $ANTLR start "rule__XWhileExpression__BodyAssignment_5"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25229:1: rule__XWhileExpression__BodyAssignment_5 : ( ruleXExpression ) ;
+    // InternalCheck.g:25229:1: rule__XWhileExpression__BodyAssignment_5 : ( ruleXExpression ) ;
     public final void rule__XWhileExpression__BodyAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25233:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25234:1: ( ruleXExpression )
+            // InternalCheck.g:25233:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:25234:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25234:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25235:1: ruleXExpression
+            // InternalCheck.g:25234:1: ( ruleXExpression )
+            // InternalCheck.g:25235:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getBodyXExpressionParserRuleCall_5_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XWhileExpression__BodyAssignment_550858);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -72137,22 +72137,22 @@ public final void rule__XWhileExpression__BodyAssignment_5() throws RecognitionE
 
 
     // $ANTLR start "rule__XDoWhileExpression__BodyAssignment_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25244:1: rule__XDoWhileExpression__BodyAssignment_2 : ( ruleXExpression ) ;
+    // InternalCheck.g:25244:1: rule__XDoWhileExpression__BodyAssignment_2 : ( ruleXExpression ) ;
     public final void rule__XDoWhileExpression__BodyAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25248:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25249:1: ( ruleXExpression )
+            // InternalCheck.g:25248:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:25249:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25249:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25250:1: ruleXExpression
+            // InternalCheck.g:25249:1: ( ruleXExpression )
+            // InternalCheck.g:25250:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getBodyXExpressionParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XDoWhileExpression__BodyAssignment_250889);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -72182,22 +72182,22 @@ public final void rule__XDoWhileExpression__BodyAssignment_2() throws Recognitio
 
 
     // $ANTLR start "rule__XDoWhileExpression__PredicateAssignment_5"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25259:1: rule__XDoWhileExpression__PredicateAssignment_5 : ( ruleXExpression ) ;
+    // InternalCheck.g:25259:1: rule__XDoWhileExpression__PredicateAssignment_5 : ( ruleXExpression ) ;
     public final void rule__XDoWhileExpression__PredicateAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25263:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25264:1: ( ruleXExpression )
+            // InternalCheck.g:25263:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:25264:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25264:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25265:1: ruleXExpression
+            // InternalCheck.g:25264:1: ( ruleXExpression )
+            // InternalCheck.g:25265:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getPredicateXExpressionParserRuleCall_5_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XDoWhileExpression__PredicateAssignment_550920);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -72227,22 +72227,22 @@ public final void rule__XDoWhileExpression__PredicateAssignment_5() throws Recog
 
 
     // $ANTLR start "rule__XBlockExpression__ExpressionsAssignment_2_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25274:1: rule__XBlockExpression__ExpressionsAssignment_2_0 : ( ruleXExpressionOrVarDeclaration ) ;
+    // InternalCheck.g:25274:1: rule__XBlockExpression__ExpressionsAssignment_2_0 : ( ruleXExpressionOrVarDeclaration ) ;
     public final void rule__XBlockExpression__ExpressionsAssignment_2_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25278:1: ( ( ruleXExpressionOrVarDeclaration ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25279:1: ( ruleXExpressionOrVarDeclaration )
+            // InternalCheck.g:25278:1: ( ( ruleXExpressionOrVarDeclaration ) )
+            // InternalCheck.g:25279:1: ( ruleXExpressionOrVarDeclaration )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25279:1: ( ruleXExpressionOrVarDeclaration )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25280:1: ruleXExpressionOrVarDeclaration
+            // InternalCheck.g:25279:1: ( ruleXExpressionOrVarDeclaration )
+            // InternalCheck.g:25280:1: ruleXExpressionOrVarDeclaration
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getExpressionsXExpressionOrVarDeclarationParserRuleCall_2_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_rule__XBlockExpression__ExpressionsAssignment_2_050951);
+            pushFollow(FOLLOW_2);
             ruleXExpressionOrVarDeclaration();
 
             state._fsp--;
@@ -72272,28 +72272,28 @@ public final void rule__XBlockExpression__ExpressionsAssignment_2_0() throws Rec
 
 
     // $ANTLR start "rule__XVariableDeclaration__WriteableAssignment_1_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25289:1: rule__XVariableDeclaration__WriteableAssignment_1_0 : ( ( 'var' ) ) ;
+    // InternalCheck.g:25289:1: rule__XVariableDeclaration__WriteableAssignment_1_0 : ( ( 'var' ) ) ;
     public final void rule__XVariableDeclaration__WriteableAssignment_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25293:1: ( ( ( 'var' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25294:1: ( ( 'var' ) )
+            // InternalCheck.g:25293:1: ( ( ( 'var' ) ) )
+            // InternalCheck.g:25294:1: ( ( 'var' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25294:1: ( ( 'var' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25295:1: ( 'var' )
+            // InternalCheck.g:25294:1: ( ( 'var' ) )
+            // InternalCheck.g:25295:1: ( 'var' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getWriteableVarKeyword_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25296:1: ( 'var' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25297:1: 'var'
+            // InternalCheck.g:25296:1: ( 'var' )
+            // InternalCheck.g:25297:1: 'var'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getWriteableVarKeyword_1_0_0()); 
             }
-            match(input,107,FOLLOW_107_in_rule__XVariableDeclaration__WriteableAssignment_1_050987); if (state.failed) return ;
+            match(input,107,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXVariableDeclarationAccess().getWriteableVarKeyword_1_0_0()); 
             }
@@ -72325,22 +72325,22 @@ public final void rule__XVariableDeclaration__WriteableAssignment_1_0() throws R
 
 
     // $ANTLR start "rule__XVariableDeclaration__TypeAssignment_2_0_0_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25312:1: rule__XVariableDeclaration__TypeAssignment_2_0_0_0 : ( ruleJvmTypeReference ) ;
+    // InternalCheck.g:25312:1: rule__XVariableDeclaration__TypeAssignment_2_0_0_0 : ( ruleJvmTypeReference ) ;
     public final void rule__XVariableDeclaration__TypeAssignment_2_0_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25316:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25317:1: ( ruleJvmTypeReference )
+            // InternalCheck.g:25316:1: ( ( ruleJvmTypeReference ) )
+            // InternalCheck.g:25317:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25317:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25318:1: ruleJvmTypeReference
+            // InternalCheck.g:25317:1: ( ruleJvmTypeReference )
+            // InternalCheck.g:25318:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getTypeJvmTypeReferenceParserRuleCall_2_0_0_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__XVariableDeclaration__TypeAssignment_2_0_0_051026);
+            pushFollow(FOLLOW_2);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -72370,22 +72370,22 @@ public final void rule__XVariableDeclaration__TypeAssignment_2_0_0_0() throws Re
 
 
     // $ANTLR start "rule__XVariableDeclaration__NameAssignment_2_0_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25327:1: rule__XVariableDeclaration__NameAssignment_2_0_0_1 : ( ruleValidID ) ;
+    // InternalCheck.g:25327:1: rule__XVariableDeclaration__NameAssignment_2_0_0_1 : ( ruleValidID ) ;
     public final void rule__XVariableDeclaration__NameAssignment_2_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25331:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25332:1: ( ruleValidID )
+            // InternalCheck.g:25331:1: ( ( ruleValidID ) )
+            // InternalCheck.g:25332:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25332:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25333:1: ruleValidID
+            // InternalCheck.g:25332:1: ( ruleValidID )
+            // InternalCheck.g:25333:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getNameValidIDParserRuleCall_2_0_0_1_0()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__XVariableDeclaration__NameAssignment_2_0_0_151057);
+            pushFollow(FOLLOW_2);
             ruleValidID();
 
             state._fsp--;
@@ -72415,22 +72415,22 @@ public final void rule__XVariableDeclaration__NameAssignment_2_0_0_1() throws Re
 
 
     // $ANTLR start "rule__XVariableDeclaration__NameAssignment_2_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25342:1: rule__XVariableDeclaration__NameAssignment_2_1 : ( ruleValidID ) ;
+    // InternalCheck.g:25342:1: rule__XVariableDeclaration__NameAssignment_2_1 : ( ruleValidID ) ;
     public final void rule__XVariableDeclaration__NameAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25346:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25347:1: ( ruleValidID )
+            // InternalCheck.g:25346:1: ( ( ruleValidID ) )
+            // InternalCheck.g:25347:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25347:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25348:1: ruleValidID
+            // InternalCheck.g:25347:1: ( ruleValidID )
+            // InternalCheck.g:25348:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getNameValidIDParserRuleCall_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__XVariableDeclaration__NameAssignment_2_151088);
+            pushFollow(FOLLOW_2);
             ruleValidID();
 
             state._fsp--;
@@ -72460,22 +72460,22 @@ public final void rule__XVariableDeclaration__NameAssignment_2_1() throws Recogn
 
 
     // $ANTLR start "rule__XVariableDeclaration__RightAssignment_3_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25357:1: rule__XVariableDeclaration__RightAssignment_3_1 : ( ruleXExpression ) ;
+    // InternalCheck.g:25357:1: rule__XVariableDeclaration__RightAssignment_3_1 : ( ruleXExpression ) ;
     public final void rule__XVariableDeclaration__RightAssignment_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25361:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25362:1: ( ruleXExpression )
+            // InternalCheck.g:25361:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:25362:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25362:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25363:1: ruleXExpression
+            // InternalCheck.g:25362:1: ( ruleXExpression )
+            // InternalCheck.g:25363:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getRightXExpressionParserRuleCall_3_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XVariableDeclaration__RightAssignment_3_151119);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -72505,22 +72505,22 @@ public final void rule__XVariableDeclaration__RightAssignment_3_1() throws Recog
 
 
     // $ANTLR start "rule__JvmFormalParameter__ParameterTypeAssignment_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25372:1: rule__JvmFormalParameter__ParameterTypeAssignment_0 : ( ruleJvmTypeReference ) ;
+    // InternalCheck.g:25372:1: rule__JvmFormalParameter__ParameterTypeAssignment_0 : ( ruleJvmTypeReference ) ;
     public final void rule__JvmFormalParameter__ParameterTypeAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25376:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25377:1: ( ruleJvmTypeReference )
+            // InternalCheck.g:25376:1: ( ( ruleJvmTypeReference ) )
+            // InternalCheck.g:25377:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25377:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25378:1: ruleJvmTypeReference
+            // InternalCheck.g:25377:1: ( ruleJvmTypeReference )
+            // InternalCheck.g:25378:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmFormalParameterAccess().getParameterTypeJvmTypeReferenceParserRuleCall_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__JvmFormalParameter__ParameterTypeAssignment_051150);
+            pushFollow(FOLLOW_2);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -72550,22 +72550,22 @@ public final void rule__JvmFormalParameter__ParameterTypeAssignment_0() throws R
 
 
     // $ANTLR start "rule__JvmFormalParameter__NameAssignment_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25387:1: rule__JvmFormalParameter__NameAssignment_1 : ( ruleValidID ) ;
+    // InternalCheck.g:25387:1: rule__JvmFormalParameter__NameAssignment_1 : ( ruleValidID ) ;
     public final void rule__JvmFormalParameter__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25391:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25392:1: ( ruleValidID )
+            // InternalCheck.g:25391:1: ( ( ruleValidID ) )
+            // InternalCheck.g:25392:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25392:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25393:1: ruleValidID
+            // InternalCheck.g:25392:1: ( ruleValidID )
+            // InternalCheck.g:25393:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmFormalParameterAccess().getNameValidIDParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__JvmFormalParameter__NameAssignment_151181);
+            pushFollow(FOLLOW_2);
             ruleValidID();
 
             state._fsp--;
@@ -72595,22 +72595,22 @@ public final void rule__JvmFormalParameter__NameAssignment_1() throws Recognitio
 
 
     // $ANTLR start "rule__FullJvmFormalParameter__ParameterTypeAssignment_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25402:1: rule__FullJvmFormalParameter__ParameterTypeAssignment_0 : ( ruleJvmTypeReference ) ;
+    // InternalCheck.g:25402:1: rule__FullJvmFormalParameter__ParameterTypeAssignment_0 : ( ruleJvmTypeReference ) ;
     public final void rule__FullJvmFormalParameter__ParameterTypeAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25406:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25407:1: ( ruleJvmTypeReference )
+            // InternalCheck.g:25406:1: ( ( ruleJvmTypeReference ) )
+            // InternalCheck.g:25407:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25407:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25408:1: ruleJvmTypeReference
+            // InternalCheck.g:25407:1: ( ruleJvmTypeReference )
+            // InternalCheck.g:25408:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFullJvmFormalParameterAccess().getParameterTypeJvmTypeReferenceParserRuleCall_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__FullJvmFormalParameter__ParameterTypeAssignment_051212);
+            pushFollow(FOLLOW_2);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -72640,22 +72640,22 @@ public final void rule__FullJvmFormalParameter__ParameterTypeAssignment_0() thro
 
 
     // $ANTLR start "rule__FullJvmFormalParameter__NameAssignment_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25417:1: rule__FullJvmFormalParameter__NameAssignment_1 : ( ruleValidID ) ;
+    // InternalCheck.g:25417:1: rule__FullJvmFormalParameter__NameAssignment_1 : ( ruleValidID ) ;
     public final void rule__FullJvmFormalParameter__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25421:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25422:1: ( ruleValidID )
+            // InternalCheck.g:25421:1: ( ( ruleValidID ) )
+            // InternalCheck.g:25422:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25422:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25423:1: ruleValidID
+            // InternalCheck.g:25422:1: ( ruleValidID )
+            // InternalCheck.g:25423:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFullJvmFormalParameterAccess().getNameValidIDParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__FullJvmFormalParameter__NameAssignment_151243);
+            pushFollow(FOLLOW_2);
             ruleValidID();
 
             state._fsp--;
@@ -72685,22 +72685,22 @@ public final void rule__FullJvmFormalParameter__NameAssignment_1() throws Recogn
 
 
     // $ANTLR start "rule__XFeatureCall__TypeArgumentsAssignment_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25432:1: rule__XFeatureCall__TypeArgumentsAssignment_1_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalCheck.g:25432:1: rule__XFeatureCall__TypeArgumentsAssignment_1_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__XFeatureCall__TypeArgumentsAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25436:1: ( ( ruleJvmArgumentTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25437:1: ( ruleJvmArgumentTypeReference )
+            // InternalCheck.g:25436:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalCheck.g:25437:1: ( ruleJvmArgumentTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25437:1: ( ruleJvmArgumentTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25438:1: ruleJvmArgumentTypeReference
+            // InternalCheck.g:25437:1: ( ruleJvmArgumentTypeReference )
+            // InternalCheck.g:25438:1: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__XFeatureCall__TypeArgumentsAssignment_1_151274);
+            pushFollow(FOLLOW_2);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -72730,22 +72730,22 @@ public final void rule__XFeatureCall__TypeArgumentsAssignment_1_1() throws Recog
 
 
     // $ANTLR start "rule__XFeatureCall__TypeArgumentsAssignment_1_2_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25447:1: rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalCheck.g:25447:1: rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__XFeatureCall__TypeArgumentsAssignment_1_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25451:1: ( ( ruleJvmArgumentTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25452:1: ( ruleJvmArgumentTypeReference )
+            // InternalCheck.g:25451:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalCheck.g:25452:1: ( ruleJvmArgumentTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25452:1: ( ruleJvmArgumentTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25453:1: ruleJvmArgumentTypeReference
+            // InternalCheck.g:25452:1: ( ruleJvmArgumentTypeReference )
+            // InternalCheck.g:25453:1: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__XFeatureCall__TypeArgumentsAssignment_1_2_151305);
+            pushFollow(FOLLOW_2);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -72775,28 +72775,28 @@ public final void rule__XFeatureCall__TypeArgumentsAssignment_1_2_1() throws Rec
 
 
     // $ANTLR start "rule__XFeatureCall__FeatureAssignment_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25462:1: rule__XFeatureCall__FeatureAssignment_2 : ( ( ruleIdOrSuper ) ) ;
+    // InternalCheck.g:25462:1: rule__XFeatureCall__FeatureAssignment_2 : ( ( ruleIdOrSuper ) ) ;
     public final void rule__XFeatureCall__FeatureAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25466:1: ( ( ( ruleIdOrSuper ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25467:1: ( ( ruleIdOrSuper ) )
+            // InternalCheck.g:25466:1: ( ( ( ruleIdOrSuper ) ) )
+            // InternalCheck.g:25467:1: ( ( ruleIdOrSuper ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25467:1: ( ( ruleIdOrSuper ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25468:1: ( ruleIdOrSuper )
+            // InternalCheck.g:25467:1: ( ( ruleIdOrSuper ) )
+            // InternalCheck.g:25468:1: ( ruleIdOrSuper )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureJvmIdentifiableElementCrossReference_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25469:1: ( ruleIdOrSuper )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25470:1: ruleIdOrSuper
+            // InternalCheck.g:25469:1: ( ruleIdOrSuper )
+            // InternalCheck.g:25470:1: ruleIdOrSuper
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureJvmIdentifiableElementIdOrSuperParserRuleCall_2_0_1()); 
             }
-            pushFollow(FOLLOW_ruleIdOrSuper_in_rule__XFeatureCall__FeatureAssignment_251340);
+            pushFollow(FOLLOW_2);
             ruleIdOrSuper();
 
             state._fsp--;
@@ -72832,28 +72832,28 @@ public final void rule__XFeatureCall__FeatureAssignment_2() throws RecognitionEx
 
 
     // $ANTLR start "rule__XFeatureCall__ExplicitOperationCallAssignment_3_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25481:1: rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 : ( ( '(' ) ) ;
+    // InternalCheck.g:25481:1: rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 : ( ( '(' ) ) ;
     public final void rule__XFeatureCall__ExplicitOperationCallAssignment_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25485:1: ( ( ( '(' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25486:1: ( ( '(' ) )
+            // InternalCheck.g:25485:1: ( ( ( '(' ) ) )
+            // InternalCheck.g:25486:1: ( ( '(' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25486:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25487:1: ( '(' )
+            // InternalCheck.g:25486:1: ( ( '(' ) )
+            // InternalCheck.g:25487:1: ( '(' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_3_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25488:1: ( '(' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25489:1: '('
+            // InternalCheck.g:25488:1: ( '(' )
+            // InternalCheck.g:25489:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_3_0_0()); 
             }
-            match(input,72,FOLLOW_72_in_rule__XFeatureCall__ExplicitOperationCallAssignment_3_051380); if (state.failed) return ;
+            match(input,72,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_3_0_0()); 
             }
@@ -72885,22 +72885,22 @@ public final void rule__XFeatureCall__ExplicitOperationCallAssignment_3_0() thro
 
 
     // $ANTLR start "rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25504:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 : ( ruleXShortClosure ) ;
+    // InternalCheck.g:25504:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 : ( ruleXShortClosure ) ;
     public final void rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25508:1: ( ( ruleXShortClosure ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25509:1: ( ruleXShortClosure )
+            // InternalCheck.g:25508:1: ( ( ruleXShortClosure ) )
+            // InternalCheck.g:25509:1: ( ruleXShortClosure )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25509:1: ( ruleXShortClosure )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25510:1: ruleXShortClosure
+            // InternalCheck.g:25509:1: ( ruleXShortClosure )
+            // InternalCheck.g:25510:1: ruleXShortClosure
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXShortClosureParserRuleCall_3_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXShortClosure_in_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_051419);
+            pushFollow(FOLLOW_2);
             ruleXShortClosure();
 
             state._fsp--;
@@ -72930,22 +72930,22 @@ public final void rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0() thr
 
 
     // $ANTLR start "rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25519:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 : ( ruleXExpression ) ;
+    // InternalCheck.g:25519:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 : ( ruleXExpression ) ;
     public final void rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25523:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25524:1: ( ruleXExpression )
+            // InternalCheck.g:25523:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:25524:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25524:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25525:1: ruleXExpression
+            // InternalCheck.g:25524:1: ( ruleXExpression )
+            // InternalCheck.g:25525:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXExpressionParserRuleCall_3_1_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_051450);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -72975,22 +72975,22 @@ public final void rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0() t
 
 
     // $ANTLR start "rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25534:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 : ( ruleXExpression ) ;
+    // InternalCheck.g:25534:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 : ( ruleXExpression ) ;
     public final void rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25538:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25539:1: ( ruleXExpression )
+            // InternalCheck.g:25538:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:25539:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25539:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25540:1: ruleXExpression
+            // InternalCheck.g:25539:1: ( ruleXExpression )
+            // InternalCheck.g:25540:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXExpressionParserRuleCall_3_1_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_151481);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -73020,22 +73020,22 @@ public final void rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1()
 
 
     // $ANTLR start "rule__XFeatureCall__FeatureCallArgumentsAssignment_4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25549:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_4 : ( ruleXClosure ) ;
+    // InternalCheck.g:25549:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_4 : ( ruleXClosure ) ;
     public final void rule__XFeatureCall__FeatureCallArgumentsAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25553:1: ( ( ruleXClosure ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25554:1: ( ruleXClosure )
+            // InternalCheck.g:25553:1: ( ( ruleXClosure ) )
+            // InternalCheck.g:25554:1: ( ruleXClosure )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25554:1: ( ruleXClosure )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25555:1: ruleXClosure
+            // InternalCheck.g:25554:1: ( ruleXClosure )
+            // InternalCheck.g:25555:1: ruleXClosure
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXClosureParserRuleCall_4_0()); 
             }
-            pushFollow(FOLLOW_ruleXClosure_in_rule__XFeatureCall__FeatureCallArgumentsAssignment_451512);
+            pushFollow(FOLLOW_2);
             ruleXClosure();
 
             state._fsp--;
@@ -73065,28 +73065,28 @@ public final void rule__XFeatureCall__FeatureCallArgumentsAssignment_4() throws
 
 
     // $ANTLR start "rule__XConstructorCall__ConstructorAssignment_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25564:1: rule__XConstructorCall__ConstructorAssignment_2 : ( ( ruleQualifiedName ) ) ;
+    // InternalCheck.g:25564:1: rule__XConstructorCall__ConstructorAssignment_2 : ( ( ruleQualifiedName ) ) ;
     public final void rule__XConstructorCall__ConstructorAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25568:1: ( ( ( ruleQualifiedName ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25569:1: ( ( ruleQualifiedName ) )
+            // InternalCheck.g:25568:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalCheck.g:25569:1: ( ( ruleQualifiedName ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25569:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25570:1: ( ruleQualifiedName )
+            // InternalCheck.g:25569:1: ( ( ruleQualifiedName ) )
+            // InternalCheck.g:25570:1: ( ruleQualifiedName )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getConstructorJvmConstructorCrossReference_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25571:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25572:1: ruleQualifiedName
+            // InternalCheck.g:25571:1: ( ruleQualifiedName )
+            // InternalCheck.g:25572:1: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getConstructorJvmConstructorQualifiedNameParserRuleCall_2_0_1()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_rule__XConstructorCall__ConstructorAssignment_251547);
+            pushFollow(FOLLOW_2);
             ruleQualifiedName();
 
             state._fsp--;
@@ -73122,22 +73122,22 @@ public final void rule__XConstructorCall__ConstructorAssignment_2() throws Recog
 
 
     // $ANTLR start "rule__XConstructorCall__TypeArgumentsAssignment_3_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25583:1: rule__XConstructorCall__TypeArgumentsAssignment_3_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalCheck.g:25583:1: rule__XConstructorCall__TypeArgumentsAssignment_3_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__XConstructorCall__TypeArgumentsAssignment_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25587:1: ( ( ruleJvmArgumentTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25588:1: ( ruleJvmArgumentTypeReference )
+            // InternalCheck.g:25587:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalCheck.g:25588:1: ( ruleJvmArgumentTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25588:1: ( ruleJvmArgumentTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25589:1: ruleJvmArgumentTypeReference
+            // InternalCheck.g:25588:1: ( ruleJvmArgumentTypeReference )
+            // InternalCheck.g:25589:1: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_3_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__XConstructorCall__TypeArgumentsAssignment_3_151582);
+            pushFollow(FOLLOW_2);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -73167,22 +73167,22 @@ public final void rule__XConstructorCall__TypeArgumentsAssignment_3_1() throws R
 
 
     // $ANTLR start "rule__XConstructorCall__TypeArgumentsAssignment_3_2_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25598:1: rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalCheck.g:25598:1: rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__XConstructorCall__TypeArgumentsAssignment_3_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25602:1: ( ( ruleJvmArgumentTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25603:1: ( ruleJvmArgumentTypeReference )
+            // InternalCheck.g:25602:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalCheck.g:25603:1: ( ruleJvmArgumentTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25603:1: ( ruleJvmArgumentTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25604:1: ruleJvmArgumentTypeReference
+            // InternalCheck.g:25603:1: ( ruleJvmArgumentTypeReference )
+            // InternalCheck.g:25604:1: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_3_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__XConstructorCall__TypeArgumentsAssignment_3_2_151613);
+            pushFollow(FOLLOW_2);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -73212,28 +73212,28 @@ public final void rule__XConstructorCall__TypeArgumentsAssignment_3_2_1() throws
 
 
     // $ANTLR start "rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25613:1: rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 : ( ( '(' ) ) ;
+    // InternalCheck.g:25613:1: rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 : ( ( '(' ) ) ;
     public final void rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25617:1: ( ( ( '(' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25618:1: ( ( '(' ) )
+            // InternalCheck.g:25617:1: ( ( ( '(' ) ) )
+            // InternalCheck.g:25618:1: ( ( '(' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25618:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25619:1: ( '(' )
+            // InternalCheck.g:25618:1: ( ( '(' ) )
+            // InternalCheck.g:25619:1: ( '(' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getExplicitConstructorCallLeftParenthesisKeyword_4_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25620:1: ( '(' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25621:1: '('
+            // InternalCheck.g:25620:1: ( '(' )
+            // InternalCheck.g:25621:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getExplicitConstructorCallLeftParenthesisKeyword_4_0_0()); 
             }
-            match(input,72,FOLLOW_72_in_rule__XConstructorCall__ExplicitConstructorCallAssignment_4_051649); if (state.failed) return ;
+            match(input,72,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstructorCallAccess().getExplicitConstructorCallLeftParenthesisKeyword_4_0_0()); 
             }
@@ -73265,22 +73265,22 @@ public final void rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0(
 
 
     // $ANTLR start "rule__XConstructorCall__ArgumentsAssignment_4_1_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25636:1: rule__XConstructorCall__ArgumentsAssignment_4_1_0 : ( ruleXShortClosure ) ;
+    // InternalCheck.g:25636:1: rule__XConstructorCall__ArgumentsAssignment_4_1_0 : ( ruleXShortClosure ) ;
     public final void rule__XConstructorCall__ArgumentsAssignment_4_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25640:1: ( ( ruleXShortClosure ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25641:1: ( ruleXShortClosure )
+            // InternalCheck.g:25640:1: ( ( ruleXShortClosure ) )
+            // InternalCheck.g:25641:1: ( ruleXShortClosure )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25641:1: ( ruleXShortClosure )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25642:1: ruleXShortClosure
+            // InternalCheck.g:25641:1: ( ruleXShortClosure )
+            // InternalCheck.g:25642:1: ruleXShortClosure
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getArgumentsXShortClosureParserRuleCall_4_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXShortClosure_in_rule__XConstructorCall__ArgumentsAssignment_4_1_051688);
+            pushFollow(FOLLOW_2);
             ruleXShortClosure();
 
             state._fsp--;
@@ -73310,22 +73310,22 @@ public final void rule__XConstructorCall__ArgumentsAssignment_4_1_0() throws Rec
 
 
     // $ANTLR start "rule__XConstructorCall__ArgumentsAssignment_4_1_1_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25651:1: rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 : ( ruleXExpression ) ;
+    // InternalCheck.g:25651:1: rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 : ( ruleXExpression ) ;
     public final void rule__XConstructorCall__ArgumentsAssignment_4_1_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25655:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25656:1: ( ruleXExpression )
+            // InternalCheck.g:25655:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:25656:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25656:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25657:1: ruleXExpression
+            // InternalCheck.g:25656:1: ( ruleXExpression )
+            // InternalCheck.g:25657:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getArgumentsXExpressionParserRuleCall_4_1_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XConstructorCall__ArgumentsAssignment_4_1_1_051719);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -73355,22 +73355,22 @@ public final void rule__XConstructorCall__ArgumentsAssignment_4_1_1_0() throws R
 
 
     // $ANTLR start "rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25666:1: rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 : ( ruleXExpression ) ;
+    // InternalCheck.g:25666:1: rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 : ( ruleXExpression ) ;
     public final void rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25670:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25671:1: ( ruleXExpression )
+            // InternalCheck.g:25670:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:25671:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25671:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25672:1: ruleXExpression
+            // InternalCheck.g:25671:1: ( ruleXExpression )
+            // InternalCheck.g:25672:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getArgumentsXExpressionParserRuleCall_4_1_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_151750);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -73400,22 +73400,22 @@ public final void rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1() throws
 
 
     // $ANTLR start "rule__XConstructorCall__ArgumentsAssignment_5"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25681:1: rule__XConstructorCall__ArgumentsAssignment_5 : ( ruleXClosure ) ;
+    // InternalCheck.g:25681:1: rule__XConstructorCall__ArgumentsAssignment_5 : ( ruleXClosure ) ;
     public final void rule__XConstructorCall__ArgumentsAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25685:1: ( ( ruleXClosure ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25686:1: ( ruleXClosure )
+            // InternalCheck.g:25685:1: ( ( ruleXClosure ) )
+            // InternalCheck.g:25686:1: ( ruleXClosure )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25686:1: ( ruleXClosure )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25687:1: ruleXClosure
+            // InternalCheck.g:25686:1: ( ruleXClosure )
+            // InternalCheck.g:25687:1: ruleXClosure
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getArgumentsXClosureParserRuleCall_5_0()); 
             }
-            pushFollow(FOLLOW_ruleXClosure_in_rule__XConstructorCall__ArgumentsAssignment_551781);
+            pushFollow(FOLLOW_2);
             ruleXClosure();
 
             state._fsp--;
@@ -73445,28 +73445,28 @@ public final void rule__XConstructorCall__ArgumentsAssignment_5() throws Recogni
 
 
     // $ANTLR start "rule__XBooleanLiteral__IsTrueAssignment_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25696:1: rule__XBooleanLiteral__IsTrueAssignment_1_1 : ( ( 'true' ) ) ;
+    // InternalCheck.g:25696:1: rule__XBooleanLiteral__IsTrueAssignment_1_1 : ( ( 'true' ) ) ;
     public final void rule__XBooleanLiteral__IsTrueAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25700:1: ( ( ( 'true' ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25701:1: ( ( 'true' ) )
+            // InternalCheck.g:25700:1: ( ( ( 'true' ) ) )
+            // InternalCheck.g:25701:1: ( ( 'true' ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25701:1: ( ( 'true' ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25702:1: ( 'true' )
+            // InternalCheck.g:25701:1: ( ( 'true' ) )
+            // InternalCheck.g:25702:1: ( 'true' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25703:1: ( 'true' )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25704:1: 'true'
+            // InternalCheck.g:25703:1: ( 'true' )
+            // InternalCheck.g:25704:1: 'true'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); 
             }
-            match(input,108,FOLLOW_108_in_rule__XBooleanLiteral__IsTrueAssignment_1_151817); if (state.failed) return ;
+            match(input,108,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); 
             }
@@ -73498,22 +73498,22 @@ public final void rule__XBooleanLiteral__IsTrueAssignment_1_1() throws Recogniti
 
 
     // $ANTLR start "rule__XNumberLiteral__ValueAssignment_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25719:1: rule__XNumberLiteral__ValueAssignment_1 : ( ruleNumber ) ;
+    // InternalCheck.g:25719:1: rule__XNumberLiteral__ValueAssignment_1 : ( ruleNumber ) ;
     public final void rule__XNumberLiteral__ValueAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25723:1: ( ( ruleNumber ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25724:1: ( ruleNumber )
+            // InternalCheck.g:25723:1: ( ( ruleNumber ) )
+            // InternalCheck.g:25724:1: ( ruleNumber )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25724:1: ( ruleNumber )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25725:1: ruleNumber
+            // InternalCheck.g:25724:1: ( ruleNumber )
+            // InternalCheck.g:25725:1: ruleNumber
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNumberLiteralAccess().getValueNumberParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleNumber_in_rule__XNumberLiteral__ValueAssignment_151856);
+            pushFollow(FOLLOW_2);
             ruleNumber();
 
             state._fsp--;
@@ -73543,22 +73543,22 @@ public final void rule__XNumberLiteral__ValueAssignment_1() throws RecognitionEx
 
 
     // $ANTLR start "rule__XStringLiteral__ValueAssignment_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25734:1: rule__XStringLiteral__ValueAssignment_1 : ( RULE_STRING ) ;
+    // InternalCheck.g:25734:1: rule__XStringLiteral__ValueAssignment_1 : ( RULE_STRING ) ;
     public final void rule__XStringLiteral__ValueAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25738:1: ( ( RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25739:1: ( RULE_STRING )
+            // InternalCheck.g:25738:1: ( ( RULE_STRING ) )
+            // InternalCheck.g:25739:1: ( RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25739:1: ( RULE_STRING )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25740:1: RULE_STRING
+            // InternalCheck.g:25739:1: ( RULE_STRING )
+            // InternalCheck.g:25740:1: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXStringLiteralAccess().getValueSTRINGTerminalRuleCall_1_0()); 
             }
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__XStringLiteral__ValueAssignment_151887); if (state.failed) return ;
+            match(input,RULE_STRING,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXStringLiteralAccess().getValueSTRINGTerminalRuleCall_1_0()); 
             }
@@ -73584,28 +73584,28 @@ public final void rule__XStringLiteral__ValueAssignment_1() throws RecognitionEx
 
 
     // $ANTLR start "rule__XTypeLiteral__TypeAssignment_3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25749:1: rule__XTypeLiteral__TypeAssignment_3 : ( ( ruleQualifiedName ) ) ;
+    // InternalCheck.g:25749:1: rule__XTypeLiteral__TypeAssignment_3 : ( ( ruleQualifiedName ) ) ;
     public final void rule__XTypeLiteral__TypeAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25753:1: ( ( ( ruleQualifiedName ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25754:1: ( ( ruleQualifiedName ) )
+            // InternalCheck.g:25753:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalCheck.g:25754:1: ( ( ruleQualifiedName ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25754:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25755:1: ( ruleQualifiedName )
+            // InternalCheck.g:25754:1: ( ( ruleQualifiedName ) )
+            // InternalCheck.g:25755:1: ( ruleQualifiedName )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getTypeJvmTypeCrossReference_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25756:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25757:1: ruleQualifiedName
+            // InternalCheck.g:25756:1: ( ruleQualifiedName )
+            // InternalCheck.g:25757:1: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getTypeJvmTypeQualifiedNameParserRuleCall_3_0_1()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_rule__XTypeLiteral__TypeAssignment_351922);
+            pushFollow(FOLLOW_2);
             ruleQualifiedName();
 
             state._fsp--;
@@ -73641,22 +73641,22 @@ public final void rule__XTypeLiteral__TypeAssignment_3() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XTypeLiteral__ArrayDimensionsAssignment_4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25768:1: rule__XTypeLiteral__ArrayDimensionsAssignment_4 : ( ruleArrayBrackets ) ;
+    // InternalCheck.g:25768:1: rule__XTypeLiteral__ArrayDimensionsAssignment_4 : ( ruleArrayBrackets ) ;
     public final void rule__XTypeLiteral__ArrayDimensionsAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25772:1: ( ( ruleArrayBrackets ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25773:1: ( ruleArrayBrackets )
+            // InternalCheck.g:25772:1: ( ( ruleArrayBrackets ) )
+            // InternalCheck.g:25773:1: ( ruleArrayBrackets )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25773:1: ( ruleArrayBrackets )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25774:1: ruleArrayBrackets
+            // InternalCheck.g:25773:1: ( ruleArrayBrackets )
+            // InternalCheck.g:25774:1: ruleArrayBrackets
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getArrayDimensionsArrayBracketsParserRuleCall_4_0()); 
             }
-            pushFollow(FOLLOW_ruleArrayBrackets_in_rule__XTypeLiteral__ArrayDimensionsAssignment_451957);
+            pushFollow(FOLLOW_2);
             ruleArrayBrackets();
 
             state._fsp--;
@@ -73686,22 +73686,22 @@ public final void rule__XTypeLiteral__ArrayDimensionsAssignment_4() throws Recog
 
 
     // $ANTLR start "rule__XThrowExpression__ExpressionAssignment_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25783:1: rule__XThrowExpression__ExpressionAssignment_2 : ( ruleXExpression ) ;
+    // InternalCheck.g:25783:1: rule__XThrowExpression__ExpressionAssignment_2 : ( ruleXExpression ) ;
     public final void rule__XThrowExpression__ExpressionAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25787:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25788:1: ( ruleXExpression )
+            // InternalCheck.g:25787:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:25788:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25788:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25789:1: ruleXExpression
+            // InternalCheck.g:25788:1: ( ruleXExpression )
+            // InternalCheck.g:25789:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXThrowExpressionAccess().getExpressionXExpressionParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XThrowExpression__ExpressionAssignment_251988);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -73731,22 +73731,22 @@ public final void rule__XThrowExpression__ExpressionAssignment_2() throws Recogn
 
 
     // $ANTLR start "rule__XReturnExpression__ExpressionAssignment_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25798:1: rule__XReturnExpression__ExpressionAssignment_2 : ( ruleXExpression ) ;
+    // InternalCheck.g:25798:1: rule__XReturnExpression__ExpressionAssignment_2 : ( ruleXExpression ) ;
     public final void rule__XReturnExpression__ExpressionAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25802:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25803:1: ( ruleXExpression )
+            // InternalCheck.g:25802:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:25803:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25803:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25804:1: ruleXExpression
+            // InternalCheck.g:25803:1: ( ruleXExpression )
+            // InternalCheck.g:25804:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXReturnExpressionAccess().getExpressionXExpressionParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XReturnExpression__ExpressionAssignment_252019);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -73776,22 +73776,22 @@ public final void rule__XReturnExpression__ExpressionAssignment_2() throws Recog
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__ExpressionAssignment_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25813:1: rule__XTryCatchFinallyExpression__ExpressionAssignment_2 : ( ruleXExpression ) ;
+    // InternalCheck.g:25813:1: rule__XTryCatchFinallyExpression__ExpressionAssignment_2 : ( ruleXExpression ) ;
     public final void rule__XTryCatchFinallyExpression__ExpressionAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25817:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25818:1: ( ruleXExpression )
+            // InternalCheck.g:25817:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:25818:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25818:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25819:1: ruleXExpression
+            // InternalCheck.g:25818:1: ( ruleXExpression )
+            // InternalCheck.g:25819:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getExpressionXExpressionParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XTryCatchFinallyExpression__ExpressionAssignment_252050);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -73821,22 +73821,22 @@ public final void rule__XTryCatchFinallyExpression__ExpressionAssignment_2() thr
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25828:1: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 : ( ruleXCatchClause ) ;
+    // InternalCheck.g:25828:1: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 : ( ruleXCatchClause ) ;
     public final void rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25832:1: ( ( ruleXCatchClause ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25833:1: ( ruleXCatchClause )
+            // InternalCheck.g:25832:1: ( ( ruleXCatchClause ) )
+            // InternalCheck.g:25833:1: ( ruleXCatchClause )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25833:1: ( ruleXCatchClause )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25834:1: ruleXCatchClause
+            // InternalCheck.g:25833:1: ( ruleXCatchClause )
+            // InternalCheck.g:25834:1: ruleXCatchClause
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getCatchClausesXCatchClauseParserRuleCall_3_0_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXCatchClause_in_rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_052081);
+            pushFollow(FOLLOW_2);
             ruleXCatchClause();
 
             state._fsp--;
@@ -73866,22 +73866,22 @@ public final void rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25843:1: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 : ( ruleXExpression ) ;
+    // InternalCheck.g:25843:1: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 : ( ruleXExpression ) ;
     public final void rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25847:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25848:1: ( ruleXExpression )
+            // InternalCheck.g:25847:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:25848:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25848:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25849:1: ruleXExpression
+            // InternalCheck.g:25848:1: ( ruleXExpression )
+            // InternalCheck.g:25849:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyExpressionXExpressionParserRuleCall_3_0_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_152112);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -73911,22 +73911,22 @@ public final void rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25858:1: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 : ( ruleXExpression ) ;
+    // InternalCheck.g:25858:1: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 : ( ruleXExpression ) ;
     public final void rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25862:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25863:1: ( ruleXExpression )
+            // InternalCheck.g:25862:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:25863:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25863:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25864:1: ruleXExpression
+            // InternalCheck.g:25863:1: ( ruleXExpression )
+            // InternalCheck.g:25864:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyExpressionXExpressionParserRuleCall_3_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_152143);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -73956,22 +73956,22 @@ public final void rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_
 
 
     // $ANTLR start "rule__XSynchronizedExpression__ParamAssignment_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25873:1: rule__XSynchronizedExpression__ParamAssignment_1 : ( ruleXExpression ) ;
+    // InternalCheck.g:25873:1: rule__XSynchronizedExpression__ParamAssignment_1 : ( ruleXExpression ) ;
     public final void rule__XSynchronizedExpression__ParamAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25877:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25878:1: ( ruleXExpression )
+            // InternalCheck.g:25877:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:25878:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25878:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25879:1: ruleXExpression
+            // InternalCheck.g:25878:1: ( ruleXExpression )
+            // InternalCheck.g:25879:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getParamXExpressionParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XSynchronizedExpression__ParamAssignment_152174);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -74001,22 +74001,22 @@ public final void rule__XSynchronizedExpression__ParamAssignment_1() throws Reco
 
 
     // $ANTLR start "rule__XSynchronizedExpression__ExpressionAssignment_3"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25888:1: rule__XSynchronizedExpression__ExpressionAssignment_3 : ( ruleXExpression ) ;
+    // InternalCheck.g:25888:1: rule__XSynchronizedExpression__ExpressionAssignment_3 : ( ruleXExpression ) ;
     public final void rule__XSynchronizedExpression__ExpressionAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25892:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25893:1: ( ruleXExpression )
+            // InternalCheck.g:25892:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:25893:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25893:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25894:1: ruleXExpression
+            // InternalCheck.g:25893:1: ( ruleXExpression )
+            // InternalCheck.g:25894:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getExpressionXExpressionParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XSynchronizedExpression__ExpressionAssignment_352205);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -74046,22 +74046,22 @@ public final void rule__XSynchronizedExpression__ExpressionAssignment_3() throws
 
 
     // $ANTLR start "rule__XCatchClause__DeclaredParamAssignment_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25903:1: rule__XCatchClause__DeclaredParamAssignment_2 : ( ruleFullJvmFormalParameter ) ;
+    // InternalCheck.g:25903:1: rule__XCatchClause__DeclaredParamAssignment_2 : ( ruleFullJvmFormalParameter ) ;
     public final void rule__XCatchClause__DeclaredParamAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25907:1: ( ( ruleFullJvmFormalParameter ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25908:1: ( ruleFullJvmFormalParameter )
+            // InternalCheck.g:25907:1: ( ( ruleFullJvmFormalParameter ) )
+            // InternalCheck.g:25908:1: ( ruleFullJvmFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25908:1: ( ruleFullJvmFormalParameter )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25909:1: ruleFullJvmFormalParameter
+            // InternalCheck.g:25908:1: ( ruleFullJvmFormalParameter )
+            // InternalCheck.g:25909:1: ruleFullJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getDeclaredParamFullJvmFormalParameterParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleFullJvmFormalParameter_in_rule__XCatchClause__DeclaredParamAssignment_252236);
+            pushFollow(FOLLOW_2);
             ruleFullJvmFormalParameter();
 
             state._fsp--;
@@ -74091,22 +74091,22 @@ public final void rule__XCatchClause__DeclaredParamAssignment_2() throws Recogni
 
 
     // $ANTLR start "rule__XCatchClause__ExpressionAssignment_4"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25918:1: rule__XCatchClause__ExpressionAssignment_4 : ( ruleXExpression ) ;
+    // InternalCheck.g:25918:1: rule__XCatchClause__ExpressionAssignment_4 : ( ruleXExpression ) ;
     public final void rule__XCatchClause__ExpressionAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25922:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25923:1: ( ruleXExpression )
+            // InternalCheck.g:25922:1: ( ( ruleXExpression ) )
+            // InternalCheck.g:25923:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25923:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25924:1: ruleXExpression
+            // InternalCheck.g:25923:1: ( ruleXExpression )
+            // InternalCheck.g:25924:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getExpressionXExpressionParserRuleCall_4_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XCatchClause__ExpressionAssignment_452267);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -74136,22 +74136,22 @@ public final void rule__XCatchClause__ExpressionAssignment_4() throws Recognitio
 
 
     // $ANTLR start "rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25933:1: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 : ( ruleJvmTypeReference ) ;
+    // InternalCheck.g:25933:1: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 : ( ruleJvmTypeReference ) ;
     public final void rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25937:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25938:1: ( ruleJvmTypeReference )
+            // InternalCheck.g:25937:1: ( ( ruleJvmTypeReference ) )
+            // InternalCheck.g:25938:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25938:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25939:1: ruleJvmTypeReference
+            // InternalCheck.g:25938:1: ( ruleJvmTypeReference )
+            // InternalCheck.g:25939:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getParamTypesJvmTypeReferenceParserRuleCall_0_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__XFunctionTypeRef__ParamTypesAssignment_0_1_052298);
+            pushFollow(FOLLOW_2);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -74181,22 +74181,22 @@ public final void rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0() throws Re
 
 
     // $ANTLR start "rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25948:1: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 : ( ruleJvmTypeReference ) ;
+    // InternalCheck.g:25948:1: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 : ( ruleJvmTypeReference ) ;
     public final void rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25952:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25953:1: ( ruleJvmTypeReference )
+            // InternalCheck.g:25952:1: ( ( ruleJvmTypeReference ) )
+            // InternalCheck.g:25953:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25953:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25954:1: ruleJvmTypeReference
+            // InternalCheck.g:25953:1: ( ruleJvmTypeReference )
+            // InternalCheck.g:25954:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getParamTypesJvmTypeReferenceParserRuleCall_0_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_152329);
+            pushFollow(FOLLOW_2);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -74226,22 +74226,22 @@ public final void rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1() throws
 
 
     // $ANTLR start "rule__XFunctionTypeRef__ReturnTypeAssignment_2"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25963:1: rule__XFunctionTypeRef__ReturnTypeAssignment_2 : ( ruleJvmTypeReference ) ;
+    // InternalCheck.g:25963:1: rule__XFunctionTypeRef__ReturnTypeAssignment_2 : ( ruleJvmTypeReference ) ;
     public final void rule__XFunctionTypeRef__ReturnTypeAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25967:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25968:1: ( ruleJvmTypeReference )
+            // InternalCheck.g:25967:1: ( ( ruleJvmTypeReference ) )
+            // InternalCheck.g:25968:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25968:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25969:1: ruleJvmTypeReference
+            // InternalCheck.g:25968:1: ( ruleJvmTypeReference )
+            // InternalCheck.g:25969:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getReturnTypeJvmTypeReferenceParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__XFunctionTypeRef__ReturnTypeAssignment_252360);
+            pushFollow(FOLLOW_2);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -74271,28 +74271,28 @@ public final void rule__XFunctionTypeRef__ReturnTypeAssignment_2() throws Recogn
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__TypeAssignment_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25978:1: rule__JvmParameterizedTypeReference__TypeAssignment_0 : ( ( ruleQualifiedName ) ) ;
+    // InternalCheck.g:25978:1: rule__JvmParameterizedTypeReference__TypeAssignment_0 : ( ( ruleQualifiedName ) ) ;
     public final void rule__JvmParameterizedTypeReference__TypeAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25982:1: ( ( ( ruleQualifiedName ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25983:1: ( ( ruleQualifiedName ) )
+            // InternalCheck.g:25982:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalCheck.g:25983:1: ( ( ruleQualifiedName ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25983:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25984:1: ( ruleQualifiedName )
+            // InternalCheck.g:25983:1: ( ( ruleQualifiedName ) )
+            // InternalCheck.g:25984:1: ( ruleQualifiedName )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeJvmTypeCrossReference_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25985:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25986:1: ruleQualifiedName
+            // InternalCheck.g:25985:1: ( ruleQualifiedName )
+            // InternalCheck.g:25986:1: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeJvmTypeQualifiedNameParserRuleCall_0_0_1()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_rule__JvmParameterizedTypeReference__TypeAssignment_052395);
+            pushFollow(FOLLOW_2);
             ruleQualifiedName();
 
             state._fsp--;
@@ -74328,22 +74328,22 @@ public final void rule__JvmParameterizedTypeReference__TypeAssignment_0() throws
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:25997:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalCheck.g:25997:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26001:1: ( ( ruleJvmArgumentTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26002:1: ( ruleJvmArgumentTypeReference )
+            // InternalCheck.g:26001:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalCheck.g:26002:1: ( ruleJvmArgumentTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26002:1: ( ruleJvmArgumentTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26003:1: ruleJvmArgumentTypeReference
+            // InternalCheck.g:26002:1: ( ruleJvmArgumentTypeReference )
+            // InternalCheck.g:26003:1: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_152430);
+            pushFollow(FOLLOW_2);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -74373,22 +74373,22 @@ public final void rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1()
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26012:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalCheck.g:26012:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26016:1: ( ( ruleJvmArgumentTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26017:1: ( ruleJvmArgumentTypeReference )
+            // InternalCheck.g:26016:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalCheck.g:26017:1: ( ruleJvmArgumentTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26017:1: ( ruleJvmArgumentTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26018:1: ruleJvmArgumentTypeReference
+            // InternalCheck.g:26017:1: ( ruleJvmArgumentTypeReference )
+            // InternalCheck.g:26018:1: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_152461);
+            pushFollow(FOLLOW_2);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -74418,28 +74418,28 @@ public final void rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26027:1: rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 : ( ( ruleValidID ) ) ;
+    // InternalCheck.g:26027:1: rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 : ( ( ruleValidID ) ) ;
     public final void rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26031:1: ( ( ( ruleValidID ) ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26032:1: ( ( ruleValidID ) )
+            // InternalCheck.g:26031:1: ( ( ( ruleValidID ) ) )
+            // InternalCheck.g:26032:1: ( ( ruleValidID ) )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26032:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26033:1: ( ruleValidID )
+            // InternalCheck.g:26032:1: ( ( ruleValidID ) )
+            // InternalCheck.g:26033:1: ( ruleValidID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeJvmTypeCrossReference_1_4_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26034:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26035:1: ruleValidID
+            // InternalCheck.g:26034:1: ( ruleValidID )
+            // InternalCheck.g:26035:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeJvmTypeValidIDParserRuleCall_1_4_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__JvmParameterizedTypeReference__TypeAssignment_1_4_152496);
+            pushFollow(FOLLOW_2);
             ruleValidID();
 
             state._fsp--;
@@ -74475,22 +74475,22 @@ public final void rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1() th
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26046:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalCheck.g:26046:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26050:1: ( ( ruleJvmArgumentTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26051:1: ( ruleJvmArgumentTypeReference )
+            // InternalCheck.g:26050:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalCheck.g:26051:1: ( ruleJvmArgumentTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26051:1: ( ruleJvmArgumentTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26052:1: ruleJvmArgumentTypeReference
+            // InternalCheck.g:26051:1: ( ruleJvmArgumentTypeReference )
+            // InternalCheck.g:26052:1: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_4_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_152531);
+            pushFollow(FOLLOW_2);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -74520,22 +74520,22 @@ public final void rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26061:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalCheck.g:26061:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26065:1: ( ( ruleJvmArgumentTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26066:1: ( ruleJvmArgumentTypeReference )
+            // InternalCheck.g:26065:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalCheck.g:26066:1: ( ruleJvmArgumentTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26066:1: ( ruleJvmArgumentTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26067:1: ruleJvmArgumentTypeReference
+            // InternalCheck.g:26066:1: ( ruleJvmArgumentTypeReference )
+            // InternalCheck.g:26067:1: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_4_2_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_152562);
+            pushFollow(FOLLOW_2);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -74565,22 +74565,22 @@ public final void rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26076:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 : ( ruleJvmUpperBound ) ;
+    // InternalCheck.g:26076:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 : ( ruleJvmUpperBound ) ;
     public final void rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26080:1: ( ( ruleJvmUpperBound ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26081:1: ( ruleJvmUpperBound )
+            // InternalCheck.g:26080:1: ( ( ruleJvmUpperBound ) )
+            // InternalCheck.g:26081:1: ( ruleJvmUpperBound )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26081:1: ( ruleJvmUpperBound )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26082:1: ruleJvmUpperBound
+            // InternalCheck.g:26081:1: ( ruleJvmUpperBound )
+            // InternalCheck.g:26082:1: ruleJvmUpperBound
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmUpperBoundParserRuleCall_2_0_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmUpperBound_in_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_052593);
+            pushFollow(FOLLOW_2);
             ruleJvmUpperBound();
 
             state._fsp--;
@@ -74610,22 +74610,22 @@ public final void rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0()
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26091:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 : ( ruleJvmUpperBoundAnded ) ;
+    // InternalCheck.g:26091:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 : ( ruleJvmUpperBoundAnded ) ;
     public final void rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26095:1: ( ( ruleJvmUpperBoundAnded ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26096:1: ( ruleJvmUpperBoundAnded )
+            // InternalCheck.g:26095:1: ( ( ruleJvmUpperBoundAnded ) )
+            // InternalCheck.g:26096:1: ( ruleJvmUpperBoundAnded )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26096:1: ( ruleJvmUpperBoundAnded )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26097:1: ruleJvmUpperBoundAnded
+            // InternalCheck.g:26096:1: ( ruleJvmUpperBoundAnded )
+            // InternalCheck.g:26097:1: ruleJvmUpperBoundAnded
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmUpperBoundAndedParserRuleCall_2_0_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmUpperBoundAnded_in_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_152624);
+            pushFollow(FOLLOW_2);
             ruleJvmUpperBoundAnded();
 
             state._fsp--;
@@ -74655,22 +74655,22 @@ public final void rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1()
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26106:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 : ( ruleJvmLowerBound ) ;
+    // InternalCheck.g:26106:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 : ( ruleJvmLowerBound ) ;
     public final void rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26110:1: ( ( ruleJvmLowerBound ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26111:1: ( ruleJvmLowerBound )
+            // InternalCheck.g:26110:1: ( ( ruleJvmLowerBound ) )
+            // InternalCheck.g:26111:1: ( ruleJvmLowerBound )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26111:1: ( ruleJvmLowerBound )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26112:1: ruleJvmLowerBound
+            // InternalCheck.g:26111:1: ( ruleJvmLowerBound )
+            // InternalCheck.g:26112:1: ruleJvmLowerBound
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmLowerBoundParserRuleCall_2_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmLowerBound_in_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_052655);
+            pushFollow(FOLLOW_2);
             ruleJvmLowerBound();
 
             state._fsp--;
@@ -74700,22 +74700,22 @@ public final void rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0()
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26121:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 : ( ruleJvmLowerBoundAnded ) ;
+    // InternalCheck.g:26121:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 : ( ruleJvmLowerBoundAnded ) ;
     public final void rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26125:1: ( ( ruleJvmLowerBoundAnded ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26126:1: ( ruleJvmLowerBoundAnded )
+            // InternalCheck.g:26125:1: ( ( ruleJvmLowerBoundAnded ) )
+            // InternalCheck.g:26126:1: ( ruleJvmLowerBoundAnded )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26126:1: ( ruleJvmLowerBoundAnded )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26127:1: ruleJvmLowerBoundAnded
+            // InternalCheck.g:26126:1: ( ruleJvmLowerBoundAnded )
+            // InternalCheck.g:26127:1: ruleJvmLowerBoundAnded
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmLowerBoundAndedParserRuleCall_2_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmLowerBoundAnded_in_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_152686);
+            pushFollow(FOLLOW_2);
             ruleJvmLowerBoundAnded();
 
             state._fsp--;
@@ -74745,22 +74745,22 @@ public final void rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1()
 
 
     // $ANTLR start "rule__JvmUpperBound__TypeReferenceAssignment_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26136:1: rule__JvmUpperBound__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
+    // InternalCheck.g:26136:1: rule__JvmUpperBound__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
     public final void rule__JvmUpperBound__TypeReferenceAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26140:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26141:1: ( ruleJvmTypeReference )
+            // InternalCheck.g:26140:1: ( ( ruleJvmTypeReference ) )
+            // InternalCheck.g:26141:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26141:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26142:1: ruleJvmTypeReference
+            // InternalCheck.g:26141:1: ( ruleJvmTypeReference )
+            // InternalCheck.g:26142:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAccess().getTypeReferenceJvmTypeReferenceParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__JvmUpperBound__TypeReferenceAssignment_152717);
+            pushFollow(FOLLOW_2);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -74790,22 +74790,22 @@ public final void rule__JvmUpperBound__TypeReferenceAssignment_1() throws Recogn
 
 
     // $ANTLR start "rule__JvmUpperBoundAnded__TypeReferenceAssignment_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26151:1: rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
+    // InternalCheck.g:26151:1: rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
     public final void rule__JvmUpperBoundAnded__TypeReferenceAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26155:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26156:1: ( ruleJvmTypeReference )
+            // InternalCheck.g:26155:1: ( ( ruleJvmTypeReference ) )
+            // InternalCheck.g:26156:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26156:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26157:1: ruleJvmTypeReference
+            // InternalCheck.g:26156:1: ( ruleJvmTypeReference )
+            // InternalCheck.g:26157:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAndedAccess().getTypeReferenceJvmTypeReferenceParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__JvmUpperBoundAnded__TypeReferenceAssignment_152748);
+            pushFollow(FOLLOW_2);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -74835,22 +74835,22 @@ public final void rule__JvmUpperBoundAnded__TypeReferenceAssignment_1() throws R
 
 
     // $ANTLR start "rule__JvmLowerBound__TypeReferenceAssignment_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26166:1: rule__JvmLowerBound__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
+    // InternalCheck.g:26166:1: rule__JvmLowerBound__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
     public final void rule__JvmLowerBound__TypeReferenceAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26170:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26171:1: ( ruleJvmTypeReference )
+            // InternalCheck.g:26170:1: ( ( ruleJvmTypeReference ) )
+            // InternalCheck.g:26171:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26171:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26172:1: ruleJvmTypeReference
+            // InternalCheck.g:26171:1: ( ruleJvmTypeReference )
+            // InternalCheck.g:26172:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAccess().getTypeReferenceJvmTypeReferenceParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__JvmLowerBound__TypeReferenceAssignment_152779);
+            pushFollow(FOLLOW_2);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -74880,22 +74880,22 @@ public final void rule__JvmLowerBound__TypeReferenceAssignment_1() throws Recogn
 
 
     // $ANTLR start "rule__JvmLowerBoundAnded__TypeReferenceAssignment_1"
-    // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26181:1: rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
+    // InternalCheck.g:26181:1: rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
     public final void rule__JvmLowerBoundAnded__TypeReferenceAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26185:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26186:1: ( ruleJvmTypeReference )
+            // InternalCheck.g:26185:1: ( ( ruleJvmTypeReference ) )
+            // InternalCheck.g:26186:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26186:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:26187:1: ruleJvmTypeReference
+            // InternalCheck.g:26186:1: ( ruleJvmTypeReference )
+            // InternalCheck.g:26187:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAndedAccess().getTypeReferenceJvmTypeReferenceParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__JvmLowerBoundAnded__TypeReferenceAssignment_152810);
+            pushFollow(FOLLOW_2);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -74925,19 +74925,19 @@ public final void rule__JvmLowerBoundAnded__TypeReferenceAssignment_1() throws R
 
     // $ANTLR start synpred19_InternalCheck
     public final void synpred19_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3004:6: ( ( ( ruleXForLoopExpression ) ) )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3004:6: ( ( ruleXForLoopExpression ) )
+        // InternalCheck.g:3004:6: ( ( ( ruleXForLoopExpression ) ) )
+        // InternalCheck.g:3004:6: ( ( ruleXForLoopExpression ) )
         {
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3004:6: ( ( ruleXForLoopExpression ) )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3005:1: ( ruleXForLoopExpression )
+        // InternalCheck.g:3004:6: ( ( ruleXForLoopExpression ) )
+        // InternalCheck.g:3005:1: ( ruleXForLoopExpression )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getXPrimaryExpressionAccess().getXForLoopExpressionParserRuleCall_7()); 
         }
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3006:1: ( ruleXForLoopExpression )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3006:3: ruleXForLoopExpression
+        // InternalCheck.g:3006:1: ( ruleXForLoopExpression )
+        // InternalCheck.g:3006:3: ruleXForLoopExpression
         {
-        pushFollow(FOLLOW_ruleXForLoopExpression_in_synpred19_InternalCheck6401);
+        pushFollow(FOLLOW_2);
         ruleXForLoopExpression();
 
         state._fsp--;
@@ -74955,16 +74955,16 @@ public final void synpred19_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred20_InternalCheck
     public final void synpred20_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3010:6: ( ( ruleXBasicForLoopExpression ) )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3010:6: ( ruleXBasicForLoopExpression )
+        // InternalCheck.g:3010:6: ( ( ruleXBasicForLoopExpression ) )
+        // InternalCheck.g:3010:6: ( ruleXBasicForLoopExpression )
         {
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3010:6: ( ruleXBasicForLoopExpression )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3011:1: ruleXBasicForLoopExpression
+        // InternalCheck.g:3010:6: ( ruleXBasicForLoopExpression )
+        // InternalCheck.g:3011:1: ruleXBasicForLoopExpression
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getXPrimaryExpressionAccess().getXBasicForLoopExpressionParserRuleCall_8()); 
         }
-        pushFollow(FOLLOW_ruleXBasicForLoopExpression_in_synpred20_InternalCheck6419);
+        pushFollow(FOLLOW_2);
         ruleXBasicForLoopExpression();
 
         state._fsp--;
@@ -74979,19 +74979,19 @@ public final void synpred20_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred48_InternalCheck
     public final void synpred48_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3250:1: ( ( ( rule__XAnnotation__Group_3_1_0__0 ) ) )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3250:1: ( ( rule__XAnnotation__Group_3_1_0__0 ) )
+        // InternalCheck.g:3250:1: ( ( ( rule__XAnnotation__Group_3_1_0__0 ) ) )
+        // InternalCheck.g:3250:1: ( ( rule__XAnnotation__Group_3_1_0__0 ) )
         {
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3250:1: ( ( rule__XAnnotation__Group_3_1_0__0 ) )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3251:1: ( rule__XAnnotation__Group_3_1_0__0 )
+        // InternalCheck.g:3250:1: ( ( rule__XAnnotation__Group_3_1_0__0 ) )
+        // InternalCheck.g:3251:1: ( rule__XAnnotation__Group_3_1_0__0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getXAnnotationAccess().getGroup_3_1_0()); 
         }
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3252:1: ( rule__XAnnotation__Group_3_1_0__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3252:2: rule__XAnnotation__Group_3_1_0__0
+        // InternalCheck.g:3252:1: ( rule__XAnnotation__Group_3_1_0__0 )
+        // InternalCheck.g:3252:2: rule__XAnnotation__Group_3_1_0__0
         {
-        pushFollow(FOLLOW_rule__XAnnotation__Group_3_1_0__0_in_synpred48_InternalCheck7019);
+        pushFollow(FOLLOW_2);
         rule__XAnnotation__Group_3_1_0__0();
 
         state._fsp--;
@@ -75009,19 +75009,19 @@ public final void synpred48_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred49_InternalCheck
     public final void synpred49_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3272:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) ) )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3272:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) )
+        // InternalCheck.g:3272:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) ) )
+        // InternalCheck.g:3272:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) )
         {
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3272:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3273:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__0 )
+        // InternalCheck.g:3272:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) )
+        // InternalCheck.g:3273:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_0()); 
         }
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3274:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3274:2: rule__XAnnotationElementValueOrCommaList__Group_0__0
+        // InternalCheck.g:3274:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__0 )
+        // InternalCheck.g:3274:2: rule__XAnnotationElementValueOrCommaList__Group_0__0
         {
-        pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__0_in_synpred49_InternalCheck7070);
+        pushFollow(FOLLOW_2);
         rule__XAnnotationElementValueOrCommaList__Group_0__0();
 
         state._fsp--;
@@ -75039,19 +75039,19 @@ public final void synpred49_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred50_InternalCheck
     public final void synpred50_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3294:1: ( ( ( rule__XAnnotationElementValue__Group_0__0 ) ) )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3294:1: ( ( rule__XAnnotationElementValue__Group_0__0 ) )
+        // InternalCheck.g:3294:1: ( ( ( rule__XAnnotationElementValue__Group_0__0 ) ) )
+        // InternalCheck.g:3294:1: ( ( rule__XAnnotationElementValue__Group_0__0 ) )
         {
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3294:1: ( ( rule__XAnnotationElementValue__Group_0__0 ) )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3295:1: ( rule__XAnnotationElementValue__Group_0__0 )
+        // InternalCheck.g:3294:1: ( ( rule__XAnnotationElementValue__Group_0__0 ) )
+        // InternalCheck.g:3295:1: ( rule__XAnnotationElementValue__Group_0__0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getXAnnotationElementValueAccess().getGroup_0()); 
         }
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3296:1: ( rule__XAnnotationElementValue__Group_0__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3296:2: rule__XAnnotationElementValue__Group_0__0
+        // InternalCheck.g:3296:1: ( rule__XAnnotationElementValue__Group_0__0 )
+        // InternalCheck.g:3296:2: rule__XAnnotationElementValue__Group_0__0
         {
-        pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0__0_in_synpred50_InternalCheck7121);
+        pushFollow(FOLLOW_2);
         rule__XAnnotationElementValue__Group_0__0();
 
         state._fsp--;
@@ -75069,19 +75069,19 @@ public final void synpred50_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred75_InternalCheck
     public final void synpred75_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3626:1: ( ( ( rule__OpOther__Group_6_1_0__0 ) ) )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3626:1: ( ( rule__OpOther__Group_6_1_0__0 ) )
+        // InternalCheck.g:3626:1: ( ( ( rule__OpOther__Group_6_1_0__0 ) ) )
+        // InternalCheck.g:3626:1: ( ( rule__OpOther__Group_6_1_0__0 ) )
         {
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3626:1: ( ( rule__OpOther__Group_6_1_0__0 ) )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3627:1: ( rule__OpOther__Group_6_1_0__0 )
+        // InternalCheck.g:3626:1: ( ( rule__OpOther__Group_6_1_0__0 ) )
+        // InternalCheck.g:3627:1: ( rule__OpOther__Group_6_1_0__0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getOpOtherAccess().getGroup_6_1_0()); 
         }
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3628:1: ( rule__OpOther__Group_6_1_0__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3628:2: rule__OpOther__Group_6_1_0__0
+        // InternalCheck.g:3628:1: ( rule__OpOther__Group_6_1_0__0 )
+        // InternalCheck.g:3628:2: rule__OpOther__Group_6_1_0__0
         {
-        pushFollow(FOLLOW_rule__OpOther__Group_6_1_0__0_in_synpred75_InternalCheck7903);
+        pushFollow(FOLLOW_2);
         rule__OpOther__Group_6_1_0__0();
 
         state._fsp--;
@@ -75099,16 +75099,16 @@ public final void synpred75_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred76_InternalCheck
     public final void synpred76_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3632:6: ( ( '<' ) )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3632:6: ( '<' )
+        // InternalCheck.g:3632:6: ( ( '<' ) )
+        // InternalCheck.g:3632:6: ( '<' )
         {
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3632:6: ( '<' )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3633:1: '<'
+        // InternalCheck.g:3632:6: ( '<' )
+        // InternalCheck.g:3633:1: '<'
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_1_1()); 
         }
-        match(input,47,FOLLOW_47_in_synpred76_InternalCheck7922); if (state.failed) return ;
+        match(input,47,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -75119,19 +75119,19 @@ public final void synpred76_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred89_InternalCheck
     public final void synpred89_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3884:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) ) )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3884:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) )
+        // InternalCheck.g:3884:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) ) )
+        // InternalCheck.g:3884:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) )
         {
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3884:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3885:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 )
+        // InternalCheck.g:3884:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) )
+        // InternalCheck.g:3885:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsAssignment_1_1_3_1_0()); 
         }
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3886:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3886:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0
+        // InternalCheck.g:3886:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 )
+        // InternalCheck.g:3886:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0
         {
-        pushFollow(FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0_in_synpred89_InternalCheck8481);
+        pushFollow(FOLLOW_2);
         rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0();
 
         state._fsp--;
@@ -75149,19 +75149,19 @@ public final void synpred89_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred97_InternalCheck
     public final void synpred97_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3980:1: ( ( ( rule__XSwitchExpression__Group_2_0__0 ) ) )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3980:1: ( ( rule__XSwitchExpression__Group_2_0__0 ) )
+        // InternalCheck.g:3980:1: ( ( ( rule__XSwitchExpression__Group_2_0__0 ) ) )
+        // InternalCheck.g:3980:1: ( ( rule__XSwitchExpression__Group_2_0__0 ) )
         {
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3980:1: ( ( rule__XSwitchExpression__Group_2_0__0 ) )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3981:1: ( rule__XSwitchExpression__Group_2_0__0 )
+        // InternalCheck.g:3980:1: ( ( rule__XSwitchExpression__Group_2_0__0 ) )
+        // InternalCheck.g:3981:1: ( rule__XSwitchExpression__Group_2_0__0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getXSwitchExpressionAccess().getGroup_2_0()); 
         }
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3982:1: ( rule__XSwitchExpression__Group_2_0__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:3982:2: rule__XSwitchExpression__Group_2_0__0
+        // InternalCheck.g:3982:1: ( rule__XSwitchExpression__Group_2_0__0 )
+        // InternalCheck.g:3982:2: rule__XSwitchExpression__Group_2_0__0
         {
-        pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0__0_in_synpred97_InternalCheck8717);
+        pushFollow(FOLLOW_2);
         rule__XSwitchExpression__Group_2_0__0();
 
         state._fsp--;
@@ -75179,19 +75179,19 @@ public final void synpred97_InternalCheck_fragment() throws RecognitionException
 
     // $ANTLR start synpred101_InternalCheck
     public final void synpred101_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4070:1: ( ( ( rule__XVariableDeclaration__Group_2_0__0 ) ) )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4070:1: ( ( rule__XVariableDeclaration__Group_2_0__0 ) )
+        // InternalCheck.g:4070:1: ( ( ( rule__XVariableDeclaration__Group_2_0__0 ) ) )
+        // InternalCheck.g:4070:1: ( ( rule__XVariableDeclaration__Group_2_0__0 ) )
         {
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4070:1: ( ( rule__XVariableDeclaration__Group_2_0__0 ) )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4071:1: ( rule__XVariableDeclaration__Group_2_0__0 )
+        // InternalCheck.g:4070:1: ( ( rule__XVariableDeclaration__Group_2_0__0 ) )
+        // InternalCheck.g:4071:1: ( rule__XVariableDeclaration__Group_2_0__0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getXVariableDeclarationAccess().getGroup_2_0()); 
         }
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4072:1: ( rule__XVariableDeclaration__Group_2_0__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4072:2: rule__XVariableDeclaration__Group_2_0__0
+        // InternalCheck.g:4072:1: ( rule__XVariableDeclaration__Group_2_0__0 )
+        // InternalCheck.g:4072:2: rule__XVariableDeclaration__Group_2_0__0
         {
-        pushFollow(FOLLOW_rule__XVariableDeclaration__Group_2_0__0_in_synpred101_InternalCheck8921);
+        pushFollow(FOLLOW_2);
         rule__XVariableDeclaration__Group_2_0__0();
 
         state._fsp--;
@@ -75209,19 +75209,19 @@ public final void synpred101_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred102_InternalCheck
     public final void synpred102_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4092:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) ) )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4092:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) )
+        // InternalCheck.g:4092:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) ) )
+        // InternalCheck.g:4092:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) )
         {
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4092:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4093:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 )
+        // InternalCheck.g:4092:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) )
+        // InternalCheck.g:4093:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsAssignment_3_1_0()); 
         }
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4094:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4094:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0
+        // InternalCheck.g:4094:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 )
+        // InternalCheck.g:4094:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0
         {
-        pushFollow(FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0_in_synpred102_InternalCheck8972);
+        pushFollow(FOLLOW_2);
         rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0();
 
         state._fsp--;
@@ -75239,19 +75239,19 @@ public final void synpred102_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred104_InternalCheck
     public final void synpred104_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4138:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) ) )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4138:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) )
+        // InternalCheck.g:4138:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) ) )
+        // InternalCheck.g:4138:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) )
         {
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4138:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4139:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 )
+        // InternalCheck.g:4138:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) )
+        // InternalCheck.g:4139:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getXConstructorCallAccess().getArgumentsAssignment_4_1_0()); 
         }
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4140:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:4140:2: rule__XConstructorCall__ArgumentsAssignment_4_1_0
+        // InternalCheck.g:4140:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 )
+        // InternalCheck.g:4140:2: rule__XConstructorCall__ArgumentsAssignment_4_1_0
         {
-        pushFollow(FOLLOW_rule__XConstructorCall__ArgumentsAssignment_4_1_0_in_synpred104_InternalCheck9075);
+        pushFollow(FOLLOW_2);
         rule__XConstructorCall__ArgumentsAssignment_4_1_0();
 
         state._fsp--;
@@ -75269,10 +75269,10 @@ public final void synpred104_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred129_InternalCheck
     public final void synpred129_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5393:2: ( rule__Check__Group_6__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:5393:2: rule__Check__Group_6__0
+        // InternalCheck.g:5393:2: ( rule__Check__Group_6__0 )
+        // InternalCheck.g:5393:2: rule__Check__Group_6__0
         {
-        pushFollow(FOLLOW_rule__Check__Group_6__0_in_synpred129_InternalCheck11665);
+        pushFollow(FOLLOW_2);
         rule__Check__Group_6__0();
 
         state._fsp--;
@@ -75284,10 +75284,10 @@ public final void synpred129_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred140_InternalCheck
     public final void synpred140_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7262:2: ( rule__XIssueExpression__CheckAssignment_2 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7262:2: rule__XIssueExpression__CheckAssignment_2
+        // InternalCheck.g:7262:2: ( rule__XIssueExpression__CheckAssignment_2 )
+        // InternalCheck.g:7262:2: rule__XIssueExpression__CheckAssignment_2
         {
-        pushFollow(FOLLOW_rule__XIssueExpression__CheckAssignment_2_in_synpred140_InternalCheck15337);
+        pushFollow(FOLLOW_2);
         rule__XIssueExpression__CheckAssignment_2();
 
         state._fsp--;
@@ -75299,10 +75299,10 @@ public final void synpred140_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred141_InternalCheck
     public final void synpred141_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7291:2: ( rule__XIssueExpression__Group_3__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7291:2: rule__XIssueExpression__Group_3__0
+        // InternalCheck.g:7291:2: ( rule__XIssueExpression__Group_3__0 )
+        // InternalCheck.g:7291:2: rule__XIssueExpression__Group_3__0
         {
-        pushFollow(FOLLOW_rule__XIssueExpression__Group_3__0_in_synpred141_InternalCheck15398);
+        pushFollow(FOLLOW_2);
         rule__XIssueExpression__Group_3__0();
 
         state._fsp--;
@@ -75314,10 +75314,10 @@ public final void synpred141_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred142_InternalCheck
     public final void synpred142_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7320:2: ( rule__XIssueExpression__Group_4__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7320:2: rule__XIssueExpression__Group_4__0
+        // InternalCheck.g:7320:2: ( rule__XIssueExpression__Group_4__0 )
+        // InternalCheck.g:7320:2: rule__XIssueExpression__Group_4__0
         {
-        pushFollow(FOLLOW_rule__XIssueExpression__Group_4__0_in_synpred142_InternalCheck15459);
+        pushFollow(FOLLOW_2);
         rule__XIssueExpression__Group_4__0();
 
         state._fsp--;
@@ -75329,10 +75329,10 @@ public final void synpred142_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred143_InternalCheck
     public final void synpred143_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7349:2: ( rule__XIssueExpression__Group_5__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7349:2: rule__XIssueExpression__Group_5__0
+        // InternalCheck.g:7349:2: ( rule__XIssueExpression__Group_5__0 )
+        // InternalCheck.g:7349:2: rule__XIssueExpression__Group_5__0
         {
-        pushFollow(FOLLOW_rule__XIssueExpression__Group_5__0_in_synpred143_InternalCheck15520);
+        pushFollow(FOLLOW_2);
         rule__XIssueExpression__Group_5__0();
 
         state._fsp--;
@@ -75344,10 +75344,10 @@ public final void synpred143_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred144_InternalCheck
     public final void synpred144_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7377:2: ( rule__XIssueExpression__Group_6__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7377:2: rule__XIssueExpression__Group_6__0
+        // InternalCheck.g:7377:2: ( rule__XIssueExpression__Group_6__0 )
+        // InternalCheck.g:7377:2: rule__XIssueExpression__Group_6__0
         {
-        pushFollow(FOLLOW_rule__XIssueExpression__Group_6__0_in_synpred144_InternalCheck15578);
+        pushFollow(FOLLOW_2);
         rule__XIssueExpression__Group_6__0();
 
         state._fsp--;
@@ -75359,10 +75359,10 @@ public final void synpred144_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred145_InternalCheck
     public final void synpred145_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7479:2: ( rule__XIssueExpression__Group_3_2__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7479:2: rule__XIssueExpression__Group_3_2__0
+        // InternalCheck.g:7479:2: ( rule__XIssueExpression__Group_3_2__0 )
+        // InternalCheck.g:7479:2: rule__XIssueExpression__Group_3_2__0
         {
-        pushFollow(FOLLOW_rule__XIssueExpression__Group_3_2__0_in_synpred145_InternalCheck15774);
+        pushFollow(FOLLOW_2);
         rule__XIssueExpression__Group_3_2__0();
 
         state._fsp--;
@@ -75374,10 +75374,10 @@ public final void synpred145_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred146_InternalCheck
     public final void synpred146_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7605:2: ( rule__XIssueExpression__Group_3_1_1_1__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:7605:2: rule__XIssueExpression__Group_3_1_1_1__0
+        // InternalCheck.g:7605:2: ( rule__XIssueExpression__Group_3_1_1_1__0 )
+        // InternalCheck.g:7605:2: rule__XIssueExpression__Group_3_1_1_1__0
         {
-        pushFollow(FOLLOW_rule__XIssueExpression__Group_3_1_1_1__0_in_synpred146_InternalCheck16023);
+        pushFollow(FOLLOW_2);
         rule__XIssueExpression__Group_3_1_1_1__0();
 
         state._fsp--;
@@ -75389,10 +75389,10 @@ public final void synpred146_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred150_InternalCheck
     public final void synpred150_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8427:2: ( rule__XAnnotation__Group_3__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:8427:2: rule__XAnnotation__Group_3__0
+        // InternalCheck.g:8427:2: ( rule__XAnnotation__Group_3__0 )
+        // InternalCheck.g:8427:2: rule__XAnnotation__Group_3__0
         {
-        pushFollow(FOLLOW_rule__XAnnotation__Group_3__0_in_synpred150_InternalCheck17652);
+        pushFollow(FOLLOW_2);
         rule__XAnnotation__Group_3__0();
 
         state._fsp--;
@@ -75404,10 +75404,10 @@ public final void synpred150_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred159_InternalCheck
     public final void synpred159_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9877:2: ( rule__XAssignment__Group_1_1__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:9877:2: rule__XAssignment__Group_1_1__0
+        // InternalCheck.g:9877:2: ( rule__XAssignment__Group_1_1__0 )
+        // InternalCheck.g:9877:2: rule__XAssignment__Group_1_1__0
         {
-        pushFollow(FOLLOW_rule__XAssignment__Group_1_1__0_in_synpred159_InternalCheck20499);
+        pushFollow(FOLLOW_2);
         rule__XAssignment__Group_1_1__0();
 
         state._fsp--;
@@ -75419,10 +75419,10 @@ public final void synpred159_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred161_InternalCheck
     public final void synpred161_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10288:2: ( rule__XOrExpression__Group_1__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10288:2: rule__XOrExpression__Group_1__0
+        // InternalCheck.g:10288:2: ( rule__XOrExpression__Group_1__0 )
+        // InternalCheck.g:10288:2: rule__XOrExpression__Group_1__0
         {
-        pushFollow(FOLLOW_rule__XOrExpression__Group_1__0_in_synpred161_InternalCheck21303);
+        pushFollow(FOLLOW_2);
         rule__XOrExpression__Group_1__0();
 
         state._fsp--;
@@ -75434,10 +75434,10 @@ public final void synpred161_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred162_InternalCheck
     public final void synpred162_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10503:2: ( rule__XAndExpression__Group_1__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10503:2: rule__XAndExpression__Group_1__0
+        // InternalCheck.g:10503:2: ( rule__XAndExpression__Group_1__0 )
+        // InternalCheck.g:10503:2: rule__XAndExpression__Group_1__0
         {
-        pushFollow(FOLLOW_rule__XAndExpression__Group_1__0_in_synpred162_InternalCheck21726);
+        pushFollow(FOLLOW_2);
         rule__XAndExpression__Group_1__0();
 
         state._fsp--;
@@ -75449,10 +75449,10 @@ public final void synpred162_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred163_InternalCheck
     public final void synpred163_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10718:2: ( rule__XEqualityExpression__Group_1__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10718:2: rule__XEqualityExpression__Group_1__0
+        // InternalCheck.g:10718:2: ( rule__XEqualityExpression__Group_1__0 )
+        // InternalCheck.g:10718:2: rule__XEqualityExpression__Group_1__0
         {
-        pushFollow(FOLLOW_rule__XEqualityExpression__Group_1__0_in_synpred163_InternalCheck22149);
+        pushFollow(FOLLOW_2);
         rule__XEqualityExpression__Group_1__0();
 
         state._fsp--;
@@ -75464,10 +75464,10 @@ public final void synpred163_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred164_InternalCheck
     public final void synpred164_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10933:2: ( rule__XRelationalExpression__Alternatives_1 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:10933:2: rule__XRelationalExpression__Alternatives_1
+        // InternalCheck.g:10933:2: ( rule__XRelationalExpression__Alternatives_1 )
+        // InternalCheck.g:10933:2: rule__XRelationalExpression__Alternatives_1
         {
-        pushFollow(FOLLOW_rule__XRelationalExpression__Alternatives_1_in_synpred164_InternalCheck22572);
+        pushFollow(FOLLOW_2);
         rule__XRelationalExpression__Alternatives_1();
 
         state._fsp--;
@@ -75479,10 +75479,10 @@ public final void synpred164_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred165_InternalCheck
     public final void synpred165_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11369:2: ( rule__XOtherOperatorExpression__Group_1__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11369:2: rule__XOtherOperatorExpression__Group_1__0
+        // InternalCheck.g:11369:2: ( rule__XOtherOperatorExpression__Group_1__0 )
+        // InternalCheck.g:11369:2: rule__XOtherOperatorExpression__Group_1__0
         {
-        pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1__0_in_synpred165_InternalCheck23424);
+        pushFollow(FOLLOW_2);
         rule__XOtherOperatorExpression__Group_1__0();
 
         state._fsp--;
@@ -75494,10 +75494,10 @@ public final void synpred165_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred166_InternalCheck
     public final void synpred166_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11965:2: ( rule__XAdditiveExpression__Group_1__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:11965:2: rule__XAdditiveExpression__Group_1__0
+        // InternalCheck.g:11965:2: ( rule__XAdditiveExpression__Group_1__0 )
+        // InternalCheck.g:11965:2: rule__XAdditiveExpression__Group_1__0
         {
-        pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1__0_in_synpred166_InternalCheck24586);
+        pushFollow(FOLLOW_2);
         rule__XAdditiveExpression__Group_1__0();
 
         state._fsp--;
@@ -75509,10 +75509,10 @@ public final void synpred166_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred167_InternalCheck
     public final void synpred167_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12180:2: ( rule__XMultiplicativeExpression__Group_1__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12180:2: rule__XMultiplicativeExpression__Group_1__0
+        // InternalCheck.g:12180:2: ( rule__XMultiplicativeExpression__Group_1__0 )
+        // InternalCheck.g:12180:2: rule__XMultiplicativeExpression__Group_1__0
         {
-        pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1__0_in_synpred167_InternalCheck25009);
+        pushFollow(FOLLOW_2);
         rule__XMultiplicativeExpression__Group_1__0();
 
         state._fsp--;
@@ -75524,10 +75524,10 @@ public final void synpred167_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred168_InternalCheck
     public final void synpred168_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12489:2: ( rule__XCastedExpression__Group_1__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12489:2: rule__XCastedExpression__Group_1__0
+        // InternalCheck.g:12489:2: ( rule__XCastedExpression__Group_1__0 )
+        // InternalCheck.g:12489:2: rule__XCastedExpression__Group_1__0
         {
-        pushFollow(FOLLOW_rule__XCastedExpression__Group_1__0_in_synpred168_InternalCheck25616);
+        pushFollow(FOLLOW_2);
         rule__XCastedExpression__Group_1__0();
 
         state._fsp--;
@@ -75539,10 +75539,10 @@ public final void synpred168_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred169_InternalCheck
     public final void synpred169_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12706:2: ( rule__XPostfixOperation__Group_1__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12706:2: rule__XPostfixOperation__Group_1__0
+        // InternalCheck.g:12706:2: ( rule__XPostfixOperation__Group_1__0 )
+        // InternalCheck.g:12706:2: rule__XPostfixOperation__Group_1__0
         {
-        pushFollow(FOLLOW_rule__XPostfixOperation__Group_1__0_in_synpred169_InternalCheck26041);
+        pushFollow(FOLLOW_2);
         rule__XPostfixOperation__Group_1__0();
 
         state._fsp--;
@@ -75554,10 +75554,10 @@ public final void synpred169_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred170_InternalCheck
     public final void synpred170_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12860:2: ( rule__XMemberFeatureCall__Alternatives_1 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:12860:2: rule__XMemberFeatureCall__Alternatives_1
+        // InternalCheck.g:12860:2: ( rule__XMemberFeatureCall__Alternatives_1 )
+        // InternalCheck.g:12860:2: rule__XMemberFeatureCall__Alternatives_1
         {
-        pushFollow(FOLLOW_rule__XMemberFeatureCall__Alternatives_1_in_synpred170_InternalCheck26343);
+        pushFollow(FOLLOW_2);
         rule__XMemberFeatureCall__Alternatives_1();
 
         state._fsp--;
@@ -75569,10 +75569,10 @@ public final void synpred170_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred172_InternalCheck
     public final void synpred172_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13196:2: ( rule__XMemberFeatureCall__Group_1_1_3__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13196:2: rule__XMemberFeatureCall__Group_1_1_3__0
+        // InternalCheck.g:13196:2: ( rule__XMemberFeatureCall__Group_1_1_3__0 )
+        // InternalCheck.g:13196:2: rule__XMemberFeatureCall__Group_1_1_3__0
         {
-        pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__0_in_synpred172_InternalCheck27014);
+        pushFollow(FOLLOW_2);
         rule__XMemberFeatureCall__Group_1_1_3__0();
 
         state._fsp--;
@@ -75584,10 +75584,10 @@ public final void synpred172_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred173_InternalCheck
     public final void synpred173_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13224:2: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:13224:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4
+        // InternalCheck.g:13224:2: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )
+        // InternalCheck.g:13224:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4
         {
-        pushFollow(FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4_in_synpred173_InternalCheck27072);
+        pushFollow(FOLLOW_2);
         rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4();
 
         state._fsp--;
@@ -75599,10 +75599,10 @@ public final void synpred173_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred181_InternalCheck
     public final void synpred181_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14365:2: ( rule__XClosure__Group_1__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:14365:2: rule__XClosure__Group_1__0
+        // InternalCheck.g:14365:2: ( rule__XClosure__Group_1__0 )
+        // InternalCheck.g:14365:2: rule__XClosure__Group_1__0
         {
-        pushFollow(FOLLOW_rule__XClosure__Group_1__0_in_synpred181_InternalCheck29308);
+        pushFollow(FOLLOW_2);
         rule__XClosure__Group_1__0();
 
         state._fsp--;
@@ -75614,10 +75614,10 @@ public final void synpred181_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred188_InternalCheck
     public final void synpred188_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15483:2: ( rule__XIfExpression__Group_6__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:15483:2: rule__XIfExpression__Group_6__0
+        // InternalCheck.g:15483:2: ( rule__XIfExpression__Group_6__0 )
+        // InternalCheck.g:15483:2: rule__XIfExpression__Group_6__0
         {
-        pushFollow(FOLLOW_rule__XIfExpression__Group_6__0_in_synpred188_InternalCheck31514);
+        pushFollow(FOLLOW_2);
         rule__XIfExpression__Group_6__0();
 
         state._fsp--;
@@ -75629,10 +75629,10 @@ public final void synpred188_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred191_InternalCheck
     public final void synpred191_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16033:2: ( rule__XSwitchExpression__Group_2_1_0__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:16033:2: rule__XSwitchExpression__Group_2_1_0__0
+        // InternalCheck.g:16033:2: ( rule__XSwitchExpression__Group_2_1_0__0 )
+        // InternalCheck.g:16033:2: rule__XSwitchExpression__Group_2_1_0__0
         {
-        pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1_0__0_in_synpred191_InternalCheck32585);
+        pushFollow(FOLLOW_2);
         rule__XSwitchExpression__Group_2_1_0__0();
 
         state._fsp--;
@@ -75644,10 +75644,10 @@ public final void synpred191_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred204_InternalCheck
     public final void synpred204_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18521:2: ( rule__XFeatureCall__Group_3__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18521:2: rule__XFeatureCall__Group_3__0
+        // InternalCheck.g:18521:2: ( rule__XFeatureCall__Group_3__0 )
+        // InternalCheck.g:18521:2: rule__XFeatureCall__Group_3__0
         {
-        pushFollow(FOLLOW_rule__XFeatureCall__Group_3__0_in_synpred204_InternalCheck37479);
+        pushFollow(FOLLOW_2);
         rule__XFeatureCall__Group_3__0();
 
         state._fsp--;
@@ -75659,10 +75659,10 @@ public final void synpred204_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred205_InternalCheck
     public final void synpred205_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18549:2: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:18549:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_4
+        // InternalCheck.g:18549:2: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )
+        // InternalCheck.g:18549:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_4
         {
-        pushFollow(FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_4_in_synpred205_InternalCheck37537);
+        pushFollow(FOLLOW_2);
         rule__XFeatureCall__FeatureCallArgumentsAssignment_4();
 
         state._fsp--;
@@ -75674,10 +75674,10 @@ public final void synpred205_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred209_InternalCheck
     public final void synpred209_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19087:2: ( rule__XConstructorCall__Group_3__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19087:2: rule__XConstructorCall__Group_3__0
+        // InternalCheck.g:19087:2: ( rule__XConstructorCall__Group_3__0 )
+        // InternalCheck.g:19087:2: rule__XConstructorCall__Group_3__0
         {
-        pushFollow(FOLLOW_rule__XConstructorCall__Group_3__0_in_synpred209_InternalCheck38595);
+        pushFollow(FOLLOW_2);
         rule__XConstructorCall__Group_3__0();
 
         state._fsp--;
@@ -75689,10 +75689,10 @@ public final void synpred209_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred210_InternalCheck
     public final void synpred210_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19116:2: ( rule__XConstructorCall__Group_4__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19116:2: rule__XConstructorCall__Group_4__0
+        // InternalCheck.g:19116:2: ( rule__XConstructorCall__Group_4__0 )
+        // InternalCheck.g:19116:2: rule__XConstructorCall__Group_4__0
         {
-        pushFollow(FOLLOW_rule__XConstructorCall__Group_4__0_in_synpred210_InternalCheck38656);
+        pushFollow(FOLLOW_2);
         rule__XConstructorCall__Group_4__0();
 
         state._fsp--;
@@ -75704,10 +75704,10 @@ public final void synpred210_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred211_InternalCheck
     public final void synpred211_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19144:2: ( rule__XConstructorCall__ArgumentsAssignment_5 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:19144:2: rule__XConstructorCall__ArgumentsAssignment_5
+        // InternalCheck.g:19144:2: ( rule__XConstructorCall__ArgumentsAssignment_5 )
+        // InternalCheck.g:19144:2: rule__XConstructorCall__ArgumentsAssignment_5
         {
-        pushFollow(FOLLOW_rule__XConstructorCall__ArgumentsAssignment_5_in_synpred211_InternalCheck38714);
+        pushFollow(FOLLOW_2);
         rule__XConstructorCall__ArgumentsAssignment_5();
 
         state._fsp--;
@@ -75719,10 +75719,10 @@ public final void synpred211_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred216_InternalCheck
     public final void synpred216_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20197:2: ( rule__XReturnExpression__ExpressionAssignment_2 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20197:2: rule__XReturnExpression__ExpressionAssignment_2
+        // InternalCheck.g:20197:2: ( rule__XReturnExpression__ExpressionAssignment_2 )
+        // InternalCheck.g:20197:2: rule__XReturnExpression__ExpressionAssignment_2
         {
-        pushFollow(FOLLOW_rule__XReturnExpression__ExpressionAssignment_2_in_synpred216_InternalCheck40766);
+        pushFollow(FOLLOW_2);
         rule__XReturnExpression__ExpressionAssignment_2();
 
         state._fsp--;
@@ -75734,10 +75734,10 @@ public final void synpred216_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred217_InternalCheck
     public final void synpred217_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20365:2: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20365:2: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0
+        // InternalCheck.g:20365:2: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )
+        // InternalCheck.g:20365:2: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0
         {
-        pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0_in_synpred217_InternalCheck41095);
+        pushFollow(FOLLOW_2);
         rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0();
 
         state._fsp--;
@@ -75749,10 +75749,10 @@ public final void synpred217_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred218_InternalCheck
     public final void synpred218_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20394:2: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20394:2: rule__XTryCatchFinallyExpression__Group_3_0_1__0
+        // InternalCheck.g:20394:2: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )
+        // InternalCheck.g:20394:2: rule__XTryCatchFinallyExpression__Group_3_0_1__0
         {
-        pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__0_in_synpred218_InternalCheck41155);
+        pushFollow(FOLLOW_2);
         rule__XTryCatchFinallyExpression__Group_3_0_1__0();
 
         state._fsp--;
@@ -75764,10 +75764,10 @@ public final void synpred218_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred219_InternalCheck
     public final void synpred219_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20994:2: ( rule__QualifiedName__Group_1__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:20994:2: rule__QualifiedName__Group_1__0
+        // InternalCheck.g:20994:2: ( rule__QualifiedName__Group_1__0 )
+        // InternalCheck.g:20994:2: rule__QualifiedName__Group_1__0
         {
-        pushFollow(FOLLOW_rule__QualifiedName__Group_1__0_in_synpred219_InternalCheck42333);
+        pushFollow(FOLLOW_2);
         rule__QualifiedName__Group_1__0();
 
         state._fsp--;
@@ -75779,10 +75779,10 @@ public final void synpred219_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred221_InternalCheck
     public final void synpred221_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21243:2: ( rule__JvmTypeReference__Group_0_1__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21243:2: rule__JvmTypeReference__Group_0_1__0
+        // InternalCheck.g:21243:2: ( rule__JvmTypeReference__Group_0_1__0 )
+        // InternalCheck.g:21243:2: rule__JvmTypeReference__Group_0_1__0
         {
-        pushFollow(FOLLOW_rule__JvmTypeReference__Group_0_1__0_in_synpred221_InternalCheck42824);
+        pushFollow(FOLLOW_2);
         rule__JvmTypeReference__Group_0_1__0();
 
         state._fsp--;
@@ -75794,10 +75794,10 @@ public final void synpred221_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred225_InternalCheck
     public final void synpred225_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21776:2: ( rule__JvmParameterizedTypeReference__Group_1__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21776:2: rule__JvmParameterizedTypeReference__Group_1__0
+        // InternalCheck.g:21776:2: ( rule__JvmParameterizedTypeReference__Group_1__0 )
+        // InternalCheck.g:21776:2: rule__JvmParameterizedTypeReference__Group_1__0
         {
-        pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__0_in_synpred225_InternalCheck43870);
+        pushFollow(FOLLOW_2);
         rule__JvmParameterizedTypeReference__Group_1__0();
 
         state._fsp--;
@@ -75809,10 +75809,10 @@ public final void synpred225_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred227_InternalCheck
     public final void synpred227_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21928:2: ( rule__JvmParameterizedTypeReference__Group_1_4__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:21928:2: rule__JvmParameterizedTypeReference__Group_1_4__0
+        // InternalCheck.g:21928:2: ( rule__JvmParameterizedTypeReference__Group_1_4__0 )
+        // InternalCheck.g:21928:2: rule__JvmParameterizedTypeReference__Group_1_4__0
         {
-        pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__0_in_synpred227_InternalCheck44179);
+        pushFollow(FOLLOW_2);
         rule__JvmParameterizedTypeReference__Group_1_4__0();
 
         state._fsp--;
@@ -75824,10 +75824,10 @@ public final void synpred227_InternalCheck_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred228_InternalCheck
     public final void synpred228_InternalCheck_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22087:2: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )
-        // ../com.avaloq.tools.ddk.check.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalCheck.g:22087:2: rule__JvmParameterizedTypeReference__Group_1_4_2__0
+        // InternalCheck.g:22087:2: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )
+        // InternalCheck.g:22087:2: rule__JvmParameterizedTypeReference__Group_1_4_2__0
         {
-        pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__0_in_synpred228_InternalCheck44490);
+        pushFollow(FOLLOW_2);
         rule__JvmParameterizedTypeReference__Group_1_4_2__0();
 
         state._fsp--;
@@ -76570,19 +76570,13 @@ public final boolean synpred141_InternalCheck() {
     protected DFA150 dfa150 = new DFA150(this);
     protected DFA159 dfa159 = new DFA159(this);
     protected DFA162 dfa162 = new DFA162(this);
-    static final String DFA2_eotS =
-        "\6\uffff";
-    static final String DFA2_eofS =
-        "\1\uffff\1\3\3\uffff\1\3";
-    static final String DFA2_minS =
-        "\1\4\1\22\1\4\2\uffff\1\22";
-    static final String DFA2_maxS =
-        "\1\4\1\147\1\70\2\uffff\1\147";
-    static final String DFA2_acceptS =
-        "\3\uffff\1\1\1\2\1\uffff";
-    static final String DFA2_specialS =
-        "\6\uffff}>";
-    static final String[] DFA2_transitionS = {
+    static final String dfa_1s = "\6\uffff";
+    static final String dfa_2s = "\1\uffff\1\3\3\uffff\1\3";
+    static final String dfa_3s = "\1\4\1\22\1\4\2\uffff\1\22";
+    static final String dfa_4s = "\1\4\1\147\1\70\2\uffff\1\147";
+    static final String dfa_5s = "\3\uffff\1\1\1\2\1\uffff";
+    static final String dfa_6s = "\6\uffff}>";
+    static final String[] dfa_7s = {
             "\1\1",
             "\1\3\1\uffff\1\3\52\uffff\1\2\7\uffff\1\3\37\uffff\1\3",
             "\1\5\63\uffff\1\4",
@@ -76591,57 +76585,38 @@ public final boolean synpred141_InternalCheck() {
             "\1\3\1\uffff\1\3\52\uffff\1\2\7\uffff\1\3\37\uffff\1\3"
     };
 
-    static final short[] DFA2_eot = DFA.unpackEncodedString(DFA2_eotS);
-    static final short[] DFA2_eof = DFA.unpackEncodedString(DFA2_eofS);
-    static final char[] DFA2_min = DFA.unpackEncodedStringToUnsignedChars(DFA2_minS);
-    static final char[] DFA2_max = DFA.unpackEncodedStringToUnsignedChars(DFA2_maxS);
-    static final short[] DFA2_accept = DFA.unpackEncodedString(DFA2_acceptS);
-    static final short[] DFA2_special = DFA.unpackEncodedString(DFA2_specialS);
-    static final short[][] DFA2_transition;
-
-    static {
-        int numStates = DFA2_transitionS.length;
-        DFA2_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA2_transition[i] = DFA.unpackEncodedString(DFA2_transitionS[i]);
-        }
-    }
+    static final short[] dfa_1 = DFA.unpackEncodedString(dfa_1s);
+    static final short[] dfa_2 = DFA.unpackEncodedString(dfa_2s);
+    static final char[] dfa_3 = DFA.unpackEncodedStringToUnsignedChars(dfa_3s);
+    static final char[] dfa_4 = DFA.unpackEncodedStringToUnsignedChars(dfa_4s);
+    static final short[] dfa_5 = DFA.unpackEncodedString(dfa_5s);
+    static final short[] dfa_6 = DFA.unpackEncodedString(dfa_6s);
+    static final short[][] dfa_7 = unpackEncodedStringArray(dfa_7s);
 
     class DFA2 extends DFA {
 
         public DFA2(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 2;
-            this.eot = DFA2_eot;
-            this.eof = DFA2_eof;
-            this.min = DFA2_min;
-            this.max = DFA2_max;
-            this.accept = DFA2_accept;
-            this.special = DFA2_special;
-            this.transition = DFA2_transition;
+            this.eot = dfa_1;
+            this.eof = dfa_2;
+            this.min = dfa_3;
+            this.max = dfa_4;
+            this.accept = dfa_5;
+            this.special = dfa_6;
+            this.transition = dfa_7;
         }
         public String getDescription() {
             return "2817:1: rule__XImportDeclaration__Alternatives_1 : ( ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_0 ) ) | ( ( rule__XImportDeclaration__ImportedNamespaceAssignment_1_1 ) ) );";
         }
     }
-    static final String DFA9_eotS =
-        "\62\uffff";
-    static final String DFA9_eofS =
-        "\62\uffff";
-    static final String DFA9_minS =
-        "\1\4\46\uffff\1\0\12\uffff";
-    static final String DFA9_maxS =
-        "\1\154\46\uffff\1\0\12\uffff";
-    static final String DFA9_acceptS =
-        "\1\uffff\1\1\1\2\1\3\1\4\1\5\26\uffff\1\6\11\uffff\1\7\1\uffff"+
-        "\1\12\1\13\1\14\1\15\1\16\1\17\1\20\1\21\1\10\1\11";
-    static final String DFA9_specialS =
-        "\47\uffff\1\0\12\uffff}>";
-    static final String[] DFA9_transitionS = {
-            "\1\5\4\34\7\uffff\24\5\13\uffff\1\5\21\uffff\1\5\1\34\1\uffff"+
-            "\1\2\1\uffff\1\47\1\uffff\1\55\4\uffff\2\34\1\uffff\1\56\1\57"+
-            "\2\uffff\1\46\1\uffff\1\3\3\uffff\1\50\1\51\1\1\2\34\1\52\1"+
-            "\53\1\54\1\uffff\1\4\10\uffff\1\34",
+    static final String dfa_8s = "\62\uffff";
+    static final String dfa_9s = "\1\4\46\uffff\1\0\12\uffff";
+    static final String dfa_10s = "\1\154\46\uffff\1\0\12\uffff";
+    static final String dfa_11s = "\1\uffff\1\1\1\2\1\3\1\4\1\5\26\uffff\1\6\11\uffff\1\7\1\uffff\1\12\1\13\1\14\1\15\1\16\1\17\1\20\1\21\1\10\1\11";
+    static final String dfa_12s = "\47\uffff\1\0\12\uffff}>";
+    static final String[] dfa_13s = {
+            "\1\5\4\34\7\uffff\24\5\13\uffff\1\5\21\uffff\1\5\1\34\1\uffff\1\2\1\uffff\1\47\1\uffff\1\55\4\uffff\2\34\1\uffff\1\56\1\57\2\uffff\1\46\1\uffff\1\3\3\uffff\1\50\1\51\1\1\2\34\1\52\1\53\1\54\1\uffff\1\4\10\uffff\1\34",
             "",
             "",
             "",
@@ -76693,34 +76668,25 @@ public String getDescription() {
             ""
     };
 
-    static final short[] DFA9_eot = DFA.unpackEncodedString(DFA9_eotS);
-    static final short[] DFA9_eof = DFA.unpackEncodedString(DFA9_eofS);
-    static final char[] DFA9_min = DFA.unpackEncodedStringToUnsignedChars(DFA9_minS);
-    static final char[] DFA9_max = DFA.unpackEncodedStringToUnsignedChars(DFA9_maxS);
-    static final short[] DFA9_accept = DFA.unpackEncodedString(DFA9_acceptS);
-    static final short[] DFA9_special = DFA.unpackEncodedString(DFA9_specialS);
-    static final short[][] DFA9_transition;
-
-    static {
-        int numStates = DFA9_transitionS.length;
-        DFA9_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA9_transition[i] = DFA.unpackEncodedString(DFA9_transitionS[i]);
-        }
-    }
+    static final short[] dfa_8 = DFA.unpackEncodedString(dfa_8s);
+    static final char[] dfa_9 = DFA.unpackEncodedStringToUnsignedChars(dfa_9s);
+    static final char[] dfa_10 = DFA.unpackEncodedStringToUnsignedChars(dfa_10s);
+    static final short[] dfa_11 = DFA.unpackEncodedString(dfa_11s);
+    static final short[] dfa_12 = DFA.unpackEncodedString(dfa_12s);
+    static final short[][] dfa_13 = unpackEncodedStringArray(dfa_13s);
 
     class DFA9 extends DFA {
 
         public DFA9(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 9;
-            this.eot = DFA9_eot;
-            this.eof = DFA9_eof;
-            this.min = DFA9_min;
-            this.max = DFA9_max;
-            this.accept = DFA9_accept;
-            this.special = DFA9_special;
-            this.transition = DFA9_transition;
+            this.eot = dfa_8;
+            this.eof = dfa_8;
+            this.min = dfa_9;
+            this.max = dfa_10;
+            this.accept = dfa_11;
+            this.special = dfa_12;
+            this.transition = dfa_13;
         }
         public String getDescription() {
             return "2957:1: rule__XPrimaryExpression__Alternatives : ( ( ruleXConstructorCall ) | ( ruleXBlockExpression ) | ( ruleXSwitchExpression ) | ( ( ruleXSynchronizedExpression ) ) | ( ruleXFeatureCall ) | ( ruleXLiteral ) | ( ruleXIfExpression ) | ( ( ruleXForLoopExpression ) ) | ( ruleXBasicForLoopExpression ) | ( ruleXWhileExpression ) | ( ruleXDoWhileExpression ) | ( ruleXThrowExpression ) | ( ruleXReturnExpression ) | ( ruleXTryCatchFinallyExpression ) | ( ruleXParenthesizedExpression ) | ( ruleXGuardExpression ) | ( ruleXIssueExpression ) );";
@@ -76752,23 +76718,13 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA11_eotS =
-        "\65\uffff";
-    static final String DFA11_eofS =
-        "\65\uffff";
-    static final String DFA11_minS =
-        "\1\4\1\0\63\uffff";
-    static final String DFA11_maxS =
-        "\1\154\1\0\63\uffff";
-    static final String DFA11_acceptS =
-        "\2\uffff\1\2\61\uffff\1\1";
-    static final String DFA11_specialS =
-        "\1\uffff\1\0\63\uffff}>";
-    static final String[] DFA11_transitionS = {
-            "\1\1\4\2\7\uffff\24\2\13\uffff\1\2\6\uffff\2\2\4\uffff\1\2"+
-            "\4\uffff\2\2\1\uffff\1\2\1\uffff\1\2\1\uffff\1\2\2\uffff\1\2"+
-            "\1\uffff\2\2\1\uffff\2\2\2\uffff\1\2\1\uffff\1\2\3\uffff\10"+
-            "\2\1\uffff\1\2\10\uffff\1\2",
+    static final String dfa_14s = "\65\uffff";
+    static final String dfa_15s = "\1\4\1\0\63\uffff";
+    static final String dfa_16s = "\1\154\1\0\63\uffff";
+    static final String dfa_17s = "\2\uffff\1\2\61\uffff\1\1";
+    static final String dfa_18s = "\1\uffff\1\0\63\uffff}>";
+    static final String[] dfa_19s = {
+            "\1\1\4\2\7\uffff\24\2\13\uffff\1\2\6\uffff\2\2\4\uffff\1\2\4\uffff\2\2\1\uffff\1\2\1\uffff\1\2\1\uffff\1\2\2\uffff\1\2\1\uffff\2\2\1\uffff\2\2\2\uffff\1\2\1\uffff\1\2\3\uffff\10\2\1\uffff\1\2\10\uffff\1\2",
             "\1\uffff",
             "",
             "",
@@ -76823,34 +76779,25 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA11_eot = DFA.unpackEncodedString(DFA11_eotS);
-    static final short[] DFA11_eof = DFA.unpackEncodedString(DFA11_eofS);
-    static final char[] DFA11_min = DFA.unpackEncodedStringToUnsignedChars(DFA11_minS);
-    static final char[] DFA11_max = DFA.unpackEncodedStringToUnsignedChars(DFA11_maxS);
-    static final short[] DFA11_accept = DFA.unpackEncodedString(DFA11_acceptS);
-    static final short[] DFA11_special = DFA.unpackEncodedString(DFA11_specialS);
-    static final short[][] DFA11_transition;
-
-    static {
-        int numStates = DFA11_transitionS.length;
-        DFA11_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA11_transition[i] = DFA.unpackEncodedString(DFA11_transitionS[i]);
-        }
-    }
+    static final short[] dfa_14 = DFA.unpackEncodedString(dfa_14s);
+    static final char[] dfa_15 = DFA.unpackEncodedStringToUnsignedChars(dfa_15s);
+    static final char[] dfa_16 = DFA.unpackEncodedStringToUnsignedChars(dfa_16s);
+    static final short[] dfa_17 = DFA.unpackEncodedString(dfa_17s);
+    static final short[] dfa_18 = DFA.unpackEncodedString(dfa_18s);
+    static final short[][] dfa_19 = unpackEncodedStringArray(dfa_19s);
 
     class DFA11 extends DFA {
 
         public DFA11(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 11;
-            this.eot = DFA11_eot;
-            this.eof = DFA11_eof;
-            this.min = DFA11_min;
-            this.max = DFA11_max;
-            this.accept = DFA11_accept;
-            this.special = DFA11_special;
-            this.transition = DFA11_transition;
+            this.eot = dfa_14;
+            this.eof = dfa_14;
+            this.min = dfa_15;
+            this.max = dfa_16;
+            this.accept = dfa_17;
+            this.special = dfa_18;
+            this.transition = dfa_19;
         }
         public String getDescription() {
             return "3245:1: rule__XAnnotation__Alternatives_3_1 : ( ( ( rule__XAnnotation__Group_3_1_0__0 ) ) | ( ( rule__XAnnotation__ValueAssignment_3_1_1 ) ) );";
@@ -76882,23 +76829,8 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA12_eotS =
-        "\65\uffff";
-    static final String DFA12_eofS =
-        "\65\uffff";
-    static final String DFA12_minS =
-        "\1\4\1\0\63\uffff";
-    static final String DFA12_maxS =
-        "\1\154\1\0\63\uffff";
-    static final String DFA12_acceptS =
-        "\2\uffff\1\2\61\uffff\1\1";
-    static final String DFA12_specialS =
-        "\1\uffff\1\0\63\uffff}>";
-    static final String[] DFA12_transitionS = {
-            "\5\2\7\uffff\24\2\13\uffff\1\2\6\uffff\2\2\4\uffff\1\2\4\uffff"+
-            "\2\2\1\uffff\1\2\1\uffff\1\2\1\uffff\1\2\2\uffff\1\2\1\uffff"+
-            "\1\1\1\2\1\uffff\2\2\2\uffff\1\2\1\uffff\1\2\3\uffff\10\2\1"+
-            "\uffff\1\2\10\uffff\1\2",
+    static final String[] dfa_20s = {
+            "\5\2\7\uffff\24\2\13\uffff\1\2\6\uffff\2\2\4\uffff\1\2\4\uffff\2\2\1\uffff\1\2\1\uffff\1\2\1\uffff\1\2\2\uffff\1\2\1\uffff\1\1\1\2\1\uffff\2\2\2\uffff\1\2\1\uffff\1\2\3\uffff\10\2\1\uffff\1\2\10\uffff\1\2",
             "\1\uffff",
             "",
             "",
@@ -76952,35 +76884,20 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             "",
             ""
     };
-
-    static final short[] DFA12_eot = DFA.unpackEncodedString(DFA12_eotS);
-    static final short[] DFA12_eof = DFA.unpackEncodedString(DFA12_eofS);
-    static final char[] DFA12_min = DFA.unpackEncodedStringToUnsignedChars(DFA12_minS);
-    static final char[] DFA12_max = DFA.unpackEncodedStringToUnsignedChars(DFA12_maxS);
-    static final short[] DFA12_accept = DFA.unpackEncodedString(DFA12_acceptS);
-    static final short[] DFA12_special = DFA.unpackEncodedString(DFA12_specialS);
-    static final short[][] DFA12_transition;
-
-    static {
-        int numStates = DFA12_transitionS.length;
-        DFA12_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA12_transition[i] = DFA.unpackEncodedString(DFA12_transitionS[i]);
-        }
-    }
+    static final short[][] dfa_20 = unpackEncodedStringArray(dfa_20s);
 
     class DFA12 extends DFA {
 
         public DFA12(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 12;
-            this.eot = DFA12_eot;
-            this.eof = DFA12_eof;
-            this.min = DFA12_min;
-            this.max = DFA12_max;
-            this.accept = DFA12_accept;
-            this.special = DFA12_special;
-            this.transition = DFA12_transition;
+            this.eot = dfa_14;
+            this.eof = dfa_14;
+            this.min = dfa_15;
+            this.max = dfa_16;
+            this.accept = dfa_17;
+            this.special = dfa_18;
+            this.transition = dfa_20;
         }
         public String getDescription() {
             return "3267:1: rule__XAnnotationElementValueOrCommaList__Alternatives : ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) ) | ( ( rule__XAnnotationElementValueOrCommaList__Group_1__0 ) ) );";
@@ -77012,105 +76929,19 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA13_eotS =
-        "\65\uffff";
-    static final String DFA13_eofS =
-        "\65\uffff";
-    static final String DFA13_minS =
-        "\1\4\1\0\63\uffff";
-    static final String DFA13_maxS =
-        "\1\154\1\0\63\uffff";
-    static final String DFA13_acceptS =
-        "\2\uffff\1\2\61\uffff\1\1";
-    static final String DFA13_specialS =
-        "\1\uffff\1\0\63\uffff}>";
-    static final String[] DFA13_transitionS = {
-            "\5\2\7\uffff\24\2\13\uffff\1\2\6\uffff\2\2\4\uffff\1\2\4\uffff"+
-            "\2\2\1\uffff\1\2\1\uffff\1\2\1\uffff\1\2\2\uffff\1\2\1\uffff"+
-            "\1\1\1\2\1\uffff\2\2\2\uffff\1\2\1\uffff\1\2\3\uffff\10\2\1"+
-            "\uffff\1\2\10\uffff\1\2",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA13_eot = DFA.unpackEncodedString(DFA13_eotS);
-    static final short[] DFA13_eof = DFA.unpackEncodedString(DFA13_eofS);
-    static final char[] DFA13_min = DFA.unpackEncodedStringToUnsignedChars(DFA13_minS);
-    static final char[] DFA13_max = DFA.unpackEncodedStringToUnsignedChars(DFA13_maxS);
-    static final short[] DFA13_accept = DFA.unpackEncodedString(DFA13_acceptS);
-    static final short[] DFA13_special = DFA.unpackEncodedString(DFA13_specialS);
-    static final short[][] DFA13_transition;
-
-    static {
-        int numStates = DFA13_transitionS.length;
-        DFA13_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA13_transition[i] = DFA.unpackEncodedString(DFA13_transitionS[i]);
-        }
-    }
 
     class DFA13 extends DFA {
 
         public DFA13(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 13;
-            this.eot = DFA13_eot;
-            this.eof = DFA13_eof;
-            this.min = DFA13_min;
-            this.max = DFA13_max;
-            this.accept = DFA13_accept;
-            this.special = DFA13_special;
-            this.transition = DFA13_transition;
+            this.eot = dfa_14;
+            this.eof = dfa_14;
+            this.min = dfa_15;
+            this.max = dfa_16;
+            this.accept = dfa_17;
+            this.special = dfa_18;
+            this.transition = dfa_20;
         }
         public String getDescription() {
             return "3289:1: rule__XAnnotationElementValue__Alternatives : ( ( ( rule__XAnnotationElementValue__Group_0__0 ) ) | ( ruleXAnnotationOrExpression ) );";
@@ -77142,116 +76973,70 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA15_eotS =
-        "\30\uffff";
-    static final String DFA15_eofS =
-        "\1\uffff\25\26\2\uffff";
-    static final String DFA15_minS =
-        "\26\4\2\uffff";
-    static final String DFA15_maxS =
-        "\26\154\2\uffff";
-    static final String DFA15_acceptS =
-        "\26\uffff\1\2\1\1";
-    static final String DFA15_specialS =
-        "\30\uffff}>";
-    static final String[] DFA15_transitionS = {
-            "\1\1\4\26\7\uffff\1\2\1\3\1\4\1\5\1\6\1\7\1\10\1\11\1\12\1"+
-            "\13\1\14\1\15\1\16\1\17\1\20\1\21\1\22\1\23\1\24\1\25\13\uffff"+
-            "\1\26\6\uffff\2\26\4\uffff\1\26\4\uffff\2\26\1\uffff\1\26\1"+
-            "\uffff\1\26\1\uffff\1\26\4\uffff\2\26\1\uffff\2\26\2\uffff\1"+
-            "\26\1\uffff\1\26\3\uffff\10\26\1\uffff\1\26\10\uffff\1\26",
-            "\5\26\4\uffff\1\27\65\26\1\uffff\7\26\2\uffff\30\26\3\uffff"+
-            "\2\26\1\uffff\2\26",
-            "\5\26\4\uffff\1\27\65\26\1\uffff\7\26\2\uffff\30\26\3\uffff"+
-            "\2\26\1\uffff\2\26",
-            "\5\26\4\uffff\1\27\65\26\1\uffff\7\26\2\uffff\30\26\3\uffff"+
-            "\2\26\1\uffff\2\26",
-            "\5\26\4\uffff\1\27\65\26\1\uffff\7\26\2\uffff\30\26\3\uffff"+
-            "\2\26\1\uffff\2\26",
-            "\5\26\4\uffff\1\27\65\26\1\uffff\7\26\2\uffff\30\26\3\uffff"+
-            "\2\26\1\uffff\2\26",
-            "\5\26\4\uffff\1\27\65\26\1\uffff\7\26\2\uffff\30\26\3\uffff"+
-            "\2\26\1\uffff\2\26",
-            "\5\26\4\uffff\1\27\65\26\1\uffff\7\26\2\uffff\30\26\3\uffff"+
-            "\2\26\1\uffff\2\26",
-            "\5\26\4\uffff\1\27\65\26\1\uffff\7\26\2\uffff\30\26\3\uffff"+
-            "\2\26\1\uffff\2\26",
-            "\5\26\4\uffff\1\27\65\26\1\uffff\7\26\2\uffff\30\26\3\uffff"+
-            "\2\26\1\uffff\2\26",
-            "\5\26\4\uffff\1\27\65\26\1\uffff\7\26\2\uffff\30\26\3\uffff"+
-            "\2\26\1\uffff\2\26",
-            "\5\26\4\uffff\1\27\65\26\1\uffff\7\26\2\uffff\30\26\3\uffff"+
-            "\2\26\1\uffff\2\26",
-            "\5\26\4\uffff\1\27\65\26\1\uffff\7\26\2\uffff\30\26\3\uffff"+
-            "\2\26\1\uffff\2\26",
-            "\5\26\4\uffff\1\27\65\26\1\uffff\7\26\2\uffff\30\26\3\uffff"+
-            "\2\26\1\uffff\2\26",
-            "\5\26\4\uffff\1\27\65\26\1\uffff\7\26\2\uffff\30\26\3\uffff"+
-            "\2\26\1\uffff\2\26",
-            "\5\26\4\uffff\1\27\65\26\1\uffff\7\26\2\uffff\30\26\3\uffff"+
-            "\2\26\1\uffff\2\26",
-            "\5\26\4\uffff\1\27\65\26\1\uffff\7\26\2\uffff\30\26\3\uffff"+
-            "\2\26\1\uffff\2\26",
-            "\5\26\4\uffff\1\27\65\26\1\uffff\7\26\2\uffff\30\26\3\uffff"+
-            "\2\26\1\uffff\2\26",
-            "\5\26\4\uffff\1\27\65\26\1\uffff\7\26\2\uffff\30\26\3\uffff"+
-            "\2\26\1\uffff\2\26",
-            "\5\26\4\uffff\1\27\65\26\1\uffff\7\26\2\uffff\30\26\3\uffff"+
-            "\2\26\1\uffff\2\26",
-            "\5\26\4\uffff\1\27\65\26\1\uffff\7\26\2\uffff\30\26\3\uffff"+
-            "\2\26\1\uffff\2\26",
-            "\5\26\4\uffff\1\27\65\26\1\uffff\7\26\2\uffff\30\26\3\uffff"+
-            "\2\26\1\uffff\2\26",
+    static final String dfa_21s = "\30\uffff";
+    static final String dfa_22s = "\1\uffff\25\26\2\uffff";
+    static final String dfa_23s = "\26\4\2\uffff";
+    static final String dfa_24s = "\26\154\2\uffff";
+    static final String dfa_25s = "\26\uffff\1\2\1\1";
+    static final String dfa_26s = "\30\uffff}>";
+    static final String[] dfa_27s = {
+            "\1\1\4\26\7\uffff\1\2\1\3\1\4\1\5\1\6\1\7\1\10\1\11\1\12\1\13\1\14\1\15\1\16\1\17\1\20\1\21\1\22\1\23\1\24\1\25\13\uffff\1\26\6\uffff\2\26\4\uffff\1\26\4\uffff\2\26\1\uffff\1\26\1\uffff\1\26\1\uffff\1\26\4\uffff\2\26\1\uffff\2\26\2\uffff\1\26\1\uffff\1\26\3\uffff\10\26\1\uffff\1\26\10\uffff\1\26",
+            "\5\26\4\uffff\1\27\65\26\1\uffff\7\26\2\uffff\30\26\3\uffff\2\26\1\uffff\2\26",
+            "\5\26\4\uffff\1\27\65\26\1\uffff\7\26\2\uffff\30\26\3\uffff\2\26\1\uffff\2\26",
+            "\5\26\4\uffff\1\27\65\26\1\uffff\7\26\2\uffff\30\26\3\uffff\2\26\1\uffff\2\26",
+            "\5\26\4\uffff\1\27\65\26\1\uffff\7\26\2\uffff\30\26\3\uffff\2\26\1\uffff\2\26",
+            "\5\26\4\uffff\1\27\65\26\1\uffff\7\26\2\uffff\30\26\3\uffff\2\26\1\uffff\2\26",
+            "\5\26\4\uffff\1\27\65\26\1\uffff\7\26\2\uffff\30\26\3\uffff\2\26\1\uffff\2\26",
+            "\5\26\4\uffff\1\27\65\26\1\uffff\7\26\2\uffff\30\26\3\uffff\2\26\1\uffff\2\26",
+            "\5\26\4\uffff\1\27\65\26\1\uffff\7\26\2\uffff\30\26\3\uffff\2\26\1\uffff\2\26",
+            "\5\26\4\uffff\1\27\65\26\1\uffff\7\26\2\uffff\30\26\3\uffff\2\26\1\uffff\2\26",
+            "\5\26\4\uffff\1\27\65\26\1\uffff\7\26\2\uffff\30\26\3\uffff\2\26\1\uffff\2\26",
+            "\5\26\4\uffff\1\27\65\26\1\uffff\7\26\2\uffff\30\26\3\uffff\2\26\1\uffff\2\26",
+            "\5\26\4\uffff\1\27\65\26\1\uffff\7\26\2\uffff\30\26\3\uffff\2\26\1\uffff\2\26",
+            "\5\26\4\uffff\1\27\65\26\1\uffff\7\26\2\uffff\30\26\3\uffff\2\26\1\uffff\2\26",
+            "\5\26\4\uffff\1\27\65\26\1\uffff\7\26\2\uffff\30\26\3\uffff\2\26\1\uffff\2\26",
+            "\5\26\4\uffff\1\27\65\26\1\uffff\7\26\2\uffff\30\26\3\uffff\2\26\1\uffff\2\26",
+            "\5\26\4\uffff\1\27\65\26\1\uffff\7\26\2\uffff\30\26\3\uffff\2\26\1\uffff\2\26",
+            "\5\26\4\uffff\1\27\65\26\1\uffff\7\26\2\uffff\30\26\3\uffff\2\26\1\uffff\2\26",
+            "\5\26\4\uffff\1\27\65\26\1\uffff\7\26\2\uffff\30\26\3\uffff\2\26\1\uffff\2\26",
+            "\5\26\4\uffff\1\27\65\26\1\uffff\7\26\2\uffff\30\26\3\uffff\2\26\1\uffff\2\26",
+            "\5\26\4\uffff\1\27\65\26\1\uffff\7\26\2\uffff\30\26\3\uffff\2\26\1\uffff\2\26",
+            "\5\26\4\uffff\1\27\65\26\1\uffff\7\26\2\uffff\30\26\3\uffff\2\26\1\uffff\2\26",
             "",
             ""
     };
 
-    static final short[] DFA15_eot = DFA.unpackEncodedString(DFA15_eotS);
-    static final short[] DFA15_eof = DFA.unpackEncodedString(DFA15_eofS);
-    static final char[] DFA15_min = DFA.unpackEncodedStringToUnsignedChars(DFA15_minS);
-    static final char[] DFA15_max = DFA.unpackEncodedStringToUnsignedChars(DFA15_maxS);
-    static final short[] DFA15_accept = DFA.unpackEncodedString(DFA15_acceptS);
-    static final short[] DFA15_special = DFA.unpackEncodedString(DFA15_specialS);
-    static final short[][] DFA15_transition;
-
-    static {
-        int numStates = DFA15_transitionS.length;
-        DFA15_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA15_transition[i] = DFA.unpackEncodedString(DFA15_transitionS[i]);
-        }
-    }
+    static final short[] dfa_21 = DFA.unpackEncodedString(dfa_21s);
+    static final short[] dfa_22 = DFA.unpackEncodedString(dfa_22s);
+    static final char[] dfa_23 = DFA.unpackEncodedStringToUnsignedChars(dfa_23s);
+    static final char[] dfa_24 = DFA.unpackEncodedStringToUnsignedChars(dfa_24s);
+    static final short[] dfa_25 = DFA.unpackEncodedString(dfa_25s);
+    static final short[] dfa_26 = DFA.unpackEncodedString(dfa_26s);
+    static final short[][] dfa_27 = unpackEncodedStringArray(dfa_27s);
 
     class DFA15 extends DFA {
 
         public DFA15(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 15;
-            this.eot = DFA15_eot;
-            this.eof = DFA15_eof;
-            this.min = DFA15_min;
-            this.max = DFA15_max;
-            this.accept = DFA15_accept;
-            this.special = DFA15_special;
-            this.transition = DFA15_transition;
+            this.eot = dfa_21;
+            this.eof = dfa_22;
+            this.min = dfa_23;
+            this.max = dfa_24;
+            this.accept = dfa_25;
+            this.special = dfa_26;
+            this.transition = dfa_27;
         }
         public String getDescription() {
             return "3333:1: rule__XAssignment__Alternatives : ( ( ( rule__XAssignment__Group_0__0 ) ) | ( ( rule__XAssignment__Group_1__0 ) ) );";
         }
     }
-    static final String DFA20_eotS =
-        "\13\uffff";
-    static final String DFA20_eofS =
-        "\13\uffff";
-    static final String DFA20_minS =
-        "\1\56\2\uffff\1\56\7\uffff";
-    static final String DFA20_maxS =
-        "\1\65\2\uffff\1\62\7\uffff";
-    static final String DFA20_acceptS =
-        "\1\uffff\1\1\1\2\1\uffff\1\4\1\5\1\7\1\10\1\11\1\6\1\3";
-    static final String DFA20_specialS =
-        "\13\uffff}>";
-    static final String[] DFA20_transitionS = {
+    static final String dfa_28s = "\13\uffff";
+    static final String dfa_29s = "\1\56\2\uffff\1\56\7\uffff";
+    static final String dfa_30s = "\1\65\2\uffff\1\62\7\uffff";
+    static final String dfa_31s = "\1\uffff\1\1\1\2\1\uffff\1\4\1\5\1\7\1\10\1\11\1\6\1\3";
+    static final String dfa_32s = "\13\uffff}>";
+    static final String[] dfa_33s = {
             "\1\3\1\6\1\1\1\2\1\4\1\5\1\7\1\10",
             "",
             "",
@@ -77265,155 +77050,96 @@ public String getDescription() {
             ""
     };
 
-    static final short[] DFA20_eot = DFA.unpackEncodedString(DFA20_eotS);
-    static final short[] DFA20_eof = DFA.unpackEncodedString(DFA20_eofS);
-    static final char[] DFA20_min = DFA.unpackEncodedStringToUnsignedChars(DFA20_minS);
-    static final char[] DFA20_max = DFA.unpackEncodedStringToUnsignedChars(DFA20_maxS);
-    static final short[] DFA20_accept = DFA.unpackEncodedString(DFA20_acceptS);
-    static final short[] DFA20_special = DFA.unpackEncodedString(DFA20_specialS);
-    static final short[][] DFA20_transition;
-
-    static {
-        int numStates = DFA20_transitionS.length;
-        DFA20_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA20_transition[i] = DFA.unpackEncodedString(DFA20_transitionS[i]);
-        }
-    }
+    static final short[] dfa_28 = DFA.unpackEncodedString(dfa_28s);
+    static final char[] dfa_29 = DFA.unpackEncodedStringToUnsignedChars(dfa_29s);
+    static final char[] dfa_30 = DFA.unpackEncodedStringToUnsignedChars(dfa_30s);
+    static final short[] dfa_31 = DFA.unpackEncodedString(dfa_31s);
+    static final short[] dfa_32 = DFA.unpackEncodedString(dfa_32s);
+    static final short[][] dfa_33 = unpackEncodedStringArray(dfa_33s);
 
     class DFA20 extends DFA {
 
         public DFA20(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 20;
-            this.eot = DFA20_eot;
-            this.eof = DFA20_eof;
-            this.min = DFA20_min;
-            this.max = DFA20_max;
-            this.accept = DFA20_accept;
-            this.special = DFA20_special;
-            this.transition = DFA20_transition;
+            this.eot = dfa_28;
+            this.eof = dfa_28;
+            this.min = dfa_29;
+            this.max = dfa_30;
+            this.accept = dfa_31;
+            this.special = dfa_32;
+            this.transition = dfa_33;
         }
         public String getDescription() {
             return "3521:1: rule__OpOther__Alternatives : ( ( '->' ) | ( '..<' ) | ( ( rule__OpOther__Group_2__0 ) ) | ( '..' ) | ( '=>' ) | ( ( rule__OpOther__Group_5__0 ) ) | ( ( rule__OpOther__Group_6__0 ) ) | ( '<>' ) | ( '?:' ) );";
         }
     }
-    static final String DFA28_eotS =
-        "\32\uffff";
-    static final String DFA28_eofS =
-        "\4\uffff\25\3\1\uffff";
-    static final String DFA28_minS =
-        "\1\77\2\4\1\uffff\25\4\1\uffff";
-    static final String DFA28_maxS =
-        "\1\151\2\101\1\uffff\25\154\1\uffff";
-    static final String DFA28_acceptS =
-        "\3\uffff\1\2\25\uffff\1\1";
-    static final String DFA28_specialS =
-        "\32\uffff}>";
-    static final String[] DFA28_transitionS = {
+    static final String dfa_34s = "\32\uffff";
+    static final String dfa_35s = "\4\uffff\25\3\1\uffff";
+    static final String dfa_36s = "\1\77\2\4\1\uffff\25\4\1\uffff";
+    static final String dfa_37s = "\1\151\2\101\1\uffff\25\154\1\uffff";
+    static final String dfa_38s = "\3\uffff\1\2\25\uffff\1\1";
+    static final String dfa_39s = "\32\uffff}>";
+    static final String[] dfa_40s = {
             "\1\1\50\uffff\1\2\1\3",
-            "\1\4\13\uffff\1\5\1\6\1\7\1\10\1\11\1\12\1\13\1\14\1\15\1"+
-            "\16\1\17\1\20\1\21\1\22\1\23\1\24\1\25\1\26\1\27\1\30\13\uffff"+
-            "\1\3\21\uffff\1\3",
-            "\1\4\13\uffff\1\5\1\6\1\7\1\10\1\11\1\12\1\13\1\14\1\15\1"+
-            "\16\1\17\1\20\1\21\1\22\1\23\1\24\1\25\1\26\1\27\1\30\13\uffff"+
-            "\1\3\21\uffff\1\3",
-            "",
-            "\5\3\4\uffff\1\31\65\3\1\uffff\7\3\2\uffff\30\3\3\uffff\2"+
-            "\3\1\uffff\2\3",
-            "\5\3\4\uffff\1\31\65\3\1\uffff\7\3\2\uffff\30\3\3\uffff\2"+
-            "\3\1\uffff\2\3",
-            "\5\3\4\uffff\1\31\65\3\1\uffff\7\3\2\uffff\30\3\3\uffff\2"+
-            "\3\1\uffff\2\3",
-            "\5\3\4\uffff\1\31\65\3\1\uffff\7\3\2\uffff\30\3\3\uffff\2"+
-            "\3\1\uffff\2\3",
-            "\5\3\4\uffff\1\31\65\3\1\uffff\7\3\2\uffff\30\3\3\uffff\2"+
-            "\3\1\uffff\2\3",
-            "\5\3\4\uffff\1\31\65\3\1\uffff\7\3\2\uffff\30\3\3\uffff\2"+
-            "\3\1\uffff\2\3",
-            "\5\3\4\uffff\1\31\65\3\1\uffff\7\3\2\uffff\30\3\3\uffff\2"+
-            "\3\1\uffff\2\3",
-            "\5\3\4\uffff\1\31\65\3\1\uffff\7\3\2\uffff\30\3\3\uffff\2"+
-            "\3\1\uffff\2\3",
-            "\5\3\4\uffff\1\31\65\3\1\uffff\7\3\2\uffff\30\3\3\uffff\2"+
-            "\3\1\uffff\2\3",
-            "\5\3\4\uffff\1\31\65\3\1\uffff\7\3\2\uffff\30\3\3\uffff\2"+
-            "\3\1\uffff\2\3",
-            "\5\3\4\uffff\1\31\65\3\1\uffff\7\3\2\uffff\30\3\3\uffff\2"+
-            "\3\1\uffff\2\3",
-            "\5\3\4\uffff\1\31\65\3\1\uffff\7\3\2\uffff\30\3\3\uffff\2"+
-            "\3\1\uffff\2\3",
-            "\5\3\4\uffff\1\31\65\3\1\uffff\7\3\2\uffff\30\3\3\uffff\2"+
-            "\3\1\uffff\2\3",
-            "\5\3\4\uffff\1\31\65\3\1\uffff\7\3\2\uffff\30\3\3\uffff\2"+
-            "\3\1\uffff\2\3",
-            "\5\3\4\uffff\1\31\65\3\1\uffff\7\3\2\uffff\30\3\3\uffff\2"+
-            "\3\1\uffff\2\3",
-            "\5\3\4\uffff\1\31\65\3\1\uffff\7\3\2\uffff\30\3\3\uffff\2"+
-            "\3\1\uffff\2\3",
-            "\5\3\4\uffff\1\31\65\3\1\uffff\7\3\2\uffff\30\3\3\uffff\2"+
-            "\3\1\uffff\2\3",
-            "\5\3\4\uffff\1\31\65\3\1\uffff\7\3\2\uffff\30\3\3\uffff\2"+
-            "\3\1\uffff\2\3",
-            "\5\3\4\uffff\1\31\65\3\1\uffff\7\3\2\uffff\30\3\3\uffff\2"+
-            "\3\1\uffff\2\3",
-            "\5\3\4\uffff\1\31\65\3\1\uffff\7\3\2\uffff\30\3\3\uffff\2"+
-            "\3\1\uffff\2\3",
-            "\5\3\4\uffff\1\31\65\3\1\uffff\7\3\2\uffff\30\3\3\uffff\2"+
-            "\3\1\uffff\2\3",
+            "\1\4\13\uffff\1\5\1\6\1\7\1\10\1\11\1\12\1\13\1\14\1\15\1\16\1\17\1\20\1\21\1\22\1\23\1\24\1\25\1\26\1\27\1\30\13\uffff\1\3\21\uffff\1\3",
+            "\1\4\13\uffff\1\5\1\6\1\7\1\10\1\11\1\12\1\13\1\14\1\15\1\16\1\17\1\20\1\21\1\22\1\23\1\24\1\25\1\26\1\27\1\30\13\uffff\1\3\21\uffff\1\3",
+            "",
+            "\5\3\4\uffff\1\31\65\3\1\uffff\7\3\2\uffff\30\3\3\uffff\2\3\1\uffff\2\3",
+            "\5\3\4\uffff\1\31\65\3\1\uffff\7\3\2\uffff\30\3\3\uffff\2\3\1\uffff\2\3",
+            "\5\3\4\uffff\1\31\65\3\1\uffff\7\3\2\uffff\30\3\3\uffff\2\3\1\uffff\2\3",
+            "\5\3\4\uffff\1\31\65\3\1\uffff\7\3\2\uffff\30\3\3\uffff\2\3\1\uffff\2\3",
+            "\5\3\4\uffff\1\31\65\3\1\uffff\7\3\2\uffff\30\3\3\uffff\2\3\1\uffff\2\3",
+            "\5\3\4\uffff\1\31\65\3\1\uffff\7\3\2\uffff\30\3\3\uffff\2\3\1\uffff\2\3",
+            "\5\3\4\uffff\1\31\65\3\1\uffff\7\3\2\uffff\30\3\3\uffff\2\3\1\uffff\2\3",
+            "\5\3\4\uffff\1\31\65\3\1\uffff\7\3\2\uffff\30\3\3\uffff\2\3\1\uffff\2\3",
+            "\5\3\4\uffff\1\31\65\3\1\uffff\7\3\2\uffff\30\3\3\uffff\2\3\1\uffff\2\3",
+            "\5\3\4\uffff\1\31\65\3\1\uffff\7\3\2\uffff\30\3\3\uffff\2\3\1\uffff\2\3",
+            "\5\3\4\uffff\1\31\65\3\1\uffff\7\3\2\uffff\30\3\3\uffff\2\3\1\uffff\2\3",
+            "\5\3\4\uffff\1\31\65\3\1\uffff\7\3\2\uffff\30\3\3\uffff\2\3\1\uffff\2\3",
+            "\5\3\4\uffff\1\31\65\3\1\uffff\7\3\2\uffff\30\3\3\uffff\2\3\1\uffff\2\3",
+            "\5\3\4\uffff\1\31\65\3\1\uffff\7\3\2\uffff\30\3\3\uffff\2\3\1\uffff\2\3",
+            "\5\3\4\uffff\1\31\65\3\1\uffff\7\3\2\uffff\30\3\3\uffff\2\3\1\uffff\2\3",
+            "\5\3\4\uffff\1\31\65\3\1\uffff\7\3\2\uffff\30\3\3\uffff\2\3\1\uffff\2\3",
+            "\5\3\4\uffff\1\31\65\3\1\uffff\7\3\2\uffff\30\3\3\uffff\2\3\1\uffff\2\3",
+            "\5\3\4\uffff\1\31\65\3\1\uffff\7\3\2\uffff\30\3\3\uffff\2\3\1\uffff\2\3",
+            "\5\3\4\uffff\1\31\65\3\1\uffff\7\3\2\uffff\30\3\3\uffff\2\3\1\uffff\2\3",
+            "\5\3\4\uffff\1\31\65\3\1\uffff\7\3\2\uffff\30\3\3\uffff\2\3\1\uffff\2\3",
+            "\5\3\4\uffff\1\31\65\3\1\uffff\7\3\2\uffff\30\3\3\uffff\2\3\1\uffff\2\3",
             ""
     };
 
-    static final short[] DFA28_eot = DFA.unpackEncodedString(DFA28_eotS);
-    static final short[] DFA28_eof = DFA.unpackEncodedString(DFA28_eofS);
-    static final char[] DFA28_min = DFA.unpackEncodedStringToUnsignedChars(DFA28_minS);
-    static final char[] DFA28_max = DFA.unpackEncodedStringToUnsignedChars(DFA28_maxS);
-    static final short[] DFA28_accept = DFA.unpackEncodedString(DFA28_acceptS);
-    static final short[] DFA28_special = DFA.unpackEncodedString(DFA28_specialS);
-    static final short[][] DFA28_transition;
-
-    static {
-        int numStates = DFA28_transitionS.length;
-        DFA28_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA28_transition[i] = DFA.unpackEncodedString(DFA28_transitionS[i]);
-        }
-    }
+    static final short[] dfa_34 = DFA.unpackEncodedString(dfa_34s);
+    static final short[] dfa_35 = DFA.unpackEncodedString(dfa_35s);
+    static final char[] dfa_36 = DFA.unpackEncodedStringToUnsignedChars(dfa_36s);
+    static final char[] dfa_37 = DFA.unpackEncodedStringToUnsignedChars(dfa_37s);
+    static final short[] dfa_38 = DFA.unpackEncodedString(dfa_38s);
+    static final short[] dfa_39 = DFA.unpackEncodedString(dfa_39s);
+    static final short[][] dfa_40 = unpackEncodedStringArray(dfa_40s);
 
     class DFA28 extends DFA {
 
         public DFA28(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 28;
-            this.eot = DFA28_eot;
-            this.eof = DFA28_eof;
-            this.min = DFA28_min;
-            this.max = DFA28_max;
-            this.accept = DFA28_accept;
-            this.special = DFA28_special;
-            this.transition = DFA28_transition;
+            this.eot = dfa_34;
+            this.eof = dfa_35;
+            this.min = dfa_36;
+            this.max = dfa_37;
+            this.accept = dfa_38;
+            this.special = dfa_39;
+            this.transition = dfa_40;
         }
         public String getDescription() {
             return "3803:1: rule__XMemberFeatureCall__Alternatives_1 : ( ( ( rule__XMemberFeatureCall__Group_1_0__0 ) ) | ( ( rule__XMemberFeatureCall__Group_1_1__0 ) ) );";
         }
     }
-    static final String DFA31_eotS =
-        "\65\uffff";
-    static final String DFA31_eofS =
-        "\65\uffff";
-    static final String DFA31_minS =
-        "\1\4\2\0\62\uffff";
-    static final String DFA31_maxS =
-        "\1\154\2\0\62\uffff";
-    static final String DFA31_acceptS =
-        "\3\uffff\1\1\1\uffff\1\2\57\uffff";
-    static final String DFA31_specialS =
-        "\1\uffff\1\0\1\1\62\uffff}>";
-    static final String[] DFA31_transitionS = {
-            "\1\1\4\5\7\uffff\24\5\13\uffff\1\5\3\uffff\1\3\2\uffff\2\5"+
-            "\4\uffff\1\5\4\uffff\2\5\1\uffff\1\5\1\uffff\1\5\1\uffff\1\2"+
-            "\4\uffff\2\5\1\uffff\2\5\2\uffff\1\5\1\uffff\1\5\3\uffff\10"+
-            "\5\1\uffff\1\5\6\uffff\1\3\1\uffff\1\5",
+    static final String dfa_41s = "\1\4\2\0\62\uffff";
+    static final String dfa_42s = "\1\154\2\0\62\uffff";
+    static final String dfa_43s = "\3\uffff\1\1\1\uffff\1\2\57\uffff";
+    static final String dfa_44s = "\1\uffff\1\0\1\1\62\uffff}>";
+    static final String[] dfa_45s = {
+            "\1\1\4\5\7\uffff\24\5\13\uffff\1\5\3\uffff\1\3\2\uffff\2\5\4\uffff\1\5\4\uffff\2\5\1\uffff\1\5\1\uffff\1\5\1\uffff\1\2\4\uffff\2\5\1\uffff\2\5\2\uffff\1\5\1\uffff\1\5\3\uffff\10\5\1\uffff\1\5\6\uffff\1\3\1\uffff\1\5",
             "\1\uffff",
             "\1\uffff",
             "",
@@ -77467,35 +77193,24 @@ public String getDescription() {
             "",
             ""
     };
-
-    static final short[] DFA31_eot = DFA.unpackEncodedString(DFA31_eotS);
-    static final short[] DFA31_eof = DFA.unpackEncodedString(DFA31_eofS);
-    static final char[] DFA31_min = DFA.unpackEncodedStringToUnsignedChars(DFA31_minS);
-    static final char[] DFA31_max = DFA.unpackEncodedStringToUnsignedChars(DFA31_maxS);
-    static final short[] DFA31_accept = DFA.unpackEncodedString(DFA31_acceptS);
-    static final short[] DFA31_special = DFA.unpackEncodedString(DFA31_specialS);
-    static final short[][] DFA31_transition;
-
-    static {
-        int numStates = DFA31_transitionS.length;
-        DFA31_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA31_transition[i] = DFA.unpackEncodedString(DFA31_transitionS[i]);
-        }
-    }
+    static final char[] dfa_41 = DFA.unpackEncodedStringToUnsignedChars(dfa_41s);
+    static final char[] dfa_42 = DFA.unpackEncodedStringToUnsignedChars(dfa_42s);
+    static final short[] dfa_43 = DFA.unpackEncodedString(dfa_43s);
+    static final short[] dfa_44 = DFA.unpackEncodedString(dfa_44s);
+    static final short[][] dfa_45 = unpackEncodedStringArray(dfa_45s);
 
     class DFA31 extends DFA {
 
         public DFA31(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 31;
-            this.eot = DFA31_eot;
-            this.eof = DFA31_eof;
-            this.min = DFA31_min;
-            this.max = DFA31_max;
-            this.accept = DFA31_accept;
-            this.special = DFA31_special;
-            this.transition = DFA31_transition;
+            this.eot = dfa_14;
+            this.eof = dfa_14;
+            this.min = dfa_41;
+            this.max = dfa_42;
+            this.accept = dfa_43;
+            this.special = dfa_44;
+            this.transition = dfa_45;
         }
         public String getDescription() {
             return "3879:1: rule__XMemberFeatureCall__Alternatives_1_1_3_1 : ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) ) | ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 ) ) );";
@@ -77542,23 +77257,8 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA34_eotS =
-        "\65\uffff";
-    static final String DFA34_eofS =
-        "\65\uffff";
-    static final String DFA34_minS =
-        "\1\4\1\0\63\uffff";
-    static final String DFA34_maxS =
-        "\1\154\1\0\63\uffff";
-    static final String DFA34_acceptS =
-        "\2\uffff\1\2\61\uffff\1\1";
-    static final String DFA34_specialS =
-        "\1\uffff\1\0\63\uffff}>";
-    static final String[] DFA34_transitionS = {
-            "\5\2\7\uffff\24\2\13\uffff\1\2\3\uffff\1\2\2\uffff\2\2\4\uffff"+
-            "\1\2\4\uffff\2\2\1\uffff\1\2\1\uffff\1\2\1\uffff\1\1\4\uffff"+
-            "\2\2\1\uffff\2\2\2\uffff\1\2\1\uffff\1\2\3\uffff\10\2\1\uffff"+
-            "\1\2\10\uffff\1\2",
+    static final String[] dfa_46s = {
+            "\5\2\7\uffff\24\2\13\uffff\1\2\3\uffff\1\2\2\uffff\2\2\4\uffff\1\2\4\uffff\2\2\1\uffff\1\2\1\uffff\1\2\1\uffff\1\1\4\uffff\2\2\1\uffff\2\2\2\uffff\1\2\1\uffff\1\2\3\uffff\10\2\1\uffff\1\2\10\uffff\1\2",
             "\1\uffff",
             "",
             "",
@@ -77612,35 +77312,20 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             "",
             ""
     };
-
-    static final short[] DFA34_eot = DFA.unpackEncodedString(DFA34_eotS);
-    static final short[] DFA34_eof = DFA.unpackEncodedString(DFA34_eofS);
-    static final char[] DFA34_min = DFA.unpackEncodedStringToUnsignedChars(DFA34_minS);
-    static final char[] DFA34_max = DFA.unpackEncodedStringToUnsignedChars(DFA34_maxS);
-    static final short[] DFA34_accept = DFA.unpackEncodedString(DFA34_acceptS);
-    static final short[] DFA34_special = DFA.unpackEncodedString(DFA34_specialS);
-    static final short[][] DFA34_transition;
-
-    static {
-        int numStates = DFA34_transitionS.length;
-        DFA34_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA34_transition[i] = DFA.unpackEncodedString(DFA34_transitionS[i]);
-        }
-    }
+    static final short[][] dfa_46 = unpackEncodedStringArray(dfa_46s);
 
     class DFA34 extends DFA {
 
         public DFA34(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 34;
-            this.eot = DFA34_eot;
-            this.eof = DFA34_eof;
-            this.min = DFA34_min;
-            this.max = DFA34_max;
-            this.accept = DFA34_accept;
-            this.special = DFA34_special;
-            this.transition = DFA34_transition;
+            this.eot = dfa_14;
+            this.eof = dfa_14;
+            this.min = dfa_15;
+            this.max = dfa_16;
+            this.accept = dfa_17;
+            this.special = dfa_18;
+            this.transition = dfa_46;
         }
         public String getDescription() {
             return "3975:1: rule__XSwitchExpression__Alternatives_2 : ( ( ( rule__XSwitchExpression__Group_2_0__0 ) ) | ( ( rule__XSwitchExpression__Group_2_1__0 ) ) );";
@@ -77672,105 +77357,19 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA39_eotS =
-        "\65\uffff";
-    static final String DFA39_eofS =
-        "\65\uffff";
-    static final String DFA39_minS =
-        "\1\4\2\0\62\uffff";
-    static final String DFA39_maxS =
-        "\1\154\2\0\62\uffff";
-    static final String DFA39_acceptS =
-        "\3\uffff\1\1\1\uffff\1\2\57\uffff";
-    static final String DFA39_specialS =
-        "\1\uffff\1\0\1\1\62\uffff}>";
-    static final String[] DFA39_transitionS = {
-            "\1\1\4\5\7\uffff\24\5\13\uffff\1\5\3\uffff\1\3\2\uffff\2\5"+
-            "\4\uffff\1\5\4\uffff\2\5\1\uffff\1\5\1\uffff\1\5\1\uffff\1\2"+
-            "\4\uffff\2\5\1\uffff\2\5\2\uffff\1\5\1\uffff\1\5\3\uffff\10"+
-            "\5\1\uffff\1\5\6\uffff\1\3\1\uffff\1\5",
-            "\1\uffff",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA39_eot = DFA.unpackEncodedString(DFA39_eotS);
-    static final short[] DFA39_eof = DFA.unpackEncodedString(DFA39_eofS);
-    static final char[] DFA39_min = DFA.unpackEncodedStringToUnsignedChars(DFA39_minS);
-    static final char[] DFA39_max = DFA.unpackEncodedStringToUnsignedChars(DFA39_maxS);
-    static final short[] DFA39_accept = DFA.unpackEncodedString(DFA39_acceptS);
-    static final short[] DFA39_special = DFA.unpackEncodedString(DFA39_specialS);
-    static final short[][] DFA39_transition;
-
-    static {
-        int numStates = DFA39_transitionS.length;
-        DFA39_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA39_transition[i] = DFA.unpackEncodedString(DFA39_transitionS[i]);
-        }
-    }
 
     class DFA39 extends DFA {
 
         public DFA39(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 39;
-            this.eot = DFA39_eot;
-            this.eof = DFA39_eof;
-            this.min = DFA39_min;
-            this.max = DFA39_max;
-            this.accept = DFA39_accept;
-            this.special = DFA39_special;
-            this.transition = DFA39_transition;
+            this.eot = dfa_14;
+            this.eof = dfa_14;
+            this.min = dfa_41;
+            this.max = dfa_42;
+            this.accept = dfa_43;
+            this.special = dfa_44;
+            this.transition = dfa_45;
         }
         public String getDescription() {
             return "4087:1: rule__XFeatureCall__Alternatives_3_1 : ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) ) | ( ( rule__XFeatureCall__Group_3_1_1__0 ) ) );";
@@ -77817,24 +77416,154 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA41_eotS =
-        "\65\uffff";
-    static final String DFA41_eofS =
-        "\65\uffff";
-    static final String DFA41_minS =
-        "\1\4\2\0\62\uffff";
-    static final String DFA41_maxS =
-        "\1\154\2\0\62\uffff";
-    static final String DFA41_acceptS =
-        "\3\uffff\1\1\1\uffff\1\2\57\uffff";
-    static final String DFA41_specialS =
-        "\1\uffff\1\0\1\1\62\uffff}>";
-    static final String[] DFA41_transitionS = {
-            "\1\1\4\5\7\uffff\24\5\13\uffff\1\5\3\uffff\1\3\2\uffff\2\5"+
-            "\4\uffff\1\5\4\uffff\2\5\1\uffff\1\5\1\uffff\1\5\1\uffff\1\2"+
-            "\4\uffff\2\5\1\uffff\2\5\2\uffff\1\5\1\uffff\1\5\3\uffff\10"+
-            "\5\1\uffff\1\5\6\uffff\1\3\1\uffff\1\5",
+
+    class DFA41 extends DFA {
+
+        public DFA41(BaseRecognizer recognizer) {
+            this.recognizer = recognizer;
+            this.decisionNumber = 41;
+            this.eot = dfa_14;
+            this.eof = dfa_14;
+            this.min = dfa_41;
+            this.max = dfa_42;
+            this.accept = dfa_43;
+            this.special = dfa_44;
+            this.transition = dfa_45;
+        }
+        public String getDescription() {
+            return "4133:1: rule__XConstructorCall__Alternatives_4_1 : ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) ) | ( ( rule__XConstructorCall__Group_4_1_1__0 ) ) );";
+        }
+        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
+            TokenStream input = (TokenStream)_input;
+        	int _s = s;
+            switch ( s ) {
+                    case 0 : 
+                        int LA41_1 = input.LA(1);
+
+                         
+                        int index41_1 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (synpred104_InternalCheck()) ) {s = 3;}
+
+                        else if ( (true) ) {s = 5;}
+
+                         
+                        input.seek(index41_1);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 1 : 
+                        int LA41_2 = input.LA(1);
+
+                         
+                        int index41_2 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (synpred104_InternalCheck()) ) {s = 3;}
+
+                        else if ( (true) ) {s = 5;}
+
+                         
+                        input.seek(index41_2);
+                        if ( s>=0 ) return s;
+                        break;
+            }
+            if (state.backtracking>0) {state.failed=true; return -1;}
+            NoViableAltException nvae =
+                new NoViableAltException(getDescription(), 41, _s, input);
+            error(nvae);
+            throw nvae;
+        }
+    }
+    static final String dfa_47s = "\25\uffff";
+    static final String dfa_48s = "\1\2\24\uffff";
+    static final String dfa_49s = "\1\4\1\0\23\uffff";
+    static final String dfa_50s = "\1\147\1\0\23\uffff";
+    static final String dfa_51s = "\2\uffff\1\2\21\uffff\1\1";
+    static final String dfa_52s = "\1\uffff\1\0\23\uffff}>";
+    static final String[] dfa_53s = {
+            "\1\2\22\uffff\2\2\4\uffff\7\2\17\uffff\1\2\20\uffff\3\2\1\uffff\1\1\2\uffff\2\2\32\uffff\1\2",
             "\1\uffff",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            ""
+    };
+
+    static final short[] dfa_47 = DFA.unpackEncodedString(dfa_47s);
+    static final short[] dfa_48 = DFA.unpackEncodedString(dfa_48s);
+    static final char[] dfa_49 = DFA.unpackEncodedStringToUnsignedChars(dfa_49s);
+    static final char[] dfa_50 = DFA.unpackEncodedStringToUnsignedChars(dfa_50s);
+    static final short[] dfa_51 = DFA.unpackEncodedString(dfa_51s);
+    static final short[] dfa_52 = DFA.unpackEncodedString(dfa_52s);
+    static final short[][] dfa_53 = unpackEncodedStringArray(dfa_53s);
+
+    class DFA63 extends DFA {
+
+        public DFA63(BaseRecognizer recognizer) {
+            this.recognizer = recognizer;
+            this.decisionNumber = 63;
+            this.eot = dfa_47;
+            this.eof = dfa_48;
+            this.min = dfa_49;
+            this.max = dfa_50;
+            this.accept = dfa_51;
+            this.special = dfa_52;
+            this.transition = dfa_53;
+        }
+        public String getDescription() {
+            return "5393:1: ( rule__Check__Group_6__0 )?";
+        }
+        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
+            TokenStream input = (TokenStream)_input;
+        	int _s = s;
+            switch ( s ) {
+                    case 0 : 
+                        int LA63_1 = input.LA(1);
+
+                         
+                        int index63_1 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (synpred129_InternalCheck()) ) {s = 20;}
+
+                        else if ( (true) ) {s = 2;}
+
+                         
+                        input.seek(index63_1);
+                        if ( s>=0 ) return s;
+                        break;
+            }
+            if (state.backtracking>0) {state.failed=true; return -1;}
+            NoViableAltException nvae =
+                new NoViableAltException(getDescription(), 63, _s, input);
+            error(nvae);
+            throw nvae;
+        }
+    }
+    static final String dfa_54s = "\140\uffff";
+    static final String dfa_55s = "\1\2\137\uffff";
+    static final String dfa_56s = "\1\4\1\0\136\uffff";
+    static final String dfa_57s = "\1\154\1\0\136\uffff";
+    static final String dfa_58s = "\2\uffff\1\2\134\uffff\1\1";
+    static final String dfa_59s = "\1\uffff\1\0\136\uffff}>";
+    static final String[] dfa_60s = {
+            "\5\2\5\uffff\13\2\1\1\51\2\1\uffff\7\2\2\uffff\30\2\3\uffff\2\2\1\uffff\2\2",
             "\1\uffff",
             "",
             "",
@@ -77885,101 +77614,34 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             "",
             "",
             "",
-            ""
-    };
-
-    static final short[] DFA41_eot = DFA.unpackEncodedString(DFA41_eotS);
-    static final short[] DFA41_eof = DFA.unpackEncodedString(DFA41_eofS);
-    static final char[] DFA41_min = DFA.unpackEncodedStringToUnsignedChars(DFA41_minS);
-    static final char[] DFA41_max = DFA.unpackEncodedStringToUnsignedChars(DFA41_maxS);
-    static final short[] DFA41_accept = DFA.unpackEncodedString(DFA41_acceptS);
-    static final short[] DFA41_special = DFA.unpackEncodedString(DFA41_specialS);
-    static final short[][] DFA41_transition;
-
-    static {
-        int numStates = DFA41_transitionS.length;
-        DFA41_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA41_transition[i] = DFA.unpackEncodedString(DFA41_transitionS[i]);
-        }
-    }
-
-    class DFA41 extends DFA {
-
-        public DFA41(BaseRecognizer recognizer) {
-            this.recognizer = recognizer;
-            this.decisionNumber = 41;
-            this.eot = DFA41_eot;
-            this.eof = DFA41_eof;
-            this.min = DFA41_min;
-            this.max = DFA41_max;
-            this.accept = DFA41_accept;
-            this.special = DFA41_special;
-            this.transition = DFA41_transition;
-        }
-        public String getDescription() {
-            return "4133:1: rule__XConstructorCall__Alternatives_4_1 : ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) ) | ( ( rule__XConstructorCall__Group_4_1_1__0 ) ) );";
-        }
-        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
-            TokenStream input = (TokenStream)_input;
-        	int _s = s;
-            switch ( s ) {
-                    case 0 : 
-                        int LA41_1 = input.LA(1);
-
-                         
-                        int index41_1 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (synpred104_InternalCheck()) ) {s = 3;}
-
-                        else if ( (true) ) {s = 5;}
-
-                         
-                        input.seek(index41_1);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 1 : 
-                        int LA41_2 = input.LA(1);
-
-                         
-                        int index41_2 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (synpred104_InternalCheck()) ) {s = 3;}
-
-                        else if ( (true) ) {s = 5;}
-
-                         
-                        input.seek(index41_2);
-                        if ( s>=0 ) return s;
-                        break;
-            }
-            if (state.backtracking>0) {state.failed=true; return -1;}
-            NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 41, _s, input);
-            error(nvae);
-            throw nvae;
-        }
-    }
-    static final String DFA63_eotS =
-        "\25\uffff";
-    static final String DFA63_eofS =
-        "\1\2\24\uffff";
-    static final String DFA63_minS =
-        "\1\4\1\0\23\uffff";
-    static final String DFA63_maxS =
-        "\1\147\1\0\23\uffff";
-    static final String DFA63_acceptS =
-        "\2\uffff\1\2\21\uffff\1\1";
-    static final String DFA63_specialS =
-        "\1\uffff\1\0\23\uffff}>";
-    static final String[] DFA63_transitionS = {
-            "\1\2\22\uffff\2\2\4\uffff\7\2\17\uffff\1\2\20\uffff\3\2\1\uffff"+
-            "\1\1\2\uffff\2\2\32\uffff\1\2",
-            "\1\uffff",
-            "",
-            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
             "",
             "",
             "",
@@ -77999,205 +77661,26 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA63_eot = DFA.unpackEncodedString(DFA63_eotS);
-    static final short[] DFA63_eof = DFA.unpackEncodedString(DFA63_eofS);
-    static final char[] DFA63_min = DFA.unpackEncodedStringToUnsignedChars(DFA63_minS);
-    static final char[] DFA63_max = DFA.unpackEncodedStringToUnsignedChars(DFA63_maxS);
-    static final short[] DFA63_accept = DFA.unpackEncodedString(DFA63_acceptS);
-    static final short[] DFA63_special = DFA.unpackEncodedString(DFA63_specialS);
-    static final short[][] DFA63_transition;
-
-    static {
-        int numStates = DFA63_transitionS.length;
-        DFA63_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA63_transition[i] = DFA.unpackEncodedString(DFA63_transitionS[i]);
-        }
-    }
-
-    class DFA63 extends DFA {
-
-        public DFA63(BaseRecognizer recognizer) {
-            this.recognizer = recognizer;
-            this.decisionNumber = 63;
-            this.eot = DFA63_eot;
-            this.eof = DFA63_eof;
-            this.min = DFA63_min;
-            this.max = DFA63_max;
-            this.accept = DFA63_accept;
-            this.special = DFA63_special;
-            this.transition = DFA63_transition;
-        }
-        public String getDescription() {
-            return "5393:1: ( rule__Check__Group_6__0 )?";
-        }
-        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
-            TokenStream input = (TokenStream)_input;
-        	int _s = s;
-            switch ( s ) {
-                    case 0 : 
-                        int LA63_1 = input.LA(1);
-
-                         
-                        int index63_1 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (synpred129_InternalCheck()) ) {s = 20;}
-
-                        else if ( (true) ) {s = 2;}
-
-                         
-                        input.seek(index63_1);
-                        if ( s>=0 ) return s;
-                        break;
-            }
-            if (state.backtracking>0) {state.failed=true; return -1;}
-            NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 63, _s, input);
-            error(nvae);
-            throw nvae;
-        }
-    }
-    static final String DFA75_eotS =
-        "\140\uffff";
-    static final String DFA75_eofS =
-        "\1\2\137\uffff";
-    static final String DFA75_minS =
-        "\1\4\1\0\136\uffff";
-    static final String DFA75_maxS =
-        "\1\154\1\0\136\uffff";
-    static final String DFA75_acceptS =
-        "\2\uffff\1\2\134\uffff\1\1";
-    static final String DFA75_specialS =
-        "\1\uffff\1\0\136\uffff}>";
-    static final String[] DFA75_transitionS = {
-            "\5\2\5\uffff\13\2\1\1\51\2\1\uffff\7\2\2\uffff\30\2\3\uffff"+
-            "\2\2\1\uffff\2\2",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA75_eot = DFA.unpackEncodedString(DFA75_eotS);
-    static final short[] DFA75_eof = DFA.unpackEncodedString(DFA75_eofS);
-    static final char[] DFA75_min = DFA.unpackEncodedStringToUnsignedChars(DFA75_minS);
-    static final char[] DFA75_max = DFA.unpackEncodedStringToUnsignedChars(DFA75_maxS);
-    static final short[] DFA75_accept = DFA.unpackEncodedString(DFA75_acceptS);
-    static final short[] DFA75_special = DFA.unpackEncodedString(DFA75_specialS);
-    static final short[][] DFA75_transition;
-
-    static {
-        int numStates = DFA75_transitionS.length;
-        DFA75_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA75_transition[i] = DFA.unpackEncodedString(DFA75_transitionS[i]);
-        }
-    }
+    static final short[] dfa_54 = DFA.unpackEncodedString(dfa_54s);
+    static final short[] dfa_55 = DFA.unpackEncodedString(dfa_55s);
+    static final char[] dfa_56 = DFA.unpackEncodedStringToUnsignedChars(dfa_56s);
+    static final char[] dfa_57 = DFA.unpackEncodedStringToUnsignedChars(dfa_57s);
+    static final short[] dfa_58 = DFA.unpackEncodedString(dfa_58s);
+    static final short[] dfa_59 = DFA.unpackEncodedString(dfa_59s);
+    static final short[][] dfa_60 = unpackEncodedStringArray(dfa_60s);
 
     class DFA75 extends DFA {
 
         public DFA75(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 75;
-            this.eot = DFA75_eot;
-            this.eof = DFA75_eof;
-            this.min = DFA75_min;
-            this.max = DFA75_max;
-            this.accept = DFA75_accept;
-            this.special = DFA75_special;
-            this.transition = DFA75_transition;
+            this.eot = dfa_54;
+            this.eof = dfa_55;
+            this.min = dfa_56;
+            this.max = dfa_57;
+            this.accept = dfa_58;
+            this.special = dfa_59;
+            this.transition = dfa_60;
         }
         public String getDescription() {
             return "7291:1: ( rule__XIssueExpression__Group_3__0 )?";
@@ -78229,19 +77712,13 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA84_eotS =
-        "\12\uffff";
-    static final String DFA84_eofS =
-        "\1\2\11\uffff";
-    static final String DFA84_minS =
-        "\1\4\1\0\10\uffff";
-    static final String DFA84_maxS =
-        "\1\117\1\0\10\uffff";
-    static final String DFA84_acceptS =
-        "\2\uffff\1\2\6\uffff\1\1";
-    static final String DFA84_specialS =
-        "\1\uffff\1\0\10\uffff}>";
-    static final String[] DFA84_transitionS = {
+    static final String dfa_61s = "\12\uffff";
+    static final String dfa_62s = "\1\2\11\uffff";
+    static final String dfa_63s = "\1\4\1\0\10\uffff";
+    static final String dfa_64s = "\1\117\1\0\10\uffff";
+    static final String dfa_65s = "\2\uffff\1\2\6\uffff\1\1";
+    static final String dfa_66s = "\1\uffff\1\0\10\uffff}>";
+    static final String[] dfa_67s = {
             "\1\2\56\uffff\1\2\24\uffff\1\1\3\2\3\uffff\1\2",
             "\1\uffff",
             "",
@@ -78254,34 +77731,26 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA84_eot = DFA.unpackEncodedString(DFA84_eotS);
-    static final short[] DFA84_eof = DFA.unpackEncodedString(DFA84_eofS);
-    static final char[] DFA84_min = DFA.unpackEncodedStringToUnsignedChars(DFA84_minS);
-    static final char[] DFA84_max = DFA.unpackEncodedStringToUnsignedChars(DFA84_maxS);
-    static final short[] DFA84_accept = DFA.unpackEncodedString(DFA84_acceptS);
-    static final short[] DFA84_special = DFA.unpackEncodedString(DFA84_specialS);
-    static final short[][] DFA84_transition;
-
-    static {
-        int numStates = DFA84_transitionS.length;
-        DFA84_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA84_transition[i] = DFA.unpackEncodedString(DFA84_transitionS[i]);
-        }
-    }
+    static final short[] dfa_61 = DFA.unpackEncodedString(dfa_61s);
+    static final short[] dfa_62 = DFA.unpackEncodedString(dfa_62s);
+    static final char[] dfa_63 = DFA.unpackEncodedStringToUnsignedChars(dfa_63s);
+    static final char[] dfa_64 = DFA.unpackEncodedStringToUnsignedChars(dfa_64s);
+    static final short[] dfa_65 = DFA.unpackEncodedString(dfa_65s);
+    static final short[] dfa_66 = DFA.unpackEncodedString(dfa_66s);
+    static final short[][] dfa_67 = unpackEncodedStringArray(dfa_67s);
 
     class DFA84 extends DFA {
 
         public DFA84(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 84;
-            this.eot = DFA84_eot;
-            this.eof = DFA84_eof;
-            this.min = DFA84_min;
-            this.max = DFA84_max;
-            this.accept = DFA84_accept;
-            this.special = DFA84_special;
-            this.transition = DFA84_transition;
+            this.eot = dfa_61;
+            this.eof = dfa_62;
+            this.min = dfa_63;
+            this.max = dfa_64;
+            this.accept = dfa_65;
+            this.special = dfa_66;
+            this.transition = dfa_67;
         }
         public String getDescription() {
             return "8427:1: ( rule__XAnnotation__Group_3__0 )?";
@@ -78313,21 +77782,13 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA93_eotS =
-        "\12\uffff";
-    static final String DFA93_eofS =
-        "\1\10\11\uffff";
-    static final String DFA93_minS =
-        "\1\4\7\0\2\uffff";
-    static final String DFA93_maxS =
-        "\1\154\7\0\2\uffff";
-    static final String DFA93_acceptS =
-        "\10\uffff\1\2\1\1";
-    static final String DFA93_specialS =
-        "\1\uffff\1\4\1\2\1\1\1\0\1\5\1\6\1\3\2\uffff}>";
-    static final String[] DFA93_transitionS = {
-            "\5\10\5\uffff\26\10\1\1\1\2\1\3\1\4\1\5\5\10\1\7\1\6\23\10"+
-            "\1\uffff\7\10\2\uffff\30\10\3\uffff\2\10\1\uffff\2\10",
+    static final String dfa_68s = "\1\10\11\uffff";
+    static final String dfa_69s = "\1\4\7\0\2\uffff";
+    static final String dfa_70s = "\1\154\7\0\2\uffff";
+    static final String dfa_71s = "\10\uffff\1\2\1\1";
+    static final String dfa_72s = "\1\uffff\1\4\1\2\1\1\1\0\1\5\1\6\1\3\2\uffff}>";
+    static final String[] dfa_73s = {
+            "\5\10\5\uffff\26\10\1\1\1\2\1\3\1\4\1\5\5\10\1\7\1\6\23\10\1\uffff\7\10\2\uffff\30\10\3\uffff\2\10\1\uffff\2\10",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -78338,35 +77799,25 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             "",
             ""
     };
-
-    static final short[] DFA93_eot = DFA.unpackEncodedString(DFA93_eotS);
-    static final short[] DFA93_eof = DFA.unpackEncodedString(DFA93_eofS);
-    static final char[] DFA93_min = DFA.unpackEncodedStringToUnsignedChars(DFA93_minS);
-    static final char[] DFA93_max = DFA.unpackEncodedStringToUnsignedChars(DFA93_maxS);
-    static final short[] DFA93_accept = DFA.unpackEncodedString(DFA93_acceptS);
-    static final short[] DFA93_special = DFA.unpackEncodedString(DFA93_specialS);
-    static final short[][] DFA93_transition;
-
-    static {
-        int numStates = DFA93_transitionS.length;
-        DFA93_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA93_transition[i] = DFA.unpackEncodedString(DFA93_transitionS[i]);
-        }
-    }
+    static final short[] dfa_68 = DFA.unpackEncodedString(dfa_68s);
+    static final char[] dfa_69 = DFA.unpackEncodedStringToUnsignedChars(dfa_69s);
+    static final char[] dfa_70 = DFA.unpackEncodedStringToUnsignedChars(dfa_70s);
+    static final short[] dfa_71 = DFA.unpackEncodedString(dfa_71s);
+    static final short[] dfa_72 = DFA.unpackEncodedString(dfa_72s);
+    static final short[][] dfa_73 = unpackEncodedStringArray(dfa_73s);
 
     class DFA93 extends DFA {
 
         public DFA93(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 93;
-            this.eot = DFA93_eot;
-            this.eof = DFA93_eof;
-            this.min = DFA93_min;
-            this.max = DFA93_max;
-            this.accept = DFA93_accept;
-            this.special = DFA93_special;
-            this.transition = DFA93_transition;
+            this.eot = dfa_61;
+            this.eof = dfa_68;
+            this.min = dfa_69;
+            this.max = dfa_70;
+            this.accept = dfa_71;
+            this.special = dfa_72;
+            this.transition = dfa_73;
         }
         public String getDescription() {
             return "9877:1: ( rule__XAssignment__Group_1_1__0 )?";
@@ -78488,21 +77939,13 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA99_eotS =
-        "\13\uffff";
-    static final String DFA99_eofS =
-        "\1\1\12\uffff";
-    static final String DFA99_minS =
-        "\1\4\1\uffff\10\0\1\uffff";
-    static final String DFA99_maxS =
-        "\1\154\1\uffff\10\0\1\uffff";
-    static final String DFA99_acceptS =
-        "\1\uffff\1\2\10\uffff\1\1";
-    static final String DFA99_specialS =
-        "\2\uffff\1\5\1\1\1\0\1\6\1\4\1\2\1\3\1\7\1\uffff}>";
-    static final String[] DFA99_transitionS = {
-            "\5\1\5\uffff\40\1\1\3\1\2\1\4\1\5\1\6\1\7\1\10\1\11\15\1\1"+
-            "\uffff\7\1\2\uffff\30\1\3\uffff\2\1\1\uffff\2\1",
+    static final String dfa_74s = "\1\1\12\uffff";
+    static final String dfa_75s = "\1\4\1\uffff\10\0\1\uffff";
+    static final String dfa_76s = "\1\154\1\uffff\10\0\1\uffff";
+    static final String dfa_77s = "\1\uffff\1\2\10\uffff\1\1";
+    static final String dfa_78s = "\2\uffff\1\5\1\1\1\0\1\6\1\4\1\2\1\3\1\7\1\uffff}>";
+    static final String[] dfa_79s = {
+            "\5\1\5\uffff\40\1\1\3\1\2\1\4\1\5\1\6\1\7\1\10\1\11\15\1\1\uffff\7\1\2\uffff\30\1\3\uffff\2\1\1\uffff\2\1",
             "",
             "\1\uffff",
             "\1\uffff",
@@ -78514,35 +77957,25 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             "\1\uffff",
             ""
     };
-
-    static final short[] DFA99_eot = DFA.unpackEncodedString(DFA99_eotS);
-    static final short[] DFA99_eof = DFA.unpackEncodedString(DFA99_eofS);
-    static final char[] DFA99_min = DFA.unpackEncodedStringToUnsignedChars(DFA99_minS);
-    static final char[] DFA99_max = DFA.unpackEncodedStringToUnsignedChars(DFA99_maxS);
-    static final short[] DFA99_accept = DFA.unpackEncodedString(DFA99_acceptS);
-    static final short[] DFA99_special = DFA.unpackEncodedString(DFA99_specialS);
-    static final short[][] DFA99_transition;
-
-    static {
-        int numStates = DFA99_transitionS.length;
-        DFA99_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA99_transition[i] = DFA.unpackEncodedString(DFA99_transitionS[i]);
-        }
-    }
+    static final short[] dfa_74 = DFA.unpackEncodedString(dfa_74s);
+    static final char[] dfa_75 = DFA.unpackEncodedStringToUnsignedChars(dfa_75s);
+    static final char[] dfa_76 = DFA.unpackEncodedStringToUnsignedChars(dfa_76s);
+    static final short[] dfa_77 = DFA.unpackEncodedString(dfa_77s);
+    static final short[] dfa_78 = DFA.unpackEncodedString(dfa_78s);
+    static final short[][] dfa_79 = unpackEncodedStringArray(dfa_79s);
 
     class DFA99 extends DFA {
 
         public DFA99(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 99;
-            this.eot = DFA99_eot;
-            this.eof = DFA99_eof;
-            this.min = DFA99_min;
-            this.max = DFA99_max;
-            this.accept = DFA99_accept;
-            this.special = DFA99_special;
-            this.transition = DFA99_transition;
+            this.eot = dfa_28;
+            this.eof = dfa_74;
+            this.min = dfa_75;
+            this.max = dfa_76;
+            this.accept = dfa_77;
+            this.special = dfa_78;
+            this.transition = dfa_79;
         }
         public String getDescription() {
             return "()* loopback of 11369:1: ( rule__XOtherOperatorExpression__Group_1__0 )*";
@@ -78679,21 +78112,8 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA106_eotS =
-        "\140\uffff";
-    static final String DFA106_eofS =
-        "\1\2\137\uffff";
-    static final String DFA106_minS =
-        "\1\4\1\0\136\uffff";
-    static final String DFA106_maxS =
-        "\1\154\1\0\136\uffff";
-    static final String DFA106_acceptS =
-        "\2\uffff\1\2\134\uffff\1\1";
-    static final String DFA106_specialS =
-        "\1\uffff\1\0\136\uffff}>";
-    static final String[] DFA106_transitionS = {
-            "\5\2\5\uffff\65\2\1\uffff\4\2\1\1\2\2\2\uffff\30\2\3\uffff"+
-            "\2\2\1\uffff\2\2",
+    static final String[] dfa_80s = {
+            "\5\2\5\uffff\65\2\1\uffff\4\2\1\1\2\2\2\uffff\30\2\3\uffff\2\2\1\uffff\2\2",
             "\1\uffff",
             "",
             "",
@@ -78790,35 +78210,20 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             "",
             ""
     };
-
-    static final short[] DFA106_eot = DFA.unpackEncodedString(DFA106_eotS);
-    static final short[] DFA106_eof = DFA.unpackEncodedString(DFA106_eofS);
-    static final char[] DFA106_min = DFA.unpackEncodedStringToUnsignedChars(DFA106_minS);
-    static final char[] DFA106_max = DFA.unpackEncodedStringToUnsignedChars(DFA106_maxS);
-    static final short[] DFA106_accept = DFA.unpackEncodedString(DFA106_acceptS);
-    static final short[] DFA106_special = DFA.unpackEncodedString(DFA106_specialS);
-    static final short[][] DFA106_transition;
-
-    static {
-        int numStates = DFA106_transitionS.length;
-        DFA106_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA106_transition[i] = DFA.unpackEncodedString(DFA106_transitionS[i]);
-        }
-    }
+    static final short[][] dfa_80 = unpackEncodedStringArray(dfa_80s);
 
     class DFA106 extends DFA {
 
         public DFA106(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 106;
-            this.eot = DFA106_eot;
-            this.eof = DFA106_eof;
-            this.min = DFA106_min;
-            this.max = DFA106_max;
-            this.accept = DFA106_accept;
-            this.special = DFA106_special;
-            this.transition = DFA106_transition;
+            this.eot = dfa_54;
+            this.eof = dfa_55;
+            this.min = dfa_56;
+            this.max = dfa_57;
+            this.accept = dfa_58;
+            this.special = dfa_59;
+            this.transition = dfa_80;
         }
         public String getDescription() {
             return "13196:1: ( rule__XMemberFeatureCall__Group_1_1_3__0 )?";
@@ -78850,21 +78255,8 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA107_eotS =
-        "\140\uffff";
-    static final String DFA107_eofS =
-        "\1\2\137\uffff";
-    static final String DFA107_minS =
-        "\1\4\1\0\136\uffff";
-    static final String DFA107_maxS =
-        "\1\154\1\0\136\uffff";
-    static final String DFA107_acceptS =
-        "\2\uffff\1\2\134\uffff\1\1";
-    static final String DFA107_specialS =
-        "\1\uffff\1\0\136\uffff}>";
-    static final String[] DFA107_transitionS = {
-            "\5\2\5\uffff\65\2\1\uffff\7\2\2\uffff\1\2\1\1\26\2\3\uffff"+
-            "\2\2\1\uffff\2\2",
+    static final String[] dfa_81s = {
+            "\5\2\5\uffff\65\2\1\uffff\7\2\2\uffff\1\2\1\1\26\2\3\uffff\2\2\1\uffff\2\2",
             "\1\uffff",
             "",
             "",
@@ -78961,35 +78353,20 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             "",
             ""
     };
-
-    static final short[] DFA107_eot = DFA.unpackEncodedString(DFA107_eotS);
-    static final short[] DFA107_eof = DFA.unpackEncodedString(DFA107_eofS);
-    static final char[] DFA107_min = DFA.unpackEncodedStringToUnsignedChars(DFA107_minS);
-    static final char[] DFA107_max = DFA.unpackEncodedStringToUnsignedChars(DFA107_maxS);
-    static final short[] DFA107_accept = DFA.unpackEncodedString(DFA107_acceptS);
-    static final short[] DFA107_special = DFA.unpackEncodedString(DFA107_specialS);
-    static final short[][] DFA107_transition;
-
-    static {
-        int numStates = DFA107_transitionS.length;
-        DFA107_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA107_transition[i] = DFA.unpackEncodedString(DFA107_transitionS[i]);
-        }
-    }
+    static final short[][] dfa_81 = unpackEncodedStringArray(dfa_81s);
 
     class DFA107 extends DFA {
 
         public DFA107(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 107;
-            this.eot = DFA107_eot;
-            this.eof = DFA107_eof;
-            this.min = DFA107_min;
-            this.max = DFA107_max;
-            this.accept = DFA107_accept;
-            this.special = DFA107_special;
-            this.transition = DFA107_transition;
+            this.eot = dfa_54;
+            this.eof = dfa_55;
+            this.min = dfa_56;
+            this.max = dfa_57;
+            this.accept = dfa_58;
+            this.special = dfa_59;
+            this.transition = dfa_81;
         }
         public String getDescription() {
             return "13224:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )?";
@@ -79021,23 +78398,13 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA115_eotS =
-        "\70\uffff";
-    static final String DFA115_eofS =
-        "\70\uffff";
-    static final String DFA115_minS =
-        "\1\4\2\0\65\uffff";
-    static final String DFA115_maxS =
-        "\1\154\2\0\65\uffff";
-    static final String DFA115_acceptS =
-        "\3\uffff\1\1\1\uffff\1\2\62\uffff";
-    static final String DFA115_specialS =
-        "\1\uffff\1\0\1\1\65\uffff}>";
-    static final String[] DFA115_transitionS = {
-            "\1\1\4\5\7\uffff\24\5\13\uffff\1\5\3\uffff\1\3\2\uffff\2\5"+
-            "\4\uffff\1\5\3\uffff\3\5\1\uffff\1\5\1\uffff\1\5\1\uffff\1\2"+
-            "\4\uffff\5\5\2\uffff\1\5\1\uffff\1\5\3\uffff\10\5\1\uffff\1"+
-            "\5\6\uffff\1\3\2\5",
+    static final String dfa_82s = "\70\uffff";
+    static final String dfa_83s = "\1\4\2\0\65\uffff";
+    static final String dfa_84s = "\1\154\2\0\65\uffff";
+    static final String dfa_85s = "\3\uffff\1\1\1\uffff\1\2\62\uffff";
+    static final String dfa_86s = "\1\uffff\1\0\1\1\65\uffff}>";
+    static final String[] dfa_87s = {
+            "\1\1\4\5\7\uffff\24\5\13\uffff\1\5\3\uffff\1\3\2\uffff\2\5\4\uffff\1\5\3\uffff\3\5\1\uffff\1\5\1\uffff\1\5\1\uffff\1\2\4\uffff\5\5\2\uffff\1\5\1\uffff\1\5\3\uffff\10\5\1\uffff\1\5\6\uffff\1\3\2\5",
             "\1\uffff",
             "\1\uffff",
             "",
@@ -79095,34 +78462,25 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA115_eot = DFA.unpackEncodedString(DFA115_eotS);
-    static final short[] DFA115_eof = DFA.unpackEncodedString(DFA115_eofS);
-    static final char[] DFA115_min = DFA.unpackEncodedStringToUnsignedChars(DFA115_minS);
-    static final char[] DFA115_max = DFA.unpackEncodedStringToUnsignedChars(DFA115_maxS);
-    static final short[] DFA115_accept = DFA.unpackEncodedString(DFA115_acceptS);
-    static final short[] DFA115_special = DFA.unpackEncodedString(DFA115_specialS);
-    static final short[][] DFA115_transition;
-
-    static {
-        int numStates = DFA115_transitionS.length;
-        DFA115_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA115_transition[i] = DFA.unpackEncodedString(DFA115_transitionS[i]);
-        }
-    }
+    static final short[] dfa_82 = DFA.unpackEncodedString(dfa_82s);
+    static final char[] dfa_83 = DFA.unpackEncodedStringToUnsignedChars(dfa_83s);
+    static final char[] dfa_84 = DFA.unpackEncodedStringToUnsignedChars(dfa_84s);
+    static final short[] dfa_85 = DFA.unpackEncodedString(dfa_85s);
+    static final short[] dfa_86 = DFA.unpackEncodedString(dfa_86s);
+    static final short[][] dfa_87 = unpackEncodedStringArray(dfa_87s);
 
     class DFA115 extends DFA {
 
         public DFA115(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 115;
-            this.eot = DFA115_eot;
-            this.eof = DFA115_eof;
-            this.min = DFA115_min;
-            this.max = DFA115_max;
-            this.accept = DFA115_accept;
-            this.special = DFA115_special;
-            this.transition = DFA115_transition;
+            this.eot = dfa_82;
+            this.eof = dfa_82;
+            this.min = dfa_83;
+            this.max = dfa_84;
+            this.accept = dfa_85;
+            this.special = dfa_86;
+            this.transition = dfa_87;
         }
         public String getDescription() {
             return "14365:1: ( rule__XClosure__Group_1__0 )?";
@@ -79169,678 +78527,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA125_eotS =
-        "\64\uffff";
-    static final String DFA125_eofS =
-        "\64\uffff";
-    static final String DFA125_minS =
-        "\1\4\2\0\61\uffff";
-    static final String DFA125_maxS =
-        "\1\154\2\0\61\uffff";
-    static final String DFA125_acceptS =
-        "\3\uffff\1\1\1\2\57\uffff";
-    static final String DFA125_specialS =
-        "\1\uffff\1\0\1\1\61\uffff}>";
-    static final String[] DFA125_transitionS = {
-            "\1\1\4\4\7\uffff\24\4\13\uffff\1\4\3\uffff\1\3\2\uffff\2\4"+
-            "\4\uffff\1\4\4\uffff\2\4\1\uffff\1\4\1\uffff\1\4\1\uffff\1\2"+
-            "\4\uffff\2\4\1\uffff\2\4\2\uffff\1\4\1\uffff\1\4\3\uffff\10"+
-            "\4\1\uffff\1\4\10\uffff\1\4",
-            "\1\uffff",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA125_eot = DFA.unpackEncodedString(DFA125_eotS);
-    static final short[] DFA125_eof = DFA.unpackEncodedString(DFA125_eofS);
-    static final char[] DFA125_min = DFA.unpackEncodedStringToUnsignedChars(DFA125_minS);
-    static final char[] DFA125_max = DFA.unpackEncodedStringToUnsignedChars(DFA125_maxS);
-    static final short[] DFA125_accept = DFA.unpackEncodedString(DFA125_acceptS);
-    static final short[] DFA125_special = DFA.unpackEncodedString(DFA125_specialS);
-    static final short[][] DFA125_transition;
-
-    static {
-        int numStates = DFA125_transitionS.length;
-        DFA125_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA125_transition[i] = DFA.unpackEncodedString(DFA125_transitionS[i]);
-        }
-    }
-
-    class DFA125 extends DFA {
-
-        public DFA125(BaseRecognizer recognizer) {
-            this.recognizer = recognizer;
-            this.decisionNumber = 125;
-            this.eot = DFA125_eot;
-            this.eof = DFA125_eof;
-            this.min = DFA125_min;
-            this.max = DFA125_max;
-            this.accept = DFA125_accept;
-            this.special = DFA125_special;
-            this.transition = DFA125_transition;
-        }
-        public String getDescription() {
-            return "16033:1: ( rule__XSwitchExpression__Group_2_1_0__0 )?";
-        }
-        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
-            TokenStream input = (TokenStream)_input;
-        	int _s = s;
-            switch ( s ) {
-                    case 0 : 
-                        int LA125_1 = input.LA(1);
-
-                         
-                        int index125_1 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (synpred191_InternalCheck()) ) {s = 3;}
-
-                        else if ( (true) ) {s = 4;}
-
-                         
-                        input.seek(index125_1);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 1 : 
-                        int LA125_2 = input.LA(1);
-
-                         
-                        int index125_2 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (synpred191_InternalCheck()) ) {s = 3;}
-
-                        else if ( (true) ) {s = 4;}
-
-                         
-                        input.seek(index125_2);
-                        if ( s>=0 ) return s;
-                        break;
-            }
-            if (state.backtracking>0) {state.failed=true; return -1;}
-            NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 125, _s, input);
-            error(nvae);
-            throw nvae;
-        }
-    }
-    static final String DFA138_eotS =
-        "\140\uffff";
-    static final String DFA138_eofS =
-        "\1\2\137\uffff";
-    static final String DFA138_minS =
-        "\1\4\1\0\136\uffff";
-    static final String DFA138_maxS =
-        "\1\154\1\0\136\uffff";
-    static final String DFA138_acceptS =
-        "\2\uffff\1\2\134\uffff\1\1";
-    static final String DFA138_specialS =
-        "\1\uffff\1\0\136\uffff}>";
-    static final String[] DFA138_transitionS = {
-            "\5\2\5\uffff\65\2\1\uffff\4\2\1\1\2\2\2\uffff\30\2\3\uffff"+
-            "\2\2\1\uffff\2\2",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA138_eot = DFA.unpackEncodedString(DFA138_eotS);
-    static final short[] DFA138_eof = DFA.unpackEncodedString(DFA138_eofS);
-    static final char[] DFA138_min = DFA.unpackEncodedStringToUnsignedChars(DFA138_minS);
-    static final char[] DFA138_max = DFA.unpackEncodedStringToUnsignedChars(DFA138_maxS);
-    static final short[] DFA138_accept = DFA.unpackEncodedString(DFA138_acceptS);
-    static final short[] DFA138_special = DFA.unpackEncodedString(DFA138_specialS);
-    static final short[][] DFA138_transition;
-
-    static {
-        int numStates = DFA138_transitionS.length;
-        DFA138_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA138_transition[i] = DFA.unpackEncodedString(DFA138_transitionS[i]);
-        }
-    }
-
-    class DFA138 extends DFA {
-
-        public DFA138(BaseRecognizer recognizer) {
-            this.recognizer = recognizer;
-            this.decisionNumber = 138;
-            this.eot = DFA138_eot;
-            this.eof = DFA138_eof;
-            this.min = DFA138_min;
-            this.max = DFA138_max;
-            this.accept = DFA138_accept;
-            this.special = DFA138_special;
-            this.transition = DFA138_transition;
-        }
-        public String getDescription() {
-            return "18521:1: ( rule__XFeatureCall__Group_3__0 )?";
-        }
-        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
-            TokenStream input = (TokenStream)_input;
-        	int _s = s;
-            switch ( s ) {
-                    case 0 : 
-                        int LA138_1 = input.LA(1);
-
-                         
-                        int index138_1 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (synpred204_InternalCheck()) ) {s = 95;}
-
-                        else if ( (true) ) {s = 2;}
-
-                         
-                        input.seek(index138_1);
-                        if ( s>=0 ) return s;
-                        break;
-            }
-            if (state.backtracking>0) {state.failed=true; return -1;}
-            NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 138, _s, input);
-            error(nvae);
-            throw nvae;
-        }
-    }
-    static final String DFA139_eotS =
-        "\140\uffff";
-    static final String DFA139_eofS =
-        "\1\2\137\uffff";
-    static final String DFA139_minS =
-        "\1\4\1\0\136\uffff";
-    static final String DFA139_maxS =
-        "\1\154\1\0\136\uffff";
-    static final String DFA139_acceptS =
-        "\2\uffff\1\2\134\uffff\1\1";
-    static final String DFA139_specialS =
-        "\1\uffff\1\0\136\uffff}>";
-    static final String[] DFA139_transitionS = {
-            "\5\2\5\uffff\65\2\1\uffff\7\2\2\uffff\1\2\1\1\26\2\3\uffff"+
-            "\2\2\1\uffff\2\2",
+    static final String dfa_88s = "\64\uffff";
+    static final String dfa_89s = "\1\4\2\0\61\uffff";
+    static final String dfa_90s = "\1\154\2\0\61\uffff";
+    static final String dfa_91s = "\3\uffff\1\1\1\2\57\uffff";
+    static final String dfa_92s = "\1\uffff\1\0\1\1\61\uffff}>";
+    static final String[] dfa_93s = {
+            "\1\1\4\4\7\uffff\24\4\13\uffff\1\4\3\uffff\1\3\2\uffff\2\4\4\uffff\1\4\4\uffff\2\4\1\uffff\1\4\1\uffff\1\4\1\uffff\1\2\4\uffff\2\4\1\uffff\2\4\2\uffff\1\4\1\uffff\1\4\3\uffff\10\4\1\uffff\1\4\10\uffff\1\4",
             "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA139_eot = DFA.unpackEncodedString(DFA139_eotS);
-    static final short[] DFA139_eof = DFA.unpackEncodedString(DFA139_eofS);
-    static final char[] DFA139_min = DFA.unpackEncodedStringToUnsignedChars(DFA139_minS);
-    static final char[] DFA139_max = DFA.unpackEncodedStringToUnsignedChars(DFA139_maxS);
-    static final short[] DFA139_accept = DFA.unpackEncodedString(DFA139_acceptS);
-    static final short[] DFA139_special = DFA.unpackEncodedString(DFA139_specialS);
-    static final short[][] DFA139_transition;
-
-    static {
-        int numStates = DFA139_transitionS.length;
-        DFA139_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA139_transition[i] = DFA.unpackEncodedString(DFA139_transitionS[i]);
-        }
-    }
-
-    class DFA139 extends DFA {
-
-        public DFA139(BaseRecognizer recognizer) {
-            this.recognizer = recognizer;
-            this.decisionNumber = 139;
-            this.eot = DFA139_eot;
-            this.eof = DFA139_eof;
-            this.min = DFA139_min;
-            this.max = DFA139_max;
-            this.accept = DFA139_accept;
-            this.special = DFA139_special;
-            this.transition = DFA139_transition;
-        }
-        public String getDescription() {
-            return "18549:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )?";
-        }
-        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
-            TokenStream input = (TokenStream)_input;
-        	int _s = s;
-            switch ( s ) {
-                    case 0 : 
-                        int LA139_1 = input.LA(1);
-
-                         
-                        int index139_1 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (synpred205_InternalCheck()) ) {s = 95;}
-
-                        else if ( (true) ) {s = 2;}
-
-                         
-                        input.seek(index139_1);
-                        if ( s>=0 ) return s;
-                        break;
-            }
-            if (state.backtracking>0) {state.failed=true; return -1;}
-            NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 139, _s, input);
-            error(nvae);
-            throw nvae;
-        }
-    }
-    static final String DFA143_eotS =
-        "\140\uffff";
-    static final String DFA143_eofS =
-        "\1\2\137\uffff";
-    static final String DFA143_minS =
-        "\1\4\1\0\136\uffff";
-    static final String DFA143_maxS =
-        "\1\154\1\0\136\uffff";
-    static final String DFA143_acceptS =
-        "\2\uffff\1\2\134\uffff\1\1";
-    static final String DFA143_specialS =
-        "\1\uffff\1\0\136\uffff}>";
-    static final String[] DFA143_transitionS = {
-            "\5\2\5\uffff\41\2\1\1\23\2\1\uffff\7\2\2\uffff\30\2\3\uffff"+
-            "\2\2\1\uffff\2\2",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA143_eot = DFA.unpackEncodedString(DFA143_eotS);
-    static final short[] DFA143_eof = DFA.unpackEncodedString(DFA143_eofS);
-    static final char[] DFA143_min = DFA.unpackEncodedStringToUnsignedChars(DFA143_minS);
-    static final char[] DFA143_max = DFA.unpackEncodedStringToUnsignedChars(DFA143_maxS);
-    static final short[] DFA143_accept = DFA.unpackEncodedString(DFA143_acceptS);
-    static final short[] DFA143_special = DFA.unpackEncodedString(DFA143_specialS);
-    static final short[][] DFA143_transition;
-
-    static {
-        int numStates = DFA143_transitionS.length;
-        DFA143_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA143_transition[i] = DFA.unpackEncodedString(DFA143_transitionS[i]);
-        }
-    }
-
-    class DFA143 extends DFA {
-
-        public DFA143(BaseRecognizer recognizer) {
-            this.recognizer = recognizer;
-            this.decisionNumber = 143;
-            this.eot = DFA143_eot;
-            this.eof = DFA143_eof;
-            this.min = DFA143_min;
-            this.max = DFA143_max;
-            this.accept = DFA143_accept;
-            this.special = DFA143_special;
-            this.transition = DFA143_transition;
-        }
-        public String getDescription() {
-            return "19087:1: ( rule__XConstructorCall__Group_3__0 )?";
-        }
-        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
-            TokenStream input = (TokenStream)_input;
-        	int _s = s;
-            switch ( s ) {
-                    case 0 : 
-                        int LA143_1 = input.LA(1);
-
-                         
-                        int index143_1 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (synpred209_InternalCheck()) ) {s = 95;}
-
-                        else if ( (true) ) {s = 2;}
-
-                         
-                        input.seek(index143_1);
-                        if ( s>=0 ) return s;
-                        break;
-            }
-            if (state.backtracking>0) {state.failed=true; return -1;}
-            NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 143, _s, input);
-            error(nvae);
-            throw nvae;
-        }
-    }
-    static final String DFA144_eotS =
-        "\140\uffff";
-    static final String DFA144_eofS =
-        "\1\2\137\uffff";
-    static final String DFA144_minS =
-        "\1\4\1\0\136\uffff";
-    static final String DFA144_maxS =
-        "\1\154\1\0\136\uffff";
-    static final String DFA144_acceptS =
-        "\2\uffff\1\2\134\uffff\1\1";
-    static final String DFA144_specialS =
-        "\1\uffff\1\0\136\uffff}>";
-    static final String[] DFA144_transitionS = {
-            "\5\2\5\uffff\65\2\1\uffff\4\2\1\1\2\2\2\uffff\30\2\3\uffff"+
-            "\2\2\1\uffff\2\2",
             "\1\uffff",
             "",
             "",
@@ -79890,128 +78584,164 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             "",
             "",
             "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
             ""
     };
 
-    static final short[] DFA144_eot = DFA.unpackEncodedString(DFA144_eotS);
-    static final short[] DFA144_eof = DFA.unpackEncodedString(DFA144_eofS);
-    static final char[] DFA144_min = DFA.unpackEncodedStringToUnsignedChars(DFA144_minS);
-    static final char[] DFA144_max = DFA.unpackEncodedStringToUnsignedChars(DFA144_maxS);
-    static final short[] DFA144_accept = DFA.unpackEncodedString(DFA144_acceptS);
-    static final short[] DFA144_special = DFA.unpackEncodedString(DFA144_specialS);
-    static final short[][] DFA144_transition;
+    static final short[] dfa_88 = DFA.unpackEncodedString(dfa_88s);
+    static final char[] dfa_89 = DFA.unpackEncodedStringToUnsignedChars(dfa_89s);
+    static final char[] dfa_90 = DFA.unpackEncodedStringToUnsignedChars(dfa_90s);
+    static final short[] dfa_91 = DFA.unpackEncodedString(dfa_91s);
+    static final short[] dfa_92 = DFA.unpackEncodedString(dfa_92s);
+    static final short[][] dfa_93 = unpackEncodedStringArray(dfa_93s);
 
-    static {
-        int numStates = DFA144_transitionS.length;
-        DFA144_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA144_transition[i] = DFA.unpackEncodedString(DFA144_transitionS[i]);
+    class DFA125 extends DFA {
+
+        public DFA125(BaseRecognizer recognizer) {
+            this.recognizer = recognizer;
+            this.decisionNumber = 125;
+            this.eot = dfa_88;
+            this.eof = dfa_88;
+            this.min = dfa_89;
+            this.max = dfa_90;
+            this.accept = dfa_91;
+            this.special = dfa_92;
+            this.transition = dfa_93;
+        }
+        public String getDescription() {
+            return "16033:1: ( rule__XSwitchExpression__Group_2_1_0__0 )?";
+        }
+        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
+            TokenStream input = (TokenStream)_input;
+        	int _s = s;
+            switch ( s ) {
+                    case 0 : 
+                        int LA125_1 = input.LA(1);
+
+                         
+                        int index125_1 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (synpred191_InternalCheck()) ) {s = 3;}
+
+                        else if ( (true) ) {s = 4;}
+
+                         
+                        input.seek(index125_1);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 1 : 
+                        int LA125_2 = input.LA(1);
+
+                         
+                        int index125_2 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (synpred191_InternalCheck()) ) {s = 3;}
+
+                        else if ( (true) ) {s = 4;}
+
+                         
+                        input.seek(index125_2);
+                        if ( s>=0 ) return s;
+                        break;
+            }
+            if (state.backtracking>0) {state.failed=true; return -1;}
+            NoViableAltException nvae =
+                new NoViableAltException(getDescription(), 125, _s, input);
+            error(nvae);
+            throw nvae;
         }
     }
 
-    class DFA144 extends DFA {
+    class DFA138 extends DFA {
 
-        public DFA144(BaseRecognizer recognizer) {
+        public DFA138(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 144;
-            this.eot = DFA144_eot;
-            this.eof = DFA144_eof;
-            this.min = DFA144_min;
-            this.max = DFA144_max;
-            this.accept = DFA144_accept;
-            this.special = DFA144_special;
-            this.transition = DFA144_transition;
+            this.decisionNumber = 138;
+            this.eot = dfa_54;
+            this.eof = dfa_55;
+            this.min = dfa_56;
+            this.max = dfa_57;
+            this.accept = dfa_58;
+            this.special = dfa_59;
+            this.transition = dfa_80;
         }
         public String getDescription() {
-            return "19116:1: ( rule__XConstructorCall__Group_4__0 )?";
+            return "18521:1: ( rule__XFeatureCall__Group_3__0 )?";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA144_1 = input.LA(1);
+                        int LA138_1 = input.LA(1);
 
                          
-                        int index144_1 = input.index();
+                        int index138_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred210_InternalCheck()) ) {s = 95;}
+                        if ( (synpred204_InternalCheck()) ) {s = 95;}
 
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index144_1);
+                        input.seek(index138_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (state.backtracking>0) {state.failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 144, _s, input);
+                new NoViableAltException(getDescription(), 138, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA145_eotS =
-        "\140\uffff";
-    static final String DFA145_eofS =
-        "\1\2\137\uffff";
-    static final String DFA145_minS =
-        "\1\4\1\0\136\uffff";
-    static final String DFA145_maxS =
-        "\1\154\1\0\136\uffff";
-    static final String DFA145_acceptS =
-        "\2\uffff\1\2\134\uffff\1\1";
-    static final String DFA145_specialS =
-        "\1\uffff\1\0\136\uffff}>";
-    static final String[] DFA145_transitionS = {
-            "\5\2\5\uffff\65\2\1\uffff\7\2\2\uffff\1\2\1\1\26\2\3\uffff"+
-            "\2\2\1\uffff\2\2",
+
+    class DFA139 extends DFA {
+
+        public DFA139(BaseRecognizer recognizer) {
+            this.recognizer = recognizer;
+            this.decisionNumber = 139;
+            this.eot = dfa_54;
+            this.eof = dfa_55;
+            this.min = dfa_56;
+            this.max = dfa_57;
+            this.accept = dfa_58;
+            this.special = dfa_59;
+            this.transition = dfa_81;
+        }
+        public String getDescription() {
+            return "18549:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )?";
+        }
+        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
+            TokenStream input = (TokenStream)_input;
+        	int _s = s;
+            switch ( s ) {
+                    case 0 : 
+                        int LA139_1 = input.LA(1);
+
+                         
+                        int index139_1 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (synpred205_InternalCheck()) ) {s = 95;}
+
+                        else if ( (true) ) {s = 2;}
+
+                         
+                        input.seek(index139_1);
+                        if ( s>=0 ) return s;
+                        break;
+            }
+            if (state.backtracking>0) {state.failed=true; return -1;}
+            NoViableAltException nvae =
+                new NoViableAltException(getDescription(), 139, _s, input);
+            error(nvae);
+            throw nvae;
+        }
+    }
+    static final String[] dfa_94s = {
+            "\5\2\5\uffff\41\2\1\1\23\2\1\uffff\7\2\2\uffff\30\2\3\uffff\2\2\1\uffff\2\2",
             "\1\uffff",
             "",
             "",
@@ -80108,20 +78838,93 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             "",
             ""
     };
+    static final short[][] dfa_94 = unpackEncodedStringArray(dfa_94s);
+
+    class DFA143 extends DFA {
+
+        public DFA143(BaseRecognizer recognizer) {
+            this.recognizer = recognizer;
+            this.decisionNumber = 143;
+            this.eot = dfa_54;
+            this.eof = dfa_55;
+            this.min = dfa_56;
+            this.max = dfa_57;
+            this.accept = dfa_58;
+            this.special = dfa_59;
+            this.transition = dfa_94;
+        }
+        public String getDescription() {
+            return "19087:1: ( rule__XConstructorCall__Group_3__0 )?";
+        }
+        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
+            TokenStream input = (TokenStream)_input;
+        	int _s = s;
+            switch ( s ) {
+                    case 0 : 
+                        int LA143_1 = input.LA(1);
+
+                         
+                        int index143_1 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (synpred209_InternalCheck()) ) {s = 95;}
+
+                        else if ( (true) ) {s = 2;}
+
+                         
+                        input.seek(index143_1);
+                        if ( s>=0 ) return s;
+                        break;
+            }
+            if (state.backtracking>0) {state.failed=true; return -1;}
+            NoViableAltException nvae =
+                new NoViableAltException(getDescription(), 143, _s, input);
+            error(nvae);
+            throw nvae;
+        }
+    }
 
-    static final short[] DFA145_eot = DFA.unpackEncodedString(DFA145_eotS);
-    static final short[] DFA145_eof = DFA.unpackEncodedString(DFA145_eofS);
-    static final char[] DFA145_min = DFA.unpackEncodedStringToUnsignedChars(DFA145_minS);
-    static final char[] DFA145_max = DFA.unpackEncodedStringToUnsignedChars(DFA145_maxS);
-    static final short[] DFA145_accept = DFA.unpackEncodedString(DFA145_acceptS);
-    static final short[] DFA145_special = DFA.unpackEncodedString(DFA145_specialS);
-    static final short[][] DFA145_transition;
+    class DFA144 extends DFA {
+
+        public DFA144(BaseRecognizer recognizer) {
+            this.recognizer = recognizer;
+            this.decisionNumber = 144;
+            this.eot = dfa_54;
+            this.eof = dfa_55;
+            this.min = dfa_56;
+            this.max = dfa_57;
+            this.accept = dfa_58;
+            this.special = dfa_59;
+            this.transition = dfa_80;
+        }
+        public String getDescription() {
+            return "19116:1: ( rule__XConstructorCall__Group_4__0 )?";
+        }
+        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
+            TokenStream input = (TokenStream)_input;
+        	int _s = s;
+            switch ( s ) {
+                    case 0 : 
+                        int LA144_1 = input.LA(1);
+
+                         
+                        int index144_1 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (synpred210_InternalCheck()) ) {s = 95;}
+
+                        else if ( (true) ) {s = 2;}
 
-    static {
-        int numStates = DFA145_transitionS.length;
-        DFA145_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA145_transition[i] = DFA.unpackEncodedString(DFA145_transitionS[i]);
+                         
+                        input.seek(index144_1);
+                        if ( s>=0 ) return s;
+                        break;
+            }
+            if (state.backtracking>0) {state.failed=true; return -1;}
+            NoViableAltException nvae =
+                new NoViableAltException(getDescription(), 144, _s, input);
+            error(nvae);
+            throw nvae;
         }
     }
 
@@ -80130,13 +78933,13 @@ class DFA145 extends DFA {
         public DFA145(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 145;
-            this.eot = DFA145_eot;
-            this.eof = DFA145_eof;
-            this.min = DFA145_min;
-            this.max = DFA145_max;
-            this.accept = DFA145_accept;
-            this.special = DFA145_special;
-            this.transition = DFA145_transition;
+            this.eot = dfa_54;
+            this.eof = dfa_55;
+            this.min = dfa_56;
+            this.max = dfa_57;
+            this.accept = dfa_58;
+            this.special = dfa_59;
+            this.transition = dfa_81;
         }
         public String getDescription() {
             return "19144:1: ( rule__XConstructorCall__ArgumentsAssignment_5 )?";
@@ -80168,30 +78971,13 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA150_eotS =
-        "\140\uffff";
-    static final String DFA150_eofS =
-        "\1\63\137\uffff";
-    static final String DFA150_minS =
-        "\1\4\62\0\55\uffff";
-    static final String DFA150_maxS =
-        "\1\154\62\0\55\uffff";
-    static final String DFA150_acceptS =
-        "\63\uffff\1\2\53\uffff\1\1";
-    static final String DFA150_specialS =
-        "\1\uffff\1\0\1\1\1\2\1\3\1\4\1\5\1\6\1\7\1\10\1\11\1\12\1\13\1"+
-        "\14\1\15\1\16\1\17\1\20\1\21\1\22\1\23\1\24\1\25\1\26\1\27\1\30"+
-        "\1\31\1\32\1\33\1\34\1\35\1\36\1\37\1\40\1\41\1\42\1\43\1\44\1\45"+
-        "\1\46\1\47\1\50\1\51\1\52\1\53\1\54\1\55\1\56\1\57\1\60\1\61\55"+
-        "\uffff}>";
-    static final String[] DFA150_transitionS = {
-            "\1\1\1\43\1\44\1\45\1\47\5\uffff\2\63\1\2\1\3\1\4\1\5\1\6\1"+
-            "\7\1\10\1\11\1\12\1\13\1\14\1\15\1\16\1\17\1\20\1\21\1\22\1"+
-            "\23\1\24\1\25\13\63\1\35\6\63\1\30\1\27\4\63\1\26\4\63\1\36"+
-            "\1\41\1\uffff\1\32\1\63\1\52\1\63\1\60\2\63\2\uffff\1\37\1\40"+
-            "\1\63\1\61\1\62\2\63\1\51\1\63\1\33\3\63\1\53\1\54\1\31\1\46"+
-            "\1\50\1\55\1\56\1\57\1\63\1\34\1\63\3\uffff\2\63\1\uffff\1\63"+
-            "\1\42",
+    static final String dfa_95s = "\1\63\137\uffff";
+    static final String dfa_96s = "\1\4\62\0\55\uffff";
+    static final String dfa_97s = "\1\154\62\0\55\uffff";
+    static final String dfa_98s = "\63\uffff\1\2\53\uffff\1\1";
+    static final String dfa_99s = "\1\uffff\1\0\1\1\1\2\1\3\1\4\1\5\1\6\1\7\1\10\1\11\1\12\1\13\1\14\1\15\1\16\1\17\1\20\1\21\1\22\1\23\1\24\1\25\1\26\1\27\1\30\1\31\1\32\1\33\1\34\1\35\1\36\1\37\1\40\1\41\1\42\1\43\1\44\1\45\1\46\1\47\1\50\1\51\1\52\1\53\1\54\1\55\1\56\1\57\1\60\1\61\55\uffff}>";
+    static final String[] dfa_100s = {
+            "\1\1\1\43\1\44\1\45\1\47\5\uffff\2\63\1\2\1\3\1\4\1\5\1\6\1\7\1\10\1\11\1\12\1\13\1\14\1\15\1\16\1\17\1\20\1\21\1\22\1\23\1\24\1\25\13\63\1\35\6\63\1\30\1\27\4\63\1\26\4\63\1\36\1\41\1\uffff\1\32\1\63\1\52\1\63\1\60\2\63\2\uffff\1\37\1\40\1\63\1\61\1\62\2\63\1\51\1\63\1\33\3\63\1\53\1\54\1\31\1\46\1\50\1\55\1\56\1\57\1\63\1\34\1\63\3\uffff\2\63\1\uffff\1\63\1\42",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -80288,35 +79074,25 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             "",
             ""
     };
-
-    static final short[] DFA150_eot = DFA.unpackEncodedString(DFA150_eotS);
-    static final short[] DFA150_eof = DFA.unpackEncodedString(DFA150_eofS);
-    static final char[] DFA150_min = DFA.unpackEncodedStringToUnsignedChars(DFA150_minS);
-    static final char[] DFA150_max = DFA.unpackEncodedStringToUnsignedChars(DFA150_maxS);
-    static final short[] DFA150_accept = DFA.unpackEncodedString(DFA150_acceptS);
-    static final short[] DFA150_special = DFA.unpackEncodedString(DFA150_specialS);
-    static final short[][] DFA150_transition;
-
-    static {
-        int numStates = DFA150_transitionS.length;
-        DFA150_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA150_transition[i] = DFA.unpackEncodedString(DFA150_transitionS[i]);
-        }
-    }
+    static final short[] dfa_95 = DFA.unpackEncodedString(dfa_95s);
+    static final char[] dfa_96 = DFA.unpackEncodedStringToUnsignedChars(dfa_96s);
+    static final char[] dfa_97 = DFA.unpackEncodedStringToUnsignedChars(dfa_97s);
+    static final short[] dfa_98 = DFA.unpackEncodedString(dfa_98s);
+    static final short[] dfa_99 = DFA.unpackEncodedString(dfa_99s);
+    static final short[][] dfa_100 = unpackEncodedStringArray(dfa_100s);
 
     class DFA150 extends DFA {
 
         public DFA150(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 150;
-            this.eot = DFA150_eot;
-            this.eof = DFA150_eof;
-            this.min = DFA150_min;
-            this.max = DFA150_max;
-            this.accept = DFA150_accept;
-            this.special = DFA150_special;
-            this.transition = DFA150_transition;
+            this.eot = dfa_54;
+            this.eof = dfa_95;
+            this.min = dfa_96;
+            this.max = dfa_97;
+            this.accept = dfa_98;
+            this.special = dfa_99;
+            this.transition = dfa_100;
         }
         public String getDescription() {
             return "20197:1: ( rule__XReturnExpression__ExpressionAssignment_2 )?";
@@ -81083,21 +79859,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA159_eotS =
-        "\141\uffff";
-    static final String DFA159_eofS =
-        "\1\2\140\uffff";
-    static final String DFA159_minS =
-        "\1\4\1\0\137\uffff";
-    static final String DFA159_maxS =
-        "\1\154\1\0\137\uffff";
-    static final String DFA159_acceptS =
-        "\2\uffff\1\2\135\uffff\1\1";
-    static final String DFA159_specialS =
-        "\1\uffff\1\0\137\uffff}>";
-    static final String[] DFA159_transitionS = {
-            "\5\2\5\uffff\41\2\1\1\23\2\1\uffff\7\2\2\uffff\30\2\1\uffff"+
-            "\1\2\1\uffff\2\2\1\uffff\2\2",
+    static final String dfa_101s = "\141\uffff";
+    static final String dfa_102s = "\1\2\140\uffff";
+    static final String dfa_103s = "\1\4\1\0\137\uffff";
+    static final String dfa_104s = "\1\154\1\0\137\uffff";
+    static final String dfa_105s = "\2\uffff\1\2\135\uffff\1\1";
+    static final String dfa_106s = "\1\uffff\1\0\137\uffff}>";
+    static final String[] dfa_107s = {
+            "\5\2\5\uffff\41\2\1\1\23\2\1\uffff\7\2\2\uffff\30\2\1\uffff\1\2\1\uffff\2\2\1\uffff\2\2",
             "\1\uffff",
             "",
             "",
@@ -81196,34 +79965,26 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA159_eot = DFA.unpackEncodedString(DFA159_eotS);
-    static final short[] DFA159_eof = DFA.unpackEncodedString(DFA159_eofS);
-    static final char[] DFA159_min = DFA.unpackEncodedStringToUnsignedChars(DFA159_minS);
-    static final char[] DFA159_max = DFA.unpackEncodedStringToUnsignedChars(DFA159_maxS);
-    static final short[] DFA159_accept = DFA.unpackEncodedString(DFA159_acceptS);
-    static final short[] DFA159_special = DFA.unpackEncodedString(DFA159_specialS);
-    static final short[][] DFA159_transition;
-
-    static {
-        int numStates = DFA159_transitionS.length;
-        DFA159_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA159_transition[i] = DFA.unpackEncodedString(DFA159_transitionS[i]);
-        }
-    }
+    static final short[] dfa_101 = DFA.unpackEncodedString(dfa_101s);
+    static final short[] dfa_102 = DFA.unpackEncodedString(dfa_102s);
+    static final char[] dfa_103 = DFA.unpackEncodedStringToUnsignedChars(dfa_103s);
+    static final char[] dfa_104 = DFA.unpackEncodedStringToUnsignedChars(dfa_104s);
+    static final short[] dfa_105 = DFA.unpackEncodedString(dfa_105s);
+    static final short[] dfa_106 = DFA.unpackEncodedString(dfa_106s);
+    static final short[][] dfa_107 = unpackEncodedStringArray(dfa_107s);
 
     class DFA159 extends DFA {
 
         public DFA159(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 159;
-            this.eot = DFA159_eot;
-            this.eof = DFA159_eof;
-            this.min = DFA159_min;
-            this.max = DFA159_max;
-            this.accept = DFA159_accept;
-            this.special = DFA159_special;
-            this.transition = DFA159_transition;
+            this.eot = dfa_101;
+            this.eof = dfa_102;
+            this.min = dfa_103;
+            this.max = dfa_104;
+            this.accept = dfa_105;
+            this.special = dfa_106;
+            this.transition = dfa_107;
         }
         public String getDescription() {
             return "21776:1: ( rule__JvmParameterizedTypeReference__Group_1__0 )?";
@@ -81255,147 +80016,19 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA162_eotS =
-        "\141\uffff";
-    static final String DFA162_eofS =
-        "\1\2\140\uffff";
-    static final String DFA162_minS =
-        "\1\4\1\0\137\uffff";
-    static final String DFA162_maxS =
-        "\1\154\1\0\137\uffff";
-    static final String DFA162_acceptS =
-        "\2\uffff\1\2\135\uffff\1\1";
-    static final String DFA162_specialS =
-        "\1\uffff\1\0\137\uffff}>";
-    static final String[] DFA162_transitionS = {
-            "\5\2\5\uffff\41\2\1\1\23\2\1\uffff\7\2\2\uffff\30\2\1\uffff"+
-            "\1\2\1\uffff\2\2\1\uffff\2\2",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA162_eot = DFA.unpackEncodedString(DFA162_eotS);
-    static final short[] DFA162_eof = DFA.unpackEncodedString(DFA162_eofS);
-    static final char[] DFA162_min = DFA.unpackEncodedStringToUnsignedChars(DFA162_minS);
-    static final char[] DFA162_max = DFA.unpackEncodedStringToUnsignedChars(DFA162_maxS);
-    static final short[] DFA162_accept = DFA.unpackEncodedString(DFA162_acceptS);
-    static final short[] DFA162_special = DFA.unpackEncodedString(DFA162_specialS);
-    static final short[][] DFA162_transition;
-
-    static {
-        int numStates = DFA162_transitionS.length;
-        DFA162_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA162_transition[i] = DFA.unpackEncodedString(DFA162_transitionS[i]);
-        }
-    }
 
     class DFA162 extends DFA {
 
         public DFA162(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 162;
-            this.eot = DFA162_eot;
-            this.eof = DFA162_eof;
-            this.min = DFA162_min;
-            this.max = DFA162_max;
-            this.accept = DFA162_accept;
-            this.special = DFA162_special;
-            this.transition = DFA162_transition;
+            this.eot = dfa_101;
+            this.eof = dfa_102;
+            this.min = dfa_103;
+            this.max = dfa_104;
+            this.accept = dfa_105;
+            this.special = dfa_106;
+            this.transition = dfa_107;
         }
         public String getDescription() {
             return "22087:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )?";
@@ -81429,2202 +80062,130 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
     }
  
 
-    public static final BitSet FOLLOW_ruleCheckCatalog_in_entryRuleCheckCatalog67 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleCheckCatalog74 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group__0_in_ruleCheckCatalog100 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXImportSection_in_entryRuleXImportSection127 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXImportSection134 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportSection__Group__0_in_ruleXImportSection160 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXImportDeclaration_in_entryRuleXImportDeclaration187 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXImportDeclaration194 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Group__0_in_ruleXImportDeclaration220 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCategory_in_entryRuleCategory251 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleCategory258 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Category__Group__0_in_ruleCategory284 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCheck_in_entryRuleCheck311 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleCheck318 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group__0_in_ruleCheck344 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSeverityRange_in_entryRuleSeverityRange371 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSeverityRange378 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SeverityRange__Group__0_in_ruleSeverityRange404 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMember_in_entryRuleMember431 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleMember438 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Member__Group__0_in_ruleMember464 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImplementation_in_entryRuleImplementation491 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleImplementation498 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Implementation__Group__0_in_ruleImplementation524 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFormalParameter_in_entryRuleFormalParameter551 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFormalParameter558 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FormalParameter__Group__0_in_ruleFormalParameter584 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSimpleFormalParameterDefaultValueLiteral_in_entryRuleXSimpleFormalParameterDefaultValueLiteral611 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXSimpleFormalParameterDefaultValueLiteral618 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives_in_ruleXSimpleFormalParameterDefaultValueLiteral644 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstantUnaryOperation_in_entryRuleXConstantUnaryOperation671 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXConstantUnaryOperation678 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantUnaryOperation__Alternatives_in_ruleXConstantUnaryOperation704 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXFormalParameterDefaultValueLiteral_in_entryRuleXFormalParameterDefaultValueLiteral731 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXFormalParameterDefaultValueLiteral738 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFormalParameterDefaultValueLiteral__Alternatives_in_ruleXFormalParameterDefaultValueLiteral764 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstantListLiteral_in_entryRuleXConstantListLiteral791 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXConstantListLiteral798 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group__0_in_ruleXConstantListLiteral824 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleContext_in_entryRuleContext851 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleContext858 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Context__Group__0_in_ruleContext884 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleContextVariable_in_entryRuleContextVariable911 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleContextVariable918 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContextVariable__Group__0_in_ruleContextVariable944 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXGuardExpression_in_entryRuleXGuardExpression971 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXGuardExpression978 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XGuardExpression__Group__0_in_ruleXGuardExpression1004 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXIssueExpression_in_entryRuleXIssueExpression1031 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXIssueExpression1038 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group__0_in_ruleXIssueExpression1064 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXPrimaryExpression_in_entryRuleXPrimaryExpression1091 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXPrimaryExpression1098 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XPrimaryExpression__Alternatives_in_ruleXPrimaryExpression1124 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFeatureCallID_in_entryRuleFeatureCallID1151 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFeatureCallID1158 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FeatureCallID__Alternatives_in_ruleFeatureCallID1184 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotation_in_entryRuleXAnnotation1211 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAnnotation1218 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group__0_in_ruleXAnnotation1244 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationElementValuePair_in_entryRuleXAnnotationElementValuePair1271 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAnnotationElementValuePair1278 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__Group__0_in_ruleXAnnotationElementValuePair1304 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationElementValueOrCommaList_in_entryRuleXAnnotationElementValueOrCommaList1331 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAnnotationElementValueOrCommaList1338 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Alternatives_in_ruleXAnnotationElementValueOrCommaList1364 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationElementValue_in_entryRuleXAnnotationElementValue1391 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAnnotationElementValue1398 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Alternatives_in_ruleXAnnotationElementValue1424 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_entryRuleXAnnotationOrExpression1451 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAnnotationOrExpression1458 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationOrExpression__Alternatives_in_ruleXAnnotationOrExpression1484 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_entryRuleXExpression1511 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXExpression1518 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAssignment_in_ruleXExpression1544 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAssignment_in_entryRuleXAssignment1570 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAssignment1577 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Alternatives_in_ruleXAssignment1603 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpSingleAssign_in_entryRuleOpSingleAssign1630 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpSingleAssign1637 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_13_in_ruleOpSingleAssign1664 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpMultiAssign_in_entryRuleOpMultiAssign1692 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpMultiAssign1699 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Alternatives_in_ruleOpMultiAssign1725 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXOrExpression_in_entryRuleXOrExpression1752 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXOrExpression1759 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group__0_in_ruleXOrExpression1785 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpOr_in_entryRuleOpOr1812 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpOr1819 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_14_in_ruleOpOr1846 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAndExpression_in_entryRuleXAndExpression1874 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAndExpression1881 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group__0_in_ruleXAndExpression1907 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpAnd_in_entryRuleOpAnd1934 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpAnd1941 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_15_in_ruleOpAnd1968 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXEqualityExpression_in_entryRuleXEqualityExpression1996 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXEqualityExpression2003 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group__0_in_ruleXEqualityExpression2029 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpEquality_in_entryRuleOpEquality2056 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpEquality2063 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpEquality__Alternatives_in_ruleOpEquality2089 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXRelationalExpression_in_entryRuleXRelationalExpression2116 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXRelationalExpression2123 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group__0_in_ruleXRelationalExpression2149 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpCompare_in_entryRuleOpCompare2176 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpCompare2183 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpCompare__Alternatives_in_ruleOpCompare2209 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXOtherOperatorExpression_in_entryRuleXOtherOperatorExpression2236 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXOtherOperatorExpression2243 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group__0_in_ruleXOtherOperatorExpression2269 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpOther_in_entryRuleOpOther2296 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpOther2303 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Alternatives_in_ruleOpOther2329 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAdditiveExpression_in_entryRuleXAdditiveExpression2356 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAdditiveExpression2363 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group__0_in_ruleXAdditiveExpression2389 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpAdd_in_entryRuleOpAdd2416 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpAdd2423 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpAdd__Alternatives_in_ruleOpAdd2449 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXMultiplicativeExpression_in_entryRuleXMultiplicativeExpression2476 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXMultiplicativeExpression2483 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group__0_in_ruleXMultiplicativeExpression2509 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpMulti_in_entryRuleOpMulti2536 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpMulti2543 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpMulti__Alternatives_in_ruleOpMulti2569 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXUnaryOperation_in_entryRuleXUnaryOperation2596 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXUnaryOperation2603 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XUnaryOperation__Alternatives_in_ruleXUnaryOperation2629 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpUnary_in_entryRuleOpUnary2656 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpUnary2663 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpUnary__Alternatives_in_ruleOpUnary2689 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCastedExpression_in_entryRuleXCastedExpression2716 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXCastedExpression2723 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group__0_in_ruleXCastedExpression2749 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXPostfixOperation_in_entryRuleXPostfixOperation2776 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXPostfixOperation2783 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group__0_in_ruleXPostfixOperation2809 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpPostfix_in_entryRuleOpPostfix2836 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpPostfix2843 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpPostfix__Alternatives_in_ruleOpPostfix2869 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXMemberFeatureCall_in_entryRuleXMemberFeatureCall2896 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXMemberFeatureCall2903 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group__0_in_ruleXMemberFeatureCall2929 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXLiteral_in_entryRuleXLiteral2956 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXLiteral2963 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XLiteral__Alternatives_in_ruleXLiteral2989 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCollectionLiteral_in_entryRuleXCollectionLiteral3016 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXCollectionLiteral3023 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCollectionLiteral__Alternatives_in_ruleXCollectionLiteral3049 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSetLiteral_in_entryRuleXSetLiteral3076 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXSetLiteral3083 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group__0_in_ruleXSetLiteral3109 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXListLiteral_in_entryRuleXListLiteral3136 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXListLiteral3143 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group__0_in_ruleXListLiteral3169 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXClosure_in_entryRuleXClosure3196 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXClosure3203 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group__0_in_ruleXClosure3229 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpressionInClosure_in_entryRuleXExpressionInClosure3256 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXExpressionInClosure3263 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XExpressionInClosure__Group__0_in_ruleXExpressionInClosure3289 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXShortClosure_in_entryRuleXShortClosure3316 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXShortClosure3323 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group__0_in_ruleXShortClosure3349 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXParenthesizedExpression_in_entryRuleXParenthesizedExpression3376 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXParenthesizedExpression3383 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XParenthesizedExpression__Group__0_in_ruleXParenthesizedExpression3409 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXIfExpression_in_entryRuleXIfExpression3436 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXIfExpression3443 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__0_in_ruleXIfExpression3469 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSwitchExpression_in_entryRuleXSwitchExpression3496 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXSwitchExpression3503 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__0_in_ruleXSwitchExpression3529 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCasePart_in_entryRuleXCasePart3556 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXCasePart3563 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group__0_in_ruleXCasePart3589 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXForLoopExpression_in_entryRuleXForLoopExpression3616 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXForLoopExpression3623 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group__0_in_ruleXForLoopExpression3649 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBasicForLoopExpression_in_entryRuleXBasicForLoopExpression3676 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXBasicForLoopExpression3683 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__0_in_ruleXBasicForLoopExpression3709 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXWhileExpression_in_entryRuleXWhileExpression3736 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXWhileExpression3743 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__0_in_ruleXWhileExpression3769 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXDoWhileExpression_in_entryRuleXDoWhileExpression3796 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXDoWhileExpression3803 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__0_in_ruleXDoWhileExpression3829 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBlockExpression_in_entryRuleXBlockExpression3856 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXBlockExpression3863 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group__0_in_ruleXBlockExpression3889 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_entryRuleXExpressionOrVarDeclaration3916 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXExpressionOrVarDeclaration3923 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XExpressionOrVarDeclaration__Alternatives_in_ruleXExpressionOrVarDeclaration3949 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXVariableDeclaration_in_entryRuleXVariableDeclaration3976 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXVariableDeclaration3983 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group__0_in_ruleXVariableDeclaration4009 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_entryRuleJvmFormalParameter4036 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmFormalParameter4043 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmFormalParameter__Group__0_in_ruleJvmFormalParameter4069 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFullJvmFormalParameter_in_entryRuleFullJvmFormalParameter4096 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFullJvmFormalParameter4103 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FullJvmFormalParameter__Group__0_in_ruleFullJvmFormalParameter4129 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXFeatureCall_in_entryRuleXFeatureCall4156 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXFeatureCall4163 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group__0_in_ruleXFeatureCall4189 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdOrSuper_in_entryRuleIdOrSuper4216 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIdOrSuper4223 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IdOrSuper__Alternatives_in_ruleIdOrSuper4249 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstructorCall_in_entryRuleXConstructorCall4276 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXConstructorCall4283 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__0_in_ruleXConstructorCall4309 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBooleanLiteral_in_entryRuleXBooleanLiteral4336 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXBooleanLiteral4343 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBooleanLiteral__Group__0_in_ruleXBooleanLiteral4369 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXNullLiteral_in_entryRuleXNullLiteral4396 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXNullLiteral4403 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XNullLiteral__Group__0_in_ruleXNullLiteral4429 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXNumberLiteral_in_entryRuleXNumberLiteral4456 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXNumberLiteral4463 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XNumberLiteral__Group__0_in_ruleXNumberLiteral4489 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXStringLiteral_in_entryRuleXStringLiteral4516 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXStringLiteral4523 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XStringLiteral__Group__0_in_ruleXStringLiteral4549 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXTypeLiteral_in_entryRuleXTypeLiteral4576 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXTypeLiteral4583 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__0_in_ruleXTypeLiteral4609 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXThrowExpression_in_entryRuleXThrowExpression4636 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXThrowExpression4643 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XThrowExpression__Group__0_in_ruleXThrowExpression4669 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXReturnExpression_in_entryRuleXReturnExpression4696 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXReturnExpression4703 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XReturnExpression__Group__0_in_ruleXReturnExpression4729 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXTryCatchFinallyExpression_in_entryRuleXTryCatchFinallyExpression4756 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXTryCatchFinallyExpression4763 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group__0_in_ruleXTryCatchFinallyExpression4789 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSynchronizedExpression_in_entryRuleXSynchronizedExpression4816 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXSynchronizedExpression4823 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group__0_in_ruleXSynchronizedExpression4849 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCatchClause_in_entryRuleXCatchClause4876 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXCatchClause4883 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCatchClause__Group__0_in_ruleXCatchClause4909 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName4936 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedName4943 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group__0_in_ruleQualifiedName4969 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNumber_in_entryRuleNumber5001 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNumber5008 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Number__Alternatives_in_ruleNumber5038 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_entryRuleJvmTypeReference5067 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmTypeReference5074 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Alternatives_in_ruleJvmTypeReference5100 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleArrayBrackets_in_entryRuleArrayBrackets5127 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleArrayBrackets5134 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ArrayBrackets__Group__0_in_ruleArrayBrackets5160 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXFunctionTypeRef_in_entryRuleXFunctionTypeRef5187 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXFunctionTypeRef5194 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group__0_in_ruleXFunctionTypeRef5220 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmParameterizedTypeReference_in_entryRuleJvmParameterizedTypeReference5247 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmParameterizedTypeReference5254 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group__0_in_ruleJvmParameterizedTypeReference5280 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_entryRuleJvmArgumentTypeReference5307 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmArgumentTypeReference5314 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmArgumentTypeReference__Alternatives_in_ruleJvmArgumentTypeReference5340 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmWildcardTypeReference_in_entryRuleJvmWildcardTypeReference5367 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmWildcardTypeReference5374 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group__0_in_ruleJvmWildcardTypeReference5400 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmUpperBound_in_entryRuleJvmUpperBound5427 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmUpperBound5434 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmUpperBound__Group__0_in_ruleJvmUpperBound5460 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmUpperBoundAnded_in_entryRuleJvmUpperBoundAnded5487 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmUpperBoundAnded5494 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmUpperBoundAnded__Group__0_in_ruleJvmUpperBoundAnded5520 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmLowerBound_in_entryRuleJvmLowerBound5547 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmLowerBound5554 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmLowerBound__Group__0_in_ruleJvmLowerBound5580 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmLowerBoundAnded_in_entryRuleJvmLowerBoundAnded5607 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmLowerBoundAnded5614 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmLowerBoundAnded__Group__0_in_ruleJvmLowerBoundAnded5640 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedNameWithWildcard_in_entryRuleQualifiedNameWithWildcard5669 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedNameWithWildcard5676 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedNameWithWildcard__Group__0_in_ruleQualifiedNameWithWildcard5702 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_entryRuleValidID5729 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleValidID5736 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleValidID5762 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SeverityKind__Alternatives_in_ruleSeverityKind5800 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TriggerKind__Alternatives_in_ruleTriggerKind5836 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__CategoriesAssignment_9_0_in_rule__CheckCatalog__Alternatives_95871 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__ImplementationsAssignment_9_1_in_rule__CheckCatalog__Alternatives_95889 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__ChecksAssignment_9_2_in_rule__CheckCatalog__Alternatives_95907 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__MembersAssignment_9_3_in_rule__CheckCatalog__Alternatives_95925 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__ImportedTypeAssignment_1_0_in_rule__XImportDeclaration__Alternatives_15958 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__ImportedNamespaceAssignment_1_1_in_rule__XImportDeclaration__Alternatives_15976 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group_8_0__0_in_rule__Check__Alternatives_86011 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__ContextsAssignment_8_1_in_rule__Check__Alternatives_86029 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBooleanLiteral_in_rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives6063 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXNumberLiteral_in_rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives6080 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXStringLiteral_in_rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives6097 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantUnaryOperation__Group_0__0_in_rule__XConstantUnaryOperation__Alternatives6129 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSimpleFormalParameterDefaultValueLiteral_in_rule__XConstantUnaryOperation__Alternatives6147 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstantUnaryOperation_in_rule__XFormalParameterDefaultValueLiteral__Alternatives6179 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstantListLiteral_in_rule__XFormalParameterDefaultValueLiteral__Alternatives6196 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_1_0__0_in_rule__XIssueExpression__Alternatives_3_16228 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_1_1__0_in_rule__XIssueExpression__Alternatives_3_16246 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstructorCall_in_rule__XPrimaryExpression__Alternatives6279 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBlockExpression_in_rule__XPrimaryExpression__Alternatives6296 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSwitchExpression_in_rule__XPrimaryExpression__Alternatives6313 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSynchronizedExpression_in_rule__XPrimaryExpression__Alternatives6331 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXFeatureCall_in_rule__XPrimaryExpression__Alternatives6349 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXLiteral_in_rule__XPrimaryExpression__Alternatives6366 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXIfExpression_in_rule__XPrimaryExpression__Alternatives6383 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXForLoopExpression_in_rule__XPrimaryExpression__Alternatives6401 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBasicForLoopExpression_in_rule__XPrimaryExpression__Alternatives6419 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXWhileExpression_in_rule__XPrimaryExpression__Alternatives6436 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXDoWhileExpression_in_rule__XPrimaryExpression__Alternatives6453 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXThrowExpression_in_rule__XPrimaryExpression__Alternatives6470 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXReturnExpression_in_rule__XPrimaryExpression__Alternatives6487 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXTryCatchFinallyExpression_in_rule__XPrimaryExpression__Alternatives6504 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXParenthesizedExpression_in_rule__XPrimaryExpression__Alternatives6521 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXGuardExpression_in_rule__XPrimaryExpression__Alternatives6538 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXIssueExpression_in_rule__XPrimaryExpression__Alternatives6555 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__FeatureCallID__Alternatives6587 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_16_in_rule__FeatureCallID__Alternatives6605 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_17_in_rule__FeatureCallID__Alternatives6625 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_18_in_rule__FeatureCallID__Alternatives6645 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_rule__FeatureCallID__Alternatives6665 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_20_in_rule__FeatureCallID__Alternatives6685 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_21_in_rule__FeatureCallID__Alternatives6705 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_22_in_rule__FeatureCallID__Alternatives6725 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_rule__FeatureCallID__Alternatives6745 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_rule__FeatureCallID__Alternatives6765 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_25_in_rule__FeatureCallID__Alternatives6785 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_rule__FeatureCallID__Alternatives6805 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__FeatureCallID__Alternatives6825 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__FeatureCallID__Alternatives6845 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_rule__FeatureCallID__Alternatives6865 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_rule__FeatureCallID__Alternatives6885 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_rule__FeatureCallID__Alternatives6905 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_rule__FeatureCallID__Alternatives6925 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_rule__FeatureCallID__Alternatives6945 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_34_in_rule__FeatureCallID__Alternatives6965 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_35_in_rule__FeatureCallID__Alternatives6985 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3_1_0__0_in_rule__XAnnotation__Alternatives_3_17019 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__ValueAssignment_3_1_1_in_rule__XAnnotation__Alternatives_3_17037 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__0_in_rule__XAnnotationElementValueOrCommaList__Alternatives7070 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1__0_in_rule__XAnnotationElementValueOrCommaList__Alternatives7088 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0__0_in_rule__XAnnotationElementValue__Alternatives7121 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValue__Alternatives7139 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotation_in_rule__XAnnotationOrExpression__Alternatives7171 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XAnnotationOrExpression__Alternatives7188 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_0__0_in_rule__XAssignment__Alternatives7220 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1__0_in_rule__XAssignment__Alternatives7238 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_rule__OpMultiAssign__Alternatives7272 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_37_in_rule__OpMultiAssign__Alternatives7292 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_38_in_rule__OpMultiAssign__Alternatives7312 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_39_in_rule__OpMultiAssign__Alternatives7332 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_40_in_rule__OpMultiAssign__Alternatives7352 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_5__0_in_rule__OpMultiAssign__Alternatives7371 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_6__0_in_rule__OpMultiAssign__Alternatives7389 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__OpEquality__Alternatives7423 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__OpEquality__Alternatives7443 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_rule__OpEquality__Alternatives7463 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_44_in_rule__OpEquality__Alternatives7483 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0__0_in_rule__XRelationalExpression__Alternatives_17517 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1__0_in_rule__XRelationalExpression__Alternatives_17535 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_45_in_rule__OpCompare__Alternatives7569 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpCompare__Group_1__0_in_rule__OpCompare__Alternatives7588 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rule__OpCompare__Alternatives7607 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__OpCompare__Alternatives7627 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_rule__OpOther__Alternatives7662 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_49_in_rule__OpOther__Alternatives7682 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_2__0_in_rule__OpOther__Alternatives7701 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_50_in_rule__OpOther__Alternatives7720 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__OpOther__Alternatives7740 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_5__0_in_rule__OpOther__Alternatives7759 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_6__0_in_rule__OpOther__Alternatives7777 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_rule__OpOther__Alternatives7796 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_53_in_rule__OpOther__Alternatives7816 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_5_1_0__0_in_rule__OpOther__Alternatives_5_17850 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rule__OpOther__Alternatives_5_17869 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_6_1_0__0_in_rule__OpOther__Alternatives_6_17903 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__OpOther__Alternatives_6_17922 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__OpOther__Alternatives_6_17942 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_54_in_rule__OpAdd__Alternatives7977 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_55_in_rule__OpAdd__Alternatives7997 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_rule__OpMulti__Alternatives8032 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_57_in_rule__OpMulti__Alternatives8052 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_58_in_rule__OpMulti__Alternatives8072 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_59_in_rule__OpMulti__Alternatives8092 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XUnaryOperation__Group_0__0_in_rule__XUnaryOperation__Alternatives8126 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCastedExpression_in_rule__XUnaryOperation__Alternatives8144 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_60_in_rule__OpUnary__Alternatives8177 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_55_in_rule__OpUnary__Alternatives8197 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_54_in_rule__OpUnary__Alternatives8217 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_61_in_rule__OpPostfix__Alternatives8252 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_62_in_rule__OpPostfix__Alternatives8272 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0__0_in_rule__XMemberFeatureCall__Alternatives_18306 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__0_in_rule__XMemberFeatureCall__Alternatives_18324 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_rule__XMemberFeatureCall__Alternatives_1_0_0_0_18358 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1_in_rule__XMemberFeatureCall__Alternatives_1_0_0_0_18377 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_rule__XMemberFeatureCall__Alternatives_1_1_0_0_18411 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1_in_rule__XMemberFeatureCall__Alternatives_1_1_0_0_18430 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2_in_rule__XMemberFeatureCall__Alternatives_1_1_0_0_18448 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0_in_rule__XMemberFeatureCall__Alternatives_1_1_3_18481 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1__0_in_rule__XMemberFeatureCall__Alternatives_1_1_3_18499 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCollectionLiteral_in_rule__XLiteral__Alternatives8532 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXClosure_in_rule__XLiteral__Alternatives8550 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBooleanLiteral_in_rule__XLiteral__Alternatives8568 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXNumberLiteral_in_rule__XLiteral__Alternatives8585 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXNullLiteral_in_rule__XLiteral__Alternatives8602 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXStringLiteral_in_rule__XLiteral__Alternatives8619 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXTypeLiteral_in_rule__XLiteral__Alternatives8636 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSetLiteral_in_rule__XCollectionLiteral__Alternatives8668 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXListLiteral_in_rule__XCollectionLiteral__Alternatives8685 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0__0_in_rule__XSwitchExpression__Alternatives_28717 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1__0_in_rule__XSwitchExpression__Alternatives_28735 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group_3_0__0_in_rule__XCasePart__Alternatives_38768 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__FallThroughAssignment_3_1_in_rule__XCasePart__Alternatives_38786 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXVariableDeclaration_in_rule__XExpressionOrVarDeclaration__Alternatives8819 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XExpressionOrVarDeclaration__Alternatives8836 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__WriteableAssignment_1_0_in_rule__XVariableDeclaration__Alternatives_18868 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_64_in_rule__XVariableDeclaration__Alternatives_18887 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_2_0__0_in_rule__XVariableDeclaration__Alternatives_28921 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__NameAssignment_2_1_in_rule__XVariableDeclaration__Alternatives_28939 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0_in_rule__XFeatureCall__Alternatives_3_18972 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3_1_1__0_in_rule__XFeatureCall__Alternatives_3_18990 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFeatureCallID_in_rule__IdOrSuper__Alternatives9023 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_65_in_rule__IdOrSuper__Alternatives9041 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__ArgumentsAssignment_4_1_0_in_rule__XConstructorCall__Alternatives_4_19075 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4_1_1__0_in_rule__XConstructorCall__Alternatives_4_19093 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_66_in_rule__XBooleanLiteral__Alternatives_19127 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBooleanLiteral__IsTrueAssignment_1_1_in_rule__XBooleanLiteral__Alternatives_19146 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0__0_in_rule__XTryCatchFinallyExpression__Alternatives_39179 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_1__0_in_rule__XTryCatchFinallyExpression__Alternatives_39197 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_HEX_in_rule__Number__Alternatives9230 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Number__Group_1__0_in_rule__Number__Alternatives9247 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__Number__Alternatives_1_09280 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_DECIMAL_in_rule__Number__Alternatives_1_09297 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__Number__Alternatives_1_1_19329 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_DECIMAL_in_rule__Number__Alternatives_1_1_19346 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0__0_in_rule__JvmTypeReference__Alternatives9378 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXFunctionTypeRef_in_rule__JvmTypeReference__Alternatives9396 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__JvmArgumentTypeReference__Alternatives9428 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmWildcardTypeReference_in_rule__JvmArgumentTypeReference__Alternatives9445 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group_2_0__0_in_rule__JvmWildcardTypeReference__Alternatives_29477 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group_2_1__0_in_rule__JvmWildcardTypeReference__Alternatives_29495 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_rule__SeverityKind__Alternatives9529 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_rule__SeverityKind__Alternatives9550 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_rule__SeverityKind__Alternatives9571 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_rule__SeverityKind__Alternatives9592 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_rule__TriggerKind__Alternatives9628 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_34_in_rule__TriggerKind__Alternatives9649 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_35_in_rule__TriggerKind__Alternatives9670 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group__0__Impl_in_rule__CheckCatalog__Group__09703 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000008L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group__1_in_rule__CheckCatalog__Group__09706 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group__1__Impl_in_rule__CheckCatalog__Group__19764 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group__2_in_rule__CheckCatalog__Group__19767 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_67_in_rule__CheckCatalog__Group__1__Impl9795 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group__2__Impl_in_rule__CheckCatalog__Group__29826 = new BitSet(new long[]{0x0000000000040000L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group__3_in_rule__CheckCatalog__Group__29829 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__PackageNameAssignment_2_in_rule__CheckCatalog__Group__2__Impl9856 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group__3__Impl_in_rule__CheckCatalog__Group__39886 = new BitSet(new long[]{0x0000000000100000L,0x0000008000000000L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group__4_in_rule__CheckCatalog__Group__39889 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__ImportsAssignment_3_in_rule__CheckCatalog__Group__3__Impl9916 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group__4__Impl_in_rule__CheckCatalog__Group__49946 = new BitSet(new long[]{0x0000000000100000L,0x0000008000000000L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group__5_in_rule__CheckCatalog__Group__49949 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__FinalAssignment_4_in_rule__CheckCatalog__Group__4__Impl9976 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group__5__Impl_in_rule__CheckCatalog__Group__510007 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group__6_in_rule__CheckCatalog__Group__510010 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_20_in_rule__CheckCatalog__Group__5__Impl10038 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group__6__Impl_in_rule__CheckCatalog__Group__610069 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000050L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group__7_in_rule__CheckCatalog__Group__610072 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__NameAssignment_6_in_rule__CheckCatalog__Group__6__Impl10099 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group__7__Impl_in_rule__CheckCatalog__Group__710129 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000050L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group__8_in_rule__CheckCatalog__Group__710132 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group_7__0_in_rule__CheckCatalog__Group__7__Impl10159 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group__8__Impl_in_rule__CheckCatalog__Group__810190 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001920L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group__9_in_rule__CheckCatalog__Group__810193 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_68_in_rule__CheckCatalog__Group__8__Impl10221 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group__9__Impl_in_rule__CheckCatalog__Group__910252 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001920L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group__10_in_rule__CheckCatalog__Group__910255 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Alternatives_9_in_rule__CheckCatalog__Group__9__Impl10282 = new BitSet(new long[]{0x0008000FE0800012L,0x0000008000001900L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group__10__Impl_in_rule__CheckCatalog__Group__1010313 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_69_in_rule__CheckCatalog__Group__10__Impl10341 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group_7__0__Impl_in_rule__CheckCatalog__Group_7__010394 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group_7__1_in_rule__CheckCatalog__Group_7__010397 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_70_in_rule__CheckCatalog__Group_7__0__Impl10425 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group_7__1__Impl_in_rule__CheckCatalog__Group_7__110456 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group_7__2_in_rule__CheckCatalog__Group_7__110459 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_21_in_rule__CheckCatalog__Group_7__1__Impl10487 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__Group_7__2__Impl_in_rule__CheckCatalog__Group_7__210518 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckCatalog__GrammarAssignment_7_2_in_rule__CheckCatalog__Group_7__2__Impl10545 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportSection__Group__0__Impl_in_rule__XImportSection__Group__010581 = new BitSet(new long[]{0x0000000000040000L});
-    public static final BitSet FOLLOW_rule__XImportSection__Group__1_in_rule__XImportSection__Group__010584 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportSection__Group__1__Impl_in_rule__XImportSection__Group__110642 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportSection__ImportDeclarationsAssignment_1_in_rule__XImportSection__Group__1__Impl10669 = new BitSet(new long[]{0x0000000000040002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Group__0__Impl_in_rule__XImportDeclaration__Group__010704 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Group__1_in_rule__XImportDeclaration__Group__010707 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_18_in_rule__XImportDeclaration__Group__0__Impl10735 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Group__1__Impl_in_rule__XImportDeclaration__Group__110766 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Group__2_in_rule__XImportDeclaration__Group__110769 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Alternatives_1_in_rule__XImportDeclaration__Group__1__Impl10796 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Group__2__Impl_in_rule__XImportDeclaration__Group__210826 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__XImportDeclaration__Group__2__Impl10855 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Category__Group__0__Impl_in_rule__Category__Group__010894 = new BitSet(new long[]{0x0000000000000110L});
-    public static final BitSet FOLLOW_rule__Category__Group__1_in_rule__Category__Group__010897 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_rule__Category__Group__0__Impl10925 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Category__Group__1__Impl_in_rule__Category__Group__110956 = new BitSet(new long[]{0x0000000000000110L});
-    public static final BitSet FOLLOW_rule__Category__Group__2_in_rule__Category__Group__110959 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Category__IdAssignment_1_in_rule__Category__Group__1__Impl10986 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Category__Group__2__Impl_in_rule__Category__Group__211017 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__Category__Group__3_in_rule__Category__Group__211020 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Category__LabelAssignment_2_in_rule__Category__Group__2__Impl11047 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Category__Group__3__Impl_in_rule__Category__Group__311077 = new BitSet(new long[]{0x0000000FE0000000L,0x0000008000000820L});
-    public static final BitSet FOLLOW_rule__Category__Group__4_in_rule__Category__Group__311080 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_68_in_rule__Category__Group__3__Impl11108 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Category__Group__4__Impl_in_rule__Category__Group__411139 = new BitSet(new long[]{0x0000000FE0000000L,0x0000008000000820L});
-    public static final BitSet FOLLOW_rule__Category__Group__5_in_rule__Category__Group__411142 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Category__ChecksAssignment_4_in_rule__Category__Group__4__Impl11169 = new BitSet(new long[]{0x0000000FE0000002L,0x0000008000000800L});
-    public static final BitSet FOLLOW_rule__Category__Group__5__Impl_in_rule__Category__Group__511200 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_69_in_rule__Category__Group__5__Impl11228 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group__0__Impl_in_rule__Check__Group__011271 = new BitSet(new long[]{0x0000000FE0000000L,0x0000008000000800L});
-    public static final BitSet FOLLOW_rule__Check__Group__1_in_rule__Check__Group__011274 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__SeverityRangeAssignment_0_in_rule__Check__Group__0__Impl11301 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group__1__Impl_in_rule__Check__Group__111332 = new BitSet(new long[]{0x0000000FE0000000L,0x0000008000000800L});
-    public static final BitSet FOLLOW_rule__Check__Group__2_in_rule__Check__Group__111335 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__FinalAssignment_1_in_rule__Check__Group__1__Impl11362 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group__2__Impl_in_rule__Check__Group__211393 = new BitSet(new long[]{0x0000000FE0000000L,0x0000008000000800L});
-    public static final BitSet FOLLOW_rule__Check__Group__3_in_rule__Check__Group__211396 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__KindAssignment_2_in_rule__Check__Group__2__Impl11423 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group__3__Impl_in_rule__Check__Group__311454 = new BitSet(new long[]{0x0000000000000110L});
-    public static final BitSet FOLLOW_rule__Check__Group__4_in_rule__Check__Group__311457 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__DefaultSeverityAssignment_3_in_rule__Check__Group__3__Impl11484 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group__4__Impl_in_rule__Check__Group__411514 = new BitSet(new long[]{0x0000000000000110L});
-    public static final BitSet FOLLOW_rule__Check__Group__5_in_rule__Check__Group__411517 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__IdAssignment_4_in_rule__Check__Group__4__Impl11544 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group__5__Impl_in_rule__Check__Group__511575 = new BitSet(new long[]{0x0000000001000000L,0x0000000000000150L});
-    public static final BitSet FOLLOW_rule__Check__Group__6_in_rule__Check__Group__511578 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__LabelAssignment_5_in_rule__Check__Group__5__Impl11605 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group__6__Impl_in_rule__Check__Group__611635 = new BitSet(new long[]{0x0000000001000000L,0x0000000000000150L});
-    public static final BitSet FOLLOW_rule__Check__Group__7_in_rule__Check__Group__611638 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group_6__0_in_rule__Check__Group__6__Impl11665 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group__7__Impl_in_rule__Check__Group__711696 = new BitSet(new long[]{0x0000000001000000L,0x0000000000000150L});
-    public static final BitSet FOLLOW_rule__Check__Group__8_in_rule__Check__Group__711699 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group_7__0_in_rule__Check__Group__7__Impl11726 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group__8__Impl_in_rule__Check__Group__811757 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Alternatives_8_in_rule__Check__Group__8__Impl11784 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group_6__0__Impl_in_rule__Check__Group_6__011832 = new BitSet(new long[]{0x0000000000000010L,0x0000000000000200L});
-    public static final BitSet FOLLOW_rule__Check__Group_6__1_in_rule__Check__Group_6__011835 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__Check__Group_6__0__Impl11864 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group_6__1__Impl_in_rule__Check__Group_6__111896 = new BitSet(new long[]{0x0000000000000010L,0x0000000000000200L});
-    public static final BitSet FOLLOW_rule__Check__Group_6__2_in_rule__Check__Group_6__111899 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group_6_1__0_in_rule__Check__Group_6__1__Impl11926 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group_6__2__Impl_in_rule__Check__Group_6__211957 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__Check__Group_6__2__Impl11985 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group_6_1__0__Impl_in_rule__Check__Group_6_1__012022 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__Check__Group_6_1__1_in_rule__Check__Group_6_1__012025 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__FormalParametersAssignment_6_1_0_in_rule__Check__Group_6_1__0__Impl12052 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group_6_1__1__Impl_in_rule__Check__Group_6_1__112082 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group_6_1_1__0_in_rule__Check__Group_6_1__1__Impl12109 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__Check__Group_6_1_1__0__Impl_in_rule__Check__Group_6_1_1__012144 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__Check__Group_6_1_1__1_in_rule__Check__Group_6_1_1__012147 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__Check__Group_6_1_1__0__Impl12175 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group_6_1_1__1__Impl_in_rule__Check__Group_6_1_1__112206 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__FormalParametersAssignment_6_1_1_1_in_rule__Check__Group_6_1_1__1__Impl12233 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group_7__0__Impl_in_rule__Check__Group_7__012267 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__Check__Group_7__1_in_rule__Check__Group_7__012270 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_rule__Check__Group_7__0__Impl12298 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group_7__1__Impl_in_rule__Check__Group_7__112329 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__GivenMessageAssignment_7_1_in_rule__Check__Group_7__1__Impl12356 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group_8_0__0__Impl_in_rule__Check__Group_8_0__012390 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000060L});
-    public static final BitSet FOLLOW_rule__Check__Group_8_0__1_in_rule__Check__Group_8_0__012393 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_68_in_rule__Check__Group_8_0__0__Impl12422 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group_8_0__1__Impl_in_rule__Check__Group_8_0__112454 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000060L});
-    public static final BitSet FOLLOW_rule__Check__Group_8_0__2_in_rule__Check__Group_8_0__112457 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__ContextsAssignment_8_0_1_in_rule__Check__Group_8_0__1__Impl12484 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__Check__Group_8_0__2__Impl_in_rule__Check__Group_8_0__212515 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_69_in_rule__Check__Group_8_0__2__Impl12543 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SeverityRange__Group__0__Impl_in_rule__SeverityRange__Group__012580 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_rule__SeverityRange__Group__1_in_rule__SeverityRange__Group__012583 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_75_in_rule__SeverityRange__Group__0__Impl12611 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SeverityRange__Group__1__Impl_in_rule__SeverityRange__Group__112642 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__SeverityRange__Group__2_in_rule__SeverityRange__Group__112645 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__SeverityRange__Group__1__Impl12673 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SeverityRange__Group__2__Impl_in_rule__SeverityRange__Group__212704 = new BitSet(new long[]{0x0000000FE0000000L,0x0000008000000800L});
-    public static final BitSet FOLLOW_rule__SeverityRange__Group__3_in_rule__SeverityRange__Group__212707 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__SeverityRange__Group__2__Impl12735 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SeverityRange__Group__3__Impl_in_rule__SeverityRange__Group__312766 = new BitSet(new long[]{0x0004000000000000L});
-    public static final BitSet FOLLOW_rule__SeverityRange__Group__4_in_rule__SeverityRange__Group__312769 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SeverityRange__MinSeverityAssignment_3_in_rule__SeverityRange__Group__3__Impl12796 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SeverityRange__Group__4__Impl_in_rule__SeverityRange__Group__412826 = new BitSet(new long[]{0x0000000FE0000000L,0x0000008000000800L});
-    public static final BitSet FOLLOW_rule__SeverityRange__Group__5_in_rule__SeverityRange__Group__412829 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_50_in_rule__SeverityRange__Group__4__Impl12857 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SeverityRange__Group__5__Impl_in_rule__SeverityRange__Group__512888 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000200L});
-    public static final BitSet FOLLOW_rule__SeverityRange__Group__6_in_rule__SeverityRange__Group__512891 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SeverityRange__MaxSeverityAssignment_5_in_rule__SeverityRange__Group__5__Impl12918 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SeverityRange__Group__6__Impl_in_rule__SeverityRange__Group__612948 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__SeverityRange__Group__6__Impl12976 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Member__Group__0__Impl_in_rule__Member__Group__013021 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
-    public static final BitSet FOLLOW_rule__Member__Group__1_in_rule__Member__Group__013024 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Member__AnnotationsAssignment_0_in_rule__Member__Group__0__Impl13051 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000800L});
-    public static final BitSet FOLLOW_rule__Member__Group__1__Impl_in_rule__Member__Group__113082 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__Member__Group__2_in_rule__Member__Group__113085 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Member__TypeAssignment_1_in_rule__Member__Group__1__Impl13112 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Member__Group__2__Impl_in_rule__Member__Group__213142 = new BitSet(new long[]{0x0000000000002000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__Member__Group__3_in_rule__Member__Group__213145 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Member__NameAssignment_2_in_rule__Member__Group__2__Impl13172 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Member__Group__3__Impl_in_rule__Member__Group__313202 = new BitSet(new long[]{0x0000000000002000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__Member__Group__4_in_rule__Member__Group__313205 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Member__Group_3__0_in_rule__Member__Group__3__Impl13232 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Member__Group__4__Impl_in_rule__Member__Group__413263 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__Member__Group__4__Impl13291 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Member__Group_3__0__Impl_in_rule__Member__Group_3__013332 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__Member__Group_3__1_in_rule__Member__Group_3__013335 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpSingleAssign_in_rule__Member__Group_3__0__Impl13362 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Member__Group_3__1__Impl_in_rule__Member__Group_3__113391 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Member__ValueAssignment_3_1_in_rule__Member__Group_3__1__Impl13418 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Implementation__Group__0__Impl_in_rule__Implementation__Group__013452 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__Implementation__Group__1_in_rule__Implementation__Group__013455 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_76_in_rule__Implementation__Group__0__Impl13483 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Implementation__Group__1__Impl_in_rule__Implementation__Group__113514 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__Implementation__Group__2_in_rule__Implementation__Group__113517 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Implementation__NameAssignment_1_in_rule__Implementation__Group__1__Impl13544 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Implementation__Group__2__Impl_in_rule__Implementation__Group__213574 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Implementation__ContextAssignment_2_in_rule__Implementation__Group__2__Impl13601 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FormalParameter__Group__0__Impl_in_rule__FormalParameter__Group__013637 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__FormalParameter__Group__1_in_rule__FormalParameter__Group__013640 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FormalParameter__TypeAssignment_0_in_rule__FormalParameter__Group__0__Impl13667 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FormalParameter__Group__1__Impl_in_rule__FormalParameter__Group__113697 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_rule__FormalParameter__Group__2_in_rule__FormalParameter__Group__113700 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FormalParameter__NameAssignment_1_in_rule__FormalParameter__Group__1__Impl13727 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FormalParameter__Group__2__Impl_in_rule__FormalParameter__Group__213757 = new BitSet(new long[]{0x10C00000000001E0L,0x0000100000002004L});
-    public static final BitSet FOLLOW_rule__FormalParameter__Group__3_in_rule__FormalParameter__Group__213760 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_13_in_rule__FormalParameter__Group__2__Impl13788 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FormalParameter__Group__3__Impl_in_rule__FormalParameter__Group__313819 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__FormalParameter__Group__4_in_rule__FormalParameter__Group__313822 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FormalParameter__RightAssignment_3_in_rule__FormalParameter__Group__3__Impl13849 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FormalParameter__Group__4__Impl_in_rule__FormalParameter__Group__413879 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FormalParameter__LabelAssignment_4_in_rule__FormalParameter__Group__4__Impl13906 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantUnaryOperation__Group_0__0__Impl_in_rule__XConstantUnaryOperation__Group_0__013947 = new BitSet(new long[]{0x10C0000000000000L});
-    public static final BitSet FOLLOW_rule__XConstantUnaryOperation__Group_0__1_in_rule__XConstantUnaryOperation__Group_0__013950 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantUnaryOperation__Group_0__1__Impl_in_rule__XConstantUnaryOperation__Group_0__114008 = new BitSet(new long[]{0x10C00000000001E0L,0x0000100000000004L});
-    public static final BitSet FOLLOW_rule__XConstantUnaryOperation__Group_0__2_in_rule__XConstantUnaryOperation__Group_0__114011 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantUnaryOperation__FeatureAssignment_0_1_in_rule__XConstantUnaryOperation__Group_0__1__Impl14038 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantUnaryOperation__Group_0__2__Impl_in_rule__XConstantUnaryOperation__Group_0__214068 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantUnaryOperation__OperandAssignment_0_2_in_rule__XConstantUnaryOperation__Group_0__2__Impl14095 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group__0__Impl_in_rule__XConstantListLiteral__Group__014131 = new BitSet(new long[]{0x10C00000000001E0L,0x0000100000002004L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group__1_in_rule__XConstantListLiteral__Group__014134 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group__1__Impl_in_rule__XConstantListLiteral__Group__114192 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group__2_in_rule__XConstantListLiteral__Group__114195 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_77_in_rule__XConstantListLiteral__Group__1__Impl14223 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group__2__Impl_in_rule__XConstantListLiteral__Group__214254 = new BitSet(new long[]{0x10C00000000001E0L,0x0000100000008004L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group__3_in_rule__XConstantListLiteral__Group__214257 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_78_in_rule__XConstantListLiteral__Group__2__Impl14285 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group__3__Impl_in_rule__XConstantListLiteral__Group__314316 = new BitSet(new long[]{0x10C00000000001E0L,0x0000100000008004L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group__4_in_rule__XConstantListLiteral__Group__314319 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group_3__0_in_rule__XConstantListLiteral__Group__3__Impl14346 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group__4__Impl_in_rule__XConstantListLiteral__Group__414377 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_79_in_rule__XConstantListLiteral__Group__4__Impl14405 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group_3__0__Impl_in_rule__XConstantListLiteral__Group_3__014446 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group_3__1_in_rule__XConstantListLiteral__Group_3__014449 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__ElementsAssignment_3_0_in_rule__XConstantListLiteral__Group_3__0__Impl14476 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group_3__1__Impl_in_rule__XConstantListLiteral__Group_3__114506 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group_3_1__0_in_rule__XConstantListLiteral__Group_3__1__Impl14533 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group_3_1__0__Impl_in_rule__XConstantListLiteral__Group_3_1__014568 = new BitSet(new long[]{0x10C00000000001E0L,0x0000100000000004L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group_3_1__1_in_rule__XConstantListLiteral__Group_3_1__014571 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XConstantListLiteral__Group_3_1__0__Impl14599 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group_3_1__1__Impl_in_rule__XConstantListLiteral__Group_3_1__114630 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__ElementsAssignment_3_1_1_in_rule__XConstantListLiteral__Group_3_1__1__Impl14657 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Context__Group__0__Impl_in_rule__Context__Group__014691 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
-    public static final BitSet FOLLOW_rule__Context__Group__1_in_rule__Context__Group__014694 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_70_in_rule__Context__Group__0__Impl14722 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Context__Group__1__Impl_in_rule__Context__Group__114753 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__Context__Group__2_in_rule__Context__Group__114756 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Context__ContextVariableAssignment_1_in_rule__Context__Group__1__Impl14783 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Context__Group__2__Impl_in_rule__Context__Group__214813 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Context__ConstraintAssignment_2_in_rule__Context__Group__2__Impl14840 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContextVariable__Group__0__Impl_in_rule__ContextVariable__Group__014876 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__ContextVariable__Group__1_in_rule__ContextVariable__Group__014879 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContextVariable__TypeAssignment_0_in_rule__ContextVariable__Group__0__Impl14906 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContextVariable__Group__1__Impl_in_rule__ContextVariable__Group__114936 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContextVariable__NameAssignment_1_in_rule__ContextVariable__Group__1__Impl14963 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XGuardExpression__Group__0__Impl_in_rule__XGuardExpression__Group__014998 = new BitSet(new long[]{0x0000000000000000L,0x0000000000010000L});
-    public static final BitSet FOLLOW_rule__XGuardExpression__Group__1_in_rule__XGuardExpression__Group__015001 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XGuardExpression__Group__1__Impl_in_rule__XGuardExpression__Group__115059 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XGuardExpression__Group__2_in_rule__XGuardExpression__Group__115062 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_80_in_rule__XGuardExpression__Group__1__Impl15090 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XGuardExpression__Group__2__Impl_in_rule__XGuardExpression__Group__215121 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XGuardExpression__GuardAssignment_2_in_rule__XGuardExpression__Group__2__Impl15148 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group__0__Impl_in_rule__XIssueExpression__Group__015184 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group__1_in_rule__XIssueExpression__Group__015187 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group__1__Impl_in_rule__XIssueExpression__Group__115245 = new BitSet(new long[]{0x000000000F000010L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group__2_in_rule__XIssueExpression__Group__115248 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_81_in_rule__XIssueExpression__Group__1__Impl15276 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group__2__Impl_in_rule__XIssueExpression__Group__215307 = new BitSet(new long[]{0x000000000F000010L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group__3_in_rule__XIssueExpression__Group__215310 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__CheckAssignment_2_in_rule__XIssueExpression__Group__2__Impl15337 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group__3__Impl_in_rule__XIssueExpression__Group__315368 = new BitSet(new long[]{0x000000000F000010L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group__4_in_rule__XIssueExpression__Group__315371 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3__0_in_rule__XIssueExpression__Group__3__Impl15398 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group__4__Impl_in_rule__XIssueExpression__Group__415429 = new BitSet(new long[]{0x000000000F000010L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group__5_in_rule__XIssueExpression__Group__415432 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_4__0_in_rule__XIssueExpression__Group__4__Impl15459 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group__5__Impl_in_rule__XIssueExpression__Group__515490 = new BitSet(new long[]{0x000000000F000010L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group__6_in_rule__XIssueExpression__Group__515493 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5__0_in_rule__XIssueExpression__Group__5__Impl15520 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group__6__Impl_in_rule__XIssueExpression__Group__615551 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6__0_in_rule__XIssueExpression__Group__6__Impl15578 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3__0__Impl_in_rule__XIssueExpression__Group_3__015623 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3__1_in_rule__XIssueExpression__Group_3__015626 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_25_in_rule__XIssueExpression__Group_3__0__Impl15655 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3__1__Impl_in_rule__XIssueExpression__Group_3__115687 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3__2_in_rule__XIssueExpression__Group_3__115690 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Alternatives_3_1_in_rule__XIssueExpression__Group_3__1__Impl15717 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3__2__Impl_in_rule__XIssueExpression__Group_3__215747 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_2__0_in_rule__XIssueExpression__Group_3__2__Impl15774 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_1_0__0__Impl_in_rule__XIssueExpression__Group_3_1_0__015811 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_1_0__1_in_rule__XIssueExpression__Group_3_1_0__015814 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_77_in_rule__XIssueExpression__Group_3_1_0__0__Impl15843 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_1_0__1__Impl_in_rule__XIssueExpression__Group_3_1_0__115875 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_1_in_rule__XIssueExpression__Group_3_1_0__1__Impl15902 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_1_1__0__Impl_in_rule__XIssueExpression__Group_3_1_1__015936 = new BitSet(new long[]{0x0000000000000000L,0x0000000000002000L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_1_1__1_in_rule__XIssueExpression__Group_3_1_1__015939 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__MarkerObjectAssignment_3_1_1_0_in_rule__XIssueExpression__Group_3_1_1__0__Impl15966 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_1_1__1__Impl_in_rule__XIssueExpression__Group_3_1_1__115996 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_1_1_1__0_in_rule__XIssueExpression__Group_3_1_1__1__Impl16023 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_1_1_1__0__Impl_in_rule__XIssueExpression__Group_3_1_1_1__016058 = new BitSet(new long[]{0x0000000FFFFF0010L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_1_1_1__1_in_rule__XIssueExpression__Group_3_1_1_1__016061 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_77_in_rule__XIssueExpression__Group_3_1_1_1__0__Impl16090 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_1_1_1__1__Impl_in_rule__XIssueExpression__Group_3_1_1_1__116122 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_1_in_rule__XIssueExpression__Group_3_1_1_1__1__Impl16149 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_2__0__Impl_in_rule__XIssueExpression__Group_3_2__016183 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_2__1_in_rule__XIssueExpression__Group_3_2__016186 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_78_in_rule__XIssueExpression__Group_3_2__0__Impl16215 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_2__1__Impl_in_rule__XIssueExpression__Group_3_2__116247 = new BitSet(new long[]{0x0000000000000000L,0x0000000000008000L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_2__2_in_rule__XIssueExpression__Group_3_2__116250 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__MarkerIndexAssignment_3_2_1_in_rule__XIssueExpression__Group_3_2__1__Impl16277 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_2__2__Impl_in_rule__XIssueExpression__Group_3_2__216307 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_79_in_rule__XIssueExpression__Group_3_2__2__Impl16335 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_4__0__Impl_in_rule__XIssueExpression__Group_4__016372 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_4__1_in_rule__XIssueExpression__Group_4__016375 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_rule__XIssueExpression__Group_4__0__Impl16404 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_4__1__Impl_in_rule__XIssueExpression__Group_4__116436 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__MessageAssignment_4_1_in_rule__XIssueExpression__Group_4__1__Impl16463 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5__0__Impl_in_rule__XIssueExpression__Group_5__016497 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5__1_in_rule__XIssueExpression__Group_5__016500 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_rule__XIssueExpression__Group_5__0__Impl16529 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5__1__Impl_in_rule__XIssueExpression__Group_5__116561 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5__2_in_rule__XIssueExpression__Group_5__116564 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__XIssueExpression__Group_5__1__Impl16592 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5__2__Impl_in_rule__XIssueExpression__Group_5__216623 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000600L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5__3_in_rule__XIssueExpression__Group_5__216626 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__MessageParametersAssignment_5_2_in_rule__XIssueExpression__Group_5__2__Impl16653 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5__3__Impl_in_rule__XIssueExpression__Group_5__316683 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000600L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5__4_in_rule__XIssueExpression__Group_5__316686 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5_3__0_in_rule__XIssueExpression__Group_5__3__Impl16713 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5__4__Impl_in_rule__XIssueExpression__Group_5__416744 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__XIssueExpression__Group_5__4__Impl16772 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5_3__0__Impl_in_rule__XIssueExpression__Group_5_3__016813 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5_3__1_in_rule__XIssueExpression__Group_5_3__016816 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XIssueExpression__Group_5_3__0__Impl16845 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5_3__1__Impl_in_rule__XIssueExpression__Group_5_3__116877 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__MessageParametersAssignment_5_3_1_in_rule__XIssueExpression__Group_5_3__1__Impl16904 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6__0__Impl_in_rule__XIssueExpression__Group_6__016938 = new BitSet(new long[]{0x0000000000000010L,0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6__1_in_rule__XIssueExpression__Group_6__016941 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__XIssueExpression__Group_6__0__Impl16970 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6__1__Impl_in_rule__XIssueExpression__Group_6__117002 = new BitSet(new long[]{0x0000000000000010L,0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6__2_in_rule__XIssueExpression__Group_6__117005 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__IssueCodeAssignment_6_1_in_rule__XIssueExpression__Group_6__1__Impl17032 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6__2__Impl_in_rule__XIssueExpression__Group_6__217063 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6__3_in_rule__XIssueExpression__Group_6__217066 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__XIssueExpression__Group_6__2__Impl17094 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6__3__Impl_in_rule__XIssueExpression__Group_6__317125 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000600L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6__4_in_rule__XIssueExpression__Group_6__317128 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__IssueDataAssignment_6_3_in_rule__XIssueExpression__Group_6__3__Impl17155 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6__4__Impl_in_rule__XIssueExpression__Group_6__417185 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000600L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6__5_in_rule__XIssueExpression__Group_6__417188 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6_4__0_in_rule__XIssueExpression__Group_6__4__Impl17215 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6__5__Impl_in_rule__XIssueExpression__Group_6__517246 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__XIssueExpression__Group_6__5__Impl17274 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6_4__0__Impl_in_rule__XIssueExpression__Group_6_4__017317 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6_4__1_in_rule__XIssueExpression__Group_6_4__017320 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XIssueExpression__Group_6_4__0__Impl17349 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6_4__1__Impl_in_rule__XIssueExpression__Group_6_4__117381 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__IssueDataAssignment_6_4_1_in_rule__XIssueExpression__Group_6_4__1__Impl17408 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group__0__Impl_in_rule__XAnnotation__Group__017442 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000800L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group__1_in_rule__XAnnotation__Group__017445 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group__1__Impl_in_rule__XAnnotation__Group__117503 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group__2_in_rule__XAnnotation__Group__117506 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_75_in_rule__XAnnotation__Group__1__Impl17534 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group__2__Impl_in_rule__XAnnotation__Group__217565 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group__3_in_rule__XAnnotation__Group__217568 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__AnnotationTypeAssignment_2_in_rule__XAnnotation__Group__2__Impl17595 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group__3__Impl_in_rule__XAnnotation__Group__317625 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3__0_in_rule__XAnnotation__Group__3__Impl17652 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3__0__Impl_in_rule__XAnnotation__Group_3__017691 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536B56L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3__1_in_rule__XAnnotation__Group_3__017694 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__XAnnotation__Group_3__0__Impl17723 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3__1__Impl_in_rule__XAnnotation__Group_3__117755 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536B56L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3__2_in_rule__XAnnotation__Group_3__117758 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Alternatives_3_1_in_rule__XAnnotation__Group_3__1__Impl17785 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3__2__Impl_in_rule__XAnnotation__Group_3__217816 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__XAnnotation__Group_3__2__Impl17844 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3_1_0__0__Impl_in_rule__XAnnotation__Group_3_1_0__017881 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3_1_0__1_in_rule__XAnnotation__Group_3_1_0__017884 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0_in_rule__XAnnotation__Group_3_1_0__0__Impl17911 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3_1_0__1__Impl_in_rule__XAnnotation__Group_3_1_0__117941 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3_1_0_1__0_in_rule__XAnnotation__Group_3_1_0__1__Impl17968 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3_1_0_1__0__Impl_in_rule__XAnnotation__Group_3_1_0_1__018003 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3_1_0_1__1_in_rule__XAnnotation__Group_3_1_0_1__018006 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XAnnotation__Group_3_1_0_1__0__Impl18034 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3_1_0_1__1__Impl_in_rule__XAnnotation__Group_3_1_0_1__118065 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1_in_rule__XAnnotation__Group_3_1_0_1__1__Impl18092 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__Group__0__Impl_in_rule__XAnnotationElementValuePair__Group__018126 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536956L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__Group__1_in_rule__XAnnotationElementValuePair__Group__018129 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__Group_0__0_in_rule__XAnnotationElementValuePair__Group__0__Impl18156 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__Group__1__Impl_in_rule__XAnnotationElementValuePair__Group__118186 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__ValueAssignment_1_in_rule__XAnnotationElementValuePair__Group__1__Impl18213 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__Group_0__0__Impl_in_rule__XAnnotationElementValuePair__Group_0__018247 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__Group_0_0__0_in_rule__XAnnotationElementValuePair__Group_0__0__Impl18274 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__Group_0_0__0__Impl_in_rule__XAnnotationElementValuePair__Group_0_0__018306 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__Group_0_0__1_in_rule__XAnnotationElementValuePair__Group_0_0__018309 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__ElementAssignment_0_0_0_in_rule__XAnnotationElementValuePair__Group_0_0__0__Impl18336 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__Group_0_0__1__Impl_in_rule__XAnnotationElementValuePair__Group_0_0__118366 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_13_in_rule__XAnnotationElementValuePair__Group_0_0__1__Impl18394 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0__018429 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC53E956L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__1_in_rule__XAnnotationElementValueOrCommaList__Group_0__018432 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0__0_in_rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl18459 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0__118489 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC53E956L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__2_in_rule__XAnnotationElementValueOrCommaList__Group_0__118492 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1__0_in_rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl18519 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0__218550 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_79_in_rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl18578 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_0__018615 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0_in_rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl18642 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__018674 = new BitSet(new long[]{0x0000000000000000L,0x0000000000002000L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__018677 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__118735 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__118738 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_77_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl18766 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__218797 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_78_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl18825 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_1__018862 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1__1_in_rule__XAnnotationElementValueOrCommaList__Group_0_1__018865 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0_in_rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl18892 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_1__118922 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0_in_rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl18949 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__018984 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536956L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1_in_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__018987 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl19015 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__119046 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1_in_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl19073 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1__019107 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1__1_in_rule__XAnnotationElementValueOrCommaList__Group_1__019110 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl19137 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1__119166 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1__0_in_rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl19193 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1_1__019228 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1__1_in_rule__XAnnotationElementValueOrCommaList__Group_1_1__019231 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1_1__119289 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0_in_rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl19318 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0_in_rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl19330 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__019367 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536956L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1_in_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__019370 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl19398 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__119429 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1_in_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl19456 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0__0__Impl_in_rule__XAnnotationElementValue__Group_0__019490 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC53E956L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0__1_in_rule__XAnnotationElementValue__Group_0__019493 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_0__0_in_rule__XAnnotationElementValue__Group_0__0__Impl19520 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0__1__Impl_in_rule__XAnnotationElementValue__Group_0__119550 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC53E956L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0__2_in_rule__XAnnotationElementValue__Group_0__119553 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_1__0_in_rule__XAnnotationElementValue__Group_0__1__Impl19580 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0__2__Impl_in_rule__XAnnotationElementValue__Group_0__219611 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_79_in_rule__XAnnotationElementValue__Group_0__2__Impl19639 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_0__0__Impl_in_rule__XAnnotationElementValue__Group_0_0__019676 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__0_in_rule__XAnnotationElementValue__Group_0_0__0__Impl19703 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__0__Impl_in_rule__XAnnotationElementValue__Group_0_0_0__019735 = new BitSet(new long[]{0x0000000000000000L,0x0000000000002000L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__1_in_rule__XAnnotationElementValue__Group_0_0_0__019738 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__1__Impl_in_rule__XAnnotationElementValue__Group_0_0_0__119796 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__2_in_rule__XAnnotationElementValue__Group_0_0_0__119799 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_77_in_rule__XAnnotationElementValue__Group_0_0_0__1__Impl19827 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__2__Impl_in_rule__XAnnotationElementValue__Group_0_0_0__219858 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_78_in_rule__XAnnotationElementValue__Group_0_0_0__2__Impl19886 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_1__0__Impl_in_rule__XAnnotationElementValue__Group_0_1__019923 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_1__1_in_rule__XAnnotationElementValue__Group_0_1__019926 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__ElementsAssignment_0_1_0_in_rule__XAnnotationElementValue__Group_0_1__0__Impl19953 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_1__1__Impl_in_rule__XAnnotationElementValue__Group_0_1__119983 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_1_1__0_in_rule__XAnnotationElementValue__Group_0_1__1__Impl20010 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_1_1__0__Impl_in_rule__XAnnotationElementValue__Group_0_1_1__020045 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536956L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_1_1__1_in_rule__XAnnotationElementValue__Group_0_1_1__020048 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XAnnotationElementValue__Group_0_1_1__0__Impl20076 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_1_1__1__Impl_in_rule__XAnnotationElementValue__Group_0_1_1__120107 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1_in_rule__XAnnotationElementValue__Group_0_1_1__1__Impl20134 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_0__0__Impl_in_rule__XAssignment__Group_0__020168 = new BitSet(new long[]{0x0000000FFFFF0010L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_0__1_in_rule__XAssignment__Group_0__020171 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_0__1__Impl_in_rule__XAssignment__Group_0__120229 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_0__2_in_rule__XAssignment__Group_0__120232 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__FeatureAssignment_0_1_in_rule__XAssignment__Group_0__1__Impl20259 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_0__2__Impl_in_rule__XAssignment__Group_0__220289 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_0__3_in_rule__XAssignment__Group_0__220292 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpSingleAssign_in_rule__XAssignment__Group_0__2__Impl20319 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_0__3__Impl_in_rule__XAssignment__Group_0__320348 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__ValueAssignment_0_3_in_rule__XAssignment__Group_0__3__Impl20375 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1__0__Impl_in_rule__XAssignment__Group_1__020413 = new BitSet(new long[]{0x0000C1F000000000L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1__1_in_rule__XAssignment__Group_1__020416 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXOrExpression_in_rule__XAssignment__Group_1__0__Impl20443 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1__1__Impl_in_rule__XAssignment__Group_1__120472 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1__0_in_rule__XAssignment__Group_1__1__Impl20499 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1__0__Impl_in_rule__XAssignment__Group_1_1__020534 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1__1_in_rule__XAssignment__Group_1_1__020537 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1_0__0_in_rule__XAssignment__Group_1_1__0__Impl20564 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1__1__Impl_in_rule__XAssignment__Group_1_1__120594 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__RightOperandAssignment_1_1_1_in_rule__XAssignment__Group_1_1__1__Impl20621 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1_0__0__Impl_in_rule__XAssignment__Group_1_1_0__020655 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1_0_0__0_in_rule__XAssignment__Group_1_1_0__0__Impl20682 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1_0_0__0__Impl_in_rule__XAssignment__Group_1_1_0_0__020714 = new BitSet(new long[]{0x0000C1F000000000L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1_0_0__1_in_rule__XAssignment__Group_1_1_0_0__020717 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1_0_0__1__Impl_in_rule__XAssignment__Group_1_1_0_0__120775 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__FeatureAssignment_1_1_0_0_1_in_rule__XAssignment__Group_1_1_0_0__1__Impl20802 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_5__0__Impl_in_rule__OpMultiAssign__Group_5__020836 = new BitSet(new long[]{0x0000800000000000L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_5__1_in_rule__OpMultiAssign__Group_5__020839 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__OpMultiAssign__Group_5__0__Impl20867 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_5__1__Impl_in_rule__OpMultiAssign__Group_5__120898 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_5__2_in_rule__OpMultiAssign__Group_5__120901 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__OpMultiAssign__Group_5__1__Impl20929 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_5__2__Impl_in_rule__OpMultiAssign__Group_5__220960 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_13_in_rule__OpMultiAssign__Group_5__2__Impl20988 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_6__0__Impl_in_rule__OpMultiAssign__Group_6__021025 = new BitSet(new long[]{0x0000600000000000L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_6__1_in_rule__OpMultiAssign__Group_6__021028 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rule__OpMultiAssign__Group_6__0__Impl21056 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_6__1__Impl_in_rule__OpMultiAssign__Group_6__121087 = new BitSet(new long[]{0x0000600000000000L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_6__2_in_rule__OpMultiAssign__Group_6__121090 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rule__OpMultiAssign__Group_6__1__Impl21119 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_6__2__Impl_in_rule__OpMultiAssign__Group_6__221152 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_45_in_rule__OpMultiAssign__Group_6__2__Impl21180 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group__0__Impl_in_rule__XOrExpression__Group__021217 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group__1_in_rule__XOrExpression__Group__021220 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAndExpression_in_rule__XOrExpression__Group__0__Impl21247 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group__1__Impl_in_rule__XOrExpression__Group__121276 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1__0_in_rule__XOrExpression__Group__1__Impl21303 = new BitSet(new long[]{0x0000000000004002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1__0__Impl_in_rule__XOrExpression__Group_1__021338 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1__1_in_rule__XOrExpression__Group_1__021341 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1_0__0_in_rule__XOrExpression__Group_1__0__Impl21368 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1__1__Impl_in_rule__XOrExpression__Group_1__121398 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__RightOperandAssignment_1_1_in_rule__XOrExpression__Group_1__1__Impl21425 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1_0__0__Impl_in_rule__XOrExpression__Group_1_0__021459 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1_0_0__0_in_rule__XOrExpression__Group_1_0__0__Impl21486 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1_0_0__0__Impl_in_rule__XOrExpression__Group_1_0_0__021518 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1_0_0__1_in_rule__XOrExpression__Group_1_0_0__021521 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1_0_0__1__Impl_in_rule__XOrExpression__Group_1_0_0__121579 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__FeatureAssignment_1_0_0_1_in_rule__XOrExpression__Group_1_0_0__1__Impl21606 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group__0__Impl_in_rule__XAndExpression__Group__021640 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group__1_in_rule__XAndExpression__Group__021643 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXEqualityExpression_in_rule__XAndExpression__Group__0__Impl21670 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group__1__Impl_in_rule__XAndExpression__Group__121699 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1__0_in_rule__XAndExpression__Group__1__Impl21726 = new BitSet(new long[]{0x0000000000008002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1__0__Impl_in_rule__XAndExpression__Group_1__021761 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1__1_in_rule__XAndExpression__Group_1__021764 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1_0__0_in_rule__XAndExpression__Group_1__0__Impl21791 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1__1__Impl_in_rule__XAndExpression__Group_1__121821 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__RightOperandAssignment_1_1_in_rule__XAndExpression__Group_1__1__Impl21848 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1_0__0__Impl_in_rule__XAndExpression__Group_1_0__021882 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1_0_0__0_in_rule__XAndExpression__Group_1_0__0__Impl21909 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1_0_0__0__Impl_in_rule__XAndExpression__Group_1_0_0__021941 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1_0_0__1_in_rule__XAndExpression__Group_1_0_0__021944 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1_0_0__1__Impl_in_rule__XAndExpression__Group_1_0_0__122002 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__FeatureAssignment_1_0_0_1_in_rule__XAndExpression__Group_1_0_0__1__Impl22029 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group__0__Impl_in_rule__XEqualityExpression__Group__022063 = new BitSet(new long[]{0x00001E0000000000L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group__1_in_rule__XEqualityExpression__Group__022066 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXRelationalExpression_in_rule__XEqualityExpression__Group__0__Impl22093 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group__1__Impl_in_rule__XEqualityExpression__Group__122122 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1__0_in_rule__XEqualityExpression__Group__1__Impl22149 = new BitSet(new long[]{0x00001E0000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1__0__Impl_in_rule__XEqualityExpression__Group_1__022184 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1__1_in_rule__XEqualityExpression__Group_1__022187 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1_0__0_in_rule__XEqualityExpression__Group_1__0__Impl22214 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1__1__Impl_in_rule__XEqualityExpression__Group_1__122244 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__RightOperandAssignment_1_1_in_rule__XEqualityExpression__Group_1__1__Impl22271 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1_0__0__Impl_in_rule__XEqualityExpression__Group_1_0__022305 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1_0_0__0_in_rule__XEqualityExpression__Group_1_0__0__Impl22332 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1_0_0__0__Impl_in_rule__XEqualityExpression__Group_1_0_0__022364 = new BitSet(new long[]{0x00001E0000000000L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1_0_0__1_in_rule__XEqualityExpression__Group_1_0_0__022367 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1_0_0__1__Impl_in_rule__XEqualityExpression__Group_1_0_0__122425 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__FeatureAssignment_1_0_0_1_in_rule__XEqualityExpression__Group_1_0_0__1__Impl22452 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group__0__Impl_in_rule__XRelationalExpression__Group__022486 = new BitSet(new long[]{0x0000E00000000000L,0x0000000000040000L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group__1_in_rule__XRelationalExpression__Group__022489 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXOtherOperatorExpression_in_rule__XRelationalExpression__Group__0__Impl22516 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group__1__Impl_in_rule__XRelationalExpression__Group__122545 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Alternatives_1_in_rule__XRelationalExpression__Group__1__Impl22572 = new BitSet(new long[]{0x0000E00000000002L,0x0000000000040000L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0__0__Impl_in_rule__XRelationalExpression__Group_1_0__022607 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0__1_in_rule__XRelationalExpression__Group_1_0__022610 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0_0__0_in_rule__XRelationalExpression__Group_1_0__0__Impl22637 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0__1__Impl_in_rule__XRelationalExpression__Group_1_0__122667 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__TypeAssignment_1_0_1_in_rule__XRelationalExpression__Group_1_0__1__Impl22694 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0_0__0__Impl_in_rule__XRelationalExpression__Group_1_0_0__022728 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0_0_0__0_in_rule__XRelationalExpression__Group_1_0_0__0__Impl22755 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0_0_0__0__Impl_in_rule__XRelationalExpression__Group_1_0_0_0__022787 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0_0_0__1_in_rule__XRelationalExpression__Group_1_0_0_0__022790 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0_0_0__1__Impl_in_rule__XRelationalExpression__Group_1_0_0_0__122848 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_82_in_rule__XRelationalExpression__Group_1_0_0_0__1__Impl22876 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1__0__Impl_in_rule__XRelationalExpression__Group_1_1__022911 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1__1_in_rule__XRelationalExpression__Group_1_1__022914 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1_0__0_in_rule__XRelationalExpression__Group_1_1__0__Impl22941 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1__1__Impl_in_rule__XRelationalExpression__Group_1_1__122971 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__RightOperandAssignment_1_1_1_in_rule__XRelationalExpression__Group_1_1__1__Impl22998 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1_0__0__Impl_in_rule__XRelationalExpression__Group_1_1_0__023032 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1_0_0__0_in_rule__XRelationalExpression__Group_1_1_0__0__Impl23059 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1_0_0__0__Impl_in_rule__XRelationalExpression__Group_1_1_0_0__023091 = new BitSet(new long[]{0x0000E00000000000L,0x0000000000040000L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1_0_0__1_in_rule__XRelationalExpression__Group_1_1_0_0__023094 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1_0_0__1__Impl_in_rule__XRelationalExpression__Group_1_1_0_0__123152 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1_in_rule__XRelationalExpression__Group_1_1_0_0__1__Impl23179 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpCompare__Group_1__0__Impl_in_rule__OpCompare__Group_1__023213 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_rule__OpCompare__Group_1__1_in_rule__OpCompare__Group_1__023216 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__OpCompare__Group_1__0__Impl23244 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpCompare__Group_1__1__Impl_in_rule__OpCompare__Group_1__123275 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_13_in_rule__OpCompare__Group_1__1__Impl23303 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group__0__Impl_in_rule__XOtherOperatorExpression__Group__023338 = new BitSet(new long[]{0x003FC00000000000L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group__1_in_rule__XOtherOperatorExpression__Group__023341 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAdditiveExpression_in_rule__XOtherOperatorExpression__Group__0__Impl23368 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group__1__Impl_in_rule__XOtherOperatorExpression__Group__123397 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1__0_in_rule__XOtherOperatorExpression__Group__1__Impl23424 = new BitSet(new long[]{0x003FC00000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1__0__Impl_in_rule__XOtherOperatorExpression__Group_1__023459 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1__1_in_rule__XOtherOperatorExpression__Group_1__023462 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1_0__0_in_rule__XOtherOperatorExpression__Group_1__0__Impl23489 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1__1__Impl_in_rule__XOtherOperatorExpression__Group_1__123519 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__RightOperandAssignment_1_1_in_rule__XOtherOperatorExpression__Group_1__1__Impl23546 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1_0__0__Impl_in_rule__XOtherOperatorExpression__Group_1_0__023580 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1_0_0__0_in_rule__XOtherOperatorExpression__Group_1_0__0__Impl23607 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1_0_0__0__Impl_in_rule__XOtherOperatorExpression__Group_1_0_0__023639 = new BitSet(new long[]{0x003FC00000000000L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1_0_0__1_in_rule__XOtherOperatorExpression__Group_1_0_0__023642 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1_0_0__1__Impl_in_rule__XOtherOperatorExpression__Group_1_0_0__123700 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1_in_rule__XOtherOperatorExpression__Group_1_0_0__1__Impl23727 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_2__0__Impl_in_rule__OpOther__Group_2__023761 = new BitSet(new long[]{0x0004000000000000L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_2__1_in_rule__OpOther__Group_2__023764 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rule__OpOther__Group_2__0__Impl23792 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_2__1__Impl_in_rule__OpOther__Group_2__123823 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_50_in_rule__OpOther__Group_2__1__Impl23851 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_5__0__Impl_in_rule__OpOther__Group_5__023886 = new BitSet(new long[]{0x0000400000000000L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_5__1_in_rule__OpOther__Group_5__023889 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rule__OpOther__Group_5__0__Impl23917 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_5__1__Impl_in_rule__OpOther__Group_5__123948 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Alternatives_5_1_in_rule__OpOther__Group_5__1__Impl23975 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_5_1_0__0__Impl_in_rule__OpOther__Group_5_1_0__024009 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_5_1_0_0__0_in_rule__OpOther__Group_5_1_0__0__Impl24036 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_5_1_0_0__0__Impl_in_rule__OpOther__Group_5_1_0_0__024068 = new BitSet(new long[]{0x0000400000000000L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_5_1_0_0__1_in_rule__OpOther__Group_5_1_0_0__024071 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rule__OpOther__Group_5_1_0_0__0__Impl24099 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_5_1_0_0__1__Impl_in_rule__OpOther__Group_5_1_0_0__124130 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rule__OpOther__Group_5_1_0_0__1__Impl24158 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_6__0__Impl_in_rule__OpOther__Group_6__024193 = new BitSet(new long[]{0x0008800000000000L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_6__1_in_rule__OpOther__Group_6__024196 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__OpOther__Group_6__0__Impl24224 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_6__1__Impl_in_rule__OpOther__Group_6__124255 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Alternatives_6_1_in_rule__OpOther__Group_6__1__Impl24282 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_6_1_0__0__Impl_in_rule__OpOther__Group_6_1_0__024316 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_6_1_0_0__0_in_rule__OpOther__Group_6_1_0__0__Impl24343 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_6_1_0_0__0__Impl_in_rule__OpOther__Group_6_1_0_0__024375 = new BitSet(new long[]{0x0000800000000000L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_6_1_0_0__1_in_rule__OpOther__Group_6_1_0_0__024378 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__OpOther__Group_6_1_0_0__0__Impl24406 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_6_1_0_0__1__Impl_in_rule__OpOther__Group_6_1_0_0__124437 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__OpOther__Group_6_1_0_0__1__Impl24465 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group__0__Impl_in_rule__XAdditiveExpression__Group__024500 = new BitSet(new long[]{0x00C0000000000000L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group__1_in_rule__XAdditiveExpression__Group__024503 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXMultiplicativeExpression_in_rule__XAdditiveExpression__Group__0__Impl24530 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group__1__Impl_in_rule__XAdditiveExpression__Group__124559 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1__0_in_rule__XAdditiveExpression__Group__1__Impl24586 = new BitSet(new long[]{0x00C0000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1__0__Impl_in_rule__XAdditiveExpression__Group_1__024621 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1__1_in_rule__XAdditiveExpression__Group_1__024624 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1_0__0_in_rule__XAdditiveExpression__Group_1__0__Impl24651 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1__1__Impl_in_rule__XAdditiveExpression__Group_1__124681 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__RightOperandAssignment_1_1_in_rule__XAdditiveExpression__Group_1__1__Impl24708 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1_0__0__Impl_in_rule__XAdditiveExpression__Group_1_0__024742 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1_0_0__0_in_rule__XAdditiveExpression__Group_1_0__0__Impl24769 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1_0_0__0__Impl_in_rule__XAdditiveExpression__Group_1_0_0__024801 = new BitSet(new long[]{0x00C0000000000000L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1_0_0__1_in_rule__XAdditiveExpression__Group_1_0_0__024804 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1_0_0__1__Impl_in_rule__XAdditiveExpression__Group_1_0_0__124862 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__FeatureAssignment_1_0_0_1_in_rule__XAdditiveExpression__Group_1_0_0__1__Impl24889 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group__0__Impl_in_rule__XMultiplicativeExpression__Group__024923 = new BitSet(new long[]{0x0F00000000000000L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group__1_in_rule__XMultiplicativeExpression__Group__024926 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXUnaryOperation_in_rule__XMultiplicativeExpression__Group__0__Impl24953 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group__1__Impl_in_rule__XMultiplicativeExpression__Group__124982 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1__0_in_rule__XMultiplicativeExpression__Group__1__Impl25009 = new BitSet(new long[]{0x0F00000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1__0__Impl_in_rule__XMultiplicativeExpression__Group_1__025044 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1__1_in_rule__XMultiplicativeExpression__Group_1__025047 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1_0__0_in_rule__XMultiplicativeExpression__Group_1__0__Impl25074 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1__1__Impl_in_rule__XMultiplicativeExpression__Group_1__125104 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__RightOperandAssignment_1_1_in_rule__XMultiplicativeExpression__Group_1__1__Impl25131 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1_0__0__Impl_in_rule__XMultiplicativeExpression__Group_1_0__025165 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1_0_0__0_in_rule__XMultiplicativeExpression__Group_1_0__0__Impl25192 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1_0_0__0__Impl_in_rule__XMultiplicativeExpression__Group_1_0_0__025224 = new BitSet(new long[]{0x0F00000000000000L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1_0_0__1_in_rule__XMultiplicativeExpression__Group_1_0_0__025227 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1_0_0__1__Impl_in_rule__XMultiplicativeExpression__Group_1_0_0__125285 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1_in_rule__XMultiplicativeExpression__Group_1_0_0__1__Impl25312 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XUnaryOperation__Group_0__0__Impl_in_rule__XUnaryOperation__Group_0__025346 = new BitSet(new long[]{0x10C0000000000000L});
-    public static final BitSet FOLLOW_rule__XUnaryOperation__Group_0__1_in_rule__XUnaryOperation__Group_0__025349 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XUnaryOperation__Group_0__1__Impl_in_rule__XUnaryOperation__Group_0__125407 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XUnaryOperation__Group_0__2_in_rule__XUnaryOperation__Group_0__125410 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XUnaryOperation__FeatureAssignment_0_1_in_rule__XUnaryOperation__Group_0__1__Impl25437 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XUnaryOperation__Group_0__2__Impl_in_rule__XUnaryOperation__Group_0__225467 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XUnaryOperation__OperandAssignment_0_2_in_rule__XUnaryOperation__Group_0__2__Impl25494 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group__0__Impl_in_rule__XCastedExpression__Group__025530 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group__1_in_rule__XCastedExpression__Group__025533 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXPostfixOperation_in_rule__XCastedExpression__Group__0__Impl25560 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group__1__Impl_in_rule__XCastedExpression__Group__125589 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1__0_in_rule__XCastedExpression__Group__1__Impl25616 = new BitSet(new long[]{0x0000000000000002L,0x0000000000080000L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1__0__Impl_in_rule__XCastedExpression__Group_1__025651 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1__1_in_rule__XCastedExpression__Group_1__025654 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1_0__0_in_rule__XCastedExpression__Group_1__0__Impl25681 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1__1__Impl_in_rule__XCastedExpression__Group_1__125711 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__TypeAssignment_1_1_in_rule__XCastedExpression__Group_1__1__Impl25738 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1_0__0__Impl_in_rule__XCastedExpression__Group_1_0__025772 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1_0_0__0_in_rule__XCastedExpression__Group_1_0__0__Impl25799 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1_0_0__0__Impl_in_rule__XCastedExpression__Group_1_0_0__025831 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1_0_0__1_in_rule__XCastedExpression__Group_1_0_0__025834 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1_0_0__1__Impl_in_rule__XCastedExpression__Group_1_0_0__125892 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_83_in_rule__XCastedExpression__Group_1_0_0__1__Impl25920 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group__0__Impl_in_rule__XPostfixOperation__Group__025955 = new BitSet(new long[]{0x6000000000000000L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group__1_in_rule__XPostfixOperation__Group__025958 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXMemberFeatureCall_in_rule__XPostfixOperation__Group__0__Impl25985 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group__1__Impl_in_rule__XPostfixOperation__Group__126014 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group_1__0_in_rule__XPostfixOperation__Group__1__Impl26041 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group_1__0__Impl_in_rule__XPostfixOperation__Group_1__026076 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group_1_0__0_in_rule__XPostfixOperation__Group_1__0__Impl26103 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group_1_0__0__Impl_in_rule__XPostfixOperation__Group_1_0__026135 = new BitSet(new long[]{0x6000000000000000L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group_1_0__1_in_rule__XPostfixOperation__Group_1_0__026138 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group_1_0__1__Impl_in_rule__XPostfixOperation__Group_1_0__126196 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__FeatureAssignment_1_0_1_in_rule__XPostfixOperation__Group_1_0__1__Impl26223 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group__0__Impl_in_rule__XMemberFeatureCall__Group__026257 = new BitSet(new long[]{0x8000000000000000L,0x0000030000000000L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group__1_in_rule__XMemberFeatureCall__Group__026260 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXPrimaryExpression_in_rule__XMemberFeatureCall__Group__0__Impl26287 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group__1__Impl_in_rule__XMemberFeatureCall__Group__126316 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Alternatives_1_in_rule__XMemberFeatureCall__Group__1__Impl26343 = new BitSet(new long[]{0x8000000000000002L,0x0000030000000000L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_0__026378 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0__1_in_rule__XMemberFeatureCall__Group_1_0__026381 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0__0_in_rule__XMemberFeatureCall__Group_1_0__0__Impl26408 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0__1__Impl_in_rule__XMemberFeatureCall__Group_1_0__126438 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__ValueAssignment_1_0_1_in_rule__XMemberFeatureCall__Group_1_0__1__Impl26465 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_0_0__026499 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__0_in_rule__XMemberFeatureCall__Group_1_0_0__0__Impl26526 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_0_0_0__026558 = new BitSet(new long[]{0x8000000000000000L,0x0000010000000000L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__1_in_rule__XMemberFeatureCall__Group_1_0_0_0__026561 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl_in_rule__XMemberFeatureCall__Group_1_0_0_0__126619 = new BitSet(new long[]{0x0000000FFFFF0010L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__2_in_rule__XMemberFeatureCall__Group_1_0_0_0__126622 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Alternatives_1_0_0_0_1_in_rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl26649 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl_in_rule__XMemberFeatureCall__Group_1_0_0_0__226679 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__3_in_rule__XMemberFeatureCall__Group_1_0_0_0__226682 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2_in_rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl26709 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl_in_rule__XMemberFeatureCall__Group_1_0_0_0__326739 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpSingleAssign_in_rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl26766 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__0__Impl_in_rule__XMemberFeatureCall__Group_1_1__026803 = new BitSet(new long[]{0x0000800FFFFF0010L,0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__1_in_rule__XMemberFeatureCall__Group_1_1__026806 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_0__0_in_rule__XMemberFeatureCall__Group_1_1__0__Impl26833 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__1__Impl_in_rule__XMemberFeatureCall__Group_1_1__126863 = new BitSet(new long[]{0x0000800FFFFF0010L,0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__2_in_rule__XMemberFeatureCall__Group_1_1__126866 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__0_in_rule__XMemberFeatureCall__Group_1_1__1__Impl26893 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__2__Impl_in_rule__XMemberFeatureCall__Group_1_1__226924 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004100L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__3_in_rule__XMemberFeatureCall__Group_1_1__226927 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__FeatureAssignment_1_1_2_in_rule__XMemberFeatureCall__Group_1_1__2__Impl26954 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__3__Impl_in_rule__XMemberFeatureCall__Group_1_1__326984 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004100L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__4_in_rule__XMemberFeatureCall__Group_1_1__326987 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__0_in_rule__XMemberFeatureCall__Group_1_1__3__Impl27014 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__4__Impl_in_rule__XMemberFeatureCall__Group_1_1__427045 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4_in_rule__XMemberFeatureCall__Group_1_1__4__Impl27072 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_0__027113 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_0_0__0_in_rule__XMemberFeatureCall__Group_1_1_0__0__Impl27140 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_0_0__027172 = new BitSet(new long[]{0x8000000000000000L,0x0000030000000000L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_0_0__1_in_rule__XMemberFeatureCall__Group_1_1_0_0__027175 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_0_0__127233 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Alternatives_1_1_0_0_1_in_rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl27260 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_1__027294 = new BitSet(new long[]{0x0008000FE0800010L,0x000000A000001900L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__1_in_rule__XMemberFeatureCall__Group_1_1_1__027297 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__XMemberFeatureCall__Group_1_1_1__0__Impl27325 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_1__127356 = new BitSet(new long[]{0x0000400000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__2_in_rule__XMemberFeatureCall__Group_1_1_1__127359 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1_in_rule__XMemberFeatureCall__Group_1_1_1__1__Impl27386 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__2__Impl_in_rule__XMemberFeatureCall__Group_1_1_1__227416 = new BitSet(new long[]{0x0000400000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__3_in_rule__XMemberFeatureCall__Group_1_1_1__227419 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1_2__0_in_rule__XMemberFeatureCall__Group_1_1_1__2__Impl27446 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__3__Impl_in_rule__XMemberFeatureCall__Group_1_1_1__327477 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rule__XMemberFeatureCall__Group_1_1_1__3__Impl27505 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_1_2__027544 = new BitSet(new long[]{0x0008000FE0800010L,0x000000A000001900L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1_2__1_in_rule__XMemberFeatureCall__Group_1_1_1_2__027547 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl27575 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_1_2__127606 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1_in_rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl27633 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_3__027667 = new BitSet(new long[]{0x10C8800FFFFF01F0L,0x0000148BFC537B56L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__1_in_rule__XMemberFeatureCall__Group_1_1_3__027670 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0_in_rule__XMemberFeatureCall__Group_1_1_3__0__Impl27697 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_3__127727 = new BitSet(new long[]{0x10C8800FFFFF01F0L,0x0000148BFC537B56L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__2_in_rule__XMemberFeatureCall__Group_1_1_3__127730 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Alternatives_1_1_3_1_in_rule__XMemberFeatureCall__Group_1_1_3__1__Impl27757 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__2__Impl_in_rule__XMemberFeatureCall__Group_1_1_3__227788 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__XMemberFeatureCall__Group_1_1_3__2__Impl27816 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__027853 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1__1_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__027856 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl27883 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__127913 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl27940 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__027975 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__027978 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl28006 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__128037 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl28064 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group__0__Impl_in_rule__XSetLiteral__Group__028098 = new BitSet(new long[]{0x0000000000000000L,0x0000000000002000L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group__1_in_rule__XSetLiteral__Group__028101 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group__1__Impl_in_rule__XSetLiteral__Group__128159 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group__2_in_rule__XSetLiteral__Group__128162 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_77_in_rule__XSetLiteral__Group__1__Impl28190 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group__2__Impl_in_rule__XSetLiteral__Group__228221 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536176L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group__3_in_rule__XSetLiteral__Group__228224 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_68_in_rule__XSetLiteral__Group__2__Impl28252 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group__3__Impl_in_rule__XSetLiteral__Group__328283 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536176L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group__4_in_rule__XSetLiteral__Group__328286 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group_3__0_in_rule__XSetLiteral__Group__3__Impl28313 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group__4__Impl_in_rule__XSetLiteral__Group__428344 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_69_in_rule__XSetLiteral__Group__4__Impl28372 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group_3__0__Impl_in_rule__XSetLiteral__Group_3__028413 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group_3__1_in_rule__XSetLiteral__Group_3__028416 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__ElementsAssignment_3_0_in_rule__XSetLiteral__Group_3__0__Impl28443 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group_3__1__Impl_in_rule__XSetLiteral__Group_3__128473 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group_3_1__0_in_rule__XSetLiteral__Group_3__1__Impl28500 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group_3_1__0__Impl_in_rule__XSetLiteral__Group_3_1__028535 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group_3_1__1_in_rule__XSetLiteral__Group_3_1__028538 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XSetLiteral__Group_3_1__0__Impl28566 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group_3_1__1__Impl_in_rule__XSetLiteral__Group_3_1__128597 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__ElementsAssignment_3_1_1_in_rule__XSetLiteral__Group_3_1__1__Impl28624 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group__0__Impl_in_rule__XListLiteral__Group__028658 = new BitSet(new long[]{0x0000000000000000L,0x0000000000002000L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group__1_in_rule__XListLiteral__Group__028661 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group__1__Impl_in_rule__XListLiteral__Group__128719 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group__2_in_rule__XListLiteral__Group__128722 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_77_in_rule__XListLiteral__Group__1__Impl28750 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group__2__Impl_in_rule__XListLiteral__Group__228781 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC53E156L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group__3_in_rule__XListLiteral__Group__228784 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_78_in_rule__XListLiteral__Group__2__Impl28812 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group__3__Impl_in_rule__XListLiteral__Group__328843 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC53E156L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group__4_in_rule__XListLiteral__Group__328846 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group_3__0_in_rule__XListLiteral__Group__3__Impl28873 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group__4__Impl_in_rule__XListLiteral__Group__428904 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_79_in_rule__XListLiteral__Group__4__Impl28932 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group_3__0__Impl_in_rule__XListLiteral__Group_3__028973 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group_3__1_in_rule__XListLiteral__Group_3__028976 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__ElementsAssignment_3_0_in_rule__XListLiteral__Group_3__0__Impl29003 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group_3__1__Impl_in_rule__XListLiteral__Group_3__129033 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group_3_1__0_in_rule__XListLiteral__Group_3__1__Impl29060 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group_3_1__0__Impl_in_rule__XListLiteral__Group_3_1__029095 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group_3_1__1_in_rule__XListLiteral__Group_3_1__029098 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XListLiteral__Group_3_1__0__Impl29126 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group_3_1__1__Impl_in_rule__XListLiteral__Group_3_1__129157 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__ElementsAssignment_3_1_1_in_rule__XListLiteral__Group_3_1__1__Impl29184 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group__0__Impl_in_rule__XClosure__Group__029218 = new BitSet(new long[]{0x10C8800FFFFF01F0L,0x00001C8BFC537957L});
-    public static final BitSet FOLLOW_rule__XClosure__Group__1_in_rule__XClosure__Group__029221 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_0__0_in_rule__XClosure__Group__0__Impl29248 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group__1__Impl_in_rule__XClosure__Group__129278 = new BitSet(new long[]{0x10C8800FFFFF01F0L,0x00001C8BFC537957L});
-    public static final BitSet FOLLOW_rule__XClosure__Group__2_in_rule__XClosure__Group__129281 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1__0_in_rule__XClosure__Group__1__Impl29308 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group__2__Impl_in_rule__XClosure__Group__229339 = new BitSet(new long[]{0x0000000000000000L,0x0000000000008000L});
-    public static final BitSet FOLLOW_rule__XClosure__Group__3_in_rule__XClosure__Group__229342 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__ExpressionAssignment_2_in_rule__XClosure__Group__2__Impl29369 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group__3__Impl_in_rule__XClosure__Group__329399 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_79_in_rule__XClosure__Group__3__Impl29427 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_0__0__Impl_in_rule__XClosure__Group_0__029466 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_0_0__0_in_rule__XClosure__Group_0__0__Impl29493 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_0_0__0__Impl_in_rule__XClosure__Group_0_0__029525 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_0_0__1_in_rule__XClosure__Group_0_0__029528 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_0_0__1__Impl_in_rule__XClosure__Group_0_0__129586 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_78_in_rule__XClosure__Group_0_0__1__Impl29614 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1__0__Impl_in_rule__XClosure__Group_1__029649 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0__0_in_rule__XClosure__Group_1__0__Impl29676 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0__0__Impl_in_rule__XClosure__Group_1_0__029708 = new BitSet(new long[]{0x0008000FE0800010L,0x0000048000001900L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0__1_in_rule__XClosure__Group_1_0__029711 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0_0__0_in_rule__XClosure__Group_1_0__0__Impl29738 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0__1__Impl_in_rule__XClosure__Group_1_0__129769 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__ExplicitSyntaxAssignment_1_0_1_in_rule__XClosure__Group_1_0__1__Impl29796 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0_0__0__Impl_in_rule__XClosure__Group_1_0_0__029830 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0_0__1_in_rule__XClosure__Group_1_0_0__029833 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0_in_rule__XClosure__Group_1_0_0__0__Impl29860 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0_0__1__Impl_in_rule__XClosure__Group_1_0_0__129890 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0_0_1__0_in_rule__XClosure__Group_1_0_0__1__Impl29917 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0_0_1__0__Impl_in_rule__XClosure__Group_1_0_0_1__029952 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0_0_1__1_in_rule__XClosure__Group_1_0_0_1__029955 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XClosure__Group_1_0_0_1__0__Impl29983 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0_0_1__1__Impl_in_rule__XClosure__Group_1_0_0_1__130014 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1_in_rule__XClosure__Group_1_0_0_1__1__Impl30041 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XExpressionInClosure__Group__0__Impl_in_rule__XExpressionInClosure__Group__030075 = new BitSet(new long[]{0x10C8800FFFFF01F0L,0x00001C8BFC537957L});
-    public static final BitSet FOLLOW_rule__XExpressionInClosure__Group__1_in_rule__XExpressionInClosure__Group__030078 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XExpressionInClosure__Group__1__Impl_in_rule__XExpressionInClosure__Group__130136 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XExpressionInClosure__Group_1__0_in_rule__XExpressionInClosure__Group__1__Impl30163 = new BitSet(new long[]{0x10C0800FFFFF01F2L,0x0000180BFC536157L});
-    public static final BitSet FOLLOW_rule__XExpressionInClosure__Group_1__0__Impl_in_rule__XExpressionInClosure__Group_1__030198 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XExpressionInClosure__Group_1__1_in_rule__XExpressionInClosure__Group_1__030201 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XExpressionInClosure__ExpressionsAssignment_1_0_in_rule__XExpressionInClosure__Group_1__0__Impl30228 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XExpressionInClosure__Group_1__1__Impl_in_rule__XExpressionInClosure__Group_1__130258 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__XExpressionInClosure__Group_1__1__Impl30287 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group__0__Impl_in_rule__XShortClosure__Group__030324 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group__1_in_rule__XShortClosure__Group__030327 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0__0_in_rule__XShortClosure__Group__0__Impl30354 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group__1__Impl_in_rule__XShortClosure__Group__130384 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__ExpressionAssignment_1_in_rule__XShortClosure__Group__1__Impl30411 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0__0__Impl_in_rule__XShortClosure__Group_0__030445 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0__0_in_rule__XShortClosure__Group_0__0__Impl30472 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0__0__Impl_in_rule__XShortClosure__Group_0_0__030504 = new BitSet(new long[]{0x0008000FE0800010L,0x0000048000001900L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0__1_in_rule__XShortClosure__Group_0_0__030507 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0__1__Impl_in_rule__XShortClosure__Group_0_0__130565 = new BitSet(new long[]{0x0008000FE0800010L,0x0000048000001900L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0__2_in_rule__XShortClosure__Group_0_0__130568 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0_1__0_in_rule__XShortClosure__Group_0_0__1__Impl30595 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0__2__Impl_in_rule__XShortClosure__Group_0_0__230626 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2_in_rule__XShortClosure__Group_0_0__2__Impl30653 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0_1__0__Impl_in_rule__XShortClosure__Group_0_0_1__030689 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0_1__1_in_rule__XShortClosure__Group_0_0_1__030692 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0_in_rule__XShortClosure__Group_0_0_1__0__Impl30719 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0_1__1__Impl_in_rule__XShortClosure__Group_0_0_1__130749 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0_1_1__0_in_rule__XShortClosure__Group_0_0_1__1__Impl30776 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0_1_1__0__Impl_in_rule__XShortClosure__Group_0_0_1_1__030811 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0_1_1__1_in_rule__XShortClosure__Group_0_0_1_1__030814 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XShortClosure__Group_0_0_1_1__0__Impl30842 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0_1_1__1__Impl_in_rule__XShortClosure__Group_0_0_1_1__130873 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1_in_rule__XShortClosure__Group_0_0_1_1__1__Impl30900 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XParenthesizedExpression__Group__0__Impl_in_rule__XParenthesizedExpression__Group__030934 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XParenthesizedExpression__Group__1_in_rule__XParenthesizedExpression__Group__030937 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__XParenthesizedExpression__Group__0__Impl30965 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XParenthesizedExpression__Group__1__Impl_in_rule__XParenthesizedExpression__Group__130996 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000200L});
-    public static final BitSet FOLLOW_rule__XParenthesizedExpression__Group__2_in_rule__XParenthesizedExpression__Group__130999 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XParenthesizedExpression__Group__1__Impl31026 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XParenthesizedExpression__Group__2__Impl_in_rule__XParenthesizedExpression__Group__231055 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__XParenthesizedExpression__Group__2__Impl31083 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__0__Impl_in_rule__XIfExpression__Group__031120 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__1_in_rule__XIfExpression__Group__031123 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__1__Impl_in_rule__XIfExpression__Group__131181 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__2_in_rule__XIfExpression__Group__131184 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_84_in_rule__XIfExpression__Group__1__Impl31212 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__2__Impl_in_rule__XIfExpression__Group__231243 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__3_in_rule__XIfExpression__Group__231246 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__XIfExpression__Group__2__Impl31274 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__3__Impl_in_rule__XIfExpression__Group__331305 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000200L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__4_in_rule__XIfExpression__Group__331308 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__IfAssignment_3_in_rule__XIfExpression__Group__3__Impl31335 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__4__Impl_in_rule__XIfExpression__Group__431365 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__5_in_rule__XIfExpression__Group__431368 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__XIfExpression__Group__4__Impl31396 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__5__Impl_in_rule__XIfExpression__Group__531427 = new BitSet(new long[]{0x0000000000000000L,0x0000000000200000L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__6_in_rule__XIfExpression__Group__531430 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__ThenAssignment_5_in_rule__XIfExpression__Group__5__Impl31457 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__6__Impl_in_rule__XIfExpression__Group__631487 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group_6__0_in_rule__XIfExpression__Group__6__Impl31514 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group_6__0__Impl_in_rule__XIfExpression__Group_6__031559 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group_6__1_in_rule__XIfExpression__Group_6__031562 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_85_in_rule__XIfExpression__Group_6__0__Impl31591 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group_6__1__Impl_in_rule__XIfExpression__Group_6__131623 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__ElseAssignment_6_1_in_rule__XIfExpression__Group_6__1__Impl31650 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__0__Impl_in_rule__XSwitchExpression__Group__031684 = new BitSet(new long[]{0x0000000000000000L,0x0000000000400000L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__1_in_rule__XSwitchExpression__Group__031687 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__1__Impl_in_rule__XSwitchExpression__Group__131745 = new BitSet(new long[]{0x10C8800FFFFF01F0L,0x0000108BFC537956L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__2_in_rule__XSwitchExpression__Group__131748 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_86_in_rule__XSwitchExpression__Group__1__Impl31776 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__2__Impl_in_rule__XSwitchExpression__Group__231807 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__3_in_rule__XSwitchExpression__Group__231810 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Alternatives_2_in_rule__XSwitchExpression__Group__2__Impl31837 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__3__Impl_in_rule__XSwitchExpression__Group__331867 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008003801D20L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__4_in_rule__XSwitchExpression__Group__331870 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_68_in_rule__XSwitchExpression__Group__3__Impl31898 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__4__Impl_in_rule__XSwitchExpression__Group__431929 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008003801D20L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__5_in_rule__XSwitchExpression__Group__431932 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__CasesAssignment_4_in_rule__XSwitchExpression__Group__4__Impl31959 = new BitSet(new long[]{0x0008000FE0800012L,0x0000008002801D00L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__5__Impl_in_rule__XSwitchExpression__Group__531990 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008003801D20L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__6_in_rule__XSwitchExpression__Group__531993 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_5__0_in_rule__XSwitchExpression__Group__5__Impl32020 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__6__Impl_in_rule__XSwitchExpression__Group__632051 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_69_in_rule__XSwitchExpression__Group__6__Impl32079 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0__0__Impl_in_rule__XSwitchExpression__Group_2_0__032124 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0__1_in_rule__XSwitchExpression__Group_2_0__032127 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0_0__0_in_rule__XSwitchExpression__Group_2_0__0__Impl32154 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0__1__Impl_in_rule__XSwitchExpression__Group_2_0__132184 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000200L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0__2_in_rule__XSwitchExpression__Group_2_0__132187 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__SwitchAssignment_2_0_1_in_rule__XSwitchExpression__Group_2_0__1__Impl32214 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0__2__Impl_in_rule__XSwitchExpression__Group_2_0__232244 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__XSwitchExpression__Group_2_0__2__Impl32272 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0_0__0__Impl_in_rule__XSwitchExpression__Group_2_0_0__032309 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__0_in_rule__XSwitchExpression__Group_2_0_0__0__Impl32336 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__0__Impl_in_rule__XSwitchExpression__Group_2_0_0_0__032368 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__1_in_rule__XSwitchExpression__Group_2_0_0_0__032371 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__XSwitchExpression__Group_2_0_0_0__0__Impl32399 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__1__Impl_in_rule__XSwitchExpression__Group_2_0_0_0__132430 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__2_in_rule__XSwitchExpression__Group_2_0_0_0__132433 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1_in_rule__XSwitchExpression__Group_2_0_0_0__1__Impl32460 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__2__Impl_in_rule__XSwitchExpression__Group_2_0_0_0__232490 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_87_in_rule__XSwitchExpression__Group_2_0_0_0__2__Impl32518 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1__0__Impl_in_rule__XSwitchExpression__Group_2_1__032555 = new BitSet(new long[]{0x10C8800FFFFF01F0L,0x0000108BFC537956L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1__1_in_rule__XSwitchExpression__Group_2_1__032558 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1_0__0_in_rule__XSwitchExpression__Group_2_1__0__Impl32585 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1__1__Impl_in_rule__XSwitchExpression__Group_2_1__132616 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__SwitchAssignment_2_1_1_in_rule__XSwitchExpression__Group_2_1__1__Impl32643 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1_0__0__Impl_in_rule__XSwitchExpression__Group_2_1_0__032677 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1_0_0__0_in_rule__XSwitchExpression__Group_2_1_0__0__Impl32704 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1_0_0__0__Impl_in_rule__XSwitchExpression__Group_2_1_0_0__032736 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1_0_0__1_in_rule__XSwitchExpression__Group_2_1_0_0__032739 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0_in_rule__XSwitchExpression__Group_2_1_0_0__0__Impl32766 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1_0_0__1__Impl_in_rule__XSwitchExpression__Group_2_1_0_0__132796 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_87_in_rule__XSwitchExpression__Group_2_1_0_0__1__Impl32824 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_5__0__Impl_in_rule__XSwitchExpression__Group_5__032859 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_5__1_in_rule__XSwitchExpression__Group_5__032862 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_88_in_rule__XSwitchExpression__Group_5__0__Impl32890 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_5__1__Impl_in_rule__XSwitchExpression__Group_5__132921 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_5__2_in_rule__XSwitchExpression__Group_5__132924 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_87_in_rule__XSwitchExpression__Group_5__1__Impl32952 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_5__2__Impl_in_rule__XSwitchExpression__Group_5__232983 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__DefaultAssignment_5_2_in_rule__XSwitchExpression__Group_5__2__Impl33010 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group__0__Impl_in_rule__XCasePart__Group__033046 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008002801D00L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group__1_in_rule__XCasePart__Group__033049 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group__1__Impl_in_rule__XCasePart__Group__133107 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008002801D00L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group__2_in_rule__XCasePart__Group__133110 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__TypeGuardAssignment_1_in_rule__XCasePart__Group__1__Impl33137 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group__2__Impl_in_rule__XCasePart__Group__233168 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008002801D00L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group__3_in_rule__XCasePart__Group__233171 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group_2__0_in_rule__XCasePart__Group__2__Impl33198 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group__3__Impl_in_rule__XCasePart__Group__333229 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Alternatives_3_in_rule__XCasePart__Group__3__Impl33256 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group_2__0__Impl_in_rule__XCasePart__Group_2__033294 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group_2__1_in_rule__XCasePart__Group_2__033297 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_89_in_rule__XCasePart__Group_2__0__Impl33325 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group_2__1__Impl_in_rule__XCasePart__Group_2__133356 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__CaseAssignment_2_1_in_rule__XCasePart__Group_2__1__Impl33383 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group_3_0__0__Impl_in_rule__XCasePart__Group_3_0__033417 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group_3_0__1_in_rule__XCasePart__Group_3_0__033420 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_87_in_rule__XCasePart__Group_3_0__0__Impl33448 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group_3_0__1__Impl_in_rule__XCasePart__Group_3_0__133479 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__ThenAssignment_3_0_1_in_rule__XCasePart__Group_3_0__1__Impl33506 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group__0__Impl_in_rule__XForLoopExpression__Group__033540 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group__1_in_rule__XForLoopExpression__Group__033543 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0__0_in_rule__XForLoopExpression__Group__0__Impl33570 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group__1__Impl_in_rule__XForLoopExpression__Group__133600 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000200L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group__2_in_rule__XForLoopExpression__Group__133603 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__ForExpressionAssignment_1_in_rule__XForLoopExpression__Group__1__Impl33630 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group__2__Impl_in_rule__XForLoopExpression__Group__233660 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group__3_in_rule__XForLoopExpression__Group__233663 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__XForLoopExpression__Group__2__Impl33691 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group__3__Impl_in_rule__XForLoopExpression__Group__333722 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__EachExpressionAssignment_3_in_rule__XForLoopExpression__Group__3__Impl33749 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0__0__Impl_in_rule__XForLoopExpression__Group_0__033787 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__0_in_rule__XForLoopExpression__Group_0__0__Impl33814 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__0__Impl_in_rule__XForLoopExpression__Group_0_0__033846 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__1_in_rule__XForLoopExpression__Group_0_0__033849 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__1__Impl_in_rule__XForLoopExpression__Group_0_0__133907 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__2_in_rule__XForLoopExpression__Group_0_0__133910 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_70_in_rule__XForLoopExpression__Group_0_0__1__Impl33938 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__2__Impl_in_rule__XForLoopExpression__Group_0_0__233969 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__3_in_rule__XForLoopExpression__Group_0_0__233972 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__XForLoopExpression__Group_0_0__2__Impl34000 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__3__Impl_in_rule__XForLoopExpression__Group_0_0__334031 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__4_in_rule__XForLoopExpression__Group_0_0__334034 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__DeclaredParamAssignment_0_0_3_in_rule__XForLoopExpression__Group_0_0__3__Impl34061 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__4__Impl_in_rule__XForLoopExpression__Group_0_0__434091 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_87_in_rule__XForLoopExpression__Group_0_0__4__Impl34119 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__0__Impl_in_rule__XBasicForLoopExpression__Group__034160 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__1_in_rule__XBasicForLoopExpression__Group__034163 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__1__Impl_in_rule__XBasicForLoopExpression__Group__134221 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__2_in_rule__XBasicForLoopExpression__Group__134224 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_70_in_rule__XBasicForLoopExpression__Group__1__Impl34252 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__2__Impl_in_rule__XBasicForLoopExpression__Group__234283 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000180BFC5361D7L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__3_in_rule__XBasicForLoopExpression__Group__234286 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__XBasicForLoopExpression__Group__2__Impl34314 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__3__Impl_in_rule__XBasicForLoopExpression__Group__334345 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000180BFC5361D7L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__4_in_rule__XBasicForLoopExpression__Group__334348 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_3__0_in_rule__XBasicForLoopExpression__Group__3__Impl34375 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__4__Impl_in_rule__XBasicForLoopExpression__Group__434406 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC5361D6L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__5_in_rule__XBasicForLoopExpression__Group__434409 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__XBasicForLoopExpression__Group__4__Impl34437 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__5__Impl_in_rule__XBasicForLoopExpression__Group__534468 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC5361D6L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__6_in_rule__XBasicForLoopExpression__Group__534471 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__ExpressionAssignment_5_in_rule__XBasicForLoopExpression__Group__5__Impl34498 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__6__Impl_in_rule__XBasicForLoopExpression__Group__634529 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536356L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__7_in_rule__XBasicForLoopExpression__Group__634532 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__XBasicForLoopExpression__Group__6__Impl34560 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__7__Impl_in_rule__XBasicForLoopExpression__Group__734591 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536356L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__8_in_rule__XBasicForLoopExpression__Group__734594 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_7__0_in_rule__XBasicForLoopExpression__Group__7__Impl34621 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__8__Impl_in_rule__XBasicForLoopExpression__Group__834652 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__9_in_rule__XBasicForLoopExpression__Group__834655 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__XBasicForLoopExpression__Group__8__Impl34683 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__9__Impl_in_rule__XBasicForLoopExpression__Group__934714 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__EachExpressionAssignment_9_in_rule__XBasicForLoopExpression__Group__9__Impl34741 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_3__0__Impl_in_rule__XBasicForLoopExpression__Group_3__034791 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_3__1_in_rule__XBasicForLoopExpression__Group_3__034794 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0_in_rule__XBasicForLoopExpression__Group_3__0__Impl34821 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_3__1__Impl_in_rule__XBasicForLoopExpression__Group_3__134851 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_3_1__0_in_rule__XBasicForLoopExpression__Group_3__1__Impl34878 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_3_1__0__Impl_in_rule__XBasicForLoopExpression__Group_3_1__034913 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000180BFC536157L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_3_1__1_in_rule__XBasicForLoopExpression__Group_3_1__034916 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XBasicForLoopExpression__Group_3_1__0__Impl34944 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_3_1__1__Impl_in_rule__XBasicForLoopExpression__Group_3_1__134975 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1_in_rule__XBasicForLoopExpression__Group_3_1__1__Impl35002 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_7__0__Impl_in_rule__XBasicForLoopExpression__Group_7__035036 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_7__1_in_rule__XBasicForLoopExpression__Group_7__035039 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0_in_rule__XBasicForLoopExpression__Group_7__0__Impl35066 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_7__1__Impl_in_rule__XBasicForLoopExpression__Group_7__135096 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_7_1__0_in_rule__XBasicForLoopExpression__Group_7__1__Impl35123 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_7_1__0__Impl_in_rule__XBasicForLoopExpression__Group_7_1__035158 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_7_1__1_in_rule__XBasicForLoopExpression__Group_7_1__035161 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XBasicForLoopExpression__Group_7_1__0__Impl35189 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_7_1__1__Impl_in_rule__XBasicForLoopExpression__Group_7_1__135220 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1_in_rule__XBasicForLoopExpression__Group_7_1__1__Impl35247 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__0__Impl_in_rule__XWhileExpression__Group__035281 = new BitSet(new long[]{0x0000000000000000L,0x0000000004000000L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__1_in_rule__XWhileExpression__Group__035284 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__1__Impl_in_rule__XWhileExpression__Group__135342 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__2_in_rule__XWhileExpression__Group__135345 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_90_in_rule__XWhileExpression__Group__1__Impl35373 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__2__Impl_in_rule__XWhileExpression__Group__235404 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__3_in_rule__XWhileExpression__Group__235407 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__XWhileExpression__Group__2__Impl35435 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__3__Impl_in_rule__XWhileExpression__Group__335466 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000200L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__4_in_rule__XWhileExpression__Group__335469 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__PredicateAssignment_3_in_rule__XWhileExpression__Group__3__Impl35496 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__4__Impl_in_rule__XWhileExpression__Group__435526 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__5_in_rule__XWhileExpression__Group__435529 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__XWhileExpression__Group__4__Impl35557 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__5__Impl_in_rule__XWhileExpression__Group__535588 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__BodyAssignment_5_in_rule__XWhileExpression__Group__5__Impl35615 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__0__Impl_in_rule__XDoWhileExpression__Group__035657 = new BitSet(new long[]{0x0000000000000000L,0x0000000008000000L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__1_in_rule__XDoWhileExpression__Group__035660 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__1__Impl_in_rule__XDoWhileExpression__Group__135718 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__2_in_rule__XDoWhileExpression__Group__135721 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_91_in_rule__XDoWhileExpression__Group__1__Impl35749 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__2__Impl_in_rule__XDoWhileExpression__Group__235780 = new BitSet(new long[]{0x0000000000000000L,0x0000000004000000L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__3_in_rule__XDoWhileExpression__Group__235783 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__BodyAssignment_2_in_rule__XDoWhileExpression__Group__2__Impl35810 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__3__Impl_in_rule__XDoWhileExpression__Group__335840 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__4_in_rule__XDoWhileExpression__Group__335843 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_90_in_rule__XDoWhileExpression__Group__3__Impl35871 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__4__Impl_in_rule__XDoWhileExpression__Group__435902 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__5_in_rule__XDoWhileExpression__Group__435905 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__XDoWhileExpression__Group__4__Impl35933 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__5__Impl_in_rule__XDoWhileExpression__Group__535964 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000200L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__6_in_rule__XDoWhileExpression__Group__535967 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__PredicateAssignment_5_in_rule__XDoWhileExpression__Group__5__Impl35994 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__6__Impl_in_rule__XDoWhileExpression__Group__636024 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__XDoWhileExpression__Group__6__Impl36052 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group__0__Impl_in_rule__XBlockExpression__Group__036097 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group__1_in_rule__XBlockExpression__Group__036100 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group__1__Impl_in_rule__XBlockExpression__Group__136158 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000180BFC536177L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group__2_in_rule__XBlockExpression__Group__136161 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_68_in_rule__XBlockExpression__Group__1__Impl36189 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group__2__Impl_in_rule__XBlockExpression__Group__236220 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000180BFC536177L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group__3_in_rule__XBlockExpression__Group__236223 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group_2__0_in_rule__XBlockExpression__Group__2__Impl36250 = new BitSet(new long[]{0x10C0800FFFFF01F2L,0x0000180BFC536157L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group__3__Impl_in_rule__XBlockExpression__Group__336281 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_69_in_rule__XBlockExpression__Group__3__Impl36309 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group_2__0__Impl_in_rule__XBlockExpression__Group_2__036348 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group_2__1_in_rule__XBlockExpression__Group_2__036351 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__ExpressionsAssignment_2_0_in_rule__XBlockExpression__Group_2__0__Impl36378 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group_2__1__Impl_in_rule__XBlockExpression__Group_2__136408 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__XBlockExpression__Group_2__1__Impl36437 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group__0__Impl_in_rule__XVariableDeclaration__Group__036474 = new BitSet(new long[]{0x0000000000000000L,0x0000080000000001L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group__1_in_rule__XVariableDeclaration__Group__036477 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group__1__Impl_in_rule__XVariableDeclaration__Group__136535 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group__2_in_rule__XVariableDeclaration__Group__136538 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Alternatives_1_in_rule__XVariableDeclaration__Group__1__Impl36565 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group__2__Impl_in_rule__XVariableDeclaration__Group__236595 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group__3_in_rule__XVariableDeclaration__Group__236598 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Alternatives_2_in_rule__XVariableDeclaration__Group__2__Impl36625 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group__3__Impl_in_rule__XVariableDeclaration__Group__336655 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_3__0_in_rule__XVariableDeclaration__Group__3__Impl36682 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_2_0__0__Impl_in_rule__XVariableDeclaration__Group_2_0__036721 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_2_0_0__0_in_rule__XVariableDeclaration__Group_2_0__0__Impl36748 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_2_0_0__0__Impl_in_rule__XVariableDeclaration__Group_2_0_0__036780 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_2_0_0__1_in_rule__XVariableDeclaration__Group_2_0_0__036783 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__TypeAssignment_2_0_0_0_in_rule__XVariableDeclaration__Group_2_0_0__0__Impl36810 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_2_0_0__1__Impl_in_rule__XVariableDeclaration__Group_2_0_0__136840 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__NameAssignment_2_0_0_1_in_rule__XVariableDeclaration__Group_2_0_0__1__Impl36867 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_3__0__Impl_in_rule__XVariableDeclaration__Group_3__036901 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_3__1_in_rule__XVariableDeclaration__Group_3__036904 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_13_in_rule__XVariableDeclaration__Group_3__0__Impl36932 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_3__1__Impl_in_rule__XVariableDeclaration__Group_3__136963 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__RightAssignment_3_1_in_rule__XVariableDeclaration__Group_3__1__Impl36990 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmFormalParameter__Group__0__Impl_in_rule__JvmFormalParameter__Group__037024 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
-    public static final BitSet FOLLOW_rule__JvmFormalParameter__Group__1_in_rule__JvmFormalParameter__Group__037027 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmFormalParameter__ParameterTypeAssignment_0_in_rule__JvmFormalParameter__Group__0__Impl37054 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmFormalParameter__Group__1__Impl_in_rule__JvmFormalParameter__Group__137085 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmFormalParameter__NameAssignment_1_in_rule__JvmFormalParameter__Group__1__Impl37112 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FullJvmFormalParameter__Group__0__Impl_in_rule__FullJvmFormalParameter__Group__037146 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__FullJvmFormalParameter__Group__1_in_rule__FullJvmFormalParameter__Group__037149 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FullJvmFormalParameter__ParameterTypeAssignment_0_in_rule__FullJvmFormalParameter__Group__0__Impl37176 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FullJvmFormalParameter__Group__1__Impl_in_rule__FullJvmFormalParameter__Group__137206 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FullJvmFormalParameter__NameAssignment_1_in_rule__FullJvmFormalParameter__Group__1__Impl37233 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group__0__Impl_in_rule__XFeatureCall__Group__037267 = new BitSet(new long[]{0x0000800FFFFF0010L,0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group__1_in_rule__XFeatureCall__Group__037270 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group__1__Impl_in_rule__XFeatureCall__Group__137328 = new BitSet(new long[]{0x0000800FFFFF0010L,0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group__2_in_rule__XFeatureCall__Group__137331 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1__0_in_rule__XFeatureCall__Group__1__Impl37358 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group__2__Impl_in_rule__XFeatureCall__Group__237389 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004100L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group__3_in_rule__XFeatureCall__Group__237392 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__FeatureAssignment_2_in_rule__XFeatureCall__Group__2__Impl37419 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group__3__Impl_in_rule__XFeatureCall__Group__337449 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004100L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group__4_in_rule__XFeatureCall__Group__337452 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3__0_in_rule__XFeatureCall__Group__3__Impl37479 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group__4__Impl_in_rule__XFeatureCall__Group__437510 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_4_in_rule__XFeatureCall__Group__4__Impl37537 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1__0__Impl_in_rule__XFeatureCall__Group_1__037578 = new BitSet(new long[]{0x0008000FE0800010L,0x000000A000001900L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1__1_in_rule__XFeatureCall__Group_1__037581 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__XFeatureCall__Group_1__0__Impl37609 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1__1__Impl_in_rule__XFeatureCall__Group_1__137640 = new BitSet(new long[]{0x0000400000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1__2_in_rule__XFeatureCall__Group_1__137643 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__TypeArgumentsAssignment_1_1_in_rule__XFeatureCall__Group_1__1__Impl37670 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1__2__Impl_in_rule__XFeatureCall__Group_1__237700 = new BitSet(new long[]{0x0000400000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1__3_in_rule__XFeatureCall__Group_1__237703 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1_2__0_in_rule__XFeatureCall__Group_1__2__Impl37730 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1__3__Impl_in_rule__XFeatureCall__Group_1__337761 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rule__XFeatureCall__Group_1__3__Impl37789 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1_2__0__Impl_in_rule__XFeatureCall__Group_1_2__037828 = new BitSet(new long[]{0x0008000FE0800010L,0x000000A000001900L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1_2__1_in_rule__XFeatureCall__Group_1_2__037831 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XFeatureCall__Group_1_2__0__Impl37859 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1_2__1__Impl_in_rule__XFeatureCall__Group_1_2__137890 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__TypeArgumentsAssignment_1_2_1_in_rule__XFeatureCall__Group_1_2__1__Impl37917 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3__0__Impl_in_rule__XFeatureCall__Group_3__037951 = new BitSet(new long[]{0x10C8800FFFFF01F0L,0x0000148BFC537B56L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3__1_in_rule__XFeatureCall__Group_3__037954 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__ExplicitOperationCallAssignment_3_0_in_rule__XFeatureCall__Group_3__0__Impl37981 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3__1__Impl_in_rule__XFeatureCall__Group_3__138011 = new BitSet(new long[]{0x10C8800FFFFF01F0L,0x0000148BFC537B56L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3__2_in_rule__XFeatureCall__Group_3__138014 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Alternatives_3_1_in_rule__XFeatureCall__Group_3__1__Impl38041 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3__2__Impl_in_rule__XFeatureCall__Group_3__238072 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__XFeatureCall__Group_3__2__Impl38100 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3_1_1__0__Impl_in_rule__XFeatureCall__Group_3_1_1__038137 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3_1_1__1_in_rule__XFeatureCall__Group_3_1_1__038140 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0_in_rule__XFeatureCall__Group_3_1_1__0__Impl38167 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3_1_1__1__Impl_in_rule__XFeatureCall__Group_3_1_1__138197 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3_1_1_1__0_in_rule__XFeatureCall__Group_3_1_1__1__Impl38224 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3_1_1_1__0__Impl_in_rule__XFeatureCall__Group_3_1_1_1__038259 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3_1_1_1__1_in_rule__XFeatureCall__Group_3_1_1_1__038262 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XFeatureCall__Group_3_1_1_1__0__Impl38290 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3_1_1_1__1__Impl_in_rule__XFeatureCall__Group_3_1_1_1__138321 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1_in_rule__XFeatureCall__Group_3_1_1_1__1__Impl38348 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__0__Impl_in_rule__XConstructorCall__Group__038382 = new BitSet(new long[]{0x0000000000000000L,0x0000000010000000L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__1_in_rule__XConstructorCall__Group__038385 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__1__Impl_in_rule__XConstructorCall__Group__138443 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__2_in_rule__XConstructorCall__Group__138446 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_92_in_rule__XConstructorCall__Group__1__Impl38474 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__2__Impl_in_rule__XConstructorCall__Group__238505 = new BitSet(new long[]{0x0000800000000000L,0x0000000000004100L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__3_in_rule__XConstructorCall__Group__238508 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__ConstructorAssignment_2_in_rule__XConstructorCall__Group__2__Impl38535 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__3__Impl_in_rule__XConstructorCall__Group__338565 = new BitSet(new long[]{0x0000800000000000L,0x0000000000004100L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__4_in_rule__XConstructorCall__Group__338568 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__0_in_rule__XConstructorCall__Group__3__Impl38595 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__4__Impl_in_rule__XConstructorCall__Group__438626 = new BitSet(new long[]{0x0000800000000000L,0x0000000000004100L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__5_in_rule__XConstructorCall__Group__438629 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4__0_in_rule__XConstructorCall__Group__4__Impl38656 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__5__Impl_in_rule__XConstructorCall__Group__538687 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__ArgumentsAssignment_5_in_rule__XConstructorCall__Group__5__Impl38714 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__0__Impl_in_rule__XConstructorCall__Group_3__038757 = new BitSet(new long[]{0x0008000FE0800010L,0x000000A000001900L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__1_in_rule__XConstructorCall__Group_3__038760 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__XConstructorCall__Group_3__0__Impl38789 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__1__Impl_in_rule__XConstructorCall__Group_3__138821 = new BitSet(new long[]{0x0000400000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__2_in_rule__XConstructorCall__Group_3__138824 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__TypeArgumentsAssignment_3_1_in_rule__XConstructorCall__Group_3__1__Impl38851 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__2__Impl_in_rule__XConstructorCall__Group_3__238881 = new BitSet(new long[]{0x0000400000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__3_in_rule__XConstructorCall__Group_3__238884 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3_2__0_in_rule__XConstructorCall__Group_3__2__Impl38911 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__3__Impl_in_rule__XConstructorCall__Group_3__338942 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rule__XConstructorCall__Group_3__3__Impl38970 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3_2__0__Impl_in_rule__XConstructorCall__Group_3_2__039009 = new BitSet(new long[]{0x0008000FE0800010L,0x000000A000001900L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3_2__1_in_rule__XConstructorCall__Group_3_2__039012 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XConstructorCall__Group_3_2__0__Impl39040 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3_2__1__Impl_in_rule__XConstructorCall__Group_3_2__139071 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__TypeArgumentsAssignment_3_2_1_in_rule__XConstructorCall__Group_3_2__1__Impl39098 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4__0__Impl_in_rule__XConstructorCall__Group_4__039132 = new BitSet(new long[]{0x10C8800FFFFF01F0L,0x0000148BFC537B56L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4__1_in_rule__XConstructorCall__Group_4__039135 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0_in_rule__XConstructorCall__Group_4__0__Impl39162 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4__1__Impl_in_rule__XConstructorCall__Group_4__139192 = new BitSet(new long[]{0x10C8800FFFFF01F0L,0x0000148BFC537B56L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4__2_in_rule__XConstructorCall__Group_4__139195 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Alternatives_4_1_in_rule__XConstructorCall__Group_4__1__Impl39222 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4__2__Impl_in_rule__XConstructorCall__Group_4__239253 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__XConstructorCall__Group_4__2__Impl39281 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4_1_1__0__Impl_in_rule__XConstructorCall__Group_4_1_1__039318 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4_1_1__1_in_rule__XConstructorCall__Group_4_1_1__039321 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__ArgumentsAssignment_4_1_1_0_in_rule__XConstructorCall__Group_4_1_1__0__Impl39348 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4_1_1__1__Impl_in_rule__XConstructorCall__Group_4_1_1__139378 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4_1_1_1__0_in_rule__XConstructorCall__Group_4_1_1__1__Impl39405 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4_1_1_1__0__Impl_in_rule__XConstructorCall__Group_4_1_1_1__039440 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4_1_1_1__1_in_rule__XConstructorCall__Group_4_1_1_1__039443 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XConstructorCall__Group_4_1_1_1__0__Impl39471 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4_1_1_1__1__Impl_in_rule__XConstructorCall__Group_4_1_1_1__139502 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1_in_rule__XConstructorCall__Group_4_1_1_1__1__Impl39529 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBooleanLiteral__Group__0__Impl_in_rule__XBooleanLiteral__Group__039563 = new BitSet(new long[]{0x0000000000000000L,0x0000100000000004L});
-    public static final BitSet FOLLOW_rule__XBooleanLiteral__Group__1_in_rule__XBooleanLiteral__Group__039566 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBooleanLiteral__Group__1__Impl_in_rule__XBooleanLiteral__Group__139624 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBooleanLiteral__Alternatives_1_in_rule__XBooleanLiteral__Group__1__Impl39651 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XNullLiteral__Group__0__Impl_in_rule__XNullLiteral__Group__039685 = new BitSet(new long[]{0x0000000000000000L,0x0000000020000000L});
-    public static final BitSet FOLLOW_rule__XNullLiteral__Group__1_in_rule__XNullLiteral__Group__039688 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XNullLiteral__Group__1__Impl_in_rule__XNullLiteral__Group__139746 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_93_in_rule__XNullLiteral__Group__1__Impl39774 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XNumberLiteral__Group__0__Impl_in_rule__XNumberLiteral__Group__039809 = new BitSet(new long[]{0x00000000000000E0L});
-    public static final BitSet FOLLOW_rule__XNumberLiteral__Group__1_in_rule__XNumberLiteral__Group__039812 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XNumberLiteral__Group__1__Impl_in_rule__XNumberLiteral__Group__139870 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XNumberLiteral__ValueAssignment_1_in_rule__XNumberLiteral__Group__1__Impl39897 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XStringLiteral__Group__0__Impl_in_rule__XStringLiteral__Group__039931 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__XStringLiteral__Group__1_in_rule__XStringLiteral__Group__039934 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XStringLiteral__Group__1__Impl_in_rule__XStringLiteral__Group__139992 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XStringLiteral__ValueAssignment_1_in_rule__XStringLiteral__Group__1__Impl40019 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__0__Impl_in_rule__XTypeLiteral__Group__040053 = new BitSet(new long[]{0x00000000000001E0L,0x0000100060006004L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__1_in_rule__XTypeLiteral__Group__040056 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__1__Impl_in_rule__XTypeLiteral__Group__140114 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__2_in_rule__XTypeLiteral__Group__140117 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_94_in_rule__XTypeLiteral__Group__1__Impl40145 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__2__Impl_in_rule__XTypeLiteral__Group__240176 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__3_in_rule__XTypeLiteral__Group__240179 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__XTypeLiteral__Group__2__Impl40207 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__3__Impl_in_rule__XTypeLiteral__Group__340238 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004200L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__4_in_rule__XTypeLiteral__Group__340241 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__TypeAssignment_3_in_rule__XTypeLiteral__Group__3__Impl40268 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__4__Impl_in_rule__XTypeLiteral__Group__440298 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004200L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__5_in_rule__XTypeLiteral__Group__440301 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__ArrayDimensionsAssignment_4_in_rule__XTypeLiteral__Group__4__Impl40328 = new BitSet(new long[]{0x0000000000000002L,0x0000000000004000L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__5__Impl_in_rule__XTypeLiteral__Group__540359 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__XTypeLiteral__Group__5__Impl40387 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XThrowExpression__Group__0__Impl_in_rule__XThrowExpression__Group__040430 = new BitSet(new long[]{0x0000000000000000L,0x0000000080000000L});
-    public static final BitSet FOLLOW_rule__XThrowExpression__Group__1_in_rule__XThrowExpression__Group__040433 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XThrowExpression__Group__1__Impl_in_rule__XThrowExpression__Group__140491 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XThrowExpression__Group__2_in_rule__XThrowExpression__Group__140494 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_95_in_rule__XThrowExpression__Group__1__Impl40522 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XThrowExpression__Group__2__Impl_in_rule__XThrowExpression__Group__240553 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XThrowExpression__ExpressionAssignment_2_in_rule__XThrowExpression__Group__2__Impl40580 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XReturnExpression__Group__0__Impl_in_rule__XReturnExpression__Group__040616 = new BitSet(new long[]{0x0000000000000000L,0x0000000100000000L});
-    public static final BitSet FOLLOW_rule__XReturnExpression__Group__1_in_rule__XReturnExpression__Group__040619 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XReturnExpression__Group__1__Impl_in_rule__XReturnExpression__Group__140677 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XReturnExpression__Group__2_in_rule__XReturnExpression__Group__140680 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_96_in_rule__XReturnExpression__Group__1__Impl40708 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XReturnExpression__Group__2__Impl_in_rule__XReturnExpression__Group__240739 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XReturnExpression__ExpressionAssignment_2_in_rule__XReturnExpression__Group__2__Impl40766 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group__0__Impl_in_rule__XTryCatchFinallyExpression__Group__040803 = new BitSet(new long[]{0x0000000000000000L,0x0000000200000000L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group__1_in_rule__XTryCatchFinallyExpression__Group__040806 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group__1__Impl_in_rule__XTryCatchFinallyExpression__Group__140864 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group__2_in_rule__XTryCatchFinallyExpression__Group__140867 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_97_in_rule__XTryCatchFinallyExpression__Group__1__Impl40895 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group__2__Impl_in_rule__XTryCatchFinallyExpression__Group__240926 = new BitSet(new long[]{0x0000000000000000L,0x0000001400000000L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group__3_in_rule__XTryCatchFinallyExpression__Group__240929 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__ExpressionAssignment_2_in_rule__XTryCatchFinallyExpression__Group__2__Impl40956 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group__3__Impl_in_rule__XTryCatchFinallyExpression__Group__340986 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Alternatives_3_in_rule__XTryCatchFinallyExpression__Group__3__Impl41013 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0__0__Impl_in_rule__XTryCatchFinallyExpression__Group_3_0__041051 = new BitSet(new long[]{0x0000000000000000L,0x0000000400000000L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0__1_in_rule__XTryCatchFinallyExpression__Group_3_0__041054 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0_in_rule__XTryCatchFinallyExpression__Group_3_0__0__Impl41083 = new BitSet(new long[]{0x0000000000000002L,0x0000001000000000L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0_in_rule__XTryCatchFinallyExpression__Group_3_0__0__Impl41095 = new BitSet(new long[]{0x0000000000000002L,0x0000001000000000L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0__1__Impl_in_rule__XTryCatchFinallyExpression__Group_3_0__141128 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__0_in_rule__XTryCatchFinallyExpression__Group_3_0__1__Impl41155 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl_in_rule__XTryCatchFinallyExpression__Group_3_0_1__041190 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__1_in_rule__XTryCatchFinallyExpression__Group_3_0_1__041193 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_98_in_rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl41222 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl_in_rule__XTryCatchFinallyExpression__Group_3_0_1__141254 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1_in_rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl41281 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_1__0__Impl_in_rule__XTryCatchFinallyExpression__Group_3_1__041315 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_1__1_in_rule__XTryCatchFinallyExpression__Group_3_1__041318 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_98_in_rule__XTryCatchFinallyExpression__Group_3_1__0__Impl41346 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_1__1__Impl_in_rule__XTryCatchFinallyExpression__Group_3_1__141377 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1_in_rule__XTryCatchFinallyExpression__Group_3_1__1__Impl41404 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group__0__Impl_in_rule__XSynchronizedExpression__Group__041438 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group__1_in_rule__XSynchronizedExpression__Group__041441 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group_0__0_in_rule__XSynchronizedExpression__Group__0__Impl41468 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group__1__Impl_in_rule__XSynchronizedExpression__Group__141498 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000200L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group__2_in_rule__XSynchronizedExpression__Group__141501 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__ParamAssignment_1_in_rule__XSynchronizedExpression__Group__1__Impl41528 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group__2__Impl_in_rule__XSynchronizedExpression__Group__241558 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group__3_in_rule__XSynchronizedExpression__Group__241561 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__XSynchronizedExpression__Group__2__Impl41589 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group__3__Impl_in_rule__XSynchronizedExpression__Group__341620 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__ExpressionAssignment_3_in_rule__XSynchronizedExpression__Group__3__Impl41647 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group_0__0__Impl_in_rule__XSynchronizedExpression__Group_0__041685 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group_0_0__0_in_rule__XSynchronizedExpression__Group_0__0__Impl41712 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group_0_0__0__Impl_in_rule__XSynchronizedExpression__Group_0_0__041744 = new BitSet(new long[]{0x0000000000000000L,0x0000000800000000L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group_0_0__1_in_rule__XSynchronizedExpression__Group_0_0__041747 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group_0_0__1__Impl_in_rule__XSynchronizedExpression__Group_0_0__141805 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group_0_0__2_in_rule__XSynchronizedExpression__Group_0_0__141808 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_99_in_rule__XSynchronizedExpression__Group_0_0__1__Impl41836 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group_0_0__2__Impl_in_rule__XSynchronizedExpression__Group_0_0__241867 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__XSynchronizedExpression__Group_0_0__2__Impl41895 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCatchClause__Group__0__Impl_in_rule__XCatchClause__Group__041932 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__XCatchClause__Group__1_in_rule__XCatchClause__Group__041935 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_100_in_rule__XCatchClause__Group__0__Impl41964 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCatchClause__Group__1__Impl_in_rule__XCatchClause__Group__141996 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
-    public static final BitSet FOLLOW_rule__XCatchClause__Group__2_in_rule__XCatchClause__Group__141999 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__XCatchClause__Group__1__Impl42027 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCatchClause__Group__2__Impl_in_rule__XCatchClause__Group__242058 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000200L});
-    public static final BitSet FOLLOW_rule__XCatchClause__Group__3_in_rule__XCatchClause__Group__242061 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCatchClause__DeclaredParamAssignment_2_in_rule__XCatchClause__Group__2__Impl42088 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCatchClause__Group__3__Impl_in_rule__XCatchClause__Group__342118 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
-    public static final BitSet FOLLOW_rule__XCatchClause__Group__4_in_rule__XCatchClause__Group__342121 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__XCatchClause__Group__3__Impl42149 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCatchClause__Group__4__Impl_in_rule__XCatchClause__Group__442180 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCatchClause__ExpressionAssignment_4_in_rule__XCatchClause__Group__4__Impl42207 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group__0__Impl_in_rule__QualifiedName__Group__042247 = new BitSet(new long[]{0x8000000000000000L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group__1_in_rule__QualifiedName__Group__042250 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__QualifiedName__Group__0__Impl42277 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group__1__Impl_in_rule__QualifiedName__Group__142306 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group_1__0_in_rule__QualifiedName__Group__1__Impl42333 = new BitSet(new long[]{0x8000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group_1__0__Impl_in_rule__QualifiedName__Group_1__042368 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group_1__1_in_rule__QualifiedName__Group_1__042371 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_rule__QualifiedName__Group_1__0__Impl42400 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group_1__1__Impl_in_rule__QualifiedName__Group_1__142432 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__QualifiedName__Group_1__1__Impl42459 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Number__Group_1__0__Impl_in_rule__Number__Group_1__042492 = new BitSet(new long[]{0x8000000000000000L});
-    public static final BitSet FOLLOW_rule__Number__Group_1__1_in_rule__Number__Group_1__042495 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Number__Alternatives_1_0_in_rule__Number__Group_1__0__Impl42522 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Number__Group_1__1__Impl_in_rule__Number__Group_1__142552 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Number__Group_1_1__0_in_rule__Number__Group_1__1__Impl42579 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Number__Group_1_1__0__Impl_in_rule__Number__Group_1_1__042614 = new BitSet(new long[]{0x00000000000000C0L});
-    public static final BitSet FOLLOW_rule__Number__Group_1_1__1_in_rule__Number__Group_1_1__042617 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_rule__Number__Group_1_1__0__Impl42645 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Number__Group_1_1__1__Impl_in_rule__Number__Group_1_1__142676 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Number__Alternatives_1_1_1_in_rule__Number__Group_1_1__1__Impl42703 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0__0__Impl_in_rule__JvmTypeReference__Group_0__042738 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0__1_in_rule__JvmTypeReference__Group_0__042741 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmParameterizedTypeReference_in_rule__JvmTypeReference__Group_0__0__Impl42768 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0__1__Impl_in_rule__JvmTypeReference__Group_0__142797 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0_1__0_in_rule__JvmTypeReference__Group_0__1__Impl42824 = new BitSet(new long[]{0x0000000000000002L,0x0000000000004000L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0_1__0__Impl_in_rule__JvmTypeReference__Group_0_1__042859 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0_1_0__0_in_rule__JvmTypeReference__Group_0_1__0__Impl42886 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0_1_0__0__Impl_in_rule__JvmTypeReference__Group_0_1_0__042918 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0_1_0__1_in_rule__JvmTypeReference__Group_0_1_0__042921 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0_1_0__1__Impl_in_rule__JvmTypeReference__Group_0_1_0__142979 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleArrayBrackets_in_rule__JvmTypeReference__Group_0_1_0__1__Impl43006 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ArrayBrackets__Group__0__Impl_in_rule__ArrayBrackets__Group__043039 = new BitSet(new long[]{0x0000000000000000L,0x0000000000008000L});
-    public static final BitSet FOLLOW_rule__ArrayBrackets__Group__1_in_rule__ArrayBrackets__Group__043042 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_78_in_rule__ArrayBrackets__Group__0__Impl43070 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ArrayBrackets__Group__1__Impl_in_rule__ArrayBrackets__Group__143101 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_79_in_rule__ArrayBrackets__Group__1__Impl43129 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group__0__Impl_in_rule__XFunctionTypeRef__Group__043164 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group__1_in_rule__XFunctionTypeRef__Group__043167 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0__0_in_rule__XFunctionTypeRef__Group__0__Impl43194 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group__1__Impl_in_rule__XFunctionTypeRef__Group__143225 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group__2_in_rule__XFunctionTypeRef__Group__143228 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__XFunctionTypeRef__Group__1__Impl43256 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group__2__Impl_in_rule__XFunctionTypeRef__Group__243287 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__ReturnTypeAssignment_2_in_rule__XFunctionTypeRef__Group__2__Impl43314 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0__0__Impl_in_rule__XFunctionTypeRef__Group_0__043350 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001B00L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0__1_in_rule__XFunctionTypeRef__Group_0__043353 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__XFunctionTypeRef__Group_0__0__Impl43381 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0__1__Impl_in_rule__XFunctionTypeRef__Group_0__143412 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001B00L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0__2_in_rule__XFunctionTypeRef__Group_0__143415 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0_1__0_in_rule__XFunctionTypeRef__Group_0__1__Impl43442 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0__2__Impl_in_rule__XFunctionTypeRef__Group_0__243473 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__XFunctionTypeRef__Group_0__2__Impl43501 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0_1__0__Impl_in_rule__XFunctionTypeRef__Group_0_1__043538 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0_1__1_in_rule__XFunctionTypeRef__Group_0_1__043541 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0_in_rule__XFunctionTypeRef__Group_0_1__0__Impl43568 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0_1__1__Impl_in_rule__XFunctionTypeRef__Group_0_1__143598 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0_1_1__0_in_rule__XFunctionTypeRef__Group_0_1__1__Impl43625 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0_1_1__0__Impl_in_rule__XFunctionTypeRef__Group_0_1_1__043660 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0_1_1__1_in_rule__XFunctionTypeRef__Group_0_1_1__043663 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XFunctionTypeRef__Group_0_1_1__0__Impl43691 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0_1_1__1__Impl_in_rule__XFunctionTypeRef__Group_0_1_1__143722 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1_in_rule__XFunctionTypeRef__Group_0_1_1__1__Impl43749 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group__0__Impl_in_rule__JvmParameterizedTypeReference__Group__043783 = new BitSet(new long[]{0x0000800000000000L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group__1_in_rule__JvmParameterizedTypeReference__Group__043786 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__TypeAssignment_0_in_rule__JvmParameterizedTypeReference__Group__0__Impl43813 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group__1__Impl_in_rule__JvmParameterizedTypeReference__Group__143843 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__0_in_rule__JvmParameterizedTypeReference__Group__1__Impl43870 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1__043905 = new BitSet(new long[]{0x0008000FE0800010L,0x000000A000001900L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__1_in_rule__JvmParameterizedTypeReference__Group_1__043908 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__JvmParameterizedTypeReference__Group_1__0__Impl43937 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1__143969 = new BitSet(new long[]{0x0000400000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__2_in_rule__JvmParameterizedTypeReference__Group_1__143972 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1_in_rule__JvmParameterizedTypeReference__Group_1__1__Impl43999 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__2__Impl_in_rule__JvmParameterizedTypeReference__Group_1__244029 = new BitSet(new long[]{0x0000400000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__3_in_rule__JvmParameterizedTypeReference__Group_1__244032 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_2__0_in_rule__JvmParameterizedTypeReference__Group_1__2__Impl44059 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__3__Impl_in_rule__JvmParameterizedTypeReference__Group_1__344090 = new BitSet(new long[]{0x8000000000000000L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__4_in_rule__JvmParameterizedTypeReference__Group_1__344093 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rule__JvmParameterizedTypeReference__Group_1__3__Impl44121 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__4__Impl_in_rule__JvmParameterizedTypeReference__Group_1__444152 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__0_in_rule__JvmParameterizedTypeReference__Group_1__4__Impl44179 = new BitSet(new long[]{0x8000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_2__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_2__044220 = new BitSet(new long[]{0x0008000FE0800010L,0x000000A000001900L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_2__1_in_rule__JvmParameterizedTypeReference__Group_1_2__044223 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__JvmParameterizedTypeReference__Group_1_2__0__Impl44251 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_2__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_2__144282 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1_in_rule__JvmParameterizedTypeReference__Group_1_2__1__Impl44309 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4__044343 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__1_in_rule__JvmParameterizedTypeReference__Group_1_4__044346 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0__0_in_rule__JvmParameterizedTypeReference__Group_1_4__0__Impl44373 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4__144403 = new BitSet(new long[]{0x0000800000000000L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__2_in_rule__JvmParameterizedTypeReference__Group_1_4__144406 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1_in_rule__JvmParameterizedTypeReference__Group_1_4__1__Impl44433 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__2__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4__244463 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__0_in_rule__JvmParameterizedTypeReference__Group_1_4__2__Impl44490 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_0__044527 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0_0__0_in_rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl44554 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_0_0__044586 = new BitSet(new long[]{0x8000000000000000L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0_0__1_in_rule__JvmParameterizedTypeReference__Group_1_4_0_0__044589 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_0_0__144647 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl44675 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2__044710 = new BitSet(new long[]{0x0008000FE0800010L,0x000000A000001900L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__1_in_rule__JvmParameterizedTypeReference__Group_1_4_2__044713 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl44742 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2__144774 = new BitSet(new long[]{0x0000400000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__2_in_rule__JvmParameterizedTypeReference__Group_1_4_2__144777 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1_in_rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl44804 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2__244834 = new BitSet(new long[]{0x0000400000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__3_in_rule__JvmParameterizedTypeReference__Group_1_4_2__244837 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2_2__0_in_rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl44864 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2__344895 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl44923 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__044962 = new BitSet(new long[]{0x0008000FE0800010L,0x000000A000001900L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2_2__1_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__044965 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl44993 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__145024 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl45051 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group__0__Impl_in_rule__JvmWildcardTypeReference__Group__045085 = new BitSet(new long[]{0x0008000FE0800010L,0x000000A000001900L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group__1_in_rule__JvmWildcardTypeReference__Group__045088 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group__1__Impl_in_rule__JvmWildcardTypeReference__Group__145146 = new BitSet(new long[]{0x0000000000010000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group__2_in_rule__JvmWildcardTypeReference__Group__145149 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_101_in_rule__JvmWildcardTypeReference__Group__1__Impl45177 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group__2__Impl_in_rule__JvmWildcardTypeReference__Group__245208 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Alternatives_2_in_rule__JvmWildcardTypeReference__Group__2__Impl45235 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group_2_0__0__Impl_in_rule__JvmWildcardTypeReference__Group_2_0__045272 = new BitSet(new long[]{0x0000000000000000L,0x0000004000000000L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group_2_0__1_in_rule__JvmWildcardTypeReference__Group_2_0__045275 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0_in_rule__JvmWildcardTypeReference__Group_2_0__0__Impl45302 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group_2_0__1__Impl_in_rule__JvmWildcardTypeReference__Group_2_0__145332 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1_in_rule__JvmWildcardTypeReference__Group_2_0__1__Impl45359 = new BitSet(new long[]{0x0000000000000002L,0x0000004000000000L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group_2_1__0__Impl_in_rule__JvmWildcardTypeReference__Group_2_1__045394 = new BitSet(new long[]{0x0000000000000000L,0x0000004000000000L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group_2_1__1_in_rule__JvmWildcardTypeReference__Group_2_1__045397 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0_in_rule__JvmWildcardTypeReference__Group_2_1__0__Impl45424 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group_2_1__1__Impl_in_rule__JvmWildcardTypeReference__Group_2_1__145454 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1_in_rule__JvmWildcardTypeReference__Group_2_1__1__Impl45481 = new BitSet(new long[]{0x0000000000000002L,0x0000004000000000L});
-    public static final BitSet FOLLOW_rule__JvmUpperBound__Group__0__Impl_in_rule__JvmUpperBound__Group__045516 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
-    public static final BitSet FOLLOW_rule__JvmUpperBound__Group__1_in_rule__JvmUpperBound__Group__045519 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_16_in_rule__JvmUpperBound__Group__0__Impl45547 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmUpperBound__Group__1__Impl_in_rule__JvmUpperBound__Group__145578 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmUpperBound__TypeReferenceAssignment_1_in_rule__JvmUpperBound__Group__1__Impl45605 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmUpperBoundAnded__Group__0__Impl_in_rule__JvmUpperBoundAnded__Group__045639 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
-    public static final BitSet FOLLOW_rule__JvmUpperBoundAnded__Group__1_in_rule__JvmUpperBoundAnded__Group__045642 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_102_in_rule__JvmUpperBoundAnded__Group__0__Impl45670 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmUpperBoundAnded__Group__1__Impl_in_rule__JvmUpperBoundAnded__Group__145701 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmUpperBoundAnded__TypeReferenceAssignment_1_in_rule__JvmUpperBoundAnded__Group__1__Impl45728 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmLowerBound__Group__0__Impl_in_rule__JvmLowerBound__Group__045762 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
-    public static final BitSet FOLLOW_rule__JvmLowerBound__Group__1_in_rule__JvmLowerBound__Group__045765 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_65_in_rule__JvmLowerBound__Group__0__Impl45793 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmLowerBound__Group__1__Impl_in_rule__JvmLowerBound__Group__145824 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmLowerBound__TypeReferenceAssignment_1_in_rule__JvmLowerBound__Group__1__Impl45851 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmLowerBoundAnded__Group__0__Impl_in_rule__JvmLowerBoundAnded__Group__045885 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
-    public static final BitSet FOLLOW_rule__JvmLowerBoundAnded__Group__1_in_rule__JvmLowerBoundAnded__Group__045888 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_102_in_rule__JvmLowerBoundAnded__Group__0__Impl45916 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmLowerBoundAnded__Group__1__Impl_in_rule__JvmLowerBoundAnded__Group__145947 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmLowerBoundAnded__TypeReferenceAssignment_1_in_rule__JvmLowerBoundAnded__Group__1__Impl45974 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedNameWithWildcard__Group__0__Impl_in_rule__QualifiedNameWithWildcard__Group__046010 = new BitSet(new long[]{0x8000000000000000L});
-    public static final BitSet FOLLOW_rule__QualifiedNameWithWildcard__Group__1_in_rule__QualifiedNameWithWildcard__Group__046013 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__QualifiedNameWithWildcard__Group__0__Impl46040 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedNameWithWildcard__Group__1__Impl_in_rule__QualifiedNameWithWildcard__Group__146069 = new BitSet(new long[]{0x0100000000000000L});
-    public static final BitSet FOLLOW_rule__QualifiedNameWithWildcard__Group__2_in_rule__QualifiedNameWithWildcard__Group__146072 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_rule__QualifiedNameWithWildcard__Group__1__Impl46100 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedNameWithWildcard__Group__2__Impl_in_rule__QualifiedNameWithWildcard__Group__246131 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_rule__QualifiedNameWithWildcard__Group__2__Impl46159 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__CheckCatalog__PackageNameAssignment_246202 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXImportSection_in_rule__CheckCatalog__ImportsAssignment_346233 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_103_in_rule__CheckCatalog__FinalAssignment_446269 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__CheckCatalog__NameAssignment_646308 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__CheckCatalog__GrammarAssignment_7_246343 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCategory_in_rule__CheckCatalog__CategoriesAssignment_9_046378 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImplementation_in_rule__CheckCatalog__ImplementationsAssignment_9_146409 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCheck_in_rule__CheckCatalog__ChecksAssignment_9_246440 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMember_in_rule__CheckCatalog__MembersAssignment_9_346471 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXImportDeclaration_in_rule__XImportSection__ImportDeclarationsAssignment_146502 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__XImportDeclaration__ImportedTypeAssignment_1_046537 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedNameWithWildcard_in_rule__XImportDeclaration__ImportedNamespaceAssignment_1_146572 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__Category__IdAssignment_146603 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__Category__LabelAssignment_246634 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCheck_in_rule__Category__ChecksAssignment_446665 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSeverityRange_in_rule__Check__SeverityRangeAssignment_046696 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_103_in_rule__Check__FinalAssignment_146732 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTriggerKind_in_rule__Check__KindAssignment_246771 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSeverityKind_in_rule__Check__DefaultSeverityAssignment_346802 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__Check__IdAssignment_446833 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__Check__LabelAssignment_546864 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFormalParameter_in_rule__Check__FormalParametersAssignment_6_1_046895 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFormalParameter_in_rule__Check__FormalParametersAssignment_6_1_1_146926 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__Check__GivenMessageAssignment_7_146957 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleContext_in_rule__Check__ContextsAssignment_8_0_146988 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleContext_in_rule__Check__ContextsAssignment_8_147019 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSeverityKind_in_rule__SeverityRange__MinSeverityAssignment_347050 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSeverityKind_in_rule__SeverityRange__MaxSeverityAssignment_547081 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotation_in_rule__Member__AnnotationsAssignment_047112 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__Member__TypeAssignment_147143 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__Member__NameAssignment_247174 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXOrExpression_in_rule__Member__ValueAssignment_3_147205 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__Implementation__NameAssignment_147236 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleContext_in_rule__Implementation__ContextAssignment_247267 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmParameterizedTypeReference_in_rule__FormalParameter__TypeAssignment_047298 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__FormalParameter__NameAssignment_147329 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXFormalParameterDefaultValueLiteral_in_rule__FormalParameter__RightAssignment_347360 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__FormalParameter__LabelAssignment_447391 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpUnary_in_rule__XConstantUnaryOperation__FeatureAssignment_0_147426 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstantUnaryOperation_in_rule__XConstantUnaryOperation__OperandAssignment_0_247461 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstantUnaryOperation_in_rule__XConstantListLiteral__ElementsAssignment_3_047492 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstantUnaryOperation_in_rule__XConstantListLiteral__ElementsAssignment_3_1_147523 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleContextVariable_in_rule__Context__ContextVariableAssignment_147554 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBlockExpression_in_rule__Context__ConstraintAssignment_247585 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__ContextVariable__TypeAssignment_047616 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__ContextVariable__NameAssignment_147647 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XGuardExpression__GuardAssignment_247678 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__XIssueExpression__CheckAssignment_247713 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__XIssueExpression__MarkerFeatureAssignment_3_1_0_147752 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XIssueExpression__MarkerObjectAssignment_3_1_1_047787 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFeatureCallID_in_rule__XIssueExpression__MarkerFeatureAssignment_3_1_1_1_147822 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XIssueExpression__MarkerIndexAssignment_3_2_147857 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XIssueExpression__MessageAssignment_4_147888 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XIssueExpression__MessageParametersAssignment_5_247919 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XIssueExpression__MessageParametersAssignment_5_3_147950 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__XIssueExpression__IssueCodeAssignment_6_147981 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XIssueExpression__IssueDataAssignment_6_348012 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XIssueExpression__IssueDataAssignment_6_4_148043 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__XAnnotation__AnnotationTypeAssignment_248078 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationElementValuePair_in_rule__XAnnotation__ElementValuePairsAssignment_3_1_0_048113 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationElementValuePair_in_rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_148144 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationElementValueOrCommaList_in_rule__XAnnotation__ValueAssignment_3_1_148175 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__XAnnotationElementValuePair__ElementAssignment_0_0_048210 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationElementValue_in_rule__XAnnotationElementValuePair__ValueAssignment_148245 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_048276 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_148307 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_148338 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValue__ElementsAssignment_0_1_048369 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValue__ElementsAssignment_0_1_1_148400 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFeatureCallID_in_rule__XAssignment__FeatureAssignment_0_148435 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAssignment_in_rule__XAssignment__ValueAssignment_0_348470 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpMultiAssign_in_rule__XAssignment__FeatureAssignment_1_1_0_0_148505 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAssignment_in_rule__XAssignment__RightOperandAssignment_1_1_148540 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpOr_in_rule__XOrExpression__FeatureAssignment_1_0_0_148575 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAndExpression_in_rule__XOrExpression__RightOperandAssignment_1_148610 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpAnd_in_rule__XAndExpression__FeatureAssignment_1_0_0_148645 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXEqualityExpression_in_rule__XAndExpression__RightOperandAssignment_1_148680 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpEquality_in_rule__XEqualityExpression__FeatureAssignment_1_0_0_148715 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXRelationalExpression_in_rule__XEqualityExpression__RightOperandAssignment_1_148750 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__XRelationalExpression__TypeAssignment_1_0_148781 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpCompare_in_rule__XRelationalExpression__FeatureAssignment_1_1_0_0_148816 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXOtherOperatorExpression_in_rule__XRelationalExpression__RightOperandAssignment_1_1_148851 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpOther_in_rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_148886 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAdditiveExpression_in_rule__XOtherOperatorExpression__RightOperandAssignment_1_148921 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpAdd_in_rule__XAdditiveExpression__FeatureAssignment_1_0_0_148956 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXMultiplicativeExpression_in_rule__XAdditiveExpression__RightOperandAssignment_1_148991 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpMulti_in_rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_149026 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXUnaryOperation_in_rule__XMultiplicativeExpression__RightOperandAssignment_1_149061 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpUnary_in_rule__XUnaryOperation__FeatureAssignment_0_149096 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXUnaryOperation_in_rule__XUnaryOperation__OperandAssignment_0_249131 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__XCastedExpression__TypeAssignment_1_149162 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpPostfix_in_rule__XPostfixOperation__FeatureAssignment_1_0_149197 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_104_in_rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_149237 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFeatureCallID_in_rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_249280 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAssignment_in_rule__XMemberFeatureCall__ValueAssignment_1_0_149315 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_105_in_rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_149351 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_104_in_rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_249395 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_149434 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_149465 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdOrSuper_in_rule__XMemberFeatureCall__FeatureAssignment_1_1_249500 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_049540 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXShortClosure_in_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_049579 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_049610 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_149641 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXClosure_in_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_449672 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XSetLiteral__ElementsAssignment_3_049703 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XSetLiteral__ElementsAssignment_3_1_149734 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XListLiteral__ElementsAssignment_3_049765 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XListLiteral__ElementsAssignment_3_1_149796 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_049827 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_149858 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_106_in_rule__XClosure__ExplicitSyntaxAssignment_1_0_149894 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpressionInClosure_in_rule__XClosure__ExpressionAssignment_249933 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_rule__XExpressionInClosure__ExpressionsAssignment_1_049964 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_049995 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_150026 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_106_in_rule__XShortClosure__ExplicitSyntaxAssignment_0_0_250062 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XShortClosure__ExpressionAssignment_150101 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XIfExpression__IfAssignment_350132 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XIfExpression__ThenAssignment_550163 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XIfExpression__ElseAssignment_6_150194 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_150225 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XSwitchExpression__SwitchAssignment_2_0_150256 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_050287 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XSwitchExpression__SwitchAssignment_2_1_150318 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCasePart_in_rule__XSwitchExpression__CasesAssignment_450349 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XSwitchExpression__DefaultAssignment_5_250380 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__XCasePart__TypeGuardAssignment_150411 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XCasePart__CaseAssignment_2_150442 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XCasePart__ThenAssignment_3_0_150473 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XCasePart__FallThroughAssignment_3_150509 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_rule__XForLoopExpression__DeclaredParamAssignment_0_0_350548 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XForLoopExpression__ForExpressionAssignment_150579 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XForLoopExpression__EachExpressionAssignment_350610 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_rule__XBasicForLoopExpression__InitExpressionsAssignment_3_050641 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_150672 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XBasicForLoopExpression__ExpressionAssignment_550703 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_050734 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_150765 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XBasicForLoopExpression__EachExpressionAssignment_950796 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XWhileExpression__PredicateAssignment_350827 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XWhileExpression__BodyAssignment_550858 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XDoWhileExpression__BodyAssignment_250889 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XDoWhileExpression__PredicateAssignment_550920 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_rule__XBlockExpression__ExpressionsAssignment_2_050951 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_107_in_rule__XVariableDeclaration__WriteableAssignment_1_050987 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__XVariableDeclaration__TypeAssignment_2_0_0_051026 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__XVariableDeclaration__NameAssignment_2_0_0_151057 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__XVariableDeclaration__NameAssignment_2_151088 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XVariableDeclaration__RightAssignment_3_151119 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__JvmFormalParameter__ParameterTypeAssignment_051150 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__JvmFormalParameter__NameAssignment_151181 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__FullJvmFormalParameter__ParameterTypeAssignment_051212 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__FullJvmFormalParameter__NameAssignment_151243 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__XFeatureCall__TypeArgumentsAssignment_1_151274 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__XFeatureCall__TypeArgumentsAssignment_1_2_151305 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdOrSuper_in_rule__XFeatureCall__FeatureAssignment_251340 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__XFeatureCall__ExplicitOperationCallAssignment_3_051380 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXShortClosure_in_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_051419 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_051450 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_151481 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXClosure_in_rule__XFeatureCall__FeatureCallArgumentsAssignment_451512 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__XConstructorCall__ConstructorAssignment_251547 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__XConstructorCall__TypeArgumentsAssignment_3_151582 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__XConstructorCall__TypeArgumentsAssignment_3_2_151613 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__XConstructorCall__ExplicitConstructorCallAssignment_4_051649 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXShortClosure_in_rule__XConstructorCall__ArgumentsAssignment_4_1_051688 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XConstructorCall__ArgumentsAssignment_4_1_1_051719 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_151750 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXClosure_in_rule__XConstructorCall__ArgumentsAssignment_551781 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_108_in_rule__XBooleanLiteral__IsTrueAssignment_1_151817 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNumber_in_rule__XNumberLiteral__ValueAssignment_151856 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__XStringLiteral__ValueAssignment_151887 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__XTypeLiteral__TypeAssignment_351922 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleArrayBrackets_in_rule__XTypeLiteral__ArrayDimensionsAssignment_451957 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XThrowExpression__ExpressionAssignment_251988 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XReturnExpression__ExpressionAssignment_252019 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XTryCatchFinallyExpression__ExpressionAssignment_252050 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCatchClause_in_rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_052081 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_152112 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_152143 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XSynchronizedExpression__ParamAssignment_152174 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XSynchronizedExpression__ExpressionAssignment_352205 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFullJvmFormalParameter_in_rule__XCatchClause__DeclaredParamAssignment_252236 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XCatchClause__ExpressionAssignment_452267 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__XFunctionTypeRef__ParamTypesAssignment_0_1_052298 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_152329 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__XFunctionTypeRef__ReturnTypeAssignment_252360 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__JvmParameterizedTypeReference__TypeAssignment_052395 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_152430 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_152461 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__JvmParameterizedTypeReference__TypeAssignment_1_4_152496 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_152531 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_152562 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmUpperBound_in_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_052593 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmUpperBoundAnded_in_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_152624 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmLowerBound_in_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_052655 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmLowerBoundAnded_in_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_152686 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__JvmUpperBound__TypeReferenceAssignment_152717 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__JvmUpperBoundAnded__TypeReferenceAssignment_152748 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__JvmLowerBound__TypeReferenceAssignment_152779 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__JvmLowerBoundAnded__TypeReferenceAssignment_152810 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXForLoopExpression_in_synpred19_InternalCheck6401 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBasicForLoopExpression_in_synpred20_InternalCheck6419 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3_1_0__0_in_synpred48_InternalCheck7019 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__0_in_synpred49_InternalCheck7070 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0__0_in_synpred50_InternalCheck7121 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_6_1_0__0_in_synpred75_InternalCheck7903 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_synpred76_InternalCheck7922 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0_in_synpred89_InternalCheck8481 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0__0_in_synpred97_InternalCheck8717 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_2_0__0_in_synpred101_InternalCheck8921 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0_in_synpred102_InternalCheck8972 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__ArgumentsAssignment_4_1_0_in_synpred104_InternalCheck9075 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Check__Group_6__0_in_synpred129_InternalCheck11665 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__CheckAssignment_2_in_synpred140_InternalCheck15337 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3__0_in_synpred141_InternalCheck15398 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_4__0_in_synpred142_InternalCheck15459 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_5__0_in_synpred143_InternalCheck15520 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_6__0_in_synpred144_InternalCheck15578 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_2__0_in_synpred145_InternalCheck15774 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIssueExpression__Group_3_1_1_1__0_in_synpred146_InternalCheck16023 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3__0_in_synpred150_InternalCheck17652 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1__0_in_synpred159_InternalCheck20499 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1__0_in_synpred161_InternalCheck21303 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1__0_in_synpred162_InternalCheck21726 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1__0_in_synpred163_InternalCheck22149 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Alternatives_1_in_synpred164_InternalCheck22572 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1__0_in_synpred165_InternalCheck23424 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1__0_in_synpred166_InternalCheck24586 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1__0_in_synpred167_InternalCheck25009 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1__0_in_synpred168_InternalCheck25616 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group_1__0_in_synpred169_InternalCheck26041 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Alternatives_1_in_synpred170_InternalCheck26343 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__0_in_synpred172_InternalCheck27014 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4_in_synpred173_InternalCheck27072 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1__0_in_synpred181_InternalCheck29308 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group_6__0_in_synpred188_InternalCheck31514 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1_0__0_in_synpred191_InternalCheck32585 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3__0_in_synpred204_InternalCheck37479 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_4_in_synpred205_InternalCheck37537 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__0_in_synpred209_InternalCheck38595 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4__0_in_synpred210_InternalCheck38656 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__ArgumentsAssignment_5_in_synpred211_InternalCheck38714 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XReturnExpression__ExpressionAssignment_2_in_synpred216_InternalCheck40766 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0_in_synpred217_InternalCheck41095 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__0_in_synpred218_InternalCheck41155 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group_1__0_in_synpred219_InternalCheck42333 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0_1__0_in_synpred221_InternalCheck42824 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__0_in_synpred225_InternalCheck43870 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__0_in_synpred227_InternalCheck44179 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__0_in_synpred228_InternalCheck44490 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_1 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_2 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000008L});
+    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0000000000040000L});
+    public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000000100000L,0x0000008000000000L});
+    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000050L});
+    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001920L});
+    public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0008000FE0800012L,0x0000008000001900L});
+    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000000200000L});
+    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000000000040002L});
+    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
+    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000000110L});
+    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
+    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000FE0000000L,0x0000008000000820L});
+    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000000FE0000002L,0x0000008000000800L});
+    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000FE0000000L,0x0000008000000800L});
+    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000001000000L,0x0000000000000150L});
+    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000000000010L,0x0000000000000200L});
+    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
+    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
+    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000000000000100L});
+    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000060L});
+    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000040L});
+    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000000010000000L});
+    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
+    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0004000000000000L});
+    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000200L});
+    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001900L});
+    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000800L});
+    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000000000002000L,0x0000000000000080L});
+    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536156L});
+    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000040L});
+    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0000000000002000L});
+    public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x10C00000000001E0L,0x0000100000002004L});
+    public static final BitSet FOLLOW_36 = new BitSet(new long[]{0x10C0000000000000L});
+    public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x10C00000000001E0L,0x0000100000000004L});
+    public static final BitSet FOLLOW_38 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L});
+    public static final BitSet FOLLOW_39 = new BitSet(new long[]{0x10C00000000001E0L,0x0000100000008004L});
+    public static final BitSet FOLLOW_40 = new BitSet(new long[]{0x0000000000000000L,0x0000000000010000L});
+    public static final BitSet FOLLOW_41 = new BitSet(new long[]{0x000000000F000010L});
+    public static final BitSet FOLLOW_42 = new BitSet(new long[]{0x0000000000000000L,0x0000000000002000L});
+    public static final BitSet FOLLOW_43 = new BitSet(new long[]{0x0000000FFFFF0010L});
+    public static final BitSet FOLLOW_44 = new BitSet(new long[]{0x0000000000000000L,0x0000000000008000L});
+    public static final BitSet FOLLOW_45 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000600L});
+    public static final BitSet FOLLOW_46 = new BitSet(new long[]{0x0000000000000010L,0x0000000000000100L});
+    public static final BitSet FOLLOW_47 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000800L});
+    public static final BitSet FOLLOW_48 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536B56L});
+    public static final BitSet FOLLOW_49 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536956L});
+    public static final BitSet FOLLOW_50 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC53E956L});
+    public static final BitSet FOLLOW_51 = new BitSet(new long[]{0x0000C1F000000000L});
+    public static final BitSet FOLLOW_52 = new BitSet(new long[]{0x0000800000000000L});
+    public static final BitSet FOLLOW_53 = new BitSet(new long[]{0x0000600000000000L});
+    public static final BitSet FOLLOW_54 = new BitSet(new long[]{0x0000000000004000L});
+    public static final BitSet FOLLOW_55 = new BitSet(new long[]{0x0000000000004002L});
+    public static final BitSet FOLLOW_56 = new BitSet(new long[]{0x0000000000008000L});
+    public static final BitSet FOLLOW_57 = new BitSet(new long[]{0x0000000000008002L});
+    public static final BitSet FOLLOW_58 = new BitSet(new long[]{0x00001E0000000000L});
+    public static final BitSet FOLLOW_59 = new BitSet(new long[]{0x00001E0000000002L});
+    public static final BitSet FOLLOW_60 = new BitSet(new long[]{0x0000E00000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_61 = new BitSet(new long[]{0x0000E00000000002L,0x0000000000040000L});
+    public static final BitSet FOLLOW_62 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_63 = new BitSet(new long[]{0x003FC00000000000L});
+    public static final BitSet FOLLOW_64 = new BitSet(new long[]{0x003FC00000000002L});
+    public static final BitSet FOLLOW_65 = new BitSet(new long[]{0x0000400000000000L});
+    public static final BitSet FOLLOW_66 = new BitSet(new long[]{0x0008800000000000L});
+    public static final BitSet FOLLOW_67 = new BitSet(new long[]{0x00C0000000000000L});
+    public static final BitSet FOLLOW_68 = new BitSet(new long[]{0x00C0000000000002L});
+    public static final BitSet FOLLOW_69 = new BitSet(new long[]{0x0F00000000000000L});
+    public static final BitSet FOLLOW_70 = new BitSet(new long[]{0x0F00000000000002L});
+    public static final BitSet FOLLOW_71 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_72 = new BitSet(new long[]{0x0000000000000002L,0x0000000000080000L});
+    public static final BitSet FOLLOW_73 = new BitSet(new long[]{0x6000000000000000L});
+    public static final BitSet FOLLOW_74 = new BitSet(new long[]{0x8000000000000000L,0x0000030000000000L});
+    public static final BitSet FOLLOW_75 = new BitSet(new long[]{0x8000000000000002L,0x0000030000000000L});
+    public static final BitSet FOLLOW_76 = new BitSet(new long[]{0x8000000000000000L,0x0000010000000000L});
+    public static final BitSet FOLLOW_77 = new BitSet(new long[]{0x0000800FFFFF0010L,0x0000000000000002L});
+    public static final BitSet FOLLOW_78 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004100L});
+    public static final BitSet FOLLOW_79 = new BitSet(new long[]{0x0008000FE0800010L,0x000000A000001900L});
+    public static final BitSet FOLLOW_80 = new BitSet(new long[]{0x0000400000000000L,0x0000000000000400L});
+    public static final BitSet FOLLOW_81 = new BitSet(new long[]{0x10C8800FFFFF01F0L,0x0000148BFC537B56L});
+    public static final BitSet FOLLOW_82 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536176L});
+    public static final BitSet FOLLOW_83 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC53E156L});
+    public static final BitSet FOLLOW_84 = new BitSet(new long[]{0x10C8800FFFFF01F0L,0x00001C8BFC537957L});
+    public static final BitSet FOLLOW_85 = new BitSet(new long[]{0x0008000FE0800010L,0x0000048000001900L});
+    public static final BitSet FOLLOW_86 = new BitSet(new long[]{0x10C0800FFFFF01F2L,0x0000180BFC536157L});
+    public static final BitSet FOLLOW_87 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_88 = new BitSet(new long[]{0x0000000000000000L,0x0000000000200000L});
+    public static final BitSet FOLLOW_89 = new BitSet(new long[]{0x0000000000000000L,0x0000000000400000L});
+    public static final BitSet FOLLOW_90 = new BitSet(new long[]{0x10C8800FFFFF01F0L,0x0000108BFC537956L});
+    public static final BitSet FOLLOW_91 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008003801D20L});
+    public static final BitSet FOLLOW_92 = new BitSet(new long[]{0x0008000FE0800012L,0x0000008002801D00L});
+    public static final BitSet FOLLOW_93 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
+    public static final BitSet FOLLOW_94 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008002801D00L});
+    public static final BitSet FOLLOW_95 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000180BFC5361D7L});
+    public static final BitSet FOLLOW_96 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC5361D6L});
+    public static final BitSet FOLLOW_97 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000100BFC536356L});
+    public static final BitSet FOLLOW_98 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000180BFC536157L});
+    public static final BitSet FOLLOW_99 = new BitSet(new long[]{0x0000000000000000L,0x0000000004000000L});
+    public static final BitSet FOLLOW_100 = new BitSet(new long[]{0x0000000000000000L,0x0000000008000000L});
+    public static final BitSet FOLLOW_101 = new BitSet(new long[]{0x10C0800FFFFF01F0L,0x0000180BFC536177L});
+    public static final BitSet FOLLOW_102 = new BitSet(new long[]{0x0000000000000000L,0x0000080000000001L});
+    public static final BitSet FOLLOW_103 = new BitSet(new long[]{0x0000000000000000L,0x0000000010000000L});
+    public static final BitSet FOLLOW_104 = new BitSet(new long[]{0x0000800000000000L,0x0000000000004100L});
+    public static final BitSet FOLLOW_105 = new BitSet(new long[]{0x0000000000000000L,0x0000100000000004L});
+    public static final BitSet FOLLOW_106 = new BitSet(new long[]{0x0000000000000000L,0x0000000020000000L});
+    public static final BitSet FOLLOW_107 = new BitSet(new long[]{0x00000000000000E0L});
+    public static final BitSet FOLLOW_108 = new BitSet(new long[]{0x00000000000001E0L,0x0000100060006004L});
+    public static final BitSet FOLLOW_109 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004200L});
+    public static final BitSet FOLLOW_110 = new BitSet(new long[]{0x0000000000000002L,0x0000000000004000L});
+    public static final BitSet FOLLOW_111 = new BitSet(new long[]{0x0000000000000000L,0x0000000080000000L});
+    public static final BitSet FOLLOW_112 = new BitSet(new long[]{0x0000000000000000L,0x0000000100000000L});
+    public static final BitSet FOLLOW_113 = new BitSet(new long[]{0x0000000000000000L,0x0000000200000000L});
+    public static final BitSet FOLLOW_114 = new BitSet(new long[]{0x0000000000000000L,0x0000001400000000L});
+    public static final BitSet FOLLOW_115 = new BitSet(new long[]{0x0000000000000000L,0x0000000400000000L});
+    public static final BitSet FOLLOW_116 = new BitSet(new long[]{0x0000000000000002L,0x0000001000000000L});
+    public static final BitSet FOLLOW_117 = new BitSet(new long[]{0x0000000000000000L,0x0000000800000000L});
+    public static final BitSet FOLLOW_118 = new BitSet(new long[]{0x8000000000000000L});
+    public static final BitSet FOLLOW_119 = new BitSet(new long[]{0x8000000000000002L});
+    public static final BitSet FOLLOW_120 = new BitSet(new long[]{0x00000000000000C0L});
+    public static final BitSet FOLLOW_121 = new BitSet(new long[]{0x0008000FE0800010L,0x0000008000001B00L});
+    public static final BitSet FOLLOW_122 = new BitSet(new long[]{0x0000000000010000L,0x0000000000000002L});
+    public static final BitSet FOLLOW_123 = new BitSet(new long[]{0x0000000000000000L,0x0000004000000000L});
+    public static final BitSet FOLLOW_124 = new BitSet(new long[]{0x0000000000000002L,0x0000004000000000L});
+    public static final BitSet FOLLOW_125 = new BitSet(new long[]{0x0100000000000000L});
 
 }
\ No newline at end of file
diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/src-gen/com/avaloq/tools/ddk/checkcfg/CheckCfgInjectorProvider.java b/com.avaloq.tools.ddk.checkcfg.core.test/src-gen/com/avaloq/tools/ddk/checkcfg/CheckCfgInjectorProvider.java
index d4ee50a3d..cbb529ccf 100644
--- a/com.avaloq.tools.ddk.checkcfg.core.test/src-gen/com/avaloq/tools/ddk/checkcfg/CheckCfgInjectorProvider.java
+++ b/com.avaloq.tools.ddk.checkcfg.core.test/src-gen/com/avaloq/tools/ddk/checkcfg/CheckCfgInjectorProvider.java
@@ -3,16 +3,16 @@
  */
 package com.avaloq.tools.ddk.checkcfg;
 
+import com.google.inject.Guice;
+import com.google.inject.Injector;
 import org.eclipse.xtext.junit4.GlobalRegistries;
 import org.eclipse.xtext.junit4.GlobalRegistries.GlobalStateMemento;
 import org.eclipse.xtext.junit4.IInjectorProvider;
 import org.eclipse.xtext.junit4.IRegistryConfigurator;
 
-import com.google.inject.Injector;
-
 public class CheckCfgInjectorProvider implements IInjectorProvider, IRegistryConfigurator {
-	
-    protected GlobalStateMemento stateBeforeInjectorCreation;
+
+	protected GlobalStateMemento stateBeforeInjectorCreation;
 	protected GlobalStateMemento stateAfterInjectorCreation;
 	protected Injector injector;
 
@@ -30,9 +30,26 @@ public Injector getInjector()
 		}
 		return injector;
 	}
-	
+
 	protected Injector internalCreateInjector() {
-	    return new CheckCfgStandaloneSetup().createInjectorAndDoEMFRegistration();
+		return new CheckCfgStandaloneSetup() {
+			@Override
+			public Injector createInjector() {
+				return Guice.createInjector(createRuntimeModule());
+			}
+		}.createInjectorAndDoEMFRegistration();
+	}
+
+	protected CheckCfgRuntimeModule createRuntimeModule() {
+		// make it work also with Maven/Tycho and OSGI
+		// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=493672
+		return new CheckCfgRuntimeModule() {
+			@Override
+			public ClassLoader bindClassLoaderToInstance() {
+				return CheckCfgInjectorProvider.class
+						.getClassLoader();
+			}
+		};
 	}
 
 	@Override
diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/src-gen/com/avaloq/tools/ddk/checkcfg/CheckCfgUiInjectorProvider.java b/com.avaloq.tools.ddk.checkcfg.core.test/src-gen/com/avaloq/tools/ddk/checkcfg/CheckCfgUiInjectorProvider.java
index 71f01f1ce..57eff466f 100644
--- a/com.avaloq.tools.ddk.checkcfg.core.test/src-gen/com/avaloq/tools/ddk/checkcfg/CheckCfgUiInjectorProvider.java
+++ b/com.avaloq.tools.ddk.checkcfg.core.test/src-gen/com/avaloq/tools/ddk/checkcfg/CheckCfgUiInjectorProvider.java
@@ -8,10 +8,10 @@
 import com.google.inject.Injector;
 
 public class CheckCfgUiInjectorProvider implements IInjectorProvider {
-	
+
 	@Override
 	public Injector getInjector() {
 		return com.avaloq.tools.ddk.checkcfg.ui.internal.CheckCfgActivator.getInstance().getInjector("com.avaloq.tools.ddk.checkcfg.CheckCfg");
 	}
-	
+
 }
diff --git a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/CheckCfg.xtextbin b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/CheckCfg.xtextbin
index 55629cb1e68cc478cb63db547d7802ad0e77641f..f597350c678132bf795cd4c52af3e6edbd017f0e 100644
GIT binary patch
literal 18129
zcma)Ed4L>6^-fJs&+MH$Bq8J=B#>)2M9z?q?yl~HCC7$rNCpCg$xiR?klC4KW;UB}
ziVBE|2XYAdQ&A8V1wjN6xj{v|MUfli6jVR~6%l^lS6w~RJG%+&ADKSh@x52Cs@|)r
z&INv7cSG~khEZ`L_U$c~`<J%04Gs>r`dztff5~qx6nom1EM9zATdM5uEPnu!SevL@
zRZREwrHe5$pYHSb?<(}Qrgx-sg;QJ0g+i{>n#pW$?dtWrws&>+v`Svc?jECgpyX#X
zXDJpFA~qe$D?oNqf9uX|X@E-cUn6Ghk*2(>-;Yno_}$sOUpgwA$@uw=h3$U6B+TaC
z$Zb3>V$B=<VqZ3&&TSaT`2lQWbEjcahAE7?jriT*cgGs~{BpXlknwW~5ubo3e$mf&
z`I)uh<5<1FKHarF-Qy=?b9duTc$_X>(&lv)iv9;BYZLXJ7CkB!Ycmq*TsB=w_>>`x
z#;#ntRLXW|{bF4#*5JA6a+;t=#Twe$yv}klo9_|v=5(&?7xU?Ic86c8hac?7eXOY~
zUChu4+48Q~0<+%F`F(!ATrwL(qHeXnYp_tvm<crGfFGMF8b!j4)r%(nG>c~bGzcMD
zL@d_0cFk7Vv39MuZlf_;7_o#=C*os7GO?;y80fDGHpYU>Xqzv_iMqyP^W|(#HIP{k
zkg7Gt^Zoobh!qnkx3emDVkmc#NSg7zl%O^-S=2YL^Lx@|KchqqwP}7;@)Tj3#?%1x
z-u!8Xj%gw}lwpNw>?0Dj&p<mp-~>-%QY9o@^qF)K&Mo9i@fji>n;8?MjCs3>0u|3~
zDxT4|&{XI+v%s`3nBt4~$b=5nSID;=jZU>`EnB$+-b6A{MDUg-&lU}h>(j-OU#tf6
z*rRv!=@<?oHVEzg;KW(RoS2dHB;#jPe0*D5Eon{I%%$h{htrJ%L}NWw$aF4enp8ed
zG{mNZAL`NZ(TdsA&=5i2(R$}Al?!6VsQ65!YxlGwzL07biKa#yvE7qrG@5nYe!4tR
z^i|(X)ED}FxV%t|El*a$rd2eLmc>G;ROz6mqHa^V7gINSg|<^9DtrfuMso>FXgOv8
zodA6)vkqn$9|GG!XqluD_BMp`!Gv}Q7!CzP-6qgy+Fj!?kg8}u9B-B)WDPt#B7C@v
zp}HIa6<cA(P7+7LljaK1GFtY+UtMt5hIGEiH_e>iUA8QSSXv|!#cWS+*|K?inh=&F
zT1-pw4v#FC7sunV$BX@hwUWPE@nDrOW3l;W!a9l!?R*Sr*3rD6oYj21hIf>+mKT(>
zju(*A!QZXIT2HcLc(WK}8+dUz!e0GZo#-&oVOSeQ!f5O-`k8DO`yN!c3hP+q9U;u7
zbUt4w2OT43Z4#p!?aG5-u&wXd;TMb9j33C|Ot~w7Jq5WCwoF*Zi6*llUF;c9LsG(6
zusmrU4+Yj1_<su8($?>WhMRSQYV$cFZk@=$wN3)hY+-FB>&cpRb2gXZ*jK}vR;<=G
z#>?I+UPdH@=q@&_l@Vi-b{D&U5N;O6WppoV8{FDW$E^@n4_gJpiq*^bv9hqLsSD#p
zxtPvks158oh2XX`5MkG`{fKa<Fp$p}RxS|OM?_;3qUu|~$SauzsH($U>E|;gVf8~p
zOF7yF6X+_|smcw3w~L}_=nyx51WYAjDg)E_A(-rZ#s{zg4GbW5C=i3RcdoE@j;wxH
zRlTrIQyiy{=!!F__Dt=HHHE>7E6xfuo?UfC^(|0*SjjvGC=#UsI8az085zk(t4OSm
z!4U}O;SF*wQJklZuj<jppRb`n?Z=hc3$*c{7+K{ft15$jgnzA1g<a`FGA|U?r@>qs
z@Sh=$EhPUesg4xZ=K{94b&*Kc^g!$L3e3e~jA>mGK)jURnydn+J)ifBLjoR?ydGK;
zg#ipk$;j9$tjnmdm8!o0V8P(aK)PHso7NRdJO_v`0^y;g`clw^P3!+EUHHo*So9Tb
zk@eNk{wuZpUmJn?>lOR23haj_D!W=SbEL4op^UzUMt?If`dc)5hBA7U52LePcCnb=
zRbzV#Ce{8z9y1JIBxB2k^=)dqma(T89E{Q1{c_2$z5~H(l()XCv|UFqTZDBze@_fB
z3F~`gzX9xHQ!5AZYFyAd4eLfom|<Ao2Q&jyZY=>K=_W{yTR#ZA7`JYw=mUgxOYp$3
zehBw8_H&-4P(5(m3YD|rj~|83yp3!KrXP<)eS1I+`a4KA4;Odh!dQ;Dx{C}&9}{h!
z^3|AecSui{Uu)ek&)Q<0Y;Cv7)|u9M);+XT&#9F;-LUQr8sR=RLN&Rl5Wv#=l@EUc
zg{oXos(uPp2qWufp}7y>_3(cAbC6-66xM^g>$$%mMOih8^-DJ8(5c<}Ri!C^tzi5{
zDYkwaI`DV&4Cb=m2Y{gJAxN1zM9SuDxi_2{4C@aSiGNg0_%Jw^2<uN;&?Eev4?u@n
zk3!PuR6D}1Snl*yfEd<eL1aA6$QX;r81fq4dV-cNFvn*VTQubi=8h+6@KcaHUb99>
z4D0DY`ZJV1u_8S}0u6swu%89aWS~S?&td9}ThHT#X}y4!NR~L8cO{G!7y(`+W$*y*
zd5QQ|m<?(IDq$`Ri2eei>NC*23^C1t{2)bC?fwc!lfMEarp>=GWX7p}8vqRGFv$F!
zHogiQrwwU`_I#&;6}Zf>UaPdk>uk;im~a1~n$h|v8-arv{;W4tUhpRH)DP-JAi(?<
zsnAr`zwoZH&+psj7nu+$r2kfu$p4=aEqR-k{8w87%<q7H3CaHl@^PWz6j$m`cLg%v
zrCkq^=slez9)TO)KV`kT)E<R=GTFItL;Jc_hAl$l>=^Oe23yUJ6Y{>oHkoE1F|!kR
zY}iRYK0(-ZVr+dFsY2NGqTaL{6uYYCK%vUHeW}w%Nv9H3+}SNk`e=&TU)W<p>0_1j
zaa#I#F&3l~D0HF{I!V7^bp}2PovekbyOs%YdkTzdu-6^8wPWK^-Uh>-TCr<yiW7;r
zJq@|Hy${MF^8?jVTpK_=WKU-?WhBZR9>qaP%dux5WSUamP9&<RCklDPo(XOCG{c^S
zSTkGDA*wG$+};=MVWXS^Q?&pwY*tN*2_$orp>yE})7~GGj(vcBIWLr0<%Ie3(fE~F
z7SpG_0AXS;B+qoiUc`u>5=_rnttg`eNpH*fUQmaNgxyL&Z2;7=GAM#rdZEIw7em59
ztg`I`0VrWF0pX#-{tz5rNd@hLa2Iw|`(WPa{%s$En`rM;O?4=h9R_8iJNi4Ze30`4
zQw;m?ingU-#8e5(j(}ys+5o$Uy)1AYUMyEJawP9p5P7PjSaq^tTiRbJeQjHjIwY0U
zn?iyWrFA2;o}yhz+Et*Pkn&Dt(N^9SWjHFr(5@JcCc|nlOiFF=bE+gs=b|iYA}nha
z%Q~`jfMrUmqulEkJ9Nbv<ys%%I!1AAAXleCW@j>4uDC=QHbxkZRScWRuo(<fQ)>ru
z<!pbBwNwpTD#CW0Vq*<tvj!TIIyRp!?h4SU;AZI)#;GcP?32I}x3@A*Pu4Hfj8lxV
zHQZ>pZMCu5#aPXdkFkny^r^cWy6Zanm2$)G!RsIpdl86nJIer>CG1o9yGYpE`MZGe
z1r0fBPz8KGqoSrSFb1#kyedHSxRgwnP*O&n*B>$LRON*t$xDiSeW6tD&hCu(p&TI}
zP~<yEJ_z#hskLfYk8~%)-Wj3arRYy1{ppH+eKCub%^^{CMuh%MSUtu*i}YuMer!sr
z;%=Y|OBC#^hW+6P^*NB9v_Hc3_^5vTF}4R&!Wu^S<XreJp7#fZeI6XAvmqr}Iq!Tn
z&&MeS&2s^V666m^$RdK!W}g5w&O`PmgVf5jKNTkE_Jt6uYQ?aY4$?~d)8Jv*VSh%a
zMYbwG77F`wyWzM<a|rwMZ15w&dvTyIZeJprhE^(*{hbW<Y&n9IzEZQWeJKST00Ecj
z(%EJKQd1e(m($}{z~e2c&R*nGGFK>Jk;t&W7;!gh5=@5whe`>e>@VXkZhwW&|Eeas
zlFo0W^8<Eh{aOIqu)hwiQ!;9a&(EwZ6#LS-N*1gAbQM8d%`k!6Ye)?H8@g$(VbdV_
z8cu^D@S6(aw}K?9MdkNgM+<Xsn>7hCeEV9Usie#Hckq-|7uyvjNig-RsswFx{rdxF
zsRH0+zX8;v!v^Wxl`p4v2JLVo+u;mF^L@}Xf<{lHD*A4sh#7nhAt+nm=$k=S+fKJ=
zGW&-i%v&iJFn=@x^=(z5_K!)28pXa{XP845gX}v<dncS<AGV%h-xX>6yMf8H@6nBa
zuR?eq8~^^W@ge&sRKfz={;6tr6(}e|V9f(zAp9Ia-zN|rBo_G7{zYizFSV7wdVl6$
zYi6+j2Gk=q#&0PuXpG;1rnWIyt=KG7CPosP_I#yNuto`I239GC{V+Z8C;j-5a13&C
zg|6+@kr#*_4Gnq>YMZJtpnJgMRQv=KPm3t-C~is@BQ=I$KN->gl**u<CgU>-F^E;#
zGlb*M5sqh7OFl=$&+Er85b<8<xFawF^@~aeN)xkTu$V3T%&LN@W?d5BkuHMh<=`@h
z%U2ZrUv;efO?l|=;I1rt*slUF`{8SR%3Uti30}uj)er4|40--f{oH;d45ByLfXjvb
z7U+T%UM1jPbVJySSYqfK`#(bq0{d<9hf58@{x3=2f&0d$YTC@O{}*xHyUKO%!FA3k
z{rC|f9HiN1>~!J8bn7|>U=3?sCr&L-fZnX4aT4S`lil7);=NM`6ys8zgV}OdZ#8rb
zr(WwrqUSUKMxE107)`-rr<pA{0WDa|3Ars$kt`{R!WqrBaj=_Y#vRlj?4iy$b;sQz
z%oNT9fNu#$YBfgFx6VYON2hdDS+bOX_X4FBtVkx41nzgHP!t9mXDTEc&fcoolq&2I
z;lVy5tC$|Dm_dG}VrGqsSy}~T?@J<heKrR)tkid*a0&X6vmdCOIq+ly(;sXp7R!b+
zSEyd=>`zxUahB4r;L!sB%XH?^qugOZ=XOwHIScey$s%ag0G7CwnF}Eu!Rsv2(de`S
ziAnXsX#-w$sVEnRXdTuShO<Oj&$0s6IR}vzDRExW9$cY41kangF@taH#fD!`uj*>f
zq2yY~K*67LSfD%Z9FE6z*riP)=@pJDC?J~UMEF!mR|N%ohJy{1FyL5KIIJorr!ZA@
zL0g_XPSLQlL}jRRSYMcqqk~4`F7CK=nHLZ_E9u#(48jqmLHQ~uZ!SgN3g;-|L4qQj
zc7RT(Ia@(iwFaYUH7Vu^XAR!h4Asus&}*P$rQxvBXih~FQYTVfIIJ!b&IY3H6hT98
zB<j&X9btkrlohPsO=lC;FB8sYs2?G{b5c;t^v*#=p;8CucycTh&X(P9oS->`b0R5`
z-Z>|MG+Nm@Tak`BClg{&EjVdfw~aB~p6Muda#h}Nx<H`n1qYi(2ryMrv<Zj%C3@u^
zo`w9LFkX6*J_>UZrXH0uR`UEx#^|V;0}bMwqBBNkJHSosu9nP0^IIneWJn%`)2G5a
zzh~+KsoAXkp}S7i?!rdOp44y)MUUrBnJgS&27(^C2Xv}fxij#>Abq$KKCDlz!8}$>
z=L~0;s7Cl{aAKWvI;qY8)p%49xm>WcSfM{Npm)w<*l-bW7!AggvsG(+n1arMpr%x(
zU#>{_h?ekCO5mzV^(9z8rXuuQM(BAVp%Bjbw0O2~KF(i^dKUx@YB<~_shl-Xi<k~~
zNR*4iT@gp`ia6XAsUha3NZ?jSl_kMk^f^Mm2+*71sZtgD=QX5@!%h=<3-FgH@Rt(&
zWg#WNe?f!4oWEOyb43XLi^K7JDFlx~Bj`?FCKtNXSB4XRwF+Kse1ucF^EJM>Q#jo6
zaIS(KV^R(d&-m$lr5Uac0NR{U)wYMjZ4Zar9vuI<@1ZLDp?t9B+p2M|1*!x_X^#5e
z0kUMaw6Qo4<VDVR@zN~gR>hrgt|N@=0b_J(-2fLtD=5AfL2-lXKQ|J^_ce-}h=L2*
zL)ZY~2T)mEFmi6Df?J><84w!I4<R8K8g5m1e?*Gguv{2F%1ar}k1MZlht{}rhayrN
z7>job=PnpvEKWhu-5doLU>v*$TiMRNYzypEIrs4bTiMS2e5?}xG#>wykGt{sXMFqs
z?`%B&IWJb?@q@hBiVKz6V<*>9sXYSwR|<gIMsR+ku2q)4O*m>30ZEqgd-eDsipUD*
z5BzQC;PyxL{9)ebgrl|!)&!0h&LhgFk1C4C=z_=Tf_5COah?$Lkn?0LHY%3HF`xE)
z8KLl$VtAVHpP@t=`)6Lz*k|bsEDSr(@%{7R`xnCZFY*HB5!Fl7_7`ZYb3NI<)?Q;c
zFDs2$XLMdsPXB8F$U%zCxhC%XUEzF{QV>?J@z;Z>*Ta$cAAGVvIRE7DBD{GckRY5l
zLz1@?{(mV!|0Wqci1Zg}9?0LuW7GLBZ{fjr_}ea=|M52?oOk)_68n3gOUhBa&j~5`
zyGF=ZKqrlWPO9bdZXuD+s@7F@ORSmG7(*ucxK+qHVv+R$QrQr=g|vwgkC!PaLN<a<
zHmMP4-9RoEb{N?#D&w`}y1F4pqr=EC!DBf#9GD_ZLP##Mn|a8gbUB`~C#dciob9Se
zpBRxoNlD*}(kE-_Q^M{zgbfm>4(X0^Zz#ZqgHkq)%Jxx)a2=weYI;P~45&)VnN&4P
ztJ*g-B*FwmvtdY*`Dg)--;W+XK*%}JUMa5RT%-<ie~OuIAbKSZ8mToaIWNeR$E3M|
z>t=Bjgv<Cr&MfDH3fr|pE}&4%tpR!_yK)iGx1`#;BblLWjlgdM{5rXq@DJ4Rmk>S<
zSq$NVbSA$>7TCF*PV5H*J039QlZQYV=OU?+-FZSDrVP_5vgD~C^?GR-Vn?XOH`C`R
zESHg(mrB-hO|060nXY7}J3fVlr8R{@f7Fynk}Fk`D|M19ndBxUlU(U(!&H*Xd4HH7
z;9doz;@yR!kUFiEOlpT$Q&J_jsHUV!ZdvL`rnfENts+x)gc+_}7qpA)0NrRm9W4(P
z;rgn<@)+8?0rpN#Iq6ciYZz8T>hzb>pWFyD8|ASybCWi6Guw~3{K)*ko2uA)oNmhF
z!)9UPJ0_dYmaDetC}Zl&8d#o4T8yOfBr-1)a_eq+PS!l&N|X2qA+fm5F{Y*(kX_mZ
zGNbAI5K%Xzj~nRE;CR(AOg$l2Z-_~yz`%6M9=Nt^E}+U$8=|!j<Ri6=T8&3ovz3|t
z%6_!W*wp6UEOw_V>wtzlHPWSuYD6fpN%R7|9AJ}hZM%jMQg;ABVvzEL93&caters9
zP&rhlLWJjrR0lduBR(B8=C(p+mwJ6h#UvrmB+j!`k8uk%3JrO71S!u7)yZ>+RA;tQ
zWwz`i!&rg!W6*763PPScMEQ9kw(}#lsB9OuTrk|0PlWWJ3~ZruKSj_ND(A9x9*jEo
z(-Fv6h&SW%vxNLP9q$)~&aGjD)Xx)8nev3Z7(i;H?h=iJ2reap%Ya}UHpqDVBMRXQ
z5eSzn2v-n-USpSEA_T7C)N(>Djscm;;6RCxI0=O4kB{%p7E3t#P+lK7IamvhCxqDK
z1jlSyUI}n}r#2RM$uyRjR`S4dF1jBhzZOCHb)YomRYZBUcGNeBavz}Ftq5qk25{r$
z;w~Y-IfBE!r7=mBNy}@Y#E{6LnP)a**RHD<$7yk#U5^>xCG6_}yBSM1m6wLRUL*P*
z5wU=eyv3l#Y&s#a?v8pFi$h=(^81Vx#M4bcHNvR;18TY%n)X_WRAKlIgCTFBPE_RA
zKmpd^f%{g9QmYoxod(Ht8;eBpHoUH^aLOO!sorUjw-XCSjXOs0(4C;uttRAM;UIRm
zvZW3u^4VrW-UH5Y`mP#hsw>}H5g_kVFz<)9DkqN%?S_+QheFjt{tS2W0eECe3ae<?
zRPXgmHETrj=aGPU5X$267uwCg3}ne)1*WPf6!O<PiI%@n$bK6vD9PX9&Xm7rtUaV9
z&J&5ov^u-YC1;*0lYdaj<R2*zspZ44qq@RhJyj!F1Q<)zy!r@eqDw3CQRYWHD5RHG
z<l}_NWAgF|ULD4(C&5*%ujEsFf%X*gX~0a#XEf+PD-)h2=;s2^@_B|M2ftx^qaraj
zI0nPTmW|ke@yp7l7hqFdzNl^DI(t1+)y{NxP)^Ff(3%xEaU);eox!hE3<edJ-Z?#*
z@^6&6Oh~T2kFa(nxem{@EBRVD^}S9GOnqE|ABlr&@#GNl4N_w5O1=rwAr5|v4*plf
z!CZ>R+7)R36CjJrx8H9aN~$Ua>rnC?UD`;V{h3hp;Lv3#`7WF23edmDHgQMoi5Nu=
zh%qd>;hMdxikgMOjqj1q)O@hTRZI6sl-*>IjqDbhTSu-t!NWhdUipB_;VxJ54VNqV
zu3pJ^D=Yc6JMlPRsyF)?G;T|c*WJ<Zx~s~dV8zfK3$5-r^xcMzel5&!$D>))vVc2*
zJ;|NOxLL43xLnpZ7NMrB{JDGSpl~M#(e6%BaHkUP-a)jx)51v$tLa0|8Q_bGawWvw
zeJDL$qWRMSyi%;VGXRqPD)@6}hAL-imHR4{v#C-a9CGo&MUV$M7ziUrHbkO{NB`B5
zW<H~wG`H4C`_oD4kdb!MJUVGUoP<Ld>fngsE~vO@AzWm-ix}whh0A4rV?Hk0_@GU=
zD6Y)doC@{>p{!YbZlED>BzAe02q#R`pZlTEyo0oP2P^Xqp?QaDkIosv4%R`@F6JIi
zJC>3|+i?W#SOz;19sM{lW4OyJR`5d!!(BnJXlM0dM5UQsdqmLc5Yc808by#w)m>ME
zR)>e&l?1(N51@~#1>H{2M@K-fCg?SR^VQ)X!(Cf}y$-M&+zvW@(UHPkkBfL~>oVbT
z4c~A#&>lSRBta|2Mt7sWa*yQ&j^VnS6y;`3nNof@P8)$@1yZ)?cP9kDkaA+>ipPBn
zcPsCq^<;3z-L&T3rrvewcdFc226wr>e!>NKLcpUQUM>TgUS6!=oTUET?1-*Eh4Ip<
zNw({$(#<J-SYTJfhWb*$EwBOlbpxErPJy%Osdjt~k;X@L9g%7s)2LsmGgQYY0!w37
zlVT|WI7@(2?U!Z1V83(+l;#~;^PsxhNzHoU+#M-iPpfVE)7kXuq>qkQ))y}83k*&Y
zXUCCT7%t0-U~u{{yluMY&|^npu=|Ko`%&DoDOf>Z2o&zQyntuV3tj|H6YlvVI`-pq
zY)43=*3VIYx}VUN;Xn`WK1Ite)IJ@_GOnNx>4~4AWuGO7wv0>XE|<<5JNm;@b%x7@
z^T4!=m1&m%vauYdUCN7DxVQ`#@#TE<1zyd<RS5R-5e>S62CWWg+%JZm6sL4lj9~d3
z_I#Q4d}R;ze6`k|D`}6a0kl0_LU*}@&XEP5(YUMx0#m+0>~rUaFs~UA<~Ip*m4^AP
z5azcvOqKk*-yzKJ?g8d?wJ@(I%<qvy!@PkoZv;%UqranQxLiRGP~Jq8XQ<;IK;d%b
zeE2ZU1$0|#l;LLrE>e8u%v+T+e?*kG?Exjf6BrU4w-e<Z5tK~q-MfIYMNc>SP^f!%
z1@1kFk2?2Wf?j}NxQ`c$aB)8`=HucgylBJ4PkAv17d&DUchzb;x`$e9$M1u9t-1-;
z+VNT~w4<{i8E10He)DSzK>rH=T%MR2?wjAzH<d}+o^2oI-es?FZ?vU*mA%Tn$X@N9
zWp}u1>`r%?z1f{_Z?U`Wf?aaQ*@O1!&Q9kH=N#uE`%e2I`wIDhT;$X_bL0xSLH5hD
z?04)Z>}Tw&<;_lq-R5kw&vveoP0salg4{=5C@+&&IxFOLOPpKW-@$8Rf+OnTxpg%2
z?<;<Lh@pj3>h2!^_fX-oMhHp(=QihYti&f0?!zJ;bN__1(1|6HPejwf*VXuhrA>Wd
z-G(o$+rlrb+rlrbIpaS<{zt)|T=;?b17?11ti%cTF$l2tF%mm@%v!jQ<F<0h+I<3d
zm9Hd|jqa1MczmF~knhg+3<O`t8tzjt+I`q?pT?k{K&dgDM#No|C}z^-)<vlNSzO~o
zoroymK8F^s)Ti$A%5}nhff?<5b8@Aw#o59tfS@jSUt}!51dJ2Hw|)jiB2M#QYt?Z7
zqCvh)kdpvXi--^b<tspGx_@QQ`di3=PRfF%p`u+SQm?Wvy+)cx4EJ>iP2$`w7B-_N
z2}Q#FM___*{|RfED8B(w^*Hy5k4&*W$CT_%0)Gp@_v0dNl-~^wQYg}Jq26UB<35H{
z?tuGmbWX$l4+Xpp0h5Dsrs;gS=Jc@p-v|>57%=@$^}=^)>3jNRS_qGIN_5P?eowRM
z#YpkEIw$NI(1vrupk-|m76G)xV>tpKc$L7FmjtBwsZN|r&-ov~GOw-*(!=-cX54Fl
z80?pN+<n1@rPqXC?34t5UNe=nK*_|4-I4uY!{gWL@RW10h<iL@l<>yFTyI?EvGB&T
zRb~rs0)Mv%Zz6jwc8k18Y^Ly=d9{!2?FDtT&O`m7GEi>{xfTkK+buQ3+;UN_5Z*LW
zov1;p9}g#vC}Cy}p9l}&zZXzn9P`8HFe-!3YXiMJhvdzGnbX3zer8QAqv6e@Sq~c?
zzkWzej|TWKViEUP$RxelfTlJGy!~iG2uC&M9H_<FVs9?tpDw)pKR_q+4xrgDflF`h
zOu|YR{;!Ch5P8(D`Lt^R>>3xo^)pyABe~)6D+*e}uP72&g&al#8(LvQo!7=TT^y1_
z^??9fr}YYN34>JMDZ4(zfIf)yj~L#;?6_F03x=#fxkz~2`Qf>0Pwo7`cvL*^I|6y!
z5K_i34X7umQ8q*#HJ#;=$MR@Q_!g$~zs@i`7D_byNE(hIrG@}zuYlR6XVGjsBnDK6
zEm-pL={3HaP?kz+amBcLFF(*%{qF;sJ2lbjEb=FnV|$(!v@#Y?cqAW{fLEe~HUDvd
zw+bCJ;T<K$??rMwIz>)-;>2O~xz`>uo0VKmI4Xhjol)^^`p{USE*Bhy@s4IQhDXVS
zw_1!hy)`jY%`iha@vV8GnDEwuKB2DRjCG{$Aa$*t!E`Z??_UxgE4Vs+2aaRNv4I?j
zwjuJf`R+o(V_|3V60{phdn{=&kqo8n$>V?UNO+q-oy31~!2ix8=<+<T70i69ZBmTF
z<8%}r&nT?ZQHb!{5{BOi!Ej`Hsti0pcqc*19;ZQXYZ!zlhoh9*rNStMU8?ut?b5u$
zQzfL{b@hB06C4T^UU%d=JjLa)l;jYB5|X`STF&oDcX363cU_-VCAz-wwpYY?GrR@f
TGWR7f>Avm0<+UJiV}|&DX0cf*

literal 18084
zcma)Ed4L>6^-fLCu}5}u5)uf3gb;G>#sG5V=<e!H2;_ilNQN^^c6&ENCNs;-Yz_`Z
z1r)^tIRyQwD2j@LAcBb8pd#L)$PID|DxiRh2>!nBb@fc|>?W{(Wcql=_g=lKdatTF
z=LcJQTiW($8Ie?K+NNr?|FF)^ZQHhW1l@&ve<kQBmHRpu%%6WqXSNz_uf7M8M5k(6
zR?cnNk}D@t#oU%)|L)S3j@;H<p>$eDwNxrpI(m9GcXV$Gx;J<C_H}4p=-xi7ZJ-kL
z7|u!}p;TfDl-Gc4r~Z!Z8*>1a<-b<K+9geOM}LqU-xKuai$Udxd{0kMTwB^46e}v#
zwkdX-OsYiN+Mv88U(6NO3>1P8wza;?N>N5iSxsy4yC&#Ov}_5gxh<uhppaI{@puxH
zgJO5kvod;|Xbz6fb#Kn~1)0Q*owySor%M-f`rV~+@LtI}RkLqIk4Pjst#q!C&sEX^
zWhkq)yO66?^1b<>+>}VP_+GA>Bj^!{md;MUt6I(%`&6<mSEvT%Vy>Fs8dRF$2Pbx)
z7}=dG_s|LX>W;*mRC7=Wwgkm$CDo$RO-BVgww1~~sWcjLAV}<^T2(rgXjUWn)27<^
z)1s7WSBXUH$`u>*>Xj?~RcozL%1WfICY2nmGU;XI(m;P*ur&r;R_AOrRyDOATdd{_
z(m<(ZfRxr4$M>^4Ay$p2+^)LZ-6FXYR3??&T?BQiiK@A6RnV8K20bEbuuZe;k|(KD
z%Gx6Yy(fR#pkuPi3}#r8vi4Hx#%G|N5^{nkJ)ss79{NnK4Cj`LmE_(knb;?xMp(0U
z5(N^^of6OJTWBhDoT*@%2BzfvT{59VZ7CHyk3^?hx00<~0dG2!E+cp=6Zcgutw-m|
zm7rV?<}pWZ-C|-mjMy-=r^AU;t^E>K#@CFW5y^3#osFaoVKalC+aFH1W~$a^s?fPY
zA(f)?S*j&51^iHtj*nK%pN@tI`;O5&TU5?TSR<1Ah_0Q}s^na%nWsj!I*9GQBBL?Y
z)Enfg1LZ*aX1cl5AHe0Ma$-@Y7B(HKZImvTDwSFXO$l|U=$=pA=oQ9Jm9Fu<Pqn5N
zz=ZZ=2G9x6mwHyg4C?@}9f+36SW$07I3Gl4?+3%dU}#zg`kv*UbqGi$+7HE>!w|9-
z9v&V&T*y#egn&vcNhMBJi{Z)C64gFRZ-T$N;jT5gVqcI-6@uQXZ8OAjDxEIp`!-c=
zhqtFIWxJ|9WozEyk?rx~cs%xbF<se9`MUuRmZ?-CF*}vEk08TxK87^=NM2CRQGC3D
zca*b|7nHM#7m%}>zZ;Z&G|7(P&3urp;l-f{d-=1w&|#p%ve&A#)!JVUdh*@udr;k>
z>|@0{hIAcCmjKRskmCJ9WoOmMR7<YhHz1=-+M2T{V;=_|`*^r?5}L;`?*>PZeS$RO
zeky67$XK*b0?)q6KAEf=4D0%Qp@+j+1M4ZmYUdaNdrAllO9;^$*;aP98kKRn*`vb<
zvU`jGcq*VTmMFWIj>bq~_c0{wO|WWYH->;}IhV)i8QPU6xKkNhu<O`<1g%>dDE3(P
z=1^dPh(-&d`dh%*A~K6m)r9FUDE3s8U4n-8YP?sa5&d?*xFKwq)6~epqt@(UFqMg^
z0!-ruVRDK+0f1EvFn|~k5L;>Q3}tT{Uj6pEdS&krj?;&A#Tit4rg6oJ(zco_&I&bt
zpzezLTcG%$$UGY;(v<-?P}v_E9?6I6NbHZm5s1*C4RQ`qoNJ7)>oLZkXP`jsM@8+&
zjPd6Wukzz{m0`T&U;7hL@3?@>bCvx`FgFJLr-%a`PuZU))na9TCS*(67phD{r?NjQ
zU@lUlQuf6m#7pR{i4r)=i^ZTkDBv+~o6#~|8o>CHi4B*^zLW|(sQPmN7LKP3q{~!W
z%D!C0v(JAX2oEOJ7s4)_vj4Bvg}*qAMPD)&*<X(Azrxu6m0_sATC@Mk(0*v5vabm<
zM+*DvV)Rus`WvCq-=xudi_yyh7@hBS%H`aS2HV>)PxhCJm^AnzlUSteZ&BOTj6Gp+
zG3;&*suj!rHU!JSZGT6!T|+P@DEnIeo)ltI_IJsC9oWZYmktzVTrfH<`+7*&+p@n0
zXclJCMgm0A4Un9)zaM%rY2QfEGnIW)_`tG%0Qa=^bLyl}GjQAtmHWaUKa8At3)v7%
zKN^nu){q+Xw~=fXE^fz#wFq%_2N}u%=FTGJ%b0OzL{FDrZC^LbKHlD7pK4d^GwpNj
zyJ)GICTr8QW#1h(!aZz+dcII2fTj0}4}T1WQUQpnpFkDD$o^?$?tOSYv|s)VWEd!w
zegDpS?$1e4ktVT!!KNHMTid^^HRZ1a#;--O{hP>vzolm|J^d~O1XT|}${vHHtj||B
zMKgnC|Gp;i57LAWf^&hg|7Zj~#NXKfbg=y}B#p{0N7$9CU4aCMWj_)|#-ogkF^G&o
zui>r7Xz85PxV*5%v&eAnc$@}50m<VGYmCIQpA4lxMd`cMq{m30;ZFklY2eI+N|gN!
zrp~1OEMBDS=g<<FN)?%FciLKl5#V`Jh7aJL7l?03szoNC3g*I)=+7XkKLg#15YraQ
z53@dL_m?=D`~@JVTJ~QVGGnFRh5$o43^ISCjW5H-$%EQqd9h1ig)Xz~S86TsDw}f-
z=G(tZGur=PBXBUopZ%KT1+N27^EQ(RgqYtT6`IQaC*HMg3AStu%FOWu>Ayr0`Tsqv
zC2!J_{}@Yv`7O{dAo+hmJ~lF(;wt^Q?oj62wCe#9y<_se!*Rp=C+wFGv;T(_G1Ikn
z&GJ>tEN4VyoTG@}NwC!%i;$-&C&@Gext5c{W6MeN@rlaGsL{<)q$=e!spgb}$_^B$
z+Jr(1wQ1DppjeaK6L(IVNN*?6{>m8@Nk^FmUKVDQK30te={O1<FG6=SFD8V16pGqQ
zgzirj?c<ZqL>SfLtU7MP>a|DsYb<9{&8|HtPNkF1o=B&i$*6Qv@2NauxsMXZ*^Bj&
zm9BDlR0n2k*O`Kl8JYFBBlkp!P%2u^-q7akX*v5K)>7^05cQWT=}bj?IMalwUQ<}k
zz7Z2hri-Eb!4D~C1|}V6fAex?B(cs3^Jk&)YqKn-PiHp5#F;~$y)0)gBYsjiJ!1i)
zimD>Fu@LxSX|2-EJOb(fp!TI<UBhY$MT5g)<v<qB&U^q$J1kBPR?Y%AzLp9)2jDL1
zsLp}BG5y;)2siQG$;NS5uQ)7NMy>Ae!iqp42u-mZ7A~Q-L&1ot64ZymvasA|_izpm
zU56K}V=QM8?-vt!c6GV#WXoA%{Iw6T+d}G))TQ1m60A6_j?sET>yvgVXvb&$(^!X9
zcf=W%#TbqdhUH{95)2cvYl4E5-?>7Z<)|3T3Sn7EmQ`SxlwDoj6qHw+A~MdkI>vRh
za2-RgHG<6P>B(~uCC<<lV^}K;EP$MKVAvzOa-dMn_ZL_mHL$IZv1NsgHITy^Xms}2
zVy?U+L?^+`(no?Du9f1)ISDLD=VZp|2J`Y1#wkYG25vN5t}#|OGFH3E$5=%;_E2{K
z-A$|eMY-kl;&m7reF(&)vxxyRRXKV7&Qs2*{GG%2f`-l1AT@chN1~<>8iQ9`cvXbx
zv00s~ph}E8uM{(^U%YS{$;(21bg5G9&2NwSp%Npn3i$xZw}O0JcBKsKvF>C!+hX+F
zg?<O=PZ#>5%XutT4vMlfV)SRi>e0?wr2hcu$7Hn>cLUv6bzo<;oDasR&xZ7j^C7m!
zht1=UusxU(HZZ~`=fHQ#Vz5m)=fZI&8xqOlyz|&RAEg*H&&N2FAb&tY788UvJ0H+E
z4>=zXQ>&Eoi6}vLE`V666{A`@Oe>vFf`?^?^C^=SIZ}SiRnBL2!f~PDP|j!B;ETa~
zQK&EJT&zY8u2d!l+ZpWnY78lTC9|+|2?flAfJ;s3?63f7sEnM;=<&<p@%C)jCgfAP
zP^w_v$8tU&b2n-d3`PHkN(rKzFXArge2LEgvLU*H&TpmjLw0EWN(kF>z6!0AdSulu
z=vi7SZ^;#ES*-EXl?3rMh6&u>Kw>#xH%)UDn+D0(P#W~pZwSP1hDlVr<o8?}i*j&>
zH3>3&=W3v-rOVE@@sw2;+Z82AIQ2_af;PJL-GQ@I0dTTk2kKE#gLLgER&(3KcDSDH
zaHi0F4>YZyG1I6--whNog|8t5WeXgABgh)t=_W(w{2+pPGvxy24~L<?r7qO@5$RB)
zIJcS%bMRu2a~o-Ihx41G*0Y>DVvT<%Fr}QkOyl1z2=8Iz-y1bPWdE2-PM`@tk#?6r
zK@kFL?u!E9X8`&xfp9;uz@N^~BP)Mlto-G>GylpkgZ<Z_9=0)lLvdka{1!BgjlpWg
zVWF~HETLImtaS?3DACNoD#dahq$mDp9zPU~L2jYcy}3T}0@1^fL61P~$a)Nz9`Gm?
zKL*8<V~SUo*X7Ew8pCoPkLiCxGN>oX_>>?9v7|kNIQ|slcv@QW86tkxJbsRdcSpw^
zh8d`z7ab@~QZ3uc`D(zdDvWB@CCRP1GKgLbFAKPQN$CG#V&$*mp}&E<w(Q}&47}`z
zuka~1uA~#Zil@>Koxcxy{txrqc`XW}*V%xJl=BAY!bMvV@K3rS>P0Lu%#HK!!3BZy
zCizd2-o|MC4@uvG`^ID&+RSqP8*|;;;<|U}y8oHS4=Lr2ptLiTt4!;<3BVfCx~@en
zkAXf}N8_f*dlr$nX}otcKruGkwJl%m-c%1A%WX3Hkm$M1fYIc(0EXKdK6Xd41;?WW
z8#y7D`$d_GNK|e++r}LQ2}u|A2YaYHM()NE$xP*r1Nio6q?R$7zIDeFJvyZ;WyxU#
zJOPwOu#oId61d-;NKqJU+)0pZxqC>niK;#2!Q|mp>=mhyEgw;_cY_M-g_%Zmr&0;L
zK8*t!7T>#3xP<-4-4|5uba=9b=}!P7s+PN-l3wf1psPl5mNKv4(ft7{<<6u>XGLUy
zKiiCzEP|E|V2NAIoCE0yUU#mEMt2^Nq^MrG9l$G>LfILiby-(f?)$`gmKBM^lzRYa
zkrEe$_P`qLL3lp07c=<UP1wWh+az7heLuP8GEng69vtdUx`*I#6E<FRNP3kk1qDR2
zoQR%^bSWs<Gu(xg69ycs3YS&I#4M(&ZfGlV6Db~cOH^&Bb6H=cT*m~Bi@T(&=`t@Q
za(#Ms4+i0|(x99>CT*42Tjeez9waErJp!Q9GG_~9sWli)vW+rJxkurB!%*$6h`a_m
zRvIoVjkat&A$4Qbh0E$9?H)taYg8ByT|_+!sAEi!hO&aCcFH}L02eBE9n=q#-nr|c
zmg${~ib7Hc_c(IQRqpXS;W)u?DECBCE(Y&OAdOeH?#W0;-3^3@bQINsdkU?~F{YRI
ztS)zPRo-$pf<Wp8w_5^CN{SBUa=*l^+{3ew-y6kCAJRvant-WCa>iPoU&|O>sX5Rf
zZr)^!?x_H`TW`H&9-QC0n}H0;qjC!p-dlD}T_iP|wG_Fl-?$4KDZ5g`Efh1JyA`r<
zfT@N(bQkEPSh+p)!dCil8+_QDU4eP5oGV!Fc2$q?9dKfkdpfDk0M$5D5rsmyv{<7*
zGo*LVV%TsIa0m^?lMhI1e2{|9hM<wzuAo|z@F64N!<4{Plln`rencYl97gE55usA<
zd9-+6<$jdE81+6DHmK!tm!x)lKo&7w?vRL!qg@gA0^?%tiZl>&QzUe&D`iPIG<=58
zF9h^9c&bvz{#gU*qNvlv-U9r^0{#+$zciu*_|F;em+|)m<z60v|NKxqUx>h?&<MNJ
z7Y+C?4JH0^9lUIOoFwfGjbGu5+m*{L5BEygF*@twJWP-))|%mKAwY*Ss%(3>-1cy}
z?SbUZ<-Uhh_JjE#`&-huR|8cVqclhTZv$B-Us+oo2=gNMJ9wF@;x@$NUPBny0>-H9
zssS#9)=+#mhT=NuKi3n*_Y8^~h=L2*gV+G#`%qb5Fmi9Cf}5Zq6B1hP4<I2N8g3T6
zKP1I1ST0N+;b$%PN43|tLTl2!O^9RzWBzvK-T?!w`B^BslcT^KjDvS!ciO$1ZGoLC
z_a0tgciO#|k0tTX;qg!SxEGIq%E$Nd&cWlK@nR_+-_HwdnY)tOV<*>@)E<HTO93F;
z2=1@tTC((w%9Tw7Bv<b5<naR(kyq~T`MaEh+aKilgS;;&SGEdPM1k;-`1E0+c!Vx^
zlrC6~(=zU3iXL(wPb5YpGB~-jyjVpjJRuBE68=+^NMrxR3mW@0oq>g6_Zhx_HhTYD
z^!|BXz&xUQf!h8IZB3r9m#=hISni9W5$lZZOXBpugn(S6$ee4E?%xFG%anq!dWF9}
zM7<h~#DC|LIm-P9f9K)NYoP??z8;ahA^86(g8oG^co69?(masAiN`7TKfHwp-{S9b
z<^GqyJ<5HXzaFu_1G<d+Ki(IVmi%^w(ki6WiI7gqa(S=P$Y-T>#cqu?a~fmmG#_^;
zogo(86e88lp<76s8urAPNKv{4bh=eWpj88fLeydONL3rJHP_WG-Hr~UM}?2|=xAVy
zF)5|F$et=f4yEg{ls!(mV|ZMvCVhNN`feh90;TV6q)&{x;~+LjoHVFA>OG(U8xEpu
zPb!-%hHxFCrfRR4swq&F(R)+XK1S8l$dDKl6itI68RnxUIDTJxc&5_Rp}kgI>HUy8
z=ou8Vmxbun`vU;itn|z<Qy!h;2CkRKQ4lWUhdHyJMaWl!YBq&pZk0dHWLM7x`u6Pd
z-dJX+=f&W60DhD1B>edX{`&|Yhb#thK{}IPD-Y~kPAB#QfgKN+^67)1jB}BeWOtU*
z2a91QMb?KzuMdqv>@Zn;O9dQ-_2DGurN~-nh-rpqrmLChj>}?UX+^2jA2%hI<Z4NB
zwMlX{liajslB-RUt0l?hygx(`^elx@$=*^~X_MA!CbdJWDJ{t@swpkWElVBE^tK(m
zb!1{kl;P@?VY}#6pc@tB;^m<buC5!bkEXrHz}|^jH&@Ab55a0_lm2r0(>Pm{YSn9L
z=CP*z*0KGV%MZ^Fyz6VWW=&Hb7c~nL-_iMEzFN1%L>W_G*1-Bi(qbglCy{xs(kJhf
zXM^DZ*C`}ETxl$>bBt-I2J}Yb0^M!sdLl#tq>mlw@4<<wA((n2uD%G9q`<(G-v!sH
zh6|`RQyZeS0P^8lMpoky)@)^_zq*8$8IxVVDUaQ$+B%@6`(s_|G#L@fY!b5oud8el
zu5C9kLh1kzq_<I?(p!lJ9cvrVwA9XtNr>>=ko2z|2Jz{jNo_3k?2y-I)J#(POyWFC
zdW=_UP-y87#E|l=P?J8JNKIy|C9`E88Nv#zAAxSGr=;{bgOr~eVLLBoi)6d7<zqu_
zIX|NRcxVfq`w4=+K%C3kd0X7MpNv7qLVPNzKTXJ=G4Xz3<lF{ENc}7URVh#DivXlC
z>Mk}&h~N?;xD*J+VuOswKjIKR7lUw_K)9R`%o@A?0wHh>r;!tKaSSMx2@jMgjgvr#
z{^Ypce7S<757nb%hXEVG@q|#A-Yd;)SziHgduG>`cjz3Jn3nPkav{DSqrVbE`Bk7y
z=_`rSq|5s2M7bAG?o<TeUIn<xYI%p!-x$VW-!z!CWYYR-D6uqhXy%!1*tP54gcGtj
zp>D>E?-2GifZc{Ao7ziDUu&A~yF|nSKK2%a8nfxN#=1M|T`UfPQR(k7RuE4&0M#&~
z^7pCfMrhi7DN==@I}Db-i8@h{Uj+qNg9q-LDN0r?;yVqR={6RL^euQ@TjA6{!c();
zpl>A>j2gEM<DuI@XIf3^JEB4CPO+s4hwRyAO5X*}vF5HGXVR7Lt_jfh2+Vt-t<L%5
zopbW+P^4PvpW;s62ain3VigUW>YIW}!y1wPSu9}ghq9#pxpDI^LRtEkp{X1I;gVmO
zBwGJkko_iHP}0A}T}uCsvG#zGI8&utb8;M+OU^u1rhhNV<R2&yspW&PqrSplKUJey
z1Xzd3y!sGm;!7*~Vdh6XC}fsa^rM8y^DO!?Ua^7n<KU{-SNaLQn8p`R0%lr2WkCN)
zOn920p9w+hXBmzh{D$m}s`Qxf7z`I%)?x!DsESR`!KS2s-q^%-_GYH4UAf+{oYa4&
zHA{d{zqm7lU#b}lDlENodQ9oRQszRXx%xiL+Lh)yJlC%DE78>VDmgIqaRq)j4z9(M
zL+RH@xfmC(gLIIC-=Ks48FMg~;@upX{v9Gq>NnqQ9ZE};f^{hUmMLvC&;E?BdvNeF
zlzy8{gk>oGj<m`Dc17%sATg$7R6AiF;z?06S9#Vh`I3eYws<Kz0Ex1f4zrP+Lh~}@
zx*a_H^P0p57?lzpSMn{7EBT&T$@gk2`HegAIACfv`x!J|TZ7lVc6i;BGALXz^hQIg
zHwJyTWp%$1W_e@LEV3-%jbl&p#={6}&K%`&S>Kw6nzHui;d2kk(Y)QmX!j-x+)0GH
zM;Ptip3$U*)$~E<4DgXewHD&uWJ=HRB%!w#fY*u@Zwf$SoHT#l-jT|EjLNB^avD{d
zgG1hQs$?GIVjzqi*-+_`Jk2jln#CS*(teFjnn5SYAtU1?d{~k4_$>tvVaUM|%j0Jg
zp^N6gMJaDC+j+L~xXf?O#zhAobSkftzx&m&&xf)$`GUYe;7IK8ED=ta$e*_$GVcIm
z-hpD?K{W6E#-r1Rv4eF`yo-5<(2hgNVeB}Jb{q~n(yRM%V#e|o)~r}04ZWCP(auZw
zTWe;|9u~A5B3fraqX-JaKpW6<c*ye!dg(4eFKYyS1VJy4fj*L;j|!bHhl4C{MGf{!
zz;5wY0j@P~vGP{qBH7WgP<dR#x4dI$2cEAXK?lZ0ughF{Yk7fVxZbfsxz13o7e8c;
z5hzw5<#_Y%gzy(qPOM$=xR2$X%zJ3v0PduBis8=5yN%|Zlp71-F0aQt3Ghn@c+|_w
zg+SBCizS?s<j>nQtn2fPmo<juR5Mk2n?)ZM*k#y|FBQBZ8=zzwpr4%rXVbIG@ijya
z-^s0xRqL2WgIb*-9pf}$Y0Vo_EF}PE8F1?TvH}?FmtIvg4;al`<!&1_n}u_4xOm;s
z*z~8f>E)!4iC5Ma9_tGXP8w&&kz80F%Zjk)eGuMGd1upOi!s=JNYs89w`>Yl5EufL
zcMdP$*>l4eq0^Li-ms4SC>^^hqLKA;)Suq@#xfk}!QCfl*#*X@!&$}^^g%uGQ?%^U
z<S>?T>D=SedF$%_=v1BMap62P?IJPlVnDVQ!L&<wF%=h=;v%_-k3Pq%skn;3UN)>j
zm(!plLmKb%Q76SI9f=VvpTnLn(w;Bv!k#ZT+H(c%ks83*!zFZ&OXwU~@EMKAN+2}l
z>%=}|Mg;S!VPSrQFtPT_Kku6n%x@W(lKgw$Cd}{b0_HW1Fs~)d?~=p7ypAxh2h7y!
z{?%p6;|h9+@&=+jQ;vHO0$0w54%1vfcd$gtKQH=Bz(a~J&b(Qi`9q?-Wfv&<oxq^r
zxRoexi=kv<@7)2E?Pj_$heEwOYjE#Ed^CA?6Z9Me!#%v1hl_i8F&h^@=0ztie!`3W
zaKR%sNl#YW(LH3b9l!VEwR97#wd1ucw4<{i8E10He)B5|K>v#VJf4^t>YLxtH%xxz
z&za^N?A_rk_O5qa?@DK>ccF8ncb2otJIYz(9qz32W;w?@fm3wK-WX@AbGp0DJ;OcQ
zz0kScdBC|`->2ug8F#u~tdG$peU|f<^O*CL^EG{=yUOWsbIu3cD|M@TtsbW*>kIUy
z`U-ckzGi`YllNPAZFG1<Jvz6JX8v8xZx1lEa7x|#J>VX!Jk|(d3E<x1K8lt2blQ7R
zB@^BsaTYqgAokT~F8p8`pRjbwN7J47Xu31{Xu31{Xqq$rL*#!L{F%A$i9clK7sMh?
zd5=JVGucYZx2Vc{6t}fQ*4|^dt9|&GY4sk5#p6QtrDAWsZy@~O)$*Qz(cXiW_ap}W
zG)j%3G%D$#L`h{lZe2vmpT;#l)QO2w-ZN<NT7Bw0E3Q-CbIfRGrzY0wTAVGc0|@JK
z?|H`Z3&1!&dK>hhNW^I#Y^_?}pAE<t3338J8WAxfpnM4^Q{G?Lv;G<}pa-&GX{l+K
zMCxVsrB_JvkmbD!p&6XJ#lmL%B%w-se-BMi-alY16Xn++su|}#@!cr4=a`bcPT+3<
z_;fDf#`(SQAcc@d3-ul=8SfFCatGXhp>tZ^zbW8N2$&e2GtCvN4X1~_|HPP3z<}w$
z(hJ|FrSF)Rr@&IyDe*DG9|1eD=>wgQ%Fe%^fHs^HR?25>5)}co#Ai7IAb6F+m7fNr
z+1W0fOD_cP!7@Kn2kAEfWYTYj823u$bN2-smVPUKu~QQM`6H>M4N7*a*&W;ewfy!_
zo_mo>`aEKk_D929e@yMM^2f4O_Er8k{+^)x@$9wOE%J9`Gew`l%RaV00qSU-kNQJ0
zP=6x1<|?1tEe*unauHW3Up_KF$$*w0A196|VV?rN`W?Xk7$6@J^IPU9D#K67L%lqQ
z<WGT_lcTpm&x%Gy%io)3J!tv-`XN0f9^gZW;SUxv8GjlKkPQNVUz!lXk;a@3wb-Ze
z_oI<#D1XL#=!E|MH2Vc`na!OESn0xl|Iim9kJ~kicFl%eW23i057x{`Zu$I*g4XaW
ziZoUshmgRAd9b0$?_isDM&wY9O{P?n(X0ITF-Xmw*tLKGeE{hnvit+taj{qz4q2gc
zmG-&w!#yfrc79+yDxP;8fqZTViSdVq)Z=B8jgZGpXL;naJQ^Lnh3Wj?Ff5;i5)EHO
z!!e{Z5WwukFgxWhq1kps45$uUuo7&=H<49YK=)m0(P~VyUmVy{{~rO`x(v}#dE`%$
zWBc4rqE<hVO#37sk%m{|gbn`}fWH(SH0>`_V|ORH8J%LMJaOW%{@gzzk!lmUhHyk0
z=R4!#JI$f7bW<Tb3ga(lGe$?rlz*feoAQrJq-2H}#2J*!rE=O|0s6FD!x<|{y^7S0
zdbZ`tMSTB~_F2I-nLBVCO^##8foK~fKVR%ErF|B5DPDrMi?nM=i-}|~ZC?@pDM#8r
z7StL1zXkjsI>Ii`^IGA|CsDYbQJ6JRcpRg!$wVQ-@AxSEP6&silrLrAOy!>hDZ88o
z{gb00+z^dYvP*?gil2b&ns=k&RlbyvX4lp4fidA3J>>_n>*y4h&r*^@1WHKulF5aj
pFW1c#{hf7vR+Z@b%0IOx&Y$AX_7C@7@YCL#-Wz@!0ykl){|BCgN!S1Y

diff --git a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/CheckCfgStandaloneSetupGenerated.java b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/CheckCfgStandaloneSetupGenerated.java
index 07a03675d..32c0b3314 100644
--- a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/CheckCfgStandaloneSetupGenerated.java
+++ b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/CheckCfgStandaloneSetupGenerated.java
@@ -4,8 +4,8 @@
 package com.avaloq.tools.ddk.checkcfg;
 
 import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.xtext.ISetup;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.xtext.ISetup;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
diff --git a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/CheckConfiguration.java b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/CheckConfiguration.java
index b30c44ea7..ea3c724af 100644
--- a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/CheckConfiguration.java
+++ b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/CheckConfiguration.java
@@ -13,13 +13,13 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.checkcfg.checkcfg.CheckConfiguration#getName <em>Name</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.checkcfg.checkcfg.CheckConfiguration#getLanguageValidatorConfigurations <em>Language Validator Configurations</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.checkcfg.checkcfg.CheckConfiguration#getLegacyCatalogConfigurations <em>Legacy Catalog Configurations</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.checkcfg.checkcfg.CheckConfiguration#getProperties <em>Properties</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.checkcfg.checkcfg.CheckcfgPackage#getCheckConfiguration()
  * @model
diff --git a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/ConfigurableSection.java b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/ConfigurableSection.java
index 84190fcf1..861c5a3bf 100644
--- a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/ConfigurableSection.java
+++ b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/ConfigurableSection.java
@@ -13,10 +13,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.checkcfg.checkcfg.ConfigurableSection#getParameterConfigurations <em>Parameter Configurations</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.checkcfg.checkcfg.CheckcfgPackage#getConfigurableSection()
  * @model
diff --git a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/ConfiguredCatalog.java b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/ConfiguredCatalog.java
index d53c9d68e..d2a87c921 100644
--- a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/ConfiguredCatalog.java
+++ b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/ConfiguredCatalog.java
@@ -13,11 +13,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.checkcfg.checkcfg.ConfiguredCatalog#getCatalog <em>Catalog</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.checkcfg.checkcfg.ConfiguredCatalog#getCheckConfigurations <em>Check Configurations</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.checkcfg.checkcfg.CheckcfgPackage#getConfiguredCatalog()
  * @model
diff --git a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/ConfiguredCheck.java b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/ConfiguredCheck.java
index b3e78623b..af55fbe25 100644
--- a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/ConfiguredCheck.java
+++ b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/ConfiguredCheck.java
@@ -11,11 +11,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.checkcfg.checkcfg.ConfiguredCheck#getSeverity <em>Severity</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.checkcfg.checkcfg.ConfiguredCheck#getCheck <em>Check</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.checkcfg.checkcfg.CheckcfgPackage#getConfiguredCheck()
  * @model
diff --git a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/ConfiguredLanguageValidator.java b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/ConfiguredLanguageValidator.java
index b8ef65016..0c2f22b38 100644
--- a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/ConfiguredLanguageValidator.java
+++ b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/ConfiguredLanguageValidator.java
@@ -11,11 +11,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.checkcfg.checkcfg.ConfiguredLanguageValidator#getLanguage <em>Language</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.checkcfg.checkcfg.ConfiguredLanguageValidator#getCatalogConfigurations <em>Catalog Configurations</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.checkcfg.checkcfg.CheckcfgPackage#getConfiguredLanguageValidator()
  * @model
diff --git a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/ConfiguredParameter.java b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/ConfiguredParameter.java
index 701f0e2f6..4114c68c3 100644
--- a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/ConfiguredParameter.java
+++ b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/ConfiguredParameter.java
@@ -15,11 +15,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.checkcfg.checkcfg.ConfiguredParameter#getParameter <em>Parameter</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.checkcfg.checkcfg.ConfiguredParameter#getNewValue <em>New Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.checkcfg.checkcfg.CheckcfgPackage#getConfiguredParameter()
  * @model
diff --git a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/SeverityKind.java b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/SeverityKind.java
index 06c90b796..6dc578caa 100644
--- a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/SeverityKind.java
+++ b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/SeverityKind.java
@@ -172,6 +172,8 @@ public enum SeverityKind implements Enumerator
 	 * Returns the '<em><b>Severity Kind</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static SeverityKind get(String literal)
@@ -191,6 +193,8 @@ public static SeverityKind get(String literal)
 	 * Returns the '<em><b>Severity Kind</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static SeverityKind getByName(String name)
@@ -210,6 +214,8 @@ public static SeverityKind getByName(String name)
 	 * Returns the '<em><b>Severity Kind</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static SeverityKind get(int value)
diff --git a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/impl/CheckConfigurationImpl.java b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/impl/CheckConfigurationImpl.java
index da2d9a84d..24676bb3f 100644
--- a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/impl/CheckConfigurationImpl.java
+++ b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/impl/CheckConfigurationImpl.java
@@ -31,13 +31,13 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.checkcfg.checkcfg.impl.CheckConfigurationImpl#getName <em>Name</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.checkcfg.checkcfg.impl.CheckConfigurationImpl#getLanguageValidatorConfigurations <em>Language Validator Configurations</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.checkcfg.checkcfg.impl.CheckConfigurationImpl#getLegacyCatalogConfigurations <em>Legacy Catalog Configurations</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.checkcfg.checkcfg.impl.CheckConfigurationImpl#getProperties <em>Properties</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/impl/ConfigurableSectionImpl.java b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/impl/ConfigurableSectionImpl.java
index 70c8390c7..f5237ea9f 100644
--- a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/impl/ConfigurableSectionImpl.java
+++ b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/impl/ConfigurableSectionImpl.java
@@ -26,10 +26,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.checkcfg.checkcfg.impl.ConfigurableSectionImpl#getParameterConfigurations <em>Parameter Configurations</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/impl/ConfiguredCatalogImpl.java b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/impl/ConfiguredCatalogImpl.java
index 345158ace..871c5421d 100644
--- a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/impl/ConfiguredCatalogImpl.java
+++ b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/impl/ConfiguredCatalogImpl.java
@@ -29,11 +29,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.checkcfg.checkcfg.impl.ConfiguredCatalogImpl#getCatalog <em>Catalog</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.checkcfg.checkcfg.impl.ConfiguredCatalogImpl#getCheckConfigurations <em>Check Configurations</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/impl/ConfiguredCheckImpl.java b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/impl/ConfiguredCheckImpl.java
index 51796c7fa..17a4414b5 100644
--- a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/impl/ConfiguredCheckImpl.java
+++ b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/impl/ConfiguredCheckImpl.java
@@ -21,11 +21,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.checkcfg.checkcfg.impl.ConfiguredCheckImpl#getSeverity <em>Severity</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.checkcfg.checkcfg.impl.ConfiguredCheckImpl#getCheck <em>Check</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/impl/ConfiguredLanguageValidatorImpl.java b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/impl/ConfiguredLanguageValidatorImpl.java
index d044d28f1..93c1f849d 100644
--- a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/impl/ConfiguredLanguageValidatorImpl.java
+++ b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/impl/ConfiguredLanguageValidatorImpl.java
@@ -27,11 +27,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.checkcfg.checkcfg.impl.ConfiguredLanguageValidatorImpl#getLanguage <em>Language</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.checkcfg.checkcfg.impl.ConfiguredLanguageValidatorImpl#getCatalogConfigurations <em>Catalog Configurations</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/impl/ConfiguredParameterImpl.java b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/impl/ConfiguredParameterImpl.java
index f4212e66e..efdb80ebe 100644
--- a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/impl/ConfiguredParameterImpl.java
+++ b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/impl/ConfiguredParameterImpl.java
@@ -24,11 +24,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.checkcfg.checkcfg.impl.ConfiguredParameterImpl#getParameter <em>Parameter</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.checkcfg.checkcfg.impl.ConfiguredParameterImpl#getNewValue <em>New Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/util/CheckcfgSwitch.java b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/util/CheckcfgSwitch.java
index a8983a70a..d9122fa54 100644
--- a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/util/CheckcfgSwitch.java
+++ b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/checkcfg/util/CheckcfgSwitch.java
@@ -50,7 +50,7 @@ public CheckcfgSwitch()
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
+	 * @param ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
diff --git a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g
index 8bbf6c208..9a6220f78 100644
--- a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g
+++ b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g
@@ -99,7 +99,7 @@ ruleCheckConfiguration returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_2_0, 
-        		"ValidID");
+        		"org.eclipse.xtext.xbase.Xtype.ValidID");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -117,7 +117,7 @@ ruleCheckConfiguration returns [EObject current=null]
        			$current, 
        			"parameterConfigurations",
         		lv_parameterConfigurations_3_0, 
-        		"ConfiguredParameter");
+        		"com.avaloq.tools.ddk.checkcfg.CheckCfg.ConfiguredParameter");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -135,7 +135,7 @@ ruleCheckConfiguration returns [EObject current=null]
        			$current, 
        			"languageValidatorConfigurations",
         		lv_languageValidatorConfigurations_4_0, 
-        		"ConfiguredLanguageValidator");
+        		"com.avaloq.tools.ddk.checkcfg.CheckCfg.ConfiguredLanguageValidator");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -157,7 +157,7 @@ ruleCheckConfiguration returns [EObject current=null]
        			$current, 
        			"legacyCatalogConfigurations",
         		lv_legacyCatalogConfigurations_6_0, 
-        		"ConfiguredCatalog");
+        		"com.avaloq.tools.ddk.checkcfg.CheckCfg.ConfiguredCatalog");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -204,7 +204,7 @@ ruleConfiguredLanguageValidator returns [EObject current=null]
        			$current, 
        			"language",
         		lv_language_1_0, 
-        		"QualifiedName");
+        		"org.eclipse.xtext.xbase.Xbase.QualifiedName");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -226,7 +226,7 @@ ruleConfiguredLanguageValidator returns [EObject current=null]
        			$current, 
        			"parameterConfigurations",
         		lv_parameterConfigurations_3_0, 
-        		"ConfiguredParameter");
+        		"com.avaloq.tools.ddk.checkcfg.CheckCfg.ConfiguredParameter");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -244,7 +244,7 @@ ruleConfiguredLanguageValidator returns [EObject current=null]
        			$current, 
        			"catalogConfigurations",
         		lv_catalogConfigurations_4_0, 
-        		"ConfiguredCatalog");
+        		"com.avaloq.tools.ddk.checkcfg.CheckCfg.ConfiguredCatalog");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -316,7 +316,7 @@ ruleConfiguredCatalog returns [EObject current=null]
        			$current, 
        			"parameterConfigurations",
         		lv_parameterConfigurations_4_0, 
-        		"ConfiguredParameter");
+        		"com.avaloq.tools.ddk.checkcfg.CheckCfg.ConfiguredParameter");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -334,7 +334,7 @@ ruleConfiguredCatalog returns [EObject current=null]
        			$current, 
        			"checkConfigurations",
         		lv_checkConfigurations_5_0, 
-        		"ConfiguredCheck");
+        		"com.avaloq.tools.ddk.checkcfg.CheckCfg.ConfiguredCheck");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -383,7 +383,7 @@ ruleConfiguredCheck returns [EObject current=null]
        			$current, 
        			"severity",
         		lv_severity_1_0, 
-        		"SeverityKind");
+        		"com.avaloq.tools.ddk.checkcfg.CheckCfg.SeverityKind");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -420,7 +420,7 @@ ruleConfiguredCheck returns [EObject current=null]
        			$current, 
        			"parameterConfigurations",
         		lv_parameterConfigurations_4_0, 
-        		"ConfiguredParameter");
+        		"com.avaloq.tools.ddk.checkcfg.CheckCfg.ConfiguredParameter");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -442,7 +442,7 @@ ruleConfiguredCheck returns [EObject current=null]
        			$current, 
        			"parameterConfigurations",
         		lv_parameterConfigurations_6_0, 
-        		"ConfiguredParameter");
+        		"com.avaloq.tools.ddk.checkcfg.CheckCfg.ConfiguredParameter");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -510,7 +510,7 @@ ruleConfiguredParameter returns [EObject current=null]
        			$current, 
        			"newValue",
         		lv_newValue_3_0, 
-        		"XFormalParameterDefaultValueLiteral");
+        		"com.avaloq.tools.ddk.checkcfg.CheckCfg.XFormalParameterDefaultValueLiteral");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -620,7 +620,7 @@ ruleXConstantUnaryOperation returns [EObject current=null]
        			$current, 
        			"operand",
         		lv_operand_2_0, 
-        		"XConstantUnaryOperation");
+        		"com.avaloq.tools.ddk.checkcfg.CheckCfg.XConstantUnaryOperation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -723,7 +723,7 @@ ruleXConstantListLiteral returns [EObject current=null]
        			$current, 
        			"elements",
         		lv_elements_3_0, 
-        		"XConstantUnaryOperation");
+        		"com.avaloq.tools.ddk.checkcfg.CheckCfg.XConstantUnaryOperation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -745,7 +745,7 @@ ruleXConstantListLiteral returns [EObject current=null]
        			$current, 
        			"elements",
         		lv_elements_5_0, 
-        		"XConstantUnaryOperation");
+        		"com.avaloq.tools.ddk.checkcfg.CheckCfg.XConstantUnaryOperation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -847,7 +847,7 @@ ruleOpSingleAssign
        			$current, 
        			"value",
         		lv_value_3_0, 
-        		"XAssignment");
+        		"org.eclipse.xtext.xbase.Xbase.XAssignment");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -901,7 +901,7 @@ ruleOpSingleAssign
        			$current, 
        			"rightOperand",
         		lv_rightOperand_7_0, 
-        		"XAssignment");
+        		"org.eclipse.xtext.xbase.Xbase.XAssignment");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1095,7 +1095,7 @@ ruleXOrExpression returns [EObject current=null]
        			$current, 
        			"rightOperand",
         		lv_rightOperand_3_0, 
-        		"XAndExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XAndExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1196,7 +1196,7 @@ ruleXAndExpression returns [EObject current=null]
        			$current, 
        			"rightOperand",
         		lv_rightOperand_3_0, 
-        		"XEqualityExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XEqualityExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1297,7 +1297,7 @@ ruleXEqualityExpression returns [EObject current=null]
        			$current, 
        			"rightOperand",
         		lv_rightOperand_3_0, 
-        		"XRelationalExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XRelationalExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1405,7 +1405,7 @@ ruleXRelationalExpression returns [EObject current=null]
        			$current, 
        			"type",
         		lv_type_3_0, 
-        		"JvmTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1450,7 +1450,7 @@ ruleXRelationalExpression returns [EObject current=null]
        			$current, 
        			"rightOperand",
         		lv_rightOperand_6_0, 
-        		"XOtherOperatorExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XOtherOperatorExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1578,7 +1578,7 @@ ruleXOtherOperatorExpression returns [EObject current=null]
        			$current, 
        			"rightOperand",
         		lv_rightOperand_3_0, 
-        		"XAdditiveExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XAdditiveExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1794,7 +1794,7 @@ ruleXAdditiveExpression returns [EObject current=null]
        			$current, 
        			"rightOperand",
         		lv_rightOperand_3_0, 
-        		"XMultiplicativeExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XMultiplicativeExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1902,7 +1902,7 @@ ruleXMultiplicativeExpression returns [EObject current=null]
        			$current, 
        			"rightOperand",
         		lv_rightOperand_3_0, 
-        		"XUnaryOperation");
+        		"org.eclipse.xtext.xbase.Xbase.XUnaryOperation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2010,7 +2010,7 @@ ruleXUnaryOperation returns [EObject current=null]
        			$current, 
        			"operand",
         		lv_operand_2_0, 
-        		"XUnaryOperation");
+        		"org.eclipse.xtext.xbase.Xbase.XUnaryOperation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2121,7 +2121,7 @@ ruleXCastedExpression returns [EObject current=null]
        			$current, 
        			"type",
         		lv_type_3_0, 
-        		"JvmTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2321,7 +2321,7 @@ ruleOpSingleAssign
        			$current, 
        			"value",
         		lv_value_6_0, 
-        		"XAssignment");
+        		"org.eclipse.xtext.xbase.Xbase.XAssignment");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2402,7 +2402,7 @@ ruleOpSingleAssign
        			$current, 
        			"typeArguments",
         		lv_typeArguments_12_0, 
-        		"JvmArgumentTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2424,7 +2424,7 @@ ruleOpSingleAssign
        			$current, 
        			"typeArguments",
         		lv_typeArguments_14_0, 
-        		"JvmArgumentTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2498,7 +2498,7 @@ ruleJvmFormalParameter
        			$current, 
        			"memberCallArguments",
         		lv_memberCallArguments_18_0, 
-        		"XShortClosure");
+        		"org.eclipse.xtext.xbase.Xbase.XShortClosure");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2517,7 +2517,7 @@ ruleJvmFormalParameter
        			$current, 
        			"memberCallArguments",
         		lv_memberCallArguments_19_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2539,7 +2539,7 @@ ruleJvmFormalParameter
        			$current, 
        			"memberCallArguments",
         		lv_memberCallArguments_21_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2563,7 +2563,7 @@ ruleJvmFormalParameter
        			$current, 
        			"memberCallArguments",
         		lv_memberCallArguments_23_0, 
-        		"XClosure");
+        		"org.eclipse.xtext.xbase.Xbase.XClosure");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2929,7 +2929,7 @@ ruleXSetLiteral returns [EObject current=null]
        			$current, 
        			"elements",
         		lv_elements_3_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2951,7 +2951,7 @@ ruleXSetLiteral returns [EObject current=null]
        			$current, 
        			"elements",
         		lv_elements_5_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3008,7 +3008,7 @@ ruleXListLiteral returns [EObject current=null]
        			$current, 
        			"elements",
         		lv_elements_3_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3030,7 +3030,7 @@ ruleXListLiteral returns [EObject current=null]
        			$current, 
        			"elements",
         		lv_elements_5_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3100,7 +3100,7 @@ ruleJvmFormalParameter
        			$current, 
        			"declaredFormalParameters",
         		lv_declaredFormalParameters_2_0, 
-        		"JvmFormalParameter");
+        		"org.eclipse.xtext.xbase.Xbase.JvmFormalParameter");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3122,7 +3122,7 @@ ruleJvmFormalParameter
        			$current, 
        			"declaredFormalParameters",
         		lv_declaredFormalParameters_4_0, 
-        		"JvmFormalParameter");
+        		"org.eclipse.xtext.xbase.Xbase.JvmFormalParameter");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3155,7 +3155,7 @@ ruleJvmFormalParameter
        			$current, 
        			"expression",
         		lv_expression_6_0, 
-        		"XExpressionInClosure");
+        		"org.eclipse.xtext.xbase.Xbase.XExpressionInClosure");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3204,7 +3204,7 @@ ruleXExpressionInClosure returns [EObject current=null]
        			$current, 
        			"expressions",
         		lv_expressions_1_0, 
-        		"XExpressionOrVarDeclaration");
+        		"org.eclipse.xtext.xbase.Xbase.XExpressionOrVarDeclaration");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3269,7 +3269,7 @@ ruleJvmFormalParameter
        			$current, 
        			"declaredFormalParameters",
         		lv_declaredFormalParameters_1_0, 
-        		"JvmFormalParameter");
+        		"org.eclipse.xtext.xbase.Xbase.JvmFormalParameter");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3291,7 +3291,7 @@ ruleJvmFormalParameter
        			$current, 
        			"declaredFormalParameters",
         		lv_declaredFormalParameters_3_0, 
-        		"JvmFormalParameter");
+        		"org.eclipse.xtext.xbase.Xbase.JvmFormalParameter");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3324,7 +3324,7 @@ ruleJvmFormalParameter
        			$current, 
        			"expression",
         		lv_expression_5_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3415,7 +3415,7 @@ ruleXIfExpression returns [EObject current=null]
        			$current, 
        			"if",
         		lv_if_3_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3437,7 +3437,7 @@ ruleXIfExpression returns [EObject current=null]
        			$current, 
        			"then",
         		lv_then_5_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3460,7 +3460,7 @@ ruleXIfExpression returns [EObject current=null]
        			$current, 
        			"else",
         		lv_else_7_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3519,7 +3519,7 @@ ruleJvmFormalParameter
        			$current, 
        			"declaredParam",
         		lv_declaredParam_3_0, 
-        		"JvmFormalParameter");
+        		"org.eclipse.xtext.xbase.Xbase.JvmFormalParameter");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3541,7 +3541,7 @@ ruleJvmFormalParameter
        			$current, 
        			"switch",
         		lv_switch_5_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3569,7 +3569,7 @@ ruleJvmFormalParameter
        			$current, 
        			"declaredParam",
         		lv_declaredParam_7_0, 
-        		"JvmFormalParameter");
+        		"org.eclipse.xtext.xbase.Xbase.JvmFormalParameter");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3591,7 +3591,7 @@ ruleJvmFormalParameter
        			$current, 
        			"switch",
         		lv_switch_9_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3613,7 +3613,7 @@ ruleJvmFormalParameter
        			$current, 
        			"cases",
         		lv_cases_11_0, 
-        		"XCasePart");
+        		"org.eclipse.xtext.xbase.Xbase.XCasePart");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3639,7 +3639,7 @@ ruleJvmFormalParameter
        			$current, 
        			"default",
         		lv_default_14_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3688,7 +3688,7 @@ ruleXCasePart returns [EObject current=null]
        			$current, 
        			"typeGuard",
         		lv_typeGuard_1_0, 
-        		"JvmTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3710,7 +3710,7 @@ ruleXCasePart returns [EObject current=null]
        			$current, 
        			"case",
         		lv_case_3_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3732,7 +3732,7 @@ ruleXCasePart returns [EObject current=null]
        			$current, 
        			"then",
         		lv_then_5_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3809,7 +3809,7 @@ ruleJvmFormalParameter
        			$current, 
        			"declaredParam",
         		lv_declaredParam_3_0, 
-        		"JvmFormalParameter");
+        		"org.eclipse.xtext.xbase.Xbase.JvmFormalParameter");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3831,7 +3831,7 @@ ruleJvmFormalParameter
        			$current, 
        			"forExpression",
         		lv_forExpression_5_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3853,7 +3853,7 @@ ruleJvmFormalParameter
        			$current, 
        			"eachExpression",
         		lv_eachExpression_7_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3906,7 +3906,7 @@ ruleXBasicForLoopExpression returns [EObject current=null]
        			$current, 
        			"initExpressions",
         		lv_initExpressions_3_0, 
-        		"XExpressionOrVarDeclaration");
+        		"org.eclipse.xtext.xbase.Xbase.XExpressionOrVarDeclaration");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3928,7 +3928,7 @@ ruleXBasicForLoopExpression returns [EObject current=null]
        			$current, 
        			"initExpressions",
         		lv_initExpressions_5_0, 
-        		"XExpressionOrVarDeclaration");
+        		"org.eclipse.xtext.xbase.Xbase.XExpressionOrVarDeclaration");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3950,7 +3950,7 @@ ruleXBasicForLoopExpression returns [EObject current=null]
        			$current, 
        			"expression",
         		lv_expression_7_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3972,7 +3972,7 @@ ruleXBasicForLoopExpression returns [EObject current=null]
        			$current, 
        			"updateExpressions",
         		lv_updateExpressions_9_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3994,7 +3994,7 @@ ruleXBasicForLoopExpression returns [EObject current=null]
        			$current, 
        			"updateExpressions",
         		lv_updateExpressions_11_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4016,7 +4016,7 @@ ruleXBasicForLoopExpression returns [EObject current=null]
        			$current, 
        			"eachExpression",
         		lv_eachExpression_13_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4069,7 +4069,7 @@ ruleXWhileExpression returns [EObject current=null]
        			$current, 
        			"predicate",
         		lv_predicate_3_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4091,7 +4091,7 @@ ruleXWhileExpression returns [EObject current=null]
        			$current, 
        			"body",
         		lv_body_5_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4140,7 +4140,7 @@ ruleXDoWhileExpression returns [EObject current=null]
        			$current, 
        			"body",
         		lv_body_2_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4166,7 +4166,7 @@ ruleXDoWhileExpression returns [EObject current=null]
        			$current, 
        			"predicate",
         		lv_predicate_5_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4219,7 +4219,7 @@ ruleXBlockExpression returns [EObject current=null]
        			$current, 
        			"expressions",
         		lv_expressions_2_0, 
-        		"XExpressionOrVarDeclaration");
+        		"org.eclipse.xtext.xbase.Xbase.XExpressionOrVarDeclaration");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4340,7 +4340,7 @@ ruleValidID
        			$current, 
        			"type",
         		lv_type_3_0, 
-        		"JvmTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4358,7 +4358,7 @@ ruleValidID
        			$current, 
        			"name",
         		lv_name_4_0, 
-        		"ValidID");
+        		"org.eclipse.xtext.xbase.Xtype.ValidID");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4377,7 +4377,7 @@ ruleValidID
        			$current, 
        			"name",
         		lv_name_5_0, 
-        		"ValidID");
+        		"org.eclipse.xtext.xbase.Xtype.ValidID");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4399,7 +4399,7 @@ ruleValidID
        			$current, 
        			"right",
         		lv_right_7_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4438,7 +4438,7 @@ ruleJvmFormalParameter returns [EObject current=null]
        			$current, 
        			"parameterType",
         		lv_parameterType_0_0, 
-        		"JvmTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4456,7 +4456,7 @@ ruleJvmFormalParameter returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ValidID");
+        		"org.eclipse.xtext.xbase.Xtype.ValidID");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4495,7 +4495,7 @@ ruleFullJvmFormalParameter returns [EObject current=null]
        			$current, 
        			"parameterType",
         		lv_parameterType_0_0, 
-        		"JvmTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4513,7 +4513,7 @@ ruleFullJvmFormalParameter returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ValidID");
+        		"org.eclipse.xtext.xbase.Xtype.ValidID");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4562,7 +4562,7 @@ ruleXFeatureCall returns [EObject current=null]
        			$current, 
        			"typeArguments",
         		lv_typeArguments_2_0, 
-        		"JvmArgumentTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4584,7 +4584,7 @@ ruleXFeatureCall returns [EObject current=null]
        			$current, 
        			"typeArguments",
         		lv_typeArguments_4_0, 
-        		"JvmArgumentTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4658,7 +4658,7 @@ ruleJvmFormalParameter
        			$current, 
        			"featureCallArguments",
         		lv_featureCallArguments_8_0, 
-        		"XShortClosure");
+        		"org.eclipse.xtext.xbase.Xbase.XShortClosure");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4677,7 +4677,7 @@ ruleJvmFormalParameter
        			$current, 
        			"featureCallArguments",
         		lv_featureCallArguments_9_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4699,7 +4699,7 @@ ruleJvmFormalParameter
        			$current, 
        			"featureCallArguments",
         		lv_featureCallArguments_11_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4723,7 +4723,7 @@ ruleJvmFormalParameter
        			$current, 
        			"featureCallArguments",
         		lv_featureCallArguments_13_0, 
-        		"XClosure");
+        		"org.eclipse.xtext.xbase.Xbase.XClosure");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4891,7 +4891,7 @@ ruleXConstructorCall returns [EObject current=null]
        			$current, 
        			"typeArguments",
         		lv_typeArguments_4_0, 
-        		"JvmArgumentTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4913,7 +4913,7 @@ ruleXConstructorCall returns [EObject current=null]
        			$current, 
        			"typeArguments",
         		lv_typeArguments_6_0, 
-        		"JvmArgumentTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4972,7 +4972,7 @@ ruleJvmFormalParameter
        			$current, 
        			"arguments",
         		lv_arguments_9_0, 
-        		"XShortClosure");
+        		"org.eclipse.xtext.xbase.Xbase.XShortClosure");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4991,7 +4991,7 @@ ruleJvmFormalParameter
        			$current, 
        			"arguments",
         		lv_arguments_10_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5013,7 +5013,7 @@ ruleJvmFormalParameter
        			$current, 
        			"arguments",
         		lv_arguments_12_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5037,7 +5037,7 @@ ruleJvmFormalParameter
        			$current, 
        			"arguments",
         		lv_arguments_14_0, 
-        		"XClosure");
+        		"org.eclipse.xtext.xbase.Xbase.XClosure");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5160,7 +5160,7 @@ ruleXNumberLiteral returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_1_0, 
-        		"Number");
+        		"org.eclipse.xtext.xbase.Xbase.Number");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5206,7 +5206,7 @@ ruleXStringLiteral returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_1_0, 
-        		"STRING");
+        		"org.eclipse.xtext.xbase.Xtype.STRING");
 	    }
 
 )
@@ -5273,7 +5273,7 @@ ruleXTypeLiteral returns [EObject current=null]
        			$current, 
        			"arrayDimensions",
         		lv_arrayDimensions_4_0, 
-        		"ArrayBrackets");
+        		"org.eclipse.xtext.xbase.Xtype.ArrayBrackets");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5326,7 +5326,7 @@ ruleXThrowExpression returns [EObject current=null]
        			$current, 
        			"expression",
         		lv_expression_2_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5402,7 +5402,7 @@ ruleXReturnExpression returns [EObject current=null]
        			$current, 
        			"expression",
         		lv_expression_2_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5451,7 +5451,7 @@ ruleXTryCatchFinallyExpression returns [EObject current=null]
        			$current, 
        			"expression",
         		lv_expression_2_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5470,7 +5470,7 @@ ruleXTryCatchFinallyExpression returns [EObject current=null]
        			$current, 
        			"catchClauses",
         		lv_catchClauses_3_0, 
-        		"XCatchClause");
+        		"org.eclipse.xtext.xbase.Xbase.XCatchClause");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5493,7 +5493,7 @@ ruleXTryCatchFinallyExpression returns [EObject current=null]
        			$current, 
        			"finallyExpression",
         		lv_finallyExpression_5_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5516,7 +5516,7 @@ ruleXTryCatchFinallyExpression returns [EObject current=null]
        			$current, 
        			"finallyExpression",
         		lv_finallyExpression_7_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5572,7 +5572,7 @@ ruleXSynchronizedExpression returns [EObject current=null]
        			$current, 
        			"param",
         		lv_param_3_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5594,7 +5594,7 @@ ruleXSynchronizedExpression returns [EObject current=null]
        			$current, 
        			"expression",
         		lv_expression_5_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5642,7 +5642,7 @@ ruleXCatchClause returns [EObject current=null]
        			$current, 
        			"declaredParam",
         		lv_declaredParam_2_0, 
-        		"FullJvmFormalParameter");
+        		"org.eclipse.xtext.xbase.Xbase.FullJvmFormalParameter");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5664,7 +5664,7 @@ ruleXCatchClause returns [EObject current=null]
        			$current, 
        			"expression",
         		lv_expression_4_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5923,7 +5923,7 @@ ruleXFunctionTypeRef returns [EObject current=null]
        			$current, 
        			"paramTypes",
         		lv_paramTypes_1_0, 
-        		"JvmTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5945,7 +5945,7 @@ ruleXFunctionTypeRef returns [EObject current=null]
        			$current, 
        			"paramTypes",
         		lv_paramTypes_3_0, 
-        		"JvmTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5971,7 +5971,7 @@ ruleXFunctionTypeRef returns [EObject current=null]
        			$current, 
        			"returnType",
         		lv_returnType_6_0, 
-        		"JvmTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6030,7 +6030,7 @@ ruleJvmParameterizedTypeReference returns [EObject current=null]
        			$current, 
        			"arguments",
         		lv_arguments_2_0, 
-        		"JvmArgumentTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6052,7 +6052,7 @@ ruleJvmParameterizedTypeReference returns [EObject current=null]
        			$current, 
        			"arguments",
         		lv_arguments_4_0, 
-        		"JvmArgumentTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6106,7 +6106,7 @@ ruleJvmParameterizedTypeReference returns [EObject current=null]
        			$current, 
        			"arguments",
         		lv_arguments_10_0, 
-        		"JvmArgumentTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6128,7 +6128,7 @@ ruleJvmParameterizedTypeReference returns [EObject current=null]
        			$current, 
        			"arguments",
         		lv_arguments_12_0, 
-        		"JvmArgumentTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6221,7 +6221,7 @@ ruleJvmWildcardTypeReference returns [EObject current=null]
        			$current, 
        			"constraints",
         		lv_constraints_2_0, 
-        		"JvmUpperBound");
+        		"org.eclipse.xtext.xbase.Xtype.JvmUpperBound");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6239,7 +6239,7 @@ ruleJvmWildcardTypeReference returns [EObject current=null]
        			$current, 
        			"constraints",
         		lv_constraints_3_0, 
-        		"JvmUpperBoundAnded");
+        		"org.eclipse.xtext.xbase.Xtype.JvmUpperBoundAnded");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6258,7 +6258,7 @@ ruleJvmWildcardTypeReference returns [EObject current=null]
        			$current, 
        			"constraints",
         		lv_constraints_4_0, 
-        		"JvmLowerBound");
+        		"org.eclipse.xtext.xbase.Xtype.JvmLowerBound");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6276,7 +6276,7 @@ ruleJvmWildcardTypeReference returns [EObject current=null]
        			$current, 
        			"constraints",
         		lv_constraints_5_0, 
-        		"JvmLowerBoundAnded");
+        		"org.eclipse.xtext.xbase.Xtype.JvmLowerBoundAnded");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6319,7 +6319,7 @@ ruleJvmUpperBound returns [EObject current=null]
        			$current, 
        			"typeReference",
         		lv_typeReference_1_0, 
-        		"JvmTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6362,7 +6362,7 @@ ruleJvmUpperBoundAnded returns [EObject current=null]
        			$current, 
        			"typeReference",
         		lv_typeReference_1_0, 
-        		"JvmTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6405,7 +6405,7 @@ ruleJvmLowerBound returns [EObject current=null]
        			$current, 
        			"typeReference",
         		lv_typeReference_1_0, 
-        		"JvmTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6448,7 +6448,7 @@ ruleJvmLowerBoundAnded returns [EObject current=null]
        			$current, 
        			"typeReference",
         		lv_typeReference_1_0, 
-        		"JvmTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6628,7 +6628,7 @@ ruleXImportDeclaration returns [EObject current=null]
        			$current, 
        			"memberName",
         		lv_memberName_5_0, 
-        		"ValidID");
+        		"org.eclipse.xtext.xbase.Xtype.ValidID");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6663,7 +6663,7 @@ ruleXImportDeclaration returns [EObject current=null]
        			$current, 
        			"importedNamespace",
         		lv_importedNamespace_7_0, 
-        		"QualifiedNameWithWildcard");
+        		"org.eclipse.xtext.xbase.Xtype.QualifiedNameWithWildcard");
 	        afterParserOrEnumRuleCall();
 	    }
 
diff --git a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfgLexer.java b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfgLexer.java
index e608c1f31..b6fbaa333 100644
--- a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfgLexer.java
+++ b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfgLexer.java
@@ -115,15 +115,15 @@ public InternalCheckCfgLexer(CharStream input, RecognizerSharedState state) {
         super(input,state);
 
     }
-    public String getGrammarFileName() { return "../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g"; }
+    public String getGrammarFileName() { return "InternalCheckCfg.g"; }
 
     // $ANTLR start "T__13"
     public final void mT__13() throws RecognitionException {
         try {
             int _type = T__13;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:11:7: ( 'check' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:11:9: 'check'
+            // InternalCheckCfg.g:11:7: ( 'check' )
+            // InternalCheckCfg.g:11:9: 'check'
             {
             match("check"); 
 
@@ -143,8 +143,8 @@ public final void mT__14() throws RecognitionException {
         try {
             int _type = T__14;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:12:7: ( 'configuration' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:12:9: 'configuration'
+            // InternalCheckCfg.g:12:7: ( 'configuration' )
+            // InternalCheckCfg.g:12:9: 'configuration'
             {
             match("configuration"); 
 
@@ -164,8 +164,8 @@ public final void mT__15() throws RecognitionException {
         try {
             int _type = T__15;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:13:7: ( '{' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:13:9: '{'
+            // InternalCheckCfg.g:13:7: ( '{' )
+            // InternalCheckCfg.g:13:9: '{'
             {
             match('{'); 
 
@@ -184,8 +184,8 @@ public final void mT__16() throws RecognitionException {
         try {
             int _type = T__16;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:14:7: ( '}' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:14:9: '}'
+            // InternalCheckCfg.g:14:7: ( '}' )
+            // InternalCheckCfg.g:14:9: '}'
             {
             match('}'); 
 
@@ -204,8 +204,8 @@ public final void mT__17() throws RecognitionException {
         try {
             int _type = T__17;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:15:7: ( 'for' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:15:9: 'for'
+            // InternalCheckCfg.g:15:7: ( 'for' )
+            // InternalCheckCfg.g:15:9: 'for'
             {
             match("for"); 
 
@@ -225,8 +225,8 @@ public final void mT__18() throws RecognitionException {
         try {
             int _type = T__18;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:16:7: ( 'catalog' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:16:9: 'catalog'
+            // InternalCheckCfg.g:16:7: ( 'catalog' )
+            // InternalCheckCfg.g:16:9: 'catalog'
             {
             match("catalog"); 
 
@@ -246,8 +246,8 @@ public final void mT__19() throws RecognitionException {
         try {
             int _type = T__19;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:17:7: ( '(' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:17:9: '('
+            // InternalCheckCfg.g:17:7: ( '(' )
+            // InternalCheckCfg.g:17:9: '('
             {
             match('('); 
 
@@ -266,8 +266,8 @@ public final void mT__20() throws RecognitionException {
         try {
             int _type = T__20;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:18:7: ( ',' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:18:9: ','
+            // InternalCheckCfg.g:18:7: ( ',' )
+            // InternalCheckCfg.g:18:9: ','
             {
             match(','); 
 
@@ -286,8 +286,8 @@ public final void mT__21() throws RecognitionException {
         try {
             int _type = T__21;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:19:7: ( ')' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:19:9: ')'
+            // InternalCheckCfg.g:19:7: ( ')' )
+            // InternalCheckCfg.g:19:9: ')'
             {
             match(')'); 
 
@@ -306,8 +306,8 @@ public final void mT__22() throws RecognitionException {
         try {
             int _type = T__22;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:20:7: ( '=' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:20:9: '='
+            // InternalCheckCfg.g:20:7: ( '=' )
+            // InternalCheckCfg.g:20:9: '='
             {
             match('='); 
 
@@ -326,8 +326,8 @@ public final void mT__23() throws RecognitionException {
         try {
             int _type = T__23;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:21:7: ( '#' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:21:9: '#'
+            // InternalCheckCfg.g:21:7: ( '#' )
+            // InternalCheckCfg.g:21:9: '#'
             {
             match('#'); 
 
@@ -346,8 +346,8 @@ public final void mT__24() throws RecognitionException {
         try {
             int _type = T__24;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:22:7: ( '[' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:22:9: '['
+            // InternalCheckCfg.g:22:7: ( '[' )
+            // InternalCheckCfg.g:22:9: '['
             {
             match('['); 
 
@@ -366,8 +366,8 @@ public final void mT__25() throws RecognitionException {
         try {
             int _type = T__25;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:23:7: ( ']' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:23:9: ']'
+            // InternalCheckCfg.g:23:7: ( ']' )
+            // InternalCheckCfg.g:23:9: ']'
             {
             match(']'); 
 
@@ -386,8 +386,8 @@ public final void mT__26() throws RecognitionException {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:24:7: ( '+=' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:24:9: '+='
+            // InternalCheckCfg.g:24:7: ( '+=' )
+            // InternalCheckCfg.g:24:9: '+='
             {
             match("+="); 
 
@@ -407,8 +407,8 @@ public final void mT__27() throws RecognitionException {
         try {
             int _type = T__27;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:25:7: ( '-=' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:25:9: '-='
+            // InternalCheckCfg.g:25:7: ( '-=' )
+            // InternalCheckCfg.g:25:9: '-='
             {
             match("-="); 
 
@@ -428,8 +428,8 @@ public final void mT__28() throws RecognitionException {
         try {
             int _type = T__28;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:26:7: ( '*=' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:26:9: '*='
+            // InternalCheckCfg.g:26:7: ( '*=' )
+            // InternalCheckCfg.g:26:9: '*='
             {
             match("*="); 
 
@@ -449,8 +449,8 @@ public final void mT__29() throws RecognitionException {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:27:7: ( '/=' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:27:9: '/='
+            // InternalCheckCfg.g:27:7: ( '/=' )
+            // InternalCheckCfg.g:27:9: '/='
             {
             match("/="); 
 
@@ -470,8 +470,8 @@ public final void mT__30() throws RecognitionException {
         try {
             int _type = T__30;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:28:7: ( '%=' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:28:9: '%='
+            // InternalCheckCfg.g:28:7: ( '%=' )
+            // InternalCheckCfg.g:28:9: '%='
             {
             match("%="); 
 
@@ -491,8 +491,8 @@ public final void mT__31() throws RecognitionException {
         try {
             int _type = T__31;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:29:7: ( '<' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:29:9: '<'
+            // InternalCheckCfg.g:29:7: ( '<' )
+            // InternalCheckCfg.g:29:9: '<'
             {
             match('<'); 
 
@@ -511,8 +511,8 @@ public final void mT__32() throws RecognitionException {
         try {
             int _type = T__32;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:30:7: ( '>' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:30:9: '>'
+            // InternalCheckCfg.g:30:7: ( '>' )
+            // InternalCheckCfg.g:30:9: '>'
             {
             match('>'); 
 
@@ -531,8 +531,8 @@ public final void mT__33() throws RecognitionException {
         try {
             int _type = T__33;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:31:7: ( '>=' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:31:9: '>='
+            // InternalCheckCfg.g:31:7: ( '>=' )
+            // InternalCheckCfg.g:31:9: '>='
             {
             match(">="); 
 
@@ -552,8 +552,8 @@ public final void mT__34() throws RecognitionException {
         try {
             int _type = T__34;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:32:7: ( '||' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:32:9: '||'
+            // InternalCheckCfg.g:32:7: ( '||' )
+            // InternalCheckCfg.g:32:9: '||'
             {
             match("||"); 
 
@@ -573,8 +573,8 @@ public final void mT__35() throws RecognitionException {
         try {
             int _type = T__35;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:33:7: ( '&&' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:33:9: '&&'
+            // InternalCheckCfg.g:33:7: ( '&&' )
+            // InternalCheckCfg.g:33:9: '&&'
             {
             match("&&"); 
 
@@ -594,8 +594,8 @@ public final void mT__36() throws RecognitionException {
         try {
             int _type = T__36;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:34:7: ( '==' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:34:9: '=='
+            // InternalCheckCfg.g:34:7: ( '==' )
+            // InternalCheckCfg.g:34:9: '=='
             {
             match("=="); 
 
@@ -615,8 +615,8 @@ public final void mT__37() throws RecognitionException {
         try {
             int _type = T__37;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:35:7: ( '!=' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:35:9: '!='
+            // InternalCheckCfg.g:35:7: ( '!=' )
+            // InternalCheckCfg.g:35:9: '!='
             {
             match("!="); 
 
@@ -636,8 +636,8 @@ public final void mT__38() throws RecognitionException {
         try {
             int _type = T__38;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:36:7: ( '===' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:36:9: '==='
+            // InternalCheckCfg.g:36:7: ( '===' )
+            // InternalCheckCfg.g:36:9: '==='
             {
             match("==="); 
 
@@ -657,8 +657,8 @@ public final void mT__39() throws RecognitionException {
         try {
             int _type = T__39;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:37:7: ( '!==' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:37:9: '!=='
+            // InternalCheckCfg.g:37:7: ( '!==' )
+            // InternalCheckCfg.g:37:9: '!=='
             {
             match("!=="); 
 
@@ -678,8 +678,8 @@ public final void mT__40() throws RecognitionException {
         try {
             int _type = T__40;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:38:7: ( 'instanceof' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:38:9: 'instanceof'
+            // InternalCheckCfg.g:38:7: ( 'instanceof' )
+            // InternalCheckCfg.g:38:9: 'instanceof'
             {
             match("instanceof"); 
 
@@ -699,8 +699,8 @@ public final void mT__41() throws RecognitionException {
         try {
             int _type = T__41;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:39:7: ( '->' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:39:9: '->'
+            // InternalCheckCfg.g:39:7: ( '->' )
+            // InternalCheckCfg.g:39:9: '->'
             {
             match("->"); 
 
@@ -720,8 +720,8 @@ public final void mT__42() throws RecognitionException {
         try {
             int _type = T__42;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:40:7: ( '..<' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:40:9: '..<'
+            // InternalCheckCfg.g:40:7: ( '..<' )
+            // InternalCheckCfg.g:40:9: '..<'
             {
             match("..<"); 
 
@@ -741,8 +741,8 @@ public final void mT__43() throws RecognitionException {
         try {
             int _type = T__43;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:41:7: ( '..' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:41:9: '..'
+            // InternalCheckCfg.g:41:7: ( '..' )
+            // InternalCheckCfg.g:41:9: '..'
             {
             match(".."); 
 
@@ -762,8 +762,8 @@ public final void mT__44() throws RecognitionException {
         try {
             int _type = T__44;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:42:7: ( '=>' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:42:9: '=>'
+            // InternalCheckCfg.g:42:7: ( '=>' )
+            // InternalCheckCfg.g:42:9: '=>'
             {
             match("=>"); 
 
@@ -783,8 +783,8 @@ public final void mT__45() throws RecognitionException {
         try {
             int _type = T__45;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:43:7: ( '<>' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:43:9: '<>'
+            // InternalCheckCfg.g:43:7: ( '<>' )
+            // InternalCheckCfg.g:43:9: '<>'
             {
             match("<>"); 
 
@@ -804,8 +804,8 @@ public final void mT__46() throws RecognitionException {
         try {
             int _type = T__46;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:44:7: ( '?:' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:44:9: '?:'
+            // InternalCheckCfg.g:44:7: ( '?:' )
+            // InternalCheckCfg.g:44:9: '?:'
             {
             match("?:"); 
 
@@ -825,8 +825,8 @@ public final void mT__47() throws RecognitionException {
         try {
             int _type = T__47;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:45:7: ( '+' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:45:9: '+'
+            // InternalCheckCfg.g:45:7: ( '+' )
+            // InternalCheckCfg.g:45:9: '+'
             {
             match('+'); 
 
@@ -845,8 +845,8 @@ public final void mT__48() throws RecognitionException {
         try {
             int _type = T__48;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:46:7: ( '-' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:46:9: '-'
+            // InternalCheckCfg.g:46:7: ( '-' )
+            // InternalCheckCfg.g:46:9: '-'
             {
             match('-'); 
 
@@ -865,8 +865,8 @@ public final void mT__49() throws RecognitionException {
         try {
             int _type = T__49;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:47:7: ( '*' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:47:9: '*'
+            // InternalCheckCfg.g:47:7: ( '*' )
+            // InternalCheckCfg.g:47:9: '*'
             {
             match('*'); 
 
@@ -885,8 +885,8 @@ public final void mT__50() throws RecognitionException {
         try {
             int _type = T__50;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:48:7: ( '**' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:48:9: '**'
+            // InternalCheckCfg.g:48:7: ( '**' )
+            // InternalCheckCfg.g:48:9: '**'
             {
             match("**"); 
 
@@ -906,8 +906,8 @@ public final void mT__51() throws RecognitionException {
         try {
             int _type = T__51;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:49:7: ( '/' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:49:9: '/'
+            // InternalCheckCfg.g:49:7: ( '/' )
+            // InternalCheckCfg.g:49:9: '/'
             {
             match('/'); 
 
@@ -926,8 +926,8 @@ public final void mT__52() throws RecognitionException {
         try {
             int _type = T__52;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:50:7: ( '%' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:50:9: '%'
+            // InternalCheckCfg.g:50:7: ( '%' )
+            // InternalCheckCfg.g:50:9: '%'
             {
             match('%'); 
 
@@ -946,8 +946,8 @@ public final void mT__53() throws RecognitionException {
         try {
             int _type = T__53;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:51:7: ( '!' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:51:9: '!'
+            // InternalCheckCfg.g:51:7: ( '!' )
+            // InternalCheckCfg.g:51:9: '!'
             {
             match('!'); 
 
@@ -966,8 +966,8 @@ public final void mT__54() throws RecognitionException {
         try {
             int _type = T__54;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:52:7: ( 'as' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:52:9: 'as'
+            // InternalCheckCfg.g:52:7: ( 'as' )
+            // InternalCheckCfg.g:52:9: 'as'
             {
             match("as"); 
 
@@ -987,8 +987,8 @@ public final void mT__55() throws RecognitionException {
         try {
             int _type = T__55;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:53:7: ( '++' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:53:9: '++'
+            // InternalCheckCfg.g:53:7: ( '++' )
+            // InternalCheckCfg.g:53:9: '++'
             {
             match("++"); 
 
@@ -1008,8 +1008,8 @@ public final void mT__56() throws RecognitionException {
         try {
             int _type = T__56;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:54:7: ( '--' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:54:9: '--'
+            // InternalCheckCfg.g:54:7: ( '--' )
+            // InternalCheckCfg.g:54:9: '--'
             {
             match("--"); 
 
@@ -1029,8 +1029,8 @@ public final void mT__57() throws RecognitionException {
         try {
             int _type = T__57;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:55:7: ( '.' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:55:9: '.'
+            // InternalCheckCfg.g:55:7: ( '.' )
+            // InternalCheckCfg.g:55:9: '.'
             {
             match('.'); 
 
@@ -1049,8 +1049,8 @@ public final void mT__58() throws RecognitionException {
         try {
             int _type = T__58;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:56:7: ( '::' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:56:9: '::'
+            // InternalCheckCfg.g:56:7: ( '::' )
+            // InternalCheckCfg.g:56:9: '::'
             {
             match("::"); 
 
@@ -1070,8 +1070,8 @@ public final void mT__59() throws RecognitionException {
         try {
             int _type = T__59;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:57:7: ( '?.' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:57:9: '?.'
+            // InternalCheckCfg.g:57:7: ( '?.' )
+            // InternalCheckCfg.g:57:9: '?.'
             {
             match("?."); 
 
@@ -1091,8 +1091,8 @@ public final void mT__60() throws RecognitionException {
         try {
             int _type = T__60;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:58:7: ( '|' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:58:9: '|'
+            // InternalCheckCfg.g:58:7: ( '|' )
+            // InternalCheckCfg.g:58:9: '|'
             {
             match('|'); 
 
@@ -1111,8 +1111,8 @@ public final void mT__61() throws RecognitionException {
         try {
             int _type = T__61;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:59:7: ( ';' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:59:9: ';'
+            // InternalCheckCfg.g:59:7: ( ';' )
+            // InternalCheckCfg.g:59:9: ';'
             {
             match(';'); 
 
@@ -1131,8 +1131,8 @@ public final void mT__62() throws RecognitionException {
         try {
             int _type = T__62;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:60:7: ( 'if' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:60:9: 'if'
+            // InternalCheckCfg.g:60:7: ( 'if' )
+            // InternalCheckCfg.g:60:9: 'if'
             {
             match("if"); 
 
@@ -1152,8 +1152,8 @@ public final void mT__63() throws RecognitionException {
         try {
             int _type = T__63;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:61:7: ( 'else' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:61:9: 'else'
+            // InternalCheckCfg.g:61:7: ( 'else' )
+            // InternalCheckCfg.g:61:9: 'else'
             {
             match("else"); 
 
@@ -1173,8 +1173,8 @@ public final void mT__64() throws RecognitionException {
         try {
             int _type = T__64;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:62:7: ( 'switch' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:62:9: 'switch'
+            // InternalCheckCfg.g:62:7: ( 'switch' )
+            // InternalCheckCfg.g:62:9: 'switch'
             {
             match("switch"); 
 
@@ -1194,8 +1194,8 @@ public final void mT__65() throws RecognitionException {
         try {
             int _type = T__65;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:63:7: ( ':' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:63:9: ':'
+            // InternalCheckCfg.g:63:7: ( ':' )
+            // InternalCheckCfg.g:63:9: ':'
             {
             match(':'); 
 
@@ -1214,8 +1214,8 @@ public final void mT__66() throws RecognitionException {
         try {
             int _type = T__66;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:64:7: ( 'default' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:64:9: 'default'
+            // InternalCheckCfg.g:64:7: ( 'default' )
+            // InternalCheckCfg.g:64:9: 'default'
             {
             match("default"); 
 
@@ -1235,8 +1235,8 @@ public final void mT__67() throws RecognitionException {
         try {
             int _type = T__67;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:65:7: ( 'case' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:65:9: 'case'
+            // InternalCheckCfg.g:65:7: ( 'case' )
+            // InternalCheckCfg.g:65:9: 'case'
             {
             match("case"); 
 
@@ -1256,8 +1256,8 @@ public final void mT__68() throws RecognitionException {
         try {
             int _type = T__68;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:66:7: ( 'while' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:66:9: 'while'
+            // InternalCheckCfg.g:66:7: ( 'while' )
+            // InternalCheckCfg.g:66:9: 'while'
             {
             match("while"); 
 
@@ -1277,8 +1277,8 @@ public final void mT__69() throws RecognitionException {
         try {
             int _type = T__69;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:67:7: ( 'do' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:67:9: 'do'
+            // InternalCheckCfg.g:67:7: ( 'do' )
+            // InternalCheckCfg.g:67:9: 'do'
             {
             match("do"); 
 
@@ -1298,8 +1298,8 @@ public final void mT__70() throws RecognitionException {
         try {
             int _type = T__70;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:68:7: ( 'var' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:68:9: 'var'
+            // InternalCheckCfg.g:68:7: ( 'var' )
+            // InternalCheckCfg.g:68:9: 'var'
             {
             match("var"); 
 
@@ -1319,8 +1319,8 @@ public final void mT__71() throws RecognitionException {
         try {
             int _type = T__71;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:69:7: ( 'val' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:69:9: 'val'
+            // InternalCheckCfg.g:69:7: ( 'val' )
+            // InternalCheckCfg.g:69:9: 'val'
             {
             match("val"); 
 
@@ -1340,8 +1340,8 @@ public final void mT__72() throws RecognitionException {
         try {
             int _type = T__72;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:70:7: ( 'extends' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:70:9: 'extends'
+            // InternalCheckCfg.g:70:7: ( 'extends' )
+            // InternalCheckCfg.g:70:9: 'extends'
             {
             match("extends"); 
 
@@ -1361,8 +1361,8 @@ public final void mT__73() throws RecognitionException {
         try {
             int _type = T__73;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:71:7: ( 'static' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:71:9: 'static'
+            // InternalCheckCfg.g:71:7: ( 'static' )
+            // InternalCheckCfg.g:71:9: 'static'
             {
             match("static"); 
 
@@ -1382,8 +1382,8 @@ public final void mT__74() throws RecognitionException {
         try {
             int _type = T__74;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:72:7: ( 'import' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:72:9: 'import'
+            // InternalCheckCfg.g:72:7: ( 'import' )
+            // InternalCheckCfg.g:72:9: 'import'
             {
             match("import"); 
 
@@ -1403,8 +1403,8 @@ public final void mT__75() throws RecognitionException {
         try {
             int _type = T__75;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:73:7: ( 'extension' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:73:9: 'extension'
+            // InternalCheckCfg.g:73:7: ( 'extension' )
+            // InternalCheckCfg.g:73:9: 'extension'
             {
             match("extension"); 
 
@@ -1424,8 +1424,8 @@ public final void mT__76() throws RecognitionException {
         try {
             int _type = T__76;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:74:7: ( 'super' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:74:9: 'super'
+            // InternalCheckCfg.g:74:7: ( 'super' )
+            // InternalCheckCfg.g:74:9: 'super'
             {
             match("super"); 
 
@@ -1445,8 +1445,8 @@ public final void mT__77() throws RecognitionException {
         try {
             int _type = T__77;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:75:7: ( 'new' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:75:9: 'new'
+            // InternalCheckCfg.g:75:7: ( 'new' )
+            // InternalCheckCfg.g:75:9: 'new'
             {
             match("new"); 
 
@@ -1466,8 +1466,8 @@ public final void mT__78() throws RecognitionException {
         try {
             int _type = T__78;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:76:7: ( 'false' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:76:9: 'false'
+            // InternalCheckCfg.g:76:7: ( 'false' )
+            // InternalCheckCfg.g:76:9: 'false'
             {
             match("false"); 
 
@@ -1487,8 +1487,8 @@ public final void mT__79() throws RecognitionException {
         try {
             int _type = T__79;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:77:7: ( 'true' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:77:9: 'true'
+            // InternalCheckCfg.g:77:7: ( 'true' )
+            // InternalCheckCfg.g:77:9: 'true'
             {
             match("true"); 
 
@@ -1508,8 +1508,8 @@ public final void mT__80() throws RecognitionException {
         try {
             int _type = T__80;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:78:7: ( 'null' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:78:9: 'null'
+            // InternalCheckCfg.g:78:7: ( 'null' )
+            // InternalCheckCfg.g:78:9: 'null'
             {
             match("null"); 
 
@@ -1529,8 +1529,8 @@ public final void mT__81() throws RecognitionException {
         try {
             int _type = T__81;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:79:7: ( 'typeof' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:79:9: 'typeof'
+            // InternalCheckCfg.g:79:7: ( 'typeof' )
+            // InternalCheckCfg.g:79:9: 'typeof'
             {
             match("typeof"); 
 
@@ -1550,8 +1550,8 @@ public final void mT__82() throws RecognitionException {
         try {
             int _type = T__82;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:80:7: ( 'throw' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:80:9: 'throw'
+            // InternalCheckCfg.g:80:7: ( 'throw' )
+            // InternalCheckCfg.g:80:9: 'throw'
             {
             match("throw"); 
 
@@ -1571,8 +1571,8 @@ public final void mT__83() throws RecognitionException {
         try {
             int _type = T__83;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:81:7: ( 'return' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:81:9: 'return'
+            // InternalCheckCfg.g:81:7: ( 'return' )
+            // InternalCheckCfg.g:81:9: 'return'
             {
             match("return"); 
 
@@ -1592,8 +1592,8 @@ public final void mT__84() throws RecognitionException {
         try {
             int _type = T__84;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:82:7: ( 'try' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:82:9: 'try'
+            // InternalCheckCfg.g:82:7: ( 'try' )
+            // InternalCheckCfg.g:82:9: 'try'
             {
             match("try"); 
 
@@ -1613,8 +1613,8 @@ public final void mT__85() throws RecognitionException {
         try {
             int _type = T__85;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:83:7: ( 'finally' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:83:9: 'finally'
+            // InternalCheckCfg.g:83:7: ( 'finally' )
+            // InternalCheckCfg.g:83:9: 'finally'
             {
             match("finally"); 
 
@@ -1634,8 +1634,8 @@ public final void mT__86() throws RecognitionException {
         try {
             int _type = T__86;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:84:7: ( 'synchronized' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:84:9: 'synchronized'
+            // InternalCheckCfg.g:84:7: ( 'synchronized' )
+            // InternalCheckCfg.g:84:9: 'synchronized'
             {
             match("synchronized"); 
 
@@ -1655,8 +1655,8 @@ public final void mT__87() throws RecognitionException {
         try {
             int _type = T__87;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:85:7: ( 'catch' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:85:9: 'catch'
+            // InternalCheckCfg.g:85:7: ( 'catch' )
+            // InternalCheckCfg.g:85:9: 'catch'
             {
             match("catch"); 
 
@@ -1676,8 +1676,8 @@ public final void mT__88() throws RecognitionException {
         try {
             int _type = T__88;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:86:7: ( '?' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:86:9: '?'
+            // InternalCheckCfg.g:86:7: ( '?' )
+            // InternalCheckCfg.g:86:9: '?'
             {
             match('?'); 
 
@@ -1696,8 +1696,8 @@ public final void mT__89() throws RecognitionException {
         try {
             int _type = T__89;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:87:7: ( '&' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:87:9: '&'
+            // InternalCheckCfg.g:87:7: ( '&' )
+            // InternalCheckCfg.g:87:9: '&'
             {
             match('&'); 
 
@@ -1716,8 +1716,8 @@ public final void mT__90() throws RecognitionException {
         try {
             int _type = T__90;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:88:7: ( 'error' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:88:9: 'error'
+            // InternalCheckCfg.g:88:7: ( 'error' )
+            // InternalCheckCfg.g:88:9: 'error'
             {
             match("error"); 
 
@@ -1737,8 +1737,8 @@ public final void mT__91() throws RecognitionException {
         try {
             int _type = T__91;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:89:7: ( 'warning' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:89:9: 'warning'
+            // InternalCheckCfg.g:89:7: ( 'warning' )
+            // InternalCheckCfg.g:89:9: 'warning'
             {
             match("warning"); 
 
@@ -1758,8 +1758,8 @@ public final void mT__92() throws RecognitionException {
         try {
             int _type = T__92;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:90:7: ( 'info' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:90:9: 'info'
+            // InternalCheckCfg.g:90:7: ( 'info' )
+            // InternalCheckCfg.g:90:9: 'info'
             {
             match("info"); 
 
@@ -1779,8 +1779,8 @@ public final void mT__93() throws RecognitionException {
         try {
             int _type = T__93;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:91:7: ( 'ignore' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:91:9: 'ignore'
+            // InternalCheckCfg.g:91:7: ( 'ignore' )
+            // InternalCheckCfg.g:91:9: 'ignore'
             {
             match("ignore"); 
 
@@ -1800,10 +1800,10 @@ public final void mRULE_HEX() throws RecognitionException {
         try {
             int _type = RULE_HEX;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6757:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )? )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6757:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
+            // InternalCheckCfg.g:6757:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )? )
+            // InternalCheckCfg.g:6757:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6757:12: ( '0x' | '0X' )
+            // InternalCheckCfg.g:6757:12: ( '0x' | '0X' )
             int alt1=2;
             int LA1_0 = input.LA(1);
 
@@ -1831,7 +1831,7 @@ else if ( (LA1_1=='X') ) {
             }
             switch (alt1) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6757:13: '0x'
+                    // InternalCheckCfg.g:6757:13: '0x'
                     {
                     match("0x"); 
 
@@ -1839,7 +1839,7 @@ else if ( (LA1_1=='X') ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6757:18: '0X'
+                    // InternalCheckCfg.g:6757:18: '0X'
                     {
                     match("0X"); 
 
@@ -1849,7 +1849,7 @@ else if ( (LA1_1=='X') ) {
 
             }
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6757:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+
+            // InternalCheckCfg.g:6757:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+
             int cnt2=0;
             loop2:
             do {
@@ -1863,7 +1863,7 @@ else if ( (LA1_1=='X') ) {
 
                 switch (alt2) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:
+            	    // InternalCheckCfg.g:
             	    {
             	    if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='F')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='f') ) {
             	        input.consume();
@@ -1887,7 +1887,7 @@ else if ( (LA1_1=='X') ) {
                 cnt2++;
             } while (true);
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6757:58: ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
+            // InternalCheckCfg.g:6757:58: ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
             int alt4=2;
             int LA4_0 = input.LA(1);
 
@@ -1896,10 +1896,10 @@ else if ( (LA1_1=='X') ) {
             }
             switch (alt4) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6757:59: '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
+                    // InternalCheckCfg.g:6757:59: '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
                     {
                     match('#'); 
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6757:63: ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
+                    // InternalCheckCfg.g:6757:63: ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
                     int alt3=2;
                     int LA3_0 = input.LA(1);
 
@@ -1917,7 +1917,7 @@ else if ( (LA3_0=='L'||LA3_0=='l') ) {
                     }
                     switch (alt3) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6757:64: ( 'b' | 'B' ) ( 'i' | 'I' )
+                            // InternalCheckCfg.g:6757:64: ( 'b' | 'B' ) ( 'i' | 'I' )
                             {
                             if ( input.LA(1)=='B'||input.LA(1)=='b' ) {
                                 input.consume();
@@ -1941,7 +1941,7 @@ else if ( (LA3_0=='L'||LA3_0=='l') ) {
                             }
                             break;
                         case 2 :
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6757:84: ( 'l' | 'L' )
+                            // InternalCheckCfg.g:6757:84: ( 'l' | 'L' )
                             {
                             if ( input.LA(1)=='L'||input.LA(1)=='l' ) {
                                 input.consume();
@@ -1980,11 +1980,11 @@ public final void mRULE_INT() throws RecognitionException {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6759:10: ( '0' .. '9' ( '0' .. '9' | '_' )* )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6759:12: '0' .. '9' ( '0' .. '9' | '_' )*
+            // InternalCheckCfg.g:6759:10: ( '0' .. '9' ( '0' .. '9' | '_' )* )
+            // InternalCheckCfg.g:6759:12: '0' .. '9' ( '0' .. '9' | '_' )*
             {
             matchRange('0','9'); 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6759:21: ( '0' .. '9' | '_' )*
+            // InternalCheckCfg.g:6759:21: ( '0' .. '9' | '_' )*
             loop5:
             do {
                 int alt5=2;
@@ -1997,7 +1997,7 @@ public final void mRULE_INT() throws RecognitionException {
 
                 switch (alt5) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:
+            	    // InternalCheckCfg.g:
             	    {
             	    if ( (input.LA(1)>='0' && input.LA(1)<='9')||input.LA(1)=='_' ) {
             	        input.consume();
@@ -2033,11 +2033,11 @@ public final void mRULE_DECIMAL() throws RecognitionException {
         try {
             int _type = RULE_DECIMAL;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6761:14: ( RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )? )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6761:16: RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
+            // InternalCheckCfg.g:6761:14: ( RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )? )
+            // InternalCheckCfg.g:6761:16: RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
             {
             mRULE_INT(); 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6761:25: ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )?
+            // InternalCheckCfg.g:6761:25: ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )?
             int alt7=2;
             int LA7_0 = input.LA(1);
 
@@ -2046,7 +2046,7 @@ public final void mRULE_DECIMAL() throws RecognitionException {
             }
             switch (alt7) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6761:26: ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT
+                    // InternalCheckCfg.g:6761:26: ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT
                     {
                     if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
                         input.consume();
@@ -2057,7 +2057,7 @@ public final void mRULE_DECIMAL() throws RecognitionException {
                         recover(mse);
                         throw mse;}
 
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6761:36: ( '+' | '-' )?
+                    // InternalCheckCfg.g:6761:36: ( '+' | '-' )?
                     int alt6=2;
                     int LA6_0 = input.LA(1);
 
@@ -2066,7 +2066,7 @@ public final void mRULE_DECIMAL() throws RecognitionException {
                     }
                     switch (alt6) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:
+                            // InternalCheckCfg.g:
                             {
                             if ( input.LA(1)=='+'||input.LA(1)=='-' ) {
                                 input.consume();
@@ -2090,7 +2090,7 @@ public final void mRULE_DECIMAL() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6761:58: ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
+            // InternalCheckCfg.g:6761:58: ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
             int alt8=3;
             int LA8_0 = input.LA(1);
 
@@ -2102,7 +2102,7 @@ else if ( (LA8_0=='D'||LA8_0=='F'||LA8_0=='L'||LA8_0=='d'||LA8_0=='f'||LA8_0=='l
             }
             switch (alt8) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6761:59: ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' )
+                    // InternalCheckCfg.g:6761:59: ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' )
                     {
                     if ( input.LA(1)=='B'||input.LA(1)=='b' ) {
                         input.consume();
@@ -2126,7 +2126,7 @@ else if ( (LA8_0=='D'||LA8_0=='F'||LA8_0=='L'||LA8_0=='d'||LA8_0=='f'||LA8_0=='l
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6761:87: ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' )
+                    // InternalCheckCfg.g:6761:87: ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' )
                     {
                     if ( input.LA(1)=='D'||input.LA(1)=='F'||input.LA(1)=='L'||input.LA(1)=='d'||input.LA(1)=='f'||input.LA(1)=='l' ) {
                         input.consume();
@@ -2159,10 +2159,10 @@ public final void mRULE_ID() throws RecognitionException {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6763:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )* )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6763:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
+            // InternalCheckCfg.g:6763:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )* )
+            // InternalCheckCfg.g:6763:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6763:11: ( '^' )?
+            // InternalCheckCfg.g:6763:11: ( '^' )?
             int alt9=2;
             int LA9_0 = input.LA(1);
 
@@ -2171,7 +2171,7 @@ public final void mRULE_ID() throws RecognitionException {
             }
             switch (alt9) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6763:11: '^'
+                    // InternalCheckCfg.g:6763:11: '^'
                     {
                     match('^'); 
 
@@ -2189,7 +2189,7 @@ public final void mRULE_ID() throws RecognitionException {
                 recover(mse);
                 throw mse;}
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6763:44: ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
+            // InternalCheckCfg.g:6763:44: ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
             loop10:
             do {
                 int alt10=2;
@@ -2202,7 +2202,7 @@ public final void mRULE_ID() throws RecognitionException {
 
                 switch (alt10) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:
+            	    // InternalCheckCfg.g:
             	    {
             	    if ( input.LA(1)=='$'||(input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
             	        input.consume();
@@ -2238,10 +2238,10 @@ public final void mRULE_STRING() throws RecognitionException {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6765:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6765:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
+            // InternalCheckCfg.g:6765:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? ) )
+            // InternalCheckCfg.g:6765:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6765:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
+            // InternalCheckCfg.g:6765:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
             int alt15=2;
             int LA15_0 = input.LA(1);
 
@@ -2259,10 +2259,10 @@ else if ( (LA15_0=='\'') ) {
             }
             switch (alt15) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6765:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )?
+                    // InternalCheckCfg.g:6765:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )?
                     {
                     match('\"'); 
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6765:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // InternalCheckCfg.g:6765:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop11:
                     do {
                         int alt11=3;
@@ -2278,7 +2278,7 @@ else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA1
 
                         switch (alt11) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6765:21: '\\\\' .
+                    	    // InternalCheckCfg.g:6765:21: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -2286,7 +2286,7 @@ else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA1
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6765:28: ~ ( ( '\\\\' | '\"' ) )
+                    	    // InternalCheckCfg.g:6765:28: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -2306,7 +2306,7 @@ else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA1
                         }
                     } while (true);
 
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6765:44: ( '\"' )?
+                    // InternalCheckCfg.g:6765:44: ( '\"' )?
                     int alt12=2;
                     int LA12_0 = input.LA(1);
 
@@ -2315,7 +2315,7 @@ else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA1
                     }
                     switch (alt12) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6765:44: '\"'
+                            // InternalCheckCfg.g:6765:44: '\"'
                             {
                             match('\"'); 
 
@@ -2328,10 +2328,10 @@ else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA1
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6765:49: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )?
+                    // InternalCheckCfg.g:6765:49: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )?
                     {
                     match('\''); 
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6765:54: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // InternalCheckCfg.g:6765:54: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop13:
                     do {
                         int alt13=3;
@@ -2347,7 +2347,7 @@ else if ( ((LA13_0>='\u0000' && LA13_0<='&')||(LA13_0>='(' && LA13_0<='[')||(LA1
 
                         switch (alt13) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6765:55: '\\\\' .
+                    	    // InternalCheckCfg.g:6765:55: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -2355,7 +2355,7 @@ else if ( ((LA13_0>='\u0000' && LA13_0<='&')||(LA13_0>='(' && LA13_0<='[')||(LA1
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6765:62: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // InternalCheckCfg.g:6765:62: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -2375,7 +2375,7 @@ else if ( ((LA13_0>='\u0000' && LA13_0<='&')||(LA13_0>='(' && LA13_0<='[')||(LA1
                         }
                     } while (true);
 
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6765:79: ( '\\'' )?
+                    // InternalCheckCfg.g:6765:79: ( '\\'' )?
                     int alt14=2;
                     int LA14_0 = input.LA(1);
 
@@ -2384,7 +2384,7 @@ else if ( ((LA13_0>='\u0000' && LA13_0<='&')||(LA13_0>='(' && LA13_0<='[')||(LA1
                     }
                     switch (alt14) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6765:79: '\\''
+                            // InternalCheckCfg.g:6765:79: '\\''
                             {
                             match('\''); 
 
@@ -2415,12 +2415,12 @@ public final void mRULE_ML_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6767:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6767:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalCheckCfg.g:6767:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalCheckCfg.g:6767:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6767:24: ( options {greedy=false; } : . )*
+            // InternalCheckCfg.g:6767:24: ( options {greedy=false; } : . )*
             loop16:
             do {
                 int alt16=2;
@@ -2445,7 +2445,7 @@ else if ( ((LA16_0>='\u0000' && LA16_0<=')')||(LA16_0>='+' && LA16_0<='\uFFFF'))
 
                 switch (alt16) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6767:52: .
+            	    // InternalCheckCfg.g:6767:52: .
             	    {
             	    matchAny(); 
 
@@ -2475,12 +2475,12 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6769:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6769:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalCheckCfg.g:6769:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalCheckCfg.g:6769:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6769:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // InternalCheckCfg.g:6769:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop17:
             do {
                 int alt17=2;
@@ -2493,7 +2493,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
 
                 switch (alt17) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6769:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // InternalCheckCfg.g:6769:24: ~ ( ( '\\n' | '\\r' ) )
             	    {
             	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
             	        input.consume();
@@ -2513,7 +2513,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
                 }
             } while (true);
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6769:40: ( ( '\\r' )? '\\n' )?
+            // InternalCheckCfg.g:6769:40: ( ( '\\r' )? '\\n' )?
             int alt19=2;
             int LA19_0 = input.LA(1);
 
@@ -2522,9 +2522,9 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
             }
             switch (alt19) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6769:41: ( '\\r' )? '\\n'
+                    // InternalCheckCfg.g:6769:41: ( '\\r' )? '\\n'
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6769:41: ( '\\r' )?
+                    // InternalCheckCfg.g:6769:41: ( '\\r' )?
                     int alt18=2;
                     int LA18_0 = input.LA(1);
 
@@ -2533,7 +2533,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
                     }
                     switch (alt18) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6769:41: '\\r'
+                            // InternalCheckCfg.g:6769:41: '\\r'
                             {
                             match('\r'); 
 
@@ -2565,10 +2565,10 @@ public final void mRULE_WS() throws RecognitionException {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6771:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6771:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalCheckCfg.g:6771:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalCheckCfg.g:6771:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6771:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalCheckCfg.g:6771:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt20=0;
             loop20:
             do {
@@ -2582,7 +2582,7 @@ public final void mRULE_WS() throws RecognitionException {
 
                 switch (alt20) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:
+            	    // InternalCheckCfg.g:
             	    {
             	    if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
             	        input.consume();
@@ -2622,8 +2622,8 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6773:16: ( . )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6773:18: .
+            // InternalCheckCfg.g:6773:16: ( . )
+            // InternalCheckCfg.g:6773:18: .
             {
             matchAny(); 
 
@@ -2638,635 +2638,635 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:8: ( T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        // InternalCheckCfg.g:1:8: ( T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
         int alt21=90;
         alt21 = dfa21.predict(input);
         switch (alt21) {
             case 1 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:10: T__13
+                // InternalCheckCfg.g:1:10: T__13
                 {
                 mT__13(); 
 
                 }
                 break;
             case 2 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:16: T__14
+                // InternalCheckCfg.g:1:16: T__14
                 {
                 mT__14(); 
 
                 }
                 break;
             case 3 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:22: T__15
+                // InternalCheckCfg.g:1:22: T__15
                 {
                 mT__15(); 
 
                 }
                 break;
             case 4 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:28: T__16
+                // InternalCheckCfg.g:1:28: T__16
                 {
                 mT__16(); 
 
                 }
                 break;
             case 5 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:34: T__17
+                // InternalCheckCfg.g:1:34: T__17
                 {
                 mT__17(); 
 
                 }
                 break;
             case 6 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:40: T__18
+                // InternalCheckCfg.g:1:40: T__18
                 {
                 mT__18(); 
 
                 }
                 break;
             case 7 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:46: T__19
+                // InternalCheckCfg.g:1:46: T__19
                 {
                 mT__19(); 
 
                 }
                 break;
             case 8 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:52: T__20
+                // InternalCheckCfg.g:1:52: T__20
                 {
                 mT__20(); 
 
                 }
                 break;
             case 9 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:58: T__21
+                // InternalCheckCfg.g:1:58: T__21
                 {
                 mT__21(); 
 
                 }
                 break;
             case 10 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:64: T__22
+                // InternalCheckCfg.g:1:64: T__22
                 {
                 mT__22(); 
 
                 }
                 break;
             case 11 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:70: T__23
+                // InternalCheckCfg.g:1:70: T__23
                 {
                 mT__23(); 
 
                 }
                 break;
             case 12 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:76: T__24
+                // InternalCheckCfg.g:1:76: T__24
                 {
                 mT__24(); 
 
                 }
                 break;
             case 13 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:82: T__25
+                // InternalCheckCfg.g:1:82: T__25
                 {
                 mT__25(); 
 
                 }
                 break;
             case 14 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:88: T__26
+                // InternalCheckCfg.g:1:88: T__26
                 {
                 mT__26(); 
 
                 }
                 break;
             case 15 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:94: T__27
+                // InternalCheckCfg.g:1:94: T__27
                 {
                 mT__27(); 
 
                 }
                 break;
             case 16 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:100: T__28
+                // InternalCheckCfg.g:1:100: T__28
                 {
                 mT__28(); 
 
                 }
                 break;
             case 17 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:106: T__29
+                // InternalCheckCfg.g:1:106: T__29
                 {
                 mT__29(); 
 
                 }
                 break;
             case 18 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:112: T__30
+                // InternalCheckCfg.g:1:112: T__30
                 {
                 mT__30(); 
 
                 }
                 break;
             case 19 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:118: T__31
+                // InternalCheckCfg.g:1:118: T__31
                 {
                 mT__31(); 
 
                 }
                 break;
             case 20 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:124: T__32
+                // InternalCheckCfg.g:1:124: T__32
                 {
                 mT__32(); 
 
                 }
                 break;
             case 21 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:130: T__33
+                // InternalCheckCfg.g:1:130: T__33
                 {
                 mT__33(); 
 
                 }
                 break;
             case 22 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:136: T__34
+                // InternalCheckCfg.g:1:136: T__34
                 {
                 mT__34(); 
 
                 }
                 break;
             case 23 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:142: T__35
+                // InternalCheckCfg.g:1:142: T__35
                 {
                 mT__35(); 
 
                 }
                 break;
             case 24 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:148: T__36
+                // InternalCheckCfg.g:1:148: T__36
                 {
                 mT__36(); 
 
                 }
                 break;
             case 25 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:154: T__37
+                // InternalCheckCfg.g:1:154: T__37
                 {
                 mT__37(); 
 
                 }
                 break;
             case 26 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:160: T__38
+                // InternalCheckCfg.g:1:160: T__38
                 {
                 mT__38(); 
 
                 }
                 break;
             case 27 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:166: T__39
+                // InternalCheckCfg.g:1:166: T__39
                 {
                 mT__39(); 
 
                 }
                 break;
             case 28 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:172: T__40
+                // InternalCheckCfg.g:1:172: T__40
                 {
                 mT__40(); 
 
                 }
                 break;
             case 29 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:178: T__41
+                // InternalCheckCfg.g:1:178: T__41
                 {
                 mT__41(); 
 
                 }
                 break;
             case 30 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:184: T__42
+                // InternalCheckCfg.g:1:184: T__42
                 {
                 mT__42(); 
 
                 }
                 break;
             case 31 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:190: T__43
+                // InternalCheckCfg.g:1:190: T__43
                 {
                 mT__43(); 
 
                 }
                 break;
             case 32 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:196: T__44
+                // InternalCheckCfg.g:1:196: T__44
                 {
                 mT__44(); 
 
                 }
                 break;
             case 33 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:202: T__45
+                // InternalCheckCfg.g:1:202: T__45
                 {
                 mT__45(); 
 
                 }
                 break;
             case 34 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:208: T__46
+                // InternalCheckCfg.g:1:208: T__46
                 {
                 mT__46(); 
 
                 }
                 break;
             case 35 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:214: T__47
+                // InternalCheckCfg.g:1:214: T__47
                 {
                 mT__47(); 
 
                 }
                 break;
             case 36 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:220: T__48
+                // InternalCheckCfg.g:1:220: T__48
                 {
                 mT__48(); 
 
                 }
                 break;
             case 37 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:226: T__49
+                // InternalCheckCfg.g:1:226: T__49
                 {
                 mT__49(); 
 
                 }
                 break;
             case 38 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:232: T__50
+                // InternalCheckCfg.g:1:232: T__50
                 {
                 mT__50(); 
 
                 }
                 break;
             case 39 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:238: T__51
+                // InternalCheckCfg.g:1:238: T__51
                 {
                 mT__51(); 
 
                 }
                 break;
             case 40 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:244: T__52
+                // InternalCheckCfg.g:1:244: T__52
                 {
                 mT__52(); 
 
                 }
                 break;
             case 41 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:250: T__53
+                // InternalCheckCfg.g:1:250: T__53
                 {
                 mT__53(); 
 
                 }
                 break;
             case 42 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:256: T__54
+                // InternalCheckCfg.g:1:256: T__54
                 {
                 mT__54(); 
 
                 }
                 break;
             case 43 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:262: T__55
+                // InternalCheckCfg.g:1:262: T__55
                 {
                 mT__55(); 
 
                 }
                 break;
             case 44 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:268: T__56
+                // InternalCheckCfg.g:1:268: T__56
                 {
                 mT__56(); 
 
                 }
                 break;
             case 45 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:274: T__57
+                // InternalCheckCfg.g:1:274: T__57
                 {
                 mT__57(); 
 
                 }
                 break;
             case 46 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:280: T__58
+                // InternalCheckCfg.g:1:280: T__58
                 {
                 mT__58(); 
 
                 }
                 break;
             case 47 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:286: T__59
+                // InternalCheckCfg.g:1:286: T__59
                 {
                 mT__59(); 
 
                 }
                 break;
             case 48 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:292: T__60
+                // InternalCheckCfg.g:1:292: T__60
                 {
                 mT__60(); 
 
                 }
                 break;
             case 49 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:298: T__61
+                // InternalCheckCfg.g:1:298: T__61
                 {
                 mT__61(); 
 
                 }
                 break;
             case 50 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:304: T__62
+                // InternalCheckCfg.g:1:304: T__62
                 {
                 mT__62(); 
 
                 }
                 break;
             case 51 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:310: T__63
+                // InternalCheckCfg.g:1:310: T__63
                 {
                 mT__63(); 
 
                 }
                 break;
             case 52 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:316: T__64
+                // InternalCheckCfg.g:1:316: T__64
                 {
                 mT__64(); 
 
                 }
                 break;
             case 53 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:322: T__65
+                // InternalCheckCfg.g:1:322: T__65
                 {
                 mT__65(); 
 
                 }
                 break;
             case 54 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:328: T__66
+                // InternalCheckCfg.g:1:328: T__66
                 {
                 mT__66(); 
 
                 }
                 break;
             case 55 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:334: T__67
+                // InternalCheckCfg.g:1:334: T__67
                 {
                 mT__67(); 
 
                 }
                 break;
             case 56 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:340: T__68
+                // InternalCheckCfg.g:1:340: T__68
                 {
                 mT__68(); 
 
                 }
                 break;
             case 57 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:346: T__69
+                // InternalCheckCfg.g:1:346: T__69
                 {
                 mT__69(); 
 
                 }
                 break;
             case 58 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:352: T__70
+                // InternalCheckCfg.g:1:352: T__70
                 {
                 mT__70(); 
 
                 }
                 break;
             case 59 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:358: T__71
+                // InternalCheckCfg.g:1:358: T__71
                 {
                 mT__71(); 
 
                 }
                 break;
             case 60 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:364: T__72
+                // InternalCheckCfg.g:1:364: T__72
                 {
                 mT__72(); 
 
                 }
                 break;
             case 61 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:370: T__73
+                // InternalCheckCfg.g:1:370: T__73
                 {
                 mT__73(); 
 
                 }
                 break;
             case 62 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:376: T__74
+                // InternalCheckCfg.g:1:376: T__74
                 {
                 mT__74(); 
 
                 }
                 break;
             case 63 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:382: T__75
+                // InternalCheckCfg.g:1:382: T__75
                 {
                 mT__75(); 
 
                 }
                 break;
             case 64 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:388: T__76
+                // InternalCheckCfg.g:1:388: T__76
                 {
                 mT__76(); 
 
                 }
                 break;
             case 65 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:394: T__77
+                // InternalCheckCfg.g:1:394: T__77
                 {
                 mT__77(); 
 
                 }
                 break;
             case 66 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:400: T__78
+                // InternalCheckCfg.g:1:400: T__78
                 {
                 mT__78(); 
 
                 }
                 break;
             case 67 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:406: T__79
+                // InternalCheckCfg.g:1:406: T__79
                 {
                 mT__79(); 
 
                 }
                 break;
             case 68 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:412: T__80
+                // InternalCheckCfg.g:1:412: T__80
                 {
                 mT__80(); 
 
                 }
                 break;
             case 69 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:418: T__81
+                // InternalCheckCfg.g:1:418: T__81
                 {
                 mT__81(); 
 
                 }
                 break;
             case 70 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:424: T__82
+                // InternalCheckCfg.g:1:424: T__82
                 {
                 mT__82(); 
 
                 }
                 break;
             case 71 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:430: T__83
+                // InternalCheckCfg.g:1:430: T__83
                 {
                 mT__83(); 
 
                 }
                 break;
             case 72 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:436: T__84
+                // InternalCheckCfg.g:1:436: T__84
                 {
                 mT__84(); 
 
                 }
                 break;
             case 73 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:442: T__85
+                // InternalCheckCfg.g:1:442: T__85
                 {
                 mT__85(); 
 
                 }
                 break;
             case 74 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:448: T__86
+                // InternalCheckCfg.g:1:448: T__86
                 {
                 mT__86(); 
 
                 }
                 break;
             case 75 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:454: T__87
+                // InternalCheckCfg.g:1:454: T__87
                 {
                 mT__87(); 
 
                 }
                 break;
             case 76 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:460: T__88
+                // InternalCheckCfg.g:1:460: T__88
                 {
                 mT__88(); 
 
                 }
                 break;
             case 77 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:466: T__89
+                // InternalCheckCfg.g:1:466: T__89
                 {
                 mT__89(); 
 
                 }
                 break;
             case 78 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:472: T__90
+                // InternalCheckCfg.g:1:472: T__90
                 {
                 mT__90(); 
 
                 }
                 break;
             case 79 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:478: T__91
+                // InternalCheckCfg.g:1:478: T__91
                 {
                 mT__91(); 
 
                 }
                 break;
             case 80 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:484: T__92
+                // InternalCheckCfg.g:1:484: T__92
                 {
                 mT__92(); 
 
                 }
                 break;
             case 81 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:490: T__93
+                // InternalCheckCfg.g:1:490: T__93
                 {
                 mT__93(); 
 
                 }
                 break;
             case 82 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:496: RULE_HEX
+                // InternalCheckCfg.g:1:496: RULE_HEX
                 {
                 mRULE_HEX(); 
 
                 }
                 break;
             case 83 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:505: RULE_INT
+                // InternalCheckCfg.g:1:505: RULE_INT
                 {
                 mRULE_INT(); 
 
                 }
                 break;
             case 84 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:514: RULE_DECIMAL
+                // InternalCheckCfg.g:1:514: RULE_DECIMAL
                 {
                 mRULE_DECIMAL(); 
 
                 }
                 break;
             case 85 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:527: RULE_ID
+                // InternalCheckCfg.g:1:527: RULE_ID
                 {
                 mRULE_ID(); 
 
                 }
                 break;
             case 86 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:535: RULE_STRING
+                // InternalCheckCfg.g:1:535: RULE_STRING
                 {
                 mRULE_STRING(); 
 
                 }
                 break;
             case 87 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:547: RULE_ML_COMMENT
+                // InternalCheckCfg.g:1:547: RULE_ML_COMMENT
                 {
                 mRULE_ML_COMMENT(); 
 
                 }
                 break;
             case 88 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:563: RULE_SL_COMMENT
+                // InternalCheckCfg.g:1:563: RULE_SL_COMMENT
                 {
                 mRULE_SL_COMMENT(); 
 
                 }
                 break;
             case 89 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:579: RULE_WS
+                // InternalCheckCfg.g:1:579: RULE_WS
                 {
                 mRULE_WS(); 
 
                 }
                 break;
             case 90 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1:587: RULE_ANY_OTHER
+                // InternalCheckCfg.g:1:587: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -3280,88 +3280,19 @@ public void mTokens() throws RecognitionException {
 
     protected DFA21 dfa21 = new DFA21(this);
     static final String DFA21_eotS =
-        "\1\uffff\1\57\2\uffff\1\57\3\uffff\1\72\3\uffff\1\100\1\104\1\107"+
-        "\1\113\1\115\1\117\1\121\1\123\1\125\1\127\1\57\1\135\1\140\1\57"+
-        "\1\143\1\uffff\10\57\2\171\1\53\5\uffff\3\57\3\uffff\3\57\3\uffff"+
-        "\1\u0085\35\uffff\1\u0087\1\uffff\1\57\1\u008a\2\57\1\u008e\4\uffff"+
-        "\1\u008f\3\uffff\10\57\1\u0098\11\57\1\uffff\1\171\4\uffff\4\57"+
-        "\1\u00a9\2\57\4\uffff\2\57\1\uffff\2\57\3\uffff\10\57\1\uffff\2"+
-        "\57\1\u00ba\1\u00bb\1\u00bc\2\57\1\u00bf\7\57\1\u00c7\1\uffff\3"+
-        "\57\1\u00cb\2\57\1\u00ce\11\57\3\uffff\1\u00d8\1\u00d9\1\uffff\3"+
-        "\57\1\u00dd\2\57\1\u00e0\1\uffff\1\u00e1\2\57\1\uffff\2\57\1\uffff"+
-        "\1\57\1\u00e8\2\57\1\u00eb\2\57\1\u00ee\1\57\2\uffff\1\57\1\u00f1"+
-        "\1\57\1\uffff\2\57\2\uffff\2\57\1\u00f7\1\u00f8\2\57\1\uffff\1\u00fb"+
-        "\1\u00fc\1\uffff\2\57\1\uffff\1\57\1\u0100\1\uffff\1\u0101\1\57"+
-        "\1\u0103\1\u0104\1\57\2\uffff\1\u0106\1\57\2\uffff\1\57\1\u0109"+
-        "\1\u010a\2\uffff\1\57\2\uffff\1\57\1\uffff\2\57\2\uffff\2\57\1\u0111"+
-        "\2\57\1\u0114\1\uffff\2\57\1\uffff\2\57\1\u0119\1\u011a\2\uffff";
+        "\1\uffff\1\57\2\uffff\1\57\3\uffff\1\72\3\uffff\1\100\1\104\1\107\1\113\1\115\1\117\1\121\1\123\1\125\1\127\1\57\1\135\1\140\1\57\1\143\1\uffff\10\57\2\171\1\53\5\uffff\3\57\3\uffff\3\57\3\uffff\1\u0085\35\uffff\1\u0087\1\uffff\1\57\1\u008a\2\57\1\u008e\4\uffff\1\u008f\3\uffff\10\57\1\u0098\11\57\1\uffff\1\171\4\uffff\4\57\1\u00a9\2\57\4\uffff\2\57\1\uffff\2\57\3\uffff\10\57\1\uffff\2\57\1\u00ba\1\u00bb\1\u00bc\2\57\1\u00bf\7\57\1\u00c7\1\uffff\3\57\1\u00cb\2\57\1\u00ce\11\57\3\uffff\1\u00d8\1\u00d9\1\uffff\3\57\1\u00dd\2\57\1\u00e0\1\uffff\1\u00e1\2\57\1\uffff\2\57\1\uffff\1\57\1\u00e8\2\57\1\u00eb\2\57\1\u00ee\1\57\2\uffff\1\57\1\u00f1\1\57\1\uffff\2\57\2\uffff\2\57\1\u00f7\1\u00f8\2\57\1\uffff\1\u00fb\1\u00fc\1\uffff\2\57\1\uffff\1\57\1\u0100\1\uffff\1\u0101\1\57\1\u0103\1\u0104\1\57\2\uffff\1\u0106\1\57\2\uffff\1\57\1\u0109\1\u010a\2\uffff\1\57\2\uffff\1\57\1\uffff\2\57\2\uffff\2\57\1\u0111\2\57\1\u0114\1\uffff\2\57\1\uffff\2\57\1\u0119\1\u011a\2\uffff";
     static final String DFA21_eofS =
         "\u011b\uffff";
     static final String DFA21_minS =
-        "\1\0\1\141\2\uffff\1\141\3\uffff\1\75\3\uffff\1\53\1\55\2\52\1"+
-        "\75\1\76\1\75\1\174\1\46\1\75\1\146\2\56\1\163\1\72\1\uffff\1\154"+
-        "\1\164\1\145\2\141\1\145\1\150\1\145\2\60\1\44\5\uffff\1\145\1\156"+
-        "\1\163\3\uffff\1\162\1\154\1\156\3\uffff\1\75\35\uffff\1\75\1\uffff"+
-        "\1\146\1\44\1\160\1\156\1\74\4\uffff\1\44\3\uffff\1\163\1\164\1"+
-        "\162\1\151\1\141\1\160\1\156\1\146\1\44\1\151\1\162\1\154\1\167"+
-        "\1\154\1\165\1\160\1\162\1\164\1\uffff\1\60\4\uffff\1\143\1\146"+
-        "\1\141\1\145\1\44\1\163\1\141\4\uffff\1\164\1\157\1\uffff\2\157"+
-        "\3\uffff\2\145\1\157\2\164\1\145\1\143\1\141\1\uffff\1\154\1\156"+
-        "\3\44\1\154\1\145\1\44\1\145\1\157\1\165\1\153\1\151\1\154\1\150"+
-        "\1\44\1\uffff\1\145\1\154\1\141\1\44\2\162\1\44\1\156\1\162\1\143"+
-        "\1\151\1\162\1\150\1\165\1\145\1\151\3\uffff\2\44\1\uffff\1\157"+
-        "\1\167\1\162\1\44\1\147\1\157\1\44\1\uffff\1\44\1\154\1\156\1\uffff"+
-        "\1\164\1\145\1\uffff\1\144\1\44\1\150\1\143\1\44\1\162\1\154\1\44"+
-        "\1\156\2\uffff\1\146\1\44\1\156\1\uffff\1\165\1\147\2\uffff\1\171"+
-        "\1\143\2\44\1\163\1\151\1\uffff\2\44\1\uffff\1\157\1\164\1\uffff"+
-        "\1\147\1\44\1\uffff\1\44\1\162\2\44\1\145\2\uffff\1\44\1\157\2\uffff"+
-        "\1\156\2\44\2\uffff\1\141\2\uffff\1\157\1\uffff\1\156\1\151\2\uffff"+
-        "\1\164\1\146\1\44\1\172\1\151\1\44\1\uffff\1\145\1\157\1\uffff\1"+
-        "\144\1\156\2\44\2\uffff";
+        "\1\0\1\141\2\uffff\1\141\3\uffff\1\75\3\uffff\1\53\1\55\2\52\1\75\1\76\1\75\1\174\1\46\1\75\1\146\2\56\1\163\1\72\1\uffff\1\154\1\164\1\145\2\141\1\145\1\150\1\145\2\60\1\44\5\uffff\1\145\1\156\1\163\3\uffff\1\162\1\154\1\156\3\uffff\1\75\35\uffff\1\75\1\uffff\1\146\1\44\1\160\1\156\1\74\4\uffff\1\44\3\uffff\1\163\1\164\1\162\1\151\1\141\1\160\1\156\1\146\1\44\1\151\1\162\1\154\1\167\1\154\1\165\1\160\1\162\1\164\1\uffff\1\60\4\uffff\1\143\1\146\1\141\1\145\1\44\1\163\1\141\4\uffff\1\164\1\157\1\uffff\2\157\3\uffff\2\145\1\157\2\164\1\145\1\143\1\141\1\uffff\1\154\1\156\3\44\1\154\1\145\1\44\1\145\1\157\1\165\1\153\1\151\1\154\1\150\1\44\1\uffff\1\145\1\154\1\141\1\44\2\162\1\44\1\156\1\162\1\143\1\151\1\162\1\150\1\165\1\145\1\151\3\uffff\2\44\1\uffff\1\157\1\167\1\162\1\44\1\147\1\157\1\44\1\uffff\1\44\1\154\1\156\1\uffff\1\164\1\145\1\uffff\1\144\1\44\1\150\1\143\1\44\1\162\1\154\1\44\1\156\2\uffff\1\146\1\44\1\156\1\uffff\1\165\1\147\2\uffff\1\171\1\143\2\44\1\163\1\151\1\uffff\2\44\1\uffff\1\157\1\164\1\uffff\1\147\1\44\1\uffff\1\44\1\162\2\44\1\145\2\uffff\1\44\1\157\2\uffff\1\156\2\44\2\uffff\1\141\2\uffff\1\157\1\uffff\1\156\1\151\2\uffff\1\164\1\146\1\44\1\172\1\151\1\44\1\uffff\1\145\1\157\1\uffff\1\144\1\156\2\44\2\uffff";
     static final String DFA21_maxS =
-        "\1\uffff\1\157\2\uffff\1\157\3\uffff\1\76\3\uffff\1\75\1\76\3\75"+
-        "\1\76\1\75\1\174\1\46\1\75\1\156\1\56\1\72\1\163\1\72\1\uffff\1"+
-        "\170\1\171\1\157\1\150\1\141\1\165\1\171\1\145\1\170\1\154\1\172"+
-        "\5\uffff\1\145\1\156\1\164\3\uffff\1\162\1\154\1\156\3\uffff\1\75"+
-        "\35\uffff\1\75\1\uffff\1\163\1\172\1\160\1\156\1\74\4\uffff\1\172"+
-        "\3\uffff\1\163\1\164\1\162\1\151\1\141\1\160\1\156\1\146\1\172\1"+
-        "\151\2\162\1\167\1\154\1\171\1\160\1\162\1\164\1\uffff\1\154\4\uffff"+
-        "\1\143\1\146\1\143\1\145\1\172\1\163\1\141\4\uffff\1\164\1\157\1"+
-        "\uffff\2\157\3\uffff\2\145\1\157\2\164\1\145\1\143\1\141\1\uffff"+
-        "\1\154\1\156\3\172\1\154\1\145\1\172\1\145\1\157\1\165\1\153\1\151"+
-        "\1\154\1\150\1\172\1\uffff\1\145\1\154\1\141\1\172\2\162\1\172\1"+
-        "\156\1\162\1\143\1\151\1\162\1\150\1\165\1\145\1\151\3\uffff\2\172"+
-        "\1\uffff\1\157\1\167\1\162\1\172\1\147\1\157\1\172\1\uffff\1\172"+
-        "\1\154\1\156\1\uffff\1\164\1\145\1\uffff\1\163\1\172\1\150\1\143"+
-        "\1\172\1\162\1\154\1\172\1\156\2\uffff\1\146\1\172\1\156\1\uffff"+
-        "\1\165\1\147\2\uffff\1\171\1\143\2\172\1\163\1\151\1\uffff\2\172"+
-        "\1\uffff\1\157\1\164\1\uffff\1\147\1\172\1\uffff\1\172\1\162\2\172"+
-        "\1\145\2\uffff\1\172\1\157\2\uffff\1\156\2\172\2\uffff\1\141\2\uffff"+
-        "\1\157\1\uffff\1\156\1\151\2\uffff\1\164\1\146\2\172\1\151\1\172"+
-        "\1\uffff\1\145\1\157\1\uffff\1\144\1\156\2\172\2\uffff";
+        "\1\uffff\1\157\2\uffff\1\157\3\uffff\1\76\3\uffff\1\75\1\76\3\75\1\76\1\75\1\174\1\46\1\75\1\156\1\56\1\72\1\163\1\72\1\uffff\1\170\1\171\1\157\1\150\1\141\1\165\1\171\1\145\1\170\1\154\1\172\5\uffff\1\145\1\156\1\164\3\uffff\1\162\1\154\1\156\3\uffff\1\75\35\uffff\1\75\1\uffff\1\163\1\172\1\160\1\156\1\74\4\uffff\1\172\3\uffff\1\163\1\164\1\162\1\151\1\141\1\160\1\156\1\146\1\172\1\151\2\162\1\167\1\154\1\171\1\160\1\162\1\164\1\uffff\1\154\4\uffff\1\143\1\146\1\143\1\145\1\172\1\163\1\141\4\uffff\1\164\1\157\1\uffff\2\157\3\uffff\2\145\1\157\2\164\1\145\1\143\1\141\1\uffff\1\154\1\156\3\172\1\154\1\145\1\172\1\145\1\157\1\165\1\153\1\151\1\154\1\150\1\172\1\uffff\1\145\1\154\1\141\1\172\2\162\1\172\1\156\1\162\1\143\1\151\1\162\1\150\1\165\1\145\1\151\3\uffff\2\172\1\uffff\1\157\1\167\1\162\1\172\1\147\1\157\1\172\1\uffff\1\172\1\154\1\156\1\uffff\1\164\1\145\1\uffff\1\163\1\172\1\150\1\143\1\172\1\162\1\154\1\172\1\156\2\uffff\1\146\1\172\1\156\1\uffff\1\165\1\147\2\uffff\1\171\1\143\2\172\1\163\1\151\1\uffff\2\172\1\uffff\1\157\1\164\1\uffff\1\147\1\172\1\uffff\1\172\1\162\2\172\1\145\2\uffff\1\172\1\157\2\uffff\1\156\2\172\2\uffff\1\141\2\uffff\1\157\1\uffff\1\156\1\151\2\uffff\1\164\1\146\2\172\1\151\1\172\1\uffff\1\145\1\157\1\uffff\1\144\1\156\2\172\2\uffff";
     static final String DFA21_acceptS =
-        "\2\uffff\1\3\1\4\1\uffff\1\7\1\10\1\11\1\uffff\1\13\1\14\1\15\17"+
-        "\uffff\1\61\13\uffff\1\125\2\126\1\131\1\132\3\uffff\1\125\1\3\1"+
-        "\4\3\uffff\1\7\1\10\1\11\1\uffff\1\40\1\12\1\13\1\14\1\15\1\16\1"+
-        "\53\1\43\1\17\1\35\1\54\1\44\1\20\1\46\1\45\1\21\1\127\1\130\1\47"+
-        "\1\22\1\50\1\41\1\23\1\25\1\24\1\26\1\60\1\27\1\115\1\uffff\1\51"+
-        "\5\uffff\1\55\1\42\1\57\1\114\1\uffff\1\56\1\65\1\61\22\uffff\1"+
-        "\122\1\uffff\1\123\1\124\1\126\1\131\7\uffff\1\32\1\30\1\33\1\31"+
-        "\2\uffff\1\62\2\uffff\1\36\1\37\1\52\10\uffff\1\71\20\uffff\1\5"+
-        "\20\uffff\1\72\1\73\1\101\2\uffff\1\110\7\uffff\1\67\3\uffff\1\120"+
-        "\2\uffff\1\63\11\uffff\1\104\1\103\3\uffff\1\1\2\uffff\1\113\1\102"+
-        "\6\uffff\1\116\2\uffff\1\100\2\uffff\1\70\2\uffff\1\106\5\uffff"+
-        "\1\76\1\121\2\uffff\1\64\1\75\3\uffff\1\105\1\107\1\uffff\1\6\1"+
-        "\111\1\uffff\1\74\2\uffff\1\66\1\117\6\uffff\1\77\2\uffff\1\34\4"+
-        "\uffff\1\112\1\2";
+        "\2\uffff\1\3\1\4\1\uffff\1\7\1\10\1\11\1\uffff\1\13\1\14\1\15\17\uffff\1\61\13\uffff\1\125\2\126\1\131\1\132\3\uffff\1\125\1\3\1\4\3\uffff\1\7\1\10\1\11\1\uffff\1\40\1\12\1\13\1\14\1\15\1\16\1\53\1\43\1\17\1\35\1\54\1\44\1\20\1\46\1\45\1\21\1\127\1\130\1\47\1\22\1\50\1\41\1\23\1\25\1\24\1\26\1\60\1\27\1\115\1\uffff\1\51\5\uffff\1\55\1\42\1\57\1\114\1\uffff\1\56\1\65\1\61\22\uffff\1\122\1\uffff\1\123\1\124\1\126\1\131\7\uffff\1\32\1\30\1\33\1\31\2\uffff\1\62\2\uffff\1\36\1\37\1\52\10\uffff\1\71\20\uffff\1\5\20\uffff\1\72\1\73\1\101\2\uffff\1\110\7\uffff\1\67\3\uffff\1\120\2\uffff\1\63\11\uffff\1\104\1\103\3\uffff\1\1\2\uffff\1\113\1\102\6\uffff\1\116\2\uffff\1\100\2\uffff\1\70\2\uffff\1\106\5\uffff\1\76\1\121\2\uffff\1\64\1\75\3\uffff\1\105\1\107\1\uffff\1\6\1\111\1\uffff\1\74\2\uffff\1\66\1\117\6\uffff\1\77\2\uffff\1\34\4\uffff\1\112\1\2";
     static final String DFA21_specialS =
         "\1\0\u011a\uffff}>";
     static final String[] DFA21_transitionS = {
-            "\11\53\2\52\2\53\1\52\22\53\1\52\1\25\1\50\1\11\1\47\1\20\1"+
-            "\24\1\51\1\5\1\7\1\16\1\14\1\6\1\15\1\27\1\17\1\44\11\45\1\32"+
-            "\1\33\1\21\1\10\1\22\1\30\1\53\32\47\1\12\1\53\1\13\1\46\1\47"+
-            "\1\53\1\31\1\47\1\1\1\36\1\34\1\4\2\47\1\26\4\47\1\41\3\47\1"+
-            "\43\1\35\1\42\1\47\1\40\1\37\3\47\1\2\1\23\1\3\uff82\53",
+            "\11\53\2\52\2\53\1\52\22\53\1\52\1\25\1\50\1\11\1\47\1\20\1\24\1\51\1\5\1\7\1\16\1\14\1\6\1\15\1\27\1\17\1\44\11\45\1\32\1\33\1\21\1\10\1\22\1\30\1\53\32\47\1\12\1\53\1\13\1\46\1\47\1\53\1\31\1\47\1\1\1\36\1\34\1\4\2\47\1\26\4\47\1\41\3\47\1\43\1\35\1\42\1\47\1\40\1\37\3\47\1\2\1\23\1\3\uff82\53",
             "\1\56\6\uffff\1\54\6\uffff\1\55",
             "",
             "",
@@ -3397,11 +3328,8 @@ public void mTokens() throws RecognitionException {
             "\1\161\17\uffff\1\162",
             "\1\165\11\uffff\1\163\6\uffff\1\164",
             "\1\166",
-            "\12\170\10\uffff\1\172\1\uffff\3\172\5\uffff\1\172\13\uffff"+
-            "\1\167\6\uffff\1\170\2\uffff\1\172\1\uffff\3\172\5\uffff\1\172"+
-            "\13\uffff\1\167",
-            "\12\170\10\uffff\1\172\1\uffff\3\172\5\uffff\1\172\22\uffff"+
-            "\1\170\2\uffff\1\172\1\uffff\3\172\5\uffff\1\172",
+            "\12\170\10\uffff\1\172\1\uffff\3\172\5\uffff\1\172\13\uffff\1\167\6\uffff\1\170\2\uffff\1\172\1\uffff\3\172\5\uffff\1\172\13\uffff\1\167",
+            "\12\170\10\uffff\1\172\1\uffff\3\172\5\uffff\1\172\22\uffff\1\170\2\uffff\1\172\1\uffff\3\172\5\uffff\1\172",
             "\1\57\34\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "",
             "",
@@ -3453,8 +3381,7 @@ public void mTokens() throws RecognitionException {
             "\1\u0086",
             "",
             "\1\u0089\14\uffff\1\u0088",
-            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32"+
-            "\57",
+            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "\1\u008b",
             "\1\u008c",
             "\1\u008d",
@@ -3462,8 +3389,7 @@ public void mTokens() throws RecognitionException {
             "",
             "",
             "",
-            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32"+
-            "\57",
+            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "",
             "",
             "",
@@ -3475,8 +3401,7 @@ public void mTokens() throws RecognitionException {
             "\1\u0095",
             "\1\u0096",
             "\1\u0097",
-            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32"+
-            "\57",
+            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "\1\u0099",
             "\1\u009a",
             "\1\u009c\5\uffff\1\u009b",
@@ -3487,8 +3412,7 @@ public void mTokens() throws RecognitionException {
             "\1\u00a2",
             "\1\u00a3",
             "",
-            "\12\170\10\uffff\1\172\1\uffff\3\172\5\uffff\1\172\22\uffff"+
-            "\1\170\2\uffff\1\172\1\uffff\3\172\5\uffff\1\172",
+            "\12\170\10\uffff\1\172\1\uffff\3\172\5\uffff\1\172\22\uffff\1\170\2\uffff\1\172\1\uffff\3\172\5\uffff\1\172",
             "",
             "",
             "",
@@ -3497,8 +3421,7 @@ public void mTokens() throws RecognitionException {
             "\1\u00a5",
             "\1\u00a6\1\uffff\1\u00a7",
             "\1\u00a8",
-            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32"+
-            "\57",
+            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "\1\u00aa",
             "\1\u00ab",
             "",
@@ -3524,16 +3447,12 @@ public void mTokens() throws RecognitionException {
             "",
             "\1\u00b8",
             "\1\u00b9",
-            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32"+
-            "\57",
-            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32"+
-            "\57",
-            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32"+
-            "\57",
+            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
+            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
+            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "\1\u00bd",
             "\1\u00be",
-            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32"+
-            "\57",
+            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "\1\u00c0",
             "\1\u00c1",
             "\1\u00c2",
@@ -3541,18 +3460,15 @@ public void mTokens() throws RecognitionException {
             "\1\u00c4",
             "\1\u00c5",
             "\1\u00c6",
-            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32"+
-            "\57",
+            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "",
             "\1\u00c8",
             "\1\u00c9",
             "\1\u00ca",
-            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32"+
-            "\57",
+            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "\1\u00cc",
             "\1\u00cd",
-            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32"+
-            "\57",
+            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "\1\u00cf",
             "\1\u00d0",
             "\1\u00d1",
@@ -3565,23 +3481,18 @@ public void mTokens() throws RecognitionException {
             "",
             "",
             "",
-            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32"+
-            "\57",
-            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32"+
-            "\57",
+            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
+            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "",
             "\1\u00da",
             "\1\u00db",
             "\1\u00dc",
-            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32"+
-            "\57",
+            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "\1\u00de",
             "\1\u00df",
-            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32"+
-            "\57",
+            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "",
-            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32"+
-            "\57",
+            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "\1\u00e2",
             "\1\u00e3",
             "",
@@ -3589,22 +3500,18 @@ public void mTokens() throws RecognitionException {
             "\1\u00e5",
             "",
             "\1\u00e6\16\uffff\1\u00e7",
-            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32"+
-            "\57",
+            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "\1\u00e9",
             "\1\u00ea",
-            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32"+
-            "\57",
+            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "\1\u00ec",
             "\1\u00ed",
-            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32"+
-            "\57",
+            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "\1\u00ef",
             "",
             "",
             "\1\u00f0",
-            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32"+
-            "\57",
+            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "\1\u00f2",
             "",
             "\1\u00f3",
@@ -3613,45 +3520,34 @@ public void mTokens() throws RecognitionException {
             "",
             "\1\u00f5",
             "\1\u00f6",
-            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32"+
-            "\57",
-            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32"+
-            "\57",
+            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
+            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "\1\u00f9",
             "\1\u00fa",
             "",
-            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32"+
-            "\57",
-            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32"+
-            "\57",
+            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
+            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "",
             "\1\u00fd",
             "\1\u00fe",
             "",
             "\1\u00ff",
-            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32"+
-            "\57",
+            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "",
-            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32"+
-            "\57",
+            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "\1\u0102",
-            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32"+
-            "\57",
-            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32"+
-            "\57",
+            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
+            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "\1\u0105",
             "",
             "",
-            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32"+
-            "\57",
+            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "\1\u0107",
             "",
             "",
             "\1\u0108",
-            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32"+
-            "\57",
-            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32"+
-            "\57",
+            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
+            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "",
             "",
             "\1\u010b",
@@ -3665,22 +3561,18 @@ public void mTokens() throws RecognitionException {
             "",
             "\1\u010f",
             "\1\u0110",
-            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32"+
-            "\57",
+            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "\1\u0112",
             "\1\u0113",
-            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32"+
-            "\57",
+            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "",
             "\1\u0115",
             "\1\u0116",
             "",
             "\1\u0117",
             "\1\u0118",
-            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32"+
-            "\57",
-            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32"+
-            "\57",
+            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
+            "\1\57\13\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "",
             ""
     };
diff --git a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfgParser.java b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfgParser.java
index b28033b83..aa928d8ed 100644
--- a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfgParser.java
+++ b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfgParser.java
@@ -131,7 +131,7 @@ public InternalCheckCfgParser(TokenStream input, RecognizerSharedState state) {
         
 
     public String[] getTokenNames() { return InternalCheckCfgParser.tokenNames; }
-    public String getGrammarFileName() { return "../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g"; }
+    public String getGrammarFileName() { return "InternalCheckCfg.g"; }
 
 
 
@@ -156,7 +156,7 @@ protected CheckCfgGrammarAccess getGrammarAccess() {
 
 
     // $ANTLR start "entryRuleCheckConfiguration"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:68:1: entryRuleCheckConfiguration returns [EObject current=null] : iv_ruleCheckConfiguration= ruleCheckConfiguration EOF ;
+    // InternalCheckCfg.g:68:1: entryRuleCheckConfiguration returns [EObject current=null] : iv_ruleCheckConfiguration= ruleCheckConfiguration EOF ;
     public final EObject entryRuleCheckConfiguration() throws RecognitionException {
         EObject current = null;
 
@@ -164,13 +164,13 @@ public final EObject entryRuleCheckConfiguration() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:69:2: (iv_ruleCheckConfiguration= ruleCheckConfiguration EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:70:2: iv_ruleCheckConfiguration= ruleCheckConfiguration EOF
+            // InternalCheckCfg.g:69:2: (iv_ruleCheckConfiguration= ruleCheckConfiguration EOF )
+            // InternalCheckCfg.g:70:2: iv_ruleCheckConfiguration= ruleCheckConfiguration EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getCheckConfigurationRule()); 
             }
-            pushFollow(FOLLOW_ruleCheckConfiguration_in_entryRuleCheckConfiguration75);
+            pushFollow(FOLLOW_1);
             iv_ruleCheckConfiguration=ruleCheckConfiguration();
 
             state._fsp--;
@@ -178,7 +178,7 @@ public final EObject entryRuleCheckConfiguration() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleCheckConfiguration; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleCheckConfiguration85); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -196,7 +196,7 @@ public final EObject entryRuleCheckConfiguration() throws RecognitionException {
 
 
     // $ANTLR start "ruleCheckConfiguration"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:77:1: ruleCheckConfiguration returns [EObject current=null] : (otherlv_0= 'check' otherlv_1= 'configuration' ( (lv_name_2_0= ruleValidID ) ) ( (lv_parameterConfigurations_3_0= ruleConfiguredParameter ) )* ( (lv_languageValidatorConfigurations_4_0= ruleConfiguredLanguageValidator ) )* (otherlv_5= '{' ( (lv_legacyCatalogConfigurations_6_0= ruleConfiguredCatalog ) )* otherlv_7= '}' )? ) ;
+    // InternalCheckCfg.g:77:1: ruleCheckConfiguration returns [EObject current=null] : (otherlv_0= 'check' otherlv_1= 'configuration' ( (lv_name_2_0= ruleValidID ) ) ( (lv_parameterConfigurations_3_0= ruleConfiguredParameter ) )* ( (lv_languageValidatorConfigurations_4_0= ruleConfiguredLanguageValidator ) )* (otherlv_5= '{' ( (lv_legacyCatalogConfigurations_6_0= ruleConfiguredCatalog ) )* otherlv_7= '}' )? ) ;
     public final EObject ruleCheckConfiguration() throws RecognitionException {
         EObject current = null;
 
@@ -216,36 +216,36 @@ public final EObject ruleCheckConfiguration() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:80:28: ( (otherlv_0= 'check' otherlv_1= 'configuration' ( (lv_name_2_0= ruleValidID ) ) ( (lv_parameterConfigurations_3_0= ruleConfiguredParameter ) )* ( (lv_languageValidatorConfigurations_4_0= ruleConfiguredLanguageValidator ) )* (otherlv_5= '{' ( (lv_legacyCatalogConfigurations_6_0= ruleConfiguredCatalog ) )* otherlv_7= '}' )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:81:1: (otherlv_0= 'check' otherlv_1= 'configuration' ( (lv_name_2_0= ruleValidID ) ) ( (lv_parameterConfigurations_3_0= ruleConfiguredParameter ) )* ( (lv_languageValidatorConfigurations_4_0= ruleConfiguredLanguageValidator ) )* (otherlv_5= '{' ( (lv_legacyCatalogConfigurations_6_0= ruleConfiguredCatalog ) )* otherlv_7= '}' )? )
+            // InternalCheckCfg.g:80:28: ( (otherlv_0= 'check' otherlv_1= 'configuration' ( (lv_name_2_0= ruleValidID ) ) ( (lv_parameterConfigurations_3_0= ruleConfiguredParameter ) )* ( (lv_languageValidatorConfigurations_4_0= ruleConfiguredLanguageValidator ) )* (otherlv_5= '{' ( (lv_legacyCatalogConfigurations_6_0= ruleConfiguredCatalog ) )* otherlv_7= '}' )? ) )
+            // InternalCheckCfg.g:81:1: (otherlv_0= 'check' otherlv_1= 'configuration' ( (lv_name_2_0= ruleValidID ) ) ( (lv_parameterConfigurations_3_0= ruleConfiguredParameter ) )* ( (lv_languageValidatorConfigurations_4_0= ruleConfiguredLanguageValidator ) )* (otherlv_5= '{' ( (lv_legacyCatalogConfigurations_6_0= ruleConfiguredCatalog ) )* otherlv_7= '}' )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:81:1: (otherlv_0= 'check' otherlv_1= 'configuration' ( (lv_name_2_0= ruleValidID ) ) ( (lv_parameterConfigurations_3_0= ruleConfiguredParameter ) )* ( (lv_languageValidatorConfigurations_4_0= ruleConfiguredLanguageValidator ) )* (otherlv_5= '{' ( (lv_legacyCatalogConfigurations_6_0= ruleConfiguredCatalog ) )* otherlv_7= '}' )? )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:81:3: otherlv_0= 'check' otherlv_1= 'configuration' ( (lv_name_2_0= ruleValidID ) ) ( (lv_parameterConfigurations_3_0= ruleConfiguredParameter ) )* ( (lv_languageValidatorConfigurations_4_0= ruleConfiguredLanguageValidator ) )* (otherlv_5= '{' ( (lv_legacyCatalogConfigurations_6_0= ruleConfiguredCatalog ) )* otherlv_7= '}' )?
+            // InternalCheckCfg.g:81:1: (otherlv_0= 'check' otherlv_1= 'configuration' ( (lv_name_2_0= ruleValidID ) ) ( (lv_parameterConfigurations_3_0= ruleConfiguredParameter ) )* ( (lv_languageValidatorConfigurations_4_0= ruleConfiguredLanguageValidator ) )* (otherlv_5= '{' ( (lv_legacyCatalogConfigurations_6_0= ruleConfiguredCatalog ) )* otherlv_7= '}' )? )
+            // InternalCheckCfg.g:81:3: otherlv_0= 'check' otherlv_1= 'configuration' ( (lv_name_2_0= ruleValidID ) ) ( (lv_parameterConfigurations_3_0= ruleConfiguredParameter ) )* ( (lv_languageValidatorConfigurations_4_0= ruleConfiguredLanguageValidator ) )* (otherlv_5= '{' ( (lv_legacyCatalogConfigurations_6_0= ruleConfiguredCatalog ) )* otherlv_7= '}' )?
             {
-            otherlv_0=(Token)match(input,13,FOLLOW_13_in_ruleCheckConfiguration122); if (state.failed) return current;
+            otherlv_0=(Token)match(input,13,FOLLOW_3); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getCheckConfigurationAccess().getCheckKeyword_0());
                   
             }
-            otherlv_1=(Token)match(input,14,FOLLOW_14_in_ruleCheckConfiguration134); if (state.failed) return current;
+            otherlv_1=(Token)match(input,14,FOLLOW_4); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getCheckConfigurationAccess().getConfigurationKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:89:1: ( (lv_name_2_0= ruleValidID ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:90:1: (lv_name_2_0= ruleValidID )
+            // InternalCheckCfg.g:89:1: ( (lv_name_2_0= ruleValidID ) )
+            // InternalCheckCfg.g:90:1: (lv_name_2_0= ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:90:1: (lv_name_2_0= ruleValidID )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:91:3: lv_name_2_0= ruleValidID
+            // InternalCheckCfg.g:90:1: (lv_name_2_0= ruleValidID )
+            // InternalCheckCfg.g:91:3: lv_name_2_0= ruleValidID
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getCheckConfigurationAccess().getNameValidIDParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleValidID_in_ruleCheckConfiguration155);
+            pushFollow(FOLLOW_5);
             lv_name_2_0=ruleValidID();
 
             state._fsp--;
@@ -259,7 +259,7 @@ public final EObject ruleCheckConfiguration() throws RecognitionException {
                      			current, 
                      			"name",
                       		lv_name_2_0, 
-                      		"ValidID");
+                      		"org.eclipse.xtext.xbase.Xtype.ValidID");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -269,7 +269,7 @@ public final EObject ruleCheckConfiguration() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:107:2: ( (lv_parameterConfigurations_3_0= ruleConfiguredParameter ) )*
+            // InternalCheckCfg.g:107:2: ( (lv_parameterConfigurations_3_0= ruleConfiguredParameter ) )*
             loop1:
             do {
                 int alt1=2;
@@ -282,17 +282,17 @@ public final EObject ruleCheckConfiguration() throws RecognitionException {
 
                 switch (alt1) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:108:1: (lv_parameterConfigurations_3_0= ruleConfiguredParameter )
+            	    // InternalCheckCfg.g:108:1: (lv_parameterConfigurations_3_0= ruleConfiguredParameter )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:108:1: (lv_parameterConfigurations_3_0= ruleConfiguredParameter )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:109:3: lv_parameterConfigurations_3_0= ruleConfiguredParameter
+            	    // InternalCheckCfg.g:108:1: (lv_parameterConfigurations_3_0= ruleConfiguredParameter )
+            	    // InternalCheckCfg.g:109:3: lv_parameterConfigurations_3_0= ruleConfiguredParameter
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getCheckConfigurationAccess().getParameterConfigurationsConfiguredParameterParserRuleCall_3_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleConfiguredParameter_in_ruleCheckConfiguration176);
+            	    pushFollow(FOLLOW_5);
             	    lv_parameterConfigurations_3_0=ruleConfiguredParameter();
 
             	    state._fsp--;
@@ -306,7 +306,7 @@ public final EObject ruleCheckConfiguration() throws RecognitionException {
             	             			current, 
             	             			"parameterConfigurations",
             	              		lv_parameterConfigurations_3_0, 
-            	              		"ConfiguredParameter");
+            	              		"com.avaloq.tools.ddk.checkcfg.CheckCfg.ConfiguredParameter");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -322,7 +322,7 @@ public final EObject ruleCheckConfiguration() throws RecognitionException {
                 }
             } while (true);
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:125:3: ( (lv_languageValidatorConfigurations_4_0= ruleConfiguredLanguageValidator ) )*
+            // InternalCheckCfg.g:125:3: ( (lv_languageValidatorConfigurations_4_0= ruleConfiguredLanguageValidator ) )*
             loop2:
             do {
                 int alt2=2;
@@ -335,17 +335,17 @@ public final EObject ruleCheckConfiguration() throws RecognitionException {
 
                 switch (alt2) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:126:1: (lv_languageValidatorConfigurations_4_0= ruleConfiguredLanguageValidator )
+            	    // InternalCheckCfg.g:126:1: (lv_languageValidatorConfigurations_4_0= ruleConfiguredLanguageValidator )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:126:1: (lv_languageValidatorConfigurations_4_0= ruleConfiguredLanguageValidator )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:127:3: lv_languageValidatorConfigurations_4_0= ruleConfiguredLanguageValidator
+            	    // InternalCheckCfg.g:126:1: (lv_languageValidatorConfigurations_4_0= ruleConfiguredLanguageValidator )
+            	    // InternalCheckCfg.g:127:3: lv_languageValidatorConfigurations_4_0= ruleConfiguredLanguageValidator
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getCheckConfigurationAccess().getLanguageValidatorConfigurationsConfiguredLanguageValidatorParserRuleCall_4_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleConfiguredLanguageValidator_in_ruleCheckConfiguration198);
+            	    pushFollow(FOLLOW_6);
             	    lv_languageValidatorConfigurations_4_0=ruleConfiguredLanguageValidator();
 
             	    state._fsp--;
@@ -359,7 +359,7 @@ public final EObject ruleCheckConfiguration() throws RecognitionException {
             	             			current, 
             	             			"languageValidatorConfigurations",
             	              		lv_languageValidatorConfigurations_4_0, 
-            	              		"ConfiguredLanguageValidator");
+            	              		"com.avaloq.tools.ddk.checkcfg.CheckCfg.ConfiguredLanguageValidator");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -375,7 +375,7 @@ public final EObject ruleCheckConfiguration() throws RecognitionException {
                 }
             } while (true);
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:143:3: (otherlv_5= '{' ( (lv_legacyCatalogConfigurations_6_0= ruleConfiguredCatalog ) )* otherlv_7= '}' )?
+            // InternalCheckCfg.g:143:3: (otherlv_5= '{' ( (lv_legacyCatalogConfigurations_6_0= ruleConfiguredCatalog ) )* otherlv_7= '}' )?
             int alt4=2;
             int LA4_0 = input.LA(1);
 
@@ -384,15 +384,15 @@ public final EObject ruleCheckConfiguration() throws RecognitionException {
             }
             switch (alt4) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:143:5: otherlv_5= '{' ( (lv_legacyCatalogConfigurations_6_0= ruleConfiguredCatalog ) )* otherlv_7= '}'
+                    // InternalCheckCfg.g:143:5: otherlv_5= '{' ( (lv_legacyCatalogConfigurations_6_0= ruleConfiguredCatalog ) )* otherlv_7= '}'
                     {
-                    otherlv_5=(Token)match(input,15,FOLLOW_15_in_ruleCheckConfiguration212); if (state.failed) return current;
+                    otherlv_5=(Token)match(input,15,FOLLOW_7); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_5, grammarAccess.getCheckConfigurationAccess().getLeftCurlyBracketKeyword_5_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:147:1: ( (lv_legacyCatalogConfigurations_6_0= ruleConfiguredCatalog ) )*
+                    // InternalCheckCfg.g:147:1: ( (lv_legacyCatalogConfigurations_6_0= ruleConfiguredCatalog ) )*
                     loop3:
                     do {
                         int alt3=2;
@@ -405,17 +405,17 @@ public final EObject ruleCheckConfiguration() throws RecognitionException {
 
                         switch (alt3) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:148:1: (lv_legacyCatalogConfigurations_6_0= ruleConfiguredCatalog )
+                    	    // InternalCheckCfg.g:148:1: (lv_legacyCatalogConfigurations_6_0= ruleConfiguredCatalog )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:148:1: (lv_legacyCatalogConfigurations_6_0= ruleConfiguredCatalog )
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:149:3: lv_legacyCatalogConfigurations_6_0= ruleConfiguredCatalog
+                    	    // InternalCheckCfg.g:148:1: (lv_legacyCatalogConfigurations_6_0= ruleConfiguredCatalog )
+                    	    // InternalCheckCfg.g:149:3: lv_legacyCatalogConfigurations_6_0= ruleConfiguredCatalog
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getCheckConfigurationAccess().getLegacyCatalogConfigurationsConfiguredCatalogParserRuleCall_5_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleConfiguredCatalog_in_ruleCheckConfiguration233);
+                    	    pushFollow(FOLLOW_7);
                     	    lv_legacyCatalogConfigurations_6_0=ruleConfiguredCatalog();
 
                     	    state._fsp--;
@@ -429,7 +429,7 @@ public final EObject ruleCheckConfiguration() throws RecognitionException {
                     	             			current, 
                     	             			"legacyCatalogConfigurations",
                     	              		lv_legacyCatalogConfigurations_6_0, 
-                    	              		"ConfiguredCatalog");
+                    	              		"com.avaloq.tools.ddk.checkcfg.CheckCfg.ConfiguredCatalog");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -445,7 +445,7 @@ public final EObject ruleCheckConfiguration() throws RecognitionException {
                         }
                     } while (true);
 
-                    otherlv_7=(Token)match(input,16,FOLLOW_16_in_ruleCheckConfiguration246); if (state.failed) return current;
+                    otherlv_7=(Token)match(input,16,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_7, grammarAccess.getCheckConfigurationAccess().getRightCurlyBracketKeyword_5_2());
@@ -480,7 +480,7 @@ public final EObject ruleCheckConfiguration() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleConfiguredLanguageValidator"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:177:1: entryRuleConfiguredLanguageValidator returns [EObject current=null] : iv_ruleConfiguredLanguageValidator= ruleConfiguredLanguageValidator EOF ;
+    // InternalCheckCfg.g:177:1: entryRuleConfiguredLanguageValidator returns [EObject current=null] : iv_ruleConfiguredLanguageValidator= ruleConfiguredLanguageValidator EOF ;
     public final EObject entryRuleConfiguredLanguageValidator() throws RecognitionException {
         EObject current = null;
 
@@ -488,13 +488,13 @@ public final EObject entryRuleConfiguredLanguageValidator() throws RecognitionEx
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:178:2: (iv_ruleConfiguredLanguageValidator= ruleConfiguredLanguageValidator EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:179:2: iv_ruleConfiguredLanguageValidator= ruleConfiguredLanguageValidator EOF
+            // InternalCheckCfg.g:178:2: (iv_ruleConfiguredLanguageValidator= ruleConfiguredLanguageValidator EOF )
+            // InternalCheckCfg.g:179:2: iv_ruleConfiguredLanguageValidator= ruleConfiguredLanguageValidator EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getConfiguredLanguageValidatorRule()); 
             }
-            pushFollow(FOLLOW_ruleConfiguredLanguageValidator_in_entryRuleConfiguredLanguageValidator284);
+            pushFollow(FOLLOW_1);
             iv_ruleConfiguredLanguageValidator=ruleConfiguredLanguageValidator();
 
             state._fsp--;
@@ -502,7 +502,7 @@ public final EObject entryRuleConfiguredLanguageValidator() throws RecognitionEx
             if ( state.backtracking==0 ) {
                current =iv_ruleConfiguredLanguageValidator; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleConfiguredLanguageValidator294); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -520,7 +520,7 @@ public final EObject entryRuleConfiguredLanguageValidator() throws RecognitionEx
 
 
     // $ANTLR start "ruleConfiguredLanguageValidator"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:186:1: ruleConfiguredLanguageValidator returns [EObject current=null] : (otherlv_0= 'for' ( (lv_language_1_0= ruleQualifiedName ) ) otherlv_2= '{' ( (lv_parameterConfigurations_3_0= ruleConfiguredParameter ) )* ( (lv_catalogConfigurations_4_0= ruleConfiguredCatalog ) )* otherlv_5= '}' ) ;
+    // InternalCheckCfg.g:186:1: ruleConfiguredLanguageValidator returns [EObject current=null] : (otherlv_0= 'for' ( (lv_language_1_0= ruleQualifiedName ) ) otherlv_2= '{' ( (lv_parameterConfigurations_3_0= ruleConfiguredParameter ) )* ( (lv_catalogConfigurations_4_0= ruleConfiguredCatalog ) )* otherlv_5= '}' ) ;
     public final EObject ruleConfiguredLanguageValidator() throws RecognitionException {
         EObject current = null;
 
@@ -537,30 +537,30 @@ public final EObject ruleConfiguredLanguageValidator() throws RecognitionExcepti
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:189:28: ( (otherlv_0= 'for' ( (lv_language_1_0= ruleQualifiedName ) ) otherlv_2= '{' ( (lv_parameterConfigurations_3_0= ruleConfiguredParameter ) )* ( (lv_catalogConfigurations_4_0= ruleConfiguredCatalog ) )* otherlv_5= '}' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:190:1: (otherlv_0= 'for' ( (lv_language_1_0= ruleQualifiedName ) ) otherlv_2= '{' ( (lv_parameterConfigurations_3_0= ruleConfiguredParameter ) )* ( (lv_catalogConfigurations_4_0= ruleConfiguredCatalog ) )* otherlv_5= '}' )
+            // InternalCheckCfg.g:189:28: ( (otherlv_0= 'for' ( (lv_language_1_0= ruleQualifiedName ) ) otherlv_2= '{' ( (lv_parameterConfigurations_3_0= ruleConfiguredParameter ) )* ( (lv_catalogConfigurations_4_0= ruleConfiguredCatalog ) )* otherlv_5= '}' ) )
+            // InternalCheckCfg.g:190:1: (otherlv_0= 'for' ( (lv_language_1_0= ruleQualifiedName ) ) otherlv_2= '{' ( (lv_parameterConfigurations_3_0= ruleConfiguredParameter ) )* ( (lv_catalogConfigurations_4_0= ruleConfiguredCatalog ) )* otherlv_5= '}' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:190:1: (otherlv_0= 'for' ( (lv_language_1_0= ruleQualifiedName ) ) otherlv_2= '{' ( (lv_parameterConfigurations_3_0= ruleConfiguredParameter ) )* ( (lv_catalogConfigurations_4_0= ruleConfiguredCatalog ) )* otherlv_5= '}' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:190:3: otherlv_0= 'for' ( (lv_language_1_0= ruleQualifiedName ) ) otherlv_2= '{' ( (lv_parameterConfigurations_3_0= ruleConfiguredParameter ) )* ( (lv_catalogConfigurations_4_0= ruleConfiguredCatalog ) )* otherlv_5= '}'
+            // InternalCheckCfg.g:190:1: (otherlv_0= 'for' ( (lv_language_1_0= ruleQualifiedName ) ) otherlv_2= '{' ( (lv_parameterConfigurations_3_0= ruleConfiguredParameter ) )* ( (lv_catalogConfigurations_4_0= ruleConfiguredCatalog ) )* otherlv_5= '}' )
+            // InternalCheckCfg.g:190:3: otherlv_0= 'for' ( (lv_language_1_0= ruleQualifiedName ) ) otherlv_2= '{' ( (lv_parameterConfigurations_3_0= ruleConfiguredParameter ) )* ( (lv_catalogConfigurations_4_0= ruleConfiguredCatalog ) )* otherlv_5= '}'
             {
-            otherlv_0=(Token)match(input,17,FOLLOW_17_in_ruleConfiguredLanguageValidator331); if (state.failed) return current;
+            otherlv_0=(Token)match(input,17,FOLLOW_4); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getConfiguredLanguageValidatorAccess().getForKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:194:1: ( (lv_language_1_0= ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:195:1: (lv_language_1_0= ruleQualifiedName )
+            // InternalCheckCfg.g:194:1: ( (lv_language_1_0= ruleQualifiedName ) )
+            // InternalCheckCfg.g:195:1: (lv_language_1_0= ruleQualifiedName )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:195:1: (lv_language_1_0= ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:196:3: lv_language_1_0= ruleQualifiedName
+            // InternalCheckCfg.g:195:1: (lv_language_1_0= ruleQualifiedName )
+            // InternalCheckCfg.g:196:3: lv_language_1_0= ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getConfiguredLanguageValidatorAccess().getLanguageQualifiedNameParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_ruleConfiguredLanguageValidator352);
+            pushFollow(FOLLOW_8);
             lv_language_1_0=ruleQualifiedName();
 
             state._fsp--;
@@ -574,7 +574,7 @@ public final EObject ruleConfiguredLanguageValidator() throws RecognitionExcepti
                      			current, 
                      			"language",
                       		lv_language_1_0, 
-                      		"QualifiedName");
+                      		"org.eclipse.xtext.xbase.Xbase.QualifiedName");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -584,13 +584,13 @@ public final EObject ruleConfiguredLanguageValidator() throws RecognitionExcepti
 
             }
 
-            otherlv_2=(Token)match(input,15,FOLLOW_15_in_ruleConfiguredLanguageValidator364); if (state.failed) return current;
+            otherlv_2=(Token)match(input,15,FOLLOW_9); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getConfiguredLanguageValidatorAccess().getLeftCurlyBracketKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:216:1: ( (lv_parameterConfigurations_3_0= ruleConfiguredParameter ) )*
+            // InternalCheckCfg.g:216:1: ( (lv_parameterConfigurations_3_0= ruleConfiguredParameter ) )*
             loop5:
             do {
                 int alt5=2;
@@ -603,17 +603,17 @@ public final EObject ruleConfiguredLanguageValidator() throws RecognitionExcepti
 
                 switch (alt5) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:217:1: (lv_parameterConfigurations_3_0= ruleConfiguredParameter )
+            	    // InternalCheckCfg.g:217:1: (lv_parameterConfigurations_3_0= ruleConfiguredParameter )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:217:1: (lv_parameterConfigurations_3_0= ruleConfiguredParameter )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:218:3: lv_parameterConfigurations_3_0= ruleConfiguredParameter
+            	    // InternalCheckCfg.g:217:1: (lv_parameterConfigurations_3_0= ruleConfiguredParameter )
+            	    // InternalCheckCfg.g:218:3: lv_parameterConfigurations_3_0= ruleConfiguredParameter
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getConfiguredLanguageValidatorAccess().getParameterConfigurationsConfiguredParameterParserRuleCall_3_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleConfiguredParameter_in_ruleConfiguredLanguageValidator385);
+            	    pushFollow(FOLLOW_9);
             	    lv_parameterConfigurations_3_0=ruleConfiguredParameter();
 
             	    state._fsp--;
@@ -627,7 +627,7 @@ public final EObject ruleConfiguredLanguageValidator() throws RecognitionExcepti
             	             			current, 
             	             			"parameterConfigurations",
             	              		lv_parameterConfigurations_3_0, 
-            	              		"ConfiguredParameter");
+            	              		"com.avaloq.tools.ddk.checkcfg.CheckCfg.ConfiguredParameter");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -643,7 +643,7 @@ public final EObject ruleConfiguredLanguageValidator() throws RecognitionExcepti
                 }
             } while (true);
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:234:3: ( (lv_catalogConfigurations_4_0= ruleConfiguredCatalog ) )*
+            // InternalCheckCfg.g:234:3: ( (lv_catalogConfigurations_4_0= ruleConfiguredCatalog ) )*
             loop6:
             do {
                 int alt6=2;
@@ -656,17 +656,17 @@ public final EObject ruleConfiguredLanguageValidator() throws RecognitionExcepti
 
                 switch (alt6) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:235:1: (lv_catalogConfigurations_4_0= ruleConfiguredCatalog )
+            	    // InternalCheckCfg.g:235:1: (lv_catalogConfigurations_4_0= ruleConfiguredCatalog )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:235:1: (lv_catalogConfigurations_4_0= ruleConfiguredCatalog )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:236:3: lv_catalogConfigurations_4_0= ruleConfiguredCatalog
+            	    // InternalCheckCfg.g:235:1: (lv_catalogConfigurations_4_0= ruleConfiguredCatalog )
+            	    // InternalCheckCfg.g:236:3: lv_catalogConfigurations_4_0= ruleConfiguredCatalog
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getConfiguredLanguageValidatorAccess().getCatalogConfigurationsConfiguredCatalogParserRuleCall_4_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleConfiguredCatalog_in_ruleConfiguredLanguageValidator407);
+            	    pushFollow(FOLLOW_7);
             	    lv_catalogConfigurations_4_0=ruleConfiguredCatalog();
 
             	    state._fsp--;
@@ -680,7 +680,7 @@ public final EObject ruleConfiguredLanguageValidator() throws RecognitionExcepti
             	             			current, 
             	             			"catalogConfigurations",
             	              		lv_catalogConfigurations_4_0, 
-            	              		"ConfiguredCatalog");
+            	              		"com.avaloq.tools.ddk.checkcfg.CheckCfg.ConfiguredCatalog");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -696,7 +696,7 @@ public final EObject ruleConfiguredLanguageValidator() throws RecognitionExcepti
                 }
             } while (true);
 
-            otherlv_5=(Token)match(input,16,FOLLOW_16_in_ruleConfiguredLanguageValidator420); if (state.failed) return current;
+            otherlv_5=(Token)match(input,16,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_5, grammarAccess.getConfiguredLanguageValidatorAccess().getRightCurlyBracketKeyword_5());
@@ -725,7 +725,7 @@ public final EObject ruleConfiguredLanguageValidator() throws RecognitionExcepti
 
 
     // $ANTLR start "entryRuleConfiguredCatalog"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:264:1: entryRuleConfiguredCatalog returns [EObject current=null] : iv_ruleConfiguredCatalog= ruleConfiguredCatalog EOF ;
+    // InternalCheckCfg.g:264:1: entryRuleConfiguredCatalog returns [EObject current=null] : iv_ruleConfiguredCatalog= ruleConfiguredCatalog EOF ;
     public final EObject entryRuleConfiguredCatalog() throws RecognitionException {
         EObject current = null;
 
@@ -733,13 +733,13 @@ public final EObject entryRuleConfiguredCatalog() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:265:2: (iv_ruleConfiguredCatalog= ruleConfiguredCatalog EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:266:2: iv_ruleConfiguredCatalog= ruleConfiguredCatalog EOF
+            // InternalCheckCfg.g:265:2: (iv_ruleConfiguredCatalog= ruleConfiguredCatalog EOF )
+            // InternalCheckCfg.g:266:2: iv_ruleConfiguredCatalog= ruleConfiguredCatalog EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getConfiguredCatalogRule()); 
             }
-            pushFollow(FOLLOW_ruleConfiguredCatalog_in_entryRuleConfiguredCatalog456);
+            pushFollow(FOLLOW_1);
             iv_ruleConfiguredCatalog=ruleConfiguredCatalog();
 
             state._fsp--;
@@ -747,7 +747,7 @@ public final EObject entryRuleConfiguredCatalog() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleConfiguredCatalog; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleConfiguredCatalog466); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -765,7 +765,7 @@ public final EObject entryRuleConfiguredCatalog() throws RecognitionException {
 
 
     // $ANTLR start "ruleConfiguredCatalog"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:273:1: ruleConfiguredCatalog returns [EObject current=null] : ( () otherlv_1= 'catalog' ( ( ruleQualifiedName ) ) otherlv_3= '{' ( (lv_parameterConfigurations_4_0= ruleConfiguredParameter ) )* ( (lv_checkConfigurations_5_0= ruleConfiguredCheck ) )* otherlv_6= '}' ) ;
+    // InternalCheckCfg.g:273:1: ruleConfiguredCatalog returns [EObject current=null] : ( () otherlv_1= 'catalog' ( ( ruleQualifiedName ) ) otherlv_3= '{' ( (lv_parameterConfigurations_4_0= ruleConfiguredParameter ) )* ( (lv_checkConfigurations_5_0= ruleConfiguredCheck ) )* otherlv_6= '}' ) ;
     public final EObject ruleConfiguredCatalog() throws RecognitionException {
         EObject current = null;
 
@@ -780,14 +780,14 @@ public final EObject ruleConfiguredCatalog() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:276:28: ( ( () otherlv_1= 'catalog' ( ( ruleQualifiedName ) ) otherlv_3= '{' ( (lv_parameterConfigurations_4_0= ruleConfiguredParameter ) )* ( (lv_checkConfigurations_5_0= ruleConfiguredCheck ) )* otherlv_6= '}' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:277:1: ( () otherlv_1= 'catalog' ( ( ruleQualifiedName ) ) otherlv_3= '{' ( (lv_parameterConfigurations_4_0= ruleConfiguredParameter ) )* ( (lv_checkConfigurations_5_0= ruleConfiguredCheck ) )* otherlv_6= '}' )
+            // InternalCheckCfg.g:276:28: ( ( () otherlv_1= 'catalog' ( ( ruleQualifiedName ) ) otherlv_3= '{' ( (lv_parameterConfigurations_4_0= ruleConfiguredParameter ) )* ( (lv_checkConfigurations_5_0= ruleConfiguredCheck ) )* otherlv_6= '}' ) )
+            // InternalCheckCfg.g:277:1: ( () otherlv_1= 'catalog' ( ( ruleQualifiedName ) ) otherlv_3= '{' ( (lv_parameterConfigurations_4_0= ruleConfiguredParameter ) )* ( (lv_checkConfigurations_5_0= ruleConfiguredCheck ) )* otherlv_6= '}' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:277:1: ( () otherlv_1= 'catalog' ( ( ruleQualifiedName ) ) otherlv_3= '{' ( (lv_parameterConfigurations_4_0= ruleConfiguredParameter ) )* ( (lv_checkConfigurations_5_0= ruleConfiguredCheck ) )* otherlv_6= '}' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:277:2: () otherlv_1= 'catalog' ( ( ruleQualifiedName ) ) otherlv_3= '{' ( (lv_parameterConfigurations_4_0= ruleConfiguredParameter ) )* ( (lv_checkConfigurations_5_0= ruleConfiguredCheck ) )* otherlv_6= '}'
+            // InternalCheckCfg.g:277:1: ( () otherlv_1= 'catalog' ( ( ruleQualifiedName ) ) otherlv_3= '{' ( (lv_parameterConfigurations_4_0= ruleConfiguredParameter ) )* ( (lv_checkConfigurations_5_0= ruleConfiguredCheck ) )* otherlv_6= '}' )
+            // InternalCheckCfg.g:277:2: () otherlv_1= 'catalog' ( ( ruleQualifiedName ) ) otherlv_3= '{' ( (lv_parameterConfigurations_4_0= ruleConfiguredParameter ) )* ( (lv_checkConfigurations_5_0= ruleConfiguredCheck ) )* otherlv_6= '}'
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:277:2: ()
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:278:5: 
+            // InternalCheckCfg.g:277:2: ()
+            // InternalCheckCfg.g:278:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -799,17 +799,17 @@ public final EObject ruleConfiguredCatalog() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,18,FOLLOW_18_in_ruleConfiguredCatalog512); if (state.failed) return current;
+            otherlv_1=(Token)match(input,18,FOLLOW_4); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getConfiguredCatalogAccess().getCatalogKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:287:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:288:1: ( ruleQualifiedName )
+            // InternalCheckCfg.g:287:1: ( ( ruleQualifiedName ) )
+            // InternalCheckCfg.g:288:1: ( ruleQualifiedName )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:288:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:289:3: ruleQualifiedName
+            // InternalCheckCfg.g:288:1: ( ruleQualifiedName )
+            // InternalCheckCfg.g:289:3: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
 
@@ -823,7 +823,7 @@ public final EObject ruleConfiguredCatalog() throws RecognitionException {
               	        newCompositeNode(grammarAccess.getConfiguredCatalogAccess().getCatalogCheckCatalogCrossReference_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_ruleConfiguredCatalog535);
+            pushFollow(FOLLOW_8);
             ruleQualifiedName();
 
             state._fsp--;
@@ -839,13 +839,13 @@ public final EObject ruleConfiguredCatalog() throws RecognitionException {
 
             }
 
-            otherlv_3=(Token)match(input,15,FOLLOW_15_in_ruleConfiguredCatalog547); if (state.failed) return current;
+            otherlv_3=(Token)match(input,15,FOLLOW_10); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_3, grammarAccess.getConfiguredCatalogAccess().getLeftCurlyBracketKeyword_3());
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:306:1: ( (lv_parameterConfigurations_4_0= ruleConfiguredParameter ) )*
+            // InternalCheckCfg.g:306:1: ( (lv_parameterConfigurations_4_0= ruleConfiguredParameter ) )*
             loop7:
             do {
                 int alt7=2;
@@ -858,17 +858,17 @@ public final EObject ruleConfiguredCatalog() throws RecognitionException {
 
                 switch (alt7) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:307:1: (lv_parameterConfigurations_4_0= ruleConfiguredParameter )
+            	    // InternalCheckCfg.g:307:1: (lv_parameterConfigurations_4_0= ruleConfiguredParameter )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:307:1: (lv_parameterConfigurations_4_0= ruleConfiguredParameter )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:308:3: lv_parameterConfigurations_4_0= ruleConfiguredParameter
+            	    // InternalCheckCfg.g:307:1: (lv_parameterConfigurations_4_0= ruleConfiguredParameter )
+            	    // InternalCheckCfg.g:308:3: lv_parameterConfigurations_4_0= ruleConfiguredParameter
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getConfiguredCatalogAccess().getParameterConfigurationsConfiguredParameterParserRuleCall_4_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleConfiguredParameter_in_ruleConfiguredCatalog568);
+            	    pushFollow(FOLLOW_10);
             	    lv_parameterConfigurations_4_0=ruleConfiguredParameter();
 
             	    state._fsp--;
@@ -882,7 +882,7 @@ public final EObject ruleConfiguredCatalog() throws RecognitionException {
             	             			current, 
             	             			"parameterConfigurations",
             	              		lv_parameterConfigurations_4_0, 
-            	              		"ConfiguredParameter");
+            	              		"com.avaloq.tools.ddk.checkcfg.CheckCfg.ConfiguredParameter");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -898,7 +898,7 @@ public final EObject ruleConfiguredCatalog() throws RecognitionException {
                 }
             } while (true);
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:324:3: ( (lv_checkConfigurations_5_0= ruleConfiguredCheck ) )*
+            // InternalCheckCfg.g:324:3: ( (lv_checkConfigurations_5_0= ruleConfiguredCheck ) )*
             loop8:
             do {
                 int alt8=2;
@@ -911,17 +911,17 @@ public final EObject ruleConfiguredCatalog() throws RecognitionException {
 
                 switch (alt8) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:325:1: (lv_checkConfigurations_5_0= ruleConfiguredCheck )
+            	    // InternalCheckCfg.g:325:1: (lv_checkConfigurations_5_0= ruleConfiguredCheck )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:325:1: (lv_checkConfigurations_5_0= ruleConfiguredCheck )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:326:3: lv_checkConfigurations_5_0= ruleConfiguredCheck
+            	    // InternalCheckCfg.g:325:1: (lv_checkConfigurations_5_0= ruleConfiguredCheck )
+            	    // InternalCheckCfg.g:326:3: lv_checkConfigurations_5_0= ruleConfiguredCheck
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getConfiguredCatalogAccess().getCheckConfigurationsConfiguredCheckParserRuleCall_5_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleConfiguredCheck_in_ruleConfiguredCatalog590);
+            	    pushFollow(FOLLOW_11);
             	    lv_checkConfigurations_5_0=ruleConfiguredCheck();
 
             	    state._fsp--;
@@ -935,7 +935,7 @@ public final EObject ruleConfiguredCatalog() throws RecognitionException {
             	             			current, 
             	             			"checkConfigurations",
             	              		lv_checkConfigurations_5_0, 
-            	              		"ConfiguredCheck");
+            	              		"com.avaloq.tools.ddk.checkcfg.CheckCfg.ConfiguredCheck");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -951,7 +951,7 @@ public final EObject ruleConfiguredCatalog() throws RecognitionException {
                 }
             } while (true);
 
-            otherlv_6=(Token)match(input,16,FOLLOW_16_in_ruleConfiguredCatalog603); if (state.failed) return current;
+            otherlv_6=(Token)match(input,16,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_6, grammarAccess.getConfiguredCatalogAccess().getRightCurlyBracketKeyword_6());
@@ -980,7 +980,7 @@ public final EObject ruleConfiguredCatalog() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleConfiguredCheck"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:354:1: entryRuleConfiguredCheck returns [EObject current=null] : iv_ruleConfiguredCheck= ruleConfiguredCheck EOF ;
+    // InternalCheckCfg.g:354:1: entryRuleConfiguredCheck returns [EObject current=null] : iv_ruleConfiguredCheck= ruleConfiguredCheck EOF ;
     public final EObject entryRuleConfiguredCheck() throws RecognitionException {
         EObject current = null;
 
@@ -988,13 +988,13 @@ public final EObject entryRuleConfiguredCheck() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:355:2: (iv_ruleConfiguredCheck= ruleConfiguredCheck EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:356:2: iv_ruleConfiguredCheck= ruleConfiguredCheck EOF
+            // InternalCheckCfg.g:355:2: (iv_ruleConfiguredCheck= ruleConfiguredCheck EOF )
+            // InternalCheckCfg.g:356:2: iv_ruleConfiguredCheck= ruleConfiguredCheck EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getConfiguredCheckRule()); 
             }
-            pushFollow(FOLLOW_ruleConfiguredCheck_in_entryRuleConfiguredCheck639);
+            pushFollow(FOLLOW_1);
             iv_ruleConfiguredCheck=ruleConfiguredCheck();
 
             state._fsp--;
@@ -1002,7 +1002,7 @@ public final EObject entryRuleConfiguredCheck() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleConfiguredCheck; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleConfiguredCheck649); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -1020,7 +1020,7 @@ public final EObject entryRuleConfiguredCheck() throws RecognitionException {
 
 
     // $ANTLR start "ruleConfiguredCheck"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:363:1: ruleConfiguredCheck returns [EObject current=null] : ( () ( (lv_severity_1_0= ruleSeverityKind ) ) ( ( ruleQualifiedName ) ) (otherlv_3= '(' ( (lv_parameterConfigurations_4_0= ruleConfiguredParameter ) ) (otherlv_5= ',' ( (lv_parameterConfigurations_6_0= ruleConfiguredParameter ) ) )* otherlv_7= ')' )? ) ;
+    // InternalCheckCfg.g:363:1: ruleConfiguredCheck returns [EObject current=null] : ( () ( (lv_severity_1_0= ruleSeverityKind ) ) ( ( ruleQualifiedName ) ) (otherlv_3= '(' ( (lv_parameterConfigurations_4_0= ruleConfiguredParameter ) ) (otherlv_5= ',' ( (lv_parameterConfigurations_6_0= ruleConfiguredParameter ) ) )* otherlv_7= ')' )? ) ;
     public final EObject ruleConfiguredCheck() throws RecognitionException {
         EObject current = null;
 
@@ -1037,14 +1037,14 @@ public final EObject ruleConfiguredCheck() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:366:28: ( ( () ( (lv_severity_1_0= ruleSeverityKind ) ) ( ( ruleQualifiedName ) ) (otherlv_3= '(' ( (lv_parameterConfigurations_4_0= ruleConfiguredParameter ) ) (otherlv_5= ',' ( (lv_parameterConfigurations_6_0= ruleConfiguredParameter ) ) )* otherlv_7= ')' )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:367:1: ( () ( (lv_severity_1_0= ruleSeverityKind ) ) ( ( ruleQualifiedName ) ) (otherlv_3= '(' ( (lv_parameterConfigurations_4_0= ruleConfiguredParameter ) ) (otherlv_5= ',' ( (lv_parameterConfigurations_6_0= ruleConfiguredParameter ) ) )* otherlv_7= ')' )? )
+            // InternalCheckCfg.g:366:28: ( ( () ( (lv_severity_1_0= ruleSeverityKind ) ) ( ( ruleQualifiedName ) ) (otherlv_3= '(' ( (lv_parameterConfigurations_4_0= ruleConfiguredParameter ) ) (otherlv_5= ',' ( (lv_parameterConfigurations_6_0= ruleConfiguredParameter ) ) )* otherlv_7= ')' )? ) )
+            // InternalCheckCfg.g:367:1: ( () ( (lv_severity_1_0= ruleSeverityKind ) ) ( ( ruleQualifiedName ) ) (otherlv_3= '(' ( (lv_parameterConfigurations_4_0= ruleConfiguredParameter ) ) (otherlv_5= ',' ( (lv_parameterConfigurations_6_0= ruleConfiguredParameter ) ) )* otherlv_7= ')' )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:367:1: ( () ( (lv_severity_1_0= ruleSeverityKind ) ) ( ( ruleQualifiedName ) ) (otherlv_3= '(' ( (lv_parameterConfigurations_4_0= ruleConfiguredParameter ) ) (otherlv_5= ',' ( (lv_parameterConfigurations_6_0= ruleConfiguredParameter ) ) )* otherlv_7= ')' )? )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:367:2: () ( (lv_severity_1_0= ruleSeverityKind ) ) ( ( ruleQualifiedName ) ) (otherlv_3= '(' ( (lv_parameterConfigurations_4_0= ruleConfiguredParameter ) ) (otherlv_5= ',' ( (lv_parameterConfigurations_6_0= ruleConfiguredParameter ) ) )* otherlv_7= ')' )?
+            // InternalCheckCfg.g:367:1: ( () ( (lv_severity_1_0= ruleSeverityKind ) ) ( ( ruleQualifiedName ) ) (otherlv_3= '(' ( (lv_parameterConfigurations_4_0= ruleConfiguredParameter ) ) (otherlv_5= ',' ( (lv_parameterConfigurations_6_0= ruleConfiguredParameter ) ) )* otherlv_7= ')' )? )
+            // InternalCheckCfg.g:367:2: () ( (lv_severity_1_0= ruleSeverityKind ) ) ( ( ruleQualifiedName ) ) (otherlv_3= '(' ( (lv_parameterConfigurations_4_0= ruleConfiguredParameter ) ) (otherlv_5= ',' ( (lv_parameterConfigurations_6_0= ruleConfiguredParameter ) ) )* otherlv_7= ')' )?
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:367:2: ()
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:368:5: 
+            // InternalCheckCfg.g:367:2: ()
+            // InternalCheckCfg.g:368:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -1056,18 +1056,18 @@ public final EObject ruleConfiguredCheck() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:373:2: ( (lv_severity_1_0= ruleSeverityKind ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:374:1: (lv_severity_1_0= ruleSeverityKind )
+            // InternalCheckCfg.g:373:2: ( (lv_severity_1_0= ruleSeverityKind ) )
+            // InternalCheckCfg.g:374:1: (lv_severity_1_0= ruleSeverityKind )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:374:1: (lv_severity_1_0= ruleSeverityKind )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:375:3: lv_severity_1_0= ruleSeverityKind
+            // InternalCheckCfg.g:374:1: (lv_severity_1_0= ruleSeverityKind )
+            // InternalCheckCfg.g:375:3: lv_severity_1_0= ruleSeverityKind
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getConfiguredCheckAccess().getSeveritySeverityKindEnumRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleSeverityKind_in_ruleConfiguredCheck704);
+            pushFollow(FOLLOW_4);
             lv_severity_1_0=ruleSeverityKind();
 
             state._fsp--;
@@ -1081,7 +1081,7 @@ public final EObject ruleConfiguredCheck() throws RecognitionException {
                      			current, 
                      			"severity",
                       		lv_severity_1_0, 
-                      		"SeverityKind");
+                      		"com.avaloq.tools.ddk.checkcfg.CheckCfg.SeverityKind");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -1091,11 +1091,11 @@ public final EObject ruleConfiguredCheck() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:391:2: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:392:1: ( ruleQualifiedName )
+            // InternalCheckCfg.g:391:2: ( ( ruleQualifiedName ) )
+            // InternalCheckCfg.g:392:1: ( ruleQualifiedName )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:392:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:393:3: ruleQualifiedName
+            // InternalCheckCfg.g:392:1: ( ruleQualifiedName )
+            // InternalCheckCfg.g:393:3: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
 
@@ -1109,7 +1109,7 @@ public final EObject ruleConfiguredCheck() throws RecognitionException {
               	        newCompositeNode(grammarAccess.getConfiguredCheckAccess().getCheckCheckCrossReference_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_ruleConfiguredCheck727);
+            pushFollow(FOLLOW_12);
             ruleQualifiedName();
 
             state._fsp--;
@@ -1125,7 +1125,7 @@ public final EObject ruleConfiguredCheck() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:406:2: (otherlv_3= '(' ( (lv_parameterConfigurations_4_0= ruleConfiguredParameter ) ) (otherlv_5= ',' ( (lv_parameterConfigurations_6_0= ruleConfiguredParameter ) ) )* otherlv_7= ')' )?
+            // InternalCheckCfg.g:406:2: (otherlv_3= '(' ( (lv_parameterConfigurations_4_0= ruleConfiguredParameter ) ) (otherlv_5= ',' ( (lv_parameterConfigurations_6_0= ruleConfiguredParameter ) ) )* otherlv_7= ')' )?
             int alt10=2;
             int LA10_0 = input.LA(1);
 
@@ -1134,26 +1134,26 @@ public final EObject ruleConfiguredCheck() throws RecognitionException {
             }
             switch (alt10) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:406:4: otherlv_3= '(' ( (lv_parameterConfigurations_4_0= ruleConfiguredParameter ) ) (otherlv_5= ',' ( (lv_parameterConfigurations_6_0= ruleConfiguredParameter ) ) )* otherlv_7= ')'
+                    // InternalCheckCfg.g:406:4: otherlv_3= '(' ( (lv_parameterConfigurations_4_0= ruleConfiguredParameter ) ) (otherlv_5= ',' ( (lv_parameterConfigurations_6_0= ruleConfiguredParameter ) ) )* otherlv_7= ')'
                     {
-                    otherlv_3=(Token)match(input,19,FOLLOW_19_in_ruleConfiguredCheck740); if (state.failed) return current;
+                    otherlv_3=(Token)match(input,19,FOLLOW_4); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_3, grammarAccess.getConfiguredCheckAccess().getLeftParenthesisKeyword_3_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:410:1: ( (lv_parameterConfigurations_4_0= ruleConfiguredParameter ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:411:1: (lv_parameterConfigurations_4_0= ruleConfiguredParameter )
+                    // InternalCheckCfg.g:410:1: ( (lv_parameterConfigurations_4_0= ruleConfiguredParameter ) )
+                    // InternalCheckCfg.g:411:1: (lv_parameterConfigurations_4_0= ruleConfiguredParameter )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:411:1: (lv_parameterConfigurations_4_0= ruleConfiguredParameter )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:412:3: lv_parameterConfigurations_4_0= ruleConfiguredParameter
+                    // InternalCheckCfg.g:411:1: (lv_parameterConfigurations_4_0= ruleConfiguredParameter )
+                    // InternalCheckCfg.g:412:3: lv_parameterConfigurations_4_0= ruleConfiguredParameter
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getConfiguredCheckAccess().getParameterConfigurationsConfiguredParameterParserRuleCall_3_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleConfiguredParameter_in_ruleConfiguredCheck761);
+                    pushFollow(FOLLOW_13);
                     lv_parameterConfigurations_4_0=ruleConfiguredParameter();
 
                     state._fsp--;
@@ -1167,7 +1167,7 @@ public final EObject ruleConfiguredCheck() throws RecognitionException {
                              			current, 
                              			"parameterConfigurations",
                               		lv_parameterConfigurations_4_0, 
-                              		"ConfiguredParameter");
+                              		"com.avaloq.tools.ddk.checkcfg.CheckCfg.ConfiguredParameter");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -1177,7 +1177,7 @@ public final EObject ruleConfiguredCheck() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:428:2: (otherlv_5= ',' ( (lv_parameterConfigurations_6_0= ruleConfiguredParameter ) ) )*
+                    // InternalCheckCfg.g:428:2: (otherlv_5= ',' ( (lv_parameterConfigurations_6_0= ruleConfiguredParameter ) ) )*
                     loop9:
                     do {
                         int alt9=2;
@@ -1190,26 +1190,26 @@ public final EObject ruleConfiguredCheck() throws RecognitionException {
 
                         switch (alt9) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:428:4: otherlv_5= ',' ( (lv_parameterConfigurations_6_0= ruleConfiguredParameter ) )
+                    	    // InternalCheckCfg.g:428:4: otherlv_5= ',' ( (lv_parameterConfigurations_6_0= ruleConfiguredParameter ) )
                     	    {
-                    	    otherlv_5=(Token)match(input,20,FOLLOW_20_in_ruleConfiguredCheck774); if (state.failed) return current;
+                    	    otherlv_5=(Token)match(input,20,FOLLOW_4); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_5, grammarAccess.getConfiguredCheckAccess().getCommaKeyword_3_2_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:432:1: ( (lv_parameterConfigurations_6_0= ruleConfiguredParameter ) )
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:433:1: (lv_parameterConfigurations_6_0= ruleConfiguredParameter )
+                    	    // InternalCheckCfg.g:432:1: ( (lv_parameterConfigurations_6_0= ruleConfiguredParameter ) )
+                    	    // InternalCheckCfg.g:433:1: (lv_parameterConfigurations_6_0= ruleConfiguredParameter )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:433:1: (lv_parameterConfigurations_6_0= ruleConfiguredParameter )
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:434:3: lv_parameterConfigurations_6_0= ruleConfiguredParameter
+                    	    // InternalCheckCfg.g:433:1: (lv_parameterConfigurations_6_0= ruleConfiguredParameter )
+                    	    // InternalCheckCfg.g:434:3: lv_parameterConfigurations_6_0= ruleConfiguredParameter
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getConfiguredCheckAccess().getParameterConfigurationsConfiguredParameterParserRuleCall_3_2_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleConfiguredParameter_in_ruleConfiguredCheck795);
+                    	    pushFollow(FOLLOW_13);
                     	    lv_parameterConfigurations_6_0=ruleConfiguredParameter();
 
                     	    state._fsp--;
@@ -1223,7 +1223,7 @@ public final EObject ruleConfiguredCheck() throws RecognitionException {
                     	             			current, 
                     	             			"parameterConfigurations",
                     	              		lv_parameterConfigurations_6_0, 
-                    	              		"ConfiguredParameter");
+                    	              		"com.avaloq.tools.ddk.checkcfg.CheckCfg.ConfiguredParameter");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -1242,7 +1242,7 @@ public final EObject ruleConfiguredCheck() throws RecognitionException {
                         }
                     } while (true);
 
-                    otherlv_7=(Token)match(input,21,FOLLOW_21_in_ruleConfiguredCheck809); if (state.failed) return current;
+                    otherlv_7=(Token)match(input,21,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_7, grammarAccess.getConfiguredCheckAccess().getRightParenthesisKeyword_3_3());
@@ -1277,7 +1277,7 @@ public final EObject ruleConfiguredCheck() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleConfiguredParameter"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:462:1: entryRuleConfiguredParameter returns [EObject current=null] : iv_ruleConfiguredParameter= ruleConfiguredParameter EOF ;
+    // InternalCheckCfg.g:462:1: entryRuleConfiguredParameter returns [EObject current=null] : iv_ruleConfiguredParameter= ruleConfiguredParameter EOF ;
     public final EObject entryRuleConfiguredParameter() throws RecognitionException {
         EObject current = null;
 
@@ -1285,13 +1285,13 @@ public final EObject entryRuleConfiguredParameter() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:463:2: (iv_ruleConfiguredParameter= ruleConfiguredParameter EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:464:2: iv_ruleConfiguredParameter= ruleConfiguredParameter EOF
+            // InternalCheckCfg.g:463:2: (iv_ruleConfiguredParameter= ruleConfiguredParameter EOF )
+            // InternalCheckCfg.g:464:2: iv_ruleConfiguredParameter= ruleConfiguredParameter EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getConfiguredParameterRule()); 
             }
-            pushFollow(FOLLOW_ruleConfiguredParameter_in_entryRuleConfiguredParameter847);
+            pushFollow(FOLLOW_1);
             iv_ruleConfiguredParameter=ruleConfiguredParameter();
 
             state._fsp--;
@@ -1299,7 +1299,7 @@ public final EObject entryRuleConfiguredParameter() throws RecognitionException
             if ( state.backtracking==0 ) {
                current =iv_ruleConfiguredParameter; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleConfiguredParameter857); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -1317,7 +1317,7 @@ public final EObject entryRuleConfiguredParameter() throws RecognitionException
 
 
     // $ANTLR start "ruleConfiguredParameter"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:471:1: ruleConfiguredParameter returns [EObject current=null] : ( () ( ( ruleValidID ) ) otherlv_2= '=' ( (lv_newValue_3_0= ruleXFormalParameterDefaultValueLiteral ) ) ) ;
+    // InternalCheckCfg.g:471:1: ruleConfiguredParameter returns [EObject current=null] : ( () ( ( ruleValidID ) ) otherlv_2= '=' ( (lv_newValue_3_0= ruleXFormalParameterDefaultValueLiteral ) ) ) ;
     public final EObject ruleConfiguredParameter() throws RecognitionException {
         EObject current = null;
 
@@ -1328,14 +1328,14 @@ public final EObject ruleConfiguredParameter() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:474:28: ( ( () ( ( ruleValidID ) ) otherlv_2= '=' ( (lv_newValue_3_0= ruleXFormalParameterDefaultValueLiteral ) ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:475:1: ( () ( ( ruleValidID ) ) otherlv_2= '=' ( (lv_newValue_3_0= ruleXFormalParameterDefaultValueLiteral ) ) )
+            // InternalCheckCfg.g:474:28: ( ( () ( ( ruleValidID ) ) otherlv_2= '=' ( (lv_newValue_3_0= ruleXFormalParameterDefaultValueLiteral ) ) ) )
+            // InternalCheckCfg.g:475:1: ( () ( ( ruleValidID ) ) otherlv_2= '=' ( (lv_newValue_3_0= ruleXFormalParameterDefaultValueLiteral ) ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:475:1: ( () ( ( ruleValidID ) ) otherlv_2= '=' ( (lv_newValue_3_0= ruleXFormalParameterDefaultValueLiteral ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:475:2: () ( ( ruleValidID ) ) otherlv_2= '=' ( (lv_newValue_3_0= ruleXFormalParameterDefaultValueLiteral ) )
+            // InternalCheckCfg.g:475:1: ( () ( ( ruleValidID ) ) otherlv_2= '=' ( (lv_newValue_3_0= ruleXFormalParameterDefaultValueLiteral ) ) )
+            // InternalCheckCfg.g:475:2: () ( ( ruleValidID ) ) otherlv_2= '=' ( (lv_newValue_3_0= ruleXFormalParameterDefaultValueLiteral ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:475:2: ()
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:476:5: 
+            // InternalCheckCfg.g:475:2: ()
+            // InternalCheckCfg.g:476:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -1347,11 +1347,11 @@ public final EObject ruleConfiguredParameter() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:481:2: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:482:1: ( ruleValidID )
+            // InternalCheckCfg.g:481:2: ( ( ruleValidID ) )
+            // InternalCheckCfg.g:482:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:482:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:483:3: ruleValidID
+            // InternalCheckCfg.g:482:1: ( ruleValidID )
+            // InternalCheckCfg.g:483:3: ruleValidID
             {
             if ( state.backtracking==0 ) {
 
@@ -1365,7 +1365,7 @@ public final EObject ruleConfiguredParameter() throws RecognitionException {
               	        newCompositeNode(grammarAccess.getConfiguredParameterAccess().getParameterFormalParameterCrossReference_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleValidID_in_ruleConfiguredParameter914);
+            pushFollow(FOLLOW_14);
             ruleValidID();
 
             state._fsp--;
@@ -1381,24 +1381,24 @@ public final EObject ruleConfiguredParameter() throws RecognitionException {
 
             }
 
-            otherlv_2=(Token)match(input,22,FOLLOW_22_in_ruleConfiguredParameter926); if (state.failed) return current;
+            otherlv_2=(Token)match(input,22,FOLLOW_15); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getConfiguredParameterAccess().getEqualsSignKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:500:1: ( (lv_newValue_3_0= ruleXFormalParameterDefaultValueLiteral ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:501:1: (lv_newValue_3_0= ruleXFormalParameterDefaultValueLiteral )
+            // InternalCheckCfg.g:500:1: ( (lv_newValue_3_0= ruleXFormalParameterDefaultValueLiteral ) )
+            // InternalCheckCfg.g:501:1: (lv_newValue_3_0= ruleXFormalParameterDefaultValueLiteral )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:501:1: (lv_newValue_3_0= ruleXFormalParameterDefaultValueLiteral )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:502:3: lv_newValue_3_0= ruleXFormalParameterDefaultValueLiteral
+            // InternalCheckCfg.g:501:1: (lv_newValue_3_0= ruleXFormalParameterDefaultValueLiteral )
+            // InternalCheckCfg.g:502:3: lv_newValue_3_0= ruleXFormalParameterDefaultValueLiteral
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getConfiguredParameterAccess().getNewValueXFormalParameterDefaultValueLiteralParserRuleCall_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXFormalParameterDefaultValueLiteral_in_ruleConfiguredParameter947);
+            pushFollow(FOLLOW_2);
             lv_newValue_3_0=ruleXFormalParameterDefaultValueLiteral();
 
             state._fsp--;
@@ -1412,7 +1412,7 @@ public final EObject ruleConfiguredParameter() throws RecognitionException {
                      			current, 
                      			"newValue",
                       		lv_newValue_3_0, 
-                      		"XFormalParameterDefaultValueLiteral");
+                      		"com.avaloq.tools.ddk.checkcfg.CheckCfg.XFormalParameterDefaultValueLiteral");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -1445,7 +1445,7 @@ public final EObject ruleConfiguredParameter() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXSimpleFormalParameterDefaultValueLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:526:1: entryRuleXSimpleFormalParameterDefaultValueLiteral returns [EObject current=null] : iv_ruleXSimpleFormalParameterDefaultValueLiteral= ruleXSimpleFormalParameterDefaultValueLiteral EOF ;
+    // InternalCheckCfg.g:526:1: entryRuleXSimpleFormalParameterDefaultValueLiteral returns [EObject current=null] : iv_ruleXSimpleFormalParameterDefaultValueLiteral= ruleXSimpleFormalParameterDefaultValueLiteral EOF ;
     public final EObject entryRuleXSimpleFormalParameterDefaultValueLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -1453,13 +1453,13 @@ public final EObject entryRuleXSimpleFormalParameterDefaultValueLiteral() throws
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:527:2: (iv_ruleXSimpleFormalParameterDefaultValueLiteral= ruleXSimpleFormalParameterDefaultValueLiteral EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:528:2: iv_ruleXSimpleFormalParameterDefaultValueLiteral= ruleXSimpleFormalParameterDefaultValueLiteral EOF
+            // InternalCheckCfg.g:527:2: (iv_ruleXSimpleFormalParameterDefaultValueLiteral= ruleXSimpleFormalParameterDefaultValueLiteral EOF )
+            // InternalCheckCfg.g:528:2: iv_ruleXSimpleFormalParameterDefaultValueLiteral= ruleXSimpleFormalParameterDefaultValueLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXSimpleFormalParameterDefaultValueLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXSimpleFormalParameterDefaultValueLiteral_in_entryRuleXSimpleFormalParameterDefaultValueLiteral983);
+            pushFollow(FOLLOW_1);
             iv_ruleXSimpleFormalParameterDefaultValueLiteral=ruleXSimpleFormalParameterDefaultValueLiteral();
 
             state._fsp--;
@@ -1467,7 +1467,7 @@ public final EObject entryRuleXSimpleFormalParameterDefaultValueLiteral() throws
             if ( state.backtracking==0 ) {
                current =iv_ruleXSimpleFormalParameterDefaultValueLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXSimpleFormalParameterDefaultValueLiteral993); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -1485,7 +1485,7 @@ public final EObject entryRuleXSimpleFormalParameterDefaultValueLiteral() throws
 
 
     // $ANTLR start "ruleXSimpleFormalParameterDefaultValueLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:535:1: ruleXSimpleFormalParameterDefaultValueLiteral returns [EObject current=null] : (this_XBooleanLiteral_0= ruleXBooleanLiteral | this_XNumberLiteral_1= ruleXNumberLiteral | this_XStringLiteral_2= ruleXStringLiteral ) ;
+    // InternalCheckCfg.g:535:1: ruleXSimpleFormalParameterDefaultValueLiteral returns [EObject current=null] : (this_XBooleanLiteral_0= ruleXBooleanLiteral | this_XNumberLiteral_1= ruleXNumberLiteral | this_XStringLiteral_2= ruleXStringLiteral ) ;
     public final EObject ruleXSimpleFormalParameterDefaultValueLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -1499,10 +1499,10 @@ public final EObject ruleXSimpleFormalParameterDefaultValueLiteral() throws Reco
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:538:28: ( (this_XBooleanLiteral_0= ruleXBooleanLiteral | this_XNumberLiteral_1= ruleXNumberLiteral | this_XStringLiteral_2= ruleXStringLiteral ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:539:1: (this_XBooleanLiteral_0= ruleXBooleanLiteral | this_XNumberLiteral_1= ruleXNumberLiteral | this_XStringLiteral_2= ruleXStringLiteral )
+            // InternalCheckCfg.g:538:28: ( (this_XBooleanLiteral_0= ruleXBooleanLiteral | this_XNumberLiteral_1= ruleXNumberLiteral | this_XStringLiteral_2= ruleXStringLiteral ) )
+            // InternalCheckCfg.g:539:1: (this_XBooleanLiteral_0= ruleXBooleanLiteral | this_XNumberLiteral_1= ruleXNumberLiteral | this_XStringLiteral_2= ruleXStringLiteral )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:539:1: (this_XBooleanLiteral_0= ruleXBooleanLiteral | this_XNumberLiteral_1= ruleXNumberLiteral | this_XStringLiteral_2= ruleXStringLiteral )
+            // InternalCheckCfg.g:539:1: (this_XBooleanLiteral_0= ruleXBooleanLiteral | this_XNumberLiteral_1= ruleXNumberLiteral | this_XStringLiteral_2= ruleXStringLiteral )
             int alt11=3;
             switch ( input.LA(1) ) {
             case 78:
@@ -1533,14 +1533,14 @@ public final EObject ruleXSimpleFormalParameterDefaultValueLiteral() throws Reco
 
             switch (alt11) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:540:5: this_XBooleanLiteral_0= ruleXBooleanLiteral
+                    // InternalCheckCfg.g:540:5: this_XBooleanLiteral_0= ruleXBooleanLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXSimpleFormalParameterDefaultValueLiteralAccess().getXBooleanLiteralParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXBooleanLiteral_in_ruleXSimpleFormalParameterDefaultValueLiteral1040);
+                    pushFollow(FOLLOW_2);
                     this_XBooleanLiteral_0=ruleXBooleanLiteral();
 
                     state._fsp--;
@@ -1555,14 +1555,14 @@ public final EObject ruleXSimpleFormalParameterDefaultValueLiteral() throws Reco
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:550:5: this_XNumberLiteral_1= ruleXNumberLiteral
+                    // InternalCheckCfg.g:550:5: this_XNumberLiteral_1= ruleXNumberLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXSimpleFormalParameterDefaultValueLiteralAccess().getXNumberLiteralParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXNumberLiteral_in_ruleXSimpleFormalParameterDefaultValueLiteral1067);
+                    pushFollow(FOLLOW_2);
                     this_XNumberLiteral_1=ruleXNumberLiteral();
 
                     state._fsp--;
@@ -1577,14 +1577,14 @@ public final EObject ruleXSimpleFormalParameterDefaultValueLiteral() throws Reco
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:560:5: this_XStringLiteral_2= ruleXStringLiteral
+                    // InternalCheckCfg.g:560:5: this_XStringLiteral_2= ruleXStringLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXSimpleFormalParameterDefaultValueLiteralAccess().getXStringLiteralParserRuleCall_2()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXStringLiteral_in_ruleXSimpleFormalParameterDefaultValueLiteral1094);
+                    pushFollow(FOLLOW_2);
                     this_XStringLiteral_2=ruleXStringLiteral();
 
                     state._fsp--;
@@ -1621,7 +1621,7 @@ public final EObject ruleXSimpleFormalParameterDefaultValueLiteral() throws Reco
 
 
     // $ANTLR start "entryRuleXConstantUnaryOperation"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:576:1: entryRuleXConstantUnaryOperation returns [EObject current=null] : iv_ruleXConstantUnaryOperation= ruleXConstantUnaryOperation EOF ;
+    // InternalCheckCfg.g:576:1: entryRuleXConstantUnaryOperation returns [EObject current=null] : iv_ruleXConstantUnaryOperation= ruleXConstantUnaryOperation EOF ;
     public final EObject entryRuleXConstantUnaryOperation() throws RecognitionException {
         EObject current = null;
 
@@ -1629,13 +1629,13 @@ public final EObject entryRuleXConstantUnaryOperation() throws RecognitionExcept
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:577:2: (iv_ruleXConstantUnaryOperation= ruleXConstantUnaryOperation EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:578:2: iv_ruleXConstantUnaryOperation= ruleXConstantUnaryOperation EOF
+            // InternalCheckCfg.g:577:2: (iv_ruleXConstantUnaryOperation= ruleXConstantUnaryOperation EOF )
+            // InternalCheckCfg.g:578:2: iv_ruleXConstantUnaryOperation= ruleXConstantUnaryOperation EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXConstantUnaryOperationRule()); 
             }
-            pushFollow(FOLLOW_ruleXConstantUnaryOperation_in_entryRuleXConstantUnaryOperation1129);
+            pushFollow(FOLLOW_1);
             iv_ruleXConstantUnaryOperation=ruleXConstantUnaryOperation();
 
             state._fsp--;
@@ -1643,7 +1643,7 @@ public final EObject entryRuleXConstantUnaryOperation() throws RecognitionExcept
             if ( state.backtracking==0 ) {
                current =iv_ruleXConstantUnaryOperation; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXConstantUnaryOperation1139); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -1661,7 +1661,7 @@ public final EObject entryRuleXConstantUnaryOperation() throws RecognitionExcept
 
 
     // $ANTLR start "ruleXConstantUnaryOperation"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:585:1: ruleXConstantUnaryOperation returns [EObject current=null] : ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXConstantUnaryOperation ) ) ) | this_XSimpleFormalParameterDefaultValueLiteral_3= ruleXSimpleFormalParameterDefaultValueLiteral ) ;
+    // InternalCheckCfg.g:585:1: ruleXConstantUnaryOperation returns [EObject current=null] : ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXConstantUnaryOperation ) ) ) | this_XSimpleFormalParameterDefaultValueLiteral_3= ruleXSimpleFormalParameterDefaultValueLiteral ) ;
     public final EObject ruleXConstantUnaryOperation() throws RecognitionException {
         EObject current = null;
 
@@ -1673,10 +1673,10 @@ public final EObject ruleXConstantUnaryOperation() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:588:28: ( ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXConstantUnaryOperation ) ) ) | this_XSimpleFormalParameterDefaultValueLiteral_3= ruleXSimpleFormalParameterDefaultValueLiteral ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:589:1: ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXConstantUnaryOperation ) ) ) | this_XSimpleFormalParameterDefaultValueLiteral_3= ruleXSimpleFormalParameterDefaultValueLiteral )
+            // InternalCheckCfg.g:588:28: ( ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXConstantUnaryOperation ) ) ) | this_XSimpleFormalParameterDefaultValueLiteral_3= ruleXSimpleFormalParameterDefaultValueLiteral ) )
+            // InternalCheckCfg.g:589:1: ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXConstantUnaryOperation ) ) ) | this_XSimpleFormalParameterDefaultValueLiteral_3= ruleXSimpleFormalParameterDefaultValueLiteral )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:589:1: ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXConstantUnaryOperation ) ) ) | this_XSimpleFormalParameterDefaultValueLiteral_3= ruleXSimpleFormalParameterDefaultValueLiteral )
+            // InternalCheckCfg.g:589:1: ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXConstantUnaryOperation ) ) ) | this_XSimpleFormalParameterDefaultValueLiteral_3= ruleXSimpleFormalParameterDefaultValueLiteral )
             int alt12=2;
             int LA12_0 = input.LA(1);
 
@@ -1695,13 +1695,13 @@ else if ( ((LA12_0>=RULE_STRING && LA12_0<=RULE_DECIMAL)||(LA12_0>=78 && LA12_0<
             }
             switch (alt12) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:589:2: ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXConstantUnaryOperation ) ) )
+                    // InternalCheckCfg.g:589:2: ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXConstantUnaryOperation ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:589:2: ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXConstantUnaryOperation ) ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:589:3: () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXConstantUnaryOperation ) )
+                    // InternalCheckCfg.g:589:2: ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXConstantUnaryOperation ) ) )
+                    // InternalCheckCfg.g:589:3: () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXConstantUnaryOperation ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:589:3: ()
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:590:5: 
+                    // InternalCheckCfg.g:589:3: ()
+                    // InternalCheckCfg.g:590:5: 
                     {
                     if ( state.backtracking==0 ) {
 
@@ -1713,11 +1713,11 @@ else if ( ((LA12_0>=RULE_STRING && LA12_0<=RULE_DECIMAL)||(LA12_0>=78 && LA12_0<
 
                     }
 
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:595:2: ( ( ruleOpUnary ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:596:1: ( ruleOpUnary )
+                    // InternalCheckCfg.g:595:2: ( ( ruleOpUnary ) )
+                    // InternalCheckCfg.g:596:1: ( ruleOpUnary )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:596:1: ( ruleOpUnary )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:597:3: ruleOpUnary
+                    // InternalCheckCfg.g:596:1: ( ruleOpUnary )
+                    // InternalCheckCfg.g:597:3: ruleOpUnary
                     {
                     if ( state.backtracking==0 ) {
 
@@ -1731,7 +1731,7 @@ else if ( ((LA12_0>=RULE_STRING && LA12_0<=RULE_DECIMAL)||(LA12_0>=78 && LA12_0<
                       	        newCompositeNode(grammarAccess.getXConstantUnaryOperationAccess().getFeatureJvmIdentifiableElementCrossReference_0_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleOpUnary_in_ruleXConstantUnaryOperation1197);
+                    pushFollow(FOLLOW_16);
                     ruleOpUnary();
 
                     state._fsp--;
@@ -1747,18 +1747,18 @@ else if ( ((LA12_0>=RULE_STRING && LA12_0<=RULE_DECIMAL)||(LA12_0>=78 && LA12_0<
 
                     }
 
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:610:2: ( (lv_operand_2_0= ruleXConstantUnaryOperation ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:611:1: (lv_operand_2_0= ruleXConstantUnaryOperation )
+                    // InternalCheckCfg.g:610:2: ( (lv_operand_2_0= ruleXConstantUnaryOperation ) )
+                    // InternalCheckCfg.g:611:1: (lv_operand_2_0= ruleXConstantUnaryOperation )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:611:1: (lv_operand_2_0= ruleXConstantUnaryOperation )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:612:3: lv_operand_2_0= ruleXConstantUnaryOperation
+                    // InternalCheckCfg.g:611:1: (lv_operand_2_0= ruleXConstantUnaryOperation )
+                    // InternalCheckCfg.g:612:3: lv_operand_2_0= ruleXConstantUnaryOperation
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXConstantUnaryOperationAccess().getOperandXConstantUnaryOperationParserRuleCall_0_2_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXConstantUnaryOperation_in_ruleXConstantUnaryOperation1218);
+                    pushFollow(FOLLOW_2);
                     lv_operand_2_0=ruleXConstantUnaryOperation();
 
                     state._fsp--;
@@ -1772,7 +1772,7 @@ else if ( ((LA12_0>=RULE_STRING && LA12_0<=RULE_DECIMAL)||(LA12_0>=78 && LA12_0<
                              			current, 
                              			"operand",
                               		lv_operand_2_0, 
-                              		"XConstantUnaryOperation");
+                              		"com.avaloq.tools.ddk.checkcfg.CheckCfg.XConstantUnaryOperation");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -1789,14 +1789,14 @@ else if ( ((LA12_0>=RULE_STRING && LA12_0<=RULE_DECIMAL)||(LA12_0>=78 && LA12_0<
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:630:5: this_XSimpleFormalParameterDefaultValueLiteral_3= ruleXSimpleFormalParameterDefaultValueLiteral
+                    // InternalCheckCfg.g:630:5: this_XSimpleFormalParameterDefaultValueLiteral_3= ruleXSimpleFormalParameterDefaultValueLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXConstantUnaryOperationAccess().getXSimpleFormalParameterDefaultValueLiteralParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXSimpleFormalParameterDefaultValueLiteral_in_ruleXConstantUnaryOperation1247);
+                    pushFollow(FOLLOW_2);
                     this_XSimpleFormalParameterDefaultValueLiteral_3=ruleXSimpleFormalParameterDefaultValueLiteral();
 
                     state._fsp--;
@@ -1833,7 +1833,7 @@ else if ( ((LA12_0>=RULE_STRING && LA12_0<=RULE_DECIMAL)||(LA12_0>=78 && LA12_0<
 
 
     // $ANTLR start "entryRuleXFormalParameterDefaultValueLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:646:1: entryRuleXFormalParameterDefaultValueLiteral returns [EObject current=null] : iv_ruleXFormalParameterDefaultValueLiteral= ruleXFormalParameterDefaultValueLiteral EOF ;
+    // InternalCheckCfg.g:646:1: entryRuleXFormalParameterDefaultValueLiteral returns [EObject current=null] : iv_ruleXFormalParameterDefaultValueLiteral= ruleXFormalParameterDefaultValueLiteral EOF ;
     public final EObject entryRuleXFormalParameterDefaultValueLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -1841,13 +1841,13 @@ public final EObject entryRuleXFormalParameterDefaultValueLiteral() throws Recog
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:647:2: (iv_ruleXFormalParameterDefaultValueLiteral= ruleXFormalParameterDefaultValueLiteral EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:648:2: iv_ruleXFormalParameterDefaultValueLiteral= ruleXFormalParameterDefaultValueLiteral EOF
+            // InternalCheckCfg.g:647:2: (iv_ruleXFormalParameterDefaultValueLiteral= ruleXFormalParameterDefaultValueLiteral EOF )
+            // InternalCheckCfg.g:648:2: iv_ruleXFormalParameterDefaultValueLiteral= ruleXFormalParameterDefaultValueLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXFormalParameterDefaultValueLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXFormalParameterDefaultValueLiteral_in_entryRuleXFormalParameterDefaultValueLiteral1282);
+            pushFollow(FOLLOW_1);
             iv_ruleXFormalParameterDefaultValueLiteral=ruleXFormalParameterDefaultValueLiteral();
 
             state._fsp--;
@@ -1855,7 +1855,7 @@ public final EObject entryRuleXFormalParameterDefaultValueLiteral() throws Recog
             if ( state.backtracking==0 ) {
                current =iv_ruleXFormalParameterDefaultValueLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXFormalParameterDefaultValueLiteral1292); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -1873,7 +1873,7 @@ public final EObject entryRuleXFormalParameterDefaultValueLiteral() throws Recog
 
 
     // $ANTLR start "ruleXFormalParameterDefaultValueLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:655:1: ruleXFormalParameterDefaultValueLiteral returns [EObject current=null] : (this_XConstantUnaryOperation_0= ruleXConstantUnaryOperation | this_XConstantListLiteral_1= ruleXConstantListLiteral ) ;
+    // InternalCheckCfg.g:655:1: ruleXFormalParameterDefaultValueLiteral returns [EObject current=null] : (this_XConstantUnaryOperation_0= ruleXConstantUnaryOperation | this_XConstantListLiteral_1= ruleXConstantListLiteral ) ;
     public final EObject ruleXFormalParameterDefaultValueLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -1885,10 +1885,10 @@ public final EObject ruleXFormalParameterDefaultValueLiteral() throws Recognitio
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:658:28: ( (this_XConstantUnaryOperation_0= ruleXConstantUnaryOperation | this_XConstantListLiteral_1= ruleXConstantListLiteral ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:659:1: (this_XConstantUnaryOperation_0= ruleXConstantUnaryOperation | this_XConstantListLiteral_1= ruleXConstantListLiteral )
+            // InternalCheckCfg.g:658:28: ( (this_XConstantUnaryOperation_0= ruleXConstantUnaryOperation | this_XConstantListLiteral_1= ruleXConstantListLiteral ) )
+            // InternalCheckCfg.g:659:1: (this_XConstantUnaryOperation_0= ruleXConstantUnaryOperation | this_XConstantListLiteral_1= ruleXConstantListLiteral )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:659:1: (this_XConstantUnaryOperation_0= ruleXConstantUnaryOperation | this_XConstantListLiteral_1= ruleXConstantListLiteral )
+            // InternalCheckCfg.g:659:1: (this_XConstantUnaryOperation_0= ruleXConstantUnaryOperation | this_XConstantListLiteral_1= ruleXConstantListLiteral )
             int alt13=2;
             int LA13_0 = input.LA(1);
 
@@ -1907,14 +1907,14 @@ else if ( (LA13_0==23) ) {
             }
             switch (alt13) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:660:5: this_XConstantUnaryOperation_0= ruleXConstantUnaryOperation
+                    // InternalCheckCfg.g:660:5: this_XConstantUnaryOperation_0= ruleXConstantUnaryOperation
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXFormalParameterDefaultValueLiteralAccess().getXConstantUnaryOperationParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXConstantUnaryOperation_in_ruleXFormalParameterDefaultValueLiteral1339);
+                    pushFollow(FOLLOW_2);
                     this_XConstantUnaryOperation_0=ruleXConstantUnaryOperation();
 
                     state._fsp--;
@@ -1929,14 +1929,14 @@ else if ( (LA13_0==23) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:670:5: this_XConstantListLiteral_1= ruleXConstantListLiteral
+                    // InternalCheckCfg.g:670:5: this_XConstantListLiteral_1= ruleXConstantListLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXFormalParameterDefaultValueLiteralAccess().getXConstantListLiteralParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXConstantListLiteral_in_ruleXFormalParameterDefaultValueLiteral1366);
+                    pushFollow(FOLLOW_2);
                     this_XConstantListLiteral_1=ruleXConstantListLiteral();
 
                     state._fsp--;
@@ -1973,7 +1973,7 @@ else if ( (LA13_0==23) ) {
 
 
     // $ANTLR start "entryRuleXConstantListLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:686:1: entryRuleXConstantListLiteral returns [EObject current=null] : iv_ruleXConstantListLiteral= ruleXConstantListLiteral EOF ;
+    // InternalCheckCfg.g:686:1: entryRuleXConstantListLiteral returns [EObject current=null] : iv_ruleXConstantListLiteral= ruleXConstantListLiteral EOF ;
     public final EObject entryRuleXConstantListLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -1981,13 +1981,13 @@ public final EObject entryRuleXConstantListLiteral() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:687:2: (iv_ruleXConstantListLiteral= ruleXConstantListLiteral EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:688:2: iv_ruleXConstantListLiteral= ruleXConstantListLiteral EOF
+            // InternalCheckCfg.g:687:2: (iv_ruleXConstantListLiteral= ruleXConstantListLiteral EOF )
+            // InternalCheckCfg.g:688:2: iv_ruleXConstantListLiteral= ruleXConstantListLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXConstantListLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXConstantListLiteral_in_entryRuleXConstantListLiteral1401);
+            pushFollow(FOLLOW_1);
             iv_ruleXConstantListLiteral=ruleXConstantListLiteral();
 
             state._fsp--;
@@ -1995,7 +1995,7 @@ public final EObject entryRuleXConstantListLiteral() throws RecognitionException
             if ( state.backtracking==0 ) {
                current =iv_ruleXConstantListLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXConstantListLiteral1411); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -2013,7 +2013,7 @@ public final EObject entryRuleXConstantListLiteral() throws RecognitionException
 
 
     // $ANTLR start "ruleXConstantListLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:695:1: ruleXConstantListLiteral returns [EObject current=null] : ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXConstantUnaryOperation ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )* )? otherlv_6= ']' ) ;
+    // InternalCheckCfg.g:695:1: ruleXConstantListLiteral returns [EObject current=null] : ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXConstantUnaryOperation ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )* )? otherlv_6= ']' ) ;
     public final EObject ruleXConstantListLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2029,14 +2029,14 @@ public final EObject ruleXConstantListLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:698:28: ( ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXConstantUnaryOperation ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )* )? otherlv_6= ']' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:699:1: ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXConstantUnaryOperation ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )* )? otherlv_6= ']' )
+            // InternalCheckCfg.g:698:28: ( ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXConstantUnaryOperation ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )* )? otherlv_6= ']' ) )
+            // InternalCheckCfg.g:699:1: ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXConstantUnaryOperation ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )* )? otherlv_6= ']' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:699:1: ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXConstantUnaryOperation ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )* )? otherlv_6= ']' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:699:2: () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXConstantUnaryOperation ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )* )? otherlv_6= ']'
+            // InternalCheckCfg.g:699:1: ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXConstantUnaryOperation ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )* )? otherlv_6= ']' )
+            // InternalCheckCfg.g:699:2: () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXConstantUnaryOperation ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )* )? otherlv_6= ']'
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:699:2: ()
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:700:5: 
+            // InternalCheckCfg.g:699:2: ()
+            // InternalCheckCfg.g:700:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -2048,19 +2048,19 @@ public final EObject ruleXConstantListLiteral() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,23,FOLLOW_23_in_ruleXConstantListLiteral1457); if (state.failed) return current;
+            otherlv_1=(Token)match(input,23,FOLLOW_17); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXConstantListLiteralAccess().getNumberSignKeyword_1());
                   
             }
-            otherlv_2=(Token)match(input,24,FOLLOW_24_in_ruleXConstantListLiteral1469); if (state.failed) return current;
+            otherlv_2=(Token)match(input,24,FOLLOW_18); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getXConstantListLiteralAccess().getLeftSquareBracketKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:713:1: ( ( (lv_elements_3_0= ruleXConstantUnaryOperation ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )* )?
+            // InternalCheckCfg.g:713:1: ( ( (lv_elements_3_0= ruleXConstantUnaryOperation ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )* )?
             int alt15=2;
             int LA15_0 = input.LA(1);
 
@@ -2069,20 +2069,20 @@ public final EObject ruleXConstantListLiteral() throws RecognitionException {
             }
             switch (alt15) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:713:2: ( (lv_elements_3_0= ruleXConstantUnaryOperation ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )*
+                    // InternalCheckCfg.g:713:2: ( (lv_elements_3_0= ruleXConstantUnaryOperation ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )*
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:713:2: ( (lv_elements_3_0= ruleXConstantUnaryOperation ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:714:1: (lv_elements_3_0= ruleXConstantUnaryOperation )
+                    // InternalCheckCfg.g:713:2: ( (lv_elements_3_0= ruleXConstantUnaryOperation ) )
+                    // InternalCheckCfg.g:714:1: (lv_elements_3_0= ruleXConstantUnaryOperation )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:714:1: (lv_elements_3_0= ruleXConstantUnaryOperation )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:715:3: lv_elements_3_0= ruleXConstantUnaryOperation
+                    // InternalCheckCfg.g:714:1: (lv_elements_3_0= ruleXConstantUnaryOperation )
+                    // InternalCheckCfg.g:715:3: lv_elements_3_0= ruleXConstantUnaryOperation
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXConstantListLiteralAccess().getElementsXConstantUnaryOperationParserRuleCall_3_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXConstantUnaryOperation_in_ruleXConstantListLiteral1491);
+                    pushFollow(FOLLOW_19);
                     lv_elements_3_0=ruleXConstantUnaryOperation();
 
                     state._fsp--;
@@ -2096,7 +2096,7 @@ public final EObject ruleXConstantListLiteral() throws RecognitionException {
                              			current, 
                              			"elements",
                               		lv_elements_3_0, 
-                              		"XConstantUnaryOperation");
+                              		"com.avaloq.tools.ddk.checkcfg.CheckCfg.XConstantUnaryOperation");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -2106,7 +2106,7 @@ public final EObject ruleXConstantListLiteral() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:731:2: (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )*
+                    // InternalCheckCfg.g:731:2: (otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) ) )*
                     loop14:
                     do {
                         int alt14=2;
@@ -2119,26 +2119,26 @@ public final EObject ruleXConstantListLiteral() throws RecognitionException {
 
                         switch (alt14) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:731:4: otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) )
+                    	    // InternalCheckCfg.g:731:4: otherlv_4= ',' ( (lv_elements_5_0= ruleXConstantUnaryOperation ) )
                     	    {
-                    	    otherlv_4=(Token)match(input,20,FOLLOW_20_in_ruleXConstantListLiteral1504); if (state.failed) return current;
+                    	    otherlv_4=(Token)match(input,20,FOLLOW_16); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_4, grammarAccess.getXConstantListLiteralAccess().getCommaKeyword_3_1_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:735:1: ( (lv_elements_5_0= ruleXConstantUnaryOperation ) )
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:736:1: (lv_elements_5_0= ruleXConstantUnaryOperation )
+                    	    // InternalCheckCfg.g:735:1: ( (lv_elements_5_0= ruleXConstantUnaryOperation ) )
+                    	    // InternalCheckCfg.g:736:1: (lv_elements_5_0= ruleXConstantUnaryOperation )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:736:1: (lv_elements_5_0= ruleXConstantUnaryOperation )
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:737:3: lv_elements_5_0= ruleXConstantUnaryOperation
+                    	    // InternalCheckCfg.g:736:1: (lv_elements_5_0= ruleXConstantUnaryOperation )
+                    	    // InternalCheckCfg.g:737:3: lv_elements_5_0= ruleXConstantUnaryOperation
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getXConstantListLiteralAccess().getElementsXConstantUnaryOperationParserRuleCall_3_1_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleXConstantUnaryOperation_in_ruleXConstantListLiteral1525);
+                    	    pushFollow(FOLLOW_19);
                     	    lv_elements_5_0=ruleXConstantUnaryOperation();
 
                     	    state._fsp--;
@@ -2152,7 +2152,7 @@ public final EObject ruleXConstantListLiteral() throws RecognitionException {
                     	             			current, 
                     	             			"elements",
                     	              		lv_elements_5_0, 
-                    	              		"XConstantUnaryOperation");
+                    	              		"com.avaloq.tools.ddk.checkcfg.CheckCfg.XConstantUnaryOperation");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -2177,7 +2177,7 @@ public final EObject ruleXConstantListLiteral() throws RecognitionException {
 
             }
 
-            otherlv_6=(Token)match(input,25,FOLLOW_25_in_ruleXConstantListLiteral1541); if (state.failed) return current;
+            otherlv_6=(Token)match(input,25,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_6, grammarAccess.getXConstantListLiteralAccess().getRightSquareBracketKeyword_4());
@@ -2206,7 +2206,7 @@ public final EObject ruleXConstantListLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:765:1: entryRuleXExpression returns [EObject current=null] : iv_ruleXExpression= ruleXExpression EOF ;
+    // InternalCheckCfg.g:765:1: entryRuleXExpression returns [EObject current=null] : iv_ruleXExpression= ruleXExpression EOF ;
     public final EObject entryRuleXExpression() throws RecognitionException {
         EObject current = null;
 
@@ -2214,13 +2214,13 @@ public final EObject entryRuleXExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:766:2: (iv_ruleXExpression= ruleXExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:767:2: iv_ruleXExpression= ruleXExpression EOF
+            // InternalCheckCfg.g:766:2: (iv_ruleXExpression= ruleXExpression EOF )
+            // InternalCheckCfg.g:767:2: iv_ruleXExpression= ruleXExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_entryRuleXExpression1577);
+            pushFollow(FOLLOW_1);
             iv_ruleXExpression=ruleXExpression();
 
             state._fsp--;
@@ -2228,7 +2228,7 @@ public final EObject entryRuleXExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXExpression1587); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -2246,7 +2246,7 @@ public final EObject entryRuleXExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:774:1: ruleXExpression returns [EObject current=null] : this_XAssignment_0= ruleXAssignment ;
+    // InternalCheckCfg.g:774:1: ruleXExpression returns [EObject current=null] : this_XAssignment_0= ruleXAssignment ;
     public final EObject ruleXExpression() throws RecognitionException {
         EObject current = null;
 
@@ -2256,15 +2256,15 @@ public final EObject ruleXExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:777:28: (this_XAssignment_0= ruleXAssignment )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:779:5: this_XAssignment_0= ruleXAssignment
+            // InternalCheckCfg.g:777:28: (this_XAssignment_0= ruleXAssignment )
+            // InternalCheckCfg.g:779:5: this_XAssignment_0= ruleXAssignment
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXExpressionAccess().getXAssignmentParserRuleCall()); 
                   
             }
-            pushFollow(FOLLOW_ruleXAssignment_in_ruleXExpression1633);
+            pushFollow(FOLLOW_2);
             this_XAssignment_0=ruleXAssignment();
 
             state._fsp--;
@@ -2295,7 +2295,7 @@ public final EObject ruleXExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXAssignment"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:795:1: entryRuleXAssignment returns [EObject current=null] : iv_ruleXAssignment= ruleXAssignment EOF ;
+    // InternalCheckCfg.g:795:1: entryRuleXAssignment returns [EObject current=null] : iv_ruleXAssignment= ruleXAssignment EOF ;
     public final EObject entryRuleXAssignment() throws RecognitionException {
         EObject current = null;
 
@@ -2303,13 +2303,13 @@ public final EObject entryRuleXAssignment() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:796:2: (iv_ruleXAssignment= ruleXAssignment EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:797:2: iv_ruleXAssignment= ruleXAssignment EOF
+            // InternalCheckCfg.g:796:2: (iv_ruleXAssignment= ruleXAssignment EOF )
+            // InternalCheckCfg.g:797:2: iv_ruleXAssignment= ruleXAssignment EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAssignmentRule()); 
             }
-            pushFollow(FOLLOW_ruleXAssignment_in_entryRuleXAssignment1667);
+            pushFollow(FOLLOW_1);
             iv_ruleXAssignment=ruleXAssignment();
 
             state._fsp--;
@@ -2317,7 +2317,7 @@ public final EObject entryRuleXAssignment() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXAssignment; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAssignment1677); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -2335,7 +2335,7 @@ public final EObject entryRuleXAssignment() throws RecognitionException {
 
 
     // $ANTLR start "ruleXAssignment"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:804:1: ruleXAssignment returns [EObject current=null] : ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) ) ;
+    // InternalCheckCfg.g:804:1: ruleXAssignment returns [EObject current=null] : ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) ) ;
     public final EObject ruleXAssignment() throws RecognitionException {
         EObject current = null;
 
@@ -2349,10 +2349,10 @@ public final EObject ruleXAssignment() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:807:28: ( ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:808:1: ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) )
+            // InternalCheckCfg.g:807:28: ( ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) ) )
+            // InternalCheckCfg.g:808:1: ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:808:1: ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) )
+            // InternalCheckCfg.g:808:1: ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) )
             int alt17=2;
             switch ( input.LA(1) ) {
             case RULE_ID:
@@ -2491,13 +2491,13 @@ else if ( (LA17_5==22) ) {
 
             switch (alt17) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:808:2: ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) )
+                    // InternalCheckCfg.g:808:2: ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:808:2: ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:808:3: () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) )
+                    // InternalCheckCfg.g:808:2: ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) )
+                    // InternalCheckCfg.g:808:3: () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:808:3: ()
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:809:5: 
+                    // InternalCheckCfg.g:808:3: ()
+                    // InternalCheckCfg.g:809:5: 
                     {
                     if ( state.backtracking==0 ) {
 
@@ -2509,11 +2509,11 @@ else if ( (LA17_5==22) ) {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:814:2: ( ( ruleFeatureCallID ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:815:1: ( ruleFeatureCallID )
+                    // InternalCheckCfg.g:814:2: ( ( ruleFeatureCallID ) )
+                    // InternalCheckCfg.g:815:1: ( ruleFeatureCallID )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:815:1: ( ruleFeatureCallID )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:816:3: ruleFeatureCallID
+                    // InternalCheckCfg.g:815:1: ( ruleFeatureCallID )
+                    // InternalCheckCfg.g:816:3: ruleFeatureCallID
                     {
                     if ( state.backtracking==0 ) {
 
@@ -2527,7 +2527,7 @@ else if ( (LA17_5==22) ) {
                       	        newCompositeNode(grammarAccess.getXAssignmentAccess().getFeatureJvmIdentifiableElementCrossReference_0_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleFeatureCallID_in_ruleXAssignment1735);
+                    pushFollow(FOLLOW_14);
                     ruleFeatureCallID();
 
                     state._fsp--;
@@ -2548,7 +2548,7 @@ else if ( (LA17_5==22) ) {
                               newCompositeNode(grammarAccess.getXAssignmentAccess().getOpSingleAssignParserRuleCall_0_2()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleOpSingleAssign_in_ruleXAssignment1751);
+                    pushFollow(FOLLOW_20);
                     ruleOpSingleAssign();
 
                     state._fsp--;
@@ -2558,18 +2558,18 @@ else if ( (LA17_5==22) ) {
                               afterParserOrEnumRuleCall();
                           
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:837:1: ( (lv_value_3_0= ruleXAssignment ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:838:1: (lv_value_3_0= ruleXAssignment )
+                    // InternalCheckCfg.g:837:1: ( (lv_value_3_0= ruleXAssignment ) )
+                    // InternalCheckCfg.g:838:1: (lv_value_3_0= ruleXAssignment )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:838:1: (lv_value_3_0= ruleXAssignment )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:839:3: lv_value_3_0= ruleXAssignment
+                    // InternalCheckCfg.g:838:1: (lv_value_3_0= ruleXAssignment )
+                    // InternalCheckCfg.g:839:3: lv_value_3_0= ruleXAssignment
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXAssignmentAccess().getValueXAssignmentParserRuleCall_0_3_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXAssignment_in_ruleXAssignment1771);
+                    pushFollow(FOLLOW_2);
                     lv_value_3_0=ruleXAssignment();
 
                     state._fsp--;
@@ -2583,7 +2583,7 @@ else if ( (LA17_5==22) ) {
                              			current, 
                              			"value",
                               		lv_value_3_0, 
-                              		"XAssignment");
+                              		"org.eclipse.xtext.xbase.Xbase.XAssignment");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -2600,17 +2600,17 @@ else if ( (LA17_5==22) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:856:6: (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? )
+                    // InternalCheckCfg.g:856:6: (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:856:6: (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:857:5: this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )?
+                    // InternalCheckCfg.g:856:6: (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? )
+                    // InternalCheckCfg.g:857:5: this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )?
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXAssignmentAccess().getXOrExpressionParserRuleCall_1_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXOrExpression_in_ruleXAssignment1801);
+                    pushFollow(FOLLOW_21);
                     this_XOrExpression_4=ruleXOrExpression();
 
                     state._fsp--;
@@ -2621,21 +2621,21 @@ else if ( (LA17_5==22) ) {
                               afterParserOrEnumRuleCall();
                           
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:865:1: ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )?
+                    // InternalCheckCfg.g:865:1: ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )?
                     int alt16=2;
                     alt16 = dfa16.predict(input);
                     switch (alt16) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:865:2: ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) )
+                            // InternalCheckCfg.g:865:2: ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) )
                             {
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:865:2: ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) )
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:865:3: ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) )
+                            // InternalCheckCfg.g:865:2: ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) )
+                            // InternalCheckCfg.g:865:3: ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) )
                             {
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:870:6: ( () ( ( ruleOpMultiAssign ) ) )
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:870:7: () ( ( ruleOpMultiAssign ) )
+                            // InternalCheckCfg.g:870:6: ( () ( ( ruleOpMultiAssign ) ) )
+                            // InternalCheckCfg.g:870:7: () ( ( ruleOpMultiAssign ) )
                             {
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:870:7: ()
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:871:5: 
+                            // InternalCheckCfg.g:870:7: ()
+                            // InternalCheckCfg.g:871:5: 
                             {
                             if ( state.backtracking==0 ) {
 
@@ -2647,11 +2647,11 @@ else if ( (LA17_5==22) ) {
 
                             }
 
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:876:2: ( ( ruleOpMultiAssign ) )
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:877:1: ( ruleOpMultiAssign )
+                            // InternalCheckCfg.g:876:2: ( ( ruleOpMultiAssign ) )
+                            // InternalCheckCfg.g:877:1: ( ruleOpMultiAssign )
                             {
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:877:1: ( ruleOpMultiAssign )
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:878:3: ruleOpMultiAssign
+                            // InternalCheckCfg.g:877:1: ( ruleOpMultiAssign )
+                            // InternalCheckCfg.g:878:3: ruleOpMultiAssign
                             {
                             if ( state.backtracking==0 ) {
 
@@ -2665,7 +2665,7 @@ else if ( (LA17_5==22) ) {
                               	        newCompositeNode(grammarAccess.getXAssignmentAccess().getFeatureJvmIdentifiableElementCrossReference_1_1_0_0_1_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleOpMultiAssign_in_ruleXAssignment1854);
+                            pushFollow(FOLLOW_20);
                             ruleOpMultiAssign();
 
                             state._fsp--;
@@ -2687,18 +2687,18 @@ else if ( (LA17_5==22) ) {
 
                             }
 
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:891:4: ( (lv_rightOperand_7_0= ruleXAssignment ) )
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:892:1: (lv_rightOperand_7_0= ruleXAssignment )
+                            // InternalCheckCfg.g:891:4: ( (lv_rightOperand_7_0= ruleXAssignment ) )
+                            // InternalCheckCfg.g:892:1: (lv_rightOperand_7_0= ruleXAssignment )
                             {
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:892:1: (lv_rightOperand_7_0= ruleXAssignment )
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:893:3: lv_rightOperand_7_0= ruleXAssignment
+                            // InternalCheckCfg.g:892:1: (lv_rightOperand_7_0= ruleXAssignment )
+                            // InternalCheckCfg.g:893:3: lv_rightOperand_7_0= ruleXAssignment
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXAssignmentAccess().getRightOperandXAssignmentParserRuleCall_1_1_1_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleXAssignment_in_ruleXAssignment1877);
+                            pushFollow(FOLLOW_2);
                             lv_rightOperand_7_0=ruleXAssignment();
 
                             state._fsp--;
@@ -2712,7 +2712,7 @@ else if ( (LA17_5==22) ) {
                                      			current, 
                                      			"rightOperand",
                                       		lv_rightOperand_7_0, 
-                                      		"XAssignment");
+                                      		"org.eclipse.xtext.xbase.Xbase.XAssignment");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -2757,7 +2757,7 @@ else if ( (LA17_5==22) ) {
 
 
     // $ANTLR start "entryRuleOpSingleAssign"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:917:1: entryRuleOpSingleAssign returns [String current=null] : iv_ruleOpSingleAssign= ruleOpSingleAssign EOF ;
+    // InternalCheckCfg.g:917:1: entryRuleOpSingleAssign returns [String current=null] : iv_ruleOpSingleAssign= ruleOpSingleAssign EOF ;
     public final String entryRuleOpSingleAssign() throws RecognitionException {
         String current = null;
 
@@ -2765,13 +2765,13 @@ public final String entryRuleOpSingleAssign() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:918:2: (iv_ruleOpSingleAssign= ruleOpSingleAssign EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:919:2: iv_ruleOpSingleAssign= ruleOpSingleAssign EOF
+            // InternalCheckCfg.g:918:2: (iv_ruleOpSingleAssign= ruleOpSingleAssign EOF )
+            // InternalCheckCfg.g:919:2: iv_ruleOpSingleAssign= ruleOpSingleAssign EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpSingleAssignRule()); 
             }
-            pushFollow(FOLLOW_ruleOpSingleAssign_in_entryRuleOpSingleAssign1917);
+            pushFollow(FOLLOW_1);
             iv_ruleOpSingleAssign=ruleOpSingleAssign();
 
             state._fsp--;
@@ -2779,7 +2779,7 @@ public final String entryRuleOpSingleAssign() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpSingleAssign.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpSingleAssign1928); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -2797,7 +2797,7 @@ public final String entryRuleOpSingleAssign() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpSingleAssign"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:926:1: ruleOpSingleAssign returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : kw= '=' ;
+    // InternalCheckCfg.g:926:1: ruleOpSingleAssign returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : kw= '=' ;
     public final AntlrDatatypeRuleToken ruleOpSingleAssign() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -2806,10 +2806,10 @@ public final AntlrDatatypeRuleToken ruleOpSingleAssign() throws RecognitionExcep
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:929:28: (kw= '=' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:931:2: kw= '='
+            // InternalCheckCfg.g:929:28: (kw= '=' )
+            // InternalCheckCfg.g:931:2: kw= '='
             {
-            kw=(Token)match(input,22,FOLLOW_22_in_ruleOpSingleAssign1965); if (state.failed) return current;
+            kw=(Token)match(input,22,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                       current.merge(kw);
@@ -2836,7 +2836,7 @@ public final AntlrDatatypeRuleToken ruleOpSingleAssign() throws RecognitionExcep
 
 
     // $ANTLR start "entryRuleOpMultiAssign"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:944:1: entryRuleOpMultiAssign returns [String current=null] : iv_ruleOpMultiAssign= ruleOpMultiAssign EOF ;
+    // InternalCheckCfg.g:944:1: entryRuleOpMultiAssign returns [String current=null] : iv_ruleOpMultiAssign= ruleOpMultiAssign EOF ;
     public final String entryRuleOpMultiAssign() throws RecognitionException {
         String current = null;
 
@@ -2844,13 +2844,13 @@ public final String entryRuleOpMultiAssign() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:945:2: (iv_ruleOpMultiAssign= ruleOpMultiAssign EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:946:2: iv_ruleOpMultiAssign= ruleOpMultiAssign EOF
+            // InternalCheckCfg.g:945:2: (iv_ruleOpMultiAssign= ruleOpMultiAssign EOF )
+            // InternalCheckCfg.g:946:2: iv_ruleOpMultiAssign= ruleOpMultiAssign EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpMultiAssignRule()); 
             }
-            pushFollow(FOLLOW_ruleOpMultiAssign_in_entryRuleOpMultiAssign2005);
+            pushFollow(FOLLOW_1);
             iv_ruleOpMultiAssign=ruleOpMultiAssign();
 
             state._fsp--;
@@ -2858,7 +2858,7 @@ public final String entryRuleOpMultiAssign() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpMultiAssign.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpMultiAssign2016); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -2876,7 +2876,7 @@ public final String entryRuleOpMultiAssign() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpMultiAssign"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:953:1: ruleOpMultiAssign returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) ) ;
+    // InternalCheckCfg.g:953:1: ruleOpMultiAssign returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) ) ;
     public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -2885,10 +2885,10 @@ public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionExcept
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:956:28: ( (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:957:1: (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) )
+            // InternalCheckCfg.g:956:28: ( (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) ) )
+            // InternalCheckCfg.g:957:1: (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:957:1: (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) )
+            // InternalCheckCfg.g:957:1: (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) )
             int alt19=7;
             switch ( input.LA(1) ) {
             case 26:
@@ -2936,9 +2936,9 @@ public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionExcept
 
             switch (alt19) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:958:2: kw= '+='
+                    // InternalCheckCfg.g:958:2: kw= '+='
                     {
-                    kw=(Token)match(input,26,FOLLOW_26_in_ruleOpMultiAssign2054); if (state.failed) return current;
+                    kw=(Token)match(input,26,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -2949,9 +2949,9 @@ public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionExcept
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:965:2: kw= '-='
+                    // InternalCheckCfg.g:965:2: kw= '-='
                     {
-                    kw=(Token)match(input,27,FOLLOW_27_in_ruleOpMultiAssign2073); if (state.failed) return current;
+                    kw=(Token)match(input,27,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -2962,9 +2962,9 @@ public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionExcept
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:972:2: kw= '*='
+                    // InternalCheckCfg.g:972:2: kw= '*='
                     {
-                    kw=(Token)match(input,28,FOLLOW_28_in_ruleOpMultiAssign2092); if (state.failed) return current;
+                    kw=(Token)match(input,28,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -2975,9 +2975,9 @@ public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionExcept
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:979:2: kw= '/='
+                    // InternalCheckCfg.g:979:2: kw= '/='
                     {
-                    kw=(Token)match(input,29,FOLLOW_29_in_ruleOpMultiAssign2111); if (state.failed) return current;
+                    kw=(Token)match(input,29,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -2988,9 +2988,9 @@ public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionExcept
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:986:2: kw= '%='
+                    // InternalCheckCfg.g:986:2: kw= '%='
                     {
-                    kw=(Token)match(input,30,FOLLOW_30_in_ruleOpMultiAssign2130); if (state.failed) return current;
+                    kw=(Token)match(input,30,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -3001,26 +3001,26 @@ public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionExcept
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:992:6: (kw= '<' kw= '<' kw= '=' )
+                    // InternalCheckCfg.g:992:6: (kw= '<' kw= '<' kw= '=' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:992:6: (kw= '<' kw= '<' kw= '=' )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:993:2: kw= '<' kw= '<' kw= '='
+                    // InternalCheckCfg.g:992:6: (kw= '<' kw= '<' kw= '=' )
+                    // InternalCheckCfg.g:993:2: kw= '<' kw= '<' kw= '='
                     {
-                    kw=(Token)match(input,31,FOLLOW_31_in_ruleOpMultiAssign2150); if (state.failed) return current;
+                    kw=(Token)match(input,31,FOLLOW_22); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
                               newLeafNode(kw, grammarAccess.getOpMultiAssignAccess().getLessThanSignKeyword_5_0()); 
                           
                     }
-                    kw=(Token)match(input,31,FOLLOW_31_in_ruleOpMultiAssign2163); if (state.failed) return current;
+                    kw=(Token)match(input,31,FOLLOW_14); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
                               newLeafNode(kw, grammarAccess.getOpMultiAssignAccess().getLessThanSignKeyword_5_1()); 
                           
                     }
-                    kw=(Token)match(input,22,FOLLOW_22_in_ruleOpMultiAssign2176); if (state.failed) return current;
+                    kw=(Token)match(input,22,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -3034,19 +3034,19 @@ public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionExcept
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1011:6: (kw= '>' (kw= '>' )? kw= '>=' )
+                    // InternalCheckCfg.g:1011:6: (kw= '>' (kw= '>' )? kw= '>=' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1011:6: (kw= '>' (kw= '>' )? kw= '>=' )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1012:2: kw= '>' (kw= '>' )? kw= '>='
+                    // InternalCheckCfg.g:1011:6: (kw= '>' (kw= '>' )? kw= '>=' )
+                    // InternalCheckCfg.g:1012:2: kw= '>' (kw= '>' )? kw= '>='
                     {
-                    kw=(Token)match(input,32,FOLLOW_32_in_ruleOpMultiAssign2197); if (state.failed) return current;
+                    kw=(Token)match(input,32,FOLLOW_23); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
                               newLeafNode(kw, grammarAccess.getOpMultiAssignAccess().getGreaterThanSignKeyword_6_0()); 
                           
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1017:1: (kw= '>' )?
+                    // InternalCheckCfg.g:1017:1: (kw= '>' )?
                     int alt18=2;
                     int LA18_0 = input.LA(1);
 
@@ -3055,9 +3055,9 @@ public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionExcept
                     }
                     switch (alt18) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1018:2: kw= '>'
+                            // InternalCheckCfg.g:1018:2: kw= '>'
                             {
-                            kw=(Token)match(input,32,FOLLOW_32_in_ruleOpMultiAssign2211); if (state.failed) return current;
+                            kw=(Token)match(input,32,FOLLOW_24); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       current.merge(kw);
@@ -3070,7 +3070,7 @@ public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionExcept
 
                     }
 
-                    kw=(Token)match(input,33,FOLLOW_33_in_ruleOpMultiAssign2226); if (state.failed) return current;
+                    kw=(Token)match(input,33,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -3106,7 +3106,7 @@ public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionExcept
 
 
     // $ANTLR start "entryRuleXOrExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1037:1: entryRuleXOrExpression returns [EObject current=null] : iv_ruleXOrExpression= ruleXOrExpression EOF ;
+    // InternalCheckCfg.g:1037:1: entryRuleXOrExpression returns [EObject current=null] : iv_ruleXOrExpression= ruleXOrExpression EOF ;
     public final EObject entryRuleXOrExpression() throws RecognitionException {
         EObject current = null;
 
@@ -3114,13 +3114,13 @@ public final EObject entryRuleXOrExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1038:2: (iv_ruleXOrExpression= ruleXOrExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1039:2: iv_ruleXOrExpression= ruleXOrExpression EOF
+            // InternalCheckCfg.g:1038:2: (iv_ruleXOrExpression= ruleXOrExpression EOF )
+            // InternalCheckCfg.g:1039:2: iv_ruleXOrExpression= ruleXOrExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXOrExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXOrExpression_in_entryRuleXOrExpression2267);
+            pushFollow(FOLLOW_1);
             iv_ruleXOrExpression=ruleXOrExpression();
 
             state._fsp--;
@@ -3128,7 +3128,7 @@ public final EObject entryRuleXOrExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXOrExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXOrExpression2277); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -3146,7 +3146,7 @@ public final EObject entryRuleXOrExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXOrExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1046:1: ruleXOrExpression returns [EObject current=null] : (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* ) ;
+    // InternalCheckCfg.g:1046:1: ruleXOrExpression returns [EObject current=null] : (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* ) ;
     public final EObject ruleXOrExpression() throws RecognitionException {
         EObject current = null;
 
@@ -3158,18 +3158,18 @@ public final EObject ruleXOrExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1049:28: ( (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1050:1: (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* )
+            // InternalCheckCfg.g:1049:28: ( (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* ) )
+            // InternalCheckCfg.g:1050:1: (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1050:1: (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1051:5: this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )*
+            // InternalCheckCfg.g:1050:1: (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* )
+            // InternalCheckCfg.g:1051:5: this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXOrExpressionAccess().getXAndExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleXAndExpression_in_ruleXOrExpression2324);
+            pushFollow(FOLLOW_25);
             this_XAndExpression_0=ruleXAndExpression();
 
             state._fsp--;
@@ -3180,7 +3180,7 @@ public final EObject ruleXOrExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1059:1: ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )*
+            // InternalCheckCfg.g:1059:1: ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )*
             loop20:
             do {
                 int alt20=2;
@@ -3199,16 +3199,16 @@ public final EObject ruleXOrExpression() throws RecognitionException {
 
                 switch (alt20) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1059:2: ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) )
+            	    // InternalCheckCfg.g:1059:2: ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1059:2: ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1059:3: ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) )
+            	    // InternalCheckCfg.g:1059:2: ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) )
+            	    // InternalCheckCfg.g:1059:3: ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1064:6: ( () ( ( ruleOpOr ) ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1064:7: () ( ( ruleOpOr ) )
+            	    // InternalCheckCfg.g:1064:6: ( () ( ( ruleOpOr ) ) )
+            	    // InternalCheckCfg.g:1064:7: () ( ( ruleOpOr ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1064:7: ()
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1065:5: 
+            	    // InternalCheckCfg.g:1064:7: ()
+            	    // InternalCheckCfg.g:1065:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -3220,11 +3220,11 @@ public final EObject ruleXOrExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1070:2: ( ( ruleOpOr ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1071:1: ( ruleOpOr )
+            	    // InternalCheckCfg.g:1070:2: ( ( ruleOpOr ) )
+            	    // InternalCheckCfg.g:1071:1: ( ruleOpOr )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1071:1: ( ruleOpOr )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1072:3: ruleOpOr
+            	    // InternalCheckCfg.g:1071:1: ( ruleOpOr )
+            	    // InternalCheckCfg.g:1072:3: ruleOpOr
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -3238,7 +3238,7 @@ public final EObject ruleXOrExpression() throws RecognitionException {
             	      	        newCompositeNode(grammarAccess.getXOrExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleOpOr_in_ruleXOrExpression2377);
+            	    pushFollow(FOLLOW_20);
             	    ruleOpOr();
 
             	    state._fsp--;
@@ -3260,18 +3260,18 @@ public final EObject ruleXOrExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1085:4: ( (lv_rightOperand_3_0= ruleXAndExpression ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1086:1: (lv_rightOperand_3_0= ruleXAndExpression )
+            	    // InternalCheckCfg.g:1085:4: ( (lv_rightOperand_3_0= ruleXAndExpression ) )
+            	    // InternalCheckCfg.g:1086:1: (lv_rightOperand_3_0= ruleXAndExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1086:1: (lv_rightOperand_3_0= ruleXAndExpression )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1087:3: lv_rightOperand_3_0= ruleXAndExpression
+            	    // InternalCheckCfg.g:1086:1: (lv_rightOperand_3_0= ruleXAndExpression )
+            	    // InternalCheckCfg.g:1087:3: lv_rightOperand_3_0= ruleXAndExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXOrExpressionAccess().getRightOperandXAndExpressionParserRuleCall_1_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXAndExpression_in_ruleXOrExpression2400);
+            	    pushFollow(FOLLOW_25);
             	    lv_rightOperand_3_0=ruleXAndExpression();
 
             	    state._fsp--;
@@ -3285,7 +3285,7 @@ public final EObject ruleXOrExpression() throws RecognitionException {
             	             			current, 
             	             			"rightOperand",
             	              		lv_rightOperand_3_0, 
-            	              		"XAndExpression");
+            	              		"org.eclipse.xtext.xbase.Xbase.XAndExpression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -3327,7 +3327,7 @@ public final EObject ruleXOrExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpOr"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1111:1: entryRuleOpOr returns [String current=null] : iv_ruleOpOr= ruleOpOr EOF ;
+    // InternalCheckCfg.g:1111:1: entryRuleOpOr returns [String current=null] : iv_ruleOpOr= ruleOpOr EOF ;
     public final String entryRuleOpOr() throws RecognitionException {
         String current = null;
 
@@ -3335,13 +3335,13 @@ public final String entryRuleOpOr() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1112:2: (iv_ruleOpOr= ruleOpOr EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1113:2: iv_ruleOpOr= ruleOpOr EOF
+            // InternalCheckCfg.g:1112:2: (iv_ruleOpOr= ruleOpOr EOF )
+            // InternalCheckCfg.g:1113:2: iv_ruleOpOr= ruleOpOr EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpOrRule()); 
             }
-            pushFollow(FOLLOW_ruleOpOr_in_entryRuleOpOr2439);
+            pushFollow(FOLLOW_1);
             iv_ruleOpOr=ruleOpOr();
 
             state._fsp--;
@@ -3349,7 +3349,7 @@ public final String entryRuleOpOr() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpOr.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpOr2450); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -3367,7 +3367,7 @@ public final String entryRuleOpOr() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpOr"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1120:1: ruleOpOr returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : kw= '||' ;
+    // InternalCheckCfg.g:1120:1: ruleOpOr returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : kw= '||' ;
     public final AntlrDatatypeRuleToken ruleOpOr() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -3376,10 +3376,10 @@ public final AntlrDatatypeRuleToken ruleOpOr() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1123:28: (kw= '||' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1125:2: kw= '||'
+            // InternalCheckCfg.g:1123:28: (kw= '||' )
+            // InternalCheckCfg.g:1125:2: kw= '||'
             {
-            kw=(Token)match(input,34,FOLLOW_34_in_ruleOpOr2487); if (state.failed) return current;
+            kw=(Token)match(input,34,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                       current.merge(kw);
@@ -3406,7 +3406,7 @@ public final AntlrDatatypeRuleToken ruleOpOr() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXAndExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1138:1: entryRuleXAndExpression returns [EObject current=null] : iv_ruleXAndExpression= ruleXAndExpression EOF ;
+    // InternalCheckCfg.g:1138:1: entryRuleXAndExpression returns [EObject current=null] : iv_ruleXAndExpression= ruleXAndExpression EOF ;
     public final EObject entryRuleXAndExpression() throws RecognitionException {
         EObject current = null;
 
@@ -3414,13 +3414,13 @@ public final EObject entryRuleXAndExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1139:2: (iv_ruleXAndExpression= ruleXAndExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1140:2: iv_ruleXAndExpression= ruleXAndExpression EOF
+            // InternalCheckCfg.g:1139:2: (iv_ruleXAndExpression= ruleXAndExpression EOF )
+            // InternalCheckCfg.g:1140:2: iv_ruleXAndExpression= ruleXAndExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAndExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXAndExpression_in_entryRuleXAndExpression2526);
+            pushFollow(FOLLOW_1);
             iv_ruleXAndExpression=ruleXAndExpression();
 
             state._fsp--;
@@ -3428,7 +3428,7 @@ public final EObject entryRuleXAndExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXAndExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAndExpression2536); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -3446,7 +3446,7 @@ public final EObject entryRuleXAndExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXAndExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1147:1: ruleXAndExpression returns [EObject current=null] : (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* ) ;
+    // InternalCheckCfg.g:1147:1: ruleXAndExpression returns [EObject current=null] : (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* ) ;
     public final EObject ruleXAndExpression() throws RecognitionException {
         EObject current = null;
 
@@ -3458,18 +3458,18 @@ public final EObject ruleXAndExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1150:28: ( (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1151:1: (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* )
+            // InternalCheckCfg.g:1150:28: ( (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* ) )
+            // InternalCheckCfg.g:1151:1: (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1151:1: (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1152:5: this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )*
+            // InternalCheckCfg.g:1151:1: (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* )
+            // InternalCheckCfg.g:1152:5: this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXAndExpressionAccess().getXEqualityExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleXEqualityExpression_in_ruleXAndExpression2583);
+            pushFollow(FOLLOW_26);
             this_XEqualityExpression_0=ruleXEqualityExpression();
 
             state._fsp--;
@@ -3480,7 +3480,7 @@ public final EObject ruleXAndExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1160:1: ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )*
+            // InternalCheckCfg.g:1160:1: ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )*
             loop21:
             do {
                 int alt21=2;
@@ -3499,16 +3499,16 @@ public final EObject ruleXAndExpression() throws RecognitionException {
 
                 switch (alt21) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1160:2: ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) )
+            	    // InternalCheckCfg.g:1160:2: ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1160:2: ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1160:3: ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) )
+            	    // InternalCheckCfg.g:1160:2: ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) )
+            	    // InternalCheckCfg.g:1160:3: ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1165:6: ( () ( ( ruleOpAnd ) ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1165:7: () ( ( ruleOpAnd ) )
+            	    // InternalCheckCfg.g:1165:6: ( () ( ( ruleOpAnd ) ) )
+            	    // InternalCheckCfg.g:1165:7: () ( ( ruleOpAnd ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1165:7: ()
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1166:5: 
+            	    // InternalCheckCfg.g:1165:7: ()
+            	    // InternalCheckCfg.g:1166:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -3520,11 +3520,11 @@ public final EObject ruleXAndExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1171:2: ( ( ruleOpAnd ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1172:1: ( ruleOpAnd )
+            	    // InternalCheckCfg.g:1171:2: ( ( ruleOpAnd ) )
+            	    // InternalCheckCfg.g:1172:1: ( ruleOpAnd )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1172:1: ( ruleOpAnd )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1173:3: ruleOpAnd
+            	    // InternalCheckCfg.g:1172:1: ( ruleOpAnd )
+            	    // InternalCheckCfg.g:1173:3: ruleOpAnd
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -3538,7 +3538,7 @@ public final EObject ruleXAndExpression() throws RecognitionException {
             	      	        newCompositeNode(grammarAccess.getXAndExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleOpAnd_in_ruleXAndExpression2636);
+            	    pushFollow(FOLLOW_20);
             	    ruleOpAnd();
 
             	    state._fsp--;
@@ -3560,18 +3560,18 @@ public final EObject ruleXAndExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1186:4: ( (lv_rightOperand_3_0= ruleXEqualityExpression ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1187:1: (lv_rightOperand_3_0= ruleXEqualityExpression )
+            	    // InternalCheckCfg.g:1186:4: ( (lv_rightOperand_3_0= ruleXEqualityExpression ) )
+            	    // InternalCheckCfg.g:1187:1: (lv_rightOperand_3_0= ruleXEqualityExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1187:1: (lv_rightOperand_3_0= ruleXEqualityExpression )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1188:3: lv_rightOperand_3_0= ruleXEqualityExpression
+            	    // InternalCheckCfg.g:1187:1: (lv_rightOperand_3_0= ruleXEqualityExpression )
+            	    // InternalCheckCfg.g:1188:3: lv_rightOperand_3_0= ruleXEqualityExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXAndExpressionAccess().getRightOperandXEqualityExpressionParserRuleCall_1_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXEqualityExpression_in_ruleXAndExpression2659);
+            	    pushFollow(FOLLOW_26);
             	    lv_rightOperand_3_0=ruleXEqualityExpression();
 
             	    state._fsp--;
@@ -3585,7 +3585,7 @@ public final EObject ruleXAndExpression() throws RecognitionException {
             	             			current, 
             	             			"rightOperand",
             	              		lv_rightOperand_3_0, 
-            	              		"XEqualityExpression");
+            	              		"org.eclipse.xtext.xbase.Xbase.XEqualityExpression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -3627,7 +3627,7 @@ public final EObject ruleXAndExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpAnd"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1212:1: entryRuleOpAnd returns [String current=null] : iv_ruleOpAnd= ruleOpAnd EOF ;
+    // InternalCheckCfg.g:1212:1: entryRuleOpAnd returns [String current=null] : iv_ruleOpAnd= ruleOpAnd EOF ;
     public final String entryRuleOpAnd() throws RecognitionException {
         String current = null;
 
@@ -3635,13 +3635,13 @@ public final String entryRuleOpAnd() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1213:2: (iv_ruleOpAnd= ruleOpAnd EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1214:2: iv_ruleOpAnd= ruleOpAnd EOF
+            // InternalCheckCfg.g:1213:2: (iv_ruleOpAnd= ruleOpAnd EOF )
+            // InternalCheckCfg.g:1214:2: iv_ruleOpAnd= ruleOpAnd EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpAndRule()); 
             }
-            pushFollow(FOLLOW_ruleOpAnd_in_entryRuleOpAnd2698);
+            pushFollow(FOLLOW_1);
             iv_ruleOpAnd=ruleOpAnd();
 
             state._fsp--;
@@ -3649,7 +3649,7 @@ public final String entryRuleOpAnd() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpAnd.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpAnd2709); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -3667,7 +3667,7 @@ public final String entryRuleOpAnd() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpAnd"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1221:1: ruleOpAnd returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : kw= '&&' ;
+    // InternalCheckCfg.g:1221:1: ruleOpAnd returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : kw= '&&' ;
     public final AntlrDatatypeRuleToken ruleOpAnd() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -3676,10 +3676,10 @@ public final AntlrDatatypeRuleToken ruleOpAnd() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1224:28: (kw= '&&' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1226:2: kw= '&&'
+            // InternalCheckCfg.g:1224:28: (kw= '&&' )
+            // InternalCheckCfg.g:1226:2: kw= '&&'
             {
-            kw=(Token)match(input,35,FOLLOW_35_in_ruleOpAnd2746); if (state.failed) return current;
+            kw=(Token)match(input,35,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                       current.merge(kw);
@@ -3706,7 +3706,7 @@ public final AntlrDatatypeRuleToken ruleOpAnd() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXEqualityExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1239:1: entryRuleXEqualityExpression returns [EObject current=null] : iv_ruleXEqualityExpression= ruleXEqualityExpression EOF ;
+    // InternalCheckCfg.g:1239:1: entryRuleXEqualityExpression returns [EObject current=null] : iv_ruleXEqualityExpression= ruleXEqualityExpression EOF ;
     public final EObject entryRuleXEqualityExpression() throws RecognitionException {
         EObject current = null;
 
@@ -3714,13 +3714,13 @@ public final EObject entryRuleXEqualityExpression() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1240:2: (iv_ruleXEqualityExpression= ruleXEqualityExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1241:2: iv_ruleXEqualityExpression= ruleXEqualityExpression EOF
+            // InternalCheckCfg.g:1240:2: (iv_ruleXEqualityExpression= ruleXEqualityExpression EOF )
+            // InternalCheckCfg.g:1241:2: iv_ruleXEqualityExpression= ruleXEqualityExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXEqualityExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXEqualityExpression_in_entryRuleXEqualityExpression2785);
+            pushFollow(FOLLOW_1);
             iv_ruleXEqualityExpression=ruleXEqualityExpression();
 
             state._fsp--;
@@ -3728,7 +3728,7 @@ public final EObject entryRuleXEqualityExpression() throws RecognitionException
             if ( state.backtracking==0 ) {
                current =iv_ruleXEqualityExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXEqualityExpression2795); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -3746,7 +3746,7 @@ public final EObject entryRuleXEqualityExpression() throws RecognitionException
 
 
     // $ANTLR start "ruleXEqualityExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1248:1: ruleXEqualityExpression returns [EObject current=null] : (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* ) ;
+    // InternalCheckCfg.g:1248:1: ruleXEqualityExpression returns [EObject current=null] : (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* ) ;
     public final EObject ruleXEqualityExpression() throws RecognitionException {
         EObject current = null;
 
@@ -3758,18 +3758,18 @@ public final EObject ruleXEqualityExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1251:28: ( (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1252:1: (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* )
+            // InternalCheckCfg.g:1251:28: ( (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* ) )
+            // InternalCheckCfg.g:1252:1: (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1252:1: (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1253:5: this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )*
+            // InternalCheckCfg.g:1252:1: (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* )
+            // InternalCheckCfg.g:1253:5: this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXEqualityExpressionAccess().getXRelationalExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleXRelationalExpression_in_ruleXEqualityExpression2842);
+            pushFollow(FOLLOW_27);
             this_XRelationalExpression_0=ruleXRelationalExpression();
 
             state._fsp--;
@@ -3780,7 +3780,7 @@ public final EObject ruleXEqualityExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1261:1: ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )*
+            // InternalCheckCfg.g:1261:1: ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )*
             loop22:
             do {
                 int alt22=2;
@@ -3834,16 +3834,16 @@ public final EObject ruleXEqualityExpression() throws RecognitionException {
 
                 switch (alt22) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1261:2: ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) )
+            	    // InternalCheckCfg.g:1261:2: ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1261:2: ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1261:3: ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) )
+            	    // InternalCheckCfg.g:1261:2: ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) )
+            	    // InternalCheckCfg.g:1261:3: ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1266:6: ( () ( ( ruleOpEquality ) ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1266:7: () ( ( ruleOpEquality ) )
+            	    // InternalCheckCfg.g:1266:6: ( () ( ( ruleOpEquality ) ) )
+            	    // InternalCheckCfg.g:1266:7: () ( ( ruleOpEquality ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1266:7: ()
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1267:5: 
+            	    // InternalCheckCfg.g:1266:7: ()
+            	    // InternalCheckCfg.g:1267:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -3855,11 +3855,11 @@ public final EObject ruleXEqualityExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1272:2: ( ( ruleOpEquality ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1273:1: ( ruleOpEquality )
+            	    // InternalCheckCfg.g:1272:2: ( ( ruleOpEquality ) )
+            	    // InternalCheckCfg.g:1273:1: ( ruleOpEquality )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1273:1: ( ruleOpEquality )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1274:3: ruleOpEquality
+            	    // InternalCheckCfg.g:1273:1: ( ruleOpEquality )
+            	    // InternalCheckCfg.g:1274:3: ruleOpEquality
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -3873,7 +3873,7 @@ public final EObject ruleXEqualityExpression() throws RecognitionException {
             	      	        newCompositeNode(grammarAccess.getXEqualityExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleOpEquality_in_ruleXEqualityExpression2895);
+            	    pushFollow(FOLLOW_20);
             	    ruleOpEquality();
 
             	    state._fsp--;
@@ -3895,18 +3895,18 @@ public final EObject ruleXEqualityExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1287:4: ( (lv_rightOperand_3_0= ruleXRelationalExpression ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1288:1: (lv_rightOperand_3_0= ruleXRelationalExpression )
+            	    // InternalCheckCfg.g:1287:4: ( (lv_rightOperand_3_0= ruleXRelationalExpression ) )
+            	    // InternalCheckCfg.g:1288:1: (lv_rightOperand_3_0= ruleXRelationalExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1288:1: (lv_rightOperand_3_0= ruleXRelationalExpression )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1289:3: lv_rightOperand_3_0= ruleXRelationalExpression
+            	    // InternalCheckCfg.g:1288:1: (lv_rightOperand_3_0= ruleXRelationalExpression )
+            	    // InternalCheckCfg.g:1289:3: lv_rightOperand_3_0= ruleXRelationalExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXEqualityExpressionAccess().getRightOperandXRelationalExpressionParserRuleCall_1_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXRelationalExpression_in_ruleXEqualityExpression2918);
+            	    pushFollow(FOLLOW_27);
             	    lv_rightOperand_3_0=ruleXRelationalExpression();
 
             	    state._fsp--;
@@ -3920,7 +3920,7 @@ public final EObject ruleXEqualityExpression() throws RecognitionException {
             	             			current, 
             	             			"rightOperand",
             	              		lv_rightOperand_3_0, 
-            	              		"XRelationalExpression");
+            	              		"org.eclipse.xtext.xbase.Xbase.XRelationalExpression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -3962,7 +3962,7 @@ public final EObject ruleXEqualityExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpEquality"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1313:1: entryRuleOpEquality returns [String current=null] : iv_ruleOpEquality= ruleOpEquality EOF ;
+    // InternalCheckCfg.g:1313:1: entryRuleOpEquality returns [String current=null] : iv_ruleOpEquality= ruleOpEquality EOF ;
     public final String entryRuleOpEquality() throws RecognitionException {
         String current = null;
 
@@ -3970,13 +3970,13 @@ public final String entryRuleOpEquality() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1314:2: (iv_ruleOpEquality= ruleOpEquality EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1315:2: iv_ruleOpEquality= ruleOpEquality EOF
+            // InternalCheckCfg.g:1314:2: (iv_ruleOpEquality= ruleOpEquality EOF )
+            // InternalCheckCfg.g:1315:2: iv_ruleOpEquality= ruleOpEquality EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpEqualityRule()); 
             }
-            pushFollow(FOLLOW_ruleOpEquality_in_entryRuleOpEquality2957);
+            pushFollow(FOLLOW_1);
             iv_ruleOpEquality=ruleOpEquality();
 
             state._fsp--;
@@ -3984,7 +3984,7 @@ public final String entryRuleOpEquality() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpEquality.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpEquality2968); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -4002,7 +4002,7 @@ public final String entryRuleOpEquality() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpEquality"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1322:1: ruleOpEquality returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' ) ;
+    // InternalCheckCfg.g:1322:1: ruleOpEquality returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' ) ;
     public final AntlrDatatypeRuleToken ruleOpEquality() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -4011,10 +4011,10 @@ public final AntlrDatatypeRuleToken ruleOpEquality() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1325:28: ( (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1326:1: (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' )
+            // InternalCheckCfg.g:1325:28: ( (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' ) )
+            // InternalCheckCfg.g:1326:1: (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1326:1: (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' )
+            // InternalCheckCfg.g:1326:1: (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' )
             int alt23=4;
             switch ( input.LA(1) ) {
             case 36:
@@ -4047,9 +4047,9 @@ public final AntlrDatatypeRuleToken ruleOpEquality() throws RecognitionException
 
             switch (alt23) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1327:2: kw= '=='
+                    // InternalCheckCfg.g:1327:2: kw= '=='
                     {
-                    kw=(Token)match(input,36,FOLLOW_36_in_ruleOpEquality3006); if (state.failed) return current;
+                    kw=(Token)match(input,36,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -4060,9 +4060,9 @@ public final AntlrDatatypeRuleToken ruleOpEquality() throws RecognitionException
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1334:2: kw= '!='
+                    // InternalCheckCfg.g:1334:2: kw= '!='
                     {
-                    kw=(Token)match(input,37,FOLLOW_37_in_ruleOpEquality3025); if (state.failed) return current;
+                    kw=(Token)match(input,37,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -4073,9 +4073,9 @@ public final AntlrDatatypeRuleToken ruleOpEquality() throws RecognitionException
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1341:2: kw= '==='
+                    // InternalCheckCfg.g:1341:2: kw= '==='
                     {
-                    kw=(Token)match(input,38,FOLLOW_38_in_ruleOpEquality3044); if (state.failed) return current;
+                    kw=(Token)match(input,38,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -4086,9 +4086,9 @@ public final AntlrDatatypeRuleToken ruleOpEquality() throws RecognitionException
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1348:2: kw= '!=='
+                    // InternalCheckCfg.g:1348:2: kw= '!=='
                     {
-                    kw=(Token)match(input,39,FOLLOW_39_in_ruleOpEquality3063); if (state.failed) return current;
+                    kw=(Token)match(input,39,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -4121,7 +4121,7 @@ public final AntlrDatatypeRuleToken ruleOpEquality() throws RecognitionException
 
 
     // $ANTLR start "entryRuleXRelationalExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1361:1: entryRuleXRelationalExpression returns [EObject current=null] : iv_ruleXRelationalExpression= ruleXRelationalExpression EOF ;
+    // InternalCheckCfg.g:1361:1: entryRuleXRelationalExpression returns [EObject current=null] : iv_ruleXRelationalExpression= ruleXRelationalExpression EOF ;
     public final EObject entryRuleXRelationalExpression() throws RecognitionException {
         EObject current = null;
 
@@ -4129,13 +4129,13 @@ public final EObject entryRuleXRelationalExpression() throws RecognitionExceptio
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1362:2: (iv_ruleXRelationalExpression= ruleXRelationalExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1363:2: iv_ruleXRelationalExpression= ruleXRelationalExpression EOF
+            // InternalCheckCfg.g:1362:2: (iv_ruleXRelationalExpression= ruleXRelationalExpression EOF )
+            // InternalCheckCfg.g:1363:2: iv_ruleXRelationalExpression= ruleXRelationalExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXRelationalExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXRelationalExpression_in_entryRuleXRelationalExpression3103);
+            pushFollow(FOLLOW_1);
             iv_ruleXRelationalExpression=ruleXRelationalExpression();
 
             state._fsp--;
@@ -4143,7 +4143,7 @@ public final EObject entryRuleXRelationalExpression() throws RecognitionExceptio
             if ( state.backtracking==0 ) {
                current =iv_ruleXRelationalExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXRelationalExpression3113); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -4161,7 +4161,7 @@ public final EObject entryRuleXRelationalExpression() throws RecognitionExceptio
 
 
     // $ANTLR start "ruleXRelationalExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1370:1: ruleXRelationalExpression returns [EObject current=null] : (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* ) ;
+    // InternalCheckCfg.g:1370:1: ruleXRelationalExpression returns [EObject current=null] : (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* ) ;
     public final EObject ruleXRelationalExpression() throws RecognitionException {
         EObject current = null;
 
@@ -4176,18 +4176,18 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1373:28: ( (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1374:1: (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* )
+            // InternalCheckCfg.g:1373:28: ( (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* ) )
+            // InternalCheckCfg.g:1374:1: (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1374:1: (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1375:5: this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )*
+            // InternalCheckCfg.g:1374:1: (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* )
+            // InternalCheckCfg.g:1375:5: this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXRelationalExpressionAccess().getXOtherOperatorExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleXOtherOperatorExpression_in_ruleXRelationalExpression3160);
+            pushFollow(FOLLOW_28);
             this_XOtherOperatorExpression_0=ruleXOtherOperatorExpression();
 
             state._fsp--;
@@ -4198,7 +4198,7 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1383:1: ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )*
+            // InternalCheckCfg.g:1383:1: ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )*
             loop24:
             do {
                 int alt24=3;
@@ -4252,19 +4252,19 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
 
                 switch (alt24) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1383:2: ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )
+            	    // InternalCheckCfg.g:1383:2: ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1383:2: ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1383:3: ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) )
+            	    // InternalCheckCfg.g:1383:2: ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )
+            	    // InternalCheckCfg.g:1383:3: ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1383:3: ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1383:4: ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' )
+            	    // InternalCheckCfg.g:1383:3: ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) )
+            	    // InternalCheckCfg.g:1383:4: ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1385:5: ( () otherlv_2= 'instanceof' )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1385:6: () otherlv_2= 'instanceof'
+            	    // InternalCheckCfg.g:1385:5: ( () otherlv_2= 'instanceof' )
+            	    // InternalCheckCfg.g:1385:6: () otherlv_2= 'instanceof'
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1385:6: ()
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1386:5: 
+            	    // InternalCheckCfg.g:1385:6: ()
+            	    // InternalCheckCfg.g:1386:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -4276,7 +4276,7 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
 
             	    }
 
-            	    otherlv_2=(Token)match(input,40,FOLLOW_40_in_ruleXRelationalExpression3196); if (state.failed) return current;
+            	    otherlv_2=(Token)match(input,40,FOLLOW_29); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_2, grammarAccess.getXRelationalExpressionAccess().getInstanceofKeyword_1_0_0_0_1());
@@ -4288,18 +4288,18 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1395:3: ( (lv_type_3_0= ruleJvmTypeReference ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1396:1: (lv_type_3_0= ruleJvmTypeReference )
+            	    // InternalCheckCfg.g:1395:3: ( (lv_type_3_0= ruleJvmTypeReference ) )
+            	    // InternalCheckCfg.g:1396:1: (lv_type_3_0= ruleJvmTypeReference )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1396:1: (lv_type_3_0= ruleJvmTypeReference )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1397:3: lv_type_3_0= ruleJvmTypeReference
+            	    // InternalCheckCfg.g:1396:1: (lv_type_3_0= ruleJvmTypeReference )
+            	    // InternalCheckCfg.g:1397:3: lv_type_3_0= ruleJvmTypeReference
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXRelationalExpressionAccess().getTypeJvmTypeReferenceParserRuleCall_1_0_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleXRelationalExpression3219);
+            	    pushFollow(FOLLOW_28);
             	    lv_type_3_0=ruleJvmTypeReference();
 
             	    state._fsp--;
@@ -4313,7 +4313,7 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
             	             			current, 
             	             			"type",
             	              		lv_type_3_0, 
-            	              		"JvmTypeReference");
+            	              		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -4330,19 +4330,19 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
             	    }
             	    break;
             	case 2 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1414:6: ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) )
+            	    // InternalCheckCfg.g:1414:6: ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1414:6: ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1414:7: ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) )
+            	    // InternalCheckCfg.g:1414:6: ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) )
+            	    // InternalCheckCfg.g:1414:7: ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1414:7: ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1414:8: ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) )
+            	    // InternalCheckCfg.g:1414:7: ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) )
+            	    // InternalCheckCfg.g:1414:8: ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1419:6: ( () ( ( ruleOpCompare ) ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1419:7: () ( ( ruleOpCompare ) )
+            	    // InternalCheckCfg.g:1419:6: ( () ( ( ruleOpCompare ) ) )
+            	    // InternalCheckCfg.g:1419:7: () ( ( ruleOpCompare ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1419:7: ()
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1420:5: 
+            	    // InternalCheckCfg.g:1419:7: ()
+            	    // InternalCheckCfg.g:1420:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -4354,11 +4354,11 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1425:2: ( ( ruleOpCompare ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1426:1: ( ruleOpCompare )
+            	    // InternalCheckCfg.g:1425:2: ( ( ruleOpCompare ) )
+            	    // InternalCheckCfg.g:1426:1: ( ruleOpCompare )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1426:1: ( ruleOpCompare )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1427:3: ruleOpCompare
+            	    // InternalCheckCfg.g:1426:1: ( ruleOpCompare )
+            	    // InternalCheckCfg.g:1427:3: ruleOpCompare
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -4372,7 +4372,7 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
             	      	        newCompositeNode(grammarAccess.getXRelationalExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_1_0_0_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleOpCompare_in_ruleXRelationalExpression3280);
+            	    pushFollow(FOLLOW_20);
             	    ruleOpCompare();
 
             	    state._fsp--;
@@ -4394,18 +4394,18 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1440:4: ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1441:1: (lv_rightOperand_6_0= ruleXOtherOperatorExpression )
+            	    // InternalCheckCfg.g:1440:4: ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) )
+            	    // InternalCheckCfg.g:1441:1: (lv_rightOperand_6_0= ruleXOtherOperatorExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1441:1: (lv_rightOperand_6_0= ruleXOtherOperatorExpression )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1442:3: lv_rightOperand_6_0= ruleXOtherOperatorExpression
+            	    // InternalCheckCfg.g:1441:1: (lv_rightOperand_6_0= ruleXOtherOperatorExpression )
+            	    // InternalCheckCfg.g:1442:3: lv_rightOperand_6_0= ruleXOtherOperatorExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXRelationalExpressionAccess().getRightOperandXOtherOperatorExpressionParserRuleCall_1_1_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXOtherOperatorExpression_in_ruleXRelationalExpression3303);
+            	    pushFollow(FOLLOW_28);
             	    lv_rightOperand_6_0=ruleXOtherOperatorExpression();
 
             	    state._fsp--;
@@ -4419,7 +4419,7 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
             	             			current, 
             	             			"rightOperand",
             	              		lv_rightOperand_6_0, 
-            	              		"XOtherOperatorExpression");
+            	              		"org.eclipse.xtext.xbase.Xbase.XOtherOperatorExpression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -4464,7 +4464,7 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpCompare"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1466:1: entryRuleOpCompare returns [String current=null] : iv_ruleOpCompare= ruleOpCompare EOF ;
+    // InternalCheckCfg.g:1466:1: entryRuleOpCompare returns [String current=null] : iv_ruleOpCompare= ruleOpCompare EOF ;
     public final String entryRuleOpCompare() throws RecognitionException {
         String current = null;
 
@@ -4472,13 +4472,13 @@ public final String entryRuleOpCompare() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1467:2: (iv_ruleOpCompare= ruleOpCompare EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1468:2: iv_ruleOpCompare= ruleOpCompare EOF
+            // InternalCheckCfg.g:1467:2: (iv_ruleOpCompare= ruleOpCompare EOF )
+            // InternalCheckCfg.g:1468:2: iv_ruleOpCompare= ruleOpCompare EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpCompareRule()); 
             }
-            pushFollow(FOLLOW_ruleOpCompare_in_entryRuleOpCompare3343);
+            pushFollow(FOLLOW_1);
             iv_ruleOpCompare=ruleOpCompare();
 
             state._fsp--;
@@ -4486,7 +4486,7 @@ public final String entryRuleOpCompare() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpCompare.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpCompare3354); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -4504,7 +4504,7 @@ public final String entryRuleOpCompare() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpCompare"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1475:1: ruleOpCompare returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' ) ;
+    // InternalCheckCfg.g:1475:1: ruleOpCompare returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' ) ;
     public final AntlrDatatypeRuleToken ruleOpCompare() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -4513,10 +4513,10 @@ public final AntlrDatatypeRuleToken ruleOpCompare() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1478:28: ( (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1479:1: (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' )
+            // InternalCheckCfg.g:1478:28: ( (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' ) )
+            // InternalCheckCfg.g:1479:1: (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1479:1: (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' )
+            // InternalCheckCfg.g:1479:1: (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' )
             int alt25=4;
             switch ( input.LA(1) ) {
             case 33:
@@ -4558,9 +4558,9 @@ else if ( (LA25_2==22) ) {
 
             switch (alt25) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1480:2: kw= '>='
+                    // InternalCheckCfg.g:1480:2: kw= '>='
                     {
-                    kw=(Token)match(input,33,FOLLOW_33_in_ruleOpCompare3392); if (state.failed) return current;
+                    kw=(Token)match(input,33,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -4571,19 +4571,19 @@ else if ( (LA25_2==22) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1486:6: (kw= '<' kw= '=' )
+                    // InternalCheckCfg.g:1486:6: (kw= '<' kw= '=' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1486:6: (kw= '<' kw= '=' )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1487:2: kw= '<' kw= '='
+                    // InternalCheckCfg.g:1486:6: (kw= '<' kw= '=' )
+                    // InternalCheckCfg.g:1487:2: kw= '<' kw= '='
                     {
-                    kw=(Token)match(input,31,FOLLOW_31_in_ruleOpCompare3412); if (state.failed) return current;
+                    kw=(Token)match(input,31,FOLLOW_14); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
                               newLeafNode(kw, grammarAccess.getOpCompareAccess().getLessThanSignKeyword_1_0()); 
                           
                     }
-                    kw=(Token)match(input,22,FOLLOW_22_in_ruleOpCompare3425); if (state.failed) return current;
+                    kw=(Token)match(input,22,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -4597,9 +4597,9 @@ else if ( (LA25_2==22) ) {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1500:2: kw= '>'
+                    // InternalCheckCfg.g:1500:2: kw= '>'
                     {
-                    kw=(Token)match(input,32,FOLLOW_32_in_ruleOpCompare3445); if (state.failed) return current;
+                    kw=(Token)match(input,32,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -4610,9 +4610,9 @@ else if ( (LA25_2==22) ) {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1507:2: kw= '<'
+                    // InternalCheckCfg.g:1507:2: kw= '<'
                     {
-                    kw=(Token)match(input,31,FOLLOW_31_in_ruleOpCompare3464); if (state.failed) return current;
+                    kw=(Token)match(input,31,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -4645,7 +4645,7 @@ else if ( (LA25_2==22) ) {
 
 
     // $ANTLR start "entryRuleXOtherOperatorExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1520:1: entryRuleXOtherOperatorExpression returns [EObject current=null] : iv_ruleXOtherOperatorExpression= ruleXOtherOperatorExpression EOF ;
+    // InternalCheckCfg.g:1520:1: entryRuleXOtherOperatorExpression returns [EObject current=null] : iv_ruleXOtherOperatorExpression= ruleXOtherOperatorExpression EOF ;
     public final EObject entryRuleXOtherOperatorExpression() throws RecognitionException {
         EObject current = null;
 
@@ -4653,13 +4653,13 @@ public final EObject entryRuleXOtherOperatorExpression() throws RecognitionExcep
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1521:2: (iv_ruleXOtherOperatorExpression= ruleXOtherOperatorExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1522:2: iv_ruleXOtherOperatorExpression= ruleXOtherOperatorExpression EOF
+            // InternalCheckCfg.g:1521:2: (iv_ruleXOtherOperatorExpression= ruleXOtherOperatorExpression EOF )
+            // InternalCheckCfg.g:1522:2: iv_ruleXOtherOperatorExpression= ruleXOtherOperatorExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXOtherOperatorExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXOtherOperatorExpression_in_entryRuleXOtherOperatorExpression3504);
+            pushFollow(FOLLOW_1);
             iv_ruleXOtherOperatorExpression=ruleXOtherOperatorExpression();
 
             state._fsp--;
@@ -4667,7 +4667,7 @@ public final EObject entryRuleXOtherOperatorExpression() throws RecognitionExcep
             if ( state.backtracking==0 ) {
                current =iv_ruleXOtherOperatorExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXOtherOperatorExpression3514); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -4685,7 +4685,7 @@ public final EObject entryRuleXOtherOperatorExpression() throws RecognitionExcep
 
 
     // $ANTLR start "ruleXOtherOperatorExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1529:1: ruleXOtherOperatorExpression returns [EObject current=null] : (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* ) ;
+    // InternalCheckCfg.g:1529:1: ruleXOtherOperatorExpression returns [EObject current=null] : (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* ) ;
     public final EObject ruleXOtherOperatorExpression() throws RecognitionException {
         EObject current = null;
 
@@ -4697,18 +4697,18 @@ public final EObject ruleXOtherOperatorExpression() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1532:28: ( (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1533:1: (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* )
+            // InternalCheckCfg.g:1532:28: ( (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* ) )
+            // InternalCheckCfg.g:1533:1: (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1533:1: (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1534:5: this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )*
+            // InternalCheckCfg.g:1533:1: (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* )
+            // InternalCheckCfg.g:1534:5: this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXOtherOperatorExpressionAccess().getXAdditiveExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleXAdditiveExpression_in_ruleXOtherOperatorExpression3561);
+            pushFollow(FOLLOW_30);
             this_XAdditiveExpression_0=ruleXAdditiveExpression();
 
             state._fsp--;
@@ -4719,23 +4719,23 @@ public final EObject ruleXOtherOperatorExpression() throws RecognitionException
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1542:1: ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )*
+            // InternalCheckCfg.g:1542:1: ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )*
             loop26:
             do {
                 int alt26=2;
                 alt26 = dfa26.predict(input);
                 switch (alt26) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1542:2: ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) )
+            	    // InternalCheckCfg.g:1542:2: ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1542:2: ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1542:3: ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) )
+            	    // InternalCheckCfg.g:1542:2: ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) )
+            	    // InternalCheckCfg.g:1542:3: ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1547:6: ( () ( ( ruleOpOther ) ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1547:7: () ( ( ruleOpOther ) )
+            	    // InternalCheckCfg.g:1547:6: ( () ( ( ruleOpOther ) ) )
+            	    // InternalCheckCfg.g:1547:7: () ( ( ruleOpOther ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1547:7: ()
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1548:5: 
+            	    // InternalCheckCfg.g:1547:7: ()
+            	    // InternalCheckCfg.g:1548:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -4747,11 +4747,11 @@ public final EObject ruleXOtherOperatorExpression() throws RecognitionException
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1553:2: ( ( ruleOpOther ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1554:1: ( ruleOpOther )
+            	    // InternalCheckCfg.g:1553:2: ( ( ruleOpOther ) )
+            	    // InternalCheckCfg.g:1554:1: ( ruleOpOther )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1554:1: ( ruleOpOther )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1555:3: ruleOpOther
+            	    // InternalCheckCfg.g:1554:1: ( ruleOpOther )
+            	    // InternalCheckCfg.g:1555:3: ruleOpOther
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -4765,7 +4765,7 @@ public final EObject ruleXOtherOperatorExpression() throws RecognitionException
             	      	        newCompositeNode(grammarAccess.getXOtherOperatorExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleOpOther_in_ruleXOtherOperatorExpression3614);
+            	    pushFollow(FOLLOW_20);
             	    ruleOpOther();
 
             	    state._fsp--;
@@ -4787,18 +4787,18 @@ public final EObject ruleXOtherOperatorExpression() throws RecognitionException
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1568:4: ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1569:1: (lv_rightOperand_3_0= ruleXAdditiveExpression )
+            	    // InternalCheckCfg.g:1568:4: ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) )
+            	    // InternalCheckCfg.g:1569:1: (lv_rightOperand_3_0= ruleXAdditiveExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1569:1: (lv_rightOperand_3_0= ruleXAdditiveExpression )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1570:3: lv_rightOperand_3_0= ruleXAdditiveExpression
+            	    // InternalCheckCfg.g:1569:1: (lv_rightOperand_3_0= ruleXAdditiveExpression )
+            	    // InternalCheckCfg.g:1570:3: lv_rightOperand_3_0= ruleXAdditiveExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXOtherOperatorExpressionAccess().getRightOperandXAdditiveExpressionParserRuleCall_1_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXAdditiveExpression_in_ruleXOtherOperatorExpression3637);
+            	    pushFollow(FOLLOW_30);
             	    lv_rightOperand_3_0=ruleXAdditiveExpression();
 
             	    state._fsp--;
@@ -4812,7 +4812,7 @@ public final EObject ruleXOtherOperatorExpression() throws RecognitionException
             	             			current, 
             	             			"rightOperand",
             	              		lv_rightOperand_3_0, 
-            	              		"XAdditiveExpression");
+            	              		"org.eclipse.xtext.xbase.Xbase.XAdditiveExpression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -4854,7 +4854,7 @@ public final EObject ruleXOtherOperatorExpression() throws RecognitionException
 
 
     // $ANTLR start "entryRuleOpOther"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1594:1: entryRuleOpOther returns [String current=null] : iv_ruleOpOther= ruleOpOther EOF ;
+    // InternalCheckCfg.g:1594:1: entryRuleOpOther returns [String current=null] : iv_ruleOpOther= ruleOpOther EOF ;
     public final String entryRuleOpOther() throws RecognitionException {
         String current = null;
 
@@ -4862,13 +4862,13 @@ public final String entryRuleOpOther() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1595:2: (iv_ruleOpOther= ruleOpOther EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1596:2: iv_ruleOpOther= ruleOpOther EOF
+            // InternalCheckCfg.g:1595:2: (iv_ruleOpOther= ruleOpOther EOF )
+            // InternalCheckCfg.g:1596:2: iv_ruleOpOther= ruleOpOther EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpOtherRule()); 
             }
-            pushFollow(FOLLOW_ruleOpOther_in_entryRuleOpOther3676);
+            pushFollow(FOLLOW_1);
             iv_ruleOpOther=ruleOpOther();
 
             state._fsp--;
@@ -4876,7 +4876,7 @@ public final String entryRuleOpOther() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpOther.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpOther3687); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -4894,7 +4894,7 @@ public final String entryRuleOpOther() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpOther"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1603:1: ruleOpOther returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' ) ;
+    // InternalCheckCfg.g:1603:1: ruleOpOther returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' ) ;
     public final AntlrDatatypeRuleToken ruleOpOther() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -4903,17 +4903,17 @@ public final AntlrDatatypeRuleToken ruleOpOther() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1606:28: ( (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1607:1: (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' )
+            // InternalCheckCfg.g:1606:28: ( (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' ) )
+            // InternalCheckCfg.g:1607:1: (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1607:1: (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' )
+            // InternalCheckCfg.g:1607:1: (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' )
             int alt29=9;
             alt29 = dfa29.predict(input);
             switch (alt29) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1608:2: kw= '->'
+                    // InternalCheckCfg.g:1608:2: kw= '->'
                     {
-                    kw=(Token)match(input,41,FOLLOW_41_in_ruleOpOther3725); if (state.failed) return current;
+                    kw=(Token)match(input,41,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -4924,9 +4924,9 @@ public final AntlrDatatypeRuleToken ruleOpOther() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1615:2: kw= '..<'
+                    // InternalCheckCfg.g:1615:2: kw= '..<'
                     {
-                    kw=(Token)match(input,42,FOLLOW_42_in_ruleOpOther3744); if (state.failed) return current;
+                    kw=(Token)match(input,42,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -4937,19 +4937,19 @@ public final AntlrDatatypeRuleToken ruleOpOther() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1621:6: (kw= '>' kw= '..' )
+                    // InternalCheckCfg.g:1621:6: (kw= '>' kw= '..' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1621:6: (kw= '>' kw= '..' )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1622:2: kw= '>' kw= '..'
+                    // InternalCheckCfg.g:1621:6: (kw= '>' kw= '..' )
+                    // InternalCheckCfg.g:1622:2: kw= '>' kw= '..'
                     {
-                    kw=(Token)match(input,32,FOLLOW_32_in_ruleOpOther3764); if (state.failed) return current;
+                    kw=(Token)match(input,32,FOLLOW_31); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
                               newLeafNode(kw, grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_2_0()); 
                           
                     }
-                    kw=(Token)match(input,43,FOLLOW_43_in_ruleOpOther3777); if (state.failed) return current;
+                    kw=(Token)match(input,43,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -4963,9 +4963,9 @@ public final AntlrDatatypeRuleToken ruleOpOther() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1635:2: kw= '..'
+                    // InternalCheckCfg.g:1635:2: kw= '..'
                     {
-                    kw=(Token)match(input,43,FOLLOW_43_in_ruleOpOther3797); if (state.failed) return current;
+                    kw=(Token)match(input,43,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -4976,9 +4976,9 @@ public final AntlrDatatypeRuleToken ruleOpOther() throws RecognitionException {
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1642:2: kw= '=>'
+                    // InternalCheckCfg.g:1642:2: kw= '=>'
                     {
-                    kw=(Token)match(input,44,FOLLOW_44_in_ruleOpOther3816); if (state.failed) return current;
+                    kw=(Token)match(input,44,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -4989,19 +4989,19 @@ public final AntlrDatatypeRuleToken ruleOpOther() throws RecognitionException {
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1648:6: (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) )
+                    // InternalCheckCfg.g:1648:6: (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1648:6: (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1649:2: kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' )
+                    // InternalCheckCfg.g:1648:6: (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) )
+                    // InternalCheckCfg.g:1649:2: kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' )
                     {
-                    kw=(Token)match(input,32,FOLLOW_32_in_ruleOpOther3836); if (state.failed) return current;
+                    kw=(Token)match(input,32,FOLLOW_32); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
                               newLeafNode(kw, grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_0()); 
                           
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1654:1: ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' )
+                    // InternalCheckCfg.g:1654:1: ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' )
                     int alt27=2;
                     int LA27_0 = input.LA(1);
 
@@ -5031,22 +5031,22 @@ else if ( (LA27_1==32) && (synpred8_InternalCheckCfg())) {
                     }
                     switch (alt27) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1654:2: ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) )
+                            // InternalCheckCfg.g:1654:2: ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) )
                             {
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1654:2: ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) )
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1654:3: ( ( '>' '>' ) )=> (kw= '>' kw= '>' )
+                            // InternalCheckCfg.g:1654:2: ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) )
+                            // InternalCheckCfg.g:1654:3: ( ( '>' '>' ) )=> (kw= '>' kw= '>' )
                             {
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1658:5: (kw= '>' kw= '>' )
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1659:2: kw= '>' kw= '>'
+                            // InternalCheckCfg.g:1658:5: (kw= '>' kw= '>' )
+                            // InternalCheckCfg.g:1659:2: kw= '>' kw= '>'
                             {
-                            kw=(Token)match(input,32,FOLLOW_32_in_ruleOpOther3867); if (state.failed) return current;
+                            kw=(Token)match(input,32,FOLLOW_32); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       current.merge(kw);
                                       newLeafNode(kw, grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_1_0_0_0()); 
                                   
                             }
-                            kw=(Token)match(input,32,FOLLOW_32_in_ruleOpOther3880); if (state.failed) return current;
+                            kw=(Token)match(input,32,FOLLOW_2); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       current.merge(kw);
@@ -5063,9 +5063,9 @@ else if ( (LA27_1==32) && (synpred8_InternalCheckCfg())) {
                             }
                             break;
                         case 2 :
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1672:2: kw= '>'
+                            // InternalCheckCfg.g:1672:2: kw= '>'
                             {
-                            kw=(Token)match(input,32,FOLLOW_32_in_ruleOpOther3901); if (state.failed) return current;
+                            kw=(Token)match(input,32,FOLLOW_2); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       current.merge(kw);
@@ -5085,19 +5085,19 @@ else if ( (LA27_1==32) && (synpred8_InternalCheckCfg())) {
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1678:6: (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) )
+                    // InternalCheckCfg.g:1678:6: (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1678:6: (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1679:2: kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' )
+                    // InternalCheckCfg.g:1678:6: (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) )
+                    // InternalCheckCfg.g:1679:2: kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' )
                     {
-                    kw=(Token)match(input,31,FOLLOW_31_in_ruleOpOther3923); if (state.failed) return current;
+                    kw=(Token)match(input,31,FOLLOW_33); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
                               newLeafNode(kw, grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_0()); 
                           
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1684:1: ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' )
+                    // InternalCheckCfg.g:1684:1: ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' )
                     int alt28=3;
                     int LA28_0 = input.LA(1);
 
@@ -5130,22 +5130,22 @@ else if ( (LA28_0==44) ) {
                     }
                     switch (alt28) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1684:2: ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) )
+                            // InternalCheckCfg.g:1684:2: ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) )
                             {
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1684:2: ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) )
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1684:3: ( ( '<' '<' ) )=> (kw= '<' kw= '<' )
+                            // InternalCheckCfg.g:1684:2: ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) )
+                            // InternalCheckCfg.g:1684:3: ( ( '<' '<' ) )=> (kw= '<' kw= '<' )
                             {
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1688:5: (kw= '<' kw= '<' )
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1689:2: kw= '<' kw= '<'
+                            // InternalCheckCfg.g:1688:5: (kw= '<' kw= '<' )
+                            // InternalCheckCfg.g:1689:2: kw= '<' kw= '<'
                             {
-                            kw=(Token)match(input,31,FOLLOW_31_in_ruleOpOther3954); if (state.failed) return current;
+                            kw=(Token)match(input,31,FOLLOW_22); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       current.merge(kw);
                                       newLeafNode(kw, grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_1_0_0_0()); 
                                   
                             }
-                            kw=(Token)match(input,31,FOLLOW_31_in_ruleOpOther3967); if (state.failed) return current;
+                            kw=(Token)match(input,31,FOLLOW_2); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       current.merge(kw);
@@ -5162,9 +5162,9 @@ else if ( (LA28_0==44) ) {
                             }
                             break;
                         case 2 :
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1702:2: kw= '<'
+                            // InternalCheckCfg.g:1702:2: kw= '<'
                             {
-                            kw=(Token)match(input,31,FOLLOW_31_in_ruleOpOther3988); if (state.failed) return current;
+                            kw=(Token)match(input,31,FOLLOW_2); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       current.merge(kw);
@@ -5175,9 +5175,9 @@ else if ( (LA28_0==44) ) {
                             }
                             break;
                         case 3 :
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1709:2: kw= '=>'
+                            // InternalCheckCfg.g:1709:2: kw= '=>'
                             {
-                            kw=(Token)match(input,44,FOLLOW_44_in_ruleOpOther4007); if (state.failed) return current;
+                            kw=(Token)match(input,44,FOLLOW_2); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       current.merge(kw);
@@ -5197,9 +5197,9 @@ else if ( (LA28_0==44) ) {
                     }
                     break;
                 case 8 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1716:2: kw= '<>'
+                    // InternalCheckCfg.g:1716:2: kw= '<>'
                     {
-                    kw=(Token)match(input,45,FOLLOW_45_in_ruleOpOther4028); if (state.failed) return current;
+                    kw=(Token)match(input,45,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5210,9 +5210,9 @@ else if ( (LA28_0==44) ) {
                     }
                     break;
                 case 9 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1723:2: kw= '?:'
+                    // InternalCheckCfg.g:1723:2: kw= '?:'
                     {
-                    kw=(Token)match(input,46,FOLLOW_46_in_ruleOpOther4047); if (state.failed) return current;
+                    kw=(Token)match(input,46,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5245,7 +5245,7 @@ else if ( (LA28_0==44) ) {
 
 
     // $ANTLR start "entryRuleXAdditiveExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1736:1: entryRuleXAdditiveExpression returns [EObject current=null] : iv_ruleXAdditiveExpression= ruleXAdditiveExpression EOF ;
+    // InternalCheckCfg.g:1736:1: entryRuleXAdditiveExpression returns [EObject current=null] : iv_ruleXAdditiveExpression= ruleXAdditiveExpression EOF ;
     public final EObject entryRuleXAdditiveExpression() throws RecognitionException {
         EObject current = null;
 
@@ -5253,13 +5253,13 @@ public final EObject entryRuleXAdditiveExpression() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1737:2: (iv_ruleXAdditiveExpression= ruleXAdditiveExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1738:2: iv_ruleXAdditiveExpression= ruleXAdditiveExpression EOF
+            // InternalCheckCfg.g:1737:2: (iv_ruleXAdditiveExpression= ruleXAdditiveExpression EOF )
+            // InternalCheckCfg.g:1738:2: iv_ruleXAdditiveExpression= ruleXAdditiveExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAdditiveExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXAdditiveExpression_in_entryRuleXAdditiveExpression4087);
+            pushFollow(FOLLOW_1);
             iv_ruleXAdditiveExpression=ruleXAdditiveExpression();
 
             state._fsp--;
@@ -5267,7 +5267,7 @@ public final EObject entryRuleXAdditiveExpression() throws RecognitionException
             if ( state.backtracking==0 ) {
                current =iv_ruleXAdditiveExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAdditiveExpression4097); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -5285,7 +5285,7 @@ public final EObject entryRuleXAdditiveExpression() throws RecognitionException
 
 
     // $ANTLR start "ruleXAdditiveExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1745:1: ruleXAdditiveExpression returns [EObject current=null] : (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* ) ;
+    // InternalCheckCfg.g:1745:1: ruleXAdditiveExpression returns [EObject current=null] : (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* ) ;
     public final EObject ruleXAdditiveExpression() throws RecognitionException {
         EObject current = null;
 
@@ -5297,18 +5297,18 @@ public final EObject ruleXAdditiveExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1748:28: ( (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1749:1: (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* )
+            // InternalCheckCfg.g:1748:28: ( (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* ) )
+            // InternalCheckCfg.g:1749:1: (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1749:1: (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1750:5: this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )*
+            // InternalCheckCfg.g:1749:1: (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* )
+            // InternalCheckCfg.g:1750:5: this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXAdditiveExpressionAccess().getXMultiplicativeExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleXMultiplicativeExpression_in_ruleXAdditiveExpression4144);
+            pushFollow(FOLLOW_34);
             this_XMultiplicativeExpression_0=ruleXMultiplicativeExpression();
 
             state._fsp--;
@@ -5319,7 +5319,7 @@ public final EObject ruleXAdditiveExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1758:1: ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )*
+            // InternalCheckCfg.g:1758:1: ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )*
             loop30:
             do {
                 int alt30=2;
@@ -5347,16 +5347,16 @@ else if ( (LA30_0==48) ) {
 
                 switch (alt30) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1758:2: ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) )
+            	    // InternalCheckCfg.g:1758:2: ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1758:2: ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1758:3: ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) )
+            	    // InternalCheckCfg.g:1758:2: ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) )
+            	    // InternalCheckCfg.g:1758:3: ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1763:6: ( () ( ( ruleOpAdd ) ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1763:7: () ( ( ruleOpAdd ) )
+            	    // InternalCheckCfg.g:1763:6: ( () ( ( ruleOpAdd ) ) )
+            	    // InternalCheckCfg.g:1763:7: () ( ( ruleOpAdd ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1763:7: ()
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1764:5: 
+            	    // InternalCheckCfg.g:1763:7: ()
+            	    // InternalCheckCfg.g:1764:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -5368,11 +5368,11 @@ else if ( (LA30_0==48) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1769:2: ( ( ruleOpAdd ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1770:1: ( ruleOpAdd )
+            	    // InternalCheckCfg.g:1769:2: ( ( ruleOpAdd ) )
+            	    // InternalCheckCfg.g:1770:1: ( ruleOpAdd )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1770:1: ( ruleOpAdd )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1771:3: ruleOpAdd
+            	    // InternalCheckCfg.g:1770:1: ( ruleOpAdd )
+            	    // InternalCheckCfg.g:1771:3: ruleOpAdd
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -5386,7 +5386,7 @@ else if ( (LA30_0==48) ) {
             	      	        newCompositeNode(grammarAccess.getXAdditiveExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleOpAdd_in_ruleXAdditiveExpression4197);
+            	    pushFollow(FOLLOW_20);
             	    ruleOpAdd();
 
             	    state._fsp--;
@@ -5408,18 +5408,18 @@ else if ( (LA30_0==48) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1784:4: ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1785:1: (lv_rightOperand_3_0= ruleXMultiplicativeExpression )
+            	    // InternalCheckCfg.g:1784:4: ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) )
+            	    // InternalCheckCfg.g:1785:1: (lv_rightOperand_3_0= ruleXMultiplicativeExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1785:1: (lv_rightOperand_3_0= ruleXMultiplicativeExpression )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1786:3: lv_rightOperand_3_0= ruleXMultiplicativeExpression
+            	    // InternalCheckCfg.g:1785:1: (lv_rightOperand_3_0= ruleXMultiplicativeExpression )
+            	    // InternalCheckCfg.g:1786:3: lv_rightOperand_3_0= ruleXMultiplicativeExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXAdditiveExpressionAccess().getRightOperandXMultiplicativeExpressionParserRuleCall_1_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXMultiplicativeExpression_in_ruleXAdditiveExpression4220);
+            	    pushFollow(FOLLOW_34);
             	    lv_rightOperand_3_0=ruleXMultiplicativeExpression();
 
             	    state._fsp--;
@@ -5433,7 +5433,7 @@ else if ( (LA30_0==48) ) {
             	             			current, 
             	             			"rightOperand",
             	              		lv_rightOperand_3_0, 
-            	              		"XMultiplicativeExpression");
+            	              		"org.eclipse.xtext.xbase.Xbase.XMultiplicativeExpression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -5475,7 +5475,7 @@ else if ( (LA30_0==48) ) {
 
 
     // $ANTLR start "entryRuleOpAdd"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1810:1: entryRuleOpAdd returns [String current=null] : iv_ruleOpAdd= ruleOpAdd EOF ;
+    // InternalCheckCfg.g:1810:1: entryRuleOpAdd returns [String current=null] : iv_ruleOpAdd= ruleOpAdd EOF ;
     public final String entryRuleOpAdd() throws RecognitionException {
         String current = null;
 
@@ -5483,13 +5483,13 @@ public final String entryRuleOpAdd() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1811:2: (iv_ruleOpAdd= ruleOpAdd EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1812:2: iv_ruleOpAdd= ruleOpAdd EOF
+            // InternalCheckCfg.g:1811:2: (iv_ruleOpAdd= ruleOpAdd EOF )
+            // InternalCheckCfg.g:1812:2: iv_ruleOpAdd= ruleOpAdd EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpAddRule()); 
             }
-            pushFollow(FOLLOW_ruleOpAdd_in_entryRuleOpAdd4259);
+            pushFollow(FOLLOW_1);
             iv_ruleOpAdd=ruleOpAdd();
 
             state._fsp--;
@@ -5497,7 +5497,7 @@ public final String entryRuleOpAdd() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpAdd.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpAdd4270); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -5515,7 +5515,7 @@ public final String entryRuleOpAdd() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpAdd"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1819:1: ruleOpAdd returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '+' | kw= '-' ) ;
+    // InternalCheckCfg.g:1819:1: ruleOpAdd returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '+' | kw= '-' ) ;
     public final AntlrDatatypeRuleToken ruleOpAdd() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -5524,10 +5524,10 @@ public final AntlrDatatypeRuleToken ruleOpAdd() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1822:28: ( (kw= '+' | kw= '-' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1823:1: (kw= '+' | kw= '-' )
+            // InternalCheckCfg.g:1822:28: ( (kw= '+' | kw= '-' ) )
+            // InternalCheckCfg.g:1823:1: (kw= '+' | kw= '-' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1823:1: (kw= '+' | kw= '-' )
+            // InternalCheckCfg.g:1823:1: (kw= '+' | kw= '-' )
             int alt31=2;
             int LA31_0 = input.LA(1);
 
@@ -5546,9 +5546,9 @@ else if ( (LA31_0==48) ) {
             }
             switch (alt31) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1824:2: kw= '+'
+                    // InternalCheckCfg.g:1824:2: kw= '+'
                     {
-                    kw=(Token)match(input,47,FOLLOW_47_in_ruleOpAdd4308); if (state.failed) return current;
+                    kw=(Token)match(input,47,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5559,9 +5559,9 @@ else if ( (LA31_0==48) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1831:2: kw= '-'
+                    // InternalCheckCfg.g:1831:2: kw= '-'
                     {
-                    kw=(Token)match(input,48,FOLLOW_48_in_ruleOpAdd4327); if (state.failed) return current;
+                    kw=(Token)match(input,48,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5594,7 +5594,7 @@ else if ( (LA31_0==48) ) {
 
 
     // $ANTLR start "entryRuleXMultiplicativeExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1844:1: entryRuleXMultiplicativeExpression returns [EObject current=null] : iv_ruleXMultiplicativeExpression= ruleXMultiplicativeExpression EOF ;
+    // InternalCheckCfg.g:1844:1: entryRuleXMultiplicativeExpression returns [EObject current=null] : iv_ruleXMultiplicativeExpression= ruleXMultiplicativeExpression EOF ;
     public final EObject entryRuleXMultiplicativeExpression() throws RecognitionException {
         EObject current = null;
 
@@ -5602,13 +5602,13 @@ public final EObject entryRuleXMultiplicativeExpression() throws RecognitionExce
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1845:2: (iv_ruleXMultiplicativeExpression= ruleXMultiplicativeExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1846:2: iv_ruleXMultiplicativeExpression= ruleXMultiplicativeExpression EOF
+            // InternalCheckCfg.g:1845:2: (iv_ruleXMultiplicativeExpression= ruleXMultiplicativeExpression EOF )
+            // InternalCheckCfg.g:1846:2: iv_ruleXMultiplicativeExpression= ruleXMultiplicativeExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXMultiplicativeExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXMultiplicativeExpression_in_entryRuleXMultiplicativeExpression4367);
+            pushFollow(FOLLOW_1);
             iv_ruleXMultiplicativeExpression=ruleXMultiplicativeExpression();
 
             state._fsp--;
@@ -5616,7 +5616,7 @@ public final EObject entryRuleXMultiplicativeExpression() throws RecognitionExce
             if ( state.backtracking==0 ) {
                current =iv_ruleXMultiplicativeExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXMultiplicativeExpression4377); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -5634,7 +5634,7 @@ public final EObject entryRuleXMultiplicativeExpression() throws RecognitionExce
 
 
     // $ANTLR start "ruleXMultiplicativeExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1853:1: ruleXMultiplicativeExpression returns [EObject current=null] : (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* ) ;
+    // InternalCheckCfg.g:1853:1: ruleXMultiplicativeExpression returns [EObject current=null] : (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* ) ;
     public final EObject ruleXMultiplicativeExpression() throws RecognitionException {
         EObject current = null;
 
@@ -5646,18 +5646,18 @@ public final EObject ruleXMultiplicativeExpression() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1856:28: ( (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1857:1: (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* )
+            // InternalCheckCfg.g:1856:28: ( (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* ) )
+            // InternalCheckCfg.g:1857:1: (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1857:1: (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1858:5: this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )*
+            // InternalCheckCfg.g:1857:1: (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* )
+            // InternalCheckCfg.g:1858:5: this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXMultiplicativeExpressionAccess().getXUnaryOperationParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleXUnaryOperation_in_ruleXMultiplicativeExpression4424);
+            pushFollow(FOLLOW_35);
             this_XUnaryOperation_0=ruleXUnaryOperation();
 
             state._fsp--;
@@ -5668,7 +5668,7 @@ public final EObject ruleXMultiplicativeExpression() throws RecognitionException
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1866:1: ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )*
+            // InternalCheckCfg.g:1866:1: ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )*
             loop32:
             do {
                 int alt32=2;
@@ -5722,16 +5722,16 @@ public final EObject ruleXMultiplicativeExpression() throws RecognitionException
 
                 switch (alt32) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1866:2: ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) )
+            	    // InternalCheckCfg.g:1866:2: ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1866:2: ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1866:3: ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) )
+            	    // InternalCheckCfg.g:1866:2: ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) )
+            	    // InternalCheckCfg.g:1866:3: ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1871:6: ( () ( ( ruleOpMulti ) ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1871:7: () ( ( ruleOpMulti ) )
+            	    // InternalCheckCfg.g:1871:6: ( () ( ( ruleOpMulti ) ) )
+            	    // InternalCheckCfg.g:1871:7: () ( ( ruleOpMulti ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1871:7: ()
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1872:5: 
+            	    // InternalCheckCfg.g:1871:7: ()
+            	    // InternalCheckCfg.g:1872:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -5743,11 +5743,11 @@ public final EObject ruleXMultiplicativeExpression() throws RecognitionException
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1877:2: ( ( ruleOpMulti ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1878:1: ( ruleOpMulti )
+            	    // InternalCheckCfg.g:1877:2: ( ( ruleOpMulti ) )
+            	    // InternalCheckCfg.g:1878:1: ( ruleOpMulti )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1878:1: ( ruleOpMulti )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1879:3: ruleOpMulti
+            	    // InternalCheckCfg.g:1878:1: ( ruleOpMulti )
+            	    // InternalCheckCfg.g:1879:3: ruleOpMulti
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -5761,7 +5761,7 @@ public final EObject ruleXMultiplicativeExpression() throws RecognitionException
             	      	        newCompositeNode(grammarAccess.getXMultiplicativeExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleOpMulti_in_ruleXMultiplicativeExpression4477);
+            	    pushFollow(FOLLOW_20);
             	    ruleOpMulti();
 
             	    state._fsp--;
@@ -5783,18 +5783,18 @@ public final EObject ruleXMultiplicativeExpression() throws RecognitionException
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1892:4: ( (lv_rightOperand_3_0= ruleXUnaryOperation ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1893:1: (lv_rightOperand_3_0= ruleXUnaryOperation )
+            	    // InternalCheckCfg.g:1892:4: ( (lv_rightOperand_3_0= ruleXUnaryOperation ) )
+            	    // InternalCheckCfg.g:1893:1: (lv_rightOperand_3_0= ruleXUnaryOperation )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1893:1: (lv_rightOperand_3_0= ruleXUnaryOperation )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1894:3: lv_rightOperand_3_0= ruleXUnaryOperation
+            	    // InternalCheckCfg.g:1893:1: (lv_rightOperand_3_0= ruleXUnaryOperation )
+            	    // InternalCheckCfg.g:1894:3: lv_rightOperand_3_0= ruleXUnaryOperation
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXMultiplicativeExpressionAccess().getRightOperandXUnaryOperationParserRuleCall_1_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXUnaryOperation_in_ruleXMultiplicativeExpression4500);
+            	    pushFollow(FOLLOW_35);
             	    lv_rightOperand_3_0=ruleXUnaryOperation();
 
             	    state._fsp--;
@@ -5808,7 +5808,7 @@ public final EObject ruleXMultiplicativeExpression() throws RecognitionException
             	             			current, 
             	             			"rightOperand",
             	              		lv_rightOperand_3_0, 
-            	              		"XUnaryOperation");
+            	              		"org.eclipse.xtext.xbase.Xbase.XUnaryOperation");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -5850,7 +5850,7 @@ public final EObject ruleXMultiplicativeExpression() throws RecognitionException
 
 
     // $ANTLR start "entryRuleOpMulti"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1918:1: entryRuleOpMulti returns [String current=null] : iv_ruleOpMulti= ruleOpMulti EOF ;
+    // InternalCheckCfg.g:1918:1: entryRuleOpMulti returns [String current=null] : iv_ruleOpMulti= ruleOpMulti EOF ;
     public final String entryRuleOpMulti() throws RecognitionException {
         String current = null;
 
@@ -5858,13 +5858,13 @@ public final String entryRuleOpMulti() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1919:2: (iv_ruleOpMulti= ruleOpMulti EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1920:2: iv_ruleOpMulti= ruleOpMulti EOF
+            // InternalCheckCfg.g:1919:2: (iv_ruleOpMulti= ruleOpMulti EOF )
+            // InternalCheckCfg.g:1920:2: iv_ruleOpMulti= ruleOpMulti EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpMultiRule()); 
             }
-            pushFollow(FOLLOW_ruleOpMulti_in_entryRuleOpMulti4539);
+            pushFollow(FOLLOW_1);
             iv_ruleOpMulti=ruleOpMulti();
 
             state._fsp--;
@@ -5872,7 +5872,7 @@ public final String entryRuleOpMulti() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpMulti.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpMulti4550); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -5890,7 +5890,7 @@ public final String entryRuleOpMulti() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpMulti"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1927:1: ruleOpMulti returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '*' | kw= '**' | kw= '/' | kw= '%' ) ;
+    // InternalCheckCfg.g:1927:1: ruleOpMulti returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '*' | kw= '**' | kw= '/' | kw= '%' ) ;
     public final AntlrDatatypeRuleToken ruleOpMulti() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -5899,10 +5899,10 @@ public final AntlrDatatypeRuleToken ruleOpMulti() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1930:28: ( (kw= '*' | kw= '**' | kw= '/' | kw= '%' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1931:1: (kw= '*' | kw= '**' | kw= '/' | kw= '%' )
+            // InternalCheckCfg.g:1930:28: ( (kw= '*' | kw= '**' | kw= '/' | kw= '%' ) )
+            // InternalCheckCfg.g:1931:1: (kw= '*' | kw= '**' | kw= '/' | kw= '%' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1931:1: (kw= '*' | kw= '**' | kw= '/' | kw= '%' )
+            // InternalCheckCfg.g:1931:1: (kw= '*' | kw= '**' | kw= '/' | kw= '%' )
             int alt33=4;
             switch ( input.LA(1) ) {
             case 49:
@@ -5935,9 +5935,9 @@ public final AntlrDatatypeRuleToken ruleOpMulti() throws RecognitionException {
 
             switch (alt33) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1932:2: kw= '*'
+                    // InternalCheckCfg.g:1932:2: kw= '*'
                     {
-                    kw=(Token)match(input,49,FOLLOW_49_in_ruleOpMulti4588); if (state.failed) return current;
+                    kw=(Token)match(input,49,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5948,9 +5948,9 @@ public final AntlrDatatypeRuleToken ruleOpMulti() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1939:2: kw= '**'
+                    // InternalCheckCfg.g:1939:2: kw= '**'
                     {
-                    kw=(Token)match(input,50,FOLLOW_50_in_ruleOpMulti4607); if (state.failed) return current;
+                    kw=(Token)match(input,50,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5961,9 +5961,9 @@ public final AntlrDatatypeRuleToken ruleOpMulti() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1946:2: kw= '/'
+                    // InternalCheckCfg.g:1946:2: kw= '/'
                     {
-                    kw=(Token)match(input,51,FOLLOW_51_in_ruleOpMulti4626); if (state.failed) return current;
+                    kw=(Token)match(input,51,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -5974,9 +5974,9 @@ public final AntlrDatatypeRuleToken ruleOpMulti() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1953:2: kw= '%'
+                    // InternalCheckCfg.g:1953:2: kw= '%'
                     {
-                    kw=(Token)match(input,52,FOLLOW_52_in_ruleOpMulti4645); if (state.failed) return current;
+                    kw=(Token)match(input,52,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -6009,7 +6009,7 @@ public final AntlrDatatypeRuleToken ruleOpMulti() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXUnaryOperation"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1966:1: entryRuleXUnaryOperation returns [EObject current=null] : iv_ruleXUnaryOperation= ruleXUnaryOperation EOF ;
+    // InternalCheckCfg.g:1966:1: entryRuleXUnaryOperation returns [EObject current=null] : iv_ruleXUnaryOperation= ruleXUnaryOperation EOF ;
     public final EObject entryRuleXUnaryOperation() throws RecognitionException {
         EObject current = null;
 
@@ -6017,13 +6017,13 @@ public final EObject entryRuleXUnaryOperation() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1967:2: (iv_ruleXUnaryOperation= ruleXUnaryOperation EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1968:2: iv_ruleXUnaryOperation= ruleXUnaryOperation EOF
+            // InternalCheckCfg.g:1967:2: (iv_ruleXUnaryOperation= ruleXUnaryOperation EOF )
+            // InternalCheckCfg.g:1968:2: iv_ruleXUnaryOperation= ruleXUnaryOperation EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXUnaryOperationRule()); 
             }
-            pushFollow(FOLLOW_ruleXUnaryOperation_in_entryRuleXUnaryOperation4685);
+            pushFollow(FOLLOW_1);
             iv_ruleXUnaryOperation=ruleXUnaryOperation();
 
             state._fsp--;
@@ -6031,7 +6031,7 @@ public final EObject entryRuleXUnaryOperation() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXUnaryOperation; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXUnaryOperation4695); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -6049,7 +6049,7 @@ public final EObject entryRuleXUnaryOperation() throws RecognitionException {
 
 
     // $ANTLR start "ruleXUnaryOperation"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1975:1: ruleXUnaryOperation returns [EObject current=null] : ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression ) ;
+    // InternalCheckCfg.g:1975:1: ruleXUnaryOperation returns [EObject current=null] : ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression ) ;
     public final EObject ruleXUnaryOperation() throws RecognitionException {
         EObject current = null;
 
@@ -6061,10 +6061,10 @@ public final EObject ruleXUnaryOperation() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1978:28: ( ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1979:1: ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression )
+            // InternalCheckCfg.g:1978:28: ( ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression ) )
+            // InternalCheckCfg.g:1979:1: ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1979:1: ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression )
+            // InternalCheckCfg.g:1979:1: ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression )
             int alt34=2;
             int LA34_0 = input.LA(1);
 
@@ -6083,13 +6083,13 @@ else if ( ((LA34_0>=RULE_STRING && LA34_0<=RULE_ID)||LA34_0==15||LA34_0==17||LA3
             }
             switch (alt34) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1979:2: ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) )
+                    // InternalCheckCfg.g:1979:2: ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1979:2: ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1979:3: () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) )
+                    // InternalCheckCfg.g:1979:2: ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) )
+                    // InternalCheckCfg.g:1979:3: () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1979:3: ()
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1980:5: 
+                    // InternalCheckCfg.g:1979:3: ()
+                    // InternalCheckCfg.g:1980:5: 
                     {
                     if ( state.backtracking==0 ) {
 
@@ -6101,11 +6101,11 @@ else if ( ((LA34_0>=RULE_STRING && LA34_0<=RULE_ID)||LA34_0==15||LA34_0==17||LA3
 
                     }
 
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1985:2: ( ( ruleOpUnary ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1986:1: ( ruleOpUnary )
+                    // InternalCheckCfg.g:1985:2: ( ( ruleOpUnary ) )
+                    // InternalCheckCfg.g:1986:1: ( ruleOpUnary )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1986:1: ( ruleOpUnary )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1987:3: ruleOpUnary
+                    // InternalCheckCfg.g:1986:1: ( ruleOpUnary )
+                    // InternalCheckCfg.g:1987:3: ruleOpUnary
                     {
                     if ( state.backtracking==0 ) {
 
@@ -6119,7 +6119,7 @@ else if ( ((LA34_0>=RULE_STRING && LA34_0<=RULE_ID)||LA34_0==15||LA34_0==17||LA3
                       	        newCompositeNode(grammarAccess.getXUnaryOperationAccess().getFeatureJvmIdentifiableElementCrossReference_0_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleOpUnary_in_ruleXUnaryOperation4753);
+                    pushFollow(FOLLOW_20);
                     ruleOpUnary();
 
                     state._fsp--;
@@ -6135,18 +6135,18 @@ else if ( ((LA34_0>=RULE_STRING && LA34_0<=RULE_ID)||LA34_0==15||LA34_0==17||LA3
 
                     }
 
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2000:2: ( (lv_operand_2_0= ruleXUnaryOperation ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2001:1: (lv_operand_2_0= ruleXUnaryOperation )
+                    // InternalCheckCfg.g:2000:2: ( (lv_operand_2_0= ruleXUnaryOperation ) )
+                    // InternalCheckCfg.g:2001:1: (lv_operand_2_0= ruleXUnaryOperation )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2001:1: (lv_operand_2_0= ruleXUnaryOperation )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2002:3: lv_operand_2_0= ruleXUnaryOperation
+                    // InternalCheckCfg.g:2001:1: (lv_operand_2_0= ruleXUnaryOperation )
+                    // InternalCheckCfg.g:2002:3: lv_operand_2_0= ruleXUnaryOperation
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXUnaryOperationAccess().getOperandXUnaryOperationParserRuleCall_0_2_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXUnaryOperation_in_ruleXUnaryOperation4774);
+                    pushFollow(FOLLOW_2);
                     lv_operand_2_0=ruleXUnaryOperation();
 
                     state._fsp--;
@@ -6160,7 +6160,7 @@ else if ( ((LA34_0>=RULE_STRING && LA34_0<=RULE_ID)||LA34_0==15||LA34_0==17||LA3
                              			current, 
                              			"operand",
                               		lv_operand_2_0, 
-                              		"XUnaryOperation");
+                              		"org.eclipse.xtext.xbase.Xbase.XUnaryOperation");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -6177,14 +6177,14 @@ else if ( ((LA34_0>=RULE_STRING && LA34_0<=RULE_ID)||LA34_0==15||LA34_0==17||LA3
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2020:5: this_XCastedExpression_3= ruleXCastedExpression
+                    // InternalCheckCfg.g:2020:5: this_XCastedExpression_3= ruleXCastedExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXUnaryOperationAccess().getXCastedExpressionParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXCastedExpression_in_ruleXUnaryOperation4803);
+                    pushFollow(FOLLOW_2);
                     this_XCastedExpression_3=ruleXCastedExpression();
 
                     state._fsp--;
@@ -6221,7 +6221,7 @@ else if ( ((LA34_0>=RULE_STRING && LA34_0<=RULE_ID)||LA34_0==15||LA34_0==17||LA3
 
 
     // $ANTLR start "entryRuleOpUnary"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2036:1: entryRuleOpUnary returns [String current=null] : iv_ruleOpUnary= ruleOpUnary EOF ;
+    // InternalCheckCfg.g:2036:1: entryRuleOpUnary returns [String current=null] : iv_ruleOpUnary= ruleOpUnary EOF ;
     public final String entryRuleOpUnary() throws RecognitionException {
         String current = null;
 
@@ -6229,13 +6229,13 @@ public final String entryRuleOpUnary() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2037:2: (iv_ruleOpUnary= ruleOpUnary EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2038:2: iv_ruleOpUnary= ruleOpUnary EOF
+            // InternalCheckCfg.g:2037:2: (iv_ruleOpUnary= ruleOpUnary EOF )
+            // InternalCheckCfg.g:2038:2: iv_ruleOpUnary= ruleOpUnary EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpUnaryRule()); 
             }
-            pushFollow(FOLLOW_ruleOpUnary_in_entryRuleOpUnary4839);
+            pushFollow(FOLLOW_1);
             iv_ruleOpUnary=ruleOpUnary();
 
             state._fsp--;
@@ -6243,7 +6243,7 @@ public final String entryRuleOpUnary() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpUnary.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpUnary4850); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -6261,7 +6261,7 @@ public final String entryRuleOpUnary() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpUnary"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2045:1: ruleOpUnary returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '!' | kw= '-' | kw= '+' ) ;
+    // InternalCheckCfg.g:2045:1: ruleOpUnary returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '!' | kw= '-' | kw= '+' ) ;
     public final AntlrDatatypeRuleToken ruleOpUnary() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -6270,10 +6270,10 @@ public final AntlrDatatypeRuleToken ruleOpUnary() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2048:28: ( (kw= '!' | kw= '-' | kw= '+' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2049:1: (kw= '!' | kw= '-' | kw= '+' )
+            // InternalCheckCfg.g:2048:28: ( (kw= '!' | kw= '-' | kw= '+' ) )
+            // InternalCheckCfg.g:2049:1: (kw= '!' | kw= '-' | kw= '+' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2049:1: (kw= '!' | kw= '-' | kw= '+' )
+            // InternalCheckCfg.g:2049:1: (kw= '!' | kw= '-' | kw= '+' )
             int alt35=3;
             switch ( input.LA(1) ) {
             case 53:
@@ -6301,9 +6301,9 @@ public final AntlrDatatypeRuleToken ruleOpUnary() throws RecognitionException {
 
             switch (alt35) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2050:2: kw= '!'
+                    // InternalCheckCfg.g:2050:2: kw= '!'
                     {
-                    kw=(Token)match(input,53,FOLLOW_53_in_ruleOpUnary4888); if (state.failed) return current;
+                    kw=(Token)match(input,53,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -6314,9 +6314,9 @@ public final AntlrDatatypeRuleToken ruleOpUnary() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2057:2: kw= '-'
+                    // InternalCheckCfg.g:2057:2: kw= '-'
                     {
-                    kw=(Token)match(input,48,FOLLOW_48_in_ruleOpUnary4907); if (state.failed) return current;
+                    kw=(Token)match(input,48,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -6327,9 +6327,9 @@ public final AntlrDatatypeRuleToken ruleOpUnary() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2064:2: kw= '+'
+                    // InternalCheckCfg.g:2064:2: kw= '+'
                     {
-                    kw=(Token)match(input,47,FOLLOW_47_in_ruleOpUnary4926); if (state.failed) return current;
+                    kw=(Token)match(input,47,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -6362,7 +6362,7 @@ public final AntlrDatatypeRuleToken ruleOpUnary() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXCastedExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2077:1: entryRuleXCastedExpression returns [EObject current=null] : iv_ruleXCastedExpression= ruleXCastedExpression EOF ;
+    // InternalCheckCfg.g:2077:1: entryRuleXCastedExpression returns [EObject current=null] : iv_ruleXCastedExpression= ruleXCastedExpression EOF ;
     public final EObject entryRuleXCastedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -6370,13 +6370,13 @@ public final EObject entryRuleXCastedExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2078:2: (iv_ruleXCastedExpression= ruleXCastedExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2079:2: iv_ruleXCastedExpression= ruleXCastedExpression EOF
+            // InternalCheckCfg.g:2078:2: (iv_ruleXCastedExpression= ruleXCastedExpression EOF )
+            // InternalCheckCfg.g:2079:2: iv_ruleXCastedExpression= ruleXCastedExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXCastedExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXCastedExpression_in_entryRuleXCastedExpression4966);
+            pushFollow(FOLLOW_1);
             iv_ruleXCastedExpression=ruleXCastedExpression();
 
             state._fsp--;
@@ -6384,7 +6384,7 @@ public final EObject entryRuleXCastedExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXCastedExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXCastedExpression4976); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -6402,7 +6402,7 @@ public final EObject entryRuleXCastedExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXCastedExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2086:1: ruleXCastedExpression returns [EObject current=null] : (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* ) ;
+    // InternalCheckCfg.g:2086:1: ruleXCastedExpression returns [EObject current=null] : (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* ) ;
     public final EObject ruleXCastedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -6415,18 +6415,18 @@ public final EObject ruleXCastedExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2089:28: ( (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2090:1: (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* )
+            // InternalCheckCfg.g:2089:28: ( (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* ) )
+            // InternalCheckCfg.g:2090:1: (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2090:1: (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2091:5: this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )*
+            // InternalCheckCfg.g:2090:1: (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* )
+            // InternalCheckCfg.g:2091:5: this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXCastedExpressionAccess().getXPostfixOperationParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleXPostfixOperation_in_ruleXCastedExpression5023);
+            pushFollow(FOLLOW_36);
             this_XPostfixOperation_0=ruleXPostfixOperation();
 
             state._fsp--;
@@ -6437,7 +6437,7 @@ public final EObject ruleXCastedExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2099:1: ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )*
+            // InternalCheckCfg.g:2099:1: ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )*
             loop36:
             do {
                 int alt36=2;
@@ -6456,16 +6456,16 @@ public final EObject ruleXCastedExpression() throws RecognitionException {
 
                 switch (alt36) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2099:2: ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) )
+            	    // InternalCheckCfg.g:2099:2: ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2099:2: ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2099:3: ( ( () 'as' ) )=> ( () otherlv_2= 'as' )
+            	    // InternalCheckCfg.g:2099:2: ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) )
+            	    // InternalCheckCfg.g:2099:3: ( ( () 'as' ) )=> ( () otherlv_2= 'as' )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2101:5: ( () otherlv_2= 'as' )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2101:6: () otherlv_2= 'as'
+            	    // InternalCheckCfg.g:2101:5: ( () otherlv_2= 'as' )
+            	    // InternalCheckCfg.g:2101:6: () otherlv_2= 'as'
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2101:6: ()
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2102:5: 
+            	    // InternalCheckCfg.g:2101:6: ()
+            	    // InternalCheckCfg.g:2102:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -6477,7 +6477,7 @@ public final EObject ruleXCastedExpression() throws RecognitionException {
 
             	    }
 
-            	    otherlv_2=(Token)match(input,54,FOLLOW_54_in_ruleXCastedExpression5058); if (state.failed) return current;
+            	    otherlv_2=(Token)match(input,54,FOLLOW_29); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_2, grammarAccess.getXCastedExpressionAccess().getAsKeyword_1_0_0_1());
@@ -6489,18 +6489,18 @@ public final EObject ruleXCastedExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2111:3: ( (lv_type_3_0= ruleJvmTypeReference ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2112:1: (lv_type_3_0= ruleJvmTypeReference )
+            	    // InternalCheckCfg.g:2111:3: ( (lv_type_3_0= ruleJvmTypeReference ) )
+            	    // InternalCheckCfg.g:2112:1: (lv_type_3_0= ruleJvmTypeReference )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2112:1: (lv_type_3_0= ruleJvmTypeReference )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2113:3: lv_type_3_0= ruleJvmTypeReference
+            	    // InternalCheckCfg.g:2112:1: (lv_type_3_0= ruleJvmTypeReference )
+            	    // InternalCheckCfg.g:2113:3: lv_type_3_0= ruleJvmTypeReference
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXCastedExpressionAccess().getTypeJvmTypeReferenceParserRuleCall_1_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleXCastedExpression5081);
+            	    pushFollow(FOLLOW_36);
             	    lv_type_3_0=ruleJvmTypeReference();
 
             	    state._fsp--;
@@ -6514,7 +6514,7 @@ public final EObject ruleXCastedExpression() throws RecognitionException {
             	             			current, 
             	             			"type",
             	              		lv_type_3_0, 
-            	              		"JvmTypeReference");
+            	              		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -6556,7 +6556,7 @@ public final EObject ruleXCastedExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXPostfixOperation"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2137:1: entryRuleXPostfixOperation returns [EObject current=null] : iv_ruleXPostfixOperation= ruleXPostfixOperation EOF ;
+    // InternalCheckCfg.g:2137:1: entryRuleXPostfixOperation returns [EObject current=null] : iv_ruleXPostfixOperation= ruleXPostfixOperation EOF ;
     public final EObject entryRuleXPostfixOperation() throws RecognitionException {
         EObject current = null;
 
@@ -6564,13 +6564,13 @@ public final EObject entryRuleXPostfixOperation() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2138:2: (iv_ruleXPostfixOperation= ruleXPostfixOperation EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2139:2: iv_ruleXPostfixOperation= ruleXPostfixOperation EOF
+            // InternalCheckCfg.g:2138:2: (iv_ruleXPostfixOperation= ruleXPostfixOperation EOF )
+            // InternalCheckCfg.g:2139:2: iv_ruleXPostfixOperation= ruleXPostfixOperation EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXPostfixOperationRule()); 
             }
-            pushFollow(FOLLOW_ruleXPostfixOperation_in_entryRuleXPostfixOperation5119);
+            pushFollow(FOLLOW_1);
             iv_ruleXPostfixOperation=ruleXPostfixOperation();
 
             state._fsp--;
@@ -6578,7 +6578,7 @@ public final EObject entryRuleXPostfixOperation() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXPostfixOperation; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXPostfixOperation5129); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -6596,7 +6596,7 @@ public final EObject entryRuleXPostfixOperation() throws RecognitionException {
 
 
     // $ANTLR start "ruleXPostfixOperation"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2146:1: ruleXPostfixOperation returns [EObject current=null] : (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? ) ;
+    // InternalCheckCfg.g:2146:1: ruleXPostfixOperation returns [EObject current=null] : (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? ) ;
     public final EObject ruleXPostfixOperation() throws RecognitionException {
         EObject current = null;
 
@@ -6606,18 +6606,18 @@ public final EObject ruleXPostfixOperation() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2149:28: ( (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2150:1: (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? )
+            // InternalCheckCfg.g:2149:28: ( (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? ) )
+            // InternalCheckCfg.g:2150:1: (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2150:1: (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2151:5: this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )?
+            // InternalCheckCfg.g:2150:1: (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? )
+            // InternalCheckCfg.g:2151:5: this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )?
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXPostfixOperationAccess().getXMemberFeatureCallParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleXMemberFeatureCall_in_ruleXPostfixOperation5176);
+            pushFollow(FOLLOW_37);
             this_XMemberFeatureCall_0=ruleXMemberFeatureCall();
 
             state._fsp--;
@@ -6628,7 +6628,7 @@ public final EObject ruleXPostfixOperation() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2159:1: ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )?
+            // InternalCheckCfg.g:2159:1: ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )?
             int alt37=2;
             int LA37_0 = input.LA(1);
 
@@ -6648,13 +6648,13 @@ else if ( (LA37_0==56) ) {
             }
             switch (alt37) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2159:2: ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) )
+                    // InternalCheckCfg.g:2159:2: ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2164:6: ( () ( ( ruleOpPostfix ) ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2164:7: () ( ( ruleOpPostfix ) )
+                    // InternalCheckCfg.g:2164:6: ( () ( ( ruleOpPostfix ) ) )
+                    // InternalCheckCfg.g:2164:7: () ( ( ruleOpPostfix ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2164:7: ()
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2165:5: 
+                    // InternalCheckCfg.g:2164:7: ()
+                    // InternalCheckCfg.g:2165:5: 
                     {
                     if ( state.backtracking==0 ) {
 
@@ -6666,11 +6666,11 @@ else if ( (LA37_0==56) ) {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2170:2: ( ( ruleOpPostfix ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2171:1: ( ruleOpPostfix )
+                    // InternalCheckCfg.g:2170:2: ( ( ruleOpPostfix ) )
+                    // InternalCheckCfg.g:2171:1: ( ruleOpPostfix )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2171:1: ( ruleOpPostfix )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2172:3: ruleOpPostfix
+                    // InternalCheckCfg.g:2171:1: ( ruleOpPostfix )
+                    // InternalCheckCfg.g:2172:3: ruleOpPostfix
                     {
                     if ( state.backtracking==0 ) {
 
@@ -6684,7 +6684,7 @@ else if ( (LA37_0==56) ) {
                       	        newCompositeNode(grammarAccess.getXPostfixOperationAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleOpPostfix_in_ruleXPostfixOperation5228);
+                    pushFollow(FOLLOW_2);
                     ruleOpPostfix();
 
                     state._fsp--;
@@ -6732,7 +6732,7 @@ else if ( (LA37_0==56) ) {
 
 
     // $ANTLR start "entryRuleOpPostfix"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2193:1: entryRuleOpPostfix returns [String current=null] : iv_ruleOpPostfix= ruleOpPostfix EOF ;
+    // InternalCheckCfg.g:2193:1: entryRuleOpPostfix returns [String current=null] : iv_ruleOpPostfix= ruleOpPostfix EOF ;
     public final String entryRuleOpPostfix() throws RecognitionException {
         String current = null;
 
@@ -6740,13 +6740,13 @@ public final String entryRuleOpPostfix() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2194:2: (iv_ruleOpPostfix= ruleOpPostfix EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2195:2: iv_ruleOpPostfix= ruleOpPostfix EOF
+            // InternalCheckCfg.g:2194:2: (iv_ruleOpPostfix= ruleOpPostfix EOF )
+            // InternalCheckCfg.g:2195:2: iv_ruleOpPostfix= ruleOpPostfix EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpPostfixRule()); 
             }
-            pushFollow(FOLLOW_ruleOpPostfix_in_entryRuleOpPostfix5268);
+            pushFollow(FOLLOW_1);
             iv_ruleOpPostfix=ruleOpPostfix();
 
             state._fsp--;
@@ -6754,7 +6754,7 @@ public final String entryRuleOpPostfix() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpPostfix.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpPostfix5279); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -6772,7 +6772,7 @@ public final String entryRuleOpPostfix() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpPostfix"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2202:1: ruleOpPostfix returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '++' | kw= '--' ) ;
+    // InternalCheckCfg.g:2202:1: ruleOpPostfix returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '++' | kw= '--' ) ;
     public final AntlrDatatypeRuleToken ruleOpPostfix() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -6781,10 +6781,10 @@ public final AntlrDatatypeRuleToken ruleOpPostfix() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2205:28: ( (kw= '++' | kw= '--' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2206:1: (kw= '++' | kw= '--' )
+            // InternalCheckCfg.g:2205:28: ( (kw= '++' | kw= '--' ) )
+            // InternalCheckCfg.g:2206:1: (kw= '++' | kw= '--' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2206:1: (kw= '++' | kw= '--' )
+            // InternalCheckCfg.g:2206:1: (kw= '++' | kw= '--' )
             int alt38=2;
             int LA38_0 = input.LA(1);
 
@@ -6803,9 +6803,9 @@ else if ( (LA38_0==56) ) {
             }
             switch (alt38) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2207:2: kw= '++'
+                    // InternalCheckCfg.g:2207:2: kw= '++'
                     {
-                    kw=(Token)match(input,55,FOLLOW_55_in_ruleOpPostfix5317); if (state.failed) return current;
+                    kw=(Token)match(input,55,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -6816,9 +6816,9 @@ else if ( (LA38_0==56) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2214:2: kw= '--'
+                    // InternalCheckCfg.g:2214:2: kw= '--'
                     {
-                    kw=(Token)match(input,56,FOLLOW_56_in_ruleOpPostfix5336); if (state.failed) return current;
+                    kw=(Token)match(input,56,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -6851,7 +6851,7 @@ else if ( (LA38_0==56) ) {
 
 
     // $ANTLR start "entryRuleXMemberFeatureCall"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2227:1: entryRuleXMemberFeatureCall returns [EObject current=null] : iv_ruleXMemberFeatureCall= ruleXMemberFeatureCall EOF ;
+    // InternalCheckCfg.g:2227:1: entryRuleXMemberFeatureCall returns [EObject current=null] : iv_ruleXMemberFeatureCall= ruleXMemberFeatureCall EOF ;
     public final EObject entryRuleXMemberFeatureCall() throws RecognitionException {
         EObject current = null;
 
@@ -6859,13 +6859,13 @@ public final EObject entryRuleXMemberFeatureCall() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2228:2: (iv_ruleXMemberFeatureCall= ruleXMemberFeatureCall EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2229:2: iv_ruleXMemberFeatureCall= ruleXMemberFeatureCall EOF
+            // InternalCheckCfg.g:2228:2: (iv_ruleXMemberFeatureCall= ruleXMemberFeatureCall EOF )
+            // InternalCheckCfg.g:2229:2: iv_ruleXMemberFeatureCall= ruleXMemberFeatureCall EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXMemberFeatureCallRule()); 
             }
-            pushFollow(FOLLOW_ruleXMemberFeatureCall_in_entryRuleXMemberFeatureCall5376);
+            pushFollow(FOLLOW_1);
             iv_ruleXMemberFeatureCall=ruleXMemberFeatureCall();
 
             state._fsp--;
@@ -6873,7 +6873,7 @@ public final EObject entryRuleXMemberFeatureCall() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXMemberFeatureCall; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXMemberFeatureCall5386); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -6891,7 +6891,7 @@ public final EObject entryRuleXMemberFeatureCall() throws RecognitionException {
 
 
     // $ANTLR start "ruleXMemberFeatureCall"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2236:1: ruleXMemberFeatureCall returns [EObject current=null] : (this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )* ) ;
+    // InternalCheckCfg.g:2236:1: ruleXMemberFeatureCall returns [EObject current=null] : (this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )* ) ;
     public final EObject ruleXMemberFeatureCall() throws RecognitionException {
         EObject current = null;
 
@@ -6926,18 +6926,18 @@ public final EObject ruleXMemberFeatureCall() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2239:28: ( (this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2240:1: (this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )* )
+            // InternalCheckCfg.g:2239:28: ( (this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )* ) )
+            // InternalCheckCfg.g:2240:1: (this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2240:1: (this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )* )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2241:5: this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )*
+            // InternalCheckCfg.g:2240:1: (this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )* )
+            // InternalCheckCfg.g:2241:5: this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getXPrimaryExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleXPrimaryExpression_in_ruleXMemberFeatureCall5433);
+            pushFollow(FOLLOW_38);
             this_XPrimaryExpression_0=ruleXPrimaryExpression();
 
             state._fsp--;
@@ -6948,7 +6948,7 @@ public final EObject ruleXMemberFeatureCall() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2249:1: ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )*
+            // InternalCheckCfg.g:2249:1: ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )*
             loop47:
             do {
                 int alt47=3;
@@ -6997,19 +6997,19 @@ else if ( (synpred15_InternalCheckCfg()) ) {
 
                 switch (alt47) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2249:2: ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) )
+            	    // InternalCheckCfg.g:2249:2: ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2249:2: ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2249:3: ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) )
+            	    // InternalCheckCfg.g:2249:2: ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) )
+            	    // InternalCheckCfg.g:2249:3: ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2249:3: ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2249:4: ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
+            	    // InternalCheckCfg.g:2249:3: ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )
+            	    // InternalCheckCfg.g:2249:4: ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2262:25: ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2262:26: () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign
+            	    // InternalCheckCfg.g:2262:25: ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
+            	    // InternalCheckCfg.g:2262:26: () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2262:26: ()
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2263:5: 
+            	    // InternalCheckCfg.g:2262:26: ()
+            	    // InternalCheckCfg.g:2263:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -7021,7 +7021,7 @@ else if ( (synpred15_InternalCheckCfg()) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2268:2: (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) )
+            	    // InternalCheckCfg.g:2268:2: (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) )
             	    int alt39=2;
             	    int LA39_0 = input.LA(1);
 
@@ -7040,9 +7040,9 @@ else if ( (LA39_0==58) ) {
             	    }
             	    switch (alt39) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2268:4: otherlv_2= '.'
+            	            // InternalCheckCfg.g:2268:4: otherlv_2= '.'
             	            {
-            	            otherlv_2=(Token)match(input,57,FOLLOW_57_in_ruleXMemberFeatureCall5505); if (state.failed) return current;
+            	            otherlv_2=(Token)match(input,57,FOLLOW_39); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                  	newLeafNode(otherlv_2, grammarAccess.getXMemberFeatureCallAccess().getFullStopKeyword_1_0_0_0_1_0());
@@ -7052,15 +7052,15 @@ else if ( (LA39_0==58) ) {
             	            }
             	            break;
             	        case 2 :
-            	            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2273:6: ( (lv_explicitStatic_3_0= '::' ) )
+            	            // InternalCheckCfg.g:2273:6: ( (lv_explicitStatic_3_0= '::' ) )
             	            {
-            	            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2273:6: ( (lv_explicitStatic_3_0= '::' ) )
-            	            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2274:1: (lv_explicitStatic_3_0= '::' )
+            	            // InternalCheckCfg.g:2273:6: ( (lv_explicitStatic_3_0= '::' ) )
+            	            // InternalCheckCfg.g:2274:1: (lv_explicitStatic_3_0= '::' )
             	            {
-            	            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2274:1: (lv_explicitStatic_3_0= '::' )
-            	            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2275:3: lv_explicitStatic_3_0= '::'
+            	            // InternalCheckCfg.g:2274:1: (lv_explicitStatic_3_0= '::' )
+            	            // InternalCheckCfg.g:2275:3: lv_explicitStatic_3_0= '::'
             	            {
-            	            lv_explicitStatic_3_0=(Token)match(input,58,FOLLOW_58_in_ruleXMemberFeatureCall5529); if (state.failed) return current;
+            	            lv_explicitStatic_3_0=(Token)match(input,58,FOLLOW_39); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_explicitStatic_3_0, grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_0_0_0_1_1_0());
@@ -7086,11 +7086,11 @@ else if ( (LA39_0==58) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2288:3: ( ( ruleFeatureCallID ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2289:1: ( ruleFeatureCallID )
+            	    // InternalCheckCfg.g:2288:3: ( ( ruleFeatureCallID ) )
+            	    // InternalCheckCfg.g:2289:1: ( ruleFeatureCallID )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2289:1: ( ruleFeatureCallID )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2290:3: ruleFeatureCallID
+            	    // InternalCheckCfg.g:2289:1: ( ruleFeatureCallID )
+            	    // InternalCheckCfg.g:2290:3: ruleFeatureCallID
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -7104,7 +7104,7 @@ else if ( (LA39_0==58) ) {
             	      	        newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_0_2_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleFeatureCallID_in_ruleXMemberFeatureCall5566);
+            	    pushFollow(FOLLOW_14);
             	    ruleFeatureCallID();
 
             	    state._fsp--;
@@ -7125,7 +7125,7 @@ else if ( (LA39_0==58) ) {
             	              newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getOpSingleAssignParserRuleCall_1_0_0_0_3()); 
             	          
             	    }
-            	    pushFollow(FOLLOW_ruleOpSingleAssign_in_ruleXMemberFeatureCall5582);
+            	    pushFollow(FOLLOW_20);
             	    ruleOpSingleAssign();
 
             	    state._fsp--;
@@ -7141,18 +7141,18 @@ else if ( (LA39_0==58) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2311:3: ( (lv_value_6_0= ruleXAssignment ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2312:1: (lv_value_6_0= ruleXAssignment )
+            	    // InternalCheckCfg.g:2311:3: ( (lv_value_6_0= ruleXAssignment ) )
+            	    // InternalCheckCfg.g:2312:1: (lv_value_6_0= ruleXAssignment )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2312:1: (lv_value_6_0= ruleXAssignment )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2313:3: lv_value_6_0= ruleXAssignment
+            	    // InternalCheckCfg.g:2312:1: (lv_value_6_0= ruleXAssignment )
+            	    // InternalCheckCfg.g:2313:3: lv_value_6_0= ruleXAssignment
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getValueXAssignmentParserRuleCall_1_0_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXAssignment_in_ruleXMemberFeatureCall5604);
+            	    pushFollow(FOLLOW_38);
             	    lv_value_6_0=ruleXAssignment();
 
             	    state._fsp--;
@@ -7166,7 +7166,7 @@ else if ( (LA39_0==58) ) {
             	             			current, 
             	             			"value",
             	              		lv_value_6_0, 
-            	              		"XAssignment");
+            	              		"org.eclipse.xtext.xbase.Xbase.XAssignment");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -7183,19 +7183,19 @@ else if ( (LA39_0==58) ) {
             	    }
             	    break;
             	case 2 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2330:6: ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? )
+            	    // InternalCheckCfg.g:2330:6: ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2330:6: ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2330:7: ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )?
+            	    // InternalCheckCfg.g:2330:6: ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? )
+            	    // InternalCheckCfg.g:2330:7: ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )?
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2330:7: ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2330:8: ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) )
+            	    // InternalCheckCfg.g:2330:7: ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) )
+            	    // InternalCheckCfg.g:2330:8: ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2346:7: ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2346:8: () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) )
+            	    // InternalCheckCfg.g:2346:7: ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) )
+            	    // InternalCheckCfg.g:2346:8: () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2346:8: ()
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2347:5: 
+            	    // InternalCheckCfg.g:2346:8: ()
+            	    // InternalCheckCfg.g:2347:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -7207,7 +7207,7 @@ else if ( (LA39_0==58) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2352:2: (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) )
+            	    // InternalCheckCfg.g:2352:2: (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) )
             	    int alt40=3;
             	    switch ( input.LA(1) ) {
             	    case 57:
@@ -7235,9 +7235,9 @@ else if ( (LA39_0==58) ) {
 
             	    switch (alt40) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2352:4: otherlv_8= '.'
+            	            // InternalCheckCfg.g:2352:4: otherlv_8= '.'
             	            {
-            	            otherlv_8=(Token)match(input,57,FOLLOW_57_in_ruleXMemberFeatureCall5690); if (state.failed) return current;
+            	            otherlv_8=(Token)match(input,57,FOLLOW_40); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                  	newLeafNode(otherlv_8, grammarAccess.getXMemberFeatureCallAccess().getFullStopKeyword_1_1_0_0_1_0());
@@ -7247,15 +7247,15 @@ else if ( (LA39_0==58) ) {
             	            }
             	            break;
             	        case 2 :
-            	            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2357:6: ( (lv_nullSafe_9_0= '?.' ) )
+            	            // InternalCheckCfg.g:2357:6: ( (lv_nullSafe_9_0= '?.' ) )
             	            {
-            	            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2357:6: ( (lv_nullSafe_9_0= '?.' ) )
-            	            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2358:1: (lv_nullSafe_9_0= '?.' )
+            	            // InternalCheckCfg.g:2357:6: ( (lv_nullSafe_9_0= '?.' ) )
+            	            // InternalCheckCfg.g:2358:1: (lv_nullSafe_9_0= '?.' )
             	            {
-            	            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2358:1: (lv_nullSafe_9_0= '?.' )
-            	            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2359:3: lv_nullSafe_9_0= '?.'
+            	            // InternalCheckCfg.g:2358:1: (lv_nullSafe_9_0= '?.' )
+            	            // InternalCheckCfg.g:2359:3: lv_nullSafe_9_0= '?.'
             	            {
-            	            lv_nullSafe_9_0=(Token)match(input,59,FOLLOW_59_in_ruleXMemberFeatureCall5714); if (state.failed) return current;
+            	            lv_nullSafe_9_0=(Token)match(input,59,FOLLOW_40); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_nullSafe_9_0, grammarAccess.getXMemberFeatureCallAccess().getNullSafeQuestionMarkFullStopKeyword_1_1_0_0_1_1_0());
@@ -7279,15 +7279,15 @@ else if ( (LA39_0==58) ) {
             	            }
             	            break;
             	        case 3 :
-            	            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2373:6: ( (lv_explicitStatic_10_0= '::' ) )
+            	            // InternalCheckCfg.g:2373:6: ( (lv_explicitStatic_10_0= '::' ) )
             	            {
-            	            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2373:6: ( (lv_explicitStatic_10_0= '::' ) )
-            	            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2374:1: (lv_explicitStatic_10_0= '::' )
+            	            // InternalCheckCfg.g:2373:6: ( (lv_explicitStatic_10_0= '::' ) )
+            	            // InternalCheckCfg.g:2374:1: (lv_explicitStatic_10_0= '::' )
             	            {
-            	            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2374:1: (lv_explicitStatic_10_0= '::' )
-            	            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2375:3: lv_explicitStatic_10_0= '::'
+            	            // InternalCheckCfg.g:2374:1: (lv_explicitStatic_10_0= '::' )
+            	            // InternalCheckCfg.g:2375:3: lv_explicitStatic_10_0= '::'
             	            {
-            	            lv_explicitStatic_10_0=(Token)match(input,58,FOLLOW_58_in_ruleXMemberFeatureCall5751); if (state.failed) return current;
+            	            lv_explicitStatic_10_0=(Token)match(input,58,FOLLOW_40); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_explicitStatic_10_0, grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_1_0_0_1_2_0());
@@ -7319,7 +7319,7 @@ else if ( (LA39_0==58) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2388:5: (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )?
+            	    // InternalCheckCfg.g:2388:5: (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )?
             	    int alt42=2;
             	    int LA42_0 = input.LA(1);
 
@@ -7328,26 +7328,26 @@ else if ( (LA39_0==58) ) {
             	    }
             	    switch (alt42) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2388:7: otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>'
+            	            // InternalCheckCfg.g:2388:7: otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>'
             	            {
-            	            otherlv_11=(Token)match(input,31,FOLLOW_31_in_ruleXMemberFeatureCall5780); if (state.failed) return current;
+            	            otherlv_11=(Token)match(input,31,FOLLOW_41); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                  	newLeafNode(otherlv_11, grammarAccess.getXMemberFeatureCallAccess().getLessThanSignKeyword_1_1_1_0());
             	                  
             	            }
-            	            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2392:1: ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) )
-            	            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2393:1: (lv_typeArguments_12_0= ruleJvmArgumentTypeReference )
+            	            // InternalCheckCfg.g:2392:1: ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) )
+            	            // InternalCheckCfg.g:2393:1: (lv_typeArguments_12_0= ruleJvmArgumentTypeReference )
             	            {
-            	            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2393:1: (lv_typeArguments_12_0= ruleJvmArgumentTypeReference )
-            	            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2394:3: lv_typeArguments_12_0= ruleJvmArgumentTypeReference
+            	            // InternalCheckCfg.g:2393:1: (lv_typeArguments_12_0= ruleJvmArgumentTypeReference )
+            	            // InternalCheckCfg.g:2394:3: lv_typeArguments_12_0= ruleJvmArgumentTypeReference
             	            {
             	            if ( state.backtracking==0 ) {
             	               
             	              	        newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_1_1_0()); 
             	              	    
             	            }
-            	            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleXMemberFeatureCall5801);
+            	            pushFollow(FOLLOW_42);
             	            lv_typeArguments_12_0=ruleJvmArgumentTypeReference();
 
             	            state._fsp--;
@@ -7361,7 +7361,7 @@ else if ( (LA39_0==58) ) {
             	                     			current, 
             	                     			"typeArguments",
             	                      		lv_typeArguments_12_0, 
-            	                      		"JvmArgumentTypeReference");
+            	                      		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
             	              	        afterParserOrEnumRuleCall();
             	              	    
             	            }
@@ -7371,7 +7371,7 @@ else if ( (LA39_0==58) ) {
 
             	            }
 
-            	            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2410:2: (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )*
+            	            // InternalCheckCfg.g:2410:2: (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )*
             	            loop41:
             	            do {
             	                int alt41=2;
@@ -7384,26 +7384,26 @@ else if ( (LA39_0==58) ) {
 
             	                switch (alt41) {
             	            	case 1 :
-            	            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2410:4: otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) )
+            	            	    // InternalCheckCfg.g:2410:4: otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) )
             	            	    {
-            	            	    otherlv_13=(Token)match(input,20,FOLLOW_20_in_ruleXMemberFeatureCall5814); if (state.failed) return current;
+            	            	    otherlv_13=(Token)match(input,20,FOLLOW_41); if (state.failed) return current;
             	            	    if ( state.backtracking==0 ) {
 
             	            	          	newLeafNode(otherlv_13, grammarAccess.getXMemberFeatureCallAccess().getCommaKeyword_1_1_1_2_0());
             	            	          
             	            	    }
-            	            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2414:1: ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) )
-            	            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2415:1: (lv_typeArguments_14_0= ruleJvmArgumentTypeReference )
+            	            	    // InternalCheckCfg.g:2414:1: ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) )
+            	            	    // InternalCheckCfg.g:2415:1: (lv_typeArguments_14_0= ruleJvmArgumentTypeReference )
             	            	    {
-            	            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2415:1: (lv_typeArguments_14_0= ruleJvmArgumentTypeReference )
-            	            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2416:3: lv_typeArguments_14_0= ruleJvmArgumentTypeReference
+            	            	    // InternalCheckCfg.g:2415:1: (lv_typeArguments_14_0= ruleJvmArgumentTypeReference )
+            	            	    // InternalCheckCfg.g:2416:3: lv_typeArguments_14_0= ruleJvmArgumentTypeReference
             	            	    {
             	            	    if ( state.backtracking==0 ) {
             	            	       
             	            	      	        newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_1_2_1_0()); 
             	            	      	    
             	            	    }
-            	            	    pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleXMemberFeatureCall5835);
+            	            	    pushFollow(FOLLOW_42);
             	            	    lv_typeArguments_14_0=ruleJvmArgumentTypeReference();
 
             	            	    state._fsp--;
@@ -7417,7 +7417,7 @@ else if ( (LA39_0==58) ) {
             	            	             			current, 
             	            	             			"typeArguments",
             	            	              		lv_typeArguments_14_0, 
-            	            	              		"JvmArgumentTypeReference");
+            	            	              		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
             	            	      	        afterParserOrEnumRuleCall();
             	            	      	    
             	            	    }
@@ -7436,7 +7436,7 @@ else if ( (LA39_0==58) ) {
             	                }
             	            } while (true);
 
-            	            otherlv_15=(Token)match(input,32,FOLLOW_32_in_ruleXMemberFeatureCall5849); if (state.failed) return current;
+            	            otherlv_15=(Token)match(input,32,FOLLOW_40); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                  	newLeafNode(otherlv_15, grammarAccess.getXMemberFeatureCallAccess().getGreaterThanSignKeyword_1_1_1_3());
@@ -7448,11 +7448,11 @@ else if ( (LA39_0==58) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2436:3: ( ( ruleIdOrSuper ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2437:1: ( ruleIdOrSuper )
+            	    // InternalCheckCfg.g:2436:3: ( ( ruleIdOrSuper ) )
+            	    // InternalCheckCfg.g:2437:1: ( ruleIdOrSuper )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2437:1: ( ruleIdOrSuper )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2438:3: ruleIdOrSuper
+            	    // InternalCheckCfg.g:2437:1: ( ruleIdOrSuper )
+            	    // InternalCheckCfg.g:2438:3: ruleIdOrSuper
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -7466,7 +7466,7 @@ else if ( (LA39_0==58) ) {
             	      	        newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getFeatureJvmIdentifiableElementCrossReference_1_1_2_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleIdOrSuper_in_ruleXMemberFeatureCall5874);
+            	    pushFollow(FOLLOW_43);
             	    ruleIdOrSuper();
 
             	    state._fsp--;
@@ -7482,20 +7482,20 @@ else if ( (LA39_0==58) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2451:2: ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )?
+            	    // InternalCheckCfg.g:2451:2: ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )?
             	    int alt45=2;
             	    alt45 = dfa45.predict(input);
             	    switch (alt45) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2451:3: ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')'
+            	            // InternalCheckCfg.g:2451:3: ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')'
             	            {
-            	            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2451:3: ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) )
-            	            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2451:4: ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' )
+            	            // InternalCheckCfg.g:2451:3: ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) )
+            	            // InternalCheckCfg.g:2451:4: ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' )
             	            {
-            	            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2458:1: (lv_explicitOperationCall_17_0= '(' )
-            	            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2459:3: lv_explicitOperationCall_17_0= '('
+            	            // InternalCheckCfg.g:2458:1: (lv_explicitOperationCall_17_0= '(' )
+            	            // InternalCheckCfg.g:2459:3: lv_explicitOperationCall_17_0= '('
             	            {
-            	            lv_explicitOperationCall_17_0=(Token)match(input,19,FOLLOW_19_in_ruleXMemberFeatureCall5908); if (state.failed) return current;
+            	            lv_explicitOperationCall_17_0=(Token)match(input,19,FOLLOW_44); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_explicitOperationCall_17_0, grammarAccess.getXMemberFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_1_1_3_0_0());
@@ -7515,25 +7515,25 @@ else if ( (LA39_0==58) ) {
 
             	            }
 
-            	            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2472:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )?
+            	            // InternalCheckCfg.g:2472:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )?
             	            int alt44=3;
             	            alt44 = dfa44.predict(input);
             	            switch (alt44) {
             	                case 1 :
-            	                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2472:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) )
+            	                    // InternalCheckCfg.g:2472:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) )
             	                    {
-            	                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2472:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) )
-            	                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2472:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure )
+            	                    // InternalCheckCfg.g:2472:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) )
+            	                    // InternalCheckCfg.g:2472:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure )
             	                    {
-            	                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2489:1: (lv_memberCallArguments_18_0= ruleXShortClosure )
-            	                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2490:3: lv_memberCallArguments_18_0= ruleXShortClosure
+            	                    // InternalCheckCfg.g:2489:1: (lv_memberCallArguments_18_0= ruleXShortClosure )
+            	                    // InternalCheckCfg.g:2490:3: lv_memberCallArguments_18_0= ruleXShortClosure
             	                    {
             	                    if ( state.backtracking==0 ) {
             	                       
             	                      	        newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXShortClosureParserRuleCall_1_1_3_1_0_0()); 
             	                      	    
             	                    }
-            	                    pushFollow(FOLLOW_ruleXShortClosure_in_ruleXMemberFeatureCall5993);
+            	                    pushFollow(FOLLOW_45);
             	                    lv_memberCallArguments_18_0=ruleXShortClosure();
 
             	                    state._fsp--;
@@ -7547,7 +7547,7 @@ else if ( (LA39_0==58) ) {
             	                             			current, 
             	                             			"memberCallArguments",
             	                              		lv_memberCallArguments_18_0, 
-            	                              		"XShortClosure");
+            	                              		"org.eclipse.xtext.xbase.Xbase.XShortClosure");
             	                      	        afterParserOrEnumRuleCall();
             	                      	    
             	                    }
@@ -7561,23 +7561,23 @@ else if ( (LA39_0==58) ) {
             	                    }
             	                    break;
             	                case 2 :
-            	                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2507:6: ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* )
+            	                    // InternalCheckCfg.g:2507:6: ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* )
             	                    {
-            	                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2507:6: ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* )
-            	                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2507:7: ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )*
+            	                    // InternalCheckCfg.g:2507:6: ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* )
+            	                    // InternalCheckCfg.g:2507:7: ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )*
             	                    {
-            	                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2507:7: ( (lv_memberCallArguments_19_0= ruleXExpression ) )
-            	                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2508:1: (lv_memberCallArguments_19_0= ruleXExpression )
+            	                    // InternalCheckCfg.g:2507:7: ( (lv_memberCallArguments_19_0= ruleXExpression ) )
+            	                    // InternalCheckCfg.g:2508:1: (lv_memberCallArguments_19_0= ruleXExpression )
             	                    {
-            	                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2508:1: (lv_memberCallArguments_19_0= ruleXExpression )
-            	                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2509:3: lv_memberCallArguments_19_0= ruleXExpression
+            	                    // InternalCheckCfg.g:2508:1: (lv_memberCallArguments_19_0= ruleXExpression )
+            	                    // InternalCheckCfg.g:2509:3: lv_memberCallArguments_19_0= ruleXExpression
             	                    {
             	                    if ( state.backtracking==0 ) {
             	                       
             	                      	        newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXExpressionParserRuleCall_1_1_3_1_1_0_0()); 
             	                      	    
             	                    }
-            	                    pushFollow(FOLLOW_ruleXExpression_in_ruleXMemberFeatureCall6021);
+            	                    pushFollow(FOLLOW_13);
             	                    lv_memberCallArguments_19_0=ruleXExpression();
 
             	                    state._fsp--;
@@ -7591,7 +7591,7 @@ else if ( (LA39_0==58) ) {
             	                             			current, 
             	                             			"memberCallArguments",
             	                              		lv_memberCallArguments_19_0, 
-            	                              		"XExpression");
+            	                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
             	                      	        afterParserOrEnumRuleCall();
             	                      	    
             	                    }
@@ -7601,7 +7601,7 @@ else if ( (LA39_0==58) ) {
 
             	                    }
 
-            	                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2525:2: (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )*
+            	                    // InternalCheckCfg.g:2525:2: (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )*
             	                    loop43:
             	                    do {
             	                        int alt43=2;
@@ -7614,26 +7614,26 @@ else if ( (LA39_0==58) ) {
 
             	                        switch (alt43) {
             	                    	case 1 :
-            	                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2525:4: otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) )
+            	                    	    // InternalCheckCfg.g:2525:4: otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) )
             	                    	    {
-            	                    	    otherlv_20=(Token)match(input,20,FOLLOW_20_in_ruleXMemberFeatureCall6034); if (state.failed) return current;
+            	                    	    otherlv_20=(Token)match(input,20,FOLLOW_20); if (state.failed) return current;
             	                    	    if ( state.backtracking==0 ) {
 
             	                    	          	newLeafNode(otherlv_20, grammarAccess.getXMemberFeatureCallAccess().getCommaKeyword_1_1_3_1_1_1_0());
             	                    	          
             	                    	    }
-            	                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2529:1: ( (lv_memberCallArguments_21_0= ruleXExpression ) )
-            	                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2530:1: (lv_memberCallArguments_21_0= ruleXExpression )
+            	                    	    // InternalCheckCfg.g:2529:1: ( (lv_memberCallArguments_21_0= ruleXExpression ) )
+            	                    	    // InternalCheckCfg.g:2530:1: (lv_memberCallArguments_21_0= ruleXExpression )
             	                    	    {
-            	                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2530:1: (lv_memberCallArguments_21_0= ruleXExpression )
-            	                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2531:3: lv_memberCallArguments_21_0= ruleXExpression
+            	                    	    // InternalCheckCfg.g:2530:1: (lv_memberCallArguments_21_0= ruleXExpression )
+            	                    	    // InternalCheckCfg.g:2531:3: lv_memberCallArguments_21_0= ruleXExpression
             	                    	    {
             	                    	    if ( state.backtracking==0 ) {
             	                    	       
             	                    	      	        newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXExpressionParserRuleCall_1_1_3_1_1_1_1_0()); 
             	                    	      	    
             	                    	    }
-            	                    	    pushFollow(FOLLOW_ruleXExpression_in_ruleXMemberFeatureCall6055);
+            	                    	    pushFollow(FOLLOW_13);
             	                    	    lv_memberCallArguments_21_0=ruleXExpression();
 
             	                    	    state._fsp--;
@@ -7647,7 +7647,7 @@ else if ( (LA39_0==58) ) {
             	                    	             			current, 
             	                    	             			"memberCallArguments",
             	                    	              		lv_memberCallArguments_21_0, 
-            	                    	              		"XExpression");
+            	                    	              		"org.eclipse.xtext.xbase.Xbase.XExpression");
             	                    	      	        afterParserOrEnumRuleCall();
             	                    	      	    
             	                    	    }
@@ -7675,7 +7675,7 @@ else if ( (LA39_0==58) ) {
 
             	            }
 
-            	            otherlv_22=(Token)match(input,21,FOLLOW_21_in_ruleXMemberFeatureCall6072); if (state.failed) return current;
+            	            otherlv_22=(Token)match(input,21,FOLLOW_46); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                  	newLeafNode(otherlv_22, grammarAccess.getXMemberFeatureCallAccess().getRightParenthesisKeyword_1_1_3_2());
@@ -7687,22 +7687,22 @@ else if ( (LA39_0==58) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2551:3: ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )?
+            	    // InternalCheckCfg.g:2551:3: ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )?
             	    int alt46=2;
             	    alt46 = dfa46.predict(input);
             	    switch (alt46) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2551:4: ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure )
+            	            // InternalCheckCfg.g:2551:4: ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure )
             	            {
-            	            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2554:1: (lv_memberCallArguments_23_0= ruleXClosure )
-            	            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2555:3: lv_memberCallArguments_23_0= ruleXClosure
+            	            // InternalCheckCfg.g:2554:1: (lv_memberCallArguments_23_0= ruleXClosure )
+            	            // InternalCheckCfg.g:2555:3: lv_memberCallArguments_23_0= ruleXClosure
             	            {
             	            if ( state.backtracking==0 ) {
             	               
             	              	        newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXClosureParserRuleCall_1_1_4_0()); 
             	              	    
             	            }
-            	            pushFollow(FOLLOW_ruleXClosure_in_ruleXMemberFeatureCall6107);
+            	            pushFollow(FOLLOW_38);
             	            lv_memberCallArguments_23_0=ruleXClosure();
 
             	            state._fsp--;
@@ -7716,7 +7716,7 @@ else if ( (LA39_0==58) ) {
             	                     			current, 
             	                     			"memberCallArguments",
             	                      		lv_memberCallArguments_23_0, 
-            	                      		"XClosure");
+            	                      		"org.eclipse.xtext.xbase.Xbase.XClosure");
             	              	        afterParserOrEnumRuleCall();
             	              	    
             	            }
@@ -7764,7 +7764,7 @@ else if ( (LA39_0==58) ) {
 
 
     // $ANTLR start "entryRuleXPrimaryExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2579:1: entryRuleXPrimaryExpression returns [EObject current=null] : iv_ruleXPrimaryExpression= ruleXPrimaryExpression EOF ;
+    // InternalCheckCfg.g:2579:1: entryRuleXPrimaryExpression returns [EObject current=null] : iv_ruleXPrimaryExpression= ruleXPrimaryExpression EOF ;
     public final EObject entryRuleXPrimaryExpression() throws RecognitionException {
         EObject current = null;
 
@@ -7772,13 +7772,13 @@ public final EObject entryRuleXPrimaryExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2580:2: (iv_ruleXPrimaryExpression= ruleXPrimaryExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2581:2: iv_ruleXPrimaryExpression= ruleXPrimaryExpression EOF
+            // InternalCheckCfg.g:2580:2: (iv_ruleXPrimaryExpression= ruleXPrimaryExpression EOF )
+            // InternalCheckCfg.g:2581:2: iv_ruleXPrimaryExpression= ruleXPrimaryExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXPrimaryExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXPrimaryExpression_in_entryRuleXPrimaryExpression6147);
+            pushFollow(FOLLOW_1);
             iv_ruleXPrimaryExpression=ruleXPrimaryExpression();
 
             state._fsp--;
@@ -7786,7 +7786,7 @@ public final EObject entryRuleXPrimaryExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXPrimaryExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXPrimaryExpression6157); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -7804,7 +7804,7 @@ public final EObject entryRuleXPrimaryExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXPrimaryExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2588:1: ruleXPrimaryExpression returns [EObject current=null] : (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression ) ;
+    // InternalCheckCfg.g:2588:1: ruleXPrimaryExpression returns [EObject current=null] : (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression ) ;
     public final EObject ruleXPrimaryExpression() throws RecognitionException {
         EObject current = null;
 
@@ -7842,22 +7842,22 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2591:28: ( (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2592:1: (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression )
+            // InternalCheckCfg.g:2591:28: ( (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression ) )
+            // InternalCheckCfg.g:2592:1: (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2592:1: (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression )
+            // InternalCheckCfg.g:2592:1: (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression )
             int alt48=15;
             alt48 = dfa48.predict(input);
             switch (alt48) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2593:5: this_XConstructorCall_0= ruleXConstructorCall
+                    // InternalCheckCfg.g:2593:5: this_XConstructorCall_0= ruleXConstructorCall
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXConstructorCallParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXConstructorCall_in_ruleXPrimaryExpression6204);
+                    pushFollow(FOLLOW_2);
                     this_XConstructorCall_0=ruleXConstructorCall();
 
                     state._fsp--;
@@ -7872,14 +7872,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2603:5: this_XBlockExpression_1= ruleXBlockExpression
+                    // InternalCheckCfg.g:2603:5: this_XBlockExpression_1= ruleXBlockExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXBlockExpressionParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXBlockExpression_in_ruleXPrimaryExpression6231);
+                    pushFollow(FOLLOW_2);
                     this_XBlockExpression_1=ruleXBlockExpression();
 
                     state._fsp--;
@@ -7894,14 +7894,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2613:5: this_XSwitchExpression_2= ruleXSwitchExpression
+                    // InternalCheckCfg.g:2613:5: this_XSwitchExpression_2= ruleXSwitchExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXSwitchExpressionParserRuleCall_2()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXSwitchExpression_in_ruleXPrimaryExpression6258);
+                    pushFollow(FOLLOW_2);
                     this_XSwitchExpression_2=ruleXSwitchExpression();
 
                     state._fsp--;
@@ -7916,17 +7916,17 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2622:6: ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression )
+                    // InternalCheckCfg.g:2622:6: ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2622:6: ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2622:7: ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression
+                    // InternalCheckCfg.g:2622:6: ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression )
+                    // InternalCheckCfg.g:2622:7: ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXSynchronizedExpressionParserRuleCall_3()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXSynchronizedExpression_in_ruleXPrimaryExpression6302);
+                    pushFollow(FOLLOW_2);
                     this_XSynchronizedExpression_3=ruleXSynchronizedExpression();
 
                     state._fsp--;
@@ -7944,14 +7944,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2636:5: this_XFeatureCall_4= ruleXFeatureCall
+                    // InternalCheckCfg.g:2636:5: this_XFeatureCall_4= ruleXFeatureCall
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXFeatureCallParserRuleCall_4()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXFeatureCall_in_ruleXPrimaryExpression6330);
+                    pushFollow(FOLLOW_2);
                     this_XFeatureCall_4=ruleXFeatureCall();
 
                     state._fsp--;
@@ -7966,14 +7966,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2646:5: this_XLiteral_5= ruleXLiteral
+                    // InternalCheckCfg.g:2646:5: this_XLiteral_5= ruleXLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXLiteralParserRuleCall_5()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXLiteral_in_ruleXPrimaryExpression6357);
+                    pushFollow(FOLLOW_2);
                     this_XLiteral_5=ruleXLiteral();
 
                     state._fsp--;
@@ -7988,14 +7988,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2656:5: this_XIfExpression_6= ruleXIfExpression
+                    // InternalCheckCfg.g:2656:5: this_XIfExpression_6= ruleXIfExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXIfExpressionParserRuleCall_6()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXIfExpression_in_ruleXPrimaryExpression6384);
+                    pushFollow(FOLLOW_2);
                     this_XIfExpression_6=ruleXIfExpression();
 
                     state._fsp--;
@@ -8010,17 +8010,17 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 8 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2665:6: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression )
+                    // InternalCheckCfg.g:2665:6: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2665:6: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2665:7: ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression
+                    // InternalCheckCfg.g:2665:6: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression )
+                    // InternalCheckCfg.g:2665:7: ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXForLoopExpressionParserRuleCall_7()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXForLoopExpression_in_ruleXPrimaryExpression6441);
+                    pushFollow(FOLLOW_2);
                     this_XForLoopExpression_7=ruleXForLoopExpression();
 
                     state._fsp--;
@@ -8038,14 +8038,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 9 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2684:5: this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression
+                    // InternalCheckCfg.g:2684:5: this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXBasicForLoopExpressionParserRuleCall_8()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXBasicForLoopExpression_in_ruleXPrimaryExpression6469);
+                    pushFollow(FOLLOW_2);
                     this_XBasicForLoopExpression_8=ruleXBasicForLoopExpression();
 
                     state._fsp--;
@@ -8060,14 +8060,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 10 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2694:5: this_XWhileExpression_9= ruleXWhileExpression
+                    // InternalCheckCfg.g:2694:5: this_XWhileExpression_9= ruleXWhileExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXWhileExpressionParserRuleCall_9()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXWhileExpression_in_ruleXPrimaryExpression6496);
+                    pushFollow(FOLLOW_2);
                     this_XWhileExpression_9=ruleXWhileExpression();
 
                     state._fsp--;
@@ -8082,14 +8082,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 11 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2704:5: this_XDoWhileExpression_10= ruleXDoWhileExpression
+                    // InternalCheckCfg.g:2704:5: this_XDoWhileExpression_10= ruleXDoWhileExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXDoWhileExpressionParserRuleCall_10()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXDoWhileExpression_in_ruleXPrimaryExpression6523);
+                    pushFollow(FOLLOW_2);
                     this_XDoWhileExpression_10=ruleXDoWhileExpression();
 
                     state._fsp--;
@@ -8104,14 +8104,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 12 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2714:5: this_XThrowExpression_11= ruleXThrowExpression
+                    // InternalCheckCfg.g:2714:5: this_XThrowExpression_11= ruleXThrowExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXThrowExpressionParserRuleCall_11()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXThrowExpression_in_ruleXPrimaryExpression6550);
+                    pushFollow(FOLLOW_2);
                     this_XThrowExpression_11=ruleXThrowExpression();
 
                     state._fsp--;
@@ -8126,14 +8126,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 13 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2724:5: this_XReturnExpression_12= ruleXReturnExpression
+                    // InternalCheckCfg.g:2724:5: this_XReturnExpression_12= ruleXReturnExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXReturnExpressionParserRuleCall_12()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXReturnExpression_in_ruleXPrimaryExpression6577);
+                    pushFollow(FOLLOW_2);
                     this_XReturnExpression_12=ruleXReturnExpression();
 
                     state._fsp--;
@@ -8148,14 +8148,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 14 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2734:5: this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression
+                    // InternalCheckCfg.g:2734:5: this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXTryCatchFinallyExpressionParserRuleCall_13()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXTryCatchFinallyExpression_in_ruleXPrimaryExpression6604);
+                    pushFollow(FOLLOW_2);
                     this_XTryCatchFinallyExpression_13=ruleXTryCatchFinallyExpression();
 
                     state._fsp--;
@@ -8170,14 +8170,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 15 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2744:5: this_XParenthesizedExpression_14= ruleXParenthesizedExpression
+                    // InternalCheckCfg.g:2744:5: this_XParenthesizedExpression_14= ruleXParenthesizedExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXParenthesizedExpressionParserRuleCall_14()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXParenthesizedExpression_in_ruleXPrimaryExpression6631);
+                    pushFollow(FOLLOW_2);
                     this_XParenthesizedExpression_14=ruleXParenthesizedExpression();
 
                     state._fsp--;
@@ -8214,7 +8214,7 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2760:1: entryRuleXLiteral returns [EObject current=null] : iv_ruleXLiteral= ruleXLiteral EOF ;
+    // InternalCheckCfg.g:2760:1: entryRuleXLiteral returns [EObject current=null] : iv_ruleXLiteral= ruleXLiteral EOF ;
     public final EObject entryRuleXLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -8222,13 +8222,13 @@ public final EObject entryRuleXLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2761:2: (iv_ruleXLiteral= ruleXLiteral EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2762:2: iv_ruleXLiteral= ruleXLiteral EOF
+            // InternalCheckCfg.g:2761:2: (iv_ruleXLiteral= ruleXLiteral EOF )
+            // InternalCheckCfg.g:2762:2: iv_ruleXLiteral= ruleXLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXLiteral_in_entryRuleXLiteral6666);
+            pushFollow(FOLLOW_1);
             iv_ruleXLiteral=ruleXLiteral();
 
             state._fsp--;
@@ -8236,7 +8236,7 @@ public final EObject entryRuleXLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXLiteral6676); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -8254,7 +8254,7 @@ public final EObject entryRuleXLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2769:1: ruleXLiteral returns [EObject current=null] : (this_XCollectionLiteral_0= ruleXCollectionLiteral | ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure ) | this_XBooleanLiteral_2= ruleXBooleanLiteral | this_XNumberLiteral_3= ruleXNumberLiteral | this_XNullLiteral_4= ruleXNullLiteral | this_XStringLiteral_5= ruleXStringLiteral | this_XTypeLiteral_6= ruleXTypeLiteral ) ;
+    // InternalCheckCfg.g:2769:1: ruleXLiteral returns [EObject current=null] : (this_XCollectionLiteral_0= ruleXCollectionLiteral | ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure ) | this_XBooleanLiteral_2= ruleXBooleanLiteral | this_XNumberLiteral_3= ruleXNumberLiteral | this_XNullLiteral_4= ruleXNullLiteral | this_XStringLiteral_5= ruleXStringLiteral | this_XTypeLiteral_6= ruleXTypeLiteral ) ;
     public final EObject ruleXLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -8276,10 +8276,10 @@ public final EObject ruleXLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2772:28: ( (this_XCollectionLiteral_0= ruleXCollectionLiteral | ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure ) | this_XBooleanLiteral_2= ruleXBooleanLiteral | this_XNumberLiteral_3= ruleXNumberLiteral | this_XNullLiteral_4= ruleXNullLiteral | this_XStringLiteral_5= ruleXStringLiteral | this_XTypeLiteral_6= ruleXTypeLiteral ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2773:1: (this_XCollectionLiteral_0= ruleXCollectionLiteral | ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure ) | this_XBooleanLiteral_2= ruleXBooleanLiteral | this_XNumberLiteral_3= ruleXNumberLiteral | this_XNullLiteral_4= ruleXNullLiteral | this_XStringLiteral_5= ruleXStringLiteral | this_XTypeLiteral_6= ruleXTypeLiteral )
+            // InternalCheckCfg.g:2772:28: ( (this_XCollectionLiteral_0= ruleXCollectionLiteral | ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure ) | this_XBooleanLiteral_2= ruleXBooleanLiteral | this_XNumberLiteral_3= ruleXNumberLiteral | this_XNullLiteral_4= ruleXNullLiteral | this_XStringLiteral_5= ruleXStringLiteral | this_XTypeLiteral_6= ruleXTypeLiteral ) )
+            // InternalCheckCfg.g:2773:1: (this_XCollectionLiteral_0= ruleXCollectionLiteral | ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure ) | this_XBooleanLiteral_2= ruleXBooleanLiteral | this_XNumberLiteral_3= ruleXNumberLiteral | this_XNullLiteral_4= ruleXNullLiteral | this_XStringLiteral_5= ruleXStringLiteral | this_XTypeLiteral_6= ruleXTypeLiteral )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2773:1: (this_XCollectionLiteral_0= ruleXCollectionLiteral | ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure ) | this_XBooleanLiteral_2= ruleXBooleanLiteral | this_XNumberLiteral_3= ruleXNumberLiteral | this_XNullLiteral_4= ruleXNullLiteral | this_XStringLiteral_5= ruleXStringLiteral | this_XTypeLiteral_6= ruleXTypeLiteral )
+            // InternalCheckCfg.g:2773:1: (this_XCollectionLiteral_0= ruleXCollectionLiteral | ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure ) | this_XBooleanLiteral_2= ruleXBooleanLiteral | this_XNumberLiteral_3= ruleXNumberLiteral | this_XNullLiteral_4= ruleXNullLiteral | this_XStringLiteral_5= ruleXStringLiteral | this_XTypeLiteral_6= ruleXTypeLiteral )
             int alt49=7;
             int LA49_0 = input.LA(1);
 
@@ -8313,14 +8313,14 @@ else if ( (LA49_0==81) ) {
             }
             switch (alt49) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2774:5: this_XCollectionLiteral_0= ruleXCollectionLiteral
+                    // InternalCheckCfg.g:2774:5: this_XCollectionLiteral_0= ruleXCollectionLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXLiteralAccess().getXCollectionLiteralParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXCollectionLiteral_in_ruleXLiteral6723);
+                    pushFollow(FOLLOW_2);
                     this_XCollectionLiteral_0=ruleXCollectionLiteral();
 
                     state._fsp--;
@@ -8335,17 +8335,17 @@ else if ( (LA49_0==81) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2783:6: ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure )
+                    // InternalCheckCfg.g:2783:6: ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2783:6: ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2783:7: ( ( () '[' ) )=>this_XClosure_1= ruleXClosure
+                    // InternalCheckCfg.g:2783:6: ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure )
+                    // InternalCheckCfg.g:2783:7: ( ( () '[' ) )=>this_XClosure_1= ruleXClosure
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXLiteralAccess().getXClosureParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXClosure_in_ruleXLiteral6763);
+                    pushFollow(FOLLOW_2);
                     this_XClosure_1=ruleXClosure();
 
                     state._fsp--;
@@ -8363,14 +8363,14 @@ else if ( (LA49_0==81) ) {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2796:5: this_XBooleanLiteral_2= ruleXBooleanLiteral
+                    // InternalCheckCfg.g:2796:5: this_XBooleanLiteral_2= ruleXBooleanLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXLiteralAccess().getXBooleanLiteralParserRuleCall_2()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXBooleanLiteral_in_ruleXLiteral6791);
+                    pushFollow(FOLLOW_2);
                     this_XBooleanLiteral_2=ruleXBooleanLiteral();
 
                     state._fsp--;
@@ -8385,14 +8385,14 @@ else if ( (LA49_0==81) ) {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2806:5: this_XNumberLiteral_3= ruleXNumberLiteral
+                    // InternalCheckCfg.g:2806:5: this_XNumberLiteral_3= ruleXNumberLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXLiteralAccess().getXNumberLiteralParserRuleCall_3()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXNumberLiteral_in_ruleXLiteral6818);
+                    pushFollow(FOLLOW_2);
                     this_XNumberLiteral_3=ruleXNumberLiteral();
 
                     state._fsp--;
@@ -8407,14 +8407,14 @@ else if ( (LA49_0==81) ) {
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2816:5: this_XNullLiteral_4= ruleXNullLiteral
+                    // InternalCheckCfg.g:2816:5: this_XNullLiteral_4= ruleXNullLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXLiteralAccess().getXNullLiteralParserRuleCall_4()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXNullLiteral_in_ruleXLiteral6845);
+                    pushFollow(FOLLOW_2);
                     this_XNullLiteral_4=ruleXNullLiteral();
 
                     state._fsp--;
@@ -8429,14 +8429,14 @@ else if ( (LA49_0==81) ) {
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2826:5: this_XStringLiteral_5= ruleXStringLiteral
+                    // InternalCheckCfg.g:2826:5: this_XStringLiteral_5= ruleXStringLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXLiteralAccess().getXStringLiteralParserRuleCall_5()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXStringLiteral_in_ruleXLiteral6872);
+                    pushFollow(FOLLOW_2);
                     this_XStringLiteral_5=ruleXStringLiteral();
 
                     state._fsp--;
@@ -8451,14 +8451,14 @@ else if ( (LA49_0==81) ) {
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2836:5: this_XTypeLiteral_6= ruleXTypeLiteral
+                    // InternalCheckCfg.g:2836:5: this_XTypeLiteral_6= ruleXTypeLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXLiteralAccess().getXTypeLiteralParserRuleCall_6()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXTypeLiteral_in_ruleXLiteral6899);
+                    pushFollow(FOLLOW_2);
                     this_XTypeLiteral_6=ruleXTypeLiteral();
 
                     state._fsp--;
@@ -8495,7 +8495,7 @@ else if ( (LA49_0==81) ) {
 
 
     // $ANTLR start "entryRuleXCollectionLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2852:1: entryRuleXCollectionLiteral returns [EObject current=null] : iv_ruleXCollectionLiteral= ruleXCollectionLiteral EOF ;
+    // InternalCheckCfg.g:2852:1: entryRuleXCollectionLiteral returns [EObject current=null] : iv_ruleXCollectionLiteral= ruleXCollectionLiteral EOF ;
     public final EObject entryRuleXCollectionLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -8503,13 +8503,13 @@ public final EObject entryRuleXCollectionLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2853:2: (iv_ruleXCollectionLiteral= ruleXCollectionLiteral EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2854:2: iv_ruleXCollectionLiteral= ruleXCollectionLiteral EOF
+            // InternalCheckCfg.g:2853:2: (iv_ruleXCollectionLiteral= ruleXCollectionLiteral EOF )
+            // InternalCheckCfg.g:2854:2: iv_ruleXCollectionLiteral= ruleXCollectionLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXCollectionLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXCollectionLiteral_in_entryRuleXCollectionLiteral6934);
+            pushFollow(FOLLOW_1);
             iv_ruleXCollectionLiteral=ruleXCollectionLiteral();
 
             state._fsp--;
@@ -8517,7 +8517,7 @@ public final EObject entryRuleXCollectionLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXCollectionLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXCollectionLiteral6944); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -8535,7 +8535,7 @@ public final EObject entryRuleXCollectionLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXCollectionLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2861:1: ruleXCollectionLiteral returns [EObject current=null] : (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral ) ;
+    // InternalCheckCfg.g:2861:1: ruleXCollectionLiteral returns [EObject current=null] : (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral ) ;
     public final EObject ruleXCollectionLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -8547,10 +8547,10 @@ public final EObject ruleXCollectionLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2864:28: ( (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2865:1: (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral )
+            // InternalCheckCfg.g:2864:28: ( (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral ) )
+            // InternalCheckCfg.g:2865:1: (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2865:1: (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral )
+            // InternalCheckCfg.g:2865:1: (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral )
             int alt50=2;
             int LA50_0 = input.LA(1);
 
@@ -8580,14 +8580,14 @@ else if ( (LA50_1==15) ) {
             }
             switch (alt50) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2866:5: this_XSetLiteral_0= ruleXSetLiteral
+                    // InternalCheckCfg.g:2866:5: this_XSetLiteral_0= ruleXSetLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXCollectionLiteralAccess().getXSetLiteralParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXSetLiteral_in_ruleXCollectionLiteral6991);
+                    pushFollow(FOLLOW_2);
                     this_XSetLiteral_0=ruleXSetLiteral();
 
                     state._fsp--;
@@ -8602,14 +8602,14 @@ else if ( (LA50_1==15) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2876:5: this_XListLiteral_1= ruleXListLiteral
+                    // InternalCheckCfg.g:2876:5: this_XListLiteral_1= ruleXListLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXCollectionLiteralAccess().getXListLiteralParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXListLiteral_in_ruleXCollectionLiteral7018);
+                    pushFollow(FOLLOW_2);
                     this_XListLiteral_1=ruleXListLiteral();
 
                     state._fsp--;
@@ -8646,7 +8646,7 @@ else if ( (LA50_1==15) ) {
 
 
     // $ANTLR start "entryRuleXSetLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2892:1: entryRuleXSetLiteral returns [EObject current=null] : iv_ruleXSetLiteral= ruleXSetLiteral EOF ;
+    // InternalCheckCfg.g:2892:1: entryRuleXSetLiteral returns [EObject current=null] : iv_ruleXSetLiteral= ruleXSetLiteral EOF ;
     public final EObject entryRuleXSetLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -8654,13 +8654,13 @@ public final EObject entryRuleXSetLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2893:2: (iv_ruleXSetLiteral= ruleXSetLiteral EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2894:2: iv_ruleXSetLiteral= ruleXSetLiteral EOF
+            // InternalCheckCfg.g:2893:2: (iv_ruleXSetLiteral= ruleXSetLiteral EOF )
+            // InternalCheckCfg.g:2894:2: iv_ruleXSetLiteral= ruleXSetLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXSetLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXSetLiteral_in_entryRuleXSetLiteral7053);
+            pushFollow(FOLLOW_1);
             iv_ruleXSetLiteral=ruleXSetLiteral();
 
             state._fsp--;
@@ -8668,7 +8668,7 @@ public final EObject entryRuleXSetLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXSetLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXSetLiteral7063); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -8686,7 +8686,7 @@ public final EObject entryRuleXSetLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXSetLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2901:1: ruleXSetLiteral returns [EObject current=null] : ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' ) ;
+    // InternalCheckCfg.g:2901:1: ruleXSetLiteral returns [EObject current=null] : ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' ) ;
     public final EObject ruleXSetLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -8702,14 +8702,14 @@ public final EObject ruleXSetLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2904:28: ( ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2905:1: ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' )
+            // InternalCheckCfg.g:2904:28: ( ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' ) )
+            // InternalCheckCfg.g:2905:1: ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2905:1: ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2905:2: () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}'
+            // InternalCheckCfg.g:2905:1: ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' )
+            // InternalCheckCfg.g:2905:2: () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}'
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2905:2: ()
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2906:5: 
+            // InternalCheckCfg.g:2905:2: ()
+            // InternalCheckCfg.g:2906:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -8721,19 +8721,19 @@ public final EObject ruleXSetLiteral() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,23,FOLLOW_23_in_ruleXSetLiteral7109); if (state.failed) return current;
+            otherlv_1=(Token)match(input,23,FOLLOW_8); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXSetLiteralAccess().getNumberSignKeyword_1());
                   
             }
-            otherlv_2=(Token)match(input,15,FOLLOW_15_in_ruleXSetLiteral7121); if (state.failed) return current;
+            otherlv_2=(Token)match(input,15,FOLLOW_47); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getXSetLiteralAccess().getLeftCurlyBracketKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2919:1: ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )?
+            // InternalCheckCfg.g:2919:1: ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )?
             int alt52=2;
             int LA52_0 = input.LA(1);
 
@@ -8742,20 +8742,20 @@ public final EObject ruleXSetLiteral() throws RecognitionException {
             }
             switch (alt52) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2919:2: ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
+                    // InternalCheckCfg.g:2919:2: ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2919:2: ( (lv_elements_3_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2920:1: (lv_elements_3_0= ruleXExpression )
+                    // InternalCheckCfg.g:2919:2: ( (lv_elements_3_0= ruleXExpression ) )
+                    // InternalCheckCfg.g:2920:1: (lv_elements_3_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2920:1: (lv_elements_3_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2921:3: lv_elements_3_0= ruleXExpression
+                    // InternalCheckCfg.g:2920:1: (lv_elements_3_0= ruleXExpression )
+                    // InternalCheckCfg.g:2921:3: lv_elements_3_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXSetLiteralAccess().getElementsXExpressionParserRuleCall_3_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXSetLiteral7143);
+                    pushFollow(FOLLOW_48);
                     lv_elements_3_0=ruleXExpression();
 
                     state._fsp--;
@@ -8769,7 +8769,7 @@ public final EObject ruleXSetLiteral() throws RecognitionException {
                              			current, 
                              			"elements",
                               		lv_elements_3_0, 
-                              		"XExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -8779,7 +8779,7 @@ public final EObject ruleXSetLiteral() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2937:2: (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
+                    // InternalCheckCfg.g:2937:2: (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
                     loop51:
                     do {
                         int alt51=2;
@@ -8792,26 +8792,26 @@ public final EObject ruleXSetLiteral() throws RecognitionException {
 
                         switch (alt51) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2937:4: otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) )
+                    	    // InternalCheckCfg.g:2937:4: otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) )
                     	    {
-                    	    otherlv_4=(Token)match(input,20,FOLLOW_20_in_ruleXSetLiteral7156); if (state.failed) return current;
+                    	    otherlv_4=(Token)match(input,20,FOLLOW_20); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_4, grammarAccess.getXSetLiteralAccess().getCommaKeyword_3_1_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2941:1: ( (lv_elements_5_0= ruleXExpression ) )
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2942:1: (lv_elements_5_0= ruleXExpression )
+                    	    // InternalCheckCfg.g:2941:1: ( (lv_elements_5_0= ruleXExpression ) )
+                    	    // InternalCheckCfg.g:2942:1: (lv_elements_5_0= ruleXExpression )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2942:1: (lv_elements_5_0= ruleXExpression )
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2943:3: lv_elements_5_0= ruleXExpression
+                    	    // InternalCheckCfg.g:2942:1: (lv_elements_5_0= ruleXExpression )
+                    	    // InternalCheckCfg.g:2943:3: lv_elements_5_0= ruleXExpression
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getXSetLiteralAccess().getElementsXExpressionParserRuleCall_3_1_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleXExpression_in_ruleXSetLiteral7177);
+                    	    pushFollow(FOLLOW_48);
                     	    lv_elements_5_0=ruleXExpression();
 
                     	    state._fsp--;
@@ -8825,7 +8825,7 @@ public final EObject ruleXSetLiteral() throws RecognitionException {
                     	             			current, 
                     	             			"elements",
                     	              		lv_elements_5_0, 
-                    	              		"XExpression");
+                    	              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -8850,7 +8850,7 @@ public final EObject ruleXSetLiteral() throws RecognitionException {
 
             }
 
-            otherlv_6=(Token)match(input,16,FOLLOW_16_in_ruleXSetLiteral7193); if (state.failed) return current;
+            otherlv_6=(Token)match(input,16,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_6, grammarAccess.getXSetLiteralAccess().getRightCurlyBracketKeyword_4());
@@ -8879,7 +8879,7 @@ public final EObject ruleXSetLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXListLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2971:1: entryRuleXListLiteral returns [EObject current=null] : iv_ruleXListLiteral= ruleXListLiteral EOF ;
+    // InternalCheckCfg.g:2971:1: entryRuleXListLiteral returns [EObject current=null] : iv_ruleXListLiteral= ruleXListLiteral EOF ;
     public final EObject entryRuleXListLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -8887,13 +8887,13 @@ public final EObject entryRuleXListLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2972:2: (iv_ruleXListLiteral= ruleXListLiteral EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2973:2: iv_ruleXListLiteral= ruleXListLiteral EOF
+            // InternalCheckCfg.g:2972:2: (iv_ruleXListLiteral= ruleXListLiteral EOF )
+            // InternalCheckCfg.g:2973:2: iv_ruleXListLiteral= ruleXListLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXListLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXListLiteral_in_entryRuleXListLiteral7229);
+            pushFollow(FOLLOW_1);
             iv_ruleXListLiteral=ruleXListLiteral();
 
             state._fsp--;
@@ -8901,7 +8901,7 @@ public final EObject entryRuleXListLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXListLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXListLiteral7239); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -8919,7 +8919,7 @@ public final EObject entryRuleXListLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXListLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2980:1: ruleXListLiteral returns [EObject current=null] : ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' ) ;
+    // InternalCheckCfg.g:2980:1: ruleXListLiteral returns [EObject current=null] : ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' ) ;
     public final EObject ruleXListLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -8935,14 +8935,14 @@ public final EObject ruleXListLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2983:28: ( ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2984:1: ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' )
+            // InternalCheckCfg.g:2983:28: ( ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' ) )
+            // InternalCheckCfg.g:2984:1: ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2984:1: ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2984:2: () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']'
+            // InternalCheckCfg.g:2984:1: ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' )
+            // InternalCheckCfg.g:2984:2: () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']'
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2984:2: ()
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2985:5: 
+            // InternalCheckCfg.g:2984:2: ()
+            // InternalCheckCfg.g:2985:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -8954,19 +8954,19 @@ public final EObject ruleXListLiteral() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,23,FOLLOW_23_in_ruleXListLiteral7285); if (state.failed) return current;
+            otherlv_1=(Token)match(input,23,FOLLOW_17); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXListLiteralAccess().getNumberSignKeyword_1());
                   
             }
-            otherlv_2=(Token)match(input,24,FOLLOW_24_in_ruleXListLiteral7297); if (state.failed) return current;
+            otherlv_2=(Token)match(input,24,FOLLOW_49); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getXListLiteralAccess().getLeftSquareBracketKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2998:1: ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )?
+            // InternalCheckCfg.g:2998:1: ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )?
             int alt54=2;
             int LA54_0 = input.LA(1);
 
@@ -8975,20 +8975,20 @@ public final EObject ruleXListLiteral() throws RecognitionException {
             }
             switch (alt54) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2998:2: ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
+                    // InternalCheckCfg.g:2998:2: ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2998:2: ( (lv_elements_3_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2999:1: (lv_elements_3_0= ruleXExpression )
+                    // InternalCheckCfg.g:2998:2: ( (lv_elements_3_0= ruleXExpression ) )
+                    // InternalCheckCfg.g:2999:1: (lv_elements_3_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2999:1: (lv_elements_3_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3000:3: lv_elements_3_0= ruleXExpression
+                    // InternalCheckCfg.g:2999:1: (lv_elements_3_0= ruleXExpression )
+                    // InternalCheckCfg.g:3000:3: lv_elements_3_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXListLiteralAccess().getElementsXExpressionParserRuleCall_3_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXListLiteral7319);
+                    pushFollow(FOLLOW_19);
                     lv_elements_3_0=ruleXExpression();
 
                     state._fsp--;
@@ -9002,7 +9002,7 @@ public final EObject ruleXListLiteral() throws RecognitionException {
                              			current, 
                              			"elements",
                               		lv_elements_3_0, 
-                              		"XExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -9012,7 +9012,7 @@ public final EObject ruleXListLiteral() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3016:2: (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
+                    // InternalCheckCfg.g:3016:2: (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
                     loop53:
                     do {
                         int alt53=2;
@@ -9025,26 +9025,26 @@ public final EObject ruleXListLiteral() throws RecognitionException {
 
                         switch (alt53) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3016:4: otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) )
+                    	    // InternalCheckCfg.g:3016:4: otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) )
                     	    {
-                    	    otherlv_4=(Token)match(input,20,FOLLOW_20_in_ruleXListLiteral7332); if (state.failed) return current;
+                    	    otherlv_4=(Token)match(input,20,FOLLOW_20); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_4, grammarAccess.getXListLiteralAccess().getCommaKeyword_3_1_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3020:1: ( (lv_elements_5_0= ruleXExpression ) )
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3021:1: (lv_elements_5_0= ruleXExpression )
+                    	    // InternalCheckCfg.g:3020:1: ( (lv_elements_5_0= ruleXExpression ) )
+                    	    // InternalCheckCfg.g:3021:1: (lv_elements_5_0= ruleXExpression )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3021:1: (lv_elements_5_0= ruleXExpression )
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3022:3: lv_elements_5_0= ruleXExpression
+                    	    // InternalCheckCfg.g:3021:1: (lv_elements_5_0= ruleXExpression )
+                    	    // InternalCheckCfg.g:3022:3: lv_elements_5_0= ruleXExpression
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getXListLiteralAccess().getElementsXExpressionParserRuleCall_3_1_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleXExpression_in_ruleXListLiteral7353);
+                    	    pushFollow(FOLLOW_19);
                     	    lv_elements_5_0=ruleXExpression();
 
                     	    state._fsp--;
@@ -9058,7 +9058,7 @@ public final EObject ruleXListLiteral() throws RecognitionException {
                     	             			current, 
                     	             			"elements",
                     	              		lv_elements_5_0, 
-                    	              		"XExpression");
+                    	              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -9083,7 +9083,7 @@ public final EObject ruleXListLiteral() throws RecognitionException {
 
             }
 
-            otherlv_6=(Token)match(input,25,FOLLOW_25_in_ruleXListLiteral7369); if (state.failed) return current;
+            otherlv_6=(Token)match(input,25,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_6, grammarAccess.getXListLiteralAccess().getRightSquareBracketKeyword_4());
@@ -9112,7 +9112,7 @@ public final EObject ruleXListLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXClosure"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3050:1: entryRuleXClosure returns [EObject current=null] : iv_ruleXClosure= ruleXClosure EOF ;
+    // InternalCheckCfg.g:3050:1: entryRuleXClosure returns [EObject current=null] : iv_ruleXClosure= ruleXClosure EOF ;
     public final EObject entryRuleXClosure() throws RecognitionException {
         EObject current = null;
 
@@ -9120,13 +9120,13 @@ public final EObject entryRuleXClosure() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3051:2: (iv_ruleXClosure= ruleXClosure EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3052:2: iv_ruleXClosure= ruleXClosure EOF
+            // InternalCheckCfg.g:3051:2: (iv_ruleXClosure= ruleXClosure EOF )
+            // InternalCheckCfg.g:3052:2: iv_ruleXClosure= ruleXClosure EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXClosureRule()); 
             }
-            pushFollow(FOLLOW_ruleXClosure_in_entryRuleXClosure7405);
+            pushFollow(FOLLOW_1);
             iv_ruleXClosure=ruleXClosure();
 
             state._fsp--;
@@ -9134,7 +9134,7 @@ public final EObject entryRuleXClosure() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXClosure; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXClosure7415); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -9152,7 +9152,7 @@ public final EObject entryRuleXClosure() throws RecognitionException {
 
 
     // $ANTLR start "ruleXClosure"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3059:1: ruleXClosure returns [EObject current=null] : ( ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']' ) ;
+    // InternalCheckCfg.g:3059:1: ruleXClosure returns [EObject current=null] : ( ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']' ) ;
     public final EObject ruleXClosure() throws RecognitionException {
         EObject current = null;
 
@@ -9170,20 +9170,20 @@ public final EObject ruleXClosure() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3062:28: ( ( ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3063:1: ( ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']' )
+            // InternalCheckCfg.g:3062:28: ( ( ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']' ) )
+            // InternalCheckCfg.g:3063:1: ( ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3063:1: ( ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3063:2: ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']'
+            // InternalCheckCfg.g:3063:1: ( ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']' )
+            // InternalCheckCfg.g:3063:2: ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']'
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3063:2: ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3063:3: ( ( () '[' ) )=> ( () otherlv_1= '[' )
+            // InternalCheckCfg.g:3063:2: ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) )
+            // InternalCheckCfg.g:3063:3: ( ( () '[' ) )=> ( () otherlv_1= '[' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3065:5: ( () otherlv_1= '[' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3065:6: () otherlv_1= '['
+            // InternalCheckCfg.g:3065:5: ( () otherlv_1= '[' )
+            // InternalCheckCfg.g:3065:6: () otherlv_1= '['
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3065:6: ()
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3066:5: 
+            // InternalCheckCfg.g:3065:6: ()
+            // InternalCheckCfg.g:3066:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -9195,7 +9195,7 @@ public final EObject ruleXClosure() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,24,FOLLOW_24_in_ruleXClosure7475); if (state.failed) return current;
+            otherlv_1=(Token)match(input,24,FOLLOW_50); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXClosureAccess().getLeftSquareBracketKeyword_0_0_1());
@@ -9207,17 +9207,17 @@ public final EObject ruleXClosure() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3075:3: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )?
+            // InternalCheckCfg.g:3075:3: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )?
             int alt57=2;
             alt57 = dfa57.predict(input);
             switch (alt57) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3075:4: ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) )
+                    // InternalCheckCfg.g:3075:4: ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3090:6: ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3090:7: ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) )
+                    // InternalCheckCfg.g:3090:6: ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) )
+                    // InternalCheckCfg.g:3090:7: ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3090:7: ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )?
+                    // InternalCheckCfg.g:3090:7: ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )?
                     int alt56=2;
                     int LA56_0 = input.LA(1);
 
@@ -9226,20 +9226,20 @@ public final EObject ruleXClosure() throws RecognitionException {
                     }
                     switch (alt56) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3090:8: ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )*
+                            // InternalCheckCfg.g:3090:8: ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )*
                             {
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3090:8: ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) )
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3091:1: (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter )
+                            // InternalCheckCfg.g:3090:8: ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) )
+                            // InternalCheckCfg.g:3091:1: (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter )
                             {
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3091:1: (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter )
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3092:3: lv_declaredFormalParameters_2_0= ruleJvmFormalParameter
+                            // InternalCheckCfg.g:3091:1: (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter )
+                            // InternalCheckCfg.g:3092:3: lv_declaredFormalParameters_2_0= ruleJvmFormalParameter
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_1_0_0_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleJvmFormalParameter_in_ruleXClosure7548);
+                            pushFollow(FOLLOW_51);
                             lv_declaredFormalParameters_2_0=ruleJvmFormalParameter();
 
                             state._fsp--;
@@ -9253,7 +9253,7 @@ public final EObject ruleXClosure() throws RecognitionException {
                                      			current, 
                                      			"declaredFormalParameters",
                                       		lv_declaredFormalParameters_2_0, 
-                                      		"JvmFormalParameter");
+                                      		"org.eclipse.xtext.xbase.Xbase.JvmFormalParameter");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -9263,7 +9263,7 @@ public final EObject ruleXClosure() throws RecognitionException {
 
                             }
 
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3108:2: (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )*
+                            // InternalCheckCfg.g:3108:2: (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )*
                             loop55:
                             do {
                                 int alt55=2;
@@ -9276,26 +9276,26 @@ public final EObject ruleXClosure() throws RecognitionException {
 
                                 switch (alt55) {
                             	case 1 :
-                            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3108:4: otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) )
+                            	    // InternalCheckCfg.g:3108:4: otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) )
                             	    {
-                            	    otherlv_3=(Token)match(input,20,FOLLOW_20_in_ruleXClosure7561); if (state.failed) return current;
+                            	    otherlv_3=(Token)match(input,20,FOLLOW_29); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	          	newLeafNode(otherlv_3, grammarAccess.getXClosureAccess().getCommaKeyword_1_0_0_1_0());
                             	          
                             	    }
-                            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3112:1: ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) )
-                            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3113:1: (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter )
+                            	    // InternalCheckCfg.g:3112:1: ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) )
+                            	    // InternalCheckCfg.g:3113:1: (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter )
                             	    {
-                            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3113:1: (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter )
-                            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3114:3: lv_declaredFormalParameters_4_0= ruleJvmFormalParameter
+                            	    // InternalCheckCfg.g:3113:1: (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter )
+                            	    // InternalCheckCfg.g:3114:3: lv_declaredFormalParameters_4_0= ruleJvmFormalParameter
                             	    {
                             	    if ( state.backtracking==0 ) {
                             	       
                             	      	        newCompositeNode(grammarAccess.getXClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_1_0_0_1_1_0()); 
                             	      	    
                             	    }
-                            	    pushFollow(FOLLOW_ruleJvmFormalParameter_in_ruleXClosure7582);
+                            	    pushFollow(FOLLOW_51);
                             	    lv_declaredFormalParameters_4_0=ruleJvmFormalParameter();
 
                             	    state._fsp--;
@@ -9309,7 +9309,7 @@ public final EObject ruleXClosure() throws RecognitionException {
                             	             			current, 
                             	             			"declaredFormalParameters",
                             	              		lv_declaredFormalParameters_4_0, 
-                            	              		"JvmFormalParameter");
+                            	              		"org.eclipse.xtext.xbase.Xbase.JvmFormalParameter");
                             	      	        afterParserOrEnumRuleCall();
                             	      	    
                             	    }
@@ -9334,13 +9334,13 @@ public final EObject ruleXClosure() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3130:6: ( (lv_explicitSyntax_5_0= '|' ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3131:1: (lv_explicitSyntax_5_0= '|' )
+                    // InternalCheckCfg.g:3130:6: ( (lv_explicitSyntax_5_0= '|' ) )
+                    // InternalCheckCfg.g:3131:1: (lv_explicitSyntax_5_0= '|' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3131:1: (lv_explicitSyntax_5_0= '|' )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3132:3: lv_explicitSyntax_5_0= '|'
+                    // InternalCheckCfg.g:3131:1: (lv_explicitSyntax_5_0= '|' )
+                    // InternalCheckCfg.g:3132:3: lv_explicitSyntax_5_0= '|'
                     {
-                    lv_explicitSyntax_5_0=(Token)match(input,60,FOLLOW_60_in_ruleXClosure7604); if (state.failed) return current;
+                    lv_explicitSyntax_5_0=(Token)match(input,60,FOLLOW_52); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_explicitSyntax_5_0, grammarAccess.getXClosureAccess().getExplicitSyntaxVerticalLineKeyword_1_0_1_0());
@@ -9369,18 +9369,18 @@ public final EObject ruleXClosure() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3145:5: ( (lv_expression_6_0= ruleXExpressionInClosure ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3146:1: (lv_expression_6_0= ruleXExpressionInClosure )
+            // InternalCheckCfg.g:3145:5: ( (lv_expression_6_0= ruleXExpressionInClosure ) )
+            // InternalCheckCfg.g:3146:1: (lv_expression_6_0= ruleXExpressionInClosure )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3146:1: (lv_expression_6_0= ruleXExpressionInClosure )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3147:3: lv_expression_6_0= ruleXExpressionInClosure
+            // InternalCheckCfg.g:3146:1: (lv_expression_6_0= ruleXExpressionInClosure )
+            // InternalCheckCfg.g:3147:3: lv_expression_6_0= ruleXExpressionInClosure
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXClosureAccess().getExpressionXExpressionInClosureParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpressionInClosure_in_ruleXClosure7641);
+            pushFollow(FOLLOW_53);
             lv_expression_6_0=ruleXExpressionInClosure();
 
             state._fsp--;
@@ -9394,7 +9394,7 @@ public final EObject ruleXClosure() throws RecognitionException {
                      			current, 
                      			"expression",
                       		lv_expression_6_0, 
-                      		"XExpressionInClosure");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpressionInClosure");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -9404,7 +9404,7 @@ public final EObject ruleXClosure() throws RecognitionException {
 
             }
 
-            otherlv_7=(Token)match(input,25,FOLLOW_25_in_ruleXClosure7653); if (state.failed) return current;
+            otherlv_7=(Token)match(input,25,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_7, grammarAccess.getXClosureAccess().getRightSquareBracketKeyword_3());
@@ -9433,7 +9433,7 @@ public final EObject ruleXClosure() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXExpressionInClosure"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3175:1: entryRuleXExpressionInClosure returns [EObject current=null] : iv_ruleXExpressionInClosure= ruleXExpressionInClosure EOF ;
+    // InternalCheckCfg.g:3175:1: entryRuleXExpressionInClosure returns [EObject current=null] : iv_ruleXExpressionInClosure= ruleXExpressionInClosure EOF ;
     public final EObject entryRuleXExpressionInClosure() throws RecognitionException {
         EObject current = null;
 
@@ -9441,13 +9441,13 @@ public final EObject entryRuleXExpressionInClosure() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3176:2: (iv_ruleXExpressionInClosure= ruleXExpressionInClosure EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3177:2: iv_ruleXExpressionInClosure= ruleXExpressionInClosure EOF
+            // InternalCheckCfg.g:3176:2: (iv_ruleXExpressionInClosure= ruleXExpressionInClosure EOF )
+            // InternalCheckCfg.g:3177:2: iv_ruleXExpressionInClosure= ruleXExpressionInClosure EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXExpressionInClosureRule()); 
             }
-            pushFollow(FOLLOW_ruleXExpressionInClosure_in_entryRuleXExpressionInClosure7689);
+            pushFollow(FOLLOW_1);
             iv_ruleXExpressionInClosure=ruleXExpressionInClosure();
 
             state._fsp--;
@@ -9455,7 +9455,7 @@ public final EObject entryRuleXExpressionInClosure() throws RecognitionException
             if ( state.backtracking==0 ) {
                current =iv_ruleXExpressionInClosure; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXExpressionInClosure7699); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -9473,7 +9473,7 @@ public final EObject entryRuleXExpressionInClosure() throws RecognitionException
 
 
     // $ANTLR start "ruleXExpressionInClosure"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3184:1: ruleXExpressionInClosure returns [EObject current=null] : ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* ) ;
+    // InternalCheckCfg.g:3184:1: ruleXExpressionInClosure returns [EObject current=null] : ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* ) ;
     public final EObject ruleXExpressionInClosure() throws RecognitionException {
         EObject current = null;
 
@@ -9484,14 +9484,14 @@ public final EObject ruleXExpressionInClosure() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3187:28: ( ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3188:1: ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* )
+            // InternalCheckCfg.g:3187:28: ( ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* ) )
+            // InternalCheckCfg.g:3188:1: ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3188:1: ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3188:2: () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )*
+            // InternalCheckCfg.g:3188:1: ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* )
+            // InternalCheckCfg.g:3188:2: () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )*
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3188:2: ()
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3189:5: 
+            // InternalCheckCfg.g:3188:2: ()
+            // InternalCheckCfg.g:3189:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -9503,7 +9503,7 @@ public final EObject ruleXExpressionInClosure() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3194:2: ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )*
+            // InternalCheckCfg.g:3194:2: ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )*
             loop59:
             do {
                 int alt59=2;
@@ -9516,20 +9516,20 @@ public final EObject ruleXExpressionInClosure() throws RecognitionException {
 
                 switch (alt59) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3194:3: ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )?
+            	    // InternalCheckCfg.g:3194:3: ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )?
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3194:3: ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3195:1: (lv_expressions_1_0= ruleXExpressionOrVarDeclaration )
+            	    // InternalCheckCfg.g:3194:3: ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) )
+            	    // InternalCheckCfg.g:3195:1: (lv_expressions_1_0= ruleXExpressionOrVarDeclaration )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3195:1: (lv_expressions_1_0= ruleXExpressionOrVarDeclaration )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3196:3: lv_expressions_1_0= ruleXExpressionOrVarDeclaration
+            	    // InternalCheckCfg.g:3195:1: (lv_expressions_1_0= ruleXExpressionOrVarDeclaration )
+            	    // InternalCheckCfg.g:3196:3: lv_expressions_1_0= ruleXExpressionOrVarDeclaration
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXExpressionInClosureAccess().getExpressionsXExpressionOrVarDeclarationParserRuleCall_1_0_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_ruleXExpressionInClosure7755);
+            	    pushFollow(FOLLOW_54);
             	    lv_expressions_1_0=ruleXExpressionOrVarDeclaration();
 
             	    state._fsp--;
@@ -9543,7 +9543,7 @@ public final EObject ruleXExpressionInClosure() throws RecognitionException {
             	             			current, 
             	             			"expressions",
             	              		lv_expressions_1_0, 
-            	              		"XExpressionOrVarDeclaration");
+            	              		"org.eclipse.xtext.xbase.Xbase.XExpressionOrVarDeclaration");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -9553,7 +9553,7 @@ public final EObject ruleXExpressionInClosure() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3212:2: (otherlv_2= ';' )?
+            	    // InternalCheckCfg.g:3212:2: (otherlv_2= ';' )?
             	    int alt58=2;
             	    int LA58_0 = input.LA(1);
 
@@ -9562,9 +9562,9 @@ public final EObject ruleXExpressionInClosure() throws RecognitionException {
             	    }
             	    switch (alt58) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3212:4: otherlv_2= ';'
+            	            // InternalCheckCfg.g:3212:4: otherlv_2= ';'
             	            {
-            	            otherlv_2=(Token)match(input,61,FOLLOW_61_in_ruleXExpressionInClosure7768); if (state.failed) return current;
+            	            otherlv_2=(Token)match(input,61,FOLLOW_55); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                  	newLeafNode(otherlv_2, grammarAccess.getXExpressionInClosureAccess().getSemicolonKeyword_1_1());
@@ -9608,7 +9608,7 @@ public final EObject ruleXExpressionInClosure() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXShortClosure"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3224:1: entryRuleXShortClosure returns [EObject current=null] : iv_ruleXShortClosure= ruleXShortClosure EOF ;
+    // InternalCheckCfg.g:3224:1: entryRuleXShortClosure returns [EObject current=null] : iv_ruleXShortClosure= ruleXShortClosure EOF ;
     public final EObject entryRuleXShortClosure() throws RecognitionException {
         EObject current = null;
 
@@ -9616,13 +9616,13 @@ public final EObject entryRuleXShortClosure() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3225:2: (iv_ruleXShortClosure= ruleXShortClosure EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3226:2: iv_ruleXShortClosure= ruleXShortClosure EOF
+            // InternalCheckCfg.g:3225:2: (iv_ruleXShortClosure= ruleXShortClosure EOF )
+            // InternalCheckCfg.g:3226:2: iv_ruleXShortClosure= ruleXShortClosure EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXShortClosureRule()); 
             }
-            pushFollow(FOLLOW_ruleXShortClosure_in_entryRuleXShortClosure7808);
+            pushFollow(FOLLOW_1);
             iv_ruleXShortClosure=ruleXShortClosure();
 
             state._fsp--;
@@ -9630,7 +9630,7 @@ public final EObject entryRuleXShortClosure() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXShortClosure; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXShortClosure7818); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -9648,7 +9648,7 @@ public final EObject entryRuleXShortClosure() throws RecognitionException {
 
 
     // $ANTLR start "ruleXShortClosure"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3233:1: ruleXShortClosure returns [EObject current=null] : ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) ) ;
+    // InternalCheckCfg.g:3233:1: ruleXShortClosure returns [EObject current=null] : ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) ) ;
     public final EObject ruleXShortClosure() throws RecognitionException {
         EObject current = null;
 
@@ -9664,20 +9664,20 @@ public final EObject ruleXShortClosure() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3236:28: ( ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3237:1: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) )
+            // InternalCheckCfg.g:3236:28: ( ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) ) )
+            // InternalCheckCfg.g:3237:1: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3237:1: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3237:2: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) )
+            // InternalCheckCfg.g:3237:1: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) )
+            // InternalCheckCfg.g:3237:2: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3237:2: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3237:3: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) )
+            // InternalCheckCfg.g:3237:2: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) )
+            // InternalCheckCfg.g:3237:3: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3253:6: ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3253:7: () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) )
+            // InternalCheckCfg.g:3253:6: ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) )
+            // InternalCheckCfg.g:3253:7: () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3253:7: ()
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3254:5: 
+            // InternalCheckCfg.g:3253:7: ()
+            // InternalCheckCfg.g:3254:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -9689,7 +9689,7 @@ public final EObject ruleXShortClosure() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3259:2: ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )?
+            // InternalCheckCfg.g:3259:2: ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )?
             int alt61=2;
             int LA61_0 = input.LA(1);
 
@@ -9698,20 +9698,20 @@ public final EObject ruleXShortClosure() throws RecognitionException {
             }
             switch (alt61) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3259:3: ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )*
+                    // InternalCheckCfg.g:3259:3: ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )*
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3259:3: ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3260:1: (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter )
+                    // InternalCheckCfg.g:3259:3: ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) )
+                    // InternalCheckCfg.g:3260:1: (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3260:1: (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3261:3: lv_declaredFormalParameters_1_0= ruleJvmFormalParameter
+                    // InternalCheckCfg.g:3260:1: (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter )
+                    // InternalCheckCfg.g:3261:3: lv_declaredFormalParameters_1_0= ruleJvmFormalParameter
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXShortClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_0_0_1_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleJvmFormalParameter_in_ruleXShortClosure7926);
+                    pushFollow(FOLLOW_51);
                     lv_declaredFormalParameters_1_0=ruleJvmFormalParameter();
 
                     state._fsp--;
@@ -9725,7 +9725,7 @@ public final EObject ruleXShortClosure() throws RecognitionException {
                              			current, 
                              			"declaredFormalParameters",
                               		lv_declaredFormalParameters_1_0, 
-                              		"JvmFormalParameter");
+                              		"org.eclipse.xtext.xbase.Xbase.JvmFormalParameter");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -9735,7 +9735,7 @@ public final EObject ruleXShortClosure() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3277:2: (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )*
+                    // InternalCheckCfg.g:3277:2: (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )*
                     loop60:
                     do {
                         int alt60=2;
@@ -9748,26 +9748,26 @@ public final EObject ruleXShortClosure() throws RecognitionException {
 
                         switch (alt60) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3277:4: otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) )
+                    	    // InternalCheckCfg.g:3277:4: otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) )
                     	    {
-                    	    otherlv_2=(Token)match(input,20,FOLLOW_20_in_ruleXShortClosure7939); if (state.failed) return current;
+                    	    otherlv_2=(Token)match(input,20,FOLLOW_29); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_2, grammarAccess.getXShortClosureAccess().getCommaKeyword_0_0_1_1_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3281:1: ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) )
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3282:1: (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter )
+                    	    // InternalCheckCfg.g:3281:1: ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) )
+                    	    // InternalCheckCfg.g:3282:1: (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3282:1: (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter )
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3283:3: lv_declaredFormalParameters_3_0= ruleJvmFormalParameter
+                    	    // InternalCheckCfg.g:3282:1: (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter )
+                    	    // InternalCheckCfg.g:3283:3: lv_declaredFormalParameters_3_0= ruleJvmFormalParameter
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getXShortClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_0_0_1_1_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleJvmFormalParameter_in_ruleXShortClosure7960);
+                    	    pushFollow(FOLLOW_51);
                     	    lv_declaredFormalParameters_3_0=ruleJvmFormalParameter();
 
                     	    state._fsp--;
@@ -9781,7 +9781,7 @@ public final EObject ruleXShortClosure() throws RecognitionException {
                     	             			current, 
                     	             			"declaredFormalParameters",
                     	              		lv_declaredFormalParameters_3_0, 
-                    	              		"JvmFormalParameter");
+                    	              		"org.eclipse.xtext.xbase.Xbase.JvmFormalParameter");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -9806,13 +9806,13 @@ public final EObject ruleXShortClosure() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3299:6: ( (lv_explicitSyntax_4_0= '|' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3300:1: (lv_explicitSyntax_4_0= '|' )
+            // InternalCheckCfg.g:3299:6: ( (lv_explicitSyntax_4_0= '|' ) )
+            // InternalCheckCfg.g:3300:1: (lv_explicitSyntax_4_0= '|' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3300:1: (lv_explicitSyntax_4_0= '|' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3301:3: lv_explicitSyntax_4_0= '|'
+            // InternalCheckCfg.g:3300:1: (lv_explicitSyntax_4_0= '|' )
+            // InternalCheckCfg.g:3301:3: lv_explicitSyntax_4_0= '|'
             {
-            lv_explicitSyntax_4_0=(Token)match(input,60,FOLLOW_60_in_ruleXShortClosure7982); if (state.failed) return current;
+            lv_explicitSyntax_4_0=(Token)match(input,60,FOLLOW_20); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                       newLeafNode(lv_explicitSyntax_4_0, grammarAccess.getXShortClosureAccess().getExplicitSyntaxVerticalLineKeyword_0_0_2_0());
@@ -9838,18 +9838,18 @@ public final EObject ruleXShortClosure() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3314:4: ( (lv_expression_5_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3315:1: (lv_expression_5_0= ruleXExpression )
+            // InternalCheckCfg.g:3314:4: ( (lv_expression_5_0= ruleXExpression ) )
+            // InternalCheckCfg.g:3315:1: (lv_expression_5_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3315:1: (lv_expression_5_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3316:3: lv_expression_5_0= ruleXExpression
+            // InternalCheckCfg.g:3315:1: (lv_expression_5_0= ruleXExpression )
+            // InternalCheckCfg.g:3316:3: lv_expression_5_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXShortClosureAccess().getExpressionXExpressionParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXShortClosure8018);
+            pushFollow(FOLLOW_2);
             lv_expression_5_0=ruleXExpression();
 
             state._fsp--;
@@ -9863,7 +9863,7 @@ public final EObject ruleXShortClosure() throws RecognitionException {
                      			current, 
                      			"expression",
                       		lv_expression_5_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -9896,7 +9896,7 @@ public final EObject ruleXShortClosure() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXParenthesizedExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3340:1: entryRuleXParenthesizedExpression returns [EObject current=null] : iv_ruleXParenthesizedExpression= ruleXParenthesizedExpression EOF ;
+    // InternalCheckCfg.g:3340:1: entryRuleXParenthesizedExpression returns [EObject current=null] : iv_ruleXParenthesizedExpression= ruleXParenthesizedExpression EOF ;
     public final EObject entryRuleXParenthesizedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -9904,13 +9904,13 @@ public final EObject entryRuleXParenthesizedExpression() throws RecognitionExcep
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3341:2: (iv_ruleXParenthesizedExpression= ruleXParenthesizedExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3342:2: iv_ruleXParenthesizedExpression= ruleXParenthesizedExpression EOF
+            // InternalCheckCfg.g:3341:2: (iv_ruleXParenthesizedExpression= ruleXParenthesizedExpression EOF )
+            // InternalCheckCfg.g:3342:2: iv_ruleXParenthesizedExpression= ruleXParenthesizedExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXParenthesizedExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXParenthesizedExpression_in_entryRuleXParenthesizedExpression8054);
+            pushFollow(FOLLOW_1);
             iv_ruleXParenthesizedExpression=ruleXParenthesizedExpression();
 
             state._fsp--;
@@ -9918,7 +9918,7 @@ public final EObject entryRuleXParenthesizedExpression() throws RecognitionExcep
             if ( state.backtracking==0 ) {
                current =iv_ruleXParenthesizedExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXParenthesizedExpression8064); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -9936,7 +9936,7 @@ public final EObject entryRuleXParenthesizedExpression() throws RecognitionExcep
 
 
     // $ANTLR start "ruleXParenthesizedExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3349:1: ruleXParenthesizedExpression returns [EObject current=null] : (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' ) ;
+    // InternalCheckCfg.g:3349:1: ruleXParenthesizedExpression returns [EObject current=null] : (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' ) ;
     public final EObject ruleXParenthesizedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -9948,13 +9948,13 @@ public final EObject ruleXParenthesizedExpression() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3352:28: ( (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3353:1: (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' )
+            // InternalCheckCfg.g:3352:28: ( (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' ) )
+            // InternalCheckCfg.g:3353:1: (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3353:1: (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3353:3: otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')'
+            // InternalCheckCfg.g:3353:1: (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' )
+            // InternalCheckCfg.g:3353:3: otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')'
             {
-            otherlv_0=(Token)match(input,19,FOLLOW_19_in_ruleXParenthesizedExpression8101); if (state.failed) return current;
+            otherlv_0=(Token)match(input,19,FOLLOW_20); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getXParenthesizedExpressionAccess().getLeftParenthesisKeyword_0());
@@ -9965,7 +9965,7 @@ public final EObject ruleXParenthesizedExpression() throws RecognitionException
                       newCompositeNode(grammarAccess.getXParenthesizedExpressionAccess().getXExpressionParserRuleCall_1()); 
                   
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXParenthesizedExpression8123);
+            pushFollow(FOLLOW_45);
             this_XExpression_1=ruleXExpression();
 
             state._fsp--;
@@ -9976,7 +9976,7 @@ public final EObject ruleXParenthesizedExpression() throws RecognitionException
                       afterParserOrEnumRuleCall();
                   
             }
-            otherlv_2=(Token)match(input,21,FOLLOW_21_in_ruleXParenthesizedExpression8134); if (state.failed) return current;
+            otherlv_2=(Token)match(input,21,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getXParenthesizedExpressionAccess().getRightParenthesisKeyword_2());
@@ -10005,7 +10005,7 @@ public final EObject ruleXParenthesizedExpression() throws RecognitionException
 
 
     // $ANTLR start "entryRuleXIfExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3378:1: entryRuleXIfExpression returns [EObject current=null] : iv_ruleXIfExpression= ruleXIfExpression EOF ;
+    // InternalCheckCfg.g:3378:1: entryRuleXIfExpression returns [EObject current=null] : iv_ruleXIfExpression= ruleXIfExpression EOF ;
     public final EObject entryRuleXIfExpression() throws RecognitionException {
         EObject current = null;
 
@@ -10013,13 +10013,13 @@ public final EObject entryRuleXIfExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3379:2: (iv_ruleXIfExpression= ruleXIfExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3380:2: iv_ruleXIfExpression= ruleXIfExpression EOF
+            // InternalCheckCfg.g:3379:2: (iv_ruleXIfExpression= ruleXIfExpression EOF )
+            // InternalCheckCfg.g:3380:2: iv_ruleXIfExpression= ruleXIfExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXIfExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXIfExpression_in_entryRuleXIfExpression8170);
+            pushFollow(FOLLOW_1);
             iv_ruleXIfExpression=ruleXIfExpression();
 
             state._fsp--;
@@ -10027,7 +10027,7 @@ public final EObject entryRuleXIfExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXIfExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXIfExpression8180); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -10045,7 +10045,7 @@ public final EObject entryRuleXIfExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXIfExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3387:1: ruleXIfExpression returns [EObject current=null] : ( () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )? ) ;
+    // InternalCheckCfg.g:3387:1: ruleXIfExpression returns [EObject current=null] : ( () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )? ) ;
     public final EObject ruleXIfExpression() throws RecognitionException {
         EObject current = null;
 
@@ -10063,14 +10063,14 @@ public final EObject ruleXIfExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3390:28: ( ( () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3391:1: ( () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )? )
+            // InternalCheckCfg.g:3390:28: ( ( () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )? ) )
+            // InternalCheckCfg.g:3391:1: ( () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3391:1: ( () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )? )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3391:2: () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )?
+            // InternalCheckCfg.g:3391:1: ( () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )? )
+            // InternalCheckCfg.g:3391:2: () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )?
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3391:2: ()
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3392:5: 
+            // InternalCheckCfg.g:3391:2: ()
+            // InternalCheckCfg.g:3392:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -10082,30 +10082,30 @@ public final EObject ruleXIfExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,62,FOLLOW_62_in_ruleXIfExpression8226); if (state.failed) return current;
+            otherlv_1=(Token)match(input,62,FOLLOW_56); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXIfExpressionAccess().getIfKeyword_1());
                   
             }
-            otherlv_2=(Token)match(input,19,FOLLOW_19_in_ruleXIfExpression8238); if (state.failed) return current;
+            otherlv_2=(Token)match(input,19,FOLLOW_20); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getXIfExpressionAccess().getLeftParenthesisKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3405:1: ( (lv_if_3_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3406:1: (lv_if_3_0= ruleXExpression )
+            // InternalCheckCfg.g:3405:1: ( (lv_if_3_0= ruleXExpression ) )
+            // InternalCheckCfg.g:3406:1: (lv_if_3_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3406:1: (lv_if_3_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3407:3: lv_if_3_0= ruleXExpression
+            // InternalCheckCfg.g:3406:1: (lv_if_3_0= ruleXExpression )
+            // InternalCheckCfg.g:3407:3: lv_if_3_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXIfExpressionAccess().getIfXExpressionParserRuleCall_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXIfExpression8259);
+            pushFollow(FOLLOW_45);
             lv_if_3_0=ruleXExpression();
 
             state._fsp--;
@@ -10119,7 +10119,7 @@ public final EObject ruleXIfExpression() throws RecognitionException {
                      			current, 
                      			"if",
                       		lv_if_3_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -10129,24 +10129,24 @@ public final EObject ruleXIfExpression() throws RecognitionException {
 
             }
 
-            otherlv_4=(Token)match(input,21,FOLLOW_21_in_ruleXIfExpression8271); if (state.failed) return current;
+            otherlv_4=(Token)match(input,21,FOLLOW_20); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_4, grammarAccess.getXIfExpressionAccess().getRightParenthesisKeyword_4());
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3427:1: ( (lv_then_5_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3428:1: (lv_then_5_0= ruleXExpression )
+            // InternalCheckCfg.g:3427:1: ( (lv_then_5_0= ruleXExpression ) )
+            // InternalCheckCfg.g:3428:1: (lv_then_5_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3428:1: (lv_then_5_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3429:3: lv_then_5_0= ruleXExpression
+            // InternalCheckCfg.g:3428:1: (lv_then_5_0= ruleXExpression )
+            // InternalCheckCfg.g:3429:3: lv_then_5_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXIfExpressionAccess().getThenXExpressionParserRuleCall_5_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXIfExpression8292);
+            pushFollow(FOLLOW_57);
             lv_then_5_0=ruleXExpression();
 
             state._fsp--;
@@ -10160,7 +10160,7 @@ public final EObject ruleXIfExpression() throws RecognitionException {
                      			current, 
                      			"then",
                       		lv_then_5_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -10170,7 +10170,7 @@ public final EObject ruleXIfExpression() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3445:2: ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )?
+            // InternalCheckCfg.g:3445:2: ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )?
             int alt62=2;
             int LA62_0 = input.LA(1);
 
@@ -10183,12 +10183,12 @@ public final EObject ruleXIfExpression() throws RecognitionException {
             }
             switch (alt62) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3445:3: ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) )
+                    // InternalCheckCfg.g:3445:3: ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3445:3: ( ( 'else' )=>otherlv_6= 'else' )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3445:4: ( 'else' )=>otherlv_6= 'else'
+                    // InternalCheckCfg.g:3445:3: ( ( 'else' )=>otherlv_6= 'else' )
+                    // InternalCheckCfg.g:3445:4: ( 'else' )=>otherlv_6= 'else'
                     {
-                    otherlv_6=(Token)match(input,63,FOLLOW_63_in_ruleXIfExpression8313); if (state.failed) return current;
+                    otherlv_6=(Token)match(input,63,FOLLOW_20); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_6, grammarAccess.getXIfExpressionAccess().getElseKeyword_6_0());
@@ -10197,18 +10197,18 @@ public final EObject ruleXIfExpression() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3450:2: ( (lv_else_7_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3451:1: (lv_else_7_0= ruleXExpression )
+                    // InternalCheckCfg.g:3450:2: ( (lv_else_7_0= ruleXExpression ) )
+                    // InternalCheckCfg.g:3451:1: (lv_else_7_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3451:1: (lv_else_7_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3452:3: lv_else_7_0= ruleXExpression
+                    // InternalCheckCfg.g:3451:1: (lv_else_7_0= ruleXExpression )
+                    // InternalCheckCfg.g:3452:3: lv_else_7_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXIfExpressionAccess().getElseXExpressionParserRuleCall_6_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXIfExpression8335);
+                    pushFollow(FOLLOW_2);
                     lv_else_7_0=ruleXExpression();
 
                     state._fsp--;
@@ -10222,7 +10222,7 @@ public final EObject ruleXIfExpression() throws RecognitionException {
                              			current, 
                              			"else",
                               		lv_else_7_0, 
-                              		"XExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -10261,7 +10261,7 @@ public final EObject ruleXIfExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXSwitchExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3476:1: entryRuleXSwitchExpression returns [EObject current=null] : iv_ruleXSwitchExpression= ruleXSwitchExpression EOF ;
+    // InternalCheckCfg.g:3476:1: entryRuleXSwitchExpression returns [EObject current=null] : iv_ruleXSwitchExpression= ruleXSwitchExpression EOF ;
     public final EObject entryRuleXSwitchExpression() throws RecognitionException {
         EObject current = null;
 
@@ -10269,13 +10269,13 @@ public final EObject entryRuleXSwitchExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3477:2: (iv_ruleXSwitchExpression= ruleXSwitchExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3478:2: iv_ruleXSwitchExpression= ruleXSwitchExpression EOF
+            // InternalCheckCfg.g:3477:2: (iv_ruleXSwitchExpression= ruleXSwitchExpression EOF )
+            // InternalCheckCfg.g:3478:2: iv_ruleXSwitchExpression= ruleXSwitchExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXSwitchExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXSwitchExpression_in_entryRuleXSwitchExpression8373);
+            pushFollow(FOLLOW_1);
             iv_ruleXSwitchExpression=ruleXSwitchExpression();
 
             state._fsp--;
@@ -10283,7 +10283,7 @@ public final EObject entryRuleXSwitchExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXSwitchExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXSwitchExpression8383); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -10301,7 +10301,7 @@ public final EObject entryRuleXSwitchExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXSwitchExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3485:1: ruleXSwitchExpression returns [EObject current=null] : ( () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}' ) ;
+    // InternalCheckCfg.g:3485:1: ruleXSwitchExpression returns [EObject current=null] : ( () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}' ) ;
     public final EObject ruleXSwitchExpression() throws RecognitionException {
         EObject current = null;
 
@@ -10330,14 +10330,14 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3488:28: ( ( () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3489:1: ( () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}' )
+            // InternalCheckCfg.g:3488:28: ( ( () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}' ) )
+            // InternalCheckCfg.g:3489:1: ( () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3489:1: ( () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3489:2: () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}'
+            // InternalCheckCfg.g:3489:1: ( () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}' )
+            // InternalCheckCfg.g:3489:2: () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}'
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3489:2: ()
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3490:5: 
+            // InternalCheckCfg.g:3489:2: ()
+            // InternalCheckCfg.g:3490:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -10349,46 +10349,46 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,64,FOLLOW_64_in_ruleXSwitchExpression8429); if (state.failed) return current;
+            otherlv_1=(Token)match(input,64,FOLLOW_58); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXSwitchExpressionAccess().getSwitchKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3499:1: ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) )
+            // InternalCheckCfg.g:3499:1: ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) )
             int alt64=2;
             alt64 = dfa64.predict(input);
             switch (alt64) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3499:2: ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' )
+                    // InternalCheckCfg.g:3499:2: ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3499:2: ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3499:3: ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')'
+                    // InternalCheckCfg.g:3499:2: ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' )
+                    // InternalCheckCfg.g:3499:3: ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')'
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3499:3: ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3499:4: ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
+                    // InternalCheckCfg.g:3499:3: ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) )
+                    // InternalCheckCfg.g:3499:4: ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3505:5: (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3505:7: otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':'
+                    // InternalCheckCfg.g:3505:5: (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
+                    // InternalCheckCfg.g:3505:7: otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':'
                     {
-                    otherlv_2=(Token)match(input,19,FOLLOW_19_in_ruleXSwitchExpression8467); if (state.failed) return current;
+                    otherlv_2=(Token)match(input,19,FOLLOW_29); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_2, grammarAccess.getXSwitchExpressionAccess().getLeftParenthesisKeyword_2_0_0_0_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3509:1: ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3510:1: (lv_declaredParam_3_0= ruleJvmFormalParameter )
+                    // InternalCheckCfg.g:3509:1: ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) )
+                    // InternalCheckCfg.g:3510:1: (lv_declaredParam_3_0= ruleJvmFormalParameter )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3510:1: (lv_declaredParam_3_0= ruleJvmFormalParameter )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3511:3: lv_declaredParam_3_0= ruleJvmFormalParameter
+                    // InternalCheckCfg.g:3510:1: (lv_declaredParam_3_0= ruleJvmFormalParameter )
+                    // InternalCheckCfg.g:3511:3: lv_declaredParam_3_0= ruleJvmFormalParameter
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXSwitchExpressionAccess().getDeclaredParamJvmFormalParameterParserRuleCall_2_0_0_0_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleJvmFormalParameter_in_ruleXSwitchExpression8488);
+                    pushFollow(FOLLOW_59);
                     lv_declaredParam_3_0=ruleJvmFormalParameter();
 
                     state._fsp--;
@@ -10402,7 +10402,7 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
                              			current, 
                              			"declaredParam",
                               		lv_declaredParam_3_0, 
-                              		"JvmFormalParameter");
+                              		"org.eclipse.xtext.xbase.Xbase.JvmFormalParameter");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -10412,7 +10412,7 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
 
                     }
 
-                    otherlv_4=(Token)match(input,65,FOLLOW_65_in_ruleXSwitchExpression8500); if (state.failed) return current;
+                    otherlv_4=(Token)match(input,65,FOLLOW_20); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_4, grammarAccess.getXSwitchExpressionAccess().getColonKeyword_2_0_0_0_2());
@@ -10424,18 +10424,18 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3531:3: ( (lv_switch_5_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3532:1: (lv_switch_5_0= ruleXExpression )
+                    // InternalCheckCfg.g:3531:3: ( (lv_switch_5_0= ruleXExpression ) )
+                    // InternalCheckCfg.g:3532:1: (lv_switch_5_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3532:1: (lv_switch_5_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3533:3: lv_switch_5_0= ruleXExpression
+                    // InternalCheckCfg.g:3532:1: (lv_switch_5_0= ruleXExpression )
+                    // InternalCheckCfg.g:3533:3: lv_switch_5_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXSwitchExpressionAccess().getSwitchXExpressionParserRuleCall_2_0_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXSwitchExpression8523);
+                    pushFollow(FOLLOW_45);
                     lv_switch_5_0=ruleXExpression();
 
                     state._fsp--;
@@ -10449,7 +10449,7 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
                              			current, 
                              			"switch",
                               		lv_switch_5_0, 
-                              		"XExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -10459,7 +10459,7 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
 
                     }
 
-                    otherlv_6=(Token)match(input,21,FOLLOW_21_in_ruleXSwitchExpression8535); if (state.failed) return current;
+                    otherlv_6=(Token)match(input,21,FOLLOW_8); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_6, grammarAccess.getXSwitchExpressionAccess().getRightParenthesisKeyword_2_0_2());
@@ -10472,33 +10472,33 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3554:6: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) )
+                    // InternalCheckCfg.g:3554:6: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3554:6: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3554:7: ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) )
+                    // InternalCheckCfg.g:3554:6: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) )
+                    // InternalCheckCfg.g:3554:7: ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3554:7: ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )?
+                    // InternalCheckCfg.g:3554:7: ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )?
                     int alt63=2;
                     alt63 = dfa63.predict(input);
                     switch (alt63) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3554:8: ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' )
+                            // InternalCheckCfg.g:3554:8: ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' )
                             {
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3559:5: ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' )
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3559:6: ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':'
+                            // InternalCheckCfg.g:3559:5: ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' )
+                            // InternalCheckCfg.g:3559:6: ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':'
                             {
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3559:6: ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) )
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3560:1: (lv_declaredParam_7_0= ruleJvmFormalParameter )
+                            // InternalCheckCfg.g:3559:6: ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) )
+                            // InternalCheckCfg.g:3560:1: (lv_declaredParam_7_0= ruleJvmFormalParameter )
                             {
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3560:1: (lv_declaredParam_7_0= ruleJvmFormalParameter )
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3561:3: lv_declaredParam_7_0= ruleJvmFormalParameter
+                            // InternalCheckCfg.g:3560:1: (lv_declaredParam_7_0= ruleJvmFormalParameter )
+                            // InternalCheckCfg.g:3561:3: lv_declaredParam_7_0= ruleJvmFormalParameter
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXSwitchExpressionAccess().getDeclaredParamJvmFormalParameterParserRuleCall_2_1_0_0_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleJvmFormalParameter_in_ruleXSwitchExpression8584);
+                            pushFollow(FOLLOW_59);
                             lv_declaredParam_7_0=ruleJvmFormalParameter();
 
                             state._fsp--;
@@ -10512,7 +10512,7 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
                                      			current, 
                                      			"declaredParam",
                                       		lv_declaredParam_7_0, 
-                                      		"JvmFormalParameter");
+                                      		"org.eclipse.xtext.xbase.Xbase.JvmFormalParameter");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -10522,7 +10522,7 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
 
                             }
 
-                            otherlv_8=(Token)match(input,65,FOLLOW_65_in_ruleXSwitchExpression8596); if (state.failed) return current;
+                            otherlv_8=(Token)match(input,65,FOLLOW_20); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                   	newLeafNode(otherlv_8, grammarAccess.getXSwitchExpressionAccess().getColonKeyword_2_1_0_0_1());
@@ -10537,18 +10537,18 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3581:4: ( (lv_switch_9_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3582:1: (lv_switch_9_0= ruleXExpression )
+                    // InternalCheckCfg.g:3581:4: ( (lv_switch_9_0= ruleXExpression ) )
+                    // InternalCheckCfg.g:3582:1: (lv_switch_9_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3582:1: (lv_switch_9_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3583:3: lv_switch_9_0= ruleXExpression
+                    // InternalCheckCfg.g:3582:1: (lv_switch_9_0= ruleXExpression )
+                    // InternalCheckCfg.g:3583:3: lv_switch_9_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXSwitchExpressionAccess().getSwitchXExpressionParserRuleCall_2_1_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXSwitchExpression8620);
+                    pushFollow(FOLLOW_8);
                     lv_switch_9_0=ruleXExpression();
 
                     state._fsp--;
@@ -10562,7 +10562,7 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
                              			current, 
                              			"switch",
                               		lv_switch_9_0, 
-                              		"XExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -10581,13 +10581,13 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
 
             }
 
-            otherlv_10=(Token)match(input,15,FOLLOW_15_in_ruleXSwitchExpression8634); if (state.failed) return current;
+            otherlv_10=(Token)match(input,15,FOLLOW_60); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_10, grammarAccess.getXSwitchExpressionAccess().getLeftCurlyBracketKeyword_3());
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3603:1: ( (lv_cases_11_0= ruleXCasePart ) )*
+            // InternalCheckCfg.g:3603:1: ( (lv_cases_11_0= ruleXCasePart ) )*
             loop65:
             do {
                 int alt65=2;
@@ -10600,17 +10600,17 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
 
                 switch (alt65) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3604:1: (lv_cases_11_0= ruleXCasePart )
+            	    // InternalCheckCfg.g:3604:1: (lv_cases_11_0= ruleXCasePart )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3604:1: (lv_cases_11_0= ruleXCasePart )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3605:3: lv_cases_11_0= ruleXCasePart
+            	    // InternalCheckCfg.g:3604:1: (lv_cases_11_0= ruleXCasePart )
+            	    // InternalCheckCfg.g:3605:3: lv_cases_11_0= ruleXCasePart
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXSwitchExpressionAccess().getCasesXCasePartParserRuleCall_4_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXCasePart_in_ruleXSwitchExpression8655);
+            	    pushFollow(FOLLOW_60);
             	    lv_cases_11_0=ruleXCasePart();
 
             	    state._fsp--;
@@ -10624,7 +10624,7 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
             	             			current, 
             	             			"cases",
             	              		lv_cases_11_0, 
-            	              		"XCasePart");
+            	              		"org.eclipse.xtext.xbase.Xbase.XCasePart");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -10640,7 +10640,7 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
                 }
             } while (true);
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3621:3: (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )?
+            // InternalCheckCfg.g:3621:3: (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )?
             int alt66=2;
             int LA66_0 = input.LA(1);
 
@@ -10649,32 +10649,32 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
             }
             switch (alt66) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3621:5: otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) )
+                    // InternalCheckCfg.g:3621:5: otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) )
                     {
-                    otherlv_12=(Token)match(input,66,FOLLOW_66_in_ruleXSwitchExpression8669); if (state.failed) return current;
+                    otherlv_12=(Token)match(input,66,FOLLOW_59); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_12, grammarAccess.getXSwitchExpressionAccess().getDefaultKeyword_5_0());
                           
                     }
-                    otherlv_13=(Token)match(input,65,FOLLOW_65_in_ruleXSwitchExpression8681); if (state.failed) return current;
+                    otherlv_13=(Token)match(input,65,FOLLOW_20); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_13, grammarAccess.getXSwitchExpressionAccess().getColonKeyword_5_1());
                           
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3629:1: ( (lv_default_14_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3630:1: (lv_default_14_0= ruleXExpression )
+                    // InternalCheckCfg.g:3629:1: ( (lv_default_14_0= ruleXExpression ) )
+                    // InternalCheckCfg.g:3630:1: (lv_default_14_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3630:1: (lv_default_14_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3631:3: lv_default_14_0= ruleXExpression
+                    // InternalCheckCfg.g:3630:1: (lv_default_14_0= ruleXExpression )
+                    // InternalCheckCfg.g:3631:3: lv_default_14_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXSwitchExpressionAccess().getDefaultXExpressionParserRuleCall_5_2_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXSwitchExpression8702);
+                    pushFollow(FOLLOW_61);
                     lv_default_14_0=ruleXExpression();
 
                     state._fsp--;
@@ -10688,7 +10688,7 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
                              			current, 
                              			"default",
                               		lv_default_14_0, 
-                              		"XExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -10704,7 +10704,7 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
 
             }
 
-            otherlv_15=(Token)match(input,16,FOLLOW_16_in_ruleXSwitchExpression8716); if (state.failed) return current;
+            otherlv_15=(Token)match(input,16,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_15, grammarAccess.getXSwitchExpressionAccess().getRightCurlyBracketKeyword_6());
@@ -10733,7 +10733,7 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXCasePart"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3659:1: entryRuleXCasePart returns [EObject current=null] : iv_ruleXCasePart= ruleXCasePart EOF ;
+    // InternalCheckCfg.g:3659:1: entryRuleXCasePart returns [EObject current=null] : iv_ruleXCasePart= ruleXCasePart EOF ;
     public final EObject entryRuleXCasePart() throws RecognitionException {
         EObject current = null;
 
@@ -10741,13 +10741,13 @@ public final EObject entryRuleXCasePart() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3660:2: (iv_ruleXCasePart= ruleXCasePart EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3661:2: iv_ruleXCasePart= ruleXCasePart EOF
+            // InternalCheckCfg.g:3660:2: (iv_ruleXCasePart= ruleXCasePart EOF )
+            // InternalCheckCfg.g:3661:2: iv_ruleXCasePart= ruleXCasePart EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXCasePartRule()); 
             }
-            pushFollow(FOLLOW_ruleXCasePart_in_entryRuleXCasePart8752);
+            pushFollow(FOLLOW_1);
             iv_ruleXCasePart=ruleXCasePart();
 
             state._fsp--;
@@ -10755,7 +10755,7 @@ public final EObject entryRuleXCasePart() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXCasePart; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXCasePart8762); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -10773,7 +10773,7 @@ public final EObject entryRuleXCasePart() throws RecognitionException {
 
 
     // $ANTLR start "ruleXCasePart"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3668:1: ruleXCasePart returns [EObject current=null] : ( () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) ) ) ;
+    // InternalCheckCfg.g:3668:1: ruleXCasePart returns [EObject current=null] : ( () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) ) ) ;
     public final EObject ruleXCasePart() throws RecognitionException {
         EObject current = null;
 
@@ -10790,14 +10790,14 @@ public final EObject ruleXCasePart() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3671:28: ( ( () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3672:1: ( () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) ) )
+            // InternalCheckCfg.g:3671:28: ( ( () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) ) ) )
+            // InternalCheckCfg.g:3672:1: ( () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3672:1: ( () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3672:2: () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) )
+            // InternalCheckCfg.g:3672:1: ( () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) ) )
+            // InternalCheckCfg.g:3672:2: () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3672:2: ()
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3673:5: 
+            // InternalCheckCfg.g:3672:2: ()
+            // InternalCheckCfg.g:3673:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -10809,7 +10809,7 @@ public final EObject ruleXCasePart() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3678:2: ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )?
+            // InternalCheckCfg.g:3678:2: ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )?
             int alt67=2;
             int LA67_0 = input.LA(1);
 
@@ -10818,17 +10818,17 @@ public final EObject ruleXCasePart() throws RecognitionException {
             }
             switch (alt67) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3679:1: (lv_typeGuard_1_0= ruleJvmTypeReference )
+                    // InternalCheckCfg.g:3679:1: (lv_typeGuard_1_0= ruleJvmTypeReference )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3679:1: (lv_typeGuard_1_0= ruleJvmTypeReference )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3680:3: lv_typeGuard_1_0= ruleJvmTypeReference
+                    // InternalCheckCfg.g:3679:1: (lv_typeGuard_1_0= ruleJvmTypeReference )
+                    // InternalCheckCfg.g:3680:3: lv_typeGuard_1_0= ruleJvmTypeReference
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXCasePartAccess().getTypeGuardJvmTypeReferenceParserRuleCall_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleXCasePart8817);
+                    pushFollow(FOLLOW_62);
                     lv_typeGuard_1_0=ruleJvmTypeReference();
 
                     state._fsp--;
@@ -10842,7 +10842,7 @@ public final EObject ruleXCasePart() throws RecognitionException {
                              			current, 
                              			"typeGuard",
                               		lv_typeGuard_1_0, 
-                              		"JvmTypeReference");
+                              		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -10855,7 +10855,7 @@ public final EObject ruleXCasePart() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3696:3: (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )?
+            // InternalCheckCfg.g:3696:3: (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )?
             int alt68=2;
             int LA68_0 = input.LA(1);
 
@@ -10864,26 +10864,26 @@ public final EObject ruleXCasePart() throws RecognitionException {
             }
             switch (alt68) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3696:5: otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) )
+                    // InternalCheckCfg.g:3696:5: otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) )
                     {
-                    otherlv_2=(Token)match(input,67,FOLLOW_67_in_ruleXCasePart8831); if (state.failed) return current;
+                    otherlv_2=(Token)match(input,67,FOLLOW_20); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_2, grammarAccess.getXCasePartAccess().getCaseKeyword_2_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3700:1: ( (lv_case_3_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3701:1: (lv_case_3_0= ruleXExpression )
+                    // InternalCheckCfg.g:3700:1: ( (lv_case_3_0= ruleXExpression ) )
+                    // InternalCheckCfg.g:3701:1: (lv_case_3_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3701:1: (lv_case_3_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3702:3: lv_case_3_0= ruleXExpression
+                    // InternalCheckCfg.g:3701:1: (lv_case_3_0= ruleXExpression )
+                    // InternalCheckCfg.g:3702:3: lv_case_3_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXCasePartAccess().getCaseXExpressionParserRuleCall_2_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXCasePart8852);
+                    pushFollow(FOLLOW_63);
                     lv_case_3_0=ruleXExpression();
 
                     state._fsp--;
@@ -10897,7 +10897,7 @@ public final EObject ruleXCasePart() throws RecognitionException {
                              			current, 
                              			"case",
                               		lv_case_3_0, 
-                              		"XExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -10913,7 +10913,7 @@ public final EObject ruleXCasePart() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3718:4: ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) )
+            // InternalCheckCfg.g:3718:4: ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) )
             int alt69=2;
             int LA69_0 = input.LA(1);
 
@@ -10932,29 +10932,29 @@ else if ( (LA69_0==20) ) {
             }
             switch (alt69) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3718:5: (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) )
+                    // InternalCheckCfg.g:3718:5: (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3718:5: (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3718:7: otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) )
+                    // InternalCheckCfg.g:3718:5: (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) )
+                    // InternalCheckCfg.g:3718:7: otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) )
                     {
-                    otherlv_4=(Token)match(input,65,FOLLOW_65_in_ruleXCasePart8868); if (state.failed) return current;
+                    otherlv_4=(Token)match(input,65,FOLLOW_20); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_4, grammarAccess.getXCasePartAccess().getColonKeyword_3_0_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3722:1: ( (lv_then_5_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3723:1: (lv_then_5_0= ruleXExpression )
+                    // InternalCheckCfg.g:3722:1: ( (lv_then_5_0= ruleXExpression ) )
+                    // InternalCheckCfg.g:3723:1: (lv_then_5_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3723:1: (lv_then_5_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3724:3: lv_then_5_0= ruleXExpression
+                    // InternalCheckCfg.g:3723:1: (lv_then_5_0= ruleXExpression )
+                    // InternalCheckCfg.g:3724:3: lv_then_5_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXCasePartAccess().getThenXExpressionParserRuleCall_3_0_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXCasePart8889);
+                    pushFollow(FOLLOW_2);
                     lv_then_5_0=ruleXExpression();
 
                     state._fsp--;
@@ -10968,7 +10968,7 @@ else if ( (LA69_0==20) ) {
                              			current, 
                              			"then",
                               		lv_then_5_0, 
-                              		"XExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -10985,15 +10985,15 @@ else if ( (LA69_0==20) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3741:6: ( (lv_fallThrough_6_0= ',' ) )
+                    // InternalCheckCfg.g:3741:6: ( (lv_fallThrough_6_0= ',' ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3741:6: ( (lv_fallThrough_6_0= ',' ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3742:1: (lv_fallThrough_6_0= ',' )
+                    // InternalCheckCfg.g:3741:6: ( (lv_fallThrough_6_0= ',' ) )
+                    // InternalCheckCfg.g:3742:1: (lv_fallThrough_6_0= ',' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3742:1: (lv_fallThrough_6_0= ',' )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3743:3: lv_fallThrough_6_0= ','
+                    // InternalCheckCfg.g:3742:1: (lv_fallThrough_6_0= ',' )
+                    // InternalCheckCfg.g:3743:3: lv_fallThrough_6_0= ','
                     {
-                    lv_fallThrough_6_0=(Token)match(input,20,FOLLOW_20_in_ruleXCasePart8914); if (state.failed) return current;
+                    lv_fallThrough_6_0=(Token)match(input,20,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_fallThrough_6_0, grammarAccess.getXCasePartAccess().getFallThroughCommaKeyword_3_1_0());
@@ -11042,7 +11042,7 @@ else if ( (LA69_0==20) ) {
 
 
     // $ANTLR start "entryRuleXForLoopExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3764:1: entryRuleXForLoopExpression returns [EObject current=null] : iv_ruleXForLoopExpression= ruleXForLoopExpression EOF ;
+    // InternalCheckCfg.g:3764:1: entryRuleXForLoopExpression returns [EObject current=null] : iv_ruleXForLoopExpression= ruleXForLoopExpression EOF ;
     public final EObject entryRuleXForLoopExpression() throws RecognitionException {
         EObject current = null;
 
@@ -11050,13 +11050,13 @@ public final EObject entryRuleXForLoopExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3765:2: (iv_ruleXForLoopExpression= ruleXForLoopExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3766:2: iv_ruleXForLoopExpression= ruleXForLoopExpression EOF
+            // InternalCheckCfg.g:3765:2: (iv_ruleXForLoopExpression= ruleXForLoopExpression EOF )
+            // InternalCheckCfg.g:3766:2: iv_ruleXForLoopExpression= ruleXForLoopExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXForLoopExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXForLoopExpression_in_entryRuleXForLoopExpression8964);
+            pushFollow(FOLLOW_1);
             iv_ruleXForLoopExpression=ruleXForLoopExpression();
 
             state._fsp--;
@@ -11064,7 +11064,7 @@ public final EObject entryRuleXForLoopExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXForLoopExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXForLoopExpression8974); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -11082,7 +11082,7 @@ public final EObject entryRuleXForLoopExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXForLoopExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3773:1: ruleXForLoopExpression returns [EObject current=null] : ( ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) ) ) ;
+    // InternalCheckCfg.g:3773:1: ruleXForLoopExpression returns [EObject current=null] : ( ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) ) ) ;
     public final EObject ruleXForLoopExpression() throws RecognitionException {
         EObject current = null;
 
@@ -11100,20 +11100,20 @@ public final EObject ruleXForLoopExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3776:28: ( ( ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3777:1: ( ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) ) )
+            // InternalCheckCfg.g:3776:28: ( ( ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) ) ) )
+            // InternalCheckCfg.g:3777:1: ( ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3777:1: ( ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3777:2: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) )
+            // InternalCheckCfg.g:3777:1: ( ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) ) )
+            // InternalCheckCfg.g:3777:2: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3777:2: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3777:3: ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
+            // InternalCheckCfg.g:3777:2: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) )
+            // InternalCheckCfg.g:3777:3: ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3785:5: ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3785:6: () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':'
+            // InternalCheckCfg.g:3785:5: ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
+            // InternalCheckCfg.g:3785:6: () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':'
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3785:6: ()
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3786:5: 
+            // InternalCheckCfg.g:3785:6: ()
+            // InternalCheckCfg.g:3786:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -11125,30 +11125,30 @@ public final EObject ruleXForLoopExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,17,FOLLOW_17_in_ruleXForLoopExpression9051); if (state.failed) return current;
+            otherlv_1=(Token)match(input,17,FOLLOW_56); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXForLoopExpressionAccess().getForKeyword_0_0_1());
                   
             }
-            otherlv_2=(Token)match(input,19,FOLLOW_19_in_ruleXForLoopExpression9063); if (state.failed) return current;
+            otherlv_2=(Token)match(input,19,FOLLOW_29); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getXForLoopExpressionAccess().getLeftParenthesisKeyword_0_0_2());
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3799:1: ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3800:1: (lv_declaredParam_3_0= ruleJvmFormalParameter )
+            // InternalCheckCfg.g:3799:1: ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) )
+            // InternalCheckCfg.g:3800:1: (lv_declaredParam_3_0= ruleJvmFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3800:1: (lv_declaredParam_3_0= ruleJvmFormalParameter )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3801:3: lv_declaredParam_3_0= ruleJvmFormalParameter
+            // InternalCheckCfg.g:3800:1: (lv_declaredParam_3_0= ruleJvmFormalParameter )
+            // InternalCheckCfg.g:3801:3: lv_declaredParam_3_0= ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXForLoopExpressionAccess().getDeclaredParamJvmFormalParameterParserRuleCall_0_0_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleJvmFormalParameter_in_ruleXForLoopExpression9084);
+            pushFollow(FOLLOW_59);
             lv_declaredParam_3_0=ruleJvmFormalParameter();
 
             state._fsp--;
@@ -11162,7 +11162,7 @@ public final EObject ruleXForLoopExpression() throws RecognitionException {
                      			current, 
                      			"declaredParam",
                       		lv_declaredParam_3_0, 
-                      		"JvmFormalParameter");
+                      		"org.eclipse.xtext.xbase.Xbase.JvmFormalParameter");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -11172,7 +11172,7 @@ public final EObject ruleXForLoopExpression() throws RecognitionException {
 
             }
 
-            otherlv_4=(Token)match(input,65,FOLLOW_65_in_ruleXForLoopExpression9096); if (state.failed) return current;
+            otherlv_4=(Token)match(input,65,FOLLOW_20); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_4, grammarAccess.getXForLoopExpressionAccess().getColonKeyword_0_0_4());
@@ -11184,18 +11184,18 @@ public final EObject ruleXForLoopExpression() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3821:3: ( (lv_forExpression_5_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3822:1: (lv_forExpression_5_0= ruleXExpression )
+            // InternalCheckCfg.g:3821:3: ( (lv_forExpression_5_0= ruleXExpression ) )
+            // InternalCheckCfg.g:3822:1: (lv_forExpression_5_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3822:1: (lv_forExpression_5_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3823:3: lv_forExpression_5_0= ruleXExpression
+            // InternalCheckCfg.g:3822:1: (lv_forExpression_5_0= ruleXExpression )
+            // InternalCheckCfg.g:3823:3: lv_forExpression_5_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXForLoopExpressionAccess().getForExpressionXExpressionParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXForLoopExpression9119);
+            pushFollow(FOLLOW_45);
             lv_forExpression_5_0=ruleXExpression();
 
             state._fsp--;
@@ -11209,7 +11209,7 @@ public final EObject ruleXForLoopExpression() throws RecognitionException {
                      			current, 
                      			"forExpression",
                       		lv_forExpression_5_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -11219,24 +11219,24 @@ public final EObject ruleXForLoopExpression() throws RecognitionException {
 
             }
 
-            otherlv_6=(Token)match(input,21,FOLLOW_21_in_ruleXForLoopExpression9131); if (state.failed) return current;
+            otherlv_6=(Token)match(input,21,FOLLOW_20); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_6, grammarAccess.getXForLoopExpressionAccess().getRightParenthesisKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3843:1: ( (lv_eachExpression_7_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3844:1: (lv_eachExpression_7_0= ruleXExpression )
+            // InternalCheckCfg.g:3843:1: ( (lv_eachExpression_7_0= ruleXExpression ) )
+            // InternalCheckCfg.g:3844:1: (lv_eachExpression_7_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3844:1: (lv_eachExpression_7_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3845:3: lv_eachExpression_7_0= ruleXExpression
+            // InternalCheckCfg.g:3844:1: (lv_eachExpression_7_0= ruleXExpression )
+            // InternalCheckCfg.g:3845:3: lv_eachExpression_7_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXForLoopExpressionAccess().getEachExpressionXExpressionParserRuleCall_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXForLoopExpression9152);
+            pushFollow(FOLLOW_2);
             lv_eachExpression_7_0=ruleXExpression();
 
             state._fsp--;
@@ -11250,7 +11250,7 @@ public final EObject ruleXForLoopExpression() throws RecognitionException {
                      			current, 
                      			"eachExpression",
                       		lv_eachExpression_7_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -11283,7 +11283,7 @@ public final EObject ruleXForLoopExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXBasicForLoopExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3869:1: entryRuleXBasicForLoopExpression returns [EObject current=null] : iv_ruleXBasicForLoopExpression= ruleXBasicForLoopExpression EOF ;
+    // InternalCheckCfg.g:3869:1: entryRuleXBasicForLoopExpression returns [EObject current=null] : iv_ruleXBasicForLoopExpression= ruleXBasicForLoopExpression EOF ;
     public final EObject entryRuleXBasicForLoopExpression() throws RecognitionException {
         EObject current = null;
 
@@ -11291,13 +11291,13 @@ public final EObject entryRuleXBasicForLoopExpression() throws RecognitionExcept
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3870:2: (iv_ruleXBasicForLoopExpression= ruleXBasicForLoopExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3871:2: iv_ruleXBasicForLoopExpression= ruleXBasicForLoopExpression EOF
+            // InternalCheckCfg.g:3870:2: (iv_ruleXBasicForLoopExpression= ruleXBasicForLoopExpression EOF )
+            // InternalCheckCfg.g:3871:2: iv_ruleXBasicForLoopExpression= ruleXBasicForLoopExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXBasicForLoopExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXBasicForLoopExpression_in_entryRuleXBasicForLoopExpression9188);
+            pushFollow(FOLLOW_1);
             iv_ruleXBasicForLoopExpression=ruleXBasicForLoopExpression();
 
             state._fsp--;
@@ -11305,7 +11305,7 @@ public final EObject entryRuleXBasicForLoopExpression() throws RecognitionExcept
             if ( state.backtracking==0 ) {
                current =iv_ruleXBasicForLoopExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXBasicForLoopExpression9198); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -11323,7 +11323,7 @@ public final EObject entryRuleXBasicForLoopExpression() throws RecognitionExcept
 
 
     // $ANTLR start "ruleXBasicForLoopExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3878:1: ruleXBasicForLoopExpression returns [EObject current=null] : ( () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) ) ) ;
+    // InternalCheckCfg.g:3878:1: ruleXBasicForLoopExpression returns [EObject current=null] : ( () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) ) ) ;
     public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
         EObject current = null;
 
@@ -11350,14 +11350,14 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3881:28: ( ( () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3882:1: ( () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) ) )
+            // InternalCheckCfg.g:3881:28: ( ( () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) ) ) )
+            // InternalCheckCfg.g:3882:1: ( () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3882:1: ( () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3882:2: () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) )
+            // InternalCheckCfg.g:3882:1: ( () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) ) )
+            // InternalCheckCfg.g:3882:2: () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3882:2: ()
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3883:5: 
+            // InternalCheckCfg.g:3882:2: ()
+            // InternalCheckCfg.g:3883:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -11369,19 +11369,19 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,17,FOLLOW_17_in_ruleXBasicForLoopExpression9244); if (state.failed) return current;
+            otherlv_1=(Token)match(input,17,FOLLOW_56); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXBasicForLoopExpressionAccess().getForKeyword_1());
                   
             }
-            otherlv_2=(Token)match(input,19,FOLLOW_19_in_ruleXBasicForLoopExpression9256); if (state.failed) return current;
+            otherlv_2=(Token)match(input,19,FOLLOW_64); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getXBasicForLoopExpressionAccess().getLeftParenthesisKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3896:1: ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )?
+            // InternalCheckCfg.g:3896:1: ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )?
             int alt71=2;
             int LA71_0 = input.LA(1);
 
@@ -11390,20 +11390,20 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
             }
             switch (alt71) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3896:2: ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )*
+                    // InternalCheckCfg.g:3896:2: ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )*
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3896:2: ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3897:1: (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration )
+                    // InternalCheckCfg.g:3896:2: ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) )
+                    // InternalCheckCfg.g:3897:1: (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3897:1: (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3898:3: lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration
+                    // InternalCheckCfg.g:3897:1: (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration )
+                    // InternalCheckCfg.g:3898:3: lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXBasicForLoopExpressionAccess().getInitExpressionsXExpressionOrVarDeclarationParserRuleCall_3_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_ruleXBasicForLoopExpression9278);
+                    pushFollow(FOLLOW_65);
                     lv_initExpressions_3_0=ruleXExpressionOrVarDeclaration();
 
                     state._fsp--;
@@ -11417,7 +11417,7 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
                              			current, 
                              			"initExpressions",
                               		lv_initExpressions_3_0, 
-                              		"XExpressionOrVarDeclaration");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpressionOrVarDeclaration");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -11427,7 +11427,7 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3914:2: (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )*
+                    // InternalCheckCfg.g:3914:2: (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )*
                     loop70:
                     do {
                         int alt70=2;
@@ -11440,26 +11440,26 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
 
                         switch (alt70) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3914:4: otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) )
+                    	    // InternalCheckCfg.g:3914:4: otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) )
                     	    {
-                    	    otherlv_4=(Token)match(input,20,FOLLOW_20_in_ruleXBasicForLoopExpression9291); if (state.failed) return current;
+                    	    otherlv_4=(Token)match(input,20,FOLLOW_66); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_4, grammarAccess.getXBasicForLoopExpressionAccess().getCommaKeyword_3_1_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3918:1: ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) )
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3919:1: (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration )
+                    	    // InternalCheckCfg.g:3918:1: ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) )
+                    	    // InternalCheckCfg.g:3919:1: (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3919:1: (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration )
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3920:3: lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration
+                    	    // InternalCheckCfg.g:3919:1: (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration )
+                    	    // InternalCheckCfg.g:3920:3: lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getXBasicForLoopExpressionAccess().getInitExpressionsXExpressionOrVarDeclarationParserRuleCall_3_1_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_ruleXBasicForLoopExpression9312);
+                    	    pushFollow(FOLLOW_65);
                     	    lv_initExpressions_5_0=ruleXExpressionOrVarDeclaration();
 
                     	    state._fsp--;
@@ -11473,7 +11473,7 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
                     	             			current, 
                     	             			"initExpressions",
                     	              		lv_initExpressions_5_0, 
-                    	              		"XExpressionOrVarDeclaration");
+                    	              		"org.eclipse.xtext.xbase.Xbase.XExpressionOrVarDeclaration");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -11498,13 +11498,13 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
 
             }
 
-            otherlv_6=(Token)match(input,61,FOLLOW_61_in_ruleXBasicForLoopExpression9328); if (state.failed) return current;
+            otherlv_6=(Token)match(input,61,FOLLOW_67); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_6, grammarAccess.getXBasicForLoopExpressionAccess().getSemicolonKeyword_4());
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3940:1: ( (lv_expression_7_0= ruleXExpression ) )?
+            // InternalCheckCfg.g:3940:1: ( (lv_expression_7_0= ruleXExpression ) )?
             int alt72=2;
             int LA72_0 = input.LA(1);
 
@@ -11513,17 +11513,17 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
             }
             switch (alt72) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3941:1: (lv_expression_7_0= ruleXExpression )
+                    // InternalCheckCfg.g:3941:1: (lv_expression_7_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3941:1: (lv_expression_7_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3942:3: lv_expression_7_0= ruleXExpression
+                    // InternalCheckCfg.g:3941:1: (lv_expression_7_0= ruleXExpression )
+                    // InternalCheckCfg.g:3942:3: lv_expression_7_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXBasicForLoopExpressionAccess().getExpressionXExpressionParserRuleCall_5_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXBasicForLoopExpression9349);
+                    pushFollow(FOLLOW_68);
                     lv_expression_7_0=ruleXExpression();
 
                     state._fsp--;
@@ -11537,7 +11537,7 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
                              			current, 
                              			"expression",
                               		lv_expression_7_0, 
-                              		"XExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -11550,13 +11550,13 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
 
             }
 
-            otherlv_8=(Token)match(input,61,FOLLOW_61_in_ruleXBasicForLoopExpression9362); if (state.failed) return current;
+            otherlv_8=(Token)match(input,61,FOLLOW_69); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_8, grammarAccess.getXBasicForLoopExpressionAccess().getSemicolonKeyword_6());
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3962:1: ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )?
+            // InternalCheckCfg.g:3962:1: ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )?
             int alt74=2;
             int LA74_0 = input.LA(1);
 
@@ -11565,20 +11565,20 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
             }
             switch (alt74) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3962:2: ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )*
+                    // InternalCheckCfg.g:3962:2: ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )*
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3962:2: ( (lv_updateExpressions_9_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3963:1: (lv_updateExpressions_9_0= ruleXExpression )
+                    // InternalCheckCfg.g:3962:2: ( (lv_updateExpressions_9_0= ruleXExpression ) )
+                    // InternalCheckCfg.g:3963:1: (lv_updateExpressions_9_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3963:1: (lv_updateExpressions_9_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3964:3: lv_updateExpressions_9_0= ruleXExpression
+                    // InternalCheckCfg.g:3963:1: (lv_updateExpressions_9_0= ruleXExpression )
+                    // InternalCheckCfg.g:3964:3: lv_updateExpressions_9_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXBasicForLoopExpressionAccess().getUpdateExpressionsXExpressionParserRuleCall_7_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXBasicForLoopExpression9384);
+                    pushFollow(FOLLOW_13);
                     lv_updateExpressions_9_0=ruleXExpression();
 
                     state._fsp--;
@@ -11592,7 +11592,7 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
                              			current, 
                              			"updateExpressions",
                               		lv_updateExpressions_9_0, 
-                              		"XExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -11602,7 +11602,7 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3980:2: (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )*
+                    // InternalCheckCfg.g:3980:2: (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )*
                     loop73:
                     do {
                         int alt73=2;
@@ -11615,26 +11615,26 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
 
                         switch (alt73) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3980:4: otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) )
+                    	    // InternalCheckCfg.g:3980:4: otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) )
                     	    {
-                    	    otherlv_10=(Token)match(input,20,FOLLOW_20_in_ruleXBasicForLoopExpression9397); if (state.failed) return current;
+                    	    otherlv_10=(Token)match(input,20,FOLLOW_20); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_10, grammarAccess.getXBasicForLoopExpressionAccess().getCommaKeyword_7_1_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3984:1: ( (lv_updateExpressions_11_0= ruleXExpression ) )
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3985:1: (lv_updateExpressions_11_0= ruleXExpression )
+                    	    // InternalCheckCfg.g:3984:1: ( (lv_updateExpressions_11_0= ruleXExpression ) )
+                    	    // InternalCheckCfg.g:3985:1: (lv_updateExpressions_11_0= ruleXExpression )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3985:1: (lv_updateExpressions_11_0= ruleXExpression )
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3986:3: lv_updateExpressions_11_0= ruleXExpression
+                    	    // InternalCheckCfg.g:3985:1: (lv_updateExpressions_11_0= ruleXExpression )
+                    	    // InternalCheckCfg.g:3986:3: lv_updateExpressions_11_0= ruleXExpression
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getXBasicForLoopExpressionAccess().getUpdateExpressionsXExpressionParserRuleCall_7_1_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleXExpression_in_ruleXBasicForLoopExpression9418);
+                    	    pushFollow(FOLLOW_13);
                     	    lv_updateExpressions_11_0=ruleXExpression();
 
                     	    state._fsp--;
@@ -11648,7 +11648,7 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
                     	             			current, 
                     	             			"updateExpressions",
                     	              		lv_updateExpressions_11_0, 
-                    	              		"XExpression");
+                    	              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -11673,24 +11673,24 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
 
             }
 
-            otherlv_12=(Token)match(input,21,FOLLOW_21_in_ruleXBasicForLoopExpression9434); if (state.failed) return current;
+            otherlv_12=(Token)match(input,21,FOLLOW_20); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_12, grammarAccess.getXBasicForLoopExpressionAccess().getRightParenthesisKeyword_8());
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4006:1: ( (lv_eachExpression_13_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4007:1: (lv_eachExpression_13_0= ruleXExpression )
+            // InternalCheckCfg.g:4006:1: ( (lv_eachExpression_13_0= ruleXExpression ) )
+            // InternalCheckCfg.g:4007:1: (lv_eachExpression_13_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4007:1: (lv_eachExpression_13_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4008:3: lv_eachExpression_13_0= ruleXExpression
+            // InternalCheckCfg.g:4007:1: (lv_eachExpression_13_0= ruleXExpression )
+            // InternalCheckCfg.g:4008:3: lv_eachExpression_13_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXBasicForLoopExpressionAccess().getEachExpressionXExpressionParserRuleCall_9_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXBasicForLoopExpression9455);
+            pushFollow(FOLLOW_2);
             lv_eachExpression_13_0=ruleXExpression();
 
             state._fsp--;
@@ -11704,7 +11704,7 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
                      			current, 
                      			"eachExpression",
                       		lv_eachExpression_13_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -11737,7 +11737,7 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXWhileExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4032:1: entryRuleXWhileExpression returns [EObject current=null] : iv_ruleXWhileExpression= ruleXWhileExpression EOF ;
+    // InternalCheckCfg.g:4032:1: entryRuleXWhileExpression returns [EObject current=null] : iv_ruleXWhileExpression= ruleXWhileExpression EOF ;
     public final EObject entryRuleXWhileExpression() throws RecognitionException {
         EObject current = null;
 
@@ -11745,13 +11745,13 @@ public final EObject entryRuleXWhileExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4033:2: (iv_ruleXWhileExpression= ruleXWhileExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4034:2: iv_ruleXWhileExpression= ruleXWhileExpression EOF
+            // InternalCheckCfg.g:4033:2: (iv_ruleXWhileExpression= ruleXWhileExpression EOF )
+            // InternalCheckCfg.g:4034:2: iv_ruleXWhileExpression= ruleXWhileExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXWhileExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXWhileExpression_in_entryRuleXWhileExpression9491);
+            pushFollow(FOLLOW_1);
             iv_ruleXWhileExpression=ruleXWhileExpression();
 
             state._fsp--;
@@ -11759,7 +11759,7 @@ public final EObject entryRuleXWhileExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXWhileExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXWhileExpression9501); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -11777,7 +11777,7 @@ public final EObject entryRuleXWhileExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXWhileExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4041:1: ruleXWhileExpression returns [EObject current=null] : ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) ) ;
+    // InternalCheckCfg.g:4041:1: ruleXWhileExpression returns [EObject current=null] : ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) ) ;
     public final EObject ruleXWhileExpression() throws RecognitionException {
         EObject current = null;
 
@@ -11792,14 +11792,14 @@ public final EObject ruleXWhileExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4044:28: ( ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4045:1: ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) )
+            // InternalCheckCfg.g:4044:28: ( ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) ) )
+            // InternalCheckCfg.g:4045:1: ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4045:1: ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4045:2: () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) )
+            // InternalCheckCfg.g:4045:1: ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) )
+            // InternalCheckCfg.g:4045:2: () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4045:2: ()
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4046:5: 
+            // InternalCheckCfg.g:4045:2: ()
+            // InternalCheckCfg.g:4046:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -11811,30 +11811,30 @@ public final EObject ruleXWhileExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,68,FOLLOW_68_in_ruleXWhileExpression9547); if (state.failed) return current;
+            otherlv_1=(Token)match(input,68,FOLLOW_56); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXWhileExpressionAccess().getWhileKeyword_1());
                   
             }
-            otherlv_2=(Token)match(input,19,FOLLOW_19_in_ruleXWhileExpression9559); if (state.failed) return current;
+            otherlv_2=(Token)match(input,19,FOLLOW_20); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getXWhileExpressionAccess().getLeftParenthesisKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4059:1: ( (lv_predicate_3_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4060:1: (lv_predicate_3_0= ruleXExpression )
+            // InternalCheckCfg.g:4059:1: ( (lv_predicate_3_0= ruleXExpression ) )
+            // InternalCheckCfg.g:4060:1: (lv_predicate_3_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4060:1: (lv_predicate_3_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4061:3: lv_predicate_3_0= ruleXExpression
+            // InternalCheckCfg.g:4060:1: (lv_predicate_3_0= ruleXExpression )
+            // InternalCheckCfg.g:4061:3: lv_predicate_3_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXWhileExpressionAccess().getPredicateXExpressionParserRuleCall_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXWhileExpression9580);
+            pushFollow(FOLLOW_45);
             lv_predicate_3_0=ruleXExpression();
 
             state._fsp--;
@@ -11848,7 +11848,7 @@ public final EObject ruleXWhileExpression() throws RecognitionException {
                      			current, 
                      			"predicate",
                       		lv_predicate_3_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -11858,24 +11858,24 @@ public final EObject ruleXWhileExpression() throws RecognitionException {
 
             }
 
-            otherlv_4=(Token)match(input,21,FOLLOW_21_in_ruleXWhileExpression9592); if (state.failed) return current;
+            otherlv_4=(Token)match(input,21,FOLLOW_20); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_4, grammarAccess.getXWhileExpressionAccess().getRightParenthesisKeyword_4());
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4081:1: ( (lv_body_5_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4082:1: (lv_body_5_0= ruleXExpression )
+            // InternalCheckCfg.g:4081:1: ( (lv_body_5_0= ruleXExpression ) )
+            // InternalCheckCfg.g:4082:1: (lv_body_5_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4082:1: (lv_body_5_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4083:3: lv_body_5_0= ruleXExpression
+            // InternalCheckCfg.g:4082:1: (lv_body_5_0= ruleXExpression )
+            // InternalCheckCfg.g:4083:3: lv_body_5_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXWhileExpressionAccess().getBodyXExpressionParserRuleCall_5_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXWhileExpression9613);
+            pushFollow(FOLLOW_2);
             lv_body_5_0=ruleXExpression();
 
             state._fsp--;
@@ -11889,7 +11889,7 @@ public final EObject ruleXWhileExpression() throws RecognitionException {
                      			current, 
                      			"body",
                       		lv_body_5_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -11922,7 +11922,7 @@ public final EObject ruleXWhileExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXDoWhileExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4107:1: entryRuleXDoWhileExpression returns [EObject current=null] : iv_ruleXDoWhileExpression= ruleXDoWhileExpression EOF ;
+    // InternalCheckCfg.g:4107:1: entryRuleXDoWhileExpression returns [EObject current=null] : iv_ruleXDoWhileExpression= ruleXDoWhileExpression EOF ;
     public final EObject entryRuleXDoWhileExpression() throws RecognitionException {
         EObject current = null;
 
@@ -11930,13 +11930,13 @@ public final EObject entryRuleXDoWhileExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4108:2: (iv_ruleXDoWhileExpression= ruleXDoWhileExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4109:2: iv_ruleXDoWhileExpression= ruleXDoWhileExpression EOF
+            // InternalCheckCfg.g:4108:2: (iv_ruleXDoWhileExpression= ruleXDoWhileExpression EOF )
+            // InternalCheckCfg.g:4109:2: iv_ruleXDoWhileExpression= ruleXDoWhileExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXDoWhileExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXDoWhileExpression_in_entryRuleXDoWhileExpression9649);
+            pushFollow(FOLLOW_1);
             iv_ruleXDoWhileExpression=ruleXDoWhileExpression();
 
             state._fsp--;
@@ -11944,7 +11944,7 @@ public final EObject entryRuleXDoWhileExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXDoWhileExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXDoWhileExpression9659); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -11962,7 +11962,7 @@ public final EObject entryRuleXDoWhileExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXDoWhileExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4116:1: ruleXDoWhileExpression returns [EObject current=null] : ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' ) ;
+    // InternalCheckCfg.g:4116:1: ruleXDoWhileExpression returns [EObject current=null] : ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' ) ;
     public final EObject ruleXDoWhileExpression() throws RecognitionException {
         EObject current = null;
 
@@ -11978,14 +11978,14 @@ public final EObject ruleXDoWhileExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4119:28: ( ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4120:1: ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' )
+            // InternalCheckCfg.g:4119:28: ( ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' ) )
+            // InternalCheckCfg.g:4120:1: ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4120:1: ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4120:2: () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')'
+            // InternalCheckCfg.g:4120:1: ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' )
+            // InternalCheckCfg.g:4120:2: () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')'
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4120:2: ()
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4121:5: 
+            // InternalCheckCfg.g:4120:2: ()
+            // InternalCheckCfg.g:4121:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -11997,24 +11997,24 @@ public final EObject ruleXDoWhileExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,69,FOLLOW_69_in_ruleXDoWhileExpression9705); if (state.failed) return current;
+            otherlv_1=(Token)match(input,69,FOLLOW_20); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXDoWhileExpressionAccess().getDoKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4130:1: ( (lv_body_2_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4131:1: (lv_body_2_0= ruleXExpression )
+            // InternalCheckCfg.g:4130:1: ( (lv_body_2_0= ruleXExpression ) )
+            // InternalCheckCfg.g:4131:1: (lv_body_2_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4131:1: (lv_body_2_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4132:3: lv_body_2_0= ruleXExpression
+            // InternalCheckCfg.g:4131:1: (lv_body_2_0= ruleXExpression )
+            // InternalCheckCfg.g:4132:3: lv_body_2_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXDoWhileExpressionAccess().getBodyXExpressionParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXDoWhileExpression9726);
+            pushFollow(FOLLOW_70);
             lv_body_2_0=ruleXExpression();
 
             state._fsp--;
@@ -12028,7 +12028,7 @@ public final EObject ruleXDoWhileExpression() throws RecognitionException {
                      			current, 
                      			"body",
                       		lv_body_2_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -12038,30 +12038,30 @@ public final EObject ruleXDoWhileExpression() throws RecognitionException {
 
             }
 
-            otherlv_3=(Token)match(input,68,FOLLOW_68_in_ruleXDoWhileExpression9738); if (state.failed) return current;
+            otherlv_3=(Token)match(input,68,FOLLOW_56); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_3, grammarAccess.getXDoWhileExpressionAccess().getWhileKeyword_3());
                   
             }
-            otherlv_4=(Token)match(input,19,FOLLOW_19_in_ruleXDoWhileExpression9750); if (state.failed) return current;
+            otherlv_4=(Token)match(input,19,FOLLOW_20); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_4, grammarAccess.getXDoWhileExpressionAccess().getLeftParenthesisKeyword_4());
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4156:1: ( (lv_predicate_5_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4157:1: (lv_predicate_5_0= ruleXExpression )
+            // InternalCheckCfg.g:4156:1: ( (lv_predicate_5_0= ruleXExpression ) )
+            // InternalCheckCfg.g:4157:1: (lv_predicate_5_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4157:1: (lv_predicate_5_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4158:3: lv_predicate_5_0= ruleXExpression
+            // InternalCheckCfg.g:4157:1: (lv_predicate_5_0= ruleXExpression )
+            // InternalCheckCfg.g:4158:3: lv_predicate_5_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXDoWhileExpressionAccess().getPredicateXExpressionParserRuleCall_5_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXDoWhileExpression9771);
+            pushFollow(FOLLOW_45);
             lv_predicate_5_0=ruleXExpression();
 
             state._fsp--;
@@ -12075,7 +12075,7 @@ public final EObject ruleXDoWhileExpression() throws RecognitionException {
                      			current, 
                      			"predicate",
                       		lv_predicate_5_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -12085,7 +12085,7 @@ public final EObject ruleXDoWhileExpression() throws RecognitionException {
 
             }
 
-            otherlv_6=(Token)match(input,21,FOLLOW_21_in_ruleXDoWhileExpression9783); if (state.failed) return current;
+            otherlv_6=(Token)match(input,21,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_6, grammarAccess.getXDoWhileExpressionAccess().getRightParenthesisKeyword_6());
@@ -12114,7 +12114,7 @@ public final EObject ruleXDoWhileExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXBlockExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4186:1: entryRuleXBlockExpression returns [EObject current=null] : iv_ruleXBlockExpression= ruleXBlockExpression EOF ;
+    // InternalCheckCfg.g:4186:1: entryRuleXBlockExpression returns [EObject current=null] : iv_ruleXBlockExpression= ruleXBlockExpression EOF ;
     public final EObject entryRuleXBlockExpression() throws RecognitionException {
         EObject current = null;
 
@@ -12122,13 +12122,13 @@ public final EObject entryRuleXBlockExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4187:2: (iv_ruleXBlockExpression= ruleXBlockExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4188:2: iv_ruleXBlockExpression= ruleXBlockExpression EOF
+            // InternalCheckCfg.g:4187:2: (iv_ruleXBlockExpression= ruleXBlockExpression EOF )
+            // InternalCheckCfg.g:4188:2: iv_ruleXBlockExpression= ruleXBlockExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXBlockExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXBlockExpression_in_entryRuleXBlockExpression9819);
+            pushFollow(FOLLOW_1);
             iv_ruleXBlockExpression=ruleXBlockExpression();
 
             state._fsp--;
@@ -12136,7 +12136,7 @@ public final EObject entryRuleXBlockExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXBlockExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXBlockExpression9829); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -12154,7 +12154,7 @@ public final EObject entryRuleXBlockExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXBlockExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4195:1: ruleXBlockExpression returns [EObject current=null] : ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' ) ;
+    // InternalCheckCfg.g:4195:1: ruleXBlockExpression returns [EObject current=null] : ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' ) ;
     public final EObject ruleXBlockExpression() throws RecognitionException {
         EObject current = null;
 
@@ -12167,14 +12167,14 @@ public final EObject ruleXBlockExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4198:28: ( ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4199:1: ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' )
+            // InternalCheckCfg.g:4198:28: ( ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' ) )
+            // InternalCheckCfg.g:4199:1: ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4199:1: ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4199:2: () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}'
+            // InternalCheckCfg.g:4199:1: ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' )
+            // InternalCheckCfg.g:4199:2: () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}'
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4199:2: ()
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4200:5: 
+            // InternalCheckCfg.g:4199:2: ()
+            // InternalCheckCfg.g:4200:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -12186,13 +12186,13 @@ public final EObject ruleXBlockExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,15,FOLLOW_15_in_ruleXBlockExpression9875); if (state.failed) return current;
+            otherlv_1=(Token)match(input,15,FOLLOW_71); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXBlockExpressionAccess().getLeftCurlyBracketKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4209:1: ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )*
+            // InternalCheckCfg.g:4209:1: ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )*
             loop76:
             do {
                 int alt76=2;
@@ -12205,20 +12205,20 @@ public final EObject ruleXBlockExpression() throws RecognitionException {
 
                 switch (alt76) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4209:2: ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )?
+            	    // InternalCheckCfg.g:4209:2: ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )?
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4209:2: ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4210:1: (lv_expressions_2_0= ruleXExpressionOrVarDeclaration )
+            	    // InternalCheckCfg.g:4209:2: ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) )
+            	    // InternalCheckCfg.g:4210:1: (lv_expressions_2_0= ruleXExpressionOrVarDeclaration )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4210:1: (lv_expressions_2_0= ruleXExpressionOrVarDeclaration )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4211:3: lv_expressions_2_0= ruleXExpressionOrVarDeclaration
+            	    // InternalCheckCfg.g:4210:1: (lv_expressions_2_0= ruleXExpressionOrVarDeclaration )
+            	    // InternalCheckCfg.g:4211:3: lv_expressions_2_0= ruleXExpressionOrVarDeclaration
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXBlockExpressionAccess().getExpressionsXExpressionOrVarDeclarationParserRuleCall_2_0_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_ruleXBlockExpression9897);
+            	    pushFollow(FOLLOW_72);
             	    lv_expressions_2_0=ruleXExpressionOrVarDeclaration();
 
             	    state._fsp--;
@@ -12232,7 +12232,7 @@ public final EObject ruleXBlockExpression() throws RecognitionException {
             	             			current, 
             	             			"expressions",
             	              		lv_expressions_2_0, 
-            	              		"XExpressionOrVarDeclaration");
+            	              		"org.eclipse.xtext.xbase.Xbase.XExpressionOrVarDeclaration");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -12242,7 +12242,7 @@ public final EObject ruleXBlockExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4227:2: (otherlv_3= ';' )?
+            	    // InternalCheckCfg.g:4227:2: (otherlv_3= ';' )?
             	    int alt75=2;
             	    int LA75_0 = input.LA(1);
 
@@ -12251,9 +12251,9 @@ public final EObject ruleXBlockExpression() throws RecognitionException {
             	    }
             	    switch (alt75) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4227:4: otherlv_3= ';'
+            	            // InternalCheckCfg.g:4227:4: otherlv_3= ';'
             	            {
-            	            otherlv_3=(Token)match(input,61,FOLLOW_61_in_ruleXBlockExpression9910); if (state.failed) return current;
+            	            otherlv_3=(Token)match(input,61,FOLLOW_71); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                  	newLeafNode(otherlv_3, grammarAccess.getXBlockExpressionAccess().getSemicolonKeyword_2_1());
@@ -12274,7 +12274,7 @@ public final EObject ruleXBlockExpression() throws RecognitionException {
                 }
             } while (true);
 
-            otherlv_4=(Token)match(input,16,FOLLOW_16_in_ruleXBlockExpression9926); if (state.failed) return current;
+            otherlv_4=(Token)match(input,16,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_4, grammarAccess.getXBlockExpressionAccess().getRightCurlyBracketKeyword_3());
@@ -12303,7 +12303,7 @@ public final EObject ruleXBlockExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXExpressionOrVarDeclaration"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4243:1: entryRuleXExpressionOrVarDeclaration returns [EObject current=null] : iv_ruleXExpressionOrVarDeclaration= ruleXExpressionOrVarDeclaration EOF ;
+    // InternalCheckCfg.g:4243:1: entryRuleXExpressionOrVarDeclaration returns [EObject current=null] : iv_ruleXExpressionOrVarDeclaration= ruleXExpressionOrVarDeclaration EOF ;
     public final EObject entryRuleXExpressionOrVarDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -12311,13 +12311,13 @@ public final EObject entryRuleXExpressionOrVarDeclaration() throws RecognitionEx
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4244:2: (iv_ruleXExpressionOrVarDeclaration= ruleXExpressionOrVarDeclaration EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4245:2: iv_ruleXExpressionOrVarDeclaration= ruleXExpressionOrVarDeclaration EOF
+            // InternalCheckCfg.g:4244:2: (iv_ruleXExpressionOrVarDeclaration= ruleXExpressionOrVarDeclaration EOF )
+            // InternalCheckCfg.g:4245:2: iv_ruleXExpressionOrVarDeclaration= ruleXExpressionOrVarDeclaration EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXExpressionOrVarDeclarationRule()); 
             }
-            pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_entryRuleXExpressionOrVarDeclaration9962);
+            pushFollow(FOLLOW_1);
             iv_ruleXExpressionOrVarDeclaration=ruleXExpressionOrVarDeclaration();
 
             state._fsp--;
@@ -12325,7 +12325,7 @@ public final EObject entryRuleXExpressionOrVarDeclaration() throws RecognitionEx
             if ( state.backtracking==0 ) {
                current =iv_ruleXExpressionOrVarDeclaration; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXExpressionOrVarDeclaration9972); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -12343,7 +12343,7 @@ public final EObject entryRuleXExpressionOrVarDeclaration() throws RecognitionEx
 
 
     // $ANTLR start "ruleXExpressionOrVarDeclaration"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4252:1: ruleXExpressionOrVarDeclaration returns [EObject current=null] : (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression ) ;
+    // InternalCheckCfg.g:4252:1: ruleXExpressionOrVarDeclaration returns [EObject current=null] : (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression ) ;
     public final EObject ruleXExpressionOrVarDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -12355,10 +12355,10 @@ public final EObject ruleXExpressionOrVarDeclaration() throws RecognitionExcepti
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4255:28: ( (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4256:1: (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression )
+            // InternalCheckCfg.g:4255:28: ( (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression ) )
+            // InternalCheckCfg.g:4256:1: (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4256:1: (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression )
+            // InternalCheckCfg.g:4256:1: (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression )
             int alt77=2;
             int LA77_0 = input.LA(1);
 
@@ -12377,14 +12377,14 @@ else if ( ((LA77_0>=RULE_STRING && LA77_0<=RULE_ID)||LA77_0==15||LA77_0==17||LA7
             }
             switch (alt77) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4257:5: this_XVariableDeclaration_0= ruleXVariableDeclaration
+                    // InternalCheckCfg.g:4257:5: this_XVariableDeclaration_0= ruleXVariableDeclaration
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXExpressionOrVarDeclarationAccess().getXVariableDeclarationParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXVariableDeclaration_in_ruleXExpressionOrVarDeclaration10019);
+                    pushFollow(FOLLOW_2);
                     this_XVariableDeclaration_0=ruleXVariableDeclaration();
 
                     state._fsp--;
@@ -12399,14 +12399,14 @@ else if ( ((LA77_0>=RULE_STRING && LA77_0<=RULE_ID)||LA77_0==15||LA77_0==17||LA7
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4267:5: this_XExpression_1= ruleXExpression
+                    // InternalCheckCfg.g:4267:5: this_XExpression_1= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXExpressionOrVarDeclarationAccess().getXExpressionParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXExpressionOrVarDeclaration10046);
+                    pushFollow(FOLLOW_2);
                     this_XExpression_1=ruleXExpression();
 
                     state._fsp--;
@@ -12443,7 +12443,7 @@ else if ( ((LA77_0>=RULE_STRING && LA77_0<=RULE_ID)||LA77_0==15||LA77_0==17||LA7
 
 
     // $ANTLR start "entryRuleXVariableDeclaration"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4283:1: entryRuleXVariableDeclaration returns [EObject current=null] : iv_ruleXVariableDeclaration= ruleXVariableDeclaration EOF ;
+    // InternalCheckCfg.g:4283:1: entryRuleXVariableDeclaration returns [EObject current=null] : iv_ruleXVariableDeclaration= ruleXVariableDeclaration EOF ;
     public final EObject entryRuleXVariableDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -12451,13 +12451,13 @@ public final EObject entryRuleXVariableDeclaration() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4284:2: (iv_ruleXVariableDeclaration= ruleXVariableDeclaration EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4285:2: iv_ruleXVariableDeclaration= ruleXVariableDeclaration EOF
+            // InternalCheckCfg.g:4284:2: (iv_ruleXVariableDeclaration= ruleXVariableDeclaration EOF )
+            // InternalCheckCfg.g:4285:2: iv_ruleXVariableDeclaration= ruleXVariableDeclaration EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXVariableDeclarationRule()); 
             }
-            pushFollow(FOLLOW_ruleXVariableDeclaration_in_entryRuleXVariableDeclaration10081);
+            pushFollow(FOLLOW_1);
             iv_ruleXVariableDeclaration=ruleXVariableDeclaration();
 
             state._fsp--;
@@ -12465,7 +12465,7 @@ public final EObject entryRuleXVariableDeclaration() throws RecognitionException
             if ( state.backtracking==0 ) {
                current =iv_ruleXVariableDeclaration; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXVariableDeclaration10091); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -12483,7 +12483,7 @@ public final EObject entryRuleXVariableDeclaration() throws RecognitionException
 
 
     // $ANTLR start "ruleXVariableDeclaration"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4292:1: ruleXVariableDeclaration returns [EObject current=null] : ( () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )? ) ;
+    // InternalCheckCfg.g:4292:1: ruleXVariableDeclaration returns [EObject current=null] : ( () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )? ) ;
     public final EObject ruleXVariableDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -12502,14 +12502,14 @@ public final EObject ruleXVariableDeclaration() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4295:28: ( ( () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4296:1: ( () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )? )
+            // InternalCheckCfg.g:4295:28: ( ( () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )? ) )
+            // InternalCheckCfg.g:4296:1: ( () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4296:1: ( () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )? )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4296:2: () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )?
+            // InternalCheckCfg.g:4296:1: ( () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )? )
+            // InternalCheckCfg.g:4296:2: () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )?
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4296:2: ()
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4297:5: 
+            // InternalCheckCfg.g:4296:2: ()
+            // InternalCheckCfg.g:4297:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -12521,7 +12521,7 @@ public final EObject ruleXVariableDeclaration() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4302:2: ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' )
+            // InternalCheckCfg.g:4302:2: ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' )
             int alt78=2;
             int LA78_0 = input.LA(1);
 
@@ -12540,15 +12540,15 @@ else if ( (LA78_0==71) ) {
             }
             switch (alt78) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4302:3: ( (lv_writeable_1_0= 'var' ) )
+                    // InternalCheckCfg.g:4302:3: ( (lv_writeable_1_0= 'var' ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4302:3: ( (lv_writeable_1_0= 'var' ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4303:1: (lv_writeable_1_0= 'var' )
+                    // InternalCheckCfg.g:4302:3: ( (lv_writeable_1_0= 'var' ) )
+                    // InternalCheckCfg.g:4303:1: (lv_writeable_1_0= 'var' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4303:1: (lv_writeable_1_0= 'var' )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4304:3: lv_writeable_1_0= 'var'
+                    // InternalCheckCfg.g:4303:1: (lv_writeable_1_0= 'var' )
+                    // InternalCheckCfg.g:4304:3: lv_writeable_1_0= 'var'
                     {
-                    lv_writeable_1_0=(Token)match(input,70,FOLLOW_70_in_ruleXVariableDeclaration10144); if (state.failed) return current;
+                    lv_writeable_1_0=(Token)match(input,70,FOLLOW_29); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_writeable_1_0, grammarAccess.getXVariableDeclarationAccess().getWriteableVarKeyword_1_0_0());
@@ -12572,9 +12572,9 @@ else if ( (LA78_0==71) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4318:7: otherlv_2= 'val'
+                    // InternalCheckCfg.g:4318:7: otherlv_2= 'val'
                     {
-                    otherlv_2=(Token)match(input,71,FOLLOW_71_in_ruleXVariableDeclaration10175); if (state.failed) return current;
+                    otherlv_2=(Token)match(input,71,FOLLOW_29); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_2, grammarAccess.getXVariableDeclarationAccess().getValKeyword_1_1());
@@ -12586,7 +12586,7 @@ else if ( (LA78_0==71) ) {
 
             }
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4322:2: ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) )
+            // InternalCheckCfg.g:4322:2: ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) )
             int alt79=2;
             int LA79_0 = input.LA(1);
 
@@ -12622,26 +12622,26 @@ else if ( (LA79_0==44) && (synpred29_InternalCheckCfg())) {
             }
             switch (alt79) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4322:3: ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) )
+                    // InternalCheckCfg.g:4322:3: ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4322:3: ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4322:4: ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) )
+                    // InternalCheckCfg.g:4322:3: ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) )
+                    // InternalCheckCfg.g:4322:4: ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4330:6: ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4330:7: ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) )
+                    // InternalCheckCfg.g:4330:6: ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) )
+                    // InternalCheckCfg.g:4330:7: ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4330:7: ( (lv_type_3_0= ruleJvmTypeReference ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4331:1: (lv_type_3_0= ruleJvmTypeReference )
+                    // InternalCheckCfg.g:4330:7: ( (lv_type_3_0= ruleJvmTypeReference ) )
+                    // InternalCheckCfg.g:4331:1: (lv_type_3_0= ruleJvmTypeReference )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4331:1: (lv_type_3_0= ruleJvmTypeReference )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4332:3: lv_type_3_0= ruleJvmTypeReference
+                    // InternalCheckCfg.g:4331:1: (lv_type_3_0= ruleJvmTypeReference )
+                    // InternalCheckCfg.g:4332:3: lv_type_3_0= ruleJvmTypeReference
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXVariableDeclarationAccess().getTypeJvmTypeReferenceParserRuleCall_2_0_0_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleXVariableDeclaration10223);
+                    pushFollow(FOLLOW_4);
                     lv_type_3_0=ruleJvmTypeReference();
 
                     state._fsp--;
@@ -12655,7 +12655,7 @@ else if ( (LA79_0==44) && (synpred29_InternalCheckCfg())) {
                              			current, 
                              			"type",
                               		lv_type_3_0, 
-                              		"JvmTypeReference");
+                              		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -12665,18 +12665,18 @@ else if ( (LA79_0==44) && (synpred29_InternalCheckCfg())) {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4348:2: ( (lv_name_4_0= ruleValidID ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4349:1: (lv_name_4_0= ruleValidID )
+                    // InternalCheckCfg.g:4348:2: ( (lv_name_4_0= ruleValidID ) )
+                    // InternalCheckCfg.g:4349:1: (lv_name_4_0= ruleValidID )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4349:1: (lv_name_4_0= ruleValidID )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4350:3: lv_name_4_0= ruleValidID
+                    // InternalCheckCfg.g:4349:1: (lv_name_4_0= ruleValidID )
+                    // InternalCheckCfg.g:4350:3: lv_name_4_0= ruleValidID
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXVariableDeclarationAccess().getNameValidIDParserRuleCall_2_0_0_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleValidID_in_ruleXVariableDeclaration10244);
+                    pushFollow(FOLLOW_73);
                     lv_name_4_0=ruleValidID();
 
                     state._fsp--;
@@ -12690,7 +12690,7 @@ else if ( (LA79_0==44) && (synpred29_InternalCheckCfg())) {
                              			current, 
                              			"name",
                               		lv_name_4_0, 
-                              		"ValidID");
+                              		"org.eclipse.xtext.xbase.Xtype.ValidID");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -12710,20 +12710,20 @@ else if ( (LA79_0==44) && (synpred29_InternalCheckCfg())) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4367:6: ( (lv_name_5_0= ruleValidID ) )
+                    // InternalCheckCfg.g:4367:6: ( (lv_name_5_0= ruleValidID ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4367:6: ( (lv_name_5_0= ruleValidID ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4368:1: (lv_name_5_0= ruleValidID )
+                    // InternalCheckCfg.g:4367:6: ( (lv_name_5_0= ruleValidID ) )
+                    // InternalCheckCfg.g:4368:1: (lv_name_5_0= ruleValidID )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4368:1: (lv_name_5_0= ruleValidID )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4369:3: lv_name_5_0= ruleValidID
+                    // InternalCheckCfg.g:4368:1: (lv_name_5_0= ruleValidID )
+                    // InternalCheckCfg.g:4369:3: lv_name_5_0= ruleValidID
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXVariableDeclarationAccess().getNameValidIDParserRuleCall_2_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleValidID_in_ruleXVariableDeclaration10273);
+                    pushFollow(FOLLOW_73);
                     lv_name_5_0=ruleValidID();
 
                     state._fsp--;
@@ -12737,7 +12737,7 @@ else if ( (LA79_0==44) && (synpred29_InternalCheckCfg())) {
                              			current, 
                              			"name",
                               		lv_name_5_0, 
-                              		"ValidID");
+                              		"org.eclipse.xtext.xbase.Xtype.ValidID");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -12753,7 +12753,7 @@ else if ( (LA79_0==44) && (synpred29_InternalCheckCfg())) {
 
             }
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4385:3: (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )?
+            // InternalCheckCfg.g:4385:3: (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )?
             int alt80=2;
             int LA80_0 = input.LA(1);
 
@@ -12762,26 +12762,26 @@ else if ( (LA79_0==44) && (synpred29_InternalCheckCfg())) {
             }
             switch (alt80) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4385:5: otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) )
+                    // InternalCheckCfg.g:4385:5: otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) )
                     {
-                    otherlv_6=(Token)match(input,22,FOLLOW_22_in_ruleXVariableDeclaration10287); if (state.failed) return current;
+                    otherlv_6=(Token)match(input,22,FOLLOW_20); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_6, grammarAccess.getXVariableDeclarationAccess().getEqualsSignKeyword_3_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4389:1: ( (lv_right_7_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4390:1: (lv_right_7_0= ruleXExpression )
+                    // InternalCheckCfg.g:4389:1: ( (lv_right_7_0= ruleXExpression ) )
+                    // InternalCheckCfg.g:4390:1: (lv_right_7_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4390:1: (lv_right_7_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4391:3: lv_right_7_0= ruleXExpression
+                    // InternalCheckCfg.g:4390:1: (lv_right_7_0= ruleXExpression )
+                    // InternalCheckCfg.g:4391:3: lv_right_7_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXVariableDeclarationAccess().getRightXExpressionParserRuleCall_3_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXVariableDeclaration10308);
+                    pushFollow(FOLLOW_2);
                     lv_right_7_0=ruleXExpression();
 
                     state._fsp--;
@@ -12795,7 +12795,7 @@ else if ( (LA79_0==44) && (synpred29_InternalCheckCfg())) {
                              			current, 
                              			"right",
                               		lv_right_7_0, 
-                              		"XExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -12834,7 +12834,7 @@ else if ( (LA79_0==44) && (synpred29_InternalCheckCfg())) {
 
 
     // $ANTLR start "entryRuleJvmFormalParameter"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4415:1: entryRuleJvmFormalParameter returns [EObject current=null] : iv_ruleJvmFormalParameter= ruleJvmFormalParameter EOF ;
+    // InternalCheckCfg.g:4415:1: entryRuleJvmFormalParameter returns [EObject current=null] : iv_ruleJvmFormalParameter= ruleJvmFormalParameter EOF ;
     public final EObject entryRuleJvmFormalParameter() throws RecognitionException {
         EObject current = null;
 
@@ -12842,13 +12842,13 @@ public final EObject entryRuleJvmFormalParameter() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4416:2: (iv_ruleJvmFormalParameter= ruleJvmFormalParameter EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4417:2: iv_ruleJvmFormalParameter= ruleJvmFormalParameter EOF
+            // InternalCheckCfg.g:4416:2: (iv_ruleJvmFormalParameter= ruleJvmFormalParameter EOF )
+            // InternalCheckCfg.g:4417:2: iv_ruleJvmFormalParameter= ruleJvmFormalParameter EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmFormalParameterRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmFormalParameter_in_entryRuleJvmFormalParameter10346);
+            pushFollow(FOLLOW_1);
             iv_ruleJvmFormalParameter=ruleJvmFormalParameter();
 
             state._fsp--;
@@ -12856,7 +12856,7 @@ public final EObject entryRuleJvmFormalParameter() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleJvmFormalParameter; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmFormalParameter10356); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -12874,7 +12874,7 @@ public final EObject entryRuleJvmFormalParameter() throws RecognitionException {
 
 
     // $ANTLR start "ruleJvmFormalParameter"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4424:1: ruleJvmFormalParameter returns [EObject current=null] : ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) ) ;
+    // InternalCheckCfg.g:4424:1: ruleJvmFormalParameter returns [EObject current=null] : ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) ) ;
     public final EObject ruleJvmFormalParameter() throws RecognitionException {
         EObject current = null;
 
@@ -12886,13 +12886,13 @@ public final EObject ruleJvmFormalParameter() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4427:28: ( ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4428:1: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) )
+            // InternalCheckCfg.g:4427:28: ( ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) ) )
+            // InternalCheckCfg.g:4428:1: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4428:1: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4428:2: ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) )
+            // InternalCheckCfg.g:4428:1: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) )
+            // InternalCheckCfg.g:4428:2: ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4428:2: ( (lv_parameterType_0_0= ruleJvmTypeReference ) )?
+            // InternalCheckCfg.g:4428:2: ( (lv_parameterType_0_0= ruleJvmTypeReference ) )?
             int alt81=2;
             int LA81_0 = input.LA(1);
 
@@ -12908,17 +12908,17 @@ else if ( (LA81_0==19||LA81_0==44) ) {
             }
             switch (alt81) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4429:1: (lv_parameterType_0_0= ruleJvmTypeReference )
+                    // InternalCheckCfg.g:4429:1: (lv_parameterType_0_0= ruleJvmTypeReference )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4429:1: (lv_parameterType_0_0= ruleJvmTypeReference )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4430:3: lv_parameterType_0_0= ruleJvmTypeReference
+                    // InternalCheckCfg.g:4429:1: (lv_parameterType_0_0= ruleJvmTypeReference )
+                    // InternalCheckCfg.g:4430:3: lv_parameterType_0_0= ruleJvmTypeReference
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getJvmFormalParameterAccess().getParameterTypeJvmTypeReferenceParserRuleCall_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleJvmFormalParameter10402);
+                    pushFollow(FOLLOW_4);
                     lv_parameterType_0_0=ruleJvmTypeReference();
 
                     state._fsp--;
@@ -12932,7 +12932,7 @@ else if ( (LA81_0==19||LA81_0==44) ) {
                              			current, 
                              			"parameterType",
                               		lv_parameterType_0_0, 
-                              		"JvmTypeReference");
+                              		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -12945,18 +12945,18 @@ else if ( (LA81_0==19||LA81_0==44) ) {
 
             }
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4446:3: ( (lv_name_1_0= ruleValidID ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4447:1: (lv_name_1_0= ruleValidID )
+            // InternalCheckCfg.g:4446:3: ( (lv_name_1_0= ruleValidID ) )
+            // InternalCheckCfg.g:4447:1: (lv_name_1_0= ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4447:1: (lv_name_1_0= ruleValidID )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4448:3: lv_name_1_0= ruleValidID
+            // InternalCheckCfg.g:4447:1: (lv_name_1_0= ruleValidID )
+            // InternalCheckCfg.g:4448:3: lv_name_1_0= ruleValidID
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getJvmFormalParameterAccess().getNameValidIDParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleValidID_in_ruleJvmFormalParameter10424);
+            pushFollow(FOLLOW_2);
             lv_name_1_0=ruleValidID();
 
             state._fsp--;
@@ -12970,7 +12970,7 @@ else if ( (LA81_0==19||LA81_0==44) ) {
                      			current, 
                      			"name",
                       		lv_name_1_0, 
-                      		"ValidID");
+                      		"org.eclipse.xtext.xbase.Xtype.ValidID");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -13003,7 +13003,7 @@ else if ( (LA81_0==19||LA81_0==44) ) {
 
 
     // $ANTLR start "entryRuleFullJvmFormalParameter"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4472:1: entryRuleFullJvmFormalParameter returns [EObject current=null] : iv_ruleFullJvmFormalParameter= ruleFullJvmFormalParameter EOF ;
+    // InternalCheckCfg.g:4472:1: entryRuleFullJvmFormalParameter returns [EObject current=null] : iv_ruleFullJvmFormalParameter= ruleFullJvmFormalParameter EOF ;
     public final EObject entryRuleFullJvmFormalParameter() throws RecognitionException {
         EObject current = null;
 
@@ -13011,13 +13011,13 @@ public final EObject entryRuleFullJvmFormalParameter() throws RecognitionExcepti
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4473:2: (iv_ruleFullJvmFormalParameter= ruleFullJvmFormalParameter EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4474:2: iv_ruleFullJvmFormalParameter= ruleFullJvmFormalParameter EOF
+            // InternalCheckCfg.g:4473:2: (iv_ruleFullJvmFormalParameter= ruleFullJvmFormalParameter EOF )
+            // InternalCheckCfg.g:4474:2: iv_ruleFullJvmFormalParameter= ruleFullJvmFormalParameter EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getFullJvmFormalParameterRule()); 
             }
-            pushFollow(FOLLOW_ruleFullJvmFormalParameter_in_entryRuleFullJvmFormalParameter10460);
+            pushFollow(FOLLOW_1);
             iv_ruleFullJvmFormalParameter=ruleFullJvmFormalParameter();
 
             state._fsp--;
@@ -13025,7 +13025,7 @@ public final EObject entryRuleFullJvmFormalParameter() throws RecognitionExcepti
             if ( state.backtracking==0 ) {
                current =iv_ruleFullJvmFormalParameter; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFullJvmFormalParameter10470); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -13043,7 +13043,7 @@ public final EObject entryRuleFullJvmFormalParameter() throws RecognitionExcepti
 
 
     // $ANTLR start "ruleFullJvmFormalParameter"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4481:1: ruleFullJvmFormalParameter returns [EObject current=null] : ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) ) ;
+    // InternalCheckCfg.g:4481:1: ruleFullJvmFormalParameter returns [EObject current=null] : ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) ) ;
     public final EObject ruleFullJvmFormalParameter() throws RecognitionException {
         EObject current = null;
 
@@ -13055,24 +13055,24 @@ public final EObject ruleFullJvmFormalParameter() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4484:28: ( ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4485:1: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) )
+            // InternalCheckCfg.g:4484:28: ( ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) ) )
+            // InternalCheckCfg.g:4485:1: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4485:1: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4485:2: ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) )
+            // InternalCheckCfg.g:4485:1: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) )
+            // InternalCheckCfg.g:4485:2: ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4485:2: ( (lv_parameterType_0_0= ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4486:1: (lv_parameterType_0_0= ruleJvmTypeReference )
+            // InternalCheckCfg.g:4485:2: ( (lv_parameterType_0_0= ruleJvmTypeReference ) )
+            // InternalCheckCfg.g:4486:1: (lv_parameterType_0_0= ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4486:1: (lv_parameterType_0_0= ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4487:3: lv_parameterType_0_0= ruleJvmTypeReference
+            // InternalCheckCfg.g:4486:1: (lv_parameterType_0_0= ruleJvmTypeReference )
+            // InternalCheckCfg.g:4487:3: lv_parameterType_0_0= ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getFullJvmFormalParameterAccess().getParameterTypeJvmTypeReferenceParserRuleCall_0_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleFullJvmFormalParameter10516);
+            pushFollow(FOLLOW_4);
             lv_parameterType_0_0=ruleJvmTypeReference();
 
             state._fsp--;
@@ -13086,7 +13086,7 @@ public final EObject ruleFullJvmFormalParameter() throws RecognitionException {
                      			current, 
                      			"parameterType",
                       		lv_parameterType_0_0, 
-                      		"JvmTypeReference");
+                      		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -13096,18 +13096,18 @@ public final EObject ruleFullJvmFormalParameter() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4503:2: ( (lv_name_1_0= ruleValidID ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4504:1: (lv_name_1_0= ruleValidID )
+            // InternalCheckCfg.g:4503:2: ( (lv_name_1_0= ruleValidID ) )
+            // InternalCheckCfg.g:4504:1: (lv_name_1_0= ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4504:1: (lv_name_1_0= ruleValidID )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4505:3: lv_name_1_0= ruleValidID
+            // InternalCheckCfg.g:4504:1: (lv_name_1_0= ruleValidID )
+            // InternalCheckCfg.g:4505:3: lv_name_1_0= ruleValidID
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getFullJvmFormalParameterAccess().getNameValidIDParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleValidID_in_ruleFullJvmFormalParameter10537);
+            pushFollow(FOLLOW_2);
             lv_name_1_0=ruleValidID();
 
             state._fsp--;
@@ -13121,7 +13121,7 @@ public final EObject ruleFullJvmFormalParameter() throws RecognitionException {
                      			current, 
                      			"name",
                       		lv_name_1_0, 
-                      		"ValidID");
+                      		"org.eclipse.xtext.xbase.Xtype.ValidID");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -13154,7 +13154,7 @@ public final EObject ruleFullJvmFormalParameter() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXFeatureCall"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4529:1: entryRuleXFeatureCall returns [EObject current=null] : iv_ruleXFeatureCall= ruleXFeatureCall EOF ;
+    // InternalCheckCfg.g:4529:1: entryRuleXFeatureCall returns [EObject current=null] : iv_ruleXFeatureCall= ruleXFeatureCall EOF ;
     public final EObject entryRuleXFeatureCall() throws RecognitionException {
         EObject current = null;
 
@@ -13162,13 +13162,13 @@ public final EObject entryRuleXFeatureCall() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4530:2: (iv_ruleXFeatureCall= ruleXFeatureCall EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4531:2: iv_ruleXFeatureCall= ruleXFeatureCall EOF
+            // InternalCheckCfg.g:4530:2: (iv_ruleXFeatureCall= ruleXFeatureCall EOF )
+            // InternalCheckCfg.g:4531:2: iv_ruleXFeatureCall= ruleXFeatureCall EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXFeatureCallRule()); 
             }
-            pushFollow(FOLLOW_ruleXFeatureCall_in_entryRuleXFeatureCall10573);
+            pushFollow(FOLLOW_1);
             iv_ruleXFeatureCall=ruleXFeatureCall();
 
             state._fsp--;
@@ -13176,7 +13176,7 @@ public final EObject entryRuleXFeatureCall() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXFeatureCall; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXFeatureCall10583); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -13194,7 +13194,7 @@ public final EObject entryRuleXFeatureCall() throws RecognitionException {
 
 
     // $ANTLR start "ruleXFeatureCall"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4538:1: ruleXFeatureCall returns [EObject current=null] : ( () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )? ) ;
+    // InternalCheckCfg.g:4538:1: ruleXFeatureCall returns [EObject current=null] : ( () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )? ) ;
     public final EObject ruleXFeatureCall() throws RecognitionException {
         EObject current = null;
 
@@ -13220,14 +13220,14 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4541:28: ( ( () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4542:1: ( () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )? )
+            // InternalCheckCfg.g:4541:28: ( ( () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )? ) )
+            // InternalCheckCfg.g:4542:1: ( () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4542:1: ( () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )? )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4542:2: () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )?
+            // InternalCheckCfg.g:4542:1: ( () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )? )
+            // InternalCheckCfg.g:4542:2: () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )?
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4542:2: ()
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4543:5: 
+            // InternalCheckCfg.g:4542:2: ()
+            // InternalCheckCfg.g:4543:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -13239,7 +13239,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4548:2: (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )?
+            // InternalCheckCfg.g:4548:2: (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )?
             int alt83=2;
             int LA83_0 = input.LA(1);
 
@@ -13248,26 +13248,26 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
             }
             switch (alt83) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4548:4: otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>'
+                    // InternalCheckCfg.g:4548:4: otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>'
                     {
-                    otherlv_1=(Token)match(input,31,FOLLOW_31_in_ruleXFeatureCall10630); if (state.failed) return current;
+                    otherlv_1=(Token)match(input,31,FOLLOW_41); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_1, grammarAccess.getXFeatureCallAccess().getLessThanSignKeyword_1_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4552:1: ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4553:1: (lv_typeArguments_2_0= ruleJvmArgumentTypeReference )
+                    // InternalCheckCfg.g:4552:1: ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) )
+                    // InternalCheckCfg.g:4553:1: (lv_typeArguments_2_0= ruleJvmArgumentTypeReference )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4553:1: (lv_typeArguments_2_0= ruleJvmArgumentTypeReference )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4554:3: lv_typeArguments_2_0= ruleJvmArgumentTypeReference
+                    // InternalCheckCfg.g:4553:1: (lv_typeArguments_2_0= ruleJvmArgumentTypeReference )
+                    // InternalCheckCfg.g:4554:3: lv_typeArguments_2_0= ruleJvmArgumentTypeReference
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleXFeatureCall10651);
+                    pushFollow(FOLLOW_42);
                     lv_typeArguments_2_0=ruleJvmArgumentTypeReference();
 
                     state._fsp--;
@@ -13281,7 +13281,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
                              			current, 
                              			"typeArguments",
                               		lv_typeArguments_2_0, 
-                              		"JvmArgumentTypeReference");
+                              		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -13291,7 +13291,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4570:2: (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )*
+                    // InternalCheckCfg.g:4570:2: (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )*
                     loop82:
                     do {
                         int alt82=2;
@@ -13304,26 +13304,26 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
 
                         switch (alt82) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4570:4: otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) )
+                    	    // InternalCheckCfg.g:4570:4: otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) )
                     	    {
-                    	    otherlv_3=(Token)match(input,20,FOLLOW_20_in_ruleXFeatureCall10664); if (state.failed) return current;
+                    	    otherlv_3=(Token)match(input,20,FOLLOW_41); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_3, grammarAccess.getXFeatureCallAccess().getCommaKeyword_1_2_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4574:1: ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) )
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4575:1: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
+                    	    // InternalCheckCfg.g:4574:1: ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) )
+                    	    // InternalCheckCfg.g:4575:1: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4575:1: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4576:3: lv_typeArguments_4_0= ruleJvmArgumentTypeReference
+                    	    // InternalCheckCfg.g:4575:1: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
+                    	    // InternalCheckCfg.g:4576:3: lv_typeArguments_4_0= ruleJvmArgumentTypeReference
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getXFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_2_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleXFeatureCall10685);
+                    	    pushFollow(FOLLOW_42);
                     	    lv_typeArguments_4_0=ruleJvmArgumentTypeReference();
 
                     	    state._fsp--;
@@ -13337,7 +13337,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
                     	             			current, 
                     	             			"typeArguments",
                     	              		lv_typeArguments_4_0, 
-                    	              		"JvmArgumentTypeReference");
+                    	              		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -13356,7 +13356,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
                         }
                     } while (true);
 
-                    otherlv_5=(Token)match(input,32,FOLLOW_32_in_ruleXFeatureCall10699); if (state.failed) return current;
+                    otherlv_5=(Token)match(input,32,FOLLOW_40); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_5, grammarAccess.getXFeatureCallAccess().getGreaterThanSignKeyword_1_3());
@@ -13368,11 +13368,11 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4596:3: ( ( ruleIdOrSuper ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4597:1: ( ruleIdOrSuper )
+            // InternalCheckCfg.g:4596:3: ( ( ruleIdOrSuper ) )
+            // InternalCheckCfg.g:4597:1: ( ruleIdOrSuper )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4597:1: ( ruleIdOrSuper )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4598:3: ruleIdOrSuper
+            // InternalCheckCfg.g:4597:1: ( ruleIdOrSuper )
+            // InternalCheckCfg.g:4598:3: ruleIdOrSuper
             {
             if ( state.backtracking==0 ) {
 
@@ -13386,7 +13386,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
               	        newCompositeNode(grammarAccess.getXFeatureCallAccess().getFeatureJvmIdentifiableElementCrossReference_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleIdOrSuper_in_ruleXFeatureCall10724);
+            pushFollow(FOLLOW_74);
             ruleIdOrSuper();
 
             state._fsp--;
@@ -13402,20 +13402,20 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4611:2: ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )?
+            // InternalCheckCfg.g:4611:2: ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )?
             int alt86=2;
             alt86 = dfa86.predict(input);
             switch (alt86) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4611:3: ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')'
+                    // InternalCheckCfg.g:4611:3: ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')'
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4611:3: ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4611:4: ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' )
+                    // InternalCheckCfg.g:4611:3: ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) )
+                    // InternalCheckCfg.g:4611:4: ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4618:1: (lv_explicitOperationCall_7_0= '(' )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4619:3: lv_explicitOperationCall_7_0= '('
+                    // InternalCheckCfg.g:4618:1: (lv_explicitOperationCall_7_0= '(' )
+                    // InternalCheckCfg.g:4619:3: lv_explicitOperationCall_7_0= '('
                     {
-                    lv_explicitOperationCall_7_0=(Token)match(input,19,FOLLOW_19_in_ruleXFeatureCall10758); if (state.failed) return current;
+                    lv_explicitOperationCall_7_0=(Token)match(input,19,FOLLOW_44); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_explicitOperationCall_7_0, grammarAccess.getXFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_3_0_0());
@@ -13435,25 +13435,25 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4632:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )?
+                    // InternalCheckCfg.g:4632:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )?
                     int alt85=3;
                     alt85 = dfa85.predict(input);
                     switch (alt85) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4632:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) )
+                            // InternalCheckCfg.g:4632:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) )
                             {
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4632:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) )
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4632:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure )
+                            // InternalCheckCfg.g:4632:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) )
+                            // InternalCheckCfg.g:4632:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure )
                             {
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4649:1: (lv_featureCallArguments_8_0= ruleXShortClosure )
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4650:3: lv_featureCallArguments_8_0= ruleXShortClosure
+                            // InternalCheckCfg.g:4649:1: (lv_featureCallArguments_8_0= ruleXShortClosure )
+                            // InternalCheckCfg.g:4650:3: lv_featureCallArguments_8_0= ruleXShortClosure
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXShortClosureParserRuleCall_3_1_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleXShortClosure_in_ruleXFeatureCall10843);
+                            pushFollow(FOLLOW_45);
                             lv_featureCallArguments_8_0=ruleXShortClosure();
 
                             state._fsp--;
@@ -13467,7 +13467,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
                                      			current, 
                                      			"featureCallArguments",
                                       		lv_featureCallArguments_8_0, 
-                                      		"XShortClosure");
+                                      		"org.eclipse.xtext.xbase.Xbase.XShortClosure");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -13481,23 +13481,23 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
                             }
                             break;
                         case 2 :
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4667:6: ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* )
+                            // InternalCheckCfg.g:4667:6: ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* )
                             {
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4667:6: ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* )
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4667:7: ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )*
+                            // InternalCheckCfg.g:4667:6: ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* )
+                            // InternalCheckCfg.g:4667:7: ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )*
                             {
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4667:7: ( (lv_featureCallArguments_9_0= ruleXExpression ) )
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4668:1: (lv_featureCallArguments_9_0= ruleXExpression )
+                            // InternalCheckCfg.g:4667:7: ( (lv_featureCallArguments_9_0= ruleXExpression ) )
+                            // InternalCheckCfg.g:4668:1: (lv_featureCallArguments_9_0= ruleXExpression )
                             {
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4668:1: (lv_featureCallArguments_9_0= ruleXExpression )
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4669:3: lv_featureCallArguments_9_0= ruleXExpression
+                            // InternalCheckCfg.g:4668:1: (lv_featureCallArguments_9_0= ruleXExpression )
+                            // InternalCheckCfg.g:4669:3: lv_featureCallArguments_9_0= ruleXExpression
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXExpressionParserRuleCall_3_1_1_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleXExpression_in_ruleXFeatureCall10871);
+                            pushFollow(FOLLOW_13);
                             lv_featureCallArguments_9_0=ruleXExpression();
 
                             state._fsp--;
@@ -13511,7 +13511,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
                                      			current, 
                                      			"featureCallArguments",
                                       		lv_featureCallArguments_9_0, 
-                                      		"XExpression");
+                                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -13521,7 +13521,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
 
                             }
 
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4685:2: (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )*
+                            // InternalCheckCfg.g:4685:2: (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )*
                             loop84:
                             do {
                                 int alt84=2;
@@ -13534,26 +13534,26 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
 
                                 switch (alt84) {
                             	case 1 :
-                            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4685:4: otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) )
+                            	    // InternalCheckCfg.g:4685:4: otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) )
                             	    {
-                            	    otherlv_10=(Token)match(input,20,FOLLOW_20_in_ruleXFeatureCall10884); if (state.failed) return current;
+                            	    otherlv_10=(Token)match(input,20,FOLLOW_20); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	          	newLeafNode(otherlv_10, grammarAccess.getXFeatureCallAccess().getCommaKeyword_3_1_1_1_0());
                             	          
                             	    }
-                            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4689:1: ( (lv_featureCallArguments_11_0= ruleXExpression ) )
-                            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4690:1: (lv_featureCallArguments_11_0= ruleXExpression )
+                            	    // InternalCheckCfg.g:4689:1: ( (lv_featureCallArguments_11_0= ruleXExpression ) )
+                            	    // InternalCheckCfg.g:4690:1: (lv_featureCallArguments_11_0= ruleXExpression )
                             	    {
-                            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4690:1: (lv_featureCallArguments_11_0= ruleXExpression )
-                            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4691:3: lv_featureCallArguments_11_0= ruleXExpression
+                            	    // InternalCheckCfg.g:4690:1: (lv_featureCallArguments_11_0= ruleXExpression )
+                            	    // InternalCheckCfg.g:4691:3: lv_featureCallArguments_11_0= ruleXExpression
                             	    {
                             	    if ( state.backtracking==0 ) {
                             	       
                             	      	        newCompositeNode(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXExpressionParserRuleCall_3_1_1_1_1_0()); 
                             	      	    
                             	    }
-                            	    pushFollow(FOLLOW_ruleXExpression_in_ruleXFeatureCall10905);
+                            	    pushFollow(FOLLOW_13);
                             	    lv_featureCallArguments_11_0=ruleXExpression();
 
                             	    state._fsp--;
@@ -13567,7 +13567,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
                             	             			current, 
                             	             			"featureCallArguments",
                             	              		lv_featureCallArguments_11_0, 
-                            	              		"XExpression");
+                            	              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                             	      	        afterParserOrEnumRuleCall();
                             	      	    
                             	    }
@@ -13595,7 +13595,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
 
                     }
 
-                    otherlv_12=(Token)match(input,21,FOLLOW_21_in_ruleXFeatureCall10922); if (state.failed) return current;
+                    otherlv_12=(Token)match(input,21,FOLLOW_75); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_12, grammarAccess.getXFeatureCallAccess().getRightParenthesisKeyword_3_2());
@@ -13607,22 +13607,22 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4711:3: ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )?
+            // InternalCheckCfg.g:4711:3: ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )?
             int alt87=2;
             alt87 = dfa87.predict(input);
             switch (alt87) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4711:4: ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure )
+                    // InternalCheckCfg.g:4711:4: ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4714:1: (lv_featureCallArguments_13_0= ruleXClosure )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4715:3: lv_featureCallArguments_13_0= ruleXClosure
+                    // InternalCheckCfg.g:4714:1: (lv_featureCallArguments_13_0= ruleXClosure )
+                    // InternalCheckCfg.g:4715:3: lv_featureCallArguments_13_0= ruleXClosure
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXClosureParserRuleCall_4_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXClosure_in_ruleXFeatureCall10957);
+                    pushFollow(FOLLOW_2);
                     lv_featureCallArguments_13_0=ruleXClosure();
 
                     state._fsp--;
@@ -13636,7 +13636,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
                              			current, 
                              			"featureCallArguments",
                               		lv_featureCallArguments_13_0, 
-                              		"XClosure");
+                              		"org.eclipse.xtext.xbase.Xbase.XClosure");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -13672,7 +13672,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleFeatureCallID"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4739:1: entryRuleFeatureCallID returns [String current=null] : iv_ruleFeatureCallID= ruleFeatureCallID EOF ;
+    // InternalCheckCfg.g:4739:1: entryRuleFeatureCallID returns [String current=null] : iv_ruleFeatureCallID= ruleFeatureCallID EOF ;
     public final String entryRuleFeatureCallID() throws RecognitionException {
         String current = null;
 
@@ -13680,13 +13680,13 @@ public final String entryRuleFeatureCallID() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4740:2: (iv_ruleFeatureCallID= ruleFeatureCallID EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4741:2: iv_ruleFeatureCallID= ruleFeatureCallID EOF
+            // InternalCheckCfg.g:4740:2: (iv_ruleFeatureCallID= ruleFeatureCallID EOF )
+            // InternalCheckCfg.g:4741:2: iv_ruleFeatureCallID= ruleFeatureCallID EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getFeatureCallIDRule()); 
             }
-            pushFollow(FOLLOW_ruleFeatureCallID_in_entryRuleFeatureCallID10995);
+            pushFollow(FOLLOW_1);
             iv_ruleFeatureCallID=ruleFeatureCallID();
 
             state._fsp--;
@@ -13694,7 +13694,7 @@ public final String entryRuleFeatureCallID() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleFeatureCallID.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFeatureCallID11006); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -13712,7 +13712,7 @@ public final String entryRuleFeatureCallID() throws RecognitionException {
 
 
     // $ANTLR start "ruleFeatureCallID"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4748:1: ruleFeatureCallID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' ) ;
+    // InternalCheckCfg.g:4748:1: ruleFeatureCallID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' ) ;
     public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -13723,10 +13723,10 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4751:28: ( (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4752:1: (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' )
+            // InternalCheckCfg.g:4751:28: ( (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' ) )
+            // InternalCheckCfg.g:4752:1: (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4752:1: (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' )
+            // InternalCheckCfg.g:4752:1: (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' )
             int alt88=5;
             switch ( input.LA(1) ) {
             case RULE_ID:
@@ -13764,14 +13764,14 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
 
             switch (alt88) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4753:5: this_ValidID_0= ruleValidID
+                    // InternalCheckCfg.g:4753:5: this_ValidID_0= ruleValidID
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getFeatureCallIDAccess().getValidIDParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleValidID_in_ruleFeatureCallID11053);
+                    pushFollow(FOLLOW_2);
                     this_ValidID_0=ruleValidID();
 
                     state._fsp--;
@@ -13790,9 +13790,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4765:2: kw= 'extends'
+                    // InternalCheckCfg.g:4765:2: kw= 'extends'
                     {
-                    kw=(Token)match(input,72,FOLLOW_72_in_ruleFeatureCallID11077); if (state.failed) return current;
+                    kw=(Token)match(input,72,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -13803,9 +13803,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4772:2: kw= 'static'
+                    // InternalCheckCfg.g:4772:2: kw= 'static'
                     {
-                    kw=(Token)match(input,73,FOLLOW_73_in_ruleFeatureCallID11096); if (state.failed) return current;
+                    kw=(Token)match(input,73,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -13816,9 +13816,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4779:2: kw= 'import'
+                    // InternalCheckCfg.g:4779:2: kw= 'import'
                     {
-                    kw=(Token)match(input,74,FOLLOW_74_in_ruleFeatureCallID11115); if (state.failed) return current;
+                    kw=(Token)match(input,74,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -13829,9 +13829,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4786:2: kw= 'extension'
+                    // InternalCheckCfg.g:4786:2: kw= 'extension'
                     {
-                    kw=(Token)match(input,75,FOLLOW_75_in_ruleFeatureCallID11134); if (state.failed) return current;
+                    kw=(Token)match(input,75,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -13864,7 +13864,7 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
 
 
     // $ANTLR start "entryRuleIdOrSuper"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4799:1: entryRuleIdOrSuper returns [String current=null] : iv_ruleIdOrSuper= ruleIdOrSuper EOF ;
+    // InternalCheckCfg.g:4799:1: entryRuleIdOrSuper returns [String current=null] : iv_ruleIdOrSuper= ruleIdOrSuper EOF ;
     public final String entryRuleIdOrSuper() throws RecognitionException {
         String current = null;
 
@@ -13872,13 +13872,13 @@ public final String entryRuleIdOrSuper() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4800:2: (iv_ruleIdOrSuper= ruleIdOrSuper EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4801:2: iv_ruleIdOrSuper= ruleIdOrSuper EOF
+            // InternalCheckCfg.g:4800:2: (iv_ruleIdOrSuper= ruleIdOrSuper EOF )
+            // InternalCheckCfg.g:4801:2: iv_ruleIdOrSuper= ruleIdOrSuper EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getIdOrSuperRule()); 
             }
-            pushFollow(FOLLOW_ruleIdOrSuper_in_entryRuleIdOrSuper11175);
+            pushFollow(FOLLOW_1);
             iv_ruleIdOrSuper=ruleIdOrSuper();
 
             state._fsp--;
@@ -13886,7 +13886,7 @@ public final String entryRuleIdOrSuper() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleIdOrSuper.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIdOrSuper11186); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -13904,7 +13904,7 @@ public final String entryRuleIdOrSuper() throws RecognitionException {
 
 
     // $ANTLR start "ruleIdOrSuper"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4808:1: ruleIdOrSuper returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' ) ;
+    // InternalCheckCfg.g:4808:1: ruleIdOrSuper returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' ) ;
     public final AntlrDatatypeRuleToken ruleIdOrSuper() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -13915,10 +13915,10 @@ public final AntlrDatatypeRuleToken ruleIdOrSuper() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4811:28: ( (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4812:1: (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' )
+            // InternalCheckCfg.g:4811:28: ( (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' ) )
+            // InternalCheckCfg.g:4812:1: (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4812:1: (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' )
+            // InternalCheckCfg.g:4812:1: (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' )
             int alt89=2;
             int LA89_0 = input.LA(1);
 
@@ -13937,14 +13937,14 @@ else if ( (LA89_0==76) ) {
             }
             switch (alt89) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4813:5: this_FeatureCallID_0= ruleFeatureCallID
+                    // InternalCheckCfg.g:4813:5: this_FeatureCallID_0= ruleFeatureCallID
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getIdOrSuperAccess().getFeatureCallIDParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleFeatureCallID_in_ruleIdOrSuper11233);
+                    pushFollow(FOLLOW_2);
                     this_FeatureCallID_0=ruleFeatureCallID();
 
                     state._fsp--;
@@ -13963,9 +13963,9 @@ else if ( (LA89_0==76) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4825:2: kw= 'super'
+                    // InternalCheckCfg.g:4825:2: kw= 'super'
                     {
-                    kw=(Token)match(input,76,FOLLOW_76_in_ruleIdOrSuper11257); if (state.failed) return current;
+                    kw=(Token)match(input,76,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -13998,7 +13998,7 @@ else if ( (LA89_0==76) ) {
 
 
     // $ANTLR start "entryRuleXConstructorCall"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4838:1: entryRuleXConstructorCall returns [EObject current=null] : iv_ruleXConstructorCall= ruleXConstructorCall EOF ;
+    // InternalCheckCfg.g:4838:1: entryRuleXConstructorCall returns [EObject current=null] : iv_ruleXConstructorCall= ruleXConstructorCall EOF ;
     public final EObject entryRuleXConstructorCall() throws RecognitionException {
         EObject current = null;
 
@@ -14006,13 +14006,13 @@ public final EObject entryRuleXConstructorCall() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4839:2: (iv_ruleXConstructorCall= ruleXConstructorCall EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4840:2: iv_ruleXConstructorCall= ruleXConstructorCall EOF
+            // InternalCheckCfg.g:4839:2: (iv_ruleXConstructorCall= ruleXConstructorCall EOF )
+            // InternalCheckCfg.g:4840:2: iv_ruleXConstructorCall= ruleXConstructorCall EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXConstructorCallRule()); 
             }
-            pushFollow(FOLLOW_ruleXConstructorCall_in_entryRuleXConstructorCall11297);
+            pushFollow(FOLLOW_1);
             iv_ruleXConstructorCall=ruleXConstructorCall();
 
             state._fsp--;
@@ -14020,7 +14020,7 @@ public final EObject entryRuleXConstructorCall() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXConstructorCall; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXConstructorCall11307); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -14038,7 +14038,7 @@ public final EObject entryRuleXConstructorCall() throws RecognitionException {
 
 
     // $ANTLR start "ruleXConstructorCall"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4847:1: ruleXConstructorCall returns [EObject current=null] : ( () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )? ) ;
+    // InternalCheckCfg.g:4847:1: ruleXConstructorCall returns [EObject current=null] : ( () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )? ) ;
     public final EObject ruleXConstructorCall() throws RecognitionException {
         EObject current = null;
 
@@ -14065,14 +14065,14 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4850:28: ( ( () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4851:1: ( () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )? )
+            // InternalCheckCfg.g:4850:28: ( ( () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )? ) )
+            // InternalCheckCfg.g:4851:1: ( () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4851:1: ( () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )? )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4851:2: () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )?
+            // InternalCheckCfg.g:4851:1: ( () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )? )
+            // InternalCheckCfg.g:4851:2: () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )?
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4851:2: ()
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4852:5: 
+            // InternalCheckCfg.g:4851:2: ()
+            // InternalCheckCfg.g:4852:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -14084,17 +14084,17 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,77,FOLLOW_77_in_ruleXConstructorCall11353); if (state.failed) return current;
+            otherlv_1=(Token)match(input,77,FOLLOW_4); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXConstructorCallAccess().getNewKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4861:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4862:1: ( ruleQualifiedName )
+            // InternalCheckCfg.g:4861:1: ( ( ruleQualifiedName ) )
+            // InternalCheckCfg.g:4862:1: ( ruleQualifiedName )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4862:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4863:3: ruleQualifiedName
+            // InternalCheckCfg.g:4862:1: ( ruleQualifiedName )
+            // InternalCheckCfg.g:4863:3: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
 
@@ -14108,7 +14108,7 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
               	        newCompositeNode(grammarAccess.getXConstructorCallAccess().getConstructorJvmConstructorCrossReference_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_ruleXConstructorCall11376);
+            pushFollow(FOLLOW_76);
             ruleQualifiedName();
 
             state._fsp--;
@@ -14124,17 +14124,17 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4876:2: ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )?
+            // InternalCheckCfg.g:4876:2: ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )?
             int alt91=2;
             alt91 = dfa91.predict(input);
             switch (alt91) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4876:3: ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>'
+                    // InternalCheckCfg.g:4876:3: ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>'
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4876:3: ( ( '<' )=>otherlv_3= '<' )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4876:4: ( '<' )=>otherlv_3= '<'
+                    // InternalCheckCfg.g:4876:3: ( ( '<' )=>otherlv_3= '<' )
+                    // InternalCheckCfg.g:4876:4: ( '<' )=>otherlv_3= '<'
                     {
-                    otherlv_3=(Token)match(input,31,FOLLOW_31_in_ruleXConstructorCall11397); if (state.failed) return current;
+                    otherlv_3=(Token)match(input,31,FOLLOW_41); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_3, grammarAccess.getXConstructorCallAccess().getLessThanSignKeyword_3_0());
@@ -14143,18 +14143,18 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4881:2: ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4882:1: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
+                    // InternalCheckCfg.g:4881:2: ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) )
+                    // InternalCheckCfg.g:4882:1: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4882:1: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4883:3: lv_typeArguments_4_0= ruleJvmArgumentTypeReference
+                    // InternalCheckCfg.g:4882:1: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
+                    // InternalCheckCfg.g:4883:3: lv_typeArguments_4_0= ruleJvmArgumentTypeReference
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXConstructorCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_3_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleXConstructorCall11419);
+                    pushFollow(FOLLOW_42);
                     lv_typeArguments_4_0=ruleJvmArgumentTypeReference();
 
                     state._fsp--;
@@ -14168,7 +14168,7 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
                              			current, 
                              			"typeArguments",
                               		lv_typeArguments_4_0, 
-                              		"JvmArgumentTypeReference");
+                              		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -14178,7 +14178,7 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4899:2: (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )*
+                    // InternalCheckCfg.g:4899:2: (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )*
                     loop90:
                     do {
                         int alt90=2;
@@ -14191,26 +14191,26 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
                         switch (alt90) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4899:4: otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) )
+                    	    // InternalCheckCfg.g:4899:4: otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) )
                     	    {
-                    	    otherlv_5=(Token)match(input,20,FOLLOW_20_in_ruleXConstructorCall11432); if (state.failed) return current;
+                    	    otherlv_5=(Token)match(input,20,FOLLOW_41); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_5, grammarAccess.getXConstructorCallAccess().getCommaKeyword_3_2_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4903:1: ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) )
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4904:1: (lv_typeArguments_6_0= ruleJvmArgumentTypeReference )
+                    	    // InternalCheckCfg.g:4903:1: ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) )
+                    	    // InternalCheckCfg.g:4904:1: (lv_typeArguments_6_0= ruleJvmArgumentTypeReference )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4904:1: (lv_typeArguments_6_0= ruleJvmArgumentTypeReference )
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4905:3: lv_typeArguments_6_0= ruleJvmArgumentTypeReference
+                    	    // InternalCheckCfg.g:4904:1: (lv_typeArguments_6_0= ruleJvmArgumentTypeReference )
+                    	    // InternalCheckCfg.g:4905:3: lv_typeArguments_6_0= ruleJvmArgumentTypeReference
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getXConstructorCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_3_2_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleXConstructorCall11453);
+                    	    pushFollow(FOLLOW_42);
                     	    lv_typeArguments_6_0=ruleJvmArgumentTypeReference();
 
                     	    state._fsp--;
@@ -14224,7 +14224,7 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
                     	             			current, 
                     	             			"typeArguments",
                     	              		lv_typeArguments_6_0, 
-                    	              		"JvmArgumentTypeReference");
+                    	              		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -14243,7 +14243,7 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
                         }
                     } while (true);
 
-                    otherlv_7=(Token)match(input,32,FOLLOW_32_in_ruleXConstructorCall11467); if (state.failed) return current;
+                    otherlv_7=(Token)match(input,32,FOLLOW_74); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_7, grammarAccess.getXConstructorCallAccess().getGreaterThanSignKeyword_3_3());
@@ -14255,20 +14255,20 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4925:3: ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )?
+            // InternalCheckCfg.g:4925:3: ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )?
             int alt94=2;
             alt94 = dfa94.predict(input);
             switch (alt94) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4925:4: ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')'
+                    // InternalCheckCfg.g:4925:4: ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')'
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4925:4: ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4925:5: ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' )
+                    // InternalCheckCfg.g:4925:4: ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) )
+                    // InternalCheckCfg.g:4925:5: ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4932:1: (lv_explicitConstructorCall_8_0= '(' )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4933:3: lv_explicitConstructorCall_8_0= '('
+                    // InternalCheckCfg.g:4932:1: (lv_explicitConstructorCall_8_0= '(' )
+                    // InternalCheckCfg.g:4933:3: lv_explicitConstructorCall_8_0= '('
                     {
-                    lv_explicitConstructorCall_8_0=(Token)match(input,19,FOLLOW_19_in_ruleXConstructorCall11503); if (state.failed) return current;
+                    lv_explicitConstructorCall_8_0=(Token)match(input,19,FOLLOW_44); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_explicitConstructorCall_8_0, grammarAccess.getXConstructorCallAccess().getExplicitConstructorCallLeftParenthesisKeyword_4_0_0());
@@ -14288,25 +14288,25 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4946:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )?
+                    // InternalCheckCfg.g:4946:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )?
                     int alt93=3;
                     alt93 = dfa93.predict(input);
                     switch (alt93) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4946:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) )
+                            // InternalCheckCfg.g:4946:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) )
                             {
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4946:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) )
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4946:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure )
+                            // InternalCheckCfg.g:4946:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) )
+                            // InternalCheckCfg.g:4946:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure )
                             {
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4963:1: (lv_arguments_9_0= ruleXShortClosure )
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4964:3: lv_arguments_9_0= ruleXShortClosure
+                            // InternalCheckCfg.g:4963:1: (lv_arguments_9_0= ruleXShortClosure )
+                            // InternalCheckCfg.g:4964:3: lv_arguments_9_0= ruleXShortClosure
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXConstructorCallAccess().getArgumentsXShortClosureParserRuleCall_4_1_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleXShortClosure_in_ruleXConstructorCall11588);
+                            pushFollow(FOLLOW_45);
                             lv_arguments_9_0=ruleXShortClosure();
 
                             state._fsp--;
@@ -14320,7 +14320,7 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
                                      			current, 
                                      			"arguments",
                                       		lv_arguments_9_0, 
-                                      		"XShortClosure");
+                                      		"org.eclipse.xtext.xbase.Xbase.XShortClosure");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -14334,23 +14334,23 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
                             }
                             break;
                         case 2 :
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4981:6: ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* )
+                            // InternalCheckCfg.g:4981:6: ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* )
                             {
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4981:6: ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* )
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4981:7: ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )*
+                            // InternalCheckCfg.g:4981:6: ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* )
+                            // InternalCheckCfg.g:4981:7: ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )*
                             {
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4981:7: ( (lv_arguments_10_0= ruleXExpression ) )
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4982:1: (lv_arguments_10_0= ruleXExpression )
+                            // InternalCheckCfg.g:4981:7: ( (lv_arguments_10_0= ruleXExpression ) )
+                            // InternalCheckCfg.g:4982:1: (lv_arguments_10_0= ruleXExpression )
                             {
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4982:1: (lv_arguments_10_0= ruleXExpression )
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4983:3: lv_arguments_10_0= ruleXExpression
+                            // InternalCheckCfg.g:4982:1: (lv_arguments_10_0= ruleXExpression )
+                            // InternalCheckCfg.g:4983:3: lv_arguments_10_0= ruleXExpression
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXConstructorCallAccess().getArgumentsXExpressionParserRuleCall_4_1_1_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleXExpression_in_ruleXConstructorCall11616);
+                            pushFollow(FOLLOW_13);
                             lv_arguments_10_0=ruleXExpression();
 
                             state._fsp--;
@@ -14364,7 +14364,7 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
                                      			current, 
                                      			"arguments",
                                       		lv_arguments_10_0, 
-                                      		"XExpression");
+                                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -14374,7 +14374,7 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
                             }
 
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4999:2: (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )*
+                            // InternalCheckCfg.g:4999:2: (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )*
                             loop92:
                             do {
                                 int alt92=2;
@@ -14387,26 +14387,26 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
                                 switch (alt92) {
                             	case 1 :
-                            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4999:4: otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) )
+                            	    // InternalCheckCfg.g:4999:4: otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) )
                             	    {
-                            	    otherlv_11=(Token)match(input,20,FOLLOW_20_in_ruleXConstructorCall11629); if (state.failed) return current;
+                            	    otherlv_11=(Token)match(input,20,FOLLOW_20); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	          	newLeafNode(otherlv_11, grammarAccess.getXConstructorCallAccess().getCommaKeyword_4_1_1_1_0());
                             	          
                             	    }
-                            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5003:1: ( (lv_arguments_12_0= ruleXExpression ) )
-                            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5004:1: (lv_arguments_12_0= ruleXExpression )
+                            	    // InternalCheckCfg.g:5003:1: ( (lv_arguments_12_0= ruleXExpression ) )
+                            	    // InternalCheckCfg.g:5004:1: (lv_arguments_12_0= ruleXExpression )
                             	    {
-                            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5004:1: (lv_arguments_12_0= ruleXExpression )
-                            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5005:3: lv_arguments_12_0= ruleXExpression
+                            	    // InternalCheckCfg.g:5004:1: (lv_arguments_12_0= ruleXExpression )
+                            	    // InternalCheckCfg.g:5005:3: lv_arguments_12_0= ruleXExpression
                             	    {
                             	    if ( state.backtracking==0 ) {
                             	       
                             	      	        newCompositeNode(grammarAccess.getXConstructorCallAccess().getArgumentsXExpressionParserRuleCall_4_1_1_1_1_0()); 
                             	      	    
                             	    }
-                            	    pushFollow(FOLLOW_ruleXExpression_in_ruleXConstructorCall11650);
+                            	    pushFollow(FOLLOW_13);
                             	    lv_arguments_12_0=ruleXExpression();
 
                             	    state._fsp--;
@@ -14420,7 +14420,7 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
                             	             			current, 
                             	             			"arguments",
                             	              		lv_arguments_12_0, 
-                            	              		"XExpression");
+                            	              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                             	      	        afterParserOrEnumRuleCall();
                             	      	    
                             	    }
@@ -14448,7 +14448,7 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
                     }
 
-                    otherlv_13=(Token)match(input,21,FOLLOW_21_in_ruleXConstructorCall11667); if (state.failed) return current;
+                    otherlv_13=(Token)match(input,21,FOLLOW_75); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_13, grammarAccess.getXConstructorCallAccess().getRightParenthesisKeyword_4_2());
@@ -14460,22 +14460,22 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5025:3: ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )?
+            // InternalCheckCfg.g:5025:3: ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )?
             int alt95=2;
             alt95 = dfa95.predict(input);
             switch (alt95) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5025:4: ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure )
+                    // InternalCheckCfg.g:5025:4: ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5028:1: (lv_arguments_14_0= ruleXClosure )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5029:3: lv_arguments_14_0= ruleXClosure
+                    // InternalCheckCfg.g:5028:1: (lv_arguments_14_0= ruleXClosure )
+                    // InternalCheckCfg.g:5029:3: lv_arguments_14_0= ruleXClosure
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXConstructorCallAccess().getArgumentsXClosureParserRuleCall_5_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXClosure_in_ruleXConstructorCall11702);
+                    pushFollow(FOLLOW_2);
                     lv_arguments_14_0=ruleXClosure();
 
                     state._fsp--;
@@ -14489,7 +14489,7 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
                              			current, 
                              			"arguments",
                               		lv_arguments_14_0, 
-                              		"XClosure");
+                              		"org.eclipse.xtext.xbase.Xbase.XClosure");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -14525,7 +14525,7 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXBooleanLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5053:1: entryRuleXBooleanLiteral returns [EObject current=null] : iv_ruleXBooleanLiteral= ruleXBooleanLiteral EOF ;
+    // InternalCheckCfg.g:5053:1: entryRuleXBooleanLiteral returns [EObject current=null] : iv_ruleXBooleanLiteral= ruleXBooleanLiteral EOF ;
     public final EObject entryRuleXBooleanLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -14533,13 +14533,13 @@ public final EObject entryRuleXBooleanLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5054:2: (iv_ruleXBooleanLiteral= ruleXBooleanLiteral EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5055:2: iv_ruleXBooleanLiteral= ruleXBooleanLiteral EOF
+            // InternalCheckCfg.g:5054:2: (iv_ruleXBooleanLiteral= ruleXBooleanLiteral EOF )
+            // InternalCheckCfg.g:5055:2: iv_ruleXBooleanLiteral= ruleXBooleanLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXBooleanLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXBooleanLiteral_in_entryRuleXBooleanLiteral11739);
+            pushFollow(FOLLOW_1);
             iv_ruleXBooleanLiteral=ruleXBooleanLiteral();
 
             state._fsp--;
@@ -14547,7 +14547,7 @@ public final EObject entryRuleXBooleanLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXBooleanLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXBooleanLiteral11749); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -14565,7 +14565,7 @@ public final EObject entryRuleXBooleanLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXBooleanLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5062:1: ruleXBooleanLiteral returns [EObject current=null] : ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) ;
+    // InternalCheckCfg.g:5062:1: ruleXBooleanLiteral returns [EObject current=null] : ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) ;
     public final EObject ruleXBooleanLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -14575,14 +14575,14 @@ public final EObject ruleXBooleanLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5065:28: ( ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5066:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
+            // InternalCheckCfg.g:5065:28: ( ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) )
+            // InternalCheckCfg.g:5066:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5066:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5066:2: () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
+            // InternalCheckCfg.g:5066:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
+            // InternalCheckCfg.g:5066:2: () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5066:2: ()
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5067:5: 
+            // InternalCheckCfg.g:5066:2: ()
+            // InternalCheckCfg.g:5067:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -14594,7 +14594,7 @@ public final EObject ruleXBooleanLiteral() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5072:2: (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
+            // InternalCheckCfg.g:5072:2: (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
             int alt96=2;
             int LA96_0 = input.LA(1);
 
@@ -14613,9 +14613,9 @@ else if ( (LA96_0==79) ) {
             }
             switch (alt96) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5072:4: otherlv_1= 'false'
+                    // InternalCheckCfg.g:5072:4: otherlv_1= 'false'
                     {
-                    otherlv_1=(Token)match(input,78,FOLLOW_78_in_ruleXBooleanLiteral11796); if (state.failed) return current;
+                    otherlv_1=(Token)match(input,78,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_1, grammarAccess.getXBooleanLiteralAccess().getFalseKeyword_1_0());
@@ -14625,15 +14625,15 @@ else if ( (LA96_0==79) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5077:6: ( (lv_isTrue_2_0= 'true' ) )
+                    // InternalCheckCfg.g:5077:6: ( (lv_isTrue_2_0= 'true' ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5077:6: ( (lv_isTrue_2_0= 'true' ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5078:1: (lv_isTrue_2_0= 'true' )
+                    // InternalCheckCfg.g:5077:6: ( (lv_isTrue_2_0= 'true' ) )
+                    // InternalCheckCfg.g:5078:1: (lv_isTrue_2_0= 'true' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5078:1: (lv_isTrue_2_0= 'true' )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5079:3: lv_isTrue_2_0= 'true'
+                    // InternalCheckCfg.g:5078:1: (lv_isTrue_2_0= 'true' )
+                    // InternalCheckCfg.g:5079:3: lv_isTrue_2_0= 'true'
                     {
-                    lv_isTrue_2_0=(Token)match(input,79,FOLLOW_79_in_ruleXBooleanLiteral11820); if (state.failed) return current;
+                    lv_isTrue_2_0=(Token)match(input,79,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_isTrue_2_0, grammarAccess.getXBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0());
@@ -14682,7 +14682,7 @@ else if ( (LA96_0==79) ) {
 
 
     // $ANTLR start "entryRuleXNullLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5100:1: entryRuleXNullLiteral returns [EObject current=null] : iv_ruleXNullLiteral= ruleXNullLiteral EOF ;
+    // InternalCheckCfg.g:5100:1: entryRuleXNullLiteral returns [EObject current=null] : iv_ruleXNullLiteral= ruleXNullLiteral EOF ;
     public final EObject entryRuleXNullLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -14690,13 +14690,13 @@ public final EObject entryRuleXNullLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5101:2: (iv_ruleXNullLiteral= ruleXNullLiteral EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5102:2: iv_ruleXNullLiteral= ruleXNullLiteral EOF
+            // InternalCheckCfg.g:5101:2: (iv_ruleXNullLiteral= ruleXNullLiteral EOF )
+            // InternalCheckCfg.g:5102:2: iv_ruleXNullLiteral= ruleXNullLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXNullLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXNullLiteral_in_entryRuleXNullLiteral11870);
+            pushFollow(FOLLOW_1);
             iv_ruleXNullLiteral=ruleXNullLiteral();
 
             state._fsp--;
@@ -14704,7 +14704,7 @@ public final EObject entryRuleXNullLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXNullLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXNullLiteral11880); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -14722,7 +14722,7 @@ public final EObject entryRuleXNullLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXNullLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5109:1: ruleXNullLiteral returns [EObject current=null] : ( () otherlv_1= 'null' ) ;
+    // InternalCheckCfg.g:5109:1: ruleXNullLiteral returns [EObject current=null] : ( () otherlv_1= 'null' ) ;
     public final EObject ruleXNullLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -14731,14 +14731,14 @@ public final EObject ruleXNullLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5112:28: ( ( () otherlv_1= 'null' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5113:1: ( () otherlv_1= 'null' )
+            // InternalCheckCfg.g:5112:28: ( ( () otherlv_1= 'null' ) )
+            // InternalCheckCfg.g:5113:1: ( () otherlv_1= 'null' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5113:1: ( () otherlv_1= 'null' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5113:2: () otherlv_1= 'null'
+            // InternalCheckCfg.g:5113:1: ( () otherlv_1= 'null' )
+            // InternalCheckCfg.g:5113:2: () otherlv_1= 'null'
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5113:2: ()
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5114:5: 
+            // InternalCheckCfg.g:5113:2: ()
+            // InternalCheckCfg.g:5114:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -14750,7 +14750,7 @@ public final EObject ruleXNullLiteral() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,80,FOLLOW_80_in_ruleXNullLiteral11926); if (state.failed) return current;
+            otherlv_1=(Token)match(input,80,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXNullLiteralAccess().getNullKeyword_1());
@@ -14779,7 +14779,7 @@ public final EObject ruleXNullLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXNumberLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5131:1: entryRuleXNumberLiteral returns [EObject current=null] : iv_ruleXNumberLiteral= ruleXNumberLiteral EOF ;
+    // InternalCheckCfg.g:5131:1: entryRuleXNumberLiteral returns [EObject current=null] : iv_ruleXNumberLiteral= ruleXNumberLiteral EOF ;
     public final EObject entryRuleXNumberLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -14787,13 +14787,13 @@ public final EObject entryRuleXNumberLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5132:2: (iv_ruleXNumberLiteral= ruleXNumberLiteral EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5133:2: iv_ruleXNumberLiteral= ruleXNumberLiteral EOF
+            // InternalCheckCfg.g:5132:2: (iv_ruleXNumberLiteral= ruleXNumberLiteral EOF )
+            // InternalCheckCfg.g:5133:2: iv_ruleXNumberLiteral= ruleXNumberLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXNumberLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXNumberLiteral_in_entryRuleXNumberLiteral11962);
+            pushFollow(FOLLOW_1);
             iv_ruleXNumberLiteral=ruleXNumberLiteral();
 
             state._fsp--;
@@ -14801,7 +14801,7 @@ public final EObject entryRuleXNumberLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXNumberLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXNumberLiteral11972); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -14819,7 +14819,7 @@ public final EObject entryRuleXNumberLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXNumberLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5140:1: ruleXNumberLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= ruleNumber ) ) ) ;
+    // InternalCheckCfg.g:5140:1: ruleXNumberLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= ruleNumber ) ) ) ;
     public final EObject ruleXNumberLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -14829,14 +14829,14 @@ public final EObject ruleXNumberLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5143:28: ( ( () ( (lv_value_1_0= ruleNumber ) ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5144:1: ( () ( (lv_value_1_0= ruleNumber ) ) )
+            // InternalCheckCfg.g:5143:28: ( ( () ( (lv_value_1_0= ruleNumber ) ) ) )
+            // InternalCheckCfg.g:5144:1: ( () ( (lv_value_1_0= ruleNumber ) ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5144:1: ( () ( (lv_value_1_0= ruleNumber ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5144:2: () ( (lv_value_1_0= ruleNumber ) )
+            // InternalCheckCfg.g:5144:1: ( () ( (lv_value_1_0= ruleNumber ) ) )
+            // InternalCheckCfg.g:5144:2: () ( (lv_value_1_0= ruleNumber ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5144:2: ()
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5145:5: 
+            // InternalCheckCfg.g:5144:2: ()
+            // InternalCheckCfg.g:5145:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -14848,18 +14848,18 @@ public final EObject ruleXNumberLiteral() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5150:2: ( (lv_value_1_0= ruleNumber ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5151:1: (lv_value_1_0= ruleNumber )
+            // InternalCheckCfg.g:5150:2: ( (lv_value_1_0= ruleNumber ) )
+            // InternalCheckCfg.g:5151:1: (lv_value_1_0= ruleNumber )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5151:1: (lv_value_1_0= ruleNumber )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5152:3: lv_value_1_0= ruleNumber
+            // InternalCheckCfg.g:5151:1: (lv_value_1_0= ruleNumber )
+            // InternalCheckCfg.g:5152:3: lv_value_1_0= ruleNumber
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXNumberLiteralAccess().getValueNumberParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleNumber_in_ruleXNumberLiteral12027);
+            pushFollow(FOLLOW_2);
             lv_value_1_0=ruleNumber();
 
             state._fsp--;
@@ -14873,7 +14873,7 @@ public final EObject ruleXNumberLiteral() throws RecognitionException {
                      			current, 
                      			"value",
                       		lv_value_1_0, 
-                      		"Number");
+                      		"org.eclipse.xtext.xbase.Xbase.Number");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -14906,7 +14906,7 @@ public final EObject ruleXNumberLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXStringLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5176:1: entryRuleXStringLiteral returns [EObject current=null] : iv_ruleXStringLiteral= ruleXStringLiteral EOF ;
+    // InternalCheckCfg.g:5176:1: entryRuleXStringLiteral returns [EObject current=null] : iv_ruleXStringLiteral= ruleXStringLiteral EOF ;
     public final EObject entryRuleXStringLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -14914,13 +14914,13 @@ public final EObject entryRuleXStringLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5177:2: (iv_ruleXStringLiteral= ruleXStringLiteral EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5178:2: iv_ruleXStringLiteral= ruleXStringLiteral EOF
+            // InternalCheckCfg.g:5177:2: (iv_ruleXStringLiteral= ruleXStringLiteral EOF )
+            // InternalCheckCfg.g:5178:2: iv_ruleXStringLiteral= ruleXStringLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXStringLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXStringLiteral_in_entryRuleXStringLiteral12063);
+            pushFollow(FOLLOW_1);
             iv_ruleXStringLiteral=ruleXStringLiteral();
 
             state._fsp--;
@@ -14928,7 +14928,7 @@ public final EObject entryRuleXStringLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXStringLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXStringLiteral12073); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -14946,7 +14946,7 @@ public final EObject entryRuleXStringLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXStringLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5185:1: ruleXStringLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= RULE_STRING ) ) ) ;
+    // InternalCheckCfg.g:5185:1: ruleXStringLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= RULE_STRING ) ) ) ;
     public final EObject ruleXStringLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -14955,14 +14955,14 @@ public final EObject ruleXStringLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5188:28: ( ( () ( (lv_value_1_0= RULE_STRING ) ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5189:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
+            // InternalCheckCfg.g:5188:28: ( ( () ( (lv_value_1_0= RULE_STRING ) ) ) )
+            // InternalCheckCfg.g:5189:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5189:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5189:2: () ( (lv_value_1_0= RULE_STRING ) )
+            // InternalCheckCfg.g:5189:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
+            // InternalCheckCfg.g:5189:2: () ( (lv_value_1_0= RULE_STRING ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5189:2: ()
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5190:5: 
+            // InternalCheckCfg.g:5189:2: ()
+            // InternalCheckCfg.g:5190:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -14974,13 +14974,13 @@ public final EObject ruleXStringLiteral() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5195:2: ( (lv_value_1_0= RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5196:1: (lv_value_1_0= RULE_STRING )
+            // InternalCheckCfg.g:5195:2: ( (lv_value_1_0= RULE_STRING ) )
+            // InternalCheckCfg.g:5196:1: (lv_value_1_0= RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5196:1: (lv_value_1_0= RULE_STRING )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5197:3: lv_value_1_0= RULE_STRING
+            // InternalCheckCfg.g:5196:1: (lv_value_1_0= RULE_STRING )
+            // InternalCheckCfg.g:5197:3: lv_value_1_0= RULE_STRING
             {
-            lv_value_1_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleXStringLiteral12124); if (state.failed) return current;
+            lv_value_1_0=(Token)match(input,RULE_STRING,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(lv_value_1_0, grammarAccess.getXStringLiteralAccess().getValueSTRINGTerminalRuleCall_1_0()); 
@@ -14995,7 +14995,7 @@ public final EObject ruleXStringLiteral() throws RecognitionException {
                      			current, 
                      			"value",
                       		lv_value_1_0, 
-                      		"STRING");
+                      		"org.eclipse.xtext.xbase.Xtype.STRING");
               	    
             }
 
@@ -15027,7 +15027,7 @@ public final EObject ruleXStringLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXTypeLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5221:1: entryRuleXTypeLiteral returns [EObject current=null] : iv_ruleXTypeLiteral= ruleXTypeLiteral EOF ;
+    // InternalCheckCfg.g:5221:1: entryRuleXTypeLiteral returns [EObject current=null] : iv_ruleXTypeLiteral= ruleXTypeLiteral EOF ;
     public final EObject entryRuleXTypeLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -15035,13 +15035,13 @@ public final EObject entryRuleXTypeLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5222:2: (iv_ruleXTypeLiteral= ruleXTypeLiteral EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5223:2: iv_ruleXTypeLiteral= ruleXTypeLiteral EOF
+            // InternalCheckCfg.g:5222:2: (iv_ruleXTypeLiteral= ruleXTypeLiteral EOF )
+            // InternalCheckCfg.g:5223:2: iv_ruleXTypeLiteral= ruleXTypeLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXTypeLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXTypeLiteral_in_entryRuleXTypeLiteral12165);
+            pushFollow(FOLLOW_1);
             iv_ruleXTypeLiteral=ruleXTypeLiteral();
 
             state._fsp--;
@@ -15049,7 +15049,7 @@ public final EObject entryRuleXTypeLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXTypeLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXTypeLiteral12175); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -15067,7 +15067,7 @@ public final EObject entryRuleXTypeLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXTypeLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5230:1: ruleXTypeLiteral returns [EObject current=null] : ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' ) ;
+    // InternalCheckCfg.g:5230:1: ruleXTypeLiteral returns [EObject current=null] : ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' ) ;
     public final EObject ruleXTypeLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -15080,14 +15080,14 @@ public final EObject ruleXTypeLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5233:28: ( ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5234:1: ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' )
+            // InternalCheckCfg.g:5233:28: ( ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' ) )
+            // InternalCheckCfg.g:5234:1: ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5234:1: ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5234:2: () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')'
+            // InternalCheckCfg.g:5234:1: ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' )
+            // InternalCheckCfg.g:5234:2: () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')'
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5234:2: ()
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5235:5: 
+            // InternalCheckCfg.g:5234:2: ()
+            // InternalCheckCfg.g:5235:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -15099,23 +15099,23 @@ public final EObject ruleXTypeLiteral() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,81,FOLLOW_81_in_ruleXTypeLiteral12221); if (state.failed) return current;
+            otherlv_1=(Token)match(input,81,FOLLOW_56); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXTypeLiteralAccess().getTypeofKeyword_1());
                   
             }
-            otherlv_2=(Token)match(input,19,FOLLOW_19_in_ruleXTypeLiteral12233); if (state.failed) return current;
+            otherlv_2=(Token)match(input,19,FOLLOW_4); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getXTypeLiteralAccess().getLeftParenthesisKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5248:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5249:1: ( ruleQualifiedName )
+            // InternalCheckCfg.g:5248:1: ( ( ruleQualifiedName ) )
+            // InternalCheckCfg.g:5249:1: ( ruleQualifiedName )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5249:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5250:3: ruleQualifiedName
+            // InternalCheckCfg.g:5249:1: ( ruleQualifiedName )
+            // InternalCheckCfg.g:5250:3: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
 
@@ -15129,7 +15129,7 @@ public final EObject ruleXTypeLiteral() throws RecognitionException {
               	        newCompositeNode(grammarAccess.getXTypeLiteralAccess().getTypeJvmTypeCrossReference_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_ruleXTypeLiteral12256);
+            pushFollow(FOLLOW_77);
             ruleQualifiedName();
 
             state._fsp--;
@@ -15145,7 +15145,7 @@ public final EObject ruleXTypeLiteral() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5263:2: ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )*
+            // InternalCheckCfg.g:5263:2: ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )*
             loop97:
             do {
                 int alt97=2;
@@ -15158,17 +15158,17 @@ public final EObject ruleXTypeLiteral() throws RecognitionException {
 
                 switch (alt97) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5264:1: (lv_arrayDimensions_4_0= ruleArrayBrackets )
+            	    // InternalCheckCfg.g:5264:1: (lv_arrayDimensions_4_0= ruleArrayBrackets )
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5264:1: (lv_arrayDimensions_4_0= ruleArrayBrackets )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5265:3: lv_arrayDimensions_4_0= ruleArrayBrackets
+            	    // InternalCheckCfg.g:5264:1: (lv_arrayDimensions_4_0= ruleArrayBrackets )
+            	    // InternalCheckCfg.g:5265:3: lv_arrayDimensions_4_0= ruleArrayBrackets
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXTypeLiteralAccess().getArrayDimensionsArrayBracketsParserRuleCall_4_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleArrayBrackets_in_ruleXTypeLiteral12277);
+            	    pushFollow(FOLLOW_77);
             	    lv_arrayDimensions_4_0=ruleArrayBrackets();
 
             	    state._fsp--;
@@ -15182,7 +15182,7 @@ public final EObject ruleXTypeLiteral() throws RecognitionException {
             	             			current, 
             	             			"arrayDimensions",
             	              		lv_arrayDimensions_4_0, 
-            	              		"ArrayBrackets");
+            	              		"org.eclipse.xtext.xbase.Xtype.ArrayBrackets");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -15198,7 +15198,7 @@ public final EObject ruleXTypeLiteral() throws RecognitionException {
                 }
             } while (true);
 
-            otherlv_5=(Token)match(input,21,FOLLOW_21_in_ruleXTypeLiteral12290); if (state.failed) return current;
+            otherlv_5=(Token)match(input,21,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_5, grammarAccess.getXTypeLiteralAccess().getRightParenthesisKeyword_5());
@@ -15227,7 +15227,7 @@ public final EObject ruleXTypeLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXThrowExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5293:1: entryRuleXThrowExpression returns [EObject current=null] : iv_ruleXThrowExpression= ruleXThrowExpression EOF ;
+    // InternalCheckCfg.g:5293:1: entryRuleXThrowExpression returns [EObject current=null] : iv_ruleXThrowExpression= ruleXThrowExpression EOF ;
     public final EObject entryRuleXThrowExpression() throws RecognitionException {
         EObject current = null;
 
@@ -15235,13 +15235,13 @@ public final EObject entryRuleXThrowExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5294:2: (iv_ruleXThrowExpression= ruleXThrowExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5295:2: iv_ruleXThrowExpression= ruleXThrowExpression EOF
+            // InternalCheckCfg.g:5294:2: (iv_ruleXThrowExpression= ruleXThrowExpression EOF )
+            // InternalCheckCfg.g:5295:2: iv_ruleXThrowExpression= ruleXThrowExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXThrowExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXThrowExpression_in_entryRuleXThrowExpression12326);
+            pushFollow(FOLLOW_1);
             iv_ruleXThrowExpression=ruleXThrowExpression();
 
             state._fsp--;
@@ -15249,7 +15249,7 @@ public final EObject entryRuleXThrowExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXThrowExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXThrowExpression12336); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -15267,7 +15267,7 @@ public final EObject entryRuleXThrowExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXThrowExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5302:1: ruleXThrowExpression returns [EObject current=null] : ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) ) ;
+    // InternalCheckCfg.g:5302:1: ruleXThrowExpression returns [EObject current=null] : ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) ) ;
     public final EObject ruleXThrowExpression() throws RecognitionException {
         EObject current = null;
 
@@ -15278,14 +15278,14 @@ public final EObject ruleXThrowExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5305:28: ( ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5306:1: ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) )
+            // InternalCheckCfg.g:5305:28: ( ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) ) )
+            // InternalCheckCfg.g:5306:1: ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5306:1: ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5306:2: () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) )
+            // InternalCheckCfg.g:5306:1: ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) )
+            // InternalCheckCfg.g:5306:2: () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5306:2: ()
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5307:5: 
+            // InternalCheckCfg.g:5306:2: ()
+            // InternalCheckCfg.g:5307:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -15297,24 +15297,24 @@ public final EObject ruleXThrowExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,82,FOLLOW_82_in_ruleXThrowExpression12382); if (state.failed) return current;
+            otherlv_1=(Token)match(input,82,FOLLOW_20); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXThrowExpressionAccess().getThrowKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5316:1: ( (lv_expression_2_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5317:1: (lv_expression_2_0= ruleXExpression )
+            // InternalCheckCfg.g:5316:1: ( (lv_expression_2_0= ruleXExpression ) )
+            // InternalCheckCfg.g:5317:1: (lv_expression_2_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5317:1: (lv_expression_2_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5318:3: lv_expression_2_0= ruleXExpression
+            // InternalCheckCfg.g:5317:1: (lv_expression_2_0= ruleXExpression )
+            // InternalCheckCfg.g:5318:3: lv_expression_2_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXThrowExpressionAccess().getExpressionXExpressionParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXThrowExpression12403);
+            pushFollow(FOLLOW_2);
             lv_expression_2_0=ruleXExpression();
 
             state._fsp--;
@@ -15328,7 +15328,7 @@ public final EObject ruleXThrowExpression() throws RecognitionException {
                      			current, 
                      			"expression",
                       		lv_expression_2_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -15361,7 +15361,7 @@ public final EObject ruleXThrowExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXReturnExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5342:1: entryRuleXReturnExpression returns [EObject current=null] : iv_ruleXReturnExpression= ruleXReturnExpression EOF ;
+    // InternalCheckCfg.g:5342:1: entryRuleXReturnExpression returns [EObject current=null] : iv_ruleXReturnExpression= ruleXReturnExpression EOF ;
     public final EObject entryRuleXReturnExpression() throws RecognitionException {
         EObject current = null;
 
@@ -15369,13 +15369,13 @@ public final EObject entryRuleXReturnExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5343:2: (iv_ruleXReturnExpression= ruleXReturnExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5344:2: iv_ruleXReturnExpression= ruleXReturnExpression EOF
+            // InternalCheckCfg.g:5343:2: (iv_ruleXReturnExpression= ruleXReturnExpression EOF )
+            // InternalCheckCfg.g:5344:2: iv_ruleXReturnExpression= ruleXReturnExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXReturnExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXReturnExpression_in_entryRuleXReturnExpression12439);
+            pushFollow(FOLLOW_1);
             iv_ruleXReturnExpression=ruleXReturnExpression();
 
             state._fsp--;
@@ -15383,7 +15383,7 @@ public final EObject entryRuleXReturnExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXReturnExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXReturnExpression12449); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -15401,7 +15401,7 @@ public final EObject entryRuleXReturnExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXReturnExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5351:1: ruleXReturnExpression returns [EObject current=null] : ( () otherlv_1= 'return' ( ( 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )? ) ;
+    // InternalCheckCfg.g:5351:1: ruleXReturnExpression returns [EObject current=null] : ( () otherlv_1= 'return' ( ( 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )? ) ;
     public final EObject ruleXReturnExpression() throws RecognitionException {
         EObject current = null;
 
@@ -15412,14 +15412,14 @@ public final EObject ruleXReturnExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5354:28: ( ( () otherlv_1= 'return' ( ( 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5355:1: ( () otherlv_1= 'return' ( ( 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )? )
+            // InternalCheckCfg.g:5354:28: ( ( () otherlv_1= 'return' ( ( 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )? ) )
+            // InternalCheckCfg.g:5355:1: ( () otherlv_1= 'return' ( ( 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5355:1: ( () otherlv_1= 'return' ( ( 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )? )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5355:2: () otherlv_1= 'return' ( ( 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )?
+            // InternalCheckCfg.g:5355:1: ( () otherlv_1= 'return' ( ( 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )? )
+            // InternalCheckCfg.g:5355:2: () otherlv_1= 'return' ( ( 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )?
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5355:2: ()
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5356:5: 
+            // InternalCheckCfg.g:5355:2: ()
+            // InternalCheckCfg.g:5356:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -15431,28 +15431,28 @@ public final EObject ruleXReturnExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,83,FOLLOW_83_in_ruleXReturnExpression12495); if (state.failed) return current;
+            otherlv_1=(Token)match(input,83,FOLLOW_78); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXReturnExpressionAccess().getReturnKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5365:1: ( ( 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )?
+            // InternalCheckCfg.g:5365:1: ( ( 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )?
             int alt98=2;
             alt98 = dfa98.predict(input);
             switch (alt98) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5365:2: ( 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression )
+                    // InternalCheckCfg.g:5365:2: ( 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5393:1: (lv_expression_2_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5394:3: lv_expression_2_0= ruleXExpression
+                    // InternalCheckCfg.g:5393:1: (lv_expression_2_0= ruleXExpression )
+                    // InternalCheckCfg.g:5394:3: lv_expression_2_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXReturnExpressionAccess().getExpressionXExpressionParserRuleCall_2_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXReturnExpression12730);
+                    pushFollow(FOLLOW_2);
                     lv_expression_2_0=ruleXExpression();
 
                     state._fsp--;
@@ -15466,7 +15466,7 @@ public final EObject ruleXReturnExpression() throws RecognitionException {
                              			current, 
                              			"expression",
                               		lv_expression_2_0, 
-                              		"XExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -15502,7 +15502,7 @@ public final EObject ruleXReturnExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXTryCatchFinallyExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5418:1: entryRuleXTryCatchFinallyExpression returns [EObject current=null] : iv_ruleXTryCatchFinallyExpression= ruleXTryCatchFinallyExpression EOF ;
+    // InternalCheckCfg.g:5418:1: entryRuleXTryCatchFinallyExpression returns [EObject current=null] : iv_ruleXTryCatchFinallyExpression= ruleXTryCatchFinallyExpression EOF ;
     public final EObject entryRuleXTryCatchFinallyExpression() throws RecognitionException {
         EObject current = null;
 
@@ -15510,13 +15510,13 @@ public final EObject entryRuleXTryCatchFinallyExpression() throws RecognitionExc
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5419:2: (iv_ruleXTryCatchFinallyExpression= ruleXTryCatchFinallyExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5420:2: iv_ruleXTryCatchFinallyExpression= ruleXTryCatchFinallyExpression EOF
+            // InternalCheckCfg.g:5419:2: (iv_ruleXTryCatchFinallyExpression= ruleXTryCatchFinallyExpression EOF )
+            // InternalCheckCfg.g:5420:2: iv_ruleXTryCatchFinallyExpression= ruleXTryCatchFinallyExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXTryCatchFinallyExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXTryCatchFinallyExpression_in_entryRuleXTryCatchFinallyExpression12767);
+            pushFollow(FOLLOW_1);
             iv_ruleXTryCatchFinallyExpression=ruleXTryCatchFinallyExpression();
 
             state._fsp--;
@@ -15524,7 +15524,7 @@ public final EObject entryRuleXTryCatchFinallyExpression() throws RecognitionExc
             if ( state.backtracking==0 ) {
                current =iv_ruleXTryCatchFinallyExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXTryCatchFinallyExpression12777); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -15542,7 +15542,7 @@ public final EObject entryRuleXTryCatchFinallyExpression() throws RecognitionExc
 
 
     // $ANTLR start "ruleXTryCatchFinallyExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5427:1: ruleXTryCatchFinallyExpression returns [EObject current=null] : ( () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) ) ) ;
+    // InternalCheckCfg.g:5427:1: ruleXTryCatchFinallyExpression returns [EObject current=null] : ( () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) ) ) ;
     public final EObject ruleXTryCatchFinallyExpression() throws RecognitionException {
         EObject current = null;
 
@@ -15561,14 +15561,14 @@ public final EObject ruleXTryCatchFinallyExpression() throws RecognitionExceptio
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5430:28: ( ( () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5431:1: ( () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) ) )
+            // InternalCheckCfg.g:5430:28: ( ( () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) ) ) )
+            // InternalCheckCfg.g:5431:1: ( () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5431:1: ( () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5431:2: () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) )
+            // InternalCheckCfg.g:5431:1: ( () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) ) )
+            // InternalCheckCfg.g:5431:2: () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5431:2: ()
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5432:5: 
+            // InternalCheckCfg.g:5431:2: ()
+            // InternalCheckCfg.g:5432:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -15580,24 +15580,24 @@ public final EObject ruleXTryCatchFinallyExpression() throws RecognitionExceptio
 
             }
 
-            otherlv_1=(Token)match(input,84,FOLLOW_84_in_ruleXTryCatchFinallyExpression12823); if (state.failed) return current;
+            otherlv_1=(Token)match(input,84,FOLLOW_20); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXTryCatchFinallyExpressionAccess().getTryKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5441:1: ( (lv_expression_2_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5442:1: (lv_expression_2_0= ruleXExpression )
+            // InternalCheckCfg.g:5441:1: ( (lv_expression_2_0= ruleXExpression ) )
+            // InternalCheckCfg.g:5442:1: (lv_expression_2_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5442:1: (lv_expression_2_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5443:3: lv_expression_2_0= ruleXExpression
+            // InternalCheckCfg.g:5442:1: (lv_expression_2_0= ruleXExpression )
+            // InternalCheckCfg.g:5443:3: lv_expression_2_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXTryCatchFinallyExpressionAccess().getExpressionXExpressionParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXTryCatchFinallyExpression12844);
+            pushFollow(FOLLOW_79);
             lv_expression_2_0=ruleXExpression();
 
             state._fsp--;
@@ -15611,7 +15611,7 @@ public final EObject ruleXTryCatchFinallyExpression() throws RecognitionExceptio
                      			current, 
                      			"expression",
                       		lv_expression_2_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -15621,7 +15621,7 @@ public final EObject ruleXTryCatchFinallyExpression() throws RecognitionExceptio
 
             }
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5459:2: ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) )
+            // InternalCheckCfg.g:5459:2: ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) )
             int alt101=2;
             int LA101_0 = input.LA(1);
 
@@ -15640,12 +15640,12 @@ else if ( (LA101_0==85) ) {
             }
             switch (alt101) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5459:3: ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? )
+                    // InternalCheckCfg.g:5459:3: ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5459:3: ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5459:4: ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )?
+                    // InternalCheckCfg.g:5459:3: ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? )
+                    // InternalCheckCfg.g:5459:4: ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )?
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5459:4: ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+
+                    // InternalCheckCfg.g:5459:4: ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+
                     int cnt99=0;
                     loop99:
                     do {
@@ -15665,17 +15665,17 @@ else if ( (LA101_0==85) ) {
 
                         switch (alt99) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5459:5: ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause )
+                    	    // InternalCheckCfg.g:5459:5: ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5461:1: (lv_catchClauses_3_0= ruleXCatchClause )
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5462:3: lv_catchClauses_3_0= ruleXCatchClause
+                    	    // InternalCheckCfg.g:5461:1: (lv_catchClauses_3_0= ruleXCatchClause )
+                    	    // InternalCheckCfg.g:5462:3: lv_catchClauses_3_0= ruleXCatchClause
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getXTryCatchFinallyExpressionAccess().getCatchClausesXCatchClauseParserRuleCall_3_0_0_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleXCatchClause_in_ruleXTryCatchFinallyExpression12874);
+                    	    pushFollow(FOLLOW_80);
                     	    lv_catchClauses_3_0=ruleXCatchClause();
 
                     	    state._fsp--;
@@ -15689,7 +15689,7 @@ else if ( (LA101_0==85) ) {
                     	             			current, 
                     	             			"catchClauses",
                     	              		lv_catchClauses_3_0, 
-                    	              		"XCatchClause");
+                    	              		"org.eclipse.xtext.xbase.Xbase.XCatchClause");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -15710,7 +15710,7 @@ else if ( (LA101_0==85) ) {
                         cnt99++;
                     } while (true);
 
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5478:3: ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )?
+                    // InternalCheckCfg.g:5478:3: ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )?
                     int alt100=2;
                     int LA100_0 = input.LA(1);
 
@@ -15723,12 +15723,12 @@ else if ( (LA101_0==85) ) {
                     }
                     switch (alt100) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5478:4: ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) )
+                            // InternalCheckCfg.g:5478:4: ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) )
                             {
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5478:4: ( ( 'finally' )=>otherlv_4= 'finally' )
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5478:5: ( 'finally' )=>otherlv_4= 'finally'
+                            // InternalCheckCfg.g:5478:4: ( ( 'finally' )=>otherlv_4= 'finally' )
+                            // InternalCheckCfg.g:5478:5: ( 'finally' )=>otherlv_4= 'finally'
                             {
-                            otherlv_4=(Token)match(input,85,FOLLOW_85_in_ruleXTryCatchFinallyExpression12896); if (state.failed) return current;
+                            otherlv_4=(Token)match(input,85,FOLLOW_20); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                   	newLeafNode(otherlv_4, grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyKeyword_3_0_1_0());
@@ -15737,18 +15737,18 @@ else if ( (LA101_0==85) ) {
 
                             }
 
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5483:2: ( (lv_finallyExpression_5_0= ruleXExpression ) )
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5484:1: (lv_finallyExpression_5_0= ruleXExpression )
+                            // InternalCheckCfg.g:5483:2: ( (lv_finallyExpression_5_0= ruleXExpression ) )
+                            // InternalCheckCfg.g:5484:1: (lv_finallyExpression_5_0= ruleXExpression )
                             {
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5484:1: (lv_finallyExpression_5_0= ruleXExpression )
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5485:3: lv_finallyExpression_5_0= ruleXExpression
+                            // InternalCheckCfg.g:5484:1: (lv_finallyExpression_5_0= ruleXExpression )
+                            // InternalCheckCfg.g:5485:3: lv_finallyExpression_5_0= ruleXExpression
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyExpressionXExpressionParserRuleCall_3_0_1_1_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleXExpression_in_ruleXTryCatchFinallyExpression12918);
+                            pushFollow(FOLLOW_2);
                             lv_finallyExpression_5_0=ruleXExpression();
 
                             state._fsp--;
@@ -15762,7 +15762,7 @@ else if ( (LA101_0==85) ) {
                                      			current, 
                                      			"finallyExpression",
                                       		lv_finallyExpression_5_0, 
-                                      		"XExpression");
+                                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -15785,29 +15785,29 @@ else if ( (LA101_0==85) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5502:6: (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) )
+                    // InternalCheckCfg.g:5502:6: (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5502:6: (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5502:8: otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) )
+                    // InternalCheckCfg.g:5502:6: (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) )
+                    // InternalCheckCfg.g:5502:8: otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) )
                     {
-                    otherlv_6=(Token)match(input,85,FOLLOW_85_in_ruleXTryCatchFinallyExpression12940); if (state.failed) return current;
+                    otherlv_6=(Token)match(input,85,FOLLOW_20); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_6, grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyKeyword_3_1_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5506:1: ( (lv_finallyExpression_7_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5507:1: (lv_finallyExpression_7_0= ruleXExpression )
+                    // InternalCheckCfg.g:5506:1: ( (lv_finallyExpression_7_0= ruleXExpression ) )
+                    // InternalCheckCfg.g:5507:1: (lv_finallyExpression_7_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5507:1: (lv_finallyExpression_7_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5508:3: lv_finallyExpression_7_0= ruleXExpression
+                    // InternalCheckCfg.g:5507:1: (lv_finallyExpression_7_0= ruleXExpression )
+                    // InternalCheckCfg.g:5508:3: lv_finallyExpression_7_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyExpressionXExpressionParserRuleCall_3_1_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXTryCatchFinallyExpression12961);
+                    pushFollow(FOLLOW_2);
                     lv_finallyExpression_7_0=ruleXExpression();
 
                     state._fsp--;
@@ -15821,7 +15821,7 @@ else if ( (LA101_0==85) ) {
                              			current, 
                              			"finallyExpression",
                               		lv_finallyExpression_7_0, 
-                              		"XExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -15863,7 +15863,7 @@ else if ( (LA101_0==85) ) {
 
 
     // $ANTLR start "entryRuleXSynchronizedExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5532:1: entryRuleXSynchronizedExpression returns [EObject current=null] : iv_ruleXSynchronizedExpression= ruleXSynchronizedExpression EOF ;
+    // InternalCheckCfg.g:5532:1: entryRuleXSynchronizedExpression returns [EObject current=null] : iv_ruleXSynchronizedExpression= ruleXSynchronizedExpression EOF ;
     public final EObject entryRuleXSynchronizedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -15871,13 +15871,13 @@ public final EObject entryRuleXSynchronizedExpression() throws RecognitionExcept
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5533:2: (iv_ruleXSynchronizedExpression= ruleXSynchronizedExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5534:2: iv_ruleXSynchronizedExpression= ruleXSynchronizedExpression EOF
+            // InternalCheckCfg.g:5533:2: (iv_ruleXSynchronizedExpression= ruleXSynchronizedExpression EOF )
+            // InternalCheckCfg.g:5534:2: iv_ruleXSynchronizedExpression= ruleXSynchronizedExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXSynchronizedExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXSynchronizedExpression_in_entryRuleXSynchronizedExpression12999);
+            pushFollow(FOLLOW_1);
             iv_ruleXSynchronizedExpression=ruleXSynchronizedExpression();
 
             state._fsp--;
@@ -15885,7 +15885,7 @@ public final EObject entryRuleXSynchronizedExpression() throws RecognitionExcept
             if ( state.backtracking==0 ) {
                current =iv_ruleXSynchronizedExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXSynchronizedExpression13009); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -15903,7 +15903,7 @@ public final EObject entryRuleXSynchronizedExpression() throws RecognitionExcept
 
 
     // $ANTLR start "ruleXSynchronizedExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5541:1: ruleXSynchronizedExpression returns [EObject current=null] : ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) ) ;
+    // InternalCheckCfg.g:5541:1: ruleXSynchronizedExpression returns [EObject current=null] : ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) ) ;
     public final EObject ruleXSynchronizedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -15918,20 +15918,20 @@ public final EObject ruleXSynchronizedExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5544:28: ( ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5545:1: ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) )
+            // InternalCheckCfg.g:5544:28: ( ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) ) )
+            // InternalCheckCfg.g:5545:1: ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5545:1: ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5545:2: ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) )
+            // InternalCheckCfg.g:5545:1: ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) )
+            // InternalCheckCfg.g:5545:2: ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5545:2: ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5545:3: ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' )
+            // InternalCheckCfg.g:5545:2: ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) )
+            // InternalCheckCfg.g:5545:3: ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5548:5: ( () otherlv_1= 'synchronized' otherlv_2= '(' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5548:6: () otherlv_1= 'synchronized' otherlv_2= '('
+            // InternalCheckCfg.g:5548:5: ( () otherlv_1= 'synchronized' otherlv_2= '(' )
+            // InternalCheckCfg.g:5548:6: () otherlv_1= 'synchronized' otherlv_2= '('
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5548:6: ()
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5549:5: 
+            // InternalCheckCfg.g:5548:6: ()
+            // InternalCheckCfg.g:5549:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -15943,13 +15943,13 @@ public final EObject ruleXSynchronizedExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,86,FOLLOW_86_in_ruleXSynchronizedExpression13073); if (state.failed) return current;
+            otherlv_1=(Token)match(input,86,FOLLOW_56); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXSynchronizedExpressionAccess().getSynchronizedKeyword_0_0_1());
                   
             }
-            otherlv_2=(Token)match(input,19,FOLLOW_19_in_ruleXSynchronizedExpression13085); if (state.failed) return current;
+            otherlv_2=(Token)match(input,19,FOLLOW_20); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getXSynchronizedExpressionAccess().getLeftParenthesisKeyword_0_0_2());
@@ -15961,18 +15961,18 @@ public final EObject ruleXSynchronizedExpression() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5562:3: ( (lv_param_3_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5563:1: (lv_param_3_0= ruleXExpression )
+            // InternalCheckCfg.g:5562:3: ( (lv_param_3_0= ruleXExpression ) )
+            // InternalCheckCfg.g:5563:1: (lv_param_3_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5563:1: (lv_param_3_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5564:3: lv_param_3_0= ruleXExpression
+            // InternalCheckCfg.g:5563:1: (lv_param_3_0= ruleXExpression )
+            // InternalCheckCfg.g:5564:3: lv_param_3_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXSynchronizedExpressionAccess().getParamXExpressionParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXSynchronizedExpression13108);
+            pushFollow(FOLLOW_45);
             lv_param_3_0=ruleXExpression();
 
             state._fsp--;
@@ -15986,7 +15986,7 @@ public final EObject ruleXSynchronizedExpression() throws RecognitionException {
                      			current, 
                      			"param",
                       		lv_param_3_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -15996,24 +15996,24 @@ public final EObject ruleXSynchronizedExpression() throws RecognitionException {
 
             }
 
-            otherlv_4=(Token)match(input,21,FOLLOW_21_in_ruleXSynchronizedExpression13120); if (state.failed) return current;
+            otherlv_4=(Token)match(input,21,FOLLOW_20); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_4, grammarAccess.getXSynchronizedExpressionAccess().getRightParenthesisKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5584:1: ( (lv_expression_5_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5585:1: (lv_expression_5_0= ruleXExpression )
+            // InternalCheckCfg.g:5584:1: ( (lv_expression_5_0= ruleXExpression ) )
+            // InternalCheckCfg.g:5585:1: (lv_expression_5_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5585:1: (lv_expression_5_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5586:3: lv_expression_5_0= ruleXExpression
+            // InternalCheckCfg.g:5585:1: (lv_expression_5_0= ruleXExpression )
+            // InternalCheckCfg.g:5586:3: lv_expression_5_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXSynchronizedExpressionAccess().getExpressionXExpressionParserRuleCall_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXSynchronizedExpression13141);
+            pushFollow(FOLLOW_2);
             lv_expression_5_0=ruleXExpression();
 
             state._fsp--;
@@ -16027,7 +16027,7 @@ public final EObject ruleXSynchronizedExpression() throws RecognitionException {
                      			current, 
                      			"expression",
                       		lv_expression_5_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -16060,7 +16060,7 @@ public final EObject ruleXSynchronizedExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXCatchClause"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5610:1: entryRuleXCatchClause returns [EObject current=null] : iv_ruleXCatchClause= ruleXCatchClause EOF ;
+    // InternalCheckCfg.g:5610:1: entryRuleXCatchClause returns [EObject current=null] : iv_ruleXCatchClause= ruleXCatchClause EOF ;
     public final EObject entryRuleXCatchClause() throws RecognitionException {
         EObject current = null;
 
@@ -16068,13 +16068,13 @@ public final EObject entryRuleXCatchClause() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5611:2: (iv_ruleXCatchClause= ruleXCatchClause EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5612:2: iv_ruleXCatchClause= ruleXCatchClause EOF
+            // InternalCheckCfg.g:5611:2: (iv_ruleXCatchClause= ruleXCatchClause EOF )
+            // InternalCheckCfg.g:5612:2: iv_ruleXCatchClause= ruleXCatchClause EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXCatchClauseRule()); 
             }
-            pushFollow(FOLLOW_ruleXCatchClause_in_entryRuleXCatchClause13177);
+            pushFollow(FOLLOW_1);
             iv_ruleXCatchClause=ruleXCatchClause();
 
             state._fsp--;
@@ -16082,7 +16082,7 @@ public final EObject entryRuleXCatchClause() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXCatchClause; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXCatchClause13187); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -16100,7 +16100,7 @@ public final EObject entryRuleXCatchClause() throws RecognitionException {
 
 
     // $ANTLR start "ruleXCatchClause"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5619:1: ruleXCatchClause returns [EObject current=null] : ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) ) ;
+    // InternalCheckCfg.g:5619:1: ruleXCatchClause returns [EObject current=null] : ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) ) ;
     public final EObject ruleXCatchClause() throws RecognitionException {
         EObject current = null;
 
@@ -16115,16 +16115,16 @@ public final EObject ruleXCatchClause() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5622:28: ( ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5623:1: ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) )
+            // InternalCheckCfg.g:5622:28: ( ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) ) )
+            // InternalCheckCfg.g:5623:1: ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5623:1: ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5623:2: ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) )
+            // InternalCheckCfg.g:5623:1: ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) )
+            // InternalCheckCfg.g:5623:2: ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5623:2: ( ( 'catch' )=>otherlv_0= 'catch' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5623:3: ( 'catch' )=>otherlv_0= 'catch'
+            // InternalCheckCfg.g:5623:2: ( ( 'catch' )=>otherlv_0= 'catch' )
+            // InternalCheckCfg.g:5623:3: ( 'catch' )=>otherlv_0= 'catch'
             {
-            otherlv_0=(Token)match(input,87,FOLLOW_87_in_ruleXCatchClause13232); if (state.failed) return current;
+            otherlv_0=(Token)match(input,87,FOLLOW_56); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getXCatchClauseAccess().getCatchKeyword_0());
@@ -16133,24 +16133,24 @@ public final EObject ruleXCatchClause() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,19,FOLLOW_19_in_ruleXCatchClause13245); if (state.failed) return current;
+            otherlv_1=(Token)match(input,19,FOLLOW_29); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXCatchClauseAccess().getLeftParenthesisKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5632:1: ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5633:1: (lv_declaredParam_2_0= ruleFullJvmFormalParameter )
+            // InternalCheckCfg.g:5632:1: ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) )
+            // InternalCheckCfg.g:5633:1: (lv_declaredParam_2_0= ruleFullJvmFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5633:1: (lv_declaredParam_2_0= ruleFullJvmFormalParameter )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5634:3: lv_declaredParam_2_0= ruleFullJvmFormalParameter
+            // InternalCheckCfg.g:5633:1: (lv_declaredParam_2_0= ruleFullJvmFormalParameter )
+            // InternalCheckCfg.g:5634:3: lv_declaredParam_2_0= ruleFullJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXCatchClauseAccess().getDeclaredParamFullJvmFormalParameterParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleFullJvmFormalParameter_in_ruleXCatchClause13266);
+            pushFollow(FOLLOW_45);
             lv_declaredParam_2_0=ruleFullJvmFormalParameter();
 
             state._fsp--;
@@ -16164,7 +16164,7 @@ public final EObject ruleXCatchClause() throws RecognitionException {
                      			current, 
                      			"declaredParam",
                       		lv_declaredParam_2_0, 
-                      		"FullJvmFormalParameter");
+                      		"org.eclipse.xtext.xbase.Xbase.FullJvmFormalParameter");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -16174,24 +16174,24 @@ public final EObject ruleXCatchClause() throws RecognitionException {
 
             }
 
-            otherlv_3=(Token)match(input,21,FOLLOW_21_in_ruleXCatchClause13278); if (state.failed) return current;
+            otherlv_3=(Token)match(input,21,FOLLOW_20); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_3, grammarAccess.getXCatchClauseAccess().getRightParenthesisKeyword_3());
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5654:1: ( (lv_expression_4_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5655:1: (lv_expression_4_0= ruleXExpression )
+            // InternalCheckCfg.g:5654:1: ( (lv_expression_4_0= ruleXExpression ) )
+            // InternalCheckCfg.g:5655:1: (lv_expression_4_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5655:1: (lv_expression_4_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5656:3: lv_expression_4_0= ruleXExpression
+            // InternalCheckCfg.g:5655:1: (lv_expression_4_0= ruleXExpression )
+            // InternalCheckCfg.g:5656:3: lv_expression_4_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXCatchClauseAccess().getExpressionXExpressionParserRuleCall_4_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXCatchClause13299);
+            pushFollow(FOLLOW_2);
             lv_expression_4_0=ruleXExpression();
 
             state._fsp--;
@@ -16205,7 +16205,7 @@ public final EObject ruleXCatchClause() throws RecognitionException {
                      			current, 
                      			"expression",
                       		lv_expression_4_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -16238,7 +16238,7 @@ public final EObject ruleXCatchClause() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleQualifiedName"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5680:1: entryRuleQualifiedName returns [String current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
+    // InternalCheckCfg.g:5680:1: entryRuleQualifiedName returns [String current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
     public final String entryRuleQualifiedName() throws RecognitionException {
         String current = null;
 
@@ -16246,13 +16246,13 @@ public final String entryRuleQualifiedName() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5681:2: (iv_ruleQualifiedName= ruleQualifiedName EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5682:2: iv_ruleQualifiedName= ruleQualifiedName EOF
+            // InternalCheckCfg.g:5681:2: (iv_ruleQualifiedName= ruleQualifiedName EOF )
+            // InternalCheckCfg.g:5682:2: iv_ruleQualifiedName= ruleQualifiedName EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getQualifiedNameRule()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName13336);
+            pushFollow(FOLLOW_1);
             iv_ruleQualifiedName=ruleQualifiedName();
 
             state._fsp--;
@@ -16260,7 +16260,7 @@ public final String entryRuleQualifiedName() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleQualifiedName.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedName13347); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -16278,7 +16278,7 @@ public final String entryRuleQualifiedName() throws RecognitionException {
 
 
     // $ANTLR start "ruleQualifiedName"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5689:1: ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* ) ;
+    // InternalCheckCfg.g:5689:1: ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* ) ;
     public final AntlrDatatypeRuleToken ruleQualifiedName() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -16291,18 +16291,18 @@ public final AntlrDatatypeRuleToken ruleQualifiedName() throws RecognitionExcept
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5692:28: ( (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5693:1: (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* )
+            // InternalCheckCfg.g:5692:28: ( (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* ) )
+            // InternalCheckCfg.g:5693:1: (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5693:1: (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5694:5: this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )*
+            // InternalCheckCfg.g:5693:1: (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* )
+            // InternalCheckCfg.g:5694:5: this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getQualifiedNameAccess().getValidIDParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleValidID_in_ruleQualifiedName13394);
+            pushFollow(FOLLOW_81);
             this_ValidID_0=ruleValidID();
 
             state._fsp--;
@@ -16317,7 +16317,7 @@ public final AntlrDatatypeRuleToken ruleQualifiedName() throws RecognitionExcept
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5704:1: ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )*
+            // InternalCheckCfg.g:5704:1: ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )*
             loop102:
             do {
                 int alt102=2;
@@ -16342,12 +16342,12 @@ public final AntlrDatatypeRuleToken ruleQualifiedName() throws RecognitionExcept
 
                 switch (alt102) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5704:2: ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID
+            	    // InternalCheckCfg.g:5704:2: ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID
             	    {
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5704:2: ( ( '.' )=>kw= '.' )
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5704:3: ( '.' )=>kw= '.'
+            	    // InternalCheckCfg.g:5704:2: ( ( '.' )=>kw= '.' )
+            	    // InternalCheckCfg.g:5704:3: ( '.' )=>kw= '.'
             	    {
-            	    kw=(Token)match(input,57,FOLLOW_57_in_ruleQualifiedName13422); if (state.failed) return current;
+            	    kw=(Token)match(input,57,FOLLOW_4); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	              current.merge(kw);
@@ -16362,7 +16362,7 @@ public final AntlrDatatypeRuleToken ruleQualifiedName() throws RecognitionExcept
             	              newCompositeNode(grammarAccess.getQualifiedNameAccess().getValidIDParserRuleCall_1_1()); 
             	          
             	    }
-            	    pushFollow(FOLLOW_ruleValidID_in_ruleQualifiedName13445);
+            	    pushFollow(FOLLOW_81);
             	    this_ValidID_2=ruleValidID();
 
             	    state._fsp--;
@@ -16409,7 +16409,7 @@ public final AntlrDatatypeRuleToken ruleQualifiedName() throws RecognitionExcept
 
 
     // $ANTLR start "entryRuleNumber"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5731:1: entryRuleNumber returns [String current=null] : iv_ruleNumber= ruleNumber EOF ;
+    // InternalCheckCfg.g:5731:1: entryRuleNumber returns [String current=null] : iv_ruleNumber= ruleNumber EOF ;
     public final String entryRuleNumber() throws RecognitionException {
         String current = null;
 
@@ -16420,13 +16420,13 @@ public final String entryRuleNumber() throws RecognitionException {
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
         	
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5735:2: (iv_ruleNumber= ruleNumber EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5736:2: iv_ruleNumber= ruleNumber EOF
+            // InternalCheckCfg.g:5735:2: (iv_ruleNumber= ruleNumber EOF )
+            // InternalCheckCfg.g:5736:2: iv_ruleNumber= ruleNumber EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getNumberRule()); 
             }
-            pushFollow(FOLLOW_ruleNumber_in_entryRuleNumber13499);
+            pushFollow(FOLLOW_1);
             iv_ruleNumber=ruleNumber();
 
             state._fsp--;
@@ -16434,7 +16434,7 @@ public final String entryRuleNumber() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleNumber.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNumber13510); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -16455,7 +16455,7 @@ public final String entryRuleNumber() throws RecognitionException {
 
 
     // $ANTLR start "ruleNumber"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5746:1: ruleNumber returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_HEX_0= RULE_HEX | ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? ) ) ;
+    // InternalCheckCfg.g:5746:1: ruleNumber returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_HEX_0= RULE_HEX | ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? ) ) ;
     public final AntlrDatatypeRuleToken ruleNumber() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -16470,10 +16470,10 @@ public final AntlrDatatypeRuleToken ruleNumber() throws RecognitionException {
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5750:28: ( (this_HEX_0= RULE_HEX | ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5751:1: (this_HEX_0= RULE_HEX | ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? ) )
+            // InternalCheckCfg.g:5750:28: ( (this_HEX_0= RULE_HEX | ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? ) ) )
+            // InternalCheckCfg.g:5751:1: (this_HEX_0= RULE_HEX | ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5751:1: (this_HEX_0= RULE_HEX | ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? ) )
+            // InternalCheckCfg.g:5751:1: (this_HEX_0= RULE_HEX | ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? ) )
             int alt106=2;
             int LA106_0 = input.LA(1);
 
@@ -16492,9 +16492,9 @@ else if ( ((LA106_0>=RULE_INT && LA106_0<=RULE_DECIMAL)) ) {
             }
             switch (alt106) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5751:6: this_HEX_0= RULE_HEX
+                    // InternalCheckCfg.g:5751:6: this_HEX_0= RULE_HEX
                     {
-                    this_HEX_0=(Token)match(input,RULE_HEX,FOLLOW_RULE_HEX_in_ruleNumber13554); if (state.failed) return current;
+                    this_HEX_0=(Token)match(input,RULE_HEX,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       		current.merge(this_HEX_0);
@@ -16509,12 +16509,12 @@ else if ( ((LA106_0>=RULE_INT && LA106_0<=RULE_DECIMAL)) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5759:6: ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? )
+                    // InternalCheckCfg.g:5759:6: ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5759:6: ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5759:7: (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )?
+                    // InternalCheckCfg.g:5759:6: ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? )
+                    // InternalCheckCfg.g:5759:7: (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )?
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5759:7: (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL )
+                    // InternalCheckCfg.g:5759:7: (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL )
                     int alt103=2;
                     int LA103_0 = input.LA(1);
 
@@ -16533,9 +16533,9 @@ else if ( (LA103_0==RULE_DECIMAL) ) {
                     }
                     switch (alt103) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5759:12: this_INT_1= RULE_INT
+                            // InternalCheckCfg.g:5759:12: this_INT_1= RULE_INT
                             {
-                            this_INT_1=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleNumber13582); if (state.failed) return current;
+                            this_INT_1=(Token)match(input,RULE_INT,FOLLOW_81); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                               		current.merge(this_INT_1);
@@ -16550,9 +16550,9 @@ else if ( (LA103_0==RULE_DECIMAL) ) {
                             }
                             break;
                         case 2 :
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5767:10: this_DECIMAL_2= RULE_DECIMAL
+                            // InternalCheckCfg.g:5767:10: this_DECIMAL_2= RULE_DECIMAL
                             {
-                            this_DECIMAL_2=(Token)match(input,RULE_DECIMAL,FOLLOW_RULE_DECIMAL_in_ruleNumber13608); if (state.failed) return current;
+                            this_DECIMAL_2=(Token)match(input,RULE_DECIMAL,FOLLOW_81); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                               		current.merge(this_DECIMAL_2);
@@ -16569,7 +16569,7 @@ else if ( (LA103_0==RULE_DECIMAL) ) {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5774:2: (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )?
+                    // InternalCheckCfg.g:5774:2: (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )?
                     int alt105=2;
                     int LA105_0 = input.LA(1);
 
@@ -16582,16 +16582,16 @@ else if ( (LA103_0==RULE_DECIMAL) ) {
                     }
                     switch (alt105) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5775:2: kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL )
+                            // InternalCheckCfg.g:5775:2: kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL )
                             {
-                            kw=(Token)match(input,57,FOLLOW_57_in_ruleNumber13628); if (state.failed) return current;
+                            kw=(Token)match(input,57,FOLLOW_82); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       current.merge(kw);
                                       newLeafNode(kw, grammarAccess.getNumberAccess().getFullStopKeyword_1_1_0()); 
                                   
                             }
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5780:1: (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL )
+                            // InternalCheckCfg.g:5780:1: (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL )
                             int alt104=2;
                             int LA104_0 = input.LA(1);
 
@@ -16610,9 +16610,9 @@ else if ( (LA104_0==RULE_DECIMAL) ) {
                             }
                             switch (alt104) {
                                 case 1 :
-                                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5780:6: this_INT_4= RULE_INT
+                                    // InternalCheckCfg.g:5780:6: this_INT_4= RULE_INT
                                     {
-                                    this_INT_4=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleNumber13644); if (state.failed) return current;
+                                    this_INT_4=(Token)match(input,RULE_INT,FOLLOW_2); if (state.failed) return current;
                                     if ( state.backtracking==0 ) {
 
                                       		current.merge(this_INT_4);
@@ -16627,9 +16627,9 @@ else if ( (LA104_0==RULE_DECIMAL) ) {
                                     }
                                     break;
                                 case 2 :
-                                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5788:10: this_DECIMAL_5= RULE_DECIMAL
+                                    // InternalCheckCfg.g:5788:10: this_DECIMAL_5= RULE_DECIMAL
                                     {
-                                    this_DECIMAL_5=(Token)match(input,RULE_DECIMAL,FOLLOW_RULE_DECIMAL_in_ruleNumber13670); if (state.failed) return current;
+                                    this_DECIMAL_5=(Token)match(input,RULE_DECIMAL,FOLLOW_2); if (state.failed) return current;
                                     if ( state.backtracking==0 ) {
 
                                       		current.merge(this_DECIMAL_5);
@@ -16684,7 +16684,7 @@ else if ( (LA104_0==RULE_DECIMAL) ) {
 
 
     // $ANTLR start "entryRuleJvmTypeReference"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5808:1: entryRuleJvmTypeReference returns [EObject current=null] : iv_ruleJvmTypeReference= ruleJvmTypeReference EOF ;
+    // InternalCheckCfg.g:5808:1: entryRuleJvmTypeReference returns [EObject current=null] : iv_ruleJvmTypeReference= ruleJvmTypeReference EOF ;
     public final EObject entryRuleJvmTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -16692,13 +16692,13 @@ public final EObject entryRuleJvmTypeReference() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5809:2: (iv_ruleJvmTypeReference= ruleJvmTypeReference EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5810:2: iv_ruleJvmTypeReference= ruleJvmTypeReference EOF
+            // InternalCheckCfg.g:5809:2: (iv_ruleJvmTypeReference= ruleJvmTypeReference EOF )
+            // InternalCheckCfg.g:5810:2: iv_ruleJvmTypeReference= ruleJvmTypeReference EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmTypeReferenceRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_entryRuleJvmTypeReference13725);
+            pushFollow(FOLLOW_1);
             iv_ruleJvmTypeReference=ruleJvmTypeReference();
 
             state._fsp--;
@@ -16706,7 +16706,7 @@ public final EObject entryRuleJvmTypeReference() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleJvmTypeReference; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmTypeReference13735); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -16724,7 +16724,7 @@ public final EObject entryRuleJvmTypeReference() throws RecognitionException {
 
 
     // $ANTLR start "ruleJvmTypeReference"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5817:1: ruleJvmTypeReference returns [EObject current=null] : ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef ) ;
+    // InternalCheckCfg.g:5817:1: ruleJvmTypeReference returns [EObject current=null] : ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef ) ;
     public final EObject ruleJvmTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -16736,10 +16736,10 @@ public final EObject ruleJvmTypeReference() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5820:28: ( ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5821:1: ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef )
+            // InternalCheckCfg.g:5820:28: ( ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef ) )
+            // InternalCheckCfg.g:5821:1: ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5821:1: ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef )
+            // InternalCheckCfg.g:5821:1: ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef )
             int alt108=2;
             int LA108_0 = input.LA(1);
 
@@ -16758,17 +16758,17 @@ else if ( (LA108_0==19||LA108_0==44) ) {
             }
             switch (alt108) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5821:2: (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* )
+                    // InternalCheckCfg.g:5821:2: (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5821:2: (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5822:5: this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )*
+                    // InternalCheckCfg.g:5821:2: (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* )
+                    // InternalCheckCfg.g:5822:5: this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )*
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getJvmTypeReferenceAccess().getJvmParameterizedTypeReferenceParserRuleCall_0_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleJvmParameterizedTypeReference_in_ruleJvmTypeReference13783);
+                    pushFollow(FOLLOW_75);
                     this_JvmParameterizedTypeReference_0=ruleJvmParameterizedTypeReference();
 
                     state._fsp--;
@@ -16779,7 +16779,7 @@ else if ( (LA108_0==19||LA108_0==44) ) {
                               afterParserOrEnumRuleCall();
                           
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5830:1: ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )*
+                    // InternalCheckCfg.g:5830:1: ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )*
                     loop107:
                     do {
                         int alt107=2;
@@ -16804,13 +16804,13 @@ else if ( (LA108_0==19||LA108_0==44) ) {
 
                         switch (alt107) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5830:2: ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets )
+                    	    // InternalCheckCfg.g:5830:2: ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5831:24: ( () ruleArrayBrackets )
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5831:25: () ruleArrayBrackets
+                    	    // InternalCheckCfg.g:5831:24: ( () ruleArrayBrackets )
+                    	    // InternalCheckCfg.g:5831:25: () ruleArrayBrackets
                     	    {
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5831:25: ()
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5832:5: 
+                    	    // InternalCheckCfg.g:5831:25: ()
+                    	    // InternalCheckCfg.g:5832:5: 
                     	    {
                     	    if ( state.backtracking==0 ) {
 
@@ -16827,7 +16827,7 @@ else if ( (LA108_0==19||LA108_0==44) ) {
                     	              newCompositeNode(grammarAccess.getJvmTypeReferenceAccess().getArrayBracketsParserRuleCall_0_1_0_1()); 
                     	          
                     	    }
-                    	    pushFollow(FOLLOW_ruleArrayBrackets_in_ruleJvmTypeReference13819);
+                    	    pushFollow(FOLLOW_75);
                     	    ruleArrayBrackets();
 
                     	    state._fsp--;
@@ -16856,14 +16856,14 @@ else if ( (LA108_0==19||LA108_0==44) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5847:5: this_XFunctionTypeRef_3= ruleXFunctionTypeRef
+                    // InternalCheckCfg.g:5847:5: this_XFunctionTypeRef_3= ruleXFunctionTypeRef
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getJvmTypeReferenceAccess().getXFunctionTypeRefParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXFunctionTypeRef_in_ruleJvmTypeReference13850);
+                    pushFollow(FOLLOW_2);
                     this_XFunctionTypeRef_3=ruleXFunctionTypeRef();
 
                     state._fsp--;
@@ -16900,7 +16900,7 @@ else if ( (LA108_0==19||LA108_0==44) ) {
 
 
     // $ANTLR start "entryRuleArrayBrackets"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5863:1: entryRuleArrayBrackets returns [String current=null] : iv_ruleArrayBrackets= ruleArrayBrackets EOF ;
+    // InternalCheckCfg.g:5863:1: entryRuleArrayBrackets returns [String current=null] : iv_ruleArrayBrackets= ruleArrayBrackets EOF ;
     public final String entryRuleArrayBrackets() throws RecognitionException {
         String current = null;
 
@@ -16908,13 +16908,13 @@ public final String entryRuleArrayBrackets() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5864:2: (iv_ruleArrayBrackets= ruleArrayBrackets EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5865:2: iv_ruleArrayBrackets= ruleArrayBrackets EOF
+            // InternalCheckCfg.g:5864:2: (iv_ruleArrayBrackets= ruleArrayBrackets EOF )
+            // InternalCheckCfg.g:5865:2: iv_ruleArrayBrackets= ruleArrayBrackets EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getArrayBracketsRule()); 
             }
-            pushFollow(FOLLOW_ruleArrayBrackets_in_entryRuleArrayBrackets13886);
+            pushFollow(FOLLOW_1);
             iv_ruleArrayBrackets=ruleArrayBrackets();
 
             state._fsp--;
@@ -16922,7 +16922,7 @@ public final String entryRuleArrayBrackets() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleArrayBrackets.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleArrayBrackets13897); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -16940,7 +16940,7 @@ public final String entryRuleArrayBrackets() throws RecognitionException {
 
 
     // $ANTLR start "ruleArrayBrackets"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5872:1: ruleArrayBrackets returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '[' kw= ']' ) ;
+    // InternalCheckCfg.g:5872:1: ruleArrayBrackets returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '[' kw= ']' ) ;
     public final AntlrDatatypeRuleToken ruleArrayBrackets() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -16949,20 +16949,20 @@ public final AntlrDatatypeRuleToken ruleArrayBrackets() throws RecognitionExcept
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5875:28: ( (kw= '[' kw= ']' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5876:1: (kw= '[' kw= ']' )
+            // InternalCheckCfg.g:5875:28: ( (kw= '[' kw= ']' ) )
+            // InternalCheckCfg.g:5876:1: (kw= '[' kw= ']' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5876:1: (kw= '[' kw= ']' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5877:2: kw= '[' kw= ']'
+            // InternalCheckCfg.g:5876:1: (kw= '[' kw= ']' )
+            // InternalCheckCfg.g:5877:2: kw= '[' kw= ']'
             {
-            kw=(Token)match(input,24,FOLLOW_24_in_ruleArrayBrackets13935); if (state.failed) return current;
+            kw=(Token)match(input,24,FOLLOW_53); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                       current.merge(kw);
                       newLeafNode(kw, grammarAccess.getArrayBracketsAccess().getLeftSquareBracketKeyword_0()); 
                   
             }
-            kw=(Token)match(input,25,FOLLOW_25_in_ruleArrayBrackets13948); if (state.failed) return current;
+            kw=(Token)match(input,25,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                       current.merge(kw);
@@ -16992,7 +16992,7 @@ public final AntlrDatatypeRuleToken ruleArrayBrackets() throws RecognitionExcept
 
 
     // $ANTLR start "entryRuleXFunctionTypeRef"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5896:1: entryRuleXFunctionTypeRef returns [EObject current=null] : iv_ruleXFunctionTypeRef= ruleXFunctionTypeRef EOF ;
+    // InternalCheckCfg.g:5896:1: entryRuleXFunctionTypeRef returns [EObject current=null] : iv_ruleXFunctionTypeRef= ruleXFunctionTypeRef EOF ;
     public final EObject entryRuleXFunctionTypeRef() throws RecognitionException {
         EObject current = null;
 
@@ -17000,13 +17000,13 @@ public final EObject entryRuleXFunctionTypeRef() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5897:2: (iv_ruleXFunctionTypeRef= ruleXFunctionTypeRef EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5898:2: iv_ruleXFunctionTypeRef= ruleXFunctionTypeRef EOF
+            // InternalCheckCfg.g:5897:2: (iv_ruleXFunctionTypeRef= ruleXFunctionTypeRef EOF )
+            // InternalCheckCfg.g:5898:2: iv_ruleXFunctionTypeRef= ruleXFunctionTypeRef EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXFunctionTypeRefRule()); 
             }
-            pushFollow(FOLLOW_ruleXFunctionTypeRef_in_entryRuleXFunctionTypeRef13988);
+            pushFollow(FOLLOW_1);
             iv_ruleXFunctionTypeRef=ruleXFunctionTypeRef();
 
             state._fsp--;
@@ -17014,7 +17014,7 @@ public final EObject entryRuleXFunctionTypeRef() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXFunctionTypeRef; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXFunctionTypeRef13998); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -17032,7 +17032,7 @@ public final EObject entryRuleXFunctionTypeRef() throws RecognitionException {
 
 
     // $ANTLR start "ruleXFunctionTypeRef"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5905:1: ruleXFunctionTypeRef returns [EObject current=null] : ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) ) ;
+    // InternalCheckCfg.g:5905:1: ruleXFunctionTypeRef returns [EObject current=null] : ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) ) ;
     public final EObject ruleXFunctionTypeRef() throws RecognitionException {
         EObject current = null;
 
@@ -17050,13 +17050,13 @@ public final EObject ruleXFunctionTypeRef() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5908:28: ( ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5909:1: ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) )
+            // InternalCheckCfg.g:5908:28: ( ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) ) )
+            // InternalCheckCfg.g:5909:1: ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5909:1: ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5909:2: (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) )
+            // InternalCheckCfg.g:5909:1: ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) )
+            // InternalCheckCfg.g:5909:2: (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5909:2: (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )?
+            // InternalCheckCfg.g:5909:2: (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )?
             int alt111=2;
             int LA111_0 = input.LA(1);
 
@@ -17065,15 +17065,15 @@ public final EObject ruleXFunctionTypeRef() throws RecognitionException {
             }
             switch (alt111) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5909:4: otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')'
+                    // InternalCheckCfg.g:5909:4: otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')'
                     {
-                    otherlv_0=(Token)match(input,19,FOLLOW_19_in_ruleXFunctionTypeRef14036); if (state.failed) return current;
+                    otherlv_0=(Token)match(input,19,FOLLOW_83); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_0, grammarAccess.getXFunctionTypeRefAccess().getLeftParenthesisKeyword_0_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5913:1: ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )?
+                    // InternalCheckCfg.g:5913:1: ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )?
                     int alt110=2;
                     int LA110_0 = input.LA(1);
 
@@ -17082,20 +17082,20 @@ public final EObject ruleXFunctionTypeRef() throws RecognitionException {
                     }
                     switch (alt110) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5913:2: ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )*
+                            // InternalCheckCfg.g:5913:2: ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )*
                             {
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5913:2: ( (lv_paramTypes_1_0= ruleJvmTypeReference ) )
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5914:1: (lv_paramTypes_1_0= ruleJvmTypeReference )
+                            // InternalCheckCfg.g:5913:2: ( (lv_paramTypes_1_0= ruleJvmTypeReference ) )
+                            // InternalCheckCfg.g:5914:1: (lv_paramTypes_1_0= ruleJvmTypeReference )
                             {
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5914:1: (lv_paramTypes_1_0= ruleJvmTypeReference )
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5915:3: lv_paramTypes_1_0= ruleJvmTypeReference
+                            // InternalCheckCfg.g:5914:1: (lv_paramTypes_1_0= ruleJvmTypeReference )
+                            // InternalCheckCfg.g:5915:3: lv_paramTypes_1_0= ruleJvmTypeReference
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXFunctionTypeRefAccess().getParamTypesJvmTypeReferenceParserRuleCall_0_1_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleXFunctionTypeRef14058);
+                            pushFollow(FOLLOW_13);
                             lv_paramTypes_1_0=ruleJvmTypeReference();
 
                             state._fsp--;
@@ -17109,7 +17109,7 @@ public final EObject ruleXFunctionTypeRef() throws RecognitionException {
                                      			current, 
                                      			"paramTypes",
                                       		lv_paramTypes_1_0, 
-                                      		"JvmTypeReference");
+                                      		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -17119,7 +17119,7 @@ public final EObject ruleXFunctionTypeRef() throws RecognitionException {
 
                             }
 
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5931:2: (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )*
+                            // InternalCheckCfg.g:5931:2: (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )*
                             loop109:
                             do {
                                 int alt109=2;
@@ -17132,26 +17132,26 @@ public final EObject ruleXFunctionTypeRef() throws RecognitionException {
 
                                 switch (alt109) {
                             	case 1 :
-                            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5931:4: otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) )
+                            	    // InternalCheckCfg.g:5931:4: otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) )
                             	    {
-                            	    otherlv_2=(Token)match(input,20,FOLLOW_20_in_ruleXFunctionTypeRef14071); if (state.failed) return current;
+                            	    otherlv_2=(Token)match(input,20,FOLLOW_29); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	          	newLeafNode(otherlv_2, grammarAccess.getXFunctionTypeRefAccess().getCommaKeyword_0_1_1_0());
                             	          
                             	    }
-                            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5935:1: ( (lv_paramTypes_3_0= ruleJvmTypeReference ) )
-                            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5936:1: (lv_paramTypes_3_0= ruleJvmTypeReference )
+                            	    // InternalCheckCfg.g:5935:1: ( (lv_paramTypes_3_0= ruleJvmTypeReference ) )
+                            	    // InternalCheckCfg.g:5936:1: (lv_paramTypes_3_0= ruleJvmTypeReference )
                             	    {
-                            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5936:1: (lv_paramTypes_3_0= ruleJvmTypeReference )
-                            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5937:3: lv_paramTypes_3_0= ruleJvmTypeReference
+                            	    // InternalCheckCfg.g:5936:1: (lv_paramTypes_3_0= ruleJvmTypeReference )
+                            	    // InternalCheckCfg.g:5937:3: lv_paramTypes_3_0= ruleJvmTypeReference
                             	    {
                             	    if ( state.backtracking==0 ) {
                             	       
                             	      	        newCompositeNode(grammarAccess.getXFunctionTypeRefAccess().getParamTypesJvmTypeReferenceParserRuleCall_0_1_1_1_0()); 
                             	      	    
                             	    }
-                            	    pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleXFunctionTypeRef14092);
+                            	    pushFollow(FOLLOW_13);
                             	    lv_paramTypes_3_0=ruleJvmTypeReference();
 
                             	    state._fsp--;
@@ -17165,7 +17165,7 @@ public final EObject ruleXFunctionTypeRef() throws RecognitionException {
                             	             			current, 
                             	             			"paramTypes",
                             	              		lv_paramTypes_3_0, 
-                            	              		"JvmTypeReference");
+                            	              		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
                             	      	        afterParserOrEnumRuleCall();
                             	      	    
                             	    }
@@ -17190,7 +17190,7 @@ public final EObject ruleXFunctionTypeRef() throws RecognitionException {
 
                     }
 
-                    otherlv_4=(Token)match(input,21,FOLLOW_21_in_ruleXFunctionTypeRef14108); if (state.failed) return current;
+                    otherlv_4=(Token)match(input,21,FOLLOW_84); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_4, grammarAccess.getXFunctionTypeRefAccess().getRightParenthesisKeyword_0_2());
@@ -17202,24 +17202,24 @@ public final EObject ruleXFunctionTypeRef() throws RecognitionException {
 
             }
 
-            otherlv_5=(Token)match(input,44,FOLLOW_44_in_ruleXFunctionTypeRef14122); if (state.failed) return current;
+            otherlv_5=(Token)match(input,44,FOLLOW_29); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_5, grammarAccess.getXFunctionTypeRefAccess().getEqualsSignGreaterThanSignKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5961:1: ( (lv_returnType_6_0= ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5962:1: (lv_returnType_6_0= ruleJvmTypeReference )
+            // InternalCheckCfg.g:5961:1: ( (lv_returnType_6_0= ruleJvmTypeReference ) )
+            // InternalCheckCfg.g:5962:1: (lv_returnType_6_0= ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5962:1: (lv_returnType_6_0= ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5963:3: lv_returnType_6_0= ruleJvmTypeReference
+            // InternalCheckCfg.g:5962:1: (lv_returnType_6_0= ruleJvmTypeReference )
+            // InternalCheckCfg.g:5963:3: lv_returnType_6_0= ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXFunctionTypeRefAccess().getReturnTypeJvmTypeReferenceParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleXFunctionTypeRef14143);
+            pushFollow(FOLLOW_2);
             lv_returnType_6_0=ruleJvmTypeReference();
 
             state._fsp--;
@@ -17233,7 +17233,7 @@ public final EObject ruleXFunctionTypeRef() throws RecognitionException {
                      			current, 
                      			"returnType",
                       		lv_returnType_6_0, 
-                      		"JvmTypeReference");
+                      		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -17266,7 +17266,7 @@ public final EObject ruleXFunctionTypeRef() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleJvmParameterizedTypeReference"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5987:1: entryRuleJvmParameterizedTypeReference returns [EObject current=null] : iv_ruleJvmParameterizedTypeReference= ruleJvmParameterizedTypeReference EOF ;
+    // InternalCheckCfg.g:5987:1: entryRuleJvmParameterizedTypeReference returns [EObject current=null] : iv_ruleJvmParameterizedTypeReference= ruleJvmParameterizedTypeReference EOF ;
     public final EObject entryRuleJvmParameterizedTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -17274,13 +17274,13 @@ public final EObject entryRuleJvmParameterizedTypeReference() throws Recognition
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5988:2: (iv_ruleJvmParameterizedTypeReference= ruleJvmParameterizedTypeReference EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5989:2: iv_ruleJvmParameterizedTypeReference= ruleJvmParameterizedTypeReference EOF
+            // InternalCheckCfg.g:5988:2: (iv_ruleJvmParameterizedTypeReference= ruleJvmParameterizedTypeReference EOF )
+            // InternalCheckCfg.g:5989:2: iv_ruleJvmParameterizedTypeReference= ruleJvmParameterizedTypeReference EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmParameterizedTypeReferenceRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmParameterizedTypeReference_in_entryRuleJvmParameterizedTypeReference14179);
+            pushFollow(FOLLOW_1);
             iv_ruleJvmParameterizedTypeReference=ruleJvmParameterizedTypeReference();
 
             state._fsp--;
@@ -17288,7 +17288,7 @@ public final EObject entryRuleJvmParameterizedTypeReference() throws Recognition
             if ( state.backtracking==0 ) {
                current =iv_ruleJvmParameterizedTypeReference; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmParameterizedTypeReference14189); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -17306,7 +17306,7 @@ public final EObject entryRuleJvmParameterizedTypeReference() throws Recognition
 
 
     // $ANTLR start "ruleJvmParameterizedTypeReference"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5996:1: ruleJvmParameterizedTypeReference returns [EObject current=null] : ( ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )? ) ;
+    // InternalCheckCfg.g:5996:1: ruleJvmParameterizedTypeReference returns [EObject current=null] : ( ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )? ) ;
     public final EObject ruleJvmParameterizedTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -17329,17 +17329,17 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5999:28: ( ( ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6000:1: ( ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )? )
+            // InternalCheckCfg.g:5999:28: ( ( ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )? ) )
+            // InternalCheckCfg.g:6000:1: ( ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6000:1: ( ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )? )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6000:2: ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )?
+            // InternalCheckCfg.g:6000:1: ( ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )? )
+            // InternalCheckCfg.g:6000:2: ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )?
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6000:2: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6001:1: ( ruleQualifiedName )
+            // InternalCheckCfg.g:6000:2: ( ( ruleQualifiedName ) )
+            // InternalCheckCfg.g:6001:1: ( ruleQualifiedName )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6001:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6002:3: ruleQualifiedName
+            // InternalCheckCfg.g:6001:1: ( ruleQualifiedName )
+            // InternalCheckCfg.g:6002:3: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
 
@@ -17353,7 +17353,7 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
               	        newCompositeNode(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeJvmTypeCrossReference_0_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_ruleJvmParameterizedTypeReference14237);
+            pushFollow(FOLLOW_85);
             ruleQualifiedName();
 
             state._fsp--;
@@ -17369,17 +17369,17 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
             }
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6015:2: ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )?
+            // InternalCheckCfg.g:6015:2: ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )?
             int alt116=2;
             alt116 = dfa116.predict(input);
             switch (alt116) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6015:3: ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )*
+                    // InternalCheckCfg.g:6015:3: ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )*
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6015:3: ( ( '<' )=>otherlv_1= '<' )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6015:4: ( '<' )=>otherlv_1= '<'
+                    // InternalCheckCfg.g:6015:3: ( ( '<' )=>otherlv_1= '<' )
+                    // InternalCheckCfg.g:6015:4: ( '<' )=>otherlv_1= '<'
                     {
-                    otherlv_1=(Token)match(input,31,FOLLOW_31_in_ruleJvmParameterizedTypeReference14258); if (state.failed) return current;
+                    otherlv_1=(Token)match(input,31,FOLLOW_41); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_1, grammarAccess.getJvmParameterizedTypeReferenceAccess().getLessThanSignKeyword_1_0());
@@ -17388,18 +17388,18 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
                     }
 
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6020:2: ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6021:1: (lv_arguments_2_0= ruleJvmArgumentTypeReference )
+                    // InternalCheckCfg.g:6020:2: ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) )
+                    // InternalCheckCfg.g:6021:1: (lv_arguments_2_0= ruleJvmArgumentTypeReference )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6021:1: (lv_arguments_2_0= ruleJvmArgumentTypeReference )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6022:3: lv_arguments_2_0= ruleJvmArgumentTypeReference
+                    // InternalCheckCfg.g:6021:1: (lv_arguments_2_0= ruleJvmArgumentTypeReference )
+                    // InternalCheckCfg.g:6022:3: lv_arguments_2_0= ruleJvmArgumentTypeReference
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleJvmParameterizedTypeReference14280);
+                    pushFollow(FOLLOW_42);
                     lv_arguments_2_0=ruleJvmArgumentTypeReference();
 
                     state._fsp--;
@@ -17413,7 +17413,7 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
                              			current, 
                              			"arguments",
                               		lv_arguments_2_0, 
-                              		"JvmArgumentTypeReference");
+                              		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -17423,7 +17423,7 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
                     }
 
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6038:2: (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )*
+                    // InternalCheckCfg.g:6038:2: (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )*
                     loop112:
                     do {
                         int alt112=2;
@@ -17436,26 +17436,26 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
                         switch (alt112) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6038:4: otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) )
+                    	    // InternalCheckCfg.g:6038:4: otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) )
                     	    {
-                    	    otherlv_3=(Token)match(input,20,FOLLOW_20_in_ruleJvmParameterizedTypeReference14293); if (state.failed) return current;
+                    	    otherlv_3=(Token)match(input,20,FOLLOW_41); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_3, grammarAccess.getJvmParameterizedTypeReferenceAccess().getCommaKeyword_1_2_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6042:1: ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) )
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6043:1: (lv_arguments_4_0= ruleJvmArgumentTypeReference )
+                    	    // InternalCheckCfg.g:6042:1: ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) )
+                    	    // InternalCheckCfg.g:6043:1: (lv_arguments_4_0= ruleJvmArgumentTypeReference )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6043:1: (lv_arguments_4_0= ruleJvmArgumentTypeReference )
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6044:3: lv_arguments_4_0= ruleJvmArgumentTypeReference
+                    	    // InternalCheckCfg.g:6043:1: (lv_arguments_4_0= ruleJvmArgumentTypeReference )
+                    	    // InternalCheckCfg.g:6044:3: lv_arguments_4_0= ruleJvmArgumentTypeReference
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_2_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleJvmParameterizedTypeReference14314);
+                    	    pushFollow(FOLLOW_42);
                     	    lv_arguments_4_0=ruleJvmArgumentTypeReference();
 
                     	    state._fsp--;
@@ -17469,7 +17469,7 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
                     	             			current, 
                     	             			"arguments",
                     	              		lv_arguments_4_0, 
-                    	              		"JvmArgumentTypeReference");
+                    	              		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -17488,13 +17488,13 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
                         }
                     } while (true);
 
-                    otherlv_5=(Token)match(input,32,FOLLOW_32_in_ruleJvmParameterizedTypeReference14328); if (state.failed) return current;
+                    otherlv_5=(Token)match(input,32,FOLLOW_81); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_5, grammarAccess.getJvmParameterizedTypeReferenceAccess().getGreaterThanSignKeyword_1_3());
                           
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6064:1: ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )*
+                    // InternalCheckCfg.g:6064:1: ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )*
                     loop115:
                     do {
                         int alt115=2;
@@ -17519,16 +17519,16 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
                         switch (alt115) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6064:2: ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )?
+                    	    // InternalCheckCfg.g:6064:2: ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )?
                     	    {
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6064:2: ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) )
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6064:3: ( ( () '.' ) )=> ( () otherlv_7= '.' )
+                    	    // InternalCheckCfg.g:6064:2: ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) )
+                    	    // InternalCheckCfg.g:6064:3: ( ( () '.' ) )=> ( () otherlv_7= '.' )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6066:5: ( () otherlv_7= '.' )
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6066:6: () otherlv_7= '.'
+                    	    // InternalCheckCfg.g:6066:5: ( () otherlv_7= '.' )
+                    	    // InternalCheckCfg.g:6066:6: () otherlv_7= '.'
                     	    {
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6066:6: ()
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6067:5: 
+                    	    // InternalCheckCfg.g:6066:6: ()
+                    	    // InternalCheckCfg.g:6067:5: 
                     	    {
                     	    if ( state.backtracking==0 ) {
 
@@ -17540,7 +17540,7 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
                     	    }
 
-                    	    otherlv_7=(Token)match(input,57,FOLLOW_57_in_ruleJvmParameterizedTypeReference14364); if (state.failed) return current;
+                    	    otherlv_7=(Token)match(input,57,FOLLOW_4); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_7, grammarAccess.getJvmParameterizedTypeReferenceAccess().getFullStopKeyword_1_4_0_0_1());
@@ -17552,11 +17552,11 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
                     	    }
 
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6076:3: ( ( ruleValidID ) )
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6077:1: ( ruleValidID )
+                    	    // InternalCheckCfg.g:6076:3: ( ( ruleValidID ) )
+                    	    // InternalCheckCfg.g:6077:1: ( ruleValidID )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6077:1: ( ruleValidID )
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6078:3: ruleValidID
+                    	    // InternalCheckCfg.g:6077:1: ( ruleValidID )
+                    	    // InternalCheckCfg.g:6078:3: ruleValidID
                     	    {
                     	    if ( state.backtracking==0 ) {
 
@@ -17570,7 +17570,7 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
                     	      	        newCompositeNode(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeJvmTypeCrossReference_1_4_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleValidID_in_ruleJvmParameterizedTypeReference14389);
+                    	    pushFollow(FOLLOW_86);
                     	    ruleValidID();
 
                     	    state._fsp--;
@@ -17586,17 +17586,17 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
                     	    }
 
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6091:2: ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )?
+                    	    // InternalCheckCfg.g:6091:2: ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )?
                     	    int alt114=2;
                     	    alt114 = dfa114.predict(input);
                     	    switch (alt114) {
                     	        case 1 :
-                    	            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6091:3: ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>'
+                    	            // InternalCheckCfg.g:6091:3: ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>'
                     	            {
-                    	            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6091:3: ( ( '<' )=>otherlv_9= '<' )
-                    	            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6091:4: ( '<' )=>otherlv_9= '<'
+                    	            // InternalCheckCfg.g:6091:3: ( ( '<' )=>otherlv_9= '<' )
+                    	            // InternalCheckCfg.g:6091:4: ( '<' )=>otherlv_9= '<'
                     	            {
-                    	            otherlv_9=(Token)match(input,31,FOLLOW_31_in_ruleJvmParameterizedTypeReference14410); if (state.failed) return current;
+                    	            otherlv_9=(Token)match(input,31,FOLLOW_41); if (state.failed) return current;
                     	            if ( state.backtracking==0 ) {
 
                     	                  	newLeafNode(otherlv_9, grammarAccess.getJvmParameterizedTypeReferenceAccess().getLessThanSignKeyword_1_4_2_0());
@@ -17605,18 +17605,18 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
                     	            }
 
-                    	            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6096:2: ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) )
-                    	            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6097:1: (lv_arguments_10_0= ruleJvmArgumentTypeReference )
+                    	            // InternalCheckCfg.g:6096:2: ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) )
+                    	            // InternalCheckCfg.g:6097:1: (lv_arguments_10_0= ruleJvmArgumentTypeReference )
                     	            {
-                    	            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6097:1: (lv_arguments_10_0= ruleJvmArgumentTypeReference )
-                    	            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6098:3: lv_arguments_10_0= ruleJvmArgumentTypeReference
+                    	            // InternalCheckCfg.g:6097:1: (lv_arguments_10_0= ruleJvmArgumentTypeReference )
+                    	            // InternalCheckCfg.g:6098:3: lv_arguments_10_0= ruleJvmArgumentTypeReference
                     	            {
                     	            if ( state.backtracking==0 ) {
                     	               
                     	              	        newCompositeNode(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_4_2_1_0()); 
                     	              	    
                     	            }
-                    	            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleJvmParameterizedTypeReference14432);
+                    	            pushFollow(FOLLOW_42);
                     	            lv_arguments_10_0=ruleJvmArgumentTypeReference();
 
                     	            state._fsp--;
@@ -17630,7 +17630,7 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
                     	                     			current, 
                     	                     			"arguments",
                     	                      		lv_arguments_10_0, 
-                    	                      		"JvmArgumentTypeReference");
+                    	                      		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
                     	              	        afterParserOrEnumRuleCall();
                     	              	    
                     	            }
@@ -17640,7 +17640,7 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
                     	            }
 
-                    	            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6114:2: (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )*
+                    	            // InternalCheckCfg.g:6114:2: (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )*
                     	            loop113:
                     	            do {
                     	                int alt113=2;
@@ -17653,26 +17653,26 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
                     	                switch (alt113) {
                     	            	case 1 :
-                    	            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6114:4: otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) )
+                    	            	    // InternalCheckCfg.g:6114:4: otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) )
                     	            	    {
-                    	            	    otherlv_11=(Token)match(input,20,FOLLOW_20_in_ruleJvmParameterizedTypeReference14445); if (state.failed) return current;
+                    	            	    otherlv_11=(Token)match(input,20,FOLLOW_41); if (state.failed) return current;
                     	            	    if ( state.backtracking==0 ) {
 
                     	            	          	newLeafNode(otherlv_11, grammarAccess.getJvmParameterizedTypeReferenceAccess().getCommaKeyword_1_4_2_2_0());
                     	            	          
                     	            	    }
-                    	            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6118:1: ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) )
-                    	            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6119:1: (lv_arguments_12_0= ruleJvmArgumentTypeReference )
+                    	            	    // InternalCheckCfg.g:6118:1: ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) )
+                    	            	    // InternalCheckCfg.g:6119:1: (lv_arguments_12_0= ruleJvmArgumentTypeReference )
                     	            	    {
-                    	            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6119:1: (lv_arguments_12_0= ruleJvmArgumentTypeReference )
-                    	            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6120:3: lv_arguments_12_0= ruleJvmArgumentTypeReference
+                    	            	    // InternalCheckCfg.g:6119:1: (lv_arguments_12_0= ruleJvmArgumentTypeReference )
+                    	            	    // InternalCheckCfg.g:6120:3: lv_arguments_12_0= ruleJvmArgumentTypeReference
                     	            	    {
                     	            	    if ( state.backtracking==0 ) {
                     	            	       
                     	            	      	        newCompositeNode(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_4_2_2_1_0()); 
                     	            	      	    
                     	            	    }
-                    	            	    pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleJvmParameterizedTypeReference14466);
+                    	            	    pushFollow(FOLLOW_42);
                     	            	    lv_arguments_12_0=ruleJvmArgumentTypeReference();
 
                     	            	    state._fsp--;
@@ -17686,7 +17686,7 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
                     	            	             			current, 
                     	            	             			"arguments",
                     	            	              		lv_arguments_12_0, 
-                    	            	              		"JvmArgumentTypeReference");
+                    	            	              		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
                     	            	      	        afterParserOrEnumRuleCall();
                     	            	      	    
                     	            	    }
@@ -17705,7 +17705,7 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
                     	                }
                     	            } while (true);
 
-                    	            otherlv_13=(Token)match(input,32,FOLLOW_32_in_ruleJvmParameterizedTypeReference14480); if (state.failed) return current;
+                    	            otherlv_13=(Token)match(input,32,FOLLOW_81); if (state.failed) return current;
                     	            if ( state.backtracking==0 ) {
 
                     	                  	newLeafNode(otherlv_13, grammarAccess.getJvmParameterizedTypeReferenceAccess().getGreaterThanSignKeyword_1_4_2_3());
@@ -17755,7 +17755,7 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
 
     // $ANTLR start "entryRuleJvmArgumentTypeReference"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6148:1: entryRuleJvmArgumentTypeReference returns [EObject current=null] : iv_ruleJvmArgumentTypeReference= ruleJvmArgumentTypeReference EOF ;
+    // InternalCheckCfg.g:6148:1: entryRuleJvmArgumentTypeReference returns [EObject current=null] : iv_ruleJvmArgumentTypeReference= ruleJvmArgumentTypeReference EOF ;
     public final EObject entryRuleJvmArgumentTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -17763,13 +17763,13 @@ public final EObject entryRuleJvmArgumentTypeReference() throws RecognitionExcep
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6149:2: (iv_ruleJvmArgumentTypeReference= ruleJvmArgumentTypeReference EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6150:2: iv_ruleJvmArgumentTypeReference= ruleJvmArgumentTypeReference EOF
+            // InternalCheckCfg.g:6149:2: (iv_ruleJvmArgumentTypeReference= ruleJvmArgumentTypeReference EOF )
+            // InternalCheckCfg.g:6150:2: iv_ruleJvmArgumentTypeReference= ruleJvmArgumentTypeReference EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmArgumentTypeReferenceRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_entryRuleJvmArgumentTypeReference14522);
+            pushFollow(FOLLOW_1);
             iv_ruleJvmArgumentTypeReference=ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -17777,7 +17777,7 @@ public final EObject entryRuleJvmArgumentTypeReference() throws RecognitionExcep
             if ( state.backtracking==0 ) {
                current =iv_ruleJvmArgumentTypeReference; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmArgumentTypeReference14532); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -17795,7 +17795,7 @@ public final EObject entryRuleJvmArgumentTypeReference() throws RecognitionExcep
 
 
     // $ANTLR start "ruleJvmArgumentTypeReference"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6157:1: ruleJvmArgumentTypeReference returns [EObject current=null] : (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference ) ;
+    // InternalCheckCfg.g:6157:1: ruleJvmArgumentTypeReference returns [EObject current=null] : (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference ) ;
     public final EObject ruleJvmArgumentTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -17807,10 +17807,10 @@ public final EObject ruleJvmArgumentTypeReference() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6160:28: ( (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6161:1: (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference )
+            // InternalCheckCfg.g:6160:28: ( (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference ) )
+            // InternalCheckCfg.g:6161:1: (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6161:1: (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference )
+            // InternalCheckCfg.g:6161:1: (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference )
             int alt117=2;
             int LA117_0 = input.LA(1);
 
@@ -17829,14 +17829,14 @@ else if ( (LA117_0==88) ) {
             }
             switch (alt117) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6162:5: this_JvmTypeReference_0= ruleJvmTypeReference
+                    // InternalCheckCfg.g:6162:5: this_JvmTypeReference_0= ruleJvmTypeReference
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getJvmArgumentTypeReferenceAccess().getJvmTypeReferenceParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleJvmArgumentTypeReference14579);
+                    pushFollow(FOLLOW_2);
                     this_JvmTypeReference_0=ruleJvmTypeReference();
 
                     state._fsp--;
@@ -17851,14 +17851,14 @@ else if ( (LA117_0==88) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6172:5: this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference
+                    // InternalCheckCfg.g:6172:5: this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getJvmArgumentTypeReferenceAccess().getJvmWildcardTypeReferenceParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleJvmWildcardTypeReference_in_ruleJvmArgumentTypeReference14606);
+                    pushFollow(FOLLOW_2);
                     this_JvmWildcardTypeReference_1=ruleJvmWildcardTypeReference();
 
                     state._fsp--;
@@ -17895,7 +17895,7 @@ else if ( (LA117_0==88) ) {
 
 
     // $ANTLR start "entryRuleJvmWildcardTypeReference"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6188:1: entryRuleJvmWildcardTypeReference returns [EObject current=null] : iv_ruleJvmWildcardTypeReference= ruleJvmWildcardTypeReference EOF ;
+    // InternalCheckCfg.g:6188:1: entryRuleJvmWildcardTypeReference returns [EObject current=null] : iv_ruleJvmWildcardTypeReference= ruleJvmWildcardTypeReference EOF ;
     public final EObject entryRuleJvmWildcardTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -17903,13 +17903,13 @@ public final EObject entryRuleJvmWildcardTypeReference() throws RecognitionExcep
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6189:2: (iv_ruleJvmWildcardTypeReference= ruleJvmWildcardTypeReference EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6190:2: iv_ruleJvmWildcardTypeReference= ruleJvmWildcardTypeReference EOF
+            // InternalCheckCfg.g:6189:2: (iv_ruleJvmWildcardTypeReference= ruleJvmWildcardTypeReference EOF )
+            // InternalCheckCfg.g:6190:2: iv_ruleJvmWildcardTypeReference= ruleJvmWildcardTypeReference EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmWildcardTypeReferenceRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmWildcardTypeReference_in_entryRuleJvmWildcardTypeReference14641);
+            pushFollow(FOLLOW_1);
             iv_ruleJvmWildcardTypeReference=ruleJvmWildcardTypeReference();
 
             state._fsp--;
@@ -17917,7 +17917,7 @@ public final EObject entryRuleJvmWildcardTypeReference() throws RecognitionExcep
             if ( state.backtracking==0 ) {
                current =iv_ruleJvmWildcardTypeReference; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmWildcardTypeReference14651); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -17935,7 +17935,7 @@ public final EObject entryRuleJvmWildcardTypeReference() throws RecognitionExcep
 
 
     // $ANTLR start "ruleJvmWildcardTypeReference"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6197:1: ruleJvmWildcardTypeReference returns [EObject current=null] : ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? ) ;
+    // InternalCheckCfg.g:6197:1: ruleJvmWildcardTypeReference returns [EObject current=null] : ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? ) ;
     public final EObject ruleJvmWildcardTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -17952,14 +17952,14 @@ public final EObject ruleJvmWildcardTypeReference() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6200:28: ( ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6201:1: ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? )
+            // InternalCheckCfg.g:6200:28: ( ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? ) )
+            // InternalCheckCfg.g:6201:1: ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6201:1: ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6201:2: () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )?
+            // InternalCheckCfg.g:6201:1: ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? )
+            // InternalCheckCfg.g:6201:2: () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )?
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6201:2: ()
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6202:5: 
+            // InternalCheckCfg.g:6201:2: ()
+            // InternalCheckCfg.g:6202:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -17971,13 +17971,13 @@ public final EObject ruleJvmWildcardTypeReference() throws RecognitionException
 
             }
 
-            otherlv_1=(Token)match(input,88,FOLLOW_88_in_ruleJvmWildcardTypeReference14697); if (state.failed) return current;
+            otherlv_1=(Token)match(input,88,FOLLOW_87); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getJvmWildcardTypeReferenceAccess().getQuestionMarkKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6211:1: ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )?
+            // InternalCheckCfg.g:6211:1: ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )?
             int alt120=3;
             int LA120_0 = input.LA(1);
 
@@ -17989,23 +17989,23 @@ else if ( (LA120_0==76) ) {
             }
             switch (alt120) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6211:2: ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* )
+                    // InternalCheckCfg.g:6211:2: ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6211:2: ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6211:3: ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )*
+                    // InternalCheckCfg.g:6211:2: ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* )
+                    // InternalCheckCfg.g:6211:3: ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )*
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6211:3: ( (lv_constraints_2_0= ruleJvmUpperBound ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6212:1: (lv_constraints_2_0= ruleJvmUpperBound )
+                    // InternalCheckCfg.g:6211:3: ( (lv_constraints_2_0= ruleJvmUpperBound ) )
+                    // InternalCheckCfg.g:6212:1: (lv_constraints_2_0= ruleJvmUpperBound )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6212:1: (lv_constraints_2_0= ruleJvmUpperBound )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6213:3: lv_constraints_2_0= ruleJvmUpperBound
+                    // InternalCheckCfg.g:6212:1: (lv_constraints_2_0= ruleJvmUpperBound )
+                    // InternalCheckCfg.g:6213:3: lv_constraints_2_0= ruleJvmUpperBound
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmUpperBoundParserRuleCall_2_0_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleJvmUpperBound_in_ruleJvmWildcardTypeReference14720);
+                    pushFollow(FOLLOW_88);
                     lv_constraints_2_0=ruleJvmUpperBound();
 
                     state._fsp--;
@@ -18019,7 +18019,7 @@ else if ( (LA120_0==76) ) {
                              			current, 
                              			"constraints",
                               		lv_constraints_2_0, 
-                              		"JvmUpperBound");
+                              		"org.eclipse.xtext.xbase.Xtype.JvmUpperBound");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -18029,7 +18029,7 @@ else if ( (LA120_0==76) ) {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6229:2: ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )*
+                    // InternalCheckCfg.g:6229:2: ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )*
                     loop118:
                     do {
                         int alt118=2;
@@ -18042,17 +18042,17 @@ else if ( (LA120_0==76) ) {
 
                         switch (alt118) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6230:1: (lv_constraints_3_0= ruleJvmUpperBoundAnded )
+                    	    // InternalCheckCfg.g:6230:1: (lv_constraints_3_0= ruleJvmUpperBoundAnded )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6230:1: (lv_constraints_3_0= ruleJvmUpperBoundAnded )
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6231:3: lv_constraints_3_0= ruleJvmUpperBoundAnded
+                    	    // InternalCheckCfg.g:6230:1: (lv_constraints_3_0= ruleJvmUpperBoundAnded )
+                    	    // InternalCheckCfg.g:6231:3: lv_constraints_3_0= ruleJvmUpperBoundAnded
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmUpperBoundAndedParserRuleCall_2_0_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleJvmUpperBoundAnded_in_ruleJvmWildcardTypeReference14741);
+                    	    pushFollow(FOLLOW_88);
                     	    lv_constraints_3_0=ruleJvmUpperBoundAnded();
 
                     	    state._fsp--;
@@ -18066,7 +18066,7 @@ else if ( (LA120_0==76) ) {
                     	             			current, 
                     	             			"constraints",
                     	              		lv_constraints_3_0, 
-                    	              		"JvmUpperBoundAnded");
+                    	              		"org.eclipse.xtext.xbase.Xtype.JvmUpperBoundAnded");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -18089,23 +18089,23 @@ else if ( (LA120_0==76) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6248:6: ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* )
+                    // InternalCheckCfg.g:6248:6: ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6248:6: ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6248:7: ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )*
+                    // InternalCheckCfg.g:6248:6: ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* )
+                    // InternalCheckCfg.g:6248:7: ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )*
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6248:7: ( (lv_constraints_4_0= ruleJvmLowerBound ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6249:1: (lv_constraints_4_0= ruleJvmLowerBound )
+                    // InternalCheckCfg.g:6248:7: ( (lv_constraints_4_0= ruleJvmLowerBound ) )
+                    // InternalCheckCfg.g:6249:1: (lv_constraints_4_0= ruleJvmLowerBound )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6249:1: (lv_constraints_4_0= ruleJvmLowerBound )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6250:3: lv_constraints_4_0= ruleJvmLowerBound
+                    // InternalCheckCfg.g:6249:1: (lv_constraints_4_0= ruleJvmLowerBound )
+                    // InternalCheckCfg.g:6250:3: lv_constraints_4_0= ruleJvmLowerBound
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmLowerBoundParserRuleCall_2_1_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleJvmLowerBound_in_ruleJvmWildcardTypeReference14771);
+                    pushFollow(FOLLOW_88);
                     lv_constraints_4_0=ruleJvmLowerBound();
 
                     state._fsp--;
@@ -18119,7 +18119,7 @@ else if ( (LA120_0==76) ) {
                              			current, 
                              			"constraints",
                               		lv_constraints_4_0, 
-                              		"JvmLowerBound");
+                              		"org.eclipse.xtext.xbase.Xtype.JvmLowerBound");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -18129,7 +18129,7 @@ else if ( (LA120_0==76) ) {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6266:2: ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )*
+                    // InternalCheckCfg.g:6266:2: ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )*
                     loop119:
                     do {
                         int alt119=2;
@@ -18142,17 +18142,17 @@ else if ( (LA120_0==76) ) {
 
                         switch (alt119) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6267:1: (lv_constraints_5_0= ruleJvmLowerBoundAnded )
+                    	    // InternalCheckCfg.g:6267:1: (lv_constraints_5_0= ruleJvmLowerBoundAnded )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6267:1: (lv_constraints_5_0= ruleJvmLowerBoundAnded )
-                    	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6268:3: lv_constraints_5_0= ruleJvmLowerBoundAnded
+                    	    // InternalCheckCfg.g:6267:1: (lv_constraints_5_0= ruleJvmLowerBoundAnded )
+                    	    // InternalCheckCfg.g:6268:3: lv_constraints_5_0= ruleJvmLowerBoundAnded
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmLowerBoundAndedParserRuleCall_2_1_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleJvmLowerBoundAnded_in_ruleJvmWildcardTypeReference14792);
+                    	    pushFollow(FOLLOW_88);
                     	    lv_constraints_5_0=ruleJvmLowerBoundAnded();
 
                     	    state._fsp--;
@@ -18166,7 +18166,7 @@ else if ( (LA120_0==76) ) {
                     	             			current, 
                     	             			"constraints",
                     	              		lv_constraints_5_0, 
-                    	              		"JvmLowerBoundAnded");
+                    	              		"org.eclipse.xtext.xbase.Xtype.JvmLowerBoundAnded");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -18214,7 +18214,7 @@ else if ( (LA120_0==76) ) {
 
 
     // $ANTLR start "entryRuleJvmUpperBound"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6292:1: entryRuleJvmUpperBound returns [EObject current=null] : iv_ruleJvmUpperBound= ruleJvmUpperBound EOF ;
+    // InternalCheckCfg.g:6292:1: entryRuleJvmUpperBound returns [EObject current=null] : iv_ruleJvmUpperBound= ruleJvmUpperBound EOF ;
     public final EObject entryRuleJvmUpperBound() throws RecognitionException {
         EObject current = null;
 
@@ -18222,13 +18222,13 @@ public final EObject entryRuleJvmUpperBound() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6293:2: (iv_ruleJvmUpperBound= ruleJvmUpperBound EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6294:2: iv_ruleJvmUpperBound= ruleJvmUpperBound EOF
+            // InternalCheckCfg.g:6293:2: (iv_ruleJvmUpperBound= ruleJvmUpperBound EOF )
+            // InternalCheckCfg.g:6294:2: iv_ruleJvmUpperBound= ruleJvmUpperBound EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmUpperBoundRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmUpperBound_in_entryRuleJvmUpperBound14832);
+            pushFollow(FOLLOW_1);
             iv_ruleJvmUpperBound=ruleJvmUpperBound();
 
             state._fsp--;
@@ -18236,7 +18236,7 @@ public final EObject entryRuleJvmUpperBound() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleJvmUpperBound; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmUpperBound14842); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -18254,7 +18254,7 @@ public final EObject entryRuleJvmUpperBound() throws RecognitionException {
 
 
     // $ANTLR start "ruleJvmUpperBound"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6301:1: ruleJvmUpperBound returns [EObject current=null] : (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
+    // InternalCheckCfg.g:6301:1: ruleJvmUpperBound returns [EObject current=null] : (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
     public final EObject ruleJvmUpperBound() throws RecognitionException {
         EObject current = null;
 
@@ -18265,30 +18265,30 @@ public final EObject ruleJvmUpperBound() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6304:28: ( (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6305:1: (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // InternalCheckCfg.g:6304:28: ( (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
+            // InternalCheckCfg.g:6305:1: (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6305:1: (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6305:3: otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // InternalCheckCfg.g:6305:1: (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // InternalCheckCfg.g:6305:3: otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
             {
-            otherlv_0=(Token)match(input,72,FOLLOW_72_in_ruleJvmUpperBound14879); if (state.failed) return current;
+            otherlv_0=(Token)match(input,72,FOLLOW_29); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getJvmUpperBoundAccess().getExtendsKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6309:1: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6310:1: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // InternalCheckCfg.g:6309:1: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // InternalCheckCfg.g:6310:1: (lv_typeReference_1_0= ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6310:1: (lv_typeReference_1_0= ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6311:3: lv_typeReference_1_0= ruleJvmTypeReference
+            // InternalCheckCfg.g:6310:1: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // InternalCheckCfg.g:6311:3: lv_typeReference_1_0= ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getJvmUpperBoundAccess().getTypeReferenceJvmTypeReferenceParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleJvmUpperBound14900);
+            pushFollow(FOLLOW_2);
             lv_typeReference_1_0=ruleJvmTypeReference();
 
             state._fsp--;
@@ -18302,7 +18302,7 @@ public final EObject ruleJvmUpperBound() throws RecognitionException {
                      			current, 
                      			"typeReference",
                       		lv_typeReference_1_0, 
-                      		"JvmTypeReference");
+                      		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -18335,7 +18335,7 @@ public final EObject ruleJvmUpperBound() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleJvmUpperBoundAnded"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6335:1: entryRuleJvmUpperBoundAnded returns [EObject current=null] : iv_ruleJvmUpperBoundAnded= ruleJvmUpperBoundAnded EOF ;
+    // InternalCheckCfg.g:6335:1: entryRuleJvmUpperBoundAnded returns [EObject current=null] : iv_ruleJvmUpperBoundAnded= ruleJvmUpperBoundAnded EOF ;
     public final EObject entryRuleJvmUpperBoundAnded() throws RecognitionException {
         EObject current = null;
 
@@ -18343,13 +18343,13 @@ public final EObject entryRuleJvmUpperBoundAnded() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6336:2: (iv_ruleJvmUpperBoundAnded= ruleJvmUpperBoundAnded EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6337:2: iv_ruleJvmUpperBoundAnded= ruleJvmUpperBoundAnded EOF
+            // InternalCheckCfg.g:6336:2: (iv_ruleJvmUpperBoundAnded= ruleJvmUpperBoundAnded EOF )
+            // InternalCheckCfg.g:6337:2: iv_ruleJvmUpperBoundAnded= ruleJvmUpperBoundAnded EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmUpperBoundAndedRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmUpperBoundAnded_in_entryRuleJvmUpperBoundAnded14936);
+            pushFollow(FOLLOW_1);
             iv_ruleJvmUpperBoundAnded=ruleJvmUpperBoundAnded();
 
             state._fsp--;
@@ -18357,7 +18357,7 @@ public final EObject entryRuleJvmUpperBoundAnded() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleJvmUpperBoundAnded; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmUpperBoundAnded14946); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -18375,7 +18375,7 @@ public final EObject entryRuleJvmUpperBoundAnded() throws RecognitionException {
 
 
     // $ANTLR start "ruleJvmUpperBoundAnded"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6344:1: ruleJvmUpperBoundAnded returns [EObject current=null] : (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
+    // InternalCheckCfg.g:6344:1: ruleJvmUpperBoundAnded returns [EObject current=null] : (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
     public final EObject ruleJvmUpperBoundAnded() throws RecognitionException {
         EObject current = null;
 
@@ -18386,30 +18386,30 @@ public final EObject ruleJvmUpperBoundAnded() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6347:28: ( (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6348:1: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // InternalCheckCfg.g:6347:28: ( (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
+            // InternalCheckCfg.g:6348:1: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6348:1: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6348:3: otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // InternalCheckCfg.g:6348:1: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // InternalCheckCfg.g:6348:3: otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
             {
-            otherlv_0=(Token)match(input,89,FOLLOW_89_in_ruleJvmUpperBoundAnded14983); if (state.failed) return current;
+            otherlv_0=(Token)match(input,89,FOLLOW_29); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getJvmUpperBoundAndedAccess().getAmpersandKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6352:1: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6353:1: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // InternalCheckCfg.g:6352:1: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // InternalCheckCfg.g:6353:1: (lv_typeReference_1_0= ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6353:1: (lv_typeReference_1_0= ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6354:3: lv_typeReference_1_0= ruleJvmTypeReference
+            // InternalCheckCfg.g:6353:1: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // InternalCheckCfg.g:6354:3: lv_typeReference_1_0= ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getJvmUpperBoundAndedAccess().getTypeReferenceJvmTypeReferenceParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleJvmUpperBoundAnded15004);
+            pushFollow(FOLLOW_2);
             lv_typeReference_1_0=ruleJvmTypeReference();
 
             state._fsp--;
@@ -18423,7 +18423,7 @@ public final EObject ruleJvmUpperBoundAnded() throws RecognitionException {
                      			current, 
                      			"typeReference",
                       		lv_typeReference_1_0, 
-                      		"JvmTypeReference");
+                      		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -18456,7 +18456,7 @@ public final EObject ruleJvmUpperBoundAnded() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleJvmLowerBound"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6378:1: entryRuleJvmLowerBound returns [EObject current=null] : iv_ruleJvmLowerBound= ruleJvmLowerBound EOF ;
+    // InternalCheckCfg.g:6378:1: entryRuleJvmLowerBound returns [EObject current=null] : iv_ruleJvmLowerBound= ruleJvmLowerBound EOF ;
     public final EObject entryRuleJvmLowerBound() throws RecognitionException {
         EObject current = null;
 
@@ -18464,13 +18464,13 @@ public final EObject entryRuleJvmLowerBound() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6379:2: (iv_ruleJvmLowerBound= ruleJvmLowerBound EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6380:2: iv_ruleJvmLowerBound= ruleJvmLowerBound EOF
+            // InternalCheckCfg.g:6379:2: (iv_ruleJvmLowerBound= ruleJvmLowerBound EOF )
+            // InternalCheckCfg.g:6380:2: iv_ruleJvmLowerBound= ruleJvmLowerBound EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmLowerBoundRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmLowerBound_in_entryRuleJvmLowerBound15040);
+            pushFollow(FOLLOW_1);
             iv_ruleJvmLowerBound=ruleJvmLowerBound();
 
             state._fsp--;
@@ -18478,7 +18478,7 @@ public final EObject entryRuleJvmLowerBound() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleJvmLowerBound; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmLowerBound15050); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -18496,7 +18496,7 @@ public final EObject entryRuleJvmLowerBound() throws RecognitionException {
 
 
     // $ANTLR start "ruleJvmLowerBound"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6387:1: ruleJvmLowerBound returns [EObject current=null] : (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
+    // InternalCheckCfg.g:6387:1: ruleJvmLowerBound returns [EObject current=null] : (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
     public final EObject ruleJvmLowerBound() throws RecognitionException {
         EObject current = null;
 
@@ -18507,30 +18507,30 @@ public final EObject ruleJvmLowerBound() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6390:28: ( (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6391:1: (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // InternalCheckCfg.g:6390:28: ( (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
+            // InternalCheckCfg.g:6391:1: (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6391:1: (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6391:3: otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // InternalCheckCfg.g:6391:1: (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // InternalCheckCfg.g:6391:3: otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
             {
-            otherlv_0=(Token)match(input,76,FOLLOW_76_in_ruleJvmLowerBound15087); if (state.failed) return current;
+            otherlv_0=(Token)match(input,76,FOLLOW_29); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getJvmLowerBoundAccess().getSuperKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6395:1: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6396:1: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // InternalCheckCfg.g:6395:1: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // InternalCheckCfg.g:6396:1: (lv_typeReference_1_0= ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6396:1: (lv_typeReference_1_0= ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6397:3: lv_typeReference_1_0= ruleJvmTypeReference
+            // InternalCheckCfg.g:6396:1: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // InternalCheckCfg.g:6397:3: lv_typeReference_1_0= ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getJvmLowerBoundAccess().getTypeReferenceJvmTypeReferenceParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleJvmLowerBound15108);
+            pushFollow(FOLLOW_2);
             lv_typeReference_1_0=ruleJvmTypeReference();
 
             state._fsp--;
@@ -18544,7 +18544,7 @@ public final EObject ruleJvmLowerBound() throws RecognitionException {
                      			current, 
                      			"typeReference",
                       		lv_typeReference_1_0, 
-                      		"JvmTypeReference");
+                      		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -18577,7 +18577,7 @@ public final EObject ruleJvmLowerBound() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleJvmLowerBoundAnded"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6421:1: entryRuleJvmLowerBoundAnded returns [EObject current=null] : iv_ruleJvmLowerBoundAnded= ruleJvmLowerBoundAnded EOF ;
+    // InternalCheckCfg.g:6421:1: entryRuleJvmLowerBoundAnded returns [EObject current=null] : iv_ruleJvmLowerBoundAnded= ruleJvmLowerBoundAnded EOF ;
     public final EObject entryRuleJvmLowerBoundAnded() throws RecognitionException {
         EObject current = null;
 
@@ -18585,13 +18585,13 @@ public final EObject entryRuleJvmLowerBoundAnded() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6422:2: (iv_ruleJvmLowerBoundAnded= ruleJvmLowerBoundAnded EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6423:2: iv_ruleJvmLowerBoundAnded= ruleJvmLowerBoundAnded EOF
+            // InternalCheckCfg.g:6422:2: (iv_ruleJvmLowerBoundAnded= ruleJvmLowerBoundAnded EOF )
+            // InternalCheckCfg.g:6423:2: iv_ruleJvmLowerBoundAnded= ruleJvmLowerBoundAnded EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmLowerBoundAndedRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmLowerBoundAnded_in_entryRuleJvmLowerBoundAnded15144);
+            pushFollow(FOLLOW_1);
             iv_ruleJvmLowerBoundAnded=ruleJvmLowerBoundAnded();
 
             state._fsp--;
@@ -18599,7 +18599,7 @@ public final EObject entryRuleJvmLowerBoundAnded() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleJvmLowerBoundAnded; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmLowerBoundAnded15154); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -18617,7 +18617,7 @@ public final EObject entryRuleJvmLowerBoundAnded() throws RecognitionException {
 
 
     // $ANTLR start "ruleJvmLowerBoundAnded"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6430:1: ruleJvmLowerBoundAnded returns [EObject current=null] : (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
+    // InternalCheckCfg.g:6430:1: ruleJvmLowerBoundAnded returns [EObject current=null] : (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
     public final EObject ruleJvmLowerBoundAnded() throws RecognitionException {
         EObject current = null;
 
@@ -18628,30 +18628,30 @@ public final EObject ruleJvmLowerBoundAnded() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6433:28: ( (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6434:1: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // InternalCheckCfg.g:6433:28: ( (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
+            // InternalCheckCfg.g:6434:1: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6434:1: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6434:3: otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // InternalCheckCfg.g:6434:1: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // InternalCheckCfg.g:6434:3: otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
             {
-            otherlv_0=(Token)match(input,89,FOLLOW_89_in_ruleJvmLowerBoundAnded15191); if (state.failed) return current;
+            otherlv_0=(Token)match(input,89,FOLLOW_29); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getJvmLowerBoundAndedAccess().getAmpersandKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6438:1: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6439:1: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // InternalCheckCfg.g:6438:1: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // InternalCheckCfg.g:6439:1: (lv_typeReference_1_0= ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6439:1: (lv_typeReference_1_0= ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6440:3: lv_typeReference_1_0= ruleJvmTypeReference
+            // InternalCheckCfg.g:6439:1: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // InternalCheckCfg.g:6440:3: lv_typeReference_1_0= ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getJvmLowerBoundAndedAccess().getTypeReferenceJvmTypeReferenceParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleJvmLowerBoundAnded15212);
+            pushFollow(FOLLOW_2);
             lv_typeReference_1_0=ruleJvmTypeReference();
 
             state._fsp--;
@@ -18665,7 +18665,7 @@ public final EObject ruleJvmLowerBoundAnded() throws RecognitionException {
                      			current, 
                      			"typeReference",
                       		lv_typeReference_1_0, 
-                      		"JvmTypeReference");
+                      		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -18698,7 +18698,7 @@ public final EObject ruleJvmLowerBoundAnded() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleQualifiedNameWithWildcard"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6466:1: entryRuleQualifiedNameWithWildcard returns [String current=null] : iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF ;
+    // InternalCheckCfg.g:6466:1: entryRuleQualifiedNameWithWildcard returns [String current=null] : iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF ;
     public final String entryRuleQualifiedNameWithWildcard() throws RecognitionException {
         String current = null;
 
@@ -18706,13 +18706,13 @@ public final String entryRuleQualifiedNameWithWildcard() throws RecognitionExcep
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6467:2: (iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6468:2: iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF
+            // InternalCheckCfg.g:6467:2: (iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF )
+            // InternalCheckCfg.g:6468:2: iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getQualifiedNameWithWildcardRule()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedNameWithWildcard_in_entryRuleQualifiedNameWithWildcard15251);
+            pushFollow(FOLLOW_1);
             iv_ruleQualifiedNameWithWildcard=ruleQualifiedNameWithWildcard();
 
             state._fsp--;
@@ -18720,7 +18720,7 @@ public final String entryRuleQualifiedNameWithWildcard() throws RecognitionExcep
             if ( state.backtracking==0 ) {
                current =iv_ruleQualifiedNameWithWildcard.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedNameWithWildcard15262); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -18738,7 +18738,7 @@ public final String entryRuleQualifiedNameWithWildcard() throws RecognitionExcep
 
 
     // $ANTLR start "ruleQualifiedNameWithWildcard"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6475:1: ruleQualifiedNameWithWildcard returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' ) ;
+    // InternalCheckCfg.g:6475:1: ruleQualifiedNameWithWildcard returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' ) ;
     public final AntlrDatatypeRuleToken ruleQualifiedNameWithWildcard() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -18749,18 +18749,18 @@ public final AntlrDatatypeRuleToken ruleQualifiedNameWithWildcard() throws Recog
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6478:28: ( (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6479:1: (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' )
+            // InternalCheckCfg.g:6478:28: ( (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' ) )
+            // InternalCheckCfg.g:6479:1: (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6479:1: (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6480:5: this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*'
+            // InternalCheckCfg.g:6479:1: (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' )
+            // InternalCheckCfg.g:6480:5: this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*'
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getQualifiedNameWithWildcardAccess().getQualifiedNameParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_ruleQualifiedNameWithWildcard15309);
+            pushFollow(FOLLOW_89);
             this_QualifiedName_0=ruleQualifiedName();
 
             state._fsp--;
@@ -18775,14 +18775,14 @@ public final AntlrDatatypeRuleToken ruleQualifiedNameWithWildcard() throws Recog
                       afterParserOrEnumRuleCall();
                   
             }
-            kw=(Token)match(input,57,FOLLOW_57_in_ruleQualifiedNameWithWildcard15327); if (state.failed) return current;
+            kw=(Token)match(input,57,FOLLOW_90); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                       current.merge(kw);
                       newLeafNode(kw, grammarAccess.getQualifiedNameWithWildcardAccess().getFullStopKeyword_1()); 
                   
             }
-            kw=(Token)match(input,49,FOLLOW_49_in_ruleQualifiedNameWithWildcard15340); if (state.failed) return current;
+            kw=(Token)match(input,49,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                       current.merge(kw);
@@ -18812,7 +18812,7 @@ public final AntlrDatatypeRuleToken ruleQualifiedNameWithWildcard() throws Recog
 
 
     // $ANTLR start "entryRuleValidID"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6510:1: entryRuleValidID returns [String current=null] : iv_ruleValidID= ruleValidID EOF ;
+    // InternalCheckCfg.g:6510:1: entryRuleValidID returns [String current=null] : iv_ruleValidID= ruleValidID EOF ;
     public final String entryRuleValidID() throws RecognitionException {
         String current = null;
 
@@ -18820,13 +18820,13 @@ public final String entryRuleValidID() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6511:2: (iv_ruleValidID= ruleValidID EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6512:2: iv_ruleValidID= ruleValidID EOF
+            // InternalCheckCfg.g:6511:2: (iv_ruleValidID= ruleValidID EOF )
+            // InternalCheckCfg.g:6512:2: iv_ruleValidID= ruleValidID EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getValidIDRule()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_entryRuleValidID15381);
+            pushFollow(FOLLOW_1);
             iv_ruleValidID=ruleValidID();
 
             state._fsp--;
@@ -18834,7 +18834,7 @@ public final String entryRuleValidID() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleValidID.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleValidID15392); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -18852,7 +18852,7 @@ public final String entryRuleValidID() throws RecognitionException {
 
 
     // $ANTLR start "ruleValidID"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6519:1: ruleValidID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_ID_0= RULE_ID ;
+    // InternalCheckCfg.g:6519:1: ruleValidID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_ID_0= RULE_ID ;
     public final AntlrDatatypeRuleToken ruleValidID() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -18861,10 +18861,10 @@ public final AntlrDatatypeRuleToken ruleValidID() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6522:28: (this_ID_0= RULE_ID )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6523:5: this_ID_0= RULE_ID
+            // InternalCheckCfg.g:6522:28: (this_ID_0= RULE_ID )
+            // InternalCheckCfg.g:6523:5: this_ID_0= RULE_ID
             {
-            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleValidID15431); if (state.failed) return current;
+            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               		current.merge(this_ID_0);
@@ -18895,7 +18895,7 @@ public final AntlrDatatypeRuleToken ruleValidID() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXImportDeclaration"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6540:1: entryRuleXImportDeclaration returns [EObject current=null] : iv_ruleXImportDeclaration= ruleXImportDeclaration EOF ;
+    // InternalCheckCfg.g:6540:1: entryRuleXImportDeclaration returns [EObject current=null] : iv_ruleXImportDeclaration= ruleXImportDeclaration EOF ;
     public final EObject entryRuleXImportDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -18903,13 +18903,13 @@ public final EObject entryRuleXImportDeclaration() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6541:2: (iv_ruleXImportDeclaration= ruleXImportDeclaration EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6542:2: iv_ruleXImportDeclaration= ruleXImportDeclaration EOF
+            // InternalCheckCfg.g:6541:2: (iv_ruleXImportDeclaration= ruleXImportDeclaration EOF )
+            // InternalCheckCfg.g:6542:2: iv_ruleXImportDeclaration= ruleXImportDeclaration EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXImportDeclarationRule()); 
             }
-            pushFollow(FOLLOW_ruleXImportDeclaration_in_entryRuleXImportDeclaration15477);
+            pushFollow(FOLLOW_1);
             iv_ruleXImportDeclaration=ruleXImportDeclaration();
 
             state._fsp--;
@@ -18917,7 +18917,7 @@ public final EObject entryRuleXImportDeclaration() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXImportDeclaration; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXImportDeclaration15487); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -18935,7 +18935,7 @@ public final EObject entryRuleXImportDeclaration() throws RecognitionException {
 
 
     // $ANTLR start "ruleXImportDeclaration"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6549:1: ruleXImportDeclaration returns [EObject current=null] : (otherlv_0= 'import' ( ( ( (lv_static_1_0= 'static' ) ) ( (lv_extension_2_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_4_0= '*' ) ) | ( (lv_memberName_5_0= ruleValidID ) ) ) ) | ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard ) ) ) (otherlv_8= ';' )? ) ;
+    // InternalCheckCfg.g:6549:1: ruleXImportDeclaration returns [EObject current=null] : (otherlv_0= 'import' ( ( ( (lv_static_1_0= 'static' ) ) ( (lv_extension_2_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_4_0= '*' ) ) | ( (lv_memberName_5_0= ruleValidID ) ) ) ) | ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard ) ) ) (otherlv_8= ';' )? ) ;
     public final EObject ruleXImportDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -18952,35 +18952,35 @@ public final EObject ruleXImportDeclaration() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6552:28: ( (otherlv_0= 'import' ( ( ( (lv_static_1_0= 'static' ) ) ( (lv_extension_2_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_4_0= '*' ) ) | ( (lv_memberName_5_0= ruleValidID ) ) ) ) | ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard ) ) ) (otherlv_8= ';' )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6553:1: (otherlv_0= 'import' ( ( ( (lv_static_1_0= 'static' ) ) ( (lv_extension_2_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_4_0= '*' ) ) | ( (lv_memberName_5_0= ruleValidID ) ) ) ) | ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard ) ) ) (otherlv_8= ';' )? )
+            // InternalCheckCfg.g:6552:28: ( (otherlv_0= 'import' ( ( ( (lv_static_1_0= 'static' ) ) ( (lv_extension_2_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_4_0= '*' ) ) | ( (lv_memberName_5_0= ruleValidID ) ) ) ) | ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard ) ) ) (otherlv_8= ';' )? ) )
+            // InternalCheckCfg.g:6553:1: (otherlv_0= 'import' ( ( ( (lv_static_1_0= 'static' ) ) ( (lv_extension_2_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_4_0= '*' ) ) | ( (lv_memberName_5_0= ruleValidID ) ) ) ) | ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard ) ) ) (otherlv_8= ';' )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6553:1: (otherlv_0= 'import' ( ( ( (lv_static_1_0= 'static' ) ) ( (lv_extension_2_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_4_0= '*' ) ) | ( (lv_memberName_5_0= ruleValidID ) ) ) ) | ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard ) ) ) (otherlv_8= ';' )? )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6553:3: otherlv_0= 'import' ( ( ( (lv_static_1_0= 'static' ) ) ( (lv_extension_2_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_4_0= '*' ) ) | ( (lv_memberName_5_0= ruleValidID ) ) ) ) | ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard ) ) ) (otherlv_8= ';' )?
+            // InternalCheckCfg.g:6553:1: (otherlv_0= 'import' ( ( ( (lv_static_1_0= 'static' ) ) ( (lv_extension_2_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_4_0= '*' ) ) | ( (lv_memberName_5_0= ruleValidID ) ) ) ) | ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard ) ) ) (otherlv_8= ';' )? )
+            // InternalCheckCfg.g:6553:3: otherlv_0= 'import' ( ( ( (lv_static_1_0= 'static' ) ) ( (lv_extension_2_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_4_0= '*' ) ) | ( (lv_memberName_5_0= ruleValidID ) ) ) ) | ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard ) ) ) (otherlv_8= ';' )?
             {
-            otherlv_0=(Token)match(input,74,FOLLOW_74_in_ruleXImportDeclaration15524); if (state.failed) return current;
+            otherlv_0=(Token)match(input,74,FOLLOW_91); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getXImportDeclarationAccess().getImportKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6557:1: ( ( ( (lv_static_1_0= 'static' ) ) ( (lv_extension_2_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_4_0= '*' ) ) | ( (lv_memberName_5_0= ruleValidID ) ) ) ) | ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard ) ) )
+            // InternalCheckCfg.g:6557:1: ( ( ( (lv_static_1_0= 'static' ) ) ( (lv_extension_2_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_4_0= '*' ) ) | ( (lv_memberName_5_0= ruleValidID ) ) ) ) | ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard ) ) )
             int alt123=3;
             alt123 = dfa123.predict(input);
             switch (alt123) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6557:2: ( ( (lv_static_1_0= 'static' ) ) ( (lv_extension_2_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_4_0= '*' ) ) | ( (lv_memberName_5_0= ruleValidID ) ) ) )
+                    // InternalCheckCfg.g:6557:2: ( ( (lv_static_1_0= 'static' ) ) ( (lv_extension_2_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_4_0= '*' ) ) | ( (lv_memberName_5_0= ruleValidID ) ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6557:2: ( ( (lv_static_1_0= 'static' ) ) ( (lv_extension_2_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_4_0= '*' ) ) | ( (lv_memberName_5_0= ruleValidID ) ) ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6557:3: ( (lv_static_1_0= 'static' ) ) ( (lv_extension_2_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_4_0= '*' ) ) | ( (lv_memberName_5_0= ruleValidID ) ) )
+                    // InternalCheckCfg.g:6557:2: ( ( (lv_static_1_0= 'static' ) ) ( (lv_extension_2_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_4_0= '*' ) ) | ( (lv_memberName_5_0= ruleValidID ) ) ) )
+                    // InternalCheckCfg.g:6557:3: ( (lv_static_1_0= 'static' ) ) ( (lv_extension_2_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_4_0= '*' ) ) | ( (lv_memberName_5_0= ruleValidID ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6557:3: ( (lv_static_1_0= 'static' ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6558:1: (lv_static_1_0= 'static' )
+                    // InternalCheckCfg.g:6557:3: ( (lv_static_1_0= 'static' ) )
+                    // InternalCheckCfg.g:6558:1: (lv_static_1_0= 'static' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6558:1: (lv_static_1_0= 'static' )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6559:3: lv_static_1_0= 'static'
+                    // InternalCheckCfg.g:6558:1: (lv_static_1_0= 'static' )
+                    // InternalCheckCfg.g:6559:3: lv_static_1_0= 'static'
                     {
-                    lv_static_1_0=(Token)match(input,73,FOLLOW_73_in_ruleXImportDeclaration15544); if (state.failed) return current;
+                    lv_static_1_0=(Token)match(input,73,FOLLOW_92); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_static_1_0, grammarAccess.getXImportDeclarationAccess().getStaticStaticKeyword_1_0_0_0());
@@ -19000,7 +19000,7 @@ public final EObject ruleXImportDeclaration() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6572:2: ( (lv_extension_2_0= 'extension' ) )?
+                    // InternalCheckCfg.g:6572:2: ( (lv_extension_2_0= 'extension' ) )?
                     int alt121=2;
                     int LA121_0 = input.LA(1);
 
@@ -19009,12 +19009,12 @@ public final EObject ruleXImportDeclaration() throws RecognitionException {
                     }
                     switch (alt121) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6573:1: (lv_extension_2_0= 'extension' )
+                            // InternalCheckCfg.g:6573:1: (lv_extension_2_0= 'extension' )
                             {
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6573:1: (lv_extension_2_0= 'extension' )
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6574:3: lv_extension_2_0= 'extension'
+                            // InternalCheckCfg.g:6573:1: (lv_extension_2_0= 'extension' )
+                            // InternalCheckCfg.g:6574:3: lv_extension_2_0= 'extension'
                             {
-                            lv_extension_2_0=(Token)match(input,75,FOLLOW_75_in_ruleXImportDeclaration15575); if (state.failed) return current;
+                            lv_extension_2_0=(Token)match(input,75,FOLLOW_92); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       newLeafNode(lv_extension_2_0, grammarAccess.getXImportDeclarationAccess().getExtensionExtensionKeyword_1_0_1_0());
@@ -19037,11 +19037,11 @@ public final EObject ruleXImportDeclaration() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6587:3: ( ( ruleQualifiedNameInStaticImport ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6588:1: ( ruleQualifiedNameInStaticImport )
+                    // InternalCheckCfg.g:6587:3: ( ( ruleQualifiedNameInStaticImport ) )
+                    // InternalCheckCfg.g:6588:1: ( ruleQualifiedNameInStaticImport )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6588:1: ( ruleQualifiedNameInStaticImport )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6589:3: ruleQualifiedNameInStaticImport
+                    // InternalCheckCfg.g:6588:1: ( ruleQualifiedNameInStaticImport )
+                    // InternalCheckCfg.g:6589:3: ruleQualifiedNameInStaticImport
                     {
                     if ( state.backtracking==0 ) {
 
@@ -19055,7 +19055,7 @@ public final EObject ruleXImportDeclaration() throws RecognitionException {
                       	        newCompositeNode(grammarAccess.getXImportDeclarationAccess().getImportedTypeJvmDeclaredTypeCrossReference_1_0_2_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleQualifiedNameInStaticImport_in_ruleXImportDeclaration15612);
+                    pushFollow(FOLLOW_93);
                     ruleQualifiedNameInStaticImport();
 
                     state._fsp--;
@@ -19071,7 +19071,7 @@ public final EObject ruleXImportDeclaration() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6602:2: ( ( (lv_wildcard_4_0= '*' ) ) | ( (lv_memberName_5_0= ruleValidID ) ) )
+                    // InternalCheckCfg.g:6602:2: ( ( (lv_wildcard_4_0= '*' ) ) | ( (lv_memberName_5_0= ruleValidID ) ) )
                     int alt122=2;
                     int LA122_0 = input.LA(1);
 
@@ -19090,15 +19090,15 @@ else if ( (LA122_0==RULE_ID) ) {
                     }
                     switch (alt122) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6602:3: ( (lv_wildcard_4_0= '*' ) )
+                            // InternalCheckCfg.g:6602:3: ( (lv_wildcard_4_0= '*' ) )
                             {
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6602:3: ( (lv_wildcard_4_0= '*' ) )
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6603:1: (lv_wildcard_4_0= '*' )
+                            // InternalCheckCfg.g:6602:3: ( (lv_wildcard_4_0= '*' ) )
+                            // InternalCheckCfg.g:6603:1: (lv_wildcard_4_0= '*' )
                             {
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6603:1: (lv_wildcard_4_0= '*' )
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6604:3: lv_wildcard_4_0= '*'
+                            // InternalCheckCfg.g:6603:1: (lv_wildcard_4_0= '*' )
+                            // InternalCheckCfg.g:6604:3: lv_wildcard_4_0= '*'
                             {
-                            lv_wildcard_4_0=(Token)match(input,49,FOLLOW_49_in_ruleXImportDeclaration15631); if (state.failed) return current;
+                            lv_wildcard_4_0=(Token)match(input,49,FOLLOW_94); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       newLeafNode(lv_wildcard_4_0, grammarAccess.getXImportDeclarationAccess().getWildcardAsteriskKeyword_1_0_3_0_0());
@@ -19122,20 +19122,20 @@ else if ( (LA122_0==RULE_ID) ) {
                             }
                             break;
                         case 2 :
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6618:6: ( (lv_memberName_5_0= ruleValidID ) )
+                            // InternalCheckCfg.g:6618:6: ( (lv_memberName_5_0= ruleValidID ) )
                             {
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6618:6: ( (lv_memberName_5_0= ruleValidID ) )
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6619:1: (lv_memberName_5_0= ruleValidID )
+                            // InternalCheckCfg.g:6618:6: ( (lv_memberName_5_0= ruleValidID ) )
+                            // InternalCheckCfg.g:6619:1: (lv_memberName_5_0= ruleValidID )
                             {
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6619:1: (lv_memberName_5_0= ruleValidID )
-                            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6620:3: lv_memberName_5_0= ruleValidID
+                            // InternalCheckCfg.g:6619:1: (lv_memberName_5_0= ruleValidID )
+                            // InternalCheckCfg.g:6620:3: lv_memberName_5_0= ruleValidID
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXImportDeclarationAccess().getMemberNameValidIDParserRuleCall_1_0_3_1_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleValidID_in_ruleXImportDeclaration15671);
+                            pushFollow(FOLLOW_94);
                             lv_memberName_5_0=ruleValidID();
 
                             state._fsp--;
@@ -19149,7 +19149,7 @@ else if ( (LA122_0==RULE_ID) ) {
                                      			current, 
                                      			"memberName",
                                       		lv_memberName_5_0, 
-                                      		"ValidID");
+                                      		"org.eclipse.xtext.xbase.Xtype.ValidID");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -19172,13 +19172,13 @@ else if ( (LA122_0==RULE_ID) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6637:6: ( ( ruleQualifiedName ) )
+                    // InternalCheckCfg.g:6637:6: ( ( ruleQualifiedName ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6637:6: ( ( ruleQualifiedName ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6638:1: ( ruleQualifiedName )
+                    // InternalCheckCfg.g:6637:6: ( ( ruleQualifiedName ) )
+                    // InternalCheckCfg.g:6638:1: ( ruleQualifiedName )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6638:1: ( ruleQualifiedName )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6639:3: ruleQualifiedName
+                    // InternalCheckCfg.g:6638:1: ( ruleQualifiedName )
+                    // InternalCheckCfg.g:6639:3: ruleQualifiedName
                     {
                     if ( state.backtracking==0 ) {
 
@@ -19192,7 +19192,7 @@ else if ( (LA122_0==RULE_ID) ) {
                       	        newCompositeNode(grammarAccess.getXImportDeclarationAccess().getImportedTypeJvmDeclaredTypeCrossReference_1_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleQualifiedName_in_ruleXImportDeclaration15702);
+                    pushFollow(FOLLOW_94);
                     ruleQualifiedName();
 
                     state._fsp--;
@@ -19212,20 +19212,20 @@ else if ( (LA122_0==RULE_ID) ) {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6653:6: ( (lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard ) )
+                    // InternalCheckCfg.g:6653:6: ( (lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6653:6: ( (lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6654:1: (lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard )
+                    // InternalCheckCfg.g:6653:6: ( (lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard ) )
+                    // InternalCheckCfg.g:6654:1: (lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6654:1: (lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6655:3: lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard
+                    // InternalCheckCfg.g:6654:1: (lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard )
+                    // InternalCheckCfg.g:6655:3: lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXImportDeclarationAccess().getImportedNamespaceQualifiedNameWithWildcardParserRuleCall_1_2_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleQualifiedNameWithWildcard_in_ruleXImportDeclaration15729);
+                    pushFollow(FOLLOW_94);
                     lv_importedNamespace_7_0=ruleQualifiedNameWithWildcard();
 
                     state._fsp--;
@@ -19239,7 +19239,7 @@ else if ( (LA122_0==RULE_ID) ) {
                              			current, 
                              			"importedNamespace",
                               		lv_importedNamespace_7_0, 
-                              		"QualifiedNameWithWildcard");
+                              		"org.eclipse.xtext.xbase.Xtype.QualifiedNameWithWildcard");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -19255,7 +19255,7 @@ else if ( (LA122_0==RULE_ID) ) {
 
             }
 
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6671:3: (otherlv_8= ';' )?
+            // InternalCheckCfg.g:6671:3: (otherlv_8= ';' )?
             int alt124=2;
             int LA124_0 = input.LA(1);
 
@@ -19264,9 +19264,9 @@ else if ( (LA122_0==RULE_ID) ) {
             }
             switch (alt124) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6671:5: otherlv_8= ';'
+                    // InternalCheckCfg.g:6671:5: otherlv_8= ';'
                     {
-                    otherlv_8=(Token)match(input,61,FOLLOW_61_in_ruleXImportDeclaration15743); if (state.failed) return current;
+                    otherlv_8=(Token)match(input,61,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_8, grammarAccess.getXImportDeclarationAccess().getSemicolonKeyword_2());
@@ -19301,7 +19301,7 @@ else if ( (LA122_0==RULE_ID) ) {
 
 
     // $ANTLR start "entryRuleQualifiedNameInStaticImport"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6683:1: entryRuleQualifiedNameInStaticImport returns [String current=null] : iv_ruleQualifiedNameInStaticImport= ruleQualifiedNameInStaticImport EOF ;
+    // InternalCheckCfg.g:6683:1: entryRuleQualifiedNameInStaticImport returns [String current=null] : iv_ruleQualifiedNameInStaticImport= ruleQualifiedNameInStaticImport EOF ;
     public final String entryRuleQualifiedNameInStaticImport() throws RecognitionException {
         String current = null;
 
@@ -19309,13 +19309,13 @@ public final String entryRuleQualifiedNameInStaticImport() throws RecognitionExc
 
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6684:2: (iv_ruleQualifiedNameInStaticImport= ruleQualifiedNameInStaticImport EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6685:2: iv_ruleQualifiedNameInStaticImport= ruleQualifiedNameInStaticImport EOF
+            // InternalCheckCfg.g:6684:2: (iv_ruleQualifiedNameInStaticImport= ruleQualifiedNameInStaticImport EOF )
+            // InternalCheckCfg.g:6685:2: iv_ruleQualifiedNameInStaticImport= ruleQualifiedNameInStaticImport EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getQualifiedNameInStaticImportRule()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedNameInStaticImport_in_entryRuleQualifiedNameInStaticImport15782);
+            pushFollow(FOLLOW_1);
             iv_ruleQualifiedNameInStaticImport=ruleQualifiedNameInStaticImport();
 
             state._fsp--;
@@ -19323,7 +19323,7 @@ public final String entryRuleQualifiedNameInStaticImport() throws RecognitionExc
             if ( state.backtracking==0 ) {
                current =iv_ruleQualifiedNameInStaticImport.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedNameInStaticImport15793); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -19341,7 +19341,7 @@ public final String entryRuleQualifiedNameInStaticImport() throws RecognitionExc
 
 
     // $ANTLR start "ruleQualifiedNameInStaticImport"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6692:1: ruleQualifiedNameInStaticImport returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ValidID_0= ruleValidID kw= '.' )+ ;
+    // InternalCheckCfg.g:6692:1: ruleQualifiedNameInStaticImport returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ValidID_0= ruleValidID kw= '.' )+ ;
     public final AntlrDatatypeRuleToken ruleQualifiedNameInStaticImport() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -19352,10 +19352,10 @@ public final AntlrDatatypeRuleToken ruleQualifiedNameInStaticImport() throws Rec
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6695:28: ( (this_ValidID_0= ruleValidID kw= '.' )+ )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6696:1: (this_ValidID_0= ruleValidID kw= '.' )+
+            // InternalCheckCfg.g:6695:28: ( (this_ValidID_0= ruleValidID kw= '.' )+ )
+            // InternalCheckCfg.g:6696:1: (this_ValidID_0= ruleValidID kw= '.' )+
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6696:1: (this_ValidID_0= ruleValidID kw= '.' )+
+            // InternalCheckCfg.g:6696:1: (this_ValidID_0= ruleValidID kw= '.' )+
             int cnt125=0;
             loop125:
             do {
@@ -19375,14 +19375,14 @@ public final AntlrDatatypeRuleToken ruleQualifiedNameInStaticImport() throws Rec
 
                 switch (alt125) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6697:5: this_ValidID_0= ruleValidID kw= '.'
+            	    // InternalCheckCfg.g:6697:5: this_ValidID_0= ruleValidID kw= '.'
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	              newCompositeNode(grammarAccess.getQualifiedNameInStaticImportAccess().getValidIDParserRuleCall_0()); 
             	          
             	    }
-            	    pushFollow(FOLLOW_ruleValidID_in_ruleQualifiedNameInStaticImport15840);
+            	    pushFollow(FOLLOW_89);
             	    this_ValidID_0=ruleValidID();
 
             	    state._fsp--;
@@ -19397,7 +19397,7 @@ public final AntlrDatatypeRuleToken ruleQualifiedNameInStaticImport() throws Rec
             	              afterParserOrEnumRuleCall();
             	          
             	    }
-            	    kw=(Token)match(input,57,FOLLOW_57_in_ruleQualifiedNameInStaticImport15858); if (state.failed) return current;
+            	    kw=(Token)match(input,57,FOLLOW_95); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	              current.merge(kw);
@@ -19438,7 +19438,7 @@ public final AntlrDatatypeRuleToken ruleQualifiedNameInStaticImport() throws Rec
 
 
     // $ANTLR start "ruleSeverityKind"
-    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6721:1: ruleSeverityKind returns [Enumerator current=null] : ( (enumLiteral_0= 'default' ) | (enumLiteral_1= 'error' ) | (enumLiteral_2= 'warning' ) | (enumLiteral_3= 'info' ) | (enumLiteral_4= 'ignore' ) ) ;
+    // InternalCheckCfg.g:6721:1: ruleSeverityKind returns [Enumerator current=null] : ( (enumLiteral_0= 'default' ) | (enumLiteral_1= 'error' ) | (enumLiteral_2= 'warning' ) | (enumLiteral_3= 'info' ) | (enumLiteral_4= 'ignore' ) ) ;
     public final Enumerator ruleSeverityKind() throws RecognitionException {
         Enumerator current = null;
 
@@ -19450,10 +19450,10 @@ public final Enumerator ruleSeverityKind() throws RecognitionException {
 
          enterRule(); 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6723:28: ( ( (enumLiteral_0= 'default' ) | (enumLiteral_1= 'error' ) | (enumLiteral_2= 'warning' ) | (enumLiteral_3= 'info' ) | (enumLiteral_4= 'ignore' ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6724:1: ( (enumLiteral_0= 'default' ) | (enumLiteral_1= 'error' ) | (enumLiteral_2= 'warning' ) | (enumLiteral_3= 'info' ) | (enumLiteral_4= 'ignore' ) )
+            // InternalCheckCfg.g:6723:28: ( ( (enumLiteral_0= 'default' ) | (enumLiteral_1= 'error' ) | (enumLiteral_2= 'warning' ) | (enumLiteral_3= 'info' ) | (enumLiteral_4= 'ignore' ) ) )
+            // InternalCheckCfg.g:6724:1: ( (enumLiteral_0= 'default' ) | (enumLiteral_1= 'error' ) | (enumLiteral_2= 'warning' ) | (enumLiteral_3= 'info' ) | (enumLiteral_4= 'ignore' ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6724:1: ( (enumLiteral_0= 'default' ) | (enumLiteral_1= 'error' ) | (enumLiteral_2= 'warning' ) | (enumLiteral_3= 'info' ) | (enumLiteral_4= 'ignore' ) )
+            // InternalCheckCfg.g:6724:1: ( (enumLiteral_0= 'default' ) | (enumLiteral_1= 'error' ) | (enumLiteral_2= 'warning' ) | (enumLiteral_3= 'info' ) | (enumLiteral_4= 'ignore' ) )
             int alt126=5;
             switch ( input.LA(1) ) {
             case 66:
@@ -19491,12 +19491,12 @@ public final Enumerator ruleSeverityKind() throws RecognitionException {
 
             switch (alt126) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6724:2: (enumLiteral_0= 'default' )
+                    // InternalCheckCfg.g:6724:2: (enumLiteral_0= 'default' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6724:2: (enumLiteral_0= 'default' )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6724:4: enumLiteral_0= 'default'
+                    // InternalCheckCfg.g:6724:2: (enumLiteral_0= 'default' )
+                    // InternalCheckCfg.g:6724:4: enumLiteral_0= 'default'
                     {
-                    enumLiteral_0=(Token)match(input,66,FOLLOW_66_in_ruleSeverityKind15913); if (state.failed) return current;
+                    enumLiteral_0=(Token)match(input,66,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current = grammarAccess.getSeverityKindAccess().getDefaultEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
@@ -19510,12 +19510,12 @@ public final Enumerator ruleSeverityKind() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6730:6: (enumLiteral_1= 'error' )
+                    // InternalCheckCfg.g:6730:6: (enumLiteral_1= 'error' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6730:6: (enumLiteral_1= 'error' )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6730:8: enumLiteral_1= 'error'
+                    // InternalCheckCfg.g:6730:6: (enumLiteral_1= 'error' )
+                    // InternalCheckCfg.g:6730:8: enumLiteral_1= 'error'
                     {
-                    enumLiteral_1=(Token)match(input,90,FOLLOW_90_in_ruleSeverityKind15930); if (state.failed) return current;
+                    enumLiteral_1=(Token)match(input,90,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current = grammarAccess.getSeverityKindAccess().getErrorEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
@@ -19529,12 +19529,12 @@ public final Enumerator ruleSeverityKind() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6736:6: (enumLiteral_2= 'warning' )
+                    // InternalCheckCfg.g:6736:6: (enumLiteral_2= 'warning' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6736:6: (enumLiteral_2= 'warning' )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6736:8: enumLiteral_2= 'warning'
+                    // InternalCheckCfg.g:6736:6: (enumLiteral_2= 'warning' )
+                    // InternalCheckCfg.g:6736:8: enumLiteral_2= 'warning'
                     {
-                    enumLiteral_2=(Token)match(input,91,FOLLOW_91_in_ruleSeverityKind15947); if (state.failed) return current;
+                    enumLiteral_2=(Token)match(input,91,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current = grammarAccess.getSeverityKindAccess().getWarningEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
@@ -19548,12 +19548,12 @@ public final Enumerator ruleSeverityKind() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6742:6: (enumLiteral_3= 'info' )
+                    // InternalCheckCfg.g:6742:6: (enumLiteral_3= 'info' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6742:6: (enumLiteral_3= 'info' )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6742:8: enumLiteral_3= 'info'
+                    // InternalCheckCfg.g:6742:6: (enumLiteral_3= 'info' )
+                    // InternalCheckCfg.g:6742:8: enumLiteral_3= 'info'
                     {
-                    enumLiteral_3=(Token)match(input,92,FOLLOW_92_in_ruleSeverityKind15964); if (state.failed) return current;
+                    enumLiteral_3=(Token)match(input,92,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current = grammarAccess.getSeverityKindAccess().getInfoEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
@@ -19567,12 +19567,12 @@ public final Enumerator ruleSeverityKind() throws RecognitionException {
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6748:6: (enumLiteral_4= 'ignore' )
+                    // InternalCheckCfg.g:6748:6: (enumLiteral_4= 'ignore' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6748:6: (enumLiteral_4= 'ignore' )
-                    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6748:8: enumLiteral_4= 'ignore'
+                    // InternalCheckCfg.g:6748:6: (enumLiteral_4= 'ignore' )
+                    // InternalCheckCfg.g:6748:8: enumLiteral_4= 'ignore'
                     {
-                    enumLiteral_4=(Token)match(input,93,FOLLOW_93_in_ruleSeverityKind15981); if (state.failed) return current;
+                    enumLiteral_4=(Token)match(input,93,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current = grammarAccess.getSeverityKindAccess().getIgnoreEnumLiteralDeclaration_4().getEnumLiteral().getInstance();
@@ -19608,24 +19608,24 @@ public final Enumerator ruleSeverityKind() throws RecognitionException {
 
     // $ANTLR start synpred1_InternalCheckCfg
     public final void synpred1_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:865:3: ( ( () ( ( ruleOpMultiAssign ) ) ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:865:4: ( () ( ( ruleOpMultiAssign ) ) )
+        // InternalCheckCfg.g:865:3: ( ( () ( ( ruleOpMultiAssign ) ) ) )
+        // InternalCheckCfg.g:865:4: ( () ( ( ruleOpMultiAssign ) ) )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:865:4: ( () ( ( ruleOpMultiAssign ) ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:865:5: () ( ( ruleOpMultiAssign ) )
+        // InternalCheckCfg.g:865:4: ( () ( ( ruleOpMultiAssign ) ) )
+        // InternalCheckCfg.g:865:5: () ( ( ruleOpMultiAssign ) )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:865:5: ()
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:866:1: 
+        // InternalCheckCfg.g:865:5: ()
+        // InternalCheckCfg.g:866:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:866:2: ( ( ruleOpMultiAssign ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:867:1: ( ruleOpMultiAssign )
+        // InternalCheckCfg.g:866:2: ( ( ruleOpMultiAssign ) )
+        // InternalCheckCfg.g:867:1: ( ruleOpMultiAssign )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:867:1: ( ruleOpMultiAssign )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:868:3: ruleOpMultiAssign
+        // InternalCheckCfg.g:867:1: ( ruleOpMultiAssign )
+        // InternalCheckCfg.g:868:3: ruleOpMultiAssign
         {
-        pushFollow(FOLLOW_ruleOpMultiAssign_in_synpred1_InternalCheckCfg1822);
+        pushFollow(FOLLOW_2);
         ruleOpMultiAssign();
 
         state._fsp--;
@@ -19646,24 +19646,24 @@ public final void synpred1_InternalCheckCfg_fragment() throws RecognitionExcepti
 
     // $ANTLR start synpred2_InternalCheckCfg
     public final void synpred2_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1059:3: ( ( () ( ( ruleOpOr ) ) ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1059:4: ( () ( ( ruleOpOr ) ) )
+        // InternalCheckCfg.g:1059:3: ( ( () ( ( ruleOpOr ) ) ) )
+        // InternalCheckCfg.g:1059:4: ( () ( ( ruleOpOr ) ) )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1059:4: ( () ( ( ruleOpOr ) ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1059:5: () ( ( ruleOpOr ) )
+        // InternalCheckCfg.g:1059:4: ( () ( ( ruleOpOr ) ) )
+        // InternalCheckCfg.g:1059:5: () ( ( ruleOpOr ) )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1059:5: ()
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1060:1: 
+        // InternalCheckCfg.g:1059:5: ()
+        // InternalCheckCfg.g:1060:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1060:2: ( ( ruleOpOr ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1061:1: ( ruleOpOr )
+        // InternalCheckCfg.g:1060:2: ( ( ruleOpOr ) )
+        // InternalCheckCfg.g:1061:1: ( ruleOpOr )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1061:1: ( ruleOpOr )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1062:3: ruleOpOr
+        // InternalCheckCfg.g:1061:1: ( ruleOpOr )
+        // InternalCheckCfg.g:1062:3: ruleOpOr
         {
-        pushFollow(FOLLOW_ruleOpOr_in_synpred2_InternalCheckCfg2345);
+        pushFollow(FOLLOW_2);
         ruleOpOr();
 
         state._fsp--;
@@ -19684,24 +19684,24 @@ public final void synpred2_InternalCheckCfg_fragment() throws RecognitionExcepti
 
     // $ANTLR start synpred3_InternalCheckCfg
     public final void synpred3_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1160:3: ( ( () ( ( ruleOpAnd ) ) ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1160:4: ( () ( ( ruleOpAnd ) ) )
+        // InternalCheckCfg.g:1160:3: ( ( () ( ( ruleOpAnd ) ) ) )
+        // InternalCheckCfg.g:1160:4: ( () ( ( ruleOpAnd ) ) )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1160:4: ( () ( ( ruleOpAnd ) ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1160:5: () ( ( ruleOpAnd ) )
+        // InternalCheckCfg.g:1160:4: ( () ( ( ruleOpAnd ) ) )
+        // InternalCheckCfg.g:1160:5: () ( ( ruleOpAnd ) )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1160:5: ()
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1161:1: 
+        // InternalCheckCfg.g:1160:5: ()
+        // InternalCheckCfg.g:1161:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1161:2: ( ( ruleOpAnd ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1162:1: ( ruleOpAnd )
+        // InternalCheckCfg.g:1161:2: ( ( ruleOpAnd ) )
+        // InternalCheckCfg.g:1162:1: ( ruleOpAnd )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1162:1: ( ruleOpAnd )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1163:3: ruleOpAnd
+        // InternalCheckCfg.g:1162:1: ( ruleOpAnd )
+        // InternalCheckCfg.g:1163:3: ruleOpAnd
         {
-        pushFollow(FOLLOW_ruleOpAnd_in_synpred3_InternalCheckCfg2604);
+        pushFollow(FOLLOW_2);
         ruleOpAnd();
 
         state._fsp--;
@@ -19722,24 +19722,24 @@ public final void synpred3_InternalCheckCfg_fragment() throws RecognitionExcepti
 
     // $ANTLR start synpred4_InternalCheckCfg
     public final void synpred4_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1261:3: ( ( () ( ( ruleOpEquality ) ) ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1261:4: ( () ( ( ruleOpEquality ) ) )
+        // InternalCheckCfg.g:1261:3: ( ( () ( ( ruleOpEquality ) ) ) )
+        // InternalCheckCfg.g:1261:4: ( () ( ( ruleOpEquality ) ) )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1261:4: ( () ( ( ruleOpEquality ) ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1261:5: () ( ( ruleOpEquality ) )
+        // InternalCheckCfg.g:1261:4: ( () ( ( ruleOpEquality ) ) )
+        // InternalCheckCfg.g:1261:5: () ( ( ruleOpEquality ) )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1261:5: ()
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1262:1: 
+        // InternalCheckCfg.g:1261:5: ()
+        // InternalCheckCfg.g:1262:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1262:2: ( ( ruleOpEquality ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1263:1: ( ruleOpEquality )
+        // InternalCheckCfg.g:1262:2: ( ( ruleOpEquality ) )
+        // InternalCheckCfg.g:1263:1: ( ruleOpEquality )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1263:1: ( ruleOpEquality )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1264:3: ruleOpEquality
+        // InternalCheckCfg.g:1263:1: ( ruleOpEquality )
+        // InternalCheckCfg.g:1264:3: ruleOpEquality
         {
-        pushFollow(FOLLOW_ruleOpEquality_in_synpred4_InternalCheckCfg2863);
+        pushFollow(FOLLOW_2);
         ruleOpEquality();
 
         state._fsp--;
@@ -19760,18 +19760,18 @@ public final void synpred4_InternalCheckCfg_fragment() throws RecognitionExcepti
 
     // $ANTLR start synpred5_InternalCheckCfg
     public final void synpred5_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1383:4: ( ( () 'instanceof' ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1383:5: ( () 'instanceof' )
+        // InternalCheckCfg.g:1383:4: ( ( () 'instanceof' ) )
+        // InternalCheckCfg.g:1383:5: ( () 'instanceof' )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1383:5: ( () 'instanceof' )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1383:6: () 'instanceof'
+        // InternalCheckCfg.g:1383:5: ( () 'instanceof' )
+        // InternalCheckCfg.g:1383:6: () 'instanceof'
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1383:6: ()
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1384:1: 
+        // InternalCheckCfg.g:1383:6: ()
+        // InternalCheckCfg.g:1384:1: 
         {
         }
 
-        match(input,40,FOLLOW_40_in_synpred5_InternalCheckCfg3177); if (state.failed) return ;
+        match(input,40,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -19782,24 +19782,24 @@ public final void synpred5_InternalCheckCfg_fragment() throws RecognitionExcepti
 
     // $ANTLR start synpred6_InternalCheckCfg
     public final void synpred6_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1414:8: ( ( () ( ( ruleOpCompare ) ) ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1414:9: ( () ( ( ruleOpCompare ) ) )
+        // InternalCheckCfg.g:1414:8: ( ( () ( ( ruleOpCompare ) ) ) )
+        // InternalCheckCfg.g:1414:9: ( () ( ( ruleOpCompare ) ) )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1414:9: ( () ( ( ruleOpCompare ) ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1414:10: () ( ( ruleOpCompare ) )
+        // InternalCheckCfg.g:1414:9: ( () ( ( ruleOpCompare ) ) )
+        // InternalCheckCfg.g:1414:10: () ( ( ruleOpCompare ) )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1414:10: ()
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1415:1: 
+        // InternalCheckCfg.g:1414:10: ()
+        // InternalCheckCfg.g:1415:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1415:2: ( ( ruleOpCompare ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1416:1: ( ruleOpCompare )
+        // InternalCheckCfg.g:1415:2: ( ( ruleOpCompare ) )
+        // InternalCheckCfg.g:1416:1: ( ruleOpCompare )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1416:1: ( ruleOpCompare )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1417:3: ruleOpCompare
+        // InternalCheckCfg.g:1416:1: ( ruleOpCompare )
+        // InternalCheckCfg.g:1417:3: ruleOpCompare
         {
-        pushFollow(FOLLOW_ruleOpCompare_in_synpred6_InternalCheckCfg3248);
+        pushFollow(FOLLOW_2);
         ruleOpCompare();
 
         state._fsp--;
@@ -19820,24 +19820,24 @@ public final void synpred6_InternalCheckCfg_fragment() throws RecognitionExcepti
 
     // $ANTLR start synpred7_InternalCheckCfg
     public final void synpred7_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1542:3: ( ( () ( ( ruleOpOther ) ) ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1542:4: ( () ( ( ruleOpOther ) ) )
+        // InternalCheckCfg.g:1542:3: ( ( () ( ( ruleOpOther ) ) ) )
+        // InternalCheckCfg.g:1542:4: ( () ( ( ruleOpOther ) ) )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1542:4: ( () ( ( ruleOpOther ) ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1542:5: () ( ( ruleOpOther ) )
+        // InternalCheckCfg.g:1542:4: ( () ( ( ruleOpOther ) ) )
+        // InternalCheckCfg.g:1542:5: () ( ( ruleOpOther ) )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1542:5: ()
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1543:1: 
+        // InternalCheckCfg.g:1542:5: ()
+        // InternalCheckCfg.g:1543:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1543:2: ( ( ruleOpOther ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1544:1: ( ruleOpOther )
+        // InternalCheckCfg.g:1543:2: ( ( ruleOpOther ) )
+        // InternalCheckCfg.g:1544:1: ( ruleOpOther )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1544:1: ( ruleOpOther )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1545:3: ruleOpOther
+        // InternalCheckCfg.g:1544:1: ( ruleOpOther )
+        // InternalCheckCfg.g:1545:3: ruleOpOther
         {
-        pushFollow(FOLLOW_ruleOpOther_in_synpred7_InternalCheckCfg3582);
+        pushFollow(FOLLOW_2);
         ruleOpOther();
 
         state._fsp--;
@@ -19858,14 +19858,14 @@ public final void synpred7_InternalCheckCfg_fragment() throws RecognitionExcepti
 
     // $ANTLR start synpred8_InternalCheckCfg
     public final void synpred8_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1654:3: ( ( '>' '>' ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1654:4: ( '>' '>' )
+        // InternalCheckCfg.g:1654:3: ( ( '>' '>' ) )
+        // InternalCheckCfg.g:1654:4: ( '>' '>' )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1654:4: ( '>' '>' )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1655:2: '>' '>'
+        // InternalCheckCfg.g:1654:4: ( '>' '>' )
+        // InternalCheckCfg.g:1655:2: '>' '>'
         {
-        match(input,32,FOLLOW_32_in_synpred8_InternalCheckCfg3851); if (state.failed) return ;
-        match(input,32,FOLLOW_32_in_synpred8_InternalCheckCfg3856); if (state.failed) return ;
+        match(input,32,FOLLOW_32); if (state.failed) return ;
+        match(input,32,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -19876,14 +19876,14 @@ public final void synpred8_InternalCheckCfg_fragment() throws RecognitionExcepti
 
     // $ANTLR start synpred9_InternalCheckCfg
     public final void synpred9_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1684:3: ( ( '<' '<' ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1684:4: ( '<' '<' )
+        // InternalCheckCfg.g:1684:3: ( ( '<' '<' ) )
+        // InternalCheckCfg.g:1684:4: ( '<' '<' )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1684:4: ( '<' '<' )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1685:2: '<' '<'
+        // InternalCheckCfg.g:1684:4: ( '<' '<' )
+        // InternalCheckCfg.g:1685:2: '<' '<'
         {
-        match(input,31,FOLLOW_31_in_synpred9_InternalCheckCfg3938); if (state.failed) return ;
-        match(input,31,FOLLOW_31_in_synpred9_InternalCheckCfg3943); if (state.failed) return ;
+        match(input,31,FOLLOW_22); if (state.failed) return ;
+        match(input,31,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -19894,24 +19894,24 @@ public final void synpred9_InternalCheckCfg_fragment() throws RecognitionExcepti
 
     // $ANTLR start synpred10_InternalCheckCfg
     public final void synpred10_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1758:3: ( ( () ( ( ruleOpAdd ) ) ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1758:4: ( () ( ( ruleOpAdd ) ) )
+        // InternalCheckCfg.g:1758:3: ( ( () ( ( ruleOpAdd ) ) ) )
+        // InternalCheckCfg.g:1758:4: ( () ( ( ruleOpAdd ) ) )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1758:4: ( () ( ( ruleOpAdd ) ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1758:5: () ( ( ruleOpAdd ) )
+        // InternalCheckCfg.g:1758:4: ( () ( ( ruleOpAdd ) ) )
+        // InternalCheckCfg.g:1758:5: () ( ( ruleOpAdd ) )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1758:5: ()
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1759:1: 
+        // InternalCheckCfg.g:1758:5: ()
+        // InternalCheckCfg.g:1759:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1759:2: ( ( ruleOpAdd ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1760:1: ( ruleOpAdd )
+        // InternalCheckCfg.g:1759:2: ( ( ruleOpAdd ) )
+        // InternalCheckCfg.g:1760:1: ( ruleOpAdd )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1760:1: ( ruleOpAdd )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1761:3: ruleOpAdd
+        // InternalCheckCfg.g:1760:1: ( ruleOpAdd )
+        // InternalCheckCfg.g:1761:3: ruleOpAdd
         {
-        pushFollow(FOLLOW_ruleOpAdd_in_synpred10_InternalCheckCfg4165);
+        pushFollow(FOLLOW_2);
         ruleOpAdd();
 
         state._fsp--;
@@ -19932,24 +19932,24 @@ public final void synpred10_InternalCheckCfg_fragment() throws RecognitionExcept
 
     // $ANTLR start synpred11_InternalCheckCfg
     public final void synpred11_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1866:3: ( ( () ( ( ruleOpMulti ) ) ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1866:4: ( () ( ( ruleOpMulti ) ) )
+        // InternalCheckCfg.g:1866:3: ( ( () ( ( ruleOpMulti ) ) ) )
+        // InternalCheckCfg.g:1866:4: ( () ( ( ruleOpMulti ) ) )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1866:4: ( () ( ( ruleOpMulti ) ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1866:5: () ( ( ruleOpMulti ) )
+        // InternalCheckCfg.g:1866:4: ( () ( ( ruleOpMulti ) ) )
+        // InternalCheckCfg.g:1866:5: () ( ( ruleOpMulti ) )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1866:5: ()
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1867:1: 
+        // InternalCheckCfg.g:1866:5: ()
+        // InternalCheckCfg.g:1867:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1867:2: ( ( ruleOpMulti ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1868:1: ( ruleOpMulti )
+        // InternalCheckCfg.g:1867:2: ( ( ruleOpMulti ) )
+        // InternalCheckCfg.g:1868:1: ( ruleOpMulti )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1868:1: ( ruleOpMulti )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:1869:3: ruleOpMulti
+        // InternalCheckCfg.g:1868:1: ( ruleOpMulti )
+        // InternalCheckCfg.g:1869:3: ruleOpMulti
         {
-        pushFollow(FOLLOW_ruleOpMulti_in_synpred11_InternalCheckCfg4445);
+        pushFollow(FOLLOW_2);
         ruleOpMulti();
 
         state._fsp--;
@@ -19970,18 +19970,18 @@ public final void synpred11_InternalCheckCfg_fragment() throws RecognitionExcept
 
     // $ANTLR start synpred12_InternalCheckCfg
     public final void synpred12_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2099:3: ( ( () 'as' ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2099:4: ( () 'as' )
+        // InternalCheckCfg.g:2099:3: ( ( () 'as' ) )
+        // InternalCheckCfg.g:2099:4: ( () 'as' )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2099:4: ( () 'as' )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2099:5: () 'as'
+        // InternalCheckCfg.g:2099:4: ( () 'as' )
+        // InternalCheckCfg.g:2099:5: () 'as'
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2099:5: ()
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2100:1: 
+        // InternalCheckCfg.g:2099:5: ()
+        // InternalCheckCfg.g:2100:1: 
         {
         }
 
-        match(input,54,FOLLOW_54_in_synpred12_InternalCheckCfg5039); if (state.failed) return ;
+        match(input,54,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -19992,24 +19992,24 @@ public final void synpred12_InternalCheckCfg_fragment() throws RecognitionExcept
 
     // $ANTLR start synpred13_InternalCheckCfg
     public final void synpred13_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2159:2: ( ( () ( ( ruleOpPostfix ) ) ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2159:3: ( () ( ( ruleOpPostfix ) ) )
+        // InternalCheckCfg.g:2159:2: ( ( () ( ( ruleOpPostfix ) ) ) )
+        // InternalCheckCfg.g:2159:3: ( () ( ( ruleOpPostfix ) ) )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2159:3: ( () ( ( ruleOpPostfix ) ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2159:4: () ( ( ruleOpPostfix ) )
+        // InternalCheckCfg.g:2159:3: ( () ( ( ruleOpPostfix ) ) )
+        // InternalCheckCfg.g:2159:4: () ( ( ruleOpPostfix ) )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2159:4: ()
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2160:1: 
+        // InternalCheckCfg.g:2159:4: ()
+        // InternalCheckCfg.g:2160:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2160:2: ( ( ruleOpPostfix ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2161:1: ( ruleOpPostfix )
+        // InternalCheckCfg.g:2160:2: ( ( ruleOpPostfix ) )
+        // InternalCheckCfg.g:2161:1: ( ruleOpPostfix )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2161:1: ( ruleOpPostfix )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2162:3: ruleOpPostfix
+        // InternalCheckCfg.g:2161:1: ( ruleOpPostfix )
+        // InternalCheckCfg.g:2162:3: ruleOpPostfix
         {
-        pushFollow(FOLLOW_ruleOpPostfix_in_synpred13_InternalCheckCfg5196);
+        pushFollow(FOLLOW_2);
         ruleOpPostfix();
 
         state._fsp--;
@@ -20030,18 +20030,18 @@ public final void synpred13_InternalCheckCfg_fragment() throws RecognitionExcept
 
     // $ANTLR start synpred14_InternalCheckCfg
     public final void synpred14_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2249:4: ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2249:5: ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
+        // InternalCheckCfg.g:2249:4: ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )
+        // InternalCheckCfg.g:2249:5: ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2249:5: ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2249:6: () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign
+        // InternalCheckCfg.g:2249:5: ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
+        // InternalCheckCfg.g:2249:6: () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2249:6: ()
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2250:1: 
+        // InternalCheckCfg.g:2249:6: ()
+        // InternalCheckCfg.g:2250:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2250:2: ( '.' | ( ( '::' ) ) )
+        // InternalCheckCfg.g:2250:2: ( '.' | ( ( '::' ) ) )
         int alt127=2;
         int LA127_0 = input.LA(1);
 
@@ -20060,22 +20060,22 @@ else if ( (LA127_0==58) ) {
         }
         switch (alt127) {
             case 1 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2250:4: '.'
+                // InternalCheckCfg.g:2250:4: '.'
                 {
-                match(input,57,FOLLOW_57_in_synpred14_InternalCheckCfg5451); if (state.failed) return ;
+                match(input,57,FOLLOW_39); if (state.failed) return ;
 
                 }
                 break;
             case 2 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2252:6: ( ( '::' ) )
+                // InternalCheckCfg.g:2252:6: ( ( '::' ) )
                 {
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2252:6: ( ( '::' ) )
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2253:1: ( '::' )
+                // InternalCheckCfg.g:2252:6: ( ( '::' ) )
+                // InternalCheckCfg.g:2253:1: ( '::' )
                 {
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2253:1: ( '::' )
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2254:2: '::'
+                // InternalCheckCfg.g:2253:1: ( '::' )
+                // InternalCheckCfg.g:2254:2: '::'
                 {
-                match(input,58,FOLLOW_58_in_synpred14_InternalCheckCfg5465); if (state.failed) return ;
+                match(input,58,FOLLOW_39); if (state.failed) return ;
 
                 }
 
@@ -20088,13 +20088,13 @@ else if ( (LA127_0==58) ) {
 
         }
 
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2258:3: ( ( ruleFeatureCallID ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2259:1: ( ruleFeatureCallID )
+        // InternalCheckCfg.g:2258:3: ( ( ruleFeatureCallID ) )
+        // InternalCheckCfg.g:2259:1: ( ruleFeatureCallID )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2259:1: ( ruleFeatureCallID )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2260:3: ruleFeatureCallID
+        // InternalCheckCfg.g:2259:1: ( ruleFeatureCallID )
+        // InternalCheckCfg.g:2260:3: ruleFeatureCallID
         {
-        pushFollow(FOLLOW_ruleFeatureCallID_in_synpred14_InternalCheckCfg5481);
+        pushFollow(FOLLOW_14);
         ruleFeatureCallID();
 
         state._fsp--;
@@ -20105,7 +20105,7 @@ else if ( (LA127_0==58) ) {
 
         }
 
-        pushFollow(FOLLOW_ruleOpSingleAssign_in_synpred14_InternalCheckCfg5487);
+        pushFollow(FOLLOW_2);
         ruleOpSingleAssign();
 
         state._fsp--;
@@ -20120,18 +20120,18 @@ else if ( (LA127_0==58) ) {
 
     // $ANTLR start synpred15_InternalCheckCfg
     public final void synpred15_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2330:8: ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2330:9: ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) )
+        // InternalCheckCfg.g:2330:8: ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )
+        // InternalCheckCfg.g:2330:9: ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2330:9: ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2330:10: () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) )
+        // InternalCheckCfg.g:2330:9: ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) )
+        // InternalCheckCfg.g:2330:10: () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2330:10: ()
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2331:1: 
+        // InternalCheckCfg.g:2330:10: ()
+        // InternalCheckCfg.g:2331:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2331:2: ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) )
+        // InternalCheckCfg.g:2331:2: ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) )
         int alt128=3;
         switch ( input.LA(1) ) {
         case 57:
@@ -20159,22 +20159,22 @@ public final void synpred15_InternalCheckCfg_fragment() throws RecognitionExcept
 
         switch (alt128) {
             case 1 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2331:4: '.'
+                // InternalCheckCfg.g:2331:4: '.'
                 {
-                match(input,57,FOLLOW_57_in_synpred15_InternalCheckCfg5629); if (state.failed) return ;
+                match(input,57,FOLLOW_2); if (state.failed) return ;
 
                 }
                 break;
             case 2 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2333:6: ( ( '?.' ) )
+                // InternalCheckCfg.g:2333:6: ( ( '?.' ) )
                 {
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2333:6: ( ( '?.' ) )
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2334:1: ( '?.' )
+                // InternalCheckCfg.g:2333:6: ( ( '?.' ) )
+                // InternalCheckCfg.g:2334:1: ( '?.' )
                 {
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2334:1: ( '?.' )
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2335:2: '?.'
+                // InternalCheckCfg.g:2334:1: ( '?.' )
+                // InternalCheckCfg.g:2335:2: '?.'
                 {
-                match(input,59,FOLLOW_59_in_synpred15_InternalCheckCfg5643); if (state.failed) return ;
+                match(input,59,FOLLOW_2); if (state.failed) return ;
 
                 }
 
@@ -20185,15 +20185,15 @@ public final void synpred15_InternalCheckCfg_fragment() throws RecognitionExcept
                 }
                 break;
             case 3 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2340:6: ( ( '::' ) )
+                // InternalCheckCfg.g:2340:6: ( ( '::' ) )
                 {
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2340:6: ( ( '::' ) )
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2341:1: ( '::' )
+                // InternalCheckCfg.g:2340:6: ( ( '::' ) )
+                // InternalCheckCfg.g:2341:1: ( '::' )
                 {
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2341:1: ( '::' )
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2342:2: '::'
+                // InternalCheckCfg.g:2341:1: ( '::' )
+                // InternalCheckCfg.g:2342:2: '::'
                 {
-                match(input,58,FOLLOW_58_in_synpred15_InternalCheckCfg5663); if (state.failed) return ;
+                match(input,58,FOLLOW_2); if (state.failed) return ;
 
                 }
 
@@ -20216,13 +20216,13 @@ public final void synpred15_InternalCheckCfg_fragment() throws RecognitionExcept
 
     // $ANTLR start synpred16_InternalCheckCfg
     public final void synpred16_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2451:4: ( ( '(' ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2452:1: ( '(' )
+        // InternalCheckCfg.g:2451:4: ( ( '(' ) )
+        // InternalCheckCfg.g:2452:1: ( '(' )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2452:1: ( '(' )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2453:2: '('
+        // InternalCheckCfg.g:2452:1: ( '(' )
+        // InternalCheckCfg.g:2453:2: '('
         {
-        match(input,19,FOLLOW_19_in_synpred16_InternalCheckCfg5890); if (state.failed) return ;
+        match(input,19,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -20233,18 +20233,18 @@ public final void synpred16_InternalCheckCfg_fragment() throws RecognitionExcept
 
     // $ANTLR start synpred17_InternalCheckCfg
     public final void synpred17_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2472:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2472:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // InternalCheckCfg.g:2472:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
+        // InternalCheckCfg.g:2472:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2472:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2472:6: () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
+        // InternalCheckCfg.g:2472:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // InternalCheckCfg.g:2472:6: () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2472:6: ()
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2473:1: 
+        // InternalCheckCfg.g:2472:6: ()
+        // InternalCheckCfg.g:2473:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2473:2: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
+        // InternalCheckCfg.g:2473:2: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
         int alt130=2;
         int LA130_0 = input.LA(1);
 
@@ -20253,15 +20253,15 @@ public final void synpred17_InternalCheckCfg_fragment() throws RecognitionExcept
         }
         switch (alt130) {
             case 1 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2473:3: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                // InternalCheckCfg.g:2473:3: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
                 {
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2473:3: ( ( ruleJvmFormalParameter ) )
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2474:1: ( ruleJvmFormalParameter )
+                // InternalCheckCfg.g:2473:3: ( ( ruleJvmFormalParameter ) )
+                // InternalCheckCfg.g:2474:1: ( ruleJvmFormalParameter )
                 {
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2474:1: ( ruleJvmFormalParameter )
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2475:1: ruleJvmFormalParameter
+                // InternalCheckCfg.g:2474:1: ( ruleJvmFormalParameter )
+                // InternalCheckCfg.g:2475:1: ruleJvmFormalParameter
                 {
-                pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred17_InternalCheckCfg5942);
+                pushFollow(FOLLOW_51);
                 ruleJvmFormalParameter();
 
                 state._fsp--;
@@ -20272,7 +20272,7 @@ public final void synpred17_InternalCheckCfg_fragment() throws RecognitionExcept
 
                 }
 
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2477:2: ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                // InternalCheckCfg.g:2477:2: ( ',' ( ( ruleJvmFormalParameter ) ) )*
                 loop129:
                 do {
                     int alt129=2;
@@ -20285,16 +20285,16 @@ public final void synpred17_InternalCheckCfg_fragment() throws RecognitionExcept
 
                     switch (alt129) {
                 	case 1 :
-                	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2477:4: ',' ( ( ruleJvmFormalParameter ) )
+                	    // InternalCheckCfg.g:2477:4: ',' ( ( ruleJvmFormalParameter ) )
                 	    {
-                	    match(input,20,FOLLOW_20_in_synpred17_InternalCheckCfg5949); if (state.failed) return ;
-                	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2478:1: ( ( ruleJvmFormalParameter ) )
-                	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2479:1: ( ruleJvmFormalParameter )
+                	    match(input,20,FOLLOW_29); if (state.failed) return ;
+                	    // InternalCheckCfg.g:2478:1: ( ( ruleJvmFormalParameter ) )
+                	    // InternalCheckCfg.g:2479:1: ( ruleJvmFormalParameter )
                 	    {
-                	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2479:1: ( ruleJvmFormalParameter )
-                	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2480:1: ruleJvmFormalParameter
+                	    // InternalCheckCfg.g:2479:1: ( ruleJvmFormalParameter )
+                	    // InternalCheckCfg.g:2480:1: ruleJvmFormalParameter
                 	    {
-                	    pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred17_InternalCheckCfg5956);
+                	    pushFollow(FOLLOW_51);
                 	    ruleJvmFormalParameter();
 
                 	    state._fsp--;
@@ -20320,13 +20320,13 @@ public final void synpred17_InternalCheckCfg_fragment() throws RecognitionExcept
 
         }
 
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2482:6: ( ( '|' ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2483:1: ( '|' )
+        // InternalCheckCfg.g:2482:6: ( ( '|' ) )
+        // InternalCheckCfg.g:2483:1: ( '|' )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2483:1: ( '|' )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2484:2: '|'
+        // InternalCheckCfg.g:2483:1: ( '|' )
+        // InternalCheckCfg.g:2484:2: '|'
         {
-        match(input,60,FOLLOW_60_in_synpred17_InternalCheckCfg5970); if (state.failed) return ;
+        match(input,60,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -20343,18 +20343,18 @@ public final void synpred17_InternalCheckCfg_fragment() throws RecognitionExcept
 
     // $ANTLR start synpred18_InternalCheckCfg
     public final void synpred18_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2551:4: ( ( () '[' ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2551:5: ( () '[' )
+        // InternalCheckCfg.g:2551:4: ( ( () '[' ) )
+        // InternalCheckCfg.g:2551:5: ( () '[' )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2551:5: ( () '[' )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2551:6: () '['
+        // InternalCheckCfg.g:2551:5: ( () '[' )
+        // InternalCheckCfg.g:2551:6: () '['
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2551:6: ()
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2552:1: 
+        // InternalCheckCfg.g:2551:6: ()
+        // InternalCheckCfg.g:2552:1: 
         {
         }
 
-        match(input,24,FOLLOW_24_in_synpred18_InternalCheckCfg6090); if (state.failed) return ;
+        match(input,24,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -20365,19 +20365,19 @@ public final void synpred18_InternalCheckCfg_fragment() throws RecognitionExcept
 
     // $ANTLR start synpred19_InternalCheckCfg
     public final void synpred19_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2622:7: ( ( () 'synchronized' '(' ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2622:8: ( () 'synchronized' '(' )
+        // InternalCheckCfg.g:2622:7: ( ( () 'synchronized' '(' ) )
+        // InternalCheckCfg.g:2622:8: ( () 'synchronized' '(' )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2622:8: ( () 'synchronized' '(' )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2622:9: () 'synchronized' '('
+        // InternalCheckCfg.g:2622:8: ( () 'synchronized' '(' )
+        // InternalCheckCfg.g:2622:9: () 'synchronized' '('
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2622:9: ()
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2623:1: 
+        // InternalCheckCfg.g:2622:9: ()
+        // InternalCheckCfg.g:2623:1: 
         {
         }
 
-        match(input,86,FOLLOW_86_in_synpred19_InternalCheckCfg6279); if (state.failed) return ;
-        match(input,19,FOLLOW_19_in_synpred19_InternalCheckCfg6283); if (state.failed) return ;
+        match(input,86,FOLLOW_56); if (state.failed) return ;
+        match(input,19,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -20388,26 +20388,26 @@ public final void synpred19_InternalCheckCfg_fragment() throws RecognitionExcept
 
     // $ANTLR start synpred20_InternalCheckCfg
     public final void synpred20_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2665:7: ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2665:8: ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' )
+        // InternalCheckCfg.g:2665:7: ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )
+        // InternalCheckCfg.g:2665:8: ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2665:8: ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2665:9: () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':'
+        // InternalCheckCfg.g:2665:8: ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' )
+        // InternalCheckCfg.g:2665:9: () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':'
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2665:9: ()
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2666:1: 
+        // InternalCheckCfg.g:2665:9: ()
+        // InternalCheckCfg.g:2666:1: 
         {
         }
 
-        match(input,17,FOLLOW_17_in_synpred20_InternalCheckCfg6405); if (state.failed) return ;
-        match(input,19,FOLLOW_19_in_synpred20_InternalCheckCfg6409); if (state.failed) return ;
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2668:1: ( ( ruleJvmFormalParameter ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2669:1: ( ruleJvmFormalParameter )
+        match(input,17,FOLLOW_56); if (state.failed) return ;
+        match(input,19,FOLLOW_29); if (state.failed) return ;
+        // InternalCheckCfg.g:2668:1: ( ( ruleJvmFormalParameter ) )
+        // InternalCheckCfg.g:2669:1: ( ruleJvmFormalParameter )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2669:1: ( ruleJvmFormalParameter )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2670:1: ruleJvmFormalParameter
+        // InternalCheckCfg.g:2669:1: ( ruleJvmFormalParameter )
+        // InternalCheckCfg.g:2670:1: ruleJvmFormalParameter
         {
-        pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred20_InternalCheckCfg6416);
+        pushFollow(FOLLOW_59);
         ruleJvmFormalParameter();
 
         state._fsp--;
@@ -20418,7 +20418,7 @@ public final void synpred20_InternalCheckCfg_fragment() throws RecognitionExcept
 
         }
 
-        match(input,65,FOLLOW_65_in_synpred20_InternalCheckCfg6422); if (state.failed) return ;
+        match(input,65,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -20429,18 +20429,18 @@ public final void synpred20_InternalCheckCfg_fragment() throws RecognitionExcept
 
     // $ANTLR start synpred21_InternalCheckCfg
     public final void synpred21_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2783:7: ( ( () '[' ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2783:8: ( () '[' )
+        // InternalCheckCfg.g:2783:7: ( ( () '[' ) )
+        // InternalCheckCfg.g:2783:8: ( () '[' )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2783:8: ( () '[' )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2783:9: () '['
+        // InternalCheckCfg.g:2783:8: ( () '[' )
+        // InternalCheckCfg.g:2783:9: () '['
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2783:9: ()
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:2784:1: 
+        // InternalCheckCfg.g:2783:9: ()
+        // InternalCheckCfg.g:2784:1: 
         {
         }
 
-        match(input,24,FOLLOW_24_in_synpred21_InternalCheckCfg6744); if (state.failed) return ;
+        match(input,24,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -20451,13 +20451,13 @@ public final void synpred21_InternalCheckCfg_fragment() throws RecognitionExcept
 
     // $ANTLR start synpred23_InternalCheckCfg
     public final void synpred23_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3075:4: ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3075:5: ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // InternalCheckCfg.g:3075:4: ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
+        // InternalCheckCfg.g:3075:5: ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3075:5: ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3075:6: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
+        // InternalCheckCfg.g:3075:5: ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // InternalCheckCfg.g:3075:6: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3075:6: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
+        // InternalCheckCfg.g:3075:6: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
         int alt132=2;
         int LA132_0 = input.LA(1);
 
@@ -20466,15 +20466,15 @@ public final void synpred23_InternalCheckCfg_fragment() throws RecognitionExcept
         }
         switch (alt132) {
             case 1 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3075:7: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                // InternalCheckCfg.g:3075:7: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
                 {
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3075:7: ( ( ruleJvmFormalParameter ) )
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3076:1: ( ruleJvmFormalParameter )
+                // InternalCheckCfg.g:3075:7: ( ( ruleJvmFormalParameter ) )
+                // InternalCheckCfg.g:3076:1: ( ruleJvmFormalParameter )
                 {
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3076:1: ( ruleJvmFormalParameter )
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3077:1: ruleJvmFormalParameter
+                // InternalCheckCfg.g:3076:1: ( ruleJvmFormalParameter )
+                // InternalCheckCfg.g:3077:1: ruleJvmFormalParameter
                 {
-                pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred23_InternalCheckCfg7494);
+                pushFollow(FOLLOW_51);
                 ruleJvmFormalParameter();
 
                 state._fsp--;
@@ -20485,7 +20485,7 @@ public final void synpred23_InternalCheckCfg_fragment() throws RecognitionExcept
 
                 }
 
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3079:2: ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                // InternalCheckCfg.g:3079:2: ( ',' ( ( ruleJvmFormalParameter ) ) )*
                 loop131:
                 do {
                     int alt131=2;
@@ -20498,16 +20498,16 @@ public final void synpred23_InternalCheckCfg_fragment() throws RecognitionExcept
 
                     switch (alt131) {
                 	case 1 :
-                	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3079:4: ',' ( ( ruleJvmFormalParameter ) )
+                	    // InternalCheckCfg.g:3079:4: ',' ( ( ruleJvmFormalParameter ) )
                 	    {
-                	    match(input,20,FOLLOW_20_in_synpred23_InternalCheckCfg7501); if (state.failed) return ;
-                	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3080:1: ( ( ruleJvmFormalParameter ) )
-                	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3081:1: ( ruleJvmFormalParameter )
+                	    match(input,20,FOLLOW_29); if (state.failed) return ;
+                	    // InternalCheckCfg.g:3080:1: ( ( ruleJvmFormalParameter ) )
+                	    // InternalCheckCfg.g:3081:1: ( ruleJvmFormalParameter )
                 	    {
-                	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3081:1: ( ruleJvmFormalParameter )
-                	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3082:1: ruleJvmFormalParameter
+                	    // InternalCheckCfg.g:3081:1: ( ruleJvmFormalParameter )
+                	    // InternalCheckCfg.g:3082:1: ruleJvmFormalParameter
                 	    {
-                	    pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred23_InternalCheckCfg7508);
+                	    pushFollow(FOLLOW_51);
                 	    ruleJvmFormalParameter();
 
                 	    state._fsp--;
@@ -20533,13 +20533,13 @@ public final void synpred23_InternalCheckCfg_fragment() throws RecognitionExcept
 
         }
 
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3084:6: ( ( '|' ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3085:1: ( '|' )
+        // InternalCheckCfg.g:3084:6: ( ( '|' ) )
+        // InternalCheckCfg.g:3085:1: ( '|' )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3085:1: ( '|' )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3086:2: '|'
+        // InternalCheckCfg.g:3085:1: ( '|' )
+        // InternalCheckCfg.g:3086:2: '|'
         {
-        match(input,60,FOLLOW_60_in_synpred23_InternalCheckCfg7522); if (state.failed) return ;
+        match(input,60,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -20556,10 +20556,10 @@ public final void synpred23_InternalCheckCfg_fragment() throws RecognitionExcept
 
     // $ANTLR start synpred25_InternalCheckCfg
     public final void synpred25_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3445:4: ( 'else' )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3445:6: 'else'
+        // InternalCheckCfg.g:3445:4: ( 'else' )
+        // InternalCheckCfg.g:3445:6: 'else'
         {
-        match(input,63,FOLLOW_63_in_synpred25_InternalCheckCfg8305); if (state.failed) return ;
+        match(input,63,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -20567,20 +20567,20 @@ public final void synpred25_InternalCheckCfg_fragment() throws RecognitionExcept
 
     // $ANTLR start synpred26_InternalCheckCfg
     public final void synpred26_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3499:4: ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3499:5: ( '(' ( ( ruleJvmFormalParameter ) ) ':' )
+        // InternalCheckCfg.g:3499:4: ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )
+        // InternalCheckCfg.g:3499:5: ( '(' ( ( ruleJvmFormalParameter ) ) ':' )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3499:5: ( '(' ( ( ruleJvmFormalParameter ) ) ':' )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3499:7: '(' ( ( ruleJvmFormalParameter ) ) ':'
+        // InternalCheckCfg.g:3499:5: ( '(' ( ( ruleJvmFormalParameter ) ) ':' )
+        // InternalCheckCfg.g:3499:7: '(' ( ( ruleJvmFormalParameter ) ) ':'
         {
-        match(input,19,FOLLOW_19_in_synpred26_InternalCheckCfg8444); if (state.failed) return ;
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3500:1: ( ( ruleJvmFormalParameter ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3501:1: ( ruleJvmFormalParameter )
+        match(input,19,FOLLOW_29); if (state.failed) return ;
+        // InternalCheckCfg.g:3500:1: ( ( ruleJvmFormalParameter ) )
+        // InternalCheckCfg.g:3501:1: ( ruleJvmFormalParameter )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3501:1: ( ruleJvmFormalParameter )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3502:1: ruleJvmFormalParameter
+        // InternalCheckCfg.g:3501:1: ( ruleJvmFormalParameter )
+        // InternalCheckCfg.g:3502:1: ruleJvmFormalParameter
         {
-        pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred26_InternalCheckCfg8451);
+        pushFollow(FOLLOW_59);
         ruleJvmFormalParameter();
 
         state._fsp--;
@@ -20591,7 +20591,7 @@ public final void synpred26_InternalCheckCfg_fragment() throws RecognitionExcept
 
         }
 
-        match(input,65,FOLLOW_65_in_synpred26_InternalCheckCfg8457); if (state.failed) return ;
+        match(input,65,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -20602,19 +20602,19 @@ public final void synpred26_InternalCheckCfg_fragment() throws RecognitionExcept
 
     // $ANTLR start synpred27_InternalCheckCfg
     public final void synpred27_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3554:8: ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3554:9: ( ( ( ruleJvmFormalParameter ) ) ':' )
+        // InternalCheckCfg.g:3554:8: ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )
+        // InternalCheckCfg.g:3554:9: ( ( ( ruleJvmFormalParameter ) ) ':' )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3554:9: ( ( ( ruleJvmFormalParameter ) ) ':' )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3554:10: ( ( ruleJvmFormalParameter ) ) ':'
+        // InternalCheckCfg.g:3554:9: ( ( ( ruleJvmFormalParameter ) ) ':' )
+        // InternalCheckCfg.g:3554:10: ( ( ruleJvmFormalParameter ) ) ':'
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3554:10: ( ( ruleJvmFormalParameter ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3555:1: ( ruleJvmFormalParameter )
+        // InternalCheckCfg.g:3554:10: ( ( ruleJvmFormalParameter ) )
+        // InternalCheckCfg.g:3555:1: ( ruleJvmFormalParameter )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3555:1: ( ruleJvmFormalParameter )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:3556:1: ruleJvmFormalParameter
+        // InternalCheckCfg.g:3555:1: ( ruleJvmFormalParameter )
+        // InternalCheckCfg.g:3556:1: ruleJvmFormalParameter
         {
-        pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred27_InternalCheckCfg8559);
+        pushFollow(FOLLOW_59);
         ruleJvmFormalParameter();
 
         state._fsp--;
@@ -20625,7 +20625,7 @@ public final void synpred27_InternalCheckCfg_fragment() throws RecognitionExcept
 
         }
 
-        match(input,65,FOLLOW_65_in_synpred27_InternalCheckCfg8565); if (state.failed) return ;
+        match(input,65,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -20636,19 +20636,19 @@ public final void synpred27_InternalCheckCfg_fragment() throws RecognitionExcept
 
     // $ANTLR start synpred29_InternalCheckCfg
     public final void synpred29_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4322:4: ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4322:5: ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) )
+        // InternalCheckCfg.g:4322:4: ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )
+        // InternalCheckCfg.g:4322:5: ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4322:5: ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4322:6: ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) )
+        // InternalCheckCfg.g:4322:5: ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) )
+        // InternalCheckCfg.g:4322:6: ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4322:6: ( ( ruleJvmTypeReference ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4323:1: ( ruleJvmTypeReference )
+        // InternalCheckCfg.g:4322:6: ( ( ruleJvmTypeReference ) )
+        // InternalCheckCfg.g:4323:1: ( ruleJvmTypeReference )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4323:1: ( ruleJvmTypeReference )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4324:1: ruleJvmTypeReference
+        // InternalCheckCfg.g:4323:1: ( ruleJvmTypeReference )
+        // InternalCheckCfg.g:4324:1: ruleJvmTypeReference
         {
-        pushFollow(FOLLOW_ruleJvmTypeReference_in_synpred29_InternalCheckCfg10193);
+        pushFollow(FOLLOW_4);
         ruleJvmTypeReference();
 
         state._fsp--;
@@ -20659,13 +20659,13 @@ public final void synpred29_InternalCheckCfg_fragment() throws RecognitionExcept
 
         }
 
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4326:2: ( ( ruleValidID ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4327:1: ( ruleValidID )
+        // InternalCheckCfg.g:4326:2: ( ( ruleValidID ) )
+        // InternalCheckCfg.g:4327:1: ( ruleValidID )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4327:1: ( ruleValidID )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4328:1: ruleValidID
+        // InternalCheckCfg.g:4327:1: ( ruleValidID )
+        // InternalCheckCfg.g:4328:1: ruleValidID
         {
-        pushFollow(FOLLOW_ruleValidID_in_synpred29_InternalCheckCfg10202);
+        pushFollow(FOLLOW_2);
         ruleValidID();
 
         state._fsp--;
@@ -20686,13 +20686,13 @@ public final void synpred29_InternalCheckCfg_fragment() throws RecognitionExcept
 
     // $ANTLR start synpred30_InternalCheckCfg
     public final void synpred30_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4611:4: ( ( '(' ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4612:1: ( '(' )
+        // InternalCheckCfg.g:4611:4: ( ( '(' ) )
+        // InternalCheckCfg.g:4612:1: ( '(' )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4612:1: ( '(' )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4613:2: '('
+        // InternalCheckCfg.g:4612:1: ( '(' )
+        // InternalCheckCfg.g:4613:2: '('
         {
-        match(input,19,FOLLOW_19_in_synpred30_InternalCheckCfg10740); if (state.failed) return ;
+        match(input,19,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -20703,18 +20703,18 @@ public final void synpred30_InternalCheckCfg_fragment() throws RecognitionExcept
 
     // $ANTLR start synpred31_InternalCheckCfg
     public final void synpred31_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4632:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4632:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // InternalCheckCfg.g:4632:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
+        // InternalCheckCfg.g:4632:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4632:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4632:6: () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
+        // InternalCheckCfg.g:4632:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // InternalCheckCfg.g:4632:6: () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4632:6: ()
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4633:1: 
+        // InternalCheckCfg.g:4632:6: ()
+        // InternalCheckCfg.g:4633:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4633:2: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
+        // InternalCheckCfg.g:4633:2: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
         int alt136=2;
         int LA136_0 = input.LA(1);
 
@@ -20723,15 +20723,15 @@ public final void synpred31_InternalCheckCfg_fragment() throws RecognitionExcept
         }
         switch (alt136) {
             case 1 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4633:3: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                // InternalCheckCfg.g:4633:3: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
                 {
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4633:3: ( ( ruleJvmFormalParameter ) )
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4634:1: ( ruleJvmFormalParameter )
+                // InternalCheckCfg.g:4633:3: ( ( ruleJvmFormalParameter ) )
+                // InternalCheckCfg.g:4634:1: ( ruleJvmFormalParameter )
                 {
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4634:1: ( ruleJvmFormalParameter )
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4635:1: ruleJvmFormalParameter
+                // InternalCheckCfg.g:4634:1: ( ruleJvmFormalParameter )
+                // InternalCheckCfg.g:4635:1: ruleJvmFormalParameter
                 {
-                pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred31_InternalCheckCfg10792);
+                pushFollow(FOLLOW_51);
                 ruleJvmFormalParameter();
 
                 state._fsp--;
@@ -20742,7 +20742,7 @@ public final void synpred31_InternalCheckCfg_fragment() throws RecognitionExcept
 
                 }
 
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4637:2: ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                // InternalCheckCfg.g:4637:2: ( ',' ( ( ruleJvmFormalParameter ) ) )*
                 loop135:
                 do {
                     int alt135=2;
@@ -20755,16 +20755,16 @@ public final void synpred31_InternalCheckCfg_fragment() throws RecognitionExcept
 
                     switch (alt135) {
                 	case 1 :
-                	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4637:4: ',' ( ( ruleJvmFormalParameter ) )
+                	    // InternalCheckCfg.g:4637:4: ',' ( ( ruleJvmFormalParameter ) )
                 	    {
-                	    match(input,20,FOLLOW_20_in_synpred31_InternalCheckCfg10799); if (state.failed) return ;
-                	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4638:1: ( ( ruleJvmFormalParameter ) )
-                	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4639:1: ( ruleJvmFormalParameter )
+                	    match(input,20,FOLLOW_29); if (state.failed) return ;
+                	    // InternalCheckCfg.g:4638:1: ( ( ruleJvmFormalParameter ) )
+                	    // InternalCheckCfg.g:4639:1: ( ruleJvmFormalParameter )
                 	    {
-                	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4639:1: ( ruleJvmFormalParameter )
-                	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4640:1: ruleJvmFormalParameter
+                	    // InternalCheckCfg.g:4639:1: ( ruleJvmFormalParameter )
+                	    // InternalCheckCfg.g:4640:1: ruleJvmFormalParameter
                 	    {
-                	    pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred31_InternalCheckCfg10806);
+                	    pushFollow(FOLLOW_51);
                 	    ruleJvmFormalParameter();
 
                 	    state._fsp--;
@@ -20790,13 +20790,13 @@ public final void synpred31_InternalCheckCfg_fragment() throws RecognitionExcept
 
         }
 
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4642:6: ( ( '|' ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4643:1: ( '|' )
+        // InternalCheckCfg.g:4642:6: ( ( '|' ) )
+        // InternalCheckCfg.g:4643:1: ( '|' )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4643:1: ( '|' )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4644:2: '|'
+        // InternalCheckCfg.g:4643:1: ( '|' )
+        // InternalCheckCfg.g:4644:2: '|'
         {
-        match(input,60,FOLLOW_60_in_synpred31_InternalCheckCfg10820); if (state.failed) return ;
+        match(input,60,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -20813,18 +20813,18 @@ public final void synpred31_InternalCheckCfg_fragment() throws RecognitionExcept
 
     // $ANTLR start synpred32_InternalCheckCfg
     public final void synpred32_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4711:4: ( ( () '[' ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4711:5: ( () '[' )
+        // InternalCheckCfg.g:4711:4: ( ( () '[' ) )
+        // InternalCheckCfg.g:4711:5: ( () '[' )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4711:5: ( () '[' )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4711:6: () '['
+        // InternalCheckCfg.g:4711:5: ( () '[' )
+        // InternalCheckCfg.g:4711:6: () '['
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4711:6: ()
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4712:1: 
+        // InternalCheckCfg.g:4711:6: ()
+        // InternalCheckCfg.g:4712:1: 
         {
         }
 
-        match(input,24,FOLLOW_24_in_synpred32_InternalCheckCfg10940); if (state.failed) return ;
+        match(input,24,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -20835,10 +20835,10 @@ public final void synpred32_InternalCheckCfg_fragment() throws RecognitionExcept
 
     // $ANTLR start synpred33_InternalCheckCfg
     public final void synpred33_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4876:4: ( '<' )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4876:6: '<'
+        // InternalCheckCfg.g:4876:4: ( '<' )
+        // InternalCheckCfg.g:4876:6: '<'
         {
-        match(input,31,FOLLOW_31_in_synpred33_InternalCheckCfg11389); if (state.failed) return ;
+        match(input,31,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -20846,13 +20846,13 @@ public final void synpred33_InternalCheckCfg_fragment() throws RecognitionExcept
 
     // $ANTLR start synpred34_InternalCheckCfg
     public final void synpred34_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4925:5: ( ( '(' ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4926:1: ( '(' )
+        // InternalCheckCfg.g:4925:5: ( ( '(' ) )
+        // InternalCheckCfg.g:4926:1: ( '(' )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4926:1: ( '(' )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4927:2: '('
+        // InternalCheckCfg.g:4926:1: ( '(' )
+        // InternalCheckCfg.g:4927:2: '('
         {
-        match(input,19,FOLLOW_19_in_synpred34_InternalCheckCfg11485); if (state.failed) return ;
+        match(input,19,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -20863,18 +20863,18 @@ public final void synpred34_InternalCheckCfg_fragment() throws RecognitionExcept
 
     // $ANTLR start synpred35_InternalCheckCfg
     public final void synpred35_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4946:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4946:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // InternalCheckCfg.g:4946:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
+        // InternalCheckCfg.g:4946:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4946:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4946:6: () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
+        // InternalCheckCfg.g:4946:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // InternalCheckCfg.g:4946:6: () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4946:6: ()
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4947:1: 
+        // InternalCheckCfg.g:4946:6: ()
+        // InternalCheckCfg.g:4947:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4947:2: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
+        // InternalCheckCfg.g:4947:2: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
         int alt138=2;
         int LA138_0 = input.LA(1);
 
@@ -20883,15 +20883,15 @@ public final void synpred35_InternalCheckCfg_fragment() throws RecognitionExcept
         }
         switch (alt138) {
             case 1 :
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4947:3: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                // InternalCheckCfg.g:4947:3: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
                 {
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4947:3: ( ( ruleJvmFormalParameter ) )
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4948:1: ( ruleJvmFormalParameter )
+                // InternalCheckCfg.g:4947:3: ( ( ruleJvmFormalParameter ) )
+                // InternalCheckCfg.g:4948:1: ( ruleJvmFormalParameter )
                 {
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4948:1: ( ruleJvmFormalParameter )
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4949:1: ruleJvmFormalParameter
+                // InternalCheckCfg.g:4948:1: ( ruleJvmFormalParameter )
+                // InternalCheckCfg.g:4949:1: ruleJvmFormalParameter
                 {
-                pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred35_InternalCheckCfg11537);
+                pushFollow(FOLLOW_51);
                 ruleJvmFormalParameter();
 
                 state._fsp--;
@@ -20902,7 +20902,7 @@ public final void synpred35_InternalCheckCfg_fragment() throws RecognitionExcept
 
                 }
 
-                // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4951:2: ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                // InternalCheckCfg.g:4951:2: ( ',' ( ( ruleJvmFormalParameter ) ) )*
                 loop137:
                 do {
                     int alt137=2;
@@ -20915,16 +20915,16 @@ public final void synpred35_InternalCheckCfg_fragment() throws RecognitionExcept
 
                     switch (alt137) {
                 	case 1 :
-                	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4951:4: ',' ( ( ruleJvmFormalParameter ) )
+                	    // InternalCheckCfg.g:4951:4: ',' ( ( ruleJvmFormalParameter ) )
                 	    {
-                	    match(input,20,FOLLOW_20_in_synpred35_InternalCheckCfg11544); if (state.failed) return ;
-                	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4952:1: ( ( ruleJvmFormalParameter ) )
-                	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4953:1: ( ruleJvmFormalParameter )
+                	    match(input,20,FOLLOW_29); if (state.failed) return ;
+                	    // InternalCheckCfg.g:4952:1: ( ( ruleJvmFormalParameter ) )
+                	    // InternalCheckCfg.g:4953:1: ( ruleJvmFormalParameter )
                 	    {
-                	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4953:1: ( ruleJvmFormalParameter )
-                	    // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4954:1: ruleJvmFormalParameter
+                	    // InternalCheckCfg.g:4953:1: ( ruleJvmFormalParameter )
+                	    // InternalCheckCfg.g:4954:1: ruleJvmFormalParameter
                 	    {
-                	    pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred35_InternalCheckCfg11551);
+                	    pushFollow(FOLLOW_51);
                 	    ruleJvmFormalParameter();
 
                 	    state._fsp--;
@@ -20950,13 +20950,13 @@ public final void synpred35_InternalCheckCfg_fragment() throws RecognitionExcept
 
         }
 
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4956:6: ( ( '|' ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4957:1: ( '|' )
+        // InternalCheckCfg.g:4956:6: ( ( '|' ) )
+        // InternalCheckCfg.g:4957:1: ( '|' )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4957:1: ( '|' )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:4958:2: '|'
+        // InternalCheckCfg.g:4957:1: ( '|' )
+        // InternalCheckCfg.g:4958:2: '|'
         {
-        match(input,60,FOLLOW_60_in_synpred35_InternalCheckCfg11565); if (state.failed) return ;
+        match(input,60,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -20973,18 +20973,18 @@ public final void synpred35_InternalCheckCfg_fragment() throws RecognitionExcept
 
     // $ANTLR start synpred36_InternalCheckCfg
     public final void synpred36_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5025:4: ( ( () '[' ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5025:5: ( () '[' )
+        // InternalCheckCfg.g:5025:4: ( ( () '[' ) )
+        // InternalCheckCfg.g:5025:5: ( () '[' )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5025:5: ( () '[' )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5025:6: () '['
+        // InternalCheckCfg.g:5025:5: ( () '[' )
+        // InternalCheckCfg.g:5025:6: () '['
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5025:6: ()
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5026:1: 
+        // InternalCheckCfg.g:5025:6: ()
+        // InternalCheckCfg.g:5026:1: 
         {
         }
 
-        match(input,24,FOLLOW_24_in_synpred36_InternalCheckCfg11685); if (state.failed) return ;
+        match(input,24,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -20995,8 +20995,8 @@ public final void synpred36_InternalCheckCfg_fragment() throws RecognitionExcept
 
     // $ANTLR start synpred37_InternalCheckCfg
     public final void synpred37_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5365:2: ( 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:
+        // InternalCheckCfg.g:5365:2: ( 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )
+        // InternalCheckCfg.g:
         {
         if ( (input.LA(1)>=RULE_STRING && input.LA(1)<=RULE_ID)||input.LA(1)==15||input.LA(1)==17||input.LA(1)==19||(input.LA(1)>=23 && input.LA(1)<=24)||input.LA(1)==31||(input.LA(1)>=47 && input.LA(1)<=48)||input.LA(1)==53||input.LA(1)==62||input.LA(1)==64||(input.LA(1)>=68 && input.LA(1)<=69)||(input.LA(1)>=72 && input.LA(1)<=84)||input.LA(1)==86 ) {
             input.consume();
@@ -21015,10 +21015,10 @@ public final void synpred37_InternalCheckCfg_fragment() throws RecognitionExcept
 
     // $ANTLR start synpred38_InternalCheckCfg
     public final void synpred38_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5459:5: ( 'catch' )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5459:7: 'catch'
+        // InternalCheckCfg.g:5459:5: ( 'catch' )
+        // InternalCheckCfg.g:5459:7: 'catch'
         {
-        match(input,87,FOLLOW_87_in_synpred38_InternalCheckCfg12858); if (state.failed) return ;
+        match(input,87,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -21026,10 +21026,10 @@ public final void synpred38_InternalCheckCfg_fragment() throws RecognitionExcept
 
     // $ANTLR start synpred39_InternalCheckCfg
     public final void synpred39_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5478:5: ( 'finally' )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5478:7: 'finally'
+        // InternalCheckCfg.g:5478:5: ( 'finally' )
+        // InternalCheckCfg.g:5478:7: 'finally'
         {
-        match(input,85,FOLLOW_85_in_synpred39_InternalCheckCfg12888); if (state.failed) return ;
+        match(input,85,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -21037,10 +21037,10 @@ public final void synpred39_InternalCheckCfg_fragment() throws RecognitionExcept
 
     // $ANTLR start synpred42_InternalCheckCfg
     public final void synpred42_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5704:3: ( '.' )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5705:2: '.'
+        // InternalCheckCfg.g:5704:3: ( '.' )
+        // InternalCheckCfg.g:5705:2: '.'
         {
-        match(input,57,FOLLOW_57_in_synpred42_InternalCheckCfg13413); if (state.failed) return ;
+        match(input,57,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -21048,18 +21048,18 @@ public final void synpred42_InternalCheckCfg_fragment() throws RecognitionExcept
 
     // $ANTLR start synpred43_InternalCheckCfg
     public final void synpred43_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5830:2: ( ( () ruleArrayBrackets ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5830:3: ( () ruleArrayBrackets )
+        // InternalCheckCfg.g:5830:2: ( ( () ruleArrayBrackets ) )
+        // InternalCheckCfg.g:5830:3: ( () ruleArrayBrackets )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5830:3: ( () ruleArrayBrackets )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5830:4: () ruleArrayBrackets
+        // InternalCheckCfg.g:5830:3: ( () ruleArrayBrackets )
+        // InternalCheckCfg.g:5830:4: () ruleArrayBrackets
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5830:4: ()
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:5831:1: 
+        // InternalCheckCfg.g:5830:4: ()
+        // InternalCheckCfg.g:5831:1: 
         {
         }
 
-        pushFollow(FOLLOW_ruleArrayBrackets_in_synpred43_InternalCheckCfg13798);
+        pushFollow(FOLLOW_2);
         ruleArrayBrackets();
 
         state._fsp--;
@@ -21074,10 +21074,10 @@ public final void synpred43_InternalCheckCfg_fragment() throws RecognitionExcept
 
     // $ANTLR start synpred44_InternalCheckCfg
     public final void synpred44_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6015:4: ( '<' )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6015:6: '<'
+        // InternalCheckCfg.g:6015:4: ( '<' )
+        // InternalCheckCfg.g:6015:6: '<'
         {
-        match(input,31,FOLLOW_31_in_synpred44_InternalCheckCfg14250); if (state.failed) return ;
+        match(input,31,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -21085,18 +21085,18 @@ public final void synpred44_InternalCheckCfg_fragment() throws RecognitionExcept
 
     // $ANTLR start synpred45_InternalCheckCfg
     public final void synpred45_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6064:3: ( ( () '.' ) )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6064:4: ( () '.' )
+        // InternalCheckCfg.g:6064:3: ( ( () '.' ) )
+        // InternalCheckCfg.g:6064:4: ( () '.' )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6064:4: ( () '.' )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6064:5: () '.'
+        // InternalCheckCfg.g:6064:4: ( () '.' )
+        // InternalCheckCfg.g:6064:5: () '.'
         {
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6064:5: ()
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6065:1: 
+        // InternalCheckCfg.g:6064:5: ()
+        // InternalCheckCfg.g:6065:1: 
         {
         }
 
-        match(input,57,FOLLOW_57_in_synpred45_InternalCheckCfg14345); if (state.failed) return ;
+        match(input,57,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -21107,10 +21107,10 @@ public final void synpred45_InternalCheckCfg_fragment() throws RecognitionExcept
 
     // $ANTLR start synpred46_InternalCheckCfg
     public final void synpred46_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6091:4: ( '<' )
-        // ../com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/parser/antlr/internal/InternalCheckCfg.g:6091:6: '<'
+        // InternalCheckCfg.g:6091:4: ( '<' )
+        // InternalCheckCfg.g:6091:6: '<'
         {
-        match(input,31,FOLLOW_31_in_synpred46_InternalCheckCfg14402); if (state.failed) return ;
+        match(input,31,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -21715,21 +21715,14 @@ public final boolean synpred16_InternalCheckCfg() {
     protected DFA116 dfa116 = new DFA116(this);
     protected DFA114 dfa114 = new DFA114(this);
     protected DFA123 dfa123 = new DFA123(this);
-    static final String DFA16_eotS =
-        "\12\uffff";
-    static final String DFA16_eofS =
-        "\1\10\11\uffff";
-    static final String DFA16_minS =
-        "\1\4\7\0\2\uffff";
-    static final String DFA16_maxS =
-        "\1\127\7\0\2\uffff";
-    static final String DFA16_acceptS =
-        "\10\uffff\1\2\1\1";
-    static final String DFA16_specialS =
-        "\1\uffff\1\1\1\2\1\3\1\4\1\5\1\6\1\0\2\uffff}>";
-    static final String[] DFA16_transitionS = {
-            "\5\10\6\uffff\3\10\1\uffff\3\10\1\uffff\3\10\1\1\1\2\1\3\1"+
-            "\4\1\5\1\6\1\7\33\10\1\uffff\33\10",
+    static final String dfa_1s = "\12\uffff";
+    static final String dfa_2s = "\1\10\11\uffff";
+    static final String dfa_3s = "\1\4\7\0\2\uffff";
+    static final String dfa_4s = "\1\127\7\0\2\uffff";
+    static final String dfa_5s = "\10\uffff\1\2\1\1";
+    static final String dfa_6s = "\1\uffff\1\1\1\2\1\3\1\4\1\5\1\6\1\0\2\uffff}>";
+    static final String[] dfa_7s = {
+            "\5\10\6\uffff\3\10\1\uffff\3\10\1\uffff\3\10\1\1\1\2\1\3\1\4\1\5\1\6\1\7\33\10\1\uffff\33\10",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -21741,34 +21734,26 @@ public final boolean synpred16_InternalCheckCfg() {
             ""
     };
 
-    static final short[] DFA16_eot = DFA.unpackEncodedString(DFA16_eotS);
-    static final short[] DFA16_eof = DFA.unpackEncodedString(DFA16_eofS);
-    static final char[] DFA16_min = DFA.unpackEncodedStringToUnsignedChars(DFA16_minS);
-    static final char[] DFA16_max = DFA.unpackEncodedStringToUnsignedChars(DFA16_maxS);
-    static final short[] DFA16_accept = DFA.unpackEncodedString(DFA16_acceptS);
-    static final short[] DFA16_special = DFA.unpackEncodedString(DFA16_specialS);
-    static final short[][] DFA16_transition;
-
-    static {
-        int numStates = DFA16_transitionS.length;
-        DFA16_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA16_transition[i] = DFA.unpackEncodedString(DFA16_transitionS[i]);
-        }
-    }
+    static final short[] dfa_1 = DFA.unpackEncodedString(dfa_1s);
+    static final short[] dfa_2 = DFA.unpackEncodedString(dfa_2s);
+    static final char[] dfa_3 = DFA.unpackEncodedStringToUnsignedChars(dfa_3s);
+    static final char[] dfa_4 = DFA.unpackEncodedStringToUnsignedChars(dfa_4s);
+    static final short[] dfa_5 = DFA.unpackEncodedString(dfa_5s);
+    static final short[] dfa_6 = DFA.unpackEncodedString(dfa_6s);
+    static final short[][] dfa_7 = unpackEncodedStringArray(dfa_7s);
 
     class DFA16 extends DFA {
 
         public DFA16(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 16;
-            this.eot = DFA16_eot;
-            this.eof = DFA16_eof;
-            this.min = DFA16_min;
-            this.max = DFA16_max;
-            this.accept = DFA16_accept;
-            this.special = DFA16_special;
-            this.transition = DFA16_transition;
+            this.eot = dfa_1;
+            this.eof = dfa_2;
+            this.min = dfa_3;
+            this.max = dfa_4;
+            this.accept = dfa_5;
+            this.special = dfa_6;
+            this.transition = dfa_7;
         }
         public String getDescription() {
             return "865:1: ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )?";
@@ -21890,21 +21875,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA26_eotS =
-        "\13\uffff";
-    static final String DFA26_eofS =
-        "\1\1\12\uffff";
-    static final String DFA26_minS =
-        "\1\4\1\uffff\10\0\1\uffff";
-    static final String DFA26_maxS =
-        "\1\127\1\uffff\10\0\1\uffff";
-    static final String DFA26_acceptS =
-        "\1\uffff\1\2\10\uffff\1\1";
-    static final String DFA26_specialS =
-        "\2\uffff\1\2\1\3\1\5\1\6\1\7\1\4\1\0\1\1\1\uffff}>";
-    static final String[] DFA26_transitionS = {
-            "\5\1\6\uffff\3\1\1\uffff\3\1\1\uffff\10\1\1\2\1\3\10\1\1\4"+
-            "\1\5\1\6\1\7\1\10\1\11\15\1\1\uffff\33\1",
+    static final String dfa_8s = "\13\uffff";
+    static final String dfa_9s = "\1\1\12\uffff";
+    static final String dfa_10s = "\1\4\1\uffff\10\0\1\uffff";
+    static final String dfa_11s = "\1\127\1\uffff\10\0\1\uffff";
+    static final String dfa_12s = "\1\uffff\1\2\10\uffff\1\1";
+    static final String dfa_13s = "\2\uffff\1\2\1\3\1\5\1\6\1\7\1\4\1\0\1\1\1\uffff}>";
+    static final String[] dfa_14s = {
+            "\5\1\6\uffff\3\1\1\uffff\3\1\1\uffff\10\1\1\2\1\3\10\1\1\4\1\5\1\6\1\7\1\10\1\11\15\1\1\uffff\33\1",
             "",
             "\1\uffff",
             "\1\uffff",
@@ -21917,34 +21895,26 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA26_eot = DFA.unpackEncodedString(DFA26_eotS);
-    static final short[] DFA26_eof = DFA.unpackEncodedString(DFA26_eofS);
-    static final char[] DFA26_min = DFA.unpackEncodedStringToUnsignedChars(DFA26_minS);
-    static final char[] DFA26_max = DFA.unpackEncodedStringToUnsignedChars(DFA26_maxS);
-    static final short[] DFA26_accept = DFA.unpackEncodedString(DFA26_acceptS);
-    static final short[] DFA26_special = DFA.unpackEncodedString(DFA26_specialS);
-    static final short[][] DFA26_transition;
-
-    static {
-        int numStates = DFA26_transitionS.length;
-        DFA26_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA26_transition[i] = DFA.unpackEncodedString(DFA26_transitionS[i]);
-        }
-    }
+    static final short[] dfa_8 = DFA.unpackEncodedString(dfa_8s);
+    static final short[] dfa_9 = DFA.unpackEncodedString(dfa_9s);
+    static final char[] dfa_10 = DFA.unpackEncodedStringToUnsignedChars(dfa_10s);
+    static final char[] dfa_11 = DFA.unpackEncodedStringToUnsignedChars(dfa_11s);
+    static final short[] dfa_12 = DFA.unpackEncodedString(dfa_12s);
+    static final short[] dfa_13 = DFA.unpackEncodedString(dfa_13s);
+    static final short[][] dfa_14 = unpackEncodedStringArray(dfa_14s);
 
     class DFA26 extends DFA {
 
         public DFA26(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 26;
-            this.eot = DFA26_eot;
-            this.eof = DFA26_eof;
-            this.min = DFA26_min;
-            this.max = DFA26_max;
-            this.accept = DFA26_accept;
-            this.special = DFA26_special;
-            this.transition = DFA26_transition;
+            this.eot = dfa_8;
+            this.eof = dfa_9;
+            this.min = dfa_10;
+            this.max = dfa_11;
+            this.accept = dfa_12;
+            this.special = dfa_13;
+            this.transition = dfa_14;
         }
         public String getDescription() {
             return "()* loopback of 1542:1: ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )*";
@@ -22081,19 +22051,11 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA29_eotS =
-        "\13\uffff";
-    static final String DFA29_eofS =
-        "\13\uffff";
-    static final String DFA29_minS =
-        "\1\37\2\uffff\1\40\7\uffff";
-    static final String DFA29_maxS =
-        "\1\56\2\uffff\1\53\7\uffff";
-    static final String DFA29_acceptS =
-        "\1\uffff\1\1\1\2\1\uffff\1\4\1\5\1\7\1\10\1\11\1\3\1\6";
-    static final String DFA29_specialS =
-        "\13\uffff}>";
-    static final String[] DFA29_transitionS = {
+    static final String dfa_15s = "\1\37\2\uffff\1\40\7\uffff";
+    static final String dfa_16s = "\1\56\2\uffff\1\53\7\uffff";
+    static final String dfa_17s = "\1\uffff\1\1\1\2\1\uffff\1\4\1\5\1\7\1\10\1\11\1\3\1\6";
+    static final String dfa_18s = "\13\uffff}>";
+    static final String[] dfa_19s = {
             "\1\6\1\3\10\uffff\1\1\1\2\1\4\1\5\1\7\1\10",
             "",
             "",
@@ -22106,53 +22068,36 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             "",
             ""
     };
-
-    static final short[] DFA29_eot = DFA.unpackEncodedString(DFA29_eotS);
-    static final short[] DFA29_eof = DFA.unpackEncodedString(DFA29_eofS);
-    static final char[] DFA29_min = DFA.unpackEncodedStringToUnsignedChars(DFA29_minS);
-    static final char[] DFA29_max = DFA.unpackEncodedStringToUnsignedChars(DFA29_maxS);
-    static final short[] DFA29_accept = DFA.unpackEncodedString(DFA29_acceptS);
-    static final short[] DFA29_special = DFA.unpackEncodedString(DFA29_specialS);
-    static final short[][] DFA29_transition;
-
-    static {
-        int numStates = DFA29_transitionS.length;
-        DFA29_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA29_transition[i] = DFA.unpackEncodedString(DFA29_transitionS[i]);
-        }
-    }
+    static final char[] dfa_15 = DFA.unpackEncodedStringToUnsignedChars(dfa_15s);
+    static final char[] dfa_16 = DFA.unpackEncodedStringToUnsignedChars(dfa_16s);
+    static final short[] dfa_17 = DFA.unpackEncodedString(dfa_17s);
+    static final short[] dfa_18 = DFA.unpackEncodedString(dfa_18s);
+    static final short[][] dfa_19 = unpackEncodedStringArray(dfa_19s);
 
     class DFA29 extends DFA {
 
         public DFA29(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 29;
-            this.eot = DFA29_eot;
-            this.eof = DFA29_eof;
-            this.min = DFA29_min;
-            this.max = DFA29_max;
-            this.accept = DFA29_accept;
-            this.special = DFA29_special;
-            this.transition = DFA29_transition;
+            this.eot = dfa_8;
+            this.eof = dfa_8;
+            this.min = dfa_15;
+            this.max = dfa_16;
+            this.accept = dfa_17;
+            this.special = dfa_18;
+            this.transition = dfa_19;
         }
         public String getDescription() {
             return "1607:1: (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' )";
         }
     }
-    static final String DFA45_eotS =
-        "\116\uffff";
-    static final String DFA45_eofS =
-        "\1\2\115\uffff";
-    static final String DFA45_minS =
-        "\1\4\1\0\114\uffff";
-    static final String DFA45_maxS =
-        "\1\127\1\0\114\uffff";
-    static final String DFA45_acceptS =
-        "\2\uffff\1\2\112\uffff\1\1";
-    static final String DFA45_specialS =
-        "\1\uffff\1\0\114\uffff}>";
-    static final String[] DFA45_transitionS = {
+    static final String dfa_20s = "\116\uffff";
+    static final String dfa_21s = "\1\2\115\uffff";
+    static final String dfa_22s = "\1\4\1\0\114\uffff";
+    static final String dfa_23s = "\1\127\1\0\114\uffff";
+    static final String dfa_24s = "\2\uffff\1\2\112\uffff\1\1";
+    static final String dfa_25s = "\1\uffff\1\0\114\uffff}>";
+    static final String[] dfa_26s = {
             "\5\2\6\uffff\3\2\1\uffff\1\1\2\2\1\uffff\45\2\1\uffff\33\2",
             "\1\uffff",
             "",
@@ -22233,34 +22178,26 @@ public String getDescription() {
             ""
     };
 
-    static final short[] DFA45_eot = DFA.unpackEncodedString(DFA45_eotS);
-    static final short[] DFA45_eof = DFA.unpackEncodedString(DFA45_eofS);
-    static final char[] DFA45_min = DFA.unpackEncodedStringToUnsignedChars(DFA45_minS);
-    static final char[] DFA45_max = DFA.unpackEncodedStringToUnsignedChars(DFA45_maxS);
-    static final short[] DFA45_accept = DFA.unpackEncodedString(DFA45_acceptS);
-    static final short[] DFA45_special = DFA.unpackEncodedString(DFA45_specialS);
-    static final short[][] DFA45_transition;
-
-    static {
-        int numStates = DFA45_transitionS.length;
-        DFA45_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA45_transition[i] = DFA.unpackEncodedString(DFA45_transitionS[i]);
-        }
-    }
+    static final short[] dfa_20 = DFA.unpackEncodedString(dfa_20s);
+    static final short[] dfa_21 = DFA.unpackEncodedString(dfa_21s);
+    static final char[] dfa_22 = DFA.unpackEncodedStringToUnsignedChars(dfa_22s);
+    static final char[] dfa_23 = DFA.unpackEncodedStringToUnsignedChars(dfa_23s);
+    static final short[] dfa_24 = DFA.unpackEncodedString(dfa_24s);
+    static final short[] dfa_25 = DFA.unpackEncodedString(dfa_25s);
+    static final short[][] dfa_26 = unpackEncodedStringArray(dfa_26s);
 
     class DFA45 extends DFA {
 
         public DFA45(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 45;
-            this.eot = DFA45_eot;
-            this.eof = DFA45_eof;
-            this.min = DFA45_min;
-            this.max = DFA45_max;
-            this.accept = DFA45_accept;
-            this.special = DFA45_special;
-            this.transition = DFA45_transition;
+            this.eot = dfa_20;
+            this.eof = dfa_21;
+            this.min = dfa_22;
+            this.max = dfa_23;
+            this.accept = dfa_24;
+            this.special = dfa_25;
+            this.transition = dfa_26;
         }
         public String getDescription() {
             return "2451:2: ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )?";
@@ -22292,23 +22229,13 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA44_eotS =
-        "\44\uffff";
-    static final String DFA44_eofS =
-        "\44\uffff";
-    static final String DFA44_minS =
-        "\1\4\2\0\41\uffff";
-    static final String DFA44_maxS =
-        "\1\126\2\0\41\uffff";
-    static final String DFA44_acceptS =
-        "\3\uffff\2\1\1\2\35\uffff\1\3";
-    static final String DFA44_specialS =
-        "\1\0\1\1\1\2\41\uffff}>";
-    static final String[] DFA44_transitionS = {
-            "\4\5\1\1\6\uffff\1\5\1\uffff\1\5\1\uffff\1\2\1\uffff\1\43\1"+
-            "\uffff\2\5\6\uffff\1\5\14\uffff\1\3\2\uffff\2\5\4\uffff\1\5"+
-            "\6\uffff\1\4\1\uffff\1\5\1\uffff\1\5\3\uffff\2\5\2\uffff\15"+
-            "\5\1\uffff\1\5",
+    static final String dfa_27s = "\44\uffff";
+    static final String dfa_28s = "\1\4\2\0\41\uffff";
+    static final String dfa_29s = "\1\126\2\0\41\uffff";
+    static final String dfa_30s = "\3\uffff\2\1\1\2\35\uffff\1\3";
+    static final String dfa_31s = "\1\0\1\1\1\2\41\uffff}>";
+    static final String[] dfa_32s = {
+            "\4\5\1\1\6\uffff\1\5\1\uffff\1\5\1\uffff\1\2\1\uffff\1\43\1\uffff\2\5\6\uffff\1\5\14\uffff\1\3\2\uffff\2\5\4\uffff\1\5\6\uffff\1\4\1\uffff\1\5\1\uffff\1\5\3\uffff\2\5\2\uffff\15\5\1\uffff\1\5",
             "\1\uffff",
             "\1\uffff",
             "",
@@ -22346,34 +22273,25 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA44_eot = DFA.unpackEncodedString(DFA44_eotS);
-    static final short[] DFA44_eof = DFA.unpackEncodedString(DFA44_eofS);
-    static final char[] DFA44_min = DFA.unpackEncodedStringToUnsignedChars(DFA44_minS);
-    static final char[] DFA44_max = DFA.unpackEncodedStringToUnsignedChars(DFA44_maxS);
-    static final short[] DFA44_accept = DFA.unpackEncodedString(DFA44_acceptS);
-    static final short[] DFA44_special = DFA.unpackEncodedString(DFA44_specialS);
-    static final short[][] DFA44_transition;
-
-    static {
-        int numStates = DFA44_transitionS.length;
-        DFA44_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA44_transition[i] = DFA.unpackEncodedString(DFA44_transitionS[i]);
-        }
-    }
+    static final short[] dfa_27 = DFA.unpackEncodedString(dfa_27s);
+    static final char[] dfa_28 = DFA.unpackEncodedStringToUnsignedChars(dfa_28s);
+    static final char[] dfa_29 = DFA.unpackEncodedStringToUnsignedChars(dfa_29s);
+    static final short[] dfa_30 = DFA.unpackEncodedString(dfa_30s);
+    static final short[] dfa_31 = DFA.unpackEncodedString(dfa_31s);
+    static final short[][] dfa_32 = unpackEncodedStringArray(dfa_32s);
 
     class DFA44 extends DFA {
 
         public DFA44(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 44;
-            this.eot = DFA44_eot;
-            this.eof = DFA44_eof;
-            this.min = DFA44_min;
-            this.max = DFA44_max;
-            this.accept = DFA44_accept;
-            this.special = DFA44_special;
-            this.transition = DFA44_transition;
+            this.eot = dfa_27;
+            this.eof = dfa_27;
+            this.min = dfa_28;
+            this.max = dfa_29;
+            this.accept = dfa_30;
+            this.special = dfa_31;
+            this.transition = dfa_32;
         }
         public String getDescription() {
             return "2472:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )?";
@@ -22443,21 +22361,8 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA46_eotS =
-        "\116\uffff";
-    static final String DFA46_eofS =
-        "\1\2\115\uffff";
-    static final String DFA46_minS =
-        "\1\4\1\0\114\uffff";
-    static final String DFA46_maxS =
-        "\1\127\1\0\114\uffff";
-    static final String DFA46_acceptS =
-        "\2\uffff\1\2\112\uffff\1\1";
-    static final String DFA46_specialS =
-        "\1\uffff\1\0\114\uffff}>";
-    static final String[] DFA46_transitionS = {
-            "\5\2\6\uffff\3\2\1\uffff\3\2\1\uffff\1\2\1\1\43\2\1\uffff\33"+
-            "\2",
+    static final String[] dfa_33s = {
+            "\5\2\6\uffff\3\2\1\uffff\3\2\1\uffff\1\2\1\1\43\2\1\uffff\33\2",
             "\1\uffff",
             "",
             "",
@@ -22536,35 +22441,20 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             "",
             ""
     };
-
-    static final short[] DFA46_eot = DFA.unpackEncodedString(DFA46_eotS);
-    static final short[] DFA46_eof = DFA.unpackEncodedString(DFA46_eofS);
-    static final char[] DFA46_min = DFA.unpackEncodedStringToUnsignedChars(DFA46_minS);
-    static final char[] DFA46_max = DFA.unpackEncodedStringToUnsignedChars(DFA46_maxS);
-    static final short[] DFA46_accept = DFA.unpackEncodedString(DFA46_acceptS);
-    static final short[] DFA46_special = DFA.unpackEncodedString(DFA46_specialS);
-    static final short[][] DFA46_transition;
-
-    static {
-        int numStates = DFA46_transitionS.length;
-        DFA46_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA46_transition[i] = DFA.unpackEncodedString(DFA46_transitionS[i]);
-        }
-    }
+    static final short[][] dfa_33 = unpackEncodedStringArray(dfa_33s);
 
     class DFA46 extends DFA {
 
         public DFA46(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 46;
-            this.eot = DFA46_eot;
-            this.eof = DFA46_eof;
-            this.min = DFA46_min;
-            this.max = DFA46_max;
-            this.accept = DFA46_accept;
-            this.special = DFA46_special;
-            this.transition = DFA46_transition;
+            this.eot = dfa_20;
+            this.eof = dfa_21;
+            this.min = dfa_22;
+            this.max = dfa_23;
+            this.accept = dfa_24;
+            this.special = dfa_25;
+            this.transition = dfa_33;
         }
         public String getDescription() {
             return "2551:3: ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )?";
@@ -22596,23 +22486,13 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA48_eotS =
-        "\40\uffff";
-    static final String DFA48_eofS =
-        "\40\uffff";
-    static final String DFA48_minS =
-        "\1\4\26\uffff\1\0\10\uffff";
-    static final String DFA48_maxS =
-        "\1\126\26\uffff\1\0\10\uffff";
-    static final String DFA48_acceptS =
-        "\1\uffff\1\1\1\2\1\3\1\4\1\5\6\uffff\1\6\11\uffff\1\7\1\uffff\1"+
-        "\12\1\13\1\14\1\15\1\16\1\17\1\10\1\11";
-    static final String DFA48_specialS =
-        "\1\0\26\uffff\1\1\10\uffff}>";
-    static final String[] DFA48_transitionS = {
-            "\4\14\1\5\6\uffff\1\2\1\uffff\1\27\1\uffff\1\35\3\uffff\2\14"+
-            "\6\uffff\1\5\36\uffff\1\26\1\uffff\1\3\3\uffff\1\30\1\31\2\uffff"+
-            "\5\5\1\1\4\14\1\32\1\33\1\34\1\uffff\1\4",
+    static final String dfa_34s = "\40\uffff";
+    static final String dfa_35s = "\1\4\26\uffff\1\0\10\uffff";
+    static final String dfa_36s = "\1\126\26\uffff\1\0\10\uffff";
+    static final String dfa_37s = "\1\uffff\1\1\1\2\1\3\1\4\1\5\6\uffff\1\6\11\uffff\1\7\1\uffff\1\12\1\13\1\14\1\15\1\16\1\17\1\10\1\11";
+    static final String dfa_38s = "\1\0\26\uffff\1\1\10\uffff}>";
+    static final String[] dfa_39s = {
+            "\4\14\1\5\6\uffff\1\2\1\uffff\1\27\1\uffff\1\35\3\uffff\2\14\6\uffff\1\5\36\uffff\1\26\1\uffff\1\3\3\uffff\1\30\1\31\2\uffff\5\5\1\1\4\14\1\32\1\33\1\34\1\uffff\1\4",
             "",
             "",
             "",
@@ -22646,34 +22526,25 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA48_eot = DFA.unpackEncodedString(DFA48_eotS);
-    static final short[] DFA48_eof = DFA.unpackEncodedString(DFA48_eofS);
-    static final char[] DFA48_min = DFA.unpackEncodedStringToUnsignedChars(DFA48_minS);
-    static final char[] DFA48_max = DFA.unpackEncodedStringToUnsignedChars(DFA48_maxS);
-    static final short[] DFA48_accept = DFA.unpackEncodedString(DFA48_acceptS);
-    static final short[] DFA48_special = DFA.unpackEncodedString(DFA48_specialS);
-    static final short[][] DFA48_transition;
-
-    static {
-        int numStates = DFA48_transitionS.length;
-        DFA48_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA48_transition[i] = DFA.unpackEncodedString(DFA48_transitionS[i]);
-        }
-    }
+    static final short[] dfa_34 = DFA.unpackEncodedString(dfa_34s);
+    static final char[] dfa_35 = DFA.unpackEncodedStringToUnsignedChars(dfa_35s);
+    static final char[] dfa_36 = DFA.unpackEncodedStringToUnsignedChars(dfa_36s);
+    static final short[] dfa_37 = DFA.unpackEncodedString(dfa_37s);
+    static final short[] dfa_38 = DFA.unpackEncodedString(dfa_38s);
+    static final short[][] dfa_39 = unpackEncodedStringArray(dfa_39s);
 
     class DFA48 extends DFA {
 
         public DFA48(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 48;
-            this.eot = DFA48_eot;
-            this.eof = DFA48_eof;
-            this.min = DFA48_min;
-            this.max = DFA48_max;
-            this.accept = DFA48_accept;
-            this.special = DFA48_special;
-            this.transition = DFA48_transition;
+            this.eot = dfa_34;
+            this.eof = dfa_34;
+            this.min = dfa_35;
+            this.max = dfa_36;
+            this.accept = dfa_37;
+            this.special = dfa_38;
+            this.transition = dfa_39;
         }
         public String getDescription() {
             return "2592:1: (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression )";
@@ -22744,22 +22615,13 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA57_eotS =
-        "\46\uffff";
-    static final String DFA57_eofS =
-        "\46\uffff";
-    static final String DFA57_minS =
-        "\1\4\2\0\43\uffff";
-    static final String DFA57_maxS =
-        "\1\126\2\0\43\uffff";
-    static final String DFA57_acceptS =
-        "\3\uffff\2\1\1\2\40\uffff";
-    static final String DFA57_specialS =
-        "\1\0\1\1\1\2\43\uffff}>";
-    static final String[] DFA57_transitionS = {
-            "\4\5\1\1\6\uffff\1\5\1\uffff\1\5\1\uffff\1\2\3\uffff\3\5\5"+
-            "\uffff\1\5\14\uffff\1\3\2\uffff\2\5\4\uffff\1\5\6\uffff\1\4"+
-            "\1\uffff\1\5\1\uffff\1\5\3\uffff\21\5\1\uffff\1\5",
+    static final String dfa_40s = "\46\uffff";
+    static final String dfa_41s = "\1\4\2\0\43\uffff";
+    static final String dfa_42s = "\1\126\2\0\43\uffff";
+    static final String dfa_43s = "\3\uffff\2\1\1\2\40\uffff";
+    static final String dfa_44s = "\1\0\1\1\1\2\43\uffff}>";
+    static final String[] dfa_45s = {
+            "\4\5\1\1\6\uffff\1\5\1\uffff\1\5\1\uffff\1\2\3\uffff\3\5\5\uffff\1\5\14\uffff\1\3\2\uffff\2\5\4\uffff\1\5\6\uffff\1\4\1\uffff\1\5\1\uffff\1\5\3\uffff\21\5\1\uffff\1\5",
             "\1\uffff",
             "\1\uffff",
             "",
@@ -22799,34 +22661,25 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA57_eot = DFA.unpackEncodedString(DFA57_eotS);
-    static final short[] DFA57_eof = DFA.unpackEncodedString(DFA57_eofS);
-    static final char[] DFA57_min = DFA.unpackEncodedStringToUnsignedChars(DFA57_minS);
-    static final char[] DFA57_max = DFA.unpackEncodedStringToUnsignedChars(DFA57_maxS);
-    static final short[] DFA57_accept = DFA.unpackEncodedString(DFA57_acceptS);
-    static final short[] DFA57_special = DFA.unpackEncodedString(DFA57_specialS);
-    static final short[][] DFA57_transition;
-
-    static {
-        int numStates = DFA57_transitionS.length;
-        DFA57_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA57_transition[i] = DFA.unpackEncodedString(DFA57_transitionS[i]);
-        }
-    }
+    static final short[] dfa_40 = DFA.unpackEncodedString(dfa_40s);
+    static final char[] dfa_41 = DFA.unpackEncodedStringToUnsignedChars(dfa_41s);
+    static final char[] dfa_42 = DFA.unpackEncodedStringToUnsignedChars(dfa_42s);
+    static final short[] dfa_43 = DFA.unpackEncodedString(dfa_43s);
+    static final short[] dfa_44 = DFA.unpackEncodedString(dfa_44s);
+    static final short[][] dfa_45 = unpackEncodedStringArray(dfa_45s);
 
     class DFA57 extends DFA {
 
         public DFA57(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 57;
-            this.eot = DFA57_eot;
-            this.eof = DFA57_eof;
-            this.min = DFA57_min;
-            this.max = DFA57_max;
-            this.accept = DFA57_accept;
-            this.special = DFA57_special;
-            this.transition = DFA57_transition;
+            this.eot = dfa_40;
+            this.eof = dfa_40;
+            this.min = dfa_41;
+            this.max = dfa_42;
+            this.accept = dfa_43;
+            this.special = dfa_44;
+            this.transition = dfa_45;
         }
         public String getDescription() {
             return "3075:3: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )?";
@@ -22894,22 +22747,13 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA64_eotS =
-        "\43\uffff";
-    static final String DFA64_eofS =
-        "\43\uffff";
-    static final String DFA64_minS =
-        "\1\4\1\0\41\uffff";
-    static final String DFA64_maxS =
-        "\1\126\1\0\41\uffff";
-    static final String DFA64_acceptS =
-        "\2\uffff\1\2\37\uffff\1\1";
-    static final String DFA64_specialS =
-        "\1\uffff\1\0\41\uffff}>";
-    static final String[] DFA64_transitionS = {
-            "\5\2\6\uffff\1\2\1\uffff\1\2\1\uffff\1\1\3\uffff\2\2\6\uffff"+
-            "\1\2\14\uffff\1\2\2\uffff\2\2\4\uffff\1\2\10\uffff\1\2\1\uffff"+
-            "\1\2\3\uffff\2\2\2\uffff\15\2\1\uffff\1\2",
+    static final String dfa_46s = "\43\uffff";
+    static final String dfa_47s = "\1\4\1\0\41\uffff";
+    static final String dfa_48s = "\1\126\1\0\41\uffff";
+    static final String dfa_49s = "\2\uffff\1\2\37\uffff\1\1";
+    static final String dfa_50s = "\1\uffff\1\0\41\uffff}>";
+    static final String[] dfa_51s = {
+            "\5\2\6\uffff\1\2\1\uffff\1\2\1\uffff\1\1\3\uffff\2\2\6\uffff\1\2\14\uffff\1\2\2\uffff\2\2\4\uffff\1\2\10\uffff\1\2\1\uffff\1\2\3\uffff\2\2\2\uffff\15\2\1\uffff\1\2",
             "\1\uffff",
             "",
             "",
@@ -22946,34 +22790,25 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA64_eot = DFA.unpackEncodedString(DFA64_eotS);
-    static final short[] DFA64_eof = DFA.unpackEncodedString(DFA64_eofS);
-    static final char[] DFA64_min = DFA.unpackEncodedStringToUnsignedChars(DFA64_minS);
-    static final char[] DFA64_max = DFA.unpackEncodedStringToUnsignedChars(DFA64_maxS);
-    static final short[] DFA64_accept = DFA.unpackEncodedString(DFA64_acceptS);
-    static final short[] DFA64_special = DFA.unpackEncodedString(DFA64_specialS);
-    static final short[][] DFA64_transition;
-
-    static {
-        int numStates = DFA64_transitionS.length;
-        DFA64_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA64_transition[i] = DFA.unpackEncodedString(DFA64_transitionS[i]);
-        }
-    }
+    static final short[] dfa_46 = DFA.unpackEncodedString(dfa_46s);
+    static final char[] dfa_47 = DFA.unpackEncodedStringToUnsignedChars(dfa_47s);
+    static final char[] dfa_48 = DFA.unpackEncodedStringToUnsignedChars(dfa_48s);
+    static final short[] dfa_49 = DFA.unpackEncodedString(dfa_49s);
+    static final short[] dfa_50 = DFA.unpackEncodedString(dfa_50s);
+    static final short[][] dfa_51 = unpackEncodedStringArray(dfa_51s);
 
     class DFA64 extends DFA {
 
         public DFA64(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 64;
-            this.eot = DFA64_eot;
-            this.eof = DFA64_eof;
-            this.min = DFA64_min;
-            this.max = DFA64_max;
-            this.accept = DFA64_accept;
-            this.special = DFA64_special;
-            this.transition = DFA64_transition;
+            this.eot = dfa_46;
+            this.eof = dfa_46;
+            this.min = dfa_47;
+            this.max = dfa_48;
+            this.accept = dfa_49;
+            this.special = dfa_50;
+            this.transition = dfa_51;
         }
         public String getDescription() {
             return "3499:1: ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) )";
@@ -23005,22 +22840,13 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA63_eotS =
-        "\42\uffff";
-    static final String DFA63_eofS =
-        "\42\uffff";
-    static final String DFA63_minS =
-        "\1\4\2\0\37\uffff";
-    static final String DFA63_maxS =
-        "\1\126\2\0\37\uffff";
-    static final String DFA63_acceptS =
-        "\3\uffff\1\1\1\2\35\uffff";
-    static final String DFA63_specialS =
-        "\1\0\1\1\1\2\37\uffff}>";
-    static final String[] DFA63_transitionS = {
-            "\4\4\1\1\6\uffff\1\4\1\uffff\1\4\1\uffff\1\2\3\uffff\2\4\6"+
-            "\uffff\1\4\14\uffff\1\3\2\uffff\2\4\4\uffff\1\4\10\uffff\1\4"+
-            "\1\uffff\1\4\3\uffff\2\4\2\uffff\15\4\1\uffff\1\4",
+    static final String dfa_52s = "\42\uffff";
+    static final String dfa_53s = "\1\4\2\0\37\uffff";
+    static final String dfa_54s = "\1\126\2\0\37\uffff";
+    static final String dfa_55s = "\3\uffff\1\1\1\2\35\uffff";
+    static final String dfa_56s = "\1\0\1\1\1\2\37\uffff}>";
+    static final String[] dfa_57s = {
+            "\4\4\1\1\6\uffff\1\4\1\uffff\1\4\1\uffff\1\2\3\uffff\2\4\6\uffff\1\4\14\uffff\1\3\2\uffff\2\4\4\uffff\1\4\10\uffff\1\4\1\uffff\1\4\3\uffff\2\4\2\uffff\15\4\1\uffff\1\4",
             "\1\uffff",
             "\1\uffff",
             "",
@@ -23056,34 +22882,25 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA63_eot = DFA.unpackEncodedString(DFA63_eotS);
-    static final short[] DFA63_eof = DFA.unpackEncodedString(DFA63_eofS);
-    static final char[] DFA63_min = DFA.unpackEncodedStringToUnsignedChars(DFA63_minS);
-    static final char[] DFA63_max = DFA.unpackEncodedStringToUnsignedChars(DFA63_maxS);
-    static final short[] DFA63_accept = DFA.unpackEncodedString(DFA63_acceptS);
-    static final short[] DFA63_special = DFA.unpackEncodedString(DFA63_specialS);
-    static final short[][] DFA63_transition;
-
-    static {
-        int numStates = DFA63_transitionS.length;
-        DFA63_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA63_transition[i] = DFA.unpackEncodedString(DFA63_transitionS[i]);
-        }
-    }
+    static final short[] dfa_52 = DFA.unpackEncodedString(dfa_52s);
+    static final char[] dfa_53 = DFA.unpackEncodedStringToUnsignedChars(dfa_53s);
+    static final char[] dfa_54 = DFA.unpackEncodedStringToUnsignedChars(dfa_54s);
+    static final short[] dfa_55 = DFA.unpackEncodedString(dfa_55s);
+    static final short[] dfa_56 = DFA.unpackEncodedString(dfa_56s);
+    static final short[][] dfa_57 = unpackEncodedStringArray(dfa_57s);
 
     class DFA63 extends DFA {
 
         public DFA63(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 63;
-            this.eot = DFA63_eot;
-            this.eof = DFA63_eof;
-            this.min = DFA63_min;
-            this.max = DFA63_max;
-            this.accept = DFA63_accept;
-            this.special = DFA63_special;
-            this.transition = DFA63_transition;
+            this.eot = dfa_52;
+            this.eof = dfa_52;
+            this.min = dfa_53;
+            this.max = dfa_54;
+            this.accept = dfa_55;
+            this.special = dfa_56;
+            this.transition = dfa_57;
         }
         public String getDescription() {
             return "3554:7: ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )?";
@@ -23149,127 +22966,19 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA86_eotS =
-        "\116\uffff";
-    static final String DFA86_eofS =
-        "\1\2\115\uffff";
-    static final String DFA86_minS =
-        "\1\4\1\0\114\uffff";
-    static final String DFA86_maxS =
-        "\1\127\1\0\114\uffff";
-    static final String DFA86_acceptS =
-        "\2\uffff\1\2\112\uffff\1\1";
-    static final String DFA86_specialS =
-        "\1\uffff\1\0\114\uffff}>";
-    static final String[] DFA86_transitionS = {
-            "\5\2\6\uffff\3\2\1\uffff\1\1\2\2\1\uffff\45\2\1\uffff\33\2",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA86_eot = DFA.unpackEncodedString(DFA86_eotS);
-    static final short[] DFA86_eof = DFA.unpackEncodedString(DFA86_eofS);
-    static final char[] DFA86_min = DFA.unpackEncodedStringToUnsignedChars(DFA86_minS);
-    static final char[] DFA86_max = DFA.unpackEncodedStringToUnsignedChars(DFA86_maxS);
-    static final short[] DFA86_accept = DFA.unpackEncodedString(DFA86_acceptS);
-    static final short[] DFA86_special = DFA.unpackEncodedString(DFA86_specialS);
-    static final short[][] DFA86_transition;
-
-    static {
-        int numStates = DFA86_transitionS.length;
-        DFA86_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA86_transition[i] = DFA.unpackEncodedString(DFA86_transitionS[i]);
-        }
-    }
 
     class DFA86 extends DFA {
 
         public DFA86(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 86;
-            this.eot = DFA86_eot;
-            this.eof = DFA86_eof;
-            this.min = DFA86_min;
-            this.max = DFA86_max;
-            this.accept = DFA86_accept;
-            this.special = DFA86_special;
-            this.transition = DFA86_transition;
+            this.eot = dfa_20;
+            this.eof = dfa_21;
+            this.min = dfa_22;
+            this.max = dfa_23;
+            this.accept = dfa_24;
+            this.special = dfa_25;
+            this.transition = dfa_26;
         }
         public String getDescription() {
             return "4611:2: ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )?";
@@ -23301,88 +23010,19 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA85_eotS =
-        "\44\uffff";
-    static final String DFA85_eofS =
-        "\44\uffff";
-    static final String DFA85_minS =
-        "\1\4\2\0\41\uffff";
-    static final String DFA85_maxS =
-        "\1\126\2\0\41\uffff";
-    static final String DFA85_acceptS =
-        "\3\uffff\2\1\1\2\35\uffff\1\3";
-    static final String DFA85_specialS =
-        "\1\0\1\1\1\2\41\uffff}>";
-    static final String[] DFA85_transitionS = {
-            "\4\5\1\1\6\uffff\1\5\1\uffff\1\5\1\uffff\1\2\1\uffff\1\43\1"+
-            "\uffff\2\5\6\uffff\1\5\14\uffff\1\3\2\uffff\2\5\4\uffff\1\5"+
-            "\6\uffff\1\4\1\uffff\1\5\1\uffff\1\5\3\uffff\2\5\2\uffff\15"+
-            "\5\1\uffff\1\5",
-            "\1\uffff",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA85_eot = DFA.unpackEncodedString(DFA85_eotS);
-    static final short[] DFA85_eof = DFA.unpackEncodedString(DFA85_eofS);
-    static final char[] DFA85_min = DFA.unpackEncodedStringToUnsignedChars(DFA85_minS);
-    static final char[] DFA85_max = DFA.unpackEncodedStringToUnsignedChars(DFA85_maxS);
-    static final short[] DFA85_accept = DFA.unpackEncodedString(DFA85_acceptS);
-    static final short[] DFA85_special = DFA.unpackEncodedString(DFA85_specialS);
-    static final short[][] DFA85_transition;
-
-    static {
-        int numStates = DFA85_transitionS.length;
-        DFA85_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA85_transition[i] = DFA.unpackEncodedString(DFA85_transitionS[i]);
-        }
-    }
 
     class DFA85 extends DFA {
 
         public DFA85(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 85;
-            this.eot = DFA85_eot;
-            this.eof = DFA85_eof;
-            this.min = DFA85_min;
-            this.max = DFA85_max;
-            this.accept = DFA85_accept;
-            this.special = DFA85_special;
-            this.transition = DFA85_transition;
+            this.eot = dfa_27;
+            this.eof = dfa_27;
+            this.min = dfa_28;
+            this.max = dfa_29;
+            this.accept = dfa_30;
+            this.special = dfa_31;
+            this.transition = dfa_32;
         }
         public String getDescription() {
             return "4632:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )?";
@@ -23452,128 +23092,19 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA87_eotS =
-        "\116\uffff";
-    static final String DFA87_eofS =
-        "\1\2\115\uffff";
-    static final String DFA87_minS =
-        "\1\4\1\0\114\uffff";
-    static final String DFA87_maxS =
-        "\1\127\1\0\114\uffff";
-    static final String DFA87_acceptS =
-        "\2\uffff\1\2\112\uffff\1\1";
-    static final String DFA87_specialS =
-        "\1\uffff\1\0\114\uffff}>";
-    static final String[] DFA87_transitionS = {
-            "\5\2\6\uffff\3\2\1\uffff\3\2\1\uffff\1\2\1\1\43\2\1\uffff\33"+
-            "\2",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA87_eot = DFA.unpackEncodedString(DFA87_eotS);
-    static final short[] DFA87_eof = DFA.unpackEncodedString(DFA87_eofS);
-    static final char[] DFA87_min = DFA.unpackEncodedStringToUnsignedChars(DFA87_minS);
-    static final char[] DFA87_max = DFA.unpackEncodedStringToUnsignedChars(DFA87_maxS);
-    static final short[] DFA87_accept = DFA.unpackEncodedString(DFA87_acceptS);
-    static final short[] DFA87_special = DFA.unpackEncodedString(DFA87_specialS);
-    static final short[][] DFA87_transition;
-
-    static {
-        int numStates = DFA87_transitionS.length;
-        DFA87_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA87_transition[i] = DFA.unpackEncodedString(DFA87_transitionS[i]);
-        }
-    }
 
     class DFA87 extends DFA {
 
         public DFA87(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 87;
-            this.eot = DFA87_eot;
-            this.eof = DFA87_eof;
-            this.min = DFA87_min;
-            this.max = DFA87_max;
-            this.accept = DFA87_accept;
-            this.special = DFA87_special;
-            this.transition = DFA87_transition;
+            this.eot = dfa_20;
+            this.eof = dfa_21;
+            this.min = dfa_22;
+            this.max = dfa_23;
+            this.accept = dfa_24;
+            this.special = dfa_25;
+            this.transition = dfa_33;
         }
         public String getDescription() {
             return "4711:3: ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )?";
@@ -23605,21 +23136,8 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA91_eotS =
-        "\116\uffff";
-    static final String DFA91_eofS =
-        "\1\2\115\uffff";
-    static final String DFA91_minS =
-        "\1\4\1\0\114\uffff";
-    static final String DFA91_maxS =
-        "\1\127\1\0\114\uffff";
-    static final String DFA91_acceptS =
-        "\2\uffff\1\2\112\uffff\1\1";
-    static final String DFA91_specialS =
-        "\1\uffff\1\0\114\uffff}>";
-    static final String[] DFA91_transitionS = {
-            "\5\2\6\uffff\3\2\1\uffff\3\2\1\uffff\10\2\1\1\34\2\1\uffff"+
-            "\33\2",
+    static final String[] dfa_58s = {
+            "\5\2\6\uffff\3\2\1\uffff\3\2\1\uffff\10\2\1\1\34\2\1\uffff\33\2",
             "\1\uffff",
             "",
             "",
@@ -23698,35 +23216,20 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             "",
             ""
     };
-
-    static final short[] DFA91_eot = DFA.unpackEncodedString(DFA91_eotS);
-    static final short[] DFA91_eof = DFA.unpackEncodedString(DFA91_eofS);
-    static final char[] DFA91_min = DFA.unpackEncodedStringToUnsignedChars(DFA91_minS);
-    static final char[] DFA91_max = DFA.unpackEncodedStringToUnsignedChars(DFA91_maxS);
-    static final short[] DFA91_accept = DFA.unpackEncodedString(DFA91_acceptS);
-    static final short[] DFA91_special = DFA.unpackEncodedString(DFA91_specialS);
-    static final short[][] DFA91_transition;
-
-    static {
-        int numStates = DFA91_transitionS.length;
-        DFA91_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA91_transition[i] = DFA.unpackEncodedString(DFA91_transitionS[i]);
-        }
-    }
+    static final short[][] dfa_58 = unpackEncodedStringArray(dfa_58s);
 
     class DFA91 extends DFA {
 
         public DFA91(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 91;
-            this.eot = DFA91_eot;
-            this.eof = DFA91_eof;
-            this.min = DFA91_min;
-            this.max = DFA91_max;
-            this.accept = DFA91_accept;
-            this.special = DFA91_special;
-            this.transition = DFA91_transition;
+            this.eot = dfa_20;
+            this.eof = dfa_21;
+            this.min = dfa_22;
+            this.max = dfa_23;
+            this.accept = dfa_24;
+            this.special = dfa_25;
+            this.transition = dfa_58;
         }
         public String getDescription() {
             return "4876:2: ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )?";
@@ -23758,127 +23261,19 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA94_eotS =
-        "\116\uffff";
-    static final String DFA94_eofS =
-        "\1\2\115\uffff";
-    static final String DFA94_minS =
-        "\1\4\1\0\114\uffff";
-    static final String DFA94_maxS =
-        "\1\127\1\0\114\uffff";
-    static final String DFA94_acceptS =
-        "\2\uffff\1\2\112\uffff\1\1";
-    static final String DFA94_specialS =
-        "\1\uffff\1\0\114\uffff}>";
-    static final String[] DFA94_transitionS = {
-            "\5\2\6\uffff\3\2\1\uffff\1\1\2\2\1\uffff\45\2\1\uffff\33\2",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA94_eot = DFA.unpackEncodedString(DFA94_eotS);
-    static final short[] DFA94_eof = DFA.unpackEncodedString(DFA94_eofS);
-    static final char[] DFA94_min = DFA.unpackEncodedStringToUnsignedChars(DFA94_minS);
-    static final char[] DFA94_max = DFA.unpackEncodedStringToUnsignedChars(DFA94_maxS);
-    static final short[] DFA94_accept = DFA.unpackEncodedString(DFA94_acceptS);
-    static final short[] DFA94_special = DFA.unpackEncodedString(DFA94_specialS);
-    static final short[][] DFA94_transition;
-
-    static {
-        int numStates = DFA94_transitionS.length;
-        DFA94_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA94_transition[i] = DFA.unpackEncodedString(DFA94_transitionS[i]);
-        }
-    }
 
     class DFA94 extends DFA {
 
         public DFA94(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 94;
-            this.eot = DFA94_eot;
-            this.eof = DFA94_eof;
-            this.min = DFA94_min;
-            this.max = DFA94_max;
-            this.accept = DFA94_accept;
-            this.special = DFA94_special;
-            this.transition = DFA94_transition;
+            this.eot = dfa_20;
+            this.eof = dfa_21;
+            this.min = dfa_22;
+            this.max = dfa_23;
+            this.accept = dfa_24;
+            this.special = dfa_25;
+            this.transition = dfa_26;
         }
         public String getDescription() {
             return "4925:3: ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )?";
@@ -23910,88 +23305,19 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA93_eotS =
-        "\44\uffff";
-    static final String DFA93_eofS =
-        "\44\uffff";
-    static final String DFA93_minS =
-        "\1\4\2\0\41\uffff";
-    static final String DFA93_maxS =
-        "\1\126\2\0\41\uffff";
-    static final String DFA93_acceptS =
-        "\3\uffff\2\1\1\2\35\uffff\1\3";
-    static final String DFA93_specialS =
-        "\1\0\1\1\1\2\41\uffff}>";
-    static final String[] DFA93_transitionS = {
-            "\4\5\1\1\6\uffff\1\5\1\uffff\1\5\1\uffff\1\2\1\uffff\1\43\1"+
-            "\uffff\2\5\6\uffff\1\5\14\uffff\1\3\2\uffff\2\5\4\uffff\1\5"+
-            "\6\uffff\1\4\1\uffff\1\5\1\uffff\1\5\3\uffff\2\5\2\uffff\15"+
-            "\5\1\uffff\1\5",
-            "\1\uffff",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA93_eot = DFA.unpackEncodedString(DFA93_eotS);
-    static final short[] DFA93_eof = DFA.unpackEncodedString(DFA93_eofS);
-    static final char[] DFA93_min = DFA.unpackEncodedStringToUnsignedChars(DFA93_minS);
-    static final char[] DFA93_max = DFA.unpackEncodedStringToUnsignedChars(DFA93_maxS);
-    static final short[] DFA93_accept = DFA.unpackEncodedString(DFA93_acceptS);
-    static final short[] DFA93_special = DFA.unpackEncodedString(DFA93_specialS);
-    static final short[][] DFA93_transition;
-
-    static {
-        int numStates = DFA93_transitionS.length;
-        DFA93_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA93_transition[i] = DFA.unpackEncodedString(DFA93_transitionS[i]);
-        }
-    }
 
     class DFA93 extends DFA {
 
         public DFA93(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 93;
-            this.eot = DFA93_eot;
-            this.eof = DFA93_eof;
-            this.min = DFA93_min;
-            this.max = DFA93_max;
-            this.accept = DFA93_accept;
-            this.special = DFA93_special;
-            this.transition = DFA93_transition;
+            this.eot = dfa_27;
+            this.eof = dfa_27;
+            this.min = dfa_28;
+            this.max = dfa_29;
+            this.accept = dfa_30;
+            this.special = dfa_31;
+            this.transition = dfa_32;
         }
         public String getDescription() {
             return "4946:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )?";
@@ -24061,128 +23387,19 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA95_eotS =
-        "\116\uffff";
-    static final String DFA95_eofS =
-        "\1\2\115\uffff";
-    static final String DFA95_minS =
-        "\1\4\1\0\114\uffff";
-    static final String DFA95_maxS =
-        "\1\127\1\0\114\uffff";
-    static final String DFA95_acceptS =
-        "\2\uffff\1\2\112\uffff\1\1";
-    static final String DFA95_specialS =
-        "\1\uffff\1\0\114\uffff}>";
-    static final String[] DFA95_transitionS = {
-            "\5\2\6\uffff\3\2\1\uffff\3\2\1\uffff\1\2\1\1\43\2\1\uffff\33"+
-            "\2",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA95_eot = DFA.unpackEncodedString(DFA95_eotS);
-    static final short[] DFA95_eof = DFA.unpackEncodedString(DFA95_eofS);
-    static final char[] DFA95_min = DFA.unpackEncodedStringToUnsignedChars(DFA95_minS);
-    static final char[] DFA95_max = DFA.unpackEncodedStringToUnsignedChars(DFA95_maxS);
-    static final short[] DFA95_accept = DFA.unpackEncodedString(DFA95_acceptS);
-    static final short[] DFA95_special = DFA.unpackEncodedString(DFA95_specialS);
-    static final short[][] DFA95_transition;
-
-    static {
-        int numStates = DFA95_transitionS.length;
-        DFA95_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA95_transition[i] = DFA.unpackEncodedString(DFA95_transitionS[i]);
-        }
-    }
 
     class DFA95 extends DFA {
 
         public DFA95(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 95;
-            this.eot = DFA95_eot;
-            this.eof = DFA95_eof;
-            this.min = DFA95_min;
-            this.max = DFA95_max;
-            this.accept = DFA95_accept;
-            this.special = DFA95_special;
-            this.transition = DFA95_transition;
+            this.eot = dfa_20;
+            this.eof = dfa_21;
+            this.min = dfa_22;
+            this.max = dfa_23;
+            this.accept = dfa_24;
+            this.special = dfa_25;
+            this.transition = dfa_33;
         }
         public String getDescription() {
             return "5025:3: ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )?";
@@ -24214,26 +23431,13 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA98_eotS =
-        "\116\uffff";
-    static final String DFA98_eofS =
-        "\1\41\115\uffff";
-    static final String DFA98_minS =
-        "\1\4\40\0\55\uffff";
-    static final String DFA98_maxS =
-        "\1\127\40\0\55\uffff";
-    static final String DFA98_acceptS =
-        "\41\uffff\1\2\53\uffff\1\1";
-    static final String DFA98_specialS =
-        "\1\uffff\1\0\1\1\1\2\1\3\1\4\1\5\1\6\1\7\1\10\1\11\1\12\1\13\1"+
-        "\14\1\15\1\16\1\17\1\20\1\21\1\22\1\23\1\24\1\25\1\26\1\27\1\30"+
-        "\1\31\1\32\1\33\1\34\1\35\1\36\1\37\55\uffff}>";
-    static final String[] DFA98_transitionS = {
-            "\1\27\1\23\1\24\1\25\1\1\6\uffff\1\12\1\41\1\32\1\uffff\1\40"+
-            "\2\41\1\uffff\1\17\1\20\6\41\1\15\17\41\1\10\1\7\4\41\1\6\6"+
-            "\41\1\uffff\1\41\1\31\1\41\1\13\3\41\1\33\1\34\2\41\1\2\1\3"+
-            "\1\4\1\5\1\16\1\11\1\21\1\22\1\26\1\30\1\35\1\36\1\37\1\41\1"+
-            "\14\1\41",
+    static final String dfa_59s = "\1\41\115\uffff";
+    static final String dfa_60s = "\1\4\40\0\55\uffff";
+    static final String dfa_61s = "\1\127\40\0\55\uffff";
+    static final String dfa_62s = "\41\uffff\1\2\53\uffff\1\1";
+    static final String dfa_63s = "\1\uffff\1\0\1\1\1\2\1\3\1\4\1\5\1\6\1\7\1\10\1\11\1\12\1\13\1\14\1\15\1\16\1\17\1\20\1\21\1\22\1\23\1\24\1\25\1\26\1\27\1\30\1\31\1\32\1\33\1\34\1\35\1\36\1\37\55\uffff}>";
+    static final String[] dfa_64s = {
+            "\1\27\1\23\1\24\1\25\1\1\6\uffff\1\12\1\41\1\32\1\uffff\1\40\2\41\1\uffff\1\17\1\20\6\41\1\15\17\41\1\10\1\7\4\41\1\6\6\41\1\uffff\1\41\1\31\1\41\1\13\3\41\1\33\1\34\2\41\1\2\1\3\1\4\1\5\1\16\1\11\1\21\1\22\1\26\1\30\1\35\1\36\1\37\1\41\1\14\1\41",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -24312,35 +23516,25 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             "",
             ""
     };
-
-    static final short[] DFA98_eot = DFA.unpackEncodedString(DFA98_eotS);
-    static final short[] DFA98_eof = DFA.unpackEncodedString(DFA98_eofS);
-    static final char[] DFA98_min = DFA.unpackEncodedStringToUnsignedChars(DFA98_minS);
-    static final char[] DFA98_max = DFA.unpackEncodedStringToUnsignedChars(DFA98_maxS);
-    static final short[] DFA98_accept = DFA.unpackEncodedString(DFA98_acceptS);
-    static final short[] DFA98_special = DFA.unpackEncodedString(DFA98_specialS);
-    static final short[][] DFA98_transition;
-
-    static {
-        int numStates = DFA98_transitionS.length;
-        DFA98_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA98_transition[i] = DFA.unpackEncodedString(DFA98_transitionS[i]);
-        }
-    }
+    static final short[] dfa_59 = DFA.unpackEncodedString(dfa_59s);
+    static final char[] dfa_60 = DFA.unpackEncodedStringToUnsignedChars(dfa_60s);
+    static final char[] dfa_61 = DFA.unpackEncodedStringToUnsignedChars(dfa_61s);
+    static final short[] dfa_62 = DFA.unpackEncodedString(dfa_62s);
+    static final short[] dfa_63 = DFA.unpackEncodedString(dfa_63s);
+    static final short[][] dfa_64 = unpackEncodedStringArray(dfa_64s);
 
     class DFA98 extends DFA {
 
         public DFA98(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 98;
-            this.eot = DFA98_eot;
-            this.eof = DFA98_eof;
-            this.min = DFA98_min;
-            this.max = DFA98_max;
-            this.accept = DFA98_accept;
-            this.special = DFA98_special;
-            this.transition = DFA98_transition;
+            this.eot = dfa_20;
+            this.eof = dfa_59;
+            this.min = dfa_60;
+            this.max = dfa_61;
+            this.accept = dfa_62;
+            this.special = dfa_63;
+            this.transition = dfa_64;
         }
         public String getDescription() {
             return "5365:1: ( ( 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )?";
@@ -24837,21 +24031,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA116_eotS =
-        "\117\uffff";
-    static final String DFA116_eofS =
-        "\1\2\116\uffff";
-    static final String DFA116_minS =
-        "\1\4\1\0\115\uffff";
-    static final String DFA116_maxS =
-        "\1\131\1\0\115\uffff";
-    static final String DFA116_acceptS =
-        "\2\uffff\1\2\113\uffff\1\1";
-    static final String DFA116_specialS =
-        "\1\uffff\1\0\115\uffff}>";
-    static final String[] DFA116_transitionS = {
-            "\5\2\6\uffff\3\2\1\uffff\3\2\1\uffff\10\2\1\1\34\2\1\uffff"+
-            "\33\2\1\uffff\1\2",
+    static final String dfa_65s = "\117\uffff";
+    static final String dfa_66s = "\1\2\116\uffff";
+    static final String dfa_67s = "\1\4\1\0\115\uffff";
+    static final String dfa_68s = "\1\131\1\0\115\uffff";
+    static final String dfa_69s = "\2\uffff\1\2\113\uffff\1\1";
+    static final String dfa_70s = "\1\uffff\1\0\115\uffff}>";
+    static final String[] dfa_71s = {
+            "\5\2\6\uffff\3\2\1\uffff\3\2\1\uffff\10\2\1\1\34\2\1\uffff\33\2\1\uffff\1\2",
             "\1\uffff",
             "",
             "",
@@ -24932,34 +24119,26 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA116_eot = DFA.unpackEncodedString(DFA116_eotS);
-    static final short[] DFA116_eof = DFA.unpackEncodedString(DFA116_eofS);
-    static final char[] DFA116_min = DFA.unpackEncodedStringToUnsignedChars(DFA116_minS);
-    static final char[] DFA116_max = DFA.unpackEncodedStringToUnsignedChars(DFA116_maxS);
-    static final short[] DFA116_accept = DFA.unpackEncodedString(DFA116_acceptS);
-    static final short[] DFA116_special = DFA.unpackEncodedString(DFA116_specialS);
-    static final short[][] DFA116_transition;
-
-    static {
-        int numStates = DFA116_transitionS.length;
-        DFA116_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA116_transition[i] = DFA.unpackEncodedString(DFA116_transitionS[i]);
-        }
-    }
+    static final short[] dfa_65 = DFA.unpackEncodedString(dfa_65s);
+    static final short[] dfa_66 = DFA.unpackEncodedString(dfa_66s);
+    static final char[] dfa_67 = DFA.unpackEncodedStringToUnsignedChars(dfa_67s);
+    static final char[] dfa_68 = DFA.unpackEncodedStringToUnsignedChars(dfa_68s);
+    static final short[] dfa_69 = DFA.unpackEncodedString(dfa_69s);
+    static final short[] dfa_70 = DFA.unpackEncodedString(dfa_70s);
+    static final short[][] dfa_71 = unpackEncodedStringArray(dfa_71s);
 
     class DFA116 extends DFA {
 
         public DFA116(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 116;
-            this.eot = DFA116_eot;
-            this.eof = DFA116_eof;
-            this.min = DFA116_min;
-            this.max = DFA116_max;
-            this.accept = DFA116_accept;
-            this.special = DFA116_special;
-            this.transition = DFA116_transition;
+            this.eot = dfa_65;
+            this.eof = dfa_66;
+            this.min = dfa_67;
+            this.max = dfa_68;
+            this.accept = dfa_69;
+            this.special = dfa_70;
+            this.transition = dfa_71;
         }
         public String getDescription() {
             return "6015:2: ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )?";
@@ -24991,129 +24170,19 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA114_eotS =
-        "\117\uffff";
-    static final String DFA114_eofS =
-        "\1\2\116\uffff";
-    static final String DFA114_minS =
-        "\1\4\1\0\115\uffff";
-    static final String DFA114_maxS =
-        "\1\131\1\0\115\uffff";
-    static final String DFA114_acceptS =
-        "\2\uffff\1\2\113\uffff\1\1";
-    static final String DFA114_specialS =
-        "\1\uffff\1\0\115\uffff}>";
-    static final String[] DFA114_transitionS = {
-            "\5\2\6\uffff\3\2\1\uffff\3\2\1\uffff\10\2\1\1\34\2\1\uffff"+
-            "\33\2\1\uffff\1\2",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA114_eot = DFA.unpackEncodedString(DFA114_eotS);
-    static final short[] DFA114_eof = DFA.unpackEncodedString(DFA114_eofS);
-    static final char[] DFA114_min = DFA.unpackEncodedStringToUnsignedChars(DFA114_minS);
-    static final char[] DFA114_max = DFA.unpackEncodedStringToUnsignedChars(DFA114_maxS);
-    static final short[] DFA114_accept = DFA.unpackEncodedString(DFA114_acceptS);
-    static final short[] DFA114_special = DFA.unpackEncodedString(DFA114_specialS);
-    static final short[][] DFA114_transition;
-
-    static {
-        int numStates = DFA114_transitionS.length;
-        DFA114_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA114_transition[i] = DFA.unpackEncodedString(DFA114_transitionS[i]);
-        }
-    }
 
     class DFA114 extends DFA {
 
         public DFA114(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 114;
-            this.eot = DFA114_eot;
-            this.eof = DFA114_eof;
-            this.min = DFA114_min;
-            this.max = DFA114_max;
-            this.accept = DFA114_accept;
-            this.special = DFA114_special;
-            this.transition = DFA114_transition;
+            this.eot = dfa_65;
+            this.eof = dfa_66;
+            this.min = dfa_67;
+            this.max = dfa_68;
+            this.accept = dfa_69;
+            this.special = dfa_70;
+            this.transition = dfa_71;
         }
         public String getDescription() {
             return "6091:2: ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )?";
@@ -25145,19 +24214,13 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA123_eotS =
-        "\7\uffff";
-    static final String DFA123_eofS =
-        "\2\uffff\1\4\2\uffff\1\4\1\uffff";
-    static final String DFA123_minS =
-        "\1\10\1\uffff\1\71\1\10\1\uffff\1\71\1\uffff";
-    static final String DFA123_maxS =
-        "\1\111\1\uffff\1\75\1\61\1\uffff\1\75\1\uffff";
-    static final String DFA123_acceptS =
-        "\1\uffff\1\1\2\uffff\1\2\1\uffff\1\3";
-    static final String DFA123_specialS =
-        "\7\uffff}>";
-    static final String[] DFA123_transitionS = {
+    static final String dfa_72s = "\7\uffff";
+    static final String dfa_73s = "\2\uffff\1\4\2\uffff\1\4\1\uffff";
+    static final String dfa_74s = "\1\10\1\uffff\1\71\1\10\1\uffff\1\71\1\uffff";
+    static final String dfa_75s = "\1\111\1\uffff\1\75\1\61\1\uffff\1\75\1\uffff";
+    static final String dfa_76s = "\1\uffff\1\1\2\uffff\1\2\1\uffff\1\3";
+    static final String dfa_77s = "\7\uffff}>";
+    static final String[] dfa_78s = {
             "\1\2\100\uffff\1\1",
             "",
             "\1\3\3\uffff\1\4",
@@ -25167,34 +24230,26 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA123_eot = DFA.unpackEncodedString(DFA123_eotS);
-    static final short[] DFA123_eof = DFA.unpackEncodedString(DFA123_eofS);
-    static final char[] DFA123_min = DFA.unpackEncodedStringToUnsignedChars(DFA123_minS);
-    static final char[] DFA123_max = DFA.unpackEncodedStringToUnsignedChars(DFA123_maxS);
-    static final short[] DFA123_accept = DFA.unpackEncodedString(DFA123_acceptS);
-    static final short[] DFA123_special = DFA.unpackEncodedString(DFA123_specialS);
-    static final short[][] DFA123_transition;
-
-    static {
-        int numStates = DFA123_transitionS.length;
-        DFA123_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA123_transition[i] = DFA.unpackEncodedString(DFA123_transitionS[i]);
-        }
-    }
+    static final short[] dfa_72 = DFA.unpackEncodedString(dfa_72s);
+    static final short[] dfa_73 = DFA.unpackEncodedString(dfa_73s);
+    static final char[] dfa_74 = DFA.unpackEncodedStringToUnsignedChars(dfa_74s);
+    static final char[] dfa_75 = DFA.unpackEncodedStringToUnsignedChars(dfa_75s);
+    static final short[] dfa_76 = DFA.unpackEncodedString(dfa_76s);
+    static final short[] dfa_77 = DFA.unpackEncodedString(dfa_77s);
+    static final short[][] dfa_78 = unpackEncodedStringArray(dfa_78s);
 
     class DFA123 extends DFA {
 
         public DFA123(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 123;
-            this.eot = DFA123_eot;
-            this.eof = DFA123_eof;
-            this.min = DFA123_min;
-            this.max = DFA123_max;
-            this.accept = DFA123_accept;
-            this.special = DFA123_special;
-            this.transition = DFA123_transition;
+            this.eot = dfa_72;
+            this.eof = dfa_73;
+            this.min = dfa_74;
+            this.max = dfa_75;
+            this.accept = dfa_76;
+            this.special = dfa_77;
+            this.transition = dfa_78;
         }
         public String getDescription() {
             return "6557:1: ( ( ( (lv_static_1_0= 'static' ) ) ( (lv_extension_2_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_4_0= '*' ) ) | ( (lv_memberName_5_0= ruleValidID ) ) ) ) | ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard ) ) )";
@@ -25202,659 +24257,100 @@ public String getDescription() {
     }
  
 
-    public static final BitSet FOLLOW_ruleCheckConfiguration_in_entryRuleCheckConfiguration75 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleCheckConfiguration85 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_13_in_ruleCheckConfiguration122 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_14_in_ruleCheckConfiguration134 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleCheckConfiguration155 = new BitSet(new long[]{0x0000000000028102L});
-    public static final BitSet FOLLOW_ruleConfiguredParameter_in_ruleCheckConfiguration176 = new BitSet(new long[]{0x0000000000028102L});
-    public static final BitSet FOLLOW_ruleConfiguredLanguageValidator_in_ruleCheckConfiguration198 = new BitSet(new long[]{0x0000000000028002L});
-    public static final BitSet FOLLOW_15_in_ruleCheckConfiguration212 = new BitSet(new long[]{0x0000000000050000L});
-    public static final BitSet FOLLOW_ruleConfiguredCatalog_in_ruleCheckConfiguration233 = new BitSet(new long[]{0x0000000000050000L});
-    public static final BitSet FOLLOW_16_in_ruleCheckConfiguration246 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConfiguredLanguageValidator_in_entryRuleConfiguredLanguageValidator284 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleConfiguredLanguageValidator294 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_17_in_ruleConfiguredLanguageValidator331 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleConfiguredLanguageValidator352 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleConfiguredLanguageValidator364 = new BitSet(new long[]{0x0000000000050100L});
-    public static final BitSet FOLLOW_ruleConfiguredParameter_in_ruleConfiguredLanguageValidator385 = new BitSet(new long[]{0x0000000000050100L});
-    public static final BitSet FOLLOW_ruleConfiguredCatalog_in_ruleConfiguredLanguageValidator407 = new BitSet(new long[]{0x0000000000050000L});
-    public static final BitSet FOLLOW_16_in_ruleConfiguredLanguageValidator420 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConfiguredCatalog_in_entryRuleConfiguredCatalog456 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleConfiguredCatalog466 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_18_in_ruleConfiguredCatalog512 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleConfiguredCatalog535 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleConfiguredCatalog547 = new BitSet(new long[]{0x0000000000010100L,0x000000003C000004L});
-    public static final BitSet FOLLOW_ruleConfiguredParameter_in_ruleConfiguredCatalog568 = new BitSet(new long[]{0x0000000000010100L,0x000000003C000004L});
-    public static final BitSet FOLLOW_ruleConfiguredCheck_in_ruleConfiguredCatalog590 = new BitSet(new long[]{0x0000000000010000L,0x000000003C000004L});
-    public static final BitSet FOLLOW_16_in_ruleConfiguredCatalog603 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConfiguredCheck_in_entryRuleConfiguredCheck639 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleConfiguredCheck649 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSeverityKind_in_ruleConfiguredCheck704 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleConfiguredCheck727 = new BitSet(new long[]{0x0000000000080002L});
-    public static final BitSet FOLLOW_19_in_ruleConfiguredCheck740 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleConfiguredParameter_in_ruleConfiguredCheck761 = new BitSet(new long[]{0x0000000000300000L});
-    public static final BitSet FOLLOW_20_in_ruleConfiguredCheck774 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleConfiguredParameter_in_ruleConfiguredCheck795 = new BitSet(new long[]{0x0000000000300000L});
-    public static final BitSet FOLLOW_21_in_ruleConfiguredCheck809 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConfiguredParameter_in_entryRuleConfiguredParameter847 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleConfiguredParameter857 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleConfiguredParameter914 = new BitSet(new long[]{0x0000000000400000L});
-    public static final BitSet FOLLOW_22_in_ruleConfiguredParameter926 = new BitSet(new long[]{0x00218000008000F0L,0x000000000000C000L});
-    public static final BitSet FOLLOW_ruleXFormalParameterDefaultValueLiteral_in_ruleConfiguredParameter947 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSimpleFormalParameterDefaultValueLiteral_in_entryRuleXSimpleFormalParameterDefaultValueLiteral983 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXSimpleFormalParameterDefaultValueLiteral993 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBooleanLiteral_in_ruleXSimpleFormalParameterDefaultValueLiteral1040 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXNumberLiteral_in_ruleXSimpleFormalParameterDefaultValueLiteral1067 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXStringLiteral_in_ruleXSimpleFormalParameterDefaultValueLiteral1094 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstantUnaryOperation_in_entryRuleXConstantUnaryOperation1129 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXConstantUnaryOperation1139 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpUnary_in_ruleXConstantUnaryOperation1197 = new BitSet(new long[]{0x00218000000000F0L,0x000000000000C000L});
-    public static final BitSet FOLLOW_ruleXConstantUnaryOperation_in_ruleXConstantUnaryOperation1218 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSimpleFormalParameterDefaultValueLiteral_in_ruleXConstantUnaryOperation1247 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXFormalParameterDefaultValueLiteral_in_entryRuleXFormalParameterDefaultValueLiteral1282 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXFormalParameterDefaultValueLiteral1292 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstantUnaryOperation_in_ruleXFormalParameterDefaultValueLiteral1339 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstantListLiteral_in_ruleXFormalParameterDefaultValueLiteral1366 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstantListLiteral_in_entryRuleXConstantListLiteral1401 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXConstantListLiteral1411 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_ruleXConstantListLiteral1457 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_24_in_ruleXConstantListLiteral1469 = new BitSet(new long[]{0x00218000020000F0L,0x000000000000C000L});
-    public static final BitSet FOLLOW_ruleXConstantUnaryOperation_in_ruleXConstantListLiteral1491 = new BitSet(new long[]{0x0000000002100000L});
-    public static final BitSet FOLLOW_20_in_ruleXConstantListLiteral1504 = new BitSet(new long[]{0x00218000000000F0L,0x000000000000C000L});
-    public static final BitSet FOLLOW_ruleXConstantUnaryOperation_in_ruleXConstantListLiteral1525 = new BitSet(new long[]{0x0000000002100000L});
-    public static final BitSet FOLLOW_25_in_ruleXConstantListLiteral1541 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_entryRuleXExpression1577 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXExpression1587 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAssignment_in_ruleXExpression1633 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAssignment_in_entryRuleXAssignment1667 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAssignment1677 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFeatureCallID_in_ruleXAssignment1735 = new BitSet(new long[]{0x0000000000400000L});
-    public static final BitSet FOLLOW_ruleOpSingleAssign_in_ruleXAssignment1751 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXAssignment_in_ruleXAssignment1771 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXOrExpression_in_ruleXAssignment1801 = new BitSet(new long[]{0x00000001FC000002L});
-    public static final BitSet FOLLOW_ruleOpMultiAssign_in_ruleXAssignment1854 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXAssignment_in_ruleXAssignment1877 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpSingleAssign_in_entryRuleOpSingleAssign1917 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpSingleAssign1928 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_22_in_ruleOpSingleAssign1965 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpMultiAssign_in_entryRuleOpMultiAssign2005 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpMultiAssign2016 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_ruleOpMultiAssign2054 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_ruleOpMultiAssign2073 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_ruleOpMultiAssign2092 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_ruleOpMultiAssign2111 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_ruleOpMultiAssign2130 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_ruleOpMultiAssign2150 = new BitSet(new long[]{0x0000000080000000L});
-    public static final BitSet FOLLOW_31_in_ruleOpMultiAssign2163 = new BitSet(new long[]{0x0000000000400000L});
-    public static final BitSet FOLLOW_22_in_ruleOpMultiAssign2176 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_ruleOpMultiAssign2197 = new BitSet(new long[]{0x0000000300000000L});
-    public static final BitSet FOLLOW_32_in_ruleOpMultiAssign2211 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_33_in_ruleOpMultiAssign2226 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXOrExpression_in_entryRuleXOrExpression2267 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXOrExpression2277 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAndExpression_in_ruleXOrExpression2324 = new BitSet(new long[]{0x0000000400000002L});
-    public static final BitSet FOLLOW_ruleOpOr_in_ruleXOrExpression2377 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXAndExpression_in_ruleXOrExpression2400 = new BitSet(new long[]{0x0000000400000002L});
-    public static final BitSet FOLLOW_ruleOpOr_in_entryRuleOpOr2439 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpOr2450 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_34_in_ruleOpOr2487 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAndExpression_in_entryRuleXAndExpression2526 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAndExpression2536 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXEqualityExpression_in_ruleXAndExpression2583 = new BitSet(new long[]{0x0000000800000002L});
-    public static final BitSet FOLLOW_ruleOpAnd_in_ruleXAndExpression2636 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXEqualityExpression_in_ruleXAndExpression2659 = new BitSet(new long[]{0x0000000800000002L});
-    public static final BitSet FOLLOW_ruleOpAnd_in_entryRuleOpAnd2698 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpAnd2709 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_35_in_ruleOpAnd2746 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXEqualityExpression_in_entryRuleXEqualityExpression2785 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXEqualityExpression2795 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXRelationalExpression_in_ruleXEqualityExpression2842 = new BitSet(new long[]{0x000000F000000002L});
-    public static final BitSet FOLLOW_ruleOpEquality_in_ruleXEqualityExpression2895 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXRelationalExpression_in_ruleXEqualityExpression2918 = new BitSet(new long[]{0x000000F000000002L});
-    public static final BitSet FOLLOW_ruleOpEquality_in_entryRuleOpEquality2957 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpEquality2968 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_ruleOpEquality3006 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_37_in_ruleOpEquality3025 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_38_in_ruleOpEquality3044 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_39_in_ruleOpEquality3063 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXRelationalExpression_in_entryRuleXRelationalExpression3103 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXRelationalExpression3113 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXOtherOperatorExpression_in_ruleXRelationalExpression3160 = new BitSet(new long[]{0x0000010380000002L});
-    public static final BitSet FOLLOW_40_in_ruleXRelationalExpression3196 = new BitSet(new long[]{0x0000100000080100L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleXRelationalExpression3219 = new BitSet(new long[]{0x0000010380000002L});
-    public static final BitSet FOLLOW_ruleOpCompare_in_ruleXRelationalExpression3280 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXOtherOperatorExpression_in_ruleXRelationalExpression3303 = new BitSet(new long[]{0x0000010380000002L});
-    public static final BitSet FOLLOW_ruleOpCompare_in_entryRuleOpCompare3343 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpCompare3354 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_ruleOpCompare3392 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_ruleOpCompare3412 = new BitSet(new long[]{0x0000000000400000L});
-    public static final BitSet FOLLOW_22_in_ruleOpCompare3425 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_ruleOpCompare3445 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_ruleOpCompare3464 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXOtherOperatorExpression_in_entryRuleXOtherOperatorExpression3504 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXOtherOperatorExpression3514 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAdditiveExpression_in_ruleXOtherOperatorExpression3561 = new BitSet(new long[]{0x00007E0180000002L});
-    public static final BitSet FOLLOW_ruleOpOther_in_ruleXOtherOperatorExpression3614 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXAdditiveExpression_in_ruleXOtherOperatorExpression3637 = new BitSet(new long[]{0x00007E0180000002L});
-    public static final BitSet FOLLOW_ruleOpOther_in_entryRuleOpOther3676 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpOther3687 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_ruleOpOther3725 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_ruleOpOther3744 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_ruleOpOther3764 = new BitSet(new long[]{0x0000080000000000L});
-    public static final BitSet FOLLOW_43_in_ruleOpOther3777 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_ruleOpOther3797 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_44_in_ruleOpOther3816 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_ruleOpOther3836 = new BitSet(new long[]{0x0000000100000000L});
-    public static final BitSet FOLLOW_32_in_ruleOpOther3867 = new BitSet(new long[]{0x0000000100000000L});
-    public static final BitSet FOLLOW_32_in_ruleOpOther3880 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_ruleOpOther3901 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_ruleOpOther3923 = new BitSet(new long[]{0x0000100080000000L});
-    public static final BitSet FOLLOW_31_in_ruleOpOther3954 = new BitSet(new long[]{0x0000000080000000L});
-    public static final BitSet FOLLOW_31_in_ruleOpOther3967 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_ruleOpOther3988 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_44_in_ruleOpOther4007 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_45_in_ruleOpOther4028 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_ruleOpOther4047 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAdditiveExpression_in_entryRuleXAdditiveExpression4087 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAdditiveExpression4097 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXMultiplicativeExpression_in_ruleXAdditiveExpression4144 = new BitSet(new long[]{0x0001800000000002L});
-    public static final BitSet FOLLOW_ruleOpAdd_in_ruleXAdditiveExpression4197 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXMultiplicativeExpression_in_ruleXAdditiveExpression4220 = new BitSet(new long[]{0x0001800000000002L});
-    public static final BitSet FOLLOW_ruleOpAdd_in_entryRuleOpAdd4259 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpAdd4270 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_ruleOpAdd4308 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_ruleOpAdd4327 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXMultiplicativeExpression_in_entryRuleXMultiplicativeExpression4367 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXMultiplicativeExpression4377 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXUnaryOperation_in_ruleXMultiplicativeExpression4424 = new BitSet(new long[]{0x001E000000000002L});
-    public static final BitSet FOLLOW_ruleOpMulti_in_ruleXMultiplicativeExpression4477 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXUnaryOperation_in_ruleXMultiplicativeExpression4500 = new BitSet(new long[]{0x001E000000000002L});
-    public static final BitSet FOLLOW_ruleOpMulti_in_entryRuleOpMulti4539 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpMulti4550 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_49_in_ruleOpMulti4588 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_50_in_ruleOpMulti4607 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_ruleOpMulti4626 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_ruleOpMulti4645 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXUnaryOperation_in_entryRuleXUnaryOperation4685 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXUnaryOperation4695 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpUnary_in_ruleXUnaryOperation4753 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXUnaryOperation_in_ruleXUnaryOperation4774 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCastedExpression_in_ruleXUnaryOperation4803 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpUnary_in_entryRuleOpUnary4839 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpUnary4850 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_53_in_ruleOpUnary4888 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_ruleOpUnary4907 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_ruleOpUnary4926 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCastedExpression_in_entryRuleXCastedExpression4966 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXCastedExpression4976 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXPostfixOperation_in_ruleXCastedExpression5023 = new BitSet(new long[]{0x0040000000000002L});
-    public static final BitSet FOLLOW_54_in_ruleXCastedExpression5058 = new BitSet(new long[]{0x0000100000080100L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleXCastedExpression5081 = new BitSet(new long[]{0x0040000000000002L});
-    public static final BitSet FOLLOW_ruleXPostfixOperation_in_entryRuleXPostfixOperation5119 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXPostfixOperation5129 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXMemberFeatureCall_in_ruleXPostfixOperation5176 = new BitSet(new long[]{0x0180000000000002L});
-    public static final BitSet FOLLOW_ruleOpPostfix_in_ruleXPostfixOperation5228 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpPostfix_in_entryRuleOpPostfix5268 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpPostfix5279 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_55_in_ruleOpPostfix5317 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_ruleOpPostfix5336 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXMemberFeatureCall_in_entryRuleXMemberFeatureCall5376 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXMemberFeatureCall5386 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXPrimaryExpression_in_ruleXMemberFeatureCall5433 = new BitSet(new long[]{0x0E00000000000002L});
-    public static final BitSet FOLLOW_57_in_ruleXMemberFeatureCall5505 = new BitSet(new long[]{0x0000000000000100L,0x0000000000000F00L});
-    public static final BitSet FOLLOW_58_in_ruleXMemberFeatureCall5529 = new BitSet(new long[]{0x0000000000000100L,0x0000000000000F00L});
-    public static final BitSet FOLLOW_ruleFeatureCallID_in_ruleXMemberFeatureCall5566 = new BitSet(new long[]{0x0000000000400000L});
-    public static final BitSet FOLLOW_ruleOpSingleAssign_in_ruleXMemberFeatureCall5582 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXAssignment_in_ruleXMemberFeatureCall5604 = new BitSet(new long[]{0x0E00000000000002L});
-    public static final BitSet FOLLOW_57_in_ruleXMemberFeatureCall5690 = new BitSet(new long[]{0x0000000080000100L,0x0000000000001F00L});
-    public static final BitSet FOLLOW_59_in_ruleXMemberFeatureCall5714 = new BitSet(new long[]{0x0000000080000100L,0x0000000000001F00L});
-    public static final BitSet FOLLOW_58_in_ruleXMemberFeatureCall5751 = new BitSet(new long[]{0x0000000080000100L,0x0000000000001F00L});
-    public static final BitSet FOLLOW_31_in_ruleXMemberFeatureCall5780 = new BitSet(new long[]{0x0000100000080100L,0x0000000001000000L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleXMemberFeatureCall5801 = new BitSet(new long[]{0x0000000100100000L});
-    public static final BitSet FOLLOW_20_in_ruleXMemberFeatureCall5814 = new BitSet(new long[]{0x0000100000080100L,0x0000000001000000L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleXMemberFeatureCall5835 = new BitSet(new long[]{0x0000000100100000L});
-    public static final BitSet FOLLOW_32_in_ruleXMemberFeatureCall5849 = new BitSet(new long[]{0x0000000080000100L,0x0000000000001F00L});
-    public static final BitSet FOLLOW_ruleIdOrSuper_in_ruleXMemberFeatureCall5874 = new BitSet(new long[]{0x0E00000001080002L});
-    public static final BitSet FOLLOW_19_in_ruleXMemberFeatureCall5908 = new BitSet(new long[]{0x5021900081AA81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXShortClosure_in_ruleXMemberFeatureCall5993 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXMemberFeatureCall6021 = new BitSet(new long[]{0x0000000000300000L});
-    public static final BitSet FOLLOW_20_in_ruleXMemberFeatureCall6034 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXMemberFeatureCall6055 = new BitSet(new long[]{0x0000000000300000L});
-    public static final BitSet FOLLOW_21_in_ruleXMemberFeatureCall6072 = new BitSet(new long[]{0x0E00000001000002L});
-    public static final BitSet FOLLOW_ruleXClosure_in_ruleXMemberFeatureCall6107 = new BitSet(new long[]{0x0E00000000000002L});
-    public static final BitSet FOLLOW_ruleXPrimaryExpression_in_entryRuleXPrimaryExpression6147 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXPrimaryExpression6157 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstructorCall_in_ruleXPrimaryExpression6204 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBlockExpression_in_ruleXPrimaryExpression6231 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSwitchExpression_in_ruleXPrimaryExpression6258 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSynchronizedExpression_in_ruleXPrimaryExpression6302 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXFeatureCall_in_ruleXPrimaryExpression6330 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXLiteral_in_ruleXPrimaryExpression6357 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXIfExpression_in_ruleXPrimaryExpression6384 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXForLoopExpression_in_ruleXPrimaryExpression6441 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBasicForLoopExpression_in_ruleXPrimaryExpression6469 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXWhileExpression_in_ruleXPrimaryExpression6496 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXDoWhileExpression_in_ruleXPrimaryExpression6523 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXThrowExpression_in_ruleXPrimaryExpression6550 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXReturnExpression_in_ruleXPrimaryExpression6577 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXTryCatchFinallyExpression_in_ruleXPrimaryExpression6604 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXParenthesizedExpression_in_ruleXPrimaryExpression6631 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXLiteral_in_entryRuleXLiteral6666 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXLiteral6676 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCollectionLiteral_in_ruleXLiteral6723 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXClosure_in_ruleXLiteral6763 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBooleanLiteral_in_ruleXLiteral6791 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXNumberLiteral_in_ruleXLiteral6818 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXNullLiteral_in_ruleXLiteral6845 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXStringLiteral_in_ruleXLiteral6872 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXTypeLiteral_in_ruleXLiteral6899 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCollectionLiteral_in_entryRuleXCollectionLiteral6934 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXCollectionLiteral6944 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSetLiteral_in_ruleXCollectionLiteral6991 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXListLiteral_in_ruleXCollectionLiteral7018 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSetLiteral_in_entryRuleXSetLiteral7053 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXSetLiteral7063 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_ruleXSetLiteral7109 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleXSetLiteral7121 = new BitSet(new long[]{0x40218000818B81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXSetLiteral7143 = new BitSet(new long[]{0x0000000000110000L});
-    public static final BitSet FOLLOW_20_in_ruleXSetLiteral7156 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXSetLiteral7177 = new BitSet(new long[]{0x0000000000110000L});
-    public static final BitSet FOLLOW_16_in_ruleXSetLiteral7193 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXListLiteral_in_entryRuleXListLiteral7229 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXListLiteral7239 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_ruleXListLiteral7285 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_24_in_ruleXListLiteral7297 = new BitSet(new long[]{0x40218000838A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXListLiteral7319 = new BitSet(new long[]{0x0000000002100000L});
-    public static final BitSet FOLLOW_20_in_ruleXListLiteral7332 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXListLiteral7353 = new BitSet(new long[]{0x0000000002100000L});
-    public static final BitSet FOLLOW_25_in_ruleXListLiteral7369 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXClosure_in_entryRuleXClosure7405 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXClosure7415 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_ruleXClosure7475 = new BitSet(new long[]{0x50219000838A81F0L,0x00000000005FFFF1L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_ruleXClosure7548 = new BitSet(new long[]{0x1000000000100000L});
-    public static final BitSet FOLLOW_20_in_ruleXClosure7561 = new BitSet(new long[]{0x0000100000080100L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_ruleXClosure7582 = new BitSet(new long[]{0x1000000000100000L});
-    public static final BitSet FOLLOW_60_in_ruleXClosure7604 = new BitSet(new long[]{0x40218000838A81F0L,0x00000000005FFFF1L});
-    public static final BitSet FOLLOW_ruleXExpressionInClosure_in_ruleXClosure7641 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_ruleXClosure7653 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpressionInClosure_in_entryRuleXExpressionInClosure7689 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXExpressionInClosure7699 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_ruleXExpressionInClosure7755 = new BitSet(new long[]{0x60218000818A81F2L,0x00000000005FFFF1L});
-    public static final BitSet FOLLOW_61_in_ruleXExpressionInClosure7768 = new BitSet(new long[]{0x40218000818A81F2L,0x00000000005FFFF1L});
-    public static final BitSet FOLLOW_ruleXShortClosure_in_entryRuleXShortClosure7808 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXShortClosure7818 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_ruleXShortClosure7926 = new BitSet(new long[]{0x1000000000100000L});
-    public static final BitSet FOLLOW_20_in_ruleXShortClosure7939 = new BitSet(new long[]{0x0000100000080100L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_ruleXShortClosure7960 = new BitSet(new long[]{0x1000000000100000L});
-    public static final BitSet FOLLOW_60_in_ruleXShortClosure7982 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXShortClosure8018 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXParenthesizedExpression_in_entryRuleXParenthesizedExpression8054 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXParenthesizedExpression8064 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_ruleXParenthesizedExpression8101 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXParenthesizedExpression8123 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_21_in_ruleXParenthesizedExpression8134 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXIfExpression_in_entryRuleXIfExpression8170 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXIfExpression8180 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_62_in_ruleXIfExpression8226 = new BitSet(new long[]{0x0000000000080000L});
-    public static final BitSet FOLLOW_19_in_ruleXIfExpression8238 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXIfExpression8259 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_21_in_ruleXIfExpression8271 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXIfExpression8292 = new BitSet(new long[]{0x8000000000000002L});
-    public static final BitSet FOLLOW_63_in_ruleXIfExpression8313 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXIfExpression8335 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSwitchExpression_in_entryRuleXSwitchExpression8373 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXSwitchExpression8383 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_64_in_ruleXSwitchExpression8429 = new BitSet(new long[]{0x40219000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_19_in_ruleXSwitchExpression8467 = new BitSet(new long[]{0x0000100000080100L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_ruleXSwitchExpression8488 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_65_in_ruleXSwitchExpression8500 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXSwitchExpression8523 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_21_in_ruleXSwitchExpression8535 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_ruleXSwitchExpression8584 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_65_in_ruleXSwitchExpression8596 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXSwitchExpression8620 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleXSwitchExpression8634 = new BitSet(new long[]{0x0000100000190100L,0x000000000000000EL});
-    public static final BitSet FOLLOW_ruleXCasePart_in_ruleXSwitchExpression8655 = new BitSet(new long[]{0x0000100000190100L,0x000000000000000EL});
-    public static final BitSet FOLLOW_66_in_ruleXSwitchExpression8669 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_65_in_ruleXSwitchExpression8681 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXSwitchExpression8702 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_16_in_ruleXSwitchExpression8716 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCasePart_in_entryRuleXCasePart8752 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXCasePart8762 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleXCasePart8817 = new BitSet(new long[]{0x0000000000100000L,0x000000000000000AL});
-    public static final BitSet FOLLOW_67_in_ruleXCasePart8831 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXCasePart8852 = new BitSet(new long[]{0x0000000000100000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_65_in_ruleXCasePart8868 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXCasePart8889 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_20_in_ruleXCasePart8914 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXForLoopExpression_in_entryRuleXForLoopExpression8964 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXForLoopExpression8974 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_17_in_ruleXForLoopExpression9051 = new BitSet(new long[]{0x0000000000080000L});
-    public static final BitSet FOLLOW_19_in_ruleXForLoopExpression9063 = new BitSet(new long[]{0x0000100000080100L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_ruleXForLoopExpression9084 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_65_in_ruleXForLoopExpression9096 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXForLoopExpression9119 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_21_in_ruleXForLoopExpression9131 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXForLoopExpression9152 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBasicForLoopExpression_in_entryRuleXBasicForLoopExpression9188 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXBasicForLoopExpression9198 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_17_in_ruleXBasicForLoopExpression9244 = new BitSet(new long[]{0x0000000000080000L});
-    public static final BitSet FOLLOW_19_in_ruleXBasicForLoopExpression9256 = new BitSet(new long[]{0x60218000818A81F0L,0x00000000005FFFF1L});
-    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_ruleXBasicForLoopExpression9278 = new BitSet(new long[]{0x2000000000100000L});
-    public static final BitSet FOLLOW_20_in_ruleXBasicForLoopExpression9291 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFFF1L});
-    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_ruleXBasicForLoopExpression9312 = new BitSet(new long[]{0x2000000000100000L});
-    public static final BitSet FOLLOW_61_in_ruleXBasicForLoopExpression9328 = new BitSet(new long[]{0x60218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXBasicForLoopExpression9349 = new BitSet(new long[]{0x2000000000000000L});
-    public static final BitSet FOLLOW_61_in_ruleXBasicForLoopExpression9362 = new BitSet(new long[]{0x4021800081AA81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXBasicForLoopExpression9384 = new BitSet(new long[]{0x0000000000300000L});
-    public static final BitSet FOLLOW_20_in_ruleXBasicForLoopExpression9397 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXBasicForLoopExpression9418 = new BitSet(new long[]{0x0000000000300000L});
-    public static final BitSet FOLLOW_21_in_ruleXBasicForLoopExpression9434 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXBasicForLoopExpression9455 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXWhileExpression_in_entryRuleXWhileExpression9491 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXWhileExpression9501 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_68_in_ruleXWhileExpression9547 = new BitSet(new long[]{0x0000000000080000L});
-    public static final BitSet FOLLOW_19_in_ruleXWhileExpression9559 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXWhileExpression9580 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_21_in_ruleXWhileExpression9592 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXWhileExpression9613 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXDoWhileExpression_in_entryRuleXDoWhileExpression9649 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXDoWhileExpression9659 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_69_in_ruleXDoWhileExpression9705 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXDoWhileExpression9726 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
-    public static final BitSet FOLLOW_68_in_ruleXDoWhileExpression9738 = new BitSet(new long[]{0x0000000000080000L});
-    public static final BitSet FOLLOW_19_in_ruleXDoWhileExpression9750 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXDoWhileExpression9771 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_21_in_ruleXDoWhileExpression9783 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBlockExpression_in_entryRuleXBlockExpression9819 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXBlockExpression9829 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_15_in_ruleXBlockExpression9875 = new BitSet(new long[]{0x40218000818B81F0L,0x00000000005FFFF1L});
-    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_ruleXBlockExpression9897 = new BitSet(new long[]{0x60218000818B81F0L,0x00000000005FFFF1L});
-    public static final BitSet FOLLOW_61_in_ruleXBlockExpression9910 = new BitSet(new long[]{0x40218000818B81F0L,0x00000000005FFFF1L});
-    public static final BitSet FOLLOW_16_in_ruleXBlockExpression9926 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_entryRuleXExpressionOrVarDeclaration9962 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXExpressionOrVarDeclaration9972 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXVariableDeclaration_in_ruleXExpressionOrVarDeclaration10019 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXExpressionOrVarDeclaration10046 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXVariableDeclaration_in_entryRuleXVariableDeclaration10081 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXVariableDeclaration10091 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_70_in_ruleXVariableDeclaration10144 = new BitSet(new long[]{0x0000100000080100L});
-    public static final BitSet FOLLOW_71_in_ruleXVariableDeclaration10175 = new BitSet(new long[]{0x0000100000080100L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleXVariableDeclaration10223 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleXVariableDeclaration10244 = new BitSet(new long[]{0x0000000000400002L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleXVariableDeclaration10273 = new BitSet(new long[]{0x0000000000400002L});
-    public static final BitSet FOLLOW_22_in_ruleXVariableDeclaration10287 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXVariableDeclaration10308 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_entryRuleJvmFormalParameter10346 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmFormalParameter10356 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleJvmFormalParameter10402 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleJvmFormalParameter10424 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFullJvmFormalParameter_in_entryRuleFullJvmFormalParameter10460 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFullJvmFormalParameter10470 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleFullJvmFormalParameter10516 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleFullJvmFormalParameter10537 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXFeatureCall_in_entryRuleXFeatureCall10573 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXFeatureCall10583 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_ruleXFeatureCall10630 = new BitSet(new long[]{0x0000100000080100L,0x0000000001000000L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleXFeatureCall10651 = new BitSet(new long[]{0x0000000100100000L});
-    public static final BitSet FOLLOW_20_in_ruleXFeatureCall10664 = new BitSet(new long[]{0x0000100000080100L,0x0000000001000000L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleXFeatureCall10685 = new BitSet(new long[]{0x0000000100100000L});
-    public static final BitSet FOLLOW_32_in_ruleXFeatureCall10699 = new BitSet(new long[]{0x0000000080000100L,0x0000000000001F00L});
-    public static final BitSet FOLLOW_ruleIdOrSuper_in_ruleXFeatureCall10724 = new BitSet(new long[]{0x0000000001080002L});
-    public static final BitSet FOLLOW_19_in_ruleXFeatureCall10758 = new BitSet(new long[]{0x5021900081AA81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXShortClosure_in_ruleXFeatureCall10843 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXFeatureCall10871 = new BitSet(new long[]{0x0000000000300000L});
-    public static final BitSet FOLLOW_20_in_ruleXFeatureCall10884 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXFeatureCall10905 = new BitSet(new long[]{0x0000000000300000L});
-    public static final BitSet FOLLOW_21_in_ruleXFeatureCall10922 = new BitSet(new long[]{0x0000000001000002L});
-    public static final BitSet FOLLOW_ruleXClosure_in_ruleXFeatureCall10957 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFeatureCallID_in_entryRuleFeatureCallID10995 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFeatureCallID11006 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleFeatureCallID11053 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_ruleFeatureCallID11077 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_ruleFeatureCallID11096 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_ruleFeatureCallID11115 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_75_in_ruleFeatureCallID11134 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdOrSuper_in_entryRuleIdOrSuper11175 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIdOrSuper11186 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFeatureCallID_in_ruleIdOrSuper11233 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_76_in_ruleIdOrSuper11257 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstructorCall_in_entryRuleXConstructorCall11297 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXConstructorCall11307 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_77_in_ruleXConstructorCall11353 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleXConstructorCall11376 = new BitSet(new long[]{0x0000000081080002L});
-    public static final BitSet FOLLOW_31_in_ruleXConstructorCall11397 = new BitSet(new long[]{0x0000100000080100L,0x0000000001000000L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleXConstructorCall11419 = new BitSet(new long[]{0x0000000100100000L});
-    public static final BitSet FOLLOW_20_in_ruleXConstructorCall11432 = new BitSet(new long[]{0x0000100000080100L,0x0000000001000000L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleXConstructorCall11453 = new BitSet(new long[]{0x0000000100100000L});
-    public static final BitSet FOLLOW_32_in_ruleXConstructorCall11467 = new BitSet(new long[]{0x0000000001080002L});
-    public static final BitSet FOLLOW_19_in_ruleXConstructorCall11503 = new BitSet(new long[]{0x5021900081AA81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXShortClosure_in_ruleXConstructorCall11588 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXConstructorCall11616 = new BitSet(new long[]{0x0000000000300000L});
-    public static final BitSet FOLLOW_20_in_ruleXConstructorCall11629 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXConstructorCall11650 = new BitSet(new long[]{0x0000000000300000L});
-    public static final BitSet FOLLOW_21_in_ruleXConstructorCall11667 = new BitSet(new long[]{0x0000000001000002L});
-    public static final BitSet FOLLOW_ruleXClosure_in_ruleXConstructorCall11702 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBooleanLiteral_in_entryRuleXBooleanLiteral11739 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXBooleanLiteral11749 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_78_in_ruleXBooleanLiteral11796 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_79_in_ruleXBooleanLiteral11820 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXNullLiteral_in_entryRuleXNullLiteral11870 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXNullLiteral11880 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_80_in_ruleXNullLiteral11926 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXNumberLiteral_in_entryRuleXNumberLiteral11962 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXNumberLiteral11972 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNumber_in_ruleXNumberLiteral12027 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXStringLiteral_in_entryRuleXStringLiteral12063 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXStringLiteral12073 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleXStringLiteral12124 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXTypeLiteral_in_entryRuleXTypeLiteral12165 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXTypeLiteral12175 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_81_in_ruleXTypeLiteral12221 = new BitSet(new long[]{0x0000000000080000L});
-    public static final BitSet FOLLOW_19_in_ruleXTypeLiteral12233 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleXTypeLiteral12256 = new BitSet(new long[]{0x0000000001200000L});
-    public static final BitSet FOLLOW_ruleArrayBrackets_in_ruleXTypeLiteral12277 = new BitSet(new long[]{0x0000000001200000L});
-    public static final BitSet FOLLOW_21_in_ruleXTypeLiteral12290 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXThrowExpression_in_entryRuleXThrowExpression12326 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXThrowExpression12336 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_82_in_ruleXThrowExpression12382 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXThrowExpression12403 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXReturnExpression_in_entryRuleXReturnExpression12439 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXReturnExpression12449 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_83_in_ruleXReturnExpression12495 = new BitSet(new long[]{0x40218000818A81F2L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXReturnExpression12730 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXTryCatchFinallyExpression_in_entryRuleXTryCatchFinallyExpression12767 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXTryCatchFinallyExpression12777 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_84_in_ruleXTryCatchFinallyExpression12823 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXTryCatchFinallyExpression12844 = new BitSet(new long[]{0x0000000000000000L,0x0000000000A00000L});
-    public static final BitSet FOLLOW_ruleXCatchClause_in_ruleXTryCatchFinallyExpression12874 = new BitSet(new long[]{0x0000000000000002L,0x0000000000A00000L});
-    public static final BitSet FOLLOW_85_in_ruleXTryCatchFinallyExpression12896 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXTryCatchFinallyExpression12918 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_85_in_ruleXTryCatchFinallyExpression12940 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXTryCatchFinallyExpression12961 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSynchronizedExpression_in_entryRuleXSynchronizedExpression12999 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXSynchronizedExpression13009 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_86_in_ruleXSynchronizedExpression13073 = new BitSet(new long[]{0x0000000000080000L});
-    public static final BitSet FOLLOW_19_in_ruleXSynchronizedExpression13085 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXSynchronizedExpression13108 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_21_in_ruleXSynchronizedExpression13120 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXSynchronizedExpression13141 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCatchClause_in_entryRuleXCatchClause13177 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXCatchClause13187 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_87_in_ruleXCatchClause13232 = new BitSet(new long[]{0x0000000000080000L});
-    public static final BitSet FOLLOW_19_in_ruleXCatchClause13245 = new BitSet(new long[]{0x0000100000080100L});
-    public static final BitSet FOLLOW_ruleFullJvmFormalParameter_in_ruleXCatchClause13266 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_21_in_ruleXCatchClause13278 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXCatchClause13299 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName13336 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedName13347 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleQualifiedName13394 = new BitSet(new long[]{0x0200000000000002L});
-    public static final BitSet FOLLOW_57_in_ruleQualifiedName13422 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleQualifiedName13445 = new BitSet(new long[]{0x0200000000000002L});
-    public static final BitSet FOLLOW_ruleNumber_in_entryRuleNumber13499 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNumber13510 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_HEX_in_ruleNumber13554 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleNumber13582 = new BitSet(new long[]{0x0200000000000002L});
-    public static final BitSet FOLLOW_RULE_DECIMAL_in_ruleNumber13608 = new BitSet(new long[]{0x0200000000000002L});
-    public static final BitSet FOLLOW_57_in_ruleNumber13628 = new BitSet(new long[]{0x00000000000000C0L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleNumber13644 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_DECIMAL_in_ruleNumber13670 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_entryRuleJvmTypeReference13725 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmTypeReference13735 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmParameterizedTypeReference_in_ruleJvmTypeReference13783 = new BitSet(new long[]{0x0000000001000002L});
-    public static final BitSet FOLLOW_ruleArrayBrackets_in_ruleJvmTypeReference13819 = new BitSet(new long[]{0x0000000001000002L});
-    public static final BitSet FOLLOW_ruleXFunctionTypeRef_in_ruleJvmTypeReference13850 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleArrayBrackets_in_entryRuleArrayBrackets13886 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleArrayBrackets13897 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_ruleArrayBrackets13935 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_ruleArrayBrackets13948 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXFunctionTypeRef_in_entryRuleXFunctionTypeRef13988 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXFunctionTypeRef13998 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_ruleXFunctionTypeRef14036 = new BitSet(new long[]{0x0000100000280100L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleXFunctionTypeRef14058 = new BitSet(new long[]{0x0000000000300000L});
-    public static final BitSet FOLLOW_20_in_ruleXFunctionTypeRef14071 = new BitSet(new long[]{0x0000100000080100L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleXFunctionTypeRef14092 = new BitSet(new long[]{0x0000000000300000L});
-    public static final BitSet FOLLOW_21_in_ruleXFunctionTypeRef14108 = new BitSet(new long[]{0x0000100000000000L});
-    public static final BitSet FOLLOW_44_in_ruleXFunctionTypeRef14122 = new BitSet(new long[]{0x0000100000080100L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleXFunctionTypeRef14143 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmParameterizedTypeReference_in_entryRuleJvmParameterizedTypeReference14179 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmParameterizedTypeReference14189 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleJvmParameterizedTypeReference14237 = new BitSet(new long[]{0x0000000080000002L});
-    public static final BitSet FOLLOW_31_in_ruleJvmParameterizedTypeReference14258 = new BitSet(new long[]{0x0000100000080100L,0x0000000001000000L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleJvmParameterizedTypeReference14280 = new BitSet(new long[]{0x0000000100100000L});
-    public static final BitSet FOLLOW_20_in_ruleJvmParameterizedTypeReference14293 = new BitSet(new long[]{0x0000100000080100L,0x0000000001000000L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleJvmParameterizedTypeReference14314 = new BitSet(new long[]{0x0000000100100000L});
-    public static final BitSet FOLLOW_32_in_ruleJvmParameterizedTypeReference14328 = new BitSet(new long[]{0x0200000000000002L});
-    public static final BitSet FOLLOW_57_in_ruleJvmParameterizedTypeReference14364 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleJvmParameterizedTypeReference14389 = new BitSet(new long[]{0x0200000080000002L});
-    public static final BitSet FOLLOW_31_in_ruleJvmParameterizedTypeReference14410 = new BitSet(new long[]{0x0000100000080100L,0x0000000001000000L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleJvmParameterizedTypeReference14432 = new BitSet(new long[]{0x0000000100100000L});
-    public static final BitSet FOLLOW_20_in_ruleJvmParameterizedTypeReference14445 = new BitSet(new long[]{0x0000100000080100L,0x0000000001000000L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleJvmParameterizedTypeReference14466 = new BitSet(new long[]{0x0000000100100000L});
-    public static final BitSet FOLLOW_32_in_ruleJvmParameterizedTypeReference14480 = new BitSet(new long[]{0x0200000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_entryRuleJvmArgumentTypeReference14522 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmArgumentTypeReference14532 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleJvmArgumentTypeReference14579 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmWildcardTypeReference_in_ruleJvmArgumentTypeReference14606 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmWildcardTypeReference_in_entryRuleJvmWildcardTypeReference14641 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmWildcardTypeReference14651 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_88_in_ruleJvmWildcardTypeReference14697 = new BitSet(new long[]{0x0000000000000002L,0x0000000000001100L});
-    public static final BitSet FOLLOW_ruleJvmUpperBound_in_ruleJvmWildcardTypeReference14720 = new BitSet(new long[]{0x0000000000000002L,0x0000000002000000L});
-    public static final BitSet FOLLOW_ruleJvmUpperBoundAnded_in_ruleJvmWildcardTypeReference14741 = new BitSet(new long[]{0x0000000000000002L,0x0000000002000000L});
-    public static final BitSet FOLLOW_ruleJvmLowerBound_in_ruleJvmWildcardTypeReference14771 = new BitSet(new long[]{0x0000000000000002L,0x0000000002000000L});
-    public static final BitSet FOLLOW_ruleJvmLowerBoundAnded_in_ruleJvmWildcardTypeReference14792 = new BitSet(new long[]{0x0000000000000002L,0x0000000002000000L});
-    public static final BitSet FOLLOW_ruleJvmUpperBound_in_entryRuleJvmUpperBound14832 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmUpperBound14842 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_ruleJvmUpperBound14879 = new BitSet(new long[]{0x0000100000080100L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleJvmUpperBound14900 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmUpperBoundAnded_in_entryRuleJvmUpperBoundAnded14936 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmUpperBoundAnded14946 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_89_in_ruleJvmUpperBoundAnded14983 = new BitSet(new long[]{0x0000100000080100L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleJvmUpperBoundAnded15004 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmLowerBound_in_entryRuleJvmLowerBound15040 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmLowerBound15050 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_76_in_ruleJvmLowerBound15087 = new BitSet(new long[]{0x0000100000080100L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleJvmLowerBound15108 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmLowerBoundAnded_in_entryRuleJvmLowerBoundAnded15144 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmLowerBoundAnded15154 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_89_in_ruleJvmLowerBoundAnded15191 = new BitSet(new long[]{0x0000100000080100L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleJvmLowerBoundAnded15212 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedNameWithWildcard_in_entryRuleQualifiedNameWithWildcard15251 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedNameWithWildcard15262 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleQualifiedNameWithWildcard15309 = new BitSet(new long[]{0x0200000000000000L});
-    public static final BitSet FOLLOW_57_in_ruleQualifiedNameWithWildcard15327 = new BitSet(new long[]{0x0002000000000000L});
-    public static final BitSet FOLLOW_49_in_ruleQualifiedNameWithWildcard15340 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_entryRuleValidID15381 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleValidID15392 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleValidID15431 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXImportDeclaration_in_entryRuleXImportDeclaration15477 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXImportDeclaration15487 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_ruleXImportDeclaration15524 = new BitSet(new long[]{0x0000000000000100L,0x0000000000000200L});
-    public static final BitSet FOLLOW_73_in_ruleXImportDeclaration15544 = new BitSet(new long[]{0x0000000000000100L,0x0000000000000800L});
-    public static final BitSet FOLLOW_75_in_ruleXImportDeclaration15575 = new BitSet(new long[]{0x0000000000000100L,0x0000000000000800L});
-    public static final BitSet FOLLOW_ruleQualifiedNameInStaticImport_in_ruleXImportDeclaration15612 = new BitSet(new long[]{0x0002000000000100L});
-    public static final BitSet FOLLOW_49_in_ruleXImportDeclaration15631 = new BitSet(new long[]{0x2000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleXImportDeclaration15671 = new BitSet(new long[]{0x2000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleXImportDeclaration15702 = new BitSet(new long[]{0x2000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedNameWithWildcard_in_ruleXImportDeclaration15729 = new BitSet(new long[]{0x2000000000000002L});
-    public static final BitSet FOLLOW_61_in_ruleXImportDeclaration15743 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedNameInStaticImport_in_entryRuleQualifiedNameInStaticImport15782 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedNameInStaticImport15793 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleQualifiedNameInStaticImport15840 = new BitSet(new long[]{0x0200000000000000L});
-    public static final BitSet FOLLOW_57_in_ruleQualifiedNameInStaticImport15858 = new BitSet(new long[]{0x0000000000000102L});
-    public static final BitSet FOLLOW_66_in_ruleSeverityKind15913 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_90_in_ruleSeverityKind15930 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_91_in_ruleSeverityKind15947 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_92_in_ruleSeverityKind15964 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_93_in_ruleSeverityKind15981 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpMultiAssign_in_synpred1_InternalCheckCfg1822 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpOr_in_synpred2_InternalCheckCfg2345 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpAnd_in_synpred3_InternalCheckCfg2604 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpEquality_in_synpred4_InternalCheckCfg2863 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_40_in_synpred5_InternalCheckCfg3177 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpCompare_in_synpred6_InternalCheckCfg3248 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpOther_in_synpred7_InternalCheckCfg3582 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_synpred8_InternalCheckCfg3851 = new BitSet(new long[]{0x0000000100000000L});
-    public static final BitSet FOLLOW_32_in_synpred8_InternalCheckCfg3856 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_synpred9_InternalCheckCfg3938 = new BitSet(new long[]{0x0000000080000000L});
-    public static final BitSet FOLLOW_31_in_synpred9_InternalCheckCfg3943 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpAdd_in_synpred10_InternalCheckCfg4165 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpMulti_in_synpred11_InternalCheckCfg4445 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_54_in_synpred12_InternalCheckCfg5039 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpPostfix_in_synpred13_InternalCheckCfg5196 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_57_in_synpred14_InternalCheckCfg5451 = new BitSet(new long[]{0x0000000000000100L,0x0000000000000F00L});
-    public static final BitSet FOLLOW_58_in_synpred14_InternalCheckCfg5465 = new BitSet(new long[]{0x0000000000000100L,0x0000000000000F00L});
-    public static final BitSet FOLLOW_ruleFeatureCallID_in_synpred14_InternalCheckCfg5481 = new BitSet(new long[]{0x0000000000400000L});
-    public static final BitSet FOLLOW_ruleOpSingleAssign_in_synpred14_InternalCheckCfg5487 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_57_in_synpred15_InternalCheckCfg5629 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_59_in_synpred15_InternalCheckCfg5643 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_58_in_synpred15_InternalCheckCfg5663 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_synpred16_InternalCheckCfg5890 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred17_InternalCheckCfg5942 = new BitSet(new long[]{0x1000000000100000L});
-    public static final BitSet FOLLOW_20_in_synpred17_InternalCheckCfg5949 = new BitSet(new long[]{0x0000100000080100L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred17_InternalCheckCfg5956 = new BitSet(new long[]{0x1000000000100000L});
-    public static final BitSet FOLLOW_60_in_synpred17_InternalCheckCfg5970 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_synpred18_InternalCheckCfg6090 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_86_in_synpred19_InternalCheckCfg6279 = new BitSet(new long[]{0x0000000000080000L});
-    public static final BitSet FOLLOW_19_in_synpred19_InternalCheckCfg6283 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_17_in_synpred20_InternalCheckCfg6405 = new BitSet(new long[]{0x0000000000080000L});
-    public static final BitSet FOLLOW_19_in_synpred20_InternalCheckCfg6409 = new BitSet(new long[]{0x0000100000080100L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred20_InternalCheckCfg6416 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_65_in_synpred20_InternalCheckCfg6422 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_synpred21_InternalCheckCfg6744 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred23_InternalCheckCfg7494 = new BitSet(new long[]{0x1000000000100000L});
-    public static final BitSet FOLLOW_20_in_synpred23_InternalCheckCfg7501 = new BitSet(new long[]{0x0000100000080100L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred23_InternalCheckCfg7508 = new BitSet(new long[]{0x1000000000100000L});
-    public static final BitSet FOLLOW_60_in_synpred23_InternalCheckCfg7522 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_synpred25_InternalCheckCfg8305 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_synpred26_InternalCheckCfg8444 = new BitSet(new long[]{0x0000100000080100L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred26_InternalCheckCfg8451 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_65_in_synpred26_InternalCheckCfg8457 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred27_InternalCheckCfg8559 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_65_in_synpred27_InternalCheckCfg8565 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_synpred29_InternalCheckCfg10193 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ruleValidID_in_synpred29_InternalCheckCfg10202 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_synpred30_InternalCheckCfg10740 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred31_InternalCheckCfg10792 = new BitSet(new long[]{0x1000000000100000L});
-    public static final BitSet FOLLOW_20_in_synpred31_InternalCheckCfg10799 = new BitSet(new long[]{0x0000100000080100L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred31_InternalCheckCfg10806 = new BitSet(new long[]{0x1000000000100000L});
-    public static final BitSet FOLLOW_60_in_synpred31_InternalCheckCfg10820 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_synpred32_InternalCheckCfg10940 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_synpred33_InternalCheckCfg11389 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_synpred34_InternalCheckCfg11485 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred35_InternalCheckCfg11537 = new BitSet(new long[]{0x1000000000100000L});
-    public static final BitSet FOLLOW_20_in_synpred35_InternalCheckCfg11544 = new BitSet(new long[]{0x0000100000080100L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred35_InternalCheckCfg11551 = new BitSet(new long[]{0x1000000000100000L});
-    public static final BitSet FOLLOW_60_in_synpred35_InternalCheckCfg11565 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_synpred36_InternalCheckCfg11685 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_set_in_synpred37_InternalCheckCfg12505 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_87_in_synpred38_InternalCheckCfg12858 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_85_in_synpred39_InternalCheckCfg12888 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_57_in_synpred42_InternalCheckCfg13413 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleArrayBrackets_in_synpred43_InternalCheckCfg13798 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_synpred44_InternalCheckCfg14250 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_57_in_synpred45_InternalCheckCfg14345 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_synpred46_InternalCheckCfg14402 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_1 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_2 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x0000000000004000L});
+    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000000000000100L});
+    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0000000000028102L});
+    public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000000028002L});
+    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000000000050000L});
+    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000000000008000L});
+    public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000000050100L});
+    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000000010100L,0x000000003C000004L});
+    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000000000010000L,0x000000003C000004L});
+    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000000080002L});
+    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000300000L});
+    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000000400000L});
+    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x00218000008000F0L,0x000000000000C000L});
+    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x00218000000000F0L,0x000000000000C000L});
+    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000001000000L});
+    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x00218000020000F0L,0x000000000000C000L});
+    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000002100000L});
+    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFF31L});
+    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x00000001FC000002L});
+    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000000080000000L});
+    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000000300000000L});
+    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0000000200000000L});
+    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000000400000002L});
+    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0000000800000002L});
+    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x000000F000000002L});
+    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0000010380000002L});
+    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000100000080100L});
+    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x00007E0180000002L});
+    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000080000000000L});
+    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0000000100000000L});
+    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0000100080000000L});
+    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0001800000000002L});
+    public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x001E000000000002L});
+    public static final BitSet FOLLOW_36 = new BitSet(new long[]{0x0040000000000002L});
+    public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x0180000000000002L});
+    public static final BitSet FOLLOW_38 = new BitSet(new long[]{0x0E00000000000002L});
+    public static final BitSet FOLLOW_39 = new BitSet(new long[]{0x0000000000000100L,0x0000000000000F00L});
+    public static final BitSet FOLLOW_40 = new BitSet(new long[]{0x0000000080000100L,0x0000000000001F00L});
+    public static final BitSet FOLLOW_41 = new BitSet(new long[]{0x0000100000080100L,0x0000000001000000L});
+    public static final BitSet FOLLOW_42 = new BitSet(new long[]{0x0000000100100000L});
+    public static final BitSet FOLLOW_43 = new BitSet(new long[]{0x0E00000001080002L});
+    public static final BitSet FOLLOW_44 = new BitSet(new long[]{0x5021900081AA81F0L,0x00000000005FFF31L});
+    public static final BitSet FOLLOW_45 = new BitSet(new long[]{0x0000000000200000L});
+    public static final BitSet FOLLOW_46 = new BitSet(new long[]{0x0E00000001000002L});
+    public static final BitSet FOLLOW_47 = new BitSet(new long[]{0x40218000818B81F0L,0x00000000005FFF31L});
+    public static final BitSet FOLLOW_48 = new BitSet(new long[]{0x0000000000110000L});
+    public static final BitSet FOLLOW_49 = new BitSet(new long[]{0x40218000838A81F0L,0x00000000005FFF31L});
+    public static final BitSet FOLLOW_50 = new BitSet(new long[]{0x50219000838A81F0L,0x00000000005FFFF1L});
+    public static final BitSet FOLLOW_51 = new BitSet(new long[]{0x1000000000100000L});
+    public static final BitSet FOLLOW_52 = new BitSet(new long[]{0x40218000838A81F0L,0x00000000005FFFF1L});
+    public static final BitSet FOLLOW_53 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_54 = new BitSet(new long[]{0x60218000818A81F2L,0x00000000005FFFF1L});
+    public static final BitSet FOLLOW_55 = new BitSet(new long[]{0x40218000818A81F2L,0x00000000005FFFF1L});
+    public static final BitSet FOLLOW_56 = new BitSet(new long[]{0x0000000000080000L});
+    public static final BitSet FOLLOW_57 = new BitSet(new long[]{0x8000000000000002L});
+    public static final BitSet FOLLOW_58 = new BitSet(new long[]{0x40219000818A81F0L,0x00000000005FFF31L});
+    public static final BitSet FOLLOW_59 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000002L});
+    public static final BitSet FOLLOW_60 = new BitSet(new long[]{0x0000100000190100L,0x000000000000000EL});
+    public static final BitSet FOLLOW_61 = new BitSet(new long[]{0x0000000000010000L});
+    public static final BitSet FOLLOW_62 = new BitSet(new long[]{0x0000000000100000L,0x000000000000000AL});
+    public static final BitSet FOLLOW_63 = new BitSet(new long[]{0x0000000000100000L,0x0000000000000002L});
+    public static final BitSet FOLLOW_64 = new BitSet(new long[]{0x60218000818A81F0L,0x00000000005FFFF1L});
+    public static final BitSet FOLLOW_65 = new BitSet(new long[]{0x2000000000100000L});
+    public static final BitSet FOLLOW_66 = new BitSet(new long[]{0x40218000818A81F0L,0x00000000005FFFF1L});
+    public static final BitSet FOLLOW_67 = new BitSet(new long[]{0x60218000818A81F0L,0x00000000005FFF31L});
+    public static final BitSet FOLLOW_68 = new BitSet(new long[]{0x2000000000000000L});
+    public static final BitSet FOLLOW_69 = new BitSet(new long[]{0x4021800081AA81F0L,0x00000000005FFF31L});
+    public static final BitSet FOLLOW_70 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
+    public static final BitSet FOLLOW_71 = new BitSet(new long[]{0x40218000818B81F0L,0x00000000005FFFF1L});
+    public static final BitSet FOLLOW_72 = new BitSet(new long[]{0x60218000818B81F0L,0x00000000005FFFF1L});
+    public static final BitSet FOLLOW_73 = new BitSet(new long[]{0x0000000000400002L});
+    public static final BitSet FOLLOW_74 = new BitSet(new long[]{0x0000000001080002L});
+    public static final BitSet FOLLOW_75 = new BitSet(new long[]{0x0000000001000002L});
+    public static final BitSet FOLLOW_76 = new BitSet(new long[]{0x0000000081080002L});
+    public static final BitSet FOLLOW_77 = new BitSet(new long[]{0x0000000001200000L});
+    public static final BitSet FOLLOW_78 = new BitSet(new long[]{0x40218000818A81F2L,0x00000000005FFF31L});
+    public static final BitSet FOLLOW_79 = new BitSet(new long[]{0x0000000000000000L,0x0000000000A00000L});
+    public static final BitSet FOLLOW_80 = new BitSet(new long[]{0x0000000000000002L,0x0000000000A00000L});
+    public static final BitSet FOLLOW_81 = new BitSet(new long[]{0x0200000000000002L});
+    public static final BitSet FOLLOW_82 = new BitSet(new long[]{0x00000000000000C0L});
+    public static final BitSet FOLLOW_83 = new BitSet(new long[]{0x0000100000280100L});
+    public static final BitSet FOLLOW_84 = new BitSet(new long[]{0x0000100000000000L});
+    public static final BitSet FOLLOW_85 = new BitSet(new long[]{0x0000000080000002L});
+    public static final BitSet FOLLOW_86 = new BitSet(new long[]{0x0200000080000002L});
+    public static final BitSet FOLLOW_87 = new BitSet(new long[]{0x0000000000000002L,0x0000000000001100L});
+    public static final BitSet FOLLOW_88 = new BitSet(new long[]{0x0000000000000002L,0x0000000002000000L});
+    public static final BitSet FOLLOW_89 = new BitSet(new long[]{0x0200000000000000L});
+    public static final BitSet FOLLOW_90 = new BitSet(new long[]{0x0002000000000000L});
+    public static final BitSet FOLLOW_91 = new BitSet(new long[]{0x0000000000000100L,0x0000000000000200L});
+    public static final BitSet FOLLOW_92 = new BitSet(new long[]{0x0000000000000100L,0x0000000000000800L});
+    public static final BitSet FOLLOW_93 = new BitSet(new long[]{0x0002000000000100L});
+    public static final BitSet FOLLOW_94 = new BitSet(new long[]{0x2000000000000002L});
+    public static final BitSet FOLLOW_95 = new BitSet(new long[]{0x0000000000000102L});
 
 }
\ No newline at end of file
diff --git a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/serializer/AbstractCheckCfgSemanticSequencer.java b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/serializer/AbstractCheckCfgSemanticSequencer.java
index 1e98fade4..e97f5040f 100644
--- a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/serializer/AbstractCheckCfgSemanticSequencer.java
+++ b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/serializer/AbstractCheckCfgSemanticSequencer.java
@@ -11,8 +11,12 @@
 import com.avaloq.tools.ddk.checkcfg.checkcfg.ConfiguredParameter;
 import com.avaloq.tools.ddk.checkcfg.services.CheckCfgGrammarAccess;
 import com.google.inject.Inject;
-import com.google.inject.Provider;
+import java.util.Set;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.xtext.Action;
+import org.eclipse.xtext.Parameter;
+import org.eclipse.xtext.ParserRule;
 import org.eclipse.xtext.common.types.JvmFormalParameter;
 import org.eclipse.xtext.common.types.JvmGenericArrayTypeReference;
 import org.eclipse.xtext.common.types.JvmInnerTypeReference;
@@ -22,14 +26,8 @@
 import org.eclipse.xtext.common.types.JvmUpperBound;
 import org.eclipse.xtext.common.types.JvmWildcardTypeReference;
 import org.eclipse.xtext.common.types.TypesPackage;
-import org.eclipse.xtext.serializer.acceptor.ISemanticSequenceAcceptor;
+import org.eclipse.xtext.serializer.ISerializationContext;
 import org.eclipse.xtext.serializer.acceptor.SequenceFeeder;
-import org.eclipse.xtext.serializer.diagnostic.ISemanticSequencerDiagnosticProvider;
-import org.eclipse.xtext.serializer.diagnostic.ISerializationDiagnostic.Acceptor;
-import org.eclipse.xtext.serializer.sequencer.GenericSequencer;
-import org.eclipse.xtext.serializer.sequencer.ISemanticNodeProvider.INodesForEObjectProvider;
-import org.eclipse.xtext.serializer.sequencer.ISemanticSequencer;
-import org.eclipse.xtext.serializer.sequencer.ITransientValueService;
 import org.eclipse.xtext.serializer.sequencer.ITransientValueService.ValueTransient;
 import org.eclipse.xtext.xbase.XAssignment;
 import org.eclipse.xtext.xbase.XBasicForLoopExpression;
@@ -72,873 +70,462 @@
 @SuppressWarnings("all")
 public abstract class AbstractCheckCfgSemanticSequencer extends XbaseSemanticSequencer {
 
-  @Inject
-  private CheckCfgGrammarAccess grammarAccess;
-
-  @Override
-  public void createSequence(EObject context, EObject semanticObject) {
-  	if(semanticObject.eClass().getEPackage() == CheckcfgPackage.eINSTANCE) switch(semanticObject.eClass().getClassifierID()) {
-  		case CheckcfgPackage.CHECK_CONFIGURATION:
-  			sequence_CheckConfiguration(context, (CheckConfiguration) semanticObject); 
-  			return; 
-  		case CheckcfgPackage.CONFIGURED_CATALOG:
-  			sequence_ConfiguredCatalog(context, (ConfiguredCatalog) semanticObject); 
-  			return; 
-  		case CheckcfgPackage.CONFIGURED_CHECK:
-  			sequence_ConfiguredCheck(context, (ConfiguredCheck) semanticObject); 
-  			return; 
-  		case CheckcfgPackage.CONFIGURED_LANGUAGE_VALIDATOR:
-  			sequence_ConfiguredLanguageValidator(context, (ConfiguredLanguageValidator) semanticObject); 
-  			return; 
-  		case CheckcfgPackage.CONFIGURED_PARAMETER:
-  			sequence_ConfiguredParameter(context, (ConfiguredParameter) semanticObject); 
-  			return; 
-  		}
-  	else if(semanticObject.eClass().getEPackage() == TypesPackage.eINSTANCE) switch(semanticObject.eClass().getClassifierID()) {
-  		case TypesPackage.JVM_FORMAL_PARAMETER:
-  			if(context == grammarAccess.getFullJvmFormalParameterRule()) {
-  				sequence_FullJvmFormalParameter(context, (JvmFormalParameter) semanticObject); 
-  				return; 
-  			}
-  			else if(context == grammarAccess.getJvmFormalParameterRule()) {
-  				sequence_JvmFormalParameter(context, (JvmFormalParameter) semanticObject); 
-  				return; 
-  			}
-  			else break;
-  		case TypesPackage.JVM_GENERIC_ARRAY_TYPE_REFERENCE:
-  			sequence_JvmTypeReference(context, (JvmGenericArrayTypeReference) semanticObject); 
-  			return; 
-  		case TypesPackage.JVM_INNER_TYPE_REFERENCE:
-  			sequence_JvmParameterizedTypeReference(context, (JvmInnerTypeReference) semanticObject); 
-  			return; 
-  		case TypesPackage.JVM_LOWER_BOUND:
-  			if(context == grammarAccess.getJvmLowerBoundAndedRule()) {
-  				sequence_JvmLowerBoundAnded(context, (JvmLowerBound) semanticObject); 
-  				return; 
-  			}
-  			else if(context == grammarAccess.getJvmLowerBoundRule()) {
-  				sequence_JvmLowerBound(context, (JvmLowerBound) semanticObject); 
-  				return; 
-  			}
-  			else break;
-  		case TypesPackage.JVM_PARAMETERIZED_TYPE_REFERENCE:
-  			sequence_JvmParameterizedTypeReference(context, (JvmParameterizedTypeReference) semanticObject); 
-  			return; 
-  		case TypesPackage.JVM_TYPE_PARAMETER:
-  			sequence_JvmTypeParameter(context, (JvmTypeParameter) semanticObject); 
-  			return; 
-  		case TypesPackage.JVM_UPPER_BOUND:
-  			if(context == grammarAccess.getJvmUpperBoundAndedRule()) {
-  				sequence_JvmUpperBoundAnded(context, (JvmUpperBound) semanticObject); 
-  				return; 
-  			}
-  			else if(context == grammarAccess.getJvmUpperBoundRule()) {
-  				sequence_JvmUpperBound(context, (JvmUpperBound) semanticObject); 
-  				return; 
-  			}
-  			else break;
-  		case TypesPackage.JVM_WILDCARD_TYPE_REFERENCE:
-  			sequence_JvmWildcardTypeReference(context, (JvmWildcardTypeReference) semanticObject); 
-  			return; 
-  		}
-  	else if(semanticObject.eClass().getEPackage() == XbasePackage.eINSTANCE) switch(semanticObject.eClass().getClassifierID()) {
-  		case XbasePackage.XASSIGNMENT:
-  			sequence_XAssignment_XMemberFeatureCall(context, (XAssignment) semanticObject); 
-  			return; 
-  		case XbasePackage.XBASIC_FOR_LOOP_EXPRESSION:
-  			sequence_XBasicForLoopExpression(context, (XBasicForLoopExpression) semanticObject); 
-  			return; 
-  		case XbasePackage.XBINARY_OPERATION:
-  			sequence_XAdditiveExpression_XAndExpression_XAssignment_XEqualityExpression_XMultiplicativeExpression_XOrExpression_XOtherOperatorExpression_XRelationalExpression(context, (XBinaryOperation) semanticObject); 
-  			return; 
-  		case XbasePackage.XBLOCK_EXPRESSION:
-  			if(context == grammarAccess.getXAdditiveExpressionRule() ||
-  			   context == grammarAccess.getXAdditiveExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXAndExpressionRule() ||
-  			   context == grammarAccess.getXAndExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXAssignmentRule() ||
-  			   context == grammarAccess.getXAssignmentAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0() ||
-  			   context == grammarAccess.getXBlockExpressionRule() ||
-  			   context == grammarAccess.getXCastedExpressionRule() ||
-  			   context == grammarAccess.getXCastedExpressionAccess().getXCastedExpressionTargetAction_1_0_0_0() ||
-  			   context == grammarAccess.getXEqualityExpressionRule() ||
-  			   context == grammarAccess.getXEqualityExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXExpressionRule() ||
-  			   context == grammarAccess.getXExpressionOrVarDeclarationRule() ||
-  			   context == grammarAccess.getXMemberFeatureCallRule() ||
-  			   context == grammarAccess.getXMemberFeatureCallAccess().getXAssignmentAssignableAction_1_0_0_0_0() ||
-  			   context == grammarAccess.getXMemberFeatureCallAccess().getXMemberFeatureCallMemberCallTargetAction_1_1_0_0_0() ||
-  			   context == grammarAccess.getXMultiplicativeExpressionRule() ||
-  			   context == grammarAccess.getXMultiplicativeExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXOrExpressionRule() ||
-  			   context == grammarAccess.getXOrExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXOtherOperatorExpressionRule() ||
-  			   context == grammarAccess.getXOtherOperatorExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXParenthesizedExpressionRule() ||
-  			   context == grammarAccess.getXPostfixOperationRule() ||
-  			   context == grammarAccess.getXPostfixOperationAccess().getXPostfixOperationOperandAction_1_0_0() ||
-  			   context == grammarAccess.getXPrimaryExpressionRule() ||
-  			   context == grammarAccess.getXRelationalExpressionRule() ||
-  			   context == grammarAccess.getXRelationalExpressionAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0() ||
-  			   context == grammarAccess.getXRelationalExpressionAccess().getXInstanceOfExpressionExpressionAction_1_0_0_0_0() ||
-  			   context == grammarAccess.getXUnaryOperationRule()) {
-  				sequence_XBlockExpression(context, (XBlockExpression) semanticObject); 
-  				return; 
-  			}
-  			else if(context == grammarAccess.getXExpressionInClosureRule()) {
-  				sequence_XExpressionInClosure(context, (XBlockExpression) semanticObject); 
-  				return; 
-  			}
-  			else break;
-  		case XbasePackage.XBOOLEAN_LITERAL:
-  			sequence_XBooleanLiteral(context, (XBooleanLiteral) semanticObject); 
-  			return; 
-  		case XbasePackage.XCASE_PART:
-  			sequence_XCasePart(context, (XCasePart) semanticObject); 
-  			return; 
-  		case XbasePackage.XCASTED_EXPRESSION:
-  			sequence_XCastedExpression(context, (XCastedExpression) semanticObject); 
-  			return; 
-  		case XbasePackage.XCATCH_CLAUSE:
-  			sequence_XCatchClause(context, (XCatchClause) semanticObject); 
-  			return; 
-  		case XbasePackage.XCLOSURE:
-  			if(context == grammarAccess.getXAdditiveExpressionRule() ||
-  			   context == grammarAccess.getXAdditiveExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXAndExpressionRule() ||
-  			   context == grammarAccess.getXAndExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXAssignmentRule() ||
-  			   context == grammarAccess.getXAssignmentAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0() ||
-  			   context == grammarAccess.getXCastedExpressionRule() ||
-  			   context == grammarAccess.getXCastedExpressionAccess().getXCastedExpressionTargetAction_1_0_0_0() ||
-  			   context == grammarAccess.getXClosureRule() ||
-  			   context == grammarAccess.getXEqualityExpressionRule() ||
-  			   context == grammarAccess.getXEqualityExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXExpressionRule() ||
-  			   context == grammarAccess.getXExpressionOrVarDeclarationRule() ||
-  			   context == grammarAccess.getXLiteralRule() ||
-  			   context == grammarAccess.getXMemberFeatureCallRule() ||
-  			   context == grammarAccess.getXMemberFeatureCallAccess().getXAssignmentAssignableAction_1_0_0_0_0() ||
-  			   context == grammarAccess.getXMemberFeatureCallAccess().getXMemberFeatureCallMemberCallTargetAction_1_1_0_0_0() ||
-  			   context == grammarAccess.getXMultiplicativeExpressionRule() ||
-  			   context == grammarAccess.getXMultiplicativeExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXOrExpressionRule() ||
-  			   context == grammarAccess.getXOrExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXOtherOperatorExpressionRule() ||
-  			   context == grammarAccess.getXOtherOperatorExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXParenthesizedExpressionRule() ||
-  			   context == grammarAccess.getXPostfixOperationRule() ||
-  			   context == grammarAccess.getXPostfixOperationAccess().getXPostfixOperationOperandAction_1_0_0() ||
-  			   context == grammarAccess.getXPrimaryExpressionRule() ||
-  			   context == grammarAccess.getXRelationalExpressionRule() ||
-  			   context == grammarAccess.getXRelationalExpressionAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0() ||
-  			   context == grammarAccess.getXRelationalExpressionAccess().getXInstanceOfExpressionExpressionAction_1_0_0_0_0() ||
-  			   context == grammarAccess.getXUnaryOperationRule()) {
-  				sequence_XClosure(context, (XClosure) semanticObject); 
-  				return; 
-  			}
-  			else if(context == grammarAccess.getXShortClosureRule()) {
-  				sequence_XShortClosure(context, (XClosure) semanticObject); 
-  				return; 
-  			}
-  			else break;
-  		case XbasePackage.XCONSTRUCTOR_CALL:
-  			sequence_XConstructorCall(context, (XConstructorCall) semanticObject); 
-  			return; 
-  		case XbasePackage.XDO_WHILE_EXPRESSION:
-  			sequence_XDoWhileExpression(context, (XDoWhileExpression) semanticObject); 
-  			return; 
-  		case XbasePackage.XFEATURE_CALL:
-  			sequence_XFeatureCall(context, (XFeatureCall) semanticObject); 
-  			return; 
-  		case XbasePackage.XFOR_LOOP_EXPRESSION:
-  			sequence_XForLoopExpression(context, (XForLoopExpression) semanticObject); 
-  			return; 
-  		case XbasePackage.XIF_EXPRESSION:
-  			sequence_XIfExpression(context, (XIfExpression) semanticObject); 
-  			return; 
-  		case XbasePackage.XINSTANCE_OF_EXPRESSION:
-  			sequence_XRelationalExpression(context, (XInstanceOfExpression) semanticObject); 
-  			return; 
-  		case XbasePackage.XLIST_LITERAL:
-  			if(context == grammarAccess.getXConstantListLiteralRule() ||
-  			   context == grammarAccess.getXFormalParameterDefaultValueLiteralRule()) {
-  				sequence_XConstantListLiteral(context, (XListLiteral) semanticObject); 
-  				return; 
-  			}
-  			else if(context == grammarAccess.getXAdditiveExpressionRule() ||
-  			   context == grammarAccess.getXAdditiveExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXAndExpressionRule() ||
-  			   context == grammarAccess.getXAndExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXAssignmentRule() ||
-  			   context == grammarAccess.getXAssignmentAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0() ||
-  			   context == grammarAccess.getXCastedExpressionRule() ||
-  			   context == grammarAccess.getXCastedExpressionAccess().getXCastedExpressionTargetAction_1_0_0_0() ||
-  			   context == grammarAccess.getXCollectionLiteralRule() ||
-  			   context == grammarAccess.getXEqualityExpressionRule() ||
-  			   context == grammarAccess.getXEqualityExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXExpressionRule() ||
-  			   context == grammarAccess.getXExpressionOrVarDeclarationRule() ||
-  			   context == grammarAccess.getXListLiteralRule() ||
-  			   context == grammarAccess.getXLiteralRule() ||
-  			   context == grammarAccess.getXMemberFeatureCallRule() ||
-  			   context == grammarAccess.getXMemberFeatureCallAccess().getXAssignmentAssignableAction_1_0_0_0_0() ||
-  			   context == grammarAccess.getXMemberFeatureCallAccess().getXMemberFeatureCallMemberCallTargetAction_1_1_0_0_0() ||
-  			   context == grammarAccess.getXMultiplicativeExpressionRule() ||
-  			   context == grammarAccess.getXMultiplicativeExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXOrExpressionRule() ||
-  			   context == grammarAccess.getXOrExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXOtherOperatorExpressionRule() ||
-  			   context == grammarAccess.getXOtherOperatorExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXParenthesizedExpressionRule() ||
-  			   context == grammarAccess.getXPostfixOperationRule() ||
-  			   context == grammarAccess.getXPostfixOperationAccess().getXPostfixOperationOperandAction_1_0_0() ||
-  			   context == grammarAccess.getXPrimaryExpressionRule() ||
-  			   context == grammarAccess.getXRelationalExpressionRule() ||
-  			   context == grammarAccess.getXRelationalExpressionAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0() ||
-  			   context == grammarAccess.getXRelationalExpressionAccess().getXInstanceOfExpressionExpressionAction_1_0_0_0_0() ||
-  			   context == grammarAccess.getXUnaryOperationRule()) {
-  				sequence_XListLiteral(context, (XListLiteral) semanticObject); 
-  				return; 
-  			}
-  			else break;
-  		case XbasePackage.XMEMBER_FEATURE_CALL:
-  			sequence_XMemberFeatureCall(context, (XMemberFeatureCall) semanticObject); 
-  			return; 
-  		case XbasePackage.XNULL_LITERAL:
-  			sequence_XNullLiteral(context, (XNullLiteral) semanticObject); 
-  			return; 
-  		case XbasePackage.XNUMBER_LITERAL:
-  			sequence_XNumberLiteral(context, (XNumberLiteral) semanticObject); 
-  			return; 
-  		case XbasePackage.XPOSTFIX_OPERATION:
-  			sequence_XPostfixOperation(context, (XPostfixOperation) semanticObject); 
-  			return; 
-  		case XbasePackage.XRETURN_EXPRESSION:
-  			sequence_XReturnExpression(context, (XReturnExpression) semanticObject); 
-  			return; 
-  		case XbasePackage.XSET_LITERAL:
-  			sequence_XSetLiteral(context, (XSetLiteral) semanticObject); 
-  			return; 
-  		case XbasePackage.XSTRING_LITERAL:
-  			sequence_XStringLiteral(context, (XStringLiteral) semanticObject); 
-  			return; 
-  		case XbasePackage.XSWITCH_EXPRESSION:
-  			sequence_XSwitchExpression(context, (XSwitchExpression) semanticObject); 
-  			return; 
-  		case XbasePackage.XSYNCHRONIZED_EXPRESSION:
-  			sequence_XSynchronizedExpression(context, (XSynchronizedExpression) semanticObject); 
-  			return; 
-  		case XbasePackage.XTHROW_EXPRESSION:
-  			sequence_XThrowExpression(context, (XThrowExpression) semanticObject); 
-  			return; 
-  		case XbasePackage.XTRY_CATCH_FINALLY_EXPRESSION:
-  			sequence_XTryCatchFinallyExpression(context, (XTryCatchFinallyExpression) semanticObject); 
-  			return; 
-  		case XbasePackage.XTYPE_LITERAL:
-  			sequence_XTypeLiteral(context, (XTypeLiteral) semanticObject); 
-  			return; 
-  		case XbasePackage.XUNARY_OPERATION:
-  			if(context == grammarAccess.getXConstantUnaryOperationRule() ||
-  			   context == grammarAccess.getXFormalParameterDefaultValueLiteralRule()) {
-  				sequence_XConstantUnaryOperation(context, (XUnaryOperation) semanticObject); 
-  				return; 
-  			}
-  			else if(context == grammarAccess.getXAdditiveExpressionRule() ||
-  			   context == grammarAccess.getXAdditiveExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXAndExpressionRule() ||
-  			   context == grammarAccess.getXAndExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXAssignmentRule() ||
-  			   context == grammarAccess.getXAssignmentAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0() ||
-  			   context == grammarAccess.getXCastedExpressionRule() ||
-  			   context == grammarAccess.getXCastedExpressionAccess().getXCastedExpressionTargetAction_1_0_0_0() ||
-  			   context == grammarAccess.getXEqualityExpressionRule() ||
-  			   context == grammarAccess.getXEqualityExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXExpressionRule() ||
-  			   context == grammarAccess.getXExpressionOrVarDeclarationRule() ||
-  			   context == grammarAccess.getXMemberFeatureCallRule() ||
-  			   context == grammarAccess.getXMemberFeatureCallAccess().getXAssignmentAssignableAction_1_0_0_0_0() ||
-  			   context == grammarAccess.getXMemberFeatureCallAccess().getXMemberFeatureCallMemberCallTargetAction_1_1_0_0_0() ||
-  			   context == grammarAccess.getXMultiplicativeExpressionRule() ||
-  			   context == grammarAccess.getXMultiplicativeExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXOrExpressionRule() ||
-  			   context == grammarAccess.getXOrExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXOtherOperatorExpressionRule() ||
-  			   context == grammarAccess.getXOtherOperatorExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-  			   context == grammarAccess.getXParenthesizedExpressionRule() ||
-  			   context == grammarAccess.getXPostfixOperationRule() ||
-  			   context == grammarAccess.getXPostfixOperationAccess().getXPostfixOperationOperandAction_1_0_0() ||
-  			   context == grammarAccess.getXPrimaryExpressionRule() ||
-  			   context == grammarAccess.getXRelationalExpressionRule() ||
-  			   context == grammarAccess.getXRelationalExpressionAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0() ||
-  			   context == grammarAccess.getXRelationalExpressionAccess().getXInstanceOfExpressionExpressionAction_1_0_0_0_0() ||
-  			   context == grammarAccess.getXUnaryOperationRule()) {
-  				sequence_XUnaryOperation(context, (XUnaryOperation) semanticObject); 
-  				return; 
-  			}
-  			else break;
-  		case XbasePackage.XVARIABLE_DECLARATION:
-  			sequence_XVariableDeclaration(context, (XVariableDeclaration) semanticObject); 
-  			return; 
-  		case XbasePackage.XWHILE_EXPRESSION:
-  			sequence_XWhileExpression(context, (XWhileExpression) semanticObject); 
-  			return; 
-  		}
-  	else if(semanticObject.eClass().getEPackage() == XtypePackage.eINSTANCE) switch(semanticObject.eClass().getClassifierID()) {
-  		case XtypePackage.XFUNCTION_TYPE_REF:
-  			sequence_XFunctionTypeRef(context, (XFunctionTypeRef) semanticObject); 
-  			return; 
-  		case XtypePackage.XIMPORT_DECLARATION:
-  			sequence_XImportDeclaration(context, (XImportDeclaration) semanticObject); 
-  			return; 
-  		case XtypePackage.XIMPORT_SECTION:
-  			sequence_XImportSection(context, (XImportSection) semanticObject); 
-  			return; 
-  		}
-  	if (errorAcceptor != null) errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
-  }
-
-  /**
-   * Constraint:
-   *     (
-   *         name=ValidID 
-   *         parameterConfigurations+=ConfiguredParameter* 
-   *         languageValidatorConfigurations+=ConfiguredLanguageValidator* 
-   *         legacyCatalogConfigurations+=ConfiguredCatalog*
-   *     )
-   */
-  protected void sequence_CheckConfiguration(EObject context, CheckConfiguration semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (catalog=[CheckCatalog|QualifiedName] parameterConfigurations+=ConfiguredParameter* checkConfigurations+=ConfiguredCheck*)
-   */
-  protected void sequence_ConfiguredCatalog(EObject context, ConfiguredCatalog semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (
-   *         severity=SeverityKind 
-   *         check=[Check|QualifiedName] 
-   *         (parameterConfigurations+=ConfiguredParameter parameterConfigurations+=ConfiguredParameter*)?
-   *     )
-   */
-  protected void sequence_ConfiguredCheck(EObject context, ConfiguredCheck semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (language=QualifiedName parameterConfigurations+=ConfiguredParameter* catalogConfigurations+=ConfiguredCatalog*)
-   */
-  protected void sequence_ConfiguredLanguageValidator(EObject context, ConfiguredLanguageValidator semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (parameter=[FormalParameter|ValidID] newValue=XFormalParameterDefaultValueLiteral)
-   */
-  protected void sequence_ConfiguredParameter(EObject context, ConfiguredParameter semanticObject) {
-  	if(errorAcceptor != null) {
-  		if(transientValues.isValueTransient(semanticObject, CheckcfgPackage.Literals.CONFIGURED_PARAMETER__PARAMETER) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CheckcfgPackage.Literals.CONFIGURED_PARAMETER__PARAMETER));
-  		if(transientValues.isValueTransient(semanticObject, CheckcfgPackage.Literals.CONFIGURED_PARAMETER__NEW_VALUE) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CheckcfgPackage.Literals.CONFIGURED_PARAMETER__NEW_VALUE));
-  	}
-  	INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-  	SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-  	feeder.accept(grammarAccess.getConfiguredParameterAccess().getParameterFormalParameterValidIDParserRuleCall_1_0_1(), semanticObject.getParameter());
-  	feeder.accept(grammarAccess.getConfiguredParameterAccess().getNewValueXFormalParameterDefaultValueLiteralParserRuleCall_3_0(), semanticObject.getNewValue());
-  	feeder.finish();
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (
-   *         (leftOperand=XAdditiveExpression_XBinaryOperation_1_0_0_0 feature=[JvmIdentifiableElement|OpAdd] rightOperand=XMultiplicativeExpression) | 
-   *         (leftOperand=XMultiplicativeExpression_XBinaryOperation_1_0_0_0 feature=[JvmIdentifiableElement|OpMulti] rightOperand=XUnaryOperation) | 
-   *         (leftOperand=XOtherOperatorExpression_XBinaryOperation_1_0_0_0 feature=[JvmIdentifiableElement|OpOther] rightOperand=XAdditiveExpression) | 
-   *         (leftOperand=XRelationalExpression_XBinaryOperation_1_1_0_0_0 feature=[JvmIdentifiableElement|OpCompare] rightOperand=XOtherOperatorExpression) | 
-   *         (leftOperand=XEqualityExpression_XBinaryOperation_1_0_0_0 feature=[JvmIdentifiableElement|OpEquality] rightOperand=XRelationalExpression) | 
-   *         (leftOperand=XAndExpression_XBinaryOperation_1_0_0_0 feature=[JvmIdentifiableElement|OpAnd] rightOperand=XEqualityExpression) | 
-   *         (leftOperand=XOrExpression_XBinaryOperation_1_0_0_0 feature=[JvmIdentifiableElement|OpOr] rightOperand=XAndExpression) | 
-   *         (leftOperand=XAssignment_XBinaryOperation_1_1_0_0_0 feature=[JvmIdentifiableElement|OpMultiAssign] rightOperand=XAssignment)
-   *     )
-   */
-  protected void sequence_XAdditiveExpression_XAndExpression_XAssignment_XEqualityExpression_XMultiplicativeExpression_XOrExpression_XOtherOperatorExpression_XRelationalExpression(EObject context, XBinaryOperation semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (
-   *         (feature=[JvmIdentifiableElement|FeatureCallID] value=XAssignment) | 
-   *         (assignable=XMemberFeatureCall_XAssignment_1_0_0_0_0 explicitStatic?='::'? feature=[JvmIdentifiableElement|FeatureCallID] value=XAssignment)
-   *     )
-   */
-  protected void sequence_XAssignment_XMemberFeatureCall(EObject context, XAssignment semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (
-   *         (initExpressions+=XExpressionOrVarDeclaration initExpressions+=XExpressionOrVarDeclaration*)? 
-   *         expression=XExpression? 
-   *         (updateExpressions+=XExpression updateExpressions+=XExpression*)? 
-   *         eachExpression=XExpression
-   *     )
-   */
-  protected void sequence_XBasicForLoopExpression(EObject context, XBasicForLoopExpression semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (expressions+=XExpressionOrVarDeclaration*)
-   */
-  protected void sequence_XBlockExpression(EObject context, XBlockExpression semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (isTrue?='true'?)
-   */
-  protected void sequence_XBooleanLiteral(EObject context, XBooleanLiteral semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (typeGuard=JvmTypeReference? case=XExpression? (then=XExpression | fallThrough?=','))
-   */
-  protected void sequence_XCasePart(EObject context, XCasePart semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (target=XCastedExpression_XCastedExpression_1_0_0_0 type=JvmTypeReference)
-   */
-  protected void sequence_XCastedExpression(EObject context, XCastedExpression semanticObject) {
-  	if(errorAcceptor != null) {
-  		if(transientValues.isValueTransient(semanticObject, XbasePackage.Literals.XCASTED_EXPRESSION__TYPE) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, XbasePackage.Literals.XCASTED_EXPRESSION__TYPE));
-  		if(transientValues.isValueTransient(semanticObject, XbasePackage.Literals.XCASTED_EXPRESSION__TARGET) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, XbasePackage.Literals.XCASTED_EXPRESSION__TARGET));
-  	}
-  	INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-  	SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-  	feeder.accept(grammarAccess.getXCastedExpressionAccess().getXCastedExpressionTargetAction_1_0_0_0(), semanticObject.getTarget());
-  	feeder.accept(grammarAccess.getXCastedExpressionAccess().getTypeJvmTypeReferenceParserRuleCall_1_1_0(), semanticObject.getType());
-  	feeder.finish();
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (declaredParam=FullJvmFormalParameter expression=XExpression)
-   */
-  protected void sequence_XCatchClause(EObject context, XCatchClause semanticObject) {
-  	if(errorAcceptor != null) {
-  		if(transientValues.isValueTransient(semanticObject, XbasePackage.Literals.XCATCH_CLAUSE__EXPRESSION) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, XbasePackage.Literals.XCATCH_CLAUSE__EXPRESSION));
-  		if(transientValues.isValueTransient(semanticObject, XbasePackage.Literals.XCATCH_CLAUSE__DECLARED_PARAM) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, XbasePackage.Literals.XCATCH_CLAUSE__DECLARED_PARAM));
-  	}
-  	INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-  	SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-  	feeder.accept(grammarAccess.getXCatchClauseAccess().getDeclaredParamFullJvmFormalParameterParserRuleCall_2_0(), semanticObject.getDeclaredParam());
-  	feeder.accept(grammarAccess.getXCatchClauseAccess().getExpressionXExpressionParserRuleCall_4_0(), semanticObject.getExpression());
-  	feeder.finish();
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (
-   *         ((declaredFormalParameters+=JvmFormalParameter declaredFormalParameters+=JvmFormalParameter*)? explicitSyntax?='|')? 
-   *         expression=XExpressionInClosure
-   *     )
-   */
-  protected void sequence_XClosure(EObject context, XClosure semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     ((elements+=XConstantUnaryOperation elements+=XConstantUnaryOperation*)?)
-   */
-  protected void sequence_XConstantListLiteral(EObject context, XListLiteral semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (feature=[JvmIdentifiableElement|OpUnary] operand=XConstantUnaryOperation)
-   */
-  protected void sequence_XConstantUnaryOperation(EObject context, XUnaryOperation semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (
-   *         constructor=[JvmConstructor|QualifiedName] 
-   *         (typeArguments+=JvmArgumentTypeReference typeArguments+=JvmArgumentTypeReference*)? 
-   *         (explicitConstructorCall?='(' (arguments+=XShortClosure | (arguments+=XExpression arguments+=XExpression*))?)? 
-   *         arguments+=XClosure?
-   *     )
-   */
-  protected void sequence_XConstructorCall(EObject context, XConstructorCall semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (body=XExpression predicate=XExpression)
-   */
-  protected void sequence_XDoWhileExpression(EObject context, XDoWhileExpression semanticObject) {
-  	if(errorAcceptor != null) {
-  		if(transientValues.isValueTransient(semanticObject, XbasePackage.Literals.XABSTRACT_WHILE_EXPRESSION__PREDICATE) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, XbasePackage.Literals.XABSTRACT_WHILE_EXPRESSION__PREDICATE));
-  		if(transientValues.isValueTransient(semanticObject, XbasePackage.Literals.XABSTRACT_WHILE_EXPRESSION__BODY) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, XbasePackage.Literals.XABSTRACT_WHILE_EXPRESSION__BODY));
-  	}
-  	INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-  	SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-  	feeder.accept(grammarAccess.getXDoWhileExpressionAccess().getBodyXExpressionParserRuleCall_2_0(), semanticObject.getBody());
-  	feeder.accept(grammarAccess.getXDoWhileExpressionAccess().getPredicateXExpressionParserRuleCall_5_0(), semanticObject.getPredicate());
-  	feeder.finish();
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (expressions+=XExpressionOrVarDeclaration*)
-   */
-  protected void sequence_XExpressionInClosure(EObject context, XBlockExpression semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (
-   *         (typeArguments+=JvmArgumentTypeReference typeArguments+=JvmArgumentTypeReference*)? 
-   *         feature=[JvmIdentifiableElement|IdOrSuper] 
-   *         (explicitOperationCall?='(' (featureCallArguments+=XShortClosure | (featureCallArguments+=XExpression featureCallArguments+=XExpression*))?)? 
-   *         featureCallArguments+=XClosure?
-   *     )
-   */
-  protected void sequence_XFeatureCall(EObject context, XFeatureCall semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (declaredParam=JvmFormalParameter forExpression=XExpression eachExpression=XExpression)
-   */
-  protected void sequence_XForLoopExpression(EObject context, XForLoopExpression semanticObject) {
-  	if(errorAcceptor != null) {
-  		if(transientValues.isValueTransient(semanticObject, XbasePackage.Literals.XFOR_LOOP_EXPRESSION__FOR_EXPRESSION) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, XbasePackage.Literals.XFOR_LOOP_EXPRESSION__FOR_EXPRESSION));
-  		if(transientValues.isValueTransient(semanticObject, XbasePackage.Literals.XFOR_LOOP_EXPRESSION__EACH_EXPRESSION) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, XbasePackage.Literals.XFOR_LOOP_EXPRESSION__EACH_EXPRESSION));
-  		if(transientValues.isValueTransient(semanticObject, XbasePackage.Literals.XFOR_LOOP_EXPRESSION__DECLARED_PARAM) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, XbasePackage.Literals.XFOR_LOOP_EXPRESSION__DECLARED_PARAM));
-  	}
-  	INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-  	SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-  	feeder.accept(grammarAccess.getXForLoopExpressionAccess().getDeclaredParamJvmFormalParameterParserRuleCall_0_0_3_0(), semanticObject.getDeclaredParam());
-  	feeder.accept(grammarAccess.getXForLoopExpressionAccess().getForExpressionXExpressionParserRuleCall_1_0(), semanticObject.getForExpression());
-  	feeder.accept(grammarAccess.getXForLoopExpressionAccess().getEachExpressionXExpressionParserRuleCall_3_0(), semanticObject.getEachExpression());
-  	feeder.finish();
-  }
-  
-  
-  /**
-   * Constraint:
-   *     ((paramTypes+=JvmTypeReference paramTypes+=JvmTypeReference*)? returnType=JvmTypeReference)
-   */
-  protected void sequence_XFunctionTypeRef(EObject context, XFunctionTypeRef semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (if=XExpression then=XExpression else=XExpression?)
-   */
-  protected void sequence_XIfExpression(EObject context, XIfExpression semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (
-   *         (static?='static' extension?='extension'? importedType=[JvmDeclaredType|QualifiedNameInStaticImport] (wildcard?='*' | memberName=ValidID)) | 
-   *         importedType=[JvmDeclaredType|QualifiedName] | 
-   *         importedNamespace=QualifiedNameWithWildcard
-   *     )
-   */
-  protected void sequence_XImportDeclaration(EObject context, XImportDeclaration semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     importDeclarations+=XImportDeclaration+
-   */
-  protected void sequence_XImportSection(EObject context, XImportSection semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     ((elements+=XExpression elements+=XExpression*)?)
-   */
-  protected void sequence_XListLiteral(EObject context, XListLiteral semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (
-   *         memberCallTarget=XMemberFeatureCall_XMemberFeatureCall_1_1_0_0_0 
-   *         (nullSafe?='?.' | explicitStatic?='::')? 
-   *         (typeArguments+=JvmArgumentTypeReference typeArguments+=JvmArgumentTypeReference*)? 
-   *         feature=[JvmIdentifiableElement|IdOrSuper] 
-   *         (explicitOperationCall?='(' (memberCallArguments+=XShortClosure | (memberCallArguments+=XExpression memberCallArguments+=XExpression*))?)? 
-   *         memberCallArguments+=XClosure?
-   *     )
-   */
-  protected void sequence_XMemberFeatureCall(EObject context, XMemberFeatureCall semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     {XNullLiteral}
-   */
-  protected void sequence_XNullLiteral(EObject context, XNullLiteral semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     value=Number
-   */
-  protected void sequence_XNumberLiteral(EObject context, XNumberLiteral semanticObject) {
-  	if(errorAcceptor != null) {
-  		if(transientValues.isValueTransient(semanticObject, XbasePackage.Literals.XNUMBER_LITERAL__VALUE) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, XbasePackage.Literals.XNUMBER_LITERAL__VALUE));
-  	}
-  	INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-  	SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-  	feeder.accept(grammarAccess.getXNumberLiteralAccess().getValueNumberParserRuleCall_1_0(), semanticObject.getValue());
-  	feeder.finish();
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (operand=XPostfixOperation_XPostfixOperation_1_0_0 feature=[JvmIdentifiableElement|OpPostfix])
-   */
-  protected void sequence_XPostfixOperation(EObject context, XPostfixOperation semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (expression=XRelationalExpression_XInstanceOfExpression_1_0_0_0_0 type=JvmTypeReference)
-   */
-  protected void sequence_XRelationalExpression(EObject context, XInstanceOfExpression semanticObject) {
-  	if(errorAcceptor != null) {
-  		if(transientValues.isValueTransient(semanticObject, XbasePackage.Literals.XINSTANCE_OF_EXPRESSION__TYPE) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, XbasePackage.Literals.XINSTANCE_OF_EXPRESSION__TYPE));
-  		if(transientValues.isValueTransient(semanticObject, XbasePackage.Literals.XINSTANCE_OF_EXPRESSION__EXPRESSION) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, XbasePackage.Literals.XINSTANCE_OF_EXPRESSION__EXPRESSION));
-  	}
-  	INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-  	SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-  	feeder.accept(grammarAccess.getXRelationalExpressionAccess().getXInstanceOfExpressionExpressionAction_1_0_0_0_0(), semanticObject.getExpression());
-  	feeder.accept(grammarAccess.getXRelationalExpressionAccess().getTypeJvmTypeReferenceParserRuleCall_1_0_1_0(), semanticObject.getType());
-  	feeder.finish();
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (expression=XExpression?)
-   */
-  protected void sequence_XReturnExpression(EObject context, XReturnExpression semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     ((elements+=XExpression elements+=XExpression*)?)
-   */
-  protected void sequence_XSetLiteral(EObject context, XSetLiteral semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     ((declaredFormalParameters+=JvmFormalParameter declaredFormalParameters+=JvmFormalParameter*)? explicitSyntax?='|' expression=XExpression)
-   */
-  protected void sequence_XShortClosure(EObject context, XClosure semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     value=STRING
-   */
-  protected void sequence_XStringLiteral(EObject context, XStringLiteral semanticObject) {
-  	if(errorAcceptor != null) {
-  		if(transientValues.isValueTransient(semanticObject, XbasePackage.Literals.XSTRING_LITERAL__VALUE) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, XbasePackage.Literals.XSTRING_LITERAL__VALUE));
-  	}
-  	INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-  	SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-  	feeder.accept(grammarAccess.getXStringLiteralAccess().getValueSTRINGTerminalRuleCall_1_0(), semanticObject.getValue());
-  	feeder.finish();
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (
-   *         ((declaredParam=JvmFormalParameter switch=XExpression) | (declaredParam=JvmFormalParameter? switch=XExpression)) 
-   *         cases+=XCasePart* 
-   *         default=XExpression?
-   *     )
-   */
-  protected void sequence_XSwitchExpression(EObject context, XSwitchExpression semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (param=XExpression expression=XExpression)
-   */
-  protected void sequence_XSynchronizedExpression(EObject context, XSynchronizedExpression semanticObject) {
-  	if(errorAcceptor != null) {
-  		if(transientValues.isValueTransient(semanticObject, XbasePackage.Literals.XSYNCHRONIZED_EXPRESSION__PARAM) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, XbasePackage.Literals.XSYNCHRONIZED_EXPRESSION__PARAM));
-  		if(transientValues.isValueTransient(semanticObject, XbasePackage.Literals.XSYNCHRONIZED_EXPRESSION__EXPRESSION) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, XbasePackage.Literals.XSYNCHRONIZED_EXPRESSION__EXPRESSION));
-  	}
-  	INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-  	SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-  	feeder.accept(grammarAccess.getXSynchronizedExpressionAccess().getParamXExpressionParserRuleCall_1_0(), semanticObject.getParam());
-  	feeder.accept(grammarAccess.getXSynchronizedExpressionAccess().getExpressionXExpressionParserRuleCall_3_0(), semanticObject.getExpression());
-  	feeder.finish();
-  }
-  
-  
-  /**
-   * Constraint:
-   *     expression=XExpression
-   */
-  protected void sequence_XThrowExpression(EObject context, XThrowExpression semanticObject) {
-  	if(errorAcceptor != null) {
-  		if(transientValues.isValueTransient(semanticObject, XbasePackage.Literals.XTHROW_EXPRESSION__EXPRESSION) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, XbasePackage.Literals.XTHROW_EXPRESSION__EXPRESSION));
-  	}
-  	INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-  	SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-  	feeder.accept(grammarAccess.getXThrowExpressionAccess().getExpressionXExpressionParserRuleCall_2_0(), semanticObject.getExpression());
-  	feeder.finish();
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (expression=XExpression ((catchClauses+=XCatchClause+ finallyExpression=XExpression?) | finallyExpression=XExpression))
-   */
-  protected void sequence_XTryCatchFinallyExpression(EObject context, XTryCatchFinallyExpression semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (type=[JvmType|QualifiedName] arrayDimensions+=ArrayBrackets*)
-   */
-  protected void sequence_XTypeLiteral(EObject context, XTypeLiteral semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (feature=[JvmIdentifiableElement|OpUnary] operand=XUnaryOperation)
-   */
-  protected void sequence_XUnaryOperation(EObject context, XUnaryOperation semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (writeable?='var'? ((type=JvmTypeReference name=ValidID) | name=ValidID) right=XExpression?)
-   */
-  protected void sequence_XVariableDeclaration(EObject context, XVariableDeclaration semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (predicate=XExpression body=XExpression)
-   */
-  protected void sequence_XWhileExpression(EObject context, XWhileExpression semanticObject) {
-  	if(errorAcceptor != null) {
-  		if(transientValues.isValueTransient(semanticObject, XbasePackage.Literals.XABSTRACT_WHILE_EXPRESSION__PREDICATE) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, XbasePackage.Literals.XABSTRACT_WHILE_EXPRESSION__PREDICATE));
-  		if(transientValues.isValueTransient(semanticObject, XbasePackage.Literals.XABSTRACT_WHILE_EXPRESSION__BODY) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, XbasePackage.Literals.XABSTRACT_WHILE_EXPRESSION__BODY));
-  	}
-  	INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-  	SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-  	feeder.accept(grammarAccess.getXWhileExpressionAccess().getPredicateXExpressionParserRuleCall_3_0(), semanticObject.getPredicate());
-  	feeder.accept(grammarAccess.getXWhileExpressionAccess().getBodyXExpressionParserRuleCall_5_0(), semanticObject.getBody());
-  	feeder.finish();
-  }
+	@Inject
+	private CheckCfgGrammarAccess grammarAccess;
+	
+	@Override
+	public void sequence(ISerializationContext context, EObject semanticObject) {
+		EPackage epackage = semanticObject.eClass().getEPackage();
+		ParserRule rule = context.getParserRule();
+		Action action = context.getAssignedAction();
+		Set<Parameter> parameters = context.getEnabledBooleanParameters();
+		if (epackage == CheckcfgPackage.eINSTANCE)
+			switch (semanticObject.eClass().getClassifierID()) {
+			case CheckcfgPackage.CHECK_CONFIGURATION:
+				sequence_CheckConfiguration(context, (CheckConfiguration) semanticObject); 
+				return; 
+			case CheckcfgPackage.CONFIGURED_CATALOG:
+				sequence_ConfiguredCatalog(context, (ConfiguredCatalog) semanticObject); 
+				return; 
+			case CheckcfgPackage.CONFIGURED_CHECK:
+				sequence_ConfiguredCheck(context, (ConfiguredCheck) semanticObject); 
+				return; 
+			case CheckcfgPackage.CONFIGURED_LANGUAGE_VALIDATOR:
+				sequence_ConfiguredLanguageValidator(context, (ConfiguredLanguageValidator) semanticObject); 
+				return; 
+			case CheckcfgPackage.CONFIGURED_PARAMETER:
+				sequence_ConfiguredParameter(context, (ConfiguredParameter) semanticObject); 
+				return; 
+			}
+		else if (epackage == TypesPackage.eINSTANCE)
+			switch (semanticObject.eClass().getClassifierID()) {
+			case TypesPackage.JVM_FORMAL_PARAMETER:
+				if (rule == grammarAccess.getFullJvmFormalParameterRule()) {
+					sequence_FullJvmFormalParameter(context, (JvmFormalParameter) semanticObject); 
+					return; 
+				}
+				else if (rule == grammarAccess.getJvmFormalParameterRule()) {
+					sequence_JvmFormalParameter(context, (JvmFormalParameter) semanticObject); 
+					return; 
+				}
+				else break;
+			case TypesPackage.JVM_GENERIC_ARRAY_TYPE_REFERENCE:
+				sequence_JvmTypeReference(context, (JvmGenericArrayTypeReference) semanticObject); 
+				return; 
+			case TypesPackage.JVM_INNER_TYPE_REFERENCE:
+				sequence_JvmParameterizedTypeReference(context, (JvmInnerTypeReference) semanticObject); 
+				return; 
+			case TypesPackage.JVM_LOWER_BOUND:
+				if (rule == grammarAccess.getJvmLowerBoundAndedRule()) {
+					sequence_JvmLowerBoundAnded(context, (JvmLowerBound) semanticObject); 
+					return; 
+				}
+				else if (rule == grammarAccess.getJvmLowerBoundRule()) {
+					sequence_JvmLowerBound(context, (JvmLowerBound) semanticObject); 
+					return; 
+				}
+				else break;
+			case TypesPackage.JVM_PARAMETERIZED_TYPE_REFERENCE:
+				if (action == grammarAccess.getJvmParameterizedTypeReferenceAccess().getJvmInnerTypeReferenceOuterAction_1_4_0_0_0()) {
+					sequence_JvmParameterizedTypeReference_JvmInnerTypeReference_1_4_0_0_0(context, (JvmParameterizedTypeReference) semanticObject); 
+					return; 
+				}
+				else if (rule == grammarAccess.getJvmTypeReferenceRule()
+						|| action == grammarAccess.getJvmTypeReferenceAccess().getJvmGenericArrayTypeReferenceComponentTypeAction_0_1_0_0()
+						|| rule == grammarAccess.getJvmParameterizedTypeReferenceRule()
+						|| rule == grammarAccess.getJvmArgumentTypeReferenceRule()) {
+					sequence_JvmParameterizedTypeReference(context, (JvmParameterizedTypeReference) semanticObject); 
+					return; 
+				}
+				else break;
+			case TypesPackage.JVM_TYPE_PARAMETER:
+				sequence_JvmTypeParameter(context, (JvmTypeParameter) semanticObject); 
+				return; 
+			case TypesPackage.JVM_UPPER_BOUND:
+				if (rule == grammarAccess.getJvmUpperBoundAndedRule()) {
+					sequence_JvmUpperBoundAnded(context, (JvmUpperBound) semanticObject); 
+					return; 
+				}
+				else if (rule == grammarAccess.getJvmUpperBoundRule()) {
+					sequence_JvmUpperBound(context, (JvmUpperBound) semanticObject); 
+					return; 
+				}
+				else break;
+			case TypesPackage.JVM_WILDCARD_TYPE_REFERENCE:
+				sequence_JvmWildcardTypeReference(context, (JvmWildcardTypeReference) semanticObject); 
+				return; 
+			}
+		else if (epackage == XbasePackage.eINSTANCE)
+			switch (semanticObject.eClass().getClassifierID()) {
+			case XbasePackage.XASSIGNMENT:
+				sequence_XAssignment_XMemberFeatureCall(context, (XAssignment) semanticObject); 
+				return; 
+			case XbasePackage.XBASIC_FOR_LOOP_EXPRESSION:
+				sequence_XBasicForLoopExpression(context, (XBasicForLoopExpression) semanticObject); 
+				return; 
+			case XbasePackage.XBINARY_OPERATION:
+				sequence_XAdditiveExpression_XAndExpression_XAssignment_XEqualityExpression_XMultiplicativeExpression_XOrExpression_XOtherOperatorExpression_XRelationalExpression(context, (XBinaryOperation) semanticObject); 
+				return; 
+			case XbasePackage.XBLOCK_EXPRESSION:
+				if (rule == grammarAccess.getXExpressionRule()
+						|| rule == grammarAccess.getXAssignmentRule()
+						|| action == grammarAccess.getXAssignmentAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0()
+						|| rule == grammarAccess.getXOrExpressionRule()
+						|| action == grammarAccess.getXOrExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXAndExpressionRule()
+						|| action == grammarAccess.getXAndExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXEqualityExpressionRule()
+						|| action == grammarAccess.getXEqualityExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXRelationalExpressionRule()
+						|| action == grammarAccess.getXRelationalExpressionAccess().getXInstanceOfExpressionExpressionAction_1_0_0_0_0()
+						|| action == grammarAccess.getXRelationalExpressionAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0()
+						|| rule == grammarAccess.getXOtherOperatorExpressionRule()
+						|| action == grammarAccess.getXOtherOperatorExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXAdditiveExpressionRule()
+						|| action == grammarAccess.getXAdditiveExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXMultiplicativeExpressionRule()
+						|| action == grammarAccess.getXMultiplicativeExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXUnaryOperationRule()
+						|| rule == grammarAccess.getXCastedExpressionRule()
+						|| action == grammarAccess.getXCastedExpressionAccess().getXCastedExpressionTargetAction_1_0_0_0()
+						|| rule == grammarAccess.getXPostfixOperationRule()
+						|| action == grammarAccess.getXPostfixOperationAccess().getXPostfixOperationOperandAction_1_0_0()
+						|| rule == grammarAccess.getXMemberFeatureCallRule()
+						|| action == grammarAccess.getXMemberFeatureCallAccess().getXAssignmentAssignableAction_1_0_0_0_0()
+						|| action == grammarAccess.getXMemberFeatureCallAccess().getXMemberFeatureCallMemberCallTargetAction_1_1_0_0_0()
+						|| rule == grammarAccess.getXPrimaryExpressionRule()
+						|| rule == grammarAccess.getXParenthesizedExpressionRule()
+						|| rule == grammarAccess.getXBlockExpressionRule()
+						|| rule == grammarAccess.getXExpressionOrVarDeclarationRule()) {
+					sequence_XBlockExpression(context, (XBlockExpression) semanticObject); 
+					return; 
+				}
+				else if (rule == grammarAccess.getXExpressionInClosureRule()) {
+					sequence_XExpressionInClosure(context, (XBlockExpression) semanticObject); 
+					return; 
+				}
+				else break;
+			case XbasePackage.XBOOLEAN_LITERAL:
+				sequence_XBooleanLiteral(context, (XBooleanLiteral) semanticObject); 
+				return; 
+			case XbasePackage.XCASE_PART:
+				sequence_XCasePart(context, (XCasePart) semanticObject); 
+				return; 
+			case XbasePackage.XCASTED_EXPRESSION:
+				sequence_XCastedExpression(context, (XCastedExpression) semanticObject); 
+				return; 
+			case XbasePackage.XCATCH_CLAUSE:
+				sequence_XCatchClause(context, (XCatchClause) semanticObject); 
+				return; 
+			case XbasePackage.XCLOSURE:
+				if (rule == grammarAccess.getXExpressionRule()
+						|| rule == grammarAccess.getXAssignmentRule()
+						|| action == grammarAccess.getXAssignmentAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0()
+						|| rule == grammarAccess.getXOrExpressionRule()
+						|| action == grammarAccess.getXOrExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXAndExpressionRule()
+						|| action == grammarAccess.getXAndExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXEqualityExpressionRule()
+						|| action == grammarAccess.getXEqualityExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXRelationalExpressionRule()
+						|| action == grammarAccess.getXRelationalExpressionAccess().getXInstanceOfExpressionExpressionAction_1_0_0_0_0()
+						|| action == grammarAccess.getXRelationalExpressionAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0()
+						|| rule == grammarAccess.getXOtherOperatorExpressionRule()
+						|| action == grammarAccess.getXOtherOperatorExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXAdditiveExpressionRule()
+						|| action == grammarAccess.getXAdditiveExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXMultiplicativeExpressionRule()
+						|| action == grammarAccess.getXMultiplicativeExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXUnaryOperationRule()
+						|| rule == grammarAccess.getXCastedExpressionRule()
+						|| action == grammarAccess.getXCastedExpressionAccess().getXCastedExpressionTargetAction_1_0_0_0()
+						|| rule == grammarAccess.getXPostfixOperationRule()
+						|| action == grammarAccess.getXPostfixOperationAccess().getXPostfixOperationOperandAction_1_0_0()
+						|| rule == grammarAccess.getXMemberFeatureCallRule()
+						|| action == grammarAccess.getXMemberFeatureCallAccess().getXAssignmentAssignableAction_1_0_0_0_0()
+						|| action == grammarAccess.getXMemberFeatureCallAccess().getXMemberFeatureCallMemberCallTargetAction_1_1_0_0_0()
+						|| rule == grammarAccess.getXPrimaryExpressionRule()
+						|| rule == grammarAccess.getXLiteralRule()
+						|| rule == grammarAccess.getXClosureRule()
+						|| rule == grammarAccess.getXParenthesizedExpressionRule()
+						|| rule == grammarAccess.getXExpressionOrVarDeclarationRule()) {
+					sequence_XClosure(context, (XClosure) semanticObject); 
+					return; 
+				}
+				else if (rule == grammarAccess.getXShortClosureRule()) {
+					sequence_XShortClosure(context, (XClosure) semanticObject); 
+					return; 
+				}
+				else break;
+			case XbasePackage.XCONSTRUCTOR_CALL:
+				sequence_XConstructorCall(context, (XConstructorCall) semanticObject); 
+				return; 
+			case XbasePackage.XDO_WHILE_EXPRESSION:
+				sequence_XDoWhileExpression(context, (XDoWhileExpression) semanticObject); 
+				return; 
+			case XbasePackage.XFEATURE_CALL:
+				sequence_XFeatureCall(context, (XFeatureCall) semanticObject); 
+				return; 
+			case XbasePackage.XFOR_LOOP_EXPRESSION:
+				sequence_XForLoopExpression(context, (XForLoopExpression) semanticObject); 
+				return; 
+			case XbasePackage.XIF_EXPRESSION:
+				sequence_XIfExpression(context, (XIfExpression) semanticObject); 
+				return; 
+			case XbasePackage.XINSTANCE_OF_EXPRESSION:
+				sequence_XRelationalExpression(context, (XInstanceOfExpression) semanticObject); 
+				return; 
+			case XbasePackage.XLIST_LITERAL:
+				if (rule == grammarAccess.getXFormalParameterDefaultValueLiteralRule()
+						|| rule == grammarAccess.getXConstantListLiteralRule()) {
+					sequence_XConstantListLiteral(context, (XListLiteral) semanticObject); 
+					return; 
+				}
+				else if (rule == grammarAccess.getXExpressionRule()
+						|| rule == grammarAccess.getXAssignmentRule()
+						|| action == grammarAccess.getXAssignmentAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0()
+						|| rule == grammarAccess.getXOrExpressionRule()
+						|| action == grammarAccess.getXOrExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXAndExpressionRule()
+						|| action == grammarAccess.getXAndExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXEqualityExpressionRule()
+						|| action == grammarAccess.getXEqualityExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXRelationalExpressionRule()
+						|| action == grammarAccess.getXRelationalExpressionAccess().getXInstanceOfExpressionExpressionAction_1_0_0_0_0()
+						|| action == grammarAccess.getXRelationalExpressionAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0()
+						|| rule == grammarAccess.getXOtherOperatorExpressionRule()
+						|| action == grammarAccess.getXOtherOperatorExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXAdditiveExpressionRule()
+						|| action == grammarAccess.getXAdditiveExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXMultiplicativeExpressionRule()
+						|| action == grammarAccess.getXMultiplicativeExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXUnaryOperationRule()
+						|| rule == grammarAccess.getXCastedExpressionRule()
+						|| action == grammarAccess.getXCastedExpressionAccess().getXCastedExpressionTargetAction_1_0_0_0()
+						|| rule == grammarAccess.getXPostfixOperationRule()
+						|| action == grammarAccess.getXPostfixOperationAccess().getXPostfixOperationOperandAction_1_0_0()
+						|| rule == grammarAccess.getXMemberFeatureCallRule()
+						|| action == grammarAccess.getXMemberFeatureCallAccess().getXAssignmentAssignableAction_1_0_0_0_0()
+						|| action == grammarAccess.getXMemberFeatureCallAccess().getXMemberFeatureCallMemberCallTargetAction_1_1_0_0_0()
+						|| rule == grammarAccess.getXPrimaryExpressionRule()
+						|| rule == grammarAccess.getXLiteralRule()
+						|| rule == grammarAccess.getXCollectionLiteralRule()
+						|| rule == grammarAccess.getXListLiteralRule()
+						|| rule == grammarAccess.getXParenthesizedExpressionRule()
+						|| rule == grammarAccess.getXExpressionOrVarDeclarationRule()) {
+					sequence_XListLiteral(context, (XListLiteral) semanticObject); 
+					return; 
+				}
+				else break;
+			case XbasePackage.XMEMBER_FEATURE_CALL:
+				sequence_XMemberFeatureCall(context, (XMemberFeatureCall) semanticObject); 
+				return; 
+			case XbasePackage.XNULL_LITERAL:
+				sequence_XNullLiteral(context, (XNullLiteral) semanticObject); 
+				return; 
+			case XbasePackage.XNUMBER_LITERAL:
+				sequence_XNumberLiteral(context, (XNumberLiteral) semanticObject); 
+				return; 
+			case XbasePackage.XPOSTFIX_OPERATION:
+				sequence_XPostfixOperation(context, (XPostfixOperation) semanticObject); 
+				return; 
+			case XbasePackage.XRETURN_EXPRESSION:
+				sequence_XReturnExpression(context, (XReturnExpression) semanticObject); 
+				return; 
+			case XbasePackage.XSET_LITERAL:
+				sequence_XSetLiteral(context, (XSetLiteral) semanticObject); 
+				return; 
+			case XbasePackage.XSTRING_LITERAL:
+				sequence_XStringLiteral(context, (XStringLiteral) semanticObject); 
+				return; 
+			case XbasePackage.XSWITCH_EXPRESSION:
+				sequence_XSwitchExpression(context, (XSwitchExpression) semanticObject); 
+				return; 
+			case XbasePackage.XSYNCHRONIZED_EXPRESSION:
+				sequence_XSynchronizedExpression(context, (XSynchronizedExpression) semanticObject); 
+				return; 
+			case XbasePackage.XTHROW_EXPRESSION:
+				sequence_XThrowExpression(context, (XThrowExpression) semanticObject); 
+				return; 
+			case XbasePackage.XTRY_CATCH_FINALLY_EXPRESSION:
+				sequence_XTryCatchFinallyExpression(context, (XTryCatchFinallyExpression) semanticObject); 
+				return; 
+			case XbasePackage.XTYPE_LITERAL:
+				sequence_XTypeLiteral(context, (XTypeLiteral) semanticObject); 
+				return; 
+			case XbasePackage.XUNARY_OPERATION:
+				if (rule == grammarAccess.getXConstantUnaryOperationRule()
+						|| rule == grammarAccess.getXFormalParameterDefaultValueLiteralRule()) {
+					sequence_XConstantUnaryOperation(context, (XUnaryOperation) semanticObject); 
+					return; 
+				}
+				else if (rule == grammarAccess.getXExpressionRule()
+						|| rule == grammarAccess.getXAssignmentRule()
+						|| action == grammarAccess.getXAssignmentAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0()
+						|| rule == grammarAccess.getXOrExpressionRule()
+						|| action == grammarAccess.getXOrExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXAndExpressionRule()
+						|| action == grammarAccess.getXAndExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXEqualityExpressionRule()
+						|| action == grammarAccess.getXEqualityExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXRelationalExpressionRule()
+						|| action == grammarAccess.getXRelationalExpressionAccess().getXInstanceOfExpressionExpressionAction_1_0_0_0_0()
+						|| action == grammarAccess.getXRelationalExpressionAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0()
+						|| rule == grammarAccess.getXOtherOperatorExpressionRule()
+						|| action == grammarAccess.getXOtherOperatorExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXAdditiveExpressionRule()
+						|| action == grammarAccess.getXAdditiveExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXMultiplicativeExpressionRule()
+						|| action == grammarAccess.getXMultiplicativeExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXUnaryOperationRule()
+						|| rule == grammarAccess.getXCastedExpressionRule()
+						|| action == grammarAccess.getXCastedExpressionAccess().getXCastedExpressionTargetAction_1_0_0_0()
+						|| rule == grammarAccess.getXPostfixOperationRule()
+						|| action == grammarAccess.getXPostfixOperationAccess().getXPostfixOperationOperandAction_1_0_0()
+						|| rule == grammarAccess.getXMemberFeatureCallRule()
+						|| action == grammarAccess.getXMemberFeatureCallAccess().getXAssignmentAssignableAction_1_0_0_0_0()
+						|| action == grammarAccess.getXMemberFeatureCallAccess().getXMemberFeatureCallMemberCallTargetAction_1_1_0_0_0()
+						|| rule == grammarAccess.getXPrimaryExpressionRule()
+						|| rule == grammarAccess.getXParenthesizedExpressionRule()
+						|| rule == grammarAccess.getXExpressionOrVarDeclarationRule()) {
+					sequence_XUnaryOperation(context, (XUnaryOperation) semanticObject); 
+					return; 
+				}
+				else break;
+			case XbasePackage.XVARIABLE_DECLARATION:
+				sequence_XVariableDeclaration(context, (XVariableDeclaration) semanticObject); 
+				return; 
+			case XbasePackage.XWHILE_EXPRESSION:
+				sequence_XWhileExpression(context, (XWhileExpression) semanticObject); 
+				return; 
+			}
+		else if (epackage == XtypePackage.eINSTANCE)
+			switch (semanticObject.eClass().getClassifierID()) {
+			case XtypePackage.XFUNCTION_TYPE_REF:
+				sequence_XFunctionTypeRef(context, (XFunctionTypeRef) semanticObject); 
+				return; 
+			case XtypePackage.XIMPORT_DECLARATION:
+				sequence_XImportDeclaration(context, (XImportDeclaration) semanticObject); 
+				return; 
+			case XtypePackage.XIMPORT_SECTION:
+				sequence_XImportSection(context, (XImportSection) semanticObject); 
+				return; 
+			}
+		if (errorAcceptor != null)
+			errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
+	}
+	
+	/**
+	 * Contexts:
+	 *     CheckConfiguration returns CheckConfiguration
+	 *
+	 * Constraint:
+	 *     (
+	 *         name=ValidID 
+	 *         parameterConfigurations+=ConfiguredParameter* 
+	 *         languageValidatorConfigurations+=ConfiguredLanguageValidator* 
+	 *         legacyCatalogConfigurations+=ConfiguredCatalog*
+	 *     )
+	 */
+	protected void sequence_CheckConfiguration(ISerializationContext context, CheckConfiguration semanticObject) {
+		genericSequencer.createSequence(context, semanticObject);
+	}
+	
+	
+	/**
+	 * Contexts:
+	 *     ConfiguredCatalog returns ConfiguredCatalog
+	 *
+	 * Constraint:
+	 *     (catalog=[CheckCatalog|QualifiedName] parameterConfigurations+=ConfiguredParameter* checkConfigurations+=ConfiguredCheck*)
+	 */
+	protected void sequence_ConfiguredCatalog(ISerializationContext context, ConfiguredCatalog semanticObject) {
+		genericSequencer.createSequence(context, semanticObject);
+	}
+	
+	
+	/**
+	 * Contexts:
+	 *     ConfiguredCheck returns ConfiguredCheck
+	 *
+	 * Constraint:
+	 *     (
+	 *         severity=SeverityKind 
+	 *         check=[Check|QualifiedName] 
+	 *         (parameterConfigurations+=ConfiguredParameter parameterConfigurations+=ConfiguredParameter*)?
+	 *     )
+	 */
+	protected void sequence_ConfiguredCheck(ISerializationContext context, ConfiguredCheck semanticObject) {
+		genericSequencer.createSequence(context, semanticObject);
+	}
+	
+	
+	/**
+	 * Contexts:
+	 *     ConfiguredLanguageValidator returns ConfiguredLanguageValidator
+	 *
+	 * Constraint:
+	 *     (language=QualifiedName parameterConfigurations+=ConfiguredParameter* catalogConfigurations+=ConfiguredCatalog*)
+	 */
+	protected void sequence_ConfiguredLanguageValidator(ISerializationContext context, ConfiguredLanguageValidator semanticObject) {
+		genericSequencer.createSequence(context, semanticObject);
+	}
+	
+	
+	/**
+	 * Contexts:
+	 *     ConfiguredParameter returns ConfiguredParameter
+	 *
+	 * Constraint:
+	 *     (parameter=[FormalParameter|ValidID] newValue=XFormalParameterDefaultValueLiteral)
+	 */
+	protected void sequence_ConfiguredParameter(ISerializationContext context, ConfiguredParameter semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, CheckcfgPackage.Literals.CONFIGURED_PARAMETER__PARAMETER) == ValueTransient.YES)
+				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CheckcfgPackage.Literals.CONFIGURED_PARAMETER__PARAMETER));
+			if (transientValues.isValueTransient(semanticObject, CheckcfgPackage.Literals.CONFIGURED_PARAMETER__NEW_VALUE) == ValueTransient.YES)
+				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, CheckcfgPackage.Literals.CONFIGURED_PARAMETER__NEW_VALUE));
+		}
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
+		feeder.accept(grammarAccess.getConfiguredParameterAccess().getParameterFormalParameterValidIDParserRuleCall_1_0_1(), semanticObject.eGet(CheckcfgPackage.Literals.CONFIGURED_PARAMETER__PARAMETER, false));
+		feeder.accept(grammarAccess.getConfiguredParameterAccess().getNewValueXFormalParameterDefaultValueLiteralParserRuleCall_3_0(), semanticObject.getNewValue());
+		feeder.finish();
+	}
+	
+	
+	/**
+	 * Contexts:
+	 *     XFormalParameterDefaultValueLiteral returns XListLiteral
+	 *     XConstantListLiteral returns XListLiteral
+	 *
+	 * Constraint:
+	 *     (elements+=XConstantUnaryOperation elements+=XConstantUnaryOperation*)?
+	 */
+	protected void sequence_XConstantListLiteral(ISerializationContext context, XListLiteral semanticObject) {
+		genericSequencer.createSequence(context, semanticObject);
+	}
+	
+	
+	/**
+	 * Contexts:
+	 *     XConstantUnaryOperation returns XUnaryOperation
+	 *     XFormalParameterDefaultValueLiteral returns XUnaryOperation
+	 *
+	 * Constraint:
+	 *     (feature=[JvmIdentifiableElement|OpUnary] operand=XConstantUnaryOperation)
+	 */
+	protected void sequence_XConstantUnaryOperation(ISerializationContext context, XUnaryOperation semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, XbasePackage.Literals.XABSTRACT_FEATURE_CALL__FEATURE) == ValueTransient.YES)
+				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, XbasePackage.Literals.XABSTRACT_FEATURE_CALL__FEATURE));
+			if (transientValues.isValueTransient(semanticObject, XbasePackage.Literals.XUNARY_OPERATION__OPERAND) == ValueTransient.YES)
+				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, XbasePackage.Literals.XUNARY_OPERATION__OPERAND));
+		}
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
+		feeder.accept(grammarAccess.getXConstantUnaryOperationAccess().getFeatureJvmIdentifiableElementOpUnaryParserRuleCall_0_1_0_1(), semanticObject.eGet(XbasePackage.Literals.XABSTRACT_FEATURE_CALL__FEATURE, false));
+		feeder.accept(grammarAccess.getXConstantUnaryOperationAccess().getOperandXConstantUnaryOperationParserRuleCall_0_2_0(), semanticObject.getOperand());
+		feeder.finish();
+	}
+	
+	
 }
diff --git a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/serializer/AbstractCheckCfgSyntacticSequencer.java b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/serializer/AbstractCheckCfgSyntacticSequencer.java
index 0146d98de..d579807ab 100644
--- a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/serializer/AbstractCheckCfgSyntacticSequencer.java
+++ b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/serializer/AbstractCheckCfgSyntacticSequencer.java
@@ -43,9 +43,9 @@ protected void init(IGrammarAccess access) {
 	
 	@Override
 	protected String getUnassignedRuleCallToken(EObject semanticObject, RuleCall ruleCall, INode node) {
-		if(ruleCall.getRule() == grammarAccess.getArrayBracketsRule())
+		if (ruleCall.getRule() == grammarAccess.getArrayBracketsRule())
 			return getArrayBracketsToken(semanticObject, ruleCall, node);
-		else if(ruleCall.getRule() == grammarAccess.getOpSingleAssignRule())
+		else if (ruleCall.getRule() == grammarAccess.getOpSingleAssignRule())
 			return getOpSingleAssignToken(semanticObject, ruleCall, node);
 		return "";
 	}
@@ -78,19 +78,19 @@ protected void emitUnassignedTokens(EObject semanticObject, ISynTransition trans
 		List<INode> transitionNodes = collectNodes(fromNode, toNode);
 		for (AbstractElementAlias syntax : transition.getAmbiguousSyntaxes()) {
 			List<INode> syntaxNodes = getNodesFor(transitionNodes, syntax);
-			if(match_CheckConfiguration___LeftCurlyBracketKeyword_5_0_RightCurlyBracketKeyword_5_2__q.equals(syntax))
+			if (match_CheckConfiguration___LeftCurlyBracketKeyword_5_0_RightCurlyBracketKeyword_5_2__q.equals(syntax))
 				emit_CheckConfiguration___LeftCurlyBracketKeyword_5_0_RightCurlyBracketKeyword_5_2__q(semanticObject, getLastNavigableState(), syntaxNodes);
-			else if(match_XBlockExpression_SemicolonKeyword_2_1_q.equals(syntax))
+			else if (match_XBlockExpression_SemicolonKeyword_2_1_q.equals(syntax))
 				emit_XBlockExpression_SemicolonKeyword_2_1_q(semanticObject, getLastNavigableState(), syntaxNodes);
-			else if(match_XExpressionInClosure_SemicolonKeyword_1_1_q.equals(syntax))
+			else if (match_XExpressionInClosure_SemicolonKeyword_1_1_q.equals(syntax))
 				emit_XExpressionInClosure_SemicolonKeyword_1_1_q(semanticObject, getLastNavigableState(), syntaxNodes);
-			else if(match_XFunctionTypeRef___LeftParenthesisKeyword_0_0_RightParenthesisKeyword_0_2__q.equals(syntax))
+			else if (match_XFunctionTypeRef___LeftParenthesisKeyword_0_0_RightParenthesisKeyword_0_2__q.equals(syntax))
 				emit_XFunctionTypeRef___LeftParenthesisKeyword_0_0_RightParenthesisKeyword_0_2__q(semanticObject, getLastNavigableState(), syntaxNodes);
-			else if(match_XImportDeclaration_SemicolonKeyword_2_q.equals(syntax))
+			else if (match_XImportDeclaration_SemicolonKeyword_2_q.equals(syntax))
 				emit_XImportDeclaration_SemicolonKeyword_2_q(semanticObject, getLastNavigableState(), syntaxNodes);
-			else if(match_XParenthesizedExpression_LeftParenthesisKeyword_0_a.equals(syntax))
+			else if (match_XParenthesizedExpression_LeftParenthesisKeyword_0_a.equals(syntax))
 				emit_XParenthesizedExpression_LeftParenthesisKeyword_0_a(semanticObject, getLastNavigableState(), syntaxNodes);
-			else if(match_XParenthesizedExpression_LeftParenthesisKeyword_0_p.equals(syntax))
+			else if (match_XParenthesizedExpression_LeftParenthesisKeyword_0_p.equals(syntax))
 				emit_XParenthesizedExpression_LeftParenthesisKeyword_0_p(semanticObject, getLastNavigableState(), syntaxNodes);
 			else acceptNodes(getLastNavigableState(), syntaxNodes);
 		}
diff --git a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/services/CheckCfgGrammarAccess.java b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/services/CheckCfgGrammarAccess.java
index 35114f040..5450dbbdb 100644
--- a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/services/CheckCfgGrammarAccess.java
+++ b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/services/CheckCfgGrammarAccess.java
@@ -20,7 +20,7 @@ public class CheckCfgGrammarAccess extends AbstractGrammarElementFinder {
 	
 	
 	public class CheckConfigurationElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "CheckConfiguration");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.checkcfg.CheckCfg.CheckConfiguration");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cCheckKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Keyword cConfigurationKeyword_1 = (Keyword)cGroup.eContents().get(1);
@@ -37,20 +37,20 @@ public class CheckConfigurationElements extends AbstractParserRuleElementFinder
 		private final Keyword cRightCurlyBracketKeyword_5_2 = (Keyword)cGroup_5.eContents().get(2);
 		
 		//CheckConfiguration:
-		//	"check" "configuration" name=ValidID parameterConfigurations+=ConfiguredParameter*
-		//	languageValidatorConfigurations+=ConfiguredLanguageValidator* ("{" legacyCatalogConfigurations+=ConfiguredCatalog*
-		//	"}")?;
+		//	'check' 'configuration' name=ValidID parameterConfigurations+=ConfiguredParameter*
+		//	languageValidatorConfigurations+=ConfiguredLanguageValidator* ('{' legacyCatalogConfigurations+=ConfiguredCatalog*
+		//	'}')?;
 		@Override public ParserRule getRule() { return rule; }
 
-		//"check" "configuration" name=ValidID parameterConfigurations+=ConfiguredParameter*
-		//languageValidatorConfigurations+=ConfiguredLanguageValidator* ("{" legacyCatalogConfigurations+=ConfiguredCatalog*
-		//"}")?
+		//'check' 'configuration' name=ValidID parameterConfigurations+=ConfiguredParameter*
+		//languageValidatorConfigurations+=ConfiguredLanguageValidator* ('{' legacyCatalogConfigurations+=ConfiguredCatalog*
+		//'}')?
 		public Group getGroup() { return cGroup; }
 
-		//"check"
+		//'check'
 		public Keyword getCheckKeyword_0() { return cCheckKeyword_0; }
 
-		//"configuration"
+		//'configuration'
 		public Keyword getConfigurationKeyword_1() { return cConfigurationKeyword_1; }
 
 		//name=ValidID
@@ -71,10 +71,10 @@ public class CheckConfigurationElements extends AbstractParserRuleElementFinder
 		//ConfiguredLanguageValidator
 		public RuleCall getLanguageValidatorConfigurationsConfiguredLanguageValidatorParserRuleCall_4_0() { return cLanguageValidatorConfigurationsConfiguredLanguageValidatorParserRuleCall_4_0; }
 
-		//("{" legacyCatalogConfigurations+=ConfiguredCatalog* "}")?
+		//('{' legacyCatalogConfigurations+=ConfiguredCatalog* '}')?
 		public Group getGroup_5() { return cGroup_5; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_5_0() { return cLeftCurlyBracketKeyword_5_0; }
 
 		//legacyCatalogConfigurations+=ConfiguredCatalog*
@@ -83,12 +83,12 @@ public class CheckConfigurationElements extends AbstractParserRuleElementFinder
 		//ConfiguredCatalog
 		public RuleCall getLegacyCatalogConfigurationsConfiguredCatalogParserRuleCall_5_1_0() { return cLegacyCatalogConfigurationsConfiguredCatalogParserRuleCall_5_1_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_5_2() { return cRightCurlyBracketKeyword_5_2; }
 	}
 
 	public class ConfiguredLanguageValidatorElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ConfiguredLanguageValidator");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.checkcfg.CheckCfg.ConfiguredLanguageValidator");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cForKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cLanguageAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -101,15 +101,15 @@ public class ConfiguredLanguageValidatorElements extends AbstractParserRuleEleme
 		private final Keyword cRightCurlyBracketKeyword_5 = (Keyword)cGroup.eContents().get(5);
 		
 		//ConfiguredLanguageValidator:
-		//	"for" language=QualifiedName "{" parameterConfigurations+=ConfiguredParameter*
-		//	catalogConfigurations+=ConfiguredCatalog* "}";
+		//	'for' language=QualifiedName '{' parameterConfigurations+=ConfiguredParameter*
+		//	catalogConfigurations+=ConfiguredCatalog* '}';
 		@Override public ParserRule getRule() { return rule; }
 
-		//"for" language=QualifiedName "{" parameterConfigurations+=ConfiguredParameter* catalogConfigurations+=ConfiguredCatalog*
-		//"}"
+		//'for' language=QualifiedName '{' parameterConfigurations+=ConfiguredParameter* catalogConfigurations+=ConfiguredCatalog*
+		//'}'
 		public Group getGroup() { return cGroup; }
 
-		//"for"
+		//'for'
 		public Keyword getForKeyword_0() { return cForKeyword_0; }
 
 		//language=QualifiedName
@@ -118,7 +118,7 @@ public class ConfiguredLanguageValidatorElements extends AbstractParserRuleEleme
 		//QualifiedName
 		public RuleCall getLanguageQualifiedNameParserRuleCall_1_0() { return cLanguageQualifiedNameParserRuleCall_1_0; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_2() { return cLeftCurlyBracketKeyword_2; }
 
 		//parameterConfigurations+=ConfiguredParameter*
@@ -133,12 +133,12 @@ public class ConfiguredLanguageValidatorElements extends AbstractParserRuleEleme
 		//ConfiguredCatalog
 		public RuleCall getCatalogConfigurationsConfiguredCatalogParserRuleCall_4_0() { return cCatalogConfigurationsConfiguredCatalogParserRuleCall_4_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_5() { return cRightCurlyBracketKeyword_5; }
 	}
 
 	public class ConfiguredCatalogElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ConfiguredCatalog");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.checkcfg.CheckCfg.ConfiguredCatalog");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Action cConfiguredCatalogAction_0 = (Action)cGroup.eContents().get(0);
 		private final Keyword cCatalogKeyword_1 = (Keyword)cGroup.eContents().get(1);
@@ -153,18 +153,18 @@ public class ConfiguredCatalogElements extends AbstractParserRuleElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_6 = (Keyword)cGroup.eContents().get(6);
 		
 		//ConfiguredCatalog:
-		//	{ConfiguredCatalog} "catalog" catalog=[check::CheckCatalog|QualifiedName] "{"
-		//	parameterConfigurations+=ConfiguredParameter* checkConfigurations+=ConfiguredCheck* "}";
+		//	{ConfiguredCatalog} 'catalog' catalog=[check::CheckCatalog|QualifiedName] '{'
+		//	parameterConfigurations+=ConfiguredParameter* checkConfigurations+=ConfiguredCheck* '}';
 		@Override public ParserRule getRule() { return rule; }
 
-		//{ConfiguredCatalog} "catalog" catalog=[check::CheckCatalog|QualifiedName] "{"
-		//parameterConfigurations+=ConfiguredParameter* checkConfigurations+=ConfiguredCheck* "}"
+		//{ConfiguredCatalog} 'catalog' catalog=[check::CheckCatalog|QualifiedName] '{'
+		//parameterConfigurations+=ConfiguredParameter* checkConfigurations+=ConfiguredCheck* '}'
 		public Group getGroup() { return cGroup; }
 
 		//{ConfiguredCatalog}
 		public Action getConfiguredCatalogAction_0() { return cConfiguredCatalogAction_0; }
 
-		//"catalog"
+		//'catalog'
 		public Keyword getCatalogKeyword_1() { return cCatalogKeyword_1; }
 
 		//catalog=[check::CheckCatalog|QualifiedName]
@@ -176,7 +176,7 @@ public class ConfiguredCatalogElements extends AbstractParserRuleElementFinder {
 		//QualifiedName
 		public RuleCall getCatalogCheckCatalogQualifiedNameParserRuleCall_2_0_1() { return cCatalogCheckCatalogQualifiedNameParserRuleCall_2_0_1; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_3() { return cLeftCurlyBracketKeyword_3; }
 
 		//parameterConfigurations+=ConfiguredParameter*
@@ -191,12 +191,12 @@ public class ConfiguredCatalogElements extends AbstractParserRuleElementFinder {
 		//ConfiguredCheck
 		public RuleCall getCheckConfigurationsConfiguredCheckParserRuleCall_5_0() { return cCheckConfigurationsConfiguredCheckParserRuleCall_5_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_6() { return cRightCurlyBracketKeyword_6; }
 	}
 
 	public class ConfiguredCheckElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ConfiguredCheck");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.checkcfg.CheckCfg.ConfiguredCheck");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Action cConfiguredCheckAction_0 = (Action)cGroup.eContents().get(0);
 		private final Assignment cSeverityAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -215,22 +215,18 @@ public class ConfiguredCheckElements extends AbstractParserRuleElementFinder {
 		private final Keyword cRightParenthesisKeyword_3_3 = (Keyword)cGroup_3.eContents().get(3);
 		
 		//ConfiguredCheck:
-		//	{ConfiguredCheck}
-		//	/ * TODO configure severity? would require modifying the run-time so that not the severity of the annotation is used * /
-		//	severity=SeverityKind check=[check::Check|QualifiedName] ("(" parameterConfigurations+=ConfiguredParameter (","
-		//	parameterConfigurations+=ConfiguredParameter)* ")")?;
+		//	{ConfiguredCheck} severity=SeverityKind check=[check::Check|QualifiedName] ('('
+		//	parameterConfigurations+=ConfiguredParameter (',' parameterConfigurations+=ConfiguredParameter)* ')')?;
 		@Override public ParserRule getRule() { return rule; }
 
-		//{ConfiguredCheck}
-		/// * TODO configure severity? would require modifying the run-time so that not the severity of the annotation is used * /
-		//severity=SeverityKind check=[check::Check|QualifiedName] ("(" parameterConfigurations+=ConfiguredParameter (","
-		//parameterConfigurations+=ConfiguredParameter)* ")")?
+		//{ConfiguredCheck} severity=SeverityKind check=[check::Check|QualifiedName] ('('
+		//parameterConfigurations+=ConfiguredParameter (',' parameterConfigurations+=ConfiguredParameter)* ')')?
 		public Group getGroup() { return cGroup; }
 
 		//{ConfiguredCheck}
 		public Action getConfiguredCheckAction_0() { return cConfiguredCheckAction_0; }
 
-		/// * TODO configure severity? would require modifying the run-time so that not the severity of the annotation is used * /
+		///* TODO configure severity? would require modifying the run-time so that not the severity of the annotation is used */
 		//severity=SeverityKind
 		public Assignment getSeverityAssignment_1() { return cSeverityAssignment_1; }
 
@@ -246,10 +242,10 @@ public class ConfiguredCheckElements extends AbstractParserRuleElementFinder {
 		//QualifiedName
 		public RuleCall getCheckCheckQualifiedNameParserRuleCall_2_0_1() { return cCheckCheckQualifiedNameParserRuleCall_2_0_1; }
 
-		//("(" parameterConfigurations+=ConfiguredParameter ("," parameterConfigurations+=ConfiguredParameter)* ")")?
+		//('(' parameterConfigurations+=ConfiguredParameter (',' parameterConfigurations+=ConfiguredParameter)* ')')?
 		public Group getGroup_3() { return cGroup_3; }
 
-		//"("
+		//'('
 		public Keyword getLeftParenthesisKeyword_3_0() { return cLeftParenthesisKeyword_3_0; }
 
 		//parameterConfigurations+=ConfiguredParameter
@@ -258,10 +254,10 @@ public class ConfiguredCheckElements extends AbstractParserRuleElementFinder {
 		//ConfiguredParameter
 		public RuleCall getParameterConfigurationsConfiguredParameterParserRuleCall_3_1_0() { return cParameterConfigurationsConfiguredParameterParserRuleCall_3_1_0; }
 
-		//("," parameterConfigurations+=ConfiguredParameter)*
+		//(',' parameterConfigurations+=ConfiguredParameter)*
 		public Group getGroup_3_2() { return cGroup_3_2; }
 
-		//","
+		//','
 		public Keyword getCommaKeyword_3_2_0() { return cCommaKeyword_3_2_0; }
 
 		//parameterConfigurations+=ConfiguredParameter
@@ -270,12 +266,12 @@ public class ConfiguredCheckElements extends AbstractParserRuleElementFinder {
 		//ConfiguredParameter
 		public RuleCall getParameterConfigurationsConfiguredParameterParserRuleCall_3_2_1_0() { return cParameterConfigurationsConfiguredParameterParserRuleCall_3_2_1_0; }
 
-		//")"
+		//')'
 		public Keyword getRightParenthesisKeyword_3_3() { return cRightParenthesisKeyword_3_3; }
 	}
 
 	public class ConfiguredParameterElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ConfiguredParameter");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.checkcfg.CheckCfg.ConfiguredParameter");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Action cConfiguredParameterAction_0 = (Action)cGroup.eContents().get(0);
 		private final Assignment cParameterAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -286,10 +282,10 @@ public class ConfiguredParameterElements extends AbstractParserRuleElementFinder
 		private final RuleCall cNewValueXFormalParameterDefaultValueLiteralParserRuleCall_3_0 = (RuleCall)cNewValueAssignment_3.eContents().get(0);
 		
 		//ConfiguredParameter:
-		//	{ConfiguredParameter} parameter=[check::FormalParameter|ValidID] "=" newValue=XFormalParameterDefaultValueLiteral;
+		//	{ConfiguredParameter} parameter=[check::FormalParameter|ValidID] '=' newValue=XFormalParameterDefaultValueLiteral;
 		@Override public ParserRule getRule() { return rule; }
 
-		//{ConfiguredParameter} parameter=[check::FormalParameter|ValidID] "=" newValue=XFormalParameterDefaultValueLiteral
+		//{ConfiguredParameter} parameter=[check::FormalParameter|ValidID] '=' newValue=XFormalParameterDefaultValueLiteral
 		public Group getGroup() { return cGroup; }
 
 		//{ConfiguredParameter}
@@ -304,7 +300,7 @@ public class ConfiguredParameterElements extends AbstractParserRuleElementFinder
 		//ValidID
 		public RuleCall getParameterFormalParameterValidIDParserRuleCall_1_0_1() { return cParameterFormalParameterValidIDParserRuleCall_1_0_1; }
 
-		//"="
+		//'='
 		public Keyword getEqualsSignKeyword_2() { return cEqualsSignKeyword_2; }
 
 		//newValue=XFormalParameterDefaultValueLiteral
@@ -315,7 +311,7 @@ public class ConfiguredParameterElements extends AbstractParserRuleElementFinder
 	}
 
 	public class XSimpleFormalParameterDefaultValueLiteralElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "XSimpleFormalParameterDefaultValueLiteral");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.checkcfg.CheckCfg.XSimpleFormalParameterDefaultValueLiteral");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cXBooleanLiteralParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cXNumberLiteralParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
@@ -323,7 +319,7 @@ public class XSimpleFormalParameterDefaultValueLiteralElements extends AbstractP
 		
 		//// defines restriction of supported parameter types. Copied from check
 		// XSimpleFormalParameterDefaultValueLiteral
-		//returns xbase::XExpression:
+		//xbase::XExpression:
 		//	XBooleanLiteral | XNumberLiteral | XStringLiteral;
 		@Override public ParserRule getRule() { return rule; }
 
@@ -341,7 +337,7 @@ public class XSimpleFormalParameterDefaultValueLiteralElements extends AbstractP
 	}
 
 	public class XConstantUnaryOperationElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "XConstantUnaryOperation");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.checkcfg.CheckCfg.XConstantUnaryOperation");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final Group cGroup_0 = (Group)cAlternatives.eContents().get(0);
 		private final Action cXUnaryOperationAction_0_0 = (Action)cGroup_0.eContents().get(0);
@@ -352,7 +348,7 @@ public class XConstantUnaryOperationElements extends AbstractParserRuleElementFi
 		private final RuleCall cOperandXConstantUnaryOperationParserRuleCall_0_2_0 = (RuleCall)cOperandAssignment_0_2.eContents().get(0);
 		private final RuleCall cXSimpleFormalParameterDefaultValueLiteralParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
 		
-		//XConstantUnaryOperation returns xbase::XExpression:
+		//XConstantUnaryOperation xbase::XExpression:
 		//	{xbase::XUnaryOperation} feature=[types::JvmIdentifiableElement|OpUnary] operand=XConstantUnaryOperation |
 		//	XSimpleFormalParameterDefaultValueLiteral;
 		@Override public ParserRule getRule() { return rule; }
@@ -387,14 +383,14 @@ public class XConstantUnaryOperationElements extends AbstractParserRuleElementFi
 	}
 
 	public class XFormalParameterDefaultValueLiteralElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "XFormalParameterDefaultValueLiteral");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.checkcfg.CheckCfg.XFormalParameterDefaultValueLiteral");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cXConstantUnaryOperationParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cXConstantListLiteralParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
 		
-		//// todo add support for enumerations
-		// XFormalParameterDefaultValueLiteral returns xbase::XExpression:
-		//	XConstantUnaryOperation | XConstantListLiteral;
+		//XFormalParameterDefaultValueLiteral xbase::XExpression:
+		//	XConstantUnaryOperation | XConstantListLiteral // todo add support for enumerations
+		//;
 		@Override public ParserRule getRule() { return rule; }
 
 		//XConstantUnaryOperation | XConstantListLiteral
@@ -408,7 +404,7 @@ public class XFormalParameterDefaultValueLiteralElements extends AbstractParserR
 	}
 
 	public class XConstantListLiteralElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "XConstantListLiteral");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.checkcfg.CheckCfg.XConstantListLiteral");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Action cXListLiteralAction_0 = (Action)cGroup.eContents().get(0);
 		private final Keyword cNumberSignKeyword_1 = (Keyword)cGroup.eContents().get(1);
@@ -422,23 +418,23 @@ public class XConstantListLiteralElements extends AbstractParserRuleElementFinde
 		private final RuleCall cElementsXConstantUnaryOperationParserRuleCall_3_1_1_0 = (RuleCall)cElementsAssignment_3_1_1.eContents().get(0);
 		private final Keyword cRightSquareBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);
 		
-		//XConstantListLiteral returns xbase::XListLiteral:
-		//	{xbase::XListLiteral} "#" "[" (elements+=XConstantUnaryOperation ("," elements+=XConstantUnaryOperation)*)? "]";
+		//XConstantListLiteral xbase::XListLiteral:
+		//	{xbase::XListLiteral} '#' '[' (elements+=XConstantUnaryOperation (',' elements+=XConstantUnaryOperation)*)? ']';
 		@Override public ParserRule getRule() { return rule; }
 
-		//{xbase::XListLiteral} "#" "[" (elements+=XConstantUnaryOperation ("," elements+=XConstantUnaryOperation)*)? "]"
+		//{xbase::XListLiteral} '#' '[' (elements+=XConstantUnaryOperation (',' elements+=XConstantUnaryOperation)*)? ']'
 		public Group getGroup() { return cGroup; }
 
 		//{xbase::XListLiteral}
 		public Action getXListLiteralAction_0() { return cXListLiteralAction_0; }
 
-		//"#"
+		//'#'
 		public Keyword getNumberSignKeyword_1() { return cNumberSignKeyword_1; }
 
-		//"["
+		//'['
 		public Keyword getLeftSquareBracketKeyword_2() { return cLeftSquareBracketKeyword_2; }
 
-		//(elements+=XConstantUnaryOperation ("," elements+=XConstantUnaryOperation)*)?
+		//(elements+=XConstantUnaryOperation (',' elements+=XConstantUnaryOperation)*)?
 		public Group getGroup_3() { return cGroup_3; }
 
 		//elements+=XConstantUnaryOperation
@@ -447,10 +443,10 @@ public class XConstantListLiteralElements extends AbstractParserRuleElementFinde
 		//XConstantUnaryOperation
 		public RuleCall getElementsXConstantUnaryOperationParserRuleCall_3_0_0() { return cElementsXConstantUnaryOperationParserRuleCall_3_0_0; }
 
-		//("," elements+=XConstantUnaryOperation)*
+		//(',' elements+=XConstantUnaryOperation)*
 		public Group getGroup_3_1() { return cGroup_3_1; }
 
-		//","
+		//','
 		public Keyword getCommaKeyword_3_1_0() { return cCommaKeyword_3_1_0; }
 
 		//elements+=XConstantUnaryOperation
@@ -459,13 +455,13 @@ public class XConstantListLiteralElements extends AbstractParserRuleElementFinde
 		//XConstantUnaryOperation
 		public RuleCall getElementsXConstantUnaryOperationParserRuleCall_3_1_1_0() { return cElementsXConstantUnaryOperationParserRuleCall_3_1_1_0; }
 
-		//"]"
+		//']'
 		public Keyword getRightSquareBracketKeyword_4() { return cRightSquareBracketKeyword_4; }
 	}
 	
 	
 	public class SeverityKindElements extends AbstractEnumRuleElementFinder {
-		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "SeverityKind");
+		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.checkcfg.CheckCfg.SeverityKind");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final EnumLiteralDeclaration cDefaultEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0);
 		private final Keyword cDefaultDefaultKeyword_0_0 = (Keyword)cDefaultEnumLiteralDeclaration_0.eContents().get(0);
@@ -478,8 +474,7 @@ public class SeverityKindElements extends AbstractEnumRuleElementFinder {
 		private final EnumLiteralDeclaration cIgnoreEnumLiteralDeclaration_4 = (EnumLiteralDeclaration)cAlternatives.eContents().get(4);
 		private final Keyword cIgnoreIgnoreKeyword_4_0 = (Keyword)cIgnoreEnumLiteralDeclaration_4.eContents().get(0);
 		
-		//// copied from Check, enum cannot be referenced
-		// enum SeverityKind:
+		//enum SeverityKind:
 		//	default | error | warning | info | ignore;
 		public EnumRule getRule() { return rule; }
 
@@ -489,31 +484,31 @@ public class SeverityKindElements extends AbstractEnumRuleElementFinder {
 		//default
 		public EnumLiteralDeclaration getDefaultEnumLiteralDeclaration_0() { return cDefaultEnumLiteralDeclaration_0; }
 
-		//"default"
+		//'default'
 		public Keyword getDefaultDefaultKeyword_0_0() { return cDefaultDefaultKeyword_0_0; }
 
 		//error
 		public EnumLiteralDeclaration getErrorEnumLiteralDeclaration_1() { return cErrorEnumLiteralDeclaration_1; }
 
-		//"error"
+		//'error'
 		public Keyword getErrorErrorKeyword_1_0() { return cErrorErrorKeyword_1_0; }
 
 		//warning
 		public EnumLiteralDeclaration getWarningEnumLiteralDeclaration_2() { return cWarningEnumLiteralDeclaration_2; }
 
-		//"warning"
+		//'warning'
 		public Keyword getWarningWarningKeyword_2_0() { return cWarningWarningKeyword_2_0; }
 
 		//info
 		public EnumLiteralDeclaration getInfoEnumLiteralDeclaration_3() { return cInfoEnumLiteralDeclaration_3; }
 
-		//"info"
+		//'info'
 		public Keyword getInfoInfoKeyword_3_0() { return cInfoInfoKeyword_3_0; }
 
 		//ignore
 		public EnumLiteralDeclaration getIgnoreEnumLiteralDeclaration_4() { return cIgnoreEnumLiteralDeclaration_4; }
 
-		//"ignore"
+		//'ignore'
 		public Keyword getIgnoreIgnoreKeyword_4_0() { return cIgnoreIgnoreKeyword_4_0; }
 	}
 	
@@ -526,17 +521,21 @@ public class SeverityKindElements extends AbstractEnumRuleElementFinder {
 	private final XConstantUnaryOperationElements pXConstantUnaryOperation;
 	private final XFormalParameterDefaultValueLiteralElements pXFormalParameterDefaultValueLiteral;
 	private final XConstantListLiteralElements pXConstantListLiteral;
-	private final SeverityKindElements unknownRuleSeverityKind;
+	private final SeverityKindElements eSeverityKind;
 	
 	private final Grammar grammar;
 
 	private final XbaseGrammarAccess gaXbase;
 
+	private final XtypeGrammarAccess gaXtype;
+
 	@Inject
 	public CheckCfgGrammarAccess(GrammarProvider grammarProvider,
-		XbaseGrammarAccess gaXbase) {
+		XbaseGrammarAccess gaXbase,
+		XtypeGrammarAccess gaXtype) {
 		this.grammar = internalFindGrammar(grammarProvider);
 		this.gaXbase = gaXbase;
+		this.gaXtype = gaXtype;
 		this.pCheckConfiguration = new CheckConfigurationElements();
 		this.pConfiguredLanguageValidator = new ConfiguredLanguageValidatorElements();
 		this.pConfiguredCatalog = new ConfiguredCatalogElements();
@@ -546,7 +545,7 @@ public CheckCfgGrammarAccess(GrammarProvider grammarProvider,
 		this.pXConstantUnaryOperation = new XConstantUnaryOperationElements();
 		this.pXFormalParameterDefaultValueLiteral = new XFormalParameterDefaultValueLiteralElements();
 		this.pXConstantListLiteral = new XConstantListLiteralElements();
-		this.unknownRuleSeverityKind = new SeverityKindElements();
+		this.eSeverityKind = new SeverityKindElements();
 	}
 	
 	protected Grammar internalFindGrammar(GrammarProvider grammarProvider) {
@@ -575,11 +574,15 @@ public XbaseGrammarAccess getXbaseGrammarAccess() {
 		return gaXbase;
 	}
 
+	public XtypeGrammarAccess getXtypeGrammarAccess() {
+		return gaXtype;
+	}
+
 	
 	//CheckConfiguration:
-	//	"check" "configuration" name=ValidID parameterConfigurations+=ConfiguredParameter*
-	//	languageValidatorConfigurations+=ConfiguredLanguageValidator* ("{" legacyCatalogConfigurations+=ConfiguredCatalog*
-	//	"}")?;
+	//	'check' 'configuration' name=ValidID parameterConfigurations+=ConfiguredParameter*
+	//	languageValidatorConfigurations+=ConfiguredLanguageValidator* ('{' legacyCatalogConfigurations+=ConfiguredCatalog*
+	//	'}')?;
 	public CheckConfigurationElements getCheckConfigurationAccess() {
 		return pCheckConfiguration;
 	}
@@ -589,8 +592,8 @@ public ParserRule getCheckConfigurationRule() {
 	}
 
 	//ConfiguredLanguageValidator:
-	//	"for" language=QualifiedName "{" parameterConfigurations+=ConfiguredParameter*
-	//	catalogConfigurations+=ConfiguredCatalog* "}";
+	//	'for' language=QualifiedName '{' parameterConfigurations+=ConfiguredParameter*
+	//	catalogConfigurations+=ConfiguredCatalog* '}';
 	public ConfiguredLanguageValidatorElements getConfiguredLanguageValidatorAccess() {
 		return pConfiguredLanguageValidator;
 	}
@@ -600,8 +603,8 @@ public ParserRule getConfiguredLanguageValidatorRule() {
 	}
 
 	//ConfiguredCatalog:
-	//	{ConfiguredCatalog} "catalog" catalog=[check::CheckCatalog|QualifiedName] "{"
-	//	parameterConfigurations+=ConfiguredParameter* checkConfigurations+=ConfiguredCheck* "}";
+	//	{ConfiguredCatalog} 'catalog' catalog=[check::CheckCatalog|QualifiedName] '{'
+	//	parameterConfigurations+=ConfiguredParameter* checkConfigurations+=ConfiguredCheck* '}';
 	public ConfiguredCatalogElements getConfiguredCatalogAccess() {
 		return pConfiguredCatalog;
 	}
@@ -611,10 +614,8 @@ public ParserRule getConfiguredCatalogRule() {
 	}
 
 	//ConfiguredCheck:
-	//	{ConfiguredCheck}
-	//	/ * TODO configure severity? would require modifying the run-time so that not the severity of the annotation is used * /
-	//	severity=SeverityKind check=[check::Check|QualifiedName] ("(" parameterConfigurations+=ConfiguredParameter (","
-	//	parameterConfigurations+=ConfiguredParameter)* ")")?;
+	//	{ConfiguredCheck} severity=SeverityKind check=[check::Check|QualifiedName] ('('
+	//	parameterConfigurations+=ConfiguredParameter (',' parameterConfigurations+=ConfiguredParameter)* ')')?;
 	public ConfiguredCheckElements getConfiguredCheckAccess() {
 		return pConfiguredCheck;
 	}
@@ -624,7 +625,7 @@ public ParserRule getConfiguredCheckRule() {
 	}
 
 	//ConfiguredParameter:
-	//	{ConfiguredParameter} parameter=[check::FormalParameter|ValidID] "=" newValue=XFormalParameterDefaultValueLiteral;
+	//	{ConfiguredParameter} parameter=[check::FormalParameter|ValidID] '=' newValue=XFormalParameterDefaultValueLiteral;
 	public ConfiguredParameterElements getConfiguredParameterAccess() {
 		return pConfiguredParameter;
 	}
@@ -635,7 +636,7 @@ public ParserRule getConfiguredParameterRule() {
 
 	//// defines restriction of supported parameter types. Copied from check
 	// XSimpleFormalParameterDefaultValueLiteral
-	//returns xbase::XExpression:
+	//xbase::XExpression:
 	//	XBooleanLiteral | XNumberLiteral | XStringLiteral;
 	public XSimpleFormalParameterDefaultValueLiteralElements getXSimpleFormalParameterDefaultValueLiteralAccess() {
 		return pXSimpleFormalParameterDefaultValueLiteral;
@@ -645,7 +646,7 @@ public ParserRule getXSimpleFormalParameterDefaultValueLiteralRule() {
 		return getXSimpleFormalParameterDefaultValueLiteralAccess().getRule();
 	}
 
-	//XConstantUnaryOperation returns xbase::XExpression:
+	//XConstantUnaryOperation xbase::XExpression:
 	//	{xbase::XUnaryOperation} feature=[types::JvmIdentifiableElement|OpUnary] operand=XConstantUnaryOperation |
 	//	XSimpleFormalParameterDefaultValueLiteral;
 	public XConstantUnaryOperationElements getXConstantUnaryOperationAccess() {
@@ -656,9 +657,9 @@ public ParserRule getXConstantUnaryOperationRule() {
 		return getXConstantUnaryOperationAccess().getRule();
 	}
 
-	//// todo add support for enumerations
-	// XFormalParameterDefaultValueLiteral returns xbase::XExpression:
-	//	XConstantUnaryOperation | XConstantListLiteral;
+	//XFormalParameterDefaultValueLiteral xbase::XExpression:
+	//	XConstantUnaryOperation | XConstantListLiteral // todo add support for enumerations
+	//;
 	public XFormalParameterDefaultValueLiteralElements getXFormalParameterDefaultValueLiteralAccess() {
 		return pXFormalParameterDefaultValueLiteral;
 	}
@@ -667,8 +668,8 @@ public ParserRule getXFormalParameterDefaultValueLiteralRule() {
 		return getXFormalParameterDefaultValueLiteralAccess().getRule();
 	}
 
-	//XConstantListLiteral returns xbase::XListLiteral:
-	//	{xbase::XListLiteral} "#" "[" (elements+=XConstantUnaryOperation ("," elements+=XConstantUnaryOperation)*)? "]";
+	//XConstantListLiteral xbase::XListLiteral:
+	//	{xbase::XListLiteral} '#' '[' (elements+=XConstantUnaryOperation (',' elements+=XConstantUnaryOperation)*)? ']';
 	public XConstantListLiteralElements getXConstantListLiteralAccess() {
 		return pXConstantListLiteral;
 	}
@@ -677,11 +678,10 @@ public ParserRule getXConstantListLiteralRule() {
 		return getXConstantListLiteralAccess().getRule();
 	}
 
-	//// copied from Check, enum cannot be referenced
-	// enum SeverityKind:
+	//enum SeverityKind:
 	//	default | error | warning | info | ignore;
 	public SeverityKindElements getSeverityKindAccess() {
-		return unknownRuleSeverityKind;
+		return eSeverityKind;
 	}
 	
 	public EnumRule getSeverityKindRule() {
@@ -698,7 +698,7 @@ public ParserRule getXExpressionRule() {
 		return getXExpressionAccess().getRule();
 	}
 
-	//XAssignment returns XExpression:
+	//XAssignment XExpression:
 	//	{XAssignment} feature=[types::JvmIdentifiableElement|FeatureCallID] OpSingleAssign value=XAssignment | XOrExpression
 	//	(=> ({XBinaryOperation.leftOperand=current} feature=[types::JvmIdentifiableElement|OpMultiAssign])
 	//	rightOperand=XAssignment)?;
@@ -711,7 +711,7 @@ public ParserRule getXAssignmentRule() {
 	}
 
 	//OpSingleAssign:
-	//	"=";
+	//	'=';
 	public XbaseGrammarAccess.OpSingleAssignElements getOpSingleAssignAccess() {
 		return gaXbase.getOpSingleAssignAccess();
 	}
@@ -721,7 +721,7 @@ public ParserRule getOpSingleAssignRule() {
 	}
 
 	//OpMultiAssign:
-	//	"+=" | "-=" | "*=" | "/=" | "%=" | "<" "<" "=" | ">" ">"? ">=";
+	//	'+=' | '-=' | '*=' | '/=' | '%=' | '<' '<' '=' | '>' '>'? '>=';
 	public XbaseGrammarAccess.OpMultiAssignElements getOpMultiAssignAccess() {
 		return gaXbase.getOpMultiAssignAccess();
 	}
@@ -730,7 +730,7 @@ public ParserRule getOpMultiAssignRule() {
 		return getOpMultiAssignAccess().getRule();
 	}
 
-	//XOrExpression returns XExpression:
+	//XOrExpression XExpression:
 	//	XAndExpression (=> ({XBinaryOperation.leftOperand=current} feature=[types::JvmIdentifiableElement|OpOr])
 	//	rightOperand=XAndExpression)*;
 	public XbaseGrammarAccess.XOrExpressionElements getXOrExpressionAccess() {
@@ -742,7 +742,7 @@ public ParserRule getXOrExpressionRule() {
 	}
 
 	//OpOr:
-	//	"||";
+	//	'||';
 	public XbaseGrammarAccess.OpOrElements getOpOrAccess() {
 		return gaXbase.getOpOrAccess();
 	}
@@ -751,7 +751,7 @@ public ParserRule getOpOrRule() {
 		return getOpOrAccess().getRule();
 	}
 
-	//XAndExpression returns XExpression:
+	//XAndExpression XExpression:
 	//	XEqualityExpression (=> ({XBinaryOperation.leftOperand=current} feature=[types::JvmIdentifiableElement|OpAnd])
 	//	rightOperand=XEqualityExpression)*;
 	public XbaseGrammarAccess.XAndExpressionElements getXAndExpressionAccess() {
@@ -763,7 +763,7 @@ public ParserRule getXAndExpressionRule() {
 	}
 
 	//OpAnd:
-	//	"&&";
+	//	'&&';
 	public XbaseGrammarAccess.OpAndElements getOpAndAccess() {
 		return gaXbase.getOpAndAccess();
 	}
@@ -772,7 +772,7 @@ public ParserRule getOpAndRule() {
 		return getOpAndAccess().getRule();
 	}
 
-	//XEqualityExpression returns XExpression:
+	//XEqualityExpression XExpression:
 	//	XRelationalExpression (=> ({XBinaryOperation.leftOperand=current} feature=[types::JvmIdentifiableElement|OpEquality])
 	//	rightOperand=XRelationalExpression)*;
 	public XbaseGrammarAccess.XEqualityExpressionElements getXEqualityExpressionAccess() {
@@ -784,7 +784,7 @@ public ParserRule getXEqualityExpressionRule() {
 	}
 
 	//OpEquality:
-	//	"==" | "!=" | "===" | "!==";
+	//	'==' | '!=' | '===' | '!==';
 	public XbaseGrammarAccess.OpEqualityElements getOpEqualityAccess() {
 		return gaXbase.getOpEqualityAccess();
 	}
@@ -793,8 +793,8 @@ public ParserRule getOpEqualityRule() {
 		return getOpEqualityAccess().getRule();
 	}
 
-	//XRelationalExpression returns XExpression:
-	//	XOtherOperatorExpression (=> ({XInstanceOfExpression.expression=current} "instanceof") type=JvmTypeReference | =>
+	//XRelationalExpression XExpression:
+	//	XOtherOperatorExpression (=> ({XInstanceOfExpression.expression=current} 'instanceof') type=JvmTypeReference | =>
 	//	({XBinaryOperation.leftOperand=current} feature=[types::JvmIdentifiableElement|OpCompare])
 	//	rightOperand=XOtherOperatorExpression)*;
 	public XbaseGrammarAccess.XRelationalExpressionElements getXRelationalExpressionAccess() {
@@ -806,7 +806,7 @@ public ParserRule getXRelationalExpressionRule() {
 	}
 
 	//OpCompare:
-	//	">=" | "<" "=" | ">" | "<";
+	//	'>=' | '<' '=' | '>' | '<';
 	public XbaseGrammarAccess.OpCompareElements getOpCompareAccess() {
 		return gaXbase.getOpCompareAccess();
 	}
@@ -815,7 +815,7 @@ public ParserRule getOpCompareRule() {
 		return getOpCompareAccess().getRule();
 	}
 
-	//XOtherOperatorExpression returns XExpression:
+	//XOtherOperatorExpression XExpression:
 	//	XAdditiveExpression (=> ({XBinaryOperation.leftOperand=current} feature=[types::JvmIdentifiableElement|OpOther])
 	//	rightOperand=XAdditiveExpression)*;
 	public XbaseGrammarAccess.XOtherOperatorExpressionElements getXOtherOperatorExpressionAccess() {
@@ -827,7 +827,7 @@ public ParserRule getXOtherOperatorExpressionRule() {
 	}
 
 	//OpOther:
-	//	"->" | "..<" | ">" ".." | ".." | "=>" | ">" (=> (">" ">") | ">") | "<" (=> ("<" "<") | "<" | "=>") | "<>" | "?:";
+	//	'->' | '..<' | '>' '..' | '..' | '=>' | '>' (=> ('>' '>') | '>') | '<' (=> ('<' '<') | '<' | '=>') | '<>' | '?:';
 	public XbaseGrammarAccess.OpOtherElements getOpOtherAccess() {
 		return gaXbase.getOpOtherAccess();
 	}
@@ -836,7 +836,7 @@ public ParserRule getOpOtherRule() {
 		return getOpOtherAccess().getRule();
 	}
 
-	//XAdditiveExpression returns XExpression:
+	//XAdditiveExpression XExpression:
 	//	XMultiplicativeExpression (=> ({XBinaryOperation.leftOperand=current} feature=[types::JvmIdentifiableElement|OpAdd])
 	//	rightOperand=XMultiplicativeExpression)*;
 	public XbaseGrammarAccess.XAdditiveExpressionElements getXAdditiveExpressionAccess() {
@@ -848,7 +848,7 @@ public ParserRule getXAdditiveExpressionRule() {
 	}
 
 	//OpAdd:
-	//	"+" | "-";
+	//	'+' | '-';
 	public XbaseGrammarAccess.OpAddElements getOpAddAccess() {
 		return gaXbase.getOpAddAccess();
 	}
@@ -857,7 +857,7 @@ public ParserRule getOpAddRule() {
 		return getOpAddAccess().getRule();
 	}
 
-	//XMultiplicativeExpression returns XExpression:
+	//XMultiplicativeExpression XExpression:
 	//	XUnaryOperation (=> ({XBinaryOperation.leftOperand=current} feature=[types::JvmIdentifiableElement|OpMulti])
 	//	rightOperand=XUnaryOperation)*;
 	public XbaseGrammarAccess.XMultiplicativeExpressionElements getXMultiplicativeExpressionAccess() {
@@ -869,7 +869,7 @@ public ParserRule getXMultiplicativeExpressionRule() {
 	}
 
 	//OpMulti:
-	//	"*" | "**" | "/" | "%";
+	//	'*' | '**' | '/' | '%';
 	public XbaseGrammarAccess.OpMultiElements getOpMultiAccess() {
 		return gaXbase.getOpMultiAccess();
 	}
@@ -878,7 +878,7 @@ public ParserRule getOpMultiRule() {
 		return getOpMultiAccess().getRule();
 	}
 
-	//XUnaryOperation returns XExpression:
+	//XUnaryOperation XExpression:
 	//	{XUnaryOperation} feature=[types::JvmIdentifiableElement|OpUnary] operand=XUnaryOperation | XCastedExpression;
 	public XbaseGrammarAccess.XUnaryOperationElements getXUnaryOperationAccess() {
 		return gaXbase.getXUnaryOperationAccess();
@@ -898,8 +898,8 @@ public ParserRule getOpUnaryRule() {
 		return getOpUnaryAccess().getRule();
 	}
 
-	//XCastedExpression returns XExpression:
-	//	XPostfixOperation (=> ({XCastedExpression.target=current} "as") type=JvmTypeReference)*;
+	//XCastedExpression XExpression:
+	//	XPostfixOperation (=> ({XCastedExpression.target=current} 'as') type=JvmTypeReference)*;
 	public XbaseGrammarAccess.XCastedExpressionElements getXCastedExpressionAccess() {
 		return gaXbase.getXCastedExpressionAccess();
 	}
@@ -908,7 +908,7 @@ public ParserRule getXCastedExpressionRule() {
 		return getXCastedExpressionAccess().getRule();
 	}
 
-	//XPostfixOperation returns XExpression:
+	//XPostfixOperation XExpression:
 	//	XMemberFeatureCall => ({XPostfixOperation.operand=current} feature=[types::JvmIdentifiableElement|OpPostfix])?;
 	public XbaseGrammarAccess.XPostfixOperationElements getXPostfixOperationAccess() {
 		return gaXbase.getXPostfixOperationAccess();
@@ -928,13 +928,13 @@ public ParserRule getOpPostfixRule() {
 		return getOpPostfixAccess().getRule();
 	}
 
-	//XMemberFeatureCall returns XExpression:
-	//	XPrimaryExpression (=> ({XAssignment.assignable=current} ("." | explicitStatic?="::")
+	//XMemberFeatureCall XExpression:
+	//	XPrimaryExpression (=> ({XAssignment.assignable=current} ('.' | explicitStatic?="::")
 	//	feature=[types::JvmIdentifiableElement|FeatureCallID] OpSingleAssign) value=XAssignment | =>
-	//	({XMemberFeatureCall.memberCallTarget=current} ("." | nullSafe?="?." | explicitStatic?="::")) ("<"
-	//	typeArguments+=JvmArgumentTypeReference ("," typeArguments+=JvmArgumentTypeReference)* ">")?
-	//	feature=[types::JvmIdentifiableElement|IdOrSuper] (=> explicitOperationCall?="(" (memberCallArguments+=XShortClosure
-	//	| memberCallArguments+=XExpression ("," memberCallArguments+=XExpression)*)? ")")? memberCallArguments+=XClosure?)*;
+	//	({XMemberFeatureCall.memberCallTarget=current} ("." | nullSafe?="?." | explicitStatic?="::")) ('<'
+	//	typeArguments+=JvmArgumentTypeReference (',' typeArguments+=JvmArgumentTypeReference)* '>')?
+	//	feature=[types::JvmIdentifiableElement|IdOrSuper] (=> explicitOperationCall?='(' (memberCallArguments+=XShortClosure
+	//	| memberCallArguments+=XExpression (',' memberCallArguments+=XExpression)*)? ')')? memberCallArguments+=XClosure?)*;
 	public XbaseGrammarAccess.XMemberFeatureCallElements getXMemberFeatureCallAccess() {
 		return gaXbase.getXMemberFeatureCallAccess();
 	}
@@ -943,7 +943,7 @@ public ParserRule getXMemberFeatureCallRule() {
 		return getXMemberFeatureCallAccess().getRule();
 	}
 
-	//XPrimaryExpression returns XExpression:
+	//XPrimaryExpression XExpression:
 	//	XConstructorCall | XBlockExpression | XSwitchExpression | XSynchronizedExpression | XFeatureCall | XLiteral |
 	//	XIfExpression | XForLoopExpression | XBasicForLoopExpression | XWhileExpression | XDoWhileExpression |
 	//	XThrowExpression | XReturnExpression | XTryCatchFinallyExpression | XParenthesizedExpression;
@@ -955,7 +955,7 @@ public ParserRule getXPrimaryExpressionRule() {
 		return getXPrimaryExpressionAccess().getRule();
 	}
 
-	//XLiteral returns XExpression:
+	//XLiteral XExpression:
 	//	XCollectionLiteral | XClosure | XBooleanLiteral | XNumberLiteral | XNullLiteral | XStringLiteral | XTypeLiteral;
 	public XbaseGrammarAccess.XLiteralElements getXLiteralAccess() {
 		return gaXbase.getXLiteralAccess();
@@ -976,7 +976,7 @@ public ParserRule getXCollectionLiteralRule() {
 	}
 
 	//XSetLiteral:
-	//	{XSetLiteral} "#" "{" (elements+=XExpression ("," elements+=XExpression)*)? "}";
+	//	{XSetLiteral} '#' '{' (elements+=XExpression (',' elements+=XExpression)*)? '}';
 	public XbaseGrammarAccess.XSetLiteralElements getXSetLiteralAccess() {
 		return gaXbase.getXSetLiteralAccess();
 	}
@@ -986,7 +986,7 @@ public ParserRule getXSetLiteralRule() {
 	}
 
 	//XListLiteral:
-	//	{XListLiteral} "#" "[" (elements+=XExpression ("," elements+=XExpression)*)? "]";
+	//	{XListLiteral} '#' '[' (elements+=XExpression (',' elements+=XExpression)*)? ']';
 	public XbaseGrammarAccess.XListLiteralElements getXListLiteralAccess() {
 		return gaXbase.getXListLiteralAccess();
 	}
@@ -995,9 +995,9 @@ public ParserRule getXListLiteralRule() {
 		return getXListLiteralAccess().getRule();
 	}
 
-	//XClosure returns XExpression:
-	//	=> ({XClosure} "[") => ((declaredFormalParameters+=JvmFormalParameter (","
-	//	declaredFormalParameters+=JvmFormalParameter)*)? explicitSyntax?="|")? expression=XExpressionInClosure "]";
+	//XClosure XExpression:
+	//	=> ({XClosure} '[') => ((declaredFormalParameters+=JvmFormalParameter (','
+	//	declaredFormalParameters+=JvmFormalParameter)*)? explicitSyntax?='|')? expression=XExpressionInClosure ']';
 	public XbaseGrammarAccess.XClosureElements getXClosureAccess() {
 		return gaXbase.getXClosureAccess();
 	}
@@ -1006,8 +1006,8 @@ public ParserRule getXClosureRule() {
 		return getXClosureAccess().getRule();
 	}
 
-	//XExpressionInClosure returns XExpression:
-	//	{XBlockExpression} (expressions+=XExpressionOrVarDeclaration ";"?)*;
+	//XExpressionInClosure XExpression:
+	//	{XBlockExpression} (expressions+=XExpressionOrVarDeclaration ';'?)*;
 	public XbaseGrammarAccess.XExpressionInClosureElements getXExpressionInClosureAccess() {
 		return gaXbase.getXExpressionInClosureAccess();
 	}
@@ -1016,9 +1016,9 @@ public ParserRule getXExpressionInClosureRule() {
 		return getXExpressionInClosureAccess().getRule();
 	}
 
-	//XShortClosure returns XExpression:
-	//	=> ({XClosure} (declaredFormalParameters+=JvmFormalParameter ("," declaredFormalParameters+=JvmFormalParameter)*)?
-	//	explicitSyntax?="|") expression=XExpression;
+	//XShortClosure XExpression:
+	//	=> ({XClosure} (declaredFormalParameters+=JvmFormalParameter (',' declaredFormalParameters+=JvmFormalParameter)*)?
+	//	explicitSyntax?='|') expression=XExpression;
 	public XbaseGrammarAccess.XShortClosureElements getXShortClosureAccess() {
 		return gaXbase.getXShortClosureAccess();
 	}
@@ -1027,8 +1027,8 @@ public ParserRule getXShortClosureRule() {
 		return getXShortClosureAccess().getRule();
 	}
 
-	//XParenthesizedExpression returns XExpression:
-	//	"(" XExpression ")";
+	//XParenthesizedExpression XExpression:
+	//	'(' XExpression ')';
 	public XbaseGrammarAccess.XParenthesizedExpressionElements getXParenthesizedExpressionAccess() {
 		return gaXbase.getXParenthesizedExpressionAccess();
 	}
@@ -1037,8 +1037,8 @@ public ParserRule getXParenthesizedExpressionRule() {
 		return getXParenthesizedExpressionAccess().getRule();
 	}
 
-	//XIfExpression returns XExpression:
-	//	{XIfExpression} "if" "(" if=XExpression ")" then=XExpression ("else" else=XExpression)?;
+	//XIfExpression XExpression:
+	//	{XIfExpression} 'if' '(' if=XExpression ')' then=XExpression (=> 'else' else=XExpression)?;
 	public XbaseGrammarAccess.XIfExpressionElements getXIfExpressionAccess() {
 		return gaXbase.getXIfExpressionAccess();
 	}
@@ -1047,10 +1047,10 @@ public ParserRule getXIfExpressionRule() {
 		return getXIfExpressionAccess().getRule();
 	}
 
-	//XSwitchExpression returns XExpression:
-	//	{XSwitchExpression} "switch" (=> ("(" declaredParam=JvmFormalParameter ":") switch=XExpression ")" | =>
-	//	(declaredParam=JvmFormalParameter ":")? switch=XExpression) "{" cases+=XCasePart* ("default" ":"
-	//	default=XExpression)? "}";
+	//XSwitchExpression XExpression:
+	//	{XSwitchExpression} 'switch' (=> ('(' declaredParam=JvmFormalParameter ':') switch=XExpression ')' | =>
+	//	(declaredParam=JvmFormalParameter ':')? switch=XExpression) '{' cases+=XCasePart* ('default' ':'
+	//	default=XExpression)? '}';
 	public XbaseGrammarAccess.XSwitchExpressionElements getXSwitchExpressionAccess() {
 		return gaXbase.getXSwitchExpressionAccess();
 	}
@@ -1060,7 +1060,7 @@ public ParserRule getXSwitchExpressionRule() {
 	}
 
 	//XCasePart:
-	//	{XCasePart} typeGuard=JvmTypeReference? ("case" case=XExpression)? (":" then=XExpression | fallThrough?=",");
+	//	{XCasePart} typeGuard=JvmTypeReference? ('case' case=XExpression)? (':' then=XExpression | fallThrough?=',');
 	public XbaseGrammarAccess.XCasePartElements getXCasePartAccess() {
 		return gaXbase.getXCasePartAccess();
 	}
@@ -1069,8 +1069,8 @@ public ParserRule getXCasePartRule() {
 		return getXCasePartAccess().getRule();
 	}
 
-	//XForLoopExpression returns XExpression:
-	//	=> ({XForLoopExpression} "for" "(" declaredParam=JvmFormalParameter ":") forExpression=XExpression ")"
+	//XForLoopExpression XExpression:
+	//	=> ({XForLoopExpression} 'for' '(' declaredParam=JvmFormalParameter ':') forExpression=XExpression ')'
 	//	eachExpression=XExpression;
 	public XbaseGrammarAccess.XForLoopExpressionElements getXForLoopExpressionAccess() {
 		return gaXbase.getXForLoopExpressionAccess();
@@ -1080,10 +1080,10 @@ public ParserRule getXForLoopExpressionRule() {
 		return getXForLoopExpressionAccess().getRule();
 	}
 
-	//XBasicForLoopExpression returns XExpression:
-	//	{XBasicForLoopExpression} "for" "(" (initExpressions+=XExpressionOrVarDeclaration (","
-	//	initExpressions+=XExpressionOrVarDeclaration)*)? ";" expression=XExpression? ";" (updateExpressions+=XExpression (","
-	//	updateExpressions+=XExpression)*)? ")" eachExpression=XExpression;
+	//XBasicForLoopExpression XExpression:
+	//	{XBasicForLoopExpression} 'for' '(' (initExpressions+=XExpressionOrVarDeclaration (','
+	//	initExpressions+=XExpressionOrVarDeclaration)*)? ';' expression=XExpression? ';' (updateExpressions+=XExpression (','
+	//	updateExpressions+=XExpression)*)? ')' eachExpression=XExpression;
 	public XbaseGrammarAccess.XBasicForLoopExpressionElements getXBasicForLoopExpressionAccess() {
 		return gaXbase.getXBasicForLoopExpressionAccess();
 	}
@@ -1092,8 +1092,8 @@ public ParserRule getXBasicForLoopExpressionRule() {
 		return getXBasicForLoopExpressionAccess().getRule();
 	}
 
-	//XWhileExpression returns XExpression:
-	//	{XWhileExpression} "while" "(" predicate=XExpression ")" body=XExpression;
+	//XWhileExpression XExpression:
+	//	{XWhileExpression} 'while' '(' predicate=XExpression ')' body=XExpression;
 	public XbaseGrammarAccess.XWhileExpressionElements getXWhileExpressionAccess() {
 		return gaXbase.getXWhileExpressionAccess();
 	}
@@ -1102,8 +1102,8 @@ public ParserRule getXWhileExpressionRule() {
 		return getXWhileExpressionAccess().getRule();
 	}
 
-	//XDoWhileExpression returns XExpression:
-	//	{XDoWhileExpression} "do" body=XExpression "while" "(" predicate=XExpression ")";
+	//XDoWhileExpression XExpression:
+	//	{XDoWhileExpression} 'do' body=XExpression 'while' '(' predicate=XExpression ')';
 	public XbaseGrammarAccess.XDoWhileExpressionElements getXDoWhileExpressionAccess() {
 		return gaXbase.getXDoWhileExpressionAccess();
 	}
@@ -1112,8 +1112,8 @@ public ParserRule getXDoWhileExpressionRule() {
 		return getXDoWhileExpressionAccess().getRule();
 	}
 
-	//XBlockExpression returns XExpression:
-	//	{XBlockExpression} "{" (expressions+=XExpressionOrVarDeclaration ";"?)* "}";
+	//XBlockExpression XExpression:
+	//	{XBlockExpression} '{' (expressions+=XExpressionOrVarDeclaration ';'?)* '}';
 	public XbaseGrammarAccess.XBlockExpressionElements getXBlockExpressionAccess() {
 		return gaXbase.getXBlockExpressionAccess();
 	}
@@ -1122,7 +1122,7 @@ public ParserRule getXBlockExpressionRule() {
 		return getXBlockExpressionAccess().getRule();
 	}
 
-	//XExpressionOrVarDeclaration returns XExpression:
+	//XExpressionOrVarDeclaration XExpression:
 	//	XVariableDeclaration | XExpression;
 	public XbaseGrammarAccess.XExpressionOrVarDeclarationElements getXExpressionOrVarDeclarationAccess() {
 		return gaXbase.getXExpressionOrVarDeclarationAccess();
@@ -1132,8 +1132,8 @@ public ParserRule getXExpressionOrVarDeclarationRule() {
 		return getXExpressionOrVarDeclarationAccess().getRule();
 	}
 
-	//XVariableDeclaration returns XExpression:
-	//	{XVariableDeclaration} (writeable?="var" | "val") (=> (type=JvmTypeReference name=ValidID) | name=ValidID) ("="
+	//XVariableDeclaration XExpression:
+	//	{XVariableDeclaration} (writeable?='var' | 'val') (=> (type=JvmTypeReference name=ValidID) | name=ValidID) ('='
 	//	right=XExpression)?;
 	public XbaseGrammarAccess.XVariableDeclarationElements getXVariableDeclarationAccess() {
 		return gaXbase.getXVariableDeclarationAccess();
@@ -1143,7 +1143,7 @@ public ParserRule getXVariableDeclarationRule() {
 		return getXVariableDeclarationAccess().getRule();
 	}
 
-	//JvmFormalParameter returns types::JvmFormalParameter:
+	//JvmFormalParameter types::JvmFormalParameter:
 	//	parameterType=JvmTypeReference? name=ValidID;
 	public XbaseGrammarAccess.JvmFormalParameterElements getJvmFormalParameterAccess() {
 		return gaXbase.getJvmFormalParameterAccess();
@@ -1153,7 +1153,7 @@ public ParserRule getJvmFormalParameterRule() {
 		return getJvmFormalParameterAccess().getRule();
 	}
 
-	//FullJvmFormalParameter returns types::JvmFormalParameter:
+	//FullJvmFormalParameter types::JvmFormalParameter:
 	//	parameterType=JvmTypeReference name=ValidID;
 	public XbaseGrammarAccess.FullJvmFormalParameterElements getFullJvmFormalParameterAccess() {
 		return gaXbase.getFullJvmFormalParameterAccess();
@@ -1163,10 +1163,10 @@ public ParserRule getFullJvmFormalParameterRule() {
 		return getFullJvmFormalParameterAccess().getRule();
 	}
 
-	//XFeatureCall returns XExpression:
-	//	{XFeatureCall} ("<" typeArguments+=JvmArgumentTypeReference ("," typeArguments+=JvmArgumentTypeReference)* ">")?
-	//	feature=[types::JvmIdentifiableElement|IdOrSuper] (=> explicitOperationCall?="(" (featureCallArguments+=XShortClosure
-	//	| featureCallArguments+=XExpression ("," featureCallArguments+=XExpression)*)? ")")? featureCallArguments+=XClosure?;
+	//XFeatureCall XExpression:
+	//	{XFeatureCall} ('<' typeArguments+=JvmArgumentTypeReference (',' typeArguments+=JvmArgumentTypeReference)* '>')?
+	//	feature=[types::JvmIdentifiableElement|IdOrSuper] (=> explicitOperationCall?='(' (featureCallArguments+=XShortClosure
+	//	| featureCallArguments+=XExpression (',' featureCallArguments+=XExpression)*)? ')')? featureCallArguments+=XClosure?;
 	public XbaseGrammarAccess.XFeatureCallElements getXFeatureCallAccess() {
 		return gaXbase.getXFeatureCallAccess();
 	}
@@ -1176,7 +1176,7 @@ public ParserRule getXFeatureCallRule() {
 	}
 
 	//FeatureCallID:
-	//	ValidID | "extends" | "static" | "import" | "extension";
+	//	ValidID | 'extends' | 'static' | 'import' | 'extension';
 	public XbaseGrammarAccess.FeatureCallIDElements getFeatureCallIDAccess() {
 		return gaXbase.getFeatureCallIDAccess();
 	}
@@ -1186,7 +1186,7 @@ public ParserRule getFeatureCallIDRule() {
 	}
 
 	//IdOrSuper:
-	//	FeatureCallID | "super";
+	//	FeatureCallID | 'super';
 	public XbaseGrammarAccess.IdOrSuperElements getIdOrSuperAccess() {
 		return gaXbase.getIdOrSuperAccess();
 	}
@@ -1195,10 +1195,10 @@ public ParserRule getIdOrSuperRule() {
 		return getIdOrSuperAccess().getRule();
 	}
 
-	//XConstructorCall returns XExpression:
-	//	{XConstructorCall} "new" constructor=[types::JvmConstructor|QualifiedName] ("<"
-	//	typeArguments+=JvmArgumentTypeReference ("," typeArguments+=JvmArgumentTypeReference)* ">")? (=>
-	//	explicitConstructorCall?="(" (arguments+=XShortClosure | arguments+=XExpression ("," arguments+=XExpression)*)? ")")?
+	//XConstructorCall XExpression:
+	//	{XConstructorCall} 'new' constructor=[types::JvmConstructor|QualifiedName] (=> '<'
+	//	typeArguments+=JvmArgumentTypeReference (',' typeArguments+=JvmArgumentTypeReference)* '>')? (=>
+	//	explicitConstructorCall?='(' (arguments+=XShortClosure | arguments+=XExpression (',' arguments+=XExpression)*)? ')')?
 	//	arguments+=XClosure?;
 	public XbaseGrammarAccess.XConstructorCallElements getXConstructorCallAccess() {
 		return gaXbase.getXConstructorCallAccess();
@@ -1208,8 +1208,8 @@ public ParserRule getXConstructorCallRule() {
 		return getXConstructorCallAccess().getRule();
 	}
 
-	//XBooleanLiteral returns XExpression:
-	//	{XBooleanLiteral} ("false" | isTrue?="true");
+	//XBooleanLiteral XExpression:
+	//	{XBooleanLiteral} ('false' | isTrue?='true');
 	public XbaseGrammarAccess.XBooleanLiteralElements getXBooleanLiteralAccess() {
 		return gaXbase.getXBooleanLiteralAccess();
 	}
@@ -1218,8 +1218,8 @@ public ParserRule getXBooleanLiteralRule() {
 		return getXBooleanLiteralAccess().getRule();
 	}
 
-	//XNullLiteral returns XExpression:
-	//	{XNullLiteral} "null";
+	//XNullLiteral XExpression:
+	//	{XNullLiteral} 'null';
 	public XbaseGrammarAccess.XNullLiteralElements getXNullLiteralAccess() {
 		return gaXbase.getXNullLiteralAccess();
 	}
@@ -1228,7 +1228,7 @@ public ParserRule getXNullLiteralRule() {
 		return getXNullLiteralAccess().getRule();
 	}
 
-	//XNumberLiteral returns XExpression:
+	//XNumberLiteral XExpression:
 	//	{XNumberLiteral} value=Number;
 	public XbaseGrammarAccess.XNumberLiteralElements getXNumberLiteralAccess() {
 		return gaXbase.getXNumberLiteralAccess();
@@ -1238,7 +1238,7 @@ public ParserRule getXNumberLiteralRule() {
 		return getXNumberLiteralAccess().getRule();
 	}
 
-	//XStringLiteral returns XExpression:
+	//XStringLiteral XExpression:
 	//	{XStringLiteral} value=STRING;
 	public XbaseGrammarAccess.XStringLiteralElements getXStringLiteralAccess() {
 		return gaXbase.getXStringLiteralAccess();
@@ -1248,8 +1248,8 @@ public ParserRule getXStringLiteralRule() {
 		return getXStringLiteralAccess().getRule();
 	}
 
-	//XTypeLiteral returns XExpression:
-	//	{XTypeLiteral} "typeof" "(" type=[types::JvmType|QualifiedName] arrayDimensions+=ArrayBrackets* ")";
+	//XTypeLiteral XExpression:
+	//	{XTypeLiteral} 'typeof' '(' type=[types::JvmType|QualifiedName] arrayDimensions+=ArrayBrackets* ')';
 	public XbaseGrammarAccess.XTypeLiteralElements getXTypeLiteralAccess() {
 		return gaXbase.getXTypeLiteralAccess();
 	}
@@ -1258,8 +1258,8 @@ public ParserRule getXTypeLiteralRule() {
 		return getXTypeLiteralAccess().getRule();
 	}
 
-	//XThrowExpression returns XExpression:
-	//	{XThrowExpression} "throw" expression=XExpression;
+	//XThrowExpression XExpression:
+	//	{XThrowExpression} 'throw' expression=XExpression;
 	public XbaseGrammarAccess.XThrowExpressionElements getXThrowExpressionAccess() {
 		return gaXbase.getXThrowExpressionAccess();
 	}
@@ -1268,8 +1268,8 @@ public ParserRule getXThrowExpressionRule() {
 		return getXThrowExpressionAccess().getRule();
 	}
 
-	//XReturnExpression returns XExpression:
-	//	{XReturnExpression} "return" -> expression=XExpression?;
+	//XReturnExpression XExpression:
+	//	{XReturnExpression} 'return' -> expression=XExpression?;
 	public XbaseGrammarAccess.XReturnExpressionElements getXReturnExpressionAccess() {
 		return gaXbase.getXReturnExpressionAccess();
 	}
@@ -1278,9 +1278,9 @@ public ParserRule getXReturnExpressionRule() {
 		return getXReturnExpressionAccess().getRule();
 	}
 
-	//XTryCatchFinallyExpression returns XExpression:
-	//	{XTryCatchFinallyExpression} "try" expression=XExpression (catchClauses+=XCatchClause+ ("finally"
-	//	finallyExpression=XExpression)? | "finally" finallyExpression=XExpression);
+	//XTryCatchFinallyExpression XExpression:
+	//	{XTryCatchFinallyExpression} 'try' expression=XExpression (catchClauses+=XCatchClause+ (=> 'finally'
+	//	finallyExpression=XExpression)? | 'finally' finallyExpression=XExpression);
 	public XbaseGrammarAccess.XTryCatchFinallyExpressionElements getXTryCatchFinallyExpressionAccess() {
 		return gaXbase.getXTryCatchFinallyExpressionAccess();
 	}
@@ -1289,8 +1289,8 @@ public ParserRule getXTryCatchFinallyExpressionRule() {
 		return getXTryCatchFinallyExpressionAccess().getRule();
 	}
 
-	//XSynchronizedExpression returns XExpression:
-	//	=> ({XSynchronizedExpression} "synchronized" "(") param=XExpression ")" expression=XExpression;
+	//XSynchronizedExpression XExpression:
+	//	=> ({XSynchronizedExpression} 'synchronized' '(') param=XExpression ')' expression=XExpression;
 	public XbaseGrammarAccess.XSynchronizedExpressionElements getXSynchronizedExpressionAccess() {
 		return gaXbase.getXSynchronizedExpressionAccess();
 	}
@@ -1300,7 +1300,7 @@ public ParserRule getXSynchronizedExpressionRule() {
 	}
 
 	//XCatchClause:
-	//	"catch" "(" declaredParam=FullJvmFormalParameter ")" expression=XExpression;
+	//	=> 'catch' '(' declaredParam=FullJvmFormalParameter ')' expression=XExpression;
 	public XbaseGrammarAccess.XCatchClauseElements getXCatchClauseAccess() {
 		return gaXbase.getXCatchClauseAccess();
 	}
@@ -1309,8 +1309,9 @@ public ParserRule getXCatchClauseRule() {
 		return getXCatchClauseAccess().getRule();
 	}
 
+	//@Override
 	//QualifiedName:
-	//	ValidID ("." ValidID)*;
+	//	ValidID (=> '.' ValidID)*;
 	public XbaseGrammarAccess.QualifiedNameElements getQualifiedNameAccess() {
 		return gaXbase.getQualifiedNameAccess();
 	}
@@ -1320,7 +1321,7 @@ public ParserRule getQualifiedNameRule() {
 	}
 
 	//Number hidden():
-	//	HEX | (INT | DECIMAL) ("." (INT | DECIMAL))?;
+	//	HEX | (INT | DECIMAL) ('.' (INT | DECIMAL))?;
 	public XbaseGrammarAccess.NumberElements getNumberAccess() {
 		return gaXbase.getNumberAccess();
 	}
@@ -1329,12 +1330,12 @@ public ParserRule getNumberRule() {
 		return getNumberAccess().getRule();
 	}
 
-	/// **
-	// * Dummy rule, for "better" downwards compatibility, since GrammarAccess generates non-static inner classes, 
+	///**
+	// * Dummy rule, for "better" downwards compatibility, since GrammarAccess generates non-static inner classes,
 	// * which makes downstream grammars break on classloading, when a rule is removed.
-	// * /
+	// */
 	//StaticQualifier:
-	//	(ValidID "::")+;
+	//	(ValidID '::')+;
 	public XbaseGrammarAccess.StaticQualifierElements getStaticQualifierAccess() {
 		return gaXbase.getStaticQualifierAccess();
 	}
@@ -1343,20 +1344,20 @@ public ParserRule getStaticQualifierRule() {
 		return getStaticQualifierAccess().getRule();
 	}
 
-	//terminal HEX returns ecore::EString:
-	//	("0x" | "0X") ("0".."9" | "a".."f" | "A".."F" | "_")+ ("#" (("b" | "B") ("i" | "I") | ("l" | "L")))?;
+	//terminal HEX:
+	//	('0x' | '0X') ('0'..'9' | 'a'..'f' | 'A'..'F' | '_')+ ('#' (('b' | 'B') ('i' | 'I') | ('l' | 'L')))?;
 	public TerminalRule getHEXRule() {
 		return gaXbase.getHEXRule();
 	} 
 
 	//terminal INT returns ecore::EInt:
-	//	"0".."9" ("0".."9" | "_")*;
+	//	'0'..'9' ('0'..'9' | '_')*;
 	public TerminalRule getINTRule() {
 		return gaXbase.getINTRule();
 	} 
 
-	//terminal DECIMAL returns ecore::EString:
-	//	INT (("e" | "E") ("+" | "-")? INT)? (("b" | "B") ("i" | "I" | "d" | "D") | ("l" | "L" | "d" | "D" | "f" | "F"))?;
+	//terminal DECIMAL:
+	//	INT (('e' | 'E') ('+' | '-')? INT)? (('b' | 'B') ('i' | 'I' | 'd' | 'D') | ('l' | 'L' | 'd' | 'D' | 'f' | 'F'))?;
 	public TerminalRule getDECIMALRule() {
 		return gaXbase.getDECIMALRule();
 	} 
@@ -1365,7 +1366,7 @@ public TerminalRule getDECIMALRule() {
 	//	JvmParameterizedTypeReference => ({JvmGenericArrayTypeReference.componentType=current} ArrayBrackets)* |
 	//	XFunctionTypeRef;
 	public XtypeGrammarAccess.JvmTypeReferenceElements getJvmTypeReferenceAccess() {
-		return gaXbase.getJvmTypeReferenceAccess();
+		return gaXtype.getJvmTypeReferenceAccess();
 	}
 	
 	public ParserRule getJvmTypeReferenceRule() {
@@ -1373,9 +1374,9 @@ public ParserRule getJvmTypeReferenceRule() {
 	}
 
 	//ArrayBrackets:
-	//	"[" "]";
+	//	'[' ']';
 	public XtypeGrammarAccess.ArrayBracketsElements getArrayBracketsAccess() {
-		return gaXbase.getArrayBracketsAccess();
+		return gaXtype.getArrayBracketsAccess();
 	}
 	
 	public ParserRule getArrayBracketsRule() {
@@ -1383,9 +1384,9 @@ public ParserRule getArrayBracketsRule() {
 	}
 
 	//XFunctionTypeRef:
-	//	("(" (paramTypes+=JvmTypeReference ("," paramTypes+=JvmTypeReference)*)? ")")? "=>" returnType=JvmTypeReference;
+	//	('(' (paramTypes+=JvmTypeReference (',' paramTypes+=JvmTypeReference)*)? ')')? '=>' returnType=JvmTypeReference;
 	public XtypeGrammarAccess.XFunctionTypeRefElements getXFunctionTypeRefAccess() {
-		return gaXbase.getXFunctionTypeRefAccess();
+		return gaXtype.getXFunctionTypeRefAccess();
 	}
 	
 	public ParserRule getXFunctionTypeRefRule() {
@@ -1393,21 +1394,21 @@ public ParserRule getXFunctionTypeRefRule() {
 	}
 
 	//JvmParameterizedTypeReference:
-	//	type=[JvmType|QualifiedName] ("<" arguments+=JvmArgumentTypeReference ("," arguments+=JvmArgumentTypeReference)* ">"
-	//	(=> ({JvmInnerTypeReference.outer=current} ".") type=[JvmType|ValidID] ("<" arguments+=JvmArgumentTypeReference (","
-	//	arguments+=JvmArgumentTypeReference)* ">")?)*)?;
+	//	type=[JvmType|super::QualifiedName] (=> '<' arguments+=JvmArgumentTypeReference (','
+	//	arguments+=JvmArgumentTypeReference)* '>' (=> ({JvmInnerTypeReference.outer=current} '.') type=[JvmType|ValidID] (=>
+	//	'<' arguments+=JvmArgumentTypeReference (',' arguments+=JvmArgumentTypeReference)* '>')?)*)?;
 	public XtypeGrammarAccess.JvmParameterizedTypeReferenceElements getJvmParameterizedTypeReferenceAccess() {
-		return gaXbase.getJvmParameterizedTypeReferenceAccess();
+		return gaXtype.getJvmParameterizedTypeReferenceAccess();
 	}
 	
 	public ParserRule getJvmParameterizedTypeReferenceRule() {
 		return getJvmParameterizedTypeReferenceAccess().getRule();
 	}
 
-	//JvmArgumentTypeReference returns JvmTypeReference:
+	//JvmArgumentTypeReference JvmTypeReference:
 	//	JvmTypeReference | JvmWildcardTypeReference;
 	public XtypeGrammarAccess.JvmArgumentTypeReferenceElements getJvmArgumentTypeReferenceAccess() {
-		return gaXbase.getJvmArgumentTypeReferenceAccess();
+		return gaXtype.getJvmArgumentTypeReferenceAccess();
 	}
 	
 	public ParserRule getJvmArgumentTypeReferenceRule() {
@@ -1415,10 +1416,10 @@ public ParserRule getJvmArgumentTypeReferenceRule() {
 	}
 
 	//JvmWildcardTypeReference:
-	//	{JvmWildcardTypeReference} "?" (constraints+=JvmUpperBound constraints+=JvmUpperBoundAnded* |
+	//	{JvmWildcardTypeReference} '?' (constraints+=JvmUpperBound constraints+=JvmUpperBoundAnded* |
 	//	constraints+=JvmLowerBound constraints+=JvmLowerBoundAnded*)?;
 	public XtypeGrammarAccess.JvmWildcardTypeReferenceElements getJvmWildcardTypeReferenceAccess() {
-		return gaXbase.getJvmWildcardTypeReferenceAccess();
+		return gaXtype.getJvmWildcardTypeReferenceAccess();
 	}
 	
 	public ParserRule getJvmWildcardTypeReferenceRule() {
@@ -1426,19 +1427,19 @@ public ParserRule getJvmWildcardTypeReferenceRule() {
 	}
 
 	//JvmUpperBound:
-	//	"extends" typeReference=JvmTypeReference;
+	//	'extends' typeReference=JvmTypeReference;
 	public XtypeGrammarAccess.JvmUpperBoundElements getJvmUpperBoundAccess() {
-		return gaXbase.getJvmUpperBoundAccess();
+		return gaXtype.getJvmUpperBoundAccess();
 	}
 	
 	public ParserRule getJvmUpperBoundRule() {
 		return getJvmUpperBoundAccess().getRule();
 	}
 
-	//JvmUpperBoundAnded returns JvmUpperBound:
-	//	"&" typeReference=JvmTypeReference;
+	//JvmUpperBoundAnded JvmUpperBound:
+	//	'&' typeReference=JvmTypeReference;
 	public XtypeGrammarAccess.JvmUpperBoundAndedElements getJvmUpperBoundAndedAccess() {
-		return gaXbase.getJvmUpperBoundAndedAccess();
+		return gaXtype.getJvmUpperBoundAndedAccess();
 	}
 	
 	public ParserRule getJvmUpperBoundAndedRule() {
@@ -1446,19 +1447,19 @@ public ParserRule getJvmUpperBoundAndedRule() {
 	}
 
 	//JvmLowerBound:
-	//	"super" typeReference=JvmTypeReference;
+	//	'super' typeReference=JvmTypeReference;
 	public XtypeGrammarAccess.JvmLowerBoundElements getJvmLowerBoundAccess() {
-		return gaXbase.getJvmLowerBoundAccess();
+		return gaXtype.getJvmLowerBoundAccess();
 	}
 	
 	public ParserRule getJvmLowerBoundRule() {
 		return getJvmLowerBoundAccess().getRule();
 	}
 
-	//JvmLowerBoundAnded returns JvmLowerBound:
-	//	"&" typeReference=JvmTypeReference;
+	//JvmLowerBoundAnded JvmLowerBound:
+	//	'&' typeReference=JvmTypeReference;
 	public XtypeGrammarAccess.JvmLowerBoundAndedElements getJvmLowerBoundAndedAccess() {
-		return gaXbase.getJvmLowerBoundAndedAccess();
+		return gaXtype.getJvmLowerBoundAndedAccess();
 	}
 	
 	public ParserRule getJvmLowerBoundAndedRule() {
@@ -1468,7 +1469,7 @@ public ParserRule getJvmLowerBoundAndedRule() {
 	//JvmTypeParameter:
 	//	name=ValidID (constraints+=JvmUpperBound constraints+=JvmUpperBoundAnded*)?;
 	public XtypeGrammarAccess.JvmTypeParameterElements getJvmTypeParameterAccess() {
-		return gaXbase.getJvmTypeParameterAccess();
+		return gaXtype.getJvmTypeParameterAccess();
 	}
 	
 	public ParserRule getJvmTypeParameterRule() {
@@ -1476,9 +1477,9 @@ public ParserRule getJvmTypeParameterRule() {
 	}
 
 	//QualifiedNameWithWildcard:
-	//	QualifiedName "." "*";
+	//	super::QualifiedName '.' '*';
 	public XtypeGrammarAccess.QualifiedNameWithWildcardElements getQualifiedNameWithWildcardAccess() {
-		return gaXbase.getQualifiedNameWithWildcardAccess();
+		return gaXtype.getQualifiedNameWithWildcardAccess();
 	}
 	
 	public ParserRule getQualifiedNameWithWildcardRule() {
@@ -1488,7 +1489,7 @@ public ParserRule getQualifiedNameWithWildcardRule() {
 	//ValidID:
 	//	ID;
 	public XtypeGrammarAccess.ValidIDElements getValidIDAccess() {
-		return gaXbase.getValidIDAccess();
+		return gaXtype.getValidIDAccess();
 	}
 	
 	public ParserRule getValidIDRule() {
@@ -1498,7 +1499,7 @@ public ParserRule getValidIDRule() {
 	//XImportSection:
 	//	importDeclarations+=XImportDeclaration+;
 	public XtypeGrammarAccess.XImportSectionElements getXImportSectionAccess() {
-		return gaXbase.getXImportSectionAccess();
+		return gaXtype.getXImportSectionAccess();
 	}
 	
 	public ParserRule getXImportSectionRule() {
@@ -1506,11 +1507,11 @@ public ParserRule getXImportSectionRule() {
 	}
 
 	//XImportDeclaration:
-	//	"import" (static?="static" extension?="extension"? importedType=[JvmDeclaredType|QualifiedNameInStaticImport]
-	//	(wildcard?="*" | memberName=ValidID) | importedType=[JvmDeclaredType|QualifiedName] |
-	//	importedNamespace=QualifiedNameWithWildcard) ";"?;
+	//	'import' (static?='static' extension?='extension'? importedType=[JvmDeclaredType|QualifiedNameInStaticImport]
+	//	(wildcard?='*' | memberName=ValidID) | importedType=[JvmDeclaredType|super::QualifiedName] |
+	//	importedNamespace=QualifiedNameWithWildcard) ';'?;
 	public XtypeGrammarAccess.XImportDeclarationElements getXImportDeclarationAccess() {
-		return gaXbase.getXImportDeclarationAccess();
+		return gaXtype.getXImportDeclarationAccess();
 	}
 	
 	public ParserRule getXImportDeclarationRule() {
@@ -1518,49 +1519,48 @@ public ParserRule getXImportDeclarationRule() {
 	}
 
 	//QualifiedNameInStaticImport:
-	//	(ValidID ".")+;
+	//	(ValidID '.')+;
 	public XtypeGrammarAccess.QualifiedNameInStaticImportElements getQualifiedNameInStaticImportAccess() {
-		return gaXbase.getQualifiedNameInStaticImportAccess();
+		return gaXtype.getQualifiedNameInStaticImportAccess();
 	}
 	
 	public ParserRule getQualifiedNameInStaticImportRule() {
 		return getQualifiedNameInStaticImportAccess().getRule();
 	}
 
-	//terminal ID returns ecore::EString:
-	//	"^"? ("a".."z" | "A".."Z" | "$" | "_") ("a".."z" | "A".."Z" | "$" | "_" | "0".."9")*;
+	//terminal ID:
+	//	'^'? ('a'..'z' | 'A'..'Z' | '$' | '_') ('a'..'z' | 'A'..'Z' | '$' | '_' | '0'..'9')*;
 	public TerminalRule getIDRule() {
-		return gaXbase.getIDRule();
+		return gaXtype.getIDRule();
 	} 
 
-	//terminal STRING returns ecore::EString:
-	//	"\"" ("\\" . / * ('b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\') * / | !("\\" | "\""))* "\""? | "\'" ("\\" .
-	//	/ * ('b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\') * / | !("\\" | "\'"))* "\'"?;
+	//terminal STRING:
+	//	'"' ('\\' . | !('\\' | '"'))* '"'? | "'" ('\\' . | !('\\' | "'"))* "'"?;
 	public TerminalRule getSTRINGRule() {
-		return gaXbase.getSTRINGRule();
+		return gaXtype.getSTRINGRule();
 	} 
 
-	//terminal ML_COMMENT returns ecore::EString:
-	//	"/ *"->"* /";
+	//terminal ML_COMMENT:
+	//	'/*'->'*/';
 	public TerminalRule getML_COMMENTRule() {
-		return gaXbase.getML_COMMENTRule();
+		return gaXtype.getML_COMMENTRule();
 	} 
 
-	//terminal SL_COMMENT returns ecore::EString:
-	//	"//" !("\n" | "\r")* ("\r"? "\n")?;
+	//terminal SL_COMMENT:
+	//	'//' !('\n' | '\r')* ('\r'? '\n')?;
 	public TerminalRule getSL_COMMENTRule() {
-		return gaXbase.getSL_COMMENTRule();
+		return gaXtype.getSL_COMMENTRule();
 	} 
 
-	//terminal WS returns ecore::EString:
-	//	(" " | "\t" | "\r" | "\n")+;
+	//terminal WS:
+	//	' ' | '\t' | '\r' | '\n'+;
 	public TerminalRule getWSRule() {
-		return gaXbase.getWSRule();
+		return gaXtype.getWSRule();
 	} 
 
-	//terminal ANY_OTHER returns ecore::EString:
+	//terminal ANY_OTHER:
 	//	.;
 	public TerminalRule getANY_OTHERRule() {
-		return gaXbase.getANY_OTHERRule();
+		return gaXtype.getANY_OTHERRule();
 	} 
 }
diff --git a/com.avaloq.tools.ddk.checkcfg.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.checkcfg.ui/META-INF/MANIFEST.MF
index 18d972f7a..1d567dc01 100644
--- a/com.avaloq.tools.ddk.checkcfg.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.checkcfg.ui/META-INF/MANIFEST.MF
@@ -32,5 +32,6 @@ Require-Bundle: com.avaloq.tools.ddk.checkcfg.core,
 Export-Package: com.avaloq.tools.ddk.checkcfg.ui.internal,
  com.avaloq.tools.ddk.checkcfg.ui.contentassist.antlr,
  com.avaloq.tools.ddk.checkcfg.ui.contentassist,
- com.avaloq.tools.ddk.checkcfg.ui.quickfix
+ com.avaloq.tools.ddk.checkcfg.ui.quickfix,
+ com.avaloq.tools.ddk.checkcfg.ui.contentassist.antlr.internal
 Import-Package: org.apache.log4j
diff --git a/com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/AbstractCheckCfgUiModule.java b/com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/AbstractCheckCfgUiModule.java
index b7ec4204f..3725aabac 100644
--- a/com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/AbstractCheckCfgUiModule.java
+++ b/com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/AbstractCheckCfgUiModule.java
@@ -152,6 +152,11 @@ public Class<? extends org.eclipse.compare.IViewerCreator> bindIViewerCreator()
 		return org.eclipse.xtext.ui.compare.DefaultViewerCreator.class;
 	}
 
+	// contributed by org.eclipse.xtext.ui.generator.compare.CompareFragment
+	public void configureCompareViewerTitle(com.google.inject.Binder binder) {
+		binder.bind(String.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.UIBindings.COMPARE_VIEWER_TITLE)).toInstance("CheckCfg Compare");
+	}
+
 	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
 	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.PrefixMatcher> bindPrefixMatcher() {
 		return org.eclipse.xtext.ui.editor.contentassist.FQNPrefixMatcher.class;
diff --git a/com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfgLexer.java b/com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfgLexer.java
index 8052a1172..df1a572ea 100644
--- a/com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfgLexer.java
+++ b/com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfgLexer.java
@@ -115,15 +115,15 @@ public InternalCheckCfgLexer(CharStream input, RecognizerSharedState state) {
         super(input,state);
 
     }
-    public String getGrammarFileName() { return "../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g"; }
+    public String getGrammarFileName() { return "InternalCheckCfg.g"; }
 
     // $ANTLR start "T__13"
     public final void mT__13() throws RecognitionException {
         try {
             int _type = T__13;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11:7: ( '=' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11:9: '='
+            // InternalCheckCfg.g:11:7: ( '=' )
+            // InternalCheckCfg.g:11:9: '='
             {
             match('='); 
 
@@ -142,8 +142,8 @@ public final void mT__14() throws RecognitionException {
         try {
             int _type = T__14;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12:7: ( '||' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12:9: '||'
+            // InternalCheckCfg.g:12:7: ( '||' )
+            // InternalCheckCfg.g:12:9: '||'
             {
             match("||"); 
 
@@ -163,8 +163,8 @@ public final void mT__15() throws RecognitionException {
         try {
             int _type = T__15;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13:7: ( '&&' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13:9: '&&'
+            // InternalCheckCfg.g:13:7: ( '&&' )
+            // InternalCheckCfg.g:13:9: '&&'
             {
             match("&&"); 
 
@@ -184,8 +184,8 @@ public final void mT__16() throws RecognitionException {
         try {
             int _type = T__16;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14:7: ( '+=' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14:9: '+='
+            // InternalCheckCfg.g:14:7: ( '+=' )
+            // InternalCheckCfg.g:14:9: '+='
             {
             match("+="); 
 
@@ -205,8 +205,8 @@ public final void mT__17() throws RecognitionException {
         try {
             int _type = T__17;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15:7: ( '-=' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15:9: '-='
+            // InternalCheckCfg.g:15:7: ( '-=' )
+            // InternalCheckCfg.g:15:9: '-='
             {
             match("-="); 
 
@@ -226,8 +226,8 @@ public final void mT__18() throws RecognitionException {
         try {
             int _type = T__18;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16:7: ( '*=' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16:9: '*='
+            // InternalCheckCfg.g:16:7: ( '*=' )
+            // InternalCheckCfg.g:16:9: '*='
             {
             match("*="); 
 
@@ -247,8 +247,8 @@ public final void mT__19() throws RecognitionException {
         try {
             int _type = T__19;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17:7: ( '/=' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17:9: '/='
+            // InternalCheckCfg.g:17:7: ( '/=' )
+            // InternalCheckCfg.g:17:9: '/='
             {
             match("/="); 
 
@@ -268,8 +268,8 @@ public final void mT__20() throws RecognitionException {
         try {
             int _type = T__20;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18:7: ( '%=' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18:9: '%='
+            // InternalCheckCfg.g:18:7: ( '%=' )
+            // InternalCheckCfg.g:18:9: '%='
             {
             match("%="); 
 
@@ -289,8 +289,8 @@ public final void mT__21() throws RecognitionException {
         try {
             int _type = T__21;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19:7: ( '==' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19:9: '=='
+            // InternalCheckCfg.g:19:7: ( '==' )
+            // InternalCheckCfg.g:19:9: '=='
             {
             match("=="); 
 
@@ -310,8 +310,8 @@ public final void mT__22() throws RecognitionException {
         try {
             int _type = T__22;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20:7: ( '!=' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20:9: '!='
+            // InternalCheckCfg.g:20:7: ( '!=' )
+            // InternalCheckCfg.g:20:9: '!='
             {
             match("!="); 
 
@@ -331,8 +331,8 @@ public final void mT__23() throws RecognitionException {
         try {
             int _type = T__23;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21:7: ( '===' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21:9: '==='
+            // InternalCheckCfg.g:21:7: ( '===' )
+            // InternalCheckCfg.g:21:9: '==='
             {
             match("==="); 
 
@@ -352,8 +352,8 @@ public final void mT__24() throws RecognitionException {
         try {
             int _type = T__24;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:22:7: ( '!==' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:22:9: '!=='
+            // InternalCheckCfg.g:22:7: ( '!==' )
+            // InternalCheckCfg.g:22:9: '!=='
             {
             match("!=="); 
 
@@ -373,8 +373,8 @@ public final void mT__25() throws RecognitionException {
         try {
             int _type = T__25;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:23:7: ( '>=' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:23:9: '>='
+            // InternalCheckCfg.g:23:7: ( '>=' )
+            // InternalCheckCfg.g:23:9: '>='
             {
             match(">="); 
 
@@ -394,8 +394,8 @@ public final void mT__26() throws RecognitionException {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:24:7: ( '>' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:24:9: '>'
+            // InternalCheckCfg.g:24:7: ( '>' )
+            // InternalCheckCfg.g:24:9: '>'
             {
             match('>'); 
 
@@ -414,8 +414,8 @@ public final void mT__27() throws RecognitionException {
         try {
             int _type = T__27;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:25:7: ( '<' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:25:9: '<'
+            // InternalCheckCfg.g:25:7: ( '<' )
+            // InternalCheckCfg.g:25:9: '<'
             {
             match('<'); 
 
@@ -434,8 +434,8 @@ public final void mT__28() throws RecognitionException {
         try {
             int _type = T__28;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:26:7: ( '->' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:26:9: '->'
+            // InternalCheckCfg.g:26:7: ( '->' )
+            // InternalCheckCfg.g:26:9: '->'
             {
             match("->"); 
 
@@ -455,8 +455,8 @@ public final void mT__29() throws RecognitionException {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:27:7: ( '..<' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:27:9: '..<'
+            // InternalCheckCfg.g:27:7: ( '..<' )
+            // InternalCheckCfg.g:27:9: '..<'
             {
             match("..<"); 
 
@@ -476,8 +476,8 @@ public final void mT__30() throws RecognitionException {
         try {
             int _type = T__30;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:28:7: ( '..' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:28:9: '..'
+            // InternalCheckCfg.g:28:7: ( '..' )
+            // InternalCheckCfg.g:28:9: '..'
             {
             match(".."); 
 
@@ -497,8 +497,8 @@ public final void mT__31() throws RecognitionException {
         try {
             int _type = T__31;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:29:7: ( '=>' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:29:9: '=>'
+            // InternalCheckCfg.g:29:7: ( '=>' )
+            // InternalCheckCfg.g:29:9: '=>'
             {
             match("=>"); 
 
@@ -518,8 +518,8 @@ public final void mT__32() throws RecognitionException {
         try {
             int _type = T__32;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:30:7: ( '<>' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:30:9: '<>'
+            // InternalCheckCfg.g:30:7: ( '<>' )
+            // InternalCheckCfg.g:30:9: '<>'
             {
             match("<>"); 
 
@@ -539,8 +539,8 @@ public final void mT__33() throws RecognitionException {
         try {
             int _type = T__33;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:31:7: ( '?:' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:31:9: '?:'
+            // InternalCheckCfg.g:31:7: ( '?:' )
+            // InternalCheckCfg.g:31:9: '?:'
             {
             match("?:"); 
 
@@ -560,8 +560,8 @@ public final void mT__34() throws RecognitionException {
         try {
             int _type = T__34;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:32:7: ( '+' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:32:9: '+'
+            // InternalCheckCfg.g:32:7: ( '+' )
+            // InternalCheckCfg.g:32:9: '+'
             {
             match('+'); 
 
@@ -580,8 +580,8 @@ public final void mT__35() throws RecognitionException {
         try {
             int _type = T__35;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:33:7: ( '-' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:33:9: '-'
+            // InternalCheckCfg.g:33:7: ( '-' )
+            // InternalCheckCfg.g:33:9: '-'
             {
             match('-'); 
 
@@ -600,8 +600,8 @@ public final void mT__36() throws RecognitionException {
         try {
             int _type = T__36;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:34:7: ( '*' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:34:9: '*'
+            // InternalCheckCfg.g:34:7: ( '*' )
+            // InternalCheckCfg.g:34:9: '*'
             {
             match('*'); 
 
@@ -620,8 +620,8 @@ public final void mT__37() throws RecognitionException {
         try {
             int _type = T__37;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:35:7: ( '**' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:35:9: '**'
+            // InternalCheckCfg.g:35:7: ( '**' )
+            // InternalCheckCfg.g:35:9: '**'
             {
             match("**"); 
 
@@ -641,8 +641,8 @@ public final void mT__38() throws RecognitionException {
         try {
             int _type = T__38;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:36:7: ( '/' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:36:9: '/'
+            // InternalCheckCfg.g:36:7: ( '/' )
+            // InternalCheckCfg.g:36:9: '/'
             {
             match('/'); 
 
@@ -661,8 +661,8 @@ public final void mT__39() throws RecognitionException {
         try {
             int _type = T__39;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:37:7: ( '%' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:37:9: '%'
+            // InternalCheckCfg.g:37:7: ( '%' )
+            // InternalCheckCfg.g:37:9: '%'
             {
             match('%'); 
 
@@ -681,8 +681,8 @@ public final void mT__40() throws RecognitionException {
         try {
             int _type = T__40;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:38:7: ( '!' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:38:9: '!'
+            // InternalCheckCfg.g:38:7: ( '!' )
+            // InternalCheckCfg.g:38:9: '!'
             {
             match('!'); 
 
@@ -701,8 +701,8 @@ public final void mT__41() throws RecognitionException {
         try {
             int _type = T__41;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:39:7: ( '++' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:39:9: '++'
+            // InternalCheckCfg.g:39:7: ( '++' )
+            // InternalCheckCfg.g:39:9: '++'
             {
             match("++"); 
 
@@ -722,8 +722,8 @@ public final void mT__42() throws RecognitionException {
         try {
             int _type = T__42;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:40:7: ( '--' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:40:9: '--'
+            // InternalCheckCfg.g:40:7: ( '--' )
+            // InternalCheckCfg.g:40:9: '--'
             {
             match("--"); 
 
@@ -743,8 +743,8 @@ public final void mT__43() throws RecognitionException {
         try {
             int _type = T__43;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:41:7: ( '.' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:41:9: '.'
+            // InternalCheckCfg.g:41:7: ( '.' )
+            // InternalCheckCfg.g:41:9: '.'
             {
             match('.'); 
 
@@ -763,8 +763,8 @@ public final void mT__44() throws RecognitionException {
         try {
             int _type = T__44;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:42:7: ( 'val' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:42:9: 'val'
+            // InternalCheckCfg.g:42:7: ( 'val' )
+            // InternalCheckCfg.g:42:9: 'val'
             {
             match("val"); 
 
@@ -784,8 +784,8 @@ public final void mT__45() throws RecognitionException {
         try {
             int _type = T__45;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:43:7: ( 'extends' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:43:9: 'extends'
+            // InternalCheckCfg.g:43:7: ( 'extends' )
+            // InternalCheckCfg.g:43:9: 'extends'
             {
             match("extends"); 
 
@@ -805,8 +805,8 @@ public final void mT__46() throws RecognitionException {
         try {
             int _type = T__46;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:44:7: ( 'static' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:44:9: 'static'
+            // InternalCheckCfg.g:44:7: ( 'static' )
+            // InternalCheckCfg.g:44:9: 'static'
             {
             match("static"); 
 
@@ -826,8 +826,8 @@ public final void mT__47() throws RecognitionException {
         try {
             int _type = T__47;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:45:7: ( 'import' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:45:9: 'import'
+            // InternalCheckCfg.g:45:7: ( 'import' )
+            // InternalCheckCfg.g:45:9: 'import'
             {
             match("import"); 
 
@@ -847,8 +847,8 @@ public final void mT__48() throws RecognitionException {
         try {
             int _type = T__48;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:46:7: ( 'extension' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:46:9: 'extension'
+            // InternalCheckCfg.g:46:7: ( 'extension' )
+            // InternalCheckCfg.g:46:9: 'extension'
             {
             match("extension"); 
 
@@ -868,8 +868,8 @@ public final void mT__49() throws RecognitionException {
         try {
             int _type = T__49;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:47:7: ( 'super' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:47:9: 'super'
+            // InternalCheckCfg.g:47:7: ( 'super' )
+            // InternalCheckCfg.g:47:9: 'super'
             {
             match("super"); 
 
@@ -889,8 +889,8 @@ public final void mT__50() throws RecognitionException {
         try {
             int _type = T__50;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:48:7: ( 'false' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:48:9: 'false'
+            // InternalCheckCfg.g:48:7: ( 'false' )
+            // InternalCheckCfg.g:48:9: 'false'
             {
             match("false"); 
 
@@ -910,8 +910,8 @@ public final void mT__51() throws RecognitionException {
         try {
             int _type = T__51;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:49:7: ( 'default' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:49:9: 'default'
+            // InternalCheckCfg.g:49:7: ( 'default' )
+            // InternalCheckCfg.g:49:9: 'default'
             {
             match("default"); 
 
@@ -931,8 +931,8 @@ public final void mT__52() throws RecognitionException {
         try {
             int _type = T__52;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:50:7: ( 'error' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:50:9: 'error'
+            // InternalCheckCfg.g:50:7: ( 'error' )
+            // InternalCheckCfg.g:50:9: 'error'
             {
             match("error"); 
 
@@ -952,8 +952,8 @@ public final void mT__53() throws RecognitionException {
         try {
             int _type = T__53;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:51:7: ( 'warning' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:51:9: 'warning'
+            // InternalCheckCfg.g:51:7: ( 'warning' )
+            // InternalCheckCfg.g:51:9: 'warning'
             {
             match("warning"); 
 
@@ -973,8 +973,8 @@ public final void mT__54() throws RecognitionException {
         try {
             int _type = T__54;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:52:7: ( 'info' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:52:9: 'info'
+            // InternalCheckCfg.g:52:7: ( 'info' )
+            // InternalCheckCfg.g:52:9: 'info'
             {
             match("info"); 
 
@@ -994,8 +994,8 @@ public final void mT__55() throws RecognitionException {
         try {
             int _type = T__55;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:53:7: ( 'ignore' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:53:9: 'ignore'
+            // InternalCheckCfg.g:53:7: ( 'ignore' )
+            // InternalCheckCfg.g:53:9: 'ignore'
             {
             match("ignore"); 
 
@@ -1015,8 +1015,8 @@ public final void mT__56() throws RecognitionException {
         try {
             int _type = T__56;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:54:7: ( 'check' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:54:9: 'check'
+            // InternalCheckCfg.g:54:7: ( 'check' )
+            // InternalCheckCfg.g:54:9: 'check'
             {
             match("check"); 
 
@@ -1036,8 +1036,8 @@ public final void mT__57() throws RecognitionException {
         try {
             int _type = T__57;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:55:7: ( 'configuration' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:55:9: 'configuration'
+            // InternalCheckCfg.g:55:7: ( 'configuration' )
+            // InternalCheckCfg.g:55:9: 'configuration'
             {
             match("configuration"); 
 
@@ -1057,8 +1057,8 @@ public final void mT__58() throws RecognitionException {
         try {
             int _type = T__58;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:56:7: ( '{' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:56:9: '{'
+            // InternalCheckCfg.g:56:7: ( '{' )
+            // InternalCheckCfg.g:56:9: '{'
             {
             match('{'); 
 
@@ -1077,8 +1077,8 @@ public final void mT__59() throws RecognitionException {
         try {
             int _type = T__59;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:57:7: ( '}' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:57:9: '}'
+            // InternalCheckCfg.g:57:7: ( '}' )
+            // InternalCheckCfg.g:57:9: '}'
             {
             match('}'); 
 
@@ -1097,8 +1097,8 @@ public final void mT__60() throws RecognitionException {
         try {
             int _type = T__60;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:58:7: ( 'for' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:58:9: 'for'
+            // InternalCheckCfg.g:58:7: ( 'for' )
+            // InternalCheckCfg.g:58:9: 'for'
             {
             match("for"); 
 
@@ -1118,8 +1118,8 @@ public final void mT__61() throws RecognitionException {
         try {
             int _type = T__61;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:59:7: ( 'catalog' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:59:9: 'catalog'
+            // InternalCheckCfg.g:59:7: ( 'catalog' )
+            // InternalCheckCfg.g:59:9: 'catalog'
             {
             match("catalog"); 
 
@@ -1139,8 +1139,8 @@ public final void mT__62() throws RecognitionException {
         try {
             int _type = T__62;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:60:7: ( '(' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:60:9: '('
+            // InternalCheckCfg.g:60:7: ( '(' )
+            // InternalCheckCfg.g:60:9: '('
             {
             match('('); 
 
@@ -1159,8 +1159,8 @@ public final void mT__63() throws RecognitionException {
         try {
             int _type = T__63;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:61:7: ( ')' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:61:9: ')'
+            // InternalCheckCfg.g:61:7: ( ')' )
+            // InternalCheckCfg.g:61:9: ')'
             {
             match(')'); 
 
@@ -1179,8 +1179,8 @@ public final void mT__64() throws RecognitionException {
         try {
             int _type = T__64;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:62:7: ( ',' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:62:9: ','
+            // InternalCheckCfg.g:62:7: ( ',' )
+            // InternalCheckCfg.g:62:9: ','
             {
             match(','); 
 
@@ -1199,8 +1199,8 @@ public final void mT__65() throws RecognitionException {
         try {
             int _type = T__65;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:63:7: ( '#' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:63:9: '#'
+            // InternalCheckCfg.g:63:7: ( '#' )
+            // InternalCheckCfg.g:63:9: '#'
             {
             match('#'); 
 
@@ -1219,8 +1219,8 @@ public final void mT__66() throws RecognitionException {
         try {
             int _type = T__66;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:64:7: ( '[' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:64:9: '['
+            // InternalCheckCfg.g:64:7: ( '[' )
+            // InternalCheckCfg.g:64:9: '['
             {
             match('['); 
 
@@ -1239,8 +1239,8 @@ public final void mT__67() throws RecognitionException {
         try {
             int _type = T__67;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:65:7: ( ']' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:65:9: ']'
+            // InternalCheckCfg.g:65:7: ( ']' )
+            // InternalCheckCfg.g:65:9: ']'
             {
             match(']'); 
 
@@ -1259,8 +1259,8 @@ public final void mT__68() throws RecognitionException {
         try {
             int _type = T__68;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:66:7: ( 'instanceof' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:66:9: 'instanceof'
+            // InternalCheckCfg.g:66:7: ( 'instanceof' )
+            // InternalCheckCfg.g:66:9: 'instanceof'
             {
             match("instanceof"); 
 
@@ -1280,8 +1280,8 @@ public final void mT__69() throws RecognitionException {
         try {
             int _type = T__69;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:67:7: ( 'as' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:67:9: 'as'
+            // InternalCheckCfg.g:67:7: ( 'as' )
+            // InternalCheckCfg.g:67:9: 'as'
             {
             match("as"); 
 
@@ -1301,8 +1301,8 @@ public final void mT__70() throws RecognitionException {
         try {
             int _type = T__70;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:68:7: ( ';' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:68:9: ';'
+            // InternalCheckCfg.g:68:7: ( ';' )
+            // InternalCheckCfg.g:68:9: ';'
             {
             match(';'); 
 
@@ -1321,8 +1321,8 @@ public final void mT__71() throws RecognitionException {
         try {
             int _type = T__71;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:69:7: ( 'if' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:69:9: 'if'
+            // InternalCheckCfg.g:69:7: ( 'if' )
+            // InternalCheckCfg.g:69:9: 'if'
             {
             match("if"); 
 
@@ -1342,8 +1342,8 @@ public final void mT__72() throws RecognitionException {
         try {
             int _type = T__72;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:70:7: ( 'else' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:70:9: 'else'
+            // InternalCheckCfg.g:70:7: ( 'else' )
+            // InternalCheckCfg.g:70:9: 'else'
             {
             match("else"); 
 
@@ -1363,8 +1363,8 @@ public final void mT__73() throws RecognitionException {
         try {
             int _type = T__73;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:71:7: ( 'switch' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:71:9: 'switch'
+            // InternalCheckCfg.g:71:7: ( 'switch' )
+            // InternalCheckCfg.g:71:9: 'switch'
             {
             match("switch"); 
 
@@ -1384,8 +1384,8 @@ public final void mT__74() throws RecognitionException {
         try {
             int _type = T__74;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:72:7: ( ':' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:72:9: ':'
+            // InternalCheckCfg.g:72:7: ( ':' )
+            // InternalCheckCfg.g:72:9: ':'
             {
             match(':'); 
 
@@ -1404,8 +1404,8 @@ public final void mT__75() throws RecognitionException {
         try {
             int _type = T__75;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:73:7: ( 'case' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:73:9: 'case'
+            // InternalCheckCfg.g:73:7: ( 'case' )
+            // InternalCheckCfg.g:73:9: 'case'
             {
             match("case"); 
 
@@ -1425,8 +1425,8 @@ public final void mT__76() throws RecognitionException {
         try {
             int _type = T__76;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:74:7: ( 'while' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:74:9: 'while'
+            // InternalCheckCfg.g:74:7: ( 'while' )
+            // InternalCheckCfg.g:74:9: 'while'
             {
             match("while"); 
 
@@ -1446,8 +1446,8 @@ public final void mT__77() throws RecognitionException {
         try {
             int _type = T__77;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:75:7: ( 'do' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:75:9: 'do'
+            // InternalCheckCfg.g:75:7: ( 'do' )
+            // InternalCheckCfg.g:75:9: 'do'
             {
             match("do"); 
 
@@ -1467,8 +1467,8 @@ public final void mT__78() throws RecognitionException {
         try {
             int _type = T__78;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:76:7: ( 'new' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:76:9: 'new'
+            // InternalCheckCfg.g:76:7: ( 'new' )
+            // InternalCheckCfg.g:76:9: 'new'
             {
             match("new"); 
 
@@ -1488,8 +1488,8 @@ public final void mT__79() throws RecognitionException {
         try {
             int _type = T__79;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:77:7: ( 'null' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:77:9: 'null'
+            // InternalCheckCfg.g:77:7: ( 'null' )
+            // InternalCheckCfg.g:77:9: 'null'
             {
             match("null"); 
 
@@ -1509,8 +1509,8 @@ public final void mT__80() throws RecognitionException {
         try {
             int _type = T__80;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:78:7: ( 'typeof' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:78:9: 'typeof'
+            // InternalCheckCfg.g:78:7: ( 'typeof' )
+            // InternalCheckCfg.g:78:9: 'typeof'
             {
             match("typeof"); 
 
@@ -1530,8 +1530,8 @@ public final void mT__81() throws RecognitionException {
         try {
             int _type = T__81;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:79:7: ( 'throw' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:79:9: 'throw'
+            // InternalCheckCfg.g:79:7: ( 'throw' )
+            // InternalCheckCfg.g:79:9: 'throw'
             {
             match("throw"); 
 
@@ -1551,8 +1551,8 @@ public final void mT__82() throws RecognitionException {
         try {
             int _type = T__82;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:80:7: ( 'return' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:80:9: 'return'
+            // InternalCheckCfg.g:80:7: ( 'return' )
+            // InternalCheckCfg.g:80:9: 'return'
             {
             match("return"); 
 
@@ -1572,8 +1572,8 @@ public final void mT__83() throws RecognitionException {
         try {
             int _type = T__83;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:81:7: ( 'try' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:81:9: 'try'
+            // InternalCheckCfg.g:81:7: ( 'try' )
+            // InternalCheckCfg.g:81:9: 'try'
             {
             match("try"); 
 
@@ -1593,8 +1593,8 @@ public final void mT__84() throws RecognitionException {
         try {
             int _type = T__84;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:82:7: ( 'finally' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:82:9: 'finally'
+            // InternalCheckCfg.g:82:7: ( 'finally' )
+            // InternalCheckCfg.g:82:9: 'finally'
             {
             match("finally"); 
 
@@ -1614,8 +1614,8 @@ public final void mT__85() throws RecognitionException {
         try {
             int _type = T__85;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:83:7: ( 'synchronized' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:83:9: 'synchronized'
+            // InternalCheckCfg.g:83:7: ( 'synchronized' )
+            // InternalCheckCfg.g:83:9: 'synchronized'
             {
             match("synchronized"); 
 
@@ -1635,8 +1635,8 @@ public final void mT__86() throws RecognitionException {
         try {
             int _type = T__86;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:84:7: ( 'catch' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:84:9: 'catch'
+            // InternalCheckCfg.g:84:7: ( 'catch' )
+            // InternalCheckCfg.g:84:9: 'catch'
             {
             match("catch"); 
 
@@ -1656,8 +1656,8 @@ public final void mT__87() throws RecognitionException {
         try {
             int _type = T__87;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:85:7: ( '?' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:85:9: '?'
+            // InternalCheckCfg.g:85:7: ( '?' )
+            // InternalCheckCfg.g:85:9: '?'
             {
             match('?'); 
 
@@ -1676,8 +1676,8 @@ public final void mT__88() throws RecognitionException {
         try {
             int _type = T__88;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:86:7: ( '&' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:86:9: '&'
+            // InternalCheckCfg.g:86:7: ( '&' )
+            // InternalCheckCfg.g:86:9: '&'
             {
             match('&'); 
 
@@ -1696,8 +1696,8 @@ public final void mT__89() throws RecognitionException {
         try {
             int _type = T__89;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:87:7: ( '::' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:87:9: '::'
+            // InternalCheckCfg.g:87:7: ( '::' )
+            // InternalCheckCfg.g:87:9: '::'
             {
             match("::"); 
 
@@ -1717,8 +1717,8 @@ public final void mT__90() throws RecognitionException {
         try {
             int _type = T__90;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:88:7: ( '?.' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:88:9: '?.'
+            // InternalCheckCfg.g:88:7: ( '?.' )
+            // InternalCheckCfg.g:88:9: '?.'
             {
             match("?."); 
 
@@ -1738,8 +1738,8 @@ public final void mT__91() throws RecognitionException {
         try {
             int _type = T__91;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:89:7: ( '|' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:89:9: '|'
+            // InternalCheckCfg.g:89:7: ( '|' )
+            // InternalCheckCfg.g:89:9: '|'
             {
             match('|'); 
 
@@ -1758,8 +1758,8 @@ public final void mT__92() throws RecognitionException {
         try {
             int _type = T__92;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:90:7: ( 'var' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:90:9: 'var'
+            // InternalCheckCfg.g:90:7: ( 'var' )
+            // InternalCheckCfg.g:90:9: 'var'
             {
             match("var"); 
 
@@ -1779,8 +1779,8 @@ public final void mT__93() throws RecognitionException {
         try {
             int _type = T__93;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:91:7: ( 'true' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:91:9: 'true'
+            // InternalCheckCfg.g:91:7: ( 'true' )
+            // InternalCheckCfg.g:91:9: 'true'
             {
             match("true"); 
 
@@ -1800,10 +1800,10 @@ public final void mRULE_HEX() throws RecognitionException {
         try {
             int _type = RULE_HEX;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21445:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21445:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
+            // InternalCheckCfg.g:21445:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )? )
+            // InternalCheckCfg.g:21445:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21445:12: ( '0x' | '0X' )
+            // InternalCheckCfg.g:21445:12: ( '0x' | '0X' )
             int alt1=2;
             int LA1_0 = input.LA(1);
 
@@ -1831,7 +1831,7 @@ else if ( (LA1_1=='X') ) {
             }
             switch (alt1) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21445:13: '0x'
+                    // InternalCheckCfg.g:21445:13: '0x'
                     {
                     match("0x"); 
 
@@ -1839,7 +1839,7 @@ else if ( (LA1_1=='X') ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21445:18: '0X'
+                    // InternalCheckCfg.g:21445:18: '0X'
                     {
                     match("0X"); 
 
@@ -1849,7 +1849,7 @@ else if ( (LA1_1=='X') ) {
 
             }
 
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21445:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+
+            // InternalCheckCfg.g:21445:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+
             int cnt2=0;
             loop2:
             do {
@@ -1863,7 +1863,7 @@ else if ( (LA1_1=='X') ) {
 
                 switch (alt2) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:
+            	    // InternalCheckCfg.g:
             	    {
             	    if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='F')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='f') ) {
             	        input.consume();
@@ -1887,7 +1887,7 @@ else if ( (LA1_1=='X') ) {
                 cnt2++;
             } while (true);
 
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21445:58: ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
+            // InternalCheckCfg.g:21445:58: ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
             int alt4=2;
             int LA4_0 = input.LA(1);
 
@@ -1896,10 +1896,10 @@ else if ( (LA1_1=='X') ) {
             }
             switch (alt4) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21445:59: '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
+                    // InternalCheckCfg.g:21445:59: '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
                     {
                     match('#'); 
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21445:63: ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
+                    // InternalCheckCfg.g:21445:63: ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
                     int alt3=2;
                     int LA3_0 = input.LA(1);
 
@@ -1917,7 +1917,7 @@ else if ( (LA3_0=='L'||LA3_0=='l') ) {
                     }
                     switch (alt3) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21445:64: ( 'b' | 'B' ) ( 'i' | 'I' )
+                            // InternalCheckCfg.g:21445:64: ( 'b' | 'B' ) ( 'i' | 'I' )
                             {
                             if ( input.LA(1)=='B'||input.LA(1)=='b' ) {
                                 input.consume();
@@ -1941,7 +1941,7 @@ else if ( (LA3_0=='L'||LA3_0=='l') ) {
                             }
                             break;
                         case 2 :
-                            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21445:84: ( 'l' | 'L' )
+                            // InternalCheckCfg.g:21445:84: ( 'l' | 'L' )
                             {
                             if ( input.LA(1)=='L'||input.LA(1)=='l' ) {
                                 input.consume();
@@ -1980,11 +1980,11 @@ public final void mRULE_INT() throws RecognitionException {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21447:10: ( '0' .. '9' ( '0' .. '9' | '_' )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21447:12: '0' .. '9' ( '0' .. '9' | '_' )*
+            // InternalCheckCfg.g:21447:10: ( '0' .. '9' ( '0' .. '9' | '_' )* )
+            // InternalCheckCfg.g:21447:12: '0' .. '9' ( '0' .. '9' | '_' )*
             {
             matchRange('0','9'); 
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21447:21: ( '0' .. '9' | '_' )*
+            // InternalCheckCfg.g:21447:21: ( '0' .. '9' | '_' )*
             loop5:
             do {
                 int alt5=2;
@@ -1997,7 +1997,7 @@ public final void mRULE_INT() throws RecognitionException {
 
                 switch (alt5) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:
+            	    // InternalCheckCfg.g:
             	    {
             	    if ( (input.LA(1)>='0' && input.LA(1)<='9')||input.LA(1)=='_' ) {
             	        input.consume();
@@ -2033,11 +2033,11 @@ public final void mRULE_DECIMAL() throws RecognitionException {
         try {
             int _type = RULE_DECIMAL;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21449:14: ( RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21449:16: RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
+            // InternalCheckCfg.g:21449:14: ( RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )? )
+            // InternalCheckCfg.g:21449:16: RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
             {
             mRULE_INT(); 
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21449:25: ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )?
+            // InternalCheckCfg.g:21449:25: ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )?
             int alt7=2;
             int LA7_0 = input.LA(1);
 
@@ -2046,7 +2046,7 @@ public final void mRULE_DECIMAL() throws RecognitionException {
             }
             switch (alt7) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21449:26: ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT
+                    // InternalCheckCfg.g:21449:26: ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT
                     {
                     if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
                         input.consume();
@@ -2057,7 +2057,7 @@ public final void mRULE_DECIMAL() throws RecognitionException {
                         recover(mse);
                         throw mse;}
 
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21449:36: ( '+' | '-' )?
+                    // InternalCheckCfg.g:21449:36: ( '+' | '-' )?
                     int alt6=2;
                     int LA6_0 = input.LA(1);
 
@@ -2066,7 +2066,7 @@ public final void mRULE_DECIMAL() throws RecognitionException {
                     }
                     switch (alt6) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:
+                            // InternalCheckCfg.g:
                             {
                             if ( input.LA(1)=='+'||input.LA(1)=='-' ) {
                                 input.consume();
@@ -2090,7 +2090,7 @@ public final void mRULE_DECIMAL() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21449:58: ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
+            // InternalCheckCfg.g:21449:58: ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
             int alt8=3;
             int LA8_0 = input.LA(1);
 
@@ -2102,7 +2102,7 @@ else if ( (LA8_0=='D'||LA8_0=='F'||LA8_0=='L'||LA8_0=='d'||LA8_0=='f'||LA8_0=='l
             }
             switch (alt8) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21449:59: ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' )
+                    // InternalCheckCfg.g:21449:59: ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' )
                     {
                     if ( input.LA(1)=='B'||input.LA(1)=='b' ) {
                         input.consume();
@@ -2126,7 +2126,7 @@ else if ( (LA8_0=='D'||LA8_0=='F'||LA8_0=='L'||LA8_0=='d'||LA8_0=='f'||LA8_0=='l
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21449:87: ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' )
+                    // InternalCheckCfg.g:21449:87: ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' )
                     {
                     if ( input.LA(1)=='D'||input.LA(1)=='F'||input.LA(1)=='L'||input.LA(1)=='d'||input.LA(1)=='f'||input.LA(1)=='l' ) {
                         input.consume();
@@ -2159,10 +2159,10 @@ public final void mRULE_ID() throws RecognitionException {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21451:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21451:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
+            // InternalCheckCfg.g:21451:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )* )
+            // InternalCheckCfg.g:21451:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21451:11: ( '^' )?
+            // InternalCheckCfg.g:21451:11: ( '^' )?
             int alt9=2;
             int LA9_0 = input.LA(1);
 
@@ -2171,7 +2171,7 @@ public final void mRULE_ID() throws RecognitionException {
             }
             switch (alt9) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21451:11: '^'
+                    // InternalCheckCfg.g:21451:11: '^'
                     {
                     match('^'); 
 
@@ -2189,7 +2189,7 @@ public final void mRULE_ID() throws RecognitionException {
                 recover(mse);
                 throw mse;}
 
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21451:44: ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
+            // InternalCheckCfg.g:21451:44: ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
             loop10:
             do {
                 int alt10=2;
@@ -2202,7 +2202,7 @@ public final void mRULE_ID() throws RecognitionException {
 
                 switch (alt10) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:
+            	    // InternalCheckCfg.g:
             	    {
             	    if ( input.LA(1)=='$'||(input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
             	        input.consume();
@@ -2238,10 +2238,10 @@ public final void mRULE_STRING() throws RecognitionException {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21453:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21453:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
+            // InternalCheckCfg.g:21453:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? ) )
+            // InternalCheckCfg.g:21453:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21453:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
+            // InternalCheckCfg.g:21453:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
             int alt15=2;
             int LA15_0 = input.LA(1);
 
@@ -2259,10 +2259,10 @@ else if ( (LA15_0=='\'') ) {
             }
             switch (alt15) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21453:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )?
+                    // InternalCheckCfg.g:21453:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )?
                     {
                     match('\"'); 
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21453:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // InternalCheckCfg.g:21453:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop11:
                     do {
                         int alt11=3;
@@ -2278,7 +2278,7 @@ else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA1
 
                         switch (alt11) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21453:21: '\\\\' .
+                    	    // InternalCheckCfg.g:21453:21: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -2286,7 +2286,7 @@ else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA1
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21453:28: ~ ( ( '\\\\' | '\"' ) )
+                    	    // InternalCheckCfg.g:21453:28: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -2306,7 +2306,7 @@ else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA1
                         }
                     } while (true);
 
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21453:44: ( '\"' )?
+                    // InternalCheckCfg.g:21453:44: ( '\"' )?
                     int alt12=2;
                     int LA12_0 = input.LA(1);
 
@@ -2315,7 +2315,7 @@ else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA1
                     }
                     switch (alt12) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21453:44: '\"'
+                            // InternalCheckCfg.g:21453:44: '\"'
                             {
                             match('\"'); 
 
@@ -2328,10 +2328,10 @@ else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA1
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21453:49: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )?
+                    // InternalCheckCfg.g:21453:49: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )?
                     {
                     match('\''); 
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21453:54: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // InternalCheckCfg.g:21453:54: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop13:
                     do {
                         int alt13=3;
@@ -2347,7 +2347,7 @@ else if ( ((LA13_0>='\u0000' && LA13_0<='&')||(LA13_0>='(' && LA13_0<='[')||(LA1
 
                         switch (alt13) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21453:55: '\\\\' .
+                    	    // InternalCheckCfg.g:21453:55: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -2355,7 +2355,7 @@ else if ( ((LA13_0>='\u0000' && LA13_0<='&')||(LA13_0>='(' && LA13_0<='[')||(LA1
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21453:62: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // InternalCheckCfg.g:21453:62: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -2375,7 +2375,7 @@ else if ( ((LA13_0>='\u0000' && LA13_0<='&')||(LA13_0>='(' && LA13_0<='[')||(LA1
                         }
                     } while (true);
 
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21453:79: ( '\\'' )?
+                    // InternalCheckCfg.g:21453:79: ( '\\'' )?
                     int alt14=2;
                     int LA14_0 = input.LA(1);
 
@@ -2384,7 +2384,7 @@ else if ( ((LA13_0>='\u0000' && LA13_0<='&')||(LA13_0>='(' && LA13_0<='[')||(LA1
                     }
                     switch (alt14) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21453:79: '\\''
+                            // InternalCheckCfg.g:21453:79: '\\''
                             {
                             match('\''); 
 
@@ -2415,12 +2415,12 @@ public final void mRULE_ML_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21455:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21455:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalCheckCfg.g:21455:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalCheckCfg.g:21455:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21455:24: ( options {greedy=false; } : . )*
+            // InternalCheckCfg.g:21455:24: ( options {greedy=false; } : . )*
             loop16:
             do {
                 int alt16=2;
@@ -2445,7 +2445,7 @@ else if ( ((LA16_0>='\u0000' && LA16_0<=')')||(LA16_0>='+' && LA16_0<='\uFFFF'))
 
                 switch (alt16) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21455:52: .
+            	    // InternalCheckCfg.g:21455:52: .
             	    {
             	    matchAny(); 
 
@@ -2475,12 +2475,12 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21457:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21457:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalCheckCfg.g:21457:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalCheckCfg.g:21457:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21457:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // InternalCheckCfg.g:21457:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop17:
             do {
                 int alt17=2;
@@ -2493,7 +2493,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
 
                 switch (alt17) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21457:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // InternalCheckCfg.g:21457:24: ~ ( ( '\\n' | '\\r' ) )
             	    {
             	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
             	        input.consume();
@@ -2513,7 +2513,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
                 }
             } while (true);
 
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21457:40: ( ( '\\r' )? '\\n' )?
+            // InternalCheckCfg.g:21457:40: ( ( '\\r' )? '\\n' )?
             int alt19=2;
             int LA19_0 = input.LA(1);
 
@@ -2522,9 +2522,9 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
             }
             switch (alt19) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21457:41: ( '\\r' )? '\\n'
+                    // InternalCheckCfg.g:21457:41: ( '\\r' )? '\\n'
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21457:41: ( '\\r' )?
+                    // InternalCheckCfg.g:21457:41: ( '\\r' )?
                     int alt18=2;
                     int LA18_0 = input.LA(1);
 
@@ -2533,7 +2533,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
                     }
                     switch (alt18) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21457:41: '\\r'
+                            // InternalCheckCfg.g:21457:41: '\\r'
                             {
                             match('\r'); 
 
@@ -2565,10 +2565,10 @@ public final void mRULE_WS() throws RecognitionException {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21459:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21459:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalCheckCfg.g:21459:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalCheckCfg.g:21459:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21459:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalCheckCfg.g:21459:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt20=0;
             loop20:
             do {
@@ -2582,7 +2582,7 @@ public final void mRULE_WS() throws RecognitionException {
 
                 switch (alt20) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:
+            	    // InternalCheckCfg.g:
             	    {
             	    if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
             	        input.consume();
@@ -2622,8 +2622,8 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21461:16: ( . )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21461:18: .
+            // InternalCheckCfg.g:21461:16: ( . )
+            // InternalCheckCfg.g:21461:18: .
             {
             matchAny(); 
 
@@ -2638,635 +2638,635 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:8: ( T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        // InternalCheckCfg.g:1:8: ( T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
         int alt21=90;
         alt21 = dfa21.predict(input);
         switch (alt21) {
             case 1 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:10: T__13
+                // InternalCheckCfg.g:1:10: T__13
                 {
                 mT__13(); 
 
                 }
                 break;
             case 2 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:16: T__14
+                // InternalCheckCfg.g:1:16: T__14
                 {
                 mT__14(); 
 
                 }
                 break;
             case 3 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:22: T__15
+                // InternalCheckCfg.g:1:22: T__15
                 {
                 mT__15(); 
 
                 }
                 break;
             case 4 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:28: T__16
+                // InternalCheckCfg.g:1:28: T__16
                 {
                 mT__16(); 
 
                 }
                 break;
             case 5 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:34: T__17
+                // InternalCheckCfg.g:1:34: T__17
                 {
                 mT__17(); 
 
                 }
                 break;
             case 6 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:40: T__18
+                // InternalCheckCfg.g:1:40: T__18
                 {
                 mT__18(); 
 
                 }
                 break;
             case 7 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:46: T__19
+                // InternalCheckCfg.g:1:46: T__19
                 {
                 mT__19(); 
 
                 }
                 break;
             case 8 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:52: T__20
+                // InternalCheckCfg.g:1:52: T__20
                 {
                 mT__20(); 
 
                 }
                 break;
             case 9 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:58: T__21
+                // InternalCheckCfg.g:1:58: T__21
                 {
                 mT__21(); 
 
                 }
                 break;
             case 10 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:64: T__22
+                // InternalCheckCfg.g:1:64: T__22
                 {
                 mT__22(); 
 
                 }
                 break;
             case 11 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:70: T__23
+                // InternalCheckCfg.g:1:70: T__23
                 {
                 mT__23(); 
 
                 }
                 break;
             case 12 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:76: T__24
+                // InternalCheckCfg.g:1:76: T__24
                 {
                 mT__24(); 
 
                 }
                 break;
             case 13 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:82: T__25
+                // InternalCheckCfg.g:1:82: T__25
                 {
                 mT__25(); 
 
                 }
                 break;
             case 14 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:88: T__26
+                // InternalCheckCfg.g:1:88: T__26
                 {
                 mT__26(); 
 
                 }
                 break;
             case 15 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:94: T__27
+                // InternalCheckCfg.g:1:94: T__27
                 {
                 mT__27(); 
 
                 }
                 break;
             case 16 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:100: T__28
+                // InternalCheckCfg.g:1:100: T__28
                 {
                 mT__28(); 
 
                 }
                 break;
             case 17 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:106: T__29
+                // InternalCheckCfg.g:1:106: T__29
                 {
                 mT__29(); 
 
                 }
                 break;
             case 18 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:112: T__30
+                // InternalCheckCfg.g:1:112: T__30
                 {
                 mT__30(); 
 
                 }
                 break;
             case 19 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:118: T__31
+                // InternalCheckCfg.g:1:118: T__31
                 {
                 mT__31(); 
 
                 }
                 break;
             case 20 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:124: T__32
+                // InternalCheckCfg.g:1:124: T__32
                 {
                 mT__32(); 
 
                 }
                 break;
             case 21 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:130: T__33
+                // InternalCheckCfg.g:1:130: T__33
                 {
                 mT__33(); 
 
                 }
                 break;
             case 22 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:136: T__34
+                // InternalCheckCfg.g:1:136: T__34
                 {
                 mT__34(); 
 
                 }
                 break;
             case 23 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:142: T__35
+                // InternalCheckCfg.g:1:142: T__35
                 {
                 mT__35(); 
 
                 }
                 break;
             case 24 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:148: T__36
+                // InternalCheckCfg.g:1:148: T__36
                 {
                 mT__36(); 
 
                 }
                 break;
             case 25 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:154: T__37
+                // InternalCheckCfg.g:1:154: T__37
                 {
                 mT__37(); 
 
                 }
                 break;
             case 26 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:160: T__38
+                // InternalCheckCfg.g:1:160: T__38
                 {
                 mT__38(); 
 
                 }
                 break;
             case 27 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:166: T__39
+                // InternalCheckCfg.g:1:166: T__39
                 {
                 mT__39(); 
 
                 }
                 break;
             case 28 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:172: T__40
+                // InternalCheckCfg.g:1:172: T__40
                 {
                 mT__40(); 
 
                 }
                 break;
             case 29 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:178: T__41
+                // InternalCheckCfg.g:1:178: T__41
                 {
                 mT__41(); 
 
                 }
                 break;
             case 30 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:184: T__42
+                // InternalCheckCfg.g:1:184: T__42
                 {
                 mT__42(); 
 
                 }
                 break;
             case 31 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:190: T__43
+                // InternalCheckCfg.g:1:190: T__43
                 {
                 mT__43(); 
 
                 }
                 break;
             case 32 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:196: T__44
+                // InternalCheckCfg.g:1:196: T__44
                 {
                 mT__44(); 
 
                 }
                 break;
             case 33 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:202: T__45
+                // InternalCheckCfg.g:1:202: T__45
                 {
                 mT__45(); 
 
                 }
                 break;
             case 34 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:208: T__46
+                // InternalCheckCfg.g:1:208: T__46
                 {
                 mT__46(); 
 
                 }
                 break;
             case 35 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:214: T__47
+                // InternalCheckCfg.g:1:214: T__47
                 {
                 mT__47(); 
 
                 }
                 break;
             case 36 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:220: T__48
+                // InternalCheckCfg.g:1:220: T__48
                 {
                 mT__48(); 
 
                 }
                 break;
             case 37 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:226: T__49
+                // InternalCheckCfg.g:1:226: T__49
                 {
                 mT__49(); 
 
                 }
                 break;
             case 38 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:232: T__50
+                // InternalCheckCfg.g:1:232: T__50
                 {
                 mT__50(); 
 
                 }
                 break;
             case 39 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:238: T__51
+                // InternalCheckCfg.g:1:238: T__51
                 {
                 mT__51(); 
 
                 }
                 break;
             case 40 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:244: T__52
+                // InternalCheckCfg.g:1:244: T__52
                 {
                 mT__52(); 
 
                 }
                 break;
             case 41 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:250: T__53
+                // InternalCheckCfg.g:1:250: T__53
                 {
                 mT__53(); 
 
                 }
                 break;
             case 42 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:256: T__54
+                // InternalCheckCfg.g:1:256: T__54
                 {
                 mT__54(); 
 
                 }
                 break;
             case 43 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:262: T__55
+                // InternalCheckCfg.g:1:262: T__55
                 {
                 mT__55(); 
 
                 }
                 break;
             case 44 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:268: T__56
+                // InternalCheckCfg.g:1:268: T__56
                 {
                 mT__56(); 
 
                 }
                 break;
             case 45 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:274: T__57
+                // InternalCheckCfg.g:1:274: T__57
                 {
                 mT__57(); 
 
                 }
                 break;
             case 46 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:280: T__58
+                // InternalCheckCfg.g:1:280: T__58
                 {
                 mT__58(); 
 
                 }
                 break;
             case 47 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:286: T__59
+                // InternalCheckCfg.g:1:286: T__59
                 {
                 mT__59(); 
 
                 }
                 break;
             case 48 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:292: T__60
+                // InternalCheckCfg.g:1:292: T__60
                 {
                 mT__60(); 
 
                 }
                 break;
             case 49 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:298: T__61
+                // InternalCheckCfg.g:1:298: T__61
                 {
                 mT__61(); 
 
                 }
                 break;
             case 50 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:304: T__62
+                // InternalCheckCfg.g:1:304: T__62
                 {
                 mT__62(); 
 
                 }
                 break;
             case 51 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:310: T__63
+                // InternalCheckCfg.g:1:310: T__63
                 {
                 mT__63(); 
 
                 }
                 break;
             case 52 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:316: T__64
+                // InternalCheckCfg.g:1:316: T__64
                 {
                 mT__64(); 
 
                 }
                 break;
             case 53 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:322: T__65
+                // InternalCheckCfg.g:1:322: T__65
                 {
                 mT__65(); 
 
                 }
                 break;
             case 54 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:328: T__66
+                // InternalCheckCfg.g:1:328: T__66
                 {
                 mT__66(); 
 
                 }
                 break;
             case 55 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:334: T__67
+                // InternalCheckCfg.g:1:334: T__67
                 {
                 mT__67(); 
 
                 }
                 break;
             case 56 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:340: T__68
+                // InternalCheckCfg.g:1:340: T__68
                 {
                 mT__68(); 
 
                 }
                 break;
             case 57 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:346: T__69
+                // InternalCheckCfg.g:1:346: T__69
                 {
                 mT__69(); 
 
                 }
                 break;
             case 58 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:352: T__70
+                // InternalCheckCfg.g:1:352: T__70
                 {
                 mT__70(); 
 
                 }
                 break;
             case 59 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:358: T__71
+                // InternalCheckCfg.g:1:358: T__71
                 {
                 mT__71(); 
 
                 }
                 break;
             case 60 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:364: T__72
+                // InternalCheckCfg.g:1:364: T__72
                 {
                 mT__72(); 
 
                 }
                 break;
             case 61 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:370: T__73
+                // InternalCheckCfg.g:1:370: T__73
                 {
                 mT__73(); 
 
                 }
                 break;
             case 62 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:376: T__74
+                // InternalCheckCfg.g:1:376: T__74
                 {
                 mT__74(); 
 
                 }
                 break;
             case 63 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:382: T__75
+                // InternalCheckCfg.g:1:382: T__75
                 {
                 mT__75(); 
 
                 }
                 break;
             case 64 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:388: T__76
+                // InternalCheckCfg.g:1:388: T__76
                 {
                 mT__76(); 
 
                 }
                 break;
             case 65 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:394: T__77
+                // InternalCheckCfg.g:1:394: T__77
                 {
                 mT__77(); 
 
                 }
                 break;
             case 66 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:400: T__78
+                // InternalCheckCfg.g:1:400: T__78
                 {
                 mT__78(); 
 
                 }
                 break;
             case 67 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:406: T__79
+                // InternalCheckCfg.g:1:406: T__79
                 {
                 mT__79(); 
 
                 }
                 break;
             case 68 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:412: T__80
+                // InternalCheckCfg.g:1:412: T__80
                 {
                 mT__80(); 
 
                 }
                 break;
             case 69 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:418: T__81
+                // InternalCheckCfg.g:1:418: T__81
                 {
                 mT__81(); 
 
                 }
                 break;
             case 70 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:424: T__82
+                // InternalCheckCfg.g:1:424: T__82
                 {
                 mT__82(); 
 
                 }
                 break;
             case 71 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:430: T__83
+                // InternalCheckCfg.g:1:430: T__83
                 {
                 mT__83(); 
 
                 }
                 break;
             case 72 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:436: T__84
+                // InternalCheckCfg.g:1:436: T__84
                 {
                 mT__84(); 
 
                 }
                 break;
             case 73 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:442: T__85
+                // InternalCheckCfg.g:1:442: T__85
                 {
                 mT__85(); 
 
                 }
                 break;
             case 74 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:448: T__86
+                // InternalCheckCfg.g:1:448: T__86
                 {
                 mT__86(); 
 
                 }
                 break;
             case 75 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:454: T__87
+                // InternalCheckCfg.g:1:454: T__87
                 {
                 mT__87(); 
 
                 }
                 break;
             case 76 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:460: T__88
+                // InternalCheckCfg.g:1:460: T__88
                 {
                 mT__88(); 
 
                 }
                 break;
             case 77 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:466: T__89
+                // InternalCheckCfg.g:1:466: T__89
                 {
                 mT__89(); 
 
                 }
                 break;
             case 78 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:472: T__90
+                // InternalCheckCfg.g:1:472: T__90
                 {
                 mT__90(); 
 
                 }
                 break;
             case 79 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:478: T__91
+                // InternalCheckCfg.g:1:478: T__91
                 {
                 mT__91(); 
 
                 }
                 break;
             case 80 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:484: T__92
+                // InternalCheckCfg.g:1:484: T__92
                 {
                 mT__92(); 
 
                 }
                 break;
             case 81 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:490: T__93
+                // InternalCheckCfg.g:1:490: T__93
                 {
                 mT__93(); 
 
                 }
                 break;
             case 82 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:496: RULE_HEX
+                // InternalCheckCfg.g:1:496: RULE_HEX
                 {
                 mRULE_HEX(); 
 
                 }
                 break;
             case 83 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:505: RULE_INT
+                // InternalCheckCfg.g:1:505: RULE_INT
                 {
                 mRULE_INT(); 
 
                 }
                 break;
             case 84 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:514: RULE_DECIMAL
+                // InternalCheckCfg.g:1:514: RULE_DECIMAL
                 {
                 mRULE_DECIMAL(); 
 
                 }
                 break;
             case 85 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:527: RULE_ID
+                // InternalCheckCfg.g:1:527: RULE_ID
                 {
                 mRULE_ID(); 
 
                 }
                 break;
             case 86 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:535: RULE_STRING
+                // InternalCheckCfg.g:1:535: RULE_STRING
                 {
                 mRULE_STRING(); 
 
                 }
                 break;
             case 87 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:547: RULE_ML_COMMENT
+                // InternalCheckCfg.g:1:547: RULE_ML_COMMENT
                 {
                 mRULE_ML_COMMENT(); 
 
                 }
                 break;
             case 88 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:563: RULE_SL_COMMENT
+                // InternalCheckCfg.g:1:563: RULE_SL_COMMENT
                 {
                 mRULE_SL_COMMENT(); 
 
                 }
                 break;
             case 89 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:579: RULE_WS
+                // InternalCheckCfg.g:1:579: RULE_WS
                 {
                 mRULE_WS(); 
 
                 }
                 break;
             case 90 :
-                // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1:587: RULE_ANY_OTHER
+                // InternalCheckCfg.g:1:587: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -3280,89 +3280,19 @@ public void mTokens() throws RecognitionException {
 
     protected DFA21 dfa21 = new DFA21(this);
     static final String DFA21_eotS =
-        "\1\uffff\1\56\1\60\1\62\1\65\1\71\1\74\1\100\1\102\1\104\1\106"+
-        "\1\110\1\112\1\115\10\117\10\uffff\1\117\1\uffff\1\160\3\117\2\171"+
-        "\1\53\5\uffff\1\176\26\uffff\1\u0080\5\uffff\1\u0082\4\uffff\1\117"+
-        "\1\uffff\12\117\1\u0090\4\117\1\u0095\5\117\10\uffff\1\u009c\3\uffff"+
-        "\6\117\1\uffff\1\171\12\uffff\1\u00a4\1\u00a5\13\117\1\uffff\1\117"+
-        "\1\u00b2\2\117\1\uffff\6\117\1\uffff\1\u00bc\3\117\1\u00c0\2\117"+
-        "\2\uffff\2\117\1\u00c5\5\117\1\u00cb\3\117\1\uffff\10\117\1\u00d7"+
-        "\1\uffff\1\u00d8\2\117\1\uffff\1\u00db\2\117\1\u00df\1\uffff\1\117"+
-        "\1\u00e1\3\117\1\uffff\2\117\1\u00e7\3\117\1\u00eb\1\u00ec\2\117"+
-        "\1\u00ef\2\uffff\1\117\1\u00f1\1\uffff\3\117\1\uffff\1\u00f5\1\uffff"+
-        "\1\u00f6\1\117\1\u00f8\1\117\1\u00fa\1\uffff\3\117\2\uffff\2\117"+
-        "\1\uffff\1\u0100\1\uffff\1\u0101\1\u0102\1\117\2\uffff\1\117\1\uffff"+
-        "\1\117\1\uffff\1\u0106\1\u0107\1\u0108\1\117\1\u010a\3\uffff\3\117"+
-        "\3\uffff\1\117\1\uffff\1\u010f\3\117\1\uffff\1\117\1\u0114\2\117"+
-        "\1\uffff\1\117\1\u0118\1\117\1\uffff\1\u011a\1\uffff";
+        "\1\uffff\1\56\1\60\1\62\1\65\1\71\1\74\1\100\1\102\1\104\1\106\1\110\1\112\1\115\10\117\10\uffff\1\117\1\uffff\1\160\3\117\2\171\1\53\5\uffff\1\176\26\uffff\1\u0080\5\uffff\1\u0082\4\uffff\1\117\1\uffff\12\117\1\u0090\4\117\1\u0095\5\117\10\uffff\1\u009c\3\uffff\6\117\1\uffff\1\171\12\uffff\1\u00a4\1\u00a5\13\117\1\uffff\1\117\1\u00b2\2\117\1\uffff\6\117\1\uffff\1\u00bc\3\117\1\u00c0\2\117\2\uffff\2\117\1\u00c5\5\117\1\u00cb\3\117\1\uffff\10\117\1\u00d7\1\uffff\1\u00d8\2\117\1\uffff\1\u00db\2\117\1\u00df\1\uffff\1\117\1\u00e1\3\117\1\uffff\2\117\1\u00e7\3\117\1\u00eb\1\u00ec\2\117\1\u00ef\2\uffff\1\117\1\u00f1\1\uffff\3\117\1\uffff\1\u00f5\1\uffff\1\u00f6\1\117\1\u00f8\1\117\1\u00fa\1\uffff\3\117\2\uffff\2\117\1\uffff\1\u0100\1\uffff\1\u0101\1\u0102\1\117\2\uffff\1\117\1\uffff\1\117\1\uffff\1\u0106\1\u0107\1\u0108\1\117\1\u010a\3\uffff\3\117\3\uffff\1\117\1\uffff\1\u010f\3\117\1\uffff\1\117\1\u0114\2\117\1\uffff\1\117\1\u0118\1\117\1\uffff\1\u011a\1\uffff";
     static final String DFA21_eofS =
         "\u011b\uffff";
     static final String DFA21_minS =
-        "\1\0\1\75\1\174\1\46\1\53\1\55\2\52\3\75\1\76\2\56\1\141\1\154"+
-        "\1\164\1\146\1\141\1\145\2\141\10\uffff\1\163\1\uffff\1\72\1\145"+
-        "\1\150\1\145\2\60\1\44\5\uffff\1\75\26\uffff\1\75\5\uffff\1\74\4"+
-        "\uffff\1\154\1\uffff\1\164\1\162\1\163\1\141\1\160\1\151\1\156\1"+
-        "\160\1\146\1\156\1\44\1\154\1\162\1\156\1\146\1\44\1\162\1\151\1"+
-        "\145\1\156\1\163\10\uffff\1\44\3\uffff\1\167\1\154\1\160\1\162\1"+
-        "\165\1\164\1\uffff\1\60\12\uffff\2\44\1\145\1\157\1\145\1\164\1"+
-        "\145\1\164\1\143\2\157\1\164\1\157\1\uffff\1\163\1\44\2\141\1\uffff"+
-        "\1\156\1\154\1\143\1\146\1\141\1\145\1\uffff\1\44\1\154\1\145\1"+
-        "\157\1\44\1\145\1\165\2\uffff\1\156\1\162\1\44\1\151\1\162\1\143"+
-        "\1\150\1\162\1\44\1\141\1\162\1\145\1\uffff\1\154\1\165\1\151\1"+
-        "\145\1\153\1\151\1\154\1\150\1\44\1\uffff\1\44\1\157\1\167\1\uffff"+
-        "\1\44\1\162\1\144\1\44\1\uffff\1\143\1\44\1\150\1\162\1\164\1\uffff"+
-        "\1\156\1\145\1\44\2\154\1\156\2\44\1\147\1\157\1\44\2\uffff\1\146"+
-        "\1\44\1\uffff\1\156\1\163\1\151\1\uffff\1\44\1\uffff\1\44\1\157"+
-        "\1\44\1\143\1\44\1\uffff\1\171\1\164\1\147\2\uffff\1\165\1\147\1"+
-        "\uffff\1\44\1\uffff\2\44\1\157\2\uffff\1\156\1\uffff\1\145\1\uffff"+
-        "\3\44\1\162\1\44\3\uffff\1\156\1\151\1\157\3\uffff\1\141\1\uffff"+
-        "\1\44\1\172\1\146\1\164\1\uffff\1\145\1\44\1\151\1\144\1\uffff\1"+
-        "\157\1\44\1\156\1\uffff\1\44\1\uffff";
+        "\1\0\1\75\1\174\1\46\1\53\1\55\2\52\3\75\1\76\2\56\1\141\1\154\1\164\1\146\1\141\1\145\2\141\10\uffff\1\163\1\uffff\1\72\1\145\1\150\1\145\2\60\1\44\5\uffff\1\75\26\uffff\1\75\5\uffff\1\74\4\uffff\1\154\1\uffff\1\164\1\162\1\163\1\141\1\160\1\151\1\156\1\160\1\146\1\156\1\44\1\154\1\162\1\156\1\146\1\44\1\162\1\151\1\145\1\156\1\163\10\uffff\1\44\3\uffff\1\167\1\154\1\160\1\162\1\165\1\164\1\uffff\1\60\12\uffff\2\44\1\145\1\157\1\145\1\164\1\145\1\164\1\143\2\157\1\164\1\157\1\uffff\1\163\1\44\2\141\1\uffff\1\156\1\154\1\143\1\146\1\141\1\145\1\uffff\1\44\1\154\1\145\1\157\1\44\1\145\1\165\2\uffff\1\156\1\162\1\44\1\151\1\162\1\143\1\150\1\162\1\44\1\141\1\162\1\145\1\uffff\1\154\1\165\1\151\1\145\1\153\1\151\1\154\1\150\1\44\1\uffff\1\44\1\157\1\167\1\uffff\1\44\1\162\1\144\1\44\1\uffff\1\143\1\44\1\150\1\162\1\164\1\uffff\1\156\1\145\1\44\2\154\1\156\2\44\1\147\1\157\1\44\2\uffff\1\146\1\44\1\uffff\1\156\1\163\1\151\1\uffff\1\44\1\uffff\1\44\1\157\1\44\1\143\1\44\1\uffff\1\171\1\164\1\147\2\uffff\1\165\1\147\1\uffff\1\44\1\uffff\2\44\1\157\2\uffff\1\156\1\uffff\1\145\1\uffff\3\44\1\162\1\44\3\uffff\1\156\1\151\1\157\3\uffff\1\141\1\uffff\1\44\1\172\1\146\1\164\1\uffff\1\145\1\44\1\151\1\144\1\uffff\1\157\1\44\1\156\1\uffff\1\44\1\uffff";
     static final String DFA21_maxS =
-        "\1\uffff\1\76\1\174\1\46\1\75\1\76\5\75\1\76\1\56\1\72\1\141\1"+
-        "\170\1\171\1\156\2\157\1\150\1\157\10\uffff\1\163\1\uffff\1\72\1"+
-        "\165\1\171\1\145\1\170\1\154\1\172\5\uffff\1\75\26\uffff\1\75\5"+
-        "\uffff\1\74\4\uffff\1\162\1\uffff\1\164\1\162\1\163\1\141\1\160"+
-        "\1\151\1\156\1\160\1\163\1\156\1\172\1\154\1\162\1\156\1\146\1\172"+
-        "\1\162\1\151\1\145\1\156\1\164\10\uffff\1\172\3\uffff\1\167\1\154"+
-        "\1\160\1\162\1\171\1\164\1\uffff\1\154\12\uffff\2\172\1\145\1\157"+
-        "\1\145\1\164\1\145\1\164\1\143\2\157\1\164\1\157\1\uffff\1\163\1"+
-        "\172\2\141\1\uffff\1\156\1\154\1\143\1\146\1\143\1\145\1\uffff\1"+
-        "\172\1\154\1\145\1\157\1\172\1\145\1\165\2\uffff\1\156\1\162\1\172"+
-        "\1\151\1\162\1\143\1\150\1\162\1\172\1\141\1\162\1\145\1\uffff\1"+
-        "\154\1\165\1\151\1\145\1\153\1\151\1\154\1\150\1\172\1\uffff\1\172"+
-        "\1\157\1\167\1\uffff\1\172\1\162\1\163\1\172\1\uffff\1\143\1\172"+
-        "\1\150\1\162\1\164\1\uffff\1\156\1\145\1\172\2\154\1\156\2\172\1"+
-        "\147\1\157\1\172\2\uffff\1\146\1\172\1\uffff\1\156\1\163\1\151\1"+
-        "\uffff\1\172\1\uffff\1\172\1\157\1\172\1\143\1\172\1\uffff\1\171"+
-        "\1\164\1\147\2\uffff\1\165\1\147\1\uffff\1\172\1\uffff\2\172\1\157"+
-        "\2\uffff\1\156\1\uffff\1\145\1\uffff\3\172\1\162\1\172\3\uffff\1"+
-        "\156\1\151\1\157\3\uffff\1\141\1\uffff\2\172\1\146\1\164\1\uffff"+
-        "\1\145\1\172\1\151\1\144\1\uffff\1\157\1\172\1\156\1\uffff\1\172"+
-        "\1\uffff";
+        "\1\uffff\1\76\1\174\1\46\1\75\1\76\5\75\1\76\1\56\1\72\1\141\1\170\1\171\1\156\2\157\1\150\1\157\10\uffff\1\163\1\uffff\1\72\1\165\1\171\1\145\1\170\1\154\1\172\5\uffff\1\75\26\uffff\1\75\5\uffff\1\74\4\uffff\1\162\1\uffff\1\164\1\162\1\163\1\141\1\160\1\151\1\156\1\160\1\163\1\156\1\172\1\154\1\162\1\156\1\146\1\172\1\162\1\151\1\145\1\156\1\164\10\uffff\1\172\3\uffff\1\167\1\154\1\160\1\162\1\171\1\164\1\uffff\1\154\12\uffff\2\172\1\145\1\157\1\145\1\164\1\145\1\164\1\143\2\157\1\164\1\157\1\uffff\1\163\1\172\2\141\1\uffff\1\156\1\154\1\143\1\146\1\143\1\145\1\uffff\1\172\1\154\1\145\1\157\1\172\1\145\1\165\2\uffff\1\156\1\162\1\172\1\151\1\162\1\143\1\150\1\162\1\172\1\141\1\162\1\145\1\uffff\1\154\1\165\1\151\1\145\1\153\1\151\1\154\1\150\1\172\1\uffff\1\172\1\157\1\167\1\uffff\1\172\1\162\1\163\1\172\1\uffff\1\143\1\172\1\150\1\162\1\164\1\uffff\1\156\1\145\1\172\2\154\1\156\2\172\1\147\1\157\1\172\2\uffff\1\146\1\172\1\uffff\1\156\1\163\1\151\1\uffff\1\172\1\uffff\1\172\1\157\1\172\1\143\1\172\1\uffff\1\171\1\164\1\147\2\uffff\1\165\1\147\1\uffff\1\172\1\uffff\2\172\1\157\2\uffff\1\156\1\uffff\1\145\1\uffff\3\172\1\162\1\172\3\uffff\1\156\1\151\1\157\3\uffff\1\141\1\uffff\2\172\1\146\1\164\1\uffff\1\145\1\172\1\151\1\144\1\uffff\1\157\1\172\1\156\1\uffff\1\172\1\uffff";
     static final String DFA21_acceptS =
-        "\26\uffff\1\56\1\57\1\62\1\63\1\64\1\65\1\66\1\67\1\uffff\1\72"+
-        "\7\uffff\1\125\2\126\1\131\1\132\1\uffff\1\23\1\1\1\2\1\117\1\3"+
-        "\1\114\1\4\1\35\1\26\1\5\1\20\1\36\1\27\1\6\1\31\1\30\1\7\1\127"+
-        "\1\130\1\32\1\10\1\33\1\uffff\1\34\1\15\1\16\1\24\1\17\1\uffff\1"+
-        "\37\1\25\1\116\1\113\1\uffff\1\125\25\uffff\1\56\1\57\1\62\1\63"+
-        "\1\64\1\65\1\66\1\67\1\uffff\1\72\1\115\1\76\6\uffff\1\122\1\uffff"+
-        "\1\123\1\124\1\126\1\131\1\13\1\11\1\14\1\12\1\21\1\22\15\uffff"+
-        "\1\73\4\uffff\1\101\6\uffff\1\71\7\uffff\1\40\1\120\14\uffff\1\60"+
-        "\11\uffff\1\102\3\uffff\1\107\4\uffff\1\74\5\uffff\1\52\13\uffff"+
-        "\1\77\1\103\2\uffff\1\121\3\uffff\1\50\1\uffff\1\45\5\uffff\1\46"+
-        "\3\uffff\1\100\1\54\2\uffff\1\112\1\uffff\1\105\3\uffff\1\42\1\75"+
-        "\1\uffff\1\43\1\uffff\1\53\5\uffff\1\104\1\106\1\41\3\uffff\1\110"+
-        "\1\47\1\51\1\uffff\1\61\4\uffff\1\44\4\uffff\1\70\3\uffff\1\111"+
-        "\1\uffff\1\55";
+        "\26\uffff\1\56\1\57\1\62\1\63\1\64\1\65\1\66\1\67\1\uffff\1\72\7\uffff\1\125\2\126\1\131\1\132\1\uffff\1\23\1\1\1\2\1\117\1\3\1\114\1\4\1\35\1\26\1\5\1\20\1\36\1\27\1\6\1\31\1\30\1\7\1\127\1\130\1\32\1\10\1\33\1\uffff\1\34\1\15\1\16\1\24\1\17\1\uffff\1\37\1\25\1\116\1\113\1\uffff\1\125\25\uffff\1\56\1\57\1\62\1\63\1\64\1\65\1\66\1\67\1\uffff\1\72\1\115\1\76\6\uffff\1\122\1\uffff\1\123\1\124\1\126\1\131\1\13\1\11\1\14\1\12\1\21\1\22\15\uffff\1\73\4\uffff\1\101\6\uffff\1\71\7\uffff\1\40\1\120\14\uffff\1\60\11\uffff\1\102\3\uffff\1\107\4\uffff\1\74\5\uffff\1\52\13\uffff\1\77\1\103\2\uffff\1\121\3\uffff\1\50\1\uffff\1\45\5\uffff\1\46\3\uffff\1\100\1\54\2\uffff\1\112\1\uffff\1\105\3\uffff\1\42\1\75\1\uffff\1\43\1\uffff\1\53\5\uffff\1\104\1\106\1\41\3\uffff\1\110\1\47\1\51\1\uffff\1\61\4\uffff\1\44\4\uffff\1\70\3\uffff\1\111\1\uffff\1\55";
     static final String DFA21_specialS =
         "\1\0\u011a\uffff}>";
     static final String[] DFA21_transitionS = {
-            "\11\53\2\52\2\53\1\52\22\53\1\52\1\11\1\50\1\33\1\47\1\10\1"+
-            "\3\1\51\1\30\1\31\1\6\1\4\1\32\1\5\1\14\1\7\1\44\11\45\1\40"+
-            "\1\37\1\13\1\1\1\12\1\15\1\53\32\47\1\34\1\53\1\35\1\46\1\47"+
-            "\1\53\1\36\1\47\1\25\1\23\1\17\1\22\2\47\1\21\4\47\1\41\3\47"+
-            "\1\43\1\20\1\42\1\47\1\16\1\24\3\47\1\26\1\2\1\27\uff82\53",
+            "\11\53\2\52\2\53\1\52\22\53\1\52\1\11\1\50\1\33\1\47\1\10\1\3\1\51\1\30\1\31\1\6\1\4\1\32\1\5\1\14\1\7\1\44\11\45\1\40\1\37\1\13\1\1\1\12\1\15\1\53\32\47\1\34\1\53\1\35\1\46\1\47\1\53\1\36\1\47\1\25\1\23\1\17\1\22\2\47\1\21\4\47\1\41\3\47\1\43\1\20\1\42\1\47\1\16\1\24\3\47\1\26\1\2\1\27\uff82\53",
             "\1\54\1\55",
             "\1\57",
             "\1\61",
@@ -3398,11 +3328,8 @@ public void mTokens() throws RecognitionException {
             "\1\161\17\uffff\1\162",
             "\1\164\11\uffff\1\165\6\uffff\1\163",
             "\1\166",
-            "\12\170\10\uffff\1\172\1\uffff\3\172\5\uffff\1\172\13\uffff"+
-            "\1\167\6\uffff\1\170\2\uffff\1\172\1\uffff\3\172\5\uffff\1\172"+
-            "\13\uffff\1\167",
-            "\12\170\10\uffff\1\172\1\uffff\3\172\5\uffff\1\172\22\uffff"+
-            "\1\170\2\uffff\1\172\1\uffff\3\172\5\uffff\1\172",
+            "\12\170\10\uffff\1\172\1\uffff\3\172\5\uffff\1\172\13\uffff\1\167\6\uffff\1\170\2\uffff\1\172\1\uffff\3\172\5\uffff\1\172\13\uffff\1\167",
+            "\12\170\10\uffff\1\172\1\uffff\3\172\5\uffff\1\172\22\uffff\1\170\2\uffff\1\172\1\uffff\3\172\5\uffff\1\172",
             "\1\117\34\uffff\32\117\4\uffff\1\117\1\uffff\32\117",
             "",
             "",
@@ -3455,14 +3382,12 @@ public void mTokens() throws RecognitionException {
             "\1\u008c",
             "\1\u008d\14\uffff\1\u008e",
             "\1\u008f",
-            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff"+
-            "\32\117",
+            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff\32\117",
             "\1\u0091",
             "\1\u0092",
             "\1\u0093",
             "\1\u0094",
-            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff"+
-            "\32\117",
+            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff\32\117",
             "\1\u0096",
             "\1\u0097",
             "\1\u0098",
@@ -3476,8 +3401,7 @@ public void mTokens() throws RecognitionException {
             "",
             "",
             "",
-            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff"+
-            "\32\117",
+            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff\32\117",
             "",
             "",
             "",
@@ -3488,8 +3412,7 @@ public void mTokens() throws RecognitionException {
             "\1\u00a2\3\uffff\1\u00a1",
             "\1\u00a3",
             "",
-            "\12\170\10\uffff\1\172\1\uffff\3\172\5\uffff\1\172\22\uffff"+
-            "\1\170\2\uffff\1\172\1\uffff\3\172\5\uffff\1\172",
+            "\12\170\10\uffff\1\172\1\uffff\3\172\5\uffff\1\172\22\uffff\1\170\2\uffff\1\172\1\uffff\3\172\5\uffff\1\172",
             "",
             "",
             "",
@@ -3500,10 +3423,8 @@ public void mTokens() throws RecognitionException {
             "",
             "",
             "",
-            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff"+
-            "\32\117",
-            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff"+
-            "\32\117",
+            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff\32\117",
+            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff\32\117",
             "\1\u00a6",
             "\1\u00a7",
             "\1\u00a8",
@@ -3517,8 +3438,7 @@ public void mTokens() throws RecognitionException {
             "\1\u00b0",
             "",
             "\1\u00b1",
-            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff"+
-            "\32\117",
+            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff\32\117",
             "\1\u00b3",
             "\1\u00b4",
             "",
@@ -3529,28 +3449,24 @@ public void mTokens() throws RecognitionException {
             "\1\u00b9\1\uffff\1\u00ba",
             "\1\u00bb",
             "",
-            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff"+
-            "\32\117",
+            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff\32\117",
             "\1\u00bd",
             "\1\u00be",
             "\1\u00bf",
-            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff"+
-            "\32\117",
+            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff\32\117",
             "\1\u00c1",
             "\1\u00c2",
             "",
             "",
             "\1\u00c3",
             "\1\u00c4",
-            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff"+
-            "\32\117",
+            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff\32\117",
             "\1\u00c6",
             "\1\u00c7",
             "\1\u00c8",
             "\1\u00c9",
             "\1\u00ca",
-            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff"+
-            "\32\117",
+            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff\32\117",
             "\1\u00cc",
             "\1\u00cd",
             "\1\u00ce",
@@ -3563,64 +3479,50 @@ public void mTokens() throws RecognitionException {
             "\1\u00d4",
             "\1\u00d5",
             "\1\u00d6",
-            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff"+
-            "\32\117",
+            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff\32\117",
             "",
-            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff"+
-            "\32\117",
+            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff\32\117",
             "\1\u00d9",
             "\1\u00da",
             "",
-            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff"+
-            "\32\117",
+            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff\32\117",
             "\1\u00dc",
             "\1\u00dd\16\uffff\1\u00de",
-            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff"+
-            "\32\117",
+            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff\32\117",
             "",
             "\1\u00e0",
-            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff"+
-            "\32\117",
+            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff\32\117",
             "\1\u00e2",
             "\1\u00e3",
             "\1\u00e4",
             "",
             "\1\u00e5",
             "\1\u00e6",
-            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff"+
-            "\32\117",
+            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff\32\117",
             "\1\u00e8",
             "\1\u00e9",
             "\1\u00ea",
-            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff"+
-            "\32\117",
-            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff"+
-            "\32\117",
+            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff\32\117",
+            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff\32\117",
             "\1\u00ed",
             "\1\u00ee",
-            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff"+
-            "\32\117",
+            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff\32\117",
             "",
             "",
             "\1\u00f0",
-            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff"+
-            "\32\117",
+            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff\32\117",
             "",
             "\1\u00f2",
             "\1\u00f3",
             "\1\u00f4",
             "",
-            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff"+
-            "\32\117",
+            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff\32\117",
             "",
-            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff"+
-            "\32\117",
+            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff\32\117",
             "\1\u00f7",
-            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff"+
-            "\32\117",
+            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff\32\117",
             "\1\u00f9",
-            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff"+
-            "\32\117",
+            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff\32\117",
             "",
             "\1\u00fb",
             "\1\u00fc",
@@ -3630,13 +3532,10 @@ public void mTokens() throws RecognitionException {
             "\1\u00fe",
             "\1\u00ff",
             "",
-            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff"+
-            "\32\117",
+            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff\32\117",
             "",
-            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff"+
-            "\32\117",
-            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff"+
-            "\32\117",
+            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff\32\117",
+            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff\32\117",
             "\1\u0103",
             "",
             "",
@@ -3644,15 +3543,11 @@ public void mTokens() throws RecognitionException {
             "",
             "\1\u0105",
             "",
-            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff"+
-            "\32\117",
-            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff"+
-            "\32\117",
-            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff"+
-            "\32\117",
+            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff\32\117",
+            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff\32\117",
+            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff\32\117",
             "\1\u0109",
-            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff"+
-            "\32\117",
+            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff\32\117",
             "",
             "",
             "",
@@ -3664,25 +3559,21 @@ public void mTokens() throws RecognitionException {
             "",
             "\1\u010e",
             "",
-            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff"+
-            "\32\117",
+            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff\32\117",
             "\1\u0110",
             "\1\u0111",
             "\1\u0112",
             "",
             "\1\u0113",
-            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff"+
-            "\32\117",
+            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff\32\117",
             "\1\u0115",
             "\1\u0116",
             "",
             "\1\u0117",
-            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff"+
-            "\32\117",
+            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff\32\117",
             "\1\u0119",
             "",
-            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff"+
-            "\32\117",
+            "\1\117\13\uffff\12\117\7\uffff\32\117\4\uffff\1\117\1\uffff\32\117",
             ""
     };
 
diff --git a/com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfgParser.java b/com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfgParser.java
index ab9078ba4..c32c61d8d 100644
--- a/com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfgParser.java
+++ b/com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfgParser.java
@@ -131,7 +131,7 @@ public InternalCheckCfgParser(TokenStream input, RecognizerSharedState state) {
         
 
     public String[] getTokenNames() { return InternalCheckCfgParser.tokenNames; }
-    public String getGrammarFileName() { return "../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g"; }
+    public String getGrammarFileName() { return "InternalCheckCfg.g"; }
 
 
      
@@ -155,16 +155,16 @@ protected String getValueForTokenName(String tokenName) {
 
 
     // $ANTLR start "entryRuleCheckConfiguration"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:61:1: entryRuleCheckConfiguration : ruleCheckConfiguration EOF ;
+    // InternalCheckCfg.g:61:1: entryRuleCheckConfiguration : ruleCheckConfiguration EOF ;
     public final void entryRuleCheckConfiguration() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:62:1: ( ruleCheckConfiguration EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:63:1: ruleCheckConfiguration EOF
+            // InternalCheckCfg.g:62:1: ( ruleCheckConfiguration EOF )
+            // InternalCheckCfg.g:63:1: ruleCheckConfiguration EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckConfigurationRule()); 
             }
-            pushFollow(FOLLOW_ruleCheckConfiguration_in_entryRuleCheckConfiguration67);
+            pushFollow(FOLLOW_1);
             ruleCheckConfiguration();
 
             state._fsp--;
@@ -172,7 +172,7 @@ public final void entryRuleCheckConfiguration() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCheckConfigurationRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleCheckConfiguration74); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -189,25 +189,25 @@ public final void entryRuleCheckConfiguration() throws RecognitionException {
 
 
     // $ANTLR start "ruleCheckConfiguration"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:70:1: ruleCheckConfiguration : ( ( rule__CheckConfiguration__Group__0 ) ) ;
+    // InternalCheckCfg.g:70:1: ruleCheckConfiguration : ( ( rule__CheckConfiguration__Group__0 ) ) ;
     public final void ruleCheckConfiguration() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:74:2: ( ( ( rule__CheckConfiguration__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:75:1: ( ( rule__CheckConfiguration__Group__0 ) )
+            // InternalCheckCfg.g:74:2: ( ( ( rule__CheckConfiguration__Group__0 ) ) )
+            // InternalCheckCfg.g:75:1: ( ( rule__CheckConfiguration__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:75:1: ( ( rule__CheckConfiguration__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:76:1: ( rule__CheckConfiguration__Group__0 )
+            // InternalCheckCfg.g:75:1: ( ( rule__CheckConfiguration__Group__0 ) )
+            // InternalCheckCfg.g:76:1: ( rule__CheckConfiguration__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckConfigurationAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:77:1: ( rule__CheckConfiguration__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:77:2: rule__CheckConfiguration__Group__0
+            // InternalCheckCfg.g:77:1: ( rule__CheckConfiguration__Group__0 )
+            // InternalCheckCfg.g:77:2: rule__CheckConfiguration__Group__0
             {
-            pushFollow(FOLLOW_rule__CheckConfiguration__Group__0_in_ruleCheckConfiguration100);
+            pushFollow(FOLLOW_2);
             rule__CheckConfiguration__Group__0();
 
             state._fsp--;
@@ -240,16 +240,16 @@ public final void ruleCheckConfiguration() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleConfiguredLanguageValidator"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:89:1: entryRuleConfiguredLanguageValidator : ruleConfiguredLanguageValidator EOF ;
+    // InternalCheckCfg.g:89:1: entryRuleConfiguredLanguageValidator : ruleConfiguredLanguageValidator EOF ;
     public final void entryRuleConfiguredLanguageValidator() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:90:1: ( ruleConfiguredLanguageValidator EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:91:1: ruleConfiguredLanguageValidator EOF
+            // InternalCheckCfg.g:90:1: ( ruleConfiguredLanguageValidator EOF )
+            // InternalCheckCfg.g:91:1: ruleConfiguredLanguageValidator EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredLanguageValidatorRule()); 
             }
-            pushFollow(FOLLOW_ruleConfiguredLanguageValidator_in_entryRuleConfiguredLanguageValidator127);
+            pushFollow(FOLLOW_1);
             ruleConfiguredLanguageValidator();
 
             state._fsp--;
@@ -257,7 +257,7 @@ public final void entryRuleConfiguredLanguageValidator() throws RecognitionExcep
             if ( state.backtracking==0 ) {
                after(grammarAccess.getConfiguredLanguageValidatorRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleConfiguredLanguageValidator134); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -274,25 +274,25 @@ public final void entryRuleConfiguredLanguageValidator() throws RecognitionExcep
 
 
     // $ANTLR start "ruleConfiguredLanguageValidator"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:98:1: ruleConfiguredLanguageValidator : ( ( rule__ConfiguredLanguageValidator__Group__0 ) ) ;
+    // InternalCheckCfg.g:98:1: ruleConfiguredLanguageValidator : ( ( rule__ConfiguredLanguageValidator__Group__0 ) ) ;
     public final void ruleConfiguredLanguageValidator() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:102:2: ( ( ( rule__ConfiguredLanguageValidator__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:103:1: ( ( rule__ConfiguredLanguageValidator__Group__0 ) )
+            // InternalCheckCfg.g:102:2: ( ( ( rule__ConfiguredLanguageValidator__Group__0 ) ) )
+            // InternalCheckCfg.g:103:1: ( ( rule__ConfiguredLanguageValidator__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:103:1: ( ( rule__ConfiguredLanguageValidator__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:104:1: ( rule__ConfiguredLanguageValidator__Group__0 )
+            // InternalCheckCfg.g:103:1: ( ( rule__ConfiguredLanguageValidator__Group__0 ) )
+            // InternalCheckCfg.g:104:1: ( rule__ConfiguredLanguageValidator__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredLanguageValidatorAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:105:1: ( rule__ConfiguredLanguageValidator__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:105:2: rule__ConfiguredLanguageValidator__Group__0
+            // InternalCheckCfg.g:105:1: ( rule__ConfiguredLanguageValidator__Group__0 )
+            // InternalCheckCfg.g:105:2: rule__ConfiguredLanguageValidator__Group__0
             {
-            pushFollow(FOLLOW_rule__ConfiguredLanguageValidator__Group__0_in_ruleConfiguredLanguageValidator160);
+            pushFollow(FOLLOW_2);
             rule__ConfiguredLanguageValidator__Group__0();
 
             state._fsp--;
@@ -325,16 +325,16 @@ public final void ruleConfiguredLanguageValidator() throws RecognitionException
 
 
     // $ANTLR start "entryRuleConfiguredCatalog"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:117:1: entryRuleConfiguredCatalog : ruleConfiguredCatalog EOF ;
+    // InternalCheckCfg.g:117:1: entryRuleConfiguredCatalog : ruleConfiguredCatalog EOF ;
     public final void entryRuleConfiguredCatalog() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:118:1: ( ruleConfiguredCatalog EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:119:1: ruleConfiguredCatalog EOF
+            // InternalCheckCfg.g:118:1: ( ruleConfiguredCatalog EOF )
+            // InternalCheckCfg.g:119:1: ruleConfiguredCatalog EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredCatalogRule()); 
             }
-            pushFollow(FOLLOW_ruleConfiguredCatalog_in_entryRuleConfiguredCatalog187);
+            pushFollow(FOLLOW_1);
             ruleConfiguredCatalog();
 
             state._fsp--;
@@ -342,7 +342,7 @@ public final void entryRuleConfiguredCatalog() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getConfiguredCatalogRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleConfiguredCatalog194); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -359,25 +359,25 @@ public final void entryRuleConfiguredCatalog() throws RecognitionException {
 
 
     // $ANTLR start "ruleConfiguredCatalog"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:126:1: ruleConfiguredCatalog : ( ( rule__ConfiguredCatalog__Group__0 ) ) ;
+    // InternalCheckCfg.g:126:1: ruleConfiguredCatalog : ( ( rule__ConfiguredCatalog__Group__0 ) ) ;
     public final void ruleConfiguredCatalog() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:130:2: ( ( ( rule__ConfiguredCatalog__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:131:1: ( ( rule__ConfiguredCatalog__Group__0 ) )
+            // InternalCheckCfg.g:130:2: ( ( ( rule__ConfiguredCatalog__Group__0 ) ) )
+            // InternalCheckCfg.g:131:1: ( ( rule__ConfiguredCatalog__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:131:1: ( ( rule__ConfiguredCatalog__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:132:1: ( rule__ConfiguredCatalog__Group__0 )
+            // InternalCheckCfg.g:131:1: ( ( rule__ConfiguredCatalog__Group__0 ) )
+            // InternalCheckCfg.g:132:1: ( rule__ConfiguredCatalog__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredCatalogAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:133:1: ( rule__ConfiguredCatalog__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:133:2: rule__ConfiguredCatalog__Group__0
+            // InternalCheckCfg.g:133:1: ( rule__ConfiguredCatalog__Group__0 )
+            // InternalCheckCfg.g:133:2: rule__ConfiguredCatalog__Group__0
             {
-            pushFollow(FOLLOW_rule__ConfiguredCatalog__Group__0_in_ruleConfiguredCatalog220);
+            pushFollow(FOLLOW_2);
             rule__ConfiguredCatalog__Group__0();
 
             state._fsp--;
@@ -410,16 +410,16 @@ public final void ruleConfiguredCatalog() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleConfiguredCheck"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:145:1: entryRuleConfiguredCheck : ruleConfiguredCheck EOF ;
+    // InternalCheckCfg.g:145:1: entryRuleConfiguredCheck : ruleConfiguredCheck EOF ;
     public final void entryRuleConfiguredCheck() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:146:1: ( ruleConfiguredCheck EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:147:1: ruleConfiguredCheck EOF
+            // InternalCheckCfg.g:146:1: ( ruleConfiguredCheck EOF )
+            // InternalCheckCfg.g:147:1: ruleConfiguredCheck EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredCheckRule()); 
             }
-            pushFollow(FOLLOW_ruleConfiguredCheck_in_entryRuleConfiguredCheck247);
+            pushFollow(FOLLOW_1);
             ruleConfiguredCheck();
 
             state._fsp--;
@@ -427,7 +427,7 @@ public final void entryRuleConfiguredCheck() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getConfiguredCheckRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleConfiguredCheck254); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -444,25 +444,25 @@ public final void entryRuleConfiguredCheck() throws RecognitionException {
 
 
     // $ANTLR start "ruleConfiguredCheck"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:154:1: ruleConfiguredCheck : ( ( rule__ConfiguredCheck__Group__0 ) ) ;
+    // InternalCheckCfg.g:154:1: ruleConfiguredCheck : ( ( rule__ConfiguredCheck__Group__0 ) ) ;
     public final void ruleConfiguredCheck() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:158:2: ( ( ( rule__ConfiguredCheck__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:159:1: ( ( rule__ConfiguredCheck__Group__0 ) )
+            // InternalCheckCfg.g:158:2: ( ( ( rule__ConfiguredCheck__Group__0 ) ) )
+            // InternalCheckCfg.g:159:1: ( ( rule__ConfiguredCheck__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:159:1: ( ( rule__ConfiguredCheck__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:160:1: ( rule__ConfiguredCheck__Group__0 )
+            // InternalCheckCfg.g:159:1: ( ( rule__ConfiguredCheck__Group__0 ) )
+            // InternalCheckCfg.g:160:1: ( rule__ConfiguredCheck__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredCheckAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:161:1: ( rule__ConfiguredCheck__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:161:2: rule__ConfiguredCheck__Group__0
+            // InternalCheckCfg.g:161:1: ( rule__ConfiguredCheck__Group__0 )
+            // InternalCheckCfg.g:161:2: rule__ConfiguredCheck__Group__0
             {
-            pushFollow(FOLLOW_rule__ConfiguredCheck__Group__0_in_ruleConfiguredCheck280);
+            pushFollow(FOLLOW_2);
             rule__ConfiguredCheck__Group__0();
 
             state._fsp--;
@@ -495,16 +495,16 @@ public final void ruleConfiguredCheck() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleConfiguredParameter"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:173:1: entryRuleConfiguredParameter : ruleConfiguredParameter EOF ;
+    // InternalCheckCfg.g:173:1: entryRuleConfiguredParameter : ruleConfiguredParameter EOF ;
     public final void entryRuleConfiguredParameter() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:174:1: ( ruleConfiguredParameter EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:175:1: ruleConfiguredParameter EOF
+            // InternalCheckCfg.g:174:1: ( ruleConfiguredParameter EOF )
+            // InternalCheckCfg.g:175:1: ruleConfiguredParameter EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredParameterRule()); 
             }
-            pushFollow(FOLLOW_ruleConfiguredParameter_in_entryRuleConfiguredParameter307);
+            pushFollow(FOLLOW_1);
             ruleConfiguredParameter();
 
             state._fsp--;
@@ -512,7 +512,7 @@ public final void entryRuleConfiguredParameter() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getConfiguredParameterRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleConfiguredParameter314); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -529,25 +529,25 @@ public final void entryRuleConfiguredParameter() throws RecognitionException {
 
 
     // $ANTLR start "ruleConfiguredParameter"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:182:1: ruleConfiguredParameter : ( ( rule__ConfiguredParameter__Group__0 ) ) ;
+    // InternalCheckCfg.g:182:1: ruleConfiguredParameter : ( ( rule__ConfiguredParameter__Group__0 ) ) ;
     public final void ruleConfiguredParameter() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:186:2: ( ( ( rule__ConfiguredParameter__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:187:1: ( ( rule__ConfiguredParameter__Group__0 ) )
+            // InternalCheckCfg.g:186:2: ( ( ( rule__ConfiguredParameter__Group__0 ) ) )
+            // InternalCheckCfg.g:187:1: ( ( rule__ConfiguredParameter__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:187:1: ( ( rule__ConfiguredParameter__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:188:1: ( rule__ConfiguredParameter__Group__0 )
+            // InternalCheckCfg.g:187:1: ( ( rule__ConfiguredParameter__Group__0 ) )
+            // InternalCheckCfg.g:188:1: ( rule__ConfiguredParameter__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredParameterAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:189:1: ( rule__ConfiguredParameter__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:189:2: rule__ConfiguredParameter__Group__0
+            // InternalCheckCfg.g:189:1: ( rule__ConfiguredParameter__Group__0 )
+            // InternalCheckCfg.g:189:2: rule__ConfiguredParameter__Group__0
             {
-            pushFollow(FOLLOW_rule__ConfiguredParameter__Group__0_in_ruleConfiguredParameter340);
+            pushFollow(FOLLOW_2);
             rule__ConfiguredParameter__Group__0();
 
             state._fsp--;
@@ -580,16 +580,16 @@ public final void ruleConfiguredParameter() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXSimpleFormalParameterDefaultValueLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:201:1: entryRuleXSimpleFormalParameterDefaultValueLiteral : ruleXSimpleFormalParameterDefaultValueLiteral EOF ;
+    // InternalCheckCfg.g:201:1: entryRuleXSimpleFormalParameterDefaultValueLiteral : ruleXSimpleFormalParameterDefaultValueLiteral EOF ;
     public final void entryRuleXSimpleFormalParameterDefaultValueLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:202:1: ( ruleXSimpleFormalParameterDefaultValueLiteral EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:203:1: ruleXSimpleFormalParameterDefaultValueLiteral EOF
+            // InternalCheckCfg.g:202:1: ( ruleXSimpleFormalParameterDefaultValueLiteral EOF )
+            // InternalCheckCfg.g:203:1: ruleXSimpleFormalParameterDefaultValueLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSimpleFormalParameterDefaultValueLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXSimpleFormalParameterDefaultValueLiteral_in_entryRuleXSimpleFormalParameterDefaultValueLiteral367);
+            pushFollow(FOLLOW_1);
             ruleXSimpleFormalParameterDefaultValueLiteral();
 
             state._fsp--;
@@ -597,7 +597,7 @@ public final void entryRuleXSimpleFormalParameterDefaultValueLiteral() throws Re
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSimpleFormalParameterDefaultValueLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXSimpleFormalParameterDefaultValueLiteral374); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -614,25 +614,25 @@ public final void entryRuleXSimpleFormalParameterDefaultValueLiteral() throws Re
 
 
     // $ANTLR start "ruleXSimpleFormalParameterDefaultValueLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:210:1: ruleXSimpleFormalParameterDefaultValueLiteral : ( ( rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives ) ) ;
+    // InternalCheckCfg.g:210:1: ruleXSimpleFormalParameterDefaultValueLiteral : ( ( rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives ) ) ;
     public final void ruleXSimpleFormalParameterDefaultValueLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:214:2: ( ( ( rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:215:1: ( ( rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives ) )
+            // InternalCheckCfg.g:214:2: ( ( ( rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives ) ) )
+            // InternalCheckCfg.g:215:1: ( ( rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:215:1: ( ( rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:216:1: ( rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives )
+            // InternalCheckCfg.g:215:1: ( ( rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives ) )
+            // InternalCheckCfg.g:216:1: ( rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSimpleFormalParameterDefaultValueLiteralAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:217:1: ( rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:217:2: rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives
+            // InternalCheckCfg.g:217:1: ( rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives )
+            // InternalCheckCfg.g:217:2: rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives
             {
-            pushFollow(FOLLOW_rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives_in_ruleXSimpleFormalParameterDefaultValueLiteral400);
+            pushFollow(FOLLOW_2);
             rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives();
 
             state._fsp--;
@@ -665,16 +665,16 @@ public final void ruleXSimpleFormalParameterDefaultValueLiteral() throws Recogni
 
 
     // $ANTLR start "entryRuleXConstantUnaryOperation"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:229:1: entryRuleXConstantUnaryOperation : ruleXConstantUnaryOperation EOF ;
+    // InternalCheckCfg.g:229:1: entryRuleXConstantUnaryOperation : ruleXConstantUnaryOperation EOF ;
     public final void entryRuleXConstantUnaryOperation() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:230:1: ( ruleXConstantUnaryOperation EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:231:1: ruleXConstantUnaryOperation EOF
+            // InternalCheckCfg.g:230:1: ( ruleXConstantUnaryOperation EOF )
+            // InternalCheckCfg.g:231:1: ruleXConstantUnaryOperation EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantUnaryOperationRule()); 
             }
-            pushFollow(FOLLOW_ruleXConstantUnaryOperation_in_entryRuleXConstantUnaryOperation427);
+            pushFollow(FOLLOW_1);
             ruleXConstantUnaryOperation();
 
             state._fsp--;
@@ -682,7 +682,7 @@ public final void entryRuleXConstantUnaryOperation() throws RecognitionException
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstantUnaryOperationRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXConstantUnaryOperation434); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -699,25 +699,25 @@ public final void entryRuleXConstantUnaryOperation() throws RecognitionException
 
 
     // $ANTLR start "ruleXConstantUnaryOperation"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:238:1: ruleXConstantUnaryOperation : ( ( rule__XConstantUnaryOperation__Alternatives ) ) ;
+    // InternalCheckCfg.g:238:1: ruleXConstantUnaryOperation : ( ( rule__XConstantUnaryOperation__Alternatives ) ) ;
     public final void ruleXConstantUnaryOperation() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:242:2: ( ( ( rule__XConstantUnaryOperation__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:243:1: ( ( rule__XConstantUnaryOperation__Alternatives ) )
+            // InternalCheckCfg.g:242:2: ( ( ( rule__XConstantUnaryOperation__Alternatives ) ) )
+            // InternalCheckCfg.g:243:1: ( ( rule__XConstantUnaryOperation__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:243:1: ( ( rule__XConstantUnaryOperation__Alternatives ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:244:1: ( rule__XConstantUnaryOperation__Alternatives )
+            // InternalCheckCfg.g:243:1: ( ( rule__XConstantUnaryOperation__Alternatives ) )
+            // InternalCheckCfg.g:244:1: ( rule__XConstantUnaryOperation__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantUnaryOperationAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:245:1: ( rule__XConstantUnaryOperation__Alternatives )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:245:2: rule__XConstantUnaryOperation__Alternatives
+            // InternalCheckCfg.g:245:1: ( rule__XConstantUnaryOperation__Alternatives )
+            // InternalCheckCfg.g:245:2: rule__XConstantUnaryOperation__Alternatives
             {
-            pushFollow(FOLLOW_rule__XConstantUnaryOperation__Alternatives_in_ruleXConstantUnaryOperation460);
+            pushFollow(FOLLOW_2);
             rule__XConstantUnaryOperation__Alternatives();
 
             state._fsp--;
@@ -750,16 +750,16 @@ public final void ruleXConstantUnaryOperation() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXFormalParameterDefaultValueLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:257:1: entryRuleXFormalParameterDefaultValueLiteral : ruleXFormalParameterDefaultValueLiteral EOF ;
+    // InternalCheckCfg.g:257:1: entryRuleXFormalParameterDefaultValueLiteral : ruleXFormalParameterDefaultValueLiteral EOF ;
     public final void entryRuleXFormalParameterDefaultValueLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:258:1: ( ruleXFormalParameterDefaultValueLiteral EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:259:1: ruleXFormalParameterDefaultValueLiteral EOF
+            // InternalCheckCfg.g:258:1: ( ruleXFormalParameterDefaultValueLiteral EOF )
+            // InternalCheckCfg.g:259:1: ruleXFormalParameterDefaultValueLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFormalParameterDefaultValueLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXFormalParameterDefaultValueLiteral_in_entryRuleXFormalParameterDefaultValueLiteral487);
+            pushFollow(FOLLOW_1);
             ruleXFormalParameterDefaultValueLiteral();
 
             state._fsp--;
@@ -767,7 +767,7 @@ public final void entryRuleXFormalParameterDefaultValueLiteral() throws Recognit
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFormalParameterDefaultValueLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXFormalParameterDefaultValueLiteral494); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -784,25 +784,25 @@ public final void entryRuleXFormalParameterDefaultValueLiteral() throws Recognit
 
 
     // $ANTLR start "ruleXFormalParameterDefaultValueLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:266:1: ruleXFormalParameterDefaultValueLiteral : ( ( rule__XFormalParameterDefaultValueLiteral__Alternatives ) ) ;
+    // InternalCheckCfg.g:266:1: ruleXFormalParameterDefaultValueLiteral : ( ( rule__XFormalParameterDefaultValueLiteral__Alternatives ) ) ;
     public final void ruleXFormalParameterDefaultValueLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:270:2: ( ( ( rule__XFormalParameterDefaultValueLiteral__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:271:1: ( ( rule__XFormalParameterDefaultValueLiteral__Alternatives ) )
+            // InternalCheckCfg.g:270:2: ( ( ( rule__XFormalParameterDefaultValueLiteral__Alternatives ) ) )
+            // InternalCheckCfg.g:271:1: ( ( rule__XFormalParameterDefaultValueLiteral__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:271:1: ( ( rule__XFormalParameterDefaultValueLiteral__Alternatives ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:272:1: ( rule__XFormalParameterDefaultValueLiteral__Alternatives )
+            // InternalCheckCfg.g:271:1: ( ( rule__XFormalParameterDefaultValueLiteral__Alternatives ) )
+            // InternalCheckCfg.g:272:1: ( rule__XFormalParameterDefaultValueLiteral__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFormalParameterDefaultValueLiteralAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:273:1: ( rule__XFormalParameterDefaultValueLiteral__Alternatives )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:273:2: rule__XFormalParameterDefaultValueLiteral__Alternatives
+            // InternalCheckCfg.g:273:1: ( rule__XFormalParameterDefaultValueLiteral__Alternatives )
+            // InternalCheckCfg.g:273:2: rule__XFormalParameterDefaultValueLiteral__Alternatives
             {
-            pushFollow(FOLLOW_rule__XFormalParameterDefaultValueLiteral__Alternatives_in_ruleXFormalParameterDefaultValueLiteral520);
+            pushFollow(FOLLOW_2);
             rule__XFormalParameterDefaultValueLiteral__Alternatives();
 
             state._fsp--;
@@ -835,16 +835,16 @@ public final void ruleXFormalParameterDefaultValueLiteral() throws RecognitionEx
 
 
     // $ANTLR start "entryRuleXConstantListLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:285:1: entryRuleXConstantListLiteral : ruleXConstantListLiteral EOF ;
+    // InternalCheckCfg.g:285:1: entryRuleXConstantListLiteral : ruleXConstantListLiteral EOF ;
     public final void entryRuleXConstantListLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:286:1: ( ruleXConstantListLiteral EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:287:1: ruleXConstantListLiteral EOF
+            // InternalCheckCfg.g:286:1: ( ruleXConstantListLiteral EOF )
+            // InternalCheckCfg.g:287:1: ruleXConstantListLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantListLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXConstantListLiteral_in_entryRuleXConstantListLiteral547);
+            pushFollow(FOLLOW_1);
             ruleXConstantListLiteral();
 
             state._fsp--;
@@ -852,7 +852,7 @@ public final void entryRuleXConstantListLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstantListLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXConstantListLiteral554); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -869,25 +869,25 @@ public final void entryRuleXConstantListLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXConstantListLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:294:1: ruleXConstantListLiteral : ( ( rule__XConstantListLiteral__Group__0 ) ) ;
+    // InternalCheckCfg.g:294:1: ruleXConstantListLiteral : ( ( rule__XConstantListLiteral__Group__0 ) ) ;
     public final void ruleXConstantListLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:298:2: ( ( ( rule__XConstantListLiteral__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:299:1: ( ( rule__XConstantListLiteral__Group__0 ) )
+            // InternalCheckCfg.g:298:2: ( ( ( rule__XConstantListLiteral__Group__0 ) ) )
+            // InternalCheckCfg.g:299:1: ( ( rule__XConstantListLiteral__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:299:1: ( ( rule__XConstantListLiteral__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:300:1: ( rule__XConstantListLiteral__Group__0 )
+            // InternalCheckCfg.g:299:1: ( ( rule__XConstantListLiteral__Group__0 ) )
+            // InternalCheckCfg.g:300:1: ( rule__XConstantListLiteral__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantListLiteralAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:301:1: ( rule__XConstantListLiteral__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:301:2: rule__XConstantListLiteral__Group__0
+            // InternalCheckCfg.g:301:1: ( rule__XConstantListLiteral__Group__0 )
+            // InternalCheckCfg.g:301:2: rule__XConstantListLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group__0_in_ruleXConstantListLiteral580);
+            pushFollow(FOLLOW_2);
             rule__XConstantListLiteral__Group__0();
 
             state._fsp--;
@@ -920,16 +920,16 @@ public final void ruleXConstantListLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:313:1: entryRuleXExpression : ruleXExpression EOF ;
+    // InternalCheckCfg.g:313:1: entryRuleXExpression : ruleXExpression EOF ;
     public final void entryRuleXExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:314:1: ( ruleXExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:315:1: ruleXExpression EOF
+            // InternalCheckCfg.g:314:1: ( ruleXExpression EOF )
+            // InternalCheckCfg.g:315:1: ruleXExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_entryRuleXExpression607);
+            pushFollow(FOLLOW_1);
             ruleXExpression();
 
             state._fsp--;
@@ -937,7 +937,7 @@ public final void entryRuleXExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXExpression614); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -954,22 +954,22 @@ public final void entryRuleXExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:322:1: ruleXExpression : ( ruleXAssignment ) ;
+    // InternalCheckCfg.g:322:1: ruleXExpression : ( ruleXAssignment ) ;
     public final void ruleXExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:326:2: ( ( ruleXAssignment ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:327:1: ( ruleXAssignment )
+            // InternalCheckCfg.g:326:2: ( ( ruleXAssignment ) )
+            // InternalCheckCfg.g:327:1: ( ruleXAssignment )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:327:1: ( ruleXAssignment )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:328:1: ruleXAssignment
+            // InternalCheckCfg.g:327:1: ( ruleXAssignment )
+            // InternalCheckCfg.g:328:1: ruleXAssignment
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionAccess().getXAssignmentParserRuleCall()); 
             }
-            pushFollow(FOLLOW_ruleXAssignment_in_ruleXExpression640);
+            pushFollow(FOLLOW_2);
             ruleXAssignment();
 
             state._fsp--;
@@ -999,16 +999,16 @@ public final void ruleXExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXAssignment"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:341:1: entryRuleXAssignment : ruleXAssignment EOF ;
+    // InternalCheckCfg.g:341:1: entryRuleXAssignment : ruleXAssignment EOF ;
     public final void entryRuleXAssignment() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:342:1: ( ruleXAssignment EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:343:1: ruleXAssignment EOF
+            // InternalCheckCfg.g:342:1: ( ruleXAssignment EOF )
+            // InternalCheckCfg.g:343:1: ruleXAssignment EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentRule()); 
             }
-            pushFollow(FOLLOW_ruleXAssignment_in_entryRuleXAssignment666);
+            pushFollow(FOLLOW_1);
             ruleXAssignment();
 
             state._fsp--;
@@ -1016,7 +1016,7 @@ public final void entryRuleXAssignment() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAssignmentRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAssignment673); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1033,25 +1033,25 @@ public final void entryRuleXAssignment() throws RecognitionException {
 
 
     // $ANTLR start "ruleXAssignment"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:350:1: ruleXAssignment : ( ( rule__XAssignment__Alternatives ) ) ;
+    // InternalCheckCfg.g:350:1: ruleXAssignment : ( ( rule__XAssignment__Alternatives ) ) ;
     public final void ruleXAssignment() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:354:2: ( ( ( rule__XAssignment__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:355:1: ( ( rule__XAssignment__Alternatives ) )
+            // InternalCheckCfg.g:354:2: ( ( ( rule__XAssignment__Alternatives ) ) )
+            // InternalCheckCfg.g:355:1: ( ( rule__XAssignment__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:355:1: ( ( rule__XAssignment__Alternatives ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:356:1: ( rule__XAssignment__Alternatives )
+            // InternalCheckCfg.g:355:1: ( ( rule__XAssignment__Alternatives ) )
+            // InternalCheckCfg.g:356:1: ( rule__XAssignment__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:357:1: ( rule__XAssignment__Alternatives )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:357:2: rule__XAssignment__Alternatives
+            // InternalCheckCfg.g:357:1: ( rule__XAssignment__Alternatives )
+            // InternalCheckCfg.g:357:2: rule__XAssignment__Alternatives
             {
-            pushFollow(FOLLOW_rule__XAssignment__Alternatives_in_ruleXAssignment699);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__Alternatives();
 
             state._fsp--;
@@ -1084,16 +1084,16 @@ public final void ruleXAssignment() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpSingleAssign"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:369:1: entryRuleOpSingleAssign : ruleOpSingleAssign EOF ;
+    // InternalCheckCfg.g:369:1: entryRuleOpSingleAssign : ruleOpSingleAssign EOF ;
     public final void entryRuleOpSingleAssign() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:370:1: ( ruleOpSingleAssign EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:371:1: ruleOpSingleAssign EOF
+            // InternalCheckCfg.g:370:1: ( ruleOpSingleAssign EOF )
+            // InternalCheckCfg.g:371:1: ruleOpSingleAssign EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpSingleAssignRule()); 
             }
-            pushFollow(FOLLOW_ruleOpSingleAssign_in_entryRuleOpSingleAssign726);
+            pushFollow(FOLLOW_1);
             ruleOpSingleAssign();
 
             state._fsp--;
@@ -1101,7 +1101,7 @@ public final void entryRuleOpSingleAssign() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpSingleAssignRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpSingleAssign733); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1118,22 +1118,22 @@ public final void entryRuleOpSingleAssign() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpSingleAssign"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:378:1: ruleOpSingleAssign : ( '=' ) ;
+    // InternalCheckCfg.g:378:1: ruleOpSingleAssign : ( '=' ) ;
     public final void ruleOpSingleAssign() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:382:2: ( ( '=' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:383:1: ( '=' )
+            // InternalCheckCfg.g:382:2: ( ( '=' ) )
+            // InternalCheckCfg.g:383:1: ( '=' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:383:1: ( '=' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:384:1: '='
+            // InternalCheckCfg.g:383:1: ( '=' )
+            // InternalCheckCfg.g:384:1: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpSingleAssignAccess().getEqualsSignKeyword()); 
             }
-            match(input,13,FOLLOW_13_in_ruleOpSingleAssign760); if (state.failed) return ;
+            match(input,13,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpSingleAssignAccess().getEqualsSignKeyword()); 
             }
@@ -1159,16 +1159,16 @@ public final void ruleOpSingleAssign() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpMultiAssign"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:399:1: entryRuleOpMultiAssign : ruleOpMultiAssign EOF ;
+    // InternalCheckCfg.g:399:1: entryRuleOpMultiAssign : ruleOpMultiAssign EOF ;
     public final void entryRuleOpMultiAssign() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:400:1: ( ruleOpMultiAssign EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:401:1: ruleOpMultiAssign EOF
+            // InternalCheckCfg.g:400:1: ( ruleOpMultiAssign EOF )
+            // InternalCheckCfg.g:401:1: ruleOpMultiAssign EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignRule()); 
             }
-            pushFollow(FOLLOW_ruleOpMultiAssign_in_entryRuleOpMultiAssign788);
+            pushFollow(FOLLOW_1);
             ruleOpMultiAssign();
 
             state._fsp--;
@@ -1176,7 +1176,7 @@ public final void entryRuleOpMultiAssign() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpMultiAssignRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpMultiAssign795); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1193,25 +1193,25 @@ public final void entryRuleOpMultiAssign() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpMultiAssign"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:408:1: ruleOpMultiAssign : ( ( rule__OpMultiAssign__Alternatives ) ) ;
+    // InternalCheckCfg.g:408:1: ruleOpMultiAssign : ( ( rule__OpMultiAssign__Alternatives ) ) ;
     public final void ruleOpMultiAssign() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:412:2: ( ( ( rule__OpMultiAssign__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:413:1: ( ( rule__OpMultiAssign__Alternatives ) )
+            // InternalCheckCfg.g:412:2: ( ( ( rule__OpMultiAssign__Alternatives ) ) )
+            // InternalCheckCfg.g:413:1: ( ( rule__OpMultiAssign__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:413:1: ( ( rule__OpMultiAssign__Alternatives ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:414:1: ( rule__OpMultiAssign__Alternatives )
+            // InternalCheckCfg.g:413:1: ( ( rule__OpMultiAssign__Alternatives ) )
+            // InternalCheckCfg.g:414:1: ( rule__OpMultiAssign__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:415:1: ( rule__OpMultiAssign__Alternatives )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:415:2: rule__OpMultiAssign__Alternatives
+            // InternalCheckCfg.g:415:1: ( rule__OpMultiAssign__Alternatives )
+            // InternalCheckCfg.g:415:2: rule__OpMultiAssign__Alternatives
             {
-            pushFollow(FOLLOW_rule__OpMultiAssign__Alternatives_in_ruleOpMultiAssign821);
+            pushFollow(FOLLOW_2);
             rule__OpMultiAssign__Alternatives();
 
             state._fsp--;
@@ -1244,16 +1244,16 @@ public final void ruleOpMultiAssign() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXOrExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:427:1: entryRuleXOrExpression : ruleXOrExpression EOF ;
+    // InternalCheckCfg.g:427:1: entryRuleXOrExpression : ruleXOrExpression EOF ;
     public final void entryRuleXOrExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:428:1: ( ruleXOrExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:429:1: ruleXOrExpression EOF
+            // InternalCheckCfg.g:428:1: ( ruleXOrExpression EOF )
+            // InternalCheckCfg.g:429:1: ruleXOrExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXOrExpression_in_entryRuleXOrExpression848);
+            pushFollow(FOLLOW_1);
             ruleXOrExpression();
 
             state._fsp--;
@@ -1261,7 +1261,7 @@ public final void entryRuleXOrExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXOrExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXOrExpression855); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1278,25 +1278,25 @@ public final void entryRuleXOrExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXOrExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:436:1: ruleXOrExpression : ( ( rule__XOrExpression__Group__0 ) ) ;
+    // InternalCheckCfg.g:436:1: ruleXOrExpression : ( ( rule__XOrExpression__Group__0 ) ) ;
     public final void ruleXOrExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:440:2: ( ( ( rule__XOrExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:441:1: ( ( rule__XOrExpression__Group__0 ) )
+            // InternalCheckCfg.g:440:2: ( ( ( rule__XOrExpression__Group__0 ) ) )
+            // InternalCheckCfg.g:441:1: ( ( rule__XOrExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:441:1: ( ( rule__XOrExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:442:1: ( rule__XOrExpression__Group__0 )
+            // InternalCheckCfg.g:441:1: ( ( rule__XOrExpression__Group__0 ) )
+            // InternalCheckCfg.g:442:1: ( rule__XOrExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:443:1: ( rule__XOrExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:443:2: rule__XOrExpression__Group__0
+            // InternalCheckCfg.g:443:1: ( rule__XOrExpression__Group__0 )
+            // InternalCheckCfg.g:443:2: rule__XOrExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XOrExpression__Group__0_in_ruleXOrExpression881);
+            pushFollow(FOLLOW_2);
             rule__XOrExpression__Group__0();
 
             state._fsp--;
@@ -1329,16 +1329,16 @@ public final void ruleXOrExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpOr"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:455:1: entryRuleOpOr : ruleOpOr EOF ;
+    // InternalCheckCfg.g:455:1: entryRuleOpOr : ruleOpOr EOF ;
     public final void entryRuleOpOr() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:456:1: ( ruleOpOr EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:457:1: ruleOpOr EOF
+            // InternalCheckCfg.g:456:1: ( ruleOpOr EOF )
+            // InternalCheckCfg.g:457:1: ruleOpOr EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOrRule()); 
             }
-            pushFollow(FOLLOW_ruleOpOr_in_entryRuleOpOr908);
+            pushFollow(FOLLOW_1);
             ruleOpOr();
 
             state._fsp--;
@@ -1346,7 +1346,7 @@ public final void entryRuleOpOr() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpOrRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpOr915); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1363,22 +1363,22 @@ public final void entryRuleOpOr() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpOr"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:464:1: ruleOpOr : ( '||' ) ;
+    // InternalCheckCfg.g:464:1: ruleOpOr : ( '||' ) ;
     public final void ruleOpOr() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:468:2: ( ( '||' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:469:1: ( '||' )
+            // InternalCheckCfg.g:468:2: ( ( '||' ) )
+            // InternalCheckCfg.g:469:1: ( '||' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:469:1: ( '||' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:470:1: '||'
+            // InternalCheckCfg.g:469:1: ( '||' )
+            // InternalCheckCfg.g:470:1: '||'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOrAccess().getVerticalLineVerticalLineKeyword()); 
             }
-            match(input,14,FOLLOW_14_in_ruleOpOr942); if (state.failed) return ;
+            match(input,14,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpOrAccess().getVerticalLineVerticalLineKeyword()); 
             }
@@ -1404,16 +1404,16 @@ public final void ruleOpOr() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXAndExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:485:1: entryRuleXAndExpression : ruleXAndExpression EOF ;
+    // InternalCheckCfg.g:485:1: entryRuleXAndExpression : ruleXAndExpression EOF ;
     public final void entryRuleXAndExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:486:1: ( ruleXAndExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:487:1: ruleXAndExpression EOF
+            // InternalCheckCfg.g:486:1: ( ruleXAndExpression EOF )
+            // InternalCheckCfg.g:487:1: ruleXAndExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXAndExpression_in_entryRuleXAndExpression970);
+            pushFollow(FOLLOW_1);
             ruleXAndExpression();
 
             state._fsp--;
@@ -1421,7 +1421,7 @@ public final void entryRuleXAndExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAndExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAndExpression977); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1438,25 +1438,25 @@ public final void entryRuleXAndExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXAndExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:494:1: ruleXAndExpression : ( ( rule__XAndExpression__Group__0 ) ) ;
+    // InternalCheckCfg.g:494:1: ruleXAndExpression : ( ( rule__XAndExpression__Group__0 ) ) ;
     public final void ruleXAndExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:498:2: ( ( ( rule__XAndExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:499:1: ( ( rule__XAndExpression__Group__0 ) )
+            // InternalCheckCfg.g:498:2: ( ( ( rule__XAndExpression__Group__0 ) ) )
+            // InternalCheckCfg.g:499:1: ( ( rule__XAndExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:499:1: ( ( rule__XAndExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:500:1: ( rule__XAndExpression__Group__0 )
+            // InternalCheckCfg.g:499:1: ( ( rule__XAndExpression__Group__0 ) )
+            // InternalCheckCfg.g:500:1: ( rule__XAndExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:501:1: ( rule__XAndExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:501:2: rule__XAndExpression__Group__0
+            // InternalCheckCfg.g:501:1: ( rule__XAndExpression__Group__0 )
+            // InternalCheckCfg.g:501:2: rule__XAndExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XAndExpression__Group__0_in_ruleXAndExpression1003);
+            pushFollow(FOLLOW_2);
             rule__XAndExpression__Group__0();
 
             state._fsp--;
@@ -1489,16 +1489,16 @@ public final void ruleXAndExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpAnd"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:513:1: entryRuleOpAnd : ruleOpAnd EOF ;
+    // InternalCheckCfg.g:513:1: entryRuleOpAnd : ruleOpAnd EOF ;
     public final void entryRuleOpAnd() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:514:1: ( ruleOpAnd EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:515:1: ruleOpAnd EOF
+            // InternalCheckCfg.g:514:1: ( ruleOpAnd EOF )
+            // InternalCheckCfg.g:515:1: ruleOpAnd EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpAndRule()); 
             }
-            pushFollow(FOLLOW_ruleOpAnd_in_entryRuleOpAnd1030);
+            pushFollow(FOLLOW_1);
             ruleOpAnd();
 
             state._fsp--;
@@ -1506,7 +1506,7 @@ public final void entryRuleOpAnd() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpAndRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpAnd1037); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1523,22 +1523,22 @@ public final void entryRuleOpAnd() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpAnd"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:522:1: ruleOpAnd : ( '&&' ) ;
+    // InternalCheckCfg.g:522:1: ruleOpAnd : ( '&&' ) ;
     public final void ruleOpAnd() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:526:2: ( ( '&&' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:527:1: ( '&&' )
+            // InternalCheckCfg.g:526:2: ( ( '&&' ) )
+            // InternalCheckCfg.g:527:1: ( '&&' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:527:1: ( '&&' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:528:1: '&&'
+            // InternalCheckCfg.g:527:1: ( '&&' )
+            // InternalCheckCfg.g:528:1: '&&'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpAndAccess().getAmpersandAmpersandKeyword()); 
             }
-            match(input,15,FOLLOW_15_in_ruleOpAnd1064); if (state.failed) return ;
+            match(input,15,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpAndAccess().getAmpersandAmpersandKeyword()); 
             }
@@ -1564,16 +1564,16 @@ public final void ruleOpAnd() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXEqualityExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:543:1: entryRuleXEqualityExpression : ruleXEqualityExpression EOF ;
+    // InternalCheckCfg.g:543:1: entryRuleXEqualityExpression : ruleXEqualityExpression EOF ;
     public final void entryRuleXEqualityExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:544:1: ( ruleXEqualityExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:545:1: ruleXEqualityExpression EOF
+            // InternalCheckCfg.g:544:1: ( ruleXEqualityExpression EOF )
+            // InternalCheckCfg.g:545:1: ruleXEqualityExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXEqualityExpression_in_entryRuleXEqualityExpression1092);
+            pushFollow(FOLLOW_1);
             ruleXEqualityExpression();
 
             state._fsp--;
@@ -1581,7 +1581,7 @@ public final void entryRuleXEqualityExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXEqualityExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXEqualityExpression1099); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1598,25 +1598,25 @@ public final void entryRuleXEqualityExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXEqualityExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:552:1: ruleXEqualityExpression : ( ( rule__XEqualityExpression__Group__0 ) ) ;
+    // InternalCheckCfg.g:552:1: ruleXEqualityExpression : ( ( rule__XEqualityExpression__Group__0 ) ) ;
     public final void ruleXEqualityExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:556:2: ( ( ( rule__XEqualityExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:557:1: ( ( rule__XEqualityExpression__Group__0 ) )
+            // InternalCheckCfg.g:556:2: ( ( ( rule__XEqualityExpression__Group__0 ) ) )
+            // InternalCheckCfg.g:557:1: ( ( rule__XEqualityExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:557:1: ( ( rule__XEqualityExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:558:1: ( rule__XEqualityExpression__Group__0 )
+            // InternalCheckCfg.g:557:1: ( ( rule__XEqualityExpression__Group__0 ) )
+            // InternalCheckCfg.g:558:1: ( rule__XEqualityExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:559:1: ( rule__XEqualityExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:559:2: rule__XEqualityExpression__Group__0
+            // InternalCheckCfg.g:559:1: ( rule__XEqualityExpression__Group__0 )
+            // InternalCheckCfg.g:559:2: rule__XEqualityExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group__0_in_ruleXEqualityExpression1125);
+            pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group__0();
 
             state._fsp--;
@@ -1649,16 +1649,16 @@ public final void ruleXEqualityExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpEquality"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:571:1: entryRuleOpEquality : ruleOpEquality EOF ;
+    // InternalCheckCfg.g:571:1: entryRuleOpEquality : ruleOpEquality EOF ;
     public final void entryRuleOpEquality() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:572:1: ( ruleOpEquality EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:573:1: ruleOpEquality EOF
+            // InternalCheckCfg.g:572:1: ( ruleOpEquality EOF )
+            // InternalCheckCfg.g:573:1: ruleOpEquality EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpEqualityRule()); 
             }
-            pushFollow(FOLLOW_ruleOpEquality_in_entryRuleOpEquality1152);
+            pushFollow(FOLLOW_1);
             ruleOpEquality();
 
             state._fsp--;
@@ -1666,7 +1666,7 @@ public final void entryRuleOpEquality() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpEqualityRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpEquality1159); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1683,25 +1683,25 @@ public final void entryRuleOpEquality() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpEquality"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:580:1: ruleOpEquality : ( ( rule__OpEquality__Alternatives ) ) ;
+    // InternalCheckCfg.g:580:1: ruleOpEquality : ( ( rule__OpEquality__Alternatives ) ) ;
     public final void ruleOpEquality() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:584:2: ( ( ( rule__OpEquality__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:585:1: ( ( rule__OpEquality__Alternatives ) )
+            // InternalCheckCfg.g:584:2: ( ( ( rule__OpEquality__Alternatives ) ) )
+            // InternalCheckCfg.g:585:1: ( ( rule__OpEquality__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:585:1: ( ( rule__OpEquality__Alternatives ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:586:1: ( rule__OpEquality__Alternatives )
+            // InternalCheckCfg.g:585:1: ( ( rule__OpEquality__Alternatives ) )
+            // InternalCheckCfg.g:586:1: ( rule__OpEquality__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpEqualityAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:587:1: ( rule__OpEquality__Alternatives )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:587:2: rule__OpEquality__Alternatives
+            // InternalCheckCfg.g:587:1: ( rule__OpEquality__Alternatives )
+            // InternalCheckCfg.g:587:2: rule__OpEquality__Alternatives
             {
-            pushFollow(FOLLOW_rule__OpEquality__Alternatives_in_ruleOpEquality1185);
+            pushFollow(FOLLOW_2);
             rule__OpEquality__Alternatives();
 
             state._fsp--;
@@ -1734,16 +1734,16 @@ public final void ruleOpEquality() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXRelationalExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:599:1: entryRuleXRelationalExpression : ruleXRelationalExpression EOF ;
+    // InternalCheckCfg.g:599:1: entryRuleXRelationalExpression : ruleXRelationalExpression EOF ;
     public final void entryRuleXRelationalExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:600:1: ( ruleXRelationalExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:601:1: ruleXRelationalExpression EOF
+            // InternalCheckCfg.g:600:1: ( ruleXRelationalExpression EOF )
+            // InternalCheckCfg.g:601:1: ruleXRelationalExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXRelationalExpression_in_entryRuleXRelationalExpression1212);
+            pushFollow(FOLLOW_1);
             ruleXRelationalExpression();
 
             state._fsp--;
@@ -1751,7 +1751,7 @@ public final void entryRuleXRelationalExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXRelationalExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXRelationalExpression1219); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1768,25 +1768,25 @@ public final void entryRuleXRelationalExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXRelationalExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:608:1: ruleXRelationalExpression : ( ( rule__XRelationalExpression__Group__0 ) ) ;
+    // InternalCheckCfg.g:608:1: ruleXRelationalExpression : ( ( rule__XRelationalExpression__Group__0 ) ) ;
     public final void ruleXRelationalExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:612:2: ( ( ( rule__XRelationalExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:613:1: ( ( rule__XRelationalExpression__Group__0 ) )
+            // InternalCheckCfg.g:612:2: ( ( ( rule__XRelationalExpression__Group__0 ) ) )
+            // InternalCheckCfg.g:613:1: ( ( rule__XRelationalExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:613:1: ( ( rule__XRelationalExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:614:1: ( rule__XRelationalExpression__Group__0 )
+            // InternalCheckCfg.g:613:1: ( ( rule__XRelationalExpression__Group__0 ) )
+            // InternalCheckCfg.g:614:1: ( rule__XRelationalExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:615:1: ( rule__XRelationalExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:615:2: rule__XRelationalExpression__Group__0
+            // InternalCheckCfg.g:615:1: ( rule__XRelationalExpression__Group__0 )
+            // InternalCheckCfg.g:615:2: rule__XRelationalExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group__0_in_ruleXRelationalExpression1245);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group__0();
 
             state._fsp--;
@@ -1819,16 +1819,16 @@ public final void ruleXRelationalExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpCompare"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:627:1: entryRuleOpCompare : ruleOpCompare EOF ;
+    // InternalCheckCfg.g:627:1: entryRuleOpCompare : ruleOpCompare EOF ;
     public final void entryRuleOpCompare() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:628:1: ( ruleOpCompare EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:629:1: ruleOpCompare EOF
+            // InternalCheckCfg.g:628:1: ( ruleOpCompare EOF )
+            // InternalCheckCfg.g:629:1: ruleOpCompare EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpCompareRule()); 
             }
-            pushFollow(FOLLOW_ruleOpCompare_in_entryRuleOpCompare1272);
+            pushFollow(FOLLOW_1);
             ruleOpCompare();
 
             state._fsp--;
@@ -1836,7 +1836,7 @@ public final void entryRuleOpCompare() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpCompareRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpCompare1279); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1853,25 +1853,25 @@ public final void entryRuleOpCompare() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpCompare"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:636:1: ruleOpCompare : ( ( rule__OpCompare__Alternatives ) ) ;
+    // InternalCheckCfg.g:636:1: ruleOpCompare : ( ( rule__OpCompare__Alternatives ) ) ;
     public final void ruleOpCompare() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:640:2: ( ( ( rule__OpCompare__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:641:1: ( ( rule__OpCompare__Alternatives ) )
+            // InternalCheckCfg.g:640:2: ( ( ( rule__OpCompare__Alternatives ) ) )
+            // InternalCheckCfg.g:641:1: ( ( rule__OpCompare__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:641:1: ( ( rule__OpCompare__Alternatives ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:642:1: ( rule__OpCompare__Alternatives )
+            // InternalCheckCfg.g:641:1: ( ( rule__OpCompare__Alternatives ) )
+            // InternalCheckCfg.g:642:1: ( rule__OpCompare__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpCompareAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:643:1: ( rule__OpCompare__Alternatives )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:643:2: rule__OpCompare__Alternatives
+            // InternalCheckCfg.g:643:1: ( rule__OpCompare__Alternatives )
+            // InternalCheckCfg.g:643:2: rule__OpCompare__Alternatives
             {
-            pushFollow(FOLLOW_rule__OpCompare__Alternatives_in_ruleOpCompare1305);
+            pushFollow(FOLLOW_2);
             rule__OpCompare__Alternatives();
 
             state._fsp--;
@@ -1904,16 +1904,16 @@ public final void ruleOpCompare() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXOtherOperatorExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:655:1: entryRuleXOtherOperatorExpression : ruleXOtherOperatorExpression EOF ;
+    // InternalCheckCfg.g:655:1: entryRuleXOtherOperatorExpression : ruleXOtherOperatorExpression EOF ;
     public final void entryRuleXOtherOperatorExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:656:1: ( ruleXOtherOperatorExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:657:1: ruleXOtherOperatorExpression EOF
+            // InternalCheckCfg.g:656:1: ( ruleXOtherOperatorExpression EOF )
+            // InternalCheckCfg.g:657:1: ruleXOtherOperatorExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXOtherOperatorExpression_in_entryRuleXOtherOperatorExpression1332);
+            pushFollow(FOLLOW_1);
             ruleXOtherOperatorExpression();
 
             state._fsp--;
@@ -1921,7 +1921,7 @@ public final void entryRuleXOtherOperatorExpression() throws RecognitionExceptio
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXOtherOperatorExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXOtherOperatorExpression1339); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1938,25 +1938,25 @@ public final void entryRuleXOtherOperatorExpression() throws RecognitionExceptio
 
 
     // $ANTLR start "ruleXOtherOperatorExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:664:1: ruleXOtherOperatorExpression : ( ( rule__XOtherOperatorExpression__Group__0 ) ) ;
+    // InternalCheckCfg.g:664:1: ruleXOtherOperatorExpression : ( ( rule__XOtherOperatorExpression__Group__0 ) ) ;
     public final void ruleXOtherOperatorExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:668:2: ( ( ( rule__XOtherOperatorExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:669:1: ( ( rule__XOtherOperatorExpression__Group__0 ) )
+            // InternalCheckCfg.g:668:2: ( ( ( rule__XOtherOperatorExpression__Group__0 ) ) )
+            // InternalCheckCfg.g:669:1: ( ( rule__XOtherOperatorExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:669:1: ( ( rule__XOtherOperatorExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:670:1: ( rule__XOtherOperatorExpression__Group__0 )
+            // InternalCheckCfg.g:669:1: ( ( rule__XOtherOperatorExpression__Group__0 ) )
+            // InternalCheckCfg.g:670:1: ( rule__XOtherOperatorExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:671:1: ( rule__XOtherOperatorExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:671:2: rule__XOtherOperatorExpression__Group__0
+            // InternalCheckCfg.g:671:1: ( rule__XOtherOperatorExpression__Group__0 )
+            // InternalCheckCfg.g:671:2: rule__XOtherOperatorExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group__0_in_ruleXOtherOperatorExpression1365);
+            pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group__0();
 
             state._fsp--;
@@ -1989,16 +1989,16 @@ public final void ruleXOtherOperatorExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpOther"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:683:1: entryRuleOpOther : ruleOpOther EOF ;
+    // InternalCheckCfg.g:683:1: entryRuleOpOther : ruleOpOther EOF ;
     public final void entryRuleOpOther() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:684:1: ( ruleOpOther EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:685:1: ruleOpOther EOF
+            // InternalCheckCfg.g:684:1: ( ruleOpOther EOF )
+            // InternalCheckCfg.g:685:1: ruleOpOther EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherRule()); 
             }
-            pushFollow(FOLLOW_ruleOpOther_in_entryRuleOpOther1392);
+            pushFollow(FOLLOW_1);
             ruleOpOther();
 
             state._fsp--;
@@ -2006,7 +2006,7 @@ public final void entryRuleOpOther() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpOtherRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpOther1399); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2023,25 +2023,25 @@ public final void entryRuleOpOther() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpOther"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:692:1: ruleOpOther : ( ( rule__OpOther__Alternatives ) ) ;
+    // InternalCheckCfg.g:692:1: ruleOpOther : ( ( rule__OpOther__Alternatives ) ) ;
     public final void ruleOpOther() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:696:2: ( ( ( rule__OpOther__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:697:1: ( ( rule__OpOther__Alternatives ) )
+            // InternalCheckCfg.g:696:2: ( ( ( rule__OpOther__Alternatives ) ) )
+            // InternalCheckCfg.g:697:1: ( ( rule__OpOther__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:697:1: ( ( rule__OpOther__Alternatives ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:698:1: ( rule__OpOther__Alternatives )
+            // InternalCheckCfg.g:697:1: ( ( rule__OpOther__Alternatives ) )
+            // InternalCheckCfg.g:698:1: ( rule__OpOther__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:699:1: ( rule__OpOther__Alternatives )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:699:2: rule__OpOther__Alternatives
+            // InternalCheckCfg.g:699:1: ( rule__OpOther__Alternatives )
+            // InternalCheckCfg.g:699:2: rule__OpOther__Alternatives
             {
-            pushFollow(FOLLOW_rule__OpOther__Alternatives_in_ruleOpOther1425);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Alternatives();
 
             state._fsp--;
@@ -2074,16 +2074,16 @@ public final void ruleOpOther() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXAdditiveExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:711:1: entryRuleXAdditiveExpression : ruleXAdditiveExpression EOF ;
+    // InternalCheckCfg.g:711:1: entryRuleXAdditiveExpression : ruleXAdditiveExpression EOF ;
     public final void entryRuleXAdditiveExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:712:1: ( ruleXAdditiveExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:713:1: ruleXAdditiveExpression EOF
+            // InternalCheckCfg.g:712:1: ( ruleXAdditiveExpression EOF )
+            // InternalCheckCfg.g:713:1: ruleXAdditiveExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXAdditiveExpression_in_entryRuleXAdditiveExpression1452);
+            pushFollow(FOLLOW_1);
             ruleXAdditiveExpression();
 
             state._fsp--;
@@ -2091,7 +2091,7 @@ public final void entryRuleXAdditiveExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAdditiveExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAdditiveExpression1459); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2108,25 +2108,25 @@ public final void entryRuleXAdditiveExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXAdditiveExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:720:1: ruleXAdditiveExpression : ( ( rule__XAdditiveExpression__Group__0 ) ) ;
+    // InternalCheckCfg.g:720:1: ruleXAdditiveExpression : ( ( rule__XAdditiveExpression__Group__0 ) ) ;
     public final void ruleXAdditiveExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:724:2: ( ( ( rule__XAdditiveExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:725:1: ( ( rule__XAdditiveExpression__Group__0 ) )
+            // InternalCheckCfg.g:724:2: ( ( ( rule__XAdditiveExpression__Group__0 ) ) )
+            // InternalCheckCfg.g:725:1: ( ( rule__XAdditiveExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:725:1: ( ( rule__XAdditiveExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:726:1: ( rule__XAdditiveExpression__Group__0 )
+            // InternalCheckCfg.g:725:1: ( ( rule__XAdditiveExpression__Group__0 ) )
+            // InternalCheckCfg.g:726:1: ( rule__XAdditiveExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:727:1: ( rule__XAdditiveExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:727:2: rule__XAdditiveExpression__Group__0
+            // InternalCheckCfg.g:727:1: ( rule__XAdditiveExpression__Group__0 )
+            // InternalCheckCfg.g:727:2: rule__XAdditiveExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group__0_in_ruleXAdditiveExpression1485);
+            pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group__0();
 
             state._fsp--;
@@ -2159,16 +2159,16 @@ public final void ruleXAdditiveExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpAdd"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:739:1: entryRuleOpAdd : ruleOpAdd EOF ;
+    // InternalCheckCfg.g:739:1: entryRuleOpAdd : ruleOpAdd EOF ;
     public final void entryRuleOpAdd() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:740:1: ( ruleOpAdd EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:741:1: ruleOpAdd EOF
+            // InternalCheckCfg.g:740:1: ( ruleOpAdd EOF )
+            // InternalCheckCfg.g:741:1: ruleOpAdd EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpAddRule()); 
             }
-            pushFollow(FOLLOW_ruleOpAdd_in_entryRuleOpAdd1512);
+            pushFollow(FOLLOW_1);
             ruleOpAdd();
 
             state._fsp--;
@@ -2176,7 +2176,7 @@ public final void entryRuleOpAdd() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpAddRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpAdd1519); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2193,25 +2193,25 @@ public final void entryRuleOpAdd() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpAdd"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:748:1: ruleOpAdd : ( ( rule__OpAdd__Alternatives ) ) ;
+    // InternalCheckCfg.g:748:1: ruleOpAdd : ( ( rule__OpAdd__Alternatives ) ) ;
     public final void ruleOpAdd() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:752:2: ( ( ( rule__OpAdd__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:753:1: ( ( rule__OpAdd__Alternatives ) )
+            // InternalCheckCfg.g:752:2: ( ( ( rule__OpAdd__Alternatives ) ) )
+            // InternalCheckCfg.g:753:1: ( ( rule__OpAdd__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:753:1: ( ( rule__OpAdd__Alternatives ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:754:1: ( rule__OpAdd__Alternatives )
+            // InternalCheckCfg.g:753:1: ( ( rule__OpAdd__Alternatives ) )
+            // InternalCheckCfg.g:754:1: ( rule__OpAdd__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpAddAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:755:1: ( rule__OpAdd__Alternatives )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:755:2: rule__OpAdd__Alternatives
+            // InternalCheckCfg.g:755:1: ( rule__OpAdd__Alternatives )
+            // InternalCheckCfg.g:755:2: rule__OpAdd__Alternatives
             {
-            pushFollow(FOLLOW_rule__OpAdd__Alternatives_in_ruleOpAdd1545);
+            pushFollow(FOLLOW_2);
             rule__OpAdd__Alternatives();
 
             state._fsp--;
@@ -2244,16 +2244,16 @@ public final void ruleOpAdd() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXMultiplicativeExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:767:1: entryRuleXMultiplicativeExpression : ruleXMultiplicativeExpression EOF ;
+    // InternalCheckCfg.g:767:1: entryRuleXMultiplicativeExpression : ruleXMultiplicativeExpression EOF ;
     public final void entryRuleXMultiplicativeExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:768:1: ( ruleXMultiplicativeExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:769:1: ruleXMultiplicativeExpression EOF
+            // InternalCheckCfg.g:768:1: ( ruleXMultiplicativeExpression EOF )
+            // InternalCheckCfg.g:769:1: ruleXMultiplicativeExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXMultiplicativeExpression_in_entryRuleXMultiplicativeExpression1572);
+            pushFollow(FOLLOW_1);
             ruleXMultiplicativeExpression();
 
             state._fsp--;
@@ -2261,7 +2261,7 @@ public final void entryRuleXMultiplicativeExpression() throws RecognitionExcepti
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMultiplicativeExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXMultiplicativeExpression1579); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2278,25 +2278,25 @@ public final void entryRuleXMultiplicativeExpression() throws RecognitionExcepti
 
 
     // $ANTLR start "ruleXMultiplicativeExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:776:1: ruleXMultiplicativeExpression : ( ( rule__XMultiplicativeExpression__Group__0 ) ) ;
+    // InternalCheckCfg.g:776:1: ruleXMultiplicativeExpression : ( ( rule__XMultiplicativeExpression__Group__0 ) ) ;
     public final void ruleXMultiplicativeExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:780:2: ( ( ( rule__XMultiplicativeExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:781:1: ( ( rule__XMultiplicativeExpression__Group__0 ) )
+            // InternalCheckCfg.g:780:2: ( ( ( rule__XMultiplicativeExpression__Group__0 ) ) )
+            // InternalCheckCfg.g:781:1: ( ( rule__XMultiplicativeExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:781:1: ( ( rule__XMultiplicativeExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:782:1: ( rule__XMultiplicativeExpression__Group__0 )
+            // InternalCheckCfg.g:781:1: ( ( rule__XMultiplicativeExpression__Group__0 ) )
+            // InternalCheckCfg.g:782:1: ( rule__XMultiplicativeExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:783:1: ( rule__XMultiplicativeExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:783:2: rule__XMultiplicativeExpression__Group__0
+            // InternalCheckCfg.g:783:1: ( rule__XMultiplicativeExpression__Group__0 )
+            // InternalCheckCfg.g:783:2: rule__XMultiplicativeExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group__0_in_ruleXMultiplicativeExpression1605);
+            pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group__0();
 
             state._fsp--;
@@ -2329,16 +2329,16 @@ public final void ruleXMultiplicativeExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpMulti"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:795:1: entryRuleOpMulti : ruleOpMulti EOF ;
+    // InternalCheckCfg.g:795:1: entryRuleOpMulti : ruleOpMulti EOF ;
     public final void entryRuleOpMulti() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:796:1: ( ruleOpMulti EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:797:1: ruleOpMulti EOF
+            // InternalCheckCfg.g:796:1: ( ruleOpMulti EOF )
+            // InternalCheckCfg.g:797:1: ruleOpMulti EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiRule()); 
             }
-            pushFollow(FOLLOW_ruleOpMulti_in_entryRuleOpMulti1632);
+            pushFollow(FOLLOW_1);
             ruleOpMulti();
 
             state._fsp--;
@@ -2346,7 +2346,7 @@ public final void entryRuleOpMulti() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpMultiRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpMulti1639); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2363,25 +2363,25 @@ public final void entryRuleOpMulti() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpMulti"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:804:1: ruleOpMulti : ( ( rule__OpMulti__Alternatives ) ) ;
+    // InternalCheckCfg.g:804:1: ruleOpMulti : ( ( rule__OpMulti__Alternatives ) ) ;
     public final void ruleOpMulti() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:808:2: ( ( ( rule__OpMulti__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:809:1: ( ( rule__OpMulti__Alternatives ) )
+            // InternalCheckCfg.g:808:2: ( ( ( rule__OpMulti__Alternatives ) ) )
+            // InternalCheckCfg.g:809:1: ( ( rule__OpMulti__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:809:1: ( ( rule__OpMulti__Alternatives ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:810:1: ( rule__OpMulti__Alternatives )
+            // InternalCheckCfg.g:809:1: ( ( rule__OpMulti__Alternatives ) )
+            // InternalCheckCfg.g:810:1: ( rule__OpMulti__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:811:1: ( rule__OpMulti__Alternatives )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:811:2: rule__OpMulti__Alternatives
+            // InternalCheckCfg.g:811:1: ( rule__OpMulti__Alternatives )
+            // InternalCheckCfg.g:811:2: rule__OpMulti__Alternatives
             {
-            pushFollow(FOLLOW_rule__OpMulti__Alternatives_in_ruleOpMulti1665);
+            pushFollow(FOLLOW_2);
             rule__OpMulti__Alternatives();
 
             state._fsp--;
@@ -2414,16 +2414,16 @@ public final void ruleOpMulti() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXUnaryOperation"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:823:1: entryRuleXUnaryOperation : ruleXUnaryOperation EOF ;
+    // InternalCheckCfg.g:823:1: entryRuleXUnaryOperation : ruleXUnaryOperation EOF ;
     public final void entryRuleXUnaryOperation() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:824:1: ( ruleXUnaryOperation EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:825:1: ruleXUnaryOperation EOF
+            // InternalCheckCfg.g:824:1: ( ruleXUnaryOperation EOF )
+            // InternalCheckCfg.g:825:1: ruleXUnaryOperation EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationRule()); 
             }
-            pushFollow(FOLLOW_ruleXUnaryOperation_in_entryRuleXUnaryOperation1692);
+            pushFollow(FOLLOW_1);
             ruleXUnaryOperation();
 
             state._fsp--;
@@ -2431,7 +2431,7 @@ public final void entryRuleXUnaryOperation() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXUnaryOperationRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXUnaryOperation1699); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2448,25 +2448,25 @@ public final void entryRuleXUnaryOperation() throws RecognitionException {
 
 
     // $ANTLR start "ruleXUnaryOperation"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:832:1: ruleXUnaryOperation : ( ( rule__XUnaryOperation__Alternatives ) ) ;
+    // InternalCheckCfg.g:832:1: ruleXUnaryOperation : ( ( rule__XUnaryOperation__Alternatives ) ) ;
     public final void ruleXUnaryOperation() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:836:2: ( ( ( rule__XUnaryOperation__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:837:1: ( ( rule__XUnaryOperation__Alternatives ) )
+            // InternalCheckCfg.g:836:2: ( ( ( rule__XUnaryOperation__Alternatives ) ) )
+            // InternalCheckCfg.g:837:1: ( ( rule__XUnaryOperation__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:837:1: ( ( rule__XUnaryOperation__Alternatives ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:838:1: ( rule__XUnaryOperation__Alternatives )
+            // InternalCheckCfg.g:837:1: ( ( rule__XUnaryOperation__Alternatives ) )
+            // InternalCheckCfg.g:838:1: ( rule__XUnaryOperation__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:839:1: ( rule__XUnaryOperation__Alternatives )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:839:2: rule__XUnaryOperation__Alternatives
+            // InternalCheckCfg.g:839:1: ( rule__XUnaryOperation__Alternatives )
+            // InternalCheckCfg.g:839:2: rule__XUnaryOperation__Alternatives
             {
-            pushFollow(FOLLOW_rule__XUnaryOperation__Alternatives_in_ruleXUnaryOperation1725);
+            pushFollow(FOLLOW_2);
             rule__XUnaryOperation__Alternatives();
 
             state._fsp--;
@@ -2499,16 +2499,16 @@ public final void ruleXUnaryOperation() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpUnary"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:851:1: entryRuleOpUnary : ruleOpUnary EOF ;
+    // InternalCheckCfg.g:851:1: entryRuleOpUnary : ruleOpUnary EOF ;
     public final void entryRuleOpUnary() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:852:1: ( ruleOpUnary EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:853:1: ruleOpUnary EOF
+            // InternalCheckCfg.g:852:1: ( ruleOpUnary EOF )
+            // InternalCheckCfg.g:853:1: ruleOpUnary EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpUnaryRule()); 
             }
-            pushFollow(FOLLOW_ruleOpUnary_in_entryRuleOpUnary1752);
+            pushFollow(FOLLOW_1);
             ruleOpUnary();
 
             state._fsp--;
@@ -2516,7 +2516,7 @@ public final void entryRuleOpUnary() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpUnaryRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpUnary1759); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2533,25 +2533,25 @@ public final void entryRuleOpUnary() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpUnary"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:860:1: ruleOpUnary : ( ( rule__OpUnary__Alternatives ) ) ;
+    // InternalCheckCfg.g:860:1: ruleOpUnary : ( ( rule__OpUnary__Alternatives ) ) ;
     public final void ruleOpUnary() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:864:2: ( ( ( rule__OpUnary__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:865:1: ( ( rule__OpUnary__Alternatives ) )
+            // InternalCheckCfg.g:864:2: ( ( ( rule__OpUnary__Alternatives ) ) )
+            // InternalCheckCfg.g:865:1: ( ( rule__OpUnary__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:865:1: ( ( rule__OpUnary__Alternatives ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:866:1: ( rule__OpUnary__Alternatives )
+            // InternalCheckCfg.g:865:1: ( ( rule__OpUnary__Alternatives ) )
+            // InternalCheckCfg.g:866:1: ( rule__OpUnary__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpUnaryAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:867:1: ( rule__OpUnary__Alternatives )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:867:2: rule__OpUnary__Alternatives
+            // InternalCheckCfg.g:867:1: ( rule__OpUnary__Alternatives )
+            // InternalCheckCfg.g:867:2: rule__OpUnary__Alternatives
             {
-            pushFollow(FOLLOW_rule__OpUnary__Alternatives_in_ruleOpUnary1785);
+            pushFollow(FOLLOW_2);
             rule__OpUnary__Alternatives();
 
             state._fsp--;
@@ -2584,16 +2584,16 @@ public final void ruleOpUnary() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXCastedExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:879:1: entryRuleXCastedExpression : ruleXCastedExpression EOF ;
+    // InternalCheckCfg.g:879:1: entryRuleXCastedExpression : ruleXCastedExpression EOF ;
     public final void entryRuleXCastedExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:880:1: ( ruleXCastedExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:881:1: ruleXCastedExpression EOF
+            // InternalCheckCfg.g:880:1: ( ruleXCastedExpression EOF )
+            // InternalCheckCfg.g:881:1: ruleXCastedExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXCastedExpression_in_entryRuleXCastedExpression1812);
+            pushFollow(FOLLOW_1);
             ruleXCastedExpression();
 
             state._fsp--;
@@ -2601,7 +2601,7 @@ public final void entryRuleXCastedExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXCastedExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXCastedExpression1819); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2618,25 +2618,25 @@ public final void entryRuleXCastedExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXCastedExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:888:1: ruleXCastedExpression : ( ( rule__XCastedExpression__Group__0 ) ) ;
+    // InternalCheckCfg.g:888:1: ruleXCastedExpression : ( ( rule__XCastedExpression__Group__0 ) ) ;
     public final void ruleXCastedExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:892:2: ( ( ( rule__XCastedExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:893:1: ( ( rule__XCastedExpression__Group__0 ) )
+            // InternalCheckCfg.g:892:2: ( ( ( rule__XCastedExpression__Group__0 ) ) )
+            // InternalCheckCfg.g:893:1: ( ( rule__XCastedExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:893:1: ( ( rule__XCastedExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:894:1: ( rule__XCastedExpression__Group__0 )
+            // InternalCheckCfg.g:893:1: ( ( rule__XCastedExpression__Group__0 ) )
+            // InternalCheckCfg.g:894:1: ( rule__XCastedExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:895:1: ( rule__XCastedExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:895:2: rule__XCastedExpression__Group__0
+            // InternalCheckCfg.g:895:1: ( rule__XCastedExpression__Group__0 )
+            // InternalCheckCfg.g:895:2: rule__XCastedExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__Group__0_in_ruleXCastedExpression1845);
+            pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group__0();
 
             state._fsp--;
@@ -2669,16 +2669,16 @@ public final void ruleXCastedExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXPostfixOperation"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:907:1: entryRuleXPostfixOperation : ruleXPostfixOperation EOF ;
+    // InternalCheckCfg.g:907:1: entryRuleXPostfixOperation : ruleXPostfixOperation EOF ;
     public final void entryRuleXPostfixOperation() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:908:1: ( ruleXPostfixOperation EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:909:1: ruleXPostfixOperation EOF
+            // InternalCheckCfg.g:908:1: ( ruleXPostfixOperation EOF )
+            // InternalCheckCfg.g:909:1: ruleXPostfixOperation EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationRule()); 
             }
-            pushFollow(FOLLOW_ruleXPostfixOperation_in_entryRuleXPostfixOperation1872);
+            pushFollow(FOLLOW_1);
             ruleXPostfixOperation();
 
             state._fsp--;
@@ -2686,7 +2686,7 @@ public final void entryRuleXPostfixOperation() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXPostfixOperationRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXPostfixOperation1879); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2703,25 +2703,25 @@ public final void entryRuleXPostfixOperation() throws RecognitionException {
 
 
     // $ANTLR start "ruleXPostfixOperation"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:916:1: ruleXPostfixOperation : ( ( rule__XPostfixOperation__Group__0 ) ) ;
+    // InternalCheckCfg.g:916:1: ruleXPostfixOperation : ( ( rule__XPostfixOperation__Group__0 ) ) ;
     public final void ruleXPostfixOperation() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:920:2: ( ( ( rule__XPostfixOperation__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:921:1: ( ( rule__XPostfixOperation__Group__0 ) )
+            // InternalCheckCfg.g:920:2: ( ( ( rule__XPostfixOperation__Group__0 ) ) )
+            // InternalCheckCfg.g:921:1: ( ( rule__XPostfixOperation__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:921:1: ( ( rule__XPostfixOperation__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:922:1: ( rule__XPostfixOperation__Group__0 )
+            // InternalCheckCfg.g:921:1: ( ( rule__XPostfixOperation__Group__0 ) )
+            // InternalCheckCfg.g:922:1: ( rule__XPostfixOperation__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:923:1: ( rule__XPostfixOperation__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:923:2: rule__XPostfixOperation__Group__0
+            // InternalCheckCfg.g:923:1: ( rule__XPostfixOperation__Group__0 )
+            // InternalCheckCfg.g:923:2: rule__XPostfixOperation__Group__0
             {
-            pushFollow(FOLLOW_rule__XPostfixOperation__Group__0_in_ruleXPostfixOperation1905);
+            pushFollow(FOLLOW_2);
             rule__XPostfixOperation__Group__0();
 
             state._fsp--;
@@ -2754,16 +2754,16 @@ public final void ruleXPostfixOperation() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpPostfix"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:935:1: entryRuleOpPostfix : ruleOpPostfix EOF ;
+    // InternalCheckCfg.g:935:1: entryRuleOpPostfix : ruleOpPostfix EOF ;
     public final void entryRuleOpPostfix() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:936:1: ( ruleOpPostfix EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:937:1: ruleOpPostfix EOF
+            // InternalCheckCfg.g:936:1: ( ruleOpPostfix EOF )
+            // InternalCheckCfg.g:937:1: ruleOpPostfix EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpPostfixRule()); 
             }
-            pushFollow(FOLLOW_ruleOpPostfix_in_entryRuleOpPostfix1932);
+            pushFollow(FOLLOW_1);
             ruleOpPostfix();
 
             state._fsp--;
@@ -2771,7 +2771,7 @@ public final void entryRuleOpPostfix() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpPostfixRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpPostfix1939); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2788,25 +2788,25 @@ public final void entryRuleOpPostfix() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpPostfix"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:944:1: ruleOpPostfix : ( ( rule__OpPostfix__Alternatives ) ) ;
+    // InternalCheckCfg.g:944:1: ruleOpPostfix : ( ( rule__OpPostfix__Alternatives ) ) ;
     public final void ruleOpPostfix() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:948:2: ( ( ( rule__OpPostfix__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:949:1: ( ( rule__OpPostfix__Alternatives ) )
+            // InternalCheckCfg.g:948:2: ( ( ( rule__OpPostfix__Alternatives ) ) )
+            // InternalCheckCfg.g:949:1: ( ( rule__OpPostfix__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:949:1: ( ( rule__OpPostfix__Alternatives ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:950:1: ( rule__OpPostfix__Alternatives )
+            // InternalCheckCfg.g:949:1: ( ( rule__OpPostfix__Alternatives ) )
+            // InternalCheckCfg.g:950:1: ( rule__OpPostfix__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpPostfixAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:951:1: ( rule__OpPostfix__Alternatives )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:951:2: rule__OpPostfix__Alternatives
+            // InternalCheckCfg.g:951:1: ( rule__OpPostfix__Alternatives )
+            // InternalCheckCfg.g:951:2: rule__OpPostfix__Alternatives
             {
-            pushFollow(FOLLOW_rule__OpPostfix__Alternatives_in_ruleOpPostfix1965);
+            pushFollow(FOLLOW_2);
             rule__OpPostfix__Alternatives();
 
             state._fsp--;
@@ -2839,16 +2839,16 @@ public final void ruleOpPostfix() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXMemberFeatureCall"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:963:1: entryRuleXMemberFeatureCall : ruleXMemberFeatureCall EOF ;
+    // InternalCheckCfg.g:963:1: entryRuleXMemberFeatureCall : ruleXMemberFeatureCall EOF ;
     public final void entryRuleXMemberFeatureCall() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:964:1: ( ruleXMemberFeatureCall EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:965:1: ruleXMemberFeatureCall EOF
+            // InternalCheckCfg.g:964:1: ( ruleXMemberFeatureCall EOF )
+            // InternalCheckCfg.g:965:1: ruleXMemberFeatureCall EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallRule()); 
             }
-            pushFollow(FOLLOW_ruleXMemberFeatureCall_in_entryRuleXMemberFeatureCall1992);
+            pushFollow(FOLLOW_1);
             ruleXMemberFeatureCall();
 
             state._fsp--;
@@ -2856,7 +2856,7 @@ public final void entryRuleXMemberFeatureCall() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXMemberFeatureCall1999); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2873,25 +2873,25 @@ public final void entryRuleXMemberFeatureCall() throws RecognitionException {
 
 
     // $ANTLR start "ruleXMemberFeatureCall"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:972:1: ruleXMemberFeatureCall : ( ( rule__XMemberFeatureCall__Group__0 ) ) ;
+    // InternalCheckCfg.g:972:1: ruleXMemberFeatureCall : ( ( rule__XMemberFeatureCall__Group__0 ) ) ;
     public final void ruleXMemberFeatureCall() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:976:2: ( ( ( rule__XMemberFeatureCall__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:977:1: ( ( rule__XMemberFeatureCall__Group__0 ) )
+            // InternalCheckCfg.g:976:2: ( ( ( rule__XMemberFeatureCall__Group__0 ) ) )
+            // InternalCheckCfg.g:977:1: ( ( rule__XMemberFeatureCall__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:977:1: ( ( rule__XMemberFeatureCall__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:978:1: ( rule__XMemberFeatureCall__Group__0 )
+            // InternalCheckCfg.g:977:1: ( ( rule__XMemberFeatureCall__Group__0 ) )
+            // InternalCheckCfg.g:978:1: ( rule__XMemberFeatureCall__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:979:1: ( rule__XMemberFeatureCall__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:979:2: rule__XMemberFeatureCall__Group__0
+            // InternalCheckCfg.g:979:1: ( rule__XMemberFeatureCall__Group__0 )
+            // InternalCheckCfg.g:979:2: rule__XMemberFeatureCall__Group__0
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group__0_in_ruleXMemberFeatureCall2025);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group__0();
 
             state._fsp--;
@@ -2924,16 +2924,16 @@ public final void ruleXMemberFeatureCall() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXPrimaryExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:991:1: entryRuleXPrimaryExpression : ruleXPrimaryExpression EOF ;
+    // InternalCheckCfg.g:991:1: entryRuleXPrimaryExpression : ruleXPrimaryExpression EOF ;
     public final void entryRuleXPrimaryExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:992:1: ( ruleXPrimaryExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:993:1: ruleXPrimaryExpression EOF
+            // InternalCheckCfg.g:992:1: ( ruleXPrimaryExpression EOF )
+            // InternalCheckCfg.g:993:1: ruleXPrimaryExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPrimaryExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXPrimaryExpression_in_entryRuleXPrimaryExpression2052);
+            pushFollow(FOLLOW_1);
             ruleXPrimaryExpression();
 
             state._fsp--;
@@ -2941,7 +2941,7 @@ public final void entryRuleXPrimaryExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXPrimaryExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXPrimaryExpression2059); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2958,25 +2958,25 @@ public final void entryRuleXPrimaryExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXPrimaryExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1000:1: ruleXPrimaryExpression : ( ( rule__XPrimaryExpression__Alternatives ) ) ;
+    // InternalCheckCfg.g:1000:1: ruleXPrimaryExpression : ( ( rule__XPrimaryExpression__Alternatives ) ) ;
     public final void ruleXPrimaryExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1004:2: ( ( ( rule__XPrimaryExpression__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1005:1: ( ( rule__XPrimaryExpression__Alternatives ) )
+            // InternalCheckCfg.g:1004:2: ( ( ( rule__XPrimaryExpression__Alternatives ) ) )
+            // InternalCheckCfg.g:1005:1: ( ( rule__XPrimaryExpression__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1005:1: ( ( rule__XPrimaryExpression__Alternatives ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1006:1: ( rule__XPrimaryExpression__Alternatives )
+            // InternalCheckCfg.g:1005:1: ( ( rule__XPrimaryExpression__Alternatives ) )
+            // InternalCheckCfg.g:1006:1: ( rule__XPrimaryExpression__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPrimaryExpressionAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1007:1: ( rule__XPrimaryExpression__Alternatives )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1007:2: rule__XPrimaryExpression__Alternatives
+            // InternalCheckCfg.g:1007:1: ( rule__XPrimaryExpression__Alternatives )
+            // InternalCheckCfg.g:1007:2: rule__XPrimaryExpression__Alternatives
             {
-            pushFollow(FOLLOW_rule__XPrimaryExpression__Alternatives_in_ruleXPrimaryExpression2085);
+            pushFollow(FOLLOW_2);
             rule__XPrimaryExpression__Alternatives();
 
             state._fsp--;
@@ -3009,16 +3009,16 @@ public final void ruleXPrimaryExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1019:1: entryRuleXLiteral : ruleXLiteral EOF ;
+    // InternalCheckCfg.g:1019:1: entryRuleXLiteral : ruleXLiteral EOF ;
     public final void entryRuleXLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1020:1: ( ruleXLiteral EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1021:1: ruleXLiteral EOF
+            // InternalCheckCfg.g:1020:1: ( ruleXLiteral EOF )
+            // InternalCheckCfg.g:1021:1: ruleXLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXLiteral_in_entryRuleXLiteral2112);
+            pushFollow(FOLLOW_1);
             ruleXLiteral();
 
             state._fsp--;
@@ -3026,7 +3026,7 @@ public final void entryRuleXLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXLiteral2119); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3043,25 +3043,25 @@ public final void entryRuleXLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1028:1: ruleXLiteral : ( ( rule__XLiteral__Alternatives ) ) ;
+    // InternalCheckCfg.g:1028:1: ruleXLiteral : ( ( rule__XLiteral__Alternatives ) ) ;
     public final void ruleXLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1032:2: ( ( ( rule__XLiteral__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1033:1: ( ( rule__XLiteral__Alternatives ) )
+            // InternalCheckCfg.g:1032:2: ( ( ( rule__XLiteral__Alternatives ) ) )
+            // InternalCheckCfg.g:1033:1: ( ( rule__XLiteral__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1033:1: ( ( rule__XLiteral__Alternatives ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1034:1: ( rule__XLiteral__Alternatives )
+            // InternalCheckCfg.g:1033:1: ( ( rule__XLiteral__Alternatives ) )
+            // InternalCheckCfg.g:1034:1: ( rule__XLiteral__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXLiteralAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1035:1: ( rule__XLiteral__Alternatives )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1035:2: rule__XLiteral__Alternatives
+            // InternalCheckCfg.g:1035:1: ( rule__XLiteral__Alternatives )
+            // InternalCheckCfg.g:1035:2: rule__XLiteral__Alternatives
             {
-            pushFollow(FOLLOW_rule__XLiteral__Alternatives_in_ruleXLiteral2145);
+            pushFollow(FOLLOW_2);
             rule__XLiteral__Alternatives();
 
             state._fsp--;
@@ -3094,16 +3094,16 @@ public final void ruleXLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXCollectionLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1047:1: entryRuleXCollectionLiteral : ruleXCollectionLiteral EOF ;
+    // InternalCheckCfg.g:1047:1: entryRuleXCollectionLiteral : ruleXCollectionLiteral EOF ;
     public final void entryRuleXCollectionLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1048:1: ( ruleXCollectionLiteral EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1049:1: ruleXCollectionLiteral EOF
+            // InternalCheckCfg.g:1048:1: ( ruleXCollectionLiteral EOF )
+            // InternalCheckCfg.g:1049:1: ruleXCollectionLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCollectionLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXCollectionLiteral_in_entryRuleXCollectionLiteral2172);
+            pushFollow(FOLLOW_1);
             ruleXCollectionLiteral();
 
             state._fsp--;
@@ -3111,7 +3111,7 @@ public final void entryRuleXCollectionLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXCollectionLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXCollectionLiteral2179); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3128,25 +3128,25 @@ public final void entryRuleXCollectionLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXCollectionLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1056:1: ruleXCollectionLiteral : ( ( rule__XCollectionLiteral__Alternatives ) ) ;
+    // InternalCheckCfg.g:1056:1: ruleXCollectionLiteral : ( ( rule__XCollectionLiteral__Alternatives ) ) ;
     public final void ruleXCollectionLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1060:2: ( ( ( rule__XCollectionLiteral__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1061:1: ( ( rule__XCollectionLiteral__Alternatives ) )
+            // InternalCheckCfg.g:1060:2: ( ( ( rule__XCollectionLiteral__Alternatives ) ) )
+            // InternalCheckCfg.g:1061:1: ( ( rule__XCollectionLiteral__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1061:1: ( ( rule__XCollectionLiteral__Alternatives ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1062:1: ( rule__XCollectionLiteral__Alternatives )
+            // InternalCheckCfg.g:1061:1: ( ( rule__XCollectionLiteral__Alternatives ) )
+            // InternalCheckCfg.g:1062:1: ( rule__XCollectionLiteral__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCollectionLiteralAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1063:1: ( rule__XCollectionLiteral__Alternatives )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1063:2: rule__XCollectionLiteral__Alternatives
+            // InternalCheckCfg.g:1063:1: ( rule__XCollectionLiteral__Alternatives )
+            // InternalCheckCfg.g:1063:2: rule__XCollectionLiteral__Alternatives
             {
-            pushFollow(FOLLOW_rule__XCollectionLiteral__Alternatives_in_ruleXCollectionLiteral2205);
+            pushFollow(FOLLOW_2);
             rule__XCollectionLiteral__Alternatives();
 
             state._fsp--;
@@ -3179,16 +3179,16 @@ public final void ruleXCollectionLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXSetLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1075:1: entryRuleXSetLiteral : ruleXSetLiteral EOF ;
+    // InternalCheckCfg.g:1075:1: entryRuleXSetLiteral : ruleXSetLiteral EOF ;
     public final void entryRuleXSetLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1076:1: ( ruleXSetLiteral EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1077:1: ruleXSetLiteral EOF
+            // InternalCheckCfg.g:1076:1: ( ruleXSetLiteral EOF )
+            // InternalCheckCfg.g:1077:1: ruleXSetLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXSetLiteral_in_entryRuleXSetLiteral2232);
+            pushFollow(FOLLOW_1);
             ruleXSetLiteral();
 
             state._fsp--;
@@ -3196,7 +3196,7 @@ public final void entryRuleXSetLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSetLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXSetLiteral2239); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3213,25 +3213,25 @@ public final void entryRuleXSetLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXSetLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1084:1: ruleXSetLiteral : ( ( rule__XSetLiteral__Group__0 ) ) ;
+    // InternalCheckCfg.g:1084:1: ruleXSetLiteral : ( ( rule__XSetLiteral__Group__0 ) ) ;
     public final void ruleXSetLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1088:2: ( ( ( rule__XSetLiteral__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1089:1: ( ( rule__XSetLiteral__Group__0 ) )
+            // InternalCheckCfg.g:1088:2: ( ( ( rule__XSetLiteral__Group__0 ) ) )
+            // InternalCheckCfg.g:1089:1: ( ( rule__XSetLiteral__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1089:1: ( ( rule__XSetLiteral__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1090:1: ( rule__XSetLiteral__Group__0 )
+            // InternalCheckCfg.g:1089:1: ( ( rule__XSetLiteral__Group__0 ) )
+            // InternalCheckCfg.g:1090:1: ( rule__XSetLiteral__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1091:1: ( rule__XSetLiteral__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1091:2: rule__XSetLiteral__Group__0
+            // InternalCheckCfg.g:1091:1: ( rule__XSetLiteral__Group__0 )
+            // InternalCheckCfg.g:1091:2: rule__XSetLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__Group__0_in_ruleXSetLiteral2265);
+            pushFollow(FOLLOW_2);
             rule__XSetLiteral__Group__0();
 
             state._fsp--;
@@ -3264,16 +3264,16 @@ public final void ruleXSetLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXListLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1103:1: entryRuleXListLiteral : ruleXListLiteral EOF ;
+    // InternalCheckCfg.g:1103:1: entryRuleXListLiteral : ruleXListLiteral EOF ;
     public final void entryRuleXListLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1104:1: ( ruleXListLiteral EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1105:1: ruleXListLiteral EOF
+            // InternalCheckCfg.g:1104:1: ( ruleXListLiteral EOF )
+            // InternalCheckCfg.g:1105:1: ruleXListLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXListLiteral_in_entryRuleXListLiteral2292);
+            pushFollow(FOLLOW_1);
             ruleXListLiteral();
 
             state._fsp--;
@@ -3281,7 +3281,7 @@ public final void entryRuleXListLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXListLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXListLiteral2299); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3298,25 +3298,25 @@ public final void entryRuleXListLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXListLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1112:1: ruleXListLiteral : ( ( rule__XListLiteral__Group__0 ) ) ;
+    // InternalCheckCfg.g:1112:1: ruleXListLiteral : ( ( rule__XListLiteral__Group__0 ) ) ;
     public final void ruleXListLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1116:2: ( ( ( rule__XListLiteral__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1117:1: ( ( rule__XListLiteral__Group__0 ) )
+            // InternalCheckCfg.g:1116:2: ( ( ( rule__XListLiteral__Group__0 ) ) )
+            // InternalCheckCfg.g:1117:1: ( ( rule__XListLiteral__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1117:1: ( ( rule__XListLiteral__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1118:1: ( rule__XListLiteral__Group__0 )
+            // InternalCheckCfg.g:1117:1: ( ( rule__XListLiteral__Group__0 ) )
+            // InternalCheckCfg.g:1118:1: ( rule__XListLiteral__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1119:1: ( rule__XListLiteral__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1119:2: rule__XListLiteral__Group__0
+            // InternalCheckCfg.g:1119:1: ( rule__XListLiteral__Group__0 )
+            // InternalCheckCfg.g:1119:2: rule__XListLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__XListLiteral__Group__0_in_ruleXListLiteral2325);
+            pushFollow(FOLLOW_2);
             rule__XListLiteral__Group__0();
 
             state._fsp--;
@@ -3349,16 +3349,16 @@ public final void ruleXListLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXClosure"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1131:1: entryRuleXClosure : ruleXClosure EOF ;
+    // InternalCheckCfg.g:1131:1: entryRuleXClosure : ruleXClosure EOF ;
     public final void entryRuleXClosure() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1132:1: ( ruleXClosure EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1133:1: ruleXClosure EOF
+            // InternalCheckCfg.g:1132:1: ( ruleXClosure EOF )
+            // InternalCheckCfg.g:1133:1: ruleXClosure EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureRule()); 
             }
-            pushFollow(FOLLOW_ruleXClosure_in_entryRuleXClosure2352);
+            pushFollow(FOLLOW_1);
             ruleXClosure();
 
             state._fsp--;
@@ -3366,7 +3366,7 @@ public final void entryRuleXClosure() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXClosureRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXClosure2359); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3383,25 +3383,25 @@ public final void entryRuleXClosure() throws RecognitionException {
 
 
     // $ANTLR start "ruleXClosure"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1140:1: ruleXClosure : ( ( rule__XClosure__Group__0 ) ) ;
+    // InternalCheckCfg.g:1140:1: ruleXClosure : ( ( rule__XClosure__Group__0 ) ) ;
     public final void ruleXClosure() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1144:2: ( ( ( rule__XClosure__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1145:1: ( ( rule__XClosure__Group__0 ) )
+            // InternalCheckCfg.g:1144:2: ( ( ( rule__XClosure__Group__0 ) ) )
+            // InternalCheckCfg.g:1145:1: ( ( rule__XClosure__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1145:1: ( ( rule__XClosure__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1146:1: ( rule__XClosure__Group__0 )
+            // InternalCheckCfg.g:1145:1: ( ( rule__XClosure__Group__0 ) )
+            // InternalCheckCfg.g:1146:1: ( rule__XClosure__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1147:1: ( rule__XClosure__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1147:2: rule__XClosure__Group__0
+            // InternalCheckCfg.g:1147:1: ( rule__XClosure__Group__0 )
+            // InternalCheckCfg.g:1147:2: rule__XClosure__Group__0
             {
-            pushFollow(FOLLOW_rule__XClosure__Group__0_in_ruleXClosure2385);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group__0();
 
             state._fsp--;
@@ -3434,16 +3434,16 @@ public final void ruleXClosure() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXExpressionInClosure"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1159:1: entryRuleXExpressionInClosure : ruleXExpressionInClosure EOF ;
+    // InternalCheckCfg.g:1159:1: entryRuleXExpressionInClosure : ruleXExpressionInClosure EOF ;
     public final void entryRuleXExpressionInClosure() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1160:1: ( ruleXExpressionInClosure EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1161:1: ruleXExpressionInClosure EOF
+            // InternalCheckCfg.g:1160:1: ( ruleXExpressionInClosure EOF )
+            // InternalCheckCfg.g:1161:1: ruleXExpressionInClosure EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionInClosureRule()); 
             }
-            pushFollow(FOLLOW_ruleXExpressionInClosure_in_entryRuleXExpressionInClosure2412);
+            pushFollow(FOLLOW_1);
             ruleXExpressionInClosure();
 
             state._fsp--;
@@ -3451,7 +3451,7 @@ public final void entryRuleXExpressionInClosure() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXExpressionInClosureRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXExpressionInClosure2419); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3468,25 +3468,25 @@ public final void entryRuleXExpressionInClosure() throws RecognitionException {
 
 
     // $ANTLR start "ruleXExpressionInClosure"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1168:1: ruleXExpressionInClosure : ( ( rule__XExpressionInClosure__Group__0 ) ) ;
+    // InternalCheckCfg.g:1168:1: ruleXExpressionInClosure : ( ( rule__XExpressionInClosure__Group__0 ) ) ;
     public final void ruleXExpressionInClosure() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1172:2: ( ( ( rule__XExpressionInClosure__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1173:1: ( ( rule__XExpressionInClosure__Group__0 ) )
+            // InternalCheckCfg.g:1172:2: ( ( ( rule__XExpressionInClosure__Group__0 ) ) )
+            // InternalCheckCfg.g:1173:1: ( ( rule__XExpressionInClosure__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1173:1: ( ( rule__XExpressionInClosure__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1174:1: ( rule__XExpressionInClosure__Group__0 )
+            // InternalCheckCfg.g:1173:1: ( ( rule__XExpressionInClosure__Group__0 ) )
+            // InternalCheckCfg.g:1174:1: ( rule__XExpressionInClosure__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionInClosureAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1175:1: ( rule__XExpressionInClosure__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1175:2: rule__XExpressionInClosure__Group__0
+            // InternalCheckCfg.g:1175:1: ( rule__XExpressionInClosure__Group__0 )
+            // InternalCheckCfg.g:1175:2: rule__XExpressionInClosure__Group__0
             {
-            pushFollow(FOLLOW_rule__XExpressionInClosure__Group__0_in_ruleXExpressionInClosure2445);
+            pushFollow(FOLLOW_2);
             rule__XExpressionInClosure__Group__0();
 
             state._fsp--;
@@ -3519,16 +3519,16 @@ public final void ruleXExpressionInClosure() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXShortClosure"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1187:1: entryRuleXShortClosure : ruleXShortClosure EOF ;
+    // InternalCheckCfg.g:1187:1: entryRuleXShortClosure : ruleXShortClosure EOF ;
     public final void entryRuleXShortClosure() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1188:1: ( ruleXShortClosure EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1189:1: ruleXShortClosure EOF
+            // InternalCheckCfg.g:1188:1: ( ruleXShortClosure EOF )
+            // InternalCheckCfg.g:1189:1: ruleXShortClosure EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureRule()); 
             }
-            pushFollow(FOLLOW_ruleXShortClosure_in_entryRuleXShortClosure2472);
+            pushFollow(FOLLOW_1);
             ruleXShortClosure();
 
             state._fsp--;
@@ -3536,7 +3536,7 @@ public final void entryRuleXShortClosure() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXShortClosureRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXShortClosure2479); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3553,25 +3553,25 @@ public final void entryRuleXShortClosure() throws RecognitionException {
 
 
     // $ANTLR start "ruleXShortClosure"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1196:1: ruleXShortClosure : ( ( rule__XShortClosure__Group__0 ) ) ;
+    // InternalCheckCfg.g:1196:1: ruleXShortClosure : ( ( rule__XShortClosure__Group__0 ) ) ;
     public final void ruleXShortClosure() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1200:2: ( ( ( rule__XShortClosure__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1201:1: ( ( rule__XShortClosure__Group__0 ) )
+            // InternalCheckCfg.g:1200:2: ( ( ( rule__XShortClosure__Group__0 ) ) )
+            // InternalCheckCfg.g:1201:1: ( ( rule__XShortClosure__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1201:1: ( ( rule__XShortClosure__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1202:1: ( rule__XShortClosure__Group__0 )
+            // InternalCheckCfg.g:1201:1: ( ( rule__XShortClosure__Group__0 ) )
+            // InternalCheckCfg.g:1202:1: ( rule__XShortClosure__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1203:1: ( rule__XShortClosure__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1203:2: rule__XShortClosure__Group__0
+            // InternalCheckCfg.g:1203:1: ( rule__XShortClosure__Group__0 )
+            // InternalCheckCfg.g:1203:2: rule__XShortClosure__Group__0
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group__0_in_ruleXShortClosure2505);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__Group__0();
 
             state._fsp--;
@@ -3604,16 +3604,16 @@ public final void ruleXShortClosure() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXParenthesizedExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1215:1: entryRuleXParenthesizedExpression : ruleXParenthesizedExpression EOF ;
+    // InternalCheckCfg.g:1215:1: entryRuleXParenthesizedExpression : ruleXParenthesizedExpression EOF ;
     public final void entryRuleXParenthesizedExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1216:1: ( ruleXParenthesizedExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1217:1: ruleXParenthesizedExpression EOF
+            // InternalCheckCfg.g:1216:1: ( ruleXParenthesizedExpression EOF )
+            // InternalCheckCfg.g:1217:1: ruleXParenthesizedExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXParenthesizedExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXParenthesizedExpression_in_entryRuleXParenthesizedExpression2532);
+            pushFollow(FOLLOW_1);
             ruleXParenthesizedExpression();
 
             state._fsp--;
@@ -3621,7 +3621,7 @@ public final void entryRuleXParenthesizedExpression() throws RecognitionExceptio
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXParenthesizedExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXParenthesizedExpression2539); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3638,25 +3638,25 @@ public final void entryRuleXParenthesizedExpression() throws RecognitionExceptio
 
 
     // $ANTLR start "ruleXParenthesizedExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1224:1: ruleXParenthesizedExpression : ( ( rule__XParenthesizedExpression__Group__0 ) ) ;
+    // InternalCheckCfg.g:1224:1: ruleXParenthesizedExpression : ( ( rule__XParenthesizedExpression__Group__0 ) ) ;
     public final void ruleXParenthesizedExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1228:2: ( ( ( rule__XParenthesizedExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1229:1: ( ( rule__XParenthesizedExpression__Group__0 ) )
+            // InternalCheckCfg.g:1228:2: ( ( ( rule__XParenthesizedExpression__Group__0 ) ) )
+            // InternalCheckCfg.g:1229:1: ( ( rule__XParenthesizedExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1229:1: ( ( rule__XParenthesizedExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1230:1: ( rule__XParenthesizedExpression__Group__0 )
+            // InternalCheckCfg.g:1229:1: ( ( rule__XParenthesizedExpression__Group__0 ) )
+            // InternalCheckCfg.g:1230:1: ( rule__XParenthesizedExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXParenthesizedExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1231:1: ( rule__XParenthesizedExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1231:2: rule__XParenthesizedExpression__Group__0
+            // InternalCheckCfg.g:1231:1: ( rule__XParenthesizedExpression__Group__0 )
+            // InternalCheckCfg.g:1231:2: rule__XParenthesizedExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XParenthesizedExpression__Group__0_in_ruleXParenthesizedExpression2565);
+            pushFollow(FOLLOW_2);
             rule__XParenthesizedExpression__Group__0();
 
             state._fsp--;
@@ -3689,16 +3689,16 @@ public final void ruleXParenthesizedExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXIfExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1243:1: entryRuleXIfExpression : ruleXIfExpression EOF ;
+    // InternalCheckCfg.g:1243:1: entryRuleXIfExpression : ruleXIfExpression EOF ;
     public final void entryRuleXIfExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1244:1: ( ruleXIfExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1245:1: ruleXIfExpression EOF
+            // InternalCheckCfg.g:1244:1: ( ruleXIfExpression EOF )
+            // InternalCheckCfg.g:1245:1: ruleXIfExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXIfExpression_in_entryRuleXIfExpression2592);
+            pushFollow(FOLLOW_1);
             ruleXIfExpression();
 
             state._fsp--;
@@ -3706,7 +3706,7 @@ public final void entryRuleXIfExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXIfExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXIfExpression2599); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3723,25 +3723,25 @@ public final void entryRuleXIfExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXIfExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1252:1: ruleXIfExpression : ( ( rule__XIfExpression__Group__0 ) ) ;
+    // InternalCheckCfg.g:1252:1: ruleXIfExpression : ( ( rule__XIfExpression__Group__0 ) ) ;
     public final void ruleXIfExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1256:2: ( ( ( rule__XIfExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1257:1: ( ( rule__XIfExpression__Group__0 ) )
+            // InternalCheckCfg.g:1256:2: ( ( ( rule__XIfExpression__Group__0 ) ) )
+            // InternalCheckCfg.g:1257:1: ( ( rule__XIfExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1257:1: ( ( rule__XIfExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1258:1: ( rule__XIfExpression__Group__0 )
+            // InternalCheckCfg.g:1257:1: ( ( rule__XIfExpression__Group__0 ) )
+            // InternalCheckCfg.g:1258:1: ( rule__XIfExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1259:1: ( rule__XIfExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1259:2: rule__XIfExpression__Group__0
+            // InternalCheckCfg.g:1259:1: ( rule__XIfExpression__Group__0 )
+            // InternalCheckCfg.g:1259:2: rule__XIfExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XIfExpression__Group__0_in_ruleXIfExpression2625);
+            pushFollow(FOLLOW_2);
             rule__XIfExpression__Group__0();
 
             state._fsp--;
@@ -3774,16 +3774,16 @@ public final void ruleXIfExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXSwitchExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1271:1: entryRuleXSwitchExpression : ruleXSwitchExpression EOF ;
+    // InternalCheckCfg.g:1271:1: entryRuleXSwitchExpression : ruleXSwitchExpression EOF ;
     public final void entryRuleXSwitchExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1272:1: ( ruleXSwitchExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1273:1: ruleXSwitchExpression EOF
+            // InternalCheckCfg.g:1272:1: ( ruleXSwitchExpression EOF )
+            // InternalCheckCfg.g:1273:1: ruleXSwitchExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXSwitchExpression_in_entryRuleXSwitchExpression2652);
+            pushFollow(FOLLOW_1);
             ruleXSwitchExpression();
 
             state._fsp--;
@@ -3791,7 +3791,7 @@ public final void entryRuleXSwitchExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXSwitchExpression2659); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3808,25 +3808,25 @@ public final void entryRuleXSwitchExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXSwitchExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1280:1: ruleXSwitchExpression : ( ( rule__XSwitchExpression__Group__0 ) ) ;
+    // InternalCheckCfg.g:1280:1: ruleXSwitchExpression : ( ( rule__XSwitchExpression__Group__0 ) ) ;
     public final void ruleXSwitchExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1284:2: ( ( ( rule__XSwitchExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1285:1: ( ( rule__XSwitchExpression__Group__0 ) )
+            // InternalCheckCfg.g:1284:2: ( ( ( rule__XSwitchExpression__Group__0 ) ) )
+            // InternalCheckCfg.g:1285:1: ( ( rule__XSwitchExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1285:1: ( ( rule__XSwitchExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1286:1: ( rule__XSwitchExpression__Group__0 )
+            // InternalCheckCfg.g:1285:1: ( ( rule__XSwitchExpression__Group__0 ) )
+            // InternalCheckCfg.g:1286:1: ( rule__XSwitchExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1287:1: ( rule__XSwitchExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1287:2: rule__XSwitchExpression__Group__0
+            // InternalCheckCfg.g:1287:1: ( rule__XSwitchExpression__Group__0 )
+            // InternalCheckCfg.g:1287:2: rule__XSwitchExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__0_in_ruleXSwitchExpression2685);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group__0();
 
             state._fsp--;
@@ -3859,16 +3859,16 @@ public final void ruleXSwitchExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXCasePart"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1299:1: entryRuleXCasePart : ruleXCasePart EOF ;
+    // InternalCheckCfg.g:1299:1: entryRuleXCasePart : ruleXCasePart EOF ;
     public final void entryRuleXCasePart() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1300:1: ( ruleXCasePart EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1301:1: ruleXCasePart EOF
+            // InternalCheckCfg.g:1300:1: ( ruleXCasePart EOF )
+            // InternalCheckCfg.g:1301:1: ruleXCasePart EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartRule()); 
             }
-            pushFollow(FOLLOW_ruleXCasePart_in_entryRuleXCasePart2712);
+            pushFollow(FOLLOW_1);
             ruleXCasePart();
 
             state._fsp--;
@@ -3876,7 +3876,7 @@ public final void entryRuleXCasePart() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXCasePartRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXCasePart2719); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3893,25 +3893,25 @@ public final void entryRuleXCasePart() throws RecognitionException {
 
 
     // $ANTLR start "ruleXCasePart"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1308:1: ruleXCasePart : ( ( rule__XCasePart__Group__0 ) ) ;
+    // InternalCheckCfg.g:1308:1: ruleXCasePart : ( ( rule__XCasePart__Group__0 ) ) ;
     public final void ruleXCasePart() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1312:2: ( ( ( rule__XCasePart__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1313:1: ( ( rule__XCasePart__Group__0 ) )
+            // InternalCheckCfg.g:1312:2: ( ( ( rule__XCasePart__Group__0 ) ) )
+            // InternalCheckCfg.g:1313:1: ( ( rule__XCasePart__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1313:1: ( ( rule__XCasePart__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1314:1: ( rule__XCasePart__Group__0 )
+            // InternalCheckCfg.g:1313:1: ( ( rule__XCasePart__Group__0 ) )
+            // InternalCheckCfg.g:1314:1: ( rule__XCasePart__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1315:1: ( rule__XCasePart__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1315:2: rule__XCasePart__Group__0
+            // InternalCheckCfg.g:1315:1: ( rule__XCasePart__Group__0 )
+            // InternalCheckCfg.g:1315:2: rule__XCasePart__Group__0
             {
-            pushFollow(FOLLOW_rule__XCasePart__Group__0_in_ruleXCasePart2745);
+            pushFollow(FOLLOW_2);
             rule__XCasePart__Group__0();
 
             state._fsp--;
@@ -3944,16 +3944,16 @@ public final void ruleXCasePart() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXForLoopExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1327:1: entryRuleXForLoopExpression : ruleXForLoopExpression EOF ;
+    // InternalCheckCfg.g:1327:1: entryRuleXForLoopExpression : ruleXForLoopExpression EOF ;
     public final void entryRuleXForLoopExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1328:1: ( ruleXForLoopExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1329:1: ruleXForLoopExpression EOF
+            // InternalCheckCfg.g:1328:1: ( ruleXForLoopExpression EOF )
+            // InternalCheckCfg.g:1329:1: ruleXForLoopExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXForLoopExpression_in_entryRuleXForLoopExpression2772);
+            pushFollow(FOLLOW_1);
             ruleXForLoopExpression();
 
             state._fsp--;
@@ -3961,7 +3961,7 @@ public final void entryRuleXForLoopExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXForLoopExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXForLoopExpression2779); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3978,25 +3978,25 @@ public final void entryRuleXForLoopExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXForLoopExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1336:1: ruleXForLoopExpression : ( ( rule__XForLoopExpression__Group__0 ) ) ;
+    // InternalCheckCfg.g:1336:1: ruleXForLoopExpression : ( ( rule__XForLoopExpression__Group__0 ) ) ;
     public final void ruleXForLoopExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1340:2: ( ( ( rule__XForLoopExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1341:1: ( ( rule__XForLoopExpression__Group__0 ) )
+            // InternalCheckCfg.g:1340:2: ( ( ( rule__XForLoopExpression__Group__0 ) ) )
+            // InternalCheckCfg.g:1341:1: ( ( rule__XForLoopExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1341:1: ( ( rule__XForLoopExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1342:1: ( rule__XForLoopExpression__Group__0 )
+            // InternalCheckCfg.g:1341:1: ( ( rule__XForLoopExpression__Group__0 ) )
+            // InternalCheckCfg.g:1342:1: ( rule__XForLoopExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1343:1: ( rule__XForLoopExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1343:2: rule__XForLoopExpression__Group__0
+            // InternalCheckCfg.g:1343:1: ( rule__XForLoopExpression__Group__0 )
+            // InternalCheckCfg.g:1343:2: rule__XForLoopExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group__0_in_ruleXForLoopExpression2805);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group__0();
 
             state._fsp--;
@@ -4029,16 +4029,16 @@ public final void ruleXForLoopExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXBasicForLoopExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1355:1: entryRuleXBasicForLoopExpression : ruleXBasicForLoopExpression EOF ;
+    // InternalCheckCfg.g:1355:1: entryRuleXBasicForLoopExpression : ruleXBasicForLoopExpression EOF ;
     public final void entryRuleXBasicForLoopExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1356:1: ( ruleXBasicForLoopExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1357:1: ruleXBasicForLoopExpression EOF
+            // InternalCheckCfg.g:1356:1: ( ruleXBasicForLoopExpression EOF )
+            // InternalCheckCfg.g:1357:1: ruleXBasicForLoopExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXBasicForLoopExpression_in_entryRuleXBasicForLoopExpression2832);
+            pushFollow(FOLLOW_1);
             ruleXBasicForLoopExpression();
 
             state._fsp--;
@@ -4046,7 +4046,7 @@ public final void entryRuleXBasicForLoopExpression() throws RecognitionException
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBasicForLoopExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXBasicForLoopExpression2839); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4063,25 +4063,25 @@ public final void entryRuleXBasicForLoopExpression() throws RecognitionException
 
 
     // $ANTLR start "ruleXBasicForLoopExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1364:1: ruleXBasicForLoopExpression : ( ( rule__XBasicForLoopExpression__Group__0 ) ) ;
+    // InternalCheckCfg.g:1364:1: ruleXBasicForLoopExpression : ( ( rule__XBasicForLoopExpression__Group__0 ) ) ;
     public final void ruleXBasicForLoopExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1368:2: ( ( ( rule__XBasicForLoopExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1369:1: ( ( rule__XBasicForLoopExpression__Group__0 ) )
+            // InternalCheckCfg.g:1368:2: ( ( ( rule__XBasicForLoopExpression__Group__0 ) ) )
+            // InternalCheckCfg.g:1369:1: ( ( rule__XBasicForLoopExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1369:1: ( ( rule__XBasicForLoopExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1370:1: ( rule__XBasicForLoopExpression__Group__0 )
+            // InternalCheckCfg.g:1369:1: ( ( rule__XBasicForLoopExpression__Group__0 ) )
+            // InternalCheckCfg.g:1370:1: ( rule__XBasicForLoopExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1371:1: ( rule__XBasicForLoopExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1371:2: rule__XBasicForLoopExpression__Group__0
+            // InternalCheckCfg.g:1371:1: ( rule__XBasicForLoopExpression__Group__0 )
+            // InternalCheckCfg.g:1371:2: rule__XBasicForLoopExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__0_in_ruleXBasicForLoopExpression2865);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group__0();
 
             state._fsp--;
@@ -4114,16 +4114,16 @@ public final void ruleXBasicForLoopExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXWhileExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1383:1: entryRuleXWhileExpression : ruleXWhileExpression EOF ;
+    // InternalCheckCfg.g:1383:1: entryRuleXWhileExpression : ruleXWhileExpression EOF ;
     public final void entryRuleXWhileExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1384:1: ( ruleXWhileExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1385:1: ruleXWhileExpression EOF
+            // InternalCheckCfg.g:1384:1: ( ruleXWhileExpression EOF )
+            // InternalCheckCfg.g:1385:1: ruleXWhileExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXWhileExpression_in_entryRuleXWhileExpression2892);
+            pushFollow(FOLLOW_1);
             ruleXWhileExpression();
 
             state._fsp--;
@@ -4131,7 +4131,7 @@ public final void entryRuleXWhileExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXWhileExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXWhileExpression2899); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4148,25 +4148,25 @@ public final void entryRuleXWhileExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXWhileExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1392:1: ruleXWhileExpression : ( ( rule__XWhileExpression__Group__0 ) ) ;
+    // InternalCheckCfg.g:1392:1: ruleXWhileExpression : ( ( rule__XWhileExpression__Group__0 ) ) ;
     public final void ruleXWhileExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1396:2: ( ( ( rule__XWhileExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1397:1: ( ( rule__XWhileExpression__Group__0 ) )
+            // InternalCheckCfg.g:1396:2: ( ( ( rule__XWhileExpression__Group__0 ) ) )
+            // InternalCheckCfg.g:1397:1: ( ( rule__XWhileExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1397:1: ( ( rule__XWhileExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1398:1: ( rule__XWhileExpression__Group__0 )
+            // InternalCheckCfg.g:1397:1: ( ( rule__XWhileExpression__Group__0 ) )
+            // InternalCheckCfg.g:1398:1: ( rule__XWhileExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1399:1: ( rule__XWhileExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1399:2: rule__XWhileExpression__Group__0
+            // InternalCheckCfg.g:1399:1: ( rule__XWhileExpression__Group__0 )
+            // InternalCheckCfg.g:1399:2: rule__XWhileExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__0_in_ruleXWhileExpression2925);
+            pushFollow(FOLLOW_2);
             rule__XWhileExpression__Group__0();
 
             state._fsp--;
@@ -4199,16 +4199,16 @@ public final void ruleXWhileExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXDoWhileExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1411:1: entryRuleXDoWhileExpression : ruleXDoWhileExpression EOF ;
+    // InternalCheckCfg.g:1411:1: entryRuleXDoWhileExpression : ruleXDoWhileExpression EOF ;
     public final void entryRuleXDoWhileExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1412:1: ( ruleXDoWhileExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1413:1: ruleXDoWhileExpression EOF
+            // InternalCheckCfg.g:1412:1: ( ruleXDoWhileExpression EOF )
+            // InternalCheckCfg.g:1413:1: ruleXDoWhileExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXDoWhileExpression_in_entryRuleXDoWhileExpression2952);
+            pushFollow(FOLLOW_1);
             ruleXDoWhileExpression();
 
             state._fsp--;
@@ -4216,7 +4216,7 @@ public final void entryRuleXDoWhileExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXDoWhileExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXDoWhileExpression2959); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4233,25 +4233,25 @@ public final void entryRuleXDoWhileExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXDoWhileExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1420:1: ruleXDoWhileExpression : ( ( rule__XDoWhileExpression__Group__0 ) ) ;
+    // InternalCheckCfg.g:1420:1: ruleXDoWhileExpression : ( ( rule__XDoWhileExpression__Group__0 ) ) ;
     public final void ruleXDoWhileExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1424:2: ( ( ( rule__XDoWhileExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1425:1: ( ( rule__XDoWhileExpression__Group__0 ) )
+            // InternalCheckCfg.g:1424:2: ( ( ( rule__XDoWhileExpression__Group__0 ) ) )
+            // InternalCheckCfg.g:1425:1: ( ( rule__XDoWhileExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1425:1: ( ( rule__XDoWhileExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1426:1: ( rule__XDoWhileExpression__Group__0 )
+            // InternalCheckCfg.g:1425:1: ( ( rule__XDoWhileExpression__Group__0 ) )
+            // InternalCheckCfg.g:1426:1: ( rule__XDoWhileExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1427:1: ( rule__XDoWhileExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1427:2: rule__XDoWhileExpression__Group__0
+            // InternalCheckCfg.g:1427:1: ( rule__XDoWhileExpression__Group__0 )
+            // InternalCheckCfg.g:1427:2: rule__XDoWhileExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__0_in_ruleXDoWhileExpression2985);
+            pushFollow(FOLLOW_2);
             rule__XDoWhileExpression__Group__0();
 
             state._fsp--;
@@ -4284,16 +4284,16 @@ public final void ruleXDoWhileExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXBlockExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1439:1: entryRuleXBlockExpression : ruleXBlockExpression EOF ;
+    // InternalCheckCfg.g:1439:1: entryRuleXBlockExpression : ruleXBlockExpression EOF ;
     public final void entryRuleXBlockExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1440:1: ( ruleXBlockExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1441:1: ruleXBlockExpression EOF
+            // InternalCheckCfg.g:1440:1: ( ruleXBlockExpression EOF )
+            // InternalCheckCfg.g:1441:1: ruleXBlockExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXBlockExpression_in_entryRuleXBlockExpression3012);
+            pushFollow(FOLLOW_1);
             ruleXBlockExpression();
 
             state._fsp--;
@@ -4301,7 +4301,7 @@ public final void entryRuleXBlockExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBlockExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXBlockExpression3019); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4318,25 +4318,25 @@ public final void entryRuleXBlockExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXBlockExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1448:1: ruleXBlockExpression : ( ( rule__XBlockExpression__Group__0 ) ) ;
+    // InternalCheckCfg.g:1448:1: ruleXBlockExpression : ( ( rule__XBlockExpression__Group__0 ) ) ;
     public final void ruleXBlockExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1452:2: ( ( ( rule__XBlockExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1453:1: ( ( rule__XBlockExpression__Group__0 ) )
+            // InternalCheckCfg.g:1452:2: ( ( ( rule__XBlockExpression__Group__0 ) ) )
+            // InternalCheckCfg.g:1453:1: ( ( rule__XBlockExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1453:1: ( ( rule__XBlockExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1454:1: ( rule__XBlockExpression__Group__0 )
+            // InternalCheckCfg.g:1453:1: ( ( rule__XBlockExpression__Group__0 ) )
+            // InternalCheckCfg.g:1454:1: ( rule__XBlockExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1455:1: ( rule__XBlockExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1455:2: rule__XBlockExpression__Group__0
+            // InternalCheckCfg.g:1455:1: ( rule__XBlockExpression__Group__0 )
+            // InternalCheckCfg.g:1455:2: rule__XBlockExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XBlockExpression__Group__0_in_ruleXBlockExpression3045);
+            pushFollow(FOLLOW_2);
             rule__XBlockExpression__Group__0();
 
             state._fsp--;
@@ -4369,16 +4369,16 @@ public final void ruleXBlockExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXExpressionOrVarDeclaration"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1467:1: entryRuleXExpressionOrVarDeclaration : ruleXExpressionOrVarDeclaration EOF ;
+    // InternalCheckCfg.g:1467:1: entryRuleXExpressionOrVarDeclaration : ruleXExpressionOrVarDeclaration EOF ;
     public final void entryRuleXExpressionOrVarDeclaration() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1468:1: ( ruleXExpressionOrVarDeclaration EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1469:1: ruleXExpressionOrVarDeclaration EOF
+            // InternalCheckCfg.g:1468:1: ( ruleXExpressionOrVarDeclaration EOF )
+            // InternalCheckCfg.g:1469:1: ruleXExpressionOrVarDeclaration EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionOrVarDeclarationRule()); 
             }
-            pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_entryRuleXExpressionOrVarDeclaration3072);
+            pushFollow(FOLLOW_1);
             ruleXExpressionOrVarDeclaration();
 
             state._fsp--;
@@ -4386,7 +4386,7 @@ public final void entryRuleXExpressionOrVarDeclaration() throws RecognitionExcep
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXExpressionOrVarDeclarationRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXExpressionOrVarDeclaration3079); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4403,25 +4403,25 @@ public final void entryRuleXExpressionOrVarDeclaration() throws RecognitionExcep
 
 
     // $ANTLR start "ruleXExpressionOrVarDeclaration"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1476:1: ruleXExpressionOrVarDeclaration : ( ( rule__XExpressionOrVarDeclaration__Alternatives ) ) ;
+    // InternalCheckCfg.g:1476:1: ruleXExpressionOrVarDeclaration : ( ( rule__XExpressionOrVarDeclaration__Alternatives ) ) ;
     public final void ruleXExpressionOrVarDeclaration() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1480:2: ( ( ( rule__XExpressionOrVarDeclaration__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1481:1: ( ( rule__XExpressionOrVarDeclaration__Alternatives ) )
+            // InternalCheckCfg.g:1480:2: ( ( ( rule__XExpressionOrVarDeclaration__Alternatives ) ) )
+            // InternalCheckCfg.g:1481:1: ( ( rule__XExpressionOrVarDeclaration__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1481:1: ( ( rule__XExpressionOrVarDeclaration__Alternatives ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1482:1: ( rule__XExpressionOrVarDeclaration__Alternatives )
+            // InternalCheckCfg.g:1481:1: ( ( rule__XExpressionOrVarDeclaration__Alternatives ) )
+            // InternalCheckCfg.g:1482:1: ( rule__XExpressionOrVarDeclaration__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionOrVarDeclarationAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1483:1: ( rule__XExpressionOrVarDeclaration__Alternatives )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1483:2: rule__XExpressionOrVarDeclaration__Alternatives
+            // InternalCheckCfg.g:1483:1: ( rule__XExpressionOrVarDeclaration__Alternatives )
+            // InternalCheckCfg.g:1483:2: rule__XExpressionOrVarDeclaration__Alternatives
             {
-            pushFollow(FOLLOW_rule__XExpressionOrVarDeclaration__Alternatives_in_ruleXExpressionOrVarDeclaration3105);
+            pushFollow(FOLLOW_2);
             rule__XExpressionOrVarDeclaration__Alternatives();
 
             state._fsp--;
@@ -4454,16 +4454,16 @@ public final void ruleXExpressionOrVarDeclaration() throws RecognitionException
 
 
     // $ANTLR start "entryRuleXVariableDeclaration"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1495:1: entryRuleXVariableDeclaration : ruleXVariableDeclaration EOF ;
+    // InternalCheckCfg.g:1495:1: entryRuleXVariableDeclaration : ruleXVariableDeclaration EOF ;
     public final void entryRuleXVariableDeclaration() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1496:1: ( ruleXVariableDeclaration EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1497:1: ruleXVariableDeclaration EOF
+            // InternalCheckCfg.g:1496:1: ( ruleXVariableDeclaration EOF )
+            // InternalCheckCfg.g:1497:1: ruleXVariableDeclaration EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationRule()); 
             }
-            pushFollow(FOLLOW_ruleXVariableDeclaration_in_entryRuleXVariableDeclaration3132);
+            pushFollow(FOLLOW_1);
             ruleXVariableDeclaration();
 
             state._fsp--;
@@ -4471,7 +4471,7 @@ public final void entryRuleXVariableDeclaration() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXVariableDeclarationRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXVariableDeclaration3139); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4488,25 +4488,25 @@ public final void entryRuleXVariableDeclaration() throws RecognitionException {
 
 
     // $ANTLR start "ruleXVariableDeclaration"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1504:1: ruleXVariableDeclaration : ( ( rule__XVariableDeclaration__Group__0 ) ) ;
+    // InternalCheckCfg.g:1504:1: ruleXVariableDeclaration : ( ( rule__XVariableDeclaration__Group__0 ) ) ;
     public final void ruleXVariableDeclaration() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1508:2: ( ( ( rule__XVariableDeclaration__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1509:1: ( ( rule__XVariableDeclaration__Group__0 ) )
+            // InternalCheckCfg.g:1508:2: ( ( ( rule__XVariableDeclaration__Group__0 ) ) )
+            // InternalCheckCfg.g:1509:1: ( ( rule__XVariableDeclaration__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1509:1: ( ( rule__XVariableDeclaration__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1510:1: ( rule__XVariableDeclaration__Group__0 )
+            // InternalCheckCfg.g:1509:1: ( ( rule__XVariableDeclaration__Group__0 ) )
+            // InternalCheckCfg.g:1510:1: ( rule__XVariableDeclaration__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1511:1: ( rule__XVariableDeclaration__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1511:2: rule__XVariableDeclaration__Group__0
+            // InternalCheckCfg.g:1511:1: ( rule__XVariableDeclaration__Group__0 )
+            // InternalCheckCfg.g:1511:2: rule__XVariableDeclaration__Group__0
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group__0_in_ruleXVariableDeclaration3165);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group__0();
 
             state._fsp--;
@@ -4539,16 +4539,16 @@ public final void ruleXVariableDeclaration() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleJvmFormalParameter"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1523:1: entryRuleJvmFormalParameter : ruleJvmFormalParameter EOF ;
+    // InternalCheckCfg.g:1523:1: entryRuleJvmFormalParameter : ruleJvmFormalParameter EOF ;
     public final void entryRuleJvmFormalParameter() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1524:1: ( ruleJvmFormalParameter EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1525:1: ruleJvmFormalParameter EOF
+            // InternalCheckCfg.g:1524:1: ( ruleJvmFormalParameter EOF )
+            // InternalCheckCfg.g:1525:1: ruleJvmFormalParameter EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmFormalParameterRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmFormalParameter_in_entryRuleJvmFormalParameter3192);
+            pushFollow(FOLLOW_1);
             ruleJvmFormalParameter();
 
             state._fsp--;
@@ -4556,7 +4556,7 @@ public final void entryRuleJvmFormalParameter() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmFormalParameterRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmFormalParameter3199); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4573,25 +4573,25 @@ public final void entryRuleJvmFormalParameter() throws RecognitionException {
 
 
     // $ANTLR start "ruleJvmFormalParameter"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1532:1: ruleJvmFormalParameter : ( ( rule__JvmFormalParameter__Group__0 ) ) ;
+    // InternalCheckCfg.g:1532:1: ruleJvmFormalParameter : ( ( rule__JvmFormalParameter__Group__0 ) ) ;
     public final void ruleJvmFormalParameter() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1536:2: ( ( ( rule__JvmFormalParameter__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1537:1: ( ( rule__JvmFormalParameter__Group__0 ) )
+            // InternalCheckCfg.g:1536:2: ( ( ( rule__JvmFormalParameter__Group__0 ) ) )
+            // InternalCheckCfg.g:1537:1: ( ( rule__JvmFormalParameter__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1537:1: ( ( rule__JvmFormalParameter__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1538:1: ( rule__JvmFormalParameter__Group__0 )
+            // InternalCheckCfg.g:1537:1: ( ( rule__JvmFormalParameter__Group__0 ) )
+            // InternalCheckCfg.g:1538:1: ( rule__JvmFormalParameter__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmFormalParameterAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1539:1: ( rule__JvmFormalParameter__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1539:2: rule__JvmFormalParameter__Group__0
+            // InternalCheckCfg.g:1539:1: ( rule__JvmFormalParameter__Group__0 )
+            // InternalCheckCfg.g:1539:2: rule__JvmFormalParameter__Group__0
             {
-            pushFollow(FOLLOW_rule__JvmFormalParameter__Group__0_in_ruleJvmFormalParameter3225);
+            pushFollow(FOLLOW_2);
             rule__JvmFormalParameter__Group__0();
 
             state._fsp--;
@@ -4624,16 +4624,16 @@ public final void ruleJvmFormalParameter() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleFullJvmFormalParameter"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1551:1: entryRuleFullJvmFormalParameter : ruleFullJvmFormalParameter EOF ;
+    // InternalCheckCfg.g:1551:1: entryRuleFullJvmFormalParameter : ruleFullJvmFormalParameter EOF ;
     public final void entryRuleFullJvmFormalParameter() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1552:1: ( ruleFullJvmFormalParameter EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1553:1: ruleFullJvmFormalParameter EOF
+            // InternalCheckCfg.g:1552:1: ( ruleFullJvmFormalParameter EOF )
+            // InternalCheckCfg.g:1553:1: ruleFullJvmFormalParameter EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFullJvmFormalParameterRule()); 
             }
-            pushFollow(FOLLOW_ruleFullJvmFormalParameter_in_entryRuleFullJvmFormalParameter3252);
+            pushFollow(FOLLOW_1);
             ruleFullJvmFormalParameter();
 
             state._fsp--;
@@ -4641,7 +4641,7 @@ public final void entryRuleFullJvmFormalParameter() throws RecognitionException
             if ( state.backtracking==0 ) {
                after(grammarAccess.getFullJvmFormalParameterRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFullJvmFormalParameter3259); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4658,25 +4658,25 @@ public final void entryRuleFullJvmFormalParameter() throws RecognitionException
 
 
     // $ANTLR start "ruleFullJvmFormalParameter"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1560:1: ruleFullJvmFormalParameter : ( ( rule__FullJvmFormalParameter__Group__0 ) ) ;
+    // InternalCheckCfg.g:1560:1: ruleFullJvmFormalParameter : ( ( rule__FullJvmFormalParameter__Group__0 ) ) ;
     public final void ruleFullJvmFormalParameter() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1564:2: ( ( ( rule__FullJvmFormalParameter__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1565:1: ( ( rule__FullJvmFormalParameter__Group__0 ) )
+            // InternalCheckCfg.g:1564:2: ( ( ( rule__FullJvmFormalParameter__Group__0 ) ) )
+            // InternalCheckCfg.g:1565:1: ( ( rule__FullJvmFormalParameter__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1565:1: ( ( rule__FullJvmFormalParameter__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1566:1: ( rule__FullJvmFormalParameter__Group__0 )
+            // InternalCheckCfg.g:1565:1: ( ( rule__FullJvmFormalParameter__Group__0 ) )
+            // InternalCheckCfg.g:1566:1: ( rule__FullJvmFormalParameter__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFullJvmFormalParameterAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1567:1: ( rule__FullJvmFormalParameter__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1567:2: rule__FullJvmFormalParameter__Group__0
+            // InternalCheckCfg.g:1567:1: ( rule__FullJvmFormalParameter__Group__0 )
+            // InternalCheckCfg.g:1567:2: rule__FullJvmFormalParameter__Group__0
             {
-            pushFollow(FOLLOW_rule__FullJvmFormalParameter__Group__0_in_ruleFullJvmFormalParameter3285);
+            pushFollow(FOLLOW_2);
             rule__FullJvmFormalParameter__Group__0();
 
             state._fsp--;
@@ -4709,16 +4709,16 @@ public final void ruleFullJvmFormalParameter() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXFeatureCall"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1579:1: entryRuleXFeatureCall : ruleXFeatureCall EOF ;
+    // InternalCheckCfg.g:1579:1: entryRuleXFeatureCall : ruleXFeatureCall EOF ;
     public final void entryRuleXFeatureCall() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1580:1: ( ruleXFeatureCall EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1581:1: ruleXFeatureCall EOF
+            // InternalCheckCfg.g:1580:1: ( ruleXFeatureCall EOF )
+            // InternalCheckCfg.g:1581:1: ruleXFeatureCall EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallRule()); 
             }
-            pushFollow(FOLLOW_ruleXFeatureCall_in_entryRuleXFeatureCall3312);
+            pushFollow(FOLLOW_1);
             ruleXFeatureCall();
 
             state._fsp--;
@@ -4726,7 +4726,7 @@ public final void entryRuleXFeatureCall() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFeatureCallRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXFeatureCall3319); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4743,25 +4743,25 @@ public final void entryRuleXFeatureCall() throws RecognitionException {
 
 
     // $ANTLR start "ruleXFeatureCall"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1588:1: ruleXFeatureCall : ( ( rule__XFeatureCall__Group__0 ) ) ;
+    // InternalCheckCfg.g:1588:1: ruleXFeatureCall : ( ( rule__XFeatureCall__Group__0 ) ) ;
     public final void ruleXFeatureCall() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1592:2: ( ( ( rule__XFeatureCall__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1593:1: ( ( rule__XFeatureCall__Group__0 ) )
+            // InternalCheckCfg.g:1592:2: ( ( ( rule__XFeatureCall__Group__0 ) ) )
+            // InternalCheckCfg.g:1593:1: ( ( rule__XFeatureCall__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1593:1: ( ( rule__XFeatureCall__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1594:1: ( rule__XFeatureCall__Group__0 )
+            // InternalCheckCfg.g:1593:1: ( ( rule__XFeatureCall__Group__0 ) )
+            // InternalCheckCfg.g:1594:1: ( rule__XFeatureCall__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1595:1: ( rule__XFeatureCall__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1595:2: rule__XFeatureCall__Group__0
+            // InternalCheckCfg.g:1595:1: ( rule__XFeatureCall__Group__0 )
+            // InternalCheckCfg.g:1595:2: rule__XFeatureCall__Group__0
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group__0_in_ruleXFeatureCall3345);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group__0();
 
             state._fsp--;
@@ -4794,16 +4794,16 @@ public final void ruleXFeatureCall() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleFeatureCallID"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1607:1: entryRuleFeatureCallID : ruleFeatureCallID EOF ;
+    // InternalCheckCfg.g:1607:1: entryRuleFeatureCallID : ruleFeatureCallID EOF ;
     public final void entryRuleFeatureCallID() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1608:1: ( ruleFeatureCallID EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1609:1: ruleFeatureCallID EOF
+            // InternalCheckCfg.g:1608:1: ( ruleFeatureCallID EOF )
+            // InternalCheckCfg.g:1609:1: ruleFeatureCallID EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFeatureCallIDRule()); 
             }
-            pushFollow(FOLLOW_ruleFeatureCallID_in_entryRuleFeatureCallID3372);
+            pushFollow(FOLLOW_1);
             ruleFeatureCallID();
 
             state._fsp--;
@@ -4811,7 +4811,7 @@ public final void entryRuleFeatureCallID() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getFeatureCallIDRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFeatureCallID3379); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4828,25 +4828,25 @@ public final void entryRuleFeatureCallID() throws RecognitionException {
 
 
     // $ANTLR start "ruleFeatureCallID"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1616:1: ruleFeatureCallID : ( ( rule__FeatureCallID__Alternatives ) ) ;
+    // InternalCheckCfg.g:1616:1: ruleFeatureCallID : ( ( rule__FeatureCallID__Alternatives ) ) ;
     public final void ruleFeatureCallID() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1620:2: ( ( ( rule__FeatureCallID__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1621:1: ( ( rule__FeatureCallID__Alternatives ) )
+            // InternalCheckCfg.g:1620:2: ( ( ( rule__FeatureCallID__Alternatives ) ) )
+            // InternalCheckCfg.g:1621:1: ( ( rule__FeatureCallID__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1621:1: ( ( rule__FeatureCallID__Alternatives ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1622:1: ( rule__FeatureCallID__Alternatives )
+            // InternalCheckCfg.g:1621:1: ( ( rule__FeatureCallID__Alternatives ) )
+            // InternalCheckCfg.g:1622:1: ( rule__FeatureCallID__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFeatureCallIDAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1623:1: ( rule__FeatureCallID__Alternatives )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1623:2: rule__FeatureCallID__Alternatives
+            // InternalCheckCfg.g:1623:1: ( rule__FeatureCallID__Alternatives )
+            // InternalCheckCfg.g:1623:2: rule__FeatureCallID__Alternatives
             {
-            pushFollow(FOLLOW_rule__FeatureCallID__Alternatives_in_ruleFeatureCallID3405);
+            pushFollow(FOLLOW_2);
             rule__FeatureCallID__Alternatives();
 
             state._fsp--;
@@ -4879,16 +4879,16 @@ public final void ruleFeatureCallID() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleIdOrSuper"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1635:1: entryRuleIdOrSuper : ruleIdOrSuper EOF ;
+    // InternalCheckCfg.g:1635:1: entryRuleIdOrSuper : ruleIdOrSuper EOF ;
     public final void entryRuleIdOrSuper() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1636:1: ( ruleIdOrSuper EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1637:1: ruleIdOrSuper EOF
+            // InternalCheckCfg.g:1636:1: ( ruleIdOrSuper EOF )
+            // InternalCheckCfg.g:1637:1: ruleIdOrSuper EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIdOrSuperRule()); 
             }
-            pushFollow(FOLLOW_ruleIdOrSuper_in_entryRuleIdOrSuper3432);
+            pushFollow(FOLLOW_1);
             ruleIdOrSuper();
 
             state._fsp--;
@@ -4896,7 +4896,7 @@ public final void entryRuleIdOrSuper() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIdOrSuperRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIdOrSuper3439); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4913,25 +4913,25 @@ public final void entryRuleIdOrSuper() throws RecognitionException {
 
 
     // $ANTLR start "ruleIdOrSuper"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1644:1: ruleIdOrSuper : ( ( rule__IdOrSuper__Alternatives ) ) ;
+    // InternalCheckCfg.g:1644:1: ruleIdOrSuper : ( ( rule__IdOrSuper__Alternatives ) ) ;
     public final void ruleIdOrSuper() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1648:2: ( ( ( rule__IdOrSuper__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1649:1: ( ( rule__IdOrSuper__Alternatives ) )
+            // InternalCheckCfg.g:1648:2: ( ( ( rule__IdOrSuper__Alternatives ) ) )
+            // InternalCheckCfg.g:1649:1: ( ( rule__IdOrSuper__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1649:1: ( ( rule__IdOrSuper__Alternatives ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1650:1: ( rule__IdOrSuper__Alternatives )
+            // InternalCheckCfg.g:1649:1: ( ( rule__IdOrSuper__Alternatives ) )
+            // InternalCheckCfg.g:1650:1: ( rule__IdOrSuper__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIdOrSuperAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1651:1: ( rule__IdOrSuper__Alternatives )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1651:2: rule__IdOrSuper__Alternatives
+            // InternalCheckCfg.g:1651:1: ( rule__IdOrSuper__Alternatives )
+            // InternalCheckCfg.g:1651:2: rule__IdOrSuper__Alternatives
             {
-            pushFollow(FOLLOW_rule__IdOrSuper__Alternatives_in_ruleIdOrSuper3465);
+            pushFollow(FOLLOW_2);
             rule__IdOrSuper__Alternatives();
 
             state._fsp--;
@@ -4964,16 +4964,16 @@ public final void ruleIdOrSuper() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXConstructorCall"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1663:1: entryRuleXConstructorCall : ruleXConstructorCall EOF ;
+    // InternalCheckCfg.g:1663:1: entryRuleXConstructorCall : ruleXConstructorCall EOF ;
     public final void entryRuleXConstructorCall() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1664:1: ( ruleXConstructorCall EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1665:1: ruleXConstructorCall EOF
+            // InternalCheckCfg.g:1664:1: ( ruleXConstructorCall EOF )
+            // InternalCheckCfg.g:1665:1: ruleXConstructorCall EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallRule()); 
             }
-            pushFollow(FOLLOW_ruleXConstructorCall_in_entryRuleXConstructorCall3492);
+            pushFollow(FOLLOW_1);
             ruleXConstructorCall();
 
             state._fsp--;
@@ -4981,7 +4981,7 @@ public final void entryRuleXConstructorCall() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstructorCallRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXConstructorCall3499); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4998,25 +4998,25 @@ public final void entryRuleXConstructorCall() throws RecognitionException {
 
 
     // $ANTLR start "ruleXConstructorCall"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1672:1: ruleXConstructorCall : ( ( rule__XConstructorCall__Group__0 ) ) ;
+    // InternalCheckCfg.g:1672:1: ruleXConstructorCall : ( ( rule__XConstructorCall__Group__0 ) ) ;
     public final void ruleXConstructorCall() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1676:2: ( ( ( rule__XConstructorCall__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1677:1: ( ( rule__XConstructorCall__Group__0 ) )
+            // InternalCheckCfg.g:1676:2: ( ( ( rule__XConstructorCall__Group__0 ) ) )
+            // InternalCheckCfg.g:1677:1: ( ( rule__XConstructorCall__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1677:1: ( ( rule__XConstructorCall__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1678:1: ( rule__XConstructorCall__Group__0 )
+            // InternalCheckCfg.g:1677:1: ( ( rule__XConstructorCall__Group__0 ) )
+            // InternalCheckCfg.g:1678:1: ( rule__XConstructorCall__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1679:1: ( rule__XConstructorCall__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1679:2: rule__XConstructorCall__Group__0
+            // InternalCheckCfg.g:1679:1: ( rule__XConstructorCall__Group__0 )
+            // InternalCheckCfg.g:1679:2: rule__XConstructorCall__Group__0
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__0_in_ruleXConstructorCall3525);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group__0();
 
             state._fsp--;
@@ -5049,16 +5049,16 @@ public final void ruleXConstructorCall() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXBooleanLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1691:1: entryRuleXBooleanLiteral : ruleXBooleanLiteral EOF ;
+    // InternalCheckCfg.g:1691:1: entryRuleXBooleanLiteral : ruleXBooleanLiteral EOF ;
     public final void entryRuleXBooleanLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1692:1: ( ruleXBooleanLiteral EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1693:1: ruleXBooleanLiteral EOF
+            // InternalCheckCfg.g:1692:1: ( ruleXBooleanLiteral EOF )
+            // InternalCheckCfg.g:1693:1: ruleXBooleanLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBooleanLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXBooleanLiteral_in_entryRuleXBooleanLiteral3552);
+            pushFollow(FOLLOW_1);
             ruleXBooleanLiteral();
 
             state._fsp--;
@@ -5066,7 +5066,7 @@ public final void entryRuleXBooleanLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBooleanLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXBooleanLiteral3559); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -5083,25 +5083,25 @@ public final void entryRuleXBooleanLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXBooleanLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1700:1: ruleXBooleanLiteral : ( ( rule__XBooleanLiteral__Group__0 ) ) ;
+    // InternalCheckCfg.g:1700:1: ruleXBooleanLiteral : ( ( rule__XBooleanLiteral__Group__0 ) ) ;
     public final void ruleXBooleanLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1704:2: ( ( ( rule__XBooleanLiteral__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1705:1: ( ( rule__XBooleanLiteral__Group__0 ) )
+            // InternalCheckCfg.g:1704:2: ( ( ( rule__XBooleanLiteral__Group__0 ) ) )
+            // InternalCheckCfg.g:1705:1: ( ( rule__XBooleanLiteral__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1705:1: ( ( rule__XBooleanLiteral__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1706:1: ( rule__XBooleanLiteral__Group__0 )
+            // InternalCheckCfg.g:1705:1: ( ( rule__XBooleanLiteral__Group__0 ) )
+            // InternalCheckCfg.g:1706:1: ( rule__XBooleanLiteral__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBooleanLiteralAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1707:1: ( rule__XBooleanLiteral__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1707:2: rule__XBooleanLiteral__Group__0
+            // InternalCheckCfg.g:1707:1: ( rule__XBooleanLiteral__Group__0 )
+            // InternalCheckCfg.g:1707:2: rule__XBooleanLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__XBooleanLiteral__Group__0_in_ruleXBooleanLiteral3585);
+            pushFollow(FOLLOW_2);
             rule__XBooleanLiteral__Group__0();
 
             state._fsp--;
@@ -5134,16 +5134,16 @@ public final void ruleXBooleanLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXNullLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1719:1: entryRuleXNullLiteral : ruleXNullLiteral EOF ;
+    // InternalCheckCfg.g:1719:1: entryRuleXNullLiteral : ruleXNullLiteral EOF ;
     public final void entryRuleXNullLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1720:1: ( ruleXNullLiteral EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1721:1: ruleXNullLiteral EOF
+            // InternalCheckCfg.g:1720:1: ( ruleXNullLiteral EOF )
+            // InternalCheckCfg.g:1721:1: ruleXNullLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNullLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXNullLiteral_in_entryRuleXNullLiteral3612);
+            pushFollow(FOLLOW_1);
             ruleXNullLiteral();
 
             state._fsp--;
@@ -5151,7 +5151,7 @@ public final void entryRuleXNullLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXNullLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXNullLiteral3619); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -5168,25 +5168,25 @@ public final void entryRuleXNullLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXNullLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1728:1: ruleXNullLiteral : ( ( rule__XNullLiteral__Group__0 ) ) ;
+    // InternalCheckCfg.g:1728:1: ruleXNullLiteral : ( ( rule__XNullLiteral__Group__0 ) ) ;
     public final void ruleXNullLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1732:2: ( ( ( rule__XNullLiteral__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1733:1: ( ( rule__XNullLiteral__Group__0 ) )
+            // InternalCheckCfg.g:1732:2: ( ( ( rule__XNullLiteral__Group__0 ) ) )
+            // InternalCheckCfg.g:1733:1: ( ( rule__XNullLiteral__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1733:1: ( ( rule__XNullLiteral__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1734:1: ( rule__XNullLiteral__Group__0 )
+            // InternalCheckCfg.g:1733:1: ( ( rule__XNullLiteral__Group__0 ) )
+            // InternalCheckCfg.g:1734:1: ( rule__XNullLiteral__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNullLiteralAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1735:1: ( rule__XNullLiteral__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1735:2: rule__XNullLiteral__Group__0
+            // InternalCheckCfg.g:1735:1: ( rule__XNullLiteral__Group__0 )
+            // InternalCheckCfg.g:1735:2: rule__XNullLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__XNullLiteral__Group__0_in_ruleXNullLiteral3645);
+            pushFollow(FOLLOW_2);
             rule__XNullLiteral__Group__0();
 
             state._fsp--;
@@ -5219,16 +5219,16 @@ public final void ruleXNullLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXNumberLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1747:1: entryRuleXNumberLiteral : ruleXNumberLiteral EOF ;
+    // InternalCheckCfg.g:1747:1: entryRuleXNumberLiteral : ruleXNumberLiteral EOF ;
     public final void entryRuleXNumberLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1748:1: ( ruleXNumberLiteral EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1749:1: ruleXNumberLiteral EOF
+            // InternalCheckCfg.g:1748:1: ( ruleXNumberLiteral EOF )
+            // InternalCheckCfg.g:1749:1: ruleXNumberLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNumberLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXNumberLiteral_in_entryRuleXNumberLiteral3672);
+            pushFollow(FOLLOW_1);
             ruleXNumberLiteral();
 
             state._fsp--;
@@ -5236,7 +5236,7 @@ public final void entryRuleXNumberLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXNumberLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXNumberLiteral3679); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -5253,25 +5253,25 @@ public final void entryRuleXNumberLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXNumberLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1756:1: ruleXNumberLiteral : ( ( rule__XNumberLiteral__Group__0 ) ) ;
+    // InternalCheckCfg.g:1756:1: ruleXNumberLiteral : ( ( rule__XNumberLiteral__Group__0 ) ) ;
     public final void ruleXNumberLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1760:2: ( ( ( rule__XNumberLiteral__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1761:1: ( ( rule__XNumberLiteral__Group__0 ) )
+            // InternalCheckCfg.g:1760:2: ( ( ( rule__XNumberLiteral__Group__0 ) ) )
+            // InternalCheckCfg.g:1761:1: ( ( rule__XNumberLiteral__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1761:1: ( ( rule__XNumberLiteral__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1762:1: ( rule__XNumberLiteral__Group__0 )
+            // InternalCheckCfg.g:1761:1: ( ( rule__XNumberLiteral__Group__0 ) )
+            // InternalCheckCfg.g:1762:1: ( rule__XNumberLiteral__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNumberLiteralAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1763:1: ( rule__XNumberLiteral__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1763:2: rule__XNumberLiteral__Group__0
+            // InternalCheckCfg.g:1763:1: ( rule__XNumberLiteral__Group__0 )
+            // InternalCheckCfg.g:1763:2: rule__XNumberLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__XNumberLiteral__Group__0_in_ruleXNumberLiteral3705);
+            pushFollow(FOLLOW_2);
             rule__XNumberLiteral__Group__0();
 
             state._fsp--;
@@ -5304,16 +5304,16 @@ public final void ruleXNumberLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXStringLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1775:1: entryRuleXStringLiteral : ruleXStringLiteral EOF ;
+    // InternalCheckCfg.g:1775:1: entryRuleXStringLiteral : ruleXStringLiteral EOF ;
     public final void entryRuleXStringLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1776:1: ( ruleXStringLiteral EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1777:1: ruleXStringLiteral EOF
+            // InternalCheckCfg.g:1776:1: ( ruleXStringLiteral EOF )
+            // InternalCheckCfg.g:1777:1: ruleXStringLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXStringLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXStringLiteral_in_entryRuleXStringLiteral3732);
+            pushFollow(FOLLOW_1);
             ruleXStringLiteral();
 
             state._fsp--;
@@ -5321,7 +5321,7 @@ public final void entryRuleXStringLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXStringLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXStringLiteral3739); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -5338,25 +5338,25 @@ public final void entryRuleXStringLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXStringLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1784:1: ruleXStringLiteral : ( ( rule__XStringLiteral__Group__0 ) ) ;
+    // InternalCheckCfg.g:1784:1: ruleXStringLiteral : ( ( rule__XStringLiteral__Group__0 ) ) ;
     public final void ruleXStringLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1788:2: ( ( ( rule__XStringLiteral__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1789:1: ( ( rule__XStringLiteral__Group__0 ) )
+            // InternalCheckCfg.g:1788:2: ( ( ( rule__XStringLiteral__Group__0 ) ) )
+            // InternalCheckCfg.g:1789:1: ( ( rule__XStringLiteral__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1789:1: ( ( rule__XStringLiteral__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1790:1: ( rule__XStringLiteral__Group__0 )
+            // InternalCheckCfg.g:1789:1: ( ( rule__XStringLiteral__Group__0 ) )
+            // InternalCheckCfg.g:1790:1: ( rule__XStringLiteral__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXStringLiteralAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1791:1: ( rule__XStringLiteral__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1791:2: rule__XStringLiteral__Group__0
+            // InternalCheckCfg.g:1791:1: ( rule__XStringLiteral__Group__0 )
+            // InternalCheckCfg.g:1791:2: rule__XStringLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__XStringLiteral__Group__0_in_ruleXStringLiteral3765);
+            pushFollow(FOLLOW_2);
             rule__XStringLiteral__Group__0();
 
             state._fsp--;
@@ -5389,16 +5389,16 @@ public final void ruleXStringLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXTypeLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1803:1: entryRuleXTypeLiteral : ruleXTypeLiteral EOF ;
+    // InternalCheckCfg.g:1803:1: entryRuleXTypeLiteral : ruleXTypeLiteral EOF ;
     public final void entryRuleXTypeLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1804:1: ( ruleXTypeLiteral EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1805:1: ruleXTypeLiteral EOF
+            // InternalCheckCfg.g:1804:1: ( ruleXTypeLiteral EOF )
+            // InternalCheckCfg.g:1805:1: ruleXTypeLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXTypeLiteral_in_entryRuleXTypeLiteral3792);
+            pushFollow(FOLLOW_1);
             ruleXTypeLiteral();
 
             state._fsp--;
@@ -5406,7 +5406,7 @@ public final void entryRuleXTypeLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXTypeLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXTypeLiteral3799); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -5423,25 +5423,25 @@ public final void entryRuleXTypeLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXTypeLiteral"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1812:1: ruleXTypeLiteral : ( ( rule__XTypeLiteral__Group__0 ) ) ;
+    // InternalCheckCfg.g:1812:1: ruleXTypeLiteral : ( ( rule__XTypeLiteral__Group__0 ) ) ;
     public final void ruleXTypeLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1816:2: ( ( ( rule__XTypeLiteral__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1817:1: ( ( rule__XTypeLiteral__Group__0 ) )
+            // InternalCheckCfg.g:1816:2: ( ( ( rule__XTypeLiteral__Group__0 ) ) )
+            // InternalCheckCfg.g:1817:1: ( ( rule__XTypeLiteral__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1817:1: ( ( rule__XTypeLiteral__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1818:1: ( rule__XTypeLiteral__Group__0 )
+            // InternalCheckCfg.g:1817:1: ( ( rule__XTypeLiteral__Group__0 ) )
+            // InternalCheckCfg.g:1818:1: ( rule__XTypeLiteral__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1819:1: ( rule__XTypeLiteral__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1819:2: rule__XTypeLiteral__Group__0
+            // InternalCheckCfg.g:1819:1: ( rule__XTypeLiteral__Group__0 )
+            // InternalCheckCfg.g:1819:2: rule__XTypeLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__0_in_ruleXTypeLiteral3825);
+            pushFollow(FOLLOW_2);
             rule__XTypeLiteral__Group__0();
 
             state._fsp--;
@@ -5474,16 +5474,16 @@ public final void ruleXTypeLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXThrowExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1831:1: entryRuleXThrowExpression : ruleXThrowExpression EOF ;
+    // InternalCheckCfg.g:1831:1: entryRuleXThrowExpression : ruleXThrowExpression EOF ;
     public final void entryRuleXThrowExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1832:1: ( ruleXThrowExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1833:1: ruleXThrowExpression EOF
+            // InternalCheckCfg.g:1832:1: ( ruleXThrowExpression EOF )
+            // InternalCheckCfg.g:1833:1: ruleXThrowExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXThrowExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXThrowExpression_in_entryRuleXThrowExpression3852);
+            pushFollow(FOLLOW_1);
             ruleXThrowExpression();
 
             state._fsp--;
@@ -5491,7 +5491,7 @@ public final void entryRuleXThrowExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXThrowExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXThrowExpression3859); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -5508,25 +5508,25 @@ public final void entryRuleXThrowExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXThrowExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1840:1: ruleXThrowExpression : ( ( rule__XThrowExpression__Group__0 ) ) ;
+    // InternalCheckCfg.g:1840:1: ruleXThrowExpression : ( ( rule__XThrowExpression__Group__0 ) ) ;
     public final void ruleXThrowExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1844:2: ( ( ( rule__XThrowExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1845:1: ( ( rule__XThrowExpression__Group__0 ) )
+            // InternalCheckCfg.g:1844:2: ( ( ( rule__XThrowExpression__Group__0 ) ) )
+            // InternalCheckCfg.g:1845:1: ( ( rule__XThrowExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1845:1: ( ( rule__XThrowExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1846:1: ( rule__XThrowExpression__Group__0 )
+            // InternalCheckCfg.g:1845:1: ( ( rule__XThrowExpression__Group__0 ) )
+            // InternalCheckCfg.g:1846:1: ( rule__XThrowExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXThrowExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1847:1: ( rule__XThrowExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1847:2: rule__XThrowExpression__Group__0
+            // InternalCheckCfg.g:1847:1: ( rule__XThrowExpression__Group__0 )
+            // InternalCheckCfg.g:1847:2: rule__XThrowExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XThrowExpression__Group__0_in_ruleXThrowExpression3885);
+            pushFollow(FOLLOW_2);
             rule__XThrowExpression__Group__0();
 
             state._fsp--;
@@ -5559,16 +5559,16 @@ public final void ruleXThrowExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXReturnExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1859:1: entryRuleXReturnExpression : ruleXReturnExpression EOF ;
+    // InternalCheckCfg.g:1859:1: entryRuleXReturnExpression : ruleXReturnExpression EOF ;
     public final void entryRuleXReturnExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1860:1: ( ruleXReturnExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1861:1: ruleXReturnExpression EOF
+            // InternalCheckCfg.g:1860:1: ( ruleXReturnExpression EOF )
+            // InternalCheckCfg.g:1861:1: ruleXReturnExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXReturnExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXReturnExpression_in_entryRuleXReturnExpression3912);
+            pushFollow(FOLLOW_1);
             ruleXReturnExpression();
 
             state._fsp--;
@@ -5576,7 +5576,7 @@ public final void entryRuleXReturnExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXReturnExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXReturnExpression3919); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -5593,25 +5593,25 @@ public final void entryRuleXReturnExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXReturnExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1868:1: ruleXReturnExpression : ( ( rule__XReturnExpression__Group__0 ) ) ;
+    // InternalCheckCfg.g:1868:1: ruleXReturnExpression : ( ( rule__XReturnExpression__Group__0 ) ) ;
     public final void ruleXReturnExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1872:2: ( ( ( rule__XReturnExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1873:1: ( ( rule__XReturnExpression__Group__0 ) )
+            // InternalCheckCfg.g:1872:2: ( ( ( rule__XReturnExpression__Group__0 ) ) )
+            // InternalCheckCfg.g:1873:1: ( ( rule__XReturnExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1873:1: ( ( rule__XReturnExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1874:1: ( rule__XReturnExpression__Group__0 )
+            // InternalCheckCfg.g:1873:1: ( ( rule__XReturnExpression__Group__0 ) )
+            // InternalCheckCfg.g:1874:1: ( rule__XReturnExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXReturnExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1875:1: ( rule__XReturnExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1875:2: rule__XReturnExpression__Group__0
+            // InternalCheckCfg.g:1875:1: ( rule__XReturnExpression__Group__0 )
+            // InternalCheckCfg.g:1875:2: rule__XReturnExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XReturnExpression__Group__0_in_ruleXReturnExpression3945);
+            pushFollow(FOLLOW_2);
             rule__XReturnExpression__Group__0();
 
             state._fsp--;
@@ -5644,16 +5644,16 @@ public final void ruleXReturnExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXTryCatchFinallyExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1887:1: entryRuleXTryCatchFinallyExpression : ruleXTryCatchFinallyExpression EOF ;
+    // InternalCheckCfg.g:1887:1: entryRuleXTryCatchFinallyExpression : ruleXTryCatchFinallyExpression EOF ;
     public final void entryRuleXTryCatchFinallyExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1888:1: ( ruleXTryCatchFinallyExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1889:1: ruleXTryCatchFinallyExpression EOF
+            // InternalCheckCfg.g:1888:1: ( ruleXTryCatchFinallyExpression EOF )
+            // InternalCheckCfg.g:1889:1: ruleXTryCatchFinallyExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXTryCatchFinallyExpression_in_entryRuleXTryCatchFinallyExpression3972);
+            pushFollow(FOLLOW_1);
             ruleXTryCatchFinallyExpression();
 
             state._fsp--;
@@ -5661,7 +5661,7 @@ public final void entryRuleXTryCatchFinallyExpression() throws RecognitionExcept
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXTryCatchFinallyExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXTryCatchFinallyExpression3979); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -5678,25 +5678,25 @@ public final void entryRuleXTryCatchFinallyExpression() throws RecognitionExcept
 
 
     // $ANTLR start "ruleXTryCatchFinallyExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1896:1: ruleXTryCatchFinallyExpression : ( ( rule__XTryCatchFinallyExpression__Group__0 ) ) ;
+    // InternalCheckCfg.g:1896:1: ruleXTryCatchFinallyExpression : ( ( rule__XTryCatchFinallyExpression__Group__0 ) ) ;
     public final void ruleXTryCatchFinallyExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1900:2: ( ( ( rule__XTryCatchFinallyExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1901:1: ( ( rule__XTryCatchFinallyExpression__Group__0 ) )
+            // InternalCheckCfg.g:1900:2: ( ( ( rule__XTryCatchFinallyExpression__Group__0 ) ) )
+            // InternalCheckCfg.g:1901:1: ( ( rule__XTryCatchFinallyExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1901:1: ( ( rule__XTryCatchFinallyExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1902:1: ( rule__XTryCatchFinallyExpression__Group__0 )
+            // InternalCheckCfg.g:1901:1: ( ( rule__XTryCatchFinallyExpression__Group__0 ) )
+            // InternalCheckCfg.g:1902:1: ( rule__XTryCatchFinallyExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1903:1: ( rule__XTryCatchFinallyExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1903:2: rule__XTryCatchFinallyExpression__Group__0
+            // InternalCheckCfg.g:1903:1: ( rule__XTryCatchFinallyExpression__Group__0 )
+            // InternalCheckCfg.g:1903:2: rule__XTryCatchFinallyExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group__0_in_ruleXTryCatchFinallyExpression4005);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Group__0();
 
             state._fsp--;
@@ -5729,16 +5729,16 @@ public final void ruleXTryCatchFinallyExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXSynchronizedExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1915:1: entryRuleXSynchronizedExpression : ruleXSynchronizedExpression EOF ;
+    // InternalCheckCfg.g:1915:1: entryRuleXSynchronizedExpression : ruleXSynchronizedExpression EOF ;
     public final void entryRuleXSynchronizedExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1916:1: ( ruleXSynchronizedExpression EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1917:1: ruleXSynchronizedExpression EOF
+            // InternalCheckCfg.g:1916:1: ( ruleXSynchronizedExpression EOF )
+            // InternalCheckCfg.g:1917:1: ruleXSynchronizedExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXSynchronizedExpression_in_entryRuleXSynchronizedExpression4032);
+            pushFollow(FOLLOW_1);
             ruleXSynchronizedExpression();
 
             state._fsp--;
@@ -5746,7 +5746,7 @@ public final void entryRuleXSynchronizedExpression() throws RecognitionException
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSynchronizedExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXSynchronizedExpression4039); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -5763,25 +5763,25 @@ public final void entryRuleXSynchronizedExpression() throws RecognitionException
 
 
     // $ANTLR start "ruleXSynchronizedExpression"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1924:1: ruleXSynchronizedExpression : ( ( rule__XSynchronizedExpression__Group__0 ) ) ;
+    // InternalCheckCfg.g:1924:1: ruleXSynchronizedExpression : ( ( rule__XSynchronizedExpression__Group__0 ) ) ;
     public final void ruleXSynchronizedExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1928:2: ( ( ( rule__XSynchronizedExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1929:1: ( ( rule__XSynchronizedExpression__Group__0 ) )
+            // InternalCheckCfg.g:1928:2: ( ( ( rule__XSynchronizedExpression__Group__0 ) ) )
+            // InternalCheckCfg.g:1929:1: ( ( rule__XSynchronizedExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1929:1: ( ( rule__XSynchronizedExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1930:1: ( rule__XSynchronizedExpression__Group__0 )
+            // InternalCheckCfg.g:1929:1: ( ( rule__XSynchronizedExpression__Group__0 ) )
+            // InternalCheckCfg.g:1930:1: ( rule__XSynchronizedExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1931:1: ( rule__XSynchronizedExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1931:2: rule__XSynchronizedExpression__Group__0
+            // InternalCheckCfg.g:1931:1: ( rule__XSynchronizedExpression__Group__0 )
+            // InternalCheckCfg.g:1931:2: rule__XSynchronizedExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group__0_in_ruleXSynchronizedExpression4065);
+            pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group__0();
 
             state._fsp--;
@@ -5814,16 +5814,16 @@ public final void ruleXSynchronizedExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXCatchClause"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1943:1: entryRuleXCatchClause : ruleXCatchClause EOF ;
+    // InternalCheckCfg.g:1943:1: entryRuleXCatchClause : ruleXCatchClause EOF ;
     public final void entryRuleXCatchClause() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1944:1: ( ruleXCatchClause EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1945:1: ruleXCatchClause EOF
+            // InternalCheckCfg.g:1944:1: ( ruleXCatchClause EOF )
+            // InternalCheckCfg.g:1945:1: ruleXCatchClause EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseRule()); 
             }
-            pushFollow(FOLLOW_ruleXCatchClause_in_entryRuleXCatchClause4092);
+            pushFollow(FOLLOW_1);
             ruleXCatchClause();
 
             state._fsp--;
@@ -5831,7 +5831,7 @@ public final void entryRuleXCatchClause() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXCatchClauseRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXCatchClause4099); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -5848,25 +5848,25 @@ public final void entryRuleXCatchClause() throws RecognitionException {
 
 
     // $ANTLR start "ruleXCatchClause"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1952:1: ruleXCatchClause : ( ( rule__XCatchClause__Group__0 ) ) ;
+    // InternalCheckCfg.g:1952:1: ruleXCatchClause : ( ( rule__XCatchClause__Group__0 ) ) ;
     public final void ruleXCatchClause() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1956:2: ( ( ( rule__XCatchClause__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1957:1: ( ( rule__XCatchClause__Group__0 ) )
+            // InternalCheckCfg.g:1956:2: ( ( ( rule__XCatchClause__Group__0 ) ) )
+            // InternalCheckCfg.g:1957:1: ( ( rule__XCatchClause__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1957:1: ( ( rule__XCatchClause__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1958:1: ( rule__XCatchClause__Group__0 )
+            // InternalCheckCfg.g:1957:1: ( ( rule__XCatchClause__Group__0 ) )
+            // InternalCheckCfg.g:1958:1: ( rule__XCatchClause__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1959:1: ( rule__XCatchClause__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1959:2: rule__XCatchClause__Group__0
+            // InternalCheckCfg.g:1959:1: ( rule__XCatchClause__Group__0 )
+            // InternalCheckCfg.g:1959:2: rule__XCatchClause__Group__0
             {
-            pushFollow(FOLLOW_rule__XCatchClause__Group__0_in_ruleXCatchClause4125);
+            pushFollow(FOLLOW_2);
             rule__XCatchClause__Group__0();
 
             state._fsp--;
@@ -5899,16 +5899,16 @@ public final void ruleXCatchClause() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleQualifiedName"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1971:1: entryRuleQualifiedName : ruleQualifiedName EOF ;
+    // InternalCheckCfg.g:1971:1: entryRuleQualifiedName : ruleQualifiedName EOF ;
     public final void entryRuleQualifiedName() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1972:1: ( ruleQualifiedName EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1973:1: ruleQualifiedName EOF
+            // InternalCheckCfg.g:1972:1: ( ruleQualifiedName EOF )
+            // InternalCheckCfg.g:1973:1: ruleQualifiedName EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameRule()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName4152);
+            pushFollow(FOLLOW_1);
             ruleQualifiedName();
 
             state._fsp--;
@@ -5916,7 +5916,7 @@ public final void entryRuleQualifiedName() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getQualifiedNameRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedName4159); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -5933,25 +5933,25 @@ public final void entryRuleQualifiedName() throws RecognitionException {
 
 
     // $ANTLR start "ruleQualifiedName"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1980:1: ruleQualifiedName : ( ( rule__QualifiedName__Group__0 ) ) ;
+    // InternalCheckCfg.g:1980:1: ruleQualifiedName : ( ( rule__QualifiedName__Group__0 ) ) ;
     public final void ruleQualifiedName() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1984:2: ( ( ( rule__QualifiedName__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1985:1: ( ( rule__QualifiedName__Group__0 ) )
+            // InternalCheckCfg.g:1984:2: ( ( ( rule__QualifiedName__Group__0 ) ) )
+            // InternalCheckCfg.g:1985:1: ( ( rule__QualifiedName__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1985:1: ( ( rule__QualifiedName__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1986:1: ( rule__QualifiedName__Group__0 )
+            // InternalCheckCfg.g:1985:1: ( ( rule__QualifiedName__Group__0 ) )
+            // InternalCheckCfg.g:1986:1: ( rule__QualifiedName__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1987:1: ( rule__QualifiedName__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1987:2: rule__QualifiedName__Group__0
+            // InternalCheckCfg.g:1987:1: ( rule__QualifiedName__Group__0 )
+            // InternalCheckCfg.g:1987:2: rule__QualifiedName__Group__0
             {
-            pushFollow(FOLLOW_rule__QualifiedName__Group__0_in_ruleQualifiedName4185);
+            pushFollow(FOLLOW_2);
             rule__QualifiedName__Group__0();
 
             state._fsp--;
@@ -5984,19 +5984,19 @@ public final void ruleQualifiedName() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleNumber"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:1999:1: entryRuleNumber : ruleNumber EOF ;
+    // InternalCheckCfg.g:1999:1: entryRuleNumber : ruleNumber EOF ;
     public final void entryRuleNumber() throws RecognitionException {
 
         	HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
 
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2003:1: ( ruleNumber EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2004:1: ruleNumber EOF
+            // InternalCheckCfg.g:2003:1: ( ruleNumber EOF )
+            // InternalCheckCfg.g:2004:1: ruleNumber EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNumberRule()); 
             }
-            pushFollow(FOLLOW_ruleNumber_in_entryRuleNumber4217);
+            pushFollow(FOLLOW_1);
             ruleNumber();
 
             state._fsp--;
@@ -6004,7 +6004,7 @@ public final void entryRuleNumber() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getNumberRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNumber4224); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -6024,26 +6024,26 @@ public final void entryRuleNumber() throws RecognitionException {
 
 
     // $ANTLR start "ruleNumber"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2014:1: ruleNumber : ( ( rule__Number__Alternatives ) ) ;
+    // InternalCheckCfg.g:2014:1: ruleNumber : ( ( rule__Number__Alternatives ) ) ;
     public final void ruleNumber() throws RecognitionException {
 
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2019:2: ( ( ( rule__Number__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2020:1: ( ( rule__Number__Alternatives ) )
+            // InternalCheckCfg.g:2019:2: ( ( ( rule__Number__Alternatives ) ) )
+            // InternalCheckCfg.g:2020:1: ( ( rule__Number__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2020:1: ( ( rule__Number__Alternatives ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2021:1: ( rule__Number__Alternatives )
+            // InternalCheckCfg.g:2020:1: ( ( rule__Number__Alternatives ) )
+            // InternalCheckCfg.g:2021:1: ( rule__Number__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNumberAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2022:1: ( rule__Number__Alternatives )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2022:2: rule__Number__Alternatives
+            // InternalCheckCfg.g:2022:1: ( rule__Number__Alternatives )
+            // InternalCheckCfg.g:2022:2: rule__Number__Alternatives
             {
-            pushFollow(FOLLOW_rule__Number__Alternatives_in_ruleNumber4254);
+            pushFollow(FOLLOW_2);
             rule__Number__Alternatives();
 
             state._fsp--;
@@ -6077,16 +6077,16 @@ public final void ruleNumber() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleJvmTypeReference"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2037:1: entryRuleJvmTypeReference : ruleJvmTypeReference EOF ;
+    // InternalCheckCfg.g:2037:1: entryRuleJvmTypeReference : ruleJvmTypeReference EOF ;
     public final void entryRuleJvmTypeReference() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2038:1: ( ruleJvmTypeReference EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2039:1: ruleJvmTypeReference EOF
+            // InternalCheckCfg.g:2038:1: ( ruleJvmTypeReference EOF )
+            // InternalCheckCfg.g:2039:1: ruleJvmTypeReference EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmTypeReferenceRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_entryRuleJvmTypeReference4283);
+            pushFollow(FOLLOW_1);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -6094,7 +6094,7 @@ public final void entryRuleJvmTypeReference() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmTypeReferenceRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmTypeReference4290); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -6111,25 +6111,25 @@ public final void entryRuleJvmTypeReference() throws RecognitionException {
 
 
     // $ANTLR start "ruleJvmTypeReference"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2046:1: ruleJvmTypeReference : ( ( rule__JvmTypeReference__Alternatives ) ) ;
+    // InternalCheckCfg.g:2046:1: ruleJvmTypeReference : ( ( rule__JvmTypeReference__Alternatives ) ) ;
     public final void ruleJvmTypeReference() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2050:2: ( ( ( rule__JvmTypeReference__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2051:1: ( ( rule__JvmTypeReference__Alternatives ) )
+            // InternalCheckCfg.g:2050:2: ( ( ( rule__JvmTypeReference__Alternatives ) ) )
+            // InternalCheckCfg.g:2051:1: ( ( rule__JvmTypeReference__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2051:1: ( ( rule__JvmTypeReference__Alternatives ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2052:1: ( rule__JvmTypeReference__Alternatives )
+            // InternalCheckCfg.g:2051:1: ( ( rule__JvmTypeReference__Alternatives ) )
+            // InternalCheckCfg.g:2052:1: ( rule__JvmTypeReference__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmTypeReferenceAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2053:1: ( rule__JvmTypeReference__Alternatives )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2053:2: rule__JvmTypeReference__Alternatives
+            // InternalCheckCfg.g:2053:1: ( rule__JvmTypeReference__Alternatives )
+            // InternalCheckCfg.g:2053:2: rule__JvmTypeReference__Alternatives
             {
-            pushFollow(FOLLOW_rule__JvmTypeReference__Alternatives_in_ruleJvmTypeReference4316);
+            pushFollow(FOLLOW_2);
             rule__JvmTypeReference__Alternatives();
 
             state._fsp--;
@@ -6162,16 +6162,16 @@ public final void ruleJvmTypeReference() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleArrayBrackets"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2065:1: entryRuleArrayBrackets : ruleArrayBrackets EOF ;
+    // InternalCheckCfg.g:2065:1: entryRuleArrayBrackets : ruleArrayBrackets EOF ;
     public final void entryRuleArrayBrackets() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2066:1: ( ruleArrayBrackets EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2067:1: ruleArrayBrackets EOF
+            // InternalCheckCfg.g:2066:1: ( ruleArrayBrackets EOF )
+            // InternalCheckCfg.g:2067:1: ruleArrayBrackets EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getArrayBracketsRule()); 
             }
-            pushFollow(FOLLOW_ruleArrayBrackets_in_entryRuleArrayBrackets4343);
+            pushFollow(FOLLOW_1);
             ruleArrayBrackets();
 
             state._fsp--;
@@ -6179,7 +6179,7 @@ public final void entryRuleArrayBrackets() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getArrayBracketsRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleArrayBrackets4350); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -6196,25 +6196,25 @@ public final void entryRuleArrayBrackets() throws RecognitionException {
 
 
     // $ANTLR start "ruleArrayBrackets"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2074:1: ruleArrayBrackets : ( ( rule__ArrayBrackets__Group__0 ) ) ;
+    // InternalCheckCfg.g:2074:1: ruleArrayBrackets : ( ( rule__ArrayBrackets__Group__0 ) ) ;
     public final void ruleArrayBrackets() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2078:2: ( ( ( rule__ArrayBrackets__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2079:1: ( ( rule__ArrayBrackets__Group__0 ) )
+            // InternalCheckCfg.g:2078:2: ( ( ( rule__ArrayBrackets__Group__0 ) ) )
+            // InternalCheckCfg.g:2079:1: ( ( rule__ArrayBrackets__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2079:1: ( ( rule__ArrayBrackets__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2080:1: ( rule__ArrayBrackets__Group__0 )
+            // InternalCheckCfg.g:2079:1: ( ( rule__ArrayBrackets__Group__0 ) )
+            // InternalCheckCfg.g:2080:1: ( rule__ArrayBrackets__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getArrayBracketsAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2081:1: ( rule__ArrayBrackets__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2081:2: rule__ArrayBrackets__Group__0
+            // InternalCheckCfg.g:2081:1: ( rule__ArrayBrackets__Group__0 )
+            // InternalCheckCfg.g:2081:2: rule__ArrayBrackets__Group__0
             {
-            pushFollow(FOLLOW_rule__ArrayBrackets__Group__0_in_ruleArrayBrackets4376);
+            pushFollow(FOLLOW_2);
             rule__ArrayBrackets__Group__0();
 
             state._fsp--;
@@ -6247,16 +6247,16 @@ public final void ruleArrayBrackets() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXFunctionTypeRef"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2093:1: entryRuleXFunctionTypeRef : ruleXFunctionTypeRef EOF ;
+    // InternalCheckCfg.g:2093:1: entryRuleXFunctionTypeRef : ruleXFunctionTypeRef EOF ;
     public final void entryRuleXFunctionTypeRef() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2094:1: ( ruleXFunctionTypeRef EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2095:1: ruleXFunctionTypeRef EOF
+            // InternalCheckCfg.g:2094:1: ( ruleXFunctionTypeRef EOF )
+            // InternalCheckCfg.g:2095:1: ruleXFunctionTypeRef EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefRule()); 
             }
-            pushFollow(FOLLOW_ruleXFunctionTypeRef_in_entryRuleXFunctionTypeRef4403);
+            pushFollow(FOLLOW_1);
             ruleXFunctionTypeRef();
 
             state._fsp--;
@@ -6264,7 +6264,7 @@ public final void entryRuleXFunctionTypeRef() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFunctionTypeRefRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXFunctionTypeRef4410); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -6281,25 +6281,25 @@ public final void entryRuleXFunctionTypeRef() throws RecognitionException {
 
 
     // $ANTLR start "ruleXFunctionTypeRef"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2102:1: ruleXFunctionTypeRef : ( ( rule__XFunctionTypeRef__Group__0 ) ) ;
+    // InternalCheckCfg.g:2102:1: ruleXFunctionTypeRef : ( ( rule__XFunctionTypeRef__Group__0 ) ) ;
     public final void ruleXFunctionTypeRef() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2106:2: ( ( ( rule__XFunctionTypeRef__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2107:1: ( ( rule__XFunctionTypeRef__Group__0 ) )
+            // InternalCheckCfg.g:2106:2: ( ( ( rule__XFunctionTypeRef__Group__0 ) ) )
+            // InternalCheckCfg.g:2107:1: ( ( rule__XFunctionTypeRef__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2107:1: ( ( rule__XFunctionTypeRef__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2108:1: ( rule__XFunctionTypeRef__Group__0 )
+            // InternalCheckCfg.g:2107:1: ( ( rule__XFunctionTypeRef__Group__0 ) )
+            // InternalCheckCfg.g:2108:1: ( rule__XFunctionTypeRef__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2109:1: ( rule__XFunctionTypeRef__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2109:2: rule__XFunctionTypeRef__Group__0
+            // InternalCheckCfg.g:2109:1: ( rule__XFunctionTypeRef__Group__0 )
+            // InternalCheckCfg.g:2109:2: rule__XFunctionTypeRef__Group__0
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group__0_in_ruleXFunctionTypeRef4436);
+            pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__Group__0();
 
             state._fsp--;
@@ -6332,16 +6332,16 @@ public final void ruleXFunctionTypeRef() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleJvmParameterizedTypeReference"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2121:1: entryRuleJvmParameterizedTypeReference : ruleJvmParameterizedTypeReference EOF ;
+    // InternalCheckCfg.g:2121:1: entryRuleJvmParameterizedTypeReference : ruleJvmParameterizedTypeReference EOF ;
     public final void entryRuleJvmParameterizedTypeReference() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2122:1: ( ruleJvmParameterizedTypeReference EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2123:1: ruleJvmParameterizedTypeReference EOF
+            // InternalCheckCfg.g:2122:1: ( ruleJvmParameterizedTypeReference EOF )
+            // InternalCheckCfg.g:2123:1: ruleJvmParameterizedTypeReference EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmParameterizedTypeReference_in_entryRuleJvmParameterizedTypeReference4463);
+            pushFollow(FOLLOW_1);
             ruleJvmParameterizedTypeReference();
 
             state._fsp--;
@@ -6349,7 +6349,7 @@ public final void entryRuleJvmParameterizedTypeReference() throws RecognitionExc
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmParameterizedTypeReferenceRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmParameterizedTypeReference4470); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -6366,25 +6366,25 @@ public final void entryRuleJvmParameterizedTypeReference() throws RecognitionExc
 
 
     // $ANTLR start "ruleJvmParameterizedTypeReference"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2130:1: ruleJvmParameterizedTypeReference : ( ( rule__JvmParameterizedTypeReference__Group__0 ) ) ;
+    // InternalCheckCfg.g:2130:1: ruleJvmParameterizedTypeReference : ( ( rule__JvmParameterizedTypeReference__Group__0 ) ) ;
     public final void ruleJvmParameterizedTypeReference() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2134:2: ( ( ( rule__JvmParameterizedTypeReference__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2135:1: ( ( rule__JvmParameterizedTypeReference__Group__0 ) )
+            // InternalCheckCfg.g:2134:2: ( ( ( rule__JvmParameterizedTypeReference__Group__0 ) ) )
+            // InternalCheckCfg.g:2135:1: ( ( rule__JvmParameterizedTypeReference__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2135:1: ( ( rule__JvmParameterizedTypeReference__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2136:1: ( rule__JvmParameterizedTypeReference__Group__0 )
+            // InternalCheckCfg.g:2135:1: ( ( rule__JvmParameterizedTypeReference__Group__0 ) )
+            // InternalCheckCfg.g:2136:1: ( rule__JvmParameterizedTypeReference__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2137:1: ( rule__JvmParameterizedTypeReference__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2137:2: rule__JvmParameterizedTypeReference__Group__0
+            // InternalCheckCfg.g:2137:1: ( rule__JvmParameterizedTypeReference__Group__0 )
+            // InternalCheckCfg.g:2137:2: rule__JvmParameterizedTypeReference__Group__0
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group__0_in_ruleJvmParameterizedTypeReference4496);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group__0();
 
             state._fsp--;
@@ -6417,16 +6417,16 @@ public final void ruleJvmParameterizedTypeReference() throws RecognitionExceptio
 
 
     // $ANTLR start "entryRuleJvmArgumentTypeReference"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2149:1: entryRuleJvmArgumentTypeReference : ruleJvmArgumentTypeReference EOF ;
+    // InternalCheckCfg.g:2149:1: entryRuleJvmArgumentTypeReference : ruleJvmArgumentTypeReference EOF ;
     public final void entryRuleJvmArgumentTypeReference() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2150:1: ( ruleJvmArgumentTypeReference EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2151:1: ruleJvmArgumentTypeReference EOF
+            // InternalCheckCfg.g:2150:1: ( ruleJvmArgumentTypeReference EOF )
+            // InternalCheckCfg.g:2151:1: ruleJvmArgumentTypeReference EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmArgumentTypeReferenceRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_entryRuleJvmArgumentTypeReference4523);
+            pushFollow(FOLLOW_1);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -6434,7 +6434,7 @@ public final void entryRuleJvmArgumentTypeReference() throws RecognitionExceptio
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmArgumentTypeReferenceRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmArgumentTypeReference4530); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -6451,25 +6451,25 @@ public final void entryRuleJvmArgumentTypeReference() throws RecognitionExceptio
 
 
     // $ANTLR start "ruleJvmArgumentTypeReference"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2158:1: ruleJvmArgumentTypeReference : ( ( rule__JvmArgumentTypeReference__Alternatives ) ) ;
+    // InternalCheckCfg.g:2158:1: ruleJvmArgumentTypeReference : ( ( rule__JvmArgumentTypeReference__Alternatives ) ) ;
     public final void ruleJvmArgumentTypeReference() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2162:2: ( ( ( rule__JvmArgumentTypeReference__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2163:1: ( ( rule__JvmArgumentTypeReference__Alternatives ) )
+            // InternalCheckCfg.g:2162:2: ( ( ( rule__JvmArgumentTypeReference__Alternatives ) ) )
+            // InternalCheckCfg.g:2163:1: ( ( rule__JvmArgumentTypeReference__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2163:1: ( ( rule__JvmArgumentTypeReference__Alternatives ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2164:1: ( rule__JvmArgumentTypeReference__Alternatives )
+            // InternalCheckCfg.g:2163:1: ( ( rule__JvmArgumentTypeReference__Alternatives ) )
+            // InternalCheckCfg.g:2164:1: ( rule__JvmArgumentTypeReference__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmArgumentTypeReferenceAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2165:1: ( rule__JvmArgumentTypeReference__Alternatives )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2165:2: rule__JvmArgumentTypeReference__Alternatives
+            // InternalCheckCfg.g:2165:1: ( rule__JvmArgumentTypeReference__Alternatives )
+            // InternalCheckCfg.g:2165:2: rule__JvmArgumentTypeReference__Alternatives
             {
-            pushFollow(FOLLOW_rule__JvmArgumentTypeReference__Alternatives_in_ruleJvmArgumentTypeReference4556);
+            pushFollow(FOLLOW_2);
             rule__JvmArgumentTypeReference__Alternatives();
 
             state._fsp--;
@@ -6502,16 +6502,16 @@ public final void ruleJvmArgumentTypeReference() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleJvmWildcardTypeReference"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2177:1: entryRuleJvmWildcardTypeReference : ruleJvmWildcardTypeReference EOF ;
+    // InternalCheckCfg.g:2177:1: entryRuleJvmWildcardTypeReference : ruleJvmWildcardTypeReference EOF ;
     public final void entryRuleJvmWildcardTypeReference() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2178:1: ( ruleJvmWildcardTypeReference EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2179:1: ruleJvmWildcardTypeReference EOF
+            // InternalCheckCfg.g:2178:1: ( ruleJvmWildcardTypeReference EOF )
+            // InternalCheckCfg.g:2179:1: ruleJvmWildcardTypeReference EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmWildcardTypeReference_in_entryRuleJvmWildcardTypeReference4583);
+            pushFollow(FOLLOW_1);
             ruleJvmWildcardTypeReference();
 
             state._fsp--;
@@ -6519,7 +6519,7 @@ public final void entryRuleJvmWildcardTypeReference() throws RecognitionExceptio
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmWildcardTypeReferenceRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmWildcardTypeReference4590); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -6536,25 +6536,25 @@ public final void entryRuleJvmWildcardTypeReference() throws RecognitionExceptio
 
 
     // $ANTLR start "ruleJvmWildcardTypeReference"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2186:1: ruleJvmWildcardTypeReference : ( ( rule__JvmWildcardTypeReference__Group__0 ) ) ;
+    // InternalCheckCfg.g:2186:1: ruleJvmWildcardTypeReference : ( ( rule__JvmWildcardTypeReference__Group__0 ) ) ;
     public final void ruleJvmWildcardTypeReference() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2190:2: ( ( ( rule__JvmWildcardTypeReference__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2191:1: ( ( rule__JvmWildcardTypeReference__Group__0 ) )
+            // InternalCheckCfg.g:2190:2: ( ( ( rule__JvmWildcardTypeReference__Group__0 ) ) )
+            // InternalCheckCfg.g:2191:1: ( ( rule__JvmWildcardTypeReference__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2191:1: ( ( rule__JvmWildcardTypeReference__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2192:1: ( rule__JvmWildcardTypeReference__Group__0 )
+            // InternalCheckCfg.g:2191:1: ( ( rule__JvmWildcardTypeReference__Group__0 ) )
+            // InternalCheckCfg.g:2192:1: ( rule__JvmWildcardTypeReference__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2193:1: ( rule__JvmWildcardTypeReference__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2193:2: rule__JvmWildcardTypeReference__Group__0
+            // InternalCheckCfg.g:2193:1: ( rule__JvmWildcardTypeReference__Group__0 )
+            // InternalCheckCfg.g:2193:2: rule__JvmWildcardTypeReference__Group__0
             {
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group__0_in_ruleJvmWildcardTypeReference4616);
+            pushFollow(FOLLOW_2);
             rule__JvmWildcardTypeReference__Group__0();
 
             state._fsp--;
@@ -6587,16 +6587,16 @@ public final void ruleJvmWildcardTypeReference() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleJvmUpperBound"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2205:1: entryRuleJvmUpperBound : ruleJvmUpperBound EOF ;
+    // InternalCheckCfg.g:2205:1: entryRuleJvmUpperBound : ruleJvmUpperBound EOF ;
     public final void entryRuleJvmUpperBound() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2206:1: ( ruleJvmUpperBound EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2207:1: ruleJvmUpperBound EOF
+            // InternalCheckCfg.g:2206:1: ( ruleJvmUpperBound EOF )
+            // InternalCheckCfg.g:2207:1: ruleJvmUpperBound EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmUpperBound_in_entryRuleJvmUpperBound4643);
+            pushFollow(FOLLOW_1);
             ruleJvmUpperBound();
 
             state._fsp--;
@@ -6604,7 +6604,7 @@ public final void entryRuleJvmUpperBound() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmUpperBoundRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmUpperBound4650); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -6621,25 +6621,25 @@ public final void entryRuleJvmUpperBound() throws RecognitionException {
 
 
     // $ANTLR start "ruleJvmUpperBound"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2214:1: ruleJvmUpperBound : ( ( rule__JvmUpperBound__Group__0 ) ) ;
+    // InternalCheckCfg.g:2214:1: ruleJvmUpperBound : ( ( rule__JvmUpperBound__Group__0 ) ) ;
     public final void ruleJvmUpperBound() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2218:2: ( ( ( rule__JvmUpperBound__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2219:1: ( ( rule__JvmUpperBound__Group__0 ) )
+            // InternalCheckCfg.g:2218:2: ( ( ( rule__JvmUpperBound__Group__0 ) ) )
+            // InternalCheckCfg.g:2219:1: ( ( rule__JvmUpperBound__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2219:1: ( ( rule__JvmUpperBound__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2220:1: ( rule__JvmUpperBound__Group__0 )
+            // InternalCheckCfg.g:2219:1: ( ( rule__JvmUpperBound__Group__0 ) )
+            // InternalCheckCfg.g:2220:1: ( rule__JvmUpperBound__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2221:1: ( rule__JvmUpperBound__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2221:2: rule__JvmUpperBound__Group__0
+            // InternalCheckCfg.g:2221:1: ( rule__JvmUpperBound__Group__0 )
+            // InternalCheckCfg.g:2221:2: rule__JvmUpperBound__Group__0
             {
-            pushFollow(FOLLOW_rule__JvmUpperBound__Group__0_in_ruleJvmUpperBound4676);
+            pushFollow(FOLLOW_2);
             rule__JvmUpperBound__Group__0();
 
             state._fsp--;
@@ -6672,16 +6672,16 @@ public final void ruleJvmUpperBound() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleJvmUpperBoundAnded"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2233:1: entryRuleJvmUpperBoundAnded : ruleJvmUpperBoundAnded EOF ;
+    // InternalCheckCfg.g:2233:1: entryRuleJvmUpperBoundAnded : ruleJvmUpperBoundAnded EOF ;
     public final void entryRuleJvmUpperBoundAnded() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2234:1: ( ruleJvmUpperBoundAnded EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2235:1: ruleJvmUpperBoundAnded EOF
+            // InternalCheckCfg.g:2234:1: ( ruleJvmUpperBoundAnded EOF )
+            // InternalCheckCfg.g:2235:1: ruleJvmUpperBoundAnded EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAndedRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmUpperBoundAnded_in_entryRuleJvmUpperBoundAnded4703);
+            pushFollow(FOLLOW_1);
             ruleJvmUpperBoundAnded();
 
             state._fsp--;
@@ -6689,7 +6689,7 @@ public final void entryRuleJvmUpperBoundAnded() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmUpperBoundAndedRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmUpperBoundAnded4710); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -6706,25 +6706,25 @@ public final void entryRuleJvmUpperBoundAnded() throws RecognitionException {
 
 
     // $ANTLR start "ruleJvmUpperBoundAnded"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2242:1: ruleJvmUpperBoundAnded : ( ( rule__JvmUpperBoundAnded__Group__0 ) ) ;
+    // InternalCheckCfg.g:2242:1: ruleJvmUpperBoundAnded : ( ( rule__JvmUpperBoundAnded__Group__0 ) ) ;
     public final void ruleJvmUpperBoundAnded() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2246:2: ( ( ( rule__JvmUpperBoundAnded__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2247:1: ( ( rule__JvmUpperBoundAnded__Group__0 ) )
+            // InternalCheckCfg.g:2246:2: ( ( ( rule__JvmUpperBoundAnded__Group__0 ) ) )
+            // InternalCheckCfg.g:2247:1: ( ( rule__JvmUpperBoundAnded__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2247:1: ( ( rule__JvmUpperBoundAnded__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2248:1: ( rule__JvmUpperBoundAnded__Group__0 )
+            // InternalCheckCfg.g:2247:1: ( ( rule__JvmUpperBoundAnded__Group__0 ) )
+            // InternalCheckCfg.g:2248:1: ( rule__JvmUpperBoundAnded__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAndedAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2249:1: ( rule__JvmUpperBoundAnded__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2249:2: rule__JvmUpperBoundAnded__Group__0
+            // InternalCheckCfg.g:2249:1: ( rule__JvmUpperBoundAnded__Group__0 )
+            // InternalCheckCfg.g:2249:2: rule__JvmUpperBoundAnded__Group__0
             {
-            pushFollow(FOLLOW_rule__JvmUpperBoundAnded__Group__0_in_ruleJvmUpperBoundAnded4736);
+            pushFollow(FOLLOW_2);
             rule__JvmUpperBoundAnded__Group__0();
 
             state._fsp--;
@@ -6757,16 +6757,16 @@ public final void ruleJvmUpperBoundAnded() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleJvmLowerBound"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2261:1: entryRuleJvmLowerBound : ruleJvmLowerBound EOF ;
+    // InternalCheckCfg.g:2261:1: entryRuleJvmLowerBound : ruleJvmLowerBound EOF ;
     public final void entryRuleJvmLowerBound() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2262:1: ( ruleJvmLowerBound EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2263:1: ruleJvmLowerBound EOF
+            // InternalCheckCfg.g:2262:1: ( ruleJvmLowerBound EOF )
+            // InternalCheckCfg.g:2263:1: ruleJvmLowerBound EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmLowerBound_in_entryRuleJvmLowerBound4763);
+            pushFollow(FOLLOW_1);
             ruleJvmLowerBound();
 
             state._fsp--;
@@ -6774,7 +6774,7 @@ public final void entryRuleJvmLowerBound() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmLowerBoundRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmLowerBound4770); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -6791,25 +6791,25 @@ public final void entryRuleJvmLowerBound() throws RecognitionException {
 
 
     // $ANTLR start "ruleJvmLowerBound"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2270:1: ruleJvmLowerBound : ( ( rule__JvmLowerBound__Group__0 ) ) ;
+    // InternalCheckCfg.g:2270:1: ruleJvmLowerBound : ( ( rule__JvmLowerBound__Group__0 ) ) ;
     public final void ruleJvmLowerBound() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2274:2: ( ( ( rule__JvmLowerBound__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2275:1: ( ( rule__JvmLowerBound__Group__0 ) )
+            // InternalCheckCfg.g:2274:2: ( ( ( rule__JvmLowerBound__Group__0 ) ) )
+            // InternalCheckCfg.g:2275:1: ( ( rule__JvmLowerBound__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2275:1: ( ( rule__JvmLowerBound__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2276:1: ( rule__JvmLowerBound__Group__0 )
+            // InternalCheckCfg.g:2275:1: ( ( rule__JvmLowerBound__Group__0 ) )
+            // InternalCheckCfg.g:2276:1: ( rule__JvmLowerBound__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2277:1: ( rule__JvmLowerBound__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2277:2: rule__JvmLowerBound__Group__0
+            // InternalCheckCfg.g:2277:1: ( rule__JvmLowerBound__Group__0 )
+            // InternalCheckCfg.g:2277:2: rule__JvmLowerBound__Group__0
             {
-            pushFollow(FOLLOW_rule__JvmLowerBound__Group__0_in_ruleJvmLowerBound4796);
+            pushFollow(FOLLOW_2);
             rule__JvmLowerBound__Group__0();
 
             state._fsp--;
@@ -6842,16 +6842,16 @@ public final void ruleJvmLowerBound() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleJvmLowerBoundAnded"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2289:1: entryRuleJvmLowerBoundAnded : ruleJvmLowerBoundAnded EOF ;
+    // InternalCheckCfg.g:2289:1: entryRuleJvmLowerBoundAnded : ruleJvmLowerBoundAnded EOF ;
     public final void entryRuleJvmLowerBoundAnded() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2290:1: ( ruleJvmLowerBoundAnded EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2291:1: ruleJvmLowerBoundAnded EOF
+            // InternalCheckCfg.g:2290:1: ( ruleJvmLowerBoundAnded EOF )
+            // InternalCheckCfg.g:2291:1: ruleJvmLowerBoundAnded EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAndedRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmLowerBoundAnded_in_entryRuleJvmLowerBoundAnded4823);
+            pushFollow(FOLLOW_1);
             ruleJvmLowerBoundAnded();
 
             state._fsp--;
@@ -6859,7 +6859,7 @@ public final void entryRuleJvmLowerBoundAnded() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmLowerBoundAndedRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmLowerBoundAnded4830); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -6876,25 +6876,25 @@ public final void entryRuleJvmLowerBoundAnded() throws RecognitionException {
 
 
     // $ANTLR start "ruleJvmLowerBoundAnded"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2298:1: ruleJvmLowerBoundAnded : ( ( rule__JvmLowerBoundAnded__Group__0 ) ) ;
+    // InternalCheckCfg.g:2298:1: ruleJvmLowerBoundAnded : ( ( rule__JvmLowerBoundAnded__Group__0 ) ) ;
     public final void ruleJvmLowerBoundAnded() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2302:2: ( ( ( rule__JvmLowerBoundAnded__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2303:1: ( ( rule__JvmLowerBoundAnded__Group__0 ) )
+            // InternalCheckCfg.g:2302:2: ( ( ( rule__JvmLowerBoundAnded__Group__0 ) ) )
+            // InternalCheckCfg.g:2303:1: ( ( rule__JvmLowerBoundAnded__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2303:1: ( ( rule__JvmLowerBoundAnded__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2304:1: ( rule__JvmLowerBoundAnded__Group__0 )
+            // InternalCheckCfg.g:2303:1: ( ( rule__JvmLowerBoundAnded__Group__0 ) )
+            // InternalCheckCfg.g:2304:1: ( rule__JvmLowerBoundAnded__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAndedAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2305:1: ( rule__JvmLowerBoundAnded__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2305:2: rule__JvmLowerBoundAnded__Group__0
+            // InternalCheckCfg.g:2305:1: ( rule__JvmLowerBoundAnded__Group__0 )
+            // InternalCheckCfg.g:2305:2: rule__JvmLowerBoundAnded__Group__0
             {
-            pushFollow(FOLLOW_rule__JvmLowerBoundAnded__Group__0_in_ruleJvmLowerBoundAnded4856);
+            pushFollow(FOLLOW_2);
             rule__JvmLowerBoundAnded__Group__0();
 
             state._fsp--;
@@ -6927,16 +6927,16 @@ public final void ruleJvmLowerBoundAnded() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleQualifiedNameWithWildcard"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2319:1: entryRuleQualifiedNameWithWildcard : ruleQualifiedNameWithWildcard EOF ;
+    // InternalCheckCfg.g:2319:1: entryRuleQualifiedNameWithWildcard : ruleQualifiedNameWithWildcard EOF ;
     public final void entryRuleQualifiedNameWithWildcard() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2320:1: ( ruleQualifiedNameWithWildcard EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2321:1: ruleQualifiedNameWithWildcard EOF
+            // InternalCheckCfg.g:2320:1: ( ruleQualifiedNameWithWildcard EOF )
+            // InternalCheckCfg.g:2321:1: ruleQualifiedNameWithWildcard EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameWithWildcardRule()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedNameWithWildcard_in_entryRuleQualifiedNameWithWildcard4885);
+            pushFollow(FOLLOW_1);
             ruleQualifiedNameWithWildcard();
 
             state._fsp--;
@@ -6944,7 +6944,7 @@ public final void entryRuleQualifiedNameWithWildcard() throws RecognitionExcepti
             if ( state.backtracking==0 ) {
                after(grammarAccess.getQualifiedNameWithWildcardRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedNameWithWildcard4892); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -6961,25 +6961,25 @@ public final void entryRuleQualifiedNameWithWildcard() throws RecognitionExcepti
 
 
     // $ANTLR start "ruleQualifiedNameWithWildcard"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2328:1: ruleQualifiedNameWithWildcard : ( ( rule__QualifiedNameWithWildcard__Group__0 ) ) ;
+    // InternalCheckCfg.g:2328:1: ruleQualifiedNameWithWildcard : ( ( rule__QualifiedNameWithWildcard__Group__0 ) ) ;
     public final void ruleQualifiedNameWithWildcard() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2332:2: ( ( ( rule__QualifiedNameWithWildcard__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2333:1: ( ( rule__QualifiedNameWithWildcard__Group__0 ) )
+            // InternalCheckCfg.g:2332:2: ( ( ( rule__QualifiedNameWithWildcard__Group__0 ) ) )
+            // InternalCheckCfg.g:2333:1: ( ( rule__QualifiedNameWithWildcard__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2333:1: ( ( rule__QualifiedNameWithWildcard__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2334:1: ( rule__QualifiedNameWithWildcard__Group__0 )
+            // InternalCheckCfg.g:2333:1: ( ( rule__QualifiedNameWithWildcard__Group__0 ) )
+            // InternalCheckCfg.g:2334:1: ( rule__QualifiedNameWithWildcard__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameWithWildcardAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2335:1: ( rule__QualifiedNameWithWildcard__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2335:2: rule__QualifiedNameWithWildcard__Group__0
+            // InternalCheckCfg.g:2335:1: ( rule__QualifiedNameWithWildcard__Group__0 )
+            // InternalCheckCfg.g:2335:2: rule__QualifiedNameWithWildcard__Group__0
             {
-            pushFollow(FOLLOW_rule__QualifiedNameWithWildcard__Group__0_in_ruleQualifiedNameWithWildcard4918);
+            pushFollow(FOLLOW_2);
             rule__QualifiedNameWithWildcard__Group__0();
 
             state._fsp--;
@@ -7012,16 +7012,16 @@ public final void ruleQualifiedNameWithWildcard() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleValidID"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2347:1: entryRuleValidID : ruleValidID EOF ;
+    // InternalCheckCfg.g:2347:1: entryRuleValidID : ruleValidID EOF ;
     public final void entryRuleValidID() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2348:1: ( ruleValidID EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2349:1: ruleValidID EOF
+            // InternalCheckCfg.g:2348:1: ( ruleValidID EOF )
+            // InternalCheckCfg.g:2349:1: ruleValidID EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getValidIDRule()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_entryRuleValidID4945);
+            pushFollow(FOLLOW_1);
             ruleValidID();
 
             state._fsp--;
@@ -7029,7 +7029,7 @@ public final void entryRuleValidID() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getValidIDRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleValidID4952); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -7046,22 +7046,22 @@ public final void entryRuleValidID() throws RecognitionException {
 
 
     // $ANTLR start "ruleValidID"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2356:1: ruleValidID : ( RULE_ID ) ;
+    // InternalCheckCfg.g:2356:1: ruleValidID : ( RULE_ID ) ;
     public final void ruleValidID() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2360:2: ( ( RULE_ID ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2361:1: ( RULE_ID )
+            // InternalCheckCfg.g:2360:2: ( ( RULE_ID ) )
+            // InternalCheckCfg.g:2361:1: ( RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2361:1: ( RULE_ID )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2362:1: RULE_ID
+            // InternalCheckCfg.g:2361:1: ( RULE_ID )
+            // InternalCheckCfg.g:2362:1: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getValidIDAccess().getIDTerminalRuleCall()); 
             }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleValidID4978); if (state.failed) return ;
+            match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getValidIDAccess().getIDTerminalRuleCall()); 
             }
@@ -7087,16 +7087,16 @@ public final void ruleValidID() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXImportDeclaration"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2377:1: entryRuleXImportDeclaration : ruleXImportDeclaration EOF ;
+    // InternalCheckCfg.g:2377:1: entryRuleXImportDeclaration : ruleXImportDeclaration EOF ;
     public final void entryRuleXImportDeclaration() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2378:1: ( ruleXImportDeclaration EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2379:1: ruleXImportDeclaration EOF
+            // InternalCheckCfg.g:2378:1: ( ruleXImportDeclaration EOF )
+            // InternalCheckCfg.g:2379:1: ruleXImportDeclaration EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationRule()); 
             }
-            pushFollow(FOLLOW_ruleXImportDeclaration_in_entryRuleXImportDeclaration5006);
+            pushFollow(FOLLOW_1);
             ruleXImportDeclaration();
 
             state._fsp--;
@@ -7104,7 +7104,7 @@ public final void entryRuleXImportDeclaration() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXImportDeclarationRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXImportDeclaration5013); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -7121,25 +7121,25 @@ public final void entryRuleXImportDeclaration() throws RecognitionException {
 
 
     // $ANTLR start "ruleXImportDeclaration"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2386:1: ruleXImportDeclaration : ( ( rule__XImportDeclaration__Group__0 ) ) ;
+    // InternalCheckCfg.g:2386:1: ruleXImportDeclaration : ( ( rule__XImportDeclaration__Group__0 ) ) ;
     public final void ruleXImportDeclaration() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2390:2: ( ( ( rule__XImportDeclaration__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2391:1: ( ( rule__XImportDeclaration__Group__0 ) )
+            // InternalCheckCfg.g:2390:2: ( ( ( rule__XImportDeclaration__Group__0 ) ) )
+            // InternalCheckCfg.g:2391:1: ( ( rule__XImportDeclaration__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2391:1: ( ( rule__XImportDeclaration__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2392:1: ( rule__XImportDeclaration__Group__0 )
+            // InternalCheckCfg.g:2391:1: ( ( rule__XImportDeclaration__Group__0 ) )
+            // InternalCheckCfg.g:2392:1: ( rule__XImportDeclaration__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2393:1: ( rule__XImportDeclaration__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2393:2: rule__XImportDeclaration__Group__0
+            // InternalCheckCfg.g:2393:1: ( rule__XImportDeclaration__Group__0 )
+            // InternalCheckCfg.g:2393:2: rule__XImportDeclaration__Group__0
             {
-            pushFollow(FOLLOW_rule__XImportDeclaration__Group__0_in_ruleXImportDeclaration5039);
+            pushFollow(FOLLOW_2);
             rule__XImportDeclaration__Group__0();
 
             state._fsp--;
@@ -7172,16 +7172,16 @@ public final void ruleXImportDeclaration() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleQualifiedNameInStaticImport"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2405:1: entryRuleQualifiedNameInStaticImport : ruleQualifiedNameInStaticImport EOF ;
+    // InternalCheckCfg.g:2405:1: entryRuleQualifiedNameInStaticImport : ruleQualifiedNameInStaticImport EOF ;
     public final void entryRuleQualifiedNameInStaticImport() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2406:1: ( ruleQualifiedNameInStaticImport EOF )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2407:1: ruleQualifiedNameInStaticImport EOF
+            // InternalCheckCfg.g:2406:1: ( ruleQualifiedNameInStaticImport EOF )
+            // InternalCheckCfg.g:2407:1: ruleQualifiedNameInStaticImport EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameInStaticImportRule()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedNameInStaticImport_in_entryRuleQualifiedNameInStaticImport5066);
+            pushFollow(FOLLOW_1);
             ruleQualifiedNameInStaticImport();
 
             state._fsp--;
@@ -7189,7 +7189,7 @@ public final void entryRuleQualifiedNameInStaticImport() throws RecognitionExcep
             if ( state.backtracking==0 ) {
                after(grammarAccess.getQualifiedNameInStaticImportRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedNameInStaticImport5073); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -7206,28 +7206,28 @@ public final void entryRuleQualifiedNameInStaticImport() throws RecognitionExcep
 
 
     // $ANTLR start "ruleQualifiedNameInStaticImport"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2414:1: ruleQualifiedNameInStaticImport : ( ( ( rule__QualifiedNameInStaticImport__Group__0 ) ) ( ( rule__QualifiedNameInStaticImport__Group__0 )* ) ) ;
+    // InternalCheckCfg.g:2414:1: ruleQualifiedNameInStaticImport : ( ( ( rule__QualifiedNameInStaticImport__Group__0 ) ) ( ( rule__QualifiedNameInStaticImport__Group__0 )* ) ) ;
     public final void ruleQualifiedNameInStaticImport() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2418:2: ( ( ( ( rule__QualifiedNameInStaticImport__Group__0 ) ) ( ( rule__QualifiedNameInStaticImport__Group__0 )* ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2419:1: ( ( ( rule__QualifiedNameInStaticImport__Group__0 ) ) ( ( rule__QualifiedNameInStaticImport__Group__0 )* ) )
+            // InternalCheckCfg.g:2418:2: ( ( ( ( rule__QualifiedNameInStaticImport__Group__0 ) ) ( ( rule__QualifiedNameInStaticImport__Group__0 )* ) ) )
+            // InternalCheckCfg.g:2419:1: ( ( ( rule__QualifiedNameInStaticImport__Group__0 ) ) ( ( rule__QualifiedNameInStaticImport__Group__0 )* ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2419:1: ( ( ( rule__QualifiedNameInStaticImport__Group__0 ) ) ( ( rule__QualifiedNameInStaticImport__Group__0 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2420:1: ( ( rule__QualifiedNameInStaticImport__Group__0 ) ) ( ( rule__QualifiedNameInStaticImport__Group__0 )* )
+            // InternalCheckCfg.g:2419:1: ( ( ( rule__QualifiedNameInStaticImport__Group__0 ) ) ( ( rule__QualifiedNameInStaticImport__Group__0 )* ) )
+            // InternalCheckCfg.g:2420:1: ( ( rule__QualifiedNameInStaticImport__Group__0 ) ) ( ( rule__QualifiedNameInStaticImport__Group__0 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2420:1: ( ( rule__QualifiedNameInStaticImport__Group__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2421:1: ( rule__QualifiedNameInStaticImport__Group__0 )
+            // InternalCheckCfg.g:2420:1: ( ( rule__QualifiedNameInStaticImport__Group__0 ) )
+            // InternalCheckCfg.g:2421:1: ( rule__QualifiedNameInStaticImport__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameInStaticImportAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2422:1: ( rule__QualifiedNameInStaticImport__Group__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2422:2: rule__QualifiedNameInStaticImport__Group__0
+            // InternalCheckCfg.g:2422:1: ( rule__QualifiedNameInStaticImport__Group__0 )
+            // InternalCheckCfg.g:2422:2: rule__QualifiedNameInStaticImport__Group__0
             {
-            pushFollow(FOLLOW_rule__QualifiedNameInStaticImport__Group__0_in_ruleQualifiedNameInStaticImport5101);
+            pushFollow(FOLLOW_3);
             rule__QualifiedNameInStaticImport__Group__0();
 
             state._fsp--;
@@ -7241,13 +7241,13 @@ public final void ruleQualifiedNameInStaticImport() throws RecognitionException
 
             }
 
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2425:1: ( ( rule__QualifiedNameInStaticImport__Group__0 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2426:1: ( rule__QualifiedNameInStaticImport__Group__0 )*
+            // InternalCheckCfg.g:2425:1: ( ( rule__QualifiedNameInStaticImport__Group__0 )* )
+            // InternalCheckCfg.g:2426:1: ( rule__QualifiedNameInStaticImport__Group__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameInStaticImportAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2427:1: ( rule__QualifiedNameInStaticImport__Group__0 )*
+            // InternalCheckCfg.g:2427:1: ( rule__QualifiedNameInStaticImport__Group__0 )*
             loop1:
             do {
                 int alt1=2;
@@ -7266,9 +7266,9 @@ public final void ruleQualifiedNameInStaticImport() throws RecognitionException
 
                 switch (alt1) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2427:2: rule__QualifiedNameInStaticImport__Group__0
+            	    // InternalCheckCfg.g:2427:2: rule__QualifiedNameInStaticImport__Group__0
             	    {
-            	    pushFollow(FOLLOW_rule__QualifiedNameInStaticImport__Group__0_in_ruleQualifiedNameInStaticImport5113);
+            	    pushFollow(FOLLOW_3);
             	    rule__QualifiedNameInStaticImport__Group__0();
 
             	    state._fsp--;
@@ -7310,25 +7310,25 @@ public final void ruleQualifiedNameInStaticImport() throws RecognitionException
 
 
     // $ANTLR start "ruleSeverityKind"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2441:1: ruleSeverityKind : ( ( rule__SeverityKind__Alternatives ) ) ;
+    // InternalCheckCfg.g:2441:1: ruleSeverityKind : ( ( rule__SeverityKind__Alternatives ) ) ;
     public final void ruleSeverityKind() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2445:1: ( ( ( rule__SeverityKind__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2446:1: ( ( rule__SeverityKind__Alternatives ) )
+            // InternalCheckCfg.g:2445:1: ( ( ( rule__SeverityKind__Alternatives ) ) )
+            // InternalCheckCfg.g:2446:1: ( ( rule__SeverityKind__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2446:1: ( ( rule__SeverityKind__Alternatives ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2447:1: ( rule__SeverityKind__Alternatives )
+            // InternalCheckCfg.g:2446:1: ( ( rule__SeverityKind__Alternatives ) )
+            // InternalCheckCfg.g:2447:1: ( rule__SeverityKind__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSeverityKindAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2448:1: ( rule__SeverityKind__Alternatives )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2448:2: rule__SeverityKind__Alternatives
+            // InternalCheckCfg.g:2448:1: ( rule__SeverityKind__Alternatives )
+            // InternalCheckCfg.g:2448:2: rule__SeverityKind__Alternatives
             {
-            pushFollow(FOLLOW_rule__SeverityKind__Alternatives_in_ruleSeverityKind5153);
+            pushFollow(FOLLOW_2);
             rule__SeverityKind__Alternatives();
 
             state._fsp--;
@@ -7361,13 +7361,13 @@ public final void ruleSeverityKind() throws RecognitionException {
 
 
     // $ANTLR start "rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2459:1: rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives : ( ( ruleXBooleanLiteral ) | ( ruleXNumberLiteral ) | ( ruleXStringLiteral ) );
+    // InternalCheckCfg.g:2459:1: rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives : ( ( ruleXBooleanLiteral ) | ( ruleXNumberLiteral ) | ( ruleXStringLiteral ) );
     public final void rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2463:1: ( ( ruleXBooleanLiteral ) | ( ruleXNumberLiteral ) | ( ruleXStringLiteral ) )
+            // InternalCheckCfg.g:2463:1: ( ( ruleXBooleanLiteral ) | ( ruleXNumberLiteral ) | ( ruleXStringLiteral ) )
             int alt2=3;
             switch ( input.LA(1) ) {
             case 50:
@@ -7398,15 +7398,15 @@ public final void rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives(
 
             switch (alt2) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2464:1: ( ruleXBooleanLiteral )
+                    // InternalCheckCfg.g:2464:1: ( ruleXBooleanLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2464:1: ( ruleXBooleanLiteral )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2465:1: ruleXBooleanLiteral
+                    // InternalCheckCfg.g:2464:1: ( ruleXBooleanLiteral )
+                    // InternalCheckCfg.g:2465:1: ruleXBooleanLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXSimpleFormalParameterDefaultValueLiteralAccess().getXBooleanLiteralParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleXBooleanLiteral_in_rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives5188);
+                    pushFollow(FOLLOW_2);
                     ruleXBooleanLiteral();
 
                     state._fsp--;
@@ -7421,15 +7421,15 @@ public final void rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives(
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2470:6: ( ruleXNumberLiteral )
+                    // InternalCheckCfg.g:2470:6: ( ruleXNumberLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2470:6: ( ruleXNumberLiteral )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2471:1: ruleXNumberLiteral
+                    // InternalCheckCfg.g:2470:6: ( ruleXNumberLiteral )
+                    // InternalCheckCfg.g:2471:1: ruleXNumberLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXSimpleFormalParameterDefaultValueLiteralAccess().getXNumberLiteralParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleXNumberLiteral_in_rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives5205);
+                    pushFollow(FOLLOW_2);
                     ruleXNumberLiteral();
 
                     state._fsp--;
@@ -7444,15 +7444,15 @@ public final void rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives(
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2476:6: ( ruleXStringLiteral )
+                    // InternalCheckCfg.g:2476:6: ( ruleXStringLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2476:6: ( ruleXStringLiteral )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2477:1: ruleXStringLiteral
+                    // InternalCheckCfg.g:2476:6: ( ruleXStringLiteral )
+                    // InternalCheckCfg.g:2477:1: ruleXStringLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXSimpleFormalParameterDefaultValueLiteralAccess().getXStringLiteralParserRuleCall_2()); 
                     }
-                    pushFollow(FOLLOW_ruleXStringLiteral_in_rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives5222);
+                    pushFollow(FOLLOW_2);
                     ruleXStringLiteral();
 
                     state._fsp--;
@@ -7484,13 +7484,13 @@ public final void rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives(
 
 
     // $ANTLR start "rule__XConstantUnaryOperation__Alternatives"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2487:1: rule__XConstantUnaryOperation__Alternatives : ( ( ( rule__XConstantUnaryOperation__Group_0__0 ) ) | ( ruleXSimpleFormalParameterDefaultValueLiteral ) );
+    // InternalCheckCfg.g:2487:1: rule__XConstantUnaryOperation__Alternatives : ( ( ( rule__XConstantUnaryOperation__Group_0__0 ) ) | ( ruleXSimpleFormalParameterDefaultValueLiteral ) );
     public final void rule__XConstantUnaryOperation__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2491:1: ( ( ( rule__XConstantUnaryOperation__Group_0__0 ) ) | ( ruleXSimpleFormalParameterDefaultValueLiteral ) )
+            // InternalCheckCfg.g:2491:1: ( ( ( rule__XConstantUnaryOperation__Group_0__0 ) ) | ( ruleXSimpleFormalParameterDefaultValueLiteral ) )
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -7509,18 +7509,18 @@ else if ( ((LA3_0>=RULE_HEX && LA3_0<=RULE_STRING)||LA3_0==50||LA3_0==93) ) {
             }
             switch (alt3) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2492:1: ( ( rule__XConstantUnaryOperation__Group_0__0 ) )
+                    // InternalCheckCfg.g:2492:1: ( ( rule__XConstantUnaryOperation__Group_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2492:1: ( ( rule__XConstantUnaryOperation__Group_0__0 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2493:1: ( rule__XConstantUnaryOperation__Group_0__0 )
+                    // InternalCheckCfg.g:2492:1: ( ( rule__XConstantUnaryOperation__Group_0__0 ) )
+                    // InternalCheckCfg.g:2493:1: ( rule__XConstantUnaryOperation__Group_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXConstantUnaryOperationAccess().getGroup_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2494:1: ( rule__XConstantUnaryOperation__Group_0__0 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2494:2: rule__XConstantUnaryOperation__Group_0__0
+                    // InternalCheckCfg.g:2494:1: ( rule__XConstantUnaryOperation__Group_0__0 )
+                    // InternalCheckCfg.g:2494:2: rule__XConstantUnaryOperation__Group_0__0
                     {
-                    pushFollow(FOLLOW_rule__XConstantUnaryOperation__Group_0__0_in_rule__XConstantUnaryOperation__Alternatives5254);
+                    pushFollow(FOLLOW_2);
                     rule__XConstantUnaryOperation__Group_0__0();
 
                     state._fsp--;
@@ -7538,15 +7538,15 @@ else if ( ((LA3_0>=RULE_HEX && LA3_0<=RULE_STRING)||LA3_0==50||LA3_0==93) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2498:6: ( ruleXSimpleFormalParameterDefaultValueLiteral )
+                    // InternalCheckCfg.g:2498:6: ( ruleXSimpleFormalParameterDefaultValueLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2498:6: ( ruleXSimpleFormalParameterDefaultValueLiteral )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2499:1: ruleXSimpleFormalParameterDefaultValueLiteral
+                    // InternalCheckCfg.g:2498:6: ( ruleXSimpleFormalParameterDefaultValueLiteral )
+                    // InternalCheckCfg.g:2499:1: ruleXSimpleFormalParameterDefaultValueLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXConstantUnaryOperationAccess().getXSimpleFormalParameterDefaultValueLiteralParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleXSimpleFormalParameterDefaultValueLiteral_in_rule__XConstantUnaryOperation__Alternatives5272);
+                    pushFollow(FOLLOW_2);
                     ruleXSimpleFormalParameterDefaultValueLiteral();
 
                     state._fsp--;
@@ -7578,13 +7578,13 @@ else if ( ((LA3_0>=RULE_HEX && LA3_0<=RULE_STRING)||LA3_0==50||LA3_0==93) ) {
 
 
     // $ANTLR start "rule__XFormalParameterDefaultValueLiteral__Alternatives"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2509:1: rule__XFormalParameterDefaultValueLiteral__Alternatives : ( ( ruleXConstantUnaryOperation ) | ( ruleXConstantListLiteral ) );
+    // InternalCheckCfg.g:2509:1: rule__XFormalParameterDefaultValueLiteral__Alternatives : ( ( ruleXConstantUnaryOperation ) | ( ruleXConstantListLiteral ) );
     public final void rule__XFormalParameterDefaultValueLiteral__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2513:1: ( ( ruleXConstantUnaryOperation ) | ( ruleXConstantListLiteral ) )
+            // InternalCheckCfg.g:2513:1: ( ( ruleXConstantUnaryOperation ) | ( ruleXConstantListLiteral ) )
             int alt4=2;
             int LA4_0 = input.LA(1);
 
@@ -7603,15 +7603,15 @@ else if ( (LA4_0==65) ) {
             }
             switch (alt4) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2514:1: ( ruleXConstantUnaryOperation )
+                    // InternalCheckCfg.g:2514:1: ( ruleXConstantUnaryOperation )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2514:1: ( ruleXConstantUnaryOperation )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2515:1: ruleXConstantUnaryOperation
+                    // InternalCheckCfg.g:2514:1: ( ruleXConstantUnaryOperation )
+                    // InternalCheckCfg.g:2515:1: ruleXConstantUnaryOperation
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXFormalParameterDefaultValueLiteralAccess().getXConstantUnaryOperationParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleXConstantUnaryOperation_in_rule__XFormalParameterDefaultValueLiteral__Alternatives5304);
+                    pushFollow(FOLLOW_2);
                     ruleXConstantUnaryOperation();
 
                     state._fsp--;
@@ -7626,15 +7626,15 @@ else if ( (LA4_0==65) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2520:6: ( ruleXConstantListLiteral )
+                    // InternalCheckCfg.g:2520:6: ( ruleXConstantListLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2520:6: ( ruleXConstantListLiteral )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2521:1: ruleXConstantListLiteral
+                    // InternalCheckCfg.g:2520:6: ( ruleXConstantListLiteral )
+                    // InternalCheckCfg.g:2521:1: ruleXConstantListLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXFormalParameterDefaultValueLiteralAccess().getXConstantListLiteralParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleXConstantListLiteral_in_rule__XFormalParameterDefaultValueLiteral__Alternatives5321);
+                    pushFollow(FOLLOW_2);
                     ruleXConstantListLiteral();
 
                     state._fsp--;
@@ -7666,13 +7666,13 @@ else if ( (LA4_0==65) ) {
 
 
     // $ANTLR start "rule__XAssignment__Alternatives"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2531:1: rule__XAssignment__Alternatives : ( ( ( rule__XAssignment__Group_0__0 ) ) | ( ( rule__XAssignment__Group_1__0 ) ) );
+    // InternalCheckCfg.g:2531:1: rule__XAssignment__Alternatives : ( ( ( rule__XAssignment__Group_0__0 ) ) | ( ( rule__XAssignment__Group_1__0 ) ) );
     public final void rule__XAssignment__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2535:1: ( ( ( rule__XAssignment__Group_0__0 ) ) | ( ( rule__XAssignment__Group_1__0 ) ) )
+            // InternalCheckCfg.g:2535:1: ( ( ( rule__XAssignment__Group_0__0 ) ) | ( ( rule__XAssignment__Group_1__0 ) ) )
             int alt5=2;
             switch ( input.LA(1) ) {
             case RULE_ID:
@@ -7811,18 +7811,18 @@ else if ( (LA5_5==13) ) {
 
             switch (alt5) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2536:1: ( ( rule__XAssignment__Group_0__0 ) )
+                    // InternalCheckCfg.g:2536:1: ( ( rule__XAssignment__Group_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2536:1: ( ( rule__XAssignment__Group_0__0 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2537:1: ( rule__XAssignment__Group_0__0 )
+                    // InternalCheckCfg.g:2536:1: ( ( rule__XAssignment__Group_0__0 ) )
+                    // InternalCheckCfg.g:2537:1: ( rule__XAssignment__Group_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXAssignmentAccess().getGroup_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2538:1: ( rule__XAssignment__Group_0__0 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2538:2: rule__XAssignment__Group_0__0
+                    // InternalCheckCfg.g:2538:1: ( rule__XAssignment__Group_0__0 )
+                    // InternalCheckCfg.g:2538:2: rule__XAssignment__Group_0__0
                     {
-                    pushFollow(FOLLOW_rule__XAssignment__Group_0__0_in_rule__XAssignment__Alternatives5353);
+                    pushFollow(FOLLOW_2);
                     rule__XAssignment__Group_0__0();
 
                     state._fsp--;
@@ -7840,18 +7840,18 @@ else if ( (LA5_5==13) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2542:6: ( ( rule__XAssignment__Group_1__0 ) )
+                    // InternalCheckCfg.g:2542:6: ( ( rule__XAssignment__Group_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2542:6: ( ( rule__XAssignment__Group_1__0 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2543:1: ( rule__XAssignment__Group_1__0 )
+                    // InternalCheckCfg.g:2542:6: ( ( rule__XAssignment__Group_1__0 ) )
+                    // InternalCheckCfg.g:2543:1: ( rule__XAssignment__Group_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXAssignmentAccess().getGroup_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2544:1: ( rule__XAssignment__Group_1__0 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2544:2: rule__XAssignment__Group_1__0
+                    // InternalCheckCfg.g:2544:1: ( rule__XAssignment__Group_1__0 )
+                    // InternalCheckCfg.g:2544:2: rule__XAssignment__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__XAssignment__Group_1__0_in_rule__XAssignment__Alternatives5371);
+                    pushFollow(FOLLOW_2);
                     rule__XAssignment__Group_1__0();
 
                     state._fsp--;
@@ -7886,13 +7886,13 @@ else if ( (LA5_5==13) ) {
 
 
     // $ANTLR start "rule__OpMultiAssign__Alternatives"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2553:1: rule__OpMultiAssign__Alternatives : ( ( '+=' ) | ( '-=' ) | ( '*=' ) | ( '/=' ) | ( '%=' ) | ( ( rule__OpMultiAssign__Group_5__0 ) ) | ( ( rule__OpMultiAssign__Group_6__0 ) ) );
+    // InternalCheckCfg.g:2553:1: rule__OpMultiAssign__Alternatives : ( ( '+=' ) | ( '-=' ) | ( '*=' ) | ( '/=' ) | ( '%=' ) | ( ( rule__OpMultiAssign__Group_5__0 ) ) | ( ( rule__OpMultiAssign__Group_6__0 ) ) );
     public final void rule__OpMultiAssign__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2557:1: ( ( '+=' ) | ( '-=' ) | ( '*=' ) | ( '/=' ) | ( '%=' ) | ( ( rule__OpMultiAssign__Group_5__0 ) ) | ( ( rule__OpMultiAssign__Group_6__0 ) ) )
+            // InternalCheckCfg.g:2557:1: ( ( '+=' ) | ( '-=' ) | ( '*=' ) | ( '/=' ) | ( '%=' ) | ( ( rule__OpMultiAssign__Group_5__0 ) ) | ( ( rule__OpMultiAssign__Group_6__0 ) ) )
             int alt6=7;
             switch ( input.LA(1) ) {
             case 16:
@@ -7940,15 +7940,15 @@ public final void rule__OpMultiAssign__Alternatives() throws RecognitionExceptio
 
             switch (alt6) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2558:1: ( '+=' )
+                    // InternalCheckCfg.g:2558:1: ( '+=' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2558:1: ( '+=' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2559:1: '+='
+                    // InternalCheckCfg.g:2558:1: ( '+=' )
+                    // InternalCheckCfg.g:2559:1: '+='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAssignAccess().getPlusSignEqualsSignKeyword_0()); 
                     }
-                    match(input,16,FOLLOW_16_in_rule__OpMultiAssign__Alternatives5405); if (state.failed) return ;
+                    match(input,16,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpMultiAssignAccess().getPlusSignEqualsSignKeyword_0()); 
                     }
@@ -7959,15 +7959,15 @@ public final void rule__OpMultiAssign__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2566:6: ( '-=' )
+                    // InternalCheckCfg.g:2566:6: ( '-=' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2566:6: ( '-=' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2567:1: '-='
+                    // InternalCheckCfg.g:2566:6: ( '-=' )
+                    // InternalCheckCfg.g:2567:1: '-='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAssignAccess().getHyphenMinusEqualsSignKeyword_1()); 
                     }
-                    match(input,17,FOLLOW_17_in_rule__OpMultiAssign__Alternatives5425); if (state.failed) return ;
+                    match(input,17,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpMultiAssignAccess().getHyphenMinusEqualsSignKeyword_1()); 
                     }
@@ -7978,15 +7978,15 @@ public final void rule__OpMultiAssign__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2574:6: ( '*=' )
+                    // InternalCheckCfg.g:2574:6: ( '*=' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2574:6: ( '*=' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2575:1: '*='
+                    // InternalCheckCfg.g:2574:6: ( '*=' )
+                    // InternalCheckCfg.g:2575:1: '*='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAssignAccess().getAsteriskEqualsSignKeyword_2()); 
                     }
-                    match(input,18,FOLLOW_18_in_rule__OpMultiAssign__Alternatives5445); if (state.failed) return ;
+                    match(input,18,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpMultiAssignAccess().getAsteriskEqualsSignKeyword_2()); 
                     }
@@ -7997,15 +7997,15 @@ public final void rule__OpMultiAssign__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2582:6: ( '/=' )
+                    // InternalCheckCfg.g:2582:6: ( '/=' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2582:6: ( '/=' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2583:1: '/='
+                    // InternalCheckCfg.g:2582:6: ( '/=' )
+                    // InternalCheckCfg.g:2583:1: '/='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAssignAccess().getSolidusEqualsSignKeyword_3()); 
                     }
-                    match(input,19,FOLLOW_19_in_rule__OpMultiAssign__Alternatives5465); if (state.failed) return ;
+                    match(input,19,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpMultiAssignAccess().getSolidusEqualsSignKeyword_3()); 
                     }
@@ -8016,15 +8016,15 @@ public final void rule__OpMultiAssign__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2590:6: ( '%=' )
+                    // InternalCheckCfg.g:2590:6: ( '%=' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2590:6: ( '%=' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2591:1: '%='
+                    // InternalCheckCfg.g:2590:6: ( '%=' )
+                    // InternalCheckCfg.g:2591:1: '%='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAssignAccess().getPercentSignEqualsSignKeyword_4()); 
                     }
-                    match(input,20,FOLLOW_20_in_rule__OpMultiAssign__Alternatives5485); if (state.failed) return ;
+                    match(input,20,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpMultiAssignAccess().getPercentSignEqualsSignKeyword_4()); 
                     }
@@ -8035,18 +8035,18 @@ public final void rule__OpMultiAssign__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2598:6: ( ( rule__OpMultiAssign__Group_5__0 ) )
+                    // InternalCheckCfg.g:2598:6: ( ( rule__OpMultiAssign__Group_5__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2598:6: ( ( rule__OpMultiAssign__Group_5__0 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2599:1: ( rule__OpMultiAssign__Group_5__0 )
+                    // InternalCheckCfg.g:2598:6: ( ( rule__OpMultiAssign__Group_5__0 ) )
+                    // InternalCheckCfg.g:2599:1: ( rule__OpMultiAssign__Group_5__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAssignAccess().getGroup_5()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2600:1: ( rule__OpMultiAssign__Group_5__0 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2600:2: rule__OpMultiAssign__Group_5__0
+                    // InternalCheckCfg.g:2600:1: ( rule__OpMultiAssign__Group_5__0 )
+                    // InternalCheckCfg.g:2600:2: rule__OpMultiAssign__Group_5__0
                     {
-                    pushFollow(FOLLOW_rule__OpMultiAssign__Group_5__0_in_rule__OpMultiAssign__Alternatives5504);
+                    pushFollow(FOLLOW_2);
                     rule__OpMultiAssign__Group_5__0();
 
                     state._fsp--;
@@ -8064,18 +8064,18 @@ public final void rule__OpMultiAssign__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2604:6: ( ( rule__OpMultiAssign__Group_6__0 ) )
+                    // InternalCheckCfg.g:2604:6: ( ( rule__OpMultiAssign__Group_6__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2604:6: ( ( rule__OpMultiAssign__Group_6__0 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2605:1: ( rule__OpMultiAssign__Group_6__0 )
+                    // InternalCheckCfg.g:2604:6: ( ( rule__OpMultiAssign__Group_6__0 ) )
+                    // InternalCheckCfg.g:2605:1: ( rule__OpMultiAssign__Group_6__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAssignAccess().getGroup_6()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2606:1: ( rule__OpMultiAssign__Group_6__0 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2606:2: rule__OpMultiAssign__Group_6__0
+                    // InternalCheckCfg.g:2606:1: ( rule__OpMultiAssign__Group_6__0 )
+                    // InternalCheckCfg.g:2606:2: rule__OpMultiAssign__Group_6__0
                     {
-                    pushFollow(FOLLOW_rule__OpMultiAssign__Group_6__0_in_rule__OpMultiAssign__Alternatives5522);
+                    pushFollow(FOLLOW_2);
                     rule__OpMultiAssign__Group_6__0();
 
                     state._fsp--;
@@ -8110,13 +8110,13 @@ public final void rule__OpMultiAssign__Alternatives() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__OpEquality__Alternatives"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2615:1: rule__OpEquality__Alternatives : ( ( '==' ) | ( '!=' ) | ( '===' ) | ( '!==' ) );
+    // InternalCheckCfg.g:2615:1: rule__OpEquality__Alternatives : ( ( '==' ) | ( '!=' ) | ( '===' ) | ( '!==' ) );
     public final void rule__OpEquality__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2619:1: ( ( '==' ) | ( '!=' ) | ( '===' ) | ( '!==' ) )
+            // InternalCheckCfg.g:2619:1: ( ( '==' ) | ( '!=' ) | ( '===' ) | ( '!==' ) )
             int alt7=4;
             switch ( input.LA(1) ) {
             case 21:
@@ -8149,15 +8149,15 @@ public final void rule__OpEquality__Alternatives() throws RecognitionException {
 
             switch (alt7) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2620:1: ( '==' )
+                    // InternalCheckCfg.g:2620:1: ( '==' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2620:1: ( '==' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2621:1: '=='
+                    // InternalCheckCfg.g:2620:1: ( '==' )
+                    // InternalCheckCfg.g:2621:1: '=='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpEqualityAccess().getEqualsSignEqualsSignKeyword_0()); 
                     }
-                    match(input,21,FOLLOW_21_in_rule__OpEquality__Alternatives5556); if (state.failed) return ;
+                    match(input,21,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpEqualityAccess().getEqualsSignEqualsSignKeyword_0()); 
                     }
@@ -8168,15 +8168,15 @@ public final void rule__OpEquality__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2628:6: ( '!=' )
+                    // InternalCheckCfg.g:2628:6: ( '!=' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2628:6: ( '!=' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2629:1: '!='
+                    // InternalCheckCfg.g:2628:6: ( '!=' )
+                    // InternalCheckCfg.g:2629:1: '!='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpEqualityAccess().getExclamationMarkEqualsSignKeyword_1()); 
                     }
-                    match(input,22,FOLLOW_22_in_rule__OpEquality__Alternatives5576); if (state.failed) return ;
+                    match(input,22,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpEqualityAccess().getExclamationMarkEqualsSignKeyword_1()); 
                     }
@@ -8187,15 +8187,15 @@ public final void rule__OpEquality__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2636:6: ( '===' )
+                    // InternalCheckCfg.g:2636:6: ( '===' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2636:6: ( '===' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2637:1: '==='
+                    // InternalCheckCfg.g:2636:6: ( '===' )
+                    // InternalCheckCfg.g:2637:1: '==='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpEqualityAccess().getEqualsSignEqualsSignEqualsSignKeyword_2()); 
                     }
-                    match(input,23,FOLLOW_23_in_rule__OpEquality__Alternatives5596); if (state.failed) return ;
+                    match(input,23,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpEqualityAccess().getEqualsSignEqualsSignEqualsSignKeyword_2()); 
                     }
@@ -8206,15 +8206,15 @@ public final void rule__OpEquality__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2644:6: ( '!==' )
+                    // InternalCheckCfg.g:2644:6: ( '!==' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2644:6: ( '!==' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2645:1: '!=='
+                    // InternalCheckCfg.g:2644:6: ( '!==' )
+                    // InternalCheckCfg.g:2645:1: '!=='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpEqualityAccess().getExclamationMarkEqualsSignEqualsSignKeyword_3()); 
                     }
-                    match(input,24,FOLLOW_24_in_rule__OpEquality__Alternatives5616); if (state.failed) return ;
+                    match(input,24,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpEqualityAccess().getExclamationMarkEqualsSignEqualsSignKeyword_3()); 
                     }
@@ -8242,13 +8242,13 @@ public final void rule__OpEquality__Alternatives() throws RecognitionException {
 
 
     // $ANTLR start "rule__XRelationalExpression__Alternatives_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2657:1: rule__XRelationalExpression__Alternatives_1 : ( ( ( rule__XRelationalExpression__Group_1_0__0 ) ) | ( ( rule__XRelationalExpression__Group_1_1__0 ) ) );
+    // InternalCheckCfg.g:2657:1: rule__XRelationalExpression__Alternatives_1 : ( ( ( rule__XRelationalExpression__Group_1_0__0 ) ) | ( ( rule__XRelationalExpression__Group_1_1__0 ) ) );
     public final void rule__XRelationalExpression__Alternatives_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2661:1: ( ( ( rule__XRelationalExpression__Group_1_0__0 ) ) | ( ( rule__XRelationalExpression__Group_1_1__0 ) ) )
+            // InternalCheckCfg.g:2661:1: ( ( ( rule__XRelationalExpression__Group_1_0__0 ) ) | ( ( rule__XRelationalExpression__Group_1_1__0 ) ) )
             int alt8=2;
             int LA8_0 = input.LA(1);
 
@@ -8267,18 +8267,18 @@ else if ( ((LA8_0>=25 && LA8_0<=27)) ) {
             }
             switch (alt8) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2662:1: ( ( rule__XRelationalExpression__Group_1_0__0 ) )
+                    // InternalCheckCfg.g:2662:1: ( ( rule__XRelationalExpression__Group_1_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2662:1: ( ( rule__XRelationalExpression__Group_1_0__0 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2663:1: ( rule__XRelationalExpression__Group_1_0__0 )
+                    // InternalCheckCfg.g:2662:1: ( ( rule__XRelationalExpression__Group_1_0__0 ) )
+                    // InternalCheckCfg.g:2663:1: ( rule__XRelationalExpression__Group_1_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXRelationalExpressionAccess().getGroup_1_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2664:1: ( rule__XRelationalExpression__Group_1_0__0 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2664:2: rule__XRelationalExpression__Group_1_0__0
+                    // InternalCheckCfg.g:2664:1: ( rule__XRelationalExpression__Group_1_0__0 )
+                    // InternalCheckCfg.g:2664:2: rule__XRelationalExpression__Group_1_0__0
                     {
-                    pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0__0_in_rule__XRelationalExpression__Alternatives_15650);
+                    pushFollow(FOLLOW_2);
                     rule__XRelationalExpression__Group_1_0__0();
 
                     state._fsp--;
@@ -8296,18 +8296,18 @@ else if ( ((LA8_0>=25 && LA8_0<=27)) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2668:6: ( ( rule__XRelationalExpression__Group_1_1__0 ) )
+                    // InternalCheckCfg.g:2668:6: ( ( rule__XRelationalExpression__Group_1_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2668:6: ( ( rule__XRelationalExpression__Group_1_1__0 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2669:1: ( rule__XRelationalExpression__Group_1_1__0 )
+                    // InternalCheckCfg.g:2668:6: ( ( rule__XRelationalExpression__Group_1_1__0 ) )
+                    // InternalCheckCfg.g:2669:1: ( rule__XRelationalExpression__Group_1_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXRelationalExpressionAccess().getGroup_1_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2670:1: ( rule__XRelationalExpression__Group_1_1__0 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2670:2: rule__XRelationalExpression__Group_1_1__0
+                    // InternalCheckCfg.g:2670:1: ( rule__XRelationalExpression__Group_1_1__0 )
+                    // InternalCheckCfg.g:2670:2: rule__XRelationalExpression__Group_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1__0_in_rule__XRelationalExpression__Alternatives_15668);
+                    pushFollow(FOLLOW_2);
                     rule__XRelationalExpression__Group_1_1__0();
 
                     state._fsp--;
@@ -8342,13 +8342,13 @@ else if ( ((LA8_0>=25 && LA8_0<=27)) ) {
 
 
     // $ANTLR start "rule__OpCompare__Alternatives"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2679:1: rule__OpCompare__Alternatives : ( ( '>=' ) | ( ( rule__OpCompare__Group_1__0 ) ) | ( '>' ) | ( '<' ) );
+    // InternalCheckCfg.g:2679:1: rule__OpCompare__Alternatives : ( ( '>=' ) | ( ( rule__OpCompare__Group_1__0 ) ) | ( '>' ) | ( '<' ) );
     public final void rule__OpCompare__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2683:1: ( ( '>=' ) | ( ( rule__OpCompare__Group_1__0 ) ) | ( '>' ) | ( '<' ) )
+            // InternalCheckCfg.g:2683:1: ( ( '>=' ) | ( ( rule__OpCompare__Group_1__0 ) ) | ( '>' ) | ( '<' ) )
             int alt9=4;
             switch ( input.LA(1) ) {
             case 25:
@@ -8390,15 +8390,15 @@ else if ( (LA9_2==EOF||(LA9_2>=RULE_ID && LA9_2<=RULE_STRING)||LA9_2==27||(LA9_2
 
             switch (alt9) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2684:1: ( '>=' )
+                    // InternalCheckCfg.g:2684:1: ( '>=' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2684:1: ( '>=' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2685:1: '>='
+                    // InternalCheckCfg.g:2684:1: ( '>=' )
+                    // InternalCheckCfg.g:2685:1: '>='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpCompareAccess().getGreaterThanSignEqualsSignKeyword_0()); 
                     }
-                    match(input,25,FOLLOW_25_in_rule__OpCompare__Alternatives5702); if (state.failed) return ;
+                    match(input,25,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpCompareAccess().getGreaterThanSignEqualsSignKeyword_0()); 
                     }
@@ -8409,18 +8409,18 @@ else if ( (LA9_2==EOF||(LA9_2>=RULE_ID && LA9_2<=RULE_STRING)||LA9_2==27||(LA9_2
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2692:6: ( ( rule__OpCompare__Group_1__0 ) )
+                    // InternalCheckCfg.g:2692:6: ( ( rule__OpCompare__Group_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2692:6: ( ( rule__OpCompare__Group_1__0 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2693:1: ( rule__OpCompare__Group_1__0 )
+                    // InternalCheckCfg.g:2692:6: ( ( rule__OpCompare__Group_1__0 ) )
+                    // InternalCheckCfg.g:2693:1: ( rule__OpCompare__Group_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpCompareAccess().getGroup_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2694:1: ( rule__OpCompare__Group_1__0 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2694:2: rule__OpCompare__Group_1__0
+                    // InternalCheckCfg.g:2694:1: ( rule__OpCompare__Group_1__0 )
+                    // InternalCheckCfg.g:2694:2: rule__OpCompare__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__OpCompare__Group_1__0_in_rule__OpCompare__Alternatives5721);
+                    pushFollow(FOLLOW_2);
                     rule__OpCompare__Group_1__0();
 
                     state._fsp--;
@@ -8438,15 +8438,15 @@ else if ( (LA9_2==EOF||(LA9_2>=RULE_ID && LA9_2<=RULE_STRING)||LA9_2==27||(LA9_2
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2698:6: ( '>' )
+                    // InternalCheckCfg.g:2698:6: ( '>' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2698:6: ( '>' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2699:1: '>'
+                    // InternalCheckCfg.g:2698:6: ( '>' )
+                    // InternalCheckCfg.g:2699:1: '>'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpCompareAccess().getGreaterThanSignKeyword_2()); 
                     }
-                    match(input,26,FOLLOW_26_in_rule__OpCompare__Alternatives5740); if (state.failed) return ;
+                    match(input,26,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpCompareAccess().getGreaterThanSignKeyword_2()); 
                     }
@@ -8457,15 +8457,15 @@ else if ( (LA9_2==EOF||(LA9_2>=RULE_ID && LA9_2<=RULE_STRING)||LA9_2==27||(LA9_2
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2706:6: ( '<' )
+                    // InternalCheckCfg.g:2706:6: ( '<' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2706:6: ( '<' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2707:1: '<'
+                    // InternalCheckCfg.g:2706:6: ( '<' )
+                    // InternalCheckCfg.g:2707:1: '<'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpCompareAccess().getLessThanSignKeyword_3()); 
                     }
-                    match(input,27,FOLLOW_27_in_rule__OpCompare__Alternatives5760); if (state.failed) return ;
+                    match(input,27,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpCompareAccess().getLessThanSignKeyword_3()); 
                     }
@@ -8493,26 +8493,26 @@ else if ( (LA9_2==EOF||(LA9_2>=RULE_ID && LA9_2<=RULE_STRING)||LA9_2==27||(LA9_2
 
 
     // $ANTLR start "rule__OpOther__Alternatives"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2719:1: rule__OpOther__Alternatives : ( ( '->' ) | ( '..<' ) | ( ( rule__OpOther__Group_2__0 ) ) | ( '..' ) | ( '=>' ) | ( ( rule__OpOther__Group_5__0 ) ) | ( ( rule__OpOther__Group_6__0 ) ) | ( '<>' ) | ( '?:' ) );
+    // InternalCheckCfg.g:2719:1: rule__OpOther__Alternatives : ( ( '->' ) | ( '..<' ) | ( ( rule__OpOther__Group_2__0 ) ) | ( '..' ) | ( '=>' ) | ( ( rule__OpOther__Group_5__0 ) ) | ( ( rule__OpOther__Group_6__0 ) ) | ( '<>' ) | ( '?:' ) );
     public final void rule__OpOther__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2723:1: ( ( '->' ) | ( '..<' ) | ( ( rule__OpOther__Group_2__0 ) ) | ( '..' ) | ( '=>' ) | ( ( rule__OpOther__Group_5__0 ) ) | ( ( rule__OpOther__Group_6__0 ) ) | ( '<>' ) | ( '?:' ) )
+            // InternalCheckCfg.g:2723:1: ( ( '->' ) | ( '..<' ) | ( ( rule__OpOther__Group_2__0 ) ) | ( '..' ) | ( '=>' ) | ( ( rule__OpOther__Group_5__0 ) ) | ( ( rule__OpOther__Group_6__0 ) ) | ( '<>' ) | ( '?:' ) )
             int alt10=9;
             alt10 = dfa10.predict(input);
             switch (alt10) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2724:1: ( '->' )
+                    // InternalCheckCfg.g:2724:1: ( '->' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2724:1: ( '->' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2725:1: '->'
+                    // InternalCheckCfg.g:2724:1: ( '->' )
+                    // InternalCheckCfg.g:2725:1: '->'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getHyphenMinusGreaterThanSignKeyword_0()); 
                     }
-                    match(input,28,FOLLOW_28_in_rule__OpOther__Alternatives5795); if (state.failed) return ;
+                    match(input,28,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpOtherAccess().getHyphenMinusGreaterThanSignKeyword_0()); 
                     }
@@ -8523,15 +8523,15 @@ public final void rule__OpOther__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2732:6: ( '..<' )
+                    // InternalCheckCfg.g:2732:6: ( '..<' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2732:6: ( '..<' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2733:1: '..<'
+                    // InternalCheckCfg.g:2732:6: ( '..<' )
+                    // InternalCheckCfg.g:2733:1: '..<'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getFullStopFullStopLessThanSignKeyword_1()); 
                     }
-                    match(input,29,FOLLOW_29_in_rule__OpOther__Alternatives5815); if (state.failed) return ;
+                    match(input,29,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpOtherAccess().getFullStopFullStopLessThanSignKeyword_1()); 
                     }
@@ -8542,18 +8542,18 @@ public final void rule__OpOther__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2740:6: ( ( rule__OpOther__Group_2__0 ) )
+                    // InternalCheckCfg.g:2740:6: ( ( rule__OpOther__Group_2__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2740:6: ( ( rule__OpOther__Group_2__0 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2741:1: ( rule__OpOther__Group_2__0 )
+                    // InternalCheckCfg.g:2740:6: ( ( rule__OpOther__Group_2__0 ) )
+                    // InternalCheckCfg.g:2741:1: ( rule__OpOther__Group_2__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getGroup_2()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2742:1: ( rule__OpOther__Group_2__0 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2742:2: rule__OpOther__Group_2__0
+                    // InternalCheckCfg.g:2742:1: ( rule__OpOther__Group_2__0 )
+                    // InternalCheckCfg.g:2742:2: rule__OpOther__Group_2__0
                     {
-                    pushFollow(FOLLOW_rule__OpOther__Group_2__0_in_rule__OpOther__Alternatives5834);
+                    pushFollow(FOLLOW_2);
                     rule__OpOther__Group_2__0();
 
                     state._fsp--;
@@ -8571,15 +8571,15 @@ public final void rule__OpOther__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2746:6: ( '..' )
+                    // InternalCheckCfg.g:2746:6: ( '..' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2746:6: ( '..' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2747:1: '..'
+                    // InternalCheckCfg.g:2746:6: ( '..' )
+                    // InternalCheckCfg.g:2747:1: '..'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getFullStopFullStopKeyword_3()); 
                     }
-                    match(input,30,FOLLOW_30_in_rule__OpOther__Alternatives5853); if (state.failed) return ;
+                    match(input,30,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpOtherAccess().getFullStopFullStopKeyword_3()); 
                     }
@@ -8590,15 +8590,15 @@ public final void rule__OpOther__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2754:6: ( '=>' )
+                    // InternalCheckCfg.g:2754:6: ( '=>' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2754:6: ( '=>' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2755:1: '=>'
+                    // InternalCheckCfg.g:2754:6: ( '=>' )
+                    // InternalCheckCfg.g:2755:1: '=>'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getEqualsSignGreaterThanSignKeyword_4()); 
                     }
-                    match(input,31,FOLLOW_31_in_rule__OpOther__Alternatives5873); if (state.failed) return ;
+                    match(input,31,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpOtherAccess().getEqualsSignGreaterThanSignKeyword_4()); 
                     }
@@ -8609,18 +8609,18 @@ public final void rule__OpOther__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2762:6: ( ( rule__OpOther__Group_5__0 ) )
+                    // InternalCheckCfg.g:2762:6: ( ( rule__OpOther__Group_5__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2762:6: ( ( rule__OpOther__Group_5__0 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2763:1: ( rule__OpOther__Group_5__0 )
+                    // InternalCheckCfg.g:2762:6: ( ( rule__OpOther__Group_5__0 ) )
+                    // InternalCheckCfg.g:2763:1: ( rule__OpOther__Group_5__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getGroup_5()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2764:1: ( rule__OpOther__Group_5__0 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2764:2: rule__OpOther__Group_5__0
+                    // InternalCheckCfg.g:2764:1: ( rule__OpOther__Group_5__0 )
+                    // InternalCheckCfg.g:2764:2: rule__OpOther__Group_5__0
                     {
-                    pushFollow(FOLLOW_rule__OpOther__Group_5__0_in_rule__OpOther__Alternatives5892);
+                    pushFollow(FOLLOW_2);
                     rule__OpOther__Group_5__0();
 
                     state._fsp--;
@@ -8638,18 +8638,18 @@ public final void rule__OpOther__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2768:6: ( ( rule__OpOther__Group_6__0 ) )
+                    // InternalCheckCfg.g:2768:6: ( ( rule__OpOther__Group_6__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2768:6: ( ( rule__OpOther__Group_6__0 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2769:1: ( rule__OpOther__Group_6__0 )
+                    // InternalCheckCfg.g:2768:6: ( ( rule__OpOther__Group_6__0 ) )
+                    // InternalCheckCfg.g:2769:1: ( rule__OpOther__Group_6__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getGroup_6()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2770:1: ( rule__OpOther__Group_6__0 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2770:2: rule__OpOther__Group_6__0
+                    // InternalCheckCfg.g:2770:1: ( rule__OpOther__Group_6__0 )
+                    // InternalCheckCfg.g:2770:2: rule__OpOther__Group_6__0
                     {
-                    pushFollow(FOLLOW_rule__OpOther__Group_6__0_in_rule__OpOther__Alternatives5910);
+                    pushFollow(FOLLOW_2);
                     rule__OpOther__Group_6__0();
 
                     state._fsp--;
@@ -8667,15 +8667,15 @@ public final void rule__OpOther__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 8 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2774:6: ( '<>' )
+                    // InternalCheckCfg.g:2774:6: ( '<>' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2774:6: ( '<>' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2775:1: '<>'
+                    // InternalCheckCfg.g:2774:6: ( '<>' )
+                    // InternalCheckCfg.g:2775:1: '<>'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getLessThanSignGreaterThanSignKeyword_7()); 
                     }
-                    match(input,32,FOLLOW_32_in_rule__OpOther__Alternatives5929); if (state.failed) return ;
+                    match(input,32,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpOtherAccess().getLessThanSignGreaterThanSignKeyword_7()); 
                     }
@@ -8686,15 +8686,15 @@ public final void rule__OpOther__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 9 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2782:6: ( '?:' )
+                    // InternalCheckCfg.g:2782:6: ( '?:' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2782:6: ( '?:' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2783:1: '?:'
+                    // InternalCheckCfg.g:2782:6: ( '?:' )
+                    // InternalCheckCfg.g:2783:1: '?:'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getQuestionMarkColonKeyword_8()); 
                     }
-                    match(input,33,FOLLOW_33_in_rule__OpOther__Alternatives5949); if (state.failed) return ;
+                    match(input,33,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpOtherAccess().getQuestionMarkColonKeyword_8()); 
                     }
@@ -8722,13 +8722,13 @@ public final void rule__OpOther__Alternatives() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpOther__Alternatives_5_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2795:1: rule__OpOther__Alternatives_5_1 : ( ( ( rule__OpOther__Group_5_1_0__0 ) ) | ( '>' ) );
+    // InternalCheckCfg.g:2795:1: rule__OpOther__Alternatives_5_1 : ( ( ( rule__OpOther__Group_5_1_0__0 ) ) | ( '>' ) );
     public final void rule__OpOther__Alternatives_5_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2799:1: ( ( ( rule__OpOther__Group_5_1_0__0 ) ) | ( '>' ) )
+            // InternalCheckCfg.g:2799:1: ( ( ( rule__OpOther__Group_5_1_0__0 ) ) | ( '>' ) )
             int alt11=2;
             int LA11_0 = input.LA(1);
 
@@ -8758,18 +8758,18 @@ else if ( (LA11_1==EOF||(LA11_1>=RULE_ID && LA11_1<=RULE_STRING)||LA11_1==27||(L
             }
             switch (alt11) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2800:1: ( ( rule__OpOther__Group_5_1_0__0 ) )
+                    // InternalCheckCfg.g:2800:1: ( ( rule__OpOther__Group_5_1_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2800:1: ( ( rule__OpOther__Group_5_1_0__0 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2801:1: ( rule__OpOther__Group_5_1_0__0 )
+                    // InternalCheckCfg.g:2800:1: ( ( rule__OpOther__Group_5_1_0__0 ) )
+                    // InternalCheckCfg.g:2801:1: ( rule__OpOther__Group_5_1_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getGroup_5_1_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2802:1: ( rule__OpOther__Group_5_1_0__0 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2802:2: rule__OpOther__Group_5_1_0__0
+                    // InternalCheckCfg.g:2802:1: ( rule__OpOther__Group_5_1_0__0 )
+                    // InternalCheckCfg.g:2802:2: rule__OpOther__Group_5_1_0__0
                     {
-                    pushFollow(FOLLOW_rule__OpOther__Group_5_1_0__0_in_rule__OpOther__Alternatives_5_15983);
+                    pushFollow(FOLLOW_2);
                     rule__OpOther__Group_5_1_0__0();
 
                     state._fsp--;
@@ -8787,15 +8787,15 @@ else if ( (LA11_1==EOF||(LA11_1>=RULE_ID && LA11_1<=RULE_STRING)||LA11_1==27||(L
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2806:6: ( '>' )
+                    // InternalCheckCfg.g:2806:6: ( '>' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2806:6: ( '>' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2807:1: '>'
+                    // InternalCheckCfg.g:2806:6: ( '>' )
+                    // InternalCheckCfg.g:2807:1: '>'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_1_1()); 
                     }
-                    match(input,26,FOLLOW_26_in_rule__OpOther__Alternatives_5_16002); if (state.failed) return ;
+                    match(input,26,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_1_1()); 
                     }
@@ -8823,13 +8823,13 @@ else if ( (LA11_1==EOF||(LA11_1>=RULE_ID && LA11_1<=RULE_STRING)||LA11_1==27||(L
 
 
     // $ANTLR start "rule__OpOther__Alternatives_6_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2819:1: rule__OpOther__Alternatives_6_1 : ( ( ( rule__OpOther__Group_6_1_0__0 ) ) | ( '<' ) | ( '=>' ) );
+    // InternalCheckCfg.g:2819:1: rule__OpOther__Alternatives_6_1 : ( ( ( rule__OpOther__Group_6_1_0__0 ) ) | ( '<' ) | ( '=>' ) );
     public final void rule__OpOther__Alternatives_6_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2823:1: ( ( ( rule__OpOther__Group_6_1_0__0 ) ) | ( '<' ) | ( '=>' ) )
+            // InternalCheckCfg.g:2823:1: ( ( ( rule__OpOther__Group_6_1_0__0 ) ) | ( '<' ) | ( '=>' ) )
             int alt12=3;
             int LA12_0 = input.LA(1);
 
@@ -8862,18 +8862,18 @@ else if ( (LA12_0==31) ) {
             }
             switch (alt12) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2824:1: ( ( rule__OpOther__Group_6_1_0__0 ) )
+                    // InternalCheckCfg.g:2824:1: ( ( rule__OpOther__Group_6_1_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2824:1: ( ( rule__OpOther__Group_6_1_0__0 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2825:1: ( rule__OpOther__Group_6_1_0__0 )
+                    // InternalCheckCfg.g:2824:1: ( ( rule__OpOther__Group_6_1_0__0 ) )
+                    // InternalCheckCfg.g:2825:1: ( rule__OpOther__Group_6_1_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getGroup_6_1_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2826:1: ( rule__OpOther__Group_6_1_0__0 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2826:2: rule__OpOther__Group_6_1_0__0
+                    // InternalCheckCfg.g:2826:1: ( rule__OpOther__Group_6_1_0__0 )
+                    // InternalCheckCfg.g:2826:2: rule__OpOther__Group_6_1_0__0
                     {
-                    pushFollow(FOLLOW_rule__OpOther__Group_6_1_0__0_in_rule__OpOther__Alternatives_6_16036);
+                    pushFollow(FOLLOW_2);
                     rule__OpOther__Group_6_1_0__0();
 
                     state._fsp--;
@@ -8891,15 +8891,15 @@ else if ( (LA12_0==31) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2830:6: ( '<' )
+                    // InternalCheckCfg.g:2830:6: ( '<' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2830:6: ( '<' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2831:1: '<'
+                    // InternalCheckCfg.g:2830:6: ( '<' )
+                    // InternalCheckCfg.g:2831:1: '<'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_1_1()); 
                     }
-                    match(input,27,FOLLOW_27_in_rule__OpOther__Alternatives_6_16055); if (state.failed) return ;
+                    match(input,27,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_1_1()); 
                     }
@@ -8910,15 +8910,15 @@ else if ( (LA12_0==31) ) {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2838:6: ( '=>' )
+                    // InternalCheckCfg.g:2838:6: ( '=>' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2838:6: ( '=>' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2839:1: '=>'
+                    // InternalCheckCfg.g:2838:6: ( '=>' )
+                    // InternalCheckCfg.g:2839:1: '=>'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getEqualsSignGreaterThanSignKeyword_6_1_2()); 
                     }
-                    match(input,31,FOLLOW_31_in_rule__OpOther__Alternatives_6_16075); if (state.failed) return ;
+                    match(input,31,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpOtherAccess().getEqualsSignGreaterThanSignKeyword_6_1_2()); 
                     }
@@ -8946,13 +8946,13 @@ else if ( (LA12_0==31) ) {
 
 
     // $ANTLR start "rule__OpAdd__Alternatives"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2851:1: rule__OpAdd__Alternatives : ( ( '+' ) | ( '-' ) );
+    // InternalCheckCfg.g:2851:1: rule__OpAdd__Alternatives : ( ( '+' ) | ( '-' ) );
     public final void rule__OpAdd__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2855:1: ( ( '+' ) | ( '-' ) )
+            // InternalCheckCfg.g:2855:1: ( ( '+' ) | ( '-' ) )
             int alt13=2;
             int LA13_0 = input.LA(1);
 
@@ -8971,15 +8971,15 @@ else if ( (LA13_0==35) ) {
             }
             switch (alt13) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2856:1: ( '+' )
+                    // InternalCheckCfg.g:2856:1: ( '+' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2856:1: ( '+' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2857:1: '+'
+                    // InternalCheckCfg.g:2856:1: ( '+' )
+                    // InternalCheckCfg.g:2857:1: '+'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpAddAccess().getPlusSignKeyword_0()); 
                     }
-                    match(input,34,FOLLOW_34_in_rule__OpAdd__Alternatives6110); if (state.failed) return ;
+                    match(input,34,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpAddAccess().getPlusSignKeyword_0()); 
                     }
@@ -8990,15 +8990,15 @@ else if ( (LA13_0==35) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2864:6: ( '-' )
+                    // InternalCheckCfg.g:2864:6: ( '-' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2864:6: ( '-' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2865:1: '-'
+                    // InternalCheckCfg.g:2864:6: ( '-' )
+                    // InternalCheckCfg.g:2865:1: '-'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpAddAccess().getHyphenMinusKeyword_1()); 
                     }
-                    match(input,35,FOLLOW_35_in_rule__OpAdd__Alternatives6130); if (state.failed) return ;
+                    match(input,35,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpAddAccess().getHyphenMinusKeyword_1()); 
                     }
@@ -9026,13 +9026,13 @@ else if ( (LA13_0==35) ) {
 
 
     // $ANTLR start "rule__OpMulti__Alternatives"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2877:1: rule__OpMulti__Alternatives : ( ( '*' ) | ( '**' ) | ( '/' ) | ( '%' ) );
+    // InternalCheckCfg.g:2877:1: rule__OpMulti__Alternatives : ( ( '*' ) | ( '**' ) | ( '/' ) | ( '%' ) );
     public final void rule__OpMulti__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2881:1: ( ( '*' ) | ( '**' ) | ( '/' ) | ( '%' ) )
+            // InternalCheckCfg.g:2881:1: ( ( '*' ) | ( '**' ) | ( '/' ) | ( '%' ) )
             int alt14=4;
             switch ( input.LA(1) ) {
             case 36:
@@ -9065,15 +9065,15 @@ public final void rule__OpMulti__Alternatives() throws RecognitionException {
 
             switch (alt14) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2882:1: ( '*' )
+                    // InternalCheckCfg.g:2882:1: ( '*' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2882:1: ( '*' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2883:1: '*'
+                    // InternalCheckCfg.g:2882:1: ( '*' )
+                    // InternalCheckCfg.g:2883:1: '*'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAccess().getAsteriskKeyword_0()); 
                     }
-                    match(input,36,FOLLOW_36_in_rule__OpMulti__Alternatives6165); if (state.failed) return ;
+                    match(input,36,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpMultiAccess().getAsteriskKeyword_0()); 
                     }
@@ -9084,15 +9084,15 @@ public final void rule__OpMulti__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2890:6: ( '**' )
+                    // InternalCheckCfg.g:2890:6: ( '**' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2890:6: ( '**' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2891:1: '**'
+                    // InternalCheckCfg.g:2890:6: ( '**' )
+                    // InternalCheckCfg.g:2891:1: '**'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAccess().getAsteriskAsteriskKeyword_1()); 
                     }
-                    match(input,37,FOLLOW_37_in_rule__OpMulti__Alternatives6185); if (state.failed) return ;
+                    match(input,37,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpMultiAccess().getAsteriskAsteriskKeyword_1()); 
                     }
@@ -9103,15 +9103,15 @@ public final void rule__OpMulti__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2898:6: ( '/' )
+                    // InternalCheckCfg.g:2898:6: ( '/' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2898:6: ( '/' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2899:1: '/'
+                    // InternalCheckCfg.g:2898:6: ( '/' )
+                    // InternalCheckCfg.g:2899:1: '/'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAccess().getSolidusKeyword_2()); 
                     }
-                    match(input,38,FOLLOW_38_in_rule__OpMulti__Alternatives6205); if (state.failed) return ;
+                    match(input,38,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpMultiAccess().getSolidusKeyword_2()); 
                     }
@@ -9122,15 +9122,15 @@ public final void rule__OpMulti__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2906:6: ( '%' )
+                    // InternalCheckCfg.g:2906:6: ( '%' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2906:6: ( '%' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2907:1: '%'
+                    // InternalCheckCfg.g:2906:6: ( '%' )
+                    // InternalCheckCfg.g:2907:1: '%'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAccess().getPercentSignKeyword_3()); 
                     }
-                    match(input,39,FOLLOW_39_in_rule__OpMulti__Alternatives6225); if (state.failed) return ;
+                    match(input,39,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpMultiAccess().getPercentSignKeyword_3()); 
                     }
@@ -9158,13 +9158,13 @@ public final void rule__OpMulti__Alternatives() throws RecognitionException {
 
 
     // $ANTLR start "rule__XUnaryOperation__Alternatives"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2919:1: rule__XUnaryOperation__Alternatives : ( ( ( rule__XUnaryOperation__Group_0__0 ) ) | ( ruleXCastedExpression ) );
+    // InternalCheckCfg.g:2919:1: rule__XUnaryOperation__Alternatives : ( ( ( rule__XUnaryOperation__Group_0__0 ) ) | ( ruleXCastedExpression ) );
     public final void rule__XUnaryOperation__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2923:1: ( ( ( rule__XUnaryOperation__Group_0__0 ) ) | ( ruleXCastedExpression ) )
+            // InternalCheckCfg.g:2923:1: ( ( ( rule__XUnaryOperation__Group_0__0 ) ) | ( ruleXCastedExpression ) )
             int alt15=2;
             int LA15_0 = input.LA(1);
 
@@ -9183,18 +9183,18 @@ else if ( ((LA15_0>=RULE_ID && LA15_0<=RULE_STRING)||LA15_0==27||(LA15_0>=45 &&
             }
             switch (alt15) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2924:1: ( ( rule__XUnaryOperation__Group_0__0 ) )
+                    // InternalCheckCfg.g:2924:1: ( ( rule__XUnaryOperation__Group_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2924:1: ( ( rule__XUnaryOperation__Group_0__0 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2925:1: ( rule__XUnaryOperation__Group_0__0 )
+                    // InternalCheckCfg.g:2924:1: ( ( rule__XUnaryOperation__Group_0__0 ) )
+                    // InternalCheckCfg.g:2925:1: ( rule__XUnaryOperation__Group_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXUnaryOperationAccess().getGroup_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2926:1: ( rule__XUnaryOperation__Group_0__0 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2926:2: rule__XUnaryOperation__Group_0__0
+                    // InternalCheckCfg.g:2926:1: ( rule__XUnaryOperation__Group_0__0 )
+                    // InternalCheckCfg.g:2926:2: rule__XUnaryOperation__Group_0__0
                     {
-                    pushFollow(FOLLOW_rule__XUnaryOperation__Group_0__0_in_rule__XUnaryOperation__Alternatives6259);
+                    pushFollow(FOLLOW_2);
                     rule__XUnaryOperation__Group_0__0();
 
                     state._fsp--;
@@ -9212,15 +9212,15 @@ else if ( ((LA15_0>=RULE_ID && LA15_0<=RULE_STRING)||LA15_0==27||(LA15_0>=45 &&
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2930:6: ( ruleXCastedExpression )
+                    // InternalCheckCfg.g:2930:6: ( ruleXCastedExpression )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2930:6: ( ruleXCastedExpression )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2931:1: ruleXCastedExpression
+                    // InternalCheckCfg.g:2930:6: ( ruleXCastedExpression )
+                    // InternalCheckCfg.g:2931:1: ruleXCastedExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXUnaryOperationAccess().getXCastedExpressionParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleXCastedExpression_in_rule__XUnaryOperation__Alternatives6277);
+                    pushFollow(FOLLOW_2);
                     ruleXCastedExpression();
 
                     state._fsp--;
@@ -9252,13 +9252,13 @@ else if ( ((LA15_0>=RULE_ID && LA15_0<=RULE_STRING)||LA15_0==27||(LA15_0>=45 &&
 
 
     // $ANTLR start "rule__OpUnary__Alternatives"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2941:1: rule__OpUnary__Alternatives : ( ( '!' ) | ( '-' ) | ( '+' ) );
+    // InternalCheckCfg.g:2941:1: rule__OpUnary__Alternatives : ( ( '!' ) | ( '-' ) | ( '+' ) );
     public final void rule__OpUnary__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2945:1: ( ( '!' ) | ( '-' ) | ( '+' ) )
+            // InternalCheckCfg.g:2945:1: ( ( '!' ) | ( '-' ) | ( '+' ) )
             int alt16=3;
             switch ( input.LA(1) ) {
             case 40:
@@ -9286,15 +9286,15 @@ public final void rule__OpUnary__Alternatives() throws RecognitionException {
 
             switch (alt16) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2946:1: ( '!' )
+                    // InternalCheckCfg.g:2946:1: ( '!' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2946:1: ( '!' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2947:1: '!'
+                    // InternalCheckCfg.g:2946:1: ( '!' )
+                    // InternalCheckCfg.g:2947:1: '!'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpUnaryAccess().getExclamationMarkKeyword_0()); 
                     }
-                    match(input,40,FOLLOW_40_in_rule__OpUnary__Alternatives6310); if (state.failed) return ;
+                    match(input,40,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpUnaryAccess().getExclamationMarkKeyword_0()); 
                     }
@@ -9305,15 +9305,15 @@ public final void rule__OpUnary__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2954:6: ( '-' )
+                    // InternalCheckCfg.g:2954:6: ( '-' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2954:6: ( '-' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2955:1: '-'
+                    // InternalCheckCfg.g:2954:6: ( '-' )
+                    // InternalCheckCfg.g:2955:1: '-'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpUnaryAccess().getHyphenMinusKeyword_1()); 
                     }
-                    match(input,35,FOLLOW_35_in_rule__OpUnary__Alternatives6330); if (state.failed) return ;
+                    match(input,35,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpUnaryAccess().getHyphenMinusKeyword_1()); 
                     }
@@ -9324,15 +9324,15 @@ public final void rule__OpUnary__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2962:6: ( '+' )
+                    // InternalCheckCfg.g:2962:6: ( '+' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2962:6: ( '+' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2963:1: '+'
+                    // InternalCheckCfg.g:2962:6: ( '+' )
+                    // InternalCheckCfg.g:2963:1: '+'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpUnaryAccess().getPlusSignKeyword_2()); 
                     }
-                    match(input,34,FOLLOW_34_in_rule__OpUnary__Alternatives6350); if (state.failed) return ;
+                    match(input,34,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpUnaryAccess().getPlusSignKeyword_2()); 
                     }
@@ -9360,13 +9360,13 @@ public final void rule__OpUnary__Alternatives() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpPostfix__Alternatives"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2975:1: rule__OpPostfix__Alternatives : ( ( '++' ) | ( '--' ) );
+    // InternalCheckCfg.g:2975:1: rule__OpPostfix__Alternatives : ( ( '++' ) | ( '--' ) );
     public final void rule__OpPostfix__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2979:1: ( ( '++' ) | ( '--' ) )
+            // InternalCheckCfg.g:2979:1: ( ( '++' ) | ( '--' ) )
             int alt17=2;
             int LA17_0 = input.LA(1);
 
@@ -9385,15 +9385,15 @@ else if ( (LA17_0==42) ) {
             }
             switch (alt17) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2980:1: ( '++' )
+                    // InternalCheckCfg.g:2980:1: ( '++' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2980:1: ( '++' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2981:1: '++'
+                    // InternalCheckCfg.g:2980:1: ( '++' )
+                    // InternalCheckCfg.g:2981:1: '++'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpPostfixAccess().getPlusSignPlusSignKeyword_0()); 
                     }
-                    match(input,41,FOLLOW_41_in_rule__OpPostfix__Alternatives6385); if (state.failed) return ;
+                    match(input,41,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpPostfixAccess().getPlusSignPlusSignKeyword_0()); 
                     }
@@ -9404,15 +9404,15 @@ else if ( (LA17_0==42) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2988:6: ( '--' )
+                    // InternalCheckCfg.g:2988:6: ( '--' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2988:6: ( '--' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2989:1: '--'
+                    // InternalCheckCfg.g:2988:6: ( '--' )
+                    // InternalCheckCfg.g:2989:1: '--'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpPostfixAccess().getHyphenMinusHyphenMinusKeyword_1()); 
                     }
-                    match(input,42,FOLLOW_42_in_rule__OpPostfix__Alternatives6405); if (state.failed) return ;
+                    match(input,42,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpPostfixAccess().getHyphenMinusHyphenMinusKeyword_1()); 
                     }
@@ -9440,29 +9440,29 @@ else if ( (LA17_0==42) ) {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Alternatives_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3001:1: rule__XMemberFeatureCall__Alternatives_1 : ( ( ( rule__XMemberFeatureCall__Group_1_0__0 ) ) | ( ( rule__XMemberFeatureCall__Group_1_1__0 ) ) );
+    // InternalCheckCfg.g:3001:1: rule__XMemberFeatureCall__Alternatives_1 : ( ( ( rule__XMemberFeatureCall__Group_1_0__0 ) ) | ( ( rule__XMemberFeatureCall__Group_1_1__0 ) ) );
     public final void rule__XMemberFeatureCall__Alternatives_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3005:1: ( ( ( rule__XMemberFeatureCall__Group_1_0__0 ) ) | ( ( rule__XMemberFeatureCall__Group_1_1__0 ) ) )
+            // InternalCheckCfg.g:3005:1: ( ( ( rule__XMemberFeatureCall__Group_1_0__0 ) ) | ( ( rule__XMemberFeatureCall__Group_1_1__0 ) ) )
             int alt18=2;
             alt18 = dfa18.predict(input);
             switch (alt18) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3006:1: ( ( rule__XMemberFeatureCall__Group_1_0__0 ) )
+                    // InternalCheckCfg.g:3006:1: ( ( rule__XMemberFeatureCall__Group_1_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3006:1: ( ( rule__XMemberFeatureCall__Group_1_0__0 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3007:1: ( rule__XMemberFeatureCall__Group_1_0__0 )
+                    // InternalCheckCfg.g:3006:1: ( ( rule__XMemberFeatureCall__Group_1_0__0 ) )
+                    // InternalCheckCfg.g:3007:1: ( rule__XMemberFeatureCall__Group_1_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3008:1: ( rule__XMemberFeatureCall__Group_1_0__0 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3008:2: rule__XMemberFeatureCall__Group_1_0__0
+                    // InternalCheckCfg.g:3008:1: ( rule__XMemberFeatureCall__Group_1_0__0 )
+                    // InternalCheckCfg.g:3008:2: rule__XMemberFeatureCall__Group_1_0__0
                     {
-                    pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0__0_in_rule__XMemberFeatureCall__Alternatives_16439);
+                    pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__Group_1_0__0();
 
                     state._fsp--;
@@ -9480,18 +9480,18 @@ public final void rule__XMemberFeatureCall__Alternatives_1() throws RecognitionE
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3012:6: ( ( rule__XMemberFeatureCall__Group_1_1__0 ) )
+                    // InternalCheckCfg.g:3012:6: ( ( rule__XMemberFeatureCall__Group_1_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3012:6: ( ( rule__XMemberFeatureCall__Group_1_1__0 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3013:1: ( rule__XMemberFeatureCall__Group_1_1__0 )
+                    // InternalCheckCfg.g:3012:6: ( ( rule__XMemberFeatureCall__Group_1_1__0 ) )
+                    // InternalCheckCfg.g:3013:1: ( rule__XMemberFeatureCall__Group_1_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3014:1: ( rule__XMemberFeatureCall__Group_1_1__0 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3014:2: rule__XMemberFeatureCall__Group_1_1__0
+                    // InternalCheckCfg.g:3014:1: ( rule__XMemberFeatureCall__Group_1_1__0 )
+                    // InternalCheckCfg.g:3014:2: rule__XMemberFeatureCall__Group_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__0_in_rule__XMemberFeatureCall__Alternatives_16457);
+                    pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__Group_1_1__0();
 
                     state._fsp--;
@@ -9526,13 +9526,13 @@ public final void rule__XMemberFeatureCall__Alternatives_1() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Alternatives_1_0_0_0_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3023:1: rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 : ( ( '.' ) | ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 ) ) );
+    // InternalCheckCfg.g:3023:1: rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 : ( ( '.' ) | ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 ) ) );
     public final void rule__XMemberFeatureCall__Alternatives_1_0_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3027:1: ( ( '.' ) | ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 ) ) )
+            // InternalCheckCfg.g:3027:1: ( ( '.' ) | ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 ) ) )
             int alt19=2;
             int LA19_0 = input.LA(1);
 
@@ -9551,15 +9551,15 @@ else if ( (LA19_0==89) ) {
             }
             switch (alt19) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3028:1: ( '.' )
+                    // InternalCheckCfg.g:3028:1: ( '.' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3028:1: ( '.' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3029:1: '.'
+                    // InternalCheckCfg.g:3028:1: ( '.' )
+                    // InternalCheckCfg.g:3029:1: '.'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXMemberFeatureCallAccess().getFullStopKeyword_1_0_0_0_1_0()); 
                     }
-                    match(input,43,FOLLOW_43_in_rule__XMemberFeatureCall__Alternatives_1_0_0_0_16491); if (state.failed) return ;
+                    match(input,43,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getXMemberFeatureCallAccess().getFullStopKeyword_1_0_0_0_1_0()); 
                     }
@@ -9570,18 +9570,18 @@ else if ( (LA19_0==89) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3036:6: ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 ) )
+                    // InternalCheckCfg.g:3036:6: ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3036:6: ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3037:1: ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 )
+                    // InternalCheckCfg.g:3036:6: ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 ) )
+                    // InternalCheckCfg.g:3037:1: ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticAssignment_1_0_0_0_1_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3038:1: ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3038:2: rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1
+                    // InternalCheckCfg.g:3038:1: ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 )
+                    // InternalCheckCfg.g:3038:2: rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1
                     {
-                    pushFollow(FOLLOW_rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1_in_rule__XMemberFeatureCall__Alternatives_1_0_0_0_16510);
+                    pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1();
 
                     state._fsp--;
@@ -9616,13 +9616,13 @@ else if ( (LA19_0==89) ) {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Alternatives_1_1_0_0_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3047:1: rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 : ( ( '.' ) | ( ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 ) ) | ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 ) ) );
+    // InternalCheckCfg.g:3047:1: rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 : ( ( '.' ) | ( ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 ) ) | ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 ) ) );
     public final void rule__XMemberFeatureCall__Alternatives_1_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3051:1: ( ( '.' ) | ( ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 ) ) | ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 ) ) )
+            // InternalCheckCfg.g:3051:1: ( ( '.' ) | ( ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 ) ) | ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 ) ) )
             int alt20=3;
             switch ( input.LA(1) ) {
             case 43:
@@ -9650,15 +9650,15 @@ public final void rule__XMemberFeatureCall__Alternatives_1_1_0_0_1() throws Reco
 
             switch (alt20) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3052:1: ( '.' )
+                    // InternalCheckCfg.g:3052:1: ( '.' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3052:1: ( '.' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3053:1: '.'
+                    // InternalCheckCfg.g:3052:1: ( '.' )
+                    // InternalCheckCfg.g:3053:1: '.'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXMemberFeatureCallAccess().getFullStopKeyword_1_1_0_0_1_0()); 
                     }
-                    match(input,43,FOLLOW_43_in_rule__XMemberFeatureCall__Alternatives_1_1_0_0_16544); if (state.failed) return ;
+                    match(input,43,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getXMemberFeatureCallAccess().getFullStopKeyword_1_1_0_0_1_0()); 
                     }
@@ -9669,18 +9669,18 @@ public final void rule__XMemberFeatureCall__Alternatives_1_1_0_0_1() throws Reco
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3060:6: ( ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 ) )
+                    // InternalCheckCfg.g:3060:6: ( ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3060:6: ( ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3061:1: ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 )
+                    // InternalCheckCfg.g:3060:6: ( ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 ) )
+                    // InternalCheckCfg.g:3061:1: ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXMemberFeatureCallAccess().getNullSafeAssignment_1_1_0_0_1_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3062:1: ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3062:2: rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1
+                    // InternalCheckCfg.g:3062:1: ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 )
+                    // InternalCheckCfg.g:3062:2: rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1
                     {
-                    pushFollow(FOLLOW_rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1_in_rule__XMemberFeatureCall__Alternatives_1_1_0_0_16563);
+                    pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1();
 
                     state._fsp--;
@@ -9698,18 +9698,18 @@ public final void rule__XMemberFeatureCall__Alternatives_1_1_0_0_1() throws Reco
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3066:6: ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 ) )
+                    // InternalCheckCfg.g:3066:6: ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3066:6: ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3067:1: ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 )
+                    // InternalCheckCfg.g:3066:6: ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 ) )
+                    // InternalCheckCfg.g:3067:1: ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticAssignment_1_1_0_0_1_2()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3068:1: ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3068:2: rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2
+                    // InternalCheckCfg.g:3068:1: ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 )
+                    // InternalCheckCfg.g:3068:2: rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2
                     {
-                    pushFollow(FOLLOW_rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2_in_rule__XMemberFeatureCall__Alternatives_1_1_0_0_16581);
+                    pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2();
 
                     state._fsp--;
@@ -9744,29 +9744,29 @@ public final void rule__XMemberFeatureCall__Alternatives_1_1_0_0_1() throws Reco
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Alternatives_1_1_3_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3077:1: rule__XMemberFeatureCall__Alternatives_1_1_3_1 : ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) ) | ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 ) ) );
+    // InternalCheckCfg.g:3077:1: rule__XMemberFeatureCall__Alternatives_1_1_3_1 : ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) ) | ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 ) ) );
     public final void rule__XMemberFeatureCall__Alternatives_1_1_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3081:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) ) | ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 ) ) )
+            // InternalCheckCfg.g:3081:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) ) | ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 ) ) )
             int alt21=2;
             alt21 = dfa21.predict(input);
             switch (alt21) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3082:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) )
+                    // InternalCheckCfg.g:3082:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3082:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3083:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 )
+                    // InternalCheckCfg.g:3082:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) )
+                    // InternalCheckCfg.g:3083:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsAssignment_1_1_3_1_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3084:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3084:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0
+                    // InternalCheckCfg.g:3084:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 )
+                    // InternalCheckCfg.g:3084:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0
                     {
-                    pushFollow(FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0_in_rule__XMemberFeatureCall__Alternatives_1_1_3_16614);
+                    pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0();
 
                     state._fsp--;
@@ -9784,18 +9784,18 @@ public final void rule__XMemberFeatureCall__Alternatives_1_1_3_1() throws Recogn
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3088:6: ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 ) )
+                    // InternalCheckCfg.g:3088:6: ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3088:6: ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3089:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 )
+                    // InternalCheckCfg.g:3088:6: ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 ) )
+                    // InternalCheckCfg.g:3089:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1_3_1_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3090:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3090:2: rule__XMemberFeatureCall__Group_1_1_3_1_1__0
+                    // InternalCheckCfg.g:3090:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 )
+                    // InternalCheckCfg.g:3090:2: rule__XMemberFeatureCall__Group_1_1_3_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1__0_in_rule__XMemberFeatureCall__Alternatives_1_1_3_16632);
+                    pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__Group_1_1_3_1_1__0();
 
                     state._fsp--;
@@ -9830,26 +9830,26 @@ public final void rule__XMemberFeatureCall__Alternatives_1_1_3_1() throws Recogn
 
 
     // $ANTLR start "rule__XPrimaryExpression__Alternatives"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3099:1: rule__XPrimaryExpression__Alternatives : ( ( ruleXConstructorCall ) | ( ruleXBlockExpression ) | ( ruleXSwitchExpression ) | ( ( ruleXSynchronizedExpression ) ) | ( ruleXFeatureCall ) | ( ruleXLiteral ) | ( ruleXIfExpression ) | ( ( ruleXForLoopExpression ) ) | ( ruleXBasicForLoopExpression ) | ( ruleXWhileExpression ) | ( ruleXDoWhileExpression ) | ( ruleXThrowExpression ) | ( ruleXReturnExpression ) | ( ruleXTryCatchFinallyExpression ) | ( ruleXParenthesizedExpression ) );
+    // InternalCheckCfg.g:3099:1: rule__XPrimaryExpression__Alternatives : ( ( ruleXConstructorCall ) | ( ruleXBlockExpression ) | ( ruleXSwitchExpression ) | ( ( ruleXSynchronizedExpression ) ) | ( ruleXFeatureCall ) | ( ruleXLiteral ) | ( ruleXIfExpression ) | ( ( ruleXForLoopExpression ) ) | ( ruleXBasicForLoopExpression ) | ( ruleXWhileExpression ) | ( ruleXDoWhileExpression ) | ( ruleXThrowExpression ) | ( ruleXReturnExpression ) | ( ruleXTryCatchFinallyExpression ) | ( ruleXParenthesizedExpression ) );
     public final void rule__XPrimaryExpression__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3103:1: ( ( ruleXConstructorCall ) | ( ruleXBlockExpression ) | ( ruleXSwitchExpression ) | ( ( ruleXSynchronizedExpression ) ) | ( ruleXFeatureCall ) | ( ruleXLiteral ) | ( ruleXIfExpression ) | ( ( ruleXForLoopExpression ) ) | ( ruleXBasicForLoopExpression ) | ( ruleXWhileExpression ) | ( ruleXDoWhileExpression ) | ( ruleXThrowExpression ) | ( ruleXReturnExpression ) | ( ruleXTryCatchFinallyExpression ) | ( ruleXParenthesizedExpression ) )
+            // InternalCheckCfg.g:3103:1: ( ( ruleXConstructorCall ) | ( ruleXBlockExpression ) | ( ruleXSwitchExpression ) | ( ( ruleXSynchronizedExpression ) ) | ( ruleXFeatureCall ) | ( ruleXLiteral ) | ( ruleXIfExpression ) | ( ( ruleXForLoopExpression ) ) | ( ruleXBasicForLoopExpression ) | ( ruleXWhileExpression ) | ( ruleXDoWhileExpression ) | ( ruleXThrowExpression ) | ( ruleXReturnExpression ) | ( ruleXTryCatchFinallyExpression ) | ( ruleXParenthesizedExpression ) )
             int alt22=15;
             alt22 = dfa22.predict(input);
             switch (alt22) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3104:1: ( ruleXConstructorCall )
+                    // InternalCheckCfg.g:3104:1: ( ruleXConstructorCall )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3104:1: ( ruleXConstructorCall )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3105:1: ruleXConstructorCall
+                    // InternalCheckCfg.g:3104:1: ( ruleXConstructorCall )
+                    // InternalCheckCfg.g:3105:1: ruleXConstructorCall
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXConstructorCallParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleXConstructorCall_in_rule__XPrimaryExpression__Alternatives6665);
+                    pushFollow(FOLLOW_2);
                     ruleXConstructorCall();
 
                     state._fsp--;
@@ -9864,15 +9864,15 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3110:6: ( ruleXBlockExpression )
+                    // InternalCheckCfg.g:3110:6: ( ruleXBlockExpression )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3110:6: ( ruleXBlockExpression )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3111:1: ruleXBlockExpression
+                    // InternalCheckCfg.g:3110:6: ( ruleXBlockExpression )
+                    // InternalCheckCfg.g:3111:1: ruleXBlockExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXBlockExpressionParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleXBlockExpression_in_rule__XPrimaryExpression__Alternatives6682);
+                    pushFollow(FOLLOW_2);
                     ruleXBlockExpression();
 
                     state._fsp--;
@@ -9887,15 +9887,15 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3116:6: ( ruleXSwitchExpression )
+                    // InternalCheckCfg.g:3116:6: ( ruleXSwitchExpression )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3116:6: ( ruleXSwitchExpression )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3117:1: ruleXSwitchExpression
+                    // InternalCheckCfg.g:3116:6: ( ruleXSwitchExpression )
+                    // InternalCheckCfg.g:3117:1: ruleXSwitchExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXSwitchExpressionParserRuleCall_2()); 
                     }
-                    pushFollow(FOLLOW_ruleXSwitchExpression_in_rule__XPrimaryExpression__Alternatives6699);
+                    pushFollow(FOLLOW_2);
                     ruleXSwitchExpression();
 
                     state._fsp--;
@@ -9910,18 +9910,18 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3122:6: ( ( ruleXSynchronizedExpression ) )
+                    // InternalCheckCfg.g:3122:6: ( ( ruleXSynchronizedExpression ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3122:6: ( ( ruleXSynchronizedExpression ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3123:1: ( ruleXSynchronizedExpression )
+                    // InternalCheckCfg.g:3122:6: ( ( ruleXSynchronizedExpression ) )
+                    // InternalCheckCfg.g:3123:1: ( ruleXSynchronizedExpression )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXSynchronizedExpressionParserRuleCall_3()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3124:1: ( ruleXSynchronizedExpression )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3124:3: ruleXSynchronizedExpression
+                    // InternalCheckCfg.g:3124:1: ( ruleXSynchronizedExpression )
+                    // InternalCheckCfg.g:3124:3: ruleXSynchronizedExpression
                     {
-                    pushFollow(FOLLOW_ruleXSynchronizedExpression_in_rule__XPrimaryExpression__Alternatives6717);
+                    pushFollow(FOLLOW_2);
                     ruleXSynchronizedExpression();
 
                     state._fsp--;
@@ -9939,15 +9939,15 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3128:6: ( ruleXFeatureCall )
+                    // InternalCheckCfg.g:3128:6: ( ruleXFeatureCall )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3128:6: ( ruleXFeatureCall )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3129:1: ruleXFeatureCall
+                    // InternalCheckCfg.g:3128:6: ( ruleXFeatureCall )
+                    // InternalCheckCfg.g:3129:1: ruleXFeatureCall
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXFeatureCallParserRuleCall_4()); 
                     }
-                    pushFollow(FOLLOW_ruleXFeatureCall_in_rule__XPrimaryExpression__Alternatives6735);
+                    pushFollow(FOLLOW_2);
                     ruleXFeatureCall();
 
                     state._fsp--;
@@ -9962,15 +9962,15 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3134:6: ( ruleXLiteral )
+                    // InternalCheckCfg.g:3134:6: ( ruleXLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3134:6: ( ruleXLiteral )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3135:1: ruleXLiteral
+                    // InternalCheckCfg.g:3134:6: ( ruleXLiteral )
+                    // InternalCheckCfg.g:3135:1: ruleXLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXLiteralParserRuleCall_5()); 
                     }
-                    pushFollow(FOLLOW_ruleXLiteral_in_rule__XPrimaryExpression__Alternatives6752);
+                    pushFollow(FOLLOW_2);
                     ruleXLiteral();
 
                     state._fsp--;
@@ -9985,15 +9985,15 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3140:6: ( ruleXIfExpression )
+                    // InternalCheckCfg.g:3140:6: ( ruleXIfExpression )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3140:6: ( ruleXIfExpression )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3141:1: ruleXIfExpression
+                    // InternalCheckCfg.g:3140:6: ( ruleXIfExpression )
+                    // InternalCheckCfg.g:3141:1: ruleXIfExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXIfExpressionParserRuleCall_6()); 
                     }
-                    pushFollow(FOLLOW_ruleXIfExpression_in_rule__XPrimaryExpression__Alternatives6769);
+                    pushFollow(FOLLOW_2);
                     ruleXIfExpression();
 
                     state._fsp--;
@@ -10008,18 +10008,18 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 8 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3146:6: ( ( ruleXForLoopExpression ) )
+                    // InternalCheckCfg.g:3146:6: ( ( ruleXForLoopExpression ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3146:6: ( ( ruleXForLoopExpression ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3147:1: ( ruleXForLoopExpression )
+                    // InternalCheckCfg.g:3146:6: ( ( ruleXForLoopExpression ) )
+                    // InternalCheckCfg.g:3147:1: ( ruleXForLoopExpression )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXForLoopExpressionParserRuleCall_7()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3148:1: ( ruleXForLoopExpression )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3148:3: ruleXForLoopExpression
+                    // InternalCheckCfg.g:3148:1: ( ruleXForLoopExpression )
+                    // InternalCheckCfg.g:3148:3: ruleXForLoopExpression
                     {
-                    pushFollow(FOLLOW_ruleXForLoopExpression_in_rule__XPrimaryExpression__Alternatives6787);
+                    pushFollow(FOLLOW_2);
                     ruleXForLoopExpression();
 
                     state._fsp--;
@@ -10037,15 +10037,15 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 9 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3152:6: ( ruleXBasicForLoopExpression )
+                    // InternalCheckCfg.g:3152:6: ( ruleXBasicForLoopExpression )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3152:6: ( ruleXBasicForLoopExpression )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3153:1: ruleXBasicForLoopExpression
+                    // InternalCheckCfg.g:3152:6: ( ruleXBasicForLoopExpression )
+                    // InternalCheckCfg.g:3153:1: ruleXBasicForLoopExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXBasicForLoopExpressionParserRuleCall_8()); 
                     }
-                    pushFollow(FOLLOW_ruleXBasicForLoopExpression_in_rule__XPrimaryExpression__Alternatives6805);
+                    pushFollow(FOLLOW_2);
                     ruleXBasicForLoopExpression();
 
                     state._fsp--;
@@ -10060,15 +10060,15 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 10 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3158:6: ( ruleXWhileExpression )
+                    // InternalCheckCfg.g:3158:6: ( ruleXWhileExpression )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3158:6: ( ruleXWhileExpression )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3159:1: ruleXWhileExpression
+                    // InternalCheckCfg.g:3158:6: ( ruleXWhileExpression )
+                    // InternalCheckCfg.g:3159:1: ruleXWhileExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXWhileExpressionParserRuleCall_9()); 
                     }
-                    pushFollow(FOLLOW_ruleXWhileExpression_in_rule__XPrimaryExpression__Alternatives6822);
+                    pushFollow(FOLLOW_2);
                     ruleXWhileExpression();
 
                     state._fsp--;
@@ -10083,15 +10083,15 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 11 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3164:6: ( ruleXDoWhileExpression )
+                    // InternalCheckCfg.g:3164:6: ( ruleXDoWhileExpression )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3164:6: ( ruleXDoWhileExpression )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3165:1: ruleXDoWhileExpression
+                    // InternalCheckCfg.g:3164:6: ( ruleXDoWhileExpression )
+                    // InternalCheckCfg.g:3165:1: ruleXDoWhileExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXDoWhileExpressionParserRuleCall_10()); 
                     }
-                    pushFollow(FOLLOW_ruleXDoWhileExpression_in_rule__XPrimaryExpression__Alternatives6839);
+                    pushFollow(FOLLOW_2);
                     ruleXDoWhileExpression();
 
                     state._fsp--;
@@ -10106,15 +10106,15 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 12 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3170:6: ( ruleXThrowExpression )
+                    // InternalCheckCfg.g:3170:6: ( ruleXThrowExpression )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3170:6: ( ruleXThrowExpression )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3171:1: ruleXThrowExpression
+                    // InternalCheckCfg.g:3170:6: ( ruleXThrowExpression )
+                    // InternalCheckCfg.g:3171:1: ruleXThrowExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXThrowExpressionParserRuleCall_11()); 
                     }
-                    pushFollow(FOLLOW_ruleXThrowExpression_in_rule__XPrimaryExpression__Alternatives6856);
+                    pushFollow(FOLLOW_2);
                     ruleXThrowExpression();
 
                     state._fsp--;
@@ -10129,15 +10129,15 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 13 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3176:6: ( ruleXReturnExpression )
+                    // InternalCheckCfg.g:3176:6: ( ruleXReturnExpression )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3176:6: ( ruleXReturnExpression )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3177:1: ruleXReturnExpression
+                    // InternalCheckCfg.g:3176:6: ( ruleXReturnExpression )
+                    // InternalCheckCfg.g:3177:1: ruleXReturnExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXReturnExpressionParserRuleCall_12()); 
                     }
-                    pushFollow(FOLLOW_ruleXReturnExpression_in_rule__XPrimaryExpression__Alternatives6873);
+                    pushFollow(FOLLOW_2);
                     ruleXReturnExpression();
 
                     state._fsp--;
@@ -10152,15 +10152,15 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 14 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3182:6: ( ruleXTryCatchFinallyExpression )
+                    // InternalCheckCfg.g:3182:6: ( ruleXTryCatchFinallyExpression )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3182:6: ( ruleXTryCatchFinallyExpression )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3183:1: ruleXTryCatchFinallyExpression
+                    // InternalCheckCfg.g:3182:6: ( ruleXTryCatchFinallyExpression )
+                    // InternalCheckCfg.g:3183:1: ruleXTryCatchFinallyExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXTryCatchFinallyExpressionParserRuleCall_13()); 
                     }
-                    pushFollow(FOLLOW_ruleXTryCatchFinallyExpression_in_rule__XPrimaryExpression__Alternatives6890);
+                    pushFollow(FOLLOW_2);
                     ruleXTryCatchFinallyExpression();
 
                     state._fsp--;
@@ -10175,15 +10175,15 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 15 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3188:6: ( ruleXParenthesizedExpression )
+                    // InternalCheckCfg.g:3188:6: ( ruleXParenthesizedExpression )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3188:6: ( ruleXParenthesizedExpression )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3189:1: ruleXParenthesizedExpression
+                    // InternalCheckCfg.g:3188:6: ( ruleXParenthesizedExpression )
+                    // InternalCheckCfg.g:3189:1: ruleXParenthesizedExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXParenthesizedExpressionParserRuleCall_14()); 
                     }
-                    pushFollow(FOLLOW_ruleXParenthesizedExpression_in_rule__XPrimaryExpression__Alternatives6907);
+                    pushFollow(FOLLOW_2);
                     ruleXParenthesizedExpression();
 
                     state._fsp--;
@@ -10215,13 +10215,13 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
 
 
     // $ANTLR start "rule__XLiteral__Alternatives"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3199:1: rule__XLiteral__Alternatives : ( ( ruleXCollectionLiteral ) | ( ( ruleXClosure ) ) | ( ruleXBooleanLiteral ) | ( ruleXNumberLiteral ) | ( ruleXNullLiteral ) | ( ruleXStringLiteral ) | ( ruleXTypeLiteral ) );
+    // InternalCheckCfg.g:3199:1: rule__XLiteral__Alternatives : ( ( ruleXCollectionLiteral ) | ( ( ruleXClosure ) ) | ( ruleXBooleanLiteral ) | ( ruleXNumberLiteral ) | ( ruleXNullLiteral ) | ( ruleXStringLiteral ) | ( ruleXTypeLiteral ) );
     public final void rule__XLiteral__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3203:1: ( ( ruleXCollectionLiteral ) | ( ( ruleXClosure ) ) | ( ruleXBooleanLiteral ) | ( ruleXNumberLiteral ) | ( ruleXNullLiteral ) | ( ruleXStringLiteral ) | ( ruleXTypeLiteral ) )
+            // InternalCheckCfg.g:3203:1: ( ( ruleXCollectionLiteral ) | ( ( ruleXClosure ) ) | ( ruleXBooleanLiteral ) | ( ruleXNumberLiteral ) | ( ruleXNullLiteral ) | ( ruleXStringLiteral ) | ( ruleXTypeLiteral ) )
             int alt23=7;
             switch ( input.LA(1) ) {
             case 65:
@@ -10272,15 +10272,15 @@ public final void rule__XLiteral__Alternatives() throws RecognitionException {
 
             switch (alt23) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3204:1: ( ruleXCollectionLiteral )
+                    // InternalCheckCfg.g:3204:1: ( ruleXCollectionLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3204:1: ( ruleXCollectionLiteral )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3205:1: ruleXCollectionLiteral
+                    // InternalCheckCfg.g:3204:1: ( ruleXCollectionLiteral )
+                    // InternalCheckCfg.g:3205:1: ruleXCollectionLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXLiteralAccess().getXCollectionLiteralParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleXCollectionLiteral_in_rule__XLiteral__Alternatives6939);
+                    pushFollow(FOLLOW_2);
                     ruleXCollectionLiteral();
 
                     state._fsp--;
@@ -10295,18 +10295,18 @@ public final void rule__XLiteral__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3210:6: ( ( ruleXClosure ) )
+                    // InternalCheckCfg.g:3210:6: ( ( ruleXClosure ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3210:6: ( ( ruleXClosure ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3211:1: ( ruleXClosure )
+                    // InternalCheckCfg.g:3210:6: ( ( ruleXClosure ) )
+                    // InternalCheckCfg.g:3211:1: ( ruleXClosure )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXLiteralAccess().getXClosureParserRuleCall_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3212:1: ( ruleXClosure )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3212:3: ruleXClosure
+                    // InternalCheckCfg.g:3212:1: ( ruleXClosure )
+                    // InternalCheckCfg.g:3212:3: ruleXClosure
                     {
-                    pushFollow(FOLLOW_ruleXClosure_in_rule__XLiteral__Alternatives6957);
+                    pushFollow(FOLLOW_2);
                     ruleXClosure();
 
                     state._fsp--;
@@ -10324,15 +10324,15 @@ public final void rule__XLiteral__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3216:6: ( ruleXBooleanLiteral )
+                    // InternalCheckCfg.g:3216:6: ( ruleXBooleanLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3216:6: ( ruleXBooleanLiteral )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3217:1: ruleXBooleanLiteral
+                    // InternalCheckCfg.g:3216:6: ( ruleXBooleanLiteral )
+                    // InternalCheckCfg.g:3217:1: ruleXBooleanLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXLiteralAccess().getXBooleanLiteralParserRuleCall_2()); 
                     }
-                    pushFollow(FOLLOW_ruleXBooleanLiteral_in_rule__XLiteral__Alternatives6975);
+                    pushFollow(FOLLOW_2);
                     ruleXBooleanLiteral();
 
                     state._fsp--;
@@ -10347,15 +10347,15 @@ public final void rule__XLiteral__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3222:6: ( ruleXNumberLiteral )
+                    // InternalCheckCfg.g:3222:6: ( ruleXNumberLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3222:6: ( ruleXNumberLiteral )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3223:1: ruleXNumberLiteral
+                    // InternalCheckCfg.g:3222:6: ( ruleXNumberLiteral )
+                    // InternalCheckCfg.g:3223:1: ruleXNumberLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXLiteralAccess().getXNumberLiteralParserRuleCall_3()); 
                     }
-                    pushFollow(FOLLOW_ruleXNumberLiteral_in_rule__XLiteral__Alternatives6992);
+                    pushFollow(FOLLOW_2);
                     ruleXNumberLiteral();
 
                     state._fsp--;
@@ -10370,15 +10370,15 @@ public final void rule__XLiteral__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3228:6: ( ruleXNullLiteral )
+                    // InternalCheckCfg.g:3228:6: ( ruleXNullLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3228:6: ( ruleXNullLiteral )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3229:1: ruleXNullLiteral
+                    // InternalCheckCfg.g:3228:6: ( ruleXNullLiteral )
+                    // InternalCheckCfg.g:3229:1: ruleXNullLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXLiteralAccess().getXNullLiteralParserRuleCall_4()); 
                     }
-                    pushFollow(FOLLOW_ruleXNullLiteral_in_rule__XLiteral__Alternatives7009);
+                    pushFollow(FOLLOW_2);
                     ruleXNullLiteral();
 
                     state._fsp--;
@@ -10393,15 +10393,15 @@ public final void rule__XLiteral__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3234:6: ( ruleXStringLiteral )
+                    // InternalCheckCfg.g:3234:6: ( ruleXStringLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3234:6: ( ruleXStringLiteral )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3235:1: ruleXStringLiteral
+                    // InternalCheckCfg.g:3234:6: ( ruleXStringLiteral )
+                    // InternalCheckCfg.g:3235:1: ruleXStringLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXLiteralAccess().getXStringLiteralParserRuleCall_5()); 
                     }
-                    pushFollow(FOLLOW_ruleXStringLiteral_in_rule__XLiteral__Alternatives7026);
+                    pushFollow(FOLLOW_2);
                     ruleXStringLiteral();
 
                     state._fsp--;
@@ -10416,15 +10416,15 @@ public final void rule__XLiteral__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3240:6: ( ruleXTypeLiteral )
+                    // InternalCheckCfg.g:3240:6: ( ruleXTypeLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3240:6: ( ruleXTypeLiteral )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3241:1: ruleXTypeLiteral
+                    // InternalCheckCfg.g:3240:6: ( ruleXTypeLiteral )
+                    // InternalCheckCfg.g:3241:1: ruleXTypeLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXLiteralAccess().getXTypeLiteralParserRuleCall_6()); 
                     }
-                    pushFollow(FOLLOW_ruleXTypeLiteral_in_rule__XLiteral__Alternatives7043);
+                    pushFollow(FOLLOW_2);
                     ruleXTypeLiteral();
 
                     state._fsp--;
@@ -10456,13 +10456,13 @@ public final void rule__XLiteral__Alternatives() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCollectionLiteral__Alternatives"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3251:1: rule__XCollectionLiteral__Alternatives : ( ( ruleXSetLiteral ) | ( ruleXListLiteral ) );
+    // InternalCheckCfg.g:3251:1: rule__XCollectionLiteral__Alternatives : ( ( ruleXSetLiteral ) | ( ruleXListLiteral ) );
     public final void rule__XCollectionLiteral__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3255:1: ( ( ruleXSetLiteral ) | ( ruleXListLiteral ) )
+            // InternalCheckCfg.g:3255:1: ( ( ruleXSetLiteral ) | ( ruleXListLiteral ) )
             int alt24=2;
             int LA24_0 = input.LA(1);
 
@@ -10492,15 +10492,15 @@ else if ( (LA24_1==66) ) {
             }
             switch (alt24) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3256:1: ( ruleXSetLiteral )
+                    // InternalCheckCfg.g:3256:1: ( ruleXSetLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3256:1: ( ruleXSetLiteral )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3257:1: ruleXSetLiteral
+                    // InternalCheckCfg.g:3256:1: ( ruleXSetLiteral )
+                    // InternalCheckCfg.g:3257:1: ruleXSetLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXCollectionLiteralAccess().getXSetLiteralParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleXSetLiteral_in_rule__XCollectionLiteral__Alternatives7075);
+                    pushFollow(FOLLOW_2);
                     ruleXSetLiteral();
 
                     state._fsp--;
@@ -10515,15 +10515,15 @@ else if ( (LA24_1==66) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3262:6: ( ruleXListLiteral )
+                    // InternalCheckCfg.g:3262:6: ( ruleXListLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3262:6: ( ruleXListLiteral )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3263:1: ruleXListLiteral
+                    // InternalCheckCfg.g:3262:6: ( ruleXListLiteral )
+                    // InternalCheckCfg.g:3263:1: ruleXListLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXCollectionLiteralAccess().getXListLiteralParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleXListLiteral_in_rule__XCollectionLiteral__Alternatives7092);
+                    pushFollow(FOLLOW_2);
                     ruleXListLiteral();
 
                     state._fsp--;
@@ -10555,29 +10555,29 @@ else if ( (LA24_1==66) ) {
 
 
     // $ANTLR start "rule__XSwitchExpression__Alternatives_2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3273:1: rule__XSwitchExpression__Alternatives_2 : ( ( ( rule__XSwitchExpression__Group_2_0__0 ) ) | ( ( rule__XSwitchExpression__Group_2_1__0 ) ) );
+    // InternalCheckCfg.g:3273:1: rule__XSwitchExpression__Alternatives_2 : ( ( ( rule__XSwitchExpression__Group_2_0__0 ) ) | ( ( rule__XSwitchExpression__Group_2_1__0 ) ) );
     public final void rule__XSwitchExpression__Alternatives_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3277:1: ( ( ( rule__XSwitchExpression__Group_2_0__0 ) ) | ( ( rule__XSwitchExpression__Group_2_1__0 ) ) )
+            // InternalCheckCfg.g:3277:1: ( ( ( rule__XSwitchExpression__Group_2_0__0 ) ) | ( ( rule__XSwitchExpression__Group_2_1__0 ) ) )
             int alt25=2;
             alt25 = dfa25.predict(input);
             switch (alt25) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3278:1: ( ( rule__XSwitchExpression__Group_2_0__0 ) )
+                    // InternalCheckCfg.g:3278:1: ( ( rule__XSwitchExpression__Group_2_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3278:1: ( ( rule__XSwitchExpression__Group_2_0__0 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3279:1: ( rule__XSwitchExpression__Group_2_0__0 )
+                    // InternalCheckCfg.g:3278:1: ( ( rule__XSwitchExpression__Group_2_0__0 ) )
+                    // InternalCheckCfg.g:3279:1: ( rule__XSwitchExpression__Group_2_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXSwitchExpressionAccess().getGroup_2_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3280:1: ( rule__XSwitchExpression__Group_2_0__0 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3280:2: rule__XSwitchExpression__Group_2_0__0
+                    // InternalCheckCfg.g:3280:1: ( rule__XSwitchExpression__Group_2_0__0 )
+                    // InternalCheckCfg.g:3280:2: rule__XSwitchExpression__Group_2_0__0
                     {
-                    pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0__0_in_rule__XSwitchExpression__Alternatives_27124);
+                    pushFollow(FOLLOW_2);
                     rule__XSwitchExpression__Group_2_0__0();
 
                     state._fsp--;
@@ -10595,18 +10595,18 @@ public final void rule__XSwitchExpression__Alternatives_2() throws RecognitionEx
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3284:6: ( ( rule__XSwitchExpression__Group_2_1__0 ) )
+                    // InternalCheckCfg.g:3284:6: ( ( rule__XSwitchExpression__Group_2_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3284:6: ( ( rule__XSwitchExpression__Group_2_1__0 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3285:1: ( rule__XSwitchExpression__Group_2_1__0 )
+                    // InternalCheckCfg.g:3284:6: ( ( rule__XSwitchExpression__Group_2_1__0 ) )
+                    // InternalCheckCfg.g:3285:1: ( rule__XSwitchExpression__Group_2_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXSwitchExpressionAccess().getGroup_2_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3286:1: ( rule__XSwitchExpression__Group_2_1__0 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3286:2: rule__XSwitchExpression__Group_2_1__0
+                    // InternalCheckCfg.g:3286:1: ( rule__XSwitchExpression__Group_2_1__0 )
+                    // InternalCheckCfg.g:3286:2: rule__XSwitchExpression__Group_2_1__0
                     {
-                    pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1__0_in_rule__XSwitchExpression__Alternatives_27142);
+                    pushFollow(FOLLOW_2);
                     rule__XSwitchExpression__Group_2_1__0();
 
                     state._fsp--;
@@ -10641,13 +10641,13 @@ public final void rule__XSwitchExpression__Alternatives_2() throws RecognitionEx
 
 
     // $ANTLR start "rule__XCasePart__Alternatives_3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3295:1: rule__XCasePart__Alternatives_3 : ( ( ( rule__XCasePart__Group_3_0__0 ) ) | ( ( rule__XCasePart__FallThroughAssignment_3_1 ) ) );
+    // InternalCheckCfg.g:3295:1: rule__XCasePart__Alternatives_3 : ( ( ( rule__XCasePart__Group_3_0__0 ) ) | ( ( rule__XCasePart__FallThroughAssignment_3_1 ) ) );
     public final void rule__XCasePart__Alternatives_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3299:1: ( ( ( rule__XCasePart__Group_3_0__0 ) ) | ( ( rule__XCasePart__FallThroughAssignment_3_1 ) ) )
+            // InternalCheckCfg.g:3299:1: ( ( ( rule__XCasePart__Group_3_0__0 ) ) | ( ( rule__XCasePart__FallThroughAssignment_3_1 ) ) )
             int alt26=2;
             int LA26_0 = input.LA(1);
 
@@ -10666,18 +10666,18 @@ else if ( (LA26_0==64) ) {
             }
             switch (alt26) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3300:1: ( ( rule__XCasePart__Group_3_0__0 ) )
+                    // InternalCheckCfg.g:3300:1: ( ( rule__XCasePart__Group_3_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3300:1: ( ( rule__XCasePart__Group_3_0__0 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3301:1: ( rule__XCasePart__Group_3_0__0 )
+                    // InternalCheckCfg.g:3300:1: ( ( rule__XCasePart__Group_3_0__0 ) )
+                    // InternalCheckCfg.g:3301:1: ( rule__XCasePart__Group_3_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXCasePartAccess().getGroup_3_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3302:1: ( rule__XCasePart__Group_3_0__0 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3302:2: rule__XCasePart__Group_3_0__0
+                    // InternalCheckCfg.g:3302:1: ( rule__XCasePart__Group_3_0__0 )
+                    // InternalCheckCfg.g:3302:2: rule__XCasePart__Group_3_0__0
                     {
-                    pushFollow(FOLLOW_rule__XCasePart__Group_3_0__0_in_rule__XCasePart__Alternatives_37175);
+                    pushFollow(FOLLOW_2);
                     rule__XCasePart__Group_3_0__0();
 
                     state._fsp--;
@@ -10695,18 +10695,18 @@ else if ( (LA26_0==64) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3306:6: ( ( rule__XCasePart__FallThroughAssignment_3_1 ) )
+                    // InternalCheckCfg.g:3306:6: ( ( rule__XCasePart__FallThroughAssignment_3_1 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3306:6: ( ( rule__XCasePart__FallThroughAssignment_3_1 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3307:1: ( rule__XCasePart__FallThroughAssignment_3_1 )
+                    // InternalCheckCfg.g:3306:6: ( ( rule__XCasePart__FallThroughAssignment_3_1 ) )
+                    // InternalCheckCfg.g:3307:1: ( rule__XCasePart__FallThroughAssignment_3_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXCasePartAccess().getFallThroughAssignment_3_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3308:1: ( rule__XCasePart__FallThroughAssignment_3_1 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3308:2: rule__XCasePart__FallThroughAssignment_3_1
+                    // InternalCheckCfg.g:3308:1: ( rule__XCasePart__FallThroughAssignment_3_1 )
+                    // InternalCheckCfg.g:3308:2: rule__XCasePart__FallThroughAssignment_3_1
                     {
-                    pushFollow(FOLLOW_rule__XCasePart__FallThroughAssignment_3_1_in_rule__XCasePart__Alternatives_37193);
+                    pushFollow(FOLLOW_2);
                     rule__XCasePart__FallThroughAssignment_3_1();
 
                     state._fsp--;
@@ -10741,13 +10741,13 @@ else if ( (LA26_0==64) ) {
 
 
     // $ANTLR start "rule__XExpressionOrVarDeclaration__Alternatives"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3317:1: rule__XExpressionOrVarDeclaration__Alternatives : ( ( ruleXVariableDeclaration ) | ( ruleXExpression ) );
+    // InternalCheckCfg.g:3317:1: rule__XExpressionOrVarDeclaration__Alternatives : ( ( ruleXVariableDeclaration ) | ( ruleXExpression ) );
     public final void rule__XExpressionOrVarDeclaration__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3321:1: ( ( ruleXVariableDeclaration ) | ( ruleXExpression ) )
+            // InternalCheckCfg.g:3321:1: ( ( ruleXVariableDeclaration ) | ( ruleXExpression ) )
             int alt27=2;
             int LA27_0 = input.LA(1);
 
@@ -10766,15 +10766,15 @@ else if ( ((LA27_0>=RULE_ID && LA27_0<=RULE_STRING)||LA27_0==27||(LA27_0>=34 &&
             }
             switch (alt27) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3322:1: ( ruleXVariableDeclaration )
+                    // InternalCheckCfg.g:3322:1: ( ruleXVariableDeclaration )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3322:1: ( ruleXVariableDeclaration )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3323:1: ruleXVariableDeclaration
+                    // InternalCheckCfg.g:3322:1: ( ruleXVariableDeclaration )
+                    // InternalCheckCfg.g:3323:1: ruleXVariableDeclaration
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXExpressionOrVarDeclarationAccess().getXVariableDeclarationParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleXVariableDeclaration_in_rule__XExpressionOrVarDeclaration__Alternatives7226);
+                    pushFollow(FOLLOW_2);
                     ruleXVariableDeclaration();
 
                     state._fsp--;
@@ -10789,15 +10789,15 @@ else if ( ((LA27_0>=RULE_ID && LA27_0<=RULE_STRING)||LA27_0==27||(LA27_0>=34 &&
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3328:6: ( ruleXExpression )
+                    // InternalCheckCfg.g:3328:6: ( ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3328:6: ( ruleXExpression )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3329:1: ruleXExpression
+                    // InternalCheckCfg.g:3328:6: ( ruleXExpression )
+                    // InternalCheckCfg.g:3329:1: ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXExpressionOrVarDeclarationAccess().getXExpressionParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_rule__XExpressionOrVarDeclaration__Alternatives7243);
+                    pushFollow(FOLLOW_2);
                     ruleXExpression();
 
                     state._fsp--;
@@ -10829,13 +10829,13 @@ else if ( ((LA27_0>=RULE_ID && LA27_0<=RULE_STRING)||LA27_0==27||(LA27_0>=34 &&
 
 
     // $ANTLR start "rule__XVariableDeclaration__Alternatives_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3339:1: rule__XVariableDeclaration__Alternatives_1 : ( ( ( rule__XVariableDeclaration__WriteableAssignment_1_0 ) ) | ( 'val' ) );
+    // InternalCheckCfg.g:3339:1: rule__XVariableDeclaration__Alternatives_1 : ( ( ( rule__XVariableDeclaration__WriteableAssignment_1_0 ) ) | ( 'val' ) );
     public final void rule__XVariableDeclaration__Alternatives_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3343:1: ( ( ( rule__XVariableDeclaration__WriteableAssignment_1_0 ) ) | ( 'val' ) )
+            // InternalCheckCfg.g:3343:1: ( ( ( rule__XVariableDeclaration__WriteableAssignment_1_0 ) ) | ( 'val' ) )
             int alt28=2;
             int LA28_0 = input.LA(1);
 
@@ -10854,18 +10854,18 @@ else if ( (LA28_0==44) ) {
             }
             switch (alt28) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3344:1: ( ( rule__XVariableDeclaration__WriteableAssignment_1_0 ) )
+                    // InternalCheckCfg.g:3344:1: ( ( rule__XVariableDeclaration__WriteableAssignment_1_0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3344:1: ( ( rule__XVariableDeclaration__WriteableAssignment_1_0 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3345:1: ( rule__XVariableDeclaration__WriteableAssignment_1_0 )
+                    // InternalCheckCfg.g:3344:1: ( ( rule__XVariableDeclaration__WriteableAssignment_1_0 ) )
+                    // InternalCheckCfg.g:3345:1: ( rule__XVariableDeclaration__WriteableAssignment_1_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXVariableDeclarationAccess().getWriteableAssignment_1_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3346:1: ( rule__XVariableDeclaration__WriteableAssignment_1_0 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3346:2: rule__XVariableDeclaration__WriteableAssignment_1_0
+                    // InternalCheckCfg.g:3346:1: ( rule__XVariableDeclaration__WriteableAssignment_1_0 )
+                    // InternalCheckCfg.g:3346:2: rule__XVariableDeclaration__WriteableAssignment_1_0
                     {
-                    pushFollow(FOLLOW_rule__XVariableDeclaration__WriteableAssignment_1_0_in_rule__XVariableDeclaration__Alternatives_17275);
+                    pushFollow(FOLLOW_2);
                     rule__XVariableDeclaration__WriteableAssignment_1_0();
 
                     state._fsp--;
@@ -10883,15 +10883,15 @@ else if ( (LA28_0==44) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3350:6: ( 'val' )
+                    // InternalCheckCfg.g:3350:6: ( 'val' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3350:6: ( 'val' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3351:1: 'val'
+                    // InternalCheckCfg.g:3350:6: ( 'val' )
+                    // InternalCheckCfg.g:3351:1: 'val'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXVariableDeclarationAccess().getValKeyword_1_1()); 
                     }
-                    match(input,44,FOLLOW_44_in_rule__XVariableDeclaration__Alternatives_17294); if (state.failed) return ;
+                    match(input,44,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getXVariableDeclarationAccess().getValKeyword_1_1()); 
                     }
@@ -10919,13 +10919,13 @@ else if ( (LA28_0==44) ) {
 
 
     // $ANTLR start "rule__XVariableDeclaration__Alternatives_2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3363:1: rule__XVariableDeclaration__Alternatives_2 : ( ( ( rule__XVariableDeclaration__Group_2_0__0 ) ) | ( ( rule__XVariableDeclaration__NameAssignment_2_1 ) ) );
+    // InternalCheckCfg.g:3363:1: rule__XVariableDeclaration__Alternatives_2 : ( ( ( rule__XVariableDeclaration__Group_2_0__0 ) ) | ( ( rule__XVariableDeclaration__NameAssignment_2_1 ) ) );
     public final void rule__XVariableDeclaration__Alternatives_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3367:1: ( ( ( rule__XVariableDeclaration__Group_2_0__0 ) ) | ( ( rule__XVariableDeclaration__NameAssignment_2_1 ) ) )
+            // InternalCheckCfg.g:3367:1: ( ( ( rule__XVariableDeclaration__Group_2_0__0 ) ) | ( ( rule__XVariableDeclaration__NameAssignment_2_1 ) ) )
             int alt29=2;
             int LA29_0 = input.LA(1);
 
@@ -10958,18 +10958,18 @@ else if ( (LA29_0==31||LA29_0==62) ) {
             }
             switch (alt29) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3368:1: ( ( rule__XVariableDeclaration__Group_2_0__0 ) )
+                    // InternalCheckCfg.g:3368:1: ( ( rule__XVariableDeclaration__Group_2_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3368:1: ( ( rule__XVariableDeclaration__Group_2_0__0 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3369:1: ( rule__XVariableDeclaration__Group_2_0__0 )
+                    // InternalCheckCfg.g:3368:1: ( ( rule__XVariableDeclaration__Group_2_0__0 ) )
+                    // InternalCheckCfg.g:3369:1: ( rule__XVariableDeclaration__Group_2_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXVariableDeclarationAccess().getGroup_2_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3370:1: ( rule__XVariableDeclaration__Group_2_0__0 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3370:2: rule__XVariableDeclaration__Group_2_0__0
+                    // InternalCheckCfg.g:3370:1: ( rule__XVariableDeclaration__Group_2_0__0 )
+                    // InternalCheckCfg.g:3370:2: rule__XVariableDeclaration__Group_2_0__0
                     {
-                    pushFollow(FOLLOW_rule__XVariableDeclaration__Group_2_0__0_in_rule__XVariableDeclaration__Alternatives_27328);
+                    pushFollow(FOLLOW_2);
                     rule__XVariableDeclaration__Group_2_0__0();
 
                     state._fsp--;
@@ -10987,18 +10987,18 @@ else if ( (LA29_0==31||LA29_0==62) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3374:6: ( ( rule__XVariableDeclaration__NameAssignment_2_1 ) )
+                    // InternalCheckCfg.g:3374:6: ( ( rule__XVariableDeclaration__NameAssignment_2_1 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3374:6: ( ( rule__XVariableDeclaration__NameAssignment_2_1 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3375:1: ( rule__XVariableDeclaration__NameAssignment_2_1 )
+                    // InternalCheckCfg.g:3374:6: ( ( rule__XVariableDeclaration__NameAssignment_2_1 ) )
+                    // InternalCheckCfg.g:3375:1: ( rule__XVariableDeclaration__NameAssignment_2_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXVariableDeclarationAccess().getNameAssignment_2_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3376:1: ( rule__XVariableDeclaration__NameAssignment_2_1 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3376:2: rule__XVariableDeclaration__NameAssignment_2_1
+                    // InternalCheckCfg.g:3376:1: ( rule__XVariableDeclaration__NameAssignment_2_1 )
+                    // InternalCheckCfg.g:3376:2: rule__XVariableDeclaration__NameAssignment_2_1
                     {
-                    pushFollow(FOLLOW_rule__XVariableDeclaration__NameAssignment_2_1_in_rule__XVariableDeclaration__Alternatives_27346);
+                    pushFollow(FOLLOW_2);
                     rule__XVariableDeclaration__NameAssignment_2_1();
 
                     state._fsp--;
@@ -11033,29 +11033,29 @@ else if ( (LA29_0==31||LA29_0==62) ) {
 
 
     // $ANTLR start "rule__XFeatureCall__Alternatives_3_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3385:1: rule__XFeatureCall__Alternatives_3_1 : ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) ) | ( ( rule__XFeatureCall__Group_3_1_1__0 ) ) );
+    // InternalCheckCfg.g:3385:1: rule__XFeatureCall__Alternatives_3_1 : ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) ) | ( ( rule__XFeatureCall__Group_3_1_1__0 ) ) );
     public final void rule__XFeatureCall__Alternatives_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3389:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) ) | ( ( rule__XFeatureCall__Group_3_1_1__0 ) ) )
+            // InternalCheckCfg.g:3389:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) ) | ( ( rule__XFeatureCall__Group_3_1_1__0 ) ) )
             int alt30=2;
             alt30 = dfa30.predict(input);
             switch (alt30) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3390:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) )
+                    // InternalCheckCfg.g:3390:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3390:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3391:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 )
+                    // InternalCheckCfg.g:3390:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) )
+                    // InternalCheckCfg.g:3391:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsAssignment_3_1_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3392:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3392:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0
+                    // InternalCheckCfg.g:3392:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 )
+                    // InternalCheckCfg.g:3392:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0
                     {
-                    pushFollow(FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0_in_rule__XFeatureCall__Alternatives_3_17379);
+                    pushFollow(FOLLOW_2);
                     rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0();
 
                     state._fsp--;
@@ -11073,18 +11073,18 @@ public final void rule__XFeatureCall__Alternatives_3_1() throws RecognitionExcep
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3396:6: ( ( rule__XFeatureCall__Group_3_1_1__0 ) )
+                    // InternalCheckCfg.g:3396:6: ( ( rule__XFeatureCall__Group_3_1_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3396:6: ( ( rule__XFeatureCall__Group_3_1_1__0 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3397:1: ( rule__XFeatureCall__Group_3_1_1__0 )
+                    // InternalCheckCfg.g:3396:6: ( ( rule__XFeatureCall__Group_3_1_1__0 ) )
+                    // InternalCheckCfg.g:3397:1: ( rule__XFeatureCall__Group_3_1_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXFeatureCallAccess().getGroup_3_1_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3398:1: ( rule__XFeatureCall__Group_3_1_1__0 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3398:2: rule__XFeatureCall__Group_3_1_1__0
+                    // InternalCheckCfg.g:3398:1: ( rule__XFeatureCall__Group_3_1_1__0 )
+                    // InternalCheckCfg.g:3398:2: rule__XFeatureCall__Group_3_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__XFeatureCall__Group_3_1_1__0_in_rule__XFeatureCall__Alternatives_3_17397);
+                    pushFollow(FOLLOW_2);
                     rule__XFeatureCall__Group_3_1_1__0();
 
                     state._fsp--;
@@ -11119,13 +11119,13 @@ public final void rule__XFeatureCall__Alternatives_3_1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__FeatureCallID__Alternatives"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3407:1: rule__FeatureCallID__Alternatives : ( ( ruleValidID ) | ( 'extends' ) | ( 'static' ) | ( 'import' ) | ( 'extension' ) );
+    // InternalCheckCfg.g:3407:1: rule__FeatureCallID__Alternatives : ( ( ruleValidID ) | ( 'extends' ) | ( 'static' ) | ( 'import' ) | ( 'extension' ) );
     public final void rule__FeatureCallID__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3411:1: ( ( ruleValidID ) | ( 'extends' ) | ( 'static' ) | ( 'import' ) | ( 'extension' ) )
+            // InternalCheckCfg.g:3411:1: ( ( ruleValidID ) | ( 'extends' ) | ( 'static' ) | ( 'import' ) | ( 'extension' ) )
             int alt31=5;
             switch ( input.LA(1) ) {
             case RULE_ID:
@@ -11163,15 +11163,15 @@ public final void rule__FeatureCallID__Alternatives() throws RecognitionExceptio
 
             switch (alt31) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3412:1: ( ruleValidID )
+                    // InternalCheckCfg.g:3412:1: ( ruleValidID )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3412:1: ( ruleValidID )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3413:1: ruleValidID
+                    // InternalCheckCfg.g:3412:1: ( ruleValidID )
+                    // InternalCheckCfg.g:3413:1: ruleValidID
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallIDAccess().getValidIDParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleValidID_in_rule__FeatureCallID__Alternatives7430);
+                    pushFollow(FOLLOW_2);
                     ruleValidID();
 
                     state._fsp--;
@@ -11186,15 +11186,15 @@ public final void rule__FeatureCallID__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3418:6: ( 'extends' )
+                    // InternalCheckCfg.g:3418:6: ( 'extends' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3418:6: ( 'extends' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3419:1: 'extends'
+                    // InternalCheckCfg.g:3418:6: ( 'extends' )
+                    // InternalCheckCfg.g:3419:1: 'extends'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallIDAccess().getExtendsKeyword_1()); 
                     }
-                    match(input,45,FOLLOW_45_in_rule__FeatureCallID__Alternatives7448); if (state.failed) return ;
+                    match(input,45,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getFeatureCallIDAccess().getExtendsKeyword_1()); 
                     }
@@ -11205,15 +11205,15 @@ public final void rule__FeatureCallID__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3426:6: ( 'static' )
+                    // InternalCheckCfg.g:3426:6: ( 'static' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3426:6: ( 'static' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3427:1: 'static'
+                    // InternalCheckCfg.g:3426:6: ( 'static' )
+                    // InternalCheckCfg.g:3427:1: 'static'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallIDAccess().getStaticKeyword_2()); 
                     }
-                    match(input,46,FOLLOW_46_in_rule__FeatureCallID__Alternatives7468); if (state.failed) return ;
+                    match(input,46,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getFeatureCallIDAccess().getStaticKeyword_2()); 
                     }
@@ -11224,15 +11224,15 @@ public final void rule__FeatureCallID__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3434:6: ( 'import' )
+                    // InternalCheckCfg.g:3434:6: ( 'import' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3434:6: ( 'import' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3435:1: 'import'
+                    // InternalCheckCfg.g:3434:6: ( 'import' )
+                    // InternalCheckCfg.g:3435:1: 'import'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallIDAccess().getImportKeyword_3()); 
                     }
-                    match(input,47,FOLLOW_47_in_rule__FeatureCallID__Alternatives7488); if (state.failed) return ;
+                    match(input,47,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getFeatureCallIDAccess().getImportKeyword_3()); 
                     }
@@ -11243,15 +11243,15 @@ public final void rule__FeatureCallID__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3442:6: ( 'extension' )
+                    // InternalCheckCfg.g:3442:6: ( 'extension' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3442:6: ( 'extension' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3443:1: 'extension'
+                    // InternalCheckCfg.g:3442:6: ( 'extension' )
+                    // InternalCheckCfg.g:3443:1: 'extension'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallIDAccess().getExtensionKeyword_4()); 
                     }
-                    match(input,48,FOLLOW_48_in_rule__FeatureCallID__Alternatives7508); if (state.failed) return ;
+                    match(input,48,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getFeatureCallIDAccess().getExtensionKeyword_4()); 
                     }
@@ -11279,13 +11279,13 @@ public final void rule__FeatureCallID__Alternatives() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__IdOrSuper__Alternatives"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3455:1: rule__IdOrSuper__Alternatives : ( ( ruleFeatureCallID ) | ( 'super' ) );
+    // InternalCheckCfg.g:3455:1: rule__IdOrSuper__Alternatives : ( ( ruleFeatureCallID ) | ( 'super' ) );
     public final void rule__IdOrSuper__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3459:1: ( ( ruleFeatureCallID ) | ( 'super' ) )
+            // InternalCheckCfg.g:3459:1: ( ( ruleFeatureCallID ) | ( 'super' ) )
             int alt32=2;
             int LA32_0 = input.LA(1);
 
@@ -11304,15 +11304,15 @@ else if ( (LA32_0==49) ) {
             }
             switch (alt32) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3460:1: ( ruleFeatureCallID )
+                    // InternalCheckCfg.g:3460:1: ( ruleFeatureCallID )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3460:1: ( ruleFeatureCallID )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3461:1: ruleFeatureCallID
+                    // InternalCheckCfg.g:3460:1: ( ruleFeatureCallID )
+                    // InternalCheckCfg.g:3461:1: ruleFeatureCallID
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getIdOrSuperAccess().getFeatureCallIDParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleFeatureCallID_in_rule__IdOrSuper__Alternatives7542);
+                    pushFollow(FOLLOW_2);
                     ruleFeatureCallID();
 
                     state._fsp--;
@@ -11327,15 +11327,15 @@ else if ( (LA32_0==49) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3466:6: ( 'super' )
+                    // InternalCheckCfg.g:3466:6: ( 'super' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3466:6: ( 'super' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3467:1: 'super'
+                    // InternalCheckCfg.g:3466:6: ( 'super' )
+                    // InternalCheckCfg.g:3467:1: 'super'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getIdOrSuperAccess().getSuperKeyword_1()); 
                     }
-                    match(input,49,FOLLOW_49_in_rule__IdOrSuper__Alternatives7560); if (state.failed) return ;
+                    match(input,49,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getIdOrSuperAccess().getSuperKeyword_1()); 
                     }
@@ -11363,29 +11363,29 @@ else if ( (LA32_0==49) ) {
 
 
     // $ANTLR start "rule__XConstructorCall__Alternatives_4_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3479:1: rule__XConstructorCall__Alternatives_4_1 : ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) ) | ( ( rule__XConstructorCall__Group_4_1_1__0 ) ) );
+    // InternalCheckCfg.g:3479:1: rule__XConstructorCall__Alternatives_4_1 : ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) ) | ( ( rule__XConstructorCall__Group_4_1_1__0 ) ) );
     public final void rule__XConstructorCall__Alternatives_4_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3483:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) ) | ( ( rule__XConstructorCall__Group_4_1_1__0 ) ) )
+            // InternalCheckCfg.g:3483:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) ) | ( ( rule__XConstructorCall__Group_4_1_1__0 ) ) )
             int alt33=2;
             alt33 = dfa33.predict(input);
             switch (alt33) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3484:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) )
+                    // InternalCheckCfg.g:3484:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3484:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3485:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 )
+                    // InternalCheckCfg.g:3484:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) )
+                    // InternalCheckCfg.g:3485:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXConstructorCallAccess().getArgumentsAssignment_4_1_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3486:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3486:2: rule__XConstructorCall__ArgumentsAssignment_4_1_0
+                    // InternalCheckCfg.g:3486:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 )
+                    // InternalCheckCfg.g:3486:2: rule__XConstructorCall__ArgumentsAssignment_4_1_0
                     {
-                    pushFollow(FOLLOW_rule__XConstructorCall__ArgumentsAssignment_4_1_0_in_rule__XConstructorCall__Alternatives_4_17594);
+                    pushFollow(FOLLOW_2);
                     rule__XConstructorCall__ArgumentsAssignment_4_1_0();
 
                     state._fsp--;
@@ -11403,18 +11403,18 @@ public final void rule__XConstructorCall__Alternatives_4_1() throws RecognitionE
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3490:6: ( ( rule__XConstructorCall__Group_4_1_1__0 ) )
+                    // InternalCheckCfg.g:3490:6: ( ( rule__XConstructorCall__Group_4_1_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3490:6: ( ( rule__XConstructorCall__Group_4_1_1__0 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3491:1: ( rule__XConstructorCall__Group_4_1_1__0 )
+                    // InternalCheckCfg.g:3490:6: ( ( rule__XConstructorCall__Group_4_1_1__0 ) )
+                    // InternalCheckCfg.g:3491:1: ( rule__XConstructorCall__Group_4_1_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXConstructorCallAccess().getGroup_4_1_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3492:1: ( rule__XConstructorCall__Group_4_1_1__0 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3492:2: rule__XConstructorCall__Group_4_1_1__0
+                    // InternalCheckCfg.g:3492:1: ( rule__XConstructorCall__Group_4_1_1__0 )
+                    // InternalCheckCfg.g:3492:2: rule__XConstructorCall__Group_4_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__XConstructorCall__Group_4_1_1__0_in_rule__XConstructorCall__Alternatives_4_17612);
+                    pushFollow(FOLLOW_2);
                     rule__XConstructorCall__Group_4_1_1__0();
 
                     state._fsp--;
@@ -11449,13 +11449,13 @@ public final void rule__XConstructorCall__Alternatives_4_1() throws RecognitionE
 
 
     // $ANTLR start "rule__XBooleanLiteral__Alternatives_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3501:1: rule__XBooleanLiteral__Alternatives_1 : ( ( 'false' ) | ( ( rule__XBooleanLiteral__IsTrueAssignment_1_1 ) ) );
+    // InternalCheckCfg.g:3501:1: rule__XBooleanLiteral__Alternatives_1 : ( ( 'false' ) | ( ( rule__XBooleanLiteral__IsTrueAssignment_1_1 ) ) );
     public final void rule__XBooleanLiteral__Alternatives_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3505:1: ( ( 'false' ) | ( ( rule__XBooleanLiteral__IsTrueAssignment_1_1 ) ) )
+            // InternalCheckCfg.g:3505:1: ( ( 'false' ) | ( ( rule__XBooleanLiteral__IsTrueAssignment_1_1 ) ) )
             int alt34=2;
             int LA34_0 = input.LA(1);
 
@@ -11474,15 +11474,15 @@ else if ( (LA34_0==93) ) {
             }
             switch (alt34) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3506:1: ( 'false' )
+                    // InternalCheckCfg.g:3506:1: ( 'false' )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3506:1: ( 'false' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3507:1: 'false'
+                    // InternalCheckCfg.g:3506:1: ( 'false' )
+                    // InternalCheckCfg.g:3507:1: 'false'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXBooleanLiteralAccess().getFalseKeyword_1_0()); 
                     }
-                    match(input,50,FOLLOW_50_in_rule__XBooleanLiteral__Alternatives_17646); if (state.failed) return ;
+                    match(input,50,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getXBooleanLiteralAccess().getFalseKeyword_1_0()); 
                     }
@@ -11493,18 +11493,18 @@ else if ( (LA34_0==93) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3514:6: ( ( rule__XBooleanLiteral__IsTrueAssignment_1_1 ) )
+                    // InternalCheckCfg.g:3514:6: ( ( rule__XBooleanLiteral__IsTrueAssignment_1_1 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3514:6: ( ( rule__XBooleanLiteral__IsTrueAssignment_1_1 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3515:1: ( rule__XBooleanLiteral__IsTrueAssignment_1_1 )
+                    // InternalCheckCfg.g:3514:6: ( ( rule__XBooleanLiteral__IsTrueAssignment_1_1 ) )
+                    // InternalCheckCfg.g:3515:1: ( rule__XBooleanLiteral__IsTrueAssignment_1_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXBooleanLiteralAccess().getIsTrueAssignment_1_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3516:1: ( rule__XBooleanLiteral__IsTrueAssignment_1_1 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3516:2: rule__XBooleanLiteral__IsTrueAssignment_1_1
+                    // InternalCheckCfg.g:3516:1: ( rule__XBooleanLiteral__IsTrueAssignment_1_1 )
+                    // InternalCheckCfg.g:3516:2: rule__XBooleanLiteral__IsTrueAssignment_1_1
                     {
-                    pushFollow(FOLLOW_rule__XBooleanLiteral__IsTrueAssignment_1_1_in_rule__XBooleanLiteral__Alternatives_17665);
+                    pushFollow(FOLLOW_2);
                     rule__XBooleanLiteral__IsTrueAssignment_1_1();
 
                     state._fsp--;
@@ -11539,13 +11539,13 @@ else if ( (LA34_0==93) ) {
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Alternatives_3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3525:1: rule__XTryCatchFinallyExpression__Alternatives_3 : ( ( ( rule__XTryCatchFinallyExpression__Group_3_0__0 ) ) | ( ( rule__XTryCatchFinallyExpression__Group_3_1__0 ) ) );
+    // InternalCheckCfg.g:3525:1: rule__XTryCatchFinallyExpression__Alternatives_3 : ( ( ( rule__XTryCatchFinallyExpression__Group_3_0__0 ) ) | ( ( rule__XTryCatchFinallyExpression__Group_3_1__0 ) ) );
     public final void rule__XTryCatchFinallyExpression__Alternatives_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3529:1: ( ( ( rule__XTryCatchFinallyExpression__Group_3_0__0 ) ) | ( ( rule__XTryCatchFinallyExpression__Group_3_1__0 ) ) )
+            // InternalCheckCfg.g:3529:1: ( ( ( rule__XTryCatchFinallyExpression__Group_3_0__0 ) ) | ( ( rule__XTryCatchFinallyExpression__Group_3_1__0 ) ) )
             int alt35=2;
             int LA35_0 = input.LA(1);
 
@@ -11564,18 +11564,18 @@ else if ( (LA35_0==84) ) {
             }
             switch (alt35) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3530:1: ( ( rule__XTryCatchFinallyExpression__Group_3_0__0 ) )
+                    // InternalCheckCfg.g:3530:1: ( ( rule__XTryCatchFinallyExpression__Group_3_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3530:1: ( ( rule__XTryCatchFinallyExpression__Group_3_0__0 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3531:1: ( rule__XTryCatchFinallyExpression__Group_3_0__0 )
+                    // InternalCheckCfg.g:3530:1: ( ( rule__XTryCatchFinallyExpression__Group_3_0__0 ) )
+                    // InternalCheckCfg.g:3531:1: ( rule__XTryCatchFinallyExpression__Group_3_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXTryCatchFinallyExpressionAccess().getGroup_3_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3532:1: ( rule__XTryCatchFinallyExpression__Group_3_0__0 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3532:2: rule__XTryCatchFinallyExpression__Group_3_0__0
+                    // InternalCheckCfg.g:3532:1: ( rule__XTryCatchFinallyExpression__Group_3_0__0 )
+                    // InternalCheckCfg.g:3532:2: rule__XTryCatchFinallyExpression__Group_3_0__0
                     {
-                    pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0__0_in_rule__XTryCatchFinallyExpression__Alternatives_37698);
+                    pushFollow(FOLLOW_2);
                     rule__XTryCatchFinallyExpression__Group_3_0__0();
 
                     state._fsp--;
@@ -11593,18 +11593,18 @@ else if ( (LA35_0==84) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3536:6: ( ( rule__XTryCatchFinallyExpression__Group_3_1__0 ) )
+                    // InternalCheckCfg.g:3536:6: ( ( rule__XTryCatchFinallyExpression__Group_3_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3536:6: ( ( rule__XTryCatchFinallyExpression__Group_3_1__0 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3537:1: ( rule__XTryCatchFinallyExpression__Group_3_1__0 )
+                    // InternalCheckCfg.g:3536:6: ( ( rule__XTryCatchFinallyExpression__Group_3_1__0 ) )
+                    // InternalCheckCfg.g:3537:1: ( rule__XTryCatchFinallyExpression__Group_3_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXTryCatchFinallyExpressionAccess().getGroup_3_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3538:1: ( rule__XTryCatchFinallyExpression__Group_3_1__0 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3538:2: rule__XTryCatchFinallyExpression__Group_3_1__0
+                    // InternalCheckCfg.g:3538:1: ( rule__XTryCatchFinallyExpression__Group_3_1__0 )
+                    // InternalCheckCfg.g:3538:2: rule__XTryCatchFinallyExpression__Group_3_1__0
                     {
-                    pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_1__0_in_rule__XTryCatchFinallyExpression__Alternatives_37716);
+                    pushFollow(FOLLOW_2);
                     rule__XTryCatchFinallyExpression__Group_3_1__0();
 
                     state._fsp--;
@@ -11639,13 +11639,13 @@ else if ( (LA35_0==84) ) {
 
 
     // $ANTLR start "rule__Number__Alternatives"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3547:1: rule__Number__Alternatives : ( ( RULE_HEX ) | ( ( rule__Number__Group_1__0 ) ) );
+    // InternalCheckCfg.g:3547:1: rule__Number__Alternatives : ( ( RULE_HEX ) | ( ( rule__Number__Group_1__0 ) ) );
     public final void rule__Number__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3551:1: ( ( RULE_HEX ) | ( ( rule__Number__Group_1__0 ) ) )
+            // InternalCheckCfg.g:3551:1: ( ( RULE_HEX ) | ( ( rule__Number__Group_1__0 ) ) )
             int alt36=2;
             int LA36_0 = input.LA(1);
 
@@ -11664,15 +11664,15 @@ else if ( ((LA36_0>=RULE_INT && LA36_0<=RULE_DECIMAL)) ) {
             }
             switch (alt36) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3552:1: ( RULE_HEX )
+                    // InternalCheckCfg.g:3552:1: ( RULE_HEX )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3552:1: ( RULE_HEX )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3553:1: RULE_HEX
+                    // InternalCheckCfg.g:3552:1: ( RULE_HEX )
+                    // InternalCheckCfg.g:3553:1: RULE_HEX
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getNumberAccess().getHEXTerminalRuleCall_0()); 
                     }
-                    match(input,RULE_HEX,FOLLOW_RULE_HEX_in_rule__Number__Alternatives7749); if (state.failed) return ;
+                    match(input,RULE_HEX,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getNumberAccess().getHEXTerminalRuleCall_0()); 
                     }
@@ -11683,18 +11683,18 @@ else if ( ((LA36_0>=RULE_INT && LA36_0<=RULE_DECIMAL)) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3558:6: ( ( rule__Number__Group_1__0 ) )
+                    // InternalCheckCfg.g:3558:6: ( ( rule__Number__Group_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3558:6: ( ( rule__Number__Group_1__0 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3559:1: ( rule__Number__Group_1__0 )
+                    // InternalCheckCfg.g:3558:6: ( ( rule__Number__Group_1__0 ) )
+                    // InternalCheckCfg.g:3559:1: ( rule__Number__Group_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getNumberAccess().getGroup_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3560:1: ( rule__Number__Group_1__0 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3560:2: rule__Number__Group_1__0
+                    // InternalCheckCfg.g:3560:1: ( rule__Number__Group_1__0 )
+                    // InternalCheckCfg.g:3560:2: rule__Number__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__Number__Group_1__0_in_rule__Number__Alternatives7766);
+                    pushFollow(FOLLOW_2);
                     rule__Number__Group_1__0();
 
                     state._fsp--;
@@ -11729,13 +11729,13 @@ else if ( ((LA36_0>=RULE_INT && LA36_0<=RULE_DECIMAL)) ) {
 
 
     // $ANTLR start "rule__Number__Alternatives_1_0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3569:1: rule__Number__Alternatives_1_0 : ( ( RULE_INT ) | ( RULE_DECIMAL ) );
+    // InternalCheckCfg.g:3569:1: rule__Number__Alternatives_1_0 : ( ( RULE_INT ) | ( RULE_DECIMAL ) );
     public final void rule__Number__Alternatives_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3573:1: ( ( RULE_INT ) | ( RULE_DECIMAL ) )
+            // InternalCheckCfg.g:3573:1: ( ( RULE_INT ) | ( RULE_DECIMAL ) )
             int alt37=2;
             int LA37_0 = input.LA(1);
 
@@ -11754,15 +11754,15 @@ else if ( (LA37_0==RULE_DECIMAL) ) {
             }
             switch (alt37) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3574:1: ( RULE_INT )
+                    // InternalCheckCfg.g:3574:1: ( RULE_INT )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3574:1: ( RULE_INT )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3575:1: RULE_INT
+                    // InternalCheckCfg.g:3574:1: ( RULE_INT )
+                    // InternalCheckCfg.g:3575:1: RULE_INT
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getNumberAccess().getINTTerminalRuleCall_1_0_0()); 
                     }
-                    match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__Number__Alternatives_1_07799); if (state.failed) return ;
+                    match(input,RULE_INT,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getNumberAccess().getINTTerminalRuleCall_1_0_0()); 
                     }
@@ -11773,15 +11773,15 @@ else if ( (LA37_0==RULE_DECIMAL) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3580:6: ( RULE_DECIMAL )
+                    // InternalCheckCfg.g:3580:6: ( RULE_DECIMAL )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3580:6: ( RULE_DECIMAL )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3581:1: RULE_DECIMAL
+                    // InternalCheckCfg.g:3580:6: ( RULE_DECIMAL )
+                    // InternalCheckCfg.g:3581:1: RULE_DECIMAL
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getNumberAccess().getDECIMALTerminalRuleCall_1_0_1()); 
                     }
-                    match(input,RULE_DECIMAL,FOLLOW_RULE_DECIMAL_in_rule__Number__Alternatives_1_07816); if (state.failed) return ;
+                    match(input,RULE_DECIMAL,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getNumberAccess().getDECIMALTerminalRuleCall_1_0_1()); 
                     }
@@ -11809,13 +11809,13 @@ else if ( (LA37_0==RULE_DECIMAL) ) {
 
 
     // $ANTLR start "rule__Number__Alternatives_1_1_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3591:1: rule__Number__Alternatives_1_1_1 : ( ( RULE_INT ) | ( RULE_DECIMAL ) );
+    // InternalCheckCfg.g:3591:1: rule__Number__Alternatives_1_1_1 : ( ( RULE_INT ) | ( RULE_DECIMAL ) );
     public final void rule__Number__Alternatives_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3595:1: ( ( RULE_INT ) | ( RULE_DECIMAL ) )
+            // InternalCheckCfg.g:3595:1: ( ( RULE_INT ) | ( RULE_DECIMAL ) )
             int alt38=2;
             int LA38_0 = input.LA(1);
 
@@ -11834,15 +11834,15 @@ else if ( (LA38_0==RULE_DECIMAL) ) {
             }
             switch (alt38) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3596:1: ( RULE_INT )
+                    // InternalCheckCfg.g:3596:1: ( RULE_INT )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3596:1: ( RULE_INT )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3597:1: RULE_INT
+                    // InternalCheckCfg.g:3596:1: ( RULE_INT )
+                    // InternalCheckCfg.g:3597:1: RULE_INT
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getNumberAccess().getINTTerminalRuleCall_1_1_1_0()); 
                     }
-                    match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__Number__Alternatives_1_1_17848); if (state.failed) return ;
+                    match(input,RULE_INT,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getNumberAccess().getINTTerminalRuleCall_1_1_1_0()); 
                     }
@@ -11853,15 +11853,15 @@ else if ( (LA38_0==RULE_DECIMAL) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3602:6: ( RULE_DECIMAL )
+                    // InternalCheckCfg.g:3602:6: ( RULE_DECIMAL )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3602:6: ( RULE_DECIMAL )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3603:1: RULE_DECIMAL
+                    // InternalCheckCfg.g:3602:6: ( RULE_DECIMAL )
+                    // InternalCheckCfg.g:3603:1: RULE_DECIMAL
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getNumberAccess().getDECIMALTerminalRuleCall_1_1_1_1()); 
                     }
-                    match(input,RULE_DECIMAL,FOLLOW_RULE_DECIMAL_in_rule__Number__Alternatives_1_1_17865); if (state.failed) return ;
+                    match(input,RULE_DECIMAL,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getNumberAccess().getDECIMALTerminalRuleCall_1_1_1_1()); 
                     }
@@ -11889,13 +11889,13 @@ else if ( (LA38_0==RULE_DECIMAL) ) {
 
 
     // $ANTLR start "rule__JvmTypeReference__Alternatives"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3613:1: rule__JvmTypeReference__Alternatives : ( ( ( rule__JvmTypeReference__Group_0__0 ) ) | ( ruleXFunctionTypeRef ) );
+    // InternalCheckCfg.g:3613:1: rule__JvmTypeReference__Alternatives : ( ( ( rule__JvmTypeReference__Group_0__0 ) ) | ( ruleXFunctionTypeRef ) );
     public final void rule__JvmTypeReference__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3617:1: ( ( ( rule__JvmTypeReference__Group_0__0 ) ) | ( ruleXFunctionTypeRef ) )
+            // InternalCheckCfg.g:3617:1: ( ( ( rule__JvmTypeReference__Group_0__0 ) ) | ( ruleXFunctionTypeRef ) )
             int alt39=2;
             int LA39_0 = input.LA(1);
 
@@ -11914,18 +11914,18 @@ else if ( (LA39_0==31||LA39_0==62) ) {
             }
             switch (alt39) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3618:1: ( ( rule__JvmTypeReference__Group_0__0 ) )
+                    // InternalCheckCfg.g:3618:1: ( ( rule__JvmTypeReference__Group_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3618:1: ( ( rule__JvmTypeReference__Group_0__0 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3619:1: ( rule__JvmTypeReference__Group_0__0 )
+                    // InternalCheckCfg.g:3618:1: ( ( rule__JvmTypeReference__Group_0__0 ) )
+                    // InternalCheckCfg.g:3619:1: ( rule__JvmTypeReference__Group_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getJvmTypeReferenceAccess().getGroup_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3620:1: ( rule__JvmTypeReference__Group_0__0 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3620:2: rule__JvmTypeReference__Group_0__0
+                    // InternalCheckCfg.g:3620:1: ( rule__JvmTypeReference__Group_0__0 )
+                    // InternalCheckCfg.g:3620:2: rule__JvmTypeReference__Group_0__0
                     {
-                    pushFollow(FOLLOW_rule__JvmTypeReference__Group_0__0_in_rule__JvmTypeReference__Alternatives7897);
+                    pushFollow(FOLLOW_2);
                     rule__JvmTypeReference__Group_0__0();
 
                     state._fsp--;
@@ -11943,15 +11943,15 @@ else if ( (LA39_0==31||LA39_0==62) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3624:6: ( ruleXFunctionTypeRef )
+                    // InternalCheckCfg.g:3624:6: ( ruleXFunctionTypeRef )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3624:6: ( ruleXFunctionTypeRef )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3625:1: ruleXFunctionTypeRef
+                    // InternalCheckCfg.g:3624:6: ( ruleXFunctionTypeRef )
+                    // InternalCheckCfg.g:3625:1: ruleXFunctionTypeRef
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getJvmTypeReferenceAccess().getXFunctionTypeRefParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleXFunctionTypeRef_in_rule__JvmTypeReference__Alternatives7915);
+                    pushFollow(FOLLOW_2);
                     ruleXFunctionTypeRef();
 
                     state._fsp--;
@@ -11983,13 +11983,13 @@ else if ( (LA39_0==31||LA39_0==62) ) {
 
 
     // $ANTLR start "rule__JvmArgumentTypeReference__Alternatives"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3635:1: rule__JvmArgumentTypeReference__Alternatives : ( ( ruleJvmTypeReference ) | ( ruleJvmWildcardTypeReference ) );
+    // InternalCheckCfg.g:3635:1: rule__JvmArgumentTypeReference__Alternatives : ( ( ruleJvmTypeReference ) | ( ruleJvmWildcardTypeReference ) );
     public final void rule__JvmArgumentTypeReference__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3639:1: ( ( ruleJvmTypeReference ) | ( ruleJvmWildcardTypeReference ) )
+            // InternalCheckCfg.g:3639:1: ( ( ruleJvmTypeReference ) | ( ruleJvmWildcardTypeReference ) )
             int alt40=2;
             int LA40_0 = input.LA(1);
 
@@ -12008,15 +12008,15 @@ else if ( (LA40_0==87) ) {
             }
             switch (alt40) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3640:1: ( ruleJvmTypeReference )
+                    // InternalCheckCfg.g:3640:1: ( ruleJvmTypeReference )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3640:1: ( ruleJvmTypeReference )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3641:1: ruleJvmTypeReference
+                    // InternalCheckCfg.g:3640:1: ( ruleJvmTypeReference )
+                    // InternalCheckCfg.g:3641:1: ruleJvmTypeReference
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getJvmArgumentTypeReferenceAccess().getJvmTypeReferenceParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__JvmArgumentTypeReference__Alternatives7947);
+                    pushFollow(FOLLOW_2);
                     ruleJvmTypeReference();
 
                     state._fsp--;
@@ -12031,15 +12031,15 @@ else if ( (LA40_0==87) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3646:6: ( ruleJvmWildcardTypeReference )
+                    // InternalCheckCfg.g:3646:6: ( ruleJvmWildcardTypeReference )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3646:6: ( ruleJvmWildcardTypeReference )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3647:1: ruleJvmWildcardTypeReference
+                    // InternalCheckCfg.g:3646:6: ( ruleJvmWildcardTypeReference )
+                    // InternalCheckCfg.g:3647:1: ruleJvmWildcardTypeReference
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getJvmArgumentTypeReferenceAccess().getJvmWildcardTypeReferenceParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleJvmWildcardTypeReference_in_rule__JvmArgumentTypeReference__Alternatives7964);
+                    pushFollow(FOLLOW_2);
                     ruleJvmWildcardTypeReference();
 
                     state._fsp--;
@@ -12071,13 +12071,13 @@ else if ( (LA40_0==87) ) {
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Alternatives_2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3657:1: rule__JvmWildcardTypeReference__Alternatives_2 : ( ( ( rule__JvmWildcardTypeReference__Group_2_0__0 ) ) | ( ( rule__JvmWildcardTypeReference__Group_2_1__0 ) ) );
+    // InternalCheckCfg.g:3657:1: rule__JvmWildcardTypeReference__Alternatives_2 : ( ( ( rule__JvmWildcardTypeReference__Group_2_0__0 ) ) | ( ( rule__JvmWildcardTypeReference__Group_2_1__0 ) ) );
     public final void rule__JvmWildcardTypeReference__Alternatives_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3661:1: ( ( ( rule__JvmWildcardTypeReference__Group_2_0__0 ) ) | ( ( rule__JvmWildcardTypeReference__Group_2_1__0 ) ) )
+            // InternalCheckCfg.g:3661:1: ( ( ( rule__JvmWildcardTypeReference__Group_2_0__0 ) ) | ( ( rule__JvmWildcardTypeReference__Group_2_1__0 ) ) )
             int alt41=2;
             int LA41_0 = input.LA(1);
 
@@ -12096,18 +12096,18 @@ else if ( (LA41_0==49) ) {
             }
             switch (alt41) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3662:1: ( ( rule__JvmWildcardTypeReference__Group_2_0__0 ) )
+                    // InternalCheckCfg.g:3662:1: ( ( rule__JvmWildcardTypeReference__Group_2_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3662:1: ( ( rule__JvmWildcardTypeReference__Group_2_0__0 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3663:1: ( rule__JvmWildcardTypeReference__Group_2_0__0 )
+                    // InternalCheckCfg.g:3662:1: ( ( rule__JvmWildcardTypeReference__Group_2_0__0 ) )
+                    // InternalCheckCfg.g:3663:1: ( rule__JvmWildcardTypeReference__Group_2_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getJvmWildcardTypeReferenceAccess().getGroup_2_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3664:1: ( rule__JvmWildcardTypeReference__Group_2_0__0 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3664:2: rule__JvmWildcardTypeReference__Group_2_0__0
+                    // InternalCheckCfg.g:3664:1: ( rule__JvmWildcardTypeReference__Group_2_0__0 )
+                    // InternalCheckCfg.g:3664:2: rule__JvmWildcardTypeReference__Group_2_0__0
                     {
-                    pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group_2_0__0_in_rule__JvmWildcardTypeReference__Alternatives_27996);
+                    pushFollow(FOLLOW_2);
                     rule__JvmWildcardTypeReference__Group_2_0__0();
 
                     state._fsp--;
@@ -12125,18 +12125,18 @@ else if ( (LA41_0==49) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3668:6: ( ( rule__JvmWildcardTypeReference__Group_2_1__0 ) )
+                    // InternalCheckCfg.g:3668:6: ( ( rule__JvmWildcardTypeReference__Group_2_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3668:6: ( ( rule__JvmWildcardTypeReference__Group_2_1__0 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3669:1: ( rule__JvmWildcardTypeReference__Group_2_1__0 )
+                    // InternalCheckCfg.g:3668:6: ( ( rule__JvmWildcardTypeReference__Group_2_1__0 ) )
+                    // InternalCheckCfg.g:3669:1: ( rule__JvmWildcardTypeReference__Group_2_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getJvmWildcardTypeReferenceAccess().getGroup_2_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3670:1: ( rule__JvmWildcardTypeReference__Group_2_1__0 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3670:2: rule__JvmWildcardTypeReference__Group_2_1__0
+                    // InternalCheckCfg.g:3670:1: ( rule__JvmWildcardTypeReference__Group_2_1__0 )
+                    // InternalCheckCfg.g:3670:2: rule__JvmWildcardTypeReference__Group_2_1__0
                     {
-                    pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group_2_1__0_in_rule__JvmWildcardTypeReference__Alternatives_28014);
+                    pushFollow(FOLLOW_2);
                     rule__JvmWildcardTypeReference__Group_2_1__0();
 
                     state._fsp--;
@@ -12171,29 +12171,29 @@ else if ( (LA41_0==49) ) {
 
 
     // $ANTLR start "rule__XImportDeclaration__Alternatives_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3679:1: rule__XImportDeclaration__Alternatives_1 : ( ( ( rule__XImportDeclaration__Group_1_0__0 ) ) | ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_1 ) ) | ( ( rule__XImportDeclaration__ImportedNamespaceAssignment_1_2 ) ) );
+    // InternalCheckCfg.g:3679:1: rule__XImportDeclaration__Alternatives_1 : ( ( ( rule__XImportDeclaration__Group_1_0__0 ) ) | ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_1 ) ) | ( ( rule__XImportDeclaration__ImportedNamespaceAssignment_1_2 ) ) );
     public final void rule__XImportDeclaration__Alternatives_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3683:1: ( ( ( rule__XImportDeclaration__Group_1_0__0 ) ) | ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_1 ) ) | ( ( rule__XImportDeclaration__ImportedNamespaceAssignment_1_2 ) ) )
+            // InternalCheckCfg.g:3683:1: ( ( ( rule__XImportDeclaration__Group_1_0__0 ) ) | ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_1 ) ) | ( ( rule__XImportDeclaration__ImportedNamespaceAssignment_1_2 ) ) )
             int alt42=3;
             alt42 = dfa42.predict(input);
             switch (alt42) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3684:1: ( ( rule__XImportDeclaration__Group_1_0__0 ) )
+                    // InternalCheckCfg.g:3684:1: ( ( rule__XImportDeclaration__Group_1_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3684:1: ( ( rule__XImportDeclaration__Group_1_0__0 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3685:1: ( rule__XImportDeclaration__Group_1_0__0 )
+                    // InternalCheckCfg.g:3684:1: ( ( rule__XImportDeclaration__Group_1_0__0 ) )
+                    // InternalCheckCfg.g:3685:1: ( rule__XImportDeclaration__Group_1_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXImportDeclarationAccess().getGroup_1_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3686:1: ( rule__XImportDeclaration__Group_1_0__0 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3686:2: rule__XImportDeclaration__Group_1_0__0
+                    // InternalCheckCfg.g:3686:1: ( rule__XImportDeclaration__Group_1_0__0 )
+                    // InternalCheckCfg.g:3686:2: rule__XImportDeclaration__Group_1_0__0
                     {
-                    pushFollow(FOLLOW_rule__XImportDeclaration__Group_1_0__0_in_rule__XImportDeclaration__Alternatives_18047);
+                    pushFollow(FOLLOW_2);
                     rule__XImportDeclaration__Group_1_0__0();
 
                     state._fsp--;
@@ -12211,18 +12211,18 @@ public final void rule__XImportDeclaration__Alternatives_1() throws RecognitionE
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3690:6: ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_1 ) )
+                    // InternalCheckCfg.g:3690:6: ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_1 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3690:6: ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_1 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3691:1: ( rule__XImportDeclaration__ImportedTypeAssignment_1_1 )
+                    // InternalCheckCfg.g:3690:6: ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_1 ) )
+                    // InternalCheckCfg.g:3691:1: ( rule__XImportDeclaration__ImportedTypeAssignment_1_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXImportDeclarationAccess().getImportedTypeAssignment_1_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3692:1: ( rule__XImportDeclaration__ImportedTypeAssignment_1_1 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3692:2: rule__XImportDeclaration__ImportedTypeAssignment_1_1
+                    // InternalCheckCfg.g:3692:1: ( rule__XImportDeclaration__ImportedTypeAssignment_1_1 )
+                    // InternalCheckCfg.g:3692:2: rule__XImportDeclaration__ImportedTypeAssignment_1_1
                     {
-                    pushFollow(FOLLOW_rule__XImportDeclaration__ImportedTypeAssignment_1_1_in_rule__XImportDeclaration__Alternatives_18065);
+                    pushFollow(FOLLOW_2);
                     rule__XImportDeclaration__ImportedTypeAssignment_1_1();
 
                     state._fsp--;
@@ -12240,18 +12240,18 @@ public final void rule__XImportDeclaration__Alternatives_1() throws RecognitionE
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3696:6: ( ( rule__XImportDeclaration__ImportedNamespaceAssignment_1_2 ) )
+                    // InternalCheckCfg.g:3696:6: ( ( rule__XImportDeclaration__ImportedNamespaceAssignment_1_2 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3696:6: ( ( rule__XImportDeclaration__ImportedNamespaceAssignment_1_2 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3697:1: ( rule__XImportDeclaration__ImportedNamespaceAssignment_1_2 )
+                    // InternalCheckCfg.g:3696:6: ( ( rule__XImportDeclaration__ImportedNamespaceAssignment_1_2 ) )
+                    // InternalCheckCfg.g:3697:1: ( rule__XImportDeclaration__ImportedNamespaceAssignment_1_2 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXImportDeclarationAccess().getImportedNamespaceAssignment_1_2()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3698:1: ( rule__XImportDeclaration__ImportedNamespaceAssignment_1_2 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3698:2: rule__XImportDeclaration__ImportedNamespaceAssignment_1_2
+                    // InternalCheckCfg.g:3698:1: ( rule__XImportDeclaration__ImportedNamespaceAssignment_1_2 )
+                    // InternalCheckCfg.g:3698:2: rule__XImportDeclaration__ImportedNamespaceAssignment_1_2
                     {
-                    pushFollow(FOLLOW_rule__XImportDeclaration__ImportedNamespaceAssignment_1_2_in_rule__XImportDeclaration__Alternatives_18083);
+                    pushFollow(FOLLOW_2);
                     rule__XImportDeclaration__ImportedNamespaceAssignment_1_2();
 
                     state._fsp--;
@@ -12286,13 +12286,13 @@ public final void rule__XImportDeclaration__Alternatives_1() throws RecognitionE
 
 
     // $ANTLR start "rule__XImportDeclaration__Alternatives_1_0_3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3707:1: rule__XImportDeclaration__Alternatives_1_0_3 : ( ( ( rule__XImportDeclaration__WildcardAssignment_1_0_3_0 ) ) | ( ( rule__XImportDeclaration__MemberNameAssignment_1_0_3_1 ) ) );
+    // InternalCheckCfg.g:3707:1: rule__XImportDeclaration__Alternatives_1_0_3 : ( ( ( rule__XImportDeclaration__WildcardAssignment_1_0_3_0 ) ) | ( ( rule__XImportDeclaration__MemberNameAssignment_1_0_3_1 ) ) );
     public final void rule__XImportDeclaration__Alternatives_1_0_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3711:1: ( ( ( rule__XImportDeclaration__WildcardAssignment_1_0_3_0 ) ) | ( ( rule__XImportDeclaration__MemberNameAssignment_1_0_3_1 ) ) )
+            // InternalCheckCfg.g:3711:1: ( ( ( rule__XImportDeclaration__WildcardAssignment_1_0_3_0 ) ) | ( ( rule__XImportDeclaration__MemberNameAssignment_1_0_3_1 ) ) )
             int alt43=2;
             int LA43_0 = input.LA(1);
 
@@ -12311,18 +12311,18 @@ else if ( (LA43_0==RULE_ID) ) {
             }
             switch (alt43) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3712:1: ( ( rule__XImportDeclaration__WildcardAssignment_1_0_3_0 ) )
+                    // InternalCheckCfg.g:3712:1: ( ( rule__XImportDeclaration__WildcardAssignment_1_0_3_0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3712:1: ( ( rule__XImportDeclaration__WildcardAssignment_1_0_3_0 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3713:1: ( rule__XImportDeclaration__WildcardAssignment_1_0_3_0 )
+                    // InternalCheckCfg.g:3712:1: ( ( rule__XImportDeclaration__WildcardAssignment_1_0_3_0 ) )
+                    // InternalCheckCfg.g:3713:1: ( rule__XImportDeclaration__WildcardAssignment_1_0_3_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXImportDeclarationAccess().getWildcardAssignment_1_0_3_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3714:1: ( rule__XImportDeclaration__WildcardAssignment_1_0_3_0 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3714:2: rule__XImportDeclaration__WildcardAssignment_1_0_3_0
+                    // InternalCheckCfg.g:3714:1: ( rule__XImportDeclaration__WildcardAssignment_1_0_3_0 )
+                    // InternalCheckCfg.g:3714:2: rule__XImportDeclaration__WildcardAssignment_1_0_3_0
                     {
-                    pushFollow(FOLLOW_rule__XImportDeclaration__WildcardAssignment_1_0_3_0_in_rule__XImportDeclaration__Alternatives_1_0_38116);
+                    pushFollow(FOLLOW_2);
                     rule__XImportDeclaration__WildcardAssignment_1_0_3_0();
 
                     state._fsp--;
@@ -12340,18 +12340,18 @@ else if ( (LA43_0==RULE_ID) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3718:6: ( ( rule__XImportDeclaration__MemberNameAssignment_1_0_3_1 ) )
+                    // InternalCheckCfg.g:3718:6: ( ( rule__XImportDeclaration__MemberNameAssignment_1_0_3_1 ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3718:6: ( ( rule__XImportDeclaration__MemberNameAssignment_1_0_3_1 ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3719:1: ( rule__XImportDeclaration__MemberNameAssignment_1_0_3_1 )
+                    // InternalCheckCfg.g:3718:6: ( ( rule__XImportDeclaration__MemberNameAssignment_1_0_3_1 ) )
+                    // InternalCheckCfg.g:3719:1: ( rule__XImportDeclaration__MemberNameAssignment_1_0_3_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXImportDeclarationAccess().getMemberNameAssignment_1_0_3_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3720:1: ( rule__XImportDeclaration__MemberNameAssignment_1_0_3_1 )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3720:2: rule__XImportDeclaration__MemberNameAssignment_1_0_3_1
+                    // InternalCheckCfg.g:3720:1: ( rule__XImportDeclaration__MemberNameAssignment_1_0_3_1 )
+                    // InternalCheckCfg.g:3720:2: rule__XImportDeclaration__MemberNameAssignment_1_0_3_1
                     {
-                    pushFollow(FOLLOW_rule__XImportDeclaration__MemberNameAssignment_1_0_3_1_in_rule__XImportDeclaration__Alternatives_1_0_38134);
+                    pushFollow(FOLLOW_2);
                     rule__XImportDeclaration__MemberNameAssignment_1_0_3_1();
 
                     state._fsp--;
@@ -12386,13 +12386,13 @@ else if ( (LA43_0==RULE_ID) ) {
 
 
     // $ANTLR start "rule__SeverityKind__Alternatives"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3729:1: rule__SeverityKind__Alternatives : ( ( ( 'default' ) ) | ( ( 'error' ) ) | ( ( 'warning' ) ) | ( ( 'info' ) ) | ( ( 'ignore' ) ) );
+    // InternalCheckCfg.g:3729:1: rule__SeverityKind__Alternatives : ( ( ( 'default' ) ) | ( ( 'error' ) ) | ( ( 'warning' ) ) | ( ( 'info' ) ) | ( ( 'ignore' ) ) );
     public final void rule__SeverityKind__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3733:1: ( ( ( 'default' ) ) | ( ( 'error' ) ) | ( ( 'warning' ) ) | ( ( 'info' ) ) | ( ( 'ignore' ) ) )
+            // InternalCheckCfg.g:3733:1: ( ( ( 'default' ) ) | ( ( 'error' ) ) | ( ( 'warning' ) ) | ( ( 'info' ) ) | ( ( 'ignore' ) ) )
             int alt44=5;
             switch ( input.LA(1) ) {
             case 51:
@@ -12430,18 +12430,18 @@ public final void rule__SeverityKind__Alternatives() throws RecognitionException
 
             switch (alt44) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3734:1: ( ( 'default' ) )
+                    // InternalCheckCfg.g:3734:1: ( ( 'default' ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3734:1: ( ( 'default' ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3735:1: ( 'default' )
+                    // InternalCheckCfg.g:3734:1: ( ( 'default' ) )
+                    // InternalCheckCfg.g:3735:1: ( 'default' )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getSeverityKindAccess().getDefaultEnumLiteralDeclaration_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3736:1: ( 'default' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3736:3: 'default'
+                    // InternalCheckCfg.g:3736:1: ( 'default' )
+                    // InternalCheckCfg.g:3736:3: 'default'
                     {
-                    match(input,51,FOLLOW_51_in_rule__SeverityKind__Alternatives8168); if (state.failed) return ;
+                    match(input,51,FOLLOW_2); if (state.failed) return ;
 
                     }
 
@@ -12455,18 +12455,18 @@ public final void rule__SeverityKind__Alternatives() throws RecognitionException
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3741:6: ( ( 'error' ) )
+                    // InternalCheckCfg.g:3741:6: ( ( 'error' ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3741:6: ( ( 'error' ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3742:1: ( 'error' )
+                    // InternalCheckCfg.g:3741:6: ( ( 'error' ) )
+                    // InternalCheckCfg.g:3742:1: ( 'error' )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getSeverityKindAccess().getErrorEnumLiteralDeclaration_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3743:1: ( 'error' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3743:3: 'error'
+                    // InternalCheckCfg.g:3743:1: ( 'error' )
+                    // InternalCheckCfg.g:3743:3: 'error'
                     {
-                    match(input,52,FOLLOW_52_in_rule__SeverityKind__Alternatives8189); if (state.failed) return ;
+                    match(input,52,FOLLOW_2); if (state.failed) return ;
 
                     }
 
@@ -12480,18 +12480,18 @@ public final void rule__SeverityKind__Alternatives() throws RecognitionException
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3748:6: ( ( 'warning' ) )
+                    // InternalCheckCfg.g:3748:6: ( ( 'warning' ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3748:6: ( ( 'warning' ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3749:1: ( 'warning' )
+                    // InternalCheckCfg.g:3748:6: ( ( 'warning' ) )
+                    // InternalCheckCfg.g:3749:1: ( 'warning' )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getSeverityKindAccess().getWarningEnumLiteralDeclaration_2()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3750:1: ( 'warning' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3750:3: 'warning'
+                    // InternalCheckCfg.g:3750:1: ( 'warning' )
+                    // InternalCheckCfg.g:3750:3: 'warning'
                     {
-                    match(input,53,FOLLOW_53_in_rule__SeverityKind__Alternatives8210); if (state.failed) return ;
+                    match(input,53,FOLLOW_2); if (state.failed) return ;
 
                     }
 
@@ -12505,18 +12505,18 @@ public final void rule__SeverityKind__Alternatives() throws RecognitionException
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3755:6: ( ( 'info' ) )
+                    // InternalCheckCfg.g:3755:6: ( ( 'info' ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3755:6: ( ( 'info' ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3756:1: ( 'info' )
+                    // InternalCheckCfg.g:3755:6: ( ( 'info' ) )
+                    // InternalCheckCfg.g:3756:1: ( 'info' )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getSeverityKindAccess().getInfoEnumLiteralDeclaration_3()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3757:1: ( 'info' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3757:3: 'info'
+                    // InternalCheckCfg.g:3757:1: ( 'info' )
+                    // InternalCheckCfg.g:3757:3: 'info'
                     {
-                    match(input,54,FOLLOW_54_in_rule__SeverityKind__Alternatives8231); if (state.failed) return ;
+                    match(input,54,FOLLOW_2); if (state.failed) return ;
 
                     }
 
@@ -12530,18 +12530,18 @@ public final void rule__SeverityKind__Alternatives() throws RecognitionException
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3762:6: ( ( 'ignore' ) )
+                    // InternalCheckCfg.g:3762:6: ( ( 'ignore' ) )
                     {
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3762:6: ( ( 'ignore' ) )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3763:1: ( 'ignore' )
+                    // InternalCheckCfg.g:3762:6: ( ( 'ignore' ) )
+                    // InternalCheckCfg.g:3763:1: ( 'ignore' )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getSeverityKindAccess().getIgnoreEnumLiteralDeclaration_4()); 
                     }
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3764:1: ( 'ignore' )
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3764:3: 'ignore'
+                    // InternalCheckCfg.g:3764:1: ( 'ignore' )
+                    // InternalCheckCfg.g:3764:3: 'ignore'
                     {
-                    match(input,55,FOLLOW_55_in_rule__SeverityKind__Alternatives8252); if (state.failed) return ;
+                    match(input,55,FOLLOW_2); if (state.failed) return ;
 
                     }
 
@@ -12572,21 +12572,21 @@ public final void rule__SeverityKind__Alternatives() throws RecognitionException
 
 
     // $ANTLR start "rule__CheckConfiguration__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3776:1: rule__CheckConfiguration__Group__0 : rule__CheckConfiguration__Group__0__Impl rule__CheckConfiguration__Group__1 ;
+    // InternalCheckCfg.g:3776:1: rule__CheckConfiguration__Group__0 : rule__CheckConfiguration__Group__0__Impl rule__CheckConfiguration__Group__1 ;
     public final void rule__CheckConfiguration__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3780:1: ( rule__CheckConfiguration__Group__0__Impl rule__CheckConfiguration__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3781:2: rule__CheckConfiguration__Group__0__Impl rule__CheckConfiguration__Group__1
+            // InternalCheckCfg.g:3780:1: ( rule__CheckConfiguration__Group__0__Impl rule__CheckConfiguration__Group__1 )
+            // InternalCheckCfg.g:3781:2: rule__CheckConfiguration__Group__0__Impl rule__CheckConfiguration__Group__1
             {
-            pushFollow(FOLLOW_rule__CheckConfiguration__Group__0__Impl_in_rule__CheckConfiguration__Group__08285);
+            pushFollow(FOLLOW_4);
             rule__CheckConfiguration__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CheckConfiguration__Group__1_in_rule__CheckConfiguration__Group__08288);
+            pushFollow(FOLLOW_2);
             rule__CheckConfiguration__Group__1();
 
             state._fsp--;
@@ -12610,22 +12610,22 @@ public final void rule__CheckConfiguration__Group__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__CheckConfiguration__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3788:1: rule__CheckConfiguration__Group__0__Impl : ( 'check' ) ;
+    // InternalCheckCfg.g:3788:1: rule__CheckConfiguration__Group__0__Impl : ( 'check' ) ;
     public final void rule__CheckConfiguration__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3792:1: ( ( 'check' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3793:1: ( 'check' )
+            // InternalCheckCfg.g:3792:1: ( ( 'check' ) )
+            // InternalCheckCfg.g:3793:1: ( 'check' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3793:1: ( 'check' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3794:1: 'check'
+            // InternalCheckCfg.g:3793:1: ( 'check' )
+            // InternalCheckCfg.g:3794:1: 'check'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckConfigurationAccess().getCheckKeyword_0()); 
             }
-            match(input,56,FOLLOW_56_in_rule__CheckConfiguration__Group__0__Impl8316); if (state.failed) return ;
+            match(input,56,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCheckConfigurationAccess().getCheckKeyword_0()); 
             }
@@ -12651,21 +12651,21 @@ public final void rule__CheckConfiguration__Group__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__CheckConfiguration__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3807:1: rule__CheckConfiguration__Group__1 : rule__CheckConfiguration__Group__1__Impl rule__CheckConfiguration__Group__2 ;
+    // InternalCheckCfg.g:3807:1: rule__CheckConfiguration__Group__1 : rule__CheckConfiguration__Group__1__Impl rule__CheckConfiguration__Group__2 ;
     public final void rule__CheckConfiguration__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3811:1: ( rule__CheckConfiguration__Group__1__Impl rule__CheckConfiguration__Group__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3812:2: rule__CheckConfiguration__Group__1__Impl rule__CheckConfiguration__Group__2
+            // InternalCheckCfg.g:3811:1: ( rule__CheckConfiguration__Group__1__Impl rule__CheckConfiguration__Group__2 )
+            // InternalCheckCfg.g:3812:2: rule__CheckConfiguration__Group__1__Impl rule__CheckConfiguration__Group__2
             {
-            pushFollow(FOLLOW_rule__CheckConfiguration__Group__1__Impl_in_rule__CheckConfiguration__Group__18347);
+            pushFollow(FOLLOW_5);
             rule__CheckConfiguration__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CheckConfiguration__Group__2_in_rule__CheckConfiguration__Group__18350);
+            pushFollow(FOLLOW_2);
             rule__CheckConfiguration__Group__2();
 
             state._fsp--;
@@ -12689,22 +12689,22 @@ public final void rule__CheckConfiguration__Group__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__CheckConfiguration__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3819:1: rule__CheckConfiguration__Group__1__Impl : ( 'configuration' ) ;
+    // InternalCheckCfg.g:3819:1: rule__CheckConfiguration__Group__1__Impl : ( 'configuration' ) ;
     public final void rule__CheckConfiguration__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3823:1: ( ( 'configuration' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3824:1: ( 'configuration' )
+            // InternalCheckCfg.g:3823:1: ( ( 'configuration' ) )
+            // InternalCheckCfg.g:3824:1: ( 'configuration' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3824:1: ( 'configuration' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3825:1: 'configuration'
+            // InternalCheckCfg.g:3824:1: ( 'configuration' )
+            // InternalCheckCfg.g:3825:1: 'configuration'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckConfigurationAccess().getConfigurationKeyword_1()); 
             }
-            match(input,57,FOLLOW_57_in_rule__CheckConfiguration__Group__1__Impl8378); if (state.failed) return ;
+            match(input,57,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCheckConfigurationAccess().getConfigurationKeyword_1()); 
             }
@@ -12730,21 +12730,21 @@ public final void rule__CheckConfiguration__Group__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__CheckConfiguration__Group__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3838:1: rule__CheckConfiguration__Group__2 : rule__CheckConfiguration__Group__2__Impl rule__CheckConfiguration__Group__3 ;
+    // InternalCheckCfg.g:3838:1: rule__CheckConfiguration__Group__2 : rule__CheckConfiguration__Group__2__Impl rule__CheckConfiguration__Group__3 ;
     public final void rule__CheckConfiguration__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3842:1: ( rule__CheckConfiguration__Group__2__Impl rule__CheckConfiguration__Group__3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3843:2: rule__CheckConfiguration__Group__2__Impl rule__CheckConfiguration__Group__3
+            // InternalCheckCfg.g:3842:1: ( rule__CheckConfiguration__Group__2__Impl rule__CheckConfiguration__Group__3 )
+            // InternalCheckCfg.g:3843:2: rule__CheckConfiguration__Group__2__Impl rule__CheckConfiguration__Group__3
             {
-            pushFollow(FOLLOW_rule__CheckConfiguration__Group__2__Impl_in_rule__CheckConfiguration__Group__28409);
+            pushFollow(FOLLOW_6);
             rule__CheckConfiguration__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CheckConfiguration__Group__3_in_rule__CheckConfiguration__Group__28412);
+            pushFollow(FOLLOW_2);
             rule__CheckConfiguration__Group__3();
 
             state._fsp--;
@@ -12768,25 +12768,25 @@ public final void rule__CheckConfiguration__Group__2() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__CheckConfiguration__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3850:1: rule__CheckConfiguration__Group__2__Impl : ( ( rule__CheckConfiguration__NameAssignment_2 ) ) ;
+    // InternalCheckCfg.g:3850:1: rule__CheckConfiguration__Group__2__Impl : ( ( rule__CheckConfiguration__NameAssignment_2 ) ) ;
     public final void rule__CheckConfiguration__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3854:1: ( ( ( rule__CheckConfiguration__NameAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3855:1: ( ( rule__CheckConfiguration__NameAssignment_2 ) )
+            // InternalCheckCfg.g:3854:1: ( ( ( rule__CheckConfiguration__NameAssignment_2 ) ) )
+            // InternalCheckCfg.g:3855:1: ( ( rule__CheckConfiguration__NameAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3855:1: ( ( rule__CheckConfiguration__NameAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3856:1: ( rule__CheckConfiguration__NameAssignment_2 )
+            // InternalCheckCfg.g:3855:1: ( ( rule__CheckConfiguration__NameAssignment_2 ) )
+            // InternalCheckCfg.g:3856:1: ( rule__CheckConfiguration__NameAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckConfigurationAccess().getNameAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3857:1: ( rule__CheckConfiguration__NameAssignment_2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3857:2: rule__CheckConfiguration__NameAssignment_2
+            // InternalCheckCfg.g:3857:1: ( rule__CheckConfiguration__NameAssignment_2 )
+            // InternalCheckCfg.g:3857:2: rule__CheckConfiguration__NameAssignment_2
             {
-            pushFollow(FOLLOW_rule__CheckConfiguration__NameAssignment_2_in_rule__CheckConfiguration__Group__2__Impl8439);
+            pushFollow(FOLLOW_2);
             rule__CheckConfiguration__NameAssignment_2();
 
             state._fsp--;
@@ -12819,21 +12819,21 @@ public final void rule__CheckConfiguration__Group__2__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__CheckConfiguration__Group__3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3867:1: rule__CheckConfiguration__Group__3 : rule__CheckConfiguration__Group__3__Impl rule__CheckConfiguration__Group__4 ;
+    // InternalCheckCfg.g:3867:1: rule__CheckConfiguration__Group__3 : rule__CheckConfiguration__Group__3__Impl rule__CheckConfiguration__Group__4 ;
     public final void rule__CheckConfiguration__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3871:1: ( rule__CheckConfiguration__Group__3__Impl rule__CheckConfiguration__Group__4 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3872:2: rule__CheckConfiguration__Group__3__Impl rule__CheckConfiguration__Group__4
+            // InternalCheckCfg.g:3871:1: ( rule__CheckConfiguration__Group__3__Impl rule__CheckConfiguration__Group__4 )
+            // InternalCheckCfg.g:3872:2: rule__CheckConfiguration__Group__3__Impl rule__CheckConfiguration__Group__4
             {
-            pushFollow(FOLLOW_rule__CheckConfiguration__Group__3__Impl_in_rule__CheckConfiguration__Group__38469);
+            pushFollow(FOLLOW_6);
             rule__CheckConfiguration__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CheckConfiguration__Group__4_in_rule__CheckConfiguration__Group__38472);
+            pushFollow(FOLLOW_2);
             rule__CheckConfiguration__Group__4();
 
             state._fsp--;
@@ -12857,22 +12857,22 @@ public final void rule__CheckConfiguration__Group__3() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__CheckConfiguration__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3879:1: rule__CheckConfiguration__Group__3__Impl : ( ( rule__CheckConfiguration__ParameterConfigurationsAssignment_3 )* ) ;
+    // InternalCheckCfg.g:3879:1: rule__CheckConfiguration__Group__3__Impl : ( ( rule__CheckConfiguration__ParameterConfigurationsAssignment_3 )* ) ;
     public final void rule__CheckConfiguration__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3883:1: ( ( ( rule__CheckConfiguration__ParameterConfigurationsAssignment_3 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3884:1: ( ( rule__CheckConfiguration__ParameterConfigurationsAssignment_3 )* )
+            // InternalCheckCfg.g:3883:1: ( ( ( rule__CheckConfiguration__ParameterConfigurationsAssignment_3 )* ) )
+            // InternalCheckCfg.g:3884:1: ( ( rule__CheckConfiguration__ParameterConfigurationsAssignment_3 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3884:1: ( ( rule__CheckConfiguration__ParameterConfigurationsAssignment_3 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3885:1: ( rule__CheckConfiguration__ParameterConfigurationsAssignment_3 )*
+            // InternalCheckCfg.g:3884:1: ( ( rule__CheckConfiguration__ParameterConfigurationsAssignment_3 )* )
+            // InternalCheckCfg.g:3885:1: ( rule__CheckConfiguration__ParameterConfigurationsAssignment_3 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckConfigurationAccess().getParameterConfigurationsAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3886:1: ( rule__CheckConfiguration__ParameterConfigurationsAssignment_3 )*
+            // InternalCheckCfg.g:3886:1: ( rule__CheckConfiguration__ParameterConfigurationsAssignment_3 )*
             loop45:
             do {
                 int alt45=2;
@@ -12885,9 +12885,9 @@ public final void rule__CheckConfiguration__Group__3__Impl() throws RecognitionE
 
                 switch (alt45) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3886:2: rule__CheckConfiguration__ParameterConfigurationsAssignment_3
+            	    // InternalCheckCfg.g:3886:2: rule__CheckConfiguration__ParameterConfigurationsAssignment_3
             	    {
-            	    pushFollow(FOLLOW_rule__CheckConfiguration__ParameterConfigurationsAssignment_3_in_rule__CheckConfiguration__Group__3__Impl8499);
+            	    pushFollow(FOLLOW_3);
             	    rule__CheckConfiguration__ParameterConfigurationsAssignment_3();
 
             	    state._fsp--;
@@ -12926,21 +12926,21 @@ public final void rule__CheckConfiguration__Group__3__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__CheckConfiguration__Group__4"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3896:1: rule__CheckConfiguration__Group__4 : rule__CheckConfiguration__Group__4__Impl rule__CheckConfiguration__Group__5 ;
+    // InternalCheckCfg.g:3896:1: rule__CheckConfiguration__Group__4 : rule__CheckConfiguration__Group__4__Impl rule__CheckConfiguration__Group__5 ;
     public final void rule__CheckConfiguration__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3900:1: ( rule__CheckConfiguration__Group__4__Impl rule__CheckConfiguration__Group__5 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3901:2: rule__CheckConfiguration__Group__4__Impl rule__CheckConfiguration__Group__5
+            // InternalCheckCfg.g:3900:1: ( rule__CheckConfiguration__Group__4__Impl rule__CheckConfiguration__Group__5 )
+            // InternalCheckCfg.g:3901:2: rule__CheckConfiguration__Group__4__Impl rule__CheckConfiguration__Group__5
             {
-            pushFollow(FOLLOW_rule__CheckConfiguration__Group__4__Impl_in_rule__CheckConfiguration__Group__48530);
+            pushFollow(FOLLOW_6);
             rule__CheckConfiguration__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CheckConfiguration__Group__5_in_rule__CheckConfiguration__Group__48533);
+            pushFollow(FOLLOW_2);
             rule__CheckConfiguration__Group__5();
 
             state._fsp--;
@@ -12964,22 +12964,22 @@ public final void rule__CheckConfiguration__Group__4() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__CheckConfiguration__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3908:1: rule__CheckConfiguration__Group__4__Impl : ( ( rule__CheckConfiguration__LanguageValidatorConfigurationsAssignment_4 )* ) ;
+    // InternalCheckCfg.g:3908:1: rule__CheckConfiguration__Group__4__Impl : ( ( rule__CheckConfiguration__LanguageValidatorConfigurationsAssignment_4 )* ) ;
     public final void rule__CheckConfiguration__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3912:1: ( ( ( rule__CheckConfiguration__LanguageValidatorConfigurationsAssignment_4 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3913:1: ( ( rule__CheckConfiguration__LanguageValidatorConfigurationsAssignment_4 )* )
+            // InternalCheckCfg.g:3912:1: ( ( ( rule__CheckConfiguration__LanguageValidatorConfigurationsAssignment_4 )* ) )
+            // InternalCheckCfg.g:3913:1: ( ( rule__CheckConfiguration__LanguageValidatorConfigurationsAssignment_4 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3913:1: ( ( rule__CheckConfiguration__LanguageValidatorConfigurationsAssignment_4 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3914:1: ( rule__CheckConfiguration__LanguageValidatorConfigurationsAssignment_4 )*
+            // InternalCheckCfg.g:3913:1: ( ( rule__CheckConfiguration__LanguageValidatorConfigurationsAssignment_4 )* )
+            // InternalCheckCfg.g:3914:1: ( rule__CheckConfiguration__LanguageValidatorConfigurationsAssignment_4 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckConfigurationAccess().getLanguageValidatorConfigurationsAssignment_4()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3915:1: ( rule__CheckConfiguration__LanguageValidatorConfigurationsAssignment_4 )*
+            // InternalCheckCfg.g:3915:1: ( rule__CheckConfiguration__LanguageValidatorConfigurationsAssignment_4 )*
             loop46:
             do {
                 int alt46=2;
@@ -12992,9 +12992,9 @@ public final void rule__CheckConfiguration__Group__4__Impl() throws RecognitionE
 
                 switch (alt46) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3915:2: rule__CheckConfiguration__LanguageValidatorConfigurationsAssignment_4
+            	    // InternalCheckCfg.g:3915:2: rule__CheckConfiguration__LanguageValidatorConfigurationsAssignment_4
             	    {
-            	    pushFollow(FOLLOW_rule__CheckConfiguration__LanguageValidatorConfigurationsAssignment_4_in_rule__CheckConfiguration__Group__4__Impl8560);
+            	    pushFollow(FOLLOW_7);
             	    rule__CheckConfiguration__LanguageValidatorConfigurationsAssignment_4();
 
             	    state._fsp--;
@@ -13033,16 +13033,16 @@ public final void rule__CheckConfiguration__Group__4__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__CheckConfiguration__Group__5"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3925:1: rule__CheckConfiguration__Group__5 : rule__CheckConfiguration__Group__5__Impl ;
+    // InternalCheckCfg.g:3925:1: rule__CheckConfiguration__Group__5 : rule__CheckConfiguration__Group__5__Impl ;
     public final void rule__CheckConfiguration__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3929:1: ( rule__CheckConfiguration__Group__5__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3930:2: rule__CheckConfiguration__Group__5__Impl
+            // InternalCheckCfg.g:3929:1: ( rule__CheckConfiguration__Group__5__Impl )
+            // InternalCheckCfg.g:3930:2: rule__CheckConfiguration__Group__5__Impl
             {
-            pushFollow(FOLLOW_rule__CheckConfiguration__Group__5__Impl_in_rule__CheckConfiguration__Group__58591);
+            pushFollow(FOLLOW_2);
             rule__CheckConfiguration__Group__5__Impl();
 
             state._fsp--;
@@ -13066,22 +13066,22 @@ public final void rule__CheckConfiguration__Group__5() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__CheckConfiguration__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3936:1: rule__CheckConfiguration__Group__5__Impl : ( ( rule__CheckConfiguration__Group_5__0 )? ) ;
+    // InternalCheckCfg.g:3936:1: rule__CheckConfiguration__Group__5__Impl : ( ( rule__CheckConfiguration__Group_5__0 )? ) ;
     public final void rule__CheckConfiguration__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3940:1: ( ( ( rule__CheckConfiguration__Group_5__0 )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3941:1: ( ( rule__CheckConfiguration__Group_5__0 )? )
+            // InternalCheckCfg.g:3940:1: ( ( ( rule__CheckConfiguration__Group_5__0 )? ) )
+            // InternalCheckCfg.g:3941:1: ( ( rule__CheckConfiguration__Group_5__0 )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3941:1: ( ( rule__CheckConfiguration__Group_5__0 )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3942:1: ( rule__CheckConfiguration__Group_5__0 )?
+            // InternalCheckCfg.g:3941:1: ( ( rule__CheckConfiguration__Group_5__0 )? )
+            // InternalCheckCfg.g:3942:1: ( rule__CheckConfiguration__Group_5__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckConfigurationAccess().getGroup_5()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3943:1: ( rule__CheckConfiguration__Group_5__0 )?
+            // InternalCheckCfg.g:3943:1: ( rule__CheckConfiguration__Group_5__0 )?
             int alt47=2;
             int LA47_0 = input.LA(1);
 
@@ -13090,9 +13090,9 @@ public final void rule__CheckConfiguration__Group__5__Impl() throws RecognitionE
             }
             switch (alt47) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3943:2: rule__CheckConfiguration__Group_5__0
+                    // InternalCheckCfg.g:3943:2: rule__CheckConfiguration__Group_5__0
                     {
-                    pushFollow(FOLLOW_rule__CheckConfiguration__Group_5__0_in_rule__CheckConfiguration__Group__5__Impl8618);
+                    pushFollow(FOLLOW_2);
                     rule__CheckConfiguration__Group_5__0();
 
                     state._fsp--;
@@ -13128,21 +13128,21 @@ public final void rule__CheckConfiguration__Group__5__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__CheckConfiguration__Group_5__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3965:1: rule__CheckConfiguration__Group_5__0 : rule__CheckConfiguration__Group_5__0__Impl rule__CheckConfiguration__Group_5__1 ;
+    // InternalCheckCfg.g:3965:1: rule__CheckConfiguration__Group_5__0 : rule__CheckConfiguration__Group_5__0__Impl rule__CheckConfiguration__Group_5__1 ;
     public final void rule__CheckConfiguration__Group_5__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3969:1: ( rule__CheckConfiguration__Group_5__0__Impl rule__CheckConfiguration__Group_5__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3970:2: rule__CheckConfiguration__Group_5__0__Impl rule__CheckConfiguration__Group_5__1
+            // InternalCheckCfg.g:3969:1: ( rule__CheckConfiguration__Group_5__0__Impl rule__CheckConfiguration__Group_5__1 )
+            // InternalCheckCfg.g:3970:2: rule__CheckConfiguration__Group_5__0__Impl rule__CheckConfiguration__Group_5__1
             {
-            pushFollow(FOLLOW_rule__CheckConfiguration__Group_5__0__Impl_in_rule__CheckConfiguration__Group_5__08661);
+            pushFollow(FOLLOW_8);
             rule__CheckConfiguration__Group_5__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CheckConfiguration__Group_5__1_in_rule__CheckConfiguration__Group_5__08664);
+            pushFollow(FOLLOW_2);
             rule__CheckConfiguration__Group_5__1();
 
             state._fsp--;
@@ -13166,22 +13166,22 @@ public final void rule__CheckConfiguration__Group_5__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__CheckConfiguration__Group_5__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3977:1: rule__CheckConfiguration__Group_5__0__Impl : ( '{' ) ;
+    // InternalCheckCfg.g:3977:1: rule__CheckConfiguration__Group_5__0__Impl : ( '{' ) ;
     public final void rule__CheckConfiguration__Group_5__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3981:1: ( ( '{' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3982:1: ( '{' )
+            // InternalCheckCfg.g:3981:1: ( ( '{' ) )
+            // InternalCheckCfg.g:3982:1: ( '{' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3982:1: ( '{' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3983:1: '{'
+            // InternalCheckCfg.g:3982:1: ( '{' )
+            // InternalCheckCfg.g:3983:1: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckConfigurationAccess().getLeftCurlyBracketKeyword_5_0()); 
             }
-            match(input,58,FOLLOW_58_in_rule__CheckConfiguration__Group_5__0__Impl8692); if (state.failed) return ;
+            match(input,58,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCheckConfigurationAccess().getLeftCurlyBracketKeyword_5_0()); 
             }
@@ -13207,21 +13207,21 @@ public final void rule__CheckConfiguration__Group_5__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__CheckConfiguration__Group_5__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3996:1: rule__CheckConfiguration__Group_5__1 : rule__CheckConfiguration__Group_5__1__Impl rule__CheckConfiguration__Group_5__2 ;
+    // InternalCheckCfg.g:3996:1: rule__CheckConfiguration__Group_5__1 : rule__CheckConfiguration__Group_5__1__Impl rule__CheckConfiguration__Group_5__2 ;
     public final void rule__CheckConfiguration__Group_5__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4000:1: ( rule__CheckConfiguration__Group_5__1__Impl rule__CheckConfiguration__Group_5__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4001:2: rule__CheckConfiguration__Group_5__1__Impl rule__CheckConfiguration__Group_5__2
+            // InternalCheckCfg.g:4000:1: ( rule__CheckConfiguration__Group_5__1__Impl rule__CheckConfiguration__Group_5__2 )
+            // InternalCheckCfg.g:4001:2: rule__CheckConfiguration__Group_5__1__Impl rule__CheckConfiguration__Group_5__2
             {
-            pushFollow(FOLLOW_rule__CheckConfiguration__Group_5__1__Impl_in_rule__CheckConfiguration__Group_5__18723);
+            pushFollow(FOLLOW_8);
             rule__CheckConfiguration__Group_5__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CheckConfiguration__Group_5__2_in_rule__CheckConfiguration__Group_5__18726);
+            pushFollow(FOLLOW_2);
             rule__CheckConfiguration__Group_5__2();
 
             state._fsp--;
@@ -13245,22 +13245,22 @@ public final void rule__CheckConfiguration__Group_5__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__CheckConfiguration__Group_5__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4008:1: rule__CheckConfiguration__Group_5__1__Impl : ( ( rule__CheckConfiguration__LegacyCatalogConfigurationsAssignment_5_1 )* ) ;
+    // InternalCheckCfg.g:4008:1: rule__CheckConfiguration__Group_5__1__Impl : ( ( rule__CheckConfiguration__LegacyCatalogConfigurationsAssignment_5_1 )* ) ;
     public final void rule__CheckConfiguration__Group_5__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4012:1: ( ( ( rule__CheckConfiguration__LegacyCatalogConfigurationsAssignment_5_1 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4013:1: ( ( rule__CheckConfiguration__LegacyCatalogConfigurationsAssignment_5_1 )* )
+            // InternalCheckCfg.g:4012:1: ( ( ( rule__CheckConfiguration__LegacyCatalogConfigurationsAssignment_5_1 )* ) )
+            // InternalCheckCfg.g:4013:1: ( ( rule__CheckConfiguration__LegacyCatalogConfigurationsAssignment_5_1 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4013:1: ( ( rule__CheckConfiguration__LegacyCatalogConfigurationsAssignment_5_1 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4014:1: ( rule__CheckConfiguration__LegacyCatalogConfigurationsAssignment_5_1 )*
+            // InternalCheckCfg.g:4013:1: ( ( rule__CheckConfiguration__LegacyCatalogConfigurationsAssignment_5_1 )* )
+            // InternalCheckCfg.g:4014:1: ( rule__CheckConfiguration__LegacyCatalogConfigurationsAssignment_5_1 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckConfigurationAccess().getLegacyCatalogConfigurationsAssignment_5_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4015:1: ( rule__CheckConfiguration__LegacyCatalogConfigurationsAssignment_5_1 )*
+            // InternalCheckCfg.g:4015:1: ( rule__CheckConfiguration__LegacyCatalogConfigurationsAssignment_5_1 )*
             loop48:
             do {
                 int alt48=2;
@@ -13273,9 +13273,9 @@ public final void rule__CheckConfiguration__Group_5__1__Impl() throws Recognitio
 
                 switch (alt48) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4015:2: rule__CheckConfiguration__LegacyCatalogConfigurationsAssignment_5_1
+            	    // InternalCheckCfg.g:4015:2: rule__CheckConfiguration__LegacyCatalogConfigurationsAssignment_5_1
             	    {
-            	    pushFollow(FOLLOW_rule__CheckConfiguration__LegacyCatalogConfigurationsAssignment_5_1_in_rule__CheckConfiguration__Group_5__1__Impl8753);
+            	    pushFollow(FOLLOW_9);
             	    rule__CheckConfiguration__LegacyCatalogConfigurationsAssignment_5_1();
 
             	    state._fsp--;
@@ -13314,16 +13314,16 @@ public final void rule__CheckConfiguration__Group_5__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__CheckConfiguration__Group_5__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4025:1: rule__CheckConfiguration__Group_5__2 : rule__CheckConfiguration__Group_5__2__Impl ;
+    // InternalCheckCfg.g:4025:1: rule__CheckConfiguration__Group_5__2 : rule__CheckConfiguration__Group_5__2__Impl ;
     public final void rule__CheckConfiguration__Group_5__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4029:1: ( rule__CheckConfiguration__Group_5__2__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4030:2: rule__CheckConfiguration__Group_5__2__Impl
+            // InternalCheckCfg.g:4029:1: ( rule__CheckConfiguration__Group_5__2__Impl )
+            // InternalCheckCfg.g:4030:2: rule__CheckConfiguration__Group_5__2__Impl
             {
-            pushFollow(FOLLOW_rule__CheckConfiguration__Group_5__2__Impl_in_rule__CheckConfiguration__Group_5__28784);
+            pushFollow(FOLLOW_2);
             rule__CheckConfiguration__Group_5__2__Impl();
 
             state._fsp--;
@@ -13347,22 +13347,22 @@ public final void rule__CheckConfiguration__Group_5__2() throws RecognitionExcep
 
 
     // $ANTLR start "rule__CheckConfiguration__Group_5__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4036:1: rule__CheckConfiguration__Group_5__2__Impl : ( '}' ) ;
+    // InternalCheckCfg.g:4036:1: rule__CheckConfiguration__Group_5__2__Impl : ( '}' ) ;
     public final void rule__CheckConfiguration__Group_5__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4040:1: ( ( '}' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4041:1: ( '}' )
+            // InternalCheckCfg.g:4040:1: ( ( '}' ) )
+            // InternalCheckCfg.g:4041:1: ( '}' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4041:1: ( '}' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4042:1: '}'
+            // InternalCheckCfg.g:4041:1: ( '}' )
+            // InternalCheckCfg.g:4042:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckConfigurationAccess().getRightCurlyBracketKeyword_5_2()); 
             }
-            match(input,59,FOLLOW_59_in_rule__CheckConfiguration__Group_5__2__Impl8812); if (state.failed) return ;
+            match(input,59,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCheckConfigurationAccess().getRightCurlyBracketKeyword_5_2()); 
             }
@@ -13388,21 +13388,21 @@ public final void rule__CheckConfiguration__Group_5__2__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__ConfiguredLanguageValidator__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4061:1: rule__ConfiguredLanguageValidator__Group__0 : rule__ConfiguredLanguageValidator__Group__0__Impl rule__ConfiguredLanguageValidator__Group__1 ;
+    // InternalCheckCfg.g:4061:1: rule__ConfiguredLanguageValidator__Group__0 : rule__ConfiguredLanguageValidator__Group__0__Impl rule__ConfiguredLanguageValidator__Group__1 ;
     public final void rule__ConfiguredLanguageValidator__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4065:1: ( rule__ConfiguredLanguageValidator__Group__0__Impl rule__ConfiguredLanguageValidator__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4066:2: rule__ConfiguredLanguageValidator__Group__0__Impl rule__ConfiguredLanguageValidator__Group__1
+            // InternalCheckCfg.g:4065:1: ( rule__ConfiguredLanguageValidator__Group__0__Impl rule__ConfiguredLanguageValidator__Group__1 )
+            // InternalCheckCfg.g:4066:2: rule__ConfiguredLanguageValidator__Group__0__Impl rule__ConfiguredLanguageValidator__Group__1
             {
-            pushFollow(FOLLOW_rule__ConfiguredLanguageValidator__Group__0__Impl_in_rule__ConfiguredLanguageValidator__Group__08849);
+            pushFollow(FOLLOW_5);
             rule__ConfiguredLanguageValidator__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ConfiguredLanguageValidator__Group__1_in_rule__ConfiguredLanguageValidator__Group__08852);
+            pushFollow(FOLLOW_2);
             rule__ConfiguredLanguageValidator__Group__1();
 
             state._fsp--;
@@ -13426,22 +13426,22 @@ public final void rule__ConfiguredLanguageValidator__Group__0() throws Recogniti
 
 
     // $ANTLR start "rule__ConfiguredLanguageValidator__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4073:1: rule__ConfiguredLanguageValidator__Group__0__Impl : ( 'for' ) ;
+    // InternalCheckCfg.g:4073:1: rule__ConfiguredLanguageValidator__Group__0__Impl : ( 'for' ) ;
     public final void rule__ConfiguredLanguageValidator__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4077:1: ( ( 'for' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4078:1: ( 'for' )
+            // InternalCheckCfg.g:4077:1: ( ( 'for' ) )
+            // InternalCheckCfg.g:4078:1: ( 'for' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4078:1: ( 'for' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4079:1: 'for'
+            // InternalCheckCfg.g:4078:1: ( 'for' )
+            // InternalCheckCfg.g:4079:1: 'for'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredLanguageValidatorAccess().getForKeyword_0()); 
             }
-            match(input,60,FOLLOW_60_in_rule__ConfiguredLanguageValidator__Group__0__Impl8880); if (state.failed) return ;
+            match(input,60,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getConfiguredLanguageValidatorAccess().getForKeyword_0()); 
             }
@@ -13467,21 +13467,21 @@ public final void rule__ConfiguredLanguageValidator__Group__0__Impl() throws Rec
 
 
     // $ANTLR start "rule__ConfiguredLanguageValidator__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4092:1: rule__ConfiguredLanguageValidator__Group__1 : rule__ConfiguredLanguageValidator__Group__1__Impl rule__ConfiguredLanguageValidator__Group__2 ;
+    // InternalCheckCfg.g:4092:1: rule__ConfiguredLanguageValidator__Group__1 : rule__ConfiguredLanguageValidator__Group__1__Impl rule__ConfiguredLanguageValidator__Group__2 ;
     public final void rule__ConfiguredLanguageValidator__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4096:1: ( rule__ConfiguredLanguageValidator__Group__1__Impl rule__ConfiguredLanguageValidator__Group__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4097:2: rule__ConfiguredLanguageValidator__Group__1__Impl rule__ConfiguredLanguageValidator__Group__2
+            // InternalCheckCfg.g:4096:1: ( rule__ConfiguredLanguageValidator__Group__1__Impl rule__ConfiguredLanguageValidator__Group__2 )
+            // InternalCheckCfg.g:4097:2: rule__ConfiguredLanguageValidator__Group__1__Impl rule__ConfiguredLanguageValidator__Group__2
             {
-            pushFollow(FOLLOW_rule__ConfiguredLanguageValidator__Group__1__Impl_in_rule__ConfiguredLanguageValidator__Group__18911);
+            pushFollow(FOLLOW_10);
             rule__ConfiguredLanguageValidator__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ConfiguredLanguageValidator__Group__2_in_rule__ConfiguredLanguageValidator__Group__18914);
+            pushFollow(FOLLOW_2);
             rule__ConfiguredLanguageValidator__Group__2();
 
             state._fsp--;
@@ -13505,25 +13505,25 @@ public final void rule__ConfiguredLanguageValidator__Group__1() throws Recogniti
 
 
     // $ANTLR start "rule__ConfiguredLanguageValidator__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4104:1: rule__ConfiguredLanguageValidator__Group__1__Impl : ( ( rule__ConfiguredLanguageValidator__LanguageAssignment_1 ) ) ;
+    // InternalCheckCfg.g:4104:1: rule__ConfiguredLanguageValidator__Group__1__Impl : ( ( rule__ConfiguredLanguageValidator__LanguageAssignment_1 ) ) ;
     public final void rule__ConfiguredLanguageValidator__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4108:1: ( ( ( rule__ConfiguredLanguageValidator__LanguageAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4109:1: ( ( rule__ConfiguredLanguageValidator__LanguageAssignment_1 ) )
+            // InternalCheckCfg.g:4108:1: ( ( ( rule__ConfiguredLanguageValidator__LanguageAssignment_1 ) ) )
+            // InternalCheckCfg.g:4109:1: ( ( rule__ConfiguredLanguageValidator__LanguageAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4109:1: ( ( rule__ConfiguredLanguageValidator__LanguageAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4110:1: ( rule__ConfiguredLanguageValidator__LanguageAssignment_1 )
+            // InternalCheckCfg.g:4109:1: ( ( rule__ConfiguredLanguageValidator__LanguageAssignment_1 ) )
+            // InternalCheckCfg.g:4110:1: ( rule__ConfiguredLanguageValidator__LanguageAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredLanguageValidatorAccess().getLanguageAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4111:1: ( rule__ConfiguredLanguageValidator__LanguageAssignment_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4111:2: rule__ConfiguredLanguageValidator__LanguageAssignment_1
+            // InternalCheckCfg.g:4111:1: ( rule__ConfiguredLanguageValidator__LanguageAssignment_1 )
+            // InternalCheckCfg.g:4111:2: rule__ConfiguredLanguageValidator__LanguageAssignment_1
             {
-            pushFollow(FOLLOW_rule__ConfiguredLanguageValidator__LanguageAssignment_1_in_rule__ConfiguredLanguageValidator__Group__1__Impl8941);
+            pushFollow(FOLLOW_2);
             rule__ConfiguredLanguageValidator__LanguageAssignment_1();
 
             state._fsp--;
@@ -13556,21 +13556,21 @@ public final void rule__ConfiguredLanguageValidator__Group__1__Impl() throws Rec
 
 
     // $ANTLR start "rule__ConfiguredLanguageValidator__Group__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4121:1: rule__ConfiguredLanguageValidator__Group__2 : rule__ConfiguredLanguageValidator__Group__2__Impl rule__ConfiguredLanguageValidator__Group__3 ;
+    // InternalCheckCfg.g:4121:1: rule__ConfiguredLanguageValidator__Group__2 : rule__ConfiguredLanguageValidator__Group__2__Impl rule__ConfiguredLanguageValidator__Group__3 ;
     public final void rule__ConfiguredLanguageValidator__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4125:1: ( rule__ConfiguredLanguageValidator__Group__2__Impl rule__ConfiguredLanguageValidator__Group__3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4126:2: rule__ConfiguredLanguageValidator__Group__2__Impl rule__ConfiguredLanguageValidator__Group__3
+            // InternalCheckCfg.g:4125:1: ( rule__ConfiguredLanguageValidator__Group__2__Impl rule__ConfiguredLanguageValidator__Group__3 )
+            // InternalCheckCfg.g:4126:2: rule__ConfiguredLanguageValidator__Group__2__Impl rule__ConfiguredLanguageValidator__Group__3
             {
-            pushFollow(FOLLOW_rule__ConfiguredLanguageValidator__Group__2__Impl_in_rule__ConfiguredLanguageValidator__Group__28971);
+            pushFollow(FOLLOW_11);
             rule__ConfiguredLanguageValidator__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ConfiguredLanguageValidator__Group__3_in_rule__ConfiguredLanguageValidator__Group__28974);
+            pushFollow(FOLLOW_2);
             rule__ConfiguredLanguageValidator__Group__3();
 
             state._fsp--;
@@ -13594,22 +13594,22 @@ public final void rule__ConfiguredLanguageValidator__Group__2() throws Recogniti
 
 
     // $ANTLR start "rule__ConfiguredLanguageValidator__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4133:1: rule__ConfiguredLanguageValidator__Group__2__Impl : ( '{' ) ;
+    // InternalCheckCfg.g:4133:1: rule__ConfiguredLanguageValidator__Group__2__Impl : ( '{' ) ;
     public final void rule__ConfiguredLanguageValidator__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4137:1: ( ( '{' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4138:1: ( '{' )
+            // InternalCheckCfg.g:4137:1: ( ( '{' ) )
+            // InternalCheckCfg.g:4138:1: ( '{' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4138:1: ( '{' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4139:1: '{'
+            // InternalCheckCfg.g:4138:1: ( '{' )
+            // InternalCheckCfg.g:4139:1: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredLanguageValidatorAccess().getLeftCurlyBracketKeyword_2()); 
             }
-            match(input,58,FOLLOW_58_in_rule__ConfiguredLanguageValidator__Group__2__Impl9002); if (state.failed) return ;
+            match(input,58,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getConfiguredLanguageValidatorAccess().getLeftCurlyBracketKeyword_2()); 
             }
@@ -13635,21 +13635,21 @@ public final void rule__ConfiguredLanguageValidator__Group__2__Impl() throws Rec
 
 
     // $ANTLR start "rule__ConfiguredLanguageValidator__Group__3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4152:1: rule__ConfiguredLanguageValidator__Group__3 : rule__ConfiguredLanguageValidator__Group__3__Impl rule__ConfiguredLanguageValidator__Group__4 ;
+    // InternalCheckCfg.g:4152:1: rule__ConfiguredLanguageValidator__Group__3 : rule__ConfiguredLanguageValidator__Group__3__Impl rule__ConfiguredLanguageValidator__Group__4 ;
     public final void rule__ConfiguredLanguageValidator__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4156:1: ( rule__ConfiguredLanguageValidator__Group__3__Impl rule__ConfiguredLanguageValidator__Group__4 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4157:2: rule__ConfiguredLanguageValidator__Group__3__Impl rule__ConfiguredLanguageValidator__Group__4
+            // InternalCheckCfg.g:4156:1: ( rule__ConfiguredLanguageValidator__Group__3__Impl rule__ConfiguredLanguageValidator__Group__4 )
+            // InternalCheckCfg.g:4157:2: rule__ConfiguredLanguageValidator__Group__3__Impl rule__ConfiguredLanguageValidator__Group__4
             {
-            pushFollow(FOLLOW_rule__ConfiguredLanguageValidator__Group__3__Impl_in_rule__ConfiguredLanguageValidator__Group__39033);
+            pushFollow(FOLLOW_11);
             rule__ConfiguredLanguageValidator__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ConfiguredLanguageValidator__Group__4_in_rule__ConfiguredLanguageValidator__Group__39036);
+            pushFollow(FOLLOW_2);
             rule__ConfiguredLanguageValidator__Group__4();
 
             state._fsp--;
@@ -13673,22 +13673,22 @@ public final void rule__ConfiguredLanguageValidator__Group__3() throws Recogniti
 
 
     // $ANTLR start "rule__ConfiguredLanguageValidator__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4164:1: rule__ConfiguredLanguageValidator__Group__3__Impl : ( ( rule__ConfiguredLanguageValidator__ParameterConfigurationsAssignment_3 )* ) ;
+    // InternalCheckCfg.g:4164:1: rule__ConfiguredLanguageValidator__Group__3__Impl : ( ( rule__ConfiguredLanguageValidator__ParameterConfigurationsAssignment_3 )* ) ;
     public final void rule__ConfiguredLanguageValidator__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4168:1: ( ( ( rule__ConfiguredLanguageValidator__ParameterConfigurationsAssignment_3 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4169:1: ( ( rule__ConfiguredLanguageValidator__ParameterConfigurationsAssignment_3 )* )
+            // InternalCheckCfg.g:4168:1: ( ( ( rule__ConfiguredLanguageValidator__ParameterConfigurationsAssignment_3 )* ) )
+            // InternalCheckCfg.g:4169:1: ( ( rule__ConfiguredLanguageValidator__ParameterConfigurationsAssignment_3 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4169:1: ( ( rule__ConfiguredLanguageValidator__ParameterConfigurationsAssignment_3 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4170:1: ( rule__ConfiguredLanguageValidator__ParameterConfigurationsAssignment_3 )*
+            // InternalCheckCfg.g:4169:1: ( ( rule__ConfiguredLanguageValidator__ParameterConfigurationsAssignment_3 )* )
+            // InternalCheckCfg.g:4170:1: ( rule__ConfiguredLanguageValidator__ParameterConfigurationsAssignment_3 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredLanguageValidatorAccess().getParameterConfigurationsAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4171:1: ( rule__ConfiguredLanguageValidator__ParameterConfigurationsAssignment_3 )*
+            // InternalCheckCfg.g:4171:1: ( rule__ConfiguredLanguageValidator__ParameterConfigurationsAssignment_3 )*
             loop49:
             do {
                 int alt49=2;
@@ -13701,9 +13701,9 @@ public final void rule__ConfiguredLanguageValidator__Group__3__Impl() throws Rec
 
                 switch (alt49) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4171:2: rule__ConfiguredLanguageValidator__ParameterConfigurationsAssignment_3
+            	    // InternalCheckCfg.g:4171:2: rule__ConfiguredLanguageValidator__ParameterConfigurationsAssignment_3
             	    {
-            	    pushFollow(FOLLOW_rule__ConfiguredLanguageValidator__ParameterConfigurationsAssignment_3_in_rule__ConfiguredLanguageValidator__Group__3__Impl9063);
+            	    pushFollow(FOLLOW_3);
             	    rule__ConfiguredLanguageValidator__ParameterConfigurationsAssignment_3();
 
             	    state._fsp--;
@@ -13742,21 +13742,21 @@ public final void rule__ConfiguredLanguageValidator__Group__3__Impl() throws Rec
 
 
     // $ANTLR start "rule__ConfiguredLanguageValidator__Group__4"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4181:1: rule__ConfiguredLanguageValidator__Group__4 : rule__ConfiguredLanguageValidator__Group__4__Impl rule__ConfiguredLanguageValidator__Group__5 ;
+    // InternalCheckCfg.g:4181:1: rule__ConfiguredLanguageValidator__Group__4 : rule__ConfiguredLanguageValidator__Group__4__Impl rule__ConfiguredLanguageValidator__Group__5 ;
     public final void rule__ConfiguredLanguageValidator__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4185:1: ( rule__ConfiguredLanguageValidator__Group__4__Impl rule__ConfiguredLanguageValidator__Group__5 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4186:2: rule__ConfiguredLanguageValidator__Group__4__Impl rule__ConfiguredLanguageValidator__Group__5
+            // InternalCheckCfg.g:4185:1: ( rule__ConfiguredLanguageValidator__Group__4__Impl rule__ConfiguredLanguageValidator__Group__5 )
+            // InternalCheckCfg.g:4186:2: rule__ConfiguredLanguageValidator__Group__4__Impl rule__ConfiguredLanguageValidator__Group__5
             {
-            pushFollow(FOLLOW_rule__ConfiguredLanguageValidator__Group__4__Impl_in_rule__ConfiguredLanguageValidator__Group__49094);
+            pushFollow(FOLLOW_11);
             rule__ConfiguredLanguageValidator__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ConfiguredLanguageValidator__Group__5_in_rule__ConfiguredLanguageValidator__Group__49097);
+            pushFollow(FOLLOW_2);
             rule__ConfiguredLanguageValidator__Group__5();
 
             state._fsp--;
@@ -13780,22 +13780,22 @@ public final void rule__ConfiguredLanguageValidator__Group__4() throws Recogniti
 
 
     // $ANTLR start "rule__ConfiguredLanguageValidator__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4193:1: rule__ConfiguredLanguageValidator__Group__4__Impl : ( ( rule__ConfiguredLanguageValidator__CatalogConfigurationsAssignment_4 )* ) ;
+    // InternalCheckCfg.g:4193:1: rule__ConfiguredLanguageValidator__Group__4__Impl : ( ( rule__ConfiguredLanguageValidator__CatalogConfigurationsAssignment_4 )* ) ;
     public final void rule__ConfiguredLanguageValidator__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4197:1: ( ( ( rule__ConfiguredLanguageValidator__CatalogConfigurationsAssignment_4 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4198:1: ( ( rule__ConfiguredLanguageValidator__CatalogConfigurationsAssignment_4 )* )
+            // InternalCheckCfg.g:4197:1: ( ( ( rule__ConfiguredLanguageValidator__CatalogConfigurationsAssignment_4 )* ) )
+            // InternalCheckCfg.g:4198:1: ( ( rule__ConfiguredLanguageValidator__CatalogConfigurationsAssignment_4 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4198:1: ( ( rule__ConfiguredLanguageValidator__CatalogConfigurationsAssignment_4 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4199:1: ( rule__ConfiguredLanguageValidator__CatalogConfigurationsAssignment_4 )*
+            // InternalCheckCfg.g:4198:1: ( ( rule__ConfiguredLanguageValidator__CatalogConfigurationsAssignment_4 )* )
+            // InternalCheckCfg.g:4199:1: ( rule__ConfiguredLanguageValidator__CatalogConfigurationsAssignment_4 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredLanguageValidatorAccess().getCatalogConfigurationsAssignment_4()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4200:1: ( rule__ConfiguredLanguageValidator__CatalogConfigurationsAssignment_4 )*
+            // InternalCheckCfg.g:4200:1: ( rule__ConfiguredLanguageValidator__CatalogConfigurationsAssignment_4 )*
             loop50:
             do {
                 int alt50=2;
@@ -13808,9 +13808,9 @@ public final void rule__ConfiguredLanguageValidator__Group__4__Impl() throws Rec
 
                 switch (alt50) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4200:2: rule__ConfiguredLanguageValidator__CatalogConfigurationsAssignment_4
+            	    // InternalCheckCfg.g:4200:2: rule__ConfiguredLanguageValidator__CatalogConfigurationsAssignment_4
             	    {
-            	    pushFollow(FOLLOW_rule__ConfiguredLanguageValidator__CatalogConfigurationsAssignment_4_in_rule__ConfiguredLanguageValidator__Group__4__Impl9124);
+            	    pushFollow(FOLLOW_9);
             	    rule__ConfiguredLanguageValidator__CatalogConfigurationsAssignment_4();
 
             	    state._fsp--;
@@ -13849,16 +13849,16 @@ public final void rule__ConfiguredLanguageValidator__Group__4__Impl() throws Rec
 
 
     // $ANTLR start "rule__ConfiguredLanguageValidator__Group__5"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4210:1: rule__ConfiguredLanguageValidator__Group__5 : rule__ConfiguredLanguageValidator__Group__5__Impl ;
+    // InternalCheckCfg.g:4210:1: rule__ConfiguredLanguageValidator__Group__5 : rule__ConfiguredLanguageValidator__Group__5__Impl ;
     public final void rule__ConfiguredLanguageValidator__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4214:1: ( rule__ConfiguredLanguageValidator__Group__5__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4215:2: rule__ConfiguredLanguageValidator__Group__5__Impl
+            // InternalCheckCfg.g:4214:1: ( rule__ConfiguredLanguageValidator__Group__5__Impl )
+            // InternalCheckCfg.g:4215:2: rule__ConfiguredLanguageValidator__Group__5__Impl
             {
-            pushFollow(FOLLOW_rule__ConfiguredLanguageValidator__Group__5__Impl_in_rule__ConfiguredLanguageValidator__Group__59155);
+            pushFollow(FOLLOW_2);
             rule__ConfiguredLanguageValidator__Group__5__Impl();
 
             state._fsp--;
@@ -13882,22 +13882,22 @@ public final void rule__ConfiguredLanguageValidator__Group__5() throws Recogniti
 
 
     // $ANTLR start "rule__ConfiguredLanguageValidator__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4221:1: rule__ConfiguredLanguageValidator__Group__5__Impl : ( '}' ) ;
+    // InternalCheckCfg.g:4221:1: rule__ConfiguredLanguageValidator__Group__5__Impl : ( '}' ) ;
     public final void rule__ConfiguredLanguageValidator__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4225:1: ( ( '}' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4226:1: ( '}' )
+            // InternalCheckCfg.g:4225:1: ( ( '}' ) )
+            // InternalCheckCfg.g:4226:1: ( '}' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4226:1: ( '}' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4227:1: '}'
+            // InternalCheckCfg.g:4226:1: ( '}' )
+            // InternalCheckCfg.g:4227:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredLanguageValidatorAccess().getRightCurlyBracketKeyword_5()); 
             }
-            match(input,59,FOLLOW_59_in_rule__ConfiguredLanguageValidator__Group__5__Impl9183); if (state.failed) return ;
+            match(input,59,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getConfiguredLanguageValidatorAccess().getRightCurlyBracketKeyword_5()); 
             }
@@ -13923,21 +13923,21 @@ public final void rule__ConfiguredLanguageValidator__Group__5__Impl() throws Rec
 
 
     // $ANTLR start "rule__ConfiguredCatalog__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4252:1: rule__ConfiguredCatalog__Group__0 : rule__ConfiguredCatalog__Group__0__Impl rule__ConfiguredCatalog__Group__1 ;
+    // InternalCheckCfg.g:4252:1: rule__ConfiguredCatalog__Group__0 : rule__ConfiguredCatalog__Group__0__Impl rule__ConfiguredCatalog__Group__1 ;
     public final void rule__ConfiguredCatalog__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4256:1: ( rule__ConfiguredCatalog__Group__0__Impl rule__ConfiguredCatalog__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4257:2: rule__ConfiguredCatalog__Group__0__Impl rule__ConfiguredCatalog__Group__1
+            // InternalCheckCfg.g:4256:1: ( rule__ConfiguredCatalog__Group__0__Impl rule__ConfiguredCatalog__Group__1 )
+            // InternalCheckCfg.g:4257:2: rule__ConfiguredCatalog__Group__0__Impl rule__ConfiguredCatalog__Group__1
             {
-            pushFollow(FOLLOW_rule__ConfiguredCatalog__Group__0__Impl_in_rule__ConfiguredCatalog__Group__09226);
+            pushFollow(FOLLOW_12);
             rule__ConfiguredCatalog__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ConfiguredCatalog__Group__1_in_rule__ConfiguredCatalog__Group__09229);
+            pushFollow(FOLLOW_2);
             rule__ConfiguredCatalog__Group__1();
 
             state._fsp--;
@@ -13961,23 +13961,23 @@ public final void rule__ConfiguredCatalog__Group__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ConfiguredCatalog__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4264:1: rule__ConfiguredCatalog__Group__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:4264:1: rule__ConfiguredCatalog__Group__0__Impl : ( () ) ;
     public final void rule__ConfiguredCatalog__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4268:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4269:1: ( () )
+            // InternalCheckCfg.g:4268:1: ( ( () ) )
+            // InternalCheckCfg.g:4269:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4269:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4270:1: ()
+            // InternalCheckCfg.g:4269:1: ( () )
+            // InternalCheckCfg.g:4270:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredCatalogAccess().getConfiguredCatalogAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4271:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4273:1: 
+            // InternalCheckCfg.g:4271:1: ()
+            // InternalCheckCfg.g:4273:1: 
             {
             }
 
@@ -14002,21 +14002,21 @@ public final void rule__ConfiguredCatalog__Group__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__ConfiguredCatalog__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4283:1: rule__ConfiguredCatalog__Group__1 : rule__ConfiguredCatalog__Group__1__Impl rule__ConfiguredCatalog__Group__2 ;
+    // InternalCheckCfg.g:4283:1: rule__ConfiguredCatalog__Group__1 : rule__ConfiguredCatalog__Group__1__Impl rule__ConfiguredCatalog__Group__2 ;
     public final void rule__ConfiguredCatalog__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4287:1: ( rule__ConfiguredCatalog__Group__1__Impl rule__ConfiguredCatalog__Group__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4288:2: rule__ConfiguredCatalog__Group__1__Impl rule__ConfiguredCatalog__Group__2
+            // InternalCheckCfg.g:4287:1: ( rule__ConfiguredCatalog__Group__1__Impl rule__ConfiguredCatalog__Group__2 )
+            // InternalCheckCfg.g:4288:2: rule__ConfiguredCatalog__Group__1__Impl rule__ConfiguredCatalog__Group__2
             {
-            pushFollow(FOLLOW_rule__ConfiguredCatalog__Group__1__Impl_in_rule__ConfiguredCatalog__Group__19287);
+            pushFollow(FOLLOW_5);
             rule__ConfiguredCatalog__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ConfiguredCatalog__Group__2_in_rule__ConfiguredCatalog__Group__19290);
+            pushFollow(FOLLOW_2);
             rule__ConfiguredCatalog__Group__2();
 
             state._fsp--;
@@ -14040,22 +14040,22 @@ public final void rule__ConfiguredCatalog__Group__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ConfiguredCatalog__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4295:1: rule__ConfiguredCatalog__Group__1__Impl : ( 'catalog' ) ;
+    // InternalCheckCfg.g:4295:1: rule__ConfiguredCatalog__Group__1__Impl : ( 'catalog' ) ;
     public final void rule__ConfiguredCatalog__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4299:1: ( ( 'catalog' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4300:1: ( 'catalog' )
+            // InternalCheckCfg.g:4299:1: ( ( 'catalog' ) )
+            // InternalCheckCfg.g:4300:1: ( 'catalog' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4300:1: ( 'catalog' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4301:1: 'catalog'
+            // InternalCheckCfg.g:4300:1: ( 'catalog' )
+            // InternalCheckCfg.g:4301:1: 'catalog'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredCatalogAccess().getCatalogKeyword_1()); 
             }
-            match(input,61,FOLLOW_61_in_rule__ConfiguredCatalog__Group__1__Impl9318); if (state.failed) return ;
+            match(input,61,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getConfiguredCatalogAccess().getCatalogKeyword_1()); 
             }
@@ -14081,21 +14081,21 @@ public final void rule__ConfiguredCatalog__Group__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__ConfiguredCatalog__Group__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4314:1: rule__ConfiguredCatalog__Group__2 : rule__ConfiguredCatalog__Group__2__Impl rule__ConfiguredCatalog__Group__3 ;
+    // InternalCheckCfg.g:4314:1: rule__ConfiguredCatalog__Group__2 : rule__ConfiguredCatalog__Group__2__Impl rule__ConfiguredCatalog__Group__3 ;
     public final void rule__ConfiguredCatalog__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4318:1: ( rule__ConfiguredCatalog__Group__2__Impl rule__ConfiguredCatalog__Group__3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4319:2: rule__ConfiguredCatalog__Group__2__Impl rule__ConfiguredCatalog__Group__3
+            // InternalCheckCfg.g:4318:1: ( rule__ConfiguredCatalog__Group__2__Impl rule__ConfiguredCatalog__Group__3 )
+            // InternalCheckCfg.g:4319:2: rule__ConfiguredCatalog__Group__2__Impl rule__ConfiguredCatalog__Group__3
             {
-            pushFollow(FOLLOW_rule__ConfiguredCatalog__Group__2__Impl_in_rule__ConfiguredCatalog__Group__29349);
+            pushFollow(FOLLOW_10);
             rule__ConfiguredCatalog__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ConfiguredCatalog__Group__3_in_rule__ConfiguredCatalog__Group__29352);
+            pushFollow(FOLLOW_2);
             rule__ConfiguredCatalog__Group__3();
 
             state._fsp--;
@@ -14119,25 +14119,25 @@ public final void rule__ConfiguredCatalog__Group__2() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ConfiguredCatalog__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4326:1: rule__ConfiguredCatalog__Group__2__Impl : ( ( rule__ConfiguredCatalog__CatalogAssignment_2 ) ) ;
+    // InternalCheckCfg.g:4326:1: rule__ConfiguredCatalog__Group__2__Impl : ( ( rule__ConfiguredCatalog__CatalogAssignment_2 ) ) ;
     public final void rule__ConfiguredCatalog__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4330:1: ( ( ( rule__ConfiguredCatalog__CatalogAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4331:1: ( ( rule__ConfiguredCatalog__CatalogAssignment_2 ) )
+            // InternalCheckCfg.g:4330:1: ( ( ( rule__ConfiguredCatalog__CatalogAssignment_2 ) ) )
+            // InternalCheckCfg.g:4331:1: ( ( rule__ConfiguredCatalog__CatalogAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4331:1: ( ( rule__ConfiguredCatalog__CatalogAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4332:1: ( rule__ConfiguredCatalog__CatalogAssignment_2 )
+            // InternalCheckCfg.g:4331:1: ( ( rule__ConfiguredCatalog__CatalogAssignment_2 ) )
+            // InternalCheckCfg.g:4332:1: ( rule__ConfiguredCatalog__CatalogAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredCatalogAccess().getCatalogAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4333:1: ( rule__ConfiguredCatalog__CatalogAssignment_2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4333:2: rule__ConfiguredCatalog__CatalogAssignment_2
+            // InternalCheckCfg.g:4333:1: ( rule__ConfiguredCatalog__CatalogAssignment_2 )
+            // InternalCheckCfg.g:4333:2: rule__ConfiguredCatalog__CatalogAssignment_2
             {
-            pushFollow(FOLLOW_rule__ConfiguredCatalog__CatalogAssignment_2_in_rule__ConfiguredCatalog__Group__2__Impl9379);
+            pushFollow(FOLLOW_2);
             rule__ConfiguredCatalog__CatalogAssignment_2();
 
             state._fsp--;
@@ -14170,21 +14170,21 @@ public final void rule__ConfiguredCatalog__Group__2__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__ConfiguredCatalog__Group__3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4343:1: rule__ConfiguredCatalog__Group__3 : rule__ConfiguredCatalog__Group__3__Impl rule__ConfiguredCatalog__Group__4 ;
+    // InternalCheckCfg.g:4343:1: rule__ConfiguredCatalog__Group__3 : rule__ConfiguredCatalog__Group__3__Impl rule__ConfiguredCatalog__Group__4 ;
     public final void rule__ConfiguredCatalog__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4347:1: ( rule__ConfiguredCatalog__Group__3__Impl rule__ConfiguredCatalog__Group__4 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4348:2: rule__ConfiguredCatalog__Group__3__Impl rule__ConfiguredCatalog__Group__4
+            // InternalCheckCfg.g:4347:1: ( rule__ConfiguredCatalog__Group__3__Impl rule__ConfiguredCatalog__Group__4 )
+            // InternalCheckCfg.g:4348:2: rule__ConfiguredCatalog__Group__3__Impl rule__ConfiguredCatalog__Group__4
             {
-            pushFollow(FOLLOW_rule__ConfiguredCatalog__Group__3__Impl_in_rule__ConfiguredCatalog__Group__39409);
+            pushFollow(FOLLOW_13);
             rule__ConfiguredCatalog__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ConfiguredCatalog__Group__4_in_rule__ConfiguredCatalog__Group__39412);
+            pushFollow(FOLLOW_2);
             rule__ConfiguredCatalog__Group__4();
 
             state._fsp--;
@@ -14208,22 +14208,22 @@ public final void rule__ConfiguredCatalog__Group__3() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ConfiguredCatalog__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4355:1: rule__ConfiguredCatalog__Group__3__Impl : ( '{' ) ;
+    // InternalCheckCfg.g:4355:1: rule__ConfiguredCatalog__Group__3__Impl : ( '{' ) ;
     public final void rule__ConfiguredCatalog__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4359:1: ( ( '{' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4360:1: ( '{' )
+            // InternalCheckCfg.g:4359:1: ( ( '{' ) )
+            // InternalCheckCfg.g:4360:1: ( '{' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4360:1: ( '{' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4361:1: '{'
+            // InternalCheckCfg.g:4360:1: ( '{' )
+            // InternalCheckCfg.g:4361:1: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredCatalogAccess().getLeftCurlyBracketKeyword_3()); 
             }
-            match(input,58,FOLLOW_58_in_rule__ConfiguredCatalog__Group__3__Impl9440); if (state.failed) return ;
+            match(input,58,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getConfiguredCatalogAccess().getLeftCurlyBracketKeyword_3()); 
             }
@@ -14249,21 +14249,21 @@ public final void rule__ConfiguredCatalog__Group__3__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__ConfiguredCatalog__Group__4"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4374:1: rule__ConfiguredCatalog__Group__4 : rule__ConfiguredCatalog__Group__4__Impl rule__ConfiguredCatalog__Group__5 ;
+    // InternalCheckCfg.g:4374:1: rule__ConfiguredCatalog__Group__4 : rule__ConfiguredCatalog__Group__4__Impl rule__ConfiguredCatalog__Group__5 ;
     public final void rule__ConfiguredCatalog__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4378:1: ( rule__ConfiguredCatalog__Group__4__Impl rule__ConfiguredCatalog__Group__5 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4379:2: rule__ConfiguredCatalog__Group__4__Impl rule__ConfiguredCatalog__Group__5
+            // InternalCheckCfg.g:4378:1: ( rule__ConfiguredCatalog__Group__4__Impl rule__ConfiguredCatalog__Group__5 )
+            // InternalCheckCfg.g:4379:2: rule__ConfiguredCatalog__Group__4__Impl rule__ConfiguredCatalog__Group__5
             {
-            pushFollow(FOLLOW_rule__ConfiguredCatalog__Group__4__Impl_in_rule__ConfiguredCatalog__Group__49471);
+            pushFollow(FOLLOW_13);
             rule__ConfiguredCatalog__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ConfiguredCatalog__Group__5_in_rule__ConfiguredCatalog__Group__49474);
+            pushFollow(FOLLOW_2);
             rule__ConfiguredCatalog__Group__5();
 
             state._fsp--;
@@ -14287,22 +14287,22 @@ public final void rule__ConfiguredCatalog__Group__4() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ConfiguredCatalog__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4386:1: rule__ConfiguredCatalog__Group__4__Impl : ( ( rule__ConfiguredCatalog__ParameterConfigurationsAssignment_4 )* ) ;
+    // InternalCheckCfg.g:4386:1: rule__ConfiguredCatalog__Group__4__Impl : ( ( rule__ConfiguredCatalog__ParameterConfigurationsAssignment_4 )* ) ;
     public final void rule__ConfiguredCatalog__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4390:1: ( ( ( rule__ConfiguredCatalog__ParameterConfigurationsAssignment_4 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4391:1: ( ( rule__ConfiguredCatalog__ParameterConfigurationsAssignment_4 )* )
+            // InternalCheckCfg.g:4390:1: ( ( ( rule__ConfiguredCatalog__ParameterConfigurationsAssignment_4 )* ) )
+            // InternalCheckCfg.g:4391:1: ( ( rule__ConfiguredCatalog__ParameterConfigurationsAssignment_4 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4391:1: ( ( rule__ConfiguredCatalog__ParameterConfigurationsAssignment_4 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4392:1: ( rule__ConfiguredCatalog__ParameterConfigurationsAssignment_4 )*
+            // InternalCheckCfg.g:4391:1: ( ( rule__ConfiguredCatalog__ParameterConfigurationsAssignment_4 )* )
+            // InternalCheckCfg.g:4392:1: ( rule__ConfiguredCatalog__ParameterConfigurationsAssignment_4 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredCatalogAccess().getParameterConfigurationsAssignment_4()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4393:1: ( rule__ConfiguredCatalog__ParameterConfigurationsAssignment_4 )*
+            // InternalCheckCfg.g:4393:1: ( rule__ConfiguredCatalog__ParameterConfigurationsAssignment_4 )*
             loop51:
             do {
                 int alt51=2;
@@ -14315,9 +14315,9 @@ public final void rule__ConfiguredCatalog__Group__4__Impl() throws RecognitionEx
 
                 switch (alt51) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4393:2: rule__ConfiguredCatalog__ParameterConfigurationsAssignment_4
+            	    // InternalCheckCfg.g:4393:2: rule__ConfiguredCatalog__ParameterConfigurationsAssignment_4
             	    {
-            	    pushFollow(FOLLOW_rule__ConfiguredCatalog__ParameterConfigurationsAssignment_4_in_rule__ConfiguredCatalog__Group__4__Impl9501);
+            	    pushFollow(FOLLOW_3);
             	    rule__ConfiguredCatalog__ParameterConfigurationsAssignment_4();
 
             	    state._fsp--;
@@ -14356,21 +14356,21 @@ public final void rule__ConfiguredCatalog__Group__4__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__ConfiguredCatalog__Group__5"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4403:1: rule__ConfiguredCatalog__Group__5 : rule__ConfiguredCatalog__Group__5__Impl rule__ConfiguredCatalog__Group__6 ;
+    // InternalCheckCfg.g:4403:1: rule__ConfiguredCatalog__Group__5 : rule__ConfiguredCatalog__Group__5__Impl rule__ConfiguredCatalog__Group__6 ;
     public final void rule__ConfiguredCatalog__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4407:1: ( rule__ConfiguredCatalog__Group__5__Impl rule__ConfiguredCatalog__Group__6 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4408:2: rule__ConfiguredCatalog__Group__5__Impl rule__ConfiguredCatalog__Group__6
+            // InternalCheckCfg.g:4407:1: ( rule__ConfiguredCatalog__Group__5__Impl rule__ConfiguredCatalog__Group__6 )
+            // InternalCheckCfg.g:4408:2: rule__ConfiguredCatalog__Group__5__Impl rule__ConfiguredCatalog__Group__6
             {
-            pushFollow(FOLLOW_rule__ConfiguredCatalog__Group__5__Impl_in_rule__ConfiguredCatalog__Group__59532);
+            pushFollow(FOLLOW_13);
             rule__ConfiguredCatalog__Group__5__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ConfiguredCatalog__Group__6_in_rule__ConfiguredCatalog__Group__59535);
+            pushFollow(FOLLOW_2);
             rule__ConfiguredCatalog__Group__6();
 
             state._fsp--;
@@ -14394,22 +14394,22 @@ public final void rule__ConfiguredCatalog__Group__5() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ConfiguredCatalog__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4415:1: rule__ConfiguredCatalog__Group__5__Impl : ( ( rule__ConfiguredCatalog__CheckConfigurationsAssignment_5 )* ) ;
+    // InternalCheckCfg.g:4415:1: rule__ConfiguredCatalog__Group__5__Impl : ( ( rule__ConfiguredCatalog__CheckConfigurationsAssignment_5 )* ) ;
     public final void rule__ConfiguredCatalog__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4419:1: ( ( ( rule__ConfiguredCatalog__CheckConfigurationsAssignment_5 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4420:1: ( ( rule__ConfiguredCatalog__CheckConfigurationsAssignment_5 )* )
+            // InternalCheckCfg.g:4419:1: ( ( ( rule__ConfiguredCatalog__CheckConfigurationsAssignment_5 )* ) )
+            // InternalCheckCfg.g:4420:1: ( ( rule__ConfiguredCatalog__CheckConfigurationsAssignment_5 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4420:1: ( ( rule__ConfiguredCatalog__CheckConfigurationsAssignment_5 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4421:1: ( rule__ConfiguredCatalog__CheckConfigurationsAssignment_5 )*
+            // InternalCheckCfg.g:4420:1: ( ( rule__ConfiguredCatalog__CheckConfigurationsAssignment_5 )* )
+            // InternalCheckCfg.g:4421:1: ( rule__ConfiguredCatalog__CheckConfigurationsAssignment_5 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredCatalogAccess().getCheckConfigurationsAssignment_5()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4422:1: ( rule__ConfiguredCatalog__CheckConfigurationsAssignment_5 )*
+            // InternalCheckCfg.g:4422:1: ( rule__ConfiguredCatalog__CheckConfigurationsAssignment_5 )*
             loop52:
             do {
                 int alt52=2;
@@ -14422,9 +14422,9 @@ public final void rule__ConfiguredCatalog__Group__5__Impl() throws RecognitionEx
 
                 switch (alt52) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4422:2: rule__ConfiguredCatalog__CheckConfigurationsAssignment_5
+            	    // InternalCheckCfg.g:4422:2: rule__ConfiguredCatalog__CheckConfigurationsAssignment_5
             	    {
-            	    pushFollow(FOLLOW_rule__ConfiguredCatalog__CheckConfigurationsAssignment_5_in_rule__ConfiguredCatalog__Group__5__Impl9562);
+            	    pushFollow(FOLLOW_14);
             	    rule__ConfiguredCatalog__CheckConfigurationsAssignment_5();
 
             	    state._fsp--;
@@ -14463,16 +14463,16 @@ public final void rule__ConfiguredCatalog__Group__5__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__ConfiguredCatalog__Group__6"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4432:1: rule__ConfiguredCatalog__Group__6 : rule__ConfiguredCatalog__Group__6__Impl ;
+    // InternalCheckCfg.g:4432:1: rule__ConfiguredCatalog__Group__6 : rule__ConfiguredCatalog__Group__6__Impl ;
     public final void rule__ConfiguredCatalog__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4436:1: ( rule__ConfiguredCatalog__Group__6__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4437:2: rule__ConfiguredCatalog__Group__6__Impl
+            // InternalCheckCfg.g:4436:1: ( rule__ConfiguredCatalog__Group__6__Impl )
+            // InternalCheckCfg.g:4437:2: rule__ConfiguredCatalog__Group__6__Impl
             {
-            pushFollow(FOLLOW_rule__ConfiguredCatalog__Group__6__Impl_in_rule__ConfiguredCatalog__Group__69593);
+            pushFollow(FOLLOW_2);
             rule__ConfiguredCatalog__Group__6__Impl();
 
             state._fsp--;
@@ -14496,22 +14496,22 @@ public final void rule__ConfiguredCatalog__Group__6() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ConfiguredCatalog__Group__6__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4443:1: rule__ConfiguredCatalog__Group__6__Impl : ( '}' ) ;
+    // InternalCheckCfg.g:4443:1: rule__ConfiguredCatalog__Group__6__Impl : ( '}' ) ;
     public final void rule__ConfiguredCatalog__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4447:1: ( ( '}' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4448:1: ( '}' )
+            // InternalCheckCfg.g:4447:1: ( ( '}' ) )
+            // InternalCheckCfg.g:4448:1: ( '}' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4448:1: ( '}' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4449:1: '}'
+            // InternalCheckCfg.g:4448:1: ( '}' )
+            // InternalCheckCfg.g:4449:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredCatalogAccess().getRightCurlyBracketKeyword_6()); 
             }
-            match(input,59,FOLLOW_59_in_rule__ConfiguredCatalog__Group__6__Impl9621); if (state.failed) return ;
+            match(input,59,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getConfiguredCatalogAccess().getRightCurlyBracketKeyword_6()); 
             }
@@ -14537,21 +14537,21 @@ public final void rule__ConfiguredCatalog__Group__6__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__ConfiguredCheck__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4476:1: rule__ConfiguredCheck__Group__0 : rule__ConfiguredCheck__Group__0__Impl rule__ConfiguredCheck__Group__1 ;
+    // InternalCheckCfg.g:4476:1: rule__ConfiguredCheck__Group__0 : rule__ConfiguredCheck__Group__0__Impl rule__ConfiguredCheck__Group__1 ;
     public final void rule__ConfiguredCheck__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4480:1: ( rule__ConfiguredCheck__Group__0__Impl rule__ConfiguredCheck__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4481:2: rule__ConfiguredCheck__Group__0__Impl rule__ConfiguredCheck__Group__1
+            // InternalCheckCfg.g:4480:1: ( rule__ConfiguredCheck__Group__0__Impl rule__ConfiguredCheck__Group__1 )
+            // InternalCheckCfg.g:4481:2: rule__ConfiguredCheck__Group__0__Impl rule__ConfiguredCheck__Group__1
             {
-            pushFollow(FOLLOW_rule__ConfiguredCheck__Group__0__Impl_in_rule__ConfiguredCheck__Group__09666);
+            pushFollow(FOLLOW_15);
             rule__ConfiguredCheck__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ConfiguredCheck__Group__1_in_rule__ConfiguredCheck__Group__09669);
+            pushFollow(FOLLOW_2);
             rule__ConfiguredCheck__Group__1();
 
             state._fsp--;
@@ -14575,23 +14575,23 @@ public final void rule__ConfiguredCheck__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__ConfiguredCheck__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4488:1: rule__ConfiguredCheck__Group__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:4488:1: rule__ConfiguredCheck__Group__0__Impl : ( () ) ;
     public final void rule__ConfiguredCheck__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4492:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4493:1: ( () )
+            // InternalCheckCfg.g:4492:1: ( ( () ) )
+            // InternalCheckCfg.g:4493:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4493:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4494:1: ()
+            // InternalCheckCfg.g:4493:1: ( () )
+            // InternalCheckCfg.g:4494:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredCheckAccess().getConfiguredCheckAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4495:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4497:1: 
+            // InternalCheckCfg.g:4495:1: ()
+            // InternalCheckCfg.g:4497:1: 
             {
             }
 
@@ -14616,21 +14616,21 @@ public final void rule__ConfiguredCheck__Group__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__ConfiguredCheck__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4507:1: rule__ConfiguredCheck__Group__1 : rule__ConfiguredCheck__Group__1__Impl rule__ConfiguredCheck__Group__2 ;
+    // InternalCheckCfg.g:4507:1: rule__ConfiguredCheck__Group__1 : rule__ConfiguredCheck__Group__1__Impl rule__ConfiguredCheck__Group__2 ;
     public final void rule__ConfiguredCheck__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4511:1: ( rule__ConfiguredCheck__Group__1__Impl rule__ConfiguredCheck__Group__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4512:2: rule__ConfiguredCheck__Group__1__Impl rule__ConfiguredCheck__Group__2
+            // InternalCheckCfg.g:4511:1: ( rule__ConfiguredCheck__Group__1__Impl rule__ConfiguredCheck__Group__2 )
+            // InternalCheckCfg.g:4512:2: rule__ConfiguredCheck__Group__1__Impl rule__ConfiguredCheck__Group__2
             {
-            pushFollow(FOLLOW_rule__ConfiguredCheck__Group__1__Impl_in_rule__ConfiguredCheck__Group__19727);
+            pushFollow(FOLLOW_5);
             rule__ConfiguredCheck__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ConfiguredCheck__Group__2_in_rule__ConfiguredCheck__Group__19730);
+            pushFollow(FOLLOW_2);
             rule__ConfiguredCheck__Group__2();
 
             state._fsp--;
@@ -14654,25 +14654,25 @@ public final void rule__ConfiguredCheck__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__ConfiguredCheck__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4519:1: rule__ConfiguredCheck__Group__1__Impl : ( ( rule__ConfiguredCheck__SeverityAssignment_1 ) ) ;
+    // InternalCheckCfg.g:4519:1: rule__ConfiguredCheck__Group__1__Impl : ( ( rule__ConfiguredCheck__SeverityAssignment_1 ) ) ;
     public final void rule__ConfiguredCheck__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4523:1: ( ( ( rule__ConfiguredCheck__SeverityAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4524:1: ( ( rule__ConfiguredCheck__SeverityAssignment_1 ) )
+            // InternalCheckCfg.g:4523:1: ( ( ( rule__ConfiguredCheck__SeverityAssignment_1 ) ) )
+            // InternalCheckCfg.g:4524:1: ( ( rule__ConfiguredCheck__SeverityAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4524:1: ( ( rule__ConfiguredCheck__SeverityAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4525:1: ( rule__ConfiguredCheck__SeverityAssignment_1 )
+            // InternalCheckCfg.g:4524:1: ( ( rule__ConfiguredCheck__SeverityAssignment_1 ) )
+            // InternalCheckCfg.g:4525:1: ( rule__ConfiguredCheck__SeverityAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredCheckAccess().getSeverityAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4526:1: ( rule__ConfiguredCheck__SeverityAssignment_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4526:2: rule__ConfiguredCheck__SeverityAssignment_1
+            // InternalCheckCfg.g:4526:1: ( rule__ConfiguredCheck__SeverityAssignment_1 )
+            // InternalCheckCfg.g:4526:2: rule__ConfiguredCheck__SeverityAssignment_1
             {
-            pushFollow(FOLLOW_rule__ConfiguredCheck__SeverityAssignment_1_in_rule__ConfiguredCheck__Group__1__Impl9757);
+            pushFollow(FOLLOW_2);
             rule__ConfiguredCheck__SeverityAssignment_1();
 
             state._fsp--;
@@ -14705,21 +14705,21 @@ public final void rule__ConfiguredCheck__Group__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__ConfiguredCheck__Group__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4536:1: rule__ConfiguredCheck__Group__2 : rule__ConfiguredCheck__Group__2__Impl rule__ConfiguredCheck__Group__3 ;
+    // InternalCheckCfg.g:4536:1: rule__ConfiguredCheck__Group__2 : rule__ConfiguredCheck__Group__2__Impl rule__ConfiguredCheck__Group__3 ;
     public final void rule__ConfiguredCheck__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4540:1: ( rule__ConfiguredCheck__Group__2__Impl rule__ConfiguredCheck__Group__3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4541:2: rule__ConfiguredCheck__Group__2__Impl rule__ConfiguredCheck__Group__3
+            // InternalCheckCfg.g:4540:1: ( rule__ConfiguredCheck__Group__2__Impl rule__ConfiguredCheck__Group__3 )
+            // InternalCheckCfg.g:4541:2: rule__ConfiguredCheck__Group__2__Impl rule__ConfiguredCheck__Group__3
             {
-            pushFollow(FOLLOW_rule__ConfiguredCheck__Group__2__Impl_in_rule__ConfiguredCheck__Group__29787);
+            pushFollow(FOLLOW_16);
             rule__ConfiguredCheck__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ConfiguredCheck__Group__3_in_rule__ConfiguredCheck__Group__29790);
+            pushFollow(FOLLOW_2);
             rule__ConfiguredCheck__Group__3();
 
             state._fsp--;
@@ -14743,25 +14743,25 @@ public final void rule__ConfiguredCheck__Group__2() throws RecognitionException
 
 
     // $ANTLR start "rule__ConfiguredCheck__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4548:1: rule__ConfiguredCheck__Group__2__Impl : ( ( rule__ConfiguredCheck__CheckAssignment_2 ) ) ;
+    // InternalCheckCfg.g:4548:1: rule__ConfiguredCheck__Group__2__Impl : ( ( rule__ConfiguredCheck__CheckAssignment_2 ) ) ;
     public final void rule__ConfiguredCheck__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4552:1: ( ( ( rule__ConfiguredCheck__CheckAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4553:1: ( ( rule__ConfiguredCheck__CheckAssignment_2 ) )
+            // InternalCheckCfg.g:4552:1: ( ( ( rule__ConfiguredCheck__CheckAssignment_2 ) ) )
+            // InternalCheckCfg.g:4553:1: ( ( rule__ConfiguredCheck__CheckAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4553:1: ( ( rule__ConfiguredCheck__CheckAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4554:1: ( rule__ConfiguredCheck__CheckAssignment_2 )
+            // InternalCheckCfg.g:4553:1: ( ( rule__ConfiguredCheck__CheckAssignment_2 ) )
+            // InternalCheckCfg.g:4554:1: ( rule__ConfiguredCheck__CheckAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredCheckAccess().getCheckAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4555:1: ( rule__ConfiguredCheck__CheckAssignment_2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4555:2: rule__ConfiguredCheck__CheckAssignment_2
+            // InternalCheckCfg.g:4555:1: ( rule__ConfiguredCheck__CheckAssignment_2 )
+            // InternalCheckCfg.g:4555:2: rule__ConfiguredCheck__CheckAssignment_2
             {
-            pushFollow(FOLLOW_rule__ConfiguredCheck__CheckAssignment_2_in_rule__ConfiguredCheck__Group__2__Impl9817);
+            pushFollow(FOLLOW_2);
             rule__ConfiguredCheck__CheckAssignment_2();
 
             state._fsp--;
@@ -14794,16 +14794,16 @@ public final void rule__ConfiguredCheck__Group__2__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__ConfiguredCheck__Group__3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4565:1: rule__ConfiguredCheck__Group__3 : rule__ConfiguredCheck__Group__3__Impl ;
+    // InternalCheckCfg.g:4565:1: rule__ConfiguredCheck__Group__3 : rule__ConfiguredCheck__Group__3__Impl ;
     public final void rule__ConfiguredCheck__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4569:1: ( rule__ConfiguredCheck__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4570:2: rule__ConfiguredCheck__Group__3__Impl
+            // InternalCheckCfg.g:4569:1: ( rule__ConfiguredCheck__Group__3__Impl )
+            // InternalCheckCfg.g:4570:2: rule__ConfiguredCheck__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__ConfiguredCheck__Group__3__Impl_in_rule__ConfiguredCheck__Group__39847);
+            pushFollow(FOLLOW_2);
             rule__ConfiguredCheck__Group__3__Impl();
 
             state._fsp--;
@@ -14827,22 +14827,22 @@ public final void rule__ConfiguredCheck__Group__3() throws RecognitionException
 
 
     // $ANTLR start "rule__ConfiguredCheck__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4576:1: rule__ConfiguredCheck__Group__3__Impl : ( ( rule__ConfiguredCheck__Group_3__0 )? ) ;
+    // InternalCheckCfg.g:4576:1: rule__ConfiguredCheck__Group__3__Impl : ( ( rule__ConfiguredCheck__Group_3__0 )? ) ;
     public final void rule__ConfiguredCheck__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4580:1: ( ( ( rule__ConfiguredCheck__Group_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4581:1: ( ( rule__ConfiguredCheck__Group_3__0 )? )
+            // InternalCheckCfg.g:4580:1: ( ( ( rule__ConfiguredCheck__Group_3__0 )? ) )
+            // InternalCheckCfg.g:4581:1: ( ( rule__ConfiguredCheck__Group_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4581:1: ( ( rule__ConfiguredCheck__Group_3__0 )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4582:1: ( rule__ConfiguredCheck__Group_3__0 )?
+            // InternalCheckCfg.g:4581:1: ( ( rule__ConfiguredCheck__Group_3__0 )? )
+            // InternalCheckCfg.g:4582:1: ( rule__ConfiguredCheck__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredCheckAccess().getGroup_3()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4583:1: ( rule__ConfiguredCheck__Group_3__0 )?
+            // InternalCheckCfg.g:4583:1: ( rule__ConfiguredCheck__Group_3__0 )?
             int alt53=2;
             int LA53_0 = input.LA(1);
 
@@ -14851,9 +14851,9 @@ public final void rule__ConfiguredCheck__Group__3__Impl() throws RecognitionExce
             }
             switch (alt53) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4583:2: rule__ConfiguredCheck__Group_3__0
+                    // InternalCheckCfg.g:4583:2: rule__ConfiguredCheck__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__ConfiguredCheck__Group_3__0_in_rule__ConfiguredCheck__Group__3__Impl9874);
+                    pushFollow(FOLLOW_2);
                     rule__ConfiguredCheck__Group_3__0();
 
                     state._fsp--;
@@ -14889,21 +14889,21 @@ public final void rule__ConfiguredCheck__Group__3__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__ConfiguredCheck__Group_3__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4601:1: rule__ConfiguredCheck__Group_3__0 : rule__ConfiguredCheck__Group_3__0__Impl rule__ConfiguredCheck__Group_3__1 ;
+    // InternalCheckCfg.g:4601:1: rule__ConfiguredCheck__Group_3__0 : rule__ConfiguredCheck__Group_3__0__Impl rule__ConfiguredCheck__Group_3__1 ;
     public final void rule__ConfiguredCheck__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4605:1: ( rule__ConfiguredCheck__Group_3__0__Impl rule__ConfiguredCheck__Group_3__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4606:2: rule__ConfiguredCheck__Group_3__0__Impl rule__ConfiguredCheck__Group_3__1
+            // InternalCheckCfg.g:4605:1: ( rule__ConfiguredCheck__Group_3__0__Impl rule__ConfiguredCheck__Group_3__1 )
+            // InternalCheckCfg.g:4606:2: rule__ConfiguredCheck__Group_3__0__Impl rule__ConfiguredCheck__Group_3__1
             {
-            pushFollow(FOLLOW_rule__ConfiguredCheck__Group_3__0__Impl_in_rule__ConfiguredCheck__Group_3__09913);
+            pushFollow(FOLLOW_5);
             rule__ConfiguredCheck__Group_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ConfiguredCheck__Group_3__1_in_rule__ConfiguredCheck__Group_3__09916);
+            pushFollow(FOLLOW_2);
             rule__ConfiguredCheck__Group_3__1();
 
             state._fsp--;
@@ -14927,22 +14927,22 @@ public final void rule__ConfiguredCheck__Group_3__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ConfiguredCheck__Group_3__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4613:1: rule__ConfiguredCheck__Group_3__0__Impl : ( '(' ) ;
+    // InternalCheckCfg.g:4613:1: rule__ConfiguredCheck__Group_3__0__Impl : ( '(' ) ;
     public final void rule__ConfiguredCheck__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4617:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4618:1: ( '(' )
+            // InternalCheckCfg.g:4617:1: ( ( '(' ) )
+            // InternalCheckCfg.g:4618:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4618:1: ( '(' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4619:1: '('
+            // InternalCheckCfg.g:4618:1: ( '(' )
+            // InternalCheckCfg.g:4619:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredCheckAccess().getLeftParenthesisKeyword_3_0()); 
             }
-            match(input,62,FOLLOW_62_in_rule__ConfiguredCheck__Group_3__0__Impl9944); if (state.failed) return ;
+            match(input,62,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getConfiguredCheckAccess().getLeftParenthesisKeyword_3_0()); 
             }
@@ -14968,21 +14968,21 @@ public final void rule__ConfiguredCheck__Group_3__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__ConfiguredCheck__Group_3__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4632:1: rule__ConfiguredCheck__Group_3__1 : rule__ConfiguredCheck__Group_3__1__Impl rule__ConfiguredCheck__Group_3__2 ;
+    // InternalCheckCfg.g:4632:1: rule__ConfiguredCheck__Group_3__1 : rule__ConfiguredCheck__Group_3__1__Impl rule__ConfiguredCheck__Group_3__2 ;
     public final void rule__ConfiguredCheck__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4636:1: ( rule__ConfiguredCheck__Group_3__1__Impl rule__ConfiguredCheck__Group_3__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4637:2: rule__ConfiguredCheck__Group_3__1__Impl rule__ConfiguredCheck__Group_3__2
+            // InternalCheckCfg.g:4636:1: ( rule__ConfiguredCheck__Group_3__1__Impl rule__ConfiguredCheck__Group_3__2 )
+            // InternalCheckCfg.g:4637:2: rule__ConfiguredCheck__Group_3__1__Impl rule__ConfiguredCheck__Group_3__2
             {
-            pushFollow(FOLLOW_rule__ConfiguredCheck__Group_3__1__Impl_in_rule__ConfiguredCheck__Group_3__19975);
+            pushFollow(FOLLOW_17);
             rule__ConfiguredCheck__Group_3__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ConfiguredCheck__Group_3__2_in_rule__ConfiguredCheck__Group_3__19978);
+            pushFollow(FOLLOW_2);
             rule__ConfiguredCheck__Group_3__2();
 
             state._fsp--;
@@ -15006,25 +15006,25 @@ public final void rule__ConfiguredCheck__Group_3__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ConfiguredCheck__Group_3__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4644:1: rule__ConfiguredCheck__Group_3__1__Impl : ( ( rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_1 ) ) ;
+    // InternalCheckCfg.g:4644:1: rule__ConfiguredCheck__Group_3__1__Impl : ( ( rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_1 ) ) ;
     public final void rule__ConfiguredCheck__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4648:1: ( ( ( rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4649:1: ( ( rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_1 ) )
+            // InternalCheckCfg.g:4648:1: ( ( ( rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_1 ) ) )
+            // InternalCheckCfg.g:4649:1: ( ( rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4649:1: ( ( rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4650:1: ( rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_1 )
+            // InternalCheckCfg.g:4649:1: ( ( rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_1 ) )
+            // InternalCheckCfg.g:4650:1: ( rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredCheckAccess().getParameterConfigurationsAssignment_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4651:1: ( rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4651:2: rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_1
+            // InternalCheckCfg.g:4651:1: ( rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_1 )
+            // InternalCheckCfg.g:4651:2: rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_1
             {
-            pushFollow(FOLLOW_rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_1_in_rule__ConfiguredCheck__Group_3__1__Impl10005);
+            pushFollow(FOLLOW_2);
             rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_1();
 
             state._fsp--;
@@ -15057,21 +15057,21 @@ public final void rule__ConfiguredCheck__Group_3__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__ConfiguredCheck__Group_3__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4661:1: rule__ConfiguredCheck__Group_3__2 : rule__ConfiguredCheck__Group_3__2__Impl rule__ConfiguredCheck__Group_3__3 ;
+    // InternalCheckCfg.g:4661:1: rule__ConfiguredCheck__Group_3__2 : rule__ConfiguredCheck__Group_3__2__Impl rule__ConfiguredCheck__Group_3__3 ;
     public final void rule__ConfiguredCheck__Group_3__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4665:1: ( rule__ConfiguredCheck__Group_3__2__Impl rule__ConfiguredCheck__Group_3__3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4666:2: rule__ConfiguredCheck__Group_3__2__Impl rule__ConfiguredCheck__Group_3__3
+            // InternalCheckCfg.g:4665:1: ( rule__ConfiguredCheck__Group_3__2__Impl rule__ConfiguredCheck__Group_3__3 )
+            // InternalCheckCfg.g:4666:2: rule__ConfiguredCheck__Group_3__2__Impl rule__ConfiguredCheck__Group_3__3
             {
-            pushFollow(FOLLOW_rule__ConfiguredCheck__Group_3__2__Impl_in_rule__ConfiguredCheck__Group_3__210035);
+            pushFollow(FOLLOW_17);
             rule__ConfiguredCheck__Group_3__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ConfiguredCheck__Group_3__3_in_rule__ConfiguredCheck__Group_3__210038);
+            pushFollow(FOLLOW_2);
             rule__ConfiguredCheck__Group_3__3();
 
             state._fsp--;
@@ -15095,22 +15095,22 @@ public final void rule__ConfiguredCheck__Group_3__2() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ConfiguredCheck__Group_3__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4673:1: rule__ConfiguredCheck__Group_3__2__Impl : ( ( rule__ConfiguredCheck__Group_3_2__0 )* ) ;
+    // InternalCheckCfg.g:4673:1: rule__ConfiguredCheck__Group_3__2__Impl : ( ( rule__ConfiguredCheck__Group_3_2__0 )* ) ;
     public final void rule__ConfiguredCheck__Group_3__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4677:1: ( ( ( rule__ConfiguredCheck__Group_3_2__0 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4678:1: ( ( rule__ConfiguredCheck__Group_3_2__0 )* )
+            // InternalCheckCfg.g:4677:1: ( ( ( rule__ConfiguredCheck__Group_3_2__0 )* ) )
+            // InternalCheckCfg.g:4678:1: ( ( rule__ConfiguredCheck__Group_3_2__0 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4678:1: ( ( rule__ConfiguredCheck__Group_3_2__0 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4679:1: ( rule__ConfiguredCheck__Group_3_2__0 )*
+            // InternalCheckCfg.g:4678:1: ( ( rule__ConfiguredCheck__Group_3_2__0 )* )
+            // InternalCheckCfg.g:4679:1: ( rule__ConfiguredCheck__Group_3_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredCheckAccess().getGroup_3_2()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4680:1: ( rule__ConfiguredCheck__Group_3_2__0 )*
+            // InternalCheckCfg.g:4680:1: ( rule__ConfiguredCheck__Group_3_2__0 )*
             loop54:
             do {
                 int alt54=2;
@@ -15123,9 +15123,9 @@ public final void rule__ConfiguredCheck__Group_3__2__Impl() throws RecognitionEx
 
                 switch (alt54) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4680:2: rule__ConfiguredCheck__Group_3_2__0
+            	    // InternalCheckCfg.g:4680:2: rule__ConfiguredCheck__Group_3_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__ConfiguredCheck__Group_3_2__0_in_rule__ConfiguredCheck__Group_3__2__Impl10065);
+            	    pushFollow(FOLLOW_18);
             	    rule__ConfiguredCheck__Group_3_2__0();
 
             	    state._fsp--;
@@ -15164,16 +15164,16 @@ public final void rule__ConfiguredCheck__Group_3__2__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__ConfiguredCheck__Group_3__3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4690:1: rule__ConfiguredCheck__Group_3__3 : rule__ConfiguredCheck__Group_3__3__Impl ;
+    // InternalCheckCfg.g:4690:1: rule__ConfiguredCheck__Group_3__3 : rule__ConfiguredCheck__Group_3__3__Impl ;
     public final void rule__ConfiguredCheck__Group_3__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4694:1: ( rule__ConfiguredCheck__Group_3__3__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4695:2: rule__ConfiguredCheck__Group_3__3__Impl
+            // InternalCheckCfg.g:4694:1: ( rule__ConfiguredCheck__Group_3__3__Impl )
+            // InternalCheckCfg.g:4695:2: rule__ConfiguredCheck__Group_3__3__Impl
             {
-            pushFollow(FOLLOW_rule__ConfiguredCheck__Group_3__3__Impl_in_rule__ConfiguredCheck__Group_3__310096);
+            pushFollow(FOLLOW_2);
             rule__ConfiguredCheck__Group_3__3__Impl();
 
             state._fsp--;
@@ -15197,22 +15197,22 @@ public final void rule__ConfiguredCheck__Group_3__3() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ConfiguredCheck__Group_3__3__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4701:1: rule__ConfiguredCheck__Group_3__3__Impl : ( ')' ) ;
+    // InternalCheckCfg.g:4701:1: rule__ConfiguredCheck__Group_3__3__Impl : ( ')' ) ;
     public final void rule__ConfiguredCheck__Group_3__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4705:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4706:1: ( ')' )
+            // InternalCheckCfg.g:4705:1: ( ( ')' ) )
+            // InternalCheckCfg.g:4706:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4706:1: ( ')' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4707:1: ')'
+            // InternalCheckCfg.g:4706:1: ( ')' )
+            // InternalCheckCfg.g:4707:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredCheckAccess().getRightParenthesisKeyword_3_3()); 
             }
-            match(input,63,FOLLOW_63_in_rule__ConfiguredCheck__Group_3__3__Impl10124); if (state.failed) return ;
+            match(input,63,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getConfiguredCheckAccess().getRightParenthesisKeyword_3_3()); 
             }
@@ -15238,21 +15238,21 @@ public final void rule__ConfiguredCheck__Group_3__3__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__ConfiguredCheck__Group_3_2__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4728:1: rule__ConfiguredCheck__Group_3_2__0 : rule__ConfiguredCheck__Group_3_2__0__Impl rule__ConfiguredCheck__Group_3_2__1 ;
+    // InternalCheckCfg.g:4728:1: rule__ConfiguredCheck__Group_3_2__0 : rule__ConfiguredCheck__Group_3_2__0__Impl rule__ConfiguredCheck__Group_3_2__1 ;
     public final void rule__ConfiguredCheck__Group_3_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4732:1: ( rule__ConfiguredCheck__Group_3_2__0__Impl rule__ConfiguredCheck__Group_3_2__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4733:2: rule__ConfiguredCheck__Group_3_2__0__Impl rule__ConfiguredCheck__Group_3_2__1
+            // InternalCheckCfg.g:4732:1: ( rule__ConfiguredCheck__Group_3_2__0__Impl rule__ConfiguredCheck__Group_3_2__1 )
+            // InternalCheckCfg.g:4733:2: rule__ConfiguredCheck__Group_3_2__0__Impl rule__ConfiguredCheck__Group_3_2__1
             {
-            pushFollow(FOLLOW_rule__ConfiguredCheck__Group_3_2__0__Impl_in_rule__ConfiguredCheck__Group_3_2__010163);
+            pushFollow(FOLLOW_5);
             rule__ConfiguredCheck__Group_3_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ConfiguredCheck__Group_3_2__1_in_rule__ConfiguredCheck__Group_3_2__010166);
+            pushFollow(FOLLOW_2);
             rule__ConfiguredCheck__Group_3_2__1();
 
             state._fsp--;
@@ -15276,22 +15276,22 @@ public final void rule__ConfiguredCheck__Group_3_2__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ConfiguredCheck__Group_3_2__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4740:1: rule__ConfiguredCheck__Group_3_2__0__Impl : ( ',' ) ;
+    // InternalCheckCfg.g:4740:1: rule__ConfiguredCheck__Group_3_2__0__Impl : ( ',' ) ;
     public final void rule__ConfiguredCheck__Group_3_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4744:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4745:1: ( ',' )
+            // InternalCheckCfg.g:4744:1: ( ( ',' ) )
+            // InternalCheckCfg.g:4745:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4745:1: ( ',' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4746:1: ','
+            // InternalCheckCfg.g:4745:1: ( ',' )
+            // InternalCheckCfg.g:4746:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredCheckAccess().getCommaKeyword_3_2_0()); 
             }
-            match(input,64,FOLLOW_64_in_rule__ConfiguredCheck__Group_3_2__0__Impl10194); if (state.failed) return ;
+            match(input,64,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getConfiguredCheckAccess().getCommaKeyword_3_2_0()); 
             }
@@ -15317,16 +15317,16 @@ public final void rule__ConfiguredCheck__Group_3_2__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__ConfiguredCheck__Group_3_2__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4759:1: rule__ConfiguredCheck__Group_3_2__1 : rule__ConfiguredCheck__Group_3_2__1__Impl ;
+    // InternalCheckCfg.g:4759:1: rule__ConfiguredCheck__Group_3_2__1 : rule__ConfiguredCheck__Group_3_2__1__Impl ;
     public final void rule__ConfiguredCheck__Group_3_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4763:1: ( rule__ConfiguredCheck__Group_3_2__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4764:2: rule__ConfiguredCheck__Group_3_2__1__Impl
+            // InternalCheckCfg.g:4763:1: ( rule__ConfiguredCheck__Group_3_2__1__Impl )
+            // InternalCheckCfg.g:4764:2: rule__ConfiguredCheck__Group_3_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__ConfiguredCheck__Group_3_2__1__Impl_in_rule__ConfiguredCheck__Group_3_2__110225);
+            pushFollow(FOLLOW_2);
             rule__ConfiguredCheck__Group_3_2__1__Impl();
 
             state._fsp--;
@@ -15350,25 +15350,25 @@ public final void rule__ConfiguredCheck__Group_3_2__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ConfiguredCheck__Group_3_2__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4770:1: rule__ConfiguredCheck__Group_3_2__1__Impl : ( ( rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_2_1 ) ) ;
+    // InternalCheckCfg.g:4770:1: rule__ConfiguredCheck__Group_3_2__1__Impl : ( ( rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_2_1 ) ) ;
     public final void rule__ConfiguredCheck__Group_3_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4774:1: ( ( ( rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4775:1: ( ( rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_2_1 ) )
+            // InternalCheckCfg.g:4774:1: ( ( ( rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_2_1 ) ) )
+            // InternalCheckCfg.g:4775:1: ( ( rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4775:1: ( ( rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_2_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4776:1: ( rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_2_1 )
+            // InternalCheckCfg.g:4775:1: ( ( rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_2_1 ) )
+            // InternalCheckCfg.g:4776:1: ( rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredCheckAccess().getParameterConfigurationsAssignment_3_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4777:1: ( rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_2_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4777:2: rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_2_1
+            // InternalCheckCfg.g:4777:1: ( rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_2_1 )
+            // InternalCheckCfg.g:4777:2: rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_2_1
             {
-            pushFollow(FOLLOW_rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_2_1_in_rule__ConfiguredCheck__Group_3_2__1__Impl10252);
+            pushFollow(FOLLOW_2);
             rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_2_1();
 
             state._fsp--;
@@ -15401,21 +15401,21 @@ public final void rule__ConfiguredCheck__Group_3_2__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__ConfiguredParameter__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4791:1: rule__ConfiguredParameter__Group__0 : rule__ConfiguredParameter__Group__0__Impl rule__ConfiguredParameter__Group__1 ;
+    // InternalCheckCfg.g:4791:1: rule__ConfiguredParameter__Group__0 : rule__ConfiguredParameter__Group__0__Impl rule__ConfiguredParameter__Group__1 ;
     public final void rule__ConfiguredParameter__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4795:1: ( rule__ConfiguredParameter__Group__0__Impl rule__ConfiguredParameter__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4796:2: rule__ConfiguredParameter__Group__0__Impl rule__ConfiguredParameter__Group__1
+            // InternalCheckCfg.g:4795:1: ( rule__ConfiguredParameter__Group__0__Impl rule__ConfiguredParameter__Group__1 )
+            // InternalCheckCfg.g:4796:2: rule__ConfiguredParameter__Group__0__Impl rule__ConfiguredParameter__Group__1
             {
-            pushFollow(FOLLOW_rule__ConfiguredParameter__Group__0__Impl_in_rule__ConfiguredParameter__Group__010286);
+            pushFollow(FOLLOW_5);
             rule__ConfiguredParameter__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ConfiguredParameter__Group__1_in_rule__ConfiguredParameter__Group__010289);
+            pushFollow(FOLLOW_2);
             rule__ConfiguredParameter__Group__1();
 
             state._fsp--;
@@ -15439,23 +15439,23 @@ public final void rule__ConfiguredParameter__Group__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ConfiguredParameter__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4803:1: rule__ConfiguredParameter__Group__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:4803:1: rule__ConfiguredParameter__Group__0__Impl : ( () ) ;
     public final void rule__ConfiguredParameter__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4807:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4808:1: ( () )
+            // InternalCheckCfg.g:4807:1: ( ( () ) )
+            // InternalCheckCfg.g:4808:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4808:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4809:1: ()
+            // InternalCheckCfg.g:4808:1: ( () )
+            // InternalCheckCfg.g:4809:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredParameterAccess().getConfiguredParameterAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4810:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4812:1: 
+            // InternalCheckCfg.g:4810:1: ()
+            // InternalCheckCfg.g:4812:1: 
             {
             }
 
@@ -15480,21 +15480,21 @@ public final void rule__ConfiguredParameter__Group__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__ConfiguredParameter__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4822:1: rule__ConfiguredParameter__Group__1 : rule__ConfiguredParameter__Group__1__Impl rule__ConfiguredParameter__Group__2 ;
+    // InternalCheckCfg.g:4822:1: rule__ConfiguredParameter__Group__1 : rule__ConfiguredParameter__Group__1__Impl rule__ConfiguredParameter__Group__2 ;
     public final void rule__ConfiguredParameter__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4826:1: ( rule__ConfiguredParameter__Group__1__Impl rule__ConfiguredParameter__Group__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4827:2: rule__ConfiguredParameter__Group__1__Impl rule__ConfiguredParameter__Group__2
+            // InternalCheckCfg.g:4826:1: ( rule__ConfiguredParameter__Group__1__Impl rule__ConfiguredParameter__Group__2 )
+            // InternalCheckCfg.g:4827:2: rule__ConfiguredParameter__Group__1__Impl rule__ConfiguredParameter__Group__2
             {
-            pushFollow(FOLLOW_rule__ConfiguredParameter__Group__1__Impl_in_rule__ConfiguredParameter__Group__110347);
+            pushFollow(FOLLOW_19);
             rule__ConfiguredParameter__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ConfiguredParameter__Group__2_in_rule__ConfiguredParameter__Group__110350);
+            pushFollow(FOLLOW_2);
             rule__ConfiguredParameter__Group__2();
 
             state._fsp--;
@@ -15518,25 +15518,25 @@ public final void rule__ConfiguredParameter__Group__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ConfiguredParameter__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4834:1: rule__ConfiguredParameter__Group__1__Impl : ( ( rule__ConfiguredParameter__ParameterAssignment_1 ) ) ;
+    // InternalCheckCfg.g:4834:1: rule__ConfiguredParameter__Group__1__Impl : ( ( rule__ConfiguredParameter__ParameterAssignment_1 ) ) ;
     public final void rule__ConfiguredParameter__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4838:1: ( ( ( rule__ConfiguredParameter__ParameterAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4839:1: ( ( rule__ConfiguredParameter__ParameterAssignment_1 ) )
+            // InternalCheckCfg.g:4838:1: ( ( ( rule__ConfiguredParameter__ParameterAssignment_1 ) ) )
+            // InternalCheckCfg.g:4839:1: ( ( rule__ConfiguredParameter__ParameterAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4839:1: ( ( rule__ConfiguredParameter__ParameterAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4840:1: ( rule__ConfiguredParameter__ParameterAssignment_1 )
+            // InternalCheckCfg.g:4839:1: ( ( rule__ConfiguredParameter__ParameterAssignment_1 ) )
+            // InternalCheckCfg.g:4840:1: ( rule__ConfiguredParameter__ParameterAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredParameterAccess().getParameterAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4841:1: ( rule__ConfiguredParameter__ParameterAssignment_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4841:2: rule__ConfiguredParameter__ParameterAssignment_1
+            // InternalCheckCfg.g:4841:1: ( rule__ConfiguredParameter__ParameterAssignment_1 )
+            // InternalCheckCfg.g:4841:2: rule__ConfiguredParameter__ParameterAssignment_1
             {
-            pushFollow(FOLLOW_rule__ConfiguredParameter__ParameterAssignment_1_in_rule__ConfiguredParameter__Group__1__Impl10377);
+            pushFollow(FOLLOW_2);
             rule__ConfiguredParameter__ParameterAssignment_1();
 
             state._fsp--;
@@ -15569,21 +15569,21 @@ public final void rule__ConfiguredParameter__Group__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__ConfiguredParameter__Group__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4851:1: rule__ConfiguredParameter__Group__2 : rule__ConfiguredParameter__Group__2__Impl rule__ConfiguredParameter__Group__3 ;
+    // InternalCheckCfg.g:4851:1: rule__ConfiguredParameter__Group__2 : rule__ConfiguredParameter__Group__2__Impl rule__ConfiguredParameter__Group__3 ;
     public final void rule__ConfiguredParameter__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4855:1: ( rule__ConfiguredParameter__Group__2__Impl rule__ConfiguredParameter__Group__3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4856:2: rule__ConfiguredParameter__Group__2__Impl rule__ConfiguredParameter__Group__3
+            // InternalCheckCfg.g:4855:1: ( rule__ConfiguredParameter__Group__2__Impl rule__ConfiguredParameter__Group__3 )
+            // InternalCheckCfg.g:4856:2: rule__ConfiguredParameter__Group__2__Impl rule__ConfiguredParameter__Group__3
             {
-            pushFollow(FOLLOW_rule__ConfiguredParameter__Group__2__Impl_in_rule__ConfiguredParameter__Group__210407);
+            pushFollow(FOLLOW_20);
             rule__ConfiguredParameter__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ConfiguredParameter__Group__3_in_rule__ConfiguredParameter__Group__210410);
+            pushFollow(FOLLOW_2);
             rule__ConfiguredParameter__Group__3();
 
             state._fsp--;
@@ -15607,22 +15607,22 @@ public final void rule__ConfiguredParameter__Group__2() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ConfiguredParameter__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4863:1: rule__ConfiguredParameter__Group__2__Impl : ( '=' ) ;
+    // InternalCheckCfg.g:4863:1: rule__ConfiguredParameter__Group__2__Impl : ( '=' ) ;
     public final void rule__ConfiguredParameter__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4867:1: ( ( '=' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4868:1: ( '=' )
+            // InternalCheckCfg.g:4867:1: ( ( '=' ) )
+            // InternalCheckCfg.g:4868:1: ( '=' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4868:1: ( '=' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4869:1: '='
+            // InternalCheckCfg.g:4868:1: ( '=' )
+            // InternalCheckCfg.g:4869:1: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredParameterAccess().getEqualsSignKeyword_2()); 
             }
-            match(input,13,FOLLOW_13_in_rule__ConfiguredParameter__Group__2__Impl10438); if (state.failed) return ;
+            match(input,13,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getConfiguredParameterAccess().getEqualsSignKeyword_2()); 
             }
@@ -15648,16 +15648,16 @@ public final void rule__ConfiguredParameter__Group__2__Impl() throws Recognition
 
 
     // $ANTLR start "rule__ConfiguredParameter__Group__3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4882:1: rule__ConfiguredParameter__Group__3 : rule__ConfiguredParameter__Group__3__Impl ;
+    // InternalCheckCfg.g:4882:1: rule__ConfiguredParameter__Group__3 : rule__ConfiguredParameter__Group__3__Impl ;
     public final void rule__ConfiguredParameter__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4886:1: ( rule__ConfiguredParameter__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4887:2: rule__ConfiguredParameter__Group__3__Impl
+            // InternalCheckCfg.g:4886:1: ( rule__ConfiguredParameter__Group__3__Impl )
+            // InternalCheckCfg.g:4887:2: rule__ConfiguredParameter__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__ConfiguredParameter__Group__3__Impl_in_rule__ConfiguredParameter__Group__310469);
+            pushFollow(FOLLOW_2);
             rule__ConfiguredParameter__Group__3__Impl();
 
             state._fsp--;
@@ -15681,25 +15681,25 @@ public final void rule__ConfiguredParameter__Group__3() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ConfiguredParameter__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4893:1: rule__ConfiguredParameter__Group__3__Impl : ( ( rule__ConfiguredParameter__NewValueAssignment_3 ) ) ;
+    // InternalCheckCfg.g:4893:1: rule__ConfiguredParameter__Group__3__Impl : ( ( rule__ConfiguredParameter__NewValueAssignment_3 ) ) ;
     public final void rule__ConfiguredParameter__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4897:1: ( ( ( rule__ConfiguredParameter__NewValueAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4898:1: ( ( rule__ConfiguredParameter__NewValueAssignment_3 ) )
+            // InternalCheckCfg.g:4897:1: ( ( ( rule__ConfiguredParameter__NewValueAssignment_3 ) ) )
+            // InternalCheckCfg.g:4898:1: ( ( rule__ConfiguredParameter__NewValueAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4898:1: ( ( rule__ConfiguredParameter__NewValueAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4899:1: ( rule__ConfiguredParameter__NewValueAssignment_3 )
+            // InternalCheckCfg.g:4898:1: ( ( rule__ConfiguredParameter__NewValueAssignment_3 ) )
+            // InternalCheckCfg.g:4899:1: ( rule__ConfiguredParameter__NewValueAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredParameterAccess().getNewValueAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4900:1: ( rule__ConfiguredParameter__NewValueAssignment_3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4900:2: rule__ConfiguredParameter__NewValueAssignment_3
+            // InternalCheckCfg.g:4900:1: ( rule__ConfiguredParameter__NewValueAssignment_3 )
+            // InternalCheckCfg.g:4900:2: rule__ConfiguredParameter__NewValueAssignment_3
             {
-            pushFollow(FOLLOW_rule__ConfiguredParameter__NewValueAssignment_3_in_rule__ConfiguredParameter__Group__3__Impl10496);
+            pushFollow(FOLLOW_2);
             rule__ConfiguredParameter__NewValueAssignment_3();
 
             state._fsp--;
@@ -15732,21 +15732,21 @@ public final void rule__ConfiguredParameter__Group__3__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XConstantUnaryOperation__Group_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4918:1: rule__XConstantUnaryOperation__Group_0__0 : rule__XConstantUnaryOperation__Group_0__0__Impl rule__XConstantUnaryOperation__Group_0__1 ;
+    // InternalCheckCfg.g:4918:1: rule__XConstantUnaryOperation__Group_0__0 : rule__XConstantUnaryOperation__Group_0__0__Impl rule__XConstantUnaryOperation__Group_0__1 ;
     public final void rule__XConstantUnaryOperation__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4922:1: ( rule__XConstantUnaryOperation__Group_0__0__Impl rule__XConstantUnaryOperation__Group_0__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4923:2: rule__XConstantUnaryOperation__Group_0__0__Impl rule__XConstantUnaryOperation__Group_0__1
+            // InternalCheckCfg.g:4922:1: ( rule__XConstantUnaryOperation__Group_0__0__Impl rule__XConstantUnaryOperation__Group_0__1 )
+            // InternalCheckCfg.g:4923:2: rule__XConstantUnaryOperation__Group_0__0__Impl rule__XConstantUnaryOperation__Group_0__1
             {
-            pushFollow(FOLLOW_rule__XConstantUnaryOperation__Group_0__0__Impl_in_rule__XConstantUnaryOperation__Group_0__010534);
+            pushFollow(FOLLOW_21);
             rule__XConstantUnaryOperation__Group_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstantUnaryOperation__Group_0__1_in_rule__XConstantUnaryOperation__Group_0__010537);
+            pushFollow(FOLLOW_2);
             rule__XConstantUnaryOperation__Group_0__1();
 
             state._fsp--;
@@ -15770,23 +15770,23 @@ public final void rule__XConstantUnaryOperation__Group_0__0() throws Recognition
 
 
     // $ANTLR start "rule__XConstantUnaryOperation__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4930:1: rule__XConstantUnaryOperation__Group_0__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:4930:1: rule__XConstantUnaryOperation__Group_0__0__Impl : ( () ) ;
     public final void rule__XConstantUnaryOperation__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4934:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4935:1: ( () )
+            // InternalCheckCfg.g:4934:1: ( ( () ) )
+            // InternalCheckCfg.g:4935:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4935:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4936:1: ()
+            // InternalCheckCfg.g:4935:1: ( () )
+            // InternalCheckCfg.g:4936:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantUnaryOperationAccess().getXUnaryOperationAction_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4937:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4939:1: 
+            // InternalCheckCfg.g:4937:1: ()
+            // InternalCheckCfg.g:4939:1: 
             {
             }
 
@@ -15811,21 +15811,21 @@ public final void rule__XConstantUnaryOperation__Group_0__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XConstantUnaryOperation__Group_0__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4949:1: rule__XConstantUnaryOperation__Group_0__1 : rule__XConstantUnaryOperation__Group_0__1__Impl rule__XConstantUnaryOperation__Group_0__2 ;
+    // InternalCheckCfg.g:4949:1: rule__XConstantUnaryOperation__Group_0__1 : rule__XConstantUnaryOperation__Group_0__1__Impl rule__XConstantUnaryOperation__Group_0__2 ;
     public final void rule__XConstantUnaryOperation__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4953:1: ( rule__XConstantUnaryOperation__Group_0__1__Impl rule__XConstantUnaryOperation__Group_0__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4954:2: rule__XConstantUnaryOperation__Group_0__1__Impl rule__XConstantUnaryOperation__Group_0__2
+            // InternalCheckCfg.g:4953:1: ( rule__XConstantUnaryOperation__Group_0__1__Impl rule__XConstantUnaryOperation__Group_0__2 )
+            // InternalCheckCfg.g:4954:2: rule__XConstantUnaryOperation__Group_0__1__Impl rule__XConstantUnaryOperation__Group_0__2
             {
-            pushFollow(FOLLOW_rule__XConstantUnaryOperation__Group_0__1__Impl_in_rule__XConstantUnaryOperation__Group_0__110595);
+            pushFollow(FOLLOW_22);
             rule__XConstantUnaryOperation__Group_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstantUnaryOperation__Group_0__2_in_rule__XConstantUnaryOperation__Group_0__110598);
+            pushFollow(FOLLOW_2);
             rule__XConstantUnaryOperation__Group_0__2();
 
             state._fsp--;
@@ -15849,25 +15849,25 @@ public final void rule__XConstantUnaryOperation__Group_0__1() throws Recognition
 
 
     // $ANTLR start "rule__XConstantUnaryOperation__Group_0__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4961:1: rule__XConstantUnaryOperation__Group_0__1__Impl : ( ( rule__XConstantUnaryOperation__FeatureAssignment_0_1 ) ) ;
+    // InternalCheckCfg.g:4961:1: rule__XConstantUnaryOperation__Group_0__1__Impl : ( ( rule__XConstantUnaryOperation__FeatureAssignment_0_1 ) ) ;
     public final void rule__XConstantUnaryOperation__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4965:1: ( ( ( rule__XConstantUnaryOperation__FeatureAssignment_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4966:1: ( ( rule__XConstantUnaryOperation__FeatureAssignment_0_1 ) )
+            // InternalCheckCfg.g:4965:1: ( ( ( rule__XConstantUnaryOperation__FeatureAssignment_0_1 ) ) )
+            // InternalCheckCfg.g:4966:1: ( ( rule__XConstantUnaryOperation__FeatureAssignment_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4966:1: ( ( rule__XConstantUnaryOperation__FeatureAssignment_0_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4967:1: ( rule__XConstantUnaryOperation__FeatureAssignment_0_1 )
+            // InternalCheckCfg.g:4966:1: ( ( rule__XConstantUnaryOperation__FeatureAssignment_0_1 ) )
+            // InternalCheckCfg.g:4967:1: ( rule__XConstantUnaryOperation__FeatureAssignment_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantUnaryOperationAccess().getFeatureAssignment_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4968:1: ( rule__XConstantUnaryOperation__FeatureAssignment_0_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4968:2: rule__XConstantUnaryOperation__FeatureAssignment_0_1
+            // InternalCheckCfg.g:4968:1: ( rule__XConstantUnaryOperation__FeatureAssignment_0_1 )
+            // InternalCheckCfg.g:4968:2: rule__XConstantUnaryOperation__FeatureAssignment_0_1
             {
-            pushFollow(FOLLOW_rule__XConstantUnaryOperation__FeatureAssignment_0_1_in_rule__XConstantUnaryOperation__Group_0__1__Impl10625);
+            pushFollow(FOLLOW_2);
             rule__XConstantUnaryOperation__FeatureAssignment_0_1();
 
             state._fsp--;
@@ -15900,16 +15900,16 @@ public final void rule__XConstantUnaryOperation__Group_0__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__XConstantUnaryOperation__Group_0__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4978:1: rule__XConstantUnaryOperation__Group_0__2 : rule__XConstantUnaryOperation__Group_0__2__Impl ;
+    // InternalCheckCfg.g:4978:1: rule__XConstantUnaryOperation__Group_0__2 : rule__XConstantUnaryOperation__Group_0__2__Impl ;
     public final void rule__XConstantUnaryOperation__Group_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4982:1: ( rule__XConstantUnaryOperation__Group_0__2__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4983:2: rule__XConstantUnaryOperation__Group_0__2__Impl
+            // InternalCheckCfg.g:4982:1: ( rule__XConstantUnaryOperation__Group_0__2__Impl )
+            // InternalCheckCfg.g:4983:2: rule__XConstantUnaryOperation__Group_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__XConstantUnaryOperation__Group_0__2__Impl_in_rule__XConstantUnaryOperation__Group_0__210655);
+            pushFollow(FOLLOW_2);
             rule__XConstantUnaryOperation__Group_0__2__Impl();
 
             state._fsp--;
@@ -15933,25 +15933,25 @@ public final void rule__XConstantUnaryOperation__Group_0__2() throws Recognition
 
 
     // $ANTLR start "rule__XConstantUnaryOperation__Group_0__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4989:1: rule__XConstantUnaryOperation__Group_0__2__Impl : ( ( rule__XConstantUnaryOperation__OperandAssignment_0_2 ) ) ;
+    // InternalCheckCfg.g:4989:1: rule__XConstantUnaryOperation__Group_0__2__Impl : ( ( rule__XConstantUnaryOperation__OperandAssignment_0_2 ) ) ;
     public final void rule__XConstantUnaryOperation__Group_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4993:1: ( ( ( rule__XConstantUnaryOperation__OperandAssignment_0_2 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4994:1: ( ( rule__XConstantUnaryOperation__OperandAssignment_0_2 ) )
+            // InternalCheckCfg.g:4993:1: ( ( ( rule__XConstantUnaryOperation__OperandAssignment_0_2 ) ) )
+            // InternalCheckCfg.g:4994:1: ( ( rule__XConstantUnaryOperation__OperandAssignment_0_2 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4994:1: ( ( rule__XConstantUnaryOperation__OperandAssignment_0_2 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4995:1: ( rule__XConstantUnaryOperation__OperandAssignment_0_2 )
+            // InternalCheckCfg.g:4994:1: ( ( rule__XConstantUnaryOperation__OperandAssignment_0_2 ) )
+            // InternalCheckCfg.g:4995:1: ( rule__XConstantUnaryOperation__OperandAssignment_0_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantUnaryOperationAccess().getOperandAssignment_0_2()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4996:1: ( rule__XConstantUnaryOperation__OperandAssignment_0_2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:4996:2: rule__XConstantUnaryOperation__OperandAssignment_0_2
+            // InternalCheckCfg.g:4996:1: ( rule__XConstantUnaryOperation__OperandAssignment_0_2 )
+            // InternalCheckCfg.g:4996:2: rule__XConstantUnaryOperation__OperandAssignment_0_2
             {
-            pushFollow(FOLLOW_rule__XConstantUnaryOperation__OperandAssignment_0_2_in_rule__XConstantUnaryOperation__Group_0__2__Impl10682);
+            pushFollow(FOLLOW_2);
             rule__XConstantUnaryOperation__OperandAssignment_0_2();
 
             state._fsp--;
@@ -15984,21 +15984,21 @@ public final void rule__XConstantUnaryOperation__Group_0__2__Impl() throws Recog
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5012:1: rule__XConstantListLiteral__Group__0 : rule__XConstantListLiteral__Group__0__Impl rule__XConstantListLiteral__Group__1 ;
+    // InternalCheckCfg.g:5012:1: rule__XConstantListLiteral__Group__0 : rule__XConstantListLiteral__Group__0__Impl rule__XConstantListLiteral__Group__1 ;
     public final void rule__XConstantListLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5016:1: ( rule__XConstantListLiteral__Group__0__Impl rule__XConstantListLiteral__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5017:2: rule__XConstantListLiteral__Group__0__Impl rule__XConstantListLiteral__Group__1
+            // InternalCheckCfg.g:5016:1: ( rule__XConstantListLiteral__Group__0__Impl rule__XConstantListLiteral__Group__1 )
+            // InternalCheckCfg.g:5017:2: rule__XConstantListLiteral__Group__0__Impl rule__XConstantListLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group__0__Impl_in_rule__XConstantListLiteral__Group__010718);
+            pushFollow(FOLLOW_20);
             rule__XConstantListLiteral__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group__1_in_rule__XConstantListLiteral__Group__010721);
+            pushFollow(FOLLOW_2);
             rule__XConstantListLiteral__Group__1();
 
             state._fsp--;
@@ -16022,23 +16022,23 @@ public final void rule__XConstantListLiteral__Group__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5024:1: rule__XConstantListLiteral__Group__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:5024:1: rule__XConstantListLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XConstantListLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5028:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5029:1: ( () )
+            // InternalCheckCfg.g:5028:1: ( ( () ) )
+            // InternalCheckCfg.g:5029:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5029:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5030:1: ()
+            // InternalCheckCfg.g:5029:1: ( () )
+            // InternalCheckCfg.g:5030:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantListLiteralAccess().getXListLiteralAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5031:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5033:1: 
+            // InternalCheckCfg.g:5031:1: ()
+            // InternalCheckCfg.g:5033:1: 
             {
             }
 
@@ -16063,21 +16063,21 @@ public final void rule__XConstantListLiteral__Group__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5043:1: rule__XConstantListLiteral__Group__1 : rule__XConstantListLiteral__Group__1__Impl rule__XConstantListLiteral__Group__2 ;
+    // InternalCheckCfg.g:5043:1: rule__XConstantListLiteral__Group__1 : rule__XConstantListLiteral__Group__1__Impl rule__XConstantListLiteral__Group__2 ;
     public final void rule__XConstantListLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5047:1: ( rule__XConstantListLiteral__Group__1__Impl rule__XConstantListLiteral__Group__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5048:2: rule__XConstantListLiteral__Group__1__Impl rule__XConstantListLiteral__Group__2
+            // InternalCheckCfg.g:5047:1: ( rule__XConstantListLiteral__Group__1__Impl rule__XConstantListLiteral__Group__2 )
+            // InternalCheckCfg.g:5048:2: rule__XConstantListLiteral__Group__1__Impl rule__XConstantListLiteral__Group__2
             {
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group__1__Impl_in_rule__XConstantListLiteral__Group__110779);
+            pushFollow(FOLLOW_23);
             rule__XConstantListLiteral__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group__2_in_rule__XConstantListLiteral__Group__110782);
+            pushFollow(FOLLOW_2);
             rule__XConstantListLiteral__Group__2();
 
             state._fsp--;
@@ -16101,22 +16101,22 @@ public final void rule__XConstantListLiteral__Group__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5055:1: rule__XConstantListLiteral__Group__1__Impl : ( '#' ) ;
+    // InternalCheckCfg.g:5055:1: rule__XConstantListLiteral__Group__1__Impl : ( '#' ) ;
     public final void rule__XConstantListLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5059:1: ( ( '#' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5060:1: ( '#' )
+            // InternalCheckCfg.g:5059:1: ( ( '#' ) )
+            // InternalCheckCfg.g:5060:1: ( '#' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5060:1: ( '#' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5061:1: '#'
+            // InternalCheckCfg.g:5060:1: ( '#' )
+            // InternalCheckCfg.g:5061:1: '#'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantListLiteralAccess().getNumberSignKeyword_1()); 
             }
-            match(input,65,FOLLOW_65_in_rule__XConstantListLiteral__Group__1__Impl10810); if (state.failed) return ;
+            match(input,65,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstantListLiteralAccess().getNumberSignKeyword_1()); 
             }
@@ -16142,21 +16142,21 @@ public final void rule__XConstantListLiteral__Group__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5074:1: rule__XConstantListLiteral__Group__2 : rule__XConstantListLiteral__Group__2__Impl rule__XConstantListLiteral__Group__3 ;
+    // InternalCheckCfg.g:5074:1: rule__XConstantListLiteral__Group__2 : rule__XConstantListLiteral__Group__2__Impl rule__XConstantListLiteral__Group__3 ;
     public final void rule__XConstantListLiteral__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5078:1: ( rule__XConstantListLiteral__Group__2__Impl rule__XConstantListLiteral__Group__3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5079:2: rule__XConstantListLiteral__Group__2__Impl rule__XConstantListLiteral__Group__3
+            // InternalCheckCfg.g:5078:1: ( rule__XConstantListLiteral__Group__2__Impl rule__XConstantListLiteral__Group__3 )
+            // InternalCheckCfg.g:5079:2: rule__XConstantListLiteral__Group__2__Impl rule__XConstantListLiteral__Group__3
             {
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group__2__Impl_in_rule__XConstantListLiteral__Group__210841);
+            pushFollow(FOLLOW_24);
             rule__XConstantListLiteral__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group__3_in_rule__XConstantListLiteral__Group__210844);
+            pushFollow(FOLLOW_2);
             rule__XConstantListLiteral__Group__3();
 
             state._fsp--;
@@ -16180,22 +16180,22 @@ public final void rule__XConstantListLiteral__Group__2() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5086:1: rule__XConstantListLiteral__Group__2__Impl : ( '[' ) ;
+    // InternalCheckCfg.g:5086:1: rule__XConstantListLiteral__Group__2__Impl : ( '[' ) ;
     public final void rule__XConstantListLiteral__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5090:1: ( ( '[' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5091:1: ( '[' )
+            // InternalCheckCfg.g:5090:1: ( ( '[' ) )
+            // InternalCheckCfg.g:5091:1: ( '[' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5091:1: ( '[' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5092:1: '['
+            // InternalCheckCfg.g:5091:1: ( '[' )
+            // InternalCheckCfg.g:5092:1: '['
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantListLiteralAccess().getLeftSquareBracketKeyword_2()); 
             }
-            match(input,66,FOLLOW_66_in_rule__XConstantListLiteral__Group__2__Impl10872); if (state.failed) return ;
+            match(input,66,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstantListLiteralAccess().getLeftSquareBracketKeyword_2()); 
             }
@@ -16221,21 +16221,21 @@ public final void rule__XConstantListLiteral__Group__2__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group__3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5105:1: rule__XConstantListLiteral__Group__3 : rule__XConstantListLiteral__Group__3__Impl rule__XConstantListLiteral__Group__4 ;
+    // InternalCheckCfg.g:5105:1: rule__XConstantListLiteral__Group__3 : rule__XConstantListLiteral__Group__3__Impl rule__XConstantListLiteral__Group__4 ;
     public final void rule__XConstantListLiteral__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5109:1: ( rule__XConstantListLiteral__Group__3__Impl rule__XConstantListLiteral__Group__4 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5110:2: rule__XConstantListLiteral__Group__3__Impl rule__XConstantListLiteral__Group__4
+            // InternalCheckCfg.g:5109:1: ( rule__XConstantListLiteral__Group__3__Impl rule__XConstantListLiteral__Group__4 )
+            // InternalCheckCfg.g:5110:2: rule__XConstantListLiteral__Group__3__Impl rule__XConstantListLiteral__Group__4
             {
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group__3__Impl_in_rule__XConstantListLiteral__Group__310903);
+            pushFollow(FOLLOW_24);
             rule__XConstantListLiteral__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group__4_in_rule__XConstantListLiteral__Group__310906);
+            pushFollow(FOLLOW_2);
             rule__XConstantListLiteral__Group__4();
 
             state._fsp--;
@@ -16259,22 +16259,22 @@ public final void rule__XConstantListLiteral__Group__3() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5117:1: rule__XConstantListLiteral__Group__3__Impl : ( ( rule__XConstantListLiteral__Group_3__0 )? ) ;
+    // InternalCheckCfg.g:5117:1: rule__XConstantListLiteral__Group__3__Impl : ( ( rule__XConstantListLiteral__Group_3__0 )? ) ;
     public final void rule__XConstantListLiteral__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5121:1: ( ( ( rule__XConstantListLiteral__Group_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5122:1: ( ( rule__XConstantListLiteral__Group_3__0 )? )
+            // InternalCheckCfg.g:5121:1: ( ( ( rule__XConstantListLiteral__Group_3__0 )? ) )
+            // InternalCheckCfg.g:5122:1: ( ( rule__XConstantListLiteral__Group_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5122:1: ( ( rule__XConstantListLiteral__Group_3__0 )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5123:1: ( rule__XConstantListLiteral__Group_3__0 )?
+            // InternalCheckCfg.g:5122:1: ( ( rule__XConstantListLiteral__Group_3__0 )? )
+            // InternalCheckCfg.g:5123:1: ( rule__XConstantListLiteral__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantListLiteralAccess().getGroup_3()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5124:1: ( rule__XConstantListLiteral__Group_3__0 )?
+            // InternalCheckCfg.g:5124:1: ( rule__XConstantListLiteral__Group_3__0 )?
             int alt55=2;
             int LA55_0 = input.LA(1);
 
@@ -16283,9 +16283,9 @@ public final void rule__XConstantListLiteral__Group__3__Impl() throws Recognitio
             }
             switch (alt55) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5124:2: rule__XConstantListLiteral__Group_3__0
+                    // InternalCheckCfg.g:5124:2: rule__XConstantListLiteral__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__XConstantListLiteral__Group_3__0_in_rule__XConstantListLiteral__Group__3__Impl10933);
+                    pushFollow(FOLLOW_2);
                     rule__XConstantListLiteral__Group_3__0();
 
                     state._fsp--;
@@ -16321,16 +16321,16 @@ public final void rule__XConstantListLiteral__Group__3__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group__4"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5134:1: rule__XConstantListLiteral__Group__4 : rule__XConstantListLiteral__Group__4__Impl ;
+    // InternalCheckCfg.g:5134:1: rule__XConstantListLiteral__Group__4 : rule__XConstantListLiteral__Group__4__Impl ;
     public final void rule__XConstantListLiteral__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5138:1: ( rule__XConstantListLiteral__Group__4__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5139:2: rule__XConstantListLiteral__Group__4__Impl
+            // InternalCheckCfg.g:5138:1: ( rule__XConstantListLiteral__Group__4__Impl )
+            // InternalCheckCfg.g:5139:2: rule__XConstantListLiteral__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group__4__Impl_in_rule__XConstantListLiteral__Group__410964);
+            pushFollow(FOLLOW_2);
             rule__XConstantListLiteral__Group__4__Impl();
 
             state._fsp--;
@@ -16354,22 +16354,22 @@ public final void rule__XConstantListLiteral__Group__4() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5145:1: rule__XConstantListLiteral__Group__4__Impl : ( ']' ) ;
+    // InternalCheckCfg.g:5145:1: rule__XConstantListLiteral__Group__4__Impl : ( ']' ) ;
     public final void rule__XConstantListLiteral__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5149:1: ( ( ']' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5150:1: ( ']' )
+            // InternalCheckCfg.g:5149:1: ( ( ']' ) )
+            // InternalCheckCfg.g:5150:1: ( ']' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5150:1: ( ']' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5151:1: ']'
+            // InternalCheckCfg.g:5150:1: ( ']' )
+            // InternalCheckCfg.g:5151:1: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantListLiteralAccess().getRightSquareBracketKeyword_4()); 
             }
-            match(input,67,FOLLOW_67_in_rule__XConstantListLiteral__Group__4__Impl10992); if (state.failed) return ;
+            match(input,67,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstantListLiteralAccess().getRightSquareBracketKeyword_4()); 
             }
@@ -16395,21 +16395,21 @@ public final void rule__XConstantListLiteral__Group__4__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group_3__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5174:1: rule__XConstantListLiteral__Group_3__0 : rule__XConstantListLiteral__Group_3__0__Impl rule__XConstantListLiteral__Group_3__1 ;
+    // InternalCheckCfg.g:5174:1: rule__XConstantListLiteral__Group_3__0 : rule__XConstantListLiteral__Group_3__0__Impl rule__XConstantListLiteral__Group_3__1 ;
     public final void rule__XConstantListLiteral__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5178:1: ( rule__XConstantListLiteral__Group_3__0__Impl rule__XConstantListLiteral__Group_3__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5179:2: rule__XConstantListLiteral__Group_3__0__Impl rule__XConstantListLiteral__Group_3__1
+            // InternalCheckCfg.g:5178:1: ( rule__XConstantListLiteral__Group_3__0__Impl rule__XConstantListLiteral__Group_3__1 )
+            // InternalCheckCfg.g:5179:2: rule__XConstantListLiteral__Group_3__0__Impl rule__XConstantListLiteral__Group_3__1
             {
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group_3__0__Impl_in_rule__XConstantListLiteral__Group_3__011033);
+            pushFollow(FOLLOW_25);
             rule__XConstantListLiteral__Group_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group_3__1_in_rule__XConstantListLiteral__Group_3__011036);
+            pushFollow(FOLLOW_2);
             rule__XConstantListLiteral__Group_3__1();
 
             state._fsp--;
@@ -16433,25 +16433,25 @@ public final void rule__XConstantListLiteral__Group_3__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group_3__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5186:1: rule__XConstantListLiteral__Group_3__0__Impl : ( ( rule__XConstantListLiteral__ElementsAssignment_3_0 ) ) ;
+    // InternalCheckCfg.g:5186:1: rule__XConstantListLiteral__Group_3__0__Impl : ( ( rule__XConstantListLiteral__ElementsAssignment_3_0 ) ) ;
     public final void rule__XConstantListLiteral__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5190:1: ( ( ( rule__XConstantListLiteral__ElementsAssignment_3_0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5191:1: ( ( rule__XConstantListLiteral__ElementsAssignment_3_0 ) )
+            // InternalCheckCfg.g:5190:1: ( ( ( rule__XConstantListLiteral__ElementsAssignment_3_0 ) ) )
+            // InternalCheckCfg.g:5191:1: ( ( rule__XConstantListLiteral__ElementsAssignment_3_0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5191:1: ( ( rule__XConstantListLiteral__ElementsAssignment_3_0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5192:1: ( rule__XConstantListLiteral__ElementsAssignment_3_0 )
+            // InternalCheckCfg.g:5191:1: ( ( rule__XConstantListLiteral__ElementsAssignment_3_0 ) )
+            // InternalCheckCfg.g:5192:1: ( rule__XConstantListLiteral__ElementsAssignment_3_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantListLiteralAccess().getElementsAssignment_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5193:1: ( rule__XConstantListLiteral__ElementsAssignment_3_0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5193:2: rule__XConstantListLiteral__ElementsAssignment_3_0
+            // InternalCheckCfg.g:5193:1: ( rule__XConstantListLiteral__ElementsAssignment_3_0 )
+            // InternalCheckCfg.g:5193:2: rule__XConstantListLiteral__ElementsAssignment_3_0
             {
-            pushFollow(FOLLOW_rule__XConstantListLiteral__ElementsAssignment_3_0_in_rule__XConstantListLiteral__Group_3__0__Impl11063);
+            pushFollow(FOLLOW_2);
             rule__XConstantListLiteral__ElementsAssignment_3_0();
 
             state._fsp--;
@@ -16484,16 +16484,16 @@ public final void rule__XConstantListLiteral__Group_3__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group_3__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5203:1: rule__XConstantListLiteral__Group_3__1 : rule__XConstantListLiteral__Group_3__1__Impl ;
+    // InternalCheckCfg.g:5203:1: rule__XConstantListLiteral__Group_3__1 : rule__XConstantListLiteral__Group_3__1__Impl ;
     public final void rule__XConstantListLiteral__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5207:1: ( rule__XConstantListLiteral__Group_3__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5208:2: rule__XConstantListLiteral__Group_3__1__Impl
+            // InternalCheckCfg.g:5207:1: ( rule__XConstantListLiteral__Group_3__1__Impl )
+            // InternalCheckCfg.g:5208:2: rule__XConstantListLiteral__Group_3__1__Impl
             {
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group_3__1__Impl_in_rule__XConstantListLiteral__Group_3__111093);
+            pushFollow(FOLLOW_2);
             rule__XConstantListLiteral__Group_3__1__Impl();
 
             state._fsp--;
@@ -16517,22 +16517,22 @@ public final void rule__XConstantListLiteral__Group_3__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group_3__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5214:1: rule__XConstantListLiteral__Group_3__1__Impl : ( ( rule__XConstantListLiteral__Group_3_1__0 )* ) ;
+    // InternalCheckCfg.g:5214:1: rule__XConstantListLiteral__Group_3__1__Impl : ( ( rule__XConstantListLiteral__Group_3_1__0 )* ) ;
     public final void rule__XConstantListLiteral__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5218:1: ( ( ( rule__XConstantListLiteral__Group_3_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5219:1: ( ( rule__XConstantListLiteral__Group_3_1__0 )* )
+            // InternalCheckCfg.g:5218:1: ( ( ( rule__XConstantListLiteral__Group_3_1__0 )* ) )
+            // InternalCheckCfg.g:5219:1: ( ( rule__XConstantListLiteral__Group_3_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5219:1: ( ( rule__XConstantListLiteral__Group_3_1__0 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5220:1: ( rule__XConstantListLiteral__Group_3_1__0 )*
+            // InternalCheckCfg.g:5219:1: ( ( rule__XConstantListLiteral__Group_3_1__0 )* )
+            // InternalCheckCfg.g:5220:1: ( rule__XConstantListLiteral__Group_3_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantListLiteralAccess().getGroup_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5221:1: ( rule__XConstantListLiteral__Group_3_1__0 )*
+            // InternalCheckCfg.g:5221:1: ( rule__XConstantListLiteral__Group_3_1__0 )*
             loop56:
             do {
                 int alt56=2;
@@ -16545,9 +16545,9 @@ public final void rule__XConstantListLiteral__Group_3__1__Impl() throws Recognit
 
                 switch (alt56) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5221:2: rule__XConstantListLiteral__Group_3_1__0
+            	    // InternalCheckCfg.g:5221:2: rule__XConstantListLiteral__Group_3_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XConstantListLiteral__Group_3_1__0_in_rule__XConstantListLiteral__Group_3__1__Impl11120);
+            	    pushFollow(FOLLOW_18);
             	    rule__XConstantListLiteral__Group_3_1__0();
 
             	    state._fsp--;
@@ -16586,21 +16586,21 @@ public final void rule__XConstantListLiteral__Group_3__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group_3_1__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5235:1: rule__XConstantListLiteral__Group_3_1__0 : rule__XConstantListLiteral__Group_3_1__0__Impl rule__XConstantListLiteral__Group_3_1__1 ;
+    // InternalCheckCfg.g:5235:1: rule__XConstantListLiteral__Group_3_1__0 : rule__XConstantListLiteral__Group_3_1__0__Impl rule__XConstantListLiteral__Group_3_1__1 ;
     public final void rule__XConstantListLiteral__Group_3_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5239:1: ( rule__XConstantListLiteral__Group_3_1__0__Impl rule__XConstantListLiteral__Group_3_1__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5240:2: rule__XConstantListLiteral__Group_3_1__0__Impl rule__XConstantListLiteral__Group_3_1__1
+            // InternalCheckCfg.g:5239:1: ( rule__XConstantListLiteral__Group_3_1__0__Impl rule__XConstantListLiteral__Group_3_1__1 )
+            // InternalCheckCfg.g:5240:2: rule__XConstantListLiteral__Group_3_1__0__Impl rule__XConstantListLiteral__Group_3_1__1
             {
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group_3_1__0__Impl_in_rule__XConstantListLiteral__Group_3_1__011155);
+            pushFollow(FOLLOW_22);
             rule__XConstantListLiteral__Group_3_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group_3_1__1_in_rule__XConstantListLiteral__Group_3_1__011158);
+            pushFollow(FOLLOW_2);
             rule__XConstantListLiteral__Group_3_1__1();
 
             state._fsp--;
@@ -16624,22 +16624,22 @@ public final void rule__XConstantListLiteral__Group_3_1__0() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group_3_1__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5247:1: rule__XConstantListLiteral__Group_3_1__0__Impl : ( ',' ) ;
+    // InternalCheckCfg.g:5247:1: rule__XConstantListLiteral__Group_3_1__0__Impl : ( ',' ) ;
     public final void rule__XConstantListLiteral__Group_3_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5251:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5252:1: ( ',' )
+            // InternalCheckCfg.g:5251:1: ( ( ',' ) )
+            // InternalCheckCfg.g:5252:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5252:1: ( ',' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5253:1: ','
+            // InternalCheckCfg.g:5252:1: ( ',' )
+            // InternalCheckCfg.g:5253:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantListLiteralAccess().getCommaKeyword_3_1_0()); 
             }
-            match(input,64,FOLLOW_64_in_rule__XConstantListLiteral__Group_3_1__0__Impl11186); if (state.failed) return ;
+            match(input,64,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstantListLiteralAccess().getCommaKeyword_3_1_0()); 
             }
@@ -16665,16 +16665,16 @@ public final void rule__XConstantListLiteral__Group_3_1__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group_3_1__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5266:1: rule__XConstantListLiteral__Group_3_1__1 : rule__XConstantListLiteral__Group_3_1__1__Impl ;
+    // InternalCheckCfg.g:5266:1: rule__XConstantListLiteral__Group_3_1__1 : rule__XConstantListLiteral__Group_3_1__1__Impl ;
     public final void rule__XConstantListLiteral__Group_3_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5270:1: ( rule__XConstantListLiteral__Group_3_1__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5271:2: rule__XConstantListLiteral__Group_3_1__1__Impl
+            // InternalCheckCfg.g:5270:1: ( rule__XConstantListLiteral__Group_3_1__1__Impl )
+            // InternalCheckCfg.g:5271:2: rule__XConstantListLiteral__Group_3_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XConstantListLiteral__Group_3_1__1__Impl_in_rule__XConstantListLiteral__Group_3_1__111217);
+            pushFollow(FOLLOW_2);
             rule__XConstantListLiteral__Group_3_1__1__Impl();
 
             state._fsp--;
@@ -16698,25 +16698,25 @@ public final void rule__XConstantListLiteral__Group_3_1__1() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstantListLiteral__Group_3_1__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5277:1: rule__XConstantListLiteral__Group_3_1__1__Impl : ( ( rule__XConstantListLiteral__ElementsAssignment_3_1_1 ) ) ;
+    // InternalCheckCfg.g:5277:1: rule__XConstantListLiteral__Group_3_1__1__Impl : ( ( rule__XConstantListLiteral__ElementsAssignment_3_1_1 ) ) ;
     public final void rule__XConstantListLiteral__Group_3_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5281:1: ( ( ( rule__XConstantListLiteral__ElementsAssignment_3_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5282:1: ( ( rule__XConstantListLiteral__ElementsAssignment_3_1_1 ) )
+            // InternalCheckCfg.g:5281:1: ( ( ( rule__XConstantListLiteral__ElementsAssignment_3_1_1 ) ) )
+            // InternalCheckCfg.g:5282:1: ( ( rule__XConstantListLiteral__ElementsAssignment_3_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5282:1: ( ( rule__XConstantListLiteral__ElementsAssignment_3_1_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5283:1: ( rule__XConstantListLiteral__ElementsAssignment_3_1_1 )
+            // InternalCheckCfg.g:5282:1: ( ( rule__XConstantListLiteral__ElementsAssignment_3_1_1 ) )
+            // InternalCheckCfg.g:5283:1: ( rule__XConstantListLiteral__ElementsAssignment_3_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantListLiteralAccess().getElementsAssignment_3_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5284:1: ( rule__XConstantListLiteral__ElementsAssignment_3_1_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5284:2: rule__XConstantListLiteral__ElementsAssignment_3_1_1
+            // InternalCheckCfg.g:5284:1: ( rule__XConstantListLiteral__ElementsAssignment_3_1_1 )
+            // InternalCheckCfg.g:5284:2: rule__XConstantListLiteral__ElementsAssignment_3_1_1
             {
-            pushFollow(FOLLOW_rule__XConstantListLiteral__ElementsAssignment_3_1_1_in_rule__XConstantListLiteral__Group_3_1__1__Impl11244);
+            pushFollow(FOLLOW_2);
             rule__XConstantListLiteral__ElementsAssignment_3_1_1();
 
             state._fsp--;
@@ -16749,21 +16749,21 @@ public final void rule__XConstantListLiteral__Group_3_1__1__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XAssignment__Group_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5298:1: rule__XAssignment__Group_0__0 : rule__XAssignment__Group_0__0__Impl rule__XAssignment__Group_0__1 ;
+    // InternalCheckCfg.g:5298:1: rule__XAssignment__Group_0__0 : rule__XAssignment__Group_0__0__Impl rule__XAssignment__Group_0__1 ;
     public final void rule__XAssignment__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5302:1: ( rule__XAssignment__Group_0__0__Impl rule__XAssignment__Group_0__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5303:2: rule__XAssignment__Group_0__0__Impl rule__XAssignment__Group_0__1
+            // InternalCheckCfg.g:5302:1: ( rule__XAssignment__Group_0__0__Impl rule__XAssignment__Group_0__1 )
+            // InternalCheckCfg.g:5303:2: rule__XAssignment__Group_0__0__Impl rule__XAssignment__Group_0__1
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_0__0__Impl_in_rule__XAssignment__Group_0__011278);
+            pushFollow(FOLLOW_26);
             rule__XAssignment__Group_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAssignment__Group_0__1_in_rule__XAssignment__Group_0__011281);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__Group_0__1();
 
             state._fsp--;
@@ -16787,23 +16787,23 @@ public final void rule__XAssignment__Group_0__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAssignment__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5310:1: rule__XAssignment__Group_0__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:5310:1: rule__XAssignment__Group_0__0__Impl : ( () ) ;
     public final void rule__XAssignment__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5314:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5315:1: ( () )
+            // InternalCheckCfg.g:5314:1: ( ( () ) )
+            // InternalCheckCfg.g:5315:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5315:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5316:1: ()
+            // InternalCheckCfg.g:5315:1: ( () )
+            // InternalCheckCfg.g:5316:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getXAssignmentAction_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5317:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5319:1: 
+            // InternalCheckCfg.g:5317:1: ()
+            // InternalCheckCfg.g:5319:1: 
             {
             }
 
@@ -16828,21 +16828,21 @@ public final void rule__XAssignment__Group_0__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAssignment__Group_0__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5329:1: rule__XAssignment__Group_0__1 : rule__XAssignment__Group_0__1__Impl rule__XAssignment__Group_0__2 ;
+    // InternalCheckCfg.g:5329:1: rule__XAssignment__Group_0__1 : rule__XAssignment__Group_0__1__Impl rule__XAssignment__Group_0__2 ;
     public final void rule__XAssignment__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5333:1: ( rule__XAssignment__Group_0__1__Impl rule__XAssignment__Group_0__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5334:2: rule__XAssignment__Group_0__1__Impl rule__XAssignment__Group_0__2
+            // InternalCheckCfg.g:5333:1: ( rule__XAssignment__Group_0__1__Impl rule__XAssignment__Group_0__2 )
+            // InternalCheckCfg.g:5334:2: rule__XAssignment__Group_0__1__Impl rule__XAssignment__Group_0__2
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_0__1__Impl_in_rule__XAssignment__Group_0__111339);
+            pushFollow(FOLLOW_19);
             rule__XAssignment__Group_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAssignment__Group_0__2_in_rule__XAssignment__Group_0__111342);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__Group_0__2();
 
             state._fsp--;
@@ -16866,25 +16866,25 @@ public final void rule__XAssignment__Group_0__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAssignment__Group_0__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5341:1: rule__XAssignment__Group_0__1__Impl : ( ( rule__XAssignment__FeatureAssignment_0_1 ) ) ;
+    // InternalCheckCfg.g:5341:1: rule__XAssignment__Group_0__1__Impl : ( ( rule__XAssignment__FeatureAssignment_0_1 ) ) ;
     public final void rule__XAssignment__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5345:1: ( ( ( rule__XAssignment__FeatureAssignment_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5346:1: ( ( rule__XAssignment__FeatureAssignment_0_1 ) )
+            // InternalCheckCfg.g:5345:1: ( ( ( rule__XAssignment__FeatureAssignment_0_1 ) ) )
+            // InternalCheckCfg.g:5346:1: ( ( rule__XAssignment__FeatureAssignment_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5346:1: ( ( rule__XAssignment__FeatureAssignment_0_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5347:1: ( rule__XAssignment__FeatureAssignment_0_1 )
+            // InternalCheckCfg.g:5346:1: ( ( rule__XAssignment__FeatureAssignment_0_1 ) )
+            // InternalCheckCfg.g:5347:1: ( rule__XAssignment__FeatureAssignment_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getFeatureAssignment_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5348:1: ( rule__XAssignment__FeatureAssignment_0_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5348:2: rule__XAssignment__FeatureAssignment_0_1
+            // InternalCheckCfg.g:5348:1: ( rule__XAssignment__FeatureAssignment_0_1 )
+            // InternalCheckCfg.g:5348:2: rule__XAssignment__FeatureAssignment_0_1
             {
-            pushFollow(FOLLOW_rule__XAssignment__FeatureAssignment_0_1_in_rule__XAssignment__Group_0__1__Impl11369);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__FeatureAssignment_0_1();
 
             state._fsp--;
@@ -16917,21 +16917,21 @@ public final void rule__XAssignment__Group_0__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAssignment__Group_0__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5358:1: rule__XAssignment__Group_0__2 : rule__XAssignment__Group_0__2__Impl rule__XAssignment__Group_0__3 ;
+    // InternalCheckCfg.g:5358:1: rule__XAssignment__Group_0__2 : rule__XAssignment__Group_0__2__Impl rule__XAssignment__Group_0__3 ;
     public final void rule__XAssignment__Group_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5362:1: ( rule__XAssignment__Group_0__2__Impl rule__XAssignment__Group_0__3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5363:2: rule__XAssignment__Group_0__2__Impl rule__XAssignment__Group_0__3
+            // InternalCheckCfg.g:5362:1: ( rule__XAssignment__Group_0__2__Impl rule__XAssignment__Group_0__3 )
+            // InternalCheckCfg.g:5363:2: rule__XAssignment__Group_0__2__Impl rule__XAssignment__Group_0__3
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_0__2__Impl_in_rule__XAssignment__Group_0__211399);
+            pushFollow(FOLLOW_27);
             rule__XAssignment__Group_0__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAssignment__Group_0__3_in_rule__XAssignment__Group_0__211402);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__Group_0__3();
 
             state._fsp--;
@@ -16955,22 +16955,22 @@ public final void rule__XAssignment__Group_0__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAssignment__Group_0__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5370:1: rule__XAssignment__Group_0__2__Impl : ( ruleOpSingleAssign ) ;
+    // InternalCheckCfg.g:5370:1: rule__XAssignment__Group_0__2__Impl : ( ruleOpSingleAssign ) ;
     public final void rule__XAssignment__Group_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5374:1: ( ( ruleOpSingleAssign ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5375:1: ( ruleOpSingleAssign )
+            // InternalCheckCfg.g:5374:1: ( ( ruleOpSingleAssign ) )
+            // InternalCheckCfg.g:5375:1: ( ruleOpSingleAssign )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5375:1: ( ruleOpSingleAssign )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5376:1: ruleOpSingleAssign
+            // InternalCheckCfg.g:5375:1: ( ruleOpSingleAssign )
+            // InternalCheckCfg.g:5376:1: ruleOpSingleAssign
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getOpSingleAssignParserRuleCall_0_2()); 
             }
-            pushFollow(FOLLOW_ruleOpSingleAssign_in_rule__XAssignment__Group_0__2__Impl11429);
+            pushFollow(FOLLOW_2);
             ruleOpSingleAssign();
 
             state._fsp--;
@@ -17000,16 +17000,16 @@ public final void rule__XAssignment__Group_0__2__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAssignment__Group_0__3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5387:1: rule__XAssignment__Group_0__3 : rule__XAssignment__Group_0__3__Impl ;
+    // InternalCheckCfg.g:5387:1: rule__XAssignment__Group_0__3 : rule__XAssignment__Group_0__3__Impl ;
     public final void rule__XAssignment__Group_0__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5391:1: ( rule__XAssignment__Group_0__3__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5392:2: rule__XAssignment__Group_0__3__Impl
+            // InternalCheckCfg.g:5391:1: ( rule__XAssignment__Group_0__3__Impl )
+            // InternalCheckCfg.g:5392:2: rule__XAssignment__Group_0__3__Impl
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_0__3__Impl_in_rule__XAssignment__Group_0__311458);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__Group_0__3__Impl();
 
             state._fsp--;
@@ -17033,25 +17033,25 @@ public final void rule__XAssignment__Group_0__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAssignment__Group_0__3__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5398:1: rule__XAssignment__Group_0__3__Impl : ( ( rule__XAssignment__ValueAssignment_0_3 ) ) ;
+    // InternalCheckCfg.g:5398:1: rule__XAssignment__Group_0__3__Impl : ( ( rule__XAssignment__ValueAssignment_0_3 ) ) ;
     public final void rule__XAssignment__Group_0__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5402:1: ( ( ( rule__XAssignment__ValueAssignment_0_3 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5403:1: ( ( rule__XAssignment__ValueAssignment_0_3 ) )
+            // InternalCheckCfg.g:5402:1: ( ( ( rule__XAssignment__ValueAssignment_0_3 ) ) )
+            // InternalCheckCfg.g:5403:1: ( ( rule__XAssignment__ValueAssignment_0_3 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5403:1: ( ( rule__XAssignment__ValueAssignment_0_3 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5404:1: ( rule__XAssignment__ValueAssignment_0_3 )
+            // InternalCheckCfg.g:5403:1: ( ( rule__XAssignment__ValueAssignment_0_3 ) )
+            // InternalCheckCfg.g:5404:1: ( rule__XAssignment__ValueAssignment_0_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getValueAssignment_0_3()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5405:1: ( rule__XAssignment__ValueAssignment_0_3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5405:2: rule__XAssignment__ValueAssignment_0_3
+            // InternalCheckCfg.g:5405:1: ( rule__XAssignment__ValueAssignment_0_3 )
+            // InternalCheckCfg.g:5405:2: rule__XAssignment__ValueAssignment_0_3
             {
-            pushFollow(FOLLOW_rule__XAssignment__ValueAssignment_0_3_in_rule__XAssignment__Group_0__3__Impl11485);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__ValueAssignment_0_3();
 
             state._fsp--;
@@ -17084,21 +17084,21 @@ public final void rule__XAssignment__Group_0__3__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAssignment__Group_1__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5423:1: rule__XAssignment__Group_1__0 : rule__XAssignment__Group_1__0__Impl rule__XAssignment__Group_1__1 ;
+    // InternalCheckCfg.g:5423:1: rule__XAssignment__Group_1__0 : rule__XAssignment__Group_1__0__Impl rule__XAssignment__Group_1__1 ;
     public final void rule__XAssignment__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5427:1: ( rule__XAssignment__Group_1__0__Impl rule__XAssignment__Group_1__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5428:2: rule__XAssignment__Group_1__0__Impl rule__XAssignment__Group_1__1
+            // InternalCheckCfg.g:5427:1: ( rule__XAssignment__Group_1__0__Impl rule__XAssignment__Group_1__1 )
+            // InternalCheckCfg.g:5428:2: rule__XAssignment__Group_1__0__Impl rule__XAssignment__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_1__0__Impl_in_rule__XAssignment__Group_1__011523);
+            pushFollow(FOLLOW_28);
             rule__XAssignment__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAssignment__Group_1__1_in_rule__XAssignment__Group_1__011526);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__Group_1__1();
 
             state._fsp--;
@@ -17122,22 +17122,22 @@ public final void rule__XAssignment__Group_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAssignment__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5435:1: rule__XAssignment__Group_1__0__Impl : ( ruleXOrExpression ) ;
+    // InternalCheckCfg.g:5435:1: rule__XAssignment__Group_1__0__Impl : ( ruleXOrExpression ) ;
     public final void rule__XAssignment__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5439:1: ( ( ruleXOrExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5440:1: ( ruleXOrExpression )
+            // InternalCheckCfg.g:5439:1: ( ( ruleXOrExpression ) )
+            // InternalCheckCfg.g:5440:1: ( ruleXOrExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5440:1: ( ruleXOrExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5441:1: ruleXOrExpression
+            // InternalCheckCfg.g:5440:1: ( ruleXOrExpression )
+            // InternalCheckCfg.g:5441:1: ruleXOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getXOrExpressionParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXOrExpression_in_rule__XAssignment__Group_1__0__Impl11553);
+            pushFollow(FOLLOW_2);
             ruleXOrExpression();
 
             state._fsp--;
@@ -17167,16 +17167,16 @@ public final void rule__XAssignment__Group_1__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAssignment__Group_1__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5452:1: rule__XAssignment__Group_1__1 : rule__XAssignment__Group_1__1__Impl ;
+    // InternalCheckCfg.g:5452:1: rule__XAssignment__Group_1__1 : rule__XAssignment__Group_1__1__Impl ;
     public final void rule__XAssignment__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5456:1: ( rule__XAssignment__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5457:2: rule__XAssignment__Group_1__1__Impl
+            // InternalCheckCfg.g:5456:1: ( rule__XAssignment__Group_1__1__Impl )
+            // InternalCheckCfg.g:5457:2: rule__XAssignment__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_1__1__Impl_in_rule__XAssignment__Group_1__111582);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__Group_1__1__Impl();
 
             state._fsp--;
@@ -17200,29 +17200,29 @@ public final void rule__XAssignment__Group_1__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAssignment__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5463:1: rule__XAssignment__Group_1__1__Impl : ( ( rule__XAssignment__Group_1_1__0 )? ) ;
+    // InternalCheckCfg.g:5463:1: rule__XAssignment__Group_1__1__Impl : ( ( rule__XAssignment__Group_1_1__0 )? ) ;
     public final void rule__XAssignment__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5467:1: ( ( ( rule__XAssignment__Group_1_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5468:1: ( ( rule__XAssignment__Group_1_1__0 )? )
+            // InternalCheckCfg.g:5467:1: ( ( ( rule__XAssignment__Group_1_1__0 )? ) )
+            // InternalCheckCfg.g:5468:1: ( ( rule__XAssignment__Group_1_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5468:1: ( ( rule__XAssignment__Group_1_1__0 )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5469:1: ( rule__XAssignment__Group_1_1__0 )?
+            // InternalCheckCfg.g:5468:1: ( ( rule__XAssignment__Group_1_1__0 )? )
+            // InternalCheckCfg.g:5469:1: ( rule__XAssignment__Group_1_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getGroup_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5470:1: ( rule__XAssignment__Group_1_1__0 )?
+            // InternalCheckCfg.g:5470:1: ( rule__XAssignment__Group_1_1__0 )?
             int alt57=2;
             alt57 = dfa57.predict(input);
             switch (alt57) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5470:2: rule__XAssignment__Group_1_1__0
+                    // InternalCheckCfg.g:5470:2: rule__XAssignment__Group_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__XAssignment__Group_1_1__0_in_rule__XAssignment__Group_1__1__Impl11609);
+                    pushFollow(FOLLOW_2);
                     rule__XAssignment__Group_1_1__0();
 
                     state._fsp--;
@@ -17258,21 +17258,21 @@ public final void rule__XAssignment__Group_1__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5484:1: rule__XAssignment__Group_1_1__0 : rule__XAssignment__Group_1_1__0__Impl rule__XAssignment__Group_1_1__1 ;
+    // InternalCheckCfg.g:5484:1: rule__XAssignment__Group_1_1__0 : rule__XAssignment__Group_1_1__0__Impl rule__XAssignment__Group_1_1__1 ;
     public final void rule__XAssignment__Group_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5488:1: ( rule__XAssignment__Group_1_1__0__Impl rule__XAssignment__Group_1_1__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5489:2: rule__XAssignment__Group_1_1__0__Impl rule__XAssignment__Group_1_1__1
+            // InternalCheckCfg.g:5488:1: ( rule__XAssignment__Group_1_1__0__Impl rule__XAssignment__Group_1_1__1 )
+            // InternalCheckCfg.g:5489:2: rule__XAssignment__Group_1_1__0__Impl rule__XAssignment__Group_1_1__1
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_1_1__0__Impl_in_rule__XAssignment__Group_1_1__011644);
+            pushFollow(FOLLOW_27);
             rule__XAssignment__Group_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAssignment__Group_1_1__1_in_rule__XAssignment__Group_1_1__011647);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__Group_1_1__1();
 
             state._fsp--;
@@ -17296,25 +17296,25 @@ public final void rule__XAssignment__Group_1_1__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5496:1: rule__XAssignment__Group_1_1__0__Impl : ( ( rule__XAssignment__Group_1_1_0__0 ) ) ;
+    // InternalCheckCfg.g:5496:1: rule__XAssignment__Group_1_1__0__Impl : ( ( rule__XAssignment__Group_1_1_0__0 ) ) ;
     public final void rule__XAssignment__Group_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5500:1: ( ( ( rule__XAssignment__Group_1_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5501:1: ( ( rule__XAssignment__Group_1_1_0__0 ) )
+            // InternalCheckCfg.g:5500:1: ( ( ( rule__XAssignment__Group_1_1_0__0 ) ) )
+            // InternalCheckCfg.g:5501:1: ( ( rule__XAssignment__Group_1_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5501:1: ( ( rule__XAssignment__Group_1_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5502:1: ( rule__XAssignment__Group_1_1_0__0 )
+            // InternalCheckCfg.g:5501:1: ( ( rule__XAssignment__Group_1_1_0__0 ) )
+            // InternalCheckCfg.g:5502:1: ( rule__XAssignment__Group_1_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getGroup_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5503:1: ( rule__XAssignment__Group_1_1_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5503:2: rule__XAssignment__Group_1_1_0__0
+            // InternalCheckCfg.g:5503:1: ( rule__XAssignment__Group_1_1_0__0 )
+            // InternalCheckCfg.g:5503:2: rule__XAssignment__Group_1_1_0__0
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_1_1_0__0_in_rule__XAssignment__Group_1_1__0__Impl11674);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__Group_1_1_0__0();
 
             state._fsp--;
@@ -17347,16 +17347,16 @@ public final void rule__XAssignment__Group_1_1__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5513:1: rule__XAssignment__Group_1_1__1 : rule__XAssignment__Group_1_1__1__Impl ;
+    // InternalCheckCfg.g:5513:1: rule__XAssignment__Group_1_1__1 : rule__XAssignment__Group_1_1__1__Impl ;
     public final void rule__XAssignment__Group_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5517:1: ( rule__XAssignment__Group_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5518:2: rule__XAssignment__Group_1_1__1__Impl
+            // InternalCheckCfg.g:5517:1: ( rule__XAssignment__Group_1_1__1__Impl )
+            // InternalCheckCfg.g:5518:2: rule__XAssignment__Group_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_1_1__1__Impl_in_rule__XAssignment__Group_1_1__111704);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__Group_1_1__1__Impl();
 
             state._fsp--;
@@ -17380,25 +17380,25 @@ public final void rule__XAssignment__Group_1_1__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5524:1: rule__XAssignment__Group_1_1__1__Impl : ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) ) ;
+    // InternalCheckCfg.g:5524:1: rule__XAssignment__Group_1_1__1__Impl : ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) ) ;
     public final void rule__XAssignment__Group_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5528:1: ( ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5529:1: ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) )
+            // InternalCheckCfg.g:5528:1: ( ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) ) )
+            // InternalCheckCfg.g:5529:1: ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5529:1: ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5530:1: ( rule__XAssignment__RightOperandAssignment_1_1_1 )
+            // InternalCheckCfg.g:5529:1: ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) )
+            // InternalCheckCfg.g:5530:1: ( rule__XAssignment__RightOperandAssignment_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getRightOperandAssignment_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5531:1: ( rule__XAssignment__RightOperandAssignment_1_1_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5531:2: rule__XAssignment__RightOperandAssignment_1_1_1
+            // InternalCheckCfg.g:5531:1: ( rule__XAssignment__RightOperandAssignment_1_1_1 )
+            // InternalCheckCfg.g:5531:2: rule__XAssignment__RightOperandAssignment_1_1_1
             {
-            pushFollow(FOLLOW_rule__XAssignment__RightOperandAssignment_1_1_1_in_rule__XAssignment__Group_1_1__1__Impl11731);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__RightOperandAssignment_1_1_1();
 
             state._fsp--;
@@ -17431,16 +17431,16 @@ public final void rule__XAssignment__Group_1_1__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5545:1: rule__XAssignment__Group_1_1_0__0 : rule__XAssignment__Group_1_1_0__0__Impl ;
+    // InternalCheckCfg.g:5545:1: rule__XAssignment__Group_1_1_0__0 : rule__XAssignment__Group_1_1_0__0__Impl ;
     public final void rule__XAssignment__Group_1_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5549:1: ( rule__XAssignment__Group_1_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5550:2: rule__XAssignment__Group_1_1_0__0__Impl
+            // InternalCheckCfg.g:5549:1: ( rule__XAssignment__Group_1_1_0__0__Impl )
+            // InternalCheckCfg.g:5550:2: rule__XAssignment__Group_1_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_1_1_0__0__Impl_in_rule__XAssignment__Group_1_1_0__011765);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__Group_1_1_0__0__Impl();
 
             state._fsp--;
@@ -17464,25 +17464,25 @@ public final void rule__XAssignment__Group_1_1_0__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5556:1: rule__XAssignment__Group_1_1_0__0__Impl : ( ( rule__XAssignment__Group_1_1_0_0__0 ) ) ;
+    // InternalCheckCfg.g:5556:1: rule__XAssignment__Group_1_1_0__0__Impl : ( ( rule__XAssignment__Group_1_1_0_0__0 ) ) ;
     public final void rule__XAssignment__Group_1_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5560:1: ( ( ( rule__XAssignment__Group_1_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5561:1: ( ( rule__XAssignment__Group_1_1_0_0__0 ) )
+            // InternalCheckCfg.g:5560:1: ( ( ( rule__XAssignment__Group_1_1_0_0__0 ) ) )
+            // InternalCheckCfg.g:5561:1: ( ( rule__XAssignment__Group_1_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5561:1: ( ( rule__XAssignment__Group_1_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5562:1: ( rule__XAssignment__Group_1_1_0_0__0 )
+            // InternalCheckCfg.g:5561:1: ( ( rule__XAssignment__Group_1_1_0_0__0 ) )
+            // InternalCheckCfg.g:5562:1: ( rule__XAssignment__Group_1_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getGroup_1_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5563:1: ( rule__XAssignment__Group_1_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5563:2: rule__XAssignment__Group_1_1_0_0__0
+            // InternalCheckCfg.g:5563:1: ( rule__XAssignment__Group_1_1_0_0__0 )
+            // InternalCheckCfg.g:5563:2: rule__XAssignment__Group_1_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_1_1_0_0__0_in_rule__XAssignment__Group_1_1_0__0__Impl11792);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__Group_1_1_0_0__0();
 
             state._fsp--;
@@ -17515,21 +17515,21 @@ public final void rule__XAssignment__Group_1_1_0__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1_0_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5575:1: rule__XAssignment__Group_1_1_0_0__0 : rule__XAssignment__Group_1_1_0_0__0__Impl rule__XAssignment__Group_1_1_0_0__1 ;
+    // InternalCheckCfg.g:5575:1: rule__XAssignment__Group_1_1_0_0__0 : rule__XAssignment__Group_1_1_0_0__0__Impl rule__XAssignment__Group_1_1_0_0__1 ;
     public final void rule__XAssignment__Group_1_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5579:1: ( rule__XAssignment__Group_1_1_0_0__0__Impl rule__XAssignment__Group_1_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5580:2: rule__XAssignment__Group_1_1_0_0__0__Impl rule__XAssignment__Group_1_1_0_0__1
+            // InternalCheckCfg.g:5579:1: ( rule__XAssignment__Group_1_1_0_0__0__Impl rule__XAssignment__Group_1_1_0_0__1 )
+            // InternalCheckCfg.g:5580:2: rule__XAssignment__Group_1_1_0_0__0__Impl rule__XAssignment__Group_1_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_1_1_0_0__0__Impl_in_rule__XAssignment__Group_1_1_0_0__011824);
+            pushFollow(FOLLOW_28);
             rule__XAssignment__Group_1_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAssignment__Group_1_1_0_0__1_in_rule__XAssignment__Group_1_1_0_0__011827);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__Group_1_1_0_0__1();
 
             state._fsp--;
@@ -17553,23 +17553,23 @@ public final void rule__XAssignment__Group_1_1_0_0__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5587:1: rule__XAssignment__Group_1_1_0_0__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:5587:1: rule__XAssignment__Group_1_1_0_0__0__Impl : ( () ) ;
     public final void rule__XAssignment__Group_1_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5591:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5592:1: ( () )
+            // InternalCheckCfg.g:5591:1: ( ( () ) )
+            // InternalCheckCfg.g:5592:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5592:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5593:1: ()
+            // InternalCheckCfg.g:5592:1: ( () )
+            // InternalCheckCfg.g:5593:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5594:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5596:1: 
+            // InternalCheckCfg.g:5594:1: ()
+            // InternalCheckCfg.g:5596:1: 
             {
             }
 
@@ -17594,16 +17594,16 @@ public final void rule__XAssignment__Group_1_1_0_0__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1_0_0__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5606:1: rule__XAssignment__Group_1_1_0_0__1 : rule__XAssignment__Group_1_1_0_0__1__Impl ;
+    // InternalCheckCfg.g:5606:1: rule__XAssignment__Group_1_1_0_0__1 : rule__XAssignment__Group_1_1_0_0__1__Impl ;
     public final void rule__XAssignment__Group_1_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5610:1: ( rule__XAssignment__Group_1_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5611:2: rule__XAssignment__Group_1_1_0_0__1__Impl
+            // InternalCheckCfg.g:5610:1: ( rule__XAssignment__Group_1_1_0_0__1__Impl )
+            // InternalCheckCfg.g:5611:2: rule__XAssignment__Group_1_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_1_1_0_0__1__Impl_in_rule__XAssignment__Group_1_1_0_0__111885);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__Group_1_1_0_0__1__Impl();
 
             state._fsp--;
@@ -17627,25 +17627,25 @@ public final void rule__XAssignment__Group_1_1_0_0__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5617:1: rule__XAssignment__Group_1_1_0_0__1__Impl : ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) ) ;
+    // InternalCheckCfg.g:5617:1: rule__XAssignment__Group_1_1_0_0__1__Impl : ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) ) ;
     public final void rule__XAssignment__Group_1_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5621:1: ( ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5622:1: ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) )
+            // InternalCheckCfg.g:5621:1: ( ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) ) )
+            // InternalCheckCfg.g:5622:1: ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5622:1: ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5623:1: ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 )
+            // InternalCheckCfg.g:5622:1: ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) )
+            // InternalCheckCfg.g:5623:1: ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getFeatureAssignment_1_1_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5624:1: ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5624:2: rule__XAssignment__FeatureAssignment_1_1_0_0_1
+            // InternalCheckCfg.g:5624:1: ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 )
+            // InternalCheckCfg.g:5624:2: rule__XAssignment__FeatureAssignment_1_1_0_0_1
             {
-            pushFollow(FOLLOW_rule__XAssignment__FeatureAssignment_1_1_0_0_1_in_rule__XAssignment__Group_1_1_0_0__1__Impl11912);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__FeatureAssignment_1_1_0_0_1();
 
             state._fsp--;
@@ -17678,21 +17678,21 @@ public final void rule__XAssignment__Group_1_1_0_0__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_5__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5638:1: rule__OpMultiAssign__Group_5__0 : rule__OpMultiAssign__Group_5__0__Impl rule__OpMultiAssign__Group_5__1 ;
+    // InternalCheckCfg.g:5638:1: rule__OpMultiAssign__Group_5__0 : rule__OpMultiAssign__Group_5__0__Impl rule__OpMultiAssign__Group_5__1 ;
     public final void rule__OpMultiAssign__Group_5__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5642:1: ( rule__OpMultiAssign__Group_5__0__Impl rule__OpMultiAssign__Group_5__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5643:2: rule__OpMultiAssign__Group_5__0__Impl rule__OpMultiAssign__Group_5__1
+            // InternalCheckCfg.g:5642:1: ( rule__OpMultiAssign__Group_5__0__Impl rule__OpMultiAssign__Group_5__1 )
+            // InternalCheckCfg.g:5643:2: rule__OpMultiAssign__Group_5__0__Impl rule__OpMultiAssign__Group_5__1
             {
-            pushFollow(FOLLOW_rule__OpMultiAssign__Group_5__0__Impl_in_rule__OpMultiAssign__Group_5__011946);
+            pushFollow(FOLLOW_29);
             rule__OpMultiAssign__Group_5__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OpMultiAssign__Group_5__1_in_rule__OpMultiAssign__Group_5__011949);
+            pushFollow(FOLLOW_2);
             rule__OpMultiAssign__Group_5__1();
 
             state._fsp--;
@@ -17716,22 +17716,22 @@ public final void rule__OpMultiAssign__Group_5__0() throws RecognitionException
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_5__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5650:1: rule__OpMultiAssign__Group_5__0__Impl : ( '<' ) ;
+    // InternalCheckCfg.g:5650:1: rule__OpMultiAssign__Group_5__0__Impl : ( '<' ) ;
     public final void rule__OpMultiAssign__Group_5__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5654:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5655:1: ( '<' )
+            // InternalCheckCfg.g:5654:1: ( ( '<' ) )
+            // InternalCheckCfg.g:5655:1: ( '<' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5655:1: ( '<' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5656:1: '<'
+            // InternalCheckCfg.g:5655:1: ( '<' )
+            // InternalCheckCfg.g:5656:1: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignAccess().getLessThanSignKeyword_5_0()); 
             }
-            match(input,27,FOLLOW_27_in_rule__OpMultiAssign__Group_5__0__Impl11977); if (state.failed) return ;
+            match(input,27,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpMultiAssignAccess().getLessThanSignKeyword_5_0()); 
             }
@@ -17757,21 +17757,21 @@ public final void rule__OpMultiAssign__Group_5__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_5__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5669:1: rule__OpMultiAssign__Group_5__1 : rule__OpMultiAssign__Group_5__1__Impl rule__OpMultiAssign__Group_5__2 ;
+    // InternalCheckCfg.g:5669:1: rule__OpMultiAssign__Group_5__1 : rule__OpMultiAssign__Group_5__1__Impl rule__OpMultiAssign__Group_5__2 ;
     public final void rule__OpMultiAssign__Group_5__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5673:1: ( rule__OpMultiAssign__Group_5__1__Impl rule__OpMultiAssign__Group_5__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5674:2: rule__OpMultiAssign__Group_5__1__Impl rule__OpMultiAssign__Group_5__2
+            // InternalCheckCfg.g:5673:1: ( rule__OpMultiAssign__Group_5__1__Impl rule__OpMultiAssign__Group_5__2 )
+            // InternalCheckCfg.g:5674:2: rule__OpMultiAssign__Group_5__1__Impl rule__OpMultiAssign__Group_5__2
             {
-            pushFollow(FOLLOW_rule__OpMultiAssign__Group_5__1__Impl_in_rule__OpMultiAssign__Group_5__112008);
+            pushFollow(FOLLOW_19);
             rule__OpMultiAssign__Group_5__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OpMultiAssign__Group_5__2_in_rule__OpMultiAssign__Group_5__112011);
+            pushFollow(FOLLOW_2);
             rule__OpMultiAssign__Group_5__2();
 
             state._fsp--;
@@ -17795,22 +17795,22 @@ public final void rule__OpMultiAssign__Group_5__1() throws RecognitionException
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_5__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5681:1: rule__OpMultiAssign__Group_5__1__Impl : ( '<' ) ;
+    // InternalCheckCfg.g:5681:1: rule__OpMultiAssign__Group_5__1__Impl : ( '<' ) ;
     public final void rule__OpMultiAssign__Group_5__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5685:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5686:1: ( '<' )
+            // InternalCheckCfg.g:5685:1: ( ( '<' ) )
+            // InternalCheckCfg.g:5686:1: ( '<' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5686:1: ( '<' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5687:1: '<'
+            // InternalCheckCfg.g:5686:1: ( '<' )
+            // InternalCheckCfg.g:5687:1: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignAccess().getLessThanSignKeyword_5_1()); 
             }
-            match(input,27,FOLLOW_27_in_rule__OpMultiAssign__Group_5__1__Impl12039); if (state.failed) return ;
+            match(input,27,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpMultiAssignAccess().getLessThanSignKeyword_5_1()); 
             }
@@ -17836,16 +17836,16 @@ public final void rule__OpMultiAssign__Group_5__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_5__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5700:1: rule__OpMultiAssign__Group_5__2 : rule__OpMultiAssign__Group_5__2__Impl ;
+    // InternalCheckCfg.g:5700:1: rule__OpMultiAssign__Group_5__2 : rule__OpMultiAssign__Group_5__2__Impl ;
     public final void rule__OpMultiAssign__Group_5__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5704:1: ( rule__OpMultiAssign__Group_5__2__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5705:2: rule__OpMultiAssign__Group_5__2__Impl
+            // InternalCheckCfg.g:5704:1: ( rule__OpMultiAssign__Group_5__2__Impl )
+            // InternalCheckCfg.g:5705:2: rule__OpMultiAssign__Group_5__2__Impl
             {
-            pushFollow(FOLLOW_rule__OpMultiAssign__Group_5__2__Impl_in_rule__OpMultiAssign__Group_5__212070);
+            pushFollow(FOLLOW_2);
             rule__OpMultiAssign__Group_5__2__Impl();
 
             state._fsp--;
@@ -17869,22 +17869,22 @@ public final void rule__OpMultiAssign__Group_5__2() throws RecognitionException
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_5__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5711:1: rule__OpMultiAssign__Group_5__2__Impl : ( '=' ) ;
+    // InternalCheckCfg.g:5711:1: rule__OpMultiAssign__Group_5__2__Impl : ( '=' ) ;
     public final void rule__OpMultiAssign__Group_5__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5715:1: ( ( '=' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5716:1: ( '=' )
+            // InternalCheckCfg.g:5715:1: ( ( '=' ) )
+            // InternalCheckCfg.g:5716:1: ( '=' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5716:1: ( '=' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5717:1: '='
+            // InternalCheckCfg.g:5716:1: ( '=' )
+            // InternalCheckCfg.g:5717:1: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignAccess().getEqualsSignKeyword_5_2()); 
             }
-            match(input,13,FOLLOW_13_in_rule__OpMultiAssign__Group_5__2__Impl12098); if (state.failed) return ;
+            match(input,13,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpMultiAssignAccess().getEqualsSignKeyword_5_2()); 
             }
@@ -17910,21 +17910,21 @@ public final void rule__OpMultiAssign__Group_5__2__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_6__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5736:1: rule__OpMultiAssign__Group_6__0 : rule__OpMultiAssign__Group_6__0__Impl rule__OpMultiAssign__Group_6__1 ;
+    // InternalCheckCfg.g:5736:1: rule__OpMultiAssign__Group_6__0 : rule__OpMultiAssign__Group_6__0__Impl rule__OpMultiAssign__Group_6__1 ;
     public final void rule__OpMultiAssign__Group_6__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5740:1: ( rule__OpMultiAssign__Group_6__0__Impl rule__OpMultiAssign__Group_6__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5741:2: rule__OpMultiAssign__Group_6__0__Impl rule__OpMultiAssign__Group_6__1
+            // InternalCheckCfg.g:5740:1: ( rule__OpMultiAssign__Group_6__0__Impl rule__OpMultiAssign__Group_6__1 )
+            // InternalCheckCfg.g:5741:2: rule__OpMultiAssign__Group_6__0__Impl rule__OpMultiAssign__Group_6__1
             {
-            pushFollow(FOLLOW_rule__OpMultiAssign__Group_6__0__Impl_in_rule__OpMultiAssign__Group_6__012135);
+            pushFollow(FOLLOW_30);
             rule__OpMultiAssign__Group_6__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OpMultiAssign__Group_6__1_in_rule__OpMultiAssign__Group_6__012138);
+            pushFollow(FOLLOW_2);
             rule__OpMultiAssign__Group_6__1();
 
             state._fsp--;
@@ -17948,22 +17948,22 @@ public final void rule__OpMultiAssign__Group_6__0() throws RecognitionException
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_6__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5748:1: rule__OpMultiAssign__Group_6__0__Impl : ( '>' ) ;
+    // InternalCheckCfg.g:5748:1: rule__OpMultiAssign__Group_6__0__Impl : ( '>' ) ;
     public final void rule__OpMultiAssign__Group_6__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5752:1: ( ( '>' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5753:1: ( '>' )
+            // InternalCheckCfg.g:5752:1: ( ( '>' ) )
+            // InternalCheckCfg.g:5753:1: ( '>' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5753:1: ( '>' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5754:1: '>'
+            // InternalCheckCfg.g:5753:1: ( '>' )
+            // InternalCheckCfg.g:5754:1: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignAccess().getGreaterThanSignKeyword_6_0()); 
             }
-            match(input,26,FOLLOW_26_in_rule__OpMultiAssign__Group_6__0__Impl12166); if (state.failed) return ;
+            match(input,26,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpMultiAssignAccess().getGreaterThanSignKeyword_6_0()); 
             }
@@ -17989,21 +17989,21 @@ public final void rule__OpMultiAssign__Group_6__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_6__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5767:1: rule__OpMultiAssign__Group_6__1 : rule__OpMultiAssign__Group_6__1__Impl rule__OpMultiAssign__Group_6__2 ;
+    // InternalCheckCfg.g:5767:1: rule__OpMultiAssign__Group_6__1 : rule__OpMultiAssign__Group_6__1__Impl rule__OpMultiAssign__Group_6__2 ;
     public final void rule__OpMultiAssign__Group_6__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5771:1: ( rule__OpMultiAssign__Group_6__1__Impl rule__OpMultiAssign__Group_6__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5772:2: rule__OpMultiAssign__Group_6__1__Impl rule__OpMultiAssign__Group_6__2
+            // InternalCheckCfg.g:5771:1: ( rule__OpMultiAssign__Group_6__1__Impl rule__OpMultiAssign__Group_6__2 )
+            // InternalCheckCfg.g:5772:2: rule__OpMultiAssign__Group_6__1__Impl rule__OpMultiAssign__Group_6__2
             {
-            pushFollow(FOLLOW_rule__OpMultiAssign__Group_6__1__Impl_in_rule__OpMultiAssign__Group_6__112197);
+            pushFollow(FOLLOW_30);
             rule__OpMultiAssign__Group_6__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OpMultiAssign__Group_6__2_in_rule__OpMultiAssign__Group_6__112200);
+            pushFollow(FOLLOW_2);
             rule__OpMultiAssign__Group_6__2();
 
             state._fsp--;
@@ -18027,22 +18027,22 @@ public final void rule__OpMultiAssign__Group_6__1() throws RecognitionException
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_6__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5779:1: rule__OpMultiAssign__Group_6__1__Impl : ( ( '>' )? ) ;
+    // InternalCheckCfg.g:5779:1: rule__OpMultiAssign__Group_6__1__Impl : ( ( '>' )? ) ;
     public final void rule__OpMultiAssign__Group_6__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5783:1: ( ( ( '>' )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5784:1: ( ( '>' )? )
+            // InternalCheckCfg.g:5783:1: ( ( ( '>' )? ) )
+            // InternalCheckCfg.g:5784:1: ( ( '>' )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5784:1: ( ( '>' )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5785:1: ( '>' )?
+            // InternalCheckCfg.g:5784:1: ( ( '>' )? )
+            // InternalCheckCfg.g:5785:1: ( '>' )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignAccess().getGreaterThanSignKeyword_6_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5786:1: ( '>' )?
+            // InternalCheckCfg.g:5786:1: ( '>' )?
             int alt58=2;
             int LA58_0 = input.LA(1);
 
@@ -18051,9 +18051,9 @@ public final void rule__OpMultiAssign__Group_6__1__Impl() throws RecognitionExce
             }
             switch (alt58) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5787:2: '>'
+                    // InternalCheckCfg.g:5787:2: '>'
                     {
-                    match(input,26,FOLLOW_26_in_rule__OpMultiAssign__Group_6__1__Impl12229); if (state.failed) return ;
+                    match(input,26,FOLLOW_2); if (state.failed) return ;
 
                     }
                     break;
@@ -18085,16 +18085,16 @@ public final void rule__OpMultiAssign__Group_6__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_6__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5798:1: rule__OpMultiAssign__Group_6__2 : rule__OpMultiAssign__Group_6__2__Impl ;
+    // InternalCheckCfg.g:5798:1: rule__OpMultiAssign__Group_6__2 : rule__OpMultiAssign__Group_6__2__Impl ;
     public final void rule__OpMultiAssign__Group_6__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5802:1: ( rule__OpMultiAssign__Group_6__2__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5803:2: rule__OpMultiAssign__Group_6__2__Impl
+            // InternalCheckCfg.g:5802:1: ( rule__OpMultiAssign__Group_6__2__Impl )
+            // InternalCheckCfg.g:5803:2: rule__OpMultiAssign__Group_6__2__Impl
             {
-            pushFollow(FOLLOW_rule__OpMultiAssign__Group_6__2__Impl_in_rule__OpMultiAssign__Group_6__212262);
+            pushFollow(FOLLOW_2);
             rule__OpMultiAssign__Group_6__2__Impl();
 
             state._fsp--;
@@ -18118,22 +18118,22 @@ public final void rule__OpMultiAssign__Group_6__2() throws RecognitionException
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_6__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5809:1: rule__OpMultiAssign__Group_6__2__Impl : ( '>=' ) ;
+    // InternalCheckCfg.g:5809:1: rule__OpMultiAssign__Group_6__2__Impl : ( '>=' ) ;
     public final void rule__OpMultiAssign__Group_6__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5813:1: ( ( '>=' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5814:1: ( '>=' )
+            // InternalCheckCfg.g:5813:1: ( ( '>=' ) )
+            // InternalCheckCfg.g:5814:1: ( '>=' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5814:1: ( '>=' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5815:1: '>='
+            // InternalCheckCfg.g:5814:1: ( '>=' )
+            // InternalCheckCfg.g:5815:1: '>='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignAccess().getGreaterThanSignEqualsSignKeyword_6_2()); 
             }
-            match(input,25,FOLLOW_25_in_rule__OpMultiAssign__Group_6__2__Impl12290); if (state.failed) return ;
+            match(input,25,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpMultiAssignAccess().getGreaterThanSignEqualsSignKeyword_6_2()); 
             }
@@ -18159,21 +18159,21 @@ public final void rule__OpMultiAssign__Group_6__2__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XOrExpression__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5834:1: rule__XOrExpression__Group__0 : rule__XOrExpression__Group__0__Impl rule__XOrExpression__Group__1 ;
+    // InternalCheckCfg.g:5834:1: rule__XOrExpression__Group__0 : rule__XOrExpression__Group__0__Impl rule__XOrExpression__Group__1 ;
     public final void rule__XOrExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5838:1: ( rule__XOrExpression__Group__0__Impl rule__XOrExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5839:2: rule__XOrExpression__Group__0__Impl rule__XOrExpression__Group__1
+            // InternalCheckCfg.g:5838:1: ( rule__XOrExpression__Group__0__Impl rule__XOrExpression__Group__1 )
+            // InternalCheckCfg.g:5839:2: rule__XOrExpression__Group__0__Impl rule__XOrExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XOrExpression__Group__0__Impl_in_rule__XOrExpression__Group__012327);
+            pushFollow(FOLLOW_31);
             rule__XOrExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XOrExpression__Group__1_in_rule__XOrExpression__Group__012330);
+            pushFollow(FOLLOW_2);
             rule__XOrExpression__Group__1();
 
             state._fsp--;
@@ -18197,22 +18197,22 @@ public final void rule__XOrExpression__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XOrExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5846:1: rule__XOrExpression__Group__0__Impl : ( ruleXAndExpression ) ;
+    // InternalCheckCfg.g:5846:1: rule__XOrExpression__Group__0__Impl : ( ruleXAndExpression ) ;
     public final void rule__XOrExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5850:1: ( ( ruleXAndExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5851:1: ( ruleXAndExpression )
+            // InternalCheckCfg.g:5850:1: ( ( ruleXAndExpression ) )
+            // InternalCheckCfg.g:5851:1: ( ruleXAndExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5851:1: ( ruleXAndExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5852:1: ruleXAndExpression
+            // InternalCheckCfg.g:5851:1: ( ruleXAndExpression )
+            // InternalCheckCfg.g:5852:1: ruleXAndExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getXAndExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleXAndExpression_in_rule__XOrExpression__Group__0__Impl12357);
+            pushFollow(FOLLOW_2);
             ruleXAndExpression();
 
             state._fsp--;
@@ -18242,16 +18242,16 @@ public final void rule__XOrExpression__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XOrExpression__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5863:1: rule__XOrExpression__Group__1 : rule__XOrExpression__Group__1__Impl ;
+    // InternalCheckCfg.g:5863:1: rule__XOrExpression__Group__1 : rule__XOrExpression__Group__1__Impl ;
     public final void rule__XOrExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5867:1: ( rule__XOrExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5868:2: rule__XOrExpression__Group__1__Impl
+            // InternalCheckCfg.g:5867:1: ( rule__XOrExpression__Group__1__Impl )
+            // InternalCheckCfg.g:5868:2: rule__XOrExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XOrExpression__Group__1__Impl_in_rule__XOrExpression__Group__112386);
+            pushFollow(FOLLOW_2);
             rule__XOrExpression__Group__1__Impl();
 
             state._fsp--;
@@ -18275,22 +18275,22 @@ public final void rule__XOrExpression__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XOrExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5874:1: rule__XOrExpression__Group__1__Impl : ( ( rule__XOrExpression__Group_1__0 )* ) ;
+    // InternalCheckCfg.g:5874:1: rule__XOrExpression__Group__1__Impl : ( ( rule__XOrExpression__Group_1__0 )* ) ;
     public final void rule__XOrExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5878:1: ( ( ( rule__XOrExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5879:1: ( ( rule__XOrExpression__Group_1__0 )* )
+            // InternalCheckCfg.g:5878:1: ( ( ( rule__XOrExpression__Group_1__0 )* ) )
+            // InternalCheckCfg.g:5879:1: ( ( rule__XOrExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5879:1: ( ( rule__XOrExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5880:1: ( rule__XOrExpression__Group_1__0 )*
+            // InternalCheckCfg.g:5879:1: ( ( rule__XOrExpression__Group_1__0 )* )
+            // InternalCheckCfg.g:5880:1: ( rule__XOrExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5881:1: ( rule__XOrExpression__Group_1__0 )*
+            // InternalCheckCfg.g:5881:1: ( rule__XOrExpression__Group_1__0 )*
             loop59:
             do {
                 int alt59=2;
@@ -18309,9 +18309,9 @@ public final void rule__XOrExpression__Group__1__Impl() throws RecognitionExcept
 
                 switch (alt59) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5881:2: rule__XOrExpression__Group_1__0
+            	    // InternalCheckCfg.g:5881:2: rule__XOrExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XOrExpression__Group_1__0_in_rule__XOrExpression__Group__1__Impl12413);
+            	    pushFollow(FOLLOW_32);
             	    rule__XOrExpression__Group_1__0();
 
             	    state._fsp--;
@@ -18350,21 +18350,21 @@ public final void rule__XOrExpression__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XOrExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5895:1: rule__XOrExpression__Group_1__0 : rule__XOrExpression__Group_1__0__Impl rule__XOrExpression__Group_1__1 ;
+    // InternalCheckCfg.g:5895:1: rule__XOrExpression__Group_1__0 : rule__XOrExpression__Group_1__0__Impl rule__XOrExpression__Group_1__1 ;
     public final void rule__XOrExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5899:1: ( rule__XOrExpression__Group_1__0__Impl rule__XOrExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5900:2: rule__XOrExpression__Group_1__0__Impl rule__XOrExpression__Group_1__1
+            // InternalCheckCfg.g:5899:1: ( rule__XOrExpression__Group_1__0__Impl rule__XOrExpression__Group_1__1 )
+            // InternalCheckCfg.g:5900:2: rule__XOrExpression__Group_1__0__Impl rule__XOrExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XOrExpression__Group_1__0__Impl_in_rule__XOrExpression__Group_1__012448);
+            pushFollow(FOLLOW_27);
             rule__XOrExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XOrExpression__Group_1__1_in_rule__XOrExpression__Group_1__012451);
+            pushFollow(FOLLOW_2);
             rule__XOrExpression__Group_1__1();
 
             state._fsp--;
@@ -18388,25 +18388,25 @@ public final void rule__XOrExpression__Group_1__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XOrExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5907:1: rule__XOrExpression__Group_1__0__Impl : ( ( rule__XOrExpression__Group_1_0__0 ) ) ;
+    // InternalCheckCfg.g:5907:1: rule__XOrExpression__Group_1__0__Impl : ( ( rule__XOrExpression__Group_1_0__0 ) ) ;
     public final void rule__XOrExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5911:1: ( ( ( rule__XOrExpression__Group_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5912:1: ( ( rule__XOrExpression__Group_1_0__0 ) )
+            // InternalCheckCfg.g:5911:1: ( ( ( rule__XOrExpression__Group_1_0__0 ) ) )
+            // InternalCheckCfg.g:5912:1: ( ( rule__XOrExpression__Group_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5912:1: ( ( rule__XOrExpression__Group_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5913:1: ( rule__XOrExpression__Group_1_0__0 )
+            // InternalCheckCfg.g:5912:1: ( ( rule__XOrExpression__Group_1_0__0 ) )
+            // InternalCheckCfg.g:5913:1: ( rule__XOrExpression__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getGroup_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5914:1: ( rule__XOrExpression__Group_1_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5914:2: rule__XOrExpression__Group_1_0__0
+            // InternalCheckCfg.g:5914:1: ( rule__XOrExpression__Group_1_0__0 )
+            // InternalCheckCfg.g:5914:2: rule__XOrExpression__Group_1_0__0
             {
-            pushFollow(FOLLOW_rule__XOrExpression__Group_1_0__0_in_rule__XOrExpression__Group_1__0__Impl12478);
+            pushFollow(FOLLOW_2);
             rule__XOrExpression__Group_1_0__0();
 
             state._fsp--;
@@ -18439,16 +18439,16 @@ public final void rule__XOrExpression__Group_1__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XOrExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5924:1: rule__XOrExpression__Group_1__1 : rule__XOrExpression__Group_1__1__Impl ;
+    // InternalCheckCfg.g:5924:1: rule__XOrExpression__Group_1__1 : rule__XOrExpression__Group_1__1__Impl ;
     public final void rule__XOrExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5928:1: ( rule__XOrExpression__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5929:2: rule__XOrExpression__Group_1__1__Impl
+            // InternalCheckCfg.g:5928:1: ( rule__XOrExpression__Group_1__1__Impl )
+            // InternalCheckCfg.g:5929:2: rule__XOrExpression__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XOrExpression__Group_1__1__Impl_in_rule__XOrExpression__Group_1__112508);
+            pushFollow(FOLLOW_2);
             rule__XOrExpression__Group_1__1__Impl();
 
             state._fsp--;
@@ -18472,25 +18472,25 @@ public final void rule__XOrExpression__Group_1__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XOrExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5935:1: rule__XOrExpression__Group_1__1__Impl : ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) ) ;
+    // InternalCheckCfg.g:5935:1: rule__XOrExpression__Group_1__1__Impl : ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) ) ;
     public final void rule__XOrExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5939:1: ( ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5940:1: ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) )
+            // InternalCheckCfg.g:5939:1: ( ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) ) )
+            // InternalCheckCfg.g:5940:1: ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5940:1: ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5941:1: ( rule__XOrExpression__RightOperandAssignment_1_1 )
+            // InternalCheckCfg.g:5940:1: ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) )
+            // InternalCheckCfg.g:5941:1: ( rule__XOrExpression__RightOperandAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getRightOperandAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5942:1: ( rule__XOrExpression__RightOperandAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5942:2: rule__XOrExpression__RightOperandAssignment_1_1
+            // InternalCheckCfg.g:5942:1: ( rule__XOrExpression__RightOperandAssignment_1_1 )
+            // InternalCheckCfg.g:5942:2: rule__XOrExpression__RightOperandAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__XOrExpression__RightOperandAssignment_1_1_in_rule__XOrExpression__Group_1__1__Impl12535);
+            pushFollow(FOLLOW_2);
             rule__XOrExpression__RightOperandAssignment_1_1();
 
             state._fsp--;
@@ -18523,16 +18523,16 @@ public final void rule__XOrExpression__Group_1__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XOrExpression__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5956:1: rule__XOrExpression__Group_1_0__0 : rule__XOrExpression__Group_1_0__0__Impl ;
+    // InternalCheckCfg.g:5956:1: rule__XOrExpression__Group_1_0__0 : rule__XOrExpression__Group_1_0__0__Impl ;
     public final void rule__XOrExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5960:1: ( rule__XOrExpression__Group_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5961:2: rule__XOrExpression__Group_1_0__0__Impl
+            // InternalCheckCfg.g:5960:1: ( rule__XOrExpression__Group_1_0__0__Impl )
+            // InternalCheckCfg.g:5961:2: rule__XOrExpression__Group_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XOrExpression__Group_1_0__0__Impl_in_rule__XOrExpression__Group_1_0__012569);
+            pushFollow(FOLLOW_2);
             rule__XOrExpression__Group_1_0__0__Impl();
 
             state._fsp--;
@@ -18556,25 +18556,25 @@ public final void rule__XOrExpression__Group_1_0__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XOrExpression__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5967:1: rule__XOrExpression__Group_1_0__0__Impl : ( ( rule__XOrExpression__Group_1_0_0__0 ) ) ;
+    // InternalCheckCfg.g:5967:1: rule__XOrExpression__Group_1_0__0__Impl : ( ( rule__XOrExpression__Group_1_0_0__0 ) ) ;
     public final void rule__XOrExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5971:1: ( ( ( rule__XOrExpression__Group_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5972:1: ( ( rule__XOrExpression__Group_1_0_0__0 ) )
+            // InternalCheckCfg.g:5971:1: ( ( ( rule__XOrExpression__Group_1_0_0__0 ) ) )
+            // InternalCheckCfg.g:5972:1: ( ( rule__XOrExpression__Group_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5972:1: ( ( rule__XOrExpression__Group_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5973:1: ( rule__XOrExpression__Group_1_0_0__0 )
+            // InternalCheckCfg.g:5972:1: ( ( rule__XOrExpression__Group_1_0_0__0 ) )
+            // InternalCheckCfg.g:5973:1: ( rule__XOrExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getGroup_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5974:1: ( rule__XOrExpression__Group_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5974:2: rule__XOrExpression__Group_1_0_0__0
+            // InternalCheckCfg.g:5974:1: ( rule__XOrExpression__Group_1_0_0__0 )
+            // InternalCheckCfg.g:5974:2: rule__XOrExpression__Group_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XOrExpression__Group_1_0_0__0_in_rule__XOrExpression__Group_1_0__0__Impl12596);
+            pushFollow(FOLLOW_2);
             rule__XOrExpression__Group_1_0_0__0();
 
             state._fsp--;
@@ -18607,21 +18607,21 @@ public final void rule__XOrExpression__Group_1_0__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XOrExpression__Group_1_0_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5986:1: rule__XOrExpression__Group_1_0_0__0 : rule__XOrExpression__Group_1_0_0__0__Impl rule__XOrExpression__Group_1_0_0__1 ;
+    // InternalCheckCfg.g:5986:1: rule__XOrExpression__Group_1_0_0__0 : rule__XOrExpression__Group_1_0_0__0__Impl rule__XOrExpression__Group_1_0_0__1 ;
     public final void rule__XOrExpression__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5990:1: ( rule__XOrExpression__Group_1_0_0__0__Impl rule__XOrExpression__Group_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5991:2: rule__XOrExpression__Group_1_0_0__0__Impl rule__XOrExpression__Group_1_0_0__1
+            // InternalCheckCfg.g:5990:1: ( rule__XOrExpression__Group_1_0_0__0__Impl rule__XOrExpression__Group_1_0_0__1 )
+            // InternalCheckCfg.g:5991:2: rule__XOrExpression__Group_1_0_0__0__Impl rule__XOrExpression__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XOrExpression__Group_1_0_0__0__Impl_in_rule__XOrExpression__Group_1_0_0__012628);
+            pushFollow(FOLLOW_31);
             rule__XOrExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XOrExpression__Group_1_0_0__1_in_rule__XOrExpression__Group_1_0_0__012631);
+            pushFollow(FOLLOW_2);
             rule__XOrExpression__Group_1_0_0__1();
 
             state._fsp--;
@@ -18645,23 +18645,23 @@ public final void rule__XOrExpression__Group_1_0_0__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XOrExpression__Group_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5998:1: rule__XOrExpression__Group_1_0_0__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:5998:1: rule__XOrExpression__Group_1_0_0__0__Impl : ( () ) ;
     public final void rule__XOrExpression__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6002:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6003:1: ( () )
+            // InternalCheckCfg.g:6002:1: ( ( () ) )
+            // InternalCheckCfg.g:6003:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6003:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6004:1: ()
+            // InternalCheckCfg.g:6003:1: ( () )
+            // InternalCheckCfg.g:6004:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6005:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6007:1: 
+            // InternalCheckCfg.g:6005:1: ()
+            // InternalCheckCfg.g:6007:1: 
             {
             }
 
@@ -18686,16 +18686,16 @@ public final void rule__XOrExpression__Group_1_0_0__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XOrExpression__Group_1_0_0__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6017:1: rule__XOrExpression__Group_1_0_0__1 : rule__XOrExpression__Group_1_0_0__1__Impl ;
+    // InternalCheckCfg.g:6017:1: rule__XOrExpression__Group_1_0_0__1 : rule__XOrExpression__Group_1_0_0__1__Impl ;
     public final void rule__XOrExpression__Group_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6021:1: ( rule__XOrExpression__Group_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6022:2: rule__XOrExpression__Group_1_0_0__1__Impl
+            // InternalCheckCfg.g:6021:1: ( rule__XOrExpression__Group_1_0_0__1__Impl )
+            // InternalCheckCfg.g:6022:2: rule__XOrExpression__Group_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XOrExpression__Group_1_0_0__1__Impl_in_rule__XOrExpression__Group_1_0_0__112689);
+            pushFollow(FOLLOW_2);
             rule__XOrExpression__Group_1_0_0__1__Impl();
 
             state._fsp--;
@@ -18719,25 +18719,25 @@ public final void rule__XOrExpression__Group_1_0_0__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XOrExpression__Group_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6028:1: rule__XOrExpression__Group_1_0_0__1__Impl : ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) ) ;
+    // InternalCheckCfg.g:6028:1: rule__XOrExpression__Group_1_0_0__1__Impl : ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) ) ;
     public final void rule__XOrExpression__Group_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6032:1: ( ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6033:1: ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalCheckCfg.g:6032:1: ( ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) ) )
+            // InternalCheckCfg.g:6033:1: ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6033:1: ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6034:1: ( rule__XOrExpression__FeatureAssignment_1_0_0_1 )
+            // InternalCheckCfg.g:6033:1: ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalCheckCfg.g:6034:1: ( rule__XOrExpression__FeatureAssignment_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getFeatureAssignment_1_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6035:1: ( rule__XOrExpression__FeatureAssignment_1_0_0_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6035:2: rule__XOrExpression__FeatureAssignment_1_0_0_1
+            // InternalCheckCfg.g:6035:1: ( rule__XOrExpression__FeatureAssignment_1_0_0_1 )
+            // InternalCheckCfg.g:6035:2: rule__XOrExpression__FeatureAssignment_1_0_0_1
             {
-            pushFollow(FOLLOW_rule__XOrExpression__FeatureAssignment_1_0_0_1_in_rule__XOrExpression__Group_1_0_0__1__Impl12716);
+            pushFollow(FOLLOW_2);
             rule__XOrExpression__FeatureAssignment_1_0_0_1();
 
             state._fsp--;
@@ -18770,21 +18770,21 @@ public final void rule__XOrExpression__Group_1_0_0__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XAndExpression__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6049:1: rule__XAndExpression__Group__0 : rule__XAndExpression__Group__0__Impl rule__XAndExpression__Group__1 ;
+    // InternalCheckCfg.g:6049:1: rule__XAndExpression__Group__0 : rule__XAndExpression__Group__0__Impl rule__XAndExpression__Group__1 ;
     public final void rule__XAndExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6053:1: ( rule__XAndExpression__Group__0__Impl rule__XAndExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6054:2: rule__XAndExpression__Group__0__Impl rule__XAndExpression__Group__1
+            // InternalCheckCfg.g:6053:1: ( rule__XAndExpression__Group__0__Impl rule__XAndExpression__Group__1 )
+            // InternalCheckCfg.g:6054:2: rule__XAndExpression__Group__0__Impl rule__XAndExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XAndExpression__Group__0__Impl_in_rule__XAndExpression__Group__012750);
+            pushFollow(FOLLOW_33);
             rule__XAndExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAndExpression__Group__1_in_rule__XAndExpression__Group__012753);
+            pushFollow(FOLLOW_2);
             rule__XAndExpression__Group__1();
 
             state._fsp--;
@@ -18808,22 +18808,22 @@ public final void rule__XAndExpression__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAndExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6061:1: rule__XAndExpression__Group__0__Impl : ( ruleXEqualityExpression ) ;
+    // InternalCheckCfg.g:6061:1: rule__XAndExpression__Group__0__Impl : ( ruleXEqualityExpression ) ;
     public final void rule__XAndExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6065:1: ( ( ruleXEqualityExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6066:1: ( ruleXEqualityExpression )
+            // InternalCheckCfg.g:6065:1: ( ( ruleXEqualityExpression ) )
+            // InternalCheckCfg.g:6066:1: ( ruleXEqualityExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6066:1: ( ruleXEqualityExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6067:1: ruleXEqualityExpression
+            // InternalCheckCfg.g:6066:1: ( ruleXEqualityExpression )
+            // InternalCheckCfg.g:6067:1: ruleXEqualityExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getXEqualityExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleXEqualityExpression_in_rule__XAndExpression__Group__0__Impl12780);
+            pushFollow(FOLLOW_2);
             ruleXEqualityExpression();
 
             state._fsp--;
@@ -18853,16 +18853,16 @@ public final void rule__XAndExpression__Group__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XAndExpression__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6078:1: rule__XAndExpression__Group__1 : rule__XAndExpression__Group__1__Impl ;
+    // InternalCheckCfg.g:6078:1: rule__XAndExpression__Group__1 : rule__XAndExpression__Group__1__Impl ;
     public final void rule__XAndExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6082:1: ( rule__XAndExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6083:2: rule__XAndExpression__Group__1__Impl
+            // InternalCheckCfg.g:6082:1: ( rule__XAndExpression__Group__1__Impl )
+            // InternalCheckCfg.g:6083:2: rule__XAndExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAndExpression__Group__1__Impl_in_rule__XAndExpression__Group__112809);
+            pushFollow(FOLLOW_2);
             rule__XAndExpression__Group__1__Impl();
 
             state._fsp--;
@@ -18886,22 +18886,22 @@ public final void rule__XAndExpression__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAndExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6089:1: rule__XAndExpression__Group__1__Impl : ( ( rule__XAndExpression__Group_1__0 )* ) ;
+    // InternalCheckCfg.g:6089:1: rule__XAndExpression__Group__1__Impl : ( ( rule__XAndExpression__Group_1__0 )* ) ;
     public final void rule__XAndExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6093:1: ( ( ( rule__XAndExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6094:1: ( ( rule__XAndExpression__Group_1__0 )* )
+            // InternalCheckCfg.g:6093:1: ( ( ( rule__XAndExpression__Group_1__0 )* ) )
+            // InternalCheckCfg.g:6094:1: ( ( rule__XAndExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6094:1: ( ( rule__XAndExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6095:1: ( rule__XAndExpression__Group_1__0 )*
+            // InternalCheckCfg.g:6094:1: ( ( rule__XAndExpression__Group_1__0 )* )
+            // InternalCheckCfg.g:6095:1: ( rule__XAndExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6096:1: ( rule__XAndExpression__Group_1__0 )*
+            // InternalCheckCfg.g:6096:1: ( rule__XAndExpression__Group_1__0 )*
             loop60:
             do {
                 int alt60=2;
@@ -18920,9 +18920,9 @@ public final void rule__XAndExpression__Group__1__Impl() throws RecognitionExcep
 
                 switch (alt60) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6096:2: rule__XAndExpression__Group_1__0
+            	    // InternalCheckCfg.g:6096:2: rule__XAndExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XAndExpression__Group_1__0_in_rule__XAndExpression__Group__1__Impl12836);
+            	    pushFollow(FOLLOW_34);
             	    rule__XAndExpression__Group_1__0();
 
             	    state._fsp--;
@@ -18961,21 +18961,21 @@ public final void rule__XAndExpression__Group__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XAndExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6110:1: rule__XAndExpression__Group_1__0 : rule__XAndExpression__Group_1__0__Impl rule__XAndExpression__Group_1__1 ;
+    // InternalCheckCfg.g:6110:1: rule__XAndExpression__Group_1__0 : rule__XAndExpression__Group_1__0__Impl rule__XAndExpression__Group_1__1 ;
     public final void rule__XAndExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6114:1: ( rule__XAndExpression__Group_1__0__Impl rule__XAndExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6115:2: rule__XAndExpression__Group_1__0__Impl rule__XAndExpression__Group_1__1
+            // InternalCheckCfg.g:6114:1: ( rule__XAndExpression__Group_1__0__Impl rule__XAndExpression__Group_1__1 )
+            // InternalCheckCfg.g:6115:2: rule__XAndExpression__Group_1__0__Impl rule__XAndExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XAndExpression__Group_1__0__Impl_in_rule__XAndExpression__Group_1__012871);
+            pushFollow(FOLLOW_27);
             rule__XAndExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAndExpression__Group_1__1_in_rule__XAndExpression__Group_1__012874);
+            pushFollow(FOLLOW_2);
             rule__XAndExpression__Group_1__1();
 
             state._fsp--;
@@ -18999,25 +18999,25 @@ public final void rule__XAndExpression__Group_1__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XAndExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6122:1: rule__XAndExpression__Group_1__0__Impl : ( ( rule__XAndExpression__Group_1_0__0 ) ) ;
+    // InternalCheckCfg.g:6122:1: rule__XAndExpression__Group_1__0__Impl : ( ( rule__XAndExpression__Group_1_0__0 ) ) ;
     public final void rule__XAndExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6126:1: ( ( ( rule__XAndExpression__Group_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6127:1: ( ( rule__XAndExpression__Group_1_0__0 ) )
+            // InternalCheckCfg.g:6126:1: ( ( ( rule__XAndExpression__Group_1_0__0 ) ) )
+            // InternalCheckCfg.g:6127:1: ( ( rule__XAndExpression__Group_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6127:1: ( ( rule__XAndExpression__Group_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6128:1: ( rule__XAndExpression__Group_1_0__0 )
+            // InternalCheckCfg.g:6127:1: ( ( rule__XAndExpression__Group_1_0__0 ) )
+            // InternalCheckCfg.g:6128:1: ( rule__XAndExpression__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getGroup_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6129:1: ( rule__XAndExpression__Group_1_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6129:2: rule__XAndExpression__Group_1_0__0
+            // InternalCheckCfg.g:6129:1: ( rule__XAndExpression__Group_1_0__0 )
+            // InternalCheckCfg.g:6129:2: rule__XAndExpression__Group_1_0__0
             {
-            pushFollow(FOLLOW_rule__XAndExpression__Group_1_0__0_in_rule__XAndExpression__Group_1__0__Impl12901);
+            pushFollow(FOLLOW_2);
             rule__XAndExpression__Group_1_0__0();
 
             state._fsp--;
@@ -19050,16 +19050,16 @@ public final void rule__XAndExpression__Group_1__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XAndExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6139:1: rule__XAndExpression__Group_1__1 : rule__XAndExpression__Group_1__1__Impl ;
+    // InternalCheckCfg.g:6139:1: rule__XAndExpression__Group_1__1 : rule__XAndExpression__Group_1__1__Impl ;
     public final void rule__XAndExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6143:1: ( rule__XAndExpression__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6144:2: rule__XAndExpression__Group_1__1__Impl
+            // InternalCheckCfg.g:6143:1: ( rule__XAndExpression__Group_1__1__Impl )
+            // InternalCheckCfg.g:6144:2: rule__XAndExpression__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAndExpression__Group_1__1__Impl_in_rule__XAndExpression__Group_1__112931);
+            pushFollow(FOLLOW_2);
             rule__XAndExpression__Group_1__1__Impl();
 
             state._fsp--;
@@ -19083,25 +19083,25 @@ public final void rule__XAndExpression__Group_1__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XAndExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6150:1: rule__XAndExpression__Group_1__1__Impl : ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) ) ;
+    // InternalCheckCfg.g:6150:1: rule__XAndExpression__Group_1__1__Impl : ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) ) ;
     public final void rule__XAndExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6154:1: ( ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6155:1: ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) )
+            // InternalCheckCfg.g:6154:1: ( ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) ) )
+            // InternalCheckCfg.g:6155:1: ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6155:1: ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6156:1: ( rule__XAndExpression__RightOperandAssignment_1_1 )
+            // InternalCheckCfg.g:6155:1: ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) )
+            // InternalCheckCfg.g:6156:1: ( rule__XAndExpression__RightOperandAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getRightOperandAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6157:1: ( rule__XAndExpression__RightOperandAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6157:2: rule__XAndExpression__RightOperandAssignment_1_1
+            // InternalCheckCfg.g:6157:1: ( rule__XAndExpression__RightOperandAssignment_1_1 )
+            // InternalCheckCfg.g:6157:2: rule__XAndExpression__RightOperandAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__XAndExpression__RightOperandAssignment_1_1_in_rule__XAndExpression__Group_1__1__Impl12958);
+            pushFollow(FOLLOW_2);
             rule__XAndExpression__RightOperandAssignment_1_1();
 
             state._fsp--;
@@ -19134,16 +19134,16 @@ public final void rule__XAndExpression__Group_1__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XAndExpression__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6171:1: rule__XAndExpression__Group_1_0__0 : rule__XAndExpression__Group_1_0__0__Impl ;
+    // InternalCheckCfg.g:6171:1: rule__XAndExpression__Group_1_0__0 : rule__XAndExpression__Group_1_0__0__Impl ;
     public final void rule__XAndExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6175:1: ( rule__XAndExpression__Group_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6176:2: rule__XAndExpression__Group_1_0__0__Impl
+            // InternalCheckCfg.g:6175:1: ( rule__XAndExpression__Group_1_0__0__Impl )
+            // InternalCheckCfg.g:6176:2: rule__XAndExpression__Group_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XAndExpression__Group_1_0__0__Impl_in_rule__XAndExpression__Group_1_0__012992);
+            pushFollow(FOLLOW_2);
             rule__XAndExpression__Group_1_0__0__Impl();
 
             state._fsp--;
@@ -19167,25 +19167,25 @@ public final void rule__XAndExpression__Group_1_0__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XAndExpression__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6182:1: rule__XAndExpression__Group_1_0__0__Impl : ( ( rule__XAndExpression__Group_1_0_0__0 ) ) ;
+    // InternalCheckCfg.g:6182:1: rule__XAndExpression__Group_1_0__0__Impl : ( ( rule__XAndExpression__Group_1_0_0__0 ) ) ;
     public final void rule__XAndExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6186:1: ( ( ( rule__XAndExpression__Group_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6187:1: ( ( rule__XAndExpression__Group_1_0_0__0 ) )
+            // InternalCheckCfg.g:6186:1: ( ( ( rule__XAndExpression__Group_1_0_0__0 ) ) )
+            // InternalCheckCfg.g:6187:1: ( ( rule__XAndExpression__Group_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6187:1: ( ( rule__XAndExpression__Group_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6188:1: ( rule__XAndExpression__Group_1_0_0__0 )
+            // InternalCheckCfg.g:6187:1: ( ( rule__XAndExpression__Group_1_0_0__0 ) )
+            // InternalCheckCfg.g:6188:1: ( rule__XAndExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getGroup_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6189:1: ( rule__XAndExpression__Group_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6189:2: rule__XAndExpression__Group_1_0_0__0
+            // InternalCheckCfg.g:6189:1: ( rule__XAndExpression__Group_1_0_0__0 )
+            // InternalCheckCfg.g:6189:2: rule__XAndExpression__Group_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XAndExpression__Group_1_0_0__0_in_rule__XAndExpression__Group_1_0__0__Impl13019);
+            pushFollow(FOLLOW_2);
             rule__XAndExpression__Group_1_0_0__0();
 
             state._fsp--;
@@ -19218,21 +19218,21 @@ public final void rule__XAndExpression__Group_1_0__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XAndExpression__Group_1_0_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6201:1: rule__XAndExpression__Group_1_0_0__0 : rule__XAndExpression__Group_1_0_0__0__Impl rule__XAndExpression__Group_1_0_0__1 ;
+    // InternalCheckCfg.g:6201:1: rule__XAndExpression__Group_1_0_0__0 : rule__XAndExpression__Group_1_0_0__0__Impl rule__XAndExpression__Group_1_0_0__1 ;
     public final void rule__XAndExpression__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6205:1: ( rule__XAndExpression__Group_1_0_0__0__Impl rule__XAndExpression__Group_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6206:2: rule__XAndExpression__Group_1_0_0__0__Impl rule__XAndExpression__Group_1_0_0__1
+            // InternalCheckCfg.g:6205:1: ( rule__XAndExpression__Group_1_0_0__0__Impl rule__XAndExpression__Group_1_0_0__1 )
+            // InternalCheckCfg.g:6206:2: rule__XAndExpression__Group_1_0_0__0__Impl rule__XAndExpression__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XAndExpression__Group_1_0_0__0__Impl_in_rule__XAndExpression__Group_1_0_0__013051);
+            pushFollow(FOLLOW_33);
             rule__XAndExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAndExpression__Group_1_0_0__1_in_rule__XAndExpression__Group_1_0_0__013054);
+            pushFollow(FOLLOW_2);
             rule__XAndExpression__Group_1_0_0__1();
 
             state._fsp--;
@@ -19256,23 +19256,23 @@ public final void rule__XAndExpression__Group_1_0_0__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XAndExpression__Group_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6213:1: rule__XAndExpression__Group_1_0_0__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:6213:1: rule__XAndExpression__Group_1_0_0__0__Impl : ( () ) ;
     public final void rule__XAndExpression__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6217:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6218:1: ( () )
+            // InternalCheckCfg.g:6217:1: ( ( () ) )
+            // InternalCheckCfg.g:6218:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6218:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6219:1: ()
+            // InternalCheckCfg.g:6218:1: ( () )
+            // InternalCheckCfg.g:6219:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6220:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6222:1: 
+            // InternalCheckCfg.g:6220:1: ()
+            // InternalCheckCfg.g:6222:1: 
             {
             }
 
@@ -19297,16 +19297,16 @@ public final void rule__XAndExpression__Group_1_0_0__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XAndExpression__Group_1_0_0__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6232:1: rule__XAndExpression__Group_1_0_0__1 : rule__XAndExpression__Group_1_0_0__1__Impl ;
+    // InternalCheckCfg.g:6232:1: rule__XAndExpression__Group_1_0_0__1 : rule__XAndExpression__Group_1_0_0__1__Impl ;
     public final void rule__XAndExpression__Group_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6236:1: ( rule__XAndExpression__Group_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6237:2: rule__XAndExpression__Group_1_0_0__1__Impl
+            // InternalCheckCfg.g:6236:1: ( rule__XAndExpression__Group_1_0_0__1__Impl )
+            // InternalCheckCfg.g:6237:2: rule__XAndExpression__Group_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAndExpression__Group_1_0_0__1__Impl_in_rule__XAndExpression__Group_1_0_0__113112);
+            pushFollow(FOLLOW_2);
             rule__XAndExpression__Group_1_0_0__1__Impl();
 
             state._fsp--;
@@ -19330,25 +19330,25 @@ public final void rule__XAndExpression__Group_1_0_0__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XAndExpression__Group_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6243:1: rule__XAndExpression__Group_1_0_0__1__Impl : ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) ) ;
+    // InternalCheckCfg.g:6243:1: rule__XAndExpression__Group_1_0_0__1__Impl : ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) ) ;
     public final void rule__XAndExpression__Group_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6247:1: ( ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6248:1: ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalCheckCfg.g:6247:1: ( ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) ) )
+            // InternalCheckCfg.g:6248:1: ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6248:1: ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6249:1: ( rule__XAndExpression__FeatureAssignment_1_0_0_1 )
+            // InternalCheckCfg.g:6248:1: ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalCheckCfg.g:6249:1: ( rule__XAndExpression__FeatureAssignment_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getFeatureAssignment_1_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6250:1: ( rule__XAndExpression__FeatureAssignment_1_0_0_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6250:2: rule__XAndExpression__FeatureAssignment_1_0_0_1
+            // InternalCheckCfg.g:6250:1: ( rule__XAndExpression__FeatureAssignment_1_0_0_1 )
+            // InternalCheckCfg.g:6250:2: rule__XAndExpression__FeatureAssignment_1_0_0_1
             {
-            pushFollow(FOLLOW_rule__XAndExpression__FeatureAssignment_1_0_0_1_in_rule__XAndExpression__Group_1_0_0__1__Impl13139);
+            pushFollow(FOLLOW_2);
             rule__XAndExpression__FeatureAssignment_1_0_0_1();
 
             state._fsp--;
@@ -19381,21 +19381,21 @@ public final void rule__XAndExpression__Group_1_0_0__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XEqualityExpression__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6264:1: rule__XEqualityExpression__Group__0 : rule__XEqualityExpression__Group__0__Impl rule__XEqualityExpression__Group__1 ;
+    // InternalCheckCfg.g:6264:1: rule__XEqualityExpression__Group__0 : rule__XEqualityExpression__Group__0__Impl rule__XEqualityExpression__Group__1 ;
     public final void rule__XEqualityExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6268:1: ( rule__XEqualityExpression__Group__0__Impl rule__XEqualityExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6269:2: rule__XEqualityExpression__Group__0__Impl rule__XEqualityExpression__Group__1
+            // InternalCheckCfg.g:6268:1: ( rule__XEqualityExpression__Group__0__Impl rule__XEqualityExpression__Group__1 )
+            // InternalCheckCfg.g:6269:2: rule__XEqualityExpression__Group__0__Impl rule__XEqualityExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group__0__Impl_in_rule__XEqualityExpression__Group__013173);
+            pushFollow(FOLLOW_35);
             rule__XEqualityExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group__1_in_rule__XEqualityExpression__Group__013176);
+            pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group__1();
 
             state._fsp--;
@@ -19419,22 +19419,22 @@ public final void rule__XEqualityExpression__Group__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XEqualityExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6276:1: rule__XEqualityExpression__Group__0__Impl : ( ruleXRelationalExpression ) ;
+    // InternalCheckCfg.g:6276:1: rule__XEqualityExpression__Group__0__Impl : ( ruleXRelationalExpression ) ;
     public final void rule__XEqualityExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6280:1: ( ( ruleXRelationalExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6281:1: ( ruleXRelationalExpression )
+            // InternalCheckCfg.g:6280:1: ( ( ruleXRelationalExpression ) )
+            // InternalCheckCfg.g:6281:1: ( ruleXRelationalExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6281:1: ( ruleXRelationalExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6282:1: ruleXRelationalExpression
+            // InternalCheckCfg.g:6281:1: ( ruleXRelationalExpression )
+            // InternalCheckCfg.g:6282:1: ruleXRelationalExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getXRelationalExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleXRelationalExpression_in_rule__XEqualityExpression__Group__0__Impl13203);
+            pushFollow(FOLLOW_2);
             ruleXRelationalExpression();
 
             state._fsp--;
@@ -19464,16 +19464,16 @@ public final void rule__XEqualityExpression__Group__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XEqualityExpression__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6293:1: rule__XEqualityExpression__Group__1 : rule__XEqualityExpression__Group__1__Impl ;
+    // InternalCheckCfg.g:6293:1: rule__XEqualityExpression__Group__1 : rule__XEqualityExpression__Group__1__Impl ;
     public final void rule__XEqualityExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6297:1: ( rule__XEqualityExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6298:2: rule__XEqualityExpression__Group__1__Impl
+            // InternalCheckCfg.g:6297:1: ( rule__XEqualityExpression__Group__1__Impl )
+            // InternalCheckCfg.g:6298:2: rule__XEqualityExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group__1__Impl_in_rule__XEqualityExpression__Group__113232);
+            pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group__1__Impl();
 
             state._fsp--;
@@ -19497,22 +19497,22 @@ public final void rule__XEqualityExpression__Group__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XEqualityExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6304:1: rule__XEqualityExpression__Group__1__Impl : ( ( rule__XEqualityExpression__Group_1__0 )* ) ;
+    // InternalCheckCfg.g:6304:1: rule__XEqualityExpression__Group__1__Impl : ( ( rule__XEqualityExpression__Group_1__0 )* ) ;
     public final void rule__XEqualityExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6308:1: ( ( ( rule__XEqualityExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6309:1: ( ( rule__XEqualityExpression__Group_1__0 )* )
+            // InternalCheckCfg.g:6308:1: ( ( ( rule__XEqualityExpression__Group_1__0 )* ) )
+            // InternalCheckCfg.g:6309:1: ( ( rule__XEqualityExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6309:1: ( ( rule__XEqualityExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6310:1: ( rule__XEqualityExpression__Group_1__0 )*
+            // InternalCheckCfg.g:6309:1: ( ( rule__XEqualityExpression__Group_1__0 )* )
+            // InternalCheckCfg.g:6310:1: ( rule__XEqualityExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6311:1: ( rule__XEqualityExpression__Group_1__0 )*
+            // InternalCheckCfg.g:6311:1: ( rule__XEqualityExpression__Group_1__0 )*
             loop61:
             do {
                 int alt61=2;
@@ -19566,9 +19566,9 @@ public final void rule__XEqualityExpression__Group__1__Impl() throws Recognition
 
                 switch (alt61) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6311:2: rule__XEqualityExpression__Group_1__0
+            	    // InternalCheckCfg.g:6311:2: rule__XEqualityExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XEqualityExpression__Group_1__0_in_rule__XEqualityExpression__Group__1__Impl13259);
+            	    pushFollow(FOLLOW_36);
             	    rule__XEqualityExpression__Group_1__0();
 
             	    state._fsp--;
@@ -19607,21 +19607,21 @@ public final void rule__XEqualityExpression__Group__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6325:1: rule__XEqualityExpression__Group_1__0 : rule__XEqualityExpression__Group_1__0__Impl rule__XEqualityExpression__Group_1__1 ;
+    // InternalCheckCfg.g:6325:1: rule__XEqualityExpression__Group_1__0 : rule__XEqualityExpression__Group_1__0__Impl rule__XEqualityExpression__Group_1__1 ;
     public final void rule__XEqualityExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6329:1: ( rule__XEqualityExpression__Group_1__0__Impl rule__XEqualityExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6330:2: rule__XEqualityExpression__Group_1__0__Impl rule__XEqualityExpression__Group_1__1
+            // InternalCheckCfg.g:6329:1: ( rule__XEqualityExpression__Group_1__0__Impl rule__XEqualityExpression__Group_1__1 )
+            // InternalCheckCfg.g:6330:2: rule__XEqualityExpression__Group_1__0__Impl rule__XEqualityExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1__0__Impl_in_rule__XEqualityExpression__Group_1__013294);
+            pushFollow(FOLLOW_27);
             rule__XEqualityExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1__1_in_rule__XEqualityExpression__Group_1__013297);
+            pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group_1__1();
 
             state._fsp--;
@@ -19645,25 +19645,25 @@ public final void rule__XEqualityExpression__Group_1__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6337:1: rule__XEqualityExpression__Group_1__0__Impl : ( ( rule__XEqualityExpression__Group_1_0__0 ) ) ;
+    // InternalCheckCfg.g:6337:1: rule__XEqualityExpression__Group_1__0__Impl : ( ( rule__XEqualityExpression__Group_1_0__0 ) ) ;
     public final void rule__XEqualityExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6341:1: ( ( ( rule__XEqualityExpression__Group_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6342:1: ( ( rule__XEqualityExpression__Group_1_0__0 ) )
+            // InternalCheckCfg.g:6341:1: ( ( ( rule__XEqualityExpression__Group_1_0__0 ) ) )
+            // InternalCheckCfg.g:6342:1: ( ( rule__XEqualityExpression__Group_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6342:1: ( ( rule__XEqualityExpression__Group_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6343:1: ( rule__XEqualityExpression__Group_1_0__0 )
+            // InternalCheckCfg.g:6342:1: ( ( rule__XEqualityExpression__Group_1_0__0 ) )
+            // InternalCheckCfg.g:6343:1: ( rule__XEqualityExpression__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getGroup_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6344:1: ( rule__XEqualityExpression__Group_1_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6344:2: rule__XEqualityExpression__Group_1_0__0
+            // InternalCheckCfg.g:6344:1: ( rule__XEqualityExpression__Group_1_0__0 )
+            // InternalCheckCfg.g:6344:2: rule__XEqualityExpression__Group_1_0__0
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1_0__0_in_rule__XEqualityExpression__Group_1__0__Impl13324);
+            pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group_1_0__0();
 
             state._fsp--;
@@ -19696,16 +19696,16 @@ public final void rule__XEqualityExpression__Group_1__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6354:1: rule__XEqualityExpression__Group_1__1 : rule__XEqualityExpression__Group_1__1__Impl ;
+    // InternalCheckCfg.g:6354:1: rule__XEqualityExpression__Group_1__1 : rule__XEqualityExpression__Group_1__1__Impl ;
     public final void rule__XEqualityExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6358:1: ( rule__XEqualityExpression__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6359:2: rule__XEqualityExpression__Group_1__1__Impl
+            // InternalCheckCfg.g:6358:1: ( rule__XEqualityExpression__Group_1__1__Impl )
+            // InternalCheckCfg.g:6359:2: rule__XEqualityExpression__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1__1__Impl_in_rule__XEqualityExpression__Group_1__113354);
+            pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group_1__1__Impl();
 
             state._fsp--;
@@ -19729,25 +19729,25 @@ public final void rule__XEqualityExpression__Group_1__1() throws RecognitionExce
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6365:1: rule__XEqualityExpression__Group_1__1__Impl : ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) ) ;
+    // InternalCheckCfg.g:6365:1: rule__XEqualityExpression__Group_1__1__Impl : ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) ) ;
     public final void rule__XEqualityExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6369:1: ( ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6370:1: ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) )
+            // InternalCheckCfg.g:6369:1: ( ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) ) )
+            // InternalCheckCfg.g:6370:1: ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6370:1: ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6371:1: ( rule__XEqualityExpression__RightOperandAssignment_1_1 )
+            // InternalCheckCfg.g:6370:1: ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) )
+            // InternalCheckCfg.g:6371:1: ( rule__XEqualityExpression__RightOperandAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getRightOperandAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6372:1: ( rule__XEqualityExpression__RightOperandAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6372:2: rule__XEqualityExpression__RightOperandAssignment_1_1
+            // InternalCheckCfg.g:6372:1: ( rule__XEqualityExpression__RightOperandAssignment_1_1 )
+            // InternalCheckCfg.g:6372:2: rule__XEqualityExpression__RightOperandAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__RightOperandAssignment_1_1_in_rule__XEqualityExpression__Group_1__1__Impl13381);
+            pushFollow(FOLLOW_2);
             rule__XEqualityExpression__RightOperandAssignment_1_1();
 
             state._fsp--;
@@ -19780,16 +19780,16 @@ public final void rule__XEqualityExpression__Group_1__1__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6386:1: rule__XEqualityExpression__Group_1_0__0 : rule__XEqualityExpression__Group_1_0__0__Impl ;
+    // InternalCheckCfg.g:6386:1: rule__XEqualityExpression__Group_1_0__0 : rule__XEqualityExpression__Group_1_0__0__Impl ;
     public final void rule__XEqualityExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6390:1: ( rule__XEqualityExpression__Group_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6391:2: rule__XEqualityExpression__Group_1_0__0__Impl
+            // InternalCheckCfg.g:6390:1: ( rule__XEqualityExpression__Group_1_0__0__Impl )
+            // InternalCheckCfg.g:6391:2: rule__XEqualityExpression__Group_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1_0__0__Impl_in_rule__XEqualityExpression__Group_1_0__013415);
+            pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group_1_0__0__Impl();
 
             state._fsp--;
@@ -19813,25 +19813,25 @@ public final void rule__XEqualityExpression__Group_1_0__0() throws RecognitionEx
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6397:1: rule__XEqualityExpression__Group_1_0__0__Impl : ( ( rule__XEqualityExpression__Group_1_0_0__0 ) ) ;
+    // InternalCheckCfg.g:6397:1: rule__XEqualityExpression__Group_1_0__0__Impl : ( ( rule__XEqualityExpression__Group_1_0_0__0 ) ) ;
     public final void rule__XEqualityExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6401:1: ( ( ( rule__XEqualityExpression__Group_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6402:1: ( ( rule__XEqualityExpression__Group_1_0_0__0 ) )
+            // InternalCheckCfg.g:6401:1: ( ( ( rule__XEqualityExpression__Group_1_0_0__0 ) ) )
+            // InternalCheckCfg.g:6402:1: ( ( rule__XEqualityExpression__Group_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6402:1: ( ( rule__XEqualityExpression__Group_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6403:1: ( rule__XEqualityExpression__Group_1_0_0__0 )
+            // InternalCheckCfg.g:6402:1: ( ( rule__XEqualityExpression__Group_1_0_0__0 ) )
+            // InternalCheckCfg.g:6403:1: ( rule__XEqualityExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getGroup_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6404:1: ( rule__XEqualityExpression__Group_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6404:2: rule__XEqualityExpression__Group_1_0_0__0
+            // InternalCheckCfg.g:6404:1: ( rule__XEqualityExpression__Group_1_0_0__0 )
+            // InternalCheckCfg.g:6404:2: rule__XEqualityExpression__Group_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1_0_0__0_in_rule__XEqualityExpression__Group_1_0__0__Impl13442);
+            pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group_1_0_0__0();
 
             state._fsp--;
@@ -19864,21 +19864,21 @@ public final void rule__XEqualityExpression__Group_1_0__0__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1_0_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6416:1: rule__XEqualityExpression__Group_1_0_0__0 : rule__XEqualityExpression__Group_1_0_0__0__Impl rule__XEqualityExpression__Group_1_0_0__1 ;
+    // InternalCheckCfg.g:6416:1: rule__XEqualityExpression__Group_1_0_0__0 : rule__XEqualityExpression__Group_1_0_0__0__Impl rule__XEqualityExpression__Group_1_0_0__1 ;
     public final void rule__XEqualityExpression__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6420:1: ( rule__XEqualityExpression__Group_1_0_0__0__Impl rule__XEqualityExpression__Group_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6421:2: rule__XEqualityExpression__Group_1_0_0__0__Impl rule__XEqualityExpression__Group_1_0_0__1
+            // InternalCheckCfg.g:6420:1: ( rule__XEqualityExpression__Group_1_0_0__0__Impl rule__XEqualityExpression__Group_1_0_0__1 )
+            // InternalCheckCfg.g:6421:2: rule__XEqualityExpression__Group_1_0_0__0__Impl rule__XEqualityExpression__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1_0_0__0__Impl_in_rule__XEqualityExpression__Group_1_0_0__013474);
+            pushFollow(FOLLOW_35);
             rule__XEqualityExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1_0_0__1_in_rule__XEqualityExpression__Group_1_0_0__013477);
+            pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group_1_0_0__1();
 
             state._fsp--;
@@ -19902,23 +19902,23 @@ public final void rule__XEqualityExpression__Group_1_0_0__0() throws Recognition
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6428:1: rule__XEqualityExpression__Group_1_0_0__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:6428:1: rule__XEqualityExpression__Group_1_0_0__0__Impl : ( () ) ;
     public final void rule__XEqualityExpression__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6432:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6433:1: ( () )
+            // InternalCheckCfg.g:6432:1: ( ( () ) )
+            // InternalCheckCfg.g:6433:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6433:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6434:1: ()
+            // InternalCheckCfg.g:6433:1: ( () )
+            // InternalCheckCfg.g:6434:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6435:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6437:1: 
+            // InternalCheckCfg.g:6435:1: ()
+            // InternalCheckCfg.g:6437:1: 
             {
             }
 
@@ -19943,16 +19943,16 @@ public final void rule__XEqualityExpression__Group_1_0_0__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1_0_0__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6447:1: rule__XEqualityExpression__Group_1_0_0__1 : rule__XEqualityExpression__Group_1_0_0__1__Impl ;
+    // InternalCheckCfg.g:6447:1: rule__XEqualityExpression__Group_1_0_0__1 : rule__XEqualityExpression__Group_1_0_0__1__Impl ;
     public final void rule__XEqualityExpression__Group_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6451:1: ( rule__XEqualityExpression__Group_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6452:2: rule__XEqualityExpression__Group_1_0_0__1__Impl
+            // InternalCheckCfg.g:6451:1: ( rule__XEqualityExpression__Group_1_0_0__1__Impl )
+            // InternalCheckCfg.g:6452:2: rule__XEqualityExpression__Group_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1_0_0__1__Impl_in_rule__XEqualityExpression__Group_1_0_0__113535);
+            pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group_1_0_0__1__Impl();
 
             state._fsp--;
@@ -19976,25 +19976,25 @@ public final void rule__XEqualityExpression__Group_1_0_0__1() throws Recognition
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6458:1: rule__XEqualityExpression__Group_1_0_0__1__Impl : ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) ) ;
+    // InternalCheckCfg.g:6458:1: rule__XEqualityExpression__Group_1_0_0__1__Impl : ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) ) ;
     public final void rule__XEqualityExpression__Group_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6462:1: ( ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6463:1: ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalCheckCfg.g:6462:1: ( ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) ) )
+            // InternalCheckCfg.g:6463:1: ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6463:1: ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6464:1: ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 )
+            // InternalCheckCfg.g:6463:1: ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalCheckCfg.g:6464:1: ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getFeatureAssignment_1_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6465:1: ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6465:2: rule__XEqualityExpression__FeatureAssignment_1_0_0_1
+            // InternalCheckCfg.g:6465:1: ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 )
+            // InternalCheckCfg.g:6465:2: rule__XEqualityExpression__FeatureAssignment_1_0_0_1
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__FeatureAssignment_1_0_0_1_in_rule__XEqualityExpression__Group_1_0_0__1__Impl13562);
+            pushFollow(FOLLOW_2);
             rule__XEqualityExpression__FeatureAssignment_1_0_0_1();
 
             state._fsp--;
@@ -20027,21 +20027,21 @@ public final void rule__XEqualityExpression__Group_1_0_0__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__XRelationalExpression__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6479:1: rule__XRelationalExpression__Group__0 : rule__XRelationalExpression__Group__0__Impl rule__XRelationalExpression__Group__1 ;
+    // InternalCheckCfg.g:6479:1: rule__XRelationalExpression__Group__0 : rule__XRelationalExpression__Group__0__Impl rule__XRelationalExpression__Group__1 ;
     public final void rule__XRelationalExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6483:1: ( rule__XRelationalExpression__Group__0__Impl rule__XRelationalExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6484:2: rule__XRelationalExpression__Group__0__Impl rule__XRelationalExpression__Group__1
+            // InternalCheckCfg.g:6483:1: ( rule__XRelationalExpression__Group__0__Impl rule__XRelationalExpression__Group__1 )
+            // InternalCheckCfg.g:6484:2: rule__XRelationalExpression__Group__0__Impl rule__XRelationalExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group__0__Impl_in_rule__XRelationalExpression__Group__013596);
+            pushFollow(FOLLOW_37);
             rule__XRelationalExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group__1_in_rule__XRelationalExpression__Group__013599);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group__1();
 
             state._fsp--;
@@ -20065,22 +20065,22 @@ public final void rule__XRelationalExpression__Group__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__XRelationalExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6491:1: rule__XRelationalExpression__Group__0__Impl : ( ruleXOtherOperatorExpression ) ;
+    // InternalCheckCfg.g:6491:1: rule__XRelationalExpression__Group__0__Impl : ( ruleXOtherOperatorExpression ) ;
     public final void rule__XRelationalExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6495:1: ( ( ruleXOtherOperatorExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6496:1: ( ruleXOtherOperatorExpression )
+            // InternalCheckCfg.g:6495:1: ( ( ruleXOtherOperatorExpression ) )
+            // InternalCheckCfg.g:6496:1: ( ruleXOtherOperatorExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6496:1: ( ruleXOtherOperatorExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6497:1: ruleXOtherOperatorExpression
+            // InternalCheckCfg.g:6496:1: ( ruleXOtherOperatorExpression )
+            // InternalCheckCfg.g:6497:1: ruleXOtherOperatorExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getXOtherOperatorExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleXOtherOperatorExpression_in_rule__XRelationalExpression__Group__0__Impl13626);
+            pushFollow(FOLLOW_2);
             ruleXOtherOperatorExpression();
 
             state._fsp--;
@@ -20110,16 +20110,16 @@ public final void rule__XRelationalExpression__Group__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XRelationalExpression__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6508:1: rule__XRelationalExpression__Group__1 : rule__XRelationalExpression__Group__1__Impl ;
+    // InternalCheckCfg.g:6508:1: rule__XRelationalExpression__Group__1 : rule__XRelationalExpression__Group__1__Impl ;
     public final void rule__XRelationalExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6512:1: ( rule__XRelationalExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6513:2: rule__XRelationalExpression__Group__1__Impl
+            // InternalCheckCfg.g:6512:1: ( rule__XRelationalExpression__Group__1__Impl )
+            // InternalCheckCfg.g:6513:2: rule__XRelationalExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group__1__Impl_in_rule__XRelationalExpression__Group__113655);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group__1__Impl();
 
             state._fsp--;
@@ -20143,22 +20143,22 @@ public final void rule__XRelationalExpression__Group__1() throws RecognitionExce
 
 
     // $ANTLR start "rule__XRelationalExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6519:1: rule__XRelationalExpression__Group__1__Impl : ( ( rule__XRelationalExpression__Alternatives_1 )* ) ;
+    // InternalCheckCfg.g:6519:1: rule__XRelationalExpression__Group__1__Impl : ( ( rule__XRelationalExpression__Alternatives_1 )* ) ;
     public final void rule__XRelationalExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6523:1: ( ( ( rule__XRelationalExpression__Alternatives_1 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6524:1: ( ( rule__XRelationalExpression__Alternatives_1 )* )
+            // InternalCheckCfg.g:6523:1: ( ( ( rule__XRelationalExpression__Alternatives_1 )* ) )
+            // InternalCheckCfg.g:6524:1: ( ( rule__XRelationalExpression__Alternatives_1 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6524:1: ( ( rule__XRelationalExpression__Alternatives_1 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6525:1: ( rule__XRelationalExpression__Alternatives_1 )*
+            // InternalCheckCfg.g:6524:1: ( ( rule__XRelationalExpression__Alternatives_1 )* )
+            // InternalCheckCfg.g:6525:1: ( rule__XRelationalExpression__Alternatives_1 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getAlternatives_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6526:1: ( rule__XRelationalExpression__Alternatives_1 )*
+            // InternalCheckCfg.g:6526:1: ( rule__XRelationalExpression__Alternatives_1 )*
             loop62:
             do {
                 int alt62=2;
@@ -20212,9 +20212,9 @@ public final void rule__XRelationalExpression__Group__1__Impl() throws Recogniti
 
                 switch (alt62) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6526:2: rule__XRelationalExpression__Alternatives_1
+            	    // InternalCheckCfg.g:6526:2: rule__XRelationalExpression__Alternatives_1
             	    {
-            	    pushFollow(FOLLOW_rule__XRelationalExpression__Alternatives_1_in_rule__XRelationalExpression__Group__1__Impl13682);
+            	    pushFollow(FOLLOW_38);
             	    rule__XRelationalExpression__Alternatives_1();
 
             	    state._fsp--;
@@ -20253,21 +20253,21 @@ public final void rule__XRelationalExpression__Group__1__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6540:1: rule__XRelationalExpression__Group_1_0__0 : rule__XRelationalExpression__Group_1_0__0__Impl rule__XRelationalExpression__Group_1_0__1 ;
+    // InternalCheckCfg.g:6540:1: rule__XRelationalExpression__Group_1_0__0 : rule__XRelationalExpression__Group_1_0__0__Impl rule__XRelationalExpression__Group_1_0__1 ;
     public final void rule__XRelationalExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6544:1: ( rule__XRelationalExpression__Group_1_0__0__Impl rule__XRelationalExpression__Group_1_0__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6545:2: rule__XRelationalExpression__Group_1_0__0__Impl rule__XRelationalExpression__Group_1_0__1
+            // InternalCheckCfg.g:6544:1: ( rule__XRelationalExpression__Group_1_0__0__Impl rule__XRelationalExpression__Group_1_0__1 )
+            // InternalCheckCfg.g:6545:2: rule__XRelationalExpression__Group_1_0__0__Impl rule__XRelationalExpression__Group_1_0__1
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0__0__Impl_in_rule__XRelationalExpression__Group_1_0__013717);
+            pushFollow(FOLLOW_39);
             rule__XRelationalExpression__Group_1_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0__1_in_rule__XRelationalExpression__Group_1_0__013720);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_0__1();
 
             state._fsp--;
@@ -20291,25 +20291,25 @@ public final void rule__XRelationalExpression__Group_1_0__0() throws Recognition
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6552:1: rule__XRelationalExpression__Group_1_0__0__Impl : ( ( rule__XRelationalExpression__Group_1_0_0__0 ) ) ;
+    // InternalCheckCfg.g:6552:1: rule__XRelationalExpression__Group_1_0__0__Impl : ( ( rule__XRelationalExpression__Group_1_0_0__0 ) ) ;
     public final void rule__XRelationalExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6556:1: ( ( ( rule__XRelationalExpression__Group_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6557:1: ( ( rule__XRelationalExpression__Group_1_0_0__0 ) )
+            // InternalCheckCfg.g:6556:1: ( ( ( rule__XRelationalExpression__Group_1_0_0__0 ) ) )
+            // InternalCheckCfg.g:6557:1: ( ( rule__XRelationalExpression__Group_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6557:1: ( ( rule__XRelationalExpression__Group_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6558:1: ( rule__XRelationalExpression__Group_1_0_0__0 )
+            // InternalCheckCfg.g:6557:1: ( ( rule__XRelationalExpression__Group_1_0_0__0 ) )
+            // InternalCheckCfg.g:6558:1: ( rule__XRelationalExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getGroup_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6559:1: ( rule__XRelationalExpression__Group_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6559:2: rule__XRelationalExpression__Group_1_0_0__0
+            // InternalCheckCfg.g:6559:1: ( rule__XRelationalExpression__Group_1_0_0__0 )
+            // InternalCheckCfg.g:6559:2: rule__XRelationalExpression__Group_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0_0__0_in_rule__XRelationalExpression__Group_1_0__0__Impl13747);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_0_0__0();
 
             state._fsp--;
@@ -20342,16 +20342,16 @@ public final void rule__XRelationalExpression__Group_1_0__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6569:1: rule__XRelationalExpression__Group_1_0__1 : rule__XRelationalExpression__Group_1_0__1__Impl ;
+    // InternalCheckCfg.g:6569:1: rule__XRelationalExpression__Group_1_0__1 : rule__XRelationalExpression__Group_1_0__1__Impl ;
     public final void rule__XRelationalExpression__Group_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6573:1: ( rule__XRelationalExpression__Group_1_0__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6574:2: rule__XRelationalExpression__Group_1_0__1__Impl
+            // InternalCheckCfg.g:6573:1: ( rule__XRelationalExpression__Group_1_0__1__Impl )
+            // InternalCheckCfg.g:6574:2: rule__XRelationalExpression__Group_1_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0__1__Impl_in_rule__XRelationalExpression__Group_1_0__113777);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_0__1__Impl();
 
             state._fsp--;
@@ -20375,25 +20375,25 @@ public final void rule__XRelationalExpression__Group_1_0__1() throws Recognition
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6580:1: rule__XRelationalExpression__Group_1_0__1__Impl : ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) ) ;
+    // InternalCheckCfg.g:6580:1: rule__XRelationalExpression__Group_1_0__1__Impl : ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) ) ;
     public final void rule__XRelationalExpression__Group_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6584:1: ( ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6585:1: ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) )
+            // InternalCheckCfg.g:6584:1: ( ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) ) )
+            // InternalCheckCfg.g:6585:1: ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6585:1: ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6586:1: ( rule__XRelationalExpression__TypeAssignment_1_0_1 )
+            // InternalCheckCfg.g:6585:1: ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) )
+            // InternalCheckCfg.g:6586:1: ( rule__XRelationalExpression__TypeAssignment_1_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getTypeAssignment_1_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6587:1: ( rule__XRelationalExpression__TypeAssignment_1_0_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6587:2: rule__XRelationalExpression__TypeAssignment_1_0_1
+            // InternalCheckCfg.g:6587:1: ( rule__XRelationalExpression__TypeAssignment_1_0_1 )
+            // InternalCheckCfg.g:6587:2: rule__XRelationalExpression__TypeAssignment_1_0_1
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__TypeAssignment_1_0_1_in_rule__XRelationalExpression__Group_1_0__1__Impl13804);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__TypeAssignment_1_0_1();
 
             state._fsp--;
@@ -20426,16 +20426,16 @@ public final void rule__XRelationalExpression__Group_1_0__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6601:1: rule__XRelationalExpression__Group_1_0_0__0 : rule__XRelationalExpression__Group_1_0_0__0__Impl ;
+    // InternalCheckCfg.g:6601:1: rule__XRelationalExpression__Group_1_0_0__0 : rule__XRelationalExpression__Group_1_0_0__0__Impl ;
     public final void rule__XRelationalExpression__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6605:1: ( rule__XRelationalExpression__Group_1_0_0__0__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6606:2: rule__XRelationalExpression__Group_1_0_0__0__Impl
+            // InternalCheckCfg.g:6605:1: ( rule__XRelationalExpression__Group_1_0_0__0__Impl )
+            // InternalCheckCfg.g:6606:2: rule__XRelationalExpression__Group_1_0_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0_0__0__Impl_in_rule__XRelationalExpression__Group_1_0_0__013838);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
@@ -20459,25 +20459,25 @@ public final void rule__XRelationalExpression__Group_1_0_0__0() throws Recogniti
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6612:1: rule__XRelationalExpression__Group_1_0_0__0__Impl : ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) ) ;
+    // InternalCheckCfg.g:6612:1: rule__XRelationalExpression__Group_1_0_0__0__Impl : ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) ) ;
     public final void rule__XRelationalExpression__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6616:1: ( ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6617:1: ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) )
+            // InternalCheckCfg.g:6616:1: ( ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) ) )
+            // InternalCheckCfg.g:6617:1: ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6617:1: ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6618:1: ( rule__XRelationalExpression__Group_1_0_0_0__0 )
+            // InternalCheckCfg.g:6617:1: ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) )
+            // InternalCheckCfg.g:6618:1: ( rule__XRelationalExpression__Group_1_0_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getGroup_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6619:1: ( rule__XRelationalExpression__Group_1_0_0_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6619:2: rule__XRelationalExpression__Group_1_0_0_0__0
+            // InternalCheckCfg.g:6619:1: ( rule__XRelationalExpression__Group_1_0_0_0__0 )
+            // InternalCheckCfg.g:6619:2: rule__XRelationalExpression__Group_1_0_0_0__0
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0_0_0__0_in_rule__XRelationalExpression__Group_1_0_0__0__Impl13865);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_0_0_0__0();
 
             state._fsp--;
@@ -20510,21 +20510,21 @@ public final void rule__XRelationalExpression__Group_1_0_0__0__Impl() throws Rec
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0_0_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6631:1: rule__XRelationalExpression__Group_1_0_0_0__0 : rule__XRelationalExpression__Group_1_0_0_0__0__Impl rule__XRelationalExpression__Group_1_0_0_0__1 ;
+    // InternalCheckCfg.g:6631:1: rule__XRelationalExpression__Group_1_0_0_0__0 : rule__XRelationalExpression__Group_1_0_0_0__0__Impl rule__XRelationalExpression__Group_1_0_0_0__1 ;
     public final void rule__XRelationalExpression__Group_1_0_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6635:1: ( rule__XRelationalExpression__Group_1_0_0_0__0__Impl rule__XRelationalExpression__Group_1_0_0_0__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6636:2: rule__XRelationalExpression__Group_1_0_0_0__0__Impl rule__XRelationalExpression__Group_1_0_0_0__1
+            // InternalCheckCfg.g:6635:1: ( rule__XRelationalExpression__Group_1_0_0_0__0__Impl rule__XRelationalExpression__Group_1_0_0_0__1 )
+            // InternalCheckCfg.g:6636:2: rule__XRelationalExpression__Group_1_0_0_0__0__Impl rule__XRelationalExpression__Group_1_0_0_0__1
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0_0_0__0__Impl_in_rule__XRelationalExpression__Group_1_0_0_0__013897);
+            pushFollow(FOLLOW_40);
             rule__XRelationalExpression__Group_1_0_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0_0_0__1_in_rule__XRelationalExpression__Group_1_0_0_0__013900);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_0_0_0__1();
 
             state._fsp--;
@@ -20548,23 +20548,23 @@ public final void rule__XRelationalExpression__Group_1_0_0_0__0() throws Recogni
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6643:1: rule__XRelationalExpression__Group_1_0_0_0__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:6643:1: rule__XRelationalExpression__Group_1_0_0_0__0__Impl : ( () ) ;
     public final void rule__XRelationalExpression__Group_1_0_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6647:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6648:1: ( () )
+            // InternalCheckCfg.g:6647:1: ( ( () ) )
+            // InternalCheckCfg.g:6648:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6648:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6649:1: ()
+            // InternalCheckCfg.g:6648:1: ( () )
+            // InternalCheckCfg.g:6649:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getXInstanceOfExpressionExpressionAction_1_0_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6650:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6652:1: 
+            // InternalCheckCfg.g:6650:1: ()
+            // InternalCheckCfg.g:6652:1: 
             {
             }
 
@@ -20589,16 +20589,16 @@ public final void rule__XRelationalExpression__Group_1_0_0_0__0__Impl() throws R
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0_0_0__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6662:1: rule__XRelationalExpression__Group_1_0_0_0__1 : rule__XRelationalExpression__Group_1_0_0_0__1__Impl ;
+    // InternalCheckCfg.g:6662:1: rule__XRelationalExpression__Group_1_0_0_0__1 : rule__XRelationalExpression__Group_1_0_0_0__1__Impl ;
     public final void rule__XRelationalExpression__Group_1_0_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6666:1: ( rule__XRelationalExpression__Group_1_0_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6667:2: rule__XRelationalExpression__Group_1_0_0_0__1__Impl
+            // InternalCheckCfg.g:6666:1: ( rule__XRelationalExpression__Group_1_0_0_0__1__Impl )
+            // InternalCheckCfg.g:6667:2: rule__XRelationalExpression__Group_1_0_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0_0_0__1__Impl_in_rule__XRelationalExpression__Group_1_0_0_0__113958);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_0_0_0__1__Impl();
 
             state._fsp--;
@@ -20622,22 +20622,22 @@ public final void rule__XRelationalExpression__Group_1_0_0_0__1() throws Recogni
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6673:1: rule__XRelationalExpression__Group_1_0_0_0__1__Impl : ( 'instanceof' ) ;
+    // InternalCheckCfg.g:6673:1: rule__XRelationalExpression__Group_1_0_0_0__1__Impl : ( 'instanceof' ) ;
     public final void rule__XRelationalExpression__Group_1_0_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6677:1: ( ( 'instanceof' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6678:1: ( 'instanceof' )
+            // InternalCheckCfg.g:6677:1: ( ( 'instanceof' ) )
+            // InternalCheckCfg.g:6678:1: ( 'instanceof' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6678:1: ( 'instanceof' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6679:1: 'instanceof'
+            // InternalCheckCfg.g:6678:1: ( 'instanceof' )
+            // InternalCheckCfg.g:6679:1: 'instanceof'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getInstanceofKeyword_1_0_0_0_1()); 
             }
-            match(input,68,FOLLOW_68_in_rule__XRelationalExpression__Group_1_0_0_0__1__Impl13986); if (state.failed) return ;
+            match(input,68,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXRelationalExpressionAccess().getInstanceofKeyword_1_0_0_0_1()); 
             }
@@ -20663,21 +20663,21 @@ public final void rule__XRelationalExpression__Group_1_0_0_0__1__Impl() throws R
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6696:1: rule__XRelationalExpression__Group_1_1__0 : rule__XRelationalExpression__Group_1_1__0__Impl rule__XRelationalExpression__Group_1_1__1 ;
+    // InternalCheckCfg.g:6696:1: rule__XRelationalExpression__Group_1_1__0 : rule__XRelationalExpression__Group_1_1__0__Impl rule__XRelationalExpression__Group_1_1__1 ;
     public final void rule__XRelationalExpression__Group_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6700:1: ( rule__XRelationalExpression__Group_1_1__0__Impl rule__XRelationalExpression__Group_1_1__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6701:2: rule__XRelationalExpression__Group_1_1__0__Impl rule__XRelationalExpression__Group_1_1__1
+            // InternalCheckCfg.g:6700:1: ( rule__XRelationalExpression__Group_1_1__0__Impl rule__XRelationalExpression__Group_1_1__1 )
+            // InternalCheckCfg.g:6701:2: rule__XRelationalExpression__Group_1_1__0__Impl rule__XRelationalExpression__Group_1_1__1
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1__0__Impl_in_rule__XRelationalExpression__Group_1_1__014021);
+            pushFollow(FOLLOW_27);
             rule__XRelationalExpression__Group_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1__1_in_rule__XRelationalExpression__Group_1_1__014024);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_1__1();
 
             state._fsp--;
@@ -20701,25 +20701,25 @@ public final void rule__XRelationalExpression__Group_1_1__0() throws Recognition
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6708:1: rule__XRelationalExpression__Group_1_1__0__Impl : ( ( rule__XRelationalExpression__Group_1_1_0__0 ) ) ;
+    // InternalCheckCfg.g:6708:1: rule__XRelationalExpression__Group_1_1__0__Impl : ( ( rule__XRelationalExpression__Group_1_1_0__0 ) ) ;
     public final void rule__XRelationalExpression__Group_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6712:1: ( ( ( rule__XRelationalExpression__Group_1_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6713:1: ( ( rule__XRelationalExpression__Group_1_1_0__0 ) )
+            // InternalCheckCfg.g:6712:1: ( ( ( rule__XRelationalExpression__Group_1_1_0__0 ) ) )
+            // InternalCheckCfg.g:6713:1: ( ( rule__XRelationalExpression__Group_1_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6713:1: ( ( rule__XRelationalExpression__Group_1_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6714:1: ( rule__XRelationalExpression__Group_1_1_0__0 )
+            // InternalCheckCfg.g:6713:1: ( ( rule__XRelationalExpression__Group_1_1_0__0 ) )
+            // InternalCheckCfg.g:6714:1: ( rule__XRelationalExpression__Group_1_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getGroup_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6715:1: ( rule__XRelationalExpression__Group_1_1_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6715:2: rule__XRelationalExpression__Group_1_1_0__0
+            // InternalCheckCfg.g:6715:1: ( rule__XRelationalExpression__Group_1_1_0__0 )
+            // InternalCheckCfg.g:6715:2: rule__XRelationalExpression__Group_1_1_0__0
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1_0__0_in_rule__XRelationalExpression__Group_1_1__0__Impl14051);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_1_0__0();
 
             state._fsp--;
@@ -20752,16 +20752,16 @@ public final void rule__XRelationalExpression__Group_1_1__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6725:1: rule__XRelationalExpression__Group_1_1__1 : rule__XRelationalExpression__Group_1_1__1__Impl ;
+    // InternalCheckCfg.g:6725:1: rule__XRelationalExpression__Group_1_1__1 : rule__XRelationalExpression__Group_1_1__1__Impl ;
     public final void rule__XRelationalExpression__Group_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6729:1: ( rule__XRelationalExpression__Group_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6730:2: rule__XRelationalExpression__Group_1_1__1__Impl
+            // InternalCheckCfg.g:6729:1: ( rule__XRelationalExpression__Group_1_1__1__Impl )
+            // InternalCheckCfg.g:6730:2: rule__XRelationalExpression__Group_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1__1__Impl_in_rule__XRelationalExpression__Group_1_1__114081);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_1__1__Impl();
 
             state._fsp--;
@@ -20785,25 +20785,25 @@ public final void rule__XRelationalExpression__Group_1_1__1() throws Recognition
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6736:1: rule__XRelationalExpression__Group_1_1__1__Impl : ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) ) ;
+    // InternalCheckCfg.g:6736:1: rule__XRelationalExpression__Group_1_1__1__Impl : ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) ) ;
     public final void rule__XRelationalExpression__Group_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6740:1: ( ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6741:1: ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) )
+            // InternalCheckCfg.g:6740:1: ( ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) ) )
+            // InternalCheckCfg.g:6741:1: ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6741:1: ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6742:1: ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 )
+            // InternalCheckCfg.g:6741:1: ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) )
+            // InternalCheckCfg.g:6742:1: ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getRightOperandAssignment_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6743:1: ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6743:2: rule__XRelationalExpression__RightOperandAssignment_1_1_1
+            // InternalCheckCfg.g:6743:1: ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 )
+            // InternalCheckCfg.g:6743:2: rule__XRelationalExpression__RightOperandAssignment_1_1_1
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__RightOperandAssignment_1_1_1_in_rule__XRelationalExpression__Group_1_1__1__Impl14108);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__RightOperandAssignment_1_1_1();
 
             state._fsp--;
@@ -20836,16 +20836,16 @@ public final void rule__XRelationalExpression__Group_1_1__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6757:1: rule__XRelationalExpression__Group_1_1_0__0 : rule__XRelationalExpression__Group_1_1_0__0__Impl ;
+    // InternalCheckCfg.g:6757:1: rule__XRelationalExpression__Group_1_1_0__0 : rule__XRelationalExpression__Group_1_1_0__0__Impl ;
     public final void rule__XRelationalExpression__Group_1_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6761:1: ( rule__XRelationalExpression__Group_1_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6762:2: rule__XRelationalExpression__Group_1_1_0__0__Impl
+            // InternalCheckCfg.g:6761:1: ( rule__XRelationalExpression__Group_1_1_0__0__Impl )
+            // InternalCheckCfg.g:6762:2: rule__XRelationalExpression__Group_1_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1_0__0__Impl_in_rule__XRelationalExpression__Group_1_1_0__014142);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_1_0__0__Impl();
 
             state._fsp--;
@@ -20869,25 +20869,25 @@ public final void rule__XRelationalExpression__Group_1_1_0__0() throws Recogniti
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6768:1: rule__XRelationalExpression__Group_1_1_0__0__Impl : ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) ) ;
+    // InternalCheckCfg.g:6768:1: rule__XRelationalExpression__Group_1_1_0__0__Impl : ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) ) ;
     public final void rule__XRelationalExpression__Group_1_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6772:1: ( ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6773:1: ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) )
+            // InternalCheckCfg.g:6772:1: ( ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) ) )
+            // InternalCheckCfg.g:6773:1: ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6773:1: ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6774:1: ( rule__XRelationalExpression__Group_1_1_0_0__0 )
+            // InternalCheckCfg.g:6773:1: ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) )
+            // InternalCheckCfg.g:6774:1: ( rule__XRelationalExpression__Group_1_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getGroup_1_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6775:1: ( rule__XRelationalExpression__Group_1_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6775:2: rule__XRelationalExpression__Group_1_1_0_0__0
+            // InternalCheckCfg.g:6775:1: ( rule__XRelationalExpression__Group_1_1_0_0__0 )
+            // InternalCheckCfg.g:6775:2: rule__XRelationalExpression__Group_1_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1_0_0__0_in_rule__XRelationalExpression__Group_1_1_0__0__Impl14169);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_1_0_0__0();
 
             state._fsp--;
@@ -20920,21 +20920,21 @@ public final void rule__XRelationalExpression__Group_1_1_0__0__Impl() throws Rec
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1_0_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6787:1: rule__XRelationalExpression__Group_1_1_0_0__0 : rule__XRelationalExpression__Group_1_1_0_0__0__Impl rule__XRelationalExpression__Group_1_1_0_0__1 ;
+    // InternalCheckCfg.g:6787:1: rule__XRelationalExpression__Group_1_1_0_0__0 : rule__XRelationalExpression__Group_1_1_0_0__0__Impl rule__XRelationalExpression__Group_1_1_0_0__1 ;
     public final void rule__XRelationalExpression__Group_1_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6791:1: ( rule__XRelationalExpression__Group_1_1_0_0__0__Impl rule__XRelationalExpression__Group_1_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6792:2: rule__XRelationalExpression__Group_1_1_0_0__0__Impl rule__XRelationalExpression__Group_1_1_0_0__1
+            // InternalCheckCfg.g:6791:1: ( rule__XRelationalExpression__Group_1_1_0_0__0__Impl rule__XRelationalExpression__Group_1_1_0_0__1 )
+            // InternalCheckCfg.g:6792:2: rule__XRelationalExpression__Group_1_1_0_0__0__Impl rule__XRelationalExpression__Group_1_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1_0_0__0__Impl_in_rule__XRelationalExpression__Group_1_1_0_0__014201);
+            pushFollow(FOLLOW_37);
             rule__XRelationalExpression__Group_1_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1_0_0__1_in_rule__XRelationalExpression__Group_1_1_0_0__014204);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_1_0_0__1();
 
             state._fsp--;
@@ -20958,23 +20958,23 @@ public final void rule__XRelationalExpression__Group_1_1_0_0__0() throws Recogni
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6799:1: rule__XRelationalExpression__Group_1_1_0_0__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:6799:1: rule__XRelationalExpression__Group_1_1_0_0__0__Impl : ( () ) ;
     public final void rule__XRelationalExpression__Group_1_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6803:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6804:1: ( () )
+            // InternalCheckCfg.g:6803:1: ( ( () ) )
+            // InternalCheckCfg.g:6804:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6804:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6805:1: ()
+            // InternalCheckCfg.g:6804:1: ( () )
+            // InternalCheckCfg.g:6805:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6806:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6808:1: 
+            // InternalCheckCfg.g:6806:1: ()
+            // InternalCheckCfg.g:6808:1: 
             {
             }
 
@@ -20999,16 +20999,16 @@ public final void rule__XRelationalExpression__Group_1_1_0_0__0__Impl() throws R
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1_0_0__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6818:1: rule__XRelationalExpression__Group_1_1_0_0__1 : rule__XRelationalExpression__Group_1_1_0_0__1__Impl ;
+    // InternalCheckCfg.g:6818:1: rule__XRelationalExpression__Group_1_1_0_0__1 : rule__XRelationalExpression__Group_1_1_0_0__1__Impl ;
     public final void rule__XRelationalExpression__Group_1_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6822:1: ( rule__XRelationalExpression__Group_1_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6823:2: rule__XRelationalExpression__Group_1_1_0_0__1__Impl
+            // InternalCheckCfg.g:6822:1: ( rule__XRelationalExpression__Group_1_1_0_0__1__Impl )
+            // InternalCheckCfg.g:6823:2: rule__XRelationalExpression__Group_1_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1_0_0__1__Impl_in_rule__XRelationalExpression__Group_1_1_0_0__114262);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_1_0_0__1__Impl();
 
             state._fsp--;
@@ -21032,25 +21032,25 @@ public final void rule__XRelationalExpression__Group_1_1_0_0__1() throws Recogni
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6829:1: rule__XRelationalExpression__Group_1_1_0_0__1__Impl : ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) ) ;
+    // InternalCheckCfg.g:6829:1: rule__XRelationalExpression__Group_1_1_0_0__1__Impl : ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) ) ;
     public final void rule__XRelationalExpression__Group_1_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6833:1: ( ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6834:1: ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) )
+            // InternalCheckCfg.g:6833:1: ( ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) ) )
+            // InternalCheckCfg.g:6834:1: ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6834:1: ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6835:1: ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 )
+            // InternalCheckCfg.g:6834:1: ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) )
+            // InternalCheckCfg.g:6835:1: ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getFeatureAssignment_1_1_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6836:1: ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6836:2: rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1
+            // InternalCheckCfg.g:6836:1: ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 )
+            // InternalCheckCfg.g:6836:2: rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1_in_rule__XRelationalExpression__Group_1_1_0_0__1__Impl14289);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1();
 
             state._fsp--;
@@ -21083,21 +21083,21 @@ public final void rule__XRelationalExpression__Group_1_1_0_0__1__Impl() throws R
 
 
     // $ANTLR start "rule__OpCompare__Group_1__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6850:1: rule__OpCompare__Group_1__0 : rule__OpCompare__Group_1__0__Impl rule__OpCompare__Group_1__1 ;
+    // InternalCheckCfg.g:6850:1: rule__OpCompare__Group_1__0 : rule__OpCompare__Group_1__0__Impl rule__OpCompare__Group_1__1 ;
     public final void rule__OpCompare__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6854:1: ( rule__OpCompare__Group_1__0__Impl rule__OpCompare__Group_1__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6855:2: rule__OpCompare__Group_1__0__Impl rule__OpCompare__Group_1__1
+            // InternalCheckCfg.g:6854:1: ( rule__OpCompare__Group_1__0__Impl rule__OpCompare__Group_1__1 )
+            // InternalCheckCfg.g:6855:2: rule__OpCompare__Group_1__0__Impl rule__OpCompare__Group_1__1
             {
-            pushFollow(FOLLOW_rule__OpCompare__Group_1__0__Impl_in_rule__OpCompare__Group_1__014323);
+            pushFollow(FOLLOW_19);
             rule__OpCompare__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OpCompare__Group_1__1_in_rule__OpCompare__Group_1__014326);
+            pushFollow(FOLLOW_2);
             rule__OpCompare__Group_1__1();
 
             state._fsp--;
@@ -21121,22 +21121,22 @@ public final void rule__OpCompare__Group_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpCompare__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6862:1: rule__OpCompare__Group_1__0__Impl : ( '<' ) ;
+    // InternalCheckCfg.g:6862:1: rule__OpCompare__Group_1__0__Impl : ( '<' ) ;
     public final void rule__OpCompare__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6866:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6867:1: ( '<' )
+            // InternalCheckCfg.g:6866:1: ( ( '<' ) )
+            // InternalCheckCfg.g:6867:1: ( '<' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6867:1: ( '<' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6868:1: '<'
+            // InternalCheckCfg.g:6867:1: ( '<' )
+            // InternalCheckCfg.g:6868:1: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpCompareAccess().getLessThanSignKeyword_1_0()); 
             }
-            match(input,27,FOLLOW_27_in_rule__OpCompare__Group_1__0__Impl14354); if (state.failed) return ;
+            match(input,27,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpCompareAccess().getLessThanSignKeyword_1_0()); 
             }
@@ -21162,16 +21162,16 @@ public final void rule__OpCompare__Group_1__0__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__OpCompare__Group_1__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6881:1: rule__OpCompare__Group_1__1 : rule__OpCompare__Group_1__1__Impl ;
+    // InternalCheckCfg.g:6881:1: rule__OpCompare__Group_1__1 : rule__OpCompare__Group_1__1__Impl ;
     public final void rule__OpCompare__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6885:1: ( rule__OpCompare__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6886:2: rule__OpCompare__Group_1__1__Impl
+            // InternalCheckCfg.g:6885:1: ( rule__OpCompare__Group_1__1__Impl )
+            // InternalCheckCfg.g:6886:2: rule__OpCompare__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__OpCompare__Group_1__1__Impl_in_rule__OpCompare__Group_1__114385);
+            pushFollow(FOLLOW_2);
             rule__OpCompare__Group_1__1__Impl();
 
             state._fsp--;
@@ -21195,22 +21195,22 @@ public final void rule__OpCompare__Group_1__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpCompare__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6892:1: rule__OpCompare__Group_1__1__Impl : ( '=' ) ;
+    // InternalCheckCfg.g:6892:1: rule__OpCompare__Group_1__1__Impl : ( '=' ) ;
     public final void rule__OpCompare__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6896:1: ( ( '=' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6897:1: ( '=' )
+            // InternalCheckCfg.g:6896:1: ( ( '=' ) )
+            // InternalCheckCfg.g:6897:1: ( '=' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6897:1: ( '=' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6898:1: '='
+            // InternalCheckCfg.g:6897:1: ( '=' )
+            // InternalCheckCfg.g:6898:1: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpCompareAccess().getEqualsSignKeyword_1_1()); 
             }
-            match(input,13,FOLLOW_13_in_rule__OpCompare__Group_1__1__Impl14413); if (state.failed) return ;
+            match(input,13,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpCompareAccess().getEqualsSignKeyword_1_1()); 
             }
@@ -21236,21 +21236,21 @@ public final void rule__OpCompare__Group_1__1__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6915:1: rule__XOtherOperatorExpression__Group__0 : rule__XOtherOperatorExpression__Group__0__Impl rule__XOtherOperatorExpression__Group__1 ;
+    // InternalCheckCfg.g:6915:1: rule__XOtherOperatorExpression__Group__0 : rule__XOtherOperatorExpression__Group__0__Impl rule__XOtherOperatorExpression__Group__1 ;
     public final void rule__XOtherOperatorExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6919:1: ( rule__XOtherOperatorExpression__Group__0__Impl rule__XOtherOperatorExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6920:2: rule__XOtherOperatorExpression__Group__0__Impl rule__XOtherOperatorExpression__Group__1
+            // InternalCheckCfg.g:6919:1: ( rule__XOtherOperatorExpression__Group__0__Impl rule__XOtherOperatorExpression__Group__1 )
+            // InternalCheckCfg.g:6920:2: rule__XOtherOperatorExpression__Group__0__Impl rule__XOtherOperatorExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group__0__Impl_in_rule__XOtherOperatorExpression__Group__014448);
+            pushFollow(FOLLOW_41);
             rule__XOtherOperatorExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group__1_in_rule__XOtherOperatorExpression__Group__014451);
+            pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group__1();
 
             state._fsp--;
@@ -21274,22 +21274,22 @@ public final void rule__XOtherOperatorExpression__Group__0() throws RecognitionE
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6927:1: rule__XOtherOperatorExpression__Group__0__Impl : ( ruleXAdditiveExpression ) ;
+    // InternalCheckCfg.g:6927:1: rule__XOtherOperatorExpression__Group__0__Impl : ( ruleXAdditiveExpression ) ;
     public final void rule__XOtherOperatorExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6931:1: ( ( ruleXAdditiveExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6932:1: ( ruleXAdditiveExpression )
+            // InternalCheckCfg.g:6931:1: ( ( ruleXAdditiveExpression ) )
+            // InternalCheckCfg.g:6932:1: ( ruleXAdditiveExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6932:1: ( ruleXAdditiveExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6933:1: ruleXAdditiveExpression
+            // InternalCheckCfg.g:6932:1: ( ruleXAdditiveExpression )
+            // InternalCheckCfg.g:6933:1: ruleXAdditiveExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getXAdditiveExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleXAdditiveExpression_in_rule__XOtherOperatorExpression__Group__0__Impl14478);
+            pushFollow(FOLLOW_2);
             ruleXAdditiveExpression();
 
             state._fsp--;
@@ -21319,16 +21319,16 @@ public final void rule__XOtherOperatorExpression__Group__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6944:1: rule__XOtherOperatorExpression__Group__1 : rule__XOtherOperatorExpression__Group__1__Impl ;
+    // InternalCheckCfg.g:6944:1: rule__XOtherOperatorExpression__Group__1 : rule__XOtherOperatorExpression__Group__1__Impl ;
     public final void rule__XOtherOperatorExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6948:1: ( rule__XOtherOperatorExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6949:2: rule__XOtherOperatorExpression__Group__1__Impl
+            // InternalCheckCfg.g:6948:1: ( rule__XOtherOperatorExpression__Group__1__Impl )
+            // InternalCheckCfg.g:6949:2: rule__XOtherOperatorExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group__1__Impl_in_rule__XOtherOperatorExpression__Group__114507);
+            pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group__1__Impl();
 
             state._fsp--;
@@ -21352,31 +21352,31 @@ public final void rule__XOtherOperatorExpression__Group__1() throws RecognitionE
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6955:1: rule__XOtherOperatorExpression__Group__1__Impl : ( ( rule__XOtherOperatorExpression__Group_1__0 )* ) ;
+    // InternalCheckCfg.g:6955:1: rule__XOtherOperatorExpression__Group__1__Impl : ( ( rule__XOtherOperatorExpression__Group_1__0 )* ) ;
     public final void rule__XOtherOperatorExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6959:1: ( ( ( rule__XOtherOperatorExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6960:1: ( ( rule__XOtherOperatorExpression__Group_1__0 )* )
+            // InternalCheckCfg.g:6959:1: ( ( ( rule__XOtherOperatorExpression__Group_1__0 )* ) )
+            // InternalCheckCfg.g:6960:1: ( ( rule__XOtherOperatorExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6960:1: ( ( rule__XOtherOperatorExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6961:1: ( rule__XOtherOperatorExpression__Group_1__0 )*
+            // InternalCheckCfg.g:6960:1: ( ( rule__XOtherOperatorExpression__Group_1__0 )* )
+            // InternalCheckCfg.g:6961:1: ( rule__XOtherOperatorExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6962:1: ( rule__XOtherOperatorExpression__Group_1__0 )*
+            // InternalCheckCfg.g:6962:1: ( rule__XOtherOperatorExpression__Group_1__0 )*
             loop63:
             do {
                 int alt63=2;
                 alt63 = dfa63.predict(input);
                 switch (alt63) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6962:2: rule__XOtherOperatorExpression__Group_1__0
+            	    // InternalCheckCfg.g:6962:2: rule__XOtherOperatorExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1__0_in_rule__XOtherOperatorExpression__Group__1__Impl14534);
+            	    pushFollow(FOLLOW_42);
             	    rule__XOtherOperatorExpression__Group_1__0();
 
             	    state._fsp--;
@@ -21415,21 +21415,21 @@ public final void rule__XOtherOperatorExpression__Group__1__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6976:1: rule__XOtherOperatorExpression__Group_1__0 : rule__XOtherOperatorExpression__Group_1__0__Impl rule__XOtherOperatorExpression__Group_1__1 ;
+    // InternalCheckCfg.g:6976:1: rule__XOtherOperatorExpression__Group_1__0 : rule__XOtherOperatorExpression__Group_1__0__Impl rule__XOtherOperatorExpression__Group_1__1 ;
     public final void rule__XOtherOperatorExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6980:1: ( rule__XOtherOperatorExpression__Group_1__0__Impl rule__XOtherOperatorExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6981:2: rule__XOtherOperatorExpression__Group_1__0__Impl rule__XOtherOperatorExpression__Group_1__1
+            // InternalCheckCfg.g:6980:1: ( rule__XOtherOperatorExpression__Group_1__0__Impl rule__XOtherOperatorExpression__Group_1__1 )
+            // InternalCheckCfg.g:6981:2: rule__XOtherOperatorExpression__Group_1__0__Impl rule__XOtherOperatorExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1__0__Impl_in_rule__XOtherOperatorExpression__Group_1__014569);
+            pushFollow(FOLLOW_27);
             rule__XOtherOperatorExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1__1_in_rule__XOtherOperatorExpression__Group_1__014572);
+            pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group_1__1();
 
             state._fsp--;
@@ -21453,25 +21453,25 @@ public final void rule__XOtherOperatorExpression__Group_1__0() throws Recognitio
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6988:1: rule__XOtherOperatorExpression__Group_1__0__Impl : ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) ) ;
+    // InternalCheckCfg.g:6988:1: rule__XOtherOperatorExpression__Group_1__0__Impl : ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) ) ;
     public final void rule__XOtherOperatorExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6992:1: ( ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6993:1: ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) )
+            // InternalCheckCfg.g:6992:1: ( ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) ) )
+            // InternalCheckCfg.g:6993:1: ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6993:1: ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6994:1: ( rule__XOtherOperatorExpression__Group_1_0__0 )
+            // InternalCheckCfg.g:6993:1: ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) )
+            // InternalCheckCfg.g:6994:1: ( rule__XOtherOperatorExpression__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getGroup_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6995:1: ( rule__XOtherOperatorExpression__Group_1_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6995:2: rule__XOtherOperatorExpression__Group_1_0__0
+            // InternalCheckCfg.g:6995:1: ( rule__XOtherOperatorExpression__Group_1_0__0 )
+            // InternalCheckCfg.g:6995:2: rule__XOtherOperatorExpression__Group_1_0__0
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1_0__0_in_rule__XOtherOperatorExpression__Group_1__0__Impl14599);
+            pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group_1_0__0();
 
             state._fsp--;
@@ -21504,16 +21504,16 @@ public final void rule__XOtherOperatorExpression__Group_1__0__Impl() throws Reco
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7005:1: rule__XOtherOperatorExpression__Group_1__1 : rule__XOtherOperatorExpression__Group_1__1__Impl ;
+    // InternalCheckCfg.g:7005:1: rule__XOtherOperatorExpression__Group_1__1 : rule__XOtherOperatorExpression__Group_1__1__Impl ;
     public final void rule__XOtherOperatorExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7009:1: ( rule__XOtherOperatorExpression__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7010:2: rule__XOtherOperatorExpression__Group_1__1__Impl
+            // InternalCheckCfg.g:7009:1: ( rule__XOtherOperatorExpression__Group_1__1__Impl )
+            // InternalCheckCfg.g:7010:2: rule__XOtherOperatorExpression__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1__1__Impl_in_rule__XOtherOperatorExpression__Group_1__114629);
+            pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group_1__1__Impl();
 
             state._fsp--;
@@ -21537,25 +21537,25 @@ public final void rule__XOtherOperatorExpression__Group_1__1() throws Recognitio
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7016:1: rule__XOtherOperatorExpression__Group_1__1__Impl : ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) ) ;
+    // InternalCheckCfg.g:7016:1: rule__XOtherOperatorExpression__Group_1__1__Impl : ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) ) ;
     public final void rule__XOtherOperatorExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7020:1: ( ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7021:1: ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) )
+            // InternalCheckCfg.g:7020:1: ( ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) ) )
+            // InternalCheckCfg.g:7021:1: ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7021:1: ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7022:1: ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 )
+            // InternalCheckCfg.g:7021:1: ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) )
+            // InternalCheckCfg.g:7022:1: ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getRightOperandAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7023:1: ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7023:2: rule__XOtherOperatorExpression__RightOperandAssignment_1_1
+            // InternalCheckCfg.g:7023:1: ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 )
+            // InternalCheckCfg.g:7023:2: rule__XOtherOperatorExpression__RightOperandAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__RightOperandAssignment_1_1_in_rule__XOtherOperatorExpression__Group_1__1__Impl14656);
+            pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__RightOperandAssignment_1_1();
 
             state._fsp--;
@@ -21588,16 +21588,16 @@ public final void rule__XOtherOperatorExpression__Group_1__1__Impl() throws Reco
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7037:1: rule__XOtherOperatorExpression__Group_1_0__0 : rule__XOtherOperatorExpression__Group_1_0__0__Impl ;
+    // InternalCheckCfg.g:7037:1: rule__XOtherOperatorExpression__Group_1_0__0 : rule__XOtherOperatorExpression__Group_1_0__0__Impl ;
     public final void rule__XOtherOperatorExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7041:1: ( rule__XOtherOperatorExpression__Group_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7042:2: rule__XOtherOperatorExpression__Group_1_0__0__Impl
+            // InternalCheckCfg.g:7041:1: ( rule__XOtherOperatorExpression__Group_1_0__0__Impl )
+            // InternalCheckCfg.g:7042:2: rule__XOtherOperatorExpression__Group_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1_0__0__Impl_in_rule__XOtherOperatorExpression__Group_1_0__014690);
+            pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group_1_0__0__Impl();
 
             state._fsp--;
@@ -21621,25 +21621,25 @@ public final void rule__XOtherOperatorExpression__Group_1_0__0() throws Recognit
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7048:1: rule__XOtherOperatorExpression__Group_1_0__0__Impl : ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) ) ;
+    // InternalCheckCfg.g:7048:1: rule__XOtherOperatorExpression__Group_1_0__0__Impl : ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) ) ;
     public final void rule__XOtherOperatorExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7052:1: ( ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7053:1: ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) )
+            // InternalCheckCfg.g:7052:1: ( ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) ) )
+            // InternalCheckCfg.g:7053:1: ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7053:1: ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7054:1: ( rule__XOtherOperatorExpression__Group_1_0_0__0 )
+            // InternalCheckCfg.g:7053:1: ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) )
+            // InternalCheckCfg.g:7054:1: ( rule__XOtherOperatorExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getGroup_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7055:1: ( rule__XOtherOperatorExpression__Group_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7055:2: rule__XOtherOperatorExpression__Group_1_0_0__0
+            // InternalCheckCfg.g:7055:1: ( rule__XOtherOperatorExpression__Group_1_0_0__0 )
+            // InternalCheckCfg.g:7055:2: rule__XOtherOperatorExpression__Group_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1_0_0__0_in_rule__XOtherOperatorExpression__Group_1_0__0__Impl14717);
+            pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group_1_0_0__0();
 
             state._fsp--;
@@ -21672,21 +21672,21 @@ public final void rule__XOtherOperatorExpression__Group_1_0__0__Impl() throws Re
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1_0_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7067:1: rule__XOtherOperatorExpression__Group_1_0_0__0 : rule__XOtherOperatorExpression__Group_1_0_0__0__Impl rule__XOtherOperatorExpression__Group_1_0_0__1 ;
+    // InternalCheckCfg.g:7067:1: rule__XOtherOperatorExpression__Group_1_0_0__0 : rule__XOtherOperatorExpression__Group_1_0_0__0__Impl rule__XOtherOperatorExpression__Group_1_0_0__1 ;
     public final void rule__XOtherOperatorExpression__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7071:1: ( rule__XOtherOperatorExpression__Group_1_0_0__0__Impl rule__XOtherOperatorExpression__Group_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7072:2: rule__XOtherOperatorExpression__Group_1_0_0__0__Impl rule__XOtherOperatorExpression__Group_1_0_0__1
+            // InternalCheckCfg.g:7071:1: ( rule__XOtherOperatorExpression__Group_1_0_0__0__Impl rule__XOtherOperatorExpression__Group_1_0_0__1 )
+            // InternalCheckCfg.g:7072:2: rule__XOtherOperatorExpression__Group_1_0_0__0__Impl rule__XOtherOperatorExpression__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1_0_0__0__Impl_in_rule__XOtherOperatorExpression__Group_1_0_0__014749);
+            pushFollow(FOLLOW_41);
             rule__XOtherOperatorExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1_0_0__1_in_rule__XOtherOperatorExpression__Group_1_0_0__014752);
+            pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group_1_0_0__1();
 
             state._fsp--;
@@ -21710,23 +21710,23 @@ public final void rule__XOtherOperatorExpression__Group_1_0_0__0() throws Recogn
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7079:1: rule__XOtherOperatorExpression__Group_1_0_0__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:7079:1: rule__XOtherOperatorExpression__Group_1_0_0__0__Impl : ( () ) ;
     public final void rule__XOtherOperatorExpression__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7083:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7084:1: ( () )
+            // InternalCheckCfg.g:7083:1: ( ( () ) )
+            // InternalCheckCfg.g:7084:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7084:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7085:1: ()
+            // InternalCheckCfg.g:7084:1: ( () )
+            // InternalCheckCfg.g:7085:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7086:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7088:1: 
+            // InternalCheckCfg.g:7086:1: ()
+            // InternalCheckCfg.g:7088:1: 
             {
             }
 
@@ -21751,16 +21751,16 @@ public final void rule__XOtherOperatorExpression__Group_1_0_0__0__Impl() throws
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1_0_0__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7098:1: rule__XOtherOperatorExpression__Group_1_0_0__1 : rule__XOtherOperatorExpression__Group_1_0_0__1__Impl ;
+    // InternalCheckCfg.g:7098:1: rule__XOtherOperatorExpression__Group_1_0_0__1 : rule__XOtherOperatorExpression__Group_1_0_0__1__Impl ;
     public final void rule__XOtherOperatorExpression__Group_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7102:1: ( rule__XOtherOperatorExpression__Group_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7103:2: rule__XOtherOperatorExpression__Group_1_0_0__1__Impl
+            // InternalCheckCfg.g:7102:1: ( rule__XOtherOperatorExpression__Group_1_0_0__1__Impl )
+            // InternalCheckCfg.g:7103:2: rule__XOtherOperatorExpression__Group_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1_0_0__1__Impl_in_rule__XOtherOperatorExpression__Group_1_0_0__114810);
+            pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group_1_0_0__1__Impl();
 
             state._fsp--;
@@ -21784,25 +21784,25 @@ public final void rule__XOtherOperatorExpression__Group_1_0_0__1() throws Recogn
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7109:1: rule__XOtherOperatorExpression__Group_1_0_0__1__Impl : ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) ) ;
+    // InternalCheckCfg.g:7109:1: rule__XOtherOperatorExpression__Group_1_0_0__1__Impl : ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) ) ;
     public final void rule__XOtherOperatorExpression__Group_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7113:1: ( ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7114:1: ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalCheckCfg.g:7113:1: ( ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) ) )
+            // InternalCheckCfg.g:7114:1: ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7114:1: ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7115:1: ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 )
+            // InternalCheckCfg.g:7114:1: ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalCheckCfg.g:7115:1: ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getFeatureAssignment_1_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7116:1: ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7116:2: rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1
+            // InternalCheckCfg.g:7116:1: ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 )
+            // InternalCheckCfg.g:7116:2: rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1_in_rule__XOtherOperatorExpression__Group_1_0_0__1__Impl14837);
+            pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1();
 
             state._fsp--;
@@ -21835,21 +21835,21 @@ public final void rule__XOtherOperatorExpression__Group_1_0_0__1__Impl() throws
 
 
     // $ANTLR start "rule__OpOther__Group_2__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7130:1: rule__OpOther__Group_2__0 : rule__OpOther__Group_2__0__Impl rule__OpOther__Group_2__1 ;
+    // InternalCheckCfg.g:7130:1: rule__OpOther__Group_2__0 : rule__OpOther__Group_2__0__Impl rule__OpOther__Group_2__1 ;
     public final void rule__OpOther__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7134:1: ( rule__OpOther__Group_2__0__Impl rule__OpOther__Group_2__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7135:2: rule__OpOther__Group_2__0__Impl rule__OpOther__Group_2__1
+            // InternalCheckCfg.g:7134:1: ( rule__OpOther__Group_2__0__Impl rule__OpOther__Group_2__1 )
+            // InternalCheckCfg.g:7135:2: rule__OpOther__Group_2__0__Impl rule__OpOther__Group_2__1
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_2__0__Impl_in_rule__OpOther__Group_2__014871);
+            pushFollow(FOLLOW_43);
             rule__OpOther__Group_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OpOther__Group_2__1_in_rule__OpOther__Group_2__014874);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Group_2__1();
 
             state._fsp--;
@@ -21873,22 +21873,22 @@ public final void rule__OpOther__Group_2__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpOther__Group_2__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7142:1: rule__OpOther__Group_2__0__Impl : ( '>' ) ;
+    // InternalCheckCfg.g:7142:1: rule__OpOther__Group_2__0__Impl : ( '>' ) ;
     public final void rule__OpOther__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7146:1: ( ( '>' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7147:1: ( '>' )
+            // InternalCheckCfg.g:7146:1: ( ( '>' ) )
+            // InternalCheckCfg.g:7147:1: ( '>' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7147:1: ( '>' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7148:1: '>'
+            // InternalCheckCfg.g:7147:1: ( '>' )
+            // InternalCheckCfg.g:7148:1: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_2_0()); 
             }
-            match(input,26,FOLLOW_26_in_rule__OpOther__Group_2__0__Impl14902); if (state.failed) return ;
+            match(input,26,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_2_0()); 
             }
@@ -21914,16 +21914,16 @@ public final void rule__OpOther__Group_2__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__OpOther__Group_2__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7161:1: rule__OpOther__Group_2__1 : rule__OpOther__Group_2__1__Impl ;
+    // InternalCheckCfg.g:7161:1: rule__OpOther__Group_2__1 : rule__OpOther__Group_2__1__Impl ;
     public final void rule__OpOther__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7165:1: ( rule__OpOther__Group_2__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7166:2: rule__OpOther__Group_2__1__Impl
+            // InternalCheckCfg.g:7165:1: ( rule__OpOther__Group_2__1__Impl )
+            // InternalCheckCfg.g:7166:2: rule__OpOther__Group_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_2__1__Impl_in_rule__OpOther__Group_2__114933);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Group_2__1__Impl();
 
             state._fsp--;
@@ -21947,22 +21947,22 @@ public final void rule__OpOther__Group_2__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpOther__Group_2__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7172:1: rule__OpOther__Group_2__1__Impl : ( '..' ) ;
+    // InternalCheckCfg.g:7172:1: rule__OpOther__Group_2__1__Impl : ( '..' ) ;
     public final void rule__OpOther__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7176:1: ( ( '..' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7177:1: ( '..' )
+            // InternalCheckCfg.g:7176:1: ( ( '..' ) )
+            // InternalCheckCfg.g:7177:1: ( '..' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7177:1: ( '..' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7178:1: '..'
+            // InternalCheckCfg.g:7177:1: ( '..' )
+            // InternalCheckCfg.g:7178:1: '..'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getFullStopFullStopKeyword_2_1()); 
             }
-            match(input,30,FOLLOW_30_in_rule__OpOther__Group_2__1__Impl14961); if (state.failed) return ;
+            match(input,30,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpOtherAccess().getFullStopFullStopKeyword_2_1()); 
             }
@@ -21988,21 +21988,21 @@ public final void rule__OpOther__Group_2__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__OpOther__Group_5__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7195:1: rule__OpOther__Group_5__0 : rule__OpOther__Group_5__0__Impl rule__OpOther__Group_5__1 ;
+    // InternalCheckCfg.g:7195:1: rule__OpOther__Group_5__0 : rule__OpOther__Group_5__0__Impl rule__OpOther__Group_5__1 ;
     public final void rule__OpOther__Group_5__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7199:1: ( rule__OpOther__Group_5__0__Impl rule__OpOther__Group_5__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7200:2: rule__OpOther__Group_5__0__Impl rule__OpOther__Group_5__1
+            // InternalCheckCfg.g:7199:1: ( rule__OpOther__Group_5__0__Impl rule__OpOther__Group_5__1 )
+            // InternalCheckCfg.g:7200:2: rule__OpOther__Group_5__0__Impl rule__OpOther__Group_5__1
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_5__0__Impl_in_rule__OpOther__Group_5__014996);
+            pushFollow(FOLLOW_44);
             rule__OpOther__Group_5__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OpOther__Group_5__1_in_rule__OpOther__Group_5__014999);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Group_5__1();
 
             state._fsp--;
@@ -22026,22 +22026,22 @@ public final void rule__OpOther__Group_5__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpOther__Group_5__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7207:1: rule__OpOther__Group_5__0__Impl : ( '>' ) ;
+    // InternalCheckCfg.g:7207:1: rule__OpOther__Group_5__0__Impl : ( '>' ) ;
     public final void rule__OpOther__Group_5__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7211:1: ( ( '>' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7212:1: ( '>' )
+            // InternalCheckCfg.g:7211:1: ( ( '>' ) )
+            // InternalCheckCfg.g:7212:1: ( '>' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7212:1: ( '>' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7213:1: '>'
+            // InternalCheckCfg.g:7212:1: ( '>' )
+            // InternalCheckCfg.g:7213:1: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_0()); 
             }
-            match(input,26,FOLLOW_26_in_rule__OpOther__Group_5__0__Impl15027); if (state.failed) return ;
+            match(input,26,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_0()); 
             }
@@ -22067,16 +22067,16 @@ public final void rule__OpOther__Group_5__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__OpOther__Group_5__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7226:1: rule__OpOther__Group_5__1 : rule__OpOther__Group_5__1__Impl ;
+    // InternalCheckCfg.g:7226:1: rule__OpOther__Group_5__1 : rule__OpOther__Group_5__1__Impl ;
     public final void rule__OpOther__Group_5__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7230:1: ( rule__OpOther__Group_5__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7231:2: rule__OpOther__Group_5__1__Impl
+            // InternalCheckCfg.g:7230:1: ( rule__OpOther__Group_5__1__Impl )
+            // InternalCheckCfg.g:7231:2: rule__OpOther__Group_5__1__Impl
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_5__1__Impl_in_rule__OpOther__Group_5__115058);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Group_5__1__Impl();
 
             state._fsp--;
@@ -22100,25 +22100,25 @@ public final void rule__OpOther__Group_5__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpOther__Group_5__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7237:1: rule__OpOther__Group_5__1__Impl : ( ( rule__OpOther__Alternatives_5_1 ) ) ;
+    // InternalCheckCfg.g:7237:1: rule__OpOther__Group_5__1__Impl : ( ( rule__OpOther__Alternatives_5_1 ) ) ;
     public final void rule__OpOther__Group_5__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7241:1: ( ( ( rule__OpOther__Alternatives_5_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7242:1: ( ( rule__OpOther__Alternatives_5_1 ) )
+            // InternalCheckCfg.g:7241:1: ( ( ( rule__OpOther__Alternatives_5_1 ) ) )
+            // InternalCheckCfg.g:7242:1: ( ( rule__OpOther__Alternatives_5_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7242:1: ( ( rule__OpOther__Alternatives_5_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7243:1: ( rule__OpOther__Alternatives_5_1 )
+            // InternalCheckCfg.g:7242:1: ( ( rule__OpOther__Alternatives_5_1 ) )
+            // InternalCheckCfg.g:7243:1: ( rule__OpOther__Alternatives_5_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getAlternatives_5_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7244:1: ( rule__OpOther__Alternatives_5_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7244:2: rule__OpOther__Alternatives_5_1
+            // InternalCheckCfg.g:7244:1: ( rule__OpOther__Alternatives_5_1 )
+            // InternalCheckCfg.g:7244:2: rule__OpOther__Alternatives_5_1
             {
-            pushFollow(FOLLOW_rule__OpOther__Alternatives_5_1_in_rule__OpOther__Group_5__1__Impl15085);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Alternatives_5_1();
 
             state._fsp--;
@@ -22151,16 +22151,16 @@ public final void rule__OpOther__Group_5__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__OpOther__Group_5_1_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7258:1: rule__OpOther__Group_5_1_0__0 : rule__OpOther__Group_5_1_0__0__Impl ;
+    // InternalCheckCfg.g:7258:1: rule__OpOther__Group_5_1_0__0 : rule__OpOther__Group_5_1_0__0__Impl ;
     public final void rule__OpOther__Group_5_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7262:1: ( rule__OpOther__Group_5_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7263:2: rule__OpOther__Group_5_1_0__0__Impl
+            // InternalCheckCfg.g:7262:1: ( rule__OpOther__Group_5_1_0__0__Impl )
+            // InternalCheckCfg.g:7263:2: rule__OpOther__Group_5_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_5_1_0__0__Impl_in_rule__OpOther__Group_5_1_0__015119);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Group_5_1_0__0__Impl();
 
             state._fsp--;
@@ -22184,25 +22184,25 @@ public final void rule__OpOther__Group_5_1_0__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpOther__Group_5_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7269:1: rule__OpOther__Group_5_1_0__0__Impl : ( ( rule__OpOther__Group_5_1_0_0__0 ) ) ;
+    // InternalCheckCfg.g:7269:1: rule__OpOther__Group_5_1_0__0__Impl : ( ( rule__OpOther__Group_5_1_0_0__0 ) ) ;
     public final void rule__OpOther__Group_5_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7273:1: ( ( ( rule__OpOther__Group_5_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7274:1: ( ( rule__OpOther__Group_5_1_0_0__0 ) )
+            // InternalCheckCfg.g:7273:1: ( ( ( rule__OpOther__Group_5_1_0_0__0 ) ) )
+            // InternalCheckCfg.g:7274:1: ( ( rule__OpOther__Group_5_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7274:1: ( ( rule__OpOther__Group_5_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7275:1: ( rule__OpOther__Group_5_1_0_0__0 )
+            // InternalCheckCfg.g:7274:1: ( ( rule__OpOther__Group_5_1_0_0__0 ) )
+            // InternalCheckCfg.g:7275:1: ( rule__OpOther__Group_5_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getGroup_5_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7276:1: ( rule__OpOther__Group_5_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7276:2: rule__OpOther__Group_5_1_0_0__0
+            // InternalCheckCfg.g:7276:1: ( rule__OpOther__Group_5_1_0_0__0 )
+            // InternalCheckCfg.g:7276:2: rule__OpOther__Group_5_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_5_1_0_0__0_in_rule__OpOther__Group_5_1_0__0__Impl15146);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Group_5_1_0_0__0();
 
             state._fsp--;
@@ -22235,21 +22235,21 @@ public final void rule__OpOther__Group_5_1_0__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__OpOther__Group_5_1_0_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7288:1: rule__OpOther__Group_5_1_0_0__0 : rule__OpOther__Group_5_1_0_0__0__Impl rule__OpOther__Group_5_1_0_0__1 ;
+    // InternalCheckCfg.g:7288:1: rule__OpOther__Group_5_1_0_0__0 : rule__OpOther__Group_5_1_0_0__0__Impl rule__OpOther__Group_5_1_0_0__1 ;
     public final void rule__OpOther__Group_5_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7292:1: ( rule__OpOther__Group_5_1_0_0__0__Impl rule__OpOther__Group_5_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7293:2: rule__OpOther__Group_5_1_0_0__0__Impl rule__OpOther__Group_5_1_0_0__1
+            // InternalCheckCfg.g:7292:1: ( rule__OpOther__Group_5_1_0_0__0__Impl rule__OpOther__Group_5_1_0_0__1 )
+            // InternalCheckCfg.g:7293:2: rule__OpOther__Group_5_1_0_0__0__Impl rule__OpOther__Group_5_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_5_1_0_0__0__Impl_in_rule__OpOther__Group_5_1_0_0__015178);
+            pushFollow(FOLLOW_44);
             rule__OpOther__Group_5_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OpOther__Group_5_1_0_0__1_in_rule__OpOther__Group_5_1_0_0__015181);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Group_5_1_0_0__1();
 
             state._fsp--;
@@ -22273,22 +22273,22 @@ public final void rule__OpOther__Group_5_1_0_0__0() throws RecognitionException
 
 
     // $ANTLR start "rule__OpOther__Group_5_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7300:1: rule__OpOther__Group_5_1_0_0__0__Impl : ( '>' ) ;
+    // InternalCheckCfg.g:7300:1: rule__OpOther__Group_5_1_0_0__0__Impl : ( '>' ) ;
     public final void rule__OpOther__Group_5_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7304:1: ( ( '>' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7305:1: ( '>' )
+            // InternalCheckCfg.g:7304:1: ( ( '>' ) )
+            // InternalCheckCfg.g:7305:1: ( '>' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7305:1: ( '>' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7306:1: '>'
+            // InternalCheckCfg.g:7305:1: ( '>' )
+            // InternalCheckCfg.g:7306:1: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_1_0_0_0()); 
             }
-            match(input,26,FOLLOW_26_in_rule__OpOther__Group_5_1_0_0__0__Impl15209); if (state.failed) return ;
+            match(input,26,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_1_0_0_0()); 
             }
@@ -22314,16 +22314,16 @@ public final void rule__OpOther__Group_5_1_0_0__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__OpOther__Group_5_1_0_0__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7319:1: rule__OpOther__Group_5_1_0_0__1 : rule__OpOther__Group_5_1_0_0__1__Impl ;
+    // InternalCheckCfg.g:7319:1: rule__OpOther__Group_5_1_0_0__1 : rule__OpOther__Group_5_1_0_0__1__Impl ;
     public final void rule__OpOther__Group_5_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7323:1: ( rule__OpOther__Group_5_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7324:2: rule__OpOther__Group_5_1_0_0__1__Impl
+            // InternalCheckCfg.g:7323:1: ( rule__OpOther__Group_5_1_0_0__1__Impl )
+            // InternalCheckCfg.g:7324:2: rule__OpOther__Group_5_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_5_1_0_0__1__Impl_in_rule__OpOther__Group_5_1_0_0__115240);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Group_5_1_0_0__1__Impl();
 
             state._fsp--;
@@ -22347,22 +22347,22 @@ public final void rule__OpOther__Group_5_1_0_0__1() throws RecognitionException
 
 
     // $ANTLR start "rule__OpOther__Group_5_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7330:1: rule__OpOther__Group_5_1_0_0__1__Impl : ( '>' ) ;
+    // InternalCheckCfg.g:7330:1: rule__OpOther__Group_5_1_0_0__1__Impl : ( '>' ) ;
     public final void rule__OpOther__Group_5_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7334:1: ( ( '>' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7335:1: ( '>' )
+            // InternalCheckCfg.g:7334:1: ( ( '>' ) )
+            // InternalCheckCfg.g:7335:1: ( '>' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7335:1: ( '>' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7336:1: '>'
+            // InternalCheckCfg.g:7335:1: ( '>' )
+            // InternalCheckCfg.g:7336:1: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_1_0_0_1()); 
             }
-            match(input,26,FOLLOW_26_in_rule__OpOther__Group_5_1_0_0__1__Impl15268); if (state.failed) return ;
+            match(input,26,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_1_0_0_1()); 
             }
@@ -22388,21 +22388,21 @@ public final void rule__OpOther__Group_5_1_0_0__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__OpOther__Group_6__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7353:1: rule__OpOther__Group_6__0 : rule__OpOther__Group_6__0__Impl rule__OpOther__Group_6__1 ;
+    // InternalCheckCfg.g:7353:1: rule__OpOther__Group_6__0 : rule__OpOther__Group_6__0__Impl rule__OpOther__Group_6__1 ;
     public final void rule__OpOther__Group_6__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7357:1: ( rule__OpOther__Group_6__0__Impl rule__OpOther__Group_6__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7358:2: rule__OpOther__Group_6__0__Impl rule__OpOther__Group_6__1
+            // InternalCheckCfg.g:7357:1: ( rule__OpOther__Group_6__0__Impl rule__OpOther__Group_6__1 )
+            // InternalCheckCfg.g:7358:2: rule__OpOther__Group_6__0__Impl rule__OpOther__Group_6__1
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_6__0__Impl_in_rule__OpOther__Group_6__015303);
+            pushFollow(FOLLOW_45);
             rule__OpOther__Group_6__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OpOther__Group_6__1_in_rule__OpOther__Group_6__015306);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Group_6__1();
 
             state._fsp--;
@@ -22426,22 +22426,22 @@ public final void rule__OpOther__Group_6__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpOther__Group_6__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7365:1: rule__OpOther__Group_6__0__Impl : ( '<' ) ;
+    // InternalCheckCfg.g:7365:1: rule__OpOther__Group_6__0__Impl : ( '<' ) ;
     public final void rule__OpOther__Group_6__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7369:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7370:1: ( '<' )
+            // InternalCheckCfg.g:7369:1: ( ( '<' ) )
+            // InternalCheckCfg.g:7370:1: ( '<' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7370:1: ( '<' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7371:1: '<'
+            // InternalCheckCfg.g:7370:1: ( '<' )
+            // InternalCheckCfg.g:7371:1: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_0()); 
             }
-            match(input,27,FOLLOW_27_in_rule__OpOther__Group_6__0__Impl15334); if (state.failed) return ;
+            match(input,27,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_0()); 
             }
@@ -22467,16 +22467,16 @@ public final void rule__OpOther__Group_6__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__OpOther__Group_6__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7384:1: rule__OpOther__Group_6__1 : rule__OpOther__Group_6__1__Impl ;
+    // InternalCheckCfg.g:7384:1: rule__OpOther__Group_6__1 : rule__OpOther__Group_6__1__Impl ;
     public final void rule__OpOther__Group_6__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7388:1: ( rule__OpOther__Group_6__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7389:2: rule__OpOther__Group_6__1__Impl
+            // InternalCheckCfg.g:7388:1: ( rule__OpOther__Group_6__1__Impl )
+            // InternalCheckCfg.g:7389:2: rule__OpOther__Group_6__1__Impl
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_6__1__Impl_in_rule__OpOther__Group_6__115365);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Group_6__1__Impl();
 
             state._fsp--;
@@ -22500,25 +22500,25 @@ public final void rule__OpOther__Group_6__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpOther__Group_6__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7395:1: rule__OpOther__Group_6__1__Impl : ( ( rule__OpOther__Alternatives_6_1 ) ) ;
+    // InternalCheckCfg.g:7395:1: rule__OpOther__Group_6__1__Impl : ( ( rule__OpOther__Alternatives_6_1 ) ) ;
     public final void rule__OpOther__Group_6__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7399:1: ( ( ( rule__OpOther__Alternatives_6_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7400:1: ( ( rule__OpOther__Alternatives_6_1 ) )
+            // InternalCheckCfg.g:7399:1: ( ( ( rule__OpOther__Alternatives_6_1 ) ) )
+            // InternalCheckCfg.g:7400:1: ( ( rule__OpOther__Alternatives_6_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7400:1: ( ( rule__OpOther__Alternatives_6_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7401:1: ( rule__OpOther__Alternatives_6_1 )
+            // InternalCheckCfg.g:7400:1: ( ( rule__OpOther__Alternatives_6_1 ) )
+            // InternalCheckCfg.g:7401:1: ( rule__OpOther__Alternatives_6_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getAlternatives_6_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7402:1: ( rule__OpOther__Alternatives_6_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7402:2: rule__OpOther__Alternatives_6_1
+            // InternalCheckCfg.g:7402:1: ( rule__OpOther__Alternatives_6_1 )
+            // InternalCheckCfg.g:7402:2: rule__OpOther__Alternatives_6_1
             {
-            pushFollow(FOLLOW_rule__OpOther__Alternatives_6_1_in_rule__OpOther__Group_6__1__Impl15392);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Alternatives_6_1();
 
             state._fsp--;
@@ -22551,16 +22551,16 @@ public final void rule__OpOther__Group_6__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__OpOther__Group_6_1_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7416:1: rule__OpOther__Group_6_1_0__0 : rule__OpOther__Group_6_1_0__0__Impl ;
+    // InternalCheckCfg.g:7416:1: rule__OpOther__Group_6_1_0__0 : rule__OpOther__Group_6_1_0__0__Impl ;
     public final void rule__OpOther__Group_6_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7420:1: ( rule__OpOther__Group_6_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7421:2: rule__OpOther__Group_6_1_0__0__Impl
+            // InternalCheckCfg.g:7420:1: ( rule__OpOther__Group_6_1_0__0__Impl )
+            // InternalCheckCfg.g:7421:2: rule__OpOther__Group_6_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_6_1_0__0__Impl_in_rule__OpOther__Group_6_1_0__015426);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Group_6_1_0__0__Impl();
 
             state._fsp--;
@@ -22584,25 +22584,25 @@ public final void rule__OpOther__Group_6_1_0__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpOther__Group_6_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7427:1: rule__OpOther__Group_6_1_0__0__Impl : ( ( rule__OpOther__Group_6_1_0_0__0 ) ) ;
+    // InternalCheckCfg.g:7427:1: rule__OpOther__Group_6_1_0__0__Impl : ( ( rule__OpOther__Group_6_1_0_0__0 ) ) ;
     public final void rule__OpOther__Group_6_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7431:1: ( ( ( rule__OpOther__Group_6_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7432:1: ( ( rule__OpOther__Group_6_1_0_0__0 ) )
+            // InternalCheckCfg.g:7431:1: ( ( ( rule__OpOther__Group_6_1_0_0__0 ) ) )
+            // InternalCheckCfg.g:7432:1: ( ( rule__OpOther__Group_6_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7432:1: ( ( rule__OpOther__Group_6_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7433:1: ( rule__OpOther__Group_6_1_0_0__0 )
+            // InternalCheckCfg.g:7432:1: ( ( rule__OpOther__Group_6_1_0_0__0 ) )
+            // InternalCheckCfg.g:7433:1: ( rule__OpOther__Group_6_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getGroup_6_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7434:1: ( rule__OpOther__Group_6_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7434:2: rule__OpOther__Group_6_1_0_0__0
+            // InternalCheckCfg.g:7434:1: ( rule__OpOther__Group_6_1_0_0__0 )
+            // InternalCheckCfg.g:7434:2: rule__OpOther__Group_6_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_6_1_0_0__0_in_rule__OpOther__Group_6_1_0__0__Impl15453);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Group_6_1_0_0__0();
 
             state._fsp--;
@@ -22635,21 +22635,21 @@ public final void rule__OpOther__Group_6_1_0__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__OpOther__Group_6_1_0_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7446:1: rule__OpOther__Group_6_1_0_0__0 : rule__OpOther__Group_6_1_0_0__0__Impl rule__OpOther__Group_6_1_0_0__1 ;
+    // InternalCheckCfg.g:7446:1: rule__OpOther__Group_6_1_0_0__0 : rule__OpOther__Group_6_1_0_0__0__Impl rule__OpOther__Group_6_1_0_0__1 ;
     public final void rule__OpOther__Group_6_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7450:1: ( rule__OpOther__Group_6_1_0_0__0__Impl rule__OpOther__Group_6_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7451:2: rule__OpOther__Group_6_1_0_0__0__Impl rule__OpOther__Group_6_1_0_0__1
+            // InternalCheckCfg.g:7450:1: ( rule__OpOther__Group_6_1_0_0__0__Impl rule__OpOther__Group_6_1_0_0__1 )
+            // InternalCheckCfg.g:7451:2: rule__OpOther__Group_6_1_0_0__0__Impl rule__OpOther__Group_6_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_6_1_0_0__0__Impl_in_rule__OpOther__Group_6_1_0_0__015485);
+            pushFollow(FOLLOW_29);
             rule__OpOther__Group_6_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OpOther__Group_6_1_0_0__1_in_rule__OpOther__Group_6_1_0_0__015488);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Group_6_1_0_0__1();
 
             state._fsp--;
@@ -22673,22 +22673,22 @@ public final void rule__OpOther__Group_6_1_0_0__0() throws RecognitionException
 
 
     // $ANTLR start "rule__OpOther__Group_6_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7458:1: rule__OpOther__Group_6_1_0_0__0__Impl : ( '<' ) ;
+    // InternalCheckCfg.g:7458:1: rule__OpOther__Group_6_1_0_0__0__Impl : ( '<' ) ;
     public final void rule__OpOther__Group_6_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7462:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7463:1: ( '<' )
+            // InternalCheckCfg.g:7462:1: ( ( '<' ) )
+            // InternalCheckCfg.g:7463:1: ( '<' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7463:1: ( '<' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7464:1: '<'
+            // InternalCheckCfg.g:7463:1: ( '<' )
+            // InternalCheckCfg.g:7464:1: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_1_0_0_0()); 
             }
-            match(input,27,FOLLOW_27_in_rule__OpOther__Group_6_1_0_0__0__Impl15516); if (state.failed) return ;
+            match(input,27,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_1_0_0_0()); 
             }
@@ -22714,16 +22714,16 @@ public final void rule__OpOther__Group_6_1_0_0__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__OpOther__Group_6_1_0_0__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7477:1: rule__OpOther__Group_6_1_0_0__1 : rule__OpOther__Group_6_1_0_0__1__Impl ;
+    // InternalCheckCfg.g:7477:1: rule__OpOther__Group_6_1_0_0__1 : rule__OpOther__Group_6_1_0_0__1__Impl ;
     public final void rule__OpOther__Group_6_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7481:1: ( rule__OpOther__Group_6_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7482:2: rule__OpOther__Group_6_1_0_0__1__Impl
+            // InternalCheckCfg.g:7481:1: ( rule__OpOther__Group_6_1_0_0__1__Impl )
+            // InternalCheckCfg.g:7482:2: rule__OpOther__Group_6_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_6_1_0_0__1__Impl_in_rule__OpOther__Group_6_1_0_0__115547);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Group_6_1_0_0__1__Impl();
 
             state._fsp--;
@@ -22747,22 +22747,22 @@ public final void rule__OpOther__Group_6_1_0_0__1() throws RecognitionException
 
 
     // $ANTLR start "rule__OpOther__Group_6_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7488:1: rule__OpOther__Group_6_1_0_0__1__Impl : ( '<' ) ;
+    // InternalCheckCfg.g:7488:1: rule__OpOther__Group_6_1_0_0__1__Impl : ( '<' ) ;
     public final void rule__OpOther__Group_6_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7492:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7493:1: ( '<' )
+            // InternalCheckCfg.g:7492:1: ( ( '<' ) )
+            // InternalCheckCfg.g:7493:1: ( '<' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7493:1: ( '<' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7494:1: '<'
+            // InternalCheckCfg.g:7493:1: ( '<' )
+            // InternalCheckCfg.g:7494:1: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_1_0_0_1()); 
             }
-            match(input,27,FOLLOW_27_in_rule__OpOther__Group_6_1_0_0__1__Impl15575); if (state.failed) return ;
+            match(input,27,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_1_0_0_1()); 
             }
@@ -22788,21 +22788,21 @@ public final void rule__OpOther__Group_6_1_0_0__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7511:1: rule__XAdditiveExpression__Group__0 : rule__XAdditiveExpression__Group__0__Impl rule__XAdditiveExpression__Group__1 ;
+    // InternalCheckCfg.g:7511:1: rule__XAdditiveExpression__Group__0 : rule__XAdditiveExpression__Group__0__Impl rule__XAdditiveExpression__Group__1 ;
     public final void rule__XAdditiveExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7515:1: ( rule__XAdditiveExpression__Group__0__Impl rule__XAdditiveExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7516:2: rule__XAdditiveExpression__Group__0__Impl rule__XAdditiveExpression__Group__1
+            // InternalCheckCfg.g:7515:1: ( rule__XAdditiveExpression__Group__0__Impl rule__XAdditiveExpression__Group__1 )
+            // InternalCheckCfg.g:7516:2: rule__XAdditiveExpression__Group__0__Impl rule__XAdditiveExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group__0__Impl_in_rule__XAdditiveExpression__Group__015610);
+            pushFollow(FOLLOW_46);
             rule__XAdditiveExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group__1_in_rule__XAdditiveExpression__Group__015613);
+            pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group__1();
 
             state._fsp--;
@@ -22826,22 +22826,22 @@ public final void rule__XAdditiveExpression__Group__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7523:1: rule__XAdditiveExpression__Group__0__Impl : ( ruleXMultiplicativeExpression ) ;
+    // InternalCheckCfg.g:7523:1: rule__XAdditiveExpression__Group__0__Impl : ( ruleXMultiplicativeExpression ) ;
     public final void rule__XAdditiveExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7527:1: ( ( ruleXMultiplicativeExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7528:1: ( ruleXMultiplicativeExpression )
+            // InternalCheckCfg.g:7527:1: ( ( ruleXMultiplicativeExpression ) )
+            // InternalCheckCfg.g:7528:1: ( ruleXMultiplicativeExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7528:1: ( ruleXMultiplicativeExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7529:1: ruleXMultiplicativeExpression
+            // InternalCheckCfg.g:7528:1: ( ruleXMultiplicativeExpression )
+            // InternalCheckCfg.g:7529:1: ruleXMultiplicativeExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getXMultiplicativeExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleXMultiplicativeExpression_in_rule__XAdditiveExpression__Group__0__Impl15640);
+            pushFollow(FOLLOW_2);
             ruleXMultiplicativeExpression();
 
             state._fsp--;
@@ -22871,16 +22871,16 @@ public final void rule__XAdditiveExpression__Group__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7540:1: rule__XAdditiveExpression__Group__1 : rule__XAdditiveExpression__Group__1__Impl ;
+    // InternalCheckCfg.g:7540:1: rule__XAdditiveExpression__Group__1 : rule__XAdditiveExpression__Group__1__Impl ;
     public final void rule__XAdditiveExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7544:1: ( rule__XAdditiveExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7545:2: rule__XAdditiveExpression__Group__1__Impl
+            // InternalCheckCfg.g:7544:1: ( rule__XAdditiveExpression__Group__1__Impl )
+            // InternalCheckCfg.g:7545:2: rule__XAdditiveExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group__1__Impl_in_rule__XAdditiveExpression__Group__115669);
+            pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group__1__Impl();
 
             state._fsp--;
@@ -22904,22 +22904,22 @@ public final void rule__XAdditiveExpression__Group__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7551:1: rule__XAdditiveExpression__Group__1__Impl : ( ( rule__XAdditiveExpression__Group_1__0 )* ) ;
+    // InternalCheckCfg.g:7551:1: rule__XAdditiveExpression__Group__1__Impl : ( ( rule__XAdditiveExpression__Group_1__0 )* ) ;
     public final void rule__XAdditiveExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7555:1: ( ( ( rule__XAdditiveExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7556:1: ( ( rule__XAdditiveExpression__Group_1__0 )* )
+            // InternalCheckCfg.g:7555:1: ( ( ( rule__XAdditiveExpression__Group_1__0 )* ) )
+            // InternalCheckCfg.g:7556:1: ( ( rule__XAdditiveExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7556:1: ( ( rule__XAdditiveExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7557:1: ( rule__XAdditiveExpression__Group_1__0 )*
+            // InternalCheckCfg.g:7556:1: ( ( rule__XAdditiveExpression__Group_1__0 )* )
+            // InternalCheckCfg.g:7557:1: ( rule__XAdditiveExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7558:1: ( rule__XAdditiveExpression__Group_1__0 )*
+            // InternalCheckCfg.g:7558:1: ( rule__XAdditiveExpression__Group_1__0 )*
             loop64:
             do {
                 int alt64=2;
@@ -22947,9 +22947,9 @@ else if ( (LA64_0==34) ) {
 
                 switch (alt64) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7558:2: rule__XAdditiveExpression__Group_1__0
+            	    // InternalCheckCfg.g:7558:2: rule__XAdditiveExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1__0_in_rule__XAdditiveExpression__Group__1__Impl15696);
+            	    pushFollow(FOLLOW_47);
             	    rule__XAdditiveExpression__Group_1__0();
 
             	    state._fsp--;
@@ -22988,21 +22988,21 @@ else if ( (LA64_0==34) ) {
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7572:1: rule__XAdditiveExpression__Group_1__0 : rule__XAdditiveExpression__Group_1__0__Impl rule__XAdditiveExpression__Group_1__1 ;
+    // InternalCheckCfg.g:7572:1: rule__XAdditiveExpression__Group_1__0 : rule__XAdditiveExpression__Group_1__0__Impl rule__XAdditiveExpression__Group_1__1 ;
     public final void rule__XAdditiveExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7576:1: ( rule__XAdditiveExpression__Group_1__0__Impl rule__XAdditiveExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7577:2: rule__XAdditiveExpression__Group_1__0__Impl rule__XAdditiveExpression__Group_1__1
+            // InternalCheckCfg.g:7576:1: ( rule__XAdditiveExpression__Group_1__0__Impl rule__XAdditiveExpression__Group_1__1 )
+            // InternalCheckCfg.g:7577:2: rule__XAdditiveExpression__Group_1__0__Impl rule__XAdditiveExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1__0__Impl_in_rule__XAdditiveExpression__Group_1__015731);
+            pushFollow(FOLLOW_27);
             rule__XAdditiveExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1__1_in_rule__XAdditiveExpression__Group_1__015734);
+            pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group_1__1();
 
             state._fsp--;
@@ -23026,25 +23026,25 @@ public final void rule__XAdditiveExpression__Group_1__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7584:1: rule__XAdditiveExpression__Group_1__0__Impl : ( ( rule__XAdditiveExpression__Group_1_0__0 ) ) ;
+    // InternalCheckCfg.g:7584:1: rule__XAdditiveExpression__Group_1__0__Impl : ( ( rule__XAdditiveExpression__Group_1_0__0 ) ) ;
     public final void rule__XAdditiveExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7588:1: ( ( ( rule__XAdditiveExpression__Group_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7589:1: ( ( rule__XAdditiveExpression__Group_1_0__0 ) )
+            // InternalCheckCfg.g:7588:1: ( ( ( rule__XAdditiveExpression__Group_1_0__0 ) ) )
+            // InternalCheckCfg.g:7589:1: ( ( rule__XAdditiveExpression__Group_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7589:1: ( ( rule__XAdditiveExpression__Group_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7590:1: ( rule__XAdditiveExpression__Group_1_0__0 )
+            // InternalCheckCfg.g:7589:1: ( ( rule__XAdditiveExpression__Group_1_0__0 ) )
+            // InternalCheckCfg.g:7590:1: ( rule__XAdditiveExpression__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getGroup_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7591:1: ( rule__XAdditiveExpression__Group_1_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7591:2: rule__XAdditiveExpression__Group_1_0__0
+            // InternalCheckCfg.g:7591:1: ( rule__XAdditiveExpression__Group_1_0__0 )
+            // InternalCheckCfg.g:7591:2: rule__XAdditiveExpression__Group_1_0__0
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1_0__0_in_rule__XAdditiveExpression__Group_1__0__Impl15761);
+            pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group_1_0__0();
 
             state._fsp--;
@@ -23077,16 +23077,16 @@ public final void rule__XAdditiveExpression__Group_1__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7601:1: rule__XAdditiveExpression__Group_1__1 : rule__XAdditiveExpression__Group_1__1__Impl ;
+    // InternalCheckCfg.g:7601:1: rule__XAdditiveExpression__Group_1__1 : rule__XAdditiveExpression__Group_1__1__Impl ;
     public final void rule__XAdditiveExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7605:1: ( rule__XAdditiveExpression__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7606:2: rule__XAdditiveExpression__Group_1__1__Impl
+            // InternalCheckCfg.g:7605:1: ( rule__XAdditiveExpression__Group_1__1__Impl )
+            // InternalCheckCfg.g:7606:2: rule__XAdditiveExpression__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1__1__Impl_in_rule__XAdditiveExpression__Group_1__115791);
+            pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group_1__1__Impl();
 
             state._fsp--;
@@ -23110,25 +23110,25 @@ public final void rule__XAdditiveExpression__Group_1__1() throws RecognitionExce
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7612:1: rule__XAdditiveExpression__Group_1__1__Impl : ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) ) ;
+    // InternalCheckCfg.g:7612:1: rule__XAdditiveExpression__Group_1__1__Impl : ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) ) ;
     public final void rule__XAdditiveExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7616:1: ( ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7617:1: ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) )
+            // InternalCheckCfg.g:7616:1: ( ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) ) )
+            // InternalCheckCfg.g:7617:1: ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7617:1: ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7618:1: ( rule__XAdditiveExpression__RightOperandAssignment_1_1 )
+            // InternalCheckCfg.g:7617:1: ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) )
+            // InternalCheckCfg.g:7618:1: ( rule__XAdditiveExpression__RightOperandAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getRightOperandAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7619:1: ( rule__XAdditiveExpression__RightOperandAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7619:2: rule__XAdditiveExpression__RightOperandAssignment_1_1
+            // InternalCheckCfg.g:7619:1: ( rule__XAdditiveExpression__RightOperandAssignment_1_1 )
+            // InternalCheckCfg.g:7619:2: rule__XAdditiveExpression__RightOperandAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__RightOperandAssignment_1_1_in_rule__XAdditiveExpression__Group_1__1__Impl15818);
+            pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__RightOperandAssignment_1_1();
 
             state._fsp--;
@@ -23161,16 +23161,16 @@ public final void rule__XAdditiveExpression__Group_1__1__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7633:1: rule__XAdditiveExpression__Group_1_0__0 : rule__XAdditiveExpression__Group_1_0__0__Impl ;
+    // InternalCheckCfg.g:7633:1: rule__XAdditiveExpression__Group_1_0__0 : rule__XAdditiveExpression__Group_1_0__0__Impl ;
     public final void rule__XAdditiveExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7637:1: ( rule__XAdditiveExpression__Group_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7638:2: rule__XAdditiveExpression__Group_1_0__0__Impl
+            // InternalCheckCfg.g:7637:1: ( rule__XAdditiveExpression__Group_1_0__0__Impl )
+            // InternalCheckCfg.g:7638:2: rule__XAdditiveExpression__Group_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1_0__0__Impl_in_rule__XAdditiveExpression__Group_1_0__015852);
+            pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group_1_0__0__Impl();
 
             state._fsp--;
@@ -23194,25 +23194,25 @@ public final void rule__XAdditiveExpression__Group_1_0__0() throws RecognitionEx
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7644:1: rule__XAdditiveExpression__Group_1_0__0__Impl : ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) ) ;
+    // InternalCheckCfg.g:7644:1: rule__XAdditiveExpression__Group_1_0__0__Impl : ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) ) ;
     public final void rule__XAdditiveExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7648:1: ( ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7649:1: ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) )
+            // InternalCheckCfg.g:7648:1: ( ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) ) )
+            // InternalCheckCfg.g:7649:1: ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7649:1: ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7650:1: ( rule__XAdditiveExpression__Group_1_0_0__0 )
+            // InternalCheckCfg.g:7649:1: ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) )
+            // InternalCheckCfg.g:7650:1: ( rule__XAdditiveExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getGroup_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7651:1: ( rule__XAdditiveExpression__Group_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7651:2: rule__XAdditiveExpression__Group_1_0_0__0
+            // InternalCheckCfg.g:7651:1: ( rule__XAdditiveExpression__Group_1_0_0__0 )
+            // InternalCheckCfg.g:7651:2: rule__XAdditiveExpression__Group_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1_0_0__0_in_rule__XAdditiveExpression__Group_1_0__0__Impl15879);
+            pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group_1_0_0__0();
 
             state._fsp--;
@@ -23245,21 +23245,21 @@ public final void rule__XAdditiveExpression__Group_1_0__0__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1_0_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7663:1: rule__XAdditiveExpression__Group_1_0_0__0 : rule__XAdditiveExpression__Group_1_0_0__0__Impl rule__XAdditiveExpression__Group_1_0_0__1 ;
+    // InternalCheckCfg.g:7663:1: rule__XAdditiveExpression__Group_1_0_0__0 : rule__XAdditiveExpression__Group_1_0_0__0__Impl rule__XAdditiveExpression__Group_1_0_0__1 ;
     public final void rule__XAdditiveExpression__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7667:1: ( rule__XAdditiveExpression__Group_1_0_0__0__Impl rule__XAdditiveExpression__Group_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7668:2: rule__XAdditiveExpression__Group_1_0_0__0__Impl rule__XAdditiveExpression__Group_1_0_0__1
+            // InternalCheckCfg.g:7667:1: ( rule__XAdditiveExpression__Group_1_0_0__0__Impl rule__XAdditiveExpression__Group_1_0_0__1 )
+            // InternalCheckCfg.g:7668:2: rule__XAdditiveExpression__Group_1_0_0__0__Impl rule__XAdditiveExpression__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1_0_0__0__Impl_in_rule__XAdditiveExpression__Group_1_0_0__015911);
+            pushFollow(FOLLOW_46);
             rule__XAdditiveExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1_0_0__1_in_rule__XAdditiveExpression__Group_1_0_0__015914);
+            pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group_1_0_0__1();
 
             state._fsp--;
@@ -23283,23 +23283,23 @@ public final void rule__XAdditiveExpression__Group_1_0_0__0() throws Recognition
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7675:1: rule__XAdditiveExpression__Group_1_0_0__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:7675:1: rule__XAdditiveExpression__Group_1_0_0__0__Impl : ( () ) ;
     public final void rule__XAdditiveExpression__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7679:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7680:1: ( () )
+            // InternalCheckCfg.g:7679:1: ( ( () ) )
+            // InternalCheckCfg.g:7680:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7680:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7681:1: ()
+            // InternalCheckCfg.g:7680:1: ( () )
+            // InternalCheckCfg.g:7681:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7682:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7684:1: 
+            // InternalCheckCfg.g:7682:1: ()
+            // InternalCheckCfg.g:7684:1: 
             {
             }
 
@@ -23324,16 +23324,16 @@ public final void rule__XAdditiveExpression__Group_1_0_0__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1_0_0__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7694:1: rule__XAdditiveExpression__Group_1_0_0__1 : rule__XAdditiveExpression__Group_1_0_0__1__Impl ;
+    // InternalCheckCfg.g:7694:1: rule__XAdditiveExpression__Group_1_0_0__1 : rule__XAdditiveExpression__Group_1_0_0__1__Impl ;
     public final void rule__XAdditiveExpression__Group_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7698:1: ( rule__XAdditiveExpression__Group_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7699:2: rule__XAdditiveExpression__Group_1_0_0__1__Impl
+            // InternalCheckCfg.g:7698:1: ( rule__XAdditiveExpression__Group_1_0_0__1__Impl )
+            // InternalCheckCfg.g:7699:2: rule__XAdditiveExpression__Group_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1_0_0__1__Impl_in_rule__XAdditiveExpression__Group_1_0_0__115972);
+            pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group_1_0_0__1__Impl();
 
             state._fsp--;
@@ -23357,25 +23357,25 @@ public final void rule__XAdditiveExpression__Group_1_0_0__1() throws Recognition
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7705:1: rule__XAdditiveExpression__Group_1_0_0__1__Impl : ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) ) ;
+    // InternalCheckCfg.g:7705:1: rule__XAdditiveExpression__Group_1_0_0__1__Impl : ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) ) ;
     public final void rule__XAdditiveExpression__Group_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7709:1: ( ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7710:1: ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalCheckCfg.g:7709:1: ( ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) ) )
+            // InternalCheckCfg.g:7710:1: ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7710:1: ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7711:1: ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 )
+            // InternalCheckCfg.g:7710:1: ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalCheckCfg.g:7711:1: ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getFeatureAssignment_1_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7712:1: ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7712:2: rule__XAdditiveExpression__FeatureAssignment_1_0_0_1
+            // InternalCheckCfg.g:7712:1: ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 )
+            // InternalCheckCfg.g:7712:2: rule__XAdditiveExpression__FeatureAssignment_1_0_0_1
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__FeatureAssignment_1_0_0_1_in_rule__XAdditiveExpression__Group_1_0_0__1__Impl15999);
+            pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__FeatureAssignment_1_0_0_1();
 
             state._fsp--;
@@ -23408,21 +23408,21 @@ public final void rule__XAdditiveExpression__Group_1_0_0__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7726:1: rule__XMultiplicativeExpression__Group__0 : rule__XMultiplicativeExpression__Group__0__Impl rule__XMultiplicativeExpression__Group__1 ;
+    // InternalCheckCfg.g:7726:1: rule__XMultiplicativeExpression__Group__0 : rule__XMultiplicativeExpression__Group__0__Impl rule__XMultiplicativeExpression__Group__1 ;
     public final void rule__XMultiplicativeExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7730:1: ( rule__XMultiplicativeExpression__Group__0__Impl rule__XMultiplicativeExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7731:2: rule__XMultiplicativeExpression__Group__0__Impl rule__XMultiplicativeExpression__Group__1
+            // InternalCheckCfg.g:7730:1: ( rule__XMultiplicativeExpression__Group__0__Impl rule__XMultiplicativeExpression__Group__1 )
+            // InternalCheckCfg.g:7731:2: rule__XMultiplicativeExpression__Group__0__Impl rule__XMultiplicativeExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group__0__Impl_in_rule__XMultiplicativeExpression__Group__016033);
+            pushFollow(FOLLOW_48);
             rule__XMultiplicativeExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group__1_in_rule__XMultiplicativeExpression__Group__016036);
+            pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group__1();
 
             state._fsp--;
@@ -23446,22 +23446,22 @@ public final void rule__XMultiplicativeExpression__Group__0() throws Recognition
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7738:1: rule__XMultiplicativeExpression__Group__0__Impl : ( ruleXUnaryOperation ) ;
+    // InternalCheckCfg.g:7738:1: rule__XMultiplicativeExpression__Group__0__Impl : ( ruleXUnaryOperation ) ;
     public final void rule__XMultiplicativeExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7742:1: ( ( ruleXUnaryOperation ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7743:1: ( ruleXUnaryOperation )
+            // InternalCheckCfg.g:7742:1: ( ( ruleXUnaryOperation ) )
+            // InternalCheckCfg.g:7743:1: ( ruleXUnaryOperation )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7743:1: ( ruleXUnaryOperation )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7744:1: ruleXUnaryOperation
+            // InternalCheckCfg.g:7743:1: ( ruleXUnaryOperation )
+            // InternalCheckCfg.g:7744:1: ruleXUnaryOperation
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getXUnaryOperationParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleXUnaryOperation_in_rule__XMultiplicativeExpression__Group__0__Impl16063);
+            pushFollow(FOLLOW_2);
             ruleXUnaryOperation();
 
             state._fsp--;
@@ -23491,16 +23491,16 @@ public final void rule__XMultiplicativeExpression__Group__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7755:1: rule__XMultiplicativeExpression__Group__1 : rule__XMultiplicativeExpression__Group__1__Impl ;
+    // InternalCheckCfg.g:7755:1: rule__XMultiplicativeExpression__Group__1 : rule__XMultiplicativeExpression__Group__1__Impl ;
     public final void rule__XMultiplicativeExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7759:1: ( rule__XMultiplicativeExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7760:2: rule__XMultiplicativeExpression__Group__1__Impl
+            // InternalCheckCfg.g:7759:1: ( rule__XMultiplicativeExpression__Group__1__Impl )
+            // InternalCheckCfg.g:7760:2: rule__XMultiplicativeExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group__1__Impl_in_rule__XMultiplicativeExpression__Group__116092);
+            pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group__1__Impl();
 
             state._fsp--;
@@ -23524,22 +23524,22 @@ public final void rule__XMultiplicativeExpression__Group__1() throws Recognition
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7766:1: rule__XMultiplicativeExpression__Group__1__Impl : ( ( rule__XMultiplicativeExpression__Group_1__0 )* ) ;
+    // InternalCheckCfg.g:7766:1: rule__XMultiplicativeExpression__Group__1__Impl : ( ( rule__XMultiplicativeExpression__Group_1__0 )* ) ;
     public final void rule__XMultiplicativeExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7770:1: ( ( ( rule__XMultiplicativeExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7771:1: ( ( rule__XMultiplicativeExpression__Group_1__0 )* )
+            // InternalCheckCfg.g:7770:1: ( ( ( rule__XMultiplicativeExpression__Group_1__0 )* ) )
+            // InternalCheckCfg.g:7771:1: ( ( rule__XMultiplicativeExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7771:1: ( ( rule__XMultiplicativeExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7772:1: ( rule__XMultiplicativeExpression__Group_1__0 )*
+            // InternalCheckCfg.g:7771:1: ( ( rule__XMultiplicativeExpression__Group_1__0 )* )
+            // InternalCheckCfg.g:7772:1: ( rule__XMultiplicativeExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7773:1: ( rule__XMultiplicativeExpression__Group_1__0 )*
+            // InternalCheckCfg.g:7773:1: ( rule__XMultiplicativeExpression__Group_1__0 )*
             loop65:
             do {
                 int alt65=2;
@@ -23593,9 +23593,9 @@ public final void rule__XMultiplicativeExpression__Group__1__Impl() throws Recog
 
                 switch (alt65) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7773:2: rule__XMultiplicativeExpression__Group_1__0
+            	    // InternalCheckCfg.g:7773:2: rule__XMultiplicativeExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1__0_in_rule__XMultiplicativeExpression__Group__1__Impl16119);
+            	    pushFollow(FOLLOW_49);
             	    rule__XMultiplicativeExpression__Group_1__0();
 
             	    state._fsp--;
@@ -23634,21 +23634,21 @@ public final void rule__XMultiplicativeExpression__Group__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7787:1: rule__XMultiplicativeExpression__Group_1__0 : rule__XMultiplicativeExpression__Group_1__0__Impl rule__XMultiplicativeExpression__Group_1__1 ;
+    // InternalCheckCfg.g:7787:1: rule__XMultiplicativeExpression__Group_1__0 : rule__XMultiplicativeExpression__Group_1__0__Impl rule__XMultiplicativeExpression__Group_1__1 ;
     public final void rule__XMultiplicativeExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7791:1: ( rule__XMultiplicativeExpression__Group_1__0__Impl rule__XMultiplicativeExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7792:2: rule__XMultiplicativeExpression__Group_1__0__Impl rule__XMultiplicativeExpression__Group_1__1
+            // InternalCheckCfg.g:7791:1: ( rule__XMultiplicativeExpression__Group_1__0__Impl rule__XMultiplicativeExpression__Group_1__1 )
+            // InternalCheckCfg.g:7792:2: rule__XMultiplicativeExpression__Group_1__0__Impl rule__XMultiplicativeExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1__0__Impl_in_rule__XMultiplicativeExpression__Group_1__016154);
+            pushFollow(FOLLOW_27);
             rule__XMultiplicativeExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1__1_in_rule__XMultiplicativeExpression__Group_1__016157);
+            pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group_1__1();
 
             state._fsp--;
@@ -23672,25 +23672,25 @@ public final void rule__XMultiplicativeExpression__Group_1__0() throws Recogniti
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7799:1: rule__XMultiplicativeExpression__Group_1__0__Impl : ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) ) ;
+    // InternalCheckCfg.g:7799:1: rule__XMultiplicativeExpression__Group_1__0__Impl : ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) ) ;
     public final void rule__XMultiplicativeExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7803:1: ( ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7804:1: ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) )
+            // InternalCheckCfg.g:7803:1: ( ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) ) )
+            // InternalCheckCfg.g:7804:1: ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7804:1: ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7805:1: ( rule__XMultiplicativeExpression__Group_1_0__0 )
+            // InternalCheckCfg.g:7804:1: ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) )
+            // InternalCheckCfg.g:7805:1: ( rule__XMultiplicativeExpression__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getGroup_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7806:1: ( rule__XMultiplicativeExpression__Group_1_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7806:2: rule__XMultiplicativeExpression__Group_1_0__0
+            // InternalCheckCfg.g:7806:1: ( rule__XMultiplicativeExpression__Group_1_0__0 )
+            // InternalCheckCfg.g:7806:2: rule__XMultiplicativeExpression__Group_1_0__0
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1_0__0_in_rule__XMultiplicativeExpression__Group_1__0__Impl16184);
+            pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group_1_0__0();
 
             state._fsp--;
@@ -23723,16 +23723,16 @@ public final void rule__XMultiplicativeExpression__Group_1__0__Impl() throws Rec
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7816:1: rule__XMultiplicativeExpression__Group_1__1 : rule__XMultiplicativeExpression__Group_1__1__Impl ;
+    // InternalCheckCfg.g:7816:1: rule__XMultiplicativeExpression__Group_1__1 : rule__XMultiplicativeExpression__Group_1__1__Impl ;
     public final void rule__XMultiplicativeExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7820:1: ( rule__XMultiplicativeExpression__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7821:2: rule__XMultiplicativeExpression__Group_1__1__Impl
+            // InternalCheckCfg.g:7820:1: ( rule__XMultiplicativeExpression__Group_1__1__Impl )
+            // InternalCheckCfg.g:7821:2: rule__XMultiplicativeExpression__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1__1__Impl_in_rule__XMultiplicativeExpression__Group_1__116214);
+            pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group_1__1__Impl();
 
             state._fsp--;
@@ -23756,25 +23756,25 @@ public final void rule__XMultiplicativeExpression__Group_1__1() throws Recogniti
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7827:1: rule__XMultiplicativeExpression__Group_1__1__Impl : ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) ) ;
+    // InternalCheckCfg.g:7827:1: rule__XMultiplicativeExpression__Group_1__1__Impl : ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) ) ;
     public final void rule__XMultiplicativeExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7831:1: ( ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7832:1: ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) )
+            // InternalCheckCfg.g:7831:1: ( ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) ) )
+            // InternalCheckCfg.g:7832:1: ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7832:1: ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7833:1: ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 )
+            // InternalCheckCfg.g:7832:1: ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) )
+            // InternalCheckCfg.g:7833:1: ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getRightOperandAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7834:1: ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7834:2: rule__XMultiplicativeExpression__RightOperandAssignment_1_1
+            // InternalCheckCfg.g:7834:1: ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 )
+            // InternalCheckCfg.g:7834:2: rule__XMultiplicativeExpression__RightOperandAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__RightOperandAssignment_1_1_in_rule__XMultiplicativeExpression__Group_1__1__Impl16241);
+            pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__RightOperandAssignment_1_1();
 
             state._fsp--;
@@ -23807,16 +23807,16 @@ public final void rule__XMultiplicativeExpression__Group_1__1__Impl() throws Rec
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7848:1: rule__XMultiplicativeExpression__Group_1_0__0 : rule__XMultiplicativeExpression__Group_1_0__0__Impl ;
+    // InternalCheckCfg.g:7848:1: rule__XMultiplicativeExpression__Group_1_0__0 : rule__XMultiplicativeExpression__Group_1_0__0__Impl ;
     public final void rule__XMultiplicativeExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7852:1: ( rule__XMultiplicativeExpression__Group_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7853:2: rule__XMultiplicativeExpression__Group_1_0__0__Impl
+            // InternalCheckCfg.g:7852:1: ( rule__XMultiplicativeExpression__Group_1_0__0__Impl )
+            // InternalCheckCfg.g:7853:2: rule__XMultiplicativeExpression__Group_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1_0__0__Impl_in_rule__XMultiplicativeExpression__Group_1_0__016275);
+            pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group_1_0__0__Impl();
 
             state._fsp--;
@@ -23840,25 +23840,25 @@ public final void rule__XMultiplicativeExpression__Group_1_0__0() throws Recogni
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7859:1: rule__XMultiplicativeExpression__Group_1_0__0__Impl : ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) ) ;
+    // InternalCheckCfg.g:7859:1: rule__XMultiplicativeExpression__Group_1_0__0__Impl : ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) ) ;
     public final void rule__XMultiplicativeExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7863:1: ( ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7864:1: ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) )
+            // InternalCheckCfg.g:7863:1: ( ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) ) )
+            // InternalCheckCfg.g:7864:1: ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7864:1: ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7865:1: ( rule__XMultiplicativeExpression__Group_1_0_0__0 )
+            // InternalCheckCfg.g:7864:1: ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) )
+            // InternalCheckCfg.g:7865:1: ( rule__XMultiplicativeExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getGroup_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7866:1: ( rule__XMultiplicativeExpression__Group_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7866:2: rule__XMultiplicativeExpression__Group_1_0_0__0
+            // InternalCheckCfg.g:7866:1: ( rule__XMultiplicativeExpression__Group_1_0_0__0 )
+            // InternalCheckCfg.g:7866:2: rule__XMultiplicativeExpression__Group_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1_0_0__0_in_rule__XMultiplicativeExpression__Group_1_0__0__Impl16302);
+            pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group_1_0_0__0();
 
             state._fsp--;
@@ -23891,21 +23891,21 @@ public final void rule__XMultiplicativeExpression__Group_1_0__0__Impl() throws R
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1_0_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7878:1: rule__XMultiplicativeExpression__Group_1_0_0__0 : rule__XMultiplicativeExpression__Group_1_0_0__0__Impl rule__XMultiplicativeExpression__Group_1_0_0__1 ;
+    // InternalCheckCfg.g:7878:1: rule__XMultiplicativeExpression__Group_1_0_0__0 : rule__XMultiplicativeExpression__Group_1_0_0__0__Impl rule__XMultiplicativeExpression__Group_1_0_0__1 ;
     public final void rule__XMultiplicativeExpression__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7882:1: ( rule__XMultiplicativeExpression__Group_1_0_0__0__Impl rule__XMultiplicativeExpression__Group_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7883:2: rule__XMultiplicativeExpression__Group_1_0_0__0__Impl rule__XMultiplicativeExpression__Group_1_0_0__1
+            // InternalCheckCfg.g:7882:1: ( rule__XMultiplicativeExpression__Group_1_0_0__0__Impl rule__XMultiplicativeExpression__Group_1_0_0__1 )
+            // InternalCheckCfg.g:7883:2: rule__XMultiplicativeExpression__Group_1_0_0__0__Impl rule__XMultiplicativeExpression__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1_0_0__0__Impl_in_rule__XMultiplicativeExpression__Group_1_0_0__016334);
+            pushFollow(FOLLOW_48);
             rule__XMultiplicativeExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1_0_0__1_in_rule__XMultiplicativeExpression__Group_1_0_0__016337);
+            pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group_1_0_0__1();
 
             state._fsp--;
@@ -23929,23 +23929,23 @@ public final void rule__XMultiplicativeExpression__Group_1_0_0__0() throws Recog
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7890:1: rule__XMultiplicativeExpression__Group_1_0_0__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:7890:1: rule__XMultiplicativeExpression__Group_1_0_0__0__Impl : ( () ) ;
     public final void rule__XMultiplicativeExpression__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7894:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7895:1: ( () )
+            // InternalCheckCfg.g:7894:1: ( ( () ) )
+            // InternalCheckCfg.g:7895:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7895:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7896:1: ()
+            // InternalCheckCfg.g:7895:1: ( () )
+            // InternalCheckCfg.g:7896:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7897:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7899:1: 
+            // InternalCheckCfg.g:7897:1: ()
+            // InternalCheckCfg.g:7899:1: 
             {
             }
 
@@ -23970,16 +23970,16 @@ public final void rule__XMultiplicativeExpression__Group_1_0_0__0__Impl() throws
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1_0_0__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7909:1: rule__XMultiplicativeExpression__Group_1_0_0__1 : rule__XMultiplicativeExpression__Group_1_0_0__1__Impl ;
+    // InternalCheckCfg.g:7909:1: rule__XMultiplicativeExpression__Group_1_0_0__1 : rule__XMultiplicativeExpression__Group_1_0_0__1__Impl ;
     public final void rule__XMultiplicativeExpression__Group_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7913:1: ( rule__XMultiplicativeExpression__Group_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7914:2: rule__XMultiplicativeExpression__Group_1_0_0__1__Impl
+            // InternalCheckCfg.g:7913:1: ( rule__XMultiplicativeExpression__Group_1_0_0__1__Impl )
+            // InternalCheckCfg.g:7914:2: rule__XMultiplicativeExpression__Group_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1_0_0__1__Impl_in_rule__XMultiplicativeExpression__Group_1_0_0__116395);
+            pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group_1_0_0__1__Impl();
 
             state._fsp--;
@@ -24003,25 +24003,25 @@ public final void rule__XMultiplicativeExpression__Group_1_0_0__1() throws Recog
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7920:1: rule__XMultiplicativeExpression__Group_1_0_0__1__Impl : ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) ) ;
+    // InternalCheckCfg.g:7920:1: rule__XMultiplicativeExpression__Group_1_0_0__1__Impl : ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) ) ;
     public final void rule__XMultiplicativeExpression__Group_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7924:1: ( ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7925:1: ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalCheckCfg.g:7924:1: ( ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) ) )
+            // InternalCheckCfg.g:7925:1: ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7925:1: ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7926:1: ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 )
+            // InternalCheckCfg.g:7925:1: ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalCheckCfg.g:7926:1: ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getFeatureAssignment_1_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7927:1: ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7927:2: rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1
+            // InternalCheckCfg.g:7927:1: ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 )
+            // InternalCheckCfg.g:7927:2: rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1_in_rule__XMultiplicativeExpression__Group_1_0_0__1__Impl16422);
+            pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1();
 
             state._fsp--;
@@ -24054,21 +24054,21 @@ public final void rule__XMultiplicativeExpression__Group_1_0_0__1__Impl() throws
 
 
     // $ANTLR start "rule__XUnaryOperation__Group_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7941:1: rule__XUnaryOperation__Group_0__0 : rule__XUnaryOperation__Group_0__0__Impl rule__XUnaryOperation__Group_0__1 ;
+    // InternalCheckCfg.g:7941:1: rule__XUnaryOperation__Group_0__0 : rule__XUnaryOperation__Group_0__0__Impl rule__XUnaryOperation__Group_0__1 ;
     public final void rule__XUnaryOperation__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7945:1: ( rule__XUnaryOperation__Group_0__0__Impl rule__XUnaryOperation__Group_0__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7946:2: rule__XUnaryOperation__Group_0__0__Impl rule__XUnaryOperation__Group_0__1
+            // InternalCheckCfg.g:7945:1: ( rule__XUnaryOperation__Group_0__0__Impl rule__XUnaryOperation__Group_0__1 )
+            // InternalCheckCfg.g:7946:2: rule__XUnaryOperation__Group_0__0__Impl rule__XUnaryOperation__Group_0__1
             {
-            pushFollow(FOLLOW_rule__XUnaryOperation__Group_0__0__Impl_in_rule__XUnaryOperation__Group_0__016456);
+            pushFollow(FOLLOW_21);
             rule__XUnaryOperation__Group_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XUnaryOperation__Group_0__1_in_rule__XUnaryOperation__Group_0__016459);
+            pushFollow(FOLLOW_2);
             rule__XUnaryOperation__Group_0__1();
 
             state._fsp--;
@@ -24092,23 +24092,23 @@ public final void rule__XUnaryOperation__Group_0__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XUnaryOperation__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7953:1: rule__XUnaryOperation__Group_0__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:7953:1: rule__XUnaryOperation__Group_0__0__Impl : ( () ) ;
     public final void rule__XUnaryOperation__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7957:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7958:1: ( () )
+            // InternalCheckCfg.g:7957:1: ( ( () ) )
+            // InternalCheckCfg.g:7958:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7958:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7959:1: ()
+            // InternalCheckCfg.g:7958:1: ( () )
+            // InternalCheckCfg.g:7959:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationAccess().getXUnaryOperationAction_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7960:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7962:1: 
+            // InternalCheckCfg.g:7960:1: ()
+            // InternalCheckCfg.g:7962:1: 
             {
             }
 
@@ -24133,21 +24133,21 @@ public final void rule__XUnaryOperation__Group_0__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XUnaryOperation__Group_0__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7972:1: rule__XUnaryOperation__Group_0__1 : rule__XUnaryOperation__Group_0__1__Impl rule__XUnaryOperation__Group_0__2 ;
+    // InternalCheckCfg.g:7972:1: rule__XUnaryOperation__Group_0__1 : rule__XUnaryOperation__Group_0__1__Impl rule__XUnaryOperation__Group_0__2 ;
     public final void rule__XUnaryOperation__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7976:1: ( rule__XUnaryOperation__Group_0__1__Impl rule__XUnaryOperation__Group_0__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7977:2: rule__XUnaryOperation__Group_0__1__Impl rule__XUnaryOperation__Group_0__2
+            // InternalCheckCfg.g:7976:1: ( rule__XUnaryOperation__Group_0__1__Impl rule__XUnaryOperation__Group_0__2 )
+            // InternalCheckCfg.g:7977:2: rule__XUnaryOperation__Group_0__1__Impl rule__XUnaryOperation__Group_0__2
             {
-            pushFollow(FOLLOW_rule__XUnaryOperation__Group_0__1__Impl_in_rule__XUnaryOperation__Group_0__116517);
+            pushFollow(FOLLOW_27);
             rule__XUnaryOperation__Group_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XUnaryOperation__Group_0__2_in_rule__XUnaryOperation__Group_0__116520);
+            pushFollow(FOLLOW_2);
             rule__XUnaryOperation__Group_0__2();
 
             state._fsp--;
@@ -24171,25 +24171,25 @@ public final void rule__XUnaryOperation__Group_0__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XUnaryOperation__Group_0__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7984:1: rule__XUnaryOperation__Group_0__1__Impl : ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) ) ;
+    // InternalCheckCfg.g:7984:1: rule__XUnaryOperation__Group_0__1__Impl : ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) ) ;
     public final void rule__XUnaryOperation__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7988:1: ( ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7989:1: ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) )
+            // InternalCheckCfg.g:7988:1: ( ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) ) )
+            // InternalCheckCfg.g:7989:1: ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7989:1: ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7990:1: ( rule__XUnaryOperation__FeatureAssignment_0_1 )
+            // InternalCheckCfg.g:7989:1: ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) )
+            // InternalCheckCfg.g:7990:1: ( rule__XUnaryOperation__FeatureAssignment_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationAccess().getFeatureAssignment_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7991:1: ( rule__XUnaryOperation__FeatureAssignment_0_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7991:2: rule__XUnaryOperation__FeatureAssignment_0_1
+            // InternalCheckCfg.g:7991:1: ( rule__XUnaryOperation__FeatureAssignment_0_1 )
+            // InternalCheckCfg.g:7991:2: rule__XUnaryOperation__FeatureAssignment_0_1
             {
-            pushFollow(FOLLOW_rule__XUnaryOperation__FeatureAssignment_0_1_in_rule__XUnaryOperation__Group_0__1__Impl16547);
+            pushFollow(FOLLOW_2);
             rule__XUnaryOperation__FeatureAssignment_0_1();
 
             state._fsp--;
@@ -24222,16 +24222,16 @@ public final void rule__XUnaryOperation__Group_0__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XUnaryOperation__Group_0__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8001:1: rule__XUnaryOperation__Group_0__2 : rule__XUnaryOperation__Group_0__2__Impl ;
+    // InternalCheckCfg.g:8001:1: rule__XUnaryOperation__Group_0__2 : rule__XUnaryOperation__Group_0__2__Impl ;
     public final void rule__XUnaryOperation__Group_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8005:1: ( rule__XUnaryOperation__Group_0__2__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8006:2: rule__XUnaryOperation__Group_0__2__Impl
+            // InternalCheckCfg.g:8005:1: ( rule__XUnaryOperation__Group_0__2__Impl )
+            // InternalCheckCfg.g:8006:2: rule__XUnaryOperation__Group_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__XUnaryOperation__Group_0__2__Impl_in_rule__XUnaryOperation__Group_0__216577);
+            pushFollow(FOLLOW_2);
             rule__XUnaryOperation__Group_0__2__Impl();
 
             state._fsp--;
@@ -24255,25 +24255,25 @@ public final void rule__XUnaryOperation__Group_0__2() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XUnaryOperation__Group_0__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8012:1: rule__XUnaryOperation__Group_0__2__Impl : ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) ) ;
+    // InternalCheckCfg.g:8012:1: rule__XUnaryOperation__Group_0__2__Impl : ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) ) ;
     public final void rule__XUnaryOperation__Group_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8016:1: ( ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8017:1: ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) )
+            // InternalCheckCfg.g:8016:1: ( ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) ) )
+            // InternalCheckCfg.g:8017:1: ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8017:1: ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8018:1: ( rule__XUnaryOperation__OperandAssignment_0_2 )
+            // InternalCheckCfg.g:8017:1: ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) )
+            // InternalCheckCfg.g:8018:1: ( rule__XUnaryOperation__OperandAssignment_0_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationAccess().getOperandAssignment_0_2()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8019:1: ( rule__XUnaryOperation__OperandAssignment_0_2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8019:2: rule__XUnaryOperation__OperandAssignment_0_2
+            // InternalCheckCfg.g:8019:1: ( rule__XUnaryOperation__OperandAssignment_0_2 )
+            // InternalCheckCfg.g:8019:2: rule__XUnaryOperation__OperandAssignment_0_2
             {
-            pushFollow(FOLLOW_rule__XUnaryOperation__OperandAssignment_0_2_in_rule__XUnaryOperation__Group_0__2__Impl16604);
+            pushFollow(FOLLOW_2);
             rule__XUnaryOperation__OperandAssignment_0_2();
 
             state._fsp--;
@@ -24306,21 +24306,21 @@ public final void rule__XUnaryOperation__Group_0__2__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XCastedExpression__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8035:1: rule__XCastedExpression__Group__0 : rule__XCastedExpression__Group__0__Impl rule__XCastedExpression__Group__1 ;
+    // InternalCheckCfg.g:8035:1: rule__XCastedExpression__Group__0 : rule__XCastedExpression__Group__0__Impl rule__XCastedExpression__Group__1 ;
     public final void rule__XCastedExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8039:1: ( rule__XCastedExpression__Group__0__Impl rule__XCastedExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8040:2: rule__XCastedExpression__Group__0__Impl rule__XCastedExpression__Group__1
+            // InternalCheckCfg.g:8039:1: ( rule__XCastedExpression__Group__0__Impl rule__XCastedExpression__Group__1 )
+            // InternalCheckCfg.g:8040:2: rule__XCastedExpression__Group__0__Impl rule__XCastedExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__Group__0__Impl_in_rule__XCastedExpression__Group__016640);
+            pushFollow(FOLLOW_50);
             rule__XCastedExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCastedExpression__Group__1_in_rule__XCastedExpression__Group__016643);
+            pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group__1();
 
             state._fsp--;
@@ -24344,22 +24344,22 @@ public final void rule__XCastedExpression__Group__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XCastedExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8047:1: rule__XCastedExpression__Group__0__Impl : ( ruleXPostfixOperation ) ;
+    // InternalCheckCfg.g:8047:1: rule__XCastedExpression__Group__0__Impl : ( ruleXPostfixOperation ) ;
     public final void rule__XCastedExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8051:1: ( ( ruleXPostfixOperation ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8052:1: ( ruleXPostfixOperation )
+            // InternalCheckCfg.g:8051:1: ( ( ruleXPostfixOperation ) )
+            // InternalCheckCfg.g:8052:1: ( ruleXPostfixOperation )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8052:1: ( ruleXPostfixOperation )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8053:1: ruleXPostfixOperation
+            // InternalCheckCfg.g:8052:1: ( ruleXPostfixOperation )
+            // InternalCheckCfg.g:8053:1: ruleXPostfixOperation
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getXPostfixOperationParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleXPostfixOperation_in_rule__XCastedExpression__Group__0__Impl16670);
+            pushFollow(FOLLOW_2);
             ruleXPostfixOperation();
 
             state._fsp--;
@@ -24389,16 +24389,16 @@ public final void rule__XCastedExpression__Group__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XCastedExpression__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8064:1: rule__XCastedExpression__Group__1 : rule__XCastedExpression__Group__1__Impl ;
+    // InternalCheckCfg.g:8064:1: rule__XCastedExpression__Group__1 : rule__XCastedExpression__Group__1__Impl ;
     public final void rule__XCastedExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8068:1: ( rule__XCastedExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8069:2: rule__XCastedExpression__Group__1__Impl
+            // InternalCheckCfg.g:8068:1: ( rule__XCastedExpression__Group__1__Impl )
+            // InternalCheckCfg.g:8069:2: rule__XCastedExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__Group__1__Impl_in_rule__XCastedExpression__Group__116699);
+            pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group__1__Impl();
 
             state._fsp--;
@@ -24422,22 +24422,22 @@ public final void rule__XCastedExpression__Group__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XCastedExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8075:1: rule__XCastedExpression__Group__1__Impl : ( ( rule__XCastedExpression__Group_1__0 )* ) ;
+    // InternalCheckCfg.g:8075:1: rule__XCastedExpression__Group__1__Impl : ( ( rule__XCastedExpression__Group_1__0 )* ) ;
     public final void rule__XCastedExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8079:1: ( ( ( rule__XCastedExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8080:1: ( ( rule__XCastedExpression__Group_1__0 )* )
+            // InternalCheckCfg.g:8079:1: ( ( ( rule__XCastedExpression__Group_1__0 )* ) )
+            // InternalCheckCfg.g:8080:1: ( ( rule__XCastedExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8080:1: ( ( rule__XCastedExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8081:1: ( rule__XCastedExpression__Group_1__0 )*
+            // InternalCheckCfg.g:8080:1: ( ( rule__XCastedExpression__Group_1__0 )* )
+            // InternalCheckCfg.g:8081:1: ( rule__XCastedExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8082:1: ( rule__XCastedExpression__Group_1__0 )*
+            // InternalCheckCfg.g:8082:1: ( rule__XCastedExpression__Group_1__0 )*
             loop66:
             do {
                 int alt66=2;
@@ -24456,9 +24456,9 @@ public final void rule__XCastedExpression__Group__1__Impl() throws RecognitionEx
 
                 switch (alt66) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8082:2: rule__XCastedExpression__Group_1__0
+            	    // InternalCheckCfg.g:8082:2: rule__XCastedExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XCastedExpression__Group_1__0_in_rule__XCastedExpression__Group__1__Impl16726);
+            	    pushFollow(FOLLOW_51);
             	    rule__XCastedExpression__Group_1__0();
 
             	    state._fsp--;
@@ -24497,21 +24497,21 @@ public final void rule__XCastedExpression__Group__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8096:1: rule__XCastedExpression__Group_1__0 : rule__XCastedExpression__Group_1__0__Impl rule__XCastedExpression__Group_1__1 ;
+    // InternalCheckCfg.g:8096:1: rule__XCastedExpression__Group_1__0 : rule__XCastedExpression__Group_1__0__Impl rule__XCastedExpression__Group_1__1 ;
     public final void rule__XCastedExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8100:1: ( rule__XCastedExpression__Group_1__0__Impl rule__XCastedExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8101:2: rule__XCastedExpression__Group_1__0__Impl rule__XCastedExpression__Group_1__1
+            // InternalCheckCfg.g:8100:1: ( rule__XCastedExpression__Group_1__0__Impl rule__XCastedExpression__Group_1__1 )
+            // InternalCheckCfg.g:8101:2: rule__XCastedExpression__Group_1__0__Impl rule__XCastedExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__Group_1__0__Impl_in_rule__XCastedExpression__Group_1__016761);
+            pushFollow(FOLLOW_39);
             rule__XCastedExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCastedExpression__Group_1__1_in_rule__XCastedExpression__Group_1__016764);
+            pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group_1__1();
 
             state._fsp--;
@@ -24535,25 +24535,25 @@ public final void rule__XCastedExpression__Group_1__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8108:1: rule__XCastedExpression__Group_1__0__Impl : ( ( rule__XCastedExpression__Group_1_0__0 ) ) ;
+    // InternalCheckCfg.g:8108:1: rule__XCastedExpression__Group_1__0__Impl : ( ( rule__XCastedExpression__Group_1_0__0 ) ) ;
     public final void rule__XCastedExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8112:1: ( ( ( rule__XCastedExpression__Group_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8113:1: ( ( rule__XCastedExpression__Group_1_0__0 ) )
+            // InternalCheckCfg.g:8112:1: ( ( ( rule__XCastedExpression__Group_1_0__0 ) ) )
+            // InternalCheckCfg.g:8113:1: ( ( rule__XCastedExpression__Group_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8113:1: ( ( rule__XCastedExpression__Group_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8114:1: ( rule__XCastedExpression__Group_1_0__0 )
+            // InternalCheckCfg.g:8113:1: ( ( rule__XCastedExpression__Group_1_0__0 ) )
+            // InternalCheckCfg.g:8114:1: ( rule__XCastedExpression__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getGroup_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8115:1: ( rule__XCastedExpression__Group_1_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8115:2: rule__XCastedExpression__Group_1_0__0
+            // InternalCheckCfg.g:8115:1: ( rule__XCastedExpression__Group_1_0__0 )
+            // InternalCheckCfg.g:8115:2: rule__XCastedExpression__Group_1_0__0
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__Group_1_0__0_in_rule__XCastedExpression__Group_1__0__Impl16791);
+            pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group_1_0__0();
 
             state._fsp--;
@@ -24586,16 +24586,16 @@ public final void rule__XCastedExpression__Group_1__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8125:1: rule__XCastedExpression__Group_1__1 : rule__XCastedExpression__Group_1__1__Impl ;
+    // InternalCheckCfg.g:8125:1: rule__XCastedExpression__Group_1__1 : rule__XCastedExpression__Group_1__1__Impl ;
     public final void rule__XCastedExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8129:1: ( rule__XCastedExpression__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8130:2: rule__XCastedExpression__Group_1__1__Impl
+            // InternalCheckCfg.g:8129:1: ( rule__XCastedExpression__Group_1__1__Impl )
+            // InternalCheckCfg.g:8130:2: rule__XCastedExpression__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__Group_1__1__Impl_in_rule__XCastedExpression__Group_1__116821);
+            pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group_1__1__Impl();
 
             state._fsp--;
@@ -24619,25 +24619,25 @@ public final void rule__XCastedExpression__Group_1__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8136:1: rule__XCastedExpression__Group_1__1__Impl : ( ( rule__XCastedExpression__TypeAssignment_1_1 ) ) ;
+    // InternalCheckCfg.g:8136:1: rule__XCastedExpression__Group_1__1__Impl : ( ( rule__XCastedExpression__TypeAssignment_1_1 ) ) ;
     public final void rule__XCastedExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8140:1: ( ( ( rule__XCastedExpression__TypeAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8141:1: ( ( rule__XCastedExpression__TypeAssignment_1_1 ) )
+            // InternalCheckCfg.g:8140:1: ( ( ( rule__XCastedExpression__TypeAssignment_1_1 ) ) )
+            // InternalCheckCfg.g:8141:1: ( ( rule__XCastedExpression__TypeAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8141:1: ( ( rule__XCastedExpression__TypeAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8142:1: ( rule__XCastedExpression__TypeAssignment_1_1 )
+            // InternalCheckCfg.g:8141:1: ( ( rule__XCastedExpression__TypeAssignment_1_1 ) )
+            // InternalCheckCfg.g:8142:1: ( rule__XCastedExpression__TypeAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getTypeAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8143:1: ( rule__XCastedExpression__TypeAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8143:2: rule__XCastedExpression__TypeAssignment_1_1
+            // InternalCheckCfg.g:8143:1: ( rule__XCastedExpression__TypeAssignment_1_1 )
+            // InternalCheckCfg.g:8143:2: rule__XCastedExpression__TypeAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__TypeAssignment_1_1_in_rule__XCastedExpression__Group_1__1__Impl16848);
+            pushFollow(FOLLOW_2);
             rule__XCastedExpression__TypeAssignment_1_1();
 
             state._fsp--;
@@ -24670,16 +24670,16 @@ public final void rule__XCastedExpression__Group_1__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8157:1: rule__XCastedExpression__Group_1_0__0 : rule__XCastedExpression__Group_1_0__0__Impl ;
+    // InternalCheckCfg.g:8157:1: rule__XCastedExpression__Group_1_0__0 : rule__XCastedExpression__Group_1_0__0__Impl ;
     public final void rule__XCastedExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8161:1: ( rule__XCastedExpression__Group_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8162:2: rule__XCastedExpression__Group_1_0__0__Impl
+            // InternalCheckCfg.g:8161:1: ( rule__XCastedExpression__Group_1_0__0__Impl )
+            // InternalCheckCfg.g:8162:2: rule__XCastedExpression__Group_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__Group_1_0__0__Impl_in_rule__XCastedExpression__Group_1_0__016882);
+            pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group_1_0__0__Impl();
 
             state._fsp--;
@@ -24703,25 +24703,25 @@ public final void rule__XCastedExpression__Group_1_0__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8168:1: rule__XCastedExpression__Group_1_0__0__Impl : ( ( rule__XCastedExpression__Group_1_0_0__0 ) ) ;
+    // InternalCheckCfg.g:8168:1: rule__XCastedExpression__Group_1_0__0__Impl : ( ( rule__XCastedExpression__Group_1_0_0__0 ) ) ;
     public final void rule__XCastedExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8172:1: ( ( ( rule__XCastedExpression__Group_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8173:1: ( ( rule__XCastedExpression__Group_1_0_0__0 ) )
+            // InternalCheckCfg.g:8172:1: ( ( ( rule__XCastedExpression__Group_1_0_0__0 ) ) )
+            // InternalCheckCfg.g:8173:1: ( ( rule__XCastedExpression__Group_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8173:1: ( ( rule__XCastedExpression__Group_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8174:1: ( rule__XCastedExpression__Group_1_0_0__0 )
+            // InternalCheckCfg.g:8173:1: ( ( rule__XCastedExpression__Group_1_0_0__0 ) )
+            // InternalCheckCfg.g:8174:1: ( rule__XCastedExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getGroup_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8175:1: ( rule__XCastedExpression__Group_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8175:2: rule__XCastedExpression__Group_1_0_0__0
+            // InternalCheckCfg.g:8175:1: ( rule__XCastedExpression__Group_1_0_0__0 )
+            // InternalCheckCfg.g:8175:2: rule__XCastedExpression__Group_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__Group_1_0_0__0_in_rule__XCastedExpression__Group_1_0__0__Impl16909);
+            pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group_1_0_0__0();
 
             state._fsp--;
@@ -24754,21 +24754,21 @@ public final void rule__XCastedExpression__Group_1_0__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1_0_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8187:1: rule__XCastedExpression__Group_1_0_0__0 : rule__XCastedExpression__Group_1_0_0__0__Impl rule__XCastedExpression__Group_1_0_0__1 ;
+    // InternalCheckCfg.g:8187:1: rule__XCastedExpression__Group_1_0_0__0 : rule__XCastedExpression__Group_1_0_0__0__Impl rule__XCastedExpression__Group_1_0_0__1 ;
     public final void rule__XCastedExpression__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8191:1: ( rule__XCastedExpression__Group_1_0_0__0__Impl rule__XCastedExpression__Group_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8192:2: rule__XCastedExpression__Group_1_0_0__0__Impl rule__XCastedExpression__Group_1_0_0__1
+            // InternalCheckCfg.g:8191:1: ( rule__XCastedExpression__Group_1_0_0__0__Impl rule__XCastedExpression__Group_1_0_0__1 )
+            // InternalCheckCfg.g:8192:2: rule__XCastedExpression__Group_1_0_0__0__Impl rule__XCastedExpression__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__Group_1_0_0__0__Impl_in_rule__XCastedExpression__Group_1_0_0__016941);
+            pushFollow(FOLLOW_50);
             rule__XCastedExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCastedExpression__Group_1_0_0__1_in_rule__XCastedExpression__Group_1_0_0__016944);
+            pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group_1_0_0__1();
 
             state._fsp--;
@@ -24792,23 +24792,23 @@ public final void rule__XCastedExpression__Group_1_0_0__0() throws RecognitionEx
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8199:1: rule__XCastedExpression__Group_1_0_0__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:8199:1: rule__XCastedExpression__Group_1_0_0__0__Impl : ( () ) ;
     public final void rule__XCastedExpression__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8203:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8204:1: ( () )
+            // InternalCheckCfg.g:8203:1: ( ( () ) )
+            // InternalCheckCfg.g:8204:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8204:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8205:1: ()
+            // InternalCheckCfg.g:8204:1: ( () )
+            // InternalCheckCfg.g:8205:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getXCastedExpressionTargetAction_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8206:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8208:1: 
+            // InternalCheckCfg.g:8206:1: ()
+            // InternalCheckCfg.g:8208:1: 
             {
             }
 
@@ -24833,16 +24833,16 @@ public final void rule__XCastedExpression__Group_1_0_0__0__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1_0_0__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8218:1: rule__XCastedExpression__Group_1_0_0__1 : rule__XCastedExpression__Group_1_0_0__1__Impl ;
+    // InternalCheckCfg.g:8218:1: rule__XCastedExpression__Group_1_0_0__1 : rule__XCastedExpression__Group_1_0_0__1__Impl ;
     public final void rule__XCastedExpression__Group_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8222:1: ( rule__XCastedExpression__Group_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8223:2: rule__XCastedExpression__Group_1_0_0__1__Impl
+            // InternalCheckCfg.g:8222:1: ( rule__XCastedExpression__Group_1_0_0__1__Impl )
+            // InternalCheckCfg.g:8223:2: rule__XCastedExpression__Group_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__Group_1_0_0__1__Impl_in_rule__XCastedExpression__Group_1_0_0__117002);
+            pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group_1_0_0__1__Impl();
 
             state._fsp--;
@@ -24866,22 +24866,22 @@ public final void rule__XCastedExpression__Group_1_0_0__1() throws RecognitionEx
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8229:1: rule__XCastedExpression__Group_1_0_0__1__Impl : ( 'as' ) ;
+    // InternalCheckCfg.g:8229:1: rule__XCastedExpression__Group_1_0_0__1__Impl : ( 'as' ) ;
     public final void rule__XCastedExpression__Group_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8233:1: ( ( 'as' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8234:1: ( 'as' )
+            // InternalCheckCfg.g:8233:1: ( ( 'as' ) )
+            // InternalCheckCfg.g:8234:1: ( 'as' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8234:1: ( 'as' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8235:1: 'as'
+            // InternalCheckCfg.g:8234:1: ( 'as' )
+            // InternalCheckCfg.g:8235:1: 'as'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getAsKeyword_1_0_0_1()); 
             }
-            match(input,69,FOLLOW_69_in_rule__XCastedExpression__Group_1_0_0__1__Impl17030); if (state.failed) return ;
+            match(input,69,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXCastedExpressionAccess().getAsKeyword_1_0_0_1()); 
             }
@@ -24907,21 +24907,21 @@ public final void rule__XCastedExpression__Group_1_0_0__1__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XPostfixOperation__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8252:1: rule__XPostfixOperation__Group__0 : rule__XPostfixOperation__Group__0__Impl rule__XPostfixOperation__Group__1 ;
+    // InternalCheckCfg.g:8252:1: rule__XPostfixOperation__Group__0 : rule__XPostfixOperation__Group__0__Impl rule__XPostfixOperation__Group__1 ;
     public final void rule__XPostfixOperation__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8256:1: ( rule__XPostfixOperation__Group__0__Impl rule__XPostfixOperation__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8257:2: rule__XPostfixOperation__Group__0__Impl rule__XPostfixOperation__Group__1
+            // InternalCheckCfg.g:8256:1: ( rule__XPostfixOperation__Group__0__Impl rule__XPostfixOperation__Group__1 )
+            // InternalCheckCfg.g:8257:2: rule__XPostfixOperation__Group__0__Impl rule__XPostfixOperation__Group__1
             {
-            pushFollow(FOLLOW_rule__XPostfixOperation__Group__0__Impl_in_rule__XPostfixOperation__Group__017065);
+            pushFollow(FOLLOW_52);
             rule__XPostfixOperation__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XPostfixOperation__Group__1_in_rule__XPostfixOperation__Group__017068);
+            pushFollow(FOLLOW_2);
             rule__XPostfixOperation__Group__1();
 
             state._fsp--;
@@ -24945,22 +24945,22 @@ public final void rule__XPostfixOperation__Group__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XPostfixOperation__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8264:1: rule__XPostfixOperation__Group__0__Impl : ( ruleXMemberFeatureCall ) ;
+    // InternalCheckCfg.g:8264:1: rule__XPostfixOperation__Group__0__Impl : ( ruleXMemberFeatureCall ) ;
     public final void rule__XPostfixOperation__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8268:1: ( ( ruleXMemberFeatureCall ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8269:1: ( ruleXMemberFeatureCall )
+            // InternalCheckCfg.g:8268:1: ( ( ruleXMemberFeatureCall ) )
+            // InternalCheckCfg.g:8269:1: ( ruleXMemberFeatureCall )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8269:1: ( ruleXMemberFeatureCall )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8270:1: ruleXMemberFeatureCall
+            // InternalCheckCfg.g:8269:1: ( ruleXMemberFeatureCall )
+            // InternalCheckCfg.g:8270:1: ruleXMemberFeatureCall
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getXMemberFeatureCallParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleXMemberFeatureCall_in_rule__XPostfixOperation__Group__0__Impl17095);
+            pushFollow(FOLLOW_2);
             ruleXMemberFeatureCall();
 
             state._fsp--;
@@ -24990,16 +24990,16 @@ public final void rule__XPostfixOperation__Group__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XPostfixOperation__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8281:1: rule__XPostfixOperation__Group__1 : rule__XPostfixOperation__Group__1__Impl ;
+    // InternalCheckCfg.g:8281:1: rule__XPostfixOperation__Group__1 : rule__XPostfixOperation__Group__1__Impl ;
     public final void rule__XPostfixOperation__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8285:1: ( rule__XPostfixOperation__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8286:2: rule__XPostfixOperation__Group__1__Impl
+            // InternalCheckCfg.g:8285:1: ( rule__XPostfixOperation__Group__1__Impl )
+            // InternalCheckCfg.g:8286:2: rule__XPostfixOperation__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XPostfixOperation__Group__1__Impl_in_rule__XPostfixOperation__Group__117124);
+            pushFollow(FOLLOW_2);
             rule__XPostfixOperation__Group__1__Impl();
 
             state._fsp--;
@@ -25023,22 +25023,22 @@ public final void rule__XPostfixOperation__Group__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XPostfixOperation__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8292:1: rule__XPostfixOperation__Group__1__Impl : ( ( rule__XPostfixOperation__Group_1__0 )? ) ;
+    // InternalCheckCfg.g:8292:1: rule__XPostfixOperation__Group__1__Impl : ( ( rule__XPostfixOperation__Group_1__0 )? ) ;
     public final void rule__XPostfixOperation__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8296:1: ( ( ( rule__XPostfixOperation__Group_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8297:1: ( ( rule__XPostfixOperation__Group_1__0 )? )
+            // InternalCheckCfg.g:8296:1: ( ( ( rule__XPostfixOperation__Group_1__0 )? ) )
+            // InternalCheckCfg.g:8297:1: ( ( rule__XPostfixOperation__Group_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8297:1: ( ( rule__XPostfixOperation__Group_1__0 )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8298:1: ( rule__XPostfixOperation__Group_1__0 )?
+            // InternalCheckCfg.g:8297:1: ( ( rule__XPostfixOperation__Group_1__0 )? )
+            // InternalCheckCfg.g:8298:1: ( rule__XPostfixOperation__Group_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8299:1: ( rule__XPostfixOperation__Group_1__0 )?
+            // InternalCheckCfg.g:8299:1: ( rule__XPostfixOperation__Group_1__0 )?
             int alt67=2;
             int LA67_0 = input.LA(1);
 
@@ -25058,9 +25058,9 @@ else if ( (LA67_0==42) ) {
             }
             switch (alt67) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8299:2: rule__XPostfixOperation__Group_1__0
+                    // InternalCheckCfg.g:8299:2: rule__XPostfixOperation__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__XPostfixOperation__Group_1__0_in_rule__XPostfixOperation__Group__1__Impl17151);
+                    pushFollow(FOLLOW_2);
                     rule__XPostfixOperation__Group_1__0();
 
                     state._fsp--;
@@ -25096,16 +25096,16 @@ else if ( (LA67_0==42) ) {
 
 
     // $ANTLR start "rule__XPostfixOperation__Group_1__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8313:1: rule__XPostfixOperation__Group_1__0 : rule__XPostfixOperation__Group_1__0__Impl ;
+    // InternalCheckCfg.g:8313:1: rule__XPostfixOperation__Group_1__0 : rule__XPostfixOperation__Group_1__0__Impl ;
     public final void rule__XPostfixOperation__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8317:1: ( rule__XPostfixOperation__Group_1__0__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8318:2: rule__XPostfixOperation__Group_1__0__Impl
+            // InternalCheckCfg.g:8317:1: ( rule__XPostfixOperation__Group_1__0__Impl )
+            // InternalCheckCfg.g:8318:2: rule__XPostfixOperation__Group_1__0__Impl
             {
-            pushFollow(FOLLOW_rule__XPostfixOperation__Group_1__0__Impl_in_rule__XPostfixOperation__Group_1__017186);
+            pushFollow(FOLLOW_2);
             rule__XPostfixOperation__Group_1__0__Impl();
 
             state._fsp--;
@@ -25129,25 +25129,25 @@ public final void rule__XPostfixOperation__Group_1__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XPostfixOperation__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8324:1: rule__XPostfixOperation__Group_1__0__Impl : ( ( rule__XPostfixOperation__Group_1_0__0 ) ) ;
+    // InternalCheckCfg.g:8324:1: rule__XPostfixOperation__Group_1__0__Impl : ( ( rule__XPostfixOperation__Group_1_0__0 ) ) ;
     public final void rule__XPostfixOperation__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8328:1: ( ( ( rule__XPostfixOperation__Group_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8329:1: ( ( rule__XPostfixOperation__Group_1_0__0 ) )
+            // InternalCheckCfg.g:8328:1: ( ( ( rule__XPostfixOperation__Group_1_0__0 ) ) )
+            // InternalCheckCfg.g:8329:1: ( ( rule__XPostfixOperation__Group_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8329:1: ( ( rule__XPostfixOperation__Group_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8330:1: ( rule__XPostfixOperation__Group_1_0__0 )
+            // InternalCheckCfg.g:8329:1: ( ( rule__XPostfixOperation__Group_1_0__0 ) )
+            // InternalCheckCfg.g:8330:1: ( rule__XPostfixOperation__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getGroup_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8331:1: ( rule__XPostfixOperation__Group_1_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8331:2: rule__XPostfixOperation__Group_1_0__0
+            // InternalCheckCfg.g:8331:1: ( rule__XPostfixOperation__Group_1_0__0 )
+            // InternalCheckCfg.g:8331:2: rule__XPostfixOperation__Group_1_0__0
             {
-            pushFollow(FOLLOW_rule__XPostfixOperation__Group_1_0__0_in_rule__XPostfixOperation__Group_1__0__Impl17213);
+            pushFollow(FOLLOW_2);
             rule__XPostfixOperation__Group_1_0__0();
 
             state._fsp--;
@@ -25180,21 +25180,21 @@ public final void rule__XPostfixOperation__Group_1__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XPostfixOperation__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8343:1: rule__XPostfixOperation__Group_1_0__0 : rule__XPostfixOperation__Group_1_0__0__Impl rule__XPostfixOperation__Group_1_0__1 ;
+    // InternalCheckCfg.g:8343:1: rule__XPostfixOperation__Group_1_0__0 : rule__XPostfixOperation__Group_1_0__0__Impl rule__XPostfixOperation__Group_1_0__1 ;
     public final void rule__XPostfixOperation__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8347:1: ( rule__XPostfixOperation__Group_1_0__0__Impl rule__XPostfixOperation__Group_1_0__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8348:2: rule__XPostfixOperation__Group_1_0__0__Impl rule__XPostfixOperation__Group_1_0__1
+            // InternalCheckCfg.g:8347:1: ( rule__XPostfixOperation__Group_1_0__0__Impl rule__XPostfixOperation__Group_1_0__1 )
+            // InternalCheckCfg.g:8348:2: rule__XPostfixOperation__Group_1_0__0__Impl rule__XPostfixOperation__Group_1_0__1
             {
-            pushFollow(FOLLOW_rule__XPostfixOperation__Group_1_0__0__Impl_in_rule__XPostfixOperation__Group_1_0__017245);
+            pushFollow(FOLLOW_52);
             rule__XPostfixOperation__Group_1_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XPostfixOperation__Group_1_0__1_in_rule__XPostfixOperation__Group_1_0__017248);
+            pushFollow(FOLLOW_2);
             rule__XPostfixOperation__Group_1_0__1();
 
             state._fsp--;
@@ -25218,23 +25218,23 @@ public final void rule__XPostfixOperation__Group_1_0__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__XPostfixOperation__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8355:1: rule__XPostfixOperation__Group_1_0__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:8355:1: rule__XPostfixOperation__Group_1_0__0__Impl : ( () ) ;
     public final void rule__XPostfixOperation__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8359:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8360:1: ( () )
+            // InternalCheckCfg.g:8359:1: ( ( () ) )
+            // InternalCheckCfg.g:8360:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8360:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8361:1: ()
+            // InternalCheckCfg.g:8360:1: ( () )
+            // InternalCheckCfg.g:8361:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getXPostfixOperationOperandAction_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8362:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8364:1: 
+            // InternalCheckCfg.g:8362:1: ()
+            // InternalCheckCfg.g:8364:1: 
             {
             }
 
@@ -25259,16 +25259,16 @@ public final void rule__XPostfixOperation__Group_1_0__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XPostfixOperation__Group_1_0__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8374:1: rule__XPostfixOperation__Group_1_0__1 : rule__XPostfixOperation__Group_1_0__1__Impl ;
+    // InternalCheckCfg.g:8374:1: rule__XPostfixOperation__Group_1_0__1 : rule__XPostfixOperation__Group_1_0__1__Impl ;
     public final void rule__XPostfixOperation__Group_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8378:1: ( rule__XPostfixOperation__Group_1_0__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8379:2: rule__XPostfixOperation__Group_1_0__1__Impl
+            // InternalCheckCfg.g:8378:1: ( rule__XPostfixOperation__Group_1_0__1__Impl )
+            // InternalCheckCfg.g:8379:2: rule__XPostfixOperation__Group_1_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XPostfixOperation__Group_1_0__1__Impl_in_rule__XPostfixOperation__Group_1_0__117306);
+            pushFollow(FOLLOW_2);
             rule__XPostfixOperation__Group_1_0__1__Impl();
 
             state._fsp--;
@@ -25292,25 +25292,25 @@ public final void rule__XPostfixOperation__Group_1_0__1() throws RecognitionExce
 
 
     // $ANTLR start "rule__XPostfixOperation__Group_1_0__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8385:1: rule__XPostfixOperation__Group_1_0__1__Impl : ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) ) ;
+    // InternalCheckCfg.g:8385:1: rule__XPostfixOperation__Group_1_0__1__Impl : ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) ) ;
     public final void rule__XPostfixOperation__Group_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8389:1: ( ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8390:1: ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) )
+            // InternalCheckCfg.g:8389:1: ( ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) ) )
+            // InternalCheckCfg.g:8390:1: ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8390:1: ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8391:1: ( rule__XPostfixOperation__FeatureAssignment_1_0_1 )
+            // InternalCheckCfg.g:8390:1: ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) )
+            // InternalCheckCfg.g:8391:1: ( rule__XPostfixOperation__FeatureAssignment_1_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getFeatureAssignment_1_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8392:1: ( rule__XPostfixOperation__FeatureAssignment_1_0_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8392:2: rule__XPostfixOperation__FeatureAssignment_1_0_1
+            // InternalCheckCfg.g:8392:1: ( rule__XPostfixOperation__FeatureAssignment_1_0_1 )
+            // InternalCheckCfg.g:8392:2: rule__XPostfixOperation__FeatureAssignment_1_0_1
             {
-            pushFollow(FOLLOW_rule__XPostfixOperation__FeatureAssignment_1_0_1_in_rule__XPostfixOperation__Group_1_0__1__Impl17333);
+            pushFollow(FOLLOW_2);
             rule__XPostfixOperation__FeatureAssignment_1_0_1();
 
             state._fsp--;
@@ -25343,21 +25343,21 @@ public final void rule__XPostfixOperation__Group_1_0__1__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8406:1: rule__XMemberFeatureCall__Group__0 : rule__XMemberFeatureCall__Group__0__Impl rule__XMemberFeatureCall__Group__1 ;
+    // InternalCheckCfg.g:8406:1: rule__XMemberFeatureCall__Group__0 : rule__XMemberFeatureCall__Group__0__Impl rule__XMemberFeatureCall__Group__1 ;
     public final void rule__XMemberFeatureCall__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8410:1: ( rule__XMemberFeatureCall__Group__0__Impl rule__XMemberFeatureCall__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8411:2: rule__XMemberFeatureCall__Group__0__Impl rule__XMemberFeatureCall__Group__1
+            // InternalCheckCfg.g:8410:1: ( rule__XMemberFeatureCall__Group__0__Impl rule__XMemberFeatureCall__Group__1 )
+            // InternalCheckCfg.g:8411:2: rule__XMemberFeatureCall__Group__0__Impl rule__XMemberFeatureCall__Group__1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group__0__Impl_in_rule__XMemberFeatureCall__Group__017367);
+            pushFollow(FOLLOW_53);
             rule__XMemberFeatureCall__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group__1_in_rule__XMemberFeatureCall__Group__017370);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group__1();
 
             state._fsp--;
@@ -25381,22 +25381,22 @@ public final void rule__XMemberFeatureCall__Group__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8418:1: rule__XMemberFeatureCall__Group__0__Impl : ( ruleXPrimaryExpression ) ;
+    // InternalCheckCfg.g:8418:1: rule__XMemberFeatureCall__Group__0__Impl : ( ruleXPrimaryExpression ) ;
     public final void rule__XMemberFeatureCall__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8422:1: ( ( ruleXPrimaryExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8423:1: ( ruleXPrimaryExpression )
+            // InternalCheckCfg.g:8422:1: ( ( ruleXPrimaryExpression ) )
+            // InternalCheckCfg.g:8423:1: ( ruleXPrimaryExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8423:1: ( ruleXPrimaryExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8424:1: ruleXPrimaryExpression
+            // InternalCheckCfg.g:8423:1: ( ruleXPrimaryExpression )
+            // InternalCheckCfg.g:8424:1: ruleXPrimaryExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getXPrimaryExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleXPrimaryExpression_in_rule__XMemberFeatureCall__Group__0__Impl17397);
+            pushFollow(FOLLOW_2);
             ruleXPrimaryExpression();
 
             state._fsp--;
@@ -25426,16 +25426,16 @@ public final void rule__XMemberFeatureCall__Group__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8435:1: rule__XMemberFeatureCall__Group__1 : rule__XMemberFeatureCall__Group__1__Impl ;
+    // InternalCheckCfg.g:8435:1: rule__XMemberFeatureCall__Group__1 : rule__XMemberFeatureCall__Group__1__Impl ;
     public final void rule__XMemberFeatureCall__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8439:1: ( rule__XMemberFeatureCall__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8440:2: rule__XMemberFeatureCall__Group__1__Impl
+            // InternalCheckCfg.g:8439:1: ( rule__XMemberFeatureCall__Group__1__Impl )
+            // InternalCheckCfg.g:8440:2: rule__XMemberFeatureCall__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group__1__Impl_in_rule__XMemberFeatureCall__Group__117426);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group__1__Impl();
 
             state._fsp--;
@@ -25459,22 +25459,22 @@ public final void rule__XMemberFeatureCall__Group__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8446:1: rule__XMemberFeatureCall__Group__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1 )* ) ;
+    // InternalCheckCfg.g:8446:1: rule__XMemberFeatureCall__Group__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1 )* ) ;
     public final void rule__XMemberFeatureCall__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8450:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8451:1: ( ( rule__XMemberFeatureCall__Alternatives_1 )* )
+            // InternalCheckCfg.g:8450:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1 )* ) )
+            // InternalCheckCfg.g:8451:1: ( ( rule__XMemberFeatureCall__Alternatives_1 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8451:1: ( ( rule__XMemberFeatureCall__Alternatives_1 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8452:1: ( rule__XMemberFeatureCall__Alternatives_1 )*
+            // InternalCheckCfg.g:8451:1: ( ( rule__XMemberFeatureCall__Alternatives_1 )* )
+            // InternalCheckCfg.g:8452:1: ( rule__XMemberFeatureCall__Alternatives_1 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getAlternatives_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8453:1: ( rule__XMemberFeatureCall__Alternatives_1 )*
+            // InternalCheckCfg.g:8453:1: ( rule__XMemberFeatureCall__Alternatives_1 )*
             loop68:
             do {
                 int alt68=2;
@@ -25517,9 +25517,9 @@ public final void rule__XMemberFeatureCall__Group__1__Impl() throws RecognitionE
 
                 switch (alt68) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8453:2: rule__XMemberFeatureCall__Alternatives_1
+            	    // InternalCheckCfg.g:8453:2: rule__XMemberFeatureCall__Alternatives_1
             	    {
-            	    pushFollow(FOLLOW_rule__XMemberFeatureCall__Alternatives_1_in_rule__XMemberFeatureCall__Group__1__Impl17453);
+            	    pushFollow(FOLLOW_54);
             	    rule__XMemberFeatureCall__Alternatives_1();
 
             	    state._fsp--;
@@ -25558,21 +25558,21 @@ public final void rule__XMemberFeatureCall__Group__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8467:1: rule__XMemberFeatureCall__Group_1_0__0 : rule__XMemberFeatureCall__Group_1_0__0__Impl rule__XMemberFeatureCall__Group_1_0__1 ;
+    // InternalCheckCfg.g:8467:1: rule__XMemberFeatureCall__Group_1_0__0 : rule__XMemberFeatureCall__Group_1_0__0__Impl rule__XMemberFeatureCall__Group_1_0__1 ;
     public final void rule__XMemberFeatureCall__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8471:1: ( rule__XMemberFeatureCall__Group_1_0__0__Impl rule__XMemberFeatureCall__Group_1_0__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8472:2: rule__XMemberFeatureCall__Group_1_0__0__Impl rule__XMemberFeatureCall__Group_1_0__1
+            // InternalCheckCfg.g:8471:1: ( rule__XMemberFeatureCall__Group_1_0__0__Impl rule__XMemberFeatureCall__Group_1_0__1 )
+            // InternalCheckCfg.g:8472:2: rule__XMemberFeatureCall__Group_1_0__0__Impl rule__XMemberFeatureCall__Group_1_0__1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_0__017488);
+            pushFollow(FOLLOW_27);
             rule__XMemberFeatureCall__Group_1_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0__1_in_rule__XMemberFeatureCall__Group_1_0__017491);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_0__1();
 
             state._fsp--;
@@ -25596,25 +25596,25 @@ public final void rule__XMemberFeatureCall__Group_1_0__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8479:1: rule__XMemberFeatureCall__Group_1_0__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) ) ;
+    // InternalCheckCfg.g:8479:1: rule__XMemberFeatureCall__Group_1_0__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8483:1: ( ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8484:1: ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) )
+            // InternalCheckCfg.g:8483:1: ( ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) ) )
+            // InternalCheckCfg.g:8484:1: ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8484:1: ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8485:1: ( rule__XMemberFeatureCall__Group_1_0_0__0 )
+            // InternalCheckCfg.g:8484:1: ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) )
+            // InternalCheckCfg.g:8485:1: ( rule__XMemberFeatureCall__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8486:1: ( rule__XMemberFeatureCall__Group_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8486:2: rule__XMemberFeatureCall__Group_1_0_0__0
+            // InternalCheckCfg.g:8486:1: ( rule__XMemberFeatureCall__Group_1_0_0__0 )
+            // InternalCheckCfg.g:8486:2: rule__XMemberFeatureCall__Group_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0__0_in_rule__XMemberFeatureCall__Group_1_0__0__Impl17518);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_0_0__0();
 
             state._fsp--;
@@ -25647,16 +25647,16 @@ public final void rule__XMemberFeatureCall__Group_1_0__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8496:1: rule__XMemberFeatureCall__Group_1_0__1 : rule__XMemberFeatureCall__Group_1_0__1__Impl ;
+    // InternalCheckCfg.g:8496:1: rule__XMemberFeatureCall__Group_1_0__1 : rule__XMemberFeatureCall__Group_1_0__1__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8500:1: ( rule__XMemberFeatureCall__Group_1_0__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8501:2: rule__XMemberFeatureCall__Group_1_0__1__Impl
+            // InternalCheckCfg.g:8500:1: ( rule__XMemberFeatureCall__Group_1_0__1__Impl )
+            // InternalCheckCfg.g:8501:2: rule__XMemberFeatureCall__Group_1_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0__1__Impl_in_rule__XMemberFeatureCall__Group_1_0__117548);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_0__1__Impl();
 
             state._fsp--;
@@ -25680,25 +25680,25 @@ public final void rule__XMemberFeatureCall__Group_1_0__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8507:1: rule__XMemberFeatureCall__Group_1_0__1__Impl : ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) ) ;
+    // InternalCheckCfg.g:8507:1: rule__XMemberFeatureCall__Group_1_0__1__Impl : ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8511:1: ( ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8512:1: ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) )
+            // InternalCheckCfg.g:8511:1: ( ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) ) )
+            // InternalCheckCfg.g:8512:1: ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8512:1: ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8513:1: ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 )
+            // InternalCheckCfg.g:8512:1: ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) )
+            // InternalCheckCfg.g:8513:1: ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getValueAssignment_1_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8514:1: ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8514:2: rule__XMemberFeatureCall__ValueAssignment_1_0_1
+            // InternalCheckCfg.g:8514:1: ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 )
+            // InternalCheckCfg.g:8514:2: rule__XMemberFeatureCall__ValueAssignment_1_0_1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__ValueAssignment_1_0_1_in_rule__XMemberFeatureCall__Group_1_0__1__Impl17575);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__ValueAssignment_1_0_1();
 
             state._fsp--;
@@ -25731,16 +25731,16 @@ public final void rule__XMemberFeatureCall__Group_1_0__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8528:1: rule__XMemberFeatureCall__Group_1_0_0__0 : rule__XMemberFeatureCall__Group_1_0_0__0__Impl ;
+    // InternalCheckCfg.g:8528:1: rule__XMemberFeatureCall__Group_1_0_0__0 : rule__XMemberFeatureCall__Group_1_0_0__0__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8532:1: ( rule__XMemberFeatureCall__Group_1_0_0__0__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8533:2: rule__XMemberFeatureCall__Group_1_0_0__0__Impl
+            // InternalCheckCfg.g:8532:1: ( rule__XMemberFeatureCall__Group_1_0_0__0__Impl )
+            // InternalCheckCfg.g:8533:2: rule__XMemberFeatureCall__Group_1_0_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_0_0__017609);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_0_0__0__Impl();
 
             state._fsp--;
@@ -25764,25 +25764,25 @@ public final void rule__XMemberFeatureCall__Group_1_0_0__0() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8539:1: rule__XMemberFeatureCall__Group_1_0_0__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) ) ;
+    // InternalCheckCfg.g:8539:1: rule__XMemberFeatureCall__Group_1_0_0__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8543:1: ( ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8544:1: ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) )
+            // InternalCheckCfg.g:8543:1: ( ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) ) )
+            // InternalCheckCfg.g:8544:1: ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8544:1: ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8545:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__0 )
+            // InternalCheckCfg.g:8544:1: ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) )
+            // InternalCheckCfg.g:8545:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8546:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8546:2: rule__XMemberFeatureCall__Group_1_0_0_0__0
+            // InternalCheckCfg.g:8546:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__0 )
+            // InternalCheckCfg.g:8546:2: rule__XMemberFeatureCall__Group_1_0_0_0__0
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__0_in_rule__XMemberFeatureCall__Group_1_0_0__0__Impl17636);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_0_0_0__0();
 
             state._fsp--;
@@ -25815,21 +25815,21 @@ public final void rule__XMemberFeatureCall__Group_1_0_0__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8558:1: rule__XMemberFeatureCall__Group_1_0_0_0__0 : rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl rule__XMemberFeatureCall__Group_1_0_0_0__1 ;
+    // InternalCheckCfg.g:8558:1: rule__XMemberFeatureCall__Group_1_0_0_0__0 : rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl rule__XMemberFeatureCall__Group_1_0_0_0__1 ;
     public final void rule__XMemberFeatureCall__Group_1_0_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8562:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl rule__XMemberFeatureCall__Group_1_0_0_0__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8563:2: rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl rule__XMemberFeatureCall__Group_1_0_0_0__1
+            // InternalCheckCfg.g:8562:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl rule__XMemberFeatureCall__Group_1_0_0_0__1 )
+            // InternalCheckCfg.g:8563:2: rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl rule__XMemberFeatureCall__Group_1_0_0_0__1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_0_0_0__017668);
+            pushFollow(FOLLOW_55);
             rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__1_in_rule__XMemberFeatureCall__Group_1_0_0_0__017671);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_0_0_0__1();
 
             state._fsp--;
@@ -25853,23 +25853,23 @@ public final void rule__XMemberFeatureCall__Group_1_0_0_0__0() throws Recognitio
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8570:1: rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:8570:1: rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl : ( () ) ;
     public final void rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8574:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8575:1: ( () )
+            // InternalCheckCfg.g:8574:1: ( ( () ) )
+            // InternalCheckCfg.g:8575:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8575:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8576:1: ()
+            // InternalCheckCfg.g:8575:1: ( () )
+            // InternalCheckCfg.g:8576:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getXAssignmentAssignableAction_1_0_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8577:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8579:1: 
+            // InternalCheckCfg.g:8577:1: ()
+            // InternalCheckCfg.g:8579:1: 
             {
             }
 
@@ -25894,21 +25894,21 @@ public final void rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl() throws Reco
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8589:1: rule__XMemberFeatureCall__Group_1_0_0_0__1 : rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl rule__XMemberFeatureCall__Group_1_0_0_0__2 ;
+    // InternalCheckCfg.g:8589:1: rule__XMemberFeatureCall__Group_1_0_0_0__1 : rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl rule__XMemberFeatureCall__Group_1_0_0_0__2 ;
     public final void rule__XMemberFeatureCall__Group_1_0_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8593:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl rule__XMemberFeatureCall__Group_1_0_0_0__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8594:2: rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl rule__XMemberFeatureCall__Group_1_0_0_0__2
+            // InternalCheckCfg.g:8593:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl rule__XMemberFeatureCall__Group_1_0_0_0__2 )
+            // InternalCheckCfg.g:8594:2: rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl rule__XMemberFeatureCall__Group_1_0_0_0__2
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl_in_rule__XMemberFeatureCall__Group_1_0_0_0__117729);
+            pushFollow(FOLLOW_26);
             rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__2_in_rule__XMemberFeatureCall__Group_1_0_0_0__117732);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_0_0_0__2();
 
             state._fsp--;
@@ -25932,25 +25932,25 @@ public final void rule__XMemberFeatureCall__Group_1_0_0_0__1() throws Recognitio
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8601:1: rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) ) ;
+    // InternalCheckCfg.g:8601:1: rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8605:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8606:1: ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) )
+            // InternalCheckCfg.g:8605:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) ) )
+            // InternalCheckCfg.g:8606:1: ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8606:1: ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8607:1: ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 )
+            // InternalCheckCfg.g:8606:1: ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) )
+            // InternalCheckCfg.g:8607:1: ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getAlternatives_1_0_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8608:1: ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8608:2: rule__XMemberFeatureCall__Alternatives_1_0_0_0_1
+            // InternalCheckCfg.g:8608:1: ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 )
+            // InternalCheckCfg.g:8608:2: rule__XMemberFeatureCall__Alternatives_1_0_0_0_1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Alternatives_1_0_0_0_1_in_rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl17759);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Alternatives_1_0_0_0_1();
 
             state._fsp--;
@@ -25983,21 +25983,21 @@ public final void rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl() throws Reco
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8618:1: rule__XMemberFeatureCall__Group_1_0_0_0__2 : rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl rule__XMemberFeatureCall__Group_1_0_0_0__3 ;
+    // InternalCheckCfg.g:8618:1: rule__XMemberFeatureCall__Group_1_0_0_0__2 : rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl rule__XMemberFeatureCall__Group_1_0_0_0__3 ;
     public final void rule__XMemberFeatureCall__Group_1_0_0_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8622:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl rule__XMemberFeatureCall__Group_1_0_0_0__3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8623:2: rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl rule__XMemberFeatureCall__Group_1_0_0_0__3
+            // InternalCheckCfg.g:8622:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl rule__XMemberFeatureCall__Group_1_0_0_0__3 )
+            // InternalCheckCfg.g:8623:2: rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl rule__XMemberFeatureCall__Group_1_0_0_0__3
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl_in_rule__XMemberFeatureCall__Group_1_0_0_0__217789);
+            pushFollow(FOLLOW_19);
             rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__3_in_rule__XMemberFeatureCall__Group_1_0_0_0__217792);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_0_0_0__3();
 
             state._fsp--;
@@ -26021,25 +26021,25 @@ public final void rule__XMemberFeatureCall__Group_1_0_0_0__2() throws Recognitio
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8630:1: rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl : ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) ) ;
+    // InternalCheckCfg.g:8630:1: rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl : ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8634:1: ( ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8635:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) )
+            // InternalCheckCfg.g:8634:1: ( ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) ) )
+            // InternalCheckCfg.g:8635:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8635:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8636:1: ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 )
+            // InternalCheckCfg.g:8635:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) )
+            // InternalCheckCfg.g:8636:1: ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getFeatureAssignment_1_0_0_0_2()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8637:1: ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8637:2: rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2
+            // InternalCheckCfg.g:8637:1: ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 )
+            // InternalCheckCfg.g:8637:2: rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2_in_rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl17819);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2();
 
             state._fsp--;
@@ -26072,16 +26072,16 @@ public final void rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl() throws Reco
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8647:1: rule__XMemberFeatureCall__Group_1_0_0_0__3 : rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl ;
+    // InternalCheckCfg.g:8647:1: rule__XMemberFeatureCall__Group_1_0_0_0__3 : rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_0_0_0__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8651:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8652:2: rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl
+            // InternalCheckCfg.g:8651:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl )
+            // InternalCheckCfg.g:8652:2: rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl_in_rule__XMemberFeatureCall__Group_1_0_0_0__317849);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl();
 
             state._fsp--;
@@ -26105,22 +26105,22 @@ public final void rule__XMemberFeatureCall__Group_1_0_0_0__3() throws Recognitio
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8658:1: rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl : ( ruleOpSingleAssign ) ;
+    // InternalCheckCfg.g:8658:1: rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl : ( ruleOpSingleAssign ) ;
     public final void rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8662:1: ( ( ruleOpSingleAssign ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8663:1: ( ruleOpSingleAssign )
+            // InternalCheckCfg.g:8662:1: ( ( ruleOpSingleAssign ) )
+            // InternalCheckCfg.g:8663:1: ( ruleOpSingleAssign )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8663:1: ( ruleOpSingleAssign )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8664:1: ruleOpSingleAssign
+            // InternalCheckCfg.g:8663:1: ( ruleOpSingleAssign )
+            // InternalCheckCfg.g:8664:1: ruleOpSingleAssign
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getOpSingleAssignParserRuleCall_1_0_0_0_3()); 
             }
-            pushFollow(FOLLOW_ruleOpSingleAssign_in_rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl17876);
+            pushFollow(FOLLOW_2);
             ruleOpSingleAssign();
 
             state._fsp--;
@@ -26150,21 +26150,21 @@ public final void rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl() throws Reco
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8683:1: rule__XMemberFeatureCall__Group_1_1__0 : rule__XMemberFeatureCall__Group_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1__1 ;
+    // InternalCheckCfg.g:8683:1: rule__XMemberFeatureCall__Group_1_1__0 : rule__XMemberFeatureCall__Group_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1__1 ;
     public final void rule__XMemberFeatureCall__Group_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8687:1: ( rule__XMemberFeatureCall__Group_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8688:2: rule__XMemberFeatureCall__Group_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1__1
+            // InternalCheckCfg.g:8687:1: ( rule__XMemberFeatureCall__Group_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1__1 )
+            // InternalCheckCfg.g:8688:2: rule__XMemberFeatureCall__Group_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1__1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__0__Impl_in_rule__XMemberFeatureCall__Group_1_1__017913);
+            pushFollow(FOLLOW_56);
             rule__XMemberFeatureCall__Group_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__1_in_rule__XMemberFeatureCall__Group_1_1__017916);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1__1();
 
             state._fsp--;
@@ -26188,25 +26188,25 @@ public final void rule__XMemberFeatureCall__Group_1_1__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8695:1: rule__XMemberFeatureCall__Group_1_1__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) ) ;
+    // InternalCheckCfg.g:8695:1: rule__XMemberFeatureCall__Group_1_1__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8699:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8700:1: ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) )
+            // InternalCheckCfg.g:8699:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) ) )
+            // InternalCheckCfg.g:8700:1: ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8700:1: ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8701:1: ( rule__XMemberFeatureCall__Group_1_1_0__0 )
+            // InternalCheckCfg.g:8700:1: ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) )
+            // InternalCheckCfg.g:8701:1: ( rule__XMemberFeatureCall__Group_1_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8702:1: ( rule__XMemberFeatureCall__Group_1_1_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8702:2: rule__XMemberFeatureCall__Group_1_1_0__0
+            // InternalCheckCfg.g:8702:1: ( rule__XMemberFeatureCall__Group_1_1_0__0 )
+            // InternalCheckCfg.g:8702:2: rule__XMemberFeatureCall__Group_1_1_0__0
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_0__0_in_rule__XMemberFeatureCall__Group_1_1__0__Impl17943);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_0__0();
 
             state._fsp--;
@@ -26239,21 +26239,21 @@ public final void rule__XMemberFeatureCall__Group_1_1__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8712:1: rule__XMemberFeatureCall__Group_1_1__1 : rule__XMemberFeatureCall__Group_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1__2 ;
+    // InternalCheckCfg.g:8712:1: rule__XMemberFeatureCall__Group_1_1__1 : rule__XMemberFeatureCall__Group_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1__2 ;
     public final void rule__XMemberFeatureCall__Group_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8716:1: ( rule__XMemberFeatureCall__Group_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8717:2: rule__XMemberFeatureCall__Group_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1__2
+            // InternalCheckCfg.g:8716:1: ( rule__XMemberFeatureCall__Group_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1__2 )
+            // InternalCheckCfg.g:8717:2: rule__XMemberFeatureCall__Group_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1__2
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__1__Impl_in_rule__XMemberFeatureCall__Group_1_1__117973);
+            pushFollow(FOLLOW_56);
             rule__XMemberFeatureCall__Group_1_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__2_in_rule__XMemberFeatureCall__Group_1_1__117976);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1__2();
 
             state._fsp--;
@@ -26277,22 +26277,22 @@ public final void rule__XMemberFeatureCall__Group_1_1__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8724:1: rule__XMemberFeatureCall__Group_1_1__1__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? ) ;
+    // InternalCheckCfg.g:8724:1: rule__XMemberFeatureCall__Group_1_1__1__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? ) ;
     public final void rule__XMemberFeatureCall__Group_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8728:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8729:1: ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? )
+            // InternalCheckCfg.g:8728:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? ) )
+            // InternalCheckCfg.g:8729:1: ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8729:1: ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8730:1: ( rule__XMemberFeatureCall__Group_1_1_1__0 )?
+            // InternalCheckCfg.g:8729:1: ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? )
+            // InternalCheckCfg.g:8730:1: ( rule__XMemberFeatureCall__Group_1_1_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8731:1: ( rule__XMemberFeatureCall__Group_1_1_1__0 )?
+            // InternalCheckCfg.g:8731:1: ( rule__XMemberFeatureCall__Group_1_1_1__0 )?
             int alt69=2;
             int LA69_0 = input.LA(1);
 
@@ -26301,9 +26301,9 @@ public final void rule__XMemberFeatureCall__Group_1_1__1__Impl() throws Recognit
             }
             switch (alt69) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8731:2: rule__XMemberFeatureCall__Group_1_1_1__0
+                    // InternalCheckCfg.g:8731:2: rule__XMemberFeatureCall__Group_1_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__0_in_rule__XMemberFeatureCall__Group_1_1__1__Impl18003);
+                    pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__Group_1_1_1__0();
 
                     state._fsp--;
@@ -26339,21 +26339,21 @@ public final void rule__XMemberFeatureCall__Group_1_1__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8741:1: rule__XMemberFeatureCall__Group_1_1__2 : rule__XMemberFeatureCall__Group_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1__3 ;
+    // InternalCheckCfg.g:8741:1: rule__XMemberFeatureCall__Group_1_1__2 : rule__XMemberFeatureCall__Group_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1__3 ;
     public final void rule__XMemberFeatureCall__Group_1_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8745:1: ( rule__XMemberFeatureCall__Group_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1__3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8746:2: rule__XMemberFeatureCall__Group_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1__3
+            // InternalCheckCfg.g:8745:1: ( rule__XMemberFeatureCall__Group_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1__3 )
+            // InternalCheckCfg.g:8746:2: rule__XMemberFeatureCall__Group_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1__3
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__2__Impl_in_rule__XMemberFeatureCall__Group_1_1__218034);
+            pushFollow(FOLLOW_57);
             rule__XMemberFeatureCall__Group_1_1__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__3_in_rule__XMemberFeatureCall__Group_1_1__218037);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1__3();
 
             state._fsp--;
@@ -26377,25 +26377,25 @@ public final void rule__XMemberFeatureCall__Group_1_1__2() throws RecognitionExc
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8753:1: rule__XMemberFeatureCall__Group_1_1__2__Impl : ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) ) ;
+    // InternalCheckCfg.g:8753:1: rule__XMemberFeatureCall__Group_1_1__2__Impl : ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8757:1: ( ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8758:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) )
+            // InternalCheckCfg.g:8757:1: ( ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) ) )
+            // InternalCheckCfg.g:8758:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8758:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8759:1: ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 )
+            // InternalCheckCfg.g:8758:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) )
+            // InternalCheckCfg.g:8759:1: ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getFeatureAssignment_1_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8760:1: ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8760:2: rule__XMemberFeatureCall__FeatureAssignment_1_1_2
+            // InternalCheckCfg.g:8760:1: ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 )
+            // InternalCheckCfg.g:8760:2: rule__XMemberFeatureCall__FeatureAssignment_1_1_2
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__FeatureAssignment_1_1_2_in_rule__XMemberFeatureCall__Group_1_1__2__Impl18064);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__FeatureAssignment_1_1_2();
 
             state._fsp--;
@@ -26428,21 +26428,21 @@ public final void rule__XMemberFeatureCall__Group_1_1__2__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8770:1: rule__XMemberFeatureCall__Group_1_1__3 : rule__XMemberFeatureCall__Group_1_1__3__Impl rule__XMemberFeatureCall__Group_1_1__4 ;
+    // InternalCheckCfg.g:8770:1: rule__XMemberFeatureCall__Group_1_1__3 : rule__XMemberFeatureCall__Group_1_1__3__Impl rule__XMemberFeatureCall__Group_1_1__4 ;
     public final void rule__XMemberFeatureCall__Group_1_1__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8774:1: ( rule__XMemberFeatureCall__Group_1_1__3__Impl rule__XMemberFeatureCall__Group_1_1__4 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8775:2: rule__XMemberFeatureCall__Group_1_1__3__Impl rule__XMemberFeatureCall__Group_1_1__4
+            // InternalCheckCfg.g:8774:1: ( rule__XMemberFeatureCall__Group_1_1__3__Impl rule__XMemberFeatureCall__Group_1_1__4 )
+            // InternalCheckCfg.g:8775:2: rule__XMemberFeatureCall__Group_1_1__3__Impl rule__XMemberFeatureCall__Group_1_1__4
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__3__Impl_in_rule__XMemberFeatureCall__Group_1_1__318094);
+            pushFollow(FOLLOW_57);
             rule__XMemberFeatureCall__Group_1_1__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__4_in_rule__XMemberFeatureCall__Group_1_1__318097);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1__4();
 
             state._fsp--;
@@ -26466,29 +26466,29 @@ public final void rule__XMemberFeatureCall__Group_1_1__3() throws RecognitionExc
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__3__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8782:1: rule__XMemberFeatureCall__Group_1_1__3__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? ) ;
+    // InternalCheckCfg.g:8782:1: rule__XMemberFeatureCall__Group_1_1__3__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? ) ;
     public final void rule__XMemberFeatureCall__Group_1_1__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8786:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8787:1: ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? )
+            // InternalCheckCfg.g:8786:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? ) )
+            // InternalCheckCfg.g:8787:1: ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8787:1: ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8788:1: ( rule__XMemberFeatureCall__Group_1_1_3__0 )?
+            // InternalCheckCfg.g:8787:1: ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? )
+            // InternalCheckCfg.g:8788:1: ( rule__XMemberFeatureCall__Group_1_1_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1_3()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8789:1: ( rule__XMemberFeatureCall__Group_1_1_3__0 )?
+            // InternalCheckCfg.g:8789:1: ( rule__XMemberFeatureCall__Group_1_1_3__0 )?
             int alt70=2;
             alt70 = dfa70.predict(input);
             switch (alt70) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8789:2: rule__XMemberFeatureCall__Group_1_1_3__0
+                    // InternalCheckCfg.g:8789:2: rule__XMemberFeatureCall__Group_1_1_3__0
                     {
-                    pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__0_in_rule__XMemberFeatureCall__Group_1_1__3__Impl18124);
+                    pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__Group_1_1_3__0();
 
                     state._fsp--;
@@ -26524,16 +26524,16 @@ public final void rule__XMemberFeatureCall__Group_1_1__3__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__4"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8799:1: rule__XMemberFeatureCall__Group_1_1__4 : rule__XMemberFeatureCall__Group_1_1__4__Impl ;
+    // InternalCheckCfg.g:8799:1: rule__XMemberFeatureCall__Group_1_1__4 : rule__XMemberFeatureCall__Group_1_1__4__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_1__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8803:1: ( rule__XMemberFeatureCall__Group_1_1__4__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8804:2: rule__XMemberFeatureCall__Group_1_1__4__Impl
+            // InternalCheckCfg.g:8803:1: ( rule__XMemberFeatureCall__Group_1_1__4__Impl )
+            // InternalCheckCfg.g:8804:2: rule__XMemberFeatureCall__Group_1_1__4__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__4__Impl_in_rule__XMemberFeatureCall__Group_1_1__418155);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1__4__Impl();
 
             state._fsp--;
@@ -26557,29 +26557,29 @@ public final void rule__XMemberFeatureCall__Group_1_1__4() throws RecognitionExc
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__4__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8810:1: rule__XMemberFeatureCall__Group_1_1__4__Impl : ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? ) ;
+    // InternalCheckCfg.g:8810:1: rule__XMemberFeatureCall__Group_1_1__4__Impl : ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? ) ;
     public final void rule__XMemberFeatureCall__Group_1_1__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8814:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8815:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? )
+            // InternalCheckCfg.g:8814:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? ) )
+            // InternalCheckCfg.g:8815:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8815:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8816:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )?
+            // InternalCheckCfg.g:8815:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? )
+            // InternalCheckCfg.g:8816:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsAssignment_1_1_4()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8817:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )?
+            // InternalCheckCfg.g:8817:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )?
             int alt71=2;
             alt71 = dfa71.predict(input);
             switch (alt71) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8817:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4
+                    // InternalCheckCfg.g:8817:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4
                     {
-                    pushFollow(FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4_in_rule__XMemberFeatureCall__Group_1_1__4__Impl18182);
+                    pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4();
 
                     state._fsp--;
@@ -26615,16 +26615,16 @@ public final void rule__XMemberFeatureCall__Group_1_1__4__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8837:1: rule__XMemberFeatureCall__Group_1_1_0__0 : rule__XMemberFeatureCall__Group_1_1_0__0__Impl ;
+    // InternalCheckCfg.g:8837:1: rule__XMemberFeatureCall__Group_1_1_0__0 : rule__XMemberFeatureCall__Group_1_1_0__0__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8841:1: ( rule__XMemberFeatureCall__Group_1_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8842:2: rule__XMemberFeatureCall__Group_1_1_0__0__Impl
+            // InternalCheckCfg.g:8841:1: ( rule__XMemberFeatureCall__Group_1_1_0__0__Impl )
+            // InternalCheckCfg.g:8842:2: rule__XMemberFeatureCall__Group_1_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_0__018223);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_0__0__Impl();
 
             state._fsp--;
@@ -26648,25 +26648,25 @@ public final void rule__XMemberFeatureCall__Group_1_1_0__0() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8848:1: rule__XMemberFeatureCall__Group_1_1_0__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) ) ;
+    // InternalCheckCfg.g:8848:1: rule__XMemberFeatureCall__Group_1_1_0__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8852:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8853:1: ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) )
+            // InternalCheckCfg.g:8852:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) ) )
+            // InternalCheckCfg.g:8853:1: ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8853:1: ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8854:1: ( rule__XMemberFeatureCall__Group_1_1_0_0__0 )
+            // InternalCheckCfg.g:8853:1: ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) )
+            // InternalCheckCfg.g:8854:1: ( rule__XMemberFeatureCall__Group_1_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8855:1: ( rule__XMemberFeatureCall__Group_1_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8855:2: rule__XMemberFeatureCall__Group_1_1_0_0__0
+            // InternalCheckCfg.g:8855:1: ( rule__XMemberFeatureCall__Group_1_1_0_0__0 )
+            // InternalCheckCfg.g:8855:2: rule__XMemberFeatureCall__Group_1_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_0_0__0_in_rule__XMemberFeatureCall__Group_1_1_0__0__Impl18250);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_0_0__0();
 
             state._fsp--;
@@ -26699,21 +26699,21 @@ public final void rule__XMemberFeatureCall__Group_1_1_0__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_0_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8867:1: rule__XMemberFeatureCall__Group_1_1_0_0__0 : rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl rule__XMemberFeatureCall__Group_1_1_0_0__1 ;
+    // InternalCheckCfg.g:8867:1: rule__XMemberFeatureCall__Group_1_1_0_0__0 : rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl rule__XMemberFeatureCall__Group_1_1_0_0__1 ;
     public final void rule__XMemberFeatureCall__Group_1_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8871:1: ( rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl rule__XMemberFeatureCall__Group_1_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8872:2: rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl rule__XMemberFeatureCall__Group_1_1_0_0__1
+            // InternalCheckCfg.g:8871:1: ( rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl rule__XMemberFeatureCall__Group_1_1_0_0__1 )
+            // InternalCheckCfg.g:8872:2: rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl rule__XMemberFeatureCall__Group_1_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_0_0__018282);
+            pushFollow(FOLLOW_53);
             rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_0_0__1_in_rule__XMemberFeatureCall__Group_1_1_0_0__018285);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_0_0__1();
 
             state._fsp--;
@@ -26737,23 +26737,23 @@ public final void rule__XMemberFeatureCall__Group_1_1_0_0__0() throws Recognitio
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8879:1: rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:8879:1: rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl : ( () ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8883:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8884:1: ( () )
+            // InternalCheckCfg.g:8883:1: ( ( () ) )
+            // InternalCheckCfg.g:8884:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8884:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8885:1: ()
+            // InternalCheckCfg.g:8884:1: ( () )
+            // InternalCheckCfg.g:8885:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getXMemberFeatureCallMemberCallTargetAction_1_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8886:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8888:1: 
+            // InternalCheckCfg.g:8886:1: ()
+            // InternalCheckCfg.g:8888:1: 
             {
             }
 
@@ -26778,16 +26778,16 @@ public final void rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl() throws Reco
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_0_0__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8898:1: rule__XMemberFeatureCall__Group_1_1_0_0__1 : rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl ;
+    // InternalCheckCfg.g:8898:1: rule__XMemberFeatureCall__Group_1_1_0_0__1 : rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8902:1: ( rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8903:2: rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl
+            // InternalCheckCfg.g:8902:1: ( rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl )
+            // InternalCheckCfg.g:8903:2: rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_0_0__118343);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl();
 
             state._fsp--;
@@ -26811,25 +26811,25 @@ public final void rule__XMemberFeatureCall__Group_1_1_0_0__1() throws Recognitio
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8909:1: rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) ) ;
+    // InternalCheckCfg.g:8909:1: rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8913:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8914:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) )
+            // InternalCheckCfg.g:8913:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) ) )
+            // InternalCheckCfg.g:8914:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8914:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8915:1: ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 )
+            // InternalCheckCfg.g:8914:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) )
+            // InternalCheckCfg.g:8915:1: ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getAlternatives_1_1_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8916:1: ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8916:2: rule__XMemberFeatureCall__Alternatives_1_1_0_0_1
+            // InternalCheckCfg.g:8916:1: ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 )
+            // InternalCheckCfg.g:8916:2: rule__XMemberFeatureCall__Alternatives_1_1_0_0_1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Alternatives_1_1_0_0_1_in_rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl18370);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Alternatives_1_1_0_0_1();
 
             state._fsp--;
@@ -26862,21 +26862,21 @@ public final void rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl() throws Reco
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8930:1: rule__XMemberFeatureCall__Group_1_1_1__0 : rule__XMemberFeatureCall__Group_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_1__1 ;
+    // InternalCheckCfg.g:8930:1: rule__XMemberFeatureCall__Group_1_1_1__0 : rule__XMemberFeatureCall__Group_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_1__1 ;
     public final void rule__XMemberFeatureCall__Group_1_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8934:1: ( rule__XMemberFeatureCall__Group_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_1__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8935:2: rule__XMemberFeatureCall__Group_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_1__1
+            // InternalCheckCfg.g:8934:1: ( rule__XMemberFeatureCall__Group_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_1__1 )
+            // InternalCheckCfg.g:8935:2: rule__XMemberFeatureCall__Group_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_1__1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_1__018404);
+            pushFollow(FOLLOW_58);
             rule__XMemberFeatureCall__Group_1_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__1_in_rule__XMemberFeatureCall__Group_1_1_1__018407);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_1__1();
 
             state._fsp--;
@@ -26900,22 +26900,22 @@ public final void rule__XMemberFeatureCall__Group_1_1_1__0() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8942:1: rule__XMemberFeatureCall__Group_1_1_1__0__Impl : ( '<' ) ;
+    // InternalCheckCfg.g:8942:1: rule__XMemberFeatureCall__Group_1_1_1__0__Impl : ( '<' ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8946:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8947:1: ( '<' )
+            // InternalCheckCfg.g:8946:1: ( ( '<' ) )
+            // InternalCheckCfg.g:8947:1: ( '<' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8947:1: ( '<' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8948:1: '<'
+            // InternalCheckCfg.g:8947:1: ( '<' )
+            // InternalCheckCfg.g:8948:1: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getLessThanSignKeyword_1_1_1_0()); 
             }
-            match(input,27,FOLLOW_27_in_rule__XMemberFeatureCall__Group_1_1_1__0__Impl18435); if (state.failed) return ;
+            match(input,27,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getLessThanSignKeyword_1_1_1_0()); 
             }
@@ -26941,21 +26941,21 @@ public final void rule__XMemberFeatureCall__Group_1_1_1__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8961:1: rule__XMemberFeatureCall__Group_1_1_1__1 : rule__XMemberFeatureCall__Group_1_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1_1__2 ;
+    // InternalCheckCfg.g:8961:1: rule__XMemberFeatureCall__Group_1_1_1__1 : rule__XMemberFeatureCall__Group_1_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1_1__2 ;
     public final void rule__XMemberFeatureCall__Group_1_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8965:1: ( rule__XMemberFeatureCall__Group_1_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1_1__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8966:2: rule__XMemberFeatureCall__Group_1_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1_1__2
+            // InternalCheckCfg.g:8965:1: ( rule__XMemberFeatureCall__Group_1_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1_1__2 )
+            // InternalCheckCfg.g:8966:2: rule__XMemberFeatureCall__Group_1_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1_1__2
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_1__118466);
+            pushFollow(FOLLOW_59);
             rule__XMemberFeatureCall__Group_1_1_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__2_in_rule__XMemberFeatureCall__Group_1_1_1__118469);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_1__2();
 
             state._fsp--;
@@ -26979,25 +26979,25 @@ public final void rule__XMemberFeatureCall__Group_1_1_1__1() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8973:1: rule__XMemberFeatureCall__Group_1_1_1__1__Impl : ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) ) ;
+    // InternalCheckCfg.g:8973:1: rule__XMemberFeatureCall__Group_1_1_1__1__Impl : ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8977:1: ( ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8978:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) )
+            // InternalCheckCfg.g:8977:1: ( ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) ) )
+            // InternalCheckCfg.g:8978:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8978:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8979:1: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 )
+            // InternalCheckCfg.g:8978:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) )
+            // InternalCheckCfg.g:8979:1: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getTypeArgumentsAssignment_1_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8980:1: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8980:2: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1
+            // InternalCheckCfg.g:8980:1: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 )
+            // InternalCheckCfg.g:8980:2: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1_in_rule__XMemberFeatureCall__Group_1_1_1__1__Impl18496);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1();
 
             state._fsp--;
@@ -27030,21 +27030,21 @@ public final void rule__XMemberFeatureCall__Group_1_1_1__1__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8990:1: rule__XMemberFeatureCall__Group_1_1_1__2 : rule__XMemberFeatureCall__Group_1_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1_1__3 ;
+    // InternalCheckCfg.g:8990:1: rule__XMemberFeatureCall__Group_1_1_1__2 : rule__XMemberFeatureCall__Group_1_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1_1__3 ;
     public final void rule__XMemberFeatureCall__Group_1_1_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8994:1: ( rule__XMemberFeatureCall__Group_1_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1_1__3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8995:2: rule__XMemberFeatureCall__Group_1_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1_1__3
+            // InternalCheckCfg.g:8994:1: ( rule__XMemberFeatureCall__Group_1_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1_1__3 )
+            // InternalCheckCfg.g:8995:2: rule__XMemberFeatureCall__Group_1_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1_1__3
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__2__Impl_in_rule__XMemberFeatureCall__Group_1_1_1__218526);
+            pushFollow(FOLLOW_59);
             rule__XMemberFeatureCall__Group_1_1_1__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__3_in_rule__XMemberFeatureCall__Group_1_1_1__218529);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_1__3();
 
             state._fsp--;
@@ -27068,22 +27068,22 @@ public final void rule__XMemberFeatureCall__Group_1_1_1__2() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9002:1: rule__XMemberFeatureCall__Group_1_1_1__2__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* ) ;
+    // InternalCheckCfg.g:9002:1: rule__XMemberFeatureCall__Group_1_1_1__2__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9006:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9007:1: ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* )
+            // InternalCheckCfg.g:9006:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* ) )
+            // InternalCheckCfg.g:9007:1: ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9007:1: ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9008:1: ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )*
+            // InternalCheckCfg.g:9007:1: ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* )
+            // InternalCheckCfg.g:9008:1: ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9009:1: ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )*
+            // InternalCheckCfg.g:9009:1: ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )*
             loop72:
             do {
                 int alt72=2;
@@ -27096,9 +27096,9 @@ public final void rule__XMemberFeatureCall__Group_1_1_1__2__Impl() throws Recogn
 
                 switch (alt72) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9009:2: rule__XMemberFeatureCall__Group_1_1_1_2__0
+            	    // InternalCheckCfg.g:9009:2: rule__XMemberFeatureCall__Group_1_1_1_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1_2__0_in_rule__XMemberFeatureCall__Group_1_1_1__2__Impl18556);
+            	    pushFollow(FOLLOW_18);
             	    rule__XMemberFeatureCall__Group_1_1_1_2__0();
 
             	    state._fsp--;
@@ -27137,16 +27137,16 @@ public final void rule__XMemberFeatureCall__Group_1_1_1__2__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9019:1: rule__XMemberFeatureCall__Group_1_1_1__3 : rule__XMemberFeatureCall__Group_1_1_1__3__Impl ;
+    // InternalCheckCfg.g:9019:1: rule__XMemberFeatureCall__Group_1_1_1__3 : rule__XMemberFeatureCall__Group_1_1_1__3__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_1_1__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9023:1: ( rule__XMemberFeatureCall__Group_1_1_1__3__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9024:2: rule__XMemberFeatureCall__Group_1_1_1__3__Impl
+            // InternalCheckCfg.g:9023:1: ( rule__XMemberFeatureCall__Group_1_1_1__3__Impl )
+            // InternalCheckCfg.g:9024:2: rule__XMemberFeatureCall__Group_1_1_1__3__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__3__Impl_in_rule__XMemberFeatureCall__Group_1_1_1__318587);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_1__3__Impl();
 
             state._fsp--;
@@ -27170,22 +27170,22 @@ public final void rule__XMemberFeatureCall__Group_1_1_1__3() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__3__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9030:1: rule__XMemberFeatureCall__Group_1_1_1__3__Impl : ( '>' ) ;
+    // InternalCheckCfg.g:9030:1: rule__XMemberFeatureCall__Group_1_1_1__3__Impl : ( '>' ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_1__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9034:1: ( ( '>' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9035:1: ( '>' )
+            // InternalCheckCfg.g:9034:1: ( ( '>' ) )
+            // InternalCheckCfg.g:9035:1: ( '>' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9035:1: ( '>' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9036:1: '>'
+            // InternalCheckCfg.g:9035:1: ( '>' )
+            // InternalCheckCfg.g:9036:1: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGreaterThanSignKeyword_1_1_1_3()); 
             }
-            match(input,26,FOLLOW_26_in_rule__XMemberFeatureCall__Group_1_1_1__3__Impl18615); if (state.failed) return ;
+            match(input,26,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getGreaterThanSignKeyword_1_1_1_3()); 
             }
@@ -27211,21 +27211,21 @@ public final void rule__XMemberFeatureCall__Group_1_1_1__3__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1_2__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9057:1: rule__XMemberFeatureCall__Group_1_1_1_2__0 : rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl rule__XMemberFeatureCall__Group_1_1_1_2__1 ;
+    // InternalCheckCfg.g:9057:1: rule__XMemberFeatureCall__Group_1_1_1_2__0 : rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl rule__XMemberFeatureCall__Group_1_1_1_2__1 ;
     public final void rule__XMemberFeatureCall__Group_1_1_1_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9061:1: ( rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl rule__XMemberFeatureCall__Group_1_1_1_2__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9062:2: rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl rule__XMemberFeatureCall__Group_1_1_1_2__1
+            // InternalCheckCfg.g:9061:1: ( rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl rule__XMemberFeatureCall__Group_1_1_1_2__1 )
+            // InternalCheckCfg.g:9062:2: rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl rule__XMemberFeatureCall__Group_1_1_1_2__1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_1_2__018654);
+            pushFollow(FOLLOW_58);
             rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1_2__1_in_rule__XMemberFeatureCall__Group_1_1_1_2__018657);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_1_2__1();
 
             state._fsp--;
@@ -27249,22 +27249,22 @@ public final void rule__XMemberFeatureCall__Group_1_1_1_2__0() throws Recognitio
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9069:1: rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl : ( ',' ) ;
+    // InternalCheckCfg.g:9069:1: rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl : ( ',' ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9073:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9074:1: ( ',' )
+            // InternalCheckCfg.g:9073:1: ( ( ',' ) )
+            // InternalCheckCfg.g:9074:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9074:1: ( ',' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9075:1: ','
+            // InternalCheckCfg.g:9074:1: ( ',' )
+            // InternalCheckCfg.g:9075:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getCommaKeyword_1_1_1_2_0()); 
             }
-            match(input,64,FOLLOW_64_in_rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl18685); if (state.failed) return ;
+            match(input,64,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getCommaKeyword_1_1_1_2_0()); 
             }
@@ -27290,16 +27290,16 @@ public final void rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl() throws Reco
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1_2__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9088:1: rule__XMemberFeatureCall__Group_1_1_1_2__1 : rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl ;
+    // InternalCheckCfg.g:9088:1: rule__XMemberFeatureCall__Group_1_1_1_2__1 : rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_1_1_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9092:1: ( rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9093:2: rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl
+            // InternalCheckCfg.g:9092:1: ( rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl )
+            // InternalCheckCfg.g:9093:2: rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_1_2__118716);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl();
 
             state._fsp--;
@@ -27323,25 +27323,25 @@ public final void rule__XMemberFeatureCall__Group_1_1_1_2__1() throws Recognitio
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9099:1: rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl : ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) ) ;
+    // InternalCheckCfg.g:9099:1: rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl : ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9103:1: ( ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9104:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) )
+            // InternalCheckCfg.g:9103:1: ( ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) ) )
+            // InternalCheckCfg.g:9104:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9104:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9105:1: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 )
+            // InternalCheckCfg.g:9104:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) )
+            // InternalCheckCfg.g:9105:1: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getTypeArgumentsAssignment_1_1_1_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9106:1: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9106:2: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1
+            // InternalCheckCfg.g:9106:1: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 )
+            // InternalCheckCfg.g:9106:2: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1_in_rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl18743);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1();
 
             state._fsp--;
@@ -27374,21 +27374,21 @@ public final void rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl() throws Reco
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9120:1: rule__XMemberFeatureCall__Group_1_1_3__0 : rule__XMemberFeatureCall__Group_1_1_3__0__Impl rule__XMemberFeatureCall__Group_1_1_3__1 ;
+    // InternalCheckCfg.g:9120:1: rule__XMemberFeatureCall__Group_1_1_3__0 : rule__XMemberFeatureCall__Group_1_1_3__0__Impl rule__XMemberFeatureCall__Group_1_1_3__1 ;
     public final void rule__XMemberFeatureCall__Group_1_1_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9124:1: ( rule__XMemberFeatureCall__Group_1_1_3__0__Impl rule__XMemberFeatureCall__Group_1_1_3__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9125:2: rule__XMemberFeatureCall__Group_1_1_3__0__Impl rule__XMemberFeatureCall__Group_1_1_3__1
+            // InternalCheckCfg.g:9124:1: ( rule__XMemberFeatureCall__Group_1_1_3__0__Impl rule__XMemberFeatureCall__Group_1_1_3__1 )
+            // InternalCheckCfg.g:9125:2: rule__XMemberFeatureCall__Group_1_1_3__0__Impl rule__XMemberFeatureCall__Group_1_1_3__1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_3__018777);
+            pushFollow(FOLLOW_60);
             rule__XMemberFeatureCall__Group_1_1_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__1_in_rule__XMemberFeatureCall__Group_1_1_3__018780);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_3__1();
 
             state._fsp--;
@@ -27412,25 +27412,25 @@ public final void rule__XMemberFeatureCall__Group_1_1_3__0() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9132:1: rule__XMemberFeatureCall__Group_1_1_3__0__Impl : ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) ) ;
+    // InternalCheckCfg.g:9132:1: rule__XMemberFeatureCall__Group_1_1_3__0__Impl : ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9136:1: ( ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9137:1: ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) )
+            // InternalCheckCfg.g:9136:1: ( ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) ) )
+            // InternalCheckCfg.g:9137:1: ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9137:1: ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9138:1: ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 )
+            // InternalCheckCfg.g:9137:1: ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) )
+            // InternalCheckCfg.g:9138:1: ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getExplicitOperationCallAssignment_1_1_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9139:1: ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9139:2: rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0
+            // InternalCheckCfg.g:9139:1: ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 )
+            // InternalCheckCfg.g:9139:2: rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0_in_rule__XMemberFeatureCall__Group_1_1_3__0__Impl18807);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0();
 
             state._fsp--;
@@ -27463,21 +27463,21 @@ public final void rule__XMemberFeatureCall__Group_1_1_3__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9149:1: rule__XMemberFeatureCall__Group_1_1_3__1 : rule__XMemberFeatureCall__Group_1_1_3__1__Impl rule__XMemberFeatureCall__Group_1_1_3__2 ;
+    // InternalCheckCfg.g:9149:1: rule__XMemberFeatureCall__Group_1_1_3__1 : rule__XMemberFeatureCall__Group_1_1_3__1__Impl rule__XMemberFeatureCall__Group_1_1_3__2 ;
     public final void rule__XMemberFeatureCall__Group_1_1_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9153:1: ( rule__XMemberFeatureCall__Group_1_1_3__1__Impl rule__XMemberFeatureCall__Group_1_1_3__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9154:2: rule__XMemberFeatureCall__Group_1_1_3__1__Impl rule__XMemberFeatureCall__Group_1_1_3__2
+            // InternalCheckCfg.g:9153:1: ( rule__XMemberFeatureCall__Group_1_1_3__1__Impl rule__XMemberFeatureCall__Group_1_1_3__2 )
+            // InternalCheckCfg.g:9154:2: rule__XMemberFeatureCall__Group_1_1_3__1__Impl rule__XMemberFeatureCall__Group_1_1_3__2
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_3__118837);
+            pushFollow(FOLLOW_60);
             rule__XMemberFeatureCall__Group_1_1_3__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__2_in_rule__XMemberFeatureCall__Group_1_1_3__118840);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_3__2();
 
             state._fsp--;
@@ -27501,22 +27501,22 @@ public final void rule__XMemberFeatureCall__Group_1_1_3__1() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9161:1: rule__XMemberFeatureCall__Group_1_1_3__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? ) ;
+    // InternalCheckCfg.g:9161:1: rule__XMemberFeatureCall__Group_1_1_3__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9165:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9166:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? )
+            // InternalCheckCfg.g:9165:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? ) )
+            // InternalCheckCfg.g:9166:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9166:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9167:1: ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )?
+            // InternalCheckCfg.g:9166:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? )
+            // InternalCheckCfg.g:9167:1: ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getAlternatives_1_1_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9168:1: ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )?
+            // InternalCheckCfg.g:9168:1: ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )?
             int alt73=2;
             int LA73_0 = input.LA(1);
 
@@ -27525,9 +27525,9 @@ public final void rule__XMemberFeatureCall__Group_1_1_3__1__Impl() throws Recogn
             }
             switch (alt73) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9168:2: rule__XMemberFeatureCall__Alternatives_1_1_3_1
+                    // InternalCheckCfg.g:9168:2: rule__XMemberFeatureCall__Alternatives_1_1_3_1
                     {
-                    pushFollow(FOLLOW_rule__XMemberFeatureCall__Alternatives_1_1_3_1_in_rule__XMemberFeatureCall__Group_1_1_3__1__Impl18867);
+                    pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__Alternatives_1_1_3_1();
 
                     state._fsp--;
@@ -27563,16 +27563,16 @@ public final void rule__XMemberFeatureCall__Group_1_1_3__1__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9178:1: rule__XMemberFeatureCall__Group_1_1_3__2 : rule__XMemberFeatureCall__Group_1_1_3__2__Impl ;
+    // InternalCheckCfg.g:9178:1: rule__XMemberFeatureCall__Group_1_1_3__2 : rule__XMemberFeatureCall__Group_1_1_3__2__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_1_3__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9182:1: ( rule__XMemberFeatureCall__Group_1_1_3__2__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9183:2: rule__XMemberFeatureCall__Group_1_1_3__2__Impl
+            // InternalCheckCfg.g:9182:1: ( rule__XMemberFeatureCall__Group_1_1_3__2__Impl )
+            // InternalCheckCfg.g:9183:2: rule__XMemberFeatureCall__Group_1_1_3__2__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__2__Impl_in_rule__XMemberFeatureCall__Group_1_1_3__218898);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_3__2__Impl();
 
             state._fsp--;
@@ -27596,22 +27596,22 @@ public final void rule__XMemberFeatureCall__Group_1_1_3__2() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9189:1: rule__XMemberFeatureCall__Group_1_1_3__2__Impl : ( ')' ) ;
+    // InternalCheckCfg.g:9189:1: rule__XMemberFeatureCall__Group_1_1_3__2__Impl : ( ')' ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_3__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9193:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9194:1: ( ')' )
+            // InternalCheckCfg.g:9193:1: ( ( ')' ) )
+            // InternalCheckCfg.g:9194:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9194:1: ( ')' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9195:1: ')'
+            // InternalCheckCfg.g:9194:1: ( ')' )
+            // InternalCheckCfg.g:9195:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getRightParenthesisKeyword_1_1_3_2()); 
             }
-            match(input,63,FOLLOW_63_in_rule__XMemberFeatureCall__Group_1_1_3__2__Impl18926); if (state.failed) return ;
+            match(input,63,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getRightParenthesisKeyword_1_1_3_2()); 
             }
@@ -27637,21 +27637,21 @@ public final void rule__XMemberFeatureCall__Group_1_1_3__2__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9214:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__0 : rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1__1 ;
+    // InternalCheckCfg.g:9214:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__0 : rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1__1 ;
     public final void rule__XMemberFeatureCall__Group_1_1_3_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9218:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9219:2: rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1__1
+            // InternalCheckCfg.g:9218:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1__1 )
+            // InternalCheckCfg.g:9219:2: rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1__1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__018963);
+            pushFollow(FOLLOW_25);
             rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1__1_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__018966);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_3_1_1__1();
 
             state._fsp--;
@@ -27675,25 +27675,25 @@ public final void rule__XMemberFeatureCall__Group_1_1_3_1_1__0() throws Recognit
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9226:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl : ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) ) ;
+    // InternalCheckCfg.g:9226:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl : ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9230:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9231:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) )
+            // InternalCheckCfg.g:9230:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) ) )
+            // InternalCheckCfg.g:9231:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9231:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9232:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 )
+            // InternalCheckCfg.g:9231:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) )
+            // InternalCheckCfg.g:9232:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsAssignment_1_1_3_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9233:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9233:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0
+            // InternalCheckCfg.g:9233:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 )
+            // InternalCheckCfg.g:9233:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl18993);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0();
 
             state._fsp--;
@@ -27726,16 +27726,16 @@ public final void rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl() throws Re
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9243:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__1 : rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl ;
+    // InternalCheckCfg.g:9243:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__1 : rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_1_3_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9247:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9248:2: rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl
+            // InternalCheckCfg.g:9247:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl )
+            // InternalCheckCfg.g:9248:2: rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__119023);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl();
 
             state._fsp--;
@@ -27759,22 +27759,22 @@ public final void rule__XMemberFeatureCall__Group_1_1_3_1_1__1() throws Recognit
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9254:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* ) ;
+    // InternalCheckCfg.g:9254:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9258:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9259:1: ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* )
+            // InternalCheckCfg.g:9258:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* ) )
+            // InternalCheckCfg.g:9259:1: ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9259:1: ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9260:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )*
+            // InternalCheckCfg.g:9259:1: ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* )
+            // InternalCheckCfg.g:9260:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1_3_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9261:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )*
+            // InternalCheckCfg.g:9261:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )*
             loop74:
             do {
                 int alt74=2;
@@ -27787,9 +27787,9 @@ public final void rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl() throws Re
 
                 switch (alt74) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9261:2: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0
+            	    // InternalCheckCfg.g:9261:2: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl19050);
+            	    pushFollow(FOLLOW_18);
             	    rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0();
 
             	    state._fsp--;
@@ -27828,21 +27828,21 @@ public final void rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl() throws Re
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9275:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 : rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1 ;
+    // InternalCheckCfg.g:9275:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 : rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1 ;
     public final void rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9279:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9280:2: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1
+            // InternalCheckCfg.g:9279:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1 )
+            // InternalCheckCfg.g:9280:2: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__019085);
+            pushFollow(FOLLOW_61);
             rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__019088);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1();
 
             state._fsp--;
@@ -27866,22 +27866,22 @@ public final void rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9287:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl : ( ',' ) ;
+    // InternalCheckCfg.g:9287:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl : ( ',' ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9291:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9292:1: ( ',' )
+            // InternalCheckCfg.g:9291:1: ( ( ',' ) )
+            // InternalCheckCfg.g:9292:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9292:1: ( ',' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9293:1: ','
+            // InternalCheckCfg.g:9292:1: ( ',' )
+            // InternalCheckCfg.g:9293:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getCommaKeyword_1_1_3_1_1_1_0()); 
             }
-            match(input,64,FOLLOW_64_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl19116); if (state.failed) return ;
+            match(input,64,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getCommaKeyword_1_1_3_1_1_1_0()); 
             }
@@ -27907,16 +27907,16 @@ public final void rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl() throws
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9306:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1 : rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl ;
+    // InternalCheckCfg.g:9306:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1 : rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9310:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9311:2: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl
+            // InternalCheckCfg.g:9310:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl )
+            // InternalCheckCfg.g:9311:2: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__119147);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl();
 
             state._fsp--;
@@ -27940,25 +27940,25 @@ public final void rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9317:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl : ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) ) ;
+    // InternalCheckCfg.g:9317:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl : ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9321:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9322:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) )
+            // InternalCheckCfg.g:9321:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) ) )
+            // InternalCheckCfg.g:9322:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9322:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9323:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 )
+            // InternalCheckCfg.g:9322:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) )
+            // InternalCheckCfg.g:9323:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsAssignment_1_1_3_1_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9324:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9324:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1
+            // InternalCheckCfg.g:9324:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 )
+            // InternalCheckCfg.g:9324:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl19174);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1();
 
             state._fsp--;
@@ -27991,21 +27991,21 @@ public final void rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl() throws
 
 
     // $ANTLR start "rule__XSetLiteral__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9338:1: rule__XSetLiteral__Group__0 : rule__XSetLiteral__Group__0__Impl rule__XSetLiteral__Group__1 ;
+    // InternalCheckCfg.g:9338:1: rule__XSetLiteral__Group__0 : rule__XSetLiteral__Group__0__Impl rule__XSetLiteral__Group__1 ;
     public final void rule__XSetLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9342:1: ( rule__XSetLiteral__Group__0__Impl rule__XSetLiteral__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9343:2: rule__XSetLiteral__Group__0__Impl rule__XSetLiteral__Group__1
+            // InternalCheckCfg.g:9342:1: ( rule__XSetLiteral__Group__0__Impl rule__XSetLiteral__Group__1 )
+            // InternalCheckCfg.g:9343:2: rule__XSetLiteral__Group__0__Impl rule__XSetLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__Group__0__Impl_in_rule__XSetLiteral__Group__019208);
+            pushFollow(FOLLOW_62);
             rule__XSetLiteral__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSetLiteral__Group__1_in_rule__XSetLiteral__Group__019211);
+            pushFollow(FOLLOW_2);
             rule__XSetLiteral__Group__1();
 
             state._fsp--;
@@ -28029,23 +28029,23 @@ public final void rule__XSetLiteral__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XSetLiteral__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9350:1: rule__XSetLiteral__Group__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:9350:1: rule__XSetLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XSetLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9354:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9355:1: ( () )
+            // InternalCheckCfg.g:9354:1: ( ( () ) )
+            // InternalCheckCfg.g:9355:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9355:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9356:1: ()
+            // InternalCheckCfg.g:9355:1: ( () )
+            // InternalCheckCfg.g:9356:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getXSetLiteralAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9357:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9359:1: 
+            // InternalCheckCfg.g:9357:1: ()
+            // InternalCheckCfg.g:9359:1: 
             {
             }
 
@@ -28070,21 +28070,21 @@ public final void rule__XSetLiteral__Group__0__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSetLiteral__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9369:1: rule__XSetLiteral__Group__1 : rule__XSetLiteral__Group__1__Impl rule__XSetLiteral__Group__2 ;
+    // InternalCheckCfg.g:9369:1: rule__XSetLiteral__Group__1 : rule__XSetLiteral__Group__1__Impl rule__XSetLiteral__Group__2 ;
     public final void rule__XSetLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9373:1: ( rule__XSetLiteral__Group__1__Impl rule__XSetLiteral__Group__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9374:2: rule__XSetLiteral__Group__1__Impl rule__XSetLiteral__Group__2
+            // InternalCheckCfg.g:9373:1: ( rule__XSetLiteral__Group__1__Impl rule__XSetLiteral__Group__2 )
+            // InternalCheckCfg.g:9374:2: rule__XSetLiteral__Group__1__Impl rule__XSetLiteral__Group__2
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__Group__1__Impl_in_rule__XSetLiteral__Group__119269);
+            pushFollow(FOLLOW_10);
             rule__XSetLiteral__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSetLiteral__Group__2_in_rule__XSetLiteral__Group__119272);
+            pushFollow(FOLLOW_2);
             rule__XSetLiteral__Group__2();
 
             state._fsp--;
@@ -28108,22 +28108,22 @@ public final void rule__XSetLiteral__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XSetLiteral__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9381:1: rule__XSetLiteral__Group__1__Impl : ( '#' ) ;
+    // InternalCheckCfg.g:9381:1: rule__XSetLiteral__Group__1__Impl : ( '#' ) ;
     public final void rule__XSetLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9385:1: ( ( '#' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9386:1: ( '#' )
+            // InternalCheckCfg.g:9385:1: ( ( '#' ) )
+            // InternalCheckCfg.g:9386:1: ( '#' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9386:1: ( '#' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9387:1: '#'
+            // InternalCheckCfg.g:9386:1: ( '#' )
+            // InternalCheckCfg.g:9387:1: '#'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getNumberSignKeyword_1()); 
             }
-            match(input,65,FOLLOW_65_in_rule__XSetLiteral__Group__1__Impl19300); if (state.failed) return ;
+            match(input,65,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSetLiteralAccess().getNumberSignKeyword_1()); 
             }
@@ -28149,21 +28149,21 @@ public final void rule__XSetLiteral__Group__1__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSetLiteral__Group__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9400:1: rule__XSetLiteral__Group__2 : rule__XSetLiteral__Group__2__Impl rule__XSetLiteral__Group__3 ;
+    // InternalCheckCfg.g:9400:1: rule__XSetLiteral__Group__2 : rule__XSetLiteral__Group__2__Impl rule__XSetLiteral__Group__3 ;
     public final void rule__XSetLiteral__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9404:1: ( rule__XSetLiteral__Group__2__Impl rule__XSetLiteral__Group__3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9405:2: rule__XSetLiteral__Group__2__Impl rule__XSetLiteral__Group__3
+            // InternalCheckCfg.g:9404:1: ( rule__XSetLiteral__Group__2__Impl rule__XSetLiteral__Group__3 )
+            // InternalCheckCfg.g:9405:2: rule__XSetLiteral__Group__2__Impl rule__XSetLiteral__Group__3
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__Group__2__Impl_in_rule__XSetLiteral__Group__219331);
+            pushFollow(FOLLOW_63);
             rule__XSetLiteral__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSetLiteral__Group__3_in_rule__XSetLiteral__Group__219334);
+            pushFollow(FOLLOW_2);
             rule__XSetLiteral__Group__3();
 
             state._fsp--;
@@ -28187,22 +28187,22 @@ public final void rule__XSetLiteral__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XSetLiteral__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9412:1: rule__XSetLiteral__Group__2__Impl : ( '{' ) ;
+    // InternalCheckCfg.g:9412:1: rule__XSetLiteral__Group__2__Impl : ( '{' ) ;
     public final void rule__XSetLiteral__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9416:1: ( ( '{' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9417:1: ( '{' )
+            // InternalCheckCfg.g:9416:1: ( ( '{' ) )
+            // InternalCheckCfg.g:9417:1: ( '{' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9417:1: ( '{' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9418:1: '{'
+            // InternalCheckCfg.g:9417:1: ( '{' )
+            // InternalCheckCfg.g:9418:1: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getLeftCurlyBracketKeyword_2()); 
             }
-            match(input,58,FOLLOW_58_in_rule__XSetLiteral__Group__2__Impl19362); if (state.failed) return ;
+            match(input,58,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSetLiteralAccess().getLeftCurlyBracketKeyword_2()); 
             }
@@ -28228,21 +28228,21 @@ public final void rule__XSetLiteral__Group__2__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSetLiteral__Group__3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9431:1: rule__XSetLiteral__Group__3 : rule__XSetLiteral__Group__3__Impl rule__XSetLiteral__Group__4 ;
+    // InternalCheckCfg.g:9431:1: rule__XSetLiteral__Group__3 : rule__XSetLiteral__Group__3__Impl rule__XSetLiteral__Group__4 ;
     public final void rule__XSetLiteral__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9435:1: ( rule__XSetLiteral__Group__3__Impl rule__XSetLiteral__Group__4 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9436:2: rule__XSetLiteral__Group__3__Impl rule__XSetLiteral__Group__4
+            // InternalCheckCfg.g:9435:1: ( rule__XSetLiteral__Group__3__Impl rule__XSetLiteral__Group__4 )
+            // InternalCheckCfg.g:9436:2: rule__XSetLiteral__Group__3__Impl rule__XSetLiteral__Group__4
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__Group__3__Impl_in_rule__XSetLiteral__Group__319393);
+            pushFollow(FOLLOW_63);
             rule__XSetLiteral__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSetLiteral__Group__4_in_rule__XSetLiteral__Group__319396);
+            pushFollow(FOLLOW_2);
             rule__XSetLiteral__Group__4();
 
             state._fsp--;
@@ -28266,22 +28266,22 @@ public final void rule__XSetLiteral__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XSetLiteral__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9443:1: rule__XSetLiteral__Group__3__Impl : ( ( rule__XSetLiteral__Group_3__0 )? ) ;
+    // InternalCheckCfg.g:9443:1: rule__XSetLiteral__Group__3__Impl : ( ( rule__XSetLiteral__Group_3__0 )? ) ;
     public final void rule__XSetLiteral__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9447:1: ( ( ( rule__XSetLiteral__Group_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9448:1: ( ( rule__XSetLiteral__Group_3__0 )? )
+            // InternalCheckCfg.g:9447:1: ( ( ( rule__XSetLiteral__Group_3__0 )? ) )
+            // InternalCheckCfg.g:9448:1: ( ( rule__XSetLiteral__Group_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9448:1: ( ( rule__XSetLiteral__Group_3__0 )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9449:1: ( rule__XSetLiteral__Group_3__0 )?
+            // InternalCheckCfg.g:9448:1: ( ( rule__XSetLiteral__Group_3__0 )? )
+            // InternalCheckCfg.g:9449:1: ( rule__XSetLiteral__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getGroup_3()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9450:1: ( rule__XSetLiteral__Group_3__0 )?
+            // InternalCheckCfg.g:9450:1: ( rule__XSetLiteral__Group_3__0 )?
             int alt75=2;
             int LA75_0 = input.LA(1);
 
@@ -28290,9 +28290,9 @@ public final void rule__XSetLiteral__Group__3__Impl() throws RecognitionExceptio
             }
             switch (alt75) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9450:2: rule__XSetLiteral__Group_3__0
+                    // InternalCheckCfg.g:9450:2: rule__XSetLiteral__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__XSetLiteral__Group_3__0_in_rule__XSetLiteral__Group__3__Impl19423);
+                    pushFollow(FOLLOW_2);
                     rule__XSetLiteral__Group_3__0();
 
                     state._fsp--;
@@ -28328,16 +28328,16 @@ public final void rule__XSetLiteral__Group__3__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSetLiteral__Group__4"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9460:1: rule__XSetLiteral__Group__4 : rule__XSetLiteral__Group__4__Impl ;
+    // InternalCheckCfg.g:9460:1: rule__XSetLiteral__Group__4 : rule__XSetLiteral__Group__4__Impl ;
     public final void rule__XSetLiteral__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9464:1: ( rule__XSetLiteral__Group__4__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9465:2: rule__XSetLiteral__Group__4__Impl
+            // InternalCheckCfg.g:9464:1: ( rule__XSetLiteral__Group__4__Impl )
+            // InternalCheckCfg.g:9465:2: rule__XSetLiteral__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__Group__4__Impl_in_rule__XSetLiteral__Group__419454);
+            pushFollow(FOLLOW_2);
             rule__XSetLiteral__Group__4__Impl();
 
             state._fsp--;
@@ -28361,22 +28361,22 @@ public final void rule__XSetLiteral__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__XSetLiteral__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9471:1: rule__XSetLiteral__Group__4__Impl : ( '}' ) ;
+    // InternalCheckCfg.g:9471:1: rule__XSetLiteral__Group__4__Impl : ( '}' ) ;
     public final void rule__XSetLiteral__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9475:1: ( ( '}' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9476:1: ( '}' )
+            // InternalCheckCfg.g:9475:1: ( ( '}' ) )
+            // InternalCheckCfg.g:9476:1: ( '}' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9476:1: ( '}' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9477:1: '}'
+            // InternalCheckCfg.g:9476:1: ( '}' )
+            // InternalCheckCfg.g:9477:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getRightCurlyBracketKeyword_4()); 
             }
-            match(input,59,FOLLOW_59_in_rule__XSetLiteral__Group__4__Impl19482); if (state.failed) return ;
+            match(input,59,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSetLiteralAccess().getRightCurlyBracketKeyword_4()); 
             }
@@ -28402,21 +28402,21 @@ public final void rule__XSetLiteral__Group__4__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9500:1: rule__XSetLiteral__Group_3__0 : rule__XSetLiteral__Group_3__0__Impl rule__XSetLiteral__Group_3__1 ;
+    // InternalCheckCfg.g:9500:1: rule__XSetLiteral__Group_3__0 : rule__XSetLiteral__Group_3__0__Impl rule__XSetLiteral__Group_3__1 ;
     public final void rule__XSetLiteral__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9504:1: ( rule__XSetLiteral__Group_3__0__Impl rule__XSetLiteral__Group_3__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9505:2: rule__XSetLiteral__Group_3__0__Impl rule__XSetLiteral__Group_3__1
+            // InternalCheckCfg.g:9504:1: ( rule__XSetLiteral__Group_3__0__Impl rule__XSetLiteral__Group_3__1 )
+            // InternalCheckCfg.g:9505:2: rule__XSetLiteral__Group_3__0__Impl rule__XSetLiteral__Group_3__1
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__Group_3__0__Impl_in_rule__XSetLiteral__Group_3__019523);
+            pushFollow(FOLLOW_25);
             rule__XSetLiteral__Group_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSetLiteral__Group_3__1_in_rule__XSetLiteral__Group_3__019526);
+            pushFollow(FOLLOW_2);
             rule__XSetLiteral__Group_3__1();
 
             state._fsp--;
@@ -28440,25 +28440,25 @@ public final void rule__XSetLiteral__Group_3__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9512:1: rule__XSetLiteral__Group_3__0__Impl : ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) ) ;
+    // InternalCheckCfg.g:9512:1: rule__XSetLiteral__Group_3__0__Impl : ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) ) ;
     public final void rule__XSetLiteral__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9516:1: ( ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9517:1: ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) )
+            // InternalCheckCfg.g:9516:1: ( ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) ) )
+            // InternalCheckCfg.g:9517:1: ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9517:1: ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9518:1: ( rule__XSetLiteral__ElementsAssignment_3_0 )
+            // InternalCheckCfg.g:9517:1: ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) )
+            // InternalCheckCfg.g:9518:1: ( rule__XSetLiteral__ElementsAssignment_3_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getElementsAssignment_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9519:1: ( rule__XSetLiteral__ElementsAssignment_3_0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9519:2: rule__XSetLiteral__ElementsAssignment_3_0
+            // InternalCheckCfg.g:9519:1: ( rule__XSetLiteral__ElementsAssignment_3_0 )
+            // InternalCheckCfg.g:9519:2: rule__XSetLiteral__ElementsAssignment_3_0
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__ElementsAssignment_3_0_in_rule__XSetLiteral__Group_3__0__Impl19553);
+            pushFollow(FOLLOW_2);
             rule__XSetLiteral__ElementsAssignment_3_0();
 
             state._fsp--;
@@ -28491,16 +28491,16 @@ public final void rule__XSetLiteral__Group_3__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9529:1: rule__XSetLiteral__Group_3__1 : rule__XSetLiteral__Group_3__1__Impl ;
+    // InternalCheckCfg.g:9529:1: rule__XSetLiteral__Group_3__1 : rule__XSetLiteral__Group_3__1__Impl ;
     public final void rule__XSetLiteral__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9533:1: ( rule__XSetLiteral__Group_3__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9534:2: rule__XSetLiteral__Group_3__1__Impl
+            // InternalCheckCfg.g:9533:1: ( rule__XSetLiteral__Group_3__1__Impl )
+            // InternalCheckCfg.g:9534:2: rule__XSetLiteral__Group_3__1__Impl
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__Group_3__1__Impl_in_rule__XSetLiteral__Group_3__119583);
+            pushFollow(FOLLOW_2);
             rule__XSetLiteral__Group_3__1__Impl();
 
             state._fsp--;
@@ -28524,22 +28524,22 @@ public final void rule__XSetLiteral__Group_3__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9540:1: rule__XSetLiteral__Group_3__1__Impl : ( ( rule__XSetLiteral__Group_3_1__0 )* ) ;
+    // InternalCheckCfg.g:9540:1: rule__XSetLiteral__Group_3__1__Impl : ( ( rule__XSetLiteral__Group_3_1__0 )* ) ;
     public final void rule__XSetLiteral__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9544:1: ( ( ( rule__XSetLiteral__Group_3_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9545:1: ( ( rule__XSetLiteral__Group_3_1__0 )* )
+            // InternalCheckCfg.g:9544:1: ( ( ( rule__XSetLiteral__Group_3_1__0 )* ) )
+            // InternalCheckCfg.g:9545:1: ( ( rule__XSetLiteral__Group_3_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9545:1: ( ( rule__XSetLiteral__Group_3_1__0 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9546:1: ( rule__XSetLiteral__Group_3_1__0 )*
+            // InternalCheckCfg.g:9545:1: ( ( rule__XSetLiteral__Group_3_1__0 )* )
+            // InternalCheckCfg.g:9546:1: ( rule__XSetLiteral__Group_3_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getGroup_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9547:1: ( rule__XSetLiteral__Group_3_1__0 )*
+            // InternalCheckCfg.g:9547:1: ( rule__XSetLiteral__Group_3_1__0 )*
             loop76:
             do {
                 int alt76=2;
@@ -28552,9 +28552,9 @@ public final void rule__XSetLiteral__Group_3__1__Impl() throws RecognitionExcept
 
                 switch (alt76) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9547:2: rule__XSetLiteral__Group_3_1__0
+            	    // InternalCheckCfg.g:9547:2: rule__XSetLiteral__Group_3_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XSetLiteral__Group_3_1__0_in_rule__XSetLiteral__Group_3__1__Impl19610);
+            	    pushFollow(FOLLOW_18);
             	    rule__XSetLiteral__Group_3_1__0();
 
             	    state._fsp--;
@@ -28593,21 +28593,21 @@ public final void rule__XSetLiteral__Group_3__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3_1__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9561:1: rule__XSetLiteral__Group_3_1__0 : rule__XSetLiteral__Group_3_1__0__Impl rule__XSetLiteral__Group_3_1__1 ;
+    // InternalCheckCfg.g:9561:1: rule__XSetLiteral__Group_3_1__0 : rule__XSetLiteral__Group_3_1__0__Impl rule__XSetLiteral__Group_3_1__1 ;
     public final void rule__XSetLiteral__Group_3_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9565:1: ( rule__XSetLiteral__Group_3_1__0__Impl rule__XSetLiteral__Group_3_1__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9566:2: rule__XSetLiteral__Group_3_1__0__Impl rule__XSetLiteral__Group_3_1__1
+            // InternalCheckCfg.g:9565:1: ( rule__XSetLiteral__Group_3_1__0__Impl rule__XSetLiteral__Group_3_1__1 )
+            // InternalCheckCfg.g:9566:2: rule__XSetLiteral__Group_3_1__0__Impl rule__XSetLiteral__Group_3_1__1
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__Group_3_1__0__Impl_in_rule__XSetLiteral__Group_3_1__019645);
+            pushFollow(FOLLOW_61);
             rule__XSetLiteral__Group_3_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSetLiteral__Group_3_1__1_in_rule__XSetLiteral__Group_3_1__019648);
+            pushFollow(FOLLOW_2);
             rule__XSetLiteral__Group_3_1__1();
 
             state._fsp--;
@@ -28631,22 +28631,22 @@ public final void rule__XSetLiteral__Group_3_1__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3_1__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9573:1: rule__XSetLiteral__Group_3_1__0__Impl : ( ',' ) ;
+    // InternalCheckCfg.g:9573:1: rule__XSetLiteral__Group_3_1__0__Impl : ( ',' ) ;
     public final void rule__XSetLiteral__Group_3_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9577:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9578:1: ( ',' )
+            // InternalCheckCfg.g:9577:1: ( ( ',' ) )
+            // InternalCheckCfg.g:9578:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9578:1: ( ',' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9579:1: ','
+            // InternalCheckCfg.g:9578:1: ( ',' )
+            // InternalCheckCfg.g:9579:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getCommaKeyword_3_1_0()); 
             }
-            match(input,64,FOLLOW_64_in_rule__XSetLiteral__Group_3_1__0__Impl19676); if (state.failed) return ;
+            match(input,64,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSetLiteralAccess().getCommaKeyword_3_1_0()); 
             }
@@ -28672,16 +28672,16 @@ public final void rule__XSetLiteral__Group_3_1__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3_1__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9592:1: rule__XSetLiteral__Group_3_1__1 : rule__XSetLiteral__Group_3_1__1__Impl ;
+    // InternalCheckCfg.g:9592:1: rule__XSetLiteral__Group_3_1__1 : rule__XSetLiteral__Group_3_1__1__Impl ;
     public final void rule__XSetLiteral__Group_3_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9596:1: ( rule__XSetLiteral__Group_3_1__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9597:2: rule__XSetLiteral__Group_3_1__1__Impl
+            // InternalCheckCfg.g:9596:1: ( rule__XSetLiteral__Group_3_1__1__Impl )
+            // InternalCheckCfg.g:9597:2: rule__XSetLiteral__Group_3_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__Group_3_1__1__Impl_in_rule__XSetLiteral__Group_3_1__119707);
+            pushFollow(FOLLOW_2);
             rule__XSetLiteral__Group_3_1__1__Impl();
 
             state._fsp--;
@@ -28705,25 +28705,25 @@ public final void rule__XSetLiteral__Group_3_1__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3_1__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9603:1: rule__XSetLiteral__Group_3_1__1__Impl : ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) ) ;
+    // InternalCheckCfg.g:9603:1: rule__XSetLiteral__Group_3_1__1__Impl : ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) ) ;
     public final void rule__XSetLiteral__Group_3_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9607:1: ( ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9608:1: ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) )
+            // InternalCheckCfg.g:9607:1: ( ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) ) )
+            // InternalCheckCfg.g:9608:1: ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9608:1: ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9609:1: ( rule__XSetLiteral__ElementsAssignment_3_1_1 )
+            // InternalCheckCfg.g:9608:1: ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) )
+            // InternalCheckCfg.g:9609:1: ( rule__XSetLiteral__ElementsAssignment_3_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getElementsAssignment_3_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9610:1: ( rule__XSetLiteral__ElementsAssignment_3_1_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9610:2: rule__XSetLiteral__ElementsAssignment_3_1_1
+            // InternalCheckCfg.g:9610:1: ( rule__XSetLiteral__ElementsAssignment_3_1_1 )
+            // InternalCheckCfg.g:9610:2: rule__XSetLiteral__ElementsAssignment_3_1_1
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__ElementsAssignment_3_1_1_in_rule__XSetLiteral__Group_3_1__1__Impl19734);
+            pushFollow(FOLLOW_2);
             rule__XSetLiteral__ElementsAssignment_3_1_1();
 
             state._fsp--;
@@ -28756,21 +28756,21 @@ public final void rule__XSetLiteral__Group_3_1__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XListLiteral__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9624:1: rule__XListLiteral__Group__0 : rule__XListLiteral__Group__0__Impl rule__XListLiteral__Group__1 ;
+    // InternalCheckCfg.g:9624:1: rule__XListLiteral__Group__0 : rule__XListLiteral__Group__0__Impl rule__XListLiteral__Group__1 ;
     public final void rule__XListLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9628:1: ( rule__XListLiteral__Group__0__Impl rule__XListLiteral__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9629:2: rule__XListLiteral__Group__0__Impl rule__XListLiteral__Group__1
+            // InternalCheckCfg.g:9628:1: ( rule__XListLiteral__Group__0__Impl rule__XListLiteral__Group__1 )
+            // InternalCheckCfg.g:9629:2: rule__XListLiteral__Group__0__Impl rule__XListLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__XListLiteral__Group__0__Impl_in_rule__XListLiteral__Group__019768);
+            pushFollow(FOLLOW_62);
             rule__XListLiteral__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XListLiteral__Group__1_in_rule__XListLiteral__Group__019771);
+            pushFollow(FOLLOW_2);
             rule__XListLiteral__Group__1();
 
             state._fsp--;
@@ -28794,23 +28794,23 @@ public final void rule__XListLiteral__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XListLiteral__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9636:1: rule__XListLiteral__Group__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:9636:1: rule__XListLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XListLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9640:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9641:1: ( () )
+            // InternalCheckCfg.g:9640:1: ( ( () ) )
+            // InternalCheckCfg.g:9641:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9641:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9642:1: ()
+            // InternalCheckCfg.g:9641:1: ( () )
+            // InternalCheckCfg.g:9642:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getXListLiteralAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9643:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9645:1: 
+            // InternalCheckCfg.g:9643:1: ()
+            // InternalCheckCfg.g:9645:1: 
             {
             }
 
@@ -28835,21 +28835,21 @@ public final void rule__XListLiteral__Group__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XListLiteral__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9655:1: rule__XListLiteral__Group__1 : rule__XListLiteral__Group__1__Impl rule__XListLiteral__Group__2 ;
+    // InternalCheckCfg.g:9655:1: rule__XListLiteral__Group__1 : rule__XListLiteral__Group__1__Impl rule__XListLiteral__Group__2 ;
     public final void rule__XListLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9659:1: ( rule__XListLiteral__Group__1__Impl rule__XListLiteral__Group__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9660:2: rule__XListLiteral__Group__1__Impl rule__XListLiteral__Group__2
+            // InternalCheckCfg.g:9659:1: ( rule__XListLiteral__Group__1__Impl rule__XListLiteral__Group__2 )
+            // InternalCheckCfg.g:9660:2: rule__XListLiteral__Group__1__Impl rule__XListLiteral__Group__2
             {
-            pushFollow(FOLLOW_rule__XListLiteral__Group__1__Impl_in_rule__XListLiteral__Group__119829);
+            pushFollow(FOLLOW_23);
             rule__XListLiteral__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XListLiteral__Group__2_in_rule__XListLiteral__Group__119832);
+            pushFollow(FOLLOW_2);
             rule__XListLiteral__Group__2();
 
             state._fsp--;
@@ -28873,22 +28873,22 @@ public final void rule__XListLiteral__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XListLiteral__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9667:1: rule__XListLiteral__Group__1__Impl : ( '#' ) ;
+    // InternalCheckCfg.g:9667:1: rule__XListLiteral__Group__1__Impl : ( '#' ) ;
     public final void rule__XListLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9671:1: ( ( '#' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9672:1: ( '#' )
+            // InternalCheckCfg.g:9671:1: ( ( '#' ) )
+            // InternalCheckCfg.g:9672:1: ( '#' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9672:1: ( '#' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9673:1: '#'
+            // InternalCheckCfg.g:9672:1: ( '#' )
+            // InternalCheckCfg.g:9673:1: '#'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getNumberSignKeyword_1()); 
             }
-            match(input,65,FOLLOW_65_in_rule__XListLiteral__Group__1__Impl19860); if (state.failed) return ;
+            match(input,65,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXListLiteralAccess().getNumberSignKeyword_1()); 
             }
@@ -28914,21 +28914,21 @@ public final void rule__XListLiteral__Group__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XListLiteral__Group__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9686:1: rule__XListLiteral__Group__2 : rule__XListLiteral__Group__2__Impl rule__XListLiteral__Group__3 ;
+    // InternalCheckCfg.g:9686:1: rule__XListLiteral__Group__2 : rule__XListLiteral__Group__2__Impl rule__XListLiteral__Group__3 ;
     public final void rule__XListLiteral__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9690:1: ( rule__XListLiteral__Group__2__Impl rule__XListLiteral__Group__3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9691:2: rule__XListLiteral__Group__2__Impl rule__XListLiteral__Group__3
+            // InternalCheckCfg.g:9690:1: ( rule__XListLiteral__Group__2__Impl rule__XListLiteral__Group__3 )
+            // InternalCheckCfg.g:9691:2: rule__XListLiteral__Group__2__Impl rule__XListLiteral__Group__3
             {
-            pushFollow(FOLLOW_rule__XListLiteral__Group__2__Impl_in_rule__XListLiteral__Group__219891);
+            pushFollow(FOLLOW_64);
             rule__XListLiteral__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XListLiteral__Group__3_in_rule__XListLiteral__Group__219894);
+            pushFollow(FOLLOW_2);
             rule__XListLiteral__Group__3();
 
             state._fsp--;
@@ -28952,22 +28952,22 @@ public final void rule__XListLiteral__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XListLiteral__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9698:1: rule__XListLiteral__Group__2__Impl : ( '[' ) ;
+    // InternalCheckCfg.g:9698:1: rule__XListLiteral__Group__2__Impl : ( '[' ) ;
     public final void rule__XListLiteral__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9702:1: ( ( '[' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9703:1: ( '[' )
+            // InternalCheckCfg.g:9702:1: ( ( '[' ) )
+            // InternalCheckCfg.g:9703:1: ( '[' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9703:1: ( '[' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9704:1: '['
+            // InternalCheckCfg.g:9703:1: ( '[' )
+            // InternalCheckCfg.g:9704:1: '['
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getLeftSquareBracketKeyword_2()); 
             }
-            match(input,66,FOLLOW_66_in_rule__XListLiteral__Group__2__Impl19922); if (state.failed) return ;
+            match(input,66,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXListLiteralAccess().getLeftSquareBracketKeyword_2()); 
             }
@@ -28993,21 +28993,21 @@ public final void rule__XListLiteral__Group__2__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XListLiteral__Group__3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9717:1: rule__XListLiteral__Group__3 : rule__XListLiteral__Group__3__Impl rule__XListLiteral__Group__4 ;
+    // InternalCheckCfg.g:9717:1: rule__XListLiteral__Group__3 : rule__XListLiteral__Group__3__Impl rule__XListLiteral__Group__4 ;
     public final void rule__XListLiteral__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9721:1: ( rule__XListLiteral__Group__3__Impl rule__XListLiteral__Group__4 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9722:2: rule__XListLiteral__Group__3__Impl rule__XListLiteral__Group__4
+            // InternalCheckCfg.g:9721:1: ( rule__XListLiteral__Group__3__Impl rule__XListLiteral__Group__4 )
+            // InternalCheckCfg.g:9722:2: rule__XListLiteral__Group__3__Impl rule__XListLiteral__Group__4
             {
-            pushFollow(FOLLOW_rule__XListLiteral__Group__3__Impl_in_rule__XListLiteral__Group__319953);
+            pushFollow(FOLLOW_64);
             rule__XListLiteral__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XListLiteral__Group__4_in_rule__XListLiteral__Group__319956);
+            pushFollow(FOLLOW_2);
             rule__XListLiteral__Group__4();
 
             state._fsp--;
@@ -29031,22 +29031,22 @@ public final void rule__XListLiteral__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XListLiteral__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9729:1: rule__XListLiteral__Group__3__Impl : ( ( rule__XListLiteral__Group_3__0 )? ) ;
+    // InternalCheckCfg.g:9729:1: rule__XListLiteral__Group__3__Impl : ( ( rule__XListLiteral__Group_3__0 )? ) ;
     public final void rule__XListLiteral__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9733:1: ( ( ( rule__XListLiteral__Group_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9734:1: ( ( rule__XListLiteral__Group_3__0 )? )
+            // InternalCheckCfg.g:9733:1: ( ( ( rule__XListLiteral__Group_3__0 )? ) )
+            // InternalCheckCfg.g:9734:1: ( ( rule__XListLiteral__Group_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9734:1: ( ( rule__XListLiteral__Group_3__0 )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9735:1: ( rule__XListLiteral__Group_3__0 )?
+            // InternalCheckCfg.g:9734:1: ( ( rule__XListLiteral__Group_3__0 )? )
+            // InternalCheckCfg.g:9735:1: ( rule__XListLiteral__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getGroup_3()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9736:1: ( rule__XListLiteral__Group_3__0 )?
+            // InternalCheckCfg.g:9736:1: ( rule__XListLiteral__Group_3__0 )?
             int alt77=2;
             int LA77_0 = input.LA(1);
 
@@ -29055,9 +29055,9 @@ public final void rule__XListLiteral__Group__3__Impl() throws RecognitionExcepti
             }
             switch (alt77) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9736:2: rule__XListLiteral__Group_3__0
+                    // InternalCheckCfg.g:9736:2: rule__XListLiteral__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__XListLiteral__Group_3__0_in_rule__XListLiteral__Group__3__Impl19983);
+                    pushFollow(FOLLOW_2);
                     rule__XListLiteral__Group_3__0();
 
                     state._fsp--;
@@ -29093,16 +29093,16 @@ public final void rule__XListLiteral__Group__3__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XListLiteral__Group__4"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9746:1: rule__XListLiteral__Group__4 : rule__XListLiteral__Group__4__Impl ;
+    // InternalCheckCfg.g:9746:1: rule__XListLiteral__Group__4 : rule__XListLiteral__Group__4__Impl ;
     public final void rule__XListLiteral__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9750:1: ( rule__XListLiteral__Group__4__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9751:2: rule__XListLiteral__Group__4__Impl
+            // InternalCheckCfg.g:9750:1: ( rule__XListLiteral__Group__4__Impl )
+            // InternalCheckCfg.g:9751:2: rule__XListLiteral__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__XListLiteral__Group__4__Impl_in_rule__XListLiteral__Group__420014);
+            pushFollow(FOLLOW_2);
             rule__XListLiteral__Group__4__Impl();
 
             state._fsp--;
@@ -29126,22 +29126,22 @@ public final void rule__XListLiteral__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__XListLiteral__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9757:1: rule__XListLiteral__Group__4__Impl : ( ']' ) ;
+    // InternalCheckCfg.g:9757:1: rule__XListLiteral__Group__4__Impl : ( ']' ) ;
     public final void rule__XListLiteral__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9761:1: ( ( ']' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9762:1: ( ']' )
+            // InternalCheckCfg.g:9761:1: ( ( ']' ) )
+            // InternalCheckCfg.g:9762:1: ( ']' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9762:1: ( ']' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9763:1: ']'
+            // InternalCheckCfg.g:9762:1: ( ']' )
+            // InternalCheckCfg.g:9763:1: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getRightSquareBracketKeyword_4()); 
             }
-            match(input,67,FOLLOW_67_in_rule__XListLiteral__Group__4__Impl20042); if (state.failed) return ;
+            match(input,67,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXListLiteralAccess().getRightSquareBracketKeyword_4()); 
             }
@@ -29167,21 +29167,21 @@ public final void rule__XListLiteral__Group__4__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XListLiteral__Group_3__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9786:1: rule__XListLiteral__Group_3__0 : rule__XListLiteral__Group_3__0__Impl rule__XListLiteral__Group_3__1 ;
+    // InternalCheckCfg.g:9786:1: rule__XListLiteral__Group_3__0 : rule__XListLiteral__Group_3__0__Impl rule__XListLiteral__Group_3__1 ;
     public final void rule__XListLiteral__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9790:1: ( rule__XListLiteral__Group_3__0__Impl rule__XListLiteral__Group_3__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9791:2: rule__XListLiteral__Group_3__0__Impl rule__XListLiteral__Group_3__1
+            // InternalCheckCfg.g:9790:1: ( rule__XListLiteral__Group_3__0__Impl rule__XListLiteral__Group_3__1 )
+            // InternalCheckCfg.g:9791:2: rule__XListLiteral__Group_3__0__Impl rule__XListLiteral__Group_3__1
             {
-            pushFollow(FOLLOW_rule__XListLiteral__Group_3__0__Impl_in_rule__XListLiteral__Group_3__020083);
+            pushFollow(FOLLOW_25);
             rule__XListLiteral__Group_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XListLiteral__Group_3__1_in_rule__XListLiteral__Group_3__020086);
+            pushFollow(FOLLOW_2);
             rule__XListLiteral__Group_3__1();
 
             state._fsp--;
@@ -29205,25 +29205,25 @@ public final void rule__XListLiteral__Group_3__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XListLiteral__Group_3__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9798:1: rule__XListLiteral__Group_3__0__Impl : ( ( rule__XListLiteral__ElementsAssignment_3_0 ) ) ;
+    // InternalCheckCfg.g:9798:1: rule__XListLiteral__Group_3__0__Impl : ( ( rule__XListLiteral__ElementsAssignment_3_0 ) ) ;
     public final void rule__XListLiteral__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9802:1: ( ( ( rule__XListLiteral__ElementsAssignment_3_0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9803:1: ( ( rule__XListLiteral__ElementsAssignment_3_0 ) )
+            // InternalCheckCfg.g:9802:1: ( ( ( rule__XListLiteral__ElementsAssignment_3_0 ) ) )
+            // InternalCheckCfg.g:9803:1: ( ( rule__XListLiteral__ElementsAssignment_3_0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9803:1: ( ( rule__XListLiteral__ElementsAssignment_3_0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9804:1: ( rule__XListLiteral__ElementsAssignment_3_0 )
+            // InternalCheckCfg.g:9803:1: ( ( rule__XListLiteral__ElementsAssignment_3_0 ) )
+            // InternalCheckCfg.g:9804:1: ( rule__XListLiteral__ElementsAssignment_3_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getElementsAssignment_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9805:1: ( rule__XListLiteral__ElementsAssignment_3_0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9805:2: rule__XListLiteral__ElementsAssignment_3_0
+            // InternalCheckCfg.g:9805:1: ( rule__XListLiteral__ElementsAssignment_3_0 )
+            // InternalCheckCfg.g:9805:2: rule__XListLiteral__ElementsAssignment_3_0
             {
-            pushFollow(FOLLOW_rule__XListLiteral__ElementsAssignment_3_0_in_rule__XListLiteral__Group_3__0__Impl20113);
+            pushFollow(FOLLOW_2);
             rule__XListLiteral__ElementsAssignment_3_0();
 
             state._fsp--;
@@ -29256,16 +29256,16 @@ public final void rule__XListLiteral__Group_3__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XListLiteral__Group_3__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9815:1: rule__XListLiteral__Group_3__1 : rule__XListLiteral__Group_3__1__Impl ;
+    // InternalCheckCfg.g:9815:1: rule__XListLiteral__Group_3__1 : rule__XListLiteral__Group_3__1__Impl ;
     public final void rule__XListLiteral__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9819:1: ( rule__XListLiteral__Group_3__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9820:2: rule__XListLiteral__Group_3__1__Impl
+            // InternalCheckCfg.g:9819:1: ( rule__XListLiteral__Group_3__1__Impl )
+            // InternalCheckCfg.g:9820:2: rule__XListLiteral__Group_3__1__Impl
             {
-            pushFollow(FOLLOW_rule__XListLiteral__Group_3__1__Impl_in_rule__XListLiteral__Group_3__120143);
+            pushFollow(FOLLOW_2);
             rule__XListLiteral__Group_3__1__Impl();
 
             state._fsp--;
@@ -29289,22 +29289,22 @@ public final void rule__XListLiteral__Group_3__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XListLiteral__Group_3__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9826:1: rule__XListLiteral__Group_3__1__Impl : ( ( rule__XListLiteral__Group_3_1__0 )* ) ;
+    // InternalCheckCfg.g:9826:1: rule__XListLiteral__Group_3__1__Impl : ( ( rule__XListLiteral__Group_3_1__0 )* ) ;
     public final void rule__XListLiteral__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9830:1: ( ( ( rule__XListLiteral__Group_3_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9831:1: ( ( rule__XListLiteral__Group_3_1__0 )* )
+            // InternalCheckCfg.g:9830:1: ( ( ( rule__XListLiteral__Group_3_1__0 )* ) )
+            // InternalCheckCfg.g:9831:1: ( ( rule__XListLiteral__Group_3_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9831:1: ( ( rule__XListLiteral__Group_3_1__0 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9832:1: ( rule__XListLiteral__Group_3_1__0 )*
+            // InternalCheckCfg.g:9831:1: ( ( rule__XListLiteral__Group_3_1__0 )* )
+            // InternalCheckCfg.g:9832:1: ( rule__XListLiteral__Group_3_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getGroup_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9833:1: ( rule__XListLiteral__Group_3_1__0 )*
+            // InternalCheckCfg.g:9833:1: ( rule__XListLiteral__Group_3_1__0 )*
             loop78:
             do {
                 int alt78=2;
@@ -29317,9 +29317,9 @@ public final void rule__XListLiteral__Group_3__1__Impl() throws RecognitionExcep
 
                 switch (alt78) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9833:2: rule__XListLiteral__Group_3_1__0
+            	    // InternalCheckCfg.g:9833:2: rule__XListLiteral__Group_3_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XListLiteral__Group_3_1__0_in_rule__XListLiteral__Group_3__1__Impl20170);
+            	    pushFollow(FOLLOW_18);
             	    rule__XListLiteral__Group_3_1__0();
 
             	    state._fsp--;
@@ -29358,21 +29358,21 @@ public final void rule__XListLiteral__Group_3__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XListLiteral__Group_3_1__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9847:1: rule__XListLiteral__Group_3_1__0 : rule__XListLiteral__Group_3_1__0__Impl rule__XListLiteral__Group_3_1__1 ;
+    // InternalCheckCfg.g:9847:1: rule__XListLiteral__Group_3_1__0 : rule__XListLiteral__Group_3_1__0__Impl rule__XListLiteral__Group_3_1__1 ;
     public final void rule__XListLiteral__Group_3_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9851:1: ( rule__XListLiteral__Group_3_1__0__Impl rule__XListLiteral__Group_3_1__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9852:2: rule__XListLiteral__Group_3_1__0__Impl rule__XListLiteral__Group_3_1__1
+            // InternalCheckCfg.g:9851:1: ( rule__XListLiteral__Group_3_1__0__Impl rule__XListLiteral__Group_3_1__1 )
+            // InternalCheckCfg.g:9852:2: rule__XListLiteral__Group_3_1__0__Impl rule__XListLiteral__Group_3_1__1
             {
-            pushFollow(FOLLOW_rule__XListLiteral__Group_3_1__0__Impl_in_rule__XListLiteral__Group_3_1__020205);
+            pushFollow(FOLLOW_61);
             rule__XListLiteral__Group_3_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XListLiteral__Group_3_1__1_in_rule__XListLiteral__Group_3_1__020208);
+            pushFollow(FOLLOW_2);
             rule__XListLiteral__Group_3_1__1();
 
             state._fsp--;
@@ -29396,22 +29396,22 @@ public final void rule__XListLiteral__Group_3_1__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XListLiteral__Group_3_1__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9859:1: rule__XListLiteral__Group_3_1__0__Impl : ( ',' ) ;
+    // InternalCheckCfg.g:9859:1: rule__XListLiteral__Group_3_1__0__Impl : ( ',' ) ;
     public final void rule__XListLiteral__Group_3_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9863:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9864:1: ( ',' )
+            // InternalCheckCfg.g:9863:1: ( ( ',' ) )
+            // InternalCheckCfg.g:9864:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9864:1: ( ',' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9865:1: ','
+            // InternalCheckCfg.g:9864:1: ( ',' )
+            // InternalCheckCfg.g:9865:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getCommaKeyword_3_1_0()); 
             }
-            match(input,64,FOLLOW_64_in_rule__XListLiteral__Group_3_1__0__Impl20236); if (state.failed) return ;
+            match(input,64,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXListLiteralAccess().getCommaKeyword_3_1_0()); 
             }
@@ -29437,16 +29437,16 @@ public final void rule__XListLiteral__Group_3_1__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XListLiteral__Group_3_1__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9878:1: rule__XListLiteral__Group_3_1__1 : rule__XListLiteral__Group_3_1__1__Impl ;
+    // InternalCheckCfg.g:9878:1: rule__XListLiteral__Group_3_1__1 : rule__XListLiteral__Group_3_1__1__Impl ;
     public final void rule__XListLiteral__Group_3_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9882:1: ( rule__XListLiteral__Group_3_1__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9883:2: rule__XListLiteral__Group_3_1__1__Impl
+            // InternalCheckCfg.g:9882:1: ( rule__XListLiteral__Group_3_1__1__Impl )
+            // InternalCheckCfg.g:9883:2: rule__XListLiteral__Group_3_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XListLiteral__Group_3_1__1__Impl_in_rule__XListLiteral__Group_3_1__120267);
+            pushFollow(FOLLOW_2);
             rule__XListLiteral__Group_3_1__1__Impl();
 
             state._fsp--;
@@ -29470,25 +29470,25 @@ public final void rule__XListLiteral__Group_3_1__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XListLiteral__Group_3_1__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9889:1: rule__XListLiteral__Group_3_1__1__Impl : ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) ) ;
+    // InternalCheckCfg.g:9889:1: rule__XListLiteral__Group_3_1__1__Impl : ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) ) ;
     public final void rule__XListLiteral__Group_3_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9893:1: ( ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9894:1: ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) )
+            // InternalCheckCfg.g:9893:1: ( ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) ) )
+            // InternalCheckCfg.g:9894:1: ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9894:1: ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9895:1: ( rule__XListLiteral__ElementsAssignment_3_1_1 )
+            // InternalCheckCfg.g:9894:1: ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) )
+            // InternalCheckCfg.g:9895:1: ( rule__XListLiteral__ElementsAssignment_3_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getElementsAssignment_3_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9896:1: ( rule__XListLiteral__ElementsAssignment_3_1_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9896:2: rule__XListLiteral__ElementsAssignment_3_1_1
+            // InternalCheckCfg.g:9896:1: ( rule__XListLiteral__ElementsAssignment_3_1_1 )
+            // InternalCheckCfg.g:9896:2: rule__XListLiteral__ElementsAssignment_3_1_1
             {
-            pushFollow(FOLLOW_rule__XListLiteral__ElementsAssignment_3_1_1_in_rule__XListLiteral__Group_3_1__1__Impl20294);
+            pushFollow(FOLLOW_2);
             rule__XListLiteral__ElementsAssignment_3_1_1();
 
             state._fsp--;
@@ -29521,21 +29521,21 @@ public final void rule__XListLiteral__Group_3_1__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XClosure__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9910:1: rule__XClosure__Group__0 : rule__XClosure__Group__0__Impl rule__XClosure__Group__1 ;
+    // InternalCheckCfg.g:9910:1: rule__XClosure__Group__0 : rule__XClosure__Group__0__Impl rule__XClosure__Group__1 ;
     public final void rule__XClosure__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9914:1: ( rule__XClosure__Group__0__Impl rule__XClosure__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9915:2: rule__XClosure__Group__0__Impl rule__XClosure__Group__1
+            // InternalCheckCfg.g:9914:1: ( rule__XClosure__Group__0__Impl rule__XClosure__Group__1 )
+            // InternalCheckCfg.g:9915:2: rule__XClosure__Group__0__Impl rule__XClosure__Group__1
             {
-            pushFollow(FOLLOW_rule__XClosure__Group__0__Impl_in_rule__XClosure__Group__020328);
+            pushFollow(FOLLOW_65);
             rule__XClosure__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XClosure__Group__1_in_rule__XClosure__Group__020331);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group__1();
 
             state._fsp--;
@@ -29559,25 +29559,25 @@ public final void rule__XClosure__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9922:1: rule__XClosure__Group__0__Impl : ( ( rule__XClosure__Group_0__0 ) ) ;
+    // InternalCheckCfg.g:9922:1: rule__XClosure__Group__0__Impl : ( ( rule__XClosure__Group_0__0 ) ) ;
     public final void rule__XClosure__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9926:1: ( ( ( rule__XClosure__Group_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9927:1: ( ( rule__XClosure__Group_0__0 ) )
+            // InternalCheckCfg.g:9926:1: ( ( ( rule__XClosure__Group_0__0 ) ) )
+            // InternalCheckCfg.g:9927:1: ( ( rule__XClosure__Group_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9927:1: ( ( rule__XClosure__Group_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9928:1: ( rule__XClosure__Group_0__0 )
+            // InternalCheckCfg.g:9927:1: ( ( rule__XClosure__Group_0__0 ) )
+            // InternalCheckCfg.g:9928:1: ( rule__XClosure__Group_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getGroup_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9929:1: ( rule__XClosure__Group_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9929:2: rule__XClosure__Group_0__0
+            // InternalCheckCfg.g:9929:1: ( rule__XClosure__Group_0__0 )
+            // InternalCheckCfg.g:9929:2: rule__XClosure__Group_0__0
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_0__0_in_rule__XClosure__Group__0__Impl20358);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group_0__0();
 
             state._fsp--;
@@ -29610,21 +29610,21 @@ public final void rule__XClosure__Group__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9939:1: rule__XClosure__Group__1 : rule__XClosure__Group__1__Impl rule__XClosure__Group__2 ;
+    // InternalCheckCfg.g:9939:1: rule__XClosure__Group__1 : rule__XClosure__Group__1__Impl rule__XClosure__Group__2 ;
     public final void rule__XClosure__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9943:1: ( rule__XClosure__Group__1__Impl rule__XClosure__Group__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9944:2: rule__XClosure__Group__1__Impl rule__XClosure__Group__2
+            // InternalCheckCfg.g:9943:1: ( rule__XClosure__Group__1__Impl rule__XClosure__Group__2 )
+            // InternalCheckCfg.g:9944:2: rule__XClosure__Group__1__Impl rule__XClosure__Group__2
             {
-            pushFollow(FOLLOW_rule__XClosure__Group__1__Impl_in_rule__XClosure__Group__120388);
+            pushFollow(FOLLOW_65);
             rule__XClosure__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XClosure__Group__2_in_rule__XClosure__Group__120391);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group__2();
 
             state._fsp--;
@@ -29648,29 +29648,29 @@ public final void rule__XClosure__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9951:1: rule__XClosure__Group__1__Impl : ( ( rule__XClosure__Group_1__0 )? ) ;
+    // InternalCheckCfg.g:9951:1: rule__XClosure__Group__1__Impl : ( ( rule__XClosure__Group_1__0 )? ) ;
     public final void rule__XClosure__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9955:1: ( ( ( rule__XClosure__Group_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9956:1: ( ( rule__XClosure__Group_1__0 )? )
+            // InternalCheckCfg.g:9955:1: ( ( ( rule__XClosure__Group_1__0 )? ) )
+            // InternalCheckCfg.g:9956:1: ( ( rule__XClosure__Group_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9956:1: ( ( rule__XClosure__Group_1__0 )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9957:1: ( rule__XClosure__Group_1__0 )?
+            // InternalCheckCfg.g:9956:1: ( ( rule__XClosure__Group_1__0 )? )
+            // InternalCheckCfg.g:9957:1: ( rule__XClosure__Group_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9958:1: ( rule__XClosure__Group_1__0 )?
+            // InternalCheckCfg.g:9958:1: ( rule__XClosure__Group_1__0 )?
             int alt79=2;
             alt79 = dfa79.predict(input);
             switch (alt79) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9958:2: rule__XClosure__Group_1__0
+                    // InternalCheckCfg.g:9958:2: rule__XClosure__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__XClosure__Group_1__0_in_rule__XClosure__Group__1__Impl20418);
+                    pushFollow(FOLLOW_2);
                     rule__XClosure__Group_1__0();
 
                     state._fsp--;
@@ -29706,21 +29706,21 @@ public final void rule__XClosure__Group__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9968:1: rule__XClosure__Group__2 : rule__XClosure__Group__2__Impl rule__XClosure__Group__3 ;
+    // InternalCheckCfg.g:9968:1: rule__XClosure__Group__2 : rule__XClosure__Group__2__Impl rule__XClosure__Group__3 ;
     public final void rule__XClosure__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9972:1: ( rule__XClosure__Group__2__Impl rule__XClosure__Group__3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9973:2: rule__XClosure__Group__2__Impl rule__XClosure__Group__3
+            // InternalCheckCfg.g:9972:1: ( rule__XClosure__Group__2__Impl rule__XClosure__Group__3 )
+            // InternalCheckCfg.g:9973:2: rule__XClosure__Group__2__Impl rule__XClosure__Group__3
             {
-            pushFollow(FOLLOW_rule__XClosure__Group__2__Impl_in_rule__XClosure__Group__220449);
+            pushFollow(FOLLOW_66);
             rule__XClosure__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XClosure__Group__3_in_rule__XClosure__Group__220452);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group__3();
 
             state._fsp--;
@@ -29744,25 +29744,25 @@ public final void rule__XClosure__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9980:1: rule__XClosure__Group__2__Impl : ( ( rule__XClosure__ExpressionAssignment_2 ) ) ;
+    // InternalCheckCfg.g:9980:1: rule__XClosure__Group__2__Impl : ( ( rule__XClosure__ExpressionAssignment_2 ) ) ;
     public final void rule__XClosure__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9984:1: ( ( ( rule__XClosure__ExpressionAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9985:1: ( ( rule__XClosure__ExpressionAssignment_2 ) )
+            // InternalCheckCfg.g:9984:1: ( ( ( rule__XClosure__ExpressionAssignment_2 ) ) )
+            // InternalCheckCfg.g:9985:1: ( ( rule__XClosure__ExpressionAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9985:1: ( ( rule__XClosure__ExpressionAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9986:1: ( rule__XClosure__ExpressionAssignment_2 )
+            // InternalCheckCfg.g:9985:1: ( ( rule__XClosure__ExpressionAssignment_2 ) )
+            // InternalCheckCfg.g:9986:1: ( rule__XClosure__ExpressionAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getExpressionAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9987:1: ( rule__XClosure__ExpressionAssignment_2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9987:2: rule__XClosure__ExpressionAssignment_2
+            // InternalCheckCfg.g:9987:1: ( rule__XClosure__ExpressionAssignment_2 )
+            // InternalCheckCfg.g:9987:2: rule__XClosure__ExpressionAssignment_2
             {
-            pushFollow(FOLLOW_rule__XClosure__ExpressionAssignment_2_in_rule__XClosure__Group__2__Impl20479);
+            pushFollow(FOLLOW_2);
             rule__XClosure__ExpressionAssignment_2();
 
             state._fsp--;
@@ -29795,16 +29795,16 @@ public final void rule__XClosure__Group__2__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group__3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9997:1: rule__XClosure__Group__3 : rule__XClosure__Group__3__Impl ;
+    // InternalCheckCfg.g:9997:1: rule__XClosure__Group__3 : rule__XClosure__Group__3__Impl ;
     public final void rule__XClosure__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10001:1: ( rule__XClosure__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10002:2: rule__XClosure__Group__3__Impl
+            // InternalCheckCfg.g:10001:1: ( rule__XClosure__Group__3__Impl )
+            // InternalCheckCfg.g:10002:2: rule__XClosure__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__XClosure__Group__3__Impl_in_rule__XClosure__Group__320509);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group__3__Impl();
 
             state._fsp--;
@@ -29828,22 +29828,22 @@ public final void rule__XClosure__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10008:1: rule__XClosure__Group__3__Impl : ( ']' ) ;
+    // InternalCheckCfg.g:10008:1: rule__XClosure__Group__3__Impl : ( ']' ) ;
     public final void rule__XClosure__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10012:1: ( ( ']' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10013:1: ( ']' )
+            // InternalCheckCfg.g:10012:1: ( ( ']' ) )
+            // InternalCheckCfg.g:10013:1: ( ']' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10013:1: ( ']' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10014:1: ']'
+            // InternalCheckCfg.g:10013:1: ( ']' )
+            // InternalCheckCfg.g:10014:1: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getRightSquareBracketKeyword_3()); 
             }
-            match(input,67,FOLLOW_67_in_rule__XClosure__Group__3__Impl20537); if (state.failed) return ;
+            match(input,67,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXClosureAccess().getRightSquareBracketKeyword_3()); 
             }
@@ -29869,16 +29869,16 @@ public final void rule__XClosure__Group__3__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10035:1: rule__XClosure__Group_0__0 : rule__XClosure__Group_0__0__Impl ;
+    // InternalCheckCfg.g:10035:1: rule__XClosure__Group_0__0 : rule__XClosure__Group_0__0__Impl ;
     public final void rule__XClosure__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10039:1: ( rule__XClosure__Group_0__0__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10040:2: rule__XClosure__Group_0__0__Impl
+            // InternalCheckCfg.g:10039:1: ( rule__XClosure__Group_0__0__Impl )
+            // InternalCheckCfg.g:10040:2: rule__XClosure__Group_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_0__0__Impl_in_rule__XClosure__Group_0__020576);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group_0__0__Impl();
 
             state._fsp--;
@@ -29902,25 +29902,25 @@ public final void rule__XClosure__Group_0__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10046:1: rule__XClosure__Group_0__0__Impl : ( ( rule__XClosure__Group_0_0__0 ) ) ;
+    // InternalCheckCfg.g:10046:1: rule__XClosure__Group_0__0__Impl : ( ( rule__XClosure__Group_0_0__0 ) ) ;
     public final void rule__XClosure__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10050:1: ( ( ( rule__XClosure__Group_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10051:1: ( ( rule__XClosure__Group_0_0__0 ) )
+            // InternalCheckCfg.g:10050:1: ( ( ( rule__XClosure__Group_0_0__0 ) ) )
+            // InternalCheckCfg.g:10051:1: ( ( rule__XClosure__Group_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10051:1: ( ( rule__XClosure__Group_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10052:1: ( rule__XClosure__Group_0_0__0 )
+            // InternalCheckCfg.g:10051:1: ( ( rule__XClosure__Group_0_0__0 ) )
+            // InternalCheckCfg.g:10052:1: ( rule__XClosure__Group_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getGroup_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10053:1: ( rule__XClosure__Group_0_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10053:2: rule__XClosure__Group_0_0__0
+            // InternalCheckCfg.g:10053:1: ( rule__XClosure__Group_0_0__0 )
+            // InternalCheckCfg.g:10053:2: rule__XClosure__Group_0_0__0
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_0_0__0_in_rule__XClosure__Group_0__0__Impl20603);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group_0_0__0();
 
             state._fsp--;
@@ -29953,21 +29953,21 @@ public final void rule__XClosure__Group_0__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__XClosure__Group_0_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10065:1: rule__XClosure__Group_0_0__0 : rule__XClosure__Group_0_0__0__Impl rule__XClosure__Group_0_0__1 ;
+    // InternalCheckCfg.g:10065:1: rule__XClosure__Group_0_0__0 : rule__XClosure__Group_0_0__0__Impl rule__XClosure__Group_0_0__1 ;
     public final void rule__XClosure__Group_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10069:1: ( rule__XClosure__Group_0_0__0__Impl rule__XClosure__Group_0_0__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10070:2: rule__XClosure__Group_0_0__0__Impl rule__XClosure__Group_0_0__1
+            // InternalCheckCfg.g:10069:1: ( rule__XClosure__Group_0_0__0__Impl rule__XClosure__Group_0_0__1 )
+            // InternalCheckCfg.g:10070:2: rule__XClosure__Group_0_0__0__Impl rule__XClosure__Group_0_0__1
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_0_0__0__Impl_in_rule__XClosure__Group_0_0__020635);
+            pushFollow(FOLLOW_23);
             rule__XClosure__Group_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XClosure__Group_0_0__1_in_rule__XClosure__Group_0_0__020638);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group_0_0__1();
 
             state._fsp--;
@@ -29991,23 +29991,23 @@ public final void rule__XClosure__Group_0_0__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10077:1: rule__XClosure__Group_0_0__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:10077:1: rule__XClosure__Group_0_0__0__Impl : ( () ) ;
     public final void rule__XClosure__Group_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10081:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10082:1: ( () )
+            // InternalCheckCfg.g:10081:1: ( ( () ) )
+            // InternalCheckCfg.g:10082:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10082:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10083:1: ()
+            // InternalCheckCfg.g:10082:1: ( () )
+            // InternalCheckCfg.g:10083:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getXClosureAction_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10084:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10086:1: 
+            // InternalCheckCfg.g:10084:1: ()
+            // InternalCheckCfg.g:10086:1: 
             {
             }
 
@@ -30032,16 +30032,16 @@ public final void rule__XClosure__Group_0_0__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XClosure__Group_0_0__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10096:1: rule__XClosure__Group_0_0__1 : rule__XClosure__Group_0_0__1__Impl ;
+    // InternalCheckCfg.g:10096:1: rule__XClosure__Group_0_0__1 : rule__XClosure__Group_0_0__1__Impl ;
     public final void rule__XClosure__Group_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10100:1: ( rule__XClosure__Group_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10101:2: rule__XClosure__Group_0_0__1__Impl
+            // InternalCheckCfg.g:10100:1: ( rule__XClosure__Group_0_0__1__Impl )
+            // InternalCheckCfg.g:10101:2: rule__XClosure__Group_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_0_0__1__Impl_in_rule__XClosure__Group_0_0__120696);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group_0_0__1__Impl();
 
             state._fsp--;
@@ -30065,22 +30065,22 @@ public final void rule__XClosure__Group_0_0__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10107:1: rule__XClosure__Group_0_0__1__Impl : ( '[' ) ;
+    // InternalCheckCfg.g:10107:1: rule__XClosure__Group_0_0__1__Impl : ( '[' ) ;
     public final void rule__XClosure__Group_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10111:1: ( ( '[' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10112:1: ( '[' )
+            // InternalCheckCfg.g:10111:1: ( ( '[' ) )
+            // InternalCheckCfg.g:10112:1: ( '[' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10112:1: ( '[' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10113:1: '['
+            // InternalCheckCfg.g:10112:1: ( '[' )
+            // InternalCheckCfg.g:10113:1: '['
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getLeftSquareBracketKeyword_0_0_1()); 
             }
-            match(input,66,FOLLOW_66_in_rule__XClosure__Group_0_0__1__Impl20724); if (state.failed) return ;
+            match(input,66,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXClosureAccess().getLeftSquareBracketKeyword_0_0_1()); 
             }
@@ -30106,16 +30106,16 @@ public final void rule__XClosure__Group_0_0__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XClosure__Group_1__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10130:1: rule__XClosure__Group_1__0 : rule__XClosure__Group_1__0__Impl ;
+    // InternalCheckCfg.g:10130:1: rule__XClosure__Group_1__0 : rule__XClosure__Group_1__0__Impl ;
     public final void rule__XClosure__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10134:1: ( rule__XClosure__Group_1__0__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10135:2: rule__XClosure__Group_1__0__Impl
+            // InternalCheckCfg.g:10134:1: ( rule__XClosure__Group_1__0__Impl )
+            // InternalCheckCfg.g:10135:2: rule__XClosure__Group_1__0__Impl
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_1__0__Impl_in_rule__XClosure__Group_1__020759);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group_1__0__Impl();
 
             state._fsp--;
@@ -30139,25 +30139,25 @@ public final void rule__XClosure__Group_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10141:1: rule__XClosure__Group_1__0__Impl : ( ( rule__XClosure__Group_1_0__0 ) ) ;
+    // InternalCheckCfg.g:10141:1: rule__XClosure__Group_1__0__Impl : ( ( rule__XClosure__Group_1_0__0 ) ) ;
     public final void rule__XClosure__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10145:1: ( ( ( rule__XClosure__Group_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10146:1: ( ( rule__XClosure__Group_1_0__0 ) )
+            // InternalCheckCfg.g:10145:1: ( ( ( rule__XClosure__Group_1_0__0 ) ) )
+            // InternalCheckCfg.g:10146:1: ( ( rule__XClosure__Group_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10146:1: ( ( rule__XClosure__Group_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10147:1: ( rule__XClosure__Group_1_0__0 )
+            // InternalCheckCfg.g:10146:1: ( ( rule__XClosure__Group_1_0__0 ) )
+            // InternalCheckCfg.g:10147:1: ( rule__XClosure__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getGroup_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10148:1: ( rule__XClosure__Group_1_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10148:2: rule__XClosure__Group_1_0__0
+            // InternalCheckCfg.g:10148:1: ( rule__XClosure__Group_1_0__0 )
+            // InternalCheckCfg.g:10148:2: rule__XClosure__Group_1_0__0
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_1_0__0_in_rule__XClosure__Group_1__0__Impl20786);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group_1_0__0();
 
             state._fsp--;
@@ -30190,21 +30190,21 @@ public final void rule__XClosure__Group_1__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__XClosure__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10160:1: rule__XClosure__Group_1_0__0 : rule__XClosure__Group_1_0__0__Impl rule__XClosure__Group_1_0__1 ;
+    // InternalCheckCfg.g:10160:1: rule__XClosure__Group_1_0__0 : rule__XClosure__Group_1_0__0__Impl rule__XClosure__Group_1_0__1 ;
     public final void rule__XClosure__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10164:1: ( rule__XClosure__Group_1_0__0__Impl rule__XClosure__Group_1_0__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10165:2: rule__XClosure__Group_1_0__0__Impl rule__XClosure__Group_1_0__1
+            // InternalCheckCfg.g:10164:1: ( rule__XClosure__Group_1_0__0__Impl rule__XClosure__Group_1_0__1 )
+            // InternalCheckCfg.g:10165:2: rule__XClosure__Group_1_0__0__Impl rule__XClosure__Group_1_0__1
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_1_0__0__Impl_in_rule__XClosure__Group_1_0__020818);
+            pushFollow(FOLLOW_67);
             rule__XClosure__Group_1_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XClosure__Group_1_0__1_in_rule__XClosure__Group_1_0__020821);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group_1_0__1();
 
             state._fsp--;
@@ -30228,22 +30228,22 @@ public final void rule__XClosure__Group_1_0__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10172:1: rule__XClosure__Group_1_0__0__Impl : ( ( rule__XClosure__Group_1_0_0__0 )? ) ;
+    // InternalCheckCfg.g:10172:1: rule__XClosure__Group_1_0__0__Impl : ( ( rule__XClosure__Group_1_0_0__0 )? ) ;
     public final void rule__XClosure__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10176:1: ( ( ( rule__XClosure__Group_1_0_0__0 )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10177:1: ( ( rule__XClosure__Group_1_0_0__0 )? )
+            // InternalCheckCfg.g:10176:1: ( ( ( rule__XClosure__Group_1_0_0__0 )? ) )
+            // InternalCheckCfg.g:10177:1: ( ( rule__XClosure__Group_1_0_0__0 )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10177:1: ( ( rule__XClosure__Group_1_0_0__0 )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10178:1: ( rule__XClosure__Group_1_0_0__0 )?
+            // InternalCheckCfg.g:10177:1: ( ( rule__XClosure__Group_1_0_0__0 )? )
+            // InternalCheckCfg.g:10178:1: ( rule__XClosure__Group_1_0_0__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getGroup_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10179:1: ( rule__XClosure__Group_1_0_0__0 )?
+            // InternalCheckCfg.g:10179:1: ( rule__XClosure__Group_1_0_0__0 )?
             int alt80=2;
             int LA80_0 = input.LA(1);
 
@@ -30252,9 +30252,9 @@ public final void rule__XClosure__Group_1_0__0__Impl() throws RecognitionExcepti
             }
             switch (alt80) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10179:2: rule__XClosure__Group_1_0_0__0
+                    // InternalCheckCfg.g:10179:2: rule__XClosure__Group_1_0_0__0
                     {
-                    pushFollow(FOLLOW_rule__XClosure__Group_1_0_0__0_in_rule__XClosure__Group_1_0__0__Impl20848);
+                    pushFollow(FOLLOW_2);
                     rule__XClosure__Group_1_0_0__0();
 
                     state._fsp--;
@@ -30290,16 +30290,16 @@ public final void rule__XClosure__Group_1_0__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XClosure__Group_1_0__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10189:1: rule__XClosure__Group_1_0__1 : rule__XClosure__Group_1_0__1__Impl ;
+    // InternalCheckCfg.g:10189:1: rule__XClosure__Group_1_0__1 : rule__XClosure__Group_1_0__1__Impl ;
     public final void rule__XClosure__Group_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10193:1: ( rule__XClosure__Group_1_0__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10194:2: rule__XClosure__Group_1_0__1__Impl
+            // InternalCheckCfg.g:10193:1: ( rule__XClosure__Group_1_0__1__Impl )
+            // InternalCheckCfg.g:10194:2: rule__XClosure__Group_1_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_1_0__1__Impl_in_rule__XClosure__Group_1_0__120879);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group_1_0__1__Impl();
 
             state._fsp--;
@@ -30323,25 +30323,25 @@ public final void rule__XClosure__Group_1_0__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group_1_0__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10200:1: rule__XClosure__Group_1_0__1__Impl : ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) ) ;
+    // InternalCheckCfg.g:10200:1: rule__XClosure__Group_1_0__1__Impl : ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) ) ;
     public final void rule__XClosure__Group_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10204:1: ( ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10205:1: ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) )
+            // InternalCheckCfg.g:10204:1: ( ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) ) )
+            // InternalCheckCfg.g:10205:1: ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10205:1: ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10206:1: ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 )
+            // InternalCheckCfg.g:10205:1: ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) )
+            // InternalCheckCfg.g:10206:1: ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getExplicitSyntaxAssignment_1_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10207:1: ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10207:2: rule__XClosure__ExplicitSyntaxAssignment_1_0_1
+            // InternalCheckCfg.g:10207:1: ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 )
+            // InternalCheckCfg.g:10207:2: rule__XClosure__ExplicitSyntaxAssignment_1_0_1
             {
-            pushFollow(FOLLOW_rule__XClosure__ExplicitSyntaxAssignment_1_0_1_in_rule__XClosure__Group_1_0__1__Impl20906);
+            pushFollow(FOLLOW_2);
             rule__XClosure__ExplicitSyntaxAssignment_1_0_1();
 
             state._fsp--;
@@ -30374,21 +30374,21 @@ public final void rule__XClosure__Group_1_0__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10221:1: rule__XClosure__Group_1_0_0__0 : rule__XClosure__Group_1_0_0__0__Impl rule__XClosure__Group_1_0_0__1 ;
+    // InternalCheckCfg.g:10221:1: rule__XClosure__Group_1_0_0__0 : rule__XClosure__Group_1_0_0__0__Impl rule__XClosure__Group_1_0_0__1 ;
     public final void rule__XClosure__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10225:1: ( rule__XClosure__Group_1_0_0__0__Impl rule__XClosure__Group_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10226:2: rule__XClosure__Group_1_0_0__0__Impl rule__XClosure__Group_1_0_0__1
+            // InternalCheckCfg.g:10225:1: ( rule__XClosure__Group_1_0_0__0__Impl rule__XClosure__Group_1_0_0__1 )
+            // InternalCheckCfg.g:10226:2: rule__XClosure__Group_1_0_0__0__Impl rule__XClosure__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_1_0_0__0__Impl_in_rule__XClosure__Group_1_0_0__020940);
+            pushFollow(FOLLOW_25);
             rule__XClosure__Group_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XClosure__Group_1_0_0__1_in_rule__XClosure__Group_1_0_0__020943);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group_1_0_0__1();
 
             state._fsp--;
@@ -30412,25 +30412,25 @@ public final void rule__XClosure__Group_1_0_0__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10233:1: rule__XClosure__Group_1_0_0__0__Impl : ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) ) ;
+    // InternalCheckCfg.g:10233:1: rule__XClosure__Group_1_0_0__0__Impl : ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) ) ;
     public final void rule__XClosure__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10237:1: ( ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10238:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) )
+            // InternalCheckCfg.g:10237:1: ( ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) ) )
+            // InternalCheckCfg.g:10238:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10238:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10239:1: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 )
+            // InternalCheckCfg.g:10238:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) )
+            // InternalCheckCfg.g:10239:1: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getDeclaredFormalParametersAssignment_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10240:1: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10240:2: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0
+            // InternalCheckCfg.g:10240:1: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 )
+            // InternalCheckCfg.g:10240:2: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0
             {
-            pushFollow(FOLLOW_rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0_in_rule__XClosure__Group_1_0_0__0__Impl20970);
+            pushFollow(FOLLOW_2);
             rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0();
 
             state._fsp--;
@@ -30463,16 +30463,16 @@ public final void rule__XClosure__Group_1_0_0__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10250:1: rule__XClosure__Group_1_0_0__1 : rule__XClosure__Group_1_0_0__1__Impl ;
+    // InternalCheckCfg.g:10250:1: rule__XClosure__Group_1_0_0__1 : rule__XClosure__Group_1_0_0__1__Impl ;
     public final void rule__XClosure__Group_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10254:1: ( rule__XClosure__Group_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10255:2: rule__XClosure__Group_1_0_0__1__Impl
+            // InternalCheckCfg.g:10254:1: ( rule__XClosure__Group_1_0_0__1__Impl )
+            // InternalCheckCfg.g:10255:2: rule__XClosure__Group_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_1_0_0__1__Impl_in_rule__XClosure__Group_1_0_0__121000);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group_1_0_0__1__Impl();
 
             state._fsp--;
@@ -30496,22 +30496,22 @@ public final void rule__XClosure__Group_1_0_0__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10261:1: rule__XClosure__Group_1_0_0__1__Impl : ( ( rule__XClosure__Group_1_0_0_1__0 )* ) ;
+    // InternalCheckCfg.g:10261:1: rule__XClosure__Group_1_0_0__1__Impl : ( ( rule__XClosure__Group_1_0_0_1__0 )* ) ;
     public final void rule__XClosure__Group_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10265:1: ( ( ( rule__XClosure__Group_1_0_0_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10266:1: ( ( rule__XClosure__Group_1_0_0_1__0 )* )
+            // InternalCheckCfg.g:10265:1: ( ( ( rule__XClosure__Group_1_0_0_1__0 )* ) )
+            // InternalCheckCfg.g:10266:1: ( ( rule__XClosure__Group_1_0_0_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10266:1: ( ( rule__XClosure__Group_1_0_0_1__0 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10267:1: ( rule__XClosure__Group_1_0_0_1__0 )*
+            // InternalCheckCfg.g:10266:1: ( ( rule__XClosure__Group_1_0_0_1__0 )* )
+            // InternalCheckCfg.g:10267:1: ( rule__XClosure__Group_1_0_0_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getGroup_1_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10268:1: ( rule__XClosure__Group_1_0_0_1__0 )*
+            // InternalCheckCfg.g:10268:1: ( rule__XClosure__Group_1_0_0_1__0 )*
             loop81:
             do {
                 int alt81=2;
@@ -30524,9 +30524,9 @@ public final void rule__XClosure__Group_1_0_0__1__Impl() throws RecognitionExcep
 
                 switch (alt81) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10268:2: rule__XClosure__Group_1_0_0_1__0
+            	    // InternalCheckCfg.g:10268:2: rule__XClosure__Group_1_0_0_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XClosure__Group_1_0_0_1__0_in_rule__XClosure__Group_1_0_0__1__Impl21027);
+            	    pushFollow(FOLLOW_18);
             	    rule__XClosure__Group_1_0_0_1__0();
 
             	    state._fsp--;
@@ -30565,21 +30565,21 @@ public final void rule__XClosure__Group_1_0_0__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0_1__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10282:1: rule__XClosure__Group_1_0_0_1__0 : rule__XClosure__Group_1_0_0_1__0__Impl rule__XClosure__Group_1_0_0_1__1 ;
+    // InternalCheckCfg.g:10282:1: rule__XClosure__Group_1_0_0_1__0 : rule__XClosure__Group_1_0_0_1__0__Impl rule__XClosure__Group_1_0_0_1__1 ;
     public final void rule__XClosure__Group_1_0_0_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10286:1: ( rule__XClosure__Group_1_0_0_1__0__Impl rule__XClosure__Group_1_0_0_1__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10287:2: rule__XClosure__Group_1_0_0_1__0__Impl rule__XClosure__Group_1_0_0_1__1
+            // InternalCheckCfg.g:10286:1: ( rule__XClosure__Group_1_0_0_1__0__Impl rule__XClosure__Group_1_0_0_1__1 )
+            // InternalCheckCfg.g:10287:2: rule__XClosure__Group_1_0_0_1__0__Impl rule__XClosure__Group_1_0_0_1__1
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_1_0_0_1__0__Impl_in_rule__XClosure__Group_1_0_0_1__021062);
+            pushFollow(FOLLOW_39);
             rule__XClosure__Group_1_0_0_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XClosure__Group_1_0_0_1__1_in_rule__XClosure__Group_1_0_0_1__021065);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group_1_0_0_1__1();
 
             state._fsp--;
@@ -30603,22 +30603,22 @@ public final void rule__XClosure__Group_1_0_0_1__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0_1__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10294:1: rule__XClosure__Group_1_0_0_1__0__Impl : ( ',' ) ;
+    // InternalCheckCfg.g:10294:1: rule__XClosure__Group_1_0_0_1__0__Impl : ( ',' ) ;
     public final void rule__XClosure__Group_1_0_0_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10298:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10299:1: ( ',' )
+            // InternalCheckCfg.g:10298:1: ( ( ',' ) )
+            // InternalCheckCfg.g:10299:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10299:1: ( ',' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10300:1: ','
+            // InternalCheckCfg.g:10299:1: ( ',' )
+            // InternalCheckCfg.g:10300:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getCommaKeyword_1_0_0_1_0()); 
             }
-            match(input,64,FOLLOW_64_in_rule__XClosure__Group_1_0_0_1__0__Impl21093); if (state.failed) return ;
+            match(input,64,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXClosureAccess().getCommaKeyword_1_0_0_1_0()); 
             }
@@ -30644,16 +30644,16 @@ public final void rule__XClosure__Group_1_0_0_1__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0_1__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10313:1: rule__XClosure__Group_1_0_0_1__1 : rule__XClosure__Group_1_0_0_1__1__Impl ;
+    // InternalCheckCfg.g:10313:1: rule__XClosure__Group_1_0_0_1__1 : rule__XClosure__Group_1_0_0_1__1__Impl ;
     public final void rule__XClosure__Group_1_0_0_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10317:1: ( rule__XClosure__Group_1_0_0_1__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10318:2: rule__XClosure__Group_1_0_0_1__1__Impl
+            // InternalCheckCfg.g:10317:1: ( rule__XClosure__Group_1_0_0_1__1__Impl )
+            // InternalCheckCfg.g:10318:2: rule__XClosure__Group_1_0_0_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_1_0_0_1__1__Impl_in_rule__XClosure__Group_1_0_0_1__121124);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group_1_0_0_1__1__Impl();
 
             state._fsp--;
@@ -30677,25 +30677,25 @@ public final void rule__XClosure__Group_1_0_0_1__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0_1__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10324:1: rule__XClosure__Group_1_0_0_1__1__Impl : ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) ) ;
+    // InternalCheckCfg.g:10324:1: rule__XClosure__Group_1_0_0_1__1__Impl : ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) ) ;
     public final void rule__XClosure__Group_1_0_0_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10328:1: ( ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10329:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) )
+            // InternalCheckCfg.g:10328:1: ( ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) ) )
+            // InternalCheckCfg.g:10329:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10329:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10330:1: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 )
+            // InternalCheckCfg.g:10329:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) )
+            // InternalCheckCfg.g:10330:1: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getDeclaredFormalParametersAssignment_1_0_0_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10331:1: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10331:2: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1
+            // InternalCheckCfg.g:10331:1: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 )
+            // InternalCheckCfg.g:10331:2: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1
             {
-            pushFollow(FOLLOW_rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1_in_rule__XClosure__Group_1_0_0_1__1__Impl21151);
+            pushFollow(FOLLOW_2);
             rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1();
 
             state._fsp--;
@@ -30728,21 +30728,21 @@ public final void rule__XClosure__Group_1_0_0_1__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10345:1: rule__XExpressionInClosure__Group__0 : rule__XExpressionInClosure__Group__0__Impl rule__XExpressionInClosure__Group__1 ;
+    // InternalCheckCfg.g:10345:1: rule__XExpressionInClosure__Group__0 : rule__XExpressionInClosure__Group__0__Impl rule__XExpressionInClosure__Group__1 ;
     public final void rule__XExpressionInClosure__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10349:1: ( rule__XExpressionInClosure__Group__0__Impl rule__XExpressionInClosure__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10350:2: rule__XExpressionInClosure__Group__0__Impl rule__XExpressionInClosure__Group__1
+            // InternalCheckCfg.g:10349:1: ( rule__XExpressionInClosure__Group__0__Impl rule__XExpressionInClosure__Group__1 )
+            // InternalCheckCfg.g:10350:2: rule__XExpressionInClosure__Group__0__Impl rule__XExpressionInClosure__Group__1
             {
-            pushFollow(FOLLOW_rule__XExpressionInClosure__Group__0__Impl_in_rule__XExpressionInClosure__Group__021185);
+            pushFollow(FOLLOW_65);
             rule__XExpressionInClosure__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XExpressionInClosure__Group__1_in_rule__XExpressionInClosure__Group__021188);
+            pushFollow(FOLLOW_2);
             rule__XExpressionInClosure__Group__1();
 
             state._fsp--;
@@ -30766,23 +30766,23 @@ public final void rule__XExpressionInClosure__Group__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10357:1: rule__XExpressionInClosure__Group__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:10357:1: rule__XExpressionInClosure__Group__0__Impl : ( () ) ;
     public final void rule__XExpressionInClosure__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10361:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10362:1: ( () )
+            // InternalCheckCfg.g:10361:1: ( ( () ) )
+            // InternalCheckCfg.g:10362:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10362:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10363:1: ()
+            // InternalCheckCfg.g:10362:1: ( () )
+            // InternalCheckCfg.g:10363:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionInClosureAccess().getXBlockExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10364:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10366:1: 
+            // InternalCheckCfg.g:10364:1: ()
+            // InternalCheckCfg.g:10366:1: 
             {
             }
 
@@ -30807,16 +30807,16 @@ public final void rule__XExpressionInClosure__Group__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10376:1: rule__XExpressionInClosure__Group__1 : rule__XExpressionInClosure__Group__1__Impl ;
+    // InternalCheckCfg.g:10376:1: rule__XExpressionInClosure__Group__1 : rule__XExpressionInClosure__Group__1__Impl ;
     public final void rule__XExpressionInClosure__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10380:1: ( rule__XExpressionInClosure__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10381:2: rule__XExpressionInClosure__Group__1__Impl
+            // InternalCheckCfg.g:10380:1: ( rule__XExpressionInClosure__Group__1__Impl )
+            // InternalCheckCfg.g:10381:2: rule__XExpressionInClosure__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XExpressionInClosure__Group__1__Impl_in_rule__XExpressionInClosure__Group__121246);
+            pushFollow(FOLLOW_2);
             rule__XExpressionInClosure__Group__1__Impl();
 
             state._fsp--;
@@ -30840,22 +30840,22 @@ public final void rule__XExpressionInClosure__Group__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10387:1: rule__XExpressionInClosure__Group__1__Impl : ( ( rule__XExpressionInClosure__Group_1__0 )* ) ;
+    // InternalCheckCfg.g:10387:1: rule__XExpressionInClosure__Group__1__Impl : ( ( rule__XExpressionInClosure__Group_1__0 )* ) ;
     public final void rule__XExpressionInClosure__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10391:1: ( ( ( rule__XExpressionInClosure__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10392:1: ( ( rule__XExpressionInClosure__Group_1__0 )* )
+            // InternalCheckCfg.g:10391:1: ( ( ( rule__XExpressionInClosure__Group_1__0 )* ) )
+            // InternalCheckCfg.g:10392:1: ( ( rule__XExpressionInClosure__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10392:1: ( ( rule__XExpressionInClosure__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10393:1: ( rule__XExpressionInClosure__Group_1__0 )*
+            // InternalCheckCfg.g:10392:1: ( ( rule__XExpressionInClosure__Group_1__0 )* )
+            // InternalCheckCfg.g:10393:1: ( rule__XExpressionInClosure__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionInClosureAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10394:1: ( rule__XExpressionInClosure__Group_1__0 )*
+            // InternalCheckCfg.g:10394:1: ( rule__XExpressionInClosure__Group_1__0 )*
             loop82:
             do {
                 int alt82=2;
@@ -30868,9 +30868,9 @@ public final void rule__XExpressionInClosure__Group__1__Impl() throws Recognitio
 
                 switch (alt82) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10394:2: rule__XExpressionInClosure__Group_1__0
+            	    // InternalCheckCfg.g:10394:2: rule__XExpressionInClosure__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XExpressionInClosure__Group_1__0_in_rule__XExpressionInClosure__Group__1__Impl21273);
+            	    pushFollow(FOLLOW_68);
             	    rule__XExpressionInClosure__Group_1__0();
 
             	    state._fsp--;
@@ -30909,21 +30909,21 @@ public final void rule__XExpressionInClosure__Group__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group_1__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10408:1: rule__XExpressionInClosure__Group_1__0 : rule__XExpressionInClosure__Group_1__0__Impl rule__XExpressionInClosure__Group_1__1 ;
+    // InternalCheckCfg.g:10408:1: rule__XExpressionInClosure__Group_1__0 : rule__XExpressionInClosure__Group_1__0__Impl rule__XExpressionInClosure__Group_1__1 ;
     public final void rule__XExpressionInClosure__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10412:1: ( rule__XExpressionInClosure__Group_1__0__Impl rule__XExpressionInClosure__Group_1__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10413:2: rule__XExpressionInClosure__Group_1__0__Impl rule__XExpressionInClosure__Group_1__1
+            // InternalCheckCfg.g:10412:1: ( rule__XExpressionInClosure__Group_1__0__Impl rule__XExpressionInClosure__Group_1__1 )
+            // InternalCheckCfg.g:10413:2: rule__XExpressionInClosure__Group_1__0__Impl rule__XExpressionInClosure__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XExpressionInClosure__Group_1__0__Impl_in_rule__XExpressionInClosure__Group_1__021308);
+            pushFollow(FOLLOW_69);
             rule__XExpressionInClosure__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XExpressionInClosure__Group_1__1_in_rule__XExpressionInClosure__Group_1__021311);
+            pushFollow(FOLLOW_2);
             rule__XExpressionInClosure__Group_1__1();
 
             state._fsp--;
@@ -30947,25 +30947,25 @@ public final void rule__XExpressionInClosure__Group_1__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10420:1: rule__XExpressionInClosure__Group_1__0__Impl : ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) ) ;
+    // InternalCheckCfg.g:10420:1: rule__XExpressionInClosure__Group_1__0__Impl : ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) ) ;
     public final void rule__XExpressionInClosure__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10424:1: ( ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10425:1: ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) )
+            // InternalCheckCfg.g:10424:1: ( ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) ) )
+            // InternalCheckCfg.g:10425:1: ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10425:1: ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10426:1: ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 )
+            // InternalCheckCfg.g:10425:1: ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) )
+            // InternalCheckCfg.g:10426:1: ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionInClosureAccess().getExpressionsAssignment_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10427:1: ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10427:2: rule__XExpressionInClosure__ExpressionsAssignment_1_0
+            // InternalCheckCfg.g:10427:1: ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 )
+            // InternalCheckCfg.g:10427:2: rule__XExpressionInClosure__ExpressionsAssignment_1_0
             {
-            pushFollow(FOLLOW_rule__XExpressionInClosure__ExpressionsAssignment_1_0_in_rule__XExpressionInClosure__Group_1__0__Impl21338);
+            pushFollow(FOLLOW_2);
             rule__XExpressionInClosure__ExpressionsAssignment_1_0();
 
             state._fsp--;
@@ -30998,16 +30998,16 @@ public final void rule__XExpressionInClosure__Group_1__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group_1__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10437:1: rule__XExpressionInClosure__Group_1__1 : rule__XExpressionInClosure__Group_1__1__Impl ;
+    // InternalCheckCfg.g:10437:1: rule__XExpressionInClosure__Group_1__1 : rule__XExpressionInClosure__Group_1__1__Impl ;
     public final void rule__XExpressionInClosure__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10441:1: ( rule__XExpressionInClosure__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10442:2: rule__XExpressionInClosure__Group_1__1__Impl
+            // InternalCheckCfg.g:10441:1: ( rule__XExpressionInClosure__Group_1__1__Impl )
+            // InternalCheckCfg.g:10442:2: rule__XExpressionInClosure__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XExpressionInClosure__Group_1__1__Impl_in_rule__XExpressionInClosure__Group_1__121368);
+            pushFollow(FOLLOW_2);
             rule__XExpressionInClosure__Group_1__1__Impl();
 
             state._fsp--;
@@ -31031,22 +31031,22 @@ public final void rule__XExpressionInClosure__Group_1__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10448:1: rule__XExpressionInClosure__Group_1__1__Impl : ( ( ';' )? ) ;
+    // InternalCheckCfg.g:10448:1: rule__XExpressionInClosure__Group_1__1__Impl : ( ( ';' )? ) ;
     public final void rule__XExpressionInClosure__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10452:1: ( ( ( ';' )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10453:1: ( ( ';' )? )
+            // InternalCheckCfg.g:10452:1: ( ( ( ';' )? ) )
+            // InternalCheckCfg.g:10453:1: ( ( ';' )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10453:1: ( ( ';' )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10454:1: ( ';' )?
+            // InternalCheckCfg.g:10453:1: ( ( ';' )? )
+            // InternalCheckCfg.g:10454:1: ( ';' )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionInClosureAccess().getSemicolonKeyword_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10455:1: ( ';' )?
+            // InternalCheckCfg.g:10455:1: ( ';' )?
             int alt83=2;
             int LA83_0 = input.LA(1);
 
@@ -31055,9 +31055,9 @@ public final void rule__XExpressionInClosure__Group_1__1__Impl() throws Recognit
             }
             switch (alt83) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10456:2: ';'
+                    // InternalCheckCfg.g:10456:2: ';'
                     {
-                    match(input,70,FOLLOW_70_in_rule__XExpressionInClosure__Group_1__1__Impl21397); if (state.failed) return ;
+                    match(input,70,FOLLOW_2); if (state.failed) return ;
 
                     }
                     break;
@@ -31089,21 +31089,21 @@ public final void rule__XExpressionInClosure__Group_1__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XShortClosure__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10471:1: rule__XShortClosure__Group__0 : rule__XShortClosure__Group__0__Impl rule__XShortClosure__Group__1 ;
+    // InternalCheckCfg.g:10471:1: rule__XShortClosure__Group__0 : rule__XShortClosure__Group__0__Impl rule__XShortClosure__Group__1 ;
     public final void rule__XShortClosure__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10475:1: ( rule__XShortClosure__Group__0__Impl rule__XShortClosure__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10476:2: rule__XShortClosure__Group__0__Impl rule__XShortClosure__Group__1
+            // InternalCheckCfg.g:10475:1: ( rule__XShortClosure__Group__0__Impl rule__XShortClosure__Group__1 )
+            // InternalCheckCfg.g:10476:2: rule__XShortClosure__Group__0__Impl rule__XShortClosure__Group__1
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group__0__Impl_in_rule__XShortClosure__Group__021434);
+            pushFollow(FOLLOW_61);
             rule__XShortClosure__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XShortClosure__Group__1_in_rule__XShortClosure__Group__021437);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__Group__1();
 
             state._fsp--;
@@ -31127,25 +31127,25 @@ public final void rule__XShortClosure__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XShortClosure__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10483:1: rule__XShortClosure__Group__0__Impl : ( ( rule__XShortClosure__Group_0__0 ) ) ;
+    // InternalCheckCfg.g:10483:1: rule__XShortClosure__Group__0__Impl : ( ( rule__XShortClosure__Group_0__0 ) ) ;
     public final void rule__XShortClosure__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10487:1: ( ( ( rule__XShortClosure__Group_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10488:1: ( ( rule__XShortClosure__Group_0__0 ) )
+            // InternalCheckCfg.g:10487:1: ( ( ( rule__XShortClosure__Group_0__0 ) ) )
+            // InternalCheckCfg.g:10488:1: ( ( rule__XShortClosure__Group_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10488:1: ( ( rule__XShortClosure__Group_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10489:1: ( rule__XShortClosure__Group_0__0 )
+            // InternalCheckCfg.g:10488:1: ( ( rule__XShortClosure__Group_0__0 ) )
+            // InternalCheckCfg.g:10489:1: ( rule__XShortClosure__Group_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getGroup_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10490:1: ( rule__XShortClosure__Group_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10490:2: rule__XShortClosure__Group_0__0
+            // InternalCheckCfg.g:10490:1: ( rule__XShortClosure__Group_0__0 )
+            // InternalCheckCfg.g:10490:2: rule__XShortClosure__Group_0__0
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0__0_in_rule__XShortClosure__Group__0__Impl21464);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__Group_0__0();
 
             state._fsp--;
@@ -31178,16 +31178,16 @@ public final void rule__XShortClosure__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XShortClosure__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10500:1: rule__XShortClosure__Group__1 : rule__XShortClosure__Group__1__Impl ;
+    // InternalCheckCfg.g:10500:1: rule__XShortClosure__Group__1 : rule__XShortClosure__Group__1__Impl ;
     public final void rule__XShortClosure__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10504:1: ( rule__XShortClosure__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10505:2: rule__XShortClosure__Group__1__Impl
+            // InternalCheckCfg.g:10504:1: ( rule__XShortClosure__Group__1__Impl )
+            // InternalCheckCfg.g:10505:2: rule__XShortClosure__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group__1__Impl_in_rule__XShortClosure__Group__121494);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__Group__1__Impl();
 
             state._fsp--;
@@ -31211,25 +31211,25 @@ public final void rule__XShortClosure__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XShortClosure__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10511:1: rule__XShortClosure__Group__1__Impl : ( ( rule__XShortClosure__ExpressionAssignment_1 ) ) ;
+    // InternalCheckCfg.g:10511:1: rule__XShortClosure__Group__1__Impl : ( ( rule__XShortClosure__ExpressionAssignment_1 ) ) ;
     public final void rule__XShortClosure__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10515:1: ( ( ( rule__XShortClosure__ExpressionAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10516:1: ( ( rule__XShortClosure__ExpressionAssignment_1 ) )
+            // InternalCheckCfg.g:10515:1: ( ( ( rule__XShortClosure__ExpressionAssignment_1 ) ) )
+            // InternalCheckCfg.g:10516:1: ( ( rule__XShortClosure__ExpressionAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10516:1: ( ( rule__XShortClosure__ExpressionAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10517:1: ( rule__XShortClosure__ExpressionAssignment_1 )
+            // InternalCheckCfg.g:10516:1: ( ( rule__XShortClosure__ExpressionAssignment_1 ) )
+            // InternalCheckCfg.g:10517:1: ( rule__XShortClosure__ExpressionAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getExpressionAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10518:1: ( rule__XShortClosure__ExpressionAssignment_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10518:2: rule__XShortClosure__ExpressionAssignment_1
+            // InternalCheckCfg.g:10518:1: ( rule__XShortClosure__ExpressionAssignment_1 )
+            // InternalCheckCfg.g:10518:2: rule__XShortClosure__ExpressionAssignment_1
             {
-            pushFollow(FOLLOW_rule__XShortClosure__ExpressionAssignment_1_in_rule__XShortClosure__Group__1__Impl21521);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__ExpressionAssignment_1();
 
             state._fsp--;
@@ -31262,16 +31262,16 @@ public final void rule__XShortClosure__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XShortClosure__Group_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10532:1: rule__XShortClosure__Group_0__0 : rule__XShortClosure__Group_0__0__Impl ;
+    // InternalCheckCfg.g:10532:1: rule__XShortClosure__Group_0__0 : rule__XShortClosure__Group_0__0__Impl ;
     public final void rule__XShortClosure__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10536:1: ( rule__XShortClosure__Group_0__0__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10537:2: rule__XShortClosure__Group_0__0__Impl
+            // InternalCheckCfg.g:10536:1: ( rule__XShortClosure__Group_0__0__Impl )
+            // InternalCheckCfg.g:10537:2: rule__XShortClosure__Group_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0__0__Impl_in_rule__XShortClosure__Group_0__021555);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__Group_0__0__Impl();
 
             state._fsp--;
@@ -31295,25 +31295,25 @@ public final void rule__XShortClosure__Group_0__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XShortClosure__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10543:1: rule__XShortClosure__Group_0__0__Impl : ( ( rule__XShortClosure__Group_0_0__0 ) ) ;
+    // InternalCheckCfg.g:10543:1: rule__XShortClosure__Group_0__0__Impl : ( ( rule__XShortClosure__Group_0_0__0 ) ) ;
     public final void rule__XShortClosure__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10547:1: ( ( ( rule__XShortClosure__Group_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10548:1: ( ( rule__XShortClosure__Group_0_0__0 ) )
+            // InternalCheckCfg.g:10547:1: ( ( ( rule__XShortClosure__Group_0_0__0 ) ) )
+            // InternalCheckCfg.g:10548:1: ( ( rule__XShortClosure__Group_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10548:1: ( ( rule__XShortClosure__Group_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10549:1: ( rule__XShortClosure__Group_0_0__0 )
+            // InternalCheckCfg.g:10548:1: ( ( rule__XShortClosure__Group_0_0__0 ) )
+            // InternalCheckCfg.g:10549:1: ( rule__XShortClosure__Group_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getGroup_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10550:1: ( rule__XShortClosure__Group_0_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10550:2: rule__XShortClosure__Group_0_0__0
+            // InternalCheckCfg.g:10550:1: ( rule__XShortClosure__Group_0_0__0 )
+            // InternalCheckCfg.g:10550:2: rule__XShortClosure__Group_0_0__0
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0__0_in_rule__XShortClosure__Group_0__0__Impl21582);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__Group_0_0__0();
 
             state._fsp--;
@@ -31346,21 +31346,21 @@ public final void rule__XShortClosure__Group_0__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10562:1: rule__XShortClosure__Group_0_0__0 : rule__XShortClosure__Group_0_0__0__Impl rule__XShortClosure__Group_0_0__1 ;
+    // InternalCheckCfg.g:10562:1: rule__XShortClosure__Group_0_0__0 : rule__XShortClosure__Group_0_0__0__Impl rule__XShortClosure__Group_0_0__1 ;
     public final void rule__XShortClosure__Group_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10566:1: ( rule__XShortClosure__Group_0_0__0__Impl rule__XShortClosure__Group_0_0__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10567:2: rule__XShortClosure__Group_0_0__0__Impl rule__XShortClosure__Group_0_0__1
+            // InternalCheckCfg.g:10566:1: ( rule__XShortClosure__Group_0_0__0__Impl rule__XShortClosure__Group_0_0__1 )
+            // InternalCheckCfg.g:10567:2: rule__XShortClosure__Group_0_0__0__Impl rule__XShortClosure__Group_0_0__1
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0__0__Impl_in_rule__XShortClosure__Group_0_0__021614);
+            pushFollow(FOLLOW_67);
             rule__XShortClosure__Group_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0__1_in_rule__XShortClosure__Group_0_0__021617);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__Group_0_0__1();
 
             state._fsp--;
@@ -31384,23 +31384,23 @@ public final void rule__XShortClosure__Group_0_0__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10574:1: rule__XShortClosure__Group_0_0__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:10574:1: rule__XShortClosure__Group_0_0__0__Impl : ( () ) ;
     public final void rule__XShortClosure__Group_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10578:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10579:1: ( () )
+            // InternalCheckCfg.g:10578:1: ( ( () ) )
+            // InternalCheckCfg.g:10579:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10579:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10580:1: ()
+            // InternalCheckCfg.g:10579:1: ( () )
+            // InternalCheckCfg.g:10580:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getXClosureAction_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10581:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10583:1: 
+            // InternalCheckCfg.g:10581:1: ()
+            // InternalCheckCfg.g:10583:1: 
             {
             }
 
@@ -31425,21 +31425,21 @@ public final void rule__XShortClosure__Group_0_0__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10593:1: rule__XShortClosure__Group_0_0__1 : rule__XShortClosure__Group_0_0__1__Impl rule__XShortClosure__Group_0_0__2 ;
+    // InternalCheckCfg.g:10593:1: rule__XShortClosure__Group_0_0__1 : rule__XShortClosure__Group_0_0__1__Impl rule__XShortClosure__Group_0_0__2 ;
     public final void rule__XShortClosure__Group_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10597:1: ( rule__XShortClosure__Group_0_0__1__Impl rule__XShortClosure__Group_0_0__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10598:2: rule__XShortClosure__Group_0_0__1__Impl rule__XShortClosure__Group_0_0__2
+            // InternalCheckCfg.g:10597:1: ( rule__XShortClosure__Group_0_0__1__Impl rule__XShortClosure__Group_0_0__2 )
+            // InternalCheckCfg.g:10598:2: rule__XShortClosure__Group_0_0__1__Impl rule__XShortClosure__Group_0_0__2
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0__1__Impl_in_rule__XShortClosure__Group_0_0__121675);
+            pushFollow(FOLLOW_67);
             rule__XShortClosure__Group_0_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0__2_in_rule__XShortClosure__Group_0_0__121678);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__Group_0_0__2();
 
             state._fsp--;
@@ -31463,22 +31463,22 @@ public final void rule__XShortClosure__Group_0_0__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10605:1: rule__XShortClosure__Group_0_0__1__Impl : ( ( rule__XShortClosure__Group_0_0_1__0 )? ) ;
+    // InternalCheckCfg.g:10605:1: rule__XShortClosure__Group_0_0__1__Impl : ( ( rule__XShortClosure__Group_0_0_1__0 )? ) ;
     public final void rule__XShortClosure__Group_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10609:1: ( ( ( rule__XShortClosure__Group_0_0_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10610:1: ( ( rule__XShortClosure__Group_0_0_1__0 )? )
+            // InternalCheckCfg.g:10609:1: ( ( ( rule__XShortClosure__Group_0_0_1__0 )? ) )
+            // InternalCheckCfg.g:10610:1: ( ( rule__XShortClosure__Group_0_0_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10610:1: ( ( rule__XShortClosure__Group_0_0_1__0 )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10611:1: ( rule__XShortClosure__Group_0_0_1__0 )?
+            // InternalCheckCfg.g:10610:1: ( ( rule__XShortClosure__Group_0_0_1__0 )? )
+            // InternalCheckCfg.g:10611:1: ( rule__XShortClosure__Group_0_0_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getGroup_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10612:1: ( rule__XShortClosure__Group_0_0_1__0 )?
+            // InternalCheckCfg.g:10612:1: ( rule__XShortClosure__Group_0_0_1__0 )?
             int alt84=2;
             int LA84_0 = input.LA(1);
 
@@ -31487,9 +31487,9 @@ public final void rule__XShortClosure__Group_0_0__1__Impl() throws RecognitionEx
             }
             switch (alt84) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10612:2: rule__XShortClosure__Group_0_0_1__0
+                    // InternalCheckCfg.g:10612:2: rule__XShortClosure__Group_0_0_1__0
                     {
-                    pushFollow(FOLLOW_rule__XShortClosure__Group_0_0_1__0_in_rule__XShortClosure__Group_0_0__1__Impl21705);
+                    pushFollow(FOLLOW_2);
                     rule__XShortClosure__Group_0_0_1__0();
 
                     state._fsp--;
@@ -31525,16 +31525,16 @@ public final void rule__XShortClosure__Group_0_0__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10622:1: rule__XShortClosure__Group_0_0__2 : rule__XShortClosure__Group_0_0__2__Impl ;
+    // InternalCheckCfg.g:10622:1: rule__XShortClosure__Group_0_0__2 : rule__XShortClosure__Group_0_0__2__Impl ;
     public final void rule__XShortClosure__Group_0_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10626:1: ( rule__XShortClosure__Group_0_0__2__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10627:2: rule__XShortClosure__Group_0_0__2__Impl
+            // InternalCheckCfg.g:10626:1: ( rule__XShortClosure__Group_0_0__2__Impl )
+            // InternalCheckCfg.g:10627:2: rule__XShortClosure__Group_0_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0__2__Impl_in_rule__XShortClosure__Group_0_0__221736);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__Group_0_0__2__Impl();
 
             state._fsp--;
@@ -31558,25 +31558,25 @@ public final void rule__XShortClosure__Group_0_0__2() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10633:1: rule__XShortClosure__Group_0_0__2__Impl : ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) ) ;
+    // InternalCheckCfg.g:10633:1: rule__XShortClosure__Group_0_0__2__Impl : ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) ) ;
     public final void rule__XShortClosure__Group_0_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10637:1: ( ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10638:1: ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) )
+            // InternalCheckCfg.g:10637:1: ( ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) ) )
+            // InternalCheckCfg.g:10638:1: ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10638:1: ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10639:1: ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 )
+            // InternalCheckCfg.g:10638:1: ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) )
+            // InternalCheckCfg.g:10639:1: ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getExplicitSyntaxAssignment_0_0_2()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10640:1: ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10640:2: rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2
+            // InternalCheckCfg.g:10640:1: ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 )
+            // InternalCheckCfg.g:10640:2: rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2
             {
-            pushFollow(FOLLOW_rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2_in_rule__XShortClosure__Group_0_0__2__Impl21763);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2();
 
             state._fsp--;
@@ -31609,21 +31609,21 @@ public final void rule__XShortClosure__Group_0_0__2__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10656:1: rule__XShortClosure__Group_0_0_1__0 : rule__XShortClosure__Group_0_0_1__0__Impl rule__XShortClosure__Group_0_0_1__1 ;
+    // InternalCheckCfg.g:10656:1: rule__XShortClosure__Group_0_0_1__0 : rule__XShortClosure__Group_0_0_1__0__Impl rule__XShortClosure__Group_0_0_1__1 ;
     public final void rule__XShortClosure__Group_0_0_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10660:1: ( rule__XShortClosure__Group_0_0_1__0__Impl rule__XShortClosure__Group_0_0_1__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10661:2: rule__XShortClosure__Group_0_0_1__0__Impl rule__XShortClosure__Group_0_0_1__1
+            // InternalCheckCfg.g:10660:1: ( rule__XShortClosure__Group_0_0_1__0__Impl rule__XShortClosure__Group_0_0_1__1 )
+            // InternalCheckCfg.g:10661:2: rule__XShortClosure__Group_0_0_1__0__Impl rule__XShortClosure__Group_0_0_1__1
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0_1__0__Impl_in_rule__XShortClosure__Group_0_0_1__021799);
+            pushFollow(FOLLOW_25);
             rule__XShortClosure__Group_0_0_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0_1__1_in_rule__XShortClosure__Group_0_0_1__021802);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__Group_0_0_1__1();
 
             state._fsp--;
@@ -31647,25 +31647,25 @@ public final void rule__XShortClosure__Group_0_0_1__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10668:1: rule__XShortClosure__Group_0_0_1__0__Impl : ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) ) ;
+    // InternalCheckCfg.g:10668:1: rule__XShortClosure__Group_0_0_1__0__Impl : ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) ) ;
     public final void rule__XShortClosure__Group_0_0_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10672:1: ( ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10673:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) )
+            // InternalCheckCfg.g:10672:1: ( ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) ) )
+            // InternalCheckCfg.g:10673:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10673:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10674:1: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 )
+            // InternalCheckCfg.g:10673:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) )
+            // InternalCheckCfg.g:10674:1: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getDeclaredFormalParametersAssignment_0_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10675:1: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10675:2: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0
+            // InternalCheckCfg.g:10675:1: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 )
+            // InternalCheckCfg.g:10675:2: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0
             {
-            pushFollow(FOLLOW_rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0_in_rule__XShortClosure__Group_0_0_1__0__Impl21829);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0();
 
             state._fsp--;
@@ -31698,16 +31698,16 @@ public final void rule__XShortClosure__Group_0_0_1__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10685:1: rule__XShortClosure__Group_0_0_1__1 : rule__XShortClosure__Group_0_0_1__1__Impl ;
+    // InternalCheckCfg.g:10685:1: rule__XShortClosure__Group_0_0_1__1 : rule__XShortClosure__Group_0_0_1__1__Impl ;
     public final void rule__XShortClosure__Group_0_0_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10689:1: ( rule__XShortClosure__Group_0_0_1__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10690:2: rule__XShortClosure__Group_0_0_1__1__Impl
+            // InternalCheckCfg.g:10689:1: ( rule__XShortClosure__Group_0_0_1__1__Impl )
+            // InternalCheckCfg.g:10690:2: rule__XShortClosure__Group_0_0_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0_1__1__Impl_in_rule__XShortClosure__Group_0_0_1__121859);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__Group_0_0_1__1__Impl();
 
             state._fsp--;
@@ -31731,22 +31731,22 @@ public final void rule__XShortClosure__Group_0_0_1__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10696:1: rule__XShortClosure__Group_0_0_1__1__Impl : ( ( rule__XShortClosure__Group_0_0_1_1__0 )* ) ;
+    // InternalCheckCfg.g:10696:1: rule__XShortClosure__Group_0_0_1__1__Impl : ( ( rule__XShortClosure__Group_0_0_1_1__0 )* ) ;
     public final void rule__XShortClosure__Group_0_0_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10700:1: ( ( ( rule__XShortClosure__Group_0_0_1_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10701:1: ( ( rule__XShortClosure__Group_0_0_1_1__0 )* )
+            // InternalCheckCfg.g:10700:1: ( ( ( rule__XShortClosure__Group_0_0_1_1__0 )* ) )
+            // InternalCheckCfg.g:10701:1: ( ( rule__XShortClosure__Group_0_0_1_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10701:1: ( ( rule__XShortClosure__Group_0_0_1_1__0 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10702:1: ( rule__XShortClosure__Group_0_0_1_1__0 )*
+            // InternalCheckCfg.g:10701:1: ( ( rule__XShortClosure__Group_0_0_1_1__0 )* )
+            // InternalCheckCfg.g:10702:1: ( rule__XShortClosure__Group_0_0_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getGroup_0_0_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10703:1: ( rule__XShortClosure__Group_0_0_1_1__0 )*
+            // InternalCheckCfg.g:10703:1: ( rule__XShortClosure__Group_0_0_1_1__0 )*
             loop85:
             do {
                 int alt85=2;
@@ -31759,9 +31759,9 @@ public final void rule__XShortClosure__Group_0_0_1__1__Impl() throws Recognition
 
                 switch (alt85) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10703:2: rule__XShortClosure__Group_0_0_1_1__0
+            	    // InternalCheckCfg.g:10703:2: rule__XShortClosure__Group_0_0_1_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XShortClosure__Group_0_0_1_1__0_in_rule__XShortClosure__Group_0_0_1__1__Impl21886);
+            	    pushFollow(FOLLOW_18);
             	    rule__XShortClosure__Group_0_0_1_1__0();
 
             	    state._fsp--;
@@ -31800,21 +31800,21 @@ public final void rule__XShortClosure__Group_0_0_1__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1_1__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10717:1: rule__XShortClosure__Group_0_0_1_1__0 : rule__XShortClosure__Group_0_0_1_1__0__Impl rule__XShortClosure__Group_0_0_1_1__1 ;
+    // InternalCheckCfg.g:10717:1: rule__XShortClosure__Group_0_0_1_1__0 : rule__XShortClosure__Group_0_0_1_1__0__Impl rule__XShortClosure__Group_0_0_1_1__1 ;
     public final void rule__XShortClosure__Group_0_0_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10721:1: ( rule__XShortClosure__Group_0_0_1_1__0__Impl rule__XShortClosure__Group_0_0_1_1__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10722:2: rule__XShortClosure__Group_0_0_1_1__0__Impl rule__XShortClosure__Group_0_0_1_1__1
+            // InternalCheckCfg.g:10721:1: ( rule__XShortClosure__Group_0_0_1_1__0__Impl rule__XShortClosure__Group_0_0_1_1__1 )
+            // InternalCheckCfg.g:10722:2: rule__XShortClosure__Group_0_0_1_1__0__Impl rule__XShortClosure__Group_0_0_1_1__1
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0_1_1__0__Impl_in_rule__XShortClosure__Group_0_0_1_1__021921);
+            pushFollow(FOLLOW_39);
             rule__XShortClosure__Group_0_0_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0_1_1__1_in_rule__XShortClosure__Group_0_0_1_1__021924);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__Group_0_0_1_1__1();
 
             state._fsp--;
@@ -31838,22 +31838,22 @@ public final void rule__XShortClosure__Group_0_0_1_1__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10729:1: rule__XShortClosure__Group_0_0_1_1__0__Impl : ( ',' ) ;
+    // InternalCheckCfg.g:10729:1: rule__XShortClosure__Group_0_0_1_1__0__Impl : ( ',' ) ;
     public final void rule__XShortClosure__Group_0_0_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10733:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10734:1: ( ',' )
+            // InternalCheckCfg.g:10733:1: ( ( ',' ) )
+            // InternalCheckCfg.g:10734:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10734:1: ( ',' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10735:1: ','
+            // InternalCheckCfg.g:10734:1: ( ',' )
+            // InternalCheckCfg.g:10735:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getCommaKeyword_0_0_1_1_0()); 
             }
-            match(input,64,FOLLOW_64_in_rule__XShortClosure__Group_0_0_1_1__0__Impl21952); if (state.failed) return ;
+            match(input,64,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXShortClosureAccess().getCommaKeyword_0_0_1_1_0()); 
             }
@@ -31879,16 +31879,16 @@ public final void rule__XShortClosure__Group_0_0_1_1__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1_1__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10748:1: rule__XShortClosure__Group_0_0_1_1__1 : rule__XShortClosure__Group_0_0_1_1__1__Impl ;
+    // InternalCheckCfg.g:10748:1: rule__XShortClosure__Group_0_0_1_1__1 : rule__XShortClosure__Group_0_0_1_1__1__Impl ;
     public final void rule__XShortClosure__Group_0_0_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10752:1: ( rule__XShortClosure__Group_0_0_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10753:2: rule__XShortClosure__Group_0_0_1_1__1__Impl
+            // InternalCheckCfg.g:10752:1: ( rule__XShortClosure__Group_0_0_1_1__1__Impl )
+            // InternalCheckCfg.g:10753:2: rule__XShortClosure__Group_0_0_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0_1_1__1__Impl_in_rule__XShortClosure__Group_0_0_1_1__121983);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__Group_0_0_1_1__1__Impl();
 
             state._fsp--;
@@ -31912,25 +31912,25 @@ public final void rule__XShortClosure__Group_0_0_1_1__1() throws RecognitionExce
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10759:1: rule__XShortClosure__Group_0_0_1_1__1__Impl : ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) ) ;
+    // InternalCheckCfg.g:10759:1: rule__XShortClosure__Group_0_0_1_1__1__Impl : ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) ) ;
     public final void rule__XShortClosure__Group_0_0_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10763:1: ( ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10764:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) )
+            // InternalCheckCfg.g:10763:1: ( ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) ) )
+            // InternalCheckCfg.g:10764:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10764:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10765:1: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 )
+            // InternalCheckCfg.g:10764:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) )
+            // InternalCheckCfg.g:10765:1: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getDeclaredFormalParametersAssignment_0_0_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10766:1: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10766:2: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1
+            // InternalCheckCfg.g:10766:1: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 )
+            // InternalCheckCfg.g:10766:2: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1
             {
-            pushFollow(FOLLOW_rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1_in_rule__XShortClosure__Group_0_0_1_1__1__Impl22010);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1();
 
             state._fsp--;
@@ -31963,21 +31963,21 @@ public final void rule__XShortClosure__Group_0_0_1_1__1__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XParenthesizedExpression__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10780:1: rule__XParenthesizedExpression__Group__0 : rule__XParenthesizedExpression__Group__0__Impl rule__XParenthesizedExpression__Group__1 ;
+    // InternalCheckCfg.g:10780:1: rule__XParenthesizedExpression__Group__0 : rule__XParenthesizedExpression__Group__0__Impl rule__XParenthesizedExpression__Group__1 ;
     public final void rule__XParenthesizedExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10784:1: ( rule__XParenthesizedExpression__Group__0__Impl rule__XParenthesizedExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10785:2: rule__XParenthesizedExpression__Group__0__Impl rule__XParenthesizedExpression__Group__1
+            // InternalCheckCfg.g:10784:1: ( rule__XParenthesizedExpression__Group__0__Impl rule__XParenthesizedExpression__Group__1 )
+            // InternalCheckCfg.g:10785:2: rule__XParenthesizedExpression__Group__0__Impl rule__XParenthesizedExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XParenthesizedExpression__Group__0__Impl_in_rule__XParenthesizedExpression__Group__022044);
+            pushFollow(FOLLOW_61);
             rule__XParenthesizedExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XParenthesizedExpression__Group__1_in_rule__XParenthesizedExpression__Group__022047);
+            pushFollow(FOLLOW_2);
             rule__XParenthesizedExpression__Group__1();
 
             state._fsp--;
@@ -32001,22 +32001,22 @@ public final void rule__XParenthesizedExpression__Group__0() throws RecognitionE
 
 
     // $ANTLR start "rule__XParenthesizedExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10792:1: rule__XParenthesizedExpression__Group__0__Impl : ( '(' ) ;
+    // InternalCheckCfg.g:10792:1: rule__XParenthesizedExpression__Group__0__Impl : ( '(' ) ;
     public final void rule__XParenthesizedExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10796:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10797:1: ( '(' )
+            // InternalCheckCfg.g:10796:1: ( ( '(' ) )
+            // InternalCheckCfg.g:10797:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10797:1: ( '(' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10798:1: '('
+            // InternalCheckCfg.g:10797:1: ( '(' )
+            // InternalCheckCfg.g:10798:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXParenthesizedExpressionAccess().getLeftParenthesisKeyword_0()); 
             }
-            match(input,62,FOLLOW_62_in_rule__XParenthesizedExpression__Group__0__Impl22075); if (state.failed) return ;
+            match(input,62,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXParenthesizedExpressionAccess().getLeftParenthesisKeyword_0()); 
             }
@@ -32042,21 +32042,21 @@ public final void rule__XParenthesizedExpression__Group__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XParenthesizedExpression__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10811:1: rule__XParenthesizedExpression__Group__1 : rule__XParenthesizedExpression__Group__1__Impl rule__XParenthesizedExpression__Group__2 ;
+    // InternalCheckCfg.g:10811:1: rule__XParenthesizedExpression__Group__1 : rule__XParenthesizedExpression__Group__1__Impl rule__XParenthesizedExpression__Group__2 ;
     public final void rule__XParenthesizedExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10815:1: ( rule__XParenthesizedExpression__Group__1__Impl rule__XParenthesizedExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10816:2: rule__XParenthesizedExpression__Group__1__Impl rule__XParenthesizedExpression__Group__2
+            // InternalCheckCfg.g:10815:1: ( rule__XParenthesizedExpression__Group__1__Impl rule__XParenthesizedExpression__Group__2 )
+            // InternalCheckCfg.g:10816:2: rule__XParenthesizedExpression__Group__1__Impl rule__XParenthesizedExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XParenthesizedExpression__Group__1__Impl_in_rule__XParenthesizedExpression__Group__122106);
+            pushFollow(FOLLOW_70);
             rule__XParenthesizedExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XParenthesizedExpression__Group__2_in_rule__XParenthesizedExpression__Group__122109);
+            pushFollow(FOLLOW_2);
             rule__XParenthesizedExpression__Group__2();
 
             state._fsp--;
@@ -32080,22 +32080,22 @@ public final void rule__XParenthesizedExpression__Group__1() throws RecognitionE
 
 
     // $ANTLR start "rule__XParenthesizedExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10823:1: rule__XParenthesizedExpression__Group__1__Impl : ( ruleXExpression ) ;
+    // InternalCheckCfg.g:10823:1: rule__XParenthesizedExpression__Group__1__Impl : ( ruleXExpression ) ;
     public final void rule__XParenthesizedExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10827:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10828:1: ( ruleXExpression )
+            // InternalCheckCfg.g:10827:1: ( ( ruleXExpression ) )
+            // InternalCheckCfg.g:10828:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10828:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10829:1: ruleXExpression
+            // InternalCheckCfg.g:10828:1: ( ruleXExpression )
+            // InternalCheckCfg.g:10829:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXParenthesizedExpressionAccess().getXExpressionParserRuleCall_1()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XParenthesizedExpression__Group__1__Impl22136);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -32125,16 +32125,16 @@ public final void rule__XParenthesizedExpression__Group__1__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XParenthesizedExpression__Group__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10840:1: rule__XParenthesizedExpression__Group__2 : rule__XParenthesizedExpression__Group__2__Impl ;
+    // InternalCheckCfg.g:10840:1: rule__XParenthesizedExpression__Group__2 : rule__XParenthesizedExpression__Group__2__Impl ;
     public final void rule__XParenthesizedExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10844:1: ( rule__XParenthesizedExpression__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10845:2: rule__XParenthesizedExpression__Group__2__Impl
+            // InternalCheckCfg.g:10844:1: ( rule__XParenthesizedExpression__Group__2__Impl )
+            // InternalCheckCfg.g:10845:2: rule__XParenthesizedExpression__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__XParenthesizedExpression__Group__2__Impl_in_rule__XParenthesizedExpression__Group__222165);
+            pushFollow(FOLLOW_2);
             rule__XParenthesizedExpression__Group__2__Impl();
 
             state._fsp--;
@@ -32158,22 +32158,22 @@ public final void rule__XParenthesizedExpression__Group__2() throws RecognitionE
 
 
     // $ANTLR start "rule__XParenthesizedExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10851:1: rule__XParenthesizedExpression__Group__2__Impl : ( ')' ) ;
+    // InternalCheckCfg.g:10851:1: rule__XParenthesizedExpression__Group__2__Impl : ( ')' ) ;
     public final void rule__XParenthesizedExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10855:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10856:1: ( ')' )
+            // InternalCheckCfg.g:10855:1: ( ( ')' ) )
+            // InternalCheckCfg.g:10856:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10856:1: ( ')' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10857:1: ')'
+            // InternalCheckCfg.g:10856:1: ( ')' )
+            // InternalCheckCfg.g:10857:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXParenthesizedExpressionAccess().getRightParenthesisKeyword_2()); 
             }
-            match(input,63,FOLLOW_63_in_rule__XParenthesizedExpression__Group__2__Impl22193); if (state.failed) return ;
+            match(input,63,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXParenthesizedExpressionAccess().getRightParenthesisKeyword_2()); 
             }
@@ -32199,21 +32199,21 @@ public final void rule__XParenthesizedExpression__Group__2__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XIfExpression__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10876:1: rule__XIfExpression__Group__0 : rule__XIfExpression__Group__0__Impl rule__XIfExpression__Group__1 ;
+    // InternalCheckCfg.g:10876:1: rule__XIfExpression__Group__0 : rule__XIfExpression__Group__0__Impl rule__XIfExpression__Group__1 ;
     public final void rule__XIfExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10880:1: ( rule__XIfExpression__Group__0__Impl rule__XIfExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10881:2: rule__XIfExpression__Group__0__Impl rule__XIfExpression__Group__1
+            // InternalCheckCfg.g:10880:1: ( rule__XIfExpression__Group__0__Impl rule__XIfExpression__Group__1 )
+            // InternalCheckCfg.g:10881:2: rule__XIfExpression__Group__0__Impl rule__XIfExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XIfExpression__Group__0__Impl_in_rule__XIfExpression__Group__022230);
+            pushFollow(FOLLOW_71);
             rule__XIfExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIfExpression__Group__1_in_rule__XIfExpression__Group__022233);
+            pushFollow(FOLLOW_2);
             rule__XIfExpression__Group__1();
 
             state._fsp--;
@@ -32237,23 +32237,23 @@ public final void rule__XIfExpression__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XIfExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10888:1: rule__XIfExpression__Group__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:10888:1: rule__XIfExpression__Group__0__Impl : ( () ) ;
     public final void rule__XIfExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10892:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10893:1: ( () )
+            // InternalCheckCfg.g:10892:1: ( ( () ) )
+            // InternalCheckCfg.g:10893:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10893:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10894:1: ()
+            // InternalCheckCfg.g:10893:1: ( () )
+            // InternalCheckCfg.g:10894:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getXIfExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10895:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10897:1: 
+            // InternalCheckCfg.g:10895:1: ()
+            // InternalCheckCfg.g:10897:1: 
             {
             }
 
@@ -32278,21 +32278,21 @@ public final void rule__XIfExpression__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XIfExpression__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10907:1: rule__XIfExpression__Group__1 : rule__XIfExpression__Group__1__Impl rule__XIfExpression__Group__2 ;
+    // InternalCheckCfg.g:10907:1: rule__XIfExpression__Group__1 : rule__XIfExpression__Group__1__Impl rule__XIfExpression__Group__2 ;
     public final void rule__XIfExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10911:1: ( rule__XIfExpression__Group__1__Impl rule__XIfExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10912:2: rule__XIfExpression__Group__1__Impl rule__XIfExpression__Group__2
+            // InternalCheckCfg.g:10911:1: ( rule__XIfExpression__Group__1__Impl rule__XIfExpression__Group__2 )
+            // InternalCheckCfg.g:10912:2: rule__XIfExpression__Group__1__Impl rule__XIfExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XIfExpression__Group__1__Impl_in_rule__XIfExpression__Group__122291);
+            pushFollow(FOLLOW_16);
             rule__XIfExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIfExpression__Group__2_in_rule__XIfExpression__Group__122294);
+            pushFollow(FOLLOW_2);
             rule__XIfExpression__Group__2();
 
             state._fsp--;
@@ -32316,22 +32316,22 @@ public final void rule__XIfExpression__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XIfExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10919:1: rule__XIfExpression__Group__1__Impl : ( 'if' ) ;
+    // InternalCheckCfg.g:10919:1: rule__XIfExpression__Group__1__Impl : ( 'if' ) ;
     public final void rule__XIfExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10923:1: ( ( 'if' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10924:1: ( 'if' )
+            // InternalCheckCfg.g:10923:1: ( ( 'if' ) )
+            // InternalCheckCfg.g:10924:1: ( 'if' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10924:1: ( 'if' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10925:1: 'if'
+            // InternalCheckCfg.g:10924:1: ( 'if' )
+            // InternalCheckCfg.g:10925:1: 'if'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getIfKeyword_1()); 
             }
-            match(input,71,FOLLOW_71_in_rule__XIfExpression__Group__1__Impl22322); if (state.failed) return ;
+            match(input,71,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXIfExpressionAccess().getIfKeyword_1()); 
             }
@@ -32357,21 +32357,21 @@ public final void rule__XIfExpression__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XIfExpression__Group__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10938:1: rule__XIfExpression__Group__2 : rule__XIfExpression__Group__2__Impl rule__XIfExpression__Group__3 ;
+    // InternalCheckCfg.g:10938:1: rule__XIfExpression__Group__2 : rule__XIfExpression__Group__2__Impl rule__XIfExpression__Group__3 ;
     public final void rule__XIfExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10942:1: ( rule__XIfExpression__Group__2__Impl rule__XIfExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10943:2: rule__XIfExpression__Group__2__Impl rule__XIfExpression__Group__3
+            // InternalCheckCfg.g:10942:1: ( rule__XIfExpression__Group__2__Impl rule__XIfExpression__Group__3 )
+            // InternalCheckCfg.g:10943:2: rule__XIfExpression__Group__2__Impl rule__XIfExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__XIfExpression__Group__2__Impl_in_rule__XIfExpression__Group__222353);
+            pushFollow(FOLLOW_61);
             rule__XIfExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIfExpression__Group__3_in_rule__XIfExpression__Group__222356);
+            pushFollow(FOLLOW_2);
             rule__XIfExpression__Group__3();
 
             state._fsp--;
@@ -32395,22 +32395,22 @@ public final void rule__XIfExpression__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XIfExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10950:1: rule__XIfExpression__Group__2__Impl : ( '(' ) ;
+    // InternalCheckCfg.g:10950:1: rule__XIfExpression__Group__2__Impl : ( '(' ) ;
     public final void rule__XIfExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10954:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10955:1: ( '(' )
+            // InternalCheckCfg.g:10954:1: ( ( '(' ) )
+            // InternalCheckCfg.g:10955:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10955:1: ( '(' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10956:1: '('
+            // InternalCheckCfg.g:10955:1: ( '(' )
+            // InternalCheckCfg.g:10956:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getLeftParenthesisKeyword_2()); 
             }
-            match(input,62,FOLLOW_62_in_rule__XIfExpression__Group__2__Impl22384); if (state.failed) return ;
+            match(input,62,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXIfExpressionAccess().getLeftParenthesisKeyword_2()); 
             }
@@ -32436,21 +32436,21 @@ public final void rule__XIfExpression__Group__2__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XIfExpression__Group__3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10969:1: rule__XIfExpression__Group__3 : rule__XIfExpression__Group__3__Impl rule__XIfExpression__Group__4 ;
+    // InternalCheckCfg.g:10969:1: rule__XIfExpression__Group__3 : rule__XIfExpression__Group__3__Impl rule__XIfExpression__Group__4 ;
     public final void rule__XIfExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10973:1: ( rule__XIfExpression__Group__3__Impl rule__XIfExpression__Group__4 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10974:2: rule__XIfExpression__Group__3__Impl rule__XIfExpression__Group__4
+            // InternalCheckCfg.g:10973:1: ( rule__XIfExpression__Group__3__Impl rule__XIfExpression__Group__4 )
+            // InternalCheckCfg.g:10974:2: rule__XIfExpression__Group__3__Impl rule__XIfExpression__Group__4
             {
-            pushFollow(FOLLOW_rule__XIfExpression__Group__3__Impl_in_rule__XIfExpression__Group__322415);
+            pushFollow(FOLLOW_70);
             rule__XIfExpression__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIfExpression__Group__4_in_rule__XIfExpression__Group__322418);
+            pushFollow(FOLLOW_2);
             rule__XIfExpression__Group__4();
 
             state._fsp--;
@@ -32474,25 +32474,25 @@ public final void rule__XIfExpression__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XIfExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10981:1: rule__XIfExpression__Group__3__Impl : ( ( rule__XIfExpression__IfAssignment_3 ) ) ;
+    // InternalCheckCfg.g:10981:1: rule__XIfExpression__Group__3__Impl : ( ( rule__XIfExpression__IfAssignment_3 ) ) ;
     public final void rule__XIfExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10985:1: ( ( ( rule__XIfExpression__IfAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10986:1: ( ( rule__XIfExpression__IfAssignment_3 ) )
+            // InternalCheckCfg.g:10985:1: ( ( ( rule__XIfExpression__IfAssignment_3 ) ) )
+            // InternalCheckCfg.g:10986:1: ( ( rule__XIfExpression__IfAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10986:1: ( ( rule__XIfExpression__IfAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10987:1: ( rule__XIfExpression__IfAssignment_3 )
+            // InternalCheckCfg.g:10986:1: ( ( rule__XIfExpression__IfAssignment_3 ) )
+            // InternalCheckCfg.g:10987:1: ( rule__XIfExpression__IfAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getIfAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10988:1: ( rule__XIfExpression__IfAssignment_3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10988:2: rule__XIfExpression__IfAssignment_3
+            // InternalCheckCfg.g:10988:1: ( rule__XIfExpression__IfAssignment_3 )
+            // InternalCheckCfg.g:10988:2: rule__XIfExpression__IfAssignment_3
             {
-            pushFollow(FOLLOW_rule__XIfExpression__IfAssignment_3_in_rule__XIfExpression__Group__3__Impl22445);
+            pushFollow(FOLLOW_2);
             rule__XIfExpression__IfAssignment_3();
 
             state._fsp--;
@@ -32525,21 +32525,21 @@ public final void rule__XIfExpression__Group__3__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XIfExpression__Group__4"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:10998:1: rule__XIfExpression__Group__4 : rule__XIfExpression__Group__4__Impl rule__XIfExpression__Group__5 ;
+    // InternalCheckCfg.g:10998:1: rule__XIfExpression__Group__4 : rule__XIfExpression__Group__4__Impl rule__XIfExpression__Group__5 ;
     public final void rule__XIfExpression__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11002:1: ( rule__XIfExpression__Group__4__Impl rule__XIfExpression__Group__5 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11003:2: rule__XIfExpression__Group__4__Impl rule__XIfExpression__Group__5
+            // InternalCheckCfg.g:11002:1: ( rule__XIfExpression__Group__4__Impl rule__XIfExpression__Group__5 )
+            // InternalCheckCfg.g:11003:2: rule__XIfExpression__Group__4__Impl rule__XIfExpression__Group__5
             {
-            pushFollow(FOLLOW_rule__XIfExpression__Group__4__Impl_in_rule__XIfExpression__Group__422475);
+            pushFollow(FOLLOW_61);
             rule__XIfExpression__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIfExpression__Group__5_in_rule__XIfExpression__Group__422478);
+            pushFollow(FOLLOW_2);
             rule__XIfExpression__Group__5();
 
             state._fsp--;
@@ -32563,22 +32563,22 @@ public final void rule__XIfExpression__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__XIfExpression__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11010:1: rule__XIfExpression__Group__4__Impl : ( ')' ) ;
+    // InternalCheckCfg.g:11010:1: rule__XIfExpression__Group__4__Impl : ( ')' ) ;
     public final void rule__XIfExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11014:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11015:1: ( ')' )
+            // InternalCheckCfg.g:11014:1: ( ( ')' ) )
+            // InternalCheckCfg.g:11015:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11015:1: ( ')' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11016:1: ')'
+            // InternalCheckCfg.g:11015:1: ( ')' )
+            // InternalCheckCfg.g:11016:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getRightParenthesisKeyword_4()); 
             }
-            match(input,63,FOLLOW_63_in_rule__XIfExpression__Group__4__Impl22506); if (state.failed) return ;
+            match(input,63,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXIfExpressionAccess().getRightParenthesisKeyword_4()); 
             }
@@ -32604,21 +32604,21 @@ public final void rule__XIfExpression__Group__4__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XIfExpression__Group__5"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11029:1: rule__XIfExpression__Group__5 : rule__XIfExpression__Group__5__Impl rule__XIfExpression__Group__6 ;
+    // InternalCheckCfg.g:11029:1: rule__XIfExpression__Group__5 : rule__XIfExpression__Group__5__Impl rule__XIfExpression__Group__6 ;
     public final void rule__XIfExpression__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11033:1: ( rule__XIfExpression__Group__5__Impl rule__XIfExpression__Group__6 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11034:2: rule__XIfExpression__Group__5__Impl rule__XIfExpression__Group__6
+            // InternalCheckCfg.g:11033:1: ( rule__XIfExpression__Group__5__Impl rule__XIfExpression__Group__6 )
+            // InternalCheckCfg.g:11034:2: rule__XIfExpression__Group__5__Impl rule__XIfExpression__Group__6
             {
-            pushFollow(FOLLOW_rule__XIfExpression__Group__5__Impl_in_rule__XIfExpression__Group__522537);
+            pushFollow(FOLLOW_72);
             rule__XIfExpression__Group__5__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIfExpression__Group__6_in_rule__XIfExpression__Group__522540);
+            pushFollow(FOLLOW_2);
             rule__XIfExpression__Group__6();
 
             state._fsp--;
@@ -32642,25 +32642,25 @@ public final void rule__XIfExpression__Group__5() throws RecognitionException {
 
 
     // $ANTLR start "rule__XIfExpression__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11041:1: rule__XIfExpression__Group__5__Impl : ( ( rule__XIfExpression__ThenAssignment_5 ) ) ;
+    // InternalCheckCfg.g:11041:1: rule__XIfExpression__Group__5__Impl : ( ( rule__XIfExpression__ThenAssignment_5 ) ) ;
     public final void rule__XIfExpression__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11045:1: ( ( ( rule__XIfExpression__ThenAssignment_5 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11046:1: ( ( rule__XIfExpression__ThenAssignment_5 ) )
+            // InternalCheckCfg.g:11045:1: ( ( ( rule__XIfExpression__ThenAssignment_5 ) ) )
+            // InternalCheckCfg.g:11046:1: ( ( rule__XIfExpression__ThenAssignment_5 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11046:1: ( ( rule__XIfExpression__ThenAssignment_5 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11047:1: ( rule__XIfExpression__ThenAssignment_5 )
+            // InternalCheckCfg.g:11046:1: ( ( rule__XIfExpression__ThenAssignment_5 ) )
+            // InternalCheckCfg.g:11047:1: ( rule__XIfExpression__ThenAssignment_5 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getThenAssignment_5()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11048:1: ( rule__XIfExpression__ThenAssignment_5 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11048:2: rule__XIfExpression__ThenAssignment_5
+            // InternalCheckCfg.g:11048:1: ( rule__XIfExpression__ThenAssignment_5 )
+            // InternalCheckCfg.g:11048:2: rule__XIfExpression__ThenAssignment_5
             {
-            pushFollow(FOLLOW_rule__XIfExpression__ThenAssignment_5_in_rule__XIfExpression__Group__5__Impl22567);
+            pushFollow(FOLLOW_2);
             rule__XIfExpression__ThenAssignment_5();
 
             state._fsp--;
@@ -32693,16 +32693,16 @@ public final void rule__XIfExpression__Group__5__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XIfExpression__Group__6"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11058:1: rule__XIfExpression__Group__6 : rule__XIfExpression__Group__6__Impl ;
+    // InternalCheckCfg.g:11058:1: rule__XIfExpression__Group__6 : rule__XIfExpression__Group__6__Impl ;
     public final void rule__XIfExpression__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11062:1: ( rule__XIfExpression__Group__6__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11063:2: rule__XIfExpression__Group__6__Impl
+            // InternalCheckCfg.g:11062:1: ( rule__XIfExpression__Group__6__Impl )
+            // InternalCheckCfg.g:11063:2: rule__XIfExpression__Group__6__Impl
             {
-            pushFollow(FOLLOW_rule__XIfExpression__Group__6__Impl_in_rule__XIfExpression__Group__622597);
+            pushFollow(FOLLOW_2);
             rule__XIfExpression__Group__6__Impl();
 
             state._fsp--;
@@ -32726,22 +32726,22 @@ public final void rule__XIfExpression__Group__6() throws RecognitionException {
 
 
     // $ANTLR start "rule__XIfExpression__Group__6__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11069:1: rule__XIfExpression__Group__6__Impl : ( ( rule__XIfExpression__Group_6__0 )? ) ;
+    // InternalCheckCfg.g:11069:1: rule__XIfExpression__Group__6__Impl : ( ( rule__XIfExpression__Group_6__0 )? ) ;
     public final void rule__XIfExpression__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11073:1: ( ( ( rule__XIfExpression__Group_6__0 )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11074:1: ( ( rule__XIfExpression__Group_6__0 )? )
+            // InternalCheckCfg.g:11073:1: ( ( ( rule__XIfExpression__Group_6__0 )? ) )
+            // InternalCheckCfg.g:11074:1: ( ( rule__XIfExpression__Group_6__0 )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11074:1: ( ( rule__XIfExpression__Group_6__0 )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11075:1: ( rule__XIfExpression__Group_6__0 )?
+            // InternalCheckCfg.g:11074:1: ( ( rule__XIfExpression__Group_6__0 )? )
+            // InternalCheckCfg.g:11075:1: ( rule__XIfExpression__Group_6__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getGroup_6()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11076:1: ( rule__XIfExpression__Group_6__0 )?
+            // InternalCheckCfg.g:11076:1: ( rule__XIfExpression__Group_6__0 )?
             int alt86=2;
             int LA86_0 = input.LA(1);
 
@@ -32754,9 +32754,9 @@ public final void rule__XIfExpression__Group__6__Impl() throws RecognitionExcept
             }
             switch (alt86) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11076:2: rule__XIfExpression__Group_6__0
+                    // InternalCheckCfg.g:11076:2: rule__XIfExpression__Group_6__0
                     {
-                    pushFollow(FOLLOW_rule__XIfExpression__Group_6__0_in_rule__XIfExpression__Group__6__Impl22624);
+                    pushFollow(FOLLOW_2);
                     rule__XIfExpression__Group_6__0();
 
                     state._fsp--;
@@ -32792,21 +32792,21 @@ public final void rule__XIfExpression__Group__6__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XIfExpression__Group_6__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11100:1: rule__XIfExpression__Group_6__0 : rule__XIfExpression__Group_6__0__Impl rule__XIfExpression__Group_6__1 ;
+    // InternalCheckCfg.g:11100:1: rule__XIfExpression__Group_6__0 : rule__XIfExpression__Group_6__0__Impl rule__XIfExpression__Group_6__1 ;
     public final void rule__XIfExpression__Group_6__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11104:1: ( rule__XIfExpression__Group_6__0__Impl rule__XIfExpression__Group_6__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11105:2: rule__XIfExpression__Group_6__0__Impl rule__XIfExpression__Group_6__1
+            // InternalCheckCfg.g:11104:1: ( rule__XIfExpression__Group_6__0__Impl rule__XIfExpression__Group_6__1 )
+            // InternalCheckCfg.g:11105:2: rule__XIfExpression__Group_6__0__Impl rule__XIfExpression__Group_6__1
             {
-            pushFollow(FOLLOW_rule__XIfExpression__Group_6__0__Impl_in_rule__XIfExpression__Group_6__022669);
+            pushFollow(FOLLOW_61);
             rule__XIfExpression__Group_6__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIfExpression__Group_6__1_in_rule__XIfExpression__Group_6__022672);
+            pushFollow(FOLLOW_2);
             rule__XIfExpression__Group_6__1();
 
             state._fsp--;
@@ -32830,25 +32830,25 @@ public final void rule__XIfExpression__Group_6__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XIfExpression__Group_6__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11112:1: rule__XIfExpression__Group_6__0__Impl : ( ( 'else' ) ) ;
+    // InternalCheckCfg.g:11112:1: rule__XIfExpression__Group_6__0__Impl : ( ( 'else' ) ) ;
     public final void rule__XIfExpression__Group_6__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11116:1: ( ( ( 'else' ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11117:1: ( ( 'else' ) )
+            // InternalCheckCfg.g:11116:1: ( ( ( 'else' ) ) )
+            // InternalCheckCfg.g:11117:1: ( ( 'else' ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11117:1: ( ( 'else' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11118:1: ( 'else' )
+            // InternalCheckCfg.g:11117:1: ( ( 'else' ) )
+            // InternalCheckCfg.g:11118:1: ( 'else' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getElseKeyword_6_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11119:1: ( 'else' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11120:2: 'else'
+            // InternalCheckCfg.g:11119:1: ( 'else' )
+            // InternalCheckCfg.g:11120:2: 'else'
             {
-            match(input,72,FOLLOW_72_in_rule__XIfExpression__Group_6__0__Impl22701); if (state.failed) return ;
+            match(input,72,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -32877,16 +32877,16 @@ public final void rule__XIfExpression__Group_6__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XIfExpression__Group_6__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11131:1: rule__XIfExpression__Group_6__1 : rule__XIfExpression__Group_6__1__Impl ;
+    // InternalCheckCfg.g:11131:1: rule__XIfExpression__Group_6__1 : rule__XIfExpression__Group_6__1__Impl ;
     public final void rule__XIfExpression__Group_6__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11135:1: ( rule__XIfExpression__Group_6__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11136:2: rule__XIfExpression__Group_6__1__Impl
+            // InternalCheckCfg.g:11135:1: ( rule__XIfExpression__Group_6__1__Impl )
+            // InternalCheckCfg.g:11136:2: rule__XIfExpression__Group_6__1__Impl
             {
-            pushFollow(FOLLOW_rule__XIfExpression__Group_6__1__Impl_in_rule__XIfExpression__Group_6__122733);
+            pushFollow(FOLLOW_2);
             rule__XIfExpression__Group_6__1__Impl();
 
             state._fsp--;
@@ -32910,25 +32910,25 @@ public final void rule__XIfExpression__Group_6__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XIfExpression__Group_6__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11142:1: rule__XIfExpression__Group_6__1__Impl : ( ( rule__XIfExpression__ElseAssignment_6_1 ) ) ;
+    // InternalCheckCfg.g:11142:1: rule__XIfExpression__Group_6__1__Impl : ( ( rule__XIfExpression__ElseAssignment_6_1 ) ) ;
     public final void rule__XIfExpression__Group_6__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11146:1: ( ( ( rule__XIfExpression__ElseAssignment_6_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11147:1: ( ( rule__XIfExpression__ElseAssignment_6_1 ) )
+            // InternalCheckCfg.g:11146:1: ( ( ( rule__XIfExpression__ElseAssignment_6_1 ) ) )
+            // InternalCheckCfg.g:11147:1: ( ( rule__XIfExpression__ElseAssignment_6_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11147:1: ( ( rule__XIfExpression__ElseAssignment_6_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11148:1: ( rule__XIfExpression__ElseAssignment_6_1 )
+            // InternalCheckCfg.g:11147:1: ( ( rule__XIfExpression__ElseAssignment_6_1 ) )
+            // InternalCheckCfg.g:11148:1: ( rule__XIfExpression__ElseAssignment_6_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getElseAssignment_6_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11149:1: ( rule__XIfExpression__ElseAssignment_6_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11149:2: rule__XIfExpression__ElseAssignment_6_1
+            // InternalCheckCfg.g:11149:1: ( rule__XIfExpression__ElseAssignment_6_1 )
+            // InternalCheckCfg.g:11149:2: rule__XIfExpression__ElseAssignment_6_1
             {
-            pushFollow(FOLLOW_rule__XIfExpression__ElseAssignment_6_1_in_rule__XIfExpression__Group_6__1__Impl22760);
+            pushFollow(FOLLOW_2);
             rule__XIfExpression__ElseAssignment_6_1();
 
             state._fsp--;
@@ -32961,21 +32961,21 @@ public final void rule__XIfExpression__Group_6__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11163:1: rule__XSwitchExpression__Group__0 : rule__XSwitchExpression__Group__0__Impl rule__XSwitchExpression__Group__1 ;
+    // InternalCheckCfg.g:11163:1: rule__XSwitchExpression__Group__0 : rule__XSwitchExpression__Group__0__Impl rule__XSwitchExpression__Group__1 ;
     public final void rule__XSwitchExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11167:1: ( rule__XSwitchExpression__Group__0__Impl rule__XSwitchExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11168:2: rule__XSwitchExpression__Group__0__Impl rule__XSwitchExpression__Group__1
+            // InternalCheckCfg.g:11167:1: ( rule__XSwitchExpression__Group__0__Impl rule__XSwitchExpression__Group__1 )
+            // InternalCheckCfg.g:11168:2: rule__XSwitchExpression__Group__0__Impl rule__XSwitchExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__0__Impl_in_rule__XSwitchExpression__Group__022794);
+            pushFollow(FOLLOW_73);
             rule__XSwitchExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__1_in_rule__XSwitchExpression__Group__022797);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group__1();
 
             state._fsp--;
@@ -32999,23 +32999,23 @@ public final void rule__XSwitchExpression__Group__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11175:1: rule__XSwitchExpression__Group__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:11175:1: rule__XSwitchExpression__Group__0__Impl : ( () ) ;
     public final void rule__XSwitchExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11179:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11180:1: ( () )
+            // InternalCheckCfg.g:11179:1: ( ( () ) )
+            // InternalCheckCfg.g:11180:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11180:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11181:1: ()
+            // InternalCheckCfg.g:11180:1: ( () )
+            // InternalCheckCfg.g:11181:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getXSwitchExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11182:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11184:1: 
+            // InternalCheckCfg.g:11182:1: ()
+            // InternalCheckCfg.g:11184:1: 
             {
             }
 
@@ -33040,21 +33040,21 @@ public final void rule__XSwitchExpression__Group__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11194:1: rule__XSwitchExpression__Group__1 : rule__XSwitchExpression__Group__1__Impl rule__XSwitchExpression__Group__2 ;
+    // InternalCheckCfg.g:11194:1: rule__XSwitchExpression__Group__1 : rule__XSwitchExpression__Group__1__Impl rule__XSwitchExpression__Group__2 ;
     public final void rule__XSwitchExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11198:1: ( rule__XSwitchExpression__Group__1__Impl rule__XSwitchExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11199:2: rule__XSwitchExpression__Group__1__Impl rule__XSwitchExpression__Group__2
+            // InternalCheckCfg.g:11198:1: ( rule__XSwitchExpression__Group__1__Impl rule__XSwitchExpression__Group__2 )
+            // InternalCheckCfg.g:11199:2: rule__XSwitchExpression__Group__1__Impl rule__XSwitchExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__1__Impl_in_rule__XSwitchExpression__Group__122855);
+            pushFollow(FOLLOW_61);
             rule__XSwitchExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__2_in_rule__XSwitchExpression__Group__122858);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group__2();
 
             state._fsp--;
@@ -33078,22 +33078,22 @@ public final void rule__XSwitchExpression__Group__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11206:1: rule__XSwitchExpression__Group__1__Impl : ( 'switch' ) ;
+    // InternalCheckCfg.g:11206:1: rule__XSwitchExpression__Group__1__Impl : ( 'switch' ) ;
     public final void rule__XSwitchExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11210:1: ( ( 'switch' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11211:1: ( 'switch' )
+            // InternalCheckCfg.g:11210:1: ( ( 'switch' ) )
+            // InternalCheckCfg.g:11211:1: ( 'switch' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11211:1: ( 'switch' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11212:1: 'switch'
+            // InternalCheckCfg.g:11211:1: ( 'switch' )
+            // InternalCheckCfg.g:11212:1: 'switch'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getSwitchKeyword_1()); 
             }
-            match(input,73,FOLLOW_73_in_rule__XSwitchExpression__Group__1__Impl22886); if (state.failed) return ;
+            match(input,73,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getSwitchKeyword_1()); 
             }
@@ -33119,21 +33119,21 @@ public final void rule__XSwitchExpression__Group__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11225:1: rule__XSwitchExpression__Group__2 : rule__XSwitchExpression__Group__2__Impl rule__XSwitchExpression__Group__3 ;
+    // InternalCheckCfg.g:11225:1: rule__XSwitchExpression__Group__2 : rule__XSwitchExpression__Group__2__Impl rule__XSwitchExpression__Group__3 ;
     public final void rule__XSwitchExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11229:1: ( rule__XSwitchExpression__Group__2__Impl rule__XSwitchExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11230:2: rule__XSwitchExpression__Group__2__Impl rule__XSwitchExpression__Group__3
+            // InternalCheckCfg.g:11229:1: ( rule__XSwitchExpression__Group__2__Impl rule__XSwitchExpression__Group__3 )
+            // InternalCheckCfg.g:11230:2: rule__XSwitchExpression__Group__2__Impl rule__XSwitchExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__2__Impl_in_rule__XSwitchExpression__Group__222917);
+            pushFollow(FOLLOW_10);
             rule__XSwitchExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__3_in_rule__XSwitchExpression__Group__222920);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group__3();
 
             state._fsp--;
@@ -33157,25 +33157,25 @@ public final void rule__XSwitchExpression__Group__2() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11237:1: rule__XSwitchExpression__Group__2__Impl : ( ( rule__XSwitchExpression__Alternatives_2 ) ) ;
+    // InternalCheckCfg.g:11237:1: rule__XSwitchExpression__Group__2__Impl : ( ( rule__XSwitchExpression__Alternatives_2 ) ) ;
     public final void rule__XSwitchExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11241:1: ( ( ( rule__XSwitchExpression__Alternatives_2 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11242:1: ( ( rule__XSwitchExpression__Alternatives_2 ) )
+            // InternalCheckCfg.g:11241:1: ( ( ( rule__XSwitchExpression__Alternatives_2 ) ) )
+            // InternalCheckCfg.g:11242:1: ( ( rule__XSwitchExpression__Alternatives_2 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11242:1: ( ( rule__XSwitchExpression__Alternatives_2 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11243:1: ( rule__XSwitchExpression__Alternatives_2 )
+            // InternalCheckCfg.g:11242:1: ( ( rule__XSwitchExpression__Alternatives_2 ) )
+            // InternalCheckCfg.g:11243:1: ( rule__XSwitchExpression__Alternatives_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getAlternatives_2()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11244:1: ( rule__XSwitchExpression__Alternatives_2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11244:2: rule__XSwitchExpression__Alternatives_2
+            // InternalCheckCfg.g:11244:1: ( rule__XSwitchExpression__Alternatives_2 )
+            // InternalCheckCfg.g:11244:2: rule__XSwitchExpression__Alternatives_2
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Alternatives_2_in_rule__XSwitchExpression__Group__2__Impl22947);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Alternatives_2();
 
             state._fsp--;
@@ -33208,21 +33208,21 @@ public final void rule__XSwitchExpression__Group__2__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11254:1: rule__XSwitchExpression__Group__3 : rule__XSwitchExpression__Group__3__Impl rule__XSwitchExpression__Group__4 ;
+    // InternalCheckCfg.g:11254:1: rule__XSwitchExpression__Group__3 : rule__XSwitchExpression__Group__3__Impl rule__XSwitchExpression__Group__4 ;
     public final void rule__XSwitchExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11258:1: ( rule__XSwitchExpression__Group__3__Impl rule__XSwitchExpression__Group__4 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11259:2: rule__XSwitchExpression__Group__3__Impl rule__XSwitchExpression__Group__4
+            // InternalCheckCfg.g:11258:1: ( rule__XSwitchExpression__Group__3__Impl rule__XSwitchExpression__Group__4 )
+            // InternalCheckCfg.g:11259:2: rule__XSwitchExpression__Group__3__Impl rule__XSwitchExpression__Group__4
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__3__Impl_in_rule__XSwitchExpression__Group__322977);
+            pushFollow(FOLLOW_74);
             rule__XSwitchExpression__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__4_in_rule__XSwitchExpression__Group__322980);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group__4();
 
             state._fsp--;
@@ -33246,22 +33246,22 @@ public final void rule__XSwitchExpression__Group__3() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11266:1: rule__XSwitchExpression__Group__3__Impl : ( '{' ) ;
+    // InternalCheckCfg.g:11266:1: rule__XSwitchExpression__Group__3__Impl : ( '{' ) ;
     public final void rule__XSwitchExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11270:1: ( ( '{' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11271:1: ( '{' )
+            // InternalCheckCfg.g:11270:1: ( ( '{' ) )
+            // InternalCheckCfg.g:11271:1: ( '{' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11271:1: ( '{' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11272:1: '{'
+            // InternalCheckCfg.g:11271:1: ( '{' )
+            // InternalCheckCfg.g:11272:1: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getLeftCurlyBracketKeyword_3()); 
             }
-            match(input,58,FOLLOW_58_in_rule__XSwitchExpression__Group__3__Impl23008); if (state.failed) return ;
+            match(input,58,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getLeftCurlyBracketKeyword_3()); 
             }
@@ -33287,21 +33287,21 @@ public final void rule__XSwitchExpression__Group__3__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__4"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11285:1: rule__XSwitchExpression__Group__4 : rule__XSwitchExpression__Group__4__Impl rule__XSwitchExpression__Group__5 ;
+    // InternalCheckCfg.g:11285:1: rule__XSwitchExpression__Group__4 : rule__XSwitchExpression__Group__4__Impl rule__XSwitchExpression__Group__5 ;
     public final void rule__XSwitchExpression__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11289:1: ( rule__XSwitchExpression__Group__4__Impl rule__XSwitchExpression__Group__5 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11290:2: rule__XSwitchExpression__Group__4__Impl rule__XSwitchExpression__Group__5
+            // InternalCheckCfg.g:11289:1: ( rule__XSwitchExpression__Group__4__Impl rule__XSwitchExpression__Group__5 )
+            // InternalCheckCfg.g:11290:2: rule__XSwitchExpression__Group__4__Impl rule__XSwitchExpression__Group__5
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__4__Impl_in_rule__XSwitchExpression__Group__423039);
+            pushFollow(FOLLOW_74);
             rule__XSwitchExpression__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__5_in_rule__XSwitchExpression__Group__423042);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group__5();
 
             state._fsp--;
@@ -33325,22 +33325,22 @@ public final void rule__XSwitchExpression__Group__4() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11297:1: rule__XSwitchExpression__Group__4__Impl : ( ( rule__XSwitchExpression__CasesAssignment_4 )* ) ;
+    // InternalCheckCfg.g:11297:1: rule__XSwitchExpression__Group__4__Impl : ( ( rule__XSwitchExpression__CasesAssignment_4 )* ) ;
     public final void rule__XSwitchExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11301:1: ( ( ( rule__XSwitchExpression__CasesAssignment_4 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11302:1: ( ( rule__XSwitchExpression__CasesAssignment_4 )* )
+            // InternalCheckCfg.g:11301:1: ( ( ( rule__XSwitchExpression__CasesAssignment_4 )* ) )
+            // InternalCheckCfg.g:11302:1: ( ( rule__XSwitchExpression__CasesAssignment_4 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11302:1: ( ( rule__XSwitchExpression__CasesAssignment_4 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11303:1: ( rule__XSwitchExpression__CasesAssignment_4 )*
+            // InternalCheckCfg.g:11302:1: ( ( rule__XSwitchExpression__CasesAssignment_4 )* )
+            // InternalCheckCfg.g:11303:1: ( rule__XSwitchExpression__CasesAssignment_4 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getCasesAssignment_4()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11304:1: ( rule__XSwitchExpression__CasesAssignment_4 )*
+            // InternalCheckCfg.g:11304:1: ( rule__XSwitchExpression__CasesAssignment_4 )*
             loop87:
             do {
                 int alt87=2;
@@ -33353,9 +33353,9 @@ public final void rule__XSwitchExpression__Group__4__Impl() throws RecognitionEx
 
                 switch (alt87) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11304:2: rule__XSwitchExpression__CasesAssignment_4
+            	    // InternalCheckCfg.g:11304:2: rule__XSwitchExpression__CasesAssignment_4
             	    {
-            	    pushFollow(FOLLOW_rule__XSwitchExpression__CasesAssignment_4_in_rule__XSwitchExpression__Group__4__Impl23069);
+            	    pushFollow(FOLLOW_75);
             	    rule__XSwitchExpression__CasesAssignment_4();
 
             	    state._fsp--;
@@ -33394,21 +33394,21 @@ public final void rule__XSwitchExpression__Group__4__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__5"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11314:1: rule__XSwitchExpression__Group__5 : rule__XSwitchExpression__Group__5__Impl rule__XSwitchExpression__Group__6 ;
+    // InternalCheckCfg.g:11314:1: rule__XSwitchExpression__Group__5 : rule__XSwitchExpression__Group__5__Impl rule__XSwitchExpression__Group__6 ;
     public final void rule__XSwitchExpression__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11318:1: ( rule__XSwitchExpression__Group__5__Impl rule__XSwitchExpression__Group__6 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11319:2: rule__XSwitchExpression__Group__5__Impl rule__XSwitchExpression__Group__6
+            // InternalCheckCfg.g:11318:1: ( rule__XSwitchExpression__Group__5__Impl rule__XSwitchExpression__Group__6 )
+            // InternalCheckCfg.g:11319:2: rule__XSwitchExpression__Group__5__Impl rule__XSwitchExpression__Group__6
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__5__Impl_in_rule__XSwitchExpression__Group__523100);
+            pushFollow(FOLLOW_74);
             rule__XSwitchExpression__Group__5__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__6_in_rule__XSwitchExpression__Group__523103);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group__6();
 
             state._fsp--;
@@ -33432,22 +33432,22 @@ public final void rule__XSwitchExpression__Group__5() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11326:1: rule__XSwitchExpression__Group__5__Impl : ( ( rule__XSwitchExpression__Group_5__0 )? ) ;
+    // InternalCheckCfg.g:11326:1: rule__XSwitchExpression__Group__5__Impl : ( ( rule__XSwitchExpression__Group_5__0 )? ) ;
     public final void rule__XSwitchExpression__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11330:1: ( ( ( rule__XSwitchExpression__Group_5__0 )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11331:1: ( ( rule__XSwitchExpression__Group_5__0 )? )
+            // InternalCheckCfg.g:11330:1: ( ( ( rule__XSwitchExpression__Group_5__0 )? ) )
+            // InternalCheckCfg.g:11331:1: ( ( rule__XSwitchExpression__Group_5__0 )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11331:1: ( ( rule__XSwitchExpression__Group_5__0 )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11332:1: ( rule__XSwitchExpression__Group_5__0 )?
+            // InternalCheckCfg.g:11331:1: ( ( rule__XSwitchExpression__Group_5__0 )? )
+            // InternalCheckCfg.g:11332:1: ( rule__XSwitchExpression__Group_5__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getGroup_5()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11333:1: ( rule__XSwitchExpression__Group_5__0 )?
+            // InternalCheckCfg.g:11333:1: ( rule__XSwitchExpression__Group_5__0 )?
             int alt88=2;
             int LA88_0 = input.LA(1);
 
@@ -33456,9 +33456,9 @@ public final void rule__XSwitchExpression__Group__5__Impl() throws RecognitionEx
             }
             switch (alt88) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11333:2: rule__XSwitchExpression__Group_5__0
+                    // InternalCheckCfg.g:11333:2: rule__XSwitchExpression__Group_5__0
                     {
-                    pushFollow(FOLLOW_rule__XSwitchExpression__Group_5__0_in_rule__XSwitchExpression__Group__5__Impl23130);
+                    pushFollow(FOLLOW_2);
                     rule__XSwitchExpression__Group_5__0();
 
                     state._fsp--;
@@ -33494,16 +33494,16 @@ public final void rule__XSwitchExpression__Group__5__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__6"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11343:1: rule__XSwitchExpression__Group__6 : rule__XSwitchExpression__Group__6__Impl ;
+    // InternalCheckCfg.g:11343:1: rule__XSwitchExpression__Group__6 : rule__XSwitchExpression__Group__6__Impl ;
     public final void rule__XSwitchExpression__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11347:1: ( rule__XSwitchExpression__Group__6__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11348:2: rule__XSwitchExpression__Group__6__Impl
+            // InternalCheckCfg.g:11347:1: ( rule__XSwitchExpression__Group__6__Impl )
+            // InternalCheckCfg.g:11348:2: rule__XSwitchExpression__Group__6__Impl
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__6__Impl_in_rule__XSwitchExpression__Group__623161);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group__6__Impl();
 
             state._fsp--;
@@ -33527,22 +33527,22 @@ public final void rule__XSwitchExpression__Group__6() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__6__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11354:1: rule__XSwitchExpression__Group__6__Impl : ( '}' ) ;
+    // InternalCheckCfg.g:11354:1: rule__XSwitchExpression__Group__6__Impl : ( '}' ) ;
     public final void rule__XSwitchExpression__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11358:1: ( ( '}' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11359:1: ( '}' )
+            // InternalCheckCfg.g:11358:1: ( ( '}' ) )
+            // InternalCheckCfg.g:11359:1: ( '}' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11359:1: ( '}' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11360:1: '}'
+            // InternalCheckCfg.g:11359:1: ( '}' )
+            // InternalCheckCfg.g:11360:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getRightCurlyBracketKeyword_6()); 
             }
-            match(input,59,FOLLOW_59_in_rule__XSwitchExpression__Group__6__Impl23189); if (state.failed) return ;
+            match(input,59,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getRightCurlyBracketKeyword_6()); 
             }
@@ -33568,21 +33568,21 @@ public final void rule__XSwitchExpression__Group__6__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11387:1: rule__XSwitchExpression__Group_2_0__0 : rule__XSwitchExpression__Group_2_0__0__Impl rule__XSwitchExpression__Group_2_0__1 ;
+    // InternalCheckCfg.g:11387:1: rule__XSwitchExpression__Group_2_0__0 : rule__XSwitchExpression__Group_2_0__0__Impl rule__XSwitchExpression__Group_2_0__1 ;
     public final void rule__XSwitchExpression__Group_2_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11391:1: ( rule__XSwitchExpression__Group_2_0__0__Impl rule__XSwitchExpression__Group_2_0__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11392:2: rule__XSwitchExpression__Group_2_0__0__Impl rule__XSwitchExpression__Group_2_0__1
+            // InternalCheckCfg.g:11391:1: ( rule__XSwitchExpression__Group_2_0__0__Impl rule__XSwitchExpression__Group_2_0__1 )
+            // InternalCheckCfg.g:11392:2: rule__XSwitchExpression__Group_2_0__0__Impl rule__XSwitchExpression__Group_2_0__1
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0__0__Impl_in_rule__XSwitchExpression__Group_2_0__023234);
+            pushFollow(FOLLOW_61);
             rule__XSwitchExpression__Group_2_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0__1_in_rule__XSwitchExpression__Group_2_0__023237);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_0__1();
 
             state._fsp--;
@@ -33606,25 +33606,25 @@ public final void rule__XSwitchExpression__Group_2_0__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11399:1: rule__XSwitchExpression__Group_2_0__0__Impl : ( ( rule__XSwitchExpression__Group_2_0_0__0 ) ) ;
+    // InternalCheckCfg.g:11399:1: rule__XSwitchExpression__Group_2_0__0__Impl : ( ( rule__XSwitchExpression__Group_2_0_0__0 ) ) ;
     public final void rule__XSwitchExpression__Group_2_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11403:1: ( ( ( rule__XSwitchExpression__Group_2_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11404:1: ( ( rule__XSwitchExpression__Group_2_0_0__0 ) )
+            // InternalCheckCfg.g:11403:1: ( ( ( rule__XSwitchExpression__Group_2_0_0__0 ) ) )
+            // InternalCheckCfg.g:11404:1: ( ( rule__XSwitchExpression__Group_2_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11404:1: ( ( rule__XSwitchExpression__Group_2_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11405:1: ( rule__XSwitchExpression__Group_2_0_0__0 )
+            // InternalCheckCfg.g:11404:1: ( ( rule__XSwitchExpression__Group_2_0_0__0 ) )
+            // InternalCheckCfg.g:11405:1: ( rule__XSwitchExpression__Group_2_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getGroup_2_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11406:1: ( rule__XSwitchExpression__Group_2_0_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11406:2: rule__XSwitchExpression__Group_2_0_0__0
+            // InternalCheckCfg.g:11406:1: ( rule__XSwitchExpression__Group_2_0_0__0 )
+            // InternalCheckCfg.g:11406:2: rule__XSwitchExpression__Group_2_0_0__0
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0_0__0_in_rule__XSwitchExpression__Group_2_0__0__Impl23264);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_0_0__0();
 
             state._fsp--;
@@ -33657,21 +33657,21 @@ public final void rule__XSwitchExpression__Group_2_0__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11416:1: rule__XSwitchExpression__Group_2_0__1 : rule__XSwitchExpression__Group_2_0__1__Impl rule__XSwitchExpression__Group_2_0__2 ;
+    // InternalCheckCfg.g:11416:1: rule__XSwitchExpression__Group_2_0__1 : rule__XSwitchExpression__Group_2_0__1__Impl rule__XSwitchExpression__Group_2_0__2 ;
     public final void rule__XSwitchExpression__Group_2_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11420:1: ( rule__XSwitchExpression__Group_2_0__1__Impl rule__XSwitchExpression__Group_2_0__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11421:2: rule__XSwitchExpression__Group_2_0__1__Impl rule__XSwitchExpression__Group_2_0__2
+            // InternalCheckCfg.g:11420:1: ( rule__XSwitchExpression__Group_2_0__1__Impl rule__XSwitchExpression__Group_2_0__2 )
+            // InternalCheckCfg.g:11421:2: rule__XSwitchExpression__Group_2_0__1__Impl rule__XSwitchExpression__Group_2_0__2
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0__1__Impl_in_rule__XSwitchExpression__Group_2_0__123294);
+            pushFollow(FOLLOW_70);
             rule__XSwitchExpression__Group_2_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0__2_in_rule__XSwitchExpression__Group_2_0__123297);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_0__2();
 
             state._fsp--;
@@ -33695,25 +33695,25 @@ public final void rule__XSwitchExpression__Group_2_0__1() throws RecognitionExce
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11428:1: rule__XSwitchExpression__Group_2_0__1__Impl : ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) ) ;
+    // InternalCheckCfg.g:11428:1: rule__XSwitchExpression__Group_2_0__1__Impl : ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) ) ;
     public final void rule__XSwitchExpression__Group_2_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11432:1: ( ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11433:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) )
+            // InternalCheckCfg.g:11432:1: ( ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) ) )
+            // InternalCheckCfg.g:11433:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11433:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11434:1: ( rule__XSwitchExpression__SwitchAssignment_2_0_1 )
+            // InternalCheckCfg.g:11433:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) )
+            // InternalCheckCfg.g:11434:1: ( rule__XSwitchExpression__SwitchAssignment_2_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getSwitchAssignment_2_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11435:1: ( rule__XSwitchExpression__SwitchAssignment_2_0_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11435:2: rule__XSwitchExpression__SwitchAssignment_2_0_1
+            // InternalCheckCfg.g:11435:1: ( rule__XSwitchExpression__SwitchAssignment_2_0_1 )
+            // InternalCheckCfg.g:11435:2: rule__XSwitchExpression__SwitchAssignment_2_0_1
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__SwitchAssignment_2_0_1_in_rule__XSwitchExpression__Group_2_0__1__Impl23324);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__SwitchAssignment_2_0_1();
 
             state._fsp--;
@@ -33746,16 +33746,16 @@ public final void rule__XSwitchExpression__Group_2_0__1__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11445:1: rule__XSwitchExpression__Group_2_0__2 : rule__XSwitchExpression__Group_2_0__2__Impl ;
+    // InternalCheckCfg.g:11445:1: rule__XSwitchExpression__Group_2_0__2 : rule__XSwitchExpression__Group_2_0__2__Impl ;
     public final void rule__XSwitchExpression__Group_2_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11449:1: ( rule__XSwitchExpression__Group_2_0__2__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11450:2: rule__XSwitchExpression__Group_2_0__2__Impl
+            // InternalCheckCfg.g:11449:1: ( rule__XSwitchExpression__Group_2_0__2__Impl )
+            // InternalCheckCfg.g:11450:2: rule__XSwitchExpression__Group_2_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0__2__Impl_in_rule__XSwitchExpression__Group_2_0__223354);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_0__2__Impl();
 
             state._fsp--;
@@ -33779,22 +33779,22 @@ public final void rule__XSwitchExpression__Group_2_0__2() throws RecognitionExce
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11456:1: rule__XSwitchExpression__Group_2_0__2__Impl : ( ')' ) ;
+    // InternalCheckCfg.g:11456:1: rule__XSwitchExpression__Group_2_0__2__Impl : ( ')' ) ;
     public final void rule__XSwitchExpression__Group_2_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11460:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11461:1: ( ')' )
+            // InternalCheckCfg.g:11460:1: ( ( ')' ) )
+            // InternalCheckCfg.g:11461:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11461:1: ( ')' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11462:1: ')'
+            // InternalCheckCfg.g:11461:1: ( ')' )
+            // InternalCheckCfg.g:11462:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getRightParenthesisKeyword_2_0_2()); 
             }
-            match(input,63,FOLLOW_63_in_rule__XSwitchExpression__Group_2_0__2__Impl23382); if (state.failed) return ;
+            match(input,63,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getRightParenthesisKeyword_2_0_2()); 
             }
@@ -33820,16 +33820,16 @@ public final void rule__XSwitchExpression__Group_2_0__2__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11481:1: rule__XSwitchExpression__Group_2_0_0__0 : rule__XSwitchExpression__Group_2_0_0__0__Impl ;
+    // InternalCheckCfg.g:11481:1: rule__XSwitchExpression__Group_2_0_0__0 : rule__XSwitchExpression__Group_2_0_0__0__Impl ;
     public final void rule__XSwitchExpression__Group_2_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11485:1: ( rule__XSwitchExpression__Group_2_0_0__0__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11486:2: rule__XSwitchExpression__Group_2_0_0__0__Impl
+            // InternalCheckCfg.g:11485:1: ( rule__XSwitchExpression__Group_2_0_0__0__Impl )
+            // InternalCheckCfg.g:11486:2: rule__XSwitchExpression__Group_2_0_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0_0__0__Impl_in_rule__XSwitchExpression__Group_2_0_0__023419);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_0_0__0__Impl();
 
             state._fsp--;
@@ -33853,25 +33853,25 @@ public final void rule__XSwitchExpression__Group_2_0_0__0() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11492:1: rule__XSwitchExpression__Group_2_0_0__0__Impl : ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) ) ;
+    // InternalCheckCfg.g:11492:1: rule__XSwitchExpression__Group_2_0_0__0__Impl : ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) ) ;
     public final void rule__XSwitchExpression__Group_2_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11496:1: ( ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11497:1: ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) )
+            // InternalCheckCfg.g:11496:1: ( ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) ) )
+            // InternalCheckCfg.g:11497:1: ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11497:1: ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11498:1: ( rule__XSwitchExpression__Group_2_0_0_0__0 )
+            // InternalCheckCfg.g:11497:1: ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) )
+            // InternalCheckCfg.g:11498:1: ( rule__XSwitchExpression__Group_2_0_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getGroup_2_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11499:1: ( rule__XSwitchExpression__Group_2_0_0_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11499:2: rule__XSwitchExpression__Group_2_0_0_0__0
+            // InternalCheckCfg.g:11499:1: ( rule__XSwitchExpression__Group_2_0_0_0__0 )
+            // InternalCheckCfg.g:11499:2: rule__XSwitchExpression__Group_2_0_0_0__0
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__0_in_rule__XSwitchExpression__Group_2_0_0__0__Impl23446);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_0_0_0__0();
 
             state._fsp--;
@@ -33904,21 +33904,21 @@ public final void rule__XSwitchExpression__Group_2_0_0__0__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11511:1: rule__XSwitchExpression__Group_2_0_0_0__0 : rule__XSwitchExpression__Group_2_0_0_0__0__Impl rule__XSwitchExpression__Group_2_0_0_0__1 ;
+    // InternalCheckCfg.g:11511:1: rule__XSwitchExpression__Group_2_0_0_0__0 : rule__XSwitchExpression__Group_2_0_0_0__0__Impl rule__XSwitchExpression__Group_2_0_0_0__1 ;
     public final void rule__XSwitchExpression__Group_2_0_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11515:1: ( rule__XSwitchExpression__Group_2_0_0_0__0__Impl rule__XSwitchExpression__Group_2_0_0_0__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11516:2: rule__XSwitchExpression__Group_2_0_0_0__0__Impl rule__XSwitchExpression__Group_2_0_0_0__1
+            // InternalCheckCfg.g:11515:1: ( rule__XSwitchExpression__Group_2_0_0_0__0__Impl rule__XSwitchExpression__Group_2_0_0_0__1 )
+            // InternalCheckCfg.g:11516:2: rule__XSwitchExpression__Group_2_0_0_0__0__Impl rule__XSwitchExpression__Group_2_0_0_0__1
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__0__Impl_in_rule__XSwitchExpression__Group_2_0_0_0__023478);
+            pushFollow(FOLLOW_39);
             rule__XSwitchExpression__Group_2_0_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__1_in_rule__XSwitchExpression__Group_2_0_0_0__023481);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_0_0_0__1();
 
             state._fsp--;
@@ -33942,22 +33942,22 @@ public final void rule__XSwitchExpression__Group_2_0_0_0__0() throws Recognition
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11523:1: rule__XSwitchExpression__Group_2_0_0_0__0__Impl : ( '(' ) ;
+    // InternalCheckCfg.g:11523:1: rule__XSwitchExpression__Group_2_0_0_0__0__Impl : ( '(' ) ;
     public final void rule__XSwitchExpression__Group_2_0_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11527:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11528:1: ( '(' )
+            // InternalCheckCfg.g:11527:1: ( ( '(' ) )
+            // InternalCheckCfg.g:11528:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11528:1: ( '(' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11529:1: '('
+            // InternalCheckCfg.g:11528:1: ( '(' )
+            // InternalCheckCfg.g:11529:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getLeftParenthesisKeyword_2_0_0_0_0()); 
             }
-            match(input,62,FOLLOW_62_in_rule__XSwitchExpression__Group_2_0_0_0__0__Impl23509); if (state.failed) return ;
+            match(input,62,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getLeftParenthesisKeyword_2_0_0_0_0()); 
             }
@@ -33983,21 +33983,21 @@ public final void rule__XSwitchExpression__Group_2_0_0_0__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0_0__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11542:1: rule__XSwitchExpression__Group_2_0_0_0__1 : rule__XSwitchExpression__Group_2_0_0_0__1__Impl rule__XSwitchExpression__Group_2_0_0_0__2 ;
+    // InternalCheckCfg.g:11542:1: rule__XSwitchExpression__Group_2_0_0_0__1 : rule__XSwitchExpression__Group_2_0_0_0__1__Impl rule__XSwitchExpression__Group_2_0_0_0__2 ;
     public final void rule__XSwitchExpression__Group_2_0_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11546:1: ( rule__XSwitchExpression__Group_2_0_0_0__1__Impl rule__XSwitchExpression__Group_2_0_0_0__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11547:2: rule__XSwitchExpression__Group_2_0_0_0__1__Impl rule__XSwitchExpression__Group_2_0_0_0__2
+            // InternalCheckCfg.g:11546:1: ( rule__XSwitchExpression__Group_2_0_0_0__1__Impl rule__XSwitchExpression__Group_2_0_0_0__2 )
+            // InternalCheckCfg.g:11547:2: rule__XSwitchExpression__Group_2_0_0_0__1__Impl rule__XSwitchExpression__Group_2_0_0_0__2
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__1__Impl_in_rule__XSwitchExpression__Group_2_0_0_0__123540);
+            pushFollow(FOLLOW_76);
             rule__XSwitchExpression__Group_2_0_0_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__2_in_rule__XSwitchExpression__Group_2_0_0_0__123543);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_0_0_0__2();
 
             state._fsp--;
@@ -34021,25 +34021,25 @@ public final void rule__XSwitchExpression__Group_2_0_0_0__1() throws Recognition
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11554:1: rule__XSwitchExpression__Group_2_0_0_0__1__Impl : ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) ) ;
+    // InternalCheckCfg.g:11554:1: rule__XSwitchExpression__Group_2_0_0_0__1__Impl : ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) ) ;
     public final void rule__XSwitchExpression__Group_2_0_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11558:1: ( ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11559:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) )
+            // InternalCheckCfg.g:11558:1: ( ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) ) )
+            // InternalCheckCfg.g:11559:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11559:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11560:1: ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 )
+            // InternalCheckCfg.g:11559:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) )
+            // InternalCheckCfg.g:11560:1: ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getDeclaredParamAssignment_2_0_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11561:1: ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11561:2: rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1
+            // InternalCheckCfg.g:11561:1: ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 )
+            // InternalCheckCfg.g:11561:2: rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1_in_rule__XSwitchExpression__Group_2_0_0_0__1__Impl23570);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1();
 
             state._fsp--;
@@ -34072,16 +34072,16 @@ public final void rule__XSwitchExpression__Group_2_0_0_0__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0_0__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11571:1: rule__XSwitchExpression__Group_2_0_0_0__2 : rule__XSwitchExpression__Group_2_0_0_0__2__Impl ;
+    // InternalCheckCfg.g:11571:1: rule__XSwitchExpression__Group_2_0_0_0__2 : rule__XSwitchExpression__Group_2_0_0_0__2__Impl ;
     public final void rule__XSwitchExpression__Group_2_0_0_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11575:1: ( rule__XSwitchExpression__Group_2_0_0_0__2__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11576:2: rule__XSwitchExpression__Group_2_0_0_0__2__Impl
+            // InternalCheckCfg.g:11575:1: ( rule__XSwitchExpression__Group_2_0_0_0__2__Impl )
+            // InternalCheckCfg.g:11576:2: rule__XSwitchExpression__Group_2_0_0_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__2__Impl_in_rule__XSwitchExpression__Group_2_0_0_0__223600);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_0_0_0__2__Impl();
 
             state._fsp--;
@@ -34105,22 +34105,22 @@ public final void rule__XSwitchExpression__Group_2_0_0_0__2() throws Recognition
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0_0__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11582:1: rule__XSwitchExpression__Group_2_0_0_0__2__Impl : ( ':' ) ;
+    // InternalCheckCfg.g:11582:1: rule__XSwitchExpression__Group_2_0_0_0__2__Impl : ( ':' ) ;
     public final void rule__XSwitchExpression__Group_2_0_0_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11586:1: ( ( ':' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11587:1: ( ':' )
+            // InternalCheckCfg.g:11586:1: ( ( ':' ) )
+            // InternalCheckCfg.g:11587:1: ( ':' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11587:1: ( ':' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11588:1: ':'
+            // InternalCheckCfg.g:11587:1: ( ':' )
+            // InternalCheckCfg.g:11588:1: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getColonKeyword_2_0_0_0_2()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XSwitchExpression__Group_2_0_0_0__2__Impl23628); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getColonKeyword_2_0_0_0_2()); 
             }
@@ -34146,21 +34146,21 @@ public final void rule__XSwitchExpression__Group_2_0_0_0__2__Impl() throws Recog
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11607:1: rule__XSwitchExpression__Group_2_1__0 : rule__XSwitchExpression__Group_2_1__0__Impl rule__XSwitchExpression__Group_2_1__1 ;
+    // InternalCheckCfg.g:11607:1: rule__XSwitchExpression__Group_2_1__0 : rule__XSwitchExpression__Group_2_1__0__Impl rule__XSwitchExpression__Group_2_1__1 ;
     public final void rule__XSwitchExpression__Group_2_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11611:1: ( rule__XSwitchExpression__Group_2_1__0__Impl rule__XSwitchExpression__Group_2_1__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11612:2: rule__XSwitchExpression__Group_2_1__0__Impl rule__XSwitchExpression__Group_2_1__1
+            // InternalCheckCfg.g:11611:1: ( rule__XSwitchExpression__Group_2_1__0__Impl rule__XSwitchExpression__Group_2_1__1 )
+            // InternalCheckCfg.g:11612:2: rule__XSwitchExpression__Group_2_1__0__Impl rule__XSwitchExpression__Group_2_1__1
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1__0__Impl_in_rule__XSwitchExpression__Group_2_1__023665);
+            pushFollow(FOLLOW_61);
             rule__XSwitchExpression__Group_2_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1__1_in_rule__XSwitchExpression__Group_2_1__023668);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_1__1();
 
             state._fsp--;
@@ -34184,29 +34184,29 @@ public final void rule__XSwitchExpression__Group_2_1__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11619:1: rule__XSwitchExpression__Group_2_1__0__Impl : ( ( rule__XSwitchExpression__Group_2_1_0__0 )? ) ;
+    // InternalCheckCfg.g:11619:1: rule__XSwitchExpression__Group_2_1__0__Impl : ( ( rule__XSwitchExpression__Group_2_1_0__0 )? ) ;
     public final void rule__XSwitchExpression__Group_2_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11623:1: ( ( ( rule__XSwitchExpression__Group_2_1_0__0 )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11624:1: ( ( rule__XSwitchExpression__Group_2_1_0__0 )? )
+            // InternalCheckCfg.g:11623:1: ( ( ( rule__XSwitchExpression__Group_2_1_0__0 )? ) )
+            // InternalCheckCfg.g:11624:1: ( ( rule__XSwitchExpression__Group_2_1_0__0 )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11624:1: ( ( rule__XSwitchExpression__Group_2_1_0__0 )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11625:1: ( rule__XSwitchExpression__Group_2_1_0__0 )?
+            // InternalCheckCfg.g:11624:1: ( ( rule__XSwitchExpression__Group_2_1_0__0 )? )
+            // InternalCheckCfg.g:11625:1: ( rule__XSwitchExpression__Group_2_1_0__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getGroup_2_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11626:1: ( rule__XSwitchExpression__Group_2_1_0__0 )?
+            // InternalCheckCfg.g:11626:1: ( rule__XSwitchExpression__Group_2_1_0__0 )?
             int alt89=2;
             alt89 = dfa89.predict(input);
             switch (alt89) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11626:2: rule__XSwitchExpression__Group_2_1_0__0
+                    // InternalCheckCfg.g:11626:2: rule__XSwitchExpression__Group_2_1_0__0
                     {
-                    pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1_0__0_in_rule__XSwitchExpression__Group_2_1__0__Impl23695);
+                    pushFollow(FOLLOW_2);
                     rule__XSwitchExpression__Group_2_1_0__0();
 
                     state._fsp--;
@@ -34242,16 +34242,16 @@ public final void rule__XSwitchExpression__Group_2_1__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11636:1: rule__XSwitchExpression__Group_2_1__1 : rule__XSwitchExpression__Group_2_1__1__Impl ;
+    // InternalCheckCfg.g:11636:1: rule__XSwitchExpression__Group_2_1__1 : rule__XSwitchExpression__Group_2_1__1__Impl ;
     public final void rule__XSwitchExpression__Group_2_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11640:1: ( rule__XSwitchExpression__Group_2_1__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11641:2: rule__XSwitchExpression__Group_2_1__1__Impl
+            // InternalCheckCfg.g:11640:1: ( rule__XSwitchExpression__Group_2_1__1__Impl )
+            // InternalCheckCfg.g:11641:2: rule__XSwitchExpression__Group_2_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1__1__Impl_in_rule__XSwitchExpression__Group_2_1__123726);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_1__1__Impl();
 
             state._fsp--;
@@ -34275,25 +34275,25 @@ public final void rule__XSwitchExpression__Group_2_1__1() throws RecognitionExce
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11647:1: rule__XSwitchExpression__Group_2_1__1__Impl : ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) ) ;
+    // InternalCheckCfg.g:11647:1: rule__XSwitchExpression__Group_2_1__1__Impl : ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) ) ;
     public final void rule__XSwitchExpression__Group_2_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11651:1: ( ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11652:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) )
+            // InternalCheckCfg.g:11651:1: ( ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) ) )
+            // InternalCheckCfg.g:11652:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11652:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11653:1: ( rule__XSwitchExpression__SwitchAssignment_2_1_1 )
+            // InternalCheckCfg.g:11652:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) )
+            // InternalCheckCfg.g:11653:1: ( rule__XSwitchExpression__SwitchAssignment_2_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getSwitchAssignment_2_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11654:1: ( rule__XSwitchExpression__SwitchAssignment_2_1_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11654:2: rule__XSwitchExpression__SwitchAssignment_2_1_1
+            // InternalCheckCfg.g:11654:1: ( rule__XSwitchExpression__SwitchAssignment_2_1_1 )
+            // InternalCheckCfg.g:11654:2: rule__XSwitchExpression__SwitchAssignment_2_1_1
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__SwitchAssignment_2_1_1_in_rule__XSwitchExpression__Group_2_1__1__Impl23753);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__SwitchAssignment_2_1_1();
 
             state._fsp--;
@@ -34326,16 +34326,16 @@ public final void rule__XSwitchExpression__Group_2_1__1__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11668:1: rule__XSwitchExpression__Group_2_1_0__0 : rule__XSwitchExpression__Group_2_1_0__0__Impl ;
+    // InternalCheckCfg.g:11668:1: rule__XSwitchExpression__Group_2_1_0__0 : rule__XSwitchExpression__Group_2_1_0__0__Impl ;
     public final void rule__XSwitchExpression__Group_2_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11672:1: ( rule__XSwitchExpression__Group_2_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11673:2: rule__XSwitchExpression__Group_2_1_0__0__Impl
+            // InternalCheckCfg.g:11672:1: ( rule__XSwitchExpression__Group_2_1_0__0__Impl )
+            // InternalCheckCfg.g:11673:2: rule__XSwitchExpression__Group_2_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1_0__0__Impl_in_rule__XSwitchExpression__Group_2_1_0__023787);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_1_0__0__Impl();
 
             state._fsp--;
@@ -34359,25 +34359,25 @@ public final void rule__XSwitchExpression__Group_2_1_0__0() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11679:1: rule__XSwitchExpression__Group_2_1_0__0__Impl : ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) ) ;
+    // InternalCheckCfg.g:11679:1: rule__XSwitchExpression__Group_2_1_0__0__Impl : ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) ) ;
     public final void rule__XSwitchExpression__Group_2_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11683:1: ( ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11684:1: ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) )
+            // InternalCheckCfg.g:11683:1: ( ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) ) )
+            // InternalCheckCfg.g:11684:1: ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11684:1: ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11685:1: ( rule__XSwitchExpression__Group_2_1_0_0__0 )
+            // InternalCheckCfg.g:11684:1: ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) )
+            // InternalCheckCfg.g:11685:1: ( rule__XSwitchExpression__Group_2_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getGroup_2_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11686:1: ( rule__XSwitchExpression__Group_2_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11686:2: rule__XSwitchExpression__Group_2_1_0_0__0
+            // InternalCheckCfg.g:11686:1: ( rule__XSwitchExpression__Group_2_1_0_0__0 )
+            // InternalCheckCfg.g:11686:2: rule__XSwitchExpression__Group_2_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1_0_0__0_in_rule__XSwitchExpression__Group_2_1_0__0__Impl23814);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_1_0_0__0();
 
             state._fsp--;
@@ -34410,21 +34410,21 @@ public final void rule__XSwitchExpression__Group_2_1_0__0__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1_0_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11698:1: rule__XSwitchExpression__Group_2_1_0_0__0 : rule__XSwitchExpression__Group_2_1_0_0__0__Impl rule__XSwitchExpression__Group_2_1_0_0__1 ;
+    // InternalCheckCfg.g:11698:1: rule__XSwitchExpression__Group_2_1_0_0__0 : rule__XSwitchExpression__Group_2_1_0_0__0__Impl rule__XSwitchExpression__Group_2_1_0_0__1 ;
     public final void rule__XSwitchExpression__Group_2_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11702:1: ( rule__XSwitchExpression__Group_2_1_0_0__0__Impl rule__XSwitchExpression__Group_2_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11703:2: rule__XSwitchExpression__Group_2_1_0_0__0__Impl rule__XSwitchExpression__Group_2_1_0_0__1
+            // InternalCheckCfg.g:11702:1: ( rule__XSwitchExpression__Group_2_1_0_0__0__Impl rule__XSwitchExpression__Group_2_1_0_0__1 )
+            // InternalCheckCfg.g:11703:2: rule__XSwitchExpression__Group_2_1_0_0__0__Impl rule__XSwitchExpression__Group_2_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1_0_0__0__Impl_in_rule__XSwitchExpression__Group_2_1_0_0__023846);
+            pushFollow(FOLLOW_76);
             rule__XSwitchExpression__Group_2_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1_0_0__1_in_rule__XSwitchExpression__Group_2_1_0_0__023849);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_1_0_0__1();
 
             state._fsp--;
@@ -34448,25 +34448,25 @@ public final void rule__XSwitchExpression__Group_2_1_0_0__0() throws Recognition
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11710:1: rule__XSwitchExpression__Group_2_1_0_0__0__Impl : ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) ) ;
+    // InternalCheckCfg.g:11710:1: rule__XSwitchExpression__Group_2_1_0_0__0__Impl : ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) ) ;
     public final void rule__XSwitchExpression__Group_2_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11714:1: ( ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11715:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) )
+            // InternalCheckCfg.g:11714:1: ( ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) ) )
+            // InternalCheckCfg.g:11715:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11715:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11716:1: ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 )
+            // InternalCheckCfg.g:11715:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) )
+            // InternalCheckCfg.g:11716:1: ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getDeclaredParamAssignment_2_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11717:1: ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11717:2: rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0
+            // InternalCheckCfg.g:11717:1: ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 )
+            // InternalCheckCfg.g:11717:2: rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0_in_rule__XSwitchExpression__Group_2_1_0_0__0__Impl23876);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0();
 
             state._fsp--;
@@ -34499,16 +34499,16 @@ public final void rule__XSwitchExpression__Group_2_1_0_0__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1_0_0__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11727:1: rule__XSwitchExpression__Group_2_1_0_0__1 : rule__XSwitchExpression__Group_2_1_0_0__1__Impl ;
+    // InternalCheckCfg.g:11727:1: rule__XSwitchExpression__Group_2_1_0_0__1 : rule__XSwitchExpression__Group_2_1_0_0__1__Impl ;
     public final void rule__XSwitchExpression__Group_2_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11731:1: ( rule__XSwitchExpression__Group_2_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11732:2: rule__XSwitchExpression__Group_2_1_0_0__1__Impl
+            // InternalCheckCfg.g:11731:1: ( rule__XSwitchExpression__Group_2_1_0_0__1__Impl )
+            // InternalCheckCfg.g:11732:2: rule__XSwitchExpression__Group_2_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1_0_0__1__Impl_in_rule__XSwitchExpression__Group_2_1_0_0__123906);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_1_0_0__1__Impl();
 
             state._fsp--;
@@ -34532,22 +34532,22 @@ public final void rule__XSwitchExpression__Group_2_1_0_0__1() throws Recognition
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11738:1: rule__XSwitchExpression__Group_2_1_0_0__1__Impl : ( ':' ) ;
+    // InternalCheckCfg.g:11738:1: rule__XSwitchExpression__Group_2_1_0_0__1__Impl : ( ':' ) ;
     public final void rule__XSwitchExpression__Group_2_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11742:1: ( ( ':' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11743:1: ( ':' )
+            // InternalCheckCfg.g:11742:1: ( ( ':' ) )
+            // InternalCheckCfg.g:11743:1: ( ':' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11743:1: ( ':' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11744:1: ':'
+            // InternalCheckCfg.g:11743:1: ( ':' )
+            // InternalCheckCfg.g:11744:1: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getColonKeyword_2_1_0_0_1()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XSwitchExpression__Group_2_1_0_0__1__Impl23934); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getColonKeyword_2_1_0_0_1()); 
             }
@@ -34573,21 +34573,21 @@ public final void rule__XSwitchExpression__Group_2_1_0_0__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_5__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11761:1: rule__XSwitchExpression__Group_5__0 : rule__XSwitchExpression__Group_5__0__Impl rule__XSwitchExpression__Group_5__1 ;
+    // InternalCheckCfg.g:11761:1: rule__XSwitchExpression__Group_5__0 : rule__XSwitchExpression__Group_5__0__Impl rule__XSwitchExpression__Group_5__1 ;
     public final void rule__XSwitchExpression__Group_5__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11765:1: ( rule__XSwitchExpression__Group_5__0__Impl rule__XSwitchExpression__Group_5__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11766:2: rule__XSwitchExpression__Group_5__0__Impl rule__XSwitchExpression__Group_5__1
+            // InternalCheckCfg.g:11765:1: ( rule__XSwitchExpression__Group_5__0__Impl rule__XSwitchExpression__Group_5__1 )
+            // InternalCheckCfg.g:11766:2: rule__XSwitchExpression__Group_5__0__Impl rule__XSwitchExpression__Group_5__1
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_5__0__Impl_in_rule__XSwitchExpression__Group_5__023969);
+            pushFollow(FOLLOW_76);
             rule__XSwitchExpression__Group_5__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_5__1_in_rule__XSwitchExpression__Group_5__023972);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_5__1();
 
             state._fsp--;
@@ -34611,22 +34611,22 @@ public final void rule__XSwitchExpression__Group_5__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_5__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11773:1: rule__XSwitchExpression__Group_5__0__Impl : ( 'default' ) ;
+    // InternalCheckCfg.g:11773:1: rule__XSwitchExpression__Group_5__0__Impl : ( 'default' ) ;
     public final void rule__XSwitchExpression__Group_5__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11777:1: ( ( 'default' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11778:1: ( 'default' )
+            // InternalCheckCfg.g:11777:1: ( ( 'default' ) )
+            // InternalCheckCfg.g:11778:1: ( 'default' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11778:1: ( 'default' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11779:1: 'default'
+            // InternalCheckCfg.g:11778:1: ( 'default' )
+            // InternalCheckCfg.g:11779:1: 'default'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getDefaultKeyword_5_0()); 
             }
-            match(input,51,FOLLOW_51_in_rule__XSwitchExpression__Group_5__0__Impl24000); if (state.failed) return ;
+            match(input,51,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getDefaultKeyword_5_0()); 
             }
@@ -34652,21 +34652,21 @@ public final void rule__XSwitchExpression__Group_5__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_5__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11792:1: rule__XSwitchExpression__Group_5__1 : rule__XSwitchExpression__Group_5__1__Impl rule__XSwitchExpression__Group_5__2 ;
+    // InternalCheckCfg.g:11792:1: rule__XSwitchExpression__Group_5__1 : rule__XSwitchExpression__Group_5__1__Impl rule__XSwitchExpression__Group_5__2 ;
     public final void rule__XSwitchExpression__Group_5__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11796:1: ( rule__XSwitchExpression__Group_5__1__Impl rule__XSwitchExpression__Group_5__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11797:2: rule__XSwitchExpression__Group_5__1__Impl rule__XSwitchExpression__Group_5__2
+            // InternalCheckCfg.g:11796:1: ( rule__XSwitchExpression__Group_5__1__Impl rule__XSwitchExpression__Group_5__2 )
+            // InternalCheckCfg.g:11797:2: rule__XSwitchExpression__Group_5__1__Impl rule__XSwitchExpression__Group_5__2
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_5__1__Impl_in_rule__XSwitchExpression__Group_5__124031);
+            pushFollow(FOLLOW_61);
             rule__XSwitchExpression__Group_5__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_5__2_in_rule__XSwitchExpression__Group_5__124034);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_5__2();
 
             state._fsp--;
@@ -34690,22 +34690,22 @@ public final void rule__XSwitchExpression__Group_5__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_5__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11804:1: rule__XSwitchExpression__Group_5__1__Impl : ( ':' ) ;
+    // InternalCheckCfg.g:11804:1: rule__XSwitchExpression__Group_5__1__Impl : ( ':' ) ;
     public final void rule__XSwitchExpression__Group_5__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11808:1: ( ( ':' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11809:1: ( ':' )
+            // InternalCheckCfg.g:11808:1: ( ( ':' ) )
+            // InternalCheckCfg.g:11809:1: ( ':' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11809:1: ( ':' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11810:1: ':'
+            // InternalCheckCfg.g:11809:1: ( ':' )
+            // InternalCheckCfg.g:11810:1: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getColonKeyword_5_1()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XSwitchExpression__Group_5__1__Impl24062); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getColonKeyword_5_1()); 
             }
@@ -34731,16 +34731,16 @@ public final void rule__XSwitchExpression__Group_5__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_5__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11823:1: rule__XSwitchExpression__Group_5__2 : rule__XSwitchExpression__Group_5__2__Impl ;
+    // InternalCheckCfg.g:11823:1: rule__XSwitchExpression__Group_5__2 : rule__XSwitchExpression__Group_5__2__Impl ;
     public final void rule__XSwitchExpression__Group_5__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11827:1: ( rule__XSwitchExpression__Group_5__2__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11828:2: rule__XSwitchExpression__Group_5__2__Impl
+            // InternalCheckCfg.g:11827:1: ( rule__XSwitchExpression__Group_5__2__Impl )
+            // InternalCheckCfg.g:11828:2: rule__XSwitchExpression__Group_5__2__Impl
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_5__2__Impl_in_rule__XSwitchExpression__Group_5__224093);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_5__2__Impl();
 
             state._fsp--;
@@ -34764,25 +34764,25 @@ public final void rule__XSwitchExpression__Group_5__2() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_5__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11834:1: rule__XSwitchExpression__Group_5__2__Impl : ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) ) ;
+    // InternalCheckCfg.g:11834:1: rule__XSwitchExpression__Group_5__2__Impl : ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) ) ;
     public final void rule__XSwitchExpression__Group_5__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11838:1: ( ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11839:1: ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) )
+            // InternalCheckCfg.g:11838:1: ( ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) ) )
+            // InternalCheckCfg.g:11839:1: ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11839:1: ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11840:1: ( rule__XSwitchExpression__DefaultAssignment_5_2 )
+            // InternalCheckCfg.g:11839:1: ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) )
+            // InternalCheckCfg.g:11840:1: ( rule__XSwitchExpression__DefaultAssignment_5_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getDefaultAssignment_5_2()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11841:1: ( rule__XSwitchExpression__DefaultAssignment_5_2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11841:2: rule__XSwitchExpression__DefaultAssignment_5_2
+            // InternalCheckCfg.g:11841:1: ( rule__XSwitchExpression__DefaultAssignment_5_2 )
+            // InternalCheckCfg.g:11841:2: rule__XSwitchExpression__DefaultAssignment_5_2
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__DefaultAssignment_5_2_in_rule__XSwitchExpression__Group_5__2__Impl24120);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__DefaultAssignment_5_2();
 
             state._fsp--;
@@ -34815,21 +34815,21 @@ public final void rule__XSwitchExpression__Group_5__2__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XCasePart__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11857:1: rule__XCasePart__Group__0 : rule__XCasePart__Group__0__Impl rule__XCasePart__Group__1 ;
+    // InternalCheckCfg.g:11857:1: rule__XCasePart__Group__0 : rule__XCasePart__Group__0__Impl rule__XCasePart__Group__1 ;
     public final void rule__XCasePart__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11861:1: ( rule__XCasePart__Group__0__Impl rule__XCasePart__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11862:2: rule__XCasePart__Group__0__Impl rule__XCasePart__Group__1
+            // InternalCheckCfg.g:11861:1: ( rule__XCasePart__Group__0__Impl rule__XCasePart__Group__1 )
+            // InternalCheckCfg.g:11862:2: rule__XCasePart__Group__0__Impl rule__XCasePart__Group__1
             {
-            pushFollow(FOLLOW_rule__XCasePart__Group__0__Impl_in_rule__XCasePart__Group__024156);
+            pushFollow(FOLLOW_77);
             rule__XCasePart__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCasePart__Group__1_in_rule__XCasePart__Group__024159);
+            pushFollow(FOLLOW_2);
             rule__XCasePart__Group__1();
 
             state._fsp--;
@@ -34853,23 +34853,23 @@ public final void rule__XCasePart__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCasePart__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11869:1: rule__XCasePart__Group__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:11869:1: rule__XCasePart__Group__0__Impl : ( () ) ;
     public final void rule__XCasePart__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11873:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11874:1: ( () )
+            // InternalCheckCfg.g:11873:1: ( ( () ) )
+            // InternalCheckCfg.g:11874:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11874:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11875:1: ()
+            // InternalCheckCfg.g:11874:1: ( () )
+            // InternalCheckCfg.g:11875:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getXCasePartAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11876:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11878:1: 
+            // InternalCheckCfg.g:11876:1: ()
+            // InternalCheckCfg.g:11878:1: 
             {
             }
 
@@ -34894,21 +34894,21 @@ public final void rule__XCasePart__Group__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__XCasePart__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11888:1: rule__XCasePart__Group__1 : rule__XCasePart__Group__1__Impl rule__XCasePart__Group__2 ;
+    // InternalCheckCfg.g:11888:1: rule__XCasePart__Group__1 : rule__XCasePart__Group__1__Impl rule__XCasePart__Group__2 ;
     public final void rule__XCasePart__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11892:1: ( rule__XCasePart__Group__1__Impl rule__XCasePart__Group__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11893:2: rule__XCasePart__Group__1__Impl rule__XCasePart__Group__2
+            // InternalCheckCfg.g:11892:1: ( rule__XCasePart__Group__1__Impl rule__XCasePart__Group__2 )
+            // InternalCheckCfg.g:11893:2: rule__XCasePart__Group__1__Impl rule__XCasePart__Group__2
             {
-            pushFollow(FOLLOW_rule__XCasePart__Group__1__Impl_in_rule__XCasePart__Group__124217);
+            pushFollow(FOLLOW_77);
             rule__XCasePart__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCasePart__Group__2_in_rule__XCasePart__Group__124220);
+            pushFollow(FOLLOW_2);
             rule__XCasePart__Group__2();
 
             state._fsp--;
@@ -34932,22 +34932,22 @@ public final void rule__XCasePart__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCasePart__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11900:1: rule__XCasePart__Group__1__Impl : ( ( rule__XCasePart__TypeGuardAssignment_1 )? ) ;
+    // InternalCheckCfg.g:11900:1: rule__XCasePart__Group__1__Impl : ( ( rule__XCasePart__TypeGuardAssignment_1 )? ) ;
     public final void rule__XCasePart__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11904:1: ( ( ( rule__XCasePart__TypeGuardAssignment_1 )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11905:1: ( ( rule__XCasePart__TypeGuardAssignment_1 )? )
+            // InternalCheckCfg.g:11904:1: ( ( ( rule__XCasePart__TypeGuardAssignment_1 )? ) )
+            // InternalCheckCfg.g:11905:1: ( ( rule__XCasePart__TypeGuardAssignment_1 )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11905:1: ( ( rule__XCasePart__TypeGuardAssignment_1 )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11906:1: ( rule__XCasePart__TypeGuardAssignment_1 )?
+            // InternalCheckCfg.g:11905:1: ( ( rule__XCasePart__TypeGuardAssignment_1 )? )
+            // InternalCheckCfg.g:11906:1: ( rule__XCasePart__TypeGuardAssignment_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getTypeGuardAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11907:1: ( rule__XCasePart__TypeGuardAssignment_1 )?
+            // InternalCheckCfg.g:11907:1: ( rule__XCasePart__TypeGuardAssignment_1 )?
             int alt90=2;
             int LA90_0 = input.LA(1);
 
@@ -34956,9 +34956,9 @@ public final void rule__XCasePart__Group__1__Impl() throws RecognitionException
             }
             switch (alt90) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11907:2: rule__XCasePart__TypeGuardAssignment_1
+                    // InternalCheckCfg.g:11907:2: rule__XCasePart__TypeGuardAssignment_1
                     {
-                    pushFollow(FOLLOW_rule__XCasePart__TypeGuardAssignment_1_in_rule__XCasePart__Group__1__Impl24247);
+                    pushFollow(FOLLOW_2);
                     rule__XCasePart__TypeGuardAssignment_1();
 
                     state._fsp--;
@@ -34994,21 +34994,21 @@ public final void rule__XCasePart__Group__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__XCasePart__Group__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11917:1: rule__XCasePart__Group__2 : rule__XCasePart__Group__2__Impl rule__XCasePart__Group__3 ;
+    // InternalCheckCfg.g:11917:1: rule__XCasePart__Group__2 : rule__XCasePart__Group__2__Impl rule__XCasePart__Group__3 ;
     public final void rule__XCasePart__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11921:1: ( rule__XCasePart__Group__2__Impl rule__XCasePart__Group__3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11922:2: rule__XCasePart__Group__2__Impl rule__XCasePart__Group__3
+            // InternalCheckCfg.g:11921:1: ( rule__XCasePart__Group__2__Impl rule__XCasePart__Group__3 )
+            // InternalCheckCfg.g:11922:2: rule__XCasePart__Group__2__Impl rule__XCasePart__Group__3
             {
-            pushFollow(FOLLOW_rule__XCasePart__Group__2__Impl_in_rule__XCasePart__Group__224278);
+            pushFollow(FOLLOW_77);
             rule__XCasePart__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCasePart__Group__3_in_rule__XCasePart__Group__224281);
+            pushFollow(FOLLOW_2);
             rule__XCasePart__Group__3();
 
             state._fsp--;
@@ -35032,22 +35032,22 @@ public final void rule__XCasePart__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCasePart__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11929:1: rule__XCasePart__Group__2__Impl : ( ( rule__XCasePart__Group_2__0 )? ) ;
+    // InternalCheckCfg.g:11929:1: rule__XCasePart__Group__2__Impl : ( ( rule__XCasePart__Group_2__0 )? ) ;
     public final void rule__XCasePart__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11933:1: ( ( ( rule__XCasePart__Group_2__0 )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11934:1: ( ( rule__XCasePart__Group_2__0 )? )
+            // InternalCheckCfg.g:11933:1: ( ( ( rule__XCasePart__Group_2__0 )? ) )
+            // InternalCheckCfg.g:11934:1: ( ( rule__XCasePart__Group_2__0 )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11934:1: ( ( rule__XCasePart__Group_2__0 )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11935:1: ( rule__XCasePart__Group_2__0 )?
+            // InternalCheckCfg.g:11934:1: ( ( rule__XCasePart__Group_2__0 )? )
+            // InternalCheckCfg.g:11935:1: ( rule__XCasePart__Group_2__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getGroup_2()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11936:1: ( rule__XCasePart__Group_2__0 )?
+            // InternalCheckCfg.g:11936:1: ( rule__XCasePart__Group_2__0 )?
             int alt91=2;
             int LA91_0 = input.LA(1);
 
@@ -35056,9 +35056,9 @@ public final void rule__XCasePart__Group__2__Impl() throws RecognitionException
             }
             switch (alt91) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11936:2: rule__XCasePart__Group_2__0
+                    // InternalCheckCfg.g:11936:2: rule__XCasePart__Group_2__0
                     {
-                    pushFollow(FOLLOW_rule__XCasePart__Group_2__0_in_rule__XCasePart__Group__2__Impl24308);
+                    pushFollow(FOLLOW_2);
                     rule__XCasePart__Group_2__0();
 
                     state._fsp--;
@@ -35094,16 +35094,16 @@ public final void rule__XCasePart__Group__2__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__XCasePart__Group__3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11946:1: rule__XCasePart__Group__3 : rule__XCasePart__Group__3__Impl ;
+    // InternalCheckCfg.g:11946:1: rule__XCasePart__Group__3 : rule__XCasePart__Group__3__Impl ;
     public final void rule__XCasePart__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11950:1: ( rule__XCasePart__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11951:2: rule__XCasePart__Group__3__Impl
+            // InternalCheckCfg.g:11950:1: ( rule__XCasePart__Group__3__Impl )
+            // InternalCheckCfg.g:11951:2: rule__XCasePart__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__XCasePart__Group__3__Impl_in_rule__XCasePart__Group__324339);
+            pushFollow(FOLLOW_2);
             rule__XCasePart__Group__3__Impl();
 
             state._fsp--;
@@ -35127,25 +35127,25 @@ public final void rule__XCasePart__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCasePart__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11957:1: rule__XCasePart__Group__3__Impl : ( ( rule__XCasePart__Alternatives_3 ) ) ;
+    // InternalCheckCfg.g:11957:1: rule__XCasePart__Group__3__Impl : ( ( rule__XCasePart__Alternatives_3 ) ) ;
     public final void rule__XCasePart__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11961:1: ( ( ( rule__XCasePart__Alternatives_3 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11962:1: ( ( rule__XCasePart__Alternatives_3 ) )
+            // InternalCheckCfg.g:11961:1: ( ( ( rule__XCasePart__Alternatives_3 ) ) )
+            // InternalCheckCfg.g:11962:1: ( ( rule__XCasePart__Alternatives_3 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11962:1: ( ( rule__XCasePart__Alternatives_3 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11963:1: ( rule__XCasePart__Alternatives_3 )
+            // InternalCheckCfg.g:11962:1: ( ( rule__XCasePart__Alternatives_3 ) )
+            // InternalCheckCfg.g:11963:1: ( rule__XCasePart__Alternatives_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getAlternatives_3()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11964:1: ( rule__XCasePart__Alternatives_3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11964:2: rule__XCasePart__Alternatives_3
+            // InternalCheckCfg.g:11964:1: ( rule__XCasePart__Alternatives_3 )
+            // InternalCheckCfg.g:11964:2: rule__XCasePart__Alternatives_3
             {
-            pushFollow(FOLLOW_rule__XCasePart__Alternatives_3_in_rule__XCasePart__Group__3__Impl24366);
+            pushFollow(FOLLOW_2);
             rule__XCasePart__Alternatives_3();
 
             state._fsp--;
@@ -35178,21 +35178,21 @@ public final void rule__XCasePart__Group__3__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__XCasePart__Group_2__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11982:1: rule__XCasePart__Group_2__0 : rule__XCasePart__Group_2__0__Impl rule__XCasePart__Group_2__1 ;
+    // InternalCheckCfg.g:11982:1: rule__XCasePart__Group_2__0 : rule__XCasePart__Group_2__0__Impl rule__XCasePart__Group_2__1 ;
     public final void rule__XCasePart__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11986:1: ( rule__XCasePart__Group_2__0__Impl rule__XCasePart__Group_2__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11987:2: rule__XCasePart__Group_2__0__Impl rule__XCasePart__Group_2__1
+            // InternalCheckCfg.g:11986:1: ( rule__XCasePart__Group_2__0__Impl rule__XCasePart__Group_2__1 )
+            // InternalCheckCfg.g:11987:2: rule__XCasePart__Group_2__0__Impl rule__XCasePart__Group_2__1
             {
-            pushFollow(FOLLOW_rule__XCasePart__Group_2__0__Impl_in_rule__XCasePart__Group_2__024404);
+            pushFollow(FOLLOW_61);
             rule__XCasePart__Group_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCasePart__Group_2__1_in_rule__XCasePart__Group_2__024407);
+            pushFollow(FOLLOW_2);
             rule__XCasePart__Group_2__1();
 
             state._fsp--;
@@ -35216,22 +35216,22 @@ public final void rule__XCasePart__Group_2__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCasePart__Group_2__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11994:1: rule__XCasePart__Group_2__0__Impl : ( 'case' ) ;
+    // InternalCheckCfg.g:11994:1: rule__XCasePart__Group_2__0__Impl : ( 'case' ) ;
     public final void rule__XCasePart__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11998:1: ( ( 'case' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11999:1: ( 'case' )
+            // InternalCheckCfg.g:11998:1: ( ( 'case' ) )
+            // InternalCheckCfg.g:11999:1: ( 'case' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11999:1: ( 'case' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12000:1: 'case'
+            // InternalCheckCfg.g:11999:1: ( 'case' )
+            // InternalCheckCfg.g:12000:1: 'case'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getCaseKeyword_2_0()); 
             }
-            match(input,75,FOLLOW_75_in_rule__XCasePart__Group_2__0__Impl24435); if (state.failed) return ;
+            match(input,75,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXCasePartAccess().getCaseKeyword_2_0()); 
             }
@@ -35257,16 +35257,16 @@ public final void rule__XCasePart__Group_2__0__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XCasePart__Group_2__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12013:1: rule__XCasePart__Group_2__1 : rule__XCasePart__Group_2__1__Impl ;
+    // InternalCheckCfg.g:12013:1: rule__XCasePart__Group_2__1 : rule__XCasePart__Group_2__1__Impl ;
     public final void rule__XCasePart__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12017:1: ( rule__XCasePart__Group_2__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12018:2: rule__XCasePart__Group_2__1__Impl
+            // InternalCheckCfg.g:12017:1: ( rule__XCasePart__Group_2__1__Impl )
+            // InternalCheckCfg.g:12018:2: rule__XCasePart__Group_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__XCasePart__Group_2__1__Impl_in_rule__XCasePart__Group_2__124466);
+            pushFollow(FOLLOW_2);
             rule__XCasePart__Group_2__1__Impl();
 
             state._fsp--;
@@ -35290,25 +35290,25 @@ public final void rule__XCasePart__Group_2__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCasePart__Group_2__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12024:1: rule__XCasePart__Group_2__1__Impl : ( ( rule__XCasePart__CaseAssignment_2_1 ) ) ;
+    // InternalCheckCfg.g:12024:1: rule__XCasePart__Group_2__1__Impl : ( ( rule__XCasePart__CaseAssignment_2_1 ) ) ;
     public final void rule__XCasePart__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12028:1: ( ( ( rule__XCasePart__CaseAssignment_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12029:1: ( ( rule__XCasePart__CaseAssignment_2_1 ) )
+            // InternalCheckCfg.g:12028:1: ( ( ( rule__XCasePart__CaseAssignment_2_1 ) ) )
+            // InternalCheckCfg.g:12029:1: ( ( rule__XCasePart__CaseAssignment_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12029:1: ( ( rule__XCasePart__CaseAssignment_2_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12030:1: ( rule__XCasePart__CaseAssignment_2_1 )
+            // InternalCheckCfg.g:12029:1: ( ( rule__XCasePart__CaseAssignment_2_1 ) )
+            // InternalCheckCfg.g:12030:1: ( rule__XCasePart__CaseAssignment_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getCaseAssignment_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12031:1: ( rule__XCasePart__CaseAssignment_2_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12031:2: rule__XCasePart__CaseAssignment_2_1
+            // InternalCheckCfg.g:12031:1: ( rule__XCasePart__CaseAssignment_2_1 )
+            // InternalCheckCfg.g:12031:2: rule__XCasePart__CaseAssignment_2_1
             {
-            pushFollow(FOLLOW_rule__XCasePart__CaseAssignment_2_1_in_rule__XCasePart__Group_2__1__Impl24493);
+            pushFollow(FOLLOW_2);
             rule__XCasePart__CaseAssignment_2_1();
 
             state._fsp--;
@@ -35341,21 +35341,21 @@ public final void rule__XCasePart__Group_2__1__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XCasePart__Group_3_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12045:1: rule__XCasePart__Group_3_0__0 : rule__XCasePart__Group_3_0__0__Impl rule__XCasePart__Group_3_0__1 ;
+    // InternalCheckCfg.g:12045:1: rule__XCasePart__Group_3_0__0 : rule__XCasePart__Group_3_0__0__Impl rule__XCasePart__Group_3_0__1 ;
     public final void rule__XCasePart__Group_3_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12049:1: ( rule__XCasePart__Group_3_0__0__Impl rule__XCasePart__Group_3_0__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12050:2: rule__XCasePart__Group_3_0__0__Impl rule__XCasePart__Group_3_0__1
+            // InternalCheckCfg.g:12049:1: ( rule__XCasePart__Group_3_0__0__Impl rule__XCasePart__Group_3_0__1 )
+            // InternalCheckCfg.g:12050:2: rule__XCasePart__Group_3_0__0__Impl rule__XCasePart__Group_3_0__1
             {
-            pushFollow(FOLLOW_rule__XCasePart__Group_3_0__0__Impl_in_rule__XCasePart__Group_3_0__024527);
+            pushFollow(FOLLOW_61);
             rule__XCasePart__Group_3_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCasePart__Group_3_0__1_in_rule__XCasePart__Group_3_0__024530);
+            pushFollow(FOLLOW_2);
             rule__XCasePart__Group_3_0__1();
 
             state._fsp--;
@@ -35379,22 +35379,22 @@ public final void rule__XCasePart__Group_3_0__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCasePart__Group_3_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12057:1: rule__XCasePart__Group_3_0__0__Impl : ( ':' ) ;
+    // InternalCheckCfg.g:12057:1: rule__XCasePart__Group_3_0__0__Impl : ( ':' ) ;
     public final void rule__XCasePart__Group_3_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12061:1: ( ( ':' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12062:1: ( ':' )
+            // InternalCheckCfg.g:12061:1: ( ( ':' ) )
+            // InternalCheckCfg.g:12062:1: ( ':' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12062:1: ( ':' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12063:1: ':'
+            // InternalCheckCfg.g:12062:1: ( ':' )
+            // InternalCheckCfg.g:12063:1: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getColonKeyword_3_0_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XCasePart__Group_3_0__0__Impl24558); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXCasePartAccess().getColonKeyword_3_0_0()); 
             }
@@ -35420,16 +35420,16 @@ public final void rule__XCasePart__Group_3_0__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XCasePart__Group_3_0__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12076:1: rule__XCasePart__Group_3_0__1 : rule__XCasePart__Group_3_0__1__Impl ;
+    // InternalCheckCfg.g:12076:1: rule__XCasePart__Group_3_0__1 : rule__XCasePart__Group_3_0__1__Impl ;
     public final void rule__XCasePart__Group_3_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12080:1: ( rule__XCasePart__Group_3_0__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12081:2: rule__XCasePart__Group_3_0__1__Impl
+            // InternalCheckCfg.g:12080:1: ( rule__XCasePart__Group_3_0__1__Impl )
+            // InternalCheckCfg.g:12081:2: rule__XCasePart__Group_3_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XCasePart__Group_3_0__1__Impl_in_rule__XCasePart__Group_3_0__124589);
+            pushFollow(FOLLOW_2);
             rule__XCasePart__Group_3_0__1__Impl();
 
             state._fsp--;
@@ -35453,25 +35453,25 @@ public final void rule__XCasePart__Group_3_0__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCasePart__Group_3_0__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12087:1: rule__XCasePart__Group_3_0__1__Impl : ( ( rule__XCasePart__ThenAssignment_3_0_1 ) ) ;
+    // InternalCheckCfg.g:12087:1: rule__XCasePart__Group_3_0__1__Impl : ( ( rule__XCasePart__ThenAssignment_3_0_1 ) ) ;
     public final void rule__XCasePart__Group_3_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12091:1: ( ( ( rule__XCasePart__ThenAssignment_3_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12092:1: ( ( rule__XCasePart__ThenAssignment_3_0_1 ) )
+            // InternalCheckCfg.g:12091:1: ( ( ( rule__XCasePart__ThenAssignment_3_0_1 ) ) )
+            // InternalCheckCfg.g:12092:1: ( ( rule__XCasePart__ThenAssignment_3_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12092:1: ( ( rule__XCasePart__ThenAssignment_3_0_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12093:1: ( rule__XCasePart__ThenAssignment_3_0_1 )
+            // InternalCheckCfg.g:12092:1: ( ( rule__XCasePart__ThenAssignment_3_0_1 ) )
+            // InternalCheckCfg.g:12093:1: ( rule__XCasePart__ThenAssignment_3_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getThenAssignment_3_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12094:1: ( rule__XCasePart__ThenAssignment_3_0_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12094:2: rule__XCasePart__ThenAssignment_3_0_1
+            // InternalCheckCfg.g:12094:1: ( rule__XCasePart__ThenAssignment_3_0_1 )
+            // InternalCheckCfg.g:12094:2: rule__XCasePart__ThenAssignment_3_0_1
             {
-            pushFollow(FOLLOW_rule__XCasePart__ThenAssignment_3_0_1_in_rule__XCasePart__Group_3_0__1__Impl24616);
+            pushFollow(FOLLOW_2);
             rule__XCasePart__ThenAssignment_3_0_1();
 
             state._fsp--;
@@ -35504,21 +35504,21 @@ public final void rule__XCasePart__Group_3_0__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12108:1: rule__XForLoopExpression__Group__0 : rule__XForLoopExpression__Group__0__Impl rule__XForLoopExpression__Group__1 ;
+    // InternalCheckCfg.g:12108:1: rule__XForLoopExpression__Group__0 : rule__XForLoopExpression__Group__0__Impl rule__XForLoopExpression__Group__1 ;
     public final void rule__XForLoopExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12112:1: ( rule__XForLoopExpression__Group__0__Impl rule__XForLoopExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12113:2: rule__XForLoopExpression__Group__0__Impl rule__XForLoopExpression__Group__1
+            // InternalCheckCfg.g:12112:1: ( rule__XForLoopExpression__Group__0__Impl rule__XForLoopExpression__Group__1 )
+            // InternalCheckCfg.g:12113:2: rule__XForLoopExpression__Group__0__Impl rule__XForLoopExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group__0__Impl_in_rule__XForLoopExpression__Group__024650);
+            pushFollow(FOLLOW_61);
             rule__XForLoopExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group__1_in_rule__XForLoopExpression__Group__024653);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group__1();
 
             state._fsp--;
@@ -35542,25 +35542,25 @@ public final void rule__XForLoopExpression__Group__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12120:1: rule__XForLoopExpression__Group__0__Impl : ( ( rule__XForLoopExpression__Group_0__0 ) ) ;
+    // InternalCheckCfg.g:12120:1: rule__XForLoopExpression__Group__0__Impl : ( ( rule__XForLoopExpression__Group_0__0 ) ) ;
     public final void rule__XForLoopExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12124:1: ( ( ( rule__XForLoopExpression__Group_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12125:1: ( ( rule__XForLoopExpression__Group_0__0 ) )
+            // InternalCheckCfg.g:12124:1: ( ( ( rule__XForLoopExpression__Group_0__0 ) ) )
+            // InternalCheckCfg.g:12125:1: ( ( rule__XForLoopExpression__Group_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12125:1: ( ( rule__XForLoopExpression__Group_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12126:1: ( rule__XForLoopExpression__Group_0__0 )
+            // InternalCheckCfg.g:12125:1: ( ( rule__XForLoopExpression__Group_0__0 ) )
+            // InternalCheckCfg.g:12126:1: ( rule__XForLoopExpression__Group_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getGroup_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12127:1: ( rule__XForLoopExpression__Group_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12127:2: rule__XForLoopExpression__Group_0__0
+            // InternalCheckCfg.g:12127:1: ( rule__XForLoopExpression__Group_0__0 )
+            // InternalCheckCfg.g:12127:2: rule__XForLoopExpression__Group_0__0
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0__0_in_rule__XForLoopExpression__Group__0__Impl24680);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group_0__0();
 
             state._fsp--;
@@ -35593,21 +35593,21 @@ public final void rule__XForLoopExpression__Group__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12137:1: rule__XForLoopExpression__Group__1 : rule__XForLoopExpression__Group__1__Impl rule__XForLoopExpression__Group__2 ;
+    // InternalCheckCfg.g:12137:1: rule__XForLoopExpression__Group__1 : rule__XForLoopExpression__Group__1__Impl rule__XForLoopExpression__Group__2 ;
     public final void rule__XForLoopExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12141:1: ( rule__XForLoopExpression__Group__1__Impl rule__XForLoopExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12142:2: rule__XForLoopExpression__Group__1__Impl rule__XForLoopExpression__Group__2
+            // InternalCheckCfg.g:12141:1: ( rule__XForLoopExpression__Group__1__Impl rule__XForLoopExpression__Group__2 )
+            // InternalCheckCfg.g:12142:2: rule__XForLoopExpression__Group__1__Impl rule__XForLoopExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group__1__Impl_in_rule__XForLoopExpression__Group__124710);
+            pushFollow(FOLLOW_70);
             rule__XForLoopExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group__2_in_rule__XForLoopExpression__Group__124713);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group__2();
 
             state._fsp--;
@@ -35631,25 +35631,25 @@ public final void rule__XForLoopExpression__Group__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12149:1: rule__XForLoopExpression__Group__1__Impl : ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) ) ;
+    // InternalCheckCfg.g:12149:1: rule__XForLoopExpression__Group__1__Impl : ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) ) ;
     public final void rule__XForLoopExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12153:1: ( ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12154:1: ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) )
+            // InternalCheckCfg.g:12153:1: ( ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) ) )
+            // InternalCheckCfg.g:12154:1: ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12154:1: ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12155:1: ( rule__XForLoopExpression__ForExpressionAssignment_1 )
+            // InternalCheckCfg.g:12154:1: ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) )
+            // InternalCheckCfg.g:12155:1: ( rule__XForLoopExpression__ForExpressionAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getForExpressionAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12156:1: ( rule__XForLoopExpression__ForExpressionAssignment_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12156:2: rule__XForLoopExpression__ForExpressionAssignment_1
+            // InternalCheckCfg.g:12156:1: ( rule__XForLoopExpression__ForExpressionAssignment_1 )
+            // InternalCheckCfg.g:12156:2: rule__XForLoopExpression__ForExpressionAssignment_1
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__ForExpressionAssignment_1_in_rule__XForLoopExpression__Group__1__Impl24740);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__ForExpressionAssignment_1();
 
             state._fsp--;
@@ -35682,21 +35682,21 @@ public final void rule__XForLoopExpression__Group__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12166:1: rule__XForLoopExpression__Group__2 : rule__XForLoopExpression__Group__2__Impl rule__XForLoopExpression__Group__3 ;
+    // InternalCheckCfg.g:12166:1: rule__XForLoopExpression__Group__2 : rule__XForLoopExpression__Group__2__Impl rule__XForLoopExpression__Group__3 ;
     public final void rule__XForLoopExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12170:1: ( rule__XForLoopExpression__Group__2__Impl rule__XForLoopExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12171:2: rule__XForLoopExpression__Group__2__Impl rule__XForLoopExpression__Group__3
+            // InternalCheckCfg.g:12170:1: ( rule__XForLoopExpression__Group__2__Impl rule__XForLoopExpression__Group__3 )
+            // InternalCheckCfg.g:12171:2: rule__XForLoopExpression__Group__2__Impl rule__XForLoopExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group__2__Impl_in_rule__XForLoopExpression__Group__224770);
+            pushFollow(FOLLOW_61);
             rule__XForLoopExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group__3_in_rule__XForLoopExpression__Group__224773);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group__3();
 
             state._fsp--;
@@ -35720,22 +35720,22 @@ public final void rule__XForLoopExpression__Group__2() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12178:1: rule__XForLoopExpression__Group__2__Impl : ( ')' ) ;
+    // InternalCheckCfg.g:12178:1: rule__XForLoopExpression__Group__2__Impl : ( ')' ) ;
     public final void rule__XForLoopExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12182:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12183:1: ( ')' )
+            // InternalCheckCfg.g:12182:1: ( ( ')' ) )
+            // InternalCheckCfg.g:12183:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12183:1: ( ')' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12184:1: ')'
+            // InternalCheckCfg.g:12183:1: ( ')' )
+            // InternalCheckCfg.g:12184:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getRightParenthesisKeyword_2()); 
             }
-            match(input,63,FOLLOW_63_in_rule__XForLoopExpression__Group__2__Impl24801); if (state.failed) return ;
+            match(input,63,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXForLoopExpressionAccess().getRightParenthesisKeyword_2()); 
             }
@@ -35761,16 +35761,16 @@ public final void rule__XForLoopExpression__Group__2__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12197:1: rule__XForLoopExpression__Group__3 : rule__XForLoopExpression__Group__3__Impl ;
+    // InternalCheckCfg.g:12197:1: rule__XForLoopExpression__Group__3 : rule__XForLoopExpression__Group__3__Impl ;
     public final void rule__XForLoopExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12201:1: ( rule__XForLoopExpression__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12202:2: rule__XForLoopExpression__Group__3__Impl
+            // InternalCheckCfg.g:12201:1: ( rule__XForLoopExpression__Group__3__Impl )
+            // InternalCheckCfg.g:12202:2: rule__XForLoopExpression__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group__3__Impl_in_rule__XForLoopExpression__Group__324832);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group__3__Impl();
 
             state._fsp--;
@@ -35794,25 +35794,25 @@ public final void rule__XForLoopExpression__Group__3() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12208:1: rule__XForLoopExpression__Group__3__Impl : ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) ) ;
+    // InternalCheckCfg.g:12208:1: rule__XForLoopExpression__Group__3__Impl : ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) ) ;
     public final void rule__XForLoopExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12212:1: ( ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12213:1: ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) )
+            // InternalCheckCfg.g:12212:1: ( ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) ) )
+            // InternalCheckCfg.g:12213:1: ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12213:1: ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12214:1: ( rule__XForLoopExpression__EachExpressionAssignment_3 )
+            // InternalCheckCfg.g:12213:1: ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) )
+            // InternalCheckCfg.g:12214:1: ( rule__XForLoopExpression__EachExpressionAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getEachExpressionAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12215:1: ( rule__XForLoopExpression__EachExpressionAssignment_3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12215:2: rule__XForLoopExpression__EachExpressionAssignment_3
+            // InternalCheckCfg.g:12215:1: ( rule__XForLoopExpression__EachExpressionAssignment_3 )
+            // InternalCheckCfg.g:12215:2: rule__XForLoopExpression__EachExpressionAssignment_3
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__EachExpressionAssignment_3_in_rule__XForLoopExpression__Group__3__Impl24859);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__EachExpressionAssignment_3();
 
             state._fsp--;
@@ -35845,16 +35845,16 @@ public final void rule__XForLoopExpression__Group__3__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12233:1: rule__XForLoopExpression__Group_0__0 : rule__XForLoopExpression__Group_0__0__Impl ;
+    // InternalCheckCfg.g:12233:1: rule__XForLoopExpression__Group_0__0 : rule__XForLoopExpression__Group_0__0__Impl ;
     public final void rule__XForLoopExpression__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12237:1: ( rule__XForLoopExpression__Group_0__0__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12238:2: rule__XForLoopExpression__Group_0__0__Impl
+            // InternalCheckCfg.g:12237:1: ( rule__XForLoopExpression__Group_0__0__Impl )
+            // InternalCheckCfg.g:12238:2: rule__XForLoopExpression__Group_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0__0__Impl_in_rule__XForLoopExpression__Group_0__024897);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group_0__0__Impl();
 
             state._fsp--;
@@ -35878,25 +35878,25 @@ public final void rule__XForLoopExpression__Group_0__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12244:1: rule__XForLoopExpression__Group_0__0__Impl : ( ( rule__XForLoopExpression__Group_0_0__0 ) ) ;
+    // InternalCheckCfg.g:12244:1: rule__XForLoopExpression__Group_0__0__Impl : ( ( rule__XForLoopExpression__Group_0_0__0 ) ) ;
     public final void rule__XForLoopExpression__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12248:1: ( ( ( rule__XForLoopExpression__Group_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12249:1: ( ( rule__XForLoopExpression__Group_0_0__0 ) )
+            // InternalCheckCfg.g:12248:1: ( ( ( rule__XForLoopExpression__Group_0_0__0 ) ) )
+            // InternalCheckCfg.g:12249:1: ( ( rule__XForLoopExpression__Group_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12249:1: ( ( rule__XForLoopExpression__Group_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12250:1: ( rule__XForLoopExpression__Group_0_0__0 )
+            // InternalCheckCfg.g:12249:1: ( ( rule__XForLoopExpression__Group_0_0__0 ) )
+            // InternalCheckCfg.g:12250:1: ( rule__XForLoopExpression__Group_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getGroup_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12251:1: ( rule__XForLoopExpression__Group_0_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12251:2: rule__XForLoopExpression__Group_0_0__0
+            // InternalCheckCfg.g:12251:1: ( rule__XForLoopExpression__Group_0_0__0 )
+            // InternalCheckCfg.g:12251:2: rule__XForLoopExpression__Group_0_0__0
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__0_in_rule__XForLoopExpression__Group_0__0__Impl24924);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group_0_0__0();
 
             state._fsp--;
@@ -35929,21 +35929,21 @@ public final void rule__XForLoopExpression__Group_0__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12263:1: rule__XForLoopExpression__Group_0_0__0 : rule__XForLoopExpression__Group_0_0__0__Impl rule__XForLoopExpression__Group_0_0__1 ;
+    // InternalCheckCfg.g:12263:1: rule__XForLoopExpression__Group_0_0__0 : rule__XForLoopExpression__Group_0_0__0__Impl rule__XForLoopExpression__Group_0_0__1 ;
     public final void rule__XForLoopExpression__Group_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12267:1: ( rule__XForLoopExpression__Group_0_0__0__Impl rule__XForLoopExpression__Group_0_0__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12268:2: rule__XForLoopExpression__Group_0_0__0__Impl rule__XForLoopExpression__Group_0_0__1
+            // InternalCheckCfg.g:12267:1: ( rule__XForLoopExpression__Group_0_0__0__Impl rule__XForLoopExpression__Group_0_0__1 )
+            // InternalCheckCfg.g:12268:2: rule__XForLoopExpression__Group_0_0__0__Impl rule__XForLoopExpression__Group_0_0__1
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__0__Impl_in_rule__XForLoopExpression__Group_0_0__024956);
+            pushFollow(FOLLOW_78);
             rule__XForLoopExpression__Group_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__1_in_rule__XForLoopExpression__Group_0_0__024959);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group_0_0__1();
 
             state._fsp--;
@@ -35967,23 +35967,23 @@ public final void rule__XForLoopExpression__Group_0_0__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12275:1: rule__XForLoopExpression__Group_0_0__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:12275:1: rule__XForLoopExpression__Group_0_0__0__Impl : ( () ) ;
     public final void rule__XForLoopExpression__Group_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12279:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12280:1: ( () )
+            // InternalCheckCfg.g:12279:1: ( ( () ) )
+            // InternalCheckCfg.g:12280:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12280:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12281:1: ()
+            // InternalCheckCfg.g:12280:1: ( () )
+            // InternalCheckCfg.g:12281:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getXForLoopExpressionAction_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12282:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12284:1: 
+            // InternalCheckCfg.g:12282:1: ()
+            // InternalCheckCfg.g:12284:1: 
             {
             }
 
@@ -36008,21 +36008,21 @@ public final void rule__XForLoopExpression__Group_0_0__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12294:1: rule__XForLoopExpression__Group_0_0__1 : rule__XForLoopExpression__Group_0_0__1__Impl rule__XForLoopExpression__Group_0_0__2 ;
+    // InternalCheckCfg.g:12294:1: rule__XForLoopExpression__Group_0_0__1 : rule__XForLoopExpression__Group_0_0__1__Impl rule__XForLoopExpression__Group_0_0__2 ;
     public final void rule__XForLoopExpression__Group_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12298:1: ( rule__XForLoopExpression__Group_0_0__1__Impl rule__XForLoopExpression__Group_0_0__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12299:2: rule__XForLoopExpression__Group_0_0__1__Impl rule__XForLoopExpression__Group_0_0__2
+            // InternalCheckCfg.g:12298:1: ( rule__XForLoopExpression__Group_0_0__1__Impl rule__XForLoopExpression__Group_0_0__2 )
+            // InternalCheckCfg.g:12299:2: rule__XForLoopExpression__Group_0_0__1__Impl rule__XForLoopExpression__Group_0_0__2
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__1__Impl_in_rule__XForLoopExpression__Group_0_0__125017);
+            pushFollow(FOLLOW_16);
             rule__XForLoopExpression__Group_0_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__2_in_rule__XForLoopExpression__Group_0_0__125020);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group_0_0__2();
 
             state._fsp--;
@@ -36046,22 +36046,22 @@ public final void rule__XForLoopExpression__Group_0_0__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12306:1: rule__XForLoopExpression__Group_0_0__1__Impl : ( 'for' ) ;
+    // InternalCheckCfg.g:12306:1: rule__XForLoopExpression__Group_0_0__1__Impl : ( 'for' ) ;
     public final void rule__XForLoopExpression__Group_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12310:1: ( ( 'for' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12311:1: ( 'for' )
+            // InternalCheckCfg.g:12310:1: ( ( 'for' ) )
+            // InternalCheckCfg.g:12311:1: ( 'for' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12311:1: ( 'for' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12312:1: 'for'
+            // InternalCheckCfg.g:12311:1: ( 'for' )
+            // InternalCheckCfg.g:12312:1: 'for'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getForKeyword_0_0_1()); 
             }
-            match(input,60,FOLLOW_60_in_rule__XForLoopExpression__Group_0_0__1__Impl25048); if (state.failed) return ;
+            match(input,60,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXForLoopExpressionAccess().getForKeyword_0_0_1()); 
             }
@@ -36087,21 +36087,21 @@ public final void rule__XForLoopExpression__Group_0_0__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12325:1: rule__XForLoopExpression__Group_0_0__2 : rule__XForLoopExpression__Group_0_0__2__Impl rule__XForLoopExpression__Group_0_0__3 ;
+    // InternalCheckCfg.g:12325:1: rule__XForLoopExpression__Group_0_0__2 : rule__XForLoopExpression__Group_0_0__2__Impl rule__XForLoopExpression__Group_0_0__3 ;
     public final void rule__XForLoopExpression__Group_0_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12329:1: ( rule__XForLoopExpression__Group_0_0__2__Impl rule__XForLoopExpression__Group_0_0__3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12330:2: rule__XForLoopExpression__Group_0_0__2__Impl rule__XForLoopExpression__Group_0_0__3
+            // InternalCheckCfg.g:12329:1: ( rule__XForLoopExpression__Group_0_0__2__Impl rule__XForLoopExpression__Group_0_0__3 )
+            // InternalCheckCfg.g:12330:2: rule__XForLoopExpression__Group_0_0__2__Impl rule__XForLoopExpression__Group_0_0__3
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__2__Impl_in_rule__XForLoopExpression__Group_0_0__225079);
+            pushFollow(FOLLOW_39);
             rule__XForLoopExpression__Group_0_0__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__3_in_rule__XForLoopExpression__Group_0_0__225082);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group_0_0__3();
 
             state._fsp--;
@@ -36125,22 +36125,22 @@ public final void rule__XForLoopExpression__Group_0_0__2() throws RecognitionExc
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12337:1: rule__XForLoopExpression__Group_0_0__2__Impl : ( '(' ) ;
+    // InternalCheckCfg.g:12337:1: rule__XForLoopExpression__Group_0_0__2__Impl : ( '(' ) ;
     public final void rule__XForLoopExpression__Group_0_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12341:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12342:1: ( '(' )
+            // InternalCheckCfg.g:12341:1: ( ( '(' ) )
+            // InternalCheckCfg.g:12342:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12342:1: ( '(' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12343:1: '('
+            // InternalCheckCfg.g:12342:1: ( '(' )
+            // InternalCheckCfg.g:12343:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getLeftParenthesisKeyword_0_0_2()); 
             }
-            match(input,62,FOLLOW_62_in_rule__XForLoopExpression__Group_0_0__2__Impl25110); if (state.failed) return ;
+            match(input,62,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXForLoopExpressionAccess().getLeftParenthesisKeyword_0_0_2()); 
             }
@@ -36166,21 +36166,21 @@ public final void rule__XForLoopExpression__Group_0_0__2__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12356:1: rule__XForLoopExpression__Group_0_0__3 : rule__XForLoopExpression__Group_0_0__3__Impl rule__XForLoopExpression__Group_0_0__4 ;
+    // InternalCheckCfg.g:12356:1: rule__XForLoopExpression__Group_0_0__3 : rule__XForLoopExpression__Group_0_0__3__Impl rule__XForLoopExpression__Group_0_0__4 ;
     public final void rule__XForLoopExpression__Group_0_0__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12360:1: ( rule__XForLoopExpression__Group_0_0__3__Impl rule__XForLoopExpression__Group_0_0__4 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12361:2: rule__XForLoopExpression__Group_0_0__3__Impl rule__XForLoopExpression__Group_0_0__4
+            // InternalCheckCfg.g:12360:1: ( rule__XForLoopExpression__Group_0_0__3__Impl rule__XForLoopExpression__Group_0_0__4 )
+            // InternalCheckCfg.g:12361:2: rule__XForLoopExpression__Group_0_0__3__Impl rule__XForLoopExpression__Group_0_0__4
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__3__Impl_in_rule__XForLoopExpression__Group_0_0__325141);
+            pushFollow(FOLLOW_76);
             rule__XForLoopExpression__Group_0_0__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__4_in_rule__XForLoopExpression__Group_0_0__325144);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group_0_0__4();
 
             state._fsp--;
@@ -36204,25 +36204,25 @@ public final void rule__XForLoopExpression__Group_0_0__3() throws RecognitionExc
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__3__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12368:1: rule__XForLoopExpression__Group_0_0__3__Impl : ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) ) ;
+    // InternalCheckCfg.g:12368:1: rule__XForLoopExpression__Group_0_0__3__Impl : ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) ) ;
     public final void rule__XForLoopExpression__Group_0_0__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12372:1: ( ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12373:1: ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) )
+            // InternalCheckCfg.g:12372:1: ( ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) ) )
+            // InternalCheckCfg.g:12373:1: ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12373:1: ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12374:1: ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 )
+            // InternalCheckCfg.g:12373:1: ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) )
+            // InternalCheckCfg.g:12374:1: ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getDeclaredParamAssignment_0_0_3()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12375:1: ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12375:2: rule__XForLoopExpression__DeclaredParamAssignment_0_0_3
+            // InternalCheckCfg.g:12375:1: ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 )
+            // InternalCheckCfg.g:12375:2: rule__XForLoopExpression__DeclaredParamAssignment_0_0_3
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__DeclaredParamAssignment_0_0_3_in_rule__XForLoopExpression__Group_0_0__3__Impl25171);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__DeclaredParamAssignment_0_0_3();
 
             state._fsp--;
@@ -36255,16 +36255,16 @@ public final void rule__XForLoopExpression__Group_0_0__3__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__4"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12385:1: rule__XForLoopExpression__Group_0_0__4 : rule__XForLoopExpression__Group_0_0__4__Impl ;
+    // InternalCheckCfg.g:12385:1: rule__XForLoopExpression__Group_0_0__4 : rule__XForLoopExpression__Group_0_0__4__Impl ;
     public final void rule__XForLoopExpression__Group_0_0__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12389:1: ( rule__XForLoopExpression__Group_0_0__4__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12390:2: rule__XForLoopExpression__Group_0_0__4__Impl
+            // InternalCheckCfg.g:12389:1: ( rule__XForLoopExpression__Group_0_0__4__Impl )
+            // InternalCheckCfg.g:12390:2: rule__XForLoopExpression__Group_0_0__4__Impl
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__4__Impl_in_rule__XForLoopExpression__Group_0_0__425201);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group_0_0__4__Impl();
 
             state._fsp--;
@@ -36288,22 +36288,22 @@ public final void rule__XForLoopExpression__Group_0_0__4() throws RecognitionExc
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__4__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12396:1: rule__XForLoopExpression__Group_0_0__4__Impl : ( ':' ) ;
+    // InternalCheckCfg.g:12396:1: rule__XForLoopExpression__Group_0_0__4__Impl : ( ':' ) ;
     public final void rule__XForLoopExpression__Group_0_0__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12400:1: ( ( ':' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12401:1: ( ':' )
+            // InternalCheckCfg.g:12400:1: ( ( ':' ) )
+            // InternalCheckCfg.g:12401:1: ( ':' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12401:1: ( ':' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12402:1: ':'
+            // InternalCheckCfg.g:12401:1: ( ':' )
+            // InternalCheckCfg.g:12402:1: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getColonKeyword_0_0_4()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XForLoopExpression__Group_0_0__4__Impl25229); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXForLoopExpressionAccess().getColonKeyword_0_0_4()); 
             }
@@ -36329,21 +36329,21 @@ public final void rule__XForLoopExpression__Group_0_0__4__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12425:1: rule__XBasicForLoopExpression__Group__0 : rule__XBasicForLoopExpression__Group__0__Impl rule__XBasicForLoopExpression__Group__1 ;
+    // InternalCheckCfg.g:12425:1: rule__XBasicForLoopExpression__Group__0 : rule__XBasicForLoopExpression__Group__0__Impl rule__XBasicForLoopExpression__Group__1 ;
     public final void rule__XBasicForLoopExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12429:1: ( rule__XBasicForLoopExpression__Group__0__Impl rule__XBasicForLoopExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12430:2: rule__XBasicForLoopExpression__Group__0__Impl rule__XBasicForLoopExpression__Group__1
+            // InternalCheckCfg.g:12429:1: ( rule__XBasicForLoopExpression__Group__0__Impl rule__XBasicForLoopExpression__Group__1 )
+            // InternalCheckCfg.g:12430:2: rule__XBasicForLoopExpression__Group__0__Impl rule__XBasicForLoopExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__0__Impl_in_rule__XBasicForLoopExpression__Group__025270);
+            pushFollow(FOLLOW_78);
             rule__XBasicForLoopExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__1_in_rule__XBasicForLoopExpression__Group__025273);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group__1();
 
             state._fsp--;
@@ -36367,23 +36367,23 @@ public final void rule__XBasicForLoopExpression__Group__0() throws RecognitionEx
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12437:1: rule__XBasicForLoopExpression__Group__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:12437:1: rule__XBasicForLoopExpression__Group__0__Impl : ( () ) ;
     public final void rule__XBasicForLoopExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12441:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12442:1: ( () )
+            // InternalCheckCfg.g:12441:1: ( ( () ) )
+            // InternalCheckCfg.g:12442:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12442:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12443:1: ()
+            // InternalCheckCfg.g:12442:1: ( () )
+            // InternalCheckCfg.g:12443:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getXBasicForLoopExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12444:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12446:1: 
+            // InternalCheckCfg.g:12444:1: ()
+            // InternalCheckCfg.g:12446:1: 
             {
             }
 
@@ -36408,21 +36408,21 @@ public final void rule__XBasicForLoopExpression__Group__0__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12456:1: rule__XBasicForLoopExpression__Group__1 : rule__XBasicForLoopExpression__Group__1__Impl rule__XBasicForLoopExpression__Group__2 ;
+    // InternalCheckCfg.g:12456:1: rule__XBasicForLoopExpression__Group__1 : rule__XBasicForLoopExpression__Group__1__Impl rule__XBasicForLoopExpression__Group__2 ;
     public final void rule__XBasicForLoopExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12460:1: ( rule__XBasicForLoopExpression__Group__1__Impl rule__XBasicForLoopExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12461:2: rule__XBasicForLoopExpression__Group__1__Impl rule__XBasicForLoopExpression__Group__2
+            // InternalCheckCfg.g:12460:1: ( rule__XBasicForLoopExpression__Group__1__Impl rule__XBasicForLoopExpression__Group__2 )
+            // InternalCheckCfg.g:12461:2: rule__XBasicForLoopExpression__Group__1__Impl rule__XBasicForLoopExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__1__Impl_in_rule__XBasicForLoopExpression__Group__125331);
+            pushFollow(FOLLOW_16);
             rule__XBasicForLoopExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__2_in_rule__XBasicForLoopExpression__Group__125334);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group__2();
 
             state._fsp--;
@@ -36446,22 +36446,22 @@ public final void rule__XBasicForLoopExpression__Group__1() throws RecognitionEx
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12468:1: rule__XBasicForLoopExpression__Group__1__Impl : ( 'for' ) ;
+    // InternalCheckCfg.g:12468:1: rule__XBasicForLoopExpression__Group__1__Impl : ( 'for' ) ;
     public final void rule__XBasicForLoopExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12472:1: ( ( 'for' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12473:1: ( 'for' )
+            // InternalCheckCfg.g:12472:1: ( ( 'for' ) )
+            // InternalCheckCfg.g:12473:1: ( 'for' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12473:1: ( 'for' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12474:1: 'for'
+            // InternalCheckCfg.g:12473:1: ( 'for' )
+            // InternalCheckCfg.g:12474:1: 'for'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getForKeyword_1()); 
             }
-            match(input,60,FOLLOW_60_in_rule__XBasicForLoopExpression__Group__1__Impl25362); if (state.failed) return ;
+            match(input,60,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBasicForLoopExpressionAccess().getForKeyword_1()); 
             }
@@ -36487,21 +36487,21 @@ public final void rule__XBasicForLoopExpression__Group__1__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12487:1: rule__XBasicForLoopExpression__Group__2 : rule__XBasicForLoopExpression__Group__2__Impl rule__XBasicForLoopExpression__Group__3 ;
+    // InternalCheckCfg.g:12487:1: rule__XBasicForLoopExpression__Group__2 : rule__XBasicForLoopExpression__Group__2__Impl rule__XBasicForLoopExpression__Group__3 ;
     public final void rule__XBasicForLoopExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12491:1: ( rule__XBasicForLoopExpression__Group__2__Impl rule__XBasicForLoopExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12492:2: rule__XBasicForLoopExpression__Group__2__Impl rule__XBasicForLoopExpression__Group__3
+            // InternalCheckCfg.g:12491:1: ( rule__XBasicForLoopExpression__Group__2__Impl rule__XBasicForLoopExpression__Group__3 )
+            // InternalCheckCfg.g:12492:2: rule__XBasicForLoopExpression__Group__2__Impl rule__XBasicForLoopExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__2__Impl_in_rule__XBasicForLoopExpression__Group__225393);
+            pushFollow(FOLLOW_79);
             rule__XBasicForLoopExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__3_in_rule__XBasicForLoopExpression__Group__225396);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group__3();
 
             state._fsp--;
@@ -36525,22 +36525,22 @@ public final void rule__XBasicForLoopExpression__Group__2() throws RecognitionEx
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12499:1: rule__XBasicForLoopExpression__Group__2__Impl : ( '(' ) ;
+    // InternalCheckCfg.g:12499:1: rule__XBasicForLoopExpression__Group__2__Impl : ( '(' ) ;
     public final void rule__XBasicForLoopExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12503:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12504:1: ( '(' )
+            // InternalCheckCfg.g:12503:1: ( ( '(' ) )
+            // InternalCheckCfg.g:12504:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12504:1: ( '(' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12505:1: '('
+            // InternalCheckCfg.g:12504:1: ( '(' )
+            // InternalCheckCfg.g:12505:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getLeftParenthesisKeyword_2()); 
             }
-            match(input,62,FOLLOW_62_in_rule__XBasicForLoopExpression__Group__2__Impl25424); if (state.failed) return ;
+            match(input,62,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBasicForLoopExpressionAccess().getLeftParenthesisKeyword_2()); 
             }
@@ -36566,21 +36566,21 @@ public final void rule__XBasicForLoopExpression__Group__2__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12518:1: rule__XBasicForLoopExpression__Group__3 : rule__XBasicForLoopExpression__Group__3__Impl rule__XBasicForLoopExpression__Group__4 ;
+    // InternalCheckCfg.g:12518:1: rule__XBasicForLoopExpression__Group__3 : rule__XBasicForLoopExpression__Group__3__Impl rule__XBasicForLoopExpression__Group__4 ;
     public final void rule__XBasicForLoopExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12522:1: ( rule__XBasicForLoopExpression__Group__3__Impl rule__XBasicForLoopExpression__Group__4 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12523:2: rule__XBasicForLoopExpression__Group__3__Impl rule__XBasicForLoopExpression__Group__4
+            // InternalCheckCfg.g:12522:1: ( rule__XBasicForLoopExpression__Group__3__Impl rule__XBasicForLoopExpression__Group__4 )
+            // InternalCheckCfg.g:12523:2: rule__XBasicForLoopExpression__Group__3__Impl rule__XBasicForLoopExpression__Group__4
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__3__Impl_in_rule__XBasicForLoopExpression__Group__325455);
+            pushFollow(FOLLOW_79);
             rule__XBasicForLoopExpression__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__4_in_rule__XBasicForLoopExpression__Group__325458);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group__4();
 
             state._fsp--;
@@ -36604,22 +36604,22 @@ public final void rule__XBasicForLoopExpression__Group__3() throws RecognitionEx
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12530:1: rule__XBasicForLoopExpression__Group__3__Impl : ( ( rule__XBasicForLoopExpression__Group_3__0 )? ) ;
+    // InternalCheckCfg.g:12530:1: rule__XBasicForLoopExpression__Group__3__Impl : ( ( rule__XBasicForLoopExpression__Group_3__0 )? ) ;
     public final void rule__XBasicForLoopExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12534:1: ( ( ( rule__XBasicForLoopExpression__Group_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12535:1: ( ( rule__XBasicForLoopExpression__Group_3__0 )? )
+            // InternalCheckCfg.g:12534:1: ( ( ( rule__XBasicForLoopExpression__Group_3__0 )? ) )
+            // InternalCheckCfg.g:12535:1: ( ( rule__XBasicForLoopExpression__Group_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12535:1: ( ( rule__XBasicForLoopExpression__Group_3__0 )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12536:1: ( rule__XBasicForLoopExpression__Group_3__0 )?
+            // InternalCheckCfg.g:12535:1: ( ( rule__XBasicForLoopExpression__Group_3__0 )? )
+            // InternalCheckCfg.g:12536:1: ( rule__XBasicForLoopExpression__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getGroup_3()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12537:1: ( rule__XBasicForLoopExpression__Group_3__0 )?
+            // InternalCheckCfg.g:12537:1: ( rule__XBasicForLoopExpression__Group_3__0 )?
             int alt92=2;
             int LA92_0 = input.LA(1);
 
@@ -36628,9 +36628,9 @@ public final void rule__XBasicForLoopExpression__Group__3__Impl() throws Recogni
             }
             switch (alt92) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12537:2: rule__XBasicForLoopExpression__Group_3__0
+                    // InternalCheckCfg.g:12537:2: rule__XBasicForLoopExpression__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_3__0_in_rule__XBasicForLoopExpression__Group__3__Impl25485);
+                    pushFollow(FOLLOW_2);
                     rule__XBasicForLoopExpression__Group_3__0();
 
                     state._fsp--;
@@ -36666,21 +36666,21 @@ public final void rule__XBasicForLoopExpression__Group__3__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__4"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12547:1: rule__XBasicForLoopExpression__Group__4 : rule__XBasicForLoopExpression__Group__4__Impl rule__XBasicForLoopExpression__Group__5 ;
+    // InternalCheckCfg.g:12547:1: rule__XBasicForLoopExpression__Group__4 : rule__XBasicForLoopExpression__Group__4__Impl rule__XBasicForLoopExpression__Group__5 ;
     public final void rule__XBasicForLoopExpression__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12551:1: ( rule__XBasicForLoopExpression__Group__4__Impl rule__XBasicForLoopExpression__Group__5 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12552:2: rule__XBasicForLoopExpression__Group__4__Impl rule__XBasicForLoopExpression__Group__5
+            // InternalCheckCfg.g:12551:1: ( rule__XBasicForLoopExpression__Group__4__Impl rule__XBasicForLoopExpression__Group__5 )
+            // InternalCheckCfg.g:12552:2: rule__XBasicForLoopExpression__Group__4__Impl rule__XBasicForLoopExpression__Group__5
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__4__Impl_in_rule__XBasicForLoopExpression__Group__425516);
+            pushFollow(FOLLOW_80);
             rule__XBasicForLoopExpression__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__5_in_rule__XBasicForLoopExpression__Group__425519);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group__5();
 
             state._fsp--;
@@ -36704,22 +36704,22 @@ public final void rule__XBasicForLoopExpression__Group__4() throws RecognitionEx
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12559:1: rule__XBasicForLoopExpression__Group__4__Impl : ( ';' ) ;
+    // InternalCheckCfg.g:12559:1: rule__XBasicForLoopExpression__Group__4__Impl : ( ';' ) ;
     public final void rule__XBasicForLoopExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12563:1: ( ( ';' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12564:1: ( ';' )
+            // InternalCheckCfg.g:12563:1: ( ( ';' ) )
+            // InternalCheckCfg.g:12564:1: ( ';' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12564:1: ( ';' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12565:1: ';'
+            // InternalCheckCfg.g:12564:1: ( ';' )
+            // InternalCheckCfg.g:12565:1: ';'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getSemicolonKeyword_4()); 
             }
-            match(input,70,FOLLOW_70_in_rule__XBasicForLoopExpression__Group__4__Impl25547); if (state.failed) return ;
+            match(input,70,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBasicForLoopExpressionAccess().getSemicolonKeyword_4()); 
             }
@@ -36745,21 +36745,21 @@ public final void rule__XBasicForLoopExpression__Group__4__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__5"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12578:1: rule__XBasicForLoopExpression__Group__5 : rule__XBasicForLoopExpression__Group__5__Impl rule__XBasicForLoopExpression__Group__6 ;
+    // InternalCheckCfg.g:12578:1: rule__XBasicForLoopExpression__Group__5 : rule__XBasicForLoopExpression__Group__5__Impl rule__XBasicForLoopExpression__Group__6 ;
     public final void rule__XBasicForLoopExpression__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12582:1: ( rule__XBasicForLoopExpression__Group__5__Impl rule__XBasicForLoopExpression__Group__6 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12583:2: rule__XBasicForLoopExpression__Group__5__Impl rule__XBasicForLoopExpression__Group__6
+            // InternalCheckCfg.g:12582:1: ( rule__XBasicForLoopExpression__Group__5__Impl rule__XBasicForLoopExpression__Group__6 )
+            // InternalCheckCfg.g:12583:2: rule__XBasicForLoopExpression__Group__5__Impl rule__XBasicForLoopExpression__Group__6
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__5__Impl_in_rule__XBasicForLoopExpression__Group__525578);
+            pushFollow(FOLLOW_80);
             rule__XBasicForLoopExpression__Group__5__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__6_in_rule__XBasicForLoopExpression__Group__525581);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group__6();
 
             state._fsp--;
@@ -36783,22 +36783,22 @@ public final void rule__XBasicForLoopExpression__Group__5() throws RecognitionEx
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12590:1: rule__XBasicForLoopExpression__Group__5__Impl : ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? ) ;
+    // InternalCheckCfg.g:12590:1: rule__XBasicForLoopExpression__Group__5__Impl : ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? ) ;
     public final void rule__XBasicForLoopExpression__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12594:1: ( ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12595:1: ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? )
+            // InternalCheckCfg.g:12594:1: ( ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? ) )
+            // InternalCheckCfg.g:12595:1: ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12595:1: ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12596:1: ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )?
+            // InternalCheckCfg.g:12595:1: ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? )
+            // InternalCheckCfg.g:12596:1: ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getExpressionAssignment_5()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12597:1: ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )?
+            // InternalCheckCfg.g:12597:1: ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )?
             int alt93=2;
             int LA93_0 = input.LA(1);
 
@@ -36807,9 +36807,9 @@ public final void rule__XBasicForLoopExpression__Group__5__Impl() throws Recogni
             }
             switch (alt93) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12597:2: rule__XBasicForLoopExpression__ExpressionAssignment_5
+                    // InternalCheckCfg.g:12597:2: rule__XBasicForLoopExpression__ExpressionAssignment_5
                     {
-                    pushFollow(FOLLOW_rule__XBasicForLoopExpression__ExpressionAssignment_5_in_rule__XBasicForLoopExpression__Group__5__Impl25608);
+                    pushFollow(FOLLOW_2);
                     rule__XBasicForLoopExpression__ExpressionAssignment_5();
 
                     state._fsp--;
@@ -36845,21 +36845,21 @@ public final void rule__XBasicForLoopExpression__Group__5__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__6"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12607:1: rule__XBasicForLoopExpression__Group__6 : rule__XBasicForLoopExpression__Group__6__Impl rule__XBasicForLoopExpression__Group__7 ;
+    // InternalCheckCfg.g:12607:1: rule__XBasicForLoopExpression__Group__6 : rule__XBasicForLoopExpression__Group__6__Impl rule__XBasicForLoopExpression__Group__7 ;
     public final void rule__XBasicForLoopExpression__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12611:1: ( rule__XBasicForLoopExpression__Group__6__Impl rule__XBasicForLoopExpression__Group__7 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12612:2: rule__XBasicForLoopExpression__Group__6__Impl rule__XBasicForLoopExpression__Group__7
+            // InternalCheckCfg.g:12611:1: ( rule__XBasicForLoopExpression__Group__6__Impl rule__XBasicForLoopExpression__Group__7 )
+            // InternalCheckCfg.g:12612:2: rule__XBasicForLoopExpression__Group__6__Impl rule__XBasicForLoopExpression__Group__7
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__6__Impl_in_rule__XBasicForLoopExpression__Group__625639);
+            pushFollow(FOLLOW_60);
             rule__XBasicForLoopExpression__Group__6__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__7_in_rule__XBasicForLoopExpression__Group__625642);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group__7();
 
             state._fsp--;
@@ -36883,22 +36883,22 @@ public final void rule__XBasicForLoopExpression__Group__6() throws RecognitionEx
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__6__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12619:1: rule__XBasicForLoopExpression__Group__6__Impl : ( ';' ) ;
+    // InternalCheckCfg.g:12619:1: rule__XBasicForLoopExpression__Group__6__Impl : ( ';' ) ;
     public final void rule__XBasicForLoopExpression__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12623:1: ( ( ';' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12624:1: ( ';' )
+            // InternalCheckCfg.g:12623:1: ( ( ';' ) )
+            // InternalCheckCfg.g:12624:1: ( ';' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12624:1: ( ';' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12625:1: ';'
+            // InternalCheckCfg.g:12624:1: ( ';' )
+            // InternalCheckCfg.g:12625:1: ';'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getSemicolonKeyword_6()); 
             }
-            match(input,70,FOLLOW_70_in_rule__XBasicForLoopExpression__Group__6__Impl25670); if (state.failed) return ;
+            match(input,70,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBasicForLoopExpressionAccess().getSemicolonKeyword_6()); 
             }
@@ -36924,21 +36924,21 @@ public final void rule__XBasicForLoopExpression__Group__6__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__7"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12638:1: rule__XBasicForLoopExpression__Group__7 : rule__XBasicForLoopExpression__Group__7__Impl rule__XBasicForLoopExpression__Group__8 ;
+    // InternalCheckCfg.g:12638:1: rule__XBasicForLoopExpression__Group__7 : rule__XBasicForLoopExpression__Group__7__Impl rule__XBasicForLoopExpression__Group__8 ;
     public final void rule__XBasicForLoopExpression__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12642:1: ( rule__XBasicForLoopExpression__Group__7__Impl rule__XBasicForLoopExpression__Group__8 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12643:2: rule__XBasicForLoopExpression__Group__7__Impl rule__XBasicForLoopExpression__Group__8
+            // InternalCheckCfg.g:12642:1: ( rule__XBasicForLoopExpression__Group__7__Impl rule__XBasicForLoopExpression__Group__8 )
+            // InternalCheckCfg.g:12643:2: rule__XBasicForLoopExpression__Group__7__Impl rule__XBasicForLoopExpression__Group__8
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__7__Impl_in_rule__XBasicForLoopExpression__Group__725701);
+            pushFollow(FOLLOW_60);
             rule__XBasicForLoopExpression__Group__7__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__8_in_rule__XBasicForLoopExpression__Group__725704);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group__8();
 
             state._fsp--;
@@ -36962,22 +36962,22 @@ public final void rule__XBasicForLoopExpression__Group__7() throws RecognitionEx
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__7__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12650:1: rule__XBasicForLoopExpression__Group__7__Impl : ( ( rule__XBasicForLoopExpression__Group_7__0 )? ) ;
+    // InternalCheckCfg.g:12650:1: rule__XBasicForLoopExpression__Group__7__Impl : ( ( rule__XBasicForLoopExpression__Group_7__0 )? ) ;
     public final void rule__XBasicForLoopExpression__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12654:1: ( ( ( rule__XBasicForLoopExpression__Group_7__0 )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12655:1: ( ( rule__XBasicForLoopExpression__Group_7__0 )? )
+            // InternalCheckCfg.g:12654:1: ( ( ( rule__XBasicForLoopExpression__Group_7__0 )? ) )
+            // InternalCheckCfg.g:12655:1: ( ( rule__XBasicForLoopExpression__Group_7__0 )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12655:1: ( ( rule__XBasicForLoopExpression__Group_7__0 )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12656:1: ( rule__XBasicForLoopExpression__Group_7__0 )?
+            // InternalCheckCfg.g:12655:1: ( ( rule__XBasicForLoopExpression__Group_7__0 )? )
+            // InternalCheckCfg.g:12656:1: ( rule__XBasicForLoopExpression__Group_7__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getGroup_7()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12657:1: ( rule__XBasicForLoopExpression__Group_7__0 )?
+            // InternalCheckCfg.g:12657:1: ( rule__XBasicForLoopExpression__Group_7__0 )?
             int alt94=2;
             int LA94_0 = input.LA(1);
 
@@ -36986,9 +36986,9 @@ public final void rule__XBasicForLoopExpression__Group__7__Impl() throws Recogni
             }
             switch (alt94) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12657:2: rule__XBasicForLoopExpression__Group_7__0
+                    // InternalCheckCfg.g:12657:2: rule__XBasicForLoopExpression__Group_7__0
                     {
-                    pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_7__0_in_rule__XBasicForLoopExpression__Group__7__Impl25731);
+                    pushFollow(FOLLOW_2);
                     rule__XBasicForLoopExpression__Group_7__0();
 
                     state._fsp--;
@@ -37024,21 +37024,21 @@ public final void rule__XBasicForLoopExpression__Group__7__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__8"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12667:1: rule__XBasicForLoopExpression__Group__8 : rule__XBasicForLoopExpression__Group__8__Impl rule__XBasicForLoopExpression__Group__9 ;
+    // InternalCheckCfg.g:12667:1: rule__XBasicForLoopExpression__Group__8 : rule__XBasicForLoopExpression__Group__8__Impl rule__XBasicForLoopExpression__Group__9 ;
     public final void rule__XBasicForLoopExpression__Group__8() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12671:1: ( rule__XBasicForLoopExpression__Group__8__Impl rule__XBasicForLoopExpression__Group__9 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12672:2: rule__XBasicForLoopExpression__Group__8__Impl rule__XBasicForLoopExpression__Group__9
+            // InternalCheckCfg.g:12671:1: ( rule__XBasicForLoopExpression__Group__8__Impl rule__XBasicForLoopExpression__Group__9 )
+            // InternalCheckCfg.g:12672:2: rule__XBasicForLoopExpression__Group__8__Impl rule__XBasicForLoopExpression__Group__9
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__8__Impl_in_rule__XBasicForLoopExpression__Group__825762);
+            pushFollow(FOLLOW_61);
             rule__XBasicForLoopExpression__Group__8__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__9_in_rule__XBasicForLoopExpression__Group__825765);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group__9();
 
             state._fsp--;
@@ -37062,22 +37062,22 @@ public final void rule__XBasicForLoopExpression__Group__8() throws RecognitionEx
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__8__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12679:1: rule__XBasicForLoopExpression__Group__8__Impl : ( ')' ) ;
+    // InternalCheckCfg.g:12679:1: rule__XBasicForLoopExpression__Group__8__Impl : ( ')' ) ;
     public final void rule__XBasicForLoopExpression__Group__8__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12683:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12684:1: ( ')' )
+            // InternalCheckCfg.g:12683:1: ( ( ')' ) )
+            // InternalCheckCfg.g:12684:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12684:1: ( ')' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12685:1: ')'
+            // InternalCheckCfg.g:12684:1: ( ')' )
+            // InternalCheckCfg.g:12685:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getRightParenthesisKeyword_8()); 
             }
-            match(input,63,FOLLOW_63_in_rule__XBasicForLoopExpression__Group__8__Impl25793); if (state.failed) return ;
+            match(input,63,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBasicForLoopExpressionAccess().getRightParenthesisKeyword_8()); 
             }
@@ -37103,16 +37103,16 @@ public final void rule__XBasicForLoopExpression__Group__8__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__9"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12698:1: rule__XBasicForLoopExpression__Group__9 : rule__XBasicForLoopExpression__Group__9__Impl ;
+    // InternalCheckCfg.g:12698:1: rule__XBasicForLoopExpression__Group__9 : rule__XBasicForLoopExpression__Group__9__Impl ;
     public final void rule__XBasicForLoopExpression__Group__9() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12702:1: ( rule__XBasicForLoopExpression__Group__9__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12703:2: rule__XBasicForLoopExpression__Group__9__Impl
+            // InternalCheckCfg.g:12702:1: ( rule__XBasicForLoopExpression__Group__9__Impl )
+            // InternalCheckCfg.g:12703:2: rule__XBasicForLoopExpression__Group__9__Impl
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__9__Impl_in_rule__XBasicForLoopExpression__Group__925824);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group__9__Impl();
 
             state._fsp--;
@@ -37136,25 +37136,25 @@ public final void rule__XBasicForLoopExpression__Group__9() throws RecognitionEx
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__9__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12709:1: rule__XBasicForLoopExpression__Group__9__Impl : ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) ) ;
+    // InternalCheckCfg.g:12709:1: rule__XBasicForLoopExpression__Group__9__Impl : ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) ) ;
     public final void rule__XBasicForLoopExpression__Group__9__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12713:1: ( ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12714:1: ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) )
+            // InternalCheckCfg.g:12713:1: ( ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) ) )
+            // InternalCheckCfg.g:12714:1: ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12714:1: ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12715:1: ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 )
+            // InternalCheckCfg.g:12714:1: ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) )
+            // InternalCheckCfg.g:12715:1: ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getEachExpressionAssignment_9()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12716:1: ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12716:2: rule__XBasicForLoopExpression__EachExpressionAssignment_9
+            // InternalCheckCfg.g:12716:1: ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 )
+            // InternalCheckCfg.g:12716:2: rule__XBasicForLoopExpression__EachExpressionAssignment_9
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__EachExpressionAssignment_9_in_rule__XBasicForLoopExpression__Group__9__Impl25851);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__EachExpressionAssignment_9();
 
             state._fsp--;
@@ -37187,21 +37187,21 @@ public final void rule__XBasicForLoopExpression__Group__9__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12746:1: rule__XBasicForLoopExpression__Group_3__0 : rule__XBasicForLoopExpression__Group_3__0__Impl rule__XBasicForLoopExpression__Group_3__1 ;
+    // InternalCheckCfg.g:12746:1: rule__XBasicForLoopExpression__Group_3__0 : rule__XBasicForLoopExpression__Group_3__0__Impl rule__XBasicForLoopExpression__Group_3__1 ;
     public final void rule__XBasicForLoopExpression__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12750:1: ( rule__XBasicForLoopExpression__Group_3__0__Impl rule__XBasicForLoopExpression__Group_3__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12751:2: rule__XBasicForLoopExpression__Group_3__0__Impl rule__XBasicForLoopExpression__Group_3__1
+            // InternalCheckCfg.g:12750:1: ( rule__XBasicForLoopExpression__Group_3__0__Impl rule__XBasicForLoopExpression__Group_3__1 )
+            // InternalCheckCfg.g:12751:2: rule__XBasicForLoopExpression__Group_3__0__Impl rule__XBasicForLoopExpression__Group_3__1
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_3__0__Impl_in_rule__XBasicForLoopExpression__Group_3__025901);
+            pushFollow(FOLLOW_25);
             rule__XBasicForLoopExpression__Group_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_3__1_in_rule__XBasicForLoopExpression__Group_3__025904);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group_3__1();
 
             state._fsp--;
@@ -37225,25 +37225,25 @@ public final void rule__XBasicForLoopExpression__Group_3__0() throws Recognition
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12758:1: rule__XBasicForLoopExpression__Group_3__0__Impl : ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) ) ;
+    // InternalCheckCfg.g:12758:1: rule__XBasicForLoopExpression__Group_3__0__Impl : ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) ) ;
     public final void rule__XBasicForLoopExpression__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12762:1: ( ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12763:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) )
+            // InternalCheckCfg.g:12762:1: ( ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) ) )
+            // InternalCheckCfg.g:12763:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12763:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12764:1: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 )
+            // InternalCheckCfg.g:12763:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) )
+            // InternalCheckCfg.g:12764:1: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getInitExpressionsAssignment_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12765:1: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12765:2: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0
+            // InternalCheckCfg.g:12765:1: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 )
+            // InternalCheckCfg.g:12765:2: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0_in_rule__XBasicForLoopExpression__Group_3__0__Impl25931);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0();
 
             state._fsp--;
@@ -37276,16 +37276,16 @@ public final void rule__XBasicForLoopExpression__Group_3__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12775:1: rule__XBasicForLoopExpression__Group_3__1 : rule__XBasicForLoopExpression__Group_3__1__Impl ;
+    // InternalCheckCfg.g:12775:1: rule__XBasicForLoopExpression__Group_3__1 : rule__XBasicForLoopExpression__Group_3__1__Impl ;
     public final void rule__XBasicForLoopExpression__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12779:1: ( rule__XBasicForLoopExpression__Group_3__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12780:2: rule__XBasicForLoopExpression__Group_3__1__Impl
+            // InternalCheckCfg.g:12779:1: ( rule__XBasicForLoopExpression__Group_3__1__Impl )
+            // InternalCheckCfg.g:12780:2: rule__XBasicForLoopExpression__Group_3__1__Impl
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_3__1__Impl_in_rule__XBasicForLoopExpression__Group_3__125961);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group_3__1__Impl();
 
             state._fsp--;
@@ -37309,22 +37309,22 @@ public final void rule__XBasicForLoopExpression__Group_3__1() throws Recognition
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12786:1: rule__XBasicForLoopExpression__Group_3__1__Impl : ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* ) ;
+    // InternalCheckCfg.g:12786:1: rule__XBasicForLoopExpression__Group_3__1__Impl : ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* ) ;
     public final void rule__XBasicForLoopExpression__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12790:1: ( ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12791:1: ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* )
+            // InternalCheckCfg.g:12790:1: ( ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* ) )
+            // InternalCheckCfg.g:12791:1: ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12791:1: ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12792:1: ( rule__XBasicForLoopExpression__Group_3_1__0 )*
+            // InternalCheckCfg.g:12791:1: ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* )
+            // InternalCheckCfg.g:12792:1: ( rule__XBasicForLoopExpression__Group_3_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getGroup_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12793:1: ( rule__XBasicForLoopExpression__Group_3_1__0 )*
+            // InternalCheckCfg.g:12793:1: ( rule__XBasicForLoopExpression__Group_3_1__0 )*
             loop95:
             do {
                 int alt95=2;
@@ -37337,9 +37337,9 @@ public final void rule__XBasicForLoopExpression__Group_3__1__Impl() throws Recog
 
                 switch (alt95) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12793:2: rule__XBasicForLoopExpression__Group_3_1__0
+            	    // InternalCheckCfg.g:12793:2: rule__XBasicForLoopExpression__Group_3_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_3_1__0_in_rule__XBasicForLoopExpression__Group_3__1__Impl25988);
+            	    pushFollow(FOLLOW_18);
             	    rule__XBasicForLoopExpression__Group_3_1__0();
 
             	    state._fsp--;
@@ -37378,21 +37378,21 @@ public final void rule__XBasicForLoopExpression__Group_3__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3_1__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12807:1: rule__XBasicForLoopExpression__Group_3_1__0 : rule__XBasicForLoopExpression__Group_3_1__0__Impl rule__XBasicForLoopExpression__Group_3_1__1 ;
+    // InternalCheckCfg.g:12807:1: rule__XBasicForLoopExpression__Group_3_1__0 : rule__XBasicForLoopExpression__Group_3_1__0__Impl rule__XBasicForLoopExpression__Group_3_1__1 ;
     public final void rule__XBasicForLoopExpression__Group_3_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12811:1: ( rule__XBasicForLoopExpression__Group_3_1__0__Impl rule__XBasicForLoopExpression__Group_3_1__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12812:2: rule__XBasicForLoopExpression__Group_3_1__0__Impl rule__XBasicForLoopExpression__Group_3_1__1
+            // InternalCheckCfg.g:12811:1: ( rule__XBasicForLoopExpression__Group_3_1__0__Impl rule__XBasicForLoopExpression__Group_3_1__1 )
+            // InternalCheckCfg.g:12812:2: rule__XBasicForLoopExpression__Group_3_1__0__Impl rule__XBasicForLoopExpression__Group_3_1__1
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_3_1__0__Impl_in_rule__XBasicForLoopExpression__Group_3_1__026023);
+            pushFollow(FOLLOW_65);
             rule__XBasicForLoopExpression__Group_3_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_3_1__1_in_rule__XBasicForLoopExpression__Group_3_1__026026);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group_3_1__1();
 
             state._fsp--;
@@ -37416,22 +37416,22 @@ public final void rule__XBasicForLoopExpression__Group_3_1__0() throws Recogniti
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3_1__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12819:1: rule__XBasicForLoopExpression__Group_3_1__0__Impl : ( ',' ) ;
+    // InternalCheckCfg.g:12819:1: rule__XBasicForLoopExpression__Group_3_1__0__Impl : ( ',' ) ;
     public final void rule__XBasicForLoopExpression__Group_3_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12823:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12824:1: ( ',' )
+            // InternalCheckCfg.g:12823:1: ( ( ',' ) )
+            // InternalCheckCfg.g:12824:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12824:1: ( ',' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12825:1: ','
+            // InternalCheckCfg.g:12824:1: ( ',' )
+            // InternalCheckCfg.g:12825:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getCommaKeyword_3_1_0()); 
             }
-            match(input,64,FOLLOW_64_in_rule__XBasicForLoopExpression__Group_3_1__0__Impl26054); if (state.failed) return ;
+            match(input,64,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBasicForLoopExpressionAccess().getCommaKeyword_3_1_0()); 
             }
@@ -37457,16 +37457,16 @@ public final void rule__XBasicForLoopExpression__Group_3_1__0__Impl() throws Rec
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3_1__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12838:1: rule__XBasicForLoopExpression__Group_3_1__1 : rule__XBasicForLoopExpression__Group_3_1__1__Impl ;
+    // InternalCheckCfg.g:12838:1: rule__XBasicForLoopExpression__Group_3_1__1 : rule__XBasicForLoopExpression__Group_3_1__1__Impl ;
     public final void rule__XBasicForLoopExpression__Group_3_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12842:1: ( rule__XBasicForLoopExpression__Group_3_1__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12843:2: rule__XBasicForLoopExpression__Group_3_1__1__Impl
+            // InternalCheckCfg.g:12842:1: ( rule__XBasicForLoopExpression__Group_3_1__1__Impl )
+            // InternalCheckCfg.g:12843:2: rule__XBasicForLoopExpression__Group_3_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_3_1__1__Impl_in_rule__XBasicForLoopExpression__Group_3_1__126085);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group_3_1__1__Impl();
 
             state._fsp--;
@@ -37490,25 +37490,25 @@ public final void rule__XBasicForLoopExpression__Group_3_1__1() throws Recogniti
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3_1__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12849:1: rule__XBasicForLoopExpression__Group_3_1__1__Impl : ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) ) ;
+    // InternalCheckCfg.g:12849:1: rule__XBasicForLoopExpression__Group_3_1__1__Impl : ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) ) ;
     public final void rule__XBasicForLoopExpression__Group_3_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12853:1: ( ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12854:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) )
+            // InternalCheckCfg.g:12853:1: ( ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) ) )
+            // InternalCheckCfg.g:12854:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12854:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12855:1: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 )
+            // InternalCheckCfg.g:12854:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) )
+            // InternalCheckCfg.g:12855:1: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getInitExpressionsAssignment_3_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12856:1: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12856:2: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1
+            // InternalCheckCfg.g:12856:1: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 )
+            // InternalCheckCfg.g:12856:2: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1_in_rule__XBasicForLoopExpression__Group_3_1__1__Impl26112);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1();
 
             state._fsp--;
@@ -37541,21 +37541,21 @@ public final void rule__XBasicForLoopExpression__Group_3_1__1__Impl() throws Rec
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12870:1: rule__XBasicForLoopExpression__Group_7__0 : rule__XBasicForLoopExpression__Group_7__0__Impl rule__XBasicForLoopExpression__Group_7__1 ;
+    // InternalCheckCfg.g:12870:1: rule__XBasicForLoopExpression__Group_7__0 : rule__XBasicForLoopExpression__Group_7__0__Impl rule__XBasicForLoopExpression__Group_7__1 ;
     public final void rule__XBasicForLoopExpression__Group_7__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12874:1: ( rule__XBasicForLoopExpression__Group_7__0__Impl rule__XBasicForLoopExpression__Group_7__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12875:2: rule__XBasicForLoopExpression__Group_7__0__Impl rule__XBasicForLoopExpression__Group_7__1
+            // InternalCheckCfg.g:12874:1: ( rule__XBasicForLoopExpression__Group_7__0__Impl rule__XBasicForLoopExpression__Group_7__1 )
+            // InternalCheckCfg.g:12875:2: rule__XBasicForLoopExpression__Group_7__0__Impl rule__XBasicForLoopExpression__Group_7__1
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_7__0__Impl_in_rule__XBasicForLoopExpression__Group_7__026146);
+            pushFollow(FOLLOW_25);
             rule__XBasicForLoopExpression__Group_7__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_7__1_in_rule__XBasicForLoopExpression__Group_7__026149);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group_7__1();
 
             state._fsp--;
@@ -37579,25 +37579,25 @@ public final void rule__XBasicForLoopExpression__Group_7__0() throws Recognition
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12882:1: rule__XBasicForLoopExpression__Group_7__0__Impl : ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) ) ;
+    // InternalCheckCfg.g:12882:1: rule__XBasicForLoopExpression__Group_7__0__Impl : ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) ) ;
     public final void rule__XBasicForLoopExpression__Group_7__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12886:1: ( ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12887:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) )
+            // InternalCheckCfg.g:12886:1: ( ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) ) )
+            // InternalCheckCfg.g:12887:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12887:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12888:1: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 )
+            // InternalCheckCfg.g:12887:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) )
+            // InternalCheckCfg.g:12888:1: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getUpdateExpressionsAssignment_7_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12889:1: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12889:2: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0
+            // InternalCheckCfg.g:12889:1: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 )
+            // InternalCheckCfg.g:12889:2: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0_in_rule__XBasicForLoopExpression__Group_7__0__Impl26176);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0();
 
             state._fsp--;
@@ -37630,16 +37630,16 @@ public final void rule__XBasicForLoopExpression__Group_7__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12899:1: rule__XBasicForLoopExpression__Group_7__1 : rule__XBasicForLoopExpression__Group_7__1__Impl ;
+    // InternalCheckCfg.g:12899:1: rule__XBasicForLoopExpression__Group_7__1 : rule__XBasicForLoopExpression__Group_7__1__Impl ;
     public final void rule__XBasicForLoopExpression__Group_7__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12903:1: ( rule__XBasicForLoopExpression__Group_7__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12904:2: rule__XBasicForLoopExpression__Group_7__1__Impl
+            // InternalCheckCfg.g:12903:1: ( rule__XBasicForLoopExpression__Group_7__1__Impl )
+            // InternalCheckCfg.g:12904:2: rule__XBasicForLoopExpression__Group_7__1__Impl
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_7__1__Impl_in_rule__XBasicForLoopExpression__Group_7__126206);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group_7__1__Impl();
 
             state._fsp--;
@@ -37663,22 +37663,22 @@ public final void rule__XBasicForLoopExpression__Group_7__1() throws Recognition
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12910:1: rule__XBasicForLoopExpression__Group_7__1__Impl : ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* ) ;
+    // InternalCheckCfg.g:12910:1: rule__XBasicForLoopExpression__Group_7__1__Impl : ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* ) ;
     public final void rule__XBasicForLoopExpression__Group_7__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12914:1: ( ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12915:1: ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* )
+            // InternalCheckCfg.g:12914:1: ( ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* ) )
+            // InternalCheckCfg.g:12915:1: ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12915:1: ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12916:1: ( rule__XBasicForLoopExpression__Group_7_1__0 )*
+            // InternalCheckCfg.g:12915:1: ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* )
+            // InternalCheckCfg.g:12916:1: ( rule__XBasicForLoopExpression__Group_7_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getGroup_7_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12917:1: ( rule__XBasicForLoopExpression__Group_7_1__0 )*
+            // InternalCheckCfg.g:12917:1: ( rule__XBasicForLoopExpression__Group_7_1__0 )*
             loop96:
             do {
                 int alt96=2;
@@ -37691,9 +37691,9 @@ public final void rule__XBasicForLoopExpression__Group_7__1__Impl() throws Recog
 
                 switch (alt96) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12917:2: rule__XBasicForLoopExpression__Group_7_1__0
+            	    // InternalCheckCfg.g:12917:2: rule__XBasicForLoopExpression__Group_7_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_7_1__0_in_rule__XBasicForLoopExpression__Group_7__1__Impl26233);
+            	    pushFollow(FOLLOW_18);
             	    rule__XBasicForLoopExpression__Group_7_1__0();
 
             	    state._fsp--;
@@ -37732,21 +37732,21 @@ public final void rule__XBasicForLoopExpression__Group_7__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7_1__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12931:1: rule__XBasicForLoopExpression__Group_7_1__0 : rule__XBasicForLoopExpression__Group_7_1__0__Impl rule__XBasicForLoopExpression__Group_7_1__1 ;
+    // InternalCheckCfg.g:12931:1: rule__XBasicForLoopExpression__Group_7_1__0 : rule__XBasicForLoopExpression__Group_7_1__0__Impl rule__XBasicForLoopExpression__Group_7_1__1 ;
     public final void rule__XBasicForLoopExpression__Group_7_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12935:1: ( rule__XBasicForLoopExpression__Group_7_1__0__Impl rule__XBasicForLoopExpression__Group_7_1__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12936:2: rule__XBasicForLoopExpression__Group_7_1__0__Impl rule__XBasicForLoopExpression__Group_7_1__1
+            // InternalCheckCfg.g:12935:1: ( rule__XBasicForLoopExpression__Group_7_1__0__Impl rule__XBasicForLoopExpression__Group_7_1__1 )
+            // InternalCheckCfg.g:12936:2: rule__XBasicForLoopExpression__Group_7_1__0__Impl rule__XBasicForLoopExpression__Group_7_1__1
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_7_1__0__Impl_in_rule__XBasicForLoopExpression__Group_7_1__026268);
+            pushFollow(FOLLOW_61);
             rule__XBasicForLoopExpression__Group_7_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_7_1__1_in_rule__XBasicForLoopExpression__Group_7_1__026271);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group_7_1__1();
 
             state._fsp--;
@@ -37770,22 +37770,22 @@ public final void rule__XBasicForLoopExpression__Group_7_1__0() throws Recogniti
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7_1__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12943:1: rule__XBasicForLoopExpression__Group_7_1__0__Impl : ( ',' ) ;
+    // InternalCheckCfg.g:12943:1: rule__XBasicForLoopExpression__Group_7_1__0__Impl : ( ',' ) ;
     public final void rule__XBasicForLoopExpression__Group_7_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12947:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12948:1: ( ',' )
+            // InternalCheckCfg.g:12947:1: ( ( ',' ) )
+            // InternalCheckCfg.g:12948:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12948:1: ( ',' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12949:1: ','
+            // InternalCheckCfg.g:12948:1: ( ',' )
+            // InternalCheckCfg.g:12949:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getCommaKeyword_7_1_0()); 
             }
-            match(input,64,FOLLOW_64_in_rule__XBasicForLoopExpression__Group_7_1__0__Impl26299); if (state.failed) return ;
+            match(input,64,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBasicForLoopExpressionAccess().getCommaKeyword_7_1_0()); 
             }
@@ -37811,16 +37811,16 @@ public final void rule__XBasicForLoopExpression__Group_7_1__0__Impl() throws Rec
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7_1__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12962:1: rule__XBasicForLoopExpression__Group_7_1__1 : rule__XBasicForLoopExpression__Group_7_1__1__Impl ;
+    // InternalCheckCfg.g:12962:1: rule__XBasicForLoopExpression__Group_7_1__1 : rule__XBasicForLoopExpression__Group_7_1__1__Impl ;
     public final void rule__XBasicForLoopExpression__Group_7_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12966:1: ( rule__XBasicForLoopExpression__Group_7_1__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12967:2: rule__XBasicForLoopExpression__Group_7_1__1__Impl
+            // InternalCheckCfg.g:12966:1: ( rule__XBasicForLoopExpression__Group_7_1__1__Impl )
+            // InternalCheckCfg.g:12967:2: rule__XBasicForLoopExpression__Group_7_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_7_1__1__Impl_in_rule__XBasicForLoopExpression__Group_7_1__126330);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group_7_1__1__Impl();
 
             state._fsp--;
@@ -37844,25 +37844,25 @@ public final void rule__XBasicForLoopExpression__Group_7_1__1() throws Recogniti
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7_1__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12973:1: rule__XBasicForLoopExpression__Group_7_1__1__Impl : ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) ) ;
+    // InternalCheckCfg.g:12973:1: rule__XBasicForLoopExpression__Group_7_1__1__Impl : ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) ) ;
     public final void rule__XBasicForLoopExpression__Group_7_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12977:1: ( ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12978:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) )
+            // InternalCheckCfg.g:12977:1: ( ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) ) )
+            // InternalCheckCfg.g:12978:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12978:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12979:1: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 )
+            // InternalCheckCfg.g:12978:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) )
+            // InternalCheckCfg.g:12979:1: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getUpdateExpressionsAssignment_7_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12980:1: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12980:2: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1
+            // InternalCheckCfg.g:12980:1: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 )
+            // InternalCheckCfg.g:12980:2: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1_in_rule__XBasicForLoopExpression__Group_7_1__1__Impl26357);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1();
 
             state._fsp--;
@@ -37895,21 +37895,21 @@ public final void rule__XBasicForLoopExpression__Group_7_1__1__Impl() throws Rec
 
 
     // $ANTLR start "rule__XWhileExpression__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12994:1: rule__XWhileExpression__Group__0 : rule__XWhileExpression__Group__0__Impl rule__XWhileExpression__Group__1 ;
+    // InternalCheckCfg.g:12994:1: rule__XWhileExpression__Group__0 : rule__XWhileExpression__Group__0__Impl rule__XWhileExpression__Group__1 ;
     public final void rule__XWhileExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12998:1: ( rule__XWhileExpression__Group__0__Impl rule__XWhileExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:12999:2: rule__XWhileExpression__Group__0__Impl rule__XWhileExpression__Group__1
+            // InternalCheckCfg.g:12998:1: ( rule__XWhileExpression__Group__0__Impl rule__XWhileExpression__Group__1 )
+            // InternalCheckCfg.g:12999:2: rule__XWhileExpression__Group__0__Impl rule__XWhileExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__0__Impl_in_rule__XWhileExpression__Group__026391);
+            pushFollow(FOLLOW_81);
             rule__XWhileExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__1_in_rule__XWhileExpression__Group__026394);
+            pushFollow(FOLLOW_2);
             rule__XWhileExpression__Group__1();
 
             state._fsp--;
@@ -37933,23 +37933,23 @@ public final void rule__XWhileExpression__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XWhileExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13006:1: rule__XWhileExpression__Group__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:13006:1: rule__XWhileExpression__Group__0__Impl : ( () ) ;
     public final void rule__XWhileExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13010:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13011:1: ( () )
+            // InternalCheckCfg.g:13010:1: ( ( () ) )
+            // InternalCheckCfg.g:13011:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13011:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13012:1: ()
+            // InternalCheckCfg.g:13011:1: ( () )
+            // InternalCheckCfg.g:13012:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getXWhileExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13013:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13015:1: 
+            // InternalCheckCfg.g:13013:1: ()
+            // InternalCheckCfg.g:13015:1: 
             {
             }
 
@@ -37974,21 +37974,21 @@ public final void rule__XWhileExpression__Group__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XWhileExpression__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13025:1: rule__XWhileExpression__Group__1 : rule__XWhileExpression__Group__1__Impl rule__XWhileExpression__Group__2 ;
+    // InternalCheckCfg.g:13025:1: rule__XWhileExpression__Group__1 : rule__XWhileExpression__Group__1__Impl rule__XWhileExpression__Group__2 ;
     public final void rule__XWhileExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13029:1: ( rule__XWhileExpression__Group__1__Impl rule__XWhileExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13030:2: rule__XWhileExpression__Group__1__Impl rule__XWhileExpression__Group__2
+            // InternalCheckCfg.g:13029:1: ( rule__XWhileExpression__Group__1__Impl rule__XWhileExpression__Group__2 )
+            // InternalCheckCfg.g:13030:2: rule__XWhileExpression__Group__1__Impl rule__XWhileExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__1__Impl_in_rule__XWhileExpression__Group__126452);
+            pushFollow(FOLLOW_16);
             rule__XWhileExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__2_in_rule__XWhileExpression__Group__126455);
+            pushFollow(FOLLOW_2);
             rule__XWhileExpression__Group__2();
 
             state._fsp--;
@@ -38012,22 +38012,22 @@ public final void rule__XWhileExpression__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XWhileExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13037:1: rule__XWhileExpression__Group__1__Impl : ( 'while' ) ;
+    // InternalCheckCfg.g:13037:1: rule__XWhileExpression__Group__1__Impl : ( 'while' ) ;
     public final void rule__XWhileExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13041:1: ( ( 'while' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13042:1: ( 'while' )
+            // InternalCheckCfg.g:13041:1: ( ( 'while' ) )
+            // InternalCheckCfg.g:13042:1: ( 'while' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13042:1: ( 'while' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13043:1: 'while'
+            // InternalCheckCfg.g:13042:1: ( 'while' )
+            // InternalCheckCfg.g:13043:1: 'while'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getWhileKeyword_1()); 
             }
-            match(input,76,FOLLOW_76_in_rule__XWhileExpression__Group__1__Impl26483); if (state.failed) return ;
+            match(input,76,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXWhileExpressionAccess().getWhileKeyword_1()); 
             }
@@ -38053,21 +38053,21 @@ public final void rule__XWhileExpression__Group__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XWhileExpression__Group__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13056:1: rule__XWhileExpression__Group__2 : rule__XWhileExpression__Group__2__Impl rule__XWhileExpression__Group__3 ;
+    // InternalCheckCfg.g:13056:1: rule__XWhileExpression__Group__2 : rule__XWhileExpression__Group__2__Impl rule__XWhileExpression__Group__3 ;
     public final void rule__XWhileExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13060:1: ( rule__XWhileExpression__Group__2__Impl rule__XWhileExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13061:2: rule__XWhileExpression__Group__2__Impl rule__XWhileExpression__Group__3
+            // InternalCheckCfg.g:13060:1: ( rule__XWhileExpression__Group__2__Impl rule__XWhileExpression__Group__3 )
+            // InternalCheckCfg.g:13061:2: rule__XWhileExpression__Group__2__Impl rule__XWhileExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__2__Impl_in_rule__XWhileExpression__Group__226514);
+            pushFollow(FOLLOW_61);
             rule__XWhileExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__3_in_rule__XWhileExpression__Group__226517);
+            pushFollow(FOLLOW_2);
             rule__XWhileExpression__Group__3();
 
             state._fsp--;
@@ -38091,22 +38091,22 @@ public final void rule__XWhileExpression__Group__2() throws RecognitionException
 
 
     // $ANTLR start "rule__XWhileExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13068:1: rule__XWhileExpression__Group__2__Impl : ( '(' ) ;
+    // InternalCheckCfg.g:13068:1: rule__XWhileExpression__Group__2__Impl : ( '(' ) ;
     public final void rule__XWhileExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13072:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13073:1: ( '(' )
+            // InternalCheckCfg.g:13072:1: ( ( '(' ) )
+            // InternalCheckCfg.g:13073:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13073:1: ( '(' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13074:1: '('
+            // InternalCheckCfg.g:13073:1: ( '(' )
+            // InternalCheckCfg.g:13074:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getLeftParenthesisKeyword_2()); 
             }
-            match(input,62,FOLLOW_62_in_rule__XWhileExpression__Group__2__Impl26545); if (state.failed) return ;
+            match(input,62,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXWhileExpressionAccess().getLeftParenthesisKeyword_2()); 
             }
@@ -38132,21 +38132,21 @@ public final void rule__XWhileExpression__Group__2__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XWhileExpression__Group__3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13087:1: rule__XWhileExpression__Group__3 : rule__XWhileExpression__Group__3__Impl rule__XWhileExpression__Group__4 ;
+    // InternalCheckCfg.g:13087:1: rule__XWhileExpression__Group__3 : rule__XWhileExpression__Group__3__Impl rule__XWhileExpression__Group__4 ;
     public final void rule__XWhileExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13091:1: ( rule__XWhileExpression__Group__3__Impl rule__XWhileExpression__Group__4 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13092:2: rule__XWhileExpression__Group__3__Impl rule__XWhileExpression__Group__4
+            // InternalCheckCfg.g:13091:1: ( rule__XWhileExpression__Group__3__Impl rule__XWhileExpression__Group__4 )
+            // InternalCheckCfg.g:13092:2: rule__XWhileExpression__Group__3__Impl rule__XWhileExpression__Group__4
             {
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__3__Impl_in_rule__XWhileExpression__Group__326576);
+            pushFollow(FOLLOW_70);
             rule__XWhileExpression__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__4_in_rule__XWhileExpression__Group__326579);
+            pushFollow(FOLLOW_2);
             rule__XWhileExpression__Group__4();
 
             state._fsp--;
@@ -38170,25 +38170,25 @@ public final void rule__XWhileExpression__Group__3() throws RecognitionException
 
 
     // $ANTLR start "rule__XWhileExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13099:1: rule__XWhileExpression__Group__3__Impl : ( ( rule__XWhileExpression__PredicateAssignment_3 ) ) ;
+    // InternalCheckCfg.g:13099:1: rule__XWhileExpression__Group__3__Impl : ( ( rule__XWhileExpression__PredicateAssignment_3 ) ) ;
     public final void rule__XWhileExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13103:1: ( ( ( rule__XWhileExpression__PredicateAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13104:1: ( ( rule__XWhileExpression__PredicateAssignment_3 ) )
+            // InternalCheckCfg.g:13103:1: ( ( ( rule__XWhileExpression__PredicateAssignment_3 ) ) )
+            // InternalCheckCfg.g:13104:1: ( ( rule__XWhileExpression__PredicateAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13104:1: ( ( rule__XWhileExpression__PredicateAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13105:1: ( rule__XWhileExpression__PredicateAssignment_3 )
+            // InternalCheckCfg.g:13104:1: ( ( rule__XWhileExpression__PredicateAssignment_3 ) )
+            // InternalCheckCfg.g:13105:1: ( rule__XWhileExpression__PredicateAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getPredicateAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13106:1: ( rule__XWhileExpression__PredicateAssignment_3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13106:2: rule__XWhileExpression__PredicateAssignment_3
+            // InternalCheckCfg.g:13106:1: ( rule__XWhileExpression__PredicateAssignment_3 )
+            // InternalCheckCfg.g:13106:2: rule__XWhileExpression__PredicateAssignment_3
             {
-            pushFollow(FOLLOW_rule__XWhileExpression__PredicateAssignment_3_in_rule__XWhileExpression__Group__3__Impl26606);
+            pushFollow(FOLLOW_2);
             rule__XWhileExpression__PredicateAssignment_3();
 
             state._fsp--;
@@ -38221,21 +38221,21 @@ public final void rule__XWhileExpression__Group__3__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XWhileExpression__Group__4"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13116:1: rule__XWhileExpression__Group__4 : rule__XWhileExpression__Group__4__Impl rule__XWhileExpression__Group__5 ;
+    // InternalCheckCfg.g:13116:1: rule__XWhileExpression__Group__4 : rule__XWhileExpression__Group__4__Impl rule__XWhileExpression__Group__5 ;
     public final void rule__XWhileExpression__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13120:1: ( rule__XWhileExpression__Group__4__Impl rule__XWhileExpression__Group__5 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13121:2: rule__XWhileExpression__Group__4__Impl rule__XWhileExpression__Group__5
+            // InternalCheckCfg.g:13120:1: ( rule__XWhileExpression__Group__4__Impl rule__XWhileExpression__Group__5 )
+            // InternalCheckCfg.g:13121:2: rule__XWhileExpression__Group__4__Impl rule__XWhileExpression__Group__5
             {
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__4__Impl_in_rule__XWhileExpression__Group__426636);
+            pushFollow(FOLLOW_61);
             rule__XWhileExpression__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__5_in_rule__XWhileExpression__Group__426639);
+            pushFollow(FOLLOW_2);
             rule__XWhileExpression__Group__5();
 
             state._fsp--;
@@ -38259,22 +38259,22 @@ public final void rule__XWhileExpression__Group__4() throws RecognitionException
 
 
     // $ANTLR start "rule__XWhileExpression__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13128:1: rule__XWhileExpression__Group__4__Impl : ( ')' ) ;
+    // InternalCheckCfg.g:13128:1: rule__XWhileExpression__Group__4__Impl : ( ')' ) ;
     public final void rule__XWhileExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13132:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13133:1: ( ')' )
+            // InternalCheckCfg.g:13132:1: ( ( ')' ) )
+            // InternalCheckCfg.g:13133:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13133:1: ( ')' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13134:1: ')'
+            // InternalCheckCfg.g:13133:1: ( ')' )
+            // InternalCheckCfg.g:13134:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getRightParenthesisKeyword_4()); 
             }
-            match(input,63,FOLLOW_63_in_rule__XWhileExpression__Group__4__Impl26667); if (state.failed) return ;
+            match(input,63,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXWhileExpressionAccess().getRightParenthesisKeyword_4()); 
             }
@@ -38300,16 +38300,16 @@ public final void rule__XWhileExpression__Group__4__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XWhileExpression__Group__5"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13147:1: rule__XWhileExpression__Group__5 : rule__XWhileExpression__Group__5__Impl ;
+    // InternalCheckCfg.g:13147:1: rule__XWhileExpression__Group__5 : rule__XWhileExpression__Group__5__Impl ;
     public final void rule__XWhileExpression__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13151:1: ( rule__XWhileExpression__Group__5__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13152:2: rule__XWhileExpression__Group__5__Impl
+            // InternalCheckCfg.g:13151:1: ( rule__XWhileExpression__Group__5__Impl )
+            // InternalCheckCfg.g:13152:2: rule__XWhileExpression__Group__5__Impl
             {
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__5__Impl_in_rule__XWhileExpression__Group__526698);
+            pushFollow(FOLLOW_2);
             rule__XWhileExpression__Group__5__Impl();
 
             state._fsp--;
@@ -38333,25 +38333,25 @@ public final void rule__XWhileExpression__Group__5() throws RecognitionException
 
 
     // $ANTLR start "rule__XWhileExpression__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13158:1: rule__XWhileExpression__Group__5__Impl : ( ( rule__XWhileExpression__BodyAssignment_5 ) ) ;
+    // InternalCheckCfg.g:13158:1: rule__XWhileExpression__Group__5__Impl : ( ( rule__XWhileExpression__BodyAssignment_5 ) ) ;
     public final void rule__XWhileExpression__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13162:1: ( ( ( rule__XWhileExpression__BodyAssignment_5 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13163:1: ( ( rule__XWhileExpression__BodyAssignment_5 ) )
+            // InternalCheckCfg.g:13162:1: ( ( ( rule__XWhileExpression__BodyAssignment_5 ) ) )
+            // InternalCheckCfg.g:13163:1: ( ( rule__XWhileExpression__BodyAssignment_5 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13163:1: ( ( rule__XWhileExpression__BodyAssignment_5 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13164:1: ( rule__XWhileExpression__BodyAssignment_5 )
+            // InternalCheckCfg.g:13163:1: ( ( rule__XWhileExpression__BodyAssignment_5 ) )
+            // InternalCheckCfg.g:13164:1: ( rule__XWhileExpression__BodyAssignment_5 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getBodyAssignment_5()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13165:1: ( rule__XWhileExpression__BodyAssignment_5 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13165:2: rule__XWhileExpression__BodyAssignment_5
+            // InternalCheckCfg.g:13165:1: ( rule__XWhileExpression__BodyAssignment_5 )
+            // InternalCheckCfg.g:13165:2: rule__XWhileExpression__BodyAssignment_5
             {
-            pushFollow(FOLLOW_rule__XWhileExpression__BodyAssignment_5_in_rule__XWhileExpression__Group__5__Impl26725);
+            pushFollow(FOLLOW_2);
             rule__XWhileExpression__BodyAssignment_5();
 
             state._fsp--;
@@ -38384,21 +38384,21 @@ public final void rule__XWhileExpression__Group__5__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13187:1: rule__XDoWhileExpression__Group__0 : rule__XDoWhileExpression__Group__0__Impl rule__XDoWhileExpression__Group__1 ;
+    // InternalCheckCfg.g:13187:1: rule__XDoWhileExpression__Group__0 : rule__XDoWhileExpression__Group__0__Impl rule__XDoWhileExpression__Group__1 ;
     public final void rule__XDoWhileExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13191:1: ( rule__XDoWhileExpression__Group__0__Impl rule__XDoWhileExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13192:2: rule__XDoWhileExpression__Group__0__Impl rule__XDoWhileExpression__Group__1
+            // InternalCheckCfg.g:13191:1: ( rule__XDoWhileExpression__Group__0__Impl rule__XDoWhileExpression__Group__1 )
+            // InternalCheckCfg.g:13192:2: rule__XDoWhileExpression__Group__0__Impl rule__XDoWhileExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__0__Impl_in_rule__XDoWhileExpression__Group__026767);
+            pushFollow(FOLLOW_82);
             rule__XDoWhileExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__1_in_rule__XDoWhileExpression__Group__026770);
+            pushFollow(FOLLOW_2);
             rule__XDoWhileExpression__Group__1();
 
             state._fsp--;
@@ -38422,23 +38422,23 @@ public final void rule__XDoWhileExpression__Group__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13199:1: rule__XDoWhileExpression__Group__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:13199:1: rule__XDoWhileExpression__Group__0__Impl : ( () ) ;
     public final void rule__XDoWhileExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13203:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13204:1: ( () )
+            // InternalCheckCfg.g:13203:1: ( ( () ) )
+            // InternalCheckCfg.g:13204:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13204:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13205:1: ()
+            // InternalCheckCfg.g:13204:1: ( () )
+            // InternalCheckCfg.g:13205:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getXDoWhileExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13206:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13208:1: 
+            // InternalCheckCfg.g:13206:1: ()
+            // InternalCheckCfg.g:13208:1: 
             {
             }
 
@@ -38463,21 +38463,21 @@ public final void rule__XDoWhileExpression__Group__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13218:1: rule__XDoWhileExpression__Group__1 : rule__XDoWhileExpression__Group__1__Impl rule__XDoWhileExpression__Group__2 ;
+    // InternalCheckCfg.g:13218:1: rule__XDoWhileExpression__Group__1 : rule__XDoWhileExpression__Group__1__Impl rule__XDoWhileExpression__Group__2 ;
     public final void rule__XDoWhileExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13222:1: ( rule__XDoWhileExpression__Group__1__Impl rule__XDoWhileExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13223:2: rule__XDoWhileExpression__Group__1__Impl rule__XDoWhileExpression__Group__2
+            // InternalCheckCfg.g:13222:1: ( rule__XDoWhileExpression__Group__1__Impl rule__XDoWhileExpression__Group__2 )
+            // InternalCheckCfg.g:13223:2: rule__XDoWhileExpression__Group__1__Impl rule__XDoWhileExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__1__Impl_in_rule__XDoWhileExpression__Group__126828);
+            pushFollow(FOLLOW_61);
             rule__XDoWhileExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__2_in_rule__XDoWhileExpression__Group__126831);
+            pushFollow(FOLLOW_2);
             rule__XDoWhileExpression__Group__2();
 
             state._fsp--;
@@ -38501,22 +38501,22 @@ public final void rule__XDoWhileExpression__Group__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13230:1: rule__XDoWhileExpression__Group__1__Impl : ( 'do' ) ;
+    // InternalCheckCfg.g:13230:1: rule__XDoWhileExpression__Group__1__Impl : ( 'do' ) ;
     public final void rule__XDoWhileExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13234:1: ( ( 'do' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13235:1: ( 'do' )
+            // InternalCheckCfg.g:13234:1: ( ( 'do' ) )
+            // InternalCheckCfg.g:13235:1: ( 'do' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13235:1: ( 'do' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13236:1: 'do'
+            // InternalCheckCfg.g:13235:1: ( 'do' )
+            // InternalCheckCfg.g:13236:1: 'do'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getDoKeyword_1()); 
             }
-            match(input,77,FOLLOW_77_in_rule__XDoWhileExpression__Group__1__Impl26859); if (state.failed) return ;
+            match(input,77,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXDoWhileExpressionAccess().getDoKeyword_1()); 
             }
@@ -38542,21 +38542,21 @@ public final void rule__XDoWhileExpression__Group__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13249:1: rule__XDoWhileExpression__Group__2 : rule__XDoWhileExpression__Group__2__Impl rule__XDoWhileExpression__Group__3 ;
+    // InternalCheckCfg.g:13249:1: rule__XDoWhileExpression__Group__2 : rule__XDoWhileExpression__Group__2__Impl rule__XDoWhileExpression__Group__3 ;
     public final void rule__XDoWhileExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13253:1: ( rule__XDoWhileExpression__Group__2__Impl rule__XDoWhileExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13254:2: rule__XDoWhileExpression__Group__2__Impl rule__XDoWhileExpression__Group__3
+            // InternalCheckCfg.g:13253:1: ( rule__XDoWhileExpression__Group__2__Impl rule__XDoWhileExpression__Group__3 )
+            // InternalCheckCfg.g:13254:2: rule__XDoWhileExpression__Group__2__Impl rule__XDoWhileExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__2__Impl_in_rule__XDoWhileExpression__Group__226890);
+            pushFollow(FOLLOW_81);
             rule__XDoWhileExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__3_in_rule__XDoWhileExpression__Group__226893);
+            pushFollow(FOLLOW_2);
             rule__XDoWhileExpression__Group__3();
 
             state._fsp--;
@@ -38580,25 +38580,25 @@ public final void rule__XDoWhileExpression__Group__2() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13261:1: rule__XDoWhileExpression__Group__2__Impl : ( ( rule__XDoWhileExpression__BodyAssignment_2 ) ) ;
+    // InternalCheckCfg.g:13261:1: rule__XDoWhileExpression__Group__2__Impl : ( ( rule__XDoWhileExpression__BodyAssignment_2 ) ) ;
     public final void rule__XDoWhileExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13265:1: ( ( ( rule__XDoWhileExpression__BodyAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13266:1: ( ( rule__XDoWhileExpression__BodyAssignment_2 ) )
+            // InternalCheckCfg.g:13265:1: ( ( ( rule__XDoWhileExpression__BodyAssignment_2 ) ) )
+            // InternalCheckCfg.g:13266:1: ( ( rule__XDoWhileExpression__BodyAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13266:1: ( ( rule__XDoWhileExpression__BodyAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13267:1: ( rule__XDoWhileExpression__BodyAssignment_2 )
+            // InternalCheckCfg.g:13266:1: ( ( rule__XDoWhileExpression__BodyAssignment_2 ) )
+            // InternalCheckCfg.g:13267:1: ( rule__XDoWhileExpression__BodyAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getBodyAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13268:1: ( rule__XDoWhileExpression__BodyAssignment_2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13268:2: rule__XDoWhileExpression__BodyAssignment_2
+            // InternalCheckCfg.g:13268:1: ( rule__XDoWhileExpression__BodyAssignment_2 )
+            // InternalCheckCfg.g:13268:2: rule__XDoWhileExpression__BodyAssignment_2
             {
-            pushFollow(FOLLOW_rule__XDoWhileExpression__BodyAssignment_2_in_rule__XDoWhileExpression__Group__2__Impl26920);
+            pushFollow(FOLLOW_2);
             rule__XDoWhileExpression__BodyAssignment_2();
 
             state._fsp--;
@@ -38631,21 +38631,21 @@ public final void rule__XDoWhileExpression__Group__2__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13278:1: rule__XDoWhileExpression__Group__3 : rule__XDoWhileExpression__Group__3__Impl rule__XDoWhileExpression__Group__4 ;
+    // InternalCheckCfg.g:13278:1: rule__XDoWhileExpression__Group__3 : rule__XDoWhileExpression__Group__3__Impl rule__XDoWhileExpression__Group__4 ;
     public final void rule__XDoWhileExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13282:1: ( rule__XDoWhileExpression__Group__3__Impl rule__XDoWhileExpression__Group__4 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13283:2: rule__XDoWhileExpression__Group__3__Impl rule__XDoWhileExpression__Group__4
+            // InternalCheckCfg.g:13282:1: ( rule__XDoWhileExpression__Group__3__Impl rule__XDoWhileExpression__Group__4 )
+            // InternalCheckCfg.g:13283:2: rule__XDoWhileExpression__Group__3__Impl rule__XDoWhileExpression__Group__4
             {
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__3__Impl_in_rule__XDoWhileExpression__Group__326950);
+            pushFollow(FOLLOW_16);
             rule__XDoWhileExpression__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__4_in_rule__XDoWhileExpression__Group__326953);
+            pushFollow(FOLLOW_2);
             rule__XDoWhileExpression__Group__4();
 
             state._fsp--;
@@ -38669,22 +38669,22 @@ public final void rule__XDoWhileExpression__Group__3() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13290:1: rule__XDoWhileExpression__Group__3__Impl : ( 'while' ) ;
+    // InternalCheckCfg.g:13290:1: rule__XDoWhileExpression__Group__3__Impl : ( 'while' ) ;
     public final void rule__XDoWhileExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13294:1: ( ( 'while' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13295:1: ( 'while' )
+            // InternalCheckCfg.g:13294:1: ( ( 'while' ) )
+            // InternalCheckCfg.g:13295:1: ( 'while' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13295:1: ( 'while' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13296:1: 'while'
+            // InternalCheckCfg.g:13295:1: ( 'while' )
+            // InternalCheckCfg.g:13296:1: 'while'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getWhileKeyword_3()); 
             }
-            match(input,76,FOLLOW_76_in_rule__XDoWhileExpression__Group__3__Impl26981); if (state.failed) return ;
+            match(input,76,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXDoWhileExpressionAccess().getWhileKeyword_3()); 
             }
@@ -38710,21 +38710,21 @@ public final void rule__XDoWhileExpression__Group__3__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__4"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13309:1: rule__XDoWhileExpression__Group__4 : rule__XDoWhileExpression__Group__4__Impl rule__XDoWhileExpression__Group__5 ;
+    // InternalCheckCfg.g:13309:1: rule__XDoWhileExpression__Group__4 : rule__XDoWhileExpression__Group__4__Impl rule__XDoWhileExpression__Group__5 ;
     public final void rule__XDoWhileExpression__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13313:1: ( rule__XDoWhileExpression__Group__4__Impl rule__XDoWhileExpression__Group__5 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13314:2: rule__XDoWhileExpression__Group__4__Impl rule__XDoWhileExpression__Group__5
+            // InternalCheckCfg.g:13313:1: ( rule__XDoWhileExpression__Group__4__Impl rule__XDoWhileExpression__Group__5 )
+            // InternalCheckCfg.g:13314:2: rule__XDoWhileExpression__Group__4__Impl rule__XDoWhileExpression__Group__5
             {
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__4__Impl_in_rule__XDoWhileExpression__Group__427012);
+            pushFollow(FOLLOW_61);
             rule__XDoWhileExpression__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__5_in_rule__XDoWhileExpression__Group__427015);
+            pushFollow(FOLLOW_2);
             rule__XDoWhileExpression__Group__5();
 
             state._fsp--;
@@ -38748,22 +38748,22 @@ public final void rule__XDoWhileExpression__Group__4() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13321:1: rule__XDoWhileExpression__Group__4__Impl : ( '(' ) ;
+    // InternalCheckCfg.g:13321:1: rule__XDoWhileExpression__Group__4__Impl : ( '(' ) ;
     public final void rule__XDoWhileExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13325:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13326:1: ( '(' )
+            // InternalCheckCfg.g:13325:1: ( ( '(' ) )
+            // InternalCheckCfg.g:13326:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13326:1: ( '(' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13327:1: '('
+            // InternalCheckCfg.g:13326:1: ( '(' )
+            // InternalCheckCfg.g:13327:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getLeftParenthesisKeyword_4()); 
             }
-            match(input,62,FOLLOW_62_in_rule__XDoWhileExpression__Group__4__Impl27043); if (state.failed) return ;
+            match(input,62,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXDoWhileExpressionAccess().getLeftParenthesisKeyword_4()); 
             }
@@ -38789,21 +38789,21 @@ public final void rule__XDoWhileExpression__Group__4__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__5"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13340:1: rule__XDoWhileExpression__Group__5 : rule__XDoWhileExpression__Group__5__Impl rule__XDoWhileExpression__Group__6 ;
+    // InternalCheckCfg.g:13340:1: rule__XDoWhileExpression__Group__5 : rule__XDoWhileExpression__Group__5__Impl rule__XDoWhileExpression__Group__6 ;
     public final void rule__XDoWhileExpression__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13344:1: ( rule__XDoWhileExpression__Group__5__Impl rule__XDoWhileExpression__Group__6 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13345:2: rule__XDoWhileExpression__Group__5__Impl rule__XDoWhileExpression__Group__6
+            // InternalCheckCfg.g:13344:1: ( rule__XDoWhileExpression__Group__5__Impl rule__XDoWhileExpression__Group__6 )
+            // InternalCheckCfg.g:13345:2: rule__XDoWhileExpression__Group__5__Impl rule__XDoWhileExpression__Group__6
             {
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__5__Impl_in_rule__XDoWhileExpression__Group__527074);
+            pushFollow(FOLLOW_70);
             rule__XDoWhileExpression__Group__5__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__6_in_rule__XDoWhileExpression__Group__527077);
+            pushFollow(FOLLOW_2);
             rule__XDoWhileExpression__Group__6();
 
             state._fsp--;
@@ -38827,25 +38827,25 @@ public final void rule__XDoWhileExpression__Group__5() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13352:1: rule__XDoWhileExpression__Group__5__Impl : ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) ) ;
+    // InternalCheckCfg.g:13352:1: rule__XDoWhileExpression__Group__5__Impl : ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) ) ;
     public final void rule__XDoWhileExpression__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13356:1: ( ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13357:1: ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) )
+            // InternalCheckCfg.g:13356:1: ( ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) ) )
+            // InternalCheckCfg.g:13357:1: ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13357:1: ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13358:1: ( rule__XDoWhileExpression__PredicateAssignment_5 )
+            // InternalCheckCfg.g:13357:1: ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) )
+            // InternalCheckCfg.g:13358:1: ( rule__XDoWhileExpression__PredicateAssignment_5 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getPredicateAssignment_5()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13359:1: ( rule__XDoWhileExpression__PredicateAssignment_5 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13359:2: rule__XDoWhileExpression__PredicateAssignment_5
+            // InternalCheckCfg.g:13359:1: ( rule__XDoWhileExpression__PredicateAssignment_5 )
+            // InternalCheckCfg.g:13359:2: rule__XDoWhileExpression__PredicateAssignment_5
             {
-            pushFollow(FOLLOW_rule__XDoWhileExpression__PredicateAssignment_5_in_rule__XDoWhileExpression__Group__5__Impl27104);
+            pushFollow(FOLLOW_2);
             rule__XDoWhileExpression__PredicateAssignment_5();
 
             state._fsp--;
@@ -38878,16 +38878,16 @@ public final void rule__XDoWhileExpression__Group__5__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__6"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13369:1: rule__XDoWhileExpression__Group__6 : rule__XDoWhileExpression__Group__6__Impl ;
+    // InternalCheckCfg.g:13369:1: rule__XDoWhileExpression__Group__6 : rule__XDoWhileExpression__Group__6__Impl ;
     public final void rule__XDoWhileExpression__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13373:1: ( rule__XDoWhileExpression__Group__6__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13374:2: rule__XDoWhileExpression__Group__6__Impl
+            // InternalCheckCfg.g:13373:1: ( rule__XDoWhileExpression__Group__6__Impl )
+            // InternalCheckCfg.g:13374:2: rule__XDoWhileExpression__Group__6__Impl
             {
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__6__Impl_in_rule__XDoWhileExpression__Group__627134);
+            pushFollow(FOLLOW_2);
             rule__XDoWhileExpression__Group__6__Impl();
 
             state._fsp--;
@@ -38911,22 +38911,22 @@ public final void rule__XDoWhileExpression__Group__6() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__6__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13380:1: rule__XDoWhileExpression__Group__6__Impl : ( ')' ) ;
+    // InternalCheckCfg.g:13380:1: rule__XDoWhileExpression__Group__6__Impl : ( ')' ) ;
     public final void rule__XDoWhileExpression__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13384:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13385:1: ( ')' )
+            // InternalCheckCfg.g:13384:1: ( ( ')' ) )
+            // InternalCheckCfg.g:13385:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13385:1: ( ')' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13386:1: ')'
+            // InternalCheckCfg.g:13385:1: ( ')' )
+            // InternalCheckCfg.g:13386:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getRightParenthesisKeyword_6()); 
             }
-            match(input,63,FOLLOW_63_in_rule__XDoWhileExpression__Group__6__Impl27162); if (state.failed) return ;
+            match(input,63,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXDoWhileExpressionAccess().getRightParenthesisKeyword_6()); 
             }
@@ -38952,21 +38952,21 @@ public final void rule__XDoWhileExpression__Group__6__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XBlockExpression__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13413:1: rule__XBlockExpression__Group__0 : rule__XBlockExpression__Group__0__Impl rule__XBlockExpression__Group__1 ;
+    // InternalCheckCfg.g:13413:1: rule__XBlockExpression__Group__0 : rule__XBlockExpression__Group__0__Impl rule__XBlockExpression__Group__1 ;
     public final void rule__XBlockExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13417:1: ( rule__XBlockExpression__Group__0__Impl rule__XBlockExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13418:2: rule__XBlockExpression__Group__0__Impl rule__XBlockExpression__Group__1
+            // InternalCheckCfg.g:13417:1: ( rule__XBlockExpression__Group__0__Impl rule__XBlockExpression__Group__1 )
+            // InternalCheckCfg.g:13418:2: rule__XBlockExpression__Group__0__Impl rule__XBlockExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XBlockExpression__Group__0__Impl_in_rule__XBlockExpression__Group__027207);
+            pushFollow(FOLLOW_10);
             rule__XBlockExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBlockExpression__Group__1_in_rule__XBlockExpression__Group__027210);
+            pushFollow(FOLLOW_2);
             rule__XBlockExpression__Group__1();
 
             state._fsp--;
@@ -38990,23 +38990,23 @@ public final void rule__XBlockExpression__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XBlockExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13425:1: rule__XBlockExpression__Group__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:13425:1: rule__XBlockExpression__Group__0__Impl : ( () ) ;
     public final void rule__XBlockExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13429:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13430:1: ( () )
+            // InternalCheckCfg.g:13429:1: ( ( () ) )
+            // InternalCheckCfg.g:13430:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13430:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13431:1: ()
+            // InternalCheckCfg.g:13430:1: ( () )
+            // InternalCheckCfg.g:13431:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getXBlockExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13432:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13434:1: 
+            // InternalCheckCfg.g:13432:1: ()
+            // InternalCheckCfg.g:13434:1: 
             {
             }
 
@@ -39031,21 +39031,21 @@ public final void rule__XBlockExpression__Group__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XBlockExpression__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13444:1: rule__XBlockExpression__Group__1 : rule__XBlockExpression__Group__1__Impl rule__XBlockExpression__Group__2 ;
+    // InternalCheckCfg.g:13444:1: rule__XBlockExpression__Group__1 : rule__XBlockExpression__Group__1__Impl rule__XBlockExpression__Group__2 ;
     public final void rule__XBlockExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13448:1: ( rule__XBlockExpression__Group__1__Impl rule__XBlockExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13449:2: rule__XBlockExpression__Group__1__Impl rule__XBlockExpression__Group__2
+            // InternalCheckCfg.g:13448:1: ( rule__XBlockExpression__Group__1__Impl rule__XBlockExpression__Group__2 )
+            // InternalCheckCfg.g:13449:2: rule__XBlockExpression__Group__1__Impl rule__XBlockExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XBlockExpression__Group__1__Impl_in_rule__XBlockExpression__Group__127268);
+            pushFollow(FOLLOW_83);
             rule__XBlockExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBlockExpression__Group__2_in_rule__XBlockExpression__Group__127271);
+            pushFollow(FOLLOW_2);
             rule__XBlockExpression__Group__2();
 
             state._fsp--;
@@ -39069,22 +39069,22 @@ public final void rule__XBlockExpression__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XBlockExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13456:1: rule__XBlockExpression__Group__1__Impl : ( '{' ) ;
+    // InternalCheckCfg.g:13456:1: rule__XBlockExpression__Group__1__Impl : ( '{' ) ;
     public final void rule__XBlockExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13460:1: ( ( '{' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13461:1: ( '{' )
+            // InternalCheckCfg.g:13460:1: ( ( '{' ) )
+            // InternalCheckCfg.g:13461:1: ( '{' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13461:1: ( '{' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13462:1: '{'
+            // InternalCheckCfg.g:13461:1: ( '{' )
+            // InternalCheckCfg.g:13462:1: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getLeftCurlyBracketKeyword_1()); 
             }
-            match(input,58,FOLLOW_58_in_rule__XBlockExpression__Group__1__Impl27299); if (state.failed) return ;
+            match(input,58,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBlockExpressionAccess().getLeftCurlyBracketKeyword_1()); 
             }
@@ -39110,21 +39110,21 @@ public final void rule__XBlockExpression__Group__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XBlockExpression__Group__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13475:1: rule__XBlockExpression__Group__2 : rule__XBlockExpression__Group__2__Impl rule__XBlockExpression__Group__3 ;
+    // InternalCheckCfg.g:13475:1: rule__XBlockExpression__Group__2 : rule__XBlockExpression__Group__2__Impl rule__XBlockExpression__Group__3 ;
     public final void rule__XBlockExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13479:1: ( rule__XBlockExpression__Group__2__Impl rule__XBlockExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13480:2: rule__XBlockExpression__Group__2__Impl rule__XBlockExpression__Group__3
+            // InternalCheckCfg.g:13479:1: ( rule__XBlockExpression__Group__2__Impl rule__XBlockExpression__Group__3 )
+            // InternalCheckCfg.g:13480:2: rule__XBlockExpression__Group__2__Impl rule__XBlockExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__XBlockExpression__Group__2__Impl_in_rule__XBlockExpression__Group__227330);
+            pushFollow(FOLLOW_83);
             rule__XBlockExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBlockExpression__Group__3_in_rule__XBlockExpression__Group__227333);
+            pushFollow(FOLLOW_2);
             rule__XBlockExpression__Group__3();
 
             state._fsp--;
@@ -39148,22 +39148,22 @@ public final void rule__XBlockExpression__Group__2() throws RecognitionException
 
 
     // $ANTLR start "rule__XBlockExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13487:1: rule__XBlockExpression__Group__2__Impl : ( ( rule__XBlockExpression__Group_2__0 )* ) ;
+    // InternalCheckCfg.g:13487:1: rule__XBlockExpression__Group__2__Impl : ( ( rule__XBlockExpression__Group_2__0 )* ) ;
     public final void rule__XBlockExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13491:1: ( ( ( rule__XBlockExpression__Group_2__0 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13492:1: ( ( rule__XBlockExpression__Group_2__0 )* )
+            // InternalCheckCfg.g:13491:1: ( ( ( rule__XBlockExpression__Group_2__0 )* ) )
+            // InternalCheckCfg.g:13492:1: ( ( rule__XBlockExpression__Group_2__0 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13492:1: ( ( rule__XBlockExpression__Group_2__0 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13493:1: ( rule__XBlockExpression__Group_2__0 )*
+            // InternalCheckCfg.g:13492:1: ( ( rule__XBlockExpression__Group_2__0 )* )
+            // InternalCheckCfg.g:13493:1: ( rule__XBlockExpression__Group_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getGroup_2()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13494:1: ( rule__XBlockExpression__Group_2__0 )*
+            // InternalCheckCfg.g:13494:1: ( rule__XBlockExpression__Group_2__0 )*
             loop97:
             do {
                 int alt97=2;
@@ -39176,9 +39176,9 @@ public final void rule__XBlockExpression__Group__2__Impl() throws RecognitionExc
 
                 switch (alt97) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13494:2: rule__XBlockExpression__Group_2__0
+            	    // InternalCheckCfg.g:13494:2: rule__XBlockExpression__Group_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__XBlockExpression__Group_2__0_in_rule__XBlockExpression__Group__2__Impl27360);
+            	    pushFollow(FOLLOW_68);
             	    rule__XBlockExpression__Group_2__0();
 
             	    state._fsp--;
@@ -39217,16 +39217,16 @@ public final void rule__XBlockExpression__Group__2__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XBlockExpression__Group__3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13504:1: rule__XBlockExpression__Group__3 : rule__XBlockExpression__Group__3__Impl ;
+    // InternalCheckCfg.g:13504:1: rule__XBlockExpression__Group__3 : rule__XBlockExpression__Group__3__Impl ;
     public final void rule__XBlockExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13508:1: ( rule__XBlockExpression__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13509:2: rule__XBlockExpression__Group__3__Impl
+            // InternalCheckCfg.g:13508:1: ( rule__XBlockExpression__Group__3__Impl )
+            // InternalCheckCfg.g:13509:2: rule__XBlockExpression__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__XBlockExpression__Group__3__Impl_in_rule__XBlockExpression__Group__327391);
+            pushFollow(FOLLOW_2);
             rule__XBlockExpression__Group__3__Impl();
 
             state._fsp--;
@@ -39250,22 +39250,22 @@ public final void rule__XBlockExpression__Group__3() throws RecognitionException
 
 
     // $ANTLR start "rule__XBlockExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13515:1: rule__XBlockExpression__Group__3__Impl : ( '}' ) ;
+    // InternalCheckCfg.g:13515:1: rule__XBlockExpression__Group__3__Impl : ( '}' ) ;
     public final void rule__XBlockExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13519:1: ( ( '}' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13520:1: ( '}' )
+            // InternalCheckCfg.g:13519:1: ( ( '}' ) )
+            // InternalCheckCfg.g:13520:1: ( '}' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13520:1: ( '}' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13521:1: '}'
+            // InternalCheckCfg.g:13520:1: ( '}' )
+            // InternalCheckCfg.g:13521:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getRightCurlyBracketKeyword_3()); 
             }
-            match(input,59,FOLLOW_59_in_rule__XBlockExpression__Group__3__Impl27419); if (state.failed) return ;
+            match(input,59,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBlockExpressionAccess().getRightCurlyBracketKeyword_3()); 
             }
@@ -39291,21 +39291,21 @@ public final void rule__XBlockExpression__Group__3__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XBlockExpression__Group_2__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13542:1: rule__XBlockExpression__Group_2__0 : rule__XBlockExpression__Group_2__0__Impl rule__XBlockExpression__Group_2__1 ;
+    // InternalCheckCfg.g:13542:1: rule__XBlockExpression__Group_2__0 : rule__XBlockExpression__Group_2__0__Impl rule__XBlockExpression__Group_2__1 ;
     public final void rule__XBlockExpression__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13546:1: ( rule__XBlockExpression__Group_2__0__Impl rule__XBlockExpression__Group_2__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13547:2: rule__XBlockExpression__Group_2__0__Impl rule__XBlockExpression__Group_2__1
+            // InternalCheckCfg.g:13546:1: ( rule__XBlockExpression__Group_2__0__Impl rule__XBlockExpression__Group_2__1 )
+            // InternalCheckCfg.g:13547:2: rule__XBlockExpression__Group_2__0__Impl rule__XBlockExpression__Group_2__1
             {
-            pushFollow(FOLLOW_rule__XBlockExpression__Group_2__0__Impl_in_rule__XBlockExpression__Group_2__027458);
+            pushFollow(FOLLOW_69);
             rule__XBlockExpression__Group_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBlockExpression__Group_2__1_in_rule__XBlockExpression__Group_2__027461);
+            pushFollow(FOLLOW_2);
             rule__XBlockExpression__Group_2__1();
 
             state._fsp--;
@@ -39329,25 +39329,25 @@ public final void rule__XBlockExpression__Group_2__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XBlockExpression__Group_2__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13554:1: rule__XBlockExpression__Group_2__0__Impl : ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) ) ;
+    // InternalCheckCfg.g:13554:1: rule__XBlockExpression__Group_2__0__Impl : ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) ) ;
     public final void rule__XBlockExpression__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13558:1: ( ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13559:1: ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) )
+            // InternalCheckCfg.g:13558:1: ( ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) ) )
+            // InternalCheckCfg.g:13559:1: ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13559:1: ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13560:1: ( rule__XBlockExpression__ExpressionsAssignment_2_0 )
+            // InternalCheckCfg.g:13559:1: ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) )
+            // InternalCheckCfg.g:13560:1: ( rule__XBlockExpression__ExpressionsAssignment_2_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getExpressionsAssignment_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13561:1: ( rule__XBlockExpression__ExpressionsAssignment_2_0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13561:2: rule__XBlockExpression__ExpressionsAssignment_2_0
+            // InternalCheckCfg.g:13561:1: ( rule__XBlockExpression__ExpressionsAssignment_2_0 )
+            // InternalCheckCfg.g:13561:2: rule__XBlockExpression__ExpressionsAssignment_2_0
             {
-            pushFollow(FOLLOW_rule__XBlockExpression__ExpressionsAssignment_2_0_in_rule__XBlockExpression__Group_2__0__Impl27488);
+            pushFollow(FOLLOW_2);
             rule__XBlockExpression__ExpressionsAssignment_2_0();
 
             state._fsp--;
@@ -39380,16 +39380,16 @@ public final void rule__XBlockExpression__Group_2__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XBlockExpression__Group_2__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13571:1: rule__XBlockExpression__Group_2__1 : rule__XBlockExpression__Group_2__1__Impl ;
+    // InternalCheckCfg.g:13571:1: rule__XBlockExpression__Group_2__1 : rule__XBlockExpression__Group_2__1__Impl ;
     public final void rule__XBlockExpression__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13575:1: ( rule__XBlockExpression__Group_2__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13576:2: rule__XBlockExpression__Group_2__1__Impl
+            // InternalCheckCfg.g:13575:1: ( rule__XBlockExpression__Group_2__1__Impl )
+            // InternalCheckCfg.g:13576:2: rule__XBlockExpression__Group_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__XBlockExpression__Group_2__1__Impl_in_rule__XBlockExpression__Group_2__127518);
+            pushFollow(FOLLOW_2);
             rule__XBlockExpression__Group_2__1__Impl();
 
             state._fsp--;
@@ -39413,22 +39413,22 @@ public final void rule__XBlockExpression__Group_2__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XBlockExpression__Group_2__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13582:1: rule__XBlockExpression__Group_2__1__Impl : ( ( ';' )? ) ;
+    // InternalCheckCfg.g:13582:1: rule__XBlockExpression__Group_2__1__Impl : ( ( ';' )? ) ;
     public final void rule__XBlockExpression__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13586:1: ( ( ( ';' )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13587:1: ( ( ';' )? )
+            // InternalCheckCfg.g:13586:1: ( ( ( ';' )? ) )
+            // InternalCheckCfg.g:13587:1: ( ( ';' )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13587:1: ( ( ';' )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13588:1: ( ';' )?
+            // InternalCheckCfg.g:13587:1: ( ( ';' )? )
+            // InternalCheckCfg.g:13588:1: ( ';' )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getSemicolonKeyword_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13589:1: ( ';' )?
+            // InternalCheckCfg.g:13589:1: ( ';' )?
             int alt98=2;
             int LA98_0 = input.LA(1);
 
@@ -39437,9 +39437,9 @@ public final void rule__XBlockExpression__Group_2__1__Impl() throws RecognitionE
             }
             switch (alt98) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13590:2: ';'
+                    // InternalCheckCfg.g:13590:2: ';'
                     {
-                    match(input,70,FOLLOW_70_in_rule__XBlockExpression__Group_2__1__Impl27547); if (state.failed) return ;
+                    match(input,70,FOLLOW_2); if (state.failed) return ;
 
                     }
                     break;
@@ -39471,21 +39471,21 @@ public final void rule__XBlockExpression__Group_2__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13605:1: rule__XVariableDeclaration__Group__0 : rule__XVariableDeclaration__Group__0__Impl rule__XVariableDeclaration__Group__1 ;
+    // InternalCheckCfg.g:13605:1: rule__XVariableDeclaration__Group__0 : rule__XVariableDeclaration__Group__0__Impl rule__XVariableDeclaration__Group__1 ;
     public final void rule__XVariableDeclaration__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13609:1: ( rule__XVariableDeclaration__Group__0__Impl rule__XVariableDeclaration__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13610:2: rule__XVariableDeclaration__Group__0__Impl rule__XVariableDeclaration__Group__1
+            // InternalCheckCfg.g:13609:1: ( rule__XVariableDeclaration__Group__0__Impl rule__XVariableDeclaration__Group__1 )
+            // InternalCheckCfg.g:13610:2: rule__XVariableDeclaration__Group__0__Impl rule__XVariableDeclaration__Group__1
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group__0__Impl_in_rule__XVariableDeclaration__Group__027584);
+            pushFollow(FOLLOW_84);
             rule__XVariableDeclaration__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group__1_in_rule__XVariableDeclaration__Group__027587);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group__1();
 
             state._fsp--;
@@ -39509,23 +39509,23 @@ public final void rule__XVariableDeclaration__Group__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13617:1: rule__XVariableDeclaration__Group__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:13617:1: rule__XVariableDeclaration__Group__0__Impl : ( () ) ;
     public final void rule__XVariableDeclaration__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13621:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13622:1: ( () )
+            // InternalCheckCfg.g:13621:1: ( ( () ) )
+            // InternalCheckCfg.g:13622:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13622:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13623:1: ()
+            // InternalCheckCfg.g:13622:1: ( () )
+            // InternalCheckCfg.g:13623:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getXVariableDeclarationAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13624:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13626:1: 
+            // InternalCheckCfg.g:13624:1: ()
+            // InternalCheckCfg.g:13626:1: 
             {
             }
 
@@ -39550,21 +39550,21 @@ public final void rule__XVariableDeclaration__Group__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13636:1: rule__XVariableDeclaration__Group__1 : rule__XVariableDeclaration__Group__1__Impl rule__XVariableDeclaration__Group__2 ;
+    // InternalCheckCfg.g:13636:1: rule__XVariableDeclaration__Group__1 : rule__XVariableDeclaration__Group__1__Impl rule__XVariableDeclaration__Group__2 ;
     public final void rule__XVariableDeclaration__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13640:1: ( rule__XVariableDeclaration__Group__1__Impl rule__XVariableDeclaration__Group__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13641:2: rule__XVariableDeclaration__Group__1__Impl rule__XVariableDeclaration__Group__2
+            // InternalCheckCfg.g:13640:1: ( rule__XVariableDeclaration__Group__1__Impl rule__XVariableDeclaration__Group__2 )
+            // InternalCheckCfg.g:13641:2: rule__XVariableDeclaration__Group__1__Impl rule__XVariableDeclaration__Group__2
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group__1__Impl_in_rule__XVariableDeclaration__Group__127645);
+            pushFollow(FOLLOW_39);
             rule__XVariableDeclaration__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group__2_in_rule__XVariableDeclaration__Group__127648);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group__2();
 
             state._fsp--;
@@ -39588,25 +39588,25 @@ public final void rule__XVariableDeclaration__Group__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13648:1: rule__XVariableDeclaration__Group__1__Impl : ( ( rule__XVariableDeclaration__Alternatives_1 ) ) ;
+    // InternalCheckCfg.g:13648:1: rule__XVariableDeclaration__Group__1__Impl : ( ( rule__XVariableDeclaration__Alternatives_1 ) ) ;
     public final void rule__XVariableDeclaration__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13652:1: ( ( ( rule__XVariableDeclaration__Alternatives_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13653:1: ( ( rule__XVariableDeclaration__Alternatives_1 ) )
+            // InternalCheckCfg.g:13652:1: ( ( ( rule__XVariableDeclaration__Alternatives_1 ) ) )
+            // InternalCheckCfg.g:13653:1: ( ( rule__XVariableDeclaration__Alternatives_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13653:1: ( ( rule__XVariableDeclaration__Alternatives_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13654:1: ( rule__XVariableDeclaration__Alternatives_1 )
+            // InternalCheckCfg.g:13653:1: ( ( rule__XVariableDeclaration__Alternatives_1 ) )
+            // InternalCheckCfg.g:13654:1: ( rule__XVariableDeclaration__Alternatives_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getAlternatives_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13655:1: ( rule__XVariableDeclaration__Alternatives_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13655:2: rule__XVariableDeclaration__Alternatives_1
+            // InternalCheckCfg.g:13655:1: ( rule__XVariableDeclaration__Alternatives_1 )
+            // InternalCheckCfg.g:13655:2: rule__XVariableDeclaration__Alternatives_1
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Alternatives_1_in_rule__XVariableDeclaration__Group__1__Impl27675);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Alternatives_1();
 
             state._fsp--;
@@ -39639,21 +39639,21 @@ public final void rule__XVariableDeclaration__Group__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13665:1: rule__XVariableDeclaration__Group__2 : rule__XVariableDeclaration__Group__2__Impl rule__XVariableDeclaration__Group__3 ;
+    // InternalCheckCfg.g:13665:1: rule__XVariableDeclaration__Group__2 : rule__XVariableDeclaration__Group__2__Impl rule__XVariableDeclaration__Group__3 ;
     public final void rule__XVariableDeclaration__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13669:1: ( rule__XVariableDeclaration__Group__2__Impl rule__XVariableDeclaration__Group__3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13670:2: rule__XVariableDeclaration__Group__2__Impl rule__XVariableDeclaration__Group__3
+            // InternalCheckCfg.g:13669:1: ( rule__XVariableDeclaration__Group__2__Impl rule__XVariableDeclaration__Group__3 )
+            // InternalCheckCfg.g:13670:2: rule__XVariableDeclaration__Group__2__Impl rule__XVariableDeclaration__Group__3
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group__2__Impl_in_rule__XVariableDeclaration__Group__227705);
+            pushFollow(FOLLOW_19);
             rule__XVariableDeclaration__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group__3_in_rule__XVariableDeclaration__Group__227708);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group__3();
 
             state._fsp--;
@@ -39677,25 +39677,25 @@ public final void rule__XVariableDeclaration__Group__2() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13677:1: rule__XVariableDeclaration__Group__2__Impl : ( ( rule__XVariableDeclaration__Alternatives_2 ) ) ;
+    // InternalCheckCfg.g:13677:1: rule__XVariableDeclaration__Group__2__Impl : ( ( rule__XVariableDeclaration__Alternatives_2 ) ) ;
     public final void rule__XVariableDeclaration__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13681:1: ( ( ( rule__XVariableDeclaration__Alternatives_2 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13682:1: ( ( rule__XVariableDeclaration__Alternatives_2 ) )
+            // InternalCheckCfg.g:13681:1: ( ( ( rule__XVariableDeclaration__Alternatives_2 ) ) )
+            // InternalCheckCfg.g:13682:1: ( ( rule__XVariableDeclaration__Alternatives_2 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13682:1: ( ( rule__XVariableDeclaration__Alternatives_2 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13683:1: ( rule__XVariableDeclaration__Alternatives_2 )
+            // InternalCheckCfg.g:13682:1: ( ( rule__XVariableDeclaration__Alternatives_2 ) )
+            // InternalCheckCfg.g:13683:1: ( rule__XVariableDeclaration__Alternatives_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getAlternatives_2()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13684:1: ( rule__XVariableDeclaration__Alternatives_2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13684:2: rule__XVariableDeclaration__Alternatives_2
+            // InternalCheckCfg.g:13684:1: ( rule__XVariableDeclaration__Alternatives_2 )
+            // InternalCheckCfg.g:13684:2: rule__XVariableDeclaration__Alternatives_2
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Alternatives_2_in_rule__XVariableDeclaration__Group__2__Impl27735);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Alternatives_2();
 
             state._fsp--;
@@ -39728,16 +39728,16 @@ public final void rule__XVariableDeclaration__Group__2__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13694:1: rule__XVariableDeclaration__Group__3 : rule__XVariableDeclaration__Group__3__Impl ;
+    // InternalCheckCfg.g:13694:1: rule__XVariableDeclaration__Group__3 : rule__XVariableDeclaration__Group__3__Impl ;
     public final void rule__XVariableDeclaration__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13698:1: ( rule__XVariableDeclaration__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13699:2: rule__XVariableDeclaration__Group__3__Impl
+            // InternalCheckCfg.g:13698:1: ( rule__XVariableDeclaration__Group__3__Impl )
+            // InternalCheckCfg.g:13699:2: rule__XVariableDeclaration__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group__3__Impl_in_rule__XVariableDeclaration__Group__327765);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group__3__Impl();
 
             state._fsp--;
@@ -39761,22 +39761,22 @@ public final void rule__XVariableDeclaration__Group__3() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13705:1: rule__XVariableDeclaration__Group__3__Impl : ( ( rule__XVariableDeclaration__Group_3__0 )? ) ;
+    // InternalCheckCfg.g:13705:1: rule__XVariableDeclaration__Group__3__Impl : ( ( rule__XVariableDeclaration__Group_3__0 )? ) ;
     public final void rule__XVariableDeclaration__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13709:1: ( ( ( rule__XVariableDeclaration__Group_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13710:1: ( ( rule__XVariableDeclaration__Group_3__0 )? )
+            // InternalCheckCfg.g:13709:1: ( ( ( rule__XVariableDeclaration__Group_3__0 )? ) )
+            // InternalCheckCfg.g:13710:1: ( ( rule__XVariableDeclaration__Group_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13710:1: ( ( rule__XVariableDeclaration__Group_3__0 )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13711:1: ( rule__XVariableDeclaration__Group_3__0 )?
+            // InternalCheckCfg.g:13710:1: ( ( rule__XVariableDeclaration__Group_3__0 )? )
+            // InternalCheckCfg.g:13711:1: ( rule__XVariableDeclaration__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getGroup_3()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13712:1: ( rule__XVariableDeclaration__Group_3__0 )?
+            // InternalCheckCfg.g:13712:1: ( rule__XVariableDeclaration__Group_3__0 )?
             int alt99=2;
             int LA99_0 = input.LA(1);
 
@@ -39785,9 +39785,9 @@ public final void rule__XVariableDeclaration__Group__3__Impl() throws Recognitio
             }
             switch (alt99) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13712:2: rule__XVariableDeclaration__Group_3__0
+                    // InternalCheckCfg.g:13712:2: rule__XVariableDeclaration__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__XVariableDeclaration__Group_3__0_in_rule__XVariableDeclaration__Group__3__Impl27792);
+                    pushFollow(FOLLOW_2);
                     rule__XVariableDeclaration__Group_3__0();
 
                     state._fsp--;
@@ -39823,16 +39823,16 @@ public final void rule__XVariableDeclaration__Group__3__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_2_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13730:1: rule__XVariableDeclaration__Group_2_0__0 : rule__XVariableDeclaration__Group_2_0__0__Impl ;
+    // InternalCheckCfg.g:13730:1: rule__XVariableDeclaration__Group_2_0__0 : rule__XVariableDeclaration__Group_2_0__0__Impl ;
     public final void rule__XVariableDeclaration__Group_2_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13734:1: ( rule__XVariableDeclaration__Group_2_0__0__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13735:2: rule__XVariableDeclaration__Group_2_0__0__Impl
+            // InternalCheckCfg.g:13734:1: ( rule__XVariableDeclaration__Group_2_0__0__Impl )
+            // InternalCheckCfg.g:13735:2: rule__XVariableDeclaration__Group_2_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group_2_0__0__Impl_in_rule__XVariableDeclaration__Group_2_0__027831);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group_2_0__0__Impl();
 
             state._fsp--;
@@ -39856,25 +39856,25 @@ public final void rule__XVariableDeclaration__Group_2_0__0() throws RecognitionE
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_2_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13741:1: rule__XVariableDeclaration__Group_2_0__0__Impl : ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) ) ;
+    // InternalCheckCfg.g:13741:1: rule__XVariableDeclaration__Group_2_0__0__Impl : ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) ) ;
     public final void rule__XVariableDeclaration__Group_2_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13745:1: ( ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13746:1: ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) )
+            // InternalCheckCfg.g:13745:1: ( ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) ) )
+            // InternalCheckCfg.g:13746:1: ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13746:1: ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13747:1: ( rule__XVariableDeclaration__Group_2_0_0__0 )
+            // InternalCheckCfg.g:13746:1: ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) )
+            // InternalCheckCfg.g:13747:1: ( rule__XVariableDeclaration__Group_2_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getGroup_2_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13748:1: ( rule__XVariableDeclaration__Group_2_0_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13748:2: rule__XVariableDeclaration__Group_2_0_0__0
+            // InternalCheckCfg.g:13748:1: ( rule__XVariableDeclaration__Group_2_0_0__0 )
+            // InternalCheckCfg.g:13748:2: rule__XVariableDeclaration__Group_2_0_0__0
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group_2_0_0__0_in_rule__XVariableDeclaration__Group_2_0__0__Impl27858);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group_2_0_0__0();
 
             state._fsp--;
@@ -39907,21 +39907,21 @@ public final void rule__XVariableDeclaration__Group_2_0__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_2_0_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13760:1: rule__XVariableDeclaration__Group_2_0_0__0 : rule__XVariableDeclaration__Group_2_0_0__0__Impl rule__XVariableDeclaration__Group_2_0_0__1 ;
+    // InternalCheckCfg.g:13760:1: rule__XVariableDeclaration__Group_2_0_0__0 : rule__XVariableDeclaration__Group_2_0_0__0__Impl rule__XVariableDeclaration__Group_2_0_0__1 ;
     public final void rule__XVariableDeclaration__Group_2_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13764:1: ( rule__XVariableDeclaration__Group_2_0_0__0__Impl rule__XVariableDeclaration__Group_2_0_0__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13765:2: rule__XVariableDeclaration__Group_2_0_0__0__Impl rule__XVariableDeclaration__Group_2_0_0__1
+            // InternalCheckCfg.g:13764:1: ( rule__XVariableDeclaration__Group_2_0_0__0__Impl rule__XVariableDeclaration__Group_2_0_0__1 )
+            // InternalCheckCfg.g:13765:2: rule__XVariableDeclaration__Group_2_0_0__0__Impl rule__XVariableDeclaration__Group_2_0_0__1
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group_2_0_0__0__Impl_in_rule__XVariableDeclaration__Group_2_0_0__027890);
+            pushFollow(FOLLOW_5);
             rule__XVariableDeclaration__Group_2_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group_2_0_0__1_in_rule__XVariableDeclaration__Group_2_0_0__027893);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group_2_0_0__1();
 
             state._fsp--;
@@ -39945,25 +39945,25 @@ public final void rule__XVariableDeclaration__Group_2_0_0__0() throws Recognitio
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_2_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13772:1: rule__XVariableDeclaration__Group_2_0_0__0__Impl : ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) ) ;
+    // InternalCheckCfg.g:13772:1: rule__XVariableDeclaration__Group_2_0_0__0__Impl : ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) ) ;
     public final void rule__XVariableDeclaration__Group_2_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13776:1: ( ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13777:1: ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) )
+            // InternalCheckCfg.g:13776:1: ( ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) ) )
+            // InternalCheckCfg.g:13777:1: ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13777:1: ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13778:1: ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 )
+            // InternalCheckCfg.g:13777:1: ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) )
+            // InternalCheckCfg.g:13778:1: ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getTypeAssignment_2_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13779:1: ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13779:2: rule__XVariableDeclaration__TypeAssignment_2_0_0_0
+            // InternalCheckCfg.g:13779:1: ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 )
+            // InternalCheckCfg.g:13779:2: rule__XVariableDeclaration__TypeAssignment_2_0_0_0
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__TypeAssignment_2_0_0_0_in_rule__XVariableDeclaration__Group_2_0_0__0__Impl27920);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__TypeAssignment_2_0_0_0();
 
             state._fsp--;
@@ -39996,16 +39996,16 @@ public final void rule__XVariableDeclaration__Group_2_0_0__0__Impl() throws Reco
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_2_0_0__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13789:1: rule__XVariableDeclaration__Group_2_0_0__1 : rule__XVariableDeclaration__Group_2_0_0__1__Impl ;
+    // InternalCheckCfg.g:13789:1: rule__XVariableDeclaration__Group_2_0_0__1 : rule__XVariableDeclaration__Group_2_0_0__1__Impl ;
     public final void rule__XVariableDeclaration__Group_2_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13793:1: ( rule__XVariableDeclaration__Group_2_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13794:2: rule__XVariableDeclaration__Group_2_0_0__1__Impl
+            // InternalCheckCfg.g:13793:1: ( rule__XVariableDeclaration__Group_2_0_0__1__Impl )
+            // InternalCheckCfg.g:13794:2: rule__XVariableDeclaration__Group_2_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group_2_0_0__1__Impl_in_rule__XVariableDeclaration__Group_2_0_0__127950);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group_2_0_0__1__Impl();
 
             state._fsp--;
@@ -40029,25 +40029,25 @@ public final void rule__XVariableDeclaration__Group_2_0_0__1() throws Recognitio
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_2_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13800:1: rule__XVariableDeclaration__Group_2_0_0__1__Impl : ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) ) ;
+    // InternalCheckCfg.g:13800:1: rule__XVariableDeclaration__Group_2_0_0__1__Impl : ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) ) ;
     public final void rule__XVariableDeclaration__Group_2_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13804:1: ( ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13805:1: ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) )
+            // InternalCheckCfg.g:13804:1: ( ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) ) )
+            // InternalCheckCfg.g:13805:1: ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13805:1: ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13806:1: ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 )
+            // InternalCheckCfg.g:13805:1: ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) )
+            // InternalCheckCfg.g:13806:1: ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getNameAssignment_2_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13807:1: ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13807:2: rule__XVariableDeclaration__NameAssignment_2_0_0_1
+            // InternalCheckCfg.g:13807:1: ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 )
+            // InternalCheckCfg.g:13807:2: rule__XVariableDeclaration__NameAssignment_2_0_0_1
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__NameAssignment_2_0_0_1_in_rule__XVariableDeclaration__Group_2_0_0__1__Impl27977);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__NameAssignment_2_0_0_1();
 
             state._fsp--;
@@ -40080,21 +40080,21 @@ public final void rule__XVariableDeclaration__Group_2_0_0__1__Impl() throws Reco
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_3__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13821:1: rule__XVariableDeclaration__Group_3__0 : rule__XVariableDeclaration__Group_3__0__Impl rule__XVariableDeclaration__Group_3__1 ;
+    // InternalCheckCfg.g:13821:1: rule__XVariableDeclaration__Group_3__0 : rule__XVariableDeclaration__Group_3__0__Impl rule__XVariableDeclaration__Group_3__1 ;
     public final void rule__XVariableDeclaration__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13825:1: ( rule__XVariableDeclaration__Group_3__0__Impl rule__XVariableDeclaration__Group_3__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13826:2: rule__XVariableDeclaration__Group_3__0__Impl rule__XVariableDeclaration__Group_3__1
+            // InternalCheckCfg.g:13825:1: ( rule__XVariableDeclaration__Group_3__0__Impl rule__XVariableDeclaration__Group_3__1 )
+            // InternalCheckCfg.g:13826:2: rule__XVariableDeclaration__Group_3__0__Impl rule__XVariableDeclaration__Group_3__1
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group_3__0__Impl_in_rule__XVariableDeclaration__Group_3__028011);
+            pushFollow(FOLLOW_61);
             rule__XVariableDeclaration__Group_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group_3__1_in_rule__XVariableDeclaration__Group_3__028014);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group_3__1();
 
             state._fsp--;
@@ -40118,22 +40118,22 @@ public final void rule__XVariableDeclaration__Group_3__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_3__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13833:1: rule__XVariableDeclaration__Group_3__0__Impl : ( '=' ) ;
+    // InternalCheckCfg.g:13833:1: rule__XVariableDeclaration__Group_3__0__Impl : ( '=' ) ;
     public final void rule__XVariableDeclaration__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13837:1: ( ( '=' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13838:1: ( '=' )
+            // InternalCheckCfg.g:13837:1: ( ( '=' ) )
+            // InternalCheckCfg.g:13838:1: ( '=' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13838:1: ( '=' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13839:1: '='
+            // InternalCheckCfg.g:13838:1: ( '=' )
+            // InternalCheckCfg.g:13839:1: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getEqualsSignKeyword_3_0()); 
             }
-            match(input,13,FOLLOW_13_in_rule__XVariableDeclaration__Group_3__0__Impl28042); if (state.failed) return ;
+            match(input,13,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXVariableDeclarationAccess().getEqualsSignKeyword_3_0()); 
             }
@@ -40159,16 +40159,16 @@ public final void rule__XVariableDeclaration__Group_3__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_3__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13852:1: rule__XVariableDeclaration__Group_3__1 : rule__XVariableDeclaration__Group_3__1__Impl ;
+    // InternalCheckCfg.g:13852:1: rule__XVariableDeclaration__Group_3__1 : rule__XVariableDeclaration__Group_3__1__Impl ;
     public final void rule__XVariableDeclaration__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13856:1: ( rule__XVariableDeclaration__Group_3__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13857:2: rule__XVariableDeclaration__Group_3__1__Impl
+            // InternalCheckCfg.g:13856:1: ( rule__XVariableDeclaration__Group_3__1__Impl )
+            // InternalCheckCfg.g:13857:2: rule__XVariableDeclaration__Group_3__1__Impl
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group_3__1__Impl_in_rule__XVariableDeclaration__Group_3__128073);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group_3__1__Impl();
 
             state._fsp--;
@@ -40192,25 +40192,25 @@ public final void rule__XVariableDeclaration__Group_3__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_3__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13863:1: rule__XVariableDeclaration__Group_3__1__Impl : ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) ) ;
+    // InternalCheckCfg.g:13863:1: rule__XVariableDeclaration__Group_3__1__Impl : ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) ) ;
     public final void rule__XVariableDeclaration__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13867:1: ( ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13868:1: ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) )
+            // InternalCheckCfg.g:13867:1: ( ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) ) )
+            // InternalCheckCfg.g:13868:1: ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13868:1: ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13869:1: ( rule__XVariableDeclaration__RightAssignment_3_1 )
+            // InternalCheckCfg.g:13868:1: ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) )
+            // InternalCheckCfg.g:13869:1: ( rule__XVariableDeclaration__RightAssignment_3_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getRightAssignment_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13870:1: ( rule__XVariableDeclaration__RightAssignment_3_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13870:2: rule__XVariableDeclaration__RightAssignment_3_1
+            // InternalCheckCfg.g:13870:1: ( rule__XVariableDeclaration__RightAssignment_3_1 )
+            // InternalCheckCfg.g:13870:2: rule__XVariableDeclaration__RightAssignment_3_1
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__RightAssignment_3_1_in_rule__XVariableDeclaration__Group_3__1__Impl28100);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__RightAssignment_3_1();
 
             state._fsp--;
@@ -40243,21 +40243,21 @@ public final void rule__XVariableDeclaration__Group_3__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__JvmFormalParameter__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13884:1: rule__JvmFormalParameter__Group__0 : rule__JvmFormalParameter__Group__0__Impl rule__JvmFormalParameter__Group__1 ;
+    // InternalCheckCfg.g:13884:1: rule__JvmFormalParameter__Group__0 : rule__JvmFormalParameter__Group__0__Impl rule__JvmFormalParameter__Group__1 ;
     public final void rule__JvmFormalParameter__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13888:1: ( rule__JvmFormalParameter__Group__0__Impl rule__JvmFormalParameter__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13889:2: rule__JvmFormalParameter__Group__0__Impl rule__JvmFormalParameter__Group__1
+            // InternalCheckCfg.g:13888:1: ( rule__JvmFormalParameter__Group__0__Impl rule__JvmFormalParameter__Group__1 )
+            // InternalCheckCfg.g:13889:2: rule__JvmFormalParameter__Group__0__Impl rule__JvmFormalParameter__Group__1
             {
-            pushFollow(FOLLOW_rule__JvmFormalParameter__Group__0__Impl_in_rule__JvmFormalParameter__Group__028134);
+            pushFollow(FOLLOW_39);
             rule__JvmFormalParameter__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmFormalParameter__Group__1_in_rule__JvmFormalParameter__Group__028137);
+            pushFollow(FOLLOW_2);
             rule__JvmFormalParameter__Group__1();
 
             state._fsp--;
@@ -40281,22 +40281,22 @@ public final void rule__JvmFormalParameter__Group__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__JvmFormalParameter__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13896:1: rule__JvmFormalParameter__Group__0__Impl : ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? ) ;
+    // InternalCheckCfg.g:13896:1: rule__JvmFormalParameter__Group__0__Impl : ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? ) ;
     public final void rule__JvmFormalParameter__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13900:1: ( ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13901:1: ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? )
+            // InternalCheckCfg.g:13900:1: ( ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? ) )
+            // InternalCheckCfg.g:13901:1: ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13901:1: ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13902:1: ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )?
+            // InternalCheckCfg.g:13901:1: ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? )
+            // InternalCheckCfg.g:13902:1: ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmFormalParameterAccess().getParameterTypeAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13903:1: ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )?
+            // InternalCheckCfg.g:13903:1: ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )?
             int alt100=2;
             int LA100_0 = input.LA(1);
 
@@ -40312,9 +40312,9 @@ else if ( (LA100_0==31||LA100_0==62) ) {
             }
             switch (alt100) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13903:2: rule__JvmFormalParameter__ParameterTypeAssignment_0
+                    // InternalCheckCfg.g:13903:2: rule__JvmFormalParameter__ParameterTypeAssignment_0
                     {
-                    pushFollow(FOLLOW_rule__JvmFormalParameter__ParameterTypeAssignment_0_in_rule__JvmFormalParameter__Group__0__Impl28164);
+                    pushFollow(FOLLOW_2);
                     rule__JvmFormalParameter__ParameterTypeAssignment_0();
 
                     state._fsp--;
@@ -40350,16 +40350,16 @@ else if ( (LA100_0==31||LA100_0==62) ) {
 
 
     // $ANTLR start "rule__JvmFormalParameter__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13913:1: rule__JvmFormalParameter__Group__1 : rule__JvmFormalParameter__Group__1__Impl ;
+    // InternalCheckCfg.g:13913:1: rule__JvmFormalParameter__Group__1 : rule__JvmFormalParameter__Group__1__Impl ;
     public final void rule__JvmFormalParameter__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13917:1: ( rule__JvmFormalParameter__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13918:2: rule__JvmFormalParameter__Group__1__Impl
+            // InternalCheckCfg.g:13917:1: ( rule__JvmFormalParameter__Group__1__Impl )
+            // InternalCheckCfg.g:13918:2: rule__JvmFormalParameter__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmFormalParameter__Group__1__Impl_in_rule__JvmFormalParameter__Group__128195);
+            pushFollow(FOLLOW_2);
             rule__JvmFormalParameter__Group__1__Impl();
 
             state._fsp--;
@@ -40383,25 +40383,25 @@ public final void rule__JvmFormalParameter__Group__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__JvmFormalParameter__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13924:1: rule__JvmFormalParameter__Group__1__Impl : ( ( rule__JvmFormalParameter__NameAssignment_1 ) ) ;
+    // InternalCheckCfg.g:13924:1: rule__JvmFormalParameter__Group__1__Impl : ( ( rule__JvmFormalParameter__NameAssignment_1 ) ) ;
     public final void rule__JvmFormalParameter__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13928:1: ( ( ( rule__JvmFormalParameter__NameAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13929:1: ( ( rule__JvmFormalParameter__NameAssignment_1 ) )
+            // InternalCheckCfg.g:13928:1: ( ( ( rule__JvmFormalParameter__NameAssignment_1 ) ) )
+            // InternalCheckCfg.g:13929:1: ( ( rule__JvmFormalParameter__NameAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13929:1: ( ( rule__JvmFormalParameter__NameAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13930:1: ( rule__JvmFormalParameter__NameAssignment_1 )
+            // InternalCheckCfg.g:13929:1: ( ( rule__JvmFormalParameter__NameAssignment_1 ) )
+            // InternalCheckCfg.g:13930:1: ( rule__JvmFormalParameter__NameAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmFormalParameterAccess().getNameAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13931:1: ( rule__JvmFormalParameter__NameAssignment_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13931:2: rule__JvmFormalParameter__NameAssignment_1
+            // InternalCheckCfg.g:13931:1: ( rule__JvmFormalParameter__NameAssignment_1 )
+            // InternalCheckCfg.g:13931:2: rule__JvmFormalParameter__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__JvmFormalParameter__NameAssignment_1_in_rule__JvmFormalParameter__Group__1__Impl28222);
+            pushFollow(FOLLOW_2);
             rule__JvmFormalParameter__NameAssignment_1();
 
             state._fsp--;
@@ -40434,21 +40434,21 @@ public final void rule__JvmFormalParameter__Group__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__FullJvmFormalParameter__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13945:1: rule__FullJvmFormalParameter__Group__0 : rule__FullJvmFormalParameter__Group__0__Impl rule__FullJvmFormalParameter__Group__1 ;
+    // InternalCheckCfg.g:13945:1: rule__FullJvmFormalParameter__Group__0 : rule__FullJvmFormalParameter__Group__0__Impl rule__FullJvmFormalParameter__Group__1 ;
     public final void rule__FullJvmFormalParameter__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13949:1: ( rule__FullJvmFormalParameter__Group__0__Impl rule__FullJvmFormalParameter__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13950:2: rule__FullJvmFormalParameter__Group__0__Impl rule__FullJvmFormalParameter__Group__1
+            // InternalCheckCfg.g:13949:1: ( rule__FullJvmFormalParameter__Group__0__Impl rule__FullJvmFormalParameter__Group__1 )
+            // InternalCheckCfg.g:13950:2: rule__FullJvmFormalParameter__Group__0__Impl rule__FullJvmFormalParameter__Group__1
             {
-            pushFollow(FOLLOW_rule__FullJvmFormalParameter__Group__0__Impl_in_rule__FullJvmFormalParameter__Group__028256);
+            pushFollow(FOLLOW_5);
             rule__FullJvmFormalParameter__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__FullJvmFormalParameter__Group__1_in_rule__FullJvmFormalParameter__Group__028259);
+            pushFollow(FOLLOW_2);
             rule__FullJvmFormalParameter__Group__1();
 
             state._fsp--;
@@ -40472,25 +40472,25 @@ public final void rule__FullJvmFormalParameter__Group__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__FullJvmFormalParameter__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13957:1: rule__FullJvmFormalParameter__Group__0__Impl : ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) ) ;
+    // InternalCheckCfg.g:13957:1: rule__FullJvmFormalParameter__Group__0__Impl : ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) ) ;
     public final void rule__FullJvmFormalParameter__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13961:1: ( ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13962:1: ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) )
+            // InternalCheckCfg.g:13961:1: ( ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) ) )
+            // InternalCheckCfg.g:13962:1: ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13962:1: ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13963:1: ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 )
+            // InternalCheckCfg.g:13962:1: ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) )
+            // InternalCheckCfg.g:13963:1: ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFullJvmFormalParameterAccess().getParameterTypeAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13964:1: ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13964:2: rule__FullJvmFormalParameter__ParameterTypeAssignment_0
+            // InternalCheckCfg.g:13964:1: ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 )
+            // InternalCheckCfg.g:13964:2: rule__FullJvmFormalParameter__ParameterTypeAssignment_0
             {
-            pushFollow(FOLLOW_rule__FullJvmFormalParameter__ParameterTypeAssignment_0_in_rule__FullJvmFormalParameter__Group__0__Impl28286);
+            pushFollow(FOLLOW_2);
             rule__FullJvmFormalParameter__ParameterTypeAssignment_0();
 
             state._fsp--;
@@ -40523,16 +40523,16 @@ public final void rule__FullJvmFormalParameter__Group__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__FullJvmFormalParameter__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13974:1: rule__FullJvmFormalParameter__Group__1 : rule__FullJvmFormalParameter__Group__1__Impl ;
+    // InternalCheckCfg.g:13974:1: rule__FullJvmFormalParameter__Group__1 : rule__FullJvmFormalParameter__Group__1__Impl ;
     public final void rule__FullJvmFormalParameter__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13978:1: ( rule__FullJvmFormalParameter__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13979:2: rule__FullJvmFormalParameter__Group__1__Impl
+            // InternalCheckCfg.g:13978:1: ( rule__FullJvmFormalParameter__Group__1__Impl )
+            // InternalCheckCfg.g:13979:2: rule__FullJvmFormalParameter__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__FullJvmFormalParameter__Group__1__Impl_in_rule__FullJvmFormalParameter__Group__128316);
+            pushFollow(FOLLOW_2);
             rule__FullJvmFormalParameter__Group__1__Impl();
 
             state._fsp--;
@@ -40556,25 +40556,25 @@ public final void rule__FullJvmFormalParameter__Group__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__FullJvmFormalParameter__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13985:1: rule__FullJvmFormalParameter__Group__1__Impl : ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) ) ;
+    // InternalCheckCfg.g:13985:1: rule__FullJvmFormalParameter__Group__1__Impl : ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) ) ;
     public final void rule__FullJvmFormalParameter__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13989:1: ( ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13990:1: ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) )
+            // InternalCheckCfg.g:13989:1: ( ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) ) )
+            // InternalCheckCfg.g:13990:1: ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13990:1: ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13991:1: ( rule__FullJvmFormalParameter__NameAssignment_1 )
+            // InternalCheckCfg.g:13990:1: ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) )
+            // InternalCheckCfg.g:13991:1: ( rule__FullJvmFormalParameter__NameAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFullJvmFormalParameterAccess().getNameAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13992:1: ( rule__FullJvmFormalParameter__NameAssignment_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:13992:2: rule__FullJvmFormalParameter__NameAssignment_1
+            // InternalCheckCfg.g:13992:1: ( rule__FullJvmFormalParameter__NameAssignment_1 )
+            // InternalCheckCfg.g:13992:2: rule__FullJvmFormalParameter__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__FullJvmFormalParameter__NameAssignment_1_in_rule__FullJvmFormalParameter__Group__1__Impl28343);
+            pushFollow(FOLLOW_2);
             rule__FullJvmFormalParameter__NameAssignment_1();
 
             state._fsp--;
@@ -40607,21 +40607,21 @@ public final void rule__FullJvmFormalParameter__Group__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XFeatureCall__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14006:1: rule__XFeatureCall__Group__0 : rule__XFeatureCall__Group__0__Impl rule__XFeatureCall__Group__1 ;
+    // InternalCheckCfg.g:14006:1: rule__XFeatureCall__Group__0 : rule__XFeatureCall__Group__0__Impl rule__XFeatureCall__Group__1 ;
     public final void rule__XFeatureCall__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14010:1: ( rule__XFeatureCall__Group__0__Impl rule__XFeatureCall__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14011:2: rule__XFeatureCall__Group__0__Impl rule__XFeatureCall__Group__1
+            // InternalCheckCfg.g:14010:1: ( rule__XFeatureCall__Group__0__Impl rule__XFeatureCall__Group__1 )
+            // InternalCheckCfg.g:14011:2: rule__XFeatureCall__Group__0__Impl rule__XFeatureCall__Group__1
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group__0__Impl_in_rule__XFeatureCall__Group__028377);
+            pushFollow(FOLLOW_56);
             rule__XFeatureCall__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group__1_in_rule__XFeatureCall__Group__028380);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group__1();
 
             state._fsp--;
@@ -40645,23 +40645,23 @@ public final void rule__XFeatureCall__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14018:1: rule__XFeatureCall__Group__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:14018:1: rule__XFeatureCall__Group__0__Impl : ( () ) ;
     public final void rule__XFeatureCall__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14022:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14023:1: ( () )
+            // InternalCheckCfg.g:14022:1: ( ( () ) )
+            // InternalCheckCfg.g:14023:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14023:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14024:1: ()
+            // InternalCheckCfg.g:14023:1: ( () )
+            // InternalCheckCfg.g:14024:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getXFeatureCallAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14025:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14027:1: 
+            // InternalCheckCfg.g:14025:1: ()
+            // InternalCheckCfg.g:14027:1: 
             {
             }
 
@@ -40686,21 +40686,21 @@ public final void rule__XFeatureCall__Group__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XFeatureCall__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14037:1: rule__XFeatureCall__Group__1 : rule__XFeatureCall__Group__1__Impl rule__XFeatureCall__Group__2 ;
+    // InternalCheckCfg.g:14037:1: rule__XFeatureCall__Group__1 : rule__XFeatureCall__Group__1__Impl rule__XFeatureCall__Group__2 ;
     public final void rule__XFeatureCall__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14041:1: ( rule__XFeatureCall__Group__1__Impl rule__XFeatureCall__Group__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14042:2: rule__XFeatureCall__Group__1__Impl rule__XFeatureCall__Group__2
+            // InternalCheckCfg.g:14041:1: ( rule__XFeatureCall__Group__1__Impl rule__XFeatureCall__Group__2 )
+            // InternalCheckCfg.g:14042:2: rule__XFeatureCall__Group__1__Impl rule__XFeatureCall__Group__2
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group__1__Impl_in_rule__XFeatureCall__Group__128438);
+            pushFollow(FOLLOW_56);
             rule__XFeatureCall__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group__2_in_rule__XFeatureCall__Group__128441);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group__2();
 
             state._fsp--;
@@ -40724,22 +40724,22 @@ public final void rule__XFeatureCall__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14049:1: rule__XFeatureCall__Group__1__Impl : ( ( rule__XFeatureCall__Group_1__0 )? ) ;
+    // InternalCheckCfg.g:14049:1: rule__XFeatureCall__Group__1__Impl : ( ( rule__XFeatureCall__Group_1__0 )? ) ;
     public final void rule__XFeatureCall__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14053:1: ( ( ( rule__XFeatureCall__Group_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14054:1: ( ( rule__XFeatureCall__Group_1__0 )? )
+            // InternalCheckCfg.g:14053:1: ( ( ( rule__XFeatureCall__Group_1__0 )? ) )
+            // InternalCheckCfg.g:14054:1: ( ( rule__XFeatureCall__Group_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14054:1: ( ( rule__XFeatureCall__Group_1__0 )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14055:1: ( rule__XFeatureCall__Group_1__0 )?
+            // InternalCheckCfg.g:14054:1: ( ( rule__XFeatureCall__Group_1__0 )? )
+            // InternalCheckCfg.g:14055:1: ( rule__XFeatureCall__Group_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14056:1: ( rule__XFeatureCall__Group_1__0 )?
+            // InternalCheckCfg.g:14056:1: ( rule__XFeatureCall__Group_1__0 )?
             int alt101=2;
             int LA101_0 = input.LA(1);
 
@@ -40748,9 +40748,9 @@ public final void rule__XFeatureCall__Group__1__Impl() throws RecognitionExcepti
             }
             switch (alt101) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14056:2: rule__XFeatureCall__Group_1__0
+                    // InternalCheckCfg.g:14056:2: rule__XFeatureCall__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__XFeatureCall__Group_1__0_in_rule__XFeatureCall__Group__1__Impl28468);
+                    pushFollow(FOLLOW_2);
                     rule__XFeatureCall__Group_1__0();
 
                     state._fsp--;
@@ -40786,21 +40786,21 @@ public final void rule__XFeatureCall__Group__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XFeatureCall__Group__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14066:1: rule__XFeatureCall__Group__2 : rule__XFeatureCall__Group__2__Impl rule__XFeatureCall__Group__3 ;
+    // InternalCheckCfg.g:14066:1: rule__XFeatureCall__Group__2 : rule__XFeatureCall__Group__2__Impl rule__XFeatureCall__Group__3 ;
     public final void rule__XFeatureCall__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14070:1: ( rule__XFeatureCall__Group__2__Impl rule__XFeatureCall__Group__3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14071:2: rule__XFeatureCall__Group__2__Impl rule__XFeatureCall__Group__3
+            // InternalCheckCfg.g:14070:1: ( rule__XFeatureCall__Group__2__Impl rule__XFeatureCall__Group__3 )
+            // InternalCheckCfg.g:14071:2: rule__XFeatureCall__Group__2__Impl rule__XFeatureCall__Group__3
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group__2__Impl_in_rule__XFeatureCall__Group__228499);
+            pushFollow(FOLLOW_57);
             rule__XFeatureCall__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group__3_in_rule__XFeatureCall__Group__228502);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group__3();
 
             state._fsp--;
@@ -40824,25 +40824,25 @@ public final void rule__XFeatureCall__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14078:1: rule__XFeatureCall__Group__2__Impl : ( ( rule__XFeatureCall__FeatureAssignment_2 ) ) ;
+    // InternalCheckCfg.g:14078:1: rule__XFeatureCall__Group__2__Impl : ( ( rule__XFeatureCall__FeatureAssignment_2 ) ) ;
     public final void rule__XFeatureCall__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14082:1: ( ( ( rule__XFeatureCall__FeatureAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14083:1: ( ( rule__XFeatureCall__FeatureAssignment_2 ) )
+            // InternalCheckCfg.g:14082:1: ( ( ( rule__XFeatureCall__FeatureAssignment_2 ) ) )
+            // InternalCheckCfg.g:14083:1: ( ( rule__XFeatureCall__FeatureAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14083:1: ( ( rule__XFeatureCall__FeatureAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14084:1: ( rule__XFeatureCall__FeatureAssignment_2 )
+            // InternalCheckCfg.g:14083:1: ( ( rule__XFeatureCall__FeatureAssignment_2 ) )
+            // InternalCheckCfg.g:14084:1: ( rule__XFeatureCall__FeatureAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14085:1: ( rule__XFeatureCall__FeatureAssignment_2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14085:2: rule__XFeatureCall__FeatureAssignment_2
+            // InternalCheckCfg.g:14085:1: ( rule__XFeatureCall__FeatureAssignment_2 )
+            // InternalCheckCfg.g:14085:2: rule__XFeatureCall__FeatureAssignment_2
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__FeatureAssignment_2_in_rule__XFeatureCall__Group__2__Impl28529);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__FeatureAssignment_2();
 
             state._fsp--;
@@ -40875,21 +40875,21 @@ public final void rule__XFeatureCall__Group__2__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XFeatureCall__Group__3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14095:1: rule__XFeatureCall__Group__3 : rule__XFeatureCall__Group__3__Impl rule__XFeatureCall__Group__4 ;
+    // InternalCheckCfg.g:14095:1: rule__XFeatureCall__Group__3 : rule__XFeatureCall__Group__3__Impl rule__XFeatureCall__Group__4 ;
     public final void rule__XFeatureCall__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14099:1: ( rule__XFeatureCall__Group__3__Impl rule__XFeatureCall__Group__4 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14100:2: rule__XFeatureCall__Group__3__Impl rule__XFeatureCall__Group__4
+            // InternalCheckCfg.g:14099:1: ( rule__XFeatureCall__Group__3__Impl rule__XFeatureCall__Group__4 )
+            // InternalCheckCfg.g:14100:2: rule__XFeatureCall__Group__3__Impl rule__XFeatureCall__Group__4
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group__3__Impl_in_rule__XFeatureCall__Group__328559);
+            pushFollow(FOLLOW_57);
             rule__XFeatureCall__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group__4_in_rule__XFeatureCall__Group__328562);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group__4();
 
             state._fsp--;
@@ -40913,29 +40913,29 @@ public final void rule__XFeatureCall__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14107:1: rule__XFeatureCall__Group__3__Impl : ( ( rule__XFeatureCall__Group_3__0 )? ) ;
+    // InternalCheckCfg.g:14107:1: rule__XFeatureCall__Group__3__Impl : ( ( rule__XFeatureCall__Group_3__0 )? ) ;
     public final void rule__XFeatureCall__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14111:1: ( ( ( rule__XFeatureCall__Group_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14112:1: ( ( rule__XFeatureCall__Group_3__0 )? )
+            // InternalCheckCfg.g:14111:1: ( ( ( rule__XFeatureCall__Group_3__0 )? ) )
+            // InternalCheckCfg.g:14112:1: ( ( rule__XFeatureCall__Group_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14112:1: ( ( rule__XFeatureCall__Group_3__0 )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14113:1: ( rule__XFeatureCall__Group_3__0 )?
+            // InternalCheckCfg.g:14112:1: ( ( rule__XFeatureCall__Group_3__0 )? )
+            // InternalCheckCfg.g:14113:1: ( rule__XFeatureCall__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getGroup_3()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14114:1: ( rule__XFeatureCall__Group_3__0 )?
+            // InternalCheckCfg.g:14114:1: ( rule__XFeatureCall__Group_3__0 )?
             int alt102=2;
             alt102 = dfa102.predict(input);
             switch (alt102) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14114:2: rule__XFeatureCall__Group_3__0
+                    // InternalCheckCfg.g:14114:2: rule__XFeatureCall__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__XFeatureCall__Group_3__0_in_rule__XFeatureCall__Group__3__Impl28589);
+                    pushFollow(FOLLOW_2);
                     rule__XFeatureCall__Group_3__0();
 
                     state._fsp--;
@@ -40971,16 +40971,16 @@ public final void rule__XFeatureCall__Group__3__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XFeatureCall__Group__4"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14124:1: rule__XFeatureCall__Group__4 : rule__XFeatureCall__Group__4__Impl ;
+    // InternalCheckCfg.g:14124:1: rule__XFeatureCall__Group__4 : rule__XFeatureCall__Group__4__Impl ;
     public final void rule__XFeatureCall__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14128:1: ( rule__XFeatureCall__Group__4__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14129:2: rule__XFeatureCall__Group__4__Impl
+            // InternalCheckCfg.g:14128:1: ( rule__XFeatureCall__Group__4__Impl )
+            // InternalCheckCfg.g:14129:2: rule__XFeatureCall__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group__4__Impl_in_rule__XFeatureCall__Group__428620);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group__4__Impl();
 
             state._fsp--;
@@ -41004,29 +41004,29 @@ public final void rule__XFeatureCall__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14135:1: rule__XFeatureCall__Group__4__Impl : ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? ) ;
+    // InternalCheckCfg.g:14135:1: rule__XFeatureCall__Group__4__Impl : ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? ) ;
     public final void rule__XFeatureCall__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14139:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14140:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? )
+            // InternalCheckCfg.g:14139:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? ) )
+            // InternalCheckCfg.g:14140:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14140:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14141:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )?
+            // InternalCheckCfg.g:14140:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? )
+            // InternalCheckCfg.g:14141:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsAssignment_4()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14142:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )?
+            // InternalCheckCfg.g:14142:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )?
             int alt103=2;
             alt103 = dfa103.predict(input);
             switch (alt103) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14142:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_4
+                    // InternalCheckCfg.g:14142:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_4
                     {
-                    pushFollow(FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_4_in_rule__XFeatureCall__Group__4__Impl28647);
+                    pushFollow(FOLLOW_2);
                     rule__XFeatureCall__FeatureCallArgumentsAssignment_4();
 
                     state._fsp--;
@@ -41062,21 +41062,21 @@ public final void rule__XFeatureCall__Group__4__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14162:1: rule__XFeatureCall__Group_1__0 : rule__XFeatureCall__Group_1__0__Impl rule__XFeatureCall__Group_1__1 ;
+    // InternalCheckCfg.g:14162:1: rule__XFeatureCall__Group_1__0 : rule__XFeatureCall__Group_1__0__Impl rule__XFeatureCall__Group_1__1 ;
     public final void rule__XFeatureCall__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14166:1: ( rule__XFeatureCall__Group_1__0__Impl rule__XFeatureCall__Group_1__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14167:2: rule__XFeatureCall__Group_1__0__Impl rule__XFeatureCall__Group_1__1
+            // InternalCheckCfg.g:14166:1: ( rule__XFeatureCall__Group_1__0__Impl rule__XFeatureCall__Group_1__1 )
+            // InternalCheckCfg.g:14167:2: rule__XFeatureCall__Group_1__0__Impl rule__XFeatureCall__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_1__0__Impl_in_rule__XFeatureCall__Group_1__028688);
+            pushFollow(FOLLOW_58);
             rule__XFeatureCall__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_1__1_in_rule__XFeatureCall__Group_1__028691);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_1__1();
 
             state._fsp--;
@@ -41100,22 +41100,22 @@ public final void rule__XFeatureCall__Group_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14174:1: rule__XFeatureCall__Group_1__0__Impl : ( '<' ) ;
+    // InternalCheckCfg.g:14174:1: rule__XFeatureCall__Group_1__0__Impl : ( '<' ) ;
     public final void rule__XFeatureCall__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14178:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14179:1: ( '<' )
+            // InternalCheckCfg.g:14178:1: ( ( '<' ) )
+            // InternalCheckCfg.g:14179:1: ( '<' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14179:1: ( '<' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14180:1: '<'
+            // InternalCheckCfg.g:14179:1: ( '<' )
+            // InternalCheckCfg.g:14180:1: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getLessThanSignKeyword_1_0()); 
             }
-            match(input,27,FOLLOW_27_in_rule__XFeatureCall__Group_1__0__Impl28719); if (state.failed) return ;
+            match(input,27,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFeatureCallAccess().getLessThanSignKeyword_1_0()); 
             }
@@ -41141,21 +41141,21 @@ public final void rule__XFeatureCall__Group_1__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14193:1: rule__XFeatureCall__Group_1__1 : rule__XFeatureCall__Group_1__1__Impl rule__XFeatureCall__Group_1__2 ;
+    // InternalCheckCfg.g:14193:1: rule__XFeatureCall__Group_1__1 : rule__XFeatureCall__Group_1__1__Impl rule__XFeatureCall__Group_1__2 ;
     public final void rule__XFeatureCall__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14197:1: ( rule__XFeatureCall__Group_1__1__Impl rule__XFeatureCall__Group_1__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14198:2: rule__XFeatureCall__Group_1__1__Impl rule__XFeatureCall__Group_1__2
+            // InternalCheckCfg.g:14197:1: ( rule__XFeatureCall__Group_1__1__Impl rule__XFeatureCall__Group_1__2 )
+            // InternalCheckCfg.g:14198:2: rule__XFeatureCall__Group_1__1__Impl rule__XFeatureCall__Group_1__2
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_1__1__Impl_in_rule__XFeatureCall__Group_1__128750);
+            pushFollow(FOLLOW_59);
             rule__XFeatureCall__Group_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_1__2_in_rule__XFeatureCall__Group_1__128753);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_1__2();
 
             state._fsp--;
@@ -41179,25 +41179,25 @@ public final void rule__XFeatureCall__Group_1__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14205:1: rule__XFeatureCall__Group_1__1__Impl : ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) ) ;
+    // InternalCheckCfg.g:14205:1: rule__XFeatureCall__Group_1__1__Impl : ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) ) ;
     public final void rule__XFeatureCall__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14209:1: ( ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14210:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) )
+            // InternalCheckCfg.g:14209:1: ( ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) ) )
+            // InternalCheckCfg.g:14210:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14210:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14211:1: ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 )
+            // InternalCheckCfg.g:14210:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) )
+            // InternalCheckCfg.g:14211:1: ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getTypeArgumentsAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14212:1: ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14212:2: rule__XFeatureCall__TypeArgumentsAssignment_1_1
+            // InternalCheckCfg.g:14212:1: ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 )
+            // InternalCheckCfg.g:14212:2: rule__XFeatureCall__TypeArgumentsAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__TypeArgumentsAssignment_1_1_in_rule__XFeatureCall__Group_1__1__Impl28780);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__TypeArgumentsAssignment_1_1();
 
             state._fsp--;
@@ -41230,21 +41230,21 @@ public final void rule__XFeatureCall__Group_1__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14222:1: rule__XFeatureCall__Group_1__2 : rule__XFeatureCall__Group_1__2__Impl rule__XFeatureCall__Group_1__3 ;
+    // InternalCheckCfg.g:14222:1: rule__XFeatureCall__Group_1__2 : rule__XFeatureCall__Group_1__2__Impl rule__XFeatureCall__Group_1__3 ;
     public final void rule__XFeatureCall__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14226:1: ( rule__XFeatureCall__Group_1__2__Impl rule__XFeatureCall__Group_1__3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14227:2: rule__XFeatureCall__Group_1__2__Impl rule__XFeatureCall__Group_1__3
+            // InternalCheckCfg.g:14226:1: ( rule__XFeatureCall__Group_1__2__Impl rule__XFeatureCall__Group_1__3 )
+            // InternalCheckCfg.g:14227:2: rule__XFeatureCall__Group_1__2__Impl rule__XFeatureCall__Group_1__3
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_1__2__Impl_in_rule__XFeatureCall__Group_1__228810);
+            pushFollow(FOLLOW_59);
             rule__XFeatureCall__Group_1__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_1__3_in_rule__XFeatureCall__Group_1__228813);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_1__3();
 
             state._fsp--;
@@ -41268,22 +41268,22 @@ public final void rule__XFeatureCall__Group_1__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14234:1: rule__XFeatureCall__Group_1__2__Impl : ( ( rule__XFeatureCall__Group_1_2__0 )* ) ;
+    // InternalCheckCfg.g:14234:1: rule__XFeatureCall__Group_1__2__Impl : ( ( rule__XFeatureCall__Group_1_2__0 )* ) ;
     public final void rule__XFeatureCall__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14238:1: ( ( ( rule__XFeatureCall__Group_1_2__0 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14239:1: ( ( rule__XFeatureCall__Group_1_2__0 )* )
+            // InternalCheckCfg.g:14238:1: ( ( ( rule__XFeatureCall__Group_1_2__0 )* ) )
+            // InternalCheckCfg.g:14239:1: ( ( rule__XFeatureCall__Group_1_2__0 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14239:1: ( ( rule__XFeatureCall__Group_1_2__0 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14240:1: ( rule__XFeatureCall__Group_1_2__0 )*
+            // InternalCheckCfg.g:14239:1: ( ( rule__XFeatureCall__Group_1_2__0 )* )
+            // InternalCheckCfg.g:14240:1: ( rule__XFeatureCall__Group_1_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getGroup_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14241:1: ( rule__XFeatureCall__Group_1_2__0 )*
+            // InternalCheckCfg.g:14241:1: ( rule__XFeatureCall__Group_1_2__0 )*
             loop104:
             do {
                 int alt104=2;
@@ -41296,9 +41296,9 @@ public final void rule__XFeatureCall__Group_1__2__Impl() throws RecognitionExcep
 
                 switch (alt104) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14241:2: rule__XFeatureCall__Group_1_2__0
+            	    // InternalCheckCfg.g:14241:2: rule__XFeatureCall__Group_1_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__XFeatureCall__Group_1_2__0_in_rule__XFeatureCall__Group_1__2__Impl28840);
+            	    pushFollow(FOLLOW_18);
             	    rule__XFeatureCall__Group_1_2__0();
 
             	    state._fsp--;
@@ -41337,16 +41337,16 @@ public final void rule__XFeatureCall__Group_1__2__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14251:1: rule__XFeatureCall__Group_1__3 : rule__XFeatureCall__Group_1__3__Impl ;
+    // InternalCheckCfg.g:14251:1: rule__XFeatureCall__Group_1__3 : rule__XFeatureCall__Group_1__3__Impl ;
     public final void rule__XFeatureCall__Group_1__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14255:1: ( rule__XFeatureCall__Group_1__3__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14256:2: rule__XFeatureCall__Group_1__3__Impl
+            // InternalCheckCfg.g:14255:1: ( rule__XFeatureCall__Group_1__3__Impl )
+            // InternalCheckCfg.g:14256:2: rule__XFeatureCall__Group_1__3__Impl
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_1__3__Impl_in_rule__XFeatureCall__Group_1__328871);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_1__3__Impl();
 
             state._fsp--;
@@ -41370,22 +41370,22 @@ public final void rule__XFeatureCall__Group_1__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__3__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14262:1: rule__XFeatureCall__Group_1__3__Impl : ( '>' ) ;
+    // InternalCheckCfg.g:14262:1: rule__XFeatureCall__Group_1__3__Impl : ( '>' ) ;
     public final void rule__XFeatureCall__Group_1__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14266:1: ( ( '>' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14267:1: ( '>' )
+            // InternalCheckCfg.g:14266:1: ( ( '>' ) )
+            // InternalCheckCfg.g:14267:1: ( '>' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14267:1: ( '>' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14268:1: '>'
+            // InternalCheckCfg.g:14267:1: ( '>' )
+            // InternalCheckCfg.g:14268:1: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getGreaterThanSignKeyword_1_3()); 
             }
-            match(input,26,FOLLOW_26_in_rule__XFeatureCall__Group_1__3__Impl28899); if (state.failed) return ;
+            match(input,26,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFeatureCallAccess().getGreaterThanSignKeyword_1_3()); 
             }
@@ -41411,21 +41411,21 @@ public final void rule__XFeatureCall__Group_1__3__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1_2__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14289:1: rule__XFeatureCall__Group_1_2__0 : rule__XFeatureCall__Group_1_2__0__Impl rule__XFeatureCall__Group_1_2__1 ;
+    // InternalCheckCfg.g:14289:1: rule__XFeatureCall__Group_1_2__0 : rule__XFeatureCall__Group_1_2__0__Impl rule__XFeatureCall__Group_1_2__1 ;
     public final void rule__XFeatureCall__Group_1_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14293:1: ( rule__XFeatureCall__Group_1_2__0__Impl rule__XFeatureCall__Group_1_2__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14294:2: rule__XFeatureCall__Group_1_2__0__Impl rule__XFeatureCall__Group_1_2__1
+            // InternalCheckCfg.g:14293:1: ( rule__XFeatureCall__Group_1_2__0__Impl rule__XFeatureCall__Group_1_2__1 )
+            // InternalCheckCfg.g:14294:2: rule__XFeatureCall__Group_1_2__0__Impl rule__XFeatureCall__Group_1_2__1
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_1_2__0__Impl_in_rule__XFeatureCall__Group_1_2__028938);
+            pushFollow(FOLLOW_58);
             rule__XFeatureCall__Group_1_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_1_2__1_in_rule__XFeatureCall__Group_1_2__028941);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_1_2__1();
 
             state._fsp--;
@@ -41449,22 +41449,22 @@ public final void rule__XFeatureCall__Group_1_2__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1_2__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14301:1: rule__XFeatureCall__Group_1_2__0__Impl : ( ',' ) ;
+    // InternalCheckCfg.g:14301:1: rule__XFeatureCall__Group_1_2__0__Impl : ( ',' ) ;
     public final void rule__XFeatureCall__Group_1_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14305:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14306:1: ( ',' )
+            // InternalCheckCfg.g:14305:1: ( ( ',' ) )
+            // InternalCheckCfg.g:14306:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14306:1: ( ',' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14307:1: ','
+            // InternalCheckCfg.g:14306:1: ( ',' )
+            // InternalCheckCfg.g:14307:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getCommaKeyword_1_2_0()); 
             }
-            match(input,64,FOLLOW_64_in_rule__XFeatureCall__Group_1_2__0__Impl28969); if (state.failed) return ;
+            match(input,64,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFeatureCallAccess().getCommaKeyword_1_2_0()); 
             }
@@ -41490,16 +41490,16 @@ public final void rule__XFeatureCall__Group_1_2__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1_2__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14320:1: rule__XFeatureCall__Group_1_2__1 : rule__XFeatureCall__Group_1_2__1__Impl ;
+    // InternalCheckCfg.g:14320:1: rule__XFeatureCall__Group_1_2__1 : rule__XFeatureCall__Group_1_2__1__Impl ;
     public final void rule__XFeatureCall__Group_1_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14324:1: ( rule__XFeatureCall__Group_1_2__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14325:2: rule__XFeatureCall__Group_1_2__1__Impl
+            // InternalCheckCfg.g:14324:1: ( rule__XFeatureCall__Group_1_2__1__Impl )
+            // InternalCheckCfg.g:14325:2: rule__XFeatureCall__Group_1_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_1_2__1__Impl_in_rule__XFeatureCall__Group_1_2__129000);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_1_2__1__Impl();
 
             state._fsp--;
@@ -41523,25 +41523,25 @@ public final void rule__XFeatureCall__Group_1_2__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1_2__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14331:1: rule__XFeatureCall__Group_1_2__1__Impl : ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) ) ;
+    // InternalCheckCfg.g:14331:1: rule__XFeatureCall__Group_1_2__1__Impl : ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) ) ;
     public final void rule__XFeatureCall__Group_1_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14335:1: ( ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14336:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) )
+            // InternalCheckCfg.g:14335:1: ( ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) ) )
+            // InternalCheckCfg.g:14336:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14336:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14337:1: ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 )
+            // InternalCheckCfg.g:14336:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) )
+            // InternalCheckCfg.g:14337:1: ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getTypeArgumentsAssignment_1_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14338:1: ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14338:2: rule__XFeatureCall__TypeArgumentsAssignment_1_2_1
+            // InternalCheckCfg.g:14338:1: ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 )
+            // InternalCheckCfg.g:14338:2: rule__XFeatureCall__TypeArgumentsAssignment_1_2_1
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__TypeArgumentsAssignment_1_2_1_in_rule__XFeatureCall__Group_1_2__1__Impl29027);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__TypeArgumentsAssignment_1_2_1();
 
             state._fsp--;
@@ -41574,21 +41574,21 @@ public final void rule__XFeatureCall__Group_1_2__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14352:1: rule__XFeatureCall__Group_3__0 : rule__XFeatureCall__Group_3__0__Impl rule__XFeatureCall__Group_3__1 ;
+    // InternalCheckCfg.g:14352:1: rule__XFeatureCall__Group_3__0 : rule__XFeatureCall__Group_3__0__Impl rule__XFeatureCall__Group_3__1 ;
     public final void rule__XFeatureCall__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14356:1: ( rule__XFeatureCall__Group_3__0__Impl rule__XFeatureCall__Group_3__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14357:2: rule__XFeatureCall__Group_3__0__Impl rule__XFeatureCall__Group_3__1
+            // InternalCheckCfg.g:14356:1: ( rule__XFeatureCall__Group_3__0__Impl rule__XFeatureCall__Group_3__1 )
+            // InternalCheckCfg.g:14357:2: rule__XFeatureCall__Group_3__0__Impl rule__XFeatureCall__Group_3__1
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3__0__Impl_in_rule__XFeatureCall__Group_3__029061);
+            pushFollow(FOLLOW_60);
             rule__XFeatureCall__Group_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3__1_in_rule__XFeatureCall__Group_3__029064);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_3__1();
 
             state._fsp--;
@@ -41612,25 +41612,25 @@ public final void rule__XFeatureCall__Group_3__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14364:1: rule__XFeatureCall__Group_3__0__Impl : ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) ) ;
+    // InternalCheckCfg.g:14364:1: rule__XFeatureCall__Group_3__0__Impl : ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) ) ;
     public final void rule__XFeatureCall__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14368:1: ( ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14369:1: ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) )
+            // InternalCheckCfg.g:14368:1: ( ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) ) )
+            // InternalCheckCfg.g:14369:1: ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14369:1: ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14370:1: ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 )
+            // InternalCheckCfg.g:14369:1: ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) )
+            // InternalCheckCfg.g:14370:1: ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getExplicitOperationCallAssignment_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14371:1: ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14371:2: rule__XFeatureCall__ExplicitOperationCallAssignment_3_0
+            // InternalCheckCfg.g:14371:1: ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 )
+            // InternalCheckCfg.g:14371:2: rule__XFeatureCall__ExplicitOperationCallAssignment_3_0
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__ExplicitOperationCallAssignment_3_0_in_rule__XFeatureCall__Group_3__0__Impl29091);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__ExplicitOperationCallAssignment_3_0();
 
             state._fsp--;
@@ -41663,21 +41663,21 @@ public final void rule__XFeatureCall__Group_3__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14381:1: rule__XFeatureCall__Group_3__1 : rule__XFeatureCall__Group_3__1__Impl rule__XFeatureCall__Group_3__2 ;
+    // InternalCheckCfg.g:14381:1: rule__XFeatureCall__Group_3__1 : rule__XFeatureCall__Group_3__1__Impl rule__XFeatureCall__Group_3__2 ;
     public final void rule__XFeatureCall__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14385:1: ( rule__XFeatureCall__Group_3__1__Impl rule__XFeatureCall__Group_3__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14386:2: rule__XFeatureCall__Group_3__1__Impl rule__XFeatureCall__Group_3__2
+            // InternalCheckCfg.g:14385:1: ( rule__XFeatureCall__Group_3__1__Impl rule__XFeatureCall__Group_3__2 )
+            // InternalCheckCfg.g:14386:2: rule__XFeatureCall__Group_3__1__Impl rule__XFeatureCall__Group_3__2
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3__1__Impl_in_rule__XFeatureCall__Group_3__129121);
+            pushFollow(FOLLOW_60);
             rule__XFeatureCall__Group_3__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3__2_in_rule__XFeatureCall__Group_3__129124);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_3__2();
 
             state._fsp--;
@@ -41701,22 +41701,22 @@ public final void rule__XFeatureCall__Group_3__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14393:1: rule__XFeatureCall__Group_3__1__Impl : ( ( rule__XFeatureCall__Alternatives_3_1 )? ) ;
+    // InternalCheckCfg.g:14393:1: rule__XFeatureCall__Group_3__1__Impl : ( ( rule__XFeatureCall__Alternatives_3_1 )? ) ;
     public final void rule__XFeatureCall__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14397:1: ( ( ( rule__XFeatureCall__Alternatives_3_1 )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14398:1: ( ( rule__XFeatureCall__Alternatives_3_1 )? )
+            // InternalCheckCfg.g:14397:1: ( ( ( rule__XFeatureCall__Alternatives_3_1 )? ) )
+            // InternalCheckCfg.g:14398:1: ( ( rule__XFeatureCall__Alternatives_3_1 )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14398:1: ( ( rule__XFeatureCall__Alternatives_3_1 )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14399:1: ( rule__XFeatureCall__Alternatives_3_1 )?
+            // InternalCheckCfg.g:14398:1: ( ( rule__XFeatureCall__Alternatives_3_1 )? )
+            // InternalCheckCfg.g:14399:1: ( rule__XFeatureCall__Alternatives_3_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getAlternatives_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14400:1: ( rule__XFeatureCall__Alternatives_3_1 )?
+            // InternalCheckCfg.g:14400:1: ( rule__XFeatureCall__Alternatives_3_1 )?
             int alt105=2;
             int LA105_0 = input.LA(1);
 
@@ -41725,9 +41725,9 @@ public final void rule__XFeatureCall__Group_3__1__Impl() throws RecognitionExcep
             }
             switch (alt105) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14400:2: rule__XFeatureCall__Alternatives_3_1
+                    // InternalCheckCfg.g:14400:2: rule__XFeatureCall__Alternatives_3_1
                     {
-                    pushFollow(FOLLOW_rule__XFeatureCall__Alternatives_3_1_in_rule__XFeatureCall__Group_3__1__Impl29151);
+                    pushFollow(FOLLOW_2);
                     rule__XFeatureCall__Alternatives_3_1();
 
                     state._fsp--;
@@ -41763,16 +41763,16 @@ public final void rule__XFeatureCall__Group_3__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14410:1: rule__XFeatureCall__Group_3__2 : rule__XFeatureCall__Group_3__2__Impl ;
+    // InternalCheckCfg.g:14410:1: rule__XFeatureCall__Group_3__2 : rule__XFeatureCall__Group_3__2__Impl ;
     public final void rule__XFeatureCall__Group_3__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14414:1: ( rule__XFeatureCall__Group_3__2__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14415:2: rule__XFeatureCall__Group_3__2__Impl
+            // InternalCheckCfg.g:14414:1: ( rule__XFeatureCall__Group_3__2__Impl )
+            // InternalCheckCfg.g:14415:2: rule__XFeatureCall__Group_3__2__Impl
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3__2__Impl_in_rule__XFeatureCall__Group_3__229182);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_3__2__Impl();
 
             state._fsp--;
@@ -41796,22 +41796,22 @@ public final void rule__XFeatureCall__Group_3__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14421:1: rule__XFeatureCall__Group_3__2__Impl : ( ')' ) ;
+    // InternalCheckCfg.g:14421:1: rule__XFeatureCall__Group_3__2__Impl : ( ')' ) ;
     public final void rule__XFeatureCall__Group_3__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14425:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14426:1: ( ')' )
+            // InternalCheckCfg.g:14425:1: ( ( ')' ) )
+            // InternalCheckCfg.g:14426:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14426:1: ( ')' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14427:1: ')'
+            // InternalCheckCfg.g:14426:1: ( ')' )
+            // InternalCheckCfg.g:14427:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getRightParenthesisKeyword_3_2()); 
             }
-            match(input,63,FOLLOW_63_in_rule__XFeatureCall__Group_3__2__Impl29210); if (state.failed) return ;
+            match(input,63,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFeatureCallAccess().getRightParenthesisKeyword_3_2()); 
             }
@@ -41837,21 +41837,21 @@ public final void rule__XFeatureCall__Group_3__2__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14446:1: rule__XFeatureCall__Group_3_1_1__0 : rule__XFeatureCall__Group_3_1_1__0__Impl rule__XFeatureCall__Group_3_1_1__1 ;
+    // InternalCheckCfg.g:14446:1: rule__XFeatureCall__Group_3_1_1__0 : rule__XFeatureCall__Group_3_1_1__0__Impl rule__XFeatureCall__Group_3_1_1__1 ;
     public final void rule__XFeatureCall__Group_3_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14450:1: ( rule__XFeatureCall__Group_3_1_1__0__Impl rule__XFeatureCall__Group_3_1_1__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14451:2: rule__XFeatureCall__Group_3_1_1__0__Impl rule__XFeatureCall__Group_3_1_1__1
+            // InternalCheckCfg.g:14450:1: ( rule__XFeatureCall__Group_3_1_1__0__Impl rule__XFeatureCall__Group_3_1_1__1 )
+            // InternalCheckCfg.g:14451:2: rule__XFeatureCall__Group_3_1_1__0__Impl rule__XFeatureCall__Group_3_1_1__1
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3_1_1__0__Impl_in_rule__XFeatureCall__Group_3_1_1__029247);
+            pushFollow(FOLLOW_25);
             rule__XFeatureCall__Group_3_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3_1_1__1_in_rule__XFeatureCall__Group_3_1_1__029250);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_3_1_1__1();
 
             state._fsp--;
@@ -41875,25 +41875,25 @@ public final void rule__XFeatureCall__Group_3_1_1__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14458:1: rule__XFeatureCall__Group_3_1_1__0__Impl : ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) ) ;
+    // InternalCheckCfg.g:14458:1: rule__XFeatureCall__Group_3_1_1__0__Impl : ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) ) ;
     public final void rule__XFeatureCall__Group_3_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14462:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14463:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) )
+            // InternalCheckCfg.g:14462:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) ) )
+            // InternalCheckCfg.g:14463:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14463:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14464:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 )
+            // InternalCheckCfg.g:14463:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) )
+            // InternalCheckCfg.g:14464:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsAssignment_3_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14465:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14465:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0
+            // InternalCheckCfg.g:14465:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 )
+            // InternalCheckCfg.g:14465:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0_in_rule__XFeatureCall__Group_3_1_1__0__Impl29277);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0();
 
             state._fsp--;
@@ -41926,16 +41926,16 @@ public final void rule__XFeatureCall__Group_3_1_1__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14475:1: rule__XFeatureCall__Group_3_1_1__1 : rule__XFeatureCall__Group_3_1_1__1__Impl ;
+    // InternalCheckCfg.g:14475:1: rule__XFeatureCall__Group_3_1_1__1 : rule__XFeatureCall__Group_3_1_1__1__Impl ;
     public final void rule__XFeatureCall__Group_3_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14479:1: ( rule__XFeatureCall__Group_3_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14480:2: rule__XFeatureCall__Group_3_1_1__1__Impl
+            // InternalCheckCfg.g:14479:1: ( rule__XFeatureCall__Group_3_1_1__1__Impl )
+            // InternalCheckCfg.g:14480:2: rule__XFeatureCall__Group_3_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3_1_1__1__Impl_in_rule__XFeatureCall__Group_3_1_1__129307);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_3_1_1__1__Impl();
 
             state._fsp--;
@@ -41959,22 +41959,22 @@ public final void rule__XFeatureCall__Group_3_1_1__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14486:1: rule__XFeatureCall__Group_3_1_1__1__Impl : ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* ) ;
+    // InternalCheckCfg.g:14486:1: rule__XFeatureCall__Group_3_1_1__1__Impl : ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* ) ;
     public final void rule__XFeatureCall__Group_3_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14490:1: ( ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14491:1: ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* )
+            // InternalCheckCfg.g:14490:1: ( ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* ) )
+            // InternalCheckCfg.g:14491:1: ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14491:1: ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14492:1: ( rule__XFeatureCall__Group_3_1_1_1__0 )*
+            // InternalCheckCfg.g:14491:1: ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* )
+            // InternalCheckCfg.g:14492:1: ( rule__XFeatureCall__Group_3_1_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getGroup_3_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14493:1: ( rule__XFeatureCall__Group_3_1_1_1__0 )*
+            // InternalCheckCfg.g:14493:1: ( rule__XFeatureCall__Group_3_1_1_1__0 )*
             loop106:
             do {
                 int alt106=2;
@@ -41987,9 +41987,9 @@ public final void rule__XFeatureCall__Group_3_1_1__1__Impl() throws RecognitionE
 
                 switch (alt106) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14493:2: rule__XFeatureCall__Group_3_1_1_1__0
+            	    // InternalCheckCfg.g:14493:2: rule__XFeatureCall__Group_3_1_1_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XFeatureCall__Group_3_1_1_1__0_in_rule__XFeatureCall__Group_3_1_1__1__Impl29334);
+            	    pushFollow(FOLLOW_18);
             	    rule__XFeatureCall__Group_3_1_1_1__0();
 
             	    state._fsp--;
@@ -42028,21 +42028,21 @@ public final void rule__XFeatureCall__Group_3_1_1__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1_1__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14507:1: rule__XFeatureCall__Group_3_1_1_1__0 : rule__XFeatureCall__Group_3_1_1_1__0__Impl rule__XFeatureCall__Group_3_1_1_1__1 ;
+    // InternalCheckCfg.g:14507:1: rule__XFeatureCall__Group_3_1_1_1__0 : rule__XFeatureCall__Group_3_1_1_1__0__Impl rule__XFeatureCall__Group_3_1_1_1__1 ;
     public final void rule__XFeatureCall__Group_3_1_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14511:1: ( rule__XFeatureCall__Group_3_1_1_1__0__Impl rule__XFeatureCall__Group_3_1_1_1__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14512:2: rule__XFeatureCall__Group_3_1_1_1__0__Impl rule__XFeatureCall__Group_3_1_1_1__1
+            // InternalCheckCfg.g:14511:1: ( rule__XFeatureCall__Group_3_1_1_1__0__Impl rule__XFeatureCall__Group_3_1_1_1__1 )
+            // InternalCheckCfg.g:14512:2: rule__XFeatureCall__Group_3_1_1_1__0__Impl rule__XFeatureCall__Group_3_1_1_1__1
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3_1_1_1__0__Impl_in_rule__XFeatureCall__Group_3_1_1_1__029369);
+            pushFollow(FOLLOW_61);
             rule__XFeatureCall__Group_3_1_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3_1_1_1__1_in_rule__XFeatureCall__Group_3_1_1_1__029372);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_3_1_1_1__1();
 
             state._fsp--;
@@ -42066,22 +42066,22 @@ public final void rule__XFeatureCall__Group_3_1_1_1__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14519:1: rule__XFeatureCall__Group_3_1_1_1__0__Impl : ( ',' ) ;
+    // InternalCheckCfg.g:14519:1: rule__XFeatureCall__Group_3_1_1_1__0__Impl : ( ',' ) ;
     public final void rule__XFeatureCall__Group_3_1_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14523:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14524:1: ( ',' )
+            // InternalCheckCfg.g:14523:1: ( ( ',' ) )
+            // InternalCheckCfg.g:14524:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14524:1: ( ',' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14525:1: ','
+            // InternalCheckCfg.g:14524:1: ( ',' )
+            // InternalCheckCfg.g:14525:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getCommaKeyword_3_1_1_1_0()); 
             }
-            match(input,64,FOLLOW_64_in_rule__XFeatureCall__Group_3_1_1_1__0__Impl29400); if (state.failed) return ;
+            match(input,64,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFeatureCallAccess().getCommaKeyword_3_1_1_1_0()); 
             }
@@ -42107,16 +42107,16 @@ public final void rule__XFeatureCall__Group_3_1_1_1__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1_1__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14538:1: rule__XFeatureCall__Group_3_1_1_1__1 : rule__XFeatureCall__Group_3_1_1_1__1__Impl ;
+    // InternalCheckCfg.g:14538:1: rule__XFeatureCall__Group_3_1_1_1__1 : rule__XFeatureCall__Group_3_1_1_1__1__Impl ;
     public final void rule__XFeatureCall__Group_3_1_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14542:1: ( rule__XFeatureCall__Group_3_1_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14543:2: rule__XFeatureCall__Group_3_1_1_1__1__Impl
+            // InternalCheckCfg.g:14542:1: ( rule__XFeatureCall__Group_3_1_1_1__1__Impl )
+            // InternalCheckCfg.g:14543:2: rule__XFeatureCall__Group_3_1_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3_1_1_1__1__Impl_in_rule__XFeatureCall__Group_3_1_1_1__129431);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_3_1_1_1__1__Impl();
 
             state._fsp--;
@@ -42140,25 +42140,25 @@ public final void rule__XFeatureCall__Group_3_1_1_1__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14549:1: rule__XFeatureCall__Group_3_1_1_1__1__Impl : ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) ) ;
+    // InternalCheckCfg.g:14549:1: rule__XFeatureCall__Group_3_1_1_1__1__Impl : ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) ) ;
     public final void rule__XFeatureCall__Group_3_1_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14553:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14554:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) )
+            // InternalCheckCfg.g:14553:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) ) )
+            // InternalCheckCfg.g:14554:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14554:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14555:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 )
+            // InternalCheckCfg.g:14554:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) )
+            // InternalCheckCfg.g:14555:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsAssignment_3_1_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14556:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14556:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1
+            // InternalCheckCfg.g:14556:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 )
+            // InternalCheckCfg.g:14556:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1_in_rule__XFeatureCall__Group_3_1_1_1__1__Impl29458);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1();
 
             state._fsp--;
@@ -42191,21 +42191,21 @@ public final void rule__XFeatureCall__Group_3_1_1_1__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XConstructorCall__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14570:1: rule__XConstructorCall__Group__0 : rule__XConstructorCall__Group__0__Impl rule__XConstructorCall__Group__1 ;
+    // InternalCheckCfg.g:14570:1: rule__XConstructorCall__Group__0 : rule__XConstructorCall__Group__0__Impl rule__XConstructorCall__Group__1 ;
     public final void rule__XConstructorCall__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14574:1: ( rule__XConstructorCall__Group__0__Impl rule__XConstructorCall__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14575:2: rule__XConstructorCall__Group__0__Impl rule__XConstructorCall__Group__1
+            // InternalCheckCfg.g:14574:1: ( rule__XConstructorCall__Group__0__Impl rule__XConstructorCall__Group__1 )
+            // InternalCheckCfg.g:14575:2: rule__XConstructorCall__Group__0__Impl rule__XConstructorCall__Group__1
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__0__Impl_in_rule__XConstructorCall__Group__029492);
+            pushFollow(FOLLOW_85);
             rule__XConstructorCall__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__1_in_rule__XConstructorCall__Group__029495);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group__1();
 
             state._fsp--;
@@ -42229,23 +42229,23 @@ public final void rule__XConstructorCall__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XConstructorCall__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14582:1: rule__XConstructorCall__Group__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:14582:1: rule__XConstructorCall__Group__0__Impl : ( () ) ;
     public final void rule__XConstructorCall__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14586:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14587:1: ( () )
+            // InternalCheckCfg.g:14586:1: ( ( () ) )
+            // InternalCheckCfg.g:14587:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14587:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14588:1: ()
+            // InternalCheckCfg.g:14587:1: ( () )
+            // InternalCheckCfg.g:14588:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getXConstructorCallAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14589:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14591:1: 
+            // InternalCheckCfg.g:14589:1: ()
+            // InternalCheckCfg.g:14591:1: 
             {
             }
 
@@ -42270,21 +42270,21 @@ public final void rule__XConstructorCall__Group__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XConstructorCall__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14601:1: rule__XConstructorCall__Group__1 : rule__XConstructorCall__Group__1__Impl rule__XConstructorCall__Group__2 ;
+    // InternalCheckCfg.g:14601:1: rule__XConstructorCall__Group__1 : rule__XConstructorCall__Group__1__Impl rule__XConstructorCall__Group__2 ;
     public final void rule__XConstructorCall__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14605:1: ( rule__XConstructorCall__Group__1__Impl rule__XConstructorCall__Group__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14606:2: rule__XConstructorCall__Group__1__Impl rule__XConstructorCall__Group__2
+            // InternalCheckCfg.g:14605:1: ( rule__XConstructorCall__Group__1__Impl rule__XConstructorCall__Group__2 )
+            // InternalCheckCfg.g:14606:2: rule__XConstructorCall__Group__1__Impl rule__XConstructorCall__Group__2
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__1__Impl_in_rule__XConstructorCall__Group__129553);
+            pushFollow(FOLLOW_5);
             rule__XConstructorCall__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__2_in_rule__XConstructorCall__Group__129556);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group__2();
 
             state._fsp--;
@@ -42308,22 +42308,22 @@ public final void rule__XConstructorCall__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XConstructorCall__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14613:1: rule__XConstructorCall__Group__1__Impl : ( 'new' ) ;
+    // InternalCheckCfg.g:14613:1: rule__XConstructorCall__Group__1__Impl : ( 'new' ) ;
     public final void rule__XConstructorCall__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14617:1: ( ( 'new' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14618:1: ( 'new' )
+            // InternalCheckCfg.g:14617:1: ( ( 'new' ) )
+            // InternalCheckCfg.g:14618:1: ( 'new' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14618:1: ( 'new' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14619:1: 'new'
+            // InternalCheckCfg.g:14618:1: ( 'new' )
+            // InternalCheckCfg.g:14619:1: 'new'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getNewKeyword_1()); 
             }
-            match(input,78,FOLLOW_78_in_rule__XConstructorCall__Group__1__Impl29584); if (state.failed) return ;
+            match(input,78,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstructorCallAccess().getNewKeyword_1()); 
             }
@@ -42349,21 +42349,21 @@ public final void rule__XConstructorCall__Group__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XConstructorCall__Group__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14632:1: rule__XConstructorCall__Group__2 : rule__XConstructorCall__Group__2__Impl rule__XConstructorCall__Group__3 ;
+    // InternalCheckCfg.g:14632:1: rule__XConstructorCall__Group__2 : rule__XConstructorCall__Group__2__Impl rule__XConstructorCall__Group__3 ;
     public final void rule__XConstructorCall__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14636:1: ( rule__XConstructorCall__Group__2__Impl rule__XConstructorCall__Group__3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14637:2: rule__XConstructorCall__Group__2__Impl rule__XConstructorCall__Group__3
+            // InternalCheckCfg.g:14636:1: ( rule__XConstructorCall__Group__2__Impl rule__XConstructorCall__Group__3 )
+            // InternalCheckCfg.g:14637:2: rule__XConstructorCall__Group__2__Impl rule__XConstructorCall__Group__3
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__2__Impl_in_rule__XConstructorCall__Group__229615);
+            pushFollow(FOLLOW_86);
             rule__XConstructorCall__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__3_in_rule__XConstructorCall__Group__229618);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group__3();
 
             state._fsp--;
@@ -42387,25 +42387,25 @@ public final void rule__XConstructorCall__Group__2() throws RecognitionException
 
 
     // $ANTLR start "rule__XConstructorCall__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14644:1: rule__XConstructorCall__Group__2__Impl : ( ( rule__XConstructorCall__ConstructorAssignment_2 ) ) ;
+    // InternalCheckCfg.g:14644:1: rule__XConstructorCall__Group__2__Impl : ( ( rule__XConstructorCall__ConstructorAssignment_2 ) ) ;
     public final void rule__XConstructorCall__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14648:1: ( ( ( rule__XConstructorCall__ConstructorAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14649:1: ( ( rule__XConstructorCall__ConstructorAssignment_2 ) )
+            // InternalCheckCfg.g:14648:1: ( ( ( rule__XConstructorCall__ConstructorAssignment_2 ) ) )
+            // InternalCheckCfg.g:14649:1: ( ( rule__XConstructorCall__ConstructorAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14649:1: ( ( rule__XConstructorCall__ConstructorAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14650:1: ( rule__XConstructorCall__ConstructorAssignment_2 )
+            // InternalCheckCfg.g:14649:1: ( ( rule__XConstructorCall__ConstructorAssignment_2 ) )
+            // InternalCheckCfg.g:14650:1: ( rule__XConstructorCall__ConstructorAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getConstructorAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14651:1: ( rule__XConstructorCall__ConstructorAssignment_2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14651:2: rule__XConstructorCall__ConstructorAssignment_2
+            // InternalCheckCfg.g:14651:1: ( rule__XConstructorCall__ConstructorAssignment_2 )
+            // InternalCheckCfg.g:14651:2: rule__XConstructorCall__ConstructorAssignment_2
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__ConstructorAssignment_2_in_rule__XConstructorCall__Group__2__Impl29645);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__ConstructorAssignment_2();
 
             state._fsp--;
@@ -42438,21 +42438,21 @@ public final void rule__XConstructorCall__Group__2__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XConstructorCall__Group__3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14661:1: rule__XConstructorCall__Group__3 : rule__XConstructorCall__Group__3__Impl rule__XConstructorCall__Group__4 ;
+    // InternalCheckCfg.g:14661:1: rule__XConstructorCall__Group__3 : rule__XConstructorCall__Group__3__Impl rule__XConstructorCall__Group__4 ;
     public final void rule__XConstructorCall__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14665:1: ( rule__XConstructorCall__Group__3__Impl rule__XConstructorCall__Group__4 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14666:2: rule__XConstructorCall__Group__3__Impl rule__XConstructorCall__Group__4
+            // InternalCheckCfg.g:14665:1: ( rule__XConstructorCall__Group__3__Impl rule__XConstructorCall__Group__4 )
+            // InternalCheckCfg.g:14666:2: rule__XConstructorCall__Group__3__Impl rule__XConstructorCall__Group__4
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__3__Impl_in_rule__XConstructorCall__Group__329675);
+            pushFollow(FOLLOW_86);
             rule__XConstructorCall__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__4_in_rule__XConstructorCall__Group__329678);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group__4();
 
             state._fsp--;
@@ -42476,29 +42476,29 @@ public final void rule__XConstructorCall__Group__3() throws RecognitionException
 
 
     // $ANTLR start "rule__XConstructorCall__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14673:1: rule__XConstructorCall__Group__3__Impl : ( ( rule__XConstructorCall__Group_3__0 )? ) ;
+    // InternalCheckCfg.g:14673:1: rule__XConstructorCall__Group__3__Impl : ( ( rule__XConstructorCall__Group_3__0 )? ) ;
     public final void rule__XConstructorCall__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14677:1: ( ( ( rule__XConstructorCall__Group_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14678:1: ( ( rule__XConstructorCall__Group_3__0 )? )
+            // InternalCheckCfg.g:14677:1: ( ( ( rule__XConstructorCall__Group_3__0 )? ) )
+            // InternalCheckCfg.g:14678:1: ( ( rule__XConstructorCall__Group_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14678:1: ( ( rule__XConstructorCall__Group_3__0 )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14679:1: ( rule__XConstructorCall__Group_3__0 )?
+            // InternalCheckCfg.g:14678:1: ( ( rule__XConstructorCall__Group_3__0 )? )
+            // InternalCheckCfg.g:14679:1: ( rule__XConstructorCall__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getGroup_3()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14680:1: ( rule__XConstructorCall__Group_3__0 )?
+            // InternalCheckCfg.g:14680:1: ( rule__XConstructorCall__Group_3__0 )?
             int alt107=2;
             alt107 = dfa107.predict(input);
             switch (alt107) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14680:2: rule__XConstructorCall__Group_3__0
+                    // InternalCheckCfg.g:14680:2: rule__XConstructorCall__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__XConstructorCall__Group_3__0_in_rule__XConstructorCall__Group__3__Impl29705);
+                    pushFollow(FOLLOW_2);
                     rule__XConstructorCall__Group_3__0();
 
                     state._fsp--;
@@ -42534,21 +42534,21 @@ public final void rule__XConstructorCall__Group__3__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XConstructorCall__Group__4"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14690:1: rule__XConstructorCall__Group__4 : rule__XConstructorCall__Group__4__Impl rule__XConstructorCall__Group__5 ;
+    // InternalCheckCfg.g:14690:1: rule__XConstructorCall__Group__4 : rule__XConstructorCall__Group__4__Impl rule__XConstructorCall__Group__5 ;
     public final void rule__XConstructorCall__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14694:1: ( rule__XConstructorCall__Group__4__Impl rule__XConstructorCall__Group__5 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14695:2: rule__XConstructorCall__Group__4__Impl rule__XConstructorCall__Group__5
+            // InternalCheckCfg.g:14694:1: ( rule__XConstructorCall__Group__4__Impl rule__XConstructorCall__Group__5 )
+            // InternalCheckCfg.g:14695:2: rule__XConstructorCall__Group__4__Impl rule__XConstructorCall__Group__5
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__4__Impl_in_rule__XConstructorCall__Group__429736);
+            pushFollow(FOLLOW_86);
             rule__XConstructorCall__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__5_in_rule__XConstructorCall__Group__429739);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group__5();
 
             state._fsp--;
@@ -42572,29 +42572,29 @@ public final void rule__XConstructorCall__Group__4() throws RecognitionException
 
 
     // $ANTLR start "rule__XConstructorCall__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14702:1: rule__XConstructorCall__Group__4__Impl : ( ( rule__XConstructorCall__Group_4__0 )? ) ;
+    // InternalCheckCfg.g:14702:1: rule__XConstructorCall__Group__4__Impl : ( ( rule__XConstructorCall__Group_4__0 )? ) ;
     public final void rule__XConstructorCall__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14706:1: ( ( ( rule__XConstructorCall__Group_4__0 )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14707:1: ( ( rule__XConstructorCall__Group_4__0 )? )
+            // InternalCheckCfg.g:14706:1: ( ( ( rule__XConstructorCall__Group_4__0 )? ) )
+            // InternalCheckCfg.g:14707:1: ( ( rule__XConstructorCall__Group_4__0 )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14707:1: ( ( rule__XConstructorCall__Group_4__0 )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14708:1: ( rule__XConstructorCall__Group_4__0 )?
+            // InternalCheckCfg.g:14707:1: ( ( rule__XConstructorCall__Group_4__0 )? )
+            // InternalCheckCfg.g:14708:1: ( rule__XConstructorCall__Group_4__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getGroup_4()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14709:1: ( rule__XConstructorCall__Group_4__0 )?
+            // InternalCheckCfg.g:14709:1: ( rule__XConstructorCall__Group_4__0 )?
             int alt108=2;
             alt108 = dfa108.predict(input);
             switch (alt108) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14709:2: rule__XConstructorCall__Group_4__0
+                    // InternalCheckCfg.g:14709:2: rule__XConstructorCall__Group_4__0
                     {
-                    pushFollow(FOLLOW_rule__XConstructorCall__Group_4__0_in_rule__XConstructorCall__Group__4__Impl29766);
+                    pushFollow(FOLLOW_2);
                     rule__XConstructorCall__Group_4__0();
 
                     state._fsp--;
@@ -42630,16 +42630,16 @@ public final void rule__XConstructorCall__Group__4__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XConstructorCall__Group__5"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14719:1: rule__XConstructorCall__Group__5 : rule__XConstructorCall__Group__5__Impl ;
+    // InternalCheckCfg.g:14719:1: rule__XConstructorCall__Group__5 : rule__XConstructorCall__Group__5__Impl ;
     public final void rule__XConstructorCall__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14723:1: ( rule__XConstructorCall__Group__5__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14724:2: rule__XConstructorCall__Group__5__Impl
+            // InternalCheckCfg.g:14723:1: ( rule__XConstructorCall__Group__5__Impl )
+            // InternalCheckCfg.g:14724:2: rule__XConstructorCall__Group__5__Impl
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__5__Impl_in_rule__XConstructorCall__Group__529797);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group__5__Impl();
 
             state._fsp--;
@@ -42663,29 +42663,29 @@ public final void rule__XConstructorCall__Group__5() throws RecognitionException
 
 
     // $ANTLR start "rule__XConstructorCall__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14730:1: rule__XConstructorCall__Group__5__Impl : ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? ) ;
+    // InternalCheckCfg.g:14730:1: rule__XConstructorCall__Group__5__Impl : ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? ) ;
     public final void rule__XConstructorCall__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14734:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14735:1: ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? )
+            // InternalCheckCfg.g:14734:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? ) )
+            // InternalCheckCfg.g:14735:1: ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14735:1: ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14736:1: ( rule__XConstructorCall__ArgumentsAssignment_5 )?
+            // InternalCheckCfg.g:14735:1: ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? )
+            // InternalCheckCfg.g:14736:1: ( rule__XConstructorCall__ArgumentsAssignment_5 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getArgumentsAssignment_5()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14737:1: ( rule__XConstructorCall__ArgumentsAssignment_5 )?
+            // InternalCheckCfg.g:14737:1: ( rule__XConstructorCall__ArgumentsAssignment_5 )?
             int alt109=2;
             alt109 = dfa109.predict(input);
             switch (alt109) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14737:2: rule__XConstructorCall__ArgumentsAssignment_5
+                    // InternalCheckCfg.g:14737:2: rule__XConstructorCall__ArgumentsAssignment_5
                     {
-                    pushFollow(FOLLOW_rule__XConstructorCall__ArgumentsAssignment_5_in_rule__XConstructorCall__Group__5__Impl29824);
+                    pushFollow(FOLLOW_2);
                     rule__XConstructorCall__ArgumentsAssignment_5();
 
                     state._fsp--;
@@ -42721,21 +42721,21 @@ public final void rule__XConstructorCall__Group__5__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14759:1: rule__XConstructorCall__Group_3__0 : rule__XConstructorCall__Group_3__0__Impl rule__XConstructorCall__Group_3__1 ;
+    // InternalCheckCfg.g:14759:1: rule__XConstructorCall__Group_3__0 : rule__XConstructorCall__Group_3__0__Impl rule__XConstructorCall__Group_3__1 ;
     public final void rule__XConstructorCall__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14763:1: ( rule__XConstructorCall__Group_3__0__Impl rule__XConstructorCall__Group_3__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14764:2: rule__XConstructorCall__Group_3__0__Impl rule__XConstructorCall__Group_3__1
+            // InternalCheckCfg.g:14763:1: ( rule__XConstructorCall__Group_3__0__Impl rule__XConstructorCall__Group_3__1 )
+            // InternalCheckCfg.g:14764:2: rule__XConstructorCall__Group_3__0__Impl rule__XConstructorCall__Group_3__1
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_3__0__Impl_in_rule__XConstructorCall__Group_3__029867);
+            pushFollow(FOLLOW_58);
             rule__XConstructorCall__Group_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_3__1_in_rule__XConstructorCall__Group_3__029870);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_3__1();
 
             state._fsp--;
@@ -42759,25 +42759,25 @@ public final void rule__XConstructorCall__Group_3__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14771:1: rule__XConstructorCall__Group_3__0__Impl : ( ( '<' ) ) ;
+    // InternalCheckCfg.g:14771:1: rule__XConstructorCall__Group_3__0__Impl : ( ( '<' ) ) ;
     public final void rule__XConstructorCall__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14775:1: ( ( ( '<' ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14776:1: ( ( '<' ) )
+            // InternalCheckCfg.g:14775:1: ( ( ( '<' ) ) )
+            // InternalCheckCfg.g:14776:1: ( ( '<' ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14776:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14777:1: ( '<' )
+            // InternalCheckCfg.g:14776:1: ( ( '<' ) )
+            // InternalCheckCfg.g:14777:1: ( '<' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getLessThanSignKeyword_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14778:1: ( '<' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14779:2: '<'
+            // InternalCheckCfg.g:14778:1: ( '<' )
+            // InternalCheckCfg.g:14779:2: '<'
             {
-            match(input,27,FOLLOW_27_in_rule__XConstructorCall__Group_3__0__Impl29899); if (state.failed) return ;
+            match(input,27,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -42806,21 +42806,21 @@ public final void rule__XConstructorCall__Group_3__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14790:1: rule__XConstructorCall__Group_3__1 : rule__XConstructorCall__Group_3__1__Impl rule__XConstructorCall__Group_3__2 ;
+    // InternalCheckCfg.g:14790:1: rule__XConstructorCall__Group_3__1 : rule__XConstructorCall__Group_3__1__Impl rule__XConstructorCall__Group_3__2 ;
     public final void rule__XConstructorCall__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14794:1: ( rule__XConstructorCall__Group_3__1__Impl rule__XConstructorCall__Group_3__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14795:2: rule__XConstructorCall__Group_3__1__Impl rule__XConstructorCall__Group_3__2
+            // InternalCheckCfg.g:14794:1: ( rule__XConstructorCall__Group_3__1__Impl rule__XConstructorCall__Group_3__2 )
+            // InternalCheckCfg.g:14795:2: rule__XConstructorCall__Group_3__1__Impl rule__XConstructorCall__Group_3__2
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_3__1__Impl_in_rule__XConstructorCall__Group_3__129931);
+            pushFollow(FOLLOW_59);
             rule__XConstructorCall__Group_3__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_3__2_in_rule__XConstructorCall__Group_3__129934);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_3__2();
 
             state._fsp--;
@@ -42844,25 +42844,25 @@ public final void rule__XConstructorCall__Group_3__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14802:1: rule__XConstructorCall__Group_3__1__Impl : ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) ) ;
+    // InternalCheckCfg.g:14802:1: rule__XConstructorCall__Group_3__1__Impl : ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) ) ;
     public final void rule__XConstructorCall__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14806:1: ( ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14807:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) )
+            // InternalCheckCfg.g:14806:1: ( ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) ) )
+            // InternalCheckCfg.g:14807:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14807:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14808:1: ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 )
+            // InternalCheckCfg.g:14807:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) )
+            // InternalCheckCfg.g:14808:1: ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getTypeArgumentsAssignment_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14809:1: ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14809:2: rule__XConstructorCall__TypeArgumentsAssignment_3_1
+            // InternalCheckCfg.g:14809:1: ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 )
+            // InternalCheckCfg.g:14809:2: rule__XConstructorCall__TypeArgumentsAssignment_3_1
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__TypeArgumentsAssignment_3_1_in_rule__XConstructorCall__Group_3__1__Impl29961);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__TypeArgumentsAssignment_3_1();
 
             state._fsp--;
@@ -42895,21 +42895,21 @@ public final void rule__XConstructorCall__Group_3__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14819:1: rule__XConstructorCall__Group_3__2 : rule__XConstructorCall__Group_3__2__Impl rule__XConstructorCall__Group_3__3 ;
+    // InternalCheckCfg.g:14819:1: rule__XConstructorCall__Group_3__2 : rule__XConstructorCall__Group_3__2__Impl rule__XConstructorCall__Group_3__3 ;
     public final void rule__XConstructorCall__Group_3__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14823:1: ( rule__XConstructorCall__Group_3__2__Impl rule__XConstructorCall__Group_3__3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14824:2: rule__XConstructorCall__Group_3__2__Impl rule__XConstructorCall__Group_3__3
+            // InternalCheckCfg.g:14823:1: ( rule__XConstructorCall__Group_3__2__Impl rule__XConstructorCall__Group_3__3 )
+            // InternalCheckCfg.g:14824:2: rule__XConstructorCall__Group_3__2__Impl rule__XConstructorCall__Group_3__3
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_3__2__Impl_in_rule__XConstructorCall__Group_3__229991);
+            pushFollow(FOLLOW_59);
             rule__XConstructorCall__Group_3__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_3__3_in_rule__XConstructorCall__Group_3__229994);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_3__3();
 
             state._fsp--;
@@ -42933,22 +42933,22 @@ public final void rule__XConstructorCall__Group_3__2() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14831:1: rule__XConstructorCall__Group_3__2__Impl : ( ( rule__XConstructorCall__Group_3_2__0 )* ) ;
+    // InternalCheckCfg.g:14831:1: rule__XConstructorCall__Group_3__2__Impl : ( ( rule__XConstructorCall__Group_3_2__0 )* ) ;
     public final void rule__XConstructorCall__Group_3__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14835:1: ( ( ( rule__XConstructorCall__Group_3_2__0 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14836:1: ( ( rule__XConstructorCall__Group_3_2__0 )* )
+            // InternalCheckCfg.g:14835:1: ( ( ( rule__XConstructorCall__Group_3_2__0 )* ) )
+            // InternalCheckCfg.g:14836:1: ( ( rule__XConstructorCall__Group_3_2__0 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14836:1: ( ( rule__XConstructorCall__Group_3_2__0 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14837:1: ( rule__XConstructorCall__Group_3_2__0 )*
+            // InternalCheckCfg.g:14836:1: ( ( rule__XConstructorCall__Group_3_2__0 )* )
+            // InternalCheckCfg.g:14837:1: ( rule__XConstructorCall__Group_3_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getGroup_3_2()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14838:1: ( rule__XConstructorCall__Group_3_2__0 )*
+            // InternalCheckCfg.g:14838:1: ( rule__XConstructorCall__Group_3_2__0 )*
             loop110:
             do {
                 int alt110=2;
@@ -42961,9 +42961,9 @@ public final void rule__XConstructorCall__Group_3__2__Impl() throws RecognitionE
 
                 switch (alt110) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14838:2: rule__XConstructorCall__Group_3_2__0
+            	    // InternalCheckCfg.g:14838:2: rule__XConstructorCall__Group_3_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__XConstructorCall__Group_3_2__0_in_rule__XConstructorCall__Group_3__2__Impl30021);
+            	    pushFollow(FOLLOW_18);
             	    rule__XConstructorCall__Group_3_2__0();
 
             	    state._fsp--;
@@ -43002,16 +43002,16 @@ public final void rule__XConstructorCall__Group_3__2__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14848:1: rule__XConstructorCall__Group_3__3 : rule__XConstructorCall__Group_3__3__Impl ;
+    // InternalCheckCfg.g:14848:1: rule__XConstructorCall__Group_3__3 : rule__XConstructorCall__Group_3__3__Impl ;
     public final void rule__XConstructorCall__Group_3__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14852:1: ( rule__XConstructorCall__Group_3__3__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14853:2: rule__XConstructorCall__Group_3__3__Impl
+            // InternalCheckCfg.g:14852:1: ( rule__XConstructorCall__Group_3__3__Impl )
+            // InternalCheckCfg.g:14853:2: rule__XConstructorCall__Group_3__3__Impl
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_3__3__Impl_in_rule__XConstructorCall__Group_3__330052);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_3__3__Impl();
 
             state._fsp--;
@@ -43035,22 +43035,22 @@ public final void rule__XConstructorCall__Group_3__3() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__3__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14859:1: rule__XConstructorCall__Group_3__3__Impl : ( '>' ) ;
+    // InternalCheckCfg.g:14859:1: rule__XConstructorCall__Group_3__3__Impl : ( '>' ) ;
     public final void rule__XConstructorCall__Group_3__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14863:1: ( ( '>' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14864:1: ( '>' )
+            // InternalCheckCfg.g:14863:1: ( ( '>' ) )
+            // InternalCheckCfg.g:14864:1: ( '>' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14864:1: ( '>' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14865:1: '>'
+            // InternalCheckCfg.g:14864:1: ( '>' )
+            // InternalCheckCfg.g:14865:1: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getGreaterThanSignKeyword_3_3()); 
             }
-            match(input,26,FOLLOW_26_in_rule__XConstructorCall__Group_3__3__Impl30080); if (state.failed) return ;
+            match(input,26,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstructorCallAccess().getGreaterThanSignKeyword_3_3()); 
             }
@@ -43076,21 +43076,21 @@ public final void rule__XConstructorCall__Group_3__3__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3_2__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14886:1: rule__XConstructorCall__Group_3_2__0 : rule__XConstructorCall__Group_3_2__0__Impl rule__XConstructorCall__Group_3_2__1 ;
+    // InternalCheckCfg.g:14886:1: rule__XConstructorCall__Group_3_2__0 : rule__XConstructorCall__Group_3_2__0__Impl rule__XConstructorCall__Group_3_2__1 ;
     public final void rule__XConstructorCall__Group_3_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14890:1: ( rule__XConstructorCall__Group_3_2__0__Impl rule__XConstructorCall__Group_3_2__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14891:2: rule__XConstructorCall__Group_3_2__0__Impl rule__XConstructorCall__Group_3_2__1
+            // InternalCheckCfg.g:14890:1: ( rule__XConstructorCall__Group_3_2__0__Impl rule__XConstructorCall__Group_3_2__1 )
+            // InternalCheckCfg.g:14891:2: rule__XConstructorCall__Group_3_2__0__Impl rule__XConstructorCall__Group_3_2__1
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_3_2__0__Impl_in_rule__XConstructorCall__Group_3_2__030119);
+            pushFollow(FOLLOW_58);
             rule__XConstructorCall__Group_3_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_3_2__1_in_rule__XConstructorCall__Group_3_2__030122);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_3_2__1();
 
             state._fsp--;
@@ -43114,22 +43114,22 @@ public final void rule__XConstructorCall__Group_3_2__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3_2__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14898:1: rule__XConstructorCall__Group_3_2__0__Impl : ( ',' ) ;
+    // InternalCheckCfg.g:14898:1: rule__XConstructorCall__Group_3_2__0__Impl : ( ',' ) ;
     public final void rule__XConstructorCall__Group_3_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14902:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14903:1: ( ',' )
+            // InternalCheckCfg.g:14902:1: ( ( ',' ) )
+            // InternalCheckCfg.g:14903:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14903:1: ( ',' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14904:1: ','
+            // InternalCheckCfg.g:14903:1: ( ',' )
+            // InternalCheckCfg.g:14904:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getCommaKeyword_3_2_0()); 
             }
-            match(input,64,FOLLOW_64_in_rule__XConstructorCall__Group_3_2__0__Impl30150); if (state.failed) return ;
+            match(input,64,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstructorCallAccess().getCommaKeyword_3_2_0()); 
             }
@@ -43155,16 +43155,16 @@ public final void rule__XConstructorCall__Group_3_2__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3_2__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14917:1: rule__XConstructorCall__Group_3_2__1 : rule__XConstructorCall__Group_3_2__1__Impl ;
+    // InternalCheckCfg.g:14917:1: rule__XConstructorCall__Group_3_2__1 : rule__XConstructorCall__Group_3_2__1__Impl ;
     public final void rule__XConstructorCall__Group_3_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14921:1: ( rule__XConstructorCall__Group_3_2__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14922:2: rule__XConstructorCall__Group_3_2__1__Impl
+            // InternalCheckCfg.g:14921:1: ( rule__XConstructorCall__Group_3_2__1__Impl )
+            // InternalCheckCfg.g:14922:2: rule__XConstructorCall__Group_3_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_3_2__1__Impl_in_rule__XConstructorCall__Group_3_2__130181);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_3_2__1__Impl();
 
             state._fsp--;
@@ -43188,25 +43188,25 @@ public final void rule__XConstructorCall__Group_3_2__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3_2__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14928:1: rule__XConstructorCall__Group_3_2__1__Impl : ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) ) ;
+    // InternalCheckCfg.g:14928:1: rule__XConstructorCall__Group_3_2__1__Impl : ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) ) ;
     public final void rule__XConstructorCall__Group_3_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14932:1: ( ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14933:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) )
+            // InternalCheckCfg.g:14932:1: ( ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) ) )
+            // InternalCheckCfg.g:14933:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14933:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14934:1: ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 )
+            // InternalCheckCfg.g:14933:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) )
+            // InternalCheckCfg.g:14934:1: ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getTypeArgumentsAssignment_3_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14935:1: ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14935:2: rule__XConstructorCall__TypeArgumentsAssignment_3_2_1
+            // InternalCheckCfg.g:14935:1: ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 )
+            // InternalCheckCfg.g:14935:2: rule__XConstructorCall__TypeArgumentsAssignment_3_2_1
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__TypeArgumentsAssignment_3_2_1_in_rule__XConstructorCall__Group_3_2__1__Impl30208);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__TypeArgumentsAssignment_3_2_1();
 
             state._fsp--;
@@ -43239,21 +43239,21 @@ public final void rule__XConstructorCall__Group_3_2__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14949:1: rule__XConstructorCall__Group_4__0 : rule__XConstructorCall__Group_4__0__Impl rule__XConstructorCall__Group_4__1 ;
+    // InternalCheckCfg.g:14949:1: rule__XConstructorCall__Group_4__0 : rule__XConstructorCall__Group_4__0__Impl rule__XConstructorCall__Group_4__1 ;
     public final void rule__XConstructorCall__Group_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14953:1: ( rule__XConstructorCall__Group_4__0__Impl rule__XConstructorCall__Group_4__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14954:2: rule__XConstructorCall__Group_4__0__Impl rule__XConstructorCall__Group_4__1
+            // InternalCheckCfg.g:14953:1: ( rule__XConstructorCall__Group_4__0__Impl rule__XConstructorCall__Group_4__1 )
+            // InternalCheckCfg.g:14954:2: rule__XConstructorCall__Group_4__0__Impl rule__XConstructorCall__Group_4__1
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4__0__Impl_in_rule__XConstructorCall__Group_4__030242);
+            pushFollow(FOLLOW_60);
             rule__XConstructorCall__Group_4__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4__1_in_rule__XConstructorCall__Group_4__030245);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_4__1();
 
             state._fsp--;
@@ -43277,25 +43277,25 @@ public final void rule__XConstructorCall__Group_4__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14961:1: rule__XConstructorCall__Group_4__0__Impl : ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) ) ;
+    // InternalCheckCfg.g:14961:1: rule__XConstructorCall__Group_4__0__Impl : ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) ) ;
     public final void rule__XConstructorCall__Group_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14965:1: ( ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14966:1: ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) )
+            // InternalCheckCfg.g:14965:1: ( ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) ) )
+            // InternalCheckCfg.g:14966:1: ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14966:1: ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14967:1: ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 )
+            // InternalCheckCfg.g:14966:1: ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) )
+            // InternalCheckCfg.g:14967:1: ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getExplicitConstructorCallAssignment_4_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14968:1: ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14968:2: rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0
+            // InternalCheckCfg.g:14968:1: ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 )
+            // InternalCheckCfg.g:14968:2: rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0_in_rule__XConstructorCall__Group_4__0__Impl30272);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0();
 
             state._fsp--;
@@ -43328,21 +43328,21 @@ public final void rule__XConstructorCall__Group_4__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14978:1: rule__XConstructorCall__Group_4__1 : rule__XConstructorCall__Group_4__1__Impl rule__XConstructorCall__Group_4__2 ;
+    // InternalCheckCfg.g:14978:1: rule__XConstructorCall__Group_4__1 : rule__XConstructorCall__Group_4__1__Impl rule__XConstructorCall__Group_4__2 ;
     public final void rule__XConstructorCall__Group_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14982:1: ( rule__XConstructorCall__Group_4__1__Impl rule__XConstructorCall__Group_4__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14983:2: rule__XConstructorCall__Group_4__1__Impl rule__XConstructorCall__Group_4__2
+            // InternalCheckCfg.g:14982:1: ( rule__XConstructorCall__Group_4__1__Impl rule__XConstructorCall__Group_4__2 )
+            // InternalCheckCfg.g:14983:2: rule__XConstructorCall__Group_4__1__Impl rule__XConstructorCall__Group_4__2
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4__1__Impl_in_rule__XConstructorCall__Group_4__130302);
+            pushFollow(FOLLOW_60);
             rule__XConstructorCall__Group_4__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4__2_in_rule__XConstructorCall__Group_4__130305);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_4__2();
 
             state._fsp--;
@@ -43366,22 +43366,22 @@ public final void rule__XConstructorCall__Group_4__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14990:1: rule__XConstructorCall__Group_4__1__Impl : ( ( rule__XConstructorCall__Alternatives_4_1 )? ) ;
+    // InternalCheckCfg.g:14990:1: rule__XConstructorCall__Group_4__1__Impl : ( ( rule__XConstructorCall__Alternatives_4_1 )? ) ;
     public final void rule__XConstructorCall__Group_4__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14994:1: ( ( ( rule__XConstructorCall__Alternatives_4_1 )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14995:1: ( ( rule__XConstructorCall__Alternatives_4_1 )? )
+            // InternalCheckCfg.g:14994:1: ( ( ( rule__XConstructorCall__Alternatives_4_1 )? ) )
+            // InternalCheckCfg.g:14995:1: ( ( rule__XConstructorCall__Alternatives_4_1 )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14995:1: ( ( rule__XConstructorCall__Alternatives_4_1 )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14996:1: ( rule__XConstructorCall__Alternatives_4_1 )?
+            // InternalCheckCfg.g:14995:1: ( ( rule__XConstructorCall__Alternatives_4_1 )? )
+            // InternalCheckCfg.g:14996:1: ( rule__XConstructorCall__Alternatives_4_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getAlternatives_4_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14997:1: ( rule__XConstructorCall__Alternatives_4_1 )?
+            // InternalCheckCfg.g:14997:1: ( rule__XConstructorCall__Alternatives_4_1 )?
             int alt111=2;
             int LA111_0 = input.LA(1);
 
@@ -43390,9 +43390,9 @@ public final void rule__XConstructorCall__Group_4__1__Impl() throws RecognitionE
             }
             switch (alt111) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14997:2: rule__XConstructorCall__Alternatives_4_1
+                    // InternalCheckCfg.g:14997:2: rule__XConstructorCall__Alternatives_4_1
                     {
-                    pushFollow(FOLLOW_rule__XConstructorCall__Alternatives_4_1_in_rule__XConstructorCall__Group_4__1__Impl30332);
+                    pushFollow(FOLLOW_2);
                     rule__XConstructorCall__Alternatives_4_1();
 
                     state._fsp--;
@@ -43428,16 +43428,16 @@ public final void rule__XConstructorCall__Group_4__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15007:1: rule__XConstructorCall__Group_4__2 : rule__XConstructorCall__Group_4__2__Impl ;
+    // InternalCheckCfg.g:15007:1: rule__XConstructorCall__Group_4__2 : rule__XConstructorCall__Group_4__2__Impl ;
     public final void rule__XConstructorCall__Group_4__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15011:1: ( rule__XConstructorCall__Group_4__2__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15012:2: rule__XConstructorCall__Group_4__2__Impl
+            // InternalCheckCfg.g:15011:1: ( rule__XConstructorCall__Group_4__2__Impl )
+            // InternalCheckCfg.g:15012:2: rule__XConstructorCall__Group_4__2__Impl
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4__2__Impl_in_rule__XConstructorCall__Group_4__230363);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_4__2__Impl();
 
             state._fsp--;
@@ -43461,22 +43461,22 @@ public final void rule__XConstructorCall__Group_4__2() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15018:1: rule__XConstructorCall__Group_4__2__Impl : ( ')' ) ;
+    // InternalCheckCfg.g:15018:1: rule__XConstructorCall__Group_4__2__Impl : ( ')' ) ;
     public final void rule__XConstructorCall__Group_4__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15022:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15023:1: ( ')' )
+            // InternalCheckCfg.g:15022:1: ( ( ')' ) )
+            // InternalCheckCfg.g:15023:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15023:1: ( ')' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15024:1: ')'
+            // InternalCheckCfg.g:15023:1: ( ')' )
+            // InternalCheckCfg.g:15024:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getRightParenthesisKeyword_4_2()); 
             }
-            match(input,63,FOLLOW_63_in_rule__XConstructorCall__Group_4__2__Impl30391); if (state.failed) return ;
+            match(input,63,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstructorCallAccess().getRightParenthesisKeyword_4_2()); 
             }
@@ -43502,21 +43502,21 @@ public final void rule__XConstructorCall__Group_4__2__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15043:1: rule__XConstructorCall__Group_4_1_1__0 : rule__XConstructorCall__Group_4_1_1__0__Impl rule__XConstructorCall__Group_4_1_1__1 ;
+    // InternalCheckCfg.g:15043:1: rule__XConstructorCall__Group_4_1_1__0 : rule__XConstructorCall__Group_4_1_1__0__Impl rule__XConstructorCall__Group_4_1_1__1 ;
     public final void rule__XConstructorCall__Group_4_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15047:1: ( rule__XConstructorCall__Group_4_1_1__0__Impl rule__XConstructorCall__Group_4_1_1__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15048:2: rule__XConstructorCall__Group_4_1_1__0__Impl rule__XConstructorCall__Group_4_1_1__1
+            // InternalCheckCfg.g:15047:1: ( rule__XConstructorCall__Group_4_1_1__0__Impl rule__XConstructorCall__Group_4_1_1__1 )
+            // InternalCheckCfg.g:15048:2: rule__XConstructorCall__Group_4_1_1__0__Impl rule__XConstructorCall__Group_4_1_1__1
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4_1_1__0__Impl_in_rule__XConstructorCall__Group_4_1_1__030428);
+            pushFollow(FOLLOW_25);
             rule__XConstructorCall__Group_4_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4_1_1__1_in_rule__XConstructorCall__Group_4_1_1__030431);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_4_1_1__1();
 
             state._fsp--;
@@ -43540,25 +43540,25 @@ public final void rule__XConstructorCall__Group_4_1_1__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15055:1: rule__XConstructorCall__Group_4_1_1__0__Impl : ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) ) ;
+    // InternalCheckCfg.g:15055:1: rule__XConstructorCall__Group_4_1_1__0__Impl : ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) ) ;
     public final void rule__XConstructorCall__Group_4_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15059:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15060:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) )
+            // InternalCheckCfg.g:15059:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) ) )
+            // InternalCheckCfg.g:15060:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15060:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15061:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 )
+            // InternalCheckCfg.g:15060:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) )
+            // InternalCheckCfg.g:15061:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getArgumentsAssignment_4_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15062:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15062:2: rule__XConstructorCall__ArgumentsAssignment_4_1_1_0
+            // InternalCheckCfg.g:15062:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 )
+            // InternalCheckCfg.g:15062:2: rule__XConstructorCall__ArgumentsAssignment_4_1_1_0
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__ArgumentsAssignment_4_1_1_0_in_rule__XConstructorCall__Group_4_1_1__0__Impl30458);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__ArgumentsAssignment_4_1_1_0();
 
             state._fsp--;
@@ -43591,16 +43591,16 @@ public final void rule__XConstructorCall__Group_4_1_1__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15072:1: rule__XConstructorCall__Group_4_1_1__1 : rule__XConstructorCall__Group_4_1_1__1__Impl ;
+    // InternalCheckCfg.g:15072:1: rule__XConstructorCall__Group_4_1_1__1 : rule__XConstructorCall__Group_4_1_1__1__Impl ;
     public final void rule__XConstructorCall__Group_4_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15076:1: ( rule__XConstructorCall__Group_4_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15077:2: rule__XConstructorCall__Group_4_1_1__1__Impl
+            // InternalCheckCfg.g:15076:1: ( rule__XConstructorCall__Group_4_1_1__1__Impl )
+            // InternalCheckCfg.g:15077:2: rule__XConstructorCall__Group_4_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4_1_1__1__Impl_in_rule__XConstructorCall__Group_4_1_1__130488);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_4_1_1__1__Impl();
 
             state._fsp--;
@@ -43624,22 +43624,22 @@ public final void rule__XConstructorCall__Group_4_1_1__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15083:1: rule__XConstructorCall__Group_4_1_1__1__Impl : ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* ) ;
+    // InternalCheckCfg.g:15083:1: rule__XConstructorCall__Group_4_1_1__1__Impl : ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* ) ;
     public final void rule__XConstructorCall__Group_4_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15087:1: ( ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15088:1: ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* )
+            // InternalCheckCfg.g:15087:1: ( ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* ) )
+            // InternalCheckCfg.g:15088:1: ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15088:1: ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15089:1: ( rule__XConstructorCall__Group_4_1_1_1__0 )*
+            // InternalCheckCfg.g:15088:1: ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* )
+            // InternalCheckCfg.g:15089:1: ( rule__XConstructorCall__Group_4_1_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getGroup_4_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15090:1: ( rule__XConstructorCall__Group_4_1_1_1__0 )*
+            // InternalCheckCfg.g:15090:1: ( rule__XConstructorCall__Group_4_1_1_1__0 )*
             loop112:
             do {
                 int alt112=2;
@@ -43652,9 +43652,9 @@ public final void rule__XConstructorCall__Group_4_1_1__1__Impl() throws Recognit
 
                 switch (alt112) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15090:2: rule__XConstructorCall__Group_4_1_1_1__0
+            	    // InternalCheckCfg.g:15090:2: rule__XConstructorCall__Group_4_1_1_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XConstructorCall__Group_4_1_1_1__0_in_rule__XConstructorCall__Group_4_1_1__1__Impl30515);
+            	    pushFollow(FOLLOW_18);
             	    rule__XConstructorCall__Group_4_1_1_1__0();
 
             	    state._fsp--;
@@ -43693,21 +43693,21 @@ public final void rule__XConstructorCall__Group_4_1_1__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1_1__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15104:1: rule__XConstructorCall__Group_4_1_1_1__0 : rule__XConstructorCall__Group_4_1_1_1__0__Impl rule__XConstructorCall__Group_4_1_1_1__1 ;
+    // InternalCheckCfg.g:15104:1: rule__XConstructorCall__Group_4_1_1_1__0 : rule__XConstructorCall__Group_4_1_1_1__0__Impl rule__XConstructorCall__Group_4_1_1_1__1 ;
     public final void rule__XConstructorCall__Group_4_1_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15108:1: ( rule__XConstructorCall__Group_4_1_1_1__0__Impl rule__XConstructorCall__Group_4_1_1_1__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15109:2: rule__XConstructorCall__Group_4_1_1_1__0__Impl rule__XConstructorCall__Group_4_1_1_1__1
+            // InternalCheckCfg.g:15108:1: ( rule__XConstructorCall__Group_4_1_1_1__0__Impl rule__XConstructorCall__Group_4_1_1_1__1 )
+            // InternalCheckCfg.g:15109:2: rule__XConstructorCall__Group_4_1_1_1__0__Impl rule__XConstructorCall__Group_4_1_1_1__1
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4_1_1_1__0__Impl_in_rule__XConstructorCall__Group_4_1_1_1__030550);
+            pushFollow(FOLLOW_61);
             rule__XConstructorCall__Group_4_1_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4_1_1_1__1_in_rule__XConstructorCall__Group_4_1_1_1__030553);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_4_1_1_1__1();
 
             state._fsp--;
@@ -43731,22 +43731,22 @@ public final void rule__XConstructorCall__Group_4_1_1_1__0() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15116:1: rule__XConstructorCall__Group_4_1_1_1__0__Impl : ( ',' ) ;
+    // InternalCheckCfg.g:15116:1: rule__XConstructorCall__Group_4_1_1_1__0__Impl : ( ',' ) ;
     public final void rule__XConstructorCall__Group_4_1_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15120:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15121:1: ( ',' )
+            // InternalCheckCfg.g:15120:1: ( ( ',' ) )
+            // InternalCheckCfg.g:15121:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15121:1: ( ',' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15122:1: ','
+            // InternalCheckCfg.g:15121:1: ( ',' )
+            // InternalCheckCfg.g:15122:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getCommaKeyword_4_1_1_1_0()); 
             }
-            match(input,64,FOLLOW_64_in_rule__XConstructorCall__Group_4_1_1_1__0__Impl30581); if (state.failed) return ;
+            match(input,64,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstructorCallAccess().getCommaKeyword_4_1_1_1_0()); 
             }
@@ -43772,16 +43772,16 @@ public final void rule__XConstructorCall__Group_4_1_1_1__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1_1__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15135:1: rule__XConstructorCall__Group_4_1_1_1__1 : rule__XConstructorCall__Group_4_1_1_1__1__Impl ;
+    // InternalCheckCfg.g:15135:1: rule__XConstructorCall__Group_4_1_1_1__1 : rule__XConstructorCall__Group_4_1_1_1__1__Impl ;
     public final void rule__XConstructorCall__Group_4_1_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15139:1: ( rule__XConstructorCall__Group_4_1_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15140:2: rule__XConstructorCall__Group_4_1_1_1__1__Impl
+            // InternalCheckCfg.g:15139:1: ( rule__XConstructorCall__Group_4_1_1_1__1__Impl )
+            // InternalCheckCfg.g:15140:2: rule__XConstructorCall__Group_4_1_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4_1_1_1__1__Impl_in_rule__XConstructorCall__Group_4_1_1_1__130612);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_4_1_1_1__1__Impl();
 
             state._fsp--;
@@ -43805,25 +43805,25 @@ public final void rule__XConstructorCall__Group_4_1_1_1__1() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15146:1: rule__XConstructorCall__Group_4_1_1_1__1__Impl : ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) ) ;
+    // InternalCheckCfg.g:15146:1: rule__XConstructorCall__Group_4_1_1_1__1__Impl : ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) ) ;
     public final void rule__XConstructorCall__Group_4_1_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15150:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15151:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) )
+            // InternalCheckCfg.g:15150:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) ) )
+            // InternalCheckCfg.g:15151:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15151:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15152:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 )
+            // InternalCheckCfg.g:15151:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) )
+            // InternalCheckCfg.g:15152:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getArgumentsAssignment_4_1_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15153:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15153:2: rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1
+            // InternalCheckCfg.g:15153:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 )
+            // InternalCheckCfg.g:15153:2: rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1_in_rule__XConstructorCall__Group_4_1_1_1__1__Impl30639);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1();
 
             state._fsp--;
@@ -43856,21 +43856,21 @@ public final void rule__XConstructorCall__Group_4_1_1_1__1__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XBooleanLiteral__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15167:1: rule__XBooleanLiteral__Group__0 : rule__XBooleanLiteral__Group__0__Impl rule__XBooleanLiteral__Group__1 ;
+    // InternalCheckCfg.g:15167:1: rule__XBooleanLiteral__Group__0 : rule__XBooleanLiteral__Group__0__Impl rule__XBooleanLiteral__Group__1 ;
     public final void rule__XBooleanLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15171:1: ( rule__XBooleanLiteral__Group__0__Impl rule__XBooleanLiteral__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15172:2: rule__XBooleanLiteral__Group__0__Impl rule__XBooleanLiteral__Group__1
+            // InternalCheckCfg.g:15171:1: ( rule__XBooleanLiteral__Group__0__Impl rule__XBooleanLiteral__Group__1 )
+            // InternalCheckCfg.g:15172:2: rule__XBooleanLiteral__Group__0__Impl rule__XBooleanLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__XBooleanLiteral__Group__0__Impl_in_rule__XBooleanLiteral__Group__030673);
+            pushFollow(FOLLOW_87);
             rule__XBooleanLiteral__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBooleanLiteral__Group__1_in_rule__XBooleanLiteral__Group__030676);
+            pushFollow(FOLLOW_2);
             rule__XBooleanLiteral__Group__1();
 
             state._fsp--;
@@ -43894,23 +43894,23 @@ public final void rule__XBooleanLiteral__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XBooleanLiteral__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15179:1: rule__XBooleanLiteral__Group__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:15179:1: rule__XBooleanLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XBooleanLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15183:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15184:1: ( () )
+            // InternalCheckCfg.g:15183:1: ( ( () ) )
+            // InternalCheckCfg.g:15184:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15184:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15185:1: ()
+            // InternalCheckCfg.g:15184:1: ( () )
+            // InternalCheckCfg.g:15185:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBooleanLiteralAccess().getXBooleanLiteralAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15186:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15188:1: 
+            // InternalCheckCfg.g:15186:1: ()
+            // InternalCheckCfg.g:15188:1: 
             {
             }
 
@@ -43935,16 +43935,16 @@ public final void rule__XBooleanLiteral__Group__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XBooleanLiteral__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15198:1: rule__XBooleanLiteral__Group__1 : rule__XBooleanLiteral__Group__1__Impl ;
+    // InternalCheckCfg.g:15198:1: rule__XBooleanLiteral__Group__1 : rule__XBooleanLiteral__Group__1__Impl ;
     public final void rule__XBooleanLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15202:1: ( rule__XBooleanLiteral__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15203:2: rule__XBooleanLiteral__Group__1__Impl
+            // InternalCheckCfg.g:15202:1: ( rule__XBooleanLiteral__Group__1__Impl )
+            // InternalCheckCfg.g:15203:2: rule__XBooleanLiteral__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XBooleanLiteral__Group__1__Impl_in_rule__XBooleanLiteral__Group__130734);
+            pushFollow(FOLLOW_2);
             rule__XBooleanLiteral__Group__1__Impl();
 
             state._fsp--;
@@ -43968,25 +43968,25 @@ public final void rule__XBooleanLiteral__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XBooleanLiteral__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15209:1: rule__XBooleanLiteral__Group__1__Impl : ( ( rule__XBooleanLiteral__Alternatives_1 ) ) ;
+    // InternalCheckCfg.g:15209:1: rule__XBooleanLiteral__Group__1__Impl : ( ( rule__XBooleanLiteral__Alternatives_1 ) ) ;
     public final void rule__XBooleanLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15213:1: ( ( ( rule__XBooleanLiteral__Alternatives_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15214:1: ( ( rule__XBooleanLiteral__Alternatives_1 ) )
+            // InternalCheckCfg.g:15213:1: ( ( ( rule__XBooleanLiteral__Alternatives_1 ) ) )
+            // InternalCheckCfg.g:15214:1: ( ( rule__XBooleanLiteral__Alternatives_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15214:1: ( ( rule__XBooleanLiteral__Alternatives_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15215:1: ( rule__XBooleanLiteral__Alternatives_1 )
+            // InternalCheckCfg.g:15214:1: ( ( rule__XBooleanLiteral__Alternatives_1 ) )
+            // InternalCheckCfg.g:15215:1: ( rule__XBooleanLiteral__Alternatives_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBooleanLiteralAccess().getAlternatives_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15216:1: ( rule__XBooleanLiteral__Alternatives_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15216:2: rule__XBooleanLiteral__Alternatives_1
+            // InternalCheckCfg.g:15216:1: ( rule__XBooleanLiteral__Alternatives_1 )
+            // InternalCheckCfg.g:15216:2: rule__XBooleanLiteral__Alternatives_1
             {
-            pushFollow(FOLLOW_rule__XBooleanLiteral__Alternatives_1_in_rule__XBooleanLiteral__Group__1__Impl30761);
+            pushFollow(FOLLOW_2);
             rule__XBooleanLiteral__Alternatives_1();
 
             state._fsp--;
@@ -44019,21 +44019,21 @@ public final void rule__XBooleanLiteral__Group__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XNullLiteral__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15230:1: rule__XNullLiteral__Group__0 : rule__XNullLiteral__Group__0__Impl rule__XNullLiteral__Group__1 ;
+    // InternalCheckCfg.g:15230:1: rule__XNullLiteral__Group__0 : rule__XNullLiteral__Group__0__Impl rule__XNullLiteral__Group__1 ;
     public final void rule__XNullLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15234:1: ( rule__XNullLiteral__Group__0__Impl rule__XNullLiteral__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15235:2: rule__XNullLiteral__Group__0__Impl rule__XNullLiteral__Group__1
+            // InternalCheckCfg.g:15234:1: ( rule__XNullLiteral__Group__0__Impl rule__XNullLiteral__Group__1 )
+            // InternalCheckCfg.g:15235:2: rule__XNullLiteral__Group__0__Impl rule__XNullLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__XNullLiteral__Group__0__Impl_in_rule__XNullLiteral__Group__030795);
+            pushFollow(FOLLOW_88);
             rule__XNullLiteral__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XNullLiteral__Group__1_in_rule__XNullLiteral__Group__030798);
+            pushFollow(FOLLOW_2);
             rule__XNullLiteral__Group__1();
 
             state._fsp--;
@@ -44057,23 +44057,23 @@ public final void rule__XNullLiteral__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XNullLiteral__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15242:1: rule__XNullLiteral__Group__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:15242:1: rule__XNullLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XNullLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15246:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15247:1: ( () )
+            // InternalCheckCfg.g:15246:1: ( ( () ) )
+            // InternalCheckCfg.g:15247:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15247:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15248:1: ()
+            // InternalCheckCfg.g:15247:1: ( () )
+            // InternalCheckCfg.g:15248:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNullLiteralAccess().getXNullLiteralAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15249:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15251:1: 
+            // InternalCheckCfg.g:15249:1: ()
+            // InternalCheckCfg.g:15251:1: 
             {
             }
 
@@ -44098,16 +44098,16 @@ public final void rule__XNullLiteral__Group__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XNullLiteral__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15261:1: rule__XNullLiteral__Group__1 : rule__XNullLiteral__Group__1__Impl ;
+    // InternalCheckCfg.g:15261:1: rule__XNullLiteral__Group__1 : rule__XNullLiteral__Group__1__Impl ;
     public final void rule__XNullLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15265:1: ( rule__XNullLiteral__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15266:2: rule__XNullLiteral__Group__1__Impl
+            // InternalCheckCfg.g:15265:1: ( rule__XNullLiteral__Group__1__Impl )
+            // InternalCheckCfg.g:15266:2: rule__XNullLiteral__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XNullLiteral__Group__1__Impl_in_rule__XNullLiteral__Group__130856);
+            pushFollow(FOLLOW_2);
             rule__XNullLiteral__Group__1__Impl();
 
             state._fsp--;
@@ -44131,22 +44131,22 @@ public final void rule__XNullLiteral__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XNullLiteral__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15272:1: rule__XNullLiteral__Group__1__Impl : ( 'null' ) ;
+    // InternalCheckCfg.g:15272:1: rule__XNullLiteral__Group__1__Impl : ( 'null' ) ;
     public final void rule__XNullLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15276:1: ( ( 'null' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15277:1: ( 'null' )
+            // InternalCheckCfg.g:15276:1: ( ( 'null' ) )
+            // InternalCheckCfg.g:15277:1: ( 'null' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15277:1: ( 'null' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15278:1: 'null'
+            // InternalCheckCfg.g:15277:1: ( 'null' )
+            // InternalCheckCfg.g:15278:1: 'null'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNullLiteralAccess().getNullKeyword_1()); 
             }
-            match(input,79,FOLLOW_79_in_rule__XNullLiteral__Group__1__Impl30884); if (state.failed) return ;
+            match(input,79,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXNullLiteralAccess().getNullKeyword_1()); 
             }
@@ -44172,21 +44172,21 @@ public final void rule__XNullLiteral__Group__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XNumberLiteral__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15295:1: rule__XNumberLiteral__Group__0 : rule__XNumberLiteral__Group__0__Impl rule__XNumberLiteral__Group__1 ;
+    // InternalCheckCfg.g:15295:1: rule__XNumberLiteral__Group__0 : rule__XNumberLiteral__Group__0__Impl rule__XNumberLiteral__Group__1 ;
     public final void rule__XNumberLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15299:1: ( rule__XNumberLiteral__Group__0__Impl rule__XNumberLiteral__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15300:2: rule__XNumberLiteral__Group__0__Impl rule__XNumberLiteral__Group__1
+            // InternalCheckCfg.g:15299:1: ( rule__XNumberLiteral__Group__0__Impl rule__XNumberLiteral__Group__1 )
+            // InternalCheckCfg.g:15300:2: rule__XNumberLiteral__Group__0__Impl rule__XNumberLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__XNumberLiteral__Group__0__Impl_in_rule__XNumberLiteral__Group__030919);
+            pushFollow(FOLLOW_89);
             rule__XNumberLiteral__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XNumberLiteral__Group__1_in_rule__XNumberLiteral__Group__030922);
+            pushFollow(FOLLOW_2);
             rule__XNumberLiteral__Group__1();
 
             state._fsp--;
@@ -44210,23 +44210,23 @@ public final void rule__XNumberLiteral__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XNumberLiteral__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15307:1: rule__XNumberLiteral__Group__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:15307:1: rule__XNumberLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XNumberLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15311:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15312:1: ( () )
+            // InternalCheckCfg.g:15311:1: ( ( () ) )
+            // InternalCheckCfg.g:15312:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15312:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15313:1: ()
+            // InternalCheckCfg.g:15312:1: ( () )
+            // InternalCheckCfg.g:15313:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNumberLiteralAccess().getXNumberLiteralAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15314:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15316:1: 
+            // InternalCheckCfg.g:15314:1: ()
+            // InternalCheckCfg.g:15316:1: 
             {
             }
 
@@ -44251,16 +44251,16 @@ public final void rule__XNumberLiteral__Group__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XNumberLiteral__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15326:1: rule__XNumberLiteral__Group__1 : rule__XNumberLiteral__Group__1__Impl ;
+    // InternalCheckCfg.g:15326:1: rule__XNumberLiteral__Group__1 : rule__XNumberLiteral__Group__1__Impl ;
     public final void rule__XNumberLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15330:1: ( rule__XNumberLiteral__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15331:2: rule__XNumberLiteral__Group__1__Impl
+            // InternalCheckCfg.g:15330:1: ( rule__XNumberLiteral__Group__1__Impl )
+            // InternalCheckCfg.g:15331:2: rule__XNumberLiteral__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XNumberLiteral__Group__1__Impl_in_rule__XNumberLiteral__Group__130980);
+            pushFollow(FOLLOW_2);
             rule__XNumberLiteral__Group__1__Impl();
 
             state._fsp--;
@@ -44284,25 +44284,25 @@ public final void rule__XNumberLiteral__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XNumberLiteral__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15337:1: rule__XNumberLiteral__Group__1__Impl : ( ( rule__XNumberLiteral__ValueAssignment_1 ) ) ;
+    // InternalCheckCfg.g:15337:1: rule__XNumberLiteral__Group__1__Impl : ( ( rule__XNumberLiteral__ValueAssignment_1 ) ) ;
     public final void rule__XNumberLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15341:1: ( ( ( rule__XNumberLiteral__ValueAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15342:1: ( ( rule__XNumberLiteral__ValueAssignment_1 ) )
+            // InternalCheckCfg.g:15341:1: ( ( ( rule__XNumberLiteral__ValueAssignment_1 ) ) )
+            // InternalCheckCfg.g:15342:1: ( ( rule__XNumberLiteral__ValueAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15342:1: ( ( rule__XNumberLiteral__ValueAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15343:1: ( rule__XNumberLiteral__ValueAssignment_1 )
+            // InternalCheckCfg.g:15342:1: ( ( rule__XNumberLiteral__ValueAssignment_1 ) )
+            // InternalCheckCfg.g:15343:1: ( rule__XNumberLiteral__ValueAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNumberLiteralAccess().getValueAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15344:1: ( rule__XNumberLiteral__ValueAssignment_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15344:2: rule__XNumberLiteral__ValueAssignment_1
+            // InternalCheckCfg.g:15344:1: ( rule__XNumberLiteral__ValueAssignment_1 )
+            // InternalCheckCfg.g:15344:2: rule__XNumberLiteral__ValueAssignment_1
             {
-            pushFollow(FOLLOW_rule__XNumberLiteral__ValueAssignment_1_in_rule__XNumberLiteral__Group__1__Impl31007);
+            pushFollow(FOLLOW_2);
             rule__XNumberLiteral__ValueAssignment_1();
 
             state._fsp--;
@@ -44335,21 +44335,21 @@ public final void rule__XNumberLiteral__Group__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XStringLiteral__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15358:1: rule__XStringLiteral__Group__0 : rule__XStringLiteral__Group__0__Impl rule__XStringLiteral__Group__1 ;
+    // InternalCheckCfg.g:15358:1: rule__XStringLiteral__Group__0 : rule__XStringLiteral__Group__0__Impl rule__XStringLiteral__Group__1 ;
     public final void rule__XStringLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15362:1: ( rule__XStringLiteral__Group__0__Impl rule__XStringLiteral__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15363:2: rule__XStringLiteral__Group__0__Impl rule__XStringLiteral__Group__1
+            // InternalCheckCfg.g:15362:1: ( rule__XStringLiteral__Group__0__Impl rule__XStringLiteral__Group__1 )
+            // InternalCheckCfg.g:15363:2: rule__XStringLiteral__Group__0__Impl rule__XStringLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__XStringLiteral__Group__0__Impl_in_rule__XStringLiteral__Group__031041);
+            pushFollow(FOLLOW_22);
             rule__XStringLiteral__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XStringLiteral__Group__1_in_rule__XStringLiteral__Group__031044);
+            pushFollow(FOLLOW_2);
             rule__XStringLiteral__Group__1();
 
             state._fsp--;
@@ -44373,23 +44373,23 @@ public final void rule__XStringLiteral__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XStringLiteral__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15370:1: rule__XStringLiteral__Group__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:15370:1: rule__XStringLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XStringLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15374:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15375:1: ( () )
+            // InternalCheckCfg.g:15374:1: ( ( () ) )
+            // InternalCheckCfg.g:15375:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15375:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15376:1: ()
+            // InternalCheckCfg.g:15375:1: ( () )
+            // InternalCheckCfg.g:15376:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXStringLiteralAccess().getXStringLiteralAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15377:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15379:1: 
+            // InternalCheckCfg.g:15377:1: ()
+            // InternalCheckCfg.g:15379:1: 
             {
             }
 
@@ -44414,16 +44414,16 @@ public final void rule__XStringLiteral__Group__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XStringLiteral__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15389:1: rule__XStringLiteral__Group__1 : rule__XStringLiteral__Group__1__Impl ;
+    // InternalCheckCfg.g:15389:1: rule__XStringLiteral__Group__1 : rule__XStringLiteral__Group__1__Impl ;
     public final void rule__XStringLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15393:1: ( rule__XStringLiteral__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15394:2: rule__XStringLiteral__Group__1__Impl
+            // InternalCheckCfg.g:15393:1: ( rule__XStringLiteral__Group__1__Impl )
+            // InternalCheckCfg.g:15394:2: rule__XStringLiteral__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XStringLiteral__Group__1__Impl_in_rule__XStringLiteral__Group__131102);
+            pushFollow(FOLLOW_2);
             rule__XStringLiteral__Group__1__Impl();
 
             state._fsp--;
@@ -44447,25 +44447,25 @@ public final void rule__XStringLiteral__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XStringLiteral__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15400:1: rule__XStringLiteral__Group__1__Impl : ( ( rule__XStringLiteral__ValueAssignment_1 ) ) ;
+    // InternalCheckCfg.g:15400:1: rule__XStringLiteral__Group__1__Impl : ( ( rule__XStringLiteral__ValueAssignment_1 ) ) ;
     public final void rule__XStringLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15404:1: ( ( ( rule__XStringLiteral__ValueAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15405:1: ( ( rule__XStringLiteral__ValueAssignment_1 ) )
+            // InternalCheckCfg.g:15404:1: ( ( ( rule__XStringLiteral__ValueAssignment_1 ) ) )
+            // InternalCheckCfg.g:15405:1: ( ( rule__XStringLiteral__ValueAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15405:1: ( ( rule__XStringLiteral__ValueAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15406:1: ( rule__XStringLiteral__ValueAssignment_1 )
+            // InternalCheckCfg.g:15405:1: ( ( rule__XStringLiteral__ValueAssignment_1 ) )
+            // InternalCheckCfg.g:15406:1: ( rule__XStringLiteral__ValueAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXStringLiteralAccess().getValueAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15407:1: ( rule__XStringLiteral__ValueAssignment_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15407:2: rule__XStringLiteral__ValueAssignment_1
+            // InternalCheckCfg.g:15407:1: ( rule__XStringLiteral__ValueAssignment_1 )
+            // InternalCheckCfg.g:15407:2: rule__XStringLiteral__ValueAssignment_1
             {
-            pushFollow(FOLLOW_rule__XStringLiteral__ValueAssignment_1_in_rule__XStringLiteral__Group__1__Impl31129);
+            pushFollow(FOLLOW_2);
             rule__XStringLiteral__ValueAssignment_1();
 
             state._fsp--;
@@ -44498,21 +44498,21 @@ public final void rule__XStringLiteral__Group__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15421:1: rule__XTypeLiteral__Group__0 : rule__XTypeLiteral__Group__0__Impl rule__XTypeLiteral__Group__1 ;
+    // InternalCheckCfg.g:15421:1: rule__XTypeLiteral__Group__0 : rule__XTypeLiteral__Group__0__Impl rule__XTypeLiteral__Group__1 ;
     public final void rule__XTypeLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15425:1: ( rule__XTypeLiteral__Group__0__Impl rule__XTypeLiteral__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15426:2: rule__XTypeLiteral__Group__0__Impl rule__XTypeLiteral__Group__1
+            // InternalCheckCfg.g:15425:1: ( rule__XTypeLiteral__Group__0__Impl rule__XTypeLiteral__Group__1 )
+            // InternalCheckCfg.g:15426:2: rule__XTypeLiteral__Group__0__Impl rule__XTypeLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__0__Impl_in_rule__XTypeLiteral__Group__031163);
+            pushFollow(FOLLOW_90);
             rule__XTypeLiteral__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__1_in_rule__XTypeLiteral__Group__031166);
+            pushFollow(FOLLOW_2);
             rule__XTypeLiteral__Group__1();
 
             state._fsp--;
@@ -44536,23 +44536,23 @@ public final void rule__XTypeLiteral__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15433:1: rule__XTypeLiteral__Group__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:15433:1: rule__XTypeLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XTypeLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15437:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15438:1: ( () )
+            // InternalCheckCfg.g:15437:1: ( ( () ) )
+            // InternalCheckCfg.g:15438:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15438:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15439:1: ()
+            // InternalCheckCfg.g:15438:1: ( () )
+            // InternalCheckCfg.g:15439:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getXTypeLiteralAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15440:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15442:1: 
+            // InternalCheckCfg.g:15440:1: ()
+            // InternalCheckCfg.g:15442:1: 
             {
             }
 
@@ -44577,21 +44577,21 @@ public final void rule__XTypeLiteral__Group__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15452:1: rule__XTypeLiteral__Group__1 : rule__XTypeLiteral__Group__1__Impl rule__XTypeLiteral__Group__2 ;
+    // InternalCheckCfg.g:15452:1: rule__XTypeLiteral__Group__1 : rule__XTypeLiteral__Group__1__Impl rule__XTypeLiteral__Group__2 ;
     public final void rule__XTypeLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15456:1: ( rule__XTypeLiteral__Group__1__Impl rule__XTypeLiteral__Group__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15457:2: rule__XTypeLiteral__Group__1__Impl rule__XTypeLiteral__Group__2
+            // InternalCheckCfg.g:15456:1: ( rule__XTypeLiteral__Group__1__Impl rule__XTypeLiteral__Group__2 )
+            // InternalCheckCfg.g:15457:2: rule__XTypeLiteral__Group__1__Impl rule__XTypeLiteral__Group__2
             {
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__1__Impl_in_rule__XTypeLiteral__Group__131224);
+            pushFollow(FOLLOW_16);
             rule__XTypeLiteral__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__2_in_rule__XTypeLiteral__Group__131227);
+            pushFollow(FOLLOW_2);
             rule__XTypeLiteral__Group__2();
 
             state._fsp--;
@@ -44615,22 +44615,22 @@ public final void rule__XTypeLiteral__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15464:1: rule__XTypeLiteral__Group__1__Impl : ( 'typeof' ) ;
+    // InternalCheckCfg.g:15464:1: rule__XTypeLiteral__Group__1__Impl : ( 'typeof' ) ;
     public final void rule__XTypeLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15468:1: ( ( 'typeof' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15469:1: ( 'typeof' )
+            // InternalCheckCfg.g:15468:1: ( ( 'typeof' ) )
+            // InternalCheckCfg.g:15469:1: ( 'typeof' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15469:1: ( 'typeof' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15470:1: 'typeof'
+            // InternalCheckCfg.g:15469:1: ( 'typeof' )
+            // InternalCheckCfg.g:15470:1: 'typeof'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getTypeofKeyword_1()); 
             }
-            match(input,80,FOLLOW_80_in_rule__XTypeLiteral__Group__1__Impl31255); if (state.failed) return ;
+            match(input,80,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXTypeLiteralAccess().getTypeofKeyword_1()); 
             }
@@ -44656,21 +44656,21 @@ public final void rule__XTypeLiteral__Group__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15483:1: rule__XTypeLiteral__Group__2 : rule__XTypeLiteral__Group__2__Impl rule__XTypeLiteral__Group__3 ;
+    // InternalCheckCfg.g:15483:1: rule__XTypeLiteral__Group__2 : rule__XTypeLiteral__Group__2__Impl rule__XTypeLiteral__Group__3 ;
     public final void rule__XTypeLiteral__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15487:1: ( rule__XTypeLiteral__Group__2__Impl rule__XTypeLiteral__Group__3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15488:2: rule__XTypeLiteral__Group__2__Impl rule__XTypeLiteral__Group__3
+            // InternalCheckCfg.g:15487:1: ( rule__XTypeLiteral__Group__2__Impl rule__XTypeLiteral__Group__3 )
+            // InternalCheckCfg.g:15488:2: rule__XTypeLiteral__Group__2__Impl rule__XTypeLiteral__Group__3
             {
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__2__Impl_in_rule__XTypeLiteral__Group__231286);
+            pushFollow(FOLLOW_5);
             rule__XTypeLiteral__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__3_in_rule__XTypeLiteral__Group__231289);
+            pushFollow(FOLLOW_2);
             rule__XTypeLiteral__Group__3();
 
             state._fsp--;
@@ -44694,22 +44694,22 @@ public final void rule__XTypeLiteral__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15495:1: rule__XTypeLiteral__Group__2__Impl : ( '(' ) ;
+    // InternalCheckCfg.g:15495:1: rule__XTypeLiteral__Group__2__Impl : ( '(' ) ;
     public final void rule__XTypeLiteral__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15499:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15500:1: ( '(' )
+            // InternalCheckCfg.g:15499:1: ( ( '(' ) )
+            // InternalCheckCfg.g:15500:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15500:1: ( '(' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15501:1: '('
+            // InternalCheckCfg.g:15500:1: ( '(' )
+            // InternalCheckCfg.g:15501:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getLeftParenthesisKeyword_2()); 
             }
-            match(input,62,FOLLOW_62_in_rule__XTypeLiteral__Group__2__Impl31317); if (state.failed) return ;
+            match(input,62,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXTypeLiteralAccess().getLeftParenthesisKeyword_2()); 
             }
@@ -44735,21 +44735,21 @@ public final void rule__XTypeLiteral__Group__2__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15514:1: rule__XTypeLiteral__Group__3 : rule__XTypeLiteral__Group__3__Impl rule__XTypeLiteral__Group__4 ;
+    // InternalCheckCfg.g:15514:1: rule__XTypeLiteral__Group__3 : rule__XTypeLiteral__Group__3__Impl rule__XTypeLiteral__Group__4 ;
     public final void rule__XTypeLiteral__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15518:1: ( rule__XTypeLiteral__Group__3__Impl rule__XTypeLiteral__Group__4 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15519:2: rule__XTypeLiteral__Group__3__Impl rule__XTypeLiteral__Group__4
+            // InternalCheckCfg.g:15518:1: ( rule__XTypeLiteral__Group__3__Impl rule__XTypeLiteral__Group__4 )
+            // InternalCheckCfg.g:15519:2: rule__XTypeLiteral__Group__3__Impl rule__XTypeLiteral__Group__4
             {
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__3__Impl_in_rule__XTypeLiteral__Group__331348);
+            pushFollow(FOLLOW_91);
             rule__XTypeLiteral__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__4_in_rule__XTypeLiteral__Group__331351);
+            pushFollow(FOLLOW_2);
             rule__XTypeLiteral__Group__4();
 
             state._fsp--;
@@ -44773,25 +44773,25 @@ public final void rule__XTypeLiteral__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15526:1: rule__XTypeLiteral__Group__3__Impl : ( ( rule__XTypeLiteral__TypeAssignment_3 ) ) ;
+    // InternalCheckCfg.g:15526:1: rule__XTypeLiteral__Group__3__Impl : ( ( rule__XTypeLiteral__TypeAssignment_3 ) ) ;
     public final void rule__XTypeLiteral__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15530:1: ( ( ( rule__XTypeLiteral__TypeAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15531:1: ( ( rule__XTypeLiteral__TypeAssignment_3 ) )
+            // InternalCheckCfg.g:15530:1: ( ( ( rule__XTypeLiteral__TypeAssignment_3 ) ) )
+            // InternalCheckCfg.g:15531:1: ( ( rule__XTypeLiteral__TypeAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15531:1: ( ( rule__XTypeLiteral__TypeAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15532:1: ( rule__XTypeLiteral__TypeAssignment_3 )
+            // InternalCheckCfg.g:15531:1: ( ( rule__XTypeLiteral__TypeAssignment_3 ) )
+            // InternalCheckCfg.g:15532:1: ( rule__XTypeLiteral__TypeAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getTypeAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15533:1: ( rule__XTypeLiteral__TypeAssignment_3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15533:2: rule__XTypeLiteral__TypeAssignment_3
+            // InternalCheckCfg.g:15533:1: ( rule__XTypeLiteral__TypeAssignment_3 )
+            // InternalCheckCfg.g:15533:2: rule__XTypeLiteral__TypeAssignment_3
             {
-            pushFollow(FOLLOW_rule__XTypeLiteral__TypeAssignment_3_in_rule__XTypeLiteral__Group__3__Impl31378);
+            pushFollow(FOLLOW_2);
             rule__XTypeLiteral__TypeAssignment_3();
 
             state._fsp--;
@@ -44824,21 +44824,21 @@ public final void rule__XTypeLiteral__Group__3__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__4"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15543:1: rule__XTypeLiteral__Group__4 : rule__XTypeLiteral__Group__4__Impl rule__XTypeLiteral__Group__5 ;
+    // InternalCheckCfg.g:15543:1: rule__XTypeLiteral__Group__4 : rule__XTypeLiteral__Group__4__Impl rule__XTypeLiteral__Group__5 ;
     public final void rule__XTypeLiteral__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15547:1: ( rule__XTypeLiteral__Group__4__Impl rule__XTypeLiteral__Group__5 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15548:2: rule__XTypeLiteral__Group__4__Impl rule__XTypeLiteral__Group__5
+            // InternalCheckCfg.g:15547:1: ( rule__XTypeLiteral__Group__4__Impl rule__XTypeLiteral__Group__5 )
+            // InternalCheckCfg.g:15548:2: rule__XTypeLiteral__Group__4__Impl rule__XTypeLiteral__Group__5
             {
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__4__Impl_in_rule__XTypeLiteral__Group__431408);
+            pushFollow(FOLLOW_91);
             rule__XTypeLiteral__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__5_in_rule__XTypeLiteral__Group__431411);
+            pushFollow(FOLLOW_2);
             rule__XTypeLiteral__Group__5();
 
             state._fsp--;
@@ -44862,22 +44862,22 @@ public final void rule__XTypeLiteral__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15555:1: rule__XTypeLiteral__Group__4__Impl : ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* ) ;
+    // InternalCheckCfg.g:15555:1: rule__XTypeLiteral__Group__4__Impl : ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* ) ;
     public final void rule__XTypeLiteral__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15559:1: ( ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15560:1: ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* )
+            // InternalCheckCfg.g:15559:1: ( ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* ) )
+            // InternalCheckCfg.g:15560:1: ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15560:1: ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15561:1: ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )*
+            // InternalCheckCfg.g:15560:1: ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* )
+            // InternalCheckCfg.g:15561:1: ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getArrayDimensionsAssignment_4()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15562:1: ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )*
+            // InternalCheckCfg.g:15562:1: ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )*
             loop113:
             do {
                 int alt113=2;
@@ -44890,9 +44890,9 @@ public final void rule__XTypeLiteral__Group__4__Impl() throws RecognitionExcepti
 
                 switch (alt113) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15562:2: rule__XTypeLiteral__ArrayDimensionsAssignment_4
+            	    // InternalCheckCfg.g:15562:2: rule__XTypeLiteral__ArrayDimensionsAssignment_4
             	    {
-            	    pushFollow(FOLLOW_rule__XTypeLiteral__ArrayDimensionsAssignment_4_in_rule__XTypeLiteral__Group__4__Impl31438);
+            	    pushFollow(FOLLOW_92);
             	    rule__XTypeLiteral__ArrayDimensionsAssignment_4();
 
             	    state._fsp--;
@@ -44931,16 +44931,16 @@ public final void rule__XTypeLiteral__Group__4__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__5"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15572:1: rule__XTypeLiteral__Group__5 : rule__XTypeLiteral__Group__5__Impl ;
+    // InternalCheckCfg.g:15572:1: rule__XTypeLiteral__Group__5 : rule__XTypeLiteral__Group__5__Impl ;
     public final void rule__XTypeLiteral__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15576:1: ( rule__XTypeLiteral__Group__5__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15577:2: rule__XTypeLiteral__Group__5__Impl
+            // InternalCheckCfg.g:15576:1: ( rule__XTypeLiteral__Group__5__Impl )
+            // InternalCheckCfg.g:15577:2: rule__XTypeLiteral__Group__5__Impl
             {
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__5__Impl_in_rule__XTypeLiteral__Group__531469);
+            pushFollow(FOLLOW_2);
             rule__XTypeLiteral__Group__5__Impl();
 
             state._fsp--;
@@ -44964,22 +44964,22 @@ public final void rule__XTypeLiteral__Group__5() throws RecognitionException {
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15583:1: rule__XTypeLiteral__Group__5__Impl : ( ')' ) ;
+    // InternalCheckCfg.g:15583:1: rule__XTypeLiteral__Group__5__Impl : ( ')' ) ;
     public final void rule__XTypeLiteral__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15587:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15588:1: ( ')' )
+            // InternalCheckCfg.g:15587:1: ( ( ')' ) )
+            // InternalCheckCfg.g:15588:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15588:1: ( ')' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15589:1: ')'
+            // InternalCheckCfg.g:15588:1: ( ')' )
+            // InternalCheckCfg.g:15589:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getRightParenthesisKeyword_5()); 
             }
-            match(input,63,FOLLOW_63_in_rule__XTypeLiteral__Group__5__Impl31497); if (state.failed) return ;
+            match(input,63,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXTypeLiteralAccess().getRightParenthesisKeyword_5()); 
             }
@@ -45005,21 +45005,21 @@ public final void rule__XTypeLiteral__Group__5__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XThrowExpression__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15614:1: rule__XThrowExpression__Group__0 : rule__XThrowExpression__Group__0__Impl rule__XThrowExpression__Group__1 ;
+    // InternalCheckCfg.g:15614:1: rule__XThrowExpression__Group__0 : rule__XThrowExpression__Group__0__Impl rule__XThrowExpression__Group__1 ;
     public final void rule__XThrowExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15618:1: ( rule__XThrowExpression__Group__0__Impl rule__XThrowExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15619:2: rule__XThrowExpression__Group__0__Impl rule__XThrowExpression__Group__1
+            // InternalCheckCfg.g:15618:1: ( rule__XThrowExpression__Group__0__Impl rule__XThrowExpression__Group__1 )
+            // InternalCheckCfg.g:15619:2: rule__XThrowExpression__Group__0__Impl rule__XThrowExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XThrowExpression__Group__0__Impl_in_rule__XThrowExpression__Group__031540);
+            pushFollow(FOLLOW_93);
             rule__XThrowExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XThrowExpression__Group__1_in_rule__XThrowExpression__Group__031543);
+            pushFollow(FOLLOW_2);
             rule__XThrowExpression__Group__1();
 
             state._fsp--;
@@ -45043,23 +45043,23 @@ public final void rule__XThrowExpression__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XThrowExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15626:1: rule__XThrowExpression__Group__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:15626:1: rule__XThrowExpression__Group__0__Impl : ( () ) ;
     public final void rule__XThrowExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15630:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15631:1: ( () )
+            // InternalCheckCfg.g:15630:1: ( ( () ) )
+            // InternalCheckCfg.g:15631:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15631:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15632:1: ()
+            // InternalCheckCfg.g:15631:1: ( () )
+            // InternalCheckCfg.g:15632:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXThrowExpressionAccess().getXThrowExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15633:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15635:1: 
+            // InternalCheckCfg.g:15633:1: ()
+            // InternalCheckCfg.g:15635:1: 
             {
             }
 
@@ -45084,21 +45084,21 @@ public final void rule__XThrowExpression__Group__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XThrowExpression__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15645:1: rule__XThrowExpression__Group__1 : rule__XThrowExpression__Group__1__Impl rule__XThrowExpression__Group__2 ;
+    // InternalCheckCfg.g:15645:1: rule__XThrowExpression__Group__1 : rule__XThrowExpression__Group__1__Impl rule__XThrowExpression__Group__2 ;
     public final void rule__XThrowExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15649:1: ( rule__XThrowExpression__Group__1__Impl rule__XThrowExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15650:2: rule__XThrowExpression__Group__1__Impl rule__XThrowExpression__Group__2
+            // InternalCheckCfg.g:15649:1: ( rule__XThrowExpression__Group__1__Impl rule__XThrowExpression__Group__2 )
+            // InternalCheckCfg.g:15650:2: rule__XThrowExpression__Group__1__Impl rule__XThrowExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XThrowExpression__Group__1__Impl_in_rule__XThrowExpression__Group__131601);
+            pushFollow(FOLLOW_61);
             rule__XThrowExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XThrowExpression__Group__2_in_rule__XThrowExpression__Group__131604);
+            pushFollow(FOLLOW_2);
             rule__XThrowExpression__Group__2();
 
             state._fsp--;
@@ -45122,22 +45122,22 @@ public final void rule__XThrowExpression__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XThrowExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15657:1: rule__XThrowExpression__Group__1__Impl : ( 'throw' ) ;
+    // InternalCheckCfg.g:15657:1: rule__XThrowExpression__Group__1__Impl : ( 'throw' ) ;
     public final void rule__XThrowExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15661:1: ( ( 'throw' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15662:1: ( 'throw' )
+            // InternalCheckCfg.g:15661:1: ( ( 'throw' ) )
+            // InternalCheckCfg.g:15662:1: ( 'throw' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15662:1: ( 'throw' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15663:1: 'throw'
+            // InternalCheckCfg.g:15662:1: ( 'throw' )
+            // InternalCheckCfg.g:15663:1: 'throw'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXThrowExpressionAccess().getThrowKeyword_1()); 
             }
-            match(input,81,FOLLOW_81_in_rule__XThrowExpression__Group__1__Impl31632); if (state.failed) return ;
+            match(input,81,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXThrowExpressionAccess().getThrowKeyword_1()); 
             }
@@ -45163,16 +45163,16 @@ public final void rule__XThrowExpression__Group__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XThrowExpression__Group__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15676:1: rule__XThrowExpression__Group__2 : rule__XThrowExpression__Group__2__Impl ;
+    // InternalCheckCfg.g:15676:1: rule__XThrowExpression__Group__2 : rule__XThrowExpression__Group__2__Impl ;
     public final void rule__XThrowExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15680:1: ( rule__XThrowExpression__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15681:2: rule__XThrowExpression__Group__2__Impl
+            // InternalCheckCfg.g:15680:1: ( rule__XThrowExpression__Group__2__Impl )
+            // InternalCheckCfg.g:15681:2: rule__XThrowExpression__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__XThrowExpression__Group__2__Impl_in_rule__XThrowExpression__Group__231663);
+            pushFollow(FOLLOW_2);
             rule__XThrowExpression__Group__2__Impl();
 
             state._fsp--;
@@ -45196,25 +45196,25 @@ public final void rule__XThrowExpression__Group__2() throws RecognitionException
 
 
     // $ANTLR start "rule__XThrowExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15687:1: rule__XThrowExpression__Group__2__Impl : ( ( rule__XThrowExpression__ExpressionAssignment_2 ) ) ;
+    // InternalCheckCfg.g:15687:1: rule__XThrowExpression__Group__2__Impl : ( ( rule__XThrowExpression__ExpressionAssignment_2 ) ) ;
     public final void rule__XThrowExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15691:1: ( ( ( rule__XThrowExpression__ExpressionAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15692:1: ( ( rule__XThrowExpression__ExpressionAssignment_2 ) )
+            // InternalCheckCfg.g:15691:1: ( ( ( rule__XThrowExpression__ExpressionAssignment_2 ) ) )
+            // InternalCheckCfg.g:15692:1: ( ( rule__XThrowExpression__ExpressionAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15692:1: ( ( rule__XThrowExpression__ExpressionAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15693:1: ( rule__XThrowExpression__ExpressionAssignment_2 )
+            // InternalCheckCfg.g:15692:1: ( ( rule__XThrowExpression__ExpressionAssignment_2 ) )
+            // InternalCheckCfg.g:15693:1: ( rule__XThrowExpression__ExpressionAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXThrowExpressionAccess().getExpressionAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15694:1: ( rule__XThrowExpression__ExpressionAssignment_2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15694:2: rule__XThrowExpression__ExpressionAssignment_2
+            // InternalCheckCfg.g:15694:1: ( rule__XThrowExpression__ExpressionAssignment_2 )
+            // InternalCheckCfg.g:15694:2: rule__XThrowExpression__ExpressionAssignment_2
             {
-            pushFollow(FOLLOW_rule__XThrowExpression__ExpressionAssignment_2_in_rule__XThrowExpression__Group__2__Impl31690);
+            pushFollow(FOLLOW_2);
             rule__XThrowExpression__ExpressionAssignment_2();
 
             state._fsp--;
@@ -45247,21 +45247,21 @@ public final void rule__XThrowExpression__Group__2__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XReturnExpression__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15710:1: rule__XReturnExpression__Group__0 : rule__XReturnExpression__Group__0__Impl rule__XReturnExpression__Group__1 ;
+    // InternalCheckCfg.g:15710:1: rule__XReturnExpression__Group__0 : rule__XReturnExpression__Group__0__Impl rule__XReturnExpression__Group__1 ;
     public final void rule__XReturnExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15714:1: ( rule__XReturnExpression__Group__0__Impl rule__XReturnExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15715:2: rule__XReturnExpression__Group__0__Impl rule__XReturnExpression__Group__1
+            // InternalCheckCfg.g:15714:1: ( rule__XReturnExpression__Group__0__Impl rule__XReturnExpression__Group__1 )
+            // InternalCheckCfg.g:15715:2: rule__XReturnExpression__Group__0__Impl rule__XReturnExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XReturnExpression__Group__0__Impl_in_rule__XReturnExpression__Group__031726);
+            pushFollow(FOLLOW_94);
             rule__XReturnExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XReturnExpression__Group__1_in_rule__XReturnExpression__Group__031729);
+            pushFollow(FOLLOW_2);
             rule__XReturnExpression__Group__1();
 
             state._fsp--;
@@ -45285,23 +45285,23 @@ public final void rule__XReturnExpression__Group__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XReturnExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15722:1: rule__XReturnExpression__Group__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:15722:1: rule__XReturnExpression__Group__0__Impl : ( () ) ;
     public final void rule__XReturnExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15726:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15727:1: ( () )
+            // InternalCheckCfg.g:15726:1: ( ( () ) )
+            // InternalCheckCfg.g:15727:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15727:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15728:1: ()
+            // InternalCheckCfg.g:15727:1: ( () )
+            // InternalCheckCfg.g:15728:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXReturnExpressionAccess().getXReturnExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15729:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15731:1: 
+            // InternalCheckCfg.g:15729:1: ()
+            // InternalCheckCfg.g:15731:1: 
             {
             }
 
@@ -45326,21 +45326,21 @@ public final void rule__XReturnExpression__Group__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XReturnExpression__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15741:1: rule__XReturnExpression__Group__1 : rule__XReturnExpression__Group__1__Impl rule__XReturnExpression__Group__2 ;
+    // InternalCheckCfg.g:15741:1: rule__XReturnExpression__Group__1 : rule__XReturnExpression__Group__1__Impl rule__XReturnExpression__Group__2 ;
     public final void rule__XReturnExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15745:1: ( rule__XReturnExpression__Group__1__Impl rule__XReturnExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15746:2: rule__XReturnExpression__Group__1__Impl rule__XReturnExpression__Group__2
+            // InternalCheckCfg.g:15745:1: ( rule__XReturnExpression__Group__1__Impl rule__XReturnExpression__Group__2 )
+            // InternalCheckCfg.g:15746:2: rule__XReturnExpression__Group__1__Impl rule__XReturnExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XReturnExpression__Group__1__Impl_in_rule__XReturnExpression__Group__131787);
+            pushFollow(FOLLOW_61);
             rule__XReturnExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XReturnExpression__Group__2_in_rule__XReturnExpression__Group__131790);
+            pushFollow(FOLLOW_2);
             rule__XReturnExpression__Group__2();
 
             state._fsp--;
@@ -45364,22 +45364,22 @@ public final void rule__XReturnExpression__Group__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XReturnExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15753:1: rule__XReturnExpression__Group__1__Impl : ( 'return' ) ;
+    // InternalCheckCfg.g:15753:1: rule__XReturnExpression__Group__1__Impl : ( 'return' ) ;
     public final void rule__XReturnExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15757:1: ( ( 'return' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15758:1: ( 'return' )
+            // InternalCheckCfg.g:15757:1: ( ( 'return' ) )
+            // InternalCheckCfg.g:15758:1: ( 'return' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15758:1: ( 'return' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15759:1: 'return'
+            // InternalCheckCfg.g:15758:1: ( 'return' )
+            // InternalCheckCfg.g:15759:1: 'return'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXReturnExpressionAccess().getReturnKeyword_1()); 
             }
-            match(input,82,FOLLOW_82_in_rule__XReturnExpression__Group__1__Impl31818); if (state.failed) return ;
+            match(input,82,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXReturnExpressionAccess().getReturnKeyword_1()); 
             }
@@ -45405,16 +45405,16 @@ public final void rule__XReturnExpression__Group__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XReturnExpression__Group__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15772:1: rule__XReturnExpression__Group__2 : rule__XReturnExpression__Group__2__Impl ;
+    // InternalCheckCfg.g:15772:1: rule__XReturnExpression__Group__2 : rule__XReturnExpression__Group__2__Impl ;
     public final void rule__XReturnExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15776:1: ( rule__XReturnExpression__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15777:2: rule__XReturnExpression__Group__2__Impl
+            // InternalCheckCfg.g:15776:1: ( rule__XReturnExpression__Group__2__Impl )
+            // InternalCheckCfg.g:15777:2: rule__XReturnExpression__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__XReturnExpression__Group__2__Impl_in_rule__XReturnExpression__Group__231849);
+            pushFollow(FOLLOW_2);
             rule__XReturnExpression__Group__2__Impl();
 
             state._fsp--;
@@ -45438,29 +45438,29 @@ public final void rule__XReturnExpression__Group__2() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XReturnExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15783:1: rule__XReturnExpression__Group__2__Impl : ( ( rule__XReturnExpression__ExpressionAssignment_2 )? ) ;
+    // InternalCheckCfg.g:15783:1: rule__XReturnExpression__Group__2__Impl : ( ( rule__XReturnExpression__ExpressionAssignment_2 )? ) ;
     public final void rule__XReturnExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15787:1: ( ( ( rule__XReturnExpression__ExpressionAssignment_2 )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15788:1: ( ( rule__XReturnExpression__ExpressionAssignment_2 )? )
+            // InternalCheckCfg.g:15787:1: ( ( ( rule__XReturnExpression__ExpressionAssignment_2 )? ) )
+            // InternalCheckCfg.g:15788:1: ( ( rule__XReturnExpression__ExpressionAssignment_2 )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15788:1: ( ( rule__XReturnExpression__ExpressionAssignment_2 )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15789:1: ( rule__XReturnExpression__ExpressionAssignment_2 )?
+            // InternalCheckCfg.g:15788:1: ( ( rule__XReturnExpression__ExpressionAssignment_2 )? )
+            // InternalCheckCfg.g:15789:1: ( rule__XReturnExpression__ExpressionAssignment_2 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXReturnExpressionAccess().getExpressionAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15790:1: ( rule__XReturnExpression__ExpressionAssignment_2 )?
+            // InternalCheckCfg.g:15790:1: ( rule__XReturnExpression__ExpressionAssignment_2 )?
             int alt114=2;
             alt114 = dfa114.predict(input);
             switch (alt114) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15790:2: rule__XReturnExpression__ExpressionAssignment_2
+                    // InternalCheckCfg.g:15790:2: rule__XReturnExpression__ExpressionAssignment_2
                     {
-                    pushFollow(FOLLOW_rule__XReturnExpression__ExpressionAssignment_2_in_rule__XReturnExpression__Group__2__Impl31876);
+                    pushFollow(FOLLOW_2);
                     rule__XReturnExpression__ExpressionAssignment_2();
 
                     state._fsp--;
@@ -45496,21 +45496,21 @@ public final void rule__XReturnExpression__Group__2__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15806:1: rule__XTryCatchFinallyExpression__Group__0 : rule__XTryCatchFinallyExpression__Group__0__Impl rule__XTryCatchFinallyExpression__Group__1 ;
+    // InternalCheckCfg.g:15806:1: rule__XTryCatchFinallyExpression__Group__0 : rule__XTryCatchFinallyExpression__Group__0__Impl rule__XTryCatchFinallyExpression__Group__1 ;
     public final void rule__XTryCatchFinallyExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15810:1: ( rule__XTryCatchFinallyExpression__Group__0__Impl rule__XTryCatchFinallyExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15811:2: rule__XTryCatchFinallyExpression__Group__0__Impl rule__XTryCatchFinallyExpression__Group__1
+            // InternalCheckCfg.g:15810:1: ( rule__XTryCatchFinallyExpression__Group__0__Impl rule__XTryCatchFinallyExpression__Group__1 )
+            // InternalCheckCfg.g:15811:2: rule__XTryCatchFinallyExpression__Group__0__Impl rule__XTryCatchFinallyExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group__0__Impl_in_rule__XTryCatchFinallyExpression__Group__031913);
+            pushFollow(FOLLOW_95);
             rule__XTryCatchFinallyExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group__1_in_rule__XTryCatchFinallyExpression__Group__031916);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Group__1();
 
             state._fsp--;
@@ -45534,23 +45534,23 @@ public final void rule__XTryCatchFinallyExpression__Group__0() throws Recognitio
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15818:1: rule__XTryCatchFinallyExpression__Group__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:15818:1: rule__XTryCatchFinallyExpression__Group__0__Impl : ( () ) ;
     public final void rule__XTryCatchFinallyExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15822:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15823:1: ( () )
+            // InternalCheckCfg.g:15822:1: ( ( () ) )
+            // InternalCheckCfg.g:15823:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15823:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15824:1: ()
+            // InternalCheckCfg.g:15823:1: ( () )
+            // InternalCheckCfg.g:15824:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getXTryCatchFinallyExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15825:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15827:1: 
+            // InternalCheckCfg.g:15825:1: ()
+            // InternalCheckCfg.g:15827:1: 
             {
             }
 
@@ -45575,21 +45575,21 @@ public final void rule__XTryCatchFinallyExpression__Group__0__Impl() throws Reco
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15837:1: rule__XTryCatchFinallyExpression__Group__1 : rule__XTryCatchFinallyExpression__Group__1__Impl rule__XTryCatchFinallyExpression__Group__2 ;
+    // InternalCheckCfg.g:15837:1: rule__XTryCatchFinallyExpression__Group__1 : rule__XTryCatchFinallyExpression__Group__1__Impl rule__XTryCatchFinallyExpression__Group__2 ;
     public final void rule__XTryCatchFinallyExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15841:1: ( rule__XTryCatchFinallyExpression__Group__1__Impl rule__XTryCatchFinallyExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15842:2: rule__XTryCatchFinallyExpression__Group__1__Impl rule__XTryCatchFinallyExpression__Group__2
+            // InternalCheckCfg.g:15841:1: ( rule__XTryCatchFinallyExpression__Group__1__Impl rule__XTryCatchFinallyExpression__Group__2 )
+            // InternalCheckCfg.g:15842:2: rule__XTryCatchFinallyExpression__Group__1__Impl rule__XTryCatchFinallyExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group__1__Impl_in_rule__XTryCatchFinallyExpression__Group__131974);
+            pushFollow(FOLLOW_61);
             rule__XTryCatchFinallyExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group__2_in_rule__XTryCatchFinallyExpression__Group__131977);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Group__2();
 
             state._fsp--;
@@ -45613,22 +45613,22 @@ public final void rule__XTryCatchFinallyExpression__Group__1() throws Recognitio
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15849:1: rule__XTryCatchFinallyExpression__Group__1__Impl : ( 'try' ) ;
+    // InternalCheckCfg.g:15849:1: rule__XTryCatchFinallyExpression__Group__1__Impl : ( 'try' ) ;
     public final void rule__XTryCatchFinallyExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15853:1: ( ( 'try' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15854:1: ( 'try' )
+            // InternalCheckCfg.g:15853:1: ( ( 'try' ) )
+            // InternalCheckCfg.g:15854:1: ( 'try' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15854:1: ( 'try' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15855:1: 'try'
+            // InternalCheckCfg.g:15854:1: ( 'try' )
+            // InternalCheckCfg.g:15855:1: 'try'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getTryKeyword_1()); 
             }
-            match(input,83,FOLLOW_83_in_rule__XTryCatchFinallyExpression__Group__1__Impl32005); if (state.failed) return ;
+            match(input,83,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXTryCatchFinallyExpressionAccess().getTryKeyword_1()); 
             }
@@ -45654,21 +45654,21 @@ public final void rule__XTryCatchFinallyExpression__Group__1__Impl() throws Reco
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15868:1: rule__XTryCatchFinallyExpression__Group__2 : rule__XTryCatchFinallyExpression__Group__2__Impl rule__XTryCatchFinallyExpression__Group__3 ;
+    // InternalCheckCfg.g:15868:1: rule__XTryCatchFinallyExpression__Group__2 : rule__XTryCatchFinallyExpression__Group__2__Impl rule__XTryCatchFinallyExpression__Group__3 ;
     public final void rule__XTryCatchFinallyExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15872:1: ( rule__XTryCatchFinallyExpression__Group__2__Impl rule__XTryCatchFinallyExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15873:2: rule__XTryCatchFinallyExpression__Group__2__Impl rule__XTryCatchFinallyExpression__Group__3
+            // InternalCheckCfg.g:15872:1: ( rule__XTryCatchFinallyExpression__Group__2__Impl rule__XTryCatchFinallyExpression__Group__3 )
+            // InternalCheckCfg.g:15873:2: rule__XTryCatchFinallyExpression__Group__2__Impl rule__XTryCatchFinallyExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group__2__Impl_in_rule__XTryCatchFinallyExpression__Group__232036);
+            pushFollow(FOLLOW_96);
             rule__XTryCatchFinallyExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group__3_in_rule__XTryCatchFinallyExpression__Group__232039);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Group__3();
 
             state._fsp--;
@@ -45692,25 +45692,25 @@ public final void rule__XTryCatchFinallyExpression__Group__2() throws Recognitio
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15880:1: rule__XTryCatchFinallyExpression__Group__2__Impl : ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) ) ;
+    // InternalCheckCfg.g:15880:1: rule__XTryCatchFinallyExpression__Group__2__Impl : ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) ) ;
     public final void rule__XTryCatchFinallyExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15884:1: ( ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15885:1: ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) )
+            // InternalCheckCfg.g:15884:1: ( ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) ) )
+            // InternalCheckCfg.g:15885:1: ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15885:1: ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15886:1: ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 )
+            // InternalCheckCfg.g:15885:1: ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) )
+            // InternalCheckCfg.g:15886:1: ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getExpressionAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15887:1: ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15887:2: rule__XTryCatchFinallyExpression__ExpressionAssignment_2
+            // InternalCheckCfg.g:15887:1: ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 )
+            // InternalCheckCfg.g:15887:2: rule__XTryCatchFinallyExpression__ExpressionAssignment_2
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__ExpressionAssignment_2_in_rule__XTryCatchFinallyExpression__Group__2__Impl32066);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__ExpressionAssignment_2();
 
             state._fsp--;
@@ -45743,16 +45743,16 @@ public final void rule__XTryCatchFinallyExpression__Group__2__Impl() throws Reco
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15897:1: rule__XTryCatchFinallyExpression__Group__3 : rule__XTryCatchFinallyExpression__Group__3__Impl ;
+    // InternalCheckCfg.g:15897:1: rule__XTryCatchFinallyExpression__Group__3 : rule__XTryCatchFinallyExpression__Group__3__Impl ;
     public final void rule__XTryCatchFinallyExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15901:1: ( rule__XTryCatchFinallyExpression__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15902:2: rule__XTryCatchFinallyExpression__Group__3__Impl
+            // InternalCheckCfg.g:15901:1: ( rule__XTryCatchFinallyExpression__Group__3__Impl )
+            // InternalCheckCfg.g:15902:2: rule__XTryCatchFinallyExpression__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group__3__Impl_in_rule__XTryCatchFinallyExpression__Group__332096);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Group__3__Impl();
 
             state._fsp--;
@@ -45776,25 +45776,25 @@ public final void rule__XTryCatchFinallyExpression__Group__3() throws Recognitio
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15908:1: rule__XTryCatchFinallyExpression__Group__3__Impl : ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) ) ;
+    // InternalCheckCfg.g:15908:1: rule__XTryCatchFinallyExpression__Group__3__Impl : ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) ) ;
     public final void rule__XTryCatchFinallyExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15912:1: ( ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15913:1: ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) )
+            // InternalCheckCfg.g:15912:1: ( ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) ) )
+            // InternalCheckCfg.g:15913:1: ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15913:1: ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15914:1: ( rule__XTryCatchFinallyExpression__Alternatives_3 )
+            // InternalCheckCfg.g:15913:1: ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) )
+            // InternalCheckCfg.g:15914:1: ( rule__XTryCatchFinallyExpression__Alternatives_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getAlternatives_3()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15915:1: ( rule__XTryCatchFinallyExpression__Alternatives_3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15915:2: rule__XTryCatchFinallyExpression__Alternatives_3
+            // InternalCheckCfg.g:15915:1: ( rule__XTryCatchFinallyExpression__Alternatives_3 )
+            // InternalCheckCfg.g:15915:2: rule__XTryCatchFinallyExpression__Alternatives_3
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Alternatives_3_in_rule__XTryCatchFinallyExpression__Group__3__Impl32123);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Alternatives_3();
 
             state._fsp--;
@@ -45827,21 +45827,21 @@ public final void rule__XTryCatchFinallyExpression__Group__3__Impl() throws Reco
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15933:1: rule__XTryCatchFinallyExpression__Group_3_0__0 : rule__XTryCatchFinallyExpression__Group_3_0__0__Impl rule__XTryCatchFinallyExpression__Group_3_0__1 ;
+    // InternalCheckCfg.g:15933:1: rule__XTryCatchFinallyExpression__Group_3_0__0 : rule__XTryCatchFinallyExpression__Group_3_0__0__Impl rule__XTryCatchFinallyExpression__Group_3_0__1 ;
     public final void rule__XTryCatchFinallyExpression__Group_3_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15937:1: ( rule__XTryCatchFinallyExpression__Group_3_0__0__Impl rule__XTryCatchFinallyExpression__Group_3_0__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15938:2: rule__XTryCatchFinallyExpression__Group_3_0__0__Impl rule__XTryCatchFinallyExpression__Group_3_0__1
+            // InternalCheckCfg.g:15937:1: ( rule__XTryCatchFinallyExpression__Group_3_0__0__Impl rule__XTryCatchFinallyExpression__Group_3_0__1 )
+            // InternalCheckCfg.g:15938:2: rule__XTryCatchFinallyExpression__Group_3_0__0__Impl rule__XTryCatchFinallyExpression__Group_3_0__1
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0__0__Impl_in_rule__XTryCatchFinallyExpression__Group_3_0__032161);
+            pushFollow(FOLLOW_97);
             rule__XTryCatchFinallyExpression__Group_3_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0__1_in_rule__XTryCatchFinallyExpression__Group_3_0__032164);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Group_3_0__1();
 
             state._fsp--;
@@ -45865,28 +45865,28 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0__0() throws Recogn
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15945:1: rule__XTryCatchFinallyExpression__Group_3_0__0__Impl : ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) ) ;
+    // InternalCheckCfg.g:15945:1: rule__XTryCatchFinallyExpression__Group_3_0__0__Impl : ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) ) ;
     public final void rule__XTryCatchFinallyExpression__Group_3_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15949:1: ( ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15950:1: ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) )
+            // InternalCheckCfg.g:15949:1: ( ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) ) )
+            // InternalCheckCfg.g:15950:1: ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15950:1: ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15951:1: ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* )
+            // InternalCheckCfg.g:15950:1: ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) )
+            // InternalCheckCfg.g:15951:1: ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15951:1: ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15952:1: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )
+            // InternalCheckCfg.g:15951:1: ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) )
+            // InternalCheckCfg.g:15952:1: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getCatchClausesAssignment_3_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15953:1: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15953:2: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0
+            // InternalCheckCfg.g:15953:1: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )
+            // InternalCheckCfg.g:15953:2: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0_in_rule__XTryCatchFinallyExpression__Group_3_0__0__Impl32193);
+            pushFollow(FOLLOW_98);
             rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0();
 
             state._fsp--;
@@ -45900,13 +45900,13 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0__0__Impl() throws
 
             }
 
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15956:1: ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15957:1: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )*
+            // InternalCheckCfg.g:15956:1: ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* )
+            // InternalCheckCfg.g:15957:1: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getCatchClausesAssignment_3_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15958:1: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )*
+            // InternalCheckCfg.g:15958:1: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )*
             loop115:
             do {
                 int alt115=2;
@@ -45925,9 +45925,9 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0__0__Impl() throws
 
                 switch (alt115) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15958:2: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0
+            	    // InternalCheckCfg.g:15958:2: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0
             	    {
-            	    pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0_in_rule__XTryCatchFinallyExpression__Group_3_0__0__Impl32205);
+            	    pushFollow(FOLLOW_98);
             	    rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0();
 
             	    state._fsp--;
@@ -45969,16 +45969,16 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0__0__Impl() throws
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15969:1: rule__XTryCatchFinallyExpression__Group_3_0__1 : rule__XTryCatchFinallyExpression__Group_3_0__1__Impl ;
+    // InternalCheckCfg.g:15969:1: rule__XTryCatchFinallyExpression__Group_3_0__1 : rule__XTryCatchFinallyExpression__Group_3_0__1__Impl ;
     public final void rule__XTryCatchFinallyExpression__Group_3_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15973:1: ( rule__XTryCatchFinallyExpression__Group_3_0__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15974:2: rule__XTryCatchFinallyExpression__Group_3_0__1__Impl
+            // InternalCheckCfg.g:15973:1: ( rule__XTryCatchFinallyExpression__Group_3_0__1__Impl )
+            // InternalCheckCfg.g:15974:2: rule__XTryCatchFinallyExpression__Group_3_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0__1__Impl_in_rule__XTryCatchFinallyExpression__Group_3_0__132238);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Group_3_0__1__Impl();
 
             state._fsp--;
@@ -46002,22 +46002,22 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0__1() throws Recogn
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15980:1: rule__XTryCatchFinallyExpression__Group_3_0__1__Impl : ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? ) ;
+    // InternalCheckCfg.g:15980:1: rule__XTryCatchFinallyExpression__Group_3_0__1__Impl : ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? ) ;
     public final void rule__XTryCatchFinallyExpression__Group_3_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15984:1: ( ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15985:1: ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? )
+            // InternalCheckCfg.g:15984:1: ( ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? ) )
+            // InternalCheckCfg.g:15985:1: ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15985:1: ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15986:1: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )?
+            // InternalCheckCfg.g:15985:1: ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? )
+            // InternalCheckCfg.g:15986:1: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getGroup_3_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15987:1: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )?
+            // InternalCheckCfg.g:15987:1: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )?
             int alt116=2;
             int LA116_0 = input.LA(1);
 
@@ -46030,9 +46030,9 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0__1__Impl() throws
             }
             switch (alt116) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15987:2: rule__XTryCatchFinallyExpression__Group_3_0_1__0
+                    // InternalCheckCfg.g:15987:2: rule__XTryCatchFinallyExpression__Group_3_0_1__0
                     {
-                    pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__0_in_rule__XTryCatchFinallyExpression__Group_3_0__1__Impl32265);
+                    pushFollow(FOLLOW_2);
                     rule__XTryCatchFinallyExpression__Group_3_0_1__0();
 
                     state._fsp--;
@@ -46068,21 +46068,21 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0__1__Impl() throws
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0_1__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16001:1: rule__XTryCatchFinallyExpression__Group_3_0_1__0 : rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_0_1__1 ;
+    // InternalCheckCfg.g:16001:1: rule__XTryCatchFinallyExpression__Group_3_0_1__0 : rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_0_1__1 ;
     public final void rule__XTryCatchFinallyExpression__Group_3_0_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16005:1: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_0_1__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16006:2: rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_0_1__1
+            // InternalCheckCfg.g:16005:1: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_0_1__1 )
+            // InternalCheckCfg.g:16006:2: rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_0_1__1
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl_in_rule__XTryCatchFinallyExpression__Group_3_0_1__032300);
+            pushFollow(FOLLOW_61);
             rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__1_in_rule__XTryCatchFinallyExpression__Group_3_0_1__032303);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Group_3_0_1__1();
 
             state._fsp--;
@@ -46106,25 +46106,25 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0_1__0() throws Reco
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16013:1: rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl : ( ( 'finally' ) ) ;
+    // InternalCheckCfg.g:16013:1: rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl : ( ( 'finally' ) ) ;
     public final void rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16017:1: ( ( ( 'finally' ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16018:1: ( ( 'finally' ) )
+            // InternalCheckCfg.g:16017:1: ( ( ( 'finally' ) ) )
+            // InternalCheckCfg.g:16018:1: ( ( 'finally' ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16018:1: ( ( 'finally' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16019:1: ( 'finally' )
+            // InternalCheckCfg.g:16018:1: ( ( 'finally' ) )
+            // InternalCheckCfg.g:16019:1: ( 'finally' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyKeyword_3_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16020:1: ( 'finally' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16021:2: 'finally'
+            // InternalCheckCfg.g:16020:1: ( 'finally' )
+            // InternalCheckCfg.g:16021:2: 'finally'
             {
-            match(input,84,FOLLOW_84_in_rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl32332); if (state.failed) return ;
+            match(input,84,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -46153,16 +46153,16 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl() throw
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0_1__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16032:1: rule__XTryCatchFinallyExpression__Group_3_0_1__1 : rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl ;
+    // InternalCheckCfg.g:16032:1: rule__XTryCatchFinallyExpression__Group_3_0_1__1 : rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl ;
     public final void rule__XTryCatchFinallyExpression__Group_3_0_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16036:1: ( rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16037:2: rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl
+            // InternalCheckCfg.g:16036:1: ( rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl )
+            // InternalCheckCfg.g:16037:2: rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl_in_rule__XTryCatchFinallyExpression__Group_3_0_1__132364);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl();
 
             state._fsp--;
@@ -46186,25 +46186,25 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0_1__1() throws Reco
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16043:1: rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl : ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) ) ;
+    // InternalCheckCfg.g:16043:1: rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl : ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) ) ;
     public final void rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16047:1: ( ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16048:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) )
+            // InternalCheckCfg.g:16047:1: ( ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) ) )
+            // InternalCheckCfg.g:16048:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16048:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16049:1: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 )
+            // InternalCheckCfg.g:16048:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) )
+            // InternalCheckCfg.g:16049:1: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyExpressionAssignment_3_0_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16050:1: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16050:2: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1
+            // InternalCheckCfg.g:16050:1: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 )
+            // InternalCheckCfg.g:16050:2: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1_in_rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl32391);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1();
 
             state._fsp--;
@@ -46237,21 +46237,21 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl() throw
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_1__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16064:1: rule__XTryCatchFinallyExpression__Group_3_1__0 : rule__XTryCatchFinallyExpression__Group_3_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_1__1 ;
+    // InternalCheckCfg.g:16064:1: rule__XTryCatchFinallyExpression__Group_3_1__0 : rule__XTryCatchFinallyExpression__Group_3_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_1__1 ;
     public final void rule__XTryCatchFinallyExpression__Group_3_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16068:1: ( rule__XTryCatchFinallyExpression__Group_3_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_1__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16069:2: rule__XTryCatchFinallyExpression__Group_3_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_1__1
+            // InternalCheckCfg.g:16068:1: ( rule__XTryCatchFinallyExpression__Group_3_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_1__1 )
+            // InternalCheckCfg.g:16069:2: rule__XTryCatchFinallyExpression__Group_3_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_1__1
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_1__0__Impl_in_rule__XTryCatchFinallyExpression__Group_3_1__032425);
+            pushFollow(FOLLOW_61);
             rule__XTryCatchFinallyExpression__Group_3_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_1__1_in_rule__XTryCatchFinallyExpression__Group_3_1__032428);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Group_3_1__1();
 
             state._fsp--;
@@ -46275,22 +46275,22 @@ public final void rule__XTryCatchFinallyExpression__Group_3_1__0() throws Recogn
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_1__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16076:1: rule__XTryCatchFinallyExpression__Group_3_1__0__Impl : ( 'finally' ) ;
+    // InternalCheckCfg.g:16076:1: rule__XTryCatchFinallyExpression__Group_3_1__0__Impl : ( 'finally' ) ;
     public final void rule__XTryCatchFinallyExpression__Group_3_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16080:1: ( ( 'finally' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16081:1: ( 'finally' )
+            // InternalCheckCfg.g:16080:1: ( ( 'finally' ) )
+            // InternalCheckCfg.g:16081:1: ( 'finally' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16081:1: ( 'finally' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16082:1: 'finally'
+            // InternalCheckCfg.g:16081:1: ( 'finally' )
+            // InternalCheckCfg.g:16082:1: 'finally'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyKeyword_3_1_0()); 
             }
-            match(input,84,FOLLOW_84_in_rule__XTryCatchFinallyExpression__Group_3_1__0__Impl32456); if (state.failed) return ;
+            match(input,84,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyKeyword_3_1_0()); 
             }
@@ -46316,16 +46316,16 @@ public final void rule__XTryCatchFinallyExpression__Group_3_1__0__Impl() throws
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_1__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16095:1: rule__XTryCatchFinallyExpression__Group_3_1__1 : rule__XTryCatchFinallyExpression__Group_3_1__1__Impl ;
+    // InternalCheckCfg.g:16095:1: rule__XTryCatchFinallyExpression__Group_3_1__1 : rule__XTryCatchFinallyExpression__Group_3_1__1__Impl ;
     public final void rule__XTryCatchFinallyExpression__Group_3_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16099:1: ( rule__XTryCatchFinallyExpression__Group_3_1__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16100:2: rule__XTryCatchFinallyExpression__Group_3_1__1__Impl
+            // InternalCheckCfg.g:16099:1: ( rule__XTryCatchFinallyExpression__Group_3_1__1__Impl )
+            // InternalCheckCfg.g:16100:2: rule__XTryCatchFinallyExpression__Group_3_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_1__1__Impl_in_rule__XTryCatchFinallyExpression__Group_3_1__132487);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Group_3_1__1__Impl();
 
             state._fsp--;
@@ -46349,25 +46349,25 @@ public final void rule__XTryCatchFinallyExpression__Group_3_1__1() throws Recogn
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_1__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16106:1: rule__XTryCatchFinallyExpression__Group_3_1__1__Impl : ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) ) ;
+    // InternalCheckCfg.g:16106:1: rule__XTryCatchFinallyExpression__Group_3_1__1__Impl : ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) ) ;
     public final void rule__XTryCatchFinallyExpression__Group_3_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16110:1: ( ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16111:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) )
+            // InternalCheckCfg.g:16110:1: ( ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) ) )
+            // InternalCheckCfg.g:16111:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16111:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16112:1: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 )
+            // InternalCheckCfg.g:16111:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) )
+            // InternalCheckCfg.g:16112:1: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyExpressionAssignment_3_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16113:1: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16113:2: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1
+            // InternalCheckCfg.g:16113:1: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 )
+            // InternalCheckCfg.g:16113:2: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1_in_rule__XTryCatchFinallyExpression__Group_3_1__1__Impl32514);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1();
 
             state._fsp--;
@@ -46400,21 +46400,21 @@ public final void rule__XTryCatchFinallyExpression__Group_3_1__1__Impl() throws
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16127:1: rule__XSynchronizedExpression__Group__0 : rule__XSynchronizedExpression__Group__0__Impl rule__XSynchronizedExpression__Group__1 ;
+    // InternalCheckCfg.g:16127:1: rule__XSynchronizedExpression__Group__0 : rule__XSynchronizedExpression__Group__0__Impl rule__XSynchronizedExpression__Group__1 ;
     public final void rule__XSynchronizedExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16131:1: ( rule__XSynchronizedExpression__Group__0__Impl rule__XSynchronizedExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16132:2: rule__XSynchronizedExpression__Group__0__Impl rule__XSynchronizedExpression__Group__1
+            // InternalCheckCfg.g:16131:1: ( rule__XSynchronizedExpression__Group__0__Impl rule__XSynchronizedExpression__Group__1 )
+            // InternalCheckCfg.g:16132:2: rule__XSynchronizedExpression__Group__0__Impl rule__XSynchronizedExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group__0__Impl_in_rule__XSynchronizedExpression__Group__032548);
+            pushFollow(FOLLOW_61);
             rule__XSynchronizedExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group__1_in_rule__XSynchronizedExpression__Group__032551);
+            pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group__1();
 
             state._fsp--;
@@ -46438,25 +46438,25 @@ public final void rule__XSynchronizedExpression__Group__0() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16139:1: rule__XSynchronizedExpression__Group__0__Impl : ( ( rule__XSynchronizedExpression__Group_0__0 ) ) ;
+    // InternalCheckCfg.g:16139:1: rule__XSynchronizedExpression__Group__0__Impl : ( ( rule__XSynchronizedExpression__Group_0__0 ) ) ;
     public final void rule__XSynchronizedExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16143:1: ( ( ( rule__XSynchronizedExpression__Group_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16144:1: ( ( rule__XSynchronizedExpression__Group_0__0 ) )
+            // InternalCheckCfg.g:16143:1: ( ( ( rule__XSynchronizedExpression__Group_0__0 ) ) )
+            // InternalCheckCfg.g:16144:1: ( ( rule__XSynchronizedExpression__Group_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16144:1: ( ( rule__XSynchronizedExpression__Group_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16145:1: ( rule__XSynchronizedExpression__Group_0__0 )
+            // InternalCheckCfg.g:16144:1: ( ( rule__XSynchronizedExpression__Group_0__0 ) )
+            // InternalCheckCfg.g:16145:1: ( rule__XSynchronizedExpression__Group_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getGroup_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16146:1: ( rule__XSynchronizedExpression__Group_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16146:2: rule__XSynchronizedExpression__Group_0__0
+            // InternalCheckCfg.g:16146:1: ( rule__XSynchronizedExpression__Group_0__0 )
+            // InternalCheckCfg.g:16146:2: rule__XSynchronizedExpression__Group_0__0
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group_0__0_in_rule__XSynchronizedExpression__Group__0__Impl32578);
+            pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group_0__0();
 
             state._fsp--;
@@ -46489,21 +46489,21 @@ public final void rule__XSynchronizedExpression__Group__0__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16156:1: rule__XSynchronizedExpression__Group__1 : rule__XSynchronizedExpression__Group__1__Impl rule__XSynchronizedExpression__Group__2 ;
+    // InternalCheckCfg.g:16156:1: rule__XSynchronizedExpression__Group__1 : rule__XSynchronizedExpression__Group__1__Impl rule__XSynchronizedExpression__Group__2 ;
     public final void rule__XSynchronizedExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16160:1: ( rule__XSynchronizedExpression__Group__1__Impl rule__XSynchronizedExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16161:2: rule__XSynchronizedExpression__Group__1__Impl rule__XSynchronizedExpression__Group__2
+            // InternalCheckCfg.g:16160:1: ( rule__XSynchronizedExpression__Group__1__Impl rule__XSynchronizedExpression__Group__2 )
+            // InternalCheckCfg.g:16161:2: rule__XSynchronizedExpression__Group__1__Impl rule__XSynchronizedExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group__1__Impl_in_rule__XSynchronizedExpression__Group__132608);
+            pushFollow(FOLLOW_70);
             rule__XSynchronizedExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group__2_in_rule__XSynchronizedExpression__Group__132611);
+            pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group__2();
 
             state._fsp--;
@@ -46527,25 +46527,25 @@ public final void rule__XSynchronizedExpression__Group__1() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16168:1: rule__XSynchronizedExpression__Group__1__Impl : ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) ) ;
+    // InternalCheckCfg.g:16168:1: rule__XSynchronizedExpression__Group__1__Impl : ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) ) ;
     public final void rule__XSynchronizedExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16172:1: ( ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16173:1: ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) )
+            // InternalCheckCfg.g:16172:1: ( ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) ) )
+            // InternalCheckCfg.g:16173:1: ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16173:1: ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16174:1: ( rule__XSynchronizedExpression__ParamAssignment_1 )
+            // InternalCheckCfg.g:16173:1: ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) )
+            // InternalCheckCfg.g:16174:1: ( rule__XSynchronizedExpression__ParamAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getParamAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16175:1: ( rule__XSynchronizedExpression__ParamAssignment_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16175:2: rule__XSynchronizedExpression__ParamAssignment_1
+            // InternalCheckCfg.g:16175:1: ( rule__XSynchronizedExpression__ParamAssignment_1 )
+            // InternalCheckCfg.g:16175:2: rule__XSynchronizedExpression__ParamAssignment_1
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__ParamAssignment_1_in_rule__XSynchronizedExpression__Group__1__Impl32638);
+            pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__ParamAssignment_1();
 
             state._fsp--;
@@ -46578,21 +46578,21 @@ public final void rule__XSynchronizedExpression__Group__1__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16185:1: rule__XSynchronizedExpression__Group__2 : rule__XSynchronizedExpression__Group__2__Impl rule__XSynchronizedExpression__Group__3 ;
+    // InternalCheckCfg.g:16185:1: rule__XSynchronizedExpression__Group__2 : rule__XSynchronizedExpression__Group__2__Impl rule__XSynchronizedExpression__Group__3 ;
     public final void rule__XSynchronizedExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16189:1: ( rule__XSynchronizedExpression__Group__2__Impl rule__XSynchronizedExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16190:2: rule__XSynchronizedExpression__Group__2__Impl rule__XSynchronizedExpression__Group__3
+            // InternalCheckCfg.g:16189:1: ( rule__XSynchronizedExpression__Group__2__Impl rule__XSynchronizedExpression__Group__3 )
+            // InternalCheckCfg.g:16190:2: rule__XSynchronizedExpression__Group__2__Impl rule__XSynchronizedExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group__2__Impl_in_rule__XSynchronizedExpression__Group__232668);
+            pushFollow(FOLLOW_61);
             rule__XSynchronizedExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group__3_in_rule__XSynchronizedExpression__Group__232671);
+            pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group__3();
 
             state._fsp--;
@@ -46616,22 +46616,22 @@ public final void rule__XSynchronizedExpression__Group__2() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16197:1: rule__XSynchronizedExpression__Group__2__Impl : ( ')' ) ;
+    // InternalCheckCfg.g:16197:1: rule__XSynchronizedExpression__Group__2__Impl : ( ')' ) ;
     public final void rule__XSynchronizedExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16201:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16202:1: ( ')' )
+            // InternalCheckCfg.g:16201:1: ( ( ')' ) )
+            // InternalCheckCfg.g:16202:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16202:1: ( ')' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16203:1: ')'
+            // InternalCheckCfg.g:16202:1: ( ')' )
+            // InternalCheckCfg.g:16203:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getRightParenthesisKeyword_2()); 
             }
-            match(input,63,FOLLOW_63_in_rule__XSynchronizedExpression__Group__2__Impl32699); if (state.failed) return ;
+            match(input,63,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSynchronizedExpressionAccess().getRightParenthesisKeyword_2()); 
             }
@@ -46657,16 +46657,16 @@ public final void rule__XSynchronizedExpression__Group__2__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16216:1: rule__XSynchronizedExpression__Group__3 : rule__XSynchronizedExpression__Group__3__Impl ;
+    // InternalCheckCfg.g:16216:1: rule__XSynchronizedExpression__Group__3 : rule__XSynchronizedExpression__Group__3__Impl ;
     public final void rule__XSynchronizedExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16220:1: ( rule__XSynchronizedExpression__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16221:2: rule__XSynchronizedExpression__Group__3__Impl
+            // InternalCheckCfg.g:16220:1: ( rule__XSynchronizedExpression__Group__3__Impl )
+            // InternalCheckCfg.g:16221:2: rule__XSynchronizedExpression__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group__3__Impl_in_rule__XSynchronizedExpression__Group__332730);
+            pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group__3__Impl();
 
             state._fsp--;
@@ -46690,25 +46690,25 @@ public final void rule__XSynchronizedExpression__Group__3() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16227:1: rule__XSynchronizedExpression__Group__3__Impl : ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) ) ;
+    // InternalCheckCfg.g:16227:1: rule__XSynchronizedExpression__Group__3__Impl : ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) ) ;
     public final void rule__XSynchronizedExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16231:1: ( ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16232:1: ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) )
+            // InternalCheckCfg.g:16231:1: ( ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) ) )
+            // InternalCheckCfg.g:16232:1: ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16232:1: ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16233:1: ( rule__XSynchronizedExpression__ExpressionAssignment_3 )
+            // InternalCheckCfg.g:16232:1: ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) )
+            // InternalCheckCfg.g:16233:1: ( rule__XSynchronizedExpression__ExpressionAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getExpressionAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16234:1: ( rule__XSynchronizedExpression__ExpressionAssignment_3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16234:2: rule__XSynchronizedExpression__ExpressionAssignment_3
+            // InternalCheckCfg.g:16234:1: ( rule__XSynchronizedExpression__ExpressionAssignment_3 )
+            // InternalCheckCfg.g:16234:2: rule__XSynchronizedExpression__ExpressionAssignment_3
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__ExpressionAssignment_3_in_rule__XSynchronizedExpression__Group__3__Impl32757);
+            pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__ExpressionAssignment_3();
 
             state._fsp--;
@@ -46741,16 +46741,16 @@ public final void rule__XSynchronizedExpression__Group__3__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16252:1: rule__XSynchronizedExpression__Group_0__0 : rule__XSynchronizedExpression__Group_0__0__Impl ;
+    // InternalCheckCfg.g:16252:1: rule__XSynchronizedExpression__Group_0__0 : rule__XSynchronizedExpression__Group_0__0__Impl ;
     public final void rule__XSynchronizedExpression__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16256:1: ( rule__XSynchronizedExpression__Group_0__0__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16257:2: rule__XSynchronizedExpression__Group_0__0__Impl
+            // InternalCheckCfg.g:16256:1: ( rule__XSynchronizedExpression__Group_0__0__Impl )
+            // InternalCheckCfg.g:16257:2: rule__XSynchronizedExpression__Group_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group_0__0__Impl_in_rule__XSynchronizedExpression__Group_0__032795);
+            pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group_0__0__Impl();
 
             state._fsp--;
@@ -46774,25 +46774,25 @@ public final void rule__XSynchronizedExpression__Group_0__0() throws Recognition
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16263:1: rule__XSynchronizedExpression__Group_0__0__Impl : ( ( rule__XSynchronizedExpression__Group_0_0__0 ) ) ;
+    // InternalCheckCfg.g:16263:1: rule__XSynchronizedExpression__Group_0__0__Impl : ( ( rule__XSynchronizedExpression__Group_0_0__0 ) ) ;
     public final void rule__XSynchronizedExpression__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16267:1: ( ( ( rule__XSynchronizedExpression__Group_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16268:1: ( ( rule__XSynchronizedExpression__Group_0_0__0 ) )
+            // InternalCheckCfg.g:16267:1: ( ( ( rule__XSynchronizedExpression__Group_0_0__0 ) ) )
+            // InternalCheckCfg.g:16268:1: ( ( rule__XSynchronizedExpression__Group_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16268:1: ( ( rule__XSynchronizedExpression__Group_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16269:1: ( rule__XSynchronizedExpression__Group_0_0__0 )
+            // InternalCheckCfg.g:16268:1: ( ( rule__XSynchronizedExpression__Group_0_0__0 ) )
+            // InternalCheckCfg.g:16269:1: ( rule__XSynchronizedExpression__Group_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getGroup_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16270:1: ( rule__XSynchronizedExpression__Group_0_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16270:2: rule__XSynchronizedExpression__Group_0_0__0
+            // InternalCheckCfg.g:16270:1: ( rule__XSynchronizedExpression__Group_0_0__0 )
+            // InternalCheckCfg.g:16270:2: rule__XSynchronizedExpression__Group_0_0__0
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group_0_0__0_in_rule__XSynchronizedExpression__Group_0__0__Impl32822);
+            pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group_0_0__0();
 
             state._fsp--;
@@ -46825,21 +46825,21 @@ public final void rule__XSynchronizedExpression__Group_0__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16282:1: rule__XSynchronizedExpression__Group_0_0__0 : rule__XSynchronizedExpression__Group_0_0__0__Impl rule__XSynchronizedExpression__Group_0_0__1 ;
+    // InternalCheckCfg.g:16282:1: rule__XSynchronizedExpression__Group_0_0__0 : rule__XSynchronizedExpression__Group_0_0__0__Impl rule__XSynchronizedExpression__Group_0_0__1 ;
     public final void rule__XSynchronizedExpression__Group_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16286:1: ( rule__XSynchronizedExpression__Group_0_0__0__Impl rule__XSynchronizedExpression__Group_0_0__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16287:2: rule__XSynchronizedExpression__Group_0_0__0__Impl rule__XSynchronizedExpression__Group_0_0__1
+            // InternalCheckCfg.g:16286:1: ( rule__XSynchronizedExpression__Group_0_0__0__Impl rule__XSynchronizedExpression__Group_0_0__1 )
+            // InternalCheckCfg.g:16287:2: rule__XSynchronizedExpression__Group_0_0__0__Impl rule__XSynchronizedExpression__Group_0_0__1
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group_0_0__0__Impl_in_rule__XSynchronizedExpression__Group_0_0__032854);
+            pushFollow(FOLLOW_99);
             rule__XSynchronizedExpression__Group_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group_0_0__1_in_rule__XSynchronizedExpression__Group_0_0__032857);
+            pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group_0_0__1();
 
             state._fsp--;
@@ -46863,23 +46863,23 @@ public final void rule__XSynchronizedExpression__Group_0_0__0() throws Recogniti
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16294:1: rule__XSynchronizedExpression__Group_0_0__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:16294:1: rule__XSynchronizedExpression__Group_0_0__0__Impl : ( () ) ;
     public final void rule__XSynchronizedExpression__Group_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16298:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16299:1: ( () )
+            // InternalCheckCfg.g:16298:1: ( ( () ) )
+            // InternalCheckCfg.g:16299:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16299:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16300:1: ()
+            // InternalCheckCfg.g:16299:1: ( () )
+            // InternalCheckCfg.g:16300:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getXSynchronizedExpressionAction_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16301:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16303:1: 
+            // InternalCheckCfg.g:16301:1: ()
+            // InternalCheckCfg.g:16303:1: 
             {
             }
 
@@ -46904,21 +46904,21 @@ public final void rule__XSynchronizedExpression__Group_0_0__0__Impl() throws Rec
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0_0__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16313:1: rule__XSynchronizedExpression__Group_0_0__1 : rule__XSynchronizedExpression__Group_0_0__1__Impl rule__XSynchronizedExpression__Group_0_0__2 ;
+    // InternalCheckCfg.g:16313:1: rule__XSynchronizedExpression__Group_0_0__1 : rule__XSynchronizedExpression__Group_0_0__1__Impl rule__XSynchronizedExpression__Group_0_0__2 ;
     public final void rule__XSynchronizedExpression__Group_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16317:1: ( rule__XSynchronizedExpression__Group_0_0__1__Impl rule__XSynchronizedExpression__Group_0_0__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16318:2: rule__XSynchronizedExpression__Group_0_0__1__Impl rule__XSynchronizedExpression__Group_0_0__2
+            // InternalCheckCfg.g:16317:1: ( rule__XSynchronizedExpression__Group_0_0__1__Impl rule__XSynchronizedExpression__Group_0_0__2 )
+            // InternalCheckCfg.g:16318:2: rule__XSynchronizedExpression__Group_0_0__1__Impl rule__XSynchronizedExpression__Group_0_0__2
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group_0_0__1__Impl_in_rule__XSynchronizedExpression__Group_0_0__132915);
+            pushFollow(FOLLOW_16);
             rule__XSynchronizedExpression__Group_0_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group_0_0__2_in_rule__XSynchronizedExpression__Group_0_0__132918);
+            pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group_0_0__2();
 
             state._fsp--;
@@ -46942,22 +46942,22 @@ public final void rule__XSynchronizedExpression__Group_0_0__1() throws Recogniti
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16325:1: rule__XSynchronizedExpression__Group_0_0__1__Impl : ( 'synchronized' ) ;
+    // InternalCheckCfg.g:16325:1: rule__XSynchronizedExpression__Group_0_0__1__Impl : ( 'synchronized' ) ;
     public final void rule__XSynchronizedExpression__Group_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16329:1: ( ( 'synchronized' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16330:1: ( 'synchronized' )
+            // InternalCheckCfg.g:16329:1: ( ( 'synchronized' ) )
+            // InternalCheckCfg.g:16330:1: ( 'synchronized' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16330:1: ( 'synchronized' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16331:1: 'synchronized'
+            // InternalCheckCfg.g:16330:1: ( 'synchronized' )
+            // InternalCheckCfg.g:16331:1: 'synchronized'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getSynchronizedKeyword_0_0_1()); 
             }
-            match(input,85,FOLLOW_85_in_rule__XSynchronizedExpression__Group_0_0__1__Impl32946); if (state.failed) return ;
+            match(input,85,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSynchronizedExpressionAccess().getSynchronizedKeyword_0_0_1()); 
             }
@@ -46983,16 +46983,16 @@ public final void rule__XSynchronizedExpression__Group_0_0__1__Impl() throws Rec
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0_0__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16344:1: rule__XSynchronizedExpression__Group_0_0__2 : rule__XSynchronizedExpression__Group_0_0__2__Impl ;
+    // InternalCheckCfg.g:16344:1: rule__XSynchronizedExpression__Group_0_0__2 : rule__XSynchronizedExpression__Group_0_0__2__Impl ;
     public final void rule__XSynchronizedExpression__Group_0_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16348:1: ( rule__XSynchronizedExpression__Group_0_0__2__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16349:2: rule__XSynchronizedExpression__Group_0_0__2__Impl
+            // InternalCheckCfg.g:16348:1: ( rule__XSynchronizedExpression__Group_0_0__2__Impl )
+            // InternalCheckCfg.g:16349:2: rule__XSynchronizedExpression__Group_0_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group_0_0__2__Impl_in_rule__XSynchronizedExpression__Group_0_0__232977);
+            pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group_0_0__2__Impl();
 
             state._fsp--;
@@ -47016,22 +47016,22 @@ public final void rule__XSynchronizedExpression__Group_0_0__2() throws Recogniti
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0_0__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16355:1: rule__XSynchronizedExpression__Group_0_0__2__Impl : ( '(' ) ;
+    // InternalCheckCfg.g:16355:1: rule__XSynchronizedExpression__Group_0_0__2__Impl : ( '(' ) ;
     public final void rule__XSynchronizedExpression__Group_0_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16359:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16360:1: ( '(' )
+            // InternalCheckCfg.g:16359:1: ( ( '(' ) )
+            // InternalCheckCfg.g:16360:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16360:1: ( '(' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16361:1: '('
+            // InternalCheckCfg.g:16360:1: ( '(' )
+            // InternalCheckCfg.g:16361:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getLeftParenthesisKeyword_0_0_2()); 
             }
-            match(input,62,FOLLOW_62_in_rule__XSynchronizedExpression__Group_0_0__2__Impl33005); if (state.failed) return ;
+            match(input,62,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSynchronizedExpressionAccess().getLeftParenthesisKeyword_0_0_2()); 
             }
@@ -47057,21 +47057,21 @@ public final void rule__XSynchronizedExpression__Group_0_0__2__Impl() throws Rec
 
 
     // $ANTLR start "rule__XCatchClause__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16380:1: rule__XCatchClause__Group__0 : rule__XCatchClause__Group__0__Impl rule__XCatchClause__Group__1 ;
+    // InternalCheckCfg.g:16380:1: rule__XCatchClause__Group__0 : rule__XCatchClause__Group__0__Impl rule__XCatchClause__Group__1 ;
     public final void rule__XCatchClause__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16384:1: ( rule__XCatchClause__Group__0__Impl rule__XCatchClause__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16385:2: rule__XCatchClause__Group__0__Impl rule__XCatchClause__Group__1
+            // InternalCheckCfg.g:16384:1: ( rule__XCatchClause__Group__0__Impl rule__XCatchClause__Group__1 )
+            // InternalCheckCfg.g:16385:2: rule__XCatchClause__Group__0__Impl rule__XCatchClause__Group__1
             {
-            pushFollow(FOLLOW_rule__XCatchClause__Group__0__Impl_in_rule__XCatchClause__Group__033042);
+            pushFollow(FOLLOW_16);
             rule__XCatchClause__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCatchClause__Group__1_in_rule__XCatchClause__Group__033045);
+            pushFollow(FOLLOW_2);
             rule__XCatchClause__Group__1();
 
             state._fsp--;
@@ -47095,25 +47095,25 @@ public final void rule__XCatchClause__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCatchClause__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16392:1: rule__XCatchClause__Group__0__Impl : ( ( 'catch' ) ) ;
+    // InternalCheckCfg.g:16392:1: rule__XCatchClause__Group__0__Impl : ( ( 'catch' ) ) ;
     public final void rule__XCatchClause__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16396:1: ( ( ( 'catch' ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16397:1: ( ( 'catch' ) )
+            // InternalCheckCfg.g:16396:1: ( ( ( 'catch' ) ) )
+            // InternalCheckCfg.g:16397:1: ( ( 'catch' ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16397:1: ( ( 'catch' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16398:1: ( 'catch' )
+            // InternalCheckCfg.g:16397:1: ( ( 'catch' ) )
+            // InternalCheckCfg.g:16398:1: ( 'catch' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getCatchKeyword_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16399:1: ( 'catch' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16400:2: 'catch'
+            // InternalCheckCfg.g:16399:1: ( 'catch' )
+            // InternalCheckCfg.g:16400:2: 'catch'
             {
-            match(input,86,FOLLOW_86_in_rule__XCatchClause__Group__0__Impl33074); if (state.failed) return ;
+            match(input,86,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -47142,21 +47142,21 @@ public final void rule__XCatchClause__Group__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XCatchClause__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16411:1: rule__XCatchClause__Group__1 : rule__XCatchClause__Group__1__Impl rule__XCatchClause__Group__2 ;
+    // InternalCheckCfg.g:16411:1: rule__XCatchClause__Group__1 : rule__XCatchClause__Group__1__Impl rule__XCatchClause__Group__2 ;
     public final void rule__XCatchClause__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16415:1: ( rule__XCatchClause__Group__1__Impl rule__XCatchClause__Group__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16416:2: rule__XCatchClause__Group__1__Impl rule__XCatchClause__Group__2
+            // InternalCheckCfg.g:16415:1: ( rule__XCatchClause__Group__1__Impl rule__XCatchClause__Group__2 )
+            // InternalCheckCfg.g:16416:2: rule__XCatchClause__Group__1__Impl rule__XCatchClause__Group__2
             {
-            pushFollow(FOLLOW_rule__XCatchClause__Group__1__Impl_in_rule__XCatchClause__Group__133106);
+            pushFollow(FOLLOW_39);
             rule__XCatchClause__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCatchClause__Group__2_in_rule__XCatchClause__Group__133109);
+            pushFollow(FOLLOW_2);
             rule__XCatchClause__Group__2();
 
             state._fsp--;
@@ -47180,22 +47180,22 @@ public final void rule__XCatchClause__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCatchClause__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16423:1: rule__XCatchClause__Group__1__Impl : ( '(' ) ;
+    // InternalCheckCfg.g:16423:1: rule__XCatchClause__Group__1__Impl : ( '(' ) ;
     public final void rule__XCatchClause__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16427:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16428:1: ( '(' )
+            // InternalCheckCfg.g:16427:1: ( ( '(' ) )
+            // InternalCheckCfg.g:16428:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16428:1: ( '(' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16429:1: '('
+            // InternalCheckCfg.g:16428:1: ( '(' )
+            // InternalCheckCfg.g:16429:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getLeftParenthesisKeyword_1()); 
             }
-            match(input,62,FOLLOW_62_in_rule__XCatchClause__Group__1__Impl33137); if (state.failed) return ;
+            match(input,62,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXCatchClauseAccess().getLeftParenthesisKeyword_1()); 
             }
@@ -47221,21 +47221,21 @@ public final void rule__XCatchClause__Group__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XCatchClause__Group__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16442:1: rule__XCatchClause__Group__2 : rule__XCatchClause__Group__2__Impl rule__XCatchClause__Group__3 ;
+    // InternalCheckCfg.g:16442:1: rule__XCatchClause__Group__2 : rule__XCatchClause__Group__2__Impl rule__XCatchClause__Group__3 ;
     public final void rule__XCatchClause__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16446:1: ( rule__XCatchClause__Group__2__Impl rule__XCatchClause__Group__3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16447:2: rule__XCatchClause__Group__2__Impl rule__XCatchClause__Group__3
+            // InternalCheckCfg.g:16446:1: ( rule__XCatchClause__Group__2__Impl rule__XCatchClause__Group__3 )
+            // InternalCheckCfg.g:16447:2: rule__XCatchClause__Group__2__Impl rule__XCatchClause__Group__3
             {
-            pushFollow(FOLLOW_rule__XCatchClause__Group__2__Impl_in_rule__XCatchClause__Group__233168);
+            pushFollow(FOLLOW_70);
             rule__XCatchClause__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCatchClause__Group__3_in_rule__XCatchClause__Group__233171);
+            pushFollow(FOLLOW_2);
             rule__XCatchClause__Group__3();
 
             state._fsp--;
@@ -47259,25 +47259,25 @@ public final void rule__XCatchClause__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCatchClause__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16454:1: rule__XCatchClause__Group__2__Impl : ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) ) ;
+    // InternalCheckCfg.g:16454:1: rule__XCatchClause__Group__2__Impl : ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) ) ;
     public final void rule__XCatchClause__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16458:1: ( ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16459:1: ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) )
+            // InternalCheckCfg.g:16458:1: ( ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) ) )
+            // InternalCheckCfg.g:16459:1: ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16459:1: ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16460:1: ( rule__XCatchClause__DeclaredParamAssignment_2 )
+            // InternalCheckCfg.g:16459:1: ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) )
+            // InternalCheckCfg.g:16460:1: ( rule__XCatchClause__DeclaredParamAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getDeclaredParamAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16461:1: ( rule__XCatchClause__DeclaredParamAssignment_2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16461:2: rule__XCatchClause__DeclaredParamAssignment_2
+            // InternalCheckCfg.g:16461:1: ( rule__XCatchClause__DeclaredParamAssignment_2 )
+            // InternalCheckCfg.g:16461:2: rule__XCatchClause__DeclaredParamAssignment_2
             {
-            pushFollow(FOLLOW_rule__XCatchClause__DeclaredParamAssignment_2_in_rule__XCatchClause__Group__2__Impl33198);
+            pushFollow(FOLLOW_2);
             rule__XCatchClause__DeclaredParamAssignment_2();
 
             state._fsp--;
@@ -47310,21 +47310,21 @@ public final void rule__XCatchClause__Group__2__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XCatchClause__Group__3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16471:1: rule__XCatchClause__Group__3 : rule__XCatchClause__Group__3__Impl rule__XCatchClause__Group__4 ;
+    // InternalCheckCfg.g:16471:1: rule__XCatchClause__Group__3 : rule__XCatchClause__Group__3__Impl rule__XCatchClause__Group__4 ;
     public final void rule__XCatchClause__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16475:1: ( rule__XCatchClause__Group__3__Impl rule__XCatchClause__Group__4 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16476:2: rule__XCatchClause__Group__3__Impl rule__XCatchClause__Group__4
+            // InternalCheckCfg.g:16475:1: ( rule__XCatchClause__Group__3__Impl rule__XCatchClause__Group__4 )
+            // InternalCheckCfg.g:16476:2: rule__XCatchClause__Group__3__Impl rule__XCatchClause__Group__4
             {
-            pushFollow(FOLLOW_rule__XCatchClause__Group__3__Impl_in_rule__XCatchClause__Group__333228);
+            pushFollow(FOLLOW_61);
             rule__XCatchClause__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCatchClause__Group__4_in_rule__XCatchClause__Group__333231);
+            pushFollow(FOLLOW_2);
             rule__XCatchClause__Group__4();
 
             state._fsp--;
@@ -47348,22 +47348,22 @@ public final void rule__XCatchClause__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCatchClause__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16483:1: rule__XCatchClause__Group__3__Impl : ( ')' ) ;
+    // InternalCheckCfg.g:16483:1: rule__XCatchClause__Group__3__Impl : ( ')' ) ;
     public final void rule__XCatchClause__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16487:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16488:1: ( ')' )
+            // InternalCheckCfg.g:16487:1: ( ( ')' ) )
+            // InternalCheckCfg.g:16488:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16488:1: ( ')' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16489:1: ')'
+            // InternalCheckCfg.g:16488:1: ( ')' )
+            // InternalCheckCfg.g:16489:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getRightParenthesisKeyword_3()); 
             }
-            match(input,63,FOLLOW_63_in_rule__XCatchClause__Group__3__Impl33259); if (state.failed) return ;
+            match(input,63,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXCatchClauseAccess().getRightParenthesisKeyword_3()); 
             }
@@ -47389,16 +47389,16 @@ public final void rule__XCatchClause__Group__3__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XCatchClause__Group__4"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16502:1: rule__XCatchClause__Group__4 : rule__XCatchClause__Group__4__Impl ;
+    // InternalCheckCfg.g:16502:1: rule__XCatchClause__Group__4 : rule__XCatchClause__Group__4__Impl ;
     public final void rule__XCatchClause__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16506:1: ( rule__XCatchClause__Group__4__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16507:2: rule__XCatchClause__Group__4__Impl
+            // InternalCheckCfg.g:16506:1: ( rule__XCatchClause__Group__4__Impl )
+            // InternalCheckCfg.g:16507:2: rule__XCatchClause__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__XCatchClause__Group__4__Impl_in_rule__XCatchClause__Group__433290);
+            pushFollow(FOLLOW_2);
             rule__XCatchClause__Group__4__Impl();
 
             state._fsp--;
@@ -47422,25 +47422,25 @@ public final void rule__XCatchClause__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCatchClause__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16513:1: rule__XCatchClause__Group__4__Impl : ( ( rule__XCatchClause__ExpressionAssignment_4 ) ) ;
+    // InternalCheckCfg.g:16513:1: rule__XCatchClause__Group__4__Impl : ( ( rule__XCatchClause__ExpressionAssignment_4 ) ) ;
     public final void rule__XCatchClause__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16517:1: ( ( ( rule__XCatchClause__ExpressionAssignment_4 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16518:1: ( ( rule__XCatchClause__ExpressionAssignment_4 ) )
+            // InternalCheckCfg.g:16517:1: ( ( ( rule__XCatchClause__ExpressionAssignment_4 ) ) )
+            // InternalCheckCfg.g:16518:1: ( ( rule__XCatchClause__ExpressionAssignment_4 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16518:1: ( ( rule__XCatchClause__ExpressionAssignment_4 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16519:1: ( rule__XCatchClause__ExpressionAssignment_4 )
+            // InternalCheckCfg.g:16518:1: ( ( rule__XCatchClause__ExpressionAssignment_4 ) )
+            // InternalCheckCfg.g:16519:1: ( rule__XCatchClause__ExpressionAssignment_4 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getExpressionAssignment_4()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16520:1: ( rule__XCatchClause__ExpressionAssignment_4 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16520:2: rule__XCatchClause__ExpressionAssignment_4
+            // InternalCheckCfg.g:16520:1: ( rule__XCatchClause__ExpressionAssignment_4 )
+            // InternalCheckCfg.g:16520:2: rule__XCatchClause__ExpressionAssignment_4
             {
-            pushFollow(FOLLOW_rule__XCatchClause__ExpressionAssignment_4_in_rule__XCatchClause__Group__4__Impl33317);
+            pushFollow(FOLLOW_2);
             rule__XCatchClause__ExpressionAssignment_4();
 
             state._fsp--;
@@ -47473,21 +47473,21 @@ public final void rule__XCatchClause__Group__4__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__QualifiedName__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16540:1: rule__QualifiedName__Group__0 : rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 ;
+    // InternalCheckCfg.g:16540:1: rule__QualifiedName__Group__0 : rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 ;
     public final void rule__QualifiedName__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16544:1: ( rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16545:2: rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1
+            // InternalCheckCfg.g:16544:1: ( rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 )
+            // InternalCheckCfg.g:16545:2: rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1
             {
-            pushFollow(FOLLOW_rule__QualifiedName__Group__0__Impl_in_rule__QualifiedName__Group__033357);
+            pushFollow(FOLLOW_100);
             rule__QualifiedName__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__QualifiedName__Group__1_in_rule__QualifiedName__Group__033360);
+            pushFollow(FOLLOW_2);
             rule__QualifiedName__Group__1();
 
             state._fsp--;
@@ -47511,22 +47511,22 @@ public final void rule__QualifiedName__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__QualifiedName__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16552:1: rule__QualifiedName__Group__0__Impl : ( ruleValidID ) ;
+    // InternalCheckCfg.g:16552:1: rule__QualifiedName__Group__0__Impl : ( ruleValidID ) ;
     public final void rule__QualifiedName__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16556:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16557:1: ( ruleValidID )
+            // InternalCheckCfg.g:16556:1: ( ( ruleValidID ) )
+            // InternalCheckCfg.g:16557:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16557:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16558:1: ruleValidID
+            // InternalCheckCfg.g:16557:1: ( ruleValidID )
+            // InternalCheckCfg.g:16558:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameAccess().getValidIDParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__QualifiedName__Group__0__Impl33387);
+            pushFollow(FOLLOW_2);
             ruleValidID();
 
             state._fsp--;
@@ -47556,16 +47556,16 @@ public final void rule__QualifiedName__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__QualifiedName__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16569:1: rule__QualifiedName__Group__1 : rule__QualifiedName__Group__1__Impl ;
+    // InternalCheckCfg.g:16569:1: rule__QualifiedName__Group__1 : rule__QualifiedName__Group__1__Impl ;
     public final void rule__QualifiedName__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16573:1: ( rule__QualifiedName__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16574:2: rule__QualifiedName__Group__1__Impl
+            // InternalCheckCfg.g:16573:1: ( rule__QualifiedName__Group__1__Impl )
+            // InternalCheckCfg.g:16574:2: rule__QualifiedName__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__QualifiedName__Group__1__Impl_in_rule__QualifiedName__Group__133416);
+            pushFollow(FOLLOW_2);
             rule__QualifiedName__Group__1__Impl();
 
             state._fsp--;
@@ -47589,22 +47589,22 @@ public final void rule__QualifiedName__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__QualifiedName__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16580:1: rule__QualifiedName__Group__1__Impl : ( ( rule__QualifiedName__Group_1__0 )* ) ;
+    // InternalCheckCfg.g:16580:1: rule__QualifiedName__Group__1__Impl : ( ( rule__QualifiedName__Group_1__0 )* ) ;
     public final void rule__QualifiedName__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16584:1: ( ( ( rule__QualifiedName__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16585:1: ( ( rule__QualifiedName__Group_1__0 )* )
+            // InternalCheckCfg.g:16584:1: ( ( ( rule__QualifiedName__Group_1__0 )* ) )
+            // InternalCheckCfg.g:16585:1: ( ( rule__QualifiedName__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16585:1: ( ( rule__QualifiedName__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16586:1: ( rule__QualifiedName__Group_1__0 )*
+            // InternalCheckCfg.g:16585:1: ( ( rule__QualifiedName__Group_1__0 )* )
+            // InternalCheckCfg.g:16586:1: ( rule__QualifiedName__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16587:1: ( rule__QualifiedName__Group_1__0 )*
+            // InternalCheckCfg.g:16587:1: ( rule__QualifiedName__Group_1__0 )*
             loop117:
             do {
                 int alt117=2;
@@ -47629,9 +47629,9 @@ public final void rule__QualifiedName__Group__1__Impl() throws RecognitionExcept
 
                 switch (alt117) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16587:2: rule__QualifiedName__Group_1__0
+            	    // InternalCheckCfg.g:16587:2: rule__QualifiedName__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__QualifiedName__Group_1__0_in_rule__QualifiedName__Group__1__Impl33443);
+            	    pushFollow(FOLLOW_101);
             	    rule__QualifiedName__Group_1__0();
 
             	    state._fsp--;
@@ -47670,21 +47670,21 @@ public final void rule__QualifiedName__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16601:1: rule__QualifiedName__Group_1__0 : rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 ;
+    // InternalCheckCfg.g:16601:1: rule__QualifiedName__Group_1__0 : rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 ;
     public final void rule__QualifiedName__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16605:1: ( rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16606:2: rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1
+            // InternalCheckCfg.g:16605:1: ( rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 )
+            // InternalCheckCfg.g:16606:2: rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1
             {
-            pushFollow(FOLLOW_rule__QualifiedName__Group_1__0__Impl_in_rule__QualifiedName__Group_1__033478);
+            pushFollow(FOLLOW_5);
             rule__QualifiedName__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__QualifiedName__Group_1__1_in_rule__QualifiedName__Group_1__033481);
+            pushFollow(FOLLOW_2);
             rule__QualifiedName__Group_1__1();
 
             state._fsp--;
@@ -47708,25 +47708,25 @@ public final void rule__QualifiedName__Group_1__0() throws RecognitionException
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16613:1: rule__QualifiedName__Group_1__0__Impl : ( ( '.' ) ) ;
+    // InternalCheckCfg.g:16613:1: rule__QualifiedName__Group_1__0__Impl : ( ( '.' ) ) ;
     public final void rule__QualifiedName__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16617:1: ( ( ( '.' ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16618:1: ( ( '.' ) )
+            // InternalCheckCfg.g:16617:1: ( ( ( '.' ) ) )
+            // InternalCheckCfg.g:16618:1: ( ( '.' ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16618:1: ( ( '.' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16619:1: ( '.' )
+            // InternalCheckCfg.g:16618:1: ( ( '.' ) )
+            // InternalCheckCfg.g:16619:1: ( '.' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameAccess().getFullStopKeyword_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16620:1: ( '.' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16621:2: '.'
+            // InternalCheckCfg.g:16620:1: ( '.' )
+            // InternalCheckCfg.g:16621:2: '.'
             {
-            match(input,43,FOLLOW_43_in_rule__QualifiedName__Group_1__0__Impl33510); if (state.failed) return ;
+            match(input,43,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -47755,16 +47755,16 @@ public final void rule__QualifiedName__Group_1__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16632:1: rule__QualifiedName__Group_1__1 : rule__QualifiedName__Group_1__1__Impl ;
+    // InternalCheckCfg.g:16632:1: rule__QualifiedName__Group_1__1 : rule__QualifiedName__Group_1__1__Impl ;
     public final void rule__QualifiedName__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16636:1: ( rule__QualifiedName__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16637:2: rule__QualifiedName__Group_1__1__Impl
+            // InternalCheckCfg.g:16636:1: ( rule__QualifiedName__Group_1__1__Impl )
+            // InternalCheckCfg.g:16637:2: rule__QualifiedName__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__QualifiedName__Group_1__1__Impl_in_rule__QualifiedName__Group_1__133542);
+            pushFollow(FOLLOW_2);
             rule__QualifiedName__Group_1__1__Impl();
 
             state._fsp--;
@@ -47788,22 +47788,22 @@ public final void rule__QualifiedName__Group_1__1() throws RecognitionException
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16643:1: rule__QualifiedName__Group_1__1__Impl : ( ruleValidID ) ;
+    // InternalCheckCfg.g:16643:1: rule__QualifiedName__Group_1__1__Impl : ( ruleValidID ) ;
     public final void rule__QualifiedName__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16647:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16648:1: ( ruleValidID )
+            // InternalCheckCfg.g:16647:1: ( ( ruleValidID ) )
+            // InternalCheckCfg.g:16648:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16648:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16649:1: ruleValidID
+            // InternalCheckCfg.g:16648:1: ( ruleValidID )
+            // InternalCheckCfg.g:16649:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameAccess().getValidIDParserRuleCall_1_1()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__QualifiedName__Group_1__1__Impl33569);
+            pushFollow(FOLLOW_2);
             ruleValidID();
 
             state._fsp--;
@@ -47833,21 +47833,21 @@ public final void rule__QualifiedName__Group_1__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__Number__Group_1__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16664:1: rule__Number__Group_1__0 : rule__Number__Group_1__0__Impl rule__Number__Group_1__1 ;
+    // InternalCheckCfg.g:16664:1: rule__Number__Group_1__0 : rule__Number__Group_1__0__Impl rule__Number__Group_1__1 ;
     public final void rule__Number__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16668:1: ( rule__Number__Group_1__0__Impl rule__Number__Group_1__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16669:2: rule__Number__Group_1__0__Impl rule__Number__Group_1__1
+            // InternalCheckCfg.g:16668:1: ( rule__Number__Group_1__0__Impl rule__Number__Group_1__1 )
+            // InternalCheckCfg.g:16669:2: rule__Number__Group_1__0__Impl rule__Number__Group_1__1
             {
-            pushFollow(FOLLOW_rule__Number__Group_1__0__Impl_in_rule__Number__Group_1__033602);
+            pushFollow(FOLLOW_100);
             rule__Number__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Number__Group_1__1_in_rule__Number__Group_1__033605);
+            pushFollow(FOLLOW_2);
             rule__Number__Group_1__1();
 
             state._fsp--;
@@ -47871,25 +47871,25 @@ public final void rule__Number__Group_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Number__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16676:1: rule__Number__Group_1__0__Impl : ( ( rule__Number__Alternatives_1_0 ) ) ;
+    // InternalCheckCfg.g:16676:1: rule__Number__Group_1__0__Impl : ( ( rule__Number__Alternatives_1_0 ) ) ;
     public final void rule__Number__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16680:1: ( ( ( rule__Number__Alternatives_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16681:1: ( ( rule__Number__Alternatives_1_0 ) )
+            // InternalCheckCfg.g:16680:1: ( ( ( rule__Number__Alternatives_1_0 ) ) )
+            // InternalCheckCfg.g:16681:1: ( ( rule__Number__Alternatives_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16681:1: ( ( rule__Number__Alternatives_1_0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16682:1: ( rule__Number__Alternatives_1_0 )
+            // InternalCheckCfg.g:16681:1: ( ( rule__Number__Alternatives_1_0 ) )
+            // InternalCheckCfg.g:16682:1: ( rule__Number__Alternatives_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNumberAccess().getAlternatives_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16683:1: ( rule__Number__Alternatives_1_0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16683:2: rule__Number__Alternatives_1_0
+            // InternalCheckCfg.g:16683:1: ( rule__Number__Alternatives_1_0 )
+            // InternalCheckCfg.g:16683:2: rule__Number__Alternatives_1_0
             {
-            pushFollow(FOLLOW_rule__Number__Alternatives_1_0_in_rule__Number__Group_1__0__Impl33632);
+            pushFollow(FOLLOW_2);
             rule__Number__Alternatives_1_0();
 
             state._fsp--;
@@ -47922,16 +47922,16 @@ public final void rule__Number__Group_1__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Number__Group_1__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16693:1: rule__Number__Group_1__1 : rule__Number__Group_1__1__Impl ;
+    // InternalCheckCfg.g:16693:1: rule__Number__Group_1__1 : rule__Number__Group_1__1__Impl ;
     public final void rule__Number__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16697:1: ( rule__Number__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16698:2: rule__Number__Group_1__1__Impl
+            // InternalCheckCfg.g:16697:1: ( rule__Number__Group_1__1__Impl )
+            // InternalCheckCfg.g:16698:2: rule__Number__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__Number__Group_1__1__Impl_in_rule__Number__Group_1__133662);
+            pushFollow(FOLLOW_2);
             rule__Number__Group_1__1__Impl();
 
             state._fsp--;
@@ -47955,22 +47955,22 @@ public final void rule__Number__Group_1__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Number__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16704:1: rule__Number__Group_1__1__Impl : ( ( rule__Number__Group_1_1__0 )? ) ;
+    // InternalCheckCfg.g:16704:1: rule__Number__Group_1__1__Impl : ( ( rule__Number__Group_1_1__0 )? ) ;
     public final void rule__Number__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16708:1: ( ( ( rule__Number__Group_1_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16709:1: ( ( rule__Number__Group_1_1__0 )? )
+            // InternalCheckCfg.g:16708:1: ( ( ( rule__Number__Group_1_1__0 )? ) )
+            // InternalCheckCfg.g:16709:1: ( ( rule__Number__Group_1_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16709:1: ( ( rule__Number__Group_1_1__0 )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16710:1: ( rule__Number__Group_1_1__0 )?
+            // InternalCheckCfg.g:16709:1: ( ( rule__Number__Group_1_1__0 )? )
+            // InternalCheckCfg.g:16710:1: ( rule__Number__Group_1_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNumberAccess().getGroup_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16711:1: ( rule__Number__Group_1_1__0 )?
+            // InternalCheckCfg.g:16711:1: ( rule__Number__Group_1_1__0 )?
             int alt118=2;
             int LA118_0 = input.LA(1);
 
@@ -47983,9 +47983,9 @@ public final void rule__Number__Group_1__1__Impl() throws RecognitionException {
             }
             switch (alt118) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16711:2: rule__Number__Group_1_1__0
+                    // InternalCheckCfg.g:16711:2: rule__Number__Group_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__Number__Group_1_1__0_in_rule__Number__Group_1__1__Impl33689);
+                    pushFollow(FOLLOW_2);
                     rule__Number__Group_1_1__0();
 
                     state._fsp--;
@@ -48021,21 +48021,21 @@ public final void rule__Number__Group_1__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Number__Group_1_1__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16725:1: rule__Number__Group_1_1__0 : rule__Number__Group_1_1__0__Impl rule__Number__Group_1_1__1 ;
+    // InternalCheckCfg.g:16725:1: rule__Number__Group_1_1__0 : rule__Number__Group_1_1__0__Impl rule__Number__Group_1_1__1 ;
     public final void rule__Number__Group_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16729:1: ( rule__Number__Group_1_1__0__Impl rule__Number__Group_1_1__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16730:2: rule__Number__Group_1_1__0__Impl rule__Number__Group_1_1__1
+            // InternalCheckCfg.g:16729:1: ( rule__Number__Group_1_1__0__Impl rule__Number__Group_1_1__1 )
+            // InternalCheckCfg.g:16730:2: rule__Number__Group_1_1__0__Impl rule__Number__Group_1_1__1
             {
-            pushFollow(FOLLOW_rule__Number__Group_1_1__0__Impl_in_rule__Number__Group_1_1__033724);
+            pushFollow(FOLLOW_102);
             rule__Number__Group_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Number__Group_1_1__1_in_rule__Number__Group_1_1__033727);
+            pushFollow(FOLLOW_2);
             rule__Number__Group_1_1__1();
 
             state._fsp--;
@@ -48059,22 +48059,22 @@ public final void rule__Number__Group_1_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Number__Group_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16737:1: rule__Number__Group_1_1__0__Impl : ( '.' ) ;
+    // InternalCheckCfg.g:16737:1: rule__Number__Group_1_1__0__Impl : ( '.' ) ;
     public final void rule__Number__Group_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16741:1: ( ( '.' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16742:1: ( '.' )
+            // InternalCheckCfg.g:16741:1: ( ( '.' ) )
+            // InternalCheckCfg.g:16742:1: ( '.' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16742:1: ( '.' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16743:1: '.'
+            // InternalCheckCfg.g:16742:1: ( '.' )
+            // InternalCheckCfg.g:16743:1: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNumberAccess().getFullStopKeyword_1_1_0()); 
             }
-            match(input,43,FOLLOW_43_in_rule__Number__Group_1_1__0__Impl33755); if (state.failed) return ;
+            match(input,43,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getNumberAccess().getFullStopKeyword_1_1_0()); 
             }
@@ -48100,16 +48100,16 @@ public final void rule__Number__Group_1_1__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__Number__Group_1_1__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16756:1: rule__Number__Group_1_1__1 : rule__Number__Group_1_1__1__Impl ;
+    // InternalCheckCfg.g:16756:1: rule__Number__Group_1_1__1 : rule__Number__Group_1_1__1__Impl ;
     public final void rule__Number__Group_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16760:1: ( rule__Number__Group_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16761:2: rule__Number__Group_1_1__1__Impl
+            // InternalCheckCfg.g:16760:1: ( rule__Number__Group_1_1__1__Impl )
+            // InternalCheckCfg.g:16761:2: rule__Number__Group_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__Number__Group_1_1__1__Impl_in_rule__Number__Group_1_1__133786);
+            pushFollow(FOLLOW_2);
             rule__Number__Group_1_1__1__Impl();
 
             state._fsp--;
@@ -48133,25 +48133,25 @@ public final void rule__Number__Group_1_1__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Number__Group_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16767:1: rule__Number__Group_1_1__1__Impl : ( ( rule__Number__Alternatives_1_1_1 ) ) ;
+    // InternalCheckCfg.g:16767:1: rule__Number__Group_1_1__1__Impl : ( ( rule__Number__Alternatives_1_1_1 ) ) ;
     public final void rule__Number__Group_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16771:1: ( ( ( rule__Number__Alternatives_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16772:1: ( ( rule__Number__Alternatives_1_1_1 ) )
+            // InternalCheckCfg.g:16771:1: ( ( ( rule__Number__Alternatives_1_1_1 ) ) )
+            // InternalCheckCfg.g:16772:1: ( ( rule__Number__Alternatives_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16772:1: ( ( rule__Number__Alternatives_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16773:1: ( rule__Number__Alternatives_1_1_1 )
+            // InternalCheckCfg.g:16772:1: ( ( rule__Number__Alternatives_1_1_1 ) )
+            // InternalCheckCfg.g:16773:1: ( rule__Number__Alternatives_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNumberAccess().getAlternatives_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16774:1: ( rule__Number__Alternatives_1_1_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16774:2: rule__Number__Alternatives_1_1_1
+            // InternalCheckCfg.g:16774:1: ( rule__Number__Alternatives_1_1_1 )
+            // InternalCheckCfg.g:16774:2: rule__Number__Alternatives_1_1_1
             {
-            pushFollow(FOLLOW_rule__Number__Alternatives_1_1_1_in_rule__Number__Group_1_1__1__Impl33813);
+            pushFollow(FOLLOW_2);
             rule__Number__Alternatives_1_1_1();
 
             state._fsp--;
@@ -48184,21 +48184,21 @@ public final void rule__Number__Group_1_1__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16789:1: rule__JvmTypeReference__Group_0__0 : rule__JvmTypeReference__Group_0__0__Impl rule__JvmTypeReference__Group_0__1 ;
+    // InternalCheckCfg.g:16789:1: rule__JvmTypeReference__Group_0__0 : rule__JvmTypeReference__Group_0__0__Impl rule__JvmTypeReference__Group_0__1 ;
     public final void rule__JvmTypeReference__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16793:1: ( rule__JvmTypeReference__Group_0__0__Impl rule__JvmTypeReference__Group_0__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16794:2: rule__JvmTypeReference__Group_0__0__Impl rule__JvmTypeReference__Group_0__1
+            // InternalCheckCfg.g:16793:1: ( rule__JvmTypeReference__Group_0__0__Impl rule__JvmTypeReference__Group_0__1 )
+            // InternalCheckCfg.g:16794:2: rule__JvmTypeReference__Group_0__0__Impl rule__JvmTypeReference__Group_0__1
             {
-            pushFollow(FOLLOW_rule__JvmTypeReference__Group_0__0__Impl_in_rule__JvmTypeReference__Group_0__033848);
+            pushFollow(FOLLOW_23);
             rule__JvmTypeReference__Group_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmTypeReference__Group_0__1_in_rule__JvmTypeReference__Group_0__033851);
+            pushFollow(FOLLOW_2);
             rule__JvmTypeReference__Group_0__1();
 
             state._fsp--;
@@ -48222,22 +48222,22 @@ public final void rule__JvmTypeReference__Group_0__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16801:1: rule__JvmTypeReference__Group_0__0__Impl : ( ruleJvmParameterizedTypeReference ) ;
+    // InternalCheckCfg.g:16801:1: rule__JvmTypeReference__Group_0__0__Impl : ( ruleJvmParameterizedTypeReference ) ;
     public final void rule__JvmTypeReference__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16805:1: ( ( ruleJvmParameterizedTypeReference ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16806:1: ( ruleJvmParameterizedTypeReference )
+            // InternalCheckCfg.g:16805:1: ( ( ruleJvmParameterizedTypeReference ) )
+            // InternalCheckCfg.g:16806:1: ( ruleJvmParameterizedTypeReference )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16806:1: ( ruleJvmParameterizedTypeReference )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16807:1: ruleJvmParameterizedTypeReference
+            // InternalCheckCfg.g:16806:1: ( ruleJvmParameterizedTypeReference )
+            // InternalCheckCfg.g:16807:1: ruleJvmParameterizedTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmTypeReferenceAccess().getJvmParameterizedTypeReferenceParserRuleCall_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmParameterizedTypeReference_in_rule__JvmTypeReference__Group_0__0__Impl33878);
+            pushFollow(FOLLOW_2);
             ruleJvmParameterizedTypeReference();
 
             state._fsp--;
@@ -48267,16 +48267,16 @@ public final void rule__JvmTypeReference__Group_0__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16818:1: rule__JvmTypeReference__Group_0__1 : rule__JvmTypeReference__Group_0__1__Impl ;
+    // InternalCheckCfg.g:16818:1: rule__JvmTypeReference__Group_0__1 : rule__JvmTypeReference__Group_0__1__Impl ;
     public final void rule__JvmTypeReference__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16822:1: ( rule__JvmTypeReference__Group_0__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16823:2: rule__JvmTypeReference__Group_0__1__Impl
+            // InternalCheckCfg.g:16822:1: ( rule__JvmTypeReference__Group_0__1__Impl )
+            // InternalCheckCfg.g:16823:2: rule__JvmTypeReference__Group_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmTypeReference__Group_0__1__Impl_in_rule__JvmTypeReference__Group_0__133907);
+            pushFollow(FOLLOW_2);
             rule__JvmTypeReference__Group_0__1__Impl();
 
             state._fsp--;
@@ -48300,22 +48300,22 @@ public final void rule__JvmTypeReference__Group_0__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16829:1: rule__JvmTypeReference__Group_0__1__Impl : ( ( rule__JvmTypeReference__Group_0_1__0 )* ) ;
+    // InternalCheckCfg.g:16829:1: rule__JvmTypeReference__Group_0__1__Impl : ( ( rule__JvmTypeReference__Group_0_1__0 )* ) ;
     public final void rule__JvmTypeReference__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16833:1: ( ( ( rule__JvmTypeReference__Group_0_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16834:1: ( ( rule__JvmTypeReference__Group_0_1__0 )* )
+            // InternalCheckCfg.g:16833:1: ( ( ( rule__JvmTypeReference__Group_0_1__0 )* ) )
+            // InternalCheckCfg.g:16834:1: ( ( rule__JvmTypeReference__Group_0_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16834:1: ( ( rule__JvmTypeReference__Group_0_1__0 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16835:1: ( rule__JvmTypeReference__Group_0_1__0 )*
+            // InternalCheckCfg.g:16834:1: ( ( rule__JvmTypeReference__Group_0_1__0 )* )
+            // InternalCheckCfg.g:16835:1: ( rule__JvmTypeReference__Group_0_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmTypeReferenceAccess().getGroup_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16836:1: ( rule__JvmTypeReference__Group_0_1__0 )*
+            // InternalCheckCfg.g:16836:1: ( rule__JvmTypeReference__Group_0_1__0 )*
             loop119:
             do {
                 int alt119=2;
@@ -48340,9 +48340,9 @@ public final void rule__JvmTypeReference__Group_0__1__Impl() throws RecognitionE
 
                 switch (alt119) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16836:2: rule__JvmTypeReference__Group_0_1__0
+            	    // InternalCheckCfg.g:16836:2: rule__JvmTypeReference__Group_0_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__JvmTypeReference__Group_0_1__0_in_rule__JvmTypeReference__Group_0__1__Impl33934);
+            	    pushFollow(FOLLOW_92);
             	    rule__JvmTypeReference__Group_0_1__0();
 
             	    state._fsp--;
@@ -48381,16 +48381,16 @@ public final void rule__JvmTypeReference__Group_0__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0_1__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16850:1: rule__JvmTypeReference__Group_0_1__0 : rule__JvmTypeReference__Group_0_1__0__Impl ;
+    // InternalCheckCfg.g:16850:1: rule__JvmTypeReference__Group_0_1__0 : rule__JvmTypeReference__Group_0_1__0__Impl ;
     public final void rule__JvmTypeReference__Group_0_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16854:1: ( rule__JvmTypeReference__Group_0_1__0__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16855:2: rule__JvmTypeReference__Group_0_1__0__Impl
+            // InternalCheckCfg.g:16854:1: ( rule__JvmTypeReference__Group_0_1__0__Impl )
+            // InternalCheckCfg.g:16855:2: rule__JvmTypeReference__Group_0_1__0__Impl
             {
-            pushFollow(FOLLOW_rule__JvmTypeReference__Group_0_1__0__Impl_in_rule__JvmTypeReference__Group_0_1__033969);
+            pushFollow(FOLLOW_2);
             rule__JvmTypeReference__Group_0_1__0__Impl();
 
             state._fsp--;
@@ -48414,25 +48414,25 @@ public final void rule__JvmTypeReference__Group_0_1__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0_1__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16861:1: rule__JvmTypeReference__Group_0_1__0__Impl : ( ( rule__JvmTypeReference__Group_0_1_0__0 ) ) ;
+    // InternalCheckCfg.g:16861:1: rule__JvmTypeReference__Group_0_1__0__Impl : ( ( rule__JvmTypeReference__Group_0_1_0__0 ) ) ;
     public final void rule__JvmTypeReference__Group_0_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16865:1: ( ( ( rule__JvmTypeReference__Group_0_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16866:1: ( ( rule__JvmTypeReference__Group_0_1_0__0 ) )
+            // InternalCheckCfg.g:16865:1: ( ( ( rule__JvmTypeReference__Group_0_1_0__0 ) ) )
+            // InternalCheckCfg.g:16866:1: ( ( rule__JvmTypeReference__Group_0_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16866:1: ( ( rule__JvmTypeReference__Group_0_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16867:1: ( rule__JvmTypeReference__Group_0_1_0__0 )
+            // InternalCheckCfg.g:16866:1: ( ( rule__JvmTypeReference__Group_0_1_0__0 ) )
+            // InternalCheckCfg.g:16867:1: ( rule__JvmTypeReference__Group_0_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmTypeReferenceAccess().getGroup_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16868:1: ( rule__JvmTypeReference__Group_0_1_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16868:2: rule__JvmTypeReference__Group_0_1_0__0
+            // InternalCheckCfg.g:16868:1: ( rule__JvmTypeReference__Group_0_1_0__0 )
+            // InternalCheckCfg.g:16868:2: rule__JvmTypeReference__Group_0_1_0__0
             {
-            pushFollow(FOLLOW_rule__JvmTypeReference__Group_0_1_0__0_in_rule__JvmTypeReference__Group_0_1__0__Impl33996);
+            pushFollow(FOLLOW_2);
             rule__JvmTypeReference__Group_0_1_0__0();
 
             state._fsp--;
@@ -48465,21 +48465,21 @@ public final void rule__JvmTypeReference__Group_0_1__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0_1_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16880:1: rule__JvmTypeReference__Group_0_1_0__0 : rule__JvmTypeReference__Group_0_1_0__0__Impl rule__JvmTypeReference__Group_0_1_0__1 ;
+    // InternalCheckCfg.g:16880:1: rule__JvmTypeReference__Group_0_1_0__0 : rule__JvmTypeReference__Group_0_1_0__0__Impl rule__JvmTypeReference__Group_0_1_0__1 ;
     public final void rule__JvmTypeReference__Group_0_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16884:1: ( rule__JvmTypeReference__Group_0_1_0__0__Impl rule__JvmTypeReference__Group_0_1_0__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16885:2: rule__JvmTypeReference__Group_0_1_0__0__Impl rule__JvmTypeReference__Group_0_1_0__1
+            // InternalCheckCfg.g:16884:1: ( rule__JvmTypeReference__Group_0_1_0__0__Impl rule__JvmTypeReference__Group_0_1_0__1 )
+            // InternalCheckCfg.g:16885:2: rule__JvmTypeReference__Group_0_1_0__0__Impl rule__JvmTypeReference__Group_0_1_0__1
             {
-            pushFollow(FOLLOW_rule__JvmTypeReference__Group_0_1_0__0__Impl_in_rule__JvmTypeReference__Group_0_1_0__034028);
+            pushFollow(FOLLOW_23);
             rule__JvmTypeReference__Group_0_1_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmTypeReference__Group_0_1_0__1_in_rule__JvmTypeReference__Group_0_1_0__034031);
+            pushFollow(FOLLOW_2);
             rule__JvmTypeReference__Group_0_1_0__1();
 
             state._fsp--;
@@ -48503,23 +48503,23 @@ public final void rule__JvmTypeReference__Group_0_1_0__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16892:1: rule__JvmTypeReference__Group_0_1_0__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:16892:1: rule__JvmTypeReference__Group_0_1_0__0__Impl : ( () ) ;
     public final void rule__JvmTypeReference__Group_0_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16896:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16897:1: ( () )
+            // InternalCheckCfg.g:16896:1: ( ( () ) )
+            // InternalCheckCfg.g:16897:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16897:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16898:1: ()
+            // InternalCheckCfg.g:16897:1: ( () )
+            // InternalCheckCfg.g:16898:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmTypeReferenceAccess().getJvmGenericArrayTypeReferenceComponentTypeAction_0_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16899:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16901:1: 
+            // InternalCheckCfg.g:16899:1: ()
+            // InternalCheckCfg.g:16901:1: 
             {
             }
 
@@ -48544,16 +48544,16 @@ public final void rule__JvmTypeReference__Group_0_1_0__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0_1_0__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16911:1: rule__JvmTypeReference__Group_0_1_0__1 : rule__JvmTypeReference__Group_0_1_0__1__Impl ;
+    // InternalCheckCfg.g:16911:1: rule__JvmTypeReference__Group_0_1_0__1 : rule__JvmTypeReference__Group_0_1_0__1__Impl ;
     public final void rule__JvmTypeReference__Group_0_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16915:1: ( rule__JvmTypeReference__Group_0_1_0__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16916:2: rule__JvmTypeReference__Group_0_1_0__1__Impl
+            // InternalCheckCfg.g:16915:1: ( rule__JvmTypeReference__Group_0_1_0__1__Impl )
+            // InternalCheckCfg.g:16916:2: rule__JvmTypeReference__Group_0_1_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmTypeReference__Group_0_1_0__1__Impl_in_rule__JvmTypeReference__Group_0_1_0__134089);
+            pushFollow(FOLLOW_2);
             rule__JvmTypeReference__Group_0_1_0__1__Impl();
 
             state._fsp--;
@@ -48577,22 +48577,22 @@ public final void rule__JvmTypeReference__Group_0_1_0__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0_1_0__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16922:1: rule__JvmTypeReference__Group_0_1_0__1__Impl : ( ruleArrayBrackets ) ;
+    // InternalCheckCfg.g:16922:1: rule__JvmTypeReference__Group_0_1_0__1__Impl : ( ruleArrayBrackets ) ;
     public final void rule__JvmTypeReference__Group_0_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16926:1: ( ( ruleArrayBrackets ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16927:1: ( ruleArrayBrackets )
+            // InternalCheckCfg.g:16926:1: ( ( ruleArrayBrackets ) )
+            // InternalCheckCfg.g:16927:1: ( ruleArrayBrackets )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16927:1: ( ruleArrayBrackets )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16928:1: ruleArrayBrackets
+            // InternalCheckCfg.g:16927:1: ( ruleArrayBrackets )
+            // InternalCheckCfg.g:16928:1: ruleArrayBrackets
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmTypeReferenceAccess().getArrayBracketsParserRuleCall_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleArrayBrackets_in_rule__JvmTypeReference__Group_0_1_0__1__Impl34116);
+            pushFollow(FOLLOW_2);
             ruleArrayBrackets();
 
             state._fsp--;
@@ -48622,21 +48622,21 @@ public final void rule__JvmTypeReference__Group_0_1_0__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__ArrayBrackets__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16943:1: rule__ArrayBrackets__Group__0 : rule__ArrayBrackets__Group__0__Impl rule__ArrayBrackets__Group__1 ;
+    // InternalCheckCfg.g:16943:1: rule__ArrayBrackets__Group__0 : rule__ArrayBrackets__Group__0__Impl rule__ArrayBrackets__Group__1 ;
     public final void rule__ArrayBrackets__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16947:1: ( rule__ArrayBrackets__Group__0__Impl rule__ArrayBrackets__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16948:2: rule__ArrayBrackets__Group__0__Impl rule__ArrayBrackets__Group__1
+            // InternalCheckCfg.g:16947:1: ( rule__ArrayBrackets__Group__0__Impl rule__ArrayBrackets__Group__1 )
+            // InternalCheckCfg.g:16948:2: rule__ArrayBrackets__Group__0__Impl rule__ArrayBrackets__Group__1
             {
-            pushFollow(FOLLOW_rule__ArrayBrackets__Group__0__Impl_in_rule__ArrayBrackets__Group__034149);
+            pushFollow(FOLLOW_66);
             rule__ArrayBrackets__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ArrayBrackets__Group__1_in_rule__ArrayBrackets__Group__034152);
+            pushFollow(FOLLOW_2);
             rule__ArrayBrackets__Group__1();
 
             state._fsp--;
@@ -48660,22 +48660,22 @@ public final void rule__ArrayBrackets__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__ArrayBrackets__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16955:1: rule__ArrayBrackets__Group__0__Impl : ( '[' ) ;
+    // InternalCheckCfg.g:16955:1: rule__ArrayBrackets__Group__0__Impl : ( '[' ) ;
     public final void rule__ArrayBrackets__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16959:1: ( ( '[' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16960:1: ( '[' )
+            // InternalCheckCfg.g:16959:1: ( ( '[' ) )
+            // InternalCheckCfg.g:16960:1: ( '[' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16960:1: ( '[' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16961:1: '['
+            // InternalCheckCfg.g:16960:1: ( '[' )
+            // InternalCheckCfg.g:16961:1: '['
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getArrayBracketsAccess().getLeftSquareBracketKeyword_0()); 
             }
-            match(input,66,FOLLOW_66_in_rule__ArrayBrackets__Group__0__Impl34180); if (state.failed) return ;
+            match(input,66,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getArrayBracketsAccess().getLeftSquareBracketKeyword_0()); 
             }
@@ -48701,16 +48701,16 @@ public final void rule__ArrayBrackets__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ArrayBrackets__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16974:1: rule__ArrayBrackets__Group__1 : rule__ArrayBrackets__Group__1__Impl ;
+    // InternalCheckCfg.g:16974:1: rule__ArrayBrackets__Group__1 : rule__ArrayBrackets__Group__1__Impl ;
     public final void rule__ArrayBrackets__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16978:1: ( rule__ArrayBrackets__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16979:2: rule__ArrayBrackets__Group__1__Impl
+            // InternalCheckCfg.g:16978:1: ( rule__ArrayBrackets__Group__1__Impl )
+            // InternalCheckCfg.g:16979:2: rule__ArrayBrackets__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__ArrayBrackets__Group__1__Impl_in_rule__ArrayBrackets__Group__134211);
+            pushFollow(FOLLOW_2);
             rule__ArrayBrackets__Group__1__Impl();
 
             state._fsp--;
@@ -48734,22 +48734,22 @@ public final void rule__ArrayBrackets__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__ArrayBrackets__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16985:1: rule__ArrayBrackets__Group__1__Impl : ( ']' ) ;
+    // InternalCheckCfg.g:16985:1: rule__ArrayBrackets__Group__1__Impl : ( ']' ) ;
     public final void rule__ArrayBrackets__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16989:1: ( ( ']' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16990:1: ( ']' )
+            // InternalCheckCfg.g:16989:1: ( ( ']' ) )
+            // InternalCheckCfg.g:16990:1: ( ']' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16990:1: ( ']' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16991:1: ']'
+            // InternalCheckCfg.g:16990:1: ( ']' )
+            // InternalCheckCfg.g:16991:1: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getArrayBracketsAccess().getRightSquareBracketKeyword_1()); 
             }
-            match(input,67,FOLLOW_67_in_rule__ArrayBrackets__Group__1__Impl34239); if (state.failed) return ;
+            match(input,67,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getArrayBracketsAccess().getRightSquareBracketKeyword_1()); 
             }
@@ -48775,21 +48775,21 @@ public final void rule__ArrayBrackets__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17008:1: rule__XFunctionTypeRef__Group__0 : rule__XFunctionTypeRef__Group__0__Impl rule__XFunctionTypeRef__Group__1 ;
+    // InternalCheckCfg.g:17008:1: rule__XFunctionTypeRef__Group__0 : rule__XFunctionTypeRef__Group__0__Impl rule__XFunctionTypeRef__Group__1 ;
     public final void rule__XFunctionTypeRef__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17012:1: ( rule__XFunctionTypeRef__Group__0__Impl rule__XFunctionTypeRef__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17013:2: rule__XFunctionTypeRef__Group__0__Impl rule__XFunctionTypeRef__Group__1
+            // InternalCheckCfg.g:17012:1: ( rule__XFunctionTypeRef__Group__0__Impl rule__XFunctionTypeRef__Group__1 )
+            // InternalCheckCfg.g:17013:2: rule__XFunctionTypeRef__Group__0__Impl rule__XFunctionTypeRef__Group__1
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group__0__Impl_in_rule__XFunctionTypeRef__Group__034274);
+            pushFollow(FOLLOW_39);
             rule__XFunctionTypeRef__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group__1_in_rule__XFunctionTypeRef__Group__034277);
+            pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__Group__1();
 
             state._fsp--;
@@ -48813,22 +48813,22 @@ public final void rule__XFunctionTypeRef__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17020:1: rule__XFunctionTypeRef__Group__0__Impl : ( ( rule__XFunctionTypeRef__Group_0__0 )? ) ;
+    // InternalCheckCfg.g:17020:1: rule__XFunctionTypeRef__Group__0__Impl : ( ( rule__XFunctionTypeRef__Group_0__0 )? ) ;
     public final void rule__XFunctionTypeRef__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17024:1: ( ( ( rule__XFunctionTypeRef__Group_0__0 )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17025:1: ( ( rule__XFunctionTypeRef__Group_0__0 )? )
+            // InternalCheckCfg.g:17024:1: ( ( ( rule__XFunctionTypeRef__Group_0__0 )? ) )
+            // InternalCheckCfg.g:17025:1: ( ( rule__XFunctionTypeRef__Group_0__0 )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17025:1: ( ( rule__XFunctionTypeRef__Group_0__0 )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17026:1: ( rule__XFunctionTypeRef__Group_0__0 )?
+            // InternalCheckCfg.g:17025:1: ( ( rule__XFunctionTypeRef__Group_0__0 )? )
+            // InternalCheckCfg.g:17026:1: ( rule__XFunctionTypeRef__Group_0__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getGroup_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17027:1: ( rule__XFunctionTypeRef__Group_0__0 )?
+            // InternalCheckCfg.g:17027:1: ( rule__XFunctionTypeRef__Group_0__0 )?
             int alt120=2;
             int LA120_0 = input.LA(1);
 
@@ -48837,9 +48837,9 @@ public final void rule__XFunctionTypeRef__Group__0__Impl() throws RecognitionExc
             }
             switch (alt120) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17027:2: rule__XFunctionTypeRef__Group_0__0
+                    // InternalCheckCfg.g:17027:2: rule__XFunctionTypeRef__Group_0__0
                     {
-                    pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0__0_in_rule__XFunctionTypeRef__Group__0__Impl34304);
+                    pushFollow(FOLLOW_2);
                     rule__XFunctionTypeRef__Group_0__0();
 
                     state._fsp--;
@@ -48875,21 +48875,21 @@ public final void rule__XFunctionTypeRef__Group__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17037:1: rule__XFunctionTypeRef__Group__1 : rule__XFunctionTypeRef__Group__1__Impl rule__XFunctionTypeRef__Group__2 ;
+    // InternalCheckCfg.g:17037:1: rule__XFunctionTypeRef__Group__1 : rule__XFunctionTypeRef__Group__1__Impl rule__XFunctionTypeRef__Group__2 ;
     public final void rule__XFunctionTypeRef__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17041:1: ( rule__XFunctionTypeRef__Group__1__Impl rule__XFunctionTypeRef__Group__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17042:2: rule__XFunctionTypeRef__Group__1__Impl rule__XFunctionTypeRef__Group__2
+            // InternalCheckCfg.g:17041:1: ( rule__XFunctionTypeRef__Group__1__Impl rule__XFunctionTypeRef__Group__2 )
+            // InternalCheckCfg.g:17042:2: rule__XFunctionTypeRef__Group__1__Impl rule__XFunctionTypeRef__Group__2
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group__1__Impl_in_rule__XFunctionTypeRef__Group__134335);
+            pushFollow(FOLLOW_39);
             rule__XFunctionTypeRef__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group__2_in_rule__XFunctionTypeRef__Group__134338);
+            pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__Group__2();
 
             state._fsp--;
@@ -48913,22 +48913,22 @@ public final void rule__XFunctionTypeRef__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17049:1: rule__XFunctionTypeRef__Group__1__Impl : ( '=>' ) ;
+    // InternalCheckCfg.g:17049:1: rule__XFunctionTypeRef__Group__1__Impl : ( '=>' ) ;
     public final void rule__XFunctionTypeRef__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17053:1: ( ( '=>' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17054:1: ( '=>' )
+            // InternalCheckCfg.g:17053:1: ( ( '=>' ) )
+            // InternalCheckCfg.g:17054:1: ( '=>' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17054:1: ( '=>' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17055:1: '=>'
+            // InternalCheckCfg.g:17054:1: ( '=>' )
+            // InternalCheckCfg.g:17055:1: '=>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getEqualsSignGreaterThanSignKeyword_1()); 
             }
-            match(input,31,FOLLOW_31_in_rule__XFunctionTypeRef__Group__1__Impl34366); if (state.failed) return ;
+            match(input,31,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFunctionTypeRefAccess().getEqualsSignGreaterThanSignKeyword_1()); 
             }
@@ -48954,16 +48954,16 @@ public final void rule__XFunctionTypeRef__Group__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17068:1: rule__XFunctionTypeRef__Group__2 : rule__XFunctionTypeRef__Group__2__Impl ;
+    // InternalCheckCfg.g:17068:1: rule__XFunctionTypeRef__Group__2 : rule__XFunctionTypeRef__Group__2__Impl ;
     public final void rule__XFunctionTypeRef__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17072:1: ( rule__XFunctionTypeRef__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17073:2: rule__XFunctionTypeRef__Group__2__Impl
+            // InternalCheckCfg.g:17072:1: ( rule__XFunctionTypeRef__Group__2__Impl )
+            // InternalCheckCfg.g:17073:2: rule__XFunctionTypeRef__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group__2__Impl_in_rule__XFunctionTypeRef__Group__234397);
+            pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__Group__2__Impl();
 
             state._fsp--;
@@ -48987,25 +48987,25 @@ public final void rule__XFunctionTypeRef__Group__2() throws RecognitionException
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17079:1: rule__XFunctionTypeRef__Group__2__Impl : ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) ) ;
+    // InternalCheckCfg.g:17079:1: rule__XFunctionTypeRef__Group__2__Impl : ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) ) ;
     public final void rule__XFunctionTypeRef__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17083:1: ( ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17084:1: ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) )
+            // InternalCheckCfg.g:17083:1: ( ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) ) )
+            // InternalCheckCfg.g:17084:1: ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17084:1: ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17085:1: ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 )
+            // InternalCheckCfg.g:17084:1: ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) )
+            // InternalCheckCfg.g:17085:1: ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getReturnTypeAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17086:1: ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17086:2: rule__XFunctionTypeRef__ReturnTypeAssignment_2
+            // InternalCheckCfg.g:17086:1: ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 )
+            // InternalCheckCfg.g:17086:2: rule__XFunctionTypeRef__ReturnTypeAssignment_2
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__ReturnTypeAssignment_2_in_rule__XFunctionTypeRef__Group__2__Impl34424);
+            pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__ReturnTypeAssignment_2();
 
             state._fsp--;
@@ -49038,21 +49038,21 @@ public final void rule__XFunctionTypeRef__Group__2__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17102:1: rule__XFunctionTypeRef__Group_0__0 : rule__XFunctionTypeRef__Group_0__0__Impl rule__XFunctionTypeRef__Group_0__1 ;
+    // InternalCheckCfg.g:17102:1: rule__XFunctionTypeRef__Group_0__0 : rule__XFunctionTypeRef__Group_0__0__Impl rule__XFunctionTypeRef__Group_0__1 ;
     public final void rule__XFunctionTypeRef__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17106:1: ( rule__XFunctionTypeRef__Group_0__0__Impl rule__XFunctionTypeRef__Group_0__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17107:2: rule__XFunctionTypeRef__Group_0__0__Impl rule__XFunctionTypeRef__Group_0__1
+            // InternalCheckCfg.g:17106:1: ( rule__XFunctionTypeRef__Group_0__0__Impl rule__XFunctionTypeRef__Group_0__1 )
+            // InternalCheckCfg.g:17107:2: rule__XFunctionTypeRef__Group_0__0__Impl rule__XFunctionTypeRef__Group_0__1
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0__0__Impl_in_rule__XFunctionTypeRef__Group_0__034460);
+            pushFollow(FOLLOW_103);
             rule__XFunctionTypeRef__Group_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0__1_in_rule__XFunctionTypeRef__Group_0__034463);
+            pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__Group_0__1();
 
             state._fsp--;
@@ -49076,22 +49076,22 @@ public final void rule__XFunctionTypeRef__Group_0__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17114:1: rule__XFunctionTypeRef__Group_0__0__Impl : ( '(' ) ;
+    // InternalCheckCfg.g:17114:1: rule__XFunctionTypeRef__Group_0__0__Impl : ( '(' ) ;
     public final void rule__XFunctionTypeRef__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17118:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17119:1: ( '(' )
+            // InternalCheckCfg.g:17118:1: ( ( '(' ) )
+            // InternalCheckCfg.g:17119:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17119:1: ( '(' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17120:1: '('
+            // InternalCheckCfg.g:17119:1: ( '(' )
+            // InternalCheckCfg.g:17120:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getLeftParenthesisKeyword_0_0()); 
             }
-            match(input,62,FOLLOW_62_in_rule__XFunctionTypeRef__Group_0__0__Impl34491); if (state.failed) return ;
+            match(input,62,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFunctionTypeRefAccess().getLeftParenthesisKeyword_0_0()); 
             }
@@ -49117,21 +49117,21 @@ public final void rule__XFunctionTypeRef__Group_0__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17133:1: rule__XFunctionTypeRef__Group_0__1 : rule__XFunctionTypeRef__Group_0__1__Impl rule__XFunctionTypeRef__Group_0__2 ;
+    // InternalCheckCfg.g:17133:1: rule__XFunctionTypeRef__Group_0__1 : rule__XFunctionTypeRef__Group_0__1__Impl rule__XFunctionTypeRef__Group_0__2 ;
     public final void rule__XFunctionTypeRef__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17137:1: ( rule__XFunctionTypeRef__Group_0__1__Impl rule__XFunctionTypeRef__Group_0__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17138:2: rule__XFunctionTypeRef__Group_0__1__Impl rule__XFunctionTypeRef__Group_0__2
+            // InternalCheckCfg.g:17137:1: ( rule__XFunctionTypeRef__Group_0__1__Impl rule__XFunctionTypeRef__Group_0__2 )
+            // InternalCheckCfg.g:17138:2: rule__XFunctionTypeRef__Group_0__1__Impl rule__XFunctionTypeRef__Group_0__2
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0__1__Impl_in_rule__XFunctionTypeRef__Group_0__134522);
+            pushFollow(FOLLOW_103);
             rule__XFunctionTypeRef__Group_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0__2_in_rule__XFunctionTypeRef__Group_0__134525);
+            pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__Group_0__2();
 
             state._fsp--;
@@ -49155,22 +49155,22 @@ public final void rule__XFunctionTypeRef__Group_0__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17145:1: rule__XFunctionTypeRef__Group_0__1__Impl : ( ( rule__XFunctionTypeRef__Group_0_1__0 )? ) ;
+    // InternalCheckCfg.g:17145:1: rule__XFunctionTypeRef__Group_0__1__Impl : ( ( rule__XFunctionTypeRef__Group_0_1__0 )? ) ;
     public final void rule__XFunctionTypeRef__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17149:1: ( ( ( rule__XFunctionTypeRef__Group_0_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17150:1: ( ( rule__XFunctionTypeRef__Group_0_1__0 )? )
+            // InternalCheckCfg.g:17149:1: ( ( ( rule__XFunctionTypeRef__Group_0_1__0 )? ) )
+            // InternalCheckCfg.g:17150:1: ( ( rule__XFunctionTypeRef__Group_0_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17150:1: ( ( rule__XFunctionTypeRef__Group_0_1__0 )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17151:1: ( rule__XFunctionTypeRef__Group_0_1__0 )?
+            // InternalCheckCfg.g:17150:1: ( ( rule__XFunctionTypeRef__Group_0_1__0 )? )
+            // InternalCheckCfg.g:17151:1: ( rule__XFunctionTypeRef__Group_0_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getGroup_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17152:1: ( rule__XFunctionTypeRef__Group_0_1__0 )?
+            // InternalCheckCfg.g:17152:1: ( rule__XFunctionTypeRef__Group_0_1__0 )?
             int alt121=2;
             int LA121_0 = input.LA(1);
 
@@ -49179,9 +49179,9 @@ public final void rule__XFunctionTypeRef__Group_0__1__Impl() throws RecognitionE
             }
             switch (alt121) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17152:2: rule__XFunctionTypeRef__Group_0_1__0
+                    // InternalCheckCfg.g:17152:2: rule__XFunctionTypeRef__Group_0_1__0
                     {
-                    pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0_1__0_in_rule__XFunctionTypeRef__Group_0__1__Impl34552);
+                    pushFollow(FOLLOW_2);
                     rule__XFunctionTypeRef__Group_0_1__0();
 
                     state._fsp--;
@@ -49217,16 +49217,16 @@ public final void rule__XFunctionTypeRef__Group_0__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17162:1: rule__XFunctionTypeRef__Group_0__2 : rule__XFunctionTypeRef__Group_0__2__Impl ;
+    // InternalCheckCfg.g:17162:1: rule__XFunctionTypeRef__Group_0__2 : rule__XFunctionTypeRef__Group_0__2__Impl ;
     public final void rule__XFunctionTypeRef__Group_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17166:1: ( rule__XFunctionTypeRef__Group_0__2__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17167:2: rule__XFunctionTypeRef__Group_0__2__Impl
+            // InternalCheckCfg.g:17166:1: ( rule__XFunctionTypeRef__Group_0__2__Impl )
+            // InternalCheckCfg.g:17167:2: rule__XFunctionTypeRef__Group_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0__2__Impl_in_rule__XFunctionTypeRef__Group_0__234583);
+            pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__Group_0__2__Impl();
 
             state._fsp--;
@@ -49250,22 +49250,22 @@ public final void rule__XFunctionTypeRef__Group_0__2() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17173:1: rule__XFunctionTypeRef__Group_0__2__Impl : ( ')' ) ;
+    // InternalCheckCfg.g:17173:1: rule__XFunctionTypeRef__Group_0__2__Impl : ( ')' ) ;
     public final void rule__XFunctionTypeRef__Group_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17177:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17178:1: ( ')' )
+            // InternalCheckCfg.g:17177:1: ( ( ')' ) )
+            // InternalCheckCfg.g:17178:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17178:1: ( ')' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17179:1: ')'
+            // InternalCheckCfg.g:17178:1: ( ')' )
+            // InternalCheckCfg.g:17179:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getRightParenthesisKeyword_0_2()); 
             }
-            match(input,63,FOLLOW_63_in_rule__XFunctionTypeRef__Group_0__2__Impl34611); if (state.failed) return ;
+            match(input,63,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFunctionTypeRefAccess().getRightParenthesisKeyword_0_2()); 
             }
@@ -49291,21 +49291,21 @@ public final void rule__XFunctionTypeRef__Group_0__2__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17198:1: rule__XFunctionTypeRef__Group_0_1__0 : rule__XFunctionTypeRef__Group_0_1__0__Impl rule__XFunctionTypeRef__Group_0_1__1 ;
+    // InternalCheckCfg.g:17198:1: rule__XFunctionTypeRef__Group_0_1__0 : rule__XFunctionTypeRef__Group_0_1__0__Impl rule__XFunctionTypeRef__Group_0_1__1 ;
     public final void rule__XFunctionTypeRef__Group_0_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17202:1: ( rule__XFunctionTypeRef__Group_0_1__0__Impl rule__XFunctionTypeRef__Group_0_1__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17203:2: rule__XFunctionTypeRef__Group_0_1__0__Impl rule__XFunctionTypeRef__Group_0_1__1
+            // InternalCheckCfg.g:17202:1: ( rule__XFunctionTypeRef__Group_0_1__0__Impl rule__XFunctionTypeRef__Group_0_1__1 )
+            // InternalCheckCfg.g:17203:2: rule__XFunctionTypeRef__Group_0_1__0__Impl rule__XFunctionTypeRef__Group_0_1__1
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0_1__0__Impl_in_rule__XFunctionTypeRef__Group_0_1__034648);
+            pushFollow(FOLLOW_25);
             rule__XFunctionTypeRef__Group_0_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0_1__1_in_rule__XFunctionTypeRef__Group_0_1__034651);
+            pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__Group_0_1__1();
 
             state._fsp--;
@@ -49329,25 +49329,25 @@ public final void rule__XFunctionTypeRef__Group_0_1__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17210:1: rule__XFunctionTypeRef__Group_0_1__0__Impl : ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) ) ;
+    // InternalCheckCfg.g:17210:1: rule__XFunctionTypeRef__Group_0_1__0__Impl : ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) ) ;
     public final void rule__XFunctionTypeRef__Group_0_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17214:1: ( ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17215:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) )
+            // InternalCheckCfg.g:17214:1: ( ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) ) )
+            // InternalCheckCfg.g:17215:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17215:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17216:1: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 )
+            // InternalCheckCfg.g:17215:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) )
+            // InternalCheckCfg.g:17216:1: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getParamTypesAssignment_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17217:1: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17217:2: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0
+            // InternalCheckCfg.g:17217:1: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 )
+            // InternalCheckCfg.g:17217:2: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0_in_rule__XFunctionTypeRef__Group_0_1__0__Impl34678);
+            pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0();
 
             state._fsp--;
@@ -49380,16 +49380,16 @@ public final void rule__XFunctionTypeRef__Group_0_1__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17227:1: rule__XFunctionTypeRef__Group_0_1__1 : rule__XFunctionTypeRef__Group_0_1__1__Impl ;
+    // InternalCheckCfg.g:17227:1: rule__XFunctionTypeRef__Group_0_1__1 : rule__XFunctionTypeRef__Group_0_1__1__Impl ;
     public final void rule__XFunctionTypeRef__Group_0_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17231:1: ( rule__XFunctionTypeRef__Group_0_1__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17232:2: rule__XFunctionTypeRef__Group_0_1__1__Impl
+            // InternalCheckCfg.g:17231:1: ( rule__XFunctionTypeRef__Group_0_1__1__Impl )
+            // InternalCheckCfg.g:17232:2: rule__XFunctionTypeRef__Group_0_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0_1__1__Impl_in_rule__XFunctionTypeRef__Group_0_1__134708);
+            pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__Group_0_1__1__Impl();
 
             state._fsp--;
@@ -49413,22 +49413,22 @@ public final void rule__XFunctionTypeRef__Group_0_1__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17238:1: rule__XFunctionTypeRef__Group_0_1__1__Impl : ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* ) ;
+    // InternalCheckCfg.g:17238:1: rule__XFunctionTypeRef__Group_0_1__1__Impl : ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* ) ;
     public final void rule__XFunctionTypeRef__Group_0_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17242:1: ( ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17243:1: ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* )
+            // InternalCheckCfg.g:17242:1: ( ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* ) )
+            // InternalCheckCfg.g:17243:1: ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17243:1: ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17244:1: ( rule__XFunctionTypeRef__Group_0_1_1__0 )*
+            // InternalCheckCfg.g:17243:1: ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* )
+            // InternalCheckCfg.g:17244:1: ( rule__XFunctionTypeRef__Group_0_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getGroup_0_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17245:1: ( rule__XFunctionTypeRef__Group_0_1_1__0 )*
+            // InternalCheckCfg.g:17245:1: ( rule__XFunctionTypeRef__Group_0_1_1__0 )*
             loop122:
             do {
                 int alt122=2;
@@ -49441,9 +49441,9 @@ public final void rule__XFunctionTypeRef__Group_0_1__1__Impl() throws Recognitio
 
                 switch (alt122) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17245:2: rule__XFunctionTypeRef__Group_0_1_1__0
+            	    // InternalCheckCfg.g:17245:2: rule__XFunctionTypeRef__Group_0_1_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0_1_1__0_in_rule__XFunctionTypeRef__Group_0_1__1__Impl34735);
+            	    pushFollow(FOLLOW_18);
             	    rule__XFunctionTypeRef__Group_0_1_1__0();
 
             	    state._fsp--;
@@ -49482,21 +49482,21 @@ public final void rule__XFunctionTypeRef__Group_0_1__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1_1__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17259:1: rule__XFunctionTypeRef__Group_0_1_1__0 : rule__XFunctionTypeRef__Group_0_1_1__0__Impl rule__XFunctionTypeRef__Group_0_1_1__1 ;
+    // InternalCheckCfg.g:17259:1: rule__XFunctionTypeRef__Group_0_1_1__0 : rule__XFunctionTypeRef__Group_0_1_1__0__Impl rule__XFunctionTypeRef__Group_0_1_1__1 ;
     public final void rule__XFunctionTypeRef__Group_0_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17263:1: ( rule__XFunctionTypeRef__Group_0_1_1__0__Impl rule__XFunctionTypeRef__Group_0_1_1__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17264:2: rule__XFunctionTypeRef__Group_0_1_1__0__Impl rule__XFunctionTypeRef__Group_0_1_1__1
+            // InternalCheckCfg.g:17263:1: ( rule__XFunctionTypeRef__Group_0_1_1__0__Impl rule__XFunctionTypeRef__Group_0_1_1__1 )
+            // InternalCheckCfg.g:17264:2: rule__XFunctionTypeRef__Group_0_1_1__0__Impl rule__XFunctionTypeRef__Group_0_1_1__1
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0_1_1__0__Impl_in_rule__XFunctionTypeRef__Group_0_1_1__034770);
+            pushFollow(FOLLOW_39);
             rule__XFunctionTypeRef__Group_0_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0_1_1__1_in_rule__XFunctionTypeRef__Group_0_1_1__034773);
+            pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__Group_0_1_1__1();
 
             state._fsp--;
@@ -49520,22 +49520,22 @@ public final void rule__XFunctionTypeRef__Group_0_1_1__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17271:1: rule__XFunctionTypeRef__Group_0_1_1__0__Impl : ( ',' ) ;
+    // InternalCheckCfg.g:17271:1: rule__XFunctionTypeRef__Group_0_1_1__0__Impl : ( ',' ) ;
     public final void rule__XFunctionTypeRef__Group_0_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17275:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17276:1: ( ',' )
+            // InternalCheckCfg.g:17275:1: ( ( ',' ) )
+            // InternalCheckCfg.g:17276:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17276:1: ( ',' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17277:1: ','
+            // InternalCheckCfg.g:17276:1: ( ',' )
+            // InternalCheckCfg.g:17277:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getCommaKeyword_0_1_1_0()); 
             }
-            match(input,64,FOLLOW_64_in_rule__XFunctionTypeRef__Group_0_1_1__0__Impl34801); if (state.failed) return ;
+            match(input,64,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFunctionTypeRefAccess().getCommaKeyword_0_1_1_0()); 
             }
@@ -49561,16 +49561,16 @@ public final void rule__XFunctionTypeRef__Group_0_1_1__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1_1__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17290:1: rule__XFunctionTypeRef__Group_0_1_1__1 : rule__XFunctionTypeRef__Group_0_1_1__1__Impl ;
+    // InternalCheckCfg.g:17290:1: rule__XFunctionTypeRef__Group_0_1_1__1 : rule__XFunctionTypeRef__Group_0_1_1__1__Impl ;
     public final void rule__XFunctionTypeRef__Group_0_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17294:1: ( rule__XFunctionTypeRef__Group_0_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17295:2: rule__XFunctionTypeRef__Group_0_1_1__1__Impl
+            // InternalCheckCfg.g:17294:1: ( rule__XFunctionTypeRef__Group_0_1_1__1__Impl )
+            // InternalCheckCfg.g:17295:2: rule__XFunctionTypeRef__Group_0_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0_1_1__1__Impl_in_rule__XFunctionTypeRef__Group_0_1_1__134832);
+            pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__Group_0_1_1__1__Impl();
 
             state._fsp--;
@@ -49594,25 +49594,25 @@ public final void rule__XFunctionTypeRef__Group_0_1_1__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17301:1: rule__XFunctionTypeRef__Group_0_1_1__1__Impl : ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) ) ;
+    // InternalCheckCfg.g:17301:1: rule__XFunctionTypeRef__Group_0_1_1__1__Impl : ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) ) ;
     public final void rule__XFunctionTypeRef__Group_0_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17305:1: ( ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17306:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) )
+            // InternalCheckCfg.g:17305:1: ( ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) ) )
+            // InternalCheckCfg.g:17306:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17306:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17307:1: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 )
+            // InternalCheckCfg.g:17306:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) )
+            // InternalCheckCfg.g:17307:1: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getParamTypesAssignment_0_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17308:1: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17308:2: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1
+            // InternalCheckCfg.g:17308:1: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 )
+            // InternalCheckCfg.g:17308:2: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1_in_rule__XFunctionTypeRef__Group_0_1_1__1__Impl34859);
+            pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1();
 
             state._fsp--;
@@ -49645,21 +49645,21 @@ public final void rule__XFunctionTypeRef__Group_0_1_1__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17322:1: rule__JvmParameterizedTypeReference__Group__0 : rule__JvmParameterizedTypeReference__Group__0__Impl rule__JvmParameterizedTypeReference__Group__1 ;
+    // InternalCheckCfg.g:17322:1: rule__JvmParameterizedTypeReference__Group__0 : rule__JvmParameterizedTypeReference__Group__0__Impl rule__JvmParameterizedTypeReference__Group__1 ;
     public final void rule__JvmParameterizedTypeReference__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17326:1: ( rule__JvmParameterizedTypeReference__Group__0__Impl rule__JvmParameterizedTypeReference__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17327:2: rule__JvmParameterizedTypeReference__Group__0__Impl rule__JvmParameterizedTypeReference__Group__1
+            // InternalCheckCfg.g:17326:1: ( rule__JvmParameterizedTypeReference__Group__0__Impl rule__JvmParameterizedTypeReference__Group__1 )
+            // InternalCheckCfg.g:17327:2: rule__JvmParameterizedTypeReference__Group__0__Impl rule__JvmParameterizedTypeReference__Group__1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group__0__Impl_in_rule__JvmParameterizedTypeReference__Group__034893);
+            pushFollow(FOLLOW_29);
             rule__JvmParameterizedTypeReference__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group__1_in_rule__JvmParameterizedTypeReference__Group__034896);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group__1();
 
             state._fsp--;
@@ -49683,25 +49683,25 @@ public final void rule__JvmParameterizedTypeReference__Group__0() throws Recogni
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17334:1: rule__JvmParameterizedTypeReference__Group__0__Impl : ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) ) ;
+    // InternalCheckCfg.g:17334:1: rule__JvmParameterizedTypeReference__Group__0__Impl : ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17338:1: ( ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17339:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) )
+            // InternalCheckCfg.g:17338:1: ( ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) ) )
+            // InternalCheckCfg.g:17339:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17339:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17340:1: ( rule__JvmParameterizedTypeReference__TypeAssignment_0 )
+            // InternalCheckCfg.g:17339:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) )
+            // InternalCheckCfg.g:17340:1: ( rule__JvmParameterizedTypeReference__TypeAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17341:1: ( rule__JvmParameterizedTypeReference__TypeAssignment_0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17341:2: rule__JvmParameterizedTypeReference__TypeAssignment_0
+            // InternalCheckCfg.g:17341:1: ( rule__JvmParameterizedTypeReference__TypeAssignment_0 )
+            // InternalCheckCfg.g:17341:2: rule__JvmParameterizedTypeReference__TypeAssignment_0
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__TypeAssignment_0_in_rule__JvmParameterizedTypeReference__Group__0__Impl34923);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__TypeAssignment_0();
 
             state._fsp--;
@@ -49734,16 +49734,16 @@ public final void rule__JvmParameterizedTypeReference__Group__0__Impl() throws R
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17351:1: rule__JvmParameterizedTypeReference__Group__1 : rule__JvmParameterizedTypeReference__Group__1__Impl ;
+    // InternalCheckCfg.g:17351:1: rule__JvmParameterizedTypeReference__Group__1 : rule__JvmParameterizedTypeReference__Group__1__Impl ;
     public final void rule__JvmParameterizedTypeReference__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17355:1: ( rule__JvmParameterizedTypeReference__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17356:2: rule__JvmParameterizedTypeReference__Group__1__Impl
+            // InternalCheckCfg.g:17355:1: ( rule__JvmParameterizedTypeReference__Group__1__Impl )
+            // InternalCheckCfg.g:17356:2: rule__JvmParameterizedTypeReference__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group__1__Impl_in_rule__JvmParameterizedTypeReference__Group__134953);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group__1__Impl();
 
             state._fsp--;
@@ -49767,29 +49767,29 @@ public final void rule__JvmParameterizedTypeReference__Group__1() throws Recogni
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17362:1: rule__JvmParameterizedTypeReference__Group__1__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? ) ;
+    // InternalCheckCfg.g:17362:1: rule__JvmParameterizedTypeReference__Group__1__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? ) ;
     public final void rule__JvmParameterizedTypeReference__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17366:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17367:1: ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? )
+            // InternalCheckCfg.g:17366:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? ) )
+            // InternalCheckCfg.g:17367:1: ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17367:1: ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17368:1: ( rule__JvmParameterizedTypeReference__Group_1__0 )?
+            // InternalCheckCfg.g:17367:1: ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? )
+            // InternalCheckCfg.g:17368:1: ( rule__JvmParameterizedTypeReference__Group_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17369:1: ( rule__JvmParameterizedTypeReference__Group_1__0 )?
+            // InternalCheckCfg.g:17369:1: ( rule__JvmParameterizedTypeReference__Group_1__0 )?
             int alt123=2;
             alt123 = dfa123.predict(input);
             switch (alt123) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17369:2: rule__JvmParameterizedTypeReference__Group_1__0
+                    // InternalCheckCfg.g:17369:2: rule__JvmParameterizedTypeReference__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__0_in_rule__JvmParameterizedTypeReference__Group__1__Impl34980);
+                    pushFollow(FOLLOW_2);
                     rule__JvmParameterizedTypeReference__Group_1__0();
 
                     state._fsp--;
@@ -49825,21 +49825,21 @@ public final void rule__JvmParameterizedTypeReference__Group__1__Impl() throws R
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17383:1: rule__JvmParameterizedTypeReference__Group_1__0 : rule__JvmParameterizedTypeReference__Group_1__0__Impl rule__JvmParameterizedTypeReference__Group_1__1 ;
+    // InternalCheckCfg.g:17383:1: rule__JvmParameterizedTypeReference__Group_1__0 : rule__JvmParameterizedTypeReference__Group_1__0__Impl rule__JvmParameterizedTypeReference__Group_1__1 ;
     public final void rule__JvmParameterizedTypeReference__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17387:1: ( rule__JvmParameterizedTypeReference__Group_1__0__Impl rule__JvmParameterizedTypeReference__Group_1__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17388:2: rule__JvmParameterizedTypeReference__Group_1__0__Impl rule__JvmParameterizedTypeReference__Group_1__1
+            // InternalCheckCfg.g:17387:1: ( rule__JvmParameterizedTypeReference__Group_1__0__Impl rule__JvmParameterizedTypeReference__Group_1__1 )
+            // InternalCheckCfg.g:17388:2: rule__JvmParameterizedTypeReference__Group_1__0__Impl rule__JvmParameterizedTypeReference__Group_1__1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1__035015);
+            pushFollow(FOLLOW_58);
             rule__JvmParameterizedTypeReference__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__1_in_rule__JvmParameterizedTypeReference__Group_1__035018);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1__1();
 
             state._fsp--;
@@ -49863,25 +49863,25 @@ public final void rule__JvmParameterizedTypeReference__Group_1__0() throws Recog
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17395:1: rule__JvmParameterizedTypeReference__Group_1__0__Impl : ( ( '<' ) ) ;
+    // InternalCheckCfg.g:17395:1: rule__JvmParameterizedTypeReference__Group_1__0__Impl : ( ( '<' ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17399:1: ( ( ( '<' ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17400:1: ( ( '<' ) )
+            // InternalCheckCfg.g:17399:1: ( ( ( '<' ) ) )
+            // InternalCheckCfg.g:17400:1: ( ( '<' ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17400:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17401:1: ( '<' )
+            // InternalCheckCfg.g:17400:1: ( ( '<' ) )
+            // InternalCheckCfg.g:17401:1: ( '<' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getLessThanSignKeyword_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17402:1: ( '<' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17403:2: '<'
+            // InternalCheckCfg.g:17402:1: ( '<' )
+            // InternalCheckCfg.g:17403:2: '<'
             {
-            match(input,27,FOLLOW_27_in_rule__JvmParameterizedTypeReference__Group_1__0__Impl35047); if (state.failed) return ;
+            match(input,27,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -49910,21 +49910,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1__0__Impl() throws
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17414:1: rule__JvmParameterizedTypeReference__Group_1__1 : rule__JvmParameterizedTypeReference__Group_1__1__Impl rule__JvmParameterizedTypeReference__Group_1__2 ;
+    // InternalCheckCfg.g:17414:1: rule__JvmParameterizedTypeReference__Group_1__1 : rule__JvmParameterizedTypeReference__Group_1__1__Impl rule__JvmParameterizedTypeReference__Group_1__2 ;
     public final void rule__JvmParameterizedTypeReference__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17418:1: ( rule__JvmParameterizedTypeReference__Group_1__1__Impl rule__JvmParameterizedTypeReference__Group_1__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17419:2: rule__JvmParameterizedTypeReference__Group_1__1__Impl rule__JvmParameterizedTypeReference__Group_1__2
+            // InternalCheckCfg.g:17418:1: ( rule__JvmParameterizedTypeReference__Group_1__1__Impl rule__JvmParameterizedTypeReference__Group_1__2 )
+            // InternalCheckCfg.g:17419:2: rule__JvmParameterizedTypeReference__Group_1__1__Impl rule__JvmParameterizedTypeReference__Group_1__2
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1__135079);
+            pushFollow(FOLLOW_59);
             rule__JvmParameterizedTypeReference__Group_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__2_in_rule__JvmParameterizedTypeReference__Group_1__135082);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1__2();
 
             state._fsp--;
@@ -49948,25 +49948,25 @@ public final void rule__JvmParameterizedTypeReference__Group_1__1() throws Recog
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17426:1: rule__JvmParameterizedTypeReference__Group_1__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) ) ;
+    // InternalCheckCfg.g:17426:1: rule__JvmParameterizedTypeReference__Group_1__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17430:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17431:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) )
+            // InternalCheckCfg.g:17430:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) ) )
+            // InternalCheckCfg.g:17431:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17431:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17432:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 )
+            // InternalCheckCfg.g:17431:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) )
+            // InternalCheckCfg.g:17432:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17433:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17433:2: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1
+            // InternalCheckCfg.g:17433:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 )
+            // InternalCheckCfg.g:17433:2: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1_in_rule__JvmParameterizedTypeReference__Group_1__1__Impl35109);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1();
 
             state._fsp--;
@@ -49999,21 +49999,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1__1__Impl() throws
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17443:1: rule__JvmParameterizedTypeReference__Group_1__2 : rule__JvmParameterizedTypeReference__Group_1__2__Impl rule__JvmParameterizedTypeReference__Group_1__3 ;
+    // InternalCheckCfg.g:17443:1: rule__JvmParameterizedTypeReference__Group_1__2 : rule__JvmParameterizedTypeReference__Group_1__2__Impl rule__JvmParameterizedTypeReference__Group_1__3 ;
     public final void rule__JvmParameterizedTypeReference__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17447:1: ( rule__JvmParameterizedTypeReference__Group_1__2__Impl rule__JvmParameterizedTypeReference__Group_1__3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17448:2: rule__JvmParameterizedTypeReference__Group_1__2__Impl rule__JvmParameterizedTypeReference__Group_1__3
+            // InternalCheckCfg.g:17447:1: ( rule__JvmParameterizedTypeReference__Group_1__2__Impl rule__JvmParameterizedTypeReference__Group_1__3 )
+            // InternalCheckCfg.g:17448:2: rule__JvmParameterizedTypeReference__Group_1__2__Impl rule__JvmParameterizedTypeReference__Group_1__3
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__2__Impl_in_rule__JvmParameterizedTypeReference__Group_1__235139);
+            pushFollow(FOLLOW_59);
             rule__JvmParameterizedTypeReference__Group_1__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__3_in_rule__JvmParameterizedTypeReference__Group_1__235142);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1__3();
 
             state._fsp--;
@@ -50037,22 +50037,22 @@ public final void rule__JvmParameterizedTypeReference__Group_1__2() throws Recog
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17455:1: rule__JvmParameterizedTypeReference__Group_1__2__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* ) ;
+    // InternalCheckCfg.g:17455:1: rule__JvmParameterizedTypeReference__Group_1__2__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17459:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17460:1: ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* )
+            // InternalCheckCfg.g:17459:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* ) )
+            // InternalCheckCfg.g:17460:1: ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17460:1: ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17461:1: ( rule__JvmParameterizedTypeReference__Group_1_2__0 )*
+            // InternalCheckCfg.g:17460:1: ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* )
+            // InternalCheckCfg.g:17461:1: ( rule__JvmParameterizedTypeReference__Group_1_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17462:1: ( rule__JvmParameterizedTypeReference__Group_1_2__0 )*
+            // InternalCheckCfg.g:17462:1: ( rule__JvmParameterizedTypeReference__Group_1_2__0 )*
             loop124:
             do {
                 int alt124=2;
@@ -50065,9 +50065,9 @@ public final void rule__JvmParameterizedTypeReference__Group_1__2__Impl() throws
 
                 switch (alt124) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17462:2: rule__JvmParameterizedTypeReference__Group_1_2__0
+            	    // InternalCheckCfg.g:17462:2: rule__JvmParameterizedTypeReference__Group_1_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_2__0_in_rule__JvmParameterizedTypeReference__Group_1__2__Impl35169);
+            	    pushFollow(FOLLOW_18);
             	    rule__JvmParameterizedTypeReference__Group_1_2__0();
 
             	    state._fsp--;
@@ -50106,21 +50106,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1__2__Impl() throws
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17472:1: rule__JvmParameterizedTypeReference__Group_1__3 : rule__JvmParameterizedTypeReference__Group_1__3__Impl rule__JvmParameterizedTypeReference__Group_1__4 ;
+    // InternalCheckCfg.g:17472:1: rule__JvmParameterizedTypeReference__Group_1__3 : rule__JvmParameterizedTypeReference__Group_1__3__Impl rule__JvmParameterizedTypeReference__Group_1__4 ;
     public final void rule__JvmParameterizedTypeReference__Group_1__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17476:1: ( rule__JvmParameterizedTypeReference__Group_1__3__Impl rule__JvmParameterizedTypeReference__Group_1__4 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17477:2: rule__JvmParameterizedTypeReference__Group_1__3__Impl rule__JvmParameterizedTypeReference__Group_1__4
+            // InternalCheckCfg.g:17476:1: ( rule__JvmParameterizedTypeReference__Group_1__3__Impl rule__JvmParameterizedTypeReference__Group_1__4 )
+            // InternalCheckCfg.g:17477:2: rule__JvmParameterizedTypeReference__Group_1__3__Impl rule__JvmParameterizedTypeReference__Group_1__4
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__3__Impl_in_rule__JvmParameterizedTypeReference__Group_1__335200);
+            pushFollow(FOLLOW_100);
             rule__JvmParameterizedTypeReference__Group_1__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__4_in_rule__JvmParameterizedTypeReference__Group_1__335203);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1__4();
 
             state._fsp--;
@@ -50144,22 +50144,22 @@ public final void rule__JvmParameterizedTypeReference__Group_1__3() throws Recog
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__3__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17484:1: rule__JvmParameterizedTypeReference__Group_1__3__Impl : ( '>' ) ;
+    // InternalCheckCfg.g:17484:1: rule__JvmParameterizedTypeReference__Group_1__3__Impl : ( '>' ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17488:1: ( ( '>' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17489:1: ( '>' )
+            // InternalCheckCfg.g:17488:1: ( ( '>' ) )
+            // InternalCheckCfg.g:17489:1: ( '>' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17489:1: ( '>' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17490:1: '>'
+            // InternalCheckCfg.g:17489:1: ( '>' )
+            // InternalCheckCfg.g:17490:1: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGreaterThanSignKeyword_1_3()); 
             }
-            match(input,26,FOLLOW_26_in_rule__JvmParameterizedTypeReference__Group_1__3__Impl35231); if (state.failed) return ;
+            match(input,26,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGreaterThanSignKeyword_1_3()); 
             }
@@ -50185,16 +50185,16 @@ public final void rule__JvmParameterizedTypeReference__Group_1__3__Impl() throws
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__4"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17503:1: rule__JvmParameterizedTypeReference__Group_1__4 : rule__JvmParameterizedTypeReference__Group_1__4__Impl ;
+    // InternalCheckCfg.g:17503:1: rule__JvmParameterizedTypeReference__Group_1__4 : rule__JvmParameterizedTypeReference__Group_1__4__Impl ;
     public final void rule__JvmParameterizedTypeReference__Group_1__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17507:1: ( rule__JvmParameterizedTypeReference__Group_1__4__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17508:2: rule__JvmParameterizedTypeReference__Group_1__4__Impl
+            // InternalCheckCfg.g:17507:1: ( rule__JvmParameterizedTypeReference__Group_1__4__Impl )
+            // InternalCheckCfg.g:17508:2: rule__JvmParameterizedTypeReference__Group_1__4__Impl
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__4__Impl_in_rule__JvmParameterizedTypeReference__Group_1__435262);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1__4__Impl();
 
             state._fsp--;
@@ -50218,22 +50218,22 @@ public final void rule__JvmParameterizedTypeReference__Group_1__4() throws Recog
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__4__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17514:1: rule__JvmParameterizedTypeReference__Group_1__4__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* ) ;
+    // InternalCheckCfg.g:17514:1: rule__JvmParameterizedTypeReference__Group_1__4__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17518:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17519:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* )
+            // InternalCheckCfg.g:17518:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* ) )
+            // InternalCheckCfg.g:17519:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17519:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17520:1: ( rule__JvmParameterizedTypeReference__Group_1_4__0 )*
+            // InternalCheckCfg.g:17519:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* )
+            // InternalCheckCfg.g:17520:1: ( rule__JvmParameterizedTypeReference__Group_1_4__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup_1_4()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17521:1: ( rule__JvmParameterizedTypeReference__Group_1_4__0 )*
+            // InternalCheckCfg.g:17521:1: ( rule__JvmParameterizedTypeReference__Group_1_4__0 )*
             loop125:
             do {
                 int alt125=2;
@@ -50258,9 +50258,9 @@ public final void rule__JvmParameterizedTypeReference__Group_1__4__Impl() throws
 
                 switch (alt125) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17521:2: rule__JvmParameterizedTypeReference__Group_1_4__0
+            	    // InternalCheckCfg.g:17521:2: rule__JvmParameterizedTypeReference__Group_1_4__0
             	    {
-            	    pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__0_in_rule__JvmParameterizedTypeReference__Group_1__4__Impl35289);
+            	    pushFollow(FOLLOW_101);
             	    rule__JvmParameterizedTypeReference__Group_1_4__0();
 
             	    state._fsp--;
@@ -50299,21 +50299,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1__4__Impl() throws
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_2__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17541:1: rule__JvmParameterizedTypeReference__Group_1_2__0 : rule__JvmParameterizedTypeReference__Group_1_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_2__1 ;
+    // InternalCheckCfg.g:17541:1: rule__JvmParameterizedTypeReference__Group_1_2__0 : rule__JvmParameterizedTypeReference__Group_1_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_2__1 ;
     public final void rule__JvmParameterizedTypeReference__Group_1_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17545:1: ( rule__JvmParameterizedTypeReference__Group_1_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_2__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17546:2: rule__JvmParameterizedTypeReference__Group_1_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_2__1
+            // InternalCheckCfg.g:17545:1: ( rule__JvmParameterizedTypeReference__Group_1_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_2__1 )
+            // InternalCheckCfg.g:17546:2: rule__JvmParameterizedTypeReference__Group_1_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_2__1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_2__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_2__035330);
+            pushFollow(FOLLOW_58);
             rule__JvmParameterizedTypeReference__Group_1_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_2__1_in_rule__JvmParameterizedTypeReference__Group_1_2__035333);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_2__1();
 
             state._fsp--;
@@ -50337,22 +50337,22 @@ public final void rule__JvmParameterizedTypeReference__Group_1_2__0() throws Rec
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_2__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17553:1: rule__JvmParameterizedTypeReference__Group_1_2__0__Impl : ( ',' ) ;
+    // InternalCheckCfg.g:17553:1: rule__JvmParameterizedTypeReference__Group_1_2__0__Impl : ( ',' ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17557:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17558:1: ( ',' )
+            // InternalCheckCfg.g:17557:1: ( ( ',' ) )
+            // InternalCheckCfg.g:17558:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17558:1: ( ',' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17559:1: ','
+            // InternalCheckCfg.g:17558:1: ( ',' )
+            // InternalCheckCfg.g:17559:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getCommaKeyword_1_2_0()); 
             }
-            match(input,64,FOLLOW_64_in_rule__JvmParameterizedTypeReference__Group_1_2__0__Impl35361); if (state.failed) return ;
+            match(input,64,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmParameterizedTypeReferenceAccess().getCommaKeyword_1_2_0()); 
             }
@@ -50378,16 +50378,16 @@ public final void rule__JvmParameterizedTypeReference__Group_1_2__0__Impl() thro
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_2__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17572:1: rule__JvmParameterizedTypeReference__Group_1_2__1 : rule__JvmParameterizedTypeReference__Group_1_2__1__Impl ;
+    // InternalCheckCfg.g:17572:1: rule__JvmParameterizedTypeReference__Group_1_2__1 : rule__JvmParameterizedTypeReference__Group_1_2__1__Impl ;
     public final void rule__JvmParameterizedTypeReference__Group_1_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17576:1: ( rule__JvmParameterizedTypeReference__Group_1_2__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17577:2: rule__JvmParameterizedTypeReference__Group_1_2__1__Impl
+            // InternalCheckCfg.g:17576:1: ( rule__JvmParameterizedTypeReference__Group_1_2__1__Impl )
+            // InternalCheckCfg.g:17577:2: rule__JvmParameterizedTypeReference__Group_1_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_2__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_2__135392);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_2__1__Impl();
 
             state._fsp--;
@@ -50411,25 +50411,25 @@ public final void rule__JvmParameterizedTypeReference__Group_1_2__1() throws Rec
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_2__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17583:1: rule__JvmParameterizedTypeReference__Group_1_2__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) ) ;
+    // InternalCheckCfg.g:17583:1: rule__JvmParameterizedTypeReference__Group_1_2__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17587:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17588:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) )
+            // InternalCheckCfg.g:17587:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) ) )
+            // InternalCheckCfg.g:17588:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17588:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17589:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 )
+            // InternalCheckCfg.g:17588:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) )
+            // InternalCheckCfg.g:17589:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsAssignment_1_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17590:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17590:2: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1
+            // InternalCheckCfg.g:17590:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 )
+            // InternalCheckCfg.g:17590:2: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1_in_rule__JvmParameterizedTypeReference__Group_1_2__1__Impl35419);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1();
 
             state._fsp--;
@@ -50462,21 +50462,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1_2__1__Impl() thro
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17604:1: rule__JvmParameterizedTypeReference__Group_1_4__0 : rule__JvmParameterizedTypeReference__Group_1_4__0__Impl rule__JvmParameterizedTypeReference__Group_1_4__1 ;
+    // InternalCheckCfg.g:17604:1: rule__JvmParameterizedTypeReference__Group_1_4__0 : rule__JvmParameterizedTypeReference__Group_1_4__0__Impl rule__JvmParameterizedTypeReference__Group_1_4__1 ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17608:1: ( rule__JvmParameterizedTypeReference__Group_1_4__0__Impl rule__JvmParameterizedTypeReference__Group_1_4__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17609:2: rule__JvmParameterizedTypeReference__Group_1_4__0__Impl rule__JvmParameterizedTypeReference__Group_1_4__1
+            // InternalCheckCfg.g:17608:1: ( rule__JvmParameterizedTypeReference__Group_1_4__0__Impl rule__JvmParameterizedTypeReference__Group_1_4__1 )
+            // InternalCheckCfg.g:17609:2: rule__JvmParameterizedTypeReference__Group_1_4__0__Impl rule__JvmParameterizedTypeReference__Group_1_4__1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4__035453);
+            pushFollow(FOLLOW_5);
             rule__JvmParameterizedTypeReference__Group_1_4__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__1_in_rule__JvmParameterizedTypeReference__Group_1_4__035456);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4__1();
 
             state._fsp--;
@@ -50500,25 +50500,25 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4__0() throws Rec
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17616:1: rule__JvmParameterizedTypeReference__Group_1_4__0__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) ) ;
+    // InternalCheckCfg.g:17616:1: rule__JvmParameterizedTypeReference__Group_1_4__0__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17620:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17621:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) )
+            // InternalCheckCfg.g:17620:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) ) )
+            // InternalCheckCfg.g:17621:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17621:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17622:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 )
+            // InternalCheckCfg.g:17621:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) )
+            // InternalCheckCfg.g:17622:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup_1_4_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17623:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17623:2: rule__JvmParameterizedTypeReference__Group_1_4_0__0
+            // InternalCheckCfg.g:17623:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 )
+            // InternalCheckCfg.g:17623:2: rule__JvmParameterizedTypeReference__Group_1_4_0__0
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0__0_in_rule__JvmParameterizedTypeReference__Group_1_4__0__Impl35483);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_0__0();
 
             state._fsp--;
@@ -50551,21 +50551,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4__0__Impl() thro
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17633:1: rule__JvmParameterizedTypeReference__Group_1_4__1 : rule__JvmParameterizedTypeReference__Group_1_4__1__Impl rule__JvmParameterizedTypeReference__Group_1_4__2 ;
+    // InternalCheckCfg.g:17633:1: rule__JvmParameterizedTypeReference__Group_1_4__1 : rule__JvmParameterizedTypeReference__Group_1_4__1__Impl rule__JvmParameterizedTypeReference__Group_1_4__2 ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17637:1: ( rule__JvmParameterizedTypeReference__Group_1_4__1__Impl rule__JvmParameterizedTypeReference__Group_1_4__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17638:2: rule__JvmParameterizedTypeReference__Group_1_4__1__Impl rule__JvmParameterizedTypeReference__Group_1_4__2
+            // InternalCheckCfg.g:17637:1: ( rule__JvmParameterizedTypeReference__Group_1_4__1__Impl rule__JvmParameterizedTypeReference__Group_1_4__2 )
+            // InternalCheckCfg.g:17638:2: rule__JvmParameterizedTypeReference__Group_1_4__1__Impl rule__JvmParameterizedTypeReference__Group_1_4__2
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4__135513);
+            pushFollow(FOLLOW_29);
             rule__JvmParameterizedTypeReference__Group_1_4__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__2_in_rule__JvmParameterizedTypeReference__Group_1_4__135516);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4__2();
 
             state._fsp--;
@@ -50589,25 +50589,25 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4__1() throws Rec
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17645:1: rule__JvmParameterizedTypeReference__Group_1_4__1__Impl : ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) ) ;
+    // InternalCheckCfg.g:17645:1: rule__JvmParameterizedTypeReference__Group_1_4__1__Impl : ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17649:1: ( ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17650:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) )
+            // InternalCheckCfg.g:17649:1: ( ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) ) )
+            // InternalCheckCfg.g:17650:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17650:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17651:1: ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 )
+            // InternalCheckCfg.g:17650:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) )
+            // InternalCheckCfg.g:17651:1: ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeAssignment_1_4_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17652:1: ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17652:2: rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1
+            // InternalCheckCfg.g:17652:1: ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 )
+            // InternalCheckCfg.g:17652:2: rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1_in_rule__JvmParameterizedTypeReference__Group_1_4__1__Impl35543);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1();
 
             state._fsp--;
@@ -50640,16 +50640,16 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4__1__Impl() thro
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17662:1: rule__JvmParameterizedTypeReference__Group_1_4__2 : rule__JvmParameterizedTypeReference__Group_1_4__2__Impl ;
+    // InternalCheckCfg.g:17662:1: rule__JvmParameterizedTypeReference__Group_1_4__2 : rule__JvmParameterizedTypeReference__Group_1_4__2__Impl ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17666:1: ( rule__JvmParameterizedTypeReference__Group_1_4__2__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17667:2: rule__JvmParameterizedTypeReference__Group_1_4__2__Impl
+            // InternalCheckCfg.g:17666:1: ( rule__JvmParameterizedTypeReference__Group_1_4__2__Impl )
+            // InternalCheckCfg.g:17667:2: rule__JvmParameterizedTypeReference__Group_1_4__2__Impl
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__2__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4__235573);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4__2__Impl();
 
             state._fsp--;
@@ -50673,29 +50673,29 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4__2() throws Rec
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17673:1: rule__JvmParameterizedTypeReference__Group_1_4__2__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? ) ;
+    // InternalCheckCfg.g:17673:1: rule__JvmParameterizedTypeReference__Group_1_4__2__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17677:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17678:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? )
+            // InternalCheckCfg.g:17677:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? ) )
+            // InternalCheckCfg.g:17678:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17678:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17679:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )?
+            // InternalCheckCfg.g:17678:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? )
+            // InternalCheckCfg.g:17679:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup_1_4_2()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17680:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )?
+            // InternalCheckCfg.g:17680:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )?
             int alt126=2;
             alt126 = dfa126.predict(input);
             switch (alt126) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17680:2: rule__JvmParameterizedTypeReference__Group_1_4_2__0
+                    // InternalCheckCfg.g:17680:2: rule__JvmParameterizedTypeReference__Group_1_4_2__0
                     {
-                    pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__0_in_rule__JvmParameterizedTypeReference__Group_1_4__2__Impl35600);
+                    pushFollow(FOLLOW_2);
                     rule__JvmParameterizedTypeReference__Group_1_4_2__0();
 
                     state._fsp--;
@@ -50731,16 +50731,16 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4__2__Impl() thro
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17696:1: rule__JvmParameterizedTypeReference__Group_1_4_0__0 : rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl ;
+    // InternalCheckCfg.g:17696:1: rule__JvmParameterizedTypeReference__Group_1_4_0__0 : rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17700:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17701:2: rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl
+            // InternalCheckCfg.g:17700:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl )
+            // InternalCheckCfg.g:17701:2: rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_0__035637);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl();
 
             state._fsp--;
@@ -50764,25 +50764,25 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_0__0() throws R
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17707:1: rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) ) ;
+    // InternalCheckCfg.g:17707:1: rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17711:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17712:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) )
+            // InternalCheckCfg.g:17711:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) ) )
+            // InternalCheckCfg.g:17712:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17712:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17713:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 )
+            // InternalCheckCfg.g:17712:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) )
+            // InternalCheckCfg.g:17713:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup_1_4_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17714:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17714:2: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0
+            // InternalCheckCfg.g:17714:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 )
+            // InternalCheckCfg.g:17714:2: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0_0__0_in_rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl35664);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_0_0__0();
 
             state._fsp--;
@@ -50815,21 +50815,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl() th
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_0_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17726:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 : rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_0_0__1 ;
+    // InternalCheckCfg.g:17726:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 : rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_0_0__1 ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17730:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_0_0__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17731:2: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_0_0__1
+            // InternalCheckCfg.g:17730:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_0_0__1 )
+            // InternalCheckCfg.g:17731:2: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_0_0__1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_0_0__035696);
+            pushFollow(FOLLOW_100);
             rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0_0__1_in_rule__JvmParameterizedTypeReference__Group_1_4_0_0__035699);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_0_0__1();
 
             state._fsp--;
@@ -50853,23 +50853,23 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_0_0__0() throws
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17738:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:17738:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl : ( () ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17742:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17743:1: ( () )
+            // InternalCheckCfg.g:17742:1: ( ( () ) )
+            // InternalCheckCfg.g:17743:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17743:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17744:1: ()
+            // InternalCheckCfg.g:17743:1: ( () )
+            // InternalCheckCfg.g:17744:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getJvmInnerTypeReferenceOuterAction_1_4_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17745:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17747:1: 
+            // InternalCheckCfg.g:17745:1: ()
+            // InternalCheckCfg.g:17747:1: 
             {
             }
 
@@ -50894,16 +50894,16 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl()
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_0_0__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17757:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__1 : rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl ;
+    // InternalCheckCfg.g:17757:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__1 : rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17761:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17762:2: rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl
+            // InternalCheckCfg.g:17761:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl )
+            // InternalCheckCfg.g:17762:2: rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_0_0__135757);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl();
 
             state._fsp--;
@@ -50927,22 +50927,22 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_0_0__1() throws
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17768:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl : ( '.' ) ;
+    // InternalCheckCfg.g:17768:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl : ( '.' ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17772:1: ( ( '.' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17773:1: ( '.' )
+            // InternalCheckCfg.g:17772:1: ( ( '.' ) )
+            // InternalCheckCfg.g:17773:1: ( '.' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17773:1: ( '.' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17774:1: '.'
+            // InternalCheckCfg.g:17773:1: ( '.' )
+            // InternalCheckCfg.g:17774:1: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getFullStopKeyword_1_4_0_0_1()); 
             }
-            match(input,43,FOLLOW_43_in_rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl35785); if (state.failed) return ;
+            match(input,43,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmParameterizedTypeReferenceAccess().getFullStopKeyword_1_4_0_0_1()); 
             }
@@ -50968,21 +50968,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl()
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17791:1: rule__JvmParameterizedTypeReference__Group_1_4_2__0 : rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__1 ;
+    // InternalCheckCfg.g:17791:1: rule__JvmParameterizedTypeReference__Group_1_4_2__0 : rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__1 ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17795:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17796:2: rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__1
+            // InternalCheckCfg.g:17795:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__1 )
+            // InternalCheckCfg.g:17796:2: rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2__035820);
+            pushFollow(FOLLOW_58);
             rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__1_in_rule__JvmParameterizedTypeReference__Group_1_4_2__035823);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_2__1();
 
             state._fsp--;
@@ -51006,25 +51006,25 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2__0() throws R
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17803:1: rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl : ( ( '<' ) ) ;
+    // InternalCheckCfg.g:17803:1: rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl : ( ( '<' ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17807:1: ( ( ( '<' ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17808:1: ( ( '<' ) )
+            // InternalCheckCfg.g:17807:1: ( ( ( '<' ) ) )
+            // InternalCheckCfg.g:17808:1: ( ( '<' ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17808:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17809:1: ( '<' )
+            // InternalCheckCfg.g:17808:1: ( ( '<' ) )
+            // InternalCheckCfg.g:17809:1: ( '<' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getLessThanSignKeyword_1_4_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17810:1: ( '<' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17811:2: '<'
+            // InternalCheckCfg.g:17810:1: ( '<' )
+            // InternalCheckCfg.g:17811:2: '<'
             {
-            match(input,27,FOLLOW_27_in_rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl35852); if (state.failed) return ;
+            match(input,27,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -51053,21 +51053,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl() th
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17822:1: rule__JvmParameterizedTypeReference__Group_1_4_2__1 : rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__2 ;
+    // InternalCheckCfg.g:17822:1: rule__JvmParameterizedTypeReference__Group_1_4_2__1 : rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__2 ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17826:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17827:2: rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__2
+            // InternalCheckCfg.g:17826:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__2 )
+            // InternalCheckCfg.g:17827:2: rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__2
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2__135884);
+            pushFollow(FOLLOW_59);
             rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__2_in_rule__JvmParameterizedTypeReference__Group_1_4_2__135887);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_2__2();
 
             state._fsp--;
@@ -51091,25 +51091,25 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2__1() throws R
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17834:1: rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) ) ;
+    // InternalCheckCfg.g:17834:1: rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17838:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17839:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) )
+            // InternalCheckCfg.g:17838:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) ) )
+            // InternalCheckCfg.g:17839:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17839:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17840:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 )
+            // InternalCheckCfg.g:17839:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) )
+            // InternalCheckCfg.g:17840:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsAssignment_1_4_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17841:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17841:2: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1
+            // InternalCheckCfg.g:17841:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 )
+            // InternalCheckCfg.g:17841:2: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1_in_rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl35914);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1();
 
             state._fsp--;
@@ -51142,21 +51142,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl() th
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17851:1: rule__JvmParameterizedTypeReference__Group_1_4_2__2 : rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__3 ;
+    // InternalCheckCfg.g:17851:1: rule__JvmParameterizedTypeReference__Group_1_4_2__2 : rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__3 ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17855:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17856:2: rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__3
+            // InternalCheckCfg.g:17855:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__3 )
+            // InternalCheckCfg.g:17856:2: rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__3
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2__235944);
+            pushFollow(FOLLOW_59);
             rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__3_in_rule__JvmParameterizedTypeReference__Group_1_4_2__235947);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_2__3();
 
             state._fsp--;
@@ -51180,22 +51180,22 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2__2() throws R
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17863:1: rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* ) ;
+    // InternalCheckCfg.g:17863:1: rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17867:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17868:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* )
+            // InternalCheckCfg.g:17867:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* ) )
+            // InternalCheckCfg.g:17868:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17868:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17869:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )*
+            // InternalCheckCfg.g:17868:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* )
+            // InternalCheckCfg.g:17869:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup_1_4_2_2()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17870:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )*
+            // InternalCheckCfg.g:17870:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )*
             loop127:
             do {
                 int alt127=2;
@@ -51208,9 +51208,9 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl() th
 
                 switch (alt127) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17870:2: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0
+            	    // InternalCheckCfg.g:17870:2: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2_2__0_in_rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl35974);
+            	    pushFollow(FOLLOW_18);
             	    rule__JvmParameterizedTypeReference__Group_1_4_2_2__0();
 
             	    state._fsp--;
@@ -51249,16 +51249,16 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl() th
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17880:1: rule__JvmParameterizedTypeReference__Group_1_4_2__3 : rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl ;
+    // InternalCheckCfg.g:17880:1: rule__JvmParameterizedTypeReference__Group_1_4_2__3 : rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17884:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17885:2: rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl
+            // InternalCheckCfg.g:17884:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl )
+            // InternalCheckCfg.g:17885:2: rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2__336005);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl();
 
             state._fsp--;
@@ -51282,22 +51282,22 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2__3() throws R
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17891:1: rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl : ( '>' ) ;
+    // InternalCheckCfg.g:17891:1: rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl : ( '>' ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17895:1: ( ( '>' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17896:1: ( '>' )
+            // InternalCheckCfg.g:17895:1: ( ( '>' ) )
+            // InternalCheckCfg.g:17896:1: ( '>' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17896:1: ( '>' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17897:1: '>'
+            // InternalCheckCfg.g:17896:1: ( '>' )
+            // InternalCheckCfg.g:17897:1: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGreaterThanSignKeyword_1_4_2_3()); 
             }
-            match(input,26,FOLLOW_26_in_rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl36033); if (state.failed) return ;
+            match(input,26,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGreaterThanSignKeyword_1_4_2_3()); 
             }
@@ -51323,21 +51323,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl() th
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2_2__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17918:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 : rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2_2__1 ;
+    // InternalCheckCfg.g:17918:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 : rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2_2__1 ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17922:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2_2__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17923:2: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2_2__1
+            // InternalCheckCfg.g:17922:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2_2__1 )
+            // InternalCheckCfg.g:17923:2: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2_2__1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__036072);
+            pushFollow(FOLLOW_58);
             rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2_2__1_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__036075);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_2_2__1();
 
             state._fsp--;
@@ -51361,22 +51361,22 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2_2__0() throws
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17930:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl : ( ',' ) ;
+    // InternalCheckCfg.g:17930:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl : ( ',' ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17934:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17935:1: ( ',' )
+            // InternalCheckCfg.g:17934:1: ( ( ',' ) )
+            // InternalCheckCfg.g:17935:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17935:1: ( ',' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17936:1: ','
+            // InternalCheckCfg.g:17935:1: ( ',' )
+            // InternalCheckCfg.g:17936:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getCommaKeyword_1_4_2_2_0()); 
             }
-            match(input,64,FOLLOW_64_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl36103); if (state.failed) return ;
+            match(input,64,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmParameterizedTypeReferenceAccess().getCommaKeyword_1_4_2_2_0()); 
             }
@@ -51402,16 +51402,16 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl()
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2_2__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17949:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__1 : rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl ;
+    // InternalCheckCfg.g:17949:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__1 : rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17953:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17954:2: rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl
+            // InternalCheckCfg.g:17953:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl )
+            // InternalCheckCfg.g:17954:2: rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__136134);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl();
 
             state._fsp--;
@@ -51435,25 +51435,25 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2_2__1() throws
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17960:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) ) ;
+    // InternalCheckCfg.g:17960:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17964:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17965:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) )
+            // InternalCheckCfg.g:17964:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) ) )
+            // InternalCheckCfg.g:17965:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17965:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17966:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 )
+            // InternalCheckCfg.g:17965:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) )
+            // InternalCheckCfg.g:17966:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsAssignment_1_4_2_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17967:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17967:2: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1
+            // InternalCheckCfg.g:17967:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 )
+            // InternalCheckCfg.g:17967:2: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl36161);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1();
 
             state._fsp--;
@@ -51486,21 +51486,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl()
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17981:1: rule__JvmWildcardTypeReference__Group__0 : rule__JvmWildcardTypeReference__Group__0__Impl rule__JvmWildcardTypeReference__Group__1 ;
+    // InternalCheckCfg.g:17981:1: rule__JvmWildcardTypeReference__Group__0 : rule__JvmWildcardTypeReference__Group__0__Impl rule__JvmWildcardTypeReference__Group__1 ;
     public final void rule__JvmWildcardTypeReference__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17985:1: ( rule__JvmWildcardTypeReference__Group__0__Impl rule__JvmWildcardTypeReference__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17986:2: rule__JvmWildcardTypeReference__Group__0__Impl rule__JvmWildcardTypeReference__Group__1
+            // InternalCheckCfg.g:17985:1: ( rule__JvmWildcardTypeReference__Group__0__Impl rule__JvmWildcardTypeReference__Group__1 )
+            // InternalCheckCfg.g:17986:2: rule__JvmWildcardTypeReference__Group__0__Impl rule__JvmWildcardTypeReference__Group__1
             {
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group__0__Impl_in_rule__JvmWildcardTypeReference__Group__036195);
+            pushFollow(FOLLOW_58);
             rule__JvmWildcardTypeReference__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group__1_in_rule__JvmWildcardTypeReference__Group__036198);
+            pushFollow(FOLLOW_2);
             rule__JvmWildcardTypeReference__Group__1();
 
             state._fsp--;
@@ -51524,23 +51524,23 @@ public final void rule__JvmWildcardTypeReference__Group__0() throws RecognitionE
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17993:1: rule__JvmWildcardTypeReference__Group__0__Impl : ( () ) ;
+    // InternalCheckCfg.g:17993:1: rule__JvmWildcardTypeReference__Group__0__Impl : ( () ) ;
     public final void rule__JvmWildcardTypeReference__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17997:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17998:1: ( () )
+            // InternalCheckCfg.g:17997:1: ( ( () ) )
+            // InternalCheckCfg.g:17998:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17998:1: ( () )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17999:1: ()
+            // InternalCheckCfg.g:17998:1: ( () )
+            // InternalCheckCfg.g:17999:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getJvmWildcardTypeReferenceAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18000:1: ()
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18002:1: 
+            // InternalCheckCfg.g:18000:1: ()
+            // InternalCheckCfg.g:18002:1: 
             {
             }
 
@@ -51565,21 +51565,21 @@ public final void rule__JvmWildcardTypeReference__Group__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18012:1: rule__JvmWildcardTypeReference__Group__1 : rule__JvmWildcardTypeReference__Group__1__Impl rule__JvmWildcardTypeReference__Group__2 ;
+    // InternalCheckCfg.g:18012:1: rule__JvmWildcardTypeReference__Group__1 : rule__JvmWildcardTypeReference__Group__1__Impl rule__JvmWildcardTypeReference__Group__2 ;
     public final void rule__JvmWildcardTypeReference__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18016:1: ( rule__JvmWildcardTypeReference__Group__1__Impl rule__JvmWildcardTypeReference__Group__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18017:2: rule__JvmWildcardTypeReference__Group__1__Impl rule__JvmWildcardTypeReference__Group__2
+            // InternalCheckCfg.g:18016:1: ( rule__JvmWildcardTypeReference__Group__1__Impl rule__JvmWildcardTypeReference__Group__2 )
+            // InternalCheckCfg.g:18017:2: rule__JvmWildcardTypeReference__Group__1__Impl rule__JvmWildcardTypeReference__Group__2
             {
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group__1__Impl_in_rule__JvmWildcardTypeReference__Group__136256);
+            pushFollow(FOLLOW_104);
             rule__JvmWildcardTypeReference__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group__2_in_rule__JvmWildcardTypeReference__Group__136259);
+            pushFollow(FOLLOW_2);
             rule__JvmWildcardTypeReference__Group__2();
 
             state._fsp--;
@@ -51603,22 +51603,22 @@ public final void rule__JvmWildcardTypeReference__Group__1() throws RecognitionE
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18024:1: rule__JvmWildcardTypeReference__Group__1__Impl : ( '?' ) ;
+    // InternalCheckCfg.g:18024:1: rule__JvmWildcardTypeReference__Group__1__Impl : ( '?' ) ;
     public final void rule__JvmWildcardTypeReference__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18028:1: ( ( '?' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18029:1: ( '?' )
+            // InternalCheckCfg.g:18028:1: ( ( '?' ) )
+            // InternalCheckCfg.g:18029:1: ( '?' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18029:1: ( '?' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18030:1: '?'
+            // InternalCheckCfg.g:18029:1: ( '?' )
+            // InternalCheckCfg.g:18030:1: '?'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getQuestionMarkKeyword_1()); 
             }
-            match(input,87,FOLLOW_87_in_rule__JvmWildcardTypeReference__Group__1__Impl36287); if (state.failed) return ;
+            match(input,87,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmWildcardTypeReferenceAccess().getQuestionMarkKeyword_1()); 
             }
@@ -51644,16 +51644,16 @@ public final void rule__JvmWildcardTypeReference__Group__1__Impl() throws Recogn
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18043:1: rule__JvmWildcardTypeReference__Group__2 : rule__JvmWildcardTypeReference__Group__2__Impl ;
+    // InternalCheckCfg.g:18043:1: rule__JvmWildcardTypeReference__Group__2 : rule__JvmWildcardTypeReference__Group__2__Impl ;
     public final void rule__JvmWildcardTypeReference__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18047:1: ( rule__JvmWildcardTypeReference__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18048:2: rule__JvmWildcardTypeReference__Group__2__Impl
+            // InternalCheckCfg.g:18047:1: ( rule__JvmWildcardTypeReference__Group__2__Impl )
+            // InternalCheckCfg.g:18048:2: rule__JvmWildcardTypeReference__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group__2__Impl_in_rule__JvmWildcardTypeReference__Group__236318);
+            pushFollow(FOLLOW_2);
             rule__JvmWildcardTypeReference__Group__2__Impl();
 
             state._fsp--;
@@ -51677,22 +51677,22 @@ public final void rule__JvmWildcardTypeReference__Group__2() throws RecognitionE
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18054:1: rule__JvmWildcardTypeReference__Group__2__Impl : ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? ) ;
+    // InternalCheckCfg.g:18054:1: rule__JvmWildcardTypeReference__Group__2__Impl : ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? ) ;
     public final void rule__JvmWildcardTypeReference__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18058:1: ( ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18059:1: ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? )
+            // InternalCheckCfg.g:18058:1: ( ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? ) )
+            // InternalCheckCfg.g:18059:1: ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18059:1: ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18060:1: ( rule__JvmWildcardTypeReference__Alternatives_2 )?
+            // InternalCheckCfg.g:18059:1: ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? )
+            // InternalCheckCfg.g:18060:1: ( rule__JvmWildcardTypeReference__Alternatives_2 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getAlternatives_2()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18061:1: ( rule__JvmWildcardTypeReference__Alternatives_2 )?
+            // InternalCheckCfg.g:18061:1: ( rule__JvmWildcardTypeReference__Alternatives_2 )?
             int alt128=2;
             int LA128_0 = input.LA(1);
 
@@ -51701,9 +51701,9 @@ public final void rule__JvmWildcardTypeReference__Group__2__Impl() throws Recogn
             }
             switch (alt128) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18061:2: rule__JvmWildcardTypeReference__Alternatives_2
+                    // InternalCheckCfg.g:18061:2: rule__JvmWildcardTypeReference__Alternatives_2
                     {
-                    pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Alternatives_2_in_rule__JvmWildcardTypeReference__Group__2__Impl36345);
+                    pushFollow(FOLLOW_2);
                     rule__JvmWildcardTypeReference__Alternatives_2();
 
                     state._fsp--;
@@ -51739,21 +51739,21 @@ public final void rule__JvmWildcardTypeReference__Group__2__Impl() throws Recogn
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18077:1: rule__JvmWildcardTypeReference__Group_2_0__0 : rule__JvmWildcardTypeReference__Group_2_0__0__Impl rule__JvmWildcardTypeReference__Group_2_0__1 ;
+    // InternalCheckCfg.g:18077:1: rule__JvmWildcardTypeReference__Group_2_0__0 : rule__JvmWildcardTypeReference__Group_2_0__0__Impl rule__JvmWildcardTypeReference__Group_2_0__1 ;
     public final void rule__JvmWildcardTypeReference__Group_2_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18081:1: ( rule__JvmWildcardTypeReference__Group_2_0__0__Impl rule__JvmWildcardTypeReference__Group_2_0__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18082:2: rule__JvmWildcardTypeReference__Group_2_0__0__Impl rule__JvmWildcardTypeReference__Group_2_0__1
+            // InternalCheckCfg.g:18081:1: ( rule__JvmWildcardTypeReference__Group_2_0__0__Impl rule__JvmWildcardTypeReference__Group_2_0__1 )
+            // InternalCheckCfg.g:18082:2: rule__JvmWildcardTypeReference__Group_2_0__0__Impl rule__JvmWildcardTypeReference__Group_2_0__1
             {
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group_2_0__0__Impl_in_rule__JvmWildcardTypeReference__Group_2_0__036382);
+            pushFollow(FOLLOW_105);
             rule__JvmWildcardTypeReference__Group_2_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group_2_0__1_in_rule__JvmWildcardTypeReference__Group_2_0__036385);
+            pushFollow(FOLLOW_2);
             rule__JvmWildcardTypeReference__Group_2_0__1();
 
             state._fsp--;
@@ -51777,25 +51777,25 @@ public final void rule__JvmWildcardTypeReference__Group_2_0__0() throws Recognit
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18089:1: rule__JvmWildcardTypeReference__Group_2_0__0__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) ) ;
+    // InternalCheckCfg.g:18089:1: rule__JvmWildcardTypeReference__Group_2_0__0__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) ) ;
     public final void rule__JvmWildcardTypeReference__Group_2_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18093:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18094:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) )
+            // InternalCheckCfg.g:18093:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) ) )
+            // InternalCheckCfg.g:18094:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18094:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18095:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 )
+            // InternalCheckCfg.g:18094:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) )
+            // InternalCheckCfg.g:18095:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsAssignment_2_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18096:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18096:2: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0
+            // InternalCheckCfg.g:18096:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 )
+            // InternalCheckCfg.g:18096:2: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0
             {
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0_in_rule__JvmWildcardTypeReference__Group_2_0__0__Impl36412);
+            pushFollow(FOLLOW_2);
             rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0();
 
             state._fsp--;
@@ -51828,16 +51828,16 @@ public final void rule__JvmWildcardTypeReference__Group_2_0__0__Impl() throws Re
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_0__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18106:1: rule__JvmWildcardTypeReference__Group_2_0__1 : rule__JvmWildcardTypeReference__Group_2_0__1__Impl ;
+    // InternalCheckCfg.g:18106:1: rule__JvmWildcardTypeReference__Group_2_0__1 : rule__JvmWildcardTypeReference__Group_2_0__1__Impl ;
     public final void rule__JvmWildcardTypeReference__Group_2_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18110:1: ( rule__JvmWildcardTypeReference__Group_2_0__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18111:2: rule__JvmWildcardTypeReference__Group_2_0__1__Impl
+            // InternalCheckCfg.g:18110:1: ( rule__JvmWildcardTypeReference__Group_2_0__1__Impl )
+            // InternalCheckCfg.g:18111:2: rule__JvmWildcardTypeReference__Group_2_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group_2_0__1__Impl_in_rule__JvmWildcardTypeReference__Group_2_0__136442);
+            pushFollow(FOLLOW_2);
             rule__JvmWildcardTypeReference__Group_2_0__1__Impl();
 
             state._fsp--;
@@ -51861,22 +51861,22 @@ public final void rule__JvmWildcardTypeReference__Group_2_0__1() throws Recognit
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_0__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18117:1: rule__JvmWildcardTypeReference__Group_2_0__1__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* ) ;
+    // InternalCheckCfg.g:18117:1: rule__JvmWildcardTypeReference__Group_2_0__1__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* ) ;
     public final void rule__JvmWildcardTypeReference__Group_2_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18121:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18122:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* )
+            // InternalCheckCfg.g:18121:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* ) )
+            // InternalCheckCfg.g:18122:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18122:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18123:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )*
+            // InternalCheckCfg.g:18122:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* )
+            // InternalCheckCfg.g:18123:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsAssignment_2_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18124:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )*
+            // InternalCheckCfg.g:18124:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )*
             loop129:
             do {
                 int alt129=2;
@@ -51889,9 +51889,9 @@ public final void rule__JvmWildcardTypeReference__Group_2_0__1__Impl() throws Re
 
                 switch (alt129) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18124:2: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1
+            	    // InternalCheckCfg.g:18124:2: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1
             	    {
-            	    pushFollow(FOLLOW_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1_in_rule__JvmWildcardTypeReference__Group_2_0__1__Impl36469);
+            	    pushFollow(FOLLOW_106);
             	    rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1();
 
             	    state._fsp--;
@@ -51930,21 +51930,21 @@ public final void rule__JvmWildcardTypeReference__Group_2_0__1__Impl() throws Re
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_1__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18138:1: rule__JvmWildcardTypeReference__Group_2_1__0 : rule__JvmWildcardTypeReference__Group_2_1__0__Impl rule__JvmWildcardTypeReference__Group_2_1__1 ;
+    // InternalCheckCfg.g:18138:1: rule__JvmWildcardTypeReference__Group_2_1__0 : rule__JvmWildcardTypeReference__Group_2_1__0__Impl rule__JvmWildcardTypeReference__Group_2_1__1 ;
     public final void rule__JvmWildcardTypeReference__Group_2_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18142:1: ( rule__JvmWildcardTypeReference__Group_2_1__0__Impl rule__JvmWildcardTypeReference__Group_2_1__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18143:2: rule__JvmWildcardTypeReference__Group_2_1__0__Impl rule__JvmWildcardTypeReference__Group_2_1__1
+            // InternalCheckCfg.g:18142:1: ( rule__JvmWildcardTypeReference__Group_2_1__0__Impl rule__JvmWildcardTypeReference__Group_2_1__1 )
+            // InternalCheckCfg.g:18143:2: rule__JvmWildcardTypeReference__Group_2_1__0__Impl rule__JvmWildcardTypeReference__Group_2_1__1
             {
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group_2_1__0__Impl_in_rule__JvmWildcardTypeReference__Group_2_1__036504);
+            pushFollow(FOLLOW_105);
             rule__JvmWildcardTypeReference__Group_2_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group_2_1__1_in_rule__JvmWildcardTypeReference__Group_2_1__036507);
+            pushFollow(FOLLOW_2);
             rule__JvmWildcardTypeReference__Group_2_1__1();
 
             state._fsp--;
@@ -51968,25 +51968,25 @@ public final void rule__JvmWildcardTypeReference__Group_2_1__0() throws Recognit
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_1__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18150:1: rule__JvmWildcardTypeReference__Group_2_1__0__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) ) ;
+    // InternalCheckCfg.g:18150:1: rule__JvmWildcardTypeReference__Group_2_1__0__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) ) ;
     public final void rule__JvmWildcardTypeReference__Group_2_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18154:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18155:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) )
+            // InternalCheckCfg.g:18154:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) ) )
+            // InternalCheckCfg.g:18155:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18155:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18156:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 )
+            // InternalCheckCfg.g:18155:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) )
+            // InternalCheckCfg.g:18156:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsAssignment_2_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18157:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18157:2: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0
+            // InternalCheckCfg.g:18157:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 )
+            // InternalCheckCfg.g:18157:2: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0
             {
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0_in_rule__JvmWildcardTypeReference__Group_2_1__0__Impl36534);
+            pushFollow(FOLLOW_2);
             rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0();
 
             state._fsp--;
@@ -52019,16 +52019,16 @@ public final void rule__JvmWildcardTypeReference__Group_2_1__0__Impl() throws Re
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_1__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18167:1: rule__JvmWildcardTypeReference__Group_2_1__1 : rule__JvmWildcardTypeReference__Group_2_1__1__Impl ;
+    // InternalCheckCfg.g:18167:1: rule__JvmWildcardTypeReference__Group_2_1__1 : rule__JvmWildcardTypeReference__Group_2_1__1__Impl ;
     public final void rule__JvmWildcardTypeReference__Group_2_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18171:1: ( rule__JvmWildcardTypeReference__Group_2_1__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18172:2: rule__JvmWildcardTypeReference__Group_2_1__1__Impl
+            // InternalCheckCfg.g:18171:1: ( rule__JvmWildcardTypeReference__Group_2_1__1__Impl )
+            // InternalCheckCfg.g:18172:2: rule__JvmWildcardTypeReference__Group_2_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group_2_1__1__Impl_in_rule__JvmWildcardTypeReference__Group_2_1__136564);
+            pushFollow(FOLLOW_2);
             rule__JvmWildcardTypeReference__Group_2_1__1__Impl();
 
             state._fsp--;
@@ -52052,22 +52052,22 @@ public final void rule__JvmWildcardTypeReference__Group_2_1__1() throws Recognit
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_1__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18178:1: rule__JvmWildcardTypeReference__Group_2_1__1__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* ) ;
+    // InternalCheckCfg.g:18178:1: rule__JvmWildcardTypeReference__Group_2_1__1__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* ) ;
     public final void rule__JvmWildcardTypeReference__Group_2_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18182:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18183:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* )
+            // InternalCheckCfg.g:18182:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* ) )
+            // InternalCheckCfg.g:18183:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18183:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18184:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )*
+            // InternalCheckCfg.g:18183:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* )
+            // InternalCheckCfg.g:18184:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsAssignment_2_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18185:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )*
+            // InternalCheckCfg.g:18185:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )*
             loop130:
             do {
                 int alt130=2;
@@ -52080,9 +52080,9 @@ public final void rule__JvmWildcardTypeReference__Group_2_1__1__Impl() throws Re
 
                 switch (alt130) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18185:2: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1
+            	    // InternalCheckCfg.g:18185:2: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1
             	    {
-            	    pushFollow(FOLLOW_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1_in_rule__JvmWildcardTypeReference__Group_2_1__1__Impl36591);
+            	    pushFollow(FOLLOW_106);
             	    rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1();
 
             	    state._fsp--;
@@ -52121,21 +52121,21 @@ public final void rule__JvmWildcardTypeReference__Group_2_1__1__Impl() throws Re
 
 
     // $ANTLR start "rule__JvmUpperBound__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18199:1: rule__JvmUpperBound__Group__0 : rule__JvmUpperBound__Group__0__Impl rule__JvmUpperBound__Group__1 ;
+    // InternalCheckCfg.g:18199:1: rule__JvmUpperBound__Group__0 : rule__JvmUpperBound__Group__0__Impl rule__JvmUpperBound__Group__1 ;
     public final void rule__JvmUpperBound__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18203:1: ( rule__JvmUpperBound__Group__0__Impl rule__JvmUpperBound__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18204:2: rule__JvmUpperBound__Group__0__Impl rule__JvmUpperBound__Group__1
+            // InternalCheckCfg.g:18203:1: ( rule__JvmUpperBound__Group__0__Impl rule__JvmUpperBound__Group__1 )
+            // InternalCheckCfg.g:18204:2: rule__JvmUpperBound__Group__0__Impl rule__JvmUpperBound__Group__1
             {
-            pushFollow(FOLLOW_rule__JvmUpperBound__Group__0__Impl_in_rule__JvmUpperBound__Group__036626);
+            pushFollow(FOLLOW_39);
             rule__JvmUpperBound__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmUpperBound__Group__1_in_rule__JvmUpperBound__Group__036629);
+            pushFollow(FOLLOW_2);
             rule__JvmUpperBound__Group__1();
 
             state._fsp--;
@@ -52159,22 +52159,22 @@ public final void rule__JvmUpperBound__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__JvmUpperBound__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18211:1: rule__JvmUpperBound__Group__0__Impl : ( 'extends' ) ;
+    // InternalCheckCfg.g:18211:1: rule__JvmUpperBound__Group__0__Impl : ( 'extends' ) ;
     public final void rule__JvmUpperBound__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18215:1: ( ( 'extends' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18216:1: ( 'extends' )
+            // InternalCheckCfg.g:18215:1: ( ( 'extends' ) )
+            // InternalCheckCfg.g:18216:1: ( 'extends' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18216:1: ( 'extends' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18217:1: 'extends'
+            // InternalCheckCfg.g:18216:1: ( 'extends' )
+            // InternalCheckCfg.g:18217:1: 'extends'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAccess().getExtendsKeyword_0()); 
             }
-            match(input,45,FOLLOW_45_in_rule__JvmUpperBound__Group__0__Impl36657); if (state.failed) return ;
+            match(input,45,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmUpperBoundAccess().getExtendsKeyword_0()); 
             }
@@ -52200,16 +52200,16 @@ public final void rule__JvmUpperBound__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__JvmUpperBound__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18230:1: rule__JvmUpperBound__Group__1 : rule__JvmUpperBound__Group__1__Impl ;
+    // InternalCheckCfg.g:18230:1: rule__JvmUpperBound__Group__1 : rule__JvmUpperBound__Group__1__Impl ;
     public final void rule__JvmUpperBound__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18234:1: ( rule__JvmUpperBound__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18235:2: rule__JvmUpperBound__Group__1__Impl
+            // InternalCheckCfg.g:18234:1: ( rule__JvmUpperBound__Group__1__Impl )
+            // InternalCheckCfg.g:18235:2: rule__JvmUpperBound__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmUpperBound__Group__1__Impl_in_rule__JvmUpperBound__Group__136688);
+            pushFollow(FOLLOW_2);
             rule__JvmUpperBound__Group__1__Impl();
 
             state._fsp--;
@@ -52233,25 +52233,25 @@ public final void rule__JvmUpperBound__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__JvmUpperBound__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18241:1: rule__JvmUpperBound__Group__1__Impl : ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) ) ;
+    // InternalCheckCfg.g:18241:1: rule__JvmUpperBound__Group__1__Impl : ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) ) ;
     public final void rule__JvmUpperBound__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18245:1: ( ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18246:1: ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) )
+            // InternalCheckCfg.g:18245:1: ( ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) ) )
+            // InternalCheckCfg.g:18246:1: ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18246:1: ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18247:1: ( rule__JvmUpperBound__TypeReferenceAssignment_1 )
+            // InternalCheckCfg.g:18246:1: ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) )
+            // InternalCheckCfg.g:18247:1: ( rule__JvmUpperBound__TypeReferenceAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAccess().getTypeReferenceAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18248:1: ( rule__JvmUpperBound__TypeReferenceAssignment_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18248:2: rule__JvmUpperBound__TypeReferenceAssignment_1
+            // InternalCheckCfg.g:18248:1: ( rule__JvmUpperBound__TypeReferenceAssignment_1 )
+            // InternalCheckCfg.g:18248:2: rule__JvmUpperBound__TypeReferenceAssignment_1
             {
-            pushFollow(FOLLOW_rule__JvmUpperBound__TypeReferenceAssignment_1_in_rule__JvmUpperBound__Group__1__Impl36715);
+            pushFollow(FOLLOW_2);
             rule__JvmUpperBound__TypeReferenceAssignment_1();
 
             state._fsp--;
@@ -52284,21 +52284,21 @@ public final void rule__JvmUpperBound__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__JvmUpperBoundAnded__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18262:1: rule__JvmUpperBoundAnded__Group__0 : rule__JvmUpperBoundAnded__Group__0__Impl rule__JvmUpperBoundAnded__Group__1 ;
+    // InternalCheckCfg.g:18262:1: rule__JvmUpperBoundAnded__Group__0 : rule__JvmUpperBoundAnded__Group__0__Impl rule__JvmUpperBoundAnded__Group__1 ;
     public final void rule__JvmUpperBoundAnded__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18266:1: ( rule__JvmUpperBoundAnded__Group__0__Impl rule__JvmUpperBoundAnded__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18267:2: rule__JvmUpperBoundAnded__Group__0__Impl rule__JvmUpperBoundAnded__Group__1
+            // InternalCheckCfg.g:18266:1: ( rule__JvmUpperBoundAnded__Group__0__Impl rule__JvmUpperBoundAnded__Group__1 )
+            // InternalCheckCfg.g:18267:2: rule__JvmUpperBoundAnded__Group__0__Impl rule__JvmUpperBoundAnded__Group__1
             {
-            pushFollow(FOLLOW_rule__JvmUpperBoundAnded__Group__0__Impl_in_rule__JvmUpperBoundAnded__Group__036749);
+            pushFollow(FOLLOW_39);
             rule__JvmUpperBoundAnded__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmUpperBoundAnded__Group__1_in_rule__JvmUpperBoundAnded__Group__036752);
+            pushFollow(FOLLOW_2);
             rule__JvmUpperBoundAnded__Group__1();
 
             state._fsp--;
@@ -52322,22 +52322,22 @@ public final void rule__JvmUpperBoundAnded__Group__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__JvmUpperBoundAnded__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18274:1: rule__JvmUpperBoundAnded__Group__0__Impl : ( '&' ) ;
+    // InternalCheckCfg.g:18274:1: rule__JvmUpperBoundAnded__Group__0__Impl : ( '&' ) ;
     public final void rule__JvmUpperBoundAnded__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18278:1: ( ( '&' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18279:1: ( '&' )
+            // InternalCheckCfg.g:18278:1: ( ( '&' ) )
+            // InternalCheckCfg.g:18279:1: ( '&' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18279:1: ( '&' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18280:1: '&'
+            // InternalCheckCfg.g:18279:1: ( '&' )
+            // InternalCheckCfg.g:18280:1: '&'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAndedAccess().getAmpersandKeyword_0()); 
             }
-            match(input,88,FOLLOW_88_in_rule__JvmUpperBoundAnded__Group__0__Impl36780); if (state.failed) return ;
+            match(input,88,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmUpperBoundAndedAccess().getAmpersandKeyword_0()); 
             }
@@ -52363,16 +52363,16 @@ public final void rule__JvmUpperBoundAnded__Group__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__JvmUpperBoundAnded__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18293:1: rule__JvmUpperBoundAnded__Group__1 : rule__JvmUpperBoundAnded__Group__1__Impl ;
+    // InternalCheckCfg.g:18293:1: rule__JvmUpperBoundAnded__Group__1 : rule__JvmUpperBoundAnded__Group__1__Impl ;
     public final void rule__JvmUpperBoundAnded__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18297:1: ( rule__JvmUpperBoundAnded__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18298:2: rule__JvmUpperBoundAnded__Group__1__Impl
+            // InternalCheckCfg.g:18297:1: ( rule__JvmUpperBoundAnded__Group__1__Impl )
+            // InternalCheckCfg.g:18298:2: rule__JvmUpperBoundAnded__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmUpperBoundAnded__Group__1__Impl_in_rule__JvmUpperBoundAnded__Group__136811);
+            pushFollow(FOLLOW_2);
             rule__JvmUpperBoundAnded__Group__1__Impl();
 
             state._fsp--;
@@ -52396,25 +52396,25 @@ public final void rule__JvmUpperBoundAnded__Group__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__JvmUpperBoundAnded__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18304:1: rule__JvmUpperBoundAnded__Group__1__Impl : ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) ) ;
+    // InternalCheckCfg.g:18304:1: rule__JvmUpperBoundAnded__Group__1__Impl : ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) ) ;
     public final void rule__JvmUpperBoundAnded__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18308:1: ( ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18309:1: ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) )
+            // InternalCheckCfg.g:18308:1: ( ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) ) )
+            // InternalCheckCfg.g:18309:1: ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18309:1: ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18310:1: ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 )
+            // InternalCheckCfg.g:18309:1: ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) )
+            // InternalCheckCfg.g:18310:1: ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAndedAccess().getTypeReferenceAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18311:1: ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18311:2: rule__JvmUpperBoundAnded__TypeReferenceAssignment_1
+            // InternalCheckCfg.g:18311:1: ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 )
+            // InternalCheckCfg.g:18311:2: rule__JvmUpperBoundAnded__TypeReferenceAssignment_1
             {
-            pushFollow(FOLLOW_rule__JvmUpperBoundAnded__TypeReferenceAssignment_1_in_rule__JvmUpperBoundAnded__Group__1__Impl36838);
+            pushFollow(FOLLOW_2);
             rule__JvmUpperBoundAnded__TypeReferenceAssignment_1();
 
             state._fsp--;
@@ -52447,21 +52447,21 @@ public final void rule__JvmUpperBoundAnded__Group__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__JvmLowerBound__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18325:1: rule__JvmLowerBound__Group__0 : rule__JvmLowerBound__Group__0__Impl rule__JvmLowerBound__Group__1 ;
+    // InternalCheckCfg.g:18325:1: rule__JvmLowerBound__Group__0 : rule__JvmLowerBound__Group__0__Impl rule__JvmLowerBound__Group__1 ;
     public final void rule__JvmLowerBound__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18329:1: ( rule__JvmLowerBound__Group__0__Impl rule__JvmLowerBound__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18330:2: rule__JvmLowerBound__Group__0__Impl rule__JvmLowerBound__Group__1
+            // InternalCheckCfg.g:18329:1: ( rule__JvmLowerBound__Group__0__Impl rule__JvmLowerBound__Group__1 )
+            // InternalCheckCfg.g:18330:2: rule__JvmLowerBound__Group__0__Impl rule__JvmLowerBound__Group__1
             {
-            pushFollow(FOLLOW_rule__JvmLowerBound__Group__0__Impl_in_rule__JvmLowerBound__Group__036872);
+            pushFollow(FOLLOW_39);
             rule__JvmLowerBound__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmLowerBound__Group__1_in_rule__JvmLowerBound__Group__036875);
+            pushFollow(FOLLOW_2);
             rule__JvmLowerBound__Group__1();
 
             state._fsp--;
@@ -52485,22 +52485,22 @@ public final void rule__JvmLowerBound__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__JvmLowerBound__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18337:1: rule__JvmLowerBound__Group__0__Impl : ( 'super' ) ;
+    // InternalCheckCfg.g:18337:1: rule__JvmLowerBound__Group__0__Impl : ( 'super' ) ;
     public final void rule__JvmLowerBound__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18341:1: ( ( 'super' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18342:1: ( 'super' )
+            // InternalCheckCfg.g:18341:1: ( ( 'super' ) )
+            // InternalCheckCfg.g:18342:1: ( 'super' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18342:1: ( 'super' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18343:1: 'super'
+            // InternalCheckCfg.g:18342:1: ( 'super' )
+            // InternalCheckCfg.g:18343:1: 'super'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAccess().getSuperKeyword_0()); 
             }
-            match(input,49,FOLLOW_49_in_rule__JvmLowerBound__Group__0__Impl36903); if (state.failed) return ;
+            match(input,49,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmLowerBoundAccess().getSuperKeyword_0()); 
             }
@@ -52526,16 +52526,16 @@ public final void rule__JvmLowerBound__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__JvmLowerBound__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18356:1: rule__JvmLowerBound__Group__1 : rule__JvmLowerBound__Group__1__Impl ;
+    // InternalCheckCfg.g:18356:1: rule__JvmLowerBound__Group__1 : rule__JvmLowerBound__Group__1__Impl ;
     public final void rule__JvmLowerBound__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18360:1: ( rule__JvmLowerBound__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18361:2: rule__JvmLowerBound__Group__1__Impl
+            // InternalCheckCfg.g:18360:1: ( rule__JvmLowerBound__Group__1__Impl )
+            // InternalCheckCfg.g:18361:2: rule__JvmLowerBound__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmLowerBound__Group__1__Impl_in_rule__JvmLowerBound__Group__136934);
+            pushFollow(FOLLOW_2);
             rule__JvmLowerBound__Group__1__Impl();
 
             state._fsp--;
@@ -52559,25 +52559,25 @@ public final void rule__JvmLowerBound__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__JvmLowerBound__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18367:1: rule__JvmLowerBound__Group__1__Impl : ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) ) ;
+    // InternalCheckCfg.g:18367:1: rule__JvmLowerBound__Group__1__Impl : ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) ) ;
     public final void rule__JvmLowerBound__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18371:1: ( ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18372:1: ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) )
+            // InternalCheckCfg.g:18371:1: ( ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) ) )
+            // InternalCheckCfg.g:18372:1: ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18372:1: ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18373:1: ( rule__JvmLowerBound__TypeReferenceAssignment_1 )
+            // InternalCheckCfg.g:18372:1: ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) )
+            // InternalCheckCfg.g:18373:1: ( rule__JvmLowerBound__TypeReferenceAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAccess().getTypeReferenceAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18374:1: ( rule__JvmLowerBound__TypeReferenceAssignment_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18374:2: rule__JvmLowerBound__TypeReferenceAssignment_1
+            // InternalCheckCfg.g:18374:1: ( rule__JvmLowerBound__TypeReferenceAssignment_1 )
+            // InternalCheckCfg.g:18374:2: rule__JvmLowerBound__TypeReferenceAssignment_1
             {
-            pushFollow(FOLLOW_rule__JvmLowerBound__TypeReferenceAssignment_1_in_rule__JvmLowerBound__Group__1__Impl36961);
+            pushFollow(FOLLOW_2);
             rule__JvmLowerBound__TypeReferenceAssignment_1();
 
             state._fsp--;
@@ -52610,21 +52610,21 @@ public final void rule__JvmLowerBound__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__JvmLowerBoundAnded__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18388:1: rule__JvmLowerBoundAnded__Group__0 : rule__JvmLowerBoundAnded__Group__0__Impl rule__JvmLowerBoundAnded__Group__1 ;
+    // InternalCheckCfg.g:18388:1: rule__JvmLowerBoundAnded__Group__0 : rule__JvmLowerBoundAnded__Group__0__Impl rule__JvmLowerBoundAnded__Group__1 ;
     public final void rule__JvmLowerBoundAnded__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18392:1: ( rule__JvmLowerBoundAnded__Group__0__Impl rule__JvmLowerBoundAnded__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18393:2: rule__JvmLowerBoundAnded__Group__0__Impl rule__JvmLowerBoundAnded__Group__1
+            // InternalCheckCfg.g:18392:1: ( rule__JvmLowerBoundAnded__Group__0__Impl rule__JvmLowerBoundAnded__Group__1 )
+            // InternalCheckCfg.g:18393:2: rule__JvmLowerBoundAnded__Group__0__Impl rule__JvmLowerBoundAnded__Group__1
             {
-            pushFollow(FOLLOW_rule__JvmLowerBoundAnded__Group__0__Impl_in_rule__JvmLowerBoundAnded__Group__036995);
+            pushFollow(FOLLOW_39);
             rule__JvmLowerBoundAnded__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmLowerBoundAnded__Group__1_in_rule__JvmLowerBoundAnded__Group__036998);
+            pushFollow(FOLLOW_2);
             rule__JvmLowerBoundAnded__Group__1();
 
             state._fsp--;
@@ -52648,22 +52648,22 @@ public final void rule__JvmLowerBoundAnded__Group__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__JvmLowerBoundAnded__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18400:1: rule__JvmLowerBoundAnded__Group__0__Impl : ( '&' ) ;
+    // InternalCheckCfg.g:18400:1: rule__JvmLowerBoundAnded__Group__0__Impl : ( '&' ) ;
     public final void rule__JvmLowerBoundAnded__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18404:1: ( ( '&' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18405:1: ( '&' )
+            // InternalCheckCfg.g:18404:1: ( ( '&' ) )
+            // InternalCheckCfg.g:18405:1: ( '&' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18405:1: ( '&' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18406:1: '&'
+            // InternalCheckCfg.g:18405:1: ( '&' )
+            // InternalCheckCfg.g:18406:1: '&'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAndedAccess().getAmpersandKeyword_0()); 
             }
-            match(input,88,FOLLOW_88_in_rule__JvmLowerBoundAnded__Group__0__Impl37026); if (state.failed) return ;
+            match(input,88,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmLowerBoundAndedAccess().getAmpersandKeyword_0()); 
             }
@@ -52689,16 +52689,16 @@ public final void rule__JvmLowerBoundAnded__Group__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__JvmLowerBoundAnded__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18419:1: rule__JvmLowerBoundAnded__Group__1 : rule__JvmLowerBoundAnded__Group__1__Impl ;
+    // InternalCheckCfg.g:18419:1: rule__JvmLowerBoundAnded__Group__1 : rule__JvmLowerBoundAnded__Group__1__Impl ;
     public final void rule__JvmLowerBoundAnded__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18423:1: ( rule__JvmLowerBoundAnded__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18424:2: rule__JvmLowerBoundAnded__Group__1__Impl
+            // InternalCheckCfg.g:18423:1: ( rule__JvmLowerBoundAnded__Group__1__Impl )
+            // InternalCheckCfg.g:18424:2: rule__JvmLowerBoundAnded__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmLowerBoundAnded__Group__1__Impl_in_rule__JvmLowerBoundAnded__Group__137057);
+            pushFollow(FOLLOW_2);
             rule__JvmLowerBoundAnded__Group__1__Impl();
 
             state._fsp--;
@@ -52722,25 +52722,25 @@ public final void rule__JvmLowerBoundAnded__Group__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__JvmLowerBoundAnded__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18430:1: rule__JvmLowerBoundAnded__Group__1__Impl : ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) ) ;
+    // InternalCheckCfg.g:18430:1: rule__JvmLowerBoundAnded__Group__1__Impl : ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) ) ;
     public final void rule__JvmLowerBoundAnded__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18434:1: ( ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18435:1: ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) )
+            // InternalCheckCfg.g:18434:1: ( ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) ) )
+            // InternalCheckCfg.g:18435:1: ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18435:1: ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18436:1: ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 )
+            // InternalCheckCfg.g:18435:1: ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) )
+            // InternalCheckCfg.g:18436:1: ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAndedAccess().getTypeReferenceAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18437:1: ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18437:2: rule__JvmLowerBoundAnded__TypeReferenceAssignment_1
+            // InternalCheckCfg.g:18437:1: ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 )
+            // InternalCheckCfg.g:18437:2: rule__JvmLowerBoundAnded__TypeReferenceAssignment_1
             {
-            pushFollow(FOLLOW_rule__JvmLowerBoundAnded__TypeReferenceAssignment_1_in_rule__JvmLowerBoundAnded__Group__1__Impl37084);
+            pushFollow(FOLLOW_2);
             rule__JvmLowerBoundAnded__TypeReferenceAssignment_1();
 
             state._fsp--;
@@ -52773,21 +52773,21 @@ public final void rule__JvmLowerBoundAnded__Group__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18453:1: rule__QualifiedNameWithWildcard__Group__0 : rule__QualifiedNameWithWildcard__Group__0__Impl rule__QualifiedNameWithWildcard__Group__1 ;
+    // InternalCheckCfg.g:18453:1: rule__QualifiedNameWithWildcard__Group__0 : rule__QualifiedNameWithWildcard__Group__0__Impl rule__QualifiedNameWithWildcard__Group__1 ;
     public final void rule__QualifiedNameWithWildcard__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18457:1: ( rule__QualifiedNameWithWildcard__Group__0__Impl rule__QualifiedNameWithWildcard__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18458:2: rule__QualifiedNameWithWildcard__Group__0__Impl rule__QualifiedNameWithWildcard__Group__1
+            // InternalCheckCfg.g:18457:1: ( rule__QualifiedNameWithWildcard__Group__0__Impl rule__QualifiedNameWithWildcard__Group__1 )
+            // InternalCheckCfg.g:18458:2: rule__QualifiedNameWithWildcard__Group__0__Impl rule__QualifiedNameWithWildcard__Group__1
             {
-            pushFollow(FOLLOW_rule__QualifiedNameWithWildcard__Group__0__Impl_in_rule__QualifiedNameWithWildcard__Group__037120);
+            pushFollow(FOLLOW_100);
             rule__QualifiedNameWithWildcard__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__QualifiedNameWithWildcard__Group__1_in_rule__QualifiedNameWithWildcard__Group__037123);
+            pushFollow(FOLLOW_2);
             rule__QualifiedNameWithWildcard__Group__1();
 
             state._fsp--;
@@ -52811,22 +52811,22 @@ public final void rule__QualifiedNameWithWildcard__Group__0() throws Recognition
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18465:1: rule__QualifiedNameWithWildcard__Group__0__Impl : ( ruleQualifiedName ) ;
+    // InternalCheckCfg.g:18465:1: rule__QualifiedNameWithWildcard__Group__0__Impl : ( ruleQualifiedName ) ;
     public final void rule__QualifiedNameWithWildcard__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18469:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18470:1: ( ruleQualifiedName )
+            // InternalCheckCfg.g:18469:1: ( ( ruleQualifiedName ) )
+            // InternalCheckCfg.g:18470:1: ( ruleQualifiedName )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18470:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18471:1: ruleQualifiedName
+            // InternalCheckCfg.g:18470:1: ( ruleQualifiedName )
+            // InternalCheckCfg.g:18471:1: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameWithWildcardAccess().getQualifiedNameParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_rule__QualifiedNameWithWildcard__Group__0__Impl37150);
+            pushFollow(FOLLOW_2);
             ruleQualifiedName();
 
             state._fsp--;
@@ -52856,21 +52856,21 @@ public final void rule__QualifiedNameWithWildcard__Group__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18482:1: rule__QualifiedNameWithWildcard__Group__1 : rule__QualifiedNameWithWildcard__Group__1__Impl rule__QualifiedNameWithWildcard__Group__2 ;
+    // InternalCheckCfg.g:18482:1: rule__QualifiedNameWithWildcard__Group__1 : rule__QualifiedNameWithWildcard__Group__1__Impl rule__QualifiedNameWithWildcard__Group__2 ;
     public final void rule__QualifiedNameWithWildcard__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18486:1: ( rule__QualifiedNameWithWildcard__Group__1__Impl rule__QualifiedNameWithWildcard__Group__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18487:2: rule__QualifiedNameWithWildcard__Group__1__Impl rule__QualifiedNameWithWildcard__Group__2
+            // InternalCheckCfg.g:18486:1: ( rule__QualifiedNameWithWildcard__Group__1__Impl rule__QualifiedNameWithWildcard__Group__2 )
+            // InternalCheckCfg.g:18487:2: rule__QualifiedNameWithWildcard__Group__1__Impl rule__QualifiedNameWithWildcard__Group__2
             {
-            pushFollow(FOLLOW_rule__QualifiedNameWithWildcard__Group__1__Impl_in_rule__QualifiedNameWithWildcard__Group__137179);
+            pushFollow(FOLLOW_107);
             rule__QualifiedNameWithWildcard__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__QualifiedNameWithWildcard__Group__2_in_rule__QualifiedNameWithWildcard__Group__137182);
+            pushFollow(FOLLOW_2);
             rule__QualifiedNameWithWildcard__Group__2();
 
             state._fsp--;
@@ -52894,22 +52894,22 @@ public final void rule__QualifiedNameWithWildcard__Group__1() throws Recognition
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18494:1: rule__QualifiedNameWithWildcard__Group__1__Impl : ( '.' ) ;
+    // InternalCheckCfg.g:18494:1: rule__QualifiedNameWithWildcard__Group__1__Impl : ( '.' ) ;
     public final void rule__QualifiedNameWithWildcard__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18498:1: ( ( '.' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18499:1: ( '.' )
+            // InternalCheckCfg.g:18498:1: ( ( '.' ) )
+            // InternalCheckCfg.g:18499:1: ( '.' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18499:1: ( '.' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18500:1: '.'
+            // InternalCheckCfg.g:18499:1: ( '.' )
+            // InternalCheckCfg.g:18500:1: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameWithWildcardAccess().getFullStopKeyword_1()); 
             }
-            match(input,43,FOLLOW_43_in_rule__QualifiedNameWithWildcard__Group__1__Impl37210); if (state.failed) return ;
+            match(input,43,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getQualifiedNameWithWildcardAccess().getFullStopKeyword_1()); 
             }
@@ -52935,16 +52935,16 @@ public final void rule__QualifiedNameWithWildcard__Group__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18513:1: rule__QualifiedNameWithWildcard__Group__2 : rule__QualifiedNameWithWildcard__Group__2__Impl ;
+    // InternalCheckCfg.g:18513:1: rule__QualifiedNameWithWildcard__Group__2 : rule__QualifiedNameWithWildcard__Group__2__Impl ;
     public final void rule__QualifiedNameWithWildcard__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18517:1: ( rule__QualifiedNameWithWildcard__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18518:2: rule__QualifiedNameWithWildcard__Group__2__Impl
+            // InternalCheckCfg.g:18517:1: ( rule__QualifiedNameWithWildcard__Group__2__Impl )
+            // InternalCheckCfg.g:18518:2: rule__QualifiedNameWithWildcard__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__QualifiedNameWithWildcard__Group__2__Impl_in_rule__QualifiedNameWithWildcard__Group__237241);
+            pushFollow(FOLLOW_2);
             rule__QualifiedNameWithWildcard__Group__2__Impl();
 
             state._fsp--;
@@ -52968,22 +52968,22 @@ public final void rule__QualifiedNameWithWildcard__Group__2() throws Recognition
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18524:1: rule__QualifiedNameWithWildcard__Group__2__Impl : ( '*' ) ;
+    // InternalCheckCfg.g:18524:1: rule__QualifiedNameWithWildcard__Group__2__Impl : ( '*' ) ;
     public final void rule__QualifiedNameWithWildcard__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18528:1: ( ( '*' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18529:1: ( '*' )
+            // InternalCheckCfg.g:18528:1: ( ( '*' ) )
+            // InternalCheckCfg.g:18529:1: ( '*' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18529:1: ( '*' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18530:1: '*'
+            // InternalCheckCfg.g:18529:1: ( '*' )
+            // InternalCheckCfg.g:18530:1: '*'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameWithWildcardAccess().getAsteriskKeyword_2()); 
             }
-            match(input,36,FOLLOW_36_in_rule__QualifiedNameWithWildcard__Group__2__Impl37269); if (state.failed) return ;
+            match(input,36,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getQualifiedNameWithWildcardAccess().getAsteriskKeyword_2()); 
             }
@@ -53009,21 +53009,21 @@ public final void rule__QualifiedNameWithWildcard__Group__2__Impl() throws Recog
 
 
     // $ANTLR start "rule__XImportDeclaration__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18549:1: rule__XImportDeclaration__Group__0 : rule__XImportDeclaration__Group__0__Impl rule__XImportDeclaration__Group__1 ;
+    // InternalCheckCfg.g:18549:1: rule__XImportDeclaration__Group__0 : rule__XImportDeclaration__Group__0__Impl rule__XImportDeclaration__Group__1 ;
     public final void rule__XImportDeclaration__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18553:1: ( rule__XImportDeclaration__Group__0__Impl rule__XImportDeclaration__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18554:2: rule__XImportDeclaration__Group__0__Impl rule__XImportDeclaration__Group__1
+            // InternalCheckCfg.g:18553:1: ( rule__XImportDeclaration__Group__0__Impl rule__XImportDeclaration__Group__1 )
+            // InternalCheckCfg.g:18554:2: rule__XImportDeclaration__Group__0__Impl rule__XImportDeclaration__Group__1
             {
-            pushFollow(FOLLOW_rule__XImportDeclaration__Group__0__Impl_in_rule__XImportDeclaration__Group__037306);
+            pushFollow(FOLLOW_108);
             rule__XImportDeclaration__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XImportDeclaration__Group__1_in_rule__XImportDeclaration__Group__037309);
+            pushFollow(FOLLOW_2);
             rule__XImportDeclaration__Group__1();
 
             state._fsp--;
@@ -53047,22 +53047,22 @@ public final void rule__XImportDeclaration__Group__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XImportDeclaration__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18561:1: rule__XImportDeclaration__Group__0__Impl : ( 'import' ) ;
+    // InternalCheckCfg.g:18561:1: rule__XImportDeclaration__Group__0__Impl : ( 'import' ) ;
     public final void rule__XImportDeclaration__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18565:1: ( ( 'import' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18566:1: ( 'import' )
+            // InternalCheckCfg.g:18565:1: ( ( 'import' ) )
+            // InternalCheckCfg.g:18566:1: ( 'import' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18566:1: ( 'import' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18567:1: 'import'
+            // InternalCheckCfg.g:18566:1: ( 'import' )
+            // InternalCheckCfg.g:18567:1: 'import'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getImportKeyword_0()); 
             }
-            match(input,47,FOLLOW_47_in_rule__XImportDeclaration__Group__0__Impl37337); if (state.failed) return ;
+            match(input,47,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXImportDeclarationAccess().getImportKeyword_0()); 
             }
@@ -53088,21 +53088,21 @@ public final void rule__XImportDeclaration__Group__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XImportDeclaration__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18580:1: rule__XImportDeclaration__Group__1 : rule__XImportDeclaration__Group__1__Impl rule__XImportDeclaration__Group__2 ;
+    // InternalCheckCfg.g:18580:1: rule__XImportDeclaration__Group__1 : rule__XImportDeclaration__Group__1__Impl rule__XImportDeclaration__Group__2 ;
     public final void rule__XImportDeclaration__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18584:1: ( rule__XImportDeclaration__Group__1__Impl rule__XImportDeclaration__Group__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18585:2: rule__XImportDeclaration__Group__1__Impl rule__XImportDeclaration__Group__2
+            // InternalCheckCfg.g:18584:1: ( rule__XImportDeclaration__Group__1__Impl rule__XImportDeclaration__Group__2 )
+            // InternalCheckCfg.g:18585:2: rule__XImportDeclaration__Group__1__Impl rule__XImportDeclaration__Group__2
             {
-            pushFollow(FOLLOW_rule__XImportDeclaration__Group__1__Impl_in_rule__XImportDeclaration__Group__137368);
+            pushFollow(FOLLOW_69);
             rule__XImportDeclaration__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XImportDeclaration__Group__2_in_rule__XImportDeclaration__Group__137371);
+            pushFollow(FOLLOW_2);
             rule__XImportDeclaration__Group__2();
 
             state._fsp--;
@@ -53126,25 +53126,25 @@ public final void rule__XImportDeclaration__Group__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XImportDeclaration__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18592:1: rule__XImportDeclaration__Group__1__Impl : ( ( rule__XImportDeclaration__Alternatives_1 ) ) ;
+    // InternalCheckCfg.g:18592:1: rule__XImportDeclaration__Group__1__Impl : ( ( rule__XImportDeclaration__Alternatives_1 ) ) ;
     public final void rule__XImportDeclaration__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18596:1: ( ( ( rule__XImportDeclaration__Alternatives_1 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18597:1: ( ( rule__XImportDeclaration__Alternatives_1 ) )
+            // InternalCheckCfg.g:18596:1: ( ( ( rule__XImportDeclaration__Alternatives_1 ) ) )
+            // InternalCheckCfg.g:18597:1: ( ( rule__XImportDeclaration__Alternatives_1 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18597:1: ( ( rule__XImportDeclaration__Alternatives_1 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18598:1: ( rule__XImportDeclaration__Alternatives_1 )
+            // InternalCheckCfg.g:18597:1: ( ( rule__XImportDeclaration__Alternatives_1 ) )
+            // InternalCheckCfg.g:18598:1: ( rule__XImportDeclaration__Alternatives_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getAlternatives_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18599:1: ( rule__XImportDeclaration__Alternatives_1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18599:2: rule__XImportDeclaration__Alternatives_1
+            // InternalCheckCfg.g:18599:1: ( rule__XImportDeclaration__Alternatives_1 )
+            // InternalCheckCfg.g:18599:2: rule__XImportDeclaration__Alternatives_1
             {
-            pushFollow(FOLLOW_rule__XImportDeclaration__Alternatives_1_in_rule__XImportDeclaration__Group__1__Impl37398);
+            pushFollow(FOLLOW_2);
             rule__XImportDeclaration__Alternatives_1();
 
             state._fsp--;
@@ -53177,16 +53177,16 @@ public final void rule__XImportDeclaration__Group__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XImportDeclaration__Group__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18609:1: rule__XImportDeclaration__Group__2 : rule__XImportDeclaration__Group__2__Impl ;
+    // InternalCheckCfg.g:18609:1: rule__XImportDeclaration__Group__2 : rule__XImportDeclaration__Group__2__Impl ;
     public final void rule__XImportDeclaration__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18613:1: ( rule__XImportDeclaration__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18614:2: rule__XImportDeclaration__Group__2__Impl
+            // InternalCheckCfg.g:18613:1: ( rule__XImportDeclaration__Group__2__Impl )
+            // InternalCheckCfg.g:18614:2: rule__XImportDeclaration__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__XImportDeclaration__Group__2__Impl_in_rule__XImportDeclaration__Group__237428);
+            pushFollow(FOLLOW_2);
             rule__XImportDeclaration__Group__2__Impl();
 
             state._fsp--;
@@ -53210,22 +53210,22 @@ public final void rule__XImportDeclaration__Group__2() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XImportDeclaration__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18620:1: rule__XImportDeclaration__Group__2__Impl : ( ( ';' )? ) ;
+    // InternalCheckCfg.g:18620:1: rule__XImportDeclaration__Group__2__Impl : ( ( ';' )? ) ;
     public final void rule__XImportDeclaration__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18624:1: ( ( ( ';' )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18625:1: ( ( ';' )? )
+            // InternalCheckCfg.g:18624:1: ( ( ( ';' )? ) )
+            // InternalCheckCfg.g:18625:1: ( ( ';' )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18625:1: ( ( ';' )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18626:1: ( ';' )?
+            // InternalCheckCfg.g:18625:1: ( ( ';' )? )
+            // InternalCheckCfg.g:18626:1: ( ';' )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getSemicolonKeyword_2()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18627:1: ( ';' )?
+            // InternalCheckCfg.g:18627:1: ( ';' )?
             int alt131=2;
             int LA131_0 = input.LA(1);
 
@@ -53234,9 +53234,9 @@ public final void rule__XImportDeclaration__Group__2__Impl() throws RecognitionE
             }
             switch (alt131) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18628:2: ';'
+                    // InternalCheckCfg.g:18628:2: ';'
                     {
-                    match(input,70,FOLLOW_70_in_rule__XImportDeclaration__Group__2__Impl37457); if (state.failed) return ;
+                    match(input,70,FOLLOW_2); if (state.failed) return ;
 
                     }
                     break;
@@ -53268,21 +53268,21 @@ public final void rule__XImportDeclaration__Group__2__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XImportDeclaration__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18645:1: rule__XImportDeclaration__Group_1_0__0 : rule__XImportDeclaration__Group_1_0__0__Impl rule__XImportDeclaration__Group_1_0__1 ;
+    // InternalCheckCfg.g:18645:1: rule__XImportDeclaration__Group_1_0__0 : rule__XImportDeclaration__Group_1_0__0__Impl rule__XImportDeclaration__Group_1_0__1 ;
     public final void rule__XImportDeclaration__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18649:1: ( rule__XImportDeclaration__Group_1_0__0__Impl rule__XImportDeclaration__Group_1_0__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18650:2: rule__XImportDeclaration__Group_1_0__0__Impl rule__XImportDeclaration__Group_1_0__1
+            // InternalCheckCfg.g:18649:1: ( rule__XImportDeclaration__Group_1_0__0__Impl rule__XImportDeclaration__Group_1_0__1 )
+            // InternalCheckCfg.g:18650:2: rule__XImportDeclaration__Group_1_0__0__Impl rule__XImportDeclaration__Group_1_0__1
             {
-            pushFollow(FOLLOW_rule__XImportDeclaration__Group_1_0__0__Impl_in_rule__XImportDeclaration__Group_1_0__037496);
+            pushFollow(FOLLOW_109);
             rule__XImportDeclaration__Group_1_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XImportDeclaration__Group_1_0__1_in_rule__XImportDeclaration__Group_1_0__037499);
+            pushFollow(FOLLOW_2);
             rule__XImportDeclaration__Group_1_0__1();
 
             state._fsp--;
@@ -53306,25 +53306,25 @@ public final void rule__XImportDeclaration__Group_1_0__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__XImportDeclaration__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18657:1: rule__XImportDeclaration__Group_1_0__0__Impl : ( ( rule__XImportDeclaration__StaticAssignment_1_0_0 ) ) ;
+    // InternalCheckCfg.g:18657:1: rule__XImportDeclaration__Group_1_0__0__Impl : ( ( rule__XImportDeclaration__StaticAssignment_1_0_0 ) ) ;
     public final void rule__XImportDeclaration__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18661:1: ( ( ( rule__XImportDeclaration__StaticAssignment_1_0_0 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18662:1: ( ( rule__XImportDeclaration__StaticAssignment_1_0_0 ) )
+            // InternalCheckCfg.g:18661:1: ( ( ( rule__XImportDeclaration__StaticAssignment_1_0_0 ) ) )
+            // InternalCheckCfg.g:18662:1: ( ( rule__XImportDeclaration__StaticAssignment_1_0_0 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18662:1: ( ( rule__XImportDeclaration__StaticAssignment_1_0_0 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18663:1: ( rule__XImportDeclaration__StaticAssignment_1_0_0 )
+            // InternalCheckCfg.g:18662:1: ( ( rule__XImportDeclaration__StaticAssignment_1_0_0 ) )
+            // InternalCheckCfg.g:18663:1: ( rule__XImportDeclaration__StaticAssignment_1_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getStaticAssignment_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18664:1: ( rule__XImportDeclaration__StaticAssignment_1_0_0 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18664:2: rule__XImportDeclaration__StaticAssignment_1_0_0
+            // InternalCheckCfg.g:18664:1: ( rule__XImportDeclaration__StaticAssignment_1_0_0 )
+            // InternalCheckCfg.g:18664:2: rule__XImportDeclaration__StaticAssignment_1_0_0
             {
-            pushFollow(FOLLOW_rule__XImportDeclaration__StaticAssignment_1_0_0_in_rule__XImportDeclaration__Group_1_0__0__Impl37526);
+            pushFollow(FOLLOW_2);
             rule__XImportDeclaration__StaticAssignment_1_0_0();
 
             state._fsp--;
@@ -53357,21 +53357,21 @@ public final void rule__XImportDeclaration__Group_1_0__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XImportDeclaration__Group_1_0__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18674:1: rule__XImportDeclaration__Group_1_0__1 : rule__XImportDeclaration__Group_1_0__1__Impl rule__XImportDeclaration__Group_1_0__2 ;
+    // InternalCheckCfg.g:18674:1: rule__XImportDeclaration__Group_1_0__1 : rule__XImportDeclaration__Group_1_0__1__Impl rule__XImportDeclaration__Group_1_0__2 ;
     public final void rule__XImportDeclaration__Group_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18678:1: ( rule__XImportDeclaration__Group_1_0__1__Impl rule__XImportDeclaration__Group_1_0__2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18679:2: rule__XImportDeclaration__Group_1_0__1__Impl rule__XImportDeclaration__Group_1_0__2
+            // InternalCheckCfg.g:18678:1: ( rule__XImportDeclaration__Group_1_0__1__Impl rule__XImportDeclaration__Group_1_0__2 )
+            // InternalCheckCfg.g:18679:2: rule__XImportDeclaration__Group_1_0__1__Impl rule__XImportDeclaration__Group_1_0__2
             {
-            pushFollow(FOLLOW_rule__XImportDeclaration__Group_1_0__1__Impl_in_rule__XImportDeclaration__Group_1_0__137556);
+            pushFollow(FOLLOW_109);
             rule__XImportDeclaration__Group_1_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XImportDeclaration__Group_1_0__2_in_rule__XImportDeclaration__Group_1_0__137559);
+            pushFollow(FOLLOW_2);
             rule__XImportDeclaration__Group_1_0__2();
 
             state._fsp--;
@@ -53395,22 +53395,22 @@ public final void rule__XImportDeclaration__Group_1_0__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__XImportDeclaration__Group_1_0__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18686:1: rule__XImportDeclaration__Group_1_0__1__Impl : ( ( rule__XImportDeclaration__ExtensionAssignment_1_0_1 )? ) ;
+    // InternalCheckCfg.g:18686:1: rule__XImportDeclaration__Group_1_0__1__Impl : ( ( rule__XImportDeclaration__ExtensionAssignment_1_0_1 )? ) ;
     public final void rule__XImportDeclaration__Group_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18690:1: ( ( ( rule__XImportDeclaration__ExtensionAssignment_1_0_1 )? ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18691:1: ( ( rule__XImportDeclaration__ExtensionAssignment_1_0_1 )? )
+            // InternalCheckCfg.g:18690:1: ( ( ( rule__XImportDeclaration__ExtensionAssignment_1_0_1 )? ) )
+            // InternalCheckCfg.g:18691:1: ( ( rule__XImportDeclaration__ExtensionAssignment_1_0_1 )? )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18691:1: ( ( rule__XImportDeclaration__ExtensionAssignment_1_0_1 )? )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18692:1: ( rule__XImportDeclaration__ExtensionAssignment_1_0_1 )?
+            // InternalCheckCfg.g:18691:1: ( ( rule__XImportDeclaration__ExtensionAssignment_1_0_1 )? )
+            // InternalCheckCfg.g:18692:1: ( rule__XImportDeclaration__ExtensionAssignment_1_0_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getExtensionAssignment_1_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18693:1: ( rule__XImportDeclaration__ExtensionAssignment_1_0_1 )?
+            // InternalCheckCfg.g:18693:1: ( rule__XImportDeclaration__ExtensionAssignment_1_0_1 )?
             int alt132=2;
             int LA132_0 = input.LA(1);
 
@@ -53419,9 +53419,9 @@ public final void rule__XImportDeclaration__Group_1_0__1__Impl() throws Recognit
             }
             switch (alt132) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18693:2: rule__XImportDeclaration__ExtensionAssignment_1_0_1
+                    // InternalCheckCfg.g:18693:2: rule__XImportDeclaration__ExtensionAssignment_1_0_1
                     {
-                    pushFollow(FOLLOW_rule__XImportDeclaration__ExtensionAssignment_1_0_1_in_rule__XImportDeclaration__Group_1_0__1__Impl37586);
+                    pushFollow(FOLLOW_2);
                     rule__XImportDeclaration__ExtensionAssignment_1_0_1();
 
                     state._fsp--;
@@ -53457,21 +53457,21 @@ public final void rule__XImportDeclaration__Group_1_0__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XImportDeclaration__Group_1_0__2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18703:1: rule__XImportDeclaration__Group_1_0__2 : rule__XImportDeclaration__Group_1_0__2__Impl rule__XImportDeclaration__Group_1_0__3 ;
+    // InternalCheckCfg.g:18703:1: rule__XImportDeclaration__Group_1_0__2 : rule__XImportDeclaration__Group_1_0__2__Impl rule__XImportDeclaration__Group_1_0__3 ;
     public final void rule__XImportDeclaration__Group_1_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18707:1: ( rule__XImportDeclaration__Group_1_0__2__Impl rule__XImportDeclaration__Group_1_0__3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18708:2: rule__XImportDeclaration__Group_1_0__2__Impl rule__XImportDeclaration__Group_1_0__3
+            // InternalCheckCfg.g:18707:1: ( rule__XImportDeclaration__Group_1_0__2__Impl rule__XImportDeclaration__Group_1_0__3 )
+            // InternalCheckCfg.g:18708:2: rule__XImportDeclaration__Group_1_0__2__Impl rule__XImportDeclaration__Group_1_0__3
             {
-            pushFollow(FOLLOW_rule__XImportDeclaration__Group_1_0__2__Impl_in_rule__XImportDeclaration__Group_1_0__237617);
+            pushFollow(FOLLOW_110);
             rule__XImportDeclaration__Group_1_0__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XImportDeclaration__Group_1_0__3_in_rule__XImportDeclaration__Group_1_0__237620);
+            pushFollow(FOLLOW_2);
             rule__XImportDeclaration__Group_1_0__3();
 
             state._fsp--;
@@ -53495,25 +53495,25 @@ public final void rule__XImportDeclaration__Group_1_0__2() throws RecognitionExc
 
 
     // $ANTLR start "rule__XImportDeclaration__Group_1_0__2__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18715:1: rule__XImportDeclaration__Group_1_0__2__Impl : ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_0_2 ) ) ;
+    // InternalCheckCfg.g:18715:1: rule__XImportDeclaration__Group_1_0__2__Impl : ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_0_2 ) ) ;
     public final void rule__XImportDeclaration__Group_1_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18719:1: ( ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_0_2 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18720:1: ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_0_2 ) )
+            // InternalCheckCfg.g:18719:1: ( ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_0_2 ) ) )
+            // InternalCheckCfg.g:18720:1: ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_0_2 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18720:1: ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_0_2 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18721:1: ( rule__XImportDeclaration__ImportedTypeAssignment_1_0_2 )
+            // InternalCheckCfg.g:18720:1: ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_0_2 ) )
+            // InternalCheckCfg.g:18721:1: ( rule__XImportDeclaration__ImportedTypeAssignment_1_0_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getImportedTypeAssignment_1_0_2()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18722:1: ( rule__XImportDeclaration__ImportedTypeAssignment_1_0_2 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18722:2: rule__XImportDeclaration__ImportedTypeAssignment_1_0_2
+            // InternalCheckCfg.g:18722:1: ( rule__XImportDeclaration__ImportedTypeAssignment_1_0_2 )
+            // InternalCheckCfg.g:18722:2: rule__XImportDeclaration__ImportedTypeAssignment_1_0_2
             {
-            pushFollow(FOLLOW_rule__XImportDeclaration__ImportedTypeAssignment_1_0_2_in_rule__XImportDeclaration__Group_1_0__2__Impl37647);
+            pushFollow(FOLLOW_2);
             rule__XImportDeclaration__ImportedTypeAssignment_1_0_2();
 
             state._fsp--;
@@ -53546,16 +53546,16 @@ public final void rule__XImportDeclaration__Group_1_0__2__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XImportDeclaration__Group_1_0__3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18732:1: rule__XImportDeclaration__Group_1_0__3 : rule__XImportDeclaration__Group_1_0__3__Impl ;
+    // InternalCheckCfg.g:18732:1: rule__XImportDeclaration__Group_1_0__3 : rule__XImportDeclaration__Group_1_0__3__Impl ;
     public final void rule__XImportDeclaration__Group_1_0__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18736:1: ( rule__XImportDeclaration__Group_1_0__3__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18737:2: rule__XImportDeclaration__Group_1_0__3__Impl
+            // InternalCheckCfg.g:18736:1: ( rule__XImportDeclaration__Group_1_0__3__Impl )
+            // InternalCheckCfg.g:18737:2: rule__XImportDeclaration__Group_1_0__3__Impl
             {
-            pushFollow(FOLLOW_rule__XImportDeclaration__Group_1_0__3__Impl_in_rule__XImportDeclaration__Group_1_0__337677);
+            pushFollow(FOLLOW_2);
             rule__XImportDeclaration__Group_1_0__3__Impl();
 
             state._fsp--;
@@ -53579,25 +53579,25 @@ public final void rule__XImportDeclaration__Group_1_0__3() throws RecognitionExc
 
 
     // $ANTLR start "rule__XImportDeclaration__Group_1_0__3__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18743:1: rule__XImportDeclaration__Group_1_0__3__Impl : ( ( rule__XImportDeclaration__Alternatives_1_0_3 ) ) ;
+    // InternalCheckCfg.g:18743:1: rule__XImportDeclaration__Group_1_0__3__Impl : ( ( rule__XImportDeclaration__Alternatives_1_0_3 ) ) ;
     public final void rule__XImportDeclaration__Group_1_0__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18747:1: ( ( ( rule__XImportDeclaration__Alternatives_1_0_3 ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18748:1: ( ( rule__XImportDeclaration__Alternatives_1_0_3 ) )
+            // InternalCheckCfg.g:18747:1: ( ( ( rule__XImportDeclaration__Alternatives_1_0_3 ) ) )
+            // InternalCheckCfg.g:18748:1: ( ( rule__XImportDeclaration__Alternatives_1_0_3 ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18748:1: ( ( rule__XImportDeclaration__Alternatives_1_0_3 ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18749:1: ( rule__XImportDeclaration__Alternatives_1_0_3 )
+            // InternalCheckCfg.g:18748:1: ( ( rule__XImportDeclaration__Alternatives_1_0_3 ) )
+            // InternalCheckCfg.g:18749:1: ( rule__XImportDeclaration__Alternatives_1_0_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getAlternatives_1_0_3()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18750:1: ( rule__XImportDeclaration__Alternatives_1_0_3 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18750:2: rule__XImportDeclaration__Alternatives_1_0_3
+            // InternalCheckCfg.g:18750:1: ( rule__XImportDeclaration__Alternatives_1_0_3 )
+            // InternalCheckCfg.g:18750:2: rule__XImportDeclaration__Alternatives_1_0_3
             {
-            pushFollow(FOLLOW_rule__XImportDeclaration__Alternatives_1_0_3_in_rule__XImportDeclaration__Group_1_0__3__Impl37704);
+            pushFollow(FOLLOW_2);
             rule__XImportDeclaration__Alternatives_1_0_3();
 
             state._fsp--;
@@ -53630,21 +53630,21 @@ public final void rule__XImportDeclaration__Group_1_0__3__Impl() throws Recognit
 
 
     // $ANTLR start "rule__QualifiedNameInStaticImport__Group__0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18768:1: rule__QualifiedNameInStaticImport__Group__0 : rule__QualifiedNameInStaticImport__Group__0__Impl rule__QualifiedNameInStaticImport__Group__1 ;
+    // InternalCheckCfg.g:18768:1: rule__QualifiedNameInStaticImport__Group__0 : rule__QualifiedNameInStaticImport__Group__0__Impl rule__QualifiedNameInStaticImport__Group__1 ;
     public final void rule__QualifiedNameInStaticImport__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18772:1: ( rule__QualifiedNameInStaticImport__Group__0__Impl rule__QualifiedNameInStaticImport__Group__1 )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18773:2: rule__QualifiedNameInStaticImport__Group__0__Impl rule__QualifiedNameInStaticImport__Group__1
+            // InternalCheckCfg.g:18772:1: ( rule__QualifiedNameInStaticImport__Group__0__Impl rule__QualifiedNameInStaticImport__Group__1 )
+            // InternalCheckCfg.g:18773:2: rule__QualifiedNameInStaticImport__Group__0__Impl rule__QualifiedNameInStaticImport__Group__1
             {
-            pushFollow(FOLLOW_rule__QualifiedNameInStaticImport__Group__0__Impl_in_rule__QualifiedNameInStaticImport__Group__037742);
+            pushFollow(FOLLOW_100);
             rule__QualifiedNameInStaticImport__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__QualifiedNameInStaticImport__Group__1_in_rule__QualifiedNameInStaticImport__Group__037745);
+            pushFollow(FOLLOW_2);
             rule__QualifiedNameInStaticImport__Group__1();
 
             state._fsp--;
@@ -53668,22 +53668,22 @@ public final void rule__QualifiedNameInStaticImport__Group__0() throws Recogniti
 
 
     // $ANTLR start "rule__QualifiedNameInStaticImport__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18780:1: rule__QualifiedNameInStaticImport__Group__0__Impl : ( ruleValidID ) ;
+    // InternalCheckCfg.g:18780:1: rule__QualifiedNameInStaticImport__Group__0__Impl : ( ruleValidID ) ;
     public final void rule__QualifiedNameInStaticImport__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18784:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18785:1: ( ruleValidID )
+            // InternalCheckCfg.g:18784:1: ( ( ruleValidID ) )
+            // InternalCheckCfg.g:18785:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18785:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18786:1: ruleValidID
+            // InternalCheckCfg.g:18785:1: ( ruleValidID )
+            // InternalCheckCfg.g:18786:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameInStaticImportAccess().getValidIDParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__QualifiedNameInStaticImport__Group__0__Impl37772);
+            pushFollow(FOLLOW_2);
             ruleValidID();
 
             state._fsp--;
@@ -53713,16 +53713,16 @@ public final void rule__QualifiedNameInStaticImport__Group__0__Impl() throws Rec
 
 
     // $ANTLR start "rule__QualifiedNameInStaticImport__Group__1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18797:1: rule__QualifiedNameInStaticImport__Group__1 : rule__QualifiedNameInStaticImport__Group__1__Impl ;
+    // InternalCheckCfg.g:18797:1: rule__QualifiedNameInStaticImport__Group__1 : rule__QualifiedNameInStaticImport__Group__1__Impl ;
     public final void rule__QualifiedNameInStaticImport__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18801:1: ( rule__QualifiedNameInStaticImport__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18802:2: rule__QualifiedNameInStaticImport__Group__1__Impl
+            // InternalCheckCfg.g:18801:1: ( rule__QualifiedNameInStaticImport__Group__1__Impl )
+            // InternalCheckCfg.g:18802:2: rule__QualifiedNameInStaticImport__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__QualifiedNameInStaticImport__Group__1__Impl_in_rule__QualifiedNameInStaticImport__Group__137801);
+            pushFollow(FOLLOW_2);
             rule__QualifiedNameInStaticImport__Group__1__Impl();
 
             state._fsp--;
@@ -53746,22 +53746,22 @@ public final void rule__QualifiedNameInStaticImport__Group__1() throws Recogniti
 
 
     // $ANTLR start "rule__QualifiedNameInStaticImport__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18808:1: rule__QualifiedNameInStaticImport__Group__1__Impl : ( '.' ) ;
+    // InternalCheckCfg.g:18808:1: rule__QualifiedNameInStaticImport__Group__1__Impl : ( '.' ) ;
     public final void rule__QualifiedNameInStaticImport__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18812:1: ( ( '.' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18813:1: ( '.' )
+            // InternalCheckCfg.g:18812:1: ( ( '.' ) )
+            // InternalCheckCfg.g:18813:1: ( '.' )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18813:1: ( '.' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18814:1: '.'
+            // InternalCheckCfg.g:18813:1: ( '.' )
+            // InternalCheckCfg.g:18814:1: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameInStaticImportAccess().getFullStopKeyword_1()); 
             }
-            match(input,43,FOLLOW_43_in_rule__QualifiedNameInStaticImport__Group__1__Impl37829); if (state.failed) return ;
+            match(input,43,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getQualifiedNameInStaticImportAccess().getFullStopKeyword_1()); 
             }
@@ -53787,22 +53787,22 @@ public final void rule__QualifiedNameInStaticImport__Group__1__Impl() throws Rec
 
 
     // $ANTLR start "rule__CheckConfiguration__NameAssignment_2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18832:1: rule__CheckConfiguration__NameAssignment_2 : ( ruleValidID ) ;
+    // InternalCheckCfg.g:18832:1: rule__CheckConfiguration__NameAssignment_2 : ( ruleValidID ) ;
     public final void rule__CheckConfiguration__NameAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18836:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18837:1: ( ruleValidID )
+            // InternalCheckCfg.g:18836:1: ( ( ruleValidID ) )
+            // InternalCheckCfg.g:18837:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18837:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18838:1: ruleValidID
+            // InternalCheckCfg.g:18837:1: ( ruleValidID )
+            // InternalCheckCfg.g:18838:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckConfigurationAccess().getNameValidIDParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__CheckConfiguration__NameAssignment_237869);
+            pushFollow(FOLLOW_2);
             ruleValidID();
 
             state._fsp--;
@@ -53832,22 +53832,22 @@ public final void rule__CheckConfiguration__NameAssignment_2() throws Recognitio
 
 
     // $ANTLR start "rule__CheckConfiguration__ParameterConfigurationsAssignment_3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18847:1: rule__CheckConfiguration__ParameterConfigurationsAssignment_3 : ( ruleConfiguredParameter ) ;
+    // InternalCheckCfg.g:18847:1: rule__CheckConfiguration__ParameterConfigurationsAssignment_3 : ( ruleConfiguredParameter ) ;
     public final void rule__CheckConfiguration__ParameterConfigurationsAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18851:1: ( ( ruleConfiguredParameter ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18852:1: ( ruleConfiguredParameter )
+            // InternalCheckCfg.g:18851:1: ( ( ruleConfiguredParameter ) )
+            // InternalCheckCfg.g:18852:1: ( ruleConfiguredParameter )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18852:1: ( ruleConfiguredParameter )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18853:1: ruleConfiguredParameter
+            // InternalCheckCfg.g:18852:1: ( ruleConfiguredParameter )
+            // InternalCheckCfg.g:18853:1: ruleConfiguredParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckConfigurationAccess().getParameterConfigurationsConfiguredParameterParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleConfiguredParameter_in_rule__CheckConfiguration__ParameterConfigurationsAssignment_337900);
+            pushFollow(FOLLOW_2);
             ruleConfiguredParameter();
 
             state._fsp--;
@@ -53877,22 +53877,22 @@ public final void rule__CheckConfiguration__ParameterConfigurationsAssignment_3(
 
 
     // $ANTLR start "rule__CheckConfiguration__LanguageValidatorConfigurationsAssignment_4"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18862:1: rule__CheckConfiguration__LanguageValidatorConfigurationsAssignment_4 : ( ruleConfiguredLanguageValidator ) ;
+    // InternalCheckCfg.g:18862:1: rule__CheckConfiguration__LanguageValidatorConfigurationsAssignment_4 : ( ruleConfiguredLanguageValidator ) ;
     public final void rule__CheckConfiguration__LanguageValidatorConfigurationsAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18866:1: ( ( ruleConfiguredLanguageValidator ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18867:1: ( ruleConfiguredLanguageValidator )
+            // InternalCheckCfg.g:18866:1: ( ( ruleConfiguredLanguageValidator ) )
+            // InternalCheckCfg.g:18867:1: ( ruleConfiguredLanguageValidator )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18867:1: ( ruleConfiguredLanguageValidator )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18868:1: ruleConfiguredLanguageValidator
+            // InternalCheckCfg.g:18867:1: ( ruleConfiguredLanguageValidator )
+            // InternalCheckCfg.g:18868:1: ruleConfiguredLanguageValidator
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckConfigurationAccess().getLanguageValidatorConfigurationsConfiguredLanguageValidatorParserRuleCall_4_0()); 
             }
-            pushFollow(FOLLOW_ruleConfiguredLanguageValidator_in_rule__CheckConfiguration__LanguageValidatorConfigurationsAssignment_437931);
+            pushFollow(FOLLOW_2);
             ruleConfiguredLanguageValidator();
 
             state._fsp--;
@@ -53922,22 +53922,22 @@ public final void rule__CheckConfiguration__LanguageValidatorConfigurationsAssig
 
 
     // $ANTLR start "rule__CheckConfiguration__LegacyCatalogConfigurationsAssignment_5_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18877:1: rule__CheckConfiguration__LegacyCatalogConfigurationsAssignment_5_1 : ( ruleConfiguredCatalog ) ;
+    // InternalCheckCfg.g:18877:1: rule__CheckConfiguration__LegacyCatalogConfigurationsAssignment_5_1 : ( ruleConfiguredCatalog ) ;
     public final void rule__CheckConfiguration__LegacyCatalogConfigurationsAssignment_5_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18881:1: ( ( ruleConfiguredCatalog ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18882:1: ( ruleConfiguredCatalog )
+            // InternalCheckCfg.g:18881:1: ( ( ruleConfiguredCatalog ) )
+            // InternalCheckCfg.g:18882:1: ( ruleConfiguredCatalog )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18882:1: ( ruleConfiguredCatalog )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18883:1: ruleConfiguredCatalog
+            // InternalCheckCfg.g:18882:1: ( ruleConfiguredCatalog )
+            // InternalCheckCfg.g:18883:1: ruleConfiguredCatalog
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckConfigurationAccess().getLegacyCatalogConfigurationsConfiguredCatalogParserRuleCall_5_1_0()); 
             }
-            pushFollow(FOLLOW_ruleConfiguredCatalog_in_rule__CheckConfiguration__LegacyCatalogConfigurationsAssignment_5_137962);
+            pushFollow(FOLLOW_2);
             ruleConfiguredCatalog();
 
             state._fsp--;
@@ -53967,22 +53967,22 @@ public final void rule__CheckConfiguration__LegacyCatalogConfigurationsAssignmen
 
 
     // $ANTLR start "rule__ConfiguredLanguageValidator__LanguageAssignment_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18892:1: rule__ConfiguredLanguageValidator__LanguageAssignment_1 : ( ruleQualifiedName ) ;
+    // InternalCheckCfg.g:18892:1: rule__ConfiguredLanguageValidator__LanguageAssignment_1 : ( ruleQualifiedName ) ;
     public final void rule__ConfiguredLanguageValidator__LanguageAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18896:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18897:1: ( ruleQualifiedName )
+            // InternalCheckCfg.g:18896:1: ( ( ruleQualifiedName ) )
+            // InternalCheckCfg.g:18897:1: ( ruleQualifiedName )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18897:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18898:1: ruleQualifiedName
+            // InternalCheckCfg.g:18897:1: ( ruleQualifiedName )
+            // InternalCheckCfg.g:18898:1: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredLanguageValidatorAccess().getLanguageQualifiedNameParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_rule__ConfiguredLanguageValidator__LanguageAssignment_137993);
+            pushFollow(FOLLOW_2);
             ruleQualifiedName();
 
             state._fsp--;
@@ -54012,22 +54012,22 @@ public final void rule__ConfiguredLanguageValidator__LanguageAssignment_1() thro
 
 
     // $ANTLR start "rule__ConfiguredLanguageValidator__ParameterConfigurationsAssignment_3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18907:1: rule__ConfiguredLanguageValidator__ParameterConfigurationsAssignment_3 : ( ruleConfiguredParameter ) ;
+    // InternalCheckCfg.g:18907:1: rule__ConfiguredLanguageValidator__ParameterConfigurationsAssignment_3 : ( ruleConfiguredParameter ) ;
     public final void rule__ConfiguredLanguageValidator__ParameterConfigurationsAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18911:1: ( ( ruleConfiguredParameter ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18912:1: ( ruleConfiguredParameter )
+            // InternalCheckCfg.g:18911:1: ( ( ruleConfiguredParameter ) )
+            // InternalCheckCfg.g:18912:1: ( ruleConfiguredParameter )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18912:1: ( ruleConfiguredParameter )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18913:1: ruleConfiguredParameter
+            // InternalCheckCfg.g:18912:1: ( ruleConfiguredParameter )
+            // InternalCheckCfg.g:18913:1: ruleConfiguredParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredLanguageValidatorAccess().getParameterConfigurationsConfiguredParameterParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleConfiguredParameter_in_rule__ConfiguredLanguageValidator__ParameterConfigurationsAssignment_338024);
+            pushFollow(FOLLOW_2);
             ruleConfiguredParameter();
 
             state._fsp--;
@@ -54057,22 +54057,22 @@ public final void rule__ConfiguredLanguageValidator__ParameterConfigurationsAssi
 
 
     // $ANTLR start "rule__ConfiguredLanguageValidator__CatalogConfigurationsAssignment_4"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18922:1: rule__ConfiguredLanguageValidator__CatalogConfigurationsAssignment_4 : ( ruleConfiguredCatalog ) ;
+    // InternalCheckCfg.g:18922:1: rule__ConfiguredLanguageValidator__CatalogConfigurationsAssignment_4 : ( ruleConfiguredCatalog ) ;
     public final void rule__ConfiguredLanguageValidator__CatalogConfigurationsAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18926:1: ( ( ruleConfiguredCatalog ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18927:1: ( ruleConfiguredCatalog )
+            // InternalCheckCfg.g:18926:1: ( ( ruleConfiguredCatalog ) )
+            // InternalCheckCfg.g:18927:1: ( ruleConfiguredCatalog )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18927:1: ( ruleConfiguredCatalog )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18928:1: ruleConfiguredCatalog
+            // InternalCheckCfg.g:18927:1: ( ruleConfiguredCatalog )
+            // InternalCheckCfg.g:18928:1: ruleConfiguredCatalog
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredLanguageValidatorAccess().getCatalogConfigurationsConfiguredCatalogParserRuleCall_4_0()); 
             }
-            pushFollow(FOLLOW_ruleConfiguredCatalog_in_rule__ConfiguredLanguageValidator__CatalogConfigurationsAssignment_438055);
+            pushFollow(FOLLOW_2);
             ruleConfiguredCatalog();
 
             state._fsp--;
@@ -54102,28 +54102,28 @@ public final void rule__ConfiguredLanguageValidator__CatalogConfigurationsAssign
 
 
     // $ANTLR start "rule__ConfiguredCatalog__CatalogAssignment_2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18937:1: rule__ConfiguredCatalog__CatalogAssignment_2 : ( ( ruleQualifiedName ) ) ;
+    // InternalCheckCfg.g:18937:1: rule__ConfiguredCatalog__CatalogAssignment_2 : ( ( ruleQualifiedName ) ) ;
     public final void rule__ConfiguredCatalog__CatalogAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18941:1: ( ( ( ruleQualifiedName ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18942:1: ( ( ruleQualifiedName ) )
+            // InternalCheckCfg.g:18941:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalCheckCfg.g:18942:1: ( ( ruleQualifiedName ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18942:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18943:1: ( ruleQualifiedName )
+            // InternalCheckCfg.g:18942:1: ( ( ruleQualifiedName ) )
+            // InternalCheckCfg.g:18943:1: ( ruleQualifiedName )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredCatalogAccess().getCatalogCheckCatalogCrossReference_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18944:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18945:1: ruleQualifiedName
+            // InternalCheckCfg.g:18944:1: ( ruleQualifiedName )
+            // InternalCheckCfg.g:18945:1: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredCatalogAccess().getCatalogCheckCatalogQualifiedNameParserRuleCall_2_0_1()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_rule__ConfiguredCatalog__CatalogAssignment_238090);
+            pushFollow(FOLLOW_2);
             ruleQualifiedName();
 
             state._fsp--;
@@ -54159,22 +54159,22 @@ public final void rule__ConfiguredCatalog__CatalogAssignment_2() throws Recognit
 
 
     // $ANTLR start "rule__ConfiguredCatalog__ParameterConfigurationsAssignment_4"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18956:1: rule__ConfiguredCatalog__ParameterConfigurationsAssignment_4 : ( ruleConfiguredParameter ) ;
+    // InternalCheckCfg.g:18956:1: rule__ConfiguredCatalog__ParameterConfigurationsAssignment_4 : ( ruleConfiguredParameter ) ;
     public final void rule__ConfiguredCatalog__ParameterConfigurationsAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18960:1: ( ( ruleConfiguredParameter ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18961:1: ( ruleConfiguredParameter )
+            // InternalCheckCfg.g:18960:1: ( ( ruleConfiguredParameter ) )
+            // InternalCheckCfg.g:18961:1: ( ruleConfiguredParameter )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18961:1: ( ruleConfiguredParameter )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18962:1: ruleConfiguredParameter
+            // InternalCheckCfg.g:18961:1: ( ruleConfiguredParameter )
+            // InternalCheckCfg.g:18962:1: ruleConfiguredParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredCatalogAccess().getParameterConfigurationsConfiguredParameterParserRuleCall_4_0()); 
             }
-            pushFollow(FOLLOW_ruleConfiguredParameter_in_rule__ConfiguredCatalog__ParameterConfigurationsAssignment_438125);
+            pushFollow(FOLLOW_2);
             ruleConfiguredParameter();
 
             state._fsp--;
@@ -54204,22 +54204,22 @@ public final void rule__ConfiguredCatalog__ParameterConfigurationsAssignment_4()
 
 
     // $ANTLR start "rule__ConfiguredCatalog__CheckConfigurationsAssignment_5"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18971:1: rule__ConfiguredCatalog__CheckConfigurationsAssignment_5 : ( ruleConfiguredCheck ) ;
+    // InternalCheckCfg.g:18971:1: rule__ConfiguredCatalog__CheckConfigurationsAssignment_5 : ( ruleConfiguredCheck ) ;
     public final void rule__ConfiguredCatalog__CheckConfigurationsAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18975:1: ( ( ruleConfiguredCheck ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18976:1: ( ruleConfiguredCheck )
+            // InternalCheckCfg.g:18975:1: ( ( ruleConfiguredCheck ) )
+            // InternalCheckCfg.g:18976:1: ( ruleConfiguredCheck )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18976:1: ( ruleConfiguredCheck )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18977:1: ruleConfiguredCheck
+            // InternalCheckCfg.g:18976:1: ( ruleConfiguredCheck )
+            // InternalCheckCfg.g:18977:1: ruleConfiguredCheck
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredCatalogAccess().getCheckConfigurationsConfiguredCheckParserRuleCall_5_0()); 
             }
-            pushFollow(FOLLOW_ruleConfiguredCheck_in_rule__ConfiguredCatalog__CheckConfigurationsAssignment_538156);
+            pushFollow(FOLLOW_2);
             ruleConfiguredCheck();
 
             state._fsp--;
@@ -54249,22 +54249,22 @@ public final void rule__ConfiguredCatalog__CheckConfigurationsAssignment_5() thr
 
 
     // $ANTLR start "rule__ConfiguredCheck__SeverityAssignment_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18986:1: rule__ConfiguredCheck__SeverityAssignment_1 : ( ruleSeverityKind ) ;
+    // InternalCheckCfg.g:18986:1: rule__ConfiguredCheck__SeverityAssignment_1 : ( ruleSeverityKind ) ;
     public final void rule__ConfiguredCheck__SeverityAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18990:1: ( ( ruleSeverityKind ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18991:1: ( ruleSeverityKind )
+            // InternalCheckCfg.g:18990:1: ( ( ruleSeverityKind ) )
+            // InternalCheckCfg.g:18991:1: ( ruleSeverityKind )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18991:1: ( ruleSeverityKind )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:18992:1: ruleSeverityKind
+            // InternalCheckCfg.g:18991:1: ( ruleSeverityKind )
+            // InternalCheckCfg.g:18992:1: ruleSeverityKind
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredCheckAccess().getSeveritySeverityKindEnumRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleSeverityKind_in_rule__ConfiguredCheck__SeverityAssignment_138187);
+            pushFollow(FOLLOW_2);
             ruleSeverityKind();
 
             state._fsp--;
@@ -54294,28 +54294,28 @@ public final void rule__ConfiguredCheck__SeverityAssignment_1() throws Recogniti
 
 
     // $ANTLR start "rule__ConfiguredCheck__CheckAssignment_2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19001:1: rule__ConfiguredCheck__CheckAssignment_2 : ( ( ruleQualifiedName ) ) ;
+    // InternalCheckCfg.g:19001:1: rule__ConfiguredCheck__CheckAssignment_2 : ( ( ruleQualifiedName ) ) ;
     public final void rule__ConfiguredCheck__CheckAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19005:1: ( ( ( ruleQualifiedName ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19006:1: ( ( ruleQualifiedName ) )
+            // InternalCheckCfg.g:19005:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalCheckCfg.g:19006:1: ( ( ruleQualifiedName ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19006:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19007:1: ( ruleQualifiedName )
+            // InternalCheckCfg.g:19006:1: ( ( ruleQualifiedName ) )
+            // InternalCheckCfg.g:19007:1: ( ruleQualifiedName )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredCheckAccess().getCheckCheckCrossReference_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19008:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19009:1: ruleQualifiedName
+            // InternalCheckCfg.g:19008:1: ( ruleQualifiedName )
+            // InternalCheckCfg.g:19009:1: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredCheckAccess().getCheckCheckQualifiedNameParserRuleCall_2_0_1()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_rule__ConfiguredCheck__CheckAssignment_238222);
+            pushFollow(FOLLOW_2);
             ruleQualifiedName();
 
             state._fsp--;
@@ -54351,22 +54351,22 @@ public final void rule__ConfiguredCheck__CheckAssignment_2() throws RecognitionE
 
 
     // $ANTLR start "rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19020:1: rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_1 : ( ruleConfiguredParameter ) ;
+    // InternalCheckCfg.g:19020:1: rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_1 : ( ruleConfiguredParameter ) ;
     public final void rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19024:1: ( ( ruleConfiguredParameter ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19025:1: ( ruleConfiguredParameter )
+            // InternalCheckCfg.g:19024:1: ( ( ruleConfiguredParameter ) )
+            // InternalCheckCfg.g:19025:1: ( ruleConfiguredParameter )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19025:1: ( ruleConfiguredParameter )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19026:1: ruleConfiguredParameter
+            // InternalCheckCfg.g:19025:1: ( ruleConfiguredParameter )
+            // InternalCheckCfg.g:19026:1: ruleConfiguredParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredCheckAccess().getParameterConfigurationsConfiguredParameterParserRuleCall_3_1_0()); 
             }
-            pushFollow(FOLLOW_ruleConfiguredParameter_in_rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_138257);
+            pushFollow(FOLLOW_2);
             ruleConfiguredParameter();
 
             state._fsp--;
@@ -54396,22 +54396,22 @@ public final void rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_1()
 
 
     // $ANTLR start "rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_2_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19035:1: rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_2_1 : ( ruleConfiguredParameter ) ;
+    // InternalCheckCfg.g:19035:1: rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_2_1 : ( ruleConfiguredParameter ) ;
     public final void rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19039:1: ( ( ruleConfiguredParameter ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19040:1: ( ruleConfiguredParameter )
+            // InternalCheckCfg.g:19039:1: ( ( ruleConfiguredParameter ) )
+            // InternalCheckCfg.g:19040:1: ( ruleConfiguredParameter )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19040:1: ( ruleConfiguredParameter )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19041:1: ruleConfiguredParameter
+            // InternalCheckCfg.g:19040:1: ( ruleConfiguredParameter )
+            // InternalCheckCfg.g:19041:1: ruleConfiguredParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredCheckAccess().getParameterConfigurationsConfiguredParameterParserRuleCall_3_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleConfiguredParameter_in_rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_2_138288);
+            pushFollow(FOLLOW_2);
             ruleConfiguredParameter();
 
             state._fsp--;
@@ -54441,28 +54441,28 @@ public final void rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_2_1
 
 
     // $ANTLR start "rule__ConfiguredParameter__ParameterAssignment_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19050:1: rule__ConfiguredParameter__ParameterAssignment_1 : ( ( ruleValidID ) ) ;
+    // InternalCheckCfg.g:19050:1: rule__ConfiguredParameter__ParameterAssignment_1 : ( ( ruleValidID ) ) ;
     public final void rule__ConfiguredParameter__ParameterAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19054:1: ( ( ( ruleValidID ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19055:1: ( ( ruleValidID ) )
+            // InternalCheckCfg.g:19054:1: ( ( ( ruleValidID ) ) )
+            // InternalCheckCfg.g:19055:1: ( ( ruleValidID ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19055:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19056:1: ( ruleValidID )
+            // InternalCheckCfg.g:19055:1: ( ( ruleValidID ) )
+            // InternalCheckCfg.g:19056:1: ( ruleValidID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredParameterAccess().getParameterFormalParameterCrossReference_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19057:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19058:1: ruleValidID
+            // InternalCheckCfg.g:19057:1: ( ruleValidID )
+            // InternalCheckCfg.g:19058:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredParameterAccess().getParameterFormalParameterValidIDParserRuleCall_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__ConfiguredParameter__ParameterAssignment_138323);
+            pushFollow(FOLLOW_2);
             ruleValidID();
 
             state._fsp--;
@@ -54498,22 +54498,22 @@ public final void rule__ConfiguredParameter__ParameterAssignment_1() throws Reco
 
 
     // $ANTLR start "rule__ConfiguredParameter__NewValueAssignment_3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19069:1: rule__ConfiguredParameter__NewValueAssignment_3 : ( ruleXFormalParameterDefaultValueLiteral ) ;
+    // InternalCheckCfg.g:19069:1: rule__ConfiguredParameter__NewValueAssignment_3 : ( ruleXFormalParameterDefaultValueLiteral ) ;
     public final void rule__ConfiguredParameter__NewValueAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19073:1: ( ( ruleXFormalParameterDefaultValueLiteral ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19074:1: ( ruleXFormalParameterDefaultValueLiteral )
+            // InternalCheckCfg.g:19073:1: ( ( ruleXFormalParameterDefaultValueLiteral ) )
+            // InternalCheckCfg.g:19074:1: ( ruleXFormalParameterDefaultValueLiteral )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19074:1: ( ruleXFormalParameterDefaultValueLiteral )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19075:1: ruleXFormalParameterDefaultValueLiteral
+            // InternalCheckCfg.g:19074:1: ( ruleXFormalParameterDefaultValueLiteral )
+            // InternalCheckCfg.g:19075:1: ruleXFormalParameterDefaultValueLiteral
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConfiguredParameterAccess().getNewValueXFormalParameterDefaultValueLiteralParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleXFormalParameterDefaultValueLiteral_in_rule__ConfiguredParameter__NewValueAssignment_338358);
+            pushFollow(FOLLOW_2);
             ruleXFormalParameterDefaultValueLiteral();
 
             state._fsp--;
@@ -54543,28 +54543,28 @@ public final void rule__ConfiguredParameter__NewValueAssignment_3() throws Recog
 
 
     // $ANTLR start "rule__XConstantUnaryOperation__FeatureAssignment_0_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19084:1: rule__XConstantUnaryOperation__FeatureAssignment_0_1 : ( ( ruleOpUnary ) ) ;
+    // InternalCheckCfg.g:19084:1: rule__XConstantUnaryOperation__FeatureAssignment_0_1 : ( ( ruleOpUnary ) ) ;
     public final void rule__XConstantUnaryOperation__FeatureAssignment_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19088:1: ( ( ( ruleOpUnary ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19089:1: ( ( ruleOpUnary ) )
+            // InternalCheckCfg.g:19088:1: ( ( ( ruleOpUnary ) ) )
+            // InternalCheckCfg.g:19089:1: ( ( ruleOpUnary ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19089:1: ( ( ruleOpUnary ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19090:1: ( ruleOpUnary )
+            // InternalCheckCfg.g:19089:1: ( ( ruleOpUnary ) )
+            // InternalCheckCfg.g:19090:1: ( ruleOpUnary )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantUnaryOperationAccess().getFeatureJvmIdentifiableElementCrossReference_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19091:1: ( ruleOpUnary )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19092:1: ruleOpUnary
+            // InternalCheckCfg.g:19091:1: ( ruleOpUnary )
+            // InternalCheckCfg.g:19092:1: ruleOpUnary
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantUnaryOperationAccess().getFeatureJvmIdentifiableElementOpUnaryParserRuleCall_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpUnary_in_rule__XConstantUnaryOperation__FeatureAssignment_0_138393);
+            pushFollow(FOLLOW_2);
             ruleOpUnary();
 
             state._fsp--;
@@ -54600,22 +54600,22 @@ public final void rule__XConstantUnaryOperation__FeatureAssignment_0_1() throws
 
 
     // $ANTLR start "rule__XConstantUnaryOperation__OperandAssignment_0_2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19103:1: rule__XConstantUnaryOperation__OperandAssignment_0_2 : ( ruleXConstantUnaryOperation ) ;
+    // InternalCheckCfg.g:19103:1: rule__XConstantUnaryOperation__OperandAssignment_0_2 : ( ruleXConstantUnaryOperation ) ;
     public final void rule__XConstantUnaryOperation__OperandAssignment_0_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19107:1: ( ( ruleXConstantUnaryOperation ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19108:1: ( ruleXConstantUnaryOperation )
+            // InternalCheckCfg.g:19107:1: ( ( ruleXConstantUnaryOperation ) )
+            // InternalCheckCfg.g:19108:1: ( ruleXConstantUnaryOperation )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19108:1: ( ruleXConstantUnaryOperation )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19109:1: ruleXConstantUnaryOperation
+            // InternalCheckCfg.g:19108:1: ( ruleXConstantUnaryOperation )
+            // InternalCheckCfg.g:19109:1: ruleXConstantUnaryOperation
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantUnaryOperationAccess().getOperandXConstantUnaryOperationParserRuleCall_0_2_0()); 
             }
-            pushFollow(FOLLOW_ruleXConstantUnaryOperation_in_rule__XConstantUnaryOperation__OperandAssignment_0_238428);
+            pushFollow(FOLLOW_2);
             ruleXConstantUnaryOperation();
 
             state._fsp--;
@@ -54645,22 +54645,22 @@ public final void rule__XConstantUnaryOperation__OperandAssignment_0_2() throws
 
 
     // $ANTLR start "rule__XConstantListLiteral__ElementsAssignment_3_0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19118:1: rule__XConstantListLiteral__ElementsAssignment_3_0 : ( ruleXConstantUnaryOperation ) ;
+    // InternalCheckCfg.g:19118:1: rule__XConstantListLiteral__ElementsAssignment_3_0 : ( ruleXConstantUnaryOperation ) ;
     public final void rule__XConstantListLiteral__ElementsAssignment_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19122:1: ( ( ruleXConstantUnaryOperation ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19123:1: ( ruleXConstantUnaryOperation )
+            // InternalCheckCfg.g:19122:1: ( ( ruleXConstantUnaryOperation ) )
+            // InternalCheckCfg.g:19123:1: ( ruleXConstantUnaryOperation )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19123:1: ( ruleXConstantUnaryOperation )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19124:1: ruleXConstantUnaryOperation
+            // InternalCheckCfg.g:19123:1: ( ruleXConstantUnaryOperation )
+            // InternalCheckCfg.g:19124:1: ruleXConstantUnaryOperation
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantListLiteralAccess().getElementsXConstantUnaryOperationParserRuleCall_3_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXConstantUnaryOperation_in_rule__XConstantListLiteral__ElementsAssignment_3_038459);
+            pushFollow(FOLLOW_2);
             ruleXConstantUnaryOperation();
 
             state._fsp--;
@@ -54690,22 +54690,22 @@ public final void rule__XConstantListLiteral__ElementsAssignment_3_0() throws Re
 
 
     // $ANTLR start "rule__XConstantListLiteral__ElementsAssignment_3_1_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19133:1: rule__XConstantListLiteral__ElementsAssignment_3_1_1 : ( ruleXConstantUnaryOperation ) ;
+    // InternalCheckCfg.g:19133:1: rule__XConstantListLiteral__ElementsAssignment_3_1_1 : ( ruleXConstantUnaryOperation ) ;
     public final void rule__XConstantListLiteral__ElementsAssignment_3_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19137:1: ( ( ruleXConstantUnaryOperation ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19138:1: ( ruleXConstantUnaryOperation )
+            // InternalCheckCfg.g:19137:1: ( ( ruleXConstantUnaryOperation ) )
+            // InternalCheckCfg.g:19138:1: ( ruleXConstantUnaryOperation )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19138:1: ( ruleXConstantUnaryOperation )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19139:1: ruleXConstantUnaryOperation
+            // InternalCheckCfg.g:19138:1: ( ruleXConstantUnaryOperation )
+            // InternalCheckCfg.g:19139:1: ruleXConstantUnaryOperation
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstantListLiteralAccess().getElementsXConstantUnaryOperationParserRuleCall_3_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXConstantUnaryOperation_in_rule__XConstantListLiteral__ElementsAssignment_3_1_138490);
+            pushFollow(FOLLOW_2);
             ruleXConstantUnaryOperation();
 
             state._fsp--;
@@ -54735,28 +54735,28 @@ public final void rule__XConstantListLiteral__ElementsAssignment_3_1_1() throws
 
 
     // $ANTLR start "rule__XAssignment__FeatureAssignment_0_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19148:1: rule__XAssignment__FeatureAssignment_0_1 : ( ( ruleFeatureCallID ) ) ;
+    // InternalCheckCfg.g:19148:1: rule__XAssignment__FeatureAssignment_0_1 : ( ( ruleFeatureCallID ) ) ;
     public final void rule__XAssignment__FeatureAssignment_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19152:1: ( ( ( ruleFeatureCallID ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19153:1: ( ( ruleFeatureCallID ) )
+            // InternalCheckCfg.g:19152:1: ( ( ( ruleFeatureCallID ) ) )
+            // InternalCheckCfg.g:19153:1: ( ( ruleFeatureCallID ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19153:1: ( ( ruleFeatureCallID ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19154:1: ( ruleFeatureCallID )
+            // InternalCheckCfg.g:19153:1: ( ( ruleFeatureCallID ) )
+            // InternalCheckCfg.g:19154:1: ( ruleFeatureCallID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getFeatureJvmIdentifiableElementCrossReference_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19155:1: ( ruleFeatureCallID )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19156:1: ruleFeatureCallID
+            // InternalCheckCfg.g:19155:1: ( ruleFeatureCallID )
+            // InternalCheckCfg.g:19156:1: ruleFeatureCallID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getFeatureJvmIdentifiableElementFeatureCallIDParserRuleCall_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleFeatureCallID_in_rule__XAssignment__FeatureAssignment_0_138525);
+            pushFollow(FOLLOW_2);
             ruleFeatureCallID();
 
             state._fsp--;
@@ -54792,22 +54792,22 @@ public final void rule__XAssignment__FeatureAssignment_0_1() throws RecognitionE
 
 
     // $ANTLR start "rule__XAssignment__ValueAssignment_0_3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19167:1: rule__XAssignment__ValueAssignment_0_3 : ( ruleXAssignment ) ;
+    // InternalCheckCfg.g:19167:1: rule__XAssignment__ValueAssignment_0_3 : ( ruleXAssignment ) ;
     public final void rule__XAssignment__ValueAssignment_0_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19171:1: ( ( ruleXAssignment ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19172:1: ( ruleXAssignment )
+            // InternalCheckCfg.g:19171:1: ( ( ruleXAssignment ) )
+            // InternalCheckCfg.g:19172:1: ( ruleXAssignment )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19172:1: ( ruleXAssignment )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19173:1: ruleXAssignment
+            // InternalCheckCfg.g:19172:1: ( ruleXAssignment )
+            // InternalCheckCfg.g:19173:1: ruleXAssignment
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getValueXAssignmentParserRuleCall_0_3_0()); 
             }
-            pushFollow(FOLLOW_ruleXAssignment_in_rule__XAssignment__ValueAssignment_0_338560);
+            pushFollow(FOLLOW_2);
             ruleXAssignment();
 
             state._fsp--;
@@ -54837,28 +54837,28 @@ public final void rule__XAssignment__ValueAssignment_0_3() throws RecognitionExc
 
 
     // $ANTLR start "rule__XAssignment__FeatureAssignment_1_1_0_0_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19182:1: rule__XAssignment__FeatureAssignment_1_1_0_0_1 : ( ( ruleOpMultiAssign ) ) ;
+    // InternalCheckCfg.g:19182:1: rule__XAssignment__FeatureAssignment_1_1_0_0_1 : ( ( ruleOpMultiAssign ) ) ;
     public final void rule__XAssignment__FeatureAssignment_1_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19186:1: ( ( ( ruleOpMultiAssign ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19187:1: ( ( ruleOpMultiAssign ) )
+            // InternalCheckCfg.g:19186:1: ( ( ( ruleOpMultiAssign ) ) )
+            // InternalCheckCfg.g:19187:1: ( ( ruleOpMultiAssign ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19187:1: ( ( ruleOpMultiAssign ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19188:1: ( ruleOpMultiAssign )
+            // InternalCheckCfg.g:19187:1: ( ( ruleOpMultiAssign ) )
+            // InternalCheckCfg.g:19188:1: ( ruleOpMultiAssign )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getFeatureJvmIdentifiableElementCrossReference_1_1_0_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19189:1: ( ruleOpMultiAssign )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19190:1: ruleOpMultiAssign
+            // InternalCheckCfg.g:19189:1: ( ruleOpMultiAssign )
+            // InternalCheckCfg.g:19190:1: ruleOpMultiAssign
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getFeatureJvmIdentifiableElementOpMultiAssignParserRuleCall_1_1_0_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpMultiAssign_in_rule__XAssignment__FeatureAssignment_1_1_0_0_138595);
+            pushFollow(FOLLOW_2);
             ruleOpMultiAssign();
 
             state._fsp--;
@@ -54894,22 +54894,22 @@ public final void rule__XAssignment__FeatureAssignment_1_1_0_0_1() throws Recogn
 
 
     // $ANTLR start "rule__XAssignment__RightOperandAssignment_1_1_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19201:1: rule__XAssignment__RightOperandAssignment_1_1_1 : ( ruleXAssignment ) ;
+    // InternalCheckCfg.g:19201:1: rule__XAssignment__RightOperandAssignment_1_1_1 : ( ruleXAssignment ) ;
     public final void rule__XAssignment__RightOperandAssignment_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19205:1: ( ( ruleXAssignment ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19206:1: ( ruleXAssignment )
+            // InternalCheckCfg.g:19205:1: ( ( ruleXAssignment ) )
+            // InternalCheckCfg.g:19206:1: ( ruleXAssignment )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19206:1: ( ruleXAssignment )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19207:1: ruleXAssignment
+            // InternalCheckCfg.g:19206:1: ( ruleXAssignment )
+            // InternalCheckCfg.g:19207:1: ruleXAssignment
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getRightOperandXAssignmentParserRuleCall_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXAssignment_in_rule__XAssignment__RightOperandAssignment_1_1_138630);
+            pushFollow(FOLLOW_2);
             ruleXAssignment();
 
             state._fsp--;
@@ -54939,28 +54939,28 @@ public final void rule__XAssignment__RightOperandAssignment_1_1_1() throws Recog
 
 
     // $ANTLR start "rule__XOrExpression__FeatureAssignment_1_0_0_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19216:1: rule__XOrExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpOr ) ) ;
+    // InternalCheckCfg.g:19216:1: rule__XOrExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpOr ) ) ;
     public final void rule__XOrExpression__FeatureAssignment_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19220:1: ( ( ( ruleOpOr ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19221:1: ( ( ruleOpOr ) )
+            // InternalCheckCfg.g:19220:1: ( ( ( ruleOpOr ) ) )
+            // InternalCheckCfg.g:19221:1: ( ( ruleOpOr ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19221:1: ( ( ruleOpOr ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19222:1: ( ruleOpOr )
+            // InternalCheckCfg.g:19221:1: ( ( ruleOpOr ) )
+            // InternalCheckCfg.g:19222:1: ( ruleOpOr )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19223:1: ( ruleOpOr )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19224:1: ruleOpOr
+            // InternalCheckCfg.g:19223:1: ( ruleOpOr )
+            // InternalCheckCfg.g:19224:1: ruleOpOr
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getFeatureJvmIdentifiableElementOpOrParserRuleCall_1_0_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpOr_in_rule__XOrExpression__FeatureAssignment_1_0_0_138665);
+            pushFollow(FOLLOW_2);
             ruleOpOr();
 
             state._fsp--;
@@ -54996,22 +54996,22 @@ public final void rule__XOrExpression__FeatureAssignment_1_0_0_1() throws Recogn
 
 
     // $ANTLR start "rule__XOrExpression__RightOperandAssignment_1_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19235:1: rule__XOrExpression__RightOperandAssignment_1_1 : ( ruleXAndExpression ) ;
+    // InternalCheckCfg.g:19235:1: rule__XOrExpression__RightOperandAssignment_1_1 : ( ruleXAndExpression ) ;
     public final void rule__XOrExpression__RightOperandAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19239:1: ( ( ruleXAndExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19240:1: ( ruleXAndExpression )
+            // InternalCheckCfg.g:19239:1: ( ( ruleXAndExpression ) )
+            // InternalCheckCfg.g:19240:1: ( ruleXAndExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19240:1: ( ruleXAndExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19241:1: ruleXAndExpression
+            // InternalCheckCfg.g:19240:1: ( ruleXAndExpression )
+            // InternalCheckCfg.g:19241:1: ruleXAndExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getRightOperandXAndExpressionParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXAndExpression_in_rule__XOrExpression__RightOperandAssignment_1_138700);
+            pushFollow(FOLLOW_2);
             ruleXAndExpression();
 
             state._fsp--;
@@ -55041,28 +55041,28 @@ public final void rule__XOrExpression__RightOperandAssignment_1_1() throws Recog
 
 
     // $ANTLR start "rule__XAndExpression__FeatureAssignment_1_0_0_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19250:1: rule__XAndExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpAnd ) ) ;
+    // InternalCheckCfg.g:19250:1: rule__XAndExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpAnd ) ) ;
     public final void rule__XAndExpression__FeatureAssignment_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19254:1: ( ( ( ruleOpAnd ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19255:1: ( ( ruleOpAnd ) )
+            // InternalCheckCfg.g:19254:1: ( ( ( ruleOpAnd ) ) )
+            // InternalCheckCfg.g:19255:1: ( ( ruleOpAnd ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19255:1: ( ( ruleOpAnd ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19256:1: ( ruleOpAnd )
+            // InternalCheckCfg.g:19255:1: ( ( ruleOpAnd ) )
+            // InternalCheckCfg.g:19256:1: ( ruleOpAnd )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19257:1: ( ruleOpAnd )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19258:1: ruleOpAnd
+            // InternalCheckCfg.g:19257:1: ( ruleOpAnd )
+            // InternalCheckCfg.g:19258:1: ruleOpAnd
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getFeatureJvmIdentifiableElementOpAndParserRuleCall_1_0_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpAnd_in_rule__XAndExpression__FeatureAssignment_1_0_0_138735);
+            pushFollow(FOLLOW_2);
             ruleOpAnd();
 
             state._fsp--;
@@ -55098,22 +55098,22 @@ public final void rule__XAndExpression__FeatureAssignment_1_0_0_1() throws Recog
 
 
     // $ANTLR start "rule__XAndExpression__RightOperandAssignment_1_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19269:1: rule__XAndExpression__RightOperandAssignment_1_1 : ( ruleXEqualityExpression ) ;
+    // InternalCheckCfg.g:19269:1: rule__XAndExpression__RightOperandAssignment_1_1 : ( ruleXEqualityExpression ) ;
     public final void rule__XAndExpression__RightOperandAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19273:1: ( ( ruleXEqualityExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19274:1: ( ruleXEqualityExpression )
+            // InternalCheckCfg.g:19273:1: ( ( ruleXEqualityExpression ) )
+            // InternalCheckCfg.g:19274:1: ( ruleXEqualityExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19274:1: ( ruleXEqualityExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19275:1: ruleXEqualityExpression
+            // InternalCheckCfg.g:19274:1: ( ruleXEqualityExpression )
+            // InternalCheckCfg.g:19275:1: ruleXEqualityExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getRightOperandXEqualityExpressionParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXEqualityExpression_in_rule__XAndExpression__RightOperandAssignment_1_138770);
+            pushFollow(FOLLOW_2);
             ruleXEqualityExpression();
 
             state._fsp--;
@@ -55143,28 +55143,28 @@ public final void rule__XAndExpression__RightOperandAssignment_1_1() throws Reco
 
 
     // $ANTLR start "rule__XEqualityExpression__FeatureAssignment_1_0_0_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19284:1: rule__XEqualityExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpEquality ) ) ;
+    // InternalCheckCfg.g:19284:1: rule__XEqualityExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpEquality ) ) ;
     public final void rule__XEqualityExpression__FeatureAssignment_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19288:1: ( ( ( ruleOpEquality ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19289:1: ( ( ruleOpEquality ) )
+            // InternalCheckCfg.g:19288:1: ( ( ( ruleOpEquality ) ) )
+            // InternalCheckCfg.g:19289:1: ( ( ruleOpEquality ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19289:1: ( ( ruleOpEquality ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19290:1: ( ruleOpEquality )
+            // InternalCheckCfg.g:19289:1: ( ( ruleOpEquality ) )
+            // InternalCheckCfg.g:19290:1: ( ruleOpEquality )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19291:1: ( ruleOpEquality )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19292:1: ruleOpEquality
+            // InternalCheckCfg.g:19291:1: ( ruleOpEquality )
+            // InternalCheckCfg.g:19292:1: ruleOpEquality
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getFeatureJvmIdentifiableElementOpEqualityParserRuleCall_1_0_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpEquality_in_rule__XEqualityExpression__FeatureAssignment_1_0_0_138805);
+            pushFollow(FOLLOW_2);
             ruleOpEquality();
 
             state._fsp--;
@@ -55200,22 +55200,22 @@ public final void rule__XEqualityExpression__FeatureAssignment_1_0_0_1() throws
 
 
     // $ANTLR start "rule__XEqualityExpression__RightOperandAssignment_1_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19303:1: rule__XEqualityExpression__RightOperandAssignment_1_1 : ( ruleXRelationalExpression ) ;
+    // InternalCheckCfg.g:19303:1: rule__XEqualityExpression__RightOperandAssignment_1_1 : ( ruleXRelationalExpression ) ;
     public final void rule__XEqualityExpression__RightOperandAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19307:1: ( ( ruleXRelationalExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19308:1: ( ruleXRelationalExpression )
+            // InternalCheckCfg.g:19307:1: ( ( ruleXRelationalExpression ) )
+            // InternalCheckCfg.g:19308:1: ( ruleXRelationalExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19308:1: ( ruleXRelationalExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19309:1: ruleXRelationalExpression
+            // InternalCheckCfg.g:19308:1: ( ruleXRelationalExpression )
+            // InternalCheckCfg.g:19309:1: ruleXRelationalExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getRightOperandXRelationalExpressionParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXRelationalExpression_in_rule__XEqualityExpression__RightOperandAssignment_1_138840);
+            pushFollow(FOLLOW_2);
             ruleXRelationalExpression();
 
             state._fsp--;
@@ -55245,22 +55245,22 @@ public final void rule__XEqualityExpression__RightOperandAssignment_1_1() throws
 
 
     // $ANTLR start "rule__XRelationalExpression__TypeAssignment_1_0_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19318:1: rule__XRelationalExpression__TypeAssignment_1_0_1 : ( ruleJvmTypeReference ) ;
+    // InternalCheckCfg.g:19318:1: rule__XRelationalExpression__TypeAssignment_1_0_1 : ( ruleJvmTypeReference ) ;
     public final void rule__XRelationalExpression__TypeAssignment_1_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19322:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19323:1: ( ruleJvmTypeReference )
+            // InternalCheckCfg.g:19322:1: ( ( ruleJvmTypeReference ) )
+            // InternalCheckCfg.g:19323:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19323:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19324:1: ruleJvmTypeReference
+            // InternalCheckCfg.g:19323:1: ( ruleJvmTypeReference )
+            // InternalCheckCfg.g:19324:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getTypeJvmTypeReferenceParserRuleCall_1_0_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__XRelationalExpression__TypeAssignment_1_0_138871);
+            pushFollow(FOLLOW_2);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -55290,28 +55290,28 @@ public final void rule__XRelationalExpression__TypeAssignment_1_0_1() throws Rec
 
 
     // $ANTLR start "rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19333:1: rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 : ( ( ruleOpCompare ) ) ;
+    // InternalCheckCfg.g:19333:1: rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 : ( ( ruleOpCompare ) ) ;
     public final void rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19337:1: ( ( ( ruleOpCompare ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19338:1: ( ( ruleOpCompare ) )
+            // InternalCheckCfg.g:19337:1: ( ( ( ruleOpCompare ) ) )
+            // InternalCheckCfg.g:19338:1: ( ( ruleOpCompare ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19338:1: ( ( ruleOpCompare ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19339:1: ( ruleOpCompare )
+            // InternalCheckCfg.g:19338:1: ( ( ruleOpCompare ) )
+            // InternalCheckCfg.g:19339:1: ( ruleOpCompare )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_1_0_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19340:1: ( ruleOpCompare )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19341:1: ruleOpCompare
+            // InternalCheckCfg.g:19340:1: ( ruleOpCompare )
+            // InternalCheckCfg.g:19341:1: ruleOpCompare
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getFeatureJvmIdentifiableElementOpCompareParserRuleCall_1_1_0_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpCompare_in_rule__XRelationalExpression__FeatureAssignment_1_1_0_0_138906);
+            pushFollow(FOLLOW_2);
             ruleOpCompare();
 
             state._fsp--;
@@ -55347,22 +55347,22 @@ public final void rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1() thr
 
 
     // $ANTLR start "rule__XRelationalExpression__RightOperandAssignment_1_1_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19352:1: rule__XRelationalExpression__RightOperandAssignment_1_1_1 : ( ruleXOtherOperatorExpression ) ;
+    // InternalCheckCfg.g:19352:1: rule__XRelationalExpression__RightOperandAssignment_1_1_1 : ( ruleXOtherOperatorExpression ) ;
     public final void rule__XRelationalExpression__RightOperandAssignment_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19356:1: ( ( ruleXOtherOperatorExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19357:1: ( ruleXOtherOperatorExpression )
+            // InternalCheckCfg.g:19356:1: ( ( ruleXOtherOperatorExpression ) )
+            // InternalCheckCfg.g:19357:1: ( ruleXOtherOperatorExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19357:1: ( ruleXOtherOperatorExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19358:1: ruleXOtherOperatorExpression
+            // InternalCheckCfg.g:19357:1: ( ruleXOtherOperatorExpression )
+            // InternalCheckCfg.g:19358:1: ruleXOtherOperatorExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getRightOperandXOtherOperatorExpressionParserRuleCall_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXOtherOperatorExpression_in_rule__XRelationalExpression__RightOperandAssignment_1_1_138941);
+            pushFollow(FOLLOW_2);
             ruleXOtherOperatorExpression();
 
             state._fsp--;
@@ -55392,28 +55392,28 @@ public final void rule__XRelationalExpression__RightOperandAssignment_1_1_1() th
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19367:1: rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpOther ) ) ;
+    // InternalCheckCfg.g:19367:1: rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpOther ) ) ;
     public final void rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19371:1: ( ( ( ruleOpOther ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19372:1: ( ( ruleOpOther ) )
+            // InternalCheckCfg.g:19371:1: ( ( ( ruleOpOther ) ) )
+            // InternalCheckCfg.g:19372:1: ( ( ruleOpOther ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19372:1: ( ( ruleOpOther ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19373:1: ( ruleOpOther )
+            // InternalCheckCfg.g:19372:1: ( ( ruleOpOther ) )
+            // InternalCheckCfg.g:19373:1: ( ruleOpOther )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19374:1: ( ruleOpOther )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19375:1: ruleOpOther
+            // InternalCheckCfg.g:19374:1: ( ruleOpOther )
+            // InternalCheckCfg.g:19375:1: ruleOpOther
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getFeatureJvmIdentifiableElementOpOtherParserRuleCall_1_0_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpOther_in_rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_138976);
+            pushFollow(FOLLOW_2);
             ruleOpOther();
 
             state._fsp--;
@@ -55449,22 +55449,22 @@ public final void rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1() th
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__RightOperandAssignment_1_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19386:1: rule__XOtherOperatorExpression__RightOperandAssignment_1_1 : ( ruleXAdditiveExpression ) ;
+    // InternalCheckCfg.g:19386:1: rule__XOtherOperatorExpression__RightOperandAssignment_1_1 : ( ruleXAdditiveExpression ) ;
     public final void rule__XOtherOperatorExpression__RightOperandAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19390:1: ( ( ruleXAdditiveExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19391:1: ( ruleXAdditiveExpression )
+            // InternalCheckCfg.g:19390:1: ( ( ruleXAdditiveExpression ) )
+            // InternalCheckCfg.g:19391:1: ( ruleXAdditiveExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19391:1: ( ruleXAdditiveExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19392:1: ruleXAdditiveExpression
+            // InternalCheckCfg.g:19391:1: ( ruleXAdditiveExpression )
+            // InternalCheckCfg.g:19392:1: ruleXAdditiveExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getRightOperandXAdditiveExpressionParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXAdditiveExpression_in_rule__XOtherOperatorExpression__RightOperandAssignment_1_139011);
+            pushFollow(FOLLOW_2);
             ruleXAdditiveExpression();
 
             state._fsp--;
@@ -55494,28 +55494,28 @@ public final void rule__XOtherOperatorExpression__RightOperandAssignment_1_1() t
 
 
     // $ANTLR start "rule__XAdditiveExpression__FeatureAssignment_1_0_0_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19401:1: rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpAdd ) ) ;
+    // InternalCheckCfg.g:19401:1: rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpAdd ) ) ;
     public final void rule__XAdditiveExpression__FeatureAssignment_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19405:1: ( ( ( ruleOpAdd ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19406:1: ( ( ruleOpAdd ) )
+            // InternalCheckCfg.g:19405:1: ( ( ( ruleOpAdd ) ) )
+            // InternalCheckCfg.g:19406:1: ( ( ruleOpAdd ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19406:1: ( ( ruleOpAdd ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19407:1: ( ruleOpAdd )
+            // InternalCheckCfg.g:19406:1: ( ( ruleOpAdd ) )
+            // InternalCheckCfg.g:19407:1: ( ruleOpAdd )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19408:1: ( ruleOpAdd )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19409:1: ruleOpAdd
+            // InternalCheckCfg.g:19408:1: ( ruleOpAdd )
+            // InternalCheckCfg.g:19409:1: ruleOpAdd
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getFeatureJvmIdentifiableElementOpAddParserRuleCall_1_0_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpAdd_in_rule__XAdditiveExpression__FeatureAssignment_1_0_0_139046);
+            pushFollow(FOLLOW_2);
             ruleOpAdd();
 
             state._fsp--;
@@ -55551,22 +55551,22 @@ public final void rule__XAdditiveExpression__FeatureAssignment_1_0_0_1() throws
 
 
     // $ANTLR start "rule__XAdditiveExpression__RightOperandAssignment_1_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19420:1: rule__XAdditiveExpression__RightOperandAssignment_1_1 : ( ruleXMultiplicativeExpression ) ;
+    // InternalCheckCfg.g:19420:1: rule__XAdditiveExpression__RightOperandAssignment_1_1 : ( ruleXMultiplicativeExpression ) ;
     public final void rule__XAdditiveExpression__RightOperandAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19424:1: ( ( ruleXMultiplicativeExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19425:1: ( ruleXMultiplicativeExpression )
+            // InternalCheckCfg.g:19424:1: ( ( ruleXMultiplicativeExpression ) )
+            // InternalCheckCfg.g:19425:1: ( ruleXMultiplicativeExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19425:1: ( ruleXMultiplicativeExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19426:1: ruleXMultiplicativeExpression
+            // InternalCheckCfg.g:19425:1: ( ruleXMultiplicativeExpression )
+            // InternalCheckCfg.g:19426:1: ruleXMultiplicativeExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getRightOperandXMultiplicativeExpressionParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXMultiplicativeExpression_in_rule__XAdditiveExpression__RightOperandAssignment_1_139081);
+            pushFollow(FOLLOW_2);
             ruleXMultiplicativeExpression();
 
             state._fsp--;
@@ -55596,28 +55596,28 @@ public final void rule__XAdditiveExpression__RightOperandAssignment_1_1() throws
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19435:1: rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpMulti ) ) ;
+    // InternalCheckCfg.g:19435:1: rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpMulti ) ) ;
     public final void rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19439:1: ( ( ( ruleOpMulti ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19440:1: ( ( ruleOpMulti ) )
+            // InternalCheckCfg.g:19439:1: ( ( ( ruleOpMulti ) ) )
+            // InternalCheckCfg.g:19440:1: ( ( ruleOpMulti ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19440:1: ( ( ruleOpMulti ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19441:1: ( ruleOpMulti )
+            // InternalCheckCfg.g:19440:1: ( ( ruleOpMulti ) )
+            // InternalCheckCfg.g:19441:1: ( ruleOpMulti )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19442:1: ( ruleOpMulti )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19443:1: ruleOpMulti
+            // InternalCheckCfg.g:19442:1: ( ruleOpMulti )
+            // InternalCheckCfg.g:19443:1: ruleOpMulti
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getFeatureJvmIdentifiableElementOpMultiParserRuleCall_1_0_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpMulti_in_rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_139116);
+            pushFollow(FOLLOW_2);
             ruleOpMulti();
 
             state._fsp--;
@@ -55653,22 +55653,22 @@ public final void rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1() t
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__RightOperandAssignment_1_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19454:1: rule__XMultiplicativeExpression__RightOperandAssignment_1_1 : ( ruleXUnaryOperation ) ;
+    // InternalCheckCfg.g:19454:1: rule__XMultiplicativeExpression__RightOperandAssignment_1_1 : ( ruleXUnaryOperation ) ;
     public final void rule__XMultiplicativeExpression__RightOperandAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19458:1: ( ( ruleXUnaryOperation ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19459:1: ( ruleXUnaryOperation )
+            // InternalCheckCfg.g:19458:1: ( ( ruleXUnaryOperation ) )
+            // InternalCheckCfg.g:19459:1: ( ruleXUnaryOperation )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19459:1: ( ruleXUnaryOperation )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19460:1: ruleXUnaryOperation
+            // InternalCheckCfg.g:19459:1: ( ruleXUnaryOperation )
+            // InternalCheckCfg.g:19460:1: ruleXUnaryOperation
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getRightOperandXUnaryOperationParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXUnaryOperation_in_rule__XMultiplicativeExpression__RightOperandAssignment_1_139151);
+            pushFollow(FOLLOW_2);
             ruleXUnaryOperation();
 
             state._fsp--;
@@ -55698,28 +55698,28 @@ public final void rule__XMultiplicativeExpression__RightOperandAssignment_1_1()
 
 
     // $ANTLR start "rule__XUnaryOperation__FeatureAssignment_0_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19469:1: rule__XUnaryOperation__FeatureAssignment_0_1 : ( ( ruleOpUnary ) ) ;
+    // InternalCheckCfg.g:19469:1: rule__XUnaryOperation__FeatureAssignment_0_1 : ( ( ruleOpUnary ) ) ;
     public final void rule__XUnaryOperation__FeatureAssignment_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19473:1: ( ( ( ruleOpUnary ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19474:1: ( ( ruleOpUnary ) )
+            // InternalCheckCfg.g:19473:1: ( ( ( ruleOpUnary ) ) )
+            // InternalCheckCfg.g:19474:1: ( ( ruleOpUnary ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19474:1: ( ( ruleOpUnary ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19475:1: ( ruleOpUnary )
+            // InternalCheckCfg.g:19474:1: ( ( ruleOpUnary ) )
+            // InternalCheckCfg.g:19475:1: ( ruleOpUnary )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationAccess().getFeatureJvmIdentifiableElementCrossReference_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19476:1: ( ruleOpUnary )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19477:1: ruleOpUnary
+            // InternalCheckCfg.g:19476:1: ( ruleOpUnary )
+            // InternalCheckCfg.g:19477:1: ruleOpUnary
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationAccess().getFeatureJvmIdentifiableElementOpUnaryParserRuleCall_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpUnary_in_rule__XUnaryOperation__FeatureAssignment_0_139186);
+            pushFollow(FOLLOW_2);
             ruleOpUnary();
 
             state._fsp--;
@@ -55755,22 +55755,22 @@ public final void rule__XUnaryOperation__FeatureAssignment_0_1() throws Recognit
 
 
     // $ANTLR start "rule__XUnaryOperation__OperandAssignment_0_2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19488:1: rule__XUnaryOperation__OperandAssignment_0_2 : ( ruleXUnaryOperation ) ;
+    // InternalCheckCfg.g:19488:1: rule__XUnaryOperation__OperandAssignment_0_2 : ( ruleXUnaryOperation ) ;
     public final void rule__XUnaryOperation__OperandAssignment_0_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19492:1: ( ( ruleXUnaryOperation ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19493:1: ( ruleXUnaryOperation )
+            // InternalCheckCfg.g:19492:1: ( ( ruleXUnaryOperation ) )
+            // InternalCheckCfg.g:19493:1: ( ruleXUnaryOperation )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19493:1: ( ruleXUnaryOperation )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19494:1: ruleXUnaryOperation
+            // InternalCheckCfg.g:19493:1: ( ruleXUnaryOperation )
+            // InternalCheckCfg.g:19494:1: ruleXUnaryOperation
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationAccess().getOperandXUnaryOperationParserRuleCall_0_2_0()); 
             }
-            pushFollow(FOLLOW_ruleXUnaryOperation_in_rule__XUnaryOperation__OperandAssignment_0_239221);
+            pushFollow(FOLLOW_2);
             ruleXUnaryOperation();
 
             state._fsp--;
@@ -55800,22 +55800,22 @@ public final void rule__XUnaryOperation__OperandAssignment_0_2() throws Recognit
 
 
     // $ANTLR start "rule__XCastedExpression__TypeAssignment_1_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19503:1: rule__XCastedExpression__TypeAssignment_1_1 : ( ruleJvmTypeReference ) ;
+    // InternalCheckCfg.g:19503:1: rule__XCastedExpression__TypeAssignment_1_1 : ( ruleJvmTypeReference ) ;
     public final void rule__XCastedExpression__TypeAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19507:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19508:1: ( ruleJvmTypeReference )
+            // InternalCheckCfg.g:19507:1: ( ( ruleJvmTypeReference ) )
+            // InternalCheckCfg.g:19508:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19508:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19509:1: ruleJvmTypeReference
+            // InternalCheckCfg.g:19508:1: ( ruleJvmTypeReference )
+            // InternalCheckCfg.g:19509:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getTypeJvmTypeReferenceParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__XCastedExpression__TypeAssignment_1_139252);
+            pushFollow(FOLLOW_2);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -55845,28 +55845,28 @@ public final void rule__XCastedExpression__TypeAssignment_1_1() throws Recogniti
 
 
     // $ANTLR start "rule__XPostfixOperation__FeatureAssignment_1_0_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19518:1: rule__XPostfixOperation__FeatureAssignment_1_0_1 : ( ( ruleOpPostfix ) ) ;
+    // InternalCheckCfg.g:19518:1: rule__XPostfixOperation__FeatureAssignment_1_0_1 : ( ( ruleOpPostfix ) ) ;
     public final void rule__XPostfixOperation__FeatureAssignment_1_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19522:1: ( ( ( ruleOpPostfix ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19523:1: ( ( ruleOpPostfix ) )
+            // InternalCheckCfg.g:19522:1: ( ( ( ruleOpPostfix ) ) )
+            // InternalCheckCfg.g:19523:1: ( ( ruleOpPostfix ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19523:1: ( ( ruleOpPostfix ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19524:1: ( ruleOpPostfix )
+            // InternalCheckCfg.g:19523:1: ( ( ruleOpPostfix ) )
+            // InternalCheckCfg.g:19524:1: ( ruleOpPostfix )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19525:1: ( ruleOpPostfix )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19526:1: ruleOpPostfix
+            // InternalCheckCfg.g:19525:1: ( ruleOpPostfix )
+            // InternalCheckCfg.g:19526:1: ruleOpPostfix
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getFeatureJvmIdentifiableElementOpPostfixParserRuleCall_1_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpPostfix_in_rule__XPostfixOperation__FeatureAssignment_1_0_139287);
+            pushFollow(FOLLOW_2);
             ruleOpPostfix();
 
             state._fsp--;
@@ -55902,28 +55902,28 @@ public final void rule__XPostfixOperation__FeatureAssignment_1_0_1() throws Reco
 
 
     // $ANTLR start "rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19537:1: rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 : ( ( '::' ) ) ;
+    // InternalCheckCfg.g:19537:1: rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 : ( ( '::' ) ) ;
     public final void rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19541:1: ( ( ( '::' ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19542:1: ( ( '::' ) )
+            // InternalCheckCfg.g:19541:1: ( ( ( '::' ) ) )
+            // InternalCheckCfg.g:19542:1: ( ( '::' ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19542:1: ( ( '::' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19543:1: ( '::' )
+            // InternalCheckCfg.g:19542:1: ( ( '::' ) )
+            // InternalCheckCfg.g:19543:1: ( '::' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_0_0_0_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19544:1: ( '::' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19545:1: '::'
+            // InternalCheckCfg.g:19544:1: ( '::' )
+            // InternalCheckCfg.g:19545:1: '::'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_0_0_0_1_1_0()); 
             }
-            match(input,89,FOLLOW_89_in_rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_139327); if (state.failed) return ;
+            match(input,89,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_0_0_0_1_1_0()); 
             }
@@ -55955,28 +55955,28 @@ public final void rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1
 
 
     // $ANTLR start "rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19560:1: rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 : ( ( ruleFeatureCallID ) ) ;
+    // InternalCheckCfg.g:19560:1: rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 : ( ( ruleFeatureCallID ) ) ;
     public final void rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19564:1: ( ( ( ruleFeatureCallID ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19565:1: ( ( ruleFeatureCallID ) )
+            // InternalCheckCfg.g:19564:1: ( ( ( ruleFeatureCallID ) ) )
+            // InternalCheckCfg.g:19565:1: ( ( ruleFeatureCallID ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19565:1: ( ( ruleFeatureCallID ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19566:1: ( ruleFeatureCallID )
+            // InternalCheckCfg.g:19565:1: ( ( ruleFeatureCallID ) )
+            // InternalCheckCfg.g:19566:1: ( ruleFeatureCallID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_0_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19567:1: ( ruleFeatureCallID )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19568:1: ruleFeatureCallID
+            // InternalCheckCfg.g:19567:1: ( ruleFeatureCallID )
+            // InternalCheckCfg.g:19568:1: ruleFeatureCallID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getFeatureJvmIdentifiableElementFeatureCallIDParserRuleCall_1_0_0_0_2_0_1()); 
             }
-            pushFollow(FOLLOW_ruleFeatureCallID_in_rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_239370);
+            pushFollow(FOLLOW_2);
             ruleFeatureCallID();
 
             state._fsp--;
@@ -56012,22 +56012,22 @@ public final void rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2() throws
 
 
     // $ANTLR start "rule__XMemberFeatureCall__ValueAssignment_1_0_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19579:1: rule__XMemberFeatureCall__ValueAssignment_1_0_1 : ( ruleXAssignment ) ;
+    // InternalCheckCfg.g:19579:1: rule__XMemberFeatureCall__ValueAssignment_1_0_1 : ( ruleXAssignment ) ;
     public final void rule__XMemberFeatureCall__ValueAssignment_1_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19583:1: ( ( ruleXAssignment ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19584:1: ( ruleXAssignment )
+            // InternalCheckCfg.g:19583:1: ( ( ruleXAssignment ) )
+            // InternalCheckCfg.g:19584:1: ( ruleXAssignment )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19584:1: ( ruleXAssignment )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19585:1: ruleXAssignment
+            // InternalCheckCfg.g:19584:1: ( ruleXAssignment )
+            // InternalCheckCfg.g:19585:1: ruleXAssignment
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getValueXAssignmentParserRuleCall_1_0_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXAssignment_in_rule__XMemberFeatureCall__ValueAssignment_1_0_139405);
+            pushFollow(FOLLOW_2);
             ruleXAssignment();
 
             state._fsp--;
@@ -56057,28 +56057,28 @@ public final void rule__XMemberFeatureCall__ValueAssignment_1_0_1() throws Recog
 
 
     // $ANTLR start "rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19594:1: rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 : ( ( '?.' ) ) ;
+    // InternalCheckCfg.g:19594:1: rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 : ( ( '?.' ) ) ;
     public final void rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19598:1: ( ( ( '?.' ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19599:1: ( ( '?.' ) )
+            // InternalCheckCfg.g:19598:1: ( ( ( '?.' ) ) )
+            // InternalCheckCfg.g:19599:1: ( ( '?.' ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19599:1: ( ( '?.' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19600:1: ( '?.' )
+            // InternalCheckCfg.g:19599:1: ( ( '?.' ) )
+            // InternalCheckCfg.g:19600:1: ( '?.' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getNullSafeQuestionMarkFullStopKeyword_1_1_0_0_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19601:1: ( '?.' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19602:1: '?.'
+            // InternalCheckCfg.g:19601:1: ( '?.' )
+            // InternalCheckCfg.g:19602:1: '?.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getNullSafeQuestionMarkFullStopKeyword_1_1_0_0_1_1_0()); 
             }
-            match(input,90,FOLLOW_90_in_rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_139441); if (state.failed) return ;
+            match(input,90,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getNullSafeQuestionMarkFullStopKeyword_1_1_0_0_1_1_0()); 
             }
@@ -56110,28 +56110,28 @@ public final void rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1() thr
 
 
     // $ANTLR start "rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19617:1: rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 : ( ( '::' ) ) ;
+    // InternalCheckCfg.g:19617:1: rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 : ( ( '::' ) ) ;
     public final void rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19621:1: ( ( ( '::' ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19622:1: ( ( '::' ) )
+            // InternalCheckCfg.g:19621:1: ( ( ( '::' ) ) )
+            // InternalCheckCfg.g:19622:1: ( ( '::' ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19622:1: ( ( '::' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19623:1: ( '::' )
+            // InternalCheckCfg.g:19622:1: ( ( '::' ) )
+            // InternalCheckCfg.g:19623:1: ( '::' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_1_0_0_1_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19624:1: ( '::' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19625:1: '::'
+            // InternalCheckCfg.g:19624:1: ( '::' )
+            // InternalCheckCfg.g:19625:1: '::'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_1_0_0_1_2_0()); 
             }
-            match(input,89,FOLLOW_89_in_rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_239485); if (state.failed) return ;
+            match(input,89,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_1_0_0_1_2_0()); 
             }
@@ -56163,22 +56163,22 @@ public final void rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2
 
 
     // $ANTLR start "rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19640:1: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalCheckCfg.g:19640:1: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19644:1: ( ( ruleJvmArgumentTypeReference ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19645:1: ( ruleJvmArgumentTypeReference )
+            // InternalCheckCfg.g:19644:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalCheckCfg.g:19645:1: ( ruleJvmArgumentTypeReference )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19645:1: ( ruleJvmArgumentTypeReference )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19646:1: ruleJvmArgumentTypeReference
+            // InternalCheckCfg.g:19645:1: ( ruleJvmArgumentTypeReference )
+            // InternalCheckCfg.g:19646:1: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_139524);
+            pushFollow(FOLLOW_2);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -56208,22 +56208,22 @@ public final void rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1() th
 
 
     // $ANTLR start "rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19655:1: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalCheckCfg.g:19655:1: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19659:1: ( ( ruleJvmArgumentTypeReference ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19660:1: ( ruleJvmArgumentTypeReference )
+            // InternalCheckCfg.g:19659:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalCheckCfg.g:19660:1: ( ruleJvmArgumentTypeReference )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19660:1: ( ruleJvmArgumentTypeReference )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19661:1: ruleJvmArgumentTypeReference
+            // InternalCheckCfg.g:19660:1: ( ruleJvmArgumentTypeReference )
+            // InternalCheckCfg.g:19661:1: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_1_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_139555);
+            pushFollow(FOLLOW_2);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -56253,28 +56253,28 @@ public final void rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1()
 
 
     // $ANTLR start "rule__XMemberFeatureCall__FeatureAssignment_1_1_2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19670:1: rule__XMemberFeatureCall__FeatureAssignment_1_1_2 : ( ( ruleIdOrSuper ) ) ;
+    // InternalCheckCfg.g:19670:1: rule__XMemberFeatureCall__FeatureAssignment_1_1_2 : ( ( ruleIdOrSuper ) ) ;
     public final void rule__XMemberFeatureCall__FeatureAssignment_1_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19674:1: ( ( ( ruleIdOrSuper ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19675:1: ( ( ruleIdOrSuper ) )
+            // InternalCheckCfg.g:19674:1: ( ( ( ruleIdOrSuper ) ) )
+            // InternalCheckCfg.g:19675:1: ( ( ruleIdOrSuper ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19675:1: ( ( ruleIdOrSuper ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19676:1: ( ruleIdOrSuper )
+            // InternalCheckCfg.g:19675:1: ( ( ruleIdOrSuper ) )
+            // InternalCheckCfg.g:19676:1: ( ruleIdOrSuper )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getFeatureJvmIdentifiableElementCrossReference_1_1_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19677:1: ( ruleIdOrSuper )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19678:1: ruleIdOrSuper
+            // InternalCheckCfg.g:19677:1: ( ruleIdOrSuper )
+            // InternalCheckCfg.g:19678:1: ruleIdOrSuper
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getFeatureJvmIdentifiableElementIdOrSuperParserRuleCall_1_1_2_0_1()); 
             }
-            pushFollow(FOLLOW_ruleIdOrSuper_in_rule__XMemberFeatureCall__FeatureAssignment_1_1_239590);
+            pushFollow(FOLLOW_2);
             ruleIdOrSuper();
 
             state._fsp--;
@@ -56310,28 +56310,28 @@ public final void rule__XMemberFeatureCall__FeatureAssignment_1_1_2() throws Rec
 
 
     // $ANTLR start "rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19689:1: rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 : ( ( '(' ) ) ;
+    // InternalCheckCfg.g:19689:1: rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 : ( ( '(' ) ) ;
     public final void rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19693:1: ( ( ( '(' ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19694:1: ( ( '(' ) )
+            // InternalCheckCfg.g:19693:1: ( ( ( '(' ) ) )
+            // InternalCheckCfg.g:19694:1: ( ( '(' ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19694:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19695:1: ( '(' )
+            // InternalCheckCfg.g:19694:1: ( ( '(' ) )
+            // InternalCheckCfg.g:19695:1: ( '(' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_1_1_3_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19696:1: ( '(' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19697:1: '('
+            // InternalCheckCfg.g:19696:1: ( '(' )
+            // InternalCheckCfg.g:19697:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_1_1_3_0_0()); 
             }
-            match(input,62,FOLLOW_62_in_rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_039630); if (state.failed) return ;
+            match(input,62,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_1_1_3_0_0()); 
             }
@@ -56363,22 +56363,22 @@ public final void rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_
 
 
     // $ANTLR start "rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19712:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 : ( ruleXShortClosure ) ;
+    // InternalCheckCfg.g:19712:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 : ( ruleXShortClosure ) ;
     public final void rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19716:1: ( ( ruleXShortClosure ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19717:1: ( ruleXShortClosure )
+            // InternalCheckCfg.g:19716:1: ( ( ruleXShortClosure ) )
+            // InternalCheckCfg.g:19717:1: ( ruleXShortClosure )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19717:1: ( ruleXShortClosure )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19718:1: ruleXShortClosure
+            // InternalCheckCfg.g:19717:1: ( ruleXShortClosure )
+            // InternalCheckCfg.g:19718:1: ruleXShortClosure
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXShortClosureParserRuleCall_1_1_3_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXShortClosure_in_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_039669);
+            pushFollow(FOLLOW_2);
             ruleXShortClosure();
 
             state._fsp--;
@@ -56408,22 +56408,22 @@ public final void rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_
 
 
     // $ANTLR start "rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19727:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 : ( ruleXExpression ) ;
+    // InternalCheckCfg.g:19727:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 : ( ruleXExpression ) ;
     public final void rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19731:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19732:1: ( ruleXExpression )
+            // InternalCheckCfg.g:19731:1: ( ( ruleXExpression ) )
+            // InternalCheckCfg.g:19732:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19732:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19733:1: ruleXExpression
+            // InternalCheckCfg.g:19732:1: ( ruleXExpression )
+            // InternalCheckCfg.g:19733:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXExpressionParserRuleCall_1_1_3_1_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_039700);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -56453,22 +56453,22 @@ public final void rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_
 
 
     // $ANTLR start "rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19742:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 : ( ruleXExpression ) ;
+    // InternalCheckCfg.g:19742:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 : ( ruleXExpression ) ;
     public final void rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19746:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19747:1: ( ruleXExpression )
+            // InternalCheckCfg.g:19746:1: ( ( ruleXExpression ) )
+            // InternalCheckCfg.g:19747:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19747:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19748:1: ruleXExpression
+            // InternalCheckCfg.g:19747:1: ( ruleXExpression )
+            // InternalCheckCfg.g:19748:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXExpressionParserRuleCall_1_1_3_1_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_139731);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -56498,22 +56498,22 @@ public final void rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_
 
 
     // $ANTLR start "rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19757:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 : ( ruleXClosure ) ;
+    // InternalCheckCfg.g:19757:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 : ( ruleXClosure ) ;
     public final void rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19761:1: ( ( ruleXClosure ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19762:1: ( ruleXClosure )
+            // InternalCheckCfg.g:19761:1: ( ( ruleXClosure ) )
+            // InternalCheckCfg.g:19762:1: ( ruleXClosure )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19762:1: ( ruleXClosure )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19763:1: ruleXClosure
+            // InternalCheckCfg.g:19762:1: ( ruleXClosure )
+            // InternalCheckCfg.g:19763:1: ruleXClosure
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXClosureParserRuleCall_1_1_4_0()); 
             }
-            pushFollow(FOLLOW_ruleXClosure_in_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_439762);
+            pushFollow(FOLLOW_2);
             ruleXClosure();
 
             state._fsp--;
@@ -56543,22 +56543,22 @@ public final void rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4(
 
 
     // $ANTLR start "rule__XSetLiteral__ElementsAssignment_3_0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19772:1: rule__XSetLiteral__ElementsAssignment_3_0 : ( ruleXExpression ) ;
+    // InternalCheckCfg.g:19772:1: rule__XSetLiteral__ElementsAssignment_3_0 : ( ruleXExpression ) ;
     public final void rule__XSetLiteral__ElementsAssignment_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19776:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19777:1: ( ruleXExpression )
+            // InternalCheckCfg.g:19776:1: ( ( ruleXExpression ) )
+            // InternalCheckCfg.g:19777:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19777:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19778:1: ruleXExpression
+            // InternalCheckCfg.g:19777:1: ( ruleXExpression )
+            // InternalCheckCfg.g:19778:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getElementsXExpressionParserRuleCall_3_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XSetLiteral__ElementsAssignment_3_039793);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -56588,22 +56588,22 @@ public final void rule__XSetLiteral__ElementsAssignment_3_0() throws Recognition
 
 
     // $ANTLR start "rule__XSetLiteral__ElementsAssignment_3_1_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19787:1: rule__XSetLiteral__ElementsAssignment_3_1_1 : ( ruleXExpression ) ;
+    // InternalCheckCfg.g:19787:1: rule__XSetLiteral__ElementsAssignment_3_1_1 : ( ruleXExpression ) ;
     public final void rule__XSetLiteral__ElementsAssignment_3_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19791:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19792:1: ( ruleXExpression )
+            // InternalCheckCfg.g:19791:1: ( ( ruleXExpression ) )
+            // InternalCheckCfg.g:19792:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19792:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19793:1: ruleXExpression
+            // InternalCheckCfg.g:19792:1: ( ruleXExpression )
+            // InternalCheckCfg.g:19793:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getElementsXExpressionParserRuleCall_3_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XSetLiteral__ElementsAssignment_3_1_139824);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -56633,22 +56633,22 @@ public final void rule__XSetLiteral__ElementsAssignment_3_1_1() throws Recogniti
 
 
     // $ANTLR start "rule__XListLiteral__ElementsAssignment_3_0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19802:1: rule__XListLiteral__ElementsAssignment_3_0 : ( ruleXExpression ) ;
+    // InternalCheckCfg.g:19802:1: rule__XListLiteral__ElementsAssignment_3_0 : ( ruleXExpression ) ;
     public final void rule__XListLiteral__ElementsAssignment_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19806:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19807:1: ( ruleXExpression )
+            // InternalCheckCfg.g:19806:1: ( ( ruleXExpression ) )
+            // InternalCheckCfg.g:19807:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19807:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19808:1: ruleXExpression
+            // InternalCheckCfg.g:19807:1: ( ruleXExpression )
+            // InternalCheckCfg.g:19808:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getElementsXExpressionParserRuleCall_3_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XListLiteral__ElementsAssignment_3_039855);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -56678,22 +56678,22 @@ public final void rule__XListLiteral__ElementsAssignment_3_0() throws Recognitio
 
 
     // $ANTLR start "rule__XListLiteral__ElementsAssignment_3_1_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19817:1: rule__XListLiteral__ElementsAssignment_3_1_1 : ( ruleXExpression ) ;
+    // InternalCheckCfg.g:19817:1: rule__XListLiteral__ElementsAssignment_3_1_1 : ( ruleXExpression ) ;
     public final void rule__XListLiteral__ElementsAssignment_3_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19821:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19822:1: ( ruleXExpression )
+            // InternalCheckCfg.g:19821:1: ( ( ruleXExpression ) )
+            // InternalCheckCfg.g:19822:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19822:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19823:1: ruleXExpression
+            // InternalCheckCfg.g:19822:1: ( ruleXExpression )
+            // InternalCheckCfg.g:19823:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getElementsXExpressionParserRuleCall_3_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XListLiteral__ElementsAssignment_3_1_139886);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -56723,22 +56723,22 @@ public final void rule__XListLiteral__ElementsAssignment_3_1_1() throws Recognit
 
 
     // $ANTLR start "rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19832:1: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 : ( ruleJvmFormalParameter ) ;
+    // InternalCheckCfg.g:19832:1: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 : ( ruleJvmFormalParameter ) ;
     public final void rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19836:1: ( ( ruleJvmFormalParameter ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19837:1: ( ruleJvmFormalParameter )
+            // InternalCheckCfg.g:19836:1: ( ( ruleJvmFormalParameter ) )
+            // InternalCheckCfg.g:19837:1: ( ruleJvmFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19837:1: ( ruleJvmFormalParameter )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19838:1: ruleJvmFormalParameter
+            // InternalCheckCfg.g:19837:1: ( ruleJvmFormalParameter )
+            // InternalCheckCfg.g:19838:1: ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_1_0_0_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmFormalParameter_in_rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_039917);
+            pushFollow(FOLLOW_2);
             ruleJvmFormalParameter();
 
             state._fsp--;
@@ -56768,22 +56768,22 @@ public final void rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0() t
 
 
     // $ANTLR start "rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19847:1: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 : ( ruleJvmFormalParameter ) ;
+    // InternalCheckCfg.g:19847:1: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 : ( ruleJvmFormalParameter ) ;
     public final void rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19851:1: ( ( ruleJvmFormalParameter ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19852:1: ( ruleJvmFormalParameter )
+            // InternalCheckCfg.g:19851:1: ( ( ruleJvmFormalParameter ) )
+            // InternalCheckCfg.g:19852:1: ( ruleJvmFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19852:1: ( ruleJvmFormalParameter )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19853:1: ruleJvmFormalParameter
+            // InternalCheckCfg.g:19852:1: ( ruleJvmFormalParameter )
+            // InternalCheckCfg.g:19853:1: ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_1_0_0_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmFormalParameter_in_rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_139948);
+            pushFollow(FOLLOW_2);
             ruleJvmFormalParameter();
 
             state._fsp--;
@@ -56813,28 +56813,28 @@ public final void rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1()
 
 
     // $ANTLR start "rule__XClosure__ExplicitSyntaxAssignment_1_0_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19862:1: rule__XClosure__ExplicitSyntaxAssignment_1_0_1 : ( ( '|' ) ) ;
+    // InternalCheckCfg.g:19862:1: rule__XClosure__ExplicitSyntaxAssignment_1_0_1 : ( ( '|' ) ) ;
     public final void rule__XClosure__ExplicitSyntaxAssignment_1_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19866:1: ( ( ( '|' ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19867:1: ( ( '|' ) )
+            // InternalCheckCfg.g:19866:1: ( ( ( '|' ) ) )
+            // InternalCheckCfg.g:19867:1: ( ( '|' ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19867:1: ( ( '|' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19868:1: ( '|' )
+            // InternalCheckCfg.g:19867:1: ( ( '|' ) )
+            // InternalCheckCfg.g:19868:1: ( '|' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getExplicitSyntaxVerticalLineKeyword_1_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19869:1: ( '|' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19870:1: '|'
+            // InternalCheckCfg.g:19869:1: ( '|' )
+            // InternalCheckCfg.g:19870:1: '|'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getExplicitSyntaxVerticalLineKeyword_1_0_1_0()); 
             }
-            match(input,91,FOLLOW_91_in_rule__XClosure__ExplicitSyntaxAssignment_1_0_139984); if (state.failed) return ;
+            match(input,91,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXClosureAccess().getExplicitSyntaxVerticalLineKeyword_1_0_1_0()); 
             }
@@ -56866,22 +56866,22 @@ public final void rule__XClosure__ExplicitSyntaxAssignment_1_0_1() throws Recogn
 
 
     // $ANTLR start "rule__XClosure__ExpressionAssignment_2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19885:1: rule__XClosure__ExpressionAssignment_2 : ( ruleXExpressionInClosure ) ;
+    // InternalCheckCfg.g:19885:1: rule__XClosure__ExpressionAssignment_2 : ( ruleXExpressionInClosure ) ;
     public final void rule__XClosure__ExpressionAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19889:1: ( ( ruleXExpressionInClosure ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19890:1: ( ruleXExpressionInClosure )
+            // InternalCheckCfg.g:19889:1: ( ( ruleXExpressionInClosure ) )
+            // InternalCheckCfg.g:19890:1: ( ruleXExpressionInClosure )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19890:1: ( ruleXExpressionInClosure )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19891:1: ruleXExpressionInClosure
+            // InternalCheckCfg.g:19890:1: ( ruleXExpressionInClosure )
+            // InternalCheckCfg.g:19891:1: ruleXExpressionInClosure
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getExpressionXExpressionInClosureParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpressionInClosure_in_rule__XClosure__ExpressionAssignment_240023);
+            pushFollow(FOLLOW_2);
             ruleXExpressionInClosure();
 
             state._fsp--;
@@ -56911,22 +56911,22 @@ public final void rule__XClosure__ExpressionAssignment_2() throws RecognitionExc
 
 
     // $ANTLR start "rule__XExpressionInClosure__ExpressionsAssignment_1_0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19900:1: rule__XExpressionInClosure__ExpressionsAssignment_1_0 : ( ruleXExpressionOrVarDeclaration ) ;
+    // InternalCheckCfg.g:19900:1: rule__XExpressionInClosure__ExpressionsAssignment_1_0 : ( ruleXExpressionOrVarDeclaration ) ;
     public final void rule__XExpressionInClosure__ExpressionsAssignment_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19904:1: ( ( ruleXExpressionOrVarDeclaration ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19905:1: ( ruleXExpressionOrVarDeclaration )
+            // InternalCheckCfg.g:19904:1: ( ( ruleXExpressionOrVarDeclaration ) )
+            // InternalCheckCfg.g:19905:1: ( ruleXExpressionOrVarDeclaration )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19905:1: ( ruleXExpressionOrVarDeclaration )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19906:1: ruleXExpressionOrVarDeclaration
+            // InternalCheckCfg.g:19905:1: ( ruleXExpressionOrVarDeclaration )
+            // InternalCheckCfg.g:19906:1: ruleXExpressionOrVarDeclaration
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionInClosureAccess().getExpressionsXExpressionOrVarDeclarationParserRuleCall_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_rule__XExpressionInClosure__ExpressionsAssignment_1_040054);
+            pushFollow(FOLLOW_2);
             ruleXExpressionOrVarDeclaration();
 
             state._fsp--;
@@ -56956,22 +56956,22 @@ public final void rule__XExpressionInClosure__ExpressionsAssignment_1_0() throws
 
 
     // $ANTLR start "rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19915:1: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 : ( ruleJvmFormalParameter ) ;
+    // InternalCheckCfg.g:19915:1: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 : ( ruleJvmFormalParameter ) ;
     public final void rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19919:1: ( ( ruleJvmFormalParameter ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19920:1: ( ruleJvmFormalParameter )
+            // InternalCheckCfg.g:19919:1: ( ( ruleJvmFormalParameter ) )
+            // InternalCheckCfg.g:19920:1: ( ruleJvmFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19920:1: ( ruleJvmFormalParameter )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19921:1: ruleJvmFormalParameter
+            // InternalCheckCfg.g:19920:1: ( ruleJvmFormalParameter )
+            // InternalCheckCfg.g:19921:1: ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_0_0_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmFormalParameter_in_rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_040085);
+            pushFollow(FOLLOW_2);
             ruleJvmFormalParameter();
 
             state._fsp--;
@@ -57001,22 +57001,22 @@ public final void rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_
 
 
     // $ANTLR start "rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19930:1: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 : ( ruleJvmFormalParameter ) ;
+    // InternalCheckCfg.g:19930:1: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 : ( ruleJvmFormalParameter ) ;
     public final void rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19934:1: ( ( ruleJvmFormalParameter ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19935:1: ( ruleJvmFormalParameter )
+            // InternalCheckCfg.g:19934:1: ( ( ruleJvmFormalParameter ) )
+            // InternalCheckCfg.g:19935:1: ( ruleJvmFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19935:1: ( ruleJvmFormalParameter )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19936:1: ruleJvmFormalParameter
+            // InternalCheckCfg.g:19935:1: ( ruleJvmFormalParameter )
+            // InternalCheckCfg.g:19936:1: ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_0_0_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmFormalParameter_in_rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_140116);
+            pushFollow(FOLLOW_2);
             ruleJvmFormalParameter();
 
             state._fsp--;
@@ -57046,28 +57046,28 @@ public final void rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_
 
 
     // $ANTLR start "rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19945:1: rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 : ( ( '|' ) ) ;
+    // InternalCheckCfg.g:19945:1: rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 : ( ( '|' ) ) ;
     public final void rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19949:1: ( ( ( '|' ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19950:1: ( ( '|' ) )
+            // InternalCheckCfg.g:19949:1: ( ( ( '|' ) ) )
+            // InternalCheckCfg.g:19950:1: ( ( '|' ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19950:1: ( ( '|' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19951:1: ( '|' )
+            // InternalCheckCfg.g:19950:1: ( ( '|' ) )
+            // InternalCheckCfg.g:19951:1: ( '|' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getExplicitSyntaxVerticalLineKeyword_0_0_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19952:1: ( '|' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19953:1: '|'
+            // InternalCheckCfg.g:19952:1: ( '|' )
+            // InternalCheckCfg.g:19953:1: '|'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getExplicitSyntaxVerticalLineKeyword_0_0_2_0()); 
             }
-            match(input,91,FOLLOW_91_in_rule__XShortClosure__ExplicitSyntaxAssignment_0_0_240152); if (state.failed) return ;
+            match(input,91,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXShortClosureAccess().getExplicitSyntaxVerticalLineKeyword_0_0_2_0()); 
             }
@@ -57099,22 +57099,22 @@ public final void rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2() throws R
 
 
     // $ANTLR start "rule__XShortClosure__ExpressionAssignment_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19968:1: rule__XShortClosure__ExpressionAssignment_1 : ( ruleXExpression ) ;
+    // InternalCheckCfg.g:19968:1: rule__XShortClosure__ExpressionAssignment_1 : ( ruleXExpression ) ;
     public final void rule__XShortClosure__ExpressionAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19972:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19973:1: ( ruleXExpression )
+            // InternalCheckCfg.g:19972:1: ( ( ruleXExpression ) )
+            // InternalCheckCfg.g:19973:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19973:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19974:1: ruleXExpression
+            // InternalCheckCfg.g:19973:1: ( ruleXExpression )
+            // InternalCheckCfg.g:19974:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getExpressionXExpressionParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XShortClosure__ExpressionAssignment_140191);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -57144,22 +57144,22 @@ public final void rule__XShortClosure__ExpressionAssignment_1() throws Recogniti
 
 
     // $ANTLR start "rule__XIfExpression__IfAssignment_3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19983:1: rule__XIfExpression__IfAssignment_3 : ( ruleXExpression ) ;
+    // InternalCheckCfg.g:19983:1: rule__XIfExpression__IfAssignment_3 : ( ruleXExpression ) ;
     public final void rule__XIfExpression__IfAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19987:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19988:1: ( ruleXExpression )
+            // InternalCheckCfg.g:19987:1: ( ( ruleXExpression ) )
+            // InternalCheckCfg.g:19988:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19988:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19989:1: ruleXExpression
+            // InternalCheckCfg.g:19988:1: ( ruleXExpression )
+            // InternalCheckCfg.g:19989:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getIfXExpressionParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XIfExpression__IfAssignment_340222);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -57189,22 +57189,22 @@ public final void rule__XIfExpression__IfAssignment_3() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XIfExpression__ThenAssignment_5"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:19998:1: rule__XIfExpression__ThenAssignment_5 : ( ruleXExpression ) ;
+    // InternalCheckCfg.g:19998:1: rule__XIfExpression__ThenAssignment_5 : ( ruleXExpression ) ;
     public final void rule__XIfExpression__ThenAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20002:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20003:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20002:1: ( ( ruleXExpression ) )
+            // InternalCheckCfg.g:20003:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20003:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20004:1: ruleXExpression
+            // InternalCheckCfg.g:20003:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20004:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getThenXExpressionParserRuleCall_5_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XIfExpression__ThenAssignment_540253);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -57234,22 +57234,22 @@ public final void rule__XIfExpression__ThenAssignment_5() throws RecognitionExce
 
 
     // $ANTLR start "rule__XIfExpression__ElseAssignment_6_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20013:1: rule__XIfExpression__ElseAssignment_6_1 : ( ruleXExpression ) ;
+    // InternalCheckCfg.g:20013:1: rule__XIfExpression__ElseAssignment_6_1 : ( ruleXExpression ) ;
     public final void rule__XIfExpression__ElseAssignment_6_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20017:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20018:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20017:1: ( ( ruleXExpression ) )
+            // InternalCheckCfg.g:20018:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20018:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20019:1: ruleXExpression
+            // InternalCheckCfg.g:20018:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20019:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getElseXExpressionParserRuleCall_6_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XIfExpression__ElseAssignment_6_140284);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -57279,22 +57279,22 @@ public final void rule__XIfExpression__ElseAssignment_6_1() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20028:1: rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 : ( ruleJvmFormalParameter ) ;
+    // InternalCheckCfg.g:20028:1: rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 : ( ruleJvmFormalParameter ) ;
     public final void rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20032:1: ( ( ruleJvmFormalParameter ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20033:1: ( ruleJvmFormalParameter )
+            // InternalCheckCfg.g:20032:1: ( ( ruleJvmFormalParameter ) )
+            // InternalCheckCfg.g:20033:1: ( ruleJvmFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20033:1: ( ruleJvmFormalParameter )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20034:1: ruleJvmFormalParameter
+            // InternalCheckCfg.g:20033:1: ( ruleJvmFormalParameter )
+            // InternalCheckCfg.g:20034:1: ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getDeclaredParamJvmFormalParameterParserRuleCall_2_0_0_0_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmFormalParameter_in_rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_140315);
+            pushFollow(FOLLOW_2);
             ruleJvmFormalParameter();
 
             state._fsp--;
@@ -57324,22 +57324,22 @@ public final void rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1() t
 
 
     // $ANTLR start "rule__XSwitchExpression__SwitchAssignment_2_0_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20043:1: rule__XSwitchExpression__SwitchAssignment_2_0_1 : ( ruleXExpression ) ;
+    // InternalCheckCfg.g:20043:1: rule__XSwitchExpression__SwitchAssignment_2_0_1 : ( ruleXExpression ) ;
     public final void rule__XSwitchExpression__SwitchAssignment_2_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20047:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20048:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20047:1: ( ( ruleXExpression ) )
+            // InternalCheckCfg.g:20048:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20048:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20049:1: ruleXExpression
+            // InternalCheckCfg.g:20048:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20049:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getSwitchXExpressionParserRuleCall_2_0_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XSwitchExpression__SwitchAssignment_2_0_140346);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -57369,22 +57369,22 @@ public final void rule__XSwitchExpression__SwitchAssignment_2_0_1() throws Recog
 
 
     // $ANTLR start "rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20058:1: rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 : ( ruleJvmFormalParameter ) ;
+    // InternalCheckCfg.g:20058:1: rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 : ( ruleJvmFormalParameter ) ;
     public final void rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20062:1: ( ( ruleJvmFormalParameter ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20063:1: ( ruleJvmFormalParameter )
+            // InternalCheckCfg.g:20062:1: ( ( ruleJvmFormalParameter ) )
+            // InternalCheckCfg.g:20063:1: ( ruleJvmFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20063:1: ( ruleJvmFormalParameter )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20064:1: ruleJvmFormalParameter
+            // InternalCheckCfg.g:20063:1: ( ruleJvmFormalParameter )
+            // InternalCheckCfg.g:20064:1: ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getDeclaredParamJvmFormalParameterParserRuleCall_2_1_0_0_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmFormalParameter_in_rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_040377);
+            pushFollow(FOLLOW_2);
             ruleJvmFormalParameter();
 
             state._fsp--;
@@ -57414,22 +57414,22 @@ public final void rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0() t
 
 
     // $ANTLR start "rule__XSwitchExpression__SwitchAssignment_2_1_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20073:1: rule__XSwitchExpression__SwitchAssignment_2_1_1 : ( ruleXExpression ) ;
+    // InternalCheckCfg.g:20073:1: rule__XSwitchExpression__SwitchAssignment_2_1_1 : ( ruleXExpression ) ;
     public final void rule__XSwitchExpression__SwitchAssignment_2_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20077:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20078:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20077:1: ( ( ruleXExpression ) )
+            // InternalCheckCfg.g:20078:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20078:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20079:1: ruleXExpression
+            // InternalCheckCfg.g:20078:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20079:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getSwitchXExpressionParserRuleCall_2_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XSwitchExpression__SwitchAssignment_2_1_140408);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -57459,22 +57459,22 @@ public final void rule__XSwitchExpression__SwitchAssignment_2_1_1() throws Recog
 
 
     // $ANTLR start "rule__XSwitchExpression__CasesAssignment_4"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20088:1: rule__XSwitchExpression__CasesAssignment_4 : ( ruleXCasePart ) ;
+    // InternalCheckCfg.g:20088:1: rule__XSwitchExpression__CasesAssignment_4 : ( ruleXCasePart ) ;
     public final void rule__XSwitchExpression__CasesAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20092:1: ( ( ruleXCasePart ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20093:1: ( ruleXCasePart )
+            // InternalCheckCfg.g:20092:1: ( ( ruleXCasePart ) )
+            // InternalCheckCfg.g:20093:1: ( ruleXCasePart )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20093:1: ( ruleXCasePart )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20094:1: ruleXCasePart
+            // InternalCheckCfg.g:20093:1: ( ruleXCasePart )
+            // InternalCheckCfg.g:20094:1: ruleXCasePart
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getCasesXCasePartParserRuleCall_4_0()); 
             }
-            pushFollow(FOLLOW_ruleXCasePart_in_rule__XSwitchExpression__CasesAssignment_440439);
+            pushFollow(FOLLOW_2);
             ruleXCasePart();
 
             state._fsp--;
@@ -57504,22 +57504,22 @@ public final void rule__XSwitchExpression__CasesAssignment_4() throws Recognitio
 
 
     // $ANTLR start "rule__XSwitchExpression__DefaultAssignment_5_2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20103:1: rule__XSwitchExpression__DefaultAssignment_5_2 : ( ruleXExpression ) ;
+    // InternalCheckCfg.g:20103:1: rule__XSwitchExpression__DefaultAssignment_5_2 : ( ruleXExpression ) ;
     public final void rule__XSwitchExpression__DefaultAssignment_5_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20107:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20108:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20107:1: ( ( ruleXExpression ) )
+            // InternalCheckCfg.g:20108:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20108:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20109:1: ruleXExpression
+            // InternalCheckCfg.g:20108:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20109:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getDefaultXExpressionParserRuleCall_5_2_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XSwitchExpression__DefaultAssignment_5_240470);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -57549,22 +57549,22 @@ public final void rule__XSwitchExpression__DefaultAssignment_5_2() throws Recogn
 
 
     // $ANTLR start "rule__XCasePart__TypeGuardAssignment_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20118:1: rule__XCasePart__TypeGuardAssignment_1 : ( ruleJvmTypeReference ) ;
+    // InternalCheckCfg.g:20118:1: rule__XCasePart__TypeGuardAssignment_1 : ( ruleJvmTypeReference ) ;
     public final void rule__XCasePart__TypeGuardAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20122:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20123:1: ( ruleJvmTypeReference )
+            // InternalCheckCfg.g:20122:1: ( ( ruleJvmTypeReference ) )
+            // InternalCheckCfg.g:20123:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20123:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20124:1: ruleJvmTypeReference
+            // InternalCheckCfg.g:20123:1: ( ruleJvmTypeReference )
+            // InternalCheckCfg.g:20124:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getTypeGuardJvmTypeReferenceParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__XCasePart__TypeGuardAssignment_140501);
+            pushFollow(FOLLOW_2);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -57594,22 +57594,22 @@ public final void rule__XCasePart__TypeGuardAssignment_1() throws RecognitionExc
 
 
     // $ANTLR start "rule__XCasePart__CaseAssignment_2_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20133:1: rule__XCasePart__CaseAssignment_2_1 : ( ruleXExpression ) ;
+    // InternalCheckCfg.g:20133:1: rule__XCasePart__CaseAssignment_2_1 : ( ruleXExpression ) ;
     public final void rule__XCasePart__CaseAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20137:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20138:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20137:1: ( ( ruleXExpression ) )
+            // InternalCheckCfg.g:20138:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20138:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20139:1: ruleXExpression
+            // InternalCheckCfg.g:20138:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20139:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getCaseXExpressionParserRuleCall_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XCasePart__CaseAssignment_2_140532);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -57639,22 +57639,22 @@ public final void rule__XCasePart__CaseAssignment_2_1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XCasePart__ThenAssignment_3_0_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20148:1: rule__XCasePart__ThenAssignment_3_0_1 : ( ruleXExpression ) ;
+    // InternalCheckCfg.g:20148:1: rule__XCasePart__ThenAssignment_3_0_1 : ( ruleXExpression ) ;
     public final void rule__XCasePart__ThenAssignment_3_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20152:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20153:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20152:1: ( ( ruleXExpression ) )
+            // InternalCheckCfg.g:20153:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20153:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20154:1: ruleXExpression
+            // InternalCheckCfg.g:20153:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20154:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getThenXExpressionParserRuleCall_3_0_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XCasePart__ThenAssignment_3_0_140563);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -57684,28 +57684,28 @@ public final void rule__XCasePart__ThenAssignment_3_0_1() throws RecognitionExce
 
 
     // $ANTLR start "rule__XCasePart__FallThroughAssignment_3_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20163:1: rule__XCasePart__FallThroughAssignment_3_1 : ( ( ',' ) ) ;
+    // InternalCheckCfg.g:20163:1: rule__XCasePart__FallThroughAssignment_3_1 : ( ( ',' ) ) ;
     public final void rule__XCasePart__FallThroughAssignment_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20167:1: ( ( ( ',' ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20168:1: ( ( ',' ) )
+            // InternalCheckCfg.g:20167:1: ( ( ( ',' ) ) )
+            // InternalCheckCfg.g:20168:1: ( ( ',' ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20168:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20169:1: ( ',' )
+            // InternalCheckCfg.g:20168:1: ( ( ',' ) )
+            // InternalCheckCfg.g:20169:1: ( ',' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getFallThroughCommaKeyword_3_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20170:1: ( ',' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20171:1: ','
+            // InternalCheckCfg.g:20170:1: ( ',' )
+            // InternalCheckCfg.g:20171:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getFallThroughCommaKeyword_3_1_0()); 
             }
-            match(input,64,FOLLOW_64_in_rule__XCasePart__FallThroughAssignment_3_140599); if (state.failed) return ;
+            match(input,64,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXCasePartAccess().getFallThroughCommaKeyword_3_1_0()); 
             }
@@ -57737,22 +57737,22 @@ public final void rule__XCasePart__FallThroughAssignment_3_1() throws Recognitio
 
 
     // $ANTLR start "rule__XForLoopExpression__DeclaredParamAssignment_0_0_3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20186:1: rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 : ( ruleJvmFormalParameter ) ;
+    // InternalCheckCfg.g:20186:1: rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 : ( ruleJvmFormalParameter ) ;
     public final void rule__XForLoopExpression__DeclaredParamAssignment_0_0_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20190:1: ( ( ruleJvmFormalParameter ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20191:1: ( ruleJvmFormalParameter )
+            // InternalCheckCfg.g:20190:1: ( ( ruleJvmFormalParameter ) )
+            // InternalCheckCfg.g:20191:1: ( ruleJvmFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20191:1: ( ruleJvmFormalParameter )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20192:1: ruleJvmFormalParameter
+            // InternalCheckCfg.g:20191:1: ( ruleJvmFormalParameter )
+            // InternalCheckCfg.g:20192:1: ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getDeclaredParamJvmFormalParameterParserRuleCall_0_0_3_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmFormalParameter_in_rule__XForLoopExpression__DeclaredParamAssignment_0_0_340638);
+            pushFollow(FOLLOW_2);
             ruleJvmFormalParameter();
 
             state._fsp--;
@@ -57782,22 +57782,22 @@ public final void rule__XForLoopExpression__DeclaredParamAssignment_0_0_3() thro
 
 
     // $ANTLR start "rule__XForLoopExpression__ForExpressionAssignment_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20201:1: rule__XForLoopExpression__ForExpressionAssignment_1 : ( ruleXExpression ) ;
+    // InternalCheckCfg.g:20201:1: rule__XForLoopExpression__ForExpressionAssignment_1 : ( ruleXExpression ) ;
     public final void rule__XForLoopExpression__ForExpressionAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20205:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20206:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20205:1: ( ( ruleXExpression ) )
+            // InternalCheckCfg.g:20206:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20206:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20207:1: ruleXExpression
+            // InternalCheckCfg.g:20206:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20207:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getForExpressionXExpressionParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XForLoopExpression__ForExpressionAssignment_140669);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -57827,22 +57827,22 @@ public final void rule__XForLoopExpression__ForExpressionAssignment_1() throws R
 
 
     // $ANTLR start "rule__XForLoopExpression__EachExpressionAssignment_3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20216:1: rule__XForLoopExpression__EachExpressionAssignment_3 : ( ruleXExpression ) ;
+    // InternalCheckCfg.g:20216:1: rule__XForLoopExpression__EachExpressionAssignment_3 : ( ruleXExpression ) ;
     public final void rule__XForLoopExpression__EachExpressionAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20220:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20221:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20220:1: ( ( ruleXExpression ) )
+            // InternalCheckCfg.g:20221:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20221:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20222:1: ruleXExpression
+            // InternalCheckCfg.g:20221:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20222:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getEachExpressionXExpressionParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XForLoopExpression__EachExpressionAssignment_340700);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -57872,22 +57872,22 @@ public final void rule__XForLoopExpression__EachExpressionAssignment_3() throws
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20231:1: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 : ( ruleXExpressionOrVarDeclaration ) ;
+    // InternalCheckCfg.g:20231:1: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 : ( ruleXExpressionOrVarDeclaration ) ;
     public final void rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20235:1: ( ( ruleXExpressionOrVarDeclaration ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20236:1: ( ruleXExpressionOrVarDeclaration )
+            // InternalCheckCfg.g:20235:1: ( ( ruleXExpressionOrVarDeclaration ) )
+            // InternalCheckCfg.g:20236:1: ( ruleXExpressionOrVarDeclaration )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20236:1: ( ruleXExpressionOrVarDeclaration )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20237:1: ruleXExpressionOrVarDeclaration
+            // InternalCheckCfg.g:20236:1: ( ruleXExpressionOrVarDeclaration )
+            // InternalCheckCfg.g:20237:1: ruleXExpressionOrVarDeclaration
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getInitExpressionsXExpressionOrVarDeclarationParserRuleCall_3_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_rule__XBasicForLoopExpression__InitExpressionsAssignment_3_040731);
+            pushFollow(FOLLOW_2);
             ruleXExpressionOrVarDeclaration();
 
             state._fsp--;
@@ -57917,22 +57917,22 @@ public final void rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0()
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20246:1: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 : ( ruleXExpressionOrVarDeclaration ) ;
+    // InternalCheckCfg.g:20246:1: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 : ( ruleXExpressionOrVarDeclaration ) ;
     public final void rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20250:1: ( ( ruleXExpressionOrVarDeclaration ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20251:1: ( ruleXExpressionOrVarDeclaration )
+            // InternalCheckCfg.g:20250:1: ( ( ruleXExpressionOrVarDeclaration ) )
+            // InternalCheckCfg.g:20251:1: ( ruleXExpressionOrVarDeclaration )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20251:1: ( ruleXExpressionOrVarDeclaration )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20252:1: ruleXExpressionOrVarDeclaration
+            // InternalCheckCfg.g:20251:1: ( ruleXExpressionOrVarDeclaration )
+            // InternalCheckCfg.g:20252:1: ruleXExpressionOrVarDeclaration
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getInitExpressionsXExpressionOrVarDeclarationParserRuleCall_3_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_140762);
+            pushFollow(FOLLOW_2);
             ruleXExpressionOrVarDeclaration();
 
             state._fsp--;
@@ -57962,22 +57962,22 @@ public final void rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__ExpressionAssignment_5"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20261:1: rule__XBasicForLoopExpression__ExpressionAssignment_5 : ( ruleXExpression ) ;
+    // InternalCheckCfg.g:20261:1: rule__XBasicForLoopExpression__ExpressionAssignment_5 : ( ruleXExpression ) ;
     public final void rule__XBasicForLoopExpression__ExpressionAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20265:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20266:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20265:1: ( ( ruleXExpression ) )
+            // InternalCheckCfg.g:20266:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20266:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20267:1: ruleXExpression
+            // InternalCheckCfg.g:20266:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20267:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getExpressionXExpressionParserRuleCall_5_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XBasicForLoopExpression__ExpressionAssignment_540793);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -58007,22 +58007,22 @@ public final void rule__XBasicForLoopExpression__ExpressionAssignment_5() throws
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20276:1: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 : ( ruleXExpression ) ;
+    // InternalCheckCfg.g:20276:1: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 : ( ruleXExpression ) ;
     public final void rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20280:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20281:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20280:1: ( ( ruleXExpression ) )
+            // InternalCheckCfg.g:20281:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20281:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20282:1: ruleXExpression
+            // InternalCheckCfg.g:20281:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20282:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getUpdateExpressionsXExpressionParserRuleCall_7_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_040824);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -58052,22 +58052,22 @@ public final void rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20291:1: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 : ( ruleXExpression ) ;
+    // InternalCheckCfg.g:20291:1: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 : ( ruleXExpression ) ;
     public final void rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20295:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20296:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20295:1: ( ( ruleXExpression ) )
+            // InternalCheckCfg.g:20296:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20296:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20297:1: ruleXExpression
+            // InternalCheckCfg.g:20296:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20297:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getUpdateExpressionsXExpressionParserRuleCall_7_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_140855);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -58097,22 +58097,22 @@ public final void rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__EachExpressionAssignment_9"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20306:1: rule__XBasicForLoopExpression__EachExpressionAssignment_9 : ( ruleXExpression ) ;
+    // InternalCheckCfg.g:20306:1: rule__XBasicForLoopExpression__EachExpressionAssignment_9 : ( ruleXExpression ) ;
     public final void rule__XBasicForLoopExpression__EachExpressionAssignment_9() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20310:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20311:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20310:1: ( ( ruleXExpression ) )
+            // InternalCheckCfg.g:20311:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20311:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20312:1: ruleXExpression
+            // InternalCheckCfg.g:20311:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20312:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getEachExpressionXExpressionParserRuleCall_9_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XBasicForLoopExpression__EachExpressionAssignment_940886);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -58142,22 +58142,22 @@ public final void rule__XBasicForLoopExpression__EachExpressionAssignment_9() th
 
 
     // $ANTLR start "rule__XWhileExpression__PredicateAssignment_3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20321:1: rule__XWhileExpression__PredicateAssignment_3 : ( ruleXExpression ) ;
+    // InternalCheckCfg.g:20321:1: rule__XWhileExpression__PredicateAssignment_3 : ( ruleXExpression ) ;
     public final void rule__XWhileExpression__PredicateAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20325:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20326:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20325:1: ( ( ruleXExpression ) )
+            // InternalCheckCfg.g:20326:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20326:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20327:1: ruleXExpression
+            // InternalCheckCfg.g:20326:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20327:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getPredicateXExpressionParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XWhileExpression__PredicateAssignment_340917);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -58187,22 +58187,22 @@ public final void rule__XWhileExpression__PredicateAssignment_3() throws Recogni
 
 
     // $ANTLR start "rule__XWhileExpression__BodyAssignment_5"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20336:1: rule__XWhileExpression__BodyAssignment_5 : ( ruleXExpression ) ;
+    // InternalCheckCfg.g:20336:1: rule__XWhileExpression__BodyAssignment_5 : ( ruleXExpression ) ;
     public final void rule__XWhileExpression__BodyAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20340:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20341:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20340:1: ( ( ruleXExpression ) )
+            // InternalCheckCfg.g:20341:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20341:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20342:1: ruleXExpression
+            // InternalCheckCfg.g:20341:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20342:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getBodyXExpressionParserRuleCall_5_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XWhileExpression__BodyAssignment_540948);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -58232,22 +58232,22 @@ public final void rule__XWhileExpression__BodyAssignment_5() throws RecognitionE
 
 
     // $ANTLR start "rule__XDoWhileExpression__BodyAssignment_2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20351:1: rule__XDoWhileExpression__BodyAssignment_2 : ( ruleXExpression ) ;
+    // InternalCheckCfg.g:20351:1: rule__XDoWhileExpression__BodyAssignment_2 : ( ruleXExpression ) ;
     public final void rule__XDoWhileExpression__BodyAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20355:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20356:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20355:1: ( ( ruleXExpression ) )
+            // InternalCheckCfg.g:20356:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20356:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20357:1: ruleXExpression
+            // InternalCheckCfg.g:20356:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20357:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getBodyXExpressionParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XDoWhileExpression__BodyAssignment_240979);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -58277,22 +58277,22 @@ public final void rule__XDoWhileExpression__BodyAssignment_2() throws Recognitio
 
 
     // $ANTLR start "rule__XDoWhileExpression__PredicateAssignment_5"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20366:1: rule__XDoWhileExpression__PredicateAssignment_5 : ( ruleXExpression ) ;
+    // InternalCheckCfg.g:20366:1: rule__XDoWhileExpression__PredicateAssignment_5 : ( ruleXExpression ) ;
     public final void rule__XDoWhileExpression__PredicateAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20370:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20371:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20370:1: ( ( ruleXExpression ) )
+            // InternalCheckCfg.g:20371:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20371:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20372:1: ruleXExpression
+            // InternalCheckCfg.g:20371:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20372:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getPredicateXExpressionParserRuleCall_5_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XDoWhileExpression__PredicateAssignment_541010);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -58322,22 +58322,22 @@ public final void rule__XDoWhileExpression__PredicateAssignment_5() throws Recog
 
 
     // $ANTLR start "rule__XBlockExpression__ExpressionsAssignment_2_0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20381:1: rule__XBlockExpression__ExpressionsAssignment_2_0 : ( ruleXExpressionOrVarDeclaration ) ;
+    // InternalCheckCfg.g:20381:1: rule__XBlockExpression__ExpressionsAssignment_2_0 : ( ruleXExpressionOrVarDeclaration ) ;
     public final void rule__XBlockExpression__ExpressionsAssignment_2_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20385:1: ( ( ruleXExpressionOrVarDeclaration ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20386:1: ( ruleXExpressionOrVarDeclaration )
+            // InternalCheckCfg.g:20385:1: ( ( ruleXExpressionOrVarDeclaration ) )
+            // InternalCheckCfg.g:20386:1: ( ruleXExpressionOrVarDeclaration )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20386:1: ( ruleXExpressionOrVarDeclaration )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20387:1: ruleXExpressionOrVarDeclaration
+            // InternalCheckCfg.g:20386:1: ( ruleXExpressionOrVarDeclaration )
+            // InternalCheckCfg.g:20387:1: ruleXExpressionOrVarDeclaration
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getExpressionsXExpressionOrVarDeclarationParserRuleCall_2_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_rule__XBlockExpression__ExpressionsAssignment_2_041041);
+            pushFollow(FOLLOW_2);
             ruleXExpressionOrVarDeclaration();
 
             state._fsp--;
@@ -58367,28 +58367,28 @@ public final void rule__XBlockExpression__ExpressionsAssignment_2_0() throws Rec
 
 
     // $ANTLR start "rule__XVariableDeclaration__WriteableAssignment_1_0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20396:1: rule__XVariableDeclaration__WriteableAssignment_1_0 : ( ( 'var' ) ) ;
+    // InternalCheckCfg.g:20396:1: rule__XVariableDeclaration__WriteableAssignment_1_0 : ( ( 'var' ) ) ;
     public final void rule__XVariableDeclaration__WriteableAssignment_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20400:1: ( ( ( 'var' ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20401:1: ( ( 'var' ) )
+            // InternalCheckCfg.g:20400:1: ( ( ( 'var' ) ) )
+            // InternalCheckCfg.g:20401:1: ( ( 'var' ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20401:1: ( ( 'var' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20402:1: ( 'var' )
+            // InternalCheckCfg.g:20401:1: ( ( 'var' ) )
+            // InternalCheckCfg.g:20402:1: ( 'var' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getWriteableVarKeyword_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20403:1: ( 'var' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20404:1: 'var'
+            // InternalCheckCfg.g:20403:1: ( 'var' )
+            // InternalCheckCfg.g:20404:1: 'var'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getWriteableVarKeyword_1_0_0()); 
             }
-            match(input,92,FOLLOW_92_in_rule__XVariableDeclaration__WriteableAssignment_1_041077); if (state.failed) return ;
+            match(input,92,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXVariableDeclarationAccess().getWriteableVarKeyword_1_0_0()); 
             }
@@ -58420,22 +58420,22 @@ public final void rule__XVariableDeclaration__WriteableAssignment_1_0() throws R
 
 
     // $ANTLR start "rule__XVariableDeclaration__TypeAssignment_2_0_0_0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20419:1: rule__XVariableDeclaration__TypeAssignment_2_0_0_0 : ( ruleJvmTypeReference ) ;
+    // InternalCheckCfg.g:20419:1: rule__XVariableDeclaration__TypeAssignment_2_0_0_0 : ( ruleJvmTypeReference ) ;
     public final void rule__XVariableDeclaration__TypeAssignment_2_0_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20423:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20424:1: ( ruleJvmTypeReference )
+            // InternalCheckCfg.g:20423:1: ( ( ruleJvmTypeReference ) )
+            // InternalCheckCfg.g:20424:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20424:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20425:1: ruleJvmTypeReference
+            // InternalCheckCfg.g:20424:1: ( ruleJvmTypeReference )
+            // InternalCheckCfg.g:20425:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getTypeJvmTypeReferenceParserRuleCall_2_0_0_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__XVariableDeclaration__TypeAssignment_2_0_0_041116);
+            pushFollow(FOLLOW_2);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -58465,22 +58465,22 @@ public final void rule__XVariableDeclaration__TypeAssignment_2_0_0_0() throws Re
 
 
     // $ANTLR start "rule__XVariableDeclaration__NameAssignment_2_0_0_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20434:1: rule__XVariableDeclaration__NameAssignment_2_0_0_1 : ( ruleValidID ) ;
+    // InternalCheckCfg.g:20434:1: rule__XVariableDeclaration__NameAssignment_2_0_0_1 : ( ruleValidID ) ;
     public final void rule__XVariableDeclaration__NameAssignment_2_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20438:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20439:1: ( ruleValidID )
+            // InternalCheckCfg.g:20438:1: ( ( ruleValidID ) )
+            // InternalCheckCfg.g:20439:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20439:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20440:1: ruleValidID
+            // InternalCheckCfg.g:20439:1: ( ruleValidID )
+            // InternalCheckCfg.g:20440:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getNameValidIDParserRuleCall_2_0_0_1_0()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__XVariableDeclaration__NameAssignment_2_0_0_141147);
+            pushFollow(FOLLOW_2);
             ruleValidID();
 
             state._fsp--;
@@ -58510,22 +58510,22 @@ public final void rule__XVariableDeclaration__NameAssignment_2_0_0_1() throws Re
 
 
     // $ANTLR start "rule__XVariableDeclaration__NameAssignment_2_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20449:1: rule__XVariableDeclaration__NameAssignment_2_1 : ( ruleValidID ) ;
+    // InternalCheckCfg.g:20449:1: rule__XVariableDeclaration__NameAssignment_2_1 : ( ruleValidID ) ;
     public final void rule__XVariableDeclaration__NameAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20453:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20454:1: ( ruleValidID )
+            // InternalCheckCfg.g:20453:1: ( ( ruleValidID ) )
+            // InternalCheckCfg.g:20454:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20454:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20455:1: ruleValidID
+            // InternalCheckCfg.g:20454:1: ( ruleValidID )
+            // InternalCheckCfg.g:20455:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getNameValidIDParserRuleCall_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__XVariableDeclaration__NameAssignment_2_141178);
+            pushFollow(FOLLOW_2);
             ruleValidID();
 
             state._fsp--;
@@ -58555,22 +58555,22 @@ public final void rule__XVariableDeclaration__NameAssignment_2_1() throws Recogn
 
 
     // $ANTLR start "rule__XVariableDeclaration__RightAssignment_3_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20464:1: rule__XVariableDeclaration__RightAssignment_3_1 : ( ruleXExpression ) ;
+    // InternalCheckCfg.g:20464:1: rule__XVariableDeclaration__RightAssignment_3_1 : ( ruleXExpression ) ;
     public final void rule__XVariableDeclaration__RightAssignment_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20468:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20469:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20468:1: ( ( ruleXExpression ) )
+            // InternalCheckCfg.g:20469:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20469:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20470:1: ruleXExpression
+            // InternalCheckCfg.g:20469:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20470:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getRightXExpressionParserRuleCall_3_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XVariableDeclaration__RightAssignment_3_141209);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -58600,22 +58600,22 @@ public final void rule__XVariableDeclaration__RightAssignment_3_1() throws Recog
 
 
     // $ANTLR start "rule__JvmFormalParameter__ParameterTypeAssignment_0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20479:1: rule__JvmFormalParameter__ParameterTypeAssignment_0 : ( ruleJvmTypeReference ) ;
+    // InternalCheckCfg.g:20479:1: rule__JvmFormalParameter__ParameterTypeAssignment_0 : ( ruleJvmTypeReference ) ;
     public final void rule__JvmFormalParameter__ParameterTypeAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20483:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20484:1: ( ruleJvmTypeReference )
+            // InternalCheckCfg.g:20483:1: ( ( ruleJvmTypeReference ) )
+            // InternalCheckCfg.g:20484:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20484:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20485:1: ruleJvmTypeReference
+            // InternalCheckCfg.g:20484:1: ( ruleJvmTypeReference )
+            // InternalCheckCfg.g:20485:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmFormalParameterAccess().getParameterTypeJvmTypeReferenceParserRuleCall_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__JvmFormalParameter__ParameterTypeAssignment_041240);
+            pushFollow(FOLLOW_2);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -58645,22 +58645,22 @@ public final void rule__JvmFormalParameter__ParameterTypeAssignment_0() throws R
 
 
     // $ANTLR start "rule__JvmFormalParameter__NameAssignment_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20494:1: rule__JvmFormalParameter__NameAssignment_1 : ( ruleValidID ) ;
+    // InternalCheckCfg.g:20494:1: rule__JvmFormalParameter__NameAssignment_1 : ( ruleValidID ) ;
     public final void rule__JvmFormalParameter__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20498:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20499:1: ( ruleValidID )
+            // InternalCheckCfg.g:20498:1: ( ( ruleValidID ) )
+            // InternalCheckCfg.g:20499:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20499:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20500:1: ruleValidID
+            // InternalCheckCfg.g:20499:1: ( ruleValidID )
+            // InternalCheckCfg.g:20500:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmFormalParameterAccess().getNameValidIDParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__JvmFormalParameter__NameAssignment_141271);
+            pushFollow(FOLLOW_2);
             ruleValidID();
 
             state._fsp--;
@@ -58690,22 +58690,22 @@ public final void rule__JvmFormalParameter__NameAssignment_1() throws Recognitio
 
 
     // $ANTLR start "rule__FullJvmFormalParameter__ParameterTypeAssignment_0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20509:1: rule__FullJvmFormalParameter__ParameterTypeAssignment_0 : ( ruleJvmTypeReference ) ;
+    // InternalCheckCfg.g:20509:1: rule__FullJvmFormalParameter__ParameterTypeAssignment_0 : ( ruleJvmTypeReference ) ;
     public final void rule__FullJvmFormalParameter__ParameterTypeAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20513:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20514:1: ( ruleJvmTypeReference )
+            // InternalCheckCfg.g:20513:1: ( ( ruleJvmTypeReference ) )
+            // InternalCheckCfg.g:20514:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20514:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20515:1: ruleJvmTypeReference
+            // InternalCheckCfg.g:20514:1: ( ruleJvmTypeReference )
+            // InternalCheckCfg.g:20515:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFullJvmFormalParameterAccess().getParameterTypeJvmTypeReferenceParserRuleCall_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__FullJvmFormalParameter__ParameterTypeAssignment_041302);
+            pushFollow(FOLLOW_2);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -58735,22 +58735,22 @@ public final void rule__FullJvmFormalParameter__ParameterTypeAssignment_0() thro
 
 
     // $ANTLR start "rule__FullJvmFormalParameter__NameAssignment_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20524:1: rule__FullJvmFormalParameter__NameAssignment_1 : ( ruleValidID ) ;
+    // InternalCheckCfg.g:20524:1: rule__FullJvmFormalParameter__NameAssignment_1 : ( ruleValidID ) ;
     public final void rule__FullJvmFormalParameter__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20528:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20529:1: ( ruleValidID )
+            // InternalCheckCfg.g:20528:1: ( ( ruleValidID ) )
+            // InternalCheckCfg.g:20529:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20529:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20530:1: ruleValidID
+            // InternalCheckCfg.g:20529:1: ( ruleValidID )
+            // InternalCheckCfg.g:20530:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFullJvmFormalParameterAccess().getNameValidIDParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__FullJvmFormalParameter__NameAssignment_141333);
+            pushFollow(FOLLOW_2);
             ruleValidID();
 
             state._fsp--;
@@ -58780,22 +58780,22 @@ public final void rule__FullJvmFormalParameter__NameAssignment_1() throws Recogn
 
 
     // $ANTLR start "rule__XFeatureCall__TypeArgumentsAssignment_1_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20539:1: rule__XFeatureCall__TypeArgumentsAssignment_1_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalCheckCfg.g:20539:1: rule__XFeatureCall__TypeArgumentsAssignment_1_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__XFeatureCall__TypeArgumentsAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20543:1: ( ( ruleJvmArgumentTypeReference ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20544:1: ( ruleJvmArgumentTypeReference )
+            // InternalCheckCfg.g:20543:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalCheckCfg.g:20544:1: ( ruleJvmArgumentTypeReference )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20544:1: ( ruleJvmArgumentTypeReference )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20545:1: ruleJvmArgumentTypeReference
+            // InternalCheckCfg.g:20544:1: ( ruleJvmArgumentTypeReference )
+            // InternalCheckCfg.g:20545:1: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__XFeatureCall__TypeArgumentsAssignment_1_141364);
+            pushFollow(FOLLOW_2);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -58825,22 +58825,22 @@ public final void rule__XFeatureCall__TypeArgumentsAssignment_1_1() throws Recog
 
 
     // $ANTLR start "rule__XFeatureCall__TypeArgumentsAssignment_1_2_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20554:1: rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalCheckCfg.g:20554:1: rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__XFeatureCall__TypeArgumentsAssignment_1_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20558:1: ( ( ruleJvmArgumentTypeReference ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20559:1: ( ruleJvmArgumentTypeReference )
+            // InternalCheckCfg.g:20558:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalCheckCfg.g:20559:1: ( ruleJvmArgumentTypeReference )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20559:1: ( ruleJvmArgumentTypeReference )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20560:1: ruleJvmArgumentTypeReference
+            // InternalCheckCfg.g:20559:1: ( ruleJvmArgumentTypeReference )
+            // InternalCheckCfg.g:20560:1: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__XFeatureCall__TypeArgumentsAssignment_1_2_141395);
+            pushFollow(FOLLOW_2);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -58870,28 +58870,28 @@ public final void rule__XFeatureCall__TypeArgumentsAssignment_1_2_1() throws Rec
 
 
     // $ANTLR start "rule__XFeatureCall__FeatureAssignment_2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20569:1: rule__XFeatureCall__FeatureAssignment_2 : ( ( ruleIdOrSuper ) ) ;
+    // InternalCheckCfg.g:20569:1: rule__XFeatureCall__FeatureAssignment_2 : ( ( ruleIdOrSuper ) ) ;
     public final void rule__XFeatureCall__FeatureAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20573:1: ( ( ( ruleIdOrSuper ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20574:1: ( ( ruleIdOrSuper ) )
+            // InternalCheckCfg.g:20573:1: ( ( ( ruleIdOrSuper ) ) )
+            // InternalCheckCfg.g:20574:1: ( ( ruleIdOrSuper ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20574:1: ( ( ruleIdOrSuper ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20575:1: ( ruleIdOrSuper )
+            // InternalCheckCfg.g:20574:1: ( ( ruleIdOrSuper ) )
+            // InternalCheckCfg.g:20575:1: ( ruleIdOrSuper )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureJvmIdentifiableElementCrossReference_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20576:1: ( ruleIdOrSuper )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20577:1: ruleIdOrSuper
+            // InternalCheckCfg.g:20576:1: ( ruleIdOrSuper )
+            // InternalCheckCfg.g:20577:1: ruleIdOrSuper
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureJvmIdentifiableElementIdOrSuperParserRuleCall_2_0_1()); 
             }
-            pushFollow(FOLLOW_ruleIdOrSuper_in_rule__XFeatureCall__FeatureAssignment_241430);
+            pushFollow(FOLLOW_2);
             ruleIdOrSuper();
 
             state._fsp--;
@@ -58927,28 +58927,28 @@ public final void rule__XFeatureCall__FeatureAssignment_2() throws RecognitionEx
 
 
     // $ANTLR start "rule__XFeatureCall__ExplicitOperationCallAssignment_3_0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20588:1: rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 : ( ( '(' ) ) ;
+    // InternalCheckCfg.g:20588:1: rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 : ( ( '(' ) ) ;
     public final void rule__XFeatureCall__ExplicitOperationCallAssignment_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20592:1: ( ( ( '(' ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20593:1: ( ( '(' ) )
+            // InternalCheckCfg.g:20592:1: ( ( ( '(' ) ) )
+            // InternalCheckCfg.g:20593:1: ( ( '(' ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20593:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20594:1: ( '(' )
+            // InternalCheckCfg.g:20593:1: ( ( '(' ) )
+            // InternalCheckCfg.g:20594:1: ( '(' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_3_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20595:1: ( '(' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20596:1: '('
+            // InternalCheckCfg.g:20595:1: ( '(' )
+            // InternalCheckCfg.g:20596:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_3_0_0()); 
             }
-            match(input,62,FOLLOW_62_in_rule__XFeatureCall__ExplicitOperationCallAssignment_3_041470); if (state.failed) return ;
+            match(input,62,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_3_0_0()); 
             }
@@ -58980,22 +58980,22 @@ public final void rule__XFeatureCall__ExplicitOperationCallAssignment_3_0() thro
 
 
     // $ANTLR start "rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20611:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 : ( ruleXShortClosure ) ;
+    // InternalCheckCfg.g:20611:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 : ( ruleXShortClosure ) ;
     public final void rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20615:1: ( ( ruleXShortClosure ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20616:1: ( ruleXShortClosure )
+            // InternalCheckCfg.g:20615:1: ( ( ruleXShortClosure ) )
+            // InternalCheckCfg.g:20616:1: ( ruleXShortClosure )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20616:1: ( ruleXShortClosure )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20617:1: ruleXShortClosure
+            // InternalCheckCfg.g:20616:1: ( ruleXShortClosure )
+            // InternalCheckCfg.g:20617:1: ruleXShortClosure
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXShortClosureParserRuleCall_3_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXShortClosure_in_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_041509);
+            pushFollow(FOLLOW_2);
             ruleXShortClosure();
 
             state._fsp--;
@@ -59025,22 +59025,22 @@ public final void rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0() thr
 
 
     // $ANTLR start "rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20626:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 : ( ruleXExpression ) ;
+    // InternalCheckCfg.g:20626:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 : ( ruleXExpression ) ;
     public final void rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20630:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20631:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20630:1: ( ( ruleXExpression ) )
+            // InternalCheckCfg.g:20631:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20631:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20632:1: ruleXExpression
+            // InternalCheckCfg.g:20631:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20632:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXExpressionParserRuleCall_3_1_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_041540);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -59070,22 +59070,22 @@ public final void rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0() t
 
 
     // $ANTLR start "rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20641:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 : ( ruleXExpression ) ;
+    // InternalCheckCfg.g:20641:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 : ( ruleXExpression ) ;
     public final void rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20645:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20646:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20645:1: ( ( ruleXExpression ) )
+            // InternalCheckCfg.g:20646:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20646:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20647:1: ruleXExpression
+            // InternalCheckCfg.g:20646:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20647:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXExpressionParserRuleCall_3_1_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_141571);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -59115,22 +59115,22 @@ public final void rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1()
 
 
     // $ANTLR start "rule__XFeatureCall__FeatureCallArgumentsAssignment_4"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20656:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_4 : ( ruleXClosure ) ;
+    // InternalCheckCfg.g:20656:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_4 : ( ruleXClosure ) ;
     public final void rule__XFeatureCall__FeatureCallArgumentsAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20660:1: ( ( ruleXClosure ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20661:1: ( ruleXClosure )
+            // InternalCheckCfg.g:20660:1: ( ( ruleXClosure ) )
+            // InternalCheckCfg.g:20661:1: ( ruleXClosure )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20661:1: ( ruleXClosure )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20662:1: ruleXClosure
+            // InternalCheckCfg.g:20661:1: ( ruleXClosure )
+            // InternalCheckCfg.g:20662:1: ruleXClosure
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXClosureParserRuleCall_4_0()); 
             }
-            pushFollow(FOLLOW_ruleXClosure_in_rule__XFeatureCall__FeatureCallArgumentsAssignment_441602);
+            pushFollow(FOLLOW_2);
             ruleXClosure();
 
             state._fsp--;
@@ -59160,28 +59160,28 @@ public final void rule__XFeatureCall__FeatureCallArgumentsAssignment_4() throws
 
 
     // $ANTLR start "rule__XConstructorCall__ConstructorAssignment_2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20671:1: rule__XConstructorCall__ConstructorAssignment_2 : ( ( ruleQualifiedName ) ) ;
+    // InternalCheckCfg.g:20671:1: rule__XConstructorCall__ConstructorAssignment_2 : ( ( ruleQualifiedName ) ) ;
     public final void rule__XConstructorCall__ConstructorAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20675:1: ( ( ( ruleQualifiedName ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20676:1: ( ( ruleQualifiedName ) )
+            // InternalCheckCfg.g:20675:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalCheckCfg.g:20676:1: ( ( ruleQualifiedName ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20676:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20677:1: ( ruleQualifiedName )
+            // InternalCheckCfg.g:20676:1: ( ( ruleQualifiedName ) )
+            // InternalCheckCfg.g:20677:1: ( ruleQualifiedName )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getConstructorJvmConstructorCrossReference_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20678:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20679:1: ruleQualifiedName
+            // InternalCheckCfg.g:20678:1: ( ruleQualifiedName )
+            // InternalCheckCfg.g:20679:1: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getConstructorJvmConstructorQualifiedNameParserRuleCall_2_0_1()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_rule__XConstructorCall__ConstructorAssignment_241637);
+            pushFollow(FOLLOW_2);
             ruleQualifiedName();
 
             state._fsp--;
@@ -59217,22 +59217,22 @@ public final void rule__XConstructorCall__ConstructorAssignment_2() throws Recog
 
 
     // $ANTLR start "rule__XConstructorCall__TypeArgumentsAssignment_3_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20690:1: rule__XConstructorCall__TypeArgumentsAssignment_3_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalCheckCfg.g:20690:1: rule__XConstructorCall__TypeArgumentsAssignment_3_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__XConstructorCall__TypeArgumentsAssignment_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20694:1: ( ( ruleJvmArgumentTypeReference ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20695:1: ( ruleJvmArgumentTypeReference )
+            // InternalCheckCfg.g:20694:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalCheckCfg.g:20695:1: ( ruleJvmArgumentTypeReference )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20695:1: ( ruleJvmArgumentTypeReference )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20696:1: ruleJvmArgumentTypeReference
+            // InternalCheckCfg.g:20695:1: ( ruleJvmArgumentTypeReference )
+            // InternalCheckCfg.g:20696:1: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_3_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__XConstructorCall__TypeArgumentsAssignment_3_141672);
+            pushFollow(FOLLOW_2);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -59262,22 +59262,22 @@ public final void rule__XConstructorCall__TypeArgumentsAssignment_3_1() throws R
 
 
     // $ANTLR start "rule__XConstructorCall__TypeArgumentsAssignment_3_2_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20705:1: rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalCheckCfg.g:20705:1: rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__XConstructorCall__TypeArgumentsAssignment_3_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20709:1: ( ( ruleJvmArgumentTypeReference ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20710:1: ( ruleJvmArgumentTypeReference )
+            // InternalCheckCfg.g:20709:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalCheckCfg.g:20710:1: ( ruleJvmArgumentTypeReference )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20710:1: ( ruleJvmArgumentTypeReference )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20711:1: ruleJvmArgumentTypeReference
+            // InternalCheckCfg.g:20710:1: ( ruleJvmArgumentTypeReference )
+            // InternalCheckCfg.g:20711:1: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_3_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__XConstructorCall__TypeArgumentsAssignment_3_2_141703);
+            pushFollow(FOLLOW_2);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -59307,28 +59307,28 @@ public final void rule__XConstructorCall__TypeArgumentsAssignment_3_2_1() throws
 
 
     // $ANTLR start "rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20720:1: rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 : ( ( '(' ) ) ;
+    // InternalCheckCfg.g:20720:1: rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 : ( ( '(' ) ) ;
     public final void rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20724:1: ( ( ( '(' ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20725:1: ( ( '(' ) )
+            // InternalCheckCfg.g:20724:1: ( ( ( '(' ) ) )
+            // InternalCheckCfg.g:20725:1: ( ( '(' ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20725:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20726:1: ( '(' )
+            // InternalCheckCfg.g:20725:1: ( ( '(' ) )
+            // InternalCheckCfg.g:20726:1: ( '(' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getExplicitConstructorCallLeftParenthesisKeyword_4_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20727:1: ( '(' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20728:1: '('
+            // InternalCheckCfg.g:20727:1: ( '(' )
+            // InternalCheckCfg.g:20728:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getExplicitConstructorCallLeftParenthesisKeyword_4_0_0()); 
             }
-            match(input,62,FOLLOW_62_in_rule__XConstructorCall__ExplicitConstructorCallAssignment_4_041739); if (state.failed) return ;
+            match(input,62,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstructorCallAccess().getExplicitConstructorCallLeftParenthesisKeyword_4_0_0()); 
             }
@@ -59360,22 +59360,22 @@ public final void rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0(
 
 
     // $ANTLR start "rule__XConstructorCall__ArgumentsAssignment_4_1_0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20743:1: rule__XConstructorCall__ArgumentsAssignment_4_1_0 : ( ruleXShortClosure ) ;
+    // InternalCheckCfg.g:20743:1: rule__XConstructorCall__ArgumentsAssignment_4_1_0 : ( ruleXShortClosure ) ;
     public final void rule__XConstructorCall__ArgumentsAssignment_4_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20747:1: ( ( ruleXShortClosure ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20748:1: ( ruleXShortClosure )
+            // InternalCheckCfg.g:20747:1: ( ( ruleXShortClosure ) )
+            // InternalCheckCfg.g:20748:1: ( ruleXShortClosure )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20748:1: ( ruleXShortClosure )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20749:1: ruleXShortClosure
+            // InternalCheckCfg.g:20748:1: ( ruleXShortClosure )
+            // InternalCheckCfg.g:20749:1: ruleXShortClosure
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getArgumentsXShortClosureParserRuleCall_4_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXShortClosure_in_rule__XConstructorCall__ArgumentsAssignment_4_1_041778);
+            pushFollow(FOLLOW_2);
             ruleXShortClosure();
 
             state._fsp--;
@@ -59405,22 +59405,22 @@ public final void rule__XConstructorCall__ArgumentsAssignment_4_1_0() throws Rec
 
 
     // $ANTLR start "rule__XConstructorCall__ArgumentsAssignment_4_1_1_0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20758:1: rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 : ( ruleXExpression ) ;
+    // InternalCheckCfg.g:20758:1: rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 : ( ruleXExpression ) ;
     public final void rule__XConstructorCall__ArgumentsAssignment_4_1_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20762:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20763:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20762:1: ( ( ruleXExpression ) )
+            // InternalCheckCfg.g:20763:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20763:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20764:1: ruleXExpression
+            // InternalCheckCfg.g:20763:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20764:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getArgumentsXExpressionParserRuleCall_4_1_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XConstructorCall__ArgumentsAssignment_4_1_1_041809);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -59450,22 +59450,22 @@ public final void rule__XConstructorCall__ArgumentsAssignment_4_1_1_0() throws R
 
 
     // $ANTLR start "rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20773:1: rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 : ( ruleXExpression ) ;
+    // InternalCheckCfg.g:20773:1: rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 : ( ruleXExpression ) ;
     public final void rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20777:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20778:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20777:1: ( ( ruleXExpression ) )
+            // InternalCheckCfg.g:20778:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20778:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20779:1: ruleXExpression
+            // InternalCheckCfg.g:20778:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20779:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getArgumentsXExpressionParserRuleCall_4_1_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_141840);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -59495,22 +59495,22 @@ public final void rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1() throws
 
 
     // $ANTLR start "rule__XConstructorCall__ArgumentsAssignment_5"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20788:1: rule__XConstructorCall__ArgumentsAssignment_5 : ( ruleXClosure ) ;
+    // InternalCheckCfg.g:20788:1: rule__XConstructorCall__ArgumentsAssignment_5 : ( ruleXClosure ) ;
     public final void rule__XConstructorCall__ArgumentsAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20792:1: ( ( ruleXClosure ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20793:1: ( ruleXClosure )
+            // InternalCheckCfg.g:20792:1: ( ( ruleXClosure ) )
+            // InternalCheckCfg.g:20793:1: ( ruleXClosure )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20793:1: ( ruleXClosure )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20794:1: ruleXClosure
+            // InternalCheckCfg.g:20793:1: ( ruleXClosure )
+            // InternalCheckCfg.g:20794:1: ruleXClosure
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getArgumentsXClosureParserRuleCall_5_0()); 
             }
-            pushFollow(FOLLOW_ruleXClosure_in_rule__XConstructorCall__ArgumentsAssignment_541871);
+            pushFollow(FOLLOW_2);
             ruleXClosure();
 
             state._fsp--;
@@ -59540,28 +59540,28 @@ public final void rule__XConstructorCall__ArgumentsAssignment_5() throws Recogni
 
 
     // $ANTLR start "rule__XBooleanLiteral__IsTrueAssignment_1_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20803:1: rule__XBooleanLiteral__IsTrueAssignment_1_1 : ( ( 'true' ) ) ;
+    // InternalCheckCfg.g:20803:1: rule__XBooleanLiteral__IsTrueAssignment_1_1 : ( ( 'true' ) ) ;
     public final void rule__XBooleanLiteral__IsTrueAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20807:1: ( ( ( 'true' ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20808:1: ( ( 'true' ) )
+            // InternalCheckCfg.g:20807:1: ( ( ( 'true' ) ) )
+            // InternalCheckCfg.g:20808:1: ( ( 'true' ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20808:1: ( ( 'true' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20809:1: ( 'true' )
+            // InternalCheckCfg.g:20808:1: ( ( 'true' ) )
+            // InternalCheckCfg.g:20809:1: ( 'true' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20810:1: ( 'true' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20811:1: 'true'
+            // InternalCheckCfg.g:20810:1: ( 'true' )
+            // InternalCheckCfg.g:20811:1: 'true'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); 
             }
-            match(input,93,FOLLOW_93_in_rule__XBooleanLiteral__IsTrueAssignment_1_141907); if (state.failed) return ;
+            match(input,93,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); 
             }
@@ -59593,22 +59593,22 @@ public final void rule__XBooleanLiteral__IsTrueAssignment_1_1() throws Recogniti
 
 
     // $ANTLR start "rule__XNumberLiteral__ValueAssignment_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20826:1: rule__XNumberLiteral__ValueAssignment_1 : ( ruleNumber ) ;
+    // InternalCheckCfg.g:20826:1: rule__XNumberLiteral__ValueAssignment_1 : ( ruleNumber ) ;
     public final void rule__XNumberLiteral__ValueAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20830:1: ( ( ruleNumber ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20831:1: ( ruleNumber )
+            // InternalCheckCfg.g:20830:1: ( ( ruleNumber ) )
+            // InternalCheckCfg.g:20831:1: ( ruleNumber )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20831:1: ( ruleNumber )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20832:1: ruleNumber
+            // InternalCheckCfg.g:20831:1: ( ruleNumber )
+            // InternalCheckCfg.g:20832:1: ruleNumber
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNumberLiteralAccess().getValueNumberParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleNumber_in_rule__XNumberLiteral__ValueAssignment_141946);
+            pushFollow(FOLLOW_2);
             ruleNumber();
 
             state._fsp--;
@@ -59638,22 +59638,22 @@ public final void rule__XNumberLiteral__ValueAssignment_1() throws RecognitionEx
 
 
     // $ANTLR start "rule__XStringLiteral__ValueAssignment_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20841:1: rule__XStringLiteral__ValueAssignment_1 : ( RULE_STRING ) ;
+    // InternalCheckCfg.g:20841:1: rule__XStringLiteral__ValueAssignment_1 : ( RULE_STRING ) ;
     public final void rule__XStringLiteral__ValueAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20845:1: ( ( RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20846:1: ( RULE_STRING )
+            // InternalCheckCfg.g:20845:1: ( ( RULE_STRING ) )
+            // InternalCheckCfg.g:20846:1: ( RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20846:1: ( RULE_STRING )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20847:1: RULE_STRING
+            // InternalCheckCfg.g:20846:1: ( RULE_STRING )
+            // InternalCheckCfg.g:20847:1: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXStringLiteralAccess().getValueSTRINGTerminalRuleCall_1_0()); 
             }
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__XStringLiteral__ValueAssignment_141977); if (state.failed) return ;
+            match(input,RULE_STRING,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXStringLiteralAccess().getValueSTRINGTerminalRuleCall_1_0()); 
             }
@@ -59679,28 +59679,28 @@ public final void rule__XStringLiteral__ValueAssignment_1() throws RecognitionEx
 
 
     // $ANTLR start "rule__XTypeLiteral__TypeAssignment_3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20856:1: rule__XTypeLiteral__TypeAssignment_3 : ( ( ruleQualifiedName ) ) ;
+    // InternalCheckCfg.g:20856:1: rule__XTypeLiteral__TypeAssignment_3 : ( ( ruleQualifiedName ) ) ;
     public final void rule__XTypeLiteral__TypeAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20860:1: ( ( ( ruleQualifiedName ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20861:1: ( ( ruleQualifiedName ) )
+            // InternalCheckCfg.g:20860:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalCheckCfg.g:20861:1: ( ( ruleQualifiedName ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20861:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20862:1: ( ruleQualifiedName )
+            // InternalCheckCfg.g:20861:1: ( ( ruleQualifiedName ) )
+            // InternalCheckCfg.g:20862:1: ( ruleQualifiedName )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getTypeJvmTypeCrossReference_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20863:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20864:1: ruleQualifiedName
+            // InternalCheckCfg.g:20863:1: ( ruleQualifiedName )
+            // InternalCheckCfg.g:20864:1: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getTypeJvmTypeQualifiedNameParserRuleCall_3_0_1()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_rule__XTypeLiteral__TypeAssignment_342012);
+            pushFollow(FOLLOW_2);
             ruleQualifiedName();
 
             state._fsp--;
@@ -59736,22 +59736,22 @@ public final void rule__XTypeLiteral__TypeAssignment_3() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XTypeLiteral__ArrayDimensionsAssignment_4"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20875:1: rule__XTypeLiteral__ArrayDimensionsAssignment_4 : ( ruleArrayBrackets ) ;
+    // InternalCheckCfg.g:20875:1: rule__XTypeLiteral__ArrayDimensionsAssignment_4 : ( ruleArrayBrackets ) ;
     public final void rule__XTypeLiteral__ArrayDimensionsAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20879:1: ( ( ruleArrayBrackets ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20880:1: ( ruleArrayBrackets )
+            // InternalCheckCfg.g:20879:1: ( ( ruleArrayBrackets ) )
+            // InternalCheckCfg.g:20880:1: ( ruleArrayBrackets )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20880:1: ( ruleArrayBrackets )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20881:1: ruleArrayBrackets
+            // InternalCheckCfg.g:20880:1: ( ruleArrayBrackets )
+            // InternalCheckCfg.g:20881:1: ruleArrayBrackets
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getArrayDimensionsArrayBracketsParserRuleCall_4_0()); 
             }
-            pushFollow(FOLLOW_ruleArrayBrackets_in_rule__XTypeLiteral__ArrayDimensionsAssignment_442047);
+            pushFollow(FOLLOW_2);
             ruleArrayBrackets();
 
             state._fsp--;
@@ -59781,22 +59781,22 @@ public final void rule__XTypeLiteral__ArrayDimensionsAssignment_4() throws Recog
 
 
     // $ANTLR start "rule__XThrowExpression__ExpressionAssignment_2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20890:1: rule__XThrowExpression__ExpressionAssignment_2 : ( ruleXExpression ) ;
+    // InternalCheckCfg.g:20890:1: rule__XThrowExpression__ExpressionAssignment_2 : ( ruleXExpression ) ;
     public final void rule__XThrowExpression__ExpressionAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20894:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20895:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20894:1: ( ( ruleXExpression ) )
+            // InternalCheckCfg.g:20895:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20895:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20896:1: ruleXExpression
+            // InternalCheckCfg.g:20895:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20896:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXThrowExpressionAccess().getExpressionXExpressionParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XThrowExpression__ExpressionAssignment_242078);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -59826,22 +59826,22 @@ public final void rule__XThrowExpression__ExpressionAssignment_2() throws Recogn
 
 
     // $ANTLR start "rule__XReturnExpression__ExpressionAssignment_2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20905:1: rule__XReturnExpression__ExpressionAssignment_2 : ( ruleXExpression ) ;
+    // InternalCheckCfg.g:20905:1: rule__XReturnExpression__ExpressionAssignment_2 : ( ruleXExpression ) ;
     public final void rule__XReturnExpression__ExpressionAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20909:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20910:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20909:1: ( ( ruleXExpression ) )
+            // InternalCheckCfg.g:20910:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20910:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20911:1: ruleXExpression
+            // InternalCheckCfg.g:20910:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20911:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXReturnExpressionAccess().getExpressionXExpressionParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XReturnExpression__ExpressionAssignment_242109);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -59871,22 +59871,22 @@ public final void rule__XReturnExpression__ExpressionAssignment_2() throws Recog
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__ExpressionAssignment_2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20920:1: rule__XTryCatchFinallyExpression__ExpressionAssignment_2 : ( ruleXExpression ) ;
+    // InternalCheckCfg.g:20920:1: rule__XTryCatchFinallyExpression__ExpressionAssignment_2 : ( ruleXExpression ) ;
     public final void rule__XTryCatchFinallyExpression__ExpressionAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20924:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20925:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20924:1: ( ( ruleXExpression ) )
+            // InternalCheckCfg.g:20925:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20925:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20926:1: ruleXExpression
+            // InternalCheckCfg.g:20925:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20926:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getExpressionXExpressionParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XTryCatchFinallyExpression__ExpressionAssignment_242140);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -59916,22 +59916,22 @@ public final void rule__XTryCatchFinallyExpression__ExpressionAssignment_2() thr
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20935:1: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 : ( ruleXCatchClause ) ;
+    // InternalCheckCfg.g:20935:1: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 : ( ruleXCatchClause ) ;
     public final void rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20939:1: ( ( ruleXCatchClause ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20940:1: ( ruleXCatchClause )
+            // InternalCheckCfg.g:20939:1: ( ( ruleXCatchClause ) )
+            // InternalCheckCfg.g:20940:1: ( ruleXCatchClause )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20940:1: ( ruleXCatchClause )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20941:1: ruleXCatchClause
+            // InternalCheckCfg.g:20940:1: ( ruleXCatchClause )
+            // InternalCheckCfg.g:20941:1: ruleXCatchClause
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getCatchClausesXCatchClauseParserRuleCall_3_0_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXCatchClause_in_rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_042171);
+            pushFollow(FOLLOW_2);
             ruleXCatchClause();
 
             state._fsp--;
@@ -59961,22 +59961,22 @@ public final void rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20950:1: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 : ( ruleXExpression ) ;
+    // InternalCheckCfg.g:20950:1: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 : ( ruleXExpression ) ;
     public final void rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20954:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20955:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20954:1: ( ( ruleXExpression ) )
+            // InternalCheckCfg.g:20955:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20955:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20956:1: ruleXExpression
+            // InternalCheckCfg.g:20955:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20956:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyExpressionXExpressionParserRuleCall_3_0_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_142202);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -60006,22 +60006,22 @@ public final void rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20965:1: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 : ( ruleXExpression ) ;
+    // InternalCheckCfg.g:20965:1: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 : ( ruleXExpression ) ;
     public final void rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20969:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20970:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20969:1: ( ( ruleXExpression ) )
+            // InternalCheckCfg.g:20970:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20970:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20971:1: ruleXExpression
+            // InternalCheckCfg.g:20970:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20971:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyExpressionXExpressionParserRuleCall_3_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_142233);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -60051,22 +60051,22 @@ public final void rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_
 
 
     // $ANTLR start "rule__XSynchronizedExpression__ParamAssignment_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20980:1: rule__XSynchronizedExpression__ParamAssignment_1 : ( ruleXExpression ) ;
+    // InternalCheckCfg.g:20980:1: rule__XSynchronizedExpression__ParamAssignment_1 : ( ruleXExpression ) ;
     public final void rule__XSynchronizedExpression__ParamAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20984:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20985:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20984:1: ( ( ruleXExpression ) )
+            // InternalCheckCfg.g:20985:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20985:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20986:1: ruleXExpression
+            // InternalCheckCfg.g:20985:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20986:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getParamXExpressionParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XSynchronizedExpression__ParamAssignment_142264);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -60096,22 +60096,22 @@ public final void rule__XSynchronizedExpression__ParamAssignment_1() throws Reco
 
 
     // $ANTLR start "rule__XSynchronizedExpression__ExpressionAssignment_3"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20995:1: rule__XSynchronizedExpression__ExpressionAssignment_3 : ( ruleXExpression ) ;
+    // InternalCheckCfg.g:20995:1: rule__XSynchronizedExpression__ExpressionAssignment_3 : ( ruleXExpression ) ;
     public final void rule__XSynchronizedExpression__ExpressionAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:20999:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21000:1: ( ruleXExpression )
+            // InternalCheckCfg.g:20999:1: ( ( ruleXExpression ) )
+            // InternalCheckCfg.g:21000:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21000:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21001:1: ruleXExpression
+            // InternalCheckCfg.g:21000:1: ( ruleXExpression )
+            // InternalCheckCfg.g:21001:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getExpressionXExpressionParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XSynchronizedExpression__ExpressionAssignment_342295);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -60141,22 +60141,22 @@ public final void rule__XSynchronizedExpression__ExpressionAssignment_3() throws
 
 
     // $ANTLR start "rule__XCatchClause__DeclaredParamAssignment_2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21010:1: rule__XCatchClause__DeclaredParamAssignment_2 : ( ruleFullJvmFormalParameter ) ;
+    // InternalCheckCfg.g:21010:1: rule__XCatchClause__DeclaredParamAssignment_2 : ( ruleFullJvmFormalParameter ) ;
     public final void rule__XCatchClause__DeclaredParamAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21014:1: ( ( ruleFullJvmFormalParameter ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21015:1: ( ruleFullJvmFormalParameter )
+            // InternalCheckCfg.g:21014:1: ( ( ruleFullJvmFormalParameter ) )
+            // InternalCheckCfg.g:21015:1: ( ruleFullJvmFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21015:1: ( ruleFullJvmFormalParameter )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21016:1: ruleFullJvmFormalParameter
+            // InternalCheckCfg.g:21015:1: ( ruleFullJvmFormalParameter )
+            // InternalCheckCfg.g:21016:1: ruleFullJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getDeclaredParamFullJvmFormalParameterParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleFullJvmFormalParameter_in_rule__XCatchClause__DeclaredParamAssignment_242326);
+            pushFollow(FOLLOW_2);
             ruleFullJvmFormalParameter();
 
             state._fsp--;
@@ -60186,22 +60186,22 @@ public final void rule__XCatchClause__DeclaredParamAssignment_2() throws Recogni
 
 
     // $ANTLR start "rule__XCatchClause__ExpressionAssignment_4"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21025:1: rule__XCatchClause__ExpressionAssignment_4 : ( ruleXExpression ) ;
+    // InternalCheckCfg.g:21025:1: rule__XCatchClause__ExpressionAssignment_4 : ( ruleXExpression ) ;
     public final void rule__XCatchClause__ExpressionAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21029:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21030:1: ( ruleXExpression )
+            // InternalCheckCfg.g:21029:1: ( ( ruleXExpression ) )
+            // InternalCheckCfg.g:21030:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21030:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21031:1: ruleXExpression
+            // InternalCheckCfg.g:21030:1: ( ruleXExpression )
+            // InternalCheckCfg.g:21031:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getExpressionXExpressionParserRuleCall_4_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XCatchClause__ExpressionAssignment_442357);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -60231,22 +60231,22 @@ public final void rule__XCatchClause__ExpressionAssignment_4() throws Recognitio
 
 
     // $ANTLR start "rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21040:1: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 : ( ruleJvmTypeReference ) ;
+    // InternalCheckCfg.g:21040:1: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 : ( ruleJvmTypeReference ) ;
     public final void rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21044:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21045:1: ( ruleJvmTypeReference )
+            // InternalCheckCfg.g:21044:1: ( ( ruleJvmTypeReference ) )
+            // InternalCheckCfg.g:21045:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21045:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21046:1: ruleJvmTypeReference
+            // InternalCheckCfg.g:21045:1: ( ruleJvmTypeReference )
+            // InternalCheckCfg.g:21046:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getParamTypesJvmTypeReferenceParserRuleCall_0_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__XFunctionTypeRef__ParamTypesAssignment_0_1_042388);
+            pushFollow(FOLLOW_2);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -60276,22 +60276,22 @@ public final void rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0() throws Re
 
 
     // $ANTLR start "rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21055:1: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 : ( ruleJvmTypeReference ) ;
+    // InternalCheckCfg.g:21055:1: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 : ( ruleJvmTypeReference ) ;
     public final void rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21059:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21060:1: ( ruleJvmTypeReference )
+            // InternalCheckCfg.g:21059:1: ( ( ruleJvmTypeReference ) )
+            // InternalCheckCfg.g:21060:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21060:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21061:1: ruleJvmTypeReference
+            // InternalCheckCfg.g:21060:1: ( ruleJvmTypeReference )
+            // InternalCheckCfg.g:21061:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getParamTypesJvmTypeReferenceParserRuleCall_0_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_142419);
+            pushFollow(FOLLOW_2);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -60321,22 +60321,22 @@ public final void rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1() throws
 
 
     // $ANTLR start "rule__XFunctionTypeRef__ReturnTypeAssignment_2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21070:1: rule__XFunctionTypeRef__ReturnTypeAssignment_2 : ( ruleJvmTypeReference ) ;
+    // InternalCheckCfg.g:21070:1: rule__XFunctionTypeRef__ReturnTypeAssignment_2 : ( ruleJvmTypeReference ) ;
     public final void rule__XFunctionTypeRef__ReturnTypeAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21074:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21075:1: ( ruleJvmTypeReference )
+            // InternalCheckCfg.g:21074:1: ( ( ruleJvmTypeReference ) )
+            // InternalCheckCfg.g:21075:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21075:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21076:1: ruleJvmTypeReference
+            // InternalCheckCfg.g:21075:1: ( ruleJvmTypeReference )
+            // InternalCheckCfg.g:21076:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getReturnTypeJvmTypeReferenceParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__XFunctionTypeRef__ReturnTypeAssignment_242450);
+            pushFollow(FOLLOW_2);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -60366,28 +60366,28 @@ public final void rule__XFunctionTypeRef__ReturnTypeAssignment_2() throws Recogn
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__TypeAssignment_0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21085:1: rule__JvmParameterizedTypeReference__TypeAssignment_0 : ( ( ruleQualifiedName ) ) ;
+    // InternalCheckCfg.g:21085:1: rule__JvmParameterizedTypeReference__TypeAssignment_0 : ( ( ruleQualifiedName ) ) ;
     public final void rule__JvmParameterizedTypeReference__TypeAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21089:1: ( ( ( ruleQualifiedName ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21090:1: ( ( ruleQualifiedName ) )
+            // InternalCheckCfg.g:21089:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalCheckCfg.g:21090:1: ( ( ruleQualifiedName ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21090:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21091:1: ( ruleQualifiedName )
+            // InternalCheckCfg.g:21090:1: ( ( ruleQualifiedName ) )
+            // InternalCheckCfg.g:21091:1: ( ruleQualifiedName )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeJvmTypeCrossReference_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21092:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21093:1: ruleQualifiedName
+            // InternalCheckCfg.g:21092:1: ( ruleQualifiedName )
+            // InternalCheckCfg.g:21093:1: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeJvmTypeQualifiedNameParserRuleCall_0_0_1()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_rule__JvmParameterizedTypeReference__TypeAssignment_042485);
+            pushFollow(FOLLOW_2);
             ruleQualifiedName();
 
             state._fsp--;
@@ -60423,22 +60423,22 @@ public final void rule__JvmParameterizedTypeReference__TypeAssignment_0() throws
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21104:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalCheckCfg.g:21104:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21108:1: ( ( ruleJvmArgumentTypeReference ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21109:1: ( ruleJvmArgumentTypeReference )
+            // InternalCheckCfg.g:21108:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalCheckCfg.g:21109:1: ( ruleJvmArgumentTypeReference )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21109:1: ( ruleJvmArgumentTypeReference )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21110:1: ruleJvmArgumentTypeReference
+            // InternalCheckCfg.g:21109:1: ( ruleJvmArgumentTypeReference )
+            // InternalCheckCfg.g:21110:1: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_142520);
+            pushFollow(FOLLOW_2);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -60468,22 +60468,22 @@ public final void rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1()
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21119:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalCheckCfg.g:21119:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21123:1: ( ( ruleJvmArgumentTypeReference ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21124:1: ( ruleJvmArgumentTypeReference )
+            // InternalCheckCfg.g:21123:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalCheckCfg.g:21124:1: ( ruleJvmArgumentTypeReference )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21124:1: ( ruleJvmArgumentTypeReference )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21125:1: ruleJvmArgumentTypeReference
+            // InternalCheckCfg.g:21124:1: ( ruleJvmArgumentTypeReference )
+            // InternalCheckCfg.g:21125:1: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_142551);
+            pushFollow(FOLLOW_2);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -60513,28 +60513,28 @@ public final void rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21134:1: rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 : ( ( ruleValidID ) ) ;
+    // InternalCheckCfg.g:21134:1: rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 : ( ( ruleValidID ) ) ;
     public final void rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21138:1: ( ( ( ruleValidID ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21139:1: ( ( ruleValidID ) )
+            // InternalCheckCfg.g:21138:1: ( ( ( ruleValidID ) ) )
+            // InternalCheckCfg.g:21139:1: ( ( ruleValidID ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21139:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21140:1: ( ruleValidID )
+            // InternalCheckCfg.g:21139:1: ( ( ruleValidID ) )
+            // InternalCheckCfg.g:21140:1: ( ruleValidID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeJvmTypeCrossReference_1_4_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21141:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21142:1: ruleValidID
+            // InternalCheckCfg.g:21141:1: ( ruleValidID )
+            // InternalCheckCfg.g:21142:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeJvmTypeValidIDParserRuleCall_1_4_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__JvmParameterizedTypeReference__TypeAssignment_1_4_142586);
+            pushFollow(FOLLOW_2);
             ruleValidID();
 
             state._fsp--;
@@ -60570,22 +60570,22 @@ public final void rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1() th
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21153:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalCheckCfg.g:21153:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21157:1: ( ( ruleJvmArgumentTypeReference ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21158:1: ( ruleJvmArgumentTypeReference )
+            // InternalCheckCfg.g:21157:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalCheckCfg.g:21158:1: ( ruleJvmArgumentTypeReference )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21158:1: ( ruleJvmArgumentTypeReference )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21159:1: ruleJvmArgumentTypeReference
+            // InternalCheckCfg.g:21158:1: ( ruleJvmArgumentTypeReference )
+            // InternalCheckCfg.g:21159:1: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_4_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_142621);
+            pushFollow(FOLLOW_2);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -60615,22 +60615,22 @@ public final void rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21168:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalCheckCfg.g:21168:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21172:1: ( ( ruleJvmArgumentTypeReference ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21173:1: ( ruleJvmArgumentTypeReference )
+            // InternalCheckCfg.g:21172:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalCheckCfg.g:21173:1: ( ruleJvmArgumentTypeReference )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21173:1: ( ruleJvmArgumentTypeReference )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21174:1: ruleJvmArgumentTypeReference
+            // InternalCheckCfg.g:21173:1: ( ruleJvmArgumentTypeReference )
+            // InternalCheckCfg.g:21174:1: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_4_2_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_142652);
+            pushFollow(FOLLOW_2);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -60660,22 +60660,22 @@ public final void rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21183:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 : ( ruleJvmUpperBound ) ;
+    // InternalCheckCfg.g:21183:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 : ( ruleJvmUpperBound ) ;
     public final void rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21187:1: ( ( ruleJvmUpperBound ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21188:1: ( ruleJvmUpperBound )
+            // InternalCheckCfg.g:21187:1: ( ( ruleJvmUpperBound ) )
+            // InternalCheckCfg.g:21188:1: ( ruleJvmUpperBound )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21188:1: ( ruleJvmUpperBound )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21189:1: ruleJvmUpperBound
+            // InternalCheckCfg.g:21188:1: ( ruleJvmUpperBound )
+            // InternalCheckCfg.g:21189:1: ruleJvmUpperBound
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmUpperBoundParserRuleCall_2_0_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmUpperBound_in_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_042683);
+            pushFollow(FOLLOW_2);
             ruleJvmUpperBound();
 
             state._fsp--;
@@ -60705,22 +60705,22 @@ public final void rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0()
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21198:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 : ( ruleJvmUpperBoundAnded ) ;
+    // InternalCheckCfg.g:21198:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 : ( ruleJvmUpperBoundAnded ) ;
     public final void rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21202:1: ( ( ruleJvmUpperBoundAnded ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21203:1: ( ruleJvmUpperBoundAnded )
+            // InternalCheckCfg.g:21202:1: ( ( ruleJvmUpperBoundAnded ) )
+            // InternalCheckCfg.g:21203:1: ( ruleJvmUpperBoundAnded )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21203:1: ( ruleJvmUpperBoundAnded )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21204:1: ruleJvmUpperBoundAnded
+            // InternalCheckCfg.g:21203:1: ( ruleJvmUpperBoundAnded )
+            // InternalCheckCfg.g:21204:1: ruleJvmUpperBoundAnded
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmUpperBoundAndedParserRuleCall_2_0_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmUpperBoundAnded_in_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_142714);
+            pushFollow(FOLLOW_2);
             ruleJvmUpperBoundAnded();
 
             state._fsp--;
@@ -60750,22 +60750,22 @@ public final void rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1()
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21213:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 : ( ruleJvmLowerBound ) ;
+    // InternalCheckCfg.g:21213:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 : ( ruleJvmLowerBound ) ;
     public final void rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21217:1: ( ( ruleJvmLowerBound ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21218:1: ( ruleJvmLowerBound )
+            // InternalCheckCfg.g:21217:1: ( ( ruleJvmLowerBound ) )
+            // InternalCheckCfg.g:21218:1: ( ruleJvmLowerBound )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21218:1: ( ruleJvmLowerBound )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21219:1: ruleJvmLowerBound
+            // InternalCheckCfg.g:21218:1: ( ruleJvmLowerBound )
+            // InternalCheckCfg.g:21219:1: ruleJvmLowerBound
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmLowerBoundParserRuleCall_2_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmLowerBound_in_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_042745);
+            pushFollow(FOLLOW_2);
             ruleJvmLowerBound();
 
             state._fsp--;
@@ -60795,22 +60795,22 @@ public final void rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0()
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21228:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 : ( ruleJvmLowerBoundAnded ) ;
+    // InternalCheckCfg.g:21228:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 : ( ruleJvmLowerBoundAnded ) ;
     public final void rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21232:1: ( ( ruleJvmLowerBoundAnded ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21233:1: ( ruleJvmLowerBoundAnded )
+            // InternalCheckCfg.g:21232:1: ( ( ruleJvmLowerBoundAnded ) )
+            // InternalCheckCfg.g:21233:1: ( ruleJvmLowerBoundAnded )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21233:1: ( ruleJvmLowerBoundAnded )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21234:1: ruleJvmLowerBoundAnded
+            // InternalCheckCfg.g:21233:1: ( ruleJvmLowerBoundAnded )
+            // InternalCheckCfg.g:21234:1: ruleJvmLowerBoundAnded
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmLowerBoundAndedParserRuleCall_2_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmLowerBoundAnded_in_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_142776);
+            pushFollow(FOLLOW_2);
             ruleJvmLowerBoundAnded();
 
             state._fsp--;
@@ -60840,22 +60840,22 @@ public final void rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1()
 
 
     // $ANTLR start "rule__JvmUpperBound__TypeReferenceAssignment_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21243:1: rule__JvmUpperBound__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
+    // InternalCheckCfg.g:21243:1: rule__JvmUpperBound__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
     public final void rule__JvmUpperBound__TypeReferenceAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21247:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21248:1: ( ruleJvmTypeReference )
+            // InternalCheckCfg.g:21247:1: ( ( ruleJvmTypeReference ) )
+            // InternalCheckCfg.g:21248:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21248:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21249:1: ruleJvmTypeReference
+            // InternalCheckCfg.g:21248:1: ( ruleJvmTypeReference )
+            // InternalCheckCfg.g:21249:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAccess().getTypeReferenceJvmTypeReferenceParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__JvmUpperBound__TypeReferenceAssignment_142807);
+            pushFollow(FOLLOW_2);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -60885,22 +60885,22 @@ public final void rule__JvmUpperBound__TypeReferenceAssignment_1() throws Recogn
 
 
     // $ANTLR start "rule__JvmUpperBoundAnded__TypeReferenceAssignment_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21258:1: rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
+    // InternalCheckCfg.g:21258:1: rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
     public final void rule__JvmUpperBoundAnded__TypeReferenceAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21262:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21263:1: ( ruleJvmTypeReference )
+            // InternalCheckCfg.g:21262:1: ( ( ruleJvmTypeReference ) )
+            // InternalCheckCfg.g:21263:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21263:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21264:1: ruleJvmTypeReference
+            // InternalCheckCfg.g:21263:1: ( ruleJvmTypeReference )
+            // InternalCheckCfg.g:21264:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAndedAccess().getTypeReferenceJvmTypeReferenceParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__JvmUpperBoundAnded__TypeReferenceAssignment_142838);
+            pushFollow(FOLLOW_2);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -60930,22 +60930,22 @@ public final void rule__JvmUpperBoundAnded__TypeReferenceAssignment_1() throws R
 
 
     // $ANTLR start "rule__JvmLowerBound__TypeReferenceAssignment_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21273:1: rule__JvmLowerBound__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
+    // InternalCheckCfg.g:21273:1: rule__JvmLowerBound__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
     public final void rule__JvmLowerBound__TypeReferenceAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21277:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21278:1: ( ruleJvmTypeReference )
+            // InternalCheckCfg.g:21277:1: ( ( ruleJvmTypeReference ) )
+            // InternalCheckCfg.g:21278:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21278:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21279:1: ruleJvmTypeReference
+            // InternalCheckCfg.g:21278:1: ( ruleJvmTypeReference )
+            // InternalCheckCfg.g:21279:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAccess().getTypeReferenceJvmTypeReferenceParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__JvmLowerBound__TypeReferenceAssignment_142869);
+            pushFollow(FOLLOW_2);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -60975,22 +60975,22 @@ public final void rule__JvmLowerBound__TypeReferenceAssignment_1() throws Recogn
 
 
     // $ANTLR start "rule__JvmLowerBoundAnded__TypeReferenceAssignment_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21288:1: rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
+    // InternalCheckCfg.g:21288:1: rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
     public final void rule__JvmLowerBoundAnded__TypeReferenceAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21292:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21293:1: ( ruleJvmTypeReference )
+            // InternalCheckCfg.g:21292:1: ( ( ruleJvmTypeReference ) )
+            // InternalCheckCfg.g:21293:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21293:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21294:1: ruleJvmTypeReference
+            // InternalCheckCfg.g:21293:1: ( ruleJvmTypeReference )
+            // InternalCheckCfg.g:21294:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAndedAccess().getTypeReferenceJvmTypeReferenceParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__JvmLowerBoundAnded__TypeReferenceAssignment_142900);
+            pushFollow(FOLLOW_2);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -61020,28 +61020,28 @@ public final void rule__JvmLowerBoundAnded__TypeReferenceAssignment_1() throws R
 
 
     // $ANTLR start "rule__XImportDeclaration__StaticAssignment_1_0_0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21307:1: rule__XImportDeclaration__StaticAssignment_1_0_0 : ( ( 'static' ) ) ;
+    // InternalCheckCfg.g:21307:1: rule__XImportDeclaration__StaticAssignment_1_0_0 : ( ( 'static' ) ) ;
     public final void rule__XImportDeclaration__StaticAssignment_1_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21311:1: ( ( ( 'static' ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21312:1: ( ( 'static' ) )
+            // InternalCheckCfg.g:21311:1: ( ( ( 'static' ) ) )
+            // InternalCheckCfg.g:21312:1: ( ( 'static' ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21312:1: ( ( 'static' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21313:1: ( 'static' )
+            // InternalCheckCfg.g:21312:1: ( ( 'static' ) )
+            // InternalCheckCfg.g:21313:1: ( 'static' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getStaticStaticKeyword_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21314:1: ( 'static' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21315:1: 'static'
+            // InternalCheckCfg.g:21314:1: ( 'static' )
+            // InternalCheckCfg.g:21315:1: 'static'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getStaticStaticKeyword_1_0_0_0()); 
             }
-            match(input,46,FOLLOW_46_in_rule__XImportDeclaration__StaticAssignment_1_0_042940); if (state.failed) return ;
+            match(input,46,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXImportDeclarationAccess().getStaticStaticKeyword_1_0_0_0()); 
             }
@@ -61073,28 +61073,28 @@ public final void rule__XImportDeclaration__StaticAssignment_1_0_0() throws Reco
 
 
     // $ANTLR start "rule__XImportDeclaration__ExtensionAssignment_1_0_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21330:1: rule__XImportDeclaration__ExtensionAssignment_1_0_1 : ( ( 'extension' ) ) ;
+    // InternalCheckCfg.g:21330:1: rule__XImportDeclaration__ExtensionAssignment_1_0_1 : ( ( 'extension' ) ) ;
     public final void rule__XImportDeclaration__ExtensionAssignment_1_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21334:1: ( ( ( 'extension' ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21335:1: ( ( 'extension' ) )
+            // InternalCheckCfg.g:21334:1: ( ( ( 'extension' ) ) )
+            // InternalCheckCfg.g:21335:1: ( ( 'extension' ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21335:1: ( ( 'extension' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21336:1: ( 'extension' )
+            // InternalCheckCfg.g:21335:1: ( ( 'extension' ) )
+            // InternalCheckCfg.g:21336:1: ( 'extension' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getExtensionExtensionKeyword_1_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21337:1: ( 'extension' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21338:1: 'extension'
+            // InternalCheckCfg.g:21337:1: ( 'extension' )
+            // InternalCheckCfg.g:21338:1: 'extension'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getExtensionExtensionKeyword_1_0_1_0()); 
             }
-            match(input,48,FOLLOW_48_in_rule__XImportDeclaration__ExtensionAssignment_1_0_142984); if (state.failed) return ;
+            match(input,48,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXImportDeclarationAccess().getExtensionExtensionKeyword_1_0_1_0()); 
             }
@@ -61126,28 +61126,28 @@ public final void rule__XImportDeclaration__ExtensionAssignment_1_0_1() throws R
 
 
     // $ANTLR start "rule__XImportDeclaration__ImportedTypeAssignment_1_0_2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21353:1: rule__XImportDeclaration__ImportedTypeAssignment_1_0_2 : ( ( ruleQualifiedNameInStaticImport ) ) ;
+    // InternalCheckCfg.g:21353:1: rule__XImportDeclaration__ImportedTypeAssignment_1_0_2 : ( ( ruleQualifiedNameInStaticImport ) ) ;
     public final void rule__XImportDeclaration__ImportedTypeAssignment_1_0_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21357:1: ( ( ( ruleQualifiedNameInStaticImport ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21358:1: ( ( ruleQualifiedNameInStaticImport ) )
+            // InternalCheckCfg.g:21357:1: ( ( ( ruleQualifiedNameInStaticImport ) ) )
+            // InternalCheckCfg.g:21358:1: ( ( ruleQualifiedNameInStaticImport ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21358:1: ( ( ruleQualifiedNameInStaticImport ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21359:1: ( ruleQualifiedNameInStaticImport )
+            // InternalCheckCfg.g:21358:1: ( ( ruleQualifiedNameInStaticImport ) )
+            // InternalCheckCfg.g:21359:1: ( ruleQualifiedNameInStaticImport )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getImportedTypeJvmDeclaredTypeCrossReference_1_0_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21360:1: ( ruleQualifiedNameInStaticImport )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21361:1: ruleQualifiedNameInStaticImport
+            // InternalCheckCfg.g:21360:1: ( ruleQualifiedNameInStaticImport )
+            // InternalCheckCfg.g:21361:1: ruleQualifiedNameInStaticImport
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getImportedTypeJvmDeclaredTypeQualifiedNameInStaticImportParserRuleCall_1_0_2_0_1()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedNameInStaticImport_in_rule__XImportDeclaration__ImportedTypeAssignment_1_0_243027);
+            pushFollow(FOLLOW_2);
             ruleQualifiedNameInStaticImport();
 
             state._fsp--;
@@ -61183,28 +61183,28 @@ public final void rule__XImportDeclaration__ImportedTypeAssignment_1_0_2() throw
 
 
     // $ANTLR start "rule__XImportDeclaration__WildcardAssignment_1_0_3_0"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21372:1: rule__XImportDeclaration__WildcardAssignment_1_0_3_0 : ( ( '*' ) ) ;
+    // InternalCheckCfg.g:21372:1: rule__XImportDeclaration__WildcardAssignment_1_0_3_0 : ( ( '*' ) ) ;
     public final void rule__XImportDeclaration__WildcardAssignment_1_0_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21376:1: ( ( ( '*' ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21377:1: ( ( '*' ) )
+            // InternalCheckCfg.g:21376:1: ( ( ( '*' ) ) )
+            // InternalCheckCfg.g:21377:1: ( ( '*' ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21377:1: ( ( '*' ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21378:1: ( '*' )
+            // InternalCheckCfg.g:21377:1: ( ( '*' ) )
+            // InternalCheckCfg.g:21378:1: ( '*' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getWildcardAsteriskKeyword_1_0_3_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21379:1: ( '*' )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21380:1: '*'
+            // InternalCheckCfg.g:21379:1: ( '*' )
+            // InternalCheckCfg.g:21380:1: '*'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getWildcardAsteriskKeyword_1_0_3_0_0()); 
             }
-            match(input,36,FOLLOW_36_in_rule__XImportDeclaration__WildcardAssignment_1_0_3_043067); if (state.failed) return ;
+            match(input,36,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXImportDeclarationAccess().getWildcardAsteriskKeyword_1_0_3_0_0()); 
             }
@@ -61236,22 +61236,22 @@ public final void rule__XImportDeclaration__WildcardAssignment_1_0_3_0() throws
 
 
     // $ANTLR start "rule__XImportDeclaration__MemberNameAssignment_1_0_3_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21395:1: rule__XImportDeclaration__MemberNameAssignment_1_0_3_1 : ( ruleValidID ) ;
+    // InternalCheckCfg.g:21395:1: rule__XImportDeclaration__MemberNameAssignment_1_0_3_1 : ( ruleValidID ) ;
     public final void rule__XImportDeclaration__MemberNameAssignment_1_0_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21399:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21400:1: ( ruleValidID )
+            // InternalCheckCfg.g:21399:1: ( ( ruleValidID ) )
+            // InternalCheckCfg.g:21400:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21400:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21401:1: ruleValidID
+            // InternalCheckCfg.g:21400:1: ( ruleValidID )
+            // InternalCheckCfg.g:21401:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getMemberNameValidIDParserRuleCall_1_0_3_1_0()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__XImportDeclaration__MemberNameAssignment_1_0_3_143106);
+            pushFollow(FOLLOW_2);
             ruleValidID();
 
             state._fsp--;
@@ -61281,28 +61281,28 @@ public final void rule__XImportDeclaration__MemberNameAssignment_1_0_3_1() throw
 
 
     // $ANTLR start "rule__XImportDeclaration__ImportedTypeAssignment_1_1"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21410:1: rule__XImportDeclaration__ImportedTypeAssignment_1_1 : ( ( ruleQualifiedName ) ) ;
+    // InternalCheckCfg.g:21410:1: rule__XImportDeclaration__ImportedTypeAssignment_1_1 : ( ( ruleQualifiedName ) ) ;
     public final void rule__XImportDeclaration__ImportedTypeAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21414:1: ( ( ( ruleQualifiedName ) ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21415:1: ( ( ruleQualifiedName ) )
+            // InternalCheckCfg.g:21414:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalCheckCfg.g:21415:1: ( ( ruleQualifiedName ) )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21415:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21416:1: ( ruleQualifiedName )
+            // InternalCheckCfg.g:21415:1: ( ( ruleQualifiedName ) )
+            // InternalCheckCfg.g:21416:1: ( ruleQualifiedName )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getImportedTypeJvmDeclaredTypeCrossReference_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21417:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21418:1: ruleQualifiedName
+            // InternalCheckCfg.g:21417:1: ( ruleQualifiedName )
+            // InternalCheckCfg.g:21418:1: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getImportedTypeJvmDeclaredTypeQualifiedNameParserRuleCall_1_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_rule__XImportDeclaration__ImportedTypeAssignment_1_143141);
+            pushFollow(FOLLOW_2);
             ruleQualifiedName();
 
             state._fsp--;
@@ -61338,22 +61338,22 @@ public final void rule__XImportDeclaration__ImportedTypeAssignment_1_1() throws
 
 
     // $ANTLR start "rule__XImportDeclaration__ImportedNamespaceAssignment_1_2"
-    // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21429:1: rule__XImportDeclaration__ImportedNamespaceAssignment_1_2 : ( ruleQualifiedNameWithWildcard ) ;
+    // InternalCheckCfg.g:21429:1: rule__XImportDeclaration__ImportedNamespaceAssignment_1_2 : ( ruleQualifiedNameWithWildcard ) ;
     public final void rule__XImportDeclaration__ImportedNamespaceAssignment_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21433:1: ( ( ruleQualifiedNameWithWildcard ) )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21434:1: ( ruleQualifiedNameWithWildcard )
+            // InternalCheckCfg.g:21433:1: ( ( ruleQualifiedNameWithWildcard ) )
+            // InternalCheckCfg.g:21434:1: ( ruleQualifiedNameWithWildcard )
             {
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21434:1: ( ruleQualifiedNameWithWildcard )
-            // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:21435:1: ruleQualifiedNameWithWildcard
+            // InternalCheckCfg.g:21434:1: ( ruleQualifiedNameWithWildcard )
+            // InternalCheckCfg.g:21435:1: ruleQualifiedNameWithWildcard
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getImportedNamespaceQualifiedNameWithWildcardParserRuleCall_1_2_0()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedNameWithWildcard_in_rule__XImportDeclaration__ImportedNamespaceAssignment_1_243176);
+            pushFollow(FOLLOW_2);
             ruleQualifiedNameWithWildcard();
 
             state._fsp--;
@@ -61383,19 +61383,19 @@ public final void rule__XImportDeclaration__ImportedNamespaceAssignment_1_2() th
 
     // $ANTLR start synpred29_InternalCheckCfg
     public final void synpred29_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2824:1: ( ( ( rule__OpOther__Group_6_1_0__0 ) ) )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2824:1: ( ( rule__OpOther__Group_6_1_0__0 ) )
+        // InternalCheckCfg.g:2824:1: ( ( ( rule__OpOther__Group_6_1_0__0 ) ) )
+        // InternalCheckCfg.g:2824:1: ( ( rule__OpOther__Group_6_1_0__0 ) )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2824:1: ( ( rule__OpOther__Group_6_1_0__0 ) )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2825:1: ( rule__OpOther__Group_6_1_0__0 )
+        // InternalCheckCfg.g:2824:1: ( ( rule__OpOther__Group_6_1_0__0 ) )
+        // InternalCheckCfg.g:2825:1: ( rule__OpOther__Group_6_1_0__0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getOpOtherAccess().getGroup_6_1_0()); 
         }
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2826:1: ( rule__OpOther__Group_6_1_0__0 )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2826:2: rule__OpOther__Group_6_1_0__0
+        // InternalCheckCfg.g:2826:1: ( rule__OpOther__Group_6_1_0__0 )
+        // InternalCheckCfg.g:2826:2: rule__OpOther__Group_6_1_0__0
         {
-        pushFollow(FOLLOW_rule__OpOther__Group_6_1_0__0_in_synpred29_InternalCheckCfg6036);
+        pushFollow(FOLLOW_2);
         rule__OpOther__Group_6_1_0__0();
 
         state._fsp--;
@@ -61413,16 +61413,16 @@ public final void synpred29_InternalCheckCfg_fragment() throws RecognitionExcept
 
     // $ANTLR start synpred30_InternalCheckCfg
     public final void synpred30_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2830:6: ( ( '<' ) )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2830:6: ( '<' )
+        // InternalCheckCfg.g:2830:6: ( ( '<' ) )
+        // InternalCheckCfg.g:2830:6: ( '<' )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2830:6: ( '<' )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:2831:1: '<'
+        // InternalCheckCfg.g:2830:6: ( '<' )
+        // InternalCheckCfg.g:2831:1: '<'
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_1_1()); 
         }
-        match(input,27,FOLLOW_27_in_synpred30_InternalCheckCfg6055); if (state.failed) return ;
+        match(input,27,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -61433,19 +61433,19 @@ public final void synpred30_InternalCheckCfg_fragment() throws RecognitionExcept
 
     // $ANTLR start synpred43_InternalCheckCfg
     public final void synpred43_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3082:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) ) )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3082:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) )
+        // InternalCheckCfg.g:3082:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) ) )
+        // InternalCheckCfg.g:3082:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3082:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3083:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 )
+        // InternalCheckCfg.g:3082:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) )
+        // InternalCheckCfg.g:3083:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsAssignment_1_1_3_1_0()); 
         }
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3084:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3084:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0
+        // InternalCheckCfg.g:3084:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 )
+        // InternalCheckCfg.g:3084:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0
         {
-        pushFollow(FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0_in_synpred43_InternalCheckCfg6614);
+        pushFollow(FOLLOW_2);
         rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0();
 
         state._fsp--;
@@ -61463,19 +61463,19 @@ public final void synpred43_InternalCheckCfg_fragment() throws RecognitionExcept
 
     // $ANTLR start synpred51_InternalCheckCfg
     public final void synpred51_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3146:6: ( ( ( ruleXForLoopExpression ) ) )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3146:6: ( ( ruleXForLoopExpression ) )
+        // InternalCheckCfg.g:3146:6: ( ( ( ruleXForLoopExpression ) ) )
+        // InternalCheckCfg.g:3146:6: ( ( ruleXForLoopExpression ) )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3146:6: ( ( ruleXForLoopExpression ) )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3147:1: ( ruleXForLoopExpression )
+        // InternalCheckCfg.g:3146:6: ( ( ruleXForLoopExpression ) )
+        // InternalCheckCfg.g:3147:1: ( ruleXForLoopExpression )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getXPrimaryExpressionAccess().getXForLoopExpressionParserRuleCall_7()); 
         }
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3148:1: ( ruleXForLoopExpression )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3148:3: ruleXForLoopExpression
+        // InternalCheckCfg.g:3148:1: ( ruleXForLoopExpression )
+        // InternalCheckCfg.g:3148:3: ruleXForLoopExpression
         {
-        pushFollow(FOLLOW_ruleXForLoopExpression_in_synpred51_InternalCheckCfg6787);
+        pushFollow(FOLLOW_2);
         ruleXForLoopExpression();
 
         state._fsp--;
@@ -61493,16 +61493,16 @@ public final void synpred51_InternalCheckCfg_fragment() throws RecognitionExcept
 
     // $ANTLR start synpred52_InternalCheckCfg
     public final void synpred52_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3152:6: ( ( ruleXBasicForLoopExpression ) )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3152:6: ( ruleXBasicForLoopExpression )
+        // InternalCheckCfg.g:3152:6: ( ( ruleXBasicForLoopExpression ) )
+        // InternalCheckCfg.g:3152:6: ( ruleXBasicForLoopExpression )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3152:6: ( ruleXBasicForLoopExpression )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3153:1: ruleXBasicForLoopExpression
+        // InternalCheckCfg.g:3152:6: ( ruleXBasicForLoopExpression )
+        // InternalCheckCfg.g:3153:1: ruleXBasicForLoopExpression
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getXPrimaryExpressionAccess().getXBasicForLoopExpressionParserRuleCall_8()); 
         }
-        pushFollow(FOLLOW_ruleXBasicForLoopExpression_in_synpred52_InternalCheckCfg6805);
+        pushFollow(FOLLOW_2);
         ruleXBasicForLoopExpression();
 
         state._fsp--;
@@ -61517,19 +61517,19 @@ public final void synpred52_InternalCheckCfg_fragment() throws RecognitionExcept
 
     // $ANTLR start synpred65_InternalCheckCfg
     public final void synpred65_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3278:1: ( ( ( rule__XSwitchExpression__Group_2_0__0 ) ) )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3278:1: ( ( rule__XSwitchExpression__Group_2_0__0 ) )
+        // InternalCheckCfg.g:3278:1: ( ( ( rule__XSwitchExpression__Group_2_0__0 ) ) )
+        // InternalCheckCfg.g:3278:1: ( ( rule__XSwitchExpression__Group_2_0__0 ) )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3278:1: ( ( rule__XSwitchExpression__Group_2_0__0 ) )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3279:1: ( rule__XSwitchExpression__Group_2_0__0 )
+        // InternalCheckCfg.g:3278:1: ( ( rule__XSwitchExpression__Group_2_0__0 ) )
+        // InternalCheckCfg.g:3279:1: ( rule__XSwitchExpression__Group_2_0__0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getXSwitchExpressionAccess().getGroup_2_0()); 
         }
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3280:1: ( rule__XSwitchExpression__Group_2_0__0 )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3280:2: rule__XSwitchExpression__Group_2_0__0
+        // InternalCheckCfg.g:3280:1: ( rule__XSwitchExpression__Group_2_0__0 )
+        // InternalCheckCfg.g:3280:2: rule__XSwitchExpression__Group_2_0__0
         {
-        pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0__0_in_synpred65_InternalCheckCfg7124);
+        pushFollow(FOLLOW_2);
         rule__XSwitchExpression__Group_2_0__0();
 
         state._fsp--;
@@ -61547,19 +61547,19 @@ public final void synpred65_InternalCheckCfg_fragment() throws RecognitionExcept
 
     // $ANTLR start synpred69_InternalCheckCfg
     public final void synpred69_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3368:1: ( ( ( rule__XVariableDeclaration__Group_2_0__0 ) ) )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3368:1: ( ( rule__XVariableDeclaration__Group_2_0__0 ) )
+        // InternalCheckCfg.g:3368:1: ( ( ( rule__XVariableDeclaration__Group_2_0__0 ) ) )
+        // InternalCheckCfg.g:3368:1: ( ( rule__XVariableDeclaration__Group_2_0__0 ) )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3368:1: ( ( rule__XVariableDeclaration__Group_2_0__0 ) )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3369:1: ( rule__XVariableDeclaration__Group_2_0__0 )
+        // InternalCheckCfg.g:3368:1: ( ( rule__XVariableDeclaration__Group_2_0__0 ) )
+        // InternalCheckCfg.g:3369:1: ( rule__XVariableDeclaration__Group_2_0__0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getXVariableDeclarationAccess().getGroup_2_0()); 
         }
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3370:1: ( rule__XVariableDeclaration__Group_2_0__0 )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3370:2: rule__XVariableDeclaration__Group_2_0__0
+        // InternalCheckCfg.g:3370:1: ( rule__XVariableDeclaration__Group_2_0__0 )
+        // InternalCheckCfg.g:3370:2: rule__XVariableDeclaration__Group_2_0__0
         {
-        pushFollow(FOLLOW_rule__XVariableDeclaration__Group_2_0__0_in_synpred69_InternalCheckCfg7328);
+        pushFollow(FOLLOW_2);
         rule__XVariableDeclaration__Group_2_0__0();
 
         state._fsp--;
@@ -61577,19 +61577,19 @@ public final void synpred69_InternalCheckCfg_fragment() throws RecognitionExcept
 
     // $ANTLR start synpred70_InternalCheckCfg
     public final void synpred70_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3390:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) ) )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3390:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) )
+        // InternalCheckCfg.g:3390:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) ) )
+        // InternalCheckCfg.g:3390:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3390:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3391:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 )
+        // InternalCheckCfg.g:3390:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) )
+        // InternalCheckCfg.g:3391:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsAssignment_3_1_0()); 
         }
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3392:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3392:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0
+        // InternalCheckCfg.g:3392:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 )
+        // InternalCheckCfg.g:3392:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0
         {
-        pushFollow(FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0_in_synpred70_InternalCheckCfg7379);
+        pushFollow(FOLLOW_2);
         rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0();
 
         state._fsp--;
@@ -61607,19 +61607,19 @@ public final void synpred70_InternalCheckCfg_fragment() throws RecognitionExcept
 
     // $ANTLR start synpred76_InternalCheckCfg
     public final void synpred76_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3484:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) ) )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3484:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) )
+        // InternalCheckCfg.g:3484:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) ) )
+        // InternalCheckCfg.g:3484:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) )
         {
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3484:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3485:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 )
+        // InternalCheckCfg.g:3484:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) )
+        // InternalCheckCfg.g:3485:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getXConstructorCallAccess().getArgumentsAssignment_4_1_0()); 
         }
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3486:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:3486:2: rule__XConstructorCall__ArgumentsAssignment_4_1_0
+        // InternalCheckCfg.g:3486:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 )
+        // InternalCheckCfg.g:3486:2: rule__XConstructorCall__ArgumentsAssignment_4_1_0
         {
-        pushFollow(FOLLOW_rule__XConstructorCall__ArgumentsAssignment_4_1_0_in_synpred76_InternalCheckCfg7594);
+        pushFollow(FOLLOW_2);
         rule__XConstructorCall__ArgumentsAssignment_4_1_0();
 
         state._fsp--;
@@ -61637,10 +61637,10 @@ public final void synpred76_InternalCheckCfg_fragment() throws RecognitionExcept
 
     // $ANTLR start synpred104_InternalCheckCfg
     public final void synpred104_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5470:2: ( rule__XAssignment__Group_1_1__0 )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5470:2: rule__XAssignment__Group_1_1__0
+        // InternalCheckCfg.g:5470:2: ( rule__XAssignment__Group_1_1__0 )
+        // InternalCheckCfg.g:5470:2: rule__XAssignment__Group_1_1__0
         {
-        pushFollow(FOLLOW_rule__XAssignment__Group_1_1__0_in_synpred104_InternalCheckCfg11609);
+        pushFollow(FOLLOW_2);
         rule__XAssignment__Group_1_1__0();
 
         state._fsp--;
@@ -61652,10 +61652,10 @@ public final void synpred104_InternalCheckCfg_fragment() throws RecognitionExcep
 
     // $ANTLR start synpred106_InternalCheckCfg
     public final void synpred106_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5881:2: ( rule__XOrExpression__Group_1__0 )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:5881:2: rule__XOrExpression__Group_1__0
+        // InternalCheckCfg.g:5881:2: ( rule__XOrExpression__Group_1__0 )
+        // InternalCheckCfg.g:5881:2: rule__XOrExpression__Group_1__0
         {
-        pushFollow(FOLLOW_rule__XOrExpression__Group_1__0_in_synpred106_InternalCheckCfg12413);
+        pushFollow(FOLLOW_2);
         rule__XOrExpression__Group_1__0();
 
         state._fsp--;
@@ -61667,10 +61667,10 @@ public final void synpred106_InternalCheckCfg_fragment() throws RecognitionExcep
 
     // $ANTLR start synpred107_InternalCheckCfg
     public final void synpred107_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6096:2: ( rule__XAndExpression__Group_1__0 )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6096:2: rule__XAndExpression__Group_1__0
+        // InternalCheckCfg.g:6096:2: ( rule__XAndExpression__Group_1__0 )
+        // InternalCheckCfg.g:6096:2: rule__XAndExpression__Group_1__0
         {
-        pushFollow(FOLLOW_rule__XAndExpression__Group_1__0_in_synpred107_InternalCheckCfg12836);
+        pushFollow(FOLLOW_2);
         rule__XAndExpression__Group_1__0();
 
         state._fsp--;
@@ -61682,10 +61682,10 @@ public final void synpred107_InternalCheckCfg_fragment() throws RecognitionExcep
 
     // $ANTLR start synpred108_InternalCheckCfg
     public final void synpred108_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6311:2: ( rule__XEqualityExpression__Group_1__0 )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6311:2: rule__XEqualityExpression__Group_1__0
+        // InternalCheckCfg.g:6311:2: ( rule__XEqualityExpression__Group_1__0 )
+        // InternalCheckCfg.g:6311:2: rule__XEqualityExpression__Group_1__0
         {
-        pushFollow(FOLLOW_rule__XEqualityExpression__Group_1__0_in_synpred108_InternalCheckCfg13259);
+        pushFollow(FOLLOW_2);
         rule__XEqualityExpression__Group_1__0();
 
         state._fsp--;
@@ -61697,10 +61697,10 @@ public final void synpred108_InternalCheckCfg_fragment() throws RecognitionExcep
 
     // $ANTLR start synpred109_InternalCheckCfg
     public final void synpred109_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6526:2: ( rule__XRelationalExpression__Alternatives_1 )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6526:2: rule__XRelationalExpression__Alternatives_1
+        // InternalCheckCfg.g:6526:2: ( rule__XRelationalExpression__Alternatives_1 )
+        // InternalCheckCfg.g:6526:2: rule__XRelationalExpression__Alternatives_1
         {
-        pushFollow(FOLLOW_rule__XRelationalExpression__Alternatives_1_in_synpred109_InternalCheckCfg13682);
+        pushFollow(FOLLOW_2);
         rule__XRelationalExpression__Alternatives_1();
 
         state._fsp--;
@@ -61712,10 +61712,10 @@ public final void synpred109_InternalCheckCfg_fragment() throws RecognitionExcep
 
     // $ANTLR start synpred110_InternalCheckCfg
     public final void synpred110_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6962:2: ( rule__XOtherOperatorExpression__Group_1__0 )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:6962:2: rule__XOtherOperatorExpression__Group_1__0
+        // InternalCheckCfg.g:6962:2: ( rule__XOtherOperatorExpression__Group_1__0 )
+        // InternalCheckCfg.g:6962:2: rule__XOtherOperatorExpression__Group_1__0
         {
-        pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1__0_in_synpred110_InternalCheckCfg14534);
+        pushFollow(FOLLOW_2);
         rule__XOtherOperatorExpression__Group_1__0();
 
         state._fsp--;
@@ -61727,10 +61727,10 @@ public final void synpred110_InternalCheckCfg_fragment() throws RecognitionExcep
 
     // $ANTLR start synpred111_InternalCheckCfg
     public final void synpred111_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7558:2: ( rule__XAdditiveExpression__Group_1__0 )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7558:2: rule__XAdditiveExpression__Group_1__0
+        // InternalCheckCfg.g:7558:2: ( rule__XAdditiveExpression__Group_1__0 )
+        // InternalCheckCfg.g:7558:2: rule__XAdditiveExpression__Group_1__0
         {
-        pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1__0_in_synpred111_InternalCheckCfg15696);
+        pushFollow(FOLLOW_2);
         rule__XAdditiveExpression__Group_1__0();
 
         state._fsp--;
@@ -61742,10 +61742,10 @@ public final void synpred111_InternalCheckCfg_fragment() throws RecognitionExcep
 
     // $ANTLR start synpred112_InternalCheckCfg
     public final void synpred112_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7773:2: ( rule__XMultiplicativeExpression__Group_1__0 )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:7773:2: rule__XMultiplicativeExpression__Group_1__0
+        // InternalCheckCfg.g:7773:2: ( rule__XMultiplicativeExpression__Group_1__0 )
+        // InternalCheckCfg.g:7773:2: rule__XMultiplicativeExpression__Group_1__0
         {
-        pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1__0_in_synpred112_InternalCheckCfg16119);
+        pushFollow(FOLLOW_2);
         rule__XMultiplicativeExpression__Group_1__0();
 
         state._fsp--;
@@ -61757,10 +61757,10 @@ public final void synpred112_InternalCheckCfg_fragment() throws RecognitionExcep
 
     // $ANTLR start synpred113_InternalCheckCfg
     public final void synpred113_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8082:2: ( rule__XCastedExpression__Group_1__0 )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8082:2: rule__XCastedExpression__Group_1__0
+        // InternalCheckCfg.g:8082:2: ( rule__XCastedExpression__Group_1__0 )
+        // InternalCheckCfg.g:8082:2: rule__XCastedExpression__Group_1__0
         {
-        pushFollow(FOLLOW_rule__XCastedExpression__Group_1__0_in_synpred113_InternalCheckCfg16726);
+        pushFollow(FOLLOW_2);
         rule__XCastedExpression__Group_1__0();
 
         state._fsp--;
@@ -61772,10 +61772,10 @@ public final void synpred113_InternalCheckCfg_fragment() throws RecognitionExcep
 
     // $ANTLR start synpred114_InternalCheckCfg
     public final void synpred114_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8299:2: ( rule__XPostfixOperation__Group_1__0 )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8299:2: rule__XPostfixOperation__Group_1__0
+        // InternalCheckCfg.g:8299:2: ( rule__XPostfixOperation__Group_1__0 )
+        // InternalCheckCfg.g:8299:2: rule__XPostfixOperation__Group_1__0
         {
-        pushFollow(FOLLOW_rule__XPostfixOperation__Group_1__0_in_synpred114_InternalCheckCfg17151);
+        pushFollow(FOLLOW_2);
         rule__XPostfixOperation__Group_1__0();
 
         state._fsp--;
@@ -61787,10 +61787,10 @@ public final void synpred114_InternalCheckCfg_fragment() throws RecognitionExcep
 
     // $ANTLR start synpred115_InternalCheckCfg
     public final void synpred115_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8453:2: ( rule__XMemberFeatureCall__Alternatives_1 )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8453:2: rule__XMemberFeatureCall__Alternatives_1
+        // InternalCheckCfg.g:8453:2: ( rule__XMemberFeatureCall__Alternatives_1 )
+        // InternalCheckCfg.g:8453:2: rule__XMemberFeatureCall__Alternatives_1
         {
-        pushFollow(FOLLOW_rule__XMemberFeatureCall__Alternatives_1_in_synpred115_InternalCheckCfg17453);
+        pushFollow(FOLLOW_2);
         rule__XMemberFeatureCall__Alternatives_1();
 
         state._fsp--;
@@ -61802,10 +61802,10 @@ public final void synpred115_InternalCheckCfg_fragment() throws RecognitionExcep
 
     // $ANTLR start synpred117_InternalCheckCfg
     public final void synpred117_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8789:2: ( rule__XMemberFeatureCall__Group_1_1_3__0 )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8789:2: rule__XMemberFeatureCall__Group_1_1_3__0
+        // InternalCheckCfg.g:8789:2: ( rule__XMemberFeatureCall__Group_1_1_3__0 )
+        // InternalCheckCfg.g:8789:2: rule__XMemberFeatureCall__Group_1_1_3__0
         {
-        pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__0_in_synpred117_InternalCheckCfg18124);
+        pushFollow(FOLLOW_2);
         rule__XMemberFeatureCall__Group_1_1_3__0();
 
         state._fsp--;
@@ -61817,10 +61817,10 @@ public final void synpred117_InternalCheckCfg_fragment() throws RecognitionExcep
 
     // $ANTLR start synpred118_InternalCheckCfg
     public final void synpred118_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8817:2: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:8817:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4
+        // InternalCheckCfg.g:8817:2: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )
+        // InternalCheckCfg.g:8817:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4
         {
-        pushFollow(FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4_in_synpred118_InternalCheckCfg18182);
+        pushFollow(FOLLOW_2);
         rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4();
 
         state._fsp--;
@@ -61832,10 +61832,10 @@ public final void synpred118_InternalCheckCfg_fragment() throws RecognitionExcep
 
     // $ANTLR start synpred126_InternalCheckCfg
     public final void synpred126_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9958:2: ( rule__XClosure__Group_1__0 )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:9958:2: rule__XClosure__Group_1__0
+        // InternalCheckCfg.g:9958:2: ( rule__XClosure__Group_1__0 )
+        // InternalCheckCfg.g:9958:2: rule__XClosure__Group_1__0
         {
-        pushFollow(FOLLOW_rule__XClosure__Group_1__0_in_synpred126_InternalCheckCfg20418);
+        pushFollow(FOLLOW_2);
         rule__XClosure__Group_1__0();
 
         state._fsp--;
@@ -61847,10 +61847,10 @@ public final void synpred126_InternalCheckCfg_fragment() throws RecognitionExcep
 
     // $ANTLR start synpred133_InternalCheckCfg
     public final void synpred133_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11076:2: ( rule__XIfExpression__Group_6__0 )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11076:2: rule__XIfExpression__Group_6__0
+        // InternalCheckCfg.g:11076:2: ( rule__XIfExpression__Group_6__0 )
+        // InternalCheckCfg.g:11076:2: rule__XIfExpression__Group_6__0
         {
-        pushFollow(FOLLOW_rule__XIfExpression__Group_6__0_in_synpred133_InternalCheckCfg22624);
+        pushFollow(FOLLOW_2);
         rule__XIfExpression__Group_6__0();
 
         state._fsp--;
@@ -61862,10 +61862,10 @@ public final void synpred133_InternalCheckCfg_fragment() throws RecognitionExcep
 
     // $ANTLR start synpred136_InternalCheckCfg
     public final void synpred136_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11626:2: ( rule__XSwitchExpression__Group_2_1_0__0 )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:11626:2: rule__XSwitchExpression__Group_2_1_0__0
+        // InternalCheckCfg.g:11626:2: ( rule__XSwitchExpression__Group_2_1_0__0 )
+        // InternalCheckCfg.g:11626:2: rule__XSwitchExpression__Group_2_1_0__0
         {
-        pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1_0__0_in_synpred136_InternalCheckCfg23695);
+        pushFollow(FOLLOW_2);
         rule__XSwitchExpression__Group_2_1_0__0();
 
         state._fsp--;
@@ -61877,10 +61877,10 @@ public final void synpred136_InternalCheckCfg_fragment() throws RecognitionExcep
 
     // $ANTLR start synpred149_InternalCheckCfg
     public final void synpred149_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14114:2: ( rule__XFeatureCall__Group_3__0 )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14114:2: rule__XFeatureCall__Group_3__0
+        // InternalCheckCfg.g:14114:2: ( rule__XFeatureCall__Group_3__0 )
+        // InternalCheckCfg.g:14114:2: rule__XFeatureCall__Group_3__0
         {
-        pushFollow(FOLLOW_rule__XFeatureCall__Group_3__0_in_synpred149_InternalCheckCfg28589);
+        pushFollow(FOLLOW_2);
         rule__XFeatureCall__Group_3__0();
 
         state._fsp--;
@@ -61892,10 +61892,10 @@ public final void synpred149_InternalCheckCfg_fragment() throws RecognitionExcep
 
     // $ANTLR start synpred150_InternalCheckCfg
     public final void synpred150_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14142:2: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14142:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_4
+        // InternalCheckCfg.g:14142:2: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )
+        // InternalCheckCfg.g:14142:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_4
         {
-        pushFollow(FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_4_in_synpred150_InternalCheckCfg28647);
+        pushFollow(FOLLOW_2);
         rule__XFeatureCall__FeatureCallArgumentsAssignment_4();
 
         state._fsp--;
@@ -61907,10 +61907,10 @@ public final void synpred150_InternalCheckCfg_fragment() throws RecognitionExcep
 
     // $ANTLR start synpred154_InternalCheckCfg
     public final void synpred154_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14680:2: ( rule__XConstructorCall__Group_3__0 )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14680:2: rule__XConstructorCall__Group_3__0
+        // InternalCheckCfg.g:14680:2: ( rule__XConstructorCall__Group_3__0 )
+        // InternalCheckCfg.g:14680:2: rule__XConstructorCall__Group_3__0
         {
-        pushFollow(FOLLOW_rule__XConstructorCall__Group_3__0_in_synpred154_InternalCheckCfg29705);
+        pushFollow(FOLLOW_2);
         rule__XConstructorCall__Group_3__0();
 
         state._fsp--;
@@ -61922,10 +61922,10 @@ public final void synpred154_InternalCheckCfg_fragment() throws RecognitionExcep
 
     // $ANTLR start synpred155_InternalCheckCfg
     public final void synpred155_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14709:2: ( rule__XConstructorCall__Group_4__0 )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14709:2: rule__XConstructorCall__Group_4__0
+        // InternalCheckCfg.g:14709:2: ( rule__XConstructorCall__Group_4__0 )
+        // InternalCheckCfg.g:14709:2: rule__XConstructorCall__Group_4__0
         {
-        pushFollow(FOLLOW_rule__XConstructorCall__Group_4__0_in_synpred155_InternalCheckCfg29766);
+        pushFollow(FOLLOW_2);
         rule__XConstructorCall__Group_4__0();
 
         state._fsp--;
@@ -61937,10 +61937,10 @@ public final void synpred155_InternalCheckCfg_fragment() throws RecognitionExcep
 
     // $ANTLR start synpred156_InternalCheckCfg
     public final void synpred156_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14737:2: ( rule__XConstructorCall__ArgumentsAssignment_5 )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:14737:2: rule__XConstructorCall__ArgumentsAssignment_5
+        // InternalCheckCfg.g:14737:2: ( rule__XConstructorCall__ArgumentsAssignment_5 )
+        // InternalCheckCfg.g:14737:2: rule__XConstructorCall__ArgumentsAssignment_5
         {
-        pushFollow(FOLLOW_rule__XConstructorCall__ArgumentsAssignment_5_in_synpred156_InternalCheckCfg29824);
+        pushFollow(FOLLOW_2);
         rule__XConstructorCall__ArgumentsAssignment_5();
 
         state._fsp--;
@@ -61952,10 +61952,10 @@ public final void synpred156_InternalCheckCfg_fragment() throws RecognitionExcep
 
     // $ANTLR start synpred161_InternalCheckCfg
     public final void synpred161_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15790:2: ( rule__XReturnExpression__ExpressionAssignment_2 )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15790:2: rule__XReturnExpression__ExpressionAssignment_2
+        // InternalCheckCfg.g:15790:2: ( rule__XReturnExpression__ExpressionAssignment_2 )
+        // InternalCheckCfg.g:15790:2: rule__XReturnExpression__ExpressionAssignment_2
         {
-        pushFollow(FOLLOW_rule__XReturnExpression__ExpressionAssignment_2_in_synpred161_InternalCheckCfg31876);
+        pushFollow(FOLLOW_2);
         rule__XReturnExpression__ExpressionAssignment_2();
 
         state._fsp--;
@@ -61967,10 +61967,10 @@ public final void synpred161_InternalCheckCfg_fragment() throws RecognitionExcep
 
     // $ANTLR start synpred162_InternalCheckCfg
     public final void synpred162_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15958:2: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15958:2: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0
+        // InternalCheckCfg.g:15958:2: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )
+        // InternalCheckCfg.g:15958:2: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0
         {
-        pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0_in_synpred162_InternalCheckCfg32205);
+        pushFollow(FOLLOW_2);
         rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0();
 
         state._fsp--;
@@ -61982,10 +61982,10 @@ public final void synpred162_InternalCheckCfg_fragment() throws RecognitionExcep
 
     // $ANTLR start synpred163_InternalCheckCfg
     public final void synpred163_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15987:2: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:15987:2: rule__XTryCatchFinallyExpression__Group_3_0_1__0
+        // InternalCheckCfg.g:15987:2: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )
+        // InternalCheckCfg.g:15987:2: rule__XTryCatchFinallyExpression__Group_3_0_1__0
         {
-        pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__0_in_synpred163_InternalCheckCfg32265);
+        pushFollow(FOLLOW_2);
         rule__XTryCatchFinallyExpression__Group_3_0_1__0();
 
         state._fsp--;
@@ -61997,10 +61997,10 @@ public final void synpred163_InternalCheckCfg_fragment() throws RecognitionExcep
 
     // $ANTLR start synpred164_InternalCheckCfg
     public final void synpred164_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16587:2: ( rule__QualifiedName__Group_1__0 )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16587:2: rule__QualifiedName__Group_1__0
+        // InternalCheckCfg.g:16587:2: ( rule__QualifiedName__Group_1__0 )
+        // InternalCheckCfg.g:16587:2: rule__QualifiedName__Group_1__0
         {
-        pushFollow(FOLLOW_rule__QualifiedName__Group_1__0_in_synpred164_InternalCheckCfg33443);
+        pushFollow(FOLLOW_2);
         rule__QualifiedName__Group_1__0();
 
         state._fsp--;
@@ -62012,10 +62012,10 @@ public final void synpred164_InternalCheckCfg_fragment() throws RecognitionExcep
 
     // $ANTLR start synpred166_InternalCheckCfg
     public final void synpred166_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16836:2: ( rule__JvmTypeReference__Group_0_1__0 )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:16836:2: rule__JvmTypeReference__Group_0_1__0
+        // InternalCheckCfg.g:16836:2: ( rule__JvmTypeReference__Group_0_1__0 )
+        // InternalCheckCfg.g:16836:2: rule__JvmTypeReference__Group_0_1__0
         {
-        pushFollow(FOLLOW_rule__JvmTypeReference__Group_0_1__0_in_synpred166_InternalCheckCfg33934);
+        pushFollow(FOLLOW_2);
         rule__JvmTypeReference__Group_0_1__0();
 
         state._fsp--;
@@ -62027,10 +62027,10 @@ public final void synpred166_InternalCheckCfg_fragment() throws RecognitionExcep
 
     // $ANTLR start synpred170_InternalCheckCfg
     public final void synpred170_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17369:2: ( rule__JvmParameterizedTypeReference__Group_1__0 )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17369:2: rule__JvmParameterizedTypeReference__Group_1__0
+        // InternalCheckCfg.g:17369:2: ( rule__JvmParameterizedTypeReference__Group_1__0 )
+        // InternalCheckCfg.g:17369:2: rule__JvmParameterizedTypeReference__Group_1__0
         {
-        pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__0_in_synpred170_InternalCheckCfg34980);
+        pushFollow(FOLLOW_2);
         rule__JvmParameterizedTypeReference__Group_1__0();
 
         state._fsp--;
@@ -62042,10 +62042,10 @@ public final void synpred170_InternalCheckCfg_fragment() throws RecognitionExcep
 
     // $ANTLR start synpred172_InternalCheckCfg
     public final void synpred172_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17521:2: ( rule__JvmParameterizedTypeReference__Group_1_4__0 )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17521:2: rule__JvmParameterizedTypeReference__Group_1_4__0
+        // InternalCheckCfg.g:17521:2: ( rule__JvmParameterizedTypeReference__Group_1_4__0 )
+        // InternalCheckCfg.g:17521:2: rule__JvmParameterizedTypeReference__Group_1_4__0
         {
-        pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__0_in_synpred172_InternalCheckCfg35289);
+        pushFollow(FOLLOW_2);
         rule__JvmParameterizedTypeReference__Group_1_4__0();
 
         state._fsp--;
@@ -62057,10 +62057,10 @@ public final void synpred172_InternalCheckCfg_fragment() throws RecognitionExcep
 
     // $ANTLR start synpred173_InternalCheckCfg
     public final void synpred173_InternalCheckCfg_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17680:2: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )
-        // ../com.avaloq.tools.ddk.checkcfg.ui/src-gen/com/avaloq/tools/ddk/checkcfg/ui/contentassist/antlr/internal/InternalCheckCfg.g:17680:2: rule__JvmParameterizedTypeReference__Group_1_4_2__0
+        // InternalCheckCfg.g:17680:2: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )
+        // InternalCheckCfg.g:17680:2: rule__JvmParameterizedTypeReference__Group_1_4_2__0
         {
-        pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__0_in_synpred173_InternalCheckCfg35600);
+        pushFollow(FOLLOW_2);
         rule__JvmParameterizedTypeReference__Group_1_4_2__0();
 
         state._fsp--;
@@ -62628,19 +62628,12 @@ public final boolean synpred29_InternalCheckCfg() {
     protected DFA114 dfa114 = new DFA114(this);
     protected DFA123 dfa123 = new DFA123(this);
     protected DFA126 dfa126 = new DFA126(this);
-    static final String DFA10_eotS =
-        "\13\uffff";
-    static final String DFA10_eofS =
-        "\13\uffff";
-    static final String DFA10_minS =
-        "\1\32\2\uffff\1\32\7\uffff";
-    static final String DFA10_maxS =
-        "\1\41\2\uffff\1\36\7\uffff";
-    static final String DFA10_acceptS =
-        "\1\uffff\1\1\1\2\1\uffff\1\4\1\5\1\7\1\10\1\11\1\6\1\3";
-    static final String DFA10_specialS =
-        "\13\uffff}>";
-    static final String[] DFA10_transitionS = {
+    static final String dfa_1s = "\13\uffff";
+    static final String dfa_2s = "\1\32\2\uffff\1\32\7\uffff";
+    static final String dfa_3s = "\1\41\2\uffff\1\36\7\uffff";
+    static final String dfa_4s = "\1\uffff\1\1\1\2\1\uffff\1\4\1\5\1\7\1\10\1\11\1\6\1\3";
+    static final String dfa_5s = "\13\uffff}>";
+    static final String[] dfa_6s = {
             "\1\3\1\6\1\1\1\2\1\4\1\5\1\7\1\10",
             "",
             "",
@@ -62654,119 +62647,81 @@ public final boolean synpred29_InternalCheckCfg() {
             ""
     };
 
-    static final short[] DFA10_eot = DFA.unpackEncodedString(DFA10_eotS);
-    static final short[] DFA10_eof = DFA.unpackEncodedString(DFA10_eofS);
-    static final char[] DFA10_min = DFA.unpackEncodedStringToUnsignedChars(DFA10_minS);
-    static final char[] DFA10_max = DFA.unpackEncodedStringToUnsignedChars(DFA10_maxS);
-    static final short[] DFA10_accept = DFA.unpackEncodedString(DFA10_acceptS);
-    static final short[] DFA10_special = DFA.unpackEncodedString(DFA10_specialS);
-    static final short[][] DFA10_transition;
-
-    static {
-        int numStates = DFA10_transitionS.length;
-        DFA10_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA10_transition[i] = DFA.unpackEncodedString(DFA10_transitionS[i]);
-        }
-    }
+    static final short[] dfa_1 = DFA.unpackEncodedString(dfa_1s);
+    static final char[] dfa_2 = DFA.unpackEncodedStringToUnsignedChars(dfa_2s);
+    static final char[] dfa_3 = DFA.unpackEncodedStringToUnsignedChars(dfa_3s);
+    static final short[] dfa_4 = DFA.unpackEncodedString(dfa_4s);
+    static final short[] dfa_5 = DFA.unpackEncodedString(dfa_5s);
+    static final short[][] dfa_6 = unpackEncodedStringArray(dfa_6s);
 
     class DFA10 extends DFA {
 
         public DFA10(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 10;
-            this.eot = DFA10_eot;
-            this.eof = DFA10_eof;
-            this.min = DFA10_min;
-            this.max = DFA10_max;
-            this.accept = DFA10_accept;
-            this.special = DFA10_special;
-            this.transition = DFA10_transition;
+            this.eot = dfa_1;
+            this.eof = dfa_1;
+            this.min = dfa_2;
+            this.max = dfa_3;
+            this.accept = dfa_4;
+            this.special = dfa_5;
+            this.transition = dfa_6;
         }
         public String getDescription() {
             return "2719:1: rule__OpOther__Alternatives : ( ( '->' ) | ( '..<' ) | ( ( rule__OpOther__Group_2__0 ) ) | ( '..' ) | ( '=>' ) | ( ( rule__OpOther__Group_5__0 ) ) | ( ( rule__OpOther__Group_6__0 ) ) | ( '<>' ) | ( '?:' ) );";
         }
     }
-    static final String DFA18_eotS =
-        "\12\uffff";
-    static final String DFA18_eofS =
-        "\4\uffff\5\3\1\uffff";
-    static final String DFA18_minS =
-        "\1\53\2\4\1\uffff\5\4\1\uffff";
-    static final String DFA18_maxS =
-        "\1\132\2\61\1\uffff\5\135\1\uffff";
-    static final String DFA18_acceptS =
-        "\3\uffff\1\2\5\uffff\1\1";
-    static final String DFA18_specialS =
-        "\12\uffff}>";
-    static final String[] DFA18_transitionS = {
+    static final String dfa_7s = "\12\uffff";
+    static final String dfa_8s = "\4\uffff\5\3\1\uffff";
+    static final String dfa_9s = "\1\53\2\4\1\uffff\5\4\1\uffff";
+    static final String dfa_10s = "\1\132\2\61\1\uffff\5\135\1\uffff";
+    static final String dfa_11s = "\3\uffff\1\2\5\uffff\1\1";
+    static final String dfa_12s = "\12\uffff}>";
+    static final String[] dfa_13s = {
             "\1\1\55\uffff\1\2\1\3",
             "\1\4\26\uffff\1\3\21\uffff\1\5\1\6\1\7\1\10\1\3",
             "\1\4\26\uffff\1\3\21\uffff\1\5\1\6\1\7\1\10\1\3",
             "",
-            "\5\3\4\uffff\1\11\46\3\6\uffff\3\3\1\uffff\31\3\2\uffff\2"+
-            "\3\1\uffff\2\3",
-            "\5\3\4\uffff\1\11\46\3\6\uffff\3\3\1\uffff\31\3\2\uffff\2"+
-            "\3\1\uffff\2\3",
-            "\5\3\4\uffff\1\11\46\3\6\uffff\3\3\1\uffff\31\3\2\uffff\2"+
-            "\3\1\uffff\2\3",
-            "\5\3\4\uffff\1\11\46\3\6\uffff\3\3\1\uffff\31\3\2\uffff\2"+
-            "\3\1\uffff\2\3",
-            "\5\3\4\uffff\1\11\46\3\6\uffff\3\3\1\uffff\31\3\2\uffff\2"+
-            "\3\1\uffff\2\3",
+            "\5\3\4\uffff\1\11\46\3\6\uffff\3\3\1\uffff\31\3\2\uffff\2\3\1\uffff\2\3",
+            "\5\3\4\uffff\1\11\46\3\6\uffff\3\3\1\uffff\31\3\2\uffff\2\3\1\uffff\2\3",
+            "\5\3\4\uffff\1\11\46\3\6\uffff\3\3\1\uffff\31\3\2\uffff\2\3\1\uffff\2\3",
+            "\5\3\4\uffff\1\11\46\3\6\uffff\3\3\1\uffff\31\3\2\uffff\2\3\1\uffff\2\3",
+            "\5\3\4\uffff\1\11\46\3\6\uffff\3\3\1\uffff\31\3\2\uffff\2\3\1\uffff\2\3",
             ""
     };
 
-    static final short[] DFA18_eot = DFA.unpackEncodedString(DFA18_eotS);
-    static final short[] DFA18_eof = DFA.unpackEncodedString(DFA18_eofS);
-    static final char[] DFA18_min = DFA.unpackEncodedStringToUnsignedChars(DFA18_minS);
-    static final char[] DFA18_max = DFA.unpackEncodedStringToUnsignedChars(DFA18_maxS);
-    static final short[] DFA18_accept = DFA.unpackEncodedString(DFA18_acceptS);
-    static final short[] DFA18_special = DFA.unpackEncodedString(DFA18_specialS);
-    static final short[][] DFA18_transition;
-
-    static {
-        int numStates = DFA18_transitionS.length;
-        DFA18_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA18_transition[i] = DFA.unpackEncodedString(DFA18_transitionS[i]);
-        }
-    }
+    static final short[] dfa_7 = DFA.unpackEncodedString(dfa_7s);
+    static final short[] dfa_8 = DFA.unpackEncodedString(dfa_8s);
+    static final char[] dfa_9 = DFA.unpackEncodedStringToUnsignedChars(dfa_9s);
+    static final char[] dfa_10 = DFA.unpackEncodedStringToUnsignedChars(dfa_10s);
+    static final short[] dfa_11 = DFA.unpackEncodedString(dfa_11s);
+    static final short[] dfa_12 = DFA.unpackEncodedString(dfa_12s);
+    static final short[][] dfa_13 = unpackEncodedStringArray(dfa_13s);
 
     class DFA18 extends DFA {
 
         public DFA18(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 18;
-            this.eot = DFA18_eot;
-            this.eof = DFA18_eof;
-            this.min = DFA18_min;
-            this.max = DFA18_max;
-            this.accept = DFA18_accept;
-            this.special = DFA18_special;
-            this.transition = DFA18_transition;
+            this.eot = dfa_7;
+            this.eof = dfa_8;
+            this.min = dfa_9;
+            this.max = dfa_10;
+            this.accept = dfa_11;
+            this.special = dfa_12;
+            this.transition = dfa_13;
         }
         public String getDescription() {
             return "3001:1: rule__XMemberFeatureCall__Alternatives_1 : ( ( ( rule__XMemberFeatureCall__Group_1_0__0 ) ) | ( ( rule__XMemberFeatureCall__Group_1_1__0 ) ) );";
         }
     }
-    static final String DFA21_eotS =
-        "\43\uffff";
-    static final String DFA21_eofS =
-        "\43\uffff";
-    static final String DFA21_minS =
-        "\1\4\2\0\40\uffff";
-    static final String DFA21_maxS =
-        "\1\135\2\0\40\uffff";
-    static final String DFA21_acceptS =
-        "\3\uffff\1\1\1\uffff\1\2\35\uffff";
-    static final String DFA21_specialS =
-        "\1\uffff\1\0\1\1\40\uffff}>";
-    static final String[] DFA21_transitionS = {
-            "\1\1\4\5\22\uffff\1\5\3\uffff\1\3\2\uffff\2\5\4\uffff\1\5\4"+
-            "\uffff\6\5\7\uffff\1\5\1\uffff\1\5\1\uffff\1\2\2\uffff\2\5\4"+
-            "\uffff\1\5\1\uffff\1\5\2\uffff\10\5\1\uffff\1\5\5\uffff\1\3"+
-            "\1\uffff\1\5",
+    static final String dfa_14s = "\43\uffff";
+    static final String dfa_15s = "\1\4\2\0\40\uffff";
+    static final String dfa_16s = "\1\135\2\0\40\uffff";
+    static final String dfa_17s = "\3\uffff\1\1\1\uffff\1\2\35\uffff";
+    static final String dfa_18s = "\1\uffff\1\0\1\1\40\uffff}>";
+    static final String[] dfa_19s = {
+            "\1\1\4\5\22\uffff\1\5\3\uffff\1\3\2\uffff\2\5\4\uffff\1\5\4\uffff\6\5\7\uffff\1\5\1\uffff\1\5\1\uffff\1\2\2\uffff\2\5\4\uffff\1\5\1\uffff\1\5\2\uffff\10\5\1\uffff\1\5\5\uffff\1\3\1\uffff\1\5",
             "\1\uffff",
             "\1\uffff",
             "",
@@ -62803,34 +62758,25 @@ public String getDescription() {
             ""
     };
 
-    static final short[] DFA21_eot = DFA.unpackEncodedString(DFA21_eotS);
-    static final short[] DFA21_eof = DFA.unpackEncodedString(DFA21_eofS);
-    static final char[] DFA21_min = DFA.unpackEncodedStringToUnsignedChars(DFA21_minS);
-    static final char[] DFA21_max = DFA.unpackEncodedStringToUnsignedChars(DFA21_maxS);
-    static final short[] DFA21_accept = DFA.unpackEncodedString(DFA21_acceptS);
-    static final short[] DFA21_special = DFA.unpackEncodedString(DFA21_specialS);
-    static final short[][] DFA21_transition;
-
-    static {
-        int numStates = DFA21_transitionS.length;
-        DFA21_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA21_transition[i] = DFA.unpackEncodedString(DFA21_transitionS[i]);
-        }
-    }
+    static final short[] dfa_14 = DFA.unpackEncodedString(dfa_14s);
+    static final char[] dfa_15 = DFA.unpackEncodedStringToUnsignedChars(dfa_15s);
+    static final char[] dfa_16 = DFA.unpackEncodedStringToUnsignedChars(dfa_16s);
+    static final short[] dfa_17 = DFA.unpackEncodedString(dfa_17s);
+    static final short[] dfa_18 = DFA.unpackEncodedString(dfa_18s);
+    static final short[][] dfa_19 = unpackEncodedStringArray(dfa_19s);
 
     class DFA21 extends DFA {
 
         public DFA21(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 21;
-            this.eot = DFA21_eot;
-            this.eof = DFA21_eof;
-            this.min = DFA21_min;
-            this.max = DFA21_max;
-            this.accept = DFA21_accept;
-            this.special = DFA21_special;
-            this.transition = DFA21_transition;
+            this.eot = dfa_14;
+            this.eof = dfa_14;
+            this.min = dfa_15;
+            this.max = dfa_16;
+            this.accept = dfa_17;
+            this.special = dfa_18;
+            this.transition = dfa_19;
         }
         public String getDescription() {
             return "3077:1: rule__XMemberFeatureCall__Alternatives_1_1_3_1 : ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) ) | ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 ) ) );";
@@ -62877,23 +62823,13 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA22_eotS =
-        "\40\uffff";
-    static final String DFA22_eofS =
-        "\40\uffff";
-    static final String DFA22_minS =
-        "\1\4\26\uffff\1\0\10\uffff";
-    static final String DFA22_maxS =
-        "\1\135\26\uffff\1\0\10\uffff";
-    static final String DFA22_acceptS =
-        "\1\uffff\1\1\1\2\1\3\1\4\1\5\6\uffff\1\6\11\uffff\1\7\1\uffff\1"+
-        "\12\1\13\1\14\1\15\1\16\1\17\1\10\1\11";
-    static final String DFA22_specialS =
-        "\27\uffff\1\0\10\uffff}>";
-    static final String[] DFA22_transitionS = {
-            "\1\5\4\14\22\uffff\1\5\21\uffff\5\5\1\14\7\uffff\1\2\1\uffff"+
-            "\1\27\1\uffff\1\35\2\uffff\2\14\4\uffff\1\26\1\uffff\1\3\2\uffff"+
-            "\1\30\1\31\1\1\2\14\1\32\1\33\1\34\1\uffff\1\4\7\uffff\1\14",
+    static final String dfa_20s = "\40\uffff";
+    static final String dfa_21s = "\1\4\26\uffff\1\0\10\uffff";
+    static final String dfa_22s = "\1\135\26\uffff\1\0\10\uffff";
+    static final String dfa_23s = "\1\uffff\1\1\1\2\1\3\1\4\1\5\6\uffff\1\6\11\uffff\1\7\1\uffff\1\12\1\13\1\14\1\15\1\16\1\17\1\10\1\11";
+    static final String dfa_24s = "\27\uffff\1\0\10\uffff}>";
+    static final String[] dfa_25s = {
+            "\1\5\4\14\22\uffff\1\5\21\uffff\5\5\1\14\7\uffff\1\2\1\uffff\1\27\1\uffff\1\35\2\uffff\2\14\4\uffff\1\26\1\uffff\1\3\2\uffff\1\30\1\31\1\1\2\14\1\32\1\33\1\34\1\uffff\1\4\7\uffff\1\14",
             "",
             "",
             "",
@@ -62927,34 +62863,25 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA22_eot = DFA.unpackEncodedString(DFA22_eotS);
-    static final short[] DFA22_eof = DFA.unpackEncodedString(DFA22_eofS);
-    static final char[] DFA22_min = DFA.unpackEncodedStringToUnsignedChars(DFA22_minS);
-    static final char[] DFA22_max = DFA.unpackEncodedStringToUnsignedChars(DFA22_maxS);
-    static final short[] DFA22_accept = DFA.unpackEncodedString(DFA22_acceptS);
-    static final short[] DFA22_special = DFA.unpackEncodedString(DFA22_specialS);
-    static final short[][] DFA22_transition;
-
-    static {
-        int numStates = DFA22_transitionS.length;
-        DFA22_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA22_transition[i] = DFA.unpackEncodedString(DFA22_transitionS[i]);
-        }
-    }
+    static final short[] dfa_20 = DFA.unpackEncodedString(dfa_20s);
+    static final char[] dfa_21 = DFA.unpackEncodedStringToUnsignedChars(dfa_21s);
+    static final char[] dfa_22 = DFA.unpackEncodedStringToUnsignedChars(dfa_22s);
+    static final short[] dfa_23 = DFA.unpackEncodedString(dfa_23s);
+    static final short[] dfa_24 = DFA.unpackEncodedString(dfa_24s);
+    static final short[][] dfa_25 = unpackEncodedStringArray(dfa_25s);
 
     class DFA22 extends DFA {
 
         public DFA22(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 22;
-            this.eot = DFA22_eot;
-            this.eof = DFA22_eof;
-            this.min = DFA22_min;
-            this.max = DFA22_max;
-            this.accept = DFA22_accept;
-            this.special = DFA22_special;
-            this.transition = DFA22_transition;
+            this.eot = dfa_20;
+            this.eof = dfa_20;
+            this.min = dfa_21;
+            this.max = dfa_22;
+            this.accept = dfa_23;
+            this.special = dfa_24;
+            this.transition = dfa_25;
         }
         public String getDescription() {
             return "3099:1: rule__XPrimaryExpression__Alternatives : ( ( ruleXConstructorCall ) | ( ruleXBlockExpression ) | ( ruleXSwitchExpression ) | ( ( ruleXSynchronizedExpression ) ) | ( ruleXFeatureCall ) | ( ruleXLiteral ) | ( ruleXIfExpression ) | ( ( ruleXForLoopExpression ) ) | ( ruleXBasicForLoopExpression ) | ( ruleXWhileExpression ) | ( ruleXDoWhileExpression ) | ( ruleXThrowExpression ) | ( ruleXReturnExpression ) | ( ruleXTryCatchFinallyExpression ) | ( ruleXParenthesizedExpression ) );";
@@ -62986,22 +62913,12 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA25_eotS =
-        "\43\uffff";
-    static final String DFA25_eofS =
-        "\43\uffff";
-    static final String DFA25_minS =
-        "\1\4\1\0\41\uffff";
-    static final String DFA25_maxS =
-        "\1\135\1\0\41\uffff";
-    static final String DFA25_acceptS =
-        "\2\uffff\1\2\37\uffff\1\1";
-    static final String DFA25_specialS =
-        "\1\uffff\1\0\41\uffff}>";
-    static final String[] DFA25_transitionS = {
-            "\5\2\22\uffff\1\2\3\uffff\1\2\2\uffff\2\2\4\uffff\1\2\4\uffff"+
-            "\6\2\7\uffff\1\2\1\uffff\1\2\1\uffff\1\1\2\uffff\2\2\4\uffff"+
-            "\1\2\1\uffff\1\2\2\uffff\10\2\1\uffff\1\2\7\uffff\1\2",
+    static final String dfa_26s = "\1\4\1\0\41\uffff";
+    static final String dfa_27s = "\1\135\1\0\41\uffff";
+    static final String dfa_28s = "\2\uffff\1\2\37\uffff\1\1";
+    static final String dfa_29s = "\1\uffff\1\0\41\uffff}>";
+    static final String[] dfa_30s = {
+            "\5\2\22\uffff\1\2\3\uffff\1\2\2\uffff\2\2\4\uffff\1\2\4\uffff\6\2\7\uffff\1\2\1\uffff\1\2\1\uffff\1\1\2\uffff\2\2\4\uffff\1\2\1\uffff\1\2\2\uffff\10\2\1\uffff\1\2\7\uffff\1\2",
             "\1\uffff",
             "",
             "",
@@ -63037,35 +62954,24 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             "",
             ""
     };
-
-    static final short[] DFA25_eot = DFA.unpackEncodedString(DFA25_eotS);
-    static final short[] DFA25_eof = DFA.unpackEncodedString(DFA25_eofS);
-    static final char[] DFA25_min = DFA.unpackEncodedStringToUnsignedChars(DFA25_minS);
-    static final char[] DFA25_max = DFA.unpackEncodedStringToUnsignedChars(DFA25_maxS);
-    static final short[] DFA25_accept = DFA.unpackEncodedString(DFA25_acceptS);
-    static final short[] DFA25_special = DFA.unpackEncodedString(DFA25_specialS);
-    static final short[][] DFA25_transition;
-
-    static {
-        int numStates = DFA25_transitionS.length;
-        DFA25_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA25_transition[i] = DFA.unpackEncodedString(DFA25_transitionS[i]);
-        }
-    }
+    static final char[] dfa_26 = DFA.unpackEncodedStringToUnsignedChars(dfa_26s);
+    static final char[] dfa_27 = DFA.unpackEncodedStringToUnsignedChars(dfa_27s);
+    static final short[] dfa_28 = DFA.unpackEncodedString(dfa_28s);
+    static final short[] dfa_29 = DFA.unpackEncodedString(dfa_29s);
+    static final short[][] dfa_30 = unpackEncodedStringArray(dfa_30s);
 
     class DFA25 extends DFA {
 
         public DFA25(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 25;
-            this.eot = DFA25_eot;
-            this.eof = DFA25_eof;
-            this.min = DFA25_min;
-            this.max = DFA25_max;
-            this.accept = DFA25_accept;
-            this.special = DFA25_special;
-            this.transition = DFA25_transition;
+            this.eot = dfa_14;
+            this.eof = dfa_14;
+            this.min = dfa_26;
+            this.max = dfa_27;
+            this.accept = dfa_28;
+            this.special = dfa_29;
+            this.transition = dfa_30;
         }
         public String getDescription() {
             return "3273:1: rule__XSwitchExpression__Alternatives_2 : ( ( ( rule__XSwitchExpression__Group_2_0__0 ) ) | ( ( rule__XSwitchExpression__Group_2_1__0 ) ) );";
@@ -63097,87 +63003,19 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA30_eotS =
-        "\43\uffff";
-    static final String DFA30_eofS =
-        "\43\uffff";
-    static final String DFA30_minS =
-        "\1\4\2\0\40\uffff";
-    static final String DFA30_maxS =
-        "\1\135\2\0\40\uffff";
-    static final String DFA30_acceptS =
-        "\3\uffff\1\1\1\uffff\1\2\35\uffff";
-    static final String DFA30_specialS =
-        "\1\uffff\1\0\1\1\40\uffff}>";
-    static final String[] DFA30_transitionS = {
-            "\1\1\4\5\22\uffff\1\5\3\uffff\1\3\2\uffff\2\5\4\uffff\1\5\4"+
-            "\uffff\6\5\7\uffff\1\5\1\uffff\1\5\1\uffff\1\2\2\uffff\2\5\4"+
-            "\uffff\1\5\1\uffff\1\5\2\uffff\10\5\1\uffff\1\5\5\uffff\1\3"+
-            "\1\uffff\1\5",
-            "\1\uffff",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA30_eot = DFA.unpackEncodedString(DFA30_eotS);
-    static final short[] DFA30_eof = DFA.unpackEncodedString(DFA30_eofS);
-    static final char[] DFA30_min = DFA.unpackEncodedStringToUnsignedChars(DFA30_minS);
-    static final char[] DFA30_max = DFA.unpackEncodedStringToUnsignedChars(DFA30_maxS);
-    static final short[] DFA30_accept = DFA.unpackEncodedString(DFA30_acceptS);
-    static final short[] DFA30_special = DFA.unpackEncodedString(DFA30_specialS);
-    static final short[][] DFA30_transition;
-
-    static {
-        int numStates = DFA30_transitionS.length;
-        DFA30_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA30_transition[i] = DFA.unpackEncodedString(DFA30_transitionS[i]);
-        }
-    }
 
     class DFA30 extends DFA {
 
         public DFA30(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 30;
-            this.eot = DFA30_eot;
-            this.eof = DFA30_eof;
-            this.min = DFA30_min;
-            this.max = DFA30_max;
-            this.accept = DFA30_accept;
-            this.special = DFA30_special;
-            this.transition = DFA30_transition;
+            this.eot = dfa_14;
+            this.eof = dfa_14;
+            this.min = dfa_15;
+            this.max = dfa_16;
+            this.accept = dfa_17;
+            this.special = dfa_18;
+            this.transition = dfa_19;
         }
         public String getDescription() {
             return "3385:1: rule__XFeatureCall__Alternatives_3_1 : ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) ) | ( ( rule__XFeatureCall__Group_3_1_1__0 ) ) );";
@@ -63224,87 +63062,19 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA33_eotS =
-        "\43\uffff";
-    static final String DFA33_eofS =
-        "\43\uffff";
-    static final String DFA33_minS =
-        "\1\4\2\0\40\uffff";
-    static final String DFA33_maxS =
-        "\1\135\2\0\40\uffff";
-    static final String DFA33_acceptS =
-        "\3\uffff\1\1\1\uffff\1\2\35\uffff";
-    static final String DFA33_specialS =
-        "\1\uffff\1\0\1\1\40\uffff}>";
-    static final String[] DFA33_transitionS = {
-            "\1\1\4\5\22\uffff\1\5\3\uffff\1\3\2\uffff\2\5\4\uffff\1\5\4"+
-            "\uffff\6\5\7\uffff\1\5\1\uffff\1\5\1\uffff\1\2\2\uffff\2\5\4"+
-            "\uffff\1\5\1\uffff\1\5\2\uffff\10\5\1\uffff\1\5\5\uffff\1\3"+
-            "\1\uffff\1\5",
-            "\1\uffff",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA33_eot = DFA.unpackEncodedString(DFA33_eotS);
-    static final short[] DFA33_eof = DFA.unpackEncodedString(DFA33_eofS);
-    static final char[] DFA33_min = DFA.unpackEncodedStringToUnsignedChars(DFA33_minS);
-    static final char[] DFA33_max = DFA.unpackEncodedStringToUnsignedChars(DFA33_maxS);
-    static final short[] DFA33_accept = DFA.unpackEncodedString(DFA33_acceptS);
-    static final short[] DFA33_special = DFA.unpackEncodedString(DFA33_specialS);
-    static final short[][] DFA33_transition;
-
-    static {
-        int numStates = DFA33_transitionS.length;
-        DFA33_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA33_transition[i] = DFA.unpackEncodedString(DFA33_transitionS[i]);
-        }
-    }
 
     class DFA33 extends DFA {
 
         public DFA33(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 33;
-            this.eot = DFA33_eot;
-            this.eof = DFA33_eof;
-            this.min = DFA33_min;
-            this.max = DFA33_max;
-            this.accept = DFA33_accept;
-            this.special = DFA33_special;
-            this.transition = DFA33_transition;
+            this.eot = dfa_14;
+            this.eof = dfa_14;
+            this.min = dfa_15;
+            this.max = dfa_16;
+            this.accept = dfa_17;
+            this.special = dfa_18;
+            this.transition = dfa_19;
         }
         public String getDescription() {
             return "3479:1: rule__XConstructorCall__Alternatives_4_1 : ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) ) | ( ( rule__XConstructorCall__Group_4_1_1__0 ) ) );";
@@ -63351,19 +63121,13 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA42_eotS =
-        "\7\uffff";
-    static final String DFA42_eofS =
-        "\2\uffff\1\4\2\uffff\1\4\1\uffff";
-    static final String DFA42_minS =
-        "\1\4\1\uffff\1\53\1\4\1\uffff\1\53\1\uffff";
-    static final String DFA42_maxS =
-        "\1\56\1\uffff\1\106\1\44\1\uffff\1\106\1\uffff";
-    static final String DFA42_acceptS =
-        "\1\uffff\1\1\2\uffff\1\2\1\uffff\1\3";
-    static final String DFA42_specialS =
-        "\7\uffff}>";
-    static final String[] DFA42_transitionS = {
+    static final String dfa_31s = "\7\uffff";
+    static final String dfa_32s = "\2\uffff\1\4\2\uffff\1\4\1\uffff";
+    static final String dfa_33s = "\1\4\1\uffff\1\53\1\4\1\uffff\1\53\1\uffff";
+    static final String dfa_34s = "\1\56\1\uffff\1\106\1\44\1\uffff\1\106\1\uffff";
+    static final String dfa_35s = "\1\uffff\1\1\2\uffff\1\2\1\uffff\1\3";
+    static final String dfa_36s = "\7\uffff}>";
+    static final String[] dfa_37s = {
             "\1\2\51\uffff\1\1",
             "",
             "\1\3\32\uffff\1\4",
@@ -63373,54 +63137,38 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA42_eot = DFA.unpackEncodedString(DFA42_eotS);
-    static final short[] DFA42_eof = DFA.unpackEncodedString(DFA42_eofS);
-    static final char[] DFA42_min = DFA.unpackEncodedStringToUnsignedChars(DFA42_minS);
-    static final char[] DFA42_max = DFA.unpackEncodedStringToUnsignedChars(DFA42_maxS);
-    static final short[] DFA42_accept = DFA.unpackEncodedString(DFA42_acceptS);
-    static final short[] DFA42_special = DFA.unpackEncodedString(DFA42_specialS);
-    static final short[][] DFA42_transition;
-
-    static {
-        int numStates = DFA42_transitionS.length;
-        DFA42_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA42_transition[i] = DFA.unpackEncodedString(DFA42_transitionS[i]);
-        }
-    }
+    static final short[] dfa_31 = DFA.unpackEncodedString(dfa_31s);
+    static final short[] dfa_32 = DFA.unpackEncodedString(dfa_32s);
+    static final char[] dfa_33 = DFA.unpackEncodedStringToUnsignedChars(dfa_33s);
+    static final char[] dfa_34 = DFA.unpackEncodedStringToUnsignedChars(dfa_34s);
+    static final short[] dfa_35 = DFA.unpackEncodedString(dfa_35s);
+    static final short[] dfa_36 = DFA.unpackEncodedString(dfa_36s);
+    static final short[][] dfa_37 = unpackEncodedStringArray(dfa_37s);
 
     class DFA42 extends DFA {
 
         public DFA42(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 42;
-            this.eot = DFA42_eot;
-            this.eof = DFA42_eof;
-            this.min = DFA42_min;
-            this.max = DFA42_max;
-            this.accept = DFA42_accept;
-            this.special = DFA42_special;
-            this.transition = DFA42_transition;
+            this.eot = dfa_31;
+            this.eof = dfa_32;
+            this.min = dfa_33;
+            this.max = dfa_34;
+            this.accept = dfa_35;
+            this.special = dfa_36;
+            this.transition = dfa_37;
         }
         public String getDescription() {
             return "3679:1: rule__XImportDeclaration__Alternatives_1 : ( ( ( rule__XImportDeclaration__Group_1_0__0 ) ) | ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_1 ) ) | ( ( rule__XImportDeclaration__ImportedNamespaceAssignment_1_2 ) ) );";
         }
     }
-    static final String DFA57_eotS =
-        "\12\uffff";
-    static final String DFA57_eofS =
-        "\1\10\11\uffff";
-    static final String DFA57_minS =
-        "\1\4\7\0\2\uffff";
-    static final String DFA57_maxS =
-        "\1\135\7\0\2\uffff";
-    static final String DFA57_acceptS =
-        "\10\uffff\1\2\1\1";
-    static final String DFA57_specialS =
-        "\1\uffff\1\4\1\6\1\0\1\1\1\5\1\2\1\3\2\uffff}>";
-    static final String[] DFA57_transitionS = {
-            "\5\10\5\uffff\2\10\1\1\1\2\1\3\1\4\1\5\5\10\1\7\1\6\30\10\6"+
-            "\uffff\3\10\1\uffff\31\10\2\uffff\2\10\1\uffff\2\10",
+    static final String dfa_38s = "\1\10\11\uffff";
+    static final String dfa_39s = "\1\4\7\0\2\uffff";
+    static final String dfa_40s = "\1\135\7\0\2\uffff";
+    static final String dfa_41s = "\10\uffff\1\2\1\1";
+    static final String dfa_42s = "\1\uffff\1\4\1\6\1\0\1\1\1\5\1\2\1\3\2\uffff}>";
+    static final String[] dfa_43s = {
+            "\5\10\5\uffff\2\10\1\1\1\2\1\3\1\4\1\5\5\10\1\7\1\6\30\10\6\uffff\3\10\1\uffff\31\10\2\uffff\2\10\1\uffff\2\10",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -63431,35 +63179,25 @@ public String getDescription() {
             "",
             ""
     };
-
-    static final short[] DFA57_eot = DFA.unpackEncodedString(DFA57_eotS);
-    static final short[] DFA57_eof = DFA.unpackEncodedString(DFA57_eofS);
-    static final char[] DFA57_min = DFA.unpackEncodedStringToUnsignedChars(DFA57_minS);
-    static final char[] DFA57_max = DFA.unpackEncodedStringToUnsignedChars(DFA57_maxS);
-    static final short[] DFA57_accept = DFA.unpackEncodedString(DFA57_acceptS);
-    static final short[] DFA57_special = DFA.unpackEncodedString(DFA57_specialS);
-    static final short[][] DFA57_transition;
-
-    static {
-        int numStates = DFA57_transitionS.length;
-        DFA57_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA57_transition[i] = DFA.unpackEncodedString(DFA57_transitionS[i]);
-        }
-    }
+    static final short[] dfa_38 = DFA.unpackEncodedString(dfa_38s);
+    static final char[] dfa_39 = DFA.unpackEncodedStringToUnsignedChars(dfa_39s);
+    static final char[] dfa_40 = DFA.unpackEncodedStringToUnsignedChars(dfa_40s);
+    static final short[] dfa_41 = DFA.unpackEncodedString(dfa_41s);
+    static final short[] dfa_42 = DFA.unpackEncodedString(dfa_42s);
+    static final short[][] dfa_43 = unpackEncodedStringArray(dfa_43s);
 
     class DFA57 extends DFA {
 
         public DFA57(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 57;
-            this.eot = DFA57_eot;
-            this.eof = DFA57_eof;
-            this.min = DFA57_min;
-            this.max = DFA57_max;
-            this.accept = DFA57_accept;
-            this.special = DFA57_special;
-            this.transition = DFA57_transition;
+            this.eot = dfa_7;
+            this.eof = dfa_38;
+            this.min = dfa_39;
+            this.max = dfa_40;
+            this.accept = dfa_41;
+            this.special = dfa_42;
+            this.transition = dfa_43;
         }
         public String getDescription() {
             return "5470:1: ( rule__XAssignment__Group_1_1__0 )?";
@@ -63581,21 +63319,13 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA63_eotS =
-        "\13\uffff";
-    static final String DFA63_eofS =
-        "\1\1\12\uffff";
-    static final String DFA63_minS =
-        "\1\4\1\uffff\10\0\1\uffff";
-    static final String DFA63_maxS =
-        "\1\135\1\uffff\10\0\1\uffff";
-    static final String DFA63_acceptS =
-        "\1\uffff\1\2\10\uffff\1\1";
-    static final String DFA63_specialS =
-        "\2\uffff\1\5\1\0\1\1\1\2\1\4\1\7\1\6\1\3\1\uffff}>";
-    static final String[] DFA63_transitionS = {
-            "\5\1\5\uffff\14\1\1\3\1\2\1\4\1\5\1\6\1\7\1\10\1\11\22\1\6"+
-            "\uffff\3\1\1\uffff\31\1\2\uffff\2\1\1\uffff\2\1",
+    static final String dfa_44s = "\1\1\12\uffff";
+    static final String dfa_45s = "\1\4\1\uffff\10\0\1\uffff";
+    static final String dfa_46s = "\1\135\1\uffff\10\0\1\uffff";
+    static final String dfa_47s = "\1\uffff\1\2\10\uffff\1\1";
+    static final String dfa_48s = "\2\uffff\1\5\1\0\1\1\1\2\1\4\1\7\1\6\1\3\1\uffff}>";
+    static final String[] dfa_49s = {
+            "\5\1\5\uffff\14\1\1\3\1\2\1\4\1\5\1\6\1\7\1\10\1\11\22\1\6\uffff\3\1\1\uffff\31\1\2\uffff\2\1\1\uffff\2\1",
             "",
             "\1\uffff",
             "\1\uffff",
@@ -63607,35 +63337,25 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             "\1\uffff",
             ""
     };
-
-    static final short[] DFA63_eot = DFA.unpackEncodedString(DFA63_eotS);
-    static final short[] DFA63_eof = DFA.unpackEncodedString(DFA63_eofS);
-    static final char[] DFA63_min = DFA.unpackEncodedStringToUnsignedChars(DFA63_minS);
-    static final char[] DFA63_max = DFA.unpackEncodedStringToUnsignedChars(DFA63_maxS);
-    static final short[] DFA63_accept = DFA.unpackEncodedString(DFA63_acceptS);
-    static final short[] DFA63_special = DFA.unpackEncodedString(DFA63_specialS);
-    static final short[][] DFA63_transition;
-
-    static {
-        int numStates = DFA63_transitionS.length;
-        DFA63_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA63_transition[i] = DFA.unpackEncodedString(DFA63_transitionS[i]);
-        }
-    }
+    static final short[] dfa_44 = DFA.unpackEncodedString(dfa_44s);
+    static final char[] dfa_45 = DFA.unpackEncodedStringToUnsignedChars(dfa_45s);
+    static final char[] dfa_46 = DFA.unpackEncodedStringToUnsignedChars(dfa_46s);
+    static final short[] dfa_47 = DFA.unpackEncodedString(dfa_47s);
+    static final short[] dfa_48 = DFA.unpackEncodedString(dfa_48s);
+    static final short[][] dfa_49 = unpackEncodedStringArray(dfa_49s);
 
     class DFA63 extends DFA {
 
         public DFA63(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 63;
-            this.eot = DFA63_eot;
-            this.eof = DFA63_eof;
-            this.min = DFA63_min;
-            this.max = DFA63_max;
-            this.accept = DFA63_accept;
-            this.special = DFA63_special;
-            this.transition = DFA63_transition;
+            this.eot = dfa_1;
+            this.eof = dfa_44;
+            this.min = dfa_45;
+            this.max = dfa_46;
+            this.accept = dfa_47;
+            this.special = dfa_48;
+            this.transition = dfa_49;
         }
         public String getDescription() {
             return "()* loopback of 6962:1: ( rule__XOtherOperatorExpression__Group_1__0 )*";
@@ -63772,21 +63492,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA70_eotS =
-        "\116\uffff";
-    static final String DFA70_eofS =
-        "\1\2\115\uffff";
-    static final String DFA70_minS =
-        "\1\4\1\0\114\uffff";
-    static final String DFA70_maxS =
-        "\1\135\1\0\114\uffff";
-    static final String DFA70_acceptS =
-        "\2\uffff\1\2\112\uffff\1\1";
-    static final String DFA70_specialS =
-        "\1\uffff\1\0\114\uffff}>";
-    static final String[] DFA70_transitionS = {
-            "\5\2\5\uffff\46\2\6\uffff\3\2\1\uffff\1\1\30\2\2\uffff\2\2"+
-            "\1\uffff\2\2",
+    static final String dfa_50s = "\116\uffff";
+    static final String dfa_51s = "\1\2\115\uffff";
+    static final String dfa_52s = "\1\4\1\0\114\uffff";
+    static final String dfa_53s = "\1\135\1\0\114\uffff";
+    static final String dfa_54s = "\2\uffff\1\2\112\uffff\1\1";
+    static final String dfa_55s = "\1\uffff\1\0\114\uffff}>";
+    static final String[] dfa_56s = {
+            "\5\2\5\uffff\46\2\6\uffff\3\2\1\uffff\1\1\30\2\2\uffff\2\2\1\uffff\2\2",
             "\1\uffff",
             "",
             "",
@@ -63866,34 +63579,26 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA70_eot = DFA.unpackEncodedString(DFA70_eotS);
-    static final short[] DFA70_eof = DFA.unpackEncodedString(DFA70_eofS);
-    static final char[] DFA70_min = DFA.unpackEncodedStringToUnsignedChars(DFA70_minS);
-    static final char[] DFA70_max = DFA.unpackEncodedStringToUnsignedChars(DFA70_maxS);
-    static final short[] DFA70_accept = DFA.unpackEncodedString(DFA70_acceptS);
-    static final short[] DFA70_special = DFA.unpackEncodedString(DFA70_specialS);
-    static final short[][] DFA70_transition;
-
-    static {
-        int numStates = DFA70_transitionS.length;
-        DFA70_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA70_transition[i] = DFA.unpackEncodedString(DFA70_transitionS[i]);
-        }
-    }
+    static final short[] dfa_50 = DFA.unpackEncodedString(dfa_50s);
+    static final short[] dfa_51 = DFA.unpackEncodedString(dfa_51s);
+    static final char[] dfa_52 = DFA.unpackEncodedStringToUnsignedChars(dfa_52s);
+    static final char[] dfa_53 = DFA.unpackEncodedStringToUnsignedChars(dfa_53s);
+    static final short[] dfa_54 = DFA.unpackEncodedString(dfa_54s);
+    static final short[] dfa_55 = DFA.unpackEncodedString(dfa_55s);
+    static final short[][] dfa_56 = unpackEncodedStringArray(dfa_56s);
 
     class DFA70 extends DFA {
 
         public DFA70(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 70;
-            this.eot = DFA70_eot;
-            this.eof = DFA70_eof;
-            this.min = DFA70_min;
-            this.max = DFA70_max;
-            this.accept = DFA70_accept;
-            this.special = DFA70_special;
-            this.transition = DFA70_transition;
+            this.eot = dfa_50;
+            this.eof = dfa_51;
+            this.min = dfa_52;
+            this.max = dfa_53;
+            this.accept = dfa_54;
+            this.special = dfa_55;
+            this.transition = dfa_56;
         }
         public String getDescription() {
             return "8789:1: ( rule__XMemberFeatureCall__Group_1_1_3__0 )?";
@@ -63925,21 +63630,8 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA71_eotS =
-        "\116\uffff";
-    static final String DFA71_eofS =
-        "\1\2\115\uffff";
-    static final String DFA71_minS =
-        "\1\4\1\0\114\uffff";
-    static final String DFA71_maxS =
-        "\1\135\1\0\114\uffff";
-    static final String DFA71_acceptS =
-        "\2\uffff\1\2\112\uffff\1\1";
-    static final String DFA71_specialS =
-        "\1\uffff\1\0\114\uffff}>";
-    static final String[] DFA71_transitionS = {
-            "\5\2\5\uffff\46\2\6\uffff\3\2\1\uffff\4\2\1\1\24\2\2\uffff"+
-            "\2\2\1\uffff\2\2",
+    static final String[] dfa_57s = {
+            "\5\2\5\uffff\46\2\6\uffff\3\2\1\uffff\4\2\1\1\24\2\2\uffff\2\2\1\uffff\2\2",
             "\1\uffff",
             "",
             "",
@@ -64018,35 +63710,20 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             "",
             ""
     };
-
-    static final short[] DFA71_eot = DFA.unpackEncodedString(DFA71_eotS);
-    static final short[] DFA71_eof = DFA.unpackEncodedString(DFA71_eofS);
-    static final char[] DFA71_min = DFA.unpackEncodedStringToUnsignedChars(DFA71_minS);
-    static final char[] DFA71_max = DFA.unpackEncodedStringToUnsignedChars(DFA71_maxS);
-    static final short[] DFA71_accept = DFA.unpackEncodedString(DFA71_acceptS);
-    static final short[] DFA71_special = DFA.unpackEncodedString(DFA71_specialS);
-    static final short[][] DFA71_transition;
-
-    static {
-        int numStates = DFA71_transitionS.length;
-        DFA71_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA71_transition[i] = DFA.unpackEncodedString(DFA71_transitionS[i]);
-        }
-    }
+    static final short[][] dfa_57 = unpackEncodedStringArray(dfa_57s);
 
     class DFA71 extends DFA {
 
         public DFA71(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 71;
-            this.eot = DFA71_eot;
-            this.eof = DFA71_eof;
-            this.min = DFA71_min;
-            this.max = DFA71_max;
-            this.accept = DFA71_accept;
-            this.special = DFA71_special;
-            this.transition = DFA71_transition;
+            this.eot = dfa_50;
+            this.eof = dfa_51;
+            this.min = dfa_52;
+            this.max = dfa_53;
+            this.accept = dfa_54;
+            this.special = dfa_55;
+            this.transition = dfa_57;
         }
         public String getDescription() {
             return "8817:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )?";
@@ -64078,23 +63755,13 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA79_eotS =
-        "\46\uffff";
-    static final String DFA79_eofS =
-        "\46\uffff";
-    static final String DFA79_minS =
-        "\1\4\2\0\43\uffff";
-    static final String DFA79_maxS =
-        "\1\135\2\0\43\uffff";
-    static final String DFA79_acceptS =
-        "\3\uffff\1\1\1\uffff\1\2\40\uffff";
-    static final String DFA79_specialS =
-        "\1\uffff\1\0\1\1\43\uffff}>";
-    static final String[] DFA79_transitionS = {
-            "\1\1\4\5\22\uffff\1\5\3\uffff\1\3\2\uffff\2\5\4\uffff\1\5\3"+
-            "\uffff\7\5\7\uffff\1\5\1\uffff\1\5\1\uffff\1\2\2\uffff\3\5\3"+
-            "\uffff\1\5\1\uffff\1\5\2\uffff\10\5\1\uffff\1\5\5\uffff\1\3"+
-            "\2\5",
+    static final String dfa_58s = "\46\uffff";
+    static final String dfa_59s = "\1\4\2\0\43\uffff";
+    static final String dfa_60s = "\1\135\2\0\43\uffff";
+    static final String dfa_61s = "\3\uffff\1\1\1\uffff\1\2\40\uffff";
+    static final String dfa_62s = "\1\uffff\1\0\1\1\43\uffff}>";
+    static final String[] dfa_63s = {
+            "\1\1\4\5\22\uffff\1\5\3\uffff\1\3\2\uffff\2\5\4\uffff\1\5\3\uffff\7\5\7\uffff\1\5\1\uffff\1\5\1\uffff\1\2\2\uffff\3\5\3\uffff\1\5\1\uffff\1\5\2\uffff\10\5\1\uffff\1\5\5\uffff\1\3\2\5",
             "\1\uffff",
             "\1\uffff",
             "",
@@ -64134,34 +63801,25 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA79_eot = DFA.unpackEncodedString(DFA79_eotS);
-    static final short[] DFA79_eof = DFA.unpackEncodedString(DFA79_eofS);
-    static final char[] DFA79_min = DFA.unpackEncodedStringToUnsignedChars(DFA79_minS);
-    static final char[] DFA79_max = DFA.unpackEncodedStringToUnsignedChars(DFA79_maxS);
-    static final short[] DFA79_accept = DFA.unpackEncodedString(DFA79_acceptS);
-    static final short[] DFA79_special = DFA.unpackEncodedString(DFA79_specialS);
-    static final short[][] DFA79_transition;
-
-    static {
-        int numStates = DFA79_transitionS.length;
-        DFA79_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA79_transition[i] = DFA.unpackEncodedString(DFA79_transitionS[i]);
-        }
-    }
+    static final short[] dfa_58 = DFA.unpackEncodedString(dfa_58s);
+    static final char[] dfa_59 = DFA.unpackEncodedStringToUnsignedChars(dfa_59s);
+    static final char[] dfa_60 = DFA.unpackEncodedStringToUnsignedChars(dfa_60s);
+    static final short[] dfa_61 = DFA.unpackEncodedString(dfa_61s);
+    static final short[] dfa_62 = DFA.unpackEncodedString(dfa_62s);
+    static final short[][] dfa_63 = unpackEncodedStringArray(dfa_63s);
 
     class DFA79 extends DFA {
 
         public DFA79(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 79;
-            this.eot = DFA79_eot;
-            this.eof = DFA79_eof;
-            this.min = DFA79_min;
-            this.max = DFA79_max;
-            this.accept = DFA79_accept;
-            this.special = DFA79_special;
-            this.transition = DFA79_transition;
+            this.eot = dfa_58;
+            this.eof = dfa_58;
+            this.min = dfa_59;
+            this.max = dfa_60;
+            this.accept = dfa_61;
+            this.special = dfa_62;
+            this.transition = dfa_63;
         }
         public String getDescription() {
             return "9958:1: ( rule__XClosure__Group_1__0 )?";
@@ -64208,22 +63866,13 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA89_eotS =
-        "\42\uffff";
-    static final String DFA89_eofS =
-        "\42\uffff";
-    static final String DFA89_minS =
-        "\1\4\2\0\37\uffff";
-    static final String DFA89_maxS =
-        "\1\135\2\0\37\uffff";
-    static final String DFA89_acceptS =
-        "\3\uffff\1\1\1\2\35\uffff";
-    static final String DFA89_specialS =
-        "\1\uffff\1\0\1\1\37\uffff}>";
-    static final String[] DFA89_transitionS = {
-            "\1\1\4\4\22\uffff\1\4\3\uffff\1\3\2\uffff\2\4\4\uffff\1\4\4"+
-            "\uffff\6\4\7\uffff\1\4\1\uffff\1\4\1\uffff\1\2\2\uffff\2\4\4"+
-            "\uffff\1\4\1\uffff\1\4\2\uffff\10\4\1\uffff\1\4\7\uffff\1\4",
+    static final String dfa_64s = "\42\uffff";
+    static final String dfa_65s = "\1\4\2\0\37\uffff";
+    static final String dfa_66s = "\1\135\2\0\37\uffff";
+    static final String dfa_67s = "\3\uffff\1\1\1\2\35\uffff";
+    static final String dfa_68s = "\1\uffff\1\0\1\1\37\uffff}>";
+    static final String[] dfa_69s = {
+            "\1\1\4\4\22\uffff\1\4\3\uffff\1\3\2\uffff\2\4\4\uffff\1\4\4\uffff\6\4\7\uffff\1\4\1\uffff\1\4\1\uffff\1\2\2\uffff\2\4\4\uffff\1\4\1\uffff\1\4\2\uffff\10\4\1\uffff\1\4\7\uffff\1\4",
             "\1\uffff",
             "\1\uffff",
             "",
@@ -64259,34 +63908,25 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA89_eot = DFA.unpackEncodedString(DFA89_eotS);
-    static final short[] DFA89_eof = DFA.unpackEncodedString(DFA89_eofS);
-    static final char[] DFA89_min = DFA.unpackEncodedStringToUnsignedChars(DFA89_minS);
-    static final char[] DFA89_max = DFA.unpackEncodedStringToUnsignedChars(DFA89_maxS);
-    static final short[] DFA89_accept = DFA.unpackEncodedString(DFA89_acceptS);
-    static final short[] DFA89_special = DFA.unpackEncodedString(DFA89_specialS);
-    static final short[][] DFA89_transition;
-
-    static {
-        int numStates = DFA89_transitionS.length;
-        DFA89_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA89_transition[i] = DFA.unpackEncodedString(DFA89_transitionS[i]);
-        }
-    }
+    static final short[] dfa_64 = DFA.unpackEncodedString(dfa_64s);
+    static final char[] dfa_65 = DFA.unpackEncodedStringToUnsignedChars(dfa_65s);
+    static final char[] dfa_66 = DFA.unpackEncodedStringToUnsignedChars(dfa_66s);
+    static final short[] dfa_67 = DFA.unpackEncodedString(dfa_67s);
+    static final short[] dfa_68 = DFA.unpackEncodedString(dfa_68s);
+    static final short[][] dfa_69 = unpackEncodedStringArray(dfa_69s);
 
     class DFA89 extends DFA {
 
         public DFA89(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 89;
-            this.eot = DFA89_eot;
-            this.eof = DFA89_eof;
-            this.min = DFA89_min;
-            this.max = DFA89_max;
-            this.accept = DFA89_accept;
-            this.special = DFA89_special;
-            this.transition = DFA89_transition;
+            this.eot = dfa_64;
+            this.eof = dfa_64;
+            this.min = dfa_65;
+            this.max = dfa_66;
+            this.accept = dfa_67;
+            this.special = dfa_68;
+            this.transition = dfa_69;
         }
         public String getDescription() {
             return "11626:1: ( rule__XSwitchExpression__Group_2_1_0__0 )?";
@@ -64333,128 +63973,19 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA102_eotS =
-        "\116\uffff";
-    static final String DFA102_eofS =
-        "\1\2\115\uffff";
-    static final String DFA102_minS =
-        "\1\4\1\0\114\uffff";
-    static final String DFA102_maxS =
-        "\1\135\1\0\114\uffff";
-    static final String DFA102_acceptS =
-        "\2\uffff\1\2\112\uffff\1\1";
-    static final String DFA102_specialS =
-        "\1\uffff\1\0\114\uffff}>";
-    static final String[] DFA102_transitionS = {
-            "\5\2\5\uffff\46\2\6\uffff\3\2\1\uffff\1\1\30\2\2\uffff\2\2"+
-            "\1\uffff\2\2",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA102_eot = DFA.unpackEncodedString(DFA102_eotS);
-    static final short[] DFA102_eof = DFA.unpackEncodedString(DFA102_eofS);
-    static final char[] DFA102_min = DFA.unpackEncodedStringToUnsignedChars(DFA102_minS);
-    static final char[] DFA102_max = DFA.unpackEncodedStringToUnsignedChars(DFA102_maxS);
-    static final short[] DFA102_accept = DFA.unpackEncodedString(DFA102_acceptS);
-    static final short[] DFA102_special = DFA.unpackEncodedString(DFA102_specialS);
-    static final short[][] DFA102_transition;
-
-    static {
-        int numStates = DFA102_transitionS.length;
-        DFA102_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA102_transition[i] = DFA.unpackEncodedString(DFA102_transitionS[i]);
-        }
-    }
 
     class DFA102 extends DFA {
 
         public DFA102(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 102;
-            this.eot = DFA102_eot;
-            this.eof = DFA102_eof;
-            this.min = DFA102_min;
-            this.max = DFA102_max;
-            this.accept = DFA102_accept;
-            this.special = DFA102_special;
-            this.transition = DFA102_transition;
+            this.eot = dfa_50;
+            this.eof = dfa_51;
+            this.min = dfa_52;
+            this.max = dfa_53;
+            this.accept = dfa_54;
+            this.special = dfa_55;
+            this.transition = dfa_56;
         }
         public String getDescription() {
             return "14114:1: ( rule__XFeatureCall__Group_3__0 )?";
@@ -64486,128 +64017,19 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA103_eotS =
-        "\116\uffff";
-    static final String DFA103_eofS =
-        "\1\2\115\uffff";
-    static final String DFA103_minS =
-        "\1\4\1\0\114\uffff";
-    static final String DFA103_maxS =
-        "\1\135\1\0\114\uffff";
-    static final String DFA103_acceptS =
-        "\2\uffff\1\2\112\uffff\1\1";
-    static final String DFA103_specialS =
-        "\1\uffff\1\0\114\uffff}>";
-    static final String[] DFA103_transitionS = {
-            "\5\2\5\uffff\46\2\6\uffff\3\2\1\uffff\4\2\1\1\24\2\2\uffff"+
-            "\2\2\1\uffff\2\2",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA103_eot = DFA.unpackEncodedString(DFA103_eotS);
-    static final short[] DFA103_eof = DFA.unpackEncodedString(DFA103_eofS);
-    static final char[] DFA103_min = DFA.unpackEncodedStringToUnsignedChars(DFA103_minS);
-    static final char[] DFA103_max = DFA.unpackEncodedStringToUnsignedChars(DFA103_maxS);
-    static final short[] DFA103_accept = DFA.unpackEncodedString(DFA103_acceptS);
-    static final short[] DFA103_special = DFA.unpackEncodedString(DFA103_specialS);
-    static final short[][] DFA103_transition;
-
-    static {
-        int numStates = DFA103_transitionS.length;
-        DFA103_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA103_transition[i] = DFA.unpackEncodedString(DFA103_transitionS[i]);
-        }
-    }
 
     class DFA103 extends DFA {
 
         public DFA103(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 103;
-            this.eot = DFA103_eot;
-            this.eof = DFA103_eof;
-            this.min = DFA103_min;
-            this.max = DFA103_max;
-            this.accept = DFA103_accept;
-            this.special = DFA103_special;
-            this.transition = DFA103_transition;
+            this.eot = dfa_50;
+            this.eof = dfa_51;
+            this.min = dfa_52;
+            this.max = dfa_53;
+            this.accept = dfa_54;
+            this.special = dfa_55;
+            this.transition = dfa_57;
         }
         public String getDescription() {
             return "14142:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )?";
@@ -64639,21 +64061,8 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA107_eotS =
-        "\116\uffff";
-    static final String DFA107_eofS =
-        "\1\2\115\uffff";
-    static final String DFA107_minS =
-        "\1\4\1\0\114\uffff";
-    static final String DFA107_maxS =
-        "\1\135\1\0\114\uffff";
-    static final String DFA107_acceptS =
-        "\2\uffff\1\2\112\uffff\1\1";
-    static final String DFA107_specialS =
-        "\1\uffff\1\0\114\uffff}>";
-    static final String[] DFA107_transitionS = {
-            "\5\2\5\uffff\15\2\1\1\30\2\6\uffff\3\2\1\uffff\31\2\2\uffff"+
-            "\2\2\1\uffff\2\2",
+    static final String[] dfa_70s = {
+            "\5\2\5\uffff\15\2\1\1\30\2\6\uffff\3\2\1\uffff\31\2\2\uffff\2\2\1\uffff\2\2",
             "\1\uffff",
             "",
             "",
@@ -64732,35 +64141,20 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             "",
             ""
     };
-
-    static final short[] DFA107_eot = DFA.unpackEncodedString(DFA107_eotS);
-    static final short[] DFA107_eof = DFA.unpackEncodedString(DFA107_eofS);
-    static final char[] DFA107_min = DFA.unpackEncodedStringToUnsignedChars(DFA107_minS);
-    static final char[] DFA107_max = DFA.unpackEncodedStringToUnsignedChars(DFA107_maxS);
-    static final short[] DFA107_accept = DFA.unpackEncodedString(DFA107_acceptS);
-    static final short[] DFA107_special = DFA.unpackEncodedString(DFA107_specialS);
-    static final short[][] DFA107_transition;
-
-    static {
-        int numStates = DFA107_transitionS.length;
-        DFA107_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA107_transition[i] = DFA.unpackEncodedString(DFA107_transitionS[i]);
-        }
-    }
+    static final short[][] dfa_70 = unpackEncodedStringArray(dfa_70s);
 
     class DFA107 extends DFA {
 
         public DFA107(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 107;
-            this.eot = DFA107_eot;
-            this.eof = DFA107_eof;
-            this.min = DFA107_min;
-            this.max = DFA107_max;
-            this.accept = DFA107_accept;
-            this.special = DFA107_special;
-            this.transition = DFA107_transition;
+            this.eot = dfa_50;
+            this.eof = dfa_51;
+            this.min = dfa_52;
+            this.max = dfa_53;
+            this.accept = dfa_54;
+            this.special = dfa_55;
+            this.transition = dfa_70;
         }
         public String getDescription() {
             return "14680:1: ( rule__XConstructorCall__Group_3__0 )?";
@@ -64792,128 +64186,19 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA108_eotS =
-        "\116\uffff";
-    static final String DFA108_eofS =
-        "\1\2\115\uffff";
-    static final String DFA108_minS =
-        "\1\4\1\0\114\uffff";
-    static final String DFA108_maxS =
-        "\1\135\1\0\114\uffff";
-    static final String DFA108_acceptS =
-        "\2\uffff\1\2\112\uffff\1\1";
-    static final String DFA108_specialS =
-        "\1\uffff\1\0\114\uffff}>";
-    static final String[] DFA108_transitionS = {
-            "\5\2\5\uffff\46\2\6\uffff\3\2\1\uffff\1\1\30\2\2\uffff\2\2"+
-            "\1\uffff\2\2",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA108_eot = DFA.unpackEncodedString(DFA108_eotS);
-    static final short[] DFA108_eof = DFA.unpackEncodedString(DFA108_eofS);
-    static final char[] DFA108_min = DFA.unpackEncodedStringToUnsignedChars(DFA108_minS);
-    static final char[] DFA108_max = DFA.unpackEncodedStringToUnsignedChars(DFA108_maxS);
-    static final short[] DFA108_accept = DFA.unpackEncodedString(DFA108_acceptS);
-    static final short[] DFA108_special = DFA.unpackEncodedString(DFA108_specialS);
-    static final short[][] DFA108_transition;
-
-    static {
-        int numStates = DFA108_transitionS.length;
-        DFA108_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA108_transition[i] = DFA.unpackEncodedString(DFA108_transitionS[i]);
-        }
-    }
 
     class DFA108 extends DFA {
 
         public DFA108(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 108;
-            this.eot = DFA108_eot;
-            this.eof = DFA108_eof;
-            this.min = DFA108_min;
-            this.max = DFA108_max;
-            this.accept = DFA108_accept;
-            this.special = DFA108_special;
-            this.transition = DFA108_transition;
+            this.eot = dfa_50;
+            this.eof = dfa_51;
+            this.min = dfa_52;
+            this.max = dfa_53;
+            this.accept = dfa_54;
+            this.special = dfa_55;
+            this.transition = dfa_56;
         }
         public String getDescription() {
             return "14709:1: ( rule__XConstructorCall__Group_4__0 )?";
@@ -64945,128 +64230,19 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA109_eotS =
-        "\116\uffff";
-    static final String DFA109_eofS =
-        "\1\2\115\uffff";
-    static final String DFA109_minS =
-        "\1\4\1\0\114\uffff";
-    static final String DFA109_maxS =
-        "\1\135\1\0\114\uffff";
-    static final String DFA109_acceptS =
-        "\2\uffff\1\2\112\uffff\1\1";
-    static final String DFA109_specialS =
-        "\1\uffff\1\0\114\uffff}>";
-    static final String[] DFA109_transitionS = {
-            "\5\2\5\uffff\46\2\6\uffff\3\2\1\uffff\4\2\1\1\24\2\2\uffff"+
-            "\2\2\1\uffff\2\2",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA109_eot = DFA.unpackEncodedString(DFA109_eotS);
-    static final short[] DFA109_eof = DFA.unpackEncodedString(DFA109_eofS);
-    static final char[] DFA109_min = DFA.unpackEncodedStringToUnsignedChars(DFA109_minS);
-    static final char[] DFA109_max = DFA.unpackEncodedStringToUnsignedChars(DFA109_maxS);
-    static final short[] DFA109_accept = DFA.unpackEncodedString(DFA109_acceptS);
-    static final short[] DFA109_special = DFA.unpackEncodedString(DFA109_specialS);
-    static final short[][] DFA109_transition;
-
-    static {
-        int numStates = DFA109_transitionS.length;
-        DFA109_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA109_transition[i] = DFA.unpackEncodedString(DFA109_transitionS[i]);
-        }
-    }
 
     class DFA109 extends DFA {
 
         public DFA109(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 109;
-            this.eot = DFA109_eot;
-            this.eof = DFA109_eof;
-            this.min = DFA109_min;
-            this.max = DFA109_max;
-            this.accept = DFA109_accept;
-            this.special = DFA109_special;
-            this.transition = DFA109_transition;
+            this.eot = dfa_50;
+            this.eof = dfa_51;
+            this.min = dfa_52;
+            this.max = dfa_53;
+            this.accept = dfa_54;
+            this.special = dfa_55;
+            this.transition = dfa_57;
         }
         public String getDescription() {
             return "14737:1: ( rule__XConstructorCall__ArgumentsAssignment_5 )?";
@@ -65098,26 +64274,13 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA114_eotS =
-        "\116\uffff";
-    static final String DFA114_eofS =
-        "\1\41\115\uffff";
-    static final String DFA114_minS =
-        "\1\4\40\0\55\uffff";
-    static final String DFA114_maxS =
-        "\1\135\40\0\55\uffff";
-    static final String DFA114_acceptS =
-        "\41\uffff\1\2\53\uffff\1\1";
-    static final String DFA114_specialS =
-        "\1\uffff\1\0\1\1\1\2\1\3\1\4\1\5\1\6\1\7\1\10\1\11\1\12\1\13\1"+
-        "\14\1\15\1\16\1\17\1\20\1\21\1\22\1\23\1\24\1\25\1\26\1\27\1\30"+
-        "\1\31\1\32\1\33\1\34\1\35\1\36\1\37\55\uffff}>";
-    static final String[] DFA114_transitionS = {
-            "\1\1\1\23\1\24\1\25\1\27\5\uffff\15\41\1\15\6\41\1\10\1\7\4"+
-            "\41\1\6\4\41\1\2\1\3\1\4\1\5\1\16\1\21\1\41\6\uffff\1\12\1\41"+
-            "\1\32\1\uffff\1\40\2\41\1\17\1\20\4\41\1\31\1\41\1\13\2\41\1"+
-            "\33\1\34\1\11\1\26\1\30\1\35\1\36\1\37\1\41\1\14\1\41\2\uffff"+
-            "\2\41\1\uffff\1\41\1\22",
+    static final String dfa_71s = "\1\41\115\uffff";
+    static final String dfa_72s = "\1\4\40\0\55\uffff";
+    static final String dfa_73s = "\1\135\40\0\55\uffff";
+    static final String dfa_74s = "\41\uffff\1\2\53\uffff\1\1";
+    static final String dfa_75s = "\1\uffff\1\0\1\1\1\2\1\3\1\4\1\5\1\6\1\7\1\10\1\11\1\12\1\13\1\14\1\15\1\16\1\17\1\20\1\21\1\22\1\23\1\24\1\25\1\26\1\27\1\30\1\31\1\32\1\33\1\34\1\35\1\36\1\37\55\uffff}>";
+    static final String[] dfa_76s = {
+            "\1\1\1\23\1\24\1\25\1\27\5\uffff\15\41\1\15\6\41\1\10\1\7\4\41\1\6\4\41\1\2\1\3\1\4\1\5\1\16\1\21\1\41\6\uffff\1\12\1\41\1\32\1\uffff\1\40\2\41\1\17\1\20\4\41\1\31\1\41\1\13\2\41\1\33\1\34\1\11\1\26\1\30\1\35\1\36\1\37\1\41\1\14\1\41\2\uffff\2\41\1\uffff\1\41\1\22",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -65196,35 +64359,25 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             "",
             ""
     };
-
-    static final short[] DFA114_eot = DFA.unpackEncodedString(DFA114_eotS);
-    static final short[] DFA114_eof = DFA.unpackEncodedString(DFA114_eofS);
-    static final char[] DFA114_min = DFA.unpackEncodedStringToUnsignedChars(DFA114_minS);
-    static final char[] DFA114_max = DFA.unpackEncodedStringToUnsignedChars(DFA114_maxS);
-    static final short[] DFA114_accept = DFA.unpackEncodedString(DFA114_acceptS);
-    static final short[] DFA114_special = DFA.unpackEncodedString(DFA114_specialS);
-    static final short[][] DFA114_transition;
-
-    static {
-        int numStates = DFA114_transitionS.length;
-        DFA114_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA114_transition[i] = DFA.unpackEncodedString(DFA114_transitionS[i]);
-        }
-    }
+    static final short[] dfa_71 = DFA.unpackEncodedString(dfa_71s);
+    static final char[] dfa_72 = DFA.unpackEncodedStringToUnsignedChars(dfa_72s);
+    static final char[] dfa_73 = DFA.unpackEncodedStringToUnsignedChars(dfa_73s);
+    static final short[] dfa_74 = DFA.unpackEncodedString(dfa_74s);
+    static final short[] dfa_75 = DFA.unpackEncodedString(dfa_75s);
+    static final short[][] dfa_76 = unpackEncodedStringArray(dfa_76s);
 
     class DFA114 extends DFA {
 
         public DFA114(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 114;
-            this.eot = DFA114_eot;
-            this.eof = DFA114_eof;
-            this.min = DFA114_min;
-            this.max = DFA114_max;
-            this.accept = DFA114_accept;
-            this.special = DFA114_special;
-            this.transition = DFA114_transition;
+            this.eot = dfa_50;
+            this.eof = dfa_71;
+            this.min = dfa_72;
+            this.max = dfa_73;
+            this.accept = dfa_74;
+            this.special = dfa_75;
+            this.transition = dfa_76;
         }
         public String getDescription() {
             return "15790:1: ( rule__XReturnExpression__ExpressionAssignment_2 )?";
@@ -65721,21 +64874,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA123_eotS =
-        "\117\uffff";
-    static final String DFA123_eofS =
-        "\1\2\116\uffff";
-    static final String DFA123_minS =
-        "\1\4\1\0\115\uffff";
-    static final String DFA123_maxS =
-        "\1\135\1\0\115\uffff";
-    static final String DFA123_acceptS =
-        "\2\uffff\1\2\113\uffff\1\1";
-    static final String DFA123_specialS =
-        "\1\uffff\1\0\115\uffff}>";
-    static final String[] DFA123_transitionS = {
-            "\5\2\5\uffff\15\2\1\1\30\2\6\uffff\3\2\1\uffff\31\2\1\uffff"+
-            "\3\2\1\uffff\2\2",
+    static final String dfa_77s = "\117\uffff";
+    static final String dfa_78s = "\1\2\116\uffff";
+    static final String dfa_79s = "\1\4\1\0\115\uffff";
+    static final String dfa_80s = "\1\135\1\0\115\uffff";
+    static final String dfa_81s = "\2\uffff\1\2\113\uffff\1\1";
+    static final String dfa_82s = "\1\uffff\1\0\115\uffff}>";
+    static final String[] dfa_83s = {
+            "\5\2\5\uffff\15\2\1\1\30\2\6\uffff\3\2\1\uffff\31\2\1\uffff\3\2\1\uffff\2\2",
             "\1\uffff",
             "",
             "",
@@ -65816,34 +64962,26 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA123_eot = DFA.unpackEncodedString(DFA123_eotS);
-    static final short[] DFA123_eof = DFA.unpackEncodedString(DFA123_eofS);
-    static final char[] DFA123_min = DFA.unpackEncodedStringToUnsignedChars(DFA123_minS);
-    static final char[] DFA123_max = DFA.unpackEncodedStringToUnsignedChars(DFA123_maxS);
-    static final short[] DFA123_accept = DFA.unpackEncodedString(DFA123_acceptS);
-    static final short[] DFA123_special = DFA.unpackEncodedString(DFA123_specialS);
-    static final short[][] DFA123_transition;
-
-    static {
-        int numStates = DFA123_transitionS.length;
-        DFA123_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA123_transition[i] = DFA.unpackEncodedString(DFA123_transitionS[i]);
-        }
-    }
+    static final short[] dfa_77 = DFA.unpackEncodedString(dfa_77s);
+    static final short[] dfa_78 = DFA.unpackEncodedString(dfa_78s);
+    static final char[] dfa_79 = DFA.unpackEncodedStringToUnsignedChars(dfa_79s);
+    static final char[] dfa_80 = DFA.unpackEncodedStringToUnsignedChars(dfa_80s);
+    static final short[] dfa_81 = DFA.unpackEncodedString(dfa_81s);
+    static final short[] dfa_82 = DFA.unpackEncodedString(dfa_82s);
+    static final short[][] dfa_83 = unpackEncodedStringArray(dfa_83s);
 
     class DFA123 extends DFA {
 
         public DFA123(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 123;
-            this.eot = DFA123_eot;
-            this.eof = DFA123_eof;
-            this.min = DFA123_min;
-            this.max = DFA123_max;
-            this.accept = DFA123_accept;
-            this.special = DFA123_special;
-            this.transition = DFA123_transition;
+            this.eot = dfa_77;
+            this.eof = dfa_78;
+            this.min = dfa_79;
+            this.max = dfa_80;
+            this.accept = dfa_81;
+            this.special = dfa_82;
+            this.transition = dfa_83;
         }
         public String getDescription() {
             return "17369:1: ( rule__JvmParameterizedTypeReference__Group_1__0 )?";
@@ -65875,129 +65013,19 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA126_eotS =
-        "\117\uffff";
-    static final String DFA126_eofS =
-        "\1\2\116\uffff";
-    static final String DFA126_minS =
-        "\1\4\1\0\115\uffff";
-    static final String DFA126_maxS =
-        "\1\135\1\0\115\uffff";
-    static final String DFA126_acceptS =
-        "\2\uffff\1\2\113\uffff\1\1";
-    static final String DFA126_specialS =
-        "\1\uffff\1\0\115\uffff}>";
-    static final String[] DFA126_transitionS = {
-            "\5\2\5\uffff\15\2\1\1\30\2\6\uffff\3\2\1\uffff\31\2\1\uffff"+
-            "\3\2\1\uffff\2\2",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA126_eot = DFA.unpackEncodedString(DFA126_eotS);
-    static final short[] DFA126_eof = DFA.unpackEncodedString(DFA126_eofS);
-    static final char[] DFA126_min = DFA.unpackEncodedStringToUnsignedChars(DFA126_minS);
-    static final char[] DFA126_max = DFA.unpackEncodedStringToUnsignedChars(DFA126_maxS);
-    static final short[] DFA126_accept = DFA.unpackEncodedString(DFA126_acceptS);
-    static final short[] DFA126_special = DFA.unpackEncodedString(DFA126_specialS);
-    static final short[][] DFA126_transition;
-
-    static {
-        int numStates = DFA126_transitionS.length;
-        DFA126_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA126_transition[i] = DFA.unpackEncodedString(DFA126_transitionS[i]);
-        }
-    }
 
     class DFA126 extends DFA {
 
         public DFA126(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 126;
-            this.eot = DFA126_eot;
-            this.eof = DFA126_eof;
-            this.min = DFA126_min;
-            this.max = DFA126_max;
-            this.accept = DFA126_accept;
-            this.special = DFA126_special;
-            this.transition = DFA126_transition;
+            this.eot = dfa_77;
+            this.eof = dfa_78;
+            this.min = dfa_79;
+            this.max = dfa_80;
+            this.accept = dfa_81;
+            this.special = dfa_82;
+            this.transition = dfa_83;
         }
         public String getDescription() {
             return "17680:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )?";
@@ -66031,1792 +65059,115 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
     }
  
 
-    public static final BitSet FOLLOW_ruleCheckConfiguration_in_entryRuleCheckConfiguration67 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleCheckConfiguration74 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckConfiguration__Group__0_in_ruleCheckConfiguration100 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConfiguredLanguageValidator_in_entryRuleConfiguredLanguageValidator127 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleConfiguredLanguageValidator134 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredLanguageValidator__Group__0_in_ruleConfiguredLanguageValidator160 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConfiguredCatalog_in_entryRuleConfiguredCatalog187 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleConfiguredCatalog194 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredCatalog__Group__0_in_ruleConfiguredCatalog220 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConfiguredCheck_in_entryRuleConfiguredCheck247 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleConfiguredCheck254 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredCheck__Group__0_in_ruleConfiguredCheck280 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConfiguredParameter_in_entryRuleConfiguredParameter307 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleConfiguredParameter314 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredParameter__Group__0_in_ruleConfiguredParameter340 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSimpleFormalParameterDefaultValueLiteral_in_entryRuleXSimpleFormalParameterDefaultValueLiteral367 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXSimpleFormalParameterDefaultValueLiteral374 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives_in_ruleXSimpleFormalParameterDefaultValueLiteral400 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstantUnaryOperation_in_entryRuleXConstantUnaryOperation427 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXConstantUnaryOperation434 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantUnaryOperation__Alternatives_in_ruleXConstantUnaryOperation460 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXFormalParameterDefaultValueLiteral_in_entryRuleXFormalParameterDefaultValueLiteral487 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXFormalParameterDefaultValueLiteral494 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFormalParameterDefaultValueLiteral__Alternatives_in_ruleXFormalParameterDefaultValueLiteral520 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstantListLiteral_in_entryRuleXConstantListLiteral547 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXConstantListLiteral554 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group__0_in_ruleXConstantListLiteral580 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_entryRuleXExpression607 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXExpression614 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAssignment_in_ruleXExpression640 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAssignment_in_entryRuleXAssignment666 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAssignment673 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Alternatives_in_ruleXAssignment699 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpSingleAssign_in_entryRuleOpSingleAssign726 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpSingleAssign733 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_13_in_ruleOpSingleAssign760 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpMultiAssign_in_entryRuleOpMultiAssign788 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpMultiAssign795 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Alternatives_in_ruleOpMultiAssign821 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXOrExpression_in_entryRuleXOrExpression848 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXOrExpression855 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group__0_in_ruleXOrExpression881 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpOr_in_entryRuleOpOr908 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpOr915 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_14_in_ruleOpOr942 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAndExpression_in_entryRuleXAndExpression970 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAndExpression977 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group__0_in_ruleXAndExpression1003 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpAnd_in_entryRuleOpAnd1030 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpAnd1037 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_15_in_ruleOpAnd1064 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXEqualityExpression_in_entryRuleXEqualityExpression1092 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXEqualityExpression1099 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group__0_in_ruleXEqualityExpression1125 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpEquality_in_entryRuleOpEquality1152 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpEquality1159 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpEquality__Alternatives_in_ruleOpEquality1185 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXRelationalExpression_in_entryRuleXRelationalExpression1212 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXRelationalExpression1219 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group__0_in_ruleXRelationalExpression1245 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpCompare_in_entryRuleOpCompare1272 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpCompare1279 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpCompare__Alternatives_in_ruleOpCompare1305 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXOtherOperatorExpression_in_entryRuleXOtherOperatorExpression1332 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXOtherOperatorExpression1339 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group__0_in_ruleXOtherOperatorExpression1365 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpOther_in_entryRuleOpOther1392 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpOther1399 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Alternatives_in_ruleOpOther1425 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAdditiveExpression_in_entryRuleXAdditiveExpression1452 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAdditiveExpression1459 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group__0_in_ruleXAdditiveExpression1485 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpAdd_in_entryRuleOpAdd1512 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpAdd1519 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpAdd__Alternatives_in_ruleOpAdd1545 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXMultiplicativeExpression_in_entryRuleXMultiplicativeExpression1572 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXMultiplicativeExpression1579 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group__0_in_ruleXMultiplicativeExpression1605 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpMulti_in_entryRuleOpMulti1632 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpMulti1639 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpMulti__Alternatives_in_ruleOpMulti1665 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXUnaryOperation_in_entryRuleXUnaryOperation1692 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXUnaryOperation1699 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XUnaryOperation__Alternatives_in_ruleXUnaryOperation1725 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpUnary_in_entryRuleOpUnary1752 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpUnary1759 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpUnary__Alternatives_in_ruleOpUnary1785 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCastedExpression_in_entryRuleXCastedExpression1812 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXCastedExpression1819 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group__0_in_ruleXCastedExpression1845 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXPostfixOperation_in_entryRuleXPostfixOperation1872 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXPostfixOperation1879 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group__0_in_ruleXPostfixOperation1905 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpPostfix_in_entryRuleOpPostfix1932 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpPostfix1939 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpPostfix__Alternatives_in_ruleOpPostfix1965 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXMemberFeatureCall_in_entryRuleXMemberFeatureCall1992 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXMemberFeatureCall1999 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group__0_in_ruleXMemberFeatureCall2025 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXPrimaryExpression_in_entryRuleXPrimaryExpression2052 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXPrimaryExpression2059 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XPrimaryExpression__Alternatives_in_ruleXPrimaryExpression2085 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXLiteral_in_entryRuleXLiteral2112 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXLiteral2119 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XLiteral__Alternatives_in_ruleXLiteral2145 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCollectionLiteral_in_entryRuleXCollectionLiteral2172 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXCollectionLiteral2179 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCollectionLiteral__Alternatives_in_ruleXCollectionLiteral2205 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSetLiteral_in_entryRuleXSetLiteral2232 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXSetLiteral2239 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group__0_in_ruleXSetLiteral2265 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXListLiteral_in_entryRuleXListLiteral2292 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXListLiteral2299 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group__0_in_ruleXListLiteral2325 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXClosure_in_entryRuleXClosure2352 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXClosure2359 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group__0_in_ruleXClosure2385 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpressionInClosure_in_entryRuleXExpressionInClosure2412 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXExpressionInClosure2419 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XExpressionInClosure__Group__0_in_ruleXExpressionInClosure2445 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXShortClosure_in_entryRuleXShortClosure2472 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXShortClosure2479 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group__0_in_ruleXShortClosure2505 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXParenthesizedExpression_in_entryRuleXParenthesizedExpression2532 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXParenthesizedExpression2539 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XParenthesizedExpression__Group__0_in_ruleXParenthesizedExpression2565 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXIfExpression_in_entryRuleXIfExpression2592 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXIfExpression2599 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__0_in_ruleXIfExpression2625 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSwitchExpression_in_entryRuleXSwitchExpression2652 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXSwitchExpression2659 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__0_in_ruleXSwitchExpression2685 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCasePart_in_entryRuleXCasePart2712 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXCasePart2719 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group__0_in_ruleXCasePart2745 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXForLoopExpression_in_entryRuleXForLoopExpression2772 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXForLoopExpression2779 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group__0_in_ruleXForLoopExpression2805 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBasicForLoopExpression_in_entryRuleXBasicForLoopExpression2832 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXBasicForLoopExpression2839 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__0_in_ruleXBasicForLoopExpression2865 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXWhileExpression_in_entryRuleXWhileExpression2892 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXWhileExpression2899 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__0_in_ruleXWhileExpression2925 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXDoWhileExpression_in_entryRuleXDoWhileExpression2952 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXDoWhileExpression2959 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__0_in_ruleXDoWhileExpression2985 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBlockExpression_in_entryRuleXBlockExpression3012 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXBlockExpression3019 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group__0_in_ruleXBlockExpression3045 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_entryRuleXExpressionOrVarDeclaration3072 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXExpressionOrVarDeclaration3079 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XExpressionOrVarDeclaration__Alternatives_in_ruleXExpressionOrVarDeclaration3105 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXVariableDeclaration_in_entryRuleXVariableDeclaration3132 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXVariableDeclaration3139 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group__0_in_ruleXVariableDeclaration3165 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_entryRuleJvmFormalParameter3192 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmFormalParameter3199 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmFormalParameter__Group__0_in_ruleJvmFormalParameter3225 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFullJvmFormalParameter_in_entryRuleFullJvmFormalParameter3252 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFullJvmFormalParameter3259 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FullJvmFormalParameter__Group__0_in_ruleFullJvmFormalParameter3285 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXFeatureCall_in_entryRuleXFeatureCall3312 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXFeatureCall3319 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group__0_in_ruleXFeatureCall3345 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFeatureCallID_in_entryRuleFeatureCallID3372 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFeatureCallID3379 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FeatureCallID__Alternatives_in_ruleFeatureCallID3405 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdOrSuper_in_entryRuleIdOrSuper3432 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIdOrSuper3439 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IdOrSuper__Alternatives_in_ruleIdOrSuper3465 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstructorCall_in_entryRuleXConstructorCall3492 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXConstructorCall3499 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__0_in_ruleXConstructorCall3525 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBooleanLiteral_in_entryRuleXBooleanLiteral3552 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXBooleanLiteral3559 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBooleanLiteral__Group__0_in_ruleXBooleanLiteral3585 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXNullLiteral_in_entryRuleXNullLiteral3612 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXNullLiteral3619 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XNullLiteral__Group__0_in_ruleXNullLiteral3645 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXNumberLiteral_in_entryRuleXNumberLiteral3672 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXNumberLiteral3679 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XNumberLiteral__Group__0_in_ruleXNumberLiteral3705 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXStringLiteral_in_entryRuleXStringLiteral3732 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXStringLiteral3739 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XStringLiteral__Group__0_in_ruleXStringLiteral3765 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXTypeLiteral_in_entryRuleXTypeLiteral3792 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXTypeLiteral3799 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__0_in_ruleXTypeLiteral3825 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXThrowExpression_in_entryRuleXThrowExpression3852 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXThrowExpression3859 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XThrowExpression__Group__0_in_ruleXThrowExpression3885 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXReturnExpression_in_entryRuleXReturnExpression3912 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXReturnExpression3919 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XReturnExpression__Group__0_in_ruleXReturnExpression3945 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXTryCatchFinallyExpression_in_entryRuleXTryCatchFinallyExpression3972 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXTryCatchFinallyExpression3979 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group__0_in_ruleXTryCatchFinallyExpression4005 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSynchronizedExpression_in_entryRuleXSynchronizedExpression4032 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXSynchronizedExpression4039 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group__0_in_ruleXSynchronizedExpression4065 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCatchClause_in_entryRuleXCatchClause4092 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXCatchClause4099 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCatchClause__Group__0_in_ruleXCatchClause4125 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName4152 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedName4159 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group__0_in_ruleQualifiedName4185 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNumber_in_entryRuleNumber4217 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNumber4224 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Number__Alternatives_in_ruleNumber4254 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_entryRuleJvmTypeReference4283 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmTypeReference4290 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Alternatives_in_ruleJvmTypeReference4316 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleArrayBrackets_in_entryRuleArrayBrackets4343 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleArrayBrackets4350 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ArrayBrackets__Group__0_in_ruleArrayBrackets4376 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXFunctionTypeRef_in_entryRuleXFunctionTypeRef4403 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXFunctionTypeRef4410 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group__0_in_ruleXFunctionTypeRef4436 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmParameterizedTypeReference_in_entryRuleJvmParameterizedTypeReference4463 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmParameterizedTypeReference4470 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group__0_in_ruleJvmParameterizedTypeReference4496 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_entryRuleJvmArgumentTypeReference4523 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmArgumentTypeReference4530 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmArgumentTypeReference__Alternatives_in_ruleJvmArgumentTypeReference4556 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmWildcardTypeReference_in_entryRuleJvmWildcardTypeReference4583 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmWildcardTypeReference4590 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group__0_in_ruleJvmWildcardTypeReference4616 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmUpperBound_in_entryRuleJvmUpperBound4643 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmUpperBound4650 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmUpperBound__Group__0_in_ruleJvmUpperBound4676 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmUpperBoundAnded_in_entryRuleJvmUpperBoundAnded4703 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmUpperBoundAnded4710 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmUpperBoundAnded__Group__0_in_ruleJvmUpperBoundAnded4736 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmLowerBound_in_entryRuleJvmLowerBound4763 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmLowerBound4770 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmLowerBound__Group__0_in_ruleJvmLowerBound4796 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmLowerBoundAnded_in_entryRuleJvmLowerBoundAnded4823 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmLowerBoundAnded4830 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmLowerBoundAnded__Group__0_in_ruleJvmLowerBoundAnded4856 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedNameWithWildcard_in_entryRuleQualifiedNameWithWildcard4885 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedNameWithWildcard4892 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedNameWithWildcard__Group__0_in_ruleQualifiedNameWithWildcard4918 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_entryRuleValidID4945 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleValidID4952 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleValidID4978 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXImportDeclaration_in_entryRuleXImportDeclaration5006 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXImportDeclaration5013 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Group__0_in_ruleXImportDeclaration5039 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedNameInStaticImport_in_entryRuleQualifiedNameInStaticImport5066 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedNameInStaticImport5073 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedNameInStaticImport__Group__0_in_ruleQualifiedNameInStaticImport5101 = new BitSet(new long[]{0x0000000000000012L});
-    public static final BitSet FOLLOW_rule__QualifiedNameInStaticImport__Group__0_in_ruleQualifiedNameInStaticImport5113 = new BitSet(new long[]{0x0000000000000012L});
-    public static final BitSet FOLLOW_rule__SeverityKind__Alternatives_in_ruleSeverityKind5153 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBooleanLiteral_in_rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives5188 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXNumberLiteral_in_rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives5205 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXStringLiteral_in_rule__XSimpleFormalParameterDefaultValueLiteral__Alternatives5222 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantUnaryOperation__Group_0__0_in_rule__XConstantUnaryOperation__Alternatives5254 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSimpleFormalParameterDefaultValueLiteral_in_rule__XConstantUnaryOperation__Alternatives5272 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstantUnaryOperation_in_rule__XFormalParameterDefaultValueLiteral__Alternatives5304 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstantListLiteral_in_rule__XFormalParameterDefaultValueLiteral__Alternatives5321 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_0__0_in_rule__XAssignment__Alternatives5353 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1__0_in_rule__XAssignment__Alternatives5371 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_16_in_rule__OpMultiAssign__Alternatives5405 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_17_in_rule__OpMultiAssign__Alternatives5425 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_18_in_rule__OpMultiAssign__Alternatives5445 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_rule__OpMultiAssign__Alternatives5465 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_20_in_rule__OpMultiAssign__Alternatives5485 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_5__0_in_rule__OpMultiAssign__Alternatives5504 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_6__0_in_rule__OpMultiAssign__Alternatives5522 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_21_in_rule__OpEquality__Alternatives5556 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_22_in_rule__OpEquality__Alternatives5576 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_rule__OpEquality__Alternatives5596 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_rule__OpEquality__Alternatives5616 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0__0_in_rule__XRelationalExpression__Alternatives_15650 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1__0_in_rule__XRelationalExpression__Alternatives_15668 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_25_in_rule__OpCompare__Alternatives5702 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpCompare__Group_1__0_in_rule__OpCompare__Alternatives5721 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_rule__OpCompare__Alternatives5740 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__OpCompare__Alternatives5760 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__OpOther__Alternatives5795 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_rule__OpOther__Alternatives5815 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_2__0_in_rule__OpOther__Alternatives5834 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_rule__OpOther__Alternatives5853 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_rule__OpOther__Alternatives5873 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_5__0_in_rule__OpOther__Alternatives5892 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_6__0_in_rule__OpOther__Alternatives5910 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_rule__OpOther__Alternatives5929 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_rule__OpOther__Alternatives5949 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_5_1_0__0_in_rule__OpOther__Alternatives_5_15983 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_rule__OpOther__Alternatives_5_16002 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_6_1_0__0_in_rule__OpOther__Alternatives_6_16036 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__OpOther__Alternatives_6_16055 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_rule__OpOther__Alternatives_6_16075 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_34_in_rule__OpAdd__Alternatives6110 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_35_in_rule__OpAdd__Alternatives6130 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_rule__OpMulti__Alternatives6165 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_37_in_rule__OpMulti__Alternatives6185 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_38_in_rule__OpMulti__Alternatives6205 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_39_in_rule__OpMulti__Alternatives6225 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XUnaryOperation__Group_0__0_in_rule__XUnaryOperation__Alternatives6259 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCastedExpression_in_rule__XUnaryOperation__Alternatives6277 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_40_in_rule__OpUnary__Alternatives6310 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_35_in_rule__OpUnary__Alternatives6330 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_34_in_rule__OpUnary__Alternatives6350 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__OpPostfix__Alternatives6385 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__OpPostfix__Alternatives6405 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0__0_in_rule__XMemberFeatureCall__Alternatives_16439 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__0_in_rule__XMemberFeatureCall__Alternatives_16457 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_rule__XMemberFeatureCall__Alternatives_1_0_0_0_16491 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1_in_rule__XMemberFeatureCall__Alternatives_1_0_0_0_16510 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_rule__XMemberFeatureCall__Alternatives_1_1_0_0_16544 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1_in_rule__XMemberFeatureCall__Alternatives_1_1_0_0_16563 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2_in_rule__XMemberFeatureCall__Alternatives_1_1_0_0_16581 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0_in_rule__XMemberFeatureCall__Alternatives_1_1_3_16614 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1__0_in_rule__XMemberFeatureCall__Alternatives_1_1_3_16632 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstructorCall_in_rule__XPrimaryExpression__Alternatives6665 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBlockExpression_in_rule__XPrimaryExpression__Alternatives6682 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSwitchExpression_in_rule__XPrimaryExpression__Alternatives6699 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSynchronizedExpression_in_rule__XPrimaryExpression__Alternatives6717 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXFeatureCall_in_rule__XPrimaryExpression__Alternatives6735 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXLiteral_in_rule__XPrimaryExpression__Alternatives6752 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXIfExpression_in_rule__XPrimaryExpression__Alternatives6769 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXForLoopExpression_in_rule__XPrimaryExpression__Alternatives6787 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBasicForLoopExpression_in_rule__XPrimaryExpression__Alternatives6805 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXWhileExpression_in_rule__XPrimaryExpression__Alternatives6822 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXDoWhileExpression_in_rule__XPrimaryExpression__Alternatives6839 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXThrowExpression_in_rule__XPrimaryExpression__Alternatives6856 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXReturnExpression_in_rule__XPrimaryExpression__Alternatives6873 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXTryCatchFinallyExpression_in_rule__XPrimaryExpression__Alternatives6890 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXParenthesizedExpression_in_rule__XPrimaryExpression__Alternatives6907 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCollectionLiteral_in_rule__XLiteral__Alternatives6939 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXClosure_in_rule__XLiteral__Alternatives6957 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBooleanLiteral_in_rule__XLiteral__Alternatives6975 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXNumberLiteral_in_rule__XLiteral__Alternatives6992 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXNullLiteral_in_rule__XLiteral__Alternatives7009 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXStringLiteral_in_rule__XLiteral__Alternatives7026 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXTypeLiteral_in_rule__XLiteral__Alternatives7043 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSetLiteral_in_rule__XCollectionLiteral__Alternatives7075 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXListLiteral_in_rule__XCollectionLiteral__Alternatives7092 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0__0_in_rule__XSwitchExpression__Alternatives_27124 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1__0_in_rule__XSwitchExpression__Alternatives_27142 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group_3_0__0_in_rule__XCasePart__Alternatives_37175 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__FallThroughAssignment_3_1_in_rule__XCasePart__Alternatives_37193 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXVariableDeclaration_in_rule__XExpressionOrVarDeclaration__Alternatives7226 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XExpressionOrVarDeclaration__Alternatives7243 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__WriteableAssignment_1_0_in_rule__XVariableDeclaration__Alternatives_17275 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_44_in_rule__XVariableDeclaration__Alternatives_17294 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_2_0__0_in_rule__XVariableDeclaration__Alternatives_27328 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__NameAssignment_2_1_in_rule__XVariableDeclaration__Alternatives_27346 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0_in_rule__XFeatureCall__Alternatives_3_17379 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3_1_1__0_in_rule__XFeatureCall__Alternatives_3_17397 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__FeatureCallID__Alternatives7430 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_45_in_rule__FeatureCallID__Alternatives7448 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rule__FeatureCallID__Alternatives7468 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__FeatureCallID__Alternatives7488 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_rule__FeatureCallID__Alternatives7508 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFeatureCallID_in_rule__IdOrSuper__Alternatives7542 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_49_in_rule__IdOrSuper__Alternatives7560 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__ArgumentsAssignment_4_1_0_in_rule__XConstructorCall__Alternatives_4_17594 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4_1_1__0_in_rule__XConstructorCall__Alternatives_4_17612 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_50_in_rule__XBooleanLiteral__Alternatives_17646 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBooleanLiteral__IsTrueAssignment_1_1_in_rule__XBooleanLiteral__Alternatives_17665 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0__0_in_rule__XTryCatchFinallyExpression__Alternatives_37698 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_1__0_in_rule__XTryCatchFinallyExpression__Alternatives_37716 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_HEX_in_rule__Number__Alternatives7749 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Number__Group_1__0_in_rule__Number__Alternatives7766 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__Number__Alternatives_1_07799 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_DECIMAL_in_rule__Number__Alternatives_1_07816 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__Number__Alternatives_1_1_17848 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_DECIMAL_in_rule__Number__Alternatives_1_1_17865 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0__0_in_rule__JvmTypeReference__Alternatives7897 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXFunctionTypeRef_in_rule__JvmTypeReference__Alternatives7915 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__JvmArgumentTypeReference__Alternatives7947 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmWildcardTypeReference_in_rule__JvmArgumentTypeReference__Alternatives7964 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group_2_0__0_in_rule__JvmWildcardTypeReference__Alternatives_27996 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group_2_1__0_in_rule__JvmWildcardTypeReference__Alternatives_28014 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Group_1_0__0_in_rule__XImportDeclaration__Alternatives_18047 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__ImportedTypeAssignment_1_1_in_rule__XImportDeclaration__Alternatives_18065 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__ImportedNamespaceAssignment_1_2_in_rule__XImportDeclaration__Alternatives_18083 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__WildcardAssignment_1_0_3_0_in_rule__XImportDeclaration__Alternatives_1_0_38116 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__MemberNameAssignment_1_0_3_1_in_rule__XImportDeclaration__Alternatives_1_0_38134 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__SeverityKind__Alternatives8168 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_rule__SeverityKind__Alternatives8189 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_53_in_rule__SeverityKind__Alternatives8210 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_54_in_rule__SeverityKind__Alternatives8231 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_55_in_rule__SeverityKind__Alternatives8252 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckConfiguration__Group__0__Impl_in_rule__CheckConfiguration__Group__08285 = new BitSet(new long[]{0x0200000000000000L});
-    public static final BitSet FOLLOW_rule__CheckConfiguration__Group__1_in_rule__CheckConfiguration__Group__08288 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_rule__CheckConfiguration__Group__0__Impl8316 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckConfiguration__Group__1__Impl_in_rule__CheckConfiguration__Group__18347 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__CheckConfiguration__Group__2_in_rule__CheckConfiguration__Group__18350 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_57_in_rule__CheckConfiguration__Group__1__Impl8378 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckConfiguration__Group__2__Impl_in_rule__CheckConfiguration__Group__28409 = new BitSet(new long[]{0x1400000000000010L});
-    public static final BitSet FOLLOW_rule__CheckConfiguration__Group__3_in_rule__CheckConfiguration__Group__28412 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckConfiguration__NameAssignment_2_in_rule__CheckConfiguration__Group__2__Impl8439 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckConfiguration__Group__3__Impl_in_rule__CheckConfiguration__Group__38469 = new BitSet(new long[]{0x1400000000000010L});
-    public static final BitSet FOLLOW_rule__CheckConfiguration__Group__4_in_rule__CheckConfiguration__Group__38472 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckConfiguration__ParameterConfigurationsAssignment_3_in_rule__CheckConfiguration__Group__3__Impl8499 = new BitSet(new long[]{0x0000000000000012L});
-    public static final BitSet FOLLOW_rule__CheckConfiguration__Group__4__Impl_in_rule__CheckConfiguration__Group__48530 = new BitSet(new long[]{0x1400000000000010L});
-    public static final BitSet FOLLOW_rule__CheckConfiguration__Group__5_in_rule__CheckConfiguration__Group__48533 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckConfiguration__LanguageValidatorConfigurationsAssignment_4_in_rule__CheckConfiguration__Group__4__Impl8560 = new BitSet(new long[]{0x1000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckConfiguration__Group__5__Impl_in_rule__CheckConfiguration__Group__58591 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckConfiguration__Group_5__0_in_rule__CheckConfiguration__Group__5__Impl8618 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckConfiguration__Group_5__0__Impl_in_rule__CheckConfiguration__Group_5__08661 = new BitSet(new long[]{0x2800000000000000L});
-    public static final BitSet FOLLOW_rule__CheckConfiguration__Group_5__1_in_rule__CheckConfiguration__Group_5__08664 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_58_in_rule__CheckConfiguration__Group_5__0__Impl8692 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckConfiguration__Group_5__1__Impl_in_rule__CheckConfiguration__Group_5__18723 = new BitSet(new long[]{0x2800000000000000L});
-    public static final BitSet FOLLOW_rule__CheckConfiguration__Group_5__2_in_rule__CheckConfiguration__Group_5__18726 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckConfiguration__LegacyCatalogConfigurationsAssignment_5_1_in_rule__CheckConfiguration__Group_5__1__Impl8753 = new BitSet(new long[]{0x2000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckConfiguration__Group_5__2__Impl_in_rule__CheckConfiguration__Group_5__28784 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_59_in_rule__CheckConfiguration__Group_5__2__Impl8812 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredLanguageValidator__Group__0__Impl_in_rule__ConfiguredLanguageValidator__Group__08849 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__ConfiguredLanguageValidator__Group__1_in_rule__ConfiguredLanguageValidator__Group__08852 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_60_in_rule__ConfiguredLanguageValidator__Group__0__Impl8880 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredLanguageValidator__Group__1__Impl_in_rule__ConfiguredLanguageValidator__Group__18911 = new BitSet(new long[]{0x0400000000000000L});
-    public static final BitSet FOLLOW_rule__ConfiguredLanguageValidator__Group__2_in_rule__ConfiguredLanguageValidator__Group__18914 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredLanguageValidator__LanguageAssignment_1_in_rule__ConfiguredLanguageValidator__Group__1__Impl8941 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredLanguageValidator__Group__2__Impl_in_rule__ConfiguredLanguageValidator__Group__28971 = new BitSet(new long[]{0x2800000000000010L});
-    public static final BitSet FOLLOW_rule__ConfiguredLanguageValidator__Group__3_in_rule__ConfiguredLanguageValidator__Group__28974 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_58_in_rule__ConfiguredLanguageValidator__Group__2__Impl9002 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredLanguageValidator__Group__3__Impl_in_rule__ConfiguredLanguageValidator__Group__39033 = new BitSet(new long[]{0x2800000000000010L});
-    public static final BitSet FOLLOW_rule__ConfiguredLanguageValidator__Group__4_in_rule__ConfiguredLanguageValidator__Group__39036 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredLanguageValidator__ParameterConfigurationsAssignment_3_in_rule__ConfiguredLanguageValidator__Group__3__Impl9063 = new BitSet(new long[]{0x0000000000000012L});
-    public static final BitSet FOLLOW_rule__ConfiguredLanguageValidator__Group__4__Impl_in_rule__ConfiguredLanguageValidator__Group__49094 = new BitSet(new long[]{0x2800000000000010L});
-    public static final BitSet FOLLOW_rule__ConfiguredLanguageValidator__Group__5_in_rule__ConfiguredLanguageValidator__Group__49097 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredLanguageValidator__CatalogConfigurationsAssignment_4_in_rule__ConfiguredLanguageValidator__Group__4__Impl9124 = new BitSet(new long[]{0x2000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredLanguageValidator__Group__5__Impl_in_rule__ConfiguredLanguageValidator__Group__59155 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_59_in_rule__ConfiguredLanguageValidator__Group__5__Impl9183 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredCatalog__Group__0__Impl_in_rule__ConfiguredCatalog__Group__09226 = new BitSet(new long[]{0x2000000000000000L});
-    public static final BitSet FOLLOW_rule__ConfiguredCatalog__Group__1_in_rule__ConfiguredCatalog__Group__09229 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredCatalog__Group__1__Impl_in_rule__ConfiguredCatalog__Group__19287 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__ConfiguredCatalog__Group__2_in_rule__ConfiguredCatalog__Group__19290 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_61_in_rule__ConfiguredCatalog__Group__1__Impl9318 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredCatalog__Group__2__Impl_in_rule__ConfiguredCatalog__Group__29349 = new BitSet(new long[]{0x0400000000000000L});
-    public static final BitSet FOLLOW_rule__ConfiguredCatalog__Group__3_in_rule__ConfiguredCatalog__Group__29352 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredCatalog__CatalogAssignment_2_in_rule__ConfiguredCatalog__Group__2__Impl9379 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredCatalog__Group__3__Impl_in_rule__ConfiguredCatalog__Group__39409 = new BitSet(new long[]{0x08F8000000000010L});
-    public static final BitSet FOLLOW_rule__ConfiguredCatalog__Group__4_in_rule__ConfiguredCatalog__Group__39412 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_58_in_rule__ConfiguredCatalog__Group__3__Impl9440 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredCatalog__Group__4__Impl_in_rule__ConfiguredCatalog__Group__49471 = new BitSet(new long[]{0x08F8000000000010L});
-    public static final BitSet FOLLOW_rule__ConfiguredCatalog__Group__5_in_rule__ConfiguredCatalog__Group__49474 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredCatalog__ParameterConfigurationsAssignment_4_in_rule__ConfiguredCatalog__Group__4__Impl9501 = new BitSet(new long[]{0x0000000000000012L});
-    public static final BitSet FOLLOW_rule__ConfiguredCatalog__Group__5__Impl_in_rule__ConfiguredCatalog__Group__59532 = new BitSet(new long[]{0x08F8000000000010L});
-    public static final BitSet FOLLOW_rule__ConfiguredCatalog__Group__6_in_rule__ConfiguredCatalog__Group__59535 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredCatalog__CheckConfigurationsAssignment_5_in_rule__ConfiguredCatalog__Group__5__Impl9562 = new BitSet(new long[]{0x00F8000000000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredCatalog__Group__6__Impl_in_rule__ConfiguredCatalog__Group__69593 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_59_in_rule__ConfiguredCatalog__Group__6__Impl9621 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredCheck__Group__0__Impl_in_rule__ConfiguredCheck__Group__09666 = new BitSet(new long[]{0x00F8000000000000L});
-    public static final BitSet FOLLOW_rule__ConfiguredCheck__Group__1_in_rule__ConfiguredCheck__Group__09669 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredCheck__Group__1__Impl_in_rule__ConfiguredCheck__Group__19727 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__ConfiguredCheck__Group__2_in_rule__ConfiguredCheck__Group__19730 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredCheck__SeverityAssignment_1_in_rule__ConfiguredCheck__Group__1__Impl9757 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredCheck__Group__2__Impl_in_rule__ConfiguredCheck__Group__29787 = new BitSet(new long[]{0x4000000000000000L});
-    public static final BitSet FOLLOW_rule__ConfiguredCheck__Group__3_in_rule__ConfiguredCheck__Group__29790 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredCheck__CheckAssignment_2_in_rule__ConfiguredCheck__Group__2__Impl9817 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredCheck__Group__3__Impl_in_rule__ConfiguredCheck__Group__39847 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredCheck__Group_3__0_in_rule__ConfiguredCheck__Group__3__Impl9874 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredCheck__Group_3__0__Impl_in_rule__ConfiguredCheck__Group_3__09913 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__ConfiguredCheck__Group_3__1_in_rule__ConfiguredCheck__Group_3__09916 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_62_in_rule__ConfiguredCheck__Group_3__0__Impl9944 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredCheck__Group_3__1__Impl_in_rule__ConfiguredCheck__Group_3__19975 = new BitSet(new long[]{0x8000000000000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__ConfiguredCheck__Group_3__2_in_rule__ConfiguredCheck__Group_3__19978 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_1_in_rule__ConfiguredCheck__Group_3__1__Impl10005 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredCheck__Group_3__2__Impl_in_rule__ConfiguredCheck__Group_3__210035 = new BitSet(new long[]{0x8000000000000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__ConfiguredCheck__Group_3__3_in_rule__ConfiguredCheck__Group_3__210038 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredCheck__Group_3_2__0_in_rule__ConfiguredCheck__Group_3__2__Impl10065 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__ConfiguredCheck__Group_3__3__Impl_in_rule__ConfiguredCheck__Group_3__310096 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_rule__ConfiguredCheck__Group_3__3__Impl10124 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredCheck__Group_3_2__0__Impl_in_rule__ConfiguredCheck__Group_3_2__010163 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__ConfiguredCheck__Group_3_2__1_in_rule__ConfiguredCheck__Group_3_2__010166 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_64_in_rule__ConfiguredCheck__Group_3_2__0__Impl10194 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredCheck__Group_3_2__1__Impl_in_rule__ConfiguredCheck__Group_3_2__110225 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_2_1_in_rule__ConfiguredCheck__Group_3_2__1__Impl10252 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredParameter__Group__0__Impl_in_rule__ConfiguredParameter__Group__010286 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__ConfiguredParameter__Group__1_in_rule__ConfiguredParameter__Group__010289 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredParameter__Group__1__Impl_in_rule__ConfiguredParameter__Group__110347 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_rule__ConfiguredParameter__Group__2_in_rule__ConfiguredParameter__Group__110350 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredParameter__ParameterAssignment_1_in_rule__ConfiguredParameter__Group__1__Impl10377 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredParameter__Group__2__Impl_in_rule__ConfiguredParameter__Group__210407 = new BitSet(new long[]{0x0004010C000001E0L,0x0000000020000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredParameter__Group__3_in_rule__ConfiguredParameter__Group__210410 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_13_in_rule__ConfiguredParameter__Group__2__Impl10438 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredParameter__Group__3__Impl_in_rule__ConfiguredParameter__Group__310469 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConfiguredParameter__NewValueAssignment_3_in_rule__ConfiguredParameter__Group__3__Impl10496 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantUnaryOperation__Group_0__0__Impl_in_rule__XConstantUnaryOperation__Group_0__010534 = new BitSet(new long[]{0x0000010C00000000L});
-    public static final BitSet FOLLOW_rule__XConstantUnaryOperation__Group_0__1_in_rule__XConstantUnaryOperation__Group_0__010537 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantUnaryOperation__Group_0__1__Impl_in_rule__XConstantUnaryOperation__Group_0__110595 = new BitSet(new long[]{0x0004010C000001E0L,0x0000000020000000L});
-    public static final BitSet FOLLOW_rule__XConstantUnaryOperation__Group_0__2_in_rule__XConstantUnaryOperation__Group_0__110598 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantUnaryOperation__FeatureAssignment_0_1_in_rule__XConstantUnaryOperation__Group_0__1__Impl10625 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantUnaryOperation__Group_0__2__Impl_in_rule__XConstantUnaryOperation__Group_0__210655 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantUnaryOperation__OperandAssignment_0_2_in_rule__XConstantUnaryOperation__Group_0__2__Impl10682 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group__0__Impl_in_rule__XConstantListLiteral__Group__010718 = new BitSet(new long[]{0x0004010C000001E0L,0x0000000020000002L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group__1_in_rule__XConstantListLiteral__Group__010721 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group__1__Impl_in_rule__XConstantListLiteral__Group__110779 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group__2_in_rule__XConstantListLiteral__Group__110782 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_65_in_rule__XConstantListLiteral__Group__1__Impl10810 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group__2__Impl_in_rule__XConstantListLiteral__Group__210841 = new BitSet(new long[]{0x0004010C000001E0L,0x0000000020000008L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group__3_in_rule__XConstantListLiteral__Group__210844 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_66_in_rule__XConstantListLiteral__Group__2__Impl10872 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group__3__Impl_in_rule__XConstantListLiteral__Group__310903 = new BitSet(new long[]{0x0004010C000001E0L,0x0000000020000008L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group__4_in_rule__XConstantListLiteral__Group__310906 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group_3__0_in_rule__XConstantListLiteral__Group__3__Impl10933 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group__4__Impl_in_rule__XConstantListLiteral__Group__410964 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_67_in_rule__XConstantListLiteral__Group__4__Impl10992 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group_3__0__Impl_in_rule__XConstantListLiteral__Group_3__011033 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group_3__1_in_rule__XConstantListLiteral__Group_3__011036 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__ElementsAssignment_3_0_in_rule__XConstantListLiteral__Group_3__0__Impl11063 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group_3__1__Impl_in_rule__XConstantListLiteral__Group_3__111093 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group_3_1__0_in_rule__XConstantListLiteral__Group_3__1__Impl11120 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group_3_1__0__Impl_in_rule__XConstantListLiteral__Group_3_1__011155 = new BitSet(new long[]{0x0004010C000001E0L,0x0000000020000000L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group_3_1__1_in_rule__XConstantListLiteral__Group_3_1__011158 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_64_in_rule__XConstantListLiteral__Group_3_1__0__Impl11186 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__Group_3_1__1__Impl_in_rule__XConstantListLiteral__Group_3_1__111217 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstantListLiteral__ElementsAssignment_3_1_1_in_rule__XConstantListLiteral__Group_3_1__1__Impl11244 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_0__0__Impl_in_rule__XAssignment__Group_0__011278 = new BitSet(new long[]{0x0001E00000000010L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_0__1_in_rule__XAssignment__Group_0__011281 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_0__1__Impl_in_rule__XAssignment__Group_0__111339 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_0__2_in_rule__XAssignment__Group_0__111342 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__FeatureAssignment_0_1_in_rule__XAssignment__Group_0__1__Impl11369 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_0__2__Impl_in_rule__XAssignment__Group_0__211399 = new BitSet(new long[]{0x5407E10C080001F0L,0x00000000202FF286L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_0__3_in_rule__XAssignment__Group_0__211402 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpSingleAssign_in_rule__XAssignment__Group_0__2__Impl11429 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_0__3__Impl_in_rule__XAssignment__Group_0__311458 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__ValueAssignment_0_3_in_rule__XAssignment__Group_0__3__Impl11485 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1__0__Impl_in_rule__XAssignment__Group_1__011523 = new BitSet(new long[]{0x000000000C1F0000L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1__1_in_rule__XAssignment__Group_1__011526 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXOrExpression_in_rule__XAssignment__Group_1__0__Impl11553 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1__1__Impl_in_rule__XAssignment__Group_1__111582 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1__0_in_rule__XAssignment__Group_1__1__Impl11609 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1__0__Impl_in_rule__XAssignment__Group_1_1__011644 = new BitSet(new long[]{0x5407E10C080001F0L,0x00000000202FF286L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1__1_in_rule__XAssignment__Group_1_1__011647 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1_0__0_in_rule__XAssignment__Group_1_1__0__Impl11674 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1__1__Impl_in_rule__XAssignment__Group_1_1__111704 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__RightOperandAssignment_1_1_1_in_rule__XAssignment__Group_1_1__1__Impl11731 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1_0__0__Impl_in_rule__XAssignment__Group_1_1_0__011765 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1_0_0__0_in_rule__XAssignment__Group_1_1_0__0__Impl11792 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1_0_0__0__Impl_in_rule__XAssignment__Group_1_1_0_0__011824 = new BitSet(new long[]{0x000000000C1F0000L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1_0_0__1_in_rule__XAssignment__Group_1_1_0_0__011827 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1_0_0__1__Impl_in_rule__XAssignment__Group_1_1_0_0__111885 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__FeatureAssignment_1_1_0_0_1_in_rule__XAssignment__Group_1_1_0_0__1__Impl11912 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_5__0__Impl_in_rule__OpMultiAssign__Group_5__011946 = new BitSet(new long[]{0x0000000008000000L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_5__1_in_rule__OpMultiAssign__Group_5__011949 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__OpMultiAssign__Group_5__0__Impl11977 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_5__1__Impl_in_rule__OpMultiAssign__Group_5__112008 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_5__2_in_rule__OpMultiAssign__Group_5__112011 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__OpMultiAssign__Group_5__1__Impl12039 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_5__2__Impl_in_rule__OpMultiAssign__Group_5__212070 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_13_in_rule__OpMultiAssign__Group_5__2__Impl12098 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_6__0__Impl_in_rule__OpMultiAssign__Group_6__012135 = new BitSet(new long[]{0x0000000006000000L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_6__1_in_rule__OpMultiAssign__Group_6__012138 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_rule__OpMultiAssign__Group_6__0__Impl12166 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_6__1__Impl_in_rule__OpMultiAssign__Group_6__112197 = new BitSet(new long[]{0x0000000006000000L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_6__2_in_rule__OpMultiAssign__Group_6__112200 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_rule__OpMultiAssign__Group_6__1__Impl12229 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_6__2__Impl_in_rule__OpMultiAssign__Group_6__212262 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_25_in_rule__OpMultiAssign__Group_6__2__Impl12290 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group__0__Impl_in_rule__XOrExpression__Group__012327 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group__1_in_rule__XOrExpression__Group__012330 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAndExpression_in_rule__XOrExpression__Group__0__Impl12357 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group__1__Impl_in_rule__XOrExpression__Group__112386 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1__0_in_rule__XOrExpression__Group__1__Impl12413 = new BitSet(new long[]{0x0000000000004002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1__0__Impl_in_rule__XOrExpression__Group_1__012448 = new BitSet(new long[]{0x5407E10C080001F0L,0x00000000202FF286L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1__1_in_rule__XOrExpression__Group_1__012451 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1_0__0_in_rule__XOrExpression__Group_1__0__Impl12478 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1__1__Impl_in_rule__XOrExpression__Group_1__112508 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__RightOperandAssignment_1_1_in_rule__XOrExpression__Group_1__1__Impl12535 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1_0__0__Impl_in_rule__XOrExpression__Group_1_0__012569 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1_0_0__0_in_rule__XOrExpression__Group_1_0__0__Impl12596 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1_0_0__0__Impl_in_rule__XOrExpression__Group_1_0_0__012628 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1_0_0__1_in_rule__XOrExpression__Group_1_0_0__012631 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1_0_0__1__Impl_in_rule__XOrExpression__Group_1_0_0__112689 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__FeatureAssignment_1_0_0_1_in_rule__XOrExpression__Group_1_0_0__1__Impl12716 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group__0__Impl_in_rule__XAndExpression__Group__012750 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group__1_in_rule__XAndExpression__Group__012753 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXEqualityExpression_in_rule__XAndExpression__Group__0__Impl12780 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group__1__Impl_in_rule__XAndExpression__Group__112809 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1__0_in_rule__XAndExpression__Group__1__Impl12836 = new BitSet(new long[]{0x0000000000008002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1__0__Impl_in_rule__XAndExpression__Group_1__012871 = new BitSet(new long[]{0x5407E10C080001F0L,0x00000000202FF286L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1__1_in_rule__XAndExpression__Group_1__012874 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1_0__0_in_rule__XAndExpression__Group_1__0__Impl12901 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1__1__Impl_in_rule__XAndExpression__Group_1__112931 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__RightOperandAssignment_1_1_in_rule__XAndExpression__Group_1__1__Impl12958 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1_0__0__Impl_in_rule__XAndExpression__Group_1_0__012992 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1_0_0__0_in_rule__XAndExpression__Group_1_0__0__Impl13019 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1_0_0__0__Impl_in_rule__XAndExpression__Group_1_0_0__013051 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1_0_0__1_in_rule__XAndExpression__Group_1_0_0__013054 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1_0_0__1__Impl_in_rule__XAndExpression__Group_1_0_0__113112 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__FeatureAssignment_1_0_0_1_in_rule__XAndExpression__Group_1_0_0__1__Impl13139 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group__0__Impl_in_rule__XEqualityExpression__Group__013173 = new BitSet(new long[]{0x0000000001E00000L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group__1_in_rule__XEqualityExpression__Group__013176 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXRelationalExpression_in_rule__XEqualityExpression__Group__0__Impl13203 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group__1__Impl_in_rule__XEqualityExpression__Group__113232 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1__0_in_rule__XEqualityExpression__Group__1__Impl13259 = new BitSet(new long[]{0x0000000001E00002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1__0__Impl_in_rule__XEqualityExpression__Group_1__013294 = new BitSet(new long[]{0x5407E10C080001F0L,0x00000000202FF286L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1__1_in_rule__XEqualityExpression__Group_1__013297 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1_0__0_in_rule__XEqualityExpression__Group_1__0__Impl13324 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1__1__Impl_in_rule__XEqualityExpression__Group_1__113354 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__RightOperandAssignment_1_1_in_rule__XEqualityExpression__Group_1__1__Impl13381 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1_0__0__Impl_in_rule__XEqualityExpression__Group_1_0__013415 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1_0_0__0_in_rule__XEqualityExpression__Group_1_0__0__Impl13442 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1_0_0__0__Impl_in_rule__XEqualityExpression__Group_1_0_0__013474 = new BitSet(new long[]{0x0000000001E00000L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1_0_0__1_in_rule__XEqualityExpression__Group_1_0_0__013477 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1_0_0__1__Impl_in_rule__XEqualityExpression__Group_1_0_0__113535 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__FeatureAssignment_1_0_0_1_in_rule__XEqualityExpression__Group_1_0_0__1__Impl13562 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group__0__Impl_in_rule__XRelationalExpression__Group__013596 = new BitSet(new long[]{0x000000000E000000L,0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group__1_in_rule__XRelationalExpression__Group__013599 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXOtherOperatorExpression_in_rule__XRelationalExpression__Group__0__Impl13626 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group__1__Impl_in_rule__XRelationalExpression__Group__113655 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Alternatives_1_in_rule__XRelationalExpression__Group__1__Impl13682 = new BitSet(new long[]{0x000000000E000002L,0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0__0__Impl_in_rule__XRelationalExpression__Group_1_0__013717 = new BitSet(new long[]{0x4000000080000010L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0__1_in_rule__XRelationalExpression__Group_1_0__013720 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0_0__0_in_rule__XRelationalExpression__Group_1_0__0__Impl13747 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0__1__Impl_in_rule__XRelationalExpression__Group_1_0__113777 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__TypeAssignment_1_0_1_in_rule__XRelationalExpression__Group_1_0__1__Impl13804 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0_0__0__Impl_in_rule__XRelationalExpression__Group_1_0_0__013838 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0_0_0__0_in_rule__XRelationalExpression__Group_1_0_0__0__Impl13865 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0_0_0__0__Impl_in_rule__XRelationalExpression__Group_1_0_0_0__013897 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0_0_0__1_in_rule__XRelationalExpression__Group_1_0_0_0__013900 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0_0_0__1__Impl_in_rule__XRelationalExpression__Group_1_0_0_0__113958 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_68_in_rule__XRelationalExpression__Group_1_0_0_0__1__Impl13986 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1__0__Impl_in_rule__XRelationalExpression__Group_1_1__014021 = new BitSet(new long[]{0x5407E10C080001F0L,0x00000000202FF286L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1__1_in_rule__XRelationalExpression__Group_1_1__014024 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1_0__0_in_rule__XRelationalExpression__Group_1_1__0__Impl14051 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1__1__Impl_in_rule__XRelationalExpression__Group_1_1__114081 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__RightOperandAssignment_1_1_1_in_rule__XRelationalExpression__Group_1_1__1__Impl14108 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1_0__0__Impl_in_rule__XRelationalExpression__Group_1_1_0__014142 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1_0_0__0_in_rule__XRelationalExpression__Group_1_1_0__0__Impl14169 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1_0_0__0__Impl_in_rule__XRelationalExpression__Group_1_1_0_0__014201 = new BitSet(new long[]{0x000000000E000000L,0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1_0_0__1_in_rule__XRelationalExpression__Group_1_1_0_0__014204 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1_0_0__1__Impl_in_rule__XRelationalExpression__Group_1_1_0_0__114262 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1_in_rule__XRelationalExpression__Group_1_1_0_0__1__Impl14289 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpCompare__Group_1__0__Impl_in_rule__OpCompare__Group_1__014323 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_rule__OpCompare__Group_1__1_in_rule__OpCompare__Group_1__014326 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__OpCompare__Group_1__0__Impl14354 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpCompare__Group_1__1__Impl_in_rule__OpCompare__Group_1__114385 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_13_in_rule__OpCompare__Group_1__1__Impl14413 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group__0__Impl_in_rule__XOtherOperatorExpression__Group__014448 = new BitSet(new long[]{0x00000003FC000000L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group__1_in_rule__XOtherOperatorExpression__Group__014451 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAdditiveExpression_in_rule__XOtherOperatorExpression__Group__0__Impl14478 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group__1__Impl_in_rule__XOtherOperatorExpression__Group__114507 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1__0_in_rule__XOtherOperatorExpression__Group__1__Impl14534 = new BitSet(new long[]{0x00000003FC000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1__0__Impl_in_rule__XOtherOperatorExpression__Group_1__014569 = new BitSet(new long[]{0x5407E10C080001F0L,0x00000000202FF286L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1__1_in_rule__XOtherOperatorExpression__Group_1__014572 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1_0__0_in_rule__XOtherOperatorExpression__Group_1__0__Impl14599 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1__1__Impl_in_rule__XOtherOperatorExpression__Group_1__114629 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__RightOperandAssignment_1_1_in_rule__XOtherOperatorExpression__Group_1__1__Impl14656 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1_0__0__Impl_in_rule__XOtherOperatorExpression__Group_1_0__014690 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1_0_0__0_in_rule__XOtherOperatorExpression__Group_1_0__0__Impl14717 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1_0_0__0__Impl_in_rule__XOtherOperatorExpression__Group_1_0_0__014749 = new BitSet(new long[]{0x00000003FC000000L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1_0_0__1_in_rule__XOtherOperatorExpression__Group_1_0_0__014752 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1_0_0__1__Impl_in_rule__XOtherOperatorExpression__Group_1_0_0__114810 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1_in_rule__XOtherOperatorExpression__Group_1_0_0__1__Impl14837 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_2__0__Impl_in_rule__OpOther__Group_2__014871 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_2__1_in_rule__OpOther__Group_2__014874 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_rule__OpOther__Group_2__0__Impl14902 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_2__1__Impl_in_rule__OpOther__Group_2__114933 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_rule__OpOther__Group_2__1__Impl14961 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_5__0__Impl_in_rule__OpOther__Group_5__014996 = new BitSet(new long[]{0x0000000004000000L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_5__1_in_rule__OpOther__Group_5__014999 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_rule__OpOther__Group_5__0__Impl15027 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_5__1__Impl_in_rule__OpOther__Group_5__115058 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Alternatives_5_1_in_rule__OpOther__Group_5__1__Impl15085 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_5_1_0__0__Impl_in_rule__OpOther__Group_5_1_0__015119 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_5_1_0_0__0_in_rule__OpOther__Group_5_1_0__0__Impl15146 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_5_1_0_0__0__Impl_in_rule__OpOther__Group_5_1_0_0__015178 = new BitSet(new long[]{0x0000000004000000L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_5_1_0_0__1_in_rule__OpOther__Group_5_1_0_0__015181 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_rule__OpOther__Group_5_1_0_0__0__Impl15209 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_5_1_0_0__1__Impl_in_rule__OpOther__Group_5_1_0_0__115240 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_rule__OpOther__Group_5_1_0_0__1__Impl15268 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_6__0__Impl_in_rule__OpOther__Group_6__015303 = new BitSet(new long[]{0x0000000088000000L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_6__1_in_rule__OpOther__Group_6__015306 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__OpOther__Group_6__0__Impl15334 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_6__1__Impl_in_rule__OpOther__Group_6__115365 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Alternatives_6_1_in_rule__OpOther__Group_6__1__Impl15392 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_6_1_0__0__Impl_in_rule__OpOther__Group_6_1_0__015426 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_6_1_0_0__0_in_rule__OpOther__Group_6_1_0__0__Impl15453 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_6_1_0_0__0__Impl_in_rule__OpOther__Group_6_1_0_0__015485 = new BitSet(new long[]{0x0000000008000000L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_6_1_0_0__1_in_rule__OpOther__Group_6_1_0_0__015488 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__OpOther__Group_6_1_0_0__0__Impl15516 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_6_1_0_0__1__Impl_in_rule__OpOther__Group_6_1_0_0__115547 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__OpOther__Group_6_1_0_0__1__Impl15575 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group__0__Impl_in_rule__XAdditiveExpression__Group__015610 = new BitSet(new long[]{0x0000000C00000000L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group__1_in_rule__XAdditiveExpression__Group__015613 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXMultiplicativeExpression_in_rule__XAdditiveExpression__Group__0__Impl15640 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group__1__Impl_in_rule__XAdditiveExpression__Group__115669 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1__0_in_rule__XAdditiveExpression__Group__1__Impl15696 = new BitSet(new long[]{0x0000000C00000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1__0__Impl_in_rule__XAdditiveExpression__Group_1__015731 = new BitSet(new long[]{0x5407E10C080001F0L,0x00000000202FF286L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1__1_in_rule__XAdditiveExpression__Group_1__015734 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1_0__0_in_rule__XAdditiveExpression__Group_1__0__Impl15761 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1__1__Impl_in_rule__XAdditiveExpression__Group_1__115791 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__RightOperandAssignment_1_1_in_rule__XAdditiveExpression__Group_1__1__Impl15818 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1_0__0__Impl_in_rule__XAdditiveExpression__Group_1_0__015852 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1_0_0__0_in_rule__XAdditiveExpression__Group_1_0__0__Impl15879 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1_0_0__0__Impl_in_rule__XAdditiveExpression__Group_1_0_0__015911 = new BitSet(new long[]{0x0000000C00000000L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1_0_0__1_in_rule__XAdditiveExpression__Group_1_0_0__015914 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1_0_0__1__Impl_in_rule__XAdditiveExpression__Group_1_0_0__115972 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__FeatureAssignment_1_0_0_1_in_rule__XAdditiveExpression__Group_1_0_0__1__Impl15999 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group__0__Impl_in_rule__XMultiplicativeExpression__Group__016033 = new BitSet(new long[]{0x000000F000000000L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group__1_in_rule__XMultiplicativeExpression__Group__016036 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXUnaryOperation_in_rule__XMultiplicativeExpression__Group__0__Impl16063 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group__1__Impl_in_rule__XMultiplicativeExpression__Group__116092 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1__0_in_rule__XMultiplicativeExpression__Group__1__Impl16119 = new BitSet(new long[]{0x000000F000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1__0__Impl_in_rule__XMultiplicativeExpression__Group_1__016154 = new BitSet(new long[]{0x5407E10C080001F0L,0x00000000202FF286L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1__1_in_rule__XMultiplicativeExpression__Group_1__016157 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1_0__0_in_rule__XMultiplicativeExpression__Group_1__0__Impl16184 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1__1__Impl_in_rule__XMultiplicativeExpression__Group_1__116214 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__RightOperandAssignment_1_1_in_rule__XMultiplicativeExpression__Group_1__1__Impl16241 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1_0__0__Impl_in_rule__XMultiplicativeExpression__Group_1_0__016275 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1_0_0__0_in_rule__XMultiplicativeExpression__Group_1_0__0__Impl16302 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1_0_0__0__Impl_in_rule__XMultiplicativeExpression__Group_1_0_0__016334 = new BitSet(new long[]{0x000000F000000000L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1_0_0__1_in_rule__XMultiplicativeExpression__Group_1_0_0__016337 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1_0_0__1__Impl_in_rule__XMultiplicativeExpression__Group_1_0_0__116395 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1_in_rule__XMultiplicativeExpression__Group_1_0_0__1__Impl16422 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XUnaryOperation__Group_0__0__Impl_in_rule__XUnaryOperation__Group_0__016456 = new BitSet(new long[]{0x0000010C00000000L});
-    public static final BitSet FOLLOW_rule__XUnaryOperation__Group_0__1_in_rule__XUnaryOperation__Group_0__016459 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XUnaryOperation__Group_0__1__Impl_in_rule__XUnaryOperation__Group_0__116517 = new BitSet(new long[]{0x5407E10C080001F0L,0x00000000202FF286L});
-    public static final BitSet FOLLOW_rule__XUnaryOperation__Group_0__2_in_rule__XUnaryOperation__Group_0__116520 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XUnaryOperation__FeatureAssignment_0_1_in_rule__XUnaryOperation__Group_0__1__Impl16547 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XUnaryOperation__Group_0__2__Impl_in_rule__XUnaryOperation__Group_0__216577 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XUnaryOperation__OperandAssignment_0_2_in_rule__XUnaryOperation__Group_0__2__Impl16604 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group__0__Impl_in_rule__XCastedExpression__Group__016640 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000020L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group__1_in_rule__XCastedExpression__Group__016643 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXPostfixOperation_in_rule__XCastedExpression__Group__0__Impl16670 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group__1__Impl_in_rule__XCastedExpression__Group__116699 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1__0_in_rule__XCastedExpression__Group__1__Impl16726 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1__0__Impl_in_rule__XCastedExpression__Group_1__016761 = new BitSet(new long[]{0x4000000080000010L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1__1_in_rule__XCastedExpression__Group_1__016764 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1_0__0_in_rule__XCastedExpression__Group_1__0__Impl16791 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1__1__Impl_in_rule__XCastedExpression__Group_1__116821 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__TypeAssignment_1_1_in_rule__XCastedExpression__Group_1__1__Impl16848 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1_0__0__Impl_in_rule__XCastedExpression__Group_1_0__016882 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1_0_0__0_in_rule__XCastedExpression__Group_1_0__0__Impl16909 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1_0_0__0__Impl_in_rule__XCastedExpression__Group_1_0_0__016941 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000020L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1_0_0__1_in_rule__XCastedExpression__Group_1_0_0__016944 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1_0_0__1__Impl_in_rule__XCastedExpression__Group_1_0_0__117002 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_69_in_rule__XCastedExpression__Group_1_0_0__1__Impl17030 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group__0__Impl_in_rule__XPostfixOperation__Group__017065 = new BitSet(new long[]{0x0000060000000000L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group__1_in_rule__XPostfixOperation__Group__017068 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXMemberFeatureCall_in_rule__XPostfixOperation__Group__0__Impl17095 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group__1__Impl_in_rule__XPostfixOperation__Group__117124 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group_1__0_in_rule__XPostfixOperation__Group__1__Impl17151 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group_1__0__Impl_in_rule__XPostfixOperation__Group_1__017186 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group_1_0__0_in_rule__XPostfixOperation__Group_1__0__Impl17213 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group_1_0__0__Impl_in_rule__XPostfixOperation__Group_1_0__017245 = new BitSet(new long[]{0x0000060000000000L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group_1_0__1_in_rule__XPostfixOperation__Group_1_0__017248 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group_1_0__1__Impl_in_rule__XPostfixOperation__Group_1_0__117306 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__FeatureAssignment_1_0_1_in_rule__XPostfixOperation__Group_1_0__1__Impl17333 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group__0__Impl_in_rule__XMemberFeatureCall__Group__017367 = new BitSet(new long[]{0x0000080000000000L,0x0000000006000000L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group__1_in_rule__XMemberFeatureCall__Group__017370 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXPrimaryExpression_in_rule__XMemberFeatureCall__Group__0__Impl17397 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group__1__Impl_in_rule__XMemberFeatureCall__Group__117426 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Alternatives_1_in_rule__XMemberFeatureCall__Group__1__Impl17453 = new BitSet(new long[]{0x0000080000000002L,0x0000000006000000L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_0__017488 = new BitSet(new long[]{0x5407E10C080001F0L,0x00000000202FF286L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0__1_in_rule__XMemberFeatureCall__Group_1_0__017491 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0__0_in_rule__XMemberFeatureCall__Group_1_0__0__Impl17518 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0__1__Impl_in_rule__XMemberFeatureCall__Group_1_0__117548 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__ValueAssignment_1_0_1_in_rule__XMemberFeatureCall__Group_1_0__1__Impl17575 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_0_0__017609 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__0_in_rule__XMemberFeatureCall__Group_1_0_0__0__Impl17636 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_0_0_0__017668 = new BitSet(new long[]{0x0000080000000000L,0x0000000002000000L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__1_in_rule__XMemberFeatureCall__Group_1_0_0_0__017671 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl_in_rule__XMemberFeatureCall__Group_1_0_0_0__117729 = new BitSet(new long[]{0x0001E00000000010L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__2_in_rule__XMemberFeatureCall__Group_1_0_0_0__117732 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Alternatives_1_0_0_0_1_in_rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl17759 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl_in_rule__XMemberFeatureCall__Group_1_0_0_0__217789 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__3_in_rule__XMemberFeatureCall__Group_1_0_0_0__217792 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2_in_rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl17819 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl_in_rule__XMemberFeatureCall__Group_1_0_0_0__317849 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpSingleAssign_in_rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl17876 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__0__Impl_in_rule__XMemberFeatureCall__Group_1_1__017913 = new BitSet(new long[]{0x0003E00008000010L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__1_in_rule__XMemberFeatureCall__Group_1_1__017916 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_0__0_in_rule__XMemberFeatureCall__Group_1_1__0__Impl17943 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__1__Impl_in_rule__XMemberFeatureCall__Group_1_1__117973 = new BitSet(new long[]{0x0003E00008000010L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__2_in_rule__XMemberFeatureCall__Group_1_1__117976 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__0_in_rule__XMemberFeatureCall__Group_1_1__1__Impl18003 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__2__Impl_in_rule__XMemberFeatureCall__Group_1_1__218034 = new BitSet(new long[]{0x4000000000000000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__3_in_rule__XMemberFeatureCall__Group_1_1__218037 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__FeatureAssignment_1_1_2_in_rule__XMemberFeatureCall__Group_1_1__2__Impl18064 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__3__Impl_in_rule__XMemberFeatureCall__Group_1_1__318094 = new BitSet(new long[]{0x4000000000000000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__4_in_rule__XMemberFeatureCall__Group_1_1__318097 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__0_in_rule__XMemberFeatureCall__Group_1_1__3__Impl18124 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__4__Impl_in_rule__XMemberFeatureCall__Group_1_1__418155 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4_in_rule__XMemberFeatureCall__Group_1_1__4__Impl18182 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_0__018223 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_0_0__0_in_rule__XMemberFeatureCall__Group_1_1_0__0__Impl18250 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_0_0__018282 = new BitSet(new long[]{0x0000080000000000L,0x0000000006000000L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_0_0__1_in_rule__XMemberFeatureCall__Group_1_1_0_0__018285 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_0_0__118343 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Alternatives_1_1_0_0_1_in_rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl18370 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_1__018404 = new BitSet(new long[]{0x4000000080000010L,0x0000000000800000L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__1_in_rule__XMemberFeatureCall__Group_1_1_1__018407 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__XMemberFeatureCall__Group_1_1_1__0__Impl18435 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_1__118466 = new BitSet(new long[]{0x0000000004000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__2_in_rule__XMemberFeatureCall__Group_1_1_1__118469 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1_in_rule__XMemberFeatureCall__Group_1_1_1__1__Impl18496 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__2__Impl_in_rule__XMemberFeatureCall__Group_1_1_1__218526 = new BitSet(new long[]{0x0000000004000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__3_in_rule__XMemberFeatureCall__Group_1_1_1__218529 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1_2__0_in_rule__XMemberFeatureCall__Group_1_1_1__2__Impl18556 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__3__Impl_in_rule__XMemberFeatureCall__Group_1_1_1__318587 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_rule__XMemberFeatureCall__Group_1_1_1__3__Impl18615 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_1_2__018654 = new BitSet(new long[]{0x4000000080000010L,0x0000000000800000L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1_2__1_in_rule__XMemberFeatureCall__Group_1_1_1_2__018657 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_64_in_rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl18685 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_1_2__118716 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1_in_rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl18743 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_3__018777 = new BitSet(new long[]{0xD407E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__1_in_rule__XMemberFeatureCall__Group_1_1_3__018780 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0_in_rule__XMemberFeatureCall__Group_1_1_3__0__Impl18807 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_3__118837 = new BitSet(new long[]{0xD407E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__2_in_rule__XMemberFeatureCall__Group_1_1_3__118840 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Alternatives_1_1_3_1_in_rule__XMemberFeatureCall__Group_1_1_3__1__Impl18867 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__2__Impl_in_rule__XMemberFeatureCall__Group_1_1_3__218898 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_rule__XMemberFeatureCall__Group_1_1_3__2__Impl18926 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__018963 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1__1_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__018966 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl18993 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__119023 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl19050 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__019085 = new BitSet(new long[]{0x5407E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__019088 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_64_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl19116 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__119147 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl19174 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group__0__Impl_in_rule__XSetLiteral__Group__019208 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group__1_in_rule__XSetLiteral__Group__019211 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group__1__Impl_in_rule__XSetLiteral__Group__119269 = new BitSet(new long[]{0x0400000000000000L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group__2_in_rule__XSetLiteral__Group__119272 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_65_in_rule__XSetLiteral__Group__1__Impl19300 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group__2__Impl_in_rule__XSetLiteral__Group__219331 = new BitSet(new long[]{0x5C07E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group__3_in_rule__XSetLiteral__Group__219334 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_58_in_rule__XSetLiteral__Group__2__Impl19362 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group__3__Impl_in_rule__XSetLiteral__Group__319393 = new BitSet(new long[]{0x5C07E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group__4_in_rule__XSetLiteral__Group__319396 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group_3__0_in_rule__XSetLiteral__Group__3__Impl19423 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group__4__Impl_in_rule__XSetLiteral__Group__419454 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_59_in_rule__XSetLiteral__Group__4__Impl19482 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group_3__0__Impl_in_rule__XSetLiteral__Group_3__019523 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group_3__1_in_rule__XSetLiteral__Group_3__019526 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__ElementsAssignment_3_0_in_rule__XSetLiteral__Group_3__0__Impl19553 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group_3__1__Impl_in_rule__XSetLiteral__Group_3__119583 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group_3_1__0_in_rule__XSetLiteral__Group_3__1__Impl19610 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group_3_1__0__Impl_in_rule__XSetLiteral__Group_3_1__019645 = new BitSet(new long[]{0x5407E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group_3_1__1_in_rule__XSetLiteral__Group_3_1__019648 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_64_in_rule__XSetLiteral__Group_3_1__0__Impl19676 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group_3_1__1__Impl_in_rule__XSetLiteral__Group_3_1__119707 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__ElementsAssignment_3_1_1_in_rule__XSetLiteral__Group_3_1__1__Impl19734 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group__0__Impl_in_rule__XListLiteral__Group__019768 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group__1_in_rule__XListLiteral__Group__019771 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group__1__Impl_in_rule__XListLiteral__Group__119829 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group__2_in_rule__XListLiteral__Group__119832 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_65_in_rule__XListLiteral__Group__1__Impl19860 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group__2__Impl_in_rule__XListLiteral__Group__219891 = new BitSet(new long[]{0x5407E10C880001F0L,0x00000000282FF28EL});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group__3_in_rule__XListLiteral__Group__219894 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_66_in_rule__XListLiteral__Group__2__Impl19922 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group__3__Impl_in_rule__XListLiteral__Group__319953 = new BitSet(new long[]{0x5407E10C880001F0L,0x00000000282FF28EL});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group__4_in_rule__XListLiteral__Group__319956 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group_3__0_in_rule__XListLiteral__Group__3__Impl19983 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group__4__Impl_in_rule__XListLiteral__Group__420014 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_67_in_rule__XListLiteral__Group__4__Impl20042 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group_3__0__Impl_in_rule__XListLiteral__Group_3__020083 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group_3__1_in_rule__XListLiteral__Group_3__020086 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__ElementsAssignment_3_0_in_rule__XListLiteral__Group_3__0__Impl20113 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group_3__1__Impl_in_rule__XListLiteral__Group_3__120143 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group_3_1__0_in_rule__XListLiteral__Group_3__1__Impl20170 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group_3_1__0__Impl_in_rule__XListLiteral__Group_3_1__020205 = new BitSet(new long[]{0x5407E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group_3_1__1_in_rule__XListLiteral__Group_3_1__020208 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_64_in_rule__XListLiteral__Group_3_1__0__Impl20236 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group_3_1__1__Impl_in_rule__XListLiteral__Group_3_1__120267 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__ElementsAssignment_3_1_1_in_rule__XListLiteral__Group_3_1__1__Impl20294 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group__0__Impl_in_rule__XClosure__Group__020328 = new BitSet(new long[]{0x5407F10C880001F0L,0x00000000382FF286L});
-    public static final BitSet FOLLOW_rule__XClosure__Group__1_in_rule__XClosure__Group__020331 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_0__0_in_rule__XClosure__Group__0__Impl20358 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group__1__Impl_in_rule__XClosure__Group__120388 = new BitSet(new long[]{0x5407F10C880001F0L,0x00000000382FF286L});
-    public static final BitSet FOLLOW_rule__XClosure__Group__2_in_rule__XClosure__Group__120391 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1__0_in_rule__XClosure__Group__1__Impl20418 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group__2__Impl_in_rule__XClosure__Group__220449 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000008L});
-    public static final BitSet FOLLOW_rule__XClosure__Group__3_in_rule__XClosure__Group__220452 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__ExpressionAssignment_2_in_rule__XClosure__Group__2__Impl20479 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group__3__Impl_in_rule__XClosure__Group__320509 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_67_in_rule__XClosure__Group__3__Impl20537 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_0__0__Impl_in_rule__XClosure__Group_0__020576 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_0_0__0_in_rule__XClosure__Group_0__0__Impl20603 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_0_0__0__Impl_in_rule__XClosure__Group_0_0__020635 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_0_0__1_in_rule__XClosure__Group_0_0__020638 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_0_0__1__Impl_in_rule__XClosure__Group_0_0__120696 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_66_in_rule__XClosure__Group_0_0__1__Impl20724 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1__0__Impl_in_rule__XClosure__Group_1__020759 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0__0_in_rule__XClosure__Group_1__0__Impl20786 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0__0__Impl_in_rule__XClosure__Group_1_0__020818 = new BitSet(new long[]{0x4000000080000010L,0x0000000008000000L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0__1_in_rule__XClosure__Group_1_0__020821 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0_0__0_in_rule__XClosure__Group_1_0__0__Impl20848 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0__1__Impl_in_rule__XClosure__Group_1_0__120879 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__ExplicitSyntaxAssignment_1_0_1_in_rule__XClosure__Group_1_0__1__Impl20906 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0_0__0__Impl_in_rule__XClosure__Group_1_0_0__020940 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0_0__1_in_rule__XClosure__Group_1_0_0__020943 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0_in_rule__XClosure__Group_1_0_0__0__Impl20970 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0_0__1__Impl_in_rule__XClosure__Group_1_0_0__121000 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0_0_1__0_in_rule__XClosure__Group_1_0_0__1__Impl21027 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0_0_1__0__Impl_in_rule__XClosure__Group_1_0_0_1__021062 = new BitSet(new long[]{0x4000000080000010L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0_0_1__1_in_rule__XClosure__Group_1_0_0_1__021065 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_64_in_rule__XClosure__Group_1_0_0_1__0__Impl21093 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0_0_1__1__Impl_in_rule__XClosure__Group_1_0_0_1__121124 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1_in_rule__XClosure__Group_1_0_0_1__1__Impl21151 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XExpressionInClosure__Group__0__Impl_in_rule__XExpressionInClosure__Group__021185 = new BitSet(new long[]{0x5407F10C880001F0L,0x00000000382FF286L});
-    public static final BitSet FOLLOW_rule__XExpressionInClosure__Group__1_in_rule__XExpressionInClosure__Group__021188 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XExpressionInClosure__Group__1__Impl_in_rule__XExpressionInClosure__Group__121246 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XExpressionInClosure__Group_1__0_in_rule__XExpressionInClosure__Group__1__Impl21273 = new BitSet(new long[]{0x5407F10C880001F2L,0x00000000382FF286L});
-    public static final BitSet FOLLOW_rule__XExpressionInClosure__Group_1__0__Impl_in_rule__XExpressionInClosure__Group_1__021308 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__XExpressionInClosure__Group_1__1_in_rule__XExpressionInClosure__Group_1__021311 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XExpressionInClosure__ExpressionsAssignment_1_0_in_rule__XExpressionInClosure__Group_1__0__Impl21338 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XExpressionInClosure__Group_1__1__Impl_in_rule__XExpressionInClosure__Group_1__121368 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_70_in_rule__XExpressionInClosure__Group_1__1__Impl21397 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group__0__Impl_in_rule__XShortClosure__Group__021434 = new BitSet(new long[]{0x5407E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group__1_in_rule__XShortClosure__Group__021437 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0__0_in_rule__XShortClosure__Group__0__Impl21464 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group__1__Impl_in_rule__XShortClosure__Group__121494 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__ExpressionAssignment_1_in_rule__XShortClosure__Group__1__Impl21521 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0__0__Impl_in_rule__XShortClosure__Group_0__021555 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0__0_in_rule__XShortClosure__Group_0__0__Impl21582 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0__0__Impl_in_rule__XShortClosure__Group_0_0__021614 = new BitSet(new long[]{0x4000000080000010L,0x0000000008000000L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0__1_in_rule__XShortClosure__Group_0_0__021617 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0__1__Impl_in_rule__XShortClosure__Group_0_0__121675 = new BitSet(new long[]{0x4000000080000010L,0x0000000008000000L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0__2_in_rule__XShortClosure__Group_0_0__121678 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0_1__0_in_rule__XShortClosure__Group_0_0__1__Impl21705 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0__2__Impl_in_rule__XShortClosure__Group_0_0__221736 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2_in_rule__XShortClosure__Group_0_0__2__Impl21763 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0_1__0__Impl_in_rule__XShortClosure__Group_0_0_1__021799 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0_1__1_in_rule__XShortClosure__Group_0_0_1__021802 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0_in_rule__XShortClosure__Group_0_0_1__0__Impl21829 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0_1__1__Impl_in_rule__XShortClosure__Group_0_0_1__121859 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0_1_1__0_in_rule__XShortClosure__Group_0_0_1__1__Impl21886 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0_1_1__0__Impl_in_rule__XShortClosure__Group_0_0_1_1__021921 = new BitSet(new long[]{0x4000000080000010L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0_1_1__1_in_rule__XShortClosure__Group_0_0_1_1__021924 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_64_in_rule__XShortClosure__Group_0_0_1_1__0__Impl21952 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0_1_1__1__Impl_in_rule__XShortClosure__Group_0_0_1_1__121983 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1_in_rule__XShortClosure__Group_0_0_1_1__1__Impl22010 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XParenthesizedExpression__Group__0__Impl_in_rule__XParenthesizedExpression__Group__022044 = new BitSet(new long[]{0x5407E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XParenthesizedExpression__Group__1_in_rule__XParenthesizedExpression__Group__022047 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_62_in_rule__XParenthesizedExpression__Group__0__Impl22075 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XParenthesizedExpression__Group__1__Impl_in_rule__XParenthesizedExpression__Group__122106 = new BitSet(new long[]{0x8000000000000000L});
-    public static final BitSet FOLLOW_rule__XParenthesizedExpression__Group__2_in_rule__XParenthesizedExpression__Group__122109 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XParenthesizedExpression__Group__1__Impl22136 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XParenthesizedExpression__Group__2__Impl_in_rule__XParenthesizedExpression__Group__222165 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_rule__XParenthesizedExpression__Group__2__Impl22193 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__0__Impl_in_rule__XIfExpression__Group__022230 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__1_in_rule__XIfExpression__Group__022233 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__1__Impl_in_rule__XIfExpression__Group__122291 = new BitSet(new long[]{0x4000000000000000L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__2_in_rule__XIfExpression__Group__122294 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__XIfExpression__Group__1__Impl22322 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__2__Impl_in_rule__XIfExpression__Group__222353 = new BitSet(new long[]{0x5407E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__3_in_rule__XIfExpression__Group__222356 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_62_in_rule__XIfExpression__Group__2__Impl22384 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__3__Impl_in_rule__XIfExpression__Group__322415 = new BitSet(new long[]{0x8000000000000000L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__4_in_rule__XIfExpression__Group__322418 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__IfAssignment_3_in_rule__XIfExpression__Group__3__Impl22445 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__4__Impl_in_rule__XIfExpression__Group__422475 = new BitSet(new long[]{0x5407E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__5_in_rule__XIfExpression__Group__422478 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_rule__XIfExpression__Group__4__Impl22506 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__5__Impl_in_rule__XIfExpression__Group__522537 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__6_in_rule__XIfExpression__Group__522540 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__ThenAssignment_5_in_rule__XIfExpression__Group__5__Impl22567 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__6__Impl_in_rule__XIfExpression__Group__622597 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group_6__0_in_rule__XIfExpression__Group__6__Impl22624 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group_6__0__Impl_in_rule__XIfExpression__Group_6__022669 = new BitSet(new long[]{0x5407E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group_6__1_in_rule__XIfExpression__Group_6__022672 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__XIfExpression__Group_6__0__Impl22701 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group_6__1__Impl_in_rule__XIfExpression__Group_6__122733 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__ElseAssignment_6_1_in_rule__XIfExpression__Group_6__1__Impl22760 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__0__Impl_in_rule__XSwitchExpression__Group__022794 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000200L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__1_in_rule__XSwitchExpression__Group__022797 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__1__Impl_in_rule__XSwitchExpression__Group__122855 = new BitSet(new long[]{0x5407E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__2_in_rule__XSwitchExpression__Group__122858 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__XSwitchExpression__Group__1__Impl22886 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__2__Impl_in_rule__XSwitchExpression__Group__222917 = new BitSet(new long[]{0x0400000000000000L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__3_in_rule__XSwitchExpression__Group__222920 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Alternatives_2_in_rule__XSwitchExpression__Group__2__Impl22947 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__3__Impl_in_rule__XSwitchExpression__Group__322977 = new BitSet(new long[]{0x4808000080000010L,0x0000000000000C01L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__4_in_rule__XSwitchExpression__Group__322980 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_58_in_rule__XSwitchExpression__Group__3__Impl23008 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__4__Impl_in_rule__XSwitchExpression__Group__423039 = new BitSet(new long[]{0x4808000080000010L,0x0000000000000C01L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__5_in_rule__XSwitchExpression__Group__423042 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__CasesAssignment_4_in_rule__XSwitchExpression__Group__4__Impl23069 = new BitSet(new long[]{0x4000000080000012L,0x0000000000000C01L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__5__Impl_in_rule__XSwitchExpression__Group__523100 = new BitSet(new long[]{0x4808000080000010L,0x0000000000000C01L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__6_in_rule__XSwitchExpression__Group__523103 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_5__0_in_rule__XSwitchExpression__Group__5__Impl23130 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__6__Impl_in_rule__XSwitchExpression__Group__623161 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_59_in_rule__XSwitchExpression__Group__6__Impl23189 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0__0__Impl_in_rule__XSwitchExpression__Group_2_0__023234 = new BitSet(new long[]{0x5407E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0__1_in_rule__XSwitchExpression__Group_2_0__023237 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0_0__0_in_rule__XSwitchExpression__Group_2_0__0__Impl23264 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0__1__Impl_in_rule__XSwitchExpression__Group_2_0__123294 = new BitSet(new long[]{0x8000000000000000L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0__2_in_rule__XSwitchExpression__Group_2_0__123297 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__SwitchAssignment_2_0_1_in_rule__XSwitchExpression__Group_2_0__1__Impl23324 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0__2__Impl_in_rule__XSwitchExpression__Group_2_0__223354 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_rule__XSwitchExpression__Group_2_0__2__Impl23382 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0_0__0__Impl_in_rule__XSwitchExpression__Group_2_0_0__023419 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__0_in_rule__XSwitchExpression__Group_2_0_0__0__Impl23446 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__0__Impl_in_rule__XSwitchExpression__Group_2_0_0_0__023478 = new BitSet(new long[]{0x4000000080000010L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__1_in_rule__XSwitchExpression__Group_2_0_0_0__023481 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_62_in_rule__XSwitchExpression__Group_2_0_0_0__0__Impl23509 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__1__Impl_in_rule__XSwitchExpression__Group_2_0_0_0__123540 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__2_in_rule__XSwitchExpression__Group_2_0_0_0__123543 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1_in_rule__XSwitchExpression__Group_2_0_0_0__1__Impl23570 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__2__Impl_in_rule__XSwitchExpression__Group_2_0_0_0__223600 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XSwitchExpression__Group_2_0_0_0__2__Impl23628 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1__0__Impl_in_rule__XSwitchExpression__Group_2_1__023665 = new BitSet(new long[]{0x5407E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1__1_in_rule__XSwitchExpression__Group_2_1__023668 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1_0__0_in_rule__XSwitchExpression__Group_2_1__0__Impl23695 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1__1__Impl_in_rule__XSwitchExpression__Group_2_1__123726 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__SwitchAssignment_2_1_1_in_rule__XSwitchExpression__Group_2_1__1__Impl23753 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1_0__0__Impl_in_rule__XSwitchExpression__Group_2_1_0__023787 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1_0_0__0_in_rule__XSwitchExpression__Group_2_1_0__0__Impl23814 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1_0_0__0__Impl_in_rule__XSwitchExpression__Group_2_1_0_0__023846 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1_0_0__1_in_rule__XSwitchExpression__Group_2_1_0_0__023849 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0_in_rule__XSwitchExpression__Group_2_1_0_0__0__Impl23876 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1_0_0__1__Impl_in_rule__XSwitchExpression__Group_2_1_0_0__123906 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XSwitchExpression__Group_2_1_0_0__1__Impl23934 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_5__0__Impl_in_rule__XSwitchExpression__Group_5__023969 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_5__1_in_rule__XSwitchExpression__Group_5__023972 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__XSwitchExpression__Group_5__0__Impl24000 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_5__1__Impl_in_rule__XSwitchExpression__Group_5__124031 = new BitSet(new long[]{0x5407E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_5__2_in_rule__XSwitchExpression__Group_5__124034 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XSwitchExpression__Group_5__1__Impl24062 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_5__2__Impl_in_rule__XSwitchExpression__Group_5__224093 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__DefaultAssignment_5_2_in_rule__XSwitchExpression__Group_5__2__Impl24120 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group__0__Impl_in_rule__XCasePart__Group__024156 = new BitSet(new long[]{0x4000000080000010L,0x0000000000000C01L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group__1_in_rule__XCasePart__Group__024159 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group__1__Impl_in_rule__XCasePart__Group__124217 = new BitSet(new long[]{0x4000000080000010L,0x0000000000000C01L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group__2_in_rule__XCasePart__Group__124220 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__TypeGuardAssignment_1_in_rule__XCasePart__Group__1__Impl24247 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group__2__Impl_in_rule__XCasePart__Group__224278 = new BitSet(new long[]{0x4000000080000010L,0x0000000000000C01L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group__3_in_rule__XCasePart__Group__224281 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group_2__0_in_rule__XCasePart__Group__2__Impl24308 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group__3__Impl_in_rule__XCasePart__Group__324339 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Alternatives_3_in_rule__XCasePart__Group__3__Impl24366 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group_2__0__Impl_in_rule__XCasePart__Group_2__024404 = new BitSet(new long[]{0x5407E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group_2__1_in_rule__XCasePart__Group_2__024407 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_75_in_rule__XCasePart__Group_2__0__Impl24435 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group_2__1__Impl_in_rule__XCasePart__Group_2__124466 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__CaseAssignment_2_1_in_rule__XCasePart__Group_2__1__Impl24493 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group_3_0__0__Impl_in_rule__XCasePart__Group_3_0__024527 = new BitSet(new long[]{0x5407E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group_3_0__1_in_rule__XCasePart__Group_3_0__024530 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XCasePart__Group_3_0__0__Impl24558 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group_3_0__1__Impl_in_rule__XCasePart__Group_3_0__124589 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__ThenAssignment_3_0_1_in_rule__XCasePart__Group_3_0__1__Impl24616 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group__0__Impl_in_rule__XForLoopExpression__Group__024650 = new BitSet(new long[]{0x5407E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group__1_in_rule__XForLoopExpression__Group__024653 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0__0_in_rule__XForLoopExpression__Group__0__Impl24680 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group__1__Impl_in_rule__XForLoopExpression__Group__124710 = new BitSet(new long[]{0x8000000000000000L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group__2_in_rule__XForLoopExpression__Group__124713 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__ForExpressionAssignment_1_in_rule__XForLoopExpression__Group__1__Impl24740 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group__2__Impl_in_rule__XForLoopExpression__Group__224770 = new BitSet(new long[]{0x5407E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group__3_in_rule__XForLoopExpression__Group__224773 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_rule__XForLoopExpression__Group__2__Impl24801 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group__3__Impl_in_rule__XForLoopExpression__Group__324832 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__EachExpressionAssignment_3_in_rule__XForLoopExpression__Group__3__Impl24859 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0__0__Impl_in_rule__XForLoopExpression__Group_0__024897 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__0_in_rule__XForLoopExpression__Group_0__0__Impl24924 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__0__Impl_in_rule__XForLoopExpression__Group_0_0__024956 = new BitSet(new long[]{0x1000000000000000L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__1_in_rule__XForLoopExpression__Group_0_0__024959 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__1__Impl_in_rule__XForLoopExpression__Group_0_0__125017 = new BitSet(new long[]{0x4000000000000000L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__2_in_rule__XForLoopExpression__Group_0_0__125020 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_60_in_rule__XForLoopExpression__Group_0_0__1__Impl25048 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__2__Impl_in_rule__XForLoopExpression__Group_0_0__225079 = new BitSet(new long[]{0x4000000080000010L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__3_in_rule__XForLoopExpression__Group_0_0__225082 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_62_in_rule__XForLoopExpression__Group_0_0__2__Impl25110 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__3__Impl_in_rule__XForLoopExpression__Group_0_0__325141 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__4_in_rule__XForLoopExpression__Group_0_0__325144 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__DeclaredParamAssignment_0_0_3_in_rule__XForLoopExpression__Group_0_0__3__Impl25171 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__4__Impl_in_rule__XForLoopExpression__Group_0_0__425201 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XForLoopExpression__Group_0_0__4__Impl25229 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__0__Impl_in_rule__XBasicForLoopExpression__Group__025270 = new BitSet(new long[]{0x1000000000000000L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__1_in_rule__XBasicForLoopExpression__Group__025273 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__1__Impl_in_rule__XBasicForLoopExpression__Group__125331 = new BitSet(new long[]{0x4000000000000000L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__2_in_rule__XBasicForLoopExpression__Group__125334 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_60_in_rule__XBasicForLoopExpression__Group__1__Impl25362 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__2__Impl_in_rule__XBasicForLoopExpression__Group__225393 = new BitSet(new long[]{0x5407F10C880001F0L,0x00000000382FF2C6L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__3_in_rule__XBasicForLoopExpression__Group__225396 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_62_in_rule__XBasicForLoopExpression__Group__2__Impl25424 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__3__Impl_in_rule__XBasicForLoopExpression__Group__325455 = new BitSet(new long[]{0x5407F10C880001F0L,0x00000000382FF2C6L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__4_in_rule__XBasicForLoopExpression__Group__325458 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_3__0_in_rule__XBasicForLoopExpression__Group__3__Impl25485 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__4__Impl_in_rule__XBasicForLoopExpression__Group__425516 = new BitSet(new long[]{0x5407E10C880001F0L,0x00000000282FF2C6L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__5_in_rule__XBasicForLoopExpression__Group__425519 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_70_in_rule__XBasicForLoopExpression__Group__4__Impl25547 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__5__Impl_in_rule__XBasicForLoopExpression__Group__525578 = new BitSet(new long[]{0x5407E10C880001F0L,0x00000000282FF2C6L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__6_in_rule__XBasicForLoopExpression__Group__525581 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__ExpressionAssignment_5_in_rule__XBasicForLoopExpression__Group__5__Impl25608 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__6__Impl_in_rule__XBasicForLoopExpression__Group__625639 = new BitSet(new long[]{0xD407E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__7_in_rule__XBasicForLoopExpression__Group__625642 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_70_in_rule__XBasicForLoopExpression__Group__6__Impl25670 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__7__Impl_in_rule__XBasicForLoopExpression__Group__725701 = new BitSet(new long[]{0xD407E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__8_in_rule__XBasicForLoopExpression__Group__725704 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_7__0_in_rule__XBasicForLoopExpression__Group__7__Impl25731 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__8__Impl_in_rule__XBasicForLoopExpression__Group__825762 = new BitSet(new long[]{0x5407E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__9_in_rule__XBasicForLoopExpression__Group__825765 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_rule__XBasicForLoopExpression__Group__8__Impl25793 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__9__Impl_in_rule__XBasicForLoopExpression__Group__925824 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__EachExpressionAssignment_9_in_rule__XBasicForLoopExpression__Group__9__Impl25851 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_3__0__Impl_in_rule__XBasicForLoopExpression__Group_3__025901 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_3__1_in_rule__XBasicForLoopExpression__Group_3__025904 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0_in_rule__XBasicForLoopExpression__Group_3__0__Impl25931 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_3__1__Impl_in_rule__XBasicForLoopExpression__Group_3__125961 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_3_1__0_in_rule__XBasicForLoopExpression__Group_3__1__Impl25988 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_3_1__0__Impl_in_rule__XBasicForLoopExpression__Group_3_1__026023 = new BitSet(new long[]{0x5407F10C880001F0L,0x00000000382FF286L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_3_1__1_in_rule__XBasicForLoopExpression__Group_3_1__026026 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_64_in_rule__XBasicForLoopExpression__Group_3_1__0__Impl26054 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_3_1__1__Impl_in_rule__XBasicForLoopExpression__Group_3_1__126085 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1_in_rule__XBasicForLoopExpression__Group_3_1__1__Impl26112 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_7__0__Impl_in_rule__XBasicForLoopExpression__Group_7__026146 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_7__1_in_rule__XBasicForLoopExpression__Group_7__026149 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0_in_rule__XBasicForLoopExpression__Group_7__0__Impl26176 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_7__1__Impl_in_rule__XBasicForLoopExpression__Group_7__126206 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_7_1__0_in_rule__XBasicForLoopExpression__Group_7__1__Impl26233 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_7_1__0__Impl_in_rule__XBasicForLoopExpression__Group_7_1__026268 = new BitSet(new long[]{0x5407E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_7_1__1_in_rule__XBasicForLoopExpression__Group_7_1__026271 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_64_in_rule__XBasicForLoopExpression__Group_7_1__0__Impl26299 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_7_1__1__Impl_in_rule__XBasicForLoopExpression__Group_7_1__126330 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1_in_rule__XBasicForLoopExpression__Group_7_1__1__Impl26357 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__0__Impl_in_rule__XWhileExpression__Group__026391 = new BitSet(new long[]{0x0000000000000000L,0x0000000000001000L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__1_in_rule__XWhileExpression__Group__026394 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__1__Impl_in_rule__XWhileExpression__Group__126452 = new BitSet(new long[]{0x4000000000000000L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__2_in_rule__XWhileExpression__Group__126455 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_76_in_rule__XWhileExpression__Group__1__Impl26483 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__2__Impl_in_rule__XWhileExpression__Group__226514 = new BitSet(new long[]{0x5407E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__3_in_rule__XWhileExpression__Group__226517 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_62_in_rule__XWhileExpression__Group__2__Impl26545 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__3__Impl_in_rule__XWhileExpression__Group__326576 = new BitSet(new long[]{0x8000000000000000L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__4_in_rule__XWhileExpression__Group__326579 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__PredicateAssignment_3_in_rule__XWhileExpression__Group__3__Impl26606 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__4__Impl_in_rule__XWhileExpression__Group__426636 = new BitSet(new long[]{0x5407E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__5_in_rule__XWhileExpression__Group__426639 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_rule__XWhileExpression__Group__4__Impl26667 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__5__Impl_in_rule__XWhileExpression__Group__526698 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__BodyAssignment_5_in_rule__XWhileExpression__Group__5__Impl26725 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__0__Impl_in_rule__XDoWhileExpression__Group__026767 = new BitSet(new long[]{0x0000000000000000L,0x0000000000002000L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__1_in_rule__XDoWhileExpression__Group__026770 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__1__Impl_in_rule__XDoWhileExpression__Group__126828 = new BitSet(new long[]{0x5407E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__2_in_rule__XDoWhileExpression__Group__126831 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_77_in_rule__XDoWhileExpression__Group__1__Impl26859 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__2__Impl_in_rule__XDoWhileExpression__Group__226890 = new BitSet(new long[]{0x0000000000000000L,0x0000000000001000L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__3_in_rule__XDoWhileExpression__Group__226893 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__BodyAssignment_2_in_rule__XDoWhileExpression__Group__2__Impl26920 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__3__Impl_in_rule__XDoWhileExpression__Group__326950 = new BitSet(new long[]{0x4000000000000000L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__4_in_rule__XDoWhileExpression__Group__326953 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_76_in_rule__XDoWhileExpression__Group__3__Impl26981 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__4__Impl_in_rule__XDoWhileExpression__Group__427012 = new BitSet(new long[]{0x5407E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__5_in_rule__XDoWhileExpression__Group__427015 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_62_in_rule__XDoWhileExpression__Group__4__Impl27043 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__5__Impl_in_rule__XDoWhileExpression__Group__527074 = new BitSet(new long[]{0x8000000000000000L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__6_in_rule__XDoWhileExpression__Group__527077 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__PredicateAssignment_5_in_rule__XDoWhileExpression__Group__5__Impl27104 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__6__Impl_in_rule__XDoWhileExpression__Group__627134 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_rule__XDoWhileExpression__Group__6__Impl27162 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group__0__Impl_in_rule__XBlockExpression__Group__027207 = new BitSet(new long[]{0x0400000000000000L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group__1_in_rule__XBlockExpression__Group__027210 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group__1__Impl_in_rule__XBlockExpression__Group__127268 = new BitSet(new long[]{0x5C07F10C880001F0L,0x00000000382FF286L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group__2_in_rule__XBlockExpression__Group__127271 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_58_in_rule__XBlockExpression__Group__1__Impl27299 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group__2__Impl_in_rule__XBlockExpression__Group__227330 = new BitSet(new long[]{0x5C07F10C880001F0L,0x00000000382FF286L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group__3_in_rule__XBlockExpression__Group__227333 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group_2__0_in_rule__XBlockExpression__Group__2__Impl27360 = new BitSet(new long[]{0x5407F10C880001F2L,0x00000000382FF286L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group__3__Impl_in_rule__XBlockExpression__Group__327391 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_59_in_rule__XBlockExpression__Group__3__Impl27419 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group_2__0__Impl_in_rule__XBlockExpression__Group_2__027458 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group_2__1_in_rule__XBlockExpression__Group_2__027461 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__ExpressionsAssignment_2_0_in_rule__XBlockExpression__Group_2__0__Impl27488 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group_2__1__Impl_in_rule__XBlockExpression__Group_2__127518 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_70_in_rule__XBlockExpression__Group_2__1__Impl27547 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group__0__Impl_in_rule__XVariableDeclaration__Group__027584 = new BitSet(new long[]{0x0000100000000000L,0x0000000010000000L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group__1_in_rule__XVariableDeclaration__Group__027587 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group__1__Impl_in_rule__XVariableDeclaration__Group__127645 = new BitSet(new long[]{0x4000000080000010L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group__2_in_rule__XVariableDeclaration__Group__127648 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Alternatives_1_in_rule__XVariableDeclaration__Group__1__Impl27675 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group__2__Impl_in_rule__XVariableDeclaration__Group__227705 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group__3_in_rule__XVariableDeclaration__Group__227708 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Alternatives_2_in_rule__XVariableDeclaration__Group__2__Impl27735 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group__3__Impl_in_rule__XVariableDeclaration__Group__327765 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_3__0_in_rule__XVariableDeclaration__Group__3__Impl27792 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_2_0__0__Impl_in_rule__XVariableDeclaration__Group_2_0__027831 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_2_0_0__0_in_rule__XVariableDeclaration__Group_2_0__0__Impl27858 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_2_0_0__0__Impl_in_rule__XVariableDeclaration__Group_2_0_0__027890 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_2_0_0__1_in_rule__XVariableDeclaration__Group_2_0_0__027893 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__TypeAssignment_2_0_0_0_in_rule__XVariableDeclaration__Group_2_0_0__0__Impl27920 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_2_0_0__1__Impl_in_rule__XVariableDeclaration__Group_2_0_0__127950 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__NameAssignment_2_0_0_1_in_rule__XVariableDeclaration__Group_2_0_0__1__Impl27977 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_3__0__Impl_in_rule__XVariableDeclaration__Group_3__028011 = new BitSet(new long[]{0x5407E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_3__1_in_rule__XVariableDeclaration__Group_3__028014 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_13_in_rule__XVariableDeclaration__Group_3__0__Impl28042 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_3__1__Impl_in_rule__XVariableDeclaration__Group_3__128073 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__RightAssignment_3_1_in_rule__XVariableDeclaration__Group_3__1__Impl28100 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmFormalParameter__Group__0__Impl_in_rule__JvmFormalParameter__Group__028134 = new BitSet(new long[]{0x4000000080000010L});
-    public static final BitSet FOLLOW_rule__JvmFormalParameter__Group__1_in_rule__JvmFormalParameter__Group__028137 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmFormalParameter__ParameterTypeAssignment_0_in_rule__JvmFormalParameter__Group__0__Impl28164 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmFormalParameter__Group__1__Impl_in_rule__JvmFormalParameter__Group__128195 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmFormalParameter__NameAssignment_1_in_rule__JvmFormalParameter__Group__1__Impl28222 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FullJvmFormalParameter__Group__0__Impl_in_rule__FullJvmFormalParameter__Group__028256 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__FullJvmFormalParameter__Group__1_in_rule__FullJvmFormalParameter__Group__028259 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FullJvmFormalParameter__ParameterTypeAssignment_0_in_rule__FullJvmFormalParameter__Group__0__Impl28286 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FullJvmFormalParameter__Group__1__Impl_in_rule__FullJvmFormalParameter__Group__128316 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FullJvmFormalParameter__NameAssignment_1_in_rule__FullJvmFormalParameter__Group__1__Impl28343 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group__0__Impl_in_rule__XFeatureCall__Group__028377 = new BitSet(new long[]{0x0003E00008000010L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group__1_in_rule__XFeatureCall__Group__028380 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group__1__Impl_in_rule__XFeatureCall__Group__128438 = new BitSet(new long[]{0x0003E00008000010L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group__2_in_rule__XFeatureCall__Group__128441 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1__0_in_rule__XFeatureCall__Group__1__Impl28468 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group__2__Impl_in_rule__XFeatureCall__Group__228499 = new BitSet(new long[]{0x4000000000000000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group__3_in_rule__XFeatureCall__Group__228502 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__FeatureAssignment_2_in_rule__XFeatureCall__Group__2__Impl28529 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group__3__Impl_in_rule__XFeatureCall__Group__328559 = new BitSet(new long[]{0x4000000000000000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group__4_in_rule__XFeatureCall__Group__328562 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3__0_in_rule__XFeatureCall__Group__3__Impl28589 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group__4__Impl_in_rule__XFeatureCall__Group__428620 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_4_in_rule__XFeatureCall__Group__4__Impl28647 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1__0__Impl_in_rule__XFeatureCall__Group_1__028688 = new BitSet(new long[]{0x4000000080000010L,0x0000000000800000L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1__1_in_rule__XFeatureCall__Group_1__028691 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__XFeatureCall__Group_1__0__Impl28719 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1__1__Impl_in_rule__XFeatureCall__Group_1__128750 = new BitSet(new long[]{0x0000000004000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1__2_in_rule__XFeatureCall__Group_1__128753 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__TypeArgumentsAssignment_1_1_in_rule__XFeatureCall__Group_1__1__Impl28780 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1__2__Impl_in_rule__XFeatureCall__Group_1__228810 = new BitSet(new long[]{0x0000000004000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1__3_in_rule__XFeatureCall__Group_1__228813 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1_2__0_in_rule__XFeatureCall__Group_1__2__Impl28840 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1__3__Impl_in_rule__XFeatureCall__Group_1__328871 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_rule__XFeatureCall__Group_1__3__Impl28899 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1_2__0__Impl_in_rule__XFeatureCall__Group_1_2__028938 = new BitSet(new long[]{0x4000000080000010L,0x0000000000800000L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1_2__1_in_rule__XFeatureCall__Group_1_2__028941 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_64_in_rule__XFeatureCall__Group_1_2__0__Impl28969 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1_2__1__Impl_in_rule__XFeatureCall__Group_1_2__129000 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__TypeArgumentsAssignment_1_2_1_in_rule__XFeatureCall__Group_1_2__1__Impl29027 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3__0__Impl_in_rule__XFeatureCall__Group_3__029061 = new BitSet(new long[]{0xD407E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3__1_in_rule__XFeatureCall__Group_3__029064 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__ExplicitOperationCallAssignment_3_0_in_rule__XFeatureCall__Group_3__0__Impl29091 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3__1__Impl_in_rule__XFeatureCall__Group_3__129121 = new BitSet(new long[]{0xD407E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3__2_in_rule__XFeatureCall__Group_3__129124 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Alternatives_3_1_in_rule__XFeatureCall__Group_3__1__Impl29151 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3__2__Impl_in_rule__XFeatureCall__Group_3__229182 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_rule__XFeatureCall__Group_3__2__Impl29210 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3_1_1__0__Impl_in_rule__XFeatureCall__Group_3_1_1__029247 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3_1_1__1_in_rule__XFeatureCall__Group_3_1_1__029250 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0_in_rule__XFeatureCall__Group_3_1_1__0__Impl29277 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3_1_1__1__Impl_in_rule__XFeatureCall__Group_3_1_1__129307 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3_1_1_1__0_in_rule__XFeatureCall__Group_3_1_1__1__Impl29334 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3_1_1_1__0__Impl_in_rule__XFeatureCall__Group_3_1_1_1__029369 = new BitSet(new long[]{0x5407E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3_1_1_1__1_in_rule__XFeatureCall__Group_3_1_1_1__029372 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_64_in_rule__XFeatureCall__Group_3_1_1_1__0__Impl29400 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3_1_1_1__1__Impl_in_rule__XFeatureCall__Group_3_1_1_1__129431 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1_in_rule__XFeatureCall__Group_3_1_1_1__1__Impl29458 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__0__Impl_in_rule__XConstructorCall__Group__029492 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__1_in_rule__XConstructorCall__Group__029495 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__1__Impl_in_rule__XConstructorCall__Group__129553 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__2_in_rule__XConstructorCall__Group__129556 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_78_in_rule__XConstructorCall__Group__1__Impl29584 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__2__Impl_in_rule__XConstructorCall__Group__229615 = new BitSet(new long[]{0x4000000008000000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__3_in_rule__XConstructorCall__Group__229618 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__ConstructorAssignment_2_in_rule__XConstructorCall__Group__2__Impl29645 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__3__Impl_in_rule__XConstructorCall__Group__329675 = new BitSet(new long[]{0x4000000008000000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__4_in_rule__XConstructorCall__Group__329678 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__0_in_rule__XConstructorCall__Group__3__Impl29705 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__4__Impl_in_rule__XConstructorCall__Group__429736 = new BitSet(new long[]{0x4000000008000000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__5_in_rule__XConstructorCall__Group__429739 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4__0_in_rule__XConstructorCall__Group__4__Impl29766 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__5__Impl_in_rule__XConstructorCall__Group__529797 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__ArgumentsAssignment_5_in_rule__XConstructorCall__Group__5__Impl29824 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__0__Impl_in_rule__XConstructorCall__Group_3__029867 = new BitSet(new long[]{0x4000000080000010L,0x0000000000800000L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__1_in_rule__XConstructorCall__Group_3__029870 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__XConstructorCall__Group_3__0__Impl29899 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__1__Impl_in_rule__XConstructorCall__Group_3__129931 = new BitSet(new long[]{0x0000000004000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__2_in_rule__XConstructorCall__Group_3__129934 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__TypeArgumentsAssignment_3_1_in_rule__XConstructorCall__Group_3__1__Impl29961 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__2__Impl_in_rule__XConstructorCall__Group_3__229991 = new BitSet(new long[]{0x0000000004000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__3_in_rule__XConstructorCall__Group_3__229994 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3_2__0_in_rule__XConstructorCall__Group_3__2__Impl30021 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__3__Impl_in_rule__XConstructorCall__Group_3__330052 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_rule__XConstructorCall__Group_3__3__Impl30080 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3_2__0__Impl_in_rule__XConstructorCall__Group_3_2__030119 = new BitSet(new long[]{0x4000000080000010L,0x0000000000800000L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3_2__1_in_rule__XConstructorCall__Group_3_2__030122 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_64_in_rule__XConstructorCall__Group_3_2__0__Impl30150 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3_2__1__Impl_in_rule__XConstructorCall__Group_3_2__130181 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__TypeArgumentsAssignment_3_2_1_in_rule__XConstructorCall__Group_3_2__1__Impl30208 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4__0__Impl_in_rule__XConstructorCall__Group_4__030242 = new BitSet(new long[]{0xD407E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4__1_in_rule__XConstructorCall__Group_4__030245 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0_in_rule__XConstructorCall__Group_4__0__Impl30272 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4__1__Impl_in_rule__XConstructorCall__Group_4__130302 = new BitSet(new long[]{0xD407E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4__2_in_rule__XConstructorCall__Group_4__130305 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Alternatives_4_1_in_rule__XConstructorCall__Group_4__1__Impl30332 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4__2__Impl_in_rule__XConstructorCall__Group_4__230363 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_rule__XConstructorCall__Group_4__2__Impl30391 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4_1_1__0__Impl_in_rule__XConstructorCall__Group_4_1_1__030428 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4_1_1__1_in_rule__XConstructorCall__Group_4_1_1__030431 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__ArgumentsAssignment_4_1_1_0_in_rule__XConstructorCall__Group_4_1_1__0__Impl30458 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4_1_1__1__Impl_in_rule__XConstructorCall__Group_4_1_1__130488 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4_1_1_1__0_in_rule__XConstructorCall__Group_4_1_1__1__Impl30515 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4_1_1_1__0__Impl_in_rule__XConstructorCall__Group_4_1_1_1__030550 = new BitSet(new long[]{0x5407E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4_1_1_1__1_in_rule__XConstructorCall__Group_4_1_1_1__030553 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_64_in_rule__XConstructorCall__Group_4_1_1_1__0__Impl30581 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4_1_1_1__1__Impl_in_rule__XConstructorCall__Group_4_1_1_1__130612 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1_in_rule__XConstructorCall__Group_4_1_1_1__1__Impl30639 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBooleanLiteral__Group__0__Impl_in_rule__XBooleanLiteral__Group__030673 = new BitSet(new long[]{0x0004000000000000L,0x0000000020000000L});
-    public static final BitSet FOLLOW_rule__XBooleanLiteral__Group__1_in_rule__XBooleanLiteral__Group__030676 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBooleanLiteral__Group__1__Impl_in_rule__XBooleanLiteral__Group__130734 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBooleanLiteral__Alternatives_1_in_rule__XBooleanLiteral__Group__1__Impl30761 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XNullLiteral__Group__0__Impl_in_rule__XNullLiteral__Group__030795 = new BitSet(new long[]{0x0000000000000000L,0x0000000000008000L});
-    public static final BitSet FOLLOW_rule__XNullLiteral__Group__1_in_rule__XNullLiteral__Group__030798 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XNullLiteral__Group__1__Impl_in_rule__XNullLiteral__Group__130856 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_79_in_rule__XNullLiteral__Group__1__Impl30884 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XNumberLiteral__Group__0__Impl_in_rule__XNumberLiteral__Group__030919 = new BitSet(new long[]{0x00000000000000E0L});
-    public static final BitSet FOLLOW_rule__XNumberLiteral__Group__1_in_rule__XNumberLiteral__Group__030922 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XNumberLiteral__Group__1__Impl_in_rule__XNumberLiteral__Group__130980 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XNumberLiteral__ValueAssignment_1_in_rule__XNumberLiteral__Group__1__Impl31007 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XStringLiteral__Group__0__Impl_in_rule__XStringLiteral__Group__031041 = new BitSet(new long[]{0x0004010C000001E0L,0x0000000020000000L});
-    public static final BitSet FOLLOW_rule__XStringLiteral__Group__1_in_rule__XStringLiteral__Group__031044 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XStringLiteral__Group__1__Impl_in_rule__XStringLiteral__Group__131102 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XStringLiteral__ValueAssignment_1_in_rule__XStringLiteral__Group__1__Impl31129 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__0__Impl_in_rule__XTypeLiteral__Group__031163 = new BitSet(new long[]{0x0004010C000001E0L,0x0000000020018006L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__1_in_rule__XTypeLiteral__Group__031166 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__1__Impl_in_rule__XTypeLiteral__Group__131224 = new BitSet(new long[]{0x4000000000000000L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__2_in_rule__XTypeLiteral__Group__131227 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_80_in_rule__XTypeLiteral__Group__1__Impl31255 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__2__Impl_in_rule__XTypeLiteral__Group__231286 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__3_in_rule__XTypeLiteral__Group__231289 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_62_in_rule__XTypeLiteral__Group__2__Impl31317 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__3__Impl_in_rule__XTypeLiteral__Group__331348 = new BitSet(new long[]{0x8000000000000000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__4_in_rule__XTypeLiteral__Group__331351 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__TypeAssignment_3_in_rule__XTypeLiteral__Group__3__Impl31378 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__4__Impl_in_rule__XTypeLiteral__Group__431408 = new BitSet(new long[]{0x8000000000000000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__5_in_rule__XTypeLiteral__Group__431411 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__ArrayDimensionsAssignment_4_in_rule__XTypeLiteral__Group__4__Impl31438 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000004L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__5__Impl_in_rule__XTypeLiteral__Group__531469 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_rule__XTypeLiteral__Group__5__Impl31497 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XThrowExpression__Group__0__Impl_in_rule__XThrowExpression__Group__031540 = new BitSet(new long[]{0x0000000000000000L,0x0000000000020000L});
-    public static final BitSet FOLLOW_rule__XThrowExpression__Group__1_in_rule__XThrowExpression__Group__031543 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XThrowExpression__Group__1__Impl_in_rule__XThrowExpression__Group__131601 = new BitSet(new long[]{0x5407E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XThrowExpression__Group__2_in_rule__XThrowExpression__Group__131604 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_81_in_rule__XThrowExpression__Group__1__Impl31632 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XThrowExpression__Group__2__Impl_in_rule__XThrowExpression__Group__231663 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XThrowExpression__ExpressionAssignment_2_in_rule__XThrowExpression__Group__2__Impl31690 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XReturnExpression__Group__0__Impl_in_rule__XReturnExpression__Group__031726 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
-    public static final BitSet FOLLOW_rule__XReturnExpression__Group__1_in_rule__XReturnExpression__Group__031729 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XReturnExpression__Group__1__Impl_in_rule__XReturnExpression__Group__131787 = new BitSet(new long[]{0x5407E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XReturnExpression__Group__2_in_rule__XReturnExpression__Group__131790 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_82_in_rule__XReturnExpression__Group__1__Impl31818 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XReturnExpression__Group__2__Impl_in_rule__XReturnExpression__Group__231849 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XReturnExpression__ExpressionAssignment_2_in_rule__XReturnExpression__Group__2__Impl31876 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group__0__Impl_in_rule__XTryCatchFinallyExpression__Group__031913 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group__1_in_rule__XTryCatchFinallyExpression__Group__031916 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group__1__Impl_in_rule__XTryCatchFinallyExpression__Group__131974 = new BitSet(new long[]{0x5407E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group__2_in_rule__XTryCatchFinallyExpression__Group__131977 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_83_in_rule__XTryCatchFinallyExpression__Group__1__Impl32005 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group__2__Impl_in_rule__XTryCatchFinallyExpression__Group__232036 = new BitSet(new long[]{0x0000000000000000L,0x0000000000500000L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group__3_in_rule__XTryCatchFinallyExpression__Group__232039 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__ExpressionAssignment_2_in_rule__XTryCatchFinallyExpression__Group__2__Impl32066 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group__3__Impl_in_rule__XTryCatchFinallyExpression__Group__332096 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Alternatives_3_in_rule__XTryCatchFinallyExpression__Group__3__Impl32123 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0__0__Impl_in_rule__XTryCatchFinallyExpression__Group_3_0__032161 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0__1_in_rule__XTryCatchFinallyExpression__Group_3_0__032164 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0_in_rule__XTryCatchFinallyExpression__Group_3_0__0__Impl32193 = new BitSet(new long[]{0x0000000000000002L,0x0000000000400000L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0_in_rule__XTryCatchFinallyExpression__Group_3_0__0__Impl32205 = new BitSet(new long[]{0x0000000000000002L,0x0000000000400000L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0__1__Impl_in_rule__XTryCatchFinallyExpression__Group_3_0__132238 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__0_in_rule__XTryCatchFinallyExpression__Group_3_0__1__Impl32265 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl_in_rule__XTryCatchFinallyExpression__Group_3_0_1__032300 = new BitSet(new long[]{0x5407E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__1_in_rule__XTryCatchFinallyExpression__Group_3_0_1__032303 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_84_in_rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl32332 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl_in_rule__XTryCatchFinallyExpression__Group_3_0_1__132364 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1_in_rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl32391 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_1__0__Impl_in_rule__XTryCatchFinallyExpression__Group_3_1__032425 = new BitSet(new long[]{0x5407E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_1__1_in_rule__XTryCatchFinallyExpression__Group_3_1__032428 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_84_in_rule__XTryCatchFinallyExpression__Group_3_1__0__Impl32456 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_1__1__Impl_in_rule__XTryCatchFinallyExpression__Group_3_1__132487 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1_in_rule__XTryCatchFinallyExpression__Group_3_1__1__Impl32514 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group__0__Impl_in_rule__XSynchronizedExpression__Group__032548 = new BitSet(new long[]{0x5407E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group__1_in_rule__XSynchronizedExpression__Group__032551 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group_0__0_in_rule__XSynchronizedExpression__Group__0__Impl32578 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group__1__Impl_in_rule__XSynchronizedExpression__Group__132608 = new BitSet(new long[]{0x8000000000000000L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group__2_in_rule__XSynchronizedExpression__Group__132611 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__ParamAssignment_1_in_rule__XSynchronizedExpression__Group__1__Impl32638 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group__2__Impl_in_rule__XSynchronizedExpression__Group__232668 = new BitSet(new long[]{0x5407E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group__3_in_rule__XSynchronizedExpression__Group__232671 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_rule__XSynchronizedExpression__Group__2__Impl32699 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group__3__Impl_in_rule__XSynchronizedExpression__Group__332730 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__ExpressionAssignment_3_in_rule__XSynchronizedExpression__Group__3__Impl32757 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group_0__0__Impl_in_rule__XSynchronizedExpression__Group_0__032795 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group_0_0__0_in_rule__XSynchronizedExpression__Group_0__0__Impl32822 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group_0_0__0__Impl_in_rule__XSynchronizedExpression__Group_0_0__032854 = new BitSet(new long[]{0x0000000000000000L,0x0000000000200000L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group_0_0__1_in_rule__XSynchronizedExpression__Group_0_0__032857 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group_0_0__1__Impl_in_rule__XSynchronizedExpression__Group_0_0__132915 = new BitSet(new long[]{0x4000000000000000L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group_0_0__2_in_rule__XSynchronizedExpression__Group_0_0__132918 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_85_in_rule__XSynchronizedExpression__Group_0_0__1__Impl32946 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group_0_0__2__Impl_in_rule__XSynchronizedExpression__Group_0_0__232977 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_62_in_rule__XSynchronizedExpression__Group_0_0__2__Impl33005 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCatchClause__Group__0__Impl_in_rule__XCatchClause__Group__033042 = new BitSet(new long[]{0x4000000000000000L});
-    public static final BitSet FOLLOW_rule__XCatchClause__Group__1_in_rule__XCatchClause__Group__033045 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_86_in_rule__XCatchClause__Group__0__Impl33074 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCatchClause__Group__1__Impl_in_rule__XCatchClause__Group__133106 = new BitSet(new long[]{0x4000000080000010L});
-    public static final BitSet FOLLOW_rule__XCatchClause__Group__2_in_rule__XCatchClause__Group__133109 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_62_in_rule__XCatchClause__Group__1__Impl33137 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCatchClause__Group__2__Impl_in_rule__XCatchClause__Group__233168 = new BitSet(new long[]{0x8000000000000000L});
-    public static final BitSet FOLLOW_rule__XCatchClause__Group__3_in_rule__XCatchClause__Group__233171 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCatchClause__DeclaredParamAssignment_2_in_rule__XCatchClause__Group__2__Impl33198 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCatchClause__Group__3__Impl_in_rule__XCatchClause__Group__333228 = new BitSet(new long[]{0x5407E10C880001F0L,0x00000000282FF286L});
-    public static final BitSet FOLLOW_rule__XCatchClause__Group__4_in_rule__XCatchClause__Group__333231 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_rule__XCatchClause__Group__3__Impl33259 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCatchClause__Group__4__Impl_in_rule__XCatchClause__Group__433290 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCatchClause__ExpressionAssignment_4_in_rule__XCatchClause__Group__4__Impl33317 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group__0__Impl_in_rule__QualifiedName__Group__033357 = new BitSet(new long[]{0x0000080000000000L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group__1_in_rule__QualifiedName__Group__033360 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__QualifiedName__Group__0__Impl33387 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group__1__Impl_in_rule__QualifiedName__Group__133416 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group_1__0_in_rule__QualifiedName__Group__1__Impl33443 = new BitSet(new long[]{0x0000080000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group_1__0__Impl_in_rule__QualifiedName__Group_1__033478 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group_1__1_in_rule__QualifiedName__Group_1__033481 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_rule__QualifiedName__Group_1__0__Impl33510 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group_1__1__Impl_in_rule__QualifiedName__Group_1__133542 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__QualifiedName__Group_1__1__Impl33569 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Number__Group_1__0__Impl_in_rule__Number__Group_1__033602 = new BitSet(new long[]{0x0000080000000000L});
-    public static final BitSet FOLLOW_rule__Number__Group_1__1_in_rule__Number__Group_1__033605 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Number__Alternatives_1_0_in_rule__Number__Group_1__0__Impl33632 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Number__Group_1__1__Impl_in_rule__Number__Group_1__133662 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Number__Group_1_1__0_in_rule__Number__Group_1__1__Impl33689 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Number__Group_1_1__0__Impl_in_rule__Number__Group_1_1__033724 = new BitSet(new long[]{0x00000000000000C0L});
-    public static final BitSet FOLLOW_rule__Number__Group_1_1__1_in_rule__Number__Group_1_1__033727 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_rule__Number__Group_1_1__0__Impl33755 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Number__Group_1_1__1__Impl_in_rule__Number__Group_1_1__133786 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Number__Alternatives_1_1_1_in_rule__Number__Group_1_1__1__Impl33813 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0__0__Impl_in_rule__JvmTypeReference__Group_0__033848 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0__1_in_rule__JvmTypeReference__Group_0__033851 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmParameterizedTypeReference_in_rule__JvmTypeReference__Group_0__0__Impl33878 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0__1__Impl_in_rule__JvmTypeReference__Group_0__133907 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0_1__0_in_rule__JvmTypeReference__Group_0__1__Impl33934 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000004L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0_1__0__Impl_in_rule__JvmTypeReference__Group_0_1__033969 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0_1_0__0_in_rule__JvmTypeReference__Group_0_1__0__Impl33996 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0_1_0__0__Impl_in_rule__JvmTypeReference__Group_0_1_0__034028 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0_1_0__1_in_rule__JvmTypeReference__Group_0_1_0__034031 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0_1_0__1__Impl_in_rule__JvmTypeReference__Group_0_1_0__134089 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleArrayBrackets_in_rule__JvmTypeReference__Group_0_1_0__1__Impl34116 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ArrayBrackets__Group__0__Impl_in_rule__ArrayBrackets__Group__034149 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000008L});
-    public static final BitSet FOLLOW_rule__ArrayBrackets__Group__1_in_rule__ArrayBrackets__Group__034152 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_66_in_rule__ArrayBrackets__Group__0__Impl34180 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ArrayBrackets__Group__1__Impl_in_rule__ArrayBrackets__Group__134211 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_67_in_rule__ArrayBrackets__Group__1__Impl34239 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group__0__Impl_in_rule__XFunctionTypeRef__Group__034274 = new BitSet(new long[]{0x4000000080000010L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group__1_in_rule__XFunctionTypeRef__Group__034277 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0__0_in_rule__XFunctionTypeRef__Group__0__Impl34304 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group__1__Impl_in_rule__XFunctionTypeRef__Group__134335 = new BitSet(new long[]{0x4000000080000010L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group__2_in_rule__XFunctionTypeRef__Group__134338 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_rule__XFunctionTypeRef__Group__1__Impl34366 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group__2__Impl_in_rule__XFunctionTypeRef__Group__234397 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__ReturnTypeAssignment_2_in_rule__XFunctionTypeRef__Group__2__Impl34424 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0__0__Impl_in_rule__XFunctionTypeRef__Group_0__034460 = new BitSet(new long[]{0xC000000080000010L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0__1_in_rule__XFunctionTypeRef__Group_0__034463 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_62_in_rule__XFunctionTypeRef__Group_0__0__Impl34491 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0__1__Impl_in_rule__XFunctionTypeRef__Group_0__134522 = new BitSet(new long[]{0xC000000080000010L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0__2_in_rule__XFunctionTypeRef__Group_0__134525 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0_1__0_in_rule__XFunctionTypeRef__Group_0__1__Impl34552 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0__2__Impl_in_rule__XFunctionTypeRef__Group_0__234583 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_rule__XFunctionTypeRef__Group_0__2__Impl34611 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0_1__0__Impl_in_rule__XFunctionTypeRef__Group_0_1__034648 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0_1__1_in_rule__XFunctionTypeRef__Group_0_1__034651 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0_in_rule__XFunctionTypeRef__Group_0_1__0__Impl34678 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0_1__1__Impl_in_rule__XFunctionTypeRef__Group_0_1__134708 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0_1_1__0_in_rule__XFunctionTypeRef__Group_0_1__1__Impl34735 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0_1_1__0__Impl_in_rule__XFunctionTypeRef__Group_0_1_1__034770 = new BitSet(new long[]{0x4000000080000010L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0_1_1__1_in_rule__XFunctionTypeRef__Group_0_1_1__034773 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_64_in_rule__XFunctionTypeRef__Group_0_1_1__0__Impl34801 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0_1_1__1__Impl_in_rule__XFunctionTypeRef__Group_0_1_1__134832 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1_in_rule__XFunctionTypeRef__Group_0_1_1__1__Impl34859 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group__0__Impl_in_rule__JvmParameterizedTypeReference__Group__034893 = new BitSet(new long[]{0x0000000008000000L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group__1_in_rule__JvmParameterizedTypeReference__Group__034896 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__TypeAssignment_0_in_rule__JvmParameterizedTypeReference__Group__0__Impl34923 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group__1__Impl_in_rule__JvmParameterizedTypeReference__Group__134953 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__0_in_rule__JvmParameterizedTypeReference__Group__1__Impl34980 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1__035015 = new BitSet(new long[]{0x4000000080000010L,0x0000000000800000L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__1_in_rule__JvmParameterizedTypeReference__Group_1__035018 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__JvmParameterizedTypeReference__Group_1__0__Impl35047 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1__135079 = new BitSet(new long[]{0x0000000004000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__2_in_rule__JvmParameterizedTypeReference__Group_1__135082 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1_in_rule__JvmParameterizedTypeReference__Group_1__1__Impl35109 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__2__Impl_in_rule__JvmParameterizedTypeReference__Group_1__235139 = new BitSet(new long[]{0x0000000004000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__3_in_rule__JvmParameterizedTypeReference__Group_1__235142 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_2__0_in_rule__JvmParameterizedTypeReference__Group_1__2__Impl35169 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__3__Impl_in_rule__JvmParameterizedTypeReference__Group_1__335200 = new BitSet(new long[]{0x0000080000000000L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__4_in_rule__JvmParameterizedTypeReference__Group_1__335203 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_rule__JvmParameterizedTypeReference__Group_1__3__Impl35231 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__4__Impl_in_rule__JvmParameterizedTypeReference__Group_1__435262 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__0_in_rule__JvmParameterizedTypeReference__Group_1__4__Impl35289 = new BitSet(new long[]{0x0000080000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_2__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_2__035330 = new BitSet(new long[]{0x4000000080000010L,0x0000000000800000L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_2__1_in_rule__JvmParameterizedTypeReference__Group_1_2__035333 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_64_in_rule__JvmParameterizedTypeReference__Group_1_2__0__Impl35361 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_2__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_2__135392 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1_in_rule__JvmParameterizedTypeReference__Group_1_2__1__Impl35419 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4__035453 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__1_in_rule__JvmParameterizedTypeReference__Group_1_4__035456 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0__0_in_rule__JvmParameterizedTypeReference__Group_1_4__0__Impl35483 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4__135513 = new BitSet(new long[]{0x0000000008000000L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__2_in_rule__JvmParameterizedTypeReference__Group_1_4__135516 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1_in_rule__JvmParameterizedTypeReference__Group_1_4__1__Impl35543 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__2__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4__235573 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__0_in_rule__JvmParameterizedTypeReference__Group_1_4__2__Impl35600 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_0__035637 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0_0__0_in_rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl35664 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_0_0__035696 = new BitSet(new long[]{0x0000080000000000L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0_0__1_in_rule__JvmParameterizedTypeReference__Group_1_4_0_0__035699 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_0_0__135757 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl35785 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2__035820 = new BitSet(new long[]{0x4000000080000010L,0x0000000000800000L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__1_in_rule__JvmParameterizedTypeReference__Group_1_4_2__035823 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl35852 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2__135884 = new BitSet(new long[]{0x0000000004000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__2_in_rule__JvmParameterizedTypeReference__Group_1_4_2__135887 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1_in_rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl35914 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2__235944 = new BitSet(new long[]{0x0000000004000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__3_in_rule__JvmParameterizedTypeReference__Group_1_4_2__235947 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2_2__0_in_rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl35974 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2__336005 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl36033 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__036072 = new BitSet(new long[]{0x4000000080000010L,0x0000000000800000L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2_2__1_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__036075 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_64_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl36103 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__136134 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl36161 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group__0__Impl_in_rule__JvmWildcardTypeReference__Group__036195 = new BitSet(new long[]{0x4000000080000010L,0x0000000000800000L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group__1_in_rule__JvmWildcardTypeReference__Group__036198 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group__1__Impl_in_rule__JvmWildcardTypeReference__Group__136256 = new BitSet(new long[]{0x0002200000000000L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group__2_in_rule__JvmWildcardTypeReference__Group__136259 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_87_in_rule__JvmWildcardTypeReference__Group__1__Impl36287 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group__2__Impl_in_rule__JvmWildcardTypeReference__Group__236318 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Alternatives_2_in_rule__JvmWildcardTypeReference__Group__2__Impl36345 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group_2_0__0__Impl_in_rule__JvmWildcardTypeReference__Group_2_0__036382 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group_2_0__1_in_rule__JvmWildcardTypeReference__Group_2_0__036385 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0_in_rule__JvmWildcardTypeReference__Group_2_0__0__Impl36412 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group_2_0__1__Impl_in_rule__JvmWildcardTypeReference__Group_2_0__136442 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1_in_rule__JvmWildcardTypeReference__Group_2_0__1__Impl36469 = new BitSet(new long[]{0x0000000000000002L,0x0000000001000000L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group_2_1__0__Impl_in_rule__JvmWildcardTypeReference__Group_2_1__036504 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group_2_1__1_in_rule__JvmWildcardTypeReference__Group_2_1__036507 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0_in_rule__JvmWildcardTypeReference__Group_2_1__0__Impl36534 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group_2_1__1__Impl_in_rule__JvmWildcardTypeReference__Group_2_1__136564 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1_in_rule__JvmWildcardTypeReference__Group_2_1__1__Impl36591 = new BitSet(new long[]{0x0000000000000002L,0x0000000001000000L});
-    public static final BitSet FOLLOW_rule__JvmUpperBound__Group__0__Impl_in_rule__JvmUpperBound__Group__036626 = new BitSet(new long[]{0x4000000080000010L});
-    public static final BitSet FOLLOW_rule__JvmUpperBound__Group__1_in_rule__JvmUpperBound__Group__036629 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_45_in_rule__JvmUpperBound__Group__0__Impl36657 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmUpperBound__Group__1__Impl_in_rule__JvmUpperBound__Group__136688 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmUpperBound__TypeReferenceAssignment_1_in_rule__JvmUpperBound__Group__1__Impl36715 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmUpperBoundAnded__Group__0__Impl_in_rule__JvmUpperBoundAnded__Group__036749 = new BitSet(new long[]{0x4000000080000010L});
-    public static final BitSet FOLLOW_rule__JvmUpperBoundAnded__Group__1_in_rule__JvmUpperBoundAnded__Group__036752 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_88_in_rule__JvmUpperBoundAnded__Group__0__Impl36780 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmUpperBoundAnded__Group__1__Impl_in_rule__JvmUpperBoundAnded__Group__136811 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmUpperBoundAnded__TypeReferenceAssignment_1_in_rule__JvmUpperBoundAnded__Group__1__Impl36838 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmLowerBound__Group__0__Impl_in_rule__JvmLowerBound__Group__036872 = new BitSet(new long[]{0x4000000080000010L});
-    public static final BitSet FOLLOW_rule__JvmLowerBound__Group__1_in_rule__JvmLowerBound__Group__036875 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_49_in_rule__JvmLowerBound__Group__0__Impl36903 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmLowerBound__Group__1__Impl_in_rule__JvmLowerBound__Group__136934 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmLowerBound__TypeReferenceAssignment_1_in_rule__JvmLowerBound__Group__1__Impl36961 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmLowerBoundAnded__Group__0__Impl_in_rule__JvmLowerBoundAnded__Group__036995 = new BitSet(new long[]{0x4000000080000010L});
-    public static final BitSet FOLLOW_rule__JvmLowerBoundAnded__Group__1_in_rule__JvmLowerBoundAnded__Group__036998 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_88_in_rule__JvmLowerBoundAnded__Group__0__Impl37026 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmLowerBoundAnded__Group__1__Impl_in_rule__JvmLowerBoundAnded__Group__137057 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmLowerBoundAnded__TypeReferenceAssignment_1_in_rule__JvmLowerBoundAnded__Group__1__Impl37084 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedNameWithWildcard__Group__0__Impl_in_rule__QualifiedNameWithWildcard__Group__037120 = new BitSet(new long[]{0x0000080000000000L});
-    public static final BitSet FOLLOW_rule__QualifiedNameWithWildcard__Group__1_in_rule__QualifiedNameWithWildcard__Group__037123 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__QualifiedNameWithWildcard__Group__0__Impl37150 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedNameWithWildcard__Group__1__Impl_in_rule__QualifiedNameWithWildcard__Group__137179 = new BitSet(new long[]{0x0000001000000000L});
-    public static final BitSet FOLLOW_rule__QualifiedNameWithWildcard__Group__2_in_rule__QualifiedNameWithWildcard__Group__137182 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_rule__QualifiedNameWithWildcard__Group__1__Impl37210 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedNameWithWildcard__Group__2__Impl_in_rule__QualifiedNameWithWildcard__Group__237241 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_rule__QualifiedNameWithWildcard__Group__2__Impl37269 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Group__0__Impl_in_rule__XImportDeclaration__Group__037306 = new BitSet(new long[]{0x0000400000000010L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Group__1_in_rule__XImportDeclaration__Group__037309 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__XImportDeclaration__Group__0__Impl37337 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Group__1__Impl_in_rule__XImportDeclaration__Group__137368 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Group__2_in_rule__XImportDeclaration__Group__137371 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Alternatives_1_in_rule__XImportDeclaration__Group__1__Impl37398 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Group__2__Impl_in_rule__XImportDeclaration__Group__237428 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_70_in_rule__XImportDeclaration__Group__2__Impl37457 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Group_1_0__0__Impl_in_rule__XImportDeclaration__Group_1_0__037496 = new BitSet(new long[]{0x0001000000000010L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Group_1_0__1_in_rule__XImportDeclaration__Group_1_0__037499 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__StaticAssignment_1_0_0_in_rule__XImportDeclaration__Group_1_0__0__Impl37526 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Group_1_0__1__Impl_in_rule__XImportDeclaration__Group_1_0__137556 = new BitSet(new long[]{0x0001000000000010L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Group_1_0__2_in_rule__XImportDeclaration__Group_1_0__137559 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__ExtensionAssignment_1_0_1_in_rule__XImportDeclaration__Group_1_0__1__Impl37586 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Group_1_0__2__Impl_in_rule__XImportDeclaration__Group_1_0__237617 = new BitSet(new long[]{0x0000001000000010L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Group_1_0__3_in_rule__XImportDeclaration__Group_1_0__237620 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__ImportedTypeAssignment_1_0_2_in_rule__XImportDeclaration__Group_1_0__2__Impl37647 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Group_1_0__3__Impl_in_rule__XImportDeclaration__Group_1_0__337677 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Alternatives_1_0_3_in_rule__XImportDeclaration__Group_1_0__3__Impl37704 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedNameInStaticImport__Group__0__Impl_in_rule__QualifiedNameInStaticImport__Group__037742 = new BitSet(new long[]{0x0000080000000000L});
-    public static final BitSet FOLLOW_rule__QualifiedNameInStaticImport__Group__1_in_rule__QualifiedNameInStaticImport__Group__037745 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__QualifiedNameInStaticImport__Group__0__Impl37772 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedNameInStaticImport__Group__1__Impl_in_rule__QualifiedNameInStaticImport__Group__137801 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_rule__QualifiedNameInStaticImport__Group__1__Impl37829 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__CheckConfiguration__NameAssignment_237869 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConfiguredParameter_in_rule__CheckConfiguration__ParameterConfigurationsAssignment_337900 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConfiguredLanguageValidator_in_rule__CheckConfiguration__LanguageValidatorConfigurationsAssignment_437931 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConfiguredCatalog_in_rule__CheckConfiguration__LegacyCatalogConfigurationsAssignment_5_137962 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__ConfiguredLanguageValidator__LanguageAssignment_137993 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConfiguredParameter_in_rule__ConfiguredLanguageValidator__ParameterConfigurationsAssignment_338024 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConfiguredCatalog_in_rule__ConfiguredLanguageValidator__CatalogConfigurationsAssignment_438055 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__ConfiguredCatalog__CatalogAssignment_238090 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConfiguredParameter_in_rule__ConfiguredCatalog__ParameterConfigurationsAssignment_438125 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConfiguredCheck_in_rule__ConfiguredCatalog__CheckConfigurationsAssignment_538156 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSeverityKind_in_rule__ConfiguredCheck__SeverityAssignment_138187 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__ConfiguredCheck__CheckAssignment_238222 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConfiguredParameter_in_rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_138257 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConfiguredParameter_in_rule__ConfiguredCheck__ParameterConfigurationsAssignment_3_2_138288 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__ConfiguredParameter__ParameterAssignment_138323 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXFormalParameterDefaultValueLiteral_in_rule__ConfiguredParameter__NewValueAssignment_338358 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpUnary_in_rule__XConstantUnaryOperation__FeatureAssignment_0_138393 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstantUnaryOperation_in_rule__XConstantUnaryOperation__OperandAssignment_0_238428 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstantUnaryOperation_in_rule__XConstantListLiteral__ElementsAssignment_3_038459 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstantUnaryOperation_in_rule__XConstantListLiteral__ElementsAssignment_3_1_138490 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFeatureCallID_in_rule__XAssignment__FeatureAssignment_0_138525 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAssignment_in_rule__XAssignment__ValueAssignment_0_338560 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpMultiAssign_in_rule__XAssignment__FeatureAssignment_1_1_0_0_138595 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAssignment_in_rule__XAssignment__RightOperandAssignment_1_1_138630 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpOr_in_rule__XOrExpression__FeatureAssignment_1_0_0_138665 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAndExpression_in_rule__XOrExpression__RightOperandAssignment_1_138700 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpAnd_in_rule__XAndExpression__FeatureAssignment_1_0_0_138735 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXEqualityExpression_in_rule__XAndExpression__RightOperandAssignment_1_138770 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpEquality_in_rule__XEqualityExpression__FeatureAssignment_1_0_0_138805 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXRelationalExpression_in_rule__XEqualityExpression__RightOperandAssignment_1_138840 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__XRelationalExpression__TypeAssignment_1_0_138871 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpCompare_in_rule__XRelationalExpression__FeatureAssignment_1_1_0_0_138906 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXOtherOperatorExpression_in_rule__XRelationalExpression__RightOperandAssignment_1_1_138941 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpOther_in_rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_138976 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAdditiveExpression_in_rule__XOtherOperatorExpression__RightOperandAssignment_1_139011 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpAdd_in_rule__XAdditiveExpression__FeatureAssignment_1_0_0_139046 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXMultiplicativeExpression_in_rule__XAdditiveExpression__RightOperandAssignment_1_139081 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpMulti_in_rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_139116 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXUnaryOperation_in_rule__XMultiplicativeExpression__RightOperandAssignment_1_139151 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpUnary_in_rule__XUnaryOperation__FeatureAssignment_0_139186 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXUnaryOperation_in_rule__XUnaryOperation__OperandAssignment_0_239221 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__XCastedExpression__TypeAssignment_1_139252 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpPostfix_in_rule__XPostfixOperation__FeatureAssignment_1_0_139287 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_89_in_rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_139327 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFeatureCallID_in_rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_239370 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAssignment_in_rule__XMemberFeatureCall__ValueAssignment_1_0_139405 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_90_in_rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_139441 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_89_in_rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_239485 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_139524 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_139555 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdOrSuper_in_rule__XMemberFeatureCall__FeatureAssignment_1_1_239590 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_62_in_rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_039630 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXShortClosure_in_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_039669 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_039700 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_139731 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXClosure_in_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_439762 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XSetLiteral__ElementsAssignment_3_039793 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XSetLiteral__ElementsAssignment_3_1_139824 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XListLiteral__ElementsAssignment_3_039855 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XListLiteral__ElementsAssignment_3_1_139886 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_039917 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_139948 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_91_in_rule__XClosure__ExplicitSyntaxAssignment_1_0_139984 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpressionInClosure_in_rule__XClosure__ExpressionAssignment_240023 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_rule__XExpressionInClosure__ExpressionsAssignment_1_040054 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_040085 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_140116 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_91_in_rule__XShortClosure__ExplicitSyntaxAssignment_0_0_240152 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XShortClosure__ExpressionAssignment_140191 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XIfExpression__IfAssignment_340222 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XIfExpression__ThenAssignment_540253 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XIfExpression__ElseAssignment_6_140284 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_140315 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XSwitchExpression__SwitchAssignment_2_0_140346 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_040377 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XSwitchExpression__SwitchAssignment_2_1_140408 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCasePart_in_rule__XSwitchExpression__CasesAssignment_440439 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XSwitchExpression__DefaultAssignment_5_240470 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__XCasePart__TypeGuardAssignment_140501 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XCasePart__CaseAssignment_2_140532 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XCasePart__ThenAssignment_3_0_140563 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_64_in_rule__XCasePart__FallThroughAssignment_3_140599 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_rule__XForLoopExpression__DeclaredParamAssignment_0_0_340638 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XForLoopExpression__ForExpressionAssignment_140669 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XForLoopExpression__EachExpressionAssignment_340700 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_rule__XBasicForLoopExpression__InitExpressionsAssignment_3_040731 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_140762 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XBasicForLoopExpression__ExpressionAssignment_540793 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_040824 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_140855 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XBasicForLoopExpression__EachExpressionAssignment_940886 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XWhileExpression__PredicateAssignment_340917 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XWhileExpression__BodyAssignment_540948 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XDoWhileExpression__BodyAssignment_240979 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XDoWhileExpression__PredicateAssignment_541010 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_rule__XBlockExpression__ExpressionsAssignment_2_041041 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_92_in_rule__XVariableDeclaration__WriteableAssignment_1_041077 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__XVariableDeclaration__TypeAssignment_2_0_0_041116 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__XVariableDeclaration__NameAssignment_2_0_0_141147 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__XVariableDeclaration__NameAssignment_2_141178 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XVariableDeclaration__RightAssignment_3_141209 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__JvmFormalParameter__ParameterTypeAssignment_041240 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__JvmFormalParameter__NameAssignment_141271 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__FullJvmFormalParameter__ParameterTypeAssignment_041302 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__FullJvmFormalParameter__NameAssignment_141333 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__XFeatureCall__TypeArgumentsAssignment_1_141364 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__XFeatureCall__TypeArgumentsAssignment_1_2_141395 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdOrSuper_in_rule__XFeatureCall__FeatureAssignment_241430 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_62_in_rule__XFeatureCall__ExplicitOperationCallAssignment_3_041470 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXShortClosure_in_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_041509 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_041540 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_141571 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXClosure_in_rule__XFeatureCall__FeatureCallArgumentsAssignment_441602 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__XConstructorCall__ConstructorAssignment_241637 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__XConstructorCall__TypeArgumentsAssignment_3_141672 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__XConstructorCall__TypeArgumentsAssignment_3_2_141703 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_62_in_rule__XConstructorCall__ExplicitConstructorCallAssignment_4_041739 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXShortClosure_in_rule__XConstructorCall__ArgumentsAssignment_4_1_041778 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XConstructorCall__ArgumentsAssignment_4_1_1_041809 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_141840 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXClosure_in_rule__XConstructorCall__ArgumentsAssignment_541871 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_93_in_rule__XBooleanLiteral__IsTrueAssignment_1_141907 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNumber_in_rule__XNumberLiteral__ValueAssignment_141946 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__XStringLiteral__ValueAssignment_141977 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__XTypeLiteral__TypeAssignment_342012 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleArrayBrackets_in_rule__XTypeLiteral__ArrayDimensionsAssignment_442047 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XThrowExpression__ExpressionAssignment_242078 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XReturnExpression__ExpressionAssignment_242109 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XTryCatchFinallyExpression__ExpressionAssignment_242140 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCatchClause_in_rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_042171 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_142202 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_142233 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XSynchronizedExpression__ParamAssignment_142264 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XSynchronizedExpression__ExpressionAssignment_342295 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFullJvmFormalParameter_in_rule__XCatchClause__DeclaredParamAssignment_242326 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XCatchClause__ExpressionAssignment_442357 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__XFunctionTypeRef__ParamTypesAssignment_0_1_042388 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_142419 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__XFunctionTypeRef__ReturnTypeAssignment_242450 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__JvmParameterizedTypeReference__TypeAssignment_042485 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_142520 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_142551 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__JvmParameterizedTypeReference__TypeAssignment_1_4_142586 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_142621 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_142652 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmUpperBound_in_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_042683 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmUpperBoundAnded_in_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_142714 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmLowerBound_in_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_042745 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmLowerBoundAnded_in_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_142776 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__JvmUpperBound__TypeReferenceAssignment_142807 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__JvmUpperBoundAnded__TypeReferenceAssignment_142838 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__JvmLowerBound__TypeReferenceAssignment_142869 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__JvmLowerBoundAnded__TypeReferenceAssignment_142900 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rule__XImportDeclaration__StaticAssignment_1_0_042940 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_rule__XImportDeclaration__ExtensionAssignment_1_0_142984 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedNameInStaticImport_in_rule__XImportDeclaration__ImportedTypeAssignment_1_0_243027 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_rule__XImportDeclaration__WildcardAssignment_1_0_3_043067 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__XImportDeclaration__MemberNameAssignment_1_0_3_143106 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__XImportDeclaration__ImportedTypeAssignment_1_143141 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedNameWithWildcard_in_rule__XImportDeclaration__ImportedNamespaceAssignment_1_243176 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_6_1_0__0_in_synpred29_InternalCheckCfg6036 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_synpred30_InternalCheckCfg6055 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0_in_synpred43_InternalCheckCfg6614 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXForLoopExpression_in_synpred51_InternalCheckCfg6787 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBasicForLoopExpression_in_synpred52_InternalCheckCfg6805 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0__0_in_synpred65_InternalCheckCfg7124 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_2_0__0_in_synpred69_InternalCheckCfg7328 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0_in_synpred70_InternalCheckCfg7379 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__ArgumentsAssignment_4_1_0_in_synpred76_InternalCheckCfg7594 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1__0_in_synpred104_InternalCheckCfg11609 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1__0_in_synpred106_InternalCheckCfg12413 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1__0_in_synpred107_InternalCheckCfg12836 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1__0_in_synpred108_InternalCheckCfg13259 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Alternatives_1_in_synpred109_InternalCheckCfg13682 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1__0_in_synpred110_InternalCheckCfg14534 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1__0_in_synpred111_InternalCheckCfg15696 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1__0_in_synpred112_InternalCheckCfg16119 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1__0_in_synpred113_InternalCheckCfg16726 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group_1__0_in_synpred114_InternalCheckCfg17151 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Alternatives_1_in_synpred115_InternalCheckCfg17453 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__0_in_synpred117_InternalCheckCfg18124 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4_in_synpred118_InternalCheckCfg18182 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1__0_in_synpred126_InternalCheckCfg20418 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group_6__0_in_synpred133_InternalCheckCfg22624 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1_0__0_in_synpred136_InternalCheckCfg23695 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3__0_in_synpred149_InternalCheckCfg28589 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_4_in_synpred150_InternalCheckCfg28647 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__0_in_synpred154_InternalCheckCfg29705 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4__0_in_synpred155_InternalCheckCfg29766 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__ArgumentsAssignment_5_in_synpred156_InternalCheckCfg29824 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XReturnExpression__ExpressionAssignment_2_in_synpred161_InternalCheckCfg31876 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0_in_synpred162_InternalCheckCfg32205 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__0_in_synpred163_InternalCheckCfg32265 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group_1__0_in_synpred164_InternalCheckCfg33443 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0_1__0_in_synpred166_InternalCheckCfg33934 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__0_in_synpred170_InternalCheckCfg34980 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__0_in_synpred172_InternalCheckCfg35289 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__0_in_synpred173_InternalCheckCfg35600 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_1 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_2 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x0000000000000012L});
+    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0200000000000000L});
+    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x1400000000000010L});
+    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x1000000000000002L});
+    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x2800000000000000L});
+    public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x2000000000000002L});
+    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0400000000000000L});
+    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x2800000000000010L});
+    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x2000000000000000L});
+    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x08F8000000000010L});
+    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x00F8000000000002L});
+    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x00F8000000000000L});
+    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x4000000000000000L});
+    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x8000000000000000L,0x0000000000000001L});
+    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000001L});
+    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000000002000L});
+    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0004010C000001E0L,0x0000000020000002L});
+    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000010C00000000L});
+    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0004010C000001E0L,0x0000000020000000L});
+    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000004L});
+    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0004010C000001E0L,0x0000000020000008L});
+    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000001L});
+    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0001E00000000010L});
+    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x5407E10C080001F0L,0x00000000202FF286L});
+    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x000000000C1F0000L});
+    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000000008000000L});
+    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000000006000000L});
+    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000000000004000L});
+    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0000000000004002L});
+    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0000000000008000L});
+    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0000000000008002L});
+    public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x0000000001E00000L});
+    public static final BitSet FOLLOW_36 = new BitSet(new long[]{0x0000000001E00002L});
+    public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x000000000E000000L,0x0000000000000010L});
+    public static final BitSet FOLLOW_38 = new BitSet(new long[]{0x000000000E000002L,0x0000000000000010L});
+    public static final BitSet FOLLOW_39 = new BitSet(new long[]{0x4000000080000010L});
+    public static final BitSet FOLLOW_40 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
+    public static final BitSet FOLLOW_41 = new BitSet(new long[]{0x00000003FC000000L});
+    public static final BitSet FOLLOW_42 = new BitSet(new long[]{0x00000003FC000002L});
+    public static final BitSet FOLLOW_43 = new BitSet(new long[]{0x0000000040000000L});
+    public static final BitSet FOLLOW_44 = new BitSet(new long[]{0x0000000004000000L});
+    public static final BitSet FOLLOW_45 = new BitSet(new long[]{0x0000000088000000L});
+    public static final BitSet FOLLOW_46 = new BitSet(new long[]{0x0000000C00000000L});
+    public static final BitSet FOLLOW_47 = new BitSet(new long[]{0x0000000C00000002L});
+    public static final BitSet FOLLOW_48 = new BitSet(new long[]{0x000000F000000000L});
+    public static final BitSet FOLLOW_49 = new BitSet(new long[]{0x000000F000000002L});
+    public static final BitSet FOLLOW_50 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000020L});
+    public static final BitSet FOLLOW_51 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L});
+    public static final BitSet FOLLOW_52 = new BitSet(new long[]{0x0000060000000000L});
+    public static final BitSet FOLLOW_53 = new BitSet(new long[]{0x0000080000000000L,0x0000000006000000L});
+    public static final BitSet FOLLOW_54 = new BitSet(new long[]{0x0000080000000002L,0x0000000006000000L});
+    public static final BitSet FOLLOW_55 = new BitSet(new long[]{0x0000080000000000L,0x0000000002000000L});
+    public static final BitSet FOLLOW_56 = new BitSet(new long[]{0x0003E00008000010L});
+    public static final BitSet FOLLOW_57 = new BitSet(new long[]{0x4000000000000000L,0x0000000000000004L});
+    public static final BitSet FOLLOW_58 = new BitSet(new long[]{0x4000000080000010L,0x0000000000800000L});
+    public static final BitSet FOLLOW_59 = new BitSet(new long[]{0x0000000004000000L,0x0000000000000001L});
+    public static final BitSet FOLLOW_60 = new BitSet(new long[]{0xD407E10C880001F0L,0x00000000282FF286L});
+    public static final BitSet FOLLOW_61 = new BitSet(new long[]{0x5407E10C880001F0L,0x00000000282FF286L});
+    public static final BitSet FOLLOW_62 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000002L});
+    public static final BitSet FOLLOW_63 = new BitSet(new long[]{0x5C07E10C880001F0L,0x00000000282FF286L});
+    public static final BitSet FOLLOW_64 = new BitSet(new long[]{0x5407E10C880001F0L,0x00000000282FF28EL});
+    public static final BitSet FOLLOW_65 = new BitSet(new long[]{0x5407F10C880001F0L,0x00000000382FF286L});
+    public static final BitSet FOLLOW_66 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000008L});
+    public static final BitSet FOLLOW_67 = new BitSet(new long[]{0x4000000080000010L,0x0000000008000000L});
+    public static final BitSet FOLLOW_68 = new BitSet(new long[]{0x5407F10C880001F2L,0x00000000382FF286L});
+    public static final BitSet FOLLOW_69 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000040L});
+    public static final BitSet FOLLOW_70 = new BitSet(new long[]{0x8000000000000000L});
+    public static final BitSet FOLLOW_71 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
+    public static final BitSet FOLLOW_72 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
+    public static final BitSet FOLLOW_73 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000200L});
+    public static final BitSet FOLLOW_74 = new BitSet(new long[]{0x4808000080000010L,0x0000000000000C01L});
+    public static final BitSet FOLLOW_75 = new BitSet(new long[]{0x4000000080000012L,0x0000000000000C01L});
+    public static final BitSet FOLLOW_76 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
+    public static final BitSet FOLLOW_77 = new BitSet(new long[]{0x4000000080000010L,0x0000000000000C01L});
+    public static final BitSet FOLLOW_78 = new BitSet(new long[]{0x1000000000000000L});
+    public static final BitSet FOLLOW_79 = new BitSet(new long[]{0x5407F10C880001F0L,0x00000000382FF2C6L});
+    public static final BitSet FOLLOW_80 = new BitSet(new long[]{0x5407E10C880001F0L,0x00000000282FF2C6L});
+    public static final BitSet FOLLOW_81 = new BitSet(new long[]{0x0000000000000000L,0x0000000000001000L});
+    public static final BitSet FOLLOW_82 = new BitSet(new long[]{0x0000000000000000L,0x0000000000002000L});
+    public static final BitSet FOLLOW_83 = new BitSet(new long[]{0x5C07F10C880001F0L,0x00000000382FF286L});
+    public static final BitSet FOLLOW_84 = new BitSet(new long[]{0x0000100000000000L,0x0000000010000000L});
+    public static final BitSet FOLLOW_85 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L});
+    public static final BitSet FOLLOW_86 = new BitSet(new long[]{0x4000000008000000L,0x0000000000000004L});
+    public static final BitSet FOLLOW_87 = new BitSet(new long[]{0x0004000000000000L,0x0000000020000000L});
+    public static final BitSet FOLLOW_88 = new BitSet(new long[]{0x0000000000000000L,0x0000000000008000L});
+    public static final BitSet FOLLOW_89 = new BitSet(new long[]{0x00000000000000E0L});
+    public static final BitSet FOLLOW_90 = new BitSet(new long[]{0x0004010C000001E0L,0x0000000020018006L});
+    public static final BitSet FOLLOW_91 = new BitSet(new long[]{0x8000000000000000L,0x0000000000000004L});
+    public static final BitSet FOLLOW_92 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000004L});
+    public static final BitSet FOLLOW_93 = new BitSet(new long[]{0x0000000000000000L,0x0000000000020000L});
+    public static final BitSet FOLLOW_94 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_95 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_96 = new BitSet(new long[]{0x0000000000000000L,0x0000000000500000L});
+    public static final BitSet FOLLOW_97 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_98 = new BitSet(new long[]{0x0000000000000002L,0x0000000000400000L});
+    public static final BitSet FOLLOW_99 = new BitSet(new long[]{0x0000000000000000L,0x0000000000200000L});
+    public static final BitSet FOLLOW_100 = new BitSet(new long[]{0x0000080000000000L});
+    public static final BitSet FOLLOW_101 = new BitSet(new long[]{0x0000080000000002L});
+    public static final BitSet FOLLOW_102 = new BitSet(new long[]{0x00000000000000C0L});
+    public static final BitSet FOLLOW_103 = new BitSet(new long[]{0xC000000080000010L});
+    public static final BitSet FOLLOW_104 = new BitSet(new long[]{0x0002200000000000L});
+    public static final BitSet FOLLOW_105 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
+    public static final BitSet FOLLOW_106 = new BitSet(new long[]{0x0000000000000002L,0x0000000001000000L});
+    public static final BitSet FOLLOW_107 = new BitSet(new long[]{0x0000001000000000L});
+    public static final BitSet FOLLOW_108 = new BitSet(new long[]{0x0000400000000010L});
+    public static final BitSet FOLLOW_109 = new BitSet(new long[]{0x0001000000000010L});
+    public static final BitSet FOLLOW_110 = new BitSet(new long[]{0x0000001000000010L});
 
 }
\ No newline at end of file
diff --git a/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/builtintypemodel/BuiltInTypeModel.java b/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/builtintypemodel/BuiltInTypeModel.java
index d78335bb6..63662cc09 100644
--- a/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/builtintypemodel/BuiltInTypeModel.java
+++ b/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/builtintypemodel/BuiltInTypeModel.java
@@ -13,10 +13,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.typesystem.builtintypemodel.BuiltInTypeModel#getInternalTypes <em>Internal Types</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.typesystem.builtintypemodel.BuiltInTypeModelPackage#getBuiltInTypeModel()
  * @model
diff --git a/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/builtintypemodel/InternalType.java b/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/builtintypemodel/InternalType.java
index 39f43c09b..4a102fb60 100644
--- a/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/builtintypemodel/InternalType.java
+++ b/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/builtintypemodel/InternalType.java
@@ -18,10 +18,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.typesystem.builtintypemodel.InternalType#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.typesystem.builtintypemodel.BuiltInTypeModelPackage#getInternalType()
  * @model
diff --git a/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/builtintypemodel/impl/BuiltInTypeModelImpl.java b/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/builtintypemodel/impl/BuiltInTypeModelImpl.java
index 701acc5b3..7fb26224f 100644
--- a/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/builtintypemodel/impl/BuiltInTypeModelImpl.java
+++ b/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/builtintypemodel/impl/BuiltInTypeModelImpl.java
@@ -26,10 +26,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.typesystem.builtintypemodel.impl.BuiltInTypeModelImpl#getInternalTypes <em>Internal Types</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/builtintypemodel/impl/InternalTypeImpl.java b/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/builtintypemodel/impl/InternalTypeImpl.java
index b9ed5b431..b9a8551ff 100644
--- a/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/builtintypemodel/impl/InternalTypeImpl.java
+++ b/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/builtintypemodel/impl/InternalTypeImpl.java
@@ -18,10 +18,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.typesystem.builtintypemodel.impl.InternalTypeImpl#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/builtintypemodel/util/BuiltInTypeModelSwitch.java b/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/builtintypemodel/util/BuiltInTypeModelSwitch.java
index 7f8337789..5df19c832 100644
--- a/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/builtintypemodel/util/BuiltInTypeModelSwitch.java
+++ b/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/builtintypemodel/util/BuiltInTypeModelSwitch.java
@@ -54,7 +54,7 @@ public BuiltInTypeModelSwitch()
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
+	 * @param ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
diff --git a/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/typemodel/impl/CallableImpl.java b/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/typemodel/impl/CallableImpl.java
index 4913d4cbd..1e89d6c88 100644
--- a/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/typemodel/impl/CallableImpl.java
+++ b/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/typemodel/impl/CallableImpl.java
@@ -11,8 +11,6 @@
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Callable</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/typemodel/impl/NamedElementImpl.java b/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/typemodel/impl/NamedElementImpl.java
index 7434dda49..faf7f9c26 100644
--- a/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/typemodel/impl/NamedElementImpl.java
+++ b/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/typemodel/impl/NamedElementImpl.java
@@ -13,8 +13,6 @@
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Named Element</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/typemodel/impl/NamedFormalParameterImpl.java b/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/typemodel/impl/NamedFormalParameterImpl.java
index 806eb6c0b..788d6a36f 100644
--- a/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/typemodel/impl/NamedFormalParameterImpl.java
+++ b/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/typemodel/impl/NamedFormalParameterImpl.java
@@ -12,8 +12,6 @@
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Named Formal Parameter</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/typemodel/impl/NamedTypeImpl.java b/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/typemodel/impl/NamedTypeImpl.java
index bceba8dc8..7d1167bee 100644
--- a/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/typemodel/impl/NamedTypeImpl.java
+++ b/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/typemodel/impl/NamedTypeImpl.java
@@ -11,8 +11,6 @@
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Named Type</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/typemodel/impl/OverrideDeclarationImpl.java b/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/typemodel/impl/OverrideDeclarationImpl.java
index f8ab7ff4e..5e211ebe5 100644
--- a/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/typemodel/impl/OverrideDeclarationImpl.java
+++ b/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/typemodel/impl/OverrideDeclarationImpl.java
@@ -14,8 +14,6 @@
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Override Declaration</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/typemodel/util/TypeModelSwitch.java b/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/typemodel/util/TypeModelSwitch.java
index 8fe7f0553..818a09ff1 100644
--- a/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/typemodel/util/TypeModelSwitch.java
+++ b/com.avaloq.tools.ddk.typesystem/src-gen/com/avaloq/tools/ddk/typesystem/typemodel/util/TypeModelSwitch.java
@@ -50,7 +50,7 @@ public TypeModelSwitch()
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
+	 * @param ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
diff --git a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/CommonXbase.mwe2 b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/CommonXbase.mwe2
index 2df907f2e..a51e735bf 100644
--- a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/CommonXbase.mwe2
+++ b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/CommonXbase.mwe2
@@ -123,7 +123,7 @@ Workflow {
       }
 
       // the serialization component
-      fragment = com.avaloq.tools.ddk.xtext.generator.serializer.SerializerFragment {}
+      fragment = serializer.SerializerFragment {}
 
       // the following fragment generates an Antlr parser
       fragment = org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment {}
diff --git a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateExport.mwe2 b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateExport.mwe2
index d7fe6cbef..3ca73b6fe 100644
--- a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateExport.mwe2
+++ b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateExport.mwe2
@@ -56,7 +56,7 @@ Workflow {
             fragment = ecore.CustomClassEcoreGeneratorFragment auto-inject {}
 
             // the serialization component
-            fragment = com.avaloq.tools.ddk.xtext.generator.serializer.SerializerFragment  {}
+            fragment = serializer.SerializerFragment {}
 
             // a custom ResourceFactory for use with EMF
             fragment = resourceFactory.ResourceFactoryFragment {
diff --git a/com.avaloq.tools.ddk.xtext.export.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.export.ui/META-INF/MANIFEST.MF
index 2d261e1f0..d12d0c285 100644
--- a/com.avaloq.tools.ddk.xtext.export.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.export.ui/META-INF/MANIFEST.MF
@@ -23,4 +23,5 @@ Require-Bundle: org.eclipse.xtext.ui,
 Import-Package: org.apache.log4j
 Export-Package: com.avaloq.tools.ddk.xtext.export.ui.contentassist.antlr,
  com.avaloq.tools.ddk.xtext.export.ui.contentassist,
- com.avaloq.tools.ddk.xtext.export.ui.quickfix
+ com.avaloq.tools.ddk.xtext.export.ui.quickfix,
+ com.avaloq.tools.ddk.xtext.export.ui.contentassist.antlr.internal
diff --git a/com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/AbstractExportUiModule.java b/com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/AbstractExportUiModule.java
index 24f9dd0ec..c23e012c2 100644
--- a/com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/AbstractExportUiModule.java
+++ b/com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/AbstractExportUiModule.java
@@ -137,5 +137,10 @@ public Class<? extends org.eclipse.compare.IViewerCreator> bindIViewerCreator()
 		return org.eclipse.xtext.ui.compare.DefaultViewerCreator.class;
 	}
 
+	// contributed by org.eclipse.xtext.ui.generator.compare.CompareFragment
+	public void configureCompareViewerTitle(com.google.inject.Binder binder) {
+		binder.bind(String.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.UIBindings.COMPARE_VIEWER_TITLE)).toInstance("Export Compare");
+	}
+
 
 }
diff --git a/com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExportLexer.java b/com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExportLexer.java
index 325fbaca5..1e900e87f 100644
--- a/com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExportLexer.java
+++ b/com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExportLexer.java
@@ -103,15 +103,15 @@ public InternalExportLexer(CharStream input, RecognizerSharedState state) {
         super(input,state);
 
     }
-    public String getGrammarFileName() { return "../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g"; }
+    public String getGrammarFileName() { return "InternalExport.g"; }
 
     // $ANTLR start "T__12"
     public final void mT__12() throws RecognitionException {
         try {
             int _type = T__12;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11:7: ( '==' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11:9: '=='
+            // InternalExport.g:11:7: ( '==' )
+            // InternalExport.g:11:9: '=='
             {
             match("=="); 
 
@@ -131,8 +131,8 @@ public final void mT__13() throws RecognitionException {
         try {
             int _type = T__13;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:12:7: ( '!=' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:12:9: '!='
+            // InternalExport.g:12:7: ( '!=' )
+            // InternalExport.g:12:9: '!='
             {
             match("!="); 
 
@@ -152,8 +152,8 @@ public final void mT__14() throws RecognitionException {
         try {
             int _type = T__14;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:13:7: ( '>=' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:13:9: '>='
+            // InternalExport.g:13:7: ( '>=' )
+            // InternalExport.g:13:9: '>='
             {
             match(">="); 
 
@@ -173,8 +173,8 @@ public final void mT__15() throws RecognitionException {
         try {
             int _type = T__15;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:14:7: ( '<=' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:14:9: '<='
+            // InternalExport.g:14:7: ( '<=' )
+            // InternalExport.g:14:9: '<='
             {
             match("<="); 
 
@@ -194,8 +194,8 @@ public final void mT__16() throws RecognitionException {
         try {
             int _type = T__16;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:15:7: ( '>' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:15:9: '>'
+            // InternalExport.g:15:7: ( '>' )
+            // InternalExport.g:15:9: '>'
             {
             match('>'); 
 
@@ -214,8 +214,8 @@ public final void mT__17() throws RecognitionException {
         try {
             int _type = T__17;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:16:7: ( '<' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:16:9: '<'
+            // InternalExport.g:16:7: ( '<' )
+            // InternalExport.g:16:9: '<'
             {
             match('<'); 
 
@@ -234,8 +234,8 @@ public final void mT__18() throws RecognitionException {
         try {
             int _type = T__18;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:17:7: ( '+' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:17:9: '+'
+            // InternalExport.g:17:7: ( '+' )
+            // InternalExport.g:17:9: '+'
             {
             match('+'); 
 
@@ -254,8 +254,8 @@ public final void mT__19() throws RecognitionException {
         try {
             int _type = T__19;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:18:7: ( '-' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:18:9: '-'
+            // InternalExport.g:18:7: ( '-' )
+            // InternalExport.g:18:9: '-'
             {
             match('-'); 
 
@@ -274,8 +274,8 @@ public final void mT__20() throws RecognitionException {
         try {
             int _type = T__20;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:19:7: ( '*' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:19:9: '*'
+            // InternalExport.g:19:7: ( '*' )
+            // InternalExport.g:19:9: '*'
             {
             match('*'); 
 
@@ -294,8 +294,8 @@ public final void mT__21() throws RecognitionException {
         try {
             int _type = T__21;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:20:7: ( '/' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:20:9: '/'
+            // InternalExport.g:20:7: ( '/' )
+            // InternalExport.g:20:9: '/'
             {
             match('/'); 
 
@@ -314,8 +314,8 @@ public final void mT__22() throws RecognitionException {
         try {
             int _type = T__22;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:21:7: ( '!' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:21:9: '!'
+            // InternalExport.g:21:7: ( '!' )
+            // InternalExport.g:21:9: '!'
             {
             match('!'); 
 
@@ -334,8 +334,8 @@ public final void mT__23() throws RecognitionException {
         try {
             int _type = T__23;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:22:7: ( 'collect' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:22:9: 'collect'
+            // InternalExport.g:22:7: ( 'collect' )
+            // InternalExport.g:22:9: 'collect'
             {
             match("collect"); 
 
@@ -355,8 +355,8 @@ public final void mT__24() throws RecognitionException {
         try {
             int _type = T__24;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:23:7: ( 'select' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:23:9: 'select'
+            // InternalExport.g:23:7: ( 'select' )
+            // InternalExport.g:23:9: 'select'
             {
             match("select"); 
 
@@ -376,8 +376,8 @@ public final void mT__25() throws RecognitionException {
         try {
             int _type = T__25;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:24:7: ( 'selectFirst' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:24:9: 'selectFirst'
+            // InternalExport.g:24:7: ( 'selectFirst' )
+            // InternalExport.g:24:9: 'selectFirst'
             {
             match("selectFirst"); 
 
@@ -397,8 +397,8 @@ public final void mT__26() throws RecognitionException {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:25:7: ( 'reject' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:25:9: 'reject'
+            // InternalExport.g:25:7: ( 'reject' )
+            // InternalExport.g:25:9: 'reject'
             {
             match("reject"); 
 
@@ -418,8 +418,8 @@ public final void mT__27() throws RecognitionException {
         try {
             int _type = T__27;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:26:7: ( 'exists' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:26:9: 'exists'
+            // InternalExport.g:26:7: ( 'exists' )
+            // InternalExport.g:26:9: 'exists'
             {
             match("exists"); 
 
@@ -439,8 +439,8 @@ public final void mT__28() throws RecognitionException {
         try {
             int _type = T__28;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:27:7: ( 'notExists' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:27:9: 'notExists'
+            // InternalExport.g:27:7: ( 'notExists' )
+            // InternalExport.g:27:9: 'notExists'
             {
             match("notExists"); 
 
@@ -460,8 +460,8 @@ public final void mT__29() throws RecognitionException {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:28:7: ( 'sortBy' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:28:9: 'sortBy'
+            // InternalExport.g:28:7: ( 'sortBy' )
+            // InternalExport.g:28:9: 'sortBy'
             {
             match("sortBy"); 
 
@@ -481,8 +481,8 @@ public final void mT__30() throws RecognitionException {
         try {
             int _type = T__30;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:29:7: ( 'forAll' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:29:9: 'forAll'
+            // InternalExport.g:29:7: ( 'forAll' )
+            // InternalExport.g:29:9: 'forAll'
             {
             match("forAll"); 
 
@@ -502,8 +502,8 @@ public final void mT__31() throws RecognitionException {
         try {
             int _type = T__31;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:30:7: ( 'true' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:30:9: 'true'
+            // InternalExport.g:30:7: ( 'true' )
+            // InternalExport.g:30:9: 'true'
             {
             match("true"); 
 
@@ -523,8 +523,8 @@ public final void mT__32() throws RecognitionException {
         try {
             int _type = T__32;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:31:7: ( 'false' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:31:9: 'false'
+            // InternalExport.g:31:7: ( 'false' )
+            // InternalExport.g:31:9: 'false'
             {
             match("false"); 
 
@@ -544,8 +544,8 @@ public final void mT__33() throws RecognitionException {
         try {
             int _type = T__33;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:32:7: ( 'Collection' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:32:9: 'Collection'
+            // InternalExport.g:32:7: ( 'Collection' )
+            // InternalExport.g:32:9: 'Collection'
             {
             match("Collection"); 
 
@@ -565,8 +565,8 @@ public final void mT__34() throws RecognitionException {
         try {
             int _type = T__34;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:33:7: ( 'List' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:33:9: 'List'
+            // InternalExport.g:33:7: ( 'List' )
+            // InternalExport.g:33:9: 'List'
             {
             match("List"); 
 
@@ -586,8 +586,8 @@ public final void mT__35() throws RecognitionException {
         try {
             int _type = T__35;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:34:7: ( 'Set' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:34:9: 'Set'
+            // InternalExport.g:34:7: ( 'Set' )
+            // InternalExport.g:34:9: 'Set'
             {
             match("Set"); 
 
@@ -607,8 +607,8 @@ public final void mT__36() throws RecognitionException {
         try {
             int _type = T__36;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:35:7: ( 'export' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:35:9: 'export'
+            // InternalExport.g:35:7: ( 'export' )
+            // InternalExport.g:35:9: 'export'
             {
             match("export"); 
 
@@ -628,8 +628,8 @@ public final void mT__37() throws RecognitionException {
         try {
             int _type = T__37;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:36:7: ( 'for' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:36:9: 'for'
+            // InternalExport.g:36:7: ( 'for' )
+            // InternalExport.g:36:9: 'for'
             {
             match("for"); 
 
@@ -649,8 +649,8 @@ public final void mT__38() throws RecognitionException {
         try {
             int _type = T__38;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:37:7: ( 'interface' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:37:9: 'interface'
+            // InternalExport.g:37:7: ( 'interface' )
+            // InternalExport.g:37:9: 'interface'
             {
             match("interface"); 
 
@@ -670,8 +670,8 @@ public final void mT__39() throws RecognitionException {
         try {
             int _type = T__39;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:38:7: ( '{' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:38:9: '{'
+            // InternalExport.g:38:7: ( '{' )
+            // InternalExport.g:38:9: '{'
             {
             match('{'); 
 
@@ -690,8 +690,8 @@ public final void mT__40() throws RecognitionException {
         try {
             int _type = T__40;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:39:7: ( '}' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:39:9: '}'
+            // InternalExport.g:39:7: ( '}' )
+            // InternalExport.g:39:9: '}'
             {
             match('}'); 
 
@@ -710,8 +710,8 @@ public final void mT__41() throws RecognitionException {
         try {
             int _type = T__41;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:40:7: ( 'import' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:40:9: 'import'
+            // InternalExport.g:40:7: ( 'import' )
+            // InternalExport.g:40:9: 'import'
             {
             match("import"); 
 
@@ -731,8 +731,8 @@ public final void mT__42() throws RecognitionException {
         try {
             int _type = T__42;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:41:7: ( 'as' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:41:9: 'as'
+            // InternalExport.g:41:7: ( 'as' )
+            // InternalExport.g:41:9: 'as'
             {
             match("as"); 
 
@@ -752,8 +752,8 @@ public final void mT__43() throws RecognitionException {
         try {
             int _type = T__43;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:42:7: ( 'extension' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:42:9: 'extension'
+            // InternalExport.g:42:7: ( 'extension' )
+            // InternalExport.g:42:9: 'extension'
             {
             match("extension"); 
 
@@ -773,8 +773,8 @@ public final void mT__44() throws RecognitionException {
         try {
             int _type = T__44;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:43:7: ( ';' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:43:9: ';'
+            // InternalExport.g:43:7: ( ';' )
+            // InternalExport.g:43:9: ';'
             {
             match(';'); 
 
@@ -793,8 +793,8 @@ public final void mT__45() throws RecognitionException {
         try {
             int _type = T__45;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:44:7: ( '[' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:44:9: '['
+            // InternalExport.g:44:7: ( '[' )
+            // InternalExport.g:44:9: '['
             {
             match('['); 
 
@@ -813,8 +813,8 @@ public final void mT__46() throws RecognitionException {
         try {
             int _type = T__46;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:45:7: ( ']' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:45:9: ']'
+            // InternalExport.g:45:7: ( ']' )
+            // InternalExport.g:45:9: ']'
             {
             match(']'); 
 
@@ -833,8 +833,8 @@ public final void mT__47() throws RecognitionException {
         try {
             int _type = T__47;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:46:7: ( '=' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:46:9: '='
+            // InternalExport.g:46:7: ( '=' )
+            // InternalExport.g:46:9: '='
             {
             match('='); 
 
@@ -853,8 +853,8 @@ public final void mT__48() throws RecognitionException {
         try {
             int _type = T__48;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:47:7: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:47:9: ','
+            // InternalExport.g:47:7: ( ',' )
+            // InternalExport.g:47:9: ','
             {
             match(','); 
 
@@ -873,8 +873,8 @@ public final void mT__49() throws RecognitionException {
         try {
             int _type = T__49;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:48:7: ( '@' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:48:9: '@'
+            // InternalExport.g:48:7: ( '@' )
+            // InternalExport.g:48:9: '@'
             {
             match('@'); 
 
@@ -893,8 +893,8 @@ public final void mT__50() throws RecognitionException {
         try {
             int _type = T__50;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:49:7: ( 'eval' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:49:9: 'eval'
+            // InternalExport.g:49:7: ( 'eval' )
+            // InternalExport.g:49:9: 'eval'
             {
             match("eval"); 
 
@@ -914,8 +914,8 @@ public final void mT__51() throws RecognitionException {
         try {
             int _type = T__51;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:50:7: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:50:9: '('
+            // InternalExport.g:50:7: ( '(' )
+            // InternalExport.g:50:9: '('
             {
             match('('); 
 
@@ -934,8 +934,8 @@ public final void mT__52() throws RecognitionException {
         try {
             int _type = T__52;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:51:7: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:51:9: ')'
+            // InternalExport.g:51:7: ( ')' )
+            // InternalExport.g:51:9: ')'
             {
             match(')'); 
 
@@ -954,8 +954,8 @@ public final void mT__53() throws RecognitionException {
         try {
             int _type = T__53;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:52:7: ( 'uri-fragment' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:52:9: 'uri-fragment'
+            // InternalExport.g:52:7: ( 'uri-fragment' )
+            // InternalExport.g:52:9: 'uri-fragment'
             {
             match("uri-fragment"); 
 
@@ -975,8 +975,8 @@ public final void mT__54() throws RecognitionException {
         try {
             int _type = T__54;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:53:7: ( 'attribute' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:53:9: 'attribute'
+            // InternalExport.g:53:7: ( 'attribute' )
+            // InternalExport.g:53:9: 'attribute'
             {
             match("attribute"); 
 
@@ -996,8 +996,8 @@ public final void mT__55() throws RecognitionException {
         try {
             int _type = T__55;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:54:7: ( 'field' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:54:9: 'field'
+            // InternalExport.g:54:7: ( 'field' )
+            // InternalExport.g:54:9: 'field'
             {
             match("field"); 
 
@@ -1017,8 +1017,8 @@ public final void mT__56() throws RecognitionException {
         try {
             int _type = T__56;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:55:7: ( 'data' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:55:9: 'data'
+            // InternalExport.g:55:7: ( 'data' )
+            // InternalExport.g:55:9: 'data'
             {
             match("data"); 
 
@@ -1038,8 +1038,8 @@ public final void mT__57() throws RecognitionException {
         try {
             int _type = T__57;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:56:7: ( '::' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:56:9: '::'
+            // InternalExport.g:56:7: ( '::' )
+            // InternalExport.g:56:9: '::'
             {
             match("::"); 
 
@@ -1059,8 +1059,8 @@ public final void mT__58() throws RecognitionException {
         try {
             int _type = T__58;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:57:7: ( 'let' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:57:9: 'let'
+            // InternalExport.g:57:7: ( 'let' )
+            // InternalExport.g:57:9: 'let'
             {
             match("let"); 
 
@@ -1080,8 +1080,8 @@ public final void mT__59() throws RecognitionException {
         try {
             int _type = T__59;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:58:7: ( ':' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:58:9: ':'
+            // InternalExport.g:58:7: ( ':' )
+            // InternalExport.g:58:9: ':'
             {
             match(':'); 
 
@@ -1100,8 +1100,8 @@ public final void mT__60() throws RecognitionException {
         try {
             int _type = T__60;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:59:7: ( '->' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:59:9: '->'
+            // InternalExport.g:59:7: ( '->' )
+            // InternalExport.g:59:9: '->'
             {
             match("->"); 
 
@@ -1121,8 +1121,8 @@ public final void mT__61() throws RecognitionException {
         try {
             int _type = T__61;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:60:7: ( '?' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:60:9: '?'
+            // InternalExport.g:60:7: ( '?' )
+            // InternalExport.g:60:9: '?'
             {
             match('?'); 
 
@@ -1141,8 +1141,8 @@ public final void mT__62() throws RecognitionException {
         try {
             int _type = T__62;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:61:7: ( 'if' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:61:9: 'if'
+            // InternalExport.g:61:7: ( 'if' )
+            // InternalExport.g:61:9: 'if'
             {
             match("if"); 
 
@@ -1162,8 +1162,8 @@ public final void mT__63() throws RecognitionException {
         try {
             int _type = T__63;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:62:7: ( 'then' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:62:9: 'then'
+            // InternalExport.g:62:7: ( 'then' )
+            // InternalExport.g:62:9: 'then'
             {
             match("then"); 
 
@@ -1183,8 +1183,8 @@ public final void mT__64() throws RecognitionException {
         try {
             int _type = T__64;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:63:7: ( 'else' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:63:9: 'else'
+            // InternalExport.g:63:7: ( 'else' )
+            // InternalExport.g:63:9: 'else'
             {
             match("else"); 
 
@@ -1204,8 +1204,8 @@ public final void mT__65() throws RecognitionException {
         try {
             int _type = T__65;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:64:7: ( 'switch' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:64:9: 'switch'
+            // InternalExport.g:64:7: ( 'switch' )
+            // InternalExport.g:64:9: 'switch'
             {
             match("switch"); 
 
@@ -1225,8 +1225,8 @@ public final void mT__66() throws RecognitionException {
         try {
             int _type = T__66;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:65:7: ( 'default' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:65:9: 'default'
+            // InternalExport.g:65:7: ( 'default' )
+            // InternalExport.g:65:9: 'default'
             {
             match("default"); 
 
@@ -1246,8 +1246,8 @@ public final void mT__67() throws RecognitionException {
         try {
             int _type = T__67;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:66:7: ( 'case' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:66:9: 'case'
+            // InternalExport.g:66:7: ( 'case' )
+            // InternalExport.g:66:9: 'case'
             {
             match("case"); 
 
@@ -1267,8 +1267,8 @@ public final void mT__68() throws RecognitionException {
         try {
             int _type = T__68;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:67:7: ( '.' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:67:9: '.'
+            // InternalExport.g:67:7: ( '.' )
+            // InternalExport.g:67:9: '.'
             {
             match('.'); 
 
@@ -1287,8 +1287,8 @@ public final void mT__69() throws RecognitionException {
         try {
             int _type = T__69;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:68:7: ( '|' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:68:9: '|'
+            // InternalExport.g:68:7: ( '|' )
+            // InternalExport.g:68:9: '|'
             {
             match('|'); 
 
@@ -1307,8 +1307,8 @@ public final void mT__70() throws RecognitionException {
         try {
             int _type = T__70;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:69:7: ( 'GLOBALVAR' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:69:9: 'GLOBALVAR'
+            // InternalExport.g:69:7: ( 'GLOBALVAR' )
+            // InternalExport.g:69:9: 'GLOBALVAR'
             {
             match("GLOBALVAR"); 
 
@@ -1328,8 +1328,8 @@ public final void mT__71() throws RecognitionException {
         try {
             int _type = T__71;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:70:7: ( 'new' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:70:9: 'new'
+            // InternalExport.g:70:7: ( 'new' )
+            // InternalExport.g:70:9: 'new'
             {
             match("new"); 
 
@@ -1349,8 +1349,8 @@ public final void mT__72() throws RecognitionException {
         try {
             int _type = T__72;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:71:7: ( 'lookup' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:71:9: 'lookup'
+            // InternalExport.g:71:7: ( 'lookup' )
+            // InternalExport.g:71:9: 'lookup'
             {
             match("lookup"); 
 
@@ -1370,8 +1370,8 @@ public final void mT__73() throws RecognitionException {
         try {
             int _type = T__73;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:72:7: ( 'qualified' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:72:9: 'qualified'
+            // InternalExport.g:72:7: ( 'qualified' )
+            // InternalExport.g:72:9: 'qualified'
             {
             match("qualified"); 
 
@@ -1391,8 +1391,8 @@ public final void mT__74() throws RecognitionException {
         try {
             int _type = T__74;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:73:7: ( 'unique' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:73:9: 'unique'
+            // InternalExport.g:73:7: ( 'unique' )
+            // InternalExport.g:73:9: 'unique'
             {
             match("unique"); 
 
@@ -1412,8 +1412,8 @@ public final void mT__75() throws RecognitionException {
         try {
             int _type = T__75;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:74:7: ( 'object-fingerprint' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:74:9: 'object-fingerprint'
+            // InternalExport.g:74:7: ( 'object-fingerprint' )
+            // InternalExport.g:74:9: 'object-fingerprint'
             {
             match("object-fingerprint"); 
 
@@ -1433,8 +1433,8 @@ public final void mT__76() throws RecognitionException {
         try {
             int _type = T__76;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:75:7: ( 'resource-fingerprint' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:75:9: 'resource-fingerprint'
+            // InternalExport.g:75:7: ( 'resource-fingerprint' )
+            // InternalExport.g:75:9: 'resource-fingerprint'
             {
             match("resource-fingerprint"); 
 
@@ -1454,8 +1454,8 @@ public final void mT__77() throws RecognitionException {
         try {
             int _type = T__77;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:76:7: ( '||' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:76:9: '||'
+            // InternalExport.g:76:7: ( '||' )
+            // InternalExport.g:76:9: '||'
             {
             match("||"); 
 
@@ -1475,8 +1475,8 @@ public final void mT__78() throws RecognitionException {
         try {
             int _type = T__78;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:77:7: ( '&&' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:77:9: '&&'
+            // InternalExport.g:77:7: ( '&&' )
+            // InternalExport.g:77:9: '&&'
             {
             match("&&"); 
 
@@ -1496,8 +1496,8 @@ public final void mT__79() throws RecognitionException {
         try {
             int _type = T__79;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:78:7: ( 'implies' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:78:9: 'implies'
+            // InternalExport.g:78:7: ( 'implies' )
+            // InternalExport.g:78:9: 'implies'
             {
             match("implies"); 
 
@@ -1517,8 +1517,8 @@ public final void mT__80() throws RecognitionException {
         try {
             int _type = T__80;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:79:7: ( 'typeSelect' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:79:9: 'typeSelect'
+            // InternalExport.g:79:7: ( 'typeSelect' )
+            // InternalExport.g:79:9: 'typeSelect'
             {
             match("typeSelect"); 
 
@@ -1538,8 +1538,8 @@ public final void mT__81() throws RecognitionException {
         try {
             int _type = T__81;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:80:7: ( 'null' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:80:9: 'null'
+            // InternalExport.g:80:7: ( 'null' )
+            // InternalExport.g:80:9: 'null'
             {
             match("null"); 
 
@@ -1559,10 +1559,10 @@ public final void mRULE_REAL() throws RecognitionException {
         try {
             int _type = RULE_REAL;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11451:11: ( ( '0' .. '9' )* '.' ( '0' .. '9' )* )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11451:13: ( '0' .. '9' )* '.' ( '0' .. '9' )*
+            // InternalExport.g:11451:11: ( ( '0' .. '9' )* '.' ( '0' .. '9' )* )
+            // InternalExport.g:11451:13: ( '0' .. '9' )* '.' ( '0' .. '9' )*
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11451:13: ( '0' .. '9' )*
+            // InternalExport.g:11451:13: ( '0' .. '9' )*
             loop1:
             do {
                 int alt1=2;
@@ -1575,7 +1575,7 @@ public final void mRULE_REAL() throws RecognitionException {
 
                 switch (alt1) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11451:14: '0' .. '9'
+            	    // InternalExport.g:11451:14: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -1588,7 +1588,7 @@ public final void mRULE_REAL() throws RecognitionException {
             } while (true);
 
             match('.'); 
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11451:29: ( '0' .. '9' )*
+            // InternalExport.g:11451:29: ( '0' .. '9' )*
             loop2:
             do {
                 int alt2=2;
@@ -1601,7 +1601,7 @@ public final void mRULE_REAL() throws RecognitionException {
 
                 switch (alt2) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11451:30: '0' .. '9'
+            	    // InternalExport.g:11451:30: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -1629,10 +1629,10 @@ public final void mRULE_ID() throws RecognitionException {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11453:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11453:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalExport.g:11453:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+            // InternalExport.g:11453:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11453:11: ( '^' )?
+            // InternalExport.g:11453:11: ( '^' )?
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -1641,7 +1641,7 @@ public final void mRULE_ID() throws RecognitionException {
             }
             switch (alt3) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11453:11: '^'
+                    // InternalExport.g:11453:11: '^'
                     {
                     match('^'); 
 
@@ -1659,7 +1659,7 @@ public final void mRULE_ID() throws RecognitionException {
                 recover(mse);
                 throw mse;}
 
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11453:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalExport.g:11453:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             loop4:
             do {
                 int alt4=2;
@@ -1672,7 +1672,7 @@ public final void mRULE_ID() throws RecognitionException {
 
                 switch (alt4) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:
+            	    // InternalExport.g:
             	    {
             	    if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
             	        input.consume();
@@ -1708,10 +1708,10 @@ public final void mRULE_INT() throws RecognitionException {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11455:10: ( ( '0' .. '9' )+ )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11455:12: ( '0' .. '9' )+
+            // InternalExport.g:11455:10: ( ( '0' .. '9' )+ )
+            // InternalExport.g:11455:12: ( '0' .. '9' )+
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11455:12: ( '0' .. '9' )+
+            // InternalExport.g:11455:12: ( '0' .. '9' )+
             int cnt5=0;
             loop5:
             do {
@@ -1725,7 +1725,7 @@ public final void mRULE_INT() throws RecognitionException {
 
                 switch (alt5) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11455:13: '0' .. '9'
+            	    // InternalExport.g:11455:13: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -1757,10 +1757,10 @@ public final void mRULE_STRING() throws RecognitionException {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11457:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11457:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalExport.g:11457:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+            // InternalExport.g:11457:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11457:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalExport.g:11457:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             int alt8=2;
             int LA8_0 = input.LA(1);
 
@@ -1778,10 +1778,10 @@ else if ( (LA8_0=='\'') ) {
             }
             switch (alt8) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11457:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+                    // InternalExport.g:11457:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
                     {
                     match('\"'); 
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11457:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // InternalExport.g:11457:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop6:
                     do {
                         int alt6=3;
@@ -1797,7 +1797,7 @@ else if ( ((LA6_0>='\u0000' && LA6_0<='!')||(LA6_0>='#' && LA6_0<='[')||(LA6_0>=
 
                         switch (alt6) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11457:21: '\\\\' .
+                    	    // InternalExport.g:11457:21: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -1805,7 +1805,7 @@ else if ( ((LA6_0>='\u0000' && LA6_0<='!')||(LA6_0>='#' && LA6_0<='[')||(LA6_0>=
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11457:28: ~ ( ( '\\\\' | '\"' ) )
+                    	    // InternalExport.g:11457:28: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -1830,10 +1830,10 @@ else if ( ((LA6_0>='\u0000' && LA6_0<='!')||(LA6_0>='#' && LA6_0<='[')||(LA6_0>=
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11457:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+                    // InternalExport.g:11457:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
                     {
                     match('\''); 
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11457:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // InternalExport.g:11457:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop7:
                     do {
                         int alt7=3;
@@ -1849,7 +1849,7 @@ else if ( ((LA7_0>='\u0000' && LA7_0<='&')||(LA7_0>='(' && LA7_0<='[')||(LA7_0>=
 
                         switch (alt7) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11457:54: '\\\\' .
+                    	    // InternalExport.g:11457:54: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -1857,7 +1857,7 @@ else if ( ((LA7_0>='\u0000' && LA7_0<='&')||(LA7_0>='(' && LA7_0<='[')||(LA7_0>=
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11457:61: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // InternalExport.g:11457:61: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -1900,12 +1900,12 @@ public final void mRULE_ML_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11459:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11459:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalExport.g:11459:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalExport.g:11459:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11459:24: ( options {greedy=false; } : . )*
+            // InternalExport.g:11459:24: ( options {greedy=false; } : . )*
             loop9:
             do {
                 int alt9=2;
@@ -1930,7 +1930,7 @@ else if ( ((LA9_0>='\u0000' && LA9_0<=')')||(LA9_0>='+' && LA9_0<='\uFFFF')) ) {
 
                 switch (alt9) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11459:52: .
+            	    // InternalExport.g:11459:52: .
             	    {
             	    matchAny(); 
 
@@ -1960,12 +1960,12 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11461:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11461:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalExport.g:11461:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalExport.g:11461:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11461:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // InternalExport.g:11461:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop10:
             do {
                 int alt10=2;
@@ -1978,7 +1978,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
 
                 switch (alt10) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11461:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // InternalExport.g:11461:24: ~ ( ( '\\n' | '\\r' ) )
             	    {
             	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
             	        input.consume();
@@ -1998,7 +1998,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
                 }
             } while (true);
 
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11461:40: ( ( '\\r' )? '\\n' )?
+            // InternalExport.g:11461:40: ( ( '\\r' )? '\\n' )?
             int alt12=2;
             int LA12_0 = input.LA(1);
 
@@ -2007,9 +2007,9 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
             }
             switch (alt12) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11461:41: ( '\\r' )? '\\n'
+                    // InternalExport.g:11461:41: ( '\\r' )? '\\n'
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11461:41: ( '\\r' )?
+                    // InternalExport.g:11461:41: ( '\\r' )?
                     int alt11=2;
                     int LA11_0 = input.LA(1);
 
@@ -2018,7 +2018,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
                     }
                     switch (alt11) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11461:41: '\\r'
+                            // InternalExport.g:11461:41: '\\r'
                             {
                             match('\r'); 
 
@@ -2050,10 +2050,10 @@ public final void mRULE_WS() throws RecognitionException {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11463:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11463:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalExport.g:11463:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalExport.g:11463:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11463:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalExport.g:11463:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt13=0;
             loop13:
             do {
@@ -2067,7 +2067,7 @@ public final void mRULE_WS() throws RecognitionException {
 
                 switch (alt13) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:
+            	    // InternalExport.g:
             	    {
             	    if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
             	        input.consume();
@@ -2107,8 +2107,8 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11465:16: ( . )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11465:18: .
+            // InternalExport.g:11465:16: ( . )
+            // InternalExport.g:11465:18: .
             {
             matchAny(); 
 
@@ -2123,551 +2123,551 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:8: ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | RULE_REAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        // InternalExport.g:1:8: ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | RULE_REAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
         int alt14=78;
         alt14 = dfa14.predict(input);
         switch (alt14) {
             case 1 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:10: T__12
+                // InternalExport.g:1:10: T__12
                 {
                 mT__12(); 
 
                 }
                 break;
             case 2 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:16: T__13
+                // InternalExport.g:1:16: T__13
                 {
                 mT__13(); 
 
                 }
                 break;
             case 3 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:22: T__14
+                // InternalExport.g:1:22: T__14
                 {
                 mT__14(); 
 
                 }
                 break;
             case 4 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:28: T__15
+                // InternalExport.g:1:28: T__15
                 {
                 mT__15(); 
 
                 }
                 break;
             case 5 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:34: T__16
+                // InternalExport.g:1:34: T__16
                 {
                 mT__16(); 
 
                 }
                 break;
             case 6 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:40: T__17
+                // InternalExport.g:1:40: T__17
                 {
                 mT__17(); 
 
                 }
                 break;
             case 7 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:46: T__18
+                // InternalExport.g:1:46: T__18
                 {
                 mT__18(); 
 
                 }
                 break;
             case 8 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:52: T__19
+                // InternalExport.g:1:52: T__19
                 {
                 mT__19(); 
 
                 }
                 break;
             case 9 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:58: T__20
+                // InternalExport.g:1:58: T__20
                 {
                 mT__20(); 
 
                 }
                 break;
             case 10 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:64: T__21
+                // InternalExport.g:1:64: T__21
                 {
                 mT__21(); 
 
                 }
                 break;
             case 11 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:70: T__22
+                // InternalExport.g:1:70: T__22
                 {
                 mT__22(); 
 
                 }
                 break;
             case 12 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:76: T__23
+                // InternalExport.g:1:76: T__23
                 {
                 mT__23(); 
 
                 }
                 break;
             case 13 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:82: T__24
+                // InternalExport.g:1:82: T__24
                 {
                 mT__24(); 
 
                 }
                 break;
             case 14 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:88: T__25
+                // InternalExport.g:1:88: T__25
                 {
                 mT__25(); 
 
                 }
                 break;
             case 15 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:94: T__26
+                // InternalExport.g:1:94: T__26
                 {
                 mT__26(); 
 
                 }
                 break;
             case 16 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:100: T__27
+                // InternalExport.g:1:100: T__27
                 {
                 mT__27(); 
 
                 }
                 break;
             case 17 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:106: T__28
+                // InternalExport.g:1:106: T__28
                 {
                 mT__28(); 
 
                 }
                 break;
             case 18 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:112: T__29
+                // InternalExport.g:1:112: T__29
                 {
                 mT__29(); 
 
                 }
                 break;
             case 19 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:118: T__30
+                // InternalExport.g:1:118: T__30
                 {
                 mT__30(); 
 
                 }
                 break;
             case 20 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:124: T__31
+                // InternalExport.g:1:124: T__31
                 {
                 mT__31(); 
 
                 }
                 break;
             case 21 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:130: T__32
+                // InternalExport.g:1:130: T__32
                 {
                 mT__32(); 
 
                 }
                 break;
             case 22 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:136: T__33
+                // InternalExport.g:1:136: T__33
                 {
                 mT__33(); 
 
                 }
                 break;
             case 23 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:142: T__34
+                // InternalExport.g:1:142: T__34
                 {
                 mT__34(); 
 
                 }
                 break;
             case 24 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:148: T__35
+                // InternalExport.g:1:148: T__35
                 {
                 mT__35(); 
 
                 }
                 break;
             case 25 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:154: T__36
+                // InternalExport.g:1:154: T__36
                 {
                 mT__36(); 
 
                 }
                 break;
             case 26 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:160: T__37
+                // InternalExport.g:1:160: T__37
                 {
                 mT__37(); 
 
                 }
                 break;
             case 27 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:166: T__38
+                // InternalExport.g:1:166: T__38
                 {
                 mT__38(); 
 
                 }
                 break;
             case 28 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:172: T__39
+                // InternalExport.g:1:172: T__39
                 {
                 mT__39(); 
 
                 }
                 break;
             case 29 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:178: T__40
+                // InternalExport.g:1:178: T__40
                 {
                 mT__40(); 
 
                 }
                 break;
             case 30 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:184: T__41
+                // InternalExport.g:1:184: T__41
                 {
                 mT__41(); 
 
                 }
                 break;
             case 31 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:190: T__42
+                // InternalExport.g:1:190: T__42
                 {
                 mT__42(); 
 
                 }
                 break;
             case 32 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:196: T__43
+                // InternalExport.g:1:196: T__43
                 {
                 mT__43(); 
 
                 }
                 break;
             case 33 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:202: T__44
+                // InternalExport.g:1:202: T__44
                 {
                 mT__44(); 
 
                 }
                 break;
             case 34 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:208: T__45
+                // InternalExport.g:1:208: T__45
                 {
                 mT__45(); 
 
                 }
                 break;
             case 35 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:214: T__46
+                // InternalExport.g:1:214: T__46
                 {
                 mT__46(); 
 
                 }
                 break;
             case 36 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:220: T__47
+                // InternalExport.g:1:220: T__47
                 {
                 mT__47(); 
 
                 }
                 break;
             case 37 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:226: T__48
+                // InternalExport.g:1:226: T__48
                 {
                 mT__48(); 
 
                 }
                 break;
             case 38 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:232: T__49
+                // InternalExport.g:1:232: T__49
                 {
                 mT__49(); 
 
                 }
                 break;
             case 39 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:238: T__50
+                // InternalExport.g:1:238: T__50
                 {
                 mT__50(); 
 
                 }
                 break;
             case 40 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:244: T__51
+                // InternalExport.g:1:244: T__51
                 {
                 mT__51(); 
 
                 }
                 break;
             case 41 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:250: T__52
+                // InternalExport.g:1:250: T__52
                 {
                 mT__52(); 
 
                 }
                 break;
             case 42 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:256: T__53
+                // InternalExport.g:1:256: T__53
                 {
                 mT__53(); 
 
                 }
                 break;
             case 43 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:262: T__54
+                // InternalExport.g:1:262: T__54
                 {
                 mT__54(); 
 
                 }
                 break;
             case 44 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:268: T__55
+                // InternalExport.g:1:268: T__55
                 {
                 mT__55(); 
 
                 }
                 break;
             case 45 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:274: T__56
+                // InternalExport.g:1:274: T__56
                 {
                 mT__56(); 
 
                 }
                 break;
             case 46 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:280: T__57
+                // InternalExport.g:1:280: T__57
                 {
                 mT__57(); 
 
                 }
                 break;
             case 47 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:286: T__58
+                // InternalExport.g:1:286: T__58
                 {
                 mT__58(); 
 
                 }
                 break;
             case 48 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:292: T__59
+                // InternalExport.g:1:292: T__59
                 {
                 mT__59(); 
 
                 }
                 break;
             case 49 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:298: T__60
+                // InternalExport.g:1:298: T__60
                 {
                 mT__60(); 
 
                 }
                 break;
             case 50 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:304: T__61
+                // InternalExport.g:1:304: T__61
                 {
                 mT__61(); 
 
                 }
                 break;
             case 51 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:310: T__62
+                // InternalExport.g:1:310: T__62
                 {
                 mT__62(); 
 
                 }
                 break;
             case 52 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:316: T__63
+                // InternalExport.g:1:316: T__63
                 {
                 mT__63(); 
 
                 }
                 break;
             case 53 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:322: T__64
+                // InternalExport.g:1:322: T__64
                 {
                 mT__64(); 
 
                 }
                 break;
             case 54 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:328: T__65
+                // InternalExport.g:1:328: T__65
                 {
                 mT__65(); 
 
                 }
                 break;
             case 55 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:334: T__66
+                // InternalExport.g:1:334: T__66
                 {
                 mT__66(); 
 
                 }
                 break;
             case 56 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:340: T__67
+                // InternalExport.g:1:340: T__67
                 {
                 mT__67(); 
 
                 }
                 break;
             case 57 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:346: T__68
+                // InternalExport.g:1:346: T__68
                 {
                 mT__68(); 
 
                 }
                 break;
             case 58 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:352: T__69
+                // InternalExport.g:1:352: T__69
                 {
                 mT__69(); 
 
                 }
                 break;
             case 59 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:358: T__70
+                // InternalExport.g:1:358: T__70
                 {
                 mT__70(); 
 
                 }
                 break;
             case 60 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:364: T__71
+                // InternalExport.g:1:364: T__71
                 {
                 mT__71(); 
 
                 }
                 break;
             case 61 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:370: T__72
+                // InternalExport.g:1:370: T__72
                 {
                 mT__72(); 
 
                 }
                 break;
             case 62 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:376: T__73
+                // InternalExport.g:1:376: T__73
                 {
                 mT__73(); 
 
                 }
                 break;
             case 63 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:382: T__74
+                // InternalExport.g:1:382: T__74
                 {
                 mT__74(); 
 
                 }
                 break;
             case 64 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:388: T__75
+                // InternalExport.g:1:388: T__75
                 {
                 mT__75(); 
 
                 }
                 break;
             case 65 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:394: T__76
+                // InternalExport.g:1:394: T__76
                 {
                 mT__76(); 
 
                 }
                 break;
             case 66 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:400: T__77
+                // InternalExport.g:1:400: T__77
                 {
                 mT__77(); 
 
                 }
                 break;
             case 67 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:406: T__78
+                // InternalExport.g:1:406: T__78
                 {
                 mT__78(); 
 
                 }
                 break;
             case 68 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:412: T__79
+                // InternalExport.g:1:412: T__79
                 {
                 mT__79(); 
 
                 }
                 break;
             case 69 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:418: T__80
+                // InternalExport.g:1:418: T__80
                 {
                 mT__80(); 
 
                 }
                 break;
             case 70 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:424: T__81
+                // InternalExport.g:1:424: T__81
                 {
                 mT__81(); 
 
                 }
                 break;
             case 71 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:430: RULE_REAL
+                // InternalExport.g:1:430: RULE_REAL
                 {
                 mRULE_REAL(); 
 
                 }
                 break;
             case 72 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:440: RULE_ID
+                // InternalExport.g:1:440: RULE_ID
                 {
                 mRULE_ID(); 
 
                 }
                 break;
             case 73 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:448: RULE_INT
+                // InternalExport.g:1:448: RULE_INT
                 {
                 mRULE_INT(); 
 
                 }
                 break;
             case 74 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:457: RULE_STRING
+                // InternalExport.g:1:457: RULE_STRING
                 {
                 mRULE_STRING(); 
 
                 }
                 break;
             case 75 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:469: RULE_ML_COMMENT
+                // InternalExport.g:1:469: RULE_ML_COMMENT
                 {
                 mRULE_ML_COMMENT(); 
 
                 }
                 break;
             case 76 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:485: RULE_SL_COMMENT
+                // InternalExport.g:1:485: RULE_SL_COMMENT
                 {
                 mRULE_SL_COMMENT(); 
 
                 }
                 break;
             case 77 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:501: RULE_WS
+                // InternalExport.g:1:501: RULE_WS
                 {
                 mRULE_WS(); 
 
                 }
                 break;
             case 78 :
-                // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1:509: RULE_ANY_OTHER
+                // InternalExport.g:1:509: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -2681,96 +2681,19 @@ public void mTokens() throws RecognitionException {
 
     protected DFA14 dfa14 = new DFA14(this);
     static final String DFA14_eotS =
-        "\1\uffff\1\61\1\63\1\65\1\67\1\uffff\1\72\1\uffff\1\76\13\101\2"+
-        "\uffff\1\101\7\uffff\2\101\1\150\1\101\1\uffff\1\154\1\157\3\101"+
-        "\1\57\1\164\1\57\1\uffff\2\57\21\uffff\2\101\1\uffff\25\101\1\u0092"+
-        "\2\uffff\1\u0093\1\101\7\uffff\4\101\2\uffff\2\101\5\uffff\3\101"+
-        "\2\uffff\1\164\2\uffff\15\101\1\u00ab\1\101\1\u00ae\7\101\1\u00b6"+
-        "\2\101\2\uffff\5\101\1\u00bf\5\101\1\u00c5\10\101\1\u00ce\1\u00cf"+
-        "\1\101\1\uffff\1\u00d1\1\101\1\uffff\2\101\1\u00d5\1\u00d6\2\101"+
-        "\1\u00d9\1\uffff\4\101\1\uffff\1\101\1\u00df\1\101\1\uffff\5\101"+
-        "\1\uffff\10\101\2\uffff\1\101\1\uffff\1\101\1\u00f0\1\u00f1\2\uffff"+
-        "\2\101\1\uffff\5\101\1\uffff\6\101\1\u0100\1\u0101\1\u0102\1\u0103"+
-        "\1\101\1\u0105\1\u0106\2\101\1\u0109\2\uffff\3\101\1\u010d\2\101"+
-        "\1\u0110\1\101\1\u0112\3\101\1\u0116\1\101\4\uffff\1\101\2\uffff"+
-        "\2\101\1\uffff\3\101\1\uffff\1\u011e\1\101\1\uffff\1\u0120\1\uffff"+
-        "\2\101\2\uffff\7\101\1\uffff\1\101\1\uffff\3\101\1\uffff\1\u012e"+
-        "\1\u012f\2\101\1\u0132\1\u0133\1\u0134\1\u0135\1\101\2\uffff\1\u0137"+
-        "\1\u0138\4\uffff\1\u0139\3\uffff";
+        "\1\uffff\1\61\1\63\1\65\1\67\1\uffff\1\72\1\uffff\1\76\13\101\2\uffff\1\101\7\uffff\2\101\1\150\1\101\1\uffff\1\154\1\157\3\101\1\57\1\164\1\57\1\uffff\2\57\21\uffff\2\101\1\uffff\25\101\1\u0092\2\uffff\1\u0093\1\101\7\uffff\4\101\2\uffff\2\101\5\uffff\3\101\2\uffff\1\164\2\uffff\15\101\1\u00ab\1\101\1\u00ae\7\101\1\u00b6\2\101\2\uffff\5\101\1\u00bf\5\101\1\u00c5\10\101\1\u00ce\1\u00cf\1\101\1\uffff\1\u00d1\1\101\1\uffff\2\101\1\u00d5\1\u00d6\2\101\1\u00d9\1\uffff\4\101\1\uffff\1\101\1\u00df\1\101\1\uffff\5\101\1\uffff\10\101\2\uffff\1\101\1\uffff\1\101\1\u00f0\1\u00f1\2\uffff\2\101\1\uffff\5\101\1\uffff\6\101\1\u0100\1\u0101\1\u0102\1\u0103\1\101\1\u0105\1\u0106\2\101\1\u0109\2\uffff\3\101\1\u010d\2\101\1\u0110\1\101\1\u0112\3\101\1\u0116\1\101\4\uffff\1\101\2\uffff\2\101\1\uffff\3\101\1\uffff\1\u011e\1\101\1\uffff\1\u0120\1\uffff\2\101\2\uffff\7\101\1\uffff\1\101\1\uffff\3\101\1\uffff\1\u012e\1\u012f\2\101\1\u0132\1\u0133\1\u0134\1\u0135\1\101\2\uffff\1\u0137\1\u0138\4\uffff\1\u0139\3\uffff";
     static final String DFA14_eofS =
         "\u013a\uffff";
     static final String DFA14_minS =
-        "\1\0\4\75\1\uffff\1\76\1\uffff\1\52\1\141\2\145\1\154\1\145\1\141"+
-        "\1\150\1\157\1\151\1\145\1\146\2\uffff\1\163\7\uffff\1\156\1\141"+
-        "\1\72\1\145\1\uffff\1\60\1\174\1\114\1\165\1\142\1\46\1\56\1\101"+
-        "\1\uffff\2\0\21\uffff\1\154\1\163\1\uffff\1\154\1\162\1\151\1\152"+
-        "\1\151\1\141\1\163\1\164\1\167\1\154\1\162\1\154\1\145\1\165\1\145"+
-        "\1\160\1\154\1\163\2\164\1\160\1\60\2\uffff\1\60\1\164\7\uffff\2"+
-        "\151\1\164\1\146\2\uffff\1\164\1\157\5\uffff\1\117\1\141\1\152\2"+
-        "\uffff\1\56\2\uffff\1\154\2\145\2\164\1\145\1\157\1\163\1\157\1"+
-        "\145\1\154\1\145\1\105\1\60\1\154\1\60\1\163\1\154\1\145\1\156\1"+
-        "\145\1\154\1\164\1\60\1\145\1\154\2\uffff\1\162\1\55\1\161\2\141"+
-        "\1\60\1\153\1\102\1\154\2\145\1\60\1\143\1\102\2\143\1\165\1\164"+
-        "\1\162\1\156\2\60\1\170\1\uffff\1\60\1\154\1\uffff\1\145\1\144\2"+
-        "\60\1\123\1\145\1\60\1\uffff\2\162\2\151\1\uffff\1\165\1\60\1\165"+
-        "\1\uffff\1\165\1\101\1\151\2\143\1\uffff\1\164\1\171\1\150\1\164"+
-        "\1\162\1\163\1\164\1\163\2\uffff\1\151\1\uffff\1\154\2\60\2\uffff"+
-        "\1\145\1\143\1\uffff\1\146\1\164\1\145\1\142\1\145\1\uffff\1\154"+
-        "\1\160\1\114\1\146\2\164\4\60\1\143\2\60\1\151\1\163\1\60\2\uffff"+
-        "\1\154\1\164\1\141\1\60\1\163\1\165\1\60\1\164\1\60\1\126\1\151"+
-        "\1\55\1\60\1\151\4\uffff\1\145\2\uffff\1\157\1\164\1\uffff\1\145"+
-        "\1\151\1\143\1\uffff\1\60\1\164\1\uffff\1\60\1\uffff\1\101\1\145"+
-        "\2\uffff\1\162\1\55\1\156\1\163\1\143\1\157\1\145\1\uffff\1\145"+
-        "\1\uffff\1\122\1\144\1\163\1\uffff\2\60\1\164\1\156\4\60\1\164\2"+
-        "\uffff\2\60\4\uffff\1\60\3\uffff";
+        "\1\0\4\75\1\uffff\1\76\1\uffff\1\52\1\141\2\145\1\154\1\145\1\141\1\150\1\157\1\151\1\145\1\146\2\uffff\1\163\7\uffff\1\156\1\141\1\72\1\145\1\uffff\1\60\1\174\1\114\1\165\1\142\1\46\1\56\1\101\1\uffff\2\0\21\uffff\1\154\1\163\1\uffff\1\154\1\162\1\151\1\152\1\151\1\141\1\163\1\164\1\167\1\154\1\162\1\154\1\145\1\165\1\145\1\160\1\154\1\163\2\164\1\160\1\60\2\uffff\1\60\1\164\7\uffff\2\151\1\164\1\146\2\uffff\1\164\1\157\5\uffff\1\117\1\141\1\152\2\uffff\1\56\2\uffff\1\154\2\145\2\164\1\145\1\157\1\163\1\157\1\145\1\154\1\145\1\105\1\60\1\154\1\60\1\163\1\154\1\145\1\156\1\145\1\154\1\164\1\60\1\145\1\154\2\uffff\1\162\1\55\1\161\2\141\1\60\1\153\1\102\1\154\2\145\1\60\1\143\1\102\2\143\1\165\1\164\1\162\1\156\2\60\1\170\1\uffff\1\60\1\154\1\uffff\1\145\1\144\2\60\1\123\1\145\1\60\1\uffff\2\162\2\151\1\uffff\1\165\1\60\1\165\1\uffff\1\165\1\101\1\151\2\143\1\uffff\1\164\1\171\1\150\1\164\1\162\1\163\1\164\1\163\2\uffff\1\151\1\uffff\1\154\2\60\2\uffff\1\145\1\143\1\uffff\1\146\1\164\1\145\1\142\1\145\1\uffff\1\154\1\160\1\114\1\146\2\164\4\60\1\143\2\60\1\151\1\163\1\60\2\uffff\1\154\1\164\1\141\1\60\1\163\1\165\1\60\1\164\1\60\1\126\1\151\1\55\1\60\1\151\4\uffff\1\145\2\uffff\1\157\1\164\1\uffff\1\145\1\151\1\143\1\uffff\1\60\1\164\1\uffff\1\60\1\uffff\1\101\1\145\2\uffff\1\162\1\55\1\156\1\163\1\143\1\157\1\145\1\uffff\1\145\1\uffff\1\122\1\144\1\163\1\uffff\2\60\1\164\1\156\4\60\1\164\2\uffff\2\60\4\uffff\1\60\3\uffff";
     static final String DFA14_maxS =
-        "\1\uffff\4\75\1\uffff\1\76\1\uffff\1\57\1\157\1\167\1\145\1\170"+
-        "\1\165\1\157\1\171\1\157\1\151\1\145\1\156\2\uffff\1\164\7\uffff"+
-        "\1\162\1\145\1\72\1\157\1\uffff\1\71\1\174\1\114\1\165\1\142\1\46"+
-        "\1\71\1\172\1\uffff\2\uffff\21\uffff\1\154\1\163\1\uffff\1\154\1"+
-        "\162\1\151\1\163\1\164\1\141\1\163\1\164\1\167\1\154\1\162\1\154"+
-        "\1\145\1\165\1\145\1\160\1\154\1\163\2\164\1\160\1\172\2\uffff\1"+
-        "\172\1\164\7\uffff\2\151\1\164\1\146\2\uffff\1\164\1\157\5\uffff"+
-        "\1\117\1\141\1\152\2\uffff\1\71\2\uffff\1\154\2\145\2\164\1\145"+
-        "\1\157\1\163\1\157\1\145\1\154\1\145\1\105\1\172\1\154\1\172\1\163"+
-        "\1\154\1\145\1\156\1\145\1\154\1\164\1\172\1\145\1\157\2\uffff\1"+
-        "\162\1\55\1\161\2\141\1\172\1\153\1\102\1\154\2\145\1\172\1\143"+
-        "\1\102\2\143\1\165\1\164\1\162\1\156\2\172\1\170\1\uffff\1\172\1"+
-        "\154\1\uffff\1\145\1\144\2\172\1\123\1\145\1\172\1\uffff\2\162\2"+
-        "\151\1\uffff\1\165\1\172\1\165\1\uffff\1\165\1\101\1\151\2\143\1"+
-        "\uffff\1\164\1\171\1\150\1\164\1\162\1\163\1\164\1\163\2\uffff\1"+
-        "\151\1\uffff\1\154\2\172\2\uffff\1\145\1\143\1\uffff\1\146\1\164"+
-        "\1\145\1\142\1\145\1\uffff\1\154\1\160\1\114\1\146\2\164\4\172\1"+
-        "\143\2\172\1\151\1\163\1\172\2\uffff\1\154\1\164\1\141\1\172\1\163"+
-        "\1\165\1\172\1\164\1\172\1\126\1\151\1\55\1\172\1\151\4\uffff\1"+
-        "\145\2\uffff\1\157\1\164\1\uffff\1\145\1\151\1\143\1\uffff\1\172"+
-        "\1\164\1\uffff\1\172\1\uffff\1\101\1\145\2\uffff\1\162\1\55\1\156"+
-        "\1\163\1\143\1\157\1\145\1\uffff\1\145\1\uffff\1\122\1\144\1\163"+
-        "\1\uffff\2\172\1\164\1\156\4\172\1\164\2\uffff\2\172\4\uffff\1\172"+
-        "\3\uffff";
+        "\1\uffff\4\75\1\uffff\1\76\1\uffff\1\57\1\157\1\167\1\145\1\170\1\165\1\157\1\171\1\157\1\151\1\145\1\156\2\uffff\1\164\7\uffff\1\162\1\145\1\72\1\157\1\uffff\1\71\1\174\1\114\1\165\1\142\1\46\1\71\1\172\1\uffff\2\uffff\21\uffff\1\154\1\163\1\uffff\1\154\1\162\1\151\1\163\1\164\1\141\1\163\1\164\1\167\1\154\1\162\1\154\1\145\1\165\1\145\1\160\1\154\1\163\2\164\1\160\1\172\2\uffff\1\172\1\164\7\uffff\2\151\1\164\1\146\2\uffff\1\164\1\157\5\uffff\1\117\1\141\1\152\2\uffff\1\71\2\uffff\1\154\2\145\2\164\1\145\1\157\1\163\1\157\1\145\1\154\1\145\1\105\1\172\1\154\1\172\1\163\1\154\1\145\1\156\1\145\1\154\1\164\1\172\1\145\1\157\2\uffff\1\162\1\55\1\161\2\141\1\172\1\153\1\102\1\154\2\145\1\172\1\143\1\102\2\143\1\165\1\164\1\162\1\156\2\172\1\170\1\uffff\1\172\1\154\1\uffff\1\145\1\144\2\172\1\123\1\145\1\172\1\uffff\2\162\2\151\1\uffff\1\165\1\172\1\165\1\uffff\1\165\1\101\1\151\2\143\1\uffff\1\164\1\171\1\150\1\164\1\162\1\163\1\164\1\163\2\uffff\1\151\1\uffff\1\154\2\172\2\uffff\1\145\1\143\1\uffff\1\146\1\164\1\145\1\142\1\145\1\uffff\1\154\1\160\1\114\1\146\2\164\4\172\1\143\2\172\1\151\1\163\1\172\2\uffff\1\154\1\164\1\141\1\172\1\163\1\165\1\172\1\164\1\172\1\126\1\151\1\55\1\172\1\151\4\uffff\1\145\2\uffff\1\157\1\164\1\uffff\1\145\1\151\1\143\1\uffff\1\172\1\164\1\uffff\1\172\1\uffff\1\101\1\145\2\uffff\1\162\1\55\1\156\1\163\1\143\1\157\1\145\1\uffff\1\145\1\uffff\1\122\1\144\1\163\1\uffff\2\172\1\164\1\156\4\172\1\164\2\uffff\2\172\4\uffff\1\172\3\uffff";
     static final String DFA14_acceptS =
-        "\5\uffff\1\7\1\uffff\1\11\14\uffff\1\34\1\35\1\uffff\1\41\1\42"+
-        "\1\43\1\45\1\46\1\50\1\51\4\uffff\1\62\10\uffff\1\110\2\uffff\1"+
-        "\115\1\116\1\1\1\44\1\2\1\13\1\3\1\5\1\4\1\6\1\7\1\61\1\10\1\11"+
-        "\1\113\1\114\1\12\2\uffff\1\110\26\uffff\1\34\1\35\2\uffff\1\41"+
-        "\1\42\1\43\1\45\1\46\1\50\1\51\4\uffff\1\56\1\60\2\uffff\1\62\1"+
-        "\71\1\107\1\102\1\72\3\uffff\1\103\1\111\1\uffff\1\112\1\115\32"+
-        "\uffff\1\63\1\37\27\uffff\1\74\2\uffff\1\32\7\uffff\1\30\4\uffff"+
-        "\1\52\3\uffff\1\57\5\uffff\1\70\10\uffff\1\47\1\65\1\uffff\1\106"+
-        "\3\uffff\1\24\1\64\2\uffff\1\27\5\uffff\1\55\20\uffff\1\25\1\54"+
-        "\16\uffff\1\15\1\22\1\66\1\17\1\uffff\1\20\1\31\2\uffff\1\23\3\uffff"+
-        "\1\36\2\uffff\1\77\1\uffff\1\75\2\uffff\1\100\1\14\7\uffff\1\104"+
-        "\1\uffff\1\67\3\uffff\1\101\11\uffff\1\40\1\21\2\uffff\1\33\1\53"+
-        "\1\73\1\76\1\uffff\1\105\1\26\1\16";
+        "\5\uffff\1\7\1\uffff\1\11\14\uffff\1\34\1\35\1\uffff\1\41\1\42\1\43\1\45\1\46\1\50\1\51\4\uffff\1\62\10\uffff\1\110\2\uffff\1\115\1\116\1\1\1\44\1\2\1\13\1\3\1\5\1\4\1\6\1\7\1\61\1\10\1\11\1\113\1\114\1\12\2\uffff\1\110\26\uffff\1\34\1\35\2\uffff\1\41\1\42\1\43\1\45\1\46\1\50\1\51\4\uffff\1\56\1\60\2\uffff\1\62\1\71\1\107\1\102\1\72\3\uffff\1\103\1\111\1\uffff\1\112\1\115\32\uffff\1\63\1\37\27\uffff\1\74\2\uffff\1\32\7\uffff\1\30\4\uffff\1\52\3\uffff\1\57\5\uffff\1\70\10\uffff\1\47\1\65\1\uffff\1\106\3\uffff\1\24\1\64\2\uffff\1\27\5\uffff\1\55\20\uffff\1\25\1\54\16\uffff\1\15\1\22\1\66\1\17\1\uffff\1\20\1\31\2\uffff\1\23\3\uffff\1\36\2\uffff\1\77\1\uffff\1\75\2\uffff\1\100\1\14\7\uffff\1\104\1\uffff\1\67\3\uffff\1\101\11\uffff\1\40\1\21\2\uffff\1\33\1\53\1\73\1\76\1\uffff\1\105\1\26\1\16";
     static final String DFA14_specialS =
         "\1\0\53\uffff\1\1\1\2\u010c\uffff}>";
     static final String[] DFA14_transitionS = {
-            "\11\57\2\56\2\57\1\56\22\57\1\56\1\2\1\54\3\57\1\50\1\55\1"+
-            "\34\1\35\1\7\1\5\1\32\1\6\1\43\1\10\12\51\1\40\1\27\1\4\1\1"+
-            "\1\3\1\42\1\33\2\53\1\20\3\53\1\45\4\53\1\21\6\53\1\22\7\53"+
-            "\1\30\1\57\1\31\1\52\1\53\1\57\1\26\1\53\1\11\1\37\1\14\1\16"+
-            "\2\53\1\23\2\53\1\41\1\53\1\15\1\47\1\53\1\46\1\13\1\12\1\17"+
-            "\1\36\5\53\1\24\1\44\1\25\uff82\57",
+            "\11\57\2\56\2\57\1\56\22\57\1\56\1\2\1\54\3\57\1\50\1\55\1\34\1\35\1\7\1\5\1\32\1\6\1\43\1\10\12\51\1\40\1\27\1\4\1\1\1\3\1\42\1\33\2\53\1\20\3\53\1\45\4\53\1\21\6\53\1\22\7\53\1\30\1\57\1\31\1\52\1\53\1\57\1\26\1\53\1\11\1\37\1\14\1\16\2\53\1\23\2\53\1\41\1\53\1\15\1\47\1\53\1\46\1\13\1\12\1\17\1\36\5\53\1\24\1\44\1\25\uff82\57",
             "\1\60",
             "\1\62",
             "\1\64",
@@ -3000,8 +2923,7 @@ public void mTokens() throws RecognitionException {
             "\1\u00fc",
             "\1\u00fd",
             "\1\u00fe",
-            "\12\101\7\uffff\5\101\1\u00ff\24\101\4\uffff\1\101\1\uffff"+
-            "\32\101",
+            "\12\101\7\uffff\5\101\1\u00ff\24\101\4\uffff\1\101\1\uffff\32\101",
             "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101",
             "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101",
             "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101",
diff --git a/com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExportParser.java b/com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExportParser.java
index 190155cd3..9f87dc410 100644
--- a/com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExportParser.java
+++ b/com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExportParser.java
@@ -119,7 +119,7 @@ public InternalExportParser(TokenStream input, RecognizerSharedState state) {
         
 
     public String[] getTokenNames() { return InternalExportParser.tokenNames; }
-    public String getGrammarFileName() { return "../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g"; }
+    public String getGrammarFileName() { return "InternalExport.g"; }
 
 
      
@@ -143,16 +143,16 @@ protected String getValueForTokenName(String tokenName) {
 
 
     // $ANTLR start "entryRuleExportModel"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:61:1: entryRuleExportModel : ruleExportModel EOF ;
+    // InternalExport.g:61:1: entryRuleExportModel : ruleExportModel EOF ;
     public final void entryRuleExportModel() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:62:1: ( ruleExportModel EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:63:1: ruleExportModel EOF
+            // InternalExport.g:62:1: ( ruleExportModel EOF )
+            // InternalExport.g:63:1: ruleExportModel EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportModelRule()); 
             }
-            pushFollow(FOLLOW_ruleExportModel_in_entryRuleExportModel67);
+            pushFollow(FOLLOW_1);
             ruleExportModel();
 
             state._fsp--;
@@ -160,7 +160,7 @@ public final void entryRuleExportModel() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExportModelRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleExportModel74); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -177,25 +177,25 @@ public final void entryRuleExportModel() throws RecognitionException {
 
 
     // $ANTLR start "ruleExportModel"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:70:1: ruleExportModel : ( ( rule__ExportModel__Group__0 ) ) ;
+    // InternalExport.g:70:1: ruleExportModel : ( ( rule__ExportModel__Group__0 ) ) ;
     public final void ruleExportModel() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:74:2: ( ( ( rule__ExportModel__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:75:1: ( ( rule__ExportModel__Group__0 ) )
+            // InternalExport.g:74:2: ( ( ( rule__ExportModel__Group__0 ) ) )
+            // InternalExport.g:75:1: ( ( rule__ExportModel__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:75:1: ( ( rule__ExportModel__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:76:1: ( rule__ExportModel__Group__0 )
+            // InternalExport.g:75:1: ( ( rule__ExportModel__Group__0 ) )
+            // InternalExport.g:76:1: ( rule__ExportModel__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportModelAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:77:1: ( rule__ExportModel__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:77:2: rule__ExportModel__Group__0
+            // InternalExport.g:77:1: ( rule__ExportModel__Group__0 )
+            // InternalExport.g:77:2: rule__ExportModel__Group__0
             {
-            pushFollow(FOLLOW_rule__ExportModel__Group__0_in_ruleExportModel100);
+            pushFollow(FOLLOW_2);
             rule__ExportModel__Group__0();
 
             state._fsp--;
@@ -228,16 +228,16 @@ public final void ruleExportModel() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleImport"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:89:1: entryRuleImport : ruleImport EOF ;
+    // InternalExport.g:89:1: entryRuleImport : ruleImport EOF ;
     public final void entryRuleImport() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:90:1: ( ruleImport EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:91:1: ruleImport EOF
+            // InternalExport.g:90:1: ( ruleImport EOF )
+            // InternalExport.g:91:1: ruleImport EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImportRule()); 
             }
-            pushFollow(FOLLOW_ruleImport_in_entryRuleImport127);
+            pushFollow(FOLLOW_1);
             ruleImport();
 
             state._fsp--;
@@ -245,7 +245,7 @@ public final void entryRuleImport() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getImportRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleImport134); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -262,25 +262,25 @@ public final void entryRuleImport() throws RecognitionException {
 
 
     // $ANTLR start "ruleImport"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:98:1: ruleImport : ( ( rule__Import__Group__0 ) ) ;
+    // InternalExport.g:98:1: ruleImport : ( ( rule__Import__Group__0 ) ) ;
     public final void ruleImport() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:102:2: ( ( ( rule__Import__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:103:1: ( ( rule__Import__Group__0 ) )
+            // InternalExport.g:102:2: ( ( ( rule__Import__Group__0 ) ) )
+            // InternalExport.g:103:1: ( ( rule__Import__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:103:1: ( ( rule__Import__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:104:1: ( rule__Import__Group__0 )
+            // InternalExport.g:103:1: ( ( rule__Import__Group__0 ) )
+            // InternalExport.g:104:1: ( rule__Import__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImportAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:105:1: ( rule__Import__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:105:2: rule__Import__Group__0
+            // InternalExport.g:105:1: ( rule__Import__Group__0 )
+            // InternalExport.g:105:2: rule__Import__Group__0
             {
-            pushFollow(FOLLOW_rule__Import__Group__0_in_ruleImport160);
+            pushFollow(FOLLOW_2);
             rule__Import__Group__0();
 
             state._fsp--;
@@ -313,16 +313,16 @@ public final void ruleImport() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleExtension"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:117:1: entryRuleExtension : ruleExtension EOF ;
+    // InternalExport.g:117:1: entryRuleExtension : ruleExtension EOF ;
     public final void entryRuleExtension() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:118:1: ( ruleExtension EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:119:1: ruleExtension EOF
+            // InternalExport.g:118:1: ( ruleExtension EOF )
+            // InternalExport.g:119:1: ruleExtension EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExtensionRule()); 
             }
-            pushFollow(FOLLOW_ruleExtension_in_entryRuleExtension187);
+            pushFollow(FOLLOW_1);
             ruleExtension();
 
             state._fsp--;
@@ -330,7 +330,7 @@ public final void entryRuleExtension() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExtensionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleExtension194); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -347,25 +347,25 @@ public final void entryRuleExtension() throws RecognitionException {
 
 
     // $ANTLR start "ruleExtension"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:126:1: ruleExtension : ( ( rule__Extension__Group__0 ) ) ;
+    // InternalExport.g:126:1: ruleExtension : ( ( rule__Extension__Group__0 ) ) ;
     public final void ruleExtension() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:130:2: ( ( ( rule__Extension__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:131:1: ( ( rule__Extension__Group__0 ) )
+            // InternalExport.g:130:2: ( ( ( rule__Extension__Group__0 ) ) )
+            // InternalExport.g:131:1: ( ( rule__Extension__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:131:1: ( ( rule__Extension__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:132:1: ( rule__Extension__Group__0 )
+            // InternalExport.g:131:1: ( ( rule__Extension__Group__0 ) )
+            // InternalExport.g:132:1: ( rule__Extension__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExtensionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:133:1: ( rule__Extension__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:133:2: rule__Extension__Group__0
+            // InternalExport.g:133:1: ( rule__Extension__Group__0 )
+            // InternalExport.g:133:2: rule__Extension__Group__0
             {
-            pushFollow(FOLLOW_rule__Extension__Group__0_in_ruleExtension220);
+            pushFollow(FOLLOW_2);
             rule__Extension__Group__0();
 
             state._fsp--;
@@ -398,16 +398,16 @@ public final void ruleExtension() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleInterface"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:147:1: entryRuleInterface : ruleInterface EOF ;
+    // InternalExport.g:147:1: entryRuleInterface : ruleInterface EOF ;
     public final void entryRuleInterface() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:148:1: ( ruleInterface EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:149:1: ruleInterface EOF
+            // InternalExport.g:148:1: ( ruleInterface EOF )
+            // InternalExport.g:149:1: ruleInterface EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceRule()); 
             }
-            pushFollow(FOLLOW_ruleInterface_in_entryRuleInterface249);
+            pushFollow(FOLLOW_1);
             ruleInterface();
 
             state._fsp--;
@@ -415,7 +415,7 @@ public final void entryRuleInterface() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInterfaceRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInterface256); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -432,25 +432,25 @@ public final void entryRuleInterface() throws RecognitionException {
 
 
     // $ANTLR start "ruleInterface"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:156:1: ruleInterface : ( ( rule__Interface__Group__0 ) ) ;
+    // InternalExport.g:156:1: ruleInterface : ( ( rule__Interface__Group__0 ) ) ;
     public final void ruleInterface() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:160:2: ( ( ( rule__Interface__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:161:1: ( ( rule__Interface__Group__0 ) )
+            // InternalExport.g:160:2: ( ( ( rule__Interface__Group__0 ) ) )
+            // InternalExport.g:161:1: ( ( rule__Interface__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:161:1: ( ( rule__Interface__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:162:1: ( rule__Interface__Group__0 )
+            // InternalExport.g:161:1: ( ( rule__Interface__Group__0 ) )
+            // InternalExport.g:162:1: ( rule__Interface__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:163:1: ( rule__Interface__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:163:2: rule__Interface__Group__0
+            // InternalExport.g:163:1: ( rule__Interface__Group__0 )
+            // InternalExport.g:163:2: rule__Interface__Group__0
             {
-            pushFollow(FOLLOW_rule__Interface__Group__0_in_ruleInterface282);
+            pushFollow(FOLLOW_2);
             rule__Interface__Group__0();
 
             state._fsp--;
@@ -483,16 +483,16 @@ public final void ruleInterface() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleInterfaceItem"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:175:1: entryRuleInterfaceItem : ruleInterfaceItem EOF ;
+    // InternalExport.g:175:1: entryRuleInterfaceItem : ruleInterfaceItem EOF ;
     public final void entryRuleInterfaceItem() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:176:1: ( ruleInterfaceItem EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:177:1: ruleInterfaceItem EOF
+            // InternalExport.g:176:1: ( ruleInterfaceItem EOF )
+            // InternalExport.g:177:1: ruleInterfaceItem EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceItemRule()); 
             }
-            pushFollow(FOLLOW_ruleInterfaceItem_in_entryRuleInterfaceItem309);
+            pushFollow(FOLLOW_1);
             ruleInterfaceItem();
 
             state._fsp--;
@@ -500,7 +500,7 @@ public final void entryRuleInterfaceItem() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInterfaceItemRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInterfaceItem316); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -517,25 +517,25 @@ public final void entryRuleInterfaceItem() throws RecognitionException {
 
 
     // $ANTLR start "ruleInterfaceItem"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:184:1: ruleInterfaceItem : ( ( rule__InterfaceItem__Alternatives ) ) ;
+    // InternalExport.g:184:1: ruleInterfaceItem : ( ( rule__InterfaceItem__Alternatives ) ) ;
     public final void ruleInterfaceItem() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:188:2: ( ( ( rule__InterfaceItem__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:189:1: ( ( rule__InterfaceItem__Alternatives ) )
+            // InternalExport.g:188:2: ( ( ( rule__InterfaceItem__Alternatives ) ) )
+            // InternalExport.g:189:1: ( ( rule__InterfaceItem__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:189:1: ( ( rule__InterfaceItem__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:190:1: ( rule__InterfaceItem__Alternatives )
+            // InternalExport.g:189:1: ( ( rule__InterfaceItem__Alternatives ) )
+            // InternalExport.g:190:1: ( rule__InterfaceItem__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceItemAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:191:1: ( rule__InterfaceItem__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:191:2: rule__InterfaceItem__Alternatives
+            // InternalExport.g:191:1: ( rule__InterfaceItem__Alternatives )
+            // InternalExport.g:191:2: rule__InterfaceItem__Alternatives
             {
-            pushFollow(FOLLOW_rule__InterfaceItem__Alternatives_in_ruleInterfaceItem342);
+            pushFollow(FOLLOW_2);
             rule__InterfaceItem__Alternatives();
 
             state._fsp--;
@@ -568,16 +568,16 @@ public final void ruleInterfaceItem() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleInterfaceField"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:203:1: entryRuleInterfaceField : ruleInterfaceField EOF ;
+    // InternalExport.g:203:1: entryRuleInterfaceField : ruleInterfaceField EOF ;
     public final void entryRuleInterfaceField() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:204:1: ( ruleInterfaceField EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:205:1: ruleInterfaceField EOF
+            // InternalExport.g:204:1: ( ruleInterfaceField EOF )
+            // InternalExport.g:205:1: ruleInterfaceField EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceFieldRule()); 
             }
-            pushFollow(FOLLOW_ruleInterfaceField_in_entryRuleInterfaceField369);
+            pushFollow(FOLLOW_1);
             ruleInterfaceField();
 
             state._fsp--;
@@ -585,7 +585,7 @@ public final void entryRuleInterfaceField() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInterfaceFieldRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInterfaceField376); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -602,25 +602,25 @@ public final void entryRuleInterfaceField() throws RecognitionException {
 
 
     // $ANTLR start "ruleInterfaceField"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:212:1: ruleInterfaceField : ( ( rule__InterfaceField__Group__0 ) ) ;
+    // InternalExport.g:212:1: ruleInterfaceField : ( ( rule__InterfaceField__Group__0 ) ) ;
     public final void ruleInterfaceField() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:216:2: ( ( ( rule__InterfaceField__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:217:1: ( ( rule__InterfaceField__Group__0 ) )
+            // InternalExport.g:216:2: ( ( ( rule__InterfaceField__Group__0 ) ) )
+            // InternalExport.g:217:1: ( ( rule__InterfaceField__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:217:1: ( ( rule__InterfaceField__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:218:1: ( rule__InterfaceField__Group__0 )
+            // InternalExport.g:217:1: ( ( rule__InterfaceField__Group__0 ) )
+            // InternalExport.g:218:1: ( rule__InterfaceField__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceFieldAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:219:1: ( rule__InterfaceField__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:219:2: rule__InterfaceField__Group__0
+            // InternalExport.g:219:1: ( rule__InterfaceField__Group__0 )
+            // InternalExport.g:219:2: rule__InterfaceField__Group__0
             {
-            pushFollow(FOLLOW_rule__InterfaceField__Group__0_in_ruleInterfaceField402);
+            pushFollow(FOLLOW_2);
             rule__InterfaceField__Group__0();
 
             state._fsp--;
@@ -653,16 +653,16 @@ public final void ruleInterfaceField() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleInterfaceNavigation"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:231:1: entryRuleInterfaceNavigation : ruleInterfaceNavigation EOF ;
+    // InternalExport.g:231:1: entryRuleInterfaceNavigation : ruleInterfaceNavigation EOF ;
     public final void entryRuleInterfaceNavigation() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:232:1: ( ruleInterfaceNavigation EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:233:1: ruleInterfaceNavigation EOF
+            // InternalExport.g:232:1: ( ruleInterfaceNavigation EOF )
+            // InternalExport.g:233:1: ruleInterfaceNavigation EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceNavigationRule()); 
             }
-            pushFollow(FOLLOW_ruleInterfaceNavigation_in_entryRuleInterfaceNavigation429);
+            pushFollow(FOLLOW_1);
             ruleInterfaceNavigation();
 
             state._fsp--;
@@ -670,7 +670,7 @@ public final void entryRuleInterfaceNavigation() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInterfaceNavigationRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInterfaceNavigation436); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -687,25 +687,25 @@ public final void entryRuleInterfaceNavigation() throws RecognitionException {
 
 
     // $ANTLR start "ruleInterfaceNavigation"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:240:1: ruleInterfaceNavigation : ( ( rule__InterfaceNavigation__Group__0 ) ) ;
+    // InternalExport.g:240:1: ruleInterfaceNavigation : ( ( rule__InterfaceNavigation__Group__0 ) ) ;
     public final void ruleInterfaceNavigation() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:244:2: ( ( ( rule__InterfaceNavigation__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:245:1: ( ( rule__InterfaceNavigation__Group__0 ) )
+            // InternalExport.g:244:2: ( ( ( rule__InterfaceNavigation__Group__0 ) ) )
+            // InternalExport.g:245:1: ( ( rule__InterfaceNavigation__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:245:1: ( ( rule__InterfaceNavigation__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:246:1: ( rule__InterfaceNavigation__Group__0 )
+            // InternalExport.g:245:1: ( ( rule__InterfaceNavigation__Group__0 ) )
+            // InternalExport.g:246:1: ( rule__InterfaceNavigation__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceNavigationAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:247:1: ( rule__InterfaceNavigation__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:247:2: rule__InterfaceNavigation__Group__0
+            // InternalExport.g:247:1: ( rule__InterfaceNavigation__Group__0 )
+            // InternalExport.g:247:2: rule__InterfaceNavigation__Group__0
             {
-            pushFollow(FOLLOW_rule__InterfaceNavigation__Group__0_in_ruleInterfaceNavigation462);
+            pushFollow(FOLLOW_2);
             rule__InterfaceNavigation__Group__0();
 
             state._fsp--;
@@ -738,16 +738,16 @@ public final void ruleInterfaceNavigation() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleInterfaceExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:259:1: entryRuleInterfaceExpression : ruleInterfaceExpression EOF ;
+    // InternalExport.g:259:1: entryRuleInterfaceExpression : ruleInterfaceExpression EOF ;
     public final void entryRuleInterfaceExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:260:1: ( ruleInterfaceExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:261:1: ruleInterfaceExpression EOF
+            // InternalExport.g:260:1: ( ruleInterfaceExpression EOF )
+            // InternalExport.g:261:1: ruleInterfaceExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleInterfaceExpression_in_entryRuleInterfaceExpression489);
+            pushFollow(FOLLOW_1);
             ruleInterfaceExpression();
 
             state._fsp--;
@@ -755,7 +755,7 @@ public final void entryRuleInterfaceExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInterfaceExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInterfaceExpression496); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -772,25 +772,25 @@ public final void entryRuleInterfaceExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleInterfaceExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:268:1: ruleInterfaceExpression : ( ( rule__InterfaceExpression__Group__0 ) ) ;
+    // InternalExport.g:268:1: ruleInterfaceExpression : ( ( rule__InterfaceExpression__Group__0 ) ) ;
     public final void ruleInterfaceExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:272:2: ( ( ( rule__InterfaceExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:273:1: ( ( rule__InterfaceExpression__Group__0 ) )
+            // InternalExport.g:272:2: ( ( ( rule__InterfaceExpression__Group__0 ) ) )
+            // InternalExport.g:273:1: ( ( rule__InterfaceExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:273:1: ( ( rule__InterfaceExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:274:1: ( rule__InterfaceExpression__Group__0 )
+            // InternalExport.g:273:1: ( ( rule__InterfaceExpression__Group__0 ) )
+            // InternalExport.g:274:1: ( rule__InterfaceExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:275:1: ( rule__InterfaceExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:275:2: rule__InterfaceExpression__Group__0
+            // InternalExport.g:275:1: ( rule__InterfaceExpression__Group__0 )
+            // InternalExport.g:275:2: rule__InterfaceExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__InterfaceExpression__Group__0_in_ruleInterfaceExpression522);
+            pushFollow(FOLLOW_2);
             rule__InterfaceExpression__Group__0();
 
             state._fsp--;
@@ -823,16 +823,16 @@ public final void ruleInterfaceExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleExport"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:287:1: entryRuleExport : ruleExport EOF ;
+    // InternalExport.g:287:1: entryRuleExport : ruleExport EOF ;
     public final void entryRuleExport() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:288:1: ( ruleExport EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:289:1: ruleExport EOF
+            // InternalExport.g:288:1: ( ruleExport EOF )
+            // InternalExport.g:289:1: ruleExport EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportRule()); 
             }
-            pushFollow(FOLLOW_ruleExport_in_entryRuleExport549);
+            pushFollow(FOLLOW_1);
             ruleExport();
 
             state._fsp--;
@@ -840,7 +840,7 @@ public final void entryRuleExport() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExportRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleExport556); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -857,25 +857,25 @@ public final void entryRuleExport() throws RecognitionException {
 
 
     // $ANTLR start "ruleExport"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:296:1: ruleExport : ( ( rule__Export__Group__0 ) ) ;
+    // InternalExport.g:296:1: ruleExport : ( ( rule__Export__Group__0 ) ) ;
     public final void ruleExport() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:300:2: ( ( ( rule__Export__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:301:1: ( ( rule__Export__Group__0 ) )
+            // InternalExport.g:300:2: ( ( ( rule__Export__Group__0 ) ) )
+            // InternalExport.g:301:1: ( ( rule__Export__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:301:1: ( ( rule__Export__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:302:1: ( rule__Export__Group__0 )
+            // InternalExport.g:301:1: ( ( rule__Export__Group__0 ) )
+            // InternalExport.g:302:1: ( rule__Export__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:303:1: ( rule__Export__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:303:2: rule__Export__Group__0
+            // InternalExport.g:303:1: ( rule__Export__Group__0 )
+            // InternalExport.g:303:2: rule__Export__Group__0
             {
-            pushFollow(FOLLOW_rule__Export__Group__0_in_ruleExport582);
+            pushFollow(FOLLOW_2);
             rule__Export__Group__0();
 
             state._fsp--;
@@ -908,16 +908,16 @@ public final void ruleExport() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleUserData"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:315:1: entryRuleUserData : ruleUserData EOF ;
+    // InternalExport.g:315:1: entryRuleUserData : ruleUserData EOF ;
     public final void entryRuleUserData() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:316:1: ( ruleUserData EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:317:1: ruleUserData EOF
+            // InternalExport.g:316:1: ( ruleUserData EOF )
+            // InternalExport.g:317:1: ruleUserData EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getUserDataRule()); 
             }
-            pushFollow(FOLLOW_ruleUserData_in_entryRuleUserData609);
+            pushFollow(FOLLOW_1);
             ruleUserData();
 
             state._fsp--;
@@ -925,7 +925,7 @@ public final void entryRuleUserData() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getUserDataRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleUserData616); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -942,25 +942,25 @@ public final void entryRuleUserData() throws RecognitionException {
 
 
     // $ANTLR start "ruleUserData"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:324:1: ruleUserData : ( ( rule__UserData__Group__0 ) ) ;
+    // InternalExport.g:324:1: ruleUserData : ( ( rule__UserData__Group__0 ) ) ;
     public final void ruleUserData() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:328:2: ( ( ( rule__UserData__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:329:1: ( ( rule__UserData__Group__0 ) )
+            // InternalExport.g:328:2: ( ( ( rule__UserData__Group__0 ) ) )
+            // InternalExport.g:329:1: ( ( rule__UserData__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:329:1: ( ( rule__UserData__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:330:1: ( rule__UserData__Group__0 )
+            // InternalExport.g:329:1: ( ( rule__UserData__Group__0 ) )
+            // InternalExport.g:330:1: ( rule__UserData__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getUserDataAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:331:1: ( rule__UserData__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:331:2: rule__UserData__Group__0
+            // InternalExport.g:331:1: ( rule__UserData__Group__0 )
+            // InternalExport.g:331:2: rule__UserData__Group__0
             {
-            pushFollow(FOLLOW_rule__UserData__Group__0_in_ruleUserData642);
+            pushFollow(FOLLOW_2);
             rule__UserData__Group__0();
 
             state._fsp--;
@@ -993,16 +993,16 @@ public final void ruleUserData() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleAttribute"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:343:1: entryRuleAttribute : ruleAttribute EOF ;
+    // InternalExport.g:343:1: entryRuleAttribute : ruleAttribute EOF ;
     public final void entryRuleAttribute() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:344:1: ( ruleAttribute EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:345:1: ruleAttribute EOF
+            // InternalExport.g:344:1: ( ruleAttribute EOF )
+            // InternalExport.g:345:1: ruleAttribute EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttributeRule()); 
             }
-            pushFollow(FOLLOW_ruleAttribute_in_entryRuleAttribute669);
+            pushFollow(FOLLOW_1);
             ruleAttribute();
 
             state._fsp--;
@@ -1010,7 +1010,7 @@ public final void entryRuleAttribute() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getAttributeRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAttribute676); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1027,25 +1027,25 @@ public final void entryRuleAttribute() throws RecognitionException {
 
 
     // $ANTLR start "ruleAttribute"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:352:1: ruleAttribute : ( ( rule__Attribute__AttributeAssignment ) ) ;
+    // InternalExport.g:352:1: ruleAttribute : ( ( rule__Attribute__AttributeAssignment ) ) ;
     public final void ruleAttribute() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:356:2: ( ( ( rule__Attribute__AttributeAssignment ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:357:1: ( ( rule__Attribute__AttributeAssignment ) )
+            // InternalExport.g:356:2: ( ( ( rule__Attribute__AttributeAssignment ) ) )
+            // InternalExport.g:357:1: ( ( rule__Attribute__AttributeAssignment ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:357:1: ( ( rule__Attribute__AttributeAssignment ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:358:1: ( rule__Attribute__AttributeAssignment )
+            // InternalExport.g:357:1: ( ( rule__Attribute__AttributeAssignment ) )
+            // InternalExport.g:358:1: ( rule__Attribute__AttributeAssignment )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttributeAccess().getAttributeAssignment()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:359:1: ( rule__Attribute__AttributeAssignment )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:359:2: rule__Attribute__AttributeAssignment
+            // InternalExport.g:359:1: ( rule__Attribute__AttributeAssignment )
+            // InternalExport.g:359:2: rule__Attribute__AttributeAssignment
             {
-            pushFollow(FOLLOW_rule__Attribute__AttributeAssignment_in_ruleAttribute702);
+            pushFollow(FOLLOW_2);
             rule__Attribute__AttributeAssignment();
 
             state._fsp--;
@@ -1078,16 +1078,16 @@ public final void ruleAttribute() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleQualifiedID"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:371:1: entryRuleQualifiedID : ruleQualifiedID EOF ;
+    // InternalExport.g:371:1: entryRuleQualifiedID : ruleQualifiedID EOF ;
     public final void entryRuleQualifiedID() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:372:1: ( ruleQualifiedID EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:373:1: ruleQualifiedID EOF
+            // InternalExport.g:372:1: ( ruleQualifiedID EOF )
+            // InternalExport.g:373:1: ruleQualifiedID EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedIDRule()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedID_in_entryRuleQualifiedID729);
+            pushFollow(FOLLOW_1);
             ruleQualifiedID();
 
             state._fsp--;
@@ -1095,7 +1095,7 @@ public final void entryRuleQualifiedID() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getQualifiedIDRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedID736); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1112,25 +1112,25 @@ public final void entryRuleQualifiedID() throws RecognitionException {
 
 
     // $ANTLR start "ruleQualifiedID"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:380:1: ruleQualifiedID : ( ( rule__QualifiedID__Group__0 ) ) ;
+    // InternalExport.g:380:1: ruleQualifiedID : ( ( rule__QualifiedID__Group__0 ) ) ;
     public final void ruleQualifiedID() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:384:2: ( ( ( rule__QualifiedID__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:385:1: ( ( rule__QualifiedID__Group__0 ) )
+            // InternalExport.g:384:2: ( ( ( rule__QualifiedID__Group__0 ) ) )
+            // InternalExport.g:385:1: ( ( rule__QualifiedID__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:385:1: ( ( rule__QualifiedID__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:386:1: ( rule__QualifiedID__Group__0 )
+            // InternalExport.g:385:1: ( ( rule__QualifiedID__Group__0 ) )
+            // InternalExport.g:386:1: ( rule__QualifiedID__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedIDAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:387:1: ( rule__QualifiedID__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:387:2: rule__QualifiedID__Group__0
+            // InternalExport.g:387:1: ( rule__QualifiedID__Group__0 )
+            // InternalExport.g:387:2: rule__QualifiedID__Group__0
             {
-            pushFollow(FOLLOW_rule__QualifiedID__Group__0_in_ruleQualifiedID762);
+            pushFollow(FOLLOW_2);
             rule__QualifiedID__Group__0();
 
             state._fsp--;
@@ -1163,16 +1163,16 @@ public final void ruleQualifiedID() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:399:1: entryRuleExpression : ruleExpression EOF ;
+    // InternalExport.g:399:1: entryRuleExpression : ruleExpression EOF ;
     public final void entryRuleExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:400:1: ( ruleExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:401:1: ruleExpression EOF
+            // InternalExport.g:400:1: ( ruleExpression EOF )
+            // InternalExport.g:401:1: ruleExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_entryRuleExpression789);
+            pushFollow(FOLLOW_1);
             ruleExpression();
 
             state._fsp--;
@@ -1180,7 +1180,7 @@ public final void entryRuleExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleExpression796); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1197,25 +1197,25 @@ public final void entryRuleExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:408:1: ruleExpression : ( ( rule__Expression__Alternatives ) ) ;
+    // InternalExport.g:408:1: ruleExpression : ( ( rule__Expression__Alternatives ) ) ;
     public final void ruleExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:412:2: ( ( ( rule__Expression__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:413:1: ( ( rule__Expression__Alternatives ) )
+            // InternalExport.g:412:2: ( ( ( rule__Expression__Alternatives ) ) )
+            // InternalExport.g:413:1: ( ( rule__Expression__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:413:1: ( ( rule__Expression__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:414:1: ( rule__Expression__Alternatives )
+            // InternalExport.g:413:1: ( ( rule__Expression__Alternatives ) )
+            // InternalExport.g:414:1: ( rule__Expression__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExpressionAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:415:1: ( rule__Expression__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:415:2: rule__Expression__Alternatives
+            // InternalExport.g:415:1: ( rule__Expression__Alternatives )
+            // InternalExport.g:415:2: rule__Expression__Alternatives
             {
-            pushFollow(FOLLOW_rule__Expression__Alternatives_in_ruleExpression822);
+            pushFollow(FOLLOW_2);
             rule__Expression__Alternatives();
 
             state._fsp--;
@@ -1248,16 +1248,16 @@ public final void ruleExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleLetExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:429:1: entryRuleLetExpression : ruleLetExpression EOF ;
+    // InternalExport.g:429:1: entryRuleLetExpression : ruleLetExpression EOF ;
     public final void entryRuleLetExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:430:1: ( ruleLetExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:431:1: ruleLetExpression EOF
+            // InternalExport.g:430:1: ( ruleLetExpression EOF )
+            // InternalExport.g:431:1: ruleLetExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLetExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleLetExpression_in_entryRuleLetExpression851);
+            pushFollow(FOLLOW_1);
             ruleLetExpression();
 
             state._fsp--;
@@ -1265,7 +1265,7 @@ public final void entryRuleLetExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getLetExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleLetExpression858); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1282,25 +1282,25 @@ public final void entryRuleLetExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleLetExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:438:1: ruleLetExpression : ( ( rule__LetExpression__Group__0 ) ) ;
+    // InternalExport.g:438:1: ruleLetExpression : ( ( rule__LetExpression__Group__0 ) ) ;
     public final void ruleLetExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:442:2: ( ( ( rule__LetExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:443:1: ( ( rule__LetExpression__Group__0 ) )
+            // InternalExport.g:442:2: ( ( ( rule__LetExpression__Group__0 ) ) )
+            // InternalExport.g:443:1: ( ( rule__LetExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:443:1: ( ( rule__LetExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:444:1: ( rule__LetExpression__Group__0 )
+            // InternalExport.g:443:1: ( ( rule__LetExpression__Group__0 ) )
+            // InternalExport.g:444:1: ( rule__LetExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLetExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:445:1: ( rule__LetExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:445:2: rule__LetExpression__Group__0
+            // InternalExport.g:445:1: ( rule__LetExpression__Group__0 )
+            // InternalExport.g:445:2: rule__LetExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__LetExpression__Group__0_in_ruleLetExpression884);
+            pushFollow(FOLLOW_2);
             rule__LetExpression__Group__0();
 
             state._fsp--;
@@ -1333,16 +1333,16 @@ public final void ruleLetExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleCastedExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:457:1: entryRuleCastedExpression : ruleCastedExpression EOF ;
+    // InternalExport.g:457:1: entryRuleCastedExpression : ruleCastedExpression EOF ;
     public final void entryRuleCastedExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:458:1: ( ruleCastedExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:459:1: ruleCastedExpression EOF
+            // InternalExport.g:458:1: ( ruleCastedExpression EOF )
+            // InternalExport.g:459:1: ruleCastedExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCastedExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleCastedExpression_in_entryRuleCastedExpression911);
+            pushFollow(FOLLOW_1);
             ruleCastedExpression();
 
             state._fsp--;
@@ -1350,7 +1350,7 @@ public final void entryRuleCastedExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCastedExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleCastedExpression918); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1367,25 +1367,25 @@ public final void entryRuleCastedExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleCastedExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:466:1: ruleCastedExpression : ( ( rule__CastedExpression__Group__0 ) ) ;
+    // InternalExport.g:466:1: ruleCastedExpression : ( ( rule__CastedExpression__Group__0 ) ) ;
     public final void ruleCastedExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:470:2: ( ( ( rule__CastedExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:471:1: ( ( rule__CastedExpression__Group__0 ) )
+            // InternalExport.g:470:2: ( ( ( rule__CastedExpression__Group__0 ) ) )
+            // InternalExport.g:471:1: ( ( rule__CastedExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:471:1: ( ( rule__CastedExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:472:1: ( rule__CastedExpression__Group__0 )
+            // InternalExport.g:471:1: ( ( rule__CastedExpression__Group__0 ) )
+            // InternalExport.g:472:1: ( rule__CastedExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCastedExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:473:1: ( rule__CastedExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:473:2: rule__CastedExpression__Group__0
+            // InternalExport.g:473:1: ( rule__CastedExpression__Group__0 )
+            // InternalExport.g:473:2: rule__CastedExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__CastedExpression__Group__0_in_ruleCastedExpression944);
+            pushFollow(FOLLOW_2);
             rule__CastedExpression__Group__0();
 
             state._fsp--;
@@ -1418,16 +1418,16 @@ public final void ruleCastedExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleChainExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:485:1: entryRuleChainExpression : ruleChainExpression EOF ;
+    // InternalExport.g:485:1: entryRuleChainExpression : ruleChainExpression EOF ;
     public final void entryRuleChainExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:486:1: ( ruleChainExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:487:1: ruleChainExpression EOF
+            // InternalExport.g:486:1: ( ruleChainExpression EOF )
+            // InternalExport.g:487:1: ruleChainExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getChainExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleChainExpression_in_entryRuleChainExpression971);
+            pushFollow(FOLLOW_1);
             ruleChainExpression();
 
             state._fsp--;
@@ -1435,7 +1435,7 @@ public final void entryRuleChainExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getChainExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleChainExpression978); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1452,25 +1452,25 @@ public final void entryRuleChainExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleChainExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:494:1: ruleChainExpression : ( ( rule__ChainExpression__Group__0 ) ) ;
+    // InternalExport.g:494:1: ruleChainExpression : ( ( rule__ChainExpression__Group__0 ) ) ;
     public final void ruleChainExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:498:2: ( ( ( rule__ChainExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:499:1: ( ( rule__ChainExpression__Group__0 ) )
+            // InternalExport.g:498:2: ( ( ( rule__ChainExpression__Group__0 ) ) )
+            // InternalExport.g:499:1: ( ( rule__ChainExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:499:1: ( ( rule__ChainExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:500:1: ( rule__ChainExpression__Group__0 )
+            // InternalExport.g:499:1: ( ( rule__ChainExpression__Group__0 ) )
+            // InternalExport.g:500:1: ( rule__ChainExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getChainExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:501:1: ( rule__ChainExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:501:2: rule__ChainExpression__Group__0
+            // InternalExport.g:501:1: ( rule__ChainExpression__Group__0 )
+            // InternalExport.g:501:2: rule__ChainExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__ChainExpression__Group__0_in_ruleChainExpression1004);
+            pushFollow(FOLLOW_2);
             rule__ChainExpression__Group__0();
 
             state._fsp--;
@@ -1503,16 +1503,16 @@ public final void ruleChainExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleChainedExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:513:1: entryRuleChainedExpression : ruleChainedExpression EOF ;
+    // InternalExport.g:513:1: entryRuleChainedExpression : ruleChainedExpression EOF ;
     public final void entryRuleChainedExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:514:1: ( ruleChainedExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:515:1: ruleChainedExpression EOF
+            // InternalExport.g:514:1: ( ruleChainedExpression EOF )
+            // InternalExport.g:515:1: ruleChainedExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getChainedExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleChainedExpression_in_entryRuleChainedExpression1031);
+            pushFollow(FOLLOW_1);
             ruleChainedExpression();
 
             state._fsp--;
@@ -1520,7 +1520,7 @@ public final void entryRuleChainedExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getChainedExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleChainedExpression1038); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1537,25 +1537,25 @@ public final void entryRuleChainedExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleChainedExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:522:1: ruleChainedExpression : ( ( rule__ChainedExpression__Alternatives ) ) ;
+    // InternalExport.g:522:1: ruleChainedExpression : ( ( rule__ChainedExpression__Alternatives ) ) ;
     public final void ruleChainedExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:526:2: ( ( ( rule__ChainedExpression__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:527:1: ( ( rule__ChainedExpression__Alternatives ) )
+            // InternalExport.g:526:2: ( ( ( rule__ChainedExpression__Alternatives ) ) )
+            // InternalExport.g:527:1: ( ( rule__ChainedExpression__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:527:1: ( ( rule__ChainedExpression__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:528:1: ( rule__ChainedExpression__Alternatives )
+            // InternalExport.g:527:1: ( ( rule__ChainedExpression__Alternatives ) )
+            // InternalExport.g:528:1: ( rule__ChainedExpression__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getChainedExpressionAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:529:1: ( rule__ChainedExpression__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:529:2: rule__ChainedExpression__Alternatives
+            // InternalExport.g:529:1: ( rule__ChainedExpression__Alternatives )
+            // InternalExport.g:529:2: rule__ChainedExpression__Alternatives
             {
-            pushFollow(FOLLOW_rule__ChainedExpression__Alternatives_in_ruleChainedExpression1064);
+            pushFollow(FOLLOW_2);
             rule__ChainedExpression__Alternatives();
 
             state._fsp--;
@@ -1588,16 +1588,16 @@ public final void ruleChainedExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleIfExpressionTri"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:541:1: entryRuleIfExpressionTri : ruleIfExpressionTri EOF ;
+    // InternalExport.g:541:1: entryRuleIfExpressionTri : ruleIfExpressionTri EOF ;
     public final void entryRuleIfExpressionTri() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:542:1: ( ruleIfExpressionTri EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:543:1: ruleIfExpressionTri EOF
+            // InternalExport.g:542:1: ( ruleIfExpressionTri EOF )
+            // InternalExport.g:543:1: ruleIfExpressionTri EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionTriRule()); 
             }
-            pushFollow(FOLLOW_ruleIfExpressionTri_in_entryRuleIfExpressionTri1091);
+            pushFollow(FOLLOW_1);
             ruleIfExpressionTri();
 
             state._fsp--;
@@ -1605,7 +1605,7 @@ public final void entryRuleIfExpressionTri() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIfExpressionTriRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIfExpressionTri1098); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1622,25 +1622,25 @@ public final void entryRuleIfExpressionTri() throws RecognitionException {
 
 
     // $ANTLR start "ruleIfExpressionTri"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:550:1: ruleIfExpressionTri : ( ( rule__IfExpressionTri__Group__0 ) ) ;
+    // InternalExport.g:550:1: ruleIfExpressionTri : ( ( rule__IfExpressionTri__Group__0 ) ) ;
     public final void ruleIfExpressionTri() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:554:2: ( ( ( rule__IfExpressionTri__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:555:1: ( ( rule__IfExpressionTri__Group__0 ) )
+            // InternalExport.g:554:2: ( ( ( rule__IfExpressionTri__Group__0 ) ) )
+            // InternalExport.g:555:1: ( ( rule__IfExpressionTri__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:555:1: ( ( rule__IfExpressionTri__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:556:1: ( rule__IfExpressionTri__Group__0 )
+            // InternalExport.g:555:1: ( ( rule__IfExpressionTri__Group__0 ) )
+            // InternalExport.g:556:1: ( rule__IfExpressionTri__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionTriAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:557:1: ( rule__IfExpressionTri__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:557:2: rule__IfExpressionTri__Group__0
+            // InternalExport.g:557:1: ( rule__IfExpressionTri__Group__0 )
+            // InternalExport.g:557:2: rule__IfExpressionTri__Group__0
             {
-            pushFollow(FOLLOW_rule__IfExpressionTri__Group__0_in_ruleIfExpressionTri1124);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionTri__Group__0();
 
             state._fsp--;
@@ -1673,16 +1673,16 @@ public final void ruleIfExpressionTri() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleIfExpressionKw"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:569:1: entryRuleIfExpressionKw : ruleIfExpressionKw EOF ;
+    // InternalExport.g:569:1: entryRuleIfExpressionKw : ruleIfExpressionKw EOF ;
     public final void entryRuleIfExpressionKw() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:570:1: ( ruleIfExpressionKw EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:571:1: ruleIfExpressionKw EOF
+            // InternalExport.g:570:1: ( ruleIfExpressionKw EOF )
+            // InternalExport.g:571:1: ruleIfExpressionKw EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionKwRule()); 
             }
-            pushFollow(FOLLOW_ruleIfExpressionKw_in_entryRuleIfExpressionKw1151);
+            pushFollow(FOLLOW_1);
             ruleIfExpressionKw();
 
             state._fsp--;
@@ -1690,7 +1690,7 @@ public final void entryRuleIfExpressionKw() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIfExpressionKwRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIfExpressionKw1158); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1707,25 +1707,25 @@ public final void entryRuleIfExpressionKw() throws RecognitionException {
 
 
     // $ANTLR start "ruleIfExpressionKw"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:578:1: ruleIfExpressionKw : ( ( rule__IfExpressionKw__Group__0 ) ) ;
+    // InternalExport.g:578:1: ruleIfExpressionKw : ( ( rule__IfExpressionKw__Group__0 ) ) ;
     public final void ruleIfExpressionKw() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:582:2: ( ( ( rule__IfExpressionKw__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:583:1: ( ( rule__IfExpressionKw__Group__0 ) )
+            // InternalExport.g:582:2: ( ( ( rule__IfExpressionKw__Group__0 ) ) )
+            // InternalExport.g:583:1: ( ( rule__IfExpressionKw__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:583:1: ( ( rule__IfExpressionKw__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:584:1: ( rule__IfExpressionKw__Group__0 )
+            // InternalExport.g:583:1: ( ( rule__IfExpressionKw__Group__0 ) )
+            // InternalExport.g:584:1: ( rule__IfExpressionKw__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionKwAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:585:1: ( rule__IfExpressionKw__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:585:2: rule__IfExpressionKw__Group__0
+            // InternalExport.g:585:1: ( rule__IfExpressionKw__Group__0 )
+            // InternalExport.g:585:2: rule__IfExpressionKw__Group__0
             {
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group__0_in_ruleIfExpressionKw1184);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionKw__Group__0();
 
             state._fsp--;
@@ -1758,16 +1758,16 @@ public final void ruleIfExpressionKw() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleSwitchExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:597:1: entryRuleSwitchExpression : ruleSwitchExpression EOF ;
+    // InternalExport.g:597:1: entryRuleSwitchExpression : ruleSwitchExpression EOF ;
     public final void entryRuleSwitchExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:598:1: ( ruleSwitchExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:599:1: ruleSwitchExpression EOF
+            // InternalExport.g:598:1: ( ruleSwitchExpression EOF )
+            // InternalExport.g:599:1: ruleSwitchExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleSwitchExpression_in_entryRuleSwitchExpression1211);
+            pushFollow(FOLLOW_1);
             ruleSwitchExpression();
 
             state._fsp--;
@@ -1775,7 +1775,7 @@ public final void entryRuleSwitchExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSwitchExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSwitchExpression1218); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1792,25 +1792,25 @@ public final void entryRuleSwitchExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleSwitchExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:606:1: ruleSwitchExpression : ( ( rule__SwitchExpression__Group__0 ) ) ;
+    // InternalExport.g:606:1: ruleSwitchExpression : ( ( rule__SwitchExpression__Group__0 ) ) ;
     public final void ruleSwitchExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:610:2: ( ( ( rule__SwitchExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:611:1: ( ( rule__SwitchExpression__Group__0 ) )
+            // InternalExport.g:610:2: ( ( ( rule__SwitchExpression__Group__0 ) ) )
+            // InternalExport.g:611:1: ( ( rule__SwitchExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:611:1: ( ( rule__SwitchExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:612:1: ( rule__SwitchExpression__Group__0 )
+            // InternalExport.g:611:1: ( ( rule__SwitchExpression__Group__0 ) )
+            // InternalExport.g:612:1: ( rule__SwitchExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:613:1: ( rule__SwitchExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:613:2: rule__SwitchExpression__Group__0
+            // InternalExport.g:613:1: ( rule__SwitchExpression__Group__0 )
+            // InternalExport.g:613:2: rule__SwitchExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__0_in_ruleSwitchExpression1244);
+            pushFollow(FOLLOW_2);
             rule__SwitchExpression__Group__0();
 
             state._fsp--;
@@ -1843,16 +1843,16 @@ public final void ruleSwitchExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleCase"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:625:1: entryRuleCase : ruleCase EOF ;
+    // InternalExport.g:625:1: entryRuleCase : ruleCase EOF ;
     public final void entryRuleCase() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:626:1: ( ruleCase EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:627:1: ruleCase EOF
+            // InternalExport.g:626:1: ( ruleCase EOF )
+            // InternalExport.g:627:1: ruleCase EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCaseRule()); 
             }
-            pushFollow(FOLLOW_ruleCase_in_entryRuleCase1271);
+            pushFollow(FOLLOW_1);
             ruleCase();
 
             state._fsp--;
@@ -1860,7 +1860,7 @@ public final void entryRuleCase() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCaseRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleCase1278); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1877,25 +1877,25 @@ public final void entryRuleCase() throws RecognitionException {
 
 
     // $ANTLR start "ruleCase"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:634:1: ruleCase : ( ( rule__Case__Group__0 ) ) ;
+    // InternalExport.g:634:1: ruleCase : ( ( rule__Case__Group__0 ) ) ;
     public final void ruleCase() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:638:2: ( ( ( rule__Case__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:639:1: ( ( rule__Case__Group__0 ) )
+            // InternalExport.g:638:2: ( ( ( rule__Case__Group__0 ) ) )
+            // InternalExport.g:639:1: ( ( rule__Case__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:639:1: ( ( rule__Case__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:640:1: ( rule__Case__Group__0 )
+            // InternalExport.g:639:1: ( ( rule__Case__Group__0 ) )
+            // InternalExport.g:640:1: ( rule__Case__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCaseAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:641:1: ( rule__Case__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:641:2: rule__Case__Group__0
+            // InternalExport.g:641:1: ( rule__Case__Group__0 )
+            // InternalExport.g:641:2: rule__Case__Group__0
             {
-            pushFollow(FOLLOW_rule__Case__Group__0_in_ruleCase1304);
+            pushFollow(FOLLOW_2);
             rule__Case__Group__0();
 
             state._fsp--;
@@ -1928,16 +1928,16 @@ public final void ruleCase() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOrExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:653:1: entryRuleOrExpression : ruleOrExpression EOF ;
+    // InternalExport.g:653:1: entryRuleOrExpression : ruleOrExpression EOF ;
     public final void entryRuleOrExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:654:1: ( ruleOrExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:655:1: ruleOrExpression EOF
+            // InternalExport.g:654:1: ( ruleOrExpression EOF )
+            // InternalExport.g:655:1: ruleOrExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOrExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleOrExpression_in_entryRuleOrExpression1331);
+            pushFollow(FOLLOW_1);
             ruleOrExpression();
 
             state._fsp--;
@@ -1945,7 +1945,7 @@ public final void entryRuleOrExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOrExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOrExpression1338); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1962,25 +1962,25 @@ public final void entryRuleOrExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleOrExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:662:1: ruleOrExpression : ( ( rule__OrExpression__Group__0 ) ) ;
+    // InternalExport.g:662:1: ruleOrExpression : ( ( rule__OrExpression__Group__0 ) ) ;
     public final void ruleOrExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:666:2: ( ( ( rule__OrExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:667:1: ( ( rule__OrExpression__Group__0 ) )
+            // InternalExport.g:666:2: ( ( ( rule__OrExpression__Group__0 ) ) )
+            // InternalExport.g:667:1: ( ( rule__OrExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:667:1: ( ( rule__OrExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:668:1: ( rule__OrExpression__Group__0 )
+            // InternalExport.g:667:1: ( ( rule__OrExpression__Group__0 ) )
+            // InternalExport.g:668:1: ( rule__OrExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOrExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:669:1: ( rule__OrExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:669:2: rule__OrExpression__Group__0
+            // InternalExport.g:669:1: ( rule__OrExpression__Group__0 )
+            // InternalExport.g:669:2: rule__OrExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__OrExpression__Group__0_in_ruleOrExpression1364);
+            pushFollow(FOLLOW_2);
             rule__OrExpression__Group__0();
 
             state._fsp--;
@@ -2013,16 +2013,16 @@ public final void ruleOrExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleAndExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:681:1: entryRuleAndExpression : ruleAndExpression EOF ;
+    // InternalExport.g:681:1: entryRuleAndExpression : ruleAndExpression EOF ;
     public final void entryRuleAndExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:682:1: ( ruleAndExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:683:1: ruleAndExpression EOF
+            // InternalExport.g:682:1: ( ruleAndExpression EOF )
+            // InternalExport.g:683:1: ruleAndExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAndExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleAndExpression_in_entryRuleAndExpression1391);
+            pushFollow(FOLLOW_1);
             ruleAndExpression();
 
             state._fsp--;
@@ -2030,7 +2030,7 @@ public final void entryRuleAndExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getAndExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAndExpression1398); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2047,25 +2047,25 @@ public final void entryRuleAndExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleAndExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:690:1: ruleAndExpression : ( ( rule__AndExpression__Group__0 ) ) ;
+    // InternalExport.g:690:1: ruleAndExpression : ( ( rule__AndExpression__Group__0 ) ) ;
     public final void ruleAndExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:694:2: ( ( ( rule__AndExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:695:1: ( ( rule__AndExpression__Group__0 ) )
+            // InternalExport.g:694:2: ( ( ( rule__AndExpression__Group__0 ) ) )
+            // InternalExport.g:695:1: ( ( rule__AndExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:695:1: ( ( rule__AndExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:696:1: ( rule__AndExpression__Group__0 )
+            // InternalExport.g:695:1: ( ( rule__AndExpression__Group__0 ) )
+            // InternalExport.g:696:1: ( rule__AndExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAndExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:697:1: ( rule__AndExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:697:2: rule__AndExpression__Group__0
+            // InternalExport.g:697:1: ( rule__AndExpression__Group__0 )
+            // InternalExport.g:697:2: rule__AndExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__AndExpression__Group__0_in_ruleAndExpression1424);
+            pushFollow(FOLLOW_2);
             rule__AndExpression__Group__0();
 
             state._fsp--;
@@ -2098,16 +2098,16 @@ public final void ruleAndExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleImpliesExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:709:1: entryRuleImpliesExpression : ruleImpliesExpression EOF ;
+    // InternalExport.g:709:1: entryRuleImpliesExpression : ruleImpliesExpression EOF ;
     public final void entryRuleImpliesExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:710:1: ( ruleImpliesExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:711:1: ruleImpliesExpression EOF
+            // InternalExport.g:710:1: ( ruleImpliesExpression EOF )
+            // InternalExport.g:711:1: ruleImpliesExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImpliesExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleImpliesExpression_in_entryRuleImpliesExpression1451);
+            pushFollow(FOLLOW_1);
             ruleImpliesExpression();
 
             state._fsp--;
@@ -2115,7 +2115,7 @@ public final void entryRuleImpliesExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getImpliesExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleImpliesExpression1458); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2132,25 +2132,25 @@ public final void entryRuleImpliesExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleImpliesExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:718:1: ruleImpliesExpression : ( ( rule__ImpliesExpression__Group__0 ) ) ;
+    // InternalExport.g:718:1: ruleImpliesExpression : ( ( rule__ImpliesExpression__Group__0 ) ) ;
     public final void ruleImpliesExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:722:2: ( ( ( rule__ImpliesExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:723:1: ( ( rule__ImpliesExpression__Group__0 ) )
+            // InternalExport.g:722:2: ( ( ( rule__ImpliesExpression__Group__0 ) ) )
+            // InternalExport.g:723:1: ( ( rule__ImpliesExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:723:1: ( ( rule__ImpliesExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:724:1: ( rule__ImpliesExpression__Group__0 )
+            // InternalExport.g:723:1: ( ( rule__ImpliesExpression__Group__0 ) )
+            // InternalExport.g:724:1: ( rule__ImpliesExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImpliesExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:725:1: ( rule__ImpliesExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:725:2: rule__ImpliesExpression__Group__0
+            // InternalExport.g:725:1: ( rule__ImpliesExpression__Group__0 )
+            // InternalExport.g:725:2: rule__ImpliesExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__ImpliesExpression__Group__0_in_ruleImpliesExpression1484);
+            pushFollow(FOLLOW_2);
             rule__ImpliesExpression__Group__0();
 
             state._fsp--;
@@ -2183,16 +2183,16 @@ public final void ruleImpliesExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleRelationalExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:737:1: entryRuleRelationalExpression : ruleRelationalExpression EOF ;
+    // InternalExport.g:737:1: entryRuleRelationalExpression : ruleRelationalExpression EOF ;
     public final void entryRuleRelationalExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:738:1: ( ruleRelationalExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:739:1: ruleRelationalExpression EOF
+            // InternalExport.g:738:1: ( ruleRelationalExpression EOF )
+            // InternalExport.g:739:1: ruleRelationalExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRelationalExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleRelationalExpression_in_entryRuleRelationalExpression1511);
+            pushFollow(FOLLOW_1);
             ruleRelationalExpression();
 
             state._fsp--;
@@ -2200,7 +2200,7 @@ public final void entryRuleRelationalExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getRelationalExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRelationalExpression1518); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2217,25 +2217,25 @@ public final void entryRuleRelationalExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleRelationalExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:746:1: ruleRelationalExpression : ( ( rule__RelationalExpression__Group__0 ) ) ;
+    // InternalExport.g:746:1: ruleRelationalExpression : ( ( rule__RelationalExpression__Group__0 ) ) ;
     public final void ruleRelationalExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:750:2: ( ( ( rule__RelationalExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:751:1: ( ( rule__RelationalExpression__Group__0 ) )
+            // InternalExport.g:750:2: ( ( ( rule__RelationalExpression__Group__0 ) ) )
+            // InternalExport.g:751:1: ( ( rule__RelationalExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:751:1: ( ( rule__RelationalExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:752:1: ( rule__RelationalExpression__Group__0 )
+            // InternalExport.g:751:1: ( ( rule__RelationalExpression__Group__0 ) )
+            // InternalExport.g:752:1: ( rule__RelationalExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRelationalExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:753:1: ( rule__RelationalExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:753:2: rule__RelationalExpression__Group__0
+            // InternalExport.g:753:1: ( rule__RelationalExpression__Group__0 )
+            // InternalExport.g:753:2: rule__RelationalExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__RelationalExpression__Group__0_in_ruleRelationalExpression1544);
+            pushFollow(FOLLOW_2);
             rule__RelationalExpression__Group__0();
 
             state._fsp--;
@@ -2268,16 +2268,16 @@ public final void ruleRelationalExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleAdditiveExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:765:1: entryRuleAdditiveExpression : ruleAdditiveExpression EOF ;
+    // InternalExport.g:765:1: entryRuleAdditiveExpression : ruleAdditiveExpression EOF ;
     public final void entryRuleAdditiveExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:766:1: ( ruleAdditiveExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:767:1: ruleAdditiveExpression EOF
+            // InternalExport.g:766:1: ( ruleAdditiveExpression EOF )
+            // InternalExport.g:767:1: ruleAdditiveExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAdditiveExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleAdditiveExpression_in_entryRuleAdditiveExpression1571);
+            pushFollow(FOLLOW_1);
             ruleAdditiveExpression();
 
             state._fsp--;
@@ -2285,7 +2285,7 @@ public final void entryRuleAdditiveExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getAdditiveExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAdditiveExpression1578); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2302,25 +2302,25 @@ public final void entryRuleAdditiveExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleAdditiveExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:774:1: ruleAdditiveExpression : ( ( rule__AdditiveExpression__Group__0 ) ) ;
+    // InternalExport.g:774:1: ruleAdditiveExpression : ( ( rule__AdditiveExpression__Group__0 ) ) ;
     public final void ruleAdditiveExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:778:2: ( ( ( rule__AdditiveExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:779:1: ( ( rule__AdditiveExpression__Group__0 ) )
+            // InternalExport.g:778:2: ( ( ( rule__AdditiveExpression__Group__0 ) ) )
+            // InternalExport.g:779:1: ( ( rule__AdditiveExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:779:1: ( ( rule__AdditiveExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:780:1: ( rule__AdditiveExpression__Group__0 )
+            // InternalExport.g:779:1: ( ( rule__AdditiveExpression__Group__0 ) )
+            // InternalExport.g:780:1: ( rule__AdditiveExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAdditiveExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:781:1: ( rule__AdditiveExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:781:2: rule__AdditiveExpression__Group__0
+            // InternalExport.g:781:1: ( rule__AdditiveExpression__Group__0 )
+            // InternalExport.g:781:2: rule__AdditiveExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__AdditiveExpression__Group__0_in_ruleAdditiveExpression1604);
+            pushFollow(FOLLOW_2);
             rule__AdditiveExpression__Group__0();
 
             state._fsp--;
@@ -2353,16 +2353,16 @@ public final void ruleAdditiveExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleMultiplicativeExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:793:1: entryRuleMultiplicativeExpression : ruleMultiplicativeExpression EOF ;
+    // InternalExport.g:793:1: entryRuleMultiplicativeExpression : ruleMultiplicativeExpression EOF ;
     public final void entryRuleMultiplicativeExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:794:1: ( ruleMultiplicativeExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:795:1: ruleMultiplicativeExpression EOF
+            // InternalExport.g:794:1: ( ruleMultiplicativeExpression EOF )
+            // InternalExport.g:795:1: ruleMultiplicativeExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMultiplicativeExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleMultiplicativeExpression_in_entryRuleMultiplicativeExpression1631);
+            pushFollow(FOLLOW_1);
             ruleMultiplicativeExpression();
 
             state._fsp--;
@@ -2370,7 +2370,7 @@ public final void entryRuleMultiplicativeExpression() throws RecognitionExceptio
             if ( state.backtracking==0 ) {
                after(grammarAccess.getMultiplicativeExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleMultiplicativeExpression1638); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2387,25 +2387,25 @@ public final void entryRuleMultiplicativeExpression() throws RecognitionExceptio
 
 
     // $ANTLR start "ruleMultiplicativeExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:802:1: ruleMultiplicativeExpression : ( ( rule__MultiplicativeExpression__Group__0 ) ) ;
+    // InternalExport.g:802:1: ruleMultiplicativeExpression : ( ( rule__MultiplicativeExpression__Group__0 ) ) ;
     public final void ruleMultiplicativeExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:806:2: ( ( ( rule__MultiplicativeExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:807:1: ( ( rule__MultiplicativeExpression__Group__0 ) )
+            // InternalExport.g:806:2: ( ( ( rule__MultiplicativeExpression__Group__0 ) ) )
+            // InternalExport.g:807:1: ( ( rule__MultiplicativeExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:807:1: ( ( rule__MultiplicativeExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:808:1: ( rule__MultiplicativeExpression__Group__0 )
+            // InternalExport.g:807:1: ( ( rule__MultiplicativeExpression__Group__0 ) )
+            // InternalExport.g:808:1: ( rule__MultiplicativeExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMultiplicativeExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:809:1: ( rule__MultiplicativeExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:809:2: rule__MultiplicativeExpression__Group__0
+            // InternalExport.g:809:1: ( rule__MultiplicativeExpression__Group__0 )
+            // InternalExport.g:809:2: rule__MultiplicativeExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__MultiplicativeExpression__Group__0_in_ruleMultiplicativeExpression1664);
+            pushFollow(FOLLOW_2);
             rule__MultiplicativeExpression__Group__0();
 
             state._fsp--;
@@ -2438,16 +2438,16 @@ public final void ruleMultiplicativeExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleUnaryOrInfixExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:821:1: entryRuleUnaryOrInfixExpression : ruleUnaryOrInfixExpression EOF ;
+    // InternalExport.g:821:1: entryRuleUnaryOrInfixExpression : ruleUnaryOrInfixExpression EOF ;
     public final void entryRuleUnaryOrInfixExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:822:1: ( ruleUnaryOrInfixExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:823:1: ruleUnaryOrInfixExpression EOF
+            // InternalExport.g:822:1: ( ruleUnaryOrInfixExpression EOF )
+            // InternalExport.g:823:1: ruleUnaryOrInfixExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getUnaryOrInfixExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleUnaryOrInfixExpression_in_entryRuleUnaryOrInfixExpression1691);
+            pushFollow(FOLLOW_1);
             ruleUnaryOrInfixExpression();
 
             state._fsp--;
@@ -2455,7 +2455,7 @@ public final void entryRuleUnaryOrInfixExpression() throws RecognitionException
             if ( state.backtracking==0 ) {
                after(grammarAccess.getUnaryOrInfixExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleUnaryOrInfixExpression1698); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2472,25 +2472,25 @@ public final void entryRuleUnaryOrInfixExpression() throws RecognitionException
 
 
     // $ANTLR start "ruleUnaryOrInfixExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:830:1: ruleUnaryOrInfixExpression : ( ( rule__UnaryOrInfixExpression__Alternatives ) ) ;
+    // InternalExport.g:830:1: ruleUnaryOrInfixExpression : ( ( rule__UnaryOrInfixExpression__Alternatives ) ) ;
     public final void ruleUnaryOrInfixExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:834:2: ( ( ( rule__UnaryOrInfixExpression__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:835:1: ( ( rule__UnaryOrInfixExpression__Alternatives ) )
+            // InternalExport.g:834:2: ( ( ( rule__UnaryOrInfixExpression__Alternatives ) ) )
+            // InternalExport.g:835:1: ( ( rule__UnaryOrInfixExpression__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:835:1: ( ( rule__UnaryOrInfixExpression__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:836:1: ( rule__UnaryOrInfixExpression__Alternatives )
+            // InternalExport.g:835:1: ( ( rule__UnaryOrInfixExpression__Alternatives ) )
+            // InternalExport.g:836:1: ( rule__UnaryOrInfixExpression__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getUnaryOrInfixExpressionAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:837:1: ( rule__UnaryOrInfixExpression__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:837:2: rule__UnaryOrInfixExpression__Alternatives
+            // InternalExport.g:837:1: ( rule__UnaryOrInfixExpression__Alternatives )
+            // InternalExport.g:837:2: rule__UnaryOrInfixExpression__Alternatives
             {
-            pushFollow(FOLLOW_rule__UnaryOrInfixExpression__Alternatives_in_ruleUnaryOrInfixExpression1724);
+            pushFollow(FOLLOW_2);
             rule__UnaryOrInfixExpression__Alternatives();
 
             state._fsp--;
@@ -2523,16 +2523,16 @@ public final void ruleUnaryOrInfixExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleUnaryExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:849:1: entryRuleUnaryExpression : ruleUnaryExpression EOF ;
+    // InternalExport.g:849:1: entryRuleUnaryExpression : ruleUnaryExpression EOF ;
     public final void entryRuleUnaryExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:850:1: ( ruleUnaryExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:851:1: ruleUnaryExpression EOF
+            // InternalExport.g:850:1: ( ruleUnaryExpression EOF )
+            // InternalExport.g:851:1: ruleUnaryExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getUnaryExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleUnaryExpression_in_entryRuleUnaryExpression1751);
+            pushFollow(FOLLOW_1);
             ruleUnaryExpression();
 
             state._fsp--;
@@ -2540,7 +2540,7 @@ public final void entryRuleUnaryExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getUnaryExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleUnaryExpression1758); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2557,25 +2557,25 @@ public final void entryRuleUnaryExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleUnaryExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:858:1: ruleUnaryExpression : ( ( rule__UnaryExpression__Group__0 ) ) ;
+    // InternalExport.g:858:1: ruleUnaryExpression : ( ( rule__UnaryExpression__Group__0 ) ) ;
     public final void ruleUnaryExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:862:2: ( ( ( rule__UnaryExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:863:1: ( ( rule__UnaryExpression__Group__0 ) )
+            // InternalExport.g:862:2: ( ( ( rule__UnaryExpression__Group__0 ) ) )
+            // InternalExport.g:863:1: ( ( rule__UnaryExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:863:1: ( ( rule__UnaryExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:864:1: ( rule__UnaryExpression__Group__0 )
+            // InternalExport.g:863:1: ( ( rule__UnaryExpression__Group__0 ) )
+            // InternalExport.g:864:1: ( rule__UnaryExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getUnaryExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:865:1: ( rule__UnaryExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:865:2: rule__UnaryExpression__Group__0
+            // InternalExport.g:865:1: ( rule__UnaryExpression__Group__0 )
+            // InternalExport.g:865:2: rule__UnaryExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__UnaryExpression__Group__0_in_ruleUnaryExpression1784);
+            pushFollow(FOLLOW_2);
             rule__UnaryExpression__Group__0();
 
             state._fsp--;
@@ -2608,16 +2608,16 @@ public final void ruleUnaryExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleInfixExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:877:1: entryRuleInfixExpression : ruleInfixExpression EOF ;
+    // InternalExport.g:877:1: entryRuleInfixExpression : ruleInfixExpression EOF ;
     public final void entryRuleInfixExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:878:1: ( ruleInfixExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:879:1: ruleInfixExpression EOF
+            // InternalExport.g:878:1: ( ruleInfixExpression EOF )
+            // InternalExport.g:879:1: ruleInfixExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleInfixExpression_in_entryRuleInfixExpression1811);
+            pushFollow(FOLLOW_1);
             ruleInfixExpression();
 
             state._fsp--;
@@ -2625,7 +2625,7 @@ public final void entryRuleInfixExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInfixExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInfixExpression1818); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2642,25 +2642,25 @@ public final void entryRuleInfixExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleInfixExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:886:1: ruleInfixExpression : ( ( rule__InfixExpression__Group__0 ) ) ;
+    // InternalExport.g:886:1: ruleInfixExpression : ( ( rule__InfixExpression__Group__0 ) ) ;
     public final void ruleInfixExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:890:2: ( ( ( rule__InfixExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:891:1: ( ( rule__InfixExpression__Group__0 ) )
+            // InternalExport.g:890:2: ( ( ( rule__InfixExpression__Group__0 ) ) )
+            // InternalExport.g:891:1: ( ( rule__InfixExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:891:1: ( ( rule__InfixExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:892:1: ( rule__InfixExpression__Group__0 )
+            // InternalExport.g:891:1: ( ( rule__InfixExpression__Group__0 ) )
+            // InternalExport.g:892:1: ( rule__InfixExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:893:1: ( rule__InfixExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:893:2: rule__InfixExpression__Group__0
+            // InternalExport.g:893:1: ( rule__InfixExpression__Group__0 )
+            // InternalExport.g:893:2: rule__InfixExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group__0_in_ruleInfixExpression1844);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group__0();
 
             state._fsp--;
@@ -2693,16 +2693,16 @@ public final void ruleInfixExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRulePrimaryExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:905:1: entryRulePrimaryExpression : rulePrimaryExpression EOF ;
+    // InternalExport.g:905:1: entryRulePrimaryExpression : rulePrimaryExpression EOF ;
     public final void entryRulePrimaryExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:906:1: ( rulePrimaryExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:907:1: rulePrimaryExpression EOF
+            // InternalExport.g:906:1: ( rulePrimaryExpression EOF )
+            // InternalExport.g:907:1: rulePrimaryExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPrimaryExpressionRule()); 
             }
-            pushFollow(FOLLOW_rulePrimaryExpression_in_entryRulePrimaryExpression1871);
+            pushFollow(FOLLOW_1);
             rulePrimaryExpression();
 
             state._fsp--;
@@ -2710,7 +2710,7 @@ public final void entryRulePrimaryExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getPrimaryExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRulePrimaryExpression1878); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2727,25 +2727,25 @@ public final void entryRulePrimaryExpression() throws RecognitionException {
 
 
     // $ANTLR start "rulePrimaryExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:914:1: rulePrimaryExpression : ( ( rule__PrimaryExpression__Alternatives ) ) ;
+    // InternalExport.g:914:1: rulePrimaryExpression : ( ( rule__PrimaryExpression__Alternatives ) ) ;
     public final void rulePrimaryExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:918:2: ( ( ( rule__PrimaryExpression__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:919:1: ( ( rule__PrimaryExpression__Alternatives ) )
+            // InternalExport.g:918:2: ( ( ( rule__PrimaryExpression__Alternatives ) ) )
+            // InternalExport.g:919:1: ( ( rule__PrimaryExpression__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:919:1: ( ( rule__PrimaryExpression__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:920:1: ( rule__PrimaryExpression__Alternatives )
+            // InternalExport.g:919:1: ( ( rule__PrimaryExpression__Alternatives ) )
+            // InternalExport.g:920:1: ( rule__PrimaryExpression__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPrimaryExpressionAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:921:1: ( rule__PrimaryExpression__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:921:2: rule__PrimaryExpression__Alternatives
+            // InternalExport.g:921:1: ( rule__PrimaryExpression__Alternatives )
+            // InternalExport.g:921:2: rule__PrimaryExpression__Alternatives
             {
-            pushFollow(FOLLOW_rule__PrimaryExpression__Alternatives_in_rulePrimaryExpression1904);
+            pushFollow(FOLLOW_2);
             rule__PrimaryExpression__Alternatives();
 
             state._fsp--;
@@ -2778,16 +2778,16 @@ public final void rulePrimaryExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleLiteral"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:933:1: entryRuleLiteral : ruleLiteral EOF ;
+    // InternalExport.g:933:1: entryRuleLiteral : ruleLiteral EOF ;
     public final void entryRuleLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:934:1: ( ruleLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:935:1: ruleLiteral EOF
+            // InternalExport.g:934:1: ( ruleLiteral EOF )
+            // InternalExport.g:935:1: ruleLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleLiteral_in_entryRuleLiteral1931);
+            pushFollow(FOLLOW_1);
             ruleLiteral();
 
             state._fsp--;
@@ -2795,7 +2795,7 @@ public final void entryRuleLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleLiteral1938); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2812,25 +2812,25 @@ public final void entryRuleLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleLiteral"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:942:1: ruleLiteral : ( ( rule__Literal__Alternatives ) ) ;
+    // InternalExport.g:942:1: ruleLiteral : ( ( rule__Literal__Alternatives ) ) ;
     public final void ruleLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:946:2: ( ( ( rule__Literal__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:947:1: ( ( rule__Literal__Alternatives ) )
+            // InternalExport.g:946:2: ( ( ( rule__Literal__Alternatives ) ) )
+            // InternalExport.g:947:1: ( ( rule__Literal__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:947:1: ( ( rule__Literal__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:948:1: ( rule__Literal__Alternatives )
+            // InternalExport.g:947:1: ( ( rule__Literal__Alternatives ) )
+            // InternalExport.g:948:1: ( rule__Literal__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLiteralAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:949:1: ( rule__Literal__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:949:2: rule__Literal__Alternatives
+            // InternalExport.g:949:1: ( rule__Literal__Alternatives )
+            // InternalExport.g:949:2: rule__Literal__Alternatives
             {
-            pushFollow(FOLLOW_rule__Literal__Alternatives_in_ruleLiteral1964);
+            pushFollow(FOLLOW_2);
             rule__Literal__Alternatives();
 
             state._fsp--;
@@ -2863,16 +2863,16 @@ public final void ruleLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleBooleanLiteral"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:961:1: entryRuleBooleanLiteral : ruleBooleanLiteral EOF ;
+    // InternalExport.g:961:1: entryRuleBooleanLiteral : ruleBooleanLiteral EOF ;
     public final void entryRuleBooleanLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:962:1: ( ruleBooleanLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:963:1: ruleBooleanLiteral EOF
+            // InternalExport.g:962:1: ( ruleBooleanLiteral EOF )
+            // InternalExport.g:963:1: ruleBooleanLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getBooleanLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleBooleanLiteral_in_entryRuleBooleanLiteral1991);
+            pushFollow(FOLLOW_1);
             ruleBooleanLiteral();
 
             state._fsp--;
@@ -2880,7 +2880,7 @@ public final void entryRuleBooleanLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getBooleanLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleBooleanLiteral1998); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2897,25 +2897,25 @@ public final void entryRuleBooleanLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleBooleanLiteral"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:970:1: ruleBooleanLiteral : ( ( rule__BooleanLiteral__ValAssignment ) ) ;
+    // InternalExport.g:970:1: ruleBooleanLiteral : ( ( rule__BooleanLiteral__ValAssignment ) ) ;
     public final void ruleBooleanLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:974:2: ( ( ( rule__BooleanLiteral__ValAssignment ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:975:1: ( ( rule__BooleanLiteral__ValAssignment ) )
+            // InternalExport.g:974:2: ( ( ( rule__BooleanLiteral__ValAssignment ) ) )
+            // InternalExport.g:975:1: ( ( rule__BooleanLiteral__ValAssignment ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:975:1: ( ( rule__BooleanLiteral__ValAssignment ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:976:1: ( rule__BooleanLiteral__ValAssignment )
+            // InternalExport.g:975:1: ( ( rule__BooleanLiteral__ValAssignment ) )
+            // InternalExport.g:976:1: ( rule__BooleanLiteral__ValAssignment )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getBooleanLiteralAccess().getValAssignment()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:977:1: ( rule__BooleanLiteral__ValAssignment )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:977:2: rule__BooleanLiteral__ValAssignment
+            // InternalExport.g:977:1: ( rule__BooleanLiteral__ValAssignment )
+            // InternalExport.g:977:2: rule__BooleanLiteral__ValAssignment
             {
-            pushFollow(FOLLOW_rule__BooleanLiteral__ValAssignment_in_ruleBooleanLiteral2024);
+            pushFollow(FOLLOW_2);
             rule__BooleanLiteral__ValAssignment();
 
             state._fsp--;
@@ -2948,16 +2948,16 @@ public final void ruleBooleanLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleIntegerLiteral"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:989:1: entryRuleIntegerLiteral : ruleIntegerLiteral EOF ;
+    // InternalExport.g:989:1: entryRuleIntegerLiteral : ruleIntegerLiteral EOF ;
     public final void entryRuleIntegerLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:990:1: ( ruleIntegerLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:991:1: ruleIntegerLiteral EOF
+            // InternalExport.g:990:1: ( ruleIntegerLiteral EOF )
+            // InternalExport.g:991:1: ruleIntegerLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIntegerLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleIntegerLiteral_in_entryRuleIntegerLiteral2051);
+            pushFollow(FOLLOW_1);
             ruleIntegerLiteral();
 
             state._fsp--;
@@ -2965,7 +2965,7 @@ public final void entryRuleIntegerLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIntegerLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIntegerLiteral2058); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2982,25 +2982,25 @@ public final void entryRuleIntegerLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleIntegerLiteral"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:998:1: ruleIntegerLiteral : ( ( rule__IntegerLiteral__ValAssignment ) ) ;
+    // InternalExport.g:998:1: ruleIntegerLiteral : ( ( rule__IntegerLiteral__ValAssignment ) ) ;
     public final void ruleIntegerLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1002:2: ( ( ( rule__IntegerLiteral__ValAssignment ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1003:1: ( ( rule__IntegerLiteral__ValAssignment ) )
+            // InternalExport.g:1002:2: ( ( ( rule__IntegerLiteral__ValAssignment ) ) )
+            // InternalExport.g:1003:1: ( ( rule__IntegerLiteral__ValAssignment ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1003:1: ( ( rule__IntegerLiteral__ValAssignment ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1004:1: ( rule__IntegerLiteral__ValAssignment )
+            // InternalExport.g:1003:1: ( ( rule__IntegerLiteral__ValAssignment ) )
+            // InternalExport.g:1004:1: ( rule__IntegerLiteral__ValAssignment )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIntegerLiteralAccess().getValAssignment()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1005:1: ( rule__IntegerLiteral__ValAssignment )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1005:2: rule__IntegerLiteral__ValAssignment
+            // InternalExport.g:1005:1: ( rule__IntegerLiteral__ValAssignment )
+            // InternalExport.g:1005:2: rule__IntegerLiteral__ValAssignment
             {
-            pushFollow(FOLLOW_rule__IntegerLiteral__ValAssignment_in_ruleIntegerLiteral2084);
+            pushFollow(FOLLOW_2);
             rule__IntegerLiteral__ValAssignment();
 
             state._fsp--;
@@ -3033,16 +3033,16 @@ public final void ruleIntegerLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleNullLiteral"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1017:1: entryRuleNullLiteral : ruleNullLiteral EOF ;
+    // InternalExport.g:1017:1: entryRuleNullLiteral : ruleNullLiteral EOF ;
     public final void entryRuleNullLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1018:1: ( ruleNullLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1019:1: ruleNullLiteral EOF
+            // InternalExport.g:1018:1: ( ruleNullLiteral EOF )
+            // InternalExport.g:1019:1: ruleNullLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNullLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleNullLiteral_in_entryRuleNullLiteral2111);
+            pushFollow(FOLLOW_1);
             ruleNullLiteral();
 
             state._fsp--;
@@ -3050,7 +3050,7 @@ public final void entryRuleNullLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getNullLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNullLiteral2118); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3067,25 +3067,25 @@ public final void entryRuleNullLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleNullLiteral"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1026:1: ruleNullLiteral : ( ( rule__NullLiteral__ValAssignment ) ) ;
+    // InternalExport.g:1026:1: ruleNullLiteral : ( ( rule__NullLiteral__ValAssignment ) ) ;
     public final void ruleNullLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1030:2: ( ( ( rule__NullLiteral__ValAssignment ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1031:1: ( ( rule__NullLiteral__ValAssignment ) )
+            // InternalExport.g:1030:2: ( ( ( rule__NullLiteral__ValAssignment ) ) )
+            // InternalExport.g:1031:1: ( ( rule__NullLiteral__ValAssignment ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1031:1: ( ( rule__NullLiteral__ValAssignment ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1032:1: ( rule__NullLiteral__ValAssignment )
+            // InternalExport.g:1031:1: ( ( rule__NullLiteral__ValAssignment ) )
+            // InternalExport.g:1032:1: ( rule__NullLiteral__ValAssignment )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNullLiteralAccess().getValAssignment()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1033:1: ( rule__NullLiteral__ValAssignment )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1033:2: rule__NullLiteral__ValAssignment
+            // InternalExport.g:1033:1: ( rule__NullLiteral__ValAssignment )
+            // InternalExport.g:1033:2: rule__NullLiteral__ValAssignment
             {
-            pushFollow(FOLLOW_rule__NullLiteral__ValAssignment_in_ruleNullLiteral2144);
+            pushFollow(FOLLOW_2);
             rule__NullLiteral__ValAssignment();
 
             state._fsp--;
@@ -3118,16 +3118,16 @@ public final void ruleNullLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleRealLiteral"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1045:1: entryRuleRealLiteral : ruleRealLiteral EOF ;
+    // InternalExport.g:1045:1: entryRuleRealLiteral : ruleRealLiteral EOF ;
     public final void entryRuleRealLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1046:1: ( ruleRealLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1047:1: ruleRealLiteral EOF
+            // InternalExport.g:1046:1: ( ruleRealLiteral EOF )
+            // InternalExport.g:1047:1: ruleRealLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRealLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleRealLiteral_in_entryRuleRealLiteral2171);
+            pushFollow(FOLLOW_1);
             ruleRealLiteral();
 
             state._fsp--;
@@ -3135,7 +3135,7 @@ public final void entryRuleRealLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getRealLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRealLiteral2178); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3152,25 +3152,25 @@ public final void entryRuleRealLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleRealLiteral"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1054:1: ruleRealLiteral : ( ( rule__RealLiteral__ValAssignment ) ) ;
+    // InternalExport.g:1054:1: ruleRealLiteral : ( ( rule__RealLiteral__ValAssignment ) ) ;
     public final void ruleRealLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1058:2: ( ( ( rule__RealLiteral__ValAssignment ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1059:1: ( ( rule__RealLiteral__ValAssignment ) )
+            // InternalExport.g:1058:2: ( ( ( rule__RealLiteral__ValAssignment ) ) )
+            // InternalExport.g:1059:1: ( ( rule__RealLiteral__ValAssignment ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1059:1: ( ( rule__RealLiteral__ValAssignment ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1060:1: ( rule__RealLiteral__ValAssignment )
+            // InternalExport.g:1059:1: ( ( rule__RealLiteral__ValAssignment ) )
+            // InternalExport.g:1060:1: ( rule__RealLiteral__ValAssignment )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRealLiteralAccess().getValAssignment()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1061:1: ( rule__RealLiteral__ValAssignment )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1061:2: rule__RealLiteral__ValAssignment
+            // InternalExport.g:1061:1: ( rule__RealLiteral__ValAssignment )
+            // InternalExport.g:1061:2: rule__RealLiteral__ValAssignment
             {
-            pushFollow(FOLLOW_rule__RealLiteral__ValAssignment_in_ruleRealLiteral2204);
+            pushFollow(FOLLOW_2);
             rule__RealLiteral__ValAssignment();
 
             state._fsp--;
@@ -3203,16 +3203,16 @@ public final void ruleRealLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleStringLiteral"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1073:1: entryRuleStringLiteral : ruleStringLiteral EOF ;
+    // InternalExport.g:1073:1: entryRuleStringLiteral : ruleStringLiteral EOF ;
     public final void entryRuleStringLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1074:1: ( ruleStringLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1075:1: ruleStringLiteral EOF
+            // InternalExport.g:1074:1: ( ruleStringLiteral EOF )
+            // InternalExport.g:1075:1: ruleStringLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getStringLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral2231);
+            pushFollow(FOLLOW_1);
             ruleStringLiteral();
 
             state._fsp--;
@@ -3220,7 +3220,7 @@ public final void entryRuleStringLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getStringLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleStringLiteral2238); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3237,25 +3237,25 @@ public final void entryRuleStringLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleStringLiteral"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1082:1: ruleStringLiteral : ( ( rule__StringLiteral__ValAssignment ) ) ;
+    // InternalExport.g:1082:1: ruleStringLiteral : ( ( rule__StringLiteral__ValAssignment ) ) ;
     public final void ruleStringLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1086:2: ( ( ( rule__StringLiteral__ValAssignment ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1087:1: ( ( rule__StringLiteral__ValAssignment ) )
+            // InternalExport.g:1086:2: ( ( ( rule__StringLiteral__ValAssignment ) ) )
+            // InternalExport.g:1087:1: ( ( rule__StringLiteral__ValAssignment ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1087:1: ( ( rule__StringLiteral__ValAssignment ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1088:1: ( rule__StringLiteral__ValAssignment )
+            // InternalExport.g:1087:1: ( ( rule__StringLiteral__ValAssignment ) )
+            // InternalExport.g:1088:1: ( rule__StringLiteral__ValAssignment )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getStringLiteralAccess().getValAssignment()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1089:1: ( rule__StringLiteral__ValAssignment )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1089:2: rule__StringLiteral__ValAssignment
+            // InternalExport.g:1089:1: ( rule__StringLiteral__ValAssignment )
+            // InternalExport.g:1089:2: rule__StringLiteral__ValAssignment
             {
-            pushFollow(FOLLOW_rule__StringLiteral__ValAssignment_in_ruleStringLiteral2264);
+            pushFollow(FOLLOW_2);
             rule__StringLiteral__ValAssignment();
 
             state._fsp--;
@@ -3288,16 +3288,16 @@ public final void ruleStringLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleParanthesizedExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1101:1: entryRuleParanthesizedExpression : ruleParanthesizedExpression EOF ;
+    // InternalExport.g:1101:1: entryRuleParanthesizedExpression : ruleParanthesizedExpression EOF ;
     public final void entryRuleParanthesizedExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1102:1: ( ruleParanthesizedExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1103:1: ruleParanthesizedExpression EOF
+            // InternalExport.g:1102:1: ( ruleParanthesizedExpression EOF )
+            // InternalExport.g:1103:1: ruleParanthesizedExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getParanthesizedExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleParanthesizedExpression_in_entryRuleParanthesizedExpression2291);
+            pushFollow(FOLLOW_1);
             ruleParanthesizedExpression();
 
             state._fsp--;
@@ -3305,7 +3305,7 @@ public final void entryRuleParanthesizedExpression() throws RecognitionException
             if ( state.backtracking==0 ) {
                after(grammarAccess.getParanthesizedExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleParanthesizedExpression2298); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3322,25 +3322,25 @@ public final void entryRuleParanthesizedExpression() throws RecognitionException
 
 
     // $ANTLR start "ruleParanthesizedExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1110:1: ruleParanthesizedExpression : ( ( rule__ParanthesizedExpression__Group__0 ) ) ;
+    // InternalExport.g:1110:1: ruleParanthesizedExpression : ( ( rule__ParanthesizedExpression__Group__0 ) ) ;
     public final void ruleParanthesizedExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1114:2: ( ( ( rule__ParanthesizedExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1115:1: ( ( rule__ParanthesizedExpression__Group__0 ) )
+            // InternalExport.g:1114:2: ( ( ( rule__ParanthesizedExpression__Group__0 ) ) )
+            // InternalExport.g:1115:1: ( ( rule__ParanthesizedExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1115:1: ( ( rule__ParanthesizedExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1116:1: ( rule__ParanthesizedExpression__Group__0 )
+            // InternalExport.g:1115:1: ( ( rule__ParanthesizedExpression__Group__0 ) )
+            // InternalExport.g:1116:1: ( rule__ParanthesizedExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getParanthesizedExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1117:1: ( rule__ParanthesizedExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1117:2: rule__ParanthesizedExpression__Group__0
+            // InternalExport.g:1117:1: ( rule__ParanthesizedExpression__Group__0 )
+            // InternalExport.g:1117:2: rule__ParanthesizedExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__ParanthesizedExpression__Group__0_in_ruleParanthesizedExpression2324);
+            pushFollow(FOLLOW_2);
             rule__ParanthesizedExpression__Group__0();
 
             state._fsp--;
@@ -3373,16 +3373,16 @@ public final void ruleParanthesizedExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleGlobalVarExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1129:1: entryRuleGlobalVarExpression : ruleGlobalVarExpression EOF ;
+    // InternalExport.g:1129:1: entryRuleGlobalVarExpression : ruleGlobalVarExpression EOF ;
     public final void entryRuleGlobalVarExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1130:1: ( ruleGlobalVarExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1131:1: ruleGlobalVarExpression EOF
+            // InternalExport.g:1130:1: ( ruleGlobalVarExpression EOF )
+            // InternalExport.g:1131:1: ruleGlobalVarExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalVarExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleGlobalVarExpression_in_entryRuleGlobalVarExpression2351);
+            pushFollow(FOLLOW_1);
             ruleGlobalVarExpression();
 
             state._fsp--;
@@ -3390,7 +3390,7 @@ public final void entryRuleGlobalVarExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGlobalVarExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleGlobalVarExpression2358); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3407,25 +3407,25 @@ public final void entryRuleGlobalVarExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleGlobalVarExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1138:1: ruleGlobalVarExpression : ( ( rule__GlobalVarExpression__Group__0 ) ) ;
+    // InternalExport.g:1138:1: ruleGlobalVarExpression : ( ( rule__GlobalVarExpression__Group__0 ) ) ;
     public final void ruleGlobalVarExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1142:2: ( ( ( rule__GlobalVarExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1143:1: ( ( rule__GlobalVarExpression__Group__0 ) )
+            // InternalExport.g:1142:2: ( ( ( rule__GlobalVarExpression__Group__0 ) ) )
+            // InternalExport.g:1143:1: ( ( rule__GlobalVarExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1143:1: ( ( rule__GlobalVarExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1144:1: ( rule__GlobalVarExpression__Group__0 )
+            // InternalExport.g:1143:1: ( ( rule__GlobalVarExpression__Group__0 ) )
+            // InternalExport.g:1144:1: ( rule__GlobalVarExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalVarExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1145:1: ( rule__GlobalVarExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1145:2: rule__GlobalVarExpression__Group__0
+            // InternalExport.g:1145:1: ( rule__GlobalVarExpression__Group__0 )
+            // InternalExport.g:1145:2: rule__GlobalVarExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__GlobalVarExpression__Group__0_in_ruleGlobalVarExpression2384);
+            pushFollow(FOLLOW_2);
             rule__GlobalVarExpression__Group__0();
 
             state._fsp--;
@@ -3458,16 +3458,16 @@ public final void ruleGlobalVarExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleFeatureCall"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1157:1: entryRuleFeatureCall : ruleFeatureCall EOF ;
+    // InternalExport.g:1157:1: entryRuleFeatureCall : ruleFeatureCall EOF ;
     public final void entryRuleFeatureCall() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1158:1: ( ruleFeatureCall EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1159:1: ruleFeatureCall EOF
+            // InternalExport.g:1158:1: ( ruleFeatureCall EOF )
+            // InternalExport.g:1159:1: ruleFeatureCall EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFeatureCallRule()); 
             }
-            pushFollow(FOLLOW_ruleFeatureCall_in_entryRuleFeatureCall2411);
+            pushFollow(FOLLOW_1);
             ruleFeatureCall();
 
             state._fsp--;
@@ -3475,7 +3475,7 @@ public final void entryRuleFeatureCall() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getFeatureCallRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFeatureCall2418); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3492,25 +3492,25 @@ public final void entryRuleFeatureCall() throws RecognitionException {
 
 
     // $ANTLR start "ruleFeatureCall"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1166:1: ruleFeatureCall : ( ( rule__FeatureCall__Alternatives ) ) ;
+    // InternalExport.g:1166:1: ruleFeatureCall : ( ( rule__FeatureCall__Alternatives ) ) ;
     public final void ruleFeatureCall() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1170:2: ( ( ( rule__FeatureCall__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1171:1: ( ( rule__FeatureCall__Alternatives ) )
+            // InternalExport.g:1170:2: ( ( ( rule__FeatureCall__Alternatives ) ) )
+            // InternalExport.g:1171:1: ( ( rule__FeatureCall__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1171:1: ( ( rule__FeatureCall__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1172:1: ( rule__FeatureCall__Alternatives )
+            // InternalExport.g:1171:1: ( ( rule__FeatureCall__Alternatives ) )
+            // InternalExport.g:1172:1: ( rule__FeatureCall__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFeatureCallAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1173:1: ( rule__FeatureCall__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1173:2: rule__FeatureCall__Alternatives
+            // InternalExport.g:1173:1: ( rule__FeatureCall__Alternatives )
+            // InternalExport.g:1173:2: rule__FeatureCall__Alternatives
             {
-            pushFollow(FOLLOW_rule__FeatureCall__Alternatives_in_ruleFeatureCall2444);
+            pushFollow(FOLLOW_2);
             rule__FeatureCall__Alternatives();
 
             state._fsp--;
@@ -3543,16 +3543,16 @@ public final void ruleFeatureCall() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOperationCall"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1185:1: entryRuleOperationCall : ruleOperationCall EOF ;
+    // InternalExport.g:1185:1: entryRuleOperationCall : ruleOperationCall EOF ;
     public final void entryRuleOperationCall() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1186:1: ( ruleOperationCall EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1187:1: ruleOperationCall EOF
+            // InternalExport.g:1186:1: ( ruleOperationCall EOF )
+            // InternalExport.g:1187:1: ruleOperationCall EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOperationCallRule()); 
             }
-            pushFollow(FOLLOW_ruleOperationCall_in_entryRuleOperationCall2471);
+            pushFollow(FOLLOW_1);
             ruleOperationCall();
 
             state._fsp--;
@@ -3560,7 +3560,7 @@ public final void entryRuleOperationCall() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOperationCallRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOperationCall2478); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3577,25 +3577,25 @@ public final void entryRuleOperationCall() throws RecognitionException {
 
 
     // $ANTLR start "ruleOperationCall"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1194:1: ruleOperationCall : ( ( rule__OperationCall__Group__0 ) ) ;
+    // InternalExport.g:1194:1: ruleOperationCall : ( ( rule__OperationCall__Group__0 ) ) ;
     public final void ruleOperationCall() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1198:2: ( ( ( rule__OperationCall__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1199:1: ( ( rule__OperationCall__Group__0 ) )
+            // InternalExport.g:1198:2: ( ( ( rule__OperationCall__Group__0 ) ) )
+            // InternalExport.g:1199:1: ( ( rule__OperationCall__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1199:1: ( ( rule__OperationCall__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1200:1: ( rule__OperationCall__Group__0 )
+            // InternalExport.g:1199:1: ( ( rule__OperationCall__Group__0 ) )
+            // InternalExport.g:1200:1: ( rule__OperationCall__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOperationCallAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1201:1: ( rule__OperationCall__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1201:2: rule__OperationCall__Group__0
+            // InternalExport.g:1201:1: ( rule__OperationCall__Group__0 )
+            // InternalExport.g:1201:2: rule__OperationCall__Group__0
             {
-            pushFollow(FOLLOW_rule__OperationCall__Group__0_in_ruleOperationCall2504);
+            pushFollow(FOLLOW_2);
             rule__OperationCall__Group__0();
 
             state._fsp--;
@@ -3628,16 +3628,16 @@ public final void ruleOperationCall() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleListLiteral"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1213:1: entryRuleListLiteral : ruleListLiteral EOF ;
+    // InternalExport.g:1213:1: entryRuleListLiteral : ruleListLiteral EOF ;
     public final void entryRuleListLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1214:1: ( ruleListLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1215:1: ruleListLiteral EOF
+            // InternalExport.g:1214:1: ( ruleListLiteral EOF )
+            // InternalExport.g:1215:1: ruleListLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getListLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleListLiteral_in_entryRuleListLiteral2531);
+            pushFollow(FOLLOW_1);
             ruleListLiteral();
 
             state._fsp--;
@@ -3645,7 +3645,7 @@ public final void entryRuleListLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getListLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleListLiteral2538); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3662,25 +3662,25 @@ public final void entryRuleListLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleListLiteral"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1222:1: ruleListLiteral : ( ( rule__ListLiteral__Group__0 ) ) ;
+    // InternalExport.g:1222:1: ruleListLiteral : ( ( rule__ListLiteral__Group__0 ) ) ;
     public final void ruleListLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1226:2: ( ( ( rule__ListLiteral__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1227:1: ( ( rule__ListLiteral__Group__0 ) )
+            // InternalExport.g:1226:2: ( ( ( rule__ListLiteral__Group__0 ) ) )
+            // InternalExport.g:1227:1: ( ( rule__ListLiteral__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1227:1: ( ( rule__ListLiteral__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1228:1: ( rule__ListLiteral__Group__0 )
+            // InternalExport.g:1227:1: ( ( rule__ListLiteral__Group__0 ) )
+            // InternalExport.g:1228:1: ( rule__ListLiteral__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getListLiteralAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1229:1: ( rule__ListLiteral__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1229:2: rule__ListLiteral__Group__0
+            // InternalExport.g:1229:1: ( rule__ListLiteral__Group__0 )
+            // InternalExport.g:1229:2: rule__ListLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__ListLiteral__Group__0_in_ruleListLiteral2564);
+            pushFollow(FOLLOW_2);
             rule__ListLiteral__Group__0();
 
             state._fsp--;
@@ -3713,16 +3713,16 @@ public final void ruleListLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleConstructorCallExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1241:1: entryRuleConstructorCallExpression : ruleConstructorCallExpression EOF ;
+    // InternalExport.g:1241:1: entryRuleConstructorCallExpression : ruleConstructorCallExpression EOF ;
     public final void entryRuleConstructorCallExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1242:1: ( ruleConstructorCallExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1243:1: ruleConstructorCallExpression EOF
+            // InternalExport.g:1242:1: ( ruleConstructorCallExpression EOF )
+            // InternalExport.g:1243:1: ruleConstructorCallExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConstructorCallExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleConstructorCallExpression_in_entryRuleConstructorCallExpression2591);
+            pushFollow(FOLLOW_1);
             ruleConstructorCallExpression();
 
             state._fsp--;
@@ -3730,7 +3730,7 @@ public final void entryRuleConstructorCallExpression() throws RecognitionExcepti
             if ( state.backtracking==0 ) {
                after(grammarAccess.getConstructorCallExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleConstructorCallExpression2598); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3747,25 +3747,25 @@ public final void entryRuleConstructorCallExpression() throws RecognitionExcepti
 
 
     // $ANTLR start "ruleConstructorCallExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1250:1: ruleConstructorCallExpression : ( ( rule__ConstructorCallExpression__Group__0 ) ) ;
+    // InternalExport.g:1250:1: ruleConstructorCallExpression : ( ( rule__ConstructorCallExpression__Group__0 ) ) ;
     public final void ruleConstructorCallExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1254:2: ( ( ( rule__ConstructorCallExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1255:1: ( ( rule__ConstructorCallExpression__Group__0 ) )
+            // InternalExport.g:1254:2: ( ( ( rule__ConstructorCallExpression__Group__0 ) ) )
+            // InternalExport.g:1255:1: ( ( rule__ConstructorCallExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1255:1: ( ( rule__ConstructorCallExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1256:1: ( rule__ConstructorCallExpression__Group__0 )
+            // InternalExport.g:1255:1: ( ( rule__ConstructorCallExpression__Group__0 ) )
+            // InternalExport.g:1256:1: ( rule__ConstructorCallExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConstructorCallExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1257:1: ( rule__ConstructorCallExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1257:2: rule__ConstructorCallExpression__Group__0
+            // InternalExport.g:1257:1: ( rule__ConstructorCallExpression__Group__0 )
+            // InternalExport.g:1257:2: rule__ConstructorCallExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__ConstructorCallExpression__Group__0_in_ruleConstructorCallExpression2624);
+            pushFollow(FOLLOW_2);
             rule__ConstructorCallExpression__Group__0();
 
             state._fsp--;
@@ -3798,16 +3798,16 @@ public final void ruleConstructorCallExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleTypeSelectExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1269:1: entryRuleTypeSelectExpression : ruleTypeSelectExpression EOF ;
+    // InternalExport.g:1269:1: entryRuleTypeSelectExpression : ruleTypeSelectExpression EOF ;
     public final void entryRuleTypeSelectExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1270:1: ( ruleTypeSelectExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1271:1: ruleTypeSelectExpression EOF
+            // InternalExport.g:1270:1: ( ruleTypeSelectExpression EOF )
+            // InternalExport.g:1271:1: ruleTypeSelectExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTypeSelectExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleTypeSelectExpression_in_entryRuleTypeSelectExpression2651);
+            pushFollow(FOLLOW_1);
             ruleTypeSelectExpression();
 
             state._fsp--;
@@ -3815,7 +3815,7 @@ public final void entryRuleTypeSelectExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getTypeSelectExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTypeSelectExpression2658); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3832,25 +3832,25 @@ public final void entryRuleTypeSelectExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleTypeSelectExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1278:1: ruleTypeSelectExpression : ( ( rule__TypeSelectExpression__Group__0 ) ) ;
+    // InternalExport.g:1278:1: ruleTypeSelectExpression : ( ( rule__TypeSelectExpression__Group__0 ) ) ;
     public final void ruleTypeSelectExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1282:2: ( ( ( rule__TypeSelectExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1283:1: ( ( rule__TypeSelectExpression__Group__0 ) )
+            // InternalExport.g:1282:2: ( ( ( rule__TypeSelectExpression__Group__0 ) ) )
+            // InternalExport.g:1283:1: ( ( rule__TypeSelectExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1283:1: ( ( rule__TypeSelectExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1284:1: ( rule__TypeSelectExpression__Group__0 )
+            // InternalExport.g:1283:1: ( ( rule__TypeSelectExpression__Group__0 ) )
+            // InternalExport.g:1284:1: ( rule__TypeSelectExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTypeSelectExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1285:1: ( rule__TypeSelectExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1285:2: rule__TypeSelectExpression__Group__0
+            // InternalExport.g:1285:1: ( rule__TypeSelectExpression__Group__0 )
+            // InternalExport.g:1285:2: rule__TypeSelectExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__TypeSelectExpression__Group__0_in_ruleTypeSelectExpression2684);
+            pushFollow(FOLLOW_2);
             rule__TypeSelectExpression__Group__0();
 
             state._fsp--;
@@ -3883,16 +3883,16 @@ public final void ruleTypeSelectExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleCollectionExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1297:1: entryRuleCollectionExpression : ruleCollectionExpression EOF ;
+    // InternalExport.g:1297:1: entryRuleCollectionExpression : ruleCollectionExpression EOF ;
     public final void entryRuleCollectionExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1298:1: ( ruleCollectionExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1299:1: ruleCollectionExpression EOF
+            // InternalExport.g:1298:1: ( ruleCollectionExpression EOF )
+            // InternalExport.g:1299:1: ruleCollectionExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleCollectionExpression_in_entryRuleCollectionExpression2711);
+            pushFollow(FOLLOW_1);
             ruleCollectionExpression();
 
             state._fsp--;
@@ -3900,7 +3900,7 @@ public final void entryRuleCollectionExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCollectionExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleCollectionExpression2718); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3917,25 +3917,25 @@ public final void entryRuleCollectionExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleCollectionExpression"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1306:1: ruleCollectionExpression : ( ( rule__CollectionExpression__Group__0 ) ) ;
+    // InternalExport.g:1306:1: ruleCollectionExpression : ( ( rule__CollectionExpression__Group__0 ) ) ;
     public final void ruleCollectionExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1310:2: ( ( ( rule__CollectionExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1311:1: ( ( rule__CollectionExpression__Group__0 ) )
+            // InternalExport.g:1310:2: ( ( ( rule__CollectionExpression__Group__0 ) ) )
+            // InternalExport.g:1311:1: ( ( rule__CollectionExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1311:1: ( ( rule__CollectionExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1312:1: ( rule__CollectionExpression__Group__0 )
+            // InternalExport.g:1311:1: ( ( rule__CollectionExpression__Group__0 ) )
+            // InternalExport.g:1312:1: ( rule__CollectionExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1313:1: ( rule__CollectionExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1313:2: rule__CollectionExpression__Group__0
+            // InternalExport.g:1313:1: ( rule__CollectionExpression__Group__0 )
+            // InternalExport.g:1313:2: rule__CollectionExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__CollectionExpression__Group__0_in_ruleCollectionExpression2744);
+            pushFollow(FOLLOW_2);
             rule__CollectionExpression__Group__0();
 
             state._fsp--;
@@ -3968,16 +3968,16 @@ public final void ruleCollectionExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleType"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1325:1: entryRuleType : ruleType EOF ;
+    // InternalExport.g:1325:1: entryRuleType : ruleType EOF ;
     public final void entryRuleType() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1326:1: ( ruleType EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1327:1: ruleType EOF
+            // InternalExport.g:1326:1: ( ruleType EOF )
+            // InternalExport.g:1327:1: ruleType EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTypeRule()); 
             }
-            pushFollow(FOLLOW_ruleType_in_entryRuleType2771);
+            pushFollow(FOLLOW_1);
             ruleType();
 
             state._fsp--;
@@ -3985,7 +3985,7 @@ public final void entryRuleType() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getTypeRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleType2778); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4002,25 +4002,25 @@ public final void entryRuleType() throws RecognitionException {
 
 
     // $ANTLR start "ruleType"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1334:1: ruleType : ( ( rule__Type__Alternatives ) ) ;
+    // InternalExport.g:1334:1: ruleType : ( ( rule__Type__Alternatives ) ) ;
     public final void ruleType() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1338:2: ( ( ( rule__Type__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1339:1: ( ( rule__Type__Alternatives ) )
+            // InternalExport.g:1338:2: ( ( ( rule__Type__Alternatives ) ) )
+            // InternalExport.g:1339:1: ( ( rule__Type__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1339:1: ( ( rule__Type__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1340:1: ( rule__Type__Alternatives )
+            // InternalExport.g:1339:1: ( ( rule__Type__Alternatives ) )
+            // InternalExport.g:1340:1: ( rule__Type__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTypeAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1341:1: ( rule__Type__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1341:2: rule__Type__Alternatives
+            // InternalExport.g:1341:1: ( rule__Type__Alternatives )
+            // InternalExport.g:1341:2: rule__Type__Alternatives
             {
-            pushFollow(FOLLOW_rule__Type__Alternatives_in_ruleType2804);
+            pushFollow(FOLLOW_2);
             rule__Type__Alternatives();
 
             state._fsp--;
@@ -4053,16 +4053,16 @@ public final void ruleType() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleCollectionType"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1353:1: entryRuleCollectionType : ruleCollectionType EOF ;
+    // InternalExport.g:1353:1: entryRuleCollectionType : ruleCollectionType EOF ;
     public final void entryRuleCollectionType() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1354:1: ( ruleCollectionType EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1355:1: ruleCollectionType EOF
+            // InternalExport.g:1354:1: ( ruleCollectionType EOF )
+            // InternalExport.g:1355:1: ruleCollectionType EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionTypeRule()); 
             }
-            pushFollow(FOLLOW_ruleCollectionType_in_entryRuleCollectionType2831);
+            pushFollow(FOLLOW_1);
             ruleCollectionType();
 
             state._fsp--;
@@ -4070,7 +4070,7 @@ public final void entryRuleCollectionType() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCollectionTypeRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleCollectionType2838); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4087,25 +4087,25 @@ public final void entryRuleCollectionType() throws RecognitionException {
 
 
     // $ANTLR start "ruleCollectionType"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1362:1: ruleCollectionType : ( ( rule__CollectionType__Group__0 ) ) ;
+    // InternalExport.g:1362:1: ruleCollectionType : ( ( rule__CollectionType__Group__0 ) ) ;
     public final void ruleCollectionType() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1366:2: ( ( ( rule__CollectionType__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1367:1: ( ( rule__CollectionType__Group__0 ) )
+            // InternalExport.g:1366:2: ( ( ( rule__CollectionType__Group__0 ) ) )
+            // InternalExport.g:1367:1: ( ( rule__CollectionType__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1367:1: ( ( rule__CollectionType__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1368:1: ( rule__CollectionType__Group__0 )
+            // InternalExport.g:1367:1: ( ( rule__CollectionType__Group__0 ) )
+            // InternalExport.g:1368:1: ( rule__CollectionType__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionTypeAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1369:1: ( rule__CollectionType__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1369:2: rule__CollectionType__Group__0
+            // InternalExport.g:1369:1: ( rule__CollectionType__Group__0 )
+            // InternalExport.g:1369:2: rule__CollectionType__Group__0
             {
-            pushFollow(FOLLOW_rule__CollectionType__Group__0_in_ruleCollectionType2864);
+            pushFollow(FOLLOW_2);
             rule__CollectionType__Group__0();
 
             state._fsp--;
@@ -4138,16 +4138,16 @@ public final void ruleCollectionType() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleSimpleType"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1381:1: entryRuleSimpleType : ruleSimpleType EOF ;
+    // InternalExport.g:1381:1: entryRuleSimpleType : ruleSimpleType EOF ;
     public final void entryRuleSimpleType() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1382:1: ( ruleSimpleType EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1383:1: ruleSimpleType EOF
+            // InternalExport.g:1382:1: ( ruleSimpleType EOF )
+            // InternalExport.g:1383:1: ruleSimpleType EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSimpleTypeRule()); 
             }
-            pushFollow(FOLLOW_ruleSimpleType_in_entryRuleSimpleType2891);
+            pushFollow(FOLLOW_1);
             ruleSimpleType();
 
             state._fsp--;
@@ -4155,7 +4155,7 @@ public final void entryRuleSimpleType() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSimpleTypeRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSimpleType2898); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4172,25 +4172,25 @@ public final void entryRuleSimpleType() throws RecognitionException {
 
 
     // $ANTLR start "ruleSimpleType"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1390:1: ruleSimpleType : ( ( rule__SimpleType__Group__0 ) ) ;
+    // InternalExport.g:1390:1: ruleSimpleType : ( ( rule__SimpleType__Group__0 ) ) ;
     public final void ruleSimpleType() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1394:2: ( ( ( rule__SimpleType__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1395:1: ( ( rule__SimpleType__Group__0 ) )
+            // InternalExport.g:1394:2: ( ( ( rule__SimpleType__Group__0 ) ) )
+            // InternalExport.g:1395:1: ( ( rule__SimpleType__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1395:1: ( ( rule__SimpleType__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1396:1: ( rule__SimpleType__Group__0 )
+            // InternalExport.g:1395:1: ( ( rule__SimpleType__Group__0 ) )
+            // InternalExport.g:1396:1: ( rule__SimpleType__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSimpleTypeAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1397:1: ( rule__SimpleType__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1397:2: rule__SimpleType__Group__0
+            // InternalExport.g:1397:1: ( rule__SimpleType__Group__0 )
+            // InternalExport.g:1397:2: rule__SimpleType__Group__0
             {
-            pushFollow(FOLLOW_rule__SimpleType__Group__0_in_ruleSimpleType2924);
+            pushFollow(FOLLOW_2);
             rule__SimpleType__Group__0();
 
             state._fsp--;
@@ -4223,16 +4223,16 @@ public final void ruleSimpleType() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleIdentifier"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1409:1: entryRuleIdentifier : ruleIdentifier EOF ;
+    // InternalExport.g:1409:1: entryRuleIdentifier : ruleIdentifier EOF ;
     public final void entryRuleIdentifier() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1410:1: ( ruleIdentifier EOF )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1411:1: ruleIdentifier EOF
+            // InternalExport.g:1410:1: ( ruleIdentifier EOF )
+            // InternalExport.g:1411:1: ruleIdentifier EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIdentifierRule()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_entryRuleIdentifier2951);
+            pushFollow(FOLLOW_1);
             ruleIdentifier();
 
             state._fsp--;
@@ -4240,7 +4240,7 @@ public final void entryRuleIdentifier() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIdentifierRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIdentifier2958); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4257,22 +4257,22 @@ public final void entryRuleIdentifier() throws RecognitionException {
 
 
     // $ANTLR start "ruleIdentifier"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1418:1: ruleIdentifier : ( RULE_ID ) ;
+    // InternalExport.g:1418:1: ruleIdentifier : ( RULE_ID ) ;
     public final void ruleIdentifier() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1422:2: ( ( RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1423:1: ( RULE_ID )
+            // InternalExport.g:1422:2: ( ( RULE_ID ) )
+            // InternalExport.g:1423:1: ( RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1423:1: ( RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1424:1: RULE_ID
+            // InternalExport.g:1423:1: ( RULE_ID )
+            // InternalExport.g:1424:1: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIdentifierAccess().getIDTerminalRuleCall()); 
             }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleIdentifier2984); if (state.failed) return ;
+            match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIdentifierAccess().getIDTerminalRuleCall()); 
             }
@@ -4298,13 +4298,13 @@ public final void ruleIdentifier() throws RecognitionException {
 
 
     // $ANTLR start "rule__InterfaceItem__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1438:1: rule__InterfaceItem__Alternatives : ( ( ruleInterfaceField ) | ( ruleInterfaceNavigation ) | ( ruleInterfaceExpression ) );
+    // InternalExport.g:1438:1: rule__InterfaceItem__Alternatives : ( ( ruleInterfaceField ) | ( ruleInterfaceNavigation ) | ( ruleInterfaceExpression ) );
     public final void rule__InterfaceItem__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1442:1: ( ( ruleInterfaceField ) | ( ruleInterfaceNavigation ) | ( ruleInterfaceExpression ) )
+            // InternalExport.g:1442:1: ( ( ruleInterfaceField ) | ( ruleInterfaceNavigation ) | ( ruleInterfaceExpression ) )
             int alt1=3;
             switch ( input.LA(1) ) {
             case RULE_ID:
@@ -4333,15 +4333,15 @@ public final void rule__InterfaceItem__Alternatives() throws RecognitionExceptio
 
             switch (alt1) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1443:1: ( ruleInterfaceField )
+                    // InternalExport.g:1443:1: ( ruleInterfaceField )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1443:1: ( ruleInterfaceField )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1444:1: ruleInterfaceField
+                    // InternalExport.g:1443:1: ( ruleInterfaceField )
+                    // InternalExport.g:1444:1: ruleInterfaceField
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getInterfaceItemAccess().getInterfaceFieldParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleInterfaceField_in_rule__InterfaceItem__Alternatives3020);
+                    pushFollow(FOLLOW_2);
                     ruleInterfaceField();
 
                     state._fsp--;
@@ -4356,15 +4356,15 @@ public final void rule__InterfaceItem__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1449:6: ( ruleInterfaceNavigation )
+                    // InternalExport.g:1449:6: ( ruleInterfaceNavigation )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1449:6: ( ruleInterfaceNavigation )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1450:1: ruleInterfaceNavigation
+                    // InternalExport.g:1449:6: ( ruleInterfaceNavigation )
+                    // InternalExport.g:1450:1: ruleInterfaceNavigation
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getInterfaceItemAccess().getInterfaceNavigationParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleInterfaceNavigation_in_rule__InterfaceItem__Alternatives3037);
+                    pushFollow(FOLLOW_2);
                     ruleInterfaceNavigation();
 
                     state._fsp--;
@@ -4379,15 +4379,15 @@ public final void rule__InterfaceItem__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1455:6: ( ruleInterfaceExpression )
+                    // InternalExport.g:1455:6: ( ruleInterfaceExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1455:6: ( ruleInterfaceExpression )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1456:1: ruleInterfaceExpression
+                    // InternalExport.g:1455:6: ( ruleInterfaceExpression )
+                    // InternalExport.g:1456:1: ruleInterfaceExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getInterfaceItemAccess().getInterfaceExpressionParserRuleCall_2()); 
                     }
-                    pushFollow(FOLLOW_ruleInterfaceExpression_in_rule__InterfaceItem__Alternatives3054);
+                    pushFollow(FOLLOW_2);
                     ruleInterfaceExpression();
 
                     state._fsp--;
@@ -4419,13 +4419,13 @@ public final void rule__InterfaceItem__Alternatives() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__Export__Alternatives_7_0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1466:1: rule__Export__Alternatives_7_0 : ( ( ( rule__Export__FingerprintAssignment_7_0_0 ) ) | ( ( rule__Export__ResourceFingerprintAssignment_7_0_1 ) ) );
+    // InternalExport.g:1466:1: rule__Export__Alternatives_7_0 : ( ( ( rule__Export__FingerprintAssignment_7_0_0 ) ) | ( ( rule__Export__ResourceFingerprintAssignment_7_0_1 ) ) );
     public final void rule__Export__Alternatives_7_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1470:1: ( ( ( rule__Export__FingerprintAssignment_7_0_0 ) ) | ( ( rule__Export__ResourceFingerprintAssignment_7_0_1 ) ) )
+            // InternalExport.g:1470:1: ( ( ( rule__Export__FingerprintAssignment_7_0_0 ) ) | ( ( rule__Export__ResourceFingerprintAssignment_7_0_1 ) ) )
             int alt2=2;
             int LA2_0 = input.LA(1);
 
@@ -4444,18 +4444,18 @@ else if ( (LA2_0==76) ) {
             }
             switch (alt2) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1471:1: ( ( rule__Export__FingerprintAssignment_7_0_0 ) )
+                    // InternalExport.g:1471:1: ( ( rule__Export__FingerprintAssignment_7_0_0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1471:1: ( ( rule__Export__FingerprintAssignment_7_0_0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1472:1: ( rule__Export__FingerprintAssignment_7_0_0 )
+                    // InternalExport.g:1471:1: ( ( rule__Export__FingerprintAssignment_7_0_0 ) )
+                    // InternalExport.g:1472:1: ( rule__Export__FingerprintAssignment_7_0_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getExportAccess().getFingerprintAssignment_7_0_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1473:1: ( rule__Export__FingerprintAssignment_7_0_0 )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1473:2: rule__Export__FingerprintAssignment_7_0_0
+                    // InternalExport.g:1473:1: ( rule__Export__FingerprintAssignment_7_0_0 )
+                    // InternalExport.g:1473:2: rule__Export__FingerprintAssignment_7_0_0
                     {
-                    pushFollow(FOLLOW_rule__Export__FingerprintAssignment_7_0_0_in_rule__Export__Alternatives_7_03086);
+                    pushFollow(FOLLOW_2);
                     rule__Export__FingerprintAssignment_7_0_0();
 
                     state._fsp--;
@@ -4473,18 +4473,18 @@ else if ( (LA2_0==76) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1477:6: ( ( rule__Export__ResourceFingerprintAssignment_7_0_1 ) )
+                    // InternalExport.g:1477:6: ( ( rule__Export__ResourceFingerprintAssignment_7_0_1 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1477:6: ( ( rule__Export__ResourceFingerprintAssignment_7_0_1 ) )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1478:1: ( rule__Export__ResourceFingerprintAssignment_7_0_1 )
+                    // InternalExport.g:1477:6: ( ( rule__Export__ResourceFingerprintAssignment_7_0_1 ) )
+                    // InternalExport.g:1478:1: ( rule__Export__ResourceFingerprintAssignment_7_0_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getExportAccess().getResourceFingerprintAssignment_7_0_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1479:1: ( rule__Export__ResourceFingerprintAssignment_7_0_1 )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1479:2: rule__Export__ResourceFingerprintAssignment_7_0_1
+                    // InternalExport.g:1479:1: ( rule__Export__ResourceFingerprintAssignment_7_0_1 )
+                    // InternalExport.g:1479:2: rule__Export__ResourceFingerprintAssignment_7_0_1
                     {
-                    pushFollow(FOLLOW_rule__Export__ResourceFingerprintAssignment_7_0_1_in_rule__Export__Alternatives_7_03104);
+                    pushFollow(FOLLOW_2);
                     rule__Export__ResourceFingerprintAssignment_7_0_1();
 
                     state._fsp--;
@@ -4519,13 +4519,13 @@ else if ( (LA2_0==76) ) {
 
 
     // $ANTLR start "rule__Export__Alternatives_8"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1488:1: rule__Export__Alternatives_8 : ( ( ( rule__Export__Group_8_0__0 ) ) | ( ( rule__Export__Group_8_1__0 ) ) );
+    // InternalExport.g:1488:1: rule__Export__Alternatives_8 : ( ( ( rule__Export__Group_8_0__0 ) ) | ( ( rule__Export__Group_8_1__0 ) ) );
     public final void rule__Export__Alternatives_8() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1492:1: ( ( ( rule__Export__Group_8_0__0 ) ) | ( ( rule__Export__Group_8_1__0 ) ) )
+            // InternalExport.g:1492:1: ( ( ( rule__Export__Group_8_0__0 ) ) | ( ( rule__Export__Group_8_1__0 ) ) )
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -4544,18 +4544,18 @@ else if ( (LA3_0==56) ) {
             }
             switch (alt3) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1493:1: ( ( rule__Export__Group_8_0__0 ) )
+                    // InternalExport.g:1493:1: ( ( rule__Export__Group_8_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1493:1: ( ( rule__Export__Group_8_0__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1494:1: ( rule__Export__Group_8_0__0 )
+                    // InternalExport.g:1493:1: ( ( rule__Export__Group_8_0__0 ) )
+                    // InternalExport.g:1494:1: ( rule__Export__Group_8_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getExportAccess().getGroup_8_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1495:1: ( rule__Export__Group_8_0__0 )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1495:2: rule__Export__Group_8_0__0
+                    // InternalExport.g:1495:1: ( rule__Export__Group_8_0__0 )
+                    // InternalExport.g:1495:2: rule__Export__Group_8_0__0
                     {
-                    pushFollow(FOLLOW_rule__Export__Group_8_0__0_in_rule__Export__Alternatives_83137);
+                    pushFollow(FOLLOW_2);
                     rule__Export__Group_8_0__0();
 
                     state._fsp--;
@@ -4573,18 +4573,18 @@ else if ( (LA3_0==56) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1499:6: ( ( rule__Export__Group_8_1__0 ) )
+                    // InternalExport.g:1499:6: ( ( rule__Export__Group_8_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1499:6: ( ( rule__Export__Group_8_1__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1500:1: ( rule__Export__Group_8_1__0 )
+                    // InternalExport.g:1499:6: ( ( rule__Export__Group_8_1__0 ) )
+                    // InternalExport.g:1500:1: ( rule__Export__Group_8_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getExportAccess().getGroup_8_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1501:1: ( rule__Export__Group_8_1__0 )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1501:2: rule__Export__Group_8_1__0
+                    // InternalExport.g:1501:1: ( rule__Export__Group_8_1__0 )
+                    // InternalExport.g:1501:2: rule__Export__Group_8_1__0
                     {
-                    pushFollow(FOLLOW_rule__Export__Group_8_1__0_in_rule__Export__Alternatives_83155);
+                    pushFollow(FOLLOW_2);
                     rule__Export__Group_8_1__0();
 
                     state._fsp--;
@@ -4619,26 +4619,26 @@ else if ( (LA3_0==56) ) {
 
 
     // $ANTLR start "rule__Expression__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1510:1: rule__Expression__Alternatives : ( ( ruleLetExpression ) | ( ( ruleCastedExpression ) ) | ( ruleChainExpression ) );
+    // InternalExport.g:1510:1: rule__Expression__Alternatives : ( ( ruleLetExpression ) | ( ( ruleCastedExpression ) ) | ( ruleChainExpression ) );
     public final void rule__Expression__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1514:1: ( ( ruleLetExpression ) | ( ( ruleCastedExpression ) ) | ( ruleChainExpression ) )
+            // InternalExport.g:1514:1: ( ( ruleLetExpression ) | ( ( ruleCastedExpression ) ) | ( ruleChainExpression ) )
             int alt4=3;
             alt4 = dfa4.predict(input);
             switch (alt4) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1515:1: ( ruleLetExpression )
+                    // InternalExport.g:1515:1: ( ruleLetExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1515:1: ( ruleLetExpression )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1516:1: ruleLetExpression
+                    // InternalExport.g:1515:1: ( ruleLetExpression )
+                    // InternalExport.g:1516:1: ruleLetExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getExpressionAccess().getLetExpressionParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleLetExpression_in_rule__Expression__Alternatives3188);
+                    pushFollow(FOLLOW_2);
                     ruleLetExpression();
 
                     state._fsp--;
@@ -4653,18 +4653,18 @@ public final void rule__Expression__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1521:6: ( ( ruleCastedExpression ) )
+                    // InternalExport.g:1521:6: ( ( ruleCastedExpression ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1521:6: ( ( ruleCastedExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1522:1: ( ruleCastedExpression )
+                    // InternalExport.g:1521:6: ( ( ruleCastedExpression ) )
+                    // InternalExport.g:1522:1: ( ruleCastedExpression )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getExpressionAccess().getCastedExpressionParserRuleCall_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1523:1: ( ruleCastedExpression )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1523:3: ruleCastedExpression
+                    // InternalExport.g:1523:1: ( ruleCastedExpression )
+                    // InternalExport.g:1523:3: ruleCastedExpression
                     {
-                    pushFollow(FOLLOW_ruleCastedExpression_in_rule__Expression__Alternatives3206);
+                    pushFollow(FOLLOW_2);
                     ruleCastedExpression();
 
                     state._fsp--;
@@ -4682,15 +4682,15 @@ public final void rule__Expression__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1527:6: ( ruleChainExpression )
+                    // InternalExport.g:1527:6: ( ruleChainExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1527:6: ( ruleChainExpression )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1528:1: ruleChainExpression
+                    // InternalExport.g:1527:6: ( ruleChainExpression )
+                    // InternalExport.g:1528:1: ruleChainExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getExpressionAccess().getChainExpressionParserRuleCall_2()); 
                     }
-                    pushFollow(FOLLOW_ruleChainExpression_in_rule__Expression__Alternatives3224);
+                    pushFollow(FOLLOW_2);
                     ruleChainExpression();
 
                     state._fsp--;
@@ -4722,13 +4722,13 @@ public final void rule__Expression__Alternatives() throws RecognitionException {
 
 
     // $ANTLR start "rule__ChainedExpression__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1539:1: rule__ChainedExpression__Alternatives : ( ( ruleIfExpressionKw ) | ( ruleIfExpressionTri ) | ( ruleSwitchExpression ) );
+    // InternalExport.g:1539:1: rule__ChainedExpression__Alternatives : ( ( ruleIfExpressionKw ) | ( ruleIfExpressionTri ) | ( ruleSwitchExpression ) );
     public final void rule__ChainedExpression__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1543:1: ( ( ruleIfExpressionKw ) | ( ruleIfExpressionTri ) | ( ruleSwitchExpression ) )
+            // InternalExport.g:1543:1: ( ( ruleIfExpressionKw ) | ( ruleIfExpressionTri ) | ( ruleSwitchExpression ) )
             int alt5=3;
             switch ( input.LA(1) ) {
             case 62:
@@ -4780,15 +4780,15 @@ public final void rule__ChainedExpression__Alternatives() throws RecognitionExce
 
             switch (alt5) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1544:1: ( ruleIfExpressionKw )
+                    // InternalExport.g:1544:1: ( ruleIfExpressionKw )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1544:1: ( ruleIfExpressionKw )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1545:1: ruleIfExpressionKw
+                    // InternalExport.g:1544:1: ( ruleIfExpressionKw )
+                    // InternalExport.g:1545:1: ruleIfExpressionKw
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getChainedExpressionAccess().getIfExpressionKwParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleIfExpressionKw_in_rule__ChainedExpression__Alternatives3257);
+                    pushFollow(FOLLOW_2);
                     ruleIfExpressionKw();
 
                     state._fsp--;
@@ -4803,15 +4803,15 @@ public final void rule__ChainedExpression__Alternatives() throws RecognitionExce
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1550:6: ( ruleIfExpressionTri )
+                    // InternalExport.g:1550:6: ( ruleIfExpressionTri )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1550:6: ( ruleIfExpressionTri )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1551:1: ruleIfExpressionTri
+                    // InternalExport.g:1550:6: ( ruleIfExpressionTri )
+                    // InternalExport.g:1551:1: ruleIfExpressionTri
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getChainedExpressionAccess().getIfExpressionTriParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleIfExpressionTri_in_rule__ChainedExpression__Alternatives3274);
+                    pushFollow(FOLLOW_2);
                     ruleIfExpressionTri();
 
                     state._fsp--;
@@ -4826,15 +4826,15 @@ public final void rule__ChainedExpression__Alternatives() throws RecognitionExce
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1556:6: ( ruleSwitchExpression )
+                    // InternalExport.g:1556:6: ( ruleSwitchExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1556:6: ( ruleSwitchExpression )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1557:1: ruleSwitchExpression
+                    // InternalExport.g:1556:6: ( ruleSwitchExpression )
+                    // InternalExport.g:1557:1: ruleSwitchExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getChainedExpressionAccess().getSwitchExpressionParserRuleCall_2()); 
                     }
-                    pushFollow(FOLLOW_ruleSwitchExpression_in_rule__ChainedExpression__Alternatives3291);
+                    pushFollow(FOLLOW_2);
                     ruleSwitchExpression();
 
                     state._fsp--;
@@ -4866,13 +4866,13 @@ public final void rule__ChainedExpression__Alternatives() throws RecognitionExce
 
 
     // $ANTLR start "rule__RelationalExpression__OperatorAlternatives_1_1_0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1567:1: rule__RelationalExpression__OperatorAlternatives_1_1_0 : ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) );
+    // InternalExport.g:1567:1: rule__RelationalExpression__OperatorAlternatives_1_1_0 : ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) );
     public final void rule__RelationalExpression__OperatorAlternatives_1_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1571:1: ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) )
+            // InternalExport.g:1571:1: ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) )
             int alt6=6;
             switch ( input.LA(1) ) {
             case 12:
@@ -4915,15 +4915,15 @@ public final void rule__RelationalExpression__OperatorAlternatives_1_1_0() throw
 
             switch (alt6) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1572:1: ( '==' )
+                    // InternalExport.g:1572:1: ( '==' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1572:1: ( '==' )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1573:1: '=='
+                    // InternalExport.g:1572:1: ( '==' )
+                    // InternalExport.g:1573:1: '=='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getRelationalExpressionAccess().getOperatorEqualsSignEqualsSignKeyword_1_1_0_0()); 
                     }
-                    match(input,12,FOLLOW_12_in_rule__RelationalExpression__OperatorAlternatives_1_1_03324); if (state.failed) return ;
+                    match(input,12,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getRelationalExpressionAccess().getOperatorEqualsSignEqualsSignKeyword_1_1_0_0()); 
                     }
@@ -4934,15 +4934,15 @@ public final void rule__RelationalExpression__OperatorAlternatives_1_1_0() throw
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1580:6: ( '!=' )
+                    // InternalExport.g:1580:6: ( '!=' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1580:6: ( '!=' )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1581:1: '!='
+                    // InternalExport.g:1580:6: ( '!=' )
+                    // InternalExport.g:1581:1: '!='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getRelationalExpressionAccess().getOperatorExclamationMarkEqualsSignKeyword_1_1_0_1()); 
                     }
-                    match(input,13,FOLLOW_13_in_rule__RelationalExpression__OperatorAlternatives_1_1_03344); if (state.failed) return ;
+                    match(input,13,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getRelationalExpressionAccess().getOperatorExclamationMarkEqualsSignKeyword_1_1_0_1()); 
                     }
@@ -4953,15 +4953,15 @@ public final void rule__RelationalExpression__OperatorAlternatives_1_1_0() throw
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1588:6: ( '>=' )
+                    // InternalExport.g:1588:6: ( '>=' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1588:6: ( '>=' )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1589:1: '>='
+                    // InternalExport.g:1588:6: ( '>=' )
+                    // InternalExport.g:1589:1: '>='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getRelationalExpressionAccess().getOperatorGreaterThanSignEqualsSignKeyword_1_1_0_2()); 
                     }
-                    match(input,14,FOLLOW_14_in_rule__RelationalExpression__OperatorAlternatives_1_1_03364); if (state.failed) return ;
+                    match(input,14,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getRelationalExpressionAccess().getOperatorGreaterThanSignEqualsSignKeyword_1_1_0_2()); 
                     }
@@ -4972,15 +4972,15 @@ public final void rule__RelationalExpression__OperatorAlternatives_1_1_0() throw
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1596:6: ( '<=' )
+                    // InternalExport.g:1596:6: ( '<=' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1596:6: ( '<=' )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1597:1: '<='
+                    // InternalExport.g:1596:6: ( '<=' )
+                    // InternalExport.g:1597:1: '<='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getRelationalExpressionAccess().getOperatorLessThanSignEqualsSignKeyword_1_1_0_3()); 
                     }
-                    match(input,15,FOLLOW_15_in_rule__RelationalExpression__OperatorAlternatives_1_1_03384); if (state.failed) return ;
+                    match(input,15,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getRelationalExpressionAccess().getOperatorLessThanSignEqualsSignKeyword_1_1_0_3()); 
                     }
@@ -4991,15 +4991,15 @@ public final void rule__RelationalExpression__OperatorAlternatives_1_1_0() throw
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1604:6: ( '>' )
+                    // InternalExport.g:1604:6: ( '>' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1604:6: ( '>' )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1605:1: '>'
+                    // InternalExport.g:1604:6: ( '>' )
+                    // InternalExport.g:1605:1: '>'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getRelationalExpressionAccess().getOperatorGreaterThanSignKeyword_1_1_0_4()); 
                     }
-                    match(input,16,FOLLOW_16_in_rule__RelationalExpression__OperatorAlternatives_1_1_03404); if (state.failed) return ;
+                    match(input,16,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getRelationalExpressionAccess().getOperatorGreaterThanSignKeyword_1_1_0_4()); 
                     }
@@ -5010,15 +5010,15 @@ public final void rule__RelationalExpression__OperatorAlternatives_1_1_0() throw
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1612:6: ( '<' )
+                    // InternalExport.g:1612:6: ( '<' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1612:6: ( '<' )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1613:1: '<'
+                    // InternalExport.g:1612:6: ( '<' )
+                    // InternalExport.g:1613:1: '<'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getRelationalExpressionAccess().getOperatorLessThanSignKeyword_1_1_0_5()); 
                     }
-                    match(input,17,FOLLOW_17_in_rule__RelationalExpression__OperatorAlternatives_1_1_03424); if (state.failed) return ;
+                    match(input,17,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getRelationalExpressionAccess().getOperatorLessThanSignKeyword_1_1_0_5()); 
                     }
@@ -5046,13 +5046,13 @@ public final void rule__RelationalExpression__OperatorAlternatives_1_1_0() throw
 
 
     // $ANTLR start "rule__AdditiveExpression__NameAlternatives_1_1_0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1625:1: rule__AdditiveExpression__NameAlternatives_1_1_0 : ( ( '+' ) | ( '-' ) );
+    // InternalExport.g:1625:1: rule__AdditiveExpression__NameAlternatives_1_1_0 : ( ( '+' ) | ( '-' ) );
     public final void rule__AdditiveExpression__NameAlternatives_1_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1629:1: ( ( '+' ) | ( '-' ) )
+            // InternalExport.g:1629:1: ( ( '+' ) | ( '-' ) )
             int alt7=2;
             int LA7_0 = input.LA(1);
 
@@ -5071,15 +5071,15 @@ else if ( (LA7_0==19) ) {
             }
             switch (alt7) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1630:1: ( '+' )
+                    // InternalExport.g:1630:1: ( '+' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1630:1: ( '+' )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1631:1: '+'
+                    // InternalExport.g:1630:1: ( '+' )
+                    // InternalExport.g:1631:1: '+'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getAdditiveExpressionAccess().getNamePlusSignKeyword_1_1_0_0()); 
                     }
-                    match(input,18,FOLLOW_18_in_rule__AdditiveExpression__NameAlternatives_1_1_03459); if (state.failed) return ;
+                    match(input,18,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getAdditiveExpressionAccess().getNamePlusSignKeyword_1_1_0_0()); 
                     }
@@ -5090,15 +5090,15 @@ else if ( (LA7_0==19) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1638:6: ( '-' )
+                    // InternalExport.g:1638:6: ( '-' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1638:6: ( '-' )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1639:1: '-'
+                    // InternalExport.g:1638:6: ( '-' )
+                    // InternalExport.g:1639:1: '-'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getAdditiveExpressionAccess().getNameHyphenMinusKeyword_1_1_0_1()); 
                     }
-                    match(input,19,FOLLOW_19_in_rule__AdditiveExpression__NameAlternatives_1_1_03479); if (state.failed) return ;
+                    match(input,19,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getAdditiveExpressionAccess().getNameHyphenMinusKeyword_1_1_0_1()); 
                     }
@@ -5126,13 +5126,13 @@ else if ( (LA7_0==19) ) {
 
 
     // $ANTLR start "rule__MultiplicativeExpression__NameAlternatives_1_1_0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1651:1: rule__MultiplicativeExpression__NameAlternatives_1_1_0 : ( ( '*' ) | ( '/' ) );
+    // InternalExport.g:1651:1: rule__MultiplicativeExpression__NameAlternatives_1_1_0 : ( ( '*' ) | ( '/' ) );
     public final void rule__MultiplicativeExpression__NameAlternatives_1_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1655:1: ( ( '*' ) | ( '/' ) )
+            // InternalExport.g:1655:1: ( ( '*' ) | ( '/' ) )
             int alt8=2;
             int LA8_0 = input.LA(1);
 
@@ -5151,15 +5151,15 @@ else if ( (LA8_0==21) ) {
             }
             switch (alt8) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1656:1: ( '*' )
+                    // InternalExport.g:1656:1: ( '*' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1656:1: ( '*' )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1657:1: '*'
+                    // InternalExport.g:1656:1: ( '*' )
+                    // InternalExport.g:1657:1: '*'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getMultiplicativeExpressionAccess().getNameAsteriskKeyword_1_1_0_0()); 
                     }
-                    match(input,20,FOLLOW_20_in_rule__MultiplicativeExpression__NameAlternatives_1_1_03514); if (state.failed) return ;
+                    match(input,20,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getMultiplicativeExpressionAccess().getNameAsteriskKeyword_1_1_0_0()); 
                     }
@@ -5170,15 +5170,15 @@ else if ( (LA8_0==21) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1664:6: ( '/' )
+                    // InternalExport.g:1664:6: ( '/' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1664:6: ( '/' )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1665:1: '/'
+                    // InternalExport.g:1664:6: ( '/' )
+                    // InternalExport.g:1665:1: '/'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getMultiplicativeExpressionAccess().getNameSolidusKeyword_1_1_0_1()); 
                     }
-                    match(input,21,FOLLOW_21_in_rule__MultiplicativeExpression__NameAlternatives_1_1_03534); if (state.failed) return ;
+                    match(input,21,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getMultiplicativeExpressionAccess().getNameSolidusKeyword_1_1_0_1()); 
                     }
@@ -5206,13 +5206,13 @@ else if ( (LA8_0==21) ) {
 
 
     // $ANTLR start "rule__UnaryOrInfixExpression__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1677:1: rule__UnaryOrInfixExpression__Alternatives : ( ( ruleUnaryExpression ) | ( ruleInfixExpression ) );
+    // InternalExport.g:1677:1: rule__UnaryOrInfixExpression__Alternatives : ( ( ruleUnaryExpression ) | ( ruleInfixExpression ) );
     public final void rule__UnaryOrInfixExpression__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1681:1: ( ( ruleUnaryExpression ) | ( ruleInfixExpression ) )
+            // InternalExport.g:1681:1: ( ( ruleUnaryExpression ) | ( ruleInfixExpression ) )
             int alt9=2;
             int LA9_0 = input.LA(1);
 
@@ -5231,15 +5231,15 @@ else if ( ((LA9_0>=RULE_ID && LA9_0<=RULE_REAL)||(LA9_0>=23 && LA9_0<=35)||LA9_0
             }
             switch (alt9) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1682:1: ( ruleUnaryExpression )
+                    // InternalExport.g:1682:1: ( ruleUnaryExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1682:1: ( ruleUnaryExpression )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1683:1: ruleUnaryExpression
+                    // InternalExport.g:1682:1: ( ruleUnaryExpression )
+                    // InternalExport.g:1683:1: ruleUnaryExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getUnaryOrInfixExpressionAccess().getUnaryExpressionParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleUnaryExpression_in_rule__UnaryOrInfixExpression__Alternatives3568);
+                    pushFollow(FOLLOW_2);
                     ruleUnaryExpression();
 
                     state._fsp--;
@@ -5254,15 +5254,15 @@ else if ( ((LA9_0>=RULE_ID && LA9_0<=RULE_REAL)||(LA9_0>=23 && LA9_0<=35)||LA9_0
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1688:6: ( ruleInfixExpression )
+                    // InternalExport.g:1688:6: ( ruleInfixExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1688:6: ( ruleInfixExpression )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1689:1: ruleInfixExpression
+                    // InternalExport.g:1688:6: ( ruleInfixExpression )
+                    // InternalExport.g:1689:1: ruleInfixExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getUnaryOrInfixExpressionAccess().getInfixExpressionParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleInfixExpression_in_rule__UnaryOrInfixExpression__Alternatives3585);
+                    pushFollow(FOLLOW_2);
                     ruleInfixExpression();
 
                     state._fsp--;
@@ -5294,13 +5294,13 @@ else if ( ((LA9_0>=RULE_ID && LA9_0<=RULE_REAL)||(LA9_0>=23 && LA9_0<=35)||LA9_0
 
 
     // $ANTLR start "rule__UnaryExpression__NameAlternatives_0_0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1699:1: rule__UnaryExpression__NameAlternatives_0_0 : ( ( '!' ) | ( '-' ) );
+    // InternalExport.g:1699:1: rule__UnaryExpression__NameAlternatives_0_0 : ( ( '!' ) | ( '-' ) );
     public final void rule__UnaryExpression__NameAlternatives_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1703:1: ( ( '!' ) | ( '-' ) )
+            // InternalExport.g:1703:1: ( ( '!' ) | ( '-' ) )
             int alt10=2;
             int LA10_0 = input.LA(1);
 
@@ -5319,15 +5319,15 @@ else if ( (LA10_0==19) ) {
             }
             switch (alt10) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1704:1: ( '!' )
+                    // InternalExport.g:1704:1: ( '!' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1704:1: ( '!' )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1705:1: '!'
+                    // InternalExport.g:1704:1: ( '!' )
+                    // InternalExport.g:1705:1: '!'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getUnaryExpressionAccess().getNameExclamationMarkKeyword_0_0_0()); 
                     }
-                    match(input,22,FOLLOW_22_in_rule__UnaryExpression__NameAlternatives_0_03618); if (state.failed) return ;
+                    match(input,22,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getUnaryExpressionAccess().getNameExclamationMarkKeyword_0_0_0()); 
                     }
@@ -5338,15 +5338,15 @@ else if ( (LA10_0==19) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1712:6: ( '-' )
+                    // InternalExport.g:1712:6: ( '-' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1712:6: ( '-' )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1713:1: '-'
+                    // InternalExport.g:1712:6: ( '-' )
+                    // InternalExport.g:1713:1: '-'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getUnaryExpressionAccess().getNameHyphenMinusKeyword_0_0_1()); 
                     }
-                    match(input,19,FOLLOW_19_in_rule__UnaryExpression__NameAlternatives_0_03638); if (state.failed) return ;
+                    match(input,19,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getUnaryExpressionAccess().getNameHyphenMinusKeyword_0_0_1()); 
                     }
@@ -5374,13 +5374,13 @@ else if ( (LA10_0==19) ) {
 
 
     // $ANTLR start "rule__InfixExpression__Alternatives_1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1725:1: rule__InfixExpression__Alternatives_1 : ( ( ( rule__InfixExpression__Group_1_0__0 ) ) | ( ( rule__InfixExpression__Group_1_1__0 ) ) | ( ( rule__InfixExpression__Group_1_2__0 ) ) | ( ( rule__InfixExpression__Group_1_3__0 ) ) );
+    // InternalExport.g:1725:1: rule__InfixExpression__Alternatives_1 : ( ( ( rule__InfixExpression__Group_1_0__0 ) ) | ( ( rule__InfixExpression__Group_1_1__0 ) ) | ( ( rule__InfixExpression__Group_1_2__0 ) ) | ( ( rule__InfixExpression__Group_1_3__0 ) ) );
     public final void rule__InfixExpression__Alternatives_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1729:1: ( ( ( rule__InfixExpression__Group_1_0__0 ) ) | ( ( rule__InfixExpression__Group_1_1__0 ) ) | ( ( rule__InfixExpression__Group_1_2__0 ) ) | ( ( rule__InfixExpression__Group_1_3__0 ) ) )
+            // InternalExport.g:1729:1: ( ( ( rule__InfixExpression__Group_1_0__0 ) ) | ( ( rule__InfixExpression__Group_1_1__0 ) ) | ( ( rule__InfixExpression__Group_1_2__0 ) ) | ( ( rule__InfixExpression__Group_1_3__0 ) ) )
             int alt11=4;
             int LA11_0 = input.LA(1);
 
@@ -5447,18 +5447,18 @@ else if ( (LA11_4==51) ) {
             }
             switch (alt11) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1730:1: ( ( rule__InfixExpression__Group_1_0__0 ) )
+                    // InternalExport.g:1730:1: ( ( rule__InfixExpression__Group_1_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1730:1: ( ( rule__InfixExpression__Group_1_0__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1731:1: ( rule__InfixExpression__Group_1_0__0 )
+                    // InternalExport.g:1730:1: ( ( rule__InfixExpression__Group_1_0__0 ) )
+                    // InternalExport.g:1731:1: ( rule__InfixExpression__Group_1_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getInfixExpressionAccess().getGroup_1_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1732:1: ( rule__InfixExpression__Group_1_0__0 )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1732:2: rule__InfixExpression__Group_1_0__0
+                    // InternalExport.g:1732:1: ( rule__InfixExpression__Group_1_0__0 )
+                    // InternalExport.g:1732:2: rule__InfixExpression__Group_1_0__0
                     {
-                    pushFollow(FOLLOW_rule__InfixExpression__Group_1_0__0_in_rule__InfixExpression__Alternatives_13672);
+                    pushFollow(FOLLOW_2);
                     rule__InfixExpression__Group_1_0__0();
 
                     state._fsp--;
@@ -5476,18 +5476,18 @@ else if ( (LA11_4==51) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1736:6: ( ( rule__InfixExpression__Group_1_1__0 ) )
+                    // InternalExport.g:1736:6: ( ( rule__InfixExpression__Group_1_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1736:6: ( ( rule__InfixExpression__Group_1_1__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1737:1: ( rule__InfixExpression__Group_1_1__0 )
+                    // InternalExport.g:1736:6: ( ( rule__InfixExpression__Group_1_1__0 ) )
+                    // InternalExport.g:1737:1: ( rule__InfixExpression__Group_1_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getInfixExpressionAccess().getGroup_1_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1738:1: ( rule__InfixExpression__Group_1_1__0 )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1738:2: rule__InfixExpression__Group_1_1__0
+                    // InternalExport.g:1738:1: ( rule__InfixExpression__Group_1_1__0 )
+                    // InternalExport.g:1738:2: rule__InfixExpression__Group_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__InfixExpression__Group_1_1__0_in_rule__InfixExpression__Alternatives_13690);
+                    pushFollow(FOLLOW_2);
                     rule__InfixExpression__Group_1_1__0();
 
                     state._fsp--;
@@ -5505,18 +5505,18 @@ else if ( (LA11_4==51) ) {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1742:6: ( ( rule__InfixExpression__Group_1_2__0 ) )
+                    // InternalExport.g:1742:6: ( ( rule__InfixExpression__Group_1_2__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1742:6: ( ( rule__InfixExpression__Group_1_2__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1743:1: ( rule__InfixExpression__Group_1_2__0 )
+                    // InternalExport.g:1742:6: ( ( rule__InfixExpression__Group_1_2__0 ) )
+                    // InternalExport.g:1743:1: ( rule__InfixExpression__Group_1_2__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getInfixExpressionAccess().getGroup_1_2()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1744:1: ( rule__InfixExpression__Group_1_2__0 )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1744:2: rule__InfixExpression__Group_1_2__0
+                    // InternalExport.g:1744:1: ( rule__InfixExpression__Group_1_2__0 )
+                    // InternalExport.g:1744:2: rule__InfixExpression__Group_1_2__0
                     {
-                    pushFollow(FOLLOW_rule__InfixExpression__Group_1_2__0_in_rule__InfixExpression__Alternatives_13708);
+                    pushFollow(FOLLOW_2);
                     rule__InfixExpression__Group_1_2__0();
 
                     state._fsp--;
@@ -5534,18 +5534,18 @@ else if ( (LA11_4==51) ) {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1748:6: ( ( rule__InfixExpression__Group_1_3__0 ) )
+                    // InternalExport.g:1748:6: ( ( rule__InfixExpression__Group_1_3__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1748:6: ( ( rule__InfixExpression__Group_1_3__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1749:1: ( rule__InfixExpression__Group_1_3__0 )
+                    // InternalExport.g:1748:6: ( ( rule__InfixExpression__Group_1_3__0 ) )
+                    // InternalExport.g:1749:1: ( rule__InfixExpression__Group_1_3__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getInfixExpressionAccess().getGroup_1_3()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1750:1: ( rule__InfixExpression__Group_1_3__0 )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1750:2: rule__InfixExpression__Group_1_3__0
+                    // InternalExport.g:1750:1: ( rule__InfixExpression__Group_1_3__0 )
+                    // InternalExport.g:1750:2: rule__InfixExpression__Group_1_3__0
                     {
-                    pushFollow(FOLLOW_rule__InfixExpression__Group_1_3__0_in_rule__InfixExpression__Alternatives_13726);
+                    pushFollow(FOLLOW_2);
                     rule__InfixExpression__Group_1_3__0();
 
                     state._fsp--;
@@ -5580,13 +5580,13 @@ else if ( (LA11_4==51) ) {
 
 
     // $ANTLR start "rule__InfixExpression__NameAlternatives_1_3_2_0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1759:1: rule__InfixExpression__NameAlternatives_1_3_2_0 : ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) );
+    // InternalExport.g:1759:1: rule__InfixExpression__NameAlternatives_1_3_2_0 : ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) );
     public final void rule__InfixExpression__NameAlternatives_1_3_2_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1763:1: ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) )
+            // InternalExport.g:1763:1: ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) )
             int alt12=8;
             switch ( input.LA(1) ) {
             case 23:
@@ -5639,15 +5639,15 @@ public final void rule__InfixExpression__NameAlternatives_1_3_2_0() throws Recog
 
             switch (alt12) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1764:1: ( 'collect' )
+                    // InternalExport.g:1764:1: ( 'collect' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1764:1: ( 'collect' )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1765:1: 'collect'
+                    // InternalExport.g:1764:1: ( 'collect' )
+                    // InternalExport.g:1765:1: 'collect'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getInfixExpressionAccess().getNameCollectKeyword_1_3_2_0_0()); 
                     }
-                    match(input,23,FOLLOW_23_in_rule__InfixExpression__NameAlternatives_1_3_2_03760); if (state.failed) return ;
+                    match(input,23,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getInfixExpressionAccess().getNameCollectKeyword_1_3_2_0_0()); 
                     }
@@ -5658,15 +5658,15 @@ public final void rule__InfixExpression__NameAlternatives_1_3_2_0() throws Recog
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1772:6: ( 'select' )
+                    // InternalExport.g:1772:6: ( 'select' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1772:6: ( 'select' )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1773:1: 'select'
+                    // InternalExport.g:1772:6: ( 'select' )
+                    // InternalExport.g:1773:1: 'select'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getInfixExpressionAccess().getNameSelectKeyword_1_3_2_0_1()); 
                     }
-                    match(input,24,FOLLOW_24_in_rule__InfixExpression__NameAlternatives_1_3_2_03780); if (state.failed) return ;
+                    match(input,24,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getInfixExpressionAccess().getNameSelectKeyword_1_3_2_0_1()); 
                     }
@@ -5677,15 +5677,15 @@ public final void rule__InfixExpression__NameAlternatives_1_3_2_0() throws Recog
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1780:6: ( 'selectFirst' )
+                    // InternalExport.g:1780:6: ( 'selectFirst' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1780:6: ( 'selectFirst' )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1781:1: 'selectFirst'
+                    // InternalExport.g:1780:6: ( 'selectFirst' )
+                    // InternalExport.g:1781:1: 'selectFirst'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getInfixExpressionAccess().getNameSelectFirstKeyword_1_3_2_0_2()); 
                     }
-                    match(input,25,FOLLOW_25_in_rule__InfixExpression__NameAlternatives_1_3_2_03800); if (state.failed) return ;
+                    match(input,25,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getInfixExpressionAccess().getNameSelectFirstKeyword_1_3_2_0_2()); 
                     }
@@ -5696,15 +5696,15 @@ public final void rule__InfixExpression__NameAlternatives_1_3_2_0() throws Recog
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1788:6: ( 'reject' )
+                    // InternalExport.g:1788:6: ( 'reject' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1788:6: ( 'reject' )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1789:1: 'reject'
+                    // InternalExport.g:1788:6: ( 'reject' )
+                    // InternalExport.g:1789:1: 'reject'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getInfixExpressionAccess().getNameRejectKeyword_1_3_2_0_3()); 
                     }
-                    match(input,26,FOLLOW_26_in_rule__InfixExpression__NameAlternatives_1_3_2_03820); if (state.failed) return ;
+                    match(input,26,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getInfixExpressionAccess().getNameRejectKeyword_1_3_2_0_3()); 
                     }
@@ -5715,15 +5715,15 @@ public final void rule__InfixExpression__NameAlternatives_1_3_2_0() throws Recog
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1796:6: ( 'exists' )
+                    // InternalExport.g:1796:6: ( 'exists' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1796:6: ( 'exists' )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1797:1: 'exists'
+                    // InternalExport.g:1796:6: ( 'exists' )
+                    // InternalExport.g:1797:1: 'exists'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getInfixExpressionAccess().getNameExistsKeyword_1_3_2_0_4()); 
                     }
-                    match(input,27,FOLLOW_27_in_rule__InfixExpression__NameAlternatives_1_3_2_03840); if (state.failed) return ;
+                    match(input,27,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getInfixExpressionAccess().getNameExistsKeyword_1_3_2_0_4()); 
                     }
@@ -5734,15 +5734,15 @@ public final void rule__InfixExpression__NameAlternatives_1_3_2_0() throws Recog
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1804:6: ( 'notExists' )
+                    // InternalExport.g:1804:6: ( 'notExists' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1804:6: ( 'notExists' )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1805:1: 'notExists'
+                    // InternalExport.g:1804:6: ( 'notExists' )
+                    // InternalExport.g:1805:1: 'notExists'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getInfixExpressionAccess().getNameNotExistsKeyword_1_3_2_0_5()); 
                     }
-                    match(input,28,FOLLOW_28_in_rule__InfixExpression__NameAlternatives_1_3_2_03860); if (state.failed) return ;
+                    match(input,28,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getInfixExpressionAccess().getNameNotExistsKeyword_1_3_2_0_5()); 
                     }
@@ -5753,15 +5753,15 @@ public final void rule__InfixExpression__NameAlternatives_1_3_2_0() throws Recog
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1812:6: ( 'sortBy' )
+                    // InternalExport.g:1812:6: ( 'sortBy' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1812:6: ( 'sortBy' )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1813:1: 'sortBy'
+                    // InternalExport.g:1812:6: ( 'sortBy' )
+                    // InternalExport.g:1813:1: 'sortBy'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getInfixExpressionAccess().getNameSortByKeyword_1_3_2_0_6()); 
                     }
-                    match(input,29,FOLLOW_29_in_rule__InfixExpression__NameAlternatives_1_3_2_03880); if (state.failed) return ;
+                    match(input,29,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getInfixExpressionAccess().getNameSortByKeyword_1_3_2_0_6()); 
                     }
@@ -5772,15 +5772,15 @@ public final void rule__InfixExpression__NameAlternatives_1_3_2_0() throws Recog
                     }
                     break;
                 case 8 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1820:6: ( 'forAll' )
+                    // InternalExport.g:1820:6: ( 'forAll' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1820:6: ( 'forAll' )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1821:1: 'forAll'
+                    // InternalExport.g:1820:6: ( 'forAll' )
+                    // InternalExport.g:1821:1: 'forAll'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getInfixExpressionAccess().getNameForAllKeyword_1_3_2_0_7()); 
                     }
-                    match(input,30,FOLLOW_30_in_rule__InfixExpression__NameAlternatives_1_3_2_03900); if (state.failed) return ;
+                    match(input,30,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getInfixExpressionAccess().getNameForAllKeyword_1_3_2_0_7()); 
                     }
@@ -5808,13 +5808,13 @@ public final void rule__InfixExpression__NameAlternatives_1_3_2_0() throws Recog
 
 
     // $ANTLR start "rule__PrimaryExpression__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1833:1: rule__PrimaryExpression__Alternatives : ( ( ruleLiteral ) | ( ruleFeatureCall ) | ( ruleListLiteral ) | ( ruleConstructorCallExpression ) | ( ruleGlobalVarExpression ) | ( ruleParanthesizedExpression ) );
+    // InternalExport.g:1833:1: rule__PrimaryExpression__Alternatives : ( ( ruleLiteral ) | ( ruleFeatureCall ) | ( ruleListLiteral ) | ( ruleConstructorCallExpression ) | ( ruleGlobalVarExpression ) | ( ruleParanthesizedExpression ) );
     public final void rule__PrimaryExpression__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1837:1: ( ( ruleLiteral ) | ( ruleFeatureCall ) | ( ruleListLiteral ) | ( ruleConstructorCallExpression ) | ( ruleGlobalVarExpression ) | ( ruleParanthesizedExpression ) )
+            // InternalExport.g:1837:1: ( ( ruleLiteral ) | ( ruleFeatureCall ) | ( ruleListLiteral ) | ( ruleConstructorCallExpression ) | ( ruleGlobalVarExpression ) | ( ruleParanthesizedExpression ) )
             int alt13=6;
             switch ( input.LA(1) ) {
             case RULE_STRING:
@@ -5874,15 +5874,15 @@ public final void rule__PrimaryExpression__Alternatives() throws RecognitionExce
 
             switch (alt13) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1838:1: ( ruleLiteral )
+                    // InternalExport.g:1838:1: ( ruleLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1838:1: ( ruleLiteral )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1839:1: ruleLiteral
+                    // InternalExport.g:1838:1: ( ruleLiteral )
+                    // InternalExport.g:1839:1: ruleLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getPrimaryExpressionAccess().getLiteralParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleLiteral_in_rule__PrimaryExpression__Alternatives3934);
+                    pushFollow(FOLLOW_2);
                     ruleLiteral();
 
                     state._fsp--;
@@ -5897,15 +5897,15 @@ public final void rule__PrimaryExpression__Alternatives() throws RecognitionExce
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1844:6: ( ruleFeatureCall )
+                    // InternalExport.g:1844:6: ( ruleFeatureCall )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1844:6: ( ruleFeatureCall )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1845:1: ruleFeatureCall
+                    // InternalExport.g:1844:6: ( ruleFeatureCall )
+                    // InternalExport.g:1845:1: ruleFeatureCall
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getPrimaryExpressionAccess().getFeatureCallParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleFeatureCall_in_rule__PrimaryExpression__Alternatives3951);
+                    pushFollow(FOLLOW_2);
                     ruleFeatureCall();
 
                     state._fsp--;
@@ -5920,15 +5920,15 @@ public final void rule__PrimaryExpression__Alternatives() throws RecognitionExce
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1850:6: ( ruleListLiteral )
+                    // InternalExport.g:1850:6: ( ruleListLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1850:6: ( ruleListLiteral )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1851:1: ruleListLiteral
+                    // InternalExport.g:1850:6: ( ruleListLiteral )
+                    // InternalExport.g:1851:1: ruleListLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getPrimaryExpressionAccess().getListLiteralParserRuleCall_2()); 
                     }
-                    pushFollow(FOLLOW_ruleListLiteral_in_rule__PrimaryExpression__Alternatives3968);
+                    pushFollow(FOLLOW_2);
                     ruleListLiteral();
 
                     state._fsp--;
@@ -5943,15 +5943,15 @@ public final void rule__PrimaryExpression__Alternatives() throws RecognitionExce
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1856:6: ( ruleConstructorCallExpression )
+                    // InternalExport.g:1856:6: ( ruleConstructorCallExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1856:6: ( ruleConstructorCallExpression )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1857:1: ruleConstructorCallExpression
+                    // InternalExport.g:1856:6: ( ruleConstructorCallExpression )
+                    // InternalExport.g:1857:1: ruleConstructorCallExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getPrimaryExpressionAccess().getConstructorCallExpressionParserRuleCall_3()); 
                     }
-                    pushFollow(FOLLOW_ruleConstructorCallExpression_in_rule__PrimaryExpression__Alternatives3985);
+                    pushFollow(FOLLOW_2);
                     ruleConstructorCallExpression();
 
                     state._fsp--;
@@ -5966,15 +5966,15 @@ public final void rule__PrimaryExpression__Alternatives() throws RecognitionExce
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1862:6: ( ruleGlobalVarExpression )
+                    // InternalExport.g:1862:6: ( ruleGlobalVarExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1862:6: ( ruleGlobalVarExpression )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1863:1: ruleGlobalVarExpression
+                    // InternalExport.g:1862:6: ( ruleGlobalVarExpression )
+                    // InternalExport.g:1863:1: ruleGlobalVarExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getPrimaryExpressionAccess().getGlobalVarExpressionParserRuleCall_4()); 
                     }
-                    pushFollow(FOLLOW_ruleGlobalVarExpression_in_rule__PrimaryExpression__Alternatives4002);
+                    pushFollow(FOLLOW_2);
                     ruleGlobalVarExpression();
 
                     state._fsp--;
@@ -5989,15 +5989,15 @@ public final void rule__PrimaryExpression__Alternatives() throws RecognitionExce
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1868:6: ( ruleParanthesizedExpression )
+                    // InternalExport.g:1868:6: ( ruleParanthesizedExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1868:6: ( ruleParanthesizedExpression )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1869:1: ruleParanthesizedExpression
+                    // InternalExport.g:1868:6: ( ruleParanthesizedExpression )
+                    // InternalExport.g:1869:1: ruleParanthesizedExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getPrimaryExpressionAccess().getParanthesizedExpressionParserRuleCall_5()); 
                     }
-                    pushFollow(FOLLOW_ruleParanthesizedExpression_in_rule__PrimaryExpression__Alternatives4019);
+                    pushFollow(FOLLOW_2);
                     ruleParanthesizedExpression();
 
                     state._fsp--;
@@ -6029,13 +6029,13 @@ public final void rule__PrimaryExpression__Alternatives() throws RecognitionExce
 
 
     // $ANTLR start "rule__Literal__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1879:1: rule__Literal__Alternatives : ( ( ruleBooleanLiteral ) | ( ruleIntegerLiteral ) | ( ruleNullLiteral ) | ( ruleRealLiteral ) | ( ruleStringLiteral ) );
+    // InternalExport.g:1879:1: rule__Literal__Alternatives : ( ( ruleBooleanLiteral ) | ( ruleIntegerLiteral ) | ( ruleNullLiteral ) | ( ruleRealLiteral ) | ( ruleStringLiteral ) );
     public final void rule__Literal__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1883:1: ( ( ruleBooleanLiteral ) | ( ruleIntegerLiteral ) | ( ruleNullLiteral ) | ( ruleRealLiteral ) | ( ruleStringLiteral ) )
+            // InternalExport.g:1883:1: ( ( ruleBooleanLiteral ) | ( ruleIntegerLiteral ) | ( ruleNullLiteral ) | ( ruleRealLiteral ) | ( ruleStringLiteral ) )
             int alt14=5;
             switch ( input.LA(1) ) {
             case 31:
@@ -6074,15 +6074,15 @@ public final void rule__Literal__Alternatives() throws RecognitionException {
 
             switch (alt14) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1884:1: ( ruleBooleanLiteral )
+                    // InternalExport.g:1884:1: ( ruleBooleanLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1884:1: ( ruleBooleanLiteral )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1885:1: ruleBooleanLiteral
+                    // InternalExport.g:1884:1: ( ruleBooleanLiteral )
+                    // InternalExport.g:1885:1: ruleBooleanLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getLiteralAccess().getBooleanLiteralParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleBooleanLiteral_in_rule__Literal__Alternatives4051);
+                    pushFollow(FOLLOW_2);
                     ruleBooleanLiteral();
 
                     state._fsp--;
@@ -6097,15 +6097,15 @@ public final void rule__Literal__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1890:6: ( ruleIntegerLiteral )
+                    // InternalExport.g:1890:6: ( ruleIntegerLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1890:6: ( ruleIntegerLiteral )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1891:1: ruleIntegerLiteral
+                    // InternalExport.g:1890:6: ( ruleIntegerLiteral )
+                    // InternalExport.g:1891:1: ruleIntegerLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getLiteralAccess().getIntegerLiteralParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleIntegerLiteral_in_rule__Literal__Alternatives4068);
+                    pushFollow(FOLLOW_2);
                     ruleIntegerLiteral();
 
                     state._fsp--;
@@ -6120,15 +6120,15 @@ public final void rule__Literal__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1896:6: ( ruleNullLiteral )
+                    // InternalExport.g:1896:6: ( ruleNullLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1896:6: ( ruleNullLiteral )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1897:1: ruleNullLiteral
+                    // InternalExport.g:1896:6: ( ruleNullLiteral )
+                    // InternalExport.g:1897:1: ruleNullLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getLiteralAccess().getNullLiteralParserRuleCall_2()); 
                     }
-                    pushFollow(FOLLOW_ruleNullLiteral_in_rule__Literal__Alternatives4085);
+                    pushFollow(FOLLOW_2);
                     ruleNullLiteral();
 
                     state._fsp--;
@@ -6143,15 +6143,15 @@ public final void rule__Literal__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1902:6: ( ruleRealLiteral )
+                    // InternalExport.g:1902:6: ( ruleRealLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1902:6: ( ruleRealLiteral )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1903:1: ruleRealLiteral
+                    // InternalExport.g:1902:6: ( ruleRealLiteral )
+                    // InternalExport.g:1903:1: ruleRealLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getLiteralAccess().getRealLiteralParserRuleCall_3()); 
                     }
-                    pushFollow(FOLLOW_ruleRealLiteral_in_rule__Literal__Alternatives4102);
+                    pushFollow(FOLLOW_2);
                     ruleRealLiteral();
 
                     state._fsp--;
@@ -6166,15 +6166,15 @@ public final void rule__Literal__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1908:6: ( ruleStringLiteral )
+                    // InternalExport.g:1908:6: ( ruleStringLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1908:6: ( ruleStringLiteral )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1909:1: ruleStringLiteral
+                    // InternalExport.g:1908:6: ( ruleStringLiteral )
+                    // InternalExport.g:1909:1: ruleStringLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getLiteralAccess().getStringLiteralParserRuleCall_4()); 
                     }
-                    pushFollow(FOLLOW_ruleStringLiteral_in_rule__Literal__Alternatives4119);
+                    pushFollow(FOLLOW_2);
                     ruleStringLiteral();
 
                     state._fsp--;
@@ -6206,13 +6206,13 @@ public final void rule__Literal__Alternatives() throws RecognitionException {
 
 
     // $ANTLR start "rule__BooleanLiteral__ValAlternatives_0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1919:1: rule__BooleanLiteral__ValAlternatives_0 : ( ( 'true' ) | ( 'false' ) );
+    // InternalExport.g:1919:1: rule__BooleanLiteral__ValAlternatives_0 : ( ( 'true' ) | ( 'false' ) );
     public final void rule__BooleanLiteral__ValAlternatives_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1923:1: ( ( 'true' ) | ( 'false' ) )
+            // InternalExport.g:1923:1: ( ( 'true' ) | ( 'false' ) )
             int alt15=2;
             int LA15_0 = input.LA(1);
 
@@ -6231,15 +6231,15 @@ else if ( (LA15_0==32) ) {
             }
             switch (alt15) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1924:1: ( 'true' )
+                    // InternalExport.g:1924:1: ( 'true' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1924:1: ( 'true' )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1925:1: 'true'
+                    // InternalExport.g:1924:1: ( 'true' )
+                    // InternalExport.g:1925:1: 'true'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getBooleanLiteralAccess().getValTrueKeyword_0_0()); 
                     }
-                    match(input,31,FOLLOW_31_in_rule__BooleanLiteral__ValAlternatives_04152); if (state.failed) return ;
+                    match(input,31,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getBooleanLiteralAccess().getValTrueKeyword_0_0()); 
                     }
@@ -6250,15 +6250,15 @@ else if ( (LA15_0==32) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1932:6: ( 'false' )
+                    // InternalExport.g:1932:6: ( 'false' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1932:6: ( 'false' )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1933:1: 'false'
+                    // InternalExport.g:1932:6: ( 'false' )
+                    // InternalExport.g:1933:1: 'false'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getBooleanLiteralAccess().getValFalseKeyword_0_1()); 
                     }
-                    match(input,32,FOLLOW_32_in_rule__BooleanLiteral__ValAlternatives_04172); if (state.failed) return ;
+                    match(input,32,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getBooleanLiteralAccess().getValFalseKeyword_0_1()); 
                     }
@@ -6286,13 +6286,13 @@ else if ( (LA15_0==32) ) {
 
 
     // $ANTLR start "rule__FeatureCall__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1945:1: rule__FeatureCall__Alternatives : ( ( ruleOperationCall ) | ( ( rule__FeatureCall__TypeAssignment_1 ) ) | ( ruleCollectionExpression ) | ( ruleTypeSelectExpression ) );
+    // InternalExport.g:1945:1: rule__FeatureCall__Alternatives : ( ( ruleOperationCall ) | ( ( rule__FeatureCall__TypeAssignment_1 ) ) | ( ruleCollectionExpression ) | ( ruleTypeSelectExpression ) );
     public final void rule__FeatureCall__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1949:1: ( ( ruleOperationCall ) | ( ( rule__FeatureCall__TypeAssignment_1 ) ) | ( ruleCollectionExpression ) | ( ruleTypeSelectExpression ) )
+            // InternalExport.g:1949:1: ( ( ruleOperationCall ) | ( ( rule__FeatureCall__TypeAssignment_1 ) ) | ( ruleCollectionExpression ) | ( ruleTypeSelectExpression ) )
             int alt16=4;
             switch ( input.LA(1) ) {
             case RULE_ID:
@@ -6348,15 +6348,15 @@ else if ( (LA16_1==51) ) {
 
             switch (alt16) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1950:1: ( ruleOperationCall )
+                    // InternalExport.g:1950:1: ( ruleOperationCall )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1950:1: ( ruleOperationCall )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1951:1: ruleOperationCall
+                    // InternalExport.g:1950:1: ( ruleOperationCall )
+                    // InternalExport.g:1951:1: ruleOperationCall
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallAccess().getOperationCallParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleOperationCall_in_rule__FeatureCall__Alternatives4206);
+                    pushFollow(FOLLOW_2);
                     ruleOperationCall();
 
                     state._fsp--;
@@ -6371,18 +6371,18 @@ else if ( (LA16_1==51) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1956:6: ( ( rule__FeatureCall__TypeAssignment_1 ) )
+                    // InternalExport.g:1956:6: ( ( rule__FeatureCall__TypeAssignment_1 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1956:6: ( ( rule__FeatureCall__TypeAssignment_1 ) )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1957:1: ( rule__FeatureCall__TypeAssignment_1 )
+                    // InternalExport.g:1956:6: ( ( rule__FeatureCall__TypeAssignment_1 ) )
+                    // InternalExport.g:1957:1: ( rule__FeatureCall__TypeAssignment_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallAccess().getTypeAssignment_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1958:1: ( rule__FeatureCall__TypeAssignment_1 )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1958:2: rule__FeatureCall__TypeAssignment_1
+                    // InternalExport.g:1958:1: ( rule__FeatureCall__TypeAssignment_1 )
+                    // InternalExport.g:1958:2: rule__FeatureCall__TypeAssignment_1
                     {
-                    pushFollow(FOLLOW_rule__FeatureCall__TypeAssignment_1_in_rule__FeatureCall__Alternatives4223);
+                    pushFollow(FOLLOW_2);
                     rule__FeatureCall__TypeAssignment_1();
 
                     state._fsp--;
@@ -6400,15 +6400,15 @@ else if ( (LA16_1==51) ) {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1962:6: ( ruleCollectionExpression )
+                    // InternalExport.g:1962:6: ( ruleCollectionExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1962:6: ( ruleCollectionExpression )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1963:1: ruleCollectionExpression
+                    // InternalExport.g:1962:6: ( ruleCollectionExpression )
+                    // InternalExport.g:1963:1: ruleCollectionExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallAccess().getCollectionExpressionParserRuleCall_2()); 
                     }
-                    pushFollow(FOLLOW_ruleCollectionExpression_in_rule__FeatureCall__Alternatives4241);
+                    pushFollow(FOLLOW_2);
                     ruleCollectionExpression();
 
                     state._fsp--;
@@ -6423,15 +6423,15 @@ else if ( (LA16_1==51) ) {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1968:6: ( ruleTypeSelectExpression )
+                    // InternalExport.g:1968:6: ( ruleTypeSelectExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1968:6: ( ruleTypeSelectExpression )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1969:1: ruleTypeSelectExpression
+                    // InternalExport.g:1968:6: ( ruleTypeSelectExpression )
+                    // InternalExport.g:1969:1: ruleTypeSelectExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallAccess().getTypeSelectExpressionParserRuleCall_3()); 
                     }
-                    pushFollow(FOLLOW_ruleTypeSelectExpression_in_rule__FeatureCall__Alternatives4258);
+                    pushFollow(FOLLOW_2);
                     ruleTypeSelectExpression();
 
                     state._fsp--;
@@ -6463,13 +6463,13 @@ else if ( (LA16_1==51) ) {
 
 
     // $ANTLR start "rule__CollectionExpression__NameAlternatives_0_0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1979:1: rule__CollectionExpression__NameAlternatives_0_0 : ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) );
+    // InternalExport.g:1979:1: rule__CollectionExpression__NameAlternatives_0_0 : ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) );
     public final void rule__CollectionExpression__NameAlternatives_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1983:1: ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) )
+            // InternalExport.g:1983:1: ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) )
             int alt17=8;
             switch ( input.LA(1) ) {
             case 23:
@@ -6522,15 +6522,15 @@ public final void rule__CollectionExpression__NameAlternatives_0_0() throws Reco
 
             switch (alt17) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1984:1: ( 'collect' )
+                    // InternalExport.g:1984:1: ( 'collect' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1984:1: ( 'collect' )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1985:1: 'collect'
+                    // InternalExport.g:1984:1: ( 'collect' )
+                    // InternalExport.g:1985:1: 'collect'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getCollectionExpressionAccess().getNameCollectKeyword_0_0_0()); 
                     }
-                    match(input,23,FOLLOW_23_in_rule__CollectionExpression__NameAlternatives_0_04291); if (state.failed) return ;
+                    match(input,23,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getCollectionExpressionAccess().getNameCollectKeyword_0_0_0()); 
                     }
@@ -6541,15 +6541,15 @@ public final void rule__CollectionExpression__NameAlternatives_0_0() throws Reco
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1992:6: ( 'select' )
+                    // InternalExport.g:1992:6: ( 'select' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1992:6: ( 'select' )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1993:1: 'select'
+                    // InternalExport.g:1992:6: ( 'select' )
+                    // InternalExport.g:1993:1: 'select'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getCollectionExpressionAccess().getNameSelectKeyword_0_0_1()); 
                     }
-                    match(input,24,FOLLOW_24_in_rule__CollectionExpression__NameAlternatives_0_04311); if (state.failed) return ;
+                    match(input,24,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getCollectionExpressionAccess().getNameSelectKeyword_0_0_1()); 
                     }
@@ -6560,15 +6560,15 @@ public final void rule__CollectionExpression__NameAlternatives_0_0() throws Reco
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2000:6: ( 'selectFirst' )
+                    // InternalExport.g:2000:6: ( 'selectFirst' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2000:6: ( 'selectFirst' )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2001:1: 'selectFirst'
+                    // InternalExport.g:2000:6: ( 'selectFirst' )
+                    // InternalExport.g:2001:1: 'selectFirst'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getCollectionExpressionAccess().getNameSelectFirstKeyword_0_0_2()); 
                     }
-                    match(input,25,FOLLOW_25_in_rule__CollectionExpression__NameAlternatives_0_04331); if (state.failed) return ;
+                    match(input,25,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getCollectionExpressionAccess().getNameSelectFirstKeyword_0_0_2()); 
                     }
@@ -6579,15 +6579,15 @@ public final void rule__CollectionExpression__NameAlternatives_0_0() throws Reco
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2008:6: ( 'reject' )
+                    // InternalExport.g:2008:6: ( 'reject' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2008:6: ( 'reject' )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2009:1: 'reject'
+                    // InternalExport.g:2008:6: ( 'reject' )
+                    // InternalExport.g:2009:1: 'reject'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getCollectionExpressionAccess().getNameRejectKeyword_0_0_3()); 
                     }
-                    match(input,26,FOLLOW_26_in_rule__CollectionExpression__NameAlternatives_0_04351); if (state.failed) return ;
+                    match(input,26,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getCollectionExpressionAccess().getNameRejectKeyword_0_0_3()); 
                     }
@@ -6598,15 +6598,15 @@ public final void rule__CollectionExpression__NameAlternatives_0_0() throws Reco
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2016:6: ( 'exists' )
+                    // InternalExport.g:2016:6: ( 'exists' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2016:6: ( 'exists' )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2017:1: 'exists'
+                    // InternalExport.g:2016:6: ( 'exists' )
+                    // InternalExport.g:2017:1: 'exists'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getCollectionExpressionAccess().getNameExistsKeyword_0_0_4()); 
                     }
-                    match(input,27,FOLLOW_27_in_rule__CollectionExpression__NameAlternatives_0_04371); if (state.failed) return ;
+                    match(input,27,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getCollectionExpressionAccess().getNameExistsKeyword_0_0_4()); 
                     }
@@ -6617,15 +6617,15 @@ public final void rule__CollectionExpression__NameAlternatives_0_0() throws Reco
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2024:6: ( 'notExists' )
+                    // InternalExport.g:2024:6: ( 'notExists' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2024:6: ( 'notExists' )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2025:1: 'notExists'
+                    // InternalExport.g:2024:6: ( 'notExists' )
+                    // InternalExport.g:2025:1: 'notExists'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getCollectionExpressionAccess().getNameNotExistsKeyword_0_0_5()); 
                     }
-                    match(input,28,FOLLOW_28_in_rule__CollectionExpression__NameAlternatives_0_04391); if (state.failed) return ;
+                    match(input,28,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getCollectionExpressionAccess().getNameNotExistsKeyword_0_0_5()); 
                     }
@@ -6636,15 +6636,15 @@ public final void rule__CollectionExpression__NameAlternatives_0_0() throws Reco
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2032:6: ( 'sortBy' )
+                    // InternalExport.g:2032:6: ( 'sortBy' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2032:6: ( 'sortBy' )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2033:1: 'sortBy'
+                    // InternalExport.g:2032:6: ( 'sortBy' )
+                    // InternalExport.g:2033:1: 'sortBy'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getCollectionExpressionAccess().getNameSortByKeyword_0_0_6()); 
                     }
-                    match(input,29,FOLLOW_29_in_rule__CollectionExpression__NameAlternatives_0_04411); if (state.failed) return ;
+                    match(input,29,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getCollectionExpressionAccess().getNameSortByKeyword_0_0_6()); 
                     }
@@ -6655,15 +6655,15 @@ public final void rule__CollectionExpression__NameAlternatives_0_0() throws Reco
                     }
                     break;
                 case 8 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2040:6: ( 'forAll' )
+                    // InternalExport.g:2040:6: ( 'forAll' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2040:6: ( 'forAll' )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2041:1: 'forAll'
+                    // InternalExport.g:2040:6: ( 'forAll' )
+                    // InternalExport.g:2041:1: 'forAll'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getCollectionExpressionAccess().getNameForAllKeyword_0_0_7()); 
                     }
-                    match(input,30,FOLLOW_30_in_rule__CollectionExpression__NameAlternatives_0_04431); if (state.failed) return ;
+                    match(input,30,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getCollectionExpressionAccess().getNameForAllKeyword_0_0_7()); 
                     }
@@ -6691,13 +6691,13 @@ public final void rule__CollectionExpression__NameAlternatives_0_0() throws Reco
 
 
     // $ANTLR start "rule__Type__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2053:1: rule__Type__Alternatives : ( ( ruleCollectionType ) | ( ruleSimpleType ) );
+    // InternalExport.g:2053:1: rule__Type__Alternatives : ( ( ruleCollectionType ) | ( ruleSimpleType ) );
     public final void rule__Type__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2057:1: ( ( ruleCollectionType ) | ( ruleSimpleType ) )
+            // InternalExport.g:2057:1: ( ( ruleCollectionType ) | ( ruleSimpleType ) )
             int alt18=2;
             int LA18_0 = input.LA(1);
 
@@ -6716,15 +6716,15 @@ else if ( (LA18_0==RULE_ID) ) {
             }
             switch (alt18) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2058:1: ( ruleCollectionType )
+                    // InternalExport.g:2058:1: ( ruleCollectionType )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2058:1: ( ruleCollectionType )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2059:1: ruleCollectionType
+                    // InternalExport.g:2058:1: ( ruleCollectionType )
+                    // InternalExport.g:2059:1: ruleCollectionType
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTypeAccess().getCollectionTypeParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleCollectionType_in_rule__Type__Alternatives4465);
+                    pushFollow(FOLLOW_2);
                     ruleCollectionType();
 
                     state._fsp--;
@@ -6739,15 +6739,15 @@ else if ( (LA18_0==RULE_ID) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2064:6: ( ruleSimpleType )
+                    // InternalExport.g:2064:6: ( ruleSimpleType )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2064:6: ( ruleSimpleType )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2065:1: ruleSimpleType
+                    // InternalExport.g:2064:6: ( ruleSimpleType )
+                    // InternalExport.g:2065:1: ruleSimpleType
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTypeAccess().getSimpleTypeParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleSimpleType_in_rule__Type__Alternatives4482);
+                    pushFollow(FOLLOW_2);
                     ruleSimpleType();
 
                     state._fsp--;
@@ -6779,13 +6779,13 @@ else if ( (LA18_0==RULE_ID) ) {
 
 
     // $ANTLR start "rule__CollectionType__ClAlternatives_0_0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2075:1: rule__CollectionType__ClAlternatives_0_0 : ( ( 'Collection' ) | ( 'List' ) | ( 'Set' ) );
+    // InternalExport.g:2075:1: rule__CollectionType__ClAlternatives_0_0 : ( ( 'Collection' ) | ( 'List' ) | ( 'Set' ) );
     public final void rule__CollectionType__ClAlternatives_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2079:1: ( ( 'Collection' ) | ( 'List' ) | ( 'Set' ) )
+            // InternalExport.g:2079:1: ( ( 'Collection' ) | ( 'List' ) | ( 'Set' ) )
             int alt19=3;
             switch ( input.LA(1) ) {
             case 33:
@@ -6813,15 +6813,15 @@ public final void rule__CollectionType__ClAlternatives_0_0() throws RecognitionE
 
             switch (alt19) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2080:1: ( 'Collection' )
+                    // InternalExport.g:2080:1: ( 'Collection' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2080:1: ( 'Collection' )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2081:1: 'Collection'
+                    // InternalExport.g:2080:1: ( 'Collection' )
+                    // InternalExport.g:2081:1: 'Collection'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getCollectionTypeAccess().getClCollectionKeyword_0_0_0()); 
                     }
-                    match(input,33,FOLLOW_33_in_rule__CollectionType__ClAlternatives_0_04515); if (state.failed) return ;
+                    match(input,33,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getCollectionTypeAccess().getClCollectionKeyword_0_0_0()); 
                     }
@@ -6832,15 +6832,15 @@ public final void rule__CollectionType__ClAlternatives_0_0() throws RecognitionE
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2088:6: ( 'List' )
+                    // InternalExport.g:2088:6: ( 'List' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2088:6: ( 'List' )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2089:1: 'List'
+                    // InternalExport.g:2088:6: ( 'List' )
+                    // InternalExport.g:2089:1: 'List'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getCollectionTypeAccess().getClListKeyword_0_0_1()); 
                     }
-                    match(input,34,FOLLOW_34_in_rule__CollectionType__ClAlternatives_0_04535); if (state.failed) return ;
+                    match(input,34,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getCollectionTypeAccess().getClListKeyword_0_0_1()); 
                     }
@@ -6851,15 +6851,15 @@ public final void rule__CollectionType__ClAlternatives_0_0() throws RecognitionE
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2096:6: ( 'Set' )
+                    // InternalExport.g:2096:6: ( 'Set' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2096:6: ( 'Set' )
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2097:1: 'Set'
+                    // InternalExport.g:2096:6: ( 'Set' )
+                    // InternalExport.g:2097:1: 'Set'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getCollectionTypeAccess().getClSetKeyword_0_0_2()); 
                     }
-                    match(input,35,FOLLOW_35_in_rule__CollectionType__ClAlternatives_0_04555); if (state.failed) return ;
+                    match(input,35,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getCollectionTypeAccess().getClSetKeyword_0_0_2()); 
                     }
@@ -6887,21 +6887,21 @@ public final void rule__CollectionType__ClAlternatives_0_0() throws RecognitionE
 
 
     // $ANTLR start "rule__ExportModel__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2111:1: rule__ExportModel__Group__0 : rule__ExportModel__Group__0__Impl rule__ExportModel__Group__1 ;
+    // InternalExport.g:2111:1: rule__ExportModel__Group__0 : rule__ExportModel__Group__0__Impl rule__ExportModel__Group__1 ;
     public final void rule__ExportModel__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2115:1: ( rule__ExportModel__Group__0__Impl rule__ExportModel__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2116:2: rule__ExportModel__Group__0__Impl rule__ExportModel__Group__1
+            // InternalExport.g:2115:1: ( rule__ExportModel__Group__0__Impl rule__ExportModel__Group__1 )
+            // InternalExport.g:2116:2: rule__ExportModel__Group__0__Impl rule__ExportModel__Group__1
             {
-            pushFollow(FOLLOW_rule__ExportModel__Group__0__Impl_in_rule__ExportModel__Group__04587);
+            pushFollow(FOLLOW_3);
             rule__ExportModel__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ExportModel__Group__1_in_rule__ExportModel__Group__04590);
+            pushFollow(FOLLOW_2);
             rule__ExportModel__Group__1();
 
             state._fsp--;
@@ -6925,22 +6925,22 @@ public final void rule__ExportModel__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__ExportModel__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2123:1: rule__ExportModel__Group__0__Impl : ( ( rule__ExportModel__Group_0__0 )? ) ;
+    // InternalExport.g:2123:1: rule__ExportModel__Group__0__Impl : ( ( rule__ExportModel__Group_0__0 )? ) ;
     public final void rule__ExportModel__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2127:1: ( ( ( rule__ExportModel__Group_0__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2128:1: ( ( rule__ExportModel__Group_0__0 )? )
+            // InternalExport.g:2127:1: ( ( ( rule__ExportModel__Group_0__0 )? ) )
+            // InternalExport.g:2128:1: ( ( rule__ExportModel__Group_0__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2128:1: ( ( rule__ExportModel__Group_0__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2129:1: ( rule__ExportModel__Group_0__0 )?
+            // InternalExport.g:2128:1: ( ( rule__ExportModel__Group_0__0 )? )
+            // InternalExport.g:2129:1: ( rule__ExportModel__Group_0__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportModelAccess().getGroup_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2130:1: ( rule__ExportModel__Group_0__0 )?
+            // InternalExport.g:2130:1: ( rule__ExportModel__Group_0__0 )?
             int alt20=2;
             int LA20_0 = input.LA(1);
 
@@ -6949,9 +6949,9 @@ public final void rule__ExportModel__Group__0__Impl() throws RecognitionExceptio
             }
             switch (alt20) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2130:2: rule__ExportModel__Group_0__0
+                    // InternalExport.g:2130:2: rule__ExportModel__Group_0__0
                     {
-                    pushFollow(FOLLOW_rule__ExportModel__Group_0__0_in_rule__ExportModel__Group__0__Impl4617);
+                    pushFollow(FOLLOW_2);
                     rule__ExportModel__Group_0__0();
 
                     state._fsp--;
@@ -6987,21 +6987,21 @@ public final void rule__ExportModel__Group__0__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ExportModel__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2140:1: rule__ExportModel__Group__1 : rule__ExportModel__Group__1__Impl rule__ExportModel__Group__2 ;
+    // InternalExport.g:2140:1: rule__ExportModel__Group__1 : rule__ExportModel__Group__1__Impl rule__ExportModel__Group__2 ;
     public final void rule__ExportModel__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2144:1: ( rule__ExportModel__Group__1__Impl rule__ExportModel__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2145:2: rule__ExportModel__Group__1__Impl rule__ExportModel__Group__2
+            // InternalExport.g:2144:1: ( rule__ExportModel__Group__1__Impl rule__ExportModel__Group__2 )
+            // InternalExport.g:2145:2: rule__ExportModel__Group__1__Impl rule__ExportModel__Group__2
             {
-            pushFollow(FOLLOW_rule__ExportModel__Group__1__Impl_in_rule__ExportModel__Group__14648);
+            pushFollow(FOLLOW_4);
             rule__ExportModel__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ExportModel__Group__2_in_rule__ExportModel__Group__14651);
+            pushFollow(FOLLOW_2);
             rule__ExportModel__Group__2();
 
             state._fsp--;
@@ -7025,28 +7025,28 @@ public final void rule__ExportModel__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__ExportModel__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2152:1: rule__ExportModel__Group__1__Impl : ( ( ( rule__ExportModel__ImportsAssignment_1 ) ) ( ( rule__ExportModel__ImportsAssignment_1 )* ) ) ;
+    // InternalExport.g:2152:1: rule__ExportModel__Group__1__Impl : ( ( ( rule__ExportModel__ImportsAssignment_1 ) ) ( ( rule__ExportModel__ImportsAssignment_1 )* ) ) ;
     public final void rule__ExportModel__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2156:1: ( ( ( ( rule__ExportModel__ImportsAssignment_1 ) ) ( ( rule__ExportModel__ImportsAssignment_1 )* ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2157:1: ( ( ( rule__ExportModel__ImportsAssignment_1 ) ) ( ( rule__ExportModel__ImportsAssignment_1 )* ) )
+            // InternalExport.g:2156:1: ( ( ( ( rule__ExportModel__ImportsAssignment_1 ) ) ( ( rule__ExportModel__ImportsAssignment_1 )* ) ) )
+            // InternalExport.g:2157:1: ( ( ( rule__ExportModel__ImportsAssignment_1 ) ) ( ( rule__ExportModel__ImportsAssignment_1 )* ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2157:1: ( ( ( rule__ExportModel__ImportsAssignment_1 ) ) ( ( rule__ExportModel__ImportsAssignment_1 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2158:1: ( ( rule__ExportModel__ImportsAssignment_1 ) ) ( ( rule__ExportModel__ImportsAssignment_1 )* )
+            // InternalExport.g:2157:1: ( ( ( rule__ExportModel__ImportsAssignment_1 ) ) ( ( rule__ExportModel__ImportsAssignment_1 )* ) )
+            // InternalExport.g:2158:1: ( ( rule__ExportModel__ImportsAssignment_1 ) ) ( ( rule__ExportModel__ImportsAssignment_1 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2158:1: ( ( rule__ExportModel__ImportsAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2159:1: ( rule__ExportModel__ImportsAssignment_1 )
+            // InternalExport.g:2158:1: ( ( rule__ExportModel__ImportsAssignment_1 ) )
+            // InternalExport.g:2159:1: ( rule__ExportModel__ImportsAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportModelAccess().getImportsAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2160:1: ( rule__ExportModel__ImportsAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2160:2: rule__ExportModel__ImportsAssignment_1
+            // InternalExport.g:2160:1: ( rule__ExportModel__ImportsAssignment_1 )
+            // InternalExport.g:2160:2: rule__ExportModel__ImportsAssignment_1
             {
-            pushFollow(FOLLOW_rule__ExportModel__ImportsAssignment_1_in_rule__ExportModel__Group__1__Impl4680);
+            pushFollow(FOLLOW_5);
             rule__ExportModel__ImportsAssignment_1();
 
             state._fsp--;
@@ -7060,13 +7060,13 @@ public final void rule__ExportModel__Group__1__Impl() throws RecognitionExceptio
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2163:1: ( ( rule__ExportModel__ImportsAssignment_1 )* )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2164:1: ( rule__ExportModel__ImportsAssignment_1 )*
+            // InternalExport.g:2163:1: ( ( rule__ExportModel__ImportsAssignment_1 )* )
+            // InternalExport.g:2164:1: ( rule__ExportModel__ImportsAssignment_1 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportModelAccess().getImportsAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2165:1: ( rule__ExportModel__ImportsAssignment_1 )*
+            // InternalExport.g:2165:1: ( rule__ExportModel__ImportsAssignment_1 )*
             loop21:
             do {
                 int alt21=2;
@@ -7079,9 +7079,9 @@ public final void rule__ExportModel__Group__1__Impl() throws RecognitionExceptio
 
                 switch (alt21) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2165:2: rule__ExportModel__ImportsAssignment_1
+            	    // InternalExport.g:2165:2: rule__ExportModel__ImportsAssignment_1
             	    {
-            	    pushFollow(FOLLOW_rule__ExportModel__ImportsAssignment_1_in_rule__ExportModel__Group__1__Impl4692);
+            	    pushFollow(FOLLOW_5);
             	    rule__ExportModel__ImportsAssignment_1();
 
             	    state._fsp--;
@@ -7123,21 +7123,21 @@ public final void rule__ExportModel__Group__1__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ExportModel__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2176:1: rule__ExportModel__Group__2 : rule__ExportModel__Group__2__Impl rule__ExportModel__Group__3 ;
+    // InternalExport.g:2176:1: rule__ExportModel__Group__2 : rule__ExportModel__Group__2__Impl rule__ExportModel__Group__3 ;
     public final void rule__ExportModel__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2180:1: ( rule__ExportModel__Group__2__Impl rule__ExportModel__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2181:2: rule__ExportModel__Group__2__Impl rule__ExportModel__Group__3
+            // InternalExport.g:2180:1: ( rule__ExportModel__Group__2__Impl rule__ExportModel__Group__3 )
+            // InternalExport.g:2181:2: rule__ExportModel__Group__2__Impl rule__ExportModel__Group__3
             {
-            pushFollow(FOLLOW_rule__ExportModel__Group__2__Impl_in_rule__ExportModel__Group__24725);
+            pushFollow(FOLLOW_4);
             rule__ExportModel__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ExportModel__Group__3_in_rule__ExportModel__Group__24728);
+            pushFollow(FOLLOW_2);
             rule__ExportModel__Group__3();
 
             state._fsp--;
@@ -7161,22 +7161,22 @@ public final void rule__ExportModel__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__ExportModel__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2188:1: rule__ExportModel__Group__2__Impl : ( ( rule__ExportModel__ExtensionsAssignment_2 )* ) ;
+    // InternalExport.g:2188:1: rule__ExportModel__Group__2__Impl : ( ( rule__ExportModel__ExtensionsAssignment_2 )* ) ;
     public final void rule__ExportModel__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2192:1: ( ( ( rule__ExportModel__ExtensionsAssignment_2 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2193:1: ( ( rule__ExportModel__ExtensionsAssignment_2 )* )
+            // InternalExport.g:2192:1: ( ( ( rule__ExportModel__ExtensionsAssignment_2 )* ) )
+            // InternalExport.g:2193:1: ( ( rule__ExportModel__ExtensionsAssignment_2 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2193:1: ( ( rule__ExportModel__ExtensionsAssignment_2 )* )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2194:1: ( rule__ExportModel__ExtensionsAssignment_2 )*
+            // InternalExport.g:2193:1: ( ( rule__ExportModel__ExtensionsAssignment_2 )* )
+            // InternalExport.g:2194:1: ( rule__ExportModel__ExtensionsAssignment_2 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportModelAccess().getExtensionsAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2195:1: ( rule__ExportModel__ExtensionsAssignment_2 )*
+            // InternalExport.g:2195:1: ( rule__ExportModel__ExtensionsAssignment_2 )*
             loop22:
             do {
                 int alt22=2;
@@ -7189,9 +7189,9 @@ public final void rule__ExportModel__Group__2__Impl() throws RecognitionExceptio
 
                 switch (alt22) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2195:2: rule__ExportModel__ExtensionsAssignment_2
+            	    // InternalExport.g:2195:2: rule__ExportModel__ExtensionsAssignment_2
             	    {
-            	    pushFollow(FOLLOW_rule__ExportModel__ExtensionsAssignment_2_in_rule__ExportModel__Group__2__Impl4755);
+            	    pushFollow(FOLLOW_6);
             	    rule__ExportModel__ExtensionsAssignment_2();
 
             	    state._fsp--;
@@ -7230,21 +7230,21 @@ public final void rule__ExportModel__Group__2__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ExportModel__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2205:1: rule__ExportModel__Group__3 : rule__ExportModel__Group__3__Impl rule__ExportModel__Group__4 ;
+    // InternalExport.g:2205:1: rule__ExportModel__Group__3 : rule__ExportModel__Group__3__Impl rule__ExportModel__Group__4 ;
     public final void rule__ExportModel__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2209:1: ( rule__ExportModel__Group__3__Impl rule__ExportModel__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2210:2: rule__ExportModel__Group__3__Impl rule__ExportModel__Group__4
+            // InternalExport.g:2209:1: ( rule__ExportModel__Group__3__Impl rule__ExportModel__Group__4 )
+            // InternalExport.g:2210:2: rule__ExportModel__Group__3__Impl rule__ExportModel__Group__4
             {
-            pushFollow(FOLLOW_rule__ExportModel__Group__3__Impl_in_rule__ExportModel__Group__34786);
+            pushFollow(FOLLOW_4);
             rule__ExportModel__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ExportModel__Group__4_in_rule__ExportModel__Group__34789);
+            pushFollow(FOLLOW_2);
             rule__ExportModel__Group__4();
 
             state._fsp--;
@@ -7268,22 +7268,22 @@ public final void rule__ExportModel__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__ExportModel__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2217:1: rule__ExportModel__Group__3__Impl : ( ( rule__ExportModel__Group_3__0 )? ) ;
+    // InternalExport.g:2217:1: rule__ExportModel__Group__3__Impl : ( ( rule__ExportModel__Group_3__0 )? ) ;
     public final void rule__ExportModel__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2221:1: ( ( ( rule__ExportModel__Group_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2222:1: ( ( rule__ExportModel__Group_3__0 )? )
+            // InternalExport.g:2221:1: ( ( ( rule__ExportModel__Group_3__0 )? ) )
+            // InternalExport.g:2222:1: ( ( rule__ExportModel__Group_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2222:1: ( ( rule__ExportModel__Group_3__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2223:1: ( rule__ExportModel__Group_3__0 )?
+            // InternalExport.g:2222:1: ( ( rule__ExportModel__Group_3__0 )? )
+            // InternalExport.g:2223:1: ( rule__ExportModel__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportModelAccess().getGroup_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2224:1: ( rule__ExportModel__Group_3__0 )?
+            // InternalExport.g:2224:1: ( rule__ExportModel__Group_3__0 )?
             int alt23=2;
             int LA23_0 = input.LA(1);
 
@@ -7292,9 +7292,9 @@ public final void rule__ExportModel__Group__3__Impl() throws RecognitionExceptio
             }
             switch (alt23) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2224:2: rule__ExportModel__Group_3__0
+                    // InternalExport.g:2224:2: rule__ExportModel__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__ExportModel__Group_3__0_in_rule__ExportModel__Group__3__Impl4816);
+                    pushFollow(FOLLOW_2);
                     rule__ExportModel__Group_3__0();
 
                     state._fsp--;
@@ -7330,16 +7330,16 @@ public final void rule__ExportModel__Group__3__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ExportModel__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2234:1: rule__ExportModel__Group__4 : rule__ExportModel__Group__4__Impl ;
+    // InternalExport.g:2234:1: rule__ExportModel__Group__4 : rule__ExportModel__Group__4__Impl ;
     public final void rule__ExportModel__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2238:1: ( rule__ExportModel__Group__4__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2239:2: rule__ExportModel__Group__4__Impl
+            // InternalExport.g:2238:1: ( rule__ExportModel__Group__4__Impl )
+            // InternalExport.g:2239:2: rule__ExportModel__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__ExportModel__Group__4__Impl_in_rule__ExportModel__Group__44847);
+            pushFollow(FOLLOW_2);
             rule__ExportModel__Group__4__Impl();
 
             state._fsp--;
@@ -7363,28 +7363,28 @@ public final void rule__ExportModel__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__ExportModel__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2245:1: rule__ExportModel__Group__4__Impl : ( ( ( rule__ExportModel__ExportsAssignment_4 ) ) ( ( rule__ExportModel__ExportsAssignment_4 )* ) ) ;
+    // InternalExport.g:2245:1: rule__ExportModel__Group__4__Impl : ( ( ( rule__ExportModel__ExportsAssignment_4 ) ) ( ( rule__ExportModel__ExportsAssignment_4 )* ) ) ;
     public final void rule__ExportModel__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2249:1: ( ( ( ( rule__ExportModel__ExportsAssignment_4 ) ) ( ( rule__ExportModel__ExportsAssignment_4 )* ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2250:1: ( ( ( rule__ExportModel__ExportsAssignment_4 ) ) ( ( rule__ExportModel__ExportsAssignment_4 )* ) )
+            // InternalExport.g:2249:1: ( ( ( ( rule__ExportModel__ExportsAssignment_4 ) ) ( ( rule__ExportModel__ExportsAssignment_4 )* ) ) )
+            // InternalExport.g:2250:1: ( ( ( rule__ExportModel__ExportsAssignment_4 ) ) ( ( rule__ExportModel__ExportsAssignment_4 )* ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2250:1: ( ( ( rule__ExportModel__ExportsAssignment_4 ) ) ( ( rule__ExportModel__ExportsAssignment_4 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2251:1: ( ( rule__ExportModel__ExportsAssignment_4 ) ) ( ( rule__ExportModel__ExportsAssignment_4 )* )
+            // InternalExport.g:2250:1: ( ( ( rule__ExportModel__ExportsAssignment_4 ) ) ( ( rule__ExportModel__ExportsAssignment_4 )* ) )
+            // InternalExport.g:2251:1: ( ( rule__ExportModel__ExportsAssignment_4 ) ) ( ( rule__ExportModel__ExportsAssignment_4 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2251:1: ( ( rule__ExportModel__ExportsAssignment_4 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2252:1: ( rule__ExportModel__ExportsAssignment_4 )
+            // InternalExport.g:2251:1: ( ( rule__ExportModel__ExportsAssignment_4 ) )
+            // InternalExport.g:2252:1: ( rule__ExportModel__ExportsAssignment_4 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportModelAccess().getExportsAssignment_4()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2253:1: ( rule__ExportModel__ExportsAssignment_4 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2253:2: rule__ExportModel__ExportsAssignment_4
+            // InternalExport.g:2253:1: ( rule__ExportModel__ExportsAssignment_4 )
+            // InternalExport.g:2253:2: rule__ExportModel__ExportsAssignment_4
             {
-            pushFollow(FOLLOW_rule__ExportModel__ExportsAssignment_4_in_rule__ExportModel__Group__4__Impl4876);
+            pushFollow(FOLLOW_7);
             rule__ExportModel__ExportsAssignment_4();
 
             state._fsp--;
@@ -7398,13 +7398,13 @@ public final void rule__ExportModel__Group__4__Impl() throws RecognitionExceptio
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2256:1: ( ( rule__ExportModel__ExportsAssignment_4 )* )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2257:1: ( rule__ExportModel__ExportsAssignment_4 )*
+            // InternalExport.g:2256:1: ( ( rule__ExportModel__ExportsAssignment_4 )* )
+            // InternalExport.g:2257:1: ( rule__ExportModel__ExportsAssignment_4 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportModelAccess().getExportsAssignment_4()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2258:1: ( rule__ExportModel__ExportsAssignment_4 )*
+            // InternalExport.g:2258:1: ( rule__ExportModel__ExportsAssignment_4 )*
             loop24:
             do {
                 int alt24=2;
@@ -7417,9 +7417,9 @@ public final void rule__ExportModel__Group__4__Impl() throws RecognitionExceptio
 
                 switch (alt24) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2258:2: rule__ExportModel__ExportsAssignment_4
+            	    // InternalExport.g:2258:2: rule__ExportModel__ExportsAssignment_4
             	    {
-            	    pushFollow(FOLLOW_rule__ExportModel__ExportsAssignment_4_in_rule__ExportModel__Group__4__Impl4888);
+            	    pushFollow(FOLLOW_7);
             	    rule__ExportModel__ExportsAssignment_4();
 
             	    state._fsp--;
@@ -7461,21 +7461,21 @@ public final void rule__ExportModel__Group__4__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ExportModel__Group_0__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2279:1: rule__ExportModel__Group_0__0 : rule__ExportModel__Group_0__0__Impl rule__ExportModel__Group_0__1 ;
+    // InternalExport.g:2279:1: rule__ExportModel__Group_0__0 : rule__ExportModel__Group_0__0__Impl rule__ExportModel__Group_0__1 ;
     public final void rule__ExportModel__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2283:1: ( rule__ExportModel__Group_0__0__Impl rule__ExportModel__Group_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2284:2: rule__ExportModel__Group_0__0__Impl rule__ExportModel__Group_0__1
+            // InternalExport.g:2283:1: ( rule__ExportModel__Group_0__0__Impl rule__ExportModel__Group_0__1 )
+            // InternalExport.g:2284:2: rule__ExportModel__Group_0__0__Impl rule__ExportModel__Group_0__1
             {
-            pushFollow(FOLLOW_rule__ExportModel__Group_0__0__Impl_in_rule__ExportModel__Group_0__04931);
+            pushFollow(FOLLOW_8);
             rule__ExportModel__Group_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ExportModel__Group_0__1_in_rule__ExportModel__Group_0__04934);
+            pushFollow(FOLLOW_2);
             rule__ExportModel__Group_0__1();
 
             state._fsp--;
@@ -7499,22 +7499,22 @@ public final void rule__ExportModel__Group_0__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__ExportModel__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2291:1: rule__ExportModel__Group_0__0__Impl : ( 'export' ) ;
+    // InternalExport.g:2291:1: rule__ExportModel__Group_0__0__Impl : ( 'export' ) ;
     public final void rule__ExportModel__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2295:1: ( ( 'export' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2296:1: ( 'export' )
+            // InternalExport.g:2295:1: ( ( 'export' ) )
+            // InternalExport.g:2296:1: ( 'export' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2296:1: ( 'export' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2297:1: 'export'
+            // InternalExport.g:2296:1: ( 'export' )
+            // InternalExport.g:2297:1: 'export'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportModelAccess().getExportKeyword_0_0()); 
             }
-            match(input,36,FOLLOW_36_in_rule__ExportModel__Group_0__0__Impl4962); if (state.failed) return ;
+            match(input,36,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExportModelAccess().getExportKeyword_0_0()); 
             }
@@ -7540,21 +7540,21 @@ public final void rule__ExportModel__Group_0__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ExportModel__Group_0__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2310:1: rule__ExportModel__Group_0__1 : rule__ExportModel__Group_0__1__Impl rule__ExportModel__Group_0__2 ;
+    // InternalExport.g:2310:1: rule__ExportModel__Group_0__1 : rule__ExportModel__Group_0__1__Impl rule__ExportModel__Group_0__2 ;
     public final void rule__ExportModel__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2314:1: ( rule__ExportModel__Group_0__1__Impl rule__ExportModel__Group_0__2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2315:2: rule__ExportModel__Group_0__1__Impl rule__ExportModel__Group_0__2
+            // InternalExport.g:2314:1: ( rule__ExportModel__Group_0__1__Impl rule__ExportModel__Group_0__2 )
+            // InternalExport.g:2315:2: rule__ExportModel__Group_0__1__Impl rule__ExportModel__Group_0__2
             {
-            pushFollow(FOLLOW_rule__ExportModel__Group_0__1__Impl_in_rule__ExportModel__Group_0__14993);
+            pushFollow(FOLLOW_8);
             rule__ExportModel__Group_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ExportModel__Group_0__2_in_rule__ExportModel__Group_0__14996);
+            pushFollow(FOLLOW_2);
             rule__ExportModel__Group_0__2();
 
             state._fsp--;
@@ -7578,22 +7578,22 @@ public final void rule__ExportModel__Group_0__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__ExportModel__Group_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2322:1: rule__ExportModel__Group_0__1__Impl : ( ( rule__ExportModel__ExtensionAssignment_0_1 )? ) ;
+    // InternalExport.g:2322:1: rule__ExportModel__Group_0__1__Impl : ( ( rule__ExportModel__ExtensionAssignment_0_1 )? ) ;
     public final void rule__ExportModel__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2326:1: ( ( ( rule__ExportModel__ExtensionAssignment_0_1 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2327:1: ( ( rule__ExportModel__ExtensionAssignment_0_1 )? )
+            // InternalExport.g:2326:1: ( ( ( rule__ExportModel__ExtensionAssignment_0_1 )? ) )
+            // InternalExport.g:2327:1: ( ( rule__ExportModel__ExtensionAssignment_0_1 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2327:1: ( ( rule__ExportModel__ExtensionAssignment_0_1 )? )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2328:1: ( rule__ExportModel__ExtensionAssignment_0_1 )?
+            // InternalExport.g:2327:1: ( ( rule__ExportModel__ExtensionAssignment_0_1 )? )
+            // InternalExport.g:2328:1: ( rule__ExportModel__ExtensionAssignment_0_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportModelAccess().getExtensionAssignment_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2329:1: ( rule__ExportModel__ExtensionAssignment_0_1 )?
+            // InternalExport.g:2329:1: ( rule__ExportModel__ExtensionAssignment_0_1 )?
             int alt25=2;
             int LA25_0 = input.LA(1);
 
@@ -7602,9 +7602,9 @@ public final void rule__ExportModel__Group_0__1__Impl() throws RecognitionExcept
             }
             switch (alt25) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2329:2: rule__ExportModel__ExtensionAssignment_0_1
+                    // InternalExport.g:2329:2: rule__ExportModel__ExtensionAssignment_0_1
                     {
-                    pushFollow(FOLLOW_rule__ExportModel__ExtensionAssignment_0_1_in_rule__ExportModel__Group_0__1__Impl5023);
+                    pushFollow(FOLLOW_2);
                     rule__ExportModel__ExtensionAssignment_0_1();
 
                     state._fsp--;
@@ -7640,21 +7640,21 @@ public final void rule__ExportModel__Group_0__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ExportModel__Group_0__2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2339:1: rule__ExportModel__Group_0__2 : rule__ExportModel__Group_0__2__Impl rule__ExportModel__Group_0__3 ;
+    // InternalExport.g:2339:1: rule__ExportModel__Group_0__2 : rule__ExportModel__Group_0__2__Impl rule__ExportModel__Group_0__3 ;
     public final void rule__ExportModel__Group_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2343:1: ( rule__ExportModel__Group_0__2__Impl rule__ExportModel__Group_0__3 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2344:2: rule__ExportModel__Group_0__2__Impl rule__ExportModel__Group_0__3
+            // InternalExport.g:2343:1: ( rule__ExportModel__Group_0__2__Impl rule__ExportModel__Group_0__3 )
+            // InternalExport.g:2344:2: rule__ExportModel__Group_0__2__Impl rule__ExportModel__Group_0__3
             {
-            pushFollow(FOLLOW_rule__ExportModel__Group_0__2__Impl_in_rule__ExportModel__Group_0__25054);
+            pushFollow(FOLLOW_9);
             rule__ExportModel__Group_0__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ExportModel__Group_0__3_in_rule__ExportModel__Group_0__25057);
+            pushFollow(FOLLOW_2);
             rule__ExportModel__Group_0__3();
 
             state._fsp--;
@@ -7678,25 +7678,25 @@ public final void rule__ExportModel__Group_0__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__ExportModel__Group_0__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2351:1: rule__ExportModel__Group_0__2__Impl : ( ( rule__ExportModel__NameAssignment_0_2 ) ) ;
+    // InternalExport.g:2351:1: rule__ExportModel__Group_0__2__Impl : ( ( rule__ExportModel__NameAssignment_0_2 ) ) ;
     public final void rule__ExportModel__Group_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2355:1: ( ( ( rule__ExportModel__NameAssignment_0_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2356:1: ( ( rule__ExportModel__NameAssignment_0_2 ) )
+            // InternalExport.g:2355:1: ( ( ( rule__ExportModel__NameAssignment_0_2 ) ) )
+            // InternalExport.g:2356:1: ( ( rule__ExportModel__NameAssignment_0_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2356:1: ( ( rule__ExportModel__NameAssignment_0_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2357:1: ( rule__ExportModel__NameAssignment_0_2 )
+            // InternalExport.g:2356:1: ( ( rule__ExportModel__NameAssignment_0_2 ) )
+            // InternalExport.g:2357:1: ( rule__ExportModel__NameAssignment_0_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportModelAccess().getNameAssignment_0_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2358:1: ( rule__ExportModel__NameAssignment_0_2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2358:2: rule__ExportModel__NameAssignment_0_2
+            // InternalExport.g:2358:1: ( rule__ExportModel__NameAssignment_0_2 )
+            // InternalExport.g:2358:2: rule__ExportModel__NameAssignment_0_2
             {
-            pushFollow(FOLLOW_rule__ExportModel__NameAssignment_0_2_in_rule__ExportModel__Group_0__2__Impl5084);
+            pushFollow(FOLLOW_2);
             rule__ExportModel__NameAssignment_0_2();
 
             state._fsp--;
@@ -7729,21 +7729,21 @@ public final void rule__ExportModel__Group_0__2__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ExportModel__Group_0__3"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2368:1: rule__ExportModel__Group_0__3 : rule__ExportModel__Group_0__3__Impl rule__ExportModel__Group_0__4 ;
+    // InternalExport.g:2368:1: rule__ExportModel__Group_0__3 : rule__ExportModel__Group_0__3__Impl rule__ExportModel__Group_0__4 ;
     public final void rule__ExportModel__Group_0__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2372:1: ( rule__ExportModel__Group_0__3__Impl rule__ExportModel__Group_0__4 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2373:2: rule__ExportModel__Group_0__3__Impl rule__ExportModel__Group_0__4
+            // InternalExport.g:2372:1: ( rule__ExportModel__Group_0__3__Impl rule__ExportModel__Group_0__4 )
+            // InternalExport.g:2373:2: rule__ExportModel__Group_0__3__Impl rule__ExportModel__Group_0__4
             {
-            pushFollow(FOLLOW_rule__ExportModel__Group_0__3__Impl_in_rule__ExportModel__Group_0__35114);
+            pushFollow(FOLLOW_10);
             rule__ExportModel__Group_0__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ExportModel__Group_0__4_in_rule__ExportModel__Group_0__35117);
+            pushFollow(FOLLOW_2);
             rule__ExportModel__Group_0__4();
 
             state._fsp--;
@@ -7767,22 +7767,22 @@ public final void rule__ExportModel__Group_0__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__ExportModel__Group_0__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2380:1: rule__ExportModel__Group_0__3__Impl : ( 'for' ) ;
+    // InternalExport.g:2380:1: rule__ExportModel__Group_0__3__Impl : ( 'for' ) ;
     public final void rule__ExportModel__Group_0__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2384:1: ( ( 'for' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2385:1: ( 'for' )
+            // InternalExport.g:2384:1: ( ( 'for' ) )
+            // InternalExport.g:2385:1: ( 'for' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2385:1: ( 'for' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2386:1: 'for'
+            // InternalExport.g:2385:1: ( 'for' )
+            // InternalExport.g:2386:1: 'for'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportModelAccess().getForKeyword_0_3()); 
             }
-            match(input,37,FOLLOW_37_in_rule__ExportModel__Group_0__3__Impl5145); if (state.failed) return ;
+            match(input,37,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExportModelAccess().getForKeyword_0_3()); 
             }
@@ -7808,16 +7808,16 @@ public final void rule__ExportModel__Group_0__3__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ExportModel__Group_0__4"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2399:1: rule__ExportModel__Group_0__4 : rule__ExportModel__Group_0__4__Impl ;
+    // InternalExport.g:2399:1: rule__ExportModel__Group_0__4 : rule__ExportModel__Group_0__4__Impl ;
     public final void rule__ExportModel__Group_0__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2403:1: ( rule__ExportModel__Group_0__4__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2404:2: rule__ExportModel__Group_0__4__Impl
+            // InternalExport.g:2403:1: ( rule__ExportModel__Group_0__4__Impl )
+            // InternalExport.g:2404:2: rule__ExportModel__Group_0__4__Impl
             {
-            pushFollow(FOLLOW_rule__ExportModel__Group_0__4__Impl_in_rule__ExportModel__Group_0__45176);
+            pushFollow(FOLLOW_2);
             rule__ExportModel__Group_0__4__Impl();
 
             state._fsp--;
@@ -7841,25 +7841,25 @@ public final void rule__ExportModel__Group_0__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__ExportModel__Group_0__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2410:1: rule__ExportModel__Group_0__4__Impl : ( ( rule__ExportModel__TargetGrammarAssignment_0_4 ) ) ;
+    // InternalExport.g:2410:1: rule__ExportModel__Group_0__4__Impl : ( ( rule__ExportModel__TargetGrammarAssignment_0_4 ) ) ;
     public final void rule__ExportModel__Group_0__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2414:1: ( ( ( rule__ExportModel__TargetGrammarAssignment_0_4 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2415:1: ( ( rule__ExportModel__TargetGrammarAssignment_0_4 ) )
+            // InternalExport.g:2414:1: ( ( ( rule__ExportModel__TargetGrammarAssignment_0_4 ) ) )
+            // InternalExport.g:2415:1: ( ( rule__ExportModel__TargetGrammarAssignment_0_4 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2415:1: ( ( rule__ExportModel__TargetGrammarAssignment_0_4 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2416:1: ( rule__ExportModel__TargetGrammarAssignment_0_4 )
+            // InternalExport.g:2415:1: ( ( rule__ExportModel__TargetGrammarAssignment_0_4 ) )
+            // InternalExport.g:2416:1: ( rule__ExportModel__TargetGrammarAssignment_0_4 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportModelAccess().getTargetGrammarAssignment_0_4()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2417:1: ( rule__ExportModel__TargetGrammarAssignment_0_4 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2417:2: rule__ExportModel__TargetGrammarAssignment_0_4
+            // InternalExport.g:2417:1: ( rule__ExportModel__TargetGrammarAssignment_0_4 )
+            // InternalExport.g:2417:2: rule__ExportModel__TargetGrammarAssignment_0_4
             {
-            pushFollow(FOLLOW_rule__ExportModel__TargetGrammarAssignment_0_4_in_rule__ExportModel__Group_0__4__Impl5203);
+            pushFollow(FOLLOW_2);
             rule__ExportModel__TargetGrammarAssignment_0_4();
 
             state._fsp--;
@@ -7892,21 +7892,21 @@ public final void rule__ExportModel__Group_0__4__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ExportModel__Group_3__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2437:1: rule__ExportModel__Group_3__0 : rule__ExportModel__Group_3__0__Impl rule__ExportModel__Group_3__1 ;
+    // InternalExport.g:2437:1: rule__ExportModel__Group_3__0 : rule__ExportModel__Group_3__0__Impl rule__ExportModel__Group_3__1 ;
     public final void rule__ExportModel__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2441:1: ( rule__ExportModel__Group_3__0__Impl rule__ExportModel__Group_3__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2442:2: rule__ExportModel__Group_3__0__Impl rule__ExportModel__Group_3__1
+            // InternalExport.g:2441:1: ( rule__ExportModel__Group_3__0__Impl rule__ExportModel__Group_3__1 )
+            // InternalExport.g:2442:2: rule__ExportModel__Group_3__0__Impl rule__ExportModel__Group_3__1
             {
-            pushFollow(FOLLOW_rule__ExportModel__Group_3__0__Impl_in_rule__ExportModel__Group_3__05243);
+            pushFollow(FOLLOW_11);
             rule__ExportModel__Group_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ExportModel__Group_3__1_in_rule__ExportModel__Group_3__05246);
+            pushFollow(FOLLOW_2);
             rule__ExportModel__Group_3__1();
 
             state._fsp--;
@@ -7930,22 +7930,22 @@ public final void rule__ExportModel__Group_3__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__ExportModel__Group_3__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2449:1: rule__ExportModel__Group_3__0__Impl : ( 'interface' ) ;
+    // InternalExport.g:2449:1: rule__ExportModel__Group_3__0__Impl : ( 'interface' ) ;
     public final void rule__ExportModel__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2453:1: ( ( 'interface' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2454:1: ( 'interface' )
+            // InternalExport.g:2453:1: ( ( 'interface' ) )
+            // InternalExport.g:2454:1: ( 'interface' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2454:1: ( 'interface' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2455:1: 'interface'
+            // InternalExport.g:2454:1: ( 'interface' )
+            // InternalExport.g:2455:1: 'interface'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportModelAccess().getInterfaceKeyword_3_0()); 
             }
-            match(input,38,FOLLOW_38_in_rule__ExportModel__Group_3__0__Impl5274); if (state.failed) return ;
+            match(input,38,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExportModelAccess().getInterfaceKeyword_3_0()); 
             }
@@ -7971,21 +7971,21 @@ public final void rule__ExportModel__Group_3__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ExportModel__Group_3__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2468:1: rule__ExportModel__Group_3__1 : rule__ExportModel__Group_3__1__Impl rule__ExportModel__Group_3__2 ;
+    // InternalExport.g:2468:1: rule__ExportModel__Group_3__1 : rule__ExportModel__Group_3__1__Impl rule__ExportModel__Group_3__2 ;
     public final void rule__ExportModel__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2472:1: ( rule__ExportModel__Group_3__1__Impl rule__ExportModel__Group_3__2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2473:2: rule__ExportModel__Group_3__1__Impl rule__ExportModel__Group_3__2
+            // InternalExport.g:2472:1: ( rule__ExportModel__Group_3__1__Impl rule__ExportModel__Group_3__2 )
+            // InternalExport.g:2473:2: rule__ExportModel__Group_3__1__Impl rule__ExportModel__Group_3__2
             {
-            pushFollow(FOLLOW_rule__ExportModel__Group_3__1__Impl_in_rule__ExportModel__Group_3__15305);
+            pushFollow(FOLLOW_10);
             rule__ExportModel__Group_3__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ExportModel__Group_3__2_in_rule__ExportModel__Group_3__15308);
+            pushFollow(FOLLOW_2);
             rule__ExportModel__Group_3__2();
 
             state._fsp--;
@@ -8009,22 +8009,22 @@ public final void rule__ExportModel__Group_3__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__ExportModel__Group_3__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2480:1: rule__ExportModel__Group_3__1__Impl : ( '{' ) ;
+    // InternalExport.g:2480:1: rule__ExportModel__Group_3__1__Impl : ( '{' ) ;
     public final void rule__ExportModel__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2484:1: ( ( '{' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2485:1: ( '{' )
+            // InternalExport.g:2484:1: ( ( '{' ) )
+            // InternalExport.g:2485:1: ( '{' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2485:1: ( '{' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2486:1: '{'
+            // InternalExport.g:2485:1: ( '{' )
+            // InternalExport.g:2486:1: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportModelAccess().getLeftCurlyBracketKeyword_3_1()); 
             }
-            match(input,39,FOLLOW_39_in_rule__ExportModel__Group_3__1__Impl5336); if (state.failed) return ;
+            match(input,39,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExportModelAccess().getLeftCurlyBracketKeyword_3_1()); 
             }
@@ -8050,21 +8050,21 @@ public final void rule__ExportModel__Group_3__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ExportModel__Group_3__2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2499:1: rule__ExportModel__Group_3__2 : rule__ExportModel__Group_3__2__Impl rule__ExportModel__Group_3__3 ;
+    // InternalExport.g:2499:1: rule__ExportModel__Group_3__2 : rule__ExportModel__Group_3__2__Impl rule__ExportModel__Group_3__3 ;
     public final void rule__ExportModel__Group_3__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2503:1: ( rule__ExportModel__Group_3__2__Impl rule__ExportModel__Group_3__3 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2504:2: rule__ExportModel__Group_3__2__Impl rule__ExportModel__Group_3__3
+            // InternalExport.g:2503:1: ( rule__ExportModel__Group_3__2__Impl rule__ExportModel__Group_3__3 )
+            // InternalExport.g:2504:2: rule__ExportModel__Group_3__2__Impl rule__ExportModel__Group_3__3
             {
-            pushFollow(FOLLOW_rule__ExportModel__Group_3__2__Impl_in_rule__ExportModel__Group_3__25367);
+            pushFollow(FOLLOW_12);
             rule__ExportModel__Group_3__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ExportModel__Group_3__3_in_rule__ExportModel__Group_3__25370);
+            pushFollow(FOLLOW_2);
             rule__ExportModel__Group_3__3();
 
             state._fsp--;
@@ -8088,28 +8088,28 @@ public final void rule__ExportModel__Group_3__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__ExportModel__Group_3__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2511:1: rule__ExportModel__Group_3__2__Impl : ( ( ( rule__ExportModel__InterfacesAssignment_3_2 ) ) ( ( rule__ExportModel__InterfacesAssignment_3_2 )* ) ) ;
+    // InternalExport.g:2511:1: rule__ExportModel__Group_3__2__Impl : ( ( ( rule__ExportModel__InterfacesAssignment_3_2 ) ) ( ( rule__ExportModel__InterfacesAssignment_3_2 )* ) ) ;
     public final void rule__ExportModel__Group_3__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2515:1: ( ( ( ( rule__ExportModel__InterfacesAssignment_3_2 ) ) ( ( rule__ExportModel__InterfacesAssignment_3_2 )* ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2516:1: ( ( ( rule__ExportModel__InterfacesAssignment_3_2 ) ) ( ( rule__ExportModel__InterfacesAssignment_3_2 )* ) )
+            // InternalExport.g:2515:1: ( ( ( ( rule__ExportModel__InterfacesAssignment_3_2 ) ) ( ( rule__ExportModel__InterfacesAssignment_3_2 )* ) ) )
+            // InternalExport.g:2516:1: ( ( ( rule__ExportModel__InterfacesAssignment_3_2 ) ) ( ( rule__ExportModel__InterfacesAssignment_3_2 )* ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2516:1: ( ( ( rule__ExportModel__InterfacesAssignment_3_2 ) ) ( ( rule__ExportModel__InterfacesAssignment_3_2 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2517:1: ( ( rule__ExportModel__InterfacesAssignment_3_2 ) ) ( ( rule__ExportModel__InterfacesAssignment_3_2 )* )
+            // InternalExport.g:2516:1: ( ( ( rule__ExportModel__InterfacesAssignment_3_2 ) ) ( ( rule__ExportModel__InterfacesAssignment_3_2 )* ) )
+            // InternalExport.g:2517:1: ( ( rule__ExportModel__InterfacesAssignment_3_2 ) ) ( ( rule__ExportModel__InterfacesAssignment_3_2 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2517:1: ( ( rule__ExportModel__InterfacesAssignment_3_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2518:1: ( rule__ExportModel__InterfacesAssignment_3_2 )
+            // InternalExport.g:2517:1: ( ( rule__ExportModel__InterfacesAssignment_3_2 ) )
+            // InternalExport.g:2518:1: ( rule__ExportModel__InterfacesAssignment_3_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportModelAccess().getInterfacesAssignment_3_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2519:1: ( rule__ExportModel__InterfacesAssignment_3_2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2519:2: rule__ExportModel__InterfacesAssignment_3_2
+            // InternalExport.g:2519:1: ( rule__ExportModel__InterfacesAssignment_3_2 )
+            // InternalExport.g:2519:2: rule__ExportModel__InterfacesAssignment_3_2
             {
-            pushFollow(FOLLOW_rule__ExportModel__InterfacesAssignment_3_2_in_rule__ExportModel__Group_3__2__Impl5399);
+            pushFollow(FOLLOW_13);
             rule__ExportModel__InterfacesAssignment_3_2();
 
             state._fsp--;
@@ -8123,13 +8123,13 @@ public final void rule__ExportModel__Group_3__2__Impl() throws RecognitionExcept
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2522:1: ( ( rule__ExportModel__InterfacesAssignment_3_2 )* )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2523:1: ( rule__ExportModel__InterfacesAssignment_3_2 )*
+            // InternalExport.g:2522:1: ( ( rule__ExportModel__InterfacesAssignment_3_2 )* )
+            // InternalExport.g:2523:1: ( rule__ExportModel__InterfacesAssignment_3_2 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportModelAccess().getInterfacesAssignment_3_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2524:1: ( rule__ExportModel__InterfacesAssignment_3_2 )*
+            // InternalExport.g:2524:1: ( rule__ExportModel__InterfacesAssignment_3_2 )*
             loop26:
             do {
                 int alt26=2;
@@ -8142,9 +8142,9 @@ public final void rule__ExportModel__Group_3__2__Impl() throws RecognitionExcept
 
                 switch (alt26) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2524:2: rule__ExportModel__InterfacesAssignment_3_2
+            	    // InternalExport.g:2524:2: rule__ExportModel__InterfacesAssignment_3_2
             	    {
-            	    pushFollow(FOLLOW_rule__ExportModel__InterfacesAssignment_3_2_in_rule__ExportModel__Group_3__2__Impl5411);
+            	    pushFollow(FOLLOW_13);
             	    rule__ExportModel__InterfacesAssignment_3_2();
 
             	    state._fsp--;
@@ -8186,16 +8186,16 @@ public final void rule__ExportModel__Group_3__2__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ExportModel__Group_3__3"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2535:1: rule__ExportModel__Group_3__3 : rule__ExportModel__Group_3__3__Impl ;
+    // InternalExport.g:2535:1: rule__ExportModel__Group_3__3 : rule__ExportModel__Group_3__3__Impl ;
     public final void rule__ExportModel__Group_3__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2539:1: ( rule__ExportModel__Group_3__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2540:2: rule__ExportModel__Group_3__3__Impl
+            // InternalExport.g:2539:1: ( rule__ExportModel__Group_3__3__Impl )
+            // InternalExport.g:2540:2: rule__ExportModel__Group_3__3__Impl
             {
-            pushFollow(FOLLOW_rule__ExportModel__Group_3__3__Impl_in_rule__ExportModel__Group_3__35444);
+            pushFollow(FOLLOW_2);
             rule__ExportModel__Group_3__3__Impl();
 
             state._fsp--;
@@ -8219,22 +8219,22 @@ public final void rule__ExportModel__Group_3__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__ExportModel__Group_3__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2546:1: rule__ExportModel__Group_3__3__Impl : ( '}' ) ;
+    // InternalExport.g:2546:1: rule__ExportModel__Group_3__3__Impl : ( '}' ) ;
     public final void rule__ExportModel__Group_3__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2550:1: ( ( '}' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2551:1: ( '}' )
+            // InternalExport.g:2550:1: ( ( '}' ) )
+            // InternalExport.g:2551:1: ( '}' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2551:1: ( '}' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2552:1: '}'
+            // InternalExport.g:2551:1: ( '}' )
+            // InternalExport.g:2552:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportModelAccess().getRightCurlyBracketKeyword_3_3()); 
             }
-            match(input,40,FOLLOW_40_in_rule__ExportModel__Group_3__3__Impl5472); if (state.failed) return ;
+            match(input,40,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExportModelAccess().getRightCurlyBracketKeyword_3_3()); 
             }
@@ -8260,21 +8260,21 @@ public final void rule__ExportModel__Group_3__3__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__Import__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2573:1: rule__Import__Group__0 : rule__Import__Group__0__Impl rule__Import__Group__1 ;
+    // InternalExport.g:2573:1: rule__Import__Group__0 : rule__Import__Group__0__Impl rule__Import__Group__1 ;
     public final void rule__Import__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2577:1: ( rule__Import__Group__0__Impl rule__Import__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2578:2: rule__Import__Group__0__Impl rule__Import__Group__1
+            // InternalExport.g:2577:1: ( rule__Import__Group__0__Impl rule__Import__Group__1 )
+            // InternalExport.g:2578:2: rule__Import__Group__0__Impl rule__Import__Group__1
             {
-            pushFollow(FOLLOW_rule__Import__Group__0__Impl_in_rule__Import__Group__05511);
+            pushFollow(FOLLOW_14);
             rule__Import__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Import__Group__1_in_rule__Import__Group__05514);
+            pushFollow(FOLLOW_2);
             rule__Import__Group__1();
 
             state._fsp--;
@@ -8298,22 +8298,22 @@ public final void rule__Import__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Import__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2585:1: rule__Import__Group__0__Impl : ( 'import' ) ;
+    // InternalExport.g:2585:1: rule__Import__Group__0__Impl : ( 'import' ) ;
     public final void rule__Import__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2589:1: ( ( 'import' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2590:1: ( 'import' )
+            // InternalExport.g:2589:1: ( ( 'import' ) )
+            // InternalExport.g:2590:1: ( 'import' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2590:1: ( 'import' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2591:1: 'import'
+            // InternalExport.g:2590:1: ( 'import' )
+            // InternalExport.g:2591:1: 'import'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImportAccess().getImportKeyword_0()); 
             }
-            match(input,41,FOLLOW_41_in_rule__Import__Group__0__Impl5542); if (state.failed) return ;
+            match(input,41,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getImportAccess().getImportKeyword_0()); 
             }
@@ -8339,21 +8339,21 @@ public final void rule__Import__Group__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Import__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2604:1: rule__Import__Group__1 : rule__Import__Group__1__Impl rule__Import__Group__2 ;
+    // InternalExport.g:2604:1: rule__Import__Group__1 : rule__Import__Group__1__Impl rule__Import__Group__2 ;
     public final void rule__Import__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2608:1: ( rule__Import__Group__1__Impl rule__Import__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2609:2: rule__Import__Group__1__Impl rule__Import__Group__2
+            // InternalExport.g:2608:1: ( rule__Import__Group__1__Impl rule__Import__Group__2 )
+            // InternalExport.g:2609:2: rule__Import__Group__1__Impl rule__Import__Group__2
             {
-            pushFollow(FOLLOW_rule__Import__Group__1__Impl_in_rule__Import__Group__15573);
+            pushFollow(FOLLOW_15);
             rule__Import__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Import__Group__2_in_rule__Import__Group__15576);
+            pushFollow(FOLLOW_2);
             rule__Import__Group__2();
 
             state._fsp--;
@@ -8377,25 +8377,25 @@ public final void rule__Import__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Import__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2616:1: rule__Import__Group__1__Impl : ( ( rule__Import__PackageAssignment_1 ) ) ;
+    // InternalExport.g:2616:1: rule__Import__Group__1__Impl : ( ( rule__Import__PackageAssignment_1 ) ) ;
     public final void rule__Import__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2620:1: ( ( ( rule__Import__PackageAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2621:1: ( ( rule__Import__PackageAssignment_1 ) )
+            // InternalExport.g:2620:1: ( ( ( rule__Import__PackageAssignment_1 ) ) )
+            // InternalExport.g:2621:1: ( ( rule__Import__PackageAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2621:1: ( ( rule__Import__PackageAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2622:1: ( rule__Import__PackageAssignment_1 )
+            // InternalExport.g:2621:1: ( ( rule__Import__PackageAssignment_1 ) )
+            // InternalExport.g:2622:1: ( rule__Import__PackageAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImportAccess().getPackageAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2623:1: ( rule__Import__PackageAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2623:2: rule__Import__PackageAssignment_1
+            // InternalExport.g:2623:1: ( rule__Import__PackageAssignment_1 )
+            // InternalExport.g:2623:2: rule__Import__PackageAssignment_1
             {
-            pushFollow(FOLLOW_rule__Import__PackageAssignment_1_in_rule__Import__Group__1__Impl5603);
+            pushFollow(FOLLOW_2);
             rule__Import__PackageAssignment_1();
 
             state._fsp--;
@@ -8428,16 +8428,16 @@ public final void rule__Import__Group__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Import__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2633:1: rule__Import__Group__2 : rule__Import__Group__2__Impl ;
+    // InternalExport.g:2633:1: rule__Import__Group__2 : rule__Import__Group__2__Impl ;
     public final void rule__Import__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2637:1: ( rule__Import__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2638:2: rule__Import__Group__2__Impl
+            // InternalExport.g:2637:1: ( rule__Import__Group__2__Impl )
+            // InternalExport.g:2638:2: rule__Import__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__Import__Group__2__Impl_in_rule__Import__Group__25633);
+            pushFollow(FOLLOW_2);
             rule__Import__Group__2__Impl();
 
             state._fsp--;
@@ -8461,22 +8461,22 @@ public final void rule__Import__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__Import__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2644:1: rule__Import__Group__2__Impl : ( ( rule__Import__Group_2__0 )? ) ;
+    // InternalExport.g:2644:1: rule__Import__Group__2__Impl : ( ( rule__Import__Group_2__0 )? ) ;
     public final void rule__Import__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2648:1: ( ( ( rule__Import__Group_2__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2649:1: ( ( rule__Import__Group_2__0 )? )
+            // InternalExport.g:2648:1: ( ( ( rule__Import__Group_2__0 )? ) )
+            // InternalExport.g:2649:1: ( ( rule__Import__Group_2__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2649:1: ( ( rule__Import__Group_2__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2650:1: ( rule__Import__Group_2__0 )?
+            // InternalExport.g:2649:1: ( ( rule__Import__Group_2__0 )? )
+            // InternalExport.g:2650:1: ( rule__Import__Group_2__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImportAccess().getGroup_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2651:1: ( rule__Import__Group_2__0 )?
+            // InternalExport.g:2651:1: ( rule__Import__Group_2__0 )?
             int alt27=2;
             int LA27_0 = input.LA(1);
 
@@ -8485,9 +8485,9 @@ public final void rule__Import__Group__2__Impl() throws RecognitionException {
             }
             switch (alt27) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2651:2: rule__Import__Group_2__0
+                    // InternalExport.g:2651:2: rule__Import__Group_2__0
                     {
-                    pushFollow(FOLLOW_rule__Import__Group_2__0_in_rule__Import__Group__2__Impl5660);
+                    pushFollow(FOLLOW_2);
                     rule__Import__Group_2__0();
 
                     state._fsp--;
@@ -8523,21 +8523,21 @@ public final void rule__Import__Group__2__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Import__Group_2__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2667:1: rule__Import__Group_2__0 : rule__Import__Group_2__0__Impl rule__Import__Group_2__1 ;
+    // InternalExport.g:2667:1: rule__Import__Group_2__0 : rule__Import__Group_2__0__Impl rule__Import__Group_2__1 ;
     public final void rule__Import__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2671:1: ( rule__Import__Group_2__0__Impl rule__Import__Group_2__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2672:2: rule__Import__Group_2__0__Impl rule__Import__Group_2__1
+            // InternalExport.g:2671:1: ( rule__Import__Group_2__0__Impl rule__Import__Group_2__1 )
+            // InternalExport.g:2672:2: rule__Import__Group_2__0__Impl rule__Import__Group_2__1
             {
-            pushFollow(FOLLOW_rule__Import__Group_2__0__Impl_in_rule__Import__Group_2__05697);
+            pushFollow(FOLLOW_10);
             rule__Import__Group_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Import__Group_2__1_in_rule__Import__Group_2__05700);
+            pushFollow(FOLLOW_2);
             rule__Import__Group_2__1();
 
             state._fsp--;
@@ -8561,22 +8561,22 @@ public final void rule__Import__Group_2__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Import__Group_2__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2679:1: rule__Import__Group_2__0__Impl : ( 'as' ) ;
+    // InternalExport.g:2679:1: rule__Import__Group_2__0__Impl : ( 'as' ) ;
     public final void rule__Import__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2683:1: ( ( 'as' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2684:1: ( 'as' )
+            // InternalExport.g:2683:1: ( ( 'as' ) )
+            // InternalExport.g:2684:1: ( 'as' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2684:1: ( 'as' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2685:1: 'as'
+            // InternalExport.g:2684:1: ( 'as' )
+            // InternalExport.g:2685:1: 'as'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImportAccess().getAsKeyword_2_0()); 
             }
-            match(input,42,FOLLOW_42_in_rule__Import__Group_2__0__Impl5728); if (state.failed) return ;
+            match(input,42,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getImportAccess().getAsKeyword_2_0()); 
             }
@@ -8602,16 +8602,16 @@ public final void rule__Import__Group_2__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Import__Group_2__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2698:1: rule__Import__Group_2__1 : rule__Import__Group_2__1__Impl ;
+    // InternalExport.g:2698:1: rule__Import__Group_2__1 : rule__Import__Group_2__1__Impl ;
     public final void rule__Import__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2702:1: ( rule__Import__Group_2__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2703:2: rule__Import__Group_2__1__Impl
+            // InternalExport.g:2702:1: ( rule__Import__Group_2__1__Impl )
+            // InternalExport.g:2703:2: rule__Import__Group_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__Import__Group_2__1__Impl_in_rule__Import__Group_2__15759);
+            pushFollow(FOLLOW_2);
             rule__Import__Group_2__1__Impl();
 
             state._fsp--;
@@ -8635,25 +8635,25 @@ public final void rule__Import__Group_2__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Import__Group_2__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2709:1: rule__Import__Group_2__1__Impl : ( ( rule__Import__NameAssignment_2_1 ) ) ;
+    // InternalExport.g:2709:1: rule__Import__Group_2__1__Impl : ( ( rule__Import__NameAssignment_2_1 ) ) ;
     public final void rule__Import__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2713:1: ( ( ( rule__Import__NameAssignment_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2714:1: ( ( rule__Import__NameAssignment_2_1 ) )
+            // InternalExport.g:2713:1: ( ( ( rule__Import__NameAssignment_2_1 ) ) )
+            // InternalExport.g:2714:1: ( ( rule__Import__NameAssignment_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2714:1: ( ( rule__Import__NameAssignment_2_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2715:1: ( rule__Import__NameAssignment_2_1 )
+            // InternalExport.g:2714:1: ( ( rule__Import__NameAssignment_2_1 ) )
+            // InternalExport.g:2715:1: ( rule__Import__NameAssignment_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImportAccess().getNameAssignment_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2716:1: ( rule__Import__NameAssignment_2_1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2716:2: rule__Import__NameAssignment_2_1
+            // InternalExport.g:2716:1: ( rule__Import__NameAssignment_2_1 )
+            // InternalExport.g:2716:2: rule__Import__NameAssignment_2_1
             {
-            pushFollow(FOLLOW_rule__Import__NameAssignment_2_1_in_rule__Import__Group_2__1__Impl5786);
+            pushFollow(FOLLOW_2);
             rule__Import__NameAssignment_2_1();
 
             state._fsp--;
@@ -8686,21 +8686,21 @@ public final void rule__Import__Group_2__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Extension__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2730:1: rule__Extension__Group__0 : rule__Extension__Group__0__Impl rule__Extension__Group__1 ;
+    // InternalExport.g:2730:1: rule__Extension__Group__0 : rule__Extension__Group__0__Impl rule__Extension__Group__1 ;
     public final void rule__Extension__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2734:1: ( rule__Extension__Group__0__Impl rule__Extension__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2735:2: rule__Extension__Group__0__Impl rule__Extension__Group__1
+            // InternalExport.g:2734:1: ( rule__Extension__Group__0__Impl rule__Extension__Group__1 )
+            // InternalExport.g:2735:2: rule__Extension__Group__0__Impl rule__Extension__Group__1
             {
-            pushFollow(FOLLOW_rule__Extension__Group__0__Impl_in_rule__Extension__Group__05820);
+            pushFollow(FOLLOW_10);
             rule__Extension__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Extension__Group__1_in_rule__Extension__Group__05823);
+            pushFollow(FOLLOW_2);
             rule__Extension__Group__1();
 
             state._fsp--;
@@ -8724,22 +8724,22 @@ public final void rule__Extension__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Extension__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2742:1: rule__Extension__Group__0__Impl : ( 'extension' ) ;
+    // InternalExport.g:2742:1: rule__Extension__Group__0__Impl : ( 'extension' ) ;
     public final void rule__Extension__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2746:1: ( ( 'extension' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2747:1: ( 'extension' )
+            // InternalExport.g:2746:1: ( ( 'extension' ) )
+            // InternalExport.g:2747:1: ( 'extension' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2747:1: ( 'extension' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2748:1: 'extension'
+            // InternalExport.g:2747:1: ( 'extension' )
+            // InternalExport.g:2748:1: 'extension'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExtensionAccess().getExtensionKeyword_0()); 
             }
-            match(input,43,FOLLOW_43_in_rule__Extension__Group__0__Impl5851); if (state.failed) return ;
+            match(input,43,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExtensionAccess().getExtensionKeyword_0()); 
             }
@@ -8765,16 +8765,16 @@ public final void rule__Extension__Group__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__Extension__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2761:1: rule__Extension__Group__1 : rule__Extension__Group__1__Impl ;
+    // InternalExport.g:2761:1: rule__Extension__Group__1 : rule__Extension__Group__1__Impl ;
     public final void rule__Extension__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2765:1: ( rule__Extension__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2766:2: rule__Extension__Group__1__Impl
+            // InternalExport.g:2765:1: ( rule__Extension__Group__1__Impl )
+            // InternalExport.g:2766:2: rule__Extension__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__Extension__Group__1__Impl_in_rule__Extension__Group__15882);
+            pushFollow(FOLLOW_2);
             rule__Extension__Group__1__Impl();
 
             state._fsp--;
@@ -8798,25 +8798,25 @@ public final void rule__Extension__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Extension__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2772:1: rule__Extension__Group__1__Impl : ( ( rule__Extension__ExtensionAssignment_1 ) ) ;
+    // InternalExport.g:2772:1: rule__Extension__Group__1__Impl : ( ( rule__Extension__ExtensionAssignment_1 ) ) ;
     public final void rule__Extension__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2776:1: ( ( ( rule__Extension__ExtensionAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2777:1: ( ( rule__Extension__ExtensionAssignment_1 ) )
+            // InternalExport.g:2776:1: ( ( ( rule__Extension__ExtensionAssignment_1 ) ) )
+            // InternalExport.g:2777:1: ( ( rule__Extension__ExtensionAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2777:1: ( ( rule__Extension__ExtensionAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2778:1: ( rule__Extension__ExtensionAssignment_1 )
+            // InternalExport.g:2777:1: ( ( rule__Extension__ExtensionAssignment_1 ) )
+            // InternalExport.g:2778:1: ( rule__Extension__ExtensionAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExtensionAccess().getExtensionAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2779:1: ( rule__Extension__ExtensionAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2779:2: rule__Extension__ExtensionAssignment_1
+            // InternalExport.g:2779:1: ( rule__Extension__ExtensionAssignment_1 )
+            // InternalExport.g:2779:2: rule__Extension__ExtensionAssignment_1
             {
-            pushFollow(FOLLOW_rule__Extension__ExtensionAssignment_1_in_rule__Extension__Group__1__Impl5909);
+            pushFollow(FOLLOW_2);
             rule__Extension__ExtensionAssignment_1();
 
             state._fsp--;
@@ -8849,21 +8849,21 @@ public final void rule__Extension__Group__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__Interface__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2793:1: rule__Interface__Group__0 : rule__Interface__Group__0__Impl rule__Interface__Group__1 ;
+    // InternalExport.g:2793:1: rule__Interface__Group__0 : rule__Interface__Group__0__Impl rule__Interface__Group__1 ;
     public final void rule__Interface__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2797:1: ( rule__Interface__Group__0__Impl rule__Interface__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2798:2: rule__Interface__Group__0__Impl rule__Interface__Group__1
+            // InternalExport.g:2797:1: ( rule__Interface__Group__0__Impl rule__Interface__Group__1 )
+            // InternalExport.g:2798:2: rule__Interface__Group__0__Impl rule__Interface__Group__1
             {
-            pushFollow(FOLLOW_rule__Interface__Group__0__Impl_in_rule__Interface__Group__05943);
+            pushFollow(FOLLOW_16);
             rule__Interface__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Interface__Group__1_in_rule__Interface__Group__05946);
+            pushFollow(FOLLOW_2);
             rule__Interface__Group__1();
 
             state._fsp--;
@@ -8887,25 +8887,25 @@ public final void rule__Interface__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Interface__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2805:1: rule__Interface__Group__0__Impl : ( ( rule__Interface__TypeAssignment_0 ) ) ;
+    // InternalExport.g:2805:1: rule__Interface__Group__0__Impl : ( ( rule__Interface__TypeAssignment_0 ) ) ;
     public final void rule__Interface__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2809:1: ( ( ( rule__Interface__TypeAssignment_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2810:1: ( ( rule__Interface__TypeAssignment_0 ) )
+            // InternalExport.g:2809:1: ( ( ( rule__Interface__TypeAssignment_0 ) ) )
+            // InternalExport.g:2810:1: ( ( rule__Interface__TypeAssignment_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2810:1: ( ( rule__Interface__TypeAssignment_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2811:1: ( rule__Interface__TypeAssignment_0 )
+            // InternalExport.g:2810:1: ( ( rule__Interface__TypeAssignment_0 ) )
+            // InternalExport.g:2811:1: ( rule__Interface__TypeAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceAccess().getTypeAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2812:1: ( rule__Interface__TypeAssignment_0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2812:2: rule__Interface__TypeAssignment_0
+            // InternalExport.g:2812:1: ( rule__Interface__TypeAssignment_0 )
+            // InternalExport.g:2812:2: rule__Interface__TypeAssignment_0
             {
-            pushFollow(FOLLOW_rule__Interface__TypeAssignment_0_in_rule__Interface__Group__0__Impl5973);
+            pushFollow(FOLLOW_2);
             rule__Interface__TypeAssignment_0();
 
             state._fsp--;
@@ -8938,21 +8938,21 @@ public final void rule__Interface__Group__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__Interface__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2822:1: rule__Interface__Group__1 : rule__Interface__Group__1__Impl rule__Interface__Group__2 ;
+    // InternalExport.g:2822:1: rule__Interface__Group__1 : rule__Interface__Group__1__Impl rule__Interface__Group__2 ;
     public final void rule__Interface__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2826:1: ( rule__Interface__Group__1__Impl rule__Interface__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2827:2: rule__Interface__Group__1__Impl rule__Interface__Group__2
+            // InternalExport.g:2826:1: ( rule__Interface__Group__1__Impl rule__Interface__Group__2 )
+            // InternalExport.g:2827:2: rule__Interface__Group__1__Impl rule__Interface__Group__2
             {
-            pushFollow(FOLLOW_rule__Interface__Group__1__Impl_in_rule__Interface__Group__16003);
+            pushFollow(FOLLOW_16);
             rule__Interface__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Interface__Group__2_in_rule__Interface__Group__16006);
+            pushFollow(FOLLOW_2);
             rule__Interface__Group__2();
 
             state._fsp--;
@@ -8976,22 +8976,22 @@ public final void rule__Interface__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Interface__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2834:1: rule__Interface__Group__1__Impl : ( ( rule__Interface__Group_1__0 )? ) ;
+    // InternalExport.g:2834:1: rule__Interface__Group__1__Impl : ( ( rule__Interface__Group_1__0 )? ) ;
     public final void rule__Interface__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2838:1: ( ( ( rule__Interface__Group_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2839:1: ( ( rule__Interface__Group_1__0 )? )
+            // InternalExport.g:2838:1: ( ( ( rule__Interface__Group_1__0 )? ) )
+            // InternalExport.g:2839:1: ( ( rule__Interface__Group_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2839:1: ( ( rule__Interface__Group_1__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2840:1: ( rule__Interface__Group_1__0 )?
+            // InternalExport.g:2839:1: ( ( rule__Interface__Group_1__0 )? )
+            // InternalExport.g:2840:1: ( rule__Interface__Group_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2841:1: ( rule__Interface__Group_1__0 )?
+            // InternalExport.g:2841:1: ( rule__Interface__Group_1__0 )?
             int alt28=2;
             int LA28_0 = input.LA(1);
 
@@ -9000,9 +9000,9 @@ public final void rule__Interface__Group__1__Impl() throws RecognitionException
             }
             switch (alt28) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2841:2: rule__Interface__Group_1__0
+                    // InternalExport.g:2841:2: rule__Interface__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__Interface__Group_1__0_in_rule__Interface__Group__1__Impl6033);
+                    pushFollow(FOLLOW_2);
                     rule__Interface__Group_1__0();
 
                     state._fsp--;
@@ -9038,21 +9038,21 @@ public final void rule__Interface__Group__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__Interface__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2851:1: rule__Interface__Group__2 : rule__Interface__Group__2__Impl rule__Interface__Group__3 ;
+    // InternalExport.g:2851:1: rule__Interface__Group__2 : rule__Interface__Group__2__Impl rule__Interface__Group__3 ;
     public final void rule__Interface__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2855:1: ( rule__Interface__Group__2__Impl rule__Interface__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2856:2: rule__Interface__Group__2__Impl rule__Interface__Group__3
+            // InternalExport.g:2855:1: ( rule__Interface__Group__2__Impl rule__Interface__Group__3 )
+            // InternalExport.g:2856:2: rule__Interface__Group__2__Impl rule__Interface__Group__3
             {
-            pushFollow(FOLLOW_rule__Interface__Group__2__Impl_in_rule__Interface__Group__26064);
+            pushFollow(FOLLOW_16);
             rule__Interface__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Interface__Group__3_in_rule__Interface__Group__26067);
+            pushFollow(FOLLOW_2);
             rule__Interface__Group__3();
 
             state._fsp--;
@@ -9076,22 +9076,22 @@ public final void rule__Interface__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__Interface__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2863:1: rule__Interface__Group__2__Impl : ( ( rule__Interface__Group_2__0 )* ) ;
+    // InternalExport.g:2863:1: rule__Interface__Group__2__Impl : ( ( rule__Interface__Group_2__0 )* ) ;
     public final void rule__Interface__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2867:1: ( ( ( rule__Interface__Group_2__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2868:1: ( ( rule__Interface__Group_2__0 )* )
+            // InternalExport.g:2867:1: ( ( ( rule__Interface__Group_2__0 )* ) )
+            // InternalExport.g:2868:1: ( ( rule__Interface__Group_2__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2868:1: ( ( rule__Interface__Group_2__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2869:1: ( rule__Interface__Group_2__0 )*
+            // InternalExport.g:2868:1: ( ( rule__Interface__Group_2__0 )* )
+            // InternalExport.g:2869:1: ( rule__Interface__Group_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceAccess().getGroup_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2870:1: ( rule__Interface__Group_2__0 )*
+            // InternalExport.g:2870:1: ( rule__Interface__Group_2__0 )*
             loop29:
             do {
                 int alt29=2;
@@ -9104,9 +9104,9 @@ public final void rule__Interface__Group__2__Impl() throws RecognitionException
 
                 switch (alt29) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2870:2: rule__Interface__Group_2__0
+            	    // InternalExport.g:2870:2: rule__Interface__Group_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__Interface__Group_2__0_in_rule__Interface__Group__2__Impl6094);
+            	    pushFollow(FOLLOW_17);
             	    rule__Interface__Group_2__0();
 
             	    state._fsp--;
@@ -9145,16 +9145,16 @@ public final void rule__Interface__Group__2__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__Interface__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2880:1: rule__Interface__Group__3 : rule__Interface__Group__3__Impl ;
+    // InternalExport.g:2880:1: rule__Interface__Group__3 : rule__Interface__Group__3__Impl ;
     public final void rule__Interface__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2884:1: ( rule__Interface__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2885:2: rule__Interface__Group__3__Impl
+            // InternalExport.g:2884:1: ( rule__Interface__Group__3__Impl )
+            // InternalExport.g:2885:2: rule__Interface__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__Interface__Group__3__Impl_in_rule__Interface__Group__36125);
+            pushFollow(FOLLOW_2);
             rule__Interface__Group__3__Impl();
 
             state._fsp--;
@@ -9178,22 +9178,22 @@ public final void rule__Interface__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__Interface__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2891:1: rule__Interface__Group__3__Impl : ( ';' ) ;
+    // InternalExport.g:2891:1: rule__Interface__Group__3__Impl : ( ';' ) ;
     public final void rule__Interface__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2895:1: ( ( ';' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2896:1: ( ';' )
+            // InternalExport.g:2895:1: ( ( ';' ) )
+            // InternalExport.g:2896:1: ( ';' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2896:1: ( ';' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2897:1: ';'
+            // InternalExport.g:2896:1: ( ';' )
+            // InternalExport.g:2897:1: ';'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceAccess().getSemicolonKeyword_3()); 
             }
-            match(input,44,FOLLOW_44_in_rule__Interface__Group__3__Impl6153); if (state.failed) return ;
+            match(input,44,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInterfaceAccess().getSemicolonKeyword_3()); 
             }
@@ -9219,21 +9219,21 @@ public final void rule__Interface__Group__3__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__Interface__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2918:1: rule__Interface__Group_1__0 : rule__Interface__Group_1__0__Impl rule__Interface__Group_1__1 ;
+    // InternalExport.g:2918:1: rule__Interface__Group_1__0 : rule__Interface__Group_1__0__Impl rule__Interface__Group_1__1 ;
     public final void rule__Interface__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2922:1: ( rule__Interface__Group_1__0__Impl rule__Interface__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2923:2: rule__Interface__Group_1__0__Impl rule__Interface__Group_1__1
+            // InternalExport.g:2922:1: ( rule__Interface__Group_1__0__Impl rule__Interface__Group_1__1 )
+            // InternalExport.g:2923:2: rule__Interface__Group_1__0__Impl rule__Interface__Group_1__1
             {
-            pushFollow(FOLLOW_rule__Interface__Group_1__0__Impl_in_rule__Interface__Group_1__06192);
+            pushFollow(FOLLOW_18);
             rule__Interface__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Interface__Group_1__1_in_rule__Interface__Group_1__06195);
+            pushFollow(FOLLOW_2);
             rule__Interface__Group_1__1();
 
             state._fsp--;
@@ -9257,22 +9257,22 @@ public final void rule__Interface__Group_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Interface__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2930:1: rule__Interface__Group_1__0__Impl : ( '[' ) ;
+    // InternalExport.g:2930:1: rule__Interface__Group_1__0__Impl : ( '[' ) ;
     public final void rule__Interface__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2934:1: ( ( '[' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2935:1: ( '[' )
+            // InternalExport.g:2934:1: ( ( '[' ) )
+            // InternalExport.g:2935:1: ( '[' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2935:1: ( '[' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2936:1: '['
+            // InternalExport.g:2935:1: ( '[' )
+            // InternalExport.g:2936:1: '['
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceAccess().getLeftSquareBracketKeyword_1_0()); 
             }
-            match(input,45,FOLLOW_45_in_rule__Interface__Group_1__0__Impl6223); if (state.failed) return ;
+            match(input,45,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInterfaceAccess().getLeftSquareBracketKeyword_1_0()); 
             }
@@ -9298,21 +9298,21 @@ public final void rule__Interface__Group_1__0__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__Interface__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2949:1: rule__Interface__Group_1__1 : rule__Interface__Group_1__1__Impl rule__Interface__Group_1__2 ;
+    // InternalExport.g:2949:1: rule__Interface__Group_1__1 : rule__Interface__Group_1__1__Impl rule__Interface__Group_1__2 ;
     public final void rule__Interface__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2953:1: ( rule__Interface__Group_1__1__Impl rule__Interface__Group_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2954:2: rule__Interface__Group_1__1__Impl rule__Interface__Group_1__2
+            // InternalExport.g:2953:1: ( rule__Interface__Group_1__1__Impl rule__Interface__Group_1__2 )
+            // InternalExport.g:2954:2: rule__Interface__Group_1__1__Impl rule__Interface__Group_1__2
             {
-            pushFollow(FOLLOW_rule__Interface__Group_1__1__Impl_in_rule__Interface__Group_1__16254);
+            pushFollow(FOLLOW_19);
             rule__Interface__Group_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Interface__Group_1__2_in_rule__Interface__Group_1__16257);
+            pushFollow(FOLLOW_2);
             rule__Interface__Group_1__2();
 
             state._fsp--;
@@ -9336,25 +9336,25 @@ public final void rule__Interface__Group_1__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Interface__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2961:1: rule__Interface__Group_1__1__Impl : ( ( rule__Interface__GuardAssignment_1_1 ) ) ;
+    // InternalExport.g:2961:1: rule__Interface__Group_1__1__Impl : ( ( rule__Interface__GuardAssignment_1_1 ) ) ;
     public final void rule__Interface__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2965:1: ( ( ( rule__Interface__GuardAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2966:1: ( ( rule__Interface__GuardAssignment_1_1 ) )
+            // InternalExport.g:2965:1: ( ( ( rule__Interface__GuardAssignment_1_1 ) ) )
+            // InternalExport.g:2966:1: ( ( rule__Interface__GuardAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2966:1: ( ( rule__Interface__GuardAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2967:1: ( rule__Interface__GuardAssignment_1_1 )
+            // InternalExport.g:2966:1: ( ( rule__Interface__GuardAssignment_1_1 ) )
+            // InternalExport.g:2967:1: ( rule__Interface__GuardAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceAccess().getGuardAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2968:1: ( rule__Interface__GuardAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2968:2: rule__Interface__GuardAssignment_1_1
+            // InternalExport.g:2968:1: ( rule__Interface__GuardAssignment_1_1 )
+            // InternalExport.g:2968:2: rule__Interface__GuardAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__Interface__GuardAssignment_1_1_in_rule__Interface__Group_1__1__Impl6284);
+            pushFollow(FOLLOW_2);
             rule__Interface__GuardAssignment_1_1();
 
             state._fsp--;
@@ -9387,16 +9387,16 @@ public final void rule__Interface__Group_1__1__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__Interface__Group_1__2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2978:1: rule__Interface__Group_1__2 : rule__Interface__Group_1__2__Impl ;
+    // InternalExport.g:2978:1: rule__Interface__Group_1__2 : rule__Interface__Group_1__2__Impl ;
     public final void rule__Interface__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2982:1: ( rule__Interface__Group_1__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2983:2: rule__Interface__Group_1__2__Impl
+            // InternalExport.g:2982:1: ( rule__Interface__Group_1__2__Impl )
+            // InternalExport.g:2983:2: rule__Interface__Group_1__2__Impl
             {
-            pushFollow(FOLLOW_rule__Interface__Group_1__2__Impl_in_rule__Interface__Group_1__26314);
+            pushFollow(FOLLOW_2);
             rule__Interface__Group_1__2__Impl();
 
             state._fsp--;
@@ -9420,22 +9420,22 @@ public final void rule__Interface__Group_1__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__Interface__Group_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2989:1: rule__Interface__Group_1__2__Impl : ( ']' ) ;
+    // InternalExport.g:2989:1: rule__Interface__Group_1__2__Impl : ( ']' ) ;
     public final void rule__Interface__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2993:1: ( ( ']' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2994:1: ( ']' )
+            // InternalExport.g:2993:1: ( ( ']' ) )
+            // InternalExport.g:2994:1: ( ']' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2994:1: ( ']' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:2995:1: ']'
+            // InternalExport.g:2994:1: ( ']' )
+            // InternalExport.g:2995:1: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceAccess().getRightSquareBracketKeyword_1_2()); 
             }
-            match(input,46,FOLLOW_46_in_rule__Interface__Group_1__2__Impl6342); if (state.failed) return ;
+            match(input,46,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInterfaceAccess().getRightSquareBracketKeyword_1_2()); 
             }
@@ -9461,21 +9461,21 @@ public final void rule__Interface__Group_1__2__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__Interface__Group_2__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3014:1: rule__Interface__Group_2__0 : rule__Interface__Group_2__0__Impl rule__Interface__Group_2__1 ;
+    // InternalExport.g:3014:1: rule__Interface__Group_2__0 : rule__Interface__Group_2__0__Impl rule__Interface__Group_2__1 ;
     public final void rule__Interface__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3018:1: ( rule__Interface__Group_2__0__Impl rule__Interface__Group_2__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3019:2: rule__Interface__Group_2__0__Impl rule__Interface__Group_2__1
+            // InternalExport.g:3018:1: ( rule__Interface__Group_2__0__Impl rule__Interface__Group_2__1 )
+            // InternalExport.g:3019:2: rule__Interface__Group_2__0__Impl rule__Interface__Group_2__1
             {
-            pushFollow(FOLLOW_rule__Interface__Group_2__0__Impl_in_rule__Interface__Group_2__06379);
+            pushFollow(FOLLOW_20);
             rule__Interface__Group_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Interface__Group_2__1_in_rule__Interface__Group_2__06382);
+            pushFollow(FOLLOW_2);
             rule__Interface__Group_2__1();
 
             state._fsp--;
@@ -9499,22 +9499,22 @@ public final void rule__Interface__Group_2__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Interface__Group_2__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3026:1: rule__Interface__Group_2__0__Impl : ( '=' ) ;
+    // InternalExport.g:3026:1: rule__Interface__Group_2__0__Impl : ( '=' ) ;
     public final void rule__Interface__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3030:1: ( ( '=' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3031:1: ( '=' )
+            // InternalExport.g:3030:1: ( ( '=' ) )
+            // InternalExport.g:3031:1: ( '=' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3031:1: ( '=' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3032:1: '='
+            // InternalExport.g:3031:1: ( '=' )
+            // InternalExport.g:3032:1: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceAccess().getEqualsSignKeyword_2_0()); 
             }
-            match(input,47,FOLLOW_47_in_rule__Interface__Group_2__0__Impl6410); if (state.failed) return ;
+            match(input,47,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInterfaceAccess().getEqualsSignKeyword_2_0()); 
             }
@@ -9540,21 +9540,21 @@ public final void rule__Interface__Group_2__0__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__Interface__Group_2__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3045:1: rule__Interface__Group_2__1 : rule__Interface__Group_2__1__Impl rule__Interface__Group_2__2 ;
+    // InternalExport.g:3045:1: rule__Interface__Group_2__1 : rule__Interface__Group_2__1__Impl rule__Interface__Group_2__2 ;
     public final void rule__Interface__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3049:1: ( rule__Interface__Group_2__1__Impl rule__Interface__Group_2__2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3050:2: rule__Interface__Group_2__1__Impl rule__Interface__Group_2__2
+            // InternalExport.g:3049:1: ( rule__Interface__Group_2__1__Impl rule__Interface__Group_2__2 )
+            // InternalExport.g:3050:2: rule__Interface__Group_2__1__Impl rule__Interface__Group_2__2
             {
-            pushFollow(FOLLOW_rule__Interface__Group_2__1__Impl_in_rule__Interface__Group_2__16441);
+            pushFollow(FOLLOW_21);
             rule__Interface__Group_2__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Interface__Group_2__2_in_rule__Interface__Group_2__16444);
+            pushFollow(FOLLOW_2);
             rule__Interface__Group_2__2();
 
             state._fsp--;
@@ -9578,25 +9578,25 @@ public final void rule__Interface__Group_2__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Interface__Group_2__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3057:1: rule__Interface__Group_2__1__Impl : ( ( rule__Interface__ItemsAssignment_2_1 ) ) ;
+    // InternalExport.g:3057:1: rule__Interface__Group_2__1__Impl : ( ( rule__Interface__ItemsAssignment_2_1 ) ) ;
     public final void rule__Interface__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3061:1: ( ( ( rule__Interface__ItemsAssignment_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3062:1: ( ( rule__Interface__ItemsAssignment_2_1 ) )
+            // InternalExport.g:3061:1: ( ( ( rule__Interface__ItemsAssignment_2_1 ) ) )
+            // InternalExport.g:3062:1: ( ( rule__Interface__ItemsAssignment_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3062:1: ( ( rule__Interface__ItemsAssignment_2_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3063:1: ( rule__Interface__ItemsAssignment_2_1 )
+            // InternalExport.g:3062:1: ( ( rule__Interface__ItemsAssignment_2_1 ) )
+            // InternalExport.g:3063:1: ( rule__Interface__ItemsAssignment_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceAccess().getItemsAssignment_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3064:1: ( rule__Interface__ItemsAssignment_2_1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3064:2: rule__Interface__ItemsAssignment_2_1
+            // InternalExport.g:3064:1: ( rule__Interface__ItemsAssignment_2_1 )
+            // InternalExport.g:3064:2: rule__Interface__ItemsAssignment_2_1
             {
-            pushFollow(FOLLOW_rule__Interface__ItemsAssignment_2_1_in_rule__Interface__Group_2__1__Impl6471);
+            pushFollow(FOLLOW_2);
             rule__Interface__ItemsAssignment_2_1();
 
             state._fsp--;
@@ -9629,16 +9629,16 @@ public final void rule__Interface__Group_2__1__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__Interface__Group_2__2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3074:1: rule__Interface__Group_2__2 : rule__Interface__Group_2__2__Impl ;
+    // InternalExport.g:3074:1: rule__Interface__Group_2__2 : rule__Interface__Group_2__2__Impl ;
     public final void rule__Interface__Group_2__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3078:1: ( rule__Interface__Group_2__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3079:2: rule__Interface__Group_2__2__Impl
+            // InternalExport.g:3078:1: ( rule__Interface__Group_2__2__Impl )
+            // InternalExport.g:3079:2: rule__Interface__Group_2__2__Impl
             {
-            pushFollow(FOLLOW_rule__Interface__Group_2__2__Impl_in_rule__Interface__Group_2__26501);
+            pushFollow(FOLLOW_2);
             rule__Interface__Group_2__2__Impl();
 
             state._fsp--;
@@ -9662,22 +9662,22 @@ public final void rule__Interface__Group_2__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__Interface__Group_2__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3085:1: rule__Interface__Group_2__2__Impl : ( ( rule__Interface__Group_2_2__0 )* ) ;
+    // InternalExport.g:3085:1: rule__Interface__Group_2__2__Impl : ( ( rule__Interface__Group_2_2__0 )* ) ;
     public final void rule__Interface__Group_2__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3089:1: ( ( ( rule__Interface__Group_2_2__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3090:1: ( ( rule__Interface__Group_2_2__0 )* )
+            // InternalExport.g:3089:1: ( ( ( rule__Interface__Group_2_2__0 )* ) )
+            // InternalExport.g:3090:1: ( ( rule__Interface__Group_2_2__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3090:1: ( ( rule__Interface__Group_2_2__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3091:1: ( rule__Interface__Group_2_2__0 )*
+            // InternalExport.g:3090:1: ( ( rule__Interface__Group_2_2__0 )* )
+            // InternalExport.g:3091:1: ( rule__Interface__Group_2_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceAccess().getGroup_2_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3092:1: ( rule__Interface__Group_2_2__0 )*
+            // InternalExport.g:3092:1: ( rule__Interface__Group_2_2__0 )*
             loop30:
             do {
                 int alt30=2;
@@ -9690,9 +9690,9 @@ public final void rule__Interface__Group_2__2__Impl() throws RecognitionExceptio
 
                 switch (alt30) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3092:2: rule__Interface__Group_2_2__0
+            	    // InternalExport.g:3092:2: rule__Interface__Group_2_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__Interface__Group_2_2__0_in_rule__Interface__Group_2__2__Impl6528);
+            	    pushFollow(FOLLOW_22);
             	    rule__Interface__Group_2_2__0();
 
             	    state._fsp--;
@@ -9731,21 +9731,21 @@ public final void rule__Interface__Group_2__2__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__Interface__Group_2_2__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3108:1: rule__Interface__Group_2_2__0 : rule__Interface__Group_2_2__0__Impl rule__Interface__Group_2_2__1 ;
+    // InternalExport.g:3108:1: rule__Interface__Group_2_2__0 : rule__Interface__Group_2_2__0__Impl rule__Interface__Group_2_2__1 ;
     public final void rule__Interface__Group_2_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3112:1: ( rule__Interface__Group_2_2__0__Impl rule__Interface__Group_2_2__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3113:2: rule__Interface__Group_2_2__0__Impl rule__Interface__Group_2_2__1
+            // InternalExport.g:3112:1: ( rule__Interface__Group_2_2__0__Impl rule__Interface__Group_2_2__1 )
+            // InternalExport.g:3113:2: rule__Interface__Group_2_2__0__Impl rule__Interface__Group_2_2__1
             {
-            pushFollow(FOLLOW_rule__Interface__Group_2_2__0__Impl_in_rule__Interface__Group_2_2__06565);
+            pushFollow(FOLLOW_20);
             rule__Interface__Group_2_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Interface__Group_2_2__1_in_rule__Interface__Group_2_2__06568);
+            pushFollow(FOLLOW_2);
             rule__Interface__Group_2_2__1();
 
             state._fsp--;
@@ -9769,22 +9769,22 @@ public final void rule__Interface__Group_2_2__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Interface__Group_2_2__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3120:1: rule__Interface__Group_2_2__0__Impl : ( ',' ) ;
+    // InternalExport.g:3120:1: rule__Interface__Group_2_2__0__Impl : ( ',' ) ;
     public final void rule__Interface__Group_2_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3124:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3125:1: ( ',' )
+            // InternalExport.g:3124:1: ( ( ',' ) )
+            // InternalExport.g:3125:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3125:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3126:1: ','
+            // InternalExport.g:3125:1: ( ',' )
+            // InternalExport.g:3126:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceAccess().getCommaKeyword_2_2_0()); 
             }
-            match(input,48,FOLLOW_48_in_rule__Interface__Group_2_2__0__Impl6596); if (state.failed) return ;
+            match(input,48,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInterfaceAccess().getCommaKeyword_2_2_0()); 
             }
@@ -9810,16 +9810,16 @@ public final void rule__Interface__Group_2_2__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__Interface__Group_2_2__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3139:1: rule__Interface__Group_2_2__1 : rule__Interface__Group_2_2__1__Impl ;
+    // InternalExport.g:3139:1: rule__Interface__Group_2_2__1 : rule__Interface__Group_2_2__1__Impl ;
     public final void rule__Interface__Group_2_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3143:1: ( rule__Interface__Group_2_2__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3144:2: rule__Interface__Group_2_2__1__Impl
+            // InternalExport.g:3143:1: ( rule__Interface__Group_2_2__1__Impl )
+            // InternalExport.g:3144:2: rule__Interface__Group_2_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__Interface__Group_2_2__1__Impl_in_rule__Interface__Group_2_2__16627);
+            pushFollow(FOLLOW_2);
             rule__Interface__Group_2_2__1__Impl();
 
             state._fsp--;
@@ -9843,25 +9843,25 @@ public final void rule__Interface__Group_2_2__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Interface__Group_2_2__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3150:1: rule__Interface__Group_2_2__1__Impl : ( ( rule__Interface__ItemsAssignment_2_2_1 ) ) ;
+    // InternalExport.g:3150:1: rule__Interface__Group_2_2__1__Impl : ( ( rule__Interface__ItemsAssignment_2_2_1 ) ) ;
     public final void rule__Interface__Group_2_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3154:1: ( ( ( rule__Interface__ItemsAssignment_2_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3155:1: ( ( rule__Interface__ItemsAssignment_2_2_1 ) )
+            // InternalExport.g:3154:1: ( ( ( rule__Interface__ItemsAssignment_2_2_1 ) ) )
+            // InternalExport.g:3155:1: ( ( rule__Interface__ItemsAssignment_2_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3155:1: ( ( rule__Interface__ItemsAssignment_2_2_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3156:1: ( rule__Interface__ItemsAssignment_2_2_1 )
+            // InternalExport.g:3155:1: ( ( rule__Interface__ItemsAssignment_2_2_1 ) )
+            // InternalExport.g:3156:1: ( rule__Interface__ItemsAssignment_2_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceAccess().getItemsAssignment_2_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3157:1: ( rule__Interface__ItemsAssignment_2_2_1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3157:2: rule__Interface__ItemsAssignment_2_2_1
+            // InternalExport.g:3157:1: ( rule__Interface__ItemsAssignment_2_2_1 )
+            // InternalExport.g:3157:2: rule__Interface__ItemsAssignment_2_2_1
             {
-            pushFollow(FOLLOW_rule__Interface__ItemsAssignment_2_2_1_in_rule__Interface__Group_2_2__1__Impl6654);
+            pushFollow(FOLLOW_2);
             rule__Interface__ItemsAssignment_2_2_1();
 
             state._fsp--;
@@ -9894,21 +9894,21 @@ public final void rule__Interface__Group_2_2__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InterfaceField__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3171:1: rule__InterfaceField__Group__0 : rule__InterfaceField__Group__0__Impl rule__InterfaceField__Group__1 ;
+    // InternalExport.g:3171:1: rule__InterfaceField__Group__0 : rule__InterfaceField__Group__0__Impl rule__InterfaceField__Group__1 ;
     public final void rule__InterfaceField__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3175:1: ( rule__InterfaceField__Group__0__Impl rule__InterfaceField__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3176:2: rule__InterfaceField__Group__0__Impl rule__InterfaceField__Group__1
+            // InternalExport.g:3175:1: ( rule__InterfaceField__Group__0__Impl rule__InterfaceField__Group__1 )
+            // InternalExport.g:3176:2: rule__InterfaceField__Group__0__Impl rule__InterfaceField__Group__1
             {
-            pushFollow(FOLLOW_rule__InterfaceField__Group__0__Impl_in_rule__InterfaceField__Group__06688);
+            pushFollow(FOLLOW_23);
             rule__InterfaceField__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InterfaceField__Group__1_in_rule__InterfaceField__Group__06691);
+            pushFollow(FOLLOW_2);
             rule__InterfaceField__Group__1();
 
             state._fsp--;
@@ -9932,22 +9932,22 @@ public final void rule__InterfaceField__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__InterfaceField__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3183:1: rule__InterfaceField__Group__0__Impl : ( ( rule__InterfaceField__UnorderedAssignment_0 )? ) ;
+    // InternalExport.g:3183:1: rule__InterfaceField__Group__0__Impl : ( ( rule__InterfaceField__UnorderedAssignment_0 )? ) ;
     public final void rule__InterfaceField__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3187:1: ( ( ( rule__InterfaceField__UnorderedAssignment_0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3188:1: ( ( rule__InterfaceField__UnorderedAssignment_0 )? )
+            // InternalExport.g:3187:1: ( ( ( rule__InterfaceField__UnorderedAssignment_0 )? ) )
+            // InternalExport.g:3188:1: ( ( rule__InterfaceField__UnorderedAssignment_0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3188:1: ( ( rule__InterfaceField__UnorderedAssignment_0 )? )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3189:1: ( rule__InterfaceField__UnorderedAssignment_0 )?
+            // InternalExport.g:3188:1: ( ( rule__InterfaceField__UnorderedAssignment_0 )? )
+            // InternalExport.g:3189:1: ( rule__InterfaceField__UnorderedAssignment_0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceFieldAccess().getUnorderedAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3190:1: ( rule__InterfaceField__UnorderedAssignment_0 )?
+            // InternalExport.g:3190:1: ( rule__InterfaceField__UnorderedAssignment_0 )?
             int alt31=2;
             int LA31_0 = input.LA(1);
 
@@ -9956,9 +9956,9 @@ public final void rule__InterfaceField__Group__0__Impl() throws RecognitionExcep
             }
             switch (alt31) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3190:2: rule__InterfaceField__UnorderedAssignment_0
+                    // InternalExport.g:3190:2: rule__InterfaceField__UnorderedAssignment_0
                     {
-                    pushFollow(FOLLOW_rule__InterfaceField__UnorderedAssignment_0_in_rule__InterfaceField__Group__0__Impl6718);
+                    pushFollow(FOLLOW_2);
                     rule__InterfaceField__UnorderedAssignment_0();
 
                     state._fsp--;
@@ -9994,16 +9994,16 @@ public final void rule__InterfaceField__Group__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__InterfaceField__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3200:1: rule__InterfaceField__Group__1 : rule__InterfaceField__Group__1__Impl ;
+    // InternalExport.g:3200:1: rule__InterfaceField__Group__1 : rule__InterfaceField__Group__1__Impl ;
     public final void rule__InterfaceField__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3204:1: ( rule__InterfaceField__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3205:2: rule__InterfaceField__Group__1__Impl
+            // InternalExport.g:3204:1: ( rule__InterfaceField__Group__1__Impl )
+            // InternalExport.g:3205:2: rule__InterfaceField__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__InterfaceField__Group__1__Impl_in_rule__InterfaceField__Group__16749);
+            pushFollow(FOLLOW_2);
             rule__InterfaceField__Group__1__Impl();
 
             state._fsp--;
@@ -10027,25 +10027,25 @@ public final void rule__InterfaceField__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__InterfaceField__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3211:1: rule__InterfaceField__Group__1__Impl : ( ( rule__InterfaceField__FieldAssignment_1 ) ) ;
+    // InternalExport.g:3211:1: rule__InterfaceField__Group__1__Impl : ( ( rule__InterfaceField__FieldAssignment_1 ) ) ;
     public final void rule__InterfaceField__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3215:1: ( ( ( rule__InterfaceField__FieldAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3216:1: ( ( rule__InterfaceField__FieldAssignment_1 ) )
+            // InternalExport.g:3215:1: ( ( ( rule__InterfaceField__FieldAssignment_1 ) ) )
+            // InternalExport.g:3216:1: ( ( rule__InterfaceField__FieldAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3216:1: ( ( rule__InterfaceField__FieldAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3217:1: ( rule__InterfaceField__FieldAssignment_1 )
+            // InternalExport.g:3216:1: ( ( rule__InterfaceField__FieldAssignment_1 ) )
+            // InternalExport.g:3217:1: ( rule__InterfaceField__FieldAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceFieldAccess().getFieldAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3218:1: ( rule__InterfaceField__FieldAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3218:2: rule__InterfaceField__FieldAssignment_1
+            // InternalExport.g:3218:1: ( rule__InterfaceField__FieldAssignment_1 )
+            // InternalExport.g:3218:2: rule__InterfaceField__FieldAssignment_1
             {
-            pushFollow(FOLLOW_rule__InterfaceField__FieldAssignment_1_in_rule__InterfaceField__Group__1__Impl6776);
+            pushFollow(FOLLOW_2);
             rule__InterfaceField__FieldAssignment_1();
 
             state._fsp--;
@@ -10078,21 +10078,21 @@ public final void rule__InterfaceField__Group__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__InterfaceNavigation__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3232:1: rule__InterfaceNavigation__Group__0 : rule__InterfaceNavigation__Group__0__Impl rule__InterfaceNavigation__Group__1 ;
+    // InternalExport.g:3232:1: rule__InterfaceNavigation__Group__0 : rule__InterfaceNavigation__Group__0__Impl rule__InterfaceNavigation__Group__1 ;
     public final void rule__InterfaceNavigation__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3236:1: ( rule__InterfaceNavigation__Group__0__Impl rule__InterfaceNavigation__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3237:2: rule__InterfaceNavigation__Group__0__Impl rule__InterfaceNavigation__Group__1
+            // InternalExport.g:3236:1: ( rule__InterfaceNavigation__Group__0__Impl rule__InterfaceNavigation__Group__1 )
+            // InternalExport.g:3237:2: rule__InterfaceNavigation__Group__0__Impl rule__InterfaceNavigation__Group__1
             {
-            pushFollow(FOLLOW_rule__InterfaceNavigation__Group__0__Impl_in_rule__InterfaceNavigation__Group__06810);
+            pushFollow(FOLLOW_23);
             rule__InterfaceNavigation__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InterfaceNavigation__Group__1_in_rule__InterfaceNavigation__Group__06813);
+            pushFollow(FOLLOW_2);
             rule__InterfaceNavigation__Group__1();
 
             state._fsp--;
@@ -10116,22 +10116,22 @@ public final void rule__InterfaceNavigation__Group__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InterfaceNavigation__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3244:1: rule__InterfaceNavigation__Group__0__Impl : ( '@' ) ;
+    // InternalExport.g:3244:1: rule__InterfaceNavigation__Group__0__Impl : ( '@' ) ;
     public final void rule__InterfaceNavigation__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3248:1: ( ( '@' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3249:1: ( '@' )
+            // InternalExport.g:3248:1: ( ( '@' ) )
+            // InternalExport.g:3249:1: ( '@' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3249:1: ( '@' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3250:1: '@'
+            // InternalExport.g:3249:1: ( '@' )
+            // InternalExport.g:3250:1: '@'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceNavigationAccess().getCommercialAtKeyword_0()); 
             }
-            match(input,49,FOLLOW_49_in_rule__InterfaceNavigation__Group__0__Impl6841); if (state.failed) return ;
+            match(input,49,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInterfaceNavigationAccess().getCommercialAtKeyword_0()); 
             }
@@ -10157,21 +10157,21 @@ public final void rule__InterfaceNavigation__Group__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InterfaceNavigation__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3263:1: rule__InterfaceNavigation__Group__1 : rule__InterfaceNavigation__Group__1__Impl rule__InterfaceNavigation__Group__2 ;
+    // InternalExport.g:3263:1: rule__InterfaceNavigation__Group__1 : rule__InterfaceNavigation__Group__1__Impl rule__InterfaceNavigation__Group__2 ;
     public final void rule__InterfaceNavigation__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3267:1: ( rule__InterfaceNavigation__Group__1__Impl rule__InterfaceNavigation__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3268:2: rule__InterfaceNavigation__Group__1__Impl rule__InterfaceNavigation__Group__2
+            // InternalExport.g:3267:1: ( rule__InterfaceNavigation__Group__1__Impl rule__InterfaceNavigation__Group__2 )
+            // InternalExport.g:3268:2: rule__InterfaceNavigation__Group__1__Impl rule__InterfaceNavigation__Group__2
             {
-            pushFollow(FOLLOW_rule__InterfaceNavigation__Group__1__Impl_in_rule__InterfaceNavigation__Group__16872);
+            pushFollow(FOLLOW_23);
             rule__InterfaceNavigation__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InterfaceNavigation__Group__2_in_rule__InterfaceNavigation__Group__16875);
+            pushFollow(FOLLOW_2);
             rule__InterfaceNavigation__Group__2();
 
             state._fsp--;
@@ -10195,22 +10195,22 @@ public final void rule__InterfaceNavigation__Group__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InterfaceNavigation__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3275:1: rule__InterfaceNavigation__Group__1__Impl : ( ( rule__InterfaceNavigation__UnorderedAssignment_1 )? ) ;
+    // InternalExport.g:3275:1: rule__InterfaceNavigation__Group__1__Impl : ( ( rule__InterfaceNavigation__UnorderedAssignment_1 )? ) ;
     public final void rule__InterfaceNavigation__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3279:1: ( ( ( rule__InterfaceNavigation__UnorderedAssignment_1 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3280:1: ( ( rule__InterfaceNavigation__UnorderedAssignment_1 )? )
+            // InternalExport.g:3279:1: ( ( ( rule__InterfaceNavigation__UnorderedAssignment_1 )? ) )
+            // InternalExport.g:3280:1: ( ( rule__InterfaceNavigation__UnorderedAssignment_1 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3280:1: ( ( rule__InterfaceNavigation__UnorderedAssignment_1 )? )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3281:1: ( rule__InterfaceNavigation__UnorderedAssignment_1 )?
+            // InternalExport.g:3280:1: ( ( rule__InterfaceNavigation__UnorderedAssignment_1 )? )
+            // InternalExport.g:3281:1: ( rule__InterfaceNavigation__UnorderedAssignment_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceNavigationAccess().getUnorderedAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3282:1: ( rule__InterfaceNavigation__UnorderedAssignment_1 )?
+            // InternalExport.g:3282:1: ( rule__InterfaceNavigation__UnorderedAssignment_1 )?
             int alt32=2;
             int LA32_0 = input.LA(1);
 
@@ -10219,9 +10219,9 @@ public final void rule__InterfaceNavigation__Group__1__Impl() throws Recognition
             }
             switch (alt32) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3282:2: rule__InterfaceNavigation__UnorderedAssignment_1
+                    // InternalExport.g:3282:2: rule__InterfaceNavigation__UnorderedAssignment_1
                     {
-                    pushFollow(FOLLOW_rule__InterfaceNavigation__UnorderedAssignment_1_in_rule__InterfaceNavigation__Group__1__Impl6902);
+                    pushFollow(FOLLOW_2);
                     rule__InterfaceNavigation__UnorderedAssignment_1();
 
                     state._fsp--;
@@ -10257,16 +10257,16 @@ public final void rule__InterfaceNavigation__Group__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InterfaceNavigation__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3292:1: rule__InterfaceNavigation__Group__2 : rule__InterfaceNavigation__Group__2__Impl ;
+    // InternalExport.g:3292:1: rule__InterfaceNavigation__Group__2 : rule__InterfaceNavigation__Group__2__Impl ;
     public final void rule__InterfaceNavigation__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3296:1: ( rule__InterfaceNavigation__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3297:2: rule__InterfaceNavigation__Group__2__Impl
+            // InternalExport.g:3296:1: ( rule__InterfaceNavigation__Group__2__Impl )
+            // InternalExport.g:3297:2: rule__InterfaceNavigation__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__InterfaceNavigation__Group__2__Impl_in_rule__InterfaceNavigation__Group__26933);
+            pushFollow(FOLLOW_2);
             rule__InterfaceNavigation__Group__2__Impl();
 
             state._fsp--;
@@ -10290,25 +10290,25 @@ public final void rule__InterfaceNavigation__Group__2() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InterfaceNavigation__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3303:1: rule__InterfaceNavigation__Group__2__Impl : ( ( rule__InterfaceNavigation__RefAssignment_2 ) ) ;
+    // InternalExport.g:3303:1: rule__InterfaceNavigation__Group__2__Impl : ( ( rule__InterfaceNavigation__RefAssignment_2 ) ) ;
     public final void rule__InterfaceNavigation__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3307:1: ( ( ( rule__InterfaceNavigation__RefAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3308:1: ( ( rule__InterfaceNavigation__RefAssignment_2 ) )
+            // InternalExport.g:3307:1: ( ( ( rule__InterfaceNavigation__RefAssignment_2 ) ) )
+            // InternalExport.g:3308:1: ( ( rule__InterfaceNavigation__RefAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3308:1: ( ( rule__InterfaceNavigation__RefAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3309:1: ( rule__InterfaceNavigation__RefAssignment_2 )
+            // InternalExport.g:3308:1: ( ( rule__InterfaceNavigation__RefAssignment_2 ) )
+            // InternalExport.g:3309:1: ( rule__InterfaceNavigation__RefAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceNavigationAccess().getRefAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3310:1: ( rule__InterfaceNavigation__RefAssignment_2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3310:2: rule__InterfaceNavigation__RefAssignment_2
+            // InternalExport.g:3310:1: ( rule__InterfaceNavigation__RefAssignment_2 )
+            // InternalExport.g:3310:2: rule__InterfaceNavigation__RefAssignment_2
             {
-            pushFollow(FOLLOW_rule__InterfaceNavigation__RefAssignment_2_in_rule__InterfaceNavigation__Group__2__Impl6960);
+            pushFollow(FOLLOW_2);
             rule__InterfaceNavigation__RefAssignment_2();
 
             state._fsp--;
@@ -10341,21 +10341,21 @@ public final void rule__InterfaceNavigation__Group__2__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InterfaceExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3326:1: rule__InterfaceExpression__Group__0 : rule__InterfaceExpression__Group__0__Impl rule__InterfaceExpression__Group__1 ;
+    // InternalExport.g:3326:1: rule__InterfaceExpression__Group__0 : rule__InterfaceExpression__Group__0__Impl rule__InterfaceExpression__Group__1 ;
     public final void rule__InterfaceExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3330:1: ( rule__InterfaceExpression__Group__0__Impl rule__InterfaceExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3331:2: rule__InterfaceExpression__Group__0__Impl rule__InterfaceExpression__Group__1
+            // InternalExport.g:3330:1: ( rule__InterfaceExpression__Group__0__Impl rule__InterfaceExpression__Group__1 )
+            // InternalExport.g:3331:2: rule__InterfaceExpression__Group__0__Impl rule__InterfaceExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__InterfaceExpression__Group__0__Impl_in_rule__InterfaceExpression__Group__06996);
+            pushFollow(FOLLOW_24);
             rule__InterfaceExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InterfaceExpression__Group__1_in_rule__InterfaceExpression__Group__06999);
+            pushFollow(FOLLOW_2);
             rule__InterfaceExpression__Group__1();
 
             state._fsp--;
@@ -10379,22 +10379,22 @@ public final void rule__InterfaceExpression__Group__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InterfaceExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3338:1: rule__InterfaceExpression__Group__0__Impl : ( 'eval' ) ;
+    // InternalExport.g:3338:1: rule__InterfaceExpression__Group__0__Impl : ( 'eval' ) ;
     public final void rule__InterfaceExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3342:1: ( ( 'eval' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3343:1: ( 'eval' )
+            // InternalExport.g:3342:1: ( ( 'eval' ) )
+            // InternalExport.g:3343:1: ( 'eval' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3343:1: ( 'eval' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3344:1: 'eval'
+            // InternalExport.g:3343:1: ( 'eval' )
+            // InternalExport.g:3344:1: 'eval'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceExpressionAccess().getEvalKeyword_0()); 
             }
-            match(input,50,FOLLOW_50_in_rule__InterfaceExpression__Group__0__Impl7027); if (state.failed) return ;
+            match(input,50,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInterfaceExpressionAccess().getEvalKeyword_0()); 
             }
@@ -10420,21 +10420,21 @@ public final void rule__InterfaceExpression__Group__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InterfaceExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3357:1: rule__InterfaceExpression__Group__1 : rule__InterfaceExpression__Group__1__Impl rule__InterfaceExpression__Group__2 ;
+    // InternalExport.g:3357:1: rule__InterfaceExpression__Group__1 : rule__InterfaceExpression__Group__1__Impl rule__InterfaceExpression__Group__2 ;
     public final void rule__InterfaceExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3361:1: ( rule__InterfaceExpression__Group__1__Impl rule__InterfaceExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3362:2: rule__InterfaceExpression__Group__1__Impl rule__InterfaceExpression__Group__2
+            // InternalExport.g:3361:1: ( rule__InterfaceExpression__Group__1__Impl rule__InterfaceExpression__Group__2 )
+            // InternalExport.g:3362:2: rule__InterfaceExpression__Group__1__Impl rule__InterfaceExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__InterfaceExpression__Group__1__Impl_in_rule__InterfaceExpression__Group__17058);
+            pushFollow(FOLLOW_24);
             rule__InterfaceExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InterfaceExpression__Group__2_in_rule__InterfaceExpression__Group__17061);
+            pushFollow(FOLLOW_2);
             rule__InterfaceExpression__Group__2();
 
             state._fsp--;
@@ -10458,22 +10458,22 @@ public final void rule__InterfaceExpression__Group__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InterfaceExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3369:1: rule__InterfaceExpression__Group__1__Impl : ( ( rule__InterfaceExpression__RefAssignment_1 )? ) ;
+    // InternalExport.g:3369:1: rule__InterfaceExpression__Group__1__Impl : ( ( rule__InterfaceExpression__RefAssignment_1 )? ) ;
     public final void rule__InterfaceExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3373:1: ( ( ( rule__InterfaceExpression__RefAssignment_1 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3374:1: ( ( rule__InterfaceExpression__RefAssignment_1 )? )
+            // InternalExport.g:3373:1: ( ( ( rule__InterfaceExpression__RefAssignment_1 )? ) )
+            // InternalExport.g:3374:1: ( ( rule__InterfaceExpression__RefAssignment_1 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3374:1: ( ( rule__InterfaceExpression__RefAssignment_1 )? )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3375:1: ( rule__InterfaceExpression__RefAssignment_1 )?
+            // InternalExport.g:3374:1: ( ( rule__InterfaceExpression__RefAssignment_1 )? )
+            // InternalExport.g:3375:1: ( rule__InterfaceExpression__RefAssignment_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceExpressionAccess().getRefAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3376:1: ( rule__InterfaceExpression__RefAssignment_1 )?
+            // InternalExport.g:3376:1: ( rule__InterfaceExpression__RefAssignment_1 )?
             int alt33=2;
             int LA33_0 = input.LA(1);
 
@@ -10482,9 +10482,9 @@ public final void rule__InterfaceExpression__Group__1__Impl() throws Recognition
             }
             switch (alt33) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3376:2: rule__InterfaceExpression__RefAssignment_1
+                    // InternalExport.g:3376:2: rule__InterfaceExpression__RefAssignment_1
                     {
-                    pushFollow(FOLLOW_rule__InterfaceExpression__RefAssignment_1_in_rule__InterfaceExpression__Group__1__Impl7088);
+                    pushFollow(FOLLOW_2);
                     rule__InterfaceExpression__RefAssignment_1();
 
                     state._fsp--;
@@ -10520,21 +10520,21 @@ public final void rule__InterfaceExpression__Group__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InterfaceExpression__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3386:1: rule__InterfaceExpression__Group__2 : rule__InterfaceExpression__Group__2__Impl rule__InterfaceExpression__Group__3 ;
+    // InternalExport.g:3386:1: rule__InterfaceExpression__Group__2 : rule__InterfaceExpression__Group__2__Impl rule__InterfaceExpression__Group__3 ;
     public final void rule__InterfaceExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3390:1: ( rule__InterfaceExpression__Group__2__Impl rule__InterfaceExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3391:2: rule__InterfaceExpression__Group__2__Impl rule__InterfaceExpression__Group__3
+            // InternalExport.g:3390:1: ( rule__InterfaceExpression__Group__2__Impl rule__InterfaceExpression__Group__3 )
+            // InternalExport.g:3391:2: rule__InterfaceExpression__Group__2__Impl rule__InterfaceExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__InterfaceExpression__Group__2__Impl_in_rule__InterfaceExpression__Group__27119);
+            pushFollow(FOLLOW_24);
             rule__InterfaceExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InterfaceExpression__Group__3_in_rule__InterfaceExpression__Group__27122);
+            pushFollow(FOLLOW_2);
             rule__InterfaceExpression__Group__3();
 
             state._fsp--;
@@ -10558,22 +10558,22 @@ public final void rule__InterfaceExpression__Group__2() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InterfaceExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3398:1: rule__InterfaceExpression__Group__2__Impl : ( ( rule__InterfaceExpression__UnorderedAssignment_2 )? ) ;
+    // InternalExport.g:3398:1: rule__InterfaceExpression__Group__2__Impl : ( ( rule__InterfaceExpression__UnorderedAssignment_2 )? ) ;
     public final void rule__InterfaceExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3402:1: ( ( ( rule__InterfaceExpression__UnorderedAssignment_2 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3403:1: ( ( rule__InterfaceExpression__UnorderedAssignment_2 )? )
+            // InternalExport.g:3402:1: ( ( ( rule__InterfaceExpression__UnorderedAssignment_2 )? ) )
+            // InternalExport.g:3403:1: ( ( rule__InterfaceExpression__UnorderedAssignment_2 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3403:1: ( ( rule__InterfaceExpression__UnorderedAssignment_2 )? )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3404:1: ( rule__InterfaceExpression__UnorderedAssignment_2 )?
+            // InternalExport.g:3403:1: ( ( rule__InterfaceExpression__UnorderedAssignment_2 )? )
+            // InternalExport.g:3404:1: ( rule__InterfaceExpression__UnorderedAssignment_2 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceExpressionAccess().getUnorderedAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3405:1: ( rule__InterfaceExpression__UnorderedAssignment_2 )?
+            // InternalExport.g:3405:1: ( rule__InterfaceExpression__UnorderedAssignment_2 )?
             int alt34=2;
             int LA34_0 = input.LA(1);
 
@@ -10582,9 +10582,9 @@ public final void rule__InterfaceExpression__Group__2__Impl() throws Recognition
             }
             switch (alt34) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3405:2: rule__InterfaceExpression__UnorderedAssignment_2
+                    // InternalExport.g:3405:2: rule__InterfaceExpression__UnorderedAssignment_2
                     {
-                    pushFollow(FOLLOW_rule__InterfaceExpression__UnorderedAssignment_2_in_rule__InterfaceExpression__Group__2__Impl7149);
+                    pushFollow(FOLLOW_2);
                     rule__InterfaceExpression__UnorderedAssignment_2();
 
                     state._fsp--;
@@ -10620,21 +10620,21 @@ public final void rule__InterfaceExpression__Group__2__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InterfaceExpression__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3415:1: rule__InterfaceExpression__Group__3 : rule__InterfaceExpression__Group__3__Impl rule__InterfaceExpression__Group__4 ;
+    // InternalExport.g:3415:1: rule__InterfaceExpression__Group__3 : rule__InterfaceExpression__Group__3__Impl rule__InterfaceExpression__Group__4 ;
     public final void rule__InterfaceExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3419:1: ( rule__InterfaceExpression__Group__3__Impl rule__InterfaceExpression__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3420:2: rule__InterfaceExpression__Group__3__Impl rule__InterfaceExpression__Group__4
+            // InternalExport.g:3419:1: ( rule__InterfaceExpression__Group__3__Impl rule__InterfaceExpression__Group__4 )
+            // InternalExport.g:3420:2: rule__InterfaceExpression__Group__3__Impl rule__InterfaceExpression__Group__4
             {
-            pushFollow(FOLLOW_rule__InterfaceExpression__Group__3__Impl_in_rule__InterfaceExpression__Group__37180);
+            pushFollow(FOLLOW_18);
             rule__InterfaceExpression__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InterfaceExpression__Group__4_in_rule__InterfaceExpression__Group__37183);
+            pushFollow(FOLLOW_2);
             rule__InterfaceExpression__Group__4();
 
             state._fsp--;
@@ -10658,22 +10658,22 @@ public final void rule__InterfaceExpression__Group__3() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InterfaceExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3427:1: rule__InterfaceExpression__Group__3__Impl : ( '(' ) ;
+    // InternalExport.g:3427:1: rule__InterfaceExpression__Group__3__Impl : ( '(' ) ;
     public final void rule__InterfaceExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3431:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3432:1: ( '(' )
+            // InternalExport.g:3431:1: ( ( '(' ) )
+            // InternalExport.g:3432:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3432:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3433:1: '('
+            // InternalExport.g:3432:1: ( '(' )
+            // InternalExport.g:3433:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceExpressionAccess().getLeftParenthesisKeyword_3()); 
             }
-            match(input,51,FOLLOW_51_in_rule__InterfaceExpression__Group__3__Impl7211); if (state.failed) return ;
+            match(input,51,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInterfaceExpressionAccess().getLeftParenthesisKeyword_3()); 
             }
@@ -10699,21 +10699,21 @@ public final void rule__InterfaceExpression__Group__3__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InterfaceExpression__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3446:1: rule__InterfaceExpression__Group__4 : rule__InterfaceExpression__Group__4__Impl rule__InterfaceExpression__Group__5 ;
+    // InternalExport.g:3446:1: rule__InterfaceExpression__Group__4 : rule__InterfaceExpression__Group__4__Impl rule__InterfaceExpression__Group__5 ;
     public final void rule__InterfaceExpression__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3450:1: ( rule__InterfaceExpression__Group__4__Impl rule__InterfaceExpression__Group__5 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3451:2: rule__InterfaceExpression__Group__4__Impl rule__InterfaceExpression__Group__5
+            // InternalExport.g:3450:1: ( rule__InterfaceExpression__Group__4__Impl rule__InterfaceExpression__Group__5 )
+            // InternalExport.g:3451:2: rule__InterfaceExpression__Group__4__Impl rule__InterfaceExpression__Group__5
             {
-            pushFollow(FOLLOW_rule__InterfaceExpression__Group__4__Impl_in_rule__InterfaceExpression__Group__47242);
+            pushFollow(FOLLOW_25);
             rule__InterfaceExpression__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InterfaceExpression__Group__5_in_rule__InterfaceExpression__Group__47245);
+            pushFollow(FOLLOW_2);
             rule__InterfaceExpression__Group__5();
 
             state._fsp--;
@@ -10737,25 +10737,25 @@ public final void rule__InterfaceExpression__Group__4() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InterfaceExpression__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3458:1: rule__InterfaceExpression__Group__4__Impl : ( ( rule__InterfaceExpression__ExprAssignment_4 ) ) ;
+    // InternalExport.g:3458:1: rule__InterfaceExpression__Group__4__Impl : ( ( rule__InterfaceExpression__ExprAssignment_4 ) ) ;
     public final void rule__InterfaceExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3462:1: ( ( ( rule__InterfaceExpression__ExprAssignment_4 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3463:1: ( ( rule__InterfaceExpression__ExprAssignment_4 ) )
+            // InternalExport.g:3462:1: ( ( ( rule__InterfaceExpression__ExprAssignment_4 ) ) )
+            // InternalExport.g:3463:1: ( ( rule__InterfaceExpression__ExprAssignment_4 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3463:1: ( ( rule__InterfaceExpression__ExprAssignment_4 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3464:1: ( rule__InterfaceExpression__ExprAssignment_4 )
+            // InternalExport.g:3463:1: ( ( rule__InterfaceExpression__ExprAssignment_4 ) )
+            // InternalExport.g:3464:1: ( rule__InterfaceExpression__ExprAssignment_4 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceExpressionAccess().getExprAssignment_4()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3465:1: ( rule__InterfaceExpression__ExprAssignment_4 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3465:2: rule__InterfaceExpression__ExprAssignment_4
+            // InternalExport.g:3465:1: ( rule__InterfaceExpression__ExprAssignment_4 )
+            // InternalExport.g:3465:2: rule__InterfaceExpression__ExprAssignment_4
             {
-            pushFollow(FOLLOW_rule__InterfaceExpression__ExprAssignment_4_in_rule__InterfaceExpression__Group__4__Impl7272);
+            pushFollow(FOLLOW_2);
             rule__InterfaceExpression__ExprAssignment_4();
 
             state._fsp--;
@@ -10788,16 +10788,16 @@ public final void rule__InterfaceExpression__Group__4__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InterfaceExpression__Group__5"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3475:1: rule__InterfaceExpression__Group__5 : rule__InterfaceExpression__Group__5__Impl ;
+    // InternalExport.g:3475:1: rule__InterfaceExpression__Group__5 : rule__InterfaceExpression__Group__5__Impl ;
     public final void rule__InterfaceExpression__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3479:1: ( rule__InterfaceExpression__Group__5__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3480:2: rule__InterfaceExpression__Group__5__Impl
+            // InternalExport.g:3479:1: ( rule__InterfaceExpression__Group__5__Impl )
+            // InternalExport.g:3480:2: rule__InterfaceExpression__Group__5__Impl
             {
-            pushFollow(FOLLOW_rule__InterfaceExpression__Group__5__Impl_in_rule__InterfaceExpression__Group__57302);
+            pushFollow(FOLLOW_2);
             rule__InterfaceExpression__Group__5__Impl();
 
             state._fsp--;
@@ -10821,22 +10821,22 @@ public final void rule__InterfaceExpression__Group__5() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InterfaceExpression__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3486:1: rule__InterfaceExpression__Group__5__Impl : ( ')' ) ;
+    // InternalExport.g:3486:1: rule__InterfaceExpression__Group__5__Impl : ( ')' ) ;
     public final void rule__InterfaceExpression__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3490:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3491:1: ( ')' )
+            // InternalExport.g:3490:1: ( ( ')' ) )
+            // InternalExport.g:3491:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3491:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3492:1: ')'
+            // InternalExport.g:3491:1: ( ')' )
+            // InternalExport.g:3492:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceExpressionAccess().getRightParenthesisKeyword_5()); 
             }
-            match(input,52,FOLLOW_52_in_rule__InterfaceExpression__Group__5__Impl7330); if (state.failed) return ;
+            match(input,52,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInterfaceExpressionAccess().getRightParenthesisKeyword_5()); 
             }
@@ -10862,21 +10862,21 @@ public final void rule__InterfaceExpression__Group__5__Impl() throws Recognition
 
 
     // $ANTLR start "rule__Export__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3517:1: rule__Export__Group__0 : rule__Export__Group__0__Impl rule__Export__Group__1 ;
+    // InternalExport.g:3517:1: rule__Export__Group__0 : rule__Export__Group__0__Impl rule__Export__Group__1 ;
     public final void rule__Export__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3521:1: ( rule__Export__Group__0__Impl rule__Export__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3522:2: rule__Export__Group__0__Impl rule__Export__Group__1
+            // InternalExport.g:3521:1: ( rule__Export__Group__0__Impl rule__Export__Group__1 )
+            // InternalExport.g:3522:2: rule__Export__Group__0__Impl rule__Export__Group__1
             {
-            pushFollow(FOLLOW_rule__Export__Group__0__Impl_in_rule__Export__Group__07373);
+            pushFollow(FOLLOW_26);
             rule__Export__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Export__Group__1_in_rule__Export__Group__07376);
+            pushFollow(FOLLOW_2);
             rule__Export__Group__1();
 
             state._fsp--;
@@ -10900,22 +10900,22 @@ public final void rule__Export__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3529:1: rule__Export__Group__0__Impl : ( 'export' ) ;
+    // InternalExport.g:3529:1: rule__Export__Group__0__Impl : ( 'export' ) ;
     public final void rule__Export__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3533:1: ( ( 'export' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3534:1: ( 'export' )
+            // InternalExport.g:3533:1: ( ( 'export' ) )
+            // InternalExport.g:3534:1: ( 'export' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3534:1: ( 'export' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3535:1: 'export'
+            // InternalExport.g:3534:1: ( 'export' )
+            // InternalExport.g:3535:1: 'export'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getExportKeyword_0()); 
             }
-            match(input,36,FOLLOW_36_in_rule__Export__Group__0__Impl7404); if (state.failed) return ;
+            match(input,36,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExportAccess().getExportKeyword_0()); 
             }
@@ -10941,21 +10941,21 @@ public final void rule__Export__Group__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3548:1: rule__Export__Group__1 : rule__Export__Group__1__Impl rule__Export__Group__2 ;
+    // InternalExport.g:3548:1: rule__Export__Group__1 : rule__Export__Group__1__Impl rule__Export__Group__2 ;
     public final void rule__Export__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3552:1: ( rule__Export__Group__1__Impl rule__Export__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3553:2: rule__Export__Group__1__Impl rule__Export__Group__2
+            // InternalExport.g:3552:1: ( rule__Export__Group__1__Impl rule__Export__Group__2 )
+            // InternalExport.g:3553:2: rule__Export__Group__1__Impl rule__Export__Group__2
             {
-            pushFollow(FOLLOW_rule__Export__Group__1__Impl_in_rule__Export__Group__17435);
+            pushFollow(FOLLOW_26);
             rule__Export__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Export__Group__2_in_rule__Export__Group__17438);
+            pushFollow(FOLLOW_2);
             rule__Export__Group__2();
 
             state._fsp--;
@@ -10979,22 +10979,22 @@ public final void rule__Export__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3560:1: rule__Export__Group__1__Impl : ( ( rule__Export__Group_1__0 )? ) ;
+    // InternalExport.g:3560:1: rule__Export__Group__1__Impl : ( ( rule__Export__Group_1__0 )? ) ;
     public final void rule__Export__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3564:1: ( ( ( rule__Export__Group_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3565:1: ( ( rule__Export__Group_1__0 )? )
+            // InternalExport.g:3564:1: ( ( ( rule__Export__Group_1__0 )? ) )
+            // InternalExport.g:3565:1: ( ( rule__Export__Group_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3565:1: ( ( rule__Export__Group_1__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3566:1: ( rule__Export__Group_1__0 )?
+            // InternalExport.g:3565:1: ( ( rule__Export__Group_1__0 )? )
+            // InternalExport.g:3566:1: ( rule__Export__Group_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3567:1: ( rule__Export__Group_1__0 )?
+            // InternalExport.g:3567:1: ( rule__Export__Group_1__0 )?
             int alt35=2;
             int LA35_0 = input.LA(1);
 
@@ -11003,9 +11003,9 @@ public final void rule__Export__Group__1__Impl() throws RecognitionException {
             }
             switch (alt35) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3567:2: rule__Export__Group_1__0
+                    // InternalExport.g:3567:2: rule__Export__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__Export__Group_1__0_in_rule__Export__Group__1__Impl7465);
+                    pushFollow(FOLLOW_2);
                     rule__Export__Group_1__0();
 
                     state._fsp--;
@@ -11041,21 +11041,21 @@ public final void rule__Export__Group__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3577:1: rule__Export__Group__2 : rule__Export__Group__2__Impl rule__Export__Group__3 ;
+    // InternalExport.g:3577:1: rule__Export__Group__2 : rule__Export__Group__2__Impl rule__Export__Group__3 ;
     public final void rule__Export__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3581:1: ( rule__Export__Group__2__Impl rule__Export__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3582:2: rule__Export__Group__2__Impl rule__Export__Group__3
+            // InternalExport.g:3581:1: ( rule__Export__Group__2__Impl rule__Export__Group__3 )
+            // InternalExport.g:3582:2: rule__Export__Group__2__Impl rule__Export__Group__3
             {
-            pushFollow(FOLLOW_rule__Export__Group__2__Impl_in_rule__Export__Group__27496);
+            pushFollow(FOLLOW_27);
             rule__Export__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Export__Group__3_in_rule__Export__Group__27499);
+            pushFollow(FOLLOW_2);
             rule__Export__Group__3();
 
             state._fsp--;
@@ -11079,25 +11079,25 @@ public final void rule__Export__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3589:1: rule__Export__Group__2__Impl : ( ( rule__Export__TypeAssignment_2 ) ) ;
+    // InternalExport.g:3589:1: rule__Export__Group__2__Impl : ( ( rule__Export__TypeAssignment_2 ) ) ;
     public final void rule__Export__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3593:1: ( ( ( rule__Export__TypeAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3594:1: ( ( rule__Export__TypeAssignment_2 ) )
+            // InternalExport.g:3593:1: ( ( ( rule__Export__TypeAssignment_2 ) ) )
+            // InternalExport.g:3594:1: ( ( rule__Export__TypeAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3594:1: ( ( rule__Export__TypeAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3595:1: ( rule__Export__TypeAssignment_2 )
+            // InternalExport.g:3594:1: ( ( rule__Export__TypeAssignment_2 ) )
+            // InternalExport.g:3595:1: ( rule__Export__TypeAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getTypeAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3596:1: ( rule__Export__TypeAssignment_2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3596:2: rule__Export__TypeAssignment_2
+            // InternalExport.g:3596:1: ( rule__Export__TypeAssignment_2 )
+            // InternalExport.g:3596:2: rule__Export__TypeAssignment_2
             {
-            pushFollow(FOLLOW_rule__Export__TypeAssignment_2_in_rule__Export__Group__2__Impl7526);
+            pushFollow(FOLLOW_2);
             rule__Export__TypeAssignment_2();
 
             state._fsp--;
@@ -11130,21 +11130,21 @@ public final void rule__Export__Group__2__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3606:1: rule__Export__Group__3 : rule__Export__Group__3__Impl rule__Export__Group__4 ;
+    // InternalExport.g:3606:1: rule__Export__Group__3 : rule__Export__Group__3__Impl rule__Export__Group__4 ;
     public final void rule__Export__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3610:1: ( rule__Export__Group__3__Impl rule__Export__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3611:2: rule__Export__Group__3__Impl rule__Export__Group__4
+            // InternalExport.g:3610:1: ( rule__Export__Group__3__Impl rule__Export__Group__4 )
+            // InternalExport.g:3611:2: rule__Export__Group__3__Impl rule__Export__Group__4
             {
-            pushFollow(FOLLOW_rule__Export__Group__3__Impl_in_rule__Export__Group__37556);
+            pushFollow(FOLLOW_27);
             rule__Export__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Export__Group__4_in_rule__Export__Group__37559);
+            pushFollow(FOLLOW_2);
             rule__Export__Group__4();
 
             state._fsp--;
@@ -11168,22 +11168,22 @@ public final void rule__Export__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3618:1: rule__Export__Group__3__Impl : ( ( rule__Export__Group_3__0 )? ) ;
+    // InternalExport.g:3618:1: rule__Export__Group__3__Impl : ( ( rule__Export__Group_3__0 )? ) ;
     public final void rule__Export__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3622:1: ( ( ( rule__Export__Group_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3623:1: ( ( rule__Export__Group_3__0 )? )
+            // InternalExport.g:3622:1: ( ( ( rule__Export__Group_3__0 )? ) )
+            // InternalExport.g:3623:1: ( ( rule__Export__Group_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3623:1: ( ( rule__Export__Group_3__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3624:1: ( rule__Export__Group_3__0 )?
+            // InternalExport.g:3623:1: ( ( rule__Export__Group_3__0 )? )
+            // InternalExport.g:3624:1: ( rule__Export__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getGroup_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3625:1: ( rule__Export__Group_3__0 )?
+            // InternalExport.g:3625:1: ( rule__Export__Group_3__0 )?
             int alt36=2;
             int LA36_0 = input.LA(1);
 
@@ -11192,9 +11192,9 @@ public final void rule__Export__Group__3__Impl() throws RecognitionException {
             }
             switch (alt36) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3625:2: rule__Export__Group_3__0
+                    // InternalExport.g:3625:2: rule__Export__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__Export__Group_3__0_in_rule__Export__Group__3__Impl7586);
+                    pushFollow(FOLLOW_2);
                     rule__Export__Group_3__0();
 
                     state._fsp--;
@@ -11230,21 +11230,21 @@ public final void rule__Export__Group__3__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3635:1: rule__Export__Group__4 : rule__Export__Group__4__Impl rule__Export__Group__5 ;
+    // InternalExport.g:3635:1: rule__Export__Group__4 : rule__Export__Group__4__Impl rule__Export__Group__5 ;
     public final void rule__Export__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3639:1: ( rule__Export__Group__4__Impl rule__Export__Group__5 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3640:2: rule__Export__Group__4__Impl rule__Export__Group__5
+            // InternalExport.g:3639:1: ( rule__Export__Group__4__Impl rule__Export__Group__5 )
+            // InternalExport.g:3640:2: rule__Export__Group__4__Impl rule__Export__Group__5
             {
-            pushFollow(FOLLOW_rule__Export__Group__4__Impl_in_rule__Export__Group__47617);
+            pushFollow(FOLLOW_27);
             rule__Export__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Export__Group__5_in_rule__Export__Group__47620);
+            pushFollow(FOLLOW_2);
             rule__Export__Group__5();
 
             state._fsp--;
@@ -11268,22 +11268,22 @@ public final void rule__Export__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3647:1: rule__Export__Group__4__Impl : ( ( rule__Export__Group_4__0 )? ) ;
+    // InternalExport.g:3647:1: rule__Export__Group__4__Impl : ( ( rule__Export__Group_4__0 )? ) ;
     public final void rule__Export__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3651:1: ( ( ( rule__Export__Group_4__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3652:1: ( ( rule__Export__Group_4__0 )? )
+            // InternalExport.g:3651:1: ( ( ( rule__Export__Group_4__0 )? ) )
+            // InternalExport.g:3652:1: ( ( rule__Export__Group_4__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3652:1: ( ( rule__Export__Group_4__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3653:1: ( rule__Export__Group_4__0 )?
+            // InternalExport.g:3652:1: ( ( rule__Export__Group_4__0 )? )
+            // InternalExport.g:3653:1: ( rule__Export__Group_4__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getGroup_4()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3654:1: ( rule__Export__Group_4__0 )?
+            // InternalExport.g:3654:1: ( rule__Export__Group_4__0 )?
             int alt37=2;
             int LA37_0 = input.LA(1);
 
@@ -11292,9 +11292,9 @@ public final void rule__Export__Group__4__Impl() throws RecognitionException {
             }
             switch (alt37) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3654:2: rule__Export__Group_4__0
+                    // InternalExport.g:3654:2: rule__Export__Group_4__0
                     {
-                    pushFollow(FOLLOW_rule__Export__Group_4__0_in_rule__Export__Group__4__Impl7647);
+                    pushFollow(FOLLOW_2);
                     rule__Export__Group_4__0();
 
                     state._fsp--;
@@ -11330,21 +11330,21 @@ public final void rule__Export__Group__4__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group__5"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3664:1: rule__Export__Group__5 : rule__Export__Group__5__Impl rule__Export__Group__6 ;
+    // InternalExport.g:3664:1: rule__Export__Group__5 : rule__Export__Group__5__Impl rule__Export__Group__6 ;
     public final void rule__Export__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3668:1: ( rule__Export__Group__5__Impl rule__Export__Group__6 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3669:2: rule__Export__Group__5__Impl rule__Export__Group__6
+            // InternalExport.g:3668:1: ( rule__Export__Group__5__Impl rule__Export__Group__6 )
+            // InternalExport.g:3669:2: rule__Export__Group__5__Impl rule__Export__Group__6
             {
-            pushFollow(FOLLOW_rule__Export__Group__5__Impl_in_rule__Export__Group__57678);
+            pushFollow(FOLLOW_28);
             rule__Export__Group__5__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Export__Group__6_in_rule__Export__Group__57681);
+            pushFollow(FOLLOW_2);
             rule__Export__Group__6();
 
             state._fsp--;
@@ -11368,22 +11368,22 @@ public final void rule__Export__Group__5() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3676:1: rule__Export__Group__5__Impl : ( '{' ) ;
+    // InternalExport.g:3676:1: rule__Export__Group__5__Impl : ( '{' ) ;
     public final void rule__Export__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3680:1: ( ( '{' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3681:1: ( '{' )
+            // InternalExport.g:3680:1: ( ( '{' ) )
+            // InternalExport.g:3681:1: ( '{' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3681:1: ( '{' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3682:1: '{'
+            // InternalExport.g:3681:1: ( '{' )
+            // InternalExport.g:3682:1: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getLeftCurlyBracketKeyword_5()); 
             }
-            match(input,39,FOLLOW_39_in_rule__Export__Group__5__Impl7709); if (state.failed) return ;
+            match(input,39,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExportAccess().getLeftCurlyBracketKeyword_5()); 
             }
@@ -11409,21 +11409,21 @@ public final void rule__Export__Group__5__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group__6"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3695:1: rule__Export__Group__6 : rule__Export__Group__6__Impl rule__Export__Group__7 ;
+    // InternalExport.g:3695:1: rule__Export__Group__6 : rule__Export__Group__6__Impl rule__Export__Group__7 ;
     public final void rule__Export__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3699:1: ( rule__Export__Group__6__Impl rule__Export__Group__7 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3700:2: rule__Export__Group__6__Impl rule__Export__Group__7
+            // InternalExport.g:3699:1: ( rule__Export__Group__6__Impl rule__Export__Group__7 )
+            // InternalExport.g:3700:2: rule__Export__Group__6__Impl rule__Export__Group__7
             {
-            pushFollow(FOLLOW_rule__Export__Group__6__Impl_in_rule__Export__Group__67740);
+            pushFollow(FOLLOW_28);
             rule__Export__Group__6__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Export__Group__7_in_rule__Export__Group__67743);
+            pushFollow(FOLLOW_2);
             rule__Export__Group__7();
 
             state._fsp--;
@@ -11447,22 +11447,22 @@ public final void rule__Export__Group__6() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group__6__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3707:1: rule__Export__Group__6__Impl : ( ( rule__Export__Group_6__0 )? ) ;
+    // InternalExport.g:3707:1: rule__Export__Group__6__Impl : ( ( rule__Export__Group_6__0 )? ) ;
     public final void rule__Export__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3711:1: ( ( ( rule__Export__Group_6__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3712:1: ( ( rule__Export__Group_6__0 )? )
+            // InternalExport.g:3711:1: ( ( ( rule__Export__Group_6__0 )? ) )
+            // InternalExport.g:3712:1: ( ( rule__Export__Group_6__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3712:1: ( ( rule__Export__Group_6__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3713:1: ( rule__Export__Group_6__0 )?
+            // InternalExport.g:3712:1: ( ( rule__Export__Group_6__0 )? )
+            // InternalExport.g:3713:1: ( rule__Export__Group_6__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getGroup_6()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3714:1: ( rule__Export__Group_6__0 )?
+            // InternalExport.g:3714:1: ( rule__Export__Group_6__0 )?
             int alt38=2;
             int LA38_0 = input.LA(1);
 
@@ -11471,9 +11471,9 @@ public final void rule__Export__Group__6__Impl() throws RecognitionException {
             }
             switch (alt38) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3714:2: rule__Export__Group_6__0
+                    // InternalExport.g:3714:2: rule__Export__Group_6__0
                     {
-                    pushFollow(FOLLOW_rule__Export__Group_6__0_in_rule__Export__Group__6__Impl7770);
+                    pushFollow(FOLLOW_2);
                     rule__Export__Group_6__0();
 
                     state._fsp--;
@@ -11509,21 +11509,21 @@ public final void rule__Export__Group__6__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group__7"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3724:1: rule__Export__Group__7 : rule__Export__Group__7__Impl rule__Export__Group__8 ;
+    // InternalExport.g:3724:1: rule__Export__Group__7 : rule__Export__Group__7__Impl rule__Export__Group__8 ;
     public final void rule__Export__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3728:1: ( rule__Export__Group__7__Impl rule__Export__Group__8 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3729:2: rule__Export__Group__7__Impl rule__Export__Group__8
+            // InternalExport.g:3728:1: ( rule__Export__Group__7__Impl rule__Export__Group__8 )
+            // InternalExport.g:3729:2: rule__Export__Group__7__Impl rule__Export__Group__8
             {
-            pushFollow(FOLLOW_rule__Export__Group__7__Impl_in_rule__Export__Group__77801);
+            pushFollow(FOLLOW_28);
             rule__Export__Group__7__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Export__Group__8_in_rule__Export__Group__77804);
+            pushFollow(FOLLOW_2);
             rule__Export__Group__8();
 
             state._fsp--;
@@ -11547,22 +11547,22 @@ public final void rule__Export__Group__7() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group__7__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3736:1: rule__Export__Group__7__Impl : ( ( rule__Export__Group_7__0 )? ) ;
+    // InternalExport.g:3736:1: rule__Export__Group__7__Impl : ( ( rule__Export__Group_7__0 )? ) ;
     public final void rule__Export__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3740:1: ( ( ( rule__Export__Group_7__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3741:1: ( ( rule__Export__Group_7__0 )? )
+            // InternalExport.g:3740:1: ( ( ( rule__Export__Group_7__0 )? ) )
+            // InternalExport.g:3741:1: ( ( rule__Export__Group_7__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3741:1: ( ( rule__Export__Group_7__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3742:1: ( rule__Export__Group_7__0 )?
+            // InternalExport.g:3741:1: ( ( rule__Export__Group_7__0 )? )
+            // InternalExport.g:3742:1: ( rule__Export__Group_7__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getGroup_7()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3743:1: ( rule__Export__Group_7__0 )?
+            // InternalExport.g:3743:1: ( rule__Export__Group_7__0 )?
             int alt39=2;
             int LA39_0 = input.LA(1);
 
@@ -11571,9 +11571,9 @@ public final void rule__Export__Group__7__Impl() throws RecognitionException {
             }
             switch (alt39) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3743:2: rule__Export__Group_7__0
+                    // InternalExport.g:3743:2: rule__Export__Group_7__0
                     {
-                    pushFollow(FOLLOW_rule__Export__Group_7__0_in_rule__Export__Group__7__Impl7831);
+                    pushFollow(FOLLOW_2);
                     rule__Export__Group_7__0();
 
                     state._fsp--;
@@ -11609,21 +11609,21 @@ public final void rule__Export__Group__7__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group__8"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3753:1: rule__Export__Group__8 : rule__Export__Group__8__Impl rule__Export__Group__9 ;
+    // InternalExport.g:3753:1: rule__Export__Group__8 : rule__Export__Group__8__Impl rule__Export__Group__9 ;
     public final void rule__Export__Group__8() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3757:1: ( rule__Export__Group__8__Impl rule__Export__Group__9 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3758:2: rule__Export__Group__8__Impl rule__Export__Group__9
+            // InternalExport.g:3757:1: ( rule__Export__Group__8__Impl rule__Export__Group__9 )
+            // InternalExport.g:3758:2: rule__Export__Group__8__Impl rule__Export__Group__9
             {
-            pushFollow(FOLLOW_rule__Export__Group__8__Impl_in_rule__Export__Group__87862);
+            pushFollow(FOLLOW_28);
             rule__Export__Group__8__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Export__Group__9_in_rule__Export__Group__87865);
+            pushFollow(FOLLOW_2);
             rule__Export__Group__9();
 
             state._fsp--;
@@ -11647,22 +11647,22 @@ public final void rule__Export__Group__8() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group__8__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3765:1: rule__Export__Group__8__Impl : ( ( rule__Export__Alternatives_8 )* ) ;
+    // InternalExport.g:3765:1: rule__Export__Group__8__Impl : ( ( rule__Export__Alternatives_8 )* ) ;
     public final void rule__Export__Group__8__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3769:1: ( ( ( rule__Export__Alternatives_8 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3770:1: ( ( rule__Export__Alternatives_8 )* )
+            // InternalExport.g:3769:1: ( ( ( rule__Export__Alternatives_8 )* ) )
+            // InternalExport.g:3770:1: ( ( rule__Export__Alternatives_8 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3770:1: ( ( rule__Export__Alternatives_8 )* )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3771:1: ( rule__Export__Alternatives_8 )*
+            // InternalExport.g:3770:1: ( ( rule__Export__Alternatives_8 )* )
+            // InternalExport.g:3771:1: ( rule__Export__Alternatives_8 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getAlternatives_8()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3772:1: ( rule__Export__Alternatives_8 )*
+            // InternalExport.g:3772:1: ( rule__Export__Alternatives_8 )*
             loop40:
             do {
                 int alt40=2;
@@ -11675,9 +11675,9 @@ public final void rule__Export__Group__8__Impl() throws RecognitionException {
 
                 switch (alt40) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3772:2: rule__Export__Alternatives_8
+            	    // InternalExport.g:3772:2: rule__Export__Alternatives_8
             	    {
-            	    pushFollow(FOLLOW_rule__Export__Alternatives_8_in_rule__Export__Group__8__Impl7892);
+            	    pushFollow(FOLLOW_29);
             	    rule__Export__Alternatives_8();
 
             	    state._fsp--;
@@ -11716,16 +11716,16 @@ public final void rule__Export__Group__8__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group__9"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3782:1: rule__Export__Group__9 : rule__Export__Group__9__Impl ;
+    // InternalExport.g:3782:1: rule__Export__Group__9 : rule__Export__Group__9__Impl ;
     public final void rule__Export__Group__9() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3786:1: ( rule__Export__Group__9__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3787:2: rule__Export__Group__9__Impl
+            // InternalExport.g:3786:1: ( rule__Export__Group__9__Impl )
+            // InternalExport.g:3787:2: rule__Export__Group__9__Impl
             {
-            pushFollow(FOLLOW_rule__Export__Group__9__Impl_in_rule__Export__Group__97923);
+            pushFollow(FOLLOW_2);
             rule__Export__Group__9__Impl();
 
             state._fsp--;
@@ -11749,22 +11749,22 @@ public final void rule__Export__Group__9() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group__9__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3793:1: rule__Export__Group__9__Impl : ( '}' ) ;
+    // InternalExport.g:3793:1: rule__Export__Group__9__Impl : ( '}' ) ;
     public final void rule__Export__Group__9__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3797:1: ( ( '}' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3798:1: ( '}' )
+            // InternalExport.g:3797:1: ( ( '}' ) )
+            // InternalExport.g:3798:1: ( '}' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3798:1: ( '}' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3799:1: '}'
+            // InternalExport.g:3798:1: ( '}' )
+            // InternalExport.g:3799:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getRightCurlyBracketKeyword_9()); 
             }
-            match(input,40,FOLLOW_40_in_rule__Export__Group__9__Impl7951); if (state.failed) return ;
+            match(input,40,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExportAccess().getRightCurlyBracketKeyword_9()); 
             }
@@ -11790,21 +11790,21 @@ public final void rule__Export__Group__9__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3832:1: rule__Export__Group_1__0 : rule__Export__Group_1__0__Impl rule__Export__Group_1__1 ;
+    // InternalExport.g:3832:1: rule__Export__Group_1__0 : rule__Export__Group_1__0__Impl rule__Export__Group_1__1 ;
     public final void rule__Export__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3836:1: ( rule__Export__Group_1__0__Impl rule__Export__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3837:2: rule__Export__Group_1__0__Impl rule__Export__Group_1__1
+            // InternalExport.g:3836:1: ( rule__Export__Group_1__0__Impl rule__Export__Group_1__1 )
+            // InternalExport.g:3837:2: rule__Export__Group_1__0__Impl rule__Export__Group_1__1
             {
-            pushFollow(FOLLOW_rule__Export__Group_1__0__Impl_in_rule__Export__Group_1__08002);
+            pushFollow(FOLLOW_30);
             rule__Export__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Export__Group_1__1_in_rule__Export__Group_1__08005);
+            pushFollow(FOLLOW_2);
             rule__Export__Group_1__1();
 
             state._fsp--;
@@ -11828,25 +11828,25 @@ public final void rule__Export__Group_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3844:1: rule__Export__Group_1__0__Impl : ( ( rule__Export__LookupAssignment_1_0 ) ) ;
+    // InternalExport.g:3844:1: rule__Export__Group_1__0__Impl : ( ( rule__Export__LookupAssignment_1_0 ) ) ;
     public final void rule__Export__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3848:1: ( ( ( rule__Export__LookupAssignment_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3849:1: ( ( rule__Export__LookupAssignment_1_0 ) )
+            // InternalExport.g:3848:1: ( ( ( rule__Export__LookupAssignment_1_0 ) ) )
+            // InternalExport.g:3849:1: ( ( rule__Export__LookupAssignment_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3849:1: ( ( rule__Export__LookupAssignment_1_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3850:1: ( rule__Export__LookupAssignment_1_0 )
+            // InternalExport.g:3849:1: ( ( rule__Export__LookupAssignment_1_0 ) )
+            // InternalExport.g:3850:1: ( rule__Export__LookupAssignment_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getLookupAssignment_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3851:1: ( rule__Export__LookupAssignment_1_0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3851:2: rule__Export__LookupAssignment_1_0
+            // InternalExport.g:3851:1: ( rule__Export__LookupAssignment_1_0 )
+            // InternalExport.g:3851:2: rule__Export__LookupAssignment_1_0
             {
-            pushFollow(FOLLOW_rule__Export__LookupAssignment_1_0_in_rule__Export__Group_1__0__Impl8032);
+            pushFollow(FOLLOW_2);
             rule__Export__LookupAssignment_1_0();
 
             state._fsp--;
@@ -11879,16 +11879,16 @@ public final void rule__Export__Group_1__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3861:1: rule__Export__Group_1__1 : rule__Export__Group_1__1__Impl ;
+    // InternalExport.g:3861:1: rule__Export__Group_1__1 : rule__Export__Group_1__1__Impl ;
     public final void rule__Export__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3865:1: ( rule__Export__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3866:2: rule__Export__Group_1__1__Impl
+            // InternalExport.g:3865:1: ( rule__Export__Group_1__1__Impl )
+            // InternalExport.g:3866:2: rule__Export__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__Export__Group_1__1__Impl_in_rule__Export__Group_1__18062);
+            pushFollow(FOLLOW_2);
             rule__Export__Group_1__1__Impl();
 
             state._fsp--;
@@ -11912,22 +11912,22 @@ public final void rule__Export__Group_1__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3872:1: rule__Export__Group_1__1__Impl : ( ( rule__Export__Group_1_1__0 )? ) ;
+    // InternalExport.g:3872:1: rule__Export__Group_1__1__Impl : ( ( rule__Export__Group_1_1__0 )? ) ;
     public final void rule__Export__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3876:1: ( ( ( rule__Export__Group_1_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3877:1: ( ( rule__Export__Group_1_1__0 )? )
+            // InternalExport.g:3876:1: ( ( ( rule__Export__Group_1_1__0 )? ) )
+            // InternalExport.g:3877:1: ( ( rule__Export__Group_1_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3877:1: ( ( rule__Export__Group_1_1__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3878:1: ( rule__Export__Group_1_1__0 )?
+            // InternalExport.g:3877:1: ( ( rule__Export__Group_1_1__0 )? )
+            // InternalExport.g:3878:1: ( rule__Export__Group_1_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getGroup_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3879:1: ( rule__Export__Group_1_1__0 )?
+            // InternalExport.g:3879:1: ( rule__Export__Group_1_1__0 )?
             int alt41=2;
             int LA41_0 = input.LA(1);
 
@@ -11936,9 +11936,9 @@ public final void rule__Export__Group_1__1__Impl() throws RecognitionException {
             }
             switch (alt41) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3879:2: rule__Export__Group_1_1__0
+                    // InternalExport.g:3879:2: rule__Export__Group_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__Export__Group_1_1__0_in_rule__Export__Group_1__1__Impl8089);
+                    pushFollow(FOLLOW_2);
                     rule__Export__Group_1_1__0();
 
                     state._fsp--;
@@ -11974,21 +11974,21 @@ public final void rule__Export__Group_1__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_1_1__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3893:1: rule__Export__Group_1_1__0 : rule__Export__Group_1_1__0__Impl rule__Export__Group_1_1__1 ;
+    // InternalExport.g:3893:1: rule__Export__Group_1_1__0 : rule__Export__Group_1_1__0__Impl rule__Export__Group_1_1__1 ;
     public final void rule__Export__Group_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3897:1: ( rule__Export__Group_1_1__0__Impl rule__Export__Group_1_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3898:2: rule__Export__Group_1_1__0__Impl rule__Export__Group_1_1__1
+            // InternalExport.g:3897:1: ( rule__Export__Group_1_1__0__Impl rule__Export__Group_1_1__1 )
+            // InternalExport.g:3898:2: rule__Export__Group_1_1__0__Impl rule__Export__Group_1_1__1
             {
-            pushFollow(FOLLOW_rule__Export__Group_1_1__0__Impl_in_rule__Export__Group_1_1__08124);
+            pushFollow(FOLLOW_18);
             rule__Export__Group_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Export__Group_1_1__1_in_rule__Export__Group_1_1__08127);
+            pushFollow(FOLLOW_2);
             rule__Export__Group_1_1__1();
 
             state._fsp--;
@@ -12012,22 +12012,22 @@ public final void rule__Export__Group_1_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3905:1: rule__Export__Group_1_1__0__Impl : ( '[' ) ;
+    // InternalExport.g:3905:1: rule__Export__Group_1_1__0__Impl : ( '[' ) ;
     public final void rule__Export__Group_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3909:1: ( ( '[' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3910:1: ( '[' )
+            // InternalExport.g:3909:1: ( ( '[' ) )
+            // InternalExport.g:3910:1: ( '[' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3910:1: ( '[' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3911:1: '['
+            // InternalExport.g:3910:1: ( '[' )
+            // InternalExport.g:3911:1: '['
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getLeftSquareBracketKeyword_1_1_0()); 
             }
-            match(input,45,FOLLOW_45_in_rule__Export__Group_1_1__0__Impl8155); if (state.failed) return ;
+            match(input,45,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExportAccess().getLeftSquareBracketKeyword_1_1_0()); 
             }
@@ -12053,21 +12053,21 @@ public final void rule__Export__Group_1_1__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__Export__Group_1_1__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3924:1: rule__Export__Group_1_1__1 : rule__Export__Group_1_1__1__Impl rule__Export__Group_1_1__2 ;
+    // InternalExport.g:3924:1: rule__Export__Group_1_1__1 : rule__Export__Group_1_1__1__Impl rule__Export__Group_1_1__2 ;
     public final void rule__Export__Group_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3928:1: ( rule__Export__Group_1_1__1__Impl rule__Export__Group_1_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3929:2: rule__Export__Group_1_1__1__Impl rule__Export__Group_1_1__2
+            // InternalExport.g:3928:1: ( rule__Export__Group_1_1__1__Impl rule__Export__Group_1_1__2 )
+            // InternalExport.g:3929:2: rule__Export__Group_1_1__1__Impl rule__Export__Group_1_1__2
             {
-            pushFollow(FOLLOW_rule__Export__Group_1_1__1__Impl_in_rule__Export__Group_1_1__18186);
+            pushFollow(FOLLOW_19);
             rule__Export__Group_1_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Export__Group_1_1__2_in_rule__Export__Group_1_1__18189);
+            pushFollow(FOLLOW_2);
             rule__Export__Group_1_1__2();
 
             state._fsp--;
@@ -12091,25 +12091,25 @@ public final void rule__Export__Group_1_1__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3936:1: rule__Export__Group_1_1__1__Impl : ( ( rule__Export__LookupPredicateAssignment_1_1_1 ) ) ;
+    // InternalExport.g:3936:1: rule__Export__Group_1_1__1__Impl : ( ( rule__Export__LookupPredicateAssignment_1_1_1 ) ) ;
     public final void rule__Export__Group_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3940:1: ( ( ( rule__Export__LookupPredicateAssignment_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3941:1: ( ( rule__Export__LookupPredicateAssignment_1_1_1 ) )
+            // InternalExport.g:3940:1: ( ( ( rule__Export__LookupPredicateAssignment_1_1_1 ) ) )
+            // InternalExport.g:3941:1: ( ( rule__Export__LookupPredicateAssignment_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3941:1: ( ( rule__Export__LookupPredicateAssignment_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3942:1: ( rule__Export__LookupPredicateAssignment_1_1_1 )
+            // InternalExport.g:3941:1: ( ( rule__Export__LookupPredicateAssignment_1_1_1 ) )
+            // InternalExport.g:3942:1: ( rule__Export__LookupPredicateAssignment_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getLookupPredicateAssignment_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3943:1: ( rule__Export__LookupPredicateAssignment_1_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3943:2: rule__Export__LookupPredicateAssignment_1_1_1
+            // InternalExport.g:3943:1: ( rule__Export__LookupPredicateAssignment_1_1_1 )
+            // InternalExport.g:3943:2: rule__Export__LookupPredicateAssignment_1_1_1
             {
-            pushFollow(FOLLOW_rule__Export__LookupPredicateAssignment_1_1_1_in_rule__Export__Group_1_1__1__Impl8216);
+            pushFollow(FOLLOW_2);
             rule__Export__LookupPredicateAssignment_1_1_1();
 
             state._fsp--;
@@ -12142,16 +12142,16 @@ public final void rule__Export__Group_1_1__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__Export__Group_1_1__2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3953:1: rule__Export__Group_1_1__2 : rule__Export__Group_1_1__2__Impl ;
+    // InternalExport.g:3953:1: rule__Export__Group_1_1__2 : rule__Export__Group_1_1__2__Impl ;
     public final void rule__Export__Group_1_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3957:1: ( rule__Export__Group_1_1__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3958:2: rule__Export__Group_1_1__2__Impl
+            // InternalExport.g:3957:1: ( rule__Export__Group_1_1__2__Impl )
+            // InternalExport.g:3958:2: rule__Export__Group_1_1__2__Impl
             {
-            pushFollow(FOLLOW_rule__Export__Group_1_1__2__Impl_in_rule__Export__Group_1_1__28246);
+            pushFollow(FOLLOW_2);
             rule__Export__Group_1_1__2__Impl();
 
             state._fsp--;
@@ -12175,22 +12175,22 @@ public final void rule__Export__Group_1_1__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_1_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3964:1: rule__Export__Group_1_1__2__Impl : ( ']' ) ;
+    // InternalExport.g:3964:1: rule__Export__Group_1_1__2__Impl : ( ']' ) ;
     public final void rule__Export__Group_1_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3968:1: ( ( ']' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3969:1: ( ']' )
+            // InternalExport.g:3968:1: ( ( ']' ) )
+            // InternalExport.g:3969:1: ( ']' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3969:1: ( ']' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3970:1: ']'
+            // InternalExport.g:3969:1: ( ']' )
+            // InternalExport.g:3970:1: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getRightSquareBracketKeyword_1_1_2()); 
             }
-            match(input,46,FOLLOW_46_in_rule__Export__Group_1_1__2__Impl8274); if (state.failed) return ;
+            match(input,46,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExportAccess().getRightSquareBracketKeyword_1_1_2()); 
             }
@@ -12216,21 +12216,21 @@ public final void rule__Export__Group_1_1__2__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__Export__Group_3__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3989:1: rule__Export__Group_3__0 : rule__Export__Group_3__0__Impl rule__Export__Group_3__1 ;
+    // InternalExport.g:3989:1: rule__Export__Group_3__0 : rule__Export__Group_3__0__Impl rule__Export__Group_3__1 ;
     public final void rule__Export__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3993:1: ( rule__Export__Group_3__0__Impl rule__Export__Group_3__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:3994:2: rule__Export__Group_3__0__Impl rule__Export__Group_3__1
+            // InternalExport.g:3993:1: ( rule__Export__Group_3__0__Impl rule__Export__Group_3__1 )
+            // InternalExport.g:3994:2: rule__Export__Group_3__0__Impl rule__Export__Group_3__1
             {
-            pushFollow(FOLLOW_rule__Export__Group_3__0__Impl_in_rule__Export__Group_3__08311);
+            pushFollow(FOLLOW_31);
             rule__Export__Group_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Export__Group_3__1_in_rule__Export__Group_3__08314);
+            pushFollow(FOLLOW_2);
             rule__Export__Group_3__1();
 
             state._fsp--;
@@ -12254,22 +12254,22 @@ public final void rule__Export__Group_3__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_3__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4001:1: rule__Export__Group_3__0__Impl : ( 'as' ) ;
+    // InternalExport.g:4001:1: rule__Export__Group_3__0__Impl : ( 'as' ) ;
     public final void rule__Export__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4005:1: ( ( 'as' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4006:1: ( 'as' )
+            // InternalExport.g:4005:1: ( ( 'as' ) )
+            // InternalExport.g:4006:1: ( 'as' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4006:1: ( 'as' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4007:1: 'as'
+            // InternalExport.g:4006:1: ( 'as' )
+            // InternalExport.g:4007:1: 'as'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getAsKeyword_3_0()); 
             }
-            match(input,42,FOLLOW_42_in_rule__Export__Group_3__0__Impl8342); if (state.failed) return ;
+            match(input,42,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExportAccess().getAsKeyword_3_0()); 
             }
@@ -12295,21 +12295,21 @@ public final void rule__Export__Group_3__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_3__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4020:1: rule__Export__Group_3__1 : rule__Export__Group_3__1__Impl rule__Export__Group_3__2 ;
+    // InternalExport.g:4020:1: rule__Export__Group_3__1 : rule__Export__Group_3__1__Impl rule__Export__Group_3__2 ;
     public final void rule__Export__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4024:1: ( rule__Export__Group_3__1__Impl rule__Export__Group_3__2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4025:2: rule__Export__Group_3__1__Impl rule__Export__Group_3__2
+            // InternalExport.g:4024:1: ( rule__Export__Group_3__1__Impl rule__Export__Group_3__2 )
+            // InternalExport.g:4025:2: rule__Export__Group_3__1__Impl rule__Export__Group_3__2
             {
-            pushFollow(FOLLOW_rule__Export__Group_3__1__Impl_in_rule__Export__Group_3__18373);
+            pushFollow(FOLLOW_31);
             rule__Export__Group_3__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Export__Group_3__2_in_rule__Export__Group_3__18376);
+            pushFollow(FOLLOW_2);
             rule__Export__Group_3__2();
 
             state._fsp--;
@@ -12333,22 +12333,22 @@ public final void rule__Export__Group_3__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_3__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4032:1: rule__Export__Group_3__1__Impl : ( ( rule__Export__QualifiedNameAssignment_3_1 )? ) ;
+    // InternalExport.g:4032:1: rule__Export__Group_3__1__Impl : ( ( rule__Export__QualifiedNameAssignment_3_1 )? ) ;
     public final void rule__Export__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4036:1: ( ( ( rule__Export__QualifiedNameAssignment_3_1 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4037:1: ( ( rule__Export__QualifiedNameAssignment_3_1 )? )
+            // InternalExport.g:4036:1: ( ( ( rule__Export__QualifiedNameAssignment_3_1 )? ) )
+            // InternalExport.g:4037:1: ( ( rule__Export__QualifiedNameAssignment_3_1 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4037:1: ( ( rule__Export__QualifiedNameAssignment_3_1 )? )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4038:1: ( rule__Export__QualifiedNameAssignment_3_1 )?
+            // InternalExport.g:4037:1: ( ( rule__Export__QualifiedNameAssignment_3_1 )? )
+            // InternalExport.g:4038:1: ( rule__Export__QualifiedNameAssignment_3_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getQualifiedNameAssignment_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4039:1: ( rule__Export__QualifiedNameAssignment_3_1 )?
+            // InternalExport.g:4039:1: ( rule__Export__QualifiedNameAssignment_3_1 )?
             int alt42=2;
             int LA42_0 = input.LA(1);
 
@@ -12357,9 +12357,9 @@ public final void rule__Export__Group_3__1__Impl() throws RecognitionException {
             }
             switch (alt42) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4039:2: rule__Export__QualifiedNameAssignment_3_1
+                    // InternalExport.g:4039:2: rule__Export__QualifiedNameAssignment_3_1
                     {
-                    pushFollow(FOLLOW_rule__Export__QualifiedNameAssignment_3_1_in_rule__Export__Group_3__1__Impl8403);
+                    pushFollow(FOLLOW_2);
                     rule__Export__QualifiedNameAssignment_3_1();
 
                     state._fsp--;
@@ -12395,16 +12395,16 @@ public final void rule__Export__Group_3__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_3__2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4049:1: rule__Export__Group_3__2 : rule__Export__Group_3__2__Impl ;
+    // InternalExport.g:4049:1: rule__Export__Group_3__2 : rule__Export__Group_3__2__Impl ;
     public final void rule__Export__Group_3__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4053:1: ( rule__Export__Group_3__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4054:2: rule__Export__Group_3__2__Impl
+            // InternalExport.g:4053:1: ( rule__Export__Group_3__2__Impl )
+            // InternalExport.g:4054:2: rule__Export__Group_3__2__Impl
             {
-            pushFollow(FOLLOW_rule__Export__Group_3__2__Impl_in_rule__Export__Group_3__28434);
+            pushFollow(FOLLOW_2);
             rule__Export__Group_3__2__Impl();
 
             state._fsp--;
@@ -12428,25 +12428,25 @@ public final void rule__Export__Group_3__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_3__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4060:1: rule__Export__Group_3__2__Impl : ( ( rule__Export__NamingAssignment_3_2 ) ) ;
+    // InternalExport.g:4060:1: rule__Export__Group_3__2__Impl : ( ( rule__Export__NamingAssignment_3_2 ) ) ;
     public final void rule__Export__Group_3__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4064:1: ( ( ( rule__Export__NamingAssignment_3_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4065:1: ( ( rule__Export__NamingAssignment_3_2 ) )
+            // InternalExport.g:4064:1: ( ( ( rule__Export__NamingAssignment_3_2 ) ) )
+            // InternalExport.g:4065:1: ( ( rule__Export__NamingAssignment_3_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4065:1: ( ( rule__Export__NamingAssignment_3_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4066:1: ( rule__Export__NamingAssignment_3_2 )
+            // InternalExport.g:4065:1: ( ( rule__Export__NamingAssignment_3_2 ) )
+            // InternalExport.g:4066:1: ( rule__Export__NamingAssignment_3_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getNamingAssignment_3_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4067:1: ( rule__Export__NamingAssignment_3_2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4067:2: rule__Export__NamingAssignment_3_2
+            // InternalExport.g:4067:1: ( rule__Export__NamingAssignment_3_2 )
+            // InternalExport.g:4067:2: rule__Export__NamingAssignment_3_2
             {
-            pushFollow(FOLLOW_rule__Export__NamingAssignment_3_2_in_rule__Export__Group_3__2__Impl8461);
+            pushFollow(FOLLOW_2);
             rule__Export__NamingAssignment_3_2();
 
             state._fsp--;
@@ -12479,21 +12479,21 @@ public final void rule__Export__Group_3__2__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_4__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4083:1: rule__Export__Group_4__0 : rule__Export__Group_4__0__Impl rule__Export__Group_4__1 ;
+    // InternalExport.g:4083:1: rule__Export__Group_4__0 : rule__Export__Group_4__0__Impl rule__Export__Group_4__1 ;
     public final void rule__Export__Group_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4087:1: ( rule__Export__Group_4__0__Impl rule__Export__Group_4__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4088:2: rule__Export__Group_4__0__Impl rule__Export__Group_4__1
+            // InternalExport.g:4087:1: ( rule__Export__Group_4__0__Impl rule__Export__Group_4__1 )
+            // InternalExport.g:4088:2: rule__Export__Group_4__0__Impl rule__Export__Group_4__1
             {
-            pushFollow(FOLLOW_rule__Export__Group_4__0__Impl_in_rule__Export__Group_4__08497);
+            pushFollow(FOLLOW_18);
             rule__Export__Group_4__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Export__Group_4__1_in_rule__Export__Group_4__08500);
+            pushFollow(FOLLOW_2);
             rule__Export__Group_4__1();
 
             state._fsp--;
@@ -12517,22 +12517,22 @@ public final void rule__Export__Group_4__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_4__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4095:1: rule__Export__Group_4__0__Impl : ( '[' ) ;
+    // InternalExport.g:4095:1: rule__Export__Group_4__0__Impl : ( '[' ) ;
     public final void rule__Export__Group_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4099:1: ( ( '[' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4100:1: ( '[' )
+            // InternalExport.g:4099:1: ( ( '[' ) )
+            // InternalExport.g:4100:1: ( '[' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4100:1: ( '[' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4101:1: '['
+            // InternalExport.g:4100:1: ( '[' )
+            // InternalExport.g:4101:1: '['
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getLeftSquareBracketKeyword_4_0()); 
             }
-            match(input,45,FOLLOW_45_in_rule__Export__Group_4__0__Impl8528); if (state.failed) return ;
+            match(input,45,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExportAccess().getLeftSquareBracketKeyword_4_0()); 
             }
@@ -12558,21 +12558,21 @@ public final void rule__Export__Group_4__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_4__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4114:1: rule__Export__Group_4__1 : rule__Export__Group_4__1__Impl rule__Export__Group_4__2 ;
+    // InternalExport.g:4114:1: rule__Export__Group_4__1 : rule__Export__Group_4__1__Impl rule__Export__Group_4__2 ;
     public final void rule__Export__Group_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4118:1: ( rule__Export__Group_4__1__Impl rule__Export__Group_4__2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4119:2: rule__Export__Group_4__1__Impl rule__Export__Group_4__2
+            // InternalExport.g:4118:1: ( rule__Export__Group_4__1__Impl rule__Export__Group_4__2 )
+            // InternalExport.g:4119:2: rule__Export__Group_4__1__Impl rule__Export__Group_4__2
             {
-            pushFollow(FOLLOW_rule__Export__Group_4__1__Impl_in_rule__Export__Group_4__18559);
+            pushFollow(FOLLOW_19);
             rule__Export__Group_4__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Export__Group_4__2_in_rule__Export__Group_4__18562);
+            pushFollow(FOLLOW_2);
             rule__Export__Group_4__2();
 
             state._fsp--;
@@ -12596,25 +12596,25 @@ public final void rule__Export__Group_4__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_4__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4126:1: rule__Export__Group_4__1__Impl : ( ( rule__Export__GuardAssignment_4_1 ) ) ;
+    // InternalExport.g:4126:1: rule__Export__Group_4__1__Impl : ( ( rule__Export__GuardAssignment_4_1 ) ) ;
     public final void rule__Export__Group_4__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4130:1: ( ( ( rule__Export__GuardAssignment_4_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4131:1: ( ( rule__Export__GuardAssignment_4_1 ) )
+            // InternalExport.g:4130:1: ( ( ( rule__Export__GuardAssignment_4_1 ) ) )
+            // InternalExport.g:4131:1: ( ( rule__Export__GuardAssignment_4_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4131:1: ( ( rule__Export__GuardAssignment_4_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4132:1: ( rule__Export__GuardAssignment_4_1 )
+            // InternalExport.g:4131:1: ( ( rule__Export__GuardAssignment_4_1 ) )
+            // InternalExport.g:4132:1: ( rule__Export__GuardAssignment_4_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getGuardAssignment_4_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4133:1: ( rule__Export__GuardAssignment_4_1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4133:2: rule__Export__GuardAssignment_4_1
+            // InternalExport.g:4133:1: ( rule__Export__GuardAssignment_4_1 )
+            // InternalExport.g:4133:2: rule__Export__GuardAssignment_4_1
             {
-            pushFollow(FOLLOW_rule__Export__GuardAssignment_4_1_in_rule__Export__Group_4__1__Impl8589);
+            pushFollow(FOLLOW_2);
             rule__Export__GuardAssignment_4_1();
 
             state._fsp--;
@@ -12647,16 +12647,16 @@ public final void rule__Export__Group_4__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_4__2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4143:1: rule__Export__Group_4__2 : rule__Export__Group_4__2__Impl ;
+    // InternalExport.g:4143:1: rule__Export__Group_4__2 : rule__Export__Group_4__2__Impl ;
     public final void rule__Export__Group_4__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4147:1: ( rule__Export__Group_4__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4148:2: rule__Export__Group_4__2__Impl
+            // InternalExport.g:4147:1: ( rule__Export__Group_4__2__Impl )
+            // InternalExport.g:4148:2: rule__Export__Group_4__2__Impl
             {
-            pushFollow(FOLLOW_rule__Export__Group_4__2__Impl_in_rule__Export__Group_4__28619);
+            pushFollow(FOLLOW_2);
             rule__Export__Group_4__2__Impl();
 
             state._fsp--;
@@ -12680,22 +12680,22 @@ public final void rule__Export__Group_4__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_4__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4154:1: rule__Export__Group_4__2__Impl : ( ']' ) ;
+    // InternalExport.g:4154:1: rule__Export__Group_4__2__Impl : ( ']' ) ;
     public final void rule__Export__Group_4__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4158:1: ( ( ']' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4159:1: ( ']' )
+            // InternalExport.g:4158:1: ( ( ']' ) )
+            // InternalExport.g:4159:1: ( ']' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4159:1: ( ']' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4160:1: ']'
+            // InternalExport.g:4159:1: ( ']' )
+            // InternalExport.g:4160:1: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getRightSquareBracketKeyword_4_2()); 
             }
-            match(input,46,FOLLOW_46_in_rule__Export__Group_4__2__Impl8647); if (state.failed) return ;
+            match(input,46,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExportAccess().getRightSquareBracketKeyword_4_2()); 
             }
@@ -12721,21 +12721,21 @@ public final void rule__Export__Group_4__2__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_6__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4179:1: rule__Export__Group_6__0 : rule__Export__Group_6__0__Impl rule__Export__Group_6__1 ;
+    // InternalExport.g:4179:1: rule__Export__Group_6__0 : rule__Export__Group_6__0__Impl rule__Export__Group_6__1 ;
     public final void rule__Export__Group_6__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4183:1: ( rule__Export__Group_6__0__Impl rule__Export__Group_6__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4184:2: rule__Export__Group_6__0__Impl rule__Export__Group_6__1
+            // InternalExport.g:4183:1: ( rule__Export__Group_6__0__Impl rule__Export__Group_6__1 )
+            // InternalExport.g:4184:2: rule__Export__Group_6__0__Impl rule__Export__Group_6__1
             {
-            pushFollow(FOLLOW_rule__Export__Group_6__0__Impl_in_rule__Export__Group_6__08684);
+            pushFollow(FOLLOW_32);
             rule__Export__Group_6__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Export__Group_6__1_in_rule__Export__Group_6__08687);
+            pushFollow(FOLLOW_2);
             rule__Export__Group_6__1();
 
             state._fsp--;
@@ -12759,22 +12759,22 @@ public final void rule__Export__Group_6__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_6__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4191:1: rule__Export__Group_6__0__Impl : ( 'uri-fragment' ) ;
+    // InternalExport.g:4191:1: rule__Export__Group_6__0__Impl : ( 'uri-fragment' ) ;
     public final void rule__Export__Group_6__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4195:1: ( ( 'uri-fragment' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4196:1: ( 'uri-fragment' )
+            // InternalExport.g:4195:1: ( ( 'uri-fragment' ) )
+            // InternalExport.g:4196:1: ( 'uri-fragment' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4196:1: ( 'uri-fragment' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4197:1: 'uri-fragment'
+            // InternalExport.g:4196:1: ( 'uri-fragment' )
+            // InternalExport.g:4197:1: 'uri-fragment'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getUriFragmentKeyword_6_0()); 
             }
-            match(input,53,FOLLOW_53_in_rule__Export__Group_6__0__Impl8715); if (state.failed) return ;
+            match(input,53,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExportAccess().getUriFragmentKeyword_6_0()); 
             }
@@ -12800,21 +12800,21 @@ public final void rule__Export__Group_6__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_6__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4210:1: rule__Export__Group_6__1 : rule__Export__Group_6__1__Impl rule__Export__Group_6__2 ;
+    // InternalExport.g:4210:1: rule__Export__Group_6__1 : rule__Export__Group_6__1__Impl rule__Export__Group_6__2 ;
     public final void rule__Export__Group_6__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4214:1: ( rule__Export__Group_6__1__Impl rule__Export__Group_6__2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4215:2: rule__Export__Group_6__1__Impl rule__Export__Group_6__2
+            // InternalExport.g:4214:1: ( rule__Export__Group_6__1__Impl rule__Export__Group_6__2 )
+            // InternalExport.g:4215:2: rule__Export__Group_6__1__Impl rule__Export__Group_6__2
             {
-            pushFollow(FOLLOW_rule__Export__Group_6__1__Impl_in_rule__Export__Group_6__18746);
+            pushFollow(FOLLOW_33);
             rule__Export__Group_6__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Export__Group_6__2_in_rule__Export__Group_6__18749);
+            pushFollow(FOLLOW_2);
             rule__Export__Group_6__2();
 
             state._fsp--;
@@ -12838,22 +12838,22 @@ public final void rule__Export__Group_6__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_6__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4222:1: rule__Export__Group_6__1__Impl : ( '=' ) ;
+    // InternalExport.g:4222:1: rule__Export__Group_6__1__Impl : ( '=' ) ;
     public final void rule__Export__Group_6__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4226:1: ( ( '=' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4227:1: ( '=' )
+            // InternalExport.g:4226:1: ( ( '=' ) )
+            // InternalExport.g:4227:1: ( '=' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4227:1: ( '=' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4228:1: '='
+            // InternalExport.g:4227:1: ( '=' )
+            // InternalExport.g:4228:1: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getEqualsSignKeyword_6_1()); 
             }
-            match(input,47,FOLLOW_47_in_rule__Export__Group_6__1__Impl8777); if (state.failed) return ;
+            match(input,47,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExportAccess().getEqualsSignKeyword_6_1()); 
             }
@@ -12879,21 +12879,21 @@ public final void rule__Export__Group_6__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_6__2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4241:1: rule__Export__Group_6__2 : rule__Export__Group_6__2__Impl rule__Export__Group_6__3 ;
+    // InternalExport.g:4241:1: rule__Export__Group_6__2 : rule__Export__Group_6__2__Impl rule__Export__Group_6__3 ;
     public final void rule__Export__Group_6__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4245:1: ( rule__Export__Group_6__2__Impl rule__Export__Group_6__3 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4246:2: rule__Export__Group_6__2__Impl rule__Export__Group_6__3
+            // InternalExport.g:4245:1: ( rule__Export__Group_6__2__Impl rule__Export__Group_6__3 )
+            // InternalExport.g:4246:2: rule__Export__Group_6__2__Impl rule__Export__Group_6__3
             {
-            pushFollow(FOLLOW_rule__Export__Group_6__2__Impl_in_rule__Export__Group_6__28808);
+            pushFollow(FOLLOW_33);
             rule__Export__Group_6__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Export__Group_6__3_in_rule__Export__Group_6__28811);
+            pushFollow(FOLLOW_2);
             rule__Export__Group_6__3();
 
             state._fsp--;
@@ -12917,22 +12917,22 @@ public final void rule__Export__Group_6__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_6__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4253:1: rule__Export__Group_6__2__Impl : ( ( rule__Export__FragmentUniqueAssignment_6_2 )? ) ;
+    // InternalExport.g:4253:1: rule__Export__Group_6__2__Impl : ( ( rule__Export__FragmentUniqueAssignment_6_2 )? ) ;
     public final void rule__Export__Group_6__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4257:1: ( ( ( rule__Export__FragmentUniqueAssignment_6_2 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4258:1: ( ( rule__Export__FragmentUniqueAssignment_6_2 )? )
+            // InternalExport.g:4257:1: ( ( ( rule__Export__FragmentUniqueAssignment_6_2 )? ) )
+            // InternalExport.g:4258:1: ( ( rule__Export__FragmentUniqueAssignment_6_2 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4258:1: ( ( rule__Export__FragmentUniqueAssignment_6_2 )? )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4259:1: ( rule__Export__FragmentUniqueAssignment_6_2 )?
+            // InternalExport.g:4258:1: ( ( rule__Export__FragmentUniqueAssignment_6_2 )? )
+            // InternalExport.g:4259:1: ( rule__Export__FragmentUniqueAssignment_6_2 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getFragmentUniqueAssignment_6_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4260:1: ( rule__Export__FragmentUniqueAssignment_6_2 )?
+            // InternalExport.g:4260:1: ( rule__Export__FragmentUniqueAssignment_6_2 )?
             int alt43=2;
             int LA43_0 = input.LA(1);
 
@@ -12941,9 +12941,9 @@ public final void rule__Export__Group_6__2__Impl() throws RecognitionException {
             }
             switch (alt43) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4260:2: rule__Export__FragmentUniqueAssignment_6_2
+                    // InternalExport.g:4260:2: rule__Export__FragmentUniqueAssignment_6_2
                     {
-                    pushFollow(FOLLOW_rule__Export__FragmentUniqueAssignment_6_2_in_rule__Export__Group_6__2__Impl8838);
+                    pushFollow(FOLLOW_2);
                     rule__Export__FragmentUniqueAssignment_6_2();
 
                     state._fsp--;
@@ -12979,21 +12979,21 @@ public final void rule__Export__Group_6__2__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_6__3"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4270:1: rule__Export__Group_6__3 : rule__Export__Group_6__3__Impl rule__Export__Group_6__4 ;
+    // InternalExport.g:4270:1: rule__Export__Group_6__3 : rule__Export__Group_6__3__Impl rule__Export__Group_6__4 ;
     public final void rule__Export__Group_6__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4274:1: ( rule__Export__Group_6__3__Impl rule__Export__Group_6__4 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4275:2: rule__Export__Group_6__3__Impl rule__Export__Group_6__4
+            // InternalExport.g:4274:1: ( rule__Export__Group_6__3__Impl rule__Export__Group_6__4 )
+            // InternalExport.g:4275:2: rule__Export__Group_6__3__Impl rule__Export__Group_6__4
             {
-            pushFollow(FOLLOW_rule__Export__Group_6__3__Impl_in_rule__Export__Group_6__38869);
+            pushFollow(FOLLOW_34);
             rule__Export__Group_6__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Export__Group_6__4_in_rule__Export__Group_6__38872);
+            pushFollow(FOLLOW_2);
             rule__Export__Group_6__4();
 
             state._fsp--;
@@ -13017,22 +13017,22 @@ public final void rule__Export__Group_6__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_6__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4282:1: rule__Export__Group_6__3__Impl : ( 'attribute' ) ;
+    // InternalExport.g:4282:1: rule__Export__Group_6__3__Impl : ( 'attribute' ) ;
     public final void rule__Export__Group_6__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4286:1: ( ( 'attribute' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4287:1: ( 'attribute' )
+            // InternalExport.g:4286:1: ( ( 'attribute' ) )
+            // InternalExport.g:4287:1: ( 'attribute' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4287:1: ( 'attribute' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4288:1: 'attribute'
+            // InternalExport.g:4287:1: ( 'attribute' )
+            // InternalExport.g:4288:1: 'attribute'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getAttributeKeyword_6_3()); 
             }
-            match(input,54,FOLLOW_54_in_rule__Export__Group_6__3__Impl8900); if (state.failed) return ;
+            match(input,54,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExportAccess().getAttributeKeyword_6_3()); 
             }
@@ -13058,21 +13058,21 @@ public final void rule__Export__Group_6__3__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_6__4"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4301:1: rule__Export__Group_6__4 : rule__Export__Group_6__4__Impl rule__Export__Group_6__5 ;
+    // InternalExport.g:4301:1: rule__Export__Group_6__4 : rule__Export__Group_6__4__Impl rule__Export__Group_6__5 ;
     public final void rule__Export__Group_6__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4305:1: ( rule__Export__Group_6__4__Impl rule__Export__Group_6__5 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4306:2: rule__Export__Group_6__4__Impl rule__Export__Group_6__5
+            // InternalExport.g:4305:1: ( rule__Export__Group_6__4__Impl rule__Export__Group_6__5 )
+            // InternalExport.g:4306:2: rule__Export__Group_6__4__Impl rule__Export__Group_6__5
             {
-            pushFollow(FOLLOW_rule__Export__Group_6__4__Impl_in_rule__Export__Group_6__48931);
+            pushFollow(FOLLOW_10);
             rule__Export__Group_6__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Export__Group_6__5_in_rule__Export__Group_6__48934);
+            pushFollow(FOLLOW_2);
             rule__Export__Group_6__5();
 
             state._fsp--;
@@ -13096,22 +13096,22 @@ public final void rule__Export__Group_6__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_6__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4313:1: rule__Export__Group_6__4__Impl : ( '(' ) ;
+    // InternalExport.g:4313:1: rule__Export__Group_6__4__Impl : ( '(' ) ;
     public final void rule__Export__Group_6__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4317:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4318:1: ( '(' )
+            // InternalExport.g:4317:1: ( ( '(' ) )
+            // InternalExport.g:4318:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4318:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4319:1: '('
+            // InternalExport.g:4318:1: ( '(' )
+            // InternalExport.g:4319:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getLeftParenthesisKeyword_6_4()); 
             }
-            match(input,51,FOLLOW_51_in_rule__Export__Group_6__4__Impl8962); if (state.failed) return ;
+            match(input,51,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExportAccess().getLeftParenthesisKeyword_6_4()); 
             }
@@ -13137,21 +13137,21 @@ public final void rule__Export__Group_6__4__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_6__5"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4332:1: rule__Export__Group_6__5 : rule__Export__Group_6__5__Impl rule__Export__Group_6__6 ;
+    // InternalExport.g:4332:1: rule__Export__Group_6__5 : rule__Export__Group_6__5__Impl rule__Export__Group_6__6 ;
     public final void rule__Export__Group_6__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4336:1: ( rule__Export__Group_6__5__Impl rule__Export__Group_6__6 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4337:2: rule__Export__Group_6__5__Impl rule__Export__Group_6__6
+            // InternalExport.g:4336:1: ( rule__Export__Group_6__5__Impl rule__Export__Group_6__6 )
+            // InternalExport.g:4337:2: rule__Export__Group_6__5__Impl rule__Export__Group_6__6
             {
-            pushFollow(FOLLOW_rule__Export__Group_6__5__Impl_in_rule__Export__Group_6__58993);
+            pushFollow(FOLLOW_25);
             rule__Export__Group_6__5__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Export__Group_6__6_in_rule__Export__Group_6__58996);
+            pushFollow(FOLLOW_2);
             rule__Export__Group_6__6();
 
             state._fsp--;
@@ -13175,25 +13175,25 @@ public final void rule__Export__Group_6__5() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_6__5__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4344:1: rule__Export__Group_6__5__Impl : ( ( rule__Export__FragmentAttributeAssignment_6_5 ) ) ;
+    // InternalExport.g:4344:1: rule__Export__Group_6__5__Impl : ( ( rule__Export__FragmentAttributeAssignment_6_5 ) ) ;
     public final void rule__Export__Group_6__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4348:1: ( ( ( rule__Export__FragmentAttributeAssignment_6_5 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4349:1: ( ( rule__Export__FragmentAttributeAssignment_6_5 ) )
+            // InternalExport.g:4348:1: ( ( ( rule__Export__FragmentAttributeAssignment_6_5 ) ) )
+            // InternalExport.g:4349:1: ( ( rule__Export__FragmentAttributeAssignment_6_5 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4349:1: ( ( rule__Export__FragmentAttributeAssignment_6_5 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4350:1: ( rule__Export__FragmentAttributeAssignment_6_5 )
+            // InternalExport.g:4349:1: ( ( rule__Export__FragmentAttributeAssignment_6_5 ) )
+            // InternalExport.g:4350:1: ( rule__Export__FragmentAttributeAssignment_6_5 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getFragmentAttributeAssignment_6_5()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4351:1: ( rule__Export__FragmentAttributeAssignment_6_5 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4351:2: rule__Export__FragmentAttributeAssignment_6_5
+            // InternalExport.g:4351:1: ( rule__Export__FragmentAttributeAssignment_6_5 )
+            // InternalExport.g:4351:2: rule__Export__FragmentAttributeAssignment_6_5
             {
-            pushFollow(FOLLOW_rule__Export__FragmentAttributeAssignment_6_5_in_rule__Export__Group_6__5__Impl9023);
+            pushFollow(FOLLOW_2);
             rule__Export__FragmentAttributeAssignment_6_5();
 
             state._fsp--;
@@ -13226,21 +13226,21 @@ public final void rule__Export__Group_6__5__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_6__6"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4361:1: rule__Export__Group_6__6 : rule__Export__Group_6__6__Impl rule__Export__Group_6__7 ;
+    // InternalExport.g:4361:1: rule__Export__Group_6__6 : rule__Export__Group_6__6__Impl rule__Export__Group_6__7 ;
     public final void rule__Export__Group_6__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4365:1: ( rule__Export__Group_6__6__Impl rule__Export__Group_6__7 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4366:2: rule__Export__Group_6__6__Impl rule__Export__Group_6__7
+            // InternalExport.g:4365:1: ( rule__Export__Group_6__6__Impl rule__Export__Group_6__7 )
+            // InternalExport.g:4366:2: rule__Export__Group_6__6__Impl rule__Export__Group_6__7
             {
-            pushFollow(FOLLOW_rule__Export__Group_6__6__Impl_in_rule__Export__Group_6__69053);
+            pushFollow(FOLLOW_35);
             rule__Export__Group_6__6__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Export__Group_6__7_in_rule__Export__Group_6__69056);
+            pushFollow(FOLLOW_2);
             rule__Export__Group_6__7();
 
             state._fsp--;
@@ -13264,22 +13264,22 @@ public final void rule__Export__Group_6__6() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_6__6__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4373:1: rule__Export__Group_6__6__Impl : ( ')' ) ;
+    // InternalExport.g:4373:1: rule__Export__Group_6__6__Impl : ( ')' ) ;
     public final void rule__Export__Group_6__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4377:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4378:1: ( ')' )
+            // InternalExport.g:4377:1: ( ( ')' ) )
+            // InternalExport.g:4378:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4378:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4379:1: ')'
+            // InternalExport.g:4378:1: ( ')' )
+            // InternalExport.g:4379:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getRightParenthesisKeyword_6_6()); 
             }
-            match(input,52,FOLLOW_52_in_rule__Export__Group_6__6__Impl9084); if (state.failed) return ;
+            match(input,52,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExportAccess().getRightParenthesisKeyword_6_6()); 
             }
@@ -13305,16 +13305,16 @@ public final void rule__Export__Group_6__6__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_6__7"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4392:1: rule__Export__Group_6__7 : rule__Export__Group_6__7__Impl ;
+    // InternalExport.g:4392:1: rule__Export__Group_6__7 : rule__Export__Group_6__7__Impl ;
     public final void rule__Export__Group_6__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4396:1: ( rule__Export__Group_6__7__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4397:2: rule__Export__Group_6__7__Impl
+            // InternalExport.g:4396:1: ( rule__Export__Group_6__7__Impl )
+            // InternalExport.g:4397:2: rule__Export__Group_6__7__Impl
             {
-            pushFollow(FOLLOW_rule__Export__Group_6__7__Impl_in_rule__Export__Group_6__79115);
+            pushFollow(FOLLOW_2);
             rule__Export__Group_6__7__Impl();
 
             state._fsp--;
@@ -13338,22 +13338,22 @@ public final void rule__Export__Group_6__7() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_6__7__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4403:1: rule__Export__Group_6__7__Impl : ( ';' ) ;
+    // InternalExport.g:4403:1: rule__Export__Group_6__7__Impl : ( ';' ) ;
     public final void rule__Export__Group_6__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4407:1: ( ( ';' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4408:1: ( ';' )
+            // InternalExport.g:4407:1: ( ( ';' ) )
+            // InternalExport.g:4408:1: ( ';' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4408:1: ( ';' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4409:1: ';'
+            // InternalExport.g:4408:1: ( ';' )
+            // InternalExport.g:4409:1: ';'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getSemicolonKeyword_6_7()); 
             }
-            match(input,44,FOLLOW_44_in_rule__Export__Group_6__7__Impl9143); if (state.failed) return ;
+            match(input,44,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExportAccess().getSemicolonKeyword_6_7()); 
             }
@@ -13379,21 +13379,21 @@ public final void rule__Export__Group_6__7__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_7__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4438:1: rule__Export__Group_7__0 : rule__Export__Group_7__0__Impl rule__Export__Group_7__1 ;
+    // InternalExport.g:4438:1: rule__Export__Group_7__0 : rule__Export__Group_7__0__Impl rule__Export__Group_7__1 ;
     public final void rule__Export__Group_7__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4442:1: ( rule__Export__Group_7__0__Impl rule__Export__Group_7__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4443:2: rule__Export__Group_7__0__Impl rule__Export__Group_7__1
+            // InternalExport.g:4442:1: ( rule__Export__Group_7__0__Impl rule__Export__Group_7__1 )
+            // InternalExport.g:4443:2: rule__Export__Group_7__0__Impl rule__Export__Group_7__1
             {
-            pushFollow(FOLLOW_rule__Export__Group_7__0__Impl_in_rule__Export__Group_7__09190);
+            pushFollow(FOLLOW_35);
             rule__Export__Group_7__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Export__Group_7__1_in_rule__Export__Group_7__09193);
+            pushFollow(FOLLOW_2);
             rule__Export__Group_7__1();
 
             state._fsp--;
@@ -13417,25 +13417,25 @@ public final void rule__Export__Group_7__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_7__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4450:1: rule__Export__Group_7__0__Impl : ( ( rule__Export__Alternatives_7_0 ) ) ;
+    // InternalExport.g:4450:1: rule__Export__Group_7__0__Impl : ( ( rule__Export__Alternatives_7_0 ) ) ;
     public final void rule__Export__Group_7__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4454:1: ( ( ( rule__Export__Alternatives_7_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4455:1: ( ( rule__Export__Alternatives_7_0 ) )
+            // InternalExport.g:4454:1: ( ( ( rule__Export__Alternatives_7_0 ) ) )
+            // InternalExport.g:4455:1: ( ( rule__Export__Alternatives_7_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4455:1: ( ( rule__Export__Alternatives_7_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4456:1: ( rule__Export__Alternatives_7_0 )
+            // InternalExport.g:4455:1: ( ( rule__Export__Alternatives_7_0 ) )
+            // InternalExport.g:4456:1: ( rule__Export__Alternatives_7_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getAlternatives_7_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4457:1: ( rule__Export__Alternatives_7_0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4457:2: rule__Export__Alternatives_7_0
+            // InternalExport.g:4457:1: ( rule__Export__Alternatives_7_0 )
+            // InternalExport.g:4457:2: rule__Export__Alternatives_7_0
             {
-            pushFollow(FOLLOW_rule__Export__Alternatives_7_0_in_rule__Export__Group_7__0__Impl9220);
+            pushFollow(FOLLOW_2);
             rule__Export__Alternatives_7_0();
 
             state._fsp--;
@@ -13468,16 +13468,16 @@ public final void rule__Export__Group_7__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_7__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4467:1: rule__Export__Group_7__1 : rule__Export__Group_7__1__Impl ;
+    // InternalExport.g:4467:1: rule__Export__Group_7__1 : rule__Export__Group_7__1__Impl ;
     public final void rule__Export__Group_7__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4471:1: ( rule__Export__Group_7__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4472:2: rule__Export__Group_7__1__Impl
+            // InternalExport.g:4471:1: ( rule__Export__Group_7__1__Impl )
+            // InternalExport.g:4472:2: rule__Export__Group_7__1__Impl
             {
-            pushFollow(FOLLOW_rule__Export__Group_7__1__Impl_in_rule__Export__Group_7__19250);
+            pushFollow(FOLLOW_2);
             rule__Export__Group_7__1__Impl();
 
             state._fsp--;
@@ -13501,22 +13501,22 @@ public final void rule__Export__Group_7__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_7__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4478:1: rule__Export__Group_7__1__Impl : ( ';' ) ;
+    // InternalExport.g:4478:1: rule__Export__Group_7__1__Impl : ( ';' ) ;
     public final void rule__Export__Group_7__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4482:1: ( ( ';' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4483:1: ( ';' )
+            // InternalExport.g:4482:1: ( ( ';' ) )
+            // InternalExport.g:4483:1: ( ';' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4483:1: ( ';' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4484:1: ';'
+            // InternalExport.g:4483:1: ( ';' )
+            // InternalExport.g:4484:1: ';'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getSemicolonKeyword_7_1()); 
             }
-            match(input,44,FOLLOW_44_in_rule__Export__Group_7__1__Impl9278); if (state.failed) return ;
+            match(input,44,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExportAccess().getSemicolonKeyword_7_1()); 
             }
@@ -13542,21 +13542,21 @@ public final void rule__Export__Group_7__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_8_0__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4501:1: rule__Export__Group_8_0__0 : rule__Export__Group_8_0__0__Impl rule__Export__Group_8_0__1 ;
+    // InternalExport.g:4501:1: rule__Export__Group_8_0__0 : rule__Export__Group_8_0__0__Impl rule__Export__Group_8_0__1 ;
     public final void rule__Export__Group_8_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4505:1: ( rule__Export__Group_8_0__0__Impl rule__Export__Group_8_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4506:2: rule__Export__Group_8_0__0__Impl rule__Export__Group_8_0__1
+            // InternalExport.g:4505:1: ( rule__Export__Group_8_0__0__Impl rule__Export__Group_8_0__1 )
+            // InternalExport.g:4506:2: rule__Export__Group_8_0__0__Impl rule__Export__Group_8_0__1
             {
-            pushFollow(FOLLOW_rule__Export__Group_8_0__0__Impl_in_rule__Export__Group_8_0__09313);
+            pushFollow(FOLLOW_10);
             rule__Export__Group_8_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Export__Group_8_0__1_in_rule__Export__Group_8_0__09316);
+            pushFollow(FOLLOW_2);
             rule__Export__Group_8_0__1();
 
             state._fsp--;
@@ -13580,22 +13580,22 @@ public final void rule__Export__Group_8_0__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_8_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4513:1: rule__Export__Group_8_0__0__Impl : ( 'field' ) ;
+    // InternalExport.g:4513:1: rule__Export__Group_8_0__0__Impl : ( 'field' ) ;
     public final void rule__Export__Group_8_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4517:1: ( ( 'field' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4518:1: ( 'field' )
+            // InternalExport.g:4517:1: ( ( 'field' ) )
+            // InternalExport.g:4518:1: ( 'field' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4518:1: ( 'field' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4519:1: 'field'
+            // InternalExport.g:4518:1: ( 'field' )
+            // InternalExport.g:4519:1: 'field'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getFieldKeyword_8_0_0()); 
             }
-            match(input,55,FOLLOW_55_in_rule__Export__Group_8_0__0__Impl9344); if (state.failed) return ;
+            match(input,55,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExportAccess().getFieldKeyword_8_0_0()); 
             }
@@ -13621,21 +13621,21 @@ public final void rule__Export__Group_8_0__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__Export__Group_8_0__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4532:1: rule__Export__Group_8_0__1 : rule__Export__Group_8_0__1__Impl rule__Export__Group_8_0__2 ;
+    // InternalExport.g:4532:1: rule__Export__Group_8_0__1 : rule__Export__Group_8_0__1__Impl rule__Export__Group_8_0__2 ;
     public final void rule__Export__Group_8_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4536:1: ( rule__Export__Group_8_0__1__Impl rule__Export__Group_8_0__2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4537:2: rule__Export__Group_8_0__1__Impl rule__Export__Group_8_0__2
+            // InternalExport.g:4536:1: ( rule__Export__Group_8_0__1__Impl rule__Export__Group_8_0__2 )
+            // InternalExport.g:4537:2: rule__Export__Group_8_0__1__Impl rule__Export__Group_8_0__2
             {
-            pushFollow(FOLLOW_rule__Export__Group_8_0__1__Impl_in_rule__Export__Group_8_0__19375);
+            pushFollow(FOLLOW_36);
             rule__Export__Group_8_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Export__Group_8_0__2_in_rule__Export__Group_8_0__19378);
+            pushFollow(FOLLOW_2);
             rule__Export__Group_8_0__2();
 
             state._fsp--;
@@ -13659,25 +13659,25 @@ public final void rule__Export__Group_8_0__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_8_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4544:1: rule__Export__Group_8_0__1__Impl : ( ( rule__Export__AttributesAssignment_8_0_1 ) ) ;
+    // InternalExport.g:4544:1: rule__Export__Group_8_0__1__Impl : ( ( rule__Export__AttributesAssignment_8_0_1 ) ) ;
     public final void rule__Export__Group_8_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4548:1: ( ( ( rule__Export__AttributesAssignment_8_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4549:1: ( ( rule__Export__AttributesAssignment_8_0_1 ) )
+            // InternalExport.g:4548:1: ( ( ( rule__Export__AttributesAssignment_8_0_1 ) ) )
+            // InternalExport.g:4549:1: ( ( rule__Export__AttributesAssignment_8_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4549:1: ( ( rule__Export__AttributesAssignment_8_0_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4550:1: ( rule__Export__AttributesAssignment_8_0_1 )
+            // InternalExport.g:4549:1: ( ( rule__Export__AttributesAssignment_8_0_1 ) )
+            // InternalExport.g:4550:1: ( rule__Export__AttributesAssignment_8_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getAttributesAssignment_8_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4551:1: ( rule__Export__AttributesAssignment_8_0_1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4551:2: rule__Export__AttributesAssignment_8_0_1
+            // InternalExport.g:4551:1: ( rule__Export__AttributesAssignment_8_0_1 )
+            // InternalExport.g:4551:2: rule__Export__AttributesAssignment_8_0_1
             {
-            pushFollow(FOLLOW_rule__Export__AttributesAssignment_8_0_1_in_rule__Export__Group_8_0__1__Impl9405);
+            pushFollow(FOLLOW_2);
             rule__Export__AttributesAssignment_8_0_1();
 
             state._fsp--;
@@ -13710,21 +13710,21 @@ public final void rule__Export__Group_8_0__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__Export__Group_8_0__2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4561:1: rule__Export__Group_8_0__2 : rule__Export__Group_8_0__2__Impl rule__Export__Group_8_0__3 ;
+    // InternalExport.g:4561:1: rule__Export__Group_8_0__2 : rule__Export__Group_8_0__2__Impl rule__Export__Group_8_0__3 ;
     public final void rule__Export__Group_8_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4565:1: ( rule__Export__Group_8_0__2__Impl rule__Export__Group_8_0__3 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4566:2: rule__Export__Group_8_0__2__Impl rule__Export__Group_8_0__3
+            // InternalExport.g:4565:1: ( rule__Export__Group_8_0__2__Impl rule__Export__Group_8_0__3 )
+            // InternalExport.g:4566:2: rule__Export__Group_8_0__2__Impl rule__Export__Group_8_0__3
             {
-            pushFollow(FOLLOW_rule__Export__Group_8_0__2__Impl_in_rule__Export__Group_8_0__29435);
+            pushFollow(FOLLOW_36);
             rule__Export__Group_8_0__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Export__Group_8_0__3_in_rule__Export__Group_8_0__29438);
+            pushFollow(FOLLOW_2);
             rule__Export__Group_8_0__3();
 
             state._fsp--;
@@ -13748,22 +13748,22 @@ public final void rule__Export__Group_8_0__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_8_0__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4573:1: rule__Export__Group_8_0__2__Impl : ( ( rule__Export__Group_8_0_2__0 )* ) ;
+    // InternalExport.g:4573:1: rule__Export__Group_8_0__2__Impl : ( ( rule__Export__Group_8_0_2__0 )* ) ;
     public final void rule__Export__Group_8_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4577:1: ( ( ( rule__Export__Group_8_0_2__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4578:1: ( ( rule__Export__Group_8_0_2__0 )* )
+            // InternalExport.g:4577:1: ( ( ( rule__Export__Group_8_0_2__0 )* ) )
+            // InternalExport.g:4578:1: ( ( rule__Export__Group_8_0_2__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4578:1: ( ( rule__Export__Group_8_0_2__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4579:1: ( rule__Export__Group_8_0_2__0 )*
+            // InternalExport.g:4578:1: ( ( rule__Export__Group_8_0_2__0 )* )
+            // InternalExport.g:4579:1: ( rule__Export__Group_8_0_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getGroup_8_0_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4580:1: ( rule__Export__Group_8_0_2__0 )*
+            // InternalExport.g:4580:1: ( rule__Export__Group_8_0_2__0 )*
             loop44:
             do {
                 int alt44=2;
@@ -13776,9 +13776,9 @@ public final void rule__Export__Group_8_0__2__Impl() throws RecognitionException
 
                 switch (alt44) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4580:2: rule__Export__Group_8_0_2__0
+            	    // InternalExport.g:4580:2: rule__Export__Group_8_0_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__Export__Group_8_0_2__0_in_rule__Export__Group_8_0__2__Impl9465);
+            	    pushFollow(FOLLOW_22);
             	    rule__Export__Group_8_0_2__0();
 
             	    state._fsp--;
@@ -13817,16 +13817,16 @@ public final void rule__Export__Group_8_0__2__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__Export__Group_8_0__3"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4590:1: rule__Export__Group_8_0__3 : rule__Export__Group_8_0__3__Impl ;
+    // InternalExport.g:4590:1: rule__Export__Group_8_0__3 : rule__Export__Group_8_0__3__Impl ;
     public final void rule__Export__Group_8_0__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4594:1: ( rule__Export__Group_8_0__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4595:2: rule__Export__Group_8_0__3__Impl
+            // InternalExport.g:4594:1: ( rule__Export__Group_8_0__3__Impl )
+            // InternalExport.g:4595:2: rule__Export__Group_8_0__3__Impl
             {
-            pushFollow(FOLLOW_rule__Export__Group_8_0__3__Impl_in_rule__Export__Group_8_0__39496);
+            pushFollow(FOLLOW_2);
             rule__Export__Group_8_0__3__Impl();
 
             state._fsp--;
@@ -13850,22 +13850,22 @@ public final void rule__Export__Group_8_0__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_8_0__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4601:1: rule__Export__Group_8_0__3__Impl : ( ';' ) ;
+    // InternalExport.g:4601:1: rule__Export__Group_8_0__3__Impl : ( ';' ) ;
     public final void rule__Export__Group_8_0__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4605:1: ( ( ';' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4606:1: ( ';' )
+            // InternalExport.g:4605:1: ( ( ';' ) )
+            // InternalExport.g:4606:1: ( ';' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4606:1: ( ';' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4607:1: ';'
+            // InternalExport.g:4606:1: ( ';' )
+            // InternalExport.g:4607:1: ';'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getSemicolonKeyword_8_0_3()); 
             }
-            match(input,44,FOLLOW_44_in_rule__Export__Group_8_0__3__Impl9524); if (state.failed) return ;
+            match(input,44,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExportAccess().getSemicolonKeyword_8_0_3()); 
             }
@@ -13891,21 +13891,21 @@ public final void rule__Export__Group_8_0__3__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__Export__Group_8_0_2__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4628:1: rule__Export__Group_8_0_2__0 : rule__Export__Group_8_0_2__0__Impl rule__Export__Group_8_0_2__1 ;
+    // InternalExport.g:4628:1: rule__Export__Group_8_0_2__0 : rule__Export__Group_8_0_2__0__Impl rule__Export__Group_8_0_2__1 ;
     public final void rule__Export__Group_8_0_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4632:1: ( rule__Export__Group_8_0_2__0__Impl rule__Export__Group_8_0_2__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4633:2: rule__Export__Group_8_0_2__0__Impl rule__Export__Group_8_0_2__1
+            // InternalExport.g:4632:1: ( rule__Export__Group_8_0_2__0__Impl rule__Export__Group_8_0_2__1 )
+            // InternalExport.g:4633:2: rule__Export__Group_8_0_2__0__Impl rule__Export__Group_8_0_2__1
             {
-            pushFollow(FOLLOW_rule__Export__Group_8_0_2__0__Impl_in_rule__Export__Group_8_0_2__09563);
+            pushFollow(FOLLOW_10);
             rule__Export__Group_8_0_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Export__Group_8_0_2__1_in_rule__Export__Group_8_0_2__09566);
+            pushFollow(FOLLOW_2);
             rule__Export__Group_8_0_2__1();
 
             state._fsp--;
@@ -13929,22 +13929,22 @@ public final void rule__Export__Group_8_0_2__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_8_0_2__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4640:1: rule__Export__Group_8_0_2__0__Impl : ( ',' ) ;
+    // InternalExport.g:4640:1: rule__Export__Group_8_0_2__0__Impl : ( ',' ) ;
     public final void rule__Export__Group_8_0_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4644:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4645:1: ( ',' )
+            // InternalExport.g:4644:1: ( ( ',' ) )
+            // InternalExport.g:4645:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4645:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4646:1: ','
+            // InternalExport.g:4645:1: ( ',' )
+            // InternalExport.g:4646:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getCommaKeyword_8_0_2_0()); 
             }
-            match(input,48,FOLLOW_48_in_rule__Export__Group_8_0_2__0__Impl9594); if (state.failed) return ;
+            match(input,48,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExportAccess().getCommaKeyword_8_0_2_0()); 
             }
@@ -13970,16 +13970,16 @@ public final void rule__Export__Group_8_0_2__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__Export__Group_8_0_2__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4659:1: rule__Export__Group_8_0_2__1 : rule__Export__Group_8_0_2__1__Impl ;
+    // InternalExport.g:4659:1: rule__Export__Group_8_0_2__1 : rule__Export__Group_8_0_2__1__Impl ;
     public final void rule__Export__Group_8_0_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4663:1: ( rule__Export__Group_8_0_2__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4664:2: rule__Export__Group_8_0_2__1__Impl
+            // InternalExport.g:4663:1: ( rule__Export__Group_8_0_2__1__Impl )
+            // InternalExport.g:4664:2: rule__Export__Group_8_0_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__Export__Group_8_0_2__1__Impl_in_rule__Export__Group_8_0_2__19625);
+            pushFollow(FOLLOW_2);
             rule__Export__Group_8_0_2__1__Impl();
 
             state._fsp--;
@@ -14003,25 +14003,25 @@ public final void rule__Export__Group_8_0_2__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_8_0_2__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4670:1: rule__Export__Group_8_0_2__1__Impl : ( ( rule__Export__AttributesAssignment_8_0_2_1 ) ) ;
+    // InternalExport.g:4670:1: rule__Export__Group_8_0_2__1__Impl : ( ( rule__Export__AttributesAssignment_8_0_2_1 ) ) ;
     public final void rule__Export__Group_8_0_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4674:1: ( ( ( rule__Export__AttributesAssignment_8_0_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4675:1: ( ( rule__Export__AttributesAssignment_8_0_2_1 ) )
+            // InternalExport.g:4674:1: ( ( ( rule__Export__AttributesAssignment_8_0_2_1 ) ) )
+            // InternalExport.g:4675:1: ( ( rule__Export__AttributesAssignment_8_0_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4675:1: ( ( rule__Export__AttributesAssignment_8_0_2_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4676:1: ( rule__Export__AttributesAssignment_8_0_2_1 )
+            // InternalExport.g:4675:1: ( ( rule__Export__AttributesAssignment_8_0_2_1 ) )
+            // InternalExport.g:4676:1: ( rule__Export__AttributesAssignment_8_0_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getAttributesAssignment_8_0_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4677:1: ( rule__Export__AttributesAssignment_8_0_2_1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4677:2: rule__Export__AttributesAssignment_8_0_2_1
+            // InternalExport.g:4677:1: ( rule__Export__AttributesAssignment_8_0_2_1 )
+            // InternalExport.g:4677:2: rule__Export__AttributesAssignment_8_0_2_1
             {
-            pushFollow(FOLLOW_rule__Export__AttributesAssignment_8_0_2_1_in_rule__Export__Group_8_0_2__1__Impl9652);
+            pushFollow(FOLLOW_2);
             rule__Export__AttributesAssignment_8_0_2_1();
 
             state._fsp--;
@@ -14054,21 +14054,21 @@ public final void rule__Export__Group_8_0_2__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__Export__Group_8_1__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4691:1: rule__Export__Group_8_1__0 : rule__Export__Group_8_1__0__Impl rule__Export__Group_8_1__1 ;
+    // InternalExport.g:4691:1: rule__Export__Group_8_1__0 : rule__Export__Group_8_1__0__Impl rule__Export__Group_8_1__1 ;
     public final void rule__Export__Group_8_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4695:1: ( rule__Export__Group_8_1__0__Impl rule__Export__Group_8_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4696:2: rule__Export__Group_8_1__0__Impl rule__Export__Group_8_1__1
+            // InternalExport.g:4695:1: ( rule__Export__Group_8_1__0__Impl rule__Export__Group_8_1__1 )
+            // InternalExport.g:4696:2: rule__Export__Group_8_1__0__Impl rule__Export__Group_8_1__1
             {
-            pushFollow(FOLLOW_rule__Export__Group_8_1__0__Impl_in_rule__Export__Group_8_1__09686);
+            pushFollow(FOLLOW_10);
             rule__Export__Group_8_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Export__Group_8_1__1_in_rule__Export__Group_8_1__09689);
+            pushFollow(FOLLOW_2);
             rule__Export__Group_8_1__1();
 
             state._fsp--;
@@ -14092,22 +14092,22 @@ public final void rule__Export__Group_8_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_8_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4703:1: rule__Export__Group_8_1__0__Impl : ( 'data' ) ;
+    // InternalExport.g:4703:1: rule__Export__Group_8_1__0__Impl : ( 'data' ) ;
     public final void rule__Export__Group_8_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4707:1: ( ( 'data' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4708:1: ( 'data' )
+            // InternalExport.g:4707:1: ( ( 'data' ) )
+            // InternalExport.g:4708:1: ( 'data' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4708:1: ( 'data' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4709:1: 'data'
+            // InternalExport.g:4708:1: ( 'data' )
+            // InternalExport.g:4709:1: 'data'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getDataKeyword_8_1_0()); 
             }
-            match(input,56,FOLLOW_56_in_rule__Export__Group_8_1__0__Impl9717); if (state.failed) return ;
+            match(input,56,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExportAccess().getDataKeyword_8_1_0()); 
             }
@@ -14133,21 +14133,21 @@ public final void rule__Export__Group_8_1__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__Export__Group_8_1__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4722:1: rule__Export__Group_8_1__1 : rule__Export__Group_8_1__1__Impl rule__Export__Group_8_1__2 ;
+    // InternalExport.g:4722:1: rule__Export__Group_8_1__1 : rule__Export__Group_8_1__1__Impl rule__Export__Group_8_1__2 ;
     public final void rule__Export__Group_8_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4726:1: ( rule__Export__Group_8_1__1__Impl rule__Export__Group_8_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4727:2: rule__Export__Group_8_1__1__Impl rule__Export__Group_8_1__2
+            // InternalExport.g:4726:1: ( rule__Export__Group_8_1__1__Impl rule__Export__Group_8_1__2 )
+            // InternalExport.g:4727:2: rule__Export__Group_8_1__1__Impl rule__Export__Group_8_1__2
             {
-            pushFollow(FOLLOW_rule__Export__Group_8_1__1__Impl_in_rule__Export__Group_8_1__19748);
+            pushFollow(FOLLOW_36);
             rule__Export__Group_8_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Export__Group_8_1__2_in_rule__Export__Group_8_1__19751);
+            pushFollow(FOLLOW_2);
             rule__Export__Group_8_1__2();
 
             state._fsp--;
@@ -14171,25 +14171,25 @@ public final void rule__Export__Group_8_1__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_8_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4734:1: rule__Export__Group_8_1__1__Impl : ( ( rule__Export__UserDataAssignment_8_1_1 ) ) ;
+    // InternalExport.g:4734:1: rule__Export__Group_8_1__1__Impl : ( ( rule__Export__UserDataAssignment_8_1_1 ) ) ;
     public final void rule__Export__Group_8_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4738:1: ( ( ( rule__Export__UserDataAssignment_8_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4739:1: ( ( rule__Export__UserDataAssignment_8_1_1 ) )
+            // InternalExport.g:4738:1: ( ( ( rule__Export__UserDataAssignment_8_1_1 ) ) )
+            // InternalExport.g:4739:1: ( ( rule__Export__UserDataAssignment_8_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4739:1: ( ( rule__Export__UserDataAssignment_8_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4740:1: ( rule__Export__UserDataAssignment_8_1_1 )
+            // InternalExport.g:4739:1: ( ( rule__Export__UserDataAssignment_8_1_1 ) )
+            // InternalExport.g:4740:1: ( rule__Export__UserDataAssignment_8_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getUserDataAssignment_8_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4741:1: ( rule__Export__UserDataAssignment_8_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4741:2: rule__Export__UserDataAssignment_8_1_1
+            // InternalExport.g:4741:1: ( rule__Export__UserDataAssignment_8_1_1 )
+            // InternalExport.g:4741:2: rule__Export__UserDataAssignment_8_1_1
             {
-            pushFollow(FOLLOW_rule__Export__UserDataAssignment_8_1_1_in_rule__Export__Group_8_1__1__Impl9778);
+            pushFollow(FOLLOW_2);
             rule__Export__UserDataAssignment_8_1_1();
 
             state._fsp--;
@@ -14222,21 +14222,21 @@ public final void rule__Export__Group_8_1__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__Export__Group_8_1__2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4751:1: rule__Export__Group_8_1__2 : rule__Export__Group_8_1__2__Impl rule__Export__Group_8_1__3 ;
+    // InternalExport.g:4751:1: rule__Export__Group_8_1__2 : rule__Export__Group_8_1__2__Impl rule__Export__Group_8_1__3 ;
     public final void rule__Export__Group_8_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4755:1: ( rule__Export__Group_8_1__2__Impl rule__Export__Group_8_1__3 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4756:2: rule__Export__Group_8_1__2__Impl rule__Export__Group_8_1__3
+            // InternalExport.g:4755:1: ( rule__Export__Group_8_1__2__Impl rule__Export__Group_8_1__3 )
+            // InternalExport.g:4756:2: rule__Export__Group_8_1__2__Impl rule__Export__Group_8_1__3
             {
-            pushFollow(FOLLOW_rule__Export__Group_8_1__2__Impl_in_rule__Export__Group_8_1__29808);
+            pushFollow(FOLLOW_36);
             rule__Export__Group_8_1__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Export__Group_8_1__3_in_rule__Export__Group_8_1__29811);
+            pushFollow(FOLLOW_2);
             rule__Export__Group_8_1__3();
 
             state._fsp--;
@@ -14260,22 +14260,22 @@ public final void rule__Export__Group_8_1__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_8_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4763:1: rule__Export__Group_8_1__2__Impl : ( ( rule__Export__Group_8_1_2__0 )* ) ;
+    // InternalExport.g:4763:1: rule__Export__Group_8_1__2__Impl : ( ( rule__Export__Group_8_1_2__0 )* ) ;
     public final void rule__Export__Group_8_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4767:1: ( ( ( rule__Export__Group_8_1_2__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4768:1: ( ( rule__Export__Group_8_1_2__0 )* )
+            // InternalExport.g:4767:1: ( ( ( rule__Export__Group_8_1_2__0 )* ) )
+            // InternalExport.g:4768:1: ( ( rule__Export__Group_8_1_2__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4768:1: ( ( rule__Export__Group_8_1_2__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4769:1: ( rule__Export__Group_8_1_2__0 )*
+            // InternalExport.g:4768:1: ( ( rule__Export__Group_8_1_2__0 )* )
+            // InternalExport.g:4769:1: ( rule__Export__Group_8_1_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getGroup_8_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4770:1: ( rule__Export__Group_8_1_2__0 )*
+            // InternalExport.g:4770:1: ( rule__Export__Group_8_1_2__0 )*
             loop45:
             do {
                 int alt45=2;
@@ -14288,9 +14288,9 @@ public final void rule__Export__Group_8_1__2__Impl() throws RecognitionException
 
                 switch (alt45) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4770:2: rule__Export__Group_8_1_2__0
+            	    // InternalExport.g:4770:2: rule__Export__Group_8_1_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__Export__Group_8_1_2__0_in_rule__Export__Group_8_1__2__Impl9838);
+            	    pushFollow(FOLLOW_22);
             	    rule__Export__Group_8_1_2__0();
 
             	    state._fsp--;
@@ -14329,16 +14329,16 @@ public final void rule__Export__Group_8_1__2__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__Export__Group_8_1__3"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4780:1: rule__Export__Group_8_1__3 : rule__Export__Group_8_1__3__Impl ;
+    // InternalExport.g:4780:1: rule__Export__Group_8_1__3 : rule__Export__Group_8_1__3__Impl ;
     public final void rule__Export__Group_8_1__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4784:1: ( rule__Export__Group_8_1__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4785:2: rule__Export__Group_8_1__3__Impl
+            // InternalExport.g:4784:1: ( rule__Export__Group_8_1__3__Impl )
+            // InternalExport.g:4785:2: rule__Export__Group_8_1__3__Impl
             {
-            pushFollow(FOLLOW_rule__Export__Group_8_1__3__Impl_in_rule__Export__Group_8_1__39869);
+            pushFollow(FOLLOW_2);
             rule__Export__Group_8_1__3__Impl();
 
             state._fsp--;
@@ -14362,22 +14362,22 @@ public final void rule__Export__Group_8_1__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_8_1__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4791:1: rule__Export__Group_8_1__3__Impl : ( ';' ) ;
+    // InternalExport.g:4791:1: rule__Export__Group_8_1__3__Impl : ( ';' ) ;
     public final void rule__Export__Group_8_1__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4795:1: ( ( ';' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4796:1: ( ';' )
+            // InternalExport.g:4795:1: ( ( ';' ) )
+            // InternalExport.g:4796:1: ( ';' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4796:1: ( ';' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4797:1: ';'
+            // InternalExport.g:4796:1: ( ';' )
+            // InternalExport.g:4797:1: ';'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getSemicolonKeyword_8_1_3()); 
             }
-            match(input,44,FOLLOW_44_in_rule__Export__Group_8_1__3__Impl9897); if (state.failed) return ;
+            match(input,44,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExportAccess().getSemicolonKeyword_8_1_3()); 
             }
@@ -14403,21 +14403,21 @@ public final void rule__Export__Group_8_1__3__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__Export__Group_8_1_2__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4818:1: rule__Export__Group_8_1_2__0 : rule__Export__Group_8_1_2__0__Impl rule__Export__Group_8_1_2__1 ;
+    // InternalExport.g:4818:1: rule__Export__Group_8_1_2__0 : rule__Export__Group_8_1_2__0__Impl rule__Export__Group_8_1_2__1 ;
     public final void rule__Export__Group_8_1_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4822:1: ( rule__Export__Group_8_1_2__0__Impl rule__Export__Group_8_1_2__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4823:2: rule__Export__Group_8_1_2__0__Impl rule__Export__Group_8_1_2__1
+            // InternalExport.g:4822:1: ( rule__Export__Group_8_1_2__0__Impl rule__Export__Group_8_1_2__1 )
+            // InternalExport.g:4823:2: rule__Export__Group_8_1_2__0__Impl rule__Export__Group_8_1_2__1
             {
-            pushFollow(FOLLOW_rule__Export__Group_8_1_2__0__Impl_in_rule__Export__Group_8_1_2__09936);
+            pushFollow(FOLLOW_10);
             rule__Export__Group_8_1_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Export__Group_8_1_2__1_in_rule__Export__Group_8_1_2__09939);
+            pushFollow(FOLLOW_2);
             rule__Export__Group_8_1_2__1();
 
             state._fsp--;
@@ -14441,22 +14441,22 @@ public final void rule__Export__Group_8_1_2__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_8_1_2__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4830:1: rule__Export__Group_8_1_2__0__Impl : ( ',' ) ;
+    // InternalExport.g:4830:1: rule__Export__Group_8_1_2__0__Impl : ( ',' ) ;
     public final void rule__Export__Group_8_1_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4834:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4835:1: ( ',' )
+            // InternalExport.g:4834:1: ( ( ',' ) )
+            // InternalExport.g:4835:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4835:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4836:1: ','
+            // InternalExport.g:4835:1: ( ',' )
+            // InternalExport.g:4836:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getCommaKeyword_8_1_2_0()); 
             }
-            match(input,48,FOLLOW_48_in_rule__Export__Group_8_1_2__0__Impl9967); if (state.failed) return ;
+            match(input,48,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExportAccess().getCommaKeyword_8_1_2_0()); 
             }
@@ -14482,16 +14482,16 @@ public final void rule__Export__Group_8_1_2__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__Export__Group_8_1_2__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4849:1: rule__Export__Group_8_1_2__1 : rule__Export__Group_8_1_2__1__Impl ;
+    // InternalExport.g:4849:1: rule__Export__Group_8_1_2__1 : rule__Export__Group_8_1_2__1__Impl ;
     public final void rule__Export__Group_8_1_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4853:1: ( rule__Export__Group_8_1_2__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4854:2: rule__Export__Group_8_1_2__1__Impl
+            // InternalExport.g:4853:1: ( rule__Export__Group_8_1_2__1__Impl )
+            // InternalExport.g:4854:2: rule__Export__Group_8_1_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__Export__Group_8_1_2__1__Impl_in_rule__Export__Group_8_1_2__19998);
+            pushFollow(FOLLOW_2);
             rule__Export__Group_8_1_2__1__Impl();
 
             state._fsp--;
@@ -14515,25 +14515,25 @@ public final void rule__Export__Group_8_1_2__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__Group_8_1_2__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4860:1: rule__Export__Group_8_1_2__1__Impl : ( ( rule__Export__UserDataAssignment_8_1_2_1 ) ) ;
+    // InternalExport.g:4860:1: rule__Export__Group_8_1_2__1__Impl : ( ( rule__Export__UserDataAssignment_8_1_2_1 ) ) ;
     public final void rule__Export__Group_8_1_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4864:1: ( ( ( rule__Export__UserDataAssignment_8_1_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4865:1: ( ( rule__Export__UserDataAssignment_8_1_2_1 ) )
+            // InternalExport.g:4864:1: ( ( ( rule__Export__UserDataAssignment_8_1_2_1 ) ) )
+            // InternalExport.g:4865:1: ( ( rule__Export__UserDataAssignment_8_1_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4865:1: ( ( rule__Export__UserDataAssignment_8_1_2_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4866:1: ( rule__Export__UserDataAssignment_8_1_2_1 )
+            // InternalExport.g:4865:1: ( ( rule__Export__UserDataAssignment_8_1_2_1 ) )
+            // InternalExport.g:4866:1: ( rule__Export__UserDataAssignment_8_1_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getUserDataAssignment_8_1_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4867:1: ( rule__Export__UserDataAssignment_8_1_2_1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4867:2: rule__Export__UserDataAssignment_8_1_2_1
+            // InternalExport.g:4867:1: ( rule__Export__UserDataAssignment_8_1_2_1 )
+            // InternalExport.g:4867:2: rule__Export__UserDataAssignment_8_1_2_1
             {
-            pushFollow(FOLLOW_rule__Export__UserDataAssignment_8_1_2_1_in_rule__Export__Group_8_1_2__1__Impl10025);
+            pushFollow(FOLLOW_2);
             rule__Export__UserDataAssignment_8_1_2_1();
 
             state._fsp--;
@@ -14566,21 +14566,21 @@ public final void rule__Export__Group_8_1_2__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__UserData__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4881:1: rule__UserData__Group__0 : rule__UserData__Group__0__Impl rule__UserData__Group__1 ;
+    // InternalExport.g:4881:1: rule__UserData__Group__0 : rule__UserData__Group__0__Impl rule__UserData__Group__1 ;
     public final void rule__UserData__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4885:1: ( rule__UserData__Group__0__Impl rule__UserData__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4886:2: rule__UserData__Group__0__Impl rule__UserData__Group__1
+            // InternalExport.g:4885:1: ( rule__UserData__Group__0__Impl rule__UserData__Group__1 )
+            // InternalExport.g:4886:2: rule__UserData__Group__0__Impl rule__UserData__Group__1
             {
-            pushFollow(FOLLOW_rule__UserData__Group__0__Impl_in_rule__UserData__Group__010059);
+            pushFollow(FOLLOW_32);
             rule__UserData__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__UserData__Group__1_in_rule__UserData__Group__010062);
+            pushFollow(FOLLOW_2);
             rule__UserData__Group__1();
 
             state._fsp--;
@@ -14604,25 +14604,25 @@ public final void rule__UserData__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__UserData__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4893:1: rule__UserData__Group__0__Impl : ( ( rule__UserData__NameAssignment_0 ) ) ;
+    // InternalExport.g:4893:1: rule__UserData__Group__0__Impl : ( ( rule__UserData__NameAssignment_0 ) ) ;
     public final void rule__UserData__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4897:1: ( ( ( rule__UserData__NameAssignment_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4898:1: ( ( rule__UserData__NameAssignment_0 ) )
+            // InternalExport.g:4897:1: ( ( ( rule__UserData__NameAssignment_0 ) ) )
+            // InternalExport.g:4898:1: ( ( rule__UserData__NameAssignment_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4898:1: ( ( rule__UserData__NameAssignment_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4899:1: ( rule__UserData__NameAssignment_0 )
+            // InternalExport.g:4898:1: ( ( rule__UserData__NameAssignment_0 ) )
+            // InternalExport.g:4899:1: ( rule__UserData__NameAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getUserDataAccess().getNameAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4900:1: ( rule__UserData__NameAssignment_0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4900:2: rule__UserData__NameAssignment_0
+            // InternalExport.g:4900:1: ( rule__UserData__NameAssignment_0 )
+            // InternalExport.g:4900:2: rule__UserData__NameAssignment_0
             {
-            pushFollow(FOLLOW_rule__UserData__NameAssignment_0_in_rule__UserData__Group__0__Impl10089);
+            pushFollow(FOLLOW_2);
             rule__UserData__NameAssignment_0();
 
             state._fsp--;
@@ -14655,21 +14655,21 @@ public final void rule__UserData__Group__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__UserData__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4910:1: rule__UserData__Group__1 : rule__UserData__Group__1__Impl rule__UserData__Group__2 ;
+    // InternalExport.g:4910:1: rule__UserData__Group__1 : rule__UserData__Group__1__Impl rule__UserData__Group__2 ;
     public final void rule__UserData__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4914:1: ( rule__UserData__Group__1__Impl rule__UserData__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4915:2: rule__UserData__Group__1__Impl rule__UserData__Group__2
+            // InternalExport.g:4914:1: ( rule__UserData__Group__1__Impl rule__UserData__Group__2 )
+            // InternalExport.g:4915:2: rule__UserData__Group__1__Impl rule__UserData__Group__2
             {
-            pushFollow(FOLLOW_rule__UserData__Group__1__Impl_in_rule__UserData__Group__110119);
+            pushFollow(FOLLOW_18);
             rule__UserData__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__UserData__Group__2_in_rule__UserData__Group__110122);
+            pushFollow(FOLLOW_2);
             rule__UserData__Group__2();
 
             state._fsp--;
@@ -14693,22 +14693,22 @@ public final void rule__UserData__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__UserData__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4922:1: rule__UserData__Group__1__Impl : ( '=' ) ;
+    // InternalExport.g:4922:1: rule__UserData__Group__1__Impl : ( '=' ) ;
     public final void rule__UserData__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4926:1: ( ( '=' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4927:1: ( '=' )
+            // InternalExport.g:4926:1: ( ( '=' ) )
+            // InternalExport.g:4927:1: ( '=' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4927:1: ( '=' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4928:1: '='
+            // InternalExport.g:4927:1: ( '=' )
+            // InternalExport.g:4928:1: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getUserDataAccess().getEqualsSignKeyword_1()); 
             }
-            match(input,47,FOLLOW_47_in_rule__UserData__Group__1__Impl10150); if (state.failed) return ;
+            match(input,47,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getUserDataAccess().getEqualsSignKeyword_1()); 
             }
@@ -14734,16 +14734,16 @@ public final void rule__UserData__Group__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__UserData__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4941:1: rule__UserData__Group__2 : rule__UserData__Group__2__Impl ;
+    // InternalExport.g:4941:1: rule__UserData__Group__2 : rule__UserData__Group__2__Impl ;
     public final void rule__UserData__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4945:1: ( rule__UserData__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4946:2: rule__UserData__Group__2__Impl
+            // InternalExport.g:4945:1: ( rule__UserData__Group__2__Impl )
+            // InternalExport.g:4946:2: rule__UserData__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__UserData__Group__2__Impl_in_rule__UserData__Group__210181);
+            pushFollow(FOLLOW_2);
             rule__UserData__Group__2__Impl();
 
             state._fsp--;
@@ -14767,25 +14767,25 @@ public final void rule__UserData__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__UserData__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4952:1: rule__UserData__Group__2__Impl : ( ( rule__UserData__ExprAssignment_2 ) ) ;
+    // InternalExport.g:4952:1: rule__UserData__Group__2__Impl : ( ( rule__UserData__ExprAssignment_2 ) ) ;
     public final void rule__UserData__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4956:1: ( ( ( rule__UserData__ExprAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4957:1: ( ( rule__UserData__ExprAssignment_2 ) )
+            // InternalExport.g:4956:1: ( ( ( rule__UserData__ExprAssignment_2 ) ) )
+            // InternalExport.g:4957:1: ( ( rule__UserData__ExprAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4957:1: ( ( rule__UserData__ExprAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4958:1: ( rule__UserData__ExprAssignment_2 )
+            // InternalExport.g:4957:1: ( ( rule__UserData__ExprAssignment_2 ) )
+            // InternalExport.g:4958:1: ( rule__UserData__ExprAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getUserDataAccess().getExprAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4959:1: ( rule__UserData__ExprAssignment_2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4959:2: rule__UserData__ExprAssignment_2
+            // InternalExport.g:4959:1: ( rule__UserData__ExprAssignment_2 )
+            // InternalExport.g:4959:2: rule__UserData__ExprAssignment_2
             {
-            pushFollow(FOLLOW_rule__UserData__ExprAssignment_2_in_rule__UserData__Group__2__Impl10208);
+            pushFollow(FOLLOW_2);
             rule__UserData__ExprAssignment_2();
 
             state._fsp--;
@@ -14818,21 +14818,21 @@ public final void rule__UserData__Group__2__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__QualifiedID__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4975:1: rule__QualifiedID__Group__0 : rule__QualifiedID__Group__0__Impl rule__QualifiedID__Group__1 ;
+    // InternalExport.g:4975:1: rule__QualifiedID__Group__0 : rule__QualifiedID__Group__0__Impl rule__QualifiedID__Group__1 ;
     public final void rule__QualifiedID__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4979:1: ( rule__QualifiedID__Group__0__Impl rule__QualifiedID__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4980:2: rule__QualifiedID__Group__0__Impl rule__QualifiedID__Group__1
+            // InternalExport.g:4979:1: ( rule__QualifiedID__Group__0__Impl rule__QualifiedID__Group__1 )
+            // InternalExport.g:4980:2: rule__QualifiedID__Group__0__Impl rule__QualifiedID__Group__1
             {
-            pushFollow(FOLLOW_rule__QualifiedID__Group__0__Impl_in_rule__QualifiedID__Group__010244);
+            pushFollow(FOLLOW_37);
             rule__QualifiedID__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__QualifiedID__Group__1_in_rule__QualifiedID__Group__010247);
+            pushFollow(FOLLOW_2);
             rule__QualifiedID__Group__1();
 
             state._fsp--;
@@ -14856,22 +14856,22 @@ public final void rule__QualifiedID__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__QualifiedID__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4987:1: rule__QualifiedID__Group__0__Impl : ( RULE_ID ) ;
+    // InternalExport.g:4987:1: rule__QualifiedID__Group__0__Impl : ( RULE_ID ) ;
     public final void rule__QualifiedID__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4991:1: ( ( RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4992:1: ( RULE_ID )
+            // InternalExport.g:4991:1: ( ( RULE_ID ) )
+            // InternalExport.g:4992:1: ( RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4992:1: ( RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:4993:1: RULE_ID
+            // InternalExport.g:4992:1: ( RULE_ID )
+            // InternalExport.g:4993:1: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedIDAccess().getIDTerminalRuleCall_0()); 
             }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__QualifiedID__Group__0__Impl10274); if (state.failed) return ;
+            match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getQualifiedIDAccess().getIDTerminalRuleCall_0()); 
             }
@@ -14897,16 +14897,16 @@ public final void rule__QualifiedID__Group__0__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__QualifiedID__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5004:1: rule__QualifiedID__Group__1 : rule__QualifiedID__Group__1__Impl ;
+    // InternalExport.g:5004:1: rule__QualifiedID__Group__1 : rule__QualifiedID__Group__1__Impl ;
     public final void rule__QualifiedID__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5008:1: ( rule__QualifiedID__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5009:2: rule__QualifiedID__Group__1__Impl
+            // InternalExport.g:5008:1: ( rule__QualifiedID__Group__1__Impl )
+            // InternalExport.g:5009:2: rule__QualifiedID__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__QualifiedID__Group__1__Impl_in_rule__QualifiedID__Group__110303);
+            pushFollow(FOLLOW_2);
             rule__QualifiedID__Group__1__Impl();
 
             state._fsp--;
@@ -14930,22 +14930,22 @@ public final void rule__QualifiedID__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__QualifiedID__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5015:1: rule__QualifiedID__Group__1__Impl : ( ( rule__QualifiedID__Group_1__0 )* ) ;
+    // InternalExport.g:5015:1: rule__QualifiedID__Group__1__Impl : ( ( rule__QualifiedID__Group_1__0 )* ) ;
     public final void rule__QualifiedID__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5019:1: ( ( ( rule__QualifiedID__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5020:1: ( ( rule__QualifiedID__Group_1__0 )* )
+            // InternalExport.g:5019:1: ( ( ( rule__QualifiedID__Group_1__0 )* ) )
+            // InternalExport.g:5020:1: ( ( rule__QualifiedID__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5020:1: ( ( rule__QualifiedID__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5021:1: ( rule__QualifiedID__Group_1__0 )*
+            // InternalExport.g:5020:1: ( ( rule__QualifiedID__Group_1__0 )* )
+            // InternalExport.g:5021:1: ( rule__QualifiedID__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedIDAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5022:1: ( rule__QualifiedID__Group_1__0 )*
+            // InternalExport.g:5022:1: ( rule__QualifiedID__Group_1__0 )*
             loop46:
             do {
                 int alt46=2;
@@ -14958,9 +14958,9 @@ public final void rule__QualifiedID__Group__1__Impl() throws RecognitionExceptio
 
                 switch (alt46) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5022:2: rule__QualifiedID__Group_1__0
+            	    // InternalExport.g:5022:2: rule__QualifiedID__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__QualifiedID__Group_1__0_in_rule__QualifiedID__Group__1__Impl10330);
+            	    pushFollow(FOLLOW_38);
             	    rule__QualifiedID__Group_1__0();
 
             	    state._fsp--;
@@ -14999,21 +14999,21 @@ public final void rule__QualifiedID__Group__1__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__QualifiedID__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5036:1: rule__QualifiedID__Group_1__0 : rule__QualifiedID__Group_1__0__Impl rule__QualifiedID__Group_1__1 ;
+    // InternalExport.g:5036:1: rule__QualifiedID__Group_1__0 : rule__QualifiedID__Group_1__0__Impl rule__QualifiedID__Group_1__1 ;
     public final void rule__QualifiedID__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5040:1: ( rule__QualifiedID__Group_1__0__Impl rule__QualifiedID__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5041:2: rule__QualifiedID__Group_1__0__Impl rule__QualifiedID__Group_1__1
+            // InternalExport.g:5040:1: ( rule__QualifiedID__Group_1__0__Impl rule__QualifiedID__Group_1__1 )
+            // InternalExport.g:5041:2: rule__QualifiedID__Group_1__0__Impl rule__QualifiedID__Group_1__1
             {
-            pushFollow(FOLLOW_rule__QualifiedID__Group_1__0__Impl_in_rule__QualifiedID__Group_1__010365);
+            pushFollow(FOLLOW_10);
             rule__QualifiedID__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__QualifiedID__Group_1__1_in_rule__QualifiedID__Group_1__010368);
+            pushFollow(FOLLOW_2);
             rule__QualifiedID__Group_1__1();
 
             state._fsp--;
@@ -15037,22 +15037,22 @@ public final void rule__QualifiedID__Group_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__QualifiedID__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5048:1: rule__QualifiedID__Group_1__0__Impl : ( '::' ) ;
+    // InternalExport.g:5048:1: rule__QualifiedID__Group_1__0__Impl : ( '::' ) ;
     public final void rule__QualifiedID__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5052:1: ( ( '::' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5053:1: ( '::' )
+            // InternalExport.g:5052:1: ( ( '::' ) )
+            // InternalExport.g:5053:1: ( '::' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5053:1: ( '::' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5054:1: '::'
+            // InternalExport.g:5053:1: ( '::' )
+            // InternalExport.g:5054:1: '::'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedIDAccess().getColonColonKeyword_1_0()); 
             }
-            match(input,57,FOLLOW_57_in_rule__QualifiedID__Group_1__0__Impl10396); if (state.failed) return ;
+            match(input,57,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getQualifiedIDAccess().getColonColonKeyword_1_0()); 
             }
@@ -15078,16 +15078,16 @@ public final void rule__QualifiedID__Group_1__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__QualifiedID__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5067:1: rule__QualifiedID__Group_1__1 : rule__QualifiedID__Group_1__1__Impl ;
+    // InternalExport.g:5067:1: rule__QualifiedID__Group_1__1 : rule__QualifiedID__Group_1__1__Impl ;
     public final void rule__QualifiedID__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5071:1: ( rule__QualifiedID__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5072:2: rule__QualifiedID__Group_1__1__Impl
+            // InternalExport.g:5071:1: ( rule__QualifiedID__Group_1__1__Impl )
+            // InternalExport.g:5072:2: rule__QualifiedID__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__QualifiedID__Group_1__1__Impl_in_rule__QualifiedID__Group_1__110427);
+            pushFollow(FOLLOW_2);
             rule__QualifiedID__Group_1__1__Impl();
 
             state._fsp--;
@@ -15111,22 +15111,22 @@ public final void rule__QualifiedID__Group_1__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__QualifiedID__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5078:1: rule__QualifiedID__Group_1__1__Impl : ( RULE_ID ) ;
+    // InternalExport.g:5078:1: rule__QualifiedID__Group_1__1__Impl : ( RULE_ID ) ;
     public final void rule__QualifiedID__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5082:1: ( ( RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5083:1: ( RULE_ID )
+            // InternalExport.g:5082:1: ( ( RULE_ID ) )
+            // InternalExport.g:5083:1: ( RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5083:1: ( RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5084:1: RULE_ID
+            // InternalExport.g:5083:1: ( RULE_ID )
+            // InternalExport.g:5084:1: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedIDAccess().getIDTerminalRuleCall_1_1()); 
             }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__QualifiedID__Group_1__1__Impl10454); if (state.failed) return ;
+            match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getQualifiedIDAccess().getIDTerminalRuleCall_1_1()); 
             }
@@ -15152,21 +15152,21 @@ public final void rule__QualifiedID__Group_1__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__LetExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5099:1: rule__LetExpression__Group__0 : rule__LetExpression__Group__0__Impl rule__LetExpression__Group__1 ;
+    // InternalExport.g:5099:1: rule__LetExpression__Group__0 : rule__LetExpression__Group__0__Impl rule__LetExpression__Group__1 ;
     public final void rule__LetExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5103:1: ( rule__LetExpression__Group__0__Impl rule__LetExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5104:2: rule__LetExpression__Group__0__Impl rule__LetExpression__Group__1
+            // InternalExport.g:5103:1: ( rule__LetExpression__Group__0__Impl rule__LetExpression__Group__1 )
+            // InternalExport.g:5104:2: rule__LetExpression__Group__0__Impl rule__LetExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__LetExpression__Group__0__Impl_in_rule__LetExpression__Group__010487);
+            pushFollow(FOLLOW_10);
             rule__LetExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__LetExpression__Group__1_in_rule__LetExpression__Group__010490);
+            pushFollow(FOLLOW_2);
             rule__LetExpression__Group__1();
 
             state._fsp--;
@@ -15190,22 +15190,22 @@ public final void rule__LetExpression__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__LetExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5111:1: rule__LetExpression__Group__0__Impl : ( 'let' ) ;
+    // InternalExport.g:5111:1: rule__LetExpression__Group__0__Impl : ( 'let' ) ;
     public final void rule__LetExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5115:1: ( ( 'let' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5116:1: ( 'let' )
+            // InternalExport.g:5115:1: ( ( 'let' ) )
+            // InternalExport.g:5116:1: ( 'let' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5116:1: ( 'let' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5117:1: 'let'
+            // InternalExport.g:5116:1: ( 'let' )
+            // InternalExport.g:5117:1: 'let'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLetExpressionAccess().getLetKeyword_0()); 
             }
-            match(input,58,FOLLOW_58_in_rule__LetExpression__Group__0__Impl10518); if (state.failed) return ;
+            match(input,58,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getLetExpressionAccess().getLetKeyword_0()); 
             }
@@ -15231,21 +15231,21 @@ public final void rule__LetExpression__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__LetExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5130:1: rule__LetExpression__Group__1 : rule__LetExpression__Group__1__Impl rule__LetExpression__Group__2 ;
+    // InternalExport.g:5130:1: rule__LetExpression__Group__1 : rule__LetExpression__Group__1__Impl rule__LetExpression__Group__2 ;
     public final void rule__LetExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5134:1: ( rule__LetExpression__Group__1__Impl rule__LetExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5135:2: rule__LetExpression__Group__1__Impl rule__LetExpression__Group__2
+            // InternalExport.g:5134:1: ( rule__LetExpression__Group__1__Impl rule__LetExpression__Group__2 )
+            // InternalExport.g:5135:2: rule__LetExpression__Group__1__Impl rule__LetExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__LetExpression__Group__1__Impl_in_rule__LetExpression__Group__110549);
+            pushFollow(FOLLOW_32);
             rule__LetExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__LetExpression__Group__2_in_rule__LetExpression__Group__110552);
+            pushFollow(FOLLOW_2);
             rule__LetExpression__Group__2();
 
             state._fsp--;
@@ -15269,25 +15269,25 @@ public final void rule__LetExpression__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__LetExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5142:1: rule__LetExpression__Group__1__Impl : ( ( rule__LetExpression__IdentifierAssignment_1 ) ) ;
+    // InternalExport.g:5142:1: rule__LetExpression__Group__1__Impl : ( ( rule__LetExpression__IdentifierAssignment_1 ) ) ;
     public final void rule__LetExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5146:1: ( ( ( rule__LetExpression__IdentifierAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5147:1: ( ( rule__LetExpression__IdentifierAssignment_1 ) )
+            // InternalExport.g:5146:1: ( ( ( rule__LetExpression__IdentifierAssignment_1 ) ) )
+            // InternalExport.g:5147:1: ( ( rule__LetExpression__IdentifierAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5147:1: ( ( rule__LetExpression__IdentifierAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5148:1: ( rule__LetExpression__IdentifierAssignment_1 )
+            // InternalExport.g:5147:1: ( ( rule__LetExpression__IdentifierAssignment_1 ) )
+            // InternalExport.g:5148:1: ( rule__LetExpression__IdentifierAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLetExpressionAccess().getIdentifierAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5149:1: ( rule__LetExpression__IdentifierAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5149:2: rule__LetExpression__IdentifierAssignment_1
+            // InternalExport.g:5149:1: ( rule__LetExpression__IdentifierAssignment_1 )
+            // InternalExport.g:5149:2: rule__LetExpression__IdentifierAssignment_1
             {
-            pushFollow(FOLLOW_rule__LetExpression__IdentifierAssignment_1_in_rule__LetExpression__Group__1__Impl10579);
+            pushFollow(FOLLOW_2);
             rule__LetExpression__IdentifierAssignment_1();
 
             state._fsp--;
@@ -15320,21 +15320,21 @@ public final void rule__LetExpression__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__LetExpression__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5159:1: rule__LetExpression__Group__2 : rule__LetExpression__Group__2__Impl rule__LetExpression__Group__3 ;
+    // InternalExport.g:5159:1: rule__LetExpression__Group__2 : rule__LetExpression__Group__2__Impl rule__LetExpression__Group__3 ;
     public final void rule__LetExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5163:1: ( rule__LetExpression__Group__2__Impl rule__LetExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5164:2: rule__LetExpression__Group__2__Impl rule__LetExpression__Group__3
+            // InternalExport.g:5163:1: ( rule__LetExpression__Group__2__Impl rule__LetExpression__Group__3 )
+            // InternalExport.g:5164:2: rule__LetExpression__Group__2__Impl rule__LetExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__LetExpression__Group__2__Impl_in_rule__LetExpression__Group__210609);
+            pushFollow(FOLLOW_18);
             rule__LetExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__LetExpression__Group__3_in_rule__LetExpression__Group__210612);
+            pushFollow(FOLLOW_2);
             rule__LetExpression__Group__3();
 
             state._fsp--;
@@ -15358,22 +15358,22 @@ public final void rule__LetExpression__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__LetExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5171:1: rule__LetExpression__Group__2__Impl : ( '=' ) ;
+    // InternalExport.g:5171:1: rule__LetExpression__Group__2__Impl : ( '=' ) ;
     public final void rule__LetExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5175:1: ( ( '=' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5176:1: ( '=' )
+            // InternalExport.g:5175:1: ( ( '=' ) )
+            // InternalExport.g:5176:1: ( '=' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5176:1: ( '=' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5177:1: '='
+            // InternalExport.g:5176:1: ( '=' )
+            // InternalExport.g:5177:1: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLetExpressionAccess().getEqualsSignKeyword_2()); 
             }
-            match(input,47,FOLLOW_47_in_rule__LetExpression__Group__2__Impl10640); if (state.failed) return ;
+            match(input,47,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getLetExpressionAccess().getEqualsSignKeyword_2()); 
             }
@@ -15399,21 +15399,21 @@ public final void rule__LetExpression__Group__2__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__LetExpression__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5190:1: rule__LetExpression__Group__3 : rule__LetExpression__Group__3__Impl rule__LetExpression__Group__4 ;
+    // InternalExport.g:5190:1: rule__LetExpression__Group__3 : rule__LetExpression__Group__3__Impl rule__LetExpression__Group__4 ;
     public final void rule__LetExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5194:1: ( rule__LetExpression__Group__3__Impl rule__LetExpression__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5195:2: rule__LetExpression__Group__3__Impl rule__LetExpression__Group__4
+            // InternalExport.g:5194:1: ( rule__LetExpression__Group__3__Impl rule__LetExpression__Group__4 )
+            // InternalExport.g:5195:2: rule__LetExpression__Group__3__Impl rule__LetExpression__Group__4
             {
-            pushFollow(FOLLOW_rule__LetExpression__Group__3__Impl_in_rule__LetExpression__Group__310671);
+            pushFollow(FOLLOW_39);
             rule__LetExpression__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__LetExpression__Group__4_in_rule__LetExpression__Group__310674);
+            pushFollow(FOLLOW_2);
             rule__LetExpression__Group__4();
 
             state._fsp--;
@@ -15437,25 +15437,25 @@ public final void rule__LetExpression__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__LetExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5202:1: rule__LetExpression__Group__3__Impl : ( ( rule__LetExpression__VarExprAssignment_3 ) ) ;
+    // InternalExport.g:5202:1: rule__LetExpression__Group__3__Impl : ( ( rule__LetExpression__VarExprAssignment_3 ) ) ;
     public final void rule__LetExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5206:1: ( ( ( rule__LetExpression__VarExprAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5207:1: ( ( rule__LetExpression__VarExprAssignment_3 ) )
+            // InternalExport.g:5206:1: ( ( ( rule__LetExpression__VarExprAssignment_3 ) ) )
+            // InternalExport.g:5207:1: ( ( rule__LetExpression__VarExprAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5207:1: ( ( rule__LetExpression__VarExprAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5208:1: ( rule__LetExpression__VarExprAssignment_3 )
+            // InternalExport.g:5207:1: ( ( rule__LetExpression__VarExprAssignment_3 ) )
+            // InternalExport.g:5208:1: ( rule__LetExpression__VarExprAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLetExpressionAccess().getVarExprAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5209:1: ( rule__LetExpression__VarExprAssignment_3 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5209:2: rule__LetExpression__VarExprAssignment_3
+            // InternalExport.g:5209:1: ( rule__LetExpression__VarExprAssignment_3 )
+            // InternalExport.g:5209:2: rule__LetExpression__VarExprAssignment_3
             {
-            pushFollow(FOLLOW_rule__LetExpression__VarExprAssignment_3_in_rule__LetExpression__Group__3__Impl10701);
+            pushFollow(FOLLOW_2);
             rule__LetExpression__VarExprAssignment_3();
 
             state._fsp--;
@@ -15488,21 +15488,21 @@ public final void rule__LetExpression__Group__3__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__LetExpression__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5219:1: rule__LetExpression__Group__4 : rule__LetExpression__Group__4__Impl rule__LetExpression__Group__5 ;
+    // InternalExport.g:5219:1: rule__LetExpression__Group__4 : rule__LetExpression__Group__4__Impl rule__LetExpression__Group__5 ;
     public final void rule__LetExpression__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5223:1: ( rule__LetExpression__Group__4__Impl rule__LetExpression__Group__5 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5224:2: rule__LetExpression__Group__4__Impl rule__LetExpression__Group__5
+            // InternalExport.g:5223:1: ( rule__LetExpression__Group__4__Impl rule__LetExpression__Group__5 )
+            // InternalExport.g:5224:2: rule__LetExpression__Group__4__Impl rule__LetExpression__Group__5
             {
-            pushFollow(FOLLOW_rule__LetExpression__Group__4__Impl_in_rule__LetExpression__Group__410731);
+            pushFollow(FOLLOW_18);
             rule__LetExpression__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__LetExpression__Group__5_in_rule__LetExpression__Group__410734);
+            pushFollow(FOLLOW_2);
             rule__LetExpression__Group__5();
 
             state._fsp--;
@@ -15526,22 +15526,22 @@ public final void rule__LetExpression__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__LetExpression__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5231:1: rule__LetExpression__Group__4__Impl : ( ':' ) ;
+    // InternalExport.g:5231:1: rule__LetExpression__Group__4__Impl : ( ':' ) ;
     public final void rule__LetExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5235:1: ( ( ':' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5236:1: ( ':' )
+            // InternalExport.g:5235:1: ( ( ':' ) )
+            // InternalExport.g:5236:1: ( ':' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5236:1: ( ':' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5237:1: ':'
+            // InternalExport.g:5236:1: ( ':' )
+            // InternalExport.g:5237:1: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLetExpressionAccess().getColonKeyword_4()); 
             }
-            match(input,59,FOLLOW_59_in_rule__LetExpression__Group__4__Impl10762); if (state.failed) return ;
+            match(input,59,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getLetExpressionAccess().getColonKeyword_4()); 
             }
@@ -15567,16 +15567,16 @@ public final void rule__LetExpression__Group__4__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__LetExpression__Group__5"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5250:1: rule__LetExpression__Group__5 : rule__LetExpression__Group__5__Impl ;
+    // InternalExport.g:5250:1: rule__LetExpression__Group__5 : rule__LetExpression__Group__5__Impl ;
     public final void rule__LetExpression__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5254:1: ( rule__LetExpression__Group__5__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5255:2: rule__LetExpression__Group__5__Impl
+            // InternalExport.g:5254:1: ( rule__LetExpression__Group__5__Impl )
+            // InternalExport.g:5255:2: rule__LetExpression__Group__5__Impl
             {
-            pushFollow(FOLLOW_rule__LetExpression__Group__5__Impl_in_rule__LetExpression__Group__510793);
+            pushFollow(FOLLOW_2);
             rule__LetExpression__Group__5__Impl();
 
             state._fsp--;
@@ -15600,25 +15600,25 @@ public final void rule__LetExpression__Group__5() throws RecognitionException {
 
 
     // $ANTLR start "rule__LetExpression__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5261:1: rule__LetExpression__Group__5__Impl : ( ( rule__LetExpression__TargetAssignment_5 ) ) ;
+    // InternalExport.g:5261:1: rule__LetExpression__Group__5__Impl : ( ( rule__LetExpression__TargetAssignment_5 ) ) ;
     public final void rule__LetExpression__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5265:1: ( ( ( rule__LetExpression__TargetAssignment_5 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5266:1: ( ( rule__LetExpression__TargetAssignment_5 ) )
+            // InternalExport.g:5265:1: ( ( ( rule__LetExpression__TargetAssignment_5 ) ) )
+            // InternalExport.g:5266:1: ( ( rule__LetExpression__TargetAssignment_5 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5266:1: ( ( rule__LetExpression__TargetAssignment_5 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5267:1: ( rule__LetExpression__TargetAssignment_5 )
+            // InternalExport.g:5266:1: ( ( rule__LetExpression__TargetAssignment_5 ) )
+            // InternalExport.g:5267:1: ( rule__LetExpression__TargetAssignment_5 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLetExpressionAccess().getTargetAssignment_5()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5268:1: ( rule__LetExpression__TargetAssignment_5 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5268:2: rule__LetExpression__TargetAssignment_5
+            // InternalExport.g:5268:1: ( rule__LetExpression__TargetAssignment_5 )
+            // InternalExport.g:5268:2: rule__LetExpression__TargetAssignment_5
             {
-            pushFollow(FOLLOW_rule__LetExpression__TargetAssignment_5_in_rule__LetExpression__Group__5__Impl10820);
+            pushFollow(FOLLOW_2);
             rule__LetExpression__TargetAssignment_5();
 
             state._fsp--;
@@ -15651,21 +15651,21 @@ public final void rule__LetExpression__Group__5__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__CastedExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5290:1: rule__CastedExpression__Group__0 : rule__CastedExpression__Group__0__Impl rule__CastedExpression__Group__1 ;
+    // InternalExport.g:5290:1: rule__CastedExpression__Group__0 : rule__CastedExpression__Group__0__Impl rule__CastedExpression__Group__1 ;
     public final void rule__CastedExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5294:1: ( rule__CastedExpression__Group__0__Impl rule__CastedExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5295:2: rule__CastedExpression__Group__0__Impl rule__CastedExpression__Group__1
+            // InternalExport.g:5294:1: ( rule__CastedExpression__Group__0__Impl rule__CastedExpression__Group__1 )
+            // InternalExport.g:5295:2: rule__CastedExpression__Group__0__Impl rule__CastedExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__CastedExpression__Group__0__Impl_in_rule__CastedExpression__Group__010862);
+            pushFollow(FOLLOW_40);
             rule__CastedExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CastedExpression__Group__1_in_rule__CastedExpression__Group__010865);
+            pushFollow(FOLLOW_2);
             rule__CastedExpression__Group__1();
 
             state._fsp--;
@@ -15689,22 +15689,22 @@ public final void rule__CastedExpression__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__CastedExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5302:1: rule__CastedExpression__Group__0__Impl : ( '(' ) ;
+    // InternalExport.g:5302:1: rule__CastedExpression__Group__0__Impl : ( '(' ) ;
     public final void rule__CastedExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5306:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5307:1: ( '(' )
+            // InternalExport.g:5306:1: ( ( '(' ) )
+            // InternalExport.g:5307:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5307:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5308:1: '('
+            // InternalExport.g:5307:1: ( '(' )
+            // InternalExport.g:5308:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCastedExpressionAccess().getLeftParenthesisKeyword_0()); 
             }
-            match(input,51,FOLLOW_51_in_rule__CastedExpression__Group__0__Impl10893); if (state.failed) return ;
+            match(input,51,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCastedExpressionAccess().getLeftParenthesisKeyword_0()); 
             }
@@ -15730,21 +15730,21 @@ public final void rule__CastedExpression__Group__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__CastedExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5321:1: rule__CastedExpression__Group__1 : rule__CastedExpression__Group__1__Impl rule__CastedExpression__Group__2 ;
+    // InternalExport.g:5321:1: rule__CastedExpression__Group__1 : rule__CastedExpression__Group__1__Impl rule__CastedExpression__Group__2 ;
     public final void rule__CastedExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5325:1: ( rule__CastedExpression__Group__1__Impl rule__CastedExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5326:2: rule__CastedExpression__Group__1__Impl rule__CastedExpression__Group__2
+            // InternalExport.g:5325:1: ( rule__CastedExpression__Group__1__Impl rule__CastedExpression__Group__2 )
+            // InternalExport.g:5326:2: rule__CastedExpression__Group__1__Impl rule__CastedExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__CastedExpression__Group__1__Impl_in_rule__CastedExpression__Group__110924);
+            pushFollow(FOLLOW_25);
             rule__CastedExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CastedExpression__Group__2_in_rule__CastedExpression__Group__110927);
+            pushFollow(FOLLOW_2);
             rule__CastedExpression__Group__2();
 
             state._fsp--;
@@ -15768,25 +15768,25 @@ public final void rule__CastedExpression__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__CastedExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5333:1: rule__CastedExpression__Group__1__Impl : ( ( rule__CastedExpression__TypeAssignment_1 ) ) ;
+    // InternalExport.g:5333:1: rule__CastedExpression__Group__1__Impl : ( ( rule__CastedExpression__TypeAssignment_1 ) ) ;
     public final void rule__CastedExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5337:1: ( ( ( rule__CastedExpression__TypeAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5338:1: ( ( rule__CastedExpression__TypeAssignment_1 ) )
+            // InternalExport.g:5337:1: ( ( ( rule__CastedExpression__TypeAssignment_1 ) ) )
+            // InternalExport.g:5338:1: ( ( rule__CastedExpression__TypeAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5338:1: ( ( rule__CastedExpression__TypeAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5339:1: ( rule__CastedExpression__TypeAssignment_1 )
+            // InternalExport.g:5338:1: ( ( rule__CastedExpression__TypeAssignment_1 ) )
+            // InternalExport.g:5339:1: ( rule__CastedExpression__TypeAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCastedExpressionAccess().getTypeAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5340:1: ( rule__CastedExpression__TypeAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5340:2: rule__CastedExpression__TypeAssignment_1
+            // InternalExport.g:5340:1: ( rule__CastedExpression__TypeAssignment_1 )
+            // InternalExport.g:5340:2: rule__CastedExpression__TypeAssignment_1
             {
-            pushFollow(FOLLOW_rule__CastedExpression__TypeAssignment_1_in_rule__CastedExpression__Group__1__Impl10954);
+            pushFollow(FOLLOW_2);
             rule__CastedExpression__TypeAssignment_1();
 
             state._fsp--;
@@ -15819,21 +15819,21 @@ public final void rule__CastedExpression__Group__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__CastedExpression__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5350:1: rule__CastedExpression__Group__2 : rule__CastedExpression__Group__2__Impl rule__CastedExpression__Group__3 ;
+    // InternalExport.g:5350:1: rule__CastedExpression__Group__2 : rule__CastedExpression__Group__2__Impl rule__CastedExpression__Group__3 ;
     public final void rule__CastedExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5354:1: ( rule__CastedExpression__Group__2__Impl rule__CastedExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5355:2: rule__CastedExpression__Group__2__Impl rule__CastedExpression__Group__3
+            // InternalExport.g:5354:1: ( rule__CastedExpression__Group__2__Impl rule__CastedExpression__Group__3 )
+            // InternalExport.g:5355:2: rule__CastedExpression__Group__2__Impl rule__CastedExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__CastedExpression__Group__2__Impl_in_rule__CastedExpression__Group__210984);
+            pushFollow(FOLLOW_18);
             rule__CastedExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CastedExpression__Group__3_in_rule__CastedExpression__Group__210987);
+            pushFollow(FOLLOW_2);
             rule__CastedExpression__Group__3();
 
             state._fsp--;
@@ -15857,22 +15857,22 @@ public final void rule__CastedExpression__Group__2() throws RecognitionException
 
 
     // $ANTLR start "rule__CastedExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5362:1: rule__CastedExpression__Group__2__Impl : ( ')' ) ;
+    // InternalExport.g:5362:1: rule__CastedExpression__Group__2__Impl : ( ')' ) ;
     public final void rule__CastedExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5366:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5367:1: ( ')' )
+            // InternalExport.g:5366:1: ( ( ')' ) )
+            // InternalExport.g:5367:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5367:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5368:1: ')'
+            // InternalExport.g:5367:1: ( ')' )
+            // InternalExport.g:5368:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCastedExpressionAccess().getRightParenthesisKeyword_2()); 
             }
-            match(input,52,FOLLOW_52_in_rule__CastedExpression__Group__2__Impl11015); if (state.failed) return ;
+            match(input,52,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCastedExpressionAccess().getRightParenthesisKeyword_2()); 
             }
@@ -15898,16 +15898,16 @@ public final void rule__CastedExpression__Group__2__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__CastedExpression__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5381:1: rule__CastedExpression__Group__3 : rule__CastedExpression__Group__3__Impl ;
+    // InternalExport.g:5381:1: rule__CastedExpression__Group__3 : rule__CastedExpression__Group__3__Impl ;
     public final void rule__CastedExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5385:1: ( rule__CastedExpression__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5386:2: rule__CastedExpression__Group__3__Impl
+            // InternalExport.g:5385:1: ( rule__CastedExpression__Group__3__Impl )
+            // InternalExport.g:5386:2: rule__CastedExpression__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__CastedExpression__Group__3__Impl_in_rule__CastedExpression__Group__311046);
+            pushFollow(FOLLOW_2);
             rule__CastedExpression__Group__3__Impl();
 
             state._fsp--;
@@ -15931,25 +15931,25 @@ public final void rule__CastedExpression__Group__3() throws RecognitionException
 
 
     // $ANTLR start "rule__CastedExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5392:1: rule__CastedExpression__Group__3__Impl : ( ( rule__CastedExpression__TargetAssignment_3 ) ) ;
+    // InternalExport.g:5392:1: rule__CastedExpression__Group__3__Impl : ( ( rule__CastedExpression__TargetAssignment_3 ) ) ;
     public final void rule__CastedExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5396:1: ( ( ( rule__CastedExpression__TargetAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5397:1: ( ( rule__CastedExpression__TargetAssignment_3 ) )
+            // InternalExport.g:5396:1: ( ( ( rule__CastedExpression__TargetAssignment_3 ) ) )
+            // InternalExport.g:5397:1: ( ( rule__CastedExpression__TargetAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5397:1: ( ( rule__CastedExpression__TargetAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5398:1: ( rule__CastedExpression__TargetAssignment_3 )
+            // InternalExport.g:5397:1: ( ( rule__CastedExpression__TargetAssignment_3 ) )
+            // InternalExport.g:5398:1: ( rule__CastedExpression__TargetAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCastedExpressionAccess().getTargetAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5399:1: ( rule__CastedExpression__TargetAssignment_3 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5399:2: rule__CastedExpression__TargetAssignment_3
+            // InternalExport.g:5399:1: ( rule__CastedExpression__TargetAssignment_3 )
+            // InternalExport.g:5399:2: rule__CastedExpression__TargetAssignment_3
             {
-            pushFollow(FOLLOW_rule__CastedExpression__TargetAssignment_3_in_rule__CastedExpression__Group__3__Impl11073);
+            pushFollow(FOLLOW_2);
             rule__CastedExpression__TargetAssignment_3();
 
             state._fsp--;
@@ -15982,21 +15982,21 @@ public final void rule__CastedExpression__Group__3__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__ChainExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5417:1: rule__ChainExpression__Group__0 : rule__ChainExpression__Group__0__Impl rule__ChainExpression__Group__1 ;
+    // InternalExport.g:5417:1: rule__ChainExpression__Group__0 : rule__ChainExpression__Group__0__Impl rule__ChainExpression__Group__1 ;
     public final void rule__ChainExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5421:1: ( rule__ChainExpression__Group__0__Impl rule__ChainExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5422:2: rule__ChainExpression__Group__0__Impl rule__ChainExpression__Group__1
+            // InternalExport.g:5421:1: ( rule__ChainExpression__Group__0__Impl rule__ChainExpression__Group__1 )
+            // InternalExport.g:5422:2: rule__ChainExpression__Group__0__Impl rule__ChainExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__ChainExpression__Group__0__Impl_in_rule__ChainExpression__Group__011111);
+            pushFollow(FOLLOW_41);
             rule__ChainExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ChainExpression__Group__1_in_rule__ChainExpression__Group__011114);
+            pushFollow(FOLLOW_2);
             rule__ChainExpression__Group__1();
 
             state._fsp--;
@@ -16020,22 +16020,22 @@ public final void rule__ChainExpression__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__ChainExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5429:1: rule__ChainExpression__Group__0__Impl : ( ruleChainedExpression ) ;
+    // InternalExport.g:5429:1: rule__ChainExpression__Group__0__Impl : ( ruleChainedExpression ) ;
     public final void rule__ChainExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5433:1: ( ( ruleChainedExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5434:1: ( ruleChainedExpression )
+            // InternalExport.g:5433:1: ( ( ruleChainedExpression ) )
+            // InternalExport.g:5434:1: ( ruleChainedExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5434:1: ( ruleChainedExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5435:1: ruleChainedExpression
+            // InternalExport.g:5434:1: ( ruleChainedExpression )
+            // InternalExport.g:5435:1: ruleChainedExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getChainExpressionAccess().getChainedExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleChainedExpression_in_rule__ChainExpression__Group__0__Impl11141);
+            pushFollow(FOLLOW_2);
             ruleChainedExpression();
 
             state._fsp--;
@@ -16065,16 +16065,16 @@ public final void rule__ChainExpression__Group__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__ChainExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5446:1: rule__ChainExpression__Group__1 : rule__ChainExpression__Group__1__Impl ;
+    // InternalExport.g:5446:1: rule__ChainExpression__Group__1 : rule__ChainExpression__Group__1__Impl ;
     public final void rule__ChainExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5450:1: ( rule__ChainExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5451:2: rule__ChainExpression__Group__1__Impl
+            // InternalExport.g:5450:1: ( rule__ChainExpression__Group__1__Impl )
+            // InternalExport.g:5451:2: rule__ChainExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__ChainExpression__Group__1__Impl_in_rule__ChainExpression__Group__111170);
+            pushFollow(FOLLOW_2);
             rule__ChainExpression__Group__1__Impl();
 
             state._fsp--;
@@ -16098,22 +16098,22 @@ public final void rule__ChainExpression__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__ChainExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5457:1: rule__ChainExpression__Group__1__Impl : ( ( rule__ChainExpression__Group_1__0 )* ) ;
+    // InternalExport.g:5457:1: rule__ChainExpression__Group__1__Impl : ( ( rule__ChainExpression__Group_1__0 )* ) ;
     public final void rule__ChainExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5461:1: ( ( ( rule__ChainExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5462:1: ( ( rule__ChainExpression__Group_1__0 )* )
+            // InternalExport.g:5461:1: ( ( ( rule__ChainExpression__Group_1__0 )* ) )
+            // InternalExport.g:5462:1: ( ( rule__ChainExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5462:1: ( ( rule__ChainExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5463:1: ( rule__ChainExpression__Group_1__0 )*
+            // InternalExport.g:5462:1: ( ( rule__ChainExpression__Group_1__0 )* )
+            // InternalExport.g:5463:1: ( rule__ChainExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getChainExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5464:1: ( rule__ChainExpression__Group_1__0 )*
+            // InternalExport.g:5464:1: ( rule__ChainExpression__Group_1__0 )*
             loop47:
             do {
                 int alt47=2;
@@ -16126,9 +16126,9 @@ public final void rule__ChainExpression__Group__1__Impl() throws RecognitionExce
 
                 switch (alt47) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5464:2: rule__ChainExpression__Group_1__0
+            	    // InternalExport.g:5464:2: rule__ChainExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__ChainExpression__Group_1__0_in_rule__ChainExpression__Group__1__Impl11197);
+            	    pushFollow(FOLLOW_42);
             	    rule__ChainExpression__Group_1__0();
 
             	    state._fsp--;
@@ -16167,21 +16167,21 @@ public final void rule__ChainExpression__Group__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__ChainExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5478:1: rule__ChainExpression__Group_1__0 : rule__ChainExpression__Group_1__0__Impl rule__ChainExpression__Group_1__1 ;
+    // InternalExport.g:5478:1: rule__ChainExpression__Group_1__0 : rule__ChainExpression__Group_1__0__Impl rule__ChainExpression__Group_1__1 ;
     public final void rule__ChainExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5482:1: ( rule__ChainExpression__Group_1__0__Impl rule__ChainExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5483:2: rule__ChainExpression__Group_1__0__Impl rule__ChainExpression__Group_1__1
+            // InternalExport.g:5482:1: ( rule__ChainExpression__Group_1__0__Impl rule__ChainExpression__Group_1__1 )
+            // InternalExport.g:5483:2: rule__ChainExpression__Group_1__0__Impl rule__ChainExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__ChainExpression__Group_1__0__Impl_in_rule__ChainExpression__Group_1__011232);
+            pushFollow(FOLLOW_41);
             rule__ChainExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ChainExpression__Group_1__1_in_rule__ChainExpression__Group_1__011235);
+            pushFollow(FOLLOW_2);
             rule__ChainExpression__Group_1__1();
 
             state._fsp--;
@@ -16205,23 +16205,23 @@ public final void rule__ChainExpression__Group_1__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ChainExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5490:1: rule__ChainExpression__Group_1__0__Impl : ( () ) ;
+    // InternalExport.g:5490:1: rule__ChainExpression__Group_1__0__Impl : ( () ) ;
     public final void rule__ChainExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5494:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5495:1: ( () )
+            // InternalExport.g:5494:1: ( ( () ) )
+            // InternalExport.g:5495:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5495:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5496:1: ()
+            // InternalExport.g:5495:1: ( () )
+            // InternalExport.g:5496:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getChainExpressionAccess().getChainExpressionFirstAction_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5497:1: ()
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5499:1: 
+            // InternalExport.g:5497:1: ()
+            // InternalExport.g:5499:1: 
             {
             }
 
@@ -16246,21 +16246,21 @@ public final void rule__ChainExpression__Group_1__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__ChainExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5509:1: rule__ChainExpression__Group_1__1 : rule__ChainExpression__Group_1__1__Impl rule__ChainExpression__Group_1__2 ;
+    // InternalExport.g:5509:1: rule__ChainExpression__Group_1__1 : rule__ChainExpression__Group_1__1__Impl rule__ChainExpression__Group_1__2 ;
     public final void rule__ChainExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5513:1: ( rule__ChainExpression__Group_1__1__Impl rule__ChainExpression__Group_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5514:2: rule__ChainExpression__Group_1__1__Impl rule__ChainExpression__Group_1__2
+            // InternalExport.g:5513:1: ( rule__ChainExpression__Group_1__1__Impl rule__ChainExpression__Group_1__2 )
+            // InternalExport.g:5514:2: rule__ChainExpression__Group_1__1__Impl rule__ChainExpression__Group_1__2
             {
-            pushFollow(FOLLOW_rule__ChainExpression__Group_1__1__Impl_in_rule__ChainExpression__Group_1__111293);
+            pushFollow(FOLLOW_18);
             rule__ChainExpression__Group_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ChainExpression__Group_1__2_in_rule__ChainExpression__Group_1__111296);
+            pushFollow(FOLLOW_2);
             rule__ChainExpression__Group_1__2();
 
             state._fsp--;
@@ -16284,22 +16284,22 @@ public final void rule__ChainExpression__Group_1__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ChainExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5521:1: rule__ChainExpression__Group_1__1__Impl : ( '->' ) ;
+    // InternalExport.g:5521:1: rule__ChainExpression__Group_1__1__Impl : ( '->' ) ;
     public final void rule__ChainExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5525:1: ( ( '->' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5526:1: ( '->' )
+            // InternalExport.g:5525:1: ( ( '->' ) )
+            // InternalExport.g:5526:1: ( '->' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5526:1: ( '->' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5527:1: '->'
+            // InternalExport.g:5526:1: ( '->' )
+            // InternalExport.g:5527:1: '->'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getChainExpressionAccess().getHyphenMinusGreaterThanSignKeyword_1_1()); 
             }
-            match(input,60,FOLLOW_60_in_rule__ChainExpression__Group_1__1__Impl11324); if (state.failed) return ;
+            match(input,60,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getChainExpressionAccess().getHyphenMinusGreaterThanSignKeyword_1_1()); 
             }
@@ -16325,16 +16325,16 @@ public final void rule__ChainExpression__Group_1__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__ChainExpression__Group_1__2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5540:1: rule__ChainExpression__Group_1__2 : rule__ChainExpression__Group_1__2__Impl ;
+    // InternalExport.g:5540:1: rule__ChainExpression__Group_1__2 : rule__ChainExpression__Group_1__2__Impl ;
     public final void rule__ChainExpression__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5544:1: ( rule__ChainExpression__Group_1__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5545:2: rule__ChainExpression__Group_1__2__Impl
+            // InternalExport.g:5544:1: ( rule__ChainExpression__Group_1__2__Impl )
+            // InternalExport.g:5545:2: rule__ChainExpression__Group_1__2__Impl
             {
-            pushFollow(FOLLOW_rule__ChainExpression__Group_1__2__Impl_in_rule__ChainExpression__Group_1__211355);
+            pushFollow(FOLLOW_2);
             rule__ChainExpression__Group_1__2__Impl();
 
             state._fsp--;
@@ -16358,25 +16358,25 @@ public final void rule__ChainExpression__Group_1__2() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ChainExpression__Group_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5551:1: rule__ChainExpression__Group_1__2__Impl : ( ( rule__ChainExpression__NextAssignment_1_2 ) ) ;
+    // InternalExport.g:5551:1: rule__ChainExpression__Group_1__2__Impl : ( ( rule__ChainExpression__NextAssignment_1_2 ) ) ;
     public final void rule__ChainExpression__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5555:1: ( ( ( rule__ChainExpression__NextAssignment_1_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5556:1: ( ( rule__ChainExpression__NextAssignment_1_2 ) )
+            // InternalExport.g:5555:1: ( ( ( rule__ChainExpression__NextAssignment_1_2 ) ) )
+            // InternalExport.g:5556:1: ( ( rule__ChainExpression__NextAssignment_1_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5556:1: ( ( rule__ChainExpression__NextAssignment_1_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5557:1: ( rule__ChainExpression__NextAssignment_1_2 )
+            // InternalExport.g:5556:1: ( ( rule__ChainExpression__NextAssignment_1_2 ) )
+            // InternalExport.g:5557:1: ( rule__ChainExpression__NextAssignment_1_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getChainExpressionAccess().getNextAssignment_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5558:1: ( rule__ChainExpression__NextAssignment_1_2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5558:2: rule__ChainExpression__NextAssignment_1_2
+            // InternalExport.g:5558:1: ( rule__ChainExpression__NextAssignment_1_2 )
+            // InternalExport.g:5558:2: rule__ChainExpression__NextAssignment_1_2
             {
-            pushFollow(FOLLOW_rule__ChainExpression__NextAssignment_1_2_in_rule__ChainExpression__Group_1__2__Impl11382);
+            pushFollow(FOLLOW_2);
             rule__ChainExpression__NextAssignment_1_2();
 
             state._fsp--;
@@ -16409,21 +16409,21 @@ public final void rule__ChainExpression__Group_1__2__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__IfExpressionTri__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5574:1: rule__IfExpressionTri__Group__0 : rule__IfExpressionTri__Group__0__Impl rule__IfExpressionTri__Group__1 ;
+    // InternalExport.g:5574:1: rule__IfExpressionTri__Group__0 : rule__IfExpressionTri__Group__0__Impl rule__IfExpressionTri__Group__1 ;
     public final void rule__IfExpressionTri__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5578:1: ( rule__IfExpressionTri__Group__0__Impl rule__IfExpressionTri__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5579:2: rule__IfExpressionTri__Group__0__Impl rule__IfExpressionTri__Group__1
+            // InternalExport.g:5578:1: ( rule__IfExpressionTri__Group__0__Impl rule__IfExpressionTri__Group__1 )
+            // InternalExport.g:5579:2: rule__IfExpressionTri__Group__0__Impl rule__IfExpressionTri__Group__1
             {
-            pushFollow(FOLLOW_rule__IfExpressionTri__Group__0__Impl_in_rule__IfExpressionTri__Group__011418);
+            pushFollow(FOLLOW_43);
             rule__IfExpressionTri__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__IfExpressionTri__Group__1_in_rule__IfExpressionTri__Group__011421);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionTri__Group__1();
 
             state._fsp--;
@@ -16447,22 +16447,22 @@ public final void rule__IfExpressionTri__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__IfExpressionTri__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5586:1: rule__IfExpressionTri__Group__0__Impl : ( ruleOrExpression ) ;
+    // InternalExport.g:5586:1: rule__IfExpressionTri__Group__0__Impl : ( ruleOrExpression ) ;
     public final void rule__IfExpressionTri__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5590:1: ( ( ruleOrExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5591:1: ( ruleOrExpression )
+            // InternalExport.g:5590:1: ( ( ruleOrExpression ) )
+            // InternalExport.g:5591:1: ( ruleOrExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5591:1: ( ruleOrExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5592:1: ruleOrExpression
+            // InternalExport.g:5591:1: ( ruleOrExpression )
+            // InternalExport.g:5592:1: ruleOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionTriAccess().getOrExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleOrExpression_in_rule__IfExpressionTri__Group__0__Impl11448);
+            pushFollow(FOLLOW_2);
             ruleOrExpression();
 
             state._fsp--;
@@ -16492,16 +16492,16 @@ public final void rule__IfExpressionTri__Group__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__IfExpressionTri__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5603:1: rule__IfExpressionTri__Group__1 : rule__IfExpressionTri__Group__1__Impl ;
+    // InternalExport.g:5603:1: rule__IfExpressionTri__Group__1 : rule__IfExpressionTri__Group__1__Impl ;
     public final void rule__IfExpressionTri__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5607:1: ( rule__IfExpressionTri__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5608:2: rule__IfExpressionTri__Group__1__Impl
+            // InternalExport.g:5607:1: ( rule__IfExpressionTri__Group__1__Impl )
+            // InternalExport.g:5608:2: rule__IfExpressionTri__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__IfExpressionTri__Group__1__Impl_in_rule__IfExpressionTri__Group__111477);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionTri__Group__1__Impl();
 
             state._fsp--;
@@ -16525,22 +16525,22 @@ public final void rule__IfExpressionTri__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__IfExpressionTri__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5614:1: rule__IfExpressionTri__Group__1__Impl : ( ( rule__IfExpressionTri__Group_1__0 )? ) ;
+    // InternalExport.g:5614:1: rule__IfExpressionTri__Group__1__Impl : ( ( rule__IfExpressionTri__Group_1__0 )? ) ;
     public final void rule__IfExpressionTri__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5618:1: ( ( ( rule__IfExpressionTri__Group_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5619:1: ( ( rule__IfExpressionTri__Group_1__0 )? )
+            // InternalExport.g:5618:1: ( ( ( rule__IfExpressionTri__Group_1__0 )? ) )
+            // InternalExport.g:5619:1: ( ( rule__IfExpressionTri__Group_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5619:1: ( ( rule__IfExpressionTri__Group_1__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5620:1: ( rule__IfExpressionTri__Group_1__0 )?
+            // InternalExport.g:5619:1: ( ( rule__IfExpressionTri__Group_1__0 )? )
+            // InternalExport.g:5620:1: ( rule__IfExpressionTri__Group_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionTriAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5621:1: ( rule__IfExpressionTri__Group_1__0 )?
+            // InternalExport.g:5621:1: ( rule__IfExpressionTri__Group_1__0 )?
             int alt48=2;
             int LA48_0 = input.LA(1);
 
@@ -16549,9 +16549,9 @@ public final void rule__IfExpressionTri__Group__1__Impl() throws RecognitionExce
             }
             switch (alt48) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5621:2: rule__IfExpressionTri__Group_1__0
+                    // InternalExport.g:5621:2: rule__IfExpressionTri__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__IfExpressionTri__Group_1__0_in_rule__IfExpressionTri__Group__1__Impl11504);
+                    pushFollow(FOLLOW_2);
                     rule__IfExpressionTri__Group_1__0();
 
                     state._fsp--;
@@ -16587,21 +16587,21 @@ public final void rule__IfExpressionTri__Group__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__IfExpressionTri__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5635:1: rule__IfExpressionTri__Group_1__0 : rule__IfExpressionTri__Group_1__0__Impl rule__IfExpressionTri__Group_1__1 ;
+    // InternalExport.g:5635:1: rule__IfExpressionTri__Group_1__0 : rule__IfExpressionTri__Group_1__0__Impl rule__IfExpressionTri__Group_1__1 ;
     public final void rule__IfExpressionTri__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5639:1: ( rule__IfExpressionTri__Group_1__0__Impl rule__IfExpressionTri__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5640:2: rule__IfExpressionTri__Group_1__0__Impl rule__IfExpressionTri__Group_1__1
+            // InternalExport.g:5639:1: ( rule__IfExpressionTri__Group_1__0__Impl rule__IfExpressionTri__Group_1__1 )
+            // InternalExport.g:5640:2: rule__IfExpressionTri__Group_1__0__Impl rule__IfExpressionTri__Group_1__1
             {
-            pushFollow(FOLLOW_rule__IfExpressionTri__Group_1__0__Impl_in_rule__IfExpressionTri__Group_1__011539);
+            pushFollow(FOLLOW_43);
             rule__IfExpressionTri__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__IfExpressionTri__Group_1__1_in_rule__IfExpressionTri__Group_1__011542);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionTri__Group_1__1();
 
             state._fsp--;
@@ -16625,23 +16625,23 @@ public final void rule__IfExpressionTri__Group_1__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__IfExpressionTri__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5647:1: rule__IfExpressionTri__Group_1__0__Impl : ( () ) ;
+    // InternalExport.g:5647:1: rule__IfExpressionTri__Group_1__0__Impl : ( () ) ;
     public final void rule__IfExpressionTri__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5651:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5652:1: ( () )
+            // InternalExport.g:5651:1: ( ( () ) )
+            // InternalExport.g:5652:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5652:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5653:1: ()
+            // InternalExport.g:5652:1: ( () )
+            // InternalExport.g:5653:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionTriAccess().getIfExpressionConditionAction_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5654:1: ()
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5656:1: 
+            // InternalExport.g:5654:1: ()
+            // InternalExport.g:5656:1: 
             {
             }
 
@@ -16666,21 +16666,21 @@ public final void rule__IfExpressionTri__Group_1__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__IfExpressionTri__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5666:1: rule__IfExpressionTri__Group_1__1 : rule__IfExpressionTri__Group_1__1__Impl rule__IfExpressionTri__Group_1__2 ;
+    // InternalExport.g:5666:1: rule__IfExpressionTri__Group_1__1 : rule__IfExpressionTri__Group_1__1__Impl rule__IfExpressionTri__Group_1__2 ;
     public final void rule__IfExpressionTri__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5670:1: ( rule__IfExpressionTri__Group_1__1__Impl rule__IfExpressionTri__Group_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5671:2: rule__IfExpressionTri__Group_1__1__Impl rule__IfExpressionTri__Group_1__2
+            // InternalExport.g:5670:1: ( rule__IfExpressionTri__Group_1__1__Impl rule__IfExpressionTri__Group_1__2 )
+            // InternalExport.g:5671:2: rule__IfExpressionTri__Group_1__1__Impl rule__IfExpressionTri__Group_1__2
             {
-            pushFollow(FOLLOW_rule__IfExpressionTri__Group_1__1__Impl_in_rule__IfExpressionTri__Group_1__111600);
+            pushFollow(FOLLOW_18);
             rule__IfExpressionTri__Group_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__IfExpressionTri__Group_1__2_in_rule__IfExpressionTri__Group_1__111603);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionTri__Group_1__2();
 
             state._fsp--;
@@ -16704,22 +16704,22 @@ public final void rule__IfExpressionTri__Group_1__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__IfExpressionTri__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5678:1: rule__IfExpressionTri__Group_1__1__Impl : ( '?' ) ;
+    // InternalExport.g:5678:1: rule__IfExpressionTri__Group_1__1__Impl : ( '?' ) ;
     public final void rule__IfExpressionTri__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5682:1: ( ( '?' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5683:1: ( '?' )
+            // InternalExport.g:5682:1: ( ( '?' ) )
+            // InternalExport.g:5683:1: ( '?' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5683:1: ( '?' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5684:1: '?'
+            // InternalExport.g:5683:1: ( '?' )
+            // InternalExport.g:5684:1: '?'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionTriAccess().getQuestionMarkKeyword_1_1()); 
             }
-            match(input,61,FOLLOW_61_in_rule__IfExpressionTri__Group_1__1__Impl11631); if (state.failed) return ;
+            match(input,61,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIfExpressionTriAccess().getQuestionMarkKeyword_1_1()); 
             }
@@ -16745,21 +16745,21 @@ public final void rule__IfExpressionTri__Group_1__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__IfExpressionTri__Group_1__2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5697:1: rule__IfExpressionTri__Group_1__2 : rule__IfExpressionTri__Group_1__2__Impl rule__IfExpressionTri__Group_1__3 ;
+    // InternalExport.g:5697:1: rule__IfExpressionTri__Group_1__2 : rule__IfExpressionTri__Group_1__2__Impl rule__IfExpressionTri__Group_1__3 ;
     public final void rule__IfExpressionTri__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5701:1: ( rule__IfExpressionTri__Group_1__2__Impl rule__IfExpressionTri__Group_1__3 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5702:2: rule__IfExpressionTri__Group_1__2__Impl rule__IfExpressionTri__Group_1__3
+            // InternalExport.g:5701:1: ( rule__IfExpressionTri__Group_1__2__Impl rule__IfExpressionTri__Group_1__3 )
+            // InternalExport.g:5702:2: rule__IfExpressionTri__Group_1__2__Impl rule__IfExpressionTri__Group_1__3
             {
-            pushFollow(FOLLOW_rule__IfExpressionTri__Group_1__2__Impl_in_rule__IfExpressionTri__Group_1__211662);
+            pushFollow(FOLLOW_39);
             rule__IfExpressionTri__Group_1__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__IfExpressionTri__Group_1__3_in_rule__IfExpressionTri__Group_1__211665);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionTri__Group_1__3();
 
             state._fsp--;
@@ -16783,25 +16783,25 @@ public final void rule__IfExpressionTri__Group_1__2() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__IfExpressionTri__Group_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5709:1: rule__IfExpressionTri__Group_1__2__Impl : ( ( rule__IfExpressionTri__ThenPartAssignment_1_2 ) ) ;
+    // InternalExport.g:5709:1: rule__IfExpressionTri__Group_1__2__Impl : ( ( rule__IfExpressionTri__ThenPartAssignment_1_2 ) ) ;
     public final void rule__IfExpressionTri__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5713:1: ( ( ( rule__IfExpressionTri__ThenPartAssignment_1_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5714:1: ( ( rule__IfExpressionTri__ThenPartAssignment_1_2 ) )
+            // InternalExport.g:5713:1: ( ( ( rule__IfExpressionTri__ThenPartAssignment_1_2 ) ) )
+            // InternalExport.g:5714:1: ( ( rule__IfExpressionTri__ThenPartAssignment_1_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5714:1: ( ( rule__IfExpressionTri__ThenPartAssignment_1_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5715:1: ( rule__IfExpressionTri__ThenPartAssignment_1_2 )
+            // InternalExport.g:5714:1: ( ( rule__IfExpressionTri__ThenPartAssignment_1_2 ) )
+            // InternalExport.g:5715:1: ( rule__IfExpressionTri__ThenPartAssignment_1_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionTriAccess().getThenPartAssignment_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5716:1: ( rule__IfExpressionTri__ThenPartAssignment_1_2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5716:2: rule__IfExpressionTri__ThenPartAssignment_1_2
+            // InternalExport.g:5716:1: ( rule__IfExpressionTri__ThenPartAssignment_1_2 )
+            // InternalExport.g:5716:2: rule__IfExpressionTri__ThenPartAssignment_1_2
             {
-            pushFollow(FOLLOW_rule__IfExpressionTri__ThenPartAssignment_1_2_in_rule__IfExpressionTri__Group_1__2__Impl11692);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionTri__ThenPartAssignment_1_2();
 
             state._fsp--;
@@ -16834,21 +16834,21 @@ public final void rule__IfExpressionTri__Group_1__2__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__IfExpressionTri__Group_1__3"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5726:1: rule__IfExpressionTri__Group_1__3 : rule__IfExpressionTri__Group_1__3__Impl rule__IfExpressionTri__Group_1__4 ;
+    // InternalExport.g:5726:1: rule__IfExpressionTri__Group_1__3 : rule__IfExpressionTri__Group_1__3__Impl rule__IfExpressionTri__Group_1__4 ;
     public final void rule__IfExpressionTri__Group_1__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5730:1: ( rule__IfExpressionTri__Group_1__3__Impl rule__IfExpressionTri__Group_1__4 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5731:2: rule__IfExpressionTri__Group_1__3__Impl rule__IfExpressionTri__Group_1__4
+            // InternalExport.g:5730:1: ( rule__IfExpressionTri__Group_1__3__Impl rule__IfExpressionTri__Group_1__4 )
+            // InternalExport.g:5731:2: rule__IfExpressionTri__Group_1__3__Impl rule__IfExpressionTri__Group_1__4
             {
-            pushFollow(FOLLOW_rule__IfExpressionTri__Group_1__3__Impl_in_rule__IfExpressionTri__Group_1__311722);
+            pushFollow(FOLLOW_18);
             rule__IfExpressionTri__Group_1__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__IfExpressionTri__Group_1__4_in_rule__IfExpressionTri__Group_1__311725);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionTri__Group_1__4();
 
             state._fsp--;
@@ -16872,22 +16872,22 @@ public final void rule__IfExpressionTri__Group_1__3() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__IfExpressionTri__Group_1__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5738:1: rule__IfExpressionTri__Group_1__3__Impl : ( ':' ) ;
+    // InternalExport.g:5738:1: rule__IfExpressionTri__Group_1__3__Impl : ( ':' ) ;
     public final void rule__IfExpressionTri__Group_1__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5742:1: ( ( ':' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5743:1: ( ':' )
+            // InternalExport.g:5742:1: ( ( ':' ) )
+            // InternalExport.g:5743:1: ( ':' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5743:1: ( ':' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5744:1: ':'
+            // InternalExport.g:5743:1: ( ':' )
+            // InternalExport.g:5744:1: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionTriAccess().getColonKeyword_1_3()); 
             }
-            match(input,59,FOLLOW_59_in_rule__IfExpressionTri__Group_1__3__Impl11753); if (state.failed) return ;
+            match(input,59,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIfExpressionTriAccess().getColonKeyword_1_3()); 
             }
@@ -16913,16 +16913,16 @@ public final void rule__IfExpressionTri__Group_1__3__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__IfExpressionTri__Group_1__4"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5757:1: rule__IfExpressionTri__Group_1__4 : rule__IfExpressionTri__Group_1__4__Impl ;
+    // InternalExport.g:5757:1: rule__IfExpressionTri__Group_1__4 : rule__IfExpressionTri__Group_1__4__Impl ;
     public final void rule__IfExpressionTri__Group_1__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5761:1: ( rule__IfExpressionTri__Group_1__4__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5762:2: rule__IfExpressionTri__Group_1__4__Impl
+            // InternalExport.g:5761:1: ( rule__IfExpressionTri__Group_1__4__Impl )
+            // InternalExport.g:5762:2: rule__IfExpressionTri__Group_1__4__Impl
             {
-            pushFollow(FOLLOW_rule__IfExpressionTri__Group_1__4__Impl_in_rule__IfExpressionTri__Group_1__411784);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionTri__Group_1__4__Impl();
 
             state._fsp--;
@@ -16946,25 +16946,25 @@ public final void rule__IfExpressionTri__Group_1__4() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__IfExpressionTri__Group_1__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5768:1: rule__IfExpressionTri__Group_1__4__Impl : ( ( rule__IfExpressionTri__ElsePartAssignment_1_4 ) ) ;
+    // InternalExport.g:5768:1: rule__IfExpressionTri__Group_1__4__Impl : ( ( rule__IfExpressionTri__ElsePartAssignment_1_4 ) ) ;
     public final void rule__IfExpressionTri__Group_1__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5772:1: ( ( ( rule__IfExpressionTri__ElsePartAssignment_1_4 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5773:1: ( ( rule__IfExpressionTri__ElsePartAssignment_1_4 ) )
+            // InternalExport.g:5772:1: ( ( ( rule__IfExpressionTri__ElsePartAssignment_1_4 ) ) )
+            // InternalExport.g:5773:1: ( ( rule__IfExpressionTri__ElsePartAssignment_1_4 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5773:1: ( ( rule__IfExpressionTri__ElsePartAssignment_1_4 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5774:1: ( rule__IfExpressionTri__ElsePartAssignment_1_4 )
+            // InternalExport.g:5773:1: ( ( rule__IfExpressionTri__ElsePartAssignment_1_4 ) )
+            // InternalExport.g:5774:1: ( rule__IfExpressionTri__ElsePartAssignment_1_4 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionTriAccess().getElsePartAssignment_1_4()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5775:1: ( rule__IfExpressionTri__ElsePartAssignment_1_4 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5775:2: rule__IfExpressionTri__ElsePartAssignment_1_4
+            // InternalExport.g:5775:1: ( rule__IfExpressionTri__ElsePartAssignment_1_4 )
+            // InternalExport.g:5775:2: rule__IfExpressionTri__ElsePartAssignment_1_4
             {
-            pushFollow(FOLLOW_rule__IfExpressionTri__ElsePartAssignment_1_4_in_rule__IfExpressionTri__Group_1__4__Impl11811);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionTri__ElsePartAssignment_1_4();
 
             state._fsp--;
@@ -16997,21 +16997,21 @@ public final void rule__IfExpressionTri__Group_1__4__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__IfExpressionKw__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5795:1: rule__IfExpressionKw__Group__0 : rule__IfExpressionKw__Group__0__Impl rule__IfExpressionKw__Group__1 ;
+    // InternalExport.g:5795:1: rule__IfExpressionKw__Group__0 : rule__IfExpressionKw__Group__0__Impl rule__IfExpressionKw__Group__1 ;
     public final void rule__IfExpressionKw__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5799:1: ( rule__IfExpressionKw__Group__0__Impl rule__IfExpressionKw__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5800:2: rule__IfExpressionKw__Group__0__Impl rule__IfExpressionKw__Group__1
+            // InternalExport.g:5799:1: ( rule__IfExpressionKw__Group__0__Impl rule__IfExpressionKw__Group__1 )
+            // InternalExport.g:5800:2: rule__IfExpressionKw__Group__0__Impl rule__IfExpressionKw__Group__1
             {
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group__0__Impl_in_rule__IfExpressionKw__Group__011851);
+            pushFollow(FOLLOW_18);
             rule__IfExpressionKw__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group__1_in_rule__IfExpressionKw__Group__011854);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionKw__Group__1();
 
             state._fsp--;
@@ -17035,22 +17035,22 @@ public final void rule__IfExpressionKw__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__IfExpressionKw__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5807:1: rule__IfExpressionKw__Group__0__Impl : ( 'if' ) ;
+    // InternalExport.g:5807:1: rule__IfExpressionKw__Group__0__Impl : ( 'if' ) ;
     public final void rule__IfExpressionKw__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5811:1: ( ( 'if' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5812:1: ( 'if' )
+            // InternalExport.g:5811:1: ( ( 'if' ) )
+            // InternalExport.g:5812:1: ( 'if' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5812:1: ( 'if' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5813:1: 'if'
+            // InternalExport.g:5812:1: ( 'if' )
+            // InternalExport.g:5813:1: 'if'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionKwAccess().getIfKeyword_0()); 
             }
-            match(input,62,FOLLOW_62_in_rule__IfExpressionKw__Group__0__Impl11882); if (state.failed) return ;
+            match(input,62,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIfExpressionKwAccess().getIfKeyword_0()); 
             }
@@ -17076,21 +17076,21 @@ public final void rule__IfExpressionKw__Group__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__IfExpressionKw__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5826:1: rule__IfExpressionKw__Group__1 : rule__IfExpressionKw__Group__1__Impl rule__IfExpressionKw__Group__2 ;
+    // InternalExport.g:5826:1: rule__IfExpressionKw__Group__1 : rule__IfExpressionKw__Group__1__Impl rule__IfExpressionKw__Group__2 ;
     public final void rule__IfExpressionKw__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5830:1: ( rule__IfExpressionKw__Group__1__Impl rule__IfExpressionKw__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5831:2: rule__IfExpressionKw__Group__1__Impl rule__IfExpressionKw__Group__2
+            // InternalExport.g:5830:1: ( rule__IfExpressionKw__Group__1__Impl rule__IfExpressionKw__Group__2 )
+            // InternalExport.g:5831:2: rule__IfExpressionKw__Group__1__Impl rule__IfExpressionKw__Group__2
             {
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group__1__Impl_in_rule__IfExpressionKw__Group__111913);
+            pushFollow(FOLLOW_44);
             rule__IfExpressionKw__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group__2_in_rule__IfExpressionKw__Group__111916);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionKw__Group__2();
 
             state._fsp--;
@@ -17114,25 +17114,25 @@ public final void rule__IfExpressionKw__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__IfExpressionKw__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5838:1: rule__IfExpressionKw__Group__1__Impl : ( ( rule__IfExpressionKw__ConditionAssignment_1 ) ) ;
+    // InternalExport.g:5838:1: rule__IfExpressionKw__Group__1__Impl : ( ( rule__IfExpressionKw__ConditionAssignment_1 ) ) ;
     public final void rule__IfExpressionKw__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5842:1: ( ( ( rule__IfExpressionKw__ConditionAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5843:1: ( ( rule__IfExpressionKw__ConditionAssignment_1 ) )
+            // InternalExport.g:5842:1: ( ( ( rule__IfExpressionKw__ConditionAssignment_1 ) ) )
+            // InternalExport.g:5843:1: ( ( rule__IfExpressionKw__ConditionAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5843:1: ( ( rule__IfExpressionKw__ConditionAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5844:1: ( rule__IfExpressionKw__ConditionAssignment_1 )
+            // InternalExport.g:5843:1: ( ( rule__IfExpressionKw__ConditionAssignment_1 ) )
+            // InternalExport.g:5844:1: ( rule__IfExpressionKw__ConditionAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionKwAccess().getConditionAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5845:1: ( rule__IfExpressionKw__ConditionAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5845:2: rule__IfExpressionKw__ConditionAssignment_1
+            // InternalExport.g:5845:1: ( rule__IfExpressionKw__ConditionAssignment_1 )
+            // InternalExport.g:5845:2: rule__IfExpressionKw__ConditionAssignment_1
             {
-            pushFollow(FOLLOW_rule__IfExpressionKw__ConditionAssignment_1_in_rule__IfExpressionKw__Group__1__Impl11943);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionKw__ConditionAssignment_1();
 
             state._fsp--;
@@ -17165,21 +17165,21 @@ public final void rule__IfExpressionKw__Group__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__IfExpressionKw__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5855:1: rule__IfExpressionKw__Group__2 : rule__IfExpressionKw__Group__2__Impl rule__IfExpressionKw__Group__3 ;
+    // InternalExport.g:5855:1: rule__IfExpressionKw__Group__2 : rule__IfExpressionKw__Group__2__Impl rule__IfExpressionKw__Group__3 ;
     public final void rule__IfExpressionKw__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5859:1: ( rule__IfExpressionKw__Group__2__Impl rule__IfExpressionKw__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5860:2: rule__IfExpressionKw__Group__2__Impl rule__IfExpressionKw__Group__3
+            // InternalExport.g:5859:1: ( rule__IfExpressionKw__Group__2__Impl rule__IfExpressionKw__Group__3 )
+            // InternalExport.g:5860:2: rule__IfExpressionKw__Group__2__Impl rule__IfExpressionKw__Group__3
             {
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group__2__Impl_in_rule__IfExpressionKw__Group__211973);
+            pushFollow(FOLLOW_18);
             rule__IfExpressionKw__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group__3_in_rule__IfExpressionKw__Group__211976);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionKw__Group__3();
 
             state._fsp--;
@@ -17203,22 +17203,22 @@ public final void rule__IfExpressionKw__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__IfExpressionKw__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5867:1: rule__IfExpressionKw__Group__2__Impl : ( 'then' ) ;
+    // InternalExport.g:5867:1: rule__IfExpressionKw__Group__2__Impl : ( 'then' ) ;
     public final void rule__IfExpressionKw__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5871:1: ( ( 'then' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5872:1: ( 'then' )
+            // InternalExport.g:5871:1: ( ( 'then' ) )
+            // InternalExport.g:5872:1: ( 'then' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5872:1: ( 'then' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5873:1: 'then'
+            // InternalExport.g:5872:1: ( 'then' )
+            // InternalExport.g:5873:1: 'then'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionKwAccess().getThenKeyword_2()); 
             }
-            match(input,63,FOLLOW_63_in_rule__IfExpressionKw__Group__2__Impl12004); if (state.failed) return ;
+            match(input,63,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIfExpressionKwAccess().getThenKeyword_2()); 
             }
@@ -17244,21 +17244,21 @@ public final void rule__IfExpressionKw__Group__2__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__IfExpressionKw__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5886:1: rule__IfExpressionKw__Group__3 : rule__IfExpressionKw__Group__3__Impl rule__IfExpressionKw__Group__4 ;
+    // InternalExport.g:5886:1: rule__IfExpressionKw__Group__3 : rule__IfExpressionKw__Group__3__Impl rule__IfExpressionKw__Group__4 ;
     public final void rule__IfExpressionKw__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5890:1: ( rule__IfExpressionKw__Group__3__Impl rule__IfExpressionKw__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5891:2: rule__IfExpressionKw__Group__3__Impl rule__IfExpressionKw__Group__4
+            // InternalExport.g:5890:1: ( rule__IfExpressionKw__Group__3__Impl rule__IfExpressionKw__Group__4 )
+            // InternalExport.g:5891:2: rule__IfExpressionKw__Group__3__Impl rule__IfExpressionKw__Group__4
             {
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group__3__Impl_in_rule__IfExpressionKw__Group__312035);
+            pushFollow(FOLLOW_45);
             rule__IfExpressionKw__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group__4_in_rule__IfExpressionKw__Group__312038);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionKw__Group__4();
 
             state._fsp--;
@@ -17282,25 +17282,25 @@ public final void rule__IfExpressionKw__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__IfExpressionKw__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5898:1: rule__IfExpressionKw__Group__3__Impl : ( ( rule__IfExpressionKw__ThenPartAssignment_3 ) ) ;
+    // InternalExport.g:5898:1: rule__IfExpressionKw__Group__3__Impl : ( ( rule__IfExpressionKw__ThenPartAssignment_3 ) ) ;
     public final void rule__IfExpressionKw__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5902:1: ( ( ( rule__IfExpressionKw__ThenPartAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5903:1: ( ( rule__IfExpressionKw__ThenPartAssignment_3 ) )
+            // InternalExport.g:5902:1: ( ( ( rule__IfExpressionKw__ThenPartAssignment_3 ) ) )
+            // InternalExport.g:5903:1: ( ( rule__IfExpressionKw__ThenPartAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5903:1: ( ( rule__IfExpressionKw__ThenPartAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5904:1: ( rule__IfExpressionKw__ThenPartAssignment_3 )
+            // InternalExport.g:5903:1: ( ( rule__IfExpressionKw__ThenPartAssignment_3 ) )
+            // InternalExport.g:5904:1: ( rule__IfExpressionKw__ThenPartAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionKwAccess().getThenPartAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5905:1: ( rule__IfExpressionKw__ThenPartAssignment_3 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5905:2: rule__IfExpressionKw__ThenPartAssignment_3
+            // InternalExport.g:5905:1: ( rule__IfExpressionKw__ThenPartAssignment_3 )
+            // InternalExport.g:5905:2: rule__IfExpressionKw__ThenPartAssignment_3
             {
-            pushFollow(FOLLOW_rule__IfExpressionKw__ThenPartAssignment_3_in_rule__IfExpressionKw__Group__3__Impl12065);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionKw__ThenPartAssignment_3();
 
             state._fsp--;
@@ -17333,16 +17333,16 @@ public final void rule__IfExpressionKw__Group__3__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__IfExpressionKw__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5915:1: rule__IfExpressionKw__Group__4 : rule__IfExpressionKw__Group__4__Impl ;
+    // InternalExport.g:5915:1: rule__IfExpressionKw__Group__4 : rule__IfExpressionKw__Group__4__Impl ;
     public final void rule__IfExpressionKw__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5919:1: ( rule__IfExpressionKw__Group__4__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5920:2: rule__IfExpressionKw__Group__4__Impl
+            // InternalExport.g:5919:1: ( rule__IfExpressionKw__Group__4__Impl )
+            // InternalExport.g:5920:2: rule__IfExpressionKw__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group__4__Impl_in_rule__IfExpressionKw__Group__412095);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionKw__Group__4__Impl();
 
             state._fsp--;
@@ -17366,22 +17366,22 @@ public final void rule__IfExpressionKw__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__IfExpressionKw__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5926:1: rule__IfExpressionKw__Group__4__Impl : ( ( rule__IfExpressionKw__Group_4__0 )? ) ;
+    // InternalExport.g:5926:1: rule__IfExpressionKw__Group__4__Impl : ( ( rule__IfExpressionKw__Group_4__0 )? ) ;
     public final void rule__IfExpressionKw__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5930:1: ( ( ( rule__IfExpressionKw__Group_4__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5931:1: ( ( rule__IfExpressionKw__Group_4__0 )? )
+            // InternalExport.g:5930:1: ( ( ( rule__IfExpressionKw__Group_4__0 )? ) )
+            // InternalExport.g:5931:1: ( ( rule__IfExpressionKw__Group_4__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5931:1: ( ( rule__IfExpressionKw__Group_4__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5932:1: ( rule__IfExpressionKw__Group_4__0 )?
+            // InternalExport.g:5931:1: ( ( rule__IfExpressionKw__Group_4__0 )? )
+            // InternalExport.g:5932:1: ( rule__IfExpressionKw__Group_4__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionKwAccess().getGroup_4()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5933:1: ( rule__IfExpressionKw__Group_4__0 )?
+            // InternalExport.g:5933:1: ( rule__IfExpressionKw__Group_4__0 )?
             int alt49=2;
             int LA49_0 = input.LA(1);
 
@@ -17394,9 +17394,9 @@ public final void rule__IfExpressionKw__Group__4__Impl() throws RecognitionExcep
             }
             switch (alt49) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5933:2: rule__IfExpressionKw__Group_4__0
+                    // InternalExport.g:5933:2: rule__IfExpressionKw__Group_4__0
                     {
-                    pushFollow(FOLLOW_rule__IfExpressionKw__Group_4__0_in_rule__IfExpressionKw__Group__4__Impl12122);
+                    pushFollow(FOLLOW_2);
                     rule__IfExpressionKw__Group_4__0();
 
                     state._fsp--;
@@ -17432,16 +17432,16 @@ public final void rule__IfExpressionKw__Group__4__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__IfExpressionKw__Group_4__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5953:1: rule__IfExpressionKw__Group_4__0 : rule__IfExpressionKw__Group_4__0__Impl ;
+    // InternalExport.g:5953:1: rule__IfExpressionKw__Group_4__0 : rule__IfExpressionKw__Group_4__0__Impl ;
     public final void rule__IfExpressionKw__Group_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5957:1: ( rule__IfExpressionKw__Group_4__0__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5958:2: rule__IfExpressionKw__Group_4__0__Impl
+            // InternalExport.g:5957:1: ( rule__IfExpressionKw__Group_4__0__Impl )
+            // InternalExport.g:5958:2: rule__IfExpressionKw__Group_4__0__Impl
             {
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group_4__0__Impl_in_rule__IfExpressionKw__Group_4__012163);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionKw__Group_4__0__Impl();
 
             state._fsp--;
@@ -17465,25 +17465,25 @@ public final void rule__IfExpressionKw__Group_4__0() throws RecognitionException
 
 
     // $ANTLR start "rule__IfExpressionKw__Group_4__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5964:1: rule__IfExpressionKw__Group_4__0__Impl : ( ( rule__IfExpressionKw__Group_4_0__0 ) ) ;
+    // InternalExport.g:5964:1: rule__IfExpressionKw__Group_4__0__Impl : ( ( rule__IfExpressionKw__Group_4_0__0 ) ) ;
     public final void rule__IfExpressionKw__Group_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5968:1: ( ( ( rule__IfExpressionKw__Group_4_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5969:1: ( ( rule__IfExpressionKw__Group_4_0__0 ) )
+            // InternalExport.g:5968:1: ( ( ( rule__IfExpressionKw__Group_4_0__0 ) ) )
+            // InternalExport.g:5969:1: ( ( rule__IfExpressionKw__Group_4_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5969:1: ( ( rule__IfExpressionKw__Group_4_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5970:1: ( rule__IfExpressionKw__Group_4_0__0 )
+            // InternalExport.g:5969:1: ( ( rule__IfExpressionKw__Group_4_0__0 ) )
+            // InternalExport.g:5970:1: ( rule__IfExpressionKw__Group_4_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionKwAccess().getGroup_4_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5971:1: ( rule__IfExpressionKw__Group_4_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5971:2: rule__IfExpressionKw__Group_4_0__0
+            // InternalExport.g:5971:1: ( rule__IfExpressionKw__Group_4_0__0 )
+            // InternalExport.g:5971:2: rule__IfExpressionKw__Group_4_0__0
             {
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group_4_0__0_in_rule__IfExpressionKw__Group_4__0__Impl12190);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionKw__Group_4_0__0();
 
             state._fsp--;
@@ -17516,21 +17516,21 @@ public final void rule__IfExpressionKw__Group_4__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__IfExpressionKw__Group_4_0__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5983:1: rule__IfExpressionKw__Group_4_0__0 : rule__IfExpressionKw__Group_4_0__0__Impl rule__IfExpressionKw__Group_4_0__1 ;
+    // InternalExport.g:5983:1: rule__IfExpressionKw__Group_4_0__0 : rule__IfExpressionKw__Group_4_0__0__Impl rule__IfExpressionKw__Group_4_0__1 ;
     public final void rule__IfExpressionKw__Group_4_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5987:1: ( rule__IfExpressionKw__Group_4_0__0__Impl rule__IfExpressionKw__Group_4_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5988:2: rule__IfExpressionKw__Group_4_0__0__Impl rule__IfExpressionKw__Group_4_0__1
+            // InternalExport.g:5987:1: ( rule__IfExpressionKw__Group_4_0__0__Impl rule__IfExpressionKw__Group_4_0__1 )
+            // InternalExport.g:5988:2: rule__IfExpressionKw__Group_4_0__0__Impl rule__IfExpressionKw__Group_4_0__1
             {
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group_4_0__0__Impl_in_rule__IfExpressionKw__Group_4_0__012222);
+            pushFollow(FOLLOW_18);
             rule__IfExpressionKw__Group_4_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group_4_0__1_in_rule__IfExpressionKw__Group_4_0__012225);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionKw__Group_4_0__1();
 
             state._fsp--;
@@ -17554,22 +17554,22 @@ public final void rule__IfExpressionKw__Group_4_0__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__IfExpressionKw__Group_4_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5995:1: rule__IfExpressionKw__Group_4_0__0__Impl : ( 'else' ) ;
+    // InternalExport.g:5995:1: rule__IfExpressionKw__Group_4_0__0__Impl : ( 'else' ) ;
     public final void rule__IfExpressionKw__Group_4_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5999:1: ( ( 'else' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6000:1: ( 'else' )
+            // InternalExport.g:5999:1: ( ( 'else' ) )
+            // InternalExport.g:6000:1: ( 'else' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6000:1: ( 'else' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6001:1: 'else'
+            // InternalExport.g:6000:1: ( 'else' )
+            // InternalExport.g:6001:1: 'else'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionKwAccess().getElseKeyword_4_0_0()); 
             }
-            match(input,64,FOLLOW_64_in_rule__IfExpressionKw__Group_4_0__0__Impl12253); if (state.failed) return ;
+            match(input,64,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIfExpressionKwAccess().getElseKeyword_4_0_0()); 
             }
@@ -17595,16 +17595,16 @@ public final void rule__IfExpressionKw__Group_4_0__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__IfExpressionKw__Group_4_0__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6014:1: rule__IfExpressionKw__Group_4_0__1 : rule__IfExpressionKw__Group_4_0__1__Impl ;
+    // InternalExport.g:6014:1: rule__IfExpressionKw__Group_4_0__1 : rule__IfExpressionKw__Group_4_0__1__Impl ;
     public final void rule__IfExpressionKw__Group_4_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6018:1: ( rule__IfExpressionKw__Group_4_0__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6019:2: rule__IfExpressionKw__Group_4_0__1__Impl
+            // InternalExport.g:6018:1: ( rule__IfExpressionKw__Group_4_0__1__Impl )
+            // InternalExport.g:6019:2: rule__IfExpressionKw__Group_4_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group_4_0__1__Impl_in_rule__IfExpressionKw__Group_4_0__112284);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionKw__Group_4_0__1__Impl();
 
             state._fsp--;
@@ -17628,25 +17628,25 @@ public final void rule__IfExpressionKw__Group_4_0__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__IfExpressionKw__Group_4_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6025:1: rule__IfExpressionKw__Group_4_0__1__Impl : ( ( rule__IfExpressionKw__ElsePartAssignment_4_0_1 ) ) ;
+    // InternalExport.g:6025:1: rule__IfExpressionKw__Group_4_0__1__Impl : ( ( rule__IfExpressionKw__ElsePartAssignment_4_0_1 ) ) ;
     public final void rule__IfExpressionKw__Group_4_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6029:1: ( ( ( rule__IfExpressionKw__ElsePartAssignment_4_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6030:1: ( ( rule__IfExpressionKw__ElsePartAssignment_4_0_1 ) )
+            // InternalExport.g:6029:1: ( ( ( rule__IfExpressionKw__ElsePartAssignment_4_0_1 ) ) )
+            // InternalExport.g:6030:1: ( ( rule__IfExpressionKw__ElsePartAssignment_4_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6030:1: ( ( rule__IfExpressionKw__ElsePartAssignment_4_0_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6031:1: ( rule__IfExpressionKw__ElsePartAssignment_4_0_1 )
+            // InternalExport.g:6030:1: ( ( rule__IfExpressionKw__ElsePartAssignment_4_0_1 ) )
+            // InternalExport.g:6031:1: ( rule__IfExpressionKw__ElsePartAssignment_4_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionKwAccess().getElsePartAssignment_4_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6032:1: ( rule__IfExpressionKw__ElsePartAssignment_4_0_1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6032:2: rule__IfExpressionKw__ElsePartAssignment_4_0_1
+            // InternalExport.g:6032:1: ( rule__IfExpressionKw__ElsePartAssignment_4_0_1 )
+            // InternalExport.g:6032:2: rule__IfExpressionKw__ElsePartAssignment_4_0_1
             {
-            pushFollow(FOLLOW_rule__IfExpressionKw__ElsePartAssignment_4_0_1_in_rule__IfExpressionKw__Group_4_0__1__Impl12311);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionKw__ElsePartAssignment_4_0_1();
 
             state._fsp--;
@@ -17679,21 +17679,21 @@ public final void rule__IfExpressionKw__Group_4_0__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__SwitchExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6046:1: rule__SwitchExpression__Group__0 : rule__SwitchExpression__Group__0__Impl rule__SwitchExpression__Group__1 ;
+    // InternalExport.g:6046:1: rule__SwitchExpression__Group__0 : rule__SwitchExpression__Group__0__Impl rule__SwitchExpression__Group__1 ;
     public final void rule__SwitchExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6050:1: ( rule__SwitchExpression__Group__0__Impl rule__SwitchExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6051:2: rule__SwitchExpression__Group__0__Impl rule__SwitchExpression__Group__1
+            // InternalExport.g:6050:1: ( rule__SwitchExpression__Group__0__Impl rule__SwitchExpression__Group__1 )
+            // InternalExport.g:6051:2: rule__SwitchExpression__Group__0__Impl rule__SwitchExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__0__Impl_in_rule__SwitchExpression__Group__012345);
+            pushFollow(FOLLOW_46);
             rule__SwitchExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__1_in_rule__SwitchExpression__Group__012348);
+            pushFollow(FOLLOW_2);
             rule__SwitchExpression__Group__1();
 
             state._fsp--;
@@ -17717,22 +17717,22 @@ public final void rule__SwitchExpression__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__SwitchExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6058:1: rule__SwitchExpression__Group__0__Impl : ( 'switch' ) ;
+    // InternalExport.g:6058:1: rule__SwitchExpression__Group__0__Impl : ( 'switch' ) ;
     public final void rule__SwitchExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6062:1: ( ( 'switch' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6063:1: ( 'switch' )
+            // InternalExport.g:6062:1: ( ( 'switch' ) )
+            // InternalExport.g:6063:1: ( 'switch' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6063:1: ( 'switch' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6064:1: 'switch'
+            // InternalExport.g:6063:1: ( 'switch' )
+            // InternalExport.g:6064:1: 'switch'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getSwitchKeyword_0()); 
             }
-            match(input,65,FOLLOW_65_in_rule__SwitchExpression__Group__0__Impl12376); if (state.failed) return ;
+            match(input,65,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSwitchExpressionAccess().getSwitchKeyword_0()); 
             }
@@ -17758,21 +17758,21 @@ public final void rule__SwitchExpression__Group__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__SwitchExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6077:1: rule__SwitchExpression__Group__1 : rule__SwitchExpression__Group__1__Impl rule__SwitchExpression__Group__2 ;
+    // InternalExport.g:6077:1: rule__SwitchExpression__Group__1 : rule__SwitchExpression__Group__1__Impl rule__SwitchExpression__Group__2 ;
     public final void rule__SwitchExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6081:1: ( rule__SwitchExpression__Group__1__Impl rule__SwitchExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6082:2: rule__SwitchExpression__Group__1__Impl rule__SwitchExpression__Group__2
+            // InternalExport.g:6081:1: ( rule__SwitchExpression__Group__1__Impl rule__SwitchExpression__Group__2 )
+            // InternalExport.g:6082:2: rule__SwitchExpression__Group__1__Impl rule__SwitchExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__1__Impl_in_rule__SwitchExpression__Group__112407);
+            pushFollow(FOLLOW_46);
             rule__SwitchExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__2_in_rule__SwitchExpression__Group__112410);
+            pushFollow(FOLLOW_2);
             rule__SwitchExpression__Group__2();
 
             state._fsp--;
@@ -17796,22 +17796,22 @@ public final void rule__SwitchExpression__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__SwitchExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6089:1: rule__SwitchExpression__Group__1__Impl : ( ( rule__SwitchExpression__Group_1__0 )? ) ;
+    // InternalExport.g:6089:1: rule__SwitchExpression__Group__1__Impl : ( ( rule__SwitchExpression__Group_1__0 )? ) ;
     public final void rule__SwitchExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6093:1: ( ( ( rule__SwitchExpression__Group_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6094:1: ( ( rule__SwitchExpression__Group_1__0 )? )
+            // InternalExport.g:6093:1: ( ( ( rule__SwitchExpression__Group_1__0 )? ) )
+            // InternalExport.g:6094:1: ( ( rule__SwitchExpression__Group_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6094:1: ( ( rule__SwitchExpression__Group_1__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6095:1: ( rule__SwitchExpression__Group_1__0 )?
+            // InternalExport.g:6094:1: ( ( rule__SwitchExpression__Group_1__0 )? )
+            // InternalExport.g:6095:1: ( rule__SwitchExpression__Group_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6096:1: ( rule__SwitchExpression__Group_1__0 )?
+            // InternalExport.g:6096:1: ( rule__SwitchExpression__Group_1__0 )?
             int alt50=2;
             int LA50_0 = input.LA(1);
 
@@ -17820,9 +17820,9 @@ public final void rule__SwitchExpression__Group__1__Impl() throws RecognitionExc
             }
             switch (alt50) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6096:2: rule__SwitchExpression__Group_1__0
+                    // InternalExport.g:6096:2: rule__SwitchExpression__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__SwitchExpression__Group_1__0_in_rule__SwitchExpression__Group__1__Impl12437);
+                    pushFollow(FOLLOW_2);
                     rule__SwitchExpression__Group_1__0();
 
                     state._fsp--;
@@ -17858,21 +17858,21 @@ public final void rule__SwitchExpression__Group__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__SwitchExpression__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6106:1: rule__SwitchExpression__Group__2 : rule__SwitchExpression__Group__2__Impl rule__SwitchExpression__Group__3 ;
+    // InternalExport.g:6106:1: rule__SwitchExpression__Group__2 : rule__SwitchExpression__Group__2__Impl rule__SwitchExpression__Group__3 ;
     public final void rule__SwitchExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6110:1: ( rule__SwitchExpression__Group__2__Impl rule__SwitchExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6111:2: rule__SwitchExpression__Group__2__Impl rule__SwitchExpression__Group__3
+            // InternalExport.g:6110:1: ( rule__SwitchExpression__Group__2__Impl rule__SwitchExpression__Group__3 )
+            // InternalExport.g:6111:2: rule__SwitchExpression__Group__2__Impl rule__SwitchExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__2__Impl_in_rule__SwitchExpression__Group__212468);
+            pushFollow(FOLLOW_47);
             rule__SwitchExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__3_in_rule__SwitchExpression__Group__212471);
+            pushFollow(FOLLOW_2);
             rule__SwitchExpression__Group__3();
 
             state._fsp--;
@@ -17896,22 +17896,22 @@ public final void rule__SwitchExpression__Group__2() throws RecognitionException
 
 
     // $ANTLR start "rule__SwitchExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6118:1: rule__SwitchExpression__Group__2__Impl : ( '{' ) ;
+    // InternalExport.g:6118:1: rule__SwitchExpression__Group__2__Impl : ( '{' ) ;
     public final void rule__SwitchExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6122:1: ( ( '{' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6123:1: ( '{' )
+            // InternalExport.g:6122:1: ( ( '{' ) )
+            // InternalExport.g:6123:1: ( '{' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6123:1: ( '{' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6124:1: '{'
+            // InternalExport.g:6123:1: ( '{' )
+            // InternalExport.g:6124:1: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getLeftCurlyBracketKeyword_2()); 
             }
-            match(input,39,FOLLOW_39_in_rule__SwitchExpression__Group__2__Impl12499); if (state.failed) return ;
+            match(input,39,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSwitchExpressionAccess().getLeftCurlyBracketKeyword_2()); 
             }
@@ -17937,21 +17937,21 @@ public final void rule__SwitchExpression__Group__2__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__SwitchExpression__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6137:1: rule__SwitchExpression__Group__3 : rule__SwitchExpression__Group__3__Impl rule__SwitchExpression__Group__4 ;
+    // InternalExport.g:6137:1: rule__SwitchExpression__Group__3 : rule__SwitchExpression__Group__3__Impl rule__SwitchExpression__Group__4 ;
     public final void rule__SwitchExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6141:1: ( rule__SwitchExpression__Group__3__Impl rule__SwitchExpression__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6142:2: rule__SwitchExpression__Group__3__Impl rule__SwitchExpression__Group__4
+            // InternalExport.g:6141:1: ( rule__SwitchExpression__Group__3__Impl rule__SwitchExpression__Group__4 )
+            // InternalExport.g:6142:2: rule__SwitchExpression__Group__3__Impl rule__SwitchExpression__Group__4
             {
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__3__Impl_in_rule__SwitchExpression__Group__312530);
+            pushFollow(FOLLOW_47);
             rule__SwitchExpression__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__4_in_rule__SwitchExpression__Group__312533);
+            pushFollow(FOLLOW_2);
             rule__SwitchExpression__Group__4();
 
             state._fsp--;
@@ -17975,22 +17975,22 @@ public final void rule__SwitchExpression__Group__3() throws RecognitionException
 
 
     // $ANTLR start "rule__SwitchExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6149:1: rule__SwitchExpression__Group__3__Impl : ( ( rule__SwitchExpression__CaseAssignment_3 )* ) ;
+    // InternalExport.g:6149:1: rule__SwitchExpression__Group__3__Impl : ( ( rule__SwitchExpression__CaseAssignment_3 )* ) ;
     public final void rule__SwitchExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6153:1: ( ( ( rule__SwitchExpression__CaseAssignment_3 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6154:1: ( ( rule__SwitchExpression__CaseAssignment_3 )* )
+            // InternalExport.g:6153:1: ( ( ( rule__SwitchExpression__CaseAssignment_3 )* ) )
+            // InternalExport.g:6154:1: ( ( rule__SwitchExpression__CaseAssignment_3 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6154:1: ( ( rule__SwitchExpression__CaseAssignment_3 )* )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6155:1: ( rule__SwitchExpression__CaseAssignment_3 )*
+            // InternalExport.g:6154:1: ( ( rule__SwitchExpression__CaseAssignment_3 )* )
+            // InternalExport.g:6155:1: ( rule__SwitchExpression__CaseAssignment_3 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getCaseAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6156:1: ( rule__SwitchExpression__CaseAssignment_3 )*
+            // InternalExport.g:6156:1: ( rule__SwitchExpression__CaseAssignment_3 )*
             loop51:
             do {
                 int alt51=2;
@@ -18003,9 +18003,9 @@ public final void rule__SwitchExpression__Group__3__Impl() throws RecognitionExc
 
                 switch (alt51) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6156:2: rule__SwitchExpression__CaseAssignment_3
+            	    // InternalExport.g:6156:2: rule__SwitchExpression__CaseAssignment_3
             	    {
-            	    pushFollow(FOLLOW_rule__SwitchExpression__CaseAssignment_3_in_rule__SwitchExpression__Group__3__Impl12560);
+            	    pushFollow(FOLLOW_48);
             	    rule__SwitchExpression__CaseAssignment_3();
 
             	    state._fsp--;
@@ -18044,21 +18044,21 @@ public final void rule__SwitchExpression__Group__3__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__SwitchExpression__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6166:1: rule__SwitchExpression__Group__4 : rule__SwitchExpression__Group__4__Impl rule__SwitchExpression__Group__5 ;
+    // InternalExport.g:6166:1: rule__SwitchExpression__Group__4 : rule__SwitchExpression__Group__4__Impl rule__SwitchExpression__Group__5 ;
     public final void rule__SwitchExpression__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6170:1: ( rule__SwitchExpression__Group__4__Impl rule__SwitchExpression__Group__5 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6171:2: rule__SwitchExpression__Group__4__Impl rule__SwitchExpression__Group__5
+            // InternalExport.g:6170:1: ( rule__SwitchExpression__Group__4__Impl rule__SwitchExpression__Group__5 )
+            // InternalExport.g:6171:2: rule__SwitchExpression__Group__4__Impl rule__SwitchExpression__Group__5
             {
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__4__Impl_in_rule__SwitchExpression__Group__412591);
+            pushFollow(FOLLOW_39);
             rule__SwitchExpression__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__5_in_rule__SwitchExpression__Group__412594);
+            pushFollow(FOLLOW_2);
             rule__SwitchExpression__Group__5();
 
             state._fsp--;
@@ -18082,22 +18082,22 @@ public final void rule__SwitchExpression__Group__4() throws RecognitionException
 
 
     // $ANTLR start "rule__SwitchExpression__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6178:1: rule__SwitchExpression__Group__4__Impl : ( 'default' ) ;
+    // InternalExport.g:6178:1: rule__SwitchExpression__Group__4__Impl : ( 'default' ) ;
     public final void rule__SwitchExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6182:1: ( ( 'default' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6183:1: ( 'default' )
+            // InternalExport.g:6182:1: ( ( 'default' ) )
+            // InternalExport.g:6183:1: ( 'default' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6183:1: ( 'default' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6184:1: 'default'
+            // InternalExport.g:6183:1: ( 'default' )
+            // InternalExport.g:6184:1: 'default'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getDefaultKeyword_4()); 
             }
-            match(input,66,FOLLOW_66_in_rule__SwitchExpression__Group__4__Impl12622); if (state.failed) return ;
+            match(input,66,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSwitchExpressionAccess().getDefaultKeyword_4()); 
             }
@@ -18123,21 +18123,21 @@ public final void rule__SwitchExpression__Group__4__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__SwitchExpression__Group__5"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6197:1: rule__SwitchExpression__Group__5 : rule__SwitchExpression__Group__5__Impl rule__SwitchExpression__Group__6 ;
+    // InternalExport.g:6197:1: rule__SwitchExpression__Group__5 : rule__SwitchExpression__Group__5__Impl rule__SwitchExpression__Group__6 ;
     public final void rule__SwitchExpression__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6201:1: ( rule__SwitchExpression__Group__5__Impl rule__SwitchExpression__Group__6 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6202:2: rule__SwitchExpression__Group__5__Impl rule__SwitchExpression__Group__6
+            // InternalExport.g:6201:1: ( rule__SwitchExpression__Group__5__Impl rule__SwitchExpression__Group__6 )
+            // InternalExport.g:6202:2: rule__SwitchExpression__Group__5__Impl rule__SwitchExpression__Group__6
             {
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__5__Impl_in_rule__SwitchExpression__Group__512653);
+            pushFollow(FOLLOW_49);
             rule__SwitchExpression__Group__5__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__6_in_rule__SwitchExpression__Group__512656);
+            pushFollow(FOLLOW_2);
             rule__SwitchExpression__Group__6();
 
             state._fsp--;
@@ -18161,22 +18161,22 @@ public final void rule__SwitchExpression__Group__5() throws RecognitionException
 
 
     // $ANTLR start "rule__SwitchExpression__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6209:1: rule__SwitchExpression__Group__5__Impl : ( ':' ) ;
+    // InternalExport.g:6209:1: rule__SwitchExpression__Group__5__Impl : ( ':' ) ;
     public final void rule__SwitchExpression__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6213:1: ( ( ':' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6214:1: ( ':' )
+            // InternalExport.g:6213:1: ( ( ':' ) )
+            // InternalExport.g:6214:1: ( ':' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6214:1: ( ':' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6215:1: ':'
+            // InternalExport.g:6214:1: ( ':' )
+            // InternalExport.g:6215:1: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getColonKeyword_5()); 
             }
-            match(input,59,FOLLOW_59_in_rule__SwitchExpression__Group__5__Impl12684); if (state.failed) return ;
+            match(input,59,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSwitchExpressionAccess().getColonKeyword_5()); 
             }
@@ -18202,21 +18202,21 @@ public final void rule__SwitchExpression__Group__5__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__SwitchExpression__Group__6"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6228:1: rule__SwitchExpression__Group__6 : rule__SwitchExpression__Group__6__Impl rule__SwitchExpression__Group__7 ;
+    // InternalExport.g:6228:1: rule__SwitchExpression__Group__6 : rule__SwitchExpression__Group__6__Impl rule__SwitchExpression__Group__7 ;
     public final void rule__SwitchExpression__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6232:1: ( rule__SwitchExpression__Group__6__Impl rule__SwitchExpression__Group__7 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6233:2: rule__SwitchExpression__Group__6__Impl rule__SwitchExpression__Group__7
+            // InternalExport.g:6232:1: ( rule__SwitchExpression__Group__6__Impl rule__SwitchExpression__Group__7 )
+            // InternalExport.g:6233:2: rule__SwitchExpression__Group__6__Impl rule__SwitchExpression__Group__7
             {
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__6__Impl_in_rule__SwitchExpression__Group__612715);
+            pushFollow(FOLLOW_12);
             rule__SwitchExpression__Group__6__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__7_in_rule__SwitchExpression__Group__612718);
+            pushFollow(FOLLOW_2);
             rule__SwitchExpression__Group__7();
 
             state._fsp--;
@@ -18240,25 +18240,25 @@ public final void rule__SwitchExpression__Group__6() throws RecognitionException
 
 
     // $ANTLR start "rule__SwitchExpression__Group__6__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6240:1: rule__SwitchExpression__Group__6__Impl : ( ( rule__SwitchExpression__DefaultExprAssignment_6 ) ) ;
+    // InternalExport.g:6240:1: rule__SwitchExpression__Group__6__Impl : ( ( rule__SwitchExpression__DefaultExprAssignment_6 ) ) ;
     public final void rule__SwitchExpression__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6244:1: ( ( ( rule__SwitchExpression__DefaultExprAssignment_6 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6245:1: ( ( rule__SwitchExpression__DefaultExprAssignment_6 ) )
+            // InternalExport.g:6244:1: ( ( ( rule__SwitchExpression__DefaultExprAssignment_6 ) ) )
+            // InternalExport.g:6245:1: ( ( rule__SwitchExpression__DefaultExprAssignment_6 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6245:1: ( ( rule__SwitchExpression__DefaultExprAssignment_6 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6246:1: ( rule__SwitchExpression__DefaultExprAssignment_6 )
+            // InternalExport.g:6245:1: ( ( rule__SwitchExpression__DefaultExprAssignment_6 ) )
+            // InternalExport.g:6246:1: ( rule__SwitchExpression__DefaultExprAssignment_6 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getDefaultExprAssignment_6()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6247:1: ( rule__SwitchExpression__DefaultExprAssignment_6 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6247:2: rule__SwitchExpression__DefaultExprAssignment_6
+            // InternalExport.g:6247:1: ( rule__SwitchExpression__DefaultExprAssignment_6 )
+            // InternalExport.g:6247:2: rule__SwitchExpression__DefaultExprAssignment_6
             {
-            pushFollow(FOLLOW_rule__SwitchExpression__DefaultExprAssignment_6_in_rule__SwitchExpression__Group__6__Impl12745);
+            pushFollow(FOLLOW_2);
             rule__SwitchExpression__DefaultExprAssignment_6();
 
             state._fsp--;
@@ -18291,16 +18291,16 @@ public final void rule__SwitchExpression__Group__6__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__SwitchExpression__Group__7"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6257:1: rule__SwitchExpression__Group__7 : rule__SwitchExpression__Group__7__Impl ;
+    // InternalExport.g:6257:1: rule__SwitchExpression__Group__7 : rule__SwitchExpression__Group__7__Impl ;
     public final void rule__SwitchExpression__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6261:1: ( rule__SwitchExpression__Group__7__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6262:2: rule__SwitchExpression__Group__7__Impl
+            // InternalExport.g:6261:1: ( rule__SwitchExpression__Group__7__Impl )
+            // InternalExport.g:6262:2: rule__SwitchExpression__Group__7__Impl
             {
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__7__Impl_in_rule__SwitchExpression__Group__712775);
+            pushFollow(FOLLOW_2);
             rule__SwitchExpression__Group__7__Impl();
 
             state._fsp--;
@@ -18324,22 +18324,22 @@ public final void rule__SwitchExpression__Group__7() throws RecognitionException
 
 
     // $ANTLR start "rule__SwitchExpression__Group__7__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6268:1: rule__SwitchExpression__Group__7__Impl : ( '}' ) ;
+    // InternalExport.g:6268:1: rule__SwitchExpression__Group__7__Impl : ( '}' ) ;
     public final void rule__SwitchExpression__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6272:1: ( ( '}' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6273:1: ( '}' )
+            // InternalExport.g:6272:1: ( ( '}' ) )
+            // InternalExport.g:6273:1: ( '}' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6273:1: ( '}' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6274:1: '}'
+            // InternalExport.g:6273:1: ( '}' )
+            // InternalExport.g:6274:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getRightCurlyBracketKeyword_7()); 
             }
-            match(input,40,FOLLOW_40_in_rule__SwitchExpression__Group__7__Impl12803); if (state.failed) return ;
+            match(input,40,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSwitchExpressionAccess().getRightCurlyBracketKeyword_7()); 
             }
@@ -18365,21 +18365,21 @@ public final void rule__SwitchExpression__Group__7__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__SwitchExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6303:1: rule__SwitchExpression__Group_1__0 : rule__SwitchExpression__Group_1__0__Impl rule__SwitchExpression__Group_1__1 ;
+    // InternalExport.g:6303:1: rule__SwitchExpression__Group_1__0 : rule__SwitchExpression__Group_1__0__Impl rule__SwitchExpression__Group_1__1 ;
     public final void rule__SwitchExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6307:1: ( rule__SwitchExpression__Group_1__0__Impl rule__SwitchExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6308:2: rule__SwitchExpression__Group_1__0__Impl rule__SwitchExpression__Group_1__1
+            // InternalExport.g:6307:1: ( rule__SwitchExpression__Group_1__0__Impl rule__SwitchExpression__Group_1__1 )
+            // InternalExport.g:6308:2: rule__SwitchExpression__Group_1__0__Impl rule__SwitchExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__SwitchExpression__Group_1__0__Impl_in_rule__SwitchExpression__Group_1__012850);
+            pushFollow(FOLLOW_49);
             rule__SwitchExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SwitchExpression__Group_1__1_in_rule__SwitchExpression__Group_1__012853);
+            pushFollow(FOLLOW_2);
             rule__SwitchExpression__Group_1__1();
 
             state._fsp--;
@@ -18403,22 +18403,22 @@ public final void rule__SwitchExpression__Group_1__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__SwitchExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6315:1: rule__SwitchExpression__Group_1__0__Impl : ( '(' ) ;
+    // InternalExport.g:6315:1: rule__SwitchExpression__Group_1__0__Impl : ( '(' ) ;
     public final void rule__SwitchExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6319:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6320:1: ( '(' )
+            // InternalExport.g:6319:1: ( ( '(' ) )
+            // InternalExport.g:6320:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6320:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6321:1: '('
+            // InternalExport.g:6320:1: ( '(' )
+            // InternalExport.g:6321:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getLeftParenthesisKeyword_1_0()); 
             }
-            match(input,51,FOLLOW_51_in_rule__SwitchExpression__Group_1__0__Impl12881); if (state.failed) return ;
+            match(input,51,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSwitchExpressionAccess().getLeftParenthesisKeyword_1_0()); 
             }
@@ -18444,21 +18444,21 @@ public final void rule__SwitchExpression__Group_1__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__SwitchExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6334:1: rule__SwitchExpression__Group_1__1 : rule__SwitchExpression__Group_1__1__Impl rule__SwitchExpression__Group_1__2 ;
+    // InternalExport.g:6334:1: rule__SwitchExpression__Group_1__1 : rule__SwitchExpression__Group_1__1__Impl rule__SwitchExpression__Group_1__2 ;
     public final void rule__SwitchExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6338:1: ( rule__SwitchExpression__Group_1__1__Impl rule__SwitchExpression__Group_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6339:2: rule__SwitchExpression__Group_1__1__Impl rule__SwitchExpression__Group_1__2
+            // InternalExport.g:6338:1: ( rule__SwitchExpression__Group_1__1__Impl rule__SwitchExpression__Group_1__2 )
+            // InternalExport.g:6339:2: rule__SwitchExpression__Group_1__1__Impl rule__SwitchExpression__Group_1__2
             {
-            pushFollow(FOLLOW_rule__SwitchExpression__Group_1__1__Impl_in_rule__SwitchExpression__Group_1__112912);
+            pushFollow(FOLLOW_25);
             rule__SwitchExpression__Group_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SwitchExpression__Group_1__2_in_rule__SwitchExpression__Group_1__112915);
+            pushFollow(FOLLOW_2);
             rule__SwitchExpression__Group_1__2();
 
             state._fsp--;
@@ -18482,25 +18482,25 @@ public final void rule__SwitchExpression__Group_1__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__SwitchExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6346:1: rule__SwitchExpression__Group_1__1__Impl : ( ( rule__SwitchExpression__SwitchExprAssignment_1_1 ) ) ;
+    // InternalExport.g:6346:1: rule__SwitchExpression__Group_1__1__Impl : ( ( rule__SwitchExpression__SwitchExprAssignment_1_1 ) ) ;
     public final void rule__SwitchExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6350:1: ( ( ( rule__SwitchExpression__SwitchExprAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6351:1: ( ( rule__SwitchExpression__SwitchExprAssignment_1_1 ) )
+            // InternalExport.g:6350:1: ( ( ( rule__SwitchExpression__SwitchExprAssignment_1_1 ) ) )
+            // InternalExport.g:6351:1: ( ( rule__SwitchExpression__SwitchExprAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6351:1: ( ( rule__SwitchExpression__SwitchExprAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6352:1: ( rule__SwitchExpression__SwitchExprAssignment_1_1 )
+            // InternalExport.g:6351:1: ( ( rule__SwitchExpression__SwitchExprAssignment_1_1 ) )
+            // InternalExport.g:6352:1: ( rule__SwitchExpression__SwitchExprAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getSwitchExprAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6353:1: ( rule__SwitchExpression__SwitchExprAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6353:2: rule__SwitchExpression__SwitchExprAssignment_1_1
+            // InternalExport.g:6353:1: ( rule__SwitchExpression__SwitchExprAssignment_1_1 )
+            // InternalExport.g:6353:2: rule__SwitchExpression__SwitchExprAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__SwitchExpression__SwitchExprAssignment_1_1_in_rule__SwitchExpression__Group_1__1__Impl12942);
+            pushFollow(FOLLOW_2);
             rule__SwitchExpression__SwitchExprAssignment_1_1();
 
             state._fsp--;
@@ -18533,16 +18533,16 @@ public final void rule__SwitchExpression__Group_1__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__SwitchExpression__Group_1__2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6363:1: rule__SwitchExpression__Group_1__2 : rule__SwitchExpression__Group_1__2__Impl ;
+    // InternalExport.g:6363:1: rule__SwitchExpression__Group_1__2 : rule__SwitchExpression__Group_1__2__Impl ;
     public final void rule__SwitchExpression__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6367:1: ( rule__SwitchExpression__Group_1__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6368:2: rule__SwitchExpression__Group_1__2__Impl
+            // InternalExport.g:6367:1: ( rule__SwitchExpression__Group_1__2__Impl )
+            // InternalExport.g:6368:2: rule__SwitchExpression__Group_1__2__Impl
             {
-            pushFollow(FOLLOW_rule__SwitchExpression__Group_1__2__Impl_in_rule__SwitchExpression__Group_1__212972);
+            pushFollow(FOLLOW_2);
             rule__SwitchExpression__Group_1__2__Impl();
 
             state._fsp--;
@@ -18566,22 +18566,22 @@ public final void rule__SwitchExpression__Group_1__2() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__SwitchExpression__Group_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6374:1: rule__SwitchExpression__Group_1__2__Impl : ( ')' ) ;
+    // InternalExport.g:6374:1: rule__SwitchExpression__Group_1__2__Impl : ( ')' ) ;
     public final void rule__SwitchExpression__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6378:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6379:1: ( ')' )
+            // InternalExport.g:6378:1: ( ( ')' ) )
+            // InternalExport.g:6379:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6379:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6380:1: ')'
+            // InternalExport.g:6379:1: ( ')' )
+            // InternalExport.g:6380:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getRightParenthesisKeyword_1_2()); 
             }
-            match(input,52,FOLLOW_52_in_rule__SwitchExpression__Group_1__2__Impl13000); if (state.failed) return ;
+            match(input,52,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSwitchExpressionAccess().getRightParenthesisKeyword_1_2()); 
             }
@@ -18607,21 +18607,21 @@ public final void rule__SwitchExpression__Group_1__2__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__Case__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6399:1: rule__Case__Group__0 : rule__Case__Group__0__Impl rule__Case__Group__1 ;
+    // InternalExport.g:6399:1: rule__Case__Group__0 : rule__Case__Group__0__Impl rule__Case__Group__1 ;
     public final void rule__Case__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6403:1: ( rule__Case__Group__0__Impl rule__Case__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6404:2: rule__Case__Group__0__Impl rule__Case__Group__1
+            // InternalExport.g:6403:1: ( rule__Case__Group__0__Impl rule__Case__Group__1 )
+            // InternalExport.g:6404:2: rule__Case__Group__0__Impl rule__Case__Group__1
             {
-            pushFollow(FOLLOW_rule__Case__Group__0__Impl_in_rule__Case__Group__013037);
+            pushFollow(FOLLOW_49);
             rule__Case__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Case__Group__1_in_rule__Case__Group__013040);
+            pushFollow(FOLLOW_2);
             rule__Case__Group__1();
 
             state._fsp--;
@@ -18645,22 +18645,22 @@ public final void rule__Case__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Case__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6411:1: rule__Case__Group__0__Impl : ( 'case' ) ;
+    // InternalExport.g:6411:1: rule__Case__Group__0__Impl : ( 'case' ) ;
     public final void rule__Case__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6415:1: ( ( 'case' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6416:1: ( 'case' )
+            // InternalExport.g:6415:1: ( ( 'case' ) )
+            // InternalExport.g:6416:1: ( 'case' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6416:1: ( 'case' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6417:1: 'case'
+            // InternalExport.g:6416:1: ( 'case' )
+            // InternalExport.g:6417:1: 'case'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCaseAccess().getCaseKeyword_0()); 
             }
-            match(input,67,FOLLOW_67_in_rule__Case__Group__0__Impl13068); if (state.failed) return ;
+            match(input,67,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCaseAccess().getCaseKeyword_0()); 
             }
@@ -18686,21 +18686,21 @@ public final void rule__Case__Group__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Case__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6430:1: rule__Case__Group__1 : rule__Case__Group__1__Impl rule__Case__Group__2 ;
+    // InternalExport.g:6430:1: rule__Case__Group__1 : rule__Case__Group__1__Impl rule__Case__Group__2 ;
     public final void rule__Case__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6434:1: ( rule__Case__Group__1__Impl rule__Case__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6435:2: rule__Case__Group__1__Impl rule__Case__Group__2
+            // InternalExport.g:6434:1: ( rule__Case__Group__1__Impl rule__Case__Group__2 )
+            // InternalExport.g:6435:2: rule__Case__Group__1__Impl rule__Case__Group__2
             {
-            pushFollow(FOLLOW_rule__Case__Group__1__Impl_in_rule__Case__Group__113099);
+            pushFollow(FOLLOW_39);
             rule__Case__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Case__Group__2_in_rule__Case__Group__113102);
+            pushFollow(FOLLOW_2);
             rule__Case__Group__2();
 
             state._fsp--;
@@ -18724,25 +18724,25 @@ public final void rule__Case__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Case__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6442:1: rule__Case__Group__1__Impl : ( ( rule__Case__ConditionAssignment_1 ) ) ;
+    // InternalExport.g:6442:1: rule__Case__Group__1__Impl : ( ( rule__Case__ConditionAssignment_1 ) ) ;
     public final void rule__Case__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6446:1: ( ( ( rule__Case__ConditionAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6447:1: ( ( rule__Case__ConditionAssignment_1 ) )
+            // InternalExport.g:6446:1: ( ( ( rule__Case__ConditionAssignment_1 ) ) )
+            // InternalExport.g:6447:1: ( ( rule__Case__ConditionAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6447:1: ( ( rule__Case__ConditionAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6448:1: ( rule__Case__ConditionAssignment_1 )
+            // InternalExport.g:6447:1: ( ( rule__Case__ConditionAssignment_1 ) )
+            // InternalExport.g:6448:1: ( rule__Case__ConditionAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCaseAccess().getConditionAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6449:1: ( rule__Case__ConditionAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6449:2: rule__Case__ConditionAssignment_1
+            // InternalExport.g:6449:1: ( rule__Case__ConditionAssignment_1 )
+            // InternalExport.g:6449:2: rule__Case__ConditionAssignment_1
             {
-            pushFollow(FOLLOW_rule__Case__ConditionAssignment_1_in_rule__Case__Group__1__Impl13129);
+            pushFollow(FOLLOW_2);
             rule__Case__ConditionAssignment_1();
 
             state._fsp--;
@@ -18775,21 +18775,21 @@ public final void rule__Case__Group__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Case__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6459:1: rule__Case__Group__2 : rule__Case__Group__2__Impl rule__Case__Group__3 ;
+    // InternalExport.g:6459:1: rule__Case__Group__2 : rule__Case__Group__2__Impl rule__Case__Group__3 ;
     public final void rule__Case__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6463:1: ( rule__Case__Group__2__Impl rule__Case__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6464:2: rule__Case__Group__2__Impl rule__Case__Group__3
+            // InternalExport.g:6463:1: ( rule__Case__Group__2__Impl rule__Case__Group__3 )
+            // InternalExport.g:6464:2: rule__Case__Group__2__Impl rule__Case__Group__3
             {
-            pushFollow(FOLLOW_rule__Case__Group__2__Impl_in_rule__Case__Group__213159);
+            pushFollow(FOLLOW_49);
             rule__Case__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Case__Group__3_in_rule__Case__Group__213162);
+            pushFollow(FOLLOW_2);
             rule__Case__Group__3();
 
             state._fsp--;
@@ -18813,22 +18813,22 @@ public final void rule__Case__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__Case__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6471:1: rule__Case__Group__2__Impl : ( ':' ) ;
+    // InternalExport.g:6471:1: rule__Case__Group__2__Impl : ( ':' ) ;
     public final void rule__Case__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6475:1: ( ( ':' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6476:1: ( ':' )
+            // InternalExport.g:6475:1: ( ( ':' ) )
+            // InternalExport.g:6476:1: ( ':' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6476:1: ( ':' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6477:1: ':'
+            // InternalExport.g:6476:1: ( ':' )
+            // InternalExport.g:6477:1: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCaseAccess().getColonKeyword_2()); 
             }
-            match(input,59,FOLLOW_59_in_rule__Case__Group__2__Impl13190); if (state.failed) return ;
+            match(input,59,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCaseAccess().getColonKeyword_2()); 
             }
@@ -18854,16 +18854,16 @@ public final void rule__Case__Group__2__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Case__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6490:1: rule__Case__Group__3 : rule__Case__Group__3__Impl ;
+    // InternalExport.g:6490:1: rule__Case__Group__3 : rule__Case__Group__3__Impl ;
     public final void rule__Case__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6494:1: ( rule__Case__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6495:2: rule__Case__Group__3__Impl
+            // InternalExport.g:6494:1: ( rule__Case__Group__3__Impl )
+            // InternalExport.g:6495:2: rule__Case__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__Case__Group__3__Impl_in_rule__Case__Group__313221);
+            pushFollow(FOLLOW_2);
             rule__Case__Group__3__Impl();
 
             state._fsp--;
@@ -18887,25 +18887,25 @@ public final void rule__Case__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__Case__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6501:1: rule__Case__Group__3__Impl : ( ( rule__Case__ThenParAssignment_3 ) ) ;
+    // InternalExport.g:6501:1: rule__Case__Group__3__Impl : ( ( rule__Case__ThenParAssignment_3 ) ) ;
     public final void rule__Case__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6505:1: ( ( ( rule__Case__ThenParAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6506:1: ( ( rule__Case__ThenParAssignment_3 ) )
+            // InternalExport.g:6505:1: ( ( ( rule__Case__ThenParAssignment_3 ) ) )
+            // InternalExport.g:6506:1: ( ( rule__Case__ThenParAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6506:1: ( ( rule__Case__ThenParAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6507:1: ( rule__Case__ThenParAssignment_3 )
+            // InternalExport.g:6506:1: ( ( rule__Case__ThenParAssignment_3 ) )
+            // InternalExport.g:6507:1: ( rule__Case__ThenParAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCaseAccess().getThenParAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6508:1: ( rule__Case__ThenParAssignment_3 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6508:2: rule__Case__ThenParAssignment_3
+            // InternalExport.g:6508:1: ( rule__Case__ThenParAssignment_3 )
+            // InternalExport.g:6508:2: rule__Case__ThenParAssignment_3
             {
-            pushFollow(FOLLOW_rule__Case__ThenParAssignment_3_in_rule__Case__Group__3__Impl13248);
+            pushFollow(FOLLOW_2);
             rule__Case__ThenParAssignment_3();
 
             state._fsp--;
@@ -18938,21 +18938,21 @@ public final void rule__Case__Group__3__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__OrExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6526:1: rule__OrExpression__Group__0 : rule__OrExpression__Group__0__Impl rule__OrExpression__Group__1 ;
+    // InternalExport.g:6526:1: rule__OrExpression__Group__0 : rule__OrExpression__Group__0__Impl rule__OrExpression__Group__1 ;
     public final void rule__OrExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6530:1: ( rule__OrExpression__Group__0__Impl rule__OrExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6531:2: rule__OrExpression__Group__0__Impl rule__OrExpression__Group__1
+            // InternalExport.g:6530:1: ( rule__OrExpression__Group__0__Impl rule__OrExpression__Group__1 )
+            // InternalExport.g:6531:2: rule__OrExpression__Group__0__Impl rule__OrExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__OrExpression__Group__0__Impl_in_rule__OrExpression__Group__013286);
+            pushFollow(FOLLOW_50);
             rule__OrExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OrExpression__Group__1_in_rule__OrExpression__Group__013289);
+            pushFollow(FOLLOW_2);
             rule__OrExpression__Group__1();
 
             state._fsp--;
@@ -18976,22 +18976,22 @@ public final void rule__OrExpression__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__OrExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6538:1: rule__OrExpression__Group__0__Impl : ( ruleAndExpression ) ;
+    // InternalExport.g:6538:1: rule__OrExpression__Group__0__Impl : ( ruleAndExpression ) ;
     public final void rule__OrExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6542:1: ( ( ruleAndExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6543:1: ( ruleAndExpression )
+            // InternalExport.g:6542:1: ( ( ruleAndExpression ) )
+            // InternalExport.g:6543:1: ( ruleAndExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6543:1: ( ruleAndExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6544:1: ruleAndExpression
+            // InternalExport.g:6543:1: ( ruleAndExpression )
+            // InternalExport.g:6544:1: ruleAndExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOrExpressionAccess().getAndExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleAndExpression_in_rule__OrExpression__Group__0__Impl13316);
+            pushFollow(FOLLOW_2);
             ruleAndExpression();
 
             state._fsp--;
@@ -19021,16 +19021,16 @@ public final void rule__OrExpression__Group__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__OrExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6555:1: rule__OrExpression__Group__1 : rule__OrExpression__Group__1__Impl ;
+    // InternalExport.g:6555:1: rule__OrExpression__Group__1 : rule__OrExpression__Group__1__Impl ;
     public final void rule__OrExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6559:1: ( rule__OrExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6560:2: rule__OrExpression__Group__1__Impl
+            // InternalExport.g:6559:1: ( rule__OrExpression__Group__1__Impl )
+            // InternalExport.g:6560:2: rule__OrExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__OrExpression__Group__1__Impl_in_rule__OrExpression__Group__113345);
+            pushFollow(FOLLOW_2);
             rule__OrExpression__Group__1__Impl();
 
             state._fsp--;
@@ -19054,22 +19054,22 @@ public final void rule__OrExpression__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__OrExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6566:1: rule__OrExpression__Group__1__Impl : ( ( rule__OrExpression__Group_1__0 )* ) ;
+    // InternalExport.g:6566:1: rule__OrExpression__Group__1__Impl : ( ( rule__OrExpression__Group_1__0 )* ) ;
     public final void rule__OrExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6570:1: ( ( ( rule__OrExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6571:1: ( ( rule__OrExpression__Group_1__0 )* )
+            // InternalExport.g:6570:1: ( ( ( rule__OrExpression__Group_1__0 )* ) )
+            // InternalExport.g:6571:1: ( ( rule__OrExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6571:1: ( ( rule__OrExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6572:1: ( rule__OrExpression__Group_1__0 )*
+            // InternalExport.g:6571:1: ( ( rule__OrExpression__Group_1__0 )* )
+            // InternalExport.g:6572:1: ( rule__OrExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOrExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6573:1: ( rule__OrExpression__Group_1__0 )*
+            // InternalExport.g:6573:1: ( rule__OrExpression__Group_1__0 )*
             loop52:
             do {
                 int alt52=2;
@@ -19082,9 +19082,9 @@ public final void rule__OrExpression__Group__1__Impl() throws RecognitionExcepti
 
                 switch (alt52) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6573:2: rule__OrExpression__Group_1__0
+            	    // InternalExport.g:6573:2: rule__OrExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__OrExpression__Group_1__0_in_rule__OrExpression__Group__1__Impl13372);
+            	    pushFollow(FOLLOW_51);
             	    rule__OrExpression__Group_1__0();
 
             	    state._fsp--;
@@ -19123,21 +19123,21 @@ public final void rule__OrExpression__Group__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__OrExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6587:1: rule__OrExpression__Group_1__0 : rule__OrExpression__Group_1__0__Impl rule__OrExpression__Group_1__1 ;
+    // InternalExport.g:6587:1: rule__OrExpression__Group_1__0 : rule__OrExpression__Group_1__0__Impl rule__OrExpression__Group_1__1 ;
     public final void rule__OrExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6591:1: ( rule__OrExpression__Group_1__0__Impl rule__OrExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6592:2: rule__OrExpression__Group_1__0__Impl rule__OrExpression__Group_1__1
+            // InternalExport.g:6591:1: ( rule__OrExpression__Group_1__0__Impl rule__OrExpression__Group_1__1 )
+            // InternalExport.g:6592:2: rule__OrExpression__Group_1__0__Impl rule__OrExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__OrExpression__Group_1__0__Impl_in_rule__OrExpression__Group_1__013407);
+            pushFollow(FOLLOW_50);
             rule__OrExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OrExpression__Group_1__1_in_rule__OrExpression__Group_1__013410);
+            pushFollow(FOLLOW_2);
             rule__OrExpression__Group_1__1();
 
             state._fsp--;
@@ -19161,23 +19161,23 @@ public final void rule__OrExpression__Group_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__OrExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6599:1: rule__OrExpression__Group_1__0__Impl : ( () ) ;
+    // InternalExport.g:6599:1: rule__OrExpression__Group_1__0__Impl : ( () ) ;
     public final void rule__OrExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6603:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6604:1: ( () )
+            // InternalExport.g:6603:1: ( ( () ) )
+            // InternalExport.g:6604:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6604:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6605:1: ()
+            // InternalExport.g:6604:1: ( () )
+            // InternalExport.g:6605:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOrExpressionAccess().getBooleanOperationLeftAction_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6606:1: ()
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6608:1: 
+            // InternalExport.g:6606:1: ()
+            // InternalExport.g:6608:1: 
             {
             }
 
@@ -19202,21 +19202,21 @@ public final void rule__OrExpression__Group_1__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__OrExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6618:1: rule__OrExpression__Group_1__1 : rule__OrExpression__Group_1__1__Impl rule__OrExpression__Group_1__2 ;
+    // InternalExport.g:6618:1: rule__OrExpression__Group_1__1 : rule__OrExpression__Group_1__1__Impl rule__OrExpression__Group_1__2 ;
     public final void rule__OrExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6622:1: ( rule__OrExpression__Group_1__1__Impl rule__OrExpression__Group_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6623:2: rule__OrExpression__Group_1__1__Impl rule__OrExpression__Group_1__2
+            // InternalExport.g:6622:1: ( rule__OrExpression__Group_1__1__Impl rule__OrExpression__Group_1__2 )
+            // InternalExport.g:6623:2: rule__OrExpression__Group_1__1__Impl rule__OrExpression__Group_1__2
             {
-            pushFollow(FOLLOW_rule__OrExpression__Group_1__1__Impl_in_rule__OrExpression__Group_1__113468);
+            pushFollow(FOLLOW_49);
             rule__OrExpression__Group_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OrExpression__Group_1__2_in_rule__OrExpression__Group_1__113471);
+            pushFollow(FOLLOW_2);
             rule__OrExpression__Group_1__2();
 
             state._fsp--;
@@ -19240,25 +19240,25 @@ public final void rule__OrExpression__Group_1__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__OrExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6630:1: rule__OrExpression__Group_1__1__Impl : ( ( rule__OrExpression__OperatorAssignment_1_1 ) ) ;
+    // InternalExport.g:6630:1: rule__OrExpression__Group_1__1__Impl : ( ( rule__OrExpression__OperatorAssignment_1_1 ) ) ;
     public final void rule__OrExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6634:1: ( ( ( rule__OrExpression__OperatorAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6635:1: ( ( rule__OrExpression__OperatorAssignment_1_1 ) )
+            // InternalExport.g:6634:1: ( ( ( rule__OrExpression__OperatorAssignment_1_1 ) ) )
+            // InternalExport.g:6635:1: ( ( rule__OrExpression__OperatorAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6635:1: ( ( rule__OrExpression__OperatorAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6636:1: ( rule__OrExpression__OperatorAssignment_1_1 )
+            // InternalExport.g:6635:1: ( ( rule__OrExpression__OperatorAssignment_1_1 ) )
+            // InternalExport.g:6636:1: ( rule__OrExpression__OperatorAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOrExpressionAccess().getOperatorAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6637:1: ( rule__OrExpression__OperatorAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6637:2: rule__OrExpression__OperatorAssignment_1_1
+            // InternalExport.g:6637:1: ( rule__OrExpression__OperatorAssignment_1_1 )
+            // InternalExport.g:6637:2: rule__OrExpression__OperatorAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__OrExpression__OperatorAssignment_1_1_in_rule__OrExpression__Group_1__1__Impl13498);
+            pushFollow(FOLLOW_2);
             rule__OrExpression__OperatorAssignment_1_1();
 
             state._fsp--;
@@ -19291,16 +19291,16 @@ public final void rule__OrExpression__Group_1__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__OrExpression__Group_1__2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6647:1: rule__OrExpression__Group_1__2 : rule__OrExpression__Group_1__2__Impl ;
+    // InternalExport.g:6647:1: rule__OrExpression__Group_1__2 : rule__OrExpression__Group_1__2__Impl ;
     public final void rule__OrExpression__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6651:1: ( rule__OrExpression__Group_1__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6652:2: rule__OrExpression__Group_1__2__Impl
+            // InternalExport.g:6651:1: ( rule__OrExpression__Group_1__2__Impl )
+            // InternalExport.g:6652:2: rule__OrExpression__Group_1__2__Impl
             {
-            pushFollow(FOLLOW_rule__OrExpression__Group_1__2__Impl_in_rule__OrExpression__Group_1__213528);
+            pushFollow(FOLLOW_2);
             rule__OrExpression__Group_1__2__Impl();
 
             state._fsp--;
@@ -19324,25 +19324,25 @@ public final void rule__OrExpression__Group_1__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__OrExpression__Group_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6658:1: rule__OrExpression__Group_1__2__Impl : ( ( rule__OrExpression__RightAssignment_1_2 ) ) ;
+    // InternalExport.g:6658:1: rule__OrExpression__Group_1__2__Impl : ( ( rule__OrExpression__RightAssignment_1_2 ) ) ;
     public final void rule__OrExpression__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6662:1: ( ( ( rule__OrExpression__RightAssignment_1_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6663:1: ( ( rule__OrExpression__RightAssignment_1_2 ) )
+            // InternalExport.g:6662:1: ( ( ( rule__OrExpression__RightAssignment_1_2 ) ) )
+            // InternalExport.g:6663:1: ( ( rule__OrExpression__RightAssignment_1_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6663:1: ( ( rule__OrExpression__RightAssignment_1_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6664:1: ( rule__OrExpression__RightAssignment_1_2 )
+            // InternalExport.g:6663:1: ( ( rule__OrExpression__RightAssignment_1_2 ) )
+            // InternalExport.g:6664:1: ( rule__OrExpression__RightAssignment_1_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOrExpressionAccess().getRightAssignment_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6665:1: ( rule__OrExpression__RightAssignment_1_2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6665:2: rule__OrExpression__RightAssignment_1_2
+            // InternalExport.g:6665:1: ( rule__OrExpression__RightAssignment_1_2 )
+            // InternalExport.g:6665:2: rule__OrExpression__RightAssignment_1_2
             {
-            pushFollow(FOLLOW_rule__OrExpression__RightAssignment_1_2_in_rule__OrExpression__Group_1__2__Impl13555);
+            pushFollow(FOLLOW_2);
             rule__OrExpression__RightAssignment_1_2();
 
             state._fsp--;
@@ -19375,21 +19375,21 @@ public final void rule__OrExpression__Group_1__2__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__AndExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6681:1: rule__AndExpression__Group__0 : rule__AndExpression__Group__0__Impl rule__AndExpression__Group__1 ;
+    // InternalExport.g:6681:1: rule__AndExpression__Group__0 : rule__AndExpression__Group__0__Impl rule__AndExpression__Group__1 ;
     public final void rule__AndExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6685:1: ( rule__AndExpression__Group__0__Impl rule__AndExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6686:2: rule__AndExpression__Group__0__Impl rule__AndExpression__Group__1
+            // InternalExport.g:6685:1: ( rule__AndExpression__Group__0__Impl rule__AndExpression__Group__1 )
+            // InternalExport.g:6686:2: rule__AndExpression__Group__0__Impl rule__AndExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__AndExpression__Group__0__Impl_in_rule__AndExpression__Group__013591);
+            pushFollow(FOLLOW_52);
             rule__AndExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__AndExpression__Group__1_in_rule__AndExpression__Group__013594);
+            pushFollow(FOLLOW_2);
             rule__AndExpression__Group__1();
 
             state._fsp--;
@@ -19413,22 +19413,22 @@ public final void rule__AndExpression__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__AndExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6693:1: rule__AndExpression__Group__0__Impl : ( ruleImpliesExpression ) ;
+    // InternalExport.g:6693:1: rule__AndExpression__Group__0__Impl : ( ruleImpliesExpression ) ;
     public final void rule__AndExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6697:1: ( ( ruleImpliesExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6698:1: ( ruleImpliesExpression )
+            // InternalExport.g:6697:1: ( ( ruleImpliesExpression ) )
+            // InternalExport.g:6698:1: ( ruleImpliesExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6698:1: ( ruleImpliesExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6699:1: ruleImpliesExpression
+            // InternalExport.g:6698:1: ( ruleImpliesExpression )
+            // InternalExport.g:6699:1: ruleImpliesExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAndExpressionAccess().getImpliesExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleImpliesExpression_in_rule__AndExpression__Group__0__Impl13621);
+            pushFollow(FOLLOW_2);
             ruleImpliesExpression();
 
             state._fsp--;
@@ -19458,16 +19458,16 @@ public final void rule__AndExpression__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__AndExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6710:1: rule__AndExpression__Group__1 : rule__AndExpression__Group__1__Impl ;
+    // InternalExport.g:6710:1: rule__AndExpression__Group__1 : rule__AndExpression__Group__1__Impl ;
     public final void rule__AndExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6714:1: ( rule__AndExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6715:2: rule__AndExpression__Group__1__Impl
+            // InternalExport.g:6714:1: ( rule__AndExpression__Group__1__Impl )
+            // InternalExport.g:6715:2: rule__AndExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__AndExpression__Group__1__Impl_in_rule__AndExpression__Group__113650);
+            pushFollow(FOLLOW_2);
             rule__AndExpression__Group__1__Impl();
 
             state._fsp--;
@@ -19491,22 +19491,22 @@ public final void rule__AndExpression__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__AndExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6721:1: rule__AndExpression__Group__1__Impl : ( ( rule__AndExpression__Group_1__0 )* ) ;
+    // InternalExport.g:6721:1: rule__AndExpression__Group__1__Impl : ( ( rule__AndExpression__Group_1__0 )* ) ;
     public final void rule__AndExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6725:1: ( ( ( rule__AndExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6726:1: ( ( rule__AndExpression__Group_1__0 )* )
+            // InternalExport.g:6725:1: ( ( ( rule__AndExpression__Group_1__0 )* ) )
+            // InternalExport.g:6726:1: ( ( rule__AndExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6726:1: ( ( rule__AndExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6727:1: ( rule__AndExpression__Group_1__0 )*
+            // InternalExport.g:6726:1: ( ( rule__AndExpression__Group_1__0 )* )
+            // InternalExport.g:6727:1: ( rule__AndExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAndExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6728:1: ( rule__AndExpression__Group_1__0 )*
+            // InternalExport.g:6728:1: ( rule__AndExpression__Group_1__0 )*
             loop53:
             do {
                 int alt53=2;
@@ -19519,9 +19519,9 @@ public final void rule__AndExpression__Group__1__Impl() throws RecognitionExcept
 
                 switch (alt53) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6728:2: rule__AndExpression__Group_1__0
+            	    // InternalExport.g:6728:2: rule__AndExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__AndExpression__Group_1__0_in_rule__AndExpression__Group__1__Impl13677);
+            	    pushFollow(FOLLOW_53);
             	    rule__AndExpression__Group_1__0();
 
             	    state._fsp--;
@@ -19560,21 +19560,21 @@ public final void rule__AndExpression__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__AndExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6742:1: rule__AndExpression__Group_1__0 : rule__AndExpression__Group_1__0__Impl rule__AndExpression__Group_1__1 ;
+    // InternalExport.g:6742:1: rule__AndExpression__Group_1__0 : rule__AndExpression__Group_1__0__Impl rule__AndExpression__Group_1__1 ;
     public final void rule__AndExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6746:1: ( rule__AndExpression__Group_1__0__Impl rule__AndExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6747:2: rule__AndExpression__Group_1__0__Impl rule__AndExpression__Group_1__1
+            // InternalExport.g:6746:1: ( rule__AndExpression__Group_1__0__Impl rule__AndExpression__Group_1__1 )
+            // InternalExport.g:6747:2: rule__AndExpression__Group_1__0__Impl rule__AndExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__AndExpression__Group_1__0__Impl_in_rule__AndExpression__Group_1__013712);
+            pushFollow(FOLLOW_52);
             rule__AndExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__AndExpression__Group_1__1_in_rule__AndExpression__Group_1__013715);
+            pushFollow(FOLLOW_2);
             rule__AndExpression__Group_1__1();
 
             state._fsp--;
@@ -19598,23 +19598,23 @@ public final void rule__AndExpression__Group_1__0() throws RecognitionException
 
 
     // $ANTLR start "rule__AndExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6754:1: rule__AndExpression__Group_1__0__Impl : ( () ) ;
+    // InternalExport.g:6754:1: rule__AndExpression__Group_1__0__Impl : ( () ) ;
     public final void rule__AndExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6758:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6759:1: ( () )
+            // InternalExport.g:6758:1: ( ( () ) )
+            // InternalExport.g:6759:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6759:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6760:1: ()
+            // InternalExport.g:6759:1: ( () )
+            // InternalExport.g:6760:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAndExpressionAccess().getBooleanOperationLeftAction_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6761:1: ()
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6763:1: 
+            // InternalExport.g:6761:1: ()
+            // InternalExport.g:6763:1: 
             {
             }
 
@@ -19639,21 +19639,21 @@ public final void rule__AndExpression__Group_1__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__AndExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6773:1: rule__AndExpression__Group_1__1 : rule__AndExpression__Group_1__1__Impl rule__AndExpression__Group_1__2 ;
+    // InternalExport.g:6773:1: rule__AndExpression__Group_1__1 : rule__AndExpression__Group_1__1__Impl rule__AndExpression__Group_1__2 ;
     public final void rule__AndExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6777:1: ( rule__AndExpression__Group_1__1__Impl rule__AndExpression__Group_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6778:2: rule__AndExpression__Group_1__1__Impl rule__AndExpression__Group_1__2
+            // InternalExport.g:6777:1: ( rule__AndExpression__Group_1__1__Impl rule__AndExpression__Group_1__2 )
+            // InternalExport.g:6778:2: rule__AndExpression__Group_1__1__Impl rule__AndExpression__Group_1__2
             {
-            pushFollow(FOLLOW_rule__AndExpression__Group_1__1__Impl_in_rule__AndExpression__Group_1__113773);
+            pushFollow(FOLLOW_49);
             rule__AndExpression__Group_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__AndExpression__Group_1__2_in_rule__AndExpression__Group_1__113776);
+            pushFollow(FOLLOW_2);
             rule__AndExpression__Group_1__2();
 
             state._fsp--;
@@ -19677,25 +19677,25 @@ public final void rule__AndExpression__Group_1__1() throws RecognitionException
 
 
     // $ANTLR start "rule__AndExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6785:1: rule__AndExpression__Group_1__1__Impl : ( ( rule__AndExpression__OperatorAssignment_1_1 ) ) ;
+    // InternalExport.g:6785:1: rule__AndExpression__Group_1__1__Impl : ( ( rule__AndExpression__OperatorAssignment_1_1 ) ) ;
     public final void rule__AndExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6789:1: ( ( ( rule__AndExpression__OperatorAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6790:1: ( ( rule__AndExpression__OperatorAssignment_1_1 ) )
+            // InternalExport.g:6789:1: ( ( ( rule__AndExpression__OperatorAssignment_1_1 ) ) )
+            // InternalExport.g:6790:1: ( ( rule__AndExpression__OperatorAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6790:1: ( ( rule__AndExpression__OperatorAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6791:1: ( rule__AndExpression__OperatorAssignment_1_1 )
+            // InternalExport.g:6790:1: ( ( rule__AndExpression__OperatorAssignment_1_1 ) )
+            // InternalExport.g:6791:1: ( rule__AndExpression__OperatorAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAndExpressionAccess().getOperatorAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6792:1: ( rule__AndExpression__OperatorAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6792:2: rule__AndExpression__OperatorAssignment_1_1
+            // InternalExport.g:6792:1: ( rule__AndExpression__OperatorAssignment_1_1 )
+            // InternalExport.g:6792:2: rule__AndExpression__OperatorAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__AndExpression__OperatorAssignment_1_1_in_rule__AndExpression__Group_1__1__Impl13803);
+            pushFollow(FOLLOW_2);
             rule__AndExpression__OperatorAssignment_1_1();
 
             state._fsp--;
@@ -19728,16 +19728,16 @@ public final void rule__AndExpression__Group_1__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__AndExpression__Group_1__2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6802:1: rule__AndExpression__Group_1__2 : rule__AndExpression__Group_1__2__Impl ;
+    // InternalExport.g:6802:1: rule__AndExpression__Group_1__2 : rule__AndExpression__Group_1__2__Impl ;
     public final void rule__AndExpression__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6806:1: ( rule__AndExpression__Group_1__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6807:2: rule__AndExpression__Group_1__2__Impl
+            // InternalExport.g:6806:1: ( rule__AndExpression__Group_1__2__Impl )
+            // InternalExport.g:6807:2: rule__AndExpression__Group_1__2__Impl
             {
-            pushFollow(FOLLOW_rule__AndExpression__Group_1__2__Impl_in_rule__AndExpression__Group_1__213833);
+            pushFollow(FOLLOW_2);
             rule__AndExpression__Group_1__2__Impl();
 
             state._fsp--;
@@ -19761,25 +19761,25 @@ public final void rule__AndExpression__Group_1__2() throws RecognitionException
 
 
     // $ANTLR start "rule__AndExpression__Group_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6813:1: rule__AndExpression__Group_1__2__Impl : ( ( rule__AndExpression__RightAssignment_1_2 ) ) ;
+    // InternalExport.g:6813:1: rule__AndExpression__Group_1__2__Impl : ( ( rule__AndExpression__RightAssignment_1_2 ) ) ;
     public final void rule__AndExpression__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6817:1: ( ( ( rule__AndExpression__RightAssignment_1_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6818:1: ( ( rule__AndExpression__RightAssignment_1_2 ) )
+            // InternalExport.g:6817:1: ( ( ( rule__AndExpression__RightAssignment_1_2 ) ) )
+            // InternalExport.g:6818:1: ( ( rule__AndExpression__RightAssignment_1_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6818:1: ( ( rule__AndExpression__RightAssignment_1_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6819:1: ( rule__AndExpression__RightAssignment_1_2 )
+            // InternalExport.g:6818:1: ( ( rule__AndExpression__RightAssignment_1_2 ) )
+            // InternalExport.g:6819:1: ( rule__AndExpression__RightAssignment_1_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAndExpressionAccess().getRightAssignment_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6820:1: ( rule__AndExpression__RightAssignment_1_2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6820:2: rule__AndExpression__RightAssignment_1_2
+            // InternalExport.g:6820:1: ( rule__AndExpression__RightAssignment_1_2 )
+            // InternalExport.g:6820:2: rule__AndExpression__RightAssignment_1_2
             {
-            pushFollow(FOLLOW_rule__AndExpression__RightAssignment_1_2_in_rule__AndExpression__Group_1__2__Impl13860);
+            pushFollow(FOLLOW_2);
             rule__AndExpression__RightAssignment_1_2();
 
             state._fsp--;
@@ -19812,21 +19812,21 @@ public final void rule__AndExpression__Group_1__2__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__ImpliesExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6836:1: rule__ImpliesExpression__Group__0 : rule__ImpliesExpression__Group__0__Impl rule__ImpliesExpression__Group__1 ;
+    // InternalExport.g:6836:1: rule__ImpliesExpression__Group__0 : rule__ImpliesExpression__Group__0__Impl rule__ImpliesExpression__Group__1 ;
     public final void rule__ImpliesExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6840:1: ( rule__ImpliesExpression__Group__0__Impl rule__ImpliesExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6841:2: rule__ImpliesExpression__Group__0__Impl rule__ImpliesExpression__Group__1
+            // InternalExport.g:6840:1: ( rule__ImpliesExpression__Group__0__Impl rule__ImpliesExpression__Group__1 )
+            // InternalExport.g:6841:2: rule__ImpliesExpression__Group__0__Impl rule__ImpliesExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__ImpliesExpression__Group__0__Impl_in_rule__ImpliesExpression__Group__013896);
+            pushFollow(FOLLOW_54);
             rule__ImpliesExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ImpliesExpression__Group__1_in_rule__ImpliesExpression__Group__013899);
+            pushFollow(FOLLOW_2);
             rule__ImpliesExpression__Group__1();
 
             state._fsp--;
@@ -19850,22 +19850,22 @@ public final void rule__ImpliesExpression__Group__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ImpliesExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6848:1: rule__ImpliesExpression__Group__0__Impl : ( ruleRelationalExpression ) ;
+    // InternalExport.g:6848:1: rule__ImpliesExpression__Group__0__Impl : ( ruleRelationalExpression ) ;
     public final void rule__ImpliesExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6852:1: ( ( ruleRelationalExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6853:1: ( ruleRelationalExpression )
+            // InternalExport.g:6852:1: ( ( ruleRelationalExpression ) )
+            // InternalExport.g:6853:1: ( ruleRelationalExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6853:1: ( ruleRelationalExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6854:1: ruleRelationalExpression
+            // InternalExport.g:6853:1: ( ruleRelationalExpression )
+            // InternalExport.g:6854:1: ruleRelationalExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImpliesExpressionAccess().getRelationalExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleRelationalExpression_in_rule__ImpliesExpression__Group__0__Impl13926);
+            pushFollow(FOLLOW_2);
             ruleRelationalExpression();
 
             state._fsp--;
@@ -19895,16 +19895,16 @@ public final void rule__ImpliesExpression__Group__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__ImpliesExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6865:1: rule__ImpliesExpression__Group__1 : rule__ImpliesExpression__Group__1__Impl ;
+    // InternalExport.g:6865:1: rule__ImpliesExpression__Group__1 : rule__ImpliesExpression__Group__1__Impl ;
     public final void rule__ImpliesExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6869:1: ( rule__ImpliesExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6870:2: rule__ImpliesExpression__Group__1__Impl
+            // InternalExport.g:6869:1: ( rule__ImpliesExpression__Group__1__Impl )
+            // InternalExport.g:6870:2: rule__ImpliesExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__ImpliesExpression__Group__1__Impl_in_rule__ImpliesExpression__Group__113955);
+            pushFollow(FOLLOW_2);
             rule__ImpliesExpression__Group__1__Impl();
 
             state._fsp--;
@@ -19928,22 +19928,22 @@ public final void rule__ImpliesExpression__Group__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ImpliesExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6876:1: rule__ImpliesExpression__Group__1__Impl : ( ( rule__ImpliesExpression__Group_1__0 )* ) ;
+    // InternalExport.g:6876:1: rule__ImpliesExpression__Group__1__Impl : ( ( rule__ImpliesExpression__Group_1__0 )* ) ;
     public final void rule__ImpliesExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6880:1: ( ( ( rule__ImpliesExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6881:1: ( ( rule__ImpliesExpression__Group_1__0 )* )
+            // InternalExport.g:6880:1: ( ( ( rule__ImpliesExpression__Group_1__0 )* ) )
+            // InternalExport.g:6881:1: ( ( rule__ImpliesExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6881:1: ( ( rule__ImpliesExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6882:1: ( rule__ImpliesExpression__Group_1__0 )*
+            // InternalExport.g:6881:1: ( ( rule__ImpliesExpression__Group_1__0 )* )
+            // InternalExport.g:6882:1: ( rule__ImpliesExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImpliesExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6883:1: ( rule__ImpliesExpression__Group_1__0 )*
+            // InternalExport.g:6883:1: ( rule__ImpliesExpression__Group_1__0 )*
             loop54:
             do {
                 int alt54=2;
@@ -19956,9 +19956,9 @@ public final void rule__ImpliesExpression__Group__1__Impl() throws RecognitionEx
 
                 switch (alt54) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6883:2: rule__ImpliesExpression__Group_1__0
+            	    // InternalExport.g:6883:2: rule__ImpliesExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__ImpliesExpression__Group_1__0_in_rule__ImpliesExpression__Group__1__Impl13982);
+            	    pushFollow(FOLLOW_55);
             	    rule__ImpliesExpression__Group_1__0();
 
             	    state._fsp--;
@@ -19997,21 +19997,21 @@ public final void rule__ImpliesExpression__Group__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__ImpliesExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6897:1: rule__ImpliesExpression__Group_1__0 : rule__ImpliesExpression__Group_1__0__Impl rule__ImpliesExpression__Group_1__1 ;
+    // InternalExport.g:6897:1: rule__ImpliesExpression__Group_1__0 : rule__ImpliesExpression__Group_1__0__Impl rule__ImpliesExpression__Group_1__1 ;
     public final void rule__ImpliesExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6901:1: ( rule__ImpliesExpression__Group_1__0__Impl rule__ImpliesExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6902:2: rule__ImpliesExpression__Group_1__0__Impl rule__ImpliesExpression__Group_1__1
+            // InternalExport.g:6901:1: ( rule__ImpliesExpression__Group_1__0__Impl rule__ImpliesExpression__Group_1__1 )
+            // InternalExport.g:6902:2: rule__ImpliesExpression__Group_1__0__Impl rule__ImpliesExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__ImpliesExpression__Group_1__0__Impl_in_rule__ImpliesExpression__Group_1__014017);
+            pushFollow(FOLLOW_54);
             rule__ImpliesExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ImpliesExpression__Group_1__1_in_rule__ImpliesExpression__Group_1__014020);
+            pushFollow(FOLLOW_2);
             rule__ImpliesExpression__Group_1__1();
 
             state._fsp--;
@@ -20035,23 +20035,23 @@ public final void rule__ImpliesExpression__Group_1__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ImpliesExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6909:1: rule__ImpliesExpression__Group_1__0__Impl : ( () ) ;
+    // InternalExport.g:6909:1: rule__ImpliesExpression__Group_1__0__Impl : ( () ) ;
     public final void rule__ImpliesExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6913:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6914:1: ( () )
+            // InternalExport.g:6913:1: ( ( () ) )
+            // InternalExport.g:6914:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6914:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6915:1: ()
+            // InternalExport.g:6914:1: ( () )
+            // InternalExport.g:6915:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImpliesExpressionAccess().getBooleanOperationLeftAction_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6916:1: ()
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6918:1: 
+            // InternalExport.g:6916:1: ()
+            // InternalExport.g:6918:1: 
             {
             }
 
@@ -20076,21 +20076,21 @@ public final void rule__ImpliesExpression__Group_1__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__ImpliesExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6928:1: rule__ImpliesExpression__Group_1__1 : rule__ImpliesExpression__Group_1__1__Impl rule__ImpliesExpression__Group_1__2 ;
+    // InternalExport.g:6928:1: rule__ImpliesExpression__Group_1__1 : rule__ImpliesExpression__Group_1__1__Impl rule__ImpliesExpression__Group_1__2 ;
     public final void rule__ImpliesExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6932:1: ( rule__ImpliesExpression__Group_1__1__Impl rule__ImpliesExpression__Group_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6933:2: rule__ImpliesExpression__Group_1__1__Impl rule__ImpliesExpression__Group_1__2
+            // InternalExport.g:6932:1: ( rule__ImpliesExpression__Group_1__1__Impl rule__ImpliesExpression__Group_1__2 )
+            // InternalExport.g:6933:2: rule__ImpliesExpression__Group_1__1__Impl rule__ImpliesExpression__Group_1__2
             {
-            pushFollow(FOLLOW_rule__ImpliesExpression__Group_1__1__Impl_in_rule__ImpliesExpression__Group_1__114078);
+            pushFollow(FOLLOW_49);
             rule__ImpliesExpression__Group_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ImpliesExpression__Group_1__2_in_rule__ImpliesExpression__Group_1__114081);
+            pushFollow(FOLLOW_2);
             rule__ImpliesExpression__Group_1__2();
 
             state._fsp--;
@@ -20114,25 +20114,25 @@ public final void rule__ImpliesExpression__Group_1__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ImpliesExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6940:1: rule__ImpliesExpression__Group_1__1__Impl : ( ( rule__ImpliesExpression__OperatorAssignment_1_1 ) ) ;
+    // InternalExport.g:6940:1: rule__ImpliesExpression__Group_1__1__Impl : ( ( rule__ImpliesExpression__OperatorAssignment_1_1 ) ) ;
     public final void rule__ImpliesExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6944:1: ( ( ( rule__ImpliesExpression__OperatorAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6945:1: ( ( rule__ImpliesExpression__OperatorAssignment_1_1 ) )
+            // InternalExport.g:6944:1: ( ( ( rule__ImpliesExpression__OperatorAssignment_1_1 ) ) )
+            // InternalExport.g:6945:1: ( ( rule__ImpliesExpression__OperatorAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6945:1: ( ( rule__ImpliesExpression__OperatorAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6946:1: ( rule__ImpliesExpression__OperatorAssignment_1_1 )
+            // InternalExport.g:6945:1: ( ( rule__ImpliesExpression__OperatorAssignment_1_1 ) )
+            // InternalExport.g:6946:1: ( rule__ImpliesExpression__OperatorAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImpliesExpressionAccess().getOperatorAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6947:1: ( rule__ImpliesExpression__OperatorAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6947:2: rule__ImpliesExpression__OperatorAssignment_1_1
+            // InternalExport.g:6947:1: ( rule__ImpliesExpression__OperatorAssignment_1_1 )
+            // InternalExport.g:6947:2: rule__ImpliesExpression__OperatorAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__ImpliesExpression__OperatorAssignment_1_1_in_rule__ImpliesExpression__Group_1__1__Impl14108);
+            pushFollow(FOLLOW_2);
             rule__ImpliesExpression__OperatorAssignment_1_1();
 
             state._fsp--;
@@ -20165,16 +20165,16 @@ public final void rule__ImpliesExpression__Group_1__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__ImpliesExpression__Group_1__2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6957:1: rule__ImpliesExpression__Group_1__2 : rule__ImpliesExpression__Group_1__2__Impl ;
+    // InternalExport.g:6957:1: rule__ImpliesExpression__Group_1__2 : rule__ImpliesExpression__Group_1__2__Impl ;
     public final void rule__ImpliesExpression__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6961:1: ( rule__ImpliesExpression__Group_1__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6962:2: rule__ImpliesExpression__Group_1__2__Impl
+            // InternalExport.g:6961:1: ( rule__ImpliesExpression__Group_1__2__Impl )
+            // InternalExport.g:6962:2: rule__ImpliesExpression__Group_1__2__Impl
             {
-            pushFollow(FOLLOW_rule__ImpliesExpression__Group_1__2__Impl_in_rule__ImpliesExpression__Group_1__214138);
+            pushFollow(FOLLOW_2);
             rule__ImpliesExpression__Group_1__2__Impl();
 
             state._fsp--;
@@ -20198,25 +20198,25 @@ public final void rule__ImpliesExpression__Group_1__2() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ImpliesExpression__Group_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6968:1: rule__ImpliesExpression__Group_1__2__Impl : ( ( rule__ImpliesExpression__RightAssignment_1_2 ) ) ;
+    // InternalExport.g:6968:1: rule__ImpliesExpression__Group_1__2__Impl : ( ( rule__ImpliesExpression__RightAssignment_1_2 ) ) ;
     public final void rule__ImpliesExpression__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6972:1: ( ( ( rule__ImpliesExpression__RightAssignment_1_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6973:1: ( ( rule__ImpliesExpression__RightAssignment_1_2 ) )
+            // InternalExport.g:6972:1: ( ( ( rule__ImpliesExpression__RightAssignment_1_2 ) ) )
+            // InternalExport.g:6973:1: ( ( rule__ImpliesExpression__RightAssignment_1_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6973:1: ( ( rule__ImpliesExpression__RightAssignment_1_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6974:1: ( rule__ImpliesExpression__RightAssignment_1_2 )
+            // InternalExport.g:6973:1: ( ( rule__ImpliesExpression__RightAssignment_1_2 ) )
+            // InternalExport.g:6974:1: ( rule__ImpliesExpression__RightAssignment_1_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImpliesExpressionAccess().getRightAssignment_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6975:1: ( rule__ImpliesExpression__RightAssignment_1_2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6975:2: rule__ImpliesExpression__RightAssignment_1_2
+            // InternalExport.g:6975:1: ( rule__ImpliesExpression__RightAssignment_1_2 )
+            // InternalExport.g:6975:2: rule__ImpliesExpression__RightAssignment_1_2
             {
-            pushFollow(FOLLOW_rule__ImpliesExpression__RightAssignment_1_2_in_rule__ImpliesExpression__Group_1__2__Impl14165);
+            pushFollow(FOLLOW_2);
             rule__ImpliesExpression__RightAssignment_1_2();
 
             state._fsp--;
@@ -20249,21 +20249,21 @@ public final void rule__ImpliesExpression__Group_1__2__Impl() throws Recognition
 
 
     // $ANTLR start "rule__RelationalExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6991:1: rule__RelationalExpression__Group__0 : rule__RelationalExpression__Group__0__Impl rule__RelationalExpression__Group__1 ;
+    // InternalExport.g:6991:1: rule__RelationalExpression__Group__0 : rule__RelationalExpression__Group__0__Impl rule__RelationalExpression__Group__1 ;
     public final void rule__RelationalExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6995:1: ( rule__RelationalExpression__Group__0__Impl rule__RelationalExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:6996:2: rule__RelationalExpression__Group__0__Impl rule__RelationalExpression__Group__1
+            // InternalExport.g:6995:1: ( rule__RelationalExpression__Group__0__Impl rule__RelationalExpression__Group__1 )
+            // InternalExport.g:6996:2: rule__RelationalExpression__Group__0__Impl rule__RelationalExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__RelationalExpression__Group__0__Impl_in_rule__RelationalExpression__Group__014201);
+            pushFollow(FOLLOW_56);
             rule__RelationalExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__RelationalExpression__Group__1_in_rule__RelationalExpression__Group__014204);
+            pushFollow(FOLLOW_2);
             rule__RelationalExpression__Group__1();
 
             state._fsp--;
@@ -20287,22 +20287,22 @@ public final void rule__RelationalExpression__Group__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__RelationalExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7003:1: rule__RelationalExpression__Group__0__Impl : ( ruleAdditiveExpression ) ;
+    // InternalExport.g:7003:1: rule__RelationalExpression__Group__0__Impl : ( ruleAdditiveExpression ) ;
     public final void rule__RelationalExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7007:1: ( ( ruleAdditiveExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7008:1: ( ruleAdditiveExpression )
+            // InternalExport.g:7007:1: ( ( ruleAdditiveExpression ) )
+            // InternalExport.g:7008:1: ( ruleAdditiveExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7008:1: ( ruleAdditiveExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7009:1: ruleAdditiveExpression
+            // InternalExport.g:7008:1: ( ruleAdditiveExpression )
+            // InternalExport.g:7009:1: ruleAdditiveExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRelationalExpressionAccess().getAdditiveExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleAdditiveExpression_in_rule__RelationalExpression__Group__0__Impl14231);
+            pushFollow(FOLLOW_2);
             ruleAdditiveExpression();
 
             state._fsp--;
@@ -20332,16 +20332,16 @@ public final void rule__RelationalExpression__Group__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__RelationalExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7020:1: rule__RelationalExpression__Group__1 : rule__RelationalExpression__Group__1__Impl ;
+    // InternalExport.g:7020:1: rule__RelationalExpression__Group__1 : rule__RelationalExpression__Group__1__Impl ;
     public final void rule__RelationalExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7024:1: ( rule__RelationalExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7025:2: rule__RelationalExpression__Group__1__Impl
+            // InternalExport.g:7024:1: ( rule__RelationalExpression__Group__1__Impl )
+            // InternalExport.g:7025:2: rule__RelationalExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__RelationalExpression__Group__1__Impl_in_rule__RelationalExpression__Group__114260);
+            pushFollow(FOLLOW_2);
             rule__RelationalExpression__Group__1__Impl();
 
             state._fsp--;
@@ -20365,22 +20365,22 @@ public final void rule__RelationalExpression__Group__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__RelationalExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7031:1: rule__RelationalExpression__Group__1__Impl : ( ( rule__RelationalExpression__Group_1__0 )* ) ;
+    // InternalExport.g:7031:1: rule__RelationalExpression__Group__1__Impl : ( ( rule__RelationalExpression__Group_1__0 )* ) ;
     public final void rule__RelationalExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7035:1: ( ( ( rule__RelationalExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7036:1: ( ( rule__RelationalExpression__Group_1__0 )* )
+            // InternalExport.g:7035:1: ( ( ( rule__RelationalExpression__Group_1__0 )* ) )
+            // InternalExport.g:7036:1: ( ( rule__RelationalExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7036:1: ( ( rule__RelationalExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7037:1: ( rule__RelationalExpression__Group_1__0 )*
+            // InternalExport.g:7036:1: ( ( rule__RelationalExpression__Group_1__0 )* )
+            // InternalExport.g:7037:1: ( rule__RelationalExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRelationalExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7038:1: ( rule__RelationalExpression__Group_1__0 )*
+            // InternalExport.g:7038:1: ( rule__RelationalExpression__Group_1__0 )*
             loop55:
             do {
                 int alt55=2;
@@ -20393,9 +20393,9 @@ public final void rule__RelationalExpression__Group__1__Impl() throws Recognitio
 
                 switch (alt55) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7038:2: rule__RelationalExpression__Group_1__0
+            	    // InternalExport.g:7038:2: rule__RelationalExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__RelationalExpression__Group_1__0_in_rule__RelationalExpression__Group__1__Impl14287);
+            	    pushFollow(FOLLOW_57);
             	    rule__RelationalExpression__Group_1__0();
 
             	    state._fsp--;
@@ -20434,21 +20434,21 @@ public final void rule__RelationalExpression__Group__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__RelationalExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7052:1: rule__RelationalExpression__Group_1__0 : rule__RelationalExpression__Group_1__0__Impl rule__RelationalExpression__Group_1__1 ;
+    // InternalExport.g:7052:1: rule__RelationalExpression__Group_1__0 : rule__RelationalExpression__Group_1__0__Impl rule__RelationalExpression__Group_1__1 ;
     public final void rule__RelationalExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7056:1: ( rule__RelationalExpression__Group_1__0__Impl rule__RelationalExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7057:2: rule__RelationalExpression__Group_1__0__Impl rule__RelationalExpression__Group_1__1
+            // InternalExport.g:7056:1: ( rule__RelationalExpression__Group_1__0__Impl rule__RelationalExpression__Group_1__1 )
+            // InternalExport.g:7057:2: rule__RelationalExpression__Group_1__0__Impl rule__RelationalExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__RelationalExpression__Group_1__0__Impl_in_rule__RelationalExpression__Group_1__014322);
+            pushFollow(FOLLOW_56);
             rule__RelationalExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__RelationalExpression__Group_1__1_in_rule__RelationalExpression__Group_1__014325);
+            pushFollow(FOLLOW_2);
             rule__RelationalExpression__Group_1__1();
 
             state._fsp--;
@@ -20472,23 +20472,23 @@ public final void rule__RelationalExpression__Group_1__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__RelationalExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7064:1: rule__RelationalExpression__Group_1__0__Impl : ( () ) ;
+    // InternalExport.g:7064:1: rule__RelationalExpression__Group_1__0__Impl : ( () ) ;
     public final void rule__RelationalExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7068:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7069:1: ( () )
+            // InternalExport.g:7068:1: ( ( () ) )
+            // InternalExport.g:7069:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7069:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7070:1: ()
+            // InternalExport.g:7069:1: ( () )
+            // InternalExport.g:7070:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRelationalExpressionAccess().getBooleanOperationLeftAction_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7071:1: ()
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7073:1: 
+            // InternalExport.g:7071:1: ()
+            // InternalExport.g:7073:1: 
             {
             }
 
@@ -20513,21 +20513,21 @@ public final void rule__RelationalExpression__Group_1__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__RelationalExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7083:1: rule__RelationalExpression__Group_1__1 : rule__RelationalExpression__Group_1__1__Impl rule__RelationalExpression__Group_1__2 ;
+    // InternalExport.g:7083:1: rule__RelationalExpression__Group_1__1 : rule__RelationalExpression__Group_1__1__Impl rule__RelationalExpression__Group_1__2 ;
     public final void rule__RelationalExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7087:1: ( rule__RelationalExpression__Group_1__1__Impl rule__RelationalExpression__Group_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7088:2: rule__RelationalExpression__Group_1__1__Impl rule__RelationalExpression__Group_1__2
+            // InternalExport.g:7087:1: ( rule__RelationalExpression__Group_1__1__Impl rule__RelationalExpression__Group_1__2 )
+            // InternalExport.g:7088:2: rule__RelationalExpression__Group_1__1__Impl rule__RelationalExpression__Group_1__2
             {
-            pushFollow(FOLLOW_rule__RelationalExpression__Group_1__1__Impl_in_rule__RelationalExpression__Group_1__114383);
+            pushFollow(FOLLOW_49);
             rule__RelationalExpression__Group_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__RelationalExpression__Group_1__2_in_rule__RelationalExpression__Group_1__114386);
+            pushFollow(FOLLOW_2);
             rule__RelationalExpression__Group_1__2();
 
             state._fsp--;
@@ -20551,25 +20551,25 @@ public final void rule__RelationalExpression__Group_1__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__RelationalExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7095:1: rule__RelationalExpression__Group_1__1__Impl : ( ( rule__RelationalExpression__OperatorAssignment_1_1 ) ) ;
+    // InternalExport.g:7095:1: rule__RelationalExpression__Group_1__1__Impl : ( ( rule__RelationalExpression__OperatorAssignment_1_1 ) ) ;
     public final void rule__RelationalExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7099:1: ( ( ( rule__RelationalExpression__OperatorAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7100:1: ( ( rule__RelationalExpression__OperatorAssignment_1_1 ) )
+            // InternalExport.g:7099:1: ( ( ( rule__RelationalExpression__OperatorAssignment_1_1 ) ) )
+            // InternalExport.g:7100:1: ( ( rule__RelationalExpression__OperatorAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7100:1: ( ( rule__RelationalExpression__OperatorAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7101:1: ( rule__RelationalExpression__OperatorAssignment_1_1 )
+            // InternalExport.g:7100:1: ( ( rule__RelationalExpression__OperatorAssignment_1_1 ) )
+            // InternalExport.g:7101:1: ( rule__RelationalExpression__OperatorAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRelationalExpressionAccess().getOperatorAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7102:1: ( rule__RelationalExpression__OperatorAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7102:2: rule__RelationalExpression__OperatorAssignment_1_1
+            // InternalExport.g:7102:1: ( rule__RelationalExpression__OperatorAssignment_1_1 )
+            // InternalExport.g:7102:2: rule__RelationalExpression__OperatorAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__RelationalExpression__OperatorAssignment_1_1_in_rule__RelationalExpression__Group_1__1__Impl14413);
+            pushFollow(FOLLOW_2);
             rule__RelationalExpression__OperatorAssignment_1_1();
 
             state._fsp--;
@@ -20602,16 +20602,16 @@ public final void rule__RelationalExpression__Group_1__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__RelationalExpression__Group_1__2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7112:1: rule__RelationalExpression__Group_1__2 : rule__RelationalExpression__Group_1__2__Impl ;
+    // InternalExport.g:7112:1: rule__RelationalExpression__Group_1__2 : rule__RelationalExpression__Group_1__2__Impl ;
     public final void rule__RelationalExpression__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7116:1: ( rule__RelationalExpression__Group_1__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7117:2: rule__RelationalExpression__Group_1__2__Impl
+            // InternalExport.g:7116:1: ( rule__RelationalExpression__Group_1__2__Impl )
+            // InternalExport.g:7117:2: rule__RelationalExpression__Group_1__2__Impl
             {
-            pushFollow(FOLLOW_rule__RelationalExpression__Group_1__2__Impl_in_rule__RelationalExpression__Group_1__214443);
+            pushFollow(FOLLOW_2);
             rule__RelationalExpression__Group_1__2__Impl();
 
             state._fsp--;
@@ -20635,25 +20635,25 @@ public final void rule__RelationalExpression__Group_1__2() throws RecognitionExc
 
 
     // $ANTLR start "rule__RelationalExpression__Group_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7123:1: rule__RelationalExpression__Group_1__2__Impl : ( ( rule__RelationalExpression__RightAssignment_1_2 ) ) ;
+    // InternalExport.g:7123:1: rule__RelationalExpression__Group_1__2__Impl : ( ( rule__RelationalExpression__RightAssignment_1_2 ) ) ;
     public final void rule__RelationalExpression__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7127:1: ( ( ( rule__RelationalExpression__RightAssignment_1_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7128:1: ( ( rule__RelationalExpression__RightAssignment_1_2 ) )
+            // InternalExport.g:7127:1: ( ( ( rule__RelationalExpression__RightAssignment_1_2 ) ) )
+            // InternalExport.g:7128:1: ( ( rule__RelationalExpression__RightAssignment_1_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7128:1: ( ( rule__RelationalExpression__RightAssignment_1_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7129:1: ( rule__RelationalExpression__RightAssignment_1_2 )
+            // InternalExport.g:7128:1: ( ( rule__RelationalExpression__RightAssignment_1_2 ) )
+            // InternalExport.g:7129:1: ( rule__RelationalExpression__RightAssignment_1_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRelationalExpressionAccess().getRightAssignment_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7130:1: ( rule__RelationalExpression__RightAssignment_1_2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7130:2: rule__RelationalExpression__RightAssignment_1_2
+            // InternalExport.g:7130:1: ( rule__RelationalExpression__RightAssignment_1_2 )
+            // InternalExport.g:7130:2: rule__RelationalExpression__RightAssignment_1_2
             {
-            pushFollow(FOLLOW_rule__RelationalExpression__RightAssignment_1_2_in_rule__RelationalExpression__Group_1__2__Impl14470);
+            pushFollow(FOLLOW_2);
             rule__RelationalExpression__RightAssignment_1_2();
 
             state._fsp--;
@@ -20686,21 +20686,21 @@ public final void rule__RelationalExpression__Group_1__2__Impl() throws Recognit
 
 
     // $ANTLR start "rule__AdditiveExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7146:1: rule__AdditiveExpression__Group__0 : rule__AdditiveExpression__Group__0__Impl rule__AdditiveExpression__Group__1 ;
+    // InternalExport.g:7146:1: rule__AdditiveExpression__Group__0 : rule__AdditiveExpression__Group__0__Impl rule__AdditiveExpression__Group__1 ;
     public final void rule__AdditiveExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7150:1: ( rule__AdditiveExpression__Group__0__Impl rule__AdditiveExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7151:2: rule__AdditiveExpression__Group__0__Impl rule__AdditiveExpression__Group__1
+            // InternalExport.g:7150:1: ( rule__AdditiveExpression__Group__0__Impl rule__AdditiveExpression__Group__1 )
+            // InternalExport.g:7151:2: rule__AdditiveExpression__Group__0__Impl rule__AdditiveExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__AdditiveExpression__Group__0__Impl_in_rule__AdditiveExpression__Group__014506);
+            pushFollow(FOLLOW_58);
             rule__AdditiveExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__AdditiveExpression__Group__1_in_rule__AdditiveExpression__Group__014509);
+            pushFollow(FOLLOW_2);
             rule__AdditiveExpression__Group__1();
 
             state._fsp--;
@@ -20724,22 +20724,22 @@ public final void rule__AdditiveExpression__Group__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__AdditiveExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7158:1: rule__AdditiveExpression__Group__0__Impl : ( ruleMultiplicativeExpression ) ;
+    // InternalExport.g:7158:1: rule__AdditiveExpression__Group__0__Impl : ( ruleMultiplicativeExpression ) ;
     public final void rule__AdditiveExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7162:1: ( ( ruleMultiplicativeExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7163:1: ( ruleMultiplicativeExpression )
+            // InternalExport.g:7162:1: ( ( ruleMultiplicativeExpression ) )
+            // InternalExport.g:7163:1: ( ruleMultiplicativeExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7163:1: ( ruleMultiplicativeExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7164:1: ruleMultiplicativeExpression
+            // InternalExport.g:7163:1: ( ruleMultiplicativeExpression )
+            // InternalExport.g:7164:1: ruleMultiplicativeExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAdditiveExpressionAccess().getMultiplicativeExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleMultiplicativeExpression_in_rule__AdditiveExpression__Group__0__Impl14536);
+            pushFollow(FOLLOW_2);
             ruleMultiplicativeExpression();
 
             state._fsp--;
@@ -20769,16 +20769,16 @@ public final void rule__AdditiveExpression__Group__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__AdditiveExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7175:1: rule__AdditiveExpression__Group__1 : rule__AdditiveExpression__Group__1__Impl ;
+    // InternalExport.g:7175:1: rule__AdditiveExpression__Group__1 : rule__AdditiveExpression__Group__1__Impl ;
     public final void rule__AdditiveExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7179:1: ( rule__AdditiveExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7180:2: rule__AdditiveExpression__Group__1__Impl
+            // InternalExport.g:7179:1: ( rule__AdditiveExpression__Group__1__Impl )
+            // InternalExport.g:7180:2: rule__AdditiveExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__AdditiveExpression__Group__1__Impl_in_rule__AdditiveExpression__Group__114565);
+            pushFollow(FOLLOW_2);
             rule__AdditiveExpression__Group__1__Impl();
 
             state._fsp--;
@@ -20802,22 +20802,22 @@ public final void rule__AdditiveExpression__Group__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__AdditiveExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7186:1: rule__AdditiveExpression__Group__1__Impl : ( ( rule__AdditiveExpression__Group_1__0 )* ) ;
+    // InternalExport.g:7186:1: rule__AdditiveExpression__Group__1__Impl : ( ( rule__AdditiveExpression__Group_1__0 )* ) ;
     public final void rule__AdditiveExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7190:1: ( ( ( rule__AdditiveExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7191:1: ( ( rule__AdditiveExpression__Group_1__0 )* )
+            // InternalExport.g:7190:1: ( ( ( rule__AdditiveExpression__Group_1__0 )* ) )
+            // InternalExport.g:7191:1: ( ( rule__AdditiveExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7191:1: ( ( rule__AdditiveExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7192:1: ( rule__AdditiveExpression__Group_1__0 )*
+            // InternalExport.g:7191:1: ( ( rule__AdditiveExpression__Group_1__0 )* )
+            // InternalExport.g:7192:1: ( rule__AdditiveExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAdditiveExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7193:1: ( rule__AdditiveExpression__Group_1__0 )*
+            // InternalExport.g:7193:1: ( rule__AdditiveExpression__Group_1__0 )*
             loop56:
             do {
                 int alt56=2;
@@ -20830,9 +20830,9 @@ public final void rule__AdditiveExpression__Group__1__Impl() throws RecognitionE
 
                 switch (alt56) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7193:2: rule__AdditiveExpression__Group_1__0
+            	    // InternalExport.g:7193:2: rule__AdditiveExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__AdditiveExpression__Group_1__0_in_rule__AdditiveExpression__Group__1__Impl14592);
+            	    pushFollow(FOLLOW_59);
             	    rule__AdditiveExpression__Group_1__0();
 
             	    state._fsp--;
@@ -20871,21 +20871,21 @@ public final void rule__AdditiveExpression__Group__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__AdditiveExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7207:1: rule__AdditiveExpression__Group_1__0 : rule__AdditiveExpression__Group_1__0__Impl rule__AdditiveExpression__Group_1__1 ;
+    // InternalExport.g:7207:1: rule__AdditiveExpression__Group_1__0 : rule__AdditiveExpression__Group_1__0__Impl rule__AdditiveExpression__Group_1__1 ;
     public final void rule__AdditiveExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7211:1: ( rule__AdditiveExpression__Group_1__0__Impl rule__AdditiveExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7212:2: rule__AdditiveExpression__Group_1__0__Impl rule__AdditiveExpression__Group_1__1
+            // InternalExport.g:7211:1: ( rule__AdditiveExpression__Group_1__0__Impl rule__AdditiveExpression__Group_1__1 )
+            // InternalExport.g:7212:2: rule__AdditiveExpression__Group_1__0__Impl rule__AdditiveExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__AdditiveExpression__Group_1__0__Impl_in_rule__AdditiveExpression__Group_1__014627);
+            pushFollow(FOLLOW_58);
             rule__AdditiveExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__AdditiveExpression__Group_1__1_in_rule__AdditiveExpression__Group_1__014630);
+            pushFollow(FOLLOW_2);
             rule__AdditiveExpression__Group_1__1();
 
             state._fsp--;
@@ -20909,23 +20909,23 @@ public final void rule__AdditiveExpression__Group_1__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__AdditiveExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7219:1: rule__AdditiveExpression__Group_1__0__Impl : ( () ) ;
+    // InternalExport.g:7219:1: rule__AdditiveExpression__Group_1__0__Impl : ( () ) ;
     public final void rule__AdditiveExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7223:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7224:1: ( () )
+            // InternalExport.g:7223:1: ( ( () ) )
+            // InternalExport.g:7224:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7224:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7225:1: ()
+            // InternalExport.g:7224:1: ( () )
+            // InternalExport.g:7225:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAdditiveExpressionAccess().getOperationCallParamsAction_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7226:1: ()
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7228:1: 
+            // InternalExport.g:7226:1: ()
+            // InternalExport.g:7228:1: 
             {
             }
 
@@ -20950,21 +20950,21 @@ public final void rule__AdditiveExpression__Group_1__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__AdditiveExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7238:1: rule__AdditiveExpression__Group_1__1 : rule__AdditiveExpression__Group_1__1__Impl rule__AdditiveExpression__Group_1__2 ;
+    // InternalExport.g:7238:1: rule__AdditiveExpression__Group_1__1 : rule__AdditiveExpression__Group_1__1__Impl rule__AdditiveExpression__Group_1__2 ;
     public final void rule__AdditiveExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7242:1: ( rule__AdditiveExpression__Group_1__1__Impl rule__AdditiveExpression__Group_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7243:2: rule__AdditiveExpression__Group_1__1__Impl rule__AdditiveExpression__Group_1__2
+            // InternalExport.g:7242:1: ( rule__AdditiveExpression__Group_1__1__Impl rule__AdditiveExpression__Group_1__2 )
+            // InternalExport.g:7243:2: rule__AdditiveExpression__Group_1__1__Impl rule__AdditiveExpression__Group_1__2
             {
-            pushFollow(FOLLOW_rule__AdditiveExpression__Group_1__1__Impl_in_rule__AdditiveExpression__Group_1__114688);
+            pushFollow(FOLLOW_49);
             rule__AdditiveExpression__Group_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__AdditiveExpression__Group_1__2_in_rule__AdditiveExpression__Group_1__114691);
+            pushFollow(FOLLOW_2);
             rule__AdditiveExpression__Group_1__2();
 
             state._fsp--;
@@ -20988,25 +20988,25 @@ public final void rule__AdditiveExpression__Group_1__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__AdditiveExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7250:1: rule__AdditiveExpression__Group_1__1__Impl : ( ( rule__AdditiveExpression__NameAssignment_1_1 ) ) ;
+    // InternalExport.g:7250:1: rule__AdditiveExpression__Group_1__1__Impl : ( ( rule__AdditiveExpression__NameAssignment_1_1 ) ) ;
     public final void rule__AdditiveExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7254:1: ( ( ( rule__AdditiveExpression__NameAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7255:1: ( ( rule__AdditiveExpression__NameAssignment_1_1 ) )
+            // InternalExport.g:7254:1: ( ( ( rule__AdditiveExpression__NameAssignment_1_1 ) ) )
+            // InternalExport.g:7255:1: ( ( rule__AdditiveExpression__NameAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7255:1: ( ( rule__AdditiveExpression__NameAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7256:1: ( rule__AdditiveExpression__NameAssignment_1_1 )
+            // InternalExport.g:7255:1: ( ( rule__AdditiveExpression__NameAssignment_1_1 ) )
+            // InternalExport.g:7256:1: ( rule__AdditiveExpression__NameAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAdditiveExpressionAccess().getNameAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7257:1: ( rule__AdditiveExpression__NameAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7257:2: rule__AdditiveExpression__NameAssignment_1_1
+            // InternalExport.g:7257:1: ( rule__AdditiveExpression__NameAssignment_1_1 )
+            // InternalExport.g:7257:2: rule__AdditiveExpression__NameAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__AdditiveExpression__NameAssignment_1_1_in_rule__AdditiveExpression__Group_1__1__Impl14718);
+            pushFollow(FOLLOW_2);
             rule__AdditiveExpression__NameAssignment_1_1();
 
             state._fsp--;
@@ -21039,16 +21039,16 @@ public final void rule__AdditiveExpression__Group_1__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__AdditiveExpression__Group_1__2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7267:1: rule__AdditiveExpression__Group_1__2 : rule__AdditiveExpression__Group_1__2__Impl ;
+    // InternalExport.g:7267:1: rule__AdditiveExpression__Group_1__2 : rule__AdditiveExpression__Group_1__2__Impl ;
     public final void rule__AdditiveExpression__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7271:1: ( rule__AdditiveExpression__Group_1__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7272:2: rule__AdditiveExpression__Group_1__2__Impl
+            // InternalExport.g:7271:1: ( rule__AdditiveExpression__Group_1__2__Impl )
+            // InternalExport.g:7272:2: rule__AdditiveExpression__Group_1__2__Impl
             {
-            pushFollow(FOLLOW_rule__AdditiveExpression__Group_1__2__Impl_in_rule__AdditiveExpression__Group_1__214748);
+            pushFollow(FOLLOW_2);
             rule__AdditiveExpression__Group_1__2__Impl();
 
             state._fsp--;
@@ -21072,25 +21072,25 @@ public final void rule__AdditiveExpression__Group_1__2() throws RecognitionExcep
 
 
     // $ANTLR start "rule__AdditiveExpression__Group_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7278:1: rule__AdditiveExpression__Group_1__2__Impl : ( ( rule__AdditiveExpression__ParamsAssignment_1_2 ) ) ;
+    // InternalExport.g:7278:1: rule__AdditiveExpression__Group_1__2__Impl : ( ( rule__AdditiveExpression__ParamsAssignment_1_2 ) ) ;
     public final void rule__AdditiveExpression__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7282:1: ( ( ( rule__AdditiveExpression__ParamsAssignment_1_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7283:1: ( ( rule__AdditiveExpression__ParamsAssignment_1_2 ) )
+            // InternalExport.g:7282:1: ( ( ( rule__AdditiveExpression__ParamsAssignment_1_2 ) ) )
+            // InternalExport.g:7283:1: ( ( rule__AdditiveExpression__ParamsAssignment_1_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7283:1: ( ( rule__AdditiveExpression__ParamsAssignment_1_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7284:1: ( rule__AdditiveExpression__ParamsAssignment_1_2 )
+            // InternalExport.g:7283:1: ( ( rule__AdditiveExpression__ParamsAssignment_1_2 ) )
+            // InternalExport.g:7284:1: ( rule__AdditiveExpression__ParamsAssignment_1_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAdditiveExpressionAccess().getParamsAssignment_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7285:1: ( rule__AdditiveExpression__ParamsAssignment_1_2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7285:2: rule__AdditiveExpression__ParamsAssignment_1_2
+            // InternalExport.g:7285:1: ( rule__AdditiveExpression__ParamsAssignment_1_2 )
+            // InternalExport.g:7285:2: rule__AdditiveExpression__ParamsAssignment_1_2
             {
-            pushFollow(FOLLOW_rule__AdditiveExpression__ParamsAssignment_1_2_in_rule__AdditiveExpression__Group_1__2__Impl14775);
+            pushFollow(FOLLOW_2);
             rule__AdditiveExpression__ParamsAssignment_1_2();
 
             state._fsp--;
@@ -21123,21 +21123,21 @@ public final void rule__AdditiveExpression__Group_1__2__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__MultiplicativeExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7301:1: rule__MultiplicativeExpression__Group__0 : rule__MultiplicativeExpression__Group__0__Impl rule__MultiplicativeExpression__Group__1 ;
+    // InternalExport.g:7301:1: rule__MultiplicativeExpression__Group__0 : rule__MultiplicativeExpression__Group__0__Impl rule__MultiplicativeExpression__Group__1 ;
     public final void rule__MultiplicativeExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7305:1: ( rule__MultiplicativeExpression__Group__0__Impl rule__MultiplicativeExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7306:2: rule__MultiplicativeExpression__Group__0__Impl rule__MultiplicativeExpression__Group__1
+            // InternalExport.g:7305:1: ( rule__MultiplicativeExpression__Group__0__Impl rule__MultiplicativeExpression__Group__1 )
+            // InternalExport.g:7306:2: rule__MultiplicativeExpression__Group__0__Impl rule__MultiplicativeExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__MultiplicativeExpression__Group__0__Impl_in_rule__MultiplicativeExpression__Group__014811);
+            pushFollow(FOLLOW_60);
             rule__MultiplicativeExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__MultiplicativeExpression__Group__1_in_rule__MultiplicativeExpression__Group__014814);
+            pushFollow(FOLLOW_2);
             rule__MultiplicativeExpression__Group__1();
 
             state._fsp--;
@@ -21161,22 +21161,22 @@ public final void rule__MultiplicativeExpression__Group__0() throws RecognitionE
 
 
     // $ANTLR start "rule__MultiplicativeExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7313:1: rule__MultiplicativeExpression__Group__0__Impl : ( ruleUnaryOrInfixExpression ) ;
+    // InternalExport.g:7313:1: rule__MultiplicativeExpression__Group__0__Impl : ( ruleUnaryOrInfixExpression ) ;
     public final void rule__MultiplicativeExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7317:1: ( ( ruleUnaryOrInfixExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7318:1: ( ruleUnaryOrInfixExpression )
+            // InternalExport.g:7317:1: ( ( ruleUnaryOrInfixExpression ) )
+            // InternalExport.g:7318:1: ( ruleUnaryOrInfixExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7318:1: ( ruleUnaryOrInfixExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7319:1: ruleUnaryOrInfixExpression
+            // InternalExport.g:7318:1: ( ruleUnaryOrInfixExpression )
+            // InternalExport.g:7319:1: ruleUnaryOrInfixExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMultiplicativeExpressionAccess().getUnaryOrInfixExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleUnaryOrInfixExpression_in_rule__MultiplicativeExpression__Group__0__Impl14841);
+            pushFollow(FOLLOW_2);
             ruleUnaryOrInfixExpression();
 
             state._fsp--;
@@ -21206,16 +21206,16 @@ public final void rule__MultiplicativeExpression__Group__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__MultiplicativeExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7330:1: rule__MultiplicativeExpression__Group__1 : rule__MultiplicativeExpression__Group__1__Impl ;
+    // InternalExport.g:7330:1: rule__MultiplicativeExpression__Group__1 : rule__MultiplicativeExpression__Group__1__Impl ;
     public final void rule__MultiplicativeExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7334:1: ( rule__MultiplicativeExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7335:2: rule__MultiplicativeExpression__Group__1__Impl
+            // InternalExport.g:7334:1: ( rule__MultiplicativeExpression__Group__1__Impl )
+            // InternalExport.g:7335:2: rule__MultiplicativeExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__MultiplicativeExpression__Group__1__Impl_in_rule__MultiplicativeExpression__Group__114870);
+            pushFollow(FOLLOW_2);
             rule__MultiplicativeExpression__Group__1__Impl();
 
             state._fsp--;
@@ -21239,22 +21239,22 @@ public final void rule__MultiplicativeExpression__Group__1() throws RecognitionE
 
 
     // $ANTLR start "rule__MultiplicativeExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7341:1: rule__MultiplicativeExpression__Group__1__Impl : ( ( rule__MultiplicativeExpression__Group_1__0 )* ) ;
+    // InternalExport.g:7341:1: rule__MultiplicativeExpression__Group__1__Impl : ( ( rule__MultiplicativeExpression__Group_1__0 )* ) ;
     public final void rule__MultiplicativeExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7345:1: ( ( ( rule__MultiplicativeExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7346:1: ( ( rule__MultiplicativeExpression__Group_1__0 )* )
+            // InternalExport.g:7345:1: ( ( ( rule__MultiplicativeExpression__Group_1__0 )* ) )
+            // InternalExport.g:7346:1: ( ( rule__MultiplicativeExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7346:1: ( ( rule__MultiplicativeExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7347:1: ( rule__MultiplicativeExpression__Group_1__0 )*
+            // InternalExport.g:7346:1: ( ( rule__MultiplicativeExpression__Group_1__0 )* )
+            // InternalExport.g:7347:1: ( rule__MultiplicativeExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMultiplicativeExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7348:1: ( rule__MultiplicativeExpression__Group_1__0 )*
+            // InternalExport.g:7348:1: ( rule__MultiplicativeExpression__Group_1__0 )*
             loop57:
             do {
                 int alt57=2;
@@ -21267,9 +21267,9 @@ public final void rule__MultiplicativeExpression__Group__1__Impl() throws Recogn
 
                 switch (alt57) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7348:2: rule__MultiplicativeExpression__Group_1__0
+            	    // InternalExport.g:7348:2: rule__MultiplicativeExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__MultiplicativeExpression__Group_1__0_in_rule__MultiplicativeExpression__Group__1__Impl14897);
+            	    pushFollow(FOLLOW_61);
             	    rule__MultiplicativeExpression__Group_1__0();
 
             	    state._fsp--;
@@ -21308,21 +21308,21 @@ public final void rule__MultiplicativeExpression__Group__1__Impl() throws Recogn
 
 
     // $ANTLR start "rule__MultiplicativeExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7362:1: rule__MultiplicativeExpression__Group_1__0 : rule__MultiplicativeExpression__Group_1__0__Impl rule__MultiplicativeExpression__Group_1__1 ;
+    // InternalExport.g:7362:1: rule__MultiplicativeExpression__Group_1__0 : rule__MultiplicativeExpression__Group_1__0__Impl rule__MultiplicativeExpression__Group_1__1 ;
     public final void rule__MultiplicativeExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7366:1: ( rule__MultiplicativeExpression__Group_1__0__Impl rule__MultiplicativeExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7367:2: rule__MultiplicativeExpression__Group_1__0__Impl rule__MultiplicativeExpression__Group_1__1
+            // InternalExport.g:7366:1: ( rule__MultiplicativeExpression__Group_1__0__Impl rule__MultiplicativeExpression__Group_1__1 )
+            // InternalExport.g:7367:2: rule__MultiplicativeExpression__Group_1__0__Impl rule__MultiplicativeExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__MultiplicativeExpression__Group_1__0__Impl_in_rule__MultiplicativeExpression__Group_1__014932);
+            pushFollow(FOLLOW_60);
             rule__MultiplicativeExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__MultiplicativeExpression__Group_1__1_in_rule__MultiplicativeExpression__Group_1__014935);
+            pushFollow(FOLLOW_2);
             rule__MultiplicativeExpression__Group_1__1();
 
             state._fsp--;
@@ -21346,23 +21346,23 @@ public final void rule__MultiplicativeExpression__Group_1__0() throws Recognitio
 
 
     // $ANTLR start "rule__MultiplicativeExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7374:1: rule__MultiplicativeExpression__Group_1__0__Impl : ( () ) ;
+    // InternalExport.g:7374:1: rule__MultiplicativeExpression__Group_1__0__Impl : ( () ) ;
     public final void rule__MultiplicativeExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7378:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7379:1: ( () )
+            // InternalExport.g:7378:1: ( ( () ) )
+            // InternalExport.g:7379:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7379:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7380:1: ()
+            // InternalExport.g:7379:1: ( () )
+            // InternalExport.g:7380:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMultiplicativeExpressionAccess().getOperationCallParamsAction_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7381:1: ()
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7383:1: 
+            // InternalExport.g:7381:1: ()
+            // InternalExport.g:7383:1: 
             {
             }
 
@@ -21387,21 +21387,21 @@ public final void rule__MultiplicativeExpression__Group_1__0__Impl() throws Reco
 
 
     // $ANTLR start "rule__MultiplicativeExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7393:1: rule__MultiplicativeExpression__Group_1__1 : rule__MultiplicativeExpression__Group_1__1__Impl rule__MultiplicativeExpression__Group_1__2 ;
+    // InternalExport.g:7393:1: rule__MultiplicativeExpression__Group_1__1 : rule__MultiplicativeExpression__Group_1__1__Impl rule__MultiplicativeExpression__Group_1__2 ;
     public final void rule__MultiplicativeExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7397:1: ( rule__MultiplicativeExpression__Group_1__1__Impl rule__MultiplicativeExpression__Group_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7398:2: rule__MultiplicativeExpression__Group_1__1__Impl rule__MultiplicativeExpression__Group_1__2
+            // InternalExport.g:7397:1: ( rule__MultiplicativeExpression__Group_1__1__Impl rule__MultiplicativeExpression__Group_1__2 )
+            // InternalExport.g:7398:2: rule__MultiplicativeExpression__Group_1__1__Impl rule__MultiplicativeExpression__Group_1__2
             {
-            pushFollow(FOLLOW_rule__MultiplicativeExpression__Group_1__1__Impl_in_rule__MultiplicativeExpression__Group_1__114993);
+            pushFollow(FOLLOW_49);
             rule__MultiplicativeExpression__Group_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__MultiplicativeExpression__Group_1__2_in_rule__MultiplicativeExpression__Group_1__114996);
+            pushFollow(FOLLOW_2);
             rule__MultiplicativeExpression__Group_1__2();
 
             state._fsp--;
@@ -21425,25 +21425,25 @@ public final void rule__MultiplicativeExpression__Group_1__1() throws Recognitio
 
 
     // $ANTLR start "rule__MultiplicativeExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7405:1: rule__MultiplicativeExpression__Group_1__1__Impl : ( ( rule__MultiplicativeExpression__NameAssignment_1_1 ) ) ;
+    // InternalExport.g:7405:1: rule__MultiplicativeExpression__Group_1__1__Impl : ( ( rule__MultiplicativeExpression__NameAssignment_1_1 ) ) ;
     public final void rule__MultiplicativeExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7409:1: ( ( ( rule__MultiplicativeExpression__NameAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7410:1: ( ( rule__MultiplicativeExpression__NameAssignment_1_1 ) )
+            // InternalExport.g:7409:1: ( ( ( rule__MultiplicativeExpression__NameAssignment_1_1 ) ) )
+            // InternalExport.g:7410:1: ( ( rule__MultiplicativeExpression__NameAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7410:1: ( ( rule__MultiplicativeExpression__NameAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7411:1: ( rule__MultiplicativeExpression__NameAssignment_1_1 )
+            // InternalExport.g:7410:1: ( ( rule__MultiplicativeExpression__NameAssignment_1_1 ) )
+            // InternalExport.g:7411:1: ( rule__MultiplicativeExpression__NameAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMultiplicativeExpressionAccess().getNameAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7412:1: ( rule__MultiplicativeExpression__NameAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7412:2: rule__MultiplicativeExpression__NameAssignment_1_1
+            // InternalExport.g:7412:1: ( rule__MultiplicativeExpression__NameAssignment_1_1 )
+            // InternalExport.g:7412:2: rule__MultiplicativeExpression__NameAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__MultiplicativeExpression__NameAssignment_1_1_in_rule__MultiplicativeExpression__Group_1__1__Impl15023);
+            pushFollow(FOLLOW_2);
             rule__MultiplicativeExpression__NameAssignment_1_1();
 
             state._fsp--;
@@ -21476,16 +21476,16 @@ public final void rule__MultiplicativeExpression__Group_1__1__Impl() throws Reco
 
 
     // $ANTLR start "rule__MultiplicativeExpression__Group_1__2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7422:1: rule__MultiplicativeExpression__Group_1__2 : rule__MultiplicativeExpression__Group_1__2__Impl ;
+    // InternalExport.g:7422:1: rule__MultiplicativeExpression__Group_1__2 : rule__MultiplicativeExpression__Group_1__2__Impl ;
     public final void rule__MultiplicativeExpression__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7426:1: ( rule__MultiplicativeExpression__Group_1__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7427:2: rule__MultiplicativeExpression__Group_1__2__Impl
+            // InternalExport.g:7426:1: ( rule__MultiplicativeExpression__Group_1__2__Impl )
+            // InternalExport.g:7427:2: rule__MultiplicativeExpression__Group_1__2__Impl
             {
-            pushFollow(FOLLOW_rule__MultiplicativeExpression__Group_1__2__Impl_in_rule__MultiplicativeExpression__Group_1__215053);
+            pushFollow(FOLLOW_2);
             rule__MultiplicativeExpression__Group_1__2__Impl();
 
             state._fsp--;
@@ -21509,25 +21509,25 @@ public final void rule__MultiplicativeExpression__Group_1__2() throws Recognitio
 
 
     // $ANTLR start "rule__MultiplicativeExpression__Group_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7433:1: rule__MultiplicativeExpression__Group_1__2__Impl : ( ( rule__MultiplicativeExpression__ParamsAssignment_1_2 ) ) ;
+    // InternalExport.g:7433:1: rule__MultiplicativeExpression__Group_1__2__Impl : ( ( rule__MultiplicativeExpression__ParamsAssignment_1_2 ) ) ;
     public final void rule__MultiplicativeExpression__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7437:1: ( ( ( rule__MultiplicativeExpression__ParamsAssignment_1_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7438:1: ( ( rule__MultiplicativeExpression__ParamsAssignment_1_2 ) )
+            // InternalExport.g:7437:1: ( ( ( rule__MultiplicativeExpression__ParamsAssignment_1_2 ) ) )
+            // InternalExport.g:7438:1: ( ( rule__MultiplicativeExpression__ParamsAssignment_1_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7438:1: ( ( rule__MultiplicativeExpression__ParamsAssignment_1_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7439:1: ( rule__MultiplicativeExpression__ParamsAssignment_1_2 )
+            // InternalExport.g:7438:1: ( ( rule__MultiplicativeExpression__ParamsAssignment_1_2 ) )
+            // InternalExport.g:7439:1: ( rule__MultiplicativeExpression__ParamsAssignment_1_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMultiplicativeExpressionAccess().getParamsAssignment_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7440:1: ( rule__MultiplicativeExpression__ParamsAssignment_1_2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7440:2: rule__MultiplicativeExpression__ParamsAssignment_1_2
+            // InternalExport.g:7440:1: ( rule__MultiplicativeExpression__ParamsAssignment_1_2 )
+            // InternalExport.g:7440:2: rule__MultiplicativeExpression__ParamsAssignment_1_2
             {
-            pushFollow(FOLLOW_rule__MultiplicativeExpression__ParamsAssignment_1_2_in_rule__MultiplicativeExpression__Group_1__2__Impl15080);
+            pushFollow(FOLLOW_2);
             rule__MultiplicativeExpression__ParamsAssignment_1_2();
 
             state._fsp--;
@@ -21560,21 +21560,21 @@ public final void rule__MultiplicativeExpression__Group_1__2__Impl() throws Reco
 
 
     // $ANTLR start "rule__UnaryExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7456:1: rule__UnaryExpression__Group__0 : rule__UnaryExpression__Group__0__Impl rule__UnaryExpression__Group__1 ;
+    // InternalExport.g:7456:1: rule__UnaryExpression__Group__0 : rule__UnaryExpression__Group__0__Impl rule__UnaryExpression__Group__1 ;
     public final void rule__UnaryExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7460:1: ( rule__UnaryExpression__Group__0__Impl rule__UnaryExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7461:2: rule__UnaryExpression__Group__0__Impl rule__UnaryExpression__Group__1
+            // InternalExport.g:7460:1: ( rule__UnaryExpression__Group__0__Impl rule__UnaryExpression__Group__1 )
+            // InternalExport.g:7461:2: rule__UnaryExpression__Group__0__Impl rule__UnaryExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__UnaryExpression__Group__0__Impl_in_rule__UnaryExpression__Group__015116);
+            pushFollow(FOLLOW_49);
             rule__UnaryExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__UnaryExpression__Group__1_in_rule__UnaryExpression__Group__015119);
+            pushFollow(FOLLOW_2);
             rule__UnaryExpression__Group__1();
 
             state._fsp--;
@@ -21598,25 +21598,25 @@ public final void rule__UnaryExpression__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__UnaryExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7468:1: rule__UnaryExpression__Group__0__Impl : ( ( rule__UnaryExpression__NameAssignment_0 ) ) ;
+    // InternalExport.g:7468:1: rule__UnaryExpression__Group__0__Impl : ( ( rule__UnaryExpression__NameAssignment_0 ) ) ;
     public final void rule__UnaryExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7472:1: ( ( ( rule__UnaryExpression__NameAssignment_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7473:1: ( ( rule__UnaryExpression__NameAssignment_0 ) )
+            // InternalExport.g:7472:1: ( ( ( rule__UnaryExpression__NameAssignment_0 ) ) )
+            // InternalExport.g:7473:1: ( ( rule__UnaryExpression__NameAssignment_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7473:1: ( ( rule__UnaryExpression__NameAssignment_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7474:1: ( rule__UnaryExpression__NameAssignment_0 )
+            // InternalExport.g:7473:1: ( ( rule__UnaryExpression__NameAssignment_0 ) )
+            // InternalExport.g:7474:1: ( rule__UnaryExpression__NameAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getUnaryExpressionAccess().getNameAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7475:1: ( rule__UnaryExpression__NameAssignment_0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7475:2: rule__UnaryExpression__NameAssignment_0
+            // InternalExport.g:7475:1: ( rule__UnaryExpression__NameAssignment_0 )
+            // InternalExport.g:7475:2: rule__UnaryExpression__NameAssignment_0
             {
-            pushFollow(FOLLOW_rule__UnaryExpression__NameAssignment_0_in_rule__UnaryExpression__Group__0__Impl15146);
+            pushFollow(FOLLOW_2);
             rule__UnaryExpression__NameAssignment_0();
 
             state._fsp--;
@@ -21649,16 +21649,16 @@ public final void rule__UnaryExpression__Group__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__UnaryExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7485:1: rule__UnaryExpression__Group__1 : rule__UnaryExpression__Group__1__Impl ;
+    // InternalExport.g:7485:1: rule__UnaryExpression__Group__1 : rule__UnaryExpression__Group__1__Impl ;
     public final void rule__UnaryExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7489:1: ( rule__UnaryExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7490:2: rule__UnaryExpression__Group__1__Impl
+            // InternalExport.g:7489:1: ( rule__UnaryExpression__Group__1__Impl )
+            // InternalExport.g:7490:2: rule__UnaryExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__UnaryExpression__Group__1__Impl_in_rule__UnaryExpression__Group__115176);
+            pushFollow(FOLLOW_2);
             rule__UnaryExpression__Group__1__Impl();
 
             state._fsp--;
@@ -21682,25 +21682,25 @@ public final void rule__UnaryExpression__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__UnaryExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7496:1: rule__UnaryExpression__Group__1__Impl : ( ( rule__UnaryExpression__ParamsAssignment_1 ) ) ;
+    // InternalExport.g:7496:1: rule__UnaryExpression__Group__1__Impl : ( ( rule__UnaryExpression__ParamsAssignment_1 ) ) ;
     public final void rule__UnaryExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7500:1: ( ( ( rule__UnaryExpression__ParamsAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7501:1: ( ( rule__UnaryExpression__ParamsAssignment_1 ) )
+            // InternalExport.g:7500:1: ( ( ( rule__UnaryExpression__ParamsAssignment_1 ) ) )
+            // InternalExport.g:7501:1: ( ( rule__UnaryExpression__ParamsAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7501:1: ( ( rule__UnaryExpression__ParamsAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7502:1: ( rule__UnaryExpression__ParamsAssignment_1 )
+            // InternalExport.g:7501:1: ( ( rule__UnaryExpression__ParamsAssignment_1 ) )
+            // InternalExport.g:7502:1: ( rule__UnaryExpression__ParamsAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getUnaryExpressionAccess().getParamsAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7503:1: ( rule__UnaryExpression__ParamsAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7503:2: rule__UnaryExpression__ParamsAssignment_1
+            // InternalExport.g:7503:1: ( rule__UnaryExpression__ParamsAssignment_1 )
+            // InternalExport.g:7503:2: rule__UnaryExpression__ParamsAssignment_1
             {
-            pushFollow(FOLLOW_rule__UnaryExpression__ParamsAssignment_1_in_rule__UnaryExpression__Group__1__Impl15203);
+            pushFollow(FOLLOW_2);
             rule__UnaryExpression__ParamsAssignment_1();
 
             state._fsp--;
@@ -21733,21 +21733,21 @@ public final void rule__UnaryExpression__Group__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__InfixExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7517:1: rule__InfixExpression__Group__0 : rule__InfixExpression__Group__0__Impl rule__InfixExpression__Group__1 ;
+    // InternalExport.g:7517:1: rule__InfixExpression__Group__0 : rule__InfixExpression__Group__0__Impl rule__InfixExpression__Group__1 ;
     public final void rule__InfixExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7521:1: ( rule__InfixExpression__Group__0__Impl rule__InfixExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7522:2: rule__InfixExpression__Group__0__Impl rule__InfixExpression__Group__1
+            // InternalExport.g:7521:1: ( rule__InfixExpression__Group__0__Impl rule__InfixExpression__Group__1 )
+            // InternalExport.g:7522:2: rule__InfixExpression__Group__0__Impl rule__InfixExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group__0__Impl_in_rule__InfixExpression__Group__015237);
+            pushFollow(FOLLOW_62);
             rule__InfixExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group__1_in_rule__InfixExpression__Group__015240);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group__1();
 
             state._fsp--;
@@ -21771,22 +21771,22 @@ public final void rule__InfixExpression__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__InfixExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7529:1: rule__InfixExpression__Group__0__Impl : ( rulePrimaryExpression ) ;
+    // InternalExport.g:7529:1: rule__InfixExpression__Group__0__Impl : ( rulePrimaryExpression ) ;
     public final void rule__InfixExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7533:1: ( ( rulePrimaryExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7534:1: ( rulePrimaryExpression )
+            // InternalExport.g:7533:1: ( ( rulePrimaryExpression ) )
+            // InternalExport.g:7534:1: ( rulePrimaryExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7534:1: ( rulePrimaryExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7535:1: rulePrimaryExpression
+            // InternalExport.g:7534:1: ( rulePrimaryExpression )
+            // InternalExport.g:7535:1: rulePrimaryExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getPrimaryExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_rulePrimaryExpression_in_rule__InfixExpression__Group__0__Impl15267);
+            pushFollow(FOLLOW_2);
             rulePrimaryExpression();
 
             state._fsp--;
@@ -21816,16 +21816,16 @@ public final void rule__InfixExpression__Group__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__InfixExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7546:1: rule__InfixExpression__Group__1 : rule__InfixExpression__Group__1__Impl ;
+    // InternalExport.g:7546:1: rule__InfixExpression__Group__1 : rule__InfixExpression__Group__1__Impl ;
     public final void rule__InfixExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7550:1: ( rule__InfixExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7551:2: rule__InfixExpression__Group__1__Impl
+            // InternalExport.g:7550:1: ( rule__InfixExpression__Group__1__Impl )
+            // InternalExport.g:7551:2: rule__InfixExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group__1__Impl_in_rule__InfixExpression__Group__115296);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group__1__Impl();
 
             state._fsp--;
@@ -21849,22 +21849,22 @@ public final void rule__InfixExpression__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__InfixExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7557:1: rule__InfixExpression__Group__1__Impl : ( ( rule__InfixExpression__Alternatives_1 )* ) ;
+    // InternalExport.g:7557:1: rule__InfixExpression__Group__1__Impl : ( ( rule__InfixExpression__Alternatives_1 )* ) ;
     public final void rule__InfixExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7561:1: ( ( ( rule__InfixExpression__Alternatives_1 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7562:1: ( ( rule__InfixExpression__Alternatives_1 )* )
+            // InternalExport.g:7561:1: ( ( ( rule__InfixExpression__Alternatives_1 )* ) )
+            // InternalExport.g:7562:1: ( ( rule__InfixExpression__Alternatives_1 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7562:1: ( ( rule__InfixExpression__Alternatives_1 )* )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7563:1: ( rule__InfixExpression__Alternatives_1 )*
+            // InternalExport.g:7562:1: ( ( rule__InfixExpression__Alternatives_1 )* )
+            // InternalExport.g:7563:1: ( rule__InfixExpression__Alternatives_1 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getAlternatives_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7564:1: ( rule__InfixExpression__Alternatives_1 )*
+            // InternalExport.g:7564:1: ( rule__InfixExpression__Alternatives_1 )*
             loop58:
             do {
                 int alt58=2;
@@ -21877,9 +21877,9 @@ public final void rule__InfixExpression__Group__1__Impl() throws RecognitionExce
 
                 switch (alt58) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7564:2: rule__InfixExpression__Alternatives_1
+            	    // InternalExport.g:7564:2: rule__InfixExpression__Alternatives_1
             	    {
-            	    pushFollow(FOLLOW_rule__InfixExpression__Alternatives_1_in_rule__InfixExpression__Group__1__Impl15323);
+            	    pushFollow(FOLLOW_63);
             	    rule__InfixExpression__Alternatives_1();
 
             	    state._fsp--;
@@ -21918,21 +21918,21 @@ public final void rule__InfixExpression__Group__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7578:1: rule__InfixExpression__Group_1_0__0 : rule__InfixExpression__Group_1_0__0__Impl rule__InfixExpression__Group_1_0__1 ;
+    // InternalExport.g:7578:1: rule__InfixExpression__Group_1_0__0 : rule__InfixExpression__Group_1_0__0__Impl rule__InfixExpression__Group_1_0__1 ;
     public final void rule__InfixExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7582:1: ( rule__InfixExpression__Group_1_0__0__Impl rule__InfixExpression__Group_1_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7583:2: rule__InfixExpression__Group_1_0__0__Impl rule__InfixExpression__Group_1_0__1
+            // InternalExport.g:7582:1: ( rule__InfixExpression__Group_1_0__0__Impl rule__InfixExpression__Group_1_0__1 )
+            // InternalExport.g:7583:2: rule__InfixExpression__Group_1_0__0__Impl rule__InfixExpression__Group_1_0__1
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0__0__Impl_in_rule__InfixExpression__Group_1_0__015358);
+            pushFollow(FOLLOW_62);
             rule__InfixExpression__Group_1_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0__1_in_rule__InfixExpression__Group_1_0__015361);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_0__1();
 
             state._fsp--;
@@ -21956,23 +21956,23 @@ public final void rule__InfixExpression__Group_1_0__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7590:1: rule__InfixExpression__Group_1_0__0__Impl : ( () ) ;
+    // InternalExport.g:7590:1: rule__InfixExpression__Group_1_0__0__Impl : ( () ) ;
     public final void rule__InfixExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7594:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7595:1: ( () )
+            // InternalExport.g:7594:1: ( ( () ) )
+            // InternalExport.g:7595:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7595:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7596:1: ()
+            // InternalExport.g:7595:1: ( () )
+            // InternalExport.g:7596:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getOperationCallTargetAction_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7597:1: ()
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7599:1: 
+            // InternalExport.g:7597:1: ()
+            // InternalExport.g:7599:1: 
             {
             }
 
@@ -21997,21 +21997,21 @@ public final void rule__InfixExpression__Group_1_0__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7609:1: rule__InfixExpression__Group_1_0__1 : rule__InfixExpression__Group_1_0__1__Impl rule__InfixExpression__Group_1_0__2 ;
+    // InternalExport.g:7609:1: rule__InfixExpression__Group_1_0__1 : rule__InfixExpression__Group_1_0__1__Impl rule__InfixExpression__Group_1_0__2 ;
     public final void rule__InfixExpression__Group_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7613:1: ( rule__InfixExpression__Group_1_0__1__Impl rule__InfixExpression__Group_1_0__2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7614:2: rule__InfixExpression__Group_1_0__1__Impl rule__InfixExpression__Group_1_0__2
+            // InternalExport.g:7613:1: ( rule__InfixExpression__Group_1_0__1__Impl rule__InfixExpression__Group_1_0__2 )
+            // InternalExport.g:7614:2: rule__InfixExpression__Group_1_0__1__Impl rule__InfixExpression__Group_1_0__2
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0__1__Impl_in_rule__InfixExpression__Group_1_0__115419);
+            pushFollow(FOLLOW_10);
             rule__InfixExpression__Group_1_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0__2_in_rule__InfixExpression__Group_1_0__115422);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_0__2();
 
             state._fsp--;
@@ -22035,22 +22035,22 @@ public final void rule__InfixExpression__Group_1_0__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7621:1: rule__InfixExpression__Group_1_0__1__Impl : ( '.' ) ;
+    // InternalExport.g:7621:1: rule__InfixExpression__Group_1_0__1__Impl : ( '.' ) ;
     public final void rule__InfixExpression__Group_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7625:1: ( ( '.' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7626:1: ( '.' )
+            // InternalExport.g:7625:1: ( ( '.' ) )
+            // InternalExport.g:7626:1: ( '.' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7626:1: ( '.' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7627:1: '.'
+            // InternalExport.g:7626:1: ( '.' )
+            // InternalExport.g:7627:1: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getFullStopKeyword_1_0_1()); 
             }
-            match(input,68,FOLLOW_68_in_rule__InfixExpression__Group_1_0__1__Impl15450); if (state.failed) return ;
+            match(input,68,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInfixExpressionAccess().getFullStopKeyword_1_0_1()); 
             }
@@ -22076,21 +22076,21 @@ public final void rule__InfixExpression__Group_1_0__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0__2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7640:1: rule__InfixExpression__Group_1_0__2 : rule__InfixExpression__Group_1_0__2__Impl rule__InfixExpression__Group_1_0__3 ;
+    // InternalExport.g:7640:1: rule__InfixExpression__Group_1_0__2 : rule__InfixExpression__Group_1_0__2__Impl rule__InfixExpression__Group_1_0__3 ;
     public final void rule__InfixExpression__Group_1_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7644:1: ( rule__InfixExpression__Group_1_0__2__Impl rule__InfixExpression__Group_1_0__3 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7645:2: rule__InfixExpression__Group_1_0__2__Impl rule__InfixExpression__Group_1_0__3
+            // InternalExport.g:7644:1: ( rule__InfixExpression__Group_1_0__2__Impl rule__InfixExpression__Group_1_0__3 )
+            // InternalExport.g:7645:2: rule__InfixExpression__Group_1_0__2__Impl rule__InfixExpression__Group_1_0__3
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0__2__Impl_in_rule__InfixExpression__Group_1_0__215481);
+            pushFollow(FOLLOW_34);
             rule__InfixExpression__Group_1_0__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0__3_in_rule__InfixExpression__Group_1_0__215484);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_0__3();
 
             state._fsp--;
@@ -22114,25 +22114,25 @@ public final void rule__InfixExpression__Group_1_0__2() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7652:1: rule__InfixExpression__Group_1_0__2__Impl : ( ( rule__InfixExpression__NameAssignment_1_0_2 ) ) ;
+    // InternalExport.g:7652:1: rule__InfixExpression__Group_1_0__2__Impl : ( ( rule__InfixExpression__NameAssignment_1_0_2 ) ) ;
     public final void rule__InfixExpression__Group_1_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7656:1: ( ( ( rule__InfixExpression__NameAssignment_1_0_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7657:1: ( ( rule__InfixExpression__NameAssignment_1_0_2 ) )
+            // InternalExport.g:7656:1: ( ( ( rule__InfixExpression__NameAssignment_1_0_2 ) ) )
+            // InternalExport.g:7657:1: ( ( rule__InfixExpression__NameAssignment_1_0_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7657:1: ( ( rule__InfixExpression__NameAssignment_1_0_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7658:1: ( rule__InfixExpression__NameAssignment_1_0_2 )
+            // InternalExport.g:7657:1: ( ( rule__InfixExpression__NameAssignment_1_0_2 ) )
+            // InternalExport.g:7658:1: ( rule__InfixExpression__NameAssignment_1_0_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getNameAssignment_1_0_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7659:1: ( rule__InfixExpression__NameAssignment_1_0_2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7659:2: rule__InfixExpression__NameAssignment_1_0_2
+            // InternalExport.g:7659:1: ( rule__InfixExpression__NameAssignment_1_0_2 )
+            // InternalExport.g:7659:2: rule__InfixExpression__NameAssignment_1_0_2
             {
-            pushFollow(FOLLOW_rule__InfixExpression__NameAssignment_1_0_2_in_rule__InfixExpression__Group_1_0__2__Impl15511);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__NameAssignment_1_0_2();
 
             state._fsp--;
@@ -22165,21 +22165,21 @@ public final void rule__InfixExpression__Group_1_0__2__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0__3"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7669:1: rule__InfixExpression__Group_1_0__3 : rule__InfixExpression__Group_1_0__3__Impl rule__InfixExpression__Group_1_0__4 ;
+    // InternalExport.g:7669:1: rule__InfixExpression__Group_1_0__3 : rule__InfixExpression__Group_1_0__3__Impl rule__InfixExpression__Group_1_0__4 ;
     public final void rule__InfixExpression__Group_1_0__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7673:1: ( rule__InfixExpression__Group_1_0__3__Impl rule__InfixExpression__Group_1_0__4 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7674:2: rule__InfixExpression__Group_1_0__3__Impl rule__InfixExpression__Group_1_0__4
+            // InternalExport.g:7673:1: ( rule__InfixExpression__Group_1_0__3__Impl rule__InfixExpression__Group_1_0__4 )
+            // InternalExport.g:7674:2: rule__InfixExpression__Group_1_0__3__Impl rule__InfixExpression__Group_1_0__4
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0__3__Impl_in_rule__InfixExpression__Group_1_0__315541);
+            pushFollow(FOLLOW_64);
             rule__InfixExpression__Group_1_0__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0__4_in_rule__InfixExpression__Group_1_0__315544);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_0__4();
 
             state._fsp--;
@@ -22203,22 +22203,22 @@ public final void rule__InfixExpression__Group_1_0__3() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7681:1: rule__InfixExpression__Group_1_0__3__Impl : ( '(' ) ;
+    // InternalExport.g:7681:1: rule__InfixExpression__Group_1_0__3__Impl : ( '(' ) ;
     public final void rule__InfixExpression__Group_1_0__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7685:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7686:1: ( '(' )
+            // InternalExport.g:7685:1: ( ( '(' ) )
+            // InternalExport.g:7686:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7686:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7687:1: '('
+            // InternalExport.g:7686:1: ( '(' )
+            // InternalExport.g:7687:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getLeftParenthesisKeyword_1_0_3()); 
             }
-            match(input,51,FOLLOW_51_in_rule__InfixExpression__Group_1_0__3__Impl15572); if (state.failed) return ;
+            match(input,51,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInfixExpressionAccess().getLeftParenthesisKeyword_1_0_3()); 
             }
@@ -22244,21 +22244,21 @@ public final void rule__InfixExpression__Group_1_0__3__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0__4"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7700:1: rule__InfixExpression__Group_1_0__4 : rule__InfixExpression__Group_1_0__4__Impl rule__InfixExpression__Group_1_0__5 ;
+    // InternalExport.g:7700:1: rule__InfixExpression__Group_1_0__4 : rule__InfixExpression__Group_1_0__4__Impl rule__InfixExpression__Group_1_0__5 ;
     public final void rule__InfixExpression__Group_1_0__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7704:1: ( rule__InfixExpression__Group_1_0__4__Impl rule__InfixExpression__Group_1_0__5 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7705:2: rule__InfixExpression__Group_1_0__4__Impl rule__InfixExpression__Group_1_0__5
+            // InternalExport.g:7704:1: ( rule__InfixExpression__Group_1_0__4__Impl rule__InfixExpression__Group_1_0__5 )
+            // InternalExport.g:7705:2: rule__InfixExpression__Group_1_0__4__Impl rule__InfixExpression__Group_1_0__5
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0__4__Impl_in_rule__InfixExpression__Group_1_0__415603);
+            pushFollow(FOLLOW_64);
             rule__InfixExpression__Group_1_0__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0__5_in_rule__InfixExpression__Group_1_0__415606);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_0__5();
 
             state._fsp--;
@@ -22282,22 +22282,22 @@ public final void rule__InfixExpression__Group_1_0__4() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7712:1: rule__InfixExpression__Group_1_0__4__Impl : ( ( rule__InfixExpression__Group_1_0_4__0 )? ) ;
+    // InternalExport.g:7712:1: rule__InfixExpression__Group_1_0__4__Impl : ( ( rule__InfixExpression__Group_1_0_4__0 )? ) ;
     public final void rule__InfixExpression__Group_1_0__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7716:1: ( ( ( rule__InfixExpression__Group_1_0_4__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7717:1: ( ( rule__InfixExpression__Group_1_0_4__0 )? )
+            // InternalExport.g:7716:1: ( ( ( rule__InfixExpression__Group_1_0_4__0 )? ) )
+            // InternalExport.g:7717:1: ( ( rule__InfixExpression__Group_1_0_4__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7717:1: ( ( rule__InfixExpression__Group_1_0_4__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7718:1: ( rule__InfixExpression__Group_1_0_4__0 )?
+            // InternalExport.g:7717:1: ( ( rule__InfixExpression__Group_1_0_4__0 )? )
+            // InternalExport.g:7718:1: ( rule__InfixExpression__Group_1_0_4__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getGroup_1_0_4()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7719:1: ( rule__InfixExpression__Group_1_0_4__0 )?
+            // InternalExport.g:7719:1: ( rule__InfixExpression__Group_1_0_4__0 )?
             int alt59=2;
             int LA59_0 = input.LA(1);
 
@@ -22306,9 +22306,9 @@ public final void rule__InfixExpression__Group_1_0__4__Impl() throws Recognition
             }
             switch (alt59) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7719:2: rule__InfixExpression__Group_1_0_4__0
+                    // InternalExport.g:7719:2: rule__InfixExpression__Group_1_0_4__0
                     {
-                    pushFollow(FOLLOW_rule__InfixExpression__Group_1_0_4__0_in_rule__InfixExpression__Group_1_0__4__Impl15633);
+                    pushFollow(FOLLOW_2);
                     rule__InfixExpression__Group_1_0_4__0();
 
                     state._fsp--;
@@ -22344,16 +22344,16 @@ public final void rule__InfixExpression__Group_1_0__4__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0__5"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7729:1: rule__InfixExpression__Group_1_0__5 : rule__InfixExpression__Group_1_0__5__Impl ;
+    // InternalExport.g:7729:1: rule__InfixExpression__Group_1_0__5 : rule__InfixExpression__Group_1_0__5__Impl ;
     public final void rule__InfixExpression__Group_1_0__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7733:1: ( rule__InfixExpression__Group_1_0__5__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7734:2: rule__InfixExpression__Group_1_0__5__Impl
+            // InternalExport.g:7733:1: ( rule__InfixExpression__Group_1_0__5__Impl )
+            // InternalExport.g:7734:2: rule__InfixExpression__Group_1_0__5__Impl
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0__5__Impl_in_rule__InfixExpression__Group_1_0__515664);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_0__5__Impl();
 
             state._fsp--;
@@ -22377,22 +22377,22 @@ public final void rule__InfixExpression__Group_1_0__5() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0__5__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7740:1: rule__InfixExpression__Group_1_0__5__Impl : ( ')' ) ;
+    // InternalExport.g:7740:1: rule__InfixExpression__Group_1_0__5__Impl : ( ')' ) ;
     public final void rule__InfixExpression__Group_1_0__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7744:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7745:1: ( ')' )
+            // InternalExport.g:7744:1: ( ( ')' ) )
+            // InternalExport.g:7745:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7745:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7746:1: ')'
+            // InternalExport.g:7745:1: ( ')' )
+            // InternalExport.g:7746:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getRightParenthesisKeyword_1_0_5()); 
             }
-            match(input,52,FOLLOW_52_in_rule__InfixExpression__Group_1_0__5__Impl15692); if (state.failed) return ;
+            match(input,52,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInfixExpressionAccess().getRightParenthesisKeyword_1_0_5()); 
             }
@@ -22418,21 +22418,21 @@ public final void rule__InfixExpression__Group_1_0__5__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0_4__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7771:1: rule__InfixExpression__Group_1_0_4__0 : rule__InfixExpression__Group_1_0_4__0__Impl rule__InfixExpression__Group_1_0_4__1 ;
+    // InternalExport.g:7771:1: rule__InfixExpression__Group_1_0_4__0 : rule__InfixExpression__Group_1_0_4__0__Impl rule__InfixExpression__Group_1_0_4__1 ;
     public final void rule__InfixExpression__Group_1_0_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7775:1: ( rule__InfixExpression__Group_1_0_4__0__Impl rule__InfixExpression__Group_1_0_4__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7776:2: rule__InfixExpression__Group_1_0_4__0__Impl rule__InfixExpression__Group_1_0_4__1
+            // InternalExport.g:7775:1: ( rule__InfixExpression__Group_1_0_4__0__Impl rule__InfixExpression__Group_1_0_4__1 )
+            // InternalExport.g:7776:2: rule__InfixExpression__Group_1_0_4__0__Impl rule__InfixExpression__Group_1_0_4__1
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0_4__0__Impl_in_rule__InfixExpression__Group_1_0_4__015735);
+            pushFollow(FOLLOW_21);
             rule__InfixExpression__Group_1_0_4__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0_4__1_in_rule__InfixExpression__Group_1_0_4__015738);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_0_4__1();
 
             state._fsp--;
@@ -22456,25 +22456,25 @@ public final void rule__InfixExpression__Group_1_0_4__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0_4__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7783:1: rule__InfixExpression__Group_1_0_4__0__Impl : ( ( rule__InfixExpression__ParamsAssignment_1_0_4_0 ) ) ;
+    // InternalExport.g:7783:1: rule__InfixExpression__Group_1_0_4__0__Impl : ( ( rule__InfixExpression__ParamsAssignment_1_0_4_0 ) ) ;
     public final void rule__InfixExpression__Group_1_0_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7787:1: ( ( ( rule__InfixExpression__ParamsAssignment_1_0_4_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7788:1: ( ( rule__InfixExpression__ParamsAssignment_1_0_4_0 ) )
+            // InternalExport.g:7787:1: ( ( ( rule__InfixExpression__ParamsAssignment_1_0_4_0 ) ) )
+            // InternalExport.g:7788:1: ( ( rule__InfixExpression__ParamsAssignment_1_0_4_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7788:1: ( ( rule__InfixExpression__ParamsAssignment_1_0_4_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7789:1: ( rule__InfixExpression__ParamsAssignment_1_0_4_0 )
+            // InternalExport.g:7788:1: ( ( rule__InfixExpression__ParamsAssignment_1_0_4_0 ) )
+            // InternalExport.g:7789:1: ( rule__InfixExpression__ParamsAssignment_1_0_4_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getParamsAssignment_1_0_4_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7790:1: ( rule__InfixExpression__ParamsAssignment_1_0_4_0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7790:2: rule__InfixExpression__ParamsAssignment_1_0_4_0
+            // InternalExport.g:7790:1: ( rule__InfixExpression__ParamsAssignment_1_0_4_0 )
+            // InternalExport.g:7790:2: rule__InfixExpression__ParamsAssignment_1_0_4_0
             {
-            pushFollow(FOLLOW_rule__InfixExpression__ParamsAssignment_1_0_4_0_in_rule__InfixExpression__Group_1_0_4__0__Impl15765);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__ParamsAssignment_1_0_4_0();
 
             state._fsp--;
@@ -22507,16 +22507,16 @@ public final void rule__InfixExpression__Group_1_0_4__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0_4__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7800:1: rule__InfixExpression__Group_1_0_4__1 : rule__InfixExpression__Group_1_0_4__1__Impl ;
+    // InternalExport.g:7800:1: rule__InfixExpression__Group_1_0_4__1 : rule__InfixExpression__Group_1_0_4__1__Impl ;
     public final void rule__InfixExpression__Group_1_0_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7804:1: ( rule__InfixExpression__Group_1_0_4__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7805:2: rule__InfixExpression__Group_1_0_4__1__Impl
+            // InternalExport.g:7804:1: ( rule__InfixExpression__Group_1_0_4__1__Impl )
+            // InternalExport.g:7805:2: rule__InfixExpression__Group_1_0_4__1__Impl
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0_4__1__Impl_in_rule__InfixExpression__Group_1_0_4__115795);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_0_4__1__Impl();
 
             state._fsp--;
@@ -22540,22 +22540,22 @@ public final void rule__InfixExpression__Group_1_0_4__1() throws RecognitionExce
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0_4__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7811:1: rule__InfixExpression__Group_1_0_4__1__Impl : ( ( rule__InfixExpression__Group_1_0_4_1__0 )* ) ;
+    // InternalExport.g:7811:1: rule__InfixExpression__Group_1_0_4__1__Impl : ( ( rule__InfixExpression__Group_1_0_4_1__0 )* ) ;
     public final void rule__InfixExpression__Group_1_0_4__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7815:1: ( ( ( rule__InfixExpression__Group_1_0_4_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7816:1: ( ( rule__InfixExpression__Group_1_0_4_1__0 )* )
+            // InternalExport.g:7815:1: ( ( ( rule__InfixExpression__Group_1_0_4_1__0 )* ) )
+            // InternalExport.g:7816:1: ( ( rule__InfixExpression__Group_1_0_4_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7816:1: ( ( rule__InfixExpression__Group_1_0_4_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7817:1: ( rule__InfixExpression__Group_1_0_4_1__0 )*
+            // InternalExport.g:7816:1: ( ( rule__InfixExpression__Group_1_0_4_1__0 )* )
+            // InternalExport.g:7817:1: ( rule__InfixExpression__Group_1_0_4_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getGroup_1_0_4_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7818:1: ( rule__InfixExpression__Group_1_0_4_1__0 )*
+            // InternalExport.g:7818:1: ( rule__InfixExpression__Group_1_0_4_1__0 )*
             loop60:
             do {
                 int alt60=2;
@@ -22568,9 +22568,9 @@ public final void rule__InfixExpression__Group_1_0_4__1__Impl() throws Recogniti
 
                 switch (alt60) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7818:2: rule__InfixExpression__Group_1_0_4_1__0
+            	    // InternalExport.g:7818:2: rule__InfixExpression__Group_1_0_4_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__InfixExpression__Group_1_0_4_1__0_in_rule__InfixExpression__Group_1_0_4__1__Impl15822);
+            	    pushFollow(FOLLOW_22);
             	    rule__InfixExpression__Group_1_0_4_1__0();
 
             	    state._fsp--;
@@ -22609,21 +22609,21 @@ public final void rule__InfixExpression__Group_1_0_4__1__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0_4_1__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7832:1: rule__InfixExpression__Group_1_0_4_1__0 : rule__InfixExpression__Group_1_0_4_1__0__Impl rule__InfixExpression__Group_1_0_4_1__1 ;
+    // InternalExport.g:7832:1: rule__InfixExpression__Group_1_0_4_1__0 : rule__InfixExpression__Group_1_0_4_1__0__Impl rule__InfixExpression__Group_1_0_4_1__1 ;
     public final void rule__InfixExpression__Group_1_0_4_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7836:1: ( rule__InfixExpression__Group_1_0_4_1__0__Impl rule__InfixExpression__Group_1_0_4_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7837:2: rule__InfixExpression__Group_1_0_4_1__0__Impl rule__InfixExpression__Group_1_0_4_1__1
+            // InternalExport.g:7836:1: ( rule__InfixExpression__Group_1_0_4_1__0__Impl rule__InfixExpression__Group_1_0_4_1__1 )
+            // InternalExport.g:7837:2: rule__InfixExpression__Group_1_0_4_1__0__Impl rule__InfixExpression__Group_1_0_4_1__1
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0_4_1__0__Impl_in_rule__InfixExpression__Group_1_0_4_1__015857);
+            pushFollow(FOLLOW_18);
             rule__InfixExpression__Group_1_0_4_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0_4_1__1_in_rule__InfixExpression__Group_1_0_4_1__015860);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_0_4_1__1();
 
             state._fsp--;
@@ -22647,22 +22647,22 @@ public final void rule__InfixExpression__Group_1_0_4_1__0() throws RecognitionEx
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0_4_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7844:1: rule__InfixExpression__Group_1_0_4_1__0__Impl : ( ',' ) ;
+    // InternalExport.g:7844:1: rule__InfixExpression__Group_1_0_4_1__0__Impl : ( ',' ) ;
     public final void rule__InfixExpression__Group_1_0_4_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7848:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7849:1: ( ',' )
+            // InternalExport.g:7848:1: ( ( ',' ) )
+            // InternalExport.g:7849:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7849:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7850:1: ','
+            // InternalExport.g:7849:1: ( ',' )
+            // InternalExport.g:7850:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getCommaKeyword_1_0_4_1_0()); 
             }
-            match(input,48,FOLLOW_48_in_rule__InfixExpression__Group_1_0_4_1__0__Impl15888); if (state.failed) return ;
+            match(input,48,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInfixExpressionAccess().getCommaKeyword_1_0_4_1_0()); 
             }
@@ -22688,16 +22688,16 @@ public final void rule__InfixExpression__Group_1_0_4_1__0__Impl() throws Recogni
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0_4_1__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7863:1: rule__InfixExpression__Group_1_0_4_1__1 : rule__InfixExpression__Group_1_0_4_1__1__Impl ;
+    // InternalExport.g:7863:1: rule__InfixExpression__Group_1_0_4_1__1 : rule__InfixExpression__Group_1_0_4_1__1__Impl ;
     public final void rule__InfixExpression__Group_1_0_4_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7867:1: ( rule__InfixExpression__Group_1_0_4_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7868:2: rule__InfixExpression__Group_1_0_4_1__1__Impl
+            // InternalExport.g:7867:1: ( rule__InfixExpression__Group_1_0_4_1__1__Impl )
+            // InternalExport.g:7868:2: rule__InfixExpression__Group_1_0_4_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0_4_1__1__Impl_in_rule__InfixExpression__Group_1_0_4_1__115919);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_0_4_1__1__Impl();
 
             state._fsp--;
@@ -22721,25 +22721,25 @@ public final void rule__InfixExpression__Group_1_0_4_1__1() throws RecognitionEx
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0_4_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7874:1: rule__InfixExpression__Group_1_0_4_1__1__Impl : ( ( rule__InfixExpression__ParamsAssignment_1_0_4_1_1 ) ) ;
+    // InternalExport.g:7874:1: rule__InfixExpression__Group_1_0_4_1__1__Impl : ( ( rule__InfixExpression__ParamsAssignment_1_0_4_1_1 ) ) ;
     public final void rule__InfixExpression__Group_1_0_4_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7878:1: ( ( ( rule__InfixExpression__ParamsAssignment_1_0_4_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7879:1: ( ( rule__InfixExpression__ParamsAssignment_1_0_4_1_1 ) )
+            // InternalExport.g:7878:1: ( ( ( rule__InfixExpression__ParamsAssignment_1_0_4_1_1 ) ) )
+            // InternalExport.g:7879:1: ( ( rule__InfixExpression__ParamsAssignment_1_0_4_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7879:1: ( ( rule__InfixExpression__ParamsAssignment_1_0_4_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7880:1: ( rule__InfixExpression__ParamsAssignment_1_0_4_1_1 )
+            // InternalExport.g:7879:1: ( ( rule__InfixExpression__ParamsAssignment_1_0_4_1_1 ) )
+            // InternalExport.g:7880:1: ( rule__InfixExpression__ParamsAssignment_1_0_4_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getParamsAssignment_1_0_4_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7881:1: ( rule__InfixExpression__ParamsAssignment_1_0_4_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7881:2: rule__InfixExpression__ParamsAssignment_1_0_4_1_1
+            // InternalExport.g:7881:1: ( rule__InfixExpression__ParamsAssignment_1_0_4_1_1 )
+            // InternalExport.g:7881:2: rule__InfixExpression__ParamsAssignment_1_0_4_1_1
             {
-            pushFollow(FOLLOW_rule__InfixExpression__ParamsAssignment_1_0_4_1_1_in_rule__InfixExpression__Group_1_0_4_1__1__Impl15946);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__ParamsAssignment_1_0_4_1_1();
 
             state._fsp--;
@@ -22772,21 +22772,21 @@ public final void rule__InfixExpression__Group_1_0_4_1__1__Impl() throws Recogni
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_1__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7895:1: rule__InfixExpression__Group_1_1__0 : rule__InfixExpression__Group_1_1__0__Impl rule__InfixExpression__Group_1_1__1 ;
+    // InternalExport.g:7895:1: rule__InfixExpression__Group_1_1__0 : rule__InfixExpression__Group_1_1__0__Impl rule__InfixExpression__Group_1_1__1 ;
     public final void rule__InfixExpression__Group_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7899:1: ( rule__InfixExpression__Group_1_1__0__Impl rule__InfixExpression__Group_1_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7900:2: rule__InfixExpression__Group_1_1__0__Impl rule__InfixExpression__Group_1_1__1
+            // InternalExport.g:7899:1: ( rule__InfixExpression__Group_1_1__0__Impl rule__InfixExpression__Group_1_1__1 )
+            // InternalExport.g:7900:2: rule__InfixExpression__Group_1_1__0__Impl rule__InfixExpression__Group_1_1__1
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_1__0__Impl_in_rule__InfixExpression__Group_1_1__015980);
+            pushFollow(FOLLOW_62);
             rule__InfixExpression__Group_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_1__1_in_rule__InfixExpression__Group_1_1__015983);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_1__1();
 
             state._fsp--;
@@ -22810,23 +22810,23 @@ public final void rule__InfixExpression__Group_1_1__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7907:1: rule__InfixExpression__Group_1_1__0__Impl : ( () ) ;
+    // InternalExport.g:7907:1: rule__InfixExpression__Group_1_1__0__Impl : ( () ) ;
     public final void rule__InfixExpression__Group_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7911:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7912:1: ( () )
+            // InternalExport.g:7911:1: ( ( () ) )
+            // InternalExport.g:7912:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7912:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7913:1: ()
+            // InternalExport.g:7912:1: ( () )
+            // InternalExport.g:7913:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getFeatureCallTargetAction_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7914:1: ()
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7916:1: 
+            // InternalExport.g:7914:1: ()
+            // InternalExport.g:7916:1: 
             {
             }
 
@@ -22851,21 +22851,21 @@ public final void rule__InfixExpression__Group_1_1__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_1__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7926:1: rule__InfixExpression__Group_1_1__1 : rule__InfixExpression__Group_1_1__1__Impl rule__InfixExpression__Group_1_1__2 ;
+    // InternalExport.g:7926:1: rule__InfixExpression__Group_1_1__1 : rule__InfixExpression__Group_1_1__1__Impl rule__InfixExpression__Group_1_1__2 ;
     public final void rule__InfixExpression__Group_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7930:1: ( rule__InfixExpression__Group_1_1__1__Impl rule__InfixExpression__Group_1_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7931:2: rule__InfixExpression__Group_1_1__1__Impl rule__InfixExpression__Group_1_1__2
+            // InternalExport.g:7930:1: ( rule__InfixExpression__Group_1_1__1__Impl rule__InfixExpression__Group_1_1__2 )
+            // InternalExport.g:7931:2: rule__InfixExpression__Group_1_1__1__Impl rule__InfixExpression__Group_1_1__2
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_1__1__Impl_in_rule__InfixExpression__Group_1_1__116041);
+            pushFollow(FOLLOW_40);
             rule__InfixExpression__Group_1_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_1__2_in_rule__InfixExpression__Group_1_1__116044);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_1__2();
 
             state._fsp--;
@@ -22889,22 +22889,22 @@ public final void rule__InfixExpression__Group_1_1__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7938:1: rule__InfixExpression__Group_1_1__1__Impl : ( '.' ) ;
+    // InternalExport.g:7938:1: rule__InfixExpression__Group_1_1__1__Impl : ( '.' ) ;
     public final void rule__InfixExpression__Group_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7942:1: ( ( '.' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7943:1: ( '.' )
+            // InternalExport.g:7942:1: ( ( '.' ) )
+            // InternalExport.g:7943:1: ( '.' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7943:1: ( '.' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7944:1: '.'
+            // InternalExport.g:7943:1: ( '.' )
+            // InternalExport.g:7944:1: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getFullStopKeyword_1_1_1()); 
             }
-            match(input,68,FOLLOW_68_in_rule__InfixExpression__Group_1_1__1__Impl16072); if (state.failed) return ;
+            match(input,68,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInfixExpressionAccess().getFullStopKeyword_1_1_1()); 
             }
@@ -22930,16 +22930,16 @@ public final void rule__InfixExpression__Group_1_1__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_1__2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7957:1: rule__InfixExpression__Group_1_1__2 : rule__InfixExpression__Group_1_1__2__Impl ;
+    // InternalExport.g:7957:1: rule__InfixExpression__Group_1_1__2 : rule__InfixExpression__Group_1_1__2__Impl ;
     public final void rule__InfixExpression__Group_1_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7961:1: ( rule__InfixExpression__Group_1_1__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7962:2: rule__InfixExpression__Group_1_1__2__Impl
+            // InternalExport.g:7961:1: ( rule__InfixExpression__Group_1_1__2__Impl )
+            // InternalExport.g:7962:2: rule__InfixExpression__Group_1_1__2__Impl
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_1__2__Impl_in_rule__InfixExpression__Group_1_1__216103);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_1__2__Impl();
 
             state._fsp--;
@@ -22963,25 +22963,25 @@ public final void rule__InfixExpression__Group_1_1__2() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7968:1: rule__InfixExpression__Group_1_1__2__Impl : ( ( rule__InfixExpression__TypeAssignment_1_1_2 ) ) ;
+    // InternalExport.g:7968:1: rule__InfixExpression__Group_1_1__2__Impl : ( ( rule__InfixExpression__TypeAssignment_1_1_2 ) ) ;
     public final void rule__InfixExpression__Group_1_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7972:1: ( ( ( rule__InfixExpression__TypeAssignment_1_1_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7973:1: ( ( rule__InfixExpression__TypeAssignment_1_1_2 ) )
+            // InternalExport.g:7972:1: ( ( ( rule__InfixExpression__TypeAssignment_1_1_2 ) ) )
+            // InternalExport.g:7973:1: ( ( rule__InfixExpression__TypeAssignment_1_1_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7973:1: ( ( rule__InfixExpression__TypeAssignment_1_1_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7974:1: ( rule__InfixExpression__TypeAssignment_1_1_2 )
+            // InternalExport.g:7973:1: ( ( rule__InfixExpression__TypeAssignment_1_1_2 ) )
+            // InternalExport.g:7974:1: ( rule__InfixExpression__TypeAssignment_1_1_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getTypeAssignment_1_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7975:1: ( rule__InfixExpression__TypeAssignment_1_1_2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7975:2: rule__InfixExpression__TypeAssignment_1_1_2
+            // InternalExport.g:7975:1: ( rule__InfixExpression__TypeAssignment_1_1_2 )
+            // InternalExport.g:7975:2: rule__InfixExpression__TypeAssignment_1_1_2
             {
-            pushFollow(FOLLOW_rule__InfixExpression__TypeAssignment_1_1_2_in_rule__InfixExpression__Group_1_1__2__Impl16130);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__TypeAssignment_1_1_2();
 
             state._fsp--;
@@ -23014,21 +23014,21 @@ public final void rule__InfixExpression__Group_1_1__2__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_2__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7991:1: rule__InfixExpression__Group_1_2__0 : rule__InfixExpression__Group_1_2__0__Impl rule__InfixExpression__Group_1_2__1 ;
+    // InternalExport.g:7991:1: rule__InfixExpression__Group_1_2__0 : rule__InfixExpression__Group_1_2__0__Impl rule__InfixExpression__Group_1_2__1 ;
     public final void rule__InfixExpression__Group_1_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7995:1: ( rule__InfixExpression__Group_1_2__0__Impl rule__InfixExpression__Group_1_2__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:7996:2: rule__InfixExpression__Group_1_2__0__Impl rule__InfixExpression__Group_1_2__1
+            // InternalExport.g:7995:1: ( rule__InfixExpression__Group_1_2__0__Impl rule__InfixExpression__Group_1_2__1 )
+            // InternalExport.g:7996:2: rule__InfixExpression__Group_1_2__0__Impl rule__InfixExpression__Group_1_2__1
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_2__0__Impl_in_rule__InfixExpression__Group_1_2__016166);
+            pushFollow(FOLLOW_62);
             rule__InfixExpression__Group_1_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_2__1_in_rule__InfixExpression__Group_1_2__016169);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_2__1();
 
             state._fsp--;
@@ -23052,23 +23052,23 @@ public final void rule__InfixExpression__Group_1_2__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_2__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8003:1: rule__InfixExpression__Group_1_2__0__Impl : ( () ) ;
+    // InternalExport.g:8003:1: rule__InfixExpression__Group_1_2__0__Impl : ( () ) ;
     public final void rule__InfixExpression__Group_1_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8007:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8008:1: ( () )
+            // InternalExport.g:8007:1: ( ( () ) )
+            // InternalExport.g:8008:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8008:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8009:1: ()
+            // InternalExport.g:8008:1: ( () )
+            // InternalExport.g:8009:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getTypeSelectExpressionTargetAction_1_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8010:1: ()
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8012:1: 
+            // InternalExport.g:8010:1: ()
+            // InternalExport.g:8012:1: 
             {
             }
 
@@ -23093,21 +23093,21 @@ public final void rule__InfixExpression__Group_1_2__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_2__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8022:1: rule__InfixExpression__Group_1_2__1 : rule__InfixExpression__Group_1_2__1__Impl rule__InfixExpression__Group_1_2__2 ;
+    // InternalExport.g:8022:1: rule__InfixExpression__Group_1_2__1 : rule__InfixExpression__Group_1_2__1__Impl rule__InfixExpression__Group_1_2__2 ;
     public final void rule__InfixExpression__Group_1_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8026:1: ( rule__InfixExpression__Group_1_2__1__Impl rule__InfixExpression__Group_1_2__2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8027:2: rule__InfixExpression__Group_1_2__1__Impl rule__InfixExpression__Group_1_2__2
+            // InternalExport.g:8026:1: ( rule__InfixExpression__Group_1_2__1__Impl rule__InfixExpression__Group_1_2__2 )
+            // InternalExport.g:8027:2: rule__InfixExpression__Group_1_2__1__Impl rule__InfixExpression__Group_1_2__2
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_2__1__Impl_in_rule__InfixExpression__Group_1_2__116227);
+            pushFollow(FOLLOW_65);
             rule__InfixExpression__Group_1_2__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_2__2_in_rule__InfixExpression__Group_1_2__116230);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_2__2();
 
             state._fsp--;
@@ -23131,22 +23131,22 @@ public final void rule__InfixExpression__Group_1_2__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_2__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8034:1: rule__InfixExpression__Group_1_2__1__Impl : ( '.' ) ;
+    // InternalExport.g:8034:1: rule__InfixExpression__Group_1_2__1__Impl : ( '.' ) ;
     public final void rule__InfixExpression__Group_1_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8038:1: ( ( '.' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8039:1: ( '.' )
+            // InternalExport.g:8038:1: ( ( '.' ) )
+            // InternalExport.g:8039:1: ( '.' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8039:1: ( '.' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8040:1: '.'
+            // InternalExport.g:8039:1: ( '.' )
+            // InternalExport.g:8040:1: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getFullStopKeyword_1_2_1()); 
             }
-            match(input,68,FOLLOW_68_in_rule__InfixExpression__Group_1_2__1__Impl16258); if (state.failed) return ;
+            match(input,68,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInfixExpressionAccess().getFullStopKeyword_1_2_1()); 
             }
@@ -23172,21 +23172,21 @@ public final void rule__InfixExpression__Group_1_2__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_2__2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8053:1: rule__InfixExpression__Group_1_2__2 : rule__InfixExpression__Group_1_2__2__Impl rule__InfixExpression__Group_1_2__3 ;
+    // InternalExport.g:8053:1: rule__InfixExpression__Group_1_2__2 : rule__InfixExpression__Group_1_2__2__Impl rule__InfixExpression__Group_1_2__3 ;
     public final void rule__InfixExpression__Group_1_2__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8057:1: ( rule__InfixExpression__Group_1_2__2__Impl rule__InfixExpression__Group_1_2__3 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8058:2: rule__InfixExpression__Group_1_2__2__Impl rule__InfixExpression__Group_1_2__3
+            // InternalExport.g:8057:1: ( rule__InfixExpression__Group_1_2__2__Impl rule__InfixExpression__Group_1_2__3 )
+            // InternalExport.g:8058:2: rule__InfixExpression__Group_1_2__2__Impl rule__InfixExpression__Group_1_2__3
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_2__2__Impl_in_rule__InfixExpression__Group_1_2__216289);
+            pushFollow(FOLLOW_34);
             rule__InfixExpression__Group_1_2__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_2__3_in_rule__InfixExpression__Group_1_2__216292);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_2__3();
 
             state._fsp--;
@@ -23210,25 +23210,25 @@ public final void rule__InfixExpression__Group_1_2__2() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_2__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8065:1: rule__InfixExpression__Group_1_2__2__Impl : ( ( rule__InfixExpression__NameAssignment_1_2_2 ) ) ;
+    // InternalExport.g:8065:1: rule__InfixExpression__Group_1_2__2__Impl : ( ( rule__InfixExpression__NameAssignment_1_2_2 ) ) ;
     public final void rule__InfixExpression__Group_1_2__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8069:1: ( ( ( rule__InfixExpression__NameAssignment_1_2_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8070:1: ( ( rule__InfixExpression__NameAssignment_1_2_2 ) )
+            // InternalExport.g:8069:1: ( ( ( rule__InfixExpression__NameAssignment_1_2_2 ) ) )
+            // InternalExport.g:8070:1: ( ( rule__InfixExpression__NameAssignment_1_2_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8070:1: ( ( rule__InfixExpression__NameAssignment_1_2_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8071:1: ( rule__InfixExpression__NameAssignment_1_2_2 )
+            // InternalExport.g:8070:1: ( ( rule__InfixExpression__NameAssignment_1_2_2 ) )
+            // InternalExport.g:8071:1: ( rule__InfixExpression__NameAssignment_1_2_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getNameAssignment_1_2_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8072:1: ( rule__InfixExpression__NameAssignment_1_2_2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8072:2: rule__InfixExpression__NameAssignment_1_2_2
+            // InternalExport.g:8072:1: ( rule__InfixExpression__NameAssignment_1_2_2 )
+            // InternalExport.g:8072:2: rule__InfixExpression__NameAssignment_1_2_2
             {
-            pushFollow(FOLLOW_rule__InfixExpression__NameAssignment_1_2_2_in_rule__InfixExpression__Group_1_2__2__Impl16319);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__NameAssignment_1_2_2();
 
             state._fsp--;
@@ -23261,21 +23261,21 @@ public final void rule__InfixExpression__Group_1_2__2__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_2__3"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8082:1: rule__InfixExpression__Group_1_2__3 : rule__InfixExpression__Group_1_2__3__Impl rule__InfixExpression__Group_1_2__4 ;
+    // InternalExport.g:8082:1: rule__InfixExpression__Group_1_2__3 : rule__InfixExpression__Group_1_2__3__Impl rule__InfixExpression__Group_1_2__4 ;
     public final void rule__InfixExpression__Group_1_2__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8086:1: ( rule__InfixExpression__Group_1_2__3__Impl rule__InfixExpression__Group_1_2__4 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8087:2: rule__InfixExpression__Group_1_2__3__Impl rule__InfixExpression__Group_1_2__4
+            // InternalExport.g:8086:1: ( rule__InfixExpression__Group_1_2__3__Impl rule__InfixExpression__Group_1_2__4 )
+            // InternalExport.g:8087:2: rule__InfixExpression__Group_1_2__3__Impl rule__InfixExpression__Group_1_2__4
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_2__3__Impl_in_rule__InfixExpression__Group_1_2__316349);
+            pushFollow(FOLLOW_40);
             rule__InfixExpression__Group_1_2__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_2__4_in_rule__InfixExpression__Group_1_2__316352);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_2__4();
 
             state._fsp--;
@@ -23299,22 +23299,22 @@ public final void rule__InfixExpression__Group_1_2__3() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_2__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8094:1: rule__InfixExpression__Group_1_2__3__Impl : ( '(' ) ;
+    // InternalExport.g:8094:1: rule__InfixExpression__Group_1_2__3__Impl : ( '(' ) ;
     public final void rule__InfixExpression__Group_1_2__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8098:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8099:1: ( '(' )
+            // InternalExport.g:8098:1: ( ( '(' ) )
+            // InternalExport.g:8099:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8099:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8100:1: '('
+            // InternalExport.g:8099:1: ( '(' )
+            // InternalExport.g:8100:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getLeftParenthesisKeyword_1_2_3()); 
             }
-            match(input,51,FOLLOW_51_in_rule__InfixExpression__Group_1_2__3__Impl16380); if (state.failed) return ;
+            match(input,51,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInfixExpressionAccess().getLeftParenthesisKeyword_1_2_3()); 
             }
@@ -23340,21 +23340,21 @@ public final void rule__InfixExpression__Group_1_2__3__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_2__4"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8113:1: rule__InfixExpression__Group_1_2__4 : rule__InfixExpression__Group_1_2__4__Impl rule__InfixExpression__Group_1_2__5 ;
+    // InternalExport.g:8113:1: rule__InfixExpression__Group_1_2__4 : rule__InfixExpression__Group_1_2__4__Impl rule__InfixExpression__Group_1_2__5 ;
     public final void rule__InfixExpression__Group_1_2__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8117:1: ( rule__InfixExpression__Group_1_2__4__Impl rule__InfixExpression__Group_1_2__5 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8118:2: rule__InfixExpression__Group_1_2__4__Impl rule__InfixExpression__Group_1_2__5
+            // InternalExport.g:8117:1: ( rule__InfixExpression__Group_1_2__4__Impl rule__InfixExpression__Group_1_2__5 )
+            // InternalExport.g:8118:2: rule__InfixExpression__Group_1_2__4__Impl rule__InfixExpression__Group_1_2__5
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_2__4__Impl_in_rule__InfixExpression__Group_1_2__416411);
+            pushFollow(FOLLOW_25);
             rule__InfixExpression__Group_1_2__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_2__5_in_rule__InfixExpression__Group_1_2__416414);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_2__5();
 
             state._fsp--;
@@ -23378,25 +23378,25 @@ public final void rule__InfixExpression__Group_1_2__4() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_2__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8125:1: rule__InfixExpression__Group_1_2__4__Impl : ( ( rule__InfixExpression__TypeAssignment_1_2_4 ) ) ;
+    // InternalExport.g:8125:1: rule__InfixExpression__Group_1_2__4__Impl : ( ( rule__InfixExpression__TypeAssignment_1_2_4 ) ) ;
     public final void rule__InfixExpression__Group_1_2__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8129:1: ( ( ( rule__InfixExpression__TypeAssignment_1_2_4 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8130:1: ( ( rule__InfixExpression__TypeAssignment_1_2_4 ) )
+            // InternalExport.g:8129:1: ( ( ( rule__InfixExpression__TypeAssignment_1_2_4 ) ) )
+            // InternalExport.g:8130:1: ( ( rule__InfixExpression__TypeAssignment_1_2_4 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8130:1: ( ( rule__InfixExpression__TypeAssignment_1_2_4 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8131:1: ( rule__InfixExpression__TypeAssignment_1_2_4 )
+            // InternalExport.g:8130:1: ( ( rule__InfixExpression__TypeAssignment_1_2_4 ) )
+            // InternalExport.g:8131:1: ( rule__InfixExpression__TypeAssignment_1_2_4 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getTypeAssignment_1_2_4()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8132:1: ( rule__InfixExpression__TypeAssignment_1_2_4 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8132:2: rule__InfixExpression__TypeAssignment_1_2_4
+            // InternalExport.g:8132:1: ( rule__InfixExpression__TypeAssignment_1_2_4 )
+            // InternalExport.g:8132:2: rule__InfixExpression__TypeAssignment_1_2_4
             {
-            pushFollow(FOLLOW_rule__InfixExpression__TypeAssignment_1_2_4_in_rule__InfixExpression__Group_1_2__4__Impl16441);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__TypeAssignment_1_2_4();
 
             state._fsp--;
@@ -23429,16 +23429,16 @@ public final void rule__InfixExpression__Group_1_2__4__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_2__5"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8142:1: rule__InfixExpression__Group_1_2__5 : rule__InfixExpression__Group_1_2__5__Impl ;
+    // InternalExport.g:8142:1: rule__InfixExpression__Group_1_2__5 : rule__InfixExpression__Group_1_2__5__Impl ;
     public final void rule__InfixExpression__Group_1_2__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8146:1: ( rule__InfixExpression__Group_1_2__5__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8147:2: rule__InfixExpression__Group_1_2__5__Impl
+            // InternalExport.g:8146:1: ( rule__InfixExpression__Group_1_2__5__Impl )
+            // InternalExport.g:8147:2: rule__InfixExpression__Group_1_2__5__Impl
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_2__5__Impl_in_rule__InfixExpression__Group_1_2__516471);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_2__5__Impl();
 
             state._fsp--;
@@ -23462,22 +23462,22 @@ public final void rule__InfixExpression__Group_1_2__5() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_2__5__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8153:1: rule__InfixExpression__Group_1_2__5__Impl : ( ')' ) ;
+    // InternalExport.g:8153:1: rule__InfixExpression__Group_1_2__5__Impl : ( ')' ) ;
     public final void rule__InfixExpression__Group_1_2__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8157:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8158:1: ( ')' )
+            // InternalExport.g:8157:1: ( ( ')' ) )
+            // InternalExport.g:8158:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8158:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8159:1: ')'
+            // InternalExport.g:8158:1: ( ')' )
+            // InternalExport.g:8159:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getRightParenthesisKeyword_1_2_5()); 
             }
-            match(input,52,FOLLOW_52_in_rule__InfixExpression__Group_1_2__5__Impl16499); if (state.failed) return ;
+            match(input,52,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInfixExpressionAccess().getRightParenthesisKeyword_1_2_5()); 
             }
@@ -23503,21 +23503,21 @@ public final void rule__InfixExpression__Group_1_2__5__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8184:1: rule__InfixExpression__Group_1_3__0 : rule__InfixExpression__Group_1_3__0__Impl rule__InfixExpression__Group_1_3__1 ;
+    // InternalExport.g:8184:1: rule__InfixExpression__Group_1_3__0 : rule__InfixExpression__Group_1_3__0__Impl rule__InfixExpression__Group_1_3__1 ;
     public final void rule__InfixExpression__Group_1_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8188:1: ( rule__InfixExpression__Group_1_3__0__Impl rule__InfixExpression__Group_1_3__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8189:2: rule__InfixExpression__Group_1_3__0__Impl rule__InfixExpression__Group_1_3__1
+            // InternalExport.g:8188:1: ( rule__InfixExpression__Group_1_3__0__Impl rule__InfixExpression__Group_1_3__1 )
+            // InternalExport.g:8189:2: rule__InfixExpression__Group_1_3__0__Impl rule__InfixExpression__Group_1_3__1
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3__0__Impl_in_rule__InfixExpression__Group_1_3__016542);
+            pushFollow(FOLLOW_62);
             rule__InfixExpression__Group_1_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3__1_in_rule__InfixExpression__Group_1_3__016545);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_3__1();
 
             state._fsp--;
@@ -23541,23 +23541,23 @@ public final void rule__InfixExpression__Group_1_3__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8196:1: rule__InfixExpression__Group_1_3__0__Impl : ( () ) ;
+    // InternalExport.g:8196:1: rule__InfixExpression__Group_1_3__0__Impl : ( () ) ;
     public final void rule__InfixExpression__Group_1_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8200:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8201:1: ( () )
+            // InternalExport.g:8200:1: ( ( () ) )
+            // InternalExport.g:8201:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8201:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8202:1: ()
+            // InternalExport.g:8201:1: ( () )
+            // InternalExport.g:8202:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getCollectionExpressionTargetAction_1_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8203:1: ()
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8205:1: 
+            // InternalExport.g:8203:1: ()
+            // InternalExport.g:8205:1: 
             {
             }
 
@@ -23582,21 +23582,21 @@ public final void rule__InfixExpression__Group_1_3__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8215:1: rule__InfixExpression__Group_1_3__1 : rule__InfixExpression__Group_1_3__1__Impl rule__InfixExpression__Group_1_3__2 ;
+    // InternalExport.g:8215:1: rule__InfixExpression__Group_1_3__1 : rule__InfixExpression__Group_1_3__1__Impl rule__InfixExpression__Group_1_3__2 ;
     public final void rule__InfixExpression__Group_1_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8219:1: ( rule__InfixExpression__Group_1_3__1__Impl rule__InfixExpression__Group_1_3__2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8220:2: rule__InfixExpression__Group_1_3__1__Impl rule__InfixExpression__Group_1_3__2
+            // InternalExport.g:8219:1: ( rule__InfixExpression__Group_1_3__1__Impl rule__InfixExpression__Group_1_3__2 )
+            // InternalExport.g:8220:2: rule__InfixExpression__Group_1_3__1__Impl rule__InfixExpression__Group_1_3__2
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3__1__Impl_in_rule__InfixExpression__Group_1_3__116603);
+            pushFollow(FOLLOW_66);
             rule__InfixExpression__Group_1_3__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3__2_in_rule__InfixExpression__Group_1_3__116606);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_3__2();
 
             state._fsp--;
@@ -23620,22 +23620,22 @@ public final void rule__InfixExpression__Group_1_3__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8227:1: rule__InfixExpression__Group_1_3__1__Impl : ( '.' ) ;
+    // InternalExport.g:8227:1: rule__InfixExpression__Group_1_3__1__Impl : ( '.' ) ;
     public final void rule__InfixExpression__Group_1_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8231:1: ( ( '.' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8232:1: ( '.' )
+            // InternalExport.g:8231:1: ( ( '.' ) )
+            // InternalExport.g:8232:1: ( '.' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8232:1: ( '.' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8233:1: '.'
+            // InternalExport.g:8232:1: ( '.' )
+            // InternalExport.g:8233:1: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getFullStopKeyword_1_3_1()); 
             }
-            match(input,68,FOLLOW_68_in_rule__InfixExpression__Group_1_3__1__Impl16634); if (state.failed) return ;
+            match(input,68,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInfixExpressionAccess().getFullStopKeyword_1_3_1()); 
             }
@@ -23661,21 +23661,21 @@ public final void rule__InfixExpression__Group_1_3__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3__2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8246:1: rule__InfixExpression__Group_1_3__2 : rule__InfixExpression__Group_1_3__2__Impl rule__InfixExpression__Group_1_3__3 ;
+    // InternalExport.g:8246:1: rule__InfixExpression__Group_1_3__2 : rule__InfixExpression__Group_1_3__2__Impl rule__InfixExpression__Group_1_3__3 ;
     public final void rule__InfixExpression__Group_1_3__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8250:1: ( rule__InfixExpression__Group_1_3__2__Impl rule__InfixExpression__Group_1_3__3 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8251:2: rule__InfixExpression__Group_1_3__2__Impl rule__InfixExpression__Group_1_3__3
+            // InternalExport.g:8250:1: ( rule__InfixExpression__Group_1_3__2__Impl rule__InfixExpression__Group_1_3__3 )
+            // InternalExport.g:8251:2: rule__InfixExpression__Group_1_3__2__Impl rule__InfixExpression__Group_1_3__3
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3__2__Impl_in_rule__InfixExpression__Group_1_3__216665);
+            pushFollow(FOLLOW_34);
             rule__InfixExpression__Group_1_3__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3__3_in_rule__InfixExpression__Group_1_3__216668);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_3__3();
 
             state._fsp--;
@@ -23699,25 +23699,25 @@ public final void rule__InfixExpression__Group_1_3__2() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8258:1: rule__InfixExpression__Group_1_3__2__Impl : ( ( rule__InfixExpression__NameAssignment_1_3_2 ) ) ;
+    // InternalExport.g:8258:1: rule__InfixExpression__Group_1_3__2__Impl : ( ( rule__InfixExpression__NameAssignment_1_3_2 ) ) ;
     public final void rule__InfixExpression__Group_1_3__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8262:1: ( ( ( rule__InfixExpression__NameAssignment_1_3_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8263:1: ( ( rule__InfixExpression__NameAssignment_1_3_2 ) )
+            // InternalExport.g:8262:1: ( ( ( rule__InfixExpression__NameAssignment_1_3_2 ) ) )
+            // InternalExport.g:8263:1: ( ( rule__InfixExpression__NameAssignment_1_3_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8263:1: ( ( rule__InfixExpression__NameAssignment_1_3_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8264:1: ( rule__InfixExpression__NameAssignment_1_3_2 )
+            // InternalExport.g:8263:1: ( ( rule__InfixExpression__NameAssignment_1_3_2 ) )
+            // InternalExport.g:8264:1: ( rule__InfixExpression__NameAssignment_1_3_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getNameAssignment_1_3_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8265:1: ( rule__InfixExpression__NameAssignment_1_3_2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8265:2: rule__InfixExpression__NameAssignment_1_3_2
+            // InternalExport.g:8265:1: ( rule__InfixExpression__NameAssignment_1_3_2 )
+            // InternalExport.g:8265:2: rule__InfixExpression__NameAssignment_1_3_2
             {
-            pushFollow(FOLLOW_rule__InfixExpression__NameAssignment_1_3_2_in_rule__InfixExpression__Group_1_3__2__Impl16695);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__NameAssignment_1_3_2();
 
             state._fsp--;
@@ -23750,21 +23750,21 @@ public final void rule__InfixExpression__Group_1_3__2__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3__3"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8275:1: rule__InfixExpression__Group_1_3__3 : rule__InfixExpression__Group_1_3__3__Impl rule__InfixExpression__Group_1_3__4 ;
+    // InternalExport.g:8275:1: rule__InfixExpression__Group_1_3__3 : rule__InfixExpression__Group_1_3__3__Impl rule__InfixExpression__Group_1_3__4 ;
     public final void rule__InfixExpression__Group_1_3__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8279:1: ( rule__InfixExpression__Group_1_3__3__Impl rule__InfixExpression__Group_1_3__4 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8280:2: rule__InfixExpression__Group_1_3__3__Impl rule__InfixExpression__Group_1_3__4
+            // InternalExport.g:8279:1: ( rule__InfixExpression__Group_1_3__3__Impl rule__InfixExpression__Group_1_3__4 )
+            // InternalExport.g:8280:2: rule__InfixExpression__Group_1_3__3__Impl rule__InfixExpression__Group_1_3__4
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3__3__Impl_in_rule__InfixExpression__Group_1_3__316725);
+            pushFollow(FOLLOW_18);
             rule__InfixExpression__Group_1_3__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3__4_in_rule__InfixExpression__Group_1_3__316728);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_3__4();
 
             state._fsp--;
@@ -23788,22 +23788,22 @@ public final void rule__InfixExpression__Group_1_3__3() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8287:1: rule__InfixExpression__Group_1_3__3__Impl : ( '(' ) ;
+    // InternalExport.g:8287:1: rule__InfixExpression__Group_1_3__3__Impl : ( '(' ) ;
     public final void rule__InfixExpression__Group_1_3__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8291:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8292:1: ( '(' )
+            // InternalExport.g:8291:1: ( ( '(' ) )
+            // InternalExport.g:8292:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8292:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8293:1: '('
+            // InternalExport.g:8292:1: ( '(' )
+            // InternalExport.g:8293:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getLeftParenthesisKeyword_1_3_3()); 
             }
-            match(input,51,FOLLOW_51_in_rule__InfixExpression__Group_1_3__3__Impl16756); if (state.failed) return ;
+            match(input,51,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInfixExpressionAccess().getLeftParenthesisKeyword_1_3_3()); 
             }
@@ -23829,21 +23829,21 @@ public final void rule__InfixExpression__Group_1_3__3__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3__4"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8306:1: rule__InfixExpression__Group_1_3__4 : rule__InfixExpression__Group_1_3__4__Impl rule__InfixExpression__Group_1_3__5 ;
+    // InternalExport.g:8306:1: rule__InfixExpression__Group_1_3__4 : rule__InfixExpression__Group_1_3__4__Impl rule__InfixExpression__Group_1_3__5 ;
     public final void rule__InfixExpression__Group_1_3__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8310:1: ( rule__InfixExpression__Group_1_3__4__Impl rule__InfixExpression__Group_1_3__5 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8311:2: rule__InfixExpression__Group_1_3__4__Impl rule__InfixExpression__Group_1_3__5
+            // InternalExport.g:8310:1: ( rule__InfixExpression__Group_1_3__4__Impl rule__InfixExpression__Group_1_3__5 )
+            // InternalExport.g:8311:2: rule__InfixExpression__Group_1_3__4__Impl rule__InfixExpression__Group_1_3__5
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3__4__Impl_in_rule__InfixExpression__Group_1_3__416787);
+            pushFollow(FOLLOW_18);
             rule__InfixExpression__Group_1_3__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3__5_in_rule__InfixExpression__Group_1_3__416790);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_3__5();
 
             state._fsp--;
@@ -23867,22 +23867,22 @@ public final void rule__InfixExpression__Group_1_3__4() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8318:1: rule__InfixExpression__Group_1_3__4__Impl : ( ( rule__InfixExpression__Group_1_3_4__0 )? ) ;
+    // InternalExport.g:8318:1: rule__InfixExpression__Group_1_3__4__Impl : ( ( rule__InfixExpression__Group_1_3_4__0 )? ) ;
     public final void rule__InfixExpression__Group_1_3__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8322:1: ( ( ( rule__InfixExpression__Group_1_3_4__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8323:1: ( ( rule__InfixExpression__Group_1_3_4__0 )? )
+            // InternalExport.g:8322:1: ( ( ( rule__InfixExpression__Group_1_3_4__0 )? ) )
+            // InternalExport.g:8323:1: ( ( rule__InfixExpression__Group_1_3_4__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8323:1: ( ( rule__InfixExpression__Group_1_3_4__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8324:1: ( rule__InfixExpression__Group_1_3_4__0 )?
+            // InternalExport.g:8323:1: ( ( rule__InfixExpression__Group_1_3_4__0 )? )
+            // InternalExport.g:8324:1: ( rule__InfixExpression__Group_1_3_4__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getGroup_1_3_4()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8325:1: ( rule__InfixExpression__Group_1_3_4__0 )?
+            // InternalExport.g:8325:1: ( rule__InfixExpression__Group_1_3_4__0 )?
             int alt61=2;
             int LA61_0 = input.LA(1);
 
@@ -23895,9 +23895,9 @@ public final void rule__InfixExpression__Group_1_3__4__Impl() throws Recognition
             }
             switch (alt61) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8325:2: rule__InfixExpression__Group_1_3_4__0
+                    // InternalExport.g:8325:2: rule__InfixExpression__Group_1_3_4__0
                     {
-                    pushFollow(FOLLOW_rule__InfixExpression__Group_1_3_4__0_in_rule__InfixExpression__Group_1_3__4__Impl16817);
+                    pushFollow(FOLLOW_2);
                     rule__InfixExpression__Group_1_3_4__0();
 
                     state._fsp--;
@@ -23933,21 +23933,21 @@ public final void rule__InfixExpression__Group_1_3__4__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3__5"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8335:1: rule__InfixExpression__Group_1_3__5 : rule__InfixExpression__Group_1_3__5__Impl rule__InfixExpression__Group_1_3__6 ;
+    // InternalExport.g:8335:1: rule__InfixExpression__Group_1_3__5 : rule__InfixExpression__Group_1_3__5__Impl rule__InfixExpression__Group_1_3__6 ;
     public final void rule__InfixExpression__Group_1_3__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8339:1: ( rule__InfixExpression__Group_1_3__5__Impl rule__InfixExpression__Group_1_3__6 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8340:2: rule__InfixExpression__Group_1_3__5__Impl rule__InfixExpression__Group_1_3__6
+            // InternalExport.g:8339:1: ( rule__InfixExpression__Group_1_3__5__Impl rule__InfixExpression__Group_1_3__6 )
+            // InternalExport.g:8340:2: rule__InfixExpression__Group_1_3__5__Impl rule__InfixExpression__Group_1_3__6
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3__5__Impl_in_rule__InfixExpression__Group_1_3__516848);
+            pushFollow(FOLLOW_25);
             rule__InfixExpression__Group_1_3__5__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3__6_in_rule__InfixExpression__Group_1_3__516851);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_3__6();
 
             state._fsp--;
@@ -23971,25 +23971,25 @@ public final void rule__InfixExpression__Group_1_3__5() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3__5__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8347:1: rule__InfixExpression__Group_1_3__5__Impl : ( ( rule__InfixExpression__ExpAssignment_1_3_5 ) ) ;
+    // InternalExport.g:8347:1: rule__InfixExpression__Group_1_3__5__Impl : ( ( rule__InfixExpression__ExpAssignment_1_3_5 ) ) ;
     public final void rule__InfixExpression__Group_1_3__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8351:1: ( ( ( rule__InfixExpression__ExpAssignment_1_3_5 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8352:1: ( ( rule__InfixExpression__ExpAssignment_1_3_5 ) )
+            // InternalExport.g:8351:1: ( ( ( rule__InfixExpression__ExpAssignment_1_3_5 ) ) )
+            // InternalExport.g:8352:1: ( ( rule__InfixExpression__ExpAssignment_1_3_5 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8352:1: ( ( rule__InfixExpression__ExpAssignment_1_3_5 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8353:1: ( rule__InfixExpression__ExpAssignment_1_3_5 )
+            // InternalExport.g:8352:1: ( ( rule__InfixExpression__ExpAssignment_1_3_5 ) )
+            // InternalExport.g:8353:1: ( rule__InfixExpression__ExpAssignment_1_3_5 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getExpAssignment_1_3_5()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8354:1: ( rule__InfixExpression__ExpAssignment_1_3_5 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8354:2: rule__InfixExpression__ExpAssignment_1_3_5
+            // InternalExport.g:8354:1: ( rule__InfixExpression__ExpAssignment_1_3_5 )
+            // InternalExport.g:8354:2: rule__InfixExpression__ExpAssignment_1_3_5
             {
-            pushFollow(FOLLOW_rule__InfixExpression__ExpAssignment_1_3_5_in_rule__InfixExpression__Group_1_3__5__Impl16878);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__ExpAssignment_1_3_5();
 
             state._fsp--;
@@ -24022,16 +24022,16 @@ public final void rule__InfixExpression__Group_1_3__5__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3__6"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8364:1: rule__InfixExpression__Group_1_3__6 : rule__InfixExpression__Group_1_3__6__Impl ;
+    // InternalExport.g:8364:1: rule__InfixExpression__Group_1_3__6 : rule__InfixExpression__Group_1_3__6__Impl ;
     public final void rule__InfixExpression__Group_1_3__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8368:1: ( rule__InfixExpression__Group_1_3__6__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8369:2: rule__InfixExpression__Group_1_3__6__Impl
+            // InternalExport.g:8368:1: ( rule__InfixExpression__Group_1_3__6__Impl )
+            // InternalExport.g:8369:2: rule__InfixExpression__Group_1_3__6__Impl
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3__6__Impl_in_rule__InfixExpression__Group_1_3__616908);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_3__6__Impl();
 
             state._fsp--;
@@ -24055,22 +24055,22 @@ public final void rule__InfixExpression__Group_1_3__6() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3__6__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8375:1: rule__InfixExpression__Group_1_3__6__Impl : ( ')' ) ;
+    // InternalExport.g:8375:1: rule__InfixExpression__Group_1_3__6__Impl : ( ')' ) ;
     public final void rule__InfixExpression__Group_1_3__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8379:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8380:1: ( ')' )
+            // InternalExport.g:8379:1: ( ( ')' ) )
+            // InternalExport.g:8380:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8380:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8381:1: ')'
+            // InternalExport.g:8380:1: ( ')' )
+            // InternalExport.g:8381:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getRightParenthesisKeyword_1_3_6()); 
             }
-            match(input,52,FOLLOW_52_in_rule__InfixExpression__Group_1_3__6__Impl16936); if (state.failed) return ;
+            match(input,52,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInfixExpressionAccess().getRightParenthesisKeyword_1_3_6()); 
             }
@@ -24096,21 +24096,21 @@ public final void rule__InfixExpression__Group_1_3__6__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3_4__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8408:1: rule__InfixExpression__Group_1_3_4__0 : rule__InfixExpression__Group_1_3_4__0__Impl rule__InfixExpression__Group_1_3_4__1 ;
+    // InternalExport.g:8408:1: rule__InfixExpression__Group_1_3_4__0 : rule__InfixExpression__Group_1_3_4__0__Impl rule__InfixExpression__Group_1_3_4__1 ;
     public final void rule__InfixExpression__Group_1_3_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8412:1: ( rule__InfixExpression__Group_1_3_4__0__Impl rule__InfixExpression__Group_1_3_4__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8413:2: rule__InfixExpression__Group_1_3_4__0__Impl rule__InfixExpression__Group_1_3_4__1
+            // InternalExport.g:8412:1: ( rule__InfixExpression__Group_1_3_4__0__Impl rule__InfixExpression__Group_1_3_4__1 )
+            // InternalExport.g:8413:2: rule__InfixExpression__Group_1_3_4__0__Impl rule__InfixExpression__Group_1_3_4__1
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3_4__0__Impl_in_rule__InfixExpression__Group_1_3_4__016981);
+            pushFollow(FOLLOW_67);
             rule__InfixExpression__Group_1_3_4__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3_4__1_in_rule__InfixExpression__Group_1_3_4__016984);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_3_4__1();
 
             state._fsp--;
@@ -24134,25 +24134,25 @@ public final void rule__InfixExpression__Group_1_3_4__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3_4__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8420:1: rule__InfixExpression__Group_1_3_4__0__Impl : ( ( rule__InfixExpression__VarAssignment_1_3_4_0 ) ) ;
+    // InternalExport.g:8420:1: rule__InfixExpression__Group_1_3_4__0__Impl : ( ( rule__InfixExpression__VarAssignment_1_3_4_0 ) ) ;
     public final void rule__InfixExpression__Group_1_3_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8424:1: ( ( ( rule__InfixExpression__VarAssignment_1_3_4_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8425:1: ( ( rule__InfixExpression__VarAssignment_1_3_4_0 ) )
+            // InternalExport.g:8424:1: ( ( ( rule__InfixExpression__VarAssignment_1_3_4_0 ) ) )
+            // InternalExport.g:8425:1: ( ( rule__InfixExpression__VarAssignment_1_3_4_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8425:1: ( ( rule__InfixExpression__VarAssignment_1_3_4_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8426:1: ( rule__InfixExpression__VarAssignment_1_3_4_0 )
+            // InternalExport.g:8425:1: ( ( rule__InfixExpression__VarAssignment_1_3_4_0 ) )
+            // InternalExport.g:8426:1: ( rule__InfixExpression__VarAssignment_1_3_4_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getVarAssignment_1_3_4_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8427:1: ( rule__InfixExpression__VarAssignment_1_3_4_0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8427:2: rule__InfixExpression__VarAssignment_1_3_4_0
+            // InternalExport.g:8427:1: ( rule__InfixExpression__VarAssignment_1_3_4_0 )
+            // InternalExport.g:8427:2: rule__InfixExpression__VarAssignment_1_3_4_0
             {
-            pushFollow(FOLLOW_rule__InfixExpression__VarAssignment_1_3_4_0_in_rule__InfixExpression__Group_1_3_4__0__Impl17011);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__VarAssignment_1_3_4_0();
 
             state._fsp--;
@@ -24185,16 +24185,16 @@ public final void rule__InfixExpression__Group_1_3_4__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3_4__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8437:1: rule__InfixExpression__Group_1_3_4__1 : rule__InfixExpression__Group_1_3_4__1__Impl ;
+    // InternalExport.g:8437:1: rule__InfixExpression__Group_1_3_4__1 : rule__InfixExpression__Group_1_3_4__1__Impl ;
     public final void rule__InfixExpression__Group_1_3_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8441:1: ( rule__InfixExpression__Group_1_3_4__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8442:2: rule__InfixExpression__Group_1_3_4__1__Impl
+            // InternalExport.g:8441:1: ( rule__InfixExpression__Group_1_3_4__1__Impl )
+            // InternalExport.g:8442:2: rule__InfixExpression__Group_1_3_4__1__Impl
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3_4__1__Impl_in_rule__InfixExpression__Group_1_3_4__117041);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_3_4__1__Impl();
 
             state._fsp--;
@@ -24218,22 +24218,22 @@ public final void rule__InfixExpression__Group_1_3_4__1() throws RecognitionExce
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3_4__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8448:1: rule__InfixExpression__Group_1_3_4__1__Impl : ( '|' ) ;
+    // InternalExport.g:8448:1: rule__InfixExpression__Group_1_3_4__1__Impl : ( '|' ) ;
     public final void rule__InfixExpression__Group_1_3_4__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8452:1: ( ( '|' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8453:1: ( '|' )
+            // InternalExport.g:8452:1: ( ( '|' ) )
+            // InternalExport.g:8453:1: ( '|' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8453:1: ( '|' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8454:1: '|'
+            // InternalExport.g:8453:1: ( '|' )
+            // InternalExport.g:8454:1: '|'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getVerticalLineKeyword_1_3_4_1()); 
             }
-            match(input,69,FOLLOW_69_in_rule__InfixExpression__Group_1_3_4__1__Impl17069); if (state.failed) return ;
+            match(input,69,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInfixExpressionAccess().getVerticalLineKeyword_1_3_4_1()); 
             }
@@ -24259,21 +24259,21 @@ public final void rule__InfixExpression__Group_1_3_4__1__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__ParanthesizedExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8471:1: rule__ParanthesizedExpression__Group__0 : rule__ParanthesizedExpression__Group__0__Impl rule__ParanthesizedExpression__Group__1 ;
+    // InternalExport.g:8471:1: rule__ParanthesizedExpression__Group__0 : rule__ParanthesizedExpression__Group__0__Impl rule__ParanthesizedExpression__Group__1 ;
     public final void rule__ParanthesizedExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8475:1: ( rule__ParanthesizedExpression__Group__0__Impl rule__ParanthesizedExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8476:2: rule__ParanthesizedExpression__Group__0__Impl rule__ParanthesizedExpression__Group__1
+            // InternalExport.g:8475:1: ( rule__ParanthesizedExpression__Group__0__Impl rule__ParanthesizedExpression__Group__1 )
+            // InternalExport.g:8476:2: rule__ParanthesizedExpression__Group__0__Impl rule__ParanthesizedExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__ParanthesizedExpression__Group__0__Impl_in_rule__ParanthesizedExpression__Group__017104);
+            pushFollow(FOLLOW_18);
             rule__ParanthesizedExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ParanthesizedExpression__Group__1_in_rule__ParanthesizedExpression__Group__017107);
+            pushFollow(FOLLOW_2);
             rule__ParanthesizedExpression__Group__1();
 
             state._fsp--;
@@ -24297,22 +24297,22 @@ public final void rule__ParanthesizedExpression__Group__0() throws RecognitionEx
 
 
     // $ANTLR start "rule__ParanthesizedExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8483:1: rule__ParanthesizedExpression__Group__0__Impl : ( '(' ) ;
+    // InternalExport.g:8483:1: rule__ParanthesizedExpression__Group__0__Impl : ( '(' ) ;
     public final void rule__ParanthesizedExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8487:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8488:1: ( '(' )
+            // InternalExport.g:8487:1: ( ( '(' ) )
+            // InternalExport.g:8488:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8488:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8489:1: '('
+            // InternalExport.g:8488:1: ( '(' )
+            // InternalExport.g:8489:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getParanthesizedExpressionAccess().getLeftParenthesisKeyword_0()); 
             }
-            match(input,51,FOLLOW_51_in_rule__ParanthesizedExpression__Group__0__Impl17135); if (state.failed) return ;
+            match(input,51,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getParanthesizedExpressionAccess().getLeftParenthesisKeyword_0()); 
             }
@@ -24338,21 +24338,21 @@ public final void rule__ParanthesizedExpression__Group__0__Impl() throws Recogni
 
 
     // $ANTLR start "rule__ParanthesizedExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8502:1: rule__ParanthesizedExpression__Group__1 : rule__ParanthesizedExpression__Group__1__Impl rule__ParanthesizedExpression__Group__2 ;
+    // InternalExport.g:8502:1: rule__ParanthesizedExpression__Group__1 : rule__ParanthesizedExpression__Group__1__Impl rule__ParanthesizedExpression__Group__2 ;
     public final void rule__ParanthesizedExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8506:1: ( rule__ParanthesizedExpression__Group__1__Impl rule__ParanthesizedExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8507:2: rule__ParanthesizedExpression__Group__1__Impl rule__ParanthesizedExpression__Group__2
+            // InternalExport.g:8506:1: ( rule__ParanthesizedExpression__Group__1__Impl rule__ParanthesizedExpression__Group__2 )
+            // InternalExport.g:8507:2: rule__ParanthesizedExpression__Group__1__Impl rule__ParanthesizedExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__ParanthesizedExpression__Group__1__Impl_in_rule__ParanthesizedExpression__Group__117166);
+            pushFollow(FOLLOW_25);
             rule__ParanthesizedExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ParanthesizedExpression__Group__2_in_rule__ParanthesizedExpression__Group__117169);
+            pushFollow(FOLLOW_2);
             rule__ParanthesizedExpression__Group__2();
 
             state._fsp--;
@@ -24376,22 +24376,22 @@ public final void rule__ParanthesizedExpression__Group__1() throws RecognitionEx
 
 
     // $ANTLR start "rule__ParanthesizedExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8514:1: rule__ParanthesizedExpression__Group__1__Impl : ( ruleExpression ) ;
+    // InternalExport.g:8514:1: rule__ParanthesizedExpression__Group__1__Impl : ( ruleExpression ) ;
     public final void rule__ParanthesizedExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8518:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8519:1: ( ruleExpression )
+            // InternalExport.g:8518:1: ( ( ruleExpression ) )
+            // InternalExport.g:8519:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8519:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8520:1: ruleExpression
+            // InternalExport.g:8519:1: ( ruleExpression )
+            // InternalExport.g:8520:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getParanthesizedExpressionAccess().getExpressionParserRuleCall_1()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__ParanthesizedExpression__Group__1__Impl17196);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -24421,16 +24421,16 @@ public final void rule__ParanthesizedExpression__Group__1__Impl() throws Recogni
 
 
     // $ANTLR start "rule__ParanthesizedExpression__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8531:1: rule__ParanthesizedExpression__Group__2 : rule__ParanthesizedExpression__Group__2__Impl ;
+    // InternalExport.g:8531:1: rule__ParanthesizedExpression__Group__2 : rule__ParanthesizedExpression__Group__2__Impl ;
     public final void rule__ParanthesizedExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8535:1: ( rule__ParanthesizedExpression__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8536:2: rule__ParanthesizedExpression__Group__2__Impl
+            // InternalExport.g:8535:1: ( rule__ParanthesizedExpression__Group__2__Impl )
+            // InternalExport.g:8536:2: rule__ParanthesizedExpression__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__ParanthesizedExpression__Group__2__Impl_in_rule__ParanthesizedExpression__Group__217225);
+            pushFollow(FOLLOW_2);
             rule__ParanthesizedExpression__Group__2__Impl();
 
             state._fsp--;
@@ -24454,22 +24454,22 @@ public final void rule__ParanthesizedExpression__Group__2() throws RecognitionEx
 
 
     // $ANTLR start "rule__ParanthesizedExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8542:1: rule__ParanthesizedExpression__Group__2__Impl : ( ')' ) ;
+    // InternalExport.g:8542:1: rule__ParanthesizedExpression__Group__2__Impl : ( ')' ) ;
     public final void rule__ParanthesizedExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8546:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8547:1: ( ')' )
+            // InternalExport.g:8546:1: ( ( ')' ) )
+            // InternalExport.g:8547:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8547:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8548:1: ')'
+            // InternalExport.g:8547:1: ( ')' )
+            // InternalExport.g:8548:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getParanthesizedExpressionAccess().getRightParenthesisKeyword_2()); 
             }
-            match(input,52,FOLLOW_52_in_rule__ParanthesizedExpression__Group__2__Impl17253); if (state.failed) return ;
+            match(input,52,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getParanthesizedExpressionAccess().getRightParenthesisKeyword_2()); 
             }
@@ -24495,21 +24495,21 @@ public final void rule__ParanthesizedExpression__Group__2__Impl() throws Recogni
 
 
     // $ANTLR start "rule__GlobalVarExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8567:1: rule__GlobalVarExpression__Group__0 : rule__GlobalVarExpression__Group__0__Impl rule__GlobalVarExpression__Group__1 ;
+    // InternalExport.g:8567:1: rule__GlobalVarExpression__Group__0 : rule__GlobalVarExpression__Group__0__Impl rule__GlobalVarExpression__Group__1 ;
     public final void rule__GlobalVarExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8571:1: ( rule__GlobalVarExpression__Group__0__Impl rule__GlobalVarExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8572:2: rule__GlobalVarExpression__Group__0__Impl rule__GlobalVarExpression__Group__1
+            // InternalExport.g:8571:1: ( rule__GlobalVarExpression__Group__0__Impl rule__GlobalVarExpression__Group__1 )
+            // InternalExport.g:8572:2: rule__GlobalVarExpression__Group__0__Impl rule__GlobalVarExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__GlobalVarExpression__Group__0__Impl_in_rule__GlobalVarExpression__Group__017290);
+            pushFollow(FOLLOW_10);
             rule__GlobalVarExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__GlobalVarExpression__Group__1_in_rule__GlobalVarExpression__Group__017293);
+            pushFollow(FOLLOW_2);
             rule__GlobalVarExpression__Group__1();
 
             state._fsp--;
@@ -24533,22 +24533,22 @@ public final void rule__GlobalVarExpression__Group__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__GlobalVarExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8579:1: rule__GlobalVarExpression__Group__0__Impl : ( 'GLOBALVAR' ) ;
+    // InternalExport.g:8579:1: rule__GlobalVarExpression__Group__0__Impl : ( 'GLOBALVAR' ) ;
     public final void rule__GlobalVarExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8583:1: ( ( 'GLOBALVAR' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8584:1: ( 'GLOBALVAR' )
+            // InternalExport.g:8583:1: ( ( 'GLOBALVAR' ) )
+            // InternalExport.g:8584:1: ( 'GLOBALVAR' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8584:1: ( 'GLOBALVAR' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8585:1: 'GLOBALVAR'
+            // InternalExport.g:8584:1: ( 'GLOBALVAR' )
+            // InternalExport.g:8585:1: 'GLOBALVAR'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalVarExpressionAccess().getGLOBALVARKeyword_0()); 
             }
-            match(input,70,FOLLOW_70_in_rule__GlobalVarExpression__Group__0__Impl17321); if (state.failed) return ;
+            match(input,70,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGlobalVarExpressionAccess().getGLOBALVARKeyword_0()); 
             }
@@ -24574,16 +24574,16 @@ public final void rule__GlobalVarExpression__Group__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__GlobalVarExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8598:1: rule__GlobalVarExpression__Group__1 : rule__GlobalVarExpression__Group__1__Impl ;
+    // InternalExport.g:8598:1: rule__GlobalVarExpression__Group__1 : rule__GlobalVarExpression__Group__1__Impl ;
     public final void rule__GlobalVarExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8602:1: ( rule__GlobalVarExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8603:2: rule__GlobalVarExpression__Group__1__Impl
+            // InternalExport.g:8602:1: ( rule__GlobalVarExpression__Group__1__Impl )
+            // InternalExport.g:8603:2: rule__GlobalVarExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__GlobalVarExpression__Group__1__Impl_in_rule__GlobalVarExpression__Group__117352);
+            pushFollow(FOLLOW_2);
             rule__GlobalVarExpression__Group__1__Impl();
 
             state._fsp--;
@@ -24607,25 +24607,25 @@ public final void rule__GlobalVarExpression__Group__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__GlobalVarExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8609:1: rule__GlobalVarExpression__Group__1__Impl : ( ( rule__GlobalVarExpression__NameAssignment_1 ) ) ;
+    // InternalExport.g:8609:1: rule__GlobalVarExpression__Group__1__Impl : ( ( rule__GlobalVarExpression__NameAssignment_1 ) ) ;
     public final void rule__GlobalVarExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8613:1: ( ( ( rule__GlobalVarExpression__NameAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8614:1: ( ( rule__GlobalVarExpression__NameAssignment_1 ) )
+            // InternalExport.g:8613:1: ( ( ( rule__GlobalVarExpression__NameAssignment_1 ) ) )
+            // InternalExport.g:8614:1: ( ( rule__GlobalVarExpression__NameAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8614:1: ( ( rule__GlobalVarExpression__NameAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8615:1: ( rule__GlobalVarExpression__NameAssignment_1 )
+            // InternalExport.g:8614:1: ( ( rule__GlobalVarExpression__NameAssignment_1 ) )
+            // InternalExport.g:8615:1: ( rule__GlobalVarExpression__NameAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalVarExpressionAccess().getNameAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8616:1: ( rule__GlobalVarExpression__NameAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8616:2: rule__GlobalVarExpression__NameAssignment_1
+            // InternalExport.g:8616:1: ( rule__GlobalVarExpression__NameAssignment_1 )
+            // InternalExport.g:8616:2: rule__GlobalVarExpression__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__GlobalVarExpression__NameAssignment_1_in_rule__GlobalVarExpression__Group__1__Impl17379);
+            pushFollow(FOLLOW_2);
             rule__GlobalVarExpression__NameAssignment_1();
 
             state._fsp--;
@@ -24658,21 +24658,21 @@ public final void rule__GlobalVarExpression__Group__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__OperationCall__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8630:1: rule__OperationCall__Group__0 : rule__OperationCall__Group__0__Impl rule__OperationCall__Group__1 ;
+    // InternalExport.g:8630:1: rule__OperationCall__Group__0 : rule__OperationCall__Group__0__Impl rule__OperationCall__Group__1 ;
     public final void rule__OperationCall__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8634:1: ( rule__OperationCall__Group__0__Impl rule__OperationCall__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8635:2: rule__OperationCall__Group__0__Impl rule__OperationCall__Group__1
+            // InternalExport.g:8634:1: ( rule__OperationCall__Group__0__Impl rule__OperationCall__Group__1 )
+            // InternalExport.g:8635:2: rule__OperationCall__Group__0__Impl rule__OperationCall__Group__1
             {
-            pushFollow(FOLLOW_rule__OperationCall__Group__0__Impl_in_rule__OperationCall__Group__017413);
+            pushFollow(FOLLOW_34);
             rule__OperationCall__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OperationCall__Group__1_in_rule__OperationCall__Group__017416);
+            pushFollow(FOLLOW_2);
             rule__OperationCall__Group__1();
 
             state._fsp--;
@@ -24696,25 +24696,25 @@ public final void rule__OperationCall__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__OperationCall__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8642:1: rule__OperationCall__Group__0__Impl : ( ( rule__OperationCall__NameAssignment_0 ) ) ;
+    // InternalExport.g:8642:1: rule__OperationCall__Group__0__Impl : ( ( rule__OperationCall__NameAssignment_0 ) ) ;
     public final void rule__OperationCall__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8646:1: ( ( ( rule__OperationCall__NameAssignment_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8647:1: ( ( rule__OperationCall__NameAssignment_0 ) )
+            // InternalExport.g:8646:1: ( ( ( rule__OperationCall__NameAssignment_0 ) ) )
+            // InternalExport.g:8647:1: ( ( rule__OperationCall__NameAssignment_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8647:1: ( ( rule__OperationCall__NameAssignment_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8648:1: ( rule__OperationCall__NameAssignment_0 )
+            // InternalExport.g:8647:1: ( ( rule__OperationCall__NameAssignment_0 ) )
+            // InternalExport.g:8648:1: ( rule__OperationCall__NameAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOperationCallAccess().getNameAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8649:1: ( rule__OperationCall__NameAssignment_0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8649:2: rule__OperationCall__NameAssignment_0
+            // InternalExport.g:8649:1: ( rule__OperationCall__NameAssignment_0 )
+            // InternalExport.g:8649:2: rule__OperationCall__NameAssignment_0
             {
-            pushFollow(FOLLOW_rule__OperationCall__NameAssignment_0_in_rule__OperationCall__Group__0__Impl17443);
+            pushFollow(FOLLOW_2);
             rule__OperationCall__NameAssignment_0();
 
             state._fsp--;
@@ -24747,21 +24747,21 @@ public final void rule__OperationCall__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__OperationCall__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8659:1: rule__OperationCall__Group__1 : rule__OperationCall__Group__1__Impl rule__OperationCall__Group__2 ;
+    // InternalExport.g:8659:1: rule__OperationCall__Group__1 : rule__OperationCall__Group__1__Impl rule__OperationCall__Group__2 ;
     public final void rule__OperationCall__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8663:1: ( rule__OperationCall__Group__1__Impl rule__OperationCall__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8664:2: rule__OperationCall__Group__1__Impl rule__OperationCall__Group__2
+            // InternalExport.g:8663:1: ( rule__OperationCall__Group__1__Impl rule__OperationCall__Group__2 )
+            // InternalExport.g:8664:2: rule__OperationCall__Group__1__Impl rule__OperationCall__Group__2
             {
-            pushFollow(FOLLOW_rule__OperationCall__Group__1__Impl_in_rule__OperationCall__Group__117473);
+            pushFollow(FOLLOW_64);
             rule__OperationCall__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OperationCall__Group__2_in_rule__OperationCall__Group__117476);
+            pushFollow(FOLLOW_2);
             rule__OperationCall__Group__2();
 
             state._fsp--;
@@ -24785,22 +24785,22 @@ public final void rule__OperationCall__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__OperationCall__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8671:1: rule__OperationCall__Group__1__Impl : ( '(' ) ;
+    // InternalExport.g:8671:1: rule__OperationCall__Group__1__Impl : ( '(' ) ;
     public final void rule__OperationCall__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8675:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8676:1: ( '(' )
+            // InternalExport.g:8675:1: ( ( '(' ) )
+            // InternalExport.g:8676:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8676:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8677:1: '('
+            // InternalExport.g:8676:1: ( '(' )
+            // InternalExport.g:8677:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOperationCallAccess().getLeftParenthesisKeyword_1()); 
             }
-            match(input,51,FOLLOW_51_in_rule__OperationCall__Group__1__Impl17504); if (state.failed) return ;
+            match(input,51,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOperationCallAccess().getLeftParenthesisKeyword_1()); 
             }
@@ -24826,21 +24826,21 @@ public final void rule__OperationCall__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__OperationCall__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8690:1: rule__OperationCall__Group__2 : rule__OperationCall__Group__2__Impl rule__OperationCall__Group__3 ;
+    // InternalExport.g:8690:1: rule__OperationCall__Group__2 : rule__OperationCall__Group__2__Impl rule__OperationCall__Group__3 ;
     public final void rule__OperationCall__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8694:1: ( rule__OperationCall__Group__2__Impl rule__OperationCall__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8695:2: rule__OperationCall__Group__2__Impl rule__OperationCall__Group__3
+            // InternalExport.g:8694:1: ( rule__OperationCall__Group__2__Impl rule__OperationCall__Group__3 )
+            // InternalExport.g:8695:2: rule__OperationCall__Group__2__Impl rule__OperationCall__Group__3
             {
-            pushFollow(FOLLOW_rule__OperationCall__Group__2__Impl_in_rule__OperationCall__Group__217535);
+            pushFollow(FOLLOW_64);
             rule__OperationCall__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OperationCall__Group__3_in_rule__OperationCall__Group__217538);
+            pushFollow(FOLLOW_2);
             rule__OperationCall__Group__3();
 
             state._fsp--;
@@ -24864,22 +24864,22 @@ public final void rule__OperationCall__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__OperationCall__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8702:1: rule__OperationCall__Group__2__Impl : ( ( rule__OperationCall__Group_2__0 )? ) ;
+    // InternalExport.g:8702:1: rule__OperationCall__Group__2__Impl : ( ( rule__OperationCall__Group_2__0 )? ) ;
     public final void rule__OperationCall__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8706:1: ( ( ( rule__OperationCall__Group_2__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8707:1: ( ( rule__OperationCall__Group_2__0 )? )
+            // InternalExport.g:8706:1: ( ( ( rule__OperationCall__Group_2__0 )? ) )
+            // InternalExport.g:8707:1: ( ( rule__OperationCall__Group_2__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8707:1: ( ( rule__OperationCall__Group_2__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8708:1: ( rule__OperationCall__Group_2__0 )?
+            // InternalExport.g:8707:1: ( ( rule__OperationCall__Group_2__0 )? )
+            // InternalExport.g:8708:1: ( rule__OperationCall__Group_2__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOperationCallAccess().getGroup_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8709:1: ( rule__OperationCall__Group_2__0 )?
+            // InternalExport.g:8709:1: ( rule__OperationCall__Group_2__0 )?
             int alt62=2;
             int LA62_0 = input.LA(1);
 
@@ -24888,9 +24888,9 @@ public final void rule__OperationCall__Group__2__Impl() throws RecognitionExcept
             }
             switch (alt62) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8709:2: rule__OperationCall__Group_2__0
+                    // InternalExport.g:8709:2: rule__OperationCall__Group_2__0
                     {
-                    pushFollow(FOLLOW_rule__OperationCall__Group_2__0_in_rule__OperationCall__Group__2__Impl17565);
+                    pushFollow(FOLLOW_2);
                     rule__OperationCall__Group_2__0();
 
                     state._fsp--;
@@ -24926,16 +24926,16 @@ public final void rule__OperationCall__Group__2__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__OperationCall__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8719:1: rule__OperationCall__Group__3 : rule__OperationCall__Group__3__Impl ;
+    // InternalExport.g:8719:1: rule__OperationCall__Group__3 : rule__OperationCall__Group__3__Impl ;
     public final void rule__OperationCall__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8723:1: ( rule__OperationCall__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8724:2: rule__OperationCall__Group__3__Impl
+            // InternalExport.g:8723:1: ( rule__OperationCall__Group__3__Impl )
+            // InternalExport.g:8724:2: rule__OperationCall__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__OperationCall__Group__3__Impl_in_rule__OperationCall__Group__317596);
+            pushFollow(FOLLOW_2);
             rule__OperationCall__Group__3__Impl();
 
             state._fsp--;
@@ -24959,22 +24959,22 @@ public final void rule__OperationCall__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__OperationCall__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8730:1: rule__OperationCall__Group__3__Impl : ( ')' ) ;
+    // InternalExport.g:8730:1: rule__OperationCall__Group__3__Impl : ( ')' ) ;
     public final void rule__OperationCall__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8734:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8735:1: ( ')' )
+            // InternalExport.g:8734:1: ( ( ')' ) )
+            // InternalExport.g:8735:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8735:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8736:1: ')'
+            // InternalExport.g:8735:1: ( ')' )
+            // InternalExport.g:8736:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOperationCallAccess().getRightParenthesisKeyword_3()); 
             }
-            match(input,52,FOLLOW_52_in_rule__OperationCall__Group__3__Impl17624); if (state.failed) return ;
+            match(input,52,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOperationCallAccess().getRightParenthesisKeyword_3()); 
             }
@@ -25000,21 +25000,21 @@ public final void rule__OperationCall__Group__3__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__OperationCall__Group_2__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8757:1: rule__OperationCall__Group_2__0 : rule__OperationCall__Group_2__0__Impl rule__OperationCall__Group_2__1 ;
+    // InternalExport.g:8757:1: rule__OperationCall__Group_2__0 : rule__OperationCall__Group_2__0__Impl rule__OperationCall__Group_2__1 ;
     public final void rule__OperationCall__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8761:1: ( rule__OperationCall__Group_2__0__Impl rule__OperationCall__Group_2__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8762:2: rule__OperationCall__Group_2__0__Impl rule__OperationCall__Group_2__1
+            // InternalExport.g:8761:1: ( rule__OperationCall__Group_2__0__Impl rule__OperationCall__Group_2__1 )
+            // InternalExport.g:8762:2: rule__OperationCall__Group_2__0__Impl rule__OperationCall__Group_2__1
             {
-            pushFollow(FOLLOW_rule__OperationCall__Group_2__0__Impl_in_rule__OperationCall__Group_2__017663);
+            pushFollow(FOLLOW_21);
             rule__OperationCall__Group_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OperationCall__Group_2__1_in_rule__OperationCall__Group_2__017666);
+            pushFollow(FOLLOW_2);
             rule__OperationCall__Group_2__1();
 
             state._fsp--;
@@ -25038,25 +25038,25 @@ public final void rule__OperationCall__Group_2__0() throws RecognitionException
 
 
     // $ANTLR start "rule__OperationCall__Group_2__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8769:1: rule__OperationCall__Group_2__0__Impl : ( ( rule__OperationCall__ParamsAssignment_2_0 ) ) ;
+    // InternalExport.g:8769:1: rule__OperationCall__Group_2__0__Impl : ( ( rule__OperationCall__ParamsAssignment_2_0 ) ) ;
     public final void rule__OperationCall__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8773:1: ( ( ( rule__OperationCall__ParamsAssignment_2_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8774:1: ( ( rule__OperationCall__ParamsAssignment_2_0 ) )
+            // InternalExport.g:8773:1: ( ( ( rule__OperationCall__ParamsAssignment_2_0 ) ) )
+            // InternalExport.g:8774:1: ( ( rule__OperationCall__ParamsAssignment_2_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8774:1: ( ( rule__OperationCall__ParamsAssignment_2_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8775:1: ( rule__OperationCall__ParamsAssignment_2_0 )
+            // InternalExport.g:8774:1: ( ( rule__OperationCall__ParamsAssignment_2_0 ) )
+            // InternalExport.g:8775:1: ( rule__OperationCall__ParamsAssignment_2_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOperationCallAccess().getParamsAssignment_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8776:1: ( rule__OperationCall__ParamsAssignment_2_0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8776:2: rule__OperationCall__ParamsAssignment_2_0
+            // InternalExport.g:8776:1: ( rule__OperationCall__ParamsAssignment_2_0 )
+            // InternalExport.g:8776:2: rule__OperationCall__ParamsAssignment_2_0
             {
-            pushFollow(FOLLOW_rule__OperationCall__ParamsAssignment_2_0_in_rule__OperationCall__Group_2__0__Impl17693);
+            pushFollow(FOLLOW_2);
             rule__OperationCall__ParamsAssignment_2_0();
 
             state._fsp--;
@@ -25089,16 +25089,16 @@ public final void rule__OperationCall__Group_2__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__OperationCall__Group_2__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8786:1: rule__OperationCall__Group_2__1 : rule__OperationCall__Group_2__1__Impl ;
+    // InternalExport.g:8786:1: rule__OperationCall__Group_2__1 : rule__OperationCall__Group_2__1__Impl ;
     public final void rule__OperationCall__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8790:1: ( rule__OperationCall__Group_2__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8791:2: rule__OperationCall__Group_2__1__Impl
+            // InternalExport.g:8790:1: ( rule__OperationCall__Group_2__1__Impl )
+            // InternalExport.g:8791:2: rule__OperationCall__Group_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__OperationCall__Group_2__1__Impl_in_rule__OperationCall__Group_2__117723);
+            pushFollow(FOLLOW_2);
             rule__OperationCall__Group_2__1__Impl();
 
             state._fsp--;
@@ -25122,22 +25122,22 @@ public final void rule__OperationCall__Group_2__1() throws RecognitionException
 
 
     // $ANTLR start "rule__OperationCall__Group_2__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8797:1: rule__OperationCall__Group_2__1__Impl : ( ( rule__OperationCall__Group_2_1__0 )* ) ;
+    // InternalExport.g:8797:1: rule__OperationCall__Group_2__1__Impl : ( ( rule__OperationCall__Group_2_1__0 )* ) ;
     public final void rule__OperationCall__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8801:1: ( ( ( rule__OperationCall__Group_2_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8802:1: ( ( rule__OperationCall__Group_2_1__0 )* )
+            // InternalExport.g:8801:1: ( ( ( rule__OperationCall__Group_2_1__0 )* ) )
+            // InternalExport.g:8802:1: ( ( rule__OperationCall__Group_2_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8802:1: ( ( rule__OperationCall__Group_2_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8803:1: ( rule__OperationCall__Group_2_1__0 )*
+            // InternalExport.g:8802:1: ( ( rule__OperationCall__Group_2_1__0 )* )
+            // InternalExport.g:8803:1: ( rule__OperationCall__Group_2_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOperationCallAccess().getGroup_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8804:1: ( rule__OperationCall__Group_2_1__0 )*
+            // InternalExport.g:8804:1: ( rule__OperationCall__Group_2_1__0 )*
             loop63:
             do {
                 int alt63=2;
@@ -25150,9 +25150,9 @@ public final void rule__OperationCall__Group_2__1__Impl() throws RecognitionExce
 
                 switch (alt63) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8804:2: rule__OperationCall__Group_2_1__0
+            	    // InternalExport.g:8804:2: rule__OperationCall__Group_2_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__OperationCall__Group_2_1__0_in_rule__OperationCall__Group_2__1__Impl17750);
+            	    pushFollow(FOLLOW_22);
             	    rule__OperationCall__Group_2_1__0();
 
             	    state._fsp--;
@@ -25191,21 +25191,21 @@ public final void rule__OperationCall__Group_2__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__OperationCall__Group_2_1__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8818:1: rule__OperationCall__Group_2_1__0 : rule__OperationCall__Group_2_1__0__Impl rule__OperationCall__Group_2_1__1 ;
+    // InternalExport.g:8818:1: rule__OperationCall__Group_2_1__0 : rule__OperationCall__Group_2_1__0__Impl rule__OperationCall__Group_2_1__1 ;
     public final void rule__OperationCall__Group_2_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8822:1: ( rule__OperationCall__Group_2_1__0__Impl rule__OperationCall__Group_2_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8823:2: rule__OperationCall__Group_2_1__0__Impl rule__OperationCall__Group_2_1__1
+            // InternalExport.g:8822:1: ( rule__OperationCall__Group_2_1__0__Impl rule__OperationCall__Group_2_1__1 )
+            // InternalExport.g:8823:2: rule__OperationCall__Group_2_1__0__Impl rule__OperationCall__Group_2_1__1
             {
-            pushFollow(FOLLOW_rule__OperationCall__Group_2_1__0__Impl_in_rule__OperationCall__Group_2_1__017785);
+            pushFollow(FOLLOW_18);
             rule__OperationCall__Group_2_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OperationCall__Group_2_1__1_in_rule__OperationCall__Group_2_1__017788);
+            pushFollow(FOLLOW_2);
             rule__OperationCall__Group_2_1__1();
 
             state._fsp--;
@@ -25229,22 +25229,22 @@ public final void rule__OperationCall__Group_2_1__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__OperationCall__Group_2_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8830:1: rule__OperationCall__Group_2_1__0__Impl : ( ',' ) ;
+    // InternalExport.g:8830:1: rule__OperationCall__Group_2_1__0__Impl : ( ',' ) ;
     public final void rule__OperationCall__Group_2_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8834:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8835:1: ( ',' )
+            // InternalExport.g:8834:1: ( ( ',' ) )
+            // InternalExport.g:8835:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8835:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8836:1: ','
+            // InternalExport.g:8835:1: ( ',' )
+            // InternalExport.g:8836:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOperationCallAccess().getCommaKeyword_2_1_0()); 
             }
-            match(input,48,FOLLOW_48_in_rule__OperationCall__Group_2_1__0__Impl17816); if (state.failed) return ;
+            match(input,48,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOperationCallAccess().getCommaKeyword_2_1_0()); 
             }
@@ -25270,16 +25270,16 @@ public final void rule__OperationCall__Group_2_1__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__OperationCall__Group_2_1__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8849:1: rule__OperationCall__Group_2_1__1 : rule__OperationCall__Group_2_1__1__Impl ;
+    // InternalExport.g:8849:1: rule__OperationCall__Group_2_1__1 : rule__OperationCall__Group_2_1__1__Impl ;
     public final void rule__OperationCall__Group_2_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8853:1: ( rule__OperationCall__Group_2_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8854:2: rule__OperationCall__Group_2_1__1__Impl
+            // InternalExport.g:8853:1: ( rule__OperationCall__Group_2_1__1__Impl )
+            // InternalExport.g:8854:2: rule__OperationCall__Group_2_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__OperationCall__Group_2_1__1__Impl_in_rule__OperationCall__Group_2_1__117847);
+            pushFollow(FOLLOW_2);
             rule__OperationCall__Group_2_1__1__Impl();
 
             state._fsp--;
@@ -25303,25 +25303,25 @@ public final void rule__OperationCall__Group_2_1__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__OperationCall__Group_2_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8860:1: rule__OperationCall__Group_2_1__1__Impl : ( ( rule__OperationCall__ParamsAssignment_2_1_1 ) ) ;
+    // InternalExport.g:8860:1: rule__OperationCall__Group_2_1__1__Impl : ( ( rule__OperationCall__ParamsAssignment_2_1_1 ) ) ;
     public final void rule__OperationCall__Group_2_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8864:1: ( ( ( rule__OperationCall__ParamsAssignment_2_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8865:1: ( ( rule__OperationCall__ParamsAssignment_2_1_1 ) )
+            // InternalExport.g:8864:1: ( ( ( rule__OperationCall__ParamsAssignment_2_1_1 ) ) )
+            // InternalExport.g:8865:1: ( ( rule__OperationCall__ParamsAssignment_2_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8865:1: ( ( rule__OperationCall__ParamsAssignment_2_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8866:1: ( rule__OperationCall__ParamsAssignment_2_1_1 )
+            // InternalExport.g:8865:1: ( ( rule__OperationCall__ParamsAssignment_2_1_1 ) )
+            // InternalExport.g:8866:1: ( rule__OperationCall__ParamsAssignment_2_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOperationCallAccess().getParamsAssignment_2_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8867:1: ( rule__OperationCall__ParamsAssignment_2_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8867:2: rule__OperationCall__ParamsAssignment_2_1_1
+            // InternalExport.g:8867:1: ( rule__OperationCall__ParamsAssignment_2_1_1 )
+            // InternalExport.g:8867:2: rule__OperationCall__ParamsAssignment_2_1_1
             {
-            pushFollow(FOLLOW_rule__OperationCall__ParamsAssignment_2_1_1_in_rule__OperationCall__Group_2_1__1__Impl17874);
+            pushFollow(FOLLOW_2);
             rule__OperationCall__ParamsAssignment_2_1_1();
 
             state._fsp--;
@@ -25354,21 +25354,21 @@ public final void rule__OperationCall__Group_2_1__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__ListLiteral__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8881:1: rule__ListLiteral__Group__0 : rule__ListLiteral__Group__0__Impl rule__ListLiteral__Group__1 ;
+    // InternalExport.g:8881:1: rule__ListLiteral__Group__0 : rule__ListLiteral__Group__0__Impl rule__ListLiteral__Group__1 ;
     public final void rule__ListLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8885:1: ( rule__ListLiteral__Group__0__Impl rule__ListLiteral__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8886:2: rule__ListLiteral__Group__0__Impl rule__ListLiteral__Group__1
+            // InternalExport.g:8885:1: ( rule__ListLiteral__Group__0__Impl rule__ListLiteral__Group__1 )
+            // InternalExport.g:8886:2: rule__ListLiteral__Group__0__Impl rule__ListLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__ListLiteral__Group__0__Impl_in_rule__ListLiteral__Group__017908);
+            pushFollow(FOLLOW_11);
             rule__ListLiteral__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ListLiteral__Group__1_in_rule__ListLiteral__Group__017911);
+            pushFollow(FOLLOW_2);
             rule__ListLiteral__Group__1();
 
             state._fsp--;
@@ -25392,23 +25392,23 @@ public final void rule__ListLiteral__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__ListLiteral__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8893:1: rule__ListLiteral__Group__0__Impl : ( () ) ;
+    // InternalExport.g:8893:1: rule__ListLiteral__Group__0__Impl : ( () ) ;
     public final void rule__ListLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8897:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8898:1: ( () )
+            // InternalExport.g:8897:1: ( ( () ) )
+            // InternalExport.g:8898:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8898:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8899:1: ()
+            // InternalExport.g:8898:1: ( () )
+            // InternalExport.g:8899:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getListLiteralAccess().getListLiteralAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8900:1: ()
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8902:1: 
+            // InternalExport.g:8900:1: ()
+            // InternalExport.g:8902:1: 
             {
             }
 
@@ -25433,21 +25433,21 @@ public final void rule__ListLiteral__Group__0__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ListLiteral__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8912:1: rule__ListLiteral__Group__1 : rule__ListLiteral__Group__1__Impl rule__ListLiteral__Group__2 ;
+    // InternalExport.g:8912:1: rule__ListLiteral__Group__1 : rule__ListLiteral__Group__1__Impl rule__ListLiteral__Group__2 ;
     public final void rule__ListLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8916:1: ( rule__ListLiteral__Group__1__Impl rule__ListLiteral__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8917:2: rule__ListLiteral__Group__1__Impl rule__ListLiteral__Group__2
+            // InternalExport.g:8916:1: ( rule__ListLiteral__Group__1__Impl rule__ListLiteral__Group__2 )
+            // InternalExport.g:8917:2: rule__ListLiteral__Group__1__Impl rule__ListLiteral__Group__2
             {
-            pushFollow(FOLLOW_rule__ListLiteral__Group__1__Impl_in_rule__ListLiteral__Group__117969);
+            pushFollow(FOLLOW_68);
             rule__ListLiteral__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ListLiteral__Group__2_in_rule__ListLiteral__Group__117972);
+            pushFollow(FOLLOW_2);
             rule__ListLiteral__Group__2();
 
             state._fsp--;
@@ -25471,22 +25471,22 @@ public final void rule__ListLiteral__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__ListLiteral__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8924:1: rule__ListLiteral__Group__1__Impl : ( '{' ) ;
+    // InternalExport.g:8924:1: rule__ListLiteral__Group__1__Impl : ( '{' ) ;
     public final void rule__ListLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8928:1: ( ( '{' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8929:1: ( '{' )
+            // InternalExport.g:8928:1: ( ( '{' ) )
+            // InternalExport.g:8929:1: ( '{' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8929:1: ( '{' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8930:1: '{'
+            // InternalExport.g:8929:1: ( '{' )
+            // InternalExport.g:8930:1: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getListLiteralAccess().getLeftCurlyBracketKeyword_1()); 
             }
-            match(input,39,FOLLOW_39_in_rule__ListLiteral__Group__1__Impl18000); if (state.failed) return ;
+            match(input,39,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getListLiteralAccess().getLeftCurlyBracketKeyword_1()); 
             }
@@ -25512,21 +25512,21 @@ public final void rule__ListLiteral__Group__1__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ListLiteral__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8943:1: rule__ListLiteral__Group__2 : rule__ListLiteral__Group__2__Impl rule__ListLiteral__Group__3 ;
+    // InternalExport.g:8943:1: rule__ListLiteral__Group__2 : rule__ListLiteral__Group__2__Impl rule__ListLiteral__Group__3 ;
     public final void rule__ListLiteral__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8947:1: ( rule__ListLiteral__Group__2__Impl rule__ListLiteral__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8948:2: rule__ListLiteral__Group__2__Impl rule__ListLiteral__Group__3
+            // InternalExport.g:8947:1: ( rule__ListLiteral__Group__2__Impl rule__ListLiteral__Group__3 )
+            // InternalExport.g:8948:2: rule__ListLiteral__Group__2__Impl rule__ListLiteral__Group__3
             {
-            pushFollow(FOLLOW_rule__ListLiteral__Group__2__Impl_in_rule__ListLiteral__Group__218031);
+            pushFollow(FOLLOW_68);
             rule__ListLiteral__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ListLiteral__Group__3_in_rule__ListLiteral__Group__218034);
+            pushFollow(FOLLOW_2);
             rule__ListLiteral__Group__3();
 
             state._fsp--;
@@ -25550,22 +25550,22 @@ public final void rule__ListLiteral__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__ListLiteral__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8955:1: rule__ListLiteral__Group__2__Impl : ( ( rule__ListLiteral__Group_2__0 )? ) ;
+    // InternalExport.g:8955:1: rule__ListLiteral__Group__2__Impl : ( ( rule__ListLiteral__Group_2__0 )? ) ;
     public final void rule__ListLiteral__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8959:1: ( ( ( rule__ListLiteral__Group_2__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8960:1: ( ( rule__ListLiteral__Group_2__0 )? )
+            // InternalExport.g:8959:1: ( ( ( rule__ListLiteral__Group_2__0 )? ) )
+            // InternalExport.g:8960:1: ( ( rule__ListLiteral__Group_2__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8960:1: ( ( rule__ListLiteral__Group_2__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8961:1: ( rule__ListLiteral__Group_2__0 )?
+            // InternalExport.g:8960:1: ( ( rule__ListLiteral__Group_2__0 )? )
+            // InternalExport.g:8961:1: ( rule__ListLiteral__Group_2__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getListLiteralAccess().getGroup_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8962:1: ( rule__ListLiteral__Group_2__0 )?
+            // InternalExport.g:8962:1: ( rule__ListLiteral__Group_2__0 )?
             int alt64=2;
             int LA64_0 = input.LA(1);
 
@@ -25574,9 +25574,9 @@ public final void rule__ListLiteral__Group__2__Impl() throws RecognitionExceptio
             }
             switch (alt64) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8962:2: rule__ListLiteral__Group_2__0
+                    // InternalExport.g:8962:2: rule__ListLiteral__Group_2__0
                     {
-                    pushFollow(FOLLOW_rule__ListLiteral__Group_2__0_in_rule__ListLiteral__Group__2__Impl18061);
+                    pushFollow(FOLLOW_2);
                     rule__ListLiteral__Group_2__0();
 
                     state._fsp--;
@@ -25612,16 +25612,16 @@ public final void rule__ListLiteral__Group__2__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ListLiteral__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8972:1: rule__ListLiteral__Group__3 : rule__ListLiteral__Group__3__Impl ;
+    // InternalExport.g:8972:1: rule__ListLiteral__Group__3 : rule__ListLiteral__Group__3__Impl ;
     public final void rule__ListLiteral__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8976:1: ( rule__ListLiteral__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8977:2: rule__ListLiteral__Group__3__Impl
+            // InternalExport.g:8976:1: ( rule__ListLiteral__Group__3__Impl )
+            // InternalExport.g:8977:2: rule__ListLiteral__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__ListLiteral__Group__3__Impl_in_rule__ListLiteral__Group__318092);
+            pushFollow(FOLLOW_2);
             rule__ListLiteral__Group__3__Impl();
 
             state._fsp--;
@@ -25645,22 +25645,22 @@ public final void rule__ListLiteral__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__ListLiteral__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8983:1: rule__ListLiteral__Group__3__Impl : ( '}' ) ;
+    // InternalExport.g:8983:1: rule__ListLiteral__Group__3__Impl : ( '}' ) ;
     public final void rule__ListLiteral__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8987:1: ( ( '}' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8988:1: ( '}' )
+            // InternalExport.g:8987:1: ( ( '}' ) )
+            // InternalExport.g:8988:1: ( '}' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8988:1: ( '}' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:8989:1: '}'
+            // InternalExport.g:8988:1: ( '}' )
+            // InternalExport.g:8989:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getListLiteralAccess().getRightCurlyBracketKeyword_3()); 
             }
-            match(input,40,FOLLOW_40_in_rule__ListLiteral__Group__3__Impl18120); if (state.failed) return ;
+            match(input,40,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getListLiteralAccess().getRightCurlyBracketKeyword_3()); 
             }
@@ -25686,21 +25686,21 @@ public final void rule__ListLiteral__Group__3__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ListLiteral__Group_2__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9010:1: rule__ListLiteral__Group_2__0 : rule__ListLiteral__Group_2__0__Impl rule__ListLiteral__Group_2__1 ;
+    // InternalExport.g:9010:1: rule__ListLiteral__Group_2__0 : rule__ListLiteral__Group_2__0__Impl rule__ListLiteral__Group_2__1 ;
     public final void rule__ListLiteral__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9014:1: ( rule__ListLiteral__Group_2__0__Impl rule__ListLiteral__Group_2__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9015:2: rule__ListLiteral__Group_2__0__Impl rule__ListLiteral__Group_2__1
+            // InternalExport.g:9014:1: ( rule__ListLiteral__Group_2__0__Impl rule__ListLiteral__Group_2__1 )
+            // InternalExport.g:9015:2: rule__ListLiteral__Group_2__0__Impl rule__ListLiteral__Group_2__1
             {
-            pushFollow(FOLLOW_rule__ListLiteral__Group_2__0__Impl_in_rule__ListLiteral__Group_2__018159);
+            pushFollow(FOLLOW_21);
             rule__ListLiteral__Group_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ListLiteral__Group_2__1_in_rule__ListLiteral__Group_2__018162);
+            pushFollow(FOLLOW_2);
             rule__ListLiteral__Group_2__1();
 
             state._fsp--;
@@ -25724,25 +25724,25 @@ public final void rule__ListLiteral__Group_2__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__ListLiteral__Group_2__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9022:1: rule__ListLiteral__Group_2__0__Impl : ( ( rule__ListLiteral__ElementsAssignment_2_0 ) ) ;
+    // InternalExport.g:9022:1: rule__ListLiteral__Group_2__0__Impl : ( ( rule__ListLiteral__ElementsAssignment_2_0 ) ) ;
     public final void rule__ListLiteral__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9026:1: ( ( ( rule__ListLiteral__ElementsAssignment_2_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9027:1: ( ( rule__ListLiteral__ElementsAssignment_2_0 ) )
+            // InternalExport.g:9026:1: ( ( ( rule__ListLiteral__ElementsAssignment_2_0 ) ) )
+            // InternalExport.g:9027:1: ( ( rule__ListLiteral__ElementsAssignment_2_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9027:1: ( ( rule__ListLiteral__ElementsAssignment_2_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9028:1: ( rule__ListLiteral__ElementsAssignment_2_0 )
+            // InternalExport.g:9027:1: ( ( rule__ListLiteral__ElementsAssignment_2_0 ) )
+            // InternalExport.g:9028:1: ( rule__ListLiteral__ElementsAssignment_2_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getListLiteralAccess().getElementsAssignment_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9029:1: ( rule__ListLiteral__ElementsAssignment_2_0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9029:2: rule__ListLiteral__ElementsAssignment_2_0
+            // InternalExport.g:9029:1: ( rule__ListLiteral__ElementsAssignment_2_0 )
+            // InternalExport.g:9029:2: rule__ListLiteral__ElementsAssignment_2_0
             {
-            pushFollow(FOLLOW_rule__ListLiteral__ElementsAssignment_2_0_in_rule__ListLiteral__Group_2__0__Impl18189);
+            pushFollow(FOLLOW_2);
             rule__ListLiteral__ElementsAssignment_2_0();
 
             state._fsp--;
@@ -25775,16 +25775,16 @@ public final void rule__ListLiteral__Group_2__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ListLiteral__Group_2__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9039:1: rule__ListLiteral__Group_2__1 : rule__ListLiteral__Group_2__1__Impl ;
+    // InternalExport.g:9039:1: rule__ListLiteral__Group_2__1 : rule__ListLiteral__Group_2__1__Impl ;
     public final void rule__ListLiteral__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9043:1: ( rule__ListLiteral__Group_2__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9044:2: rule__ListLiteral__Group_2__1__Impl
+            // InternalExport.g:9043:1: ( rule__ListLiteral__Group_2__1__Impl )
+            // InternalExport.g:9044:2: rule__ListLiteral__Group_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__ListLiteral__Group_2__1__Impl_in_rule__ListLiteral__Group_2__118219);
+            pushFollow(FOLLOW_2);
             rule__ListLiteral__Group_2__1__Impl();
 
             state._fsp--;
@@ -25808,22 +25808,22 @@ public final void rule__ListLiteral__Group_2__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__ListLiteral__Group_2__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9050:1: rule__ListLiteral__Group_2__1__Impl : ( ( rule__ListLiteral__Group_2_1__0 )* ) ;
+    // InternalExport.g:9050:1: rule__ListLiteral__Group_2__1__Impl : ( ( rule__ListLiteral__Group_2_1__0 )* ) ;
     public final void rule__ListLiteral__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9054:1: ( ( ( rule__ListLiteral__Group_2_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9055:1: ( ( rule__ListLiteral__Group_2_1__0 )* )
+            // InternalExport.g:9054:1: ( ( ( rule__ListLiteral__Group_2_1__0 )* ) )
+            // InternalExport.g:9055:1: ( ( rule__ListLiteral__Group_2_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9055:1: ( ( rule__ListLiteral__Group_2_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9056:1: ( rule__ListLiteral__Group_2_1__0 )*
+            // InternalExport.g:9055:1: ( ( rule__ListLiteral__Group_2_1__0 )* )
+            // InternalExport.g:9056:1: ( rule__ListLiteral__Group_2_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getListLiteralAccess().getGroup_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9057:1: ( rule__ListLiteral__Group_2_1__0 )*
+            // InternalExport.g:9057:1: ( rule__ListLiteral__Group_2_1__0 )*
             loop65:
             do {
                 int alt65=2;
@@ -25836,9 +25836,9 @@ public final void rule__ListLiteral__Group_2__1__Impl() throws RecognitionExcept
 
                 switch (alt65) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9057:2: rule__ListLiteral__Group_2_1__0
+            	    // InternalExport.g:9057:2: rule__ListLiteral__Group_2_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__ListLiteral__Group_2_1__0_in_rule__ListLiteral__Group_2__1__Impl18246);
+            	    pushFollow(FOLLOW_22);
             	    rule__ListLiteral__Group_2_1__0();
 
             	    state._fsp--;
@@ -25877,21 +25877,21 @@ public final void rule__ListLiteral__Group_2__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ListLiteral__Group_2_1__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9071:1: rule__ListLiteral__Group_2_1__0 : rule__ListLiteral__Group_2_1__0__Impl rule__ListLiteral__Group_2_1__1 ;
+    // InternalExport.g:9071:1: rule__ListLiteral__Group_2_1__0 : rule__ListLiteral__Group_2_1__0__Impl rule__ListLiteral__Group_2_1__1 ;
     public final void rule__ListLiteral__Group_2_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9075:1: ( rule__ListLiteral__Group_2_1__0__Impl rule__ListLiteral__Group_2_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9076:2: rule__ListLiteral__Group_2_1__0__Impl rule__ListLiteral__Group_2_1__1
+            // InternalExport.g:9075:1: ( rule__ListLiteral__Group_2_1__0__Impl rule__ListLiteral__Group_2_1__1 )
+            // InternalExport.g:9076:2: rule__ListLiteral__Group_2_1__0__Impl rule__ListLiteral__Group_2_1__1
             {
-            pushFollow(FOLLOW_rule__ListLiteral__Group_2_1__0__Impl_in_rule__ListLiteral__Group_2_1__018281);
+            pushFollow(FOLLOW_18);
             rule__ListLiteral__Group_2_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ListLiteral__Group_2_1__1_in_rule__ListLiteral__Group_2_1__018284);
+            pushFollow(FOLLOW_2);
             rule__ListLiteral__Group_2_1__1();
 
             state._fsp--;
@@ -25915,22 +25915,22 @@ public final void rule__ListLiteral__Group_2_1__0() throws RecognitionException
 
 
     // $ANTLR start "rule__ListLiteral__Group_2_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9083:1: rule__ListLiteral__Group_2_1__0__Impl : ( ',' ) ;
+    // InternalExport.g:9083:1: rule__ListLiteral__Group_2_1__0__Impl : ( ',' ) ;
     public final void rule__ListLiteral__Group_2_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9087:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9088:1: ( ',' )
+            // InternalExport.g:9087:1: ( ( ',' ) )
+            // InternalExport.g:9088:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9088:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9089:1: ','
+            // InternalExport.g:9088:1: ( ',' )
+            // InternalExport.g:9089:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getListLiteralAccess().getCommaKeyword_2_1_0()); 
             }
-            match(input,48,FOLLOW_48_in_rule__ListLiteral__Group_2_1__0__Impl18312); if (state.failed) return ;
+            match(input,48,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getListLiteralAccess().getCommaKeyword_2_1_0()); 
             }
@@ -25956,16 +25956,16 @@ public final void rule__ListLiteral__Group_2_1__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__ListLiteral__Group_2_1__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9102:1: rule__ListLiteral__Group_2_1__1 : rule__ListLiteral__Group_2_1__1__Impl ;
+    // InternalExport.g:9102:1: rule__ListLiteral__Group_2_1__1 : rule__ListLiteral__Group_2_1__1__Impl ;
     public final void rule__ListLiteral__Group_2_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9106:1: ( rule__ListLiteral__Group_2_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9107:2: rule__ListLiteral__Group_2_1__1__Impl
+            // InternalExport.g:9106:1: ( rule__ListLiteral__Group_2_1__1__Impl )
+            // InternalExport.g:9107:2: rule__ListLiteral__Group_2_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__ListLiteral__Group_2_1__1__Impl_in_rule__ListLiteral__Group_2_1__118343);
+            pushFollow(FOLLOW_2);
             rule__ListLiteral__Group_2_1__1__Impl();
 
             state._fsp--;
@@ -25989,25 +25989,25 @@ public final void rule__ListLiteral__Group_2_1__1() throws RecognitionException
 
 
     // $ANTLR start "rule__ListLiteral__Group_2_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9113:1: rule__ListLiteral__Group_2_1__1__Impl : ( ( rule__ListLiteral__ElementsAssignment_2_1_1 ) ) ;
+    // InternalExport.g:9113:1: rule__ListLiteral__Group_2_1__1__Impl : ( ( rule__ListLiteral__ElementsAssignment_2_1_1 ) ) ;
     public final void rule__ListLiteral__Group_2_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9117:1: ( ( ( rule__ListLiteral__ElementsAssignment_2_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9118:1: ( ( rule__ListLiteral__ElementsAssignment_2_1_1 ) )
+            // InternalExport.g:9117:1: ( ( ( rule__ListLiteral__ElementsAssignment_2_1_1 ) ) )
+            // InternalExport.g:9118:1: ( ( rule__ListLiteral__ElementsAssignment_2_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9118:1: ( ( rule__ListLiteral__ElementsAssignment_2_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9119:1: ( rule__ListLiteral__ElementsAssignment_2_1_1 )
+            // InternalExport.g:9118:1: ( ( rule__ListLiteral__ElementsAssignment_2_1_1 ) )
+            // InternalExport.g:9119:1: ( rule__ListLiteral__ElementsAssignment_2_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getListLiteralAccess().getElementsAssignment_2_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9120:1: ( rule__ListLiteral__ElementsAssignment_2_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9120:2: rule__ListLiteral__ElementsAssignment_2_1_1
+            // InternalExport.g:9120:1: ( rule__ListLiteral__ElementsAssignment_2_1_1 )
+            // InternalExport.g:9120:2: rule__ListLiteral__ElementsAssignment_2_1_1
             {
-            pushFollow(FOLLOW_rule__ListLiteral__ElementsAssignment_2_1_1_in_rule__ListLiteral__Group_2_1__1__Impl18370);
+            pushFollow(FOLLOW_2);
             rule__ListLiteral__ElementsAssignment_2_1_1();
 
             state._fsp--;
@@ -26040,21 +26040,21 @@ public final void rule__ListLiteral__Group_2_1__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__ConstructorCallExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9134:1: rule__ConstructorCallExpression__Group__0 : rule__ConstructorCallExpression__Group__0__Impl rule__ConstructorCallExpression__Group__1 ;
+    // InternalExport.g:9134:1: rule__ConstructorCallExpression__Group__0 : rule__ConstructorCallExpression__Group__0__Impl rule__ConstructorCallExpression__Group__1 ;
     public final void rule__ConstructorCallExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9138:1: ( rule__ConstructorCallExpression__Group__0__Impl rule__ConstructorCallExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9139:2: rule__ConstructorCallExpression__Group__0__Impl rule__ConstructorCallExpression__Group__1
+            // InternalExport.g:9138:1: ( rule__ConstructorCallExpression__Group__0__Impl rule__ConstructorCallExpression__Group__1 )
+            // InternalExport.g:9139:2: rule__ConstructorCallExpression__Group__0__Impl rule__ConstructorCallExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__ConstructorCallExpression__Group__0__Impl_in_rule__ConstructorCallExpression__Group__018404);
+            pushFollow(FOLLOW_40);
             rule__ConstructorCallExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ConstructorCallExpression__Group__1_in_rule__ConstructorCallExpression__Group__018407);
+            pushFollow(FOLLOW_2);
             rule__ConstructorCallExpression__Group__1();
 
             state._fsp--;
@@ -26078,22 +26078,22 @@ public final void rule__ConstructorCallExpression__Group__0() throws Recognition
 
 
     // $ANTLR start "rule__ConstructorCallExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9146:1: rule__ConstructorCallExpression__Group__0__Impl : ( 'new' ) ;
+    // InternalExport.g:9146:1: rule__ConstructorCallExpression__Group__0__Impl : ( 'new' ) ;
     public final void rule__ConstructorCallExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9150:1: ( ( 'new' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9151:1: ( 'new' )
+            // InternalExport.g:9150:1: ( ( 'new' ) )
+            // InternalExport.g:9151:1: ( 'new' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9151:1: ( 'new' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9152:1: 'new'
+            // InternalExport.g:9151:1: ( 'new' )
+            // InternalExport.g:9152:1: 'new'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConstructorCallExpressionAccess().getNewKeyword_0()); 
             }
-            match(input,71,FOLLOW_71_in_rule__ConstructorCallExpression__Group__0__Impl18435); if (state.failed) return ;
+            match(input,71,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getConstructorCallExpressionAccess().getNewKeyword_0()); 
             }
@@ -26119,16 +26119,16 @@ public final void rule__ConstructorCallExpression__Group__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__ConstructorCallExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9165:1: rule__ConstructorCallExpression__Group__1 : rule__ConstructorCallExpression__Group__1__Impl ;
+    // InternalExport.g:9165:1: rule__ConstructorCallExpression__Group__1 : rule__ConstructorCallExpression__Group__1__Impl ;
     public final void rule__ConstructorCallExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9169:1: ( rule__ConstructorCallExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9170:2: rule__ConstructorCallExpression__Group__1__Impl
+            // InternalExport.g:9169:1: ( rule__ConstructorCallExpression__Group__1__Impl )
+            // InternalExport.g:9170:2: rule__ConstructorCallExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__ConstructorCallExpression__Group__1__Impl_in_rule__ConstructorCallExpression__Group__118466);
+            pushFollow(FOLLOW_2);
             rule__ConstructorCallExpression__Group__1__Impl();
 
             state._fsp--;
@@ -26152,25 +26152,25 @@ public final void rule__ConstructorCallExpression__Group__1() throws Recognition
 
 
     // $ANTLR start "rule__ConstructorCallExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9176:1: rule__ConstructorCallExpression__Group__1__Impl : ( ( rule__ConstructorCallExpression__TypeAssignment_1 ) ) ;
+    // InternalExport.g:9176:1: rule__ConstructorCallExpression__Group__1__Impl : ( ( rule__ConstructorCallExpression__TypeAssignment_1 ) ) ;
     public final void rule__ConstructorCallExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9180:1: ( ( ( rule__ConstructorCallExpression__TypeAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9181:1: ( ( rule__ConstructorCallExpression__TypeAssignment_1 ) )
+            // InternalExport.g:9180:1: ( ( ( rule__ConstructorCallExpression__TypeAssignment_1 ) ) )
+            // InternalExport.g:9181:1: ( ( rule__ConstructorCallExpression__TypeAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9181:1: ( ( rule__ConstructorCallExpression__TypeAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9182:1: ( rule__ConstructorCallExpression__TypeAssignment_1 )
+            // InternalExport.g:9181:1: ( ( rule__ConstructorCallExpression__TypeAssignment_1 ) )
+            // InternalExport.g:9182:1: ( rule__ConstructorCallExpression__TypeAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConstructorCallExpressionAccess().getTypeAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9183:1: ( rule__ConstructorCallExpression__TypeAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9183:2: rule__ConstructorCallExpression__TypeAssignment_1
+            // InternalExport.g:9183:1: ( rule__ConstructorCallExpression__TypeAssignment_1 )
+            // InternalExport.g:9183:2: rule__ConstructorCallExpression__TypeAssignment_1
             {
-            pushFollow(FOLLOW_rule__ConstructorCallExpression__TypeAssignment_1_in_rule__ConstructorCallExpression__Group__1__Impl18493);
+            pushFollow(FOLLOW_2);
             rule__ConstructorCallExpression__TypeAssignment_1();
 
             state._fsp--;
@@ -26203,21 +26203,21 @@ public final void rule__ConstructorCallExpression__Group__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__TypeSelectExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9197:1: rule__TypeSelectExpression__Group__0 : rule__TypeSelectExpression__Group__0__Impl rule__TypeSelectExpression__Group__1 ;
+    // InternalExport.g:9197:1: rule__TypeSelectExpression__Group__0 : rule__TypeSelectExpression__Group__0__Impl rule__TypeSelectExpression__Group__1 ;
     public final void rule__TypeSelectExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9201:1: ( rule__TypeSelectExpression__Group__0__Impl rule__TypeSelectExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9202:2: rule__TypeSelectExpression__Group__0__Impl rule__TypeSelectExpression__Group__1
+            // InternalExport.g:9201:1: ( rule__TypeSelectExpression__Group__0__Impl rule__TypeSelectExpression__Group__1 )
+            // InternalExport.g:9202:2: rule__TypeSelectExpression__Group__0__Impl rule__TypeSelectExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__TypeSelectExpression__Group__0__Impl_in_rule__TypeSelectExpression__Group__018527);
+            pushFollow(FOLLOW_34);
             rule__TypeSelectExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__TypeSelectExpression__Group__1_in_rule__TypeSelectExpression__Group__018530);
+            pushFollow(FOLLOW_2);
             rule__TypeSelectExpression__Group__1();
 
             state._fsp--;
@@ -26241,25 +26241,25 @@ public final void rule__TypeSelectExpression__Group__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__TypeSelectExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9209:1: rule__TypeSelectExpression__Group__0__Impl : ( ( rule__TypeSelectExpression__NameAssignment_0 ) ) ;
+    // InternalExport.g:9209:1: rule__TypeSelectExpression__Group__0__Impl : ( ( rule__TypeSelectExpression__NameAssignment_0 ) ) ;
     public final void rule__TypeSelectExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9213:1: ( ( ( rule__TypeSelectExpression__NameAssignment_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9214:1: ( ( rule__TypeSelectExpression__NameAssignment_0 ) )
+            // InternalExport.g:9213:1: ( ( ( rule__TypeSelectExpression__NameAssignment_0 ) ) )
+            // InternalExport.g:9214:1: ( ( rule__TypeSelectExpression__NameAssignment_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9214:1: ( ( rule__TypeSelectExpression__NameAssignment_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9215:1: ( rule__TypeSelectExpression__NameAssignment_0 )
+            // InternalExport.g:9214:1: ( ( rule__TypeSelectExpression__NameAssignment_0 ) )
+            // InternalExport.g:9215:1: ( rule__TypeSelectExpression__NameAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTypeSelectExpressionAccess().getNameAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9216:1: ( rule__TypeSelectExpression__NameAssignment_0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9216:2: rule__TypeSelectExpression__NameAssignment_0
+            // InternalExport.g:9216:1: ( rule__TypeSelectExpression__NameAssignment_0 )
+            // InternalExport.g:9216:2: rule__TypeSelectExpression__NameAssignment_0
             {
-            pushFollow(FOLLOW_rule__TypeSelectExpression__NameAssignment_0_in_rule__TypeSelectExpression__Group__0__Impl18557);
+            pushFollow(FOLLOW_2);
             rule__TypeSelectExpression__NameAssignment_0();
 
             state._fsp--;
@@ -26292,21 +26292,21 @@ public final void rule__TypeSelectExpression__Group__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__TypeSelectExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9226:1: rule__TypeSelectExpression__Group__1 : rule__TypeSelectExpression__Group__1__Impl rule__TypeSelectExpression__Group__2 ;
+    // InternalExport.g:9226:1: rule__TypeSelectExpression__Group__1 : rule__TypeSelectExpression__Group__1__Impl rule__TypeSelectExpression__Group__2 ;
     public final void rule__TypeSelectExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9230:1: ( rule__TypeSelectExpression__Group__1__Impl rule__TypeSelectExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9231:2: rule__TypeSelectExpression__Group__1__Impl rule__TypeSelectExpression__Group__2
+            // InternalExport.g:9230:1: ( rule__TypeSelectExpression__Group__1__Impl rule__TypeSelectExpression__Group__2 )
+            // InternalExport.g:9231:2: rule__TypeSelectExpression__Group__1__Impl rule__TypeSelectExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__TypeSelectExpression__Group__1__Impl_in_rule__TypeSelectExpression__Group__118587);
+            pushFollow(FOLLOW_40);
             rule__TypeSelectExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__TypeSelectExpression__Group__2_in_rule__TypeSelectExpression__Group__118590);
+            pushFollow(FOLLOW_2);
             rule__TypeSelectExpression__Group__2();
 
             state._fsp--;
@@ -26330,22 +26330,22 @@ public final void rule__TypeSelectExpression__Group__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__TypeSelectExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9238:1: rule__TypeSelectExpression__Group__1__Impl : ( '(' ) ;
+    // InternalExport.g:9238:1: rule__TypeSelectExpression__Group__1__Impl : ( '(' ) ;
     public final void rule__TypeSelectExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9242:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9243:1: ( '(' )
+            // InternalExport.g:9242:1: ( ( '(' ) )
+            // InternalExport.g:9243:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9243:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9244:1: '('
+            // InternalExport.g:9243:1: ( '(' )
+            // InternalExport.g:9244:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTypeSelectExpressionAccess().getLeftParenthesisKeyword_1()); 
             }
-            match(input,51,FOLLOW_51_in_rule__TypeSelectExpression__Group__1__Impl18618); if (state.failed) return ;
+            match(input,51,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getTypeSelectExpressionAccess().getLeftParenthesisKeyword_1()); 
             }
@@ -26371,21 +26371,21 @@ public final void rule__TypeSelectExpression__Group__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__TypeSelectExpression__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9257:1: rule__TypeSelectExpression__Group__2 : rule__TypeSelectExpression__Group__2__Impl rule__TypeSelectExpression__Group__3 ;
+    // InternalExport.g:9257:1: rule__TypeSelectExpression__Group__2 : rule__TypeSelectExpression__Group__2__Impl rule__TypeSelectExpression__Group__3 ;
     public final void rule__TypeSelectExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9261:1: ( rule__TypeSelectExpression__Group__2__Impl rule__TypeSelectExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9262:2: rule__TypeSelectExpression__Group__2__Impl rule__TypeSelectExpression__Group__3
+            // InternalExport.g:9261:1: ( rule__TypeSelectExpression__Group__2__Impl rule__TypeSelectExpression__Group__3 )
+            // InternalExport.g:9262:2: rule__TypeSelectExpression__Group__2__Impl rule__TypeSelectExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__TypeSelectExpression__Group__2__Impl_in_rule__TypeSelectExpression__Group__218649);
+            pushFollow(FOLLOW_25);
             rule__TypeSelectExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__TypeSelectExpression__Group__3_in_rule__TypeSelectExpression__Group__218652);
+            pushFollow(FOLLOW_2);
             rule__TypeSelectExpression__Group__3();
 
             state._fsp--;
@@ -26409,25 +26409,25 @@ public final void rule__TypeSelectExpression__Group__2() throws RecognitionExcep
 
 
     // $ANTLR start "rule__TypeSelectExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9269:1: rule__TypeSelectExpression__Group__2__Impl : ( ( rule__TypeSelectExpression__TypeAssignment_2 ) ) ;
+    // InternalExport.g:9269:1: rule__TypeSelectExpression__Group__2__Impl : ( ( rule__TypeSelectExpression__TypeAssignment_2 ) ) ;
     public final void rule__TypeSelectExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9273:1: ( ( ( rule__TypeSelectExpression__TypeAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9274:1: ( ( rule__TypeSelectExpression__TypeAssignment_2 ) )
+            // InternalExport.g:9273:1: ( ( ( rule__TypeSelectExpression__TypeAssignment_2 ) ) )
+            // InternalExport.g:9274:1: ( ( rule__TypeSelectExpression__TypeAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9274:1: ( ( rule__TypeSelectExpression__TypeAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9275:1: ( rule__TypeSelectExpression__TypeAssignment_2 )
+            // InternalExport.g:9274:1: ( ( rule__TypeSelectExpression__TypeAssignment_2 ) )
+            // InternalExport.g:9275:1: ( rule__TypeSelectExpression__TypeAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTypeSelectExpressionAccess().getTypeAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9276:1: ( rule__TypeSelectExpression__TypeAssignment_2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9276:2: rule__TypeSelectExpression__TypeAssignment_2
+            // InternalExport.g:9276:1: ( rule__TypeSelectExpression__TypeAssignment_2 )
+            // InternalExport.g:9276:2: rule__TypeSelectExpression__TypeAssignment_2
             {
-            pushFollow(FOLLOW_rule__TypeSelectExpression__TypeAssignment_2_in_rule__TypeSelectExpression__Group__2__Impl18679);
+            pushFollow(FOLLOW_2);
             rule__TypeSelectExpression__TypeAssignment_2();
 
             state._fsp--;
@@ -26460,16 +26460,16 @@ public final void rule__TypeSelectExpression__Group__2__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__TypeSelectExpression__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9286:1: rule__TypeSelectExpression__Group__3 : rule__TypeSelectExpression__Group__3__Impl ;
+    // InternalExport.g:9286:1: rule__TypeSelectExpression__Group__3 : rule__TypeSelectExpression__Group__3__Impl ;
     public final void rule__TypeSelectExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9290:1: ( rule__TypeSelectExpression__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9291:2: rule__TypeSelectExpression__Group__3__Impl
+            // InternalExport.g:9290:1: ( rule__TypeSelectExpression__Group__3__Impl )
+            // InternalExport.g:9291:2: rule__TypeSelectExpression__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__TypeSelectExpression__Group__3__Impl_in_rule__TypeSelectExpression__Group__318709);
+            pushFollow(FOLLOW_2);
             rule__TypeSelectExpression__Group__3__Impl();
 
             state._fsp--;
@@ -26493,22 +26493,22 @@ public final void rule__TypeSelectExpression__Group__3() throws RecognitionExcep
 
 
     // $ANTLR start "rule__TypeSelectExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9297:1: rule__TypeSelectExpression__Group__3__Impl : ( ')' ) ;
+    // InternalExport.g:9297:1: rule__TypeSelectExpression__Group__3__Impl : ( ')' ) ;
     public final void rule__TypeSelectExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9301:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9302:1: ( ')' )
+            // InternalExport.g:9301:1: ( ( ')' ) )
+            // InternalExport.g:9302:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9302:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9303:1: ')'
+            // InternalExport.g:9302:1: ( ')' )
+            // InternalExport.g:9303:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTypeSelectExpressionAccess().getRightParenthesisKeyword_3()); 
             }
-            match(input,52,FOLLOW_52_in_rule__TypeSelectExpression__Group__3__Impl18737); if (state.failed) return ;
+            match(input,52,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getTypeSelectExpressionAccess().getRightParenthesisKeyword_3()); 
             }
@@ -26534,21 +26534,21 @@ public final void rule__TypeSelectExpression__Group__3__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__CollectionExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9324:1: rule__CollectionExpression__Group__0 : rule__CollectionExpression__Group__0__Impl rule__CollectionExpression__Group__1 ;
+    // InternalExport.g:9324:1: rule__CollectionExpression__Group__0 : rule__CollectionExpression__Group__0__Impl rule__CollectionExpression__Group__1 ;
     public final void rule__CollectionExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9328:1: ( rule__CollectionExpression__Group__0__Impl rule__CollectionExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9329:2: rule__CollectionExpression__Group__0__Impl rule__CollectionExpression__Group__1
+            // InternalExport.g:9328:1: ( rule__CollectionExpression__Group__0__Impl rule__CollectionExpression__Group__1 )
+            // InternalExport.g:9329:2: rule__CollectionExpression__Group__0__Impl rule__CollectionExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__CollectionExpression__Group__0__Impl_in_rule__CollectionExpression__Group__018776);
+            pushFollow(FOLLOW_34);
             rule__CollectionExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CollectionExpression__Group__1_in_rule__CollectionExpression__Group__018779);
+            pushFollow(FOLLOW_2);
             rule__CollectionExpression__Group__1();
 
             state._fsp--;
@@ -26572,25 +26572,25 @@ public final void rule__CollectionExpression__Group__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__CollectionExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9336:1: rule__CollectionExpression__Group__0__Impl : ( ( rule__CollectionExpression__NameAssignment_0 ) ) ;
+    // InternalExport.g:9336:1: rule__CollectionExpression__Group__0__Impl : ( ( rule__CollectionExpression__NameAssignment_0 ) ) ;
     public final void rule__CollectionExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9340:1: ( ( ( rule__CollectionExpression__NameAssignment_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9341:1: ( ( rule__CollectionExpression__NameAssignment_0 ) )
+            // InternalExport.g:9340:1: ( ( ( rule__CollectionExpression__NameAssignment_0 ) ) )
+            // InternalExport.g:9341:1: ( ( rule__CollectionExpression__NameAssignment_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9341:1: ( ( rule__CollectionExpression__NameAssignment_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9342:1: ( rule__CollectionExpression__NameAssignment_0 )
+            // InternalExport.g:9341:1: ( ( rule__CollectionExpression__NameAssignment_0 ) )
+            // InternalExport.g:9342:1: ( rule__CollectionExpression__NameAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionExpressionAccess().getNameAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9343:1: ( rule__CollectionExpression__NameAssignment_0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9343:2: rule__CollectionExpression__NameAssignment_0
+            // InternalExport.g:9343:1: ( rule__CollectionExpression__NameAssignment_0 )
+            // InternalExport.g:9343:2: rule__CollectionExpression__NameAssignment_0
             {
-            pushFollow(FOLLOW_rule__CollectionExpression__NameAssignment_0_in_rule__CollectionExpression__Group__0__Impl18806);
+            pushFollow(FOLLOW_2);
             rule__CollectionExpression__NameAssignment_0();
 
             state._fsp--;
@@ -26623,21 +26623,21 @@ public final void rule__CollectionExpression__Group__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__CollectionExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9353:1: rule__CollectionExpression__Group__1 : rule__CollectionExpression__Group__1__Impl rule__CollectionExpression__Group__2 ;
+    // InternalExport.g:9353:1: rule__CollectionExpression__Group__1 : rule__CollectionExpression__Group__1__Impl rule__CollectionExpression__Group__2 ;
     public final void rule__CollectionExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9357:1: ( rule__CollectionExpression__Group__1__Impl rule__CollectionExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9358:2: rule__CollectionExpression__Group__1__Impl rule__CollectionExpression__Group__2
+            // InternalExport.g:9357:1: ( rule__CollectionExpression__Group__1__Impl rule__CollectionExpression__Group__2 )
+            // InternalExport.g:9358:2: rule__CollectionExpression__Group__1__Impl rule__CollectionExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__CollectionExpression__Group__1__Impl_in_rule__CollectionExpression__Group__118836);
+            pushFollow(FOLLOW_18);
             rule__CollectionExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CollectionExpression__Group__2_in_rule__CollectionExpression__Group__118839);
+            pushFollow(FOLLOW_2);
             rule__CollectionExpression__Group__2();
 
             state._fsp--;
@@ -26661,22 +26661,22 @@ public final void rule__CollectionExpression__Group__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__CollectionExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9365:1: rule__CollectionExpression__Group__1__Impl : ( '(' ) ;
+    // InternalExport.g:9365:1: rule__CollectionExpression__Group__1__Impl : ( '(' ) ;
     public final void rule__CollectionExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9369:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9370:1: ( '(' )
+            // InternalExport.g:9369:1: ( ( '(' ) )
+            // InternalExport.g:9370:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9370:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9371:1: '('
+            // InternalExport.g:9370:1: ( '(' )
+            // InternalExport.g:9371:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionExpressionAccess().getLeftParenthesisKeyword_1()); 
             }
-            match(input,51,FOLLOW_51_in_rule__CollectionExpression__Group__1__Impl18867); if (state.failed) return ;
+            match(input,51,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCollectionExpressionAccess().getLeftParenthesisKeyword_1()); 
             }
@@ -26702,21 +26702,21 @@ public final void rule__CollectionExpression__Group__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__CollectionExpression__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9384:1: rule__CollectionExpression__Group__2 : rule__CollectionExpression__Group__2__Impl rule__CollectionExpression__Group__3 ;
+    // InternalExport.g:9384:1: rule__CollectionExpression__Group__2 : rule__CollectionExpression__Group__2__Impl rule__CollectionExpression__Group__3 ;
     public final void rule__CollectionExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9388:1: ( rule__CollectionExpression__Group__2__Impl rule__CollectionExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9389:2: rule__CollectionExpression__Group__2__Impl rule__CollectionExpression__Group__3
+            // InternalExport.g:9388:1: ( rule__CollectionExpression__Group__2__Impl rule__CollectionExpression__Group__3 )
+            // InternalExport.g:9389:2: rule__CollectionExpression__Group__2__Impl rule__CollectionExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__CollectionExpression__Group__2__Impl_in_rule__CollectionExpression__Group__218898);
+            pushFollow(FOLLOW_18);
             rule__CollectionExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CollectionExpression__Group__3_in_rule__CollectionExpression__Group__218901);
+            pushFollow(FOLLOW_2);
             rule__CollectionExpression__Group__3();
 
             state._fsp--;
@@ -26740,22 +26740,22 @@ public final void rule__CollectionExpression__Group__2() throws RecognitionExcep
 
 
     // $ANTLR start "rule__CollectionExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9396:1: rule__CollectionExpression__Group__2__Impl : ( ( rule__CollectionExpression__Group_2__0 )? ) ;
+    // InternalExport.g:9396:1: rule__CollectionExpression__Group__2__Impl : ( ( rule__CollectionExpression__Group_2__0 )? ) ;
     public final void rule__CollectionExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9400:1: ( ( ( rule__CollectionExpression__Group_2__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9401:1: ( ( rule__CollectionExpression__Group_2__0 )? )
+            // InternalExport.g:9400:1: ( ( ( rule__CollectionExpression__Group_2__0 )? ) )
+            // InternalExport.g:9401:1: ( ( rule__CollectionExpression__Group_2__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9401:1: ( ( rule__CollectionExpression__Group_2__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9402:1: ( rule__CollectionExpression__Group_2__0 )?
+            // InternalExport.g:9401:1: ( ( rule__CollectionExpression__Group_2__0 )? )
+            // InternalExport.g:9402:1: ( rule__CollectionExpression__Group_2__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionExpressionAccess().getGroup_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9403:1: ( rule__CollectionExpression__Group_2__0 )?
+            // InternalExport.g:9403:1: ( rule__CollectionExpression__Group_2__0 )?
             int alt66=2;
             int LA66_0 = input.LA(1);
 
@@ -26768,9 +26768,9 @@ public final void rule__CollectionExpression__Group__2__Impl() throws Recognitio
             }
             switch (alt66) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9403:2: rule__CollectionExpression__Group_2__0
+                    // InternalExport.g:9403:2: rule__CollectionExpression__Group_2__0
                     {
-                    pushFollow(FOLLOW_rule__CollectionExpression__Group_2__0_in_rule__CollectionExpression__Group__2__Impl18928);
+                    pushFollow(FOLLOW_2);
                     rule__CollectionExpression__Group_2__0();
 
                     state._fsp--;
@@ -26806,21 +26806,21 @@ public final void rule__CollectionExpression__Group__2__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__CollectionExpression__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9413:1: rule__CollectionExpression__Group__3 : rule__CollectionExpression__Group__3__Impl rule__CollectionExpression__Group__4 ;
+    // InternalExport.g:9413:1: rule__CollectionExpression__Group__3 : rule__CollectionExpression__Group__3__Impl rule__CollectionExpression__Group__4 ;
     public final void rule__CollectionExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9417:1: ( rule__CollectionExpression__Group__3__Impl rule__CollectionExpression__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9418:2: rule__CollectionExpression__Group__3__Impl rule__CollectionExpression__Group__4
+            // InternalExport.g:9417:1: ( rule__CollectionExpression__Group__3__Impl rule__CollectionExpression__Group__4 )
+            // InternalExport.g:9418:2: rule__CollectionExpression__Group__3__Impl rule__CollectionExpression__Group__4
             {
-            pushFollow(FOLLOW_rule__CollectionExpression__Group__3__Impl_in_rule__CollectionExpression__Group__318959);
+            pushFollow(FOLLOW_25);
             rule__CollectionExpression__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CollectionExpression__Group__4_in_rule__CollectionExpression__Group__318962);
+            pushFollow(FOLLOW_2);
             rule__CollectionExpression__Group__4();
 
             state._fsp--;
@@ -26844,25 +26844,25 @@ public final void rule__CollectionExpression__Group__3() throws RecognitionExcep
 
 
     // $ANTLR start "rule__CollectionExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9425:1: rule__CollectionExpression__Group__3__Impl : ( ( rule__CollectionExpression__ExpAssignment_3 ) ) ;
+    // InternalExport.g:9425:1: rule__CollectionExpression__Group__3__Impl : ( ( rule__CollectionExpression__ExpAssignment_3 ) ) ;
     public final void rule__CollectionExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9429:1: ( ( ( rule__CollectionExpression__ExpAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9430:1: ( ( rule__CollectionExpression__ExpAssignment_3 ) )
+            // InternalExport.g:9429:1: ( ( ( rule__CollectionExpression__ExpAssignment_3 ) ) )
+            // InternalExport.g:9430:1: ( ( rule__CollectionExpression__ExpAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9430:1: ( ( rule__CollectionExpression__ExpAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9431:1: ( rule__CollectionExpression__ExpAssignment_3 )
+            // InternalExport.g:9430:1: ( ( rule__CollectionExpression__ExpAssignment_3 ) )
+            // InternalExport.g:9431:1: ( rule__CollectionExpression__ExpAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionExpressionAccess().getExpAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9432:1: ( rule__CollectionExpression__ExpAssignment_3 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9432:2: rule__CollectionExpression__ExpAssignment_3
+            // InternalExport.g:9432:1: ( rule__CollectionExpression__ExpAssignment_3 )
+            // InternalExport.g:9432:2: rule__CollectionExpression__ExpAssignment_3
             {
-            pushFollow(FOLLOW_rule__CollectionExpression__ExpAssignment_3_in_rule__CollectionExpression__Group__3__Impl18989);
+            pushFollow(FOLLOW_2);
             rule__CollectionExpression__ExpAssignment_3();
 
             state._fsp--;
@@ -26895,16 +26895,16 @@ public final void rule__CollectionExpression__Group__3__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__CollectionExpression__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9442:1: rule__CollectionExpression__Group__4 : rule__CollectionExpression__Group__4__Impl ;
+    // InternalExport.g:9442:1: rule__CollectionExpression__Group__4 : rule__CollectionExpression__Group__4__Impl ;
     public final void rule__CollectionExpression__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9446:1: ( rule__CollectionExpression__Group__4__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9447:2: rule__CollectionExpression__Group__4__Impl
+            // InternalExport.g:9446:1: ( rule__CollectionExpression__Group__4__Impl )
+            // InternalExport.g:9447:2: rule__CollectionExpression__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__CollectionExpression__Group__4__Impl_in_rule__CollectionExpression__Group__419019);
+            pushFollow(FOLLOW_2);
             rule__CollectionExpression__Group__4__Impl();
 
             state._fsp--;
@@ -26928,22 +26928,22 @@ public final void rule__CollectionExpression__Group__4() throws RecognitionExcep
 
 
     // $ANTLR start "rule__CollectionExpression__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9453:1: rule__CollectionExpression__Group__4__Impl : ( ')' ) ;
+    // InternalExport.g:9453:1: rule__CollectionExpression__Group__4__Impl : ( ')' ) ;
     public final void rule__CollectionExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9457:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9458:1: ( ')' )
+            // InternalExport.g:9457:1: ( ( ')' ) )
+            // InternalExport.g:9458:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9458:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9459:1: ')'
+            // InternalExport.g:9458:1: ( ')' )
+            // InternalExport.g:9459:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionExpressionAccess().getRightParenthesisKeyword_4()); 
             }
-            match(input,52,FOLLOW_52_in_rule__CollectionExpression__Group__4__Impl19047); if (state.failed) return ;
+            match(input,52,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCollectionExpressionAccess().getRightParenthesisKeyword_4()); 
             }
@@ -26969,21 +26969,21 @@ public final void rule__CollectionExpression__Group__4__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__CollectionExpression__Group_2__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9482:1: rule__CollectionExpression__Group_2__0 : rule__CollectionExpression__Group_2__0__Impl rule__CollectionExpression__Group_2__1 ;
+    // InternalExport.g:9482:1: rule__CollectionExpression__Group_2__0 : rule__CollectionExpression__Group_2__0__Impl rule__CollectionExpression__Group_2__1 ;
     public final void rule__CollectionExpression__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9486:1: ( rule__CollectionExpression__Group_2__0__Impl rule__CollectionExpression__Group_2__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9487:2: rule__CollectionExpression__Group_2__0__Impl rule__CollectionExpression__Group_2__1
+            // InternalExport.g:9486:1: ( rule__CollectionExpression__Group_2__0__Impl rule__CollectionExpression__Group_2__1 )
+            // InternalExport.g:9487:2: rule__CollectionExpression__Group_2__0__Impl rule__CollectionExpression__Group_2__1
             {
-            pushFollow(FOLLOW_rule__CollectionExpression__Group_2__0__Impl_in_rule__CollectionExpression__Group_2__019088);
+            pushFollow(FOLLOW_67);
             rule__CollectionExpression__Group_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CollectionExpression__Group_2__1_in_rule__CollectionExpression__Group_2__019091);
+            pushFollow(FOLLOW_2);
             rule__CollectionExpression__Group_2__1();
 
             state._fsp--;
@@ -27007,25 +27007,25 @@ public final void rule__CollectionExpression__Group_2__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__CollectionExpression__Group_2__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9494:1: rule__CollectionExpression__Group_2__0__Impl : ( ( rule__CollectionExpression__VarAssignment_2_0 ) ) ;
+    // InternalExport.g:9494:1: rule__CollectionExpression__Group_2__0__Impl : ( ( rule__CollectionExpression__VarAssignment_2_0 ) ) ;
     public final void rule__CollectionExpression__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9498:1: ( ( ( rule__CollectionExpression__VarAssignment_2_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9499:1: ( ( rule__CollectionExpression__VarAssignment_2_0 ) )
+            // InternalExport.g:9498:1: ( ( ( rule__CollectionExpression__VarAssignment_2_0 ) ) )
+            // InternalExport.g:9499:1: ( ( rule__CollectionExpression__VarAssignment_2_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9499:1: ( ( rule__CollectionExpression__VarAssignment_2_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9500:1: ( rule__CollectionExpression__VarAssignment_2_0 )
+            // InternalExport.g:9499:1: ( ( rule__CollectionExpression__VarAssignment_2_0 ) )
+            // InternalExport.g:9500:1: ( rule__CollectionExpression__VarAssignment_2_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionExpressionAccess().getVarAssignment_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9501:1: ( rule__CollectionExpression__VarAssignment_2_0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9501:2: rule__CollectionExpression__VarAssignment_2_0
+            // InternalExport.g:9501:1: ( rule__CollectionExpression__VarAssignment_2_0 )
+            // InternalExport.g:9501:2: rule__CollectionExpression__VarAssignment_2_0
             {
-            pushFollow(FOLLOW_rule__CollectionExpression__VarAssignment_2_0_in_rule__CollectionExpression__Group_2__0__Impl19118);
+            pushFollow(FOLLOW_2);
             rule__CollectionExpression__VarAssignment_2_0();
 
             state._fsp--;
@@ -27058,16 +27058,16 @@ public final void rule__CollectionExpression__Group_2__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__CollectionExpression__Group_2__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9511:1: rule__CollectionExpression__Group_2__1 : rule__CollectionExpression__Group_2__1__Impl ;
+    // InternalExport.g:9511:1: rule__CollectionExpression__Group_2__1 : rule__CollectionExpression__Group_2__1__Impl ;
     public final void rule__CollectionExpression__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9515:1: ( rule__CollectionExpression__Group_2__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9516:2: rule__CollectionExpression__Group_2__1__Impl
+            // InternalExport.g:9515:1: ( rule__CollectionExpression__Group_2__1__Impl )
+            // InternalExport.g:9516:2: rule__CollectionExpression__Group_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__CollectionExpression__Group_2__1__Impl_in_rule__CollectionExpression__Group_2__119148);
+            pushFollow(FOLLOW_2);
             rule__CollectionExpression__Group_2__1__Impl();
 
             state._fsp--;
@@ -27091,22 +27091,22 @@ public final void rule__CollectionExpression__Group_2__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__CollectionExpression__Group_2__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9522:1: rule__CollectionExpression__Group_2__1__Impl : ( '|' ) ;
+    // InternalExport.g:9522:1: rule__CollectionExpression__Group_2__1__Impl : ( '|' ) ;
     public final void rule__CollectionExpression__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9526:1: ( ( '|' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9527:1: ( '|' )
+            // InternalExport.g:9526:1: ( ( '|' ) )
+            // InternalExport.g:9527:1: ( '|' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9527:1: ( '|' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9528:1: '|'
+            // InternalExport.g:9527:1: ( '|' )
+            // InternalExport.g:9528:1: '|'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionExpressionAccess().getVerticalLineKeyword_2_1()); 
             }
-            match(input,69,FOLLOW_69_in_rule__CollectionExpression__Group_2__1__Impl19176); if (state.failed) return ;
+            match(input,69,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCollectionExpressionAccess().getVerticalLineKeyword_2_1()); 
             }
@@ -27132,21 +27132,21 @@ public final void rule__CollectionExpression__Group_2__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__CollectionType__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9545:1: rule__CollectionType__Group__0 : rule__CollectionType__Group__0__Impl rule__CollectionType__Group__1 ;
+    // InternalExport.g:9545:1: rule__CollectionType__Group__0 : rule__CollectionType__Group__0__Impl rule__CollectionType__Group__1 ;
     public final void rule__CollectionType__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9549:1: ( rule__CollectionType__Group__0__Impl rule__CollectionType__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9550:2: rule__CollectionType__Group__0__Impl rule__CollectionType__Group__1
+            // InternalExport.g:9549:1: ( rule__CollectionType__Group__0__Impl rule__CollectionType__Group__1 )
+            // InternalExport.g:9550:2: rule__CollectionType__Group__0__Impl rule__CollectionType__Group__1
             {
-            pushFollow(FOLLOW_rule__CollectionType__Group__0__Impl_in_rule__CollectionType__Group__019211);
+            pushFollow(FOLLOW_30);
             rule__CollectionType__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CollectionType__Group__1_in_rule__CollectionType__Group__019214);
+            pushFollow(FOLLOW_2);
             rule__CollectionType__Group__1();
 
             state._fsp--;
@@ -27170,25 +27170,25 @@ public final void rule__CollectionType__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__CollectionType__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9557:1: rule__CollectionType__Group__0__Impl : ( ( rule__CollectionType__ClAssignment_0 ) ) ;
+    // InternalExport.g:9557:1: rule__CollectionType__Group__0__Impl : ( ( rule__CollectionType__ClAssignment_0 ) ) ;
     public final void rule__CollectionType__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9561:1: ( ( ( rule__CollectionType__ClAssignment_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9562:1: ( ( rule__CollectionType__ClAssignment_0 ) )
+            // InternalExport.g:9561:1: ( ( ( rule__CollectionType__ClAssignment_0 ) ) )
+            // InternalExport.g:9562:1: ( ( rule__CollectionType__ClAssignment_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9562:1: ( ( rule__CollectionType__ClAssignment_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9563:1: ( rule__CollectionType__ClAssignment_0 )
+            // InternalExport.g:9562:1: ( ( rule__CollectionType__ClAssignment_0 ) )
+            // InternalExport.g:9563:1: ( rule__CollectionType__ClAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionTypeAccess().getClAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9564:1: ( rule__CollectionType__ClAssignment_0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9564:2: rule__CollectionType__ClAssignment_0
+            // InternalExport.g:9564:1: ( rule__CollectionType__ClAssignment_0 )
+            // InternalExport.g:9564:2: rule__CollectionType__ClAssignment_0
             {
-            pushFollow(FOLLOW_rule__CollectionType__ClAssignment_0_in_rule__CollectionType__Group__0__Impl19241);
+            pushFollow(FOLLOW_2);
             rule__CollectionType__ClAssignment_0();
 
             state._fsp--;
@@ -27221,21 +27221,21 @@ public final void rule__CollectionType__Group__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__CollectionType__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9574:1: rule__CollectionType__Group__1 : rule__CollectionType__Group__1__Impl rule__CollectionType__Group__2 ;
+    // InternalExport.g:9574:1: rule__CollectionType__Group__1 : rule__CollectionType__Group__1__Impl rule__CollectionType__Group__2 ;
     public final void rule__CollectionType__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9578:1: ( rule__CollectionType__Group__1__Impl rule__CollectionType__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9579:2: rule__CollectionType__Group__1__Impl rule__CollectionType__Group__2
+            // InternalExport.g:9578:1: ( rule__CollectionType__Group__1__Impl rule__CollectionType__Group__2 )
+            // InternalExport.g:9579:2: rule__CollectionType__Group__1__Impl rule__CollectionType__Group__2
             {
-            pushFollow(FOLLOW_rule__CollectionType__Group__1__Impl_in_rule__CollectionType__Group__119271);
+            pushFollow(FOLLOW_40);
             rule__CollectionType__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CollectionType__Group__2_in_rule__CollectionType__Group__119274);
+            pushFollow(FOLLOW_2);
             rule__CollectionType__Group__2();
 
             state._fsp--;
@@ -27259,22 +27259,22 @@ public final void rule__CollectionType__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__CollectionType__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9586:1: rule__CollectionType__Group__1__Impl : ( '[' ) ;
+    // InternalExport.g:9586:1: rule__CollectionType__Group__1__Impl : ( '[' ) ;
     public final void rule__CollectionType__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9590:1: ( ( '[' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9591:1: ( '[' )
+            // InternalExport.g:9590:1: ( ( '[' ) )
+            // InternalExport.g:9591:1: ( '[' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9591:1: ( '[' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9592:1: '['
+            // InternalExport.g:9591:1: ( '[' )
+            // InternalExport.g:9592:1: '['
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionTypeAccess().getLeftSquareBracketKeyword_1()); 
             }
-            match(input,45,FOLLOW_45_in_rule__CollectionType__Group__1__Impl19302); if (state.failed) return ;
+            match(input,45,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCollectionTypeAccess().getLeftSquareBracketKeyword_1()); 
             }
@@ -27300,21 +27300,21 @@ public final void rule__CollectionType__Group__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__CollectionType__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9605:1: rule__CollectionType__Group__2 : rule__CollectionType__Group__2__Impl rule__CollectionType__Group__3 ;
+    // InternalExport.g:9605:1: rule__CollectionType__Group__2 : rule__CollectionType__Group__2__Impl rule__CollectionType__Group__3 ;
     public final void rule__CollectionType__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9609:1: ( rule__CollectionType__Group__2__Impl rule__CollectionType__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9610:2: rule__CollectionType__Group__2__Impl rule__CollectionType__Group__3
+            // InternalExport.g:9609:1: ( rule__CollectionType__Group__2__Impl rule__CollectionType__Group__3 )
+            // InternalExport.g:9610:2: rule__CollectionType__Group__2__Impl rule__CollectionType__Group__3
             {
-            pushFollow(FOLLOW_rule__CollectionType__Group__2__Impl_in_rule__CollectionType__Group__219333);
+            pushFollow(FOLLOW_19);
             rule__CollectionType__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CollectionType__Group__3_in_rule__CollectionType__Group__219336);
+            pushFollow(FOLLOW_2);
             rule__CollectionType__Group__3();
 
             state._fsp--;
@@ -27338,25 +27338,25 @@ public final void rule__CollectionType__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__CollectionType__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9617:1: rule__CollectionType__Group__2__Impl : ( ( rule__CollectionType__Id1Assignment_2 ) ) ;
+    // InternalExport.g:9617:1: rule__CollectionType__Group__2__Impl : ( ( rule__CollectionType__Id1Assignment_2 ) ) ;
     public final void rule__CollectionType__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9621:1: ( ( ( rule__CollectionType__Id1Assignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9622:1: ( ( rule__CollectionType__Id1Assignment_2 ) )
+            // InternalExport.g:9621:1: ( ( ( rule__CollectionType__Id1Assignment_2 ) ) )
+            // InternalExport.g:9622:1: ( ( rule__CollectionType__Id1Assignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9622:1: ( ( rule__CollectionType__Id1Assignment_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9623:1: ( rule__CollectionType__Id1Assignment_2 )
+            // InternalExport.g:9622:1: ( ( rule__CollectionType__Id1Assignment_2 ) )
+            // InternalExport.g:9623:1: ( rule__CollectionType__Id1Assignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionTypeAccess().getId1Assignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9624:1: ( rule__CollectionType__Id1Assignment_2 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9624:2: rule__CollectionType__Id1Assignment_2
+            // InternalExport.g:9624:1: ( rule__CollectionType__Id1Assignment_2 )
+            // InternalExport.g:9624:2: rule__CollectionType__Id1Assignment_2
             {
-            pushFollow(FOLLOW_rule__CollectionType__Id1Assignment_2_in_rule__CollectionType__Group__2__Impl19363);
+            pushFollow(FOLLOW_2);
             rule__CollectionType__Id1Assignment_2();
 
             state._fsp--;
@@ -27389,16 +27389,16 @@ public final void rule__CollectionType__Group__2__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__CollectionType__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9634:1: rule__CollectionType__Group__3 : rule__CollectionType__Group__3__Impl ;
+    // InternalExport.g:9634:1: rule__CollectionType__Group__3 : rule__CollectionType__Group__3__Impl ;
     public final void rule__CollectionType__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9638:1: ( rule__CollectionType__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9639:2: rule__CollectionType__Group__3__Impl
+            // InternalExport.g:9638:1: ( rule__CollectionType__Group__3__Impl )
+            // InternalExport.g:9639:2: rule__CollectionType__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__CollectionType__Group__3__Impl_in_rule__CollectionType__Group__319393);
+            pushFollow(FOLLOW_2);
             rule__CollectionType__Group__3__Impl();
 
             state._fsp--;
@@ -27422,22 +27422,22 @@ public final void rule__CollectionType__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__CollectionType__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9645:1: rule__CollectionType__Group__3__Impl : ( ']' ) ;
+    // InternalExport.g:9645:1: rule__CollectionType__Group__3__Impl : ( ']' ) ;
     public final void rule__CollectionType__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9649:1: ( ( ']' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9650:1: ( ']' )
+            // InternalExport.g:9649:1: ( ( ']' ) )
+            // InternalExport.g:9650:1: ( ']' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9650:1: ( ']' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9651:1: ']'
+            // InternalExport.g:9650:1: ( ']' )
+            // InternalExport.g:9651:1: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionTypeAccess().getRightSquareBracketKeyword_3()); 
             }
-            match(input,46,FOLLOW_46_in_rule__CollectionType__Group__3__Impl19421); if (state.failed) return ;
+            match(input,46,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCollectionTypeAccess().getRightSquareBracketKeyword_3()); 
             }
@@ -27463,21 +27463,21 @@ public final void rule__CollectionType__Group__3__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__SimpleType__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9672:1: rule__SimpleType__Group__0 : rule__SimpleType__Group__0__Impl rule__SimpleType__Group__1 ;
+    // InternalExport.g:9672:1: rule__SimpleType__Group__0 : rule__SimpleType__Group__0__Impl rule__SimpleType__Group__1 ;
     public final void rule__SimpleType__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9676:1: ( rule__SimpleType__Group__0__Impl rule__SimpleType__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9677:2: rule__SimpleType__Group__0__Impl rule__SimpleType__Group__1
+            // InternalExport.g:9676:1: ( rule__SimpleType__Group__0__Impl rule__SimpleType__Group__1 )
+            // InternalExport.g:9677:2: rule__SimpleType__Group__0__Impl rule__SimpleType__Group__1
             {
-            pushFollow(FOLLOW_rule__SimpleType__Group__0__Impl_in_rule__SimpleType__Group__019460);
+            pushFollow(FOLLOW_37);
             rule__SimpleType__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SimpleType__Group__1_in_rule__SimpleType__Group__019463);
+            pushFollow(FOLLOW_2);
             rule__SimpleType__Group__1();
 
             state._fsp--;
@@ -27501,25 +27501,25 @@ public final void rule__SimpleType__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__SimpleType__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9684:1: rule__SimpleType__Group__0__Impl : ( ( rule__SimpleType__IdAssignment_0 ) ) ;
+    // InternalExport.g:9684:1: rule__SimpleType__Group__0__Impl : ( ( rule__SimpleType__IdAssignment_0 ) ) ;
     public final void rule__SimpleType__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9688:1: ( ( ( rule__SimpleType__IdAssignment_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9689:1: ( ( rule__SimpleType__IdAssignment_0 ) )
+            // InternalExport.g:9688:1: ( ( ( rule__SimpleType__IdAssignment_0 ) ) )
+            // InternalExport.g:9689:1: ( ( rule__SimpleType__IdAssignment_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9689:1: ( ( rule__SimpleType__IdAssignment_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9690:1: ( rule__SimpleType__IdAssignment_0 )
+            // InternalExport.g:9689:1: ( ( rule__SimpleType__IdAssignment_0 ) )
+            // InternalExport.g:9690:1: ( rule__SimpleType__IdAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSimpleTypeAccess().getIdAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9691:1: ( rule__SimpleType__IdAssignment_0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9691:2: rule__SimpleType__IdAssignment_0
+            // InternalExport.g:9691:1: ( rule__SimpleType__IdAssignment_0 )
+            // InternalExport.g:9691:2: rule__SimpleType__IdAssignment_0
             {
-            pushFollow(FOLLOW_rule__SimpleType__IdAssignment_0_in_rule__SimpleType__Group__0__Impl19490);
+            pushFollow(FOLLOW_2);
             rule__SimpleType__IdAssignment_0();
 
             state._fsp--;
@@ -27552,16 +27552,16 @@ public final void rule__SimpleType__Group__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__SimpleType__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9701:1: rule__SimpleType__Group__1 : rule__SimpleType__Group__1__Impl ;
+    // InternalExport.g:9701:1: rule__SimpleType__Group__1 : rule__SimpleType__Group__1__Impl ;
     public final void rule__SimpleType__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9705:1: ( rule__SimpleType__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9706:2: rule__SimpleType__Group__1__Impl
+            // InternalExport.g:9705:1: ( rule__SimpleType__Group__1__Impl )
+            // InternalExport.g:9706:2: rule__SimpleType__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__SimpleType__Group__1__Impl_in_rule__SimpleType__Group__119520);
+            pushFollow(FOLLOW_2);
             rule__SimpleType__Group__1__Impl();
 
             state._fsp--;
@@ -27585,22 +27585,22 @@ public final void rule__SimpleType__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__SimpleType__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9712:1: rule__SimpleType__Group__1__Impl : ( ( rule__SimpleType__Group_1__0 )* ) ;
+    // InternalExport.g:9712:1: rule__SimpleType__Group__1__Impl : ( ( rule__SimpleType__Group_1__0 )* ) ;
     public final void rule__SimpleType__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9716:1: ( ( ( rule__SimpleType__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9717:1: ( ( rule__SimpleType__Group_1__0 )* )
+            // InternalExport.g:9716:1: ( ( ( rule__SimpleType__Group_1__0 )* ) )
+            // InternalExport.g:9717:1: ( ( rule__SimpleType__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9717:1: ( ( rule__SimpleType__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9718:1: ( rule__SimpleType__Group_1__0 )*
+            // InternalExport.g:9717:1: ( ( rule__SimpleType__Group_1__0 )* )
+            // InternalExport.g:9718:1: ( rule__SimpleType__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSimpleTypeAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9719:1: ( rule__SimpleType__Group_1__0 )*
+            // InternalExport.g:9719:1: ( rule__SimpleType__Group_1__0 )*
             loop67:
             do {
                 int alt67=2;
@@ -27613,9 +27613,9 @@ public final void rule__SimpleType__Group__1__Impl() throws RecognitionException
 
                 switch (alt67) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9719:2: rule__SimpleType__Group_1__0
+            	    // InternalExport.g:9719:2: rule__SimpleType__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__SimpleType__Group_1__0_in_rule__SimpleType__Group__1__Impl19547);
+            	    pushFollow(FOLLOW_38);
             	    rule__SimpleType__Group_1__0();
 
             	    state._fsp--;
@@ -27654,21 +27654,21 @@ public final void rule__SimpleType__Group__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__SimpleType__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9733:1: rule__SimpleType__Group_1__0 : rule__SimpleType__Group_1__0__Impl rule__SimpleType__Group_1__1 ;
+    // InternalExport.g:9733:1: rule__SimpleType__Group_1__0 : rule__SimpleType__Group_1__0__Impl rule__SimpleType__Group_1__1 ;
     public final void rule__SimpleType__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9737:1: ( rule__SimpleType__Group_1__0__Impl rule__SimpleType__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9738:2: rule__SimpleType__Group_1__0__Impl rule__SimpleType__Group_1__1
+            // InternalExport.g:9737:1: ( rule__SimpleType__Group_1__0__Impl rule__SimpleType__Group_1__1 )
+            // InternalExport.g:9738:2: rule__SimpleType__Group_1__0__Impl rule__SimpleType__Group_1__1
             {
-            pushFollow(FOLLOW_rule__SimpleType__Group_1__0__Impl_in_rule__SimpleType__Group_1__019582);
+            pushFollow(FOLLOW_10);
             rule__SimpleType__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SimpleType__Group_1__1_in_rule__SimpleType__Group_1__019585);
+            pushFollow(FOLLOW_2);
             rule__SimpleType__Group_1__1();
 
             state._fsp--;
@@ -27692,22 +27692,22 @@ public final void rule__SimpleType__Group_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__SimpleType__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9745:1: rule__SimpleType__Group_1__0__Impl : ( '::' ) ;
+    // InternalExport.g:9745:1: rule__SimpleType__Group_1__0__Impl : ( '::' ) ;
     public final void rule__SimpleType__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9749:1: ( ( '::' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9750:1: ( '::' )
+            // InternalExport.g:9749:1: ( ( '::' ) )
+            // InternalExport.g:9750:1: ( '::' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9750:1: ( '::' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9751:1: '::'
+            // InternalExport.g:9750:1: ( '::' )
+            // InternalExport.g:9751:1: '::'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSimpleTypeAccess().getColonColonKeyword_1_0()); 
             }
-            match(input,57,FOLLOW_57_in_rule__SimpleType__Group_1__0__Impl19613); if (state.failed) return ;
+            match(input,57,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSimpleTypeAccess().getColonColonKeyword_1_0()); 
             }
@@ -27733,16 +27733,16 @@ public final void rule__SimpleType__Group_1__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__SimpleType__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9764:1: rule__SimpleType__Group_1__1 : rule__SimpleType__Group_1__1__Impl ;
+    // InternalExport.g:9764:1: rule__SimpleType__Group_1__1 : rule__SimpleType__Group_1__1__Impl ;
     public final void rule__SimpleType__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9768:1: ( rule__SimpleType__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9769:2: rule__SimpleType__Group_1__1__Impl
+            // InternalExport.g:9768:1: ( rule__SimpleType__Group_1__1__Impl )
+            // InternalExport.g:9769:2: rule__SimpleType__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__SimpleType__Group_1__1__Impl_in_rule__SimpleType__Group_1__119644);
+            pushFollow(FOLLOW_2);
             rule__SimpleType__Group_1__1__Impl();
 
             state._fsp--;
@@ -27766,25 +27766,25 @@ public final void rule__SimpleType__Group_1__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__SimpleType__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9775:1: rule__SimpleType__Group_1__1__Impl : ( ( rule__SimpleType__IdAssignment_1_1 ) ) ;
+    // InternalExport.g:9775:1: rule__SimpleType__Group_1__1__Impl : ( ( rule__SimpleType__IdAssignment_1_1 ) ) ;
     public final void rule__SimpleType__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9779:1: ( ( ( rule__SimpleType__IdAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9780:1: ( ( rule__SimpleType__IdAssignment_1_1 ) )
+            // InternalExport.g:9779:1: ( ( ( rule__SimpleType__IdAssignment_1_1 ) ) )
+            // InternalExport.g:9780:1: ( ( rule__SimpleType__IdAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9780:1: ( ( rule__SimpleType__IdAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9781:1: ( rule__SimpleType__IdAssignment_1_1 )
+            // InternalExport.g:9780:1: ( ( rule__SimpleType__IdAssignment_1_1 ) )
+            // InternalExport.g:9781:1: ( rule__SimpleType__IdAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSimpleTypeAccess().getIdAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9782:1: ( rule__SimpleType__IdAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9782:2: rule__SimpleType__IdAssignment_1_1
+            // InternalExport.g:9782:1: ( rule__SimpleType__IdAssignment_1_1 )
+            // InternalExport.g:9782:2: rule__SimpleType__IdAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__SimpleType__IdAssignment_1_1_in_rule__SimpleType__Group_1__1__Impl19671);
+            pushFollow(FOLLOW_2);
             rule__SimpleType__IdAssignment_1_1();
 
             state._fsp--;
@@ -27817,28 +27817,28 @@ public final void rule__SimpleType__Group_1__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__ExportModel__ExtensionAssignment_0_1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9797:1: rule__ExportModel__ExtensionAssignment_0_1 : ( ( 'extension' ) ) ;
+    // InternalExport.g:9797:1: rule__ExportModel__ExtensionAssignment_0_1 : ( ( 'extension' ) ) ;
     public final void rule__ExportModel__ExtensionAssignment_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9801:1: ( ( ( 'extension' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9802:1: ( ( 'extension' ) )
+            // InternalExport.g:9801:1: ( ( ( 'extension' ) ) )
+            // InternalExport.g:9802:1: ( ( 'extension' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9802:1: ( ( 'extension' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9803:1: ( 'extension' )
+            // InternalExport.g:9802:1: ( ( 'extension' ) )
+            // InternalExport.g:9803:1: ( 'extension' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportModelAccess().getExtensionExtensionKeyword_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9804:1: ( 'extension' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9805:1: 'extension'
+            // InternalExport.g:9804:1: ( 'extension' )
+            // InternalExport.g:9805:1: 'extension'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportModelAccess().getExtensionExtensionKeyword_0_1_0()); 
             }
-            match(input,43,FOLLOW_43_in_rule__ExportModel__ExtensionAssignment_0_119715); if (state.failed) return ;
+            match(input,43,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExportModelAccess().getExtensionExtensionKeyword_0_1_0()); 
             }
@@ -27870,22 +27870,22 @@ public final void rule__ExportModel__ExtensionAssignment_0_1() throws Recognitio
 
 
     // $ANTLR start "rule__ExportModel__NameAssignment_0_2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9820:1: rule__ExportModel__NameAssignment_0_2 : ( RULE_ID ) ;
+    // InternalExport.g:9820:1: rule__ExportModel__NameAssignment_0_2 : ( RULE_ID ) ;
     public final void rule__ExportModel__NameAssignment_0_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9824:1: ( ( RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9825:1: ( RULE_ID )
+            // InternalExport.g:9824:1: ( ( RULE_ID ) )
+            // InternalExport.g:9825:1: ( RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9825:1: ( RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9826:1: RULE_ID
+            // InternalExport.g:9825:1: ( RULE_ID )
+            // InternalExport.g:9826:1: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportModelAccess().getNameIDTerminalRuleCall_0_2_0()); 
             }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__ExportModel__NameAssignment_0_219754); if (state.failed) return ;
+            match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExportModelAccess().getNameIDTerminalRuleCall_0_2_0()); 
             }
@@ -27911,28 +27911,28 @@ public final void rule__ExportModel__NameAssignment_0_2() throws RecognitionExce
 
 
     // $ANTLR start "rule__ExportModel__TargetGrammarAssignment_0_4"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9835:1: rule__ExportModel__TargetGrammarAssignment_0_4 : ( ( ruleQualifiedID ) ) ;
+    // InternalExport.g:9835:1: rule__ExportModel__TargetGrammarAssignment_0_4 : ( ( ruleQualifiedID ) ) ;
     public final void rule__ExportModel__TargetGrammarAssignment_0_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9839:1: ( ( ( ruleQualifiedID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9840:1: ( ( ruleQualifiedID ) )
+            // InternalExport.g:9839:1: ( ( ( ruleQualifiedID ) ) )
+            // InternalExport.g:9840:1: ( ( ruleQualifiedID ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9840:1: ( ( ruleQualifiedID ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9841:1: ( ruleQualifiedID )
+            // InternalExport.g:9840:1: ( ( ruleQualifiedID ) )
+            // InternalExport.g:9841:1: ( ruleQualifiedID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportModelAccess().getTargetGrammarGrammarCrossReference_0_4_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9842:1: ( ruleQualifiedID )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9843:1: ruleQualifiedID
+            // InternalExport.g:9842:1: ( ruleQualifiedID )
+            // InternalExport.g:9843:1: ruleQualifiedID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportModelAccess().getTargetGrammarGrammarQualifiedIDParserRuleCall_0_4_0_1()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedID_in_rule__ExportModel__TargetGrammarAssignment_0_419789);
+            pushFollow(FOLLOW_2);
             ruleQualifiedID();
 
             state._fsp--;
@@ -27968,22 +27968,22 @@ public final void rule__ExportModel__TargetGrammarAssignment_0_4() throws Recogn
 
 
     // $ANTLR start "rule__ExportModel__ImportsAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9854:1: rule__ExportModel__ImportsAssignment_1 : ( ruleImport ) ;
+    // InternalExport.g:9854:1: rule__ExportModel__ImportsAssignment_1 : ( ruleImport ) ;
     public final void rule__ExportModel__ImportsAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9858:1: ( ( ruleImport ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9859:1: ( ruleImport )
+            // InternalExport.g:9858:1: ( ( ruleImport ) )
+            // InternalExport.g:9859:1: ( ruleImport )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9859:1: ( ruleImport )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9860:1: ruleImport
+            // InternalExport.g:9859:1: ( ruleImport )
+            // InternalExport.g:9860:1: ruleImport
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportModelAccess().getImportsImportParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleImport_in_rule__ExportModel__ImportsAssignment_119824);
+            pushFollow(FOLLOW_2);
             ruleImport();
 
             state._fsp--;
@@ -28013,22 +28013,22 @@ public final void rule__ExportModel__ImportsAssignment_1() throws RecognitionExc
 
 
     // $ANTLR start "rule__ExportModel__ExtensionsAssignment_2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9869:1: rule__ExportModel__ExtensionsAssignment_2 : ( ruleExtension ) ;
+    // InternalExport.g:9869:1: rule__ExportModel__ExtensionsAssignment_2 : ( ruleExtension ) ;
     public final void rule__ExportModel__ExtensionsAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9873:1: ( ( ruleExtension ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9874:1: ( ruleExtension )
+            // InternalExport.g:9873:1: ( ( ruleExtension ) )
+            // InternalExport.g:9874:1: ( ruleExtension )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9874:1: ( ruleExtension )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9875:1: ruleExtension
+            // InternalExport.g:9874:1: ( ruleExtension )
+            // InternalExport.g:9875:1: ruleExtension
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportModelAccess().getExtensionsExtensionParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleExtension_in_rule__ExportModel__ExtensionsAssignment_219855);
+            pushFollow(FOLLOW_2);
             ruleExtension();
 
             state._fsp--;
@@ -28058,22 +28058,22 @@ public final void rule__ExportModel__ExtensionsAssignment_2() throws Recognition
 
 
     // $ANTLR start "rule__ExportModel__InterfacesAssignment_3_2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9884:1: rule__ExportModel__InterfacesAssignment_3_2 : ( ruleInterface ) ;
+    // InternalExport.g:9884:1: rule__ExportModel__InterfacesAssignment_3_2 : ( ruleInterface ) ;
     public final void rule__ExportModel__InterfacesAssignment_3_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9888:1: ( ( ruleInterface ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9889:1: ( ruleInterface )
+            // InternalExport.g:9888:1: ( ( ruleInterface ) )
+            // InternalExport.g:9889:1: ( ruleInterface )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9889:1: ( ruleInterface )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9890:1: ruleInterface
+            // InternalExport.g:9889:1: ( ruleInterface )
+            // InternalExport.g:9890:1: ruleInterface
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportModelAccess().getInterfacesInterfaceParserRuleCall_3_2_0()); 
             }
-            pushFollow(FOLLOW_ruleInterface_in_rule__ExportModel__InterfacesAssignment_3_219886);
+            pushFollow(FOLLOW_2);
             ruleInterface();
 
             state._fsp--;
@@ -28103,22 +28103,22 @@ public final void rule__ExportModel__InterfacesAssignment_3_2() throws Recogniti
 
 
     // $ANTLR start "rule__ExportModel__ExportsAssignment_4"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9899:1: rule__ExportModel__ExportsAssignment_4 : ( ruleExport ) ;
+    // InternalExport.g:9899:1: rule__ExportModel__ExportsAssignment_4 : ( ruleExport ) ;
     public final void rule__ExportModel__ExportsAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9903:1: ( ( ruleExport ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9904:1: ( ruleExport )
+            // InternalExport.g:9903:1: ( ( ruleExport ) )
+            // InternalExport.g:9904:1: ( ruleExport )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9904:1: ( ruleExport )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9905:1: ruleExport
+            // InternalExport.g:9904:1: ( ruleExport )
+            // InternalExport.g:9905:1: ruleExport
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportModelAccess().getExportsExportParserRuleCall_4_0()); 
             }
-            pushFollow(FOLLOW_ruleExport_in_rule__ExportModel__ExportsAssignment_419917);
+            pushFollow(FOLLOW_2);
             ruleExport();
 
             state._fsp--;
@@ -28148,28 +28148,28 @@ public final void rule__ExportModel__ExportsAssignment_4() throws RecognitionExc
 
 
     // $ANTLR start "rule__Import__PackageAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9914:1: rule__Import__PackageAssignment_1 : ( ( RULE_STRING ) ) ;
+    // InternalExport.g:9914:1: rule__Import__PackageAssignment_1 : ( ( RULE_STRING ) ) ;
     public final void rule__Import__PackageAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9918:1: ( ( ( RULE_STRING ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9919:1: ( ( RULE_STRING ) )
+            // InternalExport.g:9918:1: ( ( ( RULE_STRING ) ) )
+            // InternalExport.g:9919:1: ( ( RULE_STRING ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9919:1: ( ( RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9920:1: ( RULE_STRING )
+            // InternalExport.g:9919:1: ( ( RULE_STRING ) )
+            // InternalExport.g:9920:1: ( RULE_STRING )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImportAccess().getPackageEPackageCrossReference_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9921:1: ( RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9922:1: RULE_STRING
+            // InternalExport.g:9921:1: ( RULE_STRING )
+            // InternalExport.g:9922:1: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImportAccess().getPackageEPackageSTRINGTerminalRuleCall_1_0_1()); 
             }
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__Import__PackageAssignment_119952); if (state.failed) return ;
+            match(input,RULE_STRING,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getImportAccess().getPackageEPackageSTRINGTerminalRuleCall_1_0_1()); 
             }
@@ -28201,22 +28201,22 @@ public final void rule__Import__PackageAssignment_1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__Import__NameAssignment_2_1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9933:1: rule__Import__NameAssignment_2_1 : ( RULE_ID ) ;
+    // InternalExport.g:9933:1: rule__Import__NameAssignment_2_1 : ( RULE_ID ) ;
     public final void rule__Import__NameAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9937:1: ( ( RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9938:1: ( RULE_ID )
+            // InternalExport.g:9937:1: ( ( RULE_ID ) )
+            // InternalExport.g:9938:1: ( RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9938:1: ( RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9939:1: RULE_ID
+            // InternalExport.g:9938:1: ( RULE_ID )
+            // InternalExport.g:9939:1: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImportAccess().getNameIDTerminalRuleCall_2_1_0()); 
             }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__Import__NameAssignment_2_119987); if (state.failed) return ;
+            match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getImportAccess().getNameIDTerminalRuleCall_2_1_0()); 
             }
@@ -28242,22 +28242,22 @@ public final void rule__Import__NameAssignment_2_1() throws RecognitionException
 
 
     // $ANTLR start "rule__Extension__ExtensionAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9948:1: rule__Extension__ExtensionAssignment_1 : ( ruleQualifiedID ) ;
+    // InternalExport.g:9948:1: rule__Extension__ExtensionAssignment_1 : ( ruleQualifiedID ) ;
     public final void rule__Extension__ExtensionAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9952:1: ( ( ruleQualifiedID ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9953:1: ( ruleQualifiedID )
+            // InternalExport.g:9952:1: ( ( ruleQualifiedID ) )
+            // InternalExport.g:9953:1: ( ruleQualifiedID )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9953:1: ( ruleQualifiedID )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9954:1: ruleQualifiedID
+            // InternalExport.g:9953:1: ( ruleQualifiedID )
+            // InternalExport.g:9954:1: ruleQualifiedID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExtensionAccess().getExtensionQualifiedIDParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedID_in_rule__Extension__ExtensionAssignment_120018);
+            pushFollow(FOLLOW_2);
             ruleQualifiedID();
 
             state._fsp--;
@@ -28287,28 +28287,28 @@ public final void rule__Extension__ExtensionAssignment_1() throws RecognitionExc
 
 
     // $ANTLR start "rule__Interface__TypeAssignment_0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9963:1: rule__Interface__TypeAssignment_0 : ( ( ruleQualifiedID ) ) ;
+    // InternalExport.g:9963:1: rule__Interface__TypeAssignment_0 : ( ( ruleQualifiedID ) ) ;
     public final void rule__Interface__TypeAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9967:1: ( ( ( ruleQualifiedID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9968:1: ( ( ruleQualifiedID ) )
+            // InternalExport.g:9967:1: ( ( ( ruleQualifiedID ) ) )
+            // InternalExport.g:9968:1: ( ( ruleQualifiedID ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9968:1: ( ( ruleQualifiedID ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9969:1: ( ruleQualifiedID )
+            // InternalExport.g:9968:1: ( ( ruleQualifiedID ) )
+            // InternalExport.g:9969:1: ( ruleQualifiedID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceAccess().getTypeEClassCrossReference_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9970:1: ( ruleQualifiedID )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9971:1: ruleQualifiedID
+            // InternalExport.g:9970:1: ( ruleQualifiedID )
+            // InternalExport.g:9971:1: ruleQualifiedID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceAccess().getTypeEClassQualifiedIDParserRuleCall_0_0_1()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedID_in_rule__Interface__TypeAssignment_020053);
+            pushFollow(FOLLOW_2);
             ruleQualifiedID();
 
             state._fsp--;
@@ -28344,22 +28344,22 @@ public final void rule__Interface__TypeAssignment_0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__Interface__GuardAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9982:1: rule__Interface__GuardAssignment_1_1 : ( ruleExpression ) ;
+    // InternalExport.g:9982:1: rule__Interface__GuardAssignment_1_1 : ( ruleExpression ) ;
     public final void rule__Interface__GuardAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9986:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9987:1: ( ruleExpression )
+            // InternalExport.g:9986:1: ( ( ruleExpression ) )
+            // InternalExport.g:9987:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9987:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9988:1: ruleExpression
+            // InternalExport.g:9987:1: ( ruleExpression )
+            // InternalExport.g:9988:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceAccess().getGuardExpressionParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__Interface__GuardAssignment_1_120088);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -28389,22 +28389,22 @@ public final void rule__Interface__GuardAssignment_1_1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__Interface__ItemsAssignment_2_1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:9997:1: rule__Interface__ItemsAssignment_2_1 : ( ruleInterfaceItem ) ;
+    // InternalExport.g:9997:1: rule__Interface__ItemsAssignment_2_1 : ( ruleInterfaceItem ) ;
     public final void rule__Interface__ItemsAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10001:1: ( ( ruleInterfaceItem ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10002:1: ( ruleInterfaceItem )
+            // InternalExport.g:10001:1: ( ( ruleInterfaceItem ) )
+            // InternalExport.g:10002:1: ( ruleInterfaceItem )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10002:1: ( ruleInterfaceItem )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10003:1: ruleInterfaceItem
+            // InternalExport.g:10002:1: ( ruleInterfaceItem )
+            // InternalExport.g:10003:1: ruleInterfaceItem
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceAccess().getItemsInterfaceItemParserRuleCall_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleInterfaceItem_in_rule__Interface__ItemsAssignment_2_120119);
+            pushFollow(FOLLOW_2);
             ruleInterfaceItem();
 
             state._fsp--;
@@ -28434,22 +28434,22 @@ public final void rule__Interface__ItemsAssignment_2_1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__Interface__ItemsAssignment_2_2_1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10012:1: rule__Interface__ItemsAssignment_2_2_1 : ( ruleInterfaceItem ) ;
+    // InternalExport.g:10012:1: rule__Interface__ItemsAssignment_2_2_1 : ( ruleInterfaceItem ) ;
     public final void rule__Interface__ItemsAssignment_2_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10016:1: ( ( ruleInterfaceItem ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10017:1: ( ruleInterfaceItem )
+            // InternalExport.g:10016:1: ( ( ruleInterfaceItem ) )
+            // InternalExport.g:10017:1: ( ruleInterfaceItem )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10017:1: ( ruleInterfaceItem )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10018:1: ruleInterfaceItem
+            // InternalExport.g:10017:1: ( ruleInterfaceItem )
+            // InternalExport.g:10018:1: ruleInterfaceItem
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceAccess().getItemsInterfaceItemParserRuleCall_2_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleInterfaceItem_in_rule__Interface__ItemsAssignment_2_2_120150);
+            pushFollow(FOLLOW_2);
             ruleInterfaceItem();
 
             state._fsp--;
@@ -28479,28 +28479,28 @@ public final void rule__Interface__ItemsAssignment_2_2_1() throws RecognitionExc
 
 
     // $ANTLR start "rule__InterfaceField__UnorderedAssignment_0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10027:1: rule__InterfaceField__UnorderedAssignment_0 : ( ( '+' ) ) ;
+    // InternalExport.g:10027:1: rule__InterfaceField__UnorderedAssignment_0 : ( ( '+' ) ) ;
     public final void rule__InterfaceField__UnorderedAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10031:1: ( ( ( '+' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10032:1: ( ( '+' ) )
+            // InternalExport.g:10031:1: ( ( ( '+' ) ) )
+            // InternalExport.g:10032:1: ( ( '+' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10032:1: ( ( '+' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10033:1: ( '+' )
+            // InternalExport.g:10032:1: ( ( '+' ) )
+            // InternalExport.g:10033:1: ( '+' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceFieldAccess().getUnorderedPlusSignKeyword_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10034:1: ( '+' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10035:1: '+'
+            // InternalExport.g:10034:1: ( '+' )
+            // InternalExport.g:10035:1: '+'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceFieldAccess().getUnorderedPlusSignKeyword_0_0()); 
             }
-            match(input,18,FOLLOW_18_in_rule__InterfaceField__UnorderedAssignment_020186); if (state.failed) return ;
+            match(input,18,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInterfaceFieldAccess().getUnorderedPlusSignKeyword_0_0()); 
             }
@@ -28532,28 +28532,28 @@ public final void rule__InterfaceField__UnorderedAssignment_0() throws Recogniti
 
 
     // $ANTLR start "rule__InterfaceField__FieldAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10050:1: rule__InterfaceField__FieldAssignment_1 : ( ( RULE_ID ) ) ;
+    // InternalExport.g:10050:1: rule__InterfaceField__FieldAssignment_1 : ( ( RULE_ID ) ) ;
     public final void rule__InterfaceField__FieldAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10054:1: ( ( ( RULE_ID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10055:1: ( ( RULE_ID ) )
+            // InternalExport.g:10054:1: ( ( ( RULE_ID ) ) )
+            // InternalExport.g:10055:1: ( ( RULE_ID ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10055:1: ( ( RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10056:1: ( RULE_ID )
+            // InternalExport.g:10055:1: ( ( RULE_ID ) )
+            // InternalExport.g:10056:1: ( RULE_ID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceFieldAccess().getFieldEStructuralFeatureCrossReference_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10057:1: ( RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10058:1: RULE_ID
+            // InternalExport.g:10057:1: ( RULE_ID )
+            // InternalExport.g:10058:1: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceFieldAccess().getFieldEStructuralFeatureIDTerminalRuleCall_1_0_1()); 
             }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__InterfaceField__FieldAssignment_120229); if (state.failed) return ;
+            match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInterfaceFieldAccess().getFieldEStructuralFeatureIDTerminalRuleCall_1_0_1()); 
             }
@@ -28585,28 +28585,28 @@ public final void rule__InterfaceField__FieldAssignment_1() throws RecognitionEx
 
 
     // $ANTLR start "rule__InterfaceNavigation__UnorderedAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10069:1: rule__InterfaceNavigation__UnorderedAssignment_1 : ( ( '+' ) ) ;
+    // InternalExport.g:10069:1: rule__InterfaceNavigation__UnorderedAssignment_1 : ( ( '+' ) ) ;
     public final void rule__InterfaceNavigation__UnorderedAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10073:1: ( ( ( '+' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10074:1: ( ( '+' ) )
+            // InternalExport.g:10073:1: ( ( ( '+' ) ) )
+            // InternalExport.g:10074:1: ( ( '+' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10074:1: ( ( '+' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10075:1: ( '+' )
+            // InternalExport.g:10074:1: ( ( '+' ) )
+            // InternalExport.g:10075:1: ( '+' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceNavigationAccess().getUnorderedPlusSignKeyword_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10076:1: ( '+' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10077:1: '+'
+            // InternalExport.g:10076:1: ( '+' )
+            // InternalExport.g:10077:1: '+'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceNavigationAccess().getUnorderedPlusSignKeyword_1_0()); 
             }
-            match(input,18,FOLLOW_18_in_rule__InterfaceNavigation__UnorderedAssignment_120269); if (state.failed) return ;
+            match(input,18,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInterfaceNavigationAccess().getUnorderedPlusSignKeyword_1_0()); 
             }
@@ -28638,28 +28638,28 @@ public final void rule__InterfaceNavigation__UnorderedAssignment_1() throws Reco
 
 
     // $ANTLR start "rule__InterfaceNavigation__RefAssignment_2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10092:1: rule__InterfaceNavigation__RefAssignment_2 : ( ( RULE_ID ) ) ;
+    // InternalExport.g:10092:1: rule__InterfaceNavigation__RefAssignment_2 : ( ( RULE_ID ) ) ;
     public final void rule__InterfaceNavigation__RefAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10096:1: ( ( ( RULE_ID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10097:1: ( ( RULE_ID ) )
+            // InternalExport.g:10096:1: ( ( ( RULE_ID ) ) )
+            // InternalExport.g:10097:1: ( ( RULE_ID ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10097:1: ( ( RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10098:1: ( RULE_ID )
+            // InternalExport.g:10097:1: ( ( RULE_ID ) )
+            // InternalExport.g:10098:1: ( RULE_ID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceNavigationAccess().getRefEReferenceCrossReference_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10099:1: ( RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10100:1: RULE_ID
+            // InternalExport.g:10099:1: ( RULE_ID )
+            // InternalExport.g:10100:1: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceNavigationAccess().getRefEReferenceIDTerminalRuleCall_2_0_1()); 
             }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__InterfaceNavigation__RefAssignment_220312); if (state.failed) return ;
+            match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInterfaceNavigationAccess().getRefEReferenceIDTerminalRuleCall_2_0_1()); 
             }
@@ -28691,28 +28691,28 @@ public final void rule__InterfaceNavigation__RefAssignment_2() throws Recognitio
 
 
     // $ANTLR start "rule__InterfaceExpression__RefAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10111:1: rule__InterfaceExpression__RefAssignment_1 : ( ( '@' ) ) ;
+    // InternalExport.g:10111:1: rule__InterfaceExpression__RefAssignment_1 : ( ( '@' ) ) ;
     public final void rule__InterfaceExpression__RefAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10115:1: ( ( ( '@' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10116:1: ( ( '@' ) )
+            // InternalExport.g:10115:1: ( ( ( '@' ) ) )
+            // InternalExport.g:10116:1: ( ( '@' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10116:1: ( ( '@' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10117:1: ( '@' )
+            // InternalExport.g:10116:1: ( ( '@' ) )
+            // InternalExport.g:10117:1: ( '@' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceExpressionAccess().getRefCommercialAtKeyword_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10118:1: ( '@' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10119:1: '@'
+            // InternalExport.g:10118:1: ( '@' )
+            // InternalExport.g:10119:1: '@'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceExpressionAccess().getRefCommercialAtKeyword_1_0()); 
             }
-            match(input,49,FOLLOW_49_in_rule__InterfaceExpression__RefAssignment_120352); if (state.failed) return ;
+            match(input,49,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInterfaceExpressionAccess().getRefCommercialAtKeyword_1_0()); 
             }
@@ -28744,28 +28744,28 @@ public final void rule__InterfaceExpression__RefAssignment_1() throws Recognitio
 
 
     // $ANTLR start "rule__InterfaceExpression__UnorderedAssignment_2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10134:1: rule__InterfaceExpression__UnorderedAssignment_2 : ( ( '+' ) ) ;
+    // InternalExport.g:10134:1: rule__InterfaceExpression__UnorderedAssignment_2 : ( ( '+' ) ) ;
     public final void rule__InterfaceExpression__UnorderedAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10138:1: ( ( ( '+' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10139:1: ( ( '+' ) )
+            // InternalExport.g:10138:1: ( ( ( '+' ) ) )
+            // InternalExport.g:10139:1: ( ( '+' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10139:1: ( ( '+' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10140:1: ( '+' )
+            // InternalExport.g:10139:1: ( ( '+' ) )
+            // InternalExport.g:10140:1: ( '+' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceExpressionAccess().getUnorderedPlusSignKeyword_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10141:1: ( '+' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10142:1: '+'
+            // InternalExport.g:10141:1: ( '+' )
+            // InternalExport.g:10142:1: '+'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceExpressionAccess().getUnorderedPlusSignKeyword_2_0()); 
             }
-            match(input,18,FOLLOW_18_in_rule__InterfaceExpression__UnorderedAssignment_220396); if (state.failed) return ;
+            match(input,18,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInterfaceExpressionAccess().getUnorderedPlusSignKeyword_2_0()); 
             }
@@ -28797,22 +28797,22 @@ public final void rule__InterfaceExpression__UnorderedAssignment_2() throws Reco
 
 
     // $ANTLR start "rule__InterfaceExpression__ExprAssignment_4"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10157:1: rule__InterfaceExpression__ExprAssignment_4 : ( ruleExpression ) ;
+    // InternalExport.g:10157:1: rule__InterfaceExpression__ExprAssignment_4 : ( ruleExpression ) ;
     public final void rule__InterfaceExpression__ExprAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10161:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10162:1: ( ruleExpression )
+            // InternalExport.g:10161:1: ( ( ruleExpression ) )
+            // InternalExport.g:10162:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10162:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10163:1: ruleExpression
+            // InternalExport.g:10162:1: ( ruleExpression )
+            // InternalExport.g:10163:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInterfaceExpressionAccess().getExprExpressionParserRuleCall_4_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__InterfaceExpression__ExprAssignment_420435);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -28842,28 +28842,28 @@ public final void rule__InterfaceExpression__ExprAssignment_4() throws Recogniti
 
 
     // $ANTLR start "rule__Export__LookupAssignment_1_0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10172:1: rule__Export__LookupAssignment_1_0 : ( ( 'lookup' ) ) ;
+    // InternalExport.g:10172:1: rule__Export__LookupAssignment_1_0 : ( ( 'lookup' ) ) ;
     public final void rule__Export__LookupAssignment_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10176:1: ( ( ( 'lookup' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10177:1: ( ( 'lookup' ) )
+            // InternalExport.g:10176:1: ( ( ( 'lookup' ) ) )
+            // InternalExport.g:10177:1: ( ( 'lookup' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10177:1: ( ( 'lookup' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10178:1: ( 'lookup' )
+            // InternalExport.g:10177:1: ( ( 'lookup' ) )
+            // InternalExport.g:10178:1: ( 'lookup' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getLookupLookupKeyword_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10179:1: ( 'lookup' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10180:1: 'lookup'
+            // InternalExport.g:10179:1: ( 'lookup' )
+            // InternalExport.g:10180:1: 'lookup'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getLookupLookupKeyword_1_0_0()); 
             }
-            match(input,72,FOLLOW_72_in_rule__Export__LookupAssignment_1_020471); if (state.failed) return ;
+            match(input,72,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExportAccess().getLookupLookupKeyword_1_0_0()); 
             }
@@ -28895,22 +28895,22 @@ public final void rule__Export__LookupAssignment_1_0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__Export__LookupPredicateAssignment_1_1_1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10195:1: rule__Export__LookupPredicateAssignment_1_1_1 : ( ruleExpression ) ;
+    // InternalExport.g:10195:1: rule__Export__LookupPredicateAssignment_1_1_1 : ( ruleExpression ) ;
     public final void rule__Export__LookupPredicateAssignment_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10199:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10200:1: ( ruleExpression )
+            // InternalExport.g:10199:1: ( ( ruleExpression ) )
+            // InternalExport.g:10200:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10200:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10201:1: ruleExpression
+            // InternalExport.g:10200:1: ( ruleExpression )
+            // InternalExport.g:10201:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getLookupPredicateExpressionParserRuleCall_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__Export__LookupPredicateAssignment_1_1_120510);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -28940,28 +28940,28 @@ public final void rule__Export__LookupPredicateAssignment_1_1_1() throws Recogni
 
 
     // $ANTLR start "rule__Export__TypeAssignment_2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10210:1: rule__Export__TypeAssignment_2 : ( ( ruleQualifiedID ) ) ;
+    // InternalExport.g:10210:1: rule__Export__TypeAssignment_2 : ( ( ruleQualifiedID ) ) ;
     public final void rule__Export__TypeAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10214:1: ( ( ( ruleQualifiedID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10215:1: ( ( ruleQualifiedID ) )
+            // InternalExport.g:10214:1: ( ( ( ruleQualifiedID ) ) )
+            // InternalExport.g:10215:1: ( ( ruleQualifiedID ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10215:1: ( ( ruleQualifiedID ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10216:1: ( ruleQualifiedID )
+            // InternalExport.g:10215:1: ( ( ruleQualifiedID ) )
+            // InternalExport.g:10216:1: ( ruleQualifiedID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getTypeEClassCrossReference_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10217:1: ( ruleQualifiedID )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10218:1: ruleQualifiedID
+            // InternalExport.g:10217:1: ( ruleQualifiedID )
+            // InternalExport.g:10218:1: ruleQualifiedID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getTypeEClassQualifiedIDParserRuleCall_2_0_1()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedID_in_rule__Export__TypeAssignment_220545);
+            pushFollow(FOLLOW_2);
             ruleQualifiedID();
 
             state._fsp--;
@@ -28997,28 +28997,28 @@ public final void rule__Export__TypeAssignment_2() throws RecognitionException {
 
 
     // $ANTLR start "rule__Export__QualifiedNameAssignment_3_1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10229:1: rule__Export__QualifiedNameAssignment_3_1 : ( ( 'qualified' ) ) ;
+    // InternalExport.g:10229:1: rule__Export__QualifiedNameAssignment_3_1 : ( ( 'qualified' ) ) ;
     public final void rule__Export__QualifiedNameAssignment_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10233:1: ( ( ( 'qualified' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10234:1: ( ( 'qualified' ) )
+            // InternalExport.g:10233:1: ( ( ( 'qualified' ) ) )
+            // InternalExport.g:10234:1: ( ( 'qualified' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10234:1: ( ( 'qualified' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10235:1: ( 'qualified' )
+            // InternalExport.g:10234:1: ( ( 'qualified' ) )
+            // InternalExport.g:10235:1: ( 'qualified' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getQualifiedNameQualifiedKeyword_3_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10236:1: ( 'qualified' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10237:1: 'qualified'
+            // InternalExport.g:10236:1: ( 'qualified' )
+            // InternalExport.g:10237:1: 'qualified'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getQualifiedNameQualifiedKeyword_3_1_0()); 
             }
-            match(input,73,FOLLOW_73_in_rule__Export__QualifiedNameAssignment_3_120585); if (state.failed) return ;
+            match(input,73,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExportAccess().getQualifiedNameQualifiedKeyword_3_1_0()); 
             }
@@ -29050,22 +29050,22 @@ public final void rule__Export__QualifiedNameAssignment_3_1() throws Recognition
 
 
     // $ANTLR start "rule__Export__NamingAssignment_3_2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10252:1: rule__Export__NamingAssignment_3_2 : ( ruleExpression ) ;
+    // InternalExport.g:10252:1: rule__Export__NamingAssignment_3_2 : ( ruleExpression ) ;
     public final void rule__Export__NamingAssignment_3_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10256:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10257:1: ( ruleExpression )
+            // InternalExport.g:10256:1: ( ( ruleExpression ) )
+            // InternalExport.g:10257:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10257:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10258:1: ruleExpression
+            // InternalExport.g:10257:1: ( ruleExpression )
+            // InternalExport.g:10258:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getNamingExpressionParserRuleCall_3_2_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__Export__NamingAssignment_3_220624);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -29095,22 +29095,22 @@ public final void rule__Export__NamingAssignment_3_2() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__Export__GuardAssignment_4_1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10267:1: rule__Export__GuardAssignment_4_1 : ( ruleExpression ) ;
+    // InternalExport.g:10267:1: rule__Export__GuardAssignment_4_1 : ( ruleExpression ) ;
     public final void rule__Export__GuardAssignment_4_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10271:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10272:1: ( ruleExpression )
+            // InternalExport.g:10271:1: ( ( ruleExpression ) )
+            // InternalExport.g:10272:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10272:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10273:1: ruleExpression
+            // InternalExport.g:10272:1: ( ruleExpression )
+            // InternalExport.g:10273:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getGuardExpressionParserRuleCall_4_1_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__Export__GuardAssignment_4_120655);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -29140,28 +29140,28 @@ public final void rule__Export__GuardAssignment_4_1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__Export__FragmentUniqueAssignment_6_2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10282:1: rule__Export__FragmentUniqueAssignment_6_2 : ( ( 'unique' ) ) ;
+    // InternalExport.g:10282:1: rule__Export__FragmentUniqueAssignment_6_2 : ( ( 'unique' ) ) ;
     public final void rule__Export__FragmentUniqueAssignment_6_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10286:1: ( ( ( 'unique' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10287:1: ( ( 'unique' ) )
+            // InternalExport.g:10286:1: ( ( ( 'unique' ) ) )
+            // InternalExport.g:10287:1: ( ( 'unique' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10287:1: ( ( 'unique' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10288:1: ( 'unique' )
+            // InternalExport.g:10287:1: ( ( 'unique' ) )
+            // InternalExport.g:10288:1: ( 'unique' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getFragmentUniqueUniqueKeyword_6_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10289:1: ( 'unique' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10290:1: 'unique'
+            // InternalExport.g:10289:1: ( 'unique' )
+            // InternalExport.g:10290:1: 'unique'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getFragmentUniqueUniqueKeyword_6_2_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__Export__FragmentUniqueAssignment_6_220691); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExportAccess().getFragmentUniqueUniqueKeyword_6_2_0()); 
             }
@@ -29193,28 +29193,28 @@ public final void rule__Export__FragmentUniqueAssignment_6_2() throws Recognitio
 
 
     // $ANTLR start "rule__Export__FragmentAttributeAssignment_6_5"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10305:1: rule__Export__FragmentAttributeAssignment_6_5 : ( ( RULE_ID ) ) ;
+    // InternalExport.g:10305:1: rule__Export__FragmentAttributeAssignment_6_5 : ( ( RULE_ID ) ) ;
     public final void rule__Export__FragmentAttributeAssignment_6_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10309:1: ( ( ( RULE_ID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10310:1: ( ( RULE_ID ) )
+            // InternalExport.g:10309:1: ( ( ( RULE_ID ) ) )
+            // InternalExport.g:10310:1: ( ( RULE_ID ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10310:1: ( ( RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10311:1: ( RULE_ID )
+            // InternalExport.g:10310:1: ( ( RULE_ID ) )
+            // InternalExport.g:10311:1: ( RULE_ID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getFragmentAttributeEAttributeCrossReference_6_5_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10312:1: ( RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10313:1: RULE_ID
+            // InternalExport.g:10312:1: ( RULE_ID )
+            // InternalExport.g:10313:1: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getFragmentAttributeEAttributeIDTerminalRuleCall_6_5_0_1()); 
             }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__Export__FragmentAttributeAssignment_6_520734); if (state.failed) return ;
+            match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExportAccess().getFragmentAttributeEAttributeIDTerminalRuleCall_6_5_0_1()); 
             }
@@ -29246,28 +29246,28 @@ public final void rule__Export__FragmentAttributeAssignment_6_5() throws Recogni
 
 
     // $ANTLR start "rule__Export__FingerprintAssignment_7_0_0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10324:1: rule__Export__FingerprintAssignment_7_0_0 : ( ( 'object-fingerprint' ) ) ;
+    // InternalExport.g:10324:1: rule__Export__FingerprintAssignment_7_0_0 : ( ( 'object-fingerprint' ) ) ;
     public final void rule__Export__FingerprintAssignment_7_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10328:1: ( ( ( 'object-fingerprint' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10329:1: ( ( 'object-fingerprint' ) )
+            // InternalExport.g:10328:1: ( ( ( 'object-fingerprint' ) ) )
+            // InternalExport.g:10329:1: ( ( 'object-fingerprint' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10329:1: ( ( 'object-fingerprint' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10330:1: ( 'object-fingerprint' )
+            // InternalExport.g:10329:1: ( ( 'object-fingerprint' ) )
+            // InternalExport.g:10330:1: ( 'object-fingerprint' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getFingerprintObjectFingerprintKeyword_7_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10331:1: ( 'object-fingerprint' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10332:1: 'object-fingerprint'
+            // InternalExport.g:10331:1: ( 'object-fingerprint' )
+            // InternalExport.g:10332:1: 'object-fingerprint'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getFingerprintObjectFingerprintKeyword_7_0_0_0()); 
             }
-            match(input,75,FOLLOW_75_in_rule__Export__FingerprintAssignment_7_0_020774); if (state.failed) return ;
+            match(input,75,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExportAccess().getFingerprintObjectFingerprintKeyword_7_0_0_0()); 
             }
@@ -29299,28 +29299,28 @@ public final void rule__Export__FingerprintAssignment_7_0_0() throws Recognition
 
 
     // $ANTLR start "rule__Export__ResourceFingerprintAssignment_7_0_1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10347:1: rule__Export__ResourceFingerprintAssignment_7_0_1 : ( ( 'resource-fingerprint' ) ) ;
+    // InternalExport.g:10347:1: rule__Export__ResourceFingerprintAssignment_7_0_1 : ( ( 'resource-fingerprint' ) ) ;
     public final void rule__Export__ResourceFingerprintAssignment_7_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10351:1: ( ( ( 'resource-fingerprint' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10352:1: ( ( 'resource-fingerprint' ) )
+            // InternalExport.g:10351:1: ( ( ( 'resource-fingerprint' ) ) )
+            // InternalExport.g:10352:1: ( ( 'resource-fingerprint' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10352:1: ( ( 'resource-fingerprint' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10353:1: ( 'resource-fingerprint' )
+            // InternalExport.g:10352:1: ( ( 'resource-fingerprint' ) )
+            // InternalExport.g:10353:1: ( 'resource-fingerprint' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getResourceFingerprintResourceFingerprintKeyword_7_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10354:1: ( 'resource-fingerprint' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10355:1: 'resource-fingerprint'
+            // InternalExport.g:10354:1: ( 'resource-fingerprint' )
+            // InternalExport.g:10355:1: 'resource-fingerprint'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getResourceFingerprintResourceFingerprintKeyword_7_0_1_0()); 
             }
-            match(input,76,FOLLOW_76_in_rule__Export__ResourceFingerprintAssignment_7_0_120818); if (state.failed) return ;
+            match(input,76,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExportAccess().getResourceFingerprintResourceFingerprintKeyword_7_0_1_0()); 
             }
@@ -29352,22 +29352,22 @@ public final void rule__Export__ResourceFingerprintAssignment_7_0_1() throws Rec
 
 
     // $ANTLR start "rule__Export__AttributesAssignment_8_0_1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10370:1: rule__Export__AttributesAssignment_8_0_1 : ( ruleAttribute ) ;
+    // InternalExport.g:10370:1: rule__Export__AttributesAssignment_8_0_1 : ( ruleAttribute ) ;
     public final void rule__Export__AttributesAssignment_8_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10374:1: ( ( ruleAttribute ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10375:1: ( ruleAttribute )
+            // InternalExport.g:10374:1: ( ( ruleAttribute ) )
+            // InternalExport.g:10375:1: ( ruleAttribute )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10375:1: ( ruleAttribute )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10376:1: ruleAttribute
+            // InternalExport.g:10375:1: ( ruleAttribute )
+            // InternalExport.g:10376:1: ruleAttribute
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getAttributesAttributeParserRuleCall_8_0_1_0()); 
             }
-            pushFollow(FOLLOW_ruleAttribute_in_rule__Export__AttributesAssignment_8_0_120857);
+            pushFollow(FOLLOW_2);
             ruleAttribute();
 
             state._fsp--;
@@ -29397,22 +29397,22 @@ public final void rule__Export__AttributesAssignment_8_0_1() throws RecognitionE
 
 
     // $ANTLR start "rule__Export__AttributesAssignment_8_0_2_1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10385:1: rule__Export__AttributesAssignment_8_0_2_1 : ( ruleAttribute ) ;
+    // InternalExport.g:10385:1: rule__Export__AttributesAssignment_8_0_2_1 : ( ruleAttribute ) ;
     public final void rule__Export__AttributesAssignment_8_0_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10389:1: ( ( ruleAttribute ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10390:1: ( ruleAttribute )
+            // InternalExport.g:10389:1: ( ( ruleAttribute ) )
+            // InternalExport.g:10390:1: ( ruleAttribute )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10390:1: ( ruleAttribute )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10391:1: ruleAttribute
+            // InternalExport.g:10390:1: ( ruleAttribute )
+            // InternalExport.g:10391:1: ruleAttribute
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getAttributesAttributeParserRuleCall_8_0_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleAttribute_in_rule__Export__AttributesAssignment_8_0_2_120888);
+            pushFollow(FOLLOW_2);
             ruleAttribute();
 
             state._fsp--;
@@ -29442,22 +29442,22 @@ public final void rule__Export__AttributesAssignment_8_0_2_1() throws Recognitio
 
 
     // $ANTLR start "rule__Export__UserDataAssignment_8_1_1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10400:1: rule__Export__UserDataAssignment_8_1_1 : ( ruleUserData ) ;
+    // InternalExport.g:10400:1: rule__Export__UserDataAssignment_8_1_1 : ( ruleUserData ) ;
     public final void rule__Export__UserDataAssignment_8_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10404:1: ( ( ruleUserData ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10405:1: ( ruleUserData )
+            // InternalExport.g:10404:1: ( ( ruleUserData ) )
+            // InternalExport.g:10405:1: ( ruleUserData )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10405:1: ( ruleUserData )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10406:1: ruleUserData
+            // InternalExport.g:10405:1: ( ruleUserData )
+            // InternalExport.g:10406:1: ruleUserData
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getUserDataUserDataParserRuleCall_8_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleUserData_in_rule__Export__UserDataAssignment_8_1_120919);
+            pushFollow(FOLLOW_2);
             ruleUserData();
 
             state._fsp--;
@@ -29487,22 +29487,22 @@ public final void rule__Export__UserDataAssignment_8_1_1() throws RecognitionExc
 
 
     // $ANTLR start "rule__Export__UserDataAssignment_8_1_2_1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10415:1: rule__Export__UserDataAssignment_8_1_2_1 : ( ruleUserData ) ;
+    // InternalExport.g:10415:1: rule__Export__UserDataAssignment_8_1_2_1 : ( ruleUserData ) ;
     public final void rule__Export__UserDataAssignment_8_1_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10419:1: ( ( ruleUserData ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10420:1: ( ruleUserData )
+            // InternalExport.g:10419:1: ( ( ruleUserData ) )
+            // InternalExport.g:10420:1: ( ruleUserData )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10420:1: ( ruleUserData )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10421:1: ruleUserData
+            // InternalExport.g:10420:1: ( ruleUserData )
+            // InternalExport.g:10421:1: ruleUserData
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExportAccess().getUserDataUserDataParserRuleCall_8_1_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleUserData_in_rule__Export__UserDataAssignment_8_1_2_120950);
+            pushFollow(FOLLOW_2);
             ruleUserData();
 
             state._fsp--;
@@ -29532,22 +29532,22 @@ public final void rule__Export__UserDataAssignment_8_1_2_1() throws RecognitionE
 
 
     // $ANTLR start "rule__UserData__NameAssignment_0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10430:1: rule__UserData__NameAssignment_0 : ( RULE_ID ) ;
+    // InternalExport.g:10430:1: rule__UserData__NameAssignment_0 : ( RULE_ID ) ;
     public final void rule__UserData__NameAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10434:1: ( ( RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10435:1: ( RULE_ID )
+            // InternalExport.g:10434:1: ( ( RULE_ID ) )
+            // InternalExport.g:10435:1: ( RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10435:1: ( RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10436:1: RULE_ID
+            // InternalExport.g:10435:1: ( RULE_ID )
+            // InternalExport.g:10436:1: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getUserDataAccess().getNameIDTerminalRuleCall_0_0()); 
             }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__UserData__NameAssignment_020981); if (state.failed) return ;
+            match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getUserDataAccess().getNameIDTerminalRuleCall_0_0()); 
             }
@@ -29573,22 +29573,22 @@ public final void rule__UserData__NameAssignment_0() throws RecognitionException
 
 
     // $ANTLR start "rule__UserData__ExprAssignment_2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10445:1: rule__UserData__ExprAssignment_2 : ( ruleExpression ) ;
+    // InternalExport.g:10445:1: rule__UserData__ExprAssignment_2 : ( ruleExpression ) ;
     public final void rule__UserData__ExprAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10449:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10450:1: ( ruleExpression )
+            // InternalExport.g:10449:1: ( ( ruleExpression ) )
+            // InternalExport.g:10450:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10450:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10451:1: ruleExpression
+            // InternalExport.g:10450:1: ( ruleExpression )
+            // InternalExport.g:10451:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getUserDataAccess().getExprExpressionParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__UserData__ExprAssignment_221012);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -29618,28 +29618,28 @@ public final void rule__UserData__ExprAssignment_2() throws RecognitionException
 
 
     // $ANTLR start "rule__Attribute__AttributeAssignment"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10460:1: rule__Attribute__AttributeAssignment : ( ( RULE_ID ) ) ;
+    // InternalExport.g:10460:1: rule__Attribute__AttributeAssignment : ( ( RULE_ID ) ) ;
     public final void rule__Attribute__AttributeAssignment() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10464:1: ( ( ( RULE_ID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10465:1: ( ( RULE_ID ) )
+            // InternalExport.g:10464:1: ( ( ( RULE_ID ) ) )
+            // InternalExport.g:10465:1: ( ( RULE_ID ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10465:1: ( ( RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10466:1: ( RULE_ID )
+            // InternalExport.g:10465:1: ( ( RULE_ID ) )
+            // InternalExport.g:10466:1: ( RULE_ID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttributeAccess().getAttributeEAttributeCrossReference_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10467:1: ( RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10468:1: RULE_ID
+            // InternalExport.g:10467:1: ( RULE_ID )
+            // InternalExport.g:10468:1: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAttributeAccess().getAttributeEAttributeIDTerminalRuleCall_0_1()); 
             }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__Attribute__AttributeAssignment21047); if (state.failed) return ;
+            match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getAttributeAccess().getAttributeEAttributeIDTerminalRuleCall_0_1()); 
             }
@@ -29671,22 +29671,22 @@ public final void rule__Attribute__AttributeAssignment() throws RecognitionExcep
 
 
     // $ANTLR start "rule__LetExpression__IdentifierAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10479:1: rule__LetExpression__IdentifierAssignment_1 : ( ruleIdentifier ) ;
+    // InternalExport.g:10479:1: rule__LetExpression__IdentifierAssignment_1 : ( ruleIdentifier ) ;
     public final void rule__LetExpression__IdentifierAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10483:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10484:1: ( ruleIdentifier )
+            // InternalExport.g:10483:1: ( ( ruleIdentifier ) )
+            // InternalExport.g:10484:1: ( ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10484:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10485:1: ruleIdentifier
+            // InternalExport.g:10484:1: ( ruleIdentifier )
+            // InternalExport.g:10485:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLetExpressionAccess().getIdentifierIdentifierParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__LetExpression__IdentifierAssignment_121082);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -29716,22 +29716,22 @@ public final void rule__LetExpression__IdentifierAssignment_1() throws Recogniti
 
 
     // $ANTLR start "rule__LetExpression__VarExprAssignment_3"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10494:1: rule__LetExpression__VarExprAssignment_3 : ( ruleExpression ) ;
+    // InternalExport.g:10494:1: rule__LetExpression__VarExprAssignment_3 : ( ruleExpression ) ;
     public final void rule__LetExpression__VarExprAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10498:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10499:1: ( ruleExpression )
+            // InternalExport.g:10498:1: ( ( ruleExpression ) )
+            // InternalExport.g:10499:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10499:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10500:1: ruleExpression
+            // InternalExport.g:10499:1: ( ruleExpression )
+            // InternalExport.g:10500:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLetExpressionAccess().getVarExprExpressionParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__LetExpression__VarExprAssignment_321113);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -29761,22 +29761,22 @@ public final void rule__LetExpression__VarExprAssignment_3() throws RecognitionE
 
 
     // $ANTLR start "rule__LetExpression__TargetAssignment_5"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10509:1: rule__LetExpression__TargetAssignment_5 : ( ruleExpression ) ;
+    // InternalExport.g:10509:1: rule__LetExpression__TargetAssignment_5 : ( ruleExpression ) ;
     public final void rule__LetExpression__TargetAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10513:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10514:1: ( ruleExpression )
+            // InternalExport.g:10513:1: ( ( ruleExpression ) )
+            // InternalExport.g:10514:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10514:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10515:1: ruleExpression
+            // InternalExport.g:10514:1: ( ruleExpression )
+            // InternalExport.g:10515:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLetExpressionAccess().getTargetExpressionParserRuleCall_5_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__LetExpression__TargetAssignment_521144);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -29806,22 +29806,22 @@ public final void rule__LetExpression__TargetAssignment_5() throws RecognitionEx
 
 
     // $ANTLR start "rule__CastedExpression__TypeAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10524:1: rule__CastedExpression__TypeAssignment_1 : ( ruleType ) ;
+    // InternalExport.g:10524:1: rule__CastedExpression__TypeAssignment_1 : ( ruleType ) ;
     public final void rule__CastedExpression__TypeAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10528:1: ( ( ruleType ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10529:1: ( ruleType )
+            // InternalExport.g:10528:1: ( ( ruleType ) )
+            // InternalExport.g:10529:1: ( ruleType )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10529:1: ( ruleType )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10530:1: ruleType
+            // InternalExport.g:10529:1: ( ruleType )
+            // InternalExport.g:10530:1: ruleType
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCastedExpressionAccess().getTypeTypeParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleType_in_rule__CastedExpression__TypeAssignment_121175);
+            pushFollow(FOLLOW_2);
             ruleType();
 
             state._fsp--;
@@ -29851,22 +29851,22 @@ public final void rule__CastedExpression__TypeAssignment_1() throws RecognitionE
 
 
     // $ANTLR start "rule__CastedExpression__TargetAssignment_3"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10539:1: rule__CastedExpression__TargetAssignment_3 : ( ruleExpression ) ;
+    // InternalExport.g:10539:1: rule__CastedExpression__TargetAssignment_3 : ( ruleExpression ) ;
     public final void rule__CastedExpression__TargetAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10543:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10544:1: ( ruleExpression )
+            // InternalExport.g:10543:1: ( ( ruleExpression ) )
+            // InternalExport.g:10544:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10544:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10545:1: ruleExpression
+            // InternalExport.g:10544:1: ( ruleExpression )
+            // InternalExport.g:10545:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCastedExpressionAccess().getTargetExpressionParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__CastedExpression__TargetAssignment_321206);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -29896,22 +29896,22 @@ public final void rule__CastedExpression__TargetAssignment_3() throws Recognitio
 
 
     // $ANTLR start "rule__ChainExpression__NextAssignment_1_2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10554:1: rule__ChainExpression__NextAssignment_1_2 : ( ruleChainedExpression ) ;
+    // InternalExport.g:10554:1: rule__ChainExpression__NextAssignment_1_2 : ( ruleChainedExpression ) ;
     public final void rule__ChainExpression__NextAssignment_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10558:1: ( ( ruleChainedExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10559:1: ( ruleChainedExpression )
+            // InternalExport.g:10558:1: ( ( ruleChainedExpression ) )
+            // InternalExport.g:10559:1: ( ruleChainedExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10559:1: ( ruleChainedExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10560:1: ruleChainedExpression
+            // InternalExport.g:10559:1: ( ruleChainedExpression )
+            // InternalExport.g:10560:1: ruleChainedExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getChainExpressionAccess().getNextChainedExpressionParserRuleCall_1_2_0()); 
             }
-            pushFollow(FOLLOW_ruleChainedExpression_in_rule__ChainExpression__NextAssignment_1_221237);
+            pushFollow(FOLLOW_2);
             ruleChainedExpression();
 
             state._fsp--;
@@ -29941,22 +29941,22 @@ public final void rule__ChainExpression__NextAssignment_1_2() throws Recognition
 
 
     // $ANTLR start "rule__IfExpressionTri__ThenPartAssignment_1_2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10569:1: rule__IfExpressionTri__ThenPartAssignment_1_2 : ( ruleChainedExpression ) ;
+    // InternalExport.g:10569:1: rule__IfExpressionTri__ThenPartAssignment_1_2 : ( ruleChainedExpression ) ;
     public final void rule__IfExpressionTri__ThenPartAssignment_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10573:1: ( ( ruleChainedExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10574:1: ( ruleChainedExpression )
+            // InternalExport.g:10573:1: ( ( ruleChainedExpression ) )
+            // InternalExport.g:10574:1: ( ruleChainedExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10574:1: ( ruleChainedExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10575:1: ruleChainedExpression
+            // InternalExport.g:10574:1: ( ruleChainedExpression )
+            // InternalExport.g:10575:1: ruleChainedExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionTriAccess().getThenPartChainedExpressionParserRuleCall_1_2_0()); 
             }
-            pushFollow(FOLLOW_ruleChainedExpression_in_rule__IfExpressionTri__ThenPartAssignment_1_221268);
+            pushFollow(FOLLOW_2);
             ruleChainedExpression();
 
             state._fsp--;
@@ -29986,22 +29986,22 @@ public final void rule__IfExpressionTri__ThenPartAssignment_1_2() throws Recogni
 
 
     // $ANTLR start "rule__IfExpressionTri__ElsePartAssignment_1_4"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10584:1: rule__IfExpressionTri__ElsePartAssignment_1_4 : ( ruleChainedExpression ) ;
+    // InternalExport.g:10584:1: rule__IfExpressionTri__ElsePartAssignment_1_4 : ( ruleChainedExpression ) ;
     public final void rule__IfExpressionTri__ElsePartAssignment_1_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10588:1: ( ( ruleChainedExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10589:1: ( ruleChainedExpression )
+            // InternalExport.g:10588:1: ( ( ruleChainedExpression ) )
+            // InternalExport.g:10589:1: ( ruleChainedExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10589:1: ( ruleChainedExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10590:1: ruleChainedExpression
+            // InternalExport.g:10589:1: ( ruleChainedExpression )
+            // InternalExport.g:10590:1: ruleChainedExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionTriAccess().getElsePartChainedExpressionParserRuleCall_1_4_0()); 
             }
-            pushFollow(FOLLOW_ruleChainedExpression_in_rule__IfExpressionTri__ElsePartAssignment_1_421299);
+            pushFollow(FOLLOW_2);
             ruleChainedExpression();
 
             state._fsp--;
@@ -30031,22 +30031,22 @@ public final void rule__IfExpressionTri__ElsePartAssignment_1_4() throws Recogni
 
 
     // $ANTLR start "rule__IfExpressionKw__ConditionAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10599:1: rule__IfExpressionKw__ConditionAssignment_1 : ( ruleChainedExpression ) ;
+    // InternalExport.g:10599:1: rule__IfExpressionKw__ConditionAssignment_1 : ( ruleChainedExpression ) ;
     public final void rule__IfExpressionKw__ConditionAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10603:1: ( ( ruleChainedExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10604:1: ( ruleChainedExpression )
+            // InternalExport.g:10603:1: ( ( ruleChainedExpression ) )
+            // InternalExport.g:10604:1: ( ruleChainedExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10604:1: ( ruleChainedExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10605:1: ruleChainedExpression
+            // InternalExport.g:10604:1: ( ruleChainedExpression )
+            // InternalExport.g:10605:1: ruleChainedExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionKwAccess().getConditionChainedExpressionParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleChainedExpression_in_rule__IfExpressionKw__ConditionAssignment_121330);
+            pushFollow(FOLLOW_2);
             ruleChainedExpression();
 
             state._fsp--;
@@ -30076,22 +30076,22 @@ public final void rule__IfExpressionKw__ConditionAssignment_1() throws Recogniti
 
 
     // $ANTLR start "rule__IfExpressionKw__ThenPartAssignment_3"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10614:1: rule__IfExpressionKw__ThenPartAssignment_3 : ( ruleChainedExpression ) ;
+    // InternalExport.g:10614:1: rule__IfExpressionKw__ThenPartAssignment_3 : ( ruleChainedExpression ) ;
     public final void rule__IfExpressionKw__ThenPartAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10618:1: ( ( ruleChainedExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10619:1: ( ruleChainedExpression )
+            // InternalExport.g:10618:1: ( ( ruleChainedExpression ) )
+            // InternalExport.g:10619:1: ( ruleChainedExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10619:1: ( ruleChainedExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10620:1: ruleChainedExpression
+            // InternalExport.g:10619:1: ( ruleChainedExpression )
+            // InternalExport.g:10620:1: ruleChainedExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionKwAccess().getThenPartChainedExpressionParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleChainedExpression_in_rule__IfExpressionKw__ThenPartAssignment_321361);
+            pushFollow(FOLLOW_2);
             ruleChainedExpression();
 
             state._fsp--;
@@ -30121,22 +30121,22 @@ public final void rule__IfExpressionKw__ThenPartAssignment_3() throws Recognitio
 
 
     // $ANTLR start "rule__IfExpressionKw__ElsePartAssignment_4_0_1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10629:1: rule__IfExpressionKw__ElsePartAssignment_4_0_1 : ( ruleChainedExpression ) ;
+    // InternalExport.g:10629:1: rule__IfExpressionKw__ElsePartAssignment_4_0_1 : ( ruleChainedExpression ) ;
     public final void rule__IfExpressionKw__ElsePartAssignment_4_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10633:1: ( ( ruleChainedExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10634:1: ( ruleChainedExpression )
+            // InternalExport.g:10633:1: ( ( ruleChainedExpression ) )
+            // InternalExport.g:10634:1: ( ruleChainedExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10634:1: ( ruleChainedExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10635:1: ruleChainedExpression
+            // InternalExport.g:10634:1: ( ruleChainedExpression )
+            // InternalExport.g:10635:1: ruleChainedExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionKwAccess().getElsePartChainedExpressionParserRuleCall_4_0_1_0()); 
             }
-            pushFollow(FOLLOW_ruleChainedExpression_in_rule__IfExpressionKw__ElsePartAssignment_4_0_121392);
+            pushFollow(FOLLOW_2);
             ruleChainedExpression();
 
             state._fsp--;
@@ -30166,22 +30166,22 @@ public final void rule__IfExpressionKw__ElsePartAssignment_4_0_1() throws Recogn
 
 
     // $ANTLR start "rule__SwitchExpression__SwitchExprAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10644:1: rule__SwitchExpression__SwitchExprAssignment_1_1 : ( ruleOrExpression ) ;
+    // InternalExport.g:10644:1: rule__SwitchExpression__SwitchExprAssignment_1_1 : ( ruleOrExpression ) ;
     public final void rule__SwitchExpression__SwitchExprAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10648:1: ( ( ruleOrExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10649:1: ( ruleOrExpression )
+            // InternalExport.g:10648:1: ( ( ruleOrExpression ) )
+            // InternalExport.g:10649:1: ( ruleOrExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10649:1: ( ruleOrExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10650:1: ruleOrExpression
+            // InternalExport.g:10649:1: ( ruleOrExpression )
+            // InternalExport.g:10650:1: ruleOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getSwitchExprOrExpressionParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleOrExpression_in_rule__SwitchExpression__SwitchExprAssignment_1_121423);
+            pushFollow(FOLLOW_2);
             ruleOrExpression();
 
             state._fsp--;
@@ -30211,22 +30211,22 @@ public final void rule__SwitchExpression__SwitchExprAssignment_1_1() throws Reco
 
 
     // $ANTLR start "rule__SwitchExpression__CaseAssignment_3"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10659:1: rule__SwitchExpression__CaseAssignment_3 : ( ruleCase ) ;
+    // InternalExport.g:10659:1: rule__SwitchExpression__CaseAssignment_3 : ( ruleCase ) ;
     public final void rule__SwitchExpression__CaseAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10663:1: ( ( ruleCase ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10664:1: ( ruleCase )
+            // InternalExport.g:10663:1: ( ( ruleCase ) )
+            // InternalExport.g:10664:1: ( ruleCase )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10664:1: ( ruleCase )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10665:1: ruleCase
+            // InternalExport.g:10664:1: ( ruleCase )
+            // InternalExport.g:10665:1: ruleCase
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getCaseCaseParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleCase_in_rule__SwitchExpression__CaseAssignment_321454);
+            pushFollow(FOLLOW_2);
             ruleCase();
 
             state._fsp--;
@@ -30256,22 +30256,22 @@ public final void rule__SwitchExpression__CaseAssignment_3() throws RecognitionE
 
 
     // $ANTLR start "rule__SwitchExpression__DefaultExprAssignment_6"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10674:1: rule__SwitchExpression__DefaultExprAssignment_6 : ( ruleOrExpression ) ;
+    // InternalExport.g:10674:1: rule__SwitchExpression__DefaultExprAssignment_6 : ( ruleOrExpression ) ;
     public final void rule__SwitchExpression__DefaultExprAssignment_6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10678:1: ( ( ruleOrExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10679:1: ( ruleOrExpression )
+            // InternalExport.g:10678:1: ( ( ruleOrExpression ) )
+            // InternalExport.g:10679:1: ( ruleOrExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10679:1: ( ruleOrExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10680:1: ruleOrExpression
+            // InternalExport.g:10679:1: ( ruleOrExpression )
+            // InternalExport.g:10680:1: ruleOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getDefaultExprOrExpressionParserRuleCall_6_0()); 
             }
-            pushFollow(FOLLOW_ruleOrExpression_in_rule__SwitchExpression__DefaultExprAssignment_621485);
+            pushFollow(FOLLOW_2);
             ruleOrExpression();
 
             state._fsp--;
@@ -30301,22 +30301,22 @@ public final void rule__SwitchExpression__DefaultExprAssignment_6() throws Recog
 
 
     // $ANTLR start "rule__Case__ConditionAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10689:1: rule__Case__ConditionAssignment_1 : ( ruleOrExpression ) ;
+    // InternalExport.g:10689:1: rule__Case__ConditionAssignment_1 : ( ruleOrExpression ) ;
     public final void rule__Case__ConditionAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10693:1: ( ( ruleOrExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10694:1: ( ruleOrExpression )
+            // InternalExport.g:10693:1: ( ( ruleOrExpression ) )
+            // InternalExport.g:10694:1: ( ruleOrExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10694:1: ( ruleOrExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10695:1: ruleOrExpression
+            // InternalExport.g:10694:1: ( ruleOrExpression )
+            // InternalExport.g:10695:1: ruleOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCaseAccess().getConditionOrExpressionParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleOrExpression_in_rule__Case__ConditionAssignment_121516);
+            pushFollow(FOLLOW_2);
             ruleOrExpression();
 
             state._fsp--;
@@ -30346,22 +30346,22 @@ public final void rule__Case__ConditionAssignment_1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__Case__ThenParAssignment_3"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10704:1: rule__Case__ThenParAssignment_3 : ( ruleOrExpression ) ;
+    // InternalExport.g:10704:1: rule__Case__ThenParAssignment_3 : ( ruleOrExpression ) ;
     public final void rule__Case__ThenParAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10708:1: ( ( ruleOrExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10709:1: ( ruleOrExpression )
+            // InternalExport.g:10708:1: ( ( ruleOrExpression ) )
+            // InternalExport.g:10709:1: ( ruleOrExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10709:1: ( ruleOrExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10710:1: ruleOrExpression
+            // InternalExport.g:10709:1: ( ruleOrExpression )
+            // InternalExport.g:10710:1: ruleOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCaseAccess().getThenParOrExpressionParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleOrExpression_in_rule__Case__ThenParAssignment_321547);
+            pushFollow(FOLLOW_2);
             ruleOrExpression();
 
             state._fsp--;
@@ -30391,28 +30391,28 @@ public final void rule__Case__ThenParAssignment_3() throws RecognitionException
 
 
     // $ANTLR start "rule__OrExpression__OperatorAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10719:1: rule__OrExpression__OperatorAssignment_1_1 : ( ( '||' ) ) ;
+    // InternalExport.g:10719:1: rule__OrExpression__OperatorAssignment_1_1 : ( ( '||' ) ) ;
     public final void rule__OrExpression__OperatorAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10723:1: ( ( ( '||' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10724:1: ( ( '||' ) )
+            // InternalExport.g:10723:1: ( ( ( '||' ) ) )
+            // InternalExport.g:10724:1: ( ( '||' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10724:1: ( ( '||' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10725:1: ( '||' )
+            // InternalExport.g:10724:1: ( ( '||' ) )
+            // InternalExport.g:10725:1: ( '||' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOrExpressionAccess().getOperatorVerticalLineVerticalLineKeyword_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10726:1: ( '||' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10727:1: '||'
+            // InternalExport.g:10726:1: ( '||' )
+            // InternalExport.g:10727:1: '||'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOrExpressionAccess().getOperatorVerticalLineVerticalLineKeyword_1_1_0()); 
             }
-            match(input,77,FOLLOW_77_in_rule__OrExpression__OperatorAssignment_1_121583); if (state.failed) return ;
+            match(input,77,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOrExpressionAccess().getOperatorVerticalLineVerticalLineKeyword_1_1_0()); 
             }
@@ -30444,22 +30444,22 @@ public final void rule__OrExpression__OperatorAssignment_1_1() throws Recognitio
 
 
     // $ANTLR start "rule__OrExpression__RightAssignment_1_2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10742:1: rule__OrExpression__RightAssignment_1_2 : ( ruleAndExpression ) ;
+    // InternalExport.g:10742:1: rule__OrExpression__RightAssignment_1_2 : ( ruleAndExpression ) ;
     public final void rule__OrExpression__RightAssignment_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10746:1: ( ( ruleAndExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10747:1: ( ruleAndExpression )
+            // InternalExport.g:10746:1: ( ( ruleAndExpression ) )
+            // InternalExport.g:10747:1: ( ruleAndExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10747:1: ( ruleAndExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10748:1: ruleAndExpression
+            // InternalExport.g:10747:1: ( ruleAndExpression )
+            // InternalExport.g:10748:1: ruleAndExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOrExpressionAccess().getRightAndExpressionParserRuleCall_1_2_0()); 
             }
-            pushFollow(FOLLOW_ruleAndExpression_in_rule__OrExpression__RightAssignment_1_221622);
+            pushFollow(FOLLOW_2);
             ruleAndExpression();
 
             state._fsp--;
@@ -30489,28 +30489,28 @@ public final void rule__OrExpression__RightAssignment_1_2() throws RecognitionEx
 
 
     // $ANTLR start "rule__AndExpression__OperatorAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10757:1: rule__AndExpression__OperatorAssignment_1_1 : ( ( '&&' ) ) ;
+    // InternalExport.g:10757:1: rule__AndExpression__OperatorAssignment_1_1 : ( ( '&&' ) ) ;
     public final void rule__AndExpression__OperatorAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10761:1: ( ( ( '&&' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10762:1: ( ( '&&' ) )
+            // InternalExport.g:10761:1: ( ( ( '&&' ) ) )
+            // InternalExport.g:10762:1: ( ( '&&' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10762:1: ( ( '&&' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10763:1: ( '&&' )
+            // InternalExport.g:10762:1: ( ( '&&' ) )
+            // InternalExport.g:10763:1: ( '&&' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAndExpressionAccess().getOperatorAmpersandAmpersandKeyword_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10764:1: ( '&&' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10765:1: '&&'
+            // InternalExport.g:10764:1: ( '&&' )
+            // InternalExport.g:10765:1: '&&'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAndExpressionAccess().getOperatorAmpersandAmpersandKeyword_1_1_0()); 
             }
-            match(input,78,FOLLOW_78_in_rule__AndExpression__OperatorAssignment_1_121658); if (state.failed) return ;
+            match(input,78,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getAndExpressionAccess().getOperatorAmpersandAmpersandKeyword_1_1_0()); 
             }
@@ -30542,22 +30542,22 @@ public final void rule__AndExpression__OperatorAssignment_1_1() throws Recogniti
 
 
     // $ANTLR start "rule__AndExpression__RightAssignment_1_2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10780:1: rule__AndExpression__RightAssignment_1_2 : ( ruleImpliesExpression ) ;
+    // InternalExport.g:10780:1: rule__AndExpression__RightAssignment_1_2 : ( ruleImpliesExpression ) ;
     public final void rule__AndExpression__RightAssignment_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10784:1: ( ( ruleImpliesExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10785:1: ( ruleImpliesExpression )
+            // InternalExport.g:10784:1: ( ( ruleImpliesExpression ) )
+            // InternalExport.g:10785:1: ( ruleImpliesExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10785:1: ( ruleImpliesExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10786:1: ruleImpliesExpression
+            // InternalExport.g:10785:1: ( ruleImpliesExpression )
+            // InternalExport.g:10786:1: ruleImpliesExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAndExpressionAccess().getRightImpliesExpressionParserRuleCall_1_2_0()); 
             }
-            pushFollow(FOLLOW_ruleImpliesExpression_in_rule__AndExpression__RightAssignment_1_221697);
+            pushFollow(FOLLOW_2);
             ruleImpliesExpression();
 
             state._fsp--;
@@ -30587,28 +30587,28 @@ public final void rule__AndExpression__RightAssignment_1_2() throws RecognitionE
 
 
     // $ANTLR start "rule__ImpliesExpression__OperatorAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10795:1: rule__ImpliesExpression__OperatorAssignment_1_1 : ( ( 'implies' ) ) ;
+    // InternalExport.g:10795:1: rule__ImpliesExpression__OperatorAssignment_1_1 : ( ( 'implies' ) ) ;
     public final void rule__ImpliesExpression__OperatorAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10799:1: ( ( ( 'implies' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10800:1: ( ( 'implies' ) )
+            // InternalExport.g:10799:1: ( ( ( 'implies' ) ) )
+            // InternalExport.g:10800:1: ( ( 'implies' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10800:1: ( ( 'implies' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10801:1: ( 'implies' )
+            // InternalExport.g:10800:1: ( ( 'implies' ) )
+            // InternalExport.g:10801:1: ( 'implies' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImpliesExpressionAccess().getOperatorImpliesKeyword_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10802:1: ( 'implies' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10803:1: 'implies'
+            // InternalExport.g:10802:1: ( 'implies' )
+            // InternalExport.g:10803:1: 'implies'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImpliesExpressionAccess().getOperatorImpliesKeyword_1_1_0()); 
             }
-            match(input,79,FOLLOW_79_in_rule__ImpliesExpression__OperatorAssignment_1_121733); if (state.failed) return ;
+            match(input,79,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getImpliesExpressionAccess().getOperatorImpliesKeyword_1_1_0()); 
             }
@@ -30640,22 +30640,22 @@ public final void rule__ImpliesExpression__OperatorAssignment_1_1() throws Recog
 
 
     // $ANTLR start "rule__ImpliesExpression__RightAssignment_1_2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10818:1: rule__ImpliesExpression__RightAssignment_1_2 : ( ruleRelationalExpression ) ;
+    // InternalExport.g:10818:1: rule__ImpliesExpression__RightAssignment_1_2 : ( ruleRelationalExpression ) ;
     public final void rule__ImpliesExpression__RightAssignment_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10822:1: ( ( ruleRelationalExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10823:1: ( ruleRelationalExpression )
+            // InternalExport.g:10822:1: ( ( ruleRelationalExpression ) )
+            // InternalExport.g:10823:1: ( ruleRelationalExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10823:1: ( ruleRelationalExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10824:1: ruleRelationalExpression
+            // InternalExport.g:10823:1: ( ruleRelationalExpression )
+            // InternalExport.g:10824:1: ruleRelationalExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImpliesExpressionAccess().getRightRelationalExpressionParserRuleCall_1_2_0()); 
             }
-            pushFollow(FOLLOW_ruleRelationalExpression_in_rule__ImpliesExpression__RightAssignment_1_221772);
+            pushFollow(FOLLOW_2);
             ruleRelationalExpression();
 
             state._fsp--;
@@ -30685,25 +30685,25 @@ public final void rule__ImpliesExpression__RightAssignment_1_2() throws Recognit
 
 
     // $ANTLR start "rule__RelationalExpression__OperatorAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10833:1: rule__RelationalExpression__OperatorAssignment_1_1 : ( ( rule__RelationalExpression__OperatorAlternatives_1_1_0 ) ) ;
+    // InternalExport.g:10833:1: rule__RelationalExpression__OperatorAssignment_1_1 : ( ( rule__RelationalExpression__OperatorAlternatives_1_1_0 ) ) ;
     public final void rule__RelationalExpression__OperatorAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10837:1: ( ( ( rule__RelationalExpression__OperatorAlternatives_1_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10838:1: ( ( rule__RelationalExpression__OperatorAlternatives_1_1_0 ) )
+            // InternalExport.g:10837:1: ( ( ( rule__RelationalExpression__OperatorAlternatives_1_1_0 ) ) )
+            // InternalExport.g:10838:1: ( ( rule__RelationalExpression__OperatorAlternatives_1_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10838:1: ( ( rule__RelationalExpression__OperatorAlternatives_1_1_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10839:1: ( rule__RelationalExpression__OperatorAlternatives_1_1_0 )
+            // InternalExport.g:10838:1: ( ( rule__RelationalExpression__OperatorAlternatives_1_1_0 ) )
+            // InternalExport.g:10839:1: ( rule__RelationalExpression__OperatorAlternatives_1_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRelationalExpressionAccess().getOperatorAlternatives_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10840:1: ( rule__RelationalExpression__OperatorAlternatives_1_1_0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10840:2: rule__RelationalExpression__OperatorAlternatives_1_1_0
+            // InternalExport.g:10840:1: ( rule__RelationalExpression__OperatorAlternatives_1_1_0 )
+            // InternalExport.g:10840:2: rule__RelationalExpression__OperatorAlternatives_1_1_0
             {
-            pushFollow(FOLLOW_rule__RelationalExpression__OperatorAlternatives_1_1_0_in_rule__RelationalExpression__OperatorAssignment_1_121803);
+            pushFollow(FOLLOW_2);
             rule__RelationalExpression__OperatorAlternatives_1_1_0();
 
             state._fsp--;
@@ -30736,22 +30736,22 @@ public final void rule__RelationalExpression__OperatorAssignment_1_1() throws Re
 
 
     // $ANTLR start "rule__RelationalExpression__RightAssignment_1_2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10849:1: rule__RelationalExpression__RightAssignment_1_2 : ( ruleAdditiveExpression ) ;
+    // InternalExport.g:10849:1: rule__RelationalExpression__RightAssignment_1_2 : ( ruleAdditiveExpression ) ;
     public final void rule__RelationalExpression__RightAssignment_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10853:1: ( ( ruleAdditiveExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10854:1: ( ruleAdditiveExpression )
+            // InternalExport.g:10853:1: ( ( ruleAdditiveExpression ) )
+            // InternalExport.g:10854:1: ( ruleAdditiveExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10854:1: ( ruleAdditiveExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10855:1: ruleAdditiveExpression
+            // InternalExport.g:10854:1: ( ruleAdditiveExpression )
+            // InternalExport.g:10855:1: ruleAdditiveExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRelationalExpressionAccess().getRightAdditiveExpressionParserRuleCall_1_2_0()); 
             }
-            pushFollow(FOLLOW_ruleAdditiveExpression_in_rule__RelationalExpression__RightAssignment_1_221836);
+            pushFollow(FOLLOW_2);
             ruleAdditiveExpression();
 
             state._fsp--;
@@ -30781,25 +30781,25 @@ public final void rule__RelationalExpression__RightAssignment_1_2() throws Recog
 
 
     // $ANTLR start "rule__AdditiveExpression__NameAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10864:1: rule__AdditiveExpression__NameAssignment_1_1 : ( ( rule__AdditiveExpression__NameAlternatives_1_1_0 ) ) ;
+    // InternalExport.g:10864:1: rule__AdditiveExpression__NameAssignment_1_1 : ( ( rule__AdditiveExpression__NameAlternatives_1_1_0 ) ) ;
     public final void rule__AdditiveExpression__NameAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10868:1: ( ( ( rule__AdditiveExpression__NameAlternatives_1_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10869:1: ( ( rule__AdditiveExpression__NameAlternatives_1_1_0 ) )
+            // InternalExport.g:10868:1: ( ( ( rule__AdditiveExpression__NameAlternatives_1_1_0 ) ) )
+            // InternalExport.g:10869:1: ( ( rule__AdditiveExpression__NameAlternatives_1_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10869:1: ( ( rule__AdditiveExpression__NameAlternatives_1_1_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10870:1: ( rule__AdditiveExpression__NameAlternatives_1_1_0 )
+            // InternalExport.g:10869:1: ( ( rule__AdditiveExpression__NameAlternatives_1_1_0 ) )
+            // InternalExport.g:10870:1: ( rule__AdditiveExpression__NameAlternatives_1_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAdditiveExpressionAccess().getNameAlternatives_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10871:1: ( rule__AdditiveExpression__NameAlternatives_1_1_0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10871:2: rule__AdditiveExpression__NameAlternatives_1_1_0
+            // InternalExport.g:10871:1: ( rule__AdditiveExpression__NameAlternatives_1_1_0 )
+            // InternalExport.g:10871:2: rule__AdditiveExpression__NameAlternatives_1_1_0
             {
-            pushFollow(FOLLOW_rule__AdditiveExpression__NameAlternatives_1_1_0_in_rule__AdditiveExpression__NameAssignment_1_121867);
+            pushFollow(FOLLOW_2);
             rule__AdditiveExpression__NameAlternatives_1_1_0();
 
             state._fsp--;
@@ -30832,22 +30832,22 @@ public final void rule__AdditiveExpression__NameAssignment_1_1() throws Recognit
 
 
     // $ANTLR start "rule__AdditiveExpression__ParamsAssignment_1_2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10880:1: rule__AdditiveExpression__ParamsAssignment_1_2 : ( ruleMultiplicativeExpression ) ;
+    // InternalExport.g:10880:1: rule__AdditiveExpression__ParamsAssignment_1_2 : ( ruleMultiplicativeExpression ) ;
     public final void rule__AdditiveExpression__ParamsAssignment_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10884:1: ( ( ruleMultiplicativeExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10885:1: ( ruleMultiplicativeExpression )
+            // InternalExport.g:10884:1: ( ( ruleMultiplicativeExpression ) )
+            // InternalExport.g:10885:1: ( ruleMultiplicativeExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10885:1: ( ruleMultiplicativeExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10886:1: ruleMultiplicativeExpression
+            // InternalExport.g:10885:1: ( ruleMultiplicativeExpression )
+            // InternalExport.g:10886:1: ruleMultiplicativeExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAdditiveExpressionAccess().getParamsMultiplicativeExpressionParserRuleCall_1_2_0()); 
             }
-            pushFollow(FOLLOW_ruleMultiplicativeExpression_in_rule__AdditiveExpression__ParamsAssignment_1_221900);
+            pushFollow(FOLLOW_2);
             ruleMultiplicativeExpression();
 
             state._fsp--;
@@ -30877,25 +30877,25 @@ public final void rule__AdditiveExpression__ParamsAssignment_1_2() throws Recogn
 
 
     // $ANTLR start "rule__MultiplicativeExpression__NameAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10895:1: rule__MultiplicativeExpression__NameAssignment_1_1 : ( ( rule__MultiplicativeExpression__NameAlternatives_1_1_0 ) ) ;
+    // InternalExport.g:10895:1: rule__MultiplicativeExpression__NameAssignment_1_1 : ( ( rule__MultiplicativeExpression__NameAlternatives_1_1_0 ) ) ;
     public final void rule__MultiplicativeExpression__NameAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10899:1: ( ( ( rule__MultiplicativeExpression__NameAlternatives_1_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10900:1: ( ( rule__MultiplicativeExpression__NameAlternatives_1_1_0 ) )
+            // InternalExport.g:10899:1: ( ( ( rule__MultiplicativeExpression__NameAlternatives_1_1_0 ) ) )
+            // InternalExport.g:10900:1: ( ( rule__MultiplicativeExpression__NameAlternatives_1_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10900:1: ( ( rule__MultiplicativeExpression__NameAlternatives_1_1_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10901:1: ( rule__MultiplicativeExpression__NameAlternatives_1_1_0 )
+            // InternalExport.g:10900:1: ( ( rule__MultiplicativeExpression__NameAlternatives_1_1_0 ) )
+            // InternalExport.g:10901:1: ( rule__MultiplicativeExpression__NameAlternatives_1_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMultiplicativeExpressionAccess().getNameAlternatives_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10902:1: ( rule__MultiplicativeExpression__NameAlternatives_1_1_0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10902:2: rule__MultiplicativeExpression__NameAlternatives_1_1_0
+            // InternalExport.g:10902:1: ( rule__MultiplicativeExpression__NameAlternatives_1_1_0 )
+            // InternalExport.g:10902:2: rule__MultiplicativeExpression__NameAlternatives_1_1_0
             {
-            pushFollow(FOLLOW_rule__MultiplicativeExpression__NameAlternatives_1_1_0_in_rule__MultiplicativeExpression__NameAssignment_1_121931);
+            pushFollow(FOLLOW_2);
             rule__MultiplicativeExpression__NameAlternatives_1_1_0();
 
             state._fsp--;
@@ -30928,22 +30928,22 @@ public final void rule__MultiplicativeExpression__NameAssignment_1_1() throws Re
 
 
     // $ANTLR start "rule__MultiplicativeExpression__ParamsAssignment_1_2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10911:1: rule__MultiplicativeExpression__ParamsAssignment_1_2 : ( ruleUnaryOrInfixExpression ) ;
+    // InternalExport.g:10911:1: rule__MultiplicativeExpression__ParamsAssignment_1_2 : ( ruleUnaryOrInfixExpression ) ;
     public final void rule__MultiplicativeExpression__ParamsAssignment_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10915:1: ( ( ruleUnaryOrInfixExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10916:1: ( ruleUnaryOrInfixExpression )
+            // InternalExport.g:10915:1: ( ( ruleUnaryOrInfixExpression ) )
+            // InternalExport.g:10916:1: ( ruleUnaryOrInfixExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10916:1: ( ruleUnaryOrInfixExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10917:1: ruleUnaryOrInfixExpression
+            // InternalExport.g:10916:1: ( ruleUnaryOrInfixExpression )
+            // InternalExport.g:10917:1: ruleUnaryOrInfixExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMultiplicativeExpressionAccess().getParamsUnaryOrInfixExpressionParserRuleCall_1_2_0()); 
             }
-            pushFollow(FOLLOW_ruleUnaryOrInfixExpression_in_rule__MultiplicativeExpression__ParamsAssignment_1_221964);
+            pushFollow(FOLLOW_2);
             ruleUnaryOrInfixExpression();
 
             state._fsp--;
@@ -30973,25 +30973,25 @@ public final void rule__MultiplicativeExpression__ParamsAssignment_1_2() throws
 
 
     // $ANTLR start "rule__UnaryExpression__NameAssignment_0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10926:1: rule__UnaryExpression__NameAssignment_0 : ( ( rule__UnaryExpression__NameAlternatives_0_0 ) ) ;
+    // InternalExport.g:10926:1: rule__UnaryExpression__NameAssignment_0 : ( ( rule__UnaryExpression__NameAlternatives_0_0 ) ) ;
     public final void rule__UnaryExpression__NameAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10930:1: ( ( ( rule__UnaryExpression__NameAlternatives_0_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10931:1: ( ( rule__UnaryExpression__NameAlternatives_0_0 ) )
+            // InternalExport.g:10930:1: ( ( ( rule__UnaryExpression__NameAlternatives_0_0 ) ) )
+            // InternalExport.g:10931:1: ( ( rule__UnaryExpression__NameAlternatives_0_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10931:1: ( ( rule__UnaryExpression__NameAlternatives_0_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10932:1: ( rule__UnaryExpression__NameAlternatives_0_0 )
+            // InternalExport.g:10931:1: ( ( rule__UnaryExpression__NameAlternatives_0_0 ) )
+            // InternalExport.g:10932:1: ( rule__UnaryExpression__NameAlternatives_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getUnaryExpressionAccess().getNameAlternatives_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10933:1: ( rule__UnaryExpression__NameAlternatives_0_0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10933:2: rule__UnaryExpression__NameAlternatives_0_0
+            // InternalExport.g:10933:1: ( rule__UnaryExpression__NameAlternatives_0_0 )
+            // InternalExport.g:10933:2: rule__UnaryExpression__NameAlternatives_0_0
             {
-            pushFollow(FOLLOW_rule__UnaryExpression__NameAlternatives_0_0_in_rule__UnaryExpression__NameAssignment_021995);
+            pushFollow(FOLLOW_2);
             rule__UnaryExpression__NameAlternatives_0_0();
 
             state._fsp--;
@@ -31024,22 +31024,22 @@ public final void rule__UnaryExpression__NameAssignment_0() throws RecognitionEx
 
 
     // $ANTLR start "rule__UnaryExpression__ParamsAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10942:1: rule__UnaryExpression__ParamsAssignment_1 : ( ruleInfixExpression ) ;
+    // InternalExport.g:10942:1: rule__UnaryExpression__ParamsAssignment_1 : ( ruleInfixExpression ) ;
     public final void rule__UnaryExpression__ParamsAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10946:1: ( ( ruleInfixExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10947:1: ( ruleInfixExpression )
+            // InternalExport.g:10946:1: ( ( ruleInfixExpression ) )
+            // InternalExport.g:10947:1: ( ruleInfixExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10947:1: ( ruleInfixExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10948:1: ruleInfixExpression
+            // InternalExport.g:10947:1: ( ruleInfixExpression )
+            // InternalExport.g:10948:1: ruleInfixExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getUnaryExpressionAccess().getParamsInfixExpressionParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleInfixExpression_in_rule__UnaryExpression__ParamsAssignment_122028);
+            pushFollow(FOLLOW_2);
             ruleInfixExpression();
 
             state._fsp--;
@@ -31069,22 +31069,22 @@ public final void rule__UnaryExpression__ParamsAssignment_1() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__NameAssignment_1_0_2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10957:1: rule__InfixExpression__NameAssignment_1_0_2 : ( ruleIdentifier ) ;
+    // InternalExport.g:10957:1: rule__InfixExpression__NameAssignment_1_0_2 : ( ruleIdentifier ) ;
     public final void rule__InfixExpression__NameAssignment_1_0_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10961:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10962:1: ( ruleIdentifier )
+            // InternalExport.g:10961:1: ( ( ruleIdentifier ) )
+            // InternalExport.g:10962:1: ( ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10962:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10963:1: ruleIdentifier
+            // InternalExport.g:10962:1: ( ruleIdentifier )
+            // InternalExport.g:10963:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getNameIdentifierParserRuleCall_1_0_2_0()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__InfixExpression__NameAssignment_1_0_222059);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -31114,22 +31114,22 @@ public final void rule__InfixExpression__NameAssignment_1_0_2() throws Recogniti
 
 
     // $ANTLR start "rule__InfixExpression__ParamsAssignment_1_0_4_0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10972:1: rule__InfixExpression__ParamsAssignment_1_0_4_0 : ( ruleExpression ) ;
+    // InternalExport.g:10972:1: rule__InfixExpression__ParamsAssignment_1_0_4_0 : ( ruleExpression ) ;
     public final void rule__InfixExpression__ParamsAssignment_1_0_4_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10976:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10977:1: ( ruleExpression )
+            // InternalExport.g:10976:1: ( ( ruleExpression ) )
+            // InternalExport.g:10977:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10977:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10978:1: ruleExpression
+            // InternalExport.g:10977:1: ( ruleExpression )
+            // InternalExport.g:10978:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getParamsExpressionParserRuleCall_1_0_4_0_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__InfixExpression__ParamsAssignment_1_0_4_022090);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -31159,22 +31159,22 @@ public final void rule__InfixExpression__ParamsAssignment_1_0_4_0() throws Recog
 
 
     // $ANTLR start "rule__InfixExpression__ParamsAssignment_1_0_4_1_1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10987:1: rule__InfixExpression__ParamsAssignment_1_0_4_1_1 : ( ruleExpression ) ;
+    // InternalExport.g:10987:1: rule__InfixExpression__ParamsAssignment_1_0_4_1_1 : ( ruleExpression ) ;
     public final void rule__InfixExpression__ParamsAssignment_1_0_4_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10991:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10992:1: ( ruleExpression )
+            // InternalExport.g:10991:1: ( ( ruleExpression ) )
+            // InternalExport.g:10992:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10992:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:10993:1: ruleExpression
+            // InternalExport.g:10992:1: ( ruleExpression )
+            // InternalExport.g:10993:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getParamsExpressionParserRuleCall_1_0_4_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__InfixExpression__ParamsAssignment_1_0_4_1_122121);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -31204,22 +31204,22 @@ public final void rule__InfixExpression__ParamsAssignment_1_0_4_1_1() throws Rec
 
 
     // $ANTLR start "rule__InfixExpression__TypeAssignment_1_1_2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11002:1: rule__InfixExpression__TypeAssignment_1_1_2 : ( ruleType ) ;
+    // InternalExport.g:11002:1: rule__InfixExpression__TypeAssignment_1_1_2 : ( ruleType ) ;
     public final void rule__InfixExpression__TypeAssignment_1_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11006:1: ( ( ruleType ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11007:1: ( ruleType )
+            // InternalExport.g:11006:1: ( ( ruleType ) )
+            // InternalExport.g:11007:1: ( ruleType )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11007:1: ( ruleType )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11008:1: ruleType
+            // InternalExport.g:11007:1: ( ruleType )
+            // InternalExport.g:11008:1: ruleType
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getTypeTypeParserRuleCall_1_1_2_0()); 
             }
-            pushFollow(FOLLOW_ruleType_in_rule__InfixExpression__TypeAssignment_1_1_222152);
+            pushFollow(FOLLOW_2);
             ruleType();
 
             state._fsp--;
@@ -31249,28 +31249,28 @@ public final void rule__InfixExpression__TypeAssignment_1_1_2() throws Recogniti
 
 
     // $ANTLR start "rule__InfixExpression__NameAssignment_1_2_2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11017:1: rule__InfixExpression__NameAssignment_1_2_2 : ( ( 'typeSelect' ) ) ;
+    // InternalExport.g:11017:1: rule__InfixExpression__NameAssignment_1_2_2 : ( ( 'typeSelect' ) ) ;
     public final void rule__InfixExpression__NameAssignment_1_2_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11021:1: ( ( ( 'typeSelect' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11022:1: ( ( 'typeSelect' ) )
+            // InternalExport.g:11021:1: ( ( ( 'typeSelect' ) ) )
+            // InternalExport.g:11022:1: ( ( 'typeSelect' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11022:1: ( ( 'typeSelect' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11023:1: ( 'typeSelect' )
+            // InternalExport.g:11022:1: ( ( 'typeSelect' ) )
+            // InternalExport.g:11023:1: ( 'typeSelect' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getNameTypeSelectKeyword_1_2_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11024:1: ( 'typeSelect' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11025:1: 'typeSelect'
+            // InternalExport.g:11024:1: ( 'typeSelect' )
+            // InternalExport.g:11025:1: 'typeSelect'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getNameTypeSelectKeyword_1_2_2_0()); 
             }
-            match(input,80,FOLLOW_80_in_rule__InfixExpression__NameAssignment_1_2_222188); if (state.failed) return ;
+            match(input,80,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInfixExpressionAccess().getNameTypeSelectKeyword_1_2_2_0()); 
             }
@@ -31302,22 +31302,22 @@ public final void rule__InfixExpression__NameAssignment_1_2_2() throws Recogniti
 
 
     // $ANTLR start "rule__InfixExpression__TypeAssignment_1_2_4"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11040:1: rule__InfixExpression__TypeAssignment_1_2_4 : ( ruleType ) ;
+    // InternalExport.g:11040:1: rule__InfixExpression__TypeAssignment_1_2_4 : ( ruleType ) ;
     public final void rule__InfixExpression__TypeAssignment_1_2_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11044:1: ( ( ruleType ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11045:1: ( ruleType )
+            // InternalExport.g:11044:1: ( ( ruleType ) )
+            // InternalExport.g:11045:1: ( ruleType )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11045:1: ( ruleType )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11046:1: ruleType
+            // InternalExport.g:11045:1: ( ruleType )
+            // InternalExport.g:11046:1: ruleType
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getTypeTypeParserRuleCall_1_2_4_0()); 
             }
-            pushFollow(FOLLOW_ruleType_in_rule__InfixExpression__TypeAssignment_1_2_422227);
+            pushFollow(FOLLOW_2);
             ruleType();
 
             state._fsp--;
@@ -31347,25 +31347,25 @@ public final void rule__InfixExpression__TypeAssignment_1_2_4() throws Recogniti
 
 
     // $ANTLR start "rule__InfixExpression__NameAssignment_1_3_2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11055:1: rule__InfixExpression__NameAssignment_1_3_2 : ( ( rule__InfixExpression__NameAlternatives_1_3_2_0 ) ) ;
+    // InternalExport.g:11055:1: rule__InfixExpression__NameAssignment_1_3_2 : ( ( rule__InfixExpression__NameAlternatives_1_3_2_0 ) ) ;
     public final void rule__InfixExpression__NameAssignment_1_3_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11059:1: ( ( ( rule__InfixExpression__NameAlternatives_1_3_2_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11060:1: ( ( rule__InfixExpression__NameAlternatives_1_3_2_0 ) )
+            // InternalExport.g:11059:1: ( ( ( rule__InfixExpression__NameAlternatives_1_3_2_0 ) ) )
+            // InternalExport.g:11060:1: ( ( rule__InfixExpression__NameAlternatives_1_3_2_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11060:1: ( ( rule__InfixExpression__NameAlternatives_1_3_2_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11061:1: ( rule__InfixExpression__NameAlternatives_1_3_2_0 )
+            // InternalExport.g:11060:1: ( ( rule__InfixExpression__NameAlternatives_1_3_2_0 ) )
+            // InternalExport.g:11061:1: ( rule__InfixExpression__NameAlternatives_1_3_2_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getNameAlternatives_1_3_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11062:1: ( rule__InfixExpression__NameAlternatives_1_3_2_0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11062:2: rule__InfixExpression__NameAlternatives_1_3_2_0
+            // InternalExport.g:11062:1: ( rule__InfixExpression__NameAlternatives_1_3_2_0 )
+            // InternalExport.g:11062:2: rule__InfixExpression__NameAlternatives_1_3_2_0
             {
-            pushFollow(FOLLOW_rule__InfixExpression__NameAlternatives_1_3_2_0_in_rule__InfixExpression__NameAssignment_1_3_222258);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__NameAlternatives_1_3_2_0();
 
             state._fsp--;
@@ -31398,22 +31398,22 @@ public final void rule__InfixExpression__NameAssignment_1_3_2() throws Recogniti
 
 
     // $ANTLR start "rule__InfixExpression__VarAssignment_1_3_4_0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11071:1: rule__InfixExpression__VarAssignment_1_3_4_0 : ( ruleIdentifier ) ;
+    // InternalExport.g:11071:1: rule__InfixExpression__VarAssignment_1_3_4_0 : ( ruleIdentifier ) ;
     public final void rule__InfixExpression__VarAssignment_1_3_4_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11075:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11076:1: ( ruleIdentifier )
+            // InternalExport.g:11075:1: ( ( ruleIdentifier ) )
+            // InternalExport.g:11076:1: ( ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11076:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11077:1: ruleIdentifier
+            // InternalExport.g:11076:1: ( ruleIdentifier )
+            // InternalExport.g:11077:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getVarIdentifierParserRuleCall_1_3_4_0_0()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__InfixExpression__VarAssignment_1_3_4_022291);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -31443,22 +31443,22 @@ public final void rule__InfixExpression__VarAssignment_1_3_4_0() throws Recognit
 
 
     // $ANTLR start "rule__InfixExpression__ExpAssignment_1_3_5"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11086:1: rule__InfixExpression__ExpAssignment_1_3_5 : ( ruleExpression ) ;
+    // InternalExport.g:11086:1: rule__InfixExpression__ExpAssignment_1_3_5 : ( ruleExpression ) ;
     public final void rule__InfixExpression__ExpAssignment_1_3_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11090:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11091:1: ( ruleExpression )
+            // InternalExport.g:11090:1: ( ( ruleExpression ) )
+            // InternalExport.g:11091:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11091:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11092:1: ruleExpression
+            // InternalExport.g:11091:1: ( ruleExpression )
+            // InternalExport.g:11092:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getExpExpressionParserRuleCall_1_3_5_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__InfixExpression__ExpAssignment_1_3_522322);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -31488,25 +31488,25 @@ public final void rule__InfixExpression__ExpAssignment_1_3_5() throws Recognitio
 
 
     // $ANTLR start "rule__BooleanLiteral__ValAssignment"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11101:1: rule__BooleanLiteral__ValAssignment : ( ( rule__BooleanLiteral__ValAlternatives_0 ) ) ;
+    // InternalExport.g:11101:1: rule__BooleanLiteral__ValAssignment : ( ( rule__BooleanLiteral__ValAlternatives_0 ) ) ;
     public final void rule__BooleanLiteral__ValAssignment() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11105:1: ( ( ( rule__BooleanLiteral__ValAlternatives_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11106:1: ( ( rule__BooleanLiteral__ValAlternatives_0 ) )
+            // InternalExport.g:11105:1: ( ( ( rule__BooleanLiteral__ValAlternatives_0 ) ) )
+            // InternalExport.g:11106:1: ( ( rule__BooleanLiteral__ValAlternatives_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11106:1: ( ( rule__BooleanLiteral__ValAlternatives_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11107:1: ( rule__BooleanLiteral__ValAlternatives_0 )
+            // InternalExport.g:11106:1: ( ( rule__BooleanLiteral__ValAlternatives_0 ) )
+            // InternalExport.g:11107:1: ( rule__BooleanLiteral__ValAlternatives_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getBooleanLiteralAccess().getValAlternatives_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11108:1: ( rule__BooleanLiteral__ValAlternatives_0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11108:2: rule__BooleanLiteral__ValAlternatives_0
+            // InternalExport.g:11108:1: ( rule__BooleanLiteral__ValAlternatives_0 )
+            // InternalExport.g:11108:2: rule__BooleanLiteral__ValAlternatives_0
             {
-            pushFollow(FOLLOW_rule__BooleanLiteral__ValAlternatives_0_in_rule__BooleanLiteral__ValAssignment22353);
+            pushFollow(FOLLOW_2);
             rule__BooleanLiteral__ValAlternatives_0();
 
             state._fsp--;
@@ -31539,22 +31539,22 @@ public final void rule__BooleanLiteral__ValAssignment() throws RecognitionExcept
 
 
     // $ANTLR start "rule__IntegerLiteral__ValAssignment"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11117:1: rule__IntegerLiteral__ValAssignment : ( RULE_INT ) ;
+    // InternalExport.g:11117:1: rule__IntegerLiteral__ValAssignment : ( RULE_INT ) ;
     public final void rule__IntegerLiteral__ValAssignment() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11121:1: ( ( RULE_INT ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11122:1: ( RULE_INT )
+            // InternalExport.g:11121:1: ( ( RULE_INT ) )
+            // InternalExport.g:11122:1: ( RULE_INT )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11122:1: ( RULE_INT )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11123:1: RULE_INT
+            // InternalExport.g:11122:1: ( RULE_INT )
+            // InternalExport.g:11123:1: RULE_INT
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIntegerLiteralAccess().getValINTTerminalRuleCall_0()); 
             }
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__IntegerLiteral__ValAssignment22386); if (state.failed) return ;
+            match(input,RULE_INT,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIntegerLiteralAccess().getValINTTerminalRuleCall_0()); 
             }
@@ -31580,28 +31580,28 @@ public final void rule__IntegerLiteral__ValAssignment() throws RecognitionExcept
 
 
     // $ANTLR start "rule__NullLiteral__ValAssignment"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11132:1: rule__NullLiteral__ValAssignment : ( ( 'null' ) ) ;
+    // InternalExport.g:11132:1: rule__NullLiteral__ValAssignment : ( ( 'null' ) ) ;
     public final void rule__NullLiteral__ValAssignment() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11136:1: ( ( ( 'null' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11137:1: ( ( 'null' ) )
+            // InternalExport.g:11136:1: ( ( ( 'null' ) ) )
+            // InternalExport.g:11137:1: ( ( 'null' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11137:1: ( ( 'null' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11138:1: ( 'null' )
+            // InternalExport.g:11137:1: ( ( 'null' ) )
+            // InternalExport.g:11138:1: ( 'null' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNullLiteralAccess().getValNullKeyword_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11139:1: ( 'null' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11140:1: 'null'
+            // InternalExport.g:11139:1: ( 'null' )
+            // InternalExport.g:11140:1: 'null'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNullLiteralAccess().getValNullKeyword_0()); 
             }
-            match(input,81,FOLLOW_81_in_rule__NullLiteral__ValAssignment22422); if (state.failed) return ;
+            match(input,81,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getNullLiteralAccess().getValNullKeyword_0()); 
             }
@@ -31633,22 +31633,22 @@ public final void rule__NullLiteral__ValAssignment() throws RecognitionException
 
 
     // $ANTLR start "rule__RealLiteral__ValAssignment"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11155:1: rule__RealLiteral__ValAssignment : ( RULE_REAL ) ;
+    // InternalExport.g:11155:1: rule__RealLiteral__ValAssignment : ( RULE_REAL ) ;
     public final void rule__RealLiteral__ValAssignment() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11159:1: ( ( RULE_REAL ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11160:1: ( RULE_REAL )
+            // InternalExport.g:11159:1: ( ( RULE_REAL ) )
+            // InternalExport.g:11160:1: ( RULE_REAL )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11160:1: ( RULE_REAL )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11161:1: RULE_REAL
+            // InternalExport.g:11160:1: ( RULE_REAL )
+            // InternalExport.g:11161:1: RULE_REAL
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRealLiteralAccess().getValREALTerminalRuleCall_0()); 
             }
-            match(input,RULE_REAL,FOLLOW_RULE_REAL_in_rule__RealLiteral__ValAssignment22461); if (state.failed) return ;
+            match(input,RULE_REAL,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getRealLiteralAccess().getValREALTerminalRuleCall_0()); 
             }
@@ -31674,22 +31674,22 @@ public final void rule__RealLiteral__ValAssignment() throws RecognitionException
 
 
     // $ANTLR start "rule__StringLiteral__ValAssignment"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11170:1: rule__StringLiteral__ValAssignment : ( RULE_STRING ) ;
+    // InternalExport.g:11170:1: rule__StringLiteral__ValAssignment : ( RULE_STRING ) ;
     public final void rule__StringLiteral__ValAssignment() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11174:1: ( ( RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11175:1: ( RULE_STRING )
+            // InternalExport.g:11174:1: ( ( RULE_STRING ) )
+            // InternalExport.g:11175:1: ( RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11175:1: ( RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11176:1: RULE_STRING
+            // InternalExport.g:11175:1: ( RULE_STRING )
+            // InternalExport.g:11176:1: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getStringLiteralAccess().getValSTRINGTerminalRuleCall_0()); 
             }
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__StringLiteral__ValAssignment22492); if (state.failed) return ;
+            match(input,RULE_STRING,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getStringLiteralAccess().getValSTRINGTerminalRuleCall_0()); 
             }
@@ -31715,22 +31715,22 @@ public final void rule__StringLiteral__ValAssignment() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__GlobalVarExpression__NameAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11185:1: rule__GlobalVarExpression__NameAssignment_1 : ( ruleIdentifier ) ;
+    // InternalExport.g:11185:1: rule__GlobalVarExpression__NameAssignment_1 : ( ruleIdentifier ) ;
     public final void rule__GlobalVarExpression__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11189:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11190:1: ( ruleIdentifier )
+            // InternalExport.g:11189:1: ( ( ruleIdentifier ) )
+            // InternalExport.g:11190:1: ( ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11190:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11191:1: ruleIdentifier
+            // InternalExport.g:11190:1: ( ruleIdentifier )
+            // InternalExport.g:11191:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalVarExpressionAccess().getNameIdentifierParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__GlobalVarExpression__NameAssignment_122523);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -31760,22 +31760,22 @@ public final void rule__GlobalVarExpression__NameAssignment_1() throws Recogniti
 
 
     // $ANTLR start "rule__FeatureCall__TypeAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11200:1: rule__FeatureCall__TypeAssignment_1 : ( ruleType ) ;
+    // InternalExport.g:11200:1: rule__FeatureCall__TypeAssignment_1 : ( ruleType ) ;
     public final void rule__FeatureCall__TypeAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11204:1: ( ( ruleType ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11205:1: ( ruleType )
+            // InternalExport.g:11204:1: ( ( ruleType ) )
+            // InternalExport.g:11205:1: ( ruleType )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11205:1: ( ruleType )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11206:1: ruleType
+            // InternalExport.g:11205:1: ( ruleType )
+            // InternalExport.g:11206:1: ruleType
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFeatureCallAccess().getTypeTypeParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleType_in_rule__FeatureCall__TypeAssignment_122554);
+            pushFollow(FOLLOW_2);
             ruleType();
 
             state._fsp--;
@@ -31805,22 +31805,22 @@ public final void rule__FeatureCall__TypeAssignment_1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__OperationCall__NameAssignment_0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11215:1: rule__OperationCall__NameAssignment_0 : ( ruleIdentifier ) ;
+    // InternalExport.g:11215:1: rule__OperationCall__NameAssignment_0 : ( ruleIdentifier ) ;
     public final void rule__OperationCall__NameAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11219:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11220:1: ( ruleIdentifier )
+            // InternalExport.g:11219:1: ( ( ruleIdentifier ) )
+            // InternalExport.g:11220:1: ( ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11220:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11221:1: ruleIdentifier
+            // InternalExport.g:11220:1: ( ruleIdentifier )
+            // InternalExport.g:11221:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOperationCallAccess().getNameIdentifierParserRuleCall_0_0()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__OperationCall__NameAssignment_022585);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -31850,22 +31850,22 @@ public final void rule__OperationCall__NameAssignment_0() throws RecognitionExce
 
 
     // $ANTLR start "rule__OperationCall__ParamsAssignment_2_0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11230:1: rule__OperationCall__ParamsAssignment_2_0 : ( ruleExpression ) ;
+    // InternalExport.g:11230:1: rule__OperationCall__ParamsAssignment_2_0 : ( ruleExpression ) ;
     public final void rule__OperationCall__ParamsAssignment_2_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11234:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11235:1: ( ruleExpression )
+            // InternalExport.g:11234:1: ( ( ruleExpression ) )
+            // InternalExport.g:11235:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11235:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11236:1: ruleExpression
+            // InternalExport.g:11235:1: ( ruleExpression )
+            // InternalExport.g:11236:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOperationCallAccess().getParamsExpressionParserRuleCall_2_0_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__OperationCall__ParamsAssignment_2_022616);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -31895,22 +31895,22 @@ public final void rule__OperationCall__ParamsAssignment_2_0() throws Recognition
 
 
     // $ANTLR start "rule__OperationCall__ParamsAssignment_2_1_1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11245:1: rule__OperationCall__ParamsAssignment_2_1_1 : ( ruleExpression ) ;
+    // InternalExport.g:11245:1: rule__OperationCall__ParamsAssignment_2_1_1 : ( ruleExpression ) ;
     public final void rule__OperationCall__ParamsAssignment_2_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11249:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11250:1: ( ruleExpression )
+            // InternalExport.g:11249:1: ( ( ruleExpression ) )
+            // InternalExport.g:11250:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11250:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11251:1: ruleExpression
+            // InternalExport.g:11250:1: ( ruleExpression )
+            // InternalExport.g:11251:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOperationCallAccess().getParamsExpressionParserRuleCall_2_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__OperationCall__ParamsAssignment_2_1_122647);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -31940,22 +31940,22 @@ public final void rule__OperationCall__ParamsAssignment_2_1_1() throws Recogniti
 
 
     // $ANTLR start "rule__ListLiteral__ElementsAssignment_2_0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11260:1: rule__ListLiteral__ElementsAssignment_2_0 : ( ruleExpression ) ;
+    // InternalExport.g:11260:1: rule__ListLiteral__ElementsAssignment_2_0 : ( ruleExpression ) ;
     public final void rule__ListLiteral__ElementsAssignment_2_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11264:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11265:1: ( ruleExpression )
+            // InternalExport.g:11264:1: ( ( ruleExpression ) )
+            // InternalExport.g:11265:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11265:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11266:1: ruleExpression
+            // InternalExport.g:11265:1: ( ruleExpression )
+            // InternalExport.g:11266:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getListLiteralAccess().getElementsExpressionParserRuleCall_2_0_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__ListLiteral__ElementsAssignment_2_022678);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -31985,22 +31985,22 @@ public final void rule__ListLiteral__ElementsAssignment_2_0() throws Recognition
 
 
     // $ANTLR start "rule__ListLiteral__ElementsAssignment_2_1_1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11275:1: rule__ListLiteral__ElementsAssignment_2_1_1 : ( ruleExpression ) ;
+    // InternalExport.g:11275:1: rule__ListLiteral__ElementsAssignment_2_1_1 : ( ruleExpression ) ;
     public final void rule__ListLiteral__ElementsAssignment_2_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11279:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11280:1: ( ruleExpression )
+            // InternalExport.g:11279:1: ( ( ruleExpression ) )
+            // InternalExport.g:11280:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11280:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11281:1: ruleExpression
+            // InternalExport.g:11280:1: ( ruleExpression )
+            // InternalExport.g:11281:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getListLiteralAccess().getElementsExpressionParserRuleCall_2_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__ListLiteral__ElementsAssignment_2_1_122709);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -32030,22 +32030,22 @@ public final void rule__ListLiteral__ElementsAssignment_2_1_1() throws Recogniti
 
 
     // $ANTLR start "rule__ConstructorCallExpression__TypeAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11290:1: rule__ConstructorCallExpression__TypeAssignment_1 : ( ruleSimpleType ) ;
+    // InternalExport.g:11290:1: rule__ConstructorCallExpression__TypeAssignment_1 : ( ruleSimpleType ) ;
     public final void rule__ConstructorCallExpression__TypeAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11294:1: ( ( ruleSimpleType ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11295:1: ( ruleSimpleType )
+            // InternalExport.g:11294:1: ( ( ruleSimpleType ) )
+            // InternalExport.g:11295:1: ( ruleSimpleType )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11295:1: ( ruleSimpleType )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11296:1: ruleSimpleType
+            // InternalExport.g:11295:1: ( ruleSimpleType )
+            // InternalExport.g:11296:1: ruleSimpleType
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConstructorCallExpressionAccess().getTypeSimpleTypeParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleSimpleType_in_rule__ConstructorCallExpression__TypeAssignment_122740);
+            pushFollow(FOLLOW_2);
             ruleSimpleType();
 
             state._fsp--;
@@ -32075,28 +32075,28 @@ public final void rule__ConstructorCallExpression__TypeAssignment_1() throws Rec
 
 
     // $ANTLR start "rule__TypeSelectExpression__NameAssignment_0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11305:1: rule__TypeSelectExpression__NameAssignment_0 : ( ( 'typeSelect' ) ) ;
+    // InternalExport.g:11305:1: rule__TypeSelectExpression__NameAssignment_0 : ( ( 'typeSelect' ) ) ;
     public final void rule__TypeSelectExpression__NameAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11309:1: ( ( ( 'typeSelect' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11310:1: ( ( 'typeSelect' ) )
+            // InternalExport.g:11309:1: ( ( ( 'typeSelect' ) ) )
+            // InternalExport.g:11310:1: ( ( 'typeSelect' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11310:1: ( ( 'typeSelect' ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11311:1: ( 'typeSelect' )
+            // InternalExport.g:11310:1: ( ( 'typeSelect' ) )
+            // InternalExport.g:11311:1: ( 'typeSelect' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTypeSelectExpressionAccess().getNameTypeSelectKeyword_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11312:1: ( 'typeSelect' )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11313:1: 'typeSelect'
+            // InternalExport.g:11312:1: ( 'typeSelect' )
+            // InternalExport.g:11313:1: 'typeSelect'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTypeSelectExpressionAccess().getNameTypeSelectKeyword_0_0()); 
             }
-            match(input,80,FOLLOW_80_in_rule__TypeSelectExpression__NameAssignment_022776); if (state.failed) return ;
+            match(input,80,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getTypeSelectExpressionAccess().getNameTypeSelectKeyword_0_0()); 
             }
@@ -32128,22 +32128,22 @@ public final void rule__TypeSelectExpression__NameAssignment_0() throws Recognit
 
 
     // $ANTLR start "rule__TypeSelectExpression__TypeAssignment_2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11328:1: rule__TypeSelectExpression__TypeAssignment_2 : ( ruleType ) ;
+    // InternalExport.g:11328:1: rule__TypeSelectExpression__TypeAssignment_2 : ( ruleType ) ;
     public final void rule__TypeSelectExpression__TypeAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11332:1: ( ( ruleType ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11333:1: ( ruleType )
+            // InternalExport.g:11332:1: ( ( ruleType ) )
+            // InternalExport.g:11333:1: ( ruleType )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11333:1: ( ruleType )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11334:1: ruleType
+            // InternalExport.g:11333:1: ( ruleType )
+            // InternalExport.g:11334:1: ruleType
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTypeSelectExpressionAccess().getTypeTypeParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleType_in_rule__TypeSelectExpression__TypeAssignment_222815);
+            pushFollow(FOLLOW_2);
             ruleType();
 
             state._fsp--;
@@ -32173,25 +32173,25 @@ public final void rule__TypeSelectExpression__TypeAssignment_2() throws Recognit
 
 
     // $ANTLR start "rule__CollectionExpression__NameAssignment_0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11343:1: rule__CollectionExpression__NameAssignment_0 : ( ( rule__CollectionExpression__NameAlternatives_0_0 ) ) ;
+    // InternalExport.g:11343:1: rule__CollectionExpression__NameAssignment_0 : ( ( rule__CollectionExpression__NameAlternatives_0_0 ) ) ;
     public final void rule__CollectionExpression__NameAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11347:1: ( ( ( rule__CollectionExpression__NameAlternatives_0_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11348:1: ( ( rule__CollectionExpression__NameAlternatives_0_0 ) )
+            // InternalExport.g:11347:1: ( ( ( rule__CollectionExpression__NameAlternatives_0_0 ) ) )
+            // InternalExport.g:11348:1: ( ( rule__CollectionExpression__NameAlternatives_0_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11348:1: ( ( rule__CollectionExpression__NameAlternatives_0_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11349:1: ( rule__CollectionExpression__NameAlternatives_0_0 )
+            // InternalExport.g:11348:1: ( ( rule__CollectionExpression__NameAlternatives_0_0 ) )
+            // InternalExport.g:11349:1: ( rule__CollectionExpression__NameAlternatives_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionExpressionAccess().getNameAlternatives_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11350:1: ( rule__CollectionExpression__NameAlternatives_0_0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11350:2: rule__CollectionExpression__NameAlternatives_0_0
+            // InternalExport.g:11350:1: ( rule__CollectionExpression__NameAlternatives_0_0 )
+            // InternalExport.g:11350:2: rule__CollectionExpression__NameAlternatives_0_0
             {
-            pushFollow(FOLLOW_rule__CollectionExpression__NameAlternatives_0_0_in_rule__CollectionExpression__NameAssignment_022846);
+            pushFollow(FOLLOW_2);
             rule__CollectionExpression__NameAlternatives_0_0();
 
             state._fsp--;
@@ -32224,22 +32224,22 @@ public final void rule__CollectionExpression__NameAssignment_0() throws Recognit
 
 
     // $ANTLR start "rule__CollectionExpression__VarAssignment_2_0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11359:1: rule__CollectionExpression__VarAssignment_2_0 : ( ruleIdentifier ) ;
+    // InternalExport.g:11359:1: rule__CollectionExpression__VarAssignment_2_0 : ( ruleIdentifier ) ;
     public final void rule__CollectionExpression__VarAssignment_2_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11363:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11364:1: ( ruleIdentifier )
+            // InternalExport.g:11363:1: ( ( ruleIdentifier ) )
+            // InternalExport.g:11364:1: ( ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11364:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11365:1: ruleIdentifier
+            // InternalExport.g:11364:1: ( ruleIdentifier )
+            // InternalExport.g:11365:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionExpressionAccess().getVarIdentifierParserRuleCall_2_0_0()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__CollectionExpression__VarAssignment_2_022879);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -32269,22 +32269,22 @@ public final void rule__CollectionExpression__VarAssignment_2_0() throws Recogni
 
 
     // $ANTLR start "rule__CollectionExpression__ExpAssignment_3"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11374:1: rule__CollectionExpression__ExpAssignment_3 : ( ruleExpression ) ;
+    // InternalExport.g:11374:1: rule__CollectionExpression__ExpAssignment_3 : ( ruleExpression ) ;
     public final void rule__CollectionExpression__ExpAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11378:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11379:1: ( ruleExpression )
+            // InternalExport.g:11378:1: ( ( ruleExpression ) )
+            // InternalExport.g:11379:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11379:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11380:1: ruleExpression
+            // InternalExport.g:11379:1: ( ruleExpression )
+            // InternalExport.g:11380:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionExpressionAccess().getExpExpressionParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__CollectionExpression__ExpAssignment_322910);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -32314,25 +32314,25 @@ public final void rule__CollectionExpression__ExpAssignment_3() throws Recogniti
 
 
     // $ANTLR start "rule__CollectionType__ClAssignment_0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11389:1: rule__CollectionType__ClAssignment_0 : ( ( rule__CollectionType__ClAlternatives_0_0 ) ) ;
+    // InternalExport.g:11389:1: rule__CollectionType__ClAssignment_0 : ( ( rule__CollectionType__ClAlternatives_0_0 ) ) ;
     public final void rule__CollectionType__ClAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11393:1: ( ( ( rule__CollectionType__ClAlternatives_0_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11394:1: ( ( rule__CollectionType__ClAlternatives_0_0 ) )
+            // InternalExport.g:11393:1: ( ( ( rule__CollectionType__ClAlternatives_0_0 ) ) )
+            // InternalExport.g:11394:1: ( ( rule__CollectionType__ClAlternatives_0_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11394:1: ( ( rule__CollectionType__ClAlternatives_0_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11395:1: ( rule__CollectionType__ClAlternatives_0_0 )
+            // InternalExport.g:11394:1: ( ( rule__CollectionType__ClAlternatives_0_0 ) )
+            // InternalExport.g:11395:1: ( rule__CollectionType__ClAlternatives_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionTypeAccess().getClAlternatives_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11396:1: ( rule__CollectionType__ClAlternatives_0_0 )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11396:2: rule__CollectionType__ClAlternatives_0_0
+            // InternalExport.g:11396:1: ( rule__CollectionType__ClAlternatives_0_0 )
+            // InternalExport.g:11396:2: rule__CollectionType__ClAlternatives_0_0
             {
-            pushFollow(FOLLOW_rule__CollectionType__ClAlternatives_0_0_in_rule__CollectionType__ClAssignment_022941);
+            pushFollow(FOLLOW_2);
             rule__CollectionType__ClAlternatives_0_0();
 
             state._fsp--;
@@ -32365,22 +32365,22 @@ public final void rule__CollectionType__ClAssignment_0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__CollectionType__Id1Assignment_2"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11405:1: rule__CollectionType__Id1Assignment_2 : ( ruleSimpleType ) ;
+    // InternalExport.g:11405:1: rule__CollectionType__Id1Assignment_2 : ( ruleSimpleType ) ;
     public final void rule__CollectionType__Id1Assignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11409:1: ( ( ruleSimpleType ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11410:1: ( ruleSimpleType )
+            // InternalExport.g:11409:1: ( ( ruleSimpleType ) )
+            // InternalExport.g:11410:1: ( ruleSimpleType )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11410:1: ( ruleSimpleType )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11411:1: ruleSimpleType
+            // InternalExport.g:11410:1: ( ruleSimpleType )
+            // InternalExport.g:11411:1: ruleSimpleType
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionTypeAccess().getId1SimpleTypeParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleSimpleType_in_rule__CollectionType__Id1Assignment_222974);
+            pushFollow(FOLLOW_2);
             ruleSimpleType();
 
             state._fsp--;
@@ -32410,22 +32410,22 @@ public final void rule__CollectionType__Id1Assignment_2() throws RecognitionExce
 
 
     // $ANTLR start "rule__SimpleType__IdAssignment_0"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11420:1: rule__SimpleType__IdAssignment_0 : ( ruleIdentifier ) ;
+    // InternalExport.g:11420:1: rule__SimpleType__IdAssignment_0 : ( ruleIdentifier ) ;
     public final void rule__SimpleType__IdAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11424:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11425:1: ( ruleIdentifier )
+            // InternalExport.g:11424:1: ( ( ruleIdentifier ) )
+            // InternalExport.g:11425:1: ( ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11425:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11426:1: ruleIdentifier
+            // InternalExport.g:11425:1: ( ruleIdentifier )
+            // InternalExport.g:11426:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSimpleTypeAccess().getIdIdentifierParserRuleCall_0_0()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__SimpleType__IdAssignment_023005);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -32455,22 +32455,22 @@ public final void rule__SimpleType__IdAssignment_0() throws RecognitionException
 
 
     // $ANTLR start "rule__SimpleType__IdAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11435:1: rule__SimpleType__IdAssignment_1_1 : ( ruleIdentifier ) ;
+    // InternalExport.g:11435:1: rule__SimpleType__IdAssignment_1_1 : ( ruleIdentifier ) ;
     public final void rule__SimpleType__IdAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11439:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11440:1: ( ruleIdentifier )
+            // InternalExport.g:11439:1: ( ( ruleIdentifier ) )
+            // InternalExport.g:11440:1: ( ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11440:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:11441:1: ruleIdentifier
+            // InternalExport.g:11440:1: ( ruleIdentifier )
+            // InternalExport.g:11441:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSimpleTypeAccess().getIdIdentifierParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__SimpleType__IdAssignment_1_123036);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -32500,19 +32500,19 @@ public final void rule__SimpleType__IdAssignment_1_1() throws RecognitionExcepti
 
     // $ANTLR start synpred6_InternalExport
     public final void synpred6_InternalExport_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1521:6: ( ( ( ruleCastedExpression ) ) )
-        // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1521:6: ( ( ruleCastedExpression ) )
+        // InternalExport.g:1521:6: ( ( ( ruleCastedExpression ) ) )
+        // InternalExport.g:1521:6: ( ( ruleCastedExpression ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1521:6: ( ( ruleCastedExpression ) )
-        // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1522:1: ( ruleCastedExpression )
+        // InternalExport.g:1521:6: ( ( ruleCastedExpression ) )
+        // InternalExport.g:1522:1: ( ruleCastedExpression )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getExpressionAccess().getCastedExpressionParserRuleCall_1()); 
         }
-        // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1523:1: ( ruleCastedExpression )
-        // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:1523:3: ruleCastedExpression
+        // InternalExport.g:1523:1: ( ruleCastedExpression )
+        // InternalExport.g:1523:3: ruleCastedExpression
         {
-        pushFollow(FOLLOW_ruleCastedExpression_in_synpred6_InternalExport3206);
+        pushFollow(FOLLOW_2);
         ruleCastedExpression();
 
         state._fsp--;
@@ -32530,10 +32530,10 @@ public final void synpred6_InternalExport_fragment() throws RecognitionException
 
     // $ANTLR start synpred80_InternalExport
     public final void synpred80_InternalExport_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5933:2: ( rule__IfExpressionKw__Group_4__0 )
-        // ../com.avaloq.tools.ddk.xtext.export.ui/src-gen/com/avaloq/tools/ddk/xtext/export/ui/contentassist/antlr/internal/InternalExport.g:5933:2: rule__IfExpressionKw__Group_4__0
+        // InternalExport.g:5933:2: ( rule__IfExpressionKw__Group_4__0 )
+        // InternalExport.g:5933:2: rule__IfExpressionKw__Group_4__0
         {
-        pushFollow(FOLLOW_rule__IfExpressionKw__Group_4__0_in_synpred80_InternalExport12122);
+        pushFollow(FOLLOW_2);
         rule__IfExpressionKw__Group_4__0();
 
         state._fsp--;
@@ -32576,21 +32576,13 @@ public final boolean synpred6_InternalExport() {
 
 
     protected DFA4 dfa4 = new DFA4(this);
-    static final String DFA4_eotS =
-        "\36\uffff";
-    static final String DFA4_eofS =
-        "\36\uffff";
-    static final String DFA4_minS =
-        "\1\4\1\uffff\1\0\33\uffff";
-    static final String DFA4_maxS =
-        "\1\121\1\uffff\1\0\33\uffff";
-    static final String DFA4_acceptS =
-        "\1\uffff\1\1\1\uffff\1\3\31\uffff\1\2";
-    static final String DFA4_specialS =
-        "\2\uffff\1\0\33\uffff}>";
-    static final String[] DFA4_transitionS = {
-            "\4\3\13\uffff\1\3\2\uffff\16\3\3\uffff\1\3\13\uffff\1\2\6\uffff"+
-            "\1\1\3\uffff\1\3\2\uffff\1\3\4\uffff\2\3\10\uffff\2\3",
+    static final String dfa_1s = "\36\uffff";
+    static final String dfa_2s = "\1\4\1\uffff\1\0\33\uffff";
+    static final String dfa_3s = "\1\121\1\uffff\1\0\33\uffff";
+    static final String dfa_4s = "\1\uffff\1\1\1\uffff\1\3\31\uffff\1\2";
+    static final String dfa_5s = "\2\uffff\1\0\33\uffff}>";
+    static final String[] dfa_6s = {
+            "\4\3\13\uffff\1\3\2\uffff\16\3\3\uffff\1\3\13\uffff\1\2\6\uffff\1\1\3\uffff\1\3\2\uffff\1\3\4\uffff\2\3\10\uffff\2\3",
             "",
             "\1\uffff",
             "",
@@ -32622,34 +32614,25 @@ public final boolean synpred6_InternalExport() {
             ""
     };
 
-    static final short[] DFA4_eot = DFA.unpackEncodedString(DFA4_eotS);
-    static final short[] DFA4_eof = DFA.unpackEncodedString(DFA4_eofS);
-    static final char[] DFA4_min = DFA.unpackEncodedStringToUnsignedChars(DFA4_minS);
-    static final char[] DFA4_max = DFA.unpackEncodedStringToUnsignedChars(DFA4_maxS);
-    static final short[] DFA4_accept = DFA.unpackEncodedString(DFA4_acceptS);
-    static final short[] DFA4_special = DFA.unpackEncodedString(DFA4_specialS);
-    static final short[][] DFA4_transition;
-
-    static {
-        int numStates = DFA4_transitionS.length;
-        DFA4_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA4_transition[i] = DFA.unpackEncodedString(DFA4_transitionS[i]);
-        }
-    }
+    static final short[] dfa_1 = DFA.unpackEncodedString(dfa_1s);
+    static final char[] dfa_2 = DFA.unpackEncodedStringToUnsignedChars(dfa_2s);
+    static final char[] dfa_3 = DFA.unpackEncodedStringToUnsignedChars(dfa_3s);
+    static final short[] dfa_4 = DFA.unpackEncodedString(dfa_4s);
+    static final short[] dfa_5 = DFA.unpackEncodedString(dfa_5s);
+    static final short[][] dfa_6 = unpackEncodedStringArray(dfa_6s);
 
     class DFA4 extends DFA {
 
         public DFA4(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 4;
-            this.eot = DFA4_eot;
-            this.eof = DFA4_eof;
-            this.min = DFA4_min;
-            this.max = DFA4_max;
-            this.accept = DFA4_accept;
-            this.special = DFA4_special;
-            this.transition = DFA4_transition;
+            this.eot = dfa_1;
+            this.eof = dfa_1;
+            this.min = dfa_2;
+            this.max = dfa_3;
+            this.accept = dfa_4;
+            this.special = dfa_5;
+            this.transition = dfa_6;
         }
         public String getDescription() {
             return "1510:1: rule__Expression__Alternatives : ( ( ruleLetExpression ) | ( ( ruleCastedExpression ) ) | ( ruleChainExpression ) );";
@@ -32683,966 +32666,73 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
     }
  
 
-    public static final BitSet FOLLOW_ruleExportModel_in_entryRuleExportModel67 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleExportModel74 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExportModel__Group__0_in_ruleExportModel100 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImport_in_entryRuleImport127 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleImport134 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group__0_in_ruleImport160 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExtension_in_entryRuleExtension187 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleExtension194 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Extension__Group__0_in_ruleExtension220 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInterface_in_entryRuleInterface249 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInterface256 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Interface__Group__0_in_ruleInterface282 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInterfaceItem_in_entryRuleInterfaceItem309 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInterfaceItem316 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InterfaceItem__Alternatives_in_ruleInterfaceItem342 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInterfaceField_in_entryRuleInterfaceField369 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInterfaceField376 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InterfaceField__Group__0_in_ruleInterfaceField402 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInterfaceNavigation_in_entryRuleInterfaceNavigation429 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInterfaceNavigation436 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InterfaceNavigation__Group__0_in_ruleInterfaceNavigation462 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInterfaceExpression_in_entryRuleInterfaceExpression489 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInterfaceExpression496 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InterfaceExpression__Group__0_in_ruleInterfaceExpression522 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExport_in_entryRuleExport549 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleExport556 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group__0_in_ruleExport582 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleUserData_in_entryRuleUserData609 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleUserData616 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UserData__Group__0_in_ruleUserData642 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAttribute_in_entryRuleAttribute669 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAttribute676 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Attribute__AttributeAssignment_in_ruleAttribute702 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedID_in_entryRuleQualifiedID729 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedID736 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedID__Group__0_in_ruleQualifiedID762 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_entryRuleExpression789 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleExpression796 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Expression__Alternatives_in_ruleExpression822 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLetExpression_in_entryRuleLetExpression851 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleLetExpression858 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LetExpression__Group__0_in_ruleLetExpression884 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCastedExpression_in_entryRuleCastedExpression911 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleCastedExpression918 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CastedExpression__Group__0_in_ruleCastedExpression944 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChainExpression_in_entryRuleChainExpression971 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleChainExpression978 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChainExpression__Group__0_in_ruleChainExpression1004 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_entryRuleChainedExpression1031 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleChainedExpression1038 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChainedExpression__Alternatives_in_ruleChainedExpression1064 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIfExpressionTri_in_entryRuleIfExpressionTri1091 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIfExpressionTri1098 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__Group__0_in_ruleIfExpressionTri1124 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIfExpressionKw_in_entryRuleIfExpressionKw1151 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIfExpressionKw1158 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group__0_in_ruleIfExpressionKw1184 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSwitchExpression_in_entryRuleSwitchExpression1211 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSwitchExpression1218 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__0_in_ruleSwitchExpression1244 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCase_in_entryRuleCase1271 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleCase1278 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Case__Group__0_in_ruleCase1304 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOrExpression_in_entryRuleOrExpression1331 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOrExpression1338 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OrExpression__Group__0_in_ruleOrExpression1364 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAndExpression_in_entryRuleAndExpression1391 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAndExpression1398 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AndExpression__Group__0_in_ruleAndExpression1424 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImpliesExpression_in_entryRuleImpliesExpression1451 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleImpliesExpression1458 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ImpliesExpression__Group__0_in_ruleImpliesExpression1484 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRelationalExpression_in_entryRuleRelationalExpression1511 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRelationalExpression1518 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RelationalExpression__Group__0_in_ruleRelationalExpression1544 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAdditiveExpression_in_entryRuleAdditiveExpression1571 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAdditiveExpression1578 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AdditiveExpression__Group__0_in_ruleAdditiveExpression1604 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMultiplicativeExpression_in_entryRuleMultiplicativeExpression1631 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleMultiplicativeExpression1638 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MultiplicativeExpression__Group__0_in_ruleMultiplicativeExpression1664 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleUnaryOrInfixExpression_in_entryRuleUnaryOrInfixExpression1691 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleUnaryOrInfixExpression1698 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UnaryOrInfixExpression__Alternatives_in_ruleUnaryOrInfixExpression1724 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleUnaryExpression_in_entryRuleUnaryExpression1751 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleUnaryExpression1758 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UnaryExpression__Group__0_in_ruleUnaryExpression1784 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInfixExpression_in_entryRuleInfixExpression1811 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInfixExpression1818 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group__0_in_ruleInfixExpression1844 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePrimaryExpression_in_entryRulePrimaryExpression1871 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRulePrimaryExpression1878 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PrimaryExpression__Alternatives_in_rulePrimaryExpression1904 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteral_in_entryRuleLiteral1931 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleLiteral1938 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Literal__Alternatives_in_ruleLiteral1964 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBooleanLiteral_in_entryRuleBooleanLiteral1991 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleBooleanLiteral1998 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BooleanLiteral__ValAssignment_in_ruleBooleanLiteral2024 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntegerLiteral_in_entryRuleIntegerLiteral2051 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIntegerLiteral2058 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IntegerLiteral__ValAssignment_in_ruleIntegerLiteral2084 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNullLiteral_in_entryRuleNullLiteral2111 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNullLiteral2118 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NullLiteral__ValAssignment_in_ruleNullLiteral2144 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRealLiteral_in_entryRuleRealLiteral2171 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRealLiteral2178 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RealLiteral__ValAssignment_in_ruleRealLiteral2204 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral2231 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleStringLiteral2238 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StringLiteral__ValAssignment_in_ruleStringLiteral2264 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleParanthesizedExpression_in_entryRuleParanthesizedExpression2291 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleParanthesizedExpression2298 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ParanthesizedExpression__Group__0_in_ruleParanthesizedExpression2324 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGlobalVarExpression_in_entryRuleGlobalVarExpression2351 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleGlobalVarExpression2358 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalVarExpression__Group__0_in_ruleGlobalVarExpression2384 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFeatureCall_in_entryRuleFeatureCall2411 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFeatureCall2418 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FeatureCall__Alternatives_in_ruleFeatureCall2444 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOperationCall_in_entryRuleOperationCall2471 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOperationCall2478 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group__0_in_ruleOperationCall2504 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleListLiteral_in_entryRuleListLiteral2531 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleListLiteral2538 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group__0_in_ruleListLiteral2564 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConstructorCallExpression_in_entryRuleConstructorCallExpression2591 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleConstructorCallExpression2598 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConstructorCallExpression__Group__0_in_ruleConstructorCallExpression2624 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTypeSelectExpression_in_entryRuleTypeSelectExpression2651 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTypeSelectExpression2658 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TypeSelectExpression__Group__0_in_ruleTypeSelectExpression2684 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCollectionExpression_in_entryRuleCollectionExpression2711 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleCollectionExpression2718 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__Group__0_in_ruleCollectionExpression2744 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleType_in_entryRuleType2771 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleType2778 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Type__Alternatives_in_ruleType2804 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCollectionType_in_entryRuleCollectionType2831 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleCollectionType2838 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionType__Group__0_in_ruleCollectionType2864 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleType_in_entryRuleSimpleType2891 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSimpleType2898 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleType__Group__0_in_ruleSimpleType2924 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_entryRuleIdentifier2951 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIdentifier2958 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleIdentifier2984 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInterfaceField_in_rule__InterfaceItem__Alternatives3020 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInterfaceNavigation_in_rule__InterfaceItem__Alternatives3037 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInterfaceExpression_in_rule__InterfaceItem__Alternatives3054 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__FingerprintAssignment_7_0_0_in_rule__Export__Alternatives_7_03086 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__ResourceFingerprintAssignment_7_0_1_in_rule__Export__Alternatives_7_03104 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_8_0__0_in_rule__Export__Alternatives_83137 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_8_1__0_in_rule__Export__Alternatives_83155 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLetExpression_in_rule__Expression__Alternatives3188 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCastedExpression_in_rule__Expression__Alternatives3206 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChainExpression_in_rule__Expression__Alternatives3224 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIfExpressionKw_in_rule__ChainedExpression__Alternatives3257 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIfExpressionTri_in_rule__ChainedExpression__Alternatives3274 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSwitchExpression_in_rule__ChainedExpression__Alternatives3291 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_12_in_rule__RelationalExpression__OperatorAlternatives_1_1_03324 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_13_in_rule__RelationalExpression__OperatorAlternatives_1_1_03344 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_14_in_rule__RelationalExpression__OperatorAlternatives_1_1_03364 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_15_in_rule__RelationalExpression__OperatorAlternatives_1_1_03384 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_16_in_rule__RelationalExpression__OperatorAlternatives_1_1_03404 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_17_in_rule__RelationalExpression__OperatorAlternatives_1_1_03424 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_18_in_rule__AdditiveExpression__NameAlternatives_1_1_03459 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_rule__AdditiveExpression__NameAlternatives_1_1_03479 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_20_in_rule__MultiplicativeExpression__NameAlternatives_1_1_03514 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_21_in_rule__MultiplicativeExpression__NameAlternatives_1_1_03534 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleUnaryExpression_in_rule__UnaryOrInfixExpression__Alternatives3568 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInfixExpression_in_rule__UnaryOrInfixExpression__Alternatives3585 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_22_in_rule__UnaryExpression__NameAlternatives_0_03618 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_rule__UnaryExpression__NameAlternatives_0_03638 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0__0_in_rule__InfixExpression__Alternatives_13672 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_1__0_in_rule__InfixExpression__Alternatives_13690 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_2__0_in_rule__InfixExpression__Alternatives_13708 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3__0_in_rule__InfixExpression__Alternatives_13726 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_rule__InfixExpression__NameAlternatives_1_3_2_03760 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_rule__InfixExpression__NameAlternatives_1_3_2_03780 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_25_in_rule__InfixExpression__NameAlternatives_1_3_2_03800 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_rule__InfixExpression__NameAlternatives_1_3_2_03820 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__InfixExpression__NameAlternatives_1_3_2_03840 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__InfixExpression__NameAlternatives_1_3_2_03860 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_rule__InfixExpression__NameAlternatives_1_3_2_03880 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_rule__InfixExpression__NameAlternatives_1_3_2_03900 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteral_in_rule__PrimaryExpression__Alternatives3934 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFeatureCall_in_rule__PrimaryExpression__Alternatives3951 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleListLiteral_in_rule__PrimaryExpression__Alternatives3968 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConstructorCallExpression_in_rule__PrimaryExpression__Alternatives3985 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGlobalVarExpression_in_rule__PrimaryExpression__Alternatives4002 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleParanthesizedExpression_in_rule__PrimaryExpression__Alternatives4019 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBooleanLiteral_in_rule__Literal__Alternatives4051 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntegerLiteral_in_rule__Literal__Alternatives4068 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNullLiteral_in_rule__Literal__Alternatives4085 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRealLiteral_in_rule__Literal__Alternatives4102 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStringLiteral_in_rule__Literal__Alternatives4119 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_rule__BooleanLiteral__ValAlternatives_04152 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_rule__BooleanLiteral__ValAlternatives_04172 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOperationCall_in_rule__FeatureCall__Alternatives4206 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FeatureCall__TypeAssignment_1_in_rule__FeatureCall__Alternatives4223 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCollectionExpression_in_rule__FeatureCall__Alternatives4241 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTypeSelectExpression_in_rule__FeatureCall__Alternatives4258 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_rule__CollectionExpression__NameAlternatives_0_04291 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_rule__CollectionExpression__NameAlternatives_0_04311 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_25_in_rule__CollectionExpression__NameAlternatives_0_04331 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_rule__CollectionExpression__NameAlternatives_0_04351 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__CollectionExpression__NameAlternatives_0_04371 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__CollectionExpression__NameAlternatives_0_04391 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_rule__CollectionExpression__NameAlternatives_0_04411 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_rule__CollectionExpression__NameAlternatives_0_04431 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCollectionType_in_rule__Type__Alternatives4465 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleType_in_rule__Type__Alternatives4482 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_rule__CollectionType__ClAlternatives_0_04515 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_34_in_rule__CollectionType__ClAlternatives_0_04535 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_35_in_rule__CollectionType__ClAlternatives_0_04555 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExportModel__Group__0__Impl_in_rule__ExportModel__Group__04587 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__ExportModel__Group__1_in_rule__ExportModel__Group__04590 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExportModel__Group_0__0_in_rule__ExportModel__Group__0__Impl4617 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExportModel__Group__1__Impl_in_rule__ExportModel__Group__14648 = new BitSet(new long[]{0x0000085000000000L});
-    public static final BitSet FOLLOW_rule__ExportModel__Group__2_in_rule__ExportModel__Group__14651 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExportModel__ImportsAssignment_1_in_rule__ExportModel__Group__1__Impl4680 = new BitSet(new long[]{0x0000020000000002L});
-    public static final BitSet FOLLOW_rule__ExportModel__ImportsAssignment_1_in_rule__ExportModel__Group__1__Impl4692 = new BitSet(new long[]{0x0000020000000002L});
-    public static final BitSet FOLLOW_rule__ExportModel__Group__2__Impl_in_rule__ExportModel__Group__24725 = new BitSet(new long[]{0x0000085000000000L});
-    public static final BitSet FOLLOW_rule__ExportModel__Group__3_in_rule__ExportModel__Group__24728 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExportModel__ExtensionsAssignment_2_in_rule__ExportModel__Group__2__Impl4755 = new BitSet(new long[]{0x0000080000000002L});
-    public static final BitSet FOLLOW_rule__ExportModel__Group__3__Impl_in_rule__ExportModel__Group__34786 = new BitSet(new long[]{0x0000085000000000L});
-    public static final BitSet FOLLOW_rule__ExportModel__Group__4_in_rule__ExportModel__Group__34789 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExportModel__Group_3__0_in_rule__ExportModel__Group__3__Impl4816 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExportModel__Group__4__Impl_in_rule__ExportModel__Group__44847 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExportModel__ExportsAssignment_4_in_rule__ExportModel__Group__4__Impl4876 = new BitSet(new long[]{0x0000085000000002L});
-    public static final BitSet FOLLOW_rule__ExportModel__ExportsAssignment_4_in_rule__ExportModel__Group__4__Impl4888 = new BitSet(new long[]{0x0000085000000002L});
-    public static final BitSet FOLLOW_rule__ExportModel__Group_0__0__Impl_in_rule__ExportModel__Group_0__04931 = new BitSet(new long[]{0x0000080000000010L});
-    public static final BitSet FOLLOW_rule__ExportModel__Group_0__1_in_rule__ExportModel__Group_0__04934 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_rule__ExportModel__Group_0__0__Impl4962 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExportModel__Group_0__1__Impl_in_rule__ExportModel__Group_0__14993 = new BitSet(new long[]{0x0000080000000010L});
-    public static final BitSet FOLLOW_rule__ExportModel__Group_0__2_in_rule__ExportModel__Group_0__14996 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExportModel__ExtensionAssignment_0_1_in_rule__ExportModel__Group_0__1__Impl5023 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExportModel__Group_0__2__Impl_in_rule__ExportModel__Group_0__25054 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_rule__ExportModel__Group_0__3_in_rule__ExportModel__Group_0__25057 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExportModel__NameAssignment_0_2_in_rule__ExportModel__Group_0__2__Impl5084 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExportModel__Group_0__3__Impl_in_rule__ExportModel__Group_0__35114 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__ExportModel__Group_0__4_in_rule__ExportModel__Group_0__35117 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_37_in_rule__ExportModel__Group_0__3__Impl5145 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExportModel__Group_0__4__Impl_in_rule__ExportModel__Group_0__45176 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExportModel__TargetGrammarAssignment_0_4_in_rule__ExportModel__Group_0__4__Impl5203 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExportModel__Group_3__0__Impl_in_rule__ExportModel__Group_3__05243 = new BitSet(new long[]{0x0000008000000000L});
-    public static final BitSet FOLLOW_rule__ExportModel__Group_3__1_in_rule__ExportModel__Group_3__05246 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_38_in_rule__ExportModel__Group_3__0__Impl5274 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExportModel__Group_3__1__Impl_in_rule__ExportModel__Group_3__15305 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__ExportModel__Group_3__2_in_rule__ExportModel__Group_3__15308 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_39_in_rule__ExportModel__Group_3__1__Impl5336 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExportModel__Group_3__2__Impl_in_rule__ExportModel__Group_3__25367 = new BitSet(new long[]{0x0000010000000000L});
-    public static final BitSet FOLLOW_rule__ExportModel__Group_3__3_in_rule__ExportModel__Group_3__25370 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ExportModel__InterfacesAssignment_3_2_in_rule__ExportModel__Group_3__2__Impl5399 = new BitSet(new long[]{0x0000000000000012L});
-    public static final BitSet FOLLOW_rule__ExportModel__InterfacesAssignment_3_2_in_rule__ExportModel__Group_3__2__Impl5411 = new BitSet(new long[]{0x0000000000000012L});
-    public static final BitSet FOLLOW_rule__ExportModel__Group_3__3__Impl_in_rule__ExportModel__Group_3__35444 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_40_in_rule__ExportModel__Group_3__3__Impl5472 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group__0__Impl_in_rule__Import__Group__05511 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_rule__Import__Group__1_in_rule__Import__Group__05514 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__Import__Group__0__Impl5542 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group__1__Impl_in_rule__Import__Group__15573 = new BitSet(new long[]{0x0000040000000000L});
-    public static final BitSet FOLLOW_rule__Import__Group__2_in_rule__Import__Group__15576 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__PackageAssignment_1_in_rule__Import__Group__1__Impl5603 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group__2__Impl_in_rule__Import__Group__25633 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group_2__0_in_rule__Import__Group__2__Impl5660 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group_2__0__Impl_in_rule__Import__Group_2__05697 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__Import__Group_2__1_in_rule__Import__Group_2__05700 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__Import__Group_2__0__Impl5728 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group_2__1__Impl_in_rule__Import__Group_2__15759 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__NameAssignment_2_1_in_rule__Import__Group_2__1__Impl5786 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Extension__Group__0__Impl_in_rule__Extension__Group__05820 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__Extension__Group__1_in_rule__Extension__Group__05823 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_rule__Extension__Group__0__Impl5851 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Extension__Group__1__Impl_in_rule__Extension__Group__15882 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Extension__ExtensionAssignment_1_in_rule__Extension__Group__1__Impl5909 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Interface__Group__0__Impl_in_rule__Interface__Group__05943 = new BitSet(new long[]{0x0000B00000000000L});
-    public static final BitSet FOLLOW_rule__Interface__Group__1_in_rule__Interface__Group__05946 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Interface__TypeAssignment_0_in_rule__Interface__Group__0__Impl5973 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Interface__Group__1__Impl_in_rule__Interface__Group__16003 = new BitSet(new long[]{0x0000B00000000000L});
-    public static final BitSet FOLLOW_rule__Interface__Group__2_in_rule__Interface__Group__16006 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Interface__Group_1__0_in_rule__Interface__Group__1__Impl6033 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Interface__Group__2__Impl_in_rule__Interface__Group__26064 = new BitSet(new long[]{0x0000B00000000000L});
-    public static final BitSet FOLLOW_rule__Interface__Group__3_in_rule__Interface__Group__26067 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Interface__Group_2__0_in_rule__Interface__Group__2__Impl6094 = new BitSet(new long[]{0x0000800000000002L});
-    public static final BitSet FOLLOW_rule__Interface__Group__3__Impl_in_rule__Interface__Group__36125 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_44_in_rule__Interface__Group__3__Impl6153 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Interface__Group_1__0__Impl_in_rule__Interface__Group_1__06192 = new BitSet(new long[]{0x4408008FFFC800F0L,0x00000000000300C2L});
-    public static final BitSet FOLLOW_rule__Interface__Group_1__1_in_rule__Interface__Group_1__06195 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_45_in_rule__Interface__Group_1__0__Impl6223 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Interface__Group_1__1__Impl_in_rule__Interface__Group_1__16254 = new BitSet(new long[]{0x0000400000000000L});
-    public static final BitSet FOLLOW_rule__Interface__Group_1__2_in_rule__Interface__Group_1__16257 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Interface__GuardAssignment_1_1_in_rule__Interface__Group_1__1__Impl6284 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Interface__Group_1__2__Impl_in_rule__Interface__Group_1__26314 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rule__Interface__Group_1__2__Impl6342 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Interface__Group_2__0__Impl_in_rule__Interface__Group_2__06379 = new BitSet(new long[]{0x0006000000040010L});
-    public static final BitSet FOLLOW_rule__Interface__Group_2__1_in_rule__Interface__Group_2__06382 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__Interface__Group_2__0__Impl6410 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Interface__Group_2__1__Impl_in_rule__Interface__Group_2__16441 = new BitSet(new long[]{0x0001000000000000L});
-    public static final BitSet FOLLOW_rule__Interface__Group_2__2_in_rule__Interface__Group_2__16444 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Interface__ItemsAssignment_2_1_in_rule__Interface__Group_2__1__Impl6471 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Interface__Group_2__2__Impl_in_rule__Interface__Group_2__26501 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Interface__Group_2_2__0_in_rule__Interface__Group_2__2__Impl6528 = new BitSet(new long[]{0x0001000000000002L});
-    public static final BitSet FOLLOW_rule__Interface__Group_2_2__0__Impl_in_rule__Interface__Group_2_2__06565 = new BitSet(new long[]{0x0006000000040010L});
-    public static final BitSet FOLLOW_rule__Interface__Group_2_2__1_in_rule__Interface__Group_2_2__06568 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_rule__Interface__Group_2_2__0__Impl6596 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Interface__Group_2_2__1__Impl_in_rule__Interface__Group_2_2__16627 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Interface__ItemsAssignment_2_2_1_in_rule__Interface__Group_2_2__1__Impl6654 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InterfaceField__Group__0__Impl_in_rule__InterfaceField__Group__06688 = new BitSet(new long[]{0x0000000000040010L});
-    public static final BitSet FOLLOW_rule__InterfaceField__Group__1_in_rule__InterfaceField__Group__06691 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InterfaceField__UnorderedAssignment_0_in_rule__InterfaceField__Group__0__Impl6718 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InterfaceField__Group__1__Impl_in_rule__InterfaceField__Group__16749 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InterfaceField__FieldAssignment_1_in_rule__InterfaceField__Group__1__Impl6776 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InterfaceNavigation__Group__0__Impl_in_rule__InterfaceNavigation__Group__06810 = new BitSet(new long[]{0x0000000000040010L});
-    public static final BitSet FOLLOW_rule__InterfaceNavigation__Group__1_in_rule__InterfaceNavigation__Group__06813 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_49_in_rule__InterfaceNavigation__Group__0__Impl6841 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InterfaceNavigation__Group__1__Impl_in_rule__InterfaceNavigation__Group__16872 = new BitSet(new long[]{0x0000000000040010L});
-    public static final BitSet FOLLOW_rule__InterfaceNavigation__Group__2_in_rule__InterfaceNavigation__Group__16875 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InterfaceNavigation__UnorderedAssignment_1_in_rule__InterfaceNavigation__Group__1__Impl6902 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InterfaceNavigation__Group__2__Impl_in_rule__InterfaceNavigation__Group__26933 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InterfaceNavigation__RefAssignment_2_in_rule__InterfaceNavigation__Group__2__Impl6960 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InterfaceExpression__Group__0__Impl_in_rule__InterfaceExpression__Group__06996 = new BitSet(new long[]{0x000A000000040000L});
-    public static final BitSet FOLLOW_rule__InterfaceExpression__Group__1_in_rule__InterfaceExpression__Group__06999 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_50_in_rule__InterfaceExpression__Group__0__Impl7027 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InterfaceExpression__Group__1__Impl_in_rule__InterfaceExpression__Group__17058 = new BitSet(new long[]{0x000A000000040000L});
-    public static final BitSet FOLLOW_rule__InterfaceExpression__Group__2_in_rule__InterfaceExpression__Group__17061 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InterfaceExpression__RefAssignment_1_in_rule__InterfaceExpression__Group__1__Impl7088 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InterfaceExpression__Group__2__Impl_in_rule__InterfaceExpression__Group__27119 = new BitSet(new long[]{0x000A000000040000L});
-    public static final BitSet FOLLOW_rule__InterfaceExpression__Group__3_in_rule__InterfaceExpression__Group__27122 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InterfaceExpression__UnorderedAssignment_2_in_rule__InterfaceExpression__Group__2__Impl7149 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InterfaceExpression__Group__3__Impl_in_rule__InterfaceExpression__Group__37180 = new BitSet(new long[]{0x4408008FFFC800F0L,0x00000000000300C2L});
-    public static final BitSet FOLLOW_rule__InterfaceExpression__Group__4_in_rule__InterfaceExpression__Group__37183 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__InterfaceExpression__Group__3__Impl7211 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InterfaceExpression__Group__4__Impl_in_rule__InterfaceExpression__Group__47242 = new BitSet(new long[]{0x0010000000000000L});
-    public static final BitSet FOLLOW_rule__InterfaceExpression__Group__5_in_rule__InterfaceExpression__Group__47245 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InterfaceExpression__ExprAssignment_4_in_rule__InterfaceExpression__Group__4__Impl7272 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InterfaceExpression__Group__5__Impl_in_rule__InterfaceExpression__Group__57302 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_rule__InterfaceExpression__Group__5__Impl7330 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group__0__Impl_in_rule__Export__Group__07373 = new BitSet(new long[]{0x0000000000000010L,0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__Export__Group__1_in_rule__Export__Group__07376 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_rule__Export__Group__0__Impl7404 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group__1__Impl_in_rule__Export__Group__17435 = new BitSet(new long[]{0x0000000000000010L,0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__Export__Group__2_in_rule__Export__Group__17438 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_1__0_in_rule__Export__Group__1__Impl7465 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group__2__Impl_in_rule__Export__Group__27496 = new BitSet(new long[]{0x0000248000000000L});
-    public static final BitSet FOLLOW_rule__Export__Group__3_in_rule__Export__Group__27499 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__TypeAssignment_2_in_rule__Export__Group__2__Impl7526 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group__3__Impl_in_rule__Export__Group__37556 = new BitSet(new long[]{0x0000248000000000L});
-    public static final BitSet FOLLOW_rule__Export__Group__4_in_rule__Export__Group__37559 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_3__0_in_rule__Export__Group__3__Impl7586 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group__4__Impl_in_rule__Export__Group__47617 = new BitSet(new long[]{0x0000248000000000L});
-    public static final BitSet FOLLOW_rule__Export__Group__5_in_rule__Export__Group__47620 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_4__0_in_rule__Export__Group__4__Impl7647 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group__5__Impl_in_rule__Export__Group__57678 = new BitSet(new long[]{0x01A0010000000000L,0x0000000000001800L});
-    public static final BitSet FOLLOW_rule__Export__Group__6_in_rule__Export__Group__57681 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_39_in_rule__Export__Group__5__Impl7709 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group__6__Impl_in_rule__Export__Group__67740 = new BitSet(new long[]{0x01A0010000000000L,0x0000000000001800L});
-    public static final BitSet FOLLOW_rule__Export__Group__7_in_rule__Export__Group__67743 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_6__0_in_rule__Export__Group__6__Impl7770 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group__7__Impl_in_rule__Export__Group__77801 = new BitSet(new long[]{0x01A0010000000000L,0x0000000000001800L});
-    public static final BitSet FOLLOW_rule__Export__Group__8_in_rule__Export__Group__77804 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_7__0_in_rule__Export__Group__7__Impl7831 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group__8__Impl_in_rule__Export__Group__87862 = new BitSet(new long[]{0x01A0010000000000L,0x0000000000001800L});
-    public static final BitSet FOLLOW_rule__Export__Group__9_in_rule__Export__Group__87865 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Alternatives_8_in_rule__Export__Group__8__Impl7892 = new BitSet(new long[]{0x0180000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group__9__Impl_in_rule__Export__Group__97923 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_40_in_rule__Export__Group__9__Impl7951 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_1__0__Impl_in_rule__Export__Group_1__08002 = new BitSet(new long[]{0x0000200000000000L});
-    public static final BitSet FOLLOW_rule__Export__Group_1__1_in_rule__Export__Group_1__08005 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__LookupAssignment_1_0_in_rule__Export__Group_1__0__Impl8032 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_1__1__Impl_in_rule__Export__Group_1__18062 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_1_1__0_in_rule__Export__Group_1__1__Impl8089 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_1_1__0__Impl_in_rule__Export__Group_1_1__08124 = new BitSet(new long[]{0x4408008FFFC800F0L,0x00000000000300C2L});
-    public static final BitSet FOLLOW_rule__Export__Group_1_1__1_in_rule__Export__Group_1_1__08127 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_45_in_rule__Export__Group_1_1__0__Impl8155 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_1_1__1__Impl_in_rule__Export__Group_1_1__18186 = new BitSet(new long[]{0x0000400000000000L});
-    public static final BitSet FOLLOW_rule__Export__Group_1_1__2_in_rule__Export__Group_1_1__18189 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__LookupPredicateAssignment_1_1_1_in_rule__Export__Group_1_1__1__Impl8216 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_1_1__2__Impl_in_rule__Export__Group_1_1__28246 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rule__Export__Group_1_1__2__Impl8274 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_3__0__Impl_in_rule__Export__Group_3__08311 = new BitSet(new long[]{0x4408008FFFC800F0L,0x00000000000302C2L});
-    public static final BitSet FOLLOW_rule__Export__Group_3__1_in_rule__Export__Group_3__08314 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__Export__Group_3__0__Impl8342 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_3__1__Impl_in_rule__Export__Group_3__18373 = new BitSet(new long[]{0x4408008FFFC800F0L,0x00000000000302C2L});
-    public static final BitSet FOLLOW_rule__Export__Group_3__2_in_rule__Export__Group_3__18376 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__QualifiedNameAssignment_3_1_in_rule__Export__Group_3__1__Impl8403 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_3__2__Impl_in_rule__Export__Group_3__28434 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__NamingAssignment_3_2_in_rule__Export__Group_3__2__Impl8461 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_4__0__Impl_in_rule__Export__Group_4__08497 = new BitSet(new long[]{0x4408008FFFC800F0L,0x00000000000300C2L});
-    public static final BitSet FOLLOW_rule__Export__Group_4__1_in_rule__Export__Group_4__08500 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_45_in_rule__Export__Group_4__0__Impl8528 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_4__1__Impl_in_rule__Export__Group_4__18559 = new BitSet(new long[]{0x0000400000000000L});
-    public static final BitSet FOLLOW_rule__Export__Group_4__2_in_rule__Export__Group_4__18562 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__GuardAssignment_4_1_in_rule__Export__Group_4__1__Impl8589 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_4__2__Impl_in_rule__Export__Group_4__28619 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rule__Export__Group_4__2__Impl8647 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_6__0__Impl_in_rule__Export__Group_6__08684 = new BitSet(new long[]{0x0000800000000000L});
-    public static final BitSet FOLLOW_rule__Export__Group_6__1_in_rule__Export__Group_6__08687 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_53_in_rule__Export__Group_6__0__Impl8715 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_6__1__Impl_in_rule__Export__Group_6__18746 = new BitSet(new long[]{0x0040000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__Export__Group_6__2_in_rule__Export__Group_6__18749 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__Export__Group_6__1__Impl8777 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_6__2__Impl_in_rule__Export__Group_6__28808 = new BitSet(new long[]{0x0040000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__Export__Group_6__3_in_rule__Export__Group_6__28811 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__FragmentUniqueAssignment_6_2_in_rule__Export__Group_6__2__Impl8838 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_6__3__Impl_in_rule__Export__Group_6__38869 = new BitSet(new long[]{0x0008000000000000L});
-    public static final BitSet FOLLOW_rule__Export__Group_6__4_in_rule__Export__Group_6__38872 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_54_in_rule__Export__Group_6__3__Impl8900 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_6__4__Impl_in_rule__Export__Group_6__48931 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__Export__Group_6__5_in_rule__Export__Group_6__48934 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__Export__Group_6__4__Impl8962 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_6__5__Impl_in_rule__Export__Group_6__58993 = new BitSet(new long[]{0x0010000000000000L});
-    public static final BitSet FOLLOW_rule__Export__Group_6__6_in_rule__Export__Group_6__58996 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__FragmentAttributeAssignment_6_5_in_rule__Export__Group_6__5__Impl9023 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_6__6__Impl_in_rule__Export__Group_6__69053 = new BitSet(new long[]{0x0000100000000000L});
-    public static final BitSet FOLLOW_rule__Export__Group_6__7_in_rule__Export__Group_6__69056 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_rule__Export__Group_6__6__Impl9084 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_6__7__Impl_in_rule__Export__Group_6__79115 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_44_in_rule__Export__Group_6__7__Impl9143 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_7__0__Impl_in_rule__Export__Group_7__09190 = new BitSet(new long[]{0x0000100000000000L});
-    public static final BitSet FOLLOW_rule__Export__Group_7__1_in_rule__Export__Group_7__09193 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Alternatives_7_0_in_rule__Export__Group_7__0__Impl9220 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_7__1__Impl_in_rule__Export__Group_7__19250 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_44_in_rule__Export__Group_7__1__Impl9278 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_8_0__0__Impl_in_rule__Export__Group_8_0__09313 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__Export__Group_8_0__1_in_rule__Export__Group_8_0__09316 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_55_in_rule__Export__Group_8_0__0__Impl9344 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_8_0__1__Impl_in_rule__Export__Group_8_0__19375 = new BitSet(new long[]{0x0001100000000000L});
-    public static final BitSet FOLLOW_rule__Export__Group_8_0__2_in_rule__Export__Group_8_0__19378 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__AttributesAssignment_8_0_1_in_rule__Export__Group_8_0__1__Impl9405 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_8_0__2__Impl_in_rule__Export__Group_8_0__29435 = new BitSet(new long[]{0x0001100000000000L});
-    public static final BitSet FOLLOW_rule__Export__Group_8_0__3_in_rule__Export__Group_8_0__29438 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_8_0_2__0_in_rule__Export__Group_8_0__2__Impl9465 = new BitSet(new long[]{0x0001000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_8_0__3__Impl_in_rule__Export__Group_8_0__39496 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_44_in_rule__Export__Group_8_0__3__Impl9524 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_8_0_2__0__Impl_in_rule__Export__Group_8_0_2__09563 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__Export__Group_8_0_2__1_in_rule__Export__Group_8_0_2__09566 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_rule__Export__Group_8_0_2__0__Impl9594 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_8_0_2__1__Impl_in_rule__Export__Group_8_0_2__19625 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__AttributesAssignment_8_0_2_1_in_rule__Export__Group_8_0_2__1__Impl9652 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_8_1__0__Impl_in_rule__Export__Group_8_1__09686 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__Export__Group_8_1__1_in_rule__Export__Group_8_1__09689 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_rule__Export__Group_8_1__0__Impl9717 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_8_1__1__Impl_in_rule__Export__Group_8_1__19748 = new BitSet(new long[]{0x0001100000000000L});
-    public static final BitSet FOLLOW_rule__Export__Group_8_1__2_in_rule__Export__Group_8_1__19751 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__UserDataAssignment_8_1_1_in_rule__Export__Group_8_1__1__Impl9778 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_8_1__2__Impl_in_rule__Export__Group_8_1__29808 = new BitSet(new long[]{0x0001100000000000L});
-    public static final BitSet FOLLOW_rule__Export__Group_8_1__3_in_rule__Export__Group_8_1__29811 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_8_1_2__0_in_rule__Export__Group_8_1__2__Impl9838 = new BitSet(new long[]{0x0001000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_8_1__3__Impl_in_rule__Export__Group_8_1__39869 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_44_in_rule__Export__Group_8_1__3__Impl9897 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_8_1_2__0__Impl_in_rule__Export__Group_8_1_2__09936 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__Export__Group_8_1_2__1_in_rule__Export__Group_8_1_2__09939 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_rule__Export__Group_8_1_2__0__Impl9967 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__Group_8_1_2__1__Impl_in_rule__Export__Group_8_1_2__19998 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Export__UserDataAssignment_8_1_2_1_in_rule__Export__Group_8_1_2__1__Impl10025 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UserData__Group__0__Impl_in_rule__UserData__Group__010059 = new BitSet(new long[]{0x0000800000000000L});
-    public static final BitSet FOLLOW_rule__UserData__Group__1_in_rule__UserData__Group__010062 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UserData__NameAssignment_0_in_rule__UserData__Group__0__Impl10089 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UserData__Group__1__Impl_in_rule__UserData__Group__110119 = new BitSet(new long[]{0x4408008FFFC800F0L,0x00000000000300C2L});
-    public static final BitSet FOLLOW_rule__UserData__Group__2_in_rule__UserData__Group__110122 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__UserData__Group__1__Impl10150 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UserData__Group__2__Impl_in_rule__UserData__Group__210181 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UserData__ExprAssignment_2_in_rule__UserData__Group__2__Impl10208 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedID__Group__0__Impl_in_rule__QualifiedID__Group__010244 = new BitSet(new long[]{0x0200000000000000L});
-    public static final BitSet FOLLOW_rule__QualifiedID__Group__1_in_rule__QualifiedID__Group__010247 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__QualifiedID__Group__0__Impl10274 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedID__Group__1__Impl_in_rule__QualifiedID__Group__110303 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedID__Group_1__0_in_rule__QualifiedID__Group__1__Impl10330 = new BitSet(new long[]{0x0200000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedID__Group_1__0__Impl_in_rule__QualifiedID__Group_1__010365 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__QualifiedID__Group_1__1_in_rule__QualifiedID__Group_1__010368 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_57_in_rule__QualifiedID__Group_1__0__Impl10396 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedID__Group_1__1__Impl_in_rule__QualifiedID__Group_1__110427 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__QualifiedID__Group_1__1__Impl10454 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LetExpression__Group__0__Impl_in_rule__LetExpression__Group__010487 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__LetExpression__Group__1_in_rule__LetExpression__Group__010490 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_58_in_rule__LetExpression__Group__0__Impl10518 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LetExpression__Group__1__Impl_in_rule__LetExpression__Group__110549 = new BitSet(new long[]{0x0000800000000000L});
-    public static final BitSet FOLLOW_rule__LetExpression__Group__2_in_rule__LetExpression__Group__110552 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LetExpression__IdentifierAssignment_1_in_rule__LetExpression__Group__1__Impl10579 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LetExpression__Group__2__Impl_in_rule__LetExpression__Group__210609 = new BitSet(new long[]{0x4408008FFFC800F0L,0x00000000000300C2L});
-    public static final BitSet FOLLOW_rule__LetExpression__Group__3_in_rule__LetExpression__Group__210612 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__LetExpression__Group__2__Impl10640 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LetExpression__Group__3__Impl_in_rule__LetExpression__Group__310671 = new BitSet(new long[]{0x0800000000000000L});
-    public static final BitSet FOLLOW_rule__LetExpression__Group__4_in_rule__LetExpression__Group__310674 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LetExpression__VarExprAssignment_3_in_rule__LetExpression__Group__3__Impl10701 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LetExpression__Group__4__Impl_in_rule__LetExpression__Group__410731 = new BitSet(new long[]{0x4408008FFFC800F0L,0x00000000000300C2L});
-    public static final BitSet FOLLOW_rule__LetExpression__Group__5_in_rule__LetExpression__Group__410734 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_59_in_rule__LetExpression__Group__4__Impl10762 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LetExpression__Group__5__Impl_in_rule__LetExpression__Group__510793 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LetExpression__TargetAssignment_5_in_rule__LetExpression__Group__5__Impl10820 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CastedExpression__Group__0__Impl_in_rule__CastedExpression__Group__010862 = new BitSet(new long[]{0x0000000E00000010L});
-    public static final BitSet FOLLOW_rule__CastedExpression__Group__1_in_rule__CastedExpression__Group__010865 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__CastedExpression__Group__0__Impl10893 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CastedExpression__Group__1__Impl_in_rule__CastedExpression__Group__110924 = new BitSet(new long[]{0x0010000000000000L});
-    public static final BitSet FOLLOW_rule__CastedExpression__Group__2_in_rule__CastedExpression__Group__110927 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CastedExpression__TypeAssignment_1_in_rule__CastedExpression__Group__1__Impl10954 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CastedExpression__Group__2__Impl_in_rule__CastedExpression__Group__210984 = new BitSet(new long[]{0x4408008FFFC800F0L,0x00000000000300C2L});
-    public static final BitSet FOLLOW_rule__CastedExpression__Group__3_in_rule__CastedExpression__Group__210987 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_rule__CastedExpression__Group__2__Impl11015 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CastedExpression__Group__3__Impl_in_rule__CastedExpression__Group__311046 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CastedExpression__TargetAssignment_3_in_rule__CastedExpression__Group__3__Impl11073 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChainExpression__Group__0__Impl_in_rule__ChainExpression__Group__011111 = new BitSet(new long[]{0x1000000000000000L});
-    public static final BitSet FOLLOW_rule__ChainExpression__Group__1_in_rule__ChainExpression__Group__011114 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_rule__ChainExpression__Group__0__Impl11141 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChainExpression__Group__1__Impl_in_rule__ChainExpression__Group__111170 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChainExpression__Group_1__0_in_rule__ChainExpression__Group__1__Impl11197 = new BitSet(new long[]{0x1000000000000002L});
-    public static final BitSet FOLLOW_rule__ChainExpression__Group_1__0__Impl_in_rule__ChainExpression__Group_1__011232 = new BitSet(new long[]{0x1000000000000000L});
-    public static final BitSet FOLLOW_rule__ChainExpression__Group_1__1_in_rule__ChainExpression__Group_1__011235 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChainExpression__Group_1__1__Impl_in_rule__ChainExpression__Group_1__111293 = new BitSet(new long[]{0x4408008FFFC800F0L,0x00000000000300C2L});
-    public static final BitSet FOLLOW_rule__ChainExpression__Group_1__2_in_rule__ChainExpression__Group_1__111296 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_60_in_rule__ChainExpression__Group_1__1__Impl11324 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChainExpression__Group_1__2__Impl_in_rule__ChainExpression__Group_1__211355 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChainExpression__NextAssignment_1_2_in_rule__ChainExpression__Group_1__2__Impl11382 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__Group__0__Impl_in_rule__IfExpressionTri__Group__011418 = new BitSet(new long[]{0x2000000000000000L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__Group__1_in_rule__IfExpressionTri__Group__011421 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOrExpression_in_rule__IfExpressionTri__Group__0__Impl11448 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__Group__1__Impl_in_rule__IfExpressionTri__Group__111477 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__Group_1__0_in_rule__IfExpressionTri__Group__1__Impl11504 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__Group_1__0__Impl_in_rule__IfExpressionTri__Group_1__011539 = new BitSet(new long[]{0x2000000000000000L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__Group_1__1_in_rule__IfExpressionTri__Group_1__011542 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__Group_1__1__Impl_in_rule__IfExpressionTri__Group_1__111600 = new BitSet(new long[]{0x4408008FFFC800F0L,0x00000000000300C2L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__Group_1__2_in_rule__IfExpressionTri__Group_1__111603 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_61_in_rule__IfExpressionTri__Group_1__1__Impl11631 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__Group_1__2__Impl_in_rule__IfExpressionTri__Group_1__211662 = new BitSet(new long[]{0x0800000000000000L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__Group_1__3_in_rule__IfExpressionTri__Group_1__211665 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__ThenPartAssignment_1_2_in_rule__IfExpressionTri__Group_1__2__Impl11692 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__Group_1__3__Impl_in_rule__IfExpressionTri__Group_1__311722 = new BitSet(new long[]{0x4408008FFFC800F0L,0x00000000000300C2L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__Group_1__4_in_rule__IfExpressionTri__Group_1__311725 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_59_in_rule__IfExpressionTri__Group_1__3__Impl11753 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__Group_1__4__Impl_in_rule__IfExpressionTri__Group_1__411784 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__ElsePartAssignment_1_4_in_rule__IfExpressionTri__Group_1__4__Impl11811 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group__0__Impl_in_rule__IfExpressionKw__Group__011851 = new BitSet(new long[]{0x4408008FFFC800F0L,0x00000000000300C2L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group__1_in_rule__IfExpressionKw__Group__011854 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_62_in_rule__IfExpressionKw__Group__0__Impl11882 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group__1__Impl_in_rule__IfExpressionKw__Group__111913 = new BitSet(new long[]{0x8000000000000000L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group__2_in_rule__IfExpressionKw__Group__111916 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__ConditionAssignment_1_in_rule__IfExpressionKw__Group__1__Impl11943 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group__2__Impl_in_rule__IfExpressionKw__Group__211973 = new BitSet(new long[]{0x4408008FFFC800F0L,0x00000000000300C2L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group__3_in_rule__IfExpressionKw__Group__211976 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_rule__IfExpressionKw__Group__2__Impl12004 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group__3__Impl_in_rule__IfExpressionKw__Group__312035 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group__4_in_rule__IfExpressionKw__Group__312038 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__ThenPartAssignment_3_in_rule__IfExpressionKw__Group__3__Impl12065 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group__4__Impl_in_rule__IfExpressionKw__Group__412095 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group_4__0_in_rule__IfExpressionKw__Group__4__Impl12122 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group_4__0__Impl_in_rule__IfExpressionKw__Group_4__012163 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group_4_0__0_in_rule__IfExpressionKw__Group_4__0__Impl12190 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group_4_0__0__Impl_in_rule__IfExpressionKw__Group_4_0__012222 = new BitSet(new long[]{0x4408008FFFC800F0L,0x00000000000300C2L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group_4_0__1_in_rule__IfExpressionKw__Group_4_0__012225 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_64_in_rule__IfExpressionKw__Group_4_0__0__Impl12253 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group_4_0__1__Impl_in_rule__IfExpressionKw__Group_4_0__112284 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__ElsePartAssignment_4_0_1_in_rule__IfExpressionKw__Group_4_0__1__Impl12311 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__0__Impl_in_rule__SwitchExpression__Group__012345 = new BitSet(new long[]{0x0008008000000000L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__1_in_rule__SwitchExpression__Group__012348 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_65_in_rule__SwitchExpression__Group__0__Impl12376 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__1__Impl_in_rule__SwitchExpression__Group__112407 = new BitSet(new long[]{0x0008008000000000L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__2_in_rule__SwitchExpression__Group__112410 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group_1__0_in_rule__SwitchExpression__Group__1__Impl12437 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__2__Impl_in_rule__SwitchExpression__Group__212468 = new BitSet(new long[]{0x0000000000000000L,0x000000000000000CL});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__3_in_rule__SwitchExpression__Group__212471 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_39_in_rule__SwitchExpression__Group__2__Impl12499 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__3__Impl_in_rule__SwitchExpression__Group__312530 = new BitSet(new long[]{0x0000000000000000L,0x000000000000000CL});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__4_in_rule__SwitchExpression__Group__312533 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__CaseAssignment_3_in_rule__SwitchExpression__Group__3__Impl12560 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000008L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__4__Impl_in_rule__SwitchExpression__Group__412591 = new BitSet(new long[]{0x0800000000000000L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__5_in_rule__SwitchExpression__Group__412594 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_66_in_rule__SwitchExpression__Group__4__Impl12622 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__5__Impl_in_rule__SwitchExpression__Group__512653 = new BitSet(new long[]{0x0008008FFFC800F0L,0x00000000000300C0L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__6_in_rule__SwitchExpression__Group__512656 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_59_in_rule__SwitchExpression__Group__5__Impl12684 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__6__Impl_in_rule__SwitchExpression__Group__612715 = new BitSet(new long[]{0x0000010000000000L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__7_in_rule__SwitchExpression__Group__612718 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__DefaultExprAssignment_6_in_rule__SwitchExpression__Group__6__Impl12745 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__7__Impl_in_rule__SwitchExpression__Group__712775 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_40_in_rule__SwitchExpression__Group__7__Impl12803 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group_1__0__Impl_in_rule__SwitchExpression__Group_1__012850 = new BitSet(new long[]{0x0008008FFFC800F0L,0x00000000000300C0L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group_1__1_in_rule__SwitchExpression__Group_1__012853 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__SwitchExpression__Group_1__0__Impl12881 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group_1__1__Impl_in_rule__SwitchExpression__Group_1__112912 = new BitSet(new long[]{0x0010000000000000L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group_1__2_in_rule__SwitchExpression__Group_1__112915 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__SwitchExprAssignment_1_1_in_rule__SwitchExpression__Group_1__1__Impl12942 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group_1__2__Impl_in_rule__SwitchExpression__Group_1__212972 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_rule__SwitchExpression__Group_1__2__Impl13000 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Case__Group__0__Impl_in_rule__Case__Group__013037 = new BitSet(new long[]{0x0008008FFFC800F0L,0x00000000000300C0L});
-    public static final BitSet FOLLOW_rule__Case__Group__1_in_rule__Case__Group__013040 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_67_in_rule__Case__Group__0__Impl13068 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Case__Group__1__Impl_in_rule__Case__Group__113099 = new BitSet(new long[]{0x0800000000000000L});
-    public static final BitSet FOLLOW_rule__Case__Group__2_in_rule__Case__Group__113102 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Case__ConditionAssignment_1_in_rule__Case__Group__1__Impl13129 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Case__Group__2__Impl_in_rule__Case__Group__213159 = new BitSet(new long[]{0x0008008FFFC800F0L,0x00000000000300C0L});
-    public static final BitSet FOLLOW_rule__Case__Group__3_in_rule__Case__Group__213162 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_59_in_rule__Case__Group__2__Impl13190 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Case__Group__3__Impl_in_rule__Case__Group__313221 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Case__ThenParAssignment_3_in_rule__Case__Group__3__Impl13248 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OrExpression__Group__0__Impl_in_rule__OrExpression__Group__013286 = new BitSet(new long[]{0x0000000000000000L,0x0000000000002000L});
-    public static final BitSet FOLLOW_rule__OrExpression__Group__1_in_rule__OrExpression__Group__013289 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAndExpression_in_rule__OrExpression__Group__0__Impl13316 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OrExpression__Group__1__Impl_in_rule__OrExpression__Group__113345 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OrExpression__Group_1__0_in_rule__OrExpression__Group__1__Impl13372 = new BitSet(new long[]{0x0000000000000002L,0x0000000000002000L});
-    public static final BitSet FOLLOW_rule__OrExpression__Group_1__0__Impl_in_rule__OrExpression__Group_1__013407 = new BitSet(new long[]{0x0000000000000000L,0x0000000000002000L});
-    public static final BitSet FOLLOW_rule__OrExpression__Group_1__1_in_rule__OrExpression__Group_1__013410 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OrExpression__Group_1__1__Impl_in_rule__OrExpression__Group_1__113468 = new BitSet(new long[]{0x0008008FFFC800F0L,0x00000000000300C0L});
-    public static final BitSet FOLLOW_rule__OrExpression__Group_1__2_in_rule__OrExpression__Group_1__113471 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OrExpression__OperatorAssignment_1_1_in_rule__OrExpression__Group_1__1__Impl13498 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OrExpression__Group_1__2__Impl_in_rule__OrExpression__Group_1__213528 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OrExpression__RightAssignment_1_2_in_rule__OrExpression__Group_1__2__Impl13555 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AndExpression__Group__0__Impl_in_rule__AndExpression__Group__013591 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L});
-    public static final BitSet FOLLOW_rule__AndExpression__Group__1_in_rule__AndExpression__Group__013594 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImpliesExpression_in_rule__AndExpression__Group__0__Impl13621 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AndExpression__Group__1__Impl_in_rule__AndExpression__Group__113650 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AndExpression__Group_1__0_in_rule__AndExpression__Group__1__Impl13677 = new BitSet(new long[]{0x0000000000000002L,0x0000000000004000L});
-    public static final BitSet FOLLOW_rule__AndExpression__Group_1__0__Impl_in_rule__AndExpression__Group_1__013712 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L});
-    public static final BitSet FOLLOW_rule__AndExpression__Group_1__1_in_rule__AndExpression__Group_1__013715 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AndExpression__Group_1__1__Impl_in_rule__AndExpression__Group_1__113773 = new BitSet(new long[]{0x0008008FFFC800F0L,0x00000000000300C0L});
-    public static final BitSet FOLLOW_rule__AndExpression__Group_1__2_in_rule__AndExpression__Group_1__113776 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AndExpression__OperatorAssignment_1_1_in_rule__AndExpression__Group_1__1__Impl13803 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AndExpression__Group_1__2__Impl_in_rule__AndExpression__Group_1__213833 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AndExpression__RightAssignment_1_2_in_rule__AndExpression__Group_1__2__Impl13860 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ImpliesExpression__Group__0__Impl_in_rule__ImpliesExpression__Group__013896 = new BitSet(new long[]{0x0000000000000000L,0x0000000000008000L});
-    public static final BitSet FOLLOW_rule__ImpliesExpression__Group__1_in_rule__ImpliesExpression__Group__013899 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRelationalExpression_in_rule__ImpliesExpression__Group__0__Impl13926 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ImpliesExpression__Group__1__Impl_in_rule__ImpliesExpression__Group__113955 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ImpliesExpression__Group_1__0_in_rule__ImpliesExpression__Group__1__Impl13982 = new BitSet(new long[]{0x0000000000000002L,0x0000000000008000L});
-    public static final BitSet FOLLOW_rule__ImpliesExpression__Group_1__0__Impl_in_rule__ImpliesExpression__Group_1__014017 = new BitSet(new long[]{0x0000000000000000L,0x0000000000008000L});
-    public static final BitSet FOLLOW_rule__ImpliesExpression__Group_1__1_in_rule__ImpliesExpression__Group_1__014020 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ImpliesExpression__Group_1__1__Impl_in_rule__ImpliesExpression__Group_1__114078 = new BitSet(new long[]{0x0008008FFFC800F0L,0x00000000000300C0L});
-    public static final BitSet FOLLOW_rule__ImpliesExpression__Group_1__2_in_rule__ImpliesExpression__Group_1__114081 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ImpliesExpression__OperatorAssignment_1_1_in_rule__ImpliesExpression__Group_1__1__Impl14108 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ImpliesExpression__Group_1__2__Impl_in_rule__ImpliesExpression__Group_1__214138 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ImpliesExpression__RightAssignment_1_2_in_rule__ImpliesExpression__Group_1__2__Impl14165 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RelationalExpression__Group__0__Impl_in_rule__RelationalExpression__Group__014201 = new BitSet(new long[]{0x000000000003F000L});
-    public static final BitSet FOLLOW_rule__RelationalExpression__Group__1_in_rule__RelationalExpression__Group__014204 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAdditiveExpression_in_rule__RelationalExpression__Group__0__Impl14231 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RelationalExpression__Group__1__Impl_in_rule__RelationalExpression__Group__114260 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RelationalExpression__Group_1__0_in_rule__RelationalExpression__Group__1__Impl14287 = new BitSet(new long[]{0x000000000003F002L});
-    public static final BitSet FOLLOW_rule__RelationalExpression__Group_1__0__Impl_in_rule__RelationalExpression__Group_1__014322 = new BitSet(new long[]{0x000000000003F000L});
-    public static final BitSet FOLLOW_rule__RelationalExpression__Group_1__1_in_rule__RelationalExpression__Group_1__014325 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RelationalExpression__Group_1__1__Impl_in_rule__RelationalExpression__Group_1__114383 = new BitSet(new long[]{0x0008008FFFC800F0L,0x00000000000300C0L});
-    public static final BitSet FOLLOW_rule__RelationalExpression__Group_1__2_in_rule__RelationalExpression__Group_1__114386 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RelationalExpression__OperatorAssignment_1_1_in_rule__RelationalExpression__Group_1__1__Impl14413 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RelationalExpression__Group_1__2__Impl_in_rule__RelationalExpression__Group_1__214443 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RelationalExpression__RightAssignment_1_2_in_rule__RelationalExpression__Group_1__2__Impl14470 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AdditiveExpression__Group__0__Impl_in_rule__AdditiveExpression__Group__014506 = new BitSet(new long[]{0x00000000000C0000L});
-    public static final BitSet FOLLOW_rule__AdditiveExpression__Group__1_in_rule__AdditiveExpression__Group__014509 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMultiplicativeExpression_in_rule__AdditiveExpression__Group__0__Impl14536 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AdditiveExpression__Group__1__Impl_in_rule__AdditiveExpression__Group__114565 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AdditiveExpression__Group_1__0_in_rule__AdditiveExpression__Group__1__Impl14592 = new BitSet(new long[]{0x00000000000C0002L});
-    public static final BitSet FOLLOW_rule__AdditiveExpression__Group_1__0__Impl_in_rule__AdditiveExpression__Group_1__014627 = new BitSet(new long[]{0x00000000000C0000L});
-    public static final BitSet FOLLOW_rule__AdditiveExpression__Group_1__1_in_rule__AdditiveExpression__Group_1__014630 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AdditiveExpression__Group_1__1__Impl_in_rule__AdditiveExpression__Group_1__114688 = new BitSet(new long[]{0x0008008FFFC800F0L,0x00000000000300C0L});
-    public static final BitSet FOLLOW_rule__AdditiveExpression__Group_1__2_in_rule__AdditiveExpression__Group_1__114691 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AdditiveExpression__NameAssignment_1_1_in_rule__AdditiveExpression__Group_1__1__Impl14718 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AdditiveExpression__Group_1__2__Impl_in_rule__AdditiveExpression__Group_1__214748 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AdditiveExpression__ParamsAssignment_1_2_in_rule__AdditiveExpression__Group_1__2__Impl14775 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MultiplicativeExpression__Group__0__Impl_in_rule__MultiplicativeExpression__Group__014811 = new BitSet(new long[]{0x0000000000300000L});
-    public static final BitSet FOLLOW_rule__MultiplicativeExpression__Group__1_in_rule__MultiplicativeExpression__Group__014814 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleUnaryOrInfixExpression_in_rule__MultiplicativeExpression__Group__0__Impl14841 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MultiplicativeExpression__Group__1__Impl_in_rule__MultiplicativeExpression__Group__114870 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MultiplicativeExpression__Group_1__0_in_rule__MultiplicativeExpression__Group__1__Impl14897 = new BitSet(new long[]{0x0000000000300002L});
-    public static final BitSet FOLLOW_rule__MultiplicativeExpression__Group_1__0__Impl_in_rule__MultiplicativeExpression__Group_1__014932 = new BitSet(new long[]{0x0000000000300000L});
-    public static final BitSet FOLLOW_rule__MultiplicativeExpression__Group_1__1_in_rule__MultiplicativeExpression__Group_1__014935 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MultiplicativeExpression__Group_1__1__Impl_in_rule__MultiplicativeExpression__Group_1__114993 = new BitSet(new long[]{0x0008008FFFC800F0L,0x00000000000300C0L});
-    public static final BitSet FOLLOW_rule__MultiplicativeExpression__Group_1__2_in_rule__MultiplicativeExpression__Group_1__114996 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MultiplicativeExpression__NameAssignment_1_1_in_rule__MultiplicativeExpression__Group_1__1__Impl15023 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MultiplicativeExpression__Group_1__2__Impl_in_rule__MultiplicativeExpression__Group_1__215053 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MultiplicativeExpression__ParamsAssignment_1_2_in_rule__MultiplicativeExpression__Group_1__2__Impl15080 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UnaryExpression__Group__0__Impl_in_rule__UnaryExpression__Group__015116 = new BitSet(new long[]{0x0008008FFFC800F0L,0x00000000000300C0L});
-    public static final BitSet FOLLOW_rule__UnaryExpression__Group__1_in_rule__UnaryExpression__Group__015119 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UnaryExpression__NameAssignment_0_in_rule__UnaryExpression__Group__0__Impl15146 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UnaryExpression__Group__1__Impl_in_rule__UnaryExpression__Group__115176 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UnaryExpression__ParamsAssignment_1_in_rule__UnaryExpression__Group__1__Impl15203 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group__0__Impl_in_rule__InfixExpression__Group__015237 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group__1_in_rule__InfixExpression__Group__015240 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePrimaryExpression_in_rule__InfixExpression__Group__0__Impl15267 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group__1__Impl_in_rule__InfixExpression__Group__115296 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Alternatives_1_in_rule__InfixExpression__Group__1__Impl15323 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0__0__Impl_in_rule__InfixExpression__Group_1_0__015358 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0__1_in_rule__InfixExpression__Group_1_0__015361 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0__1__Impl_in_rule__InfixExpression__Group_1_0__115419 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0__2_in_rule__InfixExpression__Group_1_0__115422 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_68_in_rule__InfixExpression__Group_1_0__1__Impl15450 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0__2__Impl_in_rule__InfixExpression__Group_1_0__215481 = new BitSet(new long[]{0x0008000000000000L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0__3_in_rule__InfixExpression__Group_1_0__215484 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__NameAssignment_1_0_2_in_rule__InfixExpression__Group_1_0__2__Impl15511 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0__3__Impl_in_rule__InfixExpression__Group_1_0__315541 = new BitSet(new long[]{0x4418008FFFC800F0L,0x00000000000300C2L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0__4_in_rule__InfixExpression__Group_1_0__315544 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__InfixExpression__Group_1_0__3__Impl15572 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0__4__Impl_in_rule__InfixExpression__Group_1_0__415603 = new BitSet(new long[]{0x4418008FFFC800F0L,0x00000000000300C2L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0__5_in_rule__InfixExpression__Group_1_0__415606 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0_4__0_in_rule__InfixExpression__Group_1_0__4__Impl15633 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0__5__Impl_in_rule__InfixExpression__Group_1_0__515664 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_rule__InfixExpression__Group_1_0__5__Impl15692 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0_4__0__Impl_in_rule__InfixExpression__Group_1_0_4__015735 = new BitSet(new long[]{0x0001000000000000L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0_4__1_in_rule__InfixExpression__Group_1_0_4__015738 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__ParamsAssignment_1_0_4_0_in_rule__InfixExpression__Group_1_0_4__0__Impl15765 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0_4__1__Impl_in_rule__InfixExpression__Group_1_0_4__115795 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0_4_1__0_in_rule__InfixExpression__Group_1_0_4__1__Impl15822 = new BitSet(new long[]{0x0001000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0_4_1__0__Impl_in_rule__InfixExpression__Group_1_0_4_1__015857 = new BitSet(new long[]{0x4408008FFFC800F0L,0x00000000000300C2L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0_4_1__1_in_rule__InfixExpression__Group_1_0_4_1__015860 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_rule__InfixExpression__Group_1_0_4_1__0__Impl15888 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0_4_1__1__Impl_in_rule__InfixExpression__Group_1_0_4_1__115919 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__ParamsAssignment_1_0_4_1_1_in_rule__InfixExpression__Group_1_0_4_1__1__Impl15946 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_1__0__Impl_in_rule__InfixExpression__Group_1_1__015980 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_1__1_in_rule__InfixExpression__Group_1_1__015983 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_1__1__Impl_in_rule__InfixExpression__Group_1_1__116041 = new BitSet(new long[]{0x0000000E00000010L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_1__2_in_rule__InfixExpression__Group_1_1__116044 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_68_in_rule__InfixExpression__Group_1_1__1__Impl16072 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_1__2__Impl_in_rule__InfixExpression__Group_1_1__216103 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__TypeAssignment_1_1_2_in_rule__InfixExpression__Group_1_1__2__Impl16130 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_2__0__Impl_in_rule__InfixExpression__Group_1_2__016166 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_2__1_in_rule__InfixExpression__Group_1_2__016169 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_2__1__Impl_in_rule__InfixExpression__Group_1_2__116227 = new BitSet(new long[]{0x0000000000000000L,0x0000000000010000L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_2__2_in_rule__InfixExpression__Group_1_2__116230 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_68_in_rule__InfixExpression__Group_1_2__1__Impl16258 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_2__2__Impl_in_rule__InfixExpression__Group_1_2__216289 = new BitSet(new long[]{0x0008000000000000L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_2__3_in_rule__InfixExpression__Group_1_2__216292 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__NameAssignment_1_2_2_in_rule__InfixExpression__Group_1_2__2__Impl16319 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_2__3__Impl_in_rule__InfixExpression__Group_1_2__316349 = new BitSet(new long[]{0x0000000E00000010L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_2__4_in_rule__InfixExpression__Group_1_2__316352 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__InfixExpression__Group_1_2__3__Impl16380 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_2__4__Impl_in_rule__InfixExpression__Group_1_2__416411 = new BitSet(new long[]{0x0010000000000000L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_2__5_in_rule__InfixExpression__Group_1_2__416414 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__TypeAssignment_1_2_4_in_rule__InfixExpression__Group_1_2__4__Impl16441 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_2__5__Impl_in_rule__InfixExpression__Group_1_2__516471 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_rule__InfixExpression__Group_1_2__5__Impl16499 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3__0__Impl_in_rule__InfixExpression__Group_1_3__016542 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3__1_in_rule__InfixExpression__Group_1_3__016545 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3__1__Impl_in_rule__InfixExpression__Group_1_3__116603 = new BitSet(new long[]{0x000000007F800000L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3__2_in_rule__InfixExpression__Group_1_3__116606 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_68_in_rule__InfixExpression__Group_1_3__1__Impl16634 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3__2__Impl_in_rule__InfixExpression__Group_1_3__216665 = new BitSet(new long[]{0x0008000000000000L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3__3_in_rule__InfixExpression__Group_1_3__216668 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__NameAssignment_1_3_2_in_rule__InfixExpression__Group_1_3__2__Impl16695 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3__3__Impl_in_rule__InfixExpression__Group_1_3__316725 = new BitSet(new long[]{0x4408008FFFC800F0L,0x00000000000300C2L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3__4_in_rule__InfixExpression__Group_1_3__316728 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__InfixExpression__Group_1_3__3__Impl16756 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3__4__Impl_in_rule__InfixExpression__Group_1_3__416787 = new BitSet(new long[]{0x4408008FFFC800F0L,0x00000000000300C2L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3__5_in_rule__InfixExpression__Group_1_3__416790 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3_4__0_in_rule__InfixExpression__Group_1_3__4__Impl16817 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3__5__Impl_in_rule__InfixExpression__Group_1_3__516848 = new BitSet(new long[]{0x0010000000000000L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3__6_in_rule__InfixExpression__Group_1_3__516851 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__ExpAssignment_1_3_5_in_rule__InfixExpression__Group_1_3__5__Impl16878 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3__6__Impl_in_rule__InfixExpression__Group_1_3__616908 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_rule__InfixExpression__Group_1_3__6__Impl16936 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3_4__0__Impl_in_rule__InfixExpression__Group_1_3_4__016981 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000020L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3_4__1_in_rule__InfixExpression__Group_1_3_4__016984 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__VarAssignment_1_3_4_0_in_rule__InfixExpression__Group_1_3_4__0__Impl17011 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3_4__1__Impl_in_rule__InfixExpression__Group_1_3_4__117041 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_69_in_rule__InfixExpression__Group_1_3_4__1__Impl17069 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ParanthesizedExpression__Group__0__Impl_in_rule__ParanthesizedExpression__Group__017104 = new BitSet(new long[]{0x4408008FFFC800F0L,0x00000000000300C2L});
-    public static final BitSet FOLLOW_rule__ParanthesizedExpression__Group__1_in_rule__ParanthesizedExpression__Group__017107 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__ParanthesizedExpression__Group__0__Impl17135 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ParanthesizedExpression__Group__1__Impl_in_rule__ParanthesizedExpression__Group__117166 = new BitSet(new long[]{0x0010000000000000L});
-    public static final BitSet FOLLOW_rule__ParanthesizedExpression__Group__2_in_rule__ParanthesizedExpression__Group__117169 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__ParanthesizedExpression__Group__1__Impl17196 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ParanthesizedExpression__Group__2__Impl_in_rule__ParanthesizedExpression__Group__217225 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_rule__ParanthesizedExpression__Group__2__Impl17253 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalVarExpression__Group__0__Impl_in_rule__GlobalVarExpression__Group__017290 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__GlobalVarExpression__Group__1_in_rule__GlobalVarExpression__Group__017293 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_70_in_rule__GlobalVarExpression__Group__0__Impl17321 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalVarExpression__Group__1__Impl_in_rule__GlobalVarExpression__Group__117352 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalVarExpression__NameAssignment_1_in_rule__GlobalVarExpression__Group__1__Impl17379 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group__0__Impl_in_rule__OperationCall__Group__017413 = new BitSet(new long[]{0x0008000000000000L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group__1_in_rule__OperationCall__Group__017416 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OperationCall__NameAssignment_0_in_rule__OperationCall__Group__0__Impl17443 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group__1__Impl_in_rule__OperationCall__Group__117473 = new BitSet(new long[]{0x4418008FFFC800F0L,0x00000000000300C2L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group__2_in_rule__OperationCall__Group__117476 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__OperationCall__Group__1__Impl17504 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group__2__Impl_in_rule__OperationCall__Group__217535 = new BitSet(new long[]{0x4418008FFFC800F0L,0x00000000000300C2L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group__3_in_rule__OperationCall__Group__217538 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group_2__0_in_rule__OperationCall__Group__2__Impl17565 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group__3__Impl_in_rule__OperationCall__Group__317596 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_rule__OperationCall__Group__3__Impl17624 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group_2__0__Impl_in_rule__OperationCall__Group_2__017663 = new BitSet(new long[]{0x0001000000000000L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group_2__1_in_rule__OperationCall__Group_2__017666 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OperationCall__ParamsAssignment_2_0_in_rule__OperationCall__Group_2__0__Impl17693 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group_2__1__Impl_in_rule__OperationCall__Group_2__117723 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group_2_1__0_in_rule__OperationCall__Group_2__1__Impl17750 = new BitSet(new long[]{0x0001000000000002L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group_2_1__0__Impl_in_rule__OperationCall__Group_2_1__017785 = new BitSet(new long[]{0x4408008FFFC800F0L,0x00000000000300C2L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group_2_1__1_in_rule__OperationCall__Group_2_1__017788 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_rule__OperationCall__Group_2_1__0__Impl17816 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group_2_1__1__Impl_in_rule__OperationCall__Group_2_1__117847 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OperationCall__ParamsAssignment_2_1_1_in_rule__OperationCall__Group_2_1__1__Impl17874 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group__0__Impl_in_rule__ListLiteral__Group__017908 = new BitSet(new long[]{0x0000008000000000L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group__1_in_rule__ListLiteral__Group__017911 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group__1__Impl_in_rule__ListLiteral__Group__117969 = new BitSet(new long[]{0x4408018FFFC800F0L,0x00000000000300C2L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group__2_in_rule__ListLiteral__Group__117972 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_39_in_rule__ListLiteral__Group__1__Impl18000 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group__2__Impl_in_rule__ListLiteral__Group__218031 = new BitSet(new long[]{0x4408018FFFC800F0L,0x00000000000300C2L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group__3_in_rule__ListLiteral__Group__218034 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group_2__0_in_rule__ListLiteral__Group__2__Impl18061 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group__3__Impl_in_rule__ListLiteral__Group__318092 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_40_in_rule__ListLiteral__Group__3__Impl18120 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group_2__0__Impl_in_rule__ListLiteral__Group_2__018159 = new BitSet(new long[]{0x0001000000000000L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group_2__1_in_rule__ListLiteral__Group_2__018162 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ListLiteral__ElementsAssignment_2_0_in_rule__ListLiteral__Group_2__0__Impl18189 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group_2__1__Impl_in_rule__ListLiteral__Group_2__118219 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group_2_1__0_in_rule__ListLiteral__Group_2__1__Impl18246 = new BitSet(new long[]{0x0001000000000002L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group_2_1__0__Impl_in_rule__ListLiteral__Group_2_1__018281 = new BitSet(new long[]{0x4408008FFFC800F0L,0x00000000000300C2L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group_2_1__1_in_rule__ListLiteral__Group_2_1__018284 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_rule__ListLiteral__Group_2_1__0__Impl18312 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group_2_1__1__Impl_in_rule__ListLiteral__Group_2_1__118343 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ListLiteral__ElementsAssignment_2_1_1_in_rule__ListLiteral__Group_2_1__1__Impl18370 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConstructorCallExpression__Group__0__Impl_in_rule__ConstructorCallExpression__Group__018404 = new BitSet(new long[]{0x0000000E00000010L});
-    public static final BitSet FOLLOW_rule__ConstructorCallExpression__Group__1_in_rule__ConstructorCallExpression__Group__018407 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__ConstructorCallExpression__Group__0__Impl18435 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConstructorCallExpression__Group__1__Impl_in_rule__ConstructorCallExpression__Group__118466 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConstructorCallExpression__TypeAssignment_1_in_rule__ConstructorCallExpression__Group__1__Impl18493 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TypeSelectExpression__Group__0__Impl_in_rule__TypeSelectExpression__Group__018527 = new BitSet(new long[]{0x0008000000000000L});
-    public static final BitSet FOLLOW_rule__TypeSelectExpression__Group__1_in_rule__TypeSelectExpression__Group__018530 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TypeSelectExpression__NameAssignment_0_in_rule__TypeSelectExpression__Group__0__Impl18557 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TypeSelectExpression__Group__1__Impl_in_rule__TypeSelectExpression__Group__118587 = new BitSet(new long[]{0x0000000E00000010L});
-    public static final BitSet FOLLOW_rule__TypeSelectExpression__Group__2_in_rule__TypeSelectExpression__Group__118590 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__TypeSelectExpression__Group__1__Impl18618 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TypeSelectExpression__Group__2__Impl_in_rule__TypeSelectExpression__Group__218649 = new BitSet(new long[]{0x0010000000000000L});
-    public static final BitSet FOLLOW_rule__TypeSelectExpression__Group__3_in_rule__TypeSelectExpression__Group__218652 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TypeSelectExpression__TypeAssignment_2_in_rule__TypeSelectExpression__Group__2__Impl18679 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TypeSelectExpression__Group__3__Impl_in_rule__TypeSelectExpression__Group__318709 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_rule__TypeSelectExpression__Group__3__Impl18737 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__Group__0__Impl_in_rule__CollectionExpression__Group__018776 = new BitSet(new long[]{0x0008000000000000L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__Group__1_in_rule__CollectionExpression__Group__018779 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__NameAssignment_0_in_rule__CollectionExpression__Group__0__Impl18806 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__Group__1__Impl_in_rule__CollectionExpression__Group__118836 = new BitSet(new long[]{0x4408008FFFC800F0L,0x00000000000300C2L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__Group__2_in_rule__CollectionExpression__Group__118839 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__CollectionExpression__Group__1__Impl18867 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__Group__2__Impl_in_rule__CollectionExpression__Group__218898 = new BitSet(new long[]{0x4408008FFFC800F0L,0x00000000000300C2L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__Group__3_in_rule__CollectionExpression__Group__218901 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__Group_2__0_in_rule__CollectionExpression__Group__2__Impl18928 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__Group__3__Impl_in_rule__CollectionExpression__Group__318959 = new BitSet(new long[]{0x0010000000000000L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__Group__4_in_rule__CollectionExpression__Group__318962 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__ExpAssignment_3_in_rule__CollectionExpression__Group__3__Impl18989 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__Group__4__Impl_in_rule__CollectionExpression__Group__419019 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_rule__CollectionExpression__Group__4__Impl19047 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__Group_2__0__Impl_in_rule__CollectionExpression__Group_2__019088 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000020L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__Group_2__1_in_rule__CollectionExpression__Group_2__019091 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__VarAssignment_2_0_in_rule__CollectionExpression__Group_2__0__Impl19118 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__Group_2__1__Impl_in_rule__CollectionExpression__Group_2__119148 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_69_in_rule__CollectionExpression__Group_2__1__Impl19176 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionType__Group__0__Impl_in_rule__CollectionType__Group__019211 = new BitSet(new long[]{0x0000200000000000L});
-    public static final BitSet FOLLOW_rule__CollectionType__Group__1_in_rule__CollectionType__Group__019214 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionType__ClAssignment_0_in_rule__CollectionType__Group__0__Impl19241 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionType__Group__1__Impl_in_rule__CollectionType__Group__119271 = new BitSet(new long[]{0x0000000E00000010L});
-    public static final BitSet FOLLOW_rule__CollectionType__Group__2_in_rule__CollectionType__Group__119274 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_45_in_rule__CollectionType__Group__1__Impl19302 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionType__Group__2__Impl_in_rule__CollectionType__Group__219333 = new BitSet(new long[]{0x0000400000000000L});
-    public static final BitSet FOLLOW_rule__CollectionType__Group__3_in_rule__CollectionType__Group__219336 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionType__Id1Assignment_2_in_rule__CollectionType__Group__2__Impl19363 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionType__Group__3__Impl_in_rule__CollectionType__Group__319393 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rule__CollectionType__Group__3__Impl19421 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleType__Group__0__Impl_in_rule__SimpleType__Group__019460 = new BitSet(new long[]{0x0200000000000000L});
-    public static final BitSet FOLLOW_rule__SimpleType__Group__1_in_rule__SimpleType__Group__019463 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleType__IdAssignment_0_in_rule__SimpleType__Group__0__Impl19490 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleType__Group__1__Impl_in_rule__SimpleType__Group__119520 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleType__Group_1__0_in_rule__SimpleType__Group__1__Impl19547 = new BitSet(new long[]{0x0200000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleType__Group_1__0__Impl_in_rule__SimpleType__Group_1__019582 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__SimpleType__Group_1__1_in_rule__SimpleType__Group_1__019585 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_57_in_rule__SimpleType__Group_1__0__Impl19613 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleType__Group_1__1__Impl_in_rule__SimpleType__Group_1__119644 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleType__IdAssignment_1_1_in_rule__SimpleType__Group_1__1__Impl19671 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_rule__ExportModel__ExtensionAssignment_0_119715 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__ExportModel__NameAssignment_0_219754 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedID_in_rule__ExportModel__TargetGrammarAssignment_0_419789 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImport_in_rule__ExportModel__ImportsAssignment_119824 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExtension_in_rule__ExportModel__ExtensionsAssignment_219855 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInterface_in_rule__ExportModel__InterfacesAssignment_3_219886 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExport_in_rule__ExportModel__ExportsAssignment_419917 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__Import__PackageAssignment_119952 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__Import__NameAssignment_2_119987 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedID_in_rule__Extension__ExtensionAssignment_120018 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedID_in_rule__Interface__TypeAssignment_020053 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__Interface__GuardAssignment_1_120088 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInterfaceItem_in_rule__Interface__ItemsAssignment_2_120119 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInterfaceItem_in_rule__Interface__ItemsAssignment_2_2_120150 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_18_in_rule__InterfaceField__UnorderedAssignment_020186 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__InterfaceField__FieldAssignment_120229 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_18_in_rule__InterfaceNavigation__UnorderedAssignment_120269 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__InterfaceNavigation__RefAssignment_220312 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_49_in_rule__InterfaceExpression__RefAssignment_120352 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_18_in_rule__InterfaceExpression__UnorderedAssignment_220396 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__InterfaceExpression__ExprAssignment_420435 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__Export__LookupAssignment_1_020471 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__Export__LookupPredicateAssignment_1_1_120510 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedID_in_rule__Export__TypeAssignment_220545 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__Export__QualifiedNameAssignment_3_120585 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__Export__NamingAssignment_3_220624 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__Export__GuardAssignment_4_120655 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__Export__FragmentUniqueAssignment_6_220691 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__Export__FragmentAttributeAssignment_6_520734 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_75_in_rule__Export__FingerprintAssignment_7_0_020774 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_76_in_rule__Export__ResourceFingerprintAssignment_7_0_120818 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAttribute_in_rule__Export__AttributesAssignment_8_0_120857 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAttribute_in_rule__Export__AttributesAssignment_8_0_2_120888 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleUserData_in_rule__Export__UserDataAssignment_8_1_120919 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleUserData_in_rule__Export__UserDataAssignment_8_1_2_120950 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__UserData__NameAssignment_020981 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__UserData__ExprAssignment_221012 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__Attribute__AttributeAssignment21047 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__LetExpression__IdentifierAssignment_121082 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__LetExpression__VarExprAssignment_321113 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__LetExpression__TargetAssignment_521144 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleType_in_rule__CastedExpression__TypeAssignment_121175 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__CastedExpression__TargetAssignment_321206 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_rule__ChainExpression__NextAssignment_1_221237 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_rule__IfExpressionTri__ThenPartAssignment_1_221268 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_rule__IfExpressionTri__ElsePartAssignment_1_421299 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_rule__IfExpressionKw__ConditionAssignment_121330 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_rule__IfExpressionKw__ThenPartAssignment_321361 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_rule__IfExpressionKw__ElsePartAssignment_4_0_121392 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOrExpression_in_rule__SwitchExpression__SwitchExprAssignment_1_121423 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCase_in_rule__SwitchExpression__CaseAssignment_321454 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOrExpression_in_rule__SwitchExpression__DefaultExprAssignment_621485 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOrExpression_in_rule__Case__ConditionAssignment_121516 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOrExpression_in_rule__Case__ThenParAssignment_321547 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_77_in_rule__OrExpression__OperatorAssignment_1_121583 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAndExpression_in_rule__OrExpression__RightAssignment_1_221622 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_78_in_rule__AndExpression__OperatorAssignment_1_121658 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImpliesExpression_in_rule__AndExpression__RightAssignment_1_221697 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_79_in_rule__ImpliesExpression__OperatorAssignment_1_121733 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRelationalExpression_in_rule__ImpliesExpression__RightAssignment_1_221772 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RelationalExpression__OperatorAlternatives_1_1_0_in_rule__RelationalExpression__OperatorAssignment_1_121803 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAdditiveExpression_in_rule__RelationalExpression__RightAssignment_1_221836 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AdditiveExpression__NameAlternatives_1_1_0_in_rule__AdditiveExpression__NameAssignment_1_121867 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMultiplicativeExpression_in_rule__AdditiveExpression__ParamsAssignment_1_221900 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MultiplicativeExpression__NameAlternatives_1_1_0_in_rule__MultiplicativeExpression__NameAssignment_1_121931 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleUnaryOrInfixExpression_in_rule__MultiplicativeExpression__ParamsAssignment_1_221964 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UnaryExpression__NameAlternatives_0_0_in_rule__UnaryExpression__NameAssignment_021995 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInfixExpression_in_rule__UnaryExpression__ParamsAssignment_122028 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__InfixExpression__NameAssignment_1_0_222059 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__InfixExpression__ParamsAssignment_1_0_4_022090 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__InfixExpression__ParamsAssignment_1_0_4_1_122121 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleType_in_rule__InfixExpression__TypeAssignment_1_1_222152 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_80_in_rule__InfixExpression__NameAssignment_1_2_222188 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleType_in_rule__InfixExpression__TypeAssignment_1_2_422227 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__NameAlternatives_1_3_2_0_in_rule__InfixExpression__NameAssignment_1_3_222258 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__InfixExpression__VarAssignment_1_3_4_022291 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__InfixExpression__ExpAssignment_1_3_522322 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BooleanLiteral__ValAlternatives_0_in_rule__BooleanLiteral__ValAssignment22353 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__IntegerLiteral__ValAssignment22386 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_81_in_rule__NullLiteral__ValAssignment22422 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_REAL_in_rule__RealLiteral__ValAssignment22461 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__StringLiteral__ValAssignment22492 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__GlobalVarExpression__NameAssignment_122523 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleType_in_rule__FeatureCall__TypeAssignment_122554 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__OperationCall__NameAssignment_022585 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__OperationCall__ParamsAssignment_2_022616 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__OperationCall__ParamsAssignment_2_1_122647 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__ListLiteral__ElementsAssignment_2_022678 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__ListLiteral__ElementsAssignment_2_1_122709 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleType_in_rule__ConstructorCallExpression__TypeAssignment_122740 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_80_in_rule__TypeSelectExpression__NameAssignment_022776 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleType_in_rule__TypeSelectExpression__TypeAssignment_222815 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__NameAlternatives_0_0_in_rule__CollectionExpression__NameAssignment_022846 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__CollectionExpression__VarAssignment_2_022879 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__CollectionExpression__ExpAssignment_322910 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionType__ClAlternatives_0_0_in_rule__CollectionType__ClAssignment_022941 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleType_in_rule__CollectionType__Id1Assignment_222974 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__SimpleType__IdAssignment_023005 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__SimpleType__IdAssignment_1_123036 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCastedExpression_in_synpred6_InternalExport3206 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group_4__0_in_synpred80_InternalExport12122 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_1 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_2 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x0000020000000000L});
+    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000085000000000L});
+    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0000020000000002L});
+    public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000080000000002L});
+    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000085000000002L});
+    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000080000000010L});
+    public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000002000000000L});
+    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000008000000000L});
+    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000010000000000L});
+    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000000012L});
+    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000040000000000L});
+    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000B00000000000L});
+    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000800000000002L});
+    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x4408008FFFC800F0L,0x00000000000300C2L});
+    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000400000000000L});
+    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0006000000040010L});
+    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0001000000000000L});
+    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0001000000000002L});
+    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000000000040010L});
+    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x000A000000040000L});
+    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0010000000000000L});
+    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0000000000000010L,0x0000000000000100L});
+    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0000248000000000L});
+    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x01A0010000000000L,0x0000000000001800L});
+    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0180000000000002L});
+    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000200000000000L});
+    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x4408008FFFC800F0L,0x00000000000302C2L});
+    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0000800000000000L});
+    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0040000000000000L,0x0000000000000400L});
+    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0008000000000000L});
+    public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x0000100000000000L});
+    public static final BitSet FOLLOW_36 = new BitSet(new long[]{0x0001100000000000L});
+    public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x0200000000000000L});
+    public static final BitSet FOLLOW_38 = new BitSet(new long[]{0x0200000000000002L});
+    public static final BitSet FOLLOW_39 = new BitSet(new long[]{0x0800000000000000L});
+    public static final BitSet FOLLOW_40 = new BitSet(new long[]{0x0000000E00000010L});
+    public static final BitSet FOLLOW_41 = new BitSet(new long[]{0x1000000000000000L});
+    public static final BitSet FOLLOW_42 = new BitSet(new long[]{0x1000000000000002L});
+    public static final BitSet FOLLOW_43 = new BitSet(new long[]{0x2000000000000000L});
+    public static final BitSet FOLLOW_44 = new BitSet(new long[]{0x8000000000000000L});
+    public static final BitSet FOLLOW_45 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000001L});
+    public static final BitSet FOLLOW_46 = new BitSet(new long[]{0x0008008000000000L});
+    public static final BitSet FOLLOW_47 = new BitSet(new long[]{0x0000000000000000L,0x000000000000000CL});
+    public static final BitSet FOLLOW_48 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000008L});
+    public static final BitSet FOLLOW_49 = new BitSet(new long[]{0x0008008FFFC800F0L,0x00000000000300C0L});
+    public static final BitSet FOLLOW_50 = new BitSet(new long[]{0x0000000000000000L,0x0000000000002000L});
+    public static final BitSet FOLLOW_51 = new BitSet(new long[]{0x0000000000000002L,0x0000000000002000L});
+    public static final BitSet FOLLOW_52 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L});
+    public static final BitSet FOLLOW_53 = new BitSet(new long[]{0x0000000000000002L,0x0000000000004000L});
+    public static final BitSet FOLLOW_54 = new BitSet(new long[]{0x0000000000000000L,0x0000000000008000L});
+    public static final BitSet FOLLOW_55 = new BitSet(new long[]{0x0000000000000002L,0x0000000000008000L});
+    public static final BitSet FOLLOW_56 = new BitSet(new long[]{0x000000000003F000L});
+    public static final BitSet FOLLOW_57 = new BitSet(new long[]{0x000000000003F002L});
+    public static final BitSet FOLLOW_58 = new BitSet(new long[]{0x00000000000C0000L});
+    public static final BitSet FOLLOW_59 = new BitSet(new long[]{0x00000000000C0002L});
+    public static final BitSet FOLLOW_60 = new BitSet(new long[]{0x0000000000300000L});
+    public static final BitSet FOLLOW_61 = new BitSet(new long[]{0x0000000000300002L});
+    public static final BitSet FOLLOW_62 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
+    public static final BitSet FOLLOW_63 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000010L});
+    public static final BitSet FOLLOW_64 = new BitSet(new long[]{0x4418008FFFC800F0L,0x00000000000300C2L});
+    public static final BitSet FOLLOW_65 = new BitSet(new long[]{0x0000000000000000L,0x0000000000010000L});
+    public static final BitSet FOLLOW_66 = new BitSet(new long[]{0x000000007F800000L});
+    public static final BitSet FOLLOW_67 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000020L});
+    public static final BitSet FOLLOW_68 = new BitSet(new long[]{0x4408018FFFC800F0L,0x00000000000300C2L});
 
 }
\ No newline at end of file
diff --git a/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/Export.ecore b/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/Export.ecore
index 1c8f3107b..9270272d2 100644
--- a/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/Export.ecore
+++ b/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/Export.ecore
@@ -3,9 +3,9 @@
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="export" nsURI="http://www.avaloq.com/tools/ddk/xtext/export/Export"
     nsPrefix="export">
   <eClassifiers xsi:type="ecore:EClass" name="ExportModel">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="extension" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="extension" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"
         defaultValueLiteral="false" unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="targetGrammar" eType="ecore:EClass platform:/plugin/org.eclipse.xtext/org/eclipse/xtext/Xtext.ecore#//Grammar"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="imports" upperBound="-1"
         eType="#//Import" containment="true"/>
@@ -17,15 +17,15 @@
         eType="#//Export" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Import">
-    <eOperations name="getPackageName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="package" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EPackage"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eOperations name="getPackageName" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="package" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EPackage"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Extension">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="extension" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="extension" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="DeclarationForType">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="guard" eType="ecore:EClass platform:/resource/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/Expression.ecore#//Expression"
         containment="true"/>
   </eClassifiers>
@@ -34,38 +34,38 @@
         eType="#//InterfaceItem" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="InterfaceItem">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="unordered" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="unordered" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"
         defaultValueLiteral="false" unsettable="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="InterfaceField" eSuperTypes="#//InterfaceItem">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="field" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="field" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="InterfaceNavigation" eSuperTypes="#//InterfaceItem">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ref" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EReference"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="ref" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EReference"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="InterfaceExpression" eSuperTypes="#//InterfaceItem">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="ref" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="ref" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"
         defaultValueLiteral="false" unsettable="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="expr" eType="ecore:EClass platform:/resource/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/Expression.ecore#//Expression"
         containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Export" eSuperTypes="#//DeclarationForType">
-    <eOperations name="getEAttributes" upperBound="-1" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/>
-    <eOperations name="getAllEAttributes" upperBound="-1" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lookup" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+    <eOperations name="getEAttributes" upperBound="-1" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EAttribute"/>
+    <eOperations name="getAllEAttributes" upperBound="-1" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EAttribute"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lookup" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"
         defaultValueLiteral="false" unsettable="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="lookupPredicate" eType="ecore:EClass platform:/resource/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/Expression.ecore#//Expression"
         containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="qualifiedName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="qualifiedName" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"
         defaultValueLiteral="false" unsettable="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="naming" eType="ecore:EClass platform:/resource/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/Expression.ecore#//Expression"
         containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fragmentUnique" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fragmentUnique" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"
         defaultValueLiteral="false" unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="fragmentAttribute" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fingerprint" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+    <eStructuralFeatures xsi:type="ecore:EReference" name="fragmentAttribute" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EAttribute"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fingerprint" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"
         defaultValueLiteral="false" unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resourceFingerprint" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resourceFingerprint" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"
         defaultValueLiteral="false" unsettable="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="attributes" upperBound="-1"
         eType="#//Attribute" containment="true"/>
@@ -73,11 +73,11 @@
         eType="#//UserData" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="UserData">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="expr" eType="ecore:EClass platform:/resource/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/Expression.ecore#//Expression"
         containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Attribute">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="attribute" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="attribute" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EAttribute"/>
   </eClassifiers>
 </ecore:EPackage>
diff --git a/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/Export.genmodel b/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/Export.genmodel
index 17d4647dd..55eb5cecb 100644
--- a/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/Export.genmodel
+++ b/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/Export.genmodel
@@ -5,7 +5,7 @@
     forceOverwrite="true" modelName="Export" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     complianceLevel="6.0" copyrightFields="false" editPluginID="com.avaloq.tools.ddk.xtext.export.edit"
     editorPluginID="com.avaloq.tools.ddk.xtext.export.editor" runtimeVersion="2.12"
-    usedGenPackages="platform:/resource/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/Expression.genmodel#//expression platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/resource/org.eclipse.xtext/org/eclipse/xtext/Xtext.genmodel#//xtext">
+    usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.xtext/org/eclipse/xtext/Xtext.genmodel#//xtext platform:/resource/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/Expression.genmodel#//expression">
   <genPackages prefix="Export" basePackage="com.avaloq.tools.ddk.xtext.export" disposableProviderFactory="true"
       ecorePackage="Export.ecore#/">
     <genClasses ecoreClass="Export.ecore#//ExportModel">
diff --git a/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/ExportStandaloneSetupGenerated.java b/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/ExportStandaloneSetupGenerated.java
index b1ff2abbf..38a94a895 100644
--- a/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/ExportStandaloneSetupGenerated.java
+++ b/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/ExportStandaloneSetupGenerated.java
@@ -4,8 +4,8 @@
 package com.avaloq.tools.ddk.xtext.export;
 
 import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.xtext.ISetup;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.xtext.ISetup;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
diff --git a/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/export/impl/ExportPackageImpl.java b/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/export/impl/ExportPackageImpl.java
index c94e9f4ea..2cfb74c74 100644
--- a/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/export/impl/ExportPackageImpl.java
+++ b/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/export/impl/ExportPackageImpl.java
@@ -170,8 +170,8 @@ public static ExportPackage init()
 		isInited = true;
 
 		// Initialize simple dependencies
-		ExpressionPackage.eINSTANCE.eClass();
 		XtextPackage.eINSTANCE.eClass();
+		ExpressionPackage.eINSTANCE.eClass();
 
 		// Create package meta-data objects
 		theExportPackage.createPackageContents();
diff --git a/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g b/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g
index fdc935596..6c6952605 100644
--- a/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g
+++ b/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g
@@ -110,7 +110,7 @@ ruleExportModel returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_2_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -146,7 +146,7 @@ ruleExportModel returns [EObject current=null]
        			$current, 
        			"imports",
         		lv_imports_5_0, 
-        		"Import");
+        		"com.avaloq.tools.ddk.xtext.export.Export.Import");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -164,7 +164,7 @@ ruleExportModel returns [EObject current=null]
        			$current, 
        			"extensions",
         		lv_extensions_6_0, 
-        		"Extension");
+        		"com.avaloq.tools.ddk.xtext.export.Export.Extension");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -190,7 +190,7 @@ ruleExportModel returns [EObject current=null]
        			$current, 
        			"interfaces",
         		lv_interfaces_9_0, 
-        		"Interface");
+        		"com.avaloq.tools.ddk.xtext.export.Export.Interface");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -212,7 +212,7 @@ ruleExportModel returns [EObject current=null]
        			$current, 
        			"exports",
         		lv_exports_11_0, 
-        		"Export");
+        		"com.avaloq.tools.ddk.xtext.export.Export.Export");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -273,7 +273,7 @@ ruleImport returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_3_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -315,7 +315,7 @@ ruleExtension returns [EObject current=null]
        			$current, 
        			"extension",
         		lv_extension_1_0, 
-        		"QualifiedID");
+        		"com.avaloq.tools.ddk.xtext.export.Export.QualifiedID");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -375,7 +375,7 @@ ruleInterface returns [EObject current=null]
        			$current, 
        			"guard",
         		lv_guard_2_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -401,7 +401,7 @@ ruleInterface returns [EObject current=null]
        			$current, 
        			"items",
         		lv_items_5_0, 
-        		"InterfaceItem");
+        		"com.avaloq.tools.ddk.xtext.export.Export.InterfaceItem");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -423,7 +423,7 @@ ruleInterface returns [EObject current=null]
        			$current, 
        			"items",
         		lv_items_7_0, 
-        		"InterfaceItem");
+        		"com.avaloq.tools.ddk.xtext.export.Export.InterfaceItem");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -656,7 +656,7 @@ ruleInterfaceExpression returns [EObject current=null]
        			$current, 
        			"expr",
         		lv_expr_4_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -722,7 +722,7 @@ ruleExport returns [EObject current=null]
        			$current, 
        			"lookupPredicate",
         		lv_lookupPredicate_3_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -778,7 +778,7 @@ ruleExport returns [EObject current=null]
        			$current, 
        			"naming",
         		lv_naming_8_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -800,7 +800,7 @@ ruleExport returns [EObject current=null]
        			$current, 
        			"guard",
         		lv_guard_10_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -917,7 +917,7 @@ ruleExport returns [EObject current=null]
        			$current, 
        			"attributes",
         		lv_attributes_25_0, 
-        		"Attribute");
+        		"com.avaloq.tools.ddk.xtext.export.Export.Attribute");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -939,7 +939,7 @@ ruleExport returns [EObject current=null]
        			$current, 
        			"attributes",
         		lv_attributes_27_0, 
-        		"Attribute");
+        		"com.avaloq.tools.ddk.xtext.export.Export.Attribute");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -966,7 +966,7 @@ ruleExport returns [EObject current=null]
        			$current, 
        			"userData",
         		lv_userData_30_0, 
-        		"UserData");
+        		"com.avaloq.tools.ddk.xtext.export.Export.UserData");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -988,7 +988,7 @@ ruleExport returns [EObject current=null]
        			$current, 
        			"userData",
         		lv_userData_32_0, 
-        		"UserData");
+        		"com.avaloq.tools.ddk.xtext.export.Export.UserData");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1036,7 +1036,7 @@ ruleUserData returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_0_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -1057,7 +1057,7 @@ ruleUserData returns [EObject current=null]
        			$current, 
        			"expr",
         		lv_expr_2_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1227,7 +1227,7 @@ ruleLetExpression returns [EObject current=null]
        			$current, 
        			"identifier",
         		lv_identifier_1_0, 
-        		"Identifier");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1249,7 +1249,7 @@ ruleLetExpression returns [EObject current=null]
        			$current, 
        			"varExpr",
         		lv_varExpr_3_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1271,7 +1271,7 @@ ruleLetExpression returns [EObject current=null]
        			$current, 
        			"target",
         		lv_target_5_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1314,7 +1314,7 @@ ruleCastedExpression returns [EObject current=null]
        			$current, 
        			"type",
         		lv_type_1_0, 
-        		"Type");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Type");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1336,7 +1336,7 @@ ruleCastedExpression returns [EObject current=null]
        			$current, 
        			"target",
         		lv_target_3_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1394,7 +1394,7 @@ ruleChainExpression returns [EObject current=null]
        			$current, 
        			"next",
         		lv_next_3_0, 
-        		"ChainedExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.ChainedExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1502,7 +1502,7 @@ ruleIfExpressionTri returns [EObject current=null]
        			$current, 
        			"thenPart",
         		lv_thenPart_3_0, 
-        		"ChainedExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.ChainedExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1524,7 +1524,7 @@ ruleIfExpressionTri returns [EObject current=null]
        			$current, 
        			"elsePart",
         		lv_elsePart_5_0, 
-        		"ChainedExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.ChainedExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1567,7 +1567,7 @@ ruleIfExpressionKw returns [EObject current=null]
        			$current, 
        			"condition",
         		lv_condition_1_0, 
-        		"ChainedExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.ChainedExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1589,7 +1589,7 @@ ruleIfExpressionKw returns [EObject current=null]
        			$current, 
        			"thenPart",
         		lv_thenPart_3_0, 
-        		"ChainedExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.ChainedExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1612,7 +1612,7 @@ ruleIfExpressionKw returns [EObject current=null]
        			$current, 
        			"elsePart",
         		lv_elsePart_5_0, 
-        		"ChainedExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.ChainedExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1659,7 +1659,7 @@ ruleSwitchExpression returns [EObject current=null]
        			$current, 
        			"switchExpr",
         		lv_switchExpr_2_0, 
-        		"OrExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.OrExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1685,7 +1685,7 @@ ruleSwitchExpression returns [EObject current=null]
        			$current, 
        			"case",
         		lv_case_5_0, 
-        		"Case");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Case");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1711,7 +1711,7 @@ ruleSwitchExpression returns [EObject current=null]
        			$current, 
        			"defaultExpr",
         		lv_defaultExpr_8_0, 
-        		"OrExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.OrExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1758,7 +1758,7 @@ ruleCase returns [EObject current=null]
        			$current, 
        			"condition",
         		lv_condition_1_0, 
-        		"OrExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.OrExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1780,7 +1780,7 @@ ruleCase returns [EObject current=null]
        			$current, 
        			"thenPar",
         		lv_thenPar_3_0, 
-        		"OrExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.OrExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1849,7 +1849,7 @@ ruleOrExpression returns [EObject current=null]
        			$current, 
        			"right",
         		lv_right_3_0, 
-        		"AndExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.AndExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1918,7 +1918,7 @@ ruleAndExpression returns [EObject current=null]
        			$current, 
        			"right",
         		lv_right_3_0, 
-        		"ImpliesExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.ImpliesExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1987,7 +1987,7 @@ ruleImpliesExpression returns [EObject current=null]
        			$current, 
        			"right",
         		lv_right_3_0, 
-        		"RelationalExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.RelationalExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2119,7 +2119,7 @@ ruleRelationalExpression returns [EObject current=null]
        			$current, 
        			"right",
         		lv_right_3_0, 
-        		"AdditiveExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.AdditiveExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2203,7 +2203,7 @@ ruleAdditiveExpression returns [EObject current=null]
        			$current, 
        			"params",
         		lv_params_3_0, 
-        		"MultiplicativeExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.MultiplicativeExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2287,7 +2287,7 @@ ruleMultiplicativeExpression returns [EObject current=null]
        			$current, 
        			"params",
         		lv_params_3_0, 
-        		"UnaryOrInfixExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.UnaryOrInfixExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2396,7 +2396,7 @@ ruleUnaryExpression returns [EObject current=null]
        			$current, 
        			"params",
         		lv_params_1_0, 
-        		"InfixExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.InfixExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2454,7 +2454,7 @@ ruleInfixExpression returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_3_0, 
-        		"Identifier");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2476,7 +2476,7 @@ ruleInfixExpression returns [EObject current=null]
        			$current, 
        			"params",
         		lv_params_5_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2498,7 +2498,7 @@ ruleInfixExpression returns [EObject current=null]
        			$current, 
        			"params",
         		lv_params_7_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2531,7 +2531,7 @@ ruleInfixExpression returns [EObject current=null]
        			$current, 
        			"type",
         		lv_type_11_0, 
-        		"Type");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Type");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2579,7 +2579,7 @@ ruleInfixExpression returns [EObject current=null]
        			$current, 
        			"type",
         		lv_type_16_0, 
-        		"Type");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Type");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2718,7 +2718,7 @@ ruleInfixExpression returns [EObject current=null]
        			$current, 
        			"var",
         		lv_var_22_0, 
-        		"Identifier");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2740,7 +2740,7 @@ ruleInfixExpression returns [EObject current=null]
        			$current, 
        			"exp",
         		lv_exp_24_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2985,7 +2985,7 @@ ruleIntegerLiteral returns [EObject current=null]
        			$current, 
        			"val",
         		lv_val_0_0, 
-        		"INT");
+        		"org.eclipse.xtext.common.Terminals.INT");
 	    }
 
 )
@@ -3060,7 +3060,7 @@ ruleRealLiteral returns [EObject current=null]
        			$current, 
        			"val",
         		lv_val_0_0, 
-        		"REAL");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.REAL");
 	    }
 
 )
@@ -3099,7 +3099,7 @@ ruleStringLiteral returns [EObject current=null]
        			$current, 
        			"val",
         		lv_val_0_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -3179,7 +3179,7 @@ ruleGlobalVarExpression returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"Identifier");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3228,7 +3228,7 @@ ruleFeatureCall returns [EObject current=null]
        			$current, 
        			"type",
         		lv_type_1_0, 
-        		"Type");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Type");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3287,7 +3287,7 @@ ruleOperationCall returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_0_0, 
-        		"Identifier");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3309,7 +3309,7 @@ ruleOperationCall returns [EObject current=null]
        			$current, 
        			"params",
         		lv_params_2_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3331,7 +3331,7 @@ ruleOperationCall returns [EObject current=null]
        			$current, 
        			"params",
         		lv_params_4_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3384,7 +3384,7 @@ ruleListLiteral returns [EObject current=null]
        			$current, 
        			"elements",
         		lv_elements_2_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3406,7 +3406,7 @@ ruleListLiteral returns [EObject current=null]
        			$current, 
        			"elements",
         		lv_elements_4_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3453,7 +3453,7 @@ ruleConstructorCallExpression returns [EObject current=null]
        			$current, 
        			"type",
         		lv_type_1_0, 
-        		"SimpleType");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.SimpleType");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3511,7 +3511,7 @@ ruleTypeSelectExpression returns [EObject current=null]
        			$current, 
        			"type",
         		lv_type_2_0, 
-        		"Type");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Type");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3660,7 +3660,7 @@ ruleCollectionExpression returns [EObject current=null]
        			$current, 
        			"var",
         		lv_var_2_0, 
-        		"Identifier");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3682,7 +3682,7 @@ ruleCollectionExpression returns [EObject current=null]
        			$current, 
        			"exp",
         		lv_exp_4_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3811,7 +3811,7 @@ ruleCollectionType returns [EObject current=null]
        			$current, 
        			"id1",
         		lv_id1_2_0, 
-        		"SimpleType");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.SimpleType");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3854,7 +3854,7 @@ ruleSimpleType returns [EObject current=null]
        			$current, 
        			"id",
         		lv_id_0_0, 
-        		"Identifier");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3876,7 +3876,7 @@ ruleSimpleType returns [EObject current=null]
        			$current, 
        			"id",
         		lv_id_2_0, 
-        		"Identifier");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
 	        afterParserOrEnumRuleCall();
 	    }
 
diff --git a/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExportLexer.java b/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExportLexer.java
index 25eea3e26..4ee667161 100644
--- a/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExportLexer.java
+++ b/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExportLexer.java
@@ -103,15 +103,15 @@ public InternalExportLexer(CharStream input, RecognizerSharedState state) {
         super(input,state);
 
     }
-    public String getGrammarFileName() { return "../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g"; }
+    public String getGrammarFileName() { return "InternalExport.g"; }
 
     // $ANTLR start "T__12"
     public final void mT__12() throws RecognitionException {
         try {
             int _type = T__12;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:11:7: ( 'export' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:11:9: 'export'
+            // InternalExport.g:11:7: ( 'export' )
+            // InternalExport.g:11:9: 'export'
             {
             match("export"); 
 
@@ -131,8 +131,8 @@ public final void mT__13() throws RecognitionException {
         try {
             int _type = T__13;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:12:7: ( 'extension' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:12:9: 'extension'
+            // InternalExport.g:12:7: ( 'extension' )
+            // InternalExport.g:12:9: 'extension'
             {
             match("extension"); 
 
@@ -152,8 +152,8 @@ public final void mT__14() throws RecognitionException {
         try {
             int _type = T__14;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:13:7: ( 'for' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:13:9: 'for'
+            // InternalExport.g:13:7: ( 'for' )
+            // InternalExport.g:13:9: 'for'
             {
             match("for"); 
 
@@ -173,8 +173,8 @@ public final void mT__15() throws RecognitionException {
         try {
             int _type = T__15;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:14:7: ( 'interface' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:14:9: 'interface'
+            // InternalExport.g:14:7: ( 'interface' )
+            // InternalExport.g:14:9: 'interface'
             {
             match("interface"); 
 
@@ -194,8 +194,8 @@ public final void mT__16() throws RecognitionException {
         try {
             int _type = T__16;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:15:7: ( '{' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:15:9: '{'
+            // InternalExport.g:15:7: ( '{' )
+            // InternalExport.g:15:9: '{'
             {
             match('{'); 
 
@@ -214,8 +214,8 @@ public final void mT__17() throws RecognitionException {
         try {
             int _type = T__17;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:16:7: ( '}' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:16:9: '}'
+            // InternalExport.g:16:7: ( '}' )
+            // InternalExport.g:16:9: '}'
             {
             match('}'); 
 
@@ -234,8 +234,8 @@ public final void mT__18() throws RecognitionException {
         try {
             int _type = T__18;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:17:7: ( 'import' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:17:9: 'import'
+            // InternalExport.g:17:7: ( 'import' )
+            // InternalExport.g:17:9: 'import'
             {
             match("import"); 
 
@@ -255,8 +255,8 @@ public final void mT__19() throws RecognitionException {
         try {
             int _type = T__19;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:18:7: ( 'as' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:18:9: 'as'
+            // InternalExport.g:18:7: ( 'as' )
+            // InternalExport.g:18:9: 'as'
             {
             match("as"); 
 
@@ -276,8 +276,8 @@ public final void mT__20() throws RecognitionException {
         try {
             int _type = T__20;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:19:7: ( '[' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:19:9: '['
+            // InternalExport.g:19:7: ( '[' )
+            // InternalExport.g:19:9: '['
             {
             match('['); 
 
@@ -296,8 +296,8 @@ public final void mT__21() throws RecognitionException {
         try {
             int _type = T__21;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:20:7: ( ']' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:20:9: ']'
+            // InternalExport.g:20:7: ( ']' )
+            // InternalExport.g:20:9: ']'
             {
             match(']'); 
 
@@ -316,8 +316,8 @@ public final void mT__22() throws RecognitionException {
         try {
             int _type = T__22;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:21:7: ( '=' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:21:9: '='
+            // InternalExport.g:21:7: ( '=' )
+            // InternalExport.g:21:9: '='
             {
             match('='); 
 
@@ -336,8 +336,8 @@ public final void mT__23() throws RecognitionException {
         try {
             int _type = T__23;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:22:7: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:22:9: ','
+            // InternalExport.g:22:7: ( ',' )
+            // InternalExport.g:22:9: ','
             {
             match(','); 
 
@@ -356,8 +356,8 @@ public final void mT__24() throws RecognitionException {
         try {
             int _type = T__24;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:23:7: ( ';' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:23:9: ';'
+            // InternalExport.g:23:7: ( ';' )
+            // InternalExport.g:23:9: ';'
             {
             match(';'); 
 
@@ -376,8 +376,8 @@ public final void mT__25() throws RecognitionException {
         try {
             int _type = T__25;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:24:7: ( '+' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:24:9: '+'
+            // InternalExport.g:24:7: ( '+' )
+            // InternalExport.g:24:9: '+'
             {
             match('+'); 
 
@@ -396,8 +396,8 @@ public final void mT__26() throws RecognitionException {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:25:7: ( '@' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:25:9: '@'
+            // InternalExport.g:25:7: ( '@' )
+            // InternalExport.g:25:9: '@'
             {
             match('@'); 
 
@@ -416,8 +416,8 @@ public final void mT__27() throws RecognitionException {
         try {
             int _type = T__27;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:26:7: ( 'eval' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:26:9: 'eval'
+            // InternalExport.g:26:7: ( 'eval' )
+            // InternalExport.g:26:9: 'eval'
             {
             match("eval"); 
 
@@ -437,8 +437,8 @@ public final void mT__28() throws RecognitionException {
         try {
             int _type = T__28;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:27:7: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:27:9: '('
+            // InternalExport.g:27:7: ( '(' )
+            // InternalExport.g:27:9: '('
             {
             match('('); 
 
@@ -457,8 +457,8 @@ public final void mT__29() throws RecognitionException {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:28:7: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:28:9: ')'
+            // InternalExport.g:28:7: ( ')' )
+            // InternalExport.g:28:9: ')'
             {
             match(')'); 
 
@@ -477,8 +477,8 @@ public final void mT__30() throws RecognitionException {
         try {
             int _type = T__30;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:29:7: ( 'lookup' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:29:9: 'lookup'
+            // InternalExport.g:29:7: ( 'lookup' )
+            // InternalExport.g:29:9: 'lookup'
             {
             match("lookup"); 
 
@@ -498,8 +498,8 @@ public final void mT__31() throws RecognitionException {
         try {
             int _type = T__31;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:30:7: ( 'qualified' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:30:9: 'qualified'
+            // InternalExport.g:30:7: ( 'qualified' )
+            // InternalExport.g:30:9: 'qualified'
             {
             match("qualified"); 
 
@@ -519,8 +519,8 @@ public final void mT__32() throws RecognitionException {
         try {
             int _type = T__32;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:31:7: ( 'uri-fragment' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:31:9: 'uri-fragment'
+            // InternalExport.g:31:7: ( 'uri-fragment' )
+            // InternalExport.g:31:9: 'uri-fragment'
             {
             match("uri-fragment"); 
 
@@ -540,8 +540,8 @@ public final void mT__33() throws RecognitionException {
         try {
             int _type = T__33;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:32:7: ( 'unique' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:32:9: 'unique'
+            // InternalExport.g:32:7: ( 'unique' )
+            // InternalExport.g:32:9: 'unique'
             {
             match("unique"); 
 
@@ -561,8 +561,8 @@ public final void mT__34() throws RecognitionException {
         try {
             int _type = T__34;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:33:7: ( 'attribute' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:33:9: 'attribute'
+            // InternalExport.g:33:7: ( 'attribute' )
+            // InternalExport.g:33:9: 'attribute'
             {
             match("attribute"); 
 
@@ -582,8 +582,8 @@ public final void mT__35() throws RecognitionException {
         try {
             int _type = T__35;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:34:7: ( 'object-fingerprint' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:34:9: 'object-fingerprint'
+            // InternalExport.g:34:7: ( 'object-fingerprint' )
+            // InternalExport.g:34:9: 'object-fingerprint'
             {
             match("object-fingerprint"); 
 
@@ -603,8 +603,8 @@ public final void mT__36() throws RecognitionException {
         try {
             int _type = T__36;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:35:7: ( 'resource-fingerprint' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:35:9: 'resource-fingerprint'
+            // InternalExport.g:35:7: ( 'resource-fingerprint' )
+            // InternalExport.g:35:9: 'resource-fingerprint'
             {
             match("resource-fingerprint"); 
 
@@ -624,8 +624,8 @@ public final void mT__37() throws RecognitionException {
         try {
             int _type = T__37;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:36:7: ( 'field' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:36:9: 'field'
+            // InternalExport.g:36:7: ( 'field' )
+            // InternalExport.g:36:9: 'field'
             {
             match("field"); 
 
@@ -645,8 +645,8 @@ public final void mT__38() throws RecognitionException {
         try {
             int _type = T__38;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:37:7: ( 'data' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:37:9: 'data'
+            // InternalExport.g:37:7: ( 'data' )
+            // InternalExport.g:37:9: 'data'
             {
             match("data"); 
 
@@ -666,8 +666,8 @@ public final void mT__39() throws RecognitionException {
         try {
             int _type = T__39;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:38:7: ( '::' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:38:9: '::'
+            // InternalExport.g:38:7: ( '::' )
+            // InternalExport.g:38:9: '::'
             {
             match("::"); 
 
@@ -687,8 +687,8 @@ public final void mT__40() throws RecognitionException {
         try {
             int _type = T__40;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:39:7: ( 'let' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:39:9: 'let'
+            // InternalExport.g:39:7: ( 'let' )
+            // InternalExport.g:39:9: 'let'
             {
             match("let"); 
 
@@ -708,8 +708,8 @@ public final void mT__41() throws RecognitionException {
         try {
             int _type = T__41;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:40:7: ( ':' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:40:9: ':'
+            // InternalExport.g:40:7: ( ':' )
+            // InternalExport.g:40:9: ':'
             {
             match(':'); 
 
@@ -728,8 +728,8 @@ public final void mT__42() throws RecognitionException {
         try {
             int _type = T__42;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:41:7: ( '->' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:41:9: '->'
+            // InternalExport.g:41:7: ( '->' )
+            // InternalExport.g:41:9: '->'
             {
             match("->"); 
 
@@ -749,8 +749,8 @@ public final void mT__43() throws RecognitionException {
         try {
             int _type = T__43;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:42:7: ( '?' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:42:9: '?'
+            // InternalExport.g:42:7: ( '?' )
+            // InternalExport.g:42:9: '?'
             {
             match('?'); 
 
@@ -769,8 +769,8 @@ public final void mT__44() throws RecognitionException {
         try {
             int _type = T__44;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:43:7: ( 'if' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:43:9: 'if'
+            // InternalExport.g:43:7: ( 'if' )
+            // InternalExport.g:43:9: 'if'
             {
             match("if"); 
 
@@ -790,8 +790,8 @@ public final void mT__45() throws RecognitionException {
         try {
             int _type = T__45;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:44:7: ( 'then' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:44:9: 'then'
+            // InternalExport.g:44:7: ( 'then' )
+            // InternalExport.g:44:9: 'then'
             {
             match("then"); 
 
@@ -811,8 +811,8 @@ public final void mT__46() throws RecognitionException {
         try {
             int _type = T__46;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:45:7: ( 'else' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:45:9: 'else'
+            // InternalExport.g:45:7: ( 'else' )
+            // InternalExport.g:45:9: 'else'
             {
             match("else"); 
 
@@ -832,8 +832,8 @@ public final void mT__47() throws RecognitionException {
         try {
             int _type = T__47;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:46:7: ( 'switch' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:46:9: 'switch'
+            // InternalExport.g:46:7: ( 'switch' )
+            // InternalExport.g:46:9: 'switch'
             {
             match("switch"); 
 
@@ -853,8 +853,8 @@ public final void mT__48() throws RecognitionException {
         try {
             int _type = T__48;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:47:7: ( 'default' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:47:9: 'default'
+            // InternalExport.g:47:7: ( 'default' )
+            // InternalExport.g:47:9: 'default'
             {
             match("default"); 
 
@@ -874,8 +874,8 @@ public final void mT__49() throws RecognitionException {
         try {
             int _type = T__49;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:48:7: ( 'case' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:48:9: 'case'
+            // InternalExport.g:48:7: ( 'case' )
+            // InternalExport.g:48:9: 'case'
             {
             match("case"); 
 
@@ -895,8 +895,8 @@ public final void mT__50() throws RecognitionException {
         try {
             int _type = T__50;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:49:7: ( '||' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:49:9: '||'
+            // InternalExport.g:49:7: ( '||' )
+            // InternalExport.g:49:9: '||'
             {
             match("||"); 
 
@@ -916,8 +916,8 @@ public final void mT__51() throws RecognitionException {
         try {
             int _type = T__51;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:50:7: ( '&&' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:50:9: '&&'
+            // InternalExport.g:50:7: ( '&&' )
+            // InternalExport.g:50:9: '&&'
             {
             match("&&"); 
 
@@ -937,8 +937,8 @@ public final void mT__52() throws RecognitionException {
         try {
             int _type = T__52;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:51:7: ( 'implies' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:51:9: 'implies'
+            // InternalExport.g:51:7: ( 'implies' )
+            // InternalExport.g:51:9: 'implies'
             {
             match("implies"); 
 
@@ -958,8 +958,8 @@ public final void mT__53() throws RecognitionException {
         try {
             int _type = T__53;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:52:7: ( '==' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:52:9: '=='
+            // InternalExport.g:52:7: ( '==' )
+            // InternalExport.g:52:9: '=='
             {
             match("=="); 
 
@@ -979,8 +979,8 @@ public final void mT__54() throws RecognitionException {
         try {
             int _type = T__54;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:53:7: ( '!=' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:53:9: '!='
+            // InternalExport.g:53:7: ( '!=' )
+            // InternalExport.g:53:9: '!='
             {
             match("!="); 
 
@@ -1000,8 +1000,8 @@ public final void mT__55() throws RecognitionException {
         try {
             int _type = T__55;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:54:7: ( '>=' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:54:9: '>='
+            // InternalExport.g:54:7: ( '>=' )
+            // InternalExport.g:54:9: '>='
             {
             match(">="); 
 
@@ -1021,8 +1021,8 @@ public final void mT__56() throws RecognitionException {
         try {
             int _type = T__56;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:55:7: ( '<=' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:55:9: '<='
+            // InternalExport.g:55:7: ( '<=' )
+            // InternalExport.g:55:9: '<='
             {
             match("<="); 
 
@@ -1042,8 +1042,8 @@ public final void mT__57() throws RecognitionException {
         try {
             int _type = T__57;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:56:7: ( '>' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:56:9: '>'
+            // InternalExport.g:56:7: ( '>' )
+            // InternalExport.g:56:9: '>'
             {
             match('>'); 
 
@@ -1062,8 +1062,8 @@ public final void mT__58() throws RecognitionException {
         try {
             int _type = T__58;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:57:7: ( '<' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:57:9: '<'
+            // InternalExport.g:57:7: ( '<' )
+            // InternalExport.g:57:9: '<'
             {
             match('<'); 
 
@@ -1082,8 +1082,8 @@ public final void mT__59() throws RecognitionException {
         try {
             int _type = T__59;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:58:7: ( '-' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:58:9: '-'
+            // InternalExport.g:58:7: ( '-' )
+            // InternalExport.g:58:9: '-'
             {
             match('-'); 
 
@@ -1102,8 +1102,8 @@ public final void mT__60() throws RecognitionException {
         try {
             int _type = T__60;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:59:7: ( '*' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:59:9: '*'
+            // InternalExport.g:59:7: ( '*' )
+            // InternalExport.g:59:9: '*'
             {
             match('*'); 
 
@@ -1122,8 +1122,8 @@ public final void mT__61() throws RecognitionException {
         try {
             int _type = T__61;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:60:7: ( '/' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:60:9: '/'
+            // InternalExport.g:60:7: ( '/' )
+            // InternalExport.g:60:9: '/'
             {
             match('/'); 
 
@@ -1142,8 +1142,8 @@ public final void mT__62() throws RecognitionException {
         try {
             int _type = T__62;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:61:7: ( '!' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:61:9: '!'
+            // InternalExport.g:61:7: ( '!' )
+            // InternalExport.g:61:9: '!'
             {
             match('!'); 
 
@@ -1162,8 +1162,8 @@ public final void mT__63() throws RecognitionException {
         try {
             int _type = T__63;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:62:7: ( '.' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:62:9: '.'
+            // InternalExport.g:62:7: ( '.' )
+            // InternalExport.g:62:9: '.'
             {
             match('.'); 
 
@@ -1182,8 +1182,8 @@ public final void mT__64() throws RecognitionException {
         try {
             int _type = T__64;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:63:7: ( 'typeSelect' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:63:9: 'typeSelect'
+            // InternalExport.g:63:7: ( 'typeSelect' )
+            // InternalExport.g:63:9: 'typeSelect'
             {
             match("typeSelect"); 
 
@@ -1203,8 +1203,8 @@ public final void mT__65() throws RecognitionException {
         try {
             int _type = T__65;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:64:7: ( 'collect' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:64:9: 'collect'
+            // InternalExport.g:64:7: ( 'collect' )
+            // InternalExport.g:64:9: 'collect'
             {
             match("collect"); 
 
@@ -1224,8 +1224,8 @@ public final void mT__66() throws RecognitionException {
         try {
             int _type = T__66;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:65:7: ( 'select' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:65:9: 'select'
+            // InternalExport.g:65:7: ( 'select' )
+            // InternalExport.g:65:9: 'select'
             {
             match("select"); 
 
@@ -1245,8 +1245,8 @@ public final void mT__67() throws RecognitionException {
         try {
             int _type = T__67;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:66:7: ( 'selectFirst' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:66:9: 'selectFirst'
+            // InternalExport.g:66:7: ( 'selectFirst' )
+            // InternalExport.g:66:9: 'selectFirst'
             {
             match("selectFirst"); 
 
@@ -1266,8 +1266,8 @@ public final void mT__68() throws RecognitionException {
         try {
             int _type = T__68;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:67:7: ( 'reject' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:67:9: 'reject'
+            // InternalExport.g:67:7: ( 'reject' )
+            // InternalExport.g:67:9: 'reject'
             {
             match("reject"); 
 
@@ -1287,8 +1287,8 @@ public final void mT__69() throws RecognitionException {
         try {
             int _type = T__69;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:68:7: ( 'exists' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:68:9: 'exists'
+            // InternalExport.g:68:7: ( 'exists' )
+            // InternalExport.g:68:9: 'exists'
             {
             match("exists"); 
 
@@ -1308,8 +1308,8 @@ public final void mT__70() throws RecognitionException {
         try {
             int _type = T__70;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:69:7: ( 'notExists' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:69:9: 'notExists'
+            // InternalExport.g:69:7: ( 'notExists' )
+            // InternalExport.g:69:9: 'notExists'
             {
             match("notExists"); 
 
@@ -1329,8 +1329,8 @@ public final void mT__71() throws RecognitionException {
         try {
             int _type = T__71;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:70:7: ( 'sortBy' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:70:9: 'sortBy'
+            // InternalExport.g:70:7: ( 'sortBy' )
+            // InternalExport.g:70:9: 'sortBy'
             {
             match("sortBy"); 
 
@@ -1350,8 +1350,8 @@ public final void mT__72() throws RecognitionException {
         try {
             int _type = T__72;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:71:7: ( 'forAll' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:71:9: 'forAll'
+            // InternalExport.g:71:7: ( 'forAll' )
+            // InternalExport.g:71:9: 'forAll'
             {
             match("forAll"); 
 
@@ -1371,8 +1371,8 @@ public final void mT__73() throws RecognitionException {
         try {
             int _type = T__73;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:72:7: ( '|' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:72:9: '|'
+            // InternalExport.g:72:7: ( '|' )
+            // InternalExport.g:72:9: '|'
             {
             match('|'); 
 
@@ -1391,8 +1391,8 @@ public final void mT__74() throws RecognitionException {
         try {
             int _type = T__74;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:73:7: ( 'true' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:73:9: 'true'
+            // InternalExport.g:73:7: ( 'true' )
+            // InternalExport.g:73:9: 'true'
             {
             match("true"); 
 
@@ -1412,8 +1412,8 @@ public final void mT__75() throws RecognitionException {
         try {
             int _type = T__75;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:74:7: ( 'false' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:74:9: 'false'
+            // InternalExport.g:74:7: ( 'false' )
+            // InternalExport.g:74:9: 'false'
             {
             match("false"); 
 
@@ -1433,8 +1433,8 @@ public final void mT__76() throws RecognitionException {
         try {
             int _type = T__76;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:75:7: ( 'null' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:75:9: 'null'
+            // InternalExport.g:75:7: ( 'null' )
+            // InternalExport.g:75:9: 'null'
             {
             match("null"); 
 
@@ -1454,8 +1454,8 @@ public final void mT__77() throws RecognitionException {
         try {
             int _type = T__77;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:76:7: ( 'GLOBALVAR' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:76:9: 'GLOBALVAR'
+            // InternalExport.g:76:7: ( 'GLOBALVAR' )
+            // InternalExport.g:76:9: 'GLOBALVAR'
             {
             match("GLOBALVAR"); 
 
@@ -1475,8 +1475,8 @@ public final void mT__78() throws RecognitionException {
         try {
             int _type = T__78;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:77:7: ( 'new' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:77:9: 'new'
+            // InternalExport.g:77:7: ( 'new' )
+            // InternalExport.g:77:9: 'new'
             {
             match("new"); 
 
@@ -1496,8 +1496,8 @@ public final void mT__79() throws RecognitionException {
         try {
             int _type = T__79;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:78:7: ( 'Collection' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:78:9: 'Collection'
+            // InternalExport.g:78:7: ( 'Collection' )
+            // InternalExport.g:78:9: 'Collection'
             {
             match("Collection"); 
 
@@ -1517,8 +1517,8 @@ public final void mT__80() throws RecognitionException {
         try {
             int _type = T__80;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:79:7: ( 'List' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:79:9: 'List'
+            // InternalExport.g:79:7: ( 'List' )
+            // InternalExport.g:79:9: 'List'
             {
             match("List"); 
 
@@ -1538,8 +1538,8 @@ public final void mT__81() throws RecognitionException {
         try {
             int _type = T__81;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:80:7: ( 'Set' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:80:9: 'Set'
+            // InternalExport.g:80:7: ( 'Set' )
+            // InternalExport.g:80:9: 'Set'
             {
             match("Set"); 
 
@@ -1559,10 +1559,10 @@ public final void mRULE_REAL() throws RecognitionException {
         try {
             int _type = RULE_REAL;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3919:11: ( ( '0' .. '9' )* '.' ( '0' .. '9' )* )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3919:13: ( '0' .. '9' )* '.' ( '0' .. '9' )*
+            // InternalExport.g:3919:11: ( ( '0' .. '9' )* '.' ( '0' .. '9' )* )
+            // InternalExport.g:3919:13: ( '0' .. '9' )* '.' ( '0' .. '9' )*
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3919:13: ( '0' .. '9' )*
+            // InternalExport.g:3919:13: ( '0' .. '9' )*
             loop1:
             do {
                 int alt1=2;
@@ -1575,7 +1575,7 @@ public final void mRULE_REAL() throws RecognitionException {
 
                 switch (alt1) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3919:14: '0' .. '9'
+            	    // InternalExport.g:3919:14: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -1588,7 +1588,7 @@ public final void mRULE_REAL() throws RecognitionException {
             } while (true);
 
             match('.'); 
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3919:29: ( '0' .. '9' )*
+            // InternalExport.g:3919:29: ( '0' .. '9' )*
             loop2:
             do {
                 int alt2=2;
@@ -1601,7 +1601,7 @@ public final void mRULE_REAL() throws RecognitionException {
 
                 switch (alt2) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3919:30: '0' .. '9'
+            	    // InternalExport.g:3919:30: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -1629,10 +1629,10 @@ public final void mRULE_ID() throws RecognitionException {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3921:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3921:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalExport.g:3921:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+            // InternalExport.g:3921:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3921:11: ( '^' )?
+            // InternalExport.g:3921:11: ( '^' )?
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -1641,7 +1641,7 @@ public final void mRULE_ID() throws RecognitionException {
             }
             switch (alt3) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3921:11: '^'
+                    // InternalExport.g:3921:11: '^'
                     {
                     match('^'); 
 
@@ -1659,7 +1659,7 @@ public final void mRULE_ID() throws RecognitionException {
                 recover(mse);
                 throw mse;}
 
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3921:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalExport.g:3921:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             loop4:
             do {
                 int alt4=2;
@@ -1672,7 +1672,7 @@ public final void mRULE_ID() throws RecognitionException {
 
                 switch (alt4) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:
+            	    // InternalExport.g:
             	    {
             	    if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
             	        input.consume();
@@ -1708,10 +1708,10 @@ public final void mRULE_INT() throws RecognitionException {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3923:10: ( ( '0' .. '9' )+ )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3923:12: ( '0' .. '9' )+
+            // InternalExport.g:3923:10: ( ( '0' .. '9' )+ )
+            // InternalExport.g:3923:12: ( '0' .. '9' )+
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3923:12: ( '0' .. '9' )+
+            // InternalExport.g:3923:12: ( '0' .. '9' )+
             int cnt5=0;
             loop5:
             do {
@@ -1725,7 +1725,7 @@ public final void mRULE_INT() throws RecognitionException {
 
                 switch (alt5) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3923:13: '0' .. '9'
+            	    // InternalExport.g:3923:13: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -1757,10 +1757,10 @@ public final void mRULE_STRING() throws RecognitionException {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3925:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3925:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalExport.g:3925:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+            // InternalExport.g:3925:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3925:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalExport.g:3925:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             int alt8=2;
             int LA8_0 = input.LA(1);
 
@@ -1778,10 +1778,10 @@ else if ( (LA8_0=='\'') ) {
             }
             switch (alt8) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3925:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+                    // InternalExport.g:3925:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
                     {
                     match('\"'); 
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3925:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // InternalExport.g:3925:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop6:
                     do {
                         int alt6=3;
@@ -1797,7 +1797,7 @@ else if ( ((LA6_0>='\u0000' && LA6_0<='!')||(LA6_0>='#' && LA6_0<='[')||(LA6_0>=
 
                         switch (alt6) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3925:21: '\\\\' .
+                    	    // InternalExport.g:3925:21: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -1805,7 +1805,7 @@ else if ( ((LA6_0>='\u0000' && LA6_0<='!')||(LA6_0>='#' && LA6_0<='[')||(LA6_0>=
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3925:28: ~ ( ( '\\\\' | '\"' ) )
+                    	    // InternalExport.g:3925:28: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -1830,10 +1830,10 @@ else if ( ((LA6_0>='\u0000' && LA6_0<='!')||(LA6_0>='#' && LA6_0<='[')||(LA6_0>=
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3925:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+                    // InternalExport.g:3925:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
                     {
                     match('\''); 
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3925:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // InternalExport.g:3925:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop7:
                     do {
                         int alt7=3;
@@ -1849,7 +1849,7 @@ else if ( ((LA7_0>='\u0000' && LA7_0<='&')||(LA7_0>='(' && LA7_0<='[')||(LA7_0>=
 
                         switch (alt7) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3925:54: '\\\\' .
+                    	    // InternalExport.g:3925:54: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -1857,7 +1857,7 @@ else if ( ((LA7_0>='\u0000' && LA7_0<='&')||(LA7_0>='(' && LA7_0<='[')||(LA7_0>=
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3925:61: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // InternalExport.g:3925:61: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -1900,12 +1900,12 @@ public final void mRULE_ML_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3927:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3927:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalExport.g:3927:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalExport.g:3927:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3927:24: ( options {greedy=false; } : . )*
+            // InternalExport.g:3927:24: ( options {greedy=false; } : . )*
             loop9:
             do {
                 int alt9=2;
@@ -1930,7 +1930,7 @@ else if ( ((LA9_0>='\u0000' && LA9_0<=')')||(LA9_0>='+' && LA9_0<='\uFFFF')) ) {
 
                 switch (alt9) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3927:52: .
+            	    // InternalExport.g:3927:52: .
             	    {
             	    matchAny(); 
 
@@ -1960,12 +1960,12 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3929:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3929:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalExport.g:3929:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalExport.g:3929:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3929:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // InternalExport.g:3929:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop10:
             do {
                 int alt10=2;
@@ -1978,7 +1978,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
 
                 switch (alt10) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3929:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // InternalExport.g:3929:24: ~ ( ( '\\n' | '\\r' ) )
             	    {
             	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
             	        input.consume();
@@ -1998,7 +1998,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
                 }
             } while (true);
 
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3929:40: ( ( '\\r' )? '\\n' )?
+            // InternalExport.g:3929:40: ( ( '\\r' )? '\\n' )?
             int alt12=2;
             int LA12_0 = input.LA(1);
 
@@ -2007,9 +2007,9 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
             }
             switch (alt12) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3929:41: ( '\\r' )? '\\n'
+                    // InternalExport.g:3929:41: ( '\\r' )? '\\n'
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3929:41: ( '\\r' )?
+                    // InternalExport.g:3929:41: ( '\\r' )?
                     int alt11=2;
                     int LA11_0 = input.LA(1);
 
@@ -2018,7 +2018,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
                     }
                     switch (alt11) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3929:41: '\\r'
+                            // InternalExport.g:3929:41: '\\r'
                             {
                             match('\r'); 
 
@@ -2050,10 +2050,10 @@ public final void mRULE_WS() throws RecognitionException {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3931:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3931:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalExport.g:3931:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalExport.g:3931:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3931:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalExport.g:3931:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt13=0;
             loop13:
             do {
@@ -2067,7 +2067,7 @@ public final void mRULE_WS() throws RecognitionException {
 
                 switch (alt13) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:
+            	    // InternalExport.g:
             	    {
             	    if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
             	        input.consume();
@@ -2107,8 +2107,8 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3933:16: ( . )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3933:18: .
+            // InternalExport.g:3933:16: ( . )
+            // InternalExport.g:3933:18: .
             {
             matchAny(); 
 
@@ -2123,551 +2123,551 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:8: ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | RULE_REAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        // InternalExport.g:1:8: ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | RULE_REAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
         int alt14=78;
         alt14 = dfa14.predict(input);
         switch (alt14) {
             case 1 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:10: T__12
+                // InternalExport.g:1:10: T__12
                 {
                 mT__12(); 
 
                 }
                 break;
             case 2 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:16: T__13
+                // InternalExport.g:1:16: T__13
                 {
                 mT__13(); 
 
                 }
                 break;
             case 3 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:22: T__14
+                // InternalExport.g:1:22: T__14
                 {
                 mT__14(); 
 
                 }
                 break;
             case 4 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:28: T__15
+                // InternalExport.g:1:28: T__15
                 {
                 mT__15(); 
 
                 }
                 break;
             case 5 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:34: T__16
+                // InternalExport.g:1:34: T__16
                 {
                 mT__16(); 
 
                 }
                 break;
             case 6 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:40: T__17
+                // InternalExport.g:1:40: T__17
                 {
                 mT__17(); 
 
                 }
                 break;
             case 7 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:46: T__18
+                // InternalExport.g:1:46: T__18
                 {
                 mT__18(); 
 
                 }
                 break;
             case 8 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:52: T__19
+                // InternalExport.g:1:52: T__19
                 {
                 mT__19(); 
 
                 }
                 break;
             case 9 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:58: T__20
+                // InternalExport.g:1:58: T__20
                 {
                 mT__20(); 
 
                 }
                 break;
             case 10 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:64: T__21
+                // InternalExport.g:1:64: T__21
                 {
                 mT__21(); 
 
                 }
                 break;
             case 11 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:70: T__22
+                // InternalExport.g:1:70: T__22
                 {
                 mT__22(); 
 
                 }
                 break;
             case 12 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:76: T__23
+                // InternalExport.g:1:76: T__23
                 {
                 mT__23(); 
 
                 }
                 break;
             case 13 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:82: T__24
+                // InternalExport.g:1:82: T__24
                 {
                 mT__24(); 
 
                 }
                 break;
             case 14 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:88: T__25
+                // InternalExport.g:1:88: T__25
                 {
                 mT__25(); 
 
                 }
                 break;
             case 15 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:94: T__26
+                // InternalExport.g:1:94: T__26
                 {
                 mT__26(); 
 
                 }
                 break;
             case 16 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:100: T__27
+                // InternalExport.g:1:100: T__27
                 {
                 mT__27(); 
 
                 }
                 break;
             case 17 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:106: T__28
+                // InternalExport.g:1:106: T__28
                 {
                 mT__28(); 
 
                 }
                 break;
             case 18 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:112: T__29
+                // InternalExport.g:1:112: T__29
                 {
                 mT__29(); 
 
                 }
                 break;
             case 19 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:118: T__30
+                // InternalExport.g:1:118: T__30
                 {
                 mT__30(); 
 
                 }
                 break;
             case 20 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:124: T__31
+                // InternalExport.g:1:124: T__31
                 {
                 mT__31(); 
 
                 }
                 break;
             case 21 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:130: T__32
+                // InternalExport.g:1:130: T__32
                 {
                 mT__32(); 
 
                 }
                 break;
             case 22 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:136: T__33
+                // InternalExport.g:1:136: T__33
                 {
                 mT__33(); 
 
                 }
                 break;
             case 23 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:142: T__34
+                // InternalExport.g:1:142: T__34
                 {
                 mT__34(); 
 
                 }
                 break;
             case 24 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:148: T__35
+                // InternalExport.g:1:148: T__35
                 {
                 mT__35(); 
 
                 }
                 break;
             case 25 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:154: T__36
+                // InternalExport.g:1:154: T__36
                 {
                 mT__36(); 
 
                 }
                 break;
             case 26 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:160: T__37
+                // InternalExport.g:1:160: T__37
                 {
                 mT__37(); 
 
                 }
                 break;
             case 27 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:166: T__38
+                // InternalExport.g:1:166: T__38
                 {
                 mT__38(); 
 
                 }
                 break;
             case 28 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:172: T__39
+                // InternalExport.g:1:172: T__39
                 {
                 mT__39(); 
 
                 }
                 break;
             case 29 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:178: T__40
+                // InternalExport.g:1:178: T__40
                 {
                 mT__40(); 
 
                 }
                 break;
             case 30 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:184: T__41
+                // InternalExport.g:1:184: T__41
                 {
                 mT__41(); 
 
                 }
                 break;
             case 31 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:190: T__42
+                // InternalExport.g:1:190: T__42
                 {
                 mT__42(); 
 
                 }
                 break;
             case 32 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:196: T__43
+                // InternalExport.g:1:196: T__43
                 {
                 mT__43(); 
 
                 }
                 break;
             case 33 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:202: T__44
+                // InternalExport.g:1:202: T__44
                 {
                 mT__44(); 
 
                 }
                 break;
             case 34 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:208: T__45
+                // InternalExport.g:1:208: T__45
                 {
                 mT__45(); 
 
                 }
                 break;
             case 35 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:214: T__46
+                // InternalExport.g:1:214: T__46
                 {
                 mT__46(); 
 
                 }
                 break;
             case 36 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:220: T__47
+                // InternalExport.g:1:220: T__47
                 {
                 mT__47(); 
 
                 }
                 break;
             case 37 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:226: T__48
+                // InternalExport.g:1:226: T__48
                 {
                 mT__48(); 
 
                 }
                 break;
             case 38 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:232: T__49
+                // InternalExport.g:1:232: T__49
                 {
                 mT__49(); 
 
                 }
                 break;
             case 39 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:238: T__50
+                // InternalExport.g:1:238: T__50
                 {
                 mT__50(); 
 
                 }
                 break;
             case 40 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:244: T__51
+                // InternalExport.g:1:244: T__51
                 {
                 mT__51(); 
 
                 }
                 break;
             case 41 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:250: T__52
+                // InternalExport.g:1:250: T__52
                 {
                 mT__52(); 
 
                 }
                 break;
             case 42 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:256: T__53
+                // InternalExport.g:1:256: T__53
                 {
                 mT__53(); 
 
                 }
                 break;
             case 43 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:262: T__54
+                // InternalExport.g:1:262: T__54
                 {
                 mT__54(); 
 
                 }
                 break;
             case 44 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:268: T__55
+                // InternalExport.g:1:268: T__55
                 {
                 mT__55(); 
 
                 }
                 break;
             case 45 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:274: T__56
+                // InternalExport.g:1:274: T__56
                 {
                 mT__56(); 
 
                 }
                 break;
             case 46 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:280: T__57
+                // InternalExport.g:1:280: T__57
                 {
                 mT__57(); 
 
                 }
                 break;
             case 47 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:286: T__58
+                // InternalExport.g:1:286: T__58
                 {
                 mT__58(); 
 
                 }
                 break;
             case 48 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:292: T__59
+                // InternalExport.g:1:292: T__59
                 {
                 mT__59(); 
 
                 }
                 break;
             case 49 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:298: T__60
+                // InternalExport.g:1:298: T__60
                 {
                 mT__60(); 
 
                 }
                 break;
             case 50 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:304: T__61
+                // InternalExport.g:1:304: T__61
                 {
                 mT__61(); 
 
                 }
                 break;
             case 51 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:310: T__62
+                // InternalExport.g:1:310: T__62
                 {
                 mT__62(); 
 
                 }
                 break;
             case 52 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:316: T__63
+                // InternalExport.g:1:316: T__63
                 {
                 mT__63(); 
 
                 }
                 break;
             case 53 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:322: T__64
+                // InternalExport.g:1:322: T__64
                 {
                 mT__64(); 
 
                 }
                 break;
             case 54 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:328: T__65
+                // InternalExport.g:1:328: T__65
                 {
                 mT__65(); 
 
                 }
                 break;
             case 55 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:334: T__66
+                // InternalExport.g:1:334: T__66
                 {
                 mT__66(); 
 
                 }
                 break;
             case 56 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:340: T__67
+                // InternalExport.g:1:340: T__67
                 {
                 mT__67(); 
 
                 }
                 break;
             case 57 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:346: T__68
+                // InternalExport.g:1:346: T__68
                 {
                 mT__68(); 
 
                 }
                 break;
             case 58 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:352: T__69
+                // InternalExport.g:1:352: T__69
                 {
                 mT__69(); 
 
                 }
                 break;
             case 59 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:358: T__70
+                // InternalExport.g:1:358: T__70
                 {
                 mT__70(); 
 
                 }
                 break;
             case 60 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:364: T__71
+                // InternalExport.g:1:364: T__71
                 {
                 mT__71(); 
 
                 }
                 break;
             case 61 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:370: T__72
+                // InternalExport.g:1:370: T__72
                 {
                 mT__72(); 
 
                 }
                 break;
             case 62 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:376: T__73
+                // InternalExport.g:1:376: T__73
                 {
                 mT__73(); 
 
                 }
                 break;
             case 63 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:382: T__74
+                // InternalExport.g:1:382: T__74
                 {
                 mT__74(); 
 
                 }
                 break;
             case 64 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:388: T__75
+                // InternalExport.g:1:388: T__75
                 {
                 mT__75(); 
 
                 }
                 break;
             case 65 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:394: T__76
+                // InternalExport.g:1:394: T__76
                 {
                 mT__76(); 
 
                 }
                 break;
             case 66 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:400: T__77
+                // InternalExport.g:1:400: T__77
                 {
                 mT__77(); 
 
                 }
                 break;
             case 67 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:406: T__78
+                // InternalExport.g:1:406: T__78
                 {
                 mT__78(); 
 
                 }
                 break;
             case 68 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:412: T__79
+                // InternalExport.g:1:412: T__79
                 {
                 mT__79(); 
 
                 }
                 break;
             case 69 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:418: T__80
+                // InternalExport.g:1:418: T__80
                 {
                 mT__80(); 
 
                 }
                 break;
             case 70 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:424: T__81
+                // InternalExport.g:1:424: T__81
                 {
                 mT__81(); 
 
                 }
                 break;
             case 71 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:430: RULE_REAL
+                // InternalExport.g:1:430: RULE_REAL
                 {
                 mRULE_REAL(); 
 
                 }
                 break;
             case 72 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:440: RULE_ID
+                // InternalExport.g:1:440: RULE_ID
                 {
                 mRULE_ID(); 
 
                 }
                 break;
             case 73 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:448: RULE_INT
+                // InternalExport.g:1:448: RULE_INT
                 {
                 mRULE_INT(); 
 
                 }
                 break;
             case 74 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:457: RULE_STRING
+                // InternalExport.g:1:457: RULE_STRING
                 {
                 mRULE_STRING(); 
 
                 }
                 break;
             case 75 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:469: RULE_ML_COMMENT
+                // InternalExport.g:1:469: RULE_ML_COMMENT
                 {
                 mRULE_ML_COMMENT(); 
 
                 }
                 break;
             case 76 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:485: RULE_SL_COMMENT
+                // InternalExport.g:1:485: RULE_SL_COMMENT
                 {
                 mRULE_SL_COMMENT(); 
 
                 }
                 break;
             case 77 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:501: RULE_WS
+                // InternalExport.g:1:501: RULE_WS
                 {
                 mRULE_WS(); 
 
                 }
                 break;
             case 78 :
-                // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1:509: RULE_ANY_OTHER
+                // InternalExport.g:1:509: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -2681,98 +2681,19 @@ public void mTokens() throws RecognitionException {
 
     protected DFA14 dfa14 = new DFA14(this);
     static final String DFA14_eotS =
-        "\1\uffff\3\63\2\uffff\1\63\2\uffff\1\101\6\uffff\6\63\1\122\1\124"+
-        "\1\uffff\3\63\1\137\1\57\1\142\1\144\1\146\1\uffff\1\152\1\153\5"+
-        "\63\1\164\1\57\1\uffff\2\57\2\uffff\3\63\1\uffff\5\63\1\u0082\2"+
-        "\uffff\1\u0083\1\63\12\uffff\11\63\5\uffff\10\63\17\uffff\7\63\1"+
-        "\uffff\1\164\2\uffff\5\63\1\u00a4\4\63\2\uffff\2\63\1\u00ac\22\63"+
-        "\1\u00bf\3\63\1\u00c3\3\63\1\u00c7\1\u00c8\1\63\1\uffff\7\63\1\uffff"+
-        "\1\63\1\uffff\4\63\1\u00d6\1\63\1\u00d8\1\63\1\u00da\3\63\1\u00de"+
-        "\2\63\1\u00e1\1\uffff\2\63\1\u00e4\1\uffff\3\63\2\uffff\1\63\1\u00e9"+
-        "\1\u00ea\12\63\1\uffff\1\63\1\uffff\1\63\1\uffff\3\63\1\uffff\2"+
-        "\63\1\uffff\2\63\1\uffff\1\u00fe\1\63\1\u0100\1\u0101\2\uffff\1"+
-        "\63\1\u0103\2\63\1\u0106\1\63\1\u0108\2\63\1\u010b\2\63\1\u010e"+
-        "\1\u0110\1\u0111\4\63\1\uffff\1\63\2\uffff\1\63\1\uffff\1\u0118"+
-        "\1\63\1\uffff\1\63\2\uffff\1\63\1\uffff\1\u011c\1\63\1\uffff\1\63"+
-        "\2\uffff\1\u011f\5\63\1\uffff\3\63\1\uffff\2\63\1\uffff\3\63\1\u012d"+
-        "\1\u012e\1\u012f\1\u0130\1\uffff\2\63\1\u0133\1\u0134\1\63\4\uffff"+
-        "\1\u0136\1\63\2\uffff\1\u0138\1\uffff\1\u0139\2\uffff";
+        "\1\uffff\3\63\2\uffff\1\63\2\uffff\1\101\6\uffff\6\63\1\122\1\124\1\uffff\3\63\1\137\1\57\1\142\1\144\1\146\1\uffff\1\152\1\153\5\63\1\164\1\57\1\uffff\2\57\2\uffff\3\63\1\uffff\5\63\1\u0082\2\uffff\1\u0083\1\63\12\uffff\11\63\5\uffff\10\63\17\uffff\7\63\1\uffff\1\164\2\uffff\5\63\1\u00a4\4\63\2\uffff\2\63\1\u00ac\22\63\1\u00bf\3\63\1\u00c3\3\63\1\u00c7\1\u00c8\1\63\1\uffff\7\63\1\uffff\1\63\1\uffff\4\63\1\u00d6\1\63\1\u00d8\1\63\1\u00da\3\63\1\u00de\2\63\1\u00e1\1\uffff\2\63\1\u00e4\1\uffff\3\63\2\uffff\1\63\1\u00e9\1\u00ea\12\63\1\uffff\1\63\1\uffff\1\63\1\uffff\3\63\1\uffff\2\63\1\uffff\2\63\1\uffff\1\u00fe\1\63\1\u0100\1\u0101\2\uffff\1\63\1\u0103\2\63\1\u0106\1\63\1\u0108\2\63\1\u010b\2\63\1\u010e\1\u0110\1\u0111\4\63\1\uffff\1\63\2\uffff\1\63\1\uffff\1\u0118\1\63\1\uffff\1\63\2\uffff\1\63\1\uffff\1\u011c\1\63\1\uffff\1\63\2\uffff\1\u011f\5\63\1\uffff\3\63\1\uffff\2\63\1\uffff\3\63\1\u012d\1\u012e\1\u012f\1\u0130\1\uffff\2\63\1\u0133\1\u0134\1\63\4\uffff\1\u0136\1\63\2\uffff\1\u0138\1\uffff\1\u0139\2\uffff";
     static final String DFA14_eofS =
         "\u013a\uffff";
     static final String DFA14_minS =
-        "\1\0\1\154\1\141\1\146\2\uffff\1\163\2\uffff\1\75\6\uffff\1\145"+
-        "\1\165\1\156\1\142\1\145\1\141\1\72\1\76\1\uffff\1\150\1\145\1\141"+
-        "\1\174\1\46\3\75\1\uffff\1\52\1\60\1\145\1\114\1\157\1\151\1\145"+
-        "\1\56\1\101\1\uffff\2\0\2\uffff\1\151\1\141\1\163\1\uffff\1\162"+
-        "\1\145\1\154\1\164\1\160\1\60\2\uffff\1\60\1\164\12\uffff\1\157"+
-        "\1\164\1\141\2\151\2\152\1\164\1\146\5\uffff\1\145\1\160\1\165\1"+
-        "\151\1\154\1\162\1\163\1\154\17\uffff\1\164\1\154\1\167\1\117\1"+
-        "\154\1\163\1\164\1\uffff\1\56\2\uffff\1\157\1\145\1\163\1\154\1"+
-        "\145\1\60\1\154\1\163\1\145\1\154\2\uffff\1\162\1\153\1\60\1\154"+
-        "\1\55\1\161\1\145\1\157\1\145\2\141\1\156\2\145\1\164\1\145\1\164"+
-        "\1\145\1\154\1\105\1\154\1\60\1\102\1\154\1\164\1\60\1\162\1\156"+
-        "\1\164\2\60\1\154\1\uffff\1\144\1\145\2\162\2\151\1\165\1\uffff"+
-        "\1\151\1\uffff\1\165\1\143\1\165\1\143\1\60\1\165\1\60\1\123\1\60"+
-        "\2\143\1\102\1\60\1\145\1\170\1\60\1\uffff\1\101\1\145\1\60\1\uffff"+
-        "\1\164\2\163\2\uffff\1\154\2\60\1\146\1\164\1\145\1\142\1\160\1"+
-        "\146\1\145\1\164\1\162\1\164\1\uffff\1\154\1\uffff\1\145\1\uffff"+
-        "\1\150\1\164\1\171\1\uffff\1\143\1\151\1\uffff\1\114\1\143\1\uffff"+
-        "\1\60\1\151\2\60\2\uffff\1\141\1\60\1\163\1\165\1\60\1\151\1\60"+
-        "\1\55\1\143\1\60\1\164\1\154\3\60\1\164\1\163\1\126\1\164\1\uffff"+
-        "\1\157\2\uffff\1\143\1\uffff\1\60\1\164\1\uffff\1\145\2\uffff\1"+
-        "\145\1\uffff\1\60\1\145\1\uffff\1\151\2\uffff\1\60\1\164\1\101\1"+
-        "\151\1\156\1\145\1\uffff\1\145\1\144\1\55\1\uffff\1\143\1\162\1"+
-        "\uffff\1\163\1\122\1\157\4\60\1\uffff\1\164\1\163\2\60\1\156\4\uffff"+
-        "\1\60\1\164\2\uffff\1\60\1\uffff\1\60\2\uffff";
+        "\1\0\1\154\1\141\1\146\2\uffff\1\163\2\uffff\1\75\6\uffff\1\145\1\165\1\156\1\142\1\145\1\141\1\72\1\76\1\uffff\1\150\1\145\1\141\1\174\1\46\3\75\1\uffff\1\52\1\60\1\145\1\114\1\157\1\151\1\145\1\56\1\101\1\uffff\2\0\2\uffff\1\151\1\141\1\163\1\uffff\1\162\1\145\1\154\1\164\1\160\1\60\2\uffff\1\60\1\164\12\uffff\1\157\1\164\1\141\2\151\2\152\1\164\1\146\5\uffff\1\145\1\160\1\165\1\151\1\154\1\162\1\163\1\154\17\uffff\1\164\1\154\1\167\1\117\1\154\1\163\1\164\1\uffff\1\56\2\uffff\1\157\1\145\1\163\1\154\1\145\1\60\1\154\1\163\1\145\1\154\2\uffff\1\162\1\153\1\60\1\154\1\55\1\161\1\145\1\157\1\145\2\141\1\156\2\145\1\164\1\145\1\164\1\145\1\154\1\105\1\154\1\60\1\102\1\154\1\164\1\60\1\162\1\156\1\164\2\60\1\154\1\uffff\1\144\1\145\2\162\2\151\1\165\1\uffff\1\151\1\uffff\1\165\1\143\1\165\1\143\1\60\1\165\1\60\1\123\1\60\2\143\1\102\1\60\1\145\1\170\1\60\1\uffff\1\101\1\145\1\60\1\uffff\1\164\2\163\2\uffff\1\154\2\60\1\146\1\164\1\145\1\142\1\160\1\146\1\145\1\164\1\162\1\164\1\uffff\1\154\1\uffff\1\145\1\uffff\1\150\1\164\1\171\1\uffff\1\143\1\151\1\uffff\1\114\1\143\1\uffff\1\60\1\151\2\60\2\uffff\1\141\1\60\1\163\1\165\1\60\1\151\1\60\1\55\1\143\1\60\1\164\1\154\3\60\1\164\1\163\1\126\1\164\1\uffff\1\157\2\uffff\1\143\1\uffff\1\60\1\164\1\uffff\1\145\2\uffff\1\145\1\uffff\1\60\1\145\1\uffff\1\151\2\uffff\1\60\1\164\1\101\1\151\1\156\1\145\1\uffff\1\145\1\144\1\55\1\uffff\1\143\1\162\1\uffff\1\163\1\122\1\157\4\60\1\uffff\1\164\1\163\2\60\1\156\4\uffff\1\60\1\164\2\uffff\1\60\1\uffff\1\60\2\uffff";
     static final String DFA14_maxS =
-        "\1\uffff\1\170\1\157\1\156\2\uffff\1\164\2\uffff\1\75\6\uffff\1"+
-        "\157\1\165\1\162\1\142\2\145\1\72\1\76\1\uffff\1\171\1\167\1\157"+
-        "\1\174\1\46\3\75\1\uffff\1\57\1\71\1\165\1\114\1\157\1\151\1\145"+
-        "\1\71\1\172\1\uffff\2\uffff\2\uffff\1\164\1\141\1\163\1\uffff\1"+
-        "\162\1\145\1\154\1\164\1\160\1\172\2\uffff\1\172\1\164\12\uffff"+
-        "\1\157\1\164\1\141\2\151\1\152\1\163\1\164\1\146\5\uffff\1\145\1"+
-        "\160\1\165\1\151\1\154\1\162\1\163\1\154\17\uffff\1\164\1\154\1"+
-        "\167\1\117\1\154\1\163\1\164\1\uffff\1\71\2\uffff\1\157\1\145\1"+
-        "\163\1\154\1\145\1\172\1\154\1\163\1\145\1\157\2\uffff\1\162\1\153"+
-        "\1\172\1\154\1\55\1\161\1\145\1\157\1\145\2\141\1\156\2\145\1\164"+
-        "\1\145\1\164\1\145\1\154\1\105\1\154\1\172\1\102\1\154\1\164\1\172"+
-        "\1\162\1\156\1\164\2\172\1\154\1\uffff\1\144\1\145\2\162\2\151\1"+
-        "\165\1\uffff\1\151\1\uffff\1\165\1\143\1\165\1\143\1\172\1\165\1"+
-        "\172\1\123\1\172\2\143\1\102\1\172\1\145\1\170\1\172\1\uffff\1\101"+
-        "\1\145\1\172\1\uffff\1\164\2\163\2\uffff\1\154\2\172\1\146\1\164"+
-        "\1\145\1\142\1\160\1\146\1\145\1\164\1\162\1\164\1\uffff\1\154\1"+
-        "\uffff\1\145\1\uffff\1\150\1\164\1\171\1\uffff\1\143\1\151\1\uffff"+
-        "\1\114\1\143\1\uffff\1\172\1\151\2\172\2\uffff\1\141\1\172\1\163"+
-        "\1\165\1\172\1\151\1\172\1\55\1\143\1\172\1\164\1\154\3\172\1\164"+
-        "\1\163\1\126\1\164\1\uffff\1\157\2\uffff\1\143\1\uffff\1\172\1\164"+
-        "\1\uffff\1\145\2\uffff\1\145\1\uffff\1\172\1\145\1\uffff\1\151\2"+
-        "\uffff\1\172\1\164\1\101\1\151\1\156\1\145\1\uffff\1\145\1\144\1"+
-        "\55\1\uffff\1\143\1\162\1\uffff\1\163\1\122\1\157\4\172\1\uffff"+
-        "\1\164\1\163\2\172\1\156\4\uffff\1\172\1\164\2\uffff\1\172\1\uffff"+
-        "\1\172\2\uffff";
+        "\1\uffff\1\170\1\157\1\156\2\uffff\1\164\2\uffff\1\75\6\uffff\1\157\1\165\1\162\1\142\2\145\1\72\1\76\1\uffff\1\171\1\167\1\157\1\174\1\46\3\75\1\uffff\1\57\1\71\1\165\1\114\1\157\1\151\1\145\1\71\1\172\1\uffff\2\uffff\2\uffff\1\164\1\141\1\163\1\uffff\1\162\1\145\1\154\1\164\1\160\1\172\2\uffff\1\172\1\164\12\uffff\1\157\1\164\1\141\2\151\1\152\1\163\1\164\1\146\5\uffff\1\145\1\160\1\165\1\151\1\154\1\162\1\163\1\154\17\uffff\1\164\1\154\1\167\1\117\1\154\1\163\1\164\1\uffff\1\71\2\uffff\1\157\1\145\1\163\1\154\1\145\1\172\1\154\1\163\1\145\1\157\2\uffff\1\162\1\153\1\172\1\154\1\55\1\161\1\145\1\157\1\145\2\141\1\156\2\145\1\164\1\145\1\164\1\145\1\154\1\105\1\154\1\172\1\102\1\154\1\164\1\172\1\162\1\156\1\164\2\172\1\154\1\uffff\1\144\1\145\2\162\2\151\1\165\1\uffff\1\151\1\uffff\1\165\1\143\1\165\1\143\1\172\1\165\1\172\1\123\1\172\2\143\1\102\1\172\1\145\1\170\1\172\1\uffff\1\101\1\145\1\172\1\uffff\1\164\2\163\2\uffff\1\154\2\172\1\146\1\164\1\145\1\142\1\160\1\146\1\145\1\164\1\162\1\164\1\uffff\1\154\1\uffff\1\145\1\uffff\1\150\1\164\1\171\1\uffff\1\143\1\151\1\uffff\1\114\1\143\1\uffff\1\172\1\151\2\172\2\uffff\1\141\1\172\1\163\1\165\1\172\1\151\1\172\1\55\1\143\1\172\1\164\1\154\3\172\1\164\1\163\1\126\1\164\1\uffff\1\157\2\uffff\1\143\1\uffff\1\172\1\164\1\uffff\1\145\2\uffff\1\145\1\uffff\1\172\1\145\1\uffff\1\151\2\uffff\1\172\1\164\1\101\1\151\1\156\1\145\1\uffff\1\145\1\144\1\55\1\uffff\1\143\1\162\1\uffff\1\163\1\122\1\157\4\172\1\uffff\1\164\1\163\2\172\1\156\4\uffff\1\172\1\164\2\uffff\1\172\1\uffff\1\172\2\uffff";
     static final String DFA14_acceptS =
-        "\4\uffff\1\5\1\6\1\uffff\1\11\1\12\1\uffff\1\14\1\15\1\16\1\17"+
-        "\1\21\1\22\10\uffff\1\40\10\uffff\1\61\11\uffff\1\110\2\uffff\1"+
-        "\115\1\116\3\uffff\1\110\6\uffff\1\5\1\6\2\uffff\1\11\1\12\1\52"+
-        "\1\13\1\14\1\15\1\16\1\17\1\21\1\22\11\uffff\1\34\1\36\1\37\1\60"+
-        "\1\40\10\uffff\1\47\1\76\1\50\1\53\1\63\1\54\1\56\1\55\1\57\1\61"+
-        "\1\113\1\114\1\62\1\64\1\107\7\uffff\1\111\1\uffff\1\112\1\115\12"+
-        "\uffff\1\41\1\10\40\uffff\1\3\7\uffff\1\35\1\uffff\1\25\20\uffff"+
-        "\1\103\3\uffff\1\106\3\uffff\1\20\1\43\15\uffff\1\33\1\uffff\1\42"+
-        "\1\uffff\1\77\3\uffff\1\46\2\uffff\1\101\2\uffff\1\105\4\uffff\1"+
-        "\32\1\100\23\uffff\1\1\1\uffff\1\72\1\75\1\uffff\1\7\2\uffff\1\23"+
-        "\1\uffff\1\26\1\30\1\uffff\1\71\2\uffff\1\44\1\uffff\1\67\1\74\6"+
-        "\uffff\1\51\3\uffff\1\45\2\uffff\1\66\7\uffff\1\31\5\uffff\1\2\1"+
-        "\4\1\27\1\24\2\uffff\1\73\1\102\1\uffff\1\65\1\uffff\1\104\1\70";
+        "\4\uffff\1\5\1\6\1\uffff\1\11\1\12\1\uffff\1\14\1\15\1\16\1\17\1\21\1\22\10\uffff\1\40\10\uffff\1\61\11\uffff\1\110\2\uffff\1\115\1\116\3\uffff\1\110\6\uffff\1\5\1\6\2\uffff\1\11\1\12\1\52\1\13\1\14\1\15\1\16\1\17\1\21\1\22\11\uffff\1\34\1\36\1\37\1\60\1\40\10\uffff\1\47\1\76\1\50\1\53\1\63\1\54\1\56\1\55\1\57\1\61\1\113\1\114\1\62\1\64\1\107\7\uffff\1\111\1\uffff\1\112\1\115\12\uffff\1\41\1\10\40\uffff\1\3\7\uffff\1\35\1\uffff\1\25\20\uffff\1\103\3\uffff\1\106\3\uffff\1\20\1\43\15\uffff\1\33\1\uffff\1\42\1\uffff\1\77\3\uffff\1\46\2\uffff\1\101\2\uffff\1\105\4\uffff\1\32\1\100\23\uffff\1\1\1\uffff\1\72\1\75\1\uffff\1\7\2\uffff\1\23\1\uffff\1\26\1\30\1\uffff\1\71\2\uffff\1\44\1\uffff\1\67\1\74\6\uffff\1\51\3\uffff\1\45\2\uffff\1\66\7\uffff\1\31\5\uffff\1\2\1\4\1\27\1\24\2\uffff\1\73\1\102\1\uffff\1\65\1\uffff\1\104\1\70";
     static final String DFA14_specialS =
         "\1\0\53\uffff\1\1\1\2\u010c\uffff}>";
     static final String[] DFA14_transitionS = {
-            "\11\57\2\56\2\57\1\56\22\57\1\56\1\36\1\54\3\57\1\35\1\55\1"+
-            "\16\1\17\1\41\1\14\1\12\1\27\1\43\1\42\12\51\1\26\1\13\1\40"+
-            "\1\11\1\37\1\30\1\15\2\53\1\46\3\53\1\45\4\53\1\47\6\53\1\50"+
-            "\7\53\1\7\1\57\1\10\1\52\1\53\1\57\1\6\1\53\1\33\1\25\1\1\1"+
-            "\2\2\53\1\3\2\53\1\20\1\53\1\44\1\23\1\53\1\21\1\24\1\32\1\31"+
-            "\1\22\5\53\1\4\1\34\1\5\uff82\57",
+            "\11\57\2\56\2\57\1\56\22\57\1\56\1\36\1\54\3\57\1\35\1\55\1\16\1\17\1\41\1\14\1\12\1\27\1\43\1\42\12\51\1\26\1\13\1\40\1\11\1\37\1\30\1\15\2\53\1\46\3\53\1\45\4\53\1\47\6\53\1\50\7\53\1\7\1\57\1\10\1\52\1\53\1\57\1\6\1\53\1\33\1\25\1\1\1\2\2\53\1\3\2\53\1\20\1\53\1\44\1\23\1\53\1\21\1\24\1\32\1\31\1\22\5\53\1\4\1\34\1\5\uff82\57",
             "\1\62\11\uffff\1\61\1\uffff\1\60",
             "\1\66\7\uffff\1\65\5\uffff\1\64",
             "\1\71\6\uffff\1\70\1\67",
@@ -3020,8 +2941,7 @@ public void mTokens() throws RecognitionException {
             "\1\u010c",
             "\1\u010d",
             "\12\63\7\uffff\32\63\4\uffff\1\63\1\uffff\32\63",
-            "\12\63\7\uffff\5\63\1\u010f\24\63\4\uffff\1\63\1\uffff\32"+
-            "\63",
+            "\12\63\7\uffff\5\63\1\u010f\24\63\4\uffff\1\63\1\uffff\32\63",
             "\12\63\7\uffff\32\63\4\uffff\1\63\1\uffff\32\63",
             "\1\u0112",
             "\1\u0113",
diff --git a/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExportParser.java b/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExportParser.java
index a18d6929a..6a8a9d9ab 100644
--- a/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExportParser.java
+++ b/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExportParser.java
@@ -118,7 +118,7 @@ public InternalExportParser(TokenStream input, RecognizerSharedState state) {
         
 
     public String[] getTokenNames() { return InternalExportParser.tokenNames; }
-    public String getGrammarFileName() { return "../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g"; }
+    public String getGrammarFileName() { return "InternalExport.g"; }
 
 
 
@@ -143,7 +143,7 @@ protected ExportGrammarAccess getGrammarAccess() {
 
 
     // $ANTLR start "entryRuleExportModel"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:67:1: entryRuleExportModel returns [EObject current=null] : iv_ruleExportModel= ruleExportModel EOF ;
+    // InternalExport.g:67:1: entryRuleExportModel returns [EObject current=null] : iv_ruleExportModel= ruleExportModel EOF ;
     public final EObject entryRuleExportModel() throws RecognitionException {
         EObject current = null;
 
@@ -151,13 +151,13 @@ public final EObject entryRuleExportModel() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:68:2: (iv_ruleExportModel= ruleExportModel EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:69:2: iv_ruleExportModel= ruleExportModel EOF
+            // InternalExport.g:68:2: (iv_ruleExportModel= ruleExportModel EOF )
+            // InternalExport.g:69:2: iv_ruleExportModel= ruleExportModel EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getExportModelRule()); 
             }
-            pushFollow(FOLLOW_ruleExportModel_in_entryRuleExportModel75);
+            pushFollow(FOLLOW_1);
             iv_ruleExportModel=ruleExportModel();
 
             state._fsp--;
@@ -165,7 +165,7 @@ public final EObject entryRuleExportModel() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleExportModel; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleExportModel85); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -183,7 +183,7 @@ public final EObject entryRuleExportModel() throws RecognitionException {
 
 
     // $ANTLR start "ruleExportModel"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:76:1: ruleExportModel returns [EObject current=null] : ( (otherlv_0= 'export' ( (lv_extension_1_0= 'extension' ) )? ( (lv_name_2_0= RULE_ID ) ) otherlv_3= 'for' ( ( ruleQualifiedID ) ) )? ( (lv_imports_5_0= ruleImport ) )+ ( (lv_extensions_6_0= ruleExtension ) )* (otherlv_7= 'interface' otherlv_8= '{' ( (lv_interfaces_9_0= ruleInterface ) )+ otherlv_10= '}' )? ( (lv_exports_11_0= ruleExport ) )+ ) ;
+    // InternalExport.g:76:1: ruleExportModel returns [EObject current=null] : ( (otherlv_0= 'export' ( (lv_extension_1_0= 'extension' ) )? ( (lv_name_2_0= RULE_ID ) ) otherlv_3= 'for' ( ( ruleQualifiedID ) ) )? ( (lv_imports_5_0= ruleImport ) )+ ( (lv_extensions_6_0= ruleExtension ) )* (otherlv_7= 'interface' otherlv_8= '{' ( (lv_interfaces_9_0= ruleInterface ) )+ otherlv_10= '}' )? ( (lv_exports_11_0= ruleExport ) )+ ) ;
     public final EObject ruleExportModel() throws RecognitionException {
         EObject current = null;
 
@@ -206,13 +206,13 @@ public final EObject ruleExportModel() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:79:28: ( ( (otherlv_0= 'export' ( (lv_extension_1_0= 'extension' ) )? ( (lv_name_2_0= RULE_ID ) ) otherlv_3= 'for' ( ( ruleQualifiedID ) ) )? ( (lv_imports_5_0= ruleImport ) )+ ( (lv_extensions_6_0= ruleExtension ) )* (otherlv_7= 'interface' otherlv_8= '{' ( (lv_interfaces_9_0= ruleInterface ) )+ otherlv_10= '}' )? ( (lv_exports_11_0= ruleExport ) )+ ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:80:1: ( (otherlv_0= 'export' ( (lv_extension_1_0= 'extension' ) )? ( (lv_name_2_0= RULE_ID ) ) otherlv_3= 'for' ( ( ruleQualifiedID ) ) )? ( (lv_imports_5_0= ruleImport ) )+ ( (lv_extensions_6_0= ruleExtension ) )* (otherlv_7= 'interface' otherlv_8= '{' ( (lv_interfaces_9_0= ruleInterface ) )+ otherlv_10= '}' )? ( (lv_exports_11_0= ruleExport ) )+ )
+            // InternalExport.g:79:28: ( ( (otherlv_0= 'export' ( (lv_extension_1_0= 'extension' ) )? ( (lv_name_2_0= RULE_ID ) ) otherlv_3= 'for' ( ( ruleQualifiedID ) ) )? ( (lv_imports_5_0= ruleImport ) )+ ( (lv_extensions_6_0= ruleExtension ) )* (otherlv_7= 'interface' otherlv_8= '{' ( (lv_interfaces_9_0= ruleInterface ) )+ otherlv_10= '}' )? ( (lv_exports_11_0= ruleExport ) )+ ) )
+            // InternalExport.g:80:1: ( (otherlv_0= 'export' ( (lv_extension_1_0= 'extension' ) )? ( (lv_name_2_0= RULE_ID ) ) otherlv_3= 'for' ( ( ruleQualifiedID ) ) )? ( (lv_imports_5_0= ruleImport ) )+ ( (lv_extensions_6_0= ruleExtension ) )* (otherlv_7= 'interface' otherlv_8= '{' ( (lv_interfaces_9_0= ruleInterface ) )+ otherlv_10= '}' )? ( (lv_exports_11_0= ruleExport ) )+ )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:80:1: ( (otherlv_0= 'export' ( (lv_extension_1_0= 'extension' ) )? ( (lv_name_2_0= RULE_ID ) ) otherlv_3= 'for' ( ( ruleQualifiedID ) ) )? ( (lv_imports_5_0= ruleImport ) )+ ( (lv_extensions_6_0= ruleExtension ) )* (otherlv_7= 'interface' otherlv_8= '{' ( (lv_interfaces_9_0= ruleInterface ) )+ otherlv_10= '}' )? ( (lv_exports_11_0= ruleExport ) )+ )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:80:2: (otherlv_0= 'export' ( (lv_extension_1_0= 'extension' ) )? ( (lv_name_2_0= RULE_ID ) ) otherlv_3= 'for' ( ( ruleQualifiedID ) ) )? ( (lv_imports_5_0= ruleImport ) )+ ( (lv_extensions_6_0= ruleExtension ) )* (otherlv_7= 'interface' otherlv_8= '{' ( (lv_interfaces_9_0= ruleInterface ) )+ otherlv_10= '}' )? ( (lv_exports_11_0= ruleExport ) )+
+            // InternalExport.g:80:1: ( (otherlv_0= 'export' ( (lv_extension_1_0= 'extension' ) )? ( (lv_name_2_0= RULE_ID ) ) otherlv_3= 'for' ( ( ruleQualifiedID ) ) )? ( (lv_imports_5_0= ruleImport ) )+ ( (lv_extensions_6_0= ruleExtension ) )* (otherlv_7= 'interface' otherlv_8= '{' ( (lv_interfaces_9_0= ruleInterface ) )+ otherlv_10= '}' )? ( (lv_exports_11_0= ruleExport ) )+ )
+            // InternalExport.g:80:2: (otherlv_0= 'export' ( (lv_extension_1_0= 'extension' ) )? ( (lv_name_2_0= RULE_ID ) ) otherlv_3= 'for' ( ( ruleQualifiedID ) ) )? ( (lv_imports_5_0= ruleImport ) )+ ( (lv_extensions_6_0= ruleExtension ) )* (otherlv_7= 'interface' otherlv_8= '{' ( (lv_interfaces_9_0= ruleInterface ) )+ otherlv_10= '}' )? ( (lv_exports_11_0= ruleExport ) )+
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:80:2: (otherlv_0= 'export' ( (lv_extension_1_0= 'extension' ) )? ( (lv_name_2_0= RULE_ID ) ) otherlv_3= 'for' ( ( ruleQualifiedID ) ) )?
+            // InternalExport.g:80:2: (otherlv_0= 'export' ( (lv_extension_1_0= 'extension' ) )? ( (lv_name_2_0= RULE_ID ) ) otherlv_3= 'for' ( ( ruleQualifiedID ) ) )?
             int alt2=2;
             int LA2_0 = input.LA(1);
 
@@ -221,15 +221,15 @@ public final EObject ruleExportModel() throws RecognitionException {
             }
             switch (alt2) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:80:4: otherlv_0= 'export' ( (lv_extension_1_0= 'extension' ) )? ( (lv_name_2_0= RULE_ID ) ) otherlv_3= 'for' ( ( ruleQualifiedID ) )
+                    // InternalExport.g:80:4: otherlv_0= 'export' ( (lv_extension_1_0= 'extension' ) )? ( (lv_name_2_0= RULE_ID ) ) otherlv_3= 'for' ( ( ruleQualifiedID ) )
                     {
-                    otherlv_0=(Token)match(input,12,FOLLOW_12_in_ruleExportModel123); if (state.failed) return current;
+                    otherlv_0=(Token)match(input,12,FOLLOW_3); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_0, grammarAccess.getExportModelAccess().getExportKeyword_0_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:84:1: ( (lv_extension_1_0= 'extension' ) )?
+                    // InternalExport.g:84:1: ( (lv_extension_1_0= 'extension' ) )?
                     int alt1=2;
                     int LA1_0 = input.LA(1);
 
@@ -238,12 +238,12 @@ public final EObject ruleExportModel() throws RecognitionException {
                     }
                     switch (alt1) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:85:1: (lv_extension_1_0= 'extension' )
+                            // InternalExport.g:85:1: (lv_extension_1_0= 'extension' )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:85:1: (lv_extension_1_0= 'extension' )
-                            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:86:3: lv_extension_1_0= 'extension'
+                            // InternalExport.g:85:1: (lv_extension_1_0= 'extension' )
+                            // InternalExport.g:86:3: lv_extension_1_0= 'extension'
                             {
-                            lv_extension_1_0=(Token)match(input,13,FOLLOW_13_in_ruleExportModel141); if (state.failed) return current;
+                            lv_extension_1_0=(Token)match(input,13,FOLLOW_4); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       newLeafNode(lv_extension_1_0, grammarAccess.getExportModelAccess().getExtensionExtensionKeyword_0_1_0());
@@ -266,13 +266,13 @@ public final EObject ruleExportModel() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:99:3: ( (lv_name_2_0= RULE_ID ) )
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:100:1: (lv_name_2_0= RULE_ID )
+                    // InternalExport.g:99:3: ( (lv_name_2_0= RULE_ID ) )
+                    // InternalExport.g:100:1: (lv_name_2_0= RULE_ID )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:100:1: (lv_name_2_0= RULE_ID )
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:101:3: lv_name_2_0= RULE_ID
+                    // InternalExport.g:100:1: (lv_name_2_0= RULE_ID )
+                    // InternalExport.g:101:3: lv_name_2_0= RULE_ID
                     {
-                    lv_name_2_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleExportModel172); if (state.failed) return current;
+                    lv_name_2_0=(Token)match(input,RULE_ID,FOLLOW_5); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			newLeafNode(lv_name_2_0, grammarAccess.getExportModelAccess().getNameIDTerminalRuleCall_0_2_0()); 
@@ -287,7 +287,7 @@ public final EObject ruleExportModel() throws RecognitionException {
                              			current, 
                              			"name",
                               		lv_name_2_0, 
-                              		"ID");
+                              		"org.eclipse.xtext.common.Terminals.ID");
                       	    
                     }
 
@@ -296,17 +296,17 @@ public final EObject ruleExportModel() throws RecognitionException {
 
                     }
 
-                    otherlv_3=(Token)match(input,14,FOLLOW_14_in_ruleExportModel189); if (state.failed) return current;
+                    otherlv_3=(Token)match(input,14,FOLLOW_4); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_3, grammarAccess.getExportModelAccess().getForKeyword_0_3());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:121:1: ( ( ruleQualifiedID ) )
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:122:1: ( ruleQualifiedID )
+                    // InternalExport.g:121:1: ( ( ruleQualifiedID ) )
+                    // InternalExport.g:122:1: ( ruleQualifiedID )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:122:1: ( ruleQualifiedID )
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:123:3: ruleQualifiedID
+                    // InternalExport.g:122:1: ( ruleQualifiedID )
+                    // InternalExport.g:123:3: ruleQualifiedID
                     {
                     if ( state.backtracking==0 ) {
 
@@ -320,7 +320,7 @@ public final EObject ruleExportModel() throws RecognitionException {
                       	        newCompositeNode(grammarAccess.getExportModelAccess().getTargetGrammarGrammarCrossReference_0_4_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleQualifiedID_in_ruleExportModel212);
+                    pushFollow(FOLLOW_6);
                     ruleQualifiedID();
 
                     state._fsp--;
@@ -342,7 +342,7 @@ public final EObject ruleExportModel() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:136:4: ( (lv_imports_5_0= ruleImport ) )+
+            // InternalExport.g:136:4: ( (lv_imports_5_0= ruleImport ) )+
             int cnt3=0;
             loop3:
             do {
@@ -356,17 +356,17 @@ public final EObject ruleExportModel() throws RecognitionException {
 
                 switch (alt3) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:137:1: (lv_imports_5_0= ruleImport )
+            	    // InternalExport.g:137:1: (lv_imports_5_0= ruleImport )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:137:1: (lv_imports_5_0= ruleImport )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:138:3: lv_imports_5_0= ruleImport
+            	    // InternalExport.g:137:1: (lv_imports_5_0= ruleImport )
+            	    // InternalExport.g:138:3: lv_imports_5_0= ruleImport
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getExportModelAccess().getImportsImportParserRuleCall_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleImport_in_ruleExportModel235);
+            	    pushFollow(FOLLOW_7);
             	    lv_imports_5_0=ruleImport();
 
             	    state._fsp--;
@@ -380,7 +380,7 @@ public final EObject ruleExportModel() throws RecognitionException {
             	             			current, 
             	             			"imports",
             	              		lv_imports_5_0, 
-            	              		"Import");
+            	              		"com.avaloq.tools.ddk.xtext.export.Export.Import");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -401,7 +401,7 @@ public final EObject ruleExportModel() throws RecognitionException {
                 cnt3++;
             } while (true);
 
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:154:3: ( (lv_extensions_6_0= ruleExtension ) )*
+            // InternalExport.g:154:3: ( (lv_extensions_6_0= ruleExtension ) )*
             loop4:
             do {
                 int alt4=2;
@@ -414,17 +414,17 @@ public final EObject ruleExportModel() throws RecognitionException {
 
                 switch (alt4) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:155:1: (lv_extensions_6_0= ruleExtension )
+            	    // InternalExport.g:155:1: (lv_extensions_6_0= ruleExtension )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:155:1: (lv_extensions_6_0= ruleExtension )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:156:3: lv_extensions_6_0= ruleExtension
+            	    // InternalExport.g:155:1: (lv_extensions_6_0= ruleExtension )
+            	    // InternalExport.g:156:3: lv_extensions_6_0= ruleExtension
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getExportModelAccess().getExtensionsExtensionParserRuleCall_2_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleExtension_in_ruleExportModel257);
+            	    pushFollow(FOLLOW_8);
             	    lv_extensions_6_0=ruleExtension();
 
             	    state._fsp--;
@@ -438,7 +438,7 @@ public final EObject ruleExportModel() throws RecognitionException {
             	             			current, 
             	             			"extensions",
             	              		lv_extensions_6_0, 
-            	              		"Extension");
+            	              		"com.avaloq.tools.ddk.xtext.export.Export.Extension");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -454,7 +454,7 @@ public final EObject ruleExportModel() throws RecognitionException {
                 }
             } while (true);
 
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:172:3: (otherlv_7= 'interface' otherlv_8= '{' ( (lv_interfaces_9_0= ruleInterface ) )+ otherlv_10= '}' )?
+            // InternalExport.g:172:3: (otherlv_7= 'interface' otherlv_8= '{' ( (lv_interfaces_9_0= ruleInterface ) )+ otherlv_10= '}' )?
             int alt6=2;
             int LA6_0 = input.LA(1);
 
@@ -463,21 +463,21 @@ public final EObject ruleExportModel() throws RecognitionException {
             }
             switch (alt6) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:172:5: otherlv_7= 'interface' otherlv_8= '{' ( (lv_interfaces_9_0= ruleInterface ) )+ otherlv_10= '}'
+                    // InternalExport.g:172:5: otherlv_7= 'interface' otherlv_8= '{' ( (lv_interfaces_9_0= ruleInterface ) )+ otherlv_10= '}'
                     {
-                    otherlv_7=(Token)match(input,15,FOLLOW_15_in_ruleExportModel271); if (state.failed) return current;
+                    otherlv_7=(Token)match(input,15,FOLLOW_9); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_7, grammarAccess.getExportModelAccess().getInterfaceKeyword_3_0());
                           
                     }
-                    otherlv_8=(Token)match(input,16,FOLLOW_16_in_ruleExportModel283); if (state.failed) return current;
+                    otherlv_8=(Token)match(input,16,FOLLOW_4); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_8, grammarAccess.getExportModelAccess().getLeftCurlyBracketKeyword_3_1());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:180:1: ( (lv_interfaces_9_0= ruleInterface ) )+
+                    // InternalExport.g:180:1: ( (lv_interfaces_9_0= ruleInterface ) )+
                     int cnt5=0;
                     loop5:
                     do {
@@ -491,17 +491,17 @@ public final EObject ruleExportModel() throws RecognitionException {
 
                         switch (alt5) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:181:1: (lv_interfaces_9_0= ruleInterface )
+                    	    // InternalExport.g:181:1: (lv_interfaces_9_0= ruleInterface )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:181:1: (lv_interfaces_9_0= ruleInterface )
-                    	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:182:3: lv_interfaces_9_0= ruleInterface
+                    	    // InternalExport.g:181:1: (lv_interfaces_9_0= ruleInterface )
+                    	    // InternalExport.g:182:3: lv_interfaces_9_0= ruleInterface
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getExportModelAccess().getInterfacesInterfaceParserRuleCall_3_2_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleInterface_in_ruleExportModel304);
+                    	    pushFollow(FOLLOW_10);
                     	    lv_interfaces_9_0=ruleInterface();
 
                     	    state._fsp--;
@@ -515,7 +515,7 @@ public final EObject ruleExportModel() throws RecognitionException {
                     	             			current, 
                     	             			"interfaces",
                     	              		lv_interfaces_9_0, 
-                    	              		"Interface");
+                    	              		"com.avaloq.tools.ddk.xtext.export.Export.Interface");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -536,7 +536,7 @@ public final EObject ruleExportModel() throws RecognitionException {
                         cnt5++;
                     } while (true);
 
-                    otherlv_10=(Token)match(input,17,FOLLOW_17_in_ruleExportModel317); if (state.failed) return current;
+                    otherlv_10=(Token)match(input,17,FOLLOW_8); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_10, grammarAccess.getExportModelAccess().getRightCurlyBracketKeyword_3_3());
@@ -548,7 +548,7 @@ public final EObject ruleExportModel() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:202:3: ( (lv_exports_11_0= ruleExport ) )+
+            // InternalExport.g:202:3: ( (lv_exports_11_0= ruleExport ) )+
             int cnt7=0;
             loop7:
             do {
@@ -562,17 +562,17 @@ public final EObject ruleExportModel() throws RecognitionException {
 
                 switch (alt7) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:203:1: (lv_exports_11_0= ruleExport )
+            	    // InternalExport.g:203:1: (lv_exports_11_0= ruleExport )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:203:1: (lv_exports_11_0= ruleExport )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:204:3: lv_exports_11_0= ruleExport
+            	    // InternalExport.g:203:1: (lv_exports_11_0= ruleExport )
+            	    // InternalExport.g:204:3: lv_exports_11_0= ruleExport
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getExportModelAccess().getExportsExportParserRuleCall_4_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleExport_in_ruleExportModel340);
+            	    pushFollow(FOLLOW_11);
             	    lv_exports_11_0=ruleExport();
 
             	    state._fsp--;
@@ -586,7 +586,7 @@ public final EObject ruleExportModel() throws RecognitionException {
             	             			current, 
             	             			"exports",
             	              		lv_exports_11_0, 
-            	              		"Export");
+            	              		"com.avaloq.tools.ddk.xtext.export.Export.Export");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -630,7 +630,7 @@ public final EObject ruleExportModel() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleImport"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:228:1: entryRuleImport returns [EObject current=null] : iv_ruleImport= ruleImport EOF ;
+    // InternalExport.g:228:1: entryRuleImport returns [EObject current=null] : iv_ruleImport= ruleImport EOF ;
     public final EObject entryRuleImport() throws RecognitionException {
         EObject current = null;
 
@@ -638,13 +638,13 @@ public final EObject entryRuleImport() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:229:2: (iv_ruleImport= ruleImport EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:230:2: iv_ruleImport= ruleImport EOF
+            // InternalExport.g:229:2: (iv_ruleImport= ruleImport EOF )
+            // InternalExport.g:230:2: iv_ruleImport= ruleImport EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getImportRule()); 
             }
-            pushFollow(FOLLOW_ruleImport_in_entryRuleImport377);
+            pushFollow(FOLLOW_1);
             iv_ruleImport=ruleImport();
 
             state._fsp--;
@@ -652,7 +652,7 @@ public final EObject entryRuleImport() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleImport; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleImport387); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -670,7 +670,7 @@ public final EObject entryRuleImport() throws RecognitionException {
 
 
     // $ANTLR start "ruleImport"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:237:1: ruleImport returns [EObject current=null] : (otherlv_0= 'import' ( (otherlv_1= RULE_STRING ) ) (otherlv_2= 'as' ( (lv_name_3_0= RULE_ID ) ) )? ) ;
+    // InternalExport.g:237:1: ruleImport returns [EObject current=null] : (otherlv_0= 'import' ( (otherlv_1= RULE_STRING ) ) (otherlv_2= 'as' ( (lv_name_3_0= RULE_ID ) ) )? ) ;
     public final EObject ruleImport() throws RecognitionException {
         EObject current = null;
 
@@ -682,23 +682,23 @@ public final EObject ruleImport() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:240:28: ( (otherlv_0= 'import' ( (otherlv_1= RULE_STRING ) ) (otherlv_2= 'as' ( (lv_name_3_0= RULE_ID ) ) )? ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:241:1: (otherlv_0= 'import' ( (otherlv_1= RULE_STRING ) ) (otherlv_2= 'as' ( (lv_name_3_0= RULE_ID ) ) )? )
+            // InternalExport.g:240:28: ( (otherlv_0= 'import' ( (otherlv_1= RULE_STRING ) ) (otherlv_2= 'as' ( (lv_name_3_0= RULE_ID ) ) )? ) )
+            // InternalExport.g:241:1: (otherlv_0= 'import' ( (otherlv_1= RULE_STRING ) ) (otherlv_2= 'as' ( (lv_name_3_0= RULE_ID ) ) )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:241:1: (otherlv_0= 'import' ( (otherlv_1= RULE_STRING ) ) (otherlv_2= 'as' ( (lv_name_3_0= RULE_ID ) ) )? )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:241:3: otherlv_0= 'import' ( (otherlv_1= RULE_STRING ) ) (otherlv_2= 'as' ( (lv_name_3_0= RULE_ID ) ) )?
+            // InternalExport.g:241:1: (otherlv_0= 'import' ( (otherlv_1= RULE_STRING ) ) (otherlv_2= 'as' ( (lv_name_3_0= RULE_ID ) ) )? )
+            // InternalExport.g:241:3: otherlv_0= 'import' ( (otherlv_1= RULE_STRING ) ) (otherlv_2= 'as' ( (lv_name_3_0= RULE_ID ) ) )?
             {
-            otherlv_0=(Token)match(input,18,FOLLOW_18_in_ruleImport424); if (state.failed) return current;
+            otherlv_0=(Token)match(input,18,FOLLOW_12); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getImportAccess().getImportKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:245:1: ( (otherlv_1= RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:246:1: (otherlv_1= RULE_STRING )
+            // InternalExport.g:245:1: ( (otherlv_1= RULE_STRING ) )
+            // InternalExport.g:246:1: (otherlv_1= RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:246:1: (otherlv_1= RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:247:3: otherlv_1= RULE_STRING
+            // InternalExport.g:246:1: (otherlv_1= RULE_STRING )
+            // InternalExport.g:247:3: otherlv_1= RULE_STRING
             {
             if ( state.backtracking==0 ) {
 
@@ -707,7 +707,7 @@ public final EObject ruleImport() throws RecognitionException {
               	        }
                       
             }
-            otherlv_1=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleImport444); if (state.failed) return current;
+            otherlv_1=(Token)match(input,RULE_STRING,FOLLOW_13); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               		newLeafNode(otherlv_1, grammarAccess.getImportAccess().getPackageEPackageCrossReference_1_0()); 
@@ -719,7 +719,7 @@ public final EObject ruleImport() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:258:2: (otherlv_2= 'as' ( (lv_name_3_0= RULE_ID ) ) )?
+            // InternalExport.g:258:2: (otherlv_2= 'as' ( (lv_name_3_0= RULE_ID ) ) )?
             int alt8=2;
             int LA8_0 = input.LA(1);
 
@@ -728,21 +728,21 @@ public final EObject ruleImport() throws RecognitionException {
             }
             switch (alt8) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:258:4: otherlv_2= 'as' ( (lv_name_3_0= RULE_ID ) )
+                    // InternalExport.g:258:4: otherlv_2= 'as' ( (lv_name_3_0= RULE_ID ) )
                     {
-                    otherlv_2=(Token)match(input,19,FOLLOW_19_in_ruleImport457); if (state.failed) return current;
+                    otherlv_2=(Token)match(input,19,FOLLOW_4); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_2, grammarAccess.getImportAccess().getAsKeyword_2_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:262:1: ( (lv_name_3_0= RULE_ID ) )
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:263:1: (lv_name_3_0= RULE_ID )
+                    // InternalExport.g:262:1: ( (lv_name_3_0= RULE_ID ) )
+                    // InternalExport.g:263:1: (lv_name_3_0= RULE_ID )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:263:1: (lv_name_3_0= RULE_ID )
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:264:3: lv_name_3_0= RULE_ID
+                    // InternalExport.g:263:1: (lv_name_3_0= RULE_ID )
+                    // InternalExport.g:264:3: lv_name_3_0= RULE_ID
                     {
-                    lv_name_3_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleImport474); if (state.failed) return current;
+                    lv_name_3_0=(Token)match(input,RULE_ID,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			newLeafNode(lv_name_3_0, grammarAccess.getImportAccess().getNameIDTerminalRuleCall_2_1_0()); 
@@ -757,7 +757,7 @@ public final EObject ruleImport() throws RecognitionException {
                              			current, 
                              			"name",
                               		lv_name_3_0, 
-                              		"ID");
+                              		"org.eclipse.xtext.common.Terminals.ID");
                       	    
                     }
 
@@ -795,7 +795,7 @@ public final EObject ruleImport() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleExtension"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:288:1: entryRuleExtension returns [EObject current=null] : iv_ruleExtension= ruleExtension EOF ;
+    // InternalExport.g:288:1: entryRuleExtension returns [EObject current=null] : iv_ruleExtension= ruleExtension EOF ;
     public final EObject entryRuleExtension() throws RecognitionException {
         EObject current = null;
 
@@ -803,13 +803,13 @@ public final EObject entryRuleExtension() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:289:2: (iv_ruleExtension= ruleExtension EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:290:2: iv_ruleExtension= ruleExtension EOF
+            // InternalExport.g:289:2: (iv_ruleExtension= ruleExtension EOF )
+            // InternalExport.g:290:2: iv_ruleExtension= ruleExtension EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getExtensionRule()); 
             }
-            pushFollow(FOLLOW_ruleExtension_in_entryRuleExtension517);
+            pushFollow(FOLLOW_1);
             iv_ruleExtension=ruleExtension();
 
             state._fsp--;
@@ -817,7 +817,7 @@ public final EObject entryRuleExtension() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleExtension; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleExtension527); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -835,7 +835,7 @@ public final EObject entryRuleExtension() throws RecognitionException {
 
 
     // $ANTLR start "ruleExtension"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:297:1: ruleExtension returns [EObject current=null] : (otherlv_0= 'extension' ( (lv_extension_1_0= ruleQualifiedID ) ) ) ;
+    // InternalExport.g:297:1: ruleExtension returns [EObject current=null] : (otherlv_0= 'extension' ( (lv_extension_1_0= ruleQualifiedID ) ) ) ;
     public final EObject ruleExtension() throws RecognitionException {
         EObject current = null;
 
@@ -846,30 +846,30 @@ public final EObject ruleExtension() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:300:28: ( (otherlv_0= 'extension' ( (lv_extension_1_0= ruleQualifiedID ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:301:1: (otherlv_0= 'extension' ( (lv_extension_1_0= ruleQualifiedID ) ) )
+            // InternalExport.g:300:28: ( (otherlv_0= 'extension' ( (lv_extension_1_0= ruleQualifiedID ) ) ) )
+            // InternalExport.g:301:1: (otherlv_0= 'extension' ( (lv_extension_1_0= ruleQualifiedID ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:301:1: (otherlv_0= 'extension' ( (lv_extension_1_0= ruleQualifiedID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:301:3: otherlv_0= 'extension' ( (lv_extension_1_0= ruleQualifiedID ) )
+            // InternalExport.g:301:1: (otherlv_0= 'extension' ( (lv_extension_1_0= ruleQualifiedID ) ) )
+            // InternalExport.g:301:3: otherlv_0= 'extension' ( (lv_extension_1_0= ruleQualifiedID ) )
             {
-            otherlv_0=(Token)match(input,13,FOLLOW_13_in_ruleExtension564); if (state.failed) return current;
+            otherlv_0=(Token)match(input,13,FOLLOW_4); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getExtensionAccess().getExtensionKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:305:1: ( (lv_extension_1_0= ruleQualifiedID ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:306:1: (lv_extension_1_0= ruleQualifiedID )
+            // InternalExport.g:305:1: ( (lv_extension_1_0= ruleQualifiedID ) )
+            // InternalExport.g:306:1: (lv_extension_1_0= ruleQualifiedID )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:306:1: (lv_extension_1_0= ruleQualifiedID )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:307:3: lv_extension_1_0= ruleQualifiedID
+            // InternalExport.g:306:1: (lv_extension_1_0= ruleQualifiedID )
+            // InternalExport.g:307:3: lv_extension_1_0= ruleQualifiedID
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getExtensionAccess().getExtensionQualifiedIDParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleQualifiedID_in_ruleExtension585);
+            pushFollow(FOLLOW_2);
             lv_extension_1_0=ruleQualifiedID();
 
             state._fsp--;
@@ -883,7 +883,7 @@ public final EObject ruleExtension() throws RecognitionException {
                      			current, 
                      			"extension",
                       		lv_extension_1_0, 
-                      		"QualifiedID");
+                      		"com.avaloq.tools.ddk.xtext.export.Export.QualifiedID");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -916,7 +916,7 @@ public final EObject ruleExtension() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleInterface"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:333:1: entryRuleInterface returns [EObject current=null] : iv_ruleInterface= ruleInterface EOF ;
+    // InternalExport.g:333:1: entryRuleInterface returns [EObject current=null] : iv_ruleInterface= ruleInterface EOF ;
     public final EObject entryRuleInterface() throws RecognitionException {
         EObject current = null;
 
@@ -924,13 +924,13 @@ public final EObject entryRuleInterface() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:334:2: (iv_ruleInterface= ruleInterface EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:335:2: iv_ruleInterface= ruleInterface EOF
+            // InternalExport.g:334:2: (iv_ruleInterface= ruleInterface EOF )
+            // InternalExport.g:335:2: iv_ruleInterface= ruleInterface EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getInterfaceRule()); 
             }
-            pushFollow(FOLLOW_ruleInterface_in_entryRuleInterface623);
+            pushFollow(FOLLOW_1);
             iv_ruleInterface=ruleInterface();
 
             state._fsp--;
@@ -938,7 +938,7 @@ public final EObject entryRuleInterface() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleInterface; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInterface633); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -956,7 +956,7 @@ public final EObject entryRuleInterface() throws RecognitionException {
 
 
     // $ANTLR start "ruleInterface"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:342:1: ruleInterface returns [EObject current=null] : ( ( ( ruleQualifiedID ) ) (otherlv_1= '[' ( (lv_guard_2_0= ruleExpression ) ) otherlv_3= ']' )? (otherlv_4= '=' ( (lv_items_5_0= ruleInterfaceItem ) ) (otherlv_6= ',' ( (lv_items_7_0= ruleInterfaceItem ) ) )* )* otherlv_8= ';' ) ;
+    // InternalExport.g:342:1: ruleInterface returns [EObject current=null] : ( ( ( ruleQualifiedID ) ) (otherlv_1= '[' ( (lv_guard_2_0= ruleExpression ) ) otherlv_3= ']' )? (otherlv_4= '=' ( (lv_items_5_0= ruleInterfaceItem ) ) (otherlv_6= ',' ( (lv_items_7_0= ruleInterfaceItem ) ) )* )* otherlv_8= ';' ) ;
     public final EObject ruleInterface() throws RecognitionException {
         EObject current = null;
 
@@ -975,17 +975,17 @@ public final EObject ruleInterface() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:345:28: ( ( ( ( ruleQualifiedID ) ) (otherlv_1= '[' ( (lv_guard_2_0= ruleExpression ) ) otherlv_3= ']' )? (otherlv_4= '=' ( (lv_items_5_0= ruleInterfaceItem ) ) (otherlv_6= ',' ( (lv_items_7_0= ruleInterfaceItem ) ) )* )* otherlv_8= ';' ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:346:1: ( ( ( ruleQualifiedID ) ) (otherlv_1= '[' ( (lv_guard_2_0= ruleExpression ) ) otherlv_3= ']' )? (otherlv_4= '=' ( (lv_items_5_0= ruleInterfaceItem ) ) (otherlv_6= ',' ( (lv_items_7_0= ruleInterfaceItem ) ) )* )* otherlv_8= ';' )
+            // InternalExport.g:345:28: ( ( ( ( ruleQualifiedID ) ) (otherlv_1= '[' ( (lv_guard_2_0= ruleExpression ) ) otherlv_3= ']' )? (otherlv_4= '=' ( (lv_items_5_0= ruleInterfaceItem ) ) (otherlv_6= ',' ( (lv_items_7_0= ruleInterfaceItem ) ) )* )* otherlv_8= ';' ) )
+            // InternalExport.g:346:1: ( ( ( ruleQualifiedID ) ) (otherlv_1= '[' ( (lv_guard_2_0= ruleExpression ) ) otherlv_3= ']' )? (otherlv_4= '=' ( (lv_items_5_0= ruleInterfaceItem ) ) (otherlv_6= ',' ( (lv_items_7_0= ruleInterfaceItem ) ) )* )* otherlv_8= ';' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:346:1: ( ( ( ruleQualifiedID ) ) (otherlv_1= '[' ( (lv_guard_2_0= ruleExpression ) ) otherlv_3= ']' )? (otherlv_4= '=' ( (lv_items_5_0= ruleInterfaceItem ) ) (otherlv_6= ',' ( (lv_items_7_0= ruleInterfaceItem ) ) )* )* otherlv_8= ';' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:346:2: ( ( ruleQualifiedID ) ) (otherlv_1= '[' ( (lv_guard_2_0= ruleExpression ) ) otherlv_3= ']' )? (otherlv_4= '=' ( (lv_items_5_0= ruleInterfaceItem ) ) (otherlv_6= ',' ( (lv_items_7_0= ruleInterfaceItem ) ) )* )* otherlv_8= ';'
+            // InternalExport.g:346:1: ( ( ( ruleQualifiedID ) ) (otherlv_1= '[' ( (lv_guard_2_0= ruleExpression ) ) otherlv_3= ']' )? (otherlv_4= '=' ( (lv_items_5_0= ruleInterfaceItem ) ) (otherlv_6= ',' ( (lv_items_7_0= ruleInterfaceItem ) ) )* )* otherlv_8= ';' )
+            // InternalExport.g:346:2: ( ( ruleQualifiedID ) ) (otherlv_1= '[' ( (lv_guard_2_0= ruleExpression ) ) otherlv_3= ']' )? (otherlv_4= '=' ( (lv_items_5_0= ruleInterfaceItem ) ) (otherlv_6= ',' ( (lv_items_7_0= ruleInterfaceItem ) ) )* )* otherlv_8= ';'
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:346:2: ( ( ruleQualifiedID ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:347:1: ( ruleQualifiedID )
+            // InternalExport.g:346:2: ( ( ruleQualifiedID ) )
+            // InternalExport.g:347:1: ( ruleQualifiedID )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:347:1: ( ruleQualifiedID )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:348:3: ruleQualifiedID
+            // InternalExport.g:347:1: ( ruleQualifiedID )
+            // InternalExport.g:348:3: ruleQualifiedID
             {
             if ( state.backtracking==0 ) {
 
@@ -999,7 +999,7 @@ public final EObject ruleInterface() throws RecognitionException {
               	        newCompositeNode(grammarAccess.getInterfaceAccess().getTypeEClassCrossReference_0_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleQualifiedID_in_ruleInterface681);
+            pushFollow(FOLLOW_14);
             ruleQualifiedID();
 
             state._fsp--;
@@ -1015,7 +1015,7 @@ public final EObject ruleInterface() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:361:2: (otherlv_1= '[' ( (lv_guard_2_0= ruleExpression ) ) otherlv_3= ']' )?
+            // InternalExport.g:361:2: (otherlv_1= '[' ( (lv_guard_2_0= ruleExpression ) ) otherlv_3= ']' )?
             int alt9=2;
             int LA9_0 = input.LA(1);
 
@@ -1024,26 +1024,26 @@ public final EObject ruleInterface() throws RecognitionException {
             }
             switch (alt9) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:361:4: otherlv_1= '[' ( (lv_guard_2_0= ruleExpression ) ) otherlv_3= ']'
+                    // InternalExport.g:361:4: otherlv_1= '[' ( (lv_guard_2_0= ruleExpression ) ) otherlv_3= ']'
                     {
-                    otherlv_1=(Token)match(input,20,FOLLOW_20_in_ruleInterface694); if (state.failed) return current;
+                    otherlv_1=(Token)match(input,20,FOLLOW_15); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_1, grammarAccess.getInterfaceAccess().getLeftSquareBracketKeyword_1_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:365:1: ( (lv_guard_2_0= ruleExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:366:1: (lv_guard_2_0= ruleExpression )
+                    // InternalExport.g:365:1: ( (lv_guard_2_0= ruleExpression ) )
+                    // InternalExport.g:366:1: (lv_guard_2_0= ruleExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:366:1: (lv_guard_2_0= ruleExpression )
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:367:3: lv_guard_2_0= ruleExpression
+                    // InternalExport.g:366:1: (lv_guard_2_0= ruleExpression )
+                    // InternalExport.g:367:3: lv_guard_2_0= ruleExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getInterfaceAccess().getGuardExpressionParserRuleCall_1_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleExpression_in_ruleInterface715);
+                    pushFollow(FOLLOW_16);
                     lv_guard_2_0=ruleExpression();
 
                     state._fsp--;
@@ -1057,7 +1057,7 @@ public final EObject ruleInterface() throws RecognitionException {
                              			current, 
                              			"guard",
                               		lv_guard_2_0, 
-                              		"Expression");
+                              		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -1067,7 +1067,7 @@ public final EObject ruleInterface() throws RecognitionException {
 
                     }
 
-                    otherlv_3=(Token)match(input,21,FOLLOW_21_in_ruleInterface727); if (state.failed) return current;
+                    otherlv_3=(Token)match(input,21,FOLLOW_17); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_3, grammarAccess.getInterfaceAccess().getRightSquareBracketKeyword_1_2());
@@ -1079,7 +1079,7 @@ public final EObject ruleInterface() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:387:3: (otherlv_4= '=' ( (lv_items_5_0= ruleInterfaceItem ) ) (otherlv_6= ',' ( (lv_items_7_0= ruleInterfaceItem ) ) )* )*
+            // InternalExport.g:387:3: (otherlv_4= '=' ( (lv_items_5_0= ruleInterfaceItem ) ) (otherlv_6= ',' ( (lv_items_7_0= ruleInterfaceItem ) ) )* )*
             loop11:
             do {
                 int alt11=2;
@@ -1092,26 +1092,26 @@ public final EObject ruleInterface() throws RecognitionException {
 
                 switch (alt11) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:387:5: otherlv_4= '=' ( (lv_items_5_0= ruleInterfaceItem ) ) (otherlv_6= ',' ( (lv_items_7_0= ruleInterfaceItem ) ) )*
+            	    // InternalExport.g:387:5: otherlv_4= '=' ( (lv_items_5_0= ruleInterfaceItem ) ) (otherlv_6= ',' ( (lv_items_7_0= ruleInterfaceItem ) ) )*
             	    {
-            	    otherlv_4=(Token)match(input,22,FOLLOW_22_in_ruleInterface742); if (state.failed) return current;
+            	    otherlv_4=(Token)match(input,22,FOLLOW_18); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_4, grammarAccess.getInterfaceAccess().getEqualsSignKeyword_2_0());
             	          
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:391:1: ( (lv_items_5_0= ruleInterfaceItem ) )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:392:1: (lv_items_5_0= ruleInterfaceItem )
+            	    // InternalExport.g:391:1: ( (lv_items_5_0= ruleInterfaceItem ) )
+            	    // InternalExport.g:392:1: (lv_items_5_0= ruleInterfaceItem )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:392:1: (lv_items_5_0= ruleInterfaceItem )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:393:3: lv_items_5_0= ruleInterfaceItem
+            	    // InternalExport.g:392:1: (lv_items_5_0= ruleInterfaceItem )
+            	    // InternalExport.g:393:3: lv_items_5_0= ruleInterfaceItem
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getInterfaceAccess().getItemsInterfaceItemParserRuleCall_2_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleInterfaceItem_in_ruleInterface763);
+            	    pushFollow(FOLLOW_19);
             	    lv_items_5_0=ruleInterfaceItem();
 
             	    state._fsp--;
@@ -1125,7 +1125,7 @@ public final EObject ruleInterface() throws RecognitionException {
             	             			current, 
             	             			"items",
             	              		lv_items_5_0, 
-            	              		"InterfaceItem");
+            	              		"com.avaloq.tools.ddk.xtext.export.Export.InterfaceItem");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -1135,7 +1135,7 @@ public final EObject ruleInterface() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:409:2: (otherlv_6= ',' ( (lv_items_7_0= ruleInterfaceItem ) ) )*
+            	    // InternalExport.g:409:2: (otherlv_6= ',' ( (lv_items_7_0= ruleInterfaceItem ) ) )*
             	    loop10:
             	    do {
             	        int alt10=2;
@@ -1148,26 +1148,26 @@ public final EObject ruleInterface() throws RecognitionException {
 
             	        switch (alt10) {
             	    	case 1 :
-            	    	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:409:4: otherlv_6= ',' ( (lv_items_7_0= ruleInterfaceItem ) )
+            	    	    // InternalExport.g:409:4: otherlv_6= ',' ( (lv_items_7_0= ruleInterfaceItem ) )
             	    	    {
-            	    	    otherlv_6=(Token)match(input,23,FOLLOW_23_in_ruleInterface776); if (state.failed) return current;
+            	    	    otherlv_6=(Token)match(input,23,FOLLOW_18); if (state.failed) return current;
             	    	    if ( state.backtracking==0 ) {
 
             	    	          	newLeafNode(otherlv_6, grammarAccess.getInterfaceAccess().getCommaKeyword_2_2_0());
             	    	          
             	    	    }
-            	    	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:413:1: ( (lv_items_7_0= ruleInterfaceItem ) )
-            	    	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:414:1: (lv_items_7_0= ruleInterfaceItem )
+            	    	    // InternalExport.g:413:1: ( (lv_items_7_0= ruleInterfaceItem ) )
+            	    	    // InternalExport.g:414:1: (lv_items_7_0= ruleInterfaceItem )
             	    	    {
-            	    	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:414:1: (lv_items_7_0= ruleInterfaceItem )
-            	    	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:415:3: lv_items_7_0= ruleInterfaceItem
+            	    	    // InternalExport.g:414:1: (lv_items_7_0= ruleInterfaceItem )
+            	    	    // InternalExport.g:415:3: lv_items_7_0= ruleInterfaceItem
             	    	    {
             	    	    if ( state.backtracking==0 ) {
             	    	       
             	    	      	        newCompositeNode(grammarAccess.getInterfaceAccess().getItemsInterfaceItemParserRuleCall_2_2_1_0()); 
             	    	      	    
             	    	    }
-            	    	    pushFollow(FOLLOW_ruleInterfaceItem_in_ruleInterface797);
+            	    	    pushFollow(FOLLOW_19);
             	    	    lv_items_7_0=ruleInterfaceItem();
 
             	    	    state._fsp--;
@@ -1181,7 +1181,7 @@ public final EObject ruleInterface() throws RecognitionException {
             	    	             			current, 
             	    	             			"items",
             	    	              		lv_items_7_0, 
-            	    	              		"InterfaceItem");
+            	    	              		"com.avaloq.tools.ddk.xtext.export.Export.InterfaceItem");
             	    	      	        afterParserOrEnumRuleCall();
             	    	      	    
             	    	    }
@@ -1209,7 +1209,7 @@ public final EObject ruleInterface() throws RecognitionException {
                 }
             } while (true);
 
-            otherlv_8=(Token)match(input,24,FOLLOW_24_in_ruleInterface813); if (state.failed) return current;
+            otherlv_8=(Token)match(input,24,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_8, grammarAccess.getInterfaceAccess().getSemicolonKeyword_3());
@@ -1238,7 +1238,7 @@ public final EObject ruleInterface() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleInterfaceItem"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:443:1: entryRuleInterfaceItem returns [EObject current=null] : iv_ruleInterfaceItem= ruleInterfaceItem EOF ;
+    // InternalExport.g:443:1: entryRuleInterfaceItem returns [EObject current=null] : iv_ruleInterfaceItem= ruleInterfaceItem EOF ;
     public final EObject entryRuleInterfaceItem() throws RecognitionException {
         EObject current = null;
 
@@ -1246,13 +1246,13 @@ public final EObject entryRuleInterfaceItem() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:444:2: (iv_ruleInterfaceItem= ruleInterfaceItem EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:445:2: iv_ruleInterfaceItem= ruleInterfaceItem EOF
+            // InternalExport.g:444:2: (iv_ruleInterfaceItem= ruleInterfaceItem EOF )
+            // InternalExport.g:445:2: iv_ruleInterfaceItem= ruleInterfaceItem EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getInterfaceItemRule()); 
             }
-            pushFollow(FOLLOW_ruleInterfaceItem_in_entryRuleInterfaceItem849);
+            pushFollow(FOLLOW_1);
             iv_ruleInterfaceItem=ruleInterfaceItem();
 
             state._fsp--;
@@ -1260,7 +1260,7 @@ public final EObject entryRuleInterfaceItem() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleInterfaceItem; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInterfaceItem859); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -1278,7 +1278,7 @@ public final EObject entryRuleInterfaceItem() throws RecognitionException {
 
 
     // $ANTLR start "ruleInterfaceItem"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:452:1: ruleInterfaceItem returns [EObject current=null] : (this_InterfaceField_0= ruleInterfaceField | this_InterfaceNavigation_1= ruleInterfaceNavigation | this_InterfaceExpression_2= ruleInterfaceExpression ) ;
+    // InternalExport.g:452:1: ruleInterfaceItem returns [EObject current=null] : (this_InterfaceField_0= ruleInterfaceField | this_InterfaceNavigation_1= ruleInterfaceNavigation | this_InterfaceExpression_2= ruleInterfaceExpression ) ;
     public final EObject ruleInterfaceItem() throws RecognitionException {
         EObject current = null;
 
@@ -1292,10 +1292,10 @@ public final EObject ruleInterfaceItem() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:455:28: ( (this_InterfaceField_0= ruleInterfaceField | this_InterfaceNavigation_1= ruleInterfaceNavigation | this_InterfaceExpression_2= ruleInterfaceExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:456:1: (this_InterfaceField_0= ruleInterfaceField | this_InterfaceNavigation_1= ruleInterfaceNavigation | this_InterfaceExpression_2= ruleInterfaceExpression )
+            // InternalExport.g:455:28: ( (this_InterfaceField_0= ruleInterfaceField | this_InterfaceNavigation_1= ruleInterfaceNavigation | this_InterfaceExpression_2= ruleInterfaceExpression ) )
+            // InternalExport.g:456:1: (this_InterfaceField_0= ruleInterfaceField | this_InterfaceNavigation_1= ruleInterfaceNavigation | this_InterfaceExpression_2= ruleInterfaceExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:456:1: (this_InterfaceField_0= ruleInterfaceField | this_InterfaceNavigation_1= ruleInterfaceNavigation | this_InterfaceExpression_2= ruleInterfaceExpression )
+            // InternalExport.g:456:1: (this_InterfaceField_0= ruleInterfaceField | this_InterfaceNavigation_1= ruleInterfaceNavigation | this_InterfaceExpression_2= ruleInterfaceExpression )
             int alt12=3;
             switch ( input.LA(1) ) {
             case RULE_ID:
@@ -1324,14 +1324,14 @@ public final EObject ruleInterfaceItem() throws RecognitionException {
 
             switch (alt12) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:457:5: this_InterfaceField_0= ruleInterfaceField
+                    // InternalExport.g:457:5: this_InterfaceField_0= ruleInterfaceField
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getInterfaceItemAccess().getInterfaceFieldParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleInterfaceField_in_ruleInterfaceItem906);
+                    pushFollow(FOLLOW_2);
                     this_InterfaceField_0=ruleInterfaceField();
 
                     state._fsp--;
@@ -1346,14 +1346,14 @@ public final EObject ruleInterfaceItem() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:467:5: this_InterfaceNavigation_1= ruleInterfaceNavigation
+                    // InternalExport.g:467:5: this_InterfaceNavigation_1= ruleInterfaceNavigation
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getInterfaceItemAccess().getInterfaceNavigationParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleInterfaceNavigation_in_ruleInterfaceItem933);
+                    pushFollow(FOLLOW_2);
                     this_InterfaceNavigation_1=ruleInterfaceNavigation();
 
                     state._fsp--;
@@ -1368,14 +1368,14 @@ public final EObject ruleInterfaceItem() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:477:5: this_InterfaceExpression_2= ruleInterfaceExpression
+                    // InternalExport.g:477:5: this_InterfaceExpression_2= ruleInterfaceExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getInterfaceItemAccess().getInterfaceExpressionParserRuleCall_2()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleInterfaceExpression_in_ruleInterfaceItem960);
+                    pushFollow(FOLLOW_2);
                     this_InterfaceExpression_2=ruleInterfaceExpression();
 
                     state._fsp--;
@@ -1412,7 +1412,7 @@ public final EObject ruleInterfaceItem() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleInterfaceField"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:493:1: entryRuleInterfaceField returns [EObject current=null] : iv_ruleInterfaceField= ruleInterfaceField EOF ;
+    // InternalExport.g:493:1: entryRuleInterfaceField returns [EObject current=null] : iv_ruleInterfaceField= ruleInterfaceField EOF ;
     public final EObject entryRuleInterfaceField() throws RecognitionException {
         EObject current = null;
 
@@ -1420,13 +1420,13 @@ public final EObject entryRuleInterfaceField() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:494:2: (iv_ruleInterfaceField= ruleInterfaceField EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:495:2: iv_ruleInterfaceField= ruleInterfaceField EOF
+            // InternalExport.g:494:2: (iv_ruleInterfaceField= ruleInterfaceField EOF )
+            // InternalExport.g:495:2: iv_ruleInterfaceField= ruleInterfaceField EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getInterfaceFieldRule()); 
             }
-            pushFollow(FOLLOW_ruleInterfaceField_in_entryRuleInterfaceField995);
+            pushFollow(FOLLOW_1);
             iv_ruleInterfaceField=ruleInterfaceField();
 
             state._fsp--;
@@ -1434,7 +1434,7 @@ public final EObject entryRuleInterfaceField() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleInterfaceField; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInterfaceField1005); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -1452,7 +1452,7 @@ public final EObject entryRuleInterfaceField() throws RecognitionException {
 
 
     // $ANTLR start "ruleInterfaceField"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:502:1: ruleInterfaceField returns [EObject current=null] : ( ( (lv_unordered_0_0= '+' ) )? ( (otherlv_1= RULE_ID ) ) ) ;
+    // InternalExport.g:502:1: ruleInterfaceField returns [EObject current=null] : ( ( (lv_unordered_0_0= '+' ) )? ( (otherlv_1= RULE_ID ) ) ) ;
     public final EObject ruleInterfaceField() throws RecognitionException {
         EObject current = null;
 
@@ -1462,13 +1462,13 @@ public final EObject ruleInterfaceField() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:505:28: ( ( ( (lv_unordered_0_0= '+' ) )? ( (otherlv_1= RULE_ID ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:506:1: ( ( (lv_unordered_0_0= '+' ) )? ( (otherlv_1= RULE_ID ) ) )
+            // InternalExport.g:505:28: ( ( ( (lv_unordered_0_0= '+' ) )? ( (otherlv_1= RULE_ID ) ) ) )
+            // InternalExport.g:506:1: ( ( (lv_unordered_0_0= '+' ) )? ( (otherlv_1= RULE_ID ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:506:1: ( ( (lv_unordered_0_0= '+' ) )? ( (otherlv_1= RULE_ID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:506:2: ( (lv_unordered_0_0= '+' ) )? ( (otherlv_1= RULE_ID ) )
+            // InternalExport.g:506:1: ( ( (lv_unordered_0_0= '+' ) )? ( (otherlv_1= RULE_ID ) ) )
+            // InternalExport.g:506:2: ( (lv_unordered_0_0= '+' ) )? ( (otherlv_1= RULE_ID ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:506:2: ( (lv_unordered_0_0= '+' ) )?
+            // InternalExport.g:506:2: ( (lv_unordered_0_0= '+' ) )?
             int alt13=2;
             int LA13_0 = input.LA(1);
 
@@ -1477,12 +1477,12 @@ public final EObject ruleInterfaceField() throws RecognitionException {
             }
             switch (alt13) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:507:1: (lv_unordered_0_0= '+' )
+                    // InternalExport.g:507:1: (lv_unordered_0_0= '+' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:507:1: (lv_unordered_0_0= '+' )
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:508:3: lv_unordered_0_0= '+'
+                    // InternalExport.g:507:1: (lv_unordered_0_0= '+' )
+                    // InternalExport.g:508:3: lv_unordered_0_0= '+'
                     {
-                    lv_unordered_0_0=(Token)match(input,25,FOLLOW_25_in_ruleInterfaceField1048); if (state.failed) return current;
+                    lv_unordered_0_0=(Token)match(input,25,FOLLOW_4); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_unordered_0_0, grammarAccess.getInterfaceFieldAccess().getUnorderedPlusSignKeyword_0_0());
@@ -1505,11 +1505,11 @@ public final EObject ruleInterfaceField() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:521:3: ( (otherlv_1= RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:522:1: (otherlv_1= RULE_ID )
+            // InternalExport.g:521:3: ( (otherlv_1= RULE_ID ) )
+            // InternalExport.g:522:1: (otherlv_1= RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:522:1: (otherlv_1= RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:523:3: otherlv_1= RULE_ID
+            // InternalExport.g:522:1: (otherlv_1= RULE_ID )
+            // InternalExport.g:523:3: otherlv_1= RULE_ID
             {
             if ( state.backtracking==0 ) {
 
@@ -1518,7 +1518,7 @@ public final EObject ruleInterfaceField() throws RecognitionException {
               	        }
                       
             }
-            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleInterfaceField1082); if (state.failed) return current;
+            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               		newLeafNode(otherlv_1, grammarAccess.getInterfaceFieldAccess().getFieldEStructuralFeatureCrossReference_1_0()); 
@@ -1553,7 +1553,7 @@ public final EObject ruleInterfaceField() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleInterfaceNavigation"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:542:1: entryRuleInterfaceNavigation returns [EObject current=null] : iv_ruleInterfaceNavigation= ruleInterfaceNavigation EOF ;
+    // InternalExport.g:542:1: entryRuleInterfaceNavigation returns [EObject current=null] : iv_ruleInterfaceNavigation= ruleInterfaceNavigation EOF ;
     public final EObject entryRuleInterfaceNavigation() throws RecognitionException {
         EObject current = null;
 
@@ -1561,13 +1561,13 @@ public final EObject entryRuleInterfaceNavigation() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:543:2: (iv_ruleInterfaceNavigation= ruleInterfaceNavigation EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:544:2: iv_ruleInterfaceNavigation= ruleInterfaceNavigation EOF
+            // InternalExport.g:543:2: (iv_ruleInterfaceNavigation= ruleInterfaceNavigation EOF )
+            // InternalExport.g:544:2: iv_ruleInterfaceNavigation= ruleInterfaceNavigation EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getInterfaceNavigationRule()); 
             }
-            pushFollow(FOLLOW_ruleInterfaceNavigation_in_entryRuleInterfaceNavigation1118);
+            pushFollow(FOLLOW_1);
             iv_ruleInterfaceNavigation=ruleInterfaceNavigation();
 
             state._fsp--;
@@ -1575,7 +1575,7 @@ public final EObject entryRuleInterfaceNavigation() throws RecognitionException
             if ( state.backtracking==0 ) {
                current =iv_ruleInterfaceNavigation; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInterfaceNavigation1128); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -1593,7 +1593,7 @@ public final EObject entryRuleInterfaceNavigation() throws RecognitionException
 
 
     // $ANTLR start "ruleInterfaceNavigation"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:551:1: ruleInterfaceNavigation returns [EObject current=null] : (otherlv_0= '@' ( (lv_unordered_1_0= '+' ) )? ( (otherlv_2= RULE_ID ) ) ) ;
+    // InternalExport.g:551:1: ruleInterfaceNavigation returns [EObject current=null] : (otherlv_0= '@' ( (lv_unordered_1_0= '+' ) )? ( (otherlv_2= RULE_ID ) ) ) ;
     public final EObject ruleInterfaceNavigation() throws RecognitionException {
         EObject current = null;
 
@@ -1604,19 +1604,19 @@ public final EObject ruleInterfaceNavigation() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:554:28: ( (otherlv_0= '@' ( (lv_unordered_1_0= '+' ) )? ( (otherlv_2= RULE_ID ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:555:1: (otherlv_0= '@' ( (lv_unordered_1_0= '+' ) )? ( (otherlv_2= RULE_ID ) ) )
+            // InternalExport.g:554:28: ( (otherlv_0= '@' ( (lv_unordered_1_0= '+' ) )? ( (otherlv_2= RULE_ID ) ) ) )
+            // InternalExport.g:555:1: (otherlv_0= '@' ( (lv_unordered_1_0= '+' ) )? ( (otherlv_2= RULE_ID ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:555:1: (otherlv_0= '@' ( (lv_unordered_1_0= '+' ) )? ( (otherlv_2= RULE_ID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:555:3: otherlv_0= '@' ( (lv_unordered_1_0= '+' ) )? ( (otherlv_2= RULE_ID ) )
+            // InternalExport.g:555:1: (otherlv_0= '@' ( (lv_unordered_1_0= '+' ) )? ( (otherlv_2= RULE_ID ) ) )
+            // InternalExport.g:555:3: otherlv_0= '@' ( (lv_unordered_1_0= '+' ) )? ( (otherlv_2= RULE_ID ) )
             {
-            otherlv_0=(Token)match(input,26,FOLLOW_26_in_ruleInterfaceNavigation1165); if (state.failed) return current;
+            otherlv_0=(Token)match(input,26,FOLLOW_20); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getInterfaceNavigationAccess().getCommercialAtKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:559:1: ( (lv_unordered_1_0= '+' ) )?
+            // InternalExport.g:559:1: ( (lv_unordered_1_0= '+' ) )?
             int alt14=2;
             int LA14_0 = input.LA(1);
 
@@ -1625,12 +1625,12 @@ public final EObject ruleInterfaceNavigation() throws RecognitionException {
             }
             switch (alt14) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:560:1: (lv_unordered_1_0= '+' )
+                    // InternalExport.g:560:1: (lv_unordered_1_0= '+' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:560:1: (lv_unordered_1_0= '+' )
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:561:3: lv_unordered_1_0= '+'
+                    // InternalExport.g:560:1: (lv_unordered_1_0= '+' )
+                    // InternalExport.g:561:3: lv_unordered_1_0= '+'
                     {
-                    lv_unordered_1_0=(Token)match(input,25,FOLLOW_25_in_ruleInterfaceNavigation1183); if (state.failed) return current;
+                    lv_unordered_1_0=(Token)match(input,25,FOLLOW_4); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_unordered_1_0, grammarAccess.getInterfaceNavigationAccess().getUnorderedPlusSignKeyword_1_0());
@@ -1653,11 +1653,11 @@ public final EObject ruleInterfaceNavigation() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:574:3: ( (otherlv_2= RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:575:1: (otherlv_2= RULE_ID )
+            // InternalExport.g:574:3: ( (otherlv_2= RULE_ID ) )
+            // InternalExport.g:575:1: (otherlv_2= RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:575:1: (otherlv_2= RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:576:3: otherlv_2= RULE_ID
+            // InternalExport.g:575:1: (otherlv_2= RULE_ID )
+            // InternalExport.g:576:3: otherlv_2= RULE_ID
             {
             if ( state.backtracking==0 ) {
 
@@ -1666,7 +1666,7 @@ public final EObject ruleInterfaceNavigation() throws RecognitionException {
               	        }
                       
             }
-            otherlv_2=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleInterfaceNavigation1217); if (state.failed) return current;
+            otherlv_2=(Token)match(input,RULE_ID,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               		newLeafNode(otherlv_2, grammarAccess.getInterfaceNavigationAccess().getRefEReferenceCrossReference_2_0()); 
@@ -1701,7 +1701,7 @@ public final EObject ruleInterfaceNavigation() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleInterfaceExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:595:1: entryRuleInterfaceExpression returns [EObject current=null] : iv_ruleInterfaceExpression= ruleInterfaceExpression EOF ;
+    // InternalExport.g:595:1: entryRuleInterfaceExpression returns [EObject current=null] : iv_ruleInterfaceExpression= ruleInterfaceExpression EOF ;
     public final EObject entryRuleInterfaceExpression() throws RecognitionException {
         EObject current = null;
 
@@ -1709,13 +1709,13 @@ public final EObject entryRuleInterfaceExpression() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:596:2: (iv_ruleInterfaceExpression= ruleInterfaceExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:597:2: iv_ruleInterfaceExpression= ruleInterfaceExpression EOF
+            // InternalExport.g:596:2: (iv_ruleInterfaceExpression= ruleInterfaceExpression EOF )
+            // InternalExport.g:597:2: iv_ruleInterfaceExpression= ruleInterfaceExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getInterfaceExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleInterfaceExpression_in_entryRuleInterfaceExpression1253);
+            pushFollow(FOLLOW_1);
             iv_ruleInterfaceExpression=ruleInterfaceExpression();
 
             state._fsp--;
@@ -1723,7 +1723,7 @@ public final EObject entryRuleInterfaceExpression() throws RecognitionException
             if ( state.backtracking==0 ) {
                current =iv_ruleInterfaceExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInterfaceExpression1263); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -1741,7 +1741,7 @@ public final EObject entryRuleInterfaceExpression() throws RecognitionException
 
 
     // $ANTLR start "ruleInterfaceExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:604:1: ruleInterfaceExpression returns [EObject current=null] : (otherlv_0= 'eval' ( (lv_ref_1_0= '@' ) )? ( (lv_unordered_2_0= '+' ) )? otherlv_3= '(' ( (lv_expr_4_0= ruleExpression ) ) otherlv_5= ')' ) ;
+    // InternalExport.g:604:1: ruleInterfaceExpression returns [EObject current=null] : (otherlv_0= 'eval' ( (lv_ref_1_0= '@' ) )? ( (lv_unordered_2_0= '+' ) )? otherlv_3= '(' ( (lv_expr_4_0= ruleExpression ) ) otherlv_5= ')' ) ;
     public final EObject ruleInterfaceExpression() throws RecognitionException {
         EObject current = null;
 
@@ -1756,19 +1756,19 @@ public final EObject ruleInterfaceExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:607:28: ( (otherlv_0= 'eval' ( (lv_ref_1_0= '@' ) )? ( (lv_unordered_2_0= '+' ) )? otherlv_3= '(' ( (lv_expr_4_0= ruleExpression ) ) otherlv_5= ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:608:1: (otherlv_0= 'eval' ( (lv_ref_1_0= '@' ) )? ( (lv_unordered_2_0= '+' ) )? otherlv_3= '(' ( (lv_expr_4_0= ruleExpression ) ) otherlv_5= ')' )
+            // InternalExport.g:607:28: ( (otherlv_0= 'eval' ( (lv_ref_1_0= '@' ) )? ( (lv_unordered_2_0= '+' ) )? otherlv_3= '(' ( (lv_expr_4_0= ruleExpression ) ) otherlv_5= ')' ) )
+            // InternalExport.g:608:1: (otherlv_0= 'eval' ( (lv_ref_1_0= '@' ) )? ( (lv_unordered_2_0= '+' ) )? otherlv_3= '(' ( (lv_expr_4_0= ruleExpression ) ) otherlv_5= ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:608:1: (otherlv_0= 'eval' ( (lv_ref_1_0= '@' ) )? ( (lv_unordered_2_0= '+' ) )? otherlv_3= '(' ( (lv_expr_4_0= ruleExpression ) ) otherlv_5= ')' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:608:3: otherlv_0= 'eval' ( (lv_ref_1_0= '@' ) )? ( (lv_unordered_2_0= '+' ) )? otherlv_3= '(' ( (lv_expr_4_0= ruleExpression ) ) otherlv_5= ')'
+            // InternalExport.g:608:1: (otherlv_0= 'eval' ( (lv_ref_1_0= '@' ) )? ( (lv_unordered_2_0= '+' ) )? otherlv_3= '(' ( (lv_expr_4_0= ruleExpression ) ) otherlv_5= ')' )
+            // InternalExport.g:608:3: otherlv_0= 'eval' ( (lv_ref_1_0= '@' ) )? ( (lv_unordered_2_0= '+' ) )? otherlv_3= '(' ( (lv_expr_4_0= ruleExpression ) ) otherlv_5= ')'
             {
-            otherlv_0=(Token)match(input,27,FOLLOW_27_in_ruleInterfaceExpression1300); if (state.failed) return current;
+            otherlv_0=(Token)match(input,27,FOLLOW_21); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getInterfaceExpressionAccess().getEvalKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:612:1: ( (lv_ref_1_0= '@' ) )?
+            // InternalExport.g:612:1: ( (lv_ref_1_0= '@' ) )?
             int alt15=2;
             int LA15_0 = input.LA(1);
 
@@ -1777,12 +1777,12 @@ public final EObject ruleInterfaceExpression() throws RecognitionException {
             }
             switch (alt15) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:613:1: (lv_ref_1_0= '@' )
+                    // InternalExport.g:613:1: (lv_ref_1_0= '@' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:613:1: (lv_ref_1_0= '@' )
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:614:3: lv_ref_1_0= '@'
+                    // InternalExport.g:613:1: (lv_ref_1_0= '@' )
+                    // InternalExport.g:614:3: lv_ref_1_0= '@'
                     {
-                    lv_ref_1_0=(Token)match(input,26,FOLLOW_26_in_ruleInterfaceExpression1318); if (state.failed) return current;
+                    lv_ref_1_0=(Token)match(input,26,FOLLOW_22); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_ref_1_0, grammarAccess.getInterfaceExpressionAccess().getRefCommercialAtKeyword_1_0());
@@ -1805,7 +1805,7 @@ public final EObject ruleInterfaceExpression() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:627:3: ( (lv_unordered_2_0= '+' ) )?
+            // InternalExport.g:627:3: ( (lv_unordered_2_0= '+' ) )?
             int alt16=2;
             int LA16_0 = input.LA(1);
 
@@ -1814,12 +1814,12 @@ public final EObject ruleInterfaceExpression() throws RecognitionException {
             }
             switch (alt16) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:628:1: (lv_unordered_2_0= '+' )
+                    // InternalExport.g:628:1: (lv_unordered_2_0= '+' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:628:1: (lv_unordered_2_0= '+' )
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:629:3: lv_unordered_2_0= '+'
+                    // InternalExport.g:628:1: (lv_unordered_2_0= '+' )
+                    // InternalExport.g:629:3: lv_unordered_2_0= '+'
                     {
-                    lv_unordered_2_0=(Token)match(input,25,FOLLOW_25_in_ruleInterfaceExpression1350); if (state.failed) return current;
+                    lv_unordered_2_0=(Token)match(input,25,FOLLOW_23); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_unordered_2_0, grammarAccess.getInterfaceExpressionAccess().getUnorderedPlusSignKeyword_2_0());
@@ -1842,24 +1842,24 @@ public final EObject ruleInterfaceExpression() throws RecognitionException {
 
             }
 
-            otherlv_3=(Token)match(input,28,FOLLOW_28_in_ruleInterfaceExpression1376); if (state.failed) return current;
+            otherlv_3=(Token)match(input,28,FOLLOW_15); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_3, grammarAccess.getInterfaceExpressionAccess().getLeftParenthesisKeyword_3());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:646:1: ( (lv_expr_4_0= ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:647:1: (lv_expr_4_0= ruleExpression )
+            // InternalExport.g:646:1: ( (lv_expr_4_0= ruleExpression ) )
+            // InternalExport.g:647:1: (lv_expr_4_0= ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:647:1: (lv_expr_4_0= ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:648:3: lv_expr_4_0= ruleExpression
+            // InternalExport.g:647:1: (lv_expr_4_0= ruleExpression )
+            // InternalExport.g:648:3: lv_expr_4_0= ruleExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getInterfaceExpressionAccess().getExprExpressionParserRuleCall_4_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleExpression_in_ruleInterfaceExpression1397);
+            pushFollow(FOLLOW_24);
             lv_expr_4_0=ruleExpression();
 
             state._fsp--;
@@ -1873,7 +1873,7 @@ public final EObject ruleInterfaceExpression() throws RecognitionException {
                      			current, 
                      			"expr",
                       		lv_expr_4_0, 
-                      		"Expression");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -1883,7 +1883,7 @@ public final EObject ruleInterfaceExpression() throws RecognitionException {
 
             }
 
-            otherlv_5=(Token)match(input,29,FOLLOW_29_in_ruleInterfaceExpression1409); if (state.failed) return current;
+            otherlv_5=(Token)match(input,29,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_5, grammarAccess.getInterfaceExpressionAccess().getRightParenthesisKeyword_5());
@@ -1912,7 +1912,7 @@ public final EObject ruleInterfaceExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleExport"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:676:1: entryRuleExport returns [EObject current=null] : iv_ruleExport= ruleExport EOF ;
+    // InternalExport.g:676:1: entryRuleExport returns [EObject current=null] : iv_ruleExport= ruleExport EOF ;
     public final EObject entryRuleExport() throws RecognitionException {
         EObject current = null;
 
@@ -1920,13 +1920,13 @@ public final EObject entryRuleExport() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:677:2: (iv_ruleExport= ruleExport EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:678:2: iv_ruleExport= ruleExport EOF
+            // InternalExport.g:677:2: (iv_ruleExport= ruleExport EOF )
+            // InternalExport.g:678:2: iv_ruleExport= ruleExport EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getExportRule()); 
             }
-            pushFollow(FOLLOW_ruleExport_in_entryRuleExport1445);
+            pushFollow(FOLLOW_1);
             iv_ruleExport=ruleExport();
 
             state._fsp--;
@@ -1934,7 +1934,7 @@ public final EObject entryRuleExport() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleExport; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleExport1455); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -1952,7 +1952,7 @@ public final EObject entryRuleExport() throws RecognitionException {
 
 
     // $ANTLR start "ruleExport"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:685:1: ruleExport returns [EObject current=null] : (otherlv_0= 'export' ( ( (lv_lookup_1_0= 'lookup' ) ) (otherlv_2= '[' ( (lv_lookupPredicate_3_0= ruleExpression ) ) otherlv_4= ']' )? )? ( ( ruleQualifiedID ) ) (otherlv_6= 'as' ( (lv_qualifiedName_7_0= 'qualified' ) )? ( (lv_naming_8_0= ruleExpression ) ) )? (otherlv_9= '[' ( (lv_guard_10_0= ruleExpression ) ) otherlv_11= ']' )? otherlv_12= '{' (otherlv_13= 'uri-fragment' otherlv_14= '=' ( (lv_fragmentUnique_15_0= 'unique' ) )? otherlv_16= 'attribute' otherlv_17= '(' ( (otherlv_18= RULE_ID ) ) otherlv_19= ')' otherlv_20= ';' )? ( ( ( (lv_fingerprint_21_0= 'object-fingerprint' ) ) | ( (lv_resourceFingerprint_22_0= 'resource-fingerprint' ) ) ) otherlv_23= ';' )? ( (otherlv_24= 'field' ( (lv_attributes_25_0= ruleAttribute ) ) (otherlv_26= ',' ( (lv_attributes_27_0= ruleAttribute ) ) )* otherlv_28= ';' ) | (otherlv_29= 'data' ( (lv_userData_30_0= ruleUserData ) ) (otherlv_31= ',' ( (lv_userData_32_0= ruleUserData ) ) )* otherlv_33= ';' ) )* otherlv_34= '}' ) ;
+    // InternalExport.g:685:1: ruleExport returns [EObject current=null] : (otherlv_0= 'export' ( ( (lv_lookup_1_0= 'lookup' ) ) (otherlv_2= '[' ( (lv_lookupPredicate_3_0= ruleExpression ) ) otherlv_4= ']' )? )? ( ( ruleQualifiedID ) ) (otherlv_6= 'as' ( (lv_qualifiedName_7_0= 'qualified' ) )? ( (lv_naming_8_0= ruleExpression ) ) )? (otherlv_9= '[' ( (lv_guard_10_0= ruleExpression ) ) otherlv_11= ']' )? otherlv_12= '{' (otherlv_13= 'uri-fragment' otherlv_14= '=' ( (lv_fragmentUnique_15_0= 'unique' ) )? otherlv_16= 'attribute' otherlv_17= '(' ( (otherlv_18= RULE_ID ) ) otherlv_19= ')' otherlv_20= ';' )? ( ( ( (lv_fingerprint_21_0= 'object-fingerprint' ) ) | ( (lv_resourceFingerprint_22_0= 'resource-fingerprint' ) ) ) otherlv_23= ';' )? ( (otherlv_24= 'field' ( (lv_attributes_25_0= ruleAttribute ) ) (otherlv_26= ',' ( (lv_attributes_27_0= ruleAttribute ) ) )* otherlv_28= ';' ) | (otherlv_29= 'data' ( (lv_userData_30_0= ruleUserData ) ) (otherlv_31= ',' ( (lv_userData_32_0= ruleUserData ) ) )* otherlv_33= ';' ) )* otherlv_34= '}' ) ;
     public final EObject ruleExport() throws RecognitionException {
         EObject current = null;
 
@@ -2001,19 +2001,19 @@ public final EObject ruleExport() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:688:28: ( (otherlv_0= 'export' ( ( (lv_lookup_1_0= 'lookup' ) ) (otherlv_2= '[' ( (lv_lookupPredicate_3_0= ruleExpression ) ) otherlv_4= ']' )? )? ( ( ruleQualifiedID ) ) (otherlv_6= 'as' ( (lv_qualifiedName_7_0= 'qualified' ) )? ( (lv_naming_8_0= ruleExpression ) ) )? (otherlv_9= '[' ( (lv_guard_10_0= ruleExpression ) ) otherlv_11= ']' )? otherlv_12= '{' (otherlv_13= 'uri-fragment' otherlv_14= '=' ( (lv_fragmentUnique_15_0= 'unique' ) )? otherlv_16= 'attribute' otherlv_17= '(' ( (otherlv_18= RULE_ID ) ) otherlv_19= ')' otherlv_20= ';' )? ( ( ( (lv_fingerprint_21_0= 'object-fingerprint' ) ) | ( (lv_resourceFingerprint_22_0= 'resource-fingerprint' ) ) ) otherlv_23= ';' )? ( (otherlv_24= 'field' ( (lv_attributes_25_0= ruleAttribute ) ) (otherlv_26= ',' ( (lv_attributes_27_0= ruleAttribute ) ) )* otherlv_28= ';' ) | (otherlv_29= 'data' ( (lv_userData_30_0= ruleUserData ) ) (otherlv_31= ',' ( (lv_userData_32_0= ruleUserData ) ) )* otherlv_33= ';' ) )* otherlv_34= '}' ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:689:1: (otherlv_0= 'export' ( ( (lv_lookup_1_0= 'lookup' ) ) (otherlv_2= '[' ( (lv_lookupPredicate_3_0= ruleExpression ) ) otherlv_4= ']' )? )? ( ( ruleQualifiedID ) ) (otherlv_6= 'as' ( (lv_qualifiedName_7_0= 'qualified' ) )? ( (lv_naming_8_0= ruleExpression ) ) )? (otherlv_9= '[' ( (lv_guard_10_0= ruleExpression ) ) otherlv_11= ']' )? otherlv_12= '{' (otherlv_13= 'uri-fragment' otherlv_14= '=' ( (lv_fragmentUnique_15_0= 'unique' ) )? otherlv_16= 'attribute' otherlv_17= '(' ( (otherlv_18= RULE_ID ) ) otherlv_19= ')' otherlv_20= ';' )? ( ( ( (lv_fingerprint_21_0= 'object-fingerprint' ) ) | ( (lv_resourceFingerprint_22_0= 'resource-fingerprint' ) ) ) otherlv_23= ';' )? ( (otherlv_24= 'field' ( (lv_attributes_25_0= ruleAttribute ) ) (otherlv_26= ',' ( (lv_attributes_27_0= ruleAttribute ) ) )* otherlv_28= ';' ) | (otherlv_29= 'data' ( (lv_userData_30_0= ruleUserData ) ) (otherlv_31= ',' ( (lv_userData_32_0= ruleUserData ) ) )* otherlv_33= ';' ) )* otherlv_34= '}' )
+            // InternalExport.g:688:28: ( (otherlv_0= 'export' ( ( (lv_lookup_1_0= 'lookup' ) ) (otherlv_2= '[' ( (lv_lookupPredicate_3_0= ruleExpression ) ) otherlv_4= ']' )? )? ( ( ruleQualifiedID ) ) (otherlv_6= 'as' ( (lv_qualifiedName_7_0= 'qualified' ) )? ( (lv_naming_8_0= ruleExpression ) ) )? (otherlv_9= '[' ( (lv_guard_10_0= ruleExpression ) ) otherlv_11= ']' )? otherlv_12= '{' (otherlv_13= 'uri-fragment' otherlv_14= '=' ( (lv_fragmentUnique_15_0= 'unique' ) )? otherlv_16= 'attribute' otherlv_17= '(' ( (otherlv_18= RULE_ID ) ) otherlv_19= ')' otherlv_20= ';' )? ( ( ( (lv_fingerprint_21_0= 'object-fingerprint' ) ) | ( (lv_resourceFingerprint_22_0= 'resource-fingerprint' ) ) ) otherlv_23= ';' )? ( (otherlv_24= 'field' ( (lv_attributes_25_0= ruleAttribute ) ) (otherlv_26= ',' ( (lv_attributes_27_0= ruleAttribute ) ) )* otherlv_28= ';' ) | (otherlv_29= 'data' ( (lv_userData_30_0= ruleUserData ) ) (otherlv_31= ',' ( (lv_userData_32_0= ruleUserData ) ) )* otherlv_33= ';' ) )* otherlv_34= '}' ) )
+            // InternalExport.g:689:1: (otherlv_0= 'export' ( ( (lv_lookup_1_0= 'lookup' ) ) (otherlv_2= '[' ( (lv_lookupPredicate_3_0= ruleExpression ) ) otherlv_4= ']' )? )? ( ( ruleQualifiedID ) ) (otherlv_6= 'as' ( (lv_qualifiedName_7_0= 'qualified' ) )? ( (lv_naming_8_0= ruleExpression ) ) )? (otherlv_9= '[' ( (lv_guard_10_0= ruleExpression ) ) otherlv_11= ']' )? otherlv_12= '{' (otherlv_13= 'uri-fragment' otherlv_14= '=' ( (lv_fragmentUnique_15_0= 'unique' ) )? otherlv_16= 'attribute' otherlv_17= '(' ( (otherlv_18= RULE_ID ) ) otherlv_19= ')' otherlv_20= ';' )? ( ( ( (lv_fingerprint_21_0= 'object-fingerprint' ) ) | ( (lv_resourceFingerprint_22_0= 'resource-fingerprint' ) ) ) otherlv_23= ';' )? ( (otherlv_24= 'field' ( (lv_attributes_25_0= ruleAttribute ) ) (otherlv_26= ',' ( (lv_attributes_27_0= ruleAttribute ) ) )* otherlv_28= ';' ) | (otherlv_29= 'data' ( (lv_userData_30_0= ruleUserData ) ) (otherlv_31= ',' ( (lv_userData_32_0= ruleUserData ) ) )* otherlv_33= ';' ) )* otherlv_34= '}' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:689:1: (otherlv_0= 'export' ( ( (lv_lookup_1_0= 'lookup' ) ) (otherlv_2= '[' ( (lv_lookupPredicate_3_0= ruleExpression ) ) otherlv_4= ']' )? )? ( ( ruleQualifiedID ) ) (otherlv_6= 'as' ( (lv_qualifiedName_7_0= 'qualified' ) )? ( (lv_naming_8_0= ruleExpression ) ) )? (otherlv_9= '[' ( (lv_guard_10_0= ruleExpression ) ) otherlv_11= ']' )? otherlv_12= '{' (otherlv_13= 'uri-fragment' otherlv_14= '=' ( (lv_fragmentUnique_15_0= 'unique' ) )? otherlv_16= 'attribute' otherlv_17= '(' ( (otherlv_18= RULE_ID ) ) otherlv_19= ')' otherlv_20= ';' )? ( ( ( (lv_fingerprint_21_0= 'object-fingerprint' ) ) | ( (lv_resourceFingerprint_22_0= 'resource-fingerprint' ) ) ) otherlv_23= ';' )? ( (otherlv_24= 'field' ( (lv_attributes_25_0= ruleAttribute ) ) (otherlv_26= ',' ( (lv_attributes_27_0= ruleAttribute ) ) )* otherlv_28= ';' ) | (otherlv_29= 'data' ( (lv_userData_30_0= ruleUserData ) ) (otherlv_31= ',' ( (lv_userData_32_0= ruleUserData ) ) )* otherlv_33= ';' ) )* otherlv_34= '}' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:689:3: otherlv_0= 'export' ( ( (lv_lookup_1_0= 'lookup' ) ) (otherlv_2= '[' ( (lv_lookupPredicate_3_0= ruleExpression ) ) otherlv_4= ']' )? )? ( ( ruleQualifiedID ) ) (otherlv_6= 'as' ( (lv_qualifiedName_7_0= 'qualified' ) )? ( (lv_naming_8_0= ruleExpression ) ) )? (otherlv_9= '[' ( (lv_guard_10_0= ruleExpression ) ) otherlv_11= ']' )? otherlv_12= '{' (otherlv_13= 'uri-fragment' otherlv_14= '=' ( (lv_fragmentUnique_15_0= 'unique' ) )? otherlv_16= 'attribute' otherlv_17= '(' ( (otherlv_18= RULE_ID ) ) otherlv_19= ')' otherlv_20= ';' )? ( ( ( (lv_fingerprint_21_0= 'object-fingerprint' ) ) | ( (lv_resourceFingerprint_22_0= 'resource-fingerprint' ) ) ) otherlv_23= ';' )? ( (otherlv_24= 'field' ( (lv_attributes_25_0= ruleAttribute ) ) (otherlv_26= ',' ( (lv_attributes_27_0= ruleAttribute ) ) )* otherlv_28= ';' ) | (otherlv_29= 'data' ( (lv_userData_30_0= ruleUserData ) ) (otherlv_31= ',' ( (lv_userData_32_0= ruleUserData ) ) )* otherlv_33= ';' ) )* otherlv_34= '}'
+            // InternalExport.g:689:1: (otherlv_0= 'export' ( ( (lv_lookup_1_0= 'lookup' ) ) (otherlv_2= '[' ( (lv_lookupPredicate_3_0= ruleExpression ) ) otherlv_4= ']' )? )? ( ( ruleQualifiedID ) ) (otherlv_6= 'as' ( (lv_qualifiedName_7_0= 'qualified' ) )? ( (lv_naming_8_0= ruleExpression ) ) )? (otherlv_9= '[' ( (lv_guard_10_0= ruleExpression ) ) otherlv_11= ']' )? otherlv_12= '{' (otherlv_13= 'uri-fragment' otherlv_14= '=' ( (lv_fragmentUnique_15_0= 'unique' ) )? otherlv_16= 'attribute' otherlv_17= '(' ( (otherlv_18= RULE_ID ) ) otherlv_19= ')' otherlv_20= ';' )? ( ( ( (lv_fingerprint_21_0= 'object-fingerprint' ) ) | ( (lv_resourceFingerprint_22_0= 'resource-fingerprint' ) ) ) otherlv_23= ';' )? ( (otherlv_24= 'field' ( (lv_attributes_25_0= ruleAttribute ) ) (otherlv_26= ',' ( (lv_attributes_27_0= ruleAttribute ) ) )* otherlv_28= ';' ) | (otherlv_29= 'data' ( (lv_userData_30_0= ruleUserData ) ) (otherlv_31= ',' ( (lv_userData_32_0= ruleUserData ) ) )* otherlv_33= ';' ) )* otherlv_34= '}' )
+            // InternalExport.g:689:3: otherlv_0= 'export' ( ( (lv_lookup_1_0= 'lookup' ) ) (otherlv_2= '[' ( (lv_lookupPredicate_3_0= ruleExpression ) ) otherlv_4= ']' )? )? ( ( ruleQualifiedID ) ) (otherlv_6= 'as' ( (lv_qualifiedName_7_0= 'qualified' ) )? ( (lv_naming_8_0= ruleExpression ) ) )? (otherlv_9= '[' ( (lv_guard_10_0= ruleExpression ) ) otherlv_11= ']' )? otherlv_12= '{' (otherlv_13= 'uri-fragment' otherlv_14= '=' ( (lv_fragmentUnique_15_0= 'unique' ) )? otherlv_16= 'attribute' otherlv_17= '(' ( (otherlv_18= RULE_ID ) ) otherlv_19= ')' otherlv_20= ';' )? ( ( ( (lv_fingerprint_21_0= 'object-fingerprint' ) ) | ( (lv_resourceFingerprint_22_0= 'resource-fingerprint' ) ) ) otherlv_23= ';' )? ( (otherlv_24= 'field' ( (lv_attributes_25_0= ruleAttribute ) ) (otherlv_26= ',' ( (lv_attributes_27_0= ruleAttribute ) ) )* otherlv_28= ';' ) | (otherlv_29= 'data' ( (lv_userData_30_0= ruleUserData ) ) (otherlv_31= ',' ( (lv_userData_32_0= ruleUserData ) ) )* otherlv_33= ';' ) )* otherlv_34= '}'
             {
-            otherlv_0=(Token)match(input,12,FOLLOW_12_in_ruleExport1492); if (state.failed) return current;
+            otherlv_0=(Token)match(input,12,FOLLOW_25); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getExportAccess().getExportKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:693:1: ( ( (lv_lookup_1_0= 'lookup' ) ) (otherlv_2= '[' ( (lv_lookupPredicate_3_0= ruleExpression ) ) otherlv_4= ']' )? )?
+            // InternalExport.g:693:1: ( ( (lv_lookup_1_0= 'lookup' ) ) (otherlv_2= '[' ( (lv_lookupPredicate_3_0= ruleExpression ) ) otherlv_4= ']' )? )?
             int alt18=2;
             int LA18_0 = input.LA(1);
 
@@ -2022,15 +2022,15 @@ public final EObject ruleExport() throws RecognitionException {
             }
             switch (alt18) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:693:2: ( (lv_lookup_1_0= 'lookup' ) ) (otherlv_2= '[' ( (lv_lookupPredicate_3_0= ruleExpression ) ) otherlv_4= ']' )?
+                    // InternalExport.g:693:2: ( (lv_lookup_1_0= 'lookup' ) ) (otherlv_2= '[' ( (lv_lookupPredicate_3_0= ruleExpression ) ) otherlv_4= ']' )?
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:693:2: ( (lv_lookup_1_0= 'lookup' ) )
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:694:1: (lv_lookup_1_0= 'lookup' )
+                    // InternalExport.g:693:2: ( (lv_lookup_1_0= 'lookup' ) )
+                    // InternalExport.g:694:1: (lv_lookup_1_0= 'lookup' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:694:1: (lv_lookup_1_0= 'lookup' )
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:695:3: lv_lookup_1_0= 'lookup'
+                    // InternalExport.g:694:1: (lv_lookup_1_0= 'lookup' )
+                    // InternalExport.g:695:3: lv_lookup_1_0= 'lookup'
                     {
-                    lv_lookup_1_0=(Token)match(input,30,FOLLOW_30_in_ruleExport1511); if (state.failed) return current;
+                    lv_lookup_1_0=(Token)match(input,30,FOLLOW_26); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_lookup_1_0, grammarAccess.getExportAccess().getLookupLookupKeyword_1_0_0());
@@ -2050,7 +2050,7 @@ public final EObject ruleExport() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:708:2: (otherlv_2= '[' ( (lv_lookupPredicate_3_0= ruleExpression ) ) otherlv_4= ']' )?
+                    // InternalExport.g:708:2: (otherlv_2= '[' ( (lv_lookupPredicate_3_0= ruleExpression ) ) otherlv_4= ']' )?
                     int alt17=2;
                     int LA17_0 = input.LA(1);
 
@@ -2059,26 +2059,26 @@ public final EObject ruleExport() throws RecognitionException {
                     }
                     switch (alt17) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:708:4: otherlv_2= '[' ( (lv_lookupPredicate_3_0= ruleExpression ) ) otherlv_4= ']'
+                            // InternalExport.g:708:4: otherlv_2= '[' ( (lv_lookupPredicate_3_0= ruleExpression ) ) otherlv_4= ']'
                             {
-                            otherlv_2=(Token)match(input,20,FOLLOW_20_in_ruleExport1537); if (state.failed) return current;
+                            otherlv_2=(Token)match(input,20,FOLLOW_15); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                   	newLeafNode(otherlv_2, grammarAccess.getExportAccess().getLeftSquareBracketKeyword_1_1_0());
                                   
                             }
-                            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:712:1: ( (lv_lookupPredicate_3_0= ruleExpression ) )
-                            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:713:1: (lv_lookupPredicate_3_0= ruleExpression )
+                            // InternalExport.g:712:1: ( (lv_lookupPredicate_3_0= ruleExpression ) )
+                            // InternalExport.g:713:1: (lv_lookupPredicate_3_0= ruleExpression )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:713:1: (lv_lookupPredicate_3_0= ruleExpression )
-                            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:714:3: lv_lookupPredicate_3_0= ruleExpression
+                            // InternalExport.g:713:1: (lv_lookupPredicate_3_0= ruleExpression )
+                            // InternalExport.g:714:3: lv_lookupPredicate_3_0= ruleExpression
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getExportAccess().getLookupPredicateExpressionParserRuleCall_1_1_1_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleExpression_in_ruleExport1558);
+                            pushFollow(FOLLOW_16);
                             lv_lookupPredicate_3_0=ruleExpression();
 
                             state._fsp--;
@@ -2092,7 +2092,7 @@ public final EObject ruleExport() throws RecognitionException {
                                      			current, 
                                      			"lookupPredicate",
                                       		lv_lookupPredicate_3_0, 
-                                      		"Expression");
+                                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -2102,7 +2102,7 @@ public final EObject ruleExport() throws RecognitionException {
 
                             }
 
-                            otherlv_4=(Token)match(input,21,FOLLOW_21_in_ruleExport1570); if (state.failed) return current;
+                            otherlv_4=(Token)match(input,21,FOLLOW_4); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                   	newLeafNode(otherlv_4, grammarAccess.getExportAccess().getRightSquareBracketKeyword_1_1_2());
@@ -2120,11 +2120,11 @@ public final EObject ruleExport() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:734:5: ( ( ruleQualifiedID ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:735:1: ( ruleQualifiedID )
+            // InternalExport.g:734:5: ( ( ruleQualifiedID ) )
+            // InternalExport.g:735:1: ( ruleQualifiedID )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:735:1: ( ruleQualifiedID )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:736:3: ruleQualifiedID
+            // InternalExport.g:735:1: ( ruleQualifiedID )
+            // InternalExport.g:736:3: ruleQualifiedID
             {
             if ( state.backtracking==0 ) {
 
@@ -2138,7 +2138,7 @@ public final EObject ruleExport() throws RecognitionException {
               	        newCompositeNode(grammarAccess.getExportAccess().getTypeEClassCrossReference_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleQualifiedID_in_ruleExport1597);
+            pushFollow(FOLLOW_27);
             ruleQualifiedID();
 
             state._fsp--;
@@ -2154,7 +2154,7 @@ public final EObject ruleExport() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:749:2: (otherlv_6= 'as' ( (lv_qualifiedName_7_0= 'qualified' ) )? ( (lv_naming_8_0= ruleExpression ) ) )?
+            // InternalExport.g:749:2: (otherlv_6= 'as' ( (lv_qualifiedName_7_0= 'qualified' ) )? ( (lv_naming_8_0= ruleExpression ) ) )?
             int alt20=2;
             int LA20_0 = input.LA(1);
 
@@ -2163,15 +2163,15 @@ public final EObject ruleExport() throws RecognitionException {
             }
             switch (alt20) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:749:4: otherlv_6= 'as' ( (lv_qualifiedName_7_0= 'qualified' ) )? ( (lv_naming_8_0= ruleExpression ) )
+                    // InternalExport.g:749:4: otherlv_6= 'as' ( (lv_qualifiedName_7_0= 'qualified' ) )? ( (lv_naming_8_0= ruleExpression ) )
                     {
-                    otherlv_6=(Token)match(input,19,FOLLOW_19_in_ruleExport1610); if (state.failed) return current;
+                    otherlv_6=(Token)match(input,19,FOLLOW_28); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_6, grammarAccess.getExportAccess().getAsKeyword_3_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:753:1: ( (lv_qualifiedName_7_0= 'qualified' ) )?
+                    // InternalExport.g:753:1: ( (lv_qualifiedName_7_0= 'qualified' ) )?
                     int alt19=2;
                     int LA19_0 = input.LA(1);
 
@@ -2180,12 +2180,12 @@ public final EObject ruleExport() throws RecognitionException {
                     }
                     switch (alt19) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:754:1: (lv_qualifiedName_7_0= 'qualified' )
+                            // InternalExport.g:754:1: (lv_qualifiedName_7_0= 'qualified' )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:754:1: (lv_qualifiedName_7_0= 'qualified' )
-                            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:755:3: lv_qualifiedName_7_0= 'qualified'
+                            // InternalExport.g:754:1: (lv_qualifiedName_7_0= 'qualified' )
+                            // InternalExport.g:755:3: lv_qualifiedName_7_0= 'qualified'
                             {
-                            lv_qualifiedName_7_0=(Token)match(input,31,FOLLOW_31_in_ruleExport1628); if (state.failed) return current;
+                            lv_qualifiedName_7_0=(Token)match(input,31,FOLLOW_15); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       newLeafNode(lv_qualifiedName_7_0, grammarAccess.getExportAccess().getQualifiedNameQualifiedKeyword_3_1_0());
@@ -2208,18 +2208,18 @@ public final EObject ruleExport() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:768:3: ( (lv_naming_8_0= ruleExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:769:1: (lv_naming_8_0= ruleExpression )
+                    // InternalExport.g:768:3: ( (lv_naming_8_0= ruleExpression ) )
+                    // InternalExport.g:769:1: (lv_naming_8_0= ruleExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:769:1: (lv_naming_8_0= ruleExpression )
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:770:3: lv_naming_8_0= ruleExpression
+                    // InternalExport.g:769:1: (lv_naming_8_0= ruleExpression )
+                    // InternalExport.g:770:3: lv_naming_8_0= ruleExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getExportAccess().getNamingExpressionParserRuleCall_3_2_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleExpression_in_ruleExport1663);
+                    pushFollow(FOLLOW_29);
                     lv_naming_8_0=ruleExpression();
 
                     state._fsp--;
@@ -2233,7 +2233,7 @@ public final EObject ruleExport() throws RecognitionException {
                              			current, 
                              			"naming",
                               		lv_naming_8_0, 
-                              		"Expression");
+                              		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -2249,7 +2249,7 @@ public final EObject ruleExport() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:786:4: (otherlv_9= '[' ( (lv_guard_10_0= ruleExpression ) ) otherlv_11= ']' )?
+            // InternalExport.g:786:4: (otherlv_9= '[' ( (lv_guard_10_0= ruleExpression ) ) otherlv_11= ']' )?
             int alt21=2;
             int LA21_0 = input.LA(1);
 
@@ -2258,26 +2258,26 @@ public final EObject ruleExport() throws RecognitionException {
             }
             switch (alt21) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:786:6: otherlv_9= '[' ( (lv_guard_10_0= ruleExpression ) ) otherlv_11= ']'
+                    // InternalExport.g:786:6: otherlv_9= '[' ( (lv_guard_10_0= ruleExpression ) ) otherlv_11= ']'
                     {
-                    otherlv_9=(Token)match(input,20,FOLLOW_20_in_ruleExport1678); if (state.failed) return current;
+                    otherlv_9=(Token)match(input,20,FOLLOW_15); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_9, grammarAccess.getExportAccess().getLeftSquareBracketKeyword_4_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:790:1: ( (lv_guard_10_0= ruleExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:791:1: (lv_guard_10_0= ruleExpression )
+                    // InternalExport.g:790:1: ( (lv_guard_10_0= ruleExpression ) )
+                    // InternalExport.g:791:1: (lv_guard_10_0= ruleExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:791:1: (lv_guard_10_0= ruleExpression )
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:792:3: lv_guard_10_0= ruleExpression
+                    // InternalExport.g:791:1: (lv_guard_10_0= ruleExpression )
+                    // InternalExport.g:792:3: lv_guard_10_0= ruleExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getExportAccess().getGuardExpressionParserRuleCall_4_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleExpression_in_ruleExport1699);
+                    pushFollow(FOLLOW_16);
                     lv_guard_10_0=ruleExpression();
 
                     state._fsp--;
@@ -2291,7 +2291,7 @@ public final EObject ruleExport() throws RecognitionException {
                              			current, 
                              			"guard",
                               		lv_guard_10_0, 
-                              		"Expression");
+                              		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -2301,7 +2301,7 @@ public final EObject ruleExport() throws RecognitionException {
 
                     }
 
-                    otherlv_11=(Token)match(input,21,FOLLOW_21_in_ruleExport1711); if (state.failed) return current;
+                    otherlv_11=(Token)match(input,21,FOLLOW_9); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_11, grammarAccess.getExportAccess().getRightSquareBracketKeyword_4_2());
@@ -2313,13 +2313,13 @@ public final EObject ruleExport() throws RecognitionException {
 
             }
 
-            otherlv_12=(Token)match(input,16,FOLLOW_16_in_ruleExport1725); if (state.failed) return current;
+            otherlv_12=(Token)match(input,16,FOLLOW_30); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_12, grammarAccess.getExportAccess().getLeftCurlyBracketKeyword_5());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:816:1: (otherlv_13= 'uri-fragment' otherlv_14= '=' ( (lv_fragmentUnique_15_0= 'unique' ) )? otherlv_16= 'attribute' otherlv_17= '(' ( (otherlv_18= RULE_ID ) ) otherlv_19= ')' otherlv_20= ';' )?
+            // InternalExport.g:816:1: (otherlv_13= 'uri-fragment' otherlv_14= '=' ( (lv_fragmentUnique_15_0= 'unique' ) )? otherlv_16= 'attribute' otherlv_17= '(' ( (otherlv_18= RULE_ID ) ) otherlv_19= ')' otherlv_20= ';' )?
             int alt23=2;
             int LA23_0 = input.LA(1);
 
@@ -2328,21 +2328,21 @@ public final EObject ruleExport() throws RecognitionException {
             }
             switch (alt23) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:816:3: otherlv_13= 'uri-fragment' otherlv_14= '=' ( (lv_fragmentUnique_15_0= 'unique' ) )? otherlv_16= 'attribute' otherlv_17= '(' ( (otherlv_18= RULE_ID ) ) otherlv_19= ')' otherlv_20= ';'
+                    // InternalExport.g:816:3: otherlv_13= 'uri-fragment' otherlv_14= '=' ( (lv_fragmentUnique_15_0= 'unique' ) )? otherlv_16= 'attribute' otherlv_17= '(' ( (otherlv_18= RULE_ID ) ) otherlv_19= ')' otherlv_20= ';'
                     {
-                    otherlv_13=(Token)match(input,32,FOLLOW_32_in_ruleExport1738); if (state.failed) return current;
+                    otherlv_13=(Token)match(input,32,FOLLOW_31); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_13, grammarAccess.getExportAccess().getUriFragmentKeyword_6_0());
                           
                     }
-                    otherlv_14=(Token)match(input,22,FOLLOW_22_in_ruleExport1750); if (state.failed) return current;
+                    otherlv_14=(Token)match(input,22,FOLLOW_32); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_14, grammarAccess.getExportAccess().getEqualsSignKeyword_6_1());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:824:1: ( (lv_fragmentUnique_15_0= 'unique' ) )?
+                    // InternalExport.g:824:1: ( (lv_fragmentUnique_15_0= 'unique' ) )?
                     int alt22=2;
                     int LA22_0 = input.LA(1);
 
@@ -2351,12 +2351,12 @@ public final EObject ruleExport() throws RecognitionException {
                     }
                     switch (alt22) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:825:1: (lv_fragmentUnique_15_0= 'unique' )
+                            // InternalExport.g:825:1: (lv_fragmentUnique_15_0= 'unique' )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:825:1: (lv_fragmentUnique_15_0= 'unique' )
-                            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:826:3: lv_fragmentUnique_15_0= 'unique'
+                            // InternalExport.g:825:1: (lv_fragmentUnique_15_0= 'unique' )
+                            // InternalExport.g:826:3: lv_fragmentUnique_15_0= 'unique'
                             {
-                            lv_fragmentUnique_15_0=(Token)match(input,33,FOLLOW_33_in_ruleExport1768); if (state.failed) return current;
+                            lv_fragmentUnique_15_0=(Token)match(input,33,FOLLOW_33); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       newLeafNode(lv_fragmentUnique_15_0, grammarAccess.getExportAccess().getFragmentUniqueUniqueKeyword_6_2_0());
@@ -2379,23 +2379,23 @@ public final EObject ruleExport() throws RecognitionException {
 
                     }
 
-                    otherlv_16=(Token)match(input,34,FOLLOW_34_in_ruleExport1794); if (state.failed) return current;
+                    otherlv_16=(Token)match(input,34,FOLLOW_23); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_16, grammarAccess.getExportAccess().getAttributeKeyword_6_3());
                           
                     }
-                    otherlv_17=(Token)match(input,28,FOLLOW_28_in_ruleExport1806); if (state.failed) return current;
+                    otherlv_17=(Token)match(input,28,FOLLOW_4); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_17, grammarAccess.getExportAccess().getLeftParenthesisKeyword_6_4());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:847:1: ( (otherlv_18= RULE_ID ) )
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:848:1: (otherlv_18= RULE_ID )
+                    // InternalExport.g:847:1: ( (otherlv_18= RULE_ID ) )
+                    // InternalExport.g:848:1: (otherlv_18= RULE_ID )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:848:1: (otherlv_18= RULE_ID )
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:849:3: otherlv_18= RULE_ID
+                    // InternalExport.g:848:1: (otherlv_18= RULE_ID )
+                    // InternalExport.g:849:3: otherlv_18= RULE_ID
                     {
                     if ( state.backtracking==0 ) {
 
@@ -2404,7 +2404,7 @@ public final EObject ruleExport() throws RecognitionException {
                       	        }
                               
                     }
-                    otherlv_18=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleExport1826); if (state.failed) return current;
+                    otherlv_18=(Token)match(input,RULE_ID,FOLLOW_24); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       		newLeafNode(otherlv_18, grammarAccess.getExportAccess().getFragmentAttributeEAttributeCrossReference_6_5_0()); 
@@ -2416,13 +2416,13 @@ public final EObject ruleExport() throws RecognitionException {
 
                     }
 
-                    otherlv_19=(Token)match(input,29,FOLLOW_29_in_ruleExport1838); if (state.failed) return current;
+                    otherlv_19=(Token)match(input,29,FOLLOW_34); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_19, grammarAccess.getExportAccess().getRightParenthesisKeyword_6_6());
                           
                     }
-                    otherlv_20=(Token)match(input,24,FOLLOW_24_in_ruleExport1850); if (state.failed) return current;
+                    otherlv_20=(Token)match(input,24,FOLLOW_35); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_20, grammarAccess.getExportAccess().getSemicolonKeyword_6_7());
@@ -2434,7 +2434,7 @@ public final EObject ruleExport() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:868:3: ( ( ( (lv_fingerprint_21_0= 'object-fingerprint' ) ) | ( (lv_resourceFingerprint_22_0= 'resource-fingerprint' ) ) ) otherlv_23= ';' )?
+            // InternalExport.g:868:3: ( ( ( (lv_fingerprint_21_0= 'object-fingerprint' ) ) | ( (lv_resourceFingerprint_22_0= 'resource-fingerprint' ) ) ) otherlv_23= ';' )?
             int alt25=2;
             int LA25_0 = input.LA(1);
 
@@ -2443,9 +2443,9 @@ public final EObject ruleExport() throws RecognitionException {
             }
             switch (alt25) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:868:4: ( ( (lv_fingerprint_21_0= 'object-fingerprint' ) ) | ( (lv_resourceFingerprint_22_0= 'resource-fingerprint' ) ) ) otherlv_23= ';'
+                    // InternalExport.g:868:4: ( ( (lv_fingerprint_21_0= 'object-fingerprint' ) ) | ( (lv_resourceFingerprint_22_0= 'resource-fingerprint' ) ) ) otherlv_23= ';'
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:868:4: ( ( (lv_fingerprint_21_0= 'object-fingerprint' ) ) | ( (lv_resourceFingerprint_22_0= 'resource-fingerprint' ) ) )
+                    // InternalExport.g:868:4: ( ( (lv_fingerprint_21_0= 'object-fingerprint' ) ) | ( (lv_resourceFingerprint_22_0= 'resource-fingerprint' ) ) )
                     int alt24=2;
                     int LA24_0 = input.LA(1);
 
@@ -2464,15 +2464,15 @@ else if ( (LA24_0==36) ) {
                     }
                     switch (alt24) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:868:5: ( (lv_fingerprint_21_0= 'object-fingerprint' ) )
+                            // InternalExport.g:868:5: ( (lv_fingerprint_21_0= 'object-fingerprint' ) )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:868:5: ( (lv_fingerprint_21_0= 'object-fingerprint' ) )
-                            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:869:1: (lv_fingerprint_21_0= 'object-fingerprint' )
+                            // InternalExport.g:868:5: ( (lv_fingerprint_21_0= 'object-fingerprint' ) )
+                            // InternalExport.g:869:1: (lv_fingerprint_21_0= 'object-fingerprint' )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:869:1: (lv_fingerprint_21_0= 'object-fingerprint' )
-                            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:870:3: lv_fingerprint_21_0= 'object-fingerprint'
+                            // InternalExport.g:869:1: (lv_fingerprint_21_0= 'object-fingerprint' )
+                            // InternalExport.g:870:3: lv_fingerprint_21_0= 'object-fingerprint'
                             {
-                            lv_fingerprint_21_0=(Token)match(input,35,FOLLOW_35_in_ruleExport1872); if (state.failed) return current;
+                            lv_fingerprint_21_0=(Token)match(input,35,FOLLOW_34); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       newLeafNode(lv_fingerprint_21_0, grammarAccess.getExportAccess().getFingerprintObjectFingerprintKeyword_7_0_0_0());
@@ -2496,15 +2496,15 @@ else if ( (LA24_0==36) ) {
                             }
                             break;
                         case 2 :
-                            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:884:6: ( (lv_resourceFingerprint_22_0= 'resource-fingerprint' ) )
+                            // InternalExport.g:884:6: ( (lv_resourceFingerprint_22_0= 'resource-fingerprint' ) )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:884:6: ( (lv_resourceFingerprint_22_0= 'resource-fingerprint' ) )
-                            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:885:1: (lv_resourceFingerprint_22_0= 'resource-fingerprint' )
+                            // InternalExport.g:884:6: ( (lv_resourceFingerprint_22_0= 'resource-fingerprint' ) )
+                            // InternalExport.g:885:1: (lv_resourceFingerprint_22_0= 'resource-fingerprint' )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:885:1: (lv_resourceFingerprint_22_0= 'resource-fingerprint' )
-                            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:886:3: lv_resourceFingerprint_22_0= 'resource-fingerprint'
+                            // InternalExport.g:885:1: (lv_resourceFingerprint_22_0= 'resource-fingerprint' )
+                            // InternalExport.g:886:3: lv_resourceFingerprint_22_0= 'resource-fingerprint'
                             {
-                            lv_resourceFingerprint_22_0=(Token)match(input,36,FOLLOW_36_in_ruleExport1909); if (state.failed) return current;
+                            lv_resourceFingerprint_22_0=(Token)match(input,36,FOLLOW_34); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       newLeafNode(lv_resourceFingerprint_22_0, grammarAccess.getExportAccess().getResourceFingerprintResourceFingerprintKeyword_7_0_1_0());
@@ -2530,7 +2530,7 @@ else if ( (LA24_0==36) ) {
 
                     }
 
-                    otherlv_23=(Token)match(input,24,FOLLOW_24_in_ruleExport1935); if (state.failed) return current;
+                    otherlv_23=(Token)match(input,24,FOLLOW_36); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_23, grammarAccess.getExportAccess().getSemicolonKeyword_7_1());
@@ -2542,7 +2542,7 @@ else if ( (LA24_0==36) ) {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:903:3: ( (otherlv_24= 'field' ( (lv_attributes_25_0= ruleAttribute ) ) (otherlv_26= ',' ( (lv_attributes_27_0= ruleAttribute ) ) )* otherlv_28= ';' ) | (otherlv_29= 'data' ( (lv_userData_30_0= ruleUserData ) ) (otherlv_31= ',' ( (lv_userData_32_0= ruleUserData ) ) )* otherlv_33= ';' ) )*
+            // InternalExport.g:903:3: ( (otherlv_24= 'field' ( (lv_attributes_25_0= ruleAttribute ) ) (otherlv_26= ',' ( (lv_attributes_27_0= ruleAttribute ) ) )* otherlv_28= ';' ) | (otherlv_29= 'data' ( (lv_userData_30_0= ruleUserData ) ) (otherlv_31= ',' ( (lv_userData_32_0= ruleUserData ) ) )* otherlv_33= ';' ) )*
             loop28:
             do {
                 int alt28=3;
@@ -2558,29 +2558,29 @@ else if ( (LA28_0==38) ) {
 
                 switch (alt28) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:903:4: (otherlv_24= 'field' ( (lv_attributes_25_0= ruleAttribute ) ) (otherlv_26= ',' ( (lv_attributes_27_0= ruleAttribute ) ) )* otherlv_28= ';' )
+            	    // InternalExport.g:903:4: (otherlv_24= 'field' ( (lv_attributes_25_0= ruleAttribute ) ) (otherlv_26= ',' ( (lv_attributes_27_0= ruleAttribute ) ) )* otherlv_28= ';' )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:903:4: (otherlv_24= 'field' ( (lv_attributes_25_0= ruleAttribute ) ) (otherlv_26= ',' ( (lv_attributes_27_0= ruleAttribute ) ) )* otherlv_28= ';' )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:903:6: otherlv_24= 'field' ( (lv_attributes_25_0= ruleAttribute ) ) (otherlv_26= ',' ( (lv_attributes_27_0= ruleAttribute ) ) )* otherlv_28= ';'
+            	    // InternalExport.g:903:4: (otherlv_24= 'field' ( (lv_attributes_25_0= ruleAttribute ) ) (otherlv_26= ',' ( (lv_attributes_27_0= ruleAttribute ) ) )* otherlv_28= ';' )
+            	    // InternalExport.g:903:6: otherlv_24= 'field' ( (lv_attributes_25_0= ruleAttribute ) ) (otherlv_26= ',' ( (lv_attributes_27_0= ruleAttribute ) ) )* otherlv_28= ';'
             	    {
-            	    otherlv_24=(Token)match(input,37,FOLLOW_37_in_ruleExport1951); if (state.failed) return current;
+            	    otherlv_24=(Token)match(input,37,FOLLOW_4); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_24, grammarAccess.getExportAccess().getFieldKeyword_8_0_0());
             	          
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:907:1: ( (lv_attributes_25_0= ruleAttribute ) )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:908:1: (lv_attributes_25_0= ruleAttribute )
+            	    // InternalExport.g:907:1: ( (lv_attributes_25_0= ruleAttribute ) )
+            	    // InternalExport.g:908:1: (lv_attributes_25_0= ruleAttribute )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:908:1: (lv_attributes_25_0= ruleAttribute )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:909:3: lv_attributes_25_0= ruleAttribute
+            	    // InternalExport.g:908:1: (lv_attributes_25_0= ruleAttribute )
+            	    // InternalExport.g:909:3: lv_attributes_25_0= ruleAttribute
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getExportAccess().getAttributesAttributeParserRuleCall_8_0_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleAttribute_in_ruleExport1972);
+            	    pushFollow(FOLLOW_37);
             	    lv_attributes_25_0=ruleAttribute();
 
             	    state._fsp--;
@@ -2594,7 +2594,7 @@ else if ( (LA28_0==38) ) {
             	             			current, 
             	             			"attributes",
             	              		lv_attributes_25_0, 
-            	              		"Attribute");
+            	              		"com.avaloq.tools.ddk.xtext.export.Export.Attribute");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -2604,7 +2604,7 @@ else if ( (LA28_0==38) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:925:2: (otherlv_26= ',' ( (lv_attributes_27_0= ruleAttribute ) ) )*
+            	    // InternalExport.g:925:2: (otherlv_26= ',' ( (lv_attributes_27_0= ruleAttribute ) ) )*
             	    loop26:
             	    do {
             	        int alt26=2;
@@ -2617,26 +2617,26 @@ else if ( (LA28_0==38) ) {
 
             	        switch (alt26) {
             	    	case 1 :
-            	    	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:925:4: otherlv_26= ',' ( (lv_attributes_27_0= ruleAttribute ) )
+            	    	    // InternalExport.g:925:4: otherlv_26= ',' ( (lv_attributes_27_0= ruleAttribute ) )
             	    	    {
-            	    	    otherlv_26=(Token)match(input,23,FOLLOW_23_in_ruleExport1985); if (state.failed) return current;
+            	    	    otherlv_26=(Token)match(input,23,FOLLOW_4); if (state.failed) return current;
             	    	    if ( state.backtracking==0 ) {
 
             	    	          	newLeafNode(otherlv_26, grammarAccess.getExportAccess().getCommaKeyword_8_0_2_0());
             	    	          
             	    	    }
-            	    	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:929:1: ( (lv_attributes_27_0= ruleAttribute ) )
-            	    	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:930:1: (lv_attributes_27_0= ruleAttribute )
+            	    	    // InternalExport.g:929:1: ( (lv_attributes_27_0= ruleAttribute ) )
+            	    	    // InternalExport.g:930:1: (lv_attributes_27_0= ruleAttribute )
             	    	    {
-            	    	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:930:1: (lv_attributes_27_0= ruleAttribute )
-            	    	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:931:3: lv_attributes_27_0= ruleAttribute
+            	    	    // InternalExport.g:930:1: (lv_attributes_27_0= ruleAttribute )
+            	    	    // InternalExport.g:931:3: lv_attributes_27_0= ruleAttribute
             	    	    {
             	    	    if ( state.backtracking==0 ) {
             	    	       
             	    	      	        newCompositeNode(grammarAccess.getExportAccess().getAttributesAttributeParserRuleCall_8_0_2_1_0()); 
             	    	      	    
             	    	    }
-            	    	    pushFollow(FOLLOW_ruleAttribute_in_ruleExport2006);
+            	    	    pushFollow(FOLLOW_37);
             	    	    lv_attributes_27_0=ruleAttribute();
 
             	    	    state._fsp--;
@@ -2650,7 +2650,7 @@ else if ( (LA28_0==38) ) {
             	    	             			current, 
             	    	             			"attributes",
             	    	              		lv_attributes_27_0, 
-            	    	              		"Attribute");
+            	    	              		"com.avaloq.tools.ddk.xtext.export.Export.Attribute");
             	    	      	        afterParserOrEnumRuleCall();
             	    	      	    
             	    	    }
@@ -2669,7 +2669,7 @@ else if ( (LA28_0==38) ) {
             	        }
             	    } while (true);
 
-            	    otherlv_28=(Token)match(input,24,FOLLOW_24_in_ruleExport2020); if (state.failed) return current;
+            	    otherlv_28=(Token)match(input,24,FOLLOW_36); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_28, grammarAccess.getExportAccess().getSemicolonKeyword_8_0_3());
@@ -2682,29 +2682,29 @@ else if ( (LA28_0==38) ) {
             	    }
             	    break;
             	case 2 :
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:952:6: (otherlv_29= 'data' ( (lv_userData_30_0= ruleUserData ) ) (otherlv_31= ',' ( (lv_userData_32_0= ruleUserData ) ) )* otherlv_33= ';' )
+            	    // InternalExport.g:952:6: (otherlv_29= 'data' ( (lv_userData_30_0= ruleUserData ) ) (otherlv_31= ',' ( (lv_userData_32_0= ruleUserData ) ) )* otherlv_33= ';' )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:952:6: (otherlv_29= 'data' ( (lv_userData_30_0= ruleUserData ) ) (otherlv_31= ',' ( (lv_userData_32_0= ruleUserData ) ) )* otherlv_33= ';' )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:952:8: otherlv_29= 'data' ( (lv_userData_30_0= ruleUserData ) ) (otherlv_31= ',' ( (lv_userData_32_0= ruleUserData ) ) )* otherlv_33= ';'
+            	    // InternalExport.g:952:6: (otherlv_29= 'data' ( (lv_userData_30_0= ruleUserData ) ) (otherlv_31= ',' ( (lv_userData_32_0= ruleUserData ) ) )* otherlv_33= ';' )
+            	    // InternalExport.g:952:8: otherlv_29= 'data' ( (lv_userData_30_0= ruleUserData ) ) (otherlv_31= ',' ( (lv_userData_32_0= ruleUserData ) ) )* otherlv_33= ';'
             	    {
-            	    otherlv_29=(Token)match(input,38,FOLLOW_38_in_ruleExport2040); if (state.failed) return current;
+            	    otherlv_29=(Token)match(input,38,FOLLOW_4); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_29, grammarAccess.getExportAccess().getDataKeyword_8_1_0());
             	          
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:956:1: ( (lv_userData_30_0= ruleUserData ) )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:957:1: (lv_userData_30_0= ruleUserData )
+            	    // InternalExport.g:956:1: ( (lv_userData_30_0= ruleUserData ) )
+            	    // InternalExport.g:957:1: (lv_userData_30_0= ruleUserData )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:957:1: (lv_userData_30_0= ruleUserData )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:958:3: lv_userData_30_0= ruleUserData
+            	    // InternalExport.g:957:1: (lv_userData_30_0= ruleUserData )
+            	    // InternalExport.g:958:3: lv_userData_30_0= ruleUserData
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getExportAccess().getUserDataUserDataParserRuleCall_8_1_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleUserData_in_ruleExport2061);
+            	    pushFollow(FOLLOW_37);
             	    lv_userData_30_0=ruleUserData();
 
             	    state._fsp--;
@@ -2718,7 +2718,7 @@ else if ( (LA28_0==38) ) {
             	             			current, 
             	             			"userData",
             	              		lv_userData_30_0, 
-            	              		"UserData");
+            	              		"com.avaloq.tools.ddk.xtext.export.Export.UserData");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -2728,7 +2728,7 @@ else if ( (LA28_0==38) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:974:2: (otherlv_31= ',' ( (lv_userData_32_0= ruleUserData ) ) )*
+            	    // InternalExport.g:974:2: (otherlv_31= ',' ( (lv_userData_32_0= ruleUserData ) ) )*
             	    loop27:
             	    do {
             	        int alt27=2;
@@ -2741,26 +2741,26 @@ else if ( (LA28_0==38) ) {
 
             	        switch (alt27) {
             	    	case 1 :
-            	    	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:974:4: otherlv_31= ',' ( (lv_userData_32_0= ruleUserData ) )
+            	    	    // InternalExport.g:974:4: otherlv_31= ',' ( (lv_userData_32_0= ruleUserData ) )
             	    	    {
-            	    	    otherlv_31=(Token)match(input,23,FOLLOW_23_in_ruleExport2074); if (state.failed) return current;
+            	    	    otherlv_31=(Token)match(input,23,FOLLOW_4); if (state.failed) return current;
             	    	    if ( state.backtracking==0 ) {
 
             	    	          	newLeafNode(otherlv_31, grammarAccess.getExportAccess().getCommaKeyword_8_1_2_0());
             	    	          
             	    	    }
-            	    	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:978:1: ( (lv_userData_32_0= ruleUserData ) )
-            	    	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:979:1: (lv_userData_32_0= ruleUserData )
+            	    	    // InternalExport.g:978:1: ( (lv_userData_32_0= ruleUserData ) )
+            	    	    // InternalExport.g:979:1: (lv_userData_32_0= ruleUserData )
             	    	    {
-            	    	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:979:1: (lv_userData_32_0= ruleUserData )
-            	    	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:980:3: lv_userData_32_0= ruleUserData
+            	    	    // InternalExport.g:979:1: (lv_userData_32_0= ruleUserData )
+            	    	    // InternalExport.g:980:3: lv_userData_32_0= ruleUserData
             	    	    {
             	    	    if ( state.backtracking==0 ) {
             	    	       
             	    	      	        newCompositeNode(grammarAccess.getExportAccess().getUserDataUserDataParserRuleCall_8_1_2_1_0()); 
             	    	      	    
             	    	    }
-            	    	    pushFollow(FOLLOW_ruleUserData_in_ruleExport2095);
+            	    	    pushFollow(FOLLOW_37);
             	    	    lv_userData_32_0=ruleUserData();
 
             	    	    state._fsp--;
@@ -2774,7 +2774,7 @@ else if ( (LA28_0==38) ) {
             	    	             			current, 
             	    	             			"userData",
             	    	              		lv_userData_32_0, 
-            	    	              		"UserData");
+            	    	              		"com.avaloq.tools.ddk.xtext.export.Export.UserData");
             	    	      	        afterParserOrEnumRuleCall();
             	    	      	    
             	    	    }
@@ -2793,7 +2793,7 @@ else if ( (LA28_0==38) ) {
             	        }
             	    } while (true);
 
-            	    otherlv_33=(Token)match(input,24,FOLLOW_24_in_ruleExport2109); if (state.failed) return current;
+            	    otherlv_33=(Token)match(input,24,FOLLOW_36); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_33, grammarAccess.getExportAccess().getSemicolonKeyword_8_1_3());
@@ -2811,7 +2811,7 @@ else if ( (LA28_0==38) ) {
                 }
             } while (true);
 
-            otherlv_34=(Token)match(input,17,FOLLOW_17_in_ruleExport2124); if (state.failed) return current;
+            otherlv_34=(Token)match(input,17,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_34, grammarAccess.getExportAccess().getRightCurlyBracketKeyword_9());
@@ -2840,7 +2840,7 @@ else if ( (LA28_0==38) ) {
 
 
     // $ANTLR start "entryRuleUserData"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1012:1: entryRuleUserData returns [EObject current=null] : iv_ruleUserData= ruleUserData EOF ;
+    // InternalExport.g:1012:1: entryRuleUserData returns [EObject current=null] : iv_ruleUserData= ruleUserData EOF ;
     public final EObject entryRuleUserData() throws RecognitionException {
         EObject current = null;
 
@@ -2848,13 +2848,13 @@ public final EObject entryRuleUserData() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1013:2: (iv_ruleUserData= ruleUserData EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1014:2: iv_ruleUserData= ruleUserData EOF
+            // InternalExport.g:1013:2: (iv_ruleUserData= ruleUserData EOF )
+            // InternalExport.g:1014:2: iv_ruleUserData= ruleUserData EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getUserDataRule()); 
             }
-            pushFollow(FOLLOW_ruleUserData_in_entryRuleUserData2160);
+            pushFollow(FOLLOW_1);
             iv_ruleUserData=ruleUserData();
 
             state._fsp--;
@@ -2862,7 +2862,7 @@ public final EObject entryRuleUserData() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleUserData; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleUserData2170); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -2880,7 +2880,7 @@ public final EObject entryRuleUserData() throws RecognitionException {
 
 
     // $ANTLR start "ruleUserData"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1021:1: ruleUserData returns [EObject current=null] : ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_expr_2_0= ruleExpression ) ) ) ;
+    // InternalExport.g:1021:1: ruleUserData returns [EObject current=null] : ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_expr_2_0= ruleExpression ) ) ) ;
     public final EObject ruleUserData() throws RecognitionException {
         EObject current = null;
 
@@ -2892,19 +2892,19 @@ public final EObject ruleUserData() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1024:28: ( ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_expr_2_0= ruleExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1025:1: ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_expr_2_0= ruleExpression ) ) )
+            // InternalExport.g:1024:28: ( ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_expr_2_0= ruleExpression ) ) ) )
+            // InternalExport.g:1025:1: ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_expr_2_0= ruleExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1025:1: ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_expr_2_0= ruleExpression ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1025:2: ( (lv_name_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_expr_2_0= ruleExpression ) )
+            // InternalExport.g:1025:1: ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_expr_2_0= ruleExpression ) ) )
+            // InternalExport.g:1025:2: ( (lv_name_0_0= RULE_ID ) ) otherlv_1= '=' ( (lv_expr_2_0= ruleExpression ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1025:2: ( (lv_name_0_0= RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1026:1: (lv_name_0_0= RULE_ID )
+            // InternalExport.g:1025:2: ( (lv_name_0_0= RULE_ID ) )
+            // InternalExport.g:1026:1: (lv_name_0_0= RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1026:1: (lv_name_0_0= RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1027:3: lv_name_0_0= RULE_ID
+            // InternalExport.g:1026:1: (lv_name_0_0= RULE_ID )
+            // InternalExport.g:1027:3: lv_name_0_0= RULE_ID
             {
-            lv_name_0_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleUserData2212); if (state.failed) return current;
+            lv_name_0_0=(Token)match(input,RULE_ID,FOLLOW_31); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(lv_name_0_0, grammarAccess.getUserDataAccess().getNameIDTerminalRuleCall_0_0()); 
@@ -2919,7 +2919,7 @@ public final EObject ruleUserData() throws RecognitionException {
                      			current, 
                      			"name",
                       		lv_name_0_0, 
-                      		"ID");
+                      		"org.eclipse.xtext.common.Terminals.ID");
               	    
             }
 
@@ -2928,24 +2928,24 @@ public final EObject ruleUserData() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,22,FOLLOW_22_in_ruleUserData2229); if (state.failed) return current;
+            otherlv_1=(Token)match(input,22,FOLLOW_15); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getUserDataAccess().getEqualsSignKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1047:1: ( (lv_expr_2_0= ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1048:1: (lv_expr_2_0= ruleExpression )
+            // InternalExport.g:1047:1: ( (lv_expr_2_0= ruleExpression ) )
+            // InternalExport.g:1048:1: (lv_expr_2_0= ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1048:1: (lv_expr_2_0= ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1049:3: lv_expr_2_0= ruleExpression
+            // InternalExport.g:1048:1: (lv_expr_2_0= ruleExpression )
+            // InternalExport.g:1049:3: lv_expr_2_0= ruleExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getUserDataAccess().getExprExpressionParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleExpression_in_ruleUserData2250);
+            pushFollow(FOLLOW_2);
             lv_expr_2_0=ruleExpression();
 
             state._fsp--;
@@ -2959,7 +2959,7 @@ public final EObject ruleUserData() throws RecognitionException {
                      			current, 
                      			"expr",
                       		lv_expr_2_0, 
-                      		"Expression");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -2992,7 +2992,7 @@ public final EObject ruleUserData() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleAttribute"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1073:1: entryRuleAttribute returns [EObject current=null] : iv_ruleAttribute= ruleAttribute EOF ;
+    // InternalExport.g:1073:1: entryRuleAttribute returns [EObject current=null] : iv_ruleAttribute= ruleAttribute EOF ;
     public final EObject entryRuleAttribute() throws RecognitionException {
         EObject current = null;
 
@@ -3000,13 +3000,13 @@ public final EObject entryRuleAttribute() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1074:2: (iv_ruleAttribute= ruleAttribute EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1075:2: iv_ruleAttribute= ruleAttribute EOF
+            // InternalExport.g:1074:2: (iv_ruleAttribute= ruleAttribute EOF )
+            // InternalExport.g:1075:2: iv_ruleAttribute= ruleAttribute EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getAttributeRule()); 
             }
-            pushFollow(FOLLOW_ruleAttribute_in_entryRuleAttribute2286);
+            pushFollow(FOLLOW_1);
             iv_ruleAttribute=ruleAttribute();
 
             state._fsp--;
@@ -3014,7 +3014,7 @@ public final EObject entryRuleAttribute() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleAttribute; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAttribute2296); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -3032,7 +3032,7 @@ public final EObject entryRuleAttribute() throws RecognitionException {
 
 
     // $ANTLR start "ruleAttribute"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1082:1: ruleAttribute returns [EObject current=null] : ( (otherlv_0= RULE_ID ) ) ;
+    // InternalExport.g:1082:1: ruleAttribute returns [EObject current=null] : ( (otherlv_0= RULE_ID ) ) ;
     public final EObject ruleAttribute() throws RecognitionException {
         EObject current = null;
 
@@ -3041,14 +3041,14 @@ public final EObject ruleAttribute() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1085:28: ( ( (otherlv_0= RULE_ID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1086:1: ( (otherlv_0= RULE_ID ) )
+            // InternalExport.g:1085:28: ( ( (otherlv_0= RULE_ID ) ) )
+            // InternalExport.g:1086:1: ( (otherlv_0= RULE_ID ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1086:1: ( (otherlv_0= RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1087:1: (otherlv_0= RULE_ID )
+            // InternalExport.g:1086:1: ( (otherlv_0= RULE_ID ) )
+            // InternalExport.g:1087:1: (otherlv_0= RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1087:1: (otherlv_0= RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1088:3: otherlv_0= RULE_ID
+            // InternalExport.g:1087:1: (otherlv_0= RULE_ID )
+            // InternalExport.g:1088:3: otherlv_0= RULE_ID
             {
             if ( state.backtracking==0 ) {
 
@@ -3057,7 +3057,7 @@ public final EObject ruleAttribute() throws RecognitionException {
               	        }
                       
             }
-            otherlv_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAttribute2340); if (state.failed) return current;
+            otherlv_0=(Token)match(input,RULE_ID,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               		newLeafNode(otherlv_0, grammarAccess.getAttributeAccess().getAttributeEAttributeCrossReference_0()); 
@@ -3089,7 +3089,7 @@ public final EObject ruleAttribute() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleQualifiedID"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1107:1: entryRuleQualifiedID returns [String current=null] : iv_ruleQualifiedID= ruleQualifiedID EOF ;
+    // InternalExport.g:1107:1: entryRuleQualifiedID returns [String current=null] : iv_ruleQualifiedID= ruleQualifiedID EOF ;
     public final String entryRuleQualifiedID() throws RecognitionException {
         String current = null;
 
@@ -3097,13 +3097,13 @@ public final String entryRuleQualifiedID() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1108:2: (iv_ruleQualifiedID= ruleQualifiedID EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1109:2: iv_ruleQualifiedID= ruleQualifiedID EOF
+            // InternalExport.g:1108:2: (iv_ruleQualifiedID= ruleQualifiedID EOF )
+            // InternalExport.g:1109:2: iv_ruleQualifiedID= ruleQualifiedID EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getQualifiedIDRule()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedID_in_entryRuleQualifiedID2376);
+            pushFollow(FOLLOW_1);
             iv_ruleQualifiedID=ruleQualifiedID();
 
             state._fsp--;
@@ -3111,7 +3111,7 @@ public final String entryRuleQualifiedID() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleQualifiedID.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedID2387); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -3129,7 +3129,7 @@ public final String entryRuleQualifiedID() throws RecognitionException {
 
 
     // $ANTLR start "ruleQualifiedID"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1116:1: ruleQualifiedID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID_0= RULE_ID (kw= '::' this_ID_2= RULE_ID )* ) ;
+    // InternalExport.g:1116:1: ruleQualifiedID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID_0= RULE_ID (kw= '::' this_ID_2= RULE_ID )* ) ;
     public final AntlrDatatypeRuleToken ruleQualifiedID() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -3140,13 +3140,13 @@ public final AntlrDatatypeRuleToken ruleQualifiedID() throws RecognitionExceptio
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1119:28: ( (this_ID_0= RULE_ID (kw= '::' this_ID_2= RULE_ID )* ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1120:1: (this_ID_0= RULE_ID (kw= '::' this_ID_2= RULE_ID )* )
+            // InternalExport.g:1119:28: ( (this_ID_0= RULE_ID (kw= '::' this_ID_2= RULE_ID )* ) )
+            // InternalExport.g:1120:1: (this_ID_0= RULE_ID (kw= '::' this_ID_2= RULE_ID )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1120:1: (this_ID_0= RULE_ID (kw= '::' this_ID_2= RULE_ID )* )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1120:6: this_ID_0= RULE_ID (kw= '::' this_ID_2= RULE_ID )*
+            // InternalExport.g:1120:1: (this_ID_0= RULE_ID (kw= '::' this_ID_2= RULE_ID )* )
+            // InternalExport.g:1120:6: this_ID_0= RULE_ID (kw= '::' this_ID_2= RULE_ID )*
             {
-            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleQualifiedID2427); if (state.failed) return current;
+            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_38); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               		current.merge(this_ID_0);
@@ -3157,7 +3157,7 @@ public final AntlrDatatypeRuleToken ruleQualifiedID() throws RecognitionExceptio
                   newLeafNode(this_ID_0, grammarAccess.getQualifiedIDAccess().getIDTerminalRuleCall_0()); 
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1127:1: (kw= '::' this_ID_2= RULE_ID )*
+            // InternalExport.g:1127:1: (kw= '::' this_ID_2= RULE_ID )*
             loop29:
             do {
                 int alt29=2;
@@ -3170,16 +3170,16 @@ public final AntlrDatatypeRuleToken ruleQualifiedID() throws RecognitionExceptio
 
                 switch (alt29) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1128:2: kw= '::' this_ID_2= RULE_ID
+            	    // InternalExport.g:1128:2: kw= '::' this_ID_2= RULE_ID
             	    {
-            	    kw=(Token)match(input,39,FOLLOW_39_in_ruleQualifiedID2446); if (state.failed) return current;
+            	    kw=(Token)match(input,39,FOLLOW_4); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	              current.merge(kw);
             	              newLeafNode(kw, grammarAccess.getQualifiedIDAccess().getColonColonKeyword_1_0()); 
             	          
             	    }
-            	    this_ID_2=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleQualifiedID2461); if (state.failed) return current;
+            	    this_ID_2=(Token)match(input,RULE_ID,FOLLOW_38); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	      		current.merge(this_ID_2);
@@ -3222,7 +3222,7 @@ public final AntlrDatatypeRuleToken ruleQualifiedID() throws RecognitionExceptio
 
 
     // $ANTLR start "entryRuleExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1148:1: entryRuleExpression returns [EObject current=null] : iv_ruleExpression= ruleExpression EOF ;
+    // InternalExport.g:1148:1: entryRuleExpression returns [EObject current=null] : iv_ruleExpression= ruleExpression EOF ;
     public final EObject entryRuleExpression() throws RecognitionException {
         EObject current = null;
 
@@ -3230,13 +3230,13 @@ public final EObject entryRuleExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1149:2: (iv_ruleExpression= ruleExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1150:2: iv_ruleExpression= ruleExpression EOF
+            // InternalExport.g:1149:2: (iv_ruleExpression= ruleExpression EOF )
+            // InternalExport.g:1150:2: iv_ruleExpression= ruleExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_entryRuleExpression2508);
+            pushFollow(FOLLOW_1);
             iv_ruleExpression=ruleExpression();
 
             state._fsp--;
@@ -3244,7 +3244,7 @@ public final EObject entryRuleExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleExpression2518); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -3262,7 +3262,7 @@ public final EObject entryRuleExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1157:1: ruleExpression returns [EObject current=null] : (this_LetExpression_0= ruleLetExpression | ( ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression ) | this_ChainExpression_2= ruleChainExpression ) ;
+    // InternalExport.g:1157:1: ruleExpression returns [EObject current=null] : (this_LetExpression_0= ruleLetExpression | ( ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression ) | this_ChainExpression_2= ruleChainExpression ) ;
     public final EObject ruleExpression() throws RecognitionException {
         EObject current = null;
 
@@ -3276,22 +3276,22 @@ public final EObject ruleExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1160:28: ( (this_LetExpression_0= ruleLetExpression | ( ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression ) | this_ChainExpression_2= ruleChainExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1161:1: (this_LetExpression_0= ruleLetExpression | ( ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression ) | this_ChainExpression_2= ruleChainExpression )
+            // InternalExport.g:1160:28: ( (this_LetExpression_0= ruleLetExpression | ( ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression ) | this_ChainExpression_2= ruleChainExpression ) )
+            // InternalExport.g:1161:1: (this_LetExpression_0= ruleLetExpression | ( ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression ) | this_ChainExpression_2= ruleChainExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1161:1: (this_LetExpression_0= ruleLetExpression | ( ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression ) | this_ChainExpression_2= ruleChainExpression )
+            // InternalExport.g:1161:1: (this_LetExpression_0= ruleLetExpression | ( ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression ) | this_ChainExpression_2= ruleChainExpression )
             int alt30=3;
             alt30 = dfa30.predict(input);
             switch (alt30) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1162:5: this_LetExpression_0= ruleLetExpression
+                    // InternalExport.g:1162:5: this_LetExpression_0= ruleLetExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getExpressionAccess().getLetExpressionParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleLetExpression_in_ruleExpression2565);
+                    pushFollow(FOLLOW_2);
                     this_LetExpression_0=ruleLetExpression();
 
                     state._fsp--;
@@ -3306,17 +3306,17 @@ public final EObject ruleExpression() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1171:6: ( ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression )
+                    // InternalExport.g:1171:6: ( ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1171:6: ( ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression )
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1171:7: ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression
+                    // InternalExport.g:1171:6: ( ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression )
+                    // InternalExport.g:1171:7: ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getExpressionAccess().getCastedExpressionParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleCastedExpression_in_ruleExpression2598);
+                    pushFollow(FOLLOW_2);
                     this_CastedExpression_1=ruleCastedExpression();
 
                     state._fsp--;
@@ -3334,14 +3334,14 @@ public final EObject ruleExpression() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1182:5: this_ChainExpression_2= ruleChainExpression
+                    // InternalExport.g:1182:5: this_ChainExpression_2= ruleChainExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getExpressionAccess().getChainExpressionParserRuleCall_2()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleChainExpression_in_ruleExpression2626);
+                    pushFollow(FOLLOW_2);
                     this_ChainExpression_2=ruleChainExpression();
 
                     state._fsp--;
@@ -3378,7 +3378,7 @@ public final EObject ruleExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleLetExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1200:1: entryRuleLetExpression returns [EObject current=null] : iv_ruleLetExpression= ruleLetExpression EOF ;
+    // InternalExport.g:1200:1: entryRuleLetExpression returns [EObject current=null] : iv_ruleLetExpression= ruleLetExpression EOF ;
     public final EObject entryRuleLetExpression() throws RecognitionException {
         EObject current = null;
 
@@ -3386,13 +3386,13 @@ public final EObject entryRuleLetExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1201:2: (iv_ruleLetExpression= ruleLetExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1202:2: iv_ruleLetExpression= ruleLetExpression EOF
+            // InternalExport.g:1201:2: (iv_ruleLetExpression= ruleLetExpression EOF )
+            // InternalExport.g:1202:2: iv_ruleLetExpression= ruleLetExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getLetExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleLetExpression_in_entryRuleLetExpression2663);
+            pushFollow(FOLLOW_1);
             iv_ruleLetExpression=ruleLetExpression();
 
             state._fsp--;
@@ -3400,7 +3400,7 @@ public final EObject entryRuleLetExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleLetExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleLetExpression2673); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -3418,7 +3418,7 @@ public final EObject entryRuleLetExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleLetExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1209:1: ruleLetExpression returns [EObject current=null] : (otherlv_0= 'let' ( (lv_identifier_1_0= ruleIdentifier ) ) otherlv_2= '=' ( (lv_varExpr_3_0= ruleExpression ) ) otherlv_4= ':' ( (lv_target_5_0= ruleExpression ) ) ) ;
+    // InternalExport.g:1209:1: ruleLetExpression returns [EObject current=null] : (otherlv_0= 'let' ( (lv_identifier_1_0= ruleIdentifier ) ) otherlv_2= '=' ( (lv_varExpr_3_0= ruleExpression ) ) otherlv_4= ':' ( (lv_target_5_0= ruleExpression ) ) ) ;
     public final EObject ruleLetExpression() throws RecognitionException {
         EObject current = null;
 
@@ -3435,30 +3435,30 @@ public final EObject ruleLetExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1212:28: ( (otherlv_0= 'let' ( (lv_identifier_1_0= ruleIdentifier ) ) otherlv_2= '=' ( (lv_varExpr_3_0= ruleExpression ) ) otherlv_4= ':' ( (lv_target_5_0= ruleExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1213:1: (otherlv_0= 'let' ( (lv_identifier_1_0= ruleIdentifier ) ) otherlv_2= '=' ( (lv_varExpr_3_0= ruleExpression ) ) otherlv_4= ':' ( (lv_target_5_0= ruleExpression ) ) )
+            // InternalExport.g:1212:28: ( (otherlv_0= 'let' ( (lv_identifier_1_0= ruleIdentifier ) ) otherlv_2= '=' ( (lv_varExpr_3_0= ruleExpression ) ) otherlv_4= ':' ( (lv_target_5_0= ruleExpression ) ) ) )
+            // InternalExport.g:1213:1: (otherlv_0= 'let' ( (lv_identifier_1_0= ruleIdentifier ) ) otherlv_2= '=' ( (lv_varExpr_3_0= ruleExpression ) ) otherlv_4= ':' ( (lv_target_5_0= ruleExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1213:1: (otherlv_0= 'let' ( (lv_identifier_1_0= ruleIdentifier ) ) otherlv_2= '=' ( (lv_varExpr_3_0= ruleExpression ) ) otherlv_4= ':' ( (lv_target_5_0= ruleExpression ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1213:3: otherlv_0= 'let' ( (lv_identifier_1_0= ruleIdentifier ) ) otherlv_2= '=' ( (lv_varExpr_3_0= ruleExpression ) ) otherlv_4= ':' ( (lv_target_5_0= ruleExpression ) )
+            // InternalExport.g:1213:1: (otherlv_0= 'let' ( (lv_identifier_1_0= ruleIdentifier ) ) otherlv_2= '=' ( (lv_varExpr_3_0= ruleExpression ) ) otherlv_4= ':' ( (lv_target_5_0= ruleExpression ) ) )
+            // InternalExport.g:1213:3: otherlv_0= 'let' ( (lv_identifier_1_0= ruleIdentifier ) ) otherlv_2= '=' ( (lv_varExpr_3_0= ruleExpression ) ) otherlv_4= ':' ( (lv_target_5_0= ruleExpression ) )
             {
-            otherlv_0=(Token)match(input,40,FOLLOW_40_in_ruleLetExpression2710); if (state.failed) return current;
+            otherlv_0=(Token)match(input,40,FOLLOW_4); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getLetExpressionAccess().getLetKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1217:1: ( (lv_identifier_1_0= ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1218:1: (lv_identifier_1_0= ruleIdentifier )
+            // InternalExport.g:1217:1: ( (lv_identifier_1_0= ruleIdentifier ) )
+            // InternalExport.g:1218:1: (lv_identifier_1_0= ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1218:1: (lv_identifier_1_0= ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1219:3: lv_identifier_1_0= ruleIdentifier
+            // InternalExport.g:1218:1: (lv_identifier_1_0= ruleIdentifier )
+            // InternalExport.g:1219:3: lv_identifier_1_0= ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getLetExpressionAccess().getIdentifierIdentifierParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_ruleLetExpression2731);
+            pushFollow(FOLLOW_31);
             lv_identifier_1_0=ruleIdentifier();
 
             state._fsp--;
@@ -3472,7 +3472,7 @@ public final EObject ruleLetExpression() throws RecognitionException {
                      			current, 
                      			"identifier",
                       		lv_identifier_1_0, 
-                      		"Identifier");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -3482,24 +3482,24 @@ public final EObject ruleLetExpression() throws RecognitionException {
 
             }
 
-            otherlv_2=(Token)match(input,22,FOLLOW_22_in_ruleLetExpression2743); if (state.failed) return current;
+            otherlv_2=(Token)match(input,22,FOLLOW_15); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getLetExpressionAccess().getEqualsSignKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1239:1: ( (lv_varExpr_3_0= ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1240:1: (lv_varExpr_3_0= ruleExpression )
+            // InternalExport.g:1239:1: ( (lv_varExpr_3_0= ruleExpression ) )
+            // InternalExport.g:1240:1: (lv_varExpr_3_0= ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1240:1: (lv_varExpr_3_0= ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1241:3: lv_varExpr_3_0= ruleExpression
+            // InternalExport.g:1240:1: (lv_varExpr_3_0= ruleExpression )
+            // InternalExport.g:1241:3: lv_varExpr_3_0= ruleExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getLetExpressionAccess().getVarExprExpressionParserRuleCall_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleExpression_in_ruleLetExpression2764);
+            pushFollow(FOLLOW_39);
             lv_varExpr_3_0=ruleExpression();
 
             state._fsp--;
@@ -3513,7 +3513,7 @@ public final EObject ruleLetExpression() throws RecognitionException {
                      			current, 
                      			"varExpr",
                       		lv_varExpr_3_0, 
-                      		"Expression");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -3523,24 +3523,24 @@ public final EObject ruleLetExpression() throws RecognitionException {
 
             }
 
-            otherlv_4=(Token)match(input,41,FOLLOW_41_in_ruleLetExpression2776); if (state.failed) return current;
+            otherlv_4=(Token)match(input,41,FOLLOW_15); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_4, grammarAccess.getLetExpressionAccess().getColonKeyword_4());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1261:1: ( (lv_target_5_0= ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1262:1: (lv_target_5_0= ruleExpression )
+            // InternalExport.g:1261:1: ( (lv_target_5_0= ruleExpression ) )
+            // InternalExport.g:1262:1: (lv_target_5_0= ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1262:1: (lv_target_5_0= ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1263:3: lv_target_5_0= ruleExpression
+            // InternalExport.g:1262:1: (lv_target_5_0= ruleExpression )
+            // InternalExport.g:1263:3: lv_target_5_0= ruleExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getLetExpressionAccess().getTargetExpressionParserRuleCall_5_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleExpression_in_ruleLetExpression2797);
+            pushFollow(FOLLOW_2);
             lv_target_5_0=ruleExpression();
 
             state._fsp--;
@@ -3554,7 +3554,7 @@ public final EObject ruleLetExpression() throws RecognitionException {
                      			current, 
                      			"target",
                       		lv_target_5_0, 
-                      		"Expression");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -3587,7 +3587,7 @@ public final EObject ruleLetExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleCastedExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1287:1: entryRuleCastedExpression returns [EObject current=null] : iv_ruleCastedExpression= ruleCastedExpression EOF ;
+    // InternalExport.g:1287:1: entryRuleCastedExpression returns [EObject current=null] : iv_ruleCastedExpression= ruleCastedExpression EOF ;
     public final EObject entryRuleCastedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -3595,13 +3595,13 @@ public final EObject entryRuleCastedExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1288:2: (iv_ruleCastedExpression= ruleCastedExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1289:2: iv_ruleCastedExpression= ruleCastedExpression EOF
+            // InternalExport.g:1288:2: (iv_ruleCastedExpression= ruleCastedExpression EOF )
+            // InternalExport.g:1289:2: iv_ruleCastedExpression= ruleCastedExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getCastedExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleCastedExpression_in_entryRuleCastedExpression2833);
+            pushFollow(FOLLOW_1);
             iv_ruleCastedExpression=ruleCastedExpression();
 
             state._fsp--;
@@ -3609,7 +3609,7 @@ public final EObject entryRuleCastedExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleCastedExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleCastedExpression2843); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -3627,7 +3627,7 @@ public final EObject entryRuleCastedExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleCastedExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1296:1: ruleCastedExpression returns [EObject current=null] : (otherlv_0= '(' ( (lv_type_1_0= ruleType ) ) otherlv_2= ')' ( (lv_target_3_0= ruleExpression ) ) ) ;
+    // InternalExport.g:1296:1: ruleCastedExpression returns [EObject current=null] : (otherlv_0= '(' ( (lv_type_1_0= ruleType ) ) otherlv_2= ')' ( (lv_target_3_0= ruleExpression ) ) ) ;
     public final EObject ruleCastedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -3641,30 +3641,30 @@ public final EObject ruleCastedExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1299:28: ( (otherlv_0= '(' ( (lv_type_1_0= ruleType ) ) otherlv_2= ')' ( (lv_target_3_0= ruleExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1300:1: (otherlv_0= '(' ( (lv_type_1_0= ruleType ) ) otherlv_2= ')' ( (lv_target_3_0= ruleExpression ) ) )
+            // InternalExport.g:1299:28: ( (otherlv_0= '(' ( (lv_type_1_0= ruleType ) ) otherlv_2= ')' ( (lv_target_3_0= ruleExpression ) ) ) )
+            // InternalExport.g:1300:1: (otherlv_0= '(' ( (lv_type_1_0= ruleType ) ) otherlv_2= ')' ( (lv_target_3_0= ruleExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1300:1: (otherlv_0= '(' ( (lv_type_1_0= ruleType ) ) otherlv_2= ')' ( (lv_target_3_0= ruleExpression ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1300:3: otherlv_0= '(' ( (lv_type_1_0= ruleType ) ) otherlv_2= ')' ( (lv_target_3_0= ruleExpression ) )
+            // InternalExport.g:1300:1: (otherlv_0= '(' ( (lv_type_1_0= ruleType ) ) otherlv_2= ')' ( (lv_target_3_0= ruleExpression ) ) )
+            // InternalExport.g:1300:3: otherlv_0= '(' ( (lv_type_1_0= ruleType ) ) otherlv_2= ')' ( (lv_target_3_0= ruleExpression ) )
             {
-            otherlv_0=(Token)match(input,28,FOLLOW_28_in_ruleCastedExpression2880); if (state.failed) return current;
+            otherlv_0=(Token)match(input,28,FOLLOW_40); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getCastedExpressionAccess().getLeftParenthesisKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1304:1: ( (lv_type_1_0= ruleType ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1305:1: (lv_type_1_0= ruleType )
+            // InternalExport.g:1304:1: ( (lv_type_1_0= ruleType ) )
+            // InternalExport.g:1305:1: (lv_type_1_0= ruleType )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1305:1: (lv_type_1_0= ruleType )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1306:3: lv_type_1_0= ruleType
+            // InternalExport.g:1305:1: (lv_type_1_0= ruleType )
+            // InternalExport.g:1306:3: lv_type_1_0= ruleType
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getCastedExpressionAccess().getTypeTypeParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleType_in_ruleCastedExpression2901);
+            pushFollow(FOLLOW_24);
             lv_type_1_0=ruleType();
 
             state._fsp--;
@@ -3678,7 +3678,7 @@ public final EObject ruleCastedExpression() throws RecognitionException {
                      			current, 
                      			"type",
                       		lv_type_1_0, 
-                      		"Type");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Type");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -3688,24 +3688,24 @@ public final EObject ruleCastedExpression() throws RecognitionException {
 
             }
 
-            otherlv_2=(Token)match(input,29,FOLLOW_29_in_ruleCastedExpression2913); if (state.failed) return current;
+            otherlv_2=(Token)match(input,29,FOLLOW_15); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getCastedExpressionAccess().getRightParenthesisKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1326:1: ( (lv_target_3_0= ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1327:1: (lv_target_3_0= ruleExpression )
+            // InternalExport.g:1326:1: ( (lv_target_3_0= ruleExpression ) )
+            // InternalExport.g:1327:1: (lv_target_3_0= ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1327:1: (lv_target_3_0= ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1328:3: lv_target_3_0= ruleExpression
+            // InternalExport.g:1327:1: (lv_target_3_0= ruleExpression )
+            // InternalExport.g:1328:3: lv_target_3_0= ruleExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getCastedExpressionAccess().getTargetExpressionParserRuleCall_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleExpression_in_ruleCastedExpression2934);
+            pushFollow(FOLLOW_2);
             lv_target_3_0=ruleExpression();
 
             state._fsp--;
@@ -3719,7 +3719,7 @@ public final EObject ruleCastedExpression() throws RecognitionException {
                      			current, 
                      			"target",
                       		lv_target_3_0, 
-                      		"Expression");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -3752,7 +3752,7 @@ public final EObject ruleCastedExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleChainExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1352:1: entryRuleChainExpression returns [EObject current=null] : iv_ruleChainExpression= ruleChainExpression EOF ;
+    // InternalExport.g:1352:1: entryRuleChainExpression returns [EObject current=null] : iv_ruleChainExpression= ruleChainExpression EOF ;
     public final EObject entryRuleChainExpression() throws RecognitionException {
         EObject current = null;
 
@@ -3760,13 +3760,13 @@ public final EObject entryRuleChainExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1353:2: (iv_ruleChainExpression= ruleChainExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1354:2: iv_ruleChainExpression= ruleChainExpression EOF
+            // InternalExport.g:1353:2: (iv_ruleChainExpression= ruleChainExpression EOF )
+            // InternalExport.g:1354:2: iv_ruleChainExpression= ruleChainExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getChainExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleChainExpression_in_entryRuleChainExpression2970);
+            pushFollow(FOLLOW_1);
             iv_ruleChainExpression=ruleChainExpression();
 
             state._fsp--;
@@ -3774,7 +3774,7 @@ public final EObject entryRuleChainExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleChainExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleChainExpression2980); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -3792,7 +3792,7 @@ public final EObject entryRuleChainExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleChainExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1361:1: ruleChainExpression returns [EObject current=null] : (this_ChainedExpression_0= ruleChainedExpression ( () otherlv_2= '->' ( (lv_next_3_0= ruleChainedExpression ) ) )* ) ;
+    // InternalExport.g:1361:1: ruleChainExpression returns [EObject current=null] : (this_ChainedExpression_0= ruleChainedExpression ( () otherlv_2= '->' ( (lv_next_3_0= ruleChainedExpression ) ) )* ) ;
     public final EObject ruleChainExpression() throws RecognitionException {
         EObject current = null;
 
@@ -3805,18 +3805,18 @@ public final EObject ruleChainExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1364:28: ( (this_ChainedExpression_0= ruleChainedExpression ( () otherlv_2= '->' ( (lv_next_3_0= ruleChainedExpression ) ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1365:1: (this_ChainedExpression_0= ruleChainedExpression ( () otherlv_2= '->' ( (lv_next_3_0= ruleChainedExpression ) ) )* )
+            // InternalExport.g:1364:28: ( (this_ChainedExpression_0= ruleChainedExpression ( () otherlv_2= '->' ( (lv_next_3_0= ruleChainedExpression ) ) )* ) )
+            // InternalExport.g:1365:1: (this_ChainedExpression_0= ruleChainedExpression ( () otherlv_2= '->' ( (lv_next_3_0= ruleChainedExpression ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1365:1: (this_ChainedExpression_0= ruleChainedExpression ( () otherlv_2= '->' ( (lv_next_3_0= ruleChainedExpression ) ) )* )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1366:5: this_ChainedExpression_0= ruleChainedExpression ( () otherlv_2= '->' ( (lv_next_3_0= ruleChainedExpression ) ) )*
+            // InternalExport.g:1365:1: (this_ChainedExpression_0= ruleChainedExpression ( () otherlv_2= '->' ( (lv_next_3_0= ruleChainedExpression ) ) )* )
+            // InternalExport.g:1366:5: this_ChainedExpression_0= ruleChainedExpression ( () otherlv_2= '->' ( (lv_next_3_0= ruleChainedExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getChainExpressionAccess().getChainedExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleChainedExpression_in_ruleChainExpression3027);
+            pushFollow(FOLLOW_41);
             this_ChainedExpression_0=ruleChainedExpression();
 
             state._fsp--;
@@ -3827,7 +3827,7 @@ public final EObject ruleChainExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1374:1: ( () otherlv_2= '->' ( (lv_next_3_0= ruleChainedExpression ) ) )*
+            // InternalExport.g:1374:1: ( () otherlv_2= '->' ( (lv_next_3_0= ruleChainedExpression ) ) )*
             loop31:
             do {
                 int alt31=2;
@@ -3840,10 +3840,10 @@ public final EObject ruleChainExpression() throws RecognitionException {
 
                 switch (alt31) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1374:2: () otherlv_2= '->' ( (lv_next_3_0= ruleChainedExpression ) )
+            	    // InternalExport.g:1374:2: () otherlv_2= '->' ( (lv_next_3_0= ruleChainedExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1374:2: ()
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1375:5: 
+            	    // InternalExport.g:1374:2: ()
+            	    // InternalExport.g:1375:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -3855,24 +3855,24 @@ public final EObject ruleChainExpression() throws RecognitionException {
 
             	    }
 
-            	    otherlv_2=(Token)match(input,42,FOLLOW_42_in_ruleChainExpression3048); if (state.failed) return current;
+            	    otherlv_2=(Token)match(input,42,FOLLOW_15); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_2, grammarAccess.getChainExpressionAccess().getHyphenMinusGreaterThanSignKeyword_1_1());
             	          
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1384:1: ( (lv_next_3_0= ruleChainedExpression ) )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1385:1: (lv_next_3_0= ruleChainedExpression )
+            	    // InternalExport.g:1384:1: ( (lv_next_3_0= ruleChainedExpression ) )
+            	    // InternalExport.g:1385:1: (lv_next_3_0= ruleChainedExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1385:1: (lv_next_3_0= ruleChainedExpression )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1386:3: lv_next_3_0= ruleChainedExpression
+            	    // InternalExport.g:1385:1: (lv_next_3_0= ruleChainedExpression )
+            	    // InternalExport.g:1386:3: lv_next_3_0= ruleChainedExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getChainExpressionAccess().getNextChainedExpressionParserRuleCall_1_2_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleChainedExpression_in_ruleChainExpression3069);
+            	    pushFollow(FOLLOW_41);
             	    lv_next_3_0=ruleChainedExpression();
 
             	    state._fsp--;
@@ -3886,7 +3886,7 @@ public final EObject ruleChainExpression() throws RecognitionException {
             	             			current, 
             	             			"next",
             	              		lv_next_3_0, 
-            	              		"ChainedExpression");
+            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.ChainedExpression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -3928,7 +3928,7 @@ public final EObject ruleChainExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleChainedExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1410:1: entryRuleChainedExpression returns [EObject current=null] : iv_ruleChainedExpression= ruleChainedExpression EOF ;
+    // InternalExport.g:1410:1: entryRuleChainedExpression returns [EObject current=null] : iv_ruleChainedExpression= ruleChainedExpression EOF ;
     public final EObject entryRuleChainedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -3936,13 +3936,13 @@ public final EObject entryRuleChainedExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1411:2: (iv_ruleChainedExpression= ruleChainedExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1412:2: iv_ruleChainedExpression= ruleChainedExpression EOF
+            // InternalExport.g:1411:2: (iv_ruleChainedExpression= ruleChainedExpression EOF )
+            // InternalExport.g:1412:2: iv_ruleChainedExpression= ruleChainedExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getChainedExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleChainedExpression_in_entryRuleChainedExpression3107);
+            pushFollow(FOLLOW_1);
             iv_ruleChainedExpression=ruleChainedExpression();
 
             state._fsp--;
@@ -3950,7 +3950,7 @@ public final EObject entryRuleChainedExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleChainedExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleChainedExpression3117); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -3968,7 +3968,7 @@ public final EObject entryRuleChainedExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleChainedExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1419:1: ruleChainedExpression returns [EObject current=null] : (this_IfExpressionKw_0= ruleIfExpressionKw | this_IfExpressionTri_1= ruleIfExpressionTri | this_SwitchExpression_2= ruleSwitchExpression ) ;
+    // InternalExport.g:1419:1: ruleChainedExpression returns [EObject current=null] : (this_IfExpressionKw_0= ruleIfExpressionKw | this_IfExpressionTri_1= ruleIfExpressionTri | this_SwitchExpression_2= ruleSwitchExpression ) ;
     public final EObject ruleChainedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -3982,10 +3982,10 @@ public final EObject ruleChainedExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1422:28: ( (this_IfExpressionKw_0= ruleIfExpressionKw | this_IfExpressionTri_1= ruleIfExpressionTri | this_SwitchExpression_2= ruleSwitchExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1423:1: (this_IfExpressionKw_0= ruleIfExpressionKw | this_IfExpressionTri_1= ruleIfExpressionTri | this_SwitchExpression_2= ruleSwitchExpression )
+            // InternalExport.g:1422:28: ( (this_IfExpressionKw_0= ruleIfExpressionKw | this_IfExpressionTri_1= ruleIfExpressionTri | this_SwitchExpression_2= ruleSwitchExpression ) )
+            // InternalExport.g:1423:1: (this_IfExpressionKw_0= ruleIfExpressionKw | this_IfExpressionTri_1= ruleIfExpressionTri | this_SwitchExpression_2= ruleSwitchExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1423:1: (this_IfExpressionKw_0= ruleIfExpressionKw | this_IfExpressionTri_1= ruleIfExpressionTri | this_SwitchExpression_2= ruleSwitchExpression )
+            // InternalExport.g:1423:1: (this_IfExpressionKw_0= ruleIfExpressionKw | this_IfExpressionTri_1= ruleIfExpressionTri | this_SwitchExpression_2= ruleSwitchExpression )
             int alt32=3;
             switch ( input.LA(1) ) {
             case 44:
@@ -4037,14 +4037,14 @@ public final EObject ruleChainedExpression() throws RecognitionException {
 
             switch (alt32) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1424:5: this_IfExpressionKw_0= ruleIfExpressionKw
+                    // InternalExport.g:1424:5: this_IfExpressionKw_0= ruleIfExpressionKw
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getChainedExpressionAccess().getIfExpressionKwParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleIfExpressionKw_in_ruleChainedExpression3164);
+                    pushFollow(FOLLOW_2);
                     this_IfExpressionKw_0=ruleIfExpressionKw();
 
                     state._fsp--;
@@ -4059,14 +4059,14 @@ public final EObject ruleChainedExpression() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1434:5: this_IfExpressionTri_1= ruleIfExpressionTri
+                    // InternalExport.g:1434:5: this_IfExpressionTri_1= ruleIfExpressionTri
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getChainedExpressionAccess().getIfExpressionTriParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleIfExpressionTri_in_ruleChainedExpression3191);
+                    pushFollow(FOLLOW_2);
                     this_IfExpressionTri_1=ruleIfExpressionTri();
 
                     state._fsp--;
@@ -4081,14 +4081,14 @@ public final EObject ruleChainedExpression() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1444:5: this_SwitchExpression_2= ruleSwitchExpression
+                    // InternalExport.g:1444:5: this_SwitchExpression_2= ruleSwitchExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getChainedExpressionAccess().getSwitchExpressionParserRuleCall_2()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleSwitchExpression_in_ruleChainedExpression3218);
+                    pushFollow(FOLLOW_2);
                     this_SwitchExpression_2=ruleSwitchExpression();
 
                     state._fsp--;
@@ -4125,7 +4125,7 @@ public final EObject ruleChainedExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleIfExpressionTri"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1460:1: entryRuleIfExpressionTri returns [EObject current=null] : iv_ruleIfExpressionTri= ruleIfExpressionTri EOF ;
+    // InternalExport.g:1460:1: entryRuleIfExpressionTri returns [EObject current=null] : iv_ruleIfExpressionTri= ruleIfExpressionTri EOF ;
     public final EObject entryRuleIfExpressionTri() throws RecognitionException {
         EObject current = null;
 
@@ -4133,13 +4133,13 @@ public final EObject entryRuleIfExpressionTri() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1461:2: (iv_ruleIfExpressionTri= ruleIfExpressionTri EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1462:2: iv_ruleIfExpressionTri= ruleIfExpressionTri EOF
+            // InternalExport.g:1461:2: (iv_ruleIfExpressionTri= ruleIfExpressionTri EOF )
+            // InternalExport.g:1462:2: iv_ruleIfExpressionTri= ruleIfExpressionTri EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getIfExpressionTriRule()); 
             }
-            pushFollow(FOLLOW_ruleIfExpressionTri_in_entryRuleIfExpressionTri3253);
+            pushFollow(FOLLOW_1);
             iv_ruleIfExpressionTri=ruleIfExpressionTri();
 
             state._fsp--;
@@ -4147,7 +4147,7 @@ public final EObject entryRuleIfExpressionTri() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleIfExpressionTri; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIfExpressionTri3263); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -4165,7 +4165,7 @@ public final EObject entryRuleIfExpressionTri() throws RecognitionException {
 
 
     // $ANTLR start "ruleIfExpressionTri"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1469:1: ruleIfExpressionTri returns [EObject current=null] : (this_OrExpression_0= ruleOrExpression ( () otherlv_2= '?' ( (lv_thenPart_3_0= ruleChainedExpression ) ) otherlv_4= ':' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )? ) ;
+    // InternalExport.g:1469:1: ruleIfExpressionTri returns [EObject current=null] : (this_OrExpression_0= ruleOrExpression ( () otherlv_2= '?' ( (lv_thenPart_3_0= ruleChainedExpression ) ) otherlv_4= ':' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )? ) ;
     public final EObject ruleIfExpressionTri() throws RecognitionException {
         EObject current = null;
 
@@ -4181,18 +4181,18 @@ public final EObject ruleIfExpressionTri() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1472:28: ( (this_OrExpression_0= ruleOrExpression ( () otherlv_2= '?' ( (lv_thenPart_3_0= ruleChainedExpression ) ) otherlv_4= ':' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )? ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1473:1: (this_OrExpression_0= ruleOrExpression ( () otherlv_2= '?' ( (lv_thenPart_3_0= ruleChainedExpression ) ) otherlv_4= ':' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )? )
+            // InternalExport.g:1472:28: ( (this_OrExpression_0= ruleOrExpression ( () otherlv_2= '?' ( (lv_thenPart_3_0= ruleChainedExpression ) ) otherlv_4= ':' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )? ) )
+            // InternalExport.g:1473:1: (this_OrExpression_0= ruleOrExpression ( () otherlv_2= '?' ( (lv_thenPart_3_0= ruleChainedExpression ) ) otherlv_4= ':' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1473:1: (this_OrExpression_0= ruleOrExpression ( () otherlv_2= '?' ( (lv_thenPart_3_0= ruleChainedExpression ) ) otherlv_4= ':' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )? )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1474:5: this_OrExpression_0= ruleOrExpression ( () otherlv_2= '?' ( (lv_thenPart_3_0= ruleChainedExpression ) ) otherlv_4= ':' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )?
+            // InternalExport.g:1473:1: (this_OrExpression_0= ruleOrExpression ( () otherlv_2= '?' ( (lv_thenPart_3_0= ruleChainedExpression ) ) otherlv_4= ':' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )? )
+            // InternalExport.g:1474:5: this_OrExpression_0= ruleOrExpression ( () otherlv_2= '?' ( (lv_thenPart_3_0= ruleChainedExpression ) ) otherlv_4= ':' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )?
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getIfExpressionTriAccess().getOrExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleOrExpression_in_ruleIfExpressionTri3310);
+            pushFollow(FOLLOW_42);
             this_OrExpression_0=ruleOrExpression();
 
             state._fsp--;
@@ -4203,7 +4203,7 @@ public final EObject ruleIfExpressionTri() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1482:1: ( () otherlv_2= '?' ( (lv_thenPart_3_0= ruleChainedExpression ) ) otherlv_4= ':' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )?
+            // InternalExport.g:1482:1: ( () otherlv_2= '?' ( (lv_thenPart_3_0= ruleChainedExpression ) ) otherlv_4= ':' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )?
             int alt33=2;
             int LA33_0 = input.LA(1);
 
@@ -4212,10 +4212,10 @@ public final EObject ruleIfExpressionTri() throws RecognitionException {
             }
             switch (alt33) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1482:2: () otherlv_2= '?' ( (lv_thenPart_3_0= ruleChainedExpression ) ) otherlv_4= ':' ( (lv_elsePart_5_0= ruleChainedExpression ) )
+                    // InternalExport.g:1482:2: () otherlv_2= '?' ( (lv_thenPart_3_0= ruleChainedExpression ) ) otherlv_4= ':' ( (lv_elsePart_5_0= ruleChainedExpression ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1482:2: ()
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1483:5: 
+                    // InternalExport.g:1482:2: ()
+                    // InternalExport.g:1483:5: 
                     {
                     if ( state.backtracking==0 ) {
 
@@ -4227,24 +4227,24 @@ public final EObject ruleIfExpressionTri() throws RecognitionException {
 
                     }
 
-                    otherlv_2=(Token)match(input,43,FOLLOW_43_in_ruleIfExpressionTri3331); if (state.failed) return current;
+                    otherlv_2=(Token)match(input,43,FOLLOW_15); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_2, grammarAccess.getIfExpressionTriAccess().getQuestionMarkKeyword_1_1());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1492:1: ( (lv_thenPart_3_0= ruleChainedExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1493:1: (lv_thenPart_3_0= ruleChainedExpression )
+                    // InternalExport.g:1492:1: ( (lv_thenPart_3_0= ruleChainedExpression ) )
+                    // InternalExport.g:1493:1: (lv_thenPart_3_0= ruleChainedExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1493:1: (lv_thenPart_3_0= ruleChainedExpression )
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1494:3: lv_thenPart_3_0= ruleChainedExpression
+                    // InternalExport.g:1493:1: (lv_thenPart_3_0= ruleChainedExpression )
+                    // InternalExport.g:1494:3: lv_thenPart_3_0= ruleChainedExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getIfExpressionTriAccess().getThenPartChainedExpressionParserRuleCall_1_2_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleChainedExpression_in_ruleIfExpressionTri3352);
+                    pushFollow(FOLLOW_39);
                     lv_thenPart_3_0=ruleChainedExpression();
 
                     state._fsp--;
@@ -4258,7 +4258,7 @@ public final EObject ruleIfExpressionTri() throws RecognitionException {
                              			current, 
                              			"thenPart",
                               		lv_thenPart_3_0, 
-                              		"ChainedExpression");
+                              		"com.avaloq.tools.ddk.xtext.expression.Expression.ChainedExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -4268,24 +4268,24 @@ public final EObject ruleIfExpressionTri() throws RecognitionException {
 
                     }
 
-                    otherlv_4=(Token)match(input,41,FOLLOW_41_in_ruleIfExpressionTri3364); if (state.failed) return current;
+                    otherlv_4=(Token)match(input,41,FOLLOW_15); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_4, grammarAccess.getIfExpressionTriAccess().getColonKeyword_1_3());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1514:1: ( (lv_elsePart_5_0= ruleChainedExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1515:1: (lv_elsePart_5_0= ruleChainedExpression )
+                    // InternalExport.g:1514:1: ( (lv_elsePart_5_0= ruleChainedExpression ) )
+                    // InternalExport.g:1515:1: (lv_elsePart_5_0= ruleChainedExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1515:1: (lv_elsePart_5_0= ruleChainedExpression )
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1516:3: lv_elsePart_5_0= ruleChainedExpression
+                    // InternalExport.g:1515:1: (lv_elsePart_5_0= ruleChainedExpression )
+                    // InternalExport.g:1516:3: lv_elsePart_5_0= ruleChainedExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getIfExpressionTriAccess().getElsePartChainedExpressionParserRuleCall_1_4_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleChainedExpression_in_ruleIfExpressionTri3385);
+                    pushFollow(FOLLOW_2);
                     lv_elsePart_5_0=ruleChainedExpression();
 
                     state._fsp--;
@@ -4299,7 +4299,7 @@ public final EObject ruleIfExpressionTri() throws RecognitionException {
                              			current, 
                              			"elsePart",
                               		lv_elsePart_5_0, 
-                              		"ChainedExpression");
+                              		"com.avaloq.tools.ddk.xtext.expression.Expression.ChainedExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -4338,7 +4338,7 @@ public final EObject ruleIfExpressionTri() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleIfExpressionKw"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1540:1: entryRuleIfExpressionKw returns [EObject current=null] : iv_ruleIfExpressionKw= ruleIfExpressionKw EOF ;
+    // InternalExport.g:1540:1: entryRuleIfExpressionKw returns [EObject current=null] : iv_ruleIfExpressionKw= ruleIfExpressionKw EOF ;
     public final EObject entryRuleIfExpressionKw() throws RecognitionException {
         EObject current = null;
 
@@ -4346,13 +4346,13 @@ public final EObject entryRuleIfExpressionKw() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1541:2: (iv_ruleIfExpressionKw= ruleIfExpressionKw EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1542:2: iv_ruleIfExpressionKw= ruleIfExpressionKw EOF
+            // InternalExport.g:1541:2: (iv_ruleIfExpressionKw= ruleIfExpressionKw EOF )
+            // InternalExport.g:1542:2: iv_ruleIfExpressionKw= ruleIfExpressionKw EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getIfExpressionKwRule()); 
             }
-            pushFollow(FOLLOW_ruleIfExpressionKw_in_entryRuleIfExpressionKw3423);
+            pushFollow(FOLLOW_1);
             iv_ruleIfExpressionKw=ruleIfExpressionKw();
 
             state._fsp--;
@@ -4360,7 +4360,7 @@ public final EObject entryRuleIfExpressionKw() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleIfExpressionKw; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIfExpressionKw3433); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -4378,7 +4378,7 @@ public final EObject entryRuleIfExpressionKw() throws RecognitionException {
 
 
     // $ANTLR start "ruleIfExpressionKw"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1549:1: ruleIfExpressionKw returns [EObject current=null] : (otherlv_0= 'if' ( (lv_condition_1_0= ruleChainedExpression ) ) otherlv_2= 'then' ( (lv_thenPart_3_0= ruleChainedExpression ) ) ( ( 'else' )=> (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) ) )? ) ;
+    // InternalExport.g:1549:1: ruleIfExpressionKw returns [EObject current=null] : (otherlv_0= 'if' ( (lv_condition_1_0= ruleChainedExpression ) ) otherlv_2= 'then' ( (lv_thenPart_3_0= ruleChainedExpression ) ) ( ( 'else' )=> (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) ) )? ) ;
     public final EObject ruleIfExpressionKw() throws RecognitionException {
         EObject current = null;
 
@@ -4395,30 +4395,30 @@ public final EObject ruleIfExpressionKw() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1552:28: ( (otherlv_0= 'if' ( (lv_condition_1_0= ruleChainedExpression ) ) otherlv_2= 'then' ( (lv_thenPart_3_0= ruleChainedExpression ) ) ( ( 'else' )=> (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) ) )? ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1553:1: (otherlv_0= 'if' ( (lv_condition_1_0= ruleChainedExpression ) ) otherlv_2= 'then' ( (lv_thenPart_3_0= ruleChainedExpression ) ) ( ( 'else' )=> (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) ) )? )
+            // InternalExport.g:1552:28: ( (otherlv_0= 'if' ( (lv_condition_1_0= ruleChainedExpression ) ) otherlv_2= 'then' ( (lv_thenPart_3_0= ruleChainedExpression ) ) ( ( 'else' )=> (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) ) )? ) )
+            // InternalExport.g:1553:1: (otherlv_0= 'if' ( (lv_condition_1_0= ruleChainedExpression ) ) otherlv_2= 'then' ( (lv_thenPart_3_0= ruleChainedExpression ) ) ( ( 'else' )=> (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) ) )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1553:1: (otherlv_0= 'if' ( (lv_condition_1_0= ruleChainedExpression ) ) otherlv_2= 'then' ( (lv_thenPart_3_0= ruleChainedExpression ) ) ( ( 'else' )=> (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) ) )? )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1553:3: otherlv_0= 'if' ( (lv_condition_1_0= ruleChainedExpression ) ) otherlv_2= 'then' ( (lv_thenPart_3_0= ruleChainedExpression ) ) ( ( 'else' )=> (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) ) )?
+            // InternalExport.g:1553:1: (otherlv_0= 'if' ( (lv_condition_1_0= ruleChainedExpression ) ) otherlv_2= 'then' ( (lv_thenPart_3_0= ruleChainedExpression ) ) ( ( 'else' )=> (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) ) )? )
+            // InternalExport.g:1553:3: otherlv_0= 'if' ( (lv_condition_1_0= ruleChainedExpression ) ) otherlv_2= 'then' ( (lv_thenPart_3_0= ruleChainedExpression ) ) ( ( 'else' )=> (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) ) )?
             {
-            otherlv_0=(Token)match(input,44,FOLLOW_44_in_ruleIfExpressionKw3470); if (state.failed) return current;
+            otherlv_0=(Token)match(input,44,FOLLOW_15); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getIfExpressionKwAccess().getIfKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1557:1: ( (lv_condition_1_0= ruleChainedExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1558:1: (lv_condition_1_0= ruleChainedExpression )
+            // InternalExport.g:1557:1: ( (lv_condition_1_0= ruleChainedExpression ) )
+            // InternalExport.g:1558:1: (lv_condition_1_0= ruleChainedExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1558:1: (lv_condition_1_0= ruleChainedExpression )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1559:3: lv_condition_1_0= ruleChainedExpression
+            // InternalExport.g:1558:1: (lv_condition_1_0= ruleChainedExpression )
+            // InternalExport.g:1559:3: lv_condition_1_0= ruleChainedExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getIfExpressionKwAccess().getConditionChainedExpressionParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleChainedExpression_in_ruleIfExpressionKw3491);
+            pushFollow(FOLLOW_43);
             lv_condition_1_0=ruleChainedExpression();
 
             state._fsp--;
@@ -4432,7 +4432,7 @@ public final EObject ruleIfExpressionKw() throws RecognitionException {
                      			current, 
                      			"condition",
                       		lv_condition_1_0, 
-                      		"ChainedExpression");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.ChainedExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -4442,24 +4442,24 @@ public final EObject ruleIfExpressionKw() throws RecognitionException {
 
             }
 
-            otherlv_2=(Token)match(input,45,FOLLOW_45_in_ruleIfExpressionKw3503); if (state.failed) return current;
+            otherlv_2=(Token)match(input,45,FOLLOW_15); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getIfExpressionKwAccess().getThenKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1579:1: ( (lv_thenPart_3_0= ruleChainedExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1580:1: (lv_thenPart_3_0= ruleChainedExpression )
+            // InternalExport.g:1579:1: ( (lv_thenPart_3_0= ruleChainedExpression ) )
+            // InternalExport.g:1580:1: (lv_thenPart_3_0= ruleChainedExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1580:1: (lv_thenPart_3_0= ruleChainedExpression )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1581:3: lv_thenPart_3_0= ruleChainedExpression
+            // InternalExport.g:1580:1: (lv_thenPart_3_0= ruleChainedExpression )
+            // InternalExport.g:1581:3: lv_thenPart_3_0= ruleChainedExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getIfExpressionKwAccess().getThenPartChainedExpressionParserRuleCall_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleChainedExpression_in_ruleIfExpressionKw3524);
+            pushFollow(FOLLOW_44);
             lv_thenPart_3_0=ruleChainedExpression();
 
             state._fsp--;
@@ -4473,7 +4473,7 @@ public final EObject ruleIfExpressionKw() throws RecognitionException {
                      			current, 
                      			"thenPart",
                       		lv_thenPart_3_0, 
-                      		"ChainedExpression");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.ChainedExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -4483,7 +4483,7 @@ public final EObject ruleIfExpressionKw() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1597:2: ( ( 'else' )=> (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) ) )?
+            // InternalExport.g:1597:2: ( ( 'else' )=> (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) ) )?
             int alt34=2;
             int LA34_0 = input.LA(1);
 
@@ -4496,29 +4496,29 @@ public final EObject ruleIfExpressionKw() throws RecognitionException {
             }
             switch (alt34) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1597:3: ( 'else' )=> (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )
+                    // InternalExport.g:1597:3: ( 'else' )=> (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1598:4: (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1598:6: otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) )
+                    // InternalExport.g:1598:4: (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )
+                    // InternalExport.g:1598:6: otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) )
                     {
-                    otherlv_4=(Token)match(input,46,FOLLOW_46_in_ruleIfExpressionKw3545); if (state.failed) return current;
+                    otherlv_4=(Token)match(input,46,FOLLOW_15); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_4, grammarAccess.getIfExpressionKwAccess().getElseKeyword_4_0_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1602:1: ( (lv_elsePart_5_0= ruleChainedExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1603:1: (lv_elsePart_5_0= ruleChainedExpression )
+                    // InternalExport.g:1602:1: ( (lv_elsePart_5_0= ruleChainedExpression ) )
+                    // InternalExport.g:1603:1: (lv_elsePart_5_0= ruleChainedExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1603:1: (lv_elsePart_5_0= ruleChainedExpression )
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1604:3: lv_elsePart_5_0= ruleChainedExpression
+                    // InternalExport.g:1603:1: (lv_elsePart_5_0= ruleChainedExpression )
+                    // InternalExport.g:1604:3: lv_elsePart_5_0= ruleChainedExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getIfExpressionKwAccess().getElsePartChainedExpressionParserRuleCall_4_0_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleChainedExpression_in_ruleIfExpressionKw3566);
+                    pushFollow(FOLLOW_2);
                     lv_elsePart_5_0=ruleChainedExpression();
 
                     state._fsp--;
@@ -4532,7 +4532,7 @@ public final EObject ruleIfExpressionKw() throws RecognitionException {
                              			current, 
                              			"elsePart",
                               		lv_elsePart_5_0, 
-                              		"ChainedExpression");
+                              		"com.avaloq.tools.ddk.xtext.expression.Expression.ChainedExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -4574,7 +4574,7 @@ public final EObject ruleIfExpressionKw() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleSwitchExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1628:1: entryRuleSwitchExpression returns [EObject current=null] : iv_ruleSwitchExpression= ruleSwitchExpression EOF ;
+    // InternalExport.g:1628:1: entryRuleSwitchExpression returns [EObject current=null] : iv_ruleSwitchExpression= ruleSwitchExpression EOF ;
     public final EObject entryRuleSwitchExpression() throws RecognitionException {
         EObject current = null;
 
@@ -4582,13 +4582,13 @@ public final EObject entryRuleSwitchExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1629:2: (iv_ruleSwitchExpression= ruleSwitchExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1630:2: iv_ruleSwitchExpression= ruleSwitchExpression EOF
+            // InternalExport.g:1629:2: (iv_ruleSwitchExpression= ruleSwitchExpression EOF )
+            // InternalExport.g:1630:2: iv_ruleSwitchExpression= ruleSwitchExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getSwitchExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleSwitchExpression_in_entryRuleSwitchExpression3605);
+            pushFollow(FOLLOW_1);
             iv_ruleSwitchExpression=ruleSwitchExpression();
 
             state._fsp--;
@@ -4596,7 +4596,7 @@ public final EObject entryRuleSwitchExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleSwitchExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSwitchExpression3615); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -4614,7 +4614,7 @@ public final EObject entryRuleSwitchExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleSwitchExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1637:1: ruleSwitchExpression returns [EObject current=null] : (otherlv_0= 'switch' (otherlv_1= '(' ( (lv_switchExpr_2_0= ruleOrExpression ) ) otherlv_3= ')' )? otherlv_4= '{' ( (lv_case_5_0= ruleCase ) )* otherlv_6= 'default' otherlv_7= ':' ( (lv_defaultExpr_8_0= ruleOrExpression ) ) otherlv_9= '}' ) ;
+    // InternalExport.g:1637:1: ruleSwitchExpression returns [EObject current=null] : (otherlv_0= 'switch' (otherlv_1= '(' ( (lv_switchExpr_2_0= ruleOrExpression ) ) otherlv_3= ')' )? otherlv_4= '{' ( (lv_case_5_0= ruleCase ) )* otherlv_6= 'default' otherlv_7= ':' ( (lv_defaultExpr_8_0= ruleOrExpression ) ) otherlv_9= '}' ) ;
     public final EObject ruleSwitchExpression() throws RecognitionException {
         EObject current = null;
 
@@ -4635,19 +4635,19 @@ public final EObject ruleSwitchExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1640:28: ( (otherlv_0= 'switch' (otherlv_1= '(' ( (lv_switchExpr_2_0= ruleOrExpression ) ) otherlv_3= ')' )? otherlv_4= '{' ( (lv_case_5_0= ruleCase ) )* otherlv_6= 'default' otherlv_7= ':' ( (lv_defaultExpr_8_0= ruleOrExpression ) ) otherlv_9= '}' ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1641:1: (otherlv_0= 'switch' (otherlv_1= '(' ( (lv_switchExpr_2_0= ruleOrExpression ) ) otherlv_3= ')' )? otherlv_4= '{' ( (lv_case_5_0= ruleCase ) )* otherlv_6= 'default' otherlv_7= ':' ( (lv_defaultExpr_8_0= ruleOrExpression ) ) otherlv_9= '}' )
+            // InternalExport.g:1640:28: ( (otherlv_0= 'switch' (otherlv_1= '(' ( (lv_switchExpr_2_0= ruleOrExpression ) ) otherlv_3= ')' )? otherlv_4= '{' ( (lv_case_5_0= ruleCase ) )* otherlv_6= 'default' otherlv_7= ':' ( (lv_defaultExpr_8_0= ruleOrExpression ) ) otherlv_9= '}' ) )
+            // InternalExport.g:1641:1: (otherlv_0= 'switch' (otherlv_1= '(' ( (lv_switchExpr_2_0= ruleOrExpression ) ) otherlv_3= ')' )? otherlv_4= '{' ( (lv_case_5_0= ruleCase ) )* otherlv_6= 'default' otherlv_7= ':' ( (lv_defaultExpr_8_0= ruleOrExpression ) ) otherlv_9= '}' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1641:1: (otherlv_0= 'switch' (otherlv_1= '(' ( (lv_switchExpr_2_0= ruleOrExpression ) ) otherlv_3= ')' )? otherlv_4= '{' ( (lv_case_5_0= ruleCase ) )* otherlv_6= 'default' otherlv_7= ':' ( (lv_defaultExpr_8_0= ruleOrExpression ) ) otherlv_9= '}' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1641:3: otherlv_0= 'switch' (otherlv_1= '(' ( (lv_switchExpr_2_0= ruleOrExpression ) ) otherlv_3= ')' )? otherlv_4= '{' ( (lv_case_5_0= ruleCase ) )* otherlv_6= 'default' otherlv_7= ':' ( (lv_defaultExpr_8_0= ruleOrExpression ) ) otherlv_9= '}'
+            // InternalExport.g:1641:1: (otherlv_0= 'switch' (otherlv_1= '(' ( (lv_switchExpr_2_0= ruleOrExpression ) ) otherlv_3= ')' )? otherlv_4= '{' ( (lv_case_5_0= ruleCase ) )* otherlv_6= 'default' otherlv_7= ':' ( (lv_defaultExpr_8_0= ruleOrExpression ) ) otherlv_9= '}' )
+            // InternalExport.g:1641:3: otherlv_0= 'switch' (otherlv_1= '(' ( (lv_switchExpr_2_0= ruleOrExpression ) ) otherlv_3= ')' )? otherlv_4= '{' ( (lv_case_5_0= ruleCase ) )* otherlv_6= 'default' otherlv_7= ':' ( (lv_defaultExpr_8_0= ruleOrExpression ) ) otherlv_9= '}'
             {
-            otherlv_0=(Token)match(input,47,FOLLOW_47_in_ruleSwitchExpression3652); if (state.failed) return current;
+            otherlv_0=(Token)match(input,47,FOLLOW_45); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getSwitchExpressionAccess().getSwitchKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1645:1: (otherlv_1= '(' ( (lv_switchExpr_2_0= ruleOrExpression ) ) otherlv_3= ')' )?
+            // InternalExport.g:1645:1: (otherlv_1= '(' ( (lv_switchExpr_2_0= ruleOrExpression ) ) otherlv_3= ')' )?
             int alt35=2;
             int LA35_0 = input.LA(1);
 
@@ -4656,26 +4656,26 @@ public final EObject ruleSwitchExpression() throws RecognitionException {
             }
             switch (alt35) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1645:3: otherlv_1= '(' ( (lv_switchExpr_2_0= ruleOrExpression ) ) otherlv_3= ')'
+                    // InternalExport.g:1645:3: otherlv_1= '(' ( (lv_switchExpr_2_0= ruleOrExpression ) ) otherlv_3= ')'
                     {
-                    otherlv_1=(Token)match(input,28,FOLLOW_28_in_ruleSwitchExpression3665); if (state.failed) return current;
+                    otherlv_1=(Token)match(input,28,FOLLOW_46); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_1, grammarAccess.getSwitchExpressionAccess().getLeftParenthesisKeyword_1_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1649:1: ( (lv_switchExpr_2_0= ruleOrExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1650:1: (lv_switchExpr_2_0= ruleOrExpression )
+                    // InternalExport.g:1649:1: ( (lv_switchExpr_2_0= ruleOrExpression ) )
+                    // InternalExport.g:1650:1: (lv_switchExpr_2_0= ruleOrExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1650:1: (lv_switchExpr_2_0= ruleOrExpression )
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1651:3: lv_switchExpr_2_0= ruleOrExpression
+                    // InternalExport.g:1650:1: (lv_switchExpr_2_0= ruleOrExpression )
+                    // InternalExport.g:1651:3: lv_switchExpr_2_0= ruleOrExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getSwitchExpressionAccess().getSwitchExprOrExpressionParserRuleCall_1_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleOrExpression_in_ruleSwitchExpression3686);
+                    pushFollow(FOLLOW_24);
                     lv_switchExpr_2_0=ruleOrExpression();
 
                     state._fsp--;
@@ -4689,7 +4689,7 @@ public final EObject ruleSwitchExpression() throws RecognitionException {
                              			current, 
                              			"switchExpr",
                               		lv_switchExpr_2_0, 
-                              		"OrExpression");
+                              		"com.avaloq.tools.ddk.xtext.expression.Expression.OrExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -4699,7 +4699,7 @@ public final EObject ruleSwitchExpression() throws RecognitionException {
 
                     }
 
-                    otherlv_3=(Token)match(input,29,FOLLOW_29_in_ruleSwitchExpression3698); if (state.failed) return current;
+                    otherlv_3=(Token)match(input,29,FOLLOW_9); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_3, grammarAccess.getSwitchExpressionAccess().getRightParenthesisKeyword_1_2());
@@ -4711,13 +4711,13 @@ public final EObject ruleSwitchExpression() throws RecognitionException {
 
             }
 
-            otherlv_4=(Token)match(input,16,FOLLOW_16_in_ruleSwitchExpression3712); if (state.failed) return current;
+            otherlv_4=(Token)match(input,16,FOLLOW_47); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_4, grammarAccess.getSwitchExpressionAccess().getLeftCurlyBracketKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1675:1: ( (lv_case_5_0= ruleCase ) )*
+            // InternalExport.g:1675:1: ( (lv_case_5_0= ruleCase ) )*
             loop36:
             do {
                 int alt36=2;
@@ -4730,17 +4730,17 @@ public final EObject ruleSwitchExpression() throws RecognitionException {
 
                 switch (alt36) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1676:1: (lv_case_5_0= ruleCase )
+            	    // InternalExport.g:1676:1: (lv_case_5_0= ruleCase )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1676:1: (lv_case_5_0= ruleCase )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1677:3: lv_case_5_0= ruleCase
+            	    // InternalExport.g:1676:1: (lv_case_5_0= ruleCase )
+            	    // InternalExport.g:1677:3: lv_case_5_0= ruleCase
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getSwitchExpressionAccess().getCaseCaseParserRuleCall_3_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleCase_in_ruleSwitchExpression3733);
+            	    pushFollow(FOLLOW_47);
             	    lv_case_5_0=ruleCase();
 
             	    state._fsp--;
@@ -4754,7 +4754,7 @@ public final EObject ruleSwitchExpression() throws RecognitionException {
             	             			current, 
             	             			"case",
             	              		lv_case_5_0, 
-            	              		"Case");
+            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.Case");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -4770,30 +4770,30 @@ public final EObject ruleSwitchExpression() throws RecognitionException {
                 }
             } while (true);
 
-            otherlv_6=(Token)match(input,48,FOLLOW_48_in_ruleSwitchExpression3746); if (state.failed) return current;
+            otherlv_6=(Token)match(input,48,FOLLOW_39); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_6, grammarAccess.getSwitchExpressionAccess().getDefaultKeyword_4());
                   
             }
-            otherlv_7=(Token)match(input,41,FOLLOW_41_in_ruleSwitchExpression3758); if (state.failed) return current;
+            otherlv_7=(Token)match(input,41,FOLLOW_46); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_7, grammarAccess.getSwitchExpressionAccess().getColonKeyword_5());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1701:1: ( (lv_defaultExpr_8_0= ruleOrExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1702:1: (lv_defaultExpr_8_0= ruleOrExpression )
+            // InternalExport.g:1701:1: ( (lv_defaultExpr_8_0= ruleOrExpression ) )
+            // InternalExport.g:1702:1: (lv_defaultExpr_8_0= ruleOrExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1702:1: (lv_defaultExpr_8_0= ruleOrExpression )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1703:3: lv_defaultExpr_8_0= ruleOrExpression
+            // InternalExport.g:1702:1: (lv_defaultExpr_8_0= ruleOrExpression )
+            // InternalExport.g:1703:3: lv_defaultExpr_8_0= ruleOrExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getSwitchExpressionAccess().getDefaultExprOrExpressionParserRuleCall_6_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleOrExpression_in_ruleSwitchExpression3779);
+            pushFollow(FOLLOW_48);
             lv_defaultExpr_8_0=ruleOrExpression();
 
             state._fsp--;
@@ -4807,7 +4807,7 @@ public final EObject ruleSwitchExpression() throws RecognitionException {
                      			current, 
                      			"defaultExpr",
                       		lv_defaultExpr_8_0, 
-                      		"OrExpression");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.OrExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -4817,7 +4817,7 @@ public final EObject ruleSwitchExpression() throws RecognitionException {
 
             }
 
-            otherlv_9=(Token)match(input,17,FOLLOW_17_in_ruleSwitchExpression3791); if (state.failed) return current;
+            otherlv_9=(Token)match(input,17,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_9, grammarAccess.getSwitchExpressionAccess().getRightCurlyBracketKeyword_7());
@@ -4846,7 +4846,7 @@ public final EObject ruleSwitchExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleCase"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1731:1: entryRuleCase returns [EObject current=null] : iv_ruleCase= ruleCase EOF ;
+    // InternalExport.g:1731:1: entryRuleCase returns [EObject current=null] : iv_ruleCase= ruleCase EOF ;
     public final EObject entryRuleCase() throws RecognitionException {
         EObject current = null;
 
@@ -4854,13 +4854,13 @@ public final EObject entryRuleCase() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1732:2: (iv_ruleCase= ruleCase EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1733:2: iv_ruleCase= ruleCase EOF
+            // InternalExport.g:1732:2: (iv_ruleCase= ruleCase EOF )
+            // InternalExport.g:1733:2: iv_ruleCase= ruleCase EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getCaseRule()); 
             }
-            pushFollow(FOLLOW_ruleCase_in_entryRuleCase3827);
+            pushFollow(FOLLOW_1);
             iv_ruleCase=ruleCase();
 
             state._fsp--;
@@ -4868,7 +4868,7 @@ public final EObject entryRuleCase() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleCase; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleCase3837); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -4886,7 +4886,7 @@ public final EObject entryRuleCase() throws RecognitionException {
 
 
     // $ANTLR start "ruleCase"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1740:1: ruleCase returns [EObject current=null] : (otherlv_0= 'case' ( (lv_condition_1_0= ruleOrExpression ) ) otherlv_2= ':' ( (lv_thenPar_3_0= ruleOrExpression ) ) ) ;
+    // InternalExport.g:1740:1: ruleCase returns [EObject current=null] : (otherlv_0= 'case' ( (lv_condition_1_0= ruleOrExpression ) ) otherlv_2= ':' ( (lv_thenPar_3_0= ruleOrExpression ) ) ) ;
     public final EObject ruleCase() throws RecognitionException {
         EObject current = null;
 
@@ -4900,30 +4900,30 @@ public final EObject ruleCase() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1743:28: ( (otherlv_0= 'case' ( (lv_condition_1_0= ruleOrExpression ) ) otherlv_2= ':' ( (lv_thenPar_3_0= ruleOrExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1744:1: (otherlv_0= 'case' ( (lv_condition_1_0= ruleOrExpression ) ) otherlv_2= ':' ( (lv_thenPar_3_0= ruleOrExpression ) ) )
+            // InternalExport.g:1743:28: ( (otherlv_0= 'case' ( (lv_condition_1_0= ruleOrExpression ) ) otherlv_2= ':' ( (lv_thenPar_3_0= ruleOrExpression ) ) ) )
+            // InternalExport.g:1744:1: (otherlv_0= 'case' ( (lv_condition_1_0= ruleOrExpression ) ) otherlv_2= ':' ( (lv_thenPar_3_0= ruleOrExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1744:1: (otherlv_0= 'case' ( (lv_condition_1_0= ruleOrExpression ) ) otherlv_2= ':' ( (lv_thenPar_3_0= ruleOrExpression ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1744:3: otherlv_0= 'case' ( (lv_condition_1_0= ruleOrExpression ) ) otherlv_2= ':' ( (lv_thenPar_3_0= ruleOrExpression ) )
+            // InternalExport.g:1744:1: (otherlv_0= 'case' ( (lv_condition_1_0= ruleOrExpression ) ) otherlv_2= ':' ( (lv_thenPar_3_0= ruleOrExpression ) ) )
+            // InternalExport.g:1744:3: otherlv_0= 'case' ( (lv_condition_1_0= ruleOrExpression ) ) otherlv_2= ':' ( (lv_thenPar_3_0= ruleOrExpression ) )
             {
-            otherlv_0=(Token)match(input,49,FOLLOW_49_in_ruleCase3874); if (state.failed) return current;
+            otherlv_0=(Token)match(input,49,FOLLOW_46); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getCaseAccess().getCaseKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1748:1: ( (lv_condition_1_0= ruleOrExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1749:1: (lv_condition_1_0= ruleOrExpression )
+            // InternalExport.g:1748:1: ( (lv_condition_1_0= ruleOrExpression ) )
+            // InternalExport.g:1749:1: (lv_condition_1_0= ruleOrExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1749:1: (lv_condition_1_0= ruleOrExpression )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1750:3: lv_condition_1_0= ruleOrExpression
+            // InternalExport.g:1749:1: (lv_condition_1_0= ruleOrExpression )
+            // InternalExport.g:1750:3: lv_condition_1_0= ruleOrExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getCaseAccess().getConditionOrExpressionParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleOrExpression_in_ruleCase3895);
+            pushFollow(FOLLOW_39);
             lv_condition_1_0=ruleOrExpression();
 
             state._fsp--;
@@ -4937,7 +4937,7 @@ public final EObject ruleCase() throws RecognitionException {
                      			current, 
                      			"condition",
                       		lv_condition_1_0, 
-                      		"OrExpression");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.OrExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -4947,24 +4947,24 @@ public final EObject ruleCase() throws RecognitionException {
 
             }
 
-            otherlv_2=(Token)match(input,41,FOLLOW_41_in_ruleCase3907); if (state.failed) return current;
+            otherlv_2=(Token)match(input,41,FOLLOW_46); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getCaseAccess().getColonKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1770:1: ( (lv_thenPar_3_0= ruleOrExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1771:1: (lv_thenPar_3_0= ruleOrExpression )
+            // InternalExport.g:1770:1: ( (lv_thenPar_3_0= ruleOrExpression ) )
+            // InternalExport.g:1771:1: (lv_thenPar_3_0= ruleOrExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1771:1: (lv_thenPar_3_0= ruleOrExpression )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1772:3: lv_thenPar_3_0= ruleOrExpression
+            // InternalExport.g:1771:1: (lv_thenPar_3_0= ruleOrExpression )
+            // InternalExport.g:1772:3: lv_thenPar_3_0= ruleOrExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getCaseAccess().getThenParOrExpressionParserRuleCall_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleOrExpression_in_ruleCase3928);
+            pushFollow(FOLLOW_2);
             lv_thenPar_3_0=ruleOrExpression();
 
             state._fsp--;
@@ -4978,7 +4978,7 @@ public final EObject ruleCase() throws RecognitionException {
                      			current, 
                      			"thenPar",
                       		lv_thenPar_3_0, 
-                      		"OrExpression");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.OrExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -5011,7 +5011,7 @@ public final EObject ruleCase() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOrExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1796:1: entryRuleOrExpression returns [EObject current=null] : iv_ruleOrExpression= ruleOrExpression EOF ;
+    // InternalExport.g:1796:1: entryRuleOrExpression returns [EObject current=null] : iv_ruleOrExpression= ruleOrExpression EOF ;
     public final EObject entryRuleOrExpression() throws RecognitionException {
         EObject current = null;
 
@@ -5019,13 +5019,13 @@ public final EObject entryRuleOrExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1797:2: (iv_ruleOrExpression= ruleOrExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1798:2: iv_ruleOrExpression= ruleOrExpression EOF
+            // InternalExport.g:1797:2: (iv_ruleOrExpression= ruleOrExpression EOF )
+            // InternalExport.g:1798:2: iv_ruleOrExpression= ruleOrExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOrExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleOrExpression_in_entryRuleOrExpression3964);
+            pushFollow(FOLLOW_1);
             iv_ruleOrExpression=ruleOrExpression();
 
             state._fsp--;
@@ -5033,7 +5033,7 @@ public final EObject entryRuleOrExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOrExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOrExpression3974); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -5051,7 +5051,7 @@ public final EObject entryRuleOrExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleOrExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1805:1: ruleOrExpression returns [EObject current=null] : (this_AndExpression_0= ruleAndExpression ( () ( (lv_operator_2_0= '||' ) ) ( (lv_right_3_0= ruleAndExpression ) ) )* ) ;
+    // InternalExport.g:1805:1: ruleOrExpression returns [EObject current=null] : (this_AndExpression_0= ruleAndExpression ( () ( (lv_operator_2_0= '||' ) ) ( (lv_right_3_0= ruleAndExpression ) ) )* ) ;
     public final EObject ruleOrExpression() throws RecognitionException {
         EObject current = null;
 
@@ -5064,18 +5064,18 @@ public final EObject ruleOrExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1808:28: ( (this_AndExpression_0= ruleAndExpression ( () ( (lv_operator_2_0= '||' ) ) ( (lv_right_3_0= ruleAndExpression ) ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1809:1: (this_AndExpression_0= ruleAndExpression ( () ( (lv_operator_2_0= '||' ) ) ( (lv_right_3_0= ruleAndExpression ) ) )* )
+            // InternalExport.g:1808:28: ( (this_AndExpression_0= ruleAndExpression ( () ( (lv_operator_2_0= '||' ) ) ( (lv_right_3_0= ruleAndExpression ) ) )* ) )
+            // InternalExport.g:1809:1: (this_AndExpression_0= ruleAndExpression ( () ( (lv_operator_2_0= '||' ) ) ( (lv_right_3_0= ruleAndExpression ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1809:1: (this_AndExpression_0= ruleAndExpression ( () ( (lv_operator_2_0= '||' ) ) ( (lv_right_3_0= ruleAndExpression ) ) )* )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1810:5: this_AndExpression_0= ruleAndExpression ( () ( (lv_operator_2_0= '||' ) ) ( (lv_right_3_0= ruleAndExpression ) ) )*
+            // InternalExport.g:1809:1: (this_AndExpression_0= ruleAndExpression ( () ( (lv_operator_2_0= '||' ) ) ( (lv_right_3_0= ruleAndExpression ) ) )* )
+            // InternalExport.g:1810:5: this_AndExpression_0= ruleAndExpression ( () ( (lv_operator_2_0= '||' ) ) ( (lv_right_3_0= ruleAndExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getOrExpressionAccess().getAndExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleAndExpression_in_ruleOrExpression4021);
+            pushFollow(FOLLOW_49);
             this_AndExpression_0=ruleAndExpression();
 
             state._fsp--;
@@ -5086,7 +5086,7 @@ public final EObject ruleOrExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1818:1: ( () ( (lv_operator_2_0= '||' ) ) ( (lv_right_3_0= ruleAndExpression ) ) )*
+            // InternalExport.g:1818:1: ( () ( (lv_operator_2_0= '||' ) ) ( (lv_right_3_0= ruleAndExpression ) ) )*
             loop37:
             do {
                 int alt37=2;
@@ -5099,10 +5099,10 @@ public final EObject ruleOrExpression() throws RecognitionException {
 
                 switch (alt37) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1818:2: () ( (lv_operator_2_0= '||' ) ) ( (lv_right_3_0= ruleAndExpression ) )
+            	    // InternalExport.g:1818:2: () ( (lv_operator_2_0= '||' ) ) ( (lv_right_3_0= ruleAndExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1818:2: ()
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1819:5: 
+            	    // InternalExport.g:1818:2: ()
+            	    // InternalExport.g:1819:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -5114,13 +5114,13 @@ public final EObject ruleOrExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1824:2: ( (lv_operator_2_0= '||' ) )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1825:1: (lv_operator_2_0= '||' )
+            	    // InternalExport.g:1824:2: ( (lv_operator_2_0= '||' ) )
+            	    // InternalExport.g:1825:1: (lv_operator_2_0= '||' )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1825:1: (lv_operator_2_0= '||' )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1826:3: lv_operator_2_0= '||'
+            	    // InternalExport.g:1825:1: (lv_operator_2_0= '||' )
+            	    // InternalExport.g:1826:3: lv_operator_2_0= '||'
             	    {
-            	    lv_operator_2_0=(Token)match(input,50,FOLLOW_50_in_ruleOrExpression4048); if (state.failed) return current;
+            	    lv_operator_2_0=(Token)match(input,50,FOLLOW_46); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	              newLeafNode(lv_operator_2_0, grammarAccess.getOrExpressionAccess().getOperatorVerticalLineVerticalLineKeyword_1_1_0());
@@ -5140,18 +5140,18 @@ public final EObject ruleOrExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1839:2: ( (lv_right_3_0= ruleAndExpression ) )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1840:1: (lv_right_3_0= ruleAndExpression )
+            	    // InternalExport.g:1839:2: ( (lv_right_3_0= ruleAndExpression ) )
+            	    // InternalExport.g:1840:1: (lv_right_3_0= ruleAndExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1840:1: (lv_right_3_0= ruleAndExpression )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1841:3: lv_right_3_0= ruleAndExpression
+            	    // InternalExport.g:1840:1: (lv_right_3_0= ruleAndExpression )
+            	    // InternalExport.g:1841:3: lv_right_3_0= ruleAndExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getOrExpressionAccess().getRightAndExpressionParserRuleCall_1_2_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleAndExpression_in_ruleOrExpression4082);
+            	    pushFollow(FOLLOW_49);
             	    lv_right_3_0=ruleAndExpression();
 
             	    state._fsp--;
@@ -5165,7 +5165,7 @@ public final EObject ruleOrExpression() throws RecognitionException {
             	             			current, 
             	             			"right",
             	              		lv_right_3_0, 
-            	              		"AndExpression");
+            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.AndExpression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -5207,7 +5207,7 @@ public final EObject ruleOrExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleAndExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1865:1: entryRuleAndExpression returns [EObject current=null] : iv_ruleAndExpression= ruleAndExpression EOF ;
+    // InternalExport.g:1865:1: entryRuleAndExpression returns [EObject current=null] : iv_ruleAndExpression= ruleAndExpression EOF ;
     public final EObject entryRuleAndExpression() throws RecognitionException {
         EObject current = null;
 
@@ -5215,13 +5215,13 @@ public final EObject entryRuleAndExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1866:2: (iv_ruleAndExpression= ruleAndExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1867:2: iv_ruleAndExpression= ruleAndExpression EOF
+            // InternalExport.g:1866:2: (iv_ruleAndExpression= ruleAndExpression EOF )
+            // InternalExport.g:1867:2: iv_ruleAndExpression= ruleAndExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getAndExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleAndExpression_in_entryRuleAndExpression4120);
+            pushFollow(FOLLOW_1);
             iv_ruleAndExpression=ruleAndExpression();
 
             state._fsp--;
@@ -5229,7 +5229,7 @@ public final EObject entryRuleAndExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleAndExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAndExpression4130); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -5247,7 +5247,7 @@ public final EObject entryRuleAndExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleAndExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1874:1: ruleAndExpression returns [EObject current=null] : (this_ImpliesExpression_0= ruleImpliesExpression ( () ( (lv_operator_2_0= '&&' ) ) ( (lv_right_3_0= ruleImpliesExpression ) ) )* ) ;
+    // InternalExport.g:1874:1: ruleAndExpression returns [EObject current=null] : (this_ImpliesExpression_0= ruleImpliesExpression ( () ( (lv_operator_2_0= '&&' ) ) ( (lv_right_3_0= ruleImpliesExpression ) ) )* ) ;
     public final EObject ruleAndExpression() throws RecognitionException {
         EObject current = null;
 
@@ -5260,18 +5260,18 @@ public final EObject ruleAndExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1877:28: ( (this_ImpliesExpression_0= ruleImpliesExpression ( () ( (lv_operator_2_0= '&&' ) ) ( (lv_right_3_0= ruleImpliesExpression ) ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1878:1: (this_ImpliesExpression_0= ruleImpliesExpression ( () ( (lv_operator_2_0= '&&' ) ) ( (lv_right_3_0= ruleImpliesExpression ) ) )* )
+            // InternalExport.g:1877:28: ( (this_ImpliesExpression_0= ruleImpliesExpression ( () ( (lv_operator_2_0= '&&' ) ) ( (lv_right_3_0= ruleImpliesExpression ) ) )* ) )
+            // InternalExport.g:1878:1: (this_ImpliesExpression_0= ruleImpliesExpression ( () ( (lv_operator_2_0= '&&' ) ) ( (lv_right_3_0= ruleImpliesExpression ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1878:1: (this_ImpliesExpression_0= ruleImpliesExpression ( () ( (lv_operator_2_0= '&&' ) ) ( (lv_right_3_0= ruleImpliesExpression ) ) )* )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1879:5: this_ImpliesExpression_0= ruleImpliesExpression ( () ( (lv_operator_2_0= '&&' ) ) ( (lv_right_3_0= ruleImpliesExpression ) ) )*
+            // InternalExport.g:1878:1: (this_ImpliesExpression_0= ruleImpliesExpression ( () ( (lv_operator_2_0= '&&' ) ) ( (lv_right_3_0= ruleImpliesExpression ) ) )* )
+            // InternalExport.g:1879:5: this_ImpliesExpression_0= ruleImpliesExpression ( () ( (lv_operator_2_0= '&&' ) ) ( (lv_right_3_0= ruleImpliesExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getAndExpressionAccess().getImpliesExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleImpliesExpression_in_ruleAndExpression4177);
+            pushFollow(FOLLOW_50);
             this_ImpliesExpression_0=ruleImpliesExpression();
 
             state._fsp--;
@@ -5282,7 +5282,7 @@ public final EObject ruleAndExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1887:1: ( () ( (lv_operator_2_0= '&&' ) ) ( (lv_right_3_0= ruleImpliesExpression ) ) )*
+            // InternalExport.g:1887:1: ( () ( (lv_operator_2_0= '&&' ) ) ( (lv_right_3_0= ruleImpliesExpression ) ) )*
             loop38:
             do {
                 int alt38=2;
@@ -5295,10 +5295,10 @@ public final EObject ruleAndExpression() throws RecognitionException {
 
                 switch (alt38) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1887:2: () ( (lv_operator_2_0= '&&' ) ) ( (lv_right_3_0= ruleImpliesExpression ) )
+            	    // InternalExport.g:1887:2: () ( (lv_operator_2_0= '&&' ) ) ( (lv_right_3_0= ruleImpliesExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1887:2: ()
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1888:5: 
+            	    // InternalExport.g:1887:2: ()
+            	    // InternalExport.g:1888:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -5310,13 +5310,13 @@ public final EObject ruleAndExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1893:2: ( (lv_operator_2_0= '&&' ) )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1894:1: (lv_operator_2_0= '&&' )
+            	    // InternalExport.g:1893:2: ( (lv_operator_2_0= '&&' ) )
+            	    // InternalExport.g:1894:1: (lv_operator_2_0= '&&' )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1894:1: (lv_operator_2_0= '&&' )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1895:3: lv_operator_2_0= '&&'
+            	    // InternalExport.g:1894:1: (lv_operator_2_0= '&&' )
+            	    // InternalExport.g:1895:3: lv_operator_2_0= '&&'
             	    {
-            	    lv_operator_2_0=(Token)match(input,51,FOLLOW_51_in_ruleAndExpression4204); if (state.failed) return current;
+            	    lv_operator_2_0=(Token)match(input,51,FOLLOW_46); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	              newLeafNode(lv_operator_2_0, grammarAccess.getAndExpressionAccess().getOperatorAmpersandAmpersandKeyword_1_1_0());
@@ -5336,18 +5336,18 @@ public final EObject ruleAndExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1908:2: ( (lv_right_3_0= ruleImpliesExpression ) )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1909:1: (lv_right_3_0= ruleImpliesExpression )
+            	    // InternalExport.g:1908:2: ( (lv_right_3_0= ruleImpliesExpression ) )
+            	    // InternalExport.g:1909:1: (lv_right_3_0= ruleImpliesExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1909:1: (lv_right_3_0= ruleImpliesExpression )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1910:3: lv_right_3_0= ruleImpliesExpression
+            	    // InternalExport.g:1909:1: (lv_right_3_0= ruleImpliesExpression )
+            	    // InternalExport.g:1910:3: lv_right_3_0= ruleImpliesExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getAndExpressionAccess().getRightImpliesExpressionParserRuleCall_1_2_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleImpliesExpression_in_ruleAndExpression4238);
+            	    pushFollow(FOLLOW_50);
             	    lv_right_3_0=ruleImpliesExpression();
 
             	    state._fsp--;
@@ -5361,7 +5361,7 @@ public final EObject ruleAndExpression() throws RecognitionException {
             	             			current, 
             	             			"right",
             	              		lv_right_3_0, 
-            	              		"ImpliesExpression");
+            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.ImpliesExpression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -5403,7 +5403,7 @@ public final EObject ruleAndExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleImpliesExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1934:1: entryRuleImpliesExpression returns [EObject current=null] : iv_ruleImpliesExpression= ruleImpliesExpression EOF ;
+    // InternalExport.g:1934:1: entryRuleImpliesExpression returns [EObject current=null] : iv_ruleImpliesExpression= ruleImpliesExpression EOF ;
     public final EObject entryRuleImpliesExpression() throws RecognitionException {
         EObject current = null;
 
@@ -5411,13 +5411,13 @@ public final EObject entryRuleImpliesExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1935:2: (iv_ruleImpliesExpression= ruleImpliesExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1936:2: iv_ruleImpliesExpression= ruleImpliesExpression EOF
+            // InternalExport.g:1935:2: (iv_ruleImpliesExpression= ruleImpliesExpression EOF )
+            // InternalExport.g:1936:2: iv_ruleImpliesExpression= ruleImpliesExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getImpliesExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleImpliesExpression_in_entryRuleImpliesExpression4276);
+            pushFollow(FOLLOW_1);
             iv_ruleImpliesExpression=ruleImpliesExpression();
 
             state._fsp--;
@@ -5425,7 +5425,7 @@ public final EObject entryRuleImpliesExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleImpliesExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleImpliesExpression4286); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -5443,7 +5443,7 @@ public final EObject entryRuleImpliesExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleImpliesExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1943:1: ruleImpliesExpression returns [EObject current=null] : (this_RelationalExpression_0= ruleRelationalExpression ( () ( (lv_operator_2_0= 'implies' ) ) ( (lv_right_3_0= ruleRelationalExpression ) ) )* ) ;
+    // InternalExport.g:1943:1: ruleImpliesExpression returns [EObject current=null] : (this_RelationalExpression_0= ruleRelationalExpression ( () ( (lv_operator_2_0= 'implies' ) ) ( (lv_right_3_0= ruleRelationalExpression ) ) )* ) ;
     public final EObject ruleImpliesExpression() throws RecognitionException {
         EObject current = null;
 
@@ -5456,18 +5456,18 @@ public final EObject ruleImpliesExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1946:28: ( (this_RelationalExpression_0= ruleRelationalExpression ( () ( (lv_operator_2_0= 'implies' ) ) ( (lv_right_3_0= ruleRelationalExpression ) ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1947:1: (this_RelationalExpression_0= ruleRelationalExpression ( () ( (lv_operator_2_0= 'implies' ) ) ( (lv_right_3_0= ruleRelationalExpression ) ) )* )
+            // InternalExport.g:1946:28: ( (this_RelationalExpression_0= ruleRelationalExpression ( () ( (lv_operator_2_0= 'implies' ) ) ( (lv_right_3_0= ruleRelationalExpression ) ) )* ) )
+            // InternalExport.g:1947:1: (this_RelationalExpression_0= ruleRelationalExpression ( () ( (lv_operator_2_0= 'implies' ) ) ( (lv_right_3_0= ruleRelationalExpression ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1947:1: (this_RelationalExpression_0= ruleRelationalExpression ( () ( (lv_operator_2_0= 'implies' ) ) ( (lv_right_3_0= ruleRelationalExpression ) ) )* )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1948:5: this_RelationalExpression_0= ruleRelationalExpression ( () ( (lv_operator_2_0= 'implies' ) ) ( (lv_right_3_0= ruleRelationalExpression ) ) )*
+            // InternalExport.g:1947:1: (this_RelationalExpression_0= ruleRelationalExpression ( () ( (lv_operator_2_0= 'implies' ) ) ( (lv_right_3_0= ruleRelationalExpression ) ) )* )
+            // InternalExport.g:1948:5: this_RelationalExpression_0= ruleRelationalExpression ( () ( (lv_operator_2_0= 'implies' ) ) ( (lv_right_3_0= ruleRelationalExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getImpliesExpressionAccess().getRelationalExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleRelationalExpression_in_ruleImpliesExpression4333);
+            pushFollow(FOLLOW_51);
             this_RelationalExpression_0=ruleRelationalExpression();
 
             state._fsp--;
@@ -5478,7 +5478,7 @@ public final EObject ruleImpliesExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1956:1: ( () ( (lv_operator_2_0= 'implies' ) ) ( (lv_right_3_0= ruleRelationalExpression ) ) )*
+            // InternalExport.g:1956:1: ( () ( (lv_operator_2_0= 'implies' ) ) ( (lv_right_3_0= ruleRelationalExpression ) ) )*
             loop39:
             do {
                 int alt39=2;
@@ -5491,10 +5491,10 @@ public final EObject ruleImpliesExpression() throws RecognitionException {
 
                 switch (alt39) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1956:2: () ( (lv_operator_2_0= 'implies' ) ) ( (lv_right_3_0= ruleRelationalExpression ) )
+            	    // InternalExport.g:1956:2: () ( (lv_operator_2_0= 'implies' ) ) ( (lv_right_3_0= ruleRelationalExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1956:2: ()
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1957:5: 
+            	    // InternalExport.g:1956:2: ()
+            	    // InternalExport.g:1957:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -5506,13 +5506,13 @@ public final EObject ruleImpliesExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1962:2: ( (lv_operator_2_0= 'implies' ) )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1963:1: (lv_operator_2_0= 'implies' )
+            	    // InternalExport.g:1962:2: ( (lv_operator_2_0= 'implies' ) )
+            	    // InternalExport.g:1963:1: (lv_operator_2_0= 'implies' )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1963:1: (lv_operator_2_0= 'implies' )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1964:3: lv_operator_2_0= 'implies'
+            	    // InternalExport.g:1963:1: (lv_operator_2_0= 'implies' )
+            	    // InternalExport.g:1964:3: lv_operator_2_0= 'implies'
             	    {
-            	    lv_operator_2_0=(Token)match(input,52,FOLLOW_52_in_ruleImpliesExpression4360); if (state.failed) return current;
+            	    lv_operator_2_0=(Token)match(input,52,FOLLOW_46); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	              newLeafNode(lv_operator_2_0, grammarAccess.getImpliesExpressionAccess().getOperatorImpliesKeyword_1_1_0());
@@ -5532,18 +5532,18 @@ public final EObject ruleImpliesExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1977:2: ( (lv_right_3_0= ruleRelationalExpression ) )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1978:1: (lv_right_3_0= ruleRelationalExpression )
+            	    // InternalExport.g:1977:2: ( (lv_right_3_0= ruleRelationalExpression ) )
+            	    // InternalExport.g:1978:1: (lv_right_3_0= ruleRelationalExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1978:1: (lv_right_3_0= ruleRelationalExpression )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1979:3: lv_right_3_0= ruleRelationalExpression
+            	    // InternalExport.g:1978:1: (lv_right_3_0= ruleRelationalExpression )
+            	    // InternalExport.g:1979:3: lv_right_3_0= ruleRelationalExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getImpliesExpressionAccess().getRightRelationalExpressionParserRuleCall_1_2_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleRelationalExpression_in_ruleImpliesExpression4394);
+            	    pushFollow(FOLLOW_51);
             	    lv_right_3_0=ruleRelationalExpression();
 
             	    state._fsp--;
@@ -5557,7 +5557,7 @@ public final EObject ruleImpliesExpression() throws RecognitionException {
             	             			current, 
             	             			"right",
             	              		lv_right_3_0, 
-            	              		"RelationalExpression");
+            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.RelationalExpression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -5599,7 +5599,7 @@ public final EObject ruleImpliesExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleRelationalExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2003:1: entryRuleRelationalExpression returns [EObject current=null] : iv_ruleRelationalExpression= ruleRelationalExpression EOF ;
+    // InternalExport.g:2003:1: entryRuleRelationalExpression returns [EObject current=null] : iv_ruleRelationalExpression= ruleRelationalExpression EOF ;
     public final EObject entryRuleRelationalExpression() throws RecognitionException {
         EObject current = null;
 
@@ -5607,13 +5607,13 @@ public final EObject entryRuleRelationalExpression() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2004:2: (iv_ruleRelationalExpression= ruleRelationalExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2005:2: iv_ruleRelationalExpression= ruleRelationalExpression EOF
+            // InternalExport.g:2004:2: (iv_ruleRelationalExpression= ruleRelationalExpression EOF )
+            // InternalExport.g:2005:2: iv_ruleRelationalExpression= ruleRelationalExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getRelationalExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleRelationalExpression_in_entryRuleRelationalExpression4432);
+            pushFollow(FOLLOW_1);
             iv_ruleRelationalExpression=ruleRelationalExpression();
 
             state._fsp--;
@@ -5621,7 +5621,7 @@ public final EObject entryRuleRelationalExpression() throws RecognitionException
             if ( state.backtracking==0 ) {
                current =iv_ruleRelationalExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRelationalExpression4442); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -5639,7 +5639,7 @@ public final EObject entryRuleRelationalExpression() throws RecognitionException
 
 
     // $ANTLR start "ruleRelationalExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2012:1: ruleRelationalExpression returns [EObject current=null] : (this_AdditiveExpression_0= ruleAdditiveExpression ( () ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) ) ( (lv_right_3_0= ruleAdditiveExpression ) ) )* ) ;
+    // InternalExport.g:2012:1: ruleRelationalExpression returns [EObject current=null] : (this_AdditiveExpression_0= ruleAdditiveExpression ( () ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) ) ( (lv_right_3_0= ruleAdditiveExpression ) ) )* ) ;
     public final EObject ruleRelationalExpression() throws RecognitionException {
         EObject current = null;
 
@@ -5657,18 +5657,18 @@ public final EObject ruleRelationalExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2015:28: ( (this_AdditiveExpression_0= ruleAdditiveExpression ( () ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) ) ( (lv_right_3_0= ruleAdditiveExpression ) ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2016:1: (this_AdditiveExpression_0= ruleAdditiveExpression ( () ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) ) ( (lv_right_3_0= ruleAdditiveExpression ) ) )* )
+            // InternalExport.g:2015:28: ( (this_AdditiveExpression_0= ruleAdditiveExpression ( () ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) ) ( (lv_right_3_0= ruleAdditiveExpression ) ) )* ) )
+            // InternalExport.g:2016:1: (this_AdditiveExpression_0= ruleAdditiveExpression ( () ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) ) ( (lv_right_3_0= ruleAdditiveExpression ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2016:1: (this_AdditiveExpression_0= ruleAdditiveExpression ( () ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) ) ( (lv_right_3_0= ruleAdditiveExpression ) ) )* )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2017:5: this_AdditiveExpression_0= ruleAdditiveExpression ( () ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) ) ( (lv_right_3_0= ruleAdditiveExpression ) ) )*
+            // InternalExport.g:2016:1: (this_AdditiveExpression_0= ruleAdditiveExpression ( () ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) ) ( (lv_right_3_0= ruleAdditiveExpression ) ) )* )
+            // InternalExport.g:2017:5: this_AdditiveExpression_0= ruleAdditiveExpression ( () ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) ) ( (lv_right_3_0= ruleAdditiveExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getRelationalExpressionAccess().getAdditiveExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleAdditiveExpression_in_ruleRelationalExpression4489);
+            pushFollow(FOLLOW_52);
             this_AdditiveExpression_0=ruleAdditiveExpression();
 
             state._fsp--;
@@ -5679,7 +5679,7 @@ public final EObject ruleRelationalExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2025:1: ( () ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) ) ( (lv_right_3_0= ruleAdditiveExpression ) ) )*
+            // InternalExport.g:2025:1: ( () ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) ) ( (lv_right_3_0= ruleAdditiveExpression ) ) )*
             loop41:
             do {
                 int alt41=2;
@@ -5692,10 +5692,10 @@ public final EObject ruleRelationalExpression() throws RecognitionException {
 
                 switch (alt41) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2025:2: () ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) ) ( (lv_right_3_0= ruleAdditiveExpression ) )
+            	    // InternalExport.g:2025:2: () ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) ) ( (lv_right_3_0= ruleAdditiveExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2025:2: ()
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2026:5: 
+            	    // InternalExport.g:2025:2: ()
+            	    // InternalExport.g:2026:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -5707,13 +5707,13 @@ public final EObject ruleRelationalExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2031:2: ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2032:1: ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) )
+            	    // InternalExport.g:2031:2: ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) )
+            	    // InternalExport.g:2032:1: ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2032:1: ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2033:1: (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' )
+            	    // InternalExport.g:2032:1: ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) )
+            	    // InternalExport.g:2033:1: (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2033:1: (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' )
+            	    // InternalExport.g:2033:1: (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' )
             	    int alt40=6;
             	    switch ( input.LA(1) ) {
             	    case 53:
@@ -5756,9 +5756,9 @@ public final EObject ruleRelationalExpression() throws RecognitionException {
 
             	    switch (alt40) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2034:3: lv_operator_2_1= '=='
+            	            // InternalExport.g:2034:3: lv_operator_2_1= '=='
             	            {
-            	            lv_operator_2_1=(Token)match(input,53,FOLLOW_53_in_ruleRelationalExpression4518); if (state.failed) return current;
+            	            lv_operator_2_1=(Token)match(input,53,FOLLOW_46); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_operator_2_1, grammarAccess.getRelationalExpressionAccess().getOperatorEqualsSignEqualsSignKeyword_1_1_0_0());
@@ -5776,9 +5776,9 @@ public final EObject ruleRelationalExpression() throws RecognitionException {
             	            }
             	            break;
             	        case 2 :
-            	            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2046:8: lv_operator_2_2= '!='
+            	            // InternalExport.g:2046:8: lv_operator_2_2= '!='
             	            {
-            	            lv_operator_2_2=(Token)match(input,54,FOLLOW_54_in_ruleRelationalExpression4547); if (state.failed) return current;
+            	            lv_operator_2_2=(Token)match(input,54,FOLLOW_46); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_operator_2_2, grammarAccess.getRelationalExpressionAccess().getOperatorExclamationMarkEqualsSignKeyword_1_1_0_1());
@@ -5796,9 +5796,9 @@ public final EObject ruleRelationalExpression() throws RecognitionException {
             	            }
             	            break;
             	        case 3 :
-            	            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2058:8: lv_operator_2_3= '>='
+            	            // InternalExport.g:2058:8: lv_operator_2_3= '>='
             	            {
-            	            lv_operator_2_3=(Token)match(input,55,FOLLOW_55_in_ruleRelationalExpression4576); if (state.failed) return current;
+            	            lv_operator_2_3=(Token)match(input,55,FOLLOW_46); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_operator_2_3, grammarAccess.getRelationalExpressionAccess().getOperatorGreaterThanSignEqualsSignKeyword_1_1_0_2());
@@ -5816,9 +5816,9 @@ public final EObject ruleRelationalExpression() throws RecognitionException {
             	            }
             	            break;
             	        case 4 :
-            	            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2070:8: lv_operator_2_4= '<='
+            	            // InternalExport.g:2070:8: lv_operator_2_4= '<='
             	            {
-            	            lv_operator_2_4=(Token)match(input,56,FOLLOW_56_in_ruleRelationalExpression4605); if (state.failed) return current;
+            	            lv_operator_2_4=(Token)match(input,56,FOLLOW_46); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_operator_2_4, grammarAccess.getRelationalExpressionAccess().getOperatorLessThanSignEqualsSignKeyword_1_1_0_3());
@@ -5836,9 +5836,9 @@ public final EObject ruleRelationalExpression() throws RecognitionException {
             	            }
             	            break;
             	        case 5 :
-            	            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2082:8: lv_operator_2_5= '>'
+            	            // InternalExport.g:2082:8: lv_operator_2_5= '>'
             	            {
-            	            lv_operator_2_5=(Token)match(input,57,FOLLOW_57_in_ruleRelationalExpression4634); if (state.failed) return current;
+            	            lv_operator_2_5=(Token)match(input,57,FOLLOW_46); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_operator_2_5, grammarAccess.getRelationalExpressionAccess().getOperatorGreaterThanSignKeyword_1_1_0_4());
@@ -5856,9 +5856,9 @@ public final EObject ruleRelationalExpression() throws RecognitionException {
             	            }
             	            break;
             	        case 6 :
-            	            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2094:8: lv_operator_2_6= '<'
+            	            // InternalExport.g:2094:8: lv_operator_2_6= '<'
             	            {
-            	            lv_operator_2_6=(Token)match(input,58,FOLLOW_58_in_ruleRelationalExpression4663); if (state.failed) return current;
+            	            lv_operator_2_6=(Token)match(input,58,FOLLOW_46); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_operator_2_6, grammarAccess.getRelationalExpressionAccess().getOperatorLessThanSignKeyword_1_1_0_5());
@@ -5884,18 +5884,18 @@ public final EObject ruleRelationalExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2109:2: ( (lv_right_3_0= ruleAdditiveExpression ) )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2110:1: (lv_right_3_0= ruleAdditiveExpression )
+            	    // InternalExport.g:2109:2: ( (lv_right_3_0= ruleAdditiveExpression ) )
+            	    // InternalExport.g:2110:1: (lv_right_3_0= ruleAdditiveExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2110:1: (lv_right_3_0= ruleAdditiveExpression )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2111:3: lv_right_3_0= ruleAdditiveExpression
+            	    // InternalExport.g:2110:1: (lv_right_3_0= ruleAdditiveExpression )
+            	    // InternalExport.g:2111:3: lv_right_3_0= ruleAdditiveExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getRelationalExpressionAccess().getRightAdditiveExpressionParserRuleCall_1_2_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleAdditiveExpression_in_ruleRelationalExpression4700);
+            	    pushFollow(FOLLOW_52);
             	    lv_right_3_0=ruleAdditiveExpression();
 
             	    state._fsp--;
@@ -5909,7 +5909,7 @@ public final EObject ruleRelationalExpression() throws RecognitionException {
             	             			current, 
             	             			"right",
             	              		lv_right_3_0, 
-            	              		"AdditiveExpression");
+            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.AdditiveExpression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -5951,7 +5951,7 @@ public final EObject ruleRelationalExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleAdditiveExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2135:1: entryRuleAdditiveExpression returns [EObject current=null] : iv_ruleAdditiveExpression= ruleAdditiveExpression EOF ;
+    // InternalExport.g:2135:1: entryRuleAdditiveExpression returns [EObject current=null] : iv_ruleAdditiveExpression= ruleAdditiveExpression EOF ;
     public final EObject entryRuleAdditiveExpression() throws RecognitionException {
         EObject current = null;
 
@@ -5959,13 +5959,13 @@ public final EObject entryRuleAdditiveExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2136:2: (iv_ruleAdditiveExpression= ruleAdditiveExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2137:2: iv_ruleAdditiveExpression= ruleAdditiveExpression EOF
+            // InternalExport.g:2136:2: (iv_ruleAdditiveExpression= ruleAdditiveExpression EOF )
+            // InternalExport.g:2137:2: iv_ruleAdditiveExpression= ruleAdditiveExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getAdditiveExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleAdditiveExpression_in_entryRuleAdditiveExpression4738);
+            pushFollow(FOLLOW_1);
             iv_ruleAdditiveExpression=ruleAdditiveExpression();
 
             state._fsp--;
@@ -5973,7 +5973,7 @@ public final EObject entryRuleAdditiveExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleAdditiveExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAdditiveExpression4748); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -5991,7 +5991,7 @@ public final EObject entryRuleAdditiveExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleAdditiveExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2144:1: ruleAdditiveExpression returns [EObject current=null] : (this_MultiplicativeExpression_0= ruleMultiplicativeExpression ( () ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) ) ( (lv_params_3_0= ruleMultiplicativeExpression ) ) )* ) ;
+    // InternalExport.g:2144:1: ruleAdditiveExpression returns [EObject current=null] : (this_MultiplicativeExpression_0= ruleMultiplicativeExpression ( () ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) ) ( (lv_params_3_0= ruleMultiplicativeExpression ) ) )* ) ;
     public final EObject ruleAdditiveExpression() throws RecognitionException {
         EObject current = null;
 
@@ -6005,18 +6005,18 @@ public final EObject ruleAdditiveExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2147:28: ( (this_MultiplicativeExpression_0= ruleMultiplicativeExpression ( () ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) ) ( (lv_params_3_0= ruleMultiplicativeExpression ) ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2148:1: (this_MultiplicativeExpression_0= ruleMultiplicativeExpression ( () ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) ) ( (lv_params_3_0= ruleMultiplicativeExpression ) ) )* )
+            // InternalExport.g:2147:28: ( (this_MultiplicativeExpression_0= ruleMultiplicativeExpression ( () ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) ) ( (lv_params_3_0= ruleMultiplicativeExpression ) ) )* ) )
+            // InternalExport.g:2148:1: (this_MultiplicativeExpression_0= ruleMultiplicativeExpression ( () ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) ) ( (lv_params_3_0= ruleMultiplicativeExpression ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2148:1: (this_MultiplicativeExpression_0= ruleMultiplicativeExpression ( () ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) ) ( (lv_params_3_0= ruleMultiplicativeExpression ) ) )* )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2149:5: this_MultiplicativeExpression_0= ruleMultiplicativeExpression ( () ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) ) ( (lv_params_3_0= ruleMultiplicativeExpression ) ) )*
+            // InternalExport.g:2148:1: (this_MultiplicativeExpression_0= ruleMultiplicativeExpression ( () ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) ) ( (lv_params_3_0= ruleMultiplicativeExpression ) ) )* )
+            // InternalExport.g:2149:5: this_MultiplicativeExpression_0= ruleMultiplicativeExpression ( () ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) ) ( (lv_params_3_0= ruleMultiplicativeExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getAdditiveExpressionAccess().getMultiplicativeExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleMultiplicativeExpression_in_ruleAdditiveExpression4795);
+            pushFollow(FOLLOW_53);
             this_MultiplicativeExpression_0=ruleMultiplicativeExpression();
 
             state._fsp--;
@@ -6027,7 +6027,7 @@ public final EObject ruleAdditiveExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2157:1: ( () ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) ) ( (lv_params_3_0= ruleMultiplicativeExpression ) ) )*
+            // InternalExport.g:2157:1: ( () ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) ) ( (lv_params_3_0= ruleMultiplicativeExpression ) ) )*
             loop43:
             do {
                 int alt43=2;
@@ -6040,10 +6040,10 @@ public final EObject ruleAdditiveExpression() throws RecognitionException {
 
                 switch (alt43) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2157:2: () ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) ) ( (lv_params_3_0= ruleMultiplicativeExpression ) )
+            	    // InternalExport.g:2157:2: () ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) ) ( (lv_params_3_0= ruleMultiplicativeExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2157:2: ()
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2158:5: 
+            	    // InternalExport.g:2157:2: ()
+            	    // InternalExport.g:2158:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -6055,13 +6055,13 @@ public final EObject ruleAdditiveExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2163:2: ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2164:1: ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) )
+            	    // InternalExport.g:2163:2: ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) )
+            	    // InternalExport.g:2164:1: ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2164:1: ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2165:1: (lv_name_2_1= '+' | lv_name_2_2= '-' )
+            	    // InternalExport.g:2164:1: ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) )
+            	    // InternalExport.g:2165:1: (lv_name_2_1= '+' | lv_name_2_2= '-' )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2165:1: (lv_name_2_1= '+' | lv_name_2_2= '-' )
+            	    // InternalExport.g:2165:1: (lv_name_2_1= '+' | lv_name_2_2= '-' )
             	    int alt42=2;
             	    int LA42_0 = input.LA(1);
 
@@ -6080,9 +6080,9 @@ else if ( (LA42_0==59) ) {
             	    }
             	    switch (alt42) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2166:3: lv_name_2_1= '+'
+            	            // InternalExport.g:2166:3: lv_name_2_1= '+'
             	            {
-            	            lv_name_2_1=(Token)match(input,25,FOLLOW_25_in_ruleAdditiveExpression4824); if (state.failed) return current;
+            	            lv_name_2_1=(Token)match(input,25,FOLLOW_46); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_name_2_1, grammarAccess.getAdditiveExpressionAccess().getNamePlusSignKeyword_1_1_0_0());
@@ -6100,9 +6100,9 @@ else if ( (LA42_0==59) ) {
             	            }
             	            break;
             	        case 2 :
-            	            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2178:8: lv_name_2_2= '-'
+            	            // InternalExport.g:2178:8: lv_name_2_2= '-'
             	            {
-            	            lv_name_2_2=(Token)match(input,59,FOLLOW_59_in_ruleAdditiveExpression4853); if (state.failed) return current;
+            	            lv_name_2_2=(Token)match(input,59,FOLLOW_46); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_name_2_2, grammarAccess.getAdditiveExpressionAccess().getNameHyphenMinusKeyword_1_1_0_1());
@@ -6128,18 +6128,18 @@ else if ( (LA42_0==59) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2193:2: ( (lv_params_3_0= ruleMultiplicativeExpression ) )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2194:1: (lv_params_3_0= ruleMultiplicativeExpression )
+            	    // InternalExport.g:2193:2: ( (lv_params_3_0= ruleMultiplicativeExpression ) )
+            	    // InternalExport.g:2194:1: (lv_params_3_0= ruleMultiplicativeExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2194:1: (lv_params_3_0= ruleMultiplicativeExpression )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2195:3: lv_params_3_0= ruleMultiplicativeExpression
+            	    // InternalExport.g:2194:1: (lv_params_3_0= ruleMultiplicativeExpression )
+            	    // InternalExport.g:2195:3: lv_params_3_0= ruleMultiplicativeExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getAdditiveExpressionAccess().getParamsMultiplicativeExpressionParserRuleCall_1_2_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleMultiplicativeExpression_in_ruleAdditiveExpression4890);
+            	    pushFollow(FOLLOW_53);
             	    lv_params_3_0=ruleMultiplicativeExpression();
 
             	    state._fsp--;
@@ -6153,7 +6153,7 @@ else if ( (LA42_0==59) ) {
             	             			current, 
             	             			"params",
             	              		lv_params_3_0, 
-            	              		"MultiplicativeExpression");
+            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.MultiplicativeExpression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -6195,7 +6195,7 @@ else if ( (LA42_0==59) ) {
 
 
     // $ANTLR start "entryRuleMultiplicativeExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2219:1: entryRuleMultiplicativeExpression returns [EObject current=null] : iv_ruleMultiplicativeExpression= ruleMultiplicativeExpression EOF ;
+    // InternalExport.g:2219:1: entryRuleMultiplicativeExpression returns [EObject current=null] : iv_ruleMultiplicativeExpression= ruleMultiplicativeExpression EOF ;
     public final EObject entryRuleMultiplicativeExpression() throws RecognitionException {
         EObject current = null;
 
@@ -6203,13 +6203,13 @@ public final EObject entryRuleMultiplicativeExpression() throws RecognitionExcep
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2220:2: (iv_ruleMultiplicativeExpression= ruleMultiplicativeExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2221:2: iv_ruleMultiplicativeExpression= ruleMultiplicativeExpression EOF
+            // InternalExport.g:2220:2: (iv_ruleMultiplicativeExpression= ruleMultiplicativeExpression EOF )
+            // InternalExport.g:2221:2: iv_ruleMultiplicativeExpression= ruleMultiplicativeExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getMultiplicativeExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleMultiplicativeExpression_in_entryRuleMultiplicativeExpression4928);
+            pushFollow(FOLLOW_1);
             iv_ruleMultiplicativeExpression=ruleMultiplicativeExpression();
 
             state._fsp--;
@@ -6217,7 +6217,7 @@ public final EObject entryRuleMultiplicativeExpression() throws RecognitionExcep
             if ( state.backtracking==0 ) {
                current =iv_ruleMultiplicativeExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleMultiplicativeExpression4938); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -6235,7 +6235,7 @@ public final EObject entryRuleMultiplicativeExpression() throws RecognitionExcep
 
 
     // $ANTLR start "ruleMultiplicativeExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2228:1: ruleMultiplicativeExpression returns [EObject current=null] : (this_UnaryOrInfixExpression_0= ruleUnaryOrInfixExpression ( () ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) ) ( (lv_params_3_0= ruleUnaryOrInfixExpression ) ) )* ) ;
+    // InternalExport.g:2228:1: ruleMultiplicativeExpression returns [EObject current=null] : (this_UnaryOrInfixExpression_0= ruleUnaryOrInfixExpression ( () ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) ) ( (lv_params_3_0= ruleUnaryOrInfixExpression ) ) )* ) ;
     public final EObject ruleMultiplicativeExpression() throws RecognitionException {
         EObject current = null;
 
@@ -6249,18 +6249,18 @@ public final EObject ruleMultiplicativeExpression() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2231:28: ( (this_UnaryOrInfixExpression_0= ruleUnaryOrInfixExpression ( () ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) ) ( (lv_params_3_0= ruleUnaryOrInfixExpression ) ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2232:1: (this_UnaryOrInfixExpression_0= ruleUnaryOrInfixExpression ( () ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) ) ( (lv_params_3_0= ruleUnaryOrInfixExpression ) ) )* )
+            // InternalExport.g:2231:28: ( (this_UnaryOrInfixExpression_0= ruleUnaryOrInfixExpression ( () ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) ) ( (lv_params_3_0= ruleUnaryOrInfixExpression ) ) )* ) )
+            // InternalExport.g:2232:1: (this_UnaryOrInfixExpression_0= ruleUnaryOrInfixExpression ( () ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) ) ( (lv_params_3_0= ruleUnaryOrInfixExpression ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2232:1: (this_UnaryOrInfixExpression_0= ruleUnaryOrInfixExpression ( () ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) ) ( (lv_params_3_0= ruleUnaryOrInfixExpression ) ) )* )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2233:5: this_UnaryOrInfixExpression_0= ruleUnaryOrInfixExpression ( () ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) ) ( (lv_params_3_0= ruleUnaryOrInfixExpression ) ) )*
+            // InternalExport.g:2232:1: (this_UnaryOrInfixExpression_0= ruleUnaryOrInfixExpression ( () ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) ) ( (lv_params_3_0= ruleUnaryOrInfixExpression ) ) )* )
+            // InternalExport.g:2233:5: this_UnaryOrInfixExpression_0= ruleUnaryOrInfixExpression ( () ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) ) ( (lv_params_3_0= ruleUnaryOrInfixExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getMultiplicativeExpressionAccess().getUnaryOrInfixExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleUnaryOrInfixExpression_in_ruleMultiplicativeExpression4985);
+            pushFollow(FOLLOW_54);
             this_UnaryOrInfixExpression_0=ruleUnaryOrInfixExpression();
 
             state._fsp--;
@@ -6271,7 +6271,7 @@ public final EObject ruleMultiplicativeExpression() throws RecognitionException
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2241:1: ( () ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) ) ( (lv_params_3_0= ruleUnaryOrInfixExpression ) ) )*
+            // InternalExport.g:2241:1: ( () ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) ) ( (lv_params_3_0= ruleUnaryOrInfixExpression ) ) )*
             loop45:
             do {
                 int alt45=2;
@@ -6284,10 +6284,10 @@ public final EObject ruleMultiplicativeExpression() throws RecognitionException
 
                 switch (alt45) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2241:2: () ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) ) ( (lv_params_3_0= ruleUnaryOrInfixExpression ) )
+            	    // InternalExport.g:2241:2: () ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) ) ( (lv_params_3_0= ruleUnaryOrInfixExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2241:2: ()
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2242:5: 
+            	    // InternalExport.g:2241:2: ()
+            	    // InternalExport.g:2242:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -6299,13 +6299,13 @@ public final EObject ruleMultiplicativeExpression() throws RecognitionException
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2247:2: ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2248:1: ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) )
+            	    // InternalExport.g:2247:2: ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) )
+            	    // InternalExport.g:2248:1: ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2248:1: ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2249:1: (lv_name_2_1= '*' | lv_name_2_2= '/' )
+            	    // InternalExport.g:2248:1: ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) )
+            	    // InternalExport.g:2249:1: (lv_name_2_1= '*' | lv_name_2_2= '/' )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2249:1: (lv_name_2_1= '*' | lv_name_2_2= '/' )
+            	    // InternalExport.g:2249:1: (lv_name_2_1= '*' | lv_name_2_2= '/' )
             	    int alt44=2;
             	    int LA44_0 = input.LA(1);
 
@@ -6324,9 +6324,9 @@ else if ( (LA44_0==61) ) {
             	    }
             	    switch (alt44) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2250:3: lv_name_2_1= '*'
+            	            // InternalExport.g:2250:3: lv_name_2_1= '*'
             	            {
-            	            lv_name_2_1=(Token)match(input,60,FOLLOW_60_in_ruleMultiplicativeExpression5014); if (state.failed) return current;
+            	            lv_name_2_1=(Token)match(input,60,FOLLOW_46); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_name_2_1, grammarAccess.getMultiplicativeExpressionAccess().getNameAsteriskKeyword_1_1_0_0());
@@ -6344,9 +6344,9 @@ else if ( (LA44_0==61) ) {
             	            }
             	            break;
             	        case 2 :
-            	            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2262:8: lv_name_2_2= '/'
+            	            // InternalExport.g:2262:8: lv_name_2_2= '/'
             	            {
-            	            lv_name_2_2=(Token)match(input,61,FOLLOW_61_in_ruleMultiplicativeExpression5043); if (state.failed) return current;
+            	            lv_name_2_2=(Token)match(input,61,FOLLOW_46); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_name_2_2, grammarAccess.getMultiplicativeExpressionAccess().getNameSolidusKeyword_1_1_0_1());
@@ -6372,18 +6372,18 @@ else if ( (LA44_0==61) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2277:2: ( (lv_params_3_0= ruleUnaryOrInfixExpression ) )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2278:1: (lv_params_3_0= ruleUnaryOrInfixExpression )
+            	    // InternalExport.g:2277:2: ( (lv_params_3_0= ruleUnaryOrInfixExpression ) )
+            	    // InternalExport.g:2278:1: (lv_params_3_0= ruleUnaryOrInfixExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2278:1: (lv_params_3_0= ruleUnaryOrInfixExpression )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2279:3: lv_params_3_0= ruleUnaryOrInfixExpression
+            	    // InternalExport.g:2278:1: (lv_params_3_0= ruleUnaryOrInfixExpression )
+            	    // InternalExport.g:2279:3: lv_params_3_0= ruleUnaryOrInfixExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getMultiplicativeExpressionAccess().getParamsUnaryOrInfixExpressionParserRuleCall_1_2_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleUnaryOrInfixExpression_in_ruleMultiplicativeExpression5080);
+            	    pushFollow(FOLLOW_54);
             	    lv_params_3_0=ruleUnaryOrInfixExpression();
 
             	    state._fsp--;
@@ -6397,7 +6397,7 @@ else if ( (LA44_0==61) ) {
             	             			current, 
             	             			"params",
             	              		lv_params_3_0, 
-            	              		"UnaryOrInfixExpression");
+            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.UnaryOrInfixExpression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -6439,7 +6439,7 @@ else if ( (LA44_0==61) ) {
 
 
     // $ANTLR start "entryRuleUnaryOrInfixExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2303:1: entryRuleUnaryOrInfixExpression returns [EObject current=null] : iv_ruleUnaryOrInfixExpression= ruleUnaryOrInfixExpression EOF ;
+    // InternalExport.g:2303:1: entryRuleUnaryOrInfixExpression returns [EObject current=null] : iv_ruleUnaryOrInfixExpression= ruleUnaryOrInfixExpression EOF ;
     public final EObject entryRuleUnaryOrInfixExpression() throws RecognitionException {
         EObject current = null;
 
@@ -6447,13 +6447,13 @@ public final EObject entryRuleUnaryOrInfixExpression() throws RecognitionExcepti
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2304:2: (iv_ruleUnaryOrInfixExpression= ruleUnaryOrInfixExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2305:2: iv_ruleUnaryOrInfixExpression= ruleUnaryOrInfixExpression EOF
+            // InternalExport.g:2304:2: (iv_ruleUnaryOrInfixExpression= ruleUnaryOrInfixExpression EOF )
+            // InternalExport.g:2305:2: iv_ruleUnaryOrInfixExpression= ruleUnaryOrInfixExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getUnaryOrInfixExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleUnaryOrInfixExpression_in_entryRuleUnaryOrInfixExpression5118);
+            pushFollow(FOLLOW_1);
             iv_ruleUnaryOrInfixExpression=ruleUnaryOrInfixExpression();
 
             state._fsp--;
@@ -6461,7 +6461,7 @@ public final EObject entryRuleUnaryOrInfixExpression() throws RecognitionExcepti
             if ( state.backtracking==0 ) {
                current =iv_ruleUnaryOrInfixExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleUnaryOrInfixExpression5128); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -6479,7 +6479,7 @@ public final EObject entryRuleUnaryOrInfixExpression() throws RecognitionExcepti
 
 
     // $ANTLR start "ruleUnaryOrInfixExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2312:1: ruleUnaryOrInfixExpression returns [EObject current=null] : (this_UnaryExpression_0= ruleUnaryExpression | this_InfixExpression_1= ruleInfixExpression ) ;
+    // InternalExport.g:2312:1: ruleUnaryOrInfixExpression returns [EObject current=null] : (this_UnaryExpression_0= ruleUnaryExpression | this_InfixExpression_1= ruleInfixExpression ) ;
     public final EObject ruleUnaryOrInfixExpression() throws RecognitionException {
         EObject current = null;
 
@@ -6491,10 +6491,10 @@ public final EObject ruleUnaryOrInfixExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2315:28: ( (this_UnaryExpression_0= ruleUnaryExpression | this_InfixExpression_1= ruleInfixExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2316:1: (this_UnaryExpression_0= ruleUnaryExpression | this_InfixExpression_1= ruleInfixExpression )
+            // InternalExport.g:2315:28: ( (this_UnaryExpression_0= ruleUnaryExpression | this_InfixExpression_1= ruleInfixExpression ) )
+            // InternalExport.g:2316:1: (this_UnaryExpression_0= ruleUnaryExpression | this_InfixExpression_1= ruleInfixExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2316:1: (this_UnaryExpression_0= ruleUnaryExpression | this_InfixExpression_1= ruleInfixExpression )
+            // InternalExport.g:2316:1: (this_UnaryExpression_0= ruleUnaryExpression | this_InfixExpression_1= ruleInfixExpression )
             int alt46=2;
             int LA46_0 = input.LA(1);
 
@@ -6513,14 +6513,14 @@ else if ( ((LA46_0>=RULE_ID && LA46_0<=RULE_REAL)||LA46_0==16||LA46_0==28||(LA46
             }
             switch (alt46) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2317:5: this_UnaryExpression_0= ruleUnaryExpression
+                    // InternalExport.g:2317:5: this_UnaryExpression_0= ruleUnaryExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getUnaryOrInfixExpressionAccess().getUnaryExpressionParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleUnaryExpression_in_ruleUnaryOrInfixExpression5175);
+                    pushFollow(FOLLOW_2);
                     this_UnaryExpression_0=ruleUnaryExpression();
 
                     state._fsp--;
@@ -6535,14 +6535,14 @@ else if ( ((LA46_0>=RULE_ID && LA46_0<=RULE_REAL)||LA46_0==16||LA46_0==28||(LA46
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2327:5: this_InfixExpression_1= ruleInfixExpression
+                    // InternalExport.g:2327:5: this_InfixExpression_1= ruleInfixExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getUnaryOrInfixExpressionAccess().getInfixExpressionParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleInfixExpression_in_ruleUnaryOrInfixExpression5202);
+                    pushFollow(FOLLOW_2);
                     this_InfixExpression_1=ruleInfixExpression();
 
                     state._fsp--;
@@ -6579,7 +6579,7 @@ else if ( ((LA46_0>=RULE_ID && LA46_0<=RULE_REAL)||LA46_0==16||LA46_0==28||(LA46
 
 
     // $ANTLR start "entryRuleUnaryExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2343:1: entryRuleUnaryExpression returns [EObject current=null] : iv_ruleUnaryExpression= ruleUnaryExpression EOF ;
+    // InternalExport.g:2343:1: entryRuleUnaryExpression returns [EObject current=null] : iv_ruleUnaryExpression= ruleUnaryExpression EOF ;
     public final EObject entryRuleUnaryExpression() throws RecognitionException {
         EObject current = null;
 
@@ -6587,13 +6587,13 @@ public final EObject entryRuleUnaryExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2344:2: (iv_ruleUnaryExpression= ruleUnaryExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2345:2: iv_ruleUnaryExpression= ruleUnaryExpression EOF
+            // InternalExport.g:2344:2: (iv_ruleUnaryExpression= ruleUnaryExpression EOF )
+            // InternalExport.g:2345:2: iv_ruleUnaryExpression= ruleUnaryExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getUnaryExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleUnaryExpression_in_entryRuleUnaryExpression5237);
+            pushFollow(FOLLOW_1);
             iv_ruleUnaryExpression=ruleUnaryExpression();
 
             state._fsp--;
@@ -6601,7 +6601,7 @@ public final EObject entryRuleUnaryExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleUnaryExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleUnaryExpression5247); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -6619,7 +6619,7 @@ public final EObject entryRuleUnaryExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleUnaryExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2352:1: ruleUnaryExpression returns [EObject current=null] : ( ( ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) ) ) ( (lv_params_1_0= ruleInfixExpression ) ) ) ;
+    // InternalExport.g:2352:1: ruleUnaryExpression returns [EObject current=null] : ( ( ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) ) ) ( (lv_params_1_0= ruleInfixExpression ) ) ) ;
     public final EObject ruleUnaryExpression() throws RecognitionException {
         EObject current = null;
 
@@ -6631,19 +6631,19 @@ public final EObject ruleUnaryExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2355:28: ( ( ( ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) ) ) ( (lv_params_1_0= ruleInfixExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2356:1: ( ( ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) ) ) ( (lv_params_1_0= ruleInfixExpression ) ) )
+            // InternalExport.g:2355:28: ( ( ( ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) ) ) ( (lv_params_1_0= ruleInfixExpression ) ) ) )
+            // InternalExport.g:2356:1: ( ( ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) ) ) ( (lv_params_1_0= ruleInfixExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2356:1: ( ( ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) ) ) ( (lv_params_1_0= ruleInfixExpression ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2356:2: ( ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) ) ) ( (lv_params_1_0= ruleInfixExpression ) )
+            // InternalExport.g:2356:1: ( ( ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) ) ) ( (lv_params_1_0= ruleInfixExpression ) ) )
+            // InternalExport.g:2356:2: ( ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) ) ) ( (lv_params_1_0= ruleInfixExpression ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2356:2: ( ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2357:1: ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) )
+            // InternalExport.g:2356:2: ( ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) ) )
+            // InternalExport.g:2357:1: ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2357:1: ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2358:1: (lv_name_0_1= '!' | lv_name_0_2= '-' )
+            // InternalExport.g:2357:1: ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) )
+            // InternalExport.g:2358:1: (lv_name_0_1= '!' | lv_name_0_2= '-' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2358:1: (lv_name_0_1= '!' | lv_name_0_2= '-' )
+            // InternalExport.g:2358:1: (lv_name_0_1= '!' | lv_name_0_2= '-' )
             int alt47=2;
             int LA47_0 = input.LA(1);
 
@@ -6662,9 +6662,9 @@ else if ( (LA47_0==59) ) {
             }
             switch (alt47) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2359:3: lv_name_0_1= '!'
+                    // InternalExport.g:2359:3: lv_name_0_1= '!'
                     {
-                    lv_name_0_1=(Token)match(input,62,FOLLOW_62_in_ruleUnaryExpression5292); if (state.failed) return current;
+                    lv_name_0_1=(Token)match(input,62,FOLLOW_46); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_name_0_1, grammarAccess.getUnaryExpressionAccess().getNameExclamationMarkKeyword_0_0_0());
@@ -6682,9 +6682,9 @@ else if ( (LA47_0==59) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2371:8: lv_name_0_2= '-'
+                    // InternalExport.g:2371:8: lv_name_0_2= '-'
                     {
-                    lv_name_0_2=(Token)match(input,59,FOLLOW_59_in_ruleUnaryExpression5321); if (state.failed) return current;
+                    lv_name_0_2=(Token)match(input,59,FOLLOW_46); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_name_0_2, grammarAccess.getUnaryExpressionAccess().getNameHyphenMinusKeyword_0_0_1());
@@ -6710,18 +6710,18 @@ else if ( (LA47_0==59) ) {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2386:2: ( (lv_params_1_0= ruleInfixExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2387:1: (lv_params_1_0= ruleInfixExpression )
+            // InternalExport.g:2386:2: ( (lv_params_1_0= ruleInfixExpression ) )
+            // InternalExport.g:2387:1: (lv_params_1_0= ruleInfixExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2387:1: (lv_params_1_0= ruleInfixExpression )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2388:3: lv_params_1_0= ruleInfixExpression
+            // InternalExport.g:2387:1: (lv_params_1_0= ruleInfixExpression )
+            // InternalExport.g:2388:3: lv_params_1_0= ruleInfixExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getUnaryExpressionAccess().getParamsInfixExpressionParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleInfixExpression_in_ruleUnaryExpression5358);
+            pushFollow(FOLLOW_2);
             lv_params_1_0=ruleInfixExpression();
 
             state._fsp--;
@@ -6735,7 +6735,7 @@ else if ( (LA47_0==59) ) {
                      			current, 
                      			"params",
                       		lv_params_1_0, 
-                      		"InfixExpression");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.InfixExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -6768,7 +6768,7 @@ else if ( (LA47_0==59) ) {
 
 
     // $ANTLR start "entryRuleInfixExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2412:1: entryRuleInfixExpression returns [EObject current=null] : iv_ruleInfixExpression= ruleInfixExpression EOF ;
+    // InternalExport.g:2412:1: entryRuleInfixExpression returns [EObject current=null] : iv_ruleInfixExpression= ruleInfixExpression EOF ;
     public final EObject entryRuleInfixExpression() throws RecognitionException {
         EObject current = null;
 
@@ -6776,13 +6776,13 @@ public final EObject entryRuleInfixExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2413:2: (iv_ruleInfixExpression= ruleInfixExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2414:2: iv_ruleInfixExpression= ruleInfixExpression EOF
+            // InternalExport.g:2413:2: (iv_ruleInfixExpression= ruleInfixExpression EOF )
+            // InternalExport.g:2414:2: iv_ruleInfixExpression= ruleInfixExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getInfixExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleInfixExpression_in_entryRuleInfixExpression5394);
+            pushFollow(FOLLOW_1);
             iv_ruleInfixExpression=ruleInfixExpression();
 
             state._fsp--;
@@ -6790,7 +6790,7 @@ public final EObject entryRuleInfixExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleInfixExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInfixExpression5404); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -6808,7 +6808,7 @@ public final EObject entryRuleInfixExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleInfixExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2421:1: ruleInfixExpression returns [EObject current=null] : (this_PrimaryExpression_0= rulePrimaryExpression ( ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' ) | ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) ) | ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' ) | ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' ) )* ) ;
+    // InternalExport.g:2421:1: ruleInfixExpression returns [EObject current=null] : (this_PrimaryExpression_0= rulePrimaryExpression ( ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' ) | ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) ) | ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' ) | ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' ) )* ) ;
     public final EObject ruleInfixExpression() throws RecognitionException {
         EObject current = null;
 
@@ -6853,18 +6853,18 @@ public final EObject ruleInfixExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2424:28: ( (this_PrimaryExpression_0= rulePrimaryExpression ( ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' ) | ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) ) | ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' ) | ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2425:1: (this_PrimaryExpression_0= rulePrimaryExpression ( ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' ) | ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) ) | ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' ) | ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' ) )* )
+            // InternalExport.g:2424:28: ( (this_PrimaryExpression_0= rulePrimaryExpression ( ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' ) | ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) ) | ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' ) | ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' ) )* ) )
+            // InternalExport.g:2425:1: (this_PrimaryExpression_0= rulePrimaryExpression ( ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' ) | ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) ) | ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' ) | ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2425:1: (this_PrimaryExpression_0= rulePrimaryExpression ( ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' ) | ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) ) | ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' ) | ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' ) )* )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2426:5: this_PrimaryExpression_0= rulePrimaryExpression ( ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' ) | ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) ) | ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' ) | ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' ) )*
+            // InternalExport.g:2425:1: (this_PrimaryExpression_0= rulePrimaryExpression ( ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' ) | ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) ) | ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' ) | ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' ) )* )
+            // InternalExport.g:2426:5: this_PrimaryExpression_0= rulePrimaryExpression ( ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' ) | ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) ) | ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' ) | ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getInfixExpressionAccess().getPrimaryExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_rulePrimaryExpression_in_ruleInfixExpression5451);
+            pushFollow(FOLLOW_55);
             this_PrimaryExpression_0=rulePrimaryExpression();
 
             state._fsp--;
@@ -6875,7 +6875,7 @@ public final EObject ruleInfixExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2434:1: ( ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' ) | ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) ) | ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' ) | ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' ) )*
+            // InternalExport.g:2434:1: ( ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' ) | ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) ) | ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' ) | ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' ) )*
             loop52:
             do {
                 int alt52=5;
@@ -6929,13 +6929,13 @@ else if ( (LA52_3==EOF||(LA52_3>=16 && LA52_3<=17)||(LA52_3>=20 && LA52_3<=21)||
 
                 switch (alt52) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2434:2: ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' )
+            	    // InternalExport.g:2434:2: ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2434:2: ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2434:3: () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')'
+            	    // InternalExport.g:2434:2: ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' )
+            	    // InternalExport.g:2434:3: () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')'
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2434:3: ()
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2435:5: 
+            	    // InternalExport.g:2434:3: ()
+            	    // InternalExport.g:2435:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -6947,24 +6947,24 @@ else if ( (LA52_3==EOF||(LA52_3>=16 && LA52_3<=17)||(LA52_3>=20 && LA52_3<=21)||
 
             	    }
 
-            	    otherlv_2=(Token)match(input,63,FOLLOW_63_in_ruleInfixExpression5473); if (state.failed) return current;
+            	    otherlv_2=(Token)match(input,63,FOLLOW_4); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_2, grammarAccess.getInfixExpressionAccess().getFullStopKeyword_1_0_1());
             	          
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2444:1: ( (lv_name_3_0= ruleIdentifier ) )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2445:1: (lv_name_3_0= ruleIdentifier )
+            	    // InternalExport.g:2444:1: ( (lv_name_3_0= ruleIdentifier ) )
+            	    // InternalExport.g:2445:1: (lv_name_3_0= ruleIdentifier )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2445:1: (lv_name_3_0= ruleIdentifier )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2446:3: lv_name_3_0= ruleIdentifier
+            	    // InternalExport.g:2445:1: (lv_name_3_0= ruleIdentifier )
+            	    // InternalExport.g:2446:3: lv_name_3_0= ruleIdentifier
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getInfixExpressionAccess().getNameIdentifierParserRuleCall_1_0_2_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleIdentifier_in_ruleInfixExpression5494);
+            	    pushFollow(FOLLOW_23);
             	    lv_name_3_0=ruleIdentifier();
 
             	    state._fsp--;
@@ -6978,7 +6978,7 @@ else if ( (LA52_3==EOF||(LA52_3>=16 && LA52_3<=17)||(LA52_3>=20 && LA52_3<=21)||
             	             			current, 
             	             			"name",
             	              		lv_name_3_0, 
-            	              		"Identifier");
+            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -6988,13 +6988,13 @@ else if ( (LA52_3==EOF||(LA52_3>=16 && LA52_3<=17)||(LA52_3>=20 && LA52_3<=21)||
 
             	    }
 
-            	    otherlv_4=(Token)match(input,28,FOLLOW_28_in_ruleInfixExpression5506); if (state.failed) return current;
+            	    otherlv_4=(Token)match(input,28,FOLLOW_56); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_4, grammarAccess.getInfixExpressionAccess().getLeftParenthesisKeyword_1_0_3());
             	          
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2466:1: ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )?
+            	    // InternalExport.g:2466:1: ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )?
             	    int alt49=2;
             	    int LA49_0 = input.LA(1);
 
@@ -7003,20 +7003,20 @@ else if ( (LA52_3==EOF||(LA52_3>=16 && LA52_3<=17)||(LA52_3>=20 && LA52_3<=21)||
             	    }
             	    switch (alt49) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2466:2: ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )*
+            	            // InternalExport.g:2466:2: ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )*
             	            {
-            	            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2466:2: ( (lv_params_5_0= ruleExpression ) )
-            	            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2467:1: (lv_params_5_0= ruleExpression )
+            	            // InternalExport.g:2466:2: ( (lv_params_5_0= ruleExpression ) )
+            	            // InternalExport.g:2467:1: (lv_params_5_0= ruleExpression )
             	            {
-            	            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2467:1: (lv_params_5_0= ruleExpression )
-            	            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2468:3: lv_params_5_0= ruleExpression
+            	            // InternalExport.g:2467:1: (lv_params_5_0= ruleExpression )
+            	            // InternalExport.g:2468:3: lv_params_5_0= ruleExpression
             	            {
             	            if ( state.backtracking==0 ) {
             	               
             	              	        newCompositeNode(grammarAccess.getInfixExpressionAccess().getParamsExpressionParserRuleCall_1_0_4_0_0()); 
             	              	    
             	            }
-            	            pushFollow(FOLLOW_ruleExpression_in_ruleInfixExpression5528);
+            	            pushFollow(FOLLOW_57);
             	            lv_params_5_0=ruleExpression();
 
             	            state._fsp--;
@@ -7030,7 +7030,7 @@ else if ( (LA52_3==EOF||(LA52_3>=16 && LA52_3<=17)||(LA52_3>=20 && LA52_3<=21)||
             	                     			current, 
             	                     			"params",
             	                      		lv_params_5_0, 
-            	                      		"Expression");
+            	                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
             	              	        afterParserOrEnumRuleCall();
             	              	    
             	            }
@@ -7040,7 +7040,7 @@ else if ( (LA52_3==EOF||(LA52_3>=16 && LA52_3<=17)||(LA52_3>=20 && LA52_3<=21)||
 
             	            }
 
-            	            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2484:2: (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )*
+            	            // InternalExport.g:2484:2: (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )*
             	            loop48:
             	            do {
             	                int alt48=2;
@@ -7053,26 +7053,26 @@ else if ( (LA52_3==EOF||(LA52_3>=16 && LA52_3<=17)||(LA52_3>=20 && LA52_3<=21)||
 
             	                switch (alt48) {
             	            	case 1 :
-            	            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2484:4: otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) )
+            	            	    // InternalExport.g:2484:4: otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) )
             	            	    {
-            	            	    otherlv_6=(Token)match(input,23,FOLLOW_23_in_ruleInfixExpression5541); if (state.failed) return current;
+            	            	    otherlv_6=(Token)match(input,23,FOLLOW_15); if (state.failed) return current;
             	            	    if ( state.backtracking==0 ) {
 
             	            	          	newLeafNode(otherlv_6, grammarAccess.getInfixExpressionAccess().getCommaKeyword_1_0_4_1_0());
             	            	          
             	            	    }
-            	            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2488:1: ( (lv_params_7_0= ruleExpression ) )
-            	            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2489:1: (lv_params_7_0= ruleExpression )
+            	            	    // InternalExport.g:2488:1: ( (lv_params_7_0= ruleExpression ) )
+            	            	    // InternalExport.g:2489:1: (lv_params_7_0= ruleExpression )
             	            	    {
-            	            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2489:1: (lv_params_7_0= ruleExpression )
-            	            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2490:3: lv_params_7_0= ruleExpression
+            	            	    // InternalExport.g:2489:1: (lv_params_7_0= ruleExpression )
+            	            	    // InternalExport.g:2490:3: lv_params_7_0= ruleExpression
             	            	    {
             	            	    if ( state.backtracking==0 ) {
             	            	       
             	            	      	        newCompositeNode(grammarAccess.getInfixExpressionAccess().getParamsExpressionParserRuleCall_1_0_4_1_1_0()); 
             	            	      	    
             	            	    }
-            	            	    pushFollow(FOLLOW_ruleExpression_in_ruleInfixExpression5562);
+            	            	    pushFollow(FOLLOW_57);
             	            	    lv_params_7_0=ruleExpression();
 
             	            	    state._fsp--;
@@ -7086,7 +7086,7 @@ else if ( (LA52_3==EOF||(LA52_3>=16 && LA52_3<=17)||(LA52_3>=20 && LA52_3<=21)||
             	            	             			current, 
             	            	             			"params",
             	            	              		lv_params_7_0, 
-            	            	              		"Expression");
+            	            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
             	            	      	        afterParserOrEnumRuleCall();
             	            	      	    
             	            	    }
@@ -7111,7 +7111,7 @@ else if ( (LA52_3==EOF||(LA52_3>=16 && LA52_3<=17)||(LA52_3>=20 && LA52_3<=21)||
 
             	    }
 
-            	    otherlv_8=(Token)match(input,29,FOLLOW_29_in_ruleInfixExpression5578); if (state.failed) return current;
+            	    otherlv_8=(Token)match(input,29,FOLLOW_55); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_8, grammarAccess.getInfixExpressionAccess().getRightParenthesisKeyword_1_0_5());
@@ -7124,13 +7124,13 @@ else if ( (LA52_3==EOF||(LA52_3>=16 && LA52_3<=17)||(LA52_3>=20 && LA52_3<=21)||
             	    }
             	    break;
             	case 2 :
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2511:6: ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) )
+            	    // InternalExport.g:2511:6: ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2511:6: ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2511:7: () otherlv_10= '.' ( (lv_type_11_0= ruleType ) )
+            	    // InternalExport.g:2511:6: ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) )
+            	    // InternalExport.g:2511:7: () otherlv_10= '.' ( (lv_type_11_0= ruleType ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2511:7: ()
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2512:5: 
+            	    // InternalExport.g:2511:7: ()
+            	    // InternalExport.g:2512:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -7142,24 +7142,24 @@ else if ( (LA52_3==EOF||(LA52_3>=16 && LA52_3<=17)||(LA52_3>=20 && LA52_3<=21)||
 
             	    }
 
-            	    otherlv_10=(Token)match(input,63,FOLLOW_63_in_ruleInfixExpression5607); if (state.failed) return current;
+            	    otherlv_10=(Token)match(input,63,FOLLOW_40); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_10, grammarAccess.getInfixExpressionAccess().getFullStopKeyword_1_1_1());
             	          
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2521:1: ( (lv_type_11_0= ruleType ) )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2522:1: (lv_type_11_0= ruleType )
+            	    // InternalExport.g:2521:1: ( (lv_type_11_0= ruleType ) )
+            	    // InternalExport.g:2522:1: (lv_type_11_0= ruleType )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2522:1: (lv_type_11_0= ruleType )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2523:3: lv_type_11_0= ruleType
+            	    // InternalExport.g:2522:1: (lv_type_11_0= ruleType )
+            	    // InternalExport.g:2523:3: lv_type_11_0= ruleType
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getInfixExpressionAccess().getTypeTypeParserRuleCall_1_1_2_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleType_in_ruleInfixExpression5628);
+            	    pushFollow(FOLLOW_55);
             	    lv_type_11_0=ruleType();
 
             	    state._fsp--;
@@ -7173,7 +7173,7 @@ else if ( (LA52_3==EOF||(LA52_3>=16 && LA52_3<=17)||(LA52_3>=20 && LA52_3<=21)||
             	             			current, 
             	             			"type",
             	              		lv_type_11_0, 
-            	              		"Type");
+            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.Type");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -7190,13 +7190,13 @@ else if ( (LA52_3==EOF||(LA52_3>=16 && LA52_3<=17)||(LA52_3>=20 && LA52_3<=21)||
             	    }
             	    break;
             	case 3 :
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2540:6: ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' )
+            	    // InternalExport.g:2540:6: ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2540:6: ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2540:7: () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')'
+            	    // InternalExport.g:2540:6: ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' )
+            	    // InternalExport.g:2540:7: () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')'
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2540:7: ()
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2541:5: 
+            	    // InternalExport.g:2540:7: ()
+            	    // InternalExport.g:2541:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -7208,19 +7208,19 @@ else if ( (LA52_3==EOF||(LA52_3>=16 && LA52_3<=17)||(LA52_3>=20 && LA52_3<=21)||
 
             	    }
 
-            	    otherlv_13=(Token)match(input,63,FOLLOW_63_in_ruleInfixExpression5657); if (state.failed) return current;
+            	    otherlv_13=(Token)match(input,63,FOLLOW_58); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_13, grammarAccess.getInfixExpressionAccess().getFullStopKeyword_1_2_1());
             	          
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2550:1: ( (lv_name_14_0= 'typeSelect' ) )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2551:1: (lv_name_14_0= 'typeSelect' )
+            	    // InternalExport.g:2550:1: ( (lv_name_14_0= 'typeSelect' ) )
+            	    // InternalExport.g:2551:1: (lv_name_14_0= 'typeSelect' )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2551:1: (lv_name_14_0= 'typeSelect' )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2552:3: lv_name_14_0= 'typeSelect'
+            	    // InternalExport.g:2551:1: (lv_name_14_0= 'typeSelect' )
+            	    // InternalExport.g:2552:3: lv_name_14_0= 'typeSelect'
             	    {
-            	    lv_name_14_0=(Token)match(input,64,FOLLOW_64_in_ruleInfixExpression5675); if (state.failed) return current;
+            	    lv_name_14_0=(Token)match(input,64,FOLLOW_23); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	              newLeafNode(lv_name_14_0, grammarAccess.getInfixExpressionAccess().getNameTypeSelectKeyword_1_2_2_0());
@@ -7240,24 +7240,24 @@ else if ( (LA52_3==EOF||(LA52_3>=16 && LA52_3<=17)||(LA52_3>=20 && LA52_3<=21)||
 
             	    }
 
-            	    otherlv_15=(Token)match(input,28,FOLLOW_28_in_ruleInfixExpression5700); if (state.failed) return current;
+            	    otherlv_15=(Token)match(input,28,FOLLOW_40); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_15, grammarAccess.getInfixExpressionAccess().getLeftParenthesisKeyword_1_2_3());
             	          
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2569:1: ( (lv_type_16_0= ruleType ) )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2570:1: (lv_type_16_0= ruleType )
+            	    // InternalExport.g:2569:1: ( (lv_type_16_0= ruleType ) )
+            	    // InternalExport.g:2570:1: (lv_type_16_0= ruleType )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2570:1: (lv_type_16_0= ruleType )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2571:3: lv_type_16_0= ruleType
+            	    // InternalExport.g:2570:1: (lv_type_16_0= ruleType )
+            	    // InternalExport.g:2571:3: lv_type_16_0= ruleType
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getInfixExpressionAccess().getTypeTypeParserRuleCall_1_2_4_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleType_in_ruleInfixExpression5721);
+            	    pushFollow(FOLLOW_24);
             	    lv_type_16_0=ruleType();
 
             	    state._fsp--;
@@ -7271,7 +7271,7 @@ else if ( (LA52_3==EOF||(LA52_3>=16 && LA52_3<=17)||(LA52_3>=20 && LA52_3<=21)||
             	             			current, 
             	             			"type",
             	              		lv_type_16_0, 
-            	              		"Type");
+            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.Type");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -7281,7 +7281,7 @@ else if ( (LA52_3==EOF||(LA52_3>=16 && LA52_3<=17)||(LA52_3>=20 && LA52_3<=21)||
 
             	    }
 
-            	    otherlv_17=(Token)match(input,29,FOLLOW_29_in_ruleInfixExpression5733); if (state.failed) return current;
+            	    otherlv_17=(Token)match(input,29,FOLLOW_55); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_17, grammarAccess.getInfixExpressionAccess().getRightParenthesisKeyword_1_2_5());
@@ -7294,13 +7294,13 @@ else if ( (LA52_3==EOF||(LA52_3>=16 && LA52_3<=17)||(LA52_3>=20 && LA52_3<=21)||
             	    }
             	    break;
             	case 4 :
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2592:6: ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' )
+            	    // InternalExport.g:2592:6: ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2592:6: ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2592:7: () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')'
+            	    // InternalExport.g:2592:6: ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' )
+            	    // InternalExport.g:2592:7: () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')'
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2592:7: ()
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2593:5: 
+            	    // InternalExport.g:2592:7: ()
+            	    // InternalExport.g:2593:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -7312,19 +7312,19 @@ else if ( (LA52_3==EOF||(LA52_3>=16 && LA52_3<=17)||(LA52_3>=20 && LA52_3<=21)||
 
             	    }
 
-            	    otherlv_19=(Token)match(input,63,FOLLOW_63_in_ruleInfixExpression5762); if (state.failed) return current;
+            	    otherlv_19=(Token)match(input,63,FOLLOW_59); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_19, grammarAccess.getInfixExpressionAccess().getFullStopKeyword_1_3_1());
             	          
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2602:1: ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2603:1: ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) )
+            	    // InternalExport.g:2602:1: ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) )
+            	    // InternalExport.g:2603:1: ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2603:1: ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2604:1: (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' )
+            	    // InternalExport.g:2603:1: ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) )
+            	    // InternalExport.g:2604:1: (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2604:1: (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' )
+            	    // InternalExport.g:2604:1: (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' )
             	    int alt50=8;
             	    switch ( input.LA(1) ) {
             	    case 65:
@@ -7377,9 +7377,9 @@ else if ( (LA52_3==EOF||(LA52_3>=16 && LA52_3<=17)||(LA52_3>=20 && LA52_3<=21)||
 
             	    switch (alt50) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2605:3: lv_name_20_1= 'collect'
+            	            // InternalExport.g:2605:3: lv_name_20_1= 'collect'
             	            {
-            	            lv_name_20_1=(Token)match(input,65,FOLLOW_65_in_ruleInfixExpression5782); if (state.failed) return current;
+            	            lv_name_20_1=(Token)match(input,65,FOLLOW_23); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_name_20_1, grammarAccess.getInfixExpressionAccess().getNameCollectKeyword_1_3_2_0_0());
@@ -7397,9 +7397,9 @@ else if ( (LA52_3==EOF||(LA52_3>=16 && LA52_3<=17)||(LA52_3>=20 && LA52_3<=21)||
             	            }
             	            break;
             	        case 2 :
-            	            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2617:8: lv_name_20_2= 'select'
+            	            // InternalExport.g:2617:8: lv_name_20_2= 'select'
             	            {
-            	            lv_name_20_2=(Token)match(input,66,FOLLOW_66_in_ruleInfixExpression5811); if (state.failed) return current;
+            	            lv_name_20_2=(Token)match(input,66,FOLLOW_23); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_name_20_2, grammarAccess.getInfixExpressionAccess().getNameSelectKeyword_1_3_2_0_1());
@@ -7417,9 +7417,9 @@ else if ( (LA52_3==EOF||(LA52_3>=16 && LA52_3<=17)||(LA52_3>=20 && LA52_3<=21)||
             	            }
             	            break;
             	        case 3 :
-            	            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2629:8: lv_name_20_3= 'selectFirst'
+            	            // InternalExport.g:2629:8: lv_name_20_3= 'selectFirst'
             	            {
-            	            lv_name_20_3=(Token)match(input,67,FOLLOW_67_in_ruleInfixExpression5840); if (state.failed) return current;
+            	            lv_name_20_3=(Token)match(input,67,FOLLOW_23); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_name_20_3, grammarAccess.getInfixExpressionAccess().getNameSelectFirstKeyword_1_3_2_0_2());
@@ -7437,9 +7437,9 @@ else if ( (LA52_3==EOF||(LA52_3>=16 && LA52_3<=17)||(LA52_3>=20 && LA52_3<=21)||
             	            }
             	            break;
             	        case 4 :
-            	            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2641:8: lv_name_20_4= 'reject'
+            	            // InternalExport.g:2641:8: lv_name_20_4= 'reject'
             	            {
-            	            lv_name_20_4=(Token)match(input,68,FOLLOW_68_in_ruleInfixExpression5869); if (state.failed) return current;
+            	            lv_name_20_4=(Token)match(input,68,FOLLOW_23); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_name_20_4, grammarAccess.getInfixExpressionAccess().getNameRejectKeyword_1_3_2_0_3());
@@ -7457,9 +7457,9 @@ else if ( (LA52_3==EOF||(LA52_3>=16 && LA52_3<=17)||(LA52_3>=20 && LA52_3<=21)||
             	            }
             	            break;
             	        case 5 :
-            	            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2653:8: lv_name_20_5= 'exists'
+            	            // InternalExport.g:2653:8: lv_name_20_5= 'exists'
             	            {
-            	            lv_name_20_5=(Token)match(input,69,FOLLOW_69_in_ruleInfixExpression5898); if (state.failed) return current;
+            	            lv_name_20_5=(Token)match(input,69,FOLLOW_23); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_name_20_5, grammarAccess.getInfixExpressionAccess().getNameExistsKeyword_1_3_2_0_4());
@@ -7477,9 +7477,9 @@ else if ( (LA52_3==EOF||(LA52_3>=16 && LA52_3<=17)||(LA52_3>=20 && LA52_3<=21)||
             	            }
             	            break;
             	        case 6 :
-            	            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2665:8: lv_name_20_6= 'notExists'
+            	            // InternalExport.g:2665:8: lv_name_20_6= 'notExists'
             	            {
-            	            lv_name_20_6=(Token)match(input,70,FOLLOW_70_in_ruleInfixExpression5927); if (state.failed) return current;
+            	            lv_name_20_6=(Token)match(input,70,FOLLOW_23); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_name_20_6, grammarAccess.getInfixExpressionAccess().getNameNotExistsKeyword_1_3_2_0_5());
@@ -7497,9 +7497,9 @@ else if ( (LA52_3==EOF||(LA52_3>=16 && LA52_3<=17)||(LA52_3>=20 && LA52_3<=21)||
             	            }
             	            break;
             	        case 7 :
-            	            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2677:8: lv_name_20_7= 'sortBy'
+            	            // InternalExport.g:2677:8: lv_name_20_7= 'sortBy'
             	            {
-            	            lv_name_20_7=(Token)match(input,71,FOLLOW_71_in_ruleInfixExpression5956); if (state.failed) return current;
+            	            lv_name_20_7=(Token)match(input,71,FOLLOW_23); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_name_20_7, grammarAccess.getInfixExpressionAccess().getNameSortByKeyword_1_3_2_0_6());
@@ -7517,9 +7517,9 @@ else if ( (LA52_3==EOF||(LA52_3>=16 && LA52_3<=17)||(LA52_3>=20 && LA52_3<=21)||
             	            }
             	            break;
             	        case 8 :
-            	            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2689:8: lv_name_20_8= 'forAll'
+            	            // InternalExport.g:2689:8: lv_name_20_8= 'forAll'
             	            {
-            	            lv_name_20_8=(Token)match(input,72,FOLLOW_72_in_ruleInfixExpression5985); if (state.failed) return current;
+            	            lv_name_20_8=(Token)match(input,72,FOLLOW_23); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_name_20_8, grammarAccess.getInfixExpressionAccess().getNameForAllKeyword_1_3_2_0_7());
@@ -7545,13 +7545,13 @@ else if ( (LA52_3==EOF||(LA52_3>=16 && LA52_3<=17)||(LA52_3>=20 && LA52_3<=21)||
 
             	    }
 
-            	    otherlv_21=(Token)match(input,28,FOLLOW_28_in_ruleInfixExpression6013); if (state.failed) return current;
+            	    otherlv_21=(Token)match(input,28,FOLLOW_15); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_21, grammarAccess.getInfixExpressionAccess().getLeftParenthesisKeyword_1_3_3());
             	          
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2708:1: ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )?
+            	    // InternalExport.g:2708:1: ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )?
             	    int alt51=2;
             	    int LA51_0 = input.LA(1);
 
@@ -7564,20 +7564,20 @@ else if ( (LA52_3==EOF||(LA52_3>=16 && LA52_3<=17)||(LA52_3>=20 && LA52_3<=21)||
             	    }
             	    switch (alt51) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2708:2: ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|'
+            	            // InternalExport.g:2708:2: ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|'
             	            {
-            	            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2708:2: ( (lv_var_22_0= ruleIdentifier ) )
-            	            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2709:1: (lv_var_22_0= ruleIdentifier )
+            	            // InternalExport.g:2708:2: ( (lv_var_22_0= ruleIdentifier ) )
+            	            // InternalExport.g:2709:1: (lv_var_22_0= ruleIdentifier )
             	            {
-            	            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2709:1: (lv_var_22_0= ruleIdentifier )
-            	            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2710:3: lv_var_22_0= ruleIdentifier
+            	            // InternalExport.g:2709:1: (lv_var_22_0= ruleIdentifier )
+            	            // InternalExport.g:2710:3: lv_var_22_0= ruleIdentifier
             	            {
             	            if ( state.backtracking==0 ) {
             	               
             	              	        newCompositeNode(grammarAccess.getInfixExpressionAccess().getVarIdentifierParserRuleCall_1_3_4_0_0()); 
             	              	    
             	            }
-            	            pushFollow(FOLLOW_ruleIdentifier_in_ruleInfixExpression6035);
+            	            pushFollow(FOLLOW_60);
             	            lv_var_22_0=ruleIdentifier();
 
             	            state._fsp--;
@@ -7591,7 +7591,7 @@ else if ( (LA52_3==EOF||(LA52_3>=16 && LA52_3<=17)||(LA52_3>=20 && LA52_3<=21)||
             	                     			current, 
             	                     			"var",
             	                      		lv_var_22_0, 
-            	                      		"Identifier");
+            	                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
             	              	        afterParserOrEnumRuleCall();
             	              	    
             	            }
@@ -7601,7 +7601,7 @@ else if ( (LA52_3==EOF||(LA52_3>=16 && LA52_3<=17)||(LA52_3>=20 && LA52_3<=21)||
 
             	            }
 
-            	            otherlv_23=(Token)match(input,73,FOLLOW_73_in_ruleInfixExpression6047); if (state.failed) return current;
+            	            otherlv_23=(Token)match(input,73,FOLLOW_15); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                  	newLeafNode(otherlv_23, grammarAccess.getInfixExpressionAccess().getVerticalLineKeyword_1_3_4_1());
@@ -7613,18 +7613,18 @@ else if ( (LA52_3==EOF||(LA52_3>=16 && LA52_3<=17)||(LA52_3>=20 && LA52_3<=21)||
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2730:3: ( (lv_exp_24_0= ruleExpression ) )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2731:1: (lv_exp_24_0= ruleExpression )
+            	    // InternalExport.g:2730:3: ( (lv_exp_24_0= ruleExpression ) )
+            	    // InternalExport.g:2731:1: (lv_exp_24_0= ruleExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2731:1: (lv_exp_24_0= ruleExpression )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2732:3: lv_exp_24_0= ruleExpression
+            	    // InternalExport.g:2731:1: (lv_exp_24_0= ruleExpression )
+            	    // InternalExport.g:2732:3: lv_exp_24_0= ruleExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getInfixExpressionAccess().getExpExpressionParserRuleCall_1_3_5_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleExpression_in_ruleInfixExpression6070);
+            	    pushFollow(FOLLOW_24);
             	    lv_exp_24_0=ruleExpression();
 
             	    state._fsp--;
@@ -7638,7 +7638,7 @@ else if ( (LA52_3==EOF||(LA52_3>=16 && LA52_3<=17)||(LA52_3>=20 && LA52_3<=21)||
             	             			current, 
             	             			"exp",
             	              		lv_exp_24_0, 
-            	              		"Expression");
+            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -7648,7 +7648,7 @@ else if ( (LA52_3==EOF||(LA52_3>=16 && LA52_3<=17)||(LA52_3>=20 && LA52_3<=21)||
 
             	    }
 
-            	    otherlv_25=(Token)match(input,29,FOLLOW_29_in_ruleInfixExpression6082); if (state.failed) return current;
+            	    otherlv_25=(Token)match(input,29,FOLLOW_55); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_25, grammarAccess.getInfixExpressionAccess().getRightParenthesisKeyword_1_3_6());
@@ -7689,7 +7689,7 @@ else if ( (LA52_3==EOF||(LA52_3>=16 && LA52_3<=17)||(LA52_3>=20 && LA52_3<=21)||
 
 
     // $ANTLR start "entryRulePrimaryExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2760:1: entryRulePrimaryExpression returns [EObject current=null] : iv_rulePrimaryExpression= rulePrimaryExpression EOF ;
+    // InternalExport.g:2760:1: entryRulePrimaryExpression returns [EObject current=null] : iv_rulePrimaryExpression= rulePrimaryExpression EOF ;
     public final EObject entryRulePrimaryExpression() throws RecognitionException {
         EObject current = null;
 
@@ -7697,13 +7697,13 @@ public final EObject entryRulePrimaryExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2761:2: (iv_rulePrimaryExpression= rulePrimaryExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2762:2: iv_rulePrimaryExpression= rulePrimaryExpression EOF
+            // InternalExport.g:2761:2: (iv_rulePrimaryExpression= rulePrimaryExpression EOF )
+            // InternalExport.g:2762:2: iv_rulePrimaryExpression= rulePrimaryExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getPrimaryExpressionRule()); 
             }
-            pushFollow(FOLLOW_rulePrimaryExpression_in_entryRulePrimaryExpression6121);
+            pushFollow(FOLLOW_1);
             iv_rulePrimaryExpression=rulePrimaryExpression();
 
             state._fsp--;
@@ -7711,7 +7711,7 @@ public final EObject entryRulePrimaryExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_rulePrimaryExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRulePrimaryExpression6131); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -7729,7 +7729,7 @@ public final EObject entryRulePrimaryExpression() throws RecognitionException {
 
 
     // $ANTLR start "rulePrimaryExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2769:1: rulePrimaryExpression returns [EObject current=null] : (this_Literal_0= ruleLiteral | this_FeatureCall_1= ruleFeatureCall | this_ListLiteral_2= ruleListLiteral | this_ConstructorCallExpression_3= ruleConstructorCallExpression | this_GlobalVarExpression_4= ruleGlobalVarExpression | this_ParanthesizedExpression_5= ruleParanthesizedExpression ) ;
+    // InternalExport.g:2769:1: rulePrimaryExpression returns [EObject current=null] : (this_Literal_0= ruleLiteral | this_FeatureCall_1= ruleFeatureCall | this_ListLiteral_2= ruleListLiteral | this_ConstructorCallExpression_3= ruleConstructorCallExpression | this_GlobalVarExpression_4= ruleGlobalVarExpression | this_ParanthesizedExpression_5= ruleParanthesizedExpression ) ;
     public final EObject rulePrimaryExpression() throws RecognitionException {
         EObject current = null;
 
@@ -7749,10 +7749,10 @@ public final EObject rulePrimaryExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2772:28: ( (this_Literal_0= ruleLiteral | this_FeatureCall_1= ruleFeatureCall | this_ListLiteral_2= ruleListLiteral | this_ConstructorCallExpression_3= ruleConstructorCallExpression | this_GlobalVarExpression_4= ruleGlobalVarExpression | this_ParanthesizedExpression_5= ruleParanthesizedExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2773:1: (this_Literal_0= ruleLiteral | this_FeatureCall_1= ruleFeatureCall | this_ListLiteral_2= ruleListLiteral | this_ConstructorCallExpression_3= ruleConstructorCallExpression | this_GlobalVarExpression_4= ruleGlobalVarExpression | this_ParanthesizedExpression_5= ruleParanthesizedExpression )
+            // InternalExport.g:2772:28: ( (this_Literal_0= ruleLiteral | this_FeatureCall_1= ruleFeatureCall | this_ListLiteral_2= ruleListLiteral | this_ConstructorCallExpression_3= ruleConstructorCallExpression | this_GlobalVarExpression_4= ruleGlobalVarExpression | this_ParanthesizedExpression_5= ruleParanthesizedExpression ) )
+            // InternalExport.g:2773:1: (this_Literal_0= ruleLiteral | this_FeatureCall_1= ruleFeatureCall | this_ListLiteral_2= ruleListLiteral | this_ConstructorCallExpression_3= ruleConstructorCallExpression | this_GlobalVarExpression_4= ruleGlobalVarExpression | this_ParanthesizedExpression_5= ruleParanthesizedExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2773:1: (this_Literal_0= ruleLiteral | this_FeatureCall_1= ruleFeatureCall | this_ListLiteral_2= ruleListLiteral | this_ConstructorCallExpression_3= ruleConstructorCallExpression | this_GlobalVarExpression_4= ruleGlobalVarExpression | this_ParanthesizedExpression_5= ruleParanthesizedExpression )
+            // InternalExport.g:2773:1: (this_Literal_0= ruleLiteral | this_FeatureCall_1= ruleFeatureCall | this_ListLiteral_2= ruleListLiteral | this_ConstructorCallExpression_3= ruleConstructorCallExpression | this_GlobalVarExpression_4= ruleGlobalVarExpression | this_ParanthesizedExpression_5= ruleParanthesizedExpression )
             int alt53=6;
             switch ( input.LA(1) ) {
             case RULE_STRING:
@@ -7812,14 +7812,14 @@ public final EObject rulePrimaryExpression() throws RecognitionException {
 
             switch (alt53) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2774:5: this_Literal_0= ruleLiteral
+                    // InternalExport.g:2774:5: this_Literal_0= ruleLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getPrimaryExpressionAccess().getLiteralParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleLiteral_in_rulePrimaryExpression6178);
+                    pushFollow(FOLLOW_2);
                     this_Literal_0=ruleLiteral();
 
                     state._fsp--;
@@ -7834,14 +7834,14 @@ public final EObject rulePrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2784:5: this_FeatureCall_1= ruleFeatureCall
+                    // InternalExport.g:2784:5: this_FeatureCall_1= ruleFeatureCall
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getPrimaryExpressionAccess().getFeatureCallParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleFeatureCall_in_rulePrimaryExpression6205);
+                    pushFollow(FOLLOW_2);
                     this_FeatureCall_1=ruleFeatureCall();
 
                     state._fsp--;
@@ -7856,14 +7856,14 @@ public final EObject rulePrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2794:5: this_ListLiteral_2= ruleListLiteral
+                    // InternalExport.g:2794:5: this_ListLiteral_2= ruleListLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getPrimaryExpressionAccess().getListLiteralParserRuleCall_2()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleListLiteral_in_rulePrimaryExpression6232);
+                    pushFollow(FOLLOW_2);
                     this_ListLiteral_2=ruleListLiteral();
 
                     state._fsp--;
@@ -7878,14 +7878,14 @@ public final EObject rulePrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2804:5: this_ConstructorCallExpression_3= ruleConstructorCallExpression
+                    // InternalExport.g:2804:5: this_ConstructorCallExpression_3= ruleConstructorCallExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getPrimaryExpressionAccess().getConstructorCallExpressionParserRuleCall_3()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleConstructorCallExpression_in_rulePrimaryExpression6259);
+                    pushFollow(FOLLOW_2);
                     this_ConstructorCallExpression_3=ruleConstructorCallExpression();
 
                     state._fsp--;
@@ -7900,14 +7900,14 @@ public final EObject rulePrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2814:5: this_GlobalVarExpression_4= ruleGlobalVarExpression
+                    // InternalExport.g:2814:5: this_GlobalVarExpression_4= ruleGlobalVarExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getPrimaryExpressionAccess().getGlobalVarExpressionParserRuleCall_4()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleGlobalVarExpression_in_rulePrimaryExpression6286);
+                    pushFollow(FOLLOW_2);
                     this_GlobalVarExpression_4=ruleGlobalVarExpression();
 
                     state._fsp--;
@@ -7922,14 +7922,14 @@ public final EObject rulePrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2824:5: this_ParanthesizedExpression_5= ruleParanthesizedExpression
+                    // InternalExport.g:2824:5: this_ParanthesizedExpression_5= ruleParanthesizedExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getPrimaryExpressionAccess().getParanthesizedExpressionParserRuleCall_5()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleParanthesizedExpression_in_rulePrimaryExpression6313);
+                    pushFollow(FOLLOW_2);
                     this_ParanthesizedExpression_5=ruleParanthesizedExpression();
 
                     state._fsp--;
@@ -7966,7 +7966,7 @@ public final EObject rulePrimaryExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleLiteral"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2840:1: entryRuleLiteral returns [EObject current=null] : iv_ruleLiteral= ruleLiteral EOF ;
+    // InternalExport.g:2840:1: entryRuleLiteral returns [EObject current=null] : iv_ruleLiteral= ruleLiteral EOF ;
     public final EObject entryRuleLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -7974,13 +7974,13 @@ public final EObject entryRuleLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2841:2: (iv_ruleLiteral= ruleLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2842:2: iv_ruleLiteral= ruleLiteral EOF
+            // InternalExport.g:2841:2: (iv_ruleLiteral= ruleLiteral EOF )
+            // InternalExport.g:2842:2: iv_ruleLiteral= ruleLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleLiteral_in_entryRuleLiteral6348);
+            pushFollow(FOLLOW_1);
             iv_ruleLiteral=ruleLiteral();
 
             state._fsp--;
@@ -7988,7 +7988,7 @@ public final EObject entryRuleLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleLiteral6358); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -8006,7 +8006,7 @@ public final EObject entryRuleLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleLiteral"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2849:1: ruleLiteral returns [EObject current=null] : (this_BooleanLiteral_0= ruleBooleanLiteral | this_IntegerLiteral_1= ruleIntegerLiteral | this_NullLiteral_2= ruleNullLiteral | this_RealLiteral_3= ruleRealLiteral | this_StringLiteral_4= ruleStringLiteral ) ;
+    // InternalExport.g:2849:1: ruleLiteral returns [EObject current=null] : (this_BooleanLiteral_0= ruleBooleanLiteral | this_IntegerLiteral_1= ruleIntegerLiteral | this_NullLiteral_2= ruleNullLiteral | this_RealLiteral_3= ruleRealLiteral | this_StringLiteral_4= ruleStringLiteral ) ;
     public final EObject ruleLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -8024,10 +8024,10 @@ public final EObject ruleLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2852:28: ( (this_BooleanLiteral_0= ruleBooleanLiteral | this_IntegerLiteral_1= ruleIntegerLiteral | this_NullLiteral_2= ruleNullLiteral | this_RealLiteral_3= ruleRealLiteral | this_StringLiteral_4= ruleStringLiteral ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2853:1: (this_BooleanLiteral_0= ruleBooleanLiteral | this_IntegerLiteral_1= ruleIntegerLiteral | this_NullLiteral_2= ruleNullLiteral | this_RealLiteral_3= ruleRealLiteral | this_StringLiteral_4= ruleStringLiteral )
+            // InternalExport.g:2852:28: ( (this_BooleanLiteral_0= ruleBooleanLiteral | this_IntegerLiteral_1= ruleIntegerLiteral | this_NullLiteral_2= ruleNullLiteral | this_RealLiteral_3= ruleRealLiteral | this_StringLiteral_4= ruleStringLiteral ) )
+            // InternalExport.g:2853:1: (this_BooleanLiteral_0= ruleBooleanLiteral | this_IntegerLiteral_1= ruleIntegerLiteral | this_NullLiteral_2= ruleNullLiteral | this_RealLiteral_3= ruleRealLiteral | this_StringLiteral_4= ruleStringLiteral )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2853:1: (this_BooleanLiteral_0= ruleBooleanLiteral | this_IntegerLiteral_1= ruleIntegerLiteral | this_NullLiteral_2= ruleNullLiteral | this_RealLiteral_3= ruleRealLiteral | this_StringLiteral_4= ruleStringLiteral )
+            // InternalExport.g:2853:1: (this_BooleanLiteral_0= ruleBooleanLiteral | this_IntegerLiteral_1= ruleIntegerLiteral | this_NullLiteral_2= ruleNullLiteral | this_RealLiteral_3= ruleRealLiteral | this_StringLiteral_4= ruleStringLiteral )
             int alt54=5;
             switch ( input.LA(1) ) {
             case 74:
@@ -8066,14 +8066,14 @@ public final EObject ruleLiteral() throws RecognitionException {
 
             switch (alt54) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2854:5: this_BooleanLiteral_0= ruleBooleanLiteral
+                    // InternalExport.g:2854:5: this_BooleanLiteral_0= ruleBooleanLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getLiteralAccess().getBooleanLiteralParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleBooleanLiteral_in_ruleLiteral6405);
+                    pushFollow(FOLLOW_2);
                     this_BooleanLiteral_0=ruleBooleanLiteral();
 
                     state._fsp--;
@@ -8088,14 +8088,14 @@ public final EObject ruleLiteral() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2864:5: this_IntegerLiteral_1= ruleIntegerLiteral
+                    // InternalExport.g:2864:5: this_IntegerLiteral_1= ruleIntegerLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getLiteralAccess().getIntegerLiteralParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleIntegerLiteral_in_ruleLiteral6432);
+                    pushFollow(FOLLOW_2);
                     this_IntegerLiteral_1=ruleIntegerLiteral();
 
                     state._fsp--;
@@ -8110,14 +8110,14 @@ public final EObject ruleLiteral() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2874:5: this_NullLiteral_2= ruleNullLiteral
+                    // InternalExport.g:2874:5: this_NullLiteral_2= ruleNullLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getLiteralAccess().getNullLiteralParserRuleCall_2()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleNullLiteral_in_ruleLiteral6459);
+                    pushFollow(FOLLOW_2);
                     this_NullLiteral_2=ruleNullLiteral();
 
                     state._fsp--;
@@ -8132,14 +8132,14 @@ public final EObject ruleLiteral() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2884:5: this_RealLiteral_3= ruleRealLiteral
+                    // InternalExport.g:2884:5: this_RealLiteral_3= ruleRealLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getLiteralAccess().getRealLiteralParserRuleCall_3()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleRealLiteral_in_ruleLiteral6486);
+                    pushFollow(FOLLOW_2);
                     this_RealLiteral_3=ruleRealLiteral();
 
                     state._fsp--;
@@ -8154,14 +8154,14 @@ public final EObject ruleLiteral() throws RecognitionException {
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2894:5: this_StringLiteral_4= ruleStringLiteral
+                    // InternalExport.g:2894:5: this_StringLiteral_4= ruleStringLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getLiteralAccess().getStringLiteralParserRuleCall_4()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleStringLiteral_in_ruleLiteral6513);
+                    pushFollow(FOLLOW_2);
                     this_StringLiteral_4=ruleStringLiteral();
 
                     state._fsp--;
@@ -8198,7 +8198,7 @@ public final EObject ruleLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleBooleanLiteral"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2910:1: entryRuleBooleanLiteral returns [EObject current=null] : iv_ruleBooleanLiteral= ruleBooleanLiteral EOF ;
+    // InternalExport.g:2910:1: entryRuleBooleanLiteral returns [EObject current=null] : iv_ruleBooleanLiteral= ruleBooleanLiteral EOF ;
     public final EObject entryRuleBooleanLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -8206,13 +8206,13 @@ public final EObject entryRuleBooleanLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2911:2: (iv_ruleBooleanLiteral= ruleBooleanLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2912:2: iv_ruleBooleanLiteral= ruleBooleanLiteral EOF
+            // InternalExport.g:2911:2: (iv_ruleBooleanLiteral= ruleBooleanLiteral EOF )
+            // InternalExport.g:2912:2: iv_ruleBooleanLiteral= ruleBooleanLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getBooleanLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleBooleanLiteral_in_entryRuleBooleanLiteral6548);
+            pushFollow(FOLLOW_1);
             iv_ruleBooleanLiteral=ruleBooleanLiteral();
 
             state._fsp--;
@@ -8220,7 +8220,7 @@ public final EObject entryRuleBooleanLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleBooleanLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleBooleanLiteral6558); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -8238,7 +8238,7 @@ public final EObject entryRuleBooleanLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleBooleanLiteral"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2919:1: ruleBooleanLiteral returns [EObject current=null] : ( ( (lv_val_0_1= 'true' | lv_val_0_2= 'false' ) ) ) ;
+    // InternalExport.g:2919:1: ruleBooleanLiteral returns [EObject current=null] : ( ( (lv_val_0_1= 'true' | lv_val_0_2= 'false' ) ) ) ;
     public final EObject ruleBooleanLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -8248,16 +8248,16 @@ public final EObject ruleBooleanLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2922:28: ( ( ( (lv_val_0_1= 'true' | lv_val_0_2= 'false' ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2923:1: ( ( (lv_val_0_1= 'true' | lv_val_0_2= 'false' ) ) )
+            // InternalExport.g:2922:28: ( ( ( (lv_val_0_1= 'true' | lv_val_0_2= 'false' ) ) ) )
+            // InternalExport.g:2923:1: ( ( (lv_val_0_1= 'true' | lv_val_0_2= 'false' ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2923:1: ( ( (lv_val_0_1= 'true' | lv_val_0_2= 'false' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2924:1: ( (lv_val_0_1= 'true' | lv_val_0_2= 'false' ) )
+            // InternalExport.g:2923:1: ( ( (lv_val_0_1= 'true' | lv_val_0_2= 'false' ) ) )
+            // InternalExport.g:2924:1: ( (lv_val_0_1= 'true' | lv_val_0_2= 'false' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2924:1: ( (lv_val_0_1= 'true' | lv_val_0_2= 'false' ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2925:1: (lv_val_0_1= 'true' | lv_val_0_2= 'false' )
+            // InternalExport.g:2924:1: ( (lv_val_0_1= 'true' | lv_val_0_2= 'false' ) )
+            // InternalExport.g:2925:1: (lv_val_0_1= 'true' | lv_val_0_2= 'false' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2925:1: (lv_val_0_1= 'true' | lv_val_0_2= 'false' )
+            // InternalExport.g:2925:1: (lv_val_0_1= 'true' | lv_val_0_2= 'false' )
             int alt55=2;
             int LA55_0 = input.LA(1);
 
@@ -8276,9 +8276,9 @@ else if ( (LA55_0==75) ) {
             }
             switch (alt55) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2926:3: lv_val_0_1= 'true'
+                    // InternalExport.g:2926:3: lv_val_0_1= 'true'
                     {
-                    lv_val_0_1=(Token)match(input,74,FOLLOW_74_in_ruleBooleanLiteral6602); if (state.failed) return current;
+                    lv_val_0_1=(Token)match(input,74,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_val_0_1, grammarAccess.getBooleanLiteralAccess().getValTrueKeyword_0_0());
@@ -8296,9 +8296,9 @@ else if ( (LA55_0==75) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2938:8: lv_val_0_2= 'false'
+                    // InternalExport.g:2938:8: lv_val_0_2= 'false'
                     {
-                    lv_val_0_2=(Token)match(input,75,FOLLOW_75_in_ruleBooleanLiteral6631); if (state.failed) return current;
+                    lv_val_0_2=(Token)match(input,75,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_val_0_2, grammarAccess.getBooleanLiteralAccess().getValFalseKeyword_0_1());
@@ -8344,7 +8344,7 @@ else if ( (LA55_0==75) ) {
 
 
     // $ANTLR start "entryRuleIntegerLiteral"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2961:1: entryRuleIntegerLiteral returns [EObject current=null] : iv_ruleIntegerLiteral= ruleIntegerLiteral EOF ;
+    // InternalExport.g:2961:1: entryRuleIntegerLiteral returns [EObject current=null] : iv_ruleIntegerLiteral= ruleIntegerLiteral EOF ;
     public final EObject entryRuleIntegerLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -8352,13 +8352,13 @@ public final EObject entryRuleIntegerLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2962:2: (iv_ruleIntegerLiteral= ruleIntegerLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2963:2: iv_ruleIntegerLiteral= ruleIntegerLiteral EOF
+            // InternalExport.g:2962:2: (iv_ruleIntegerLiteral= ruleIntegerLiteral EOF )
+            // InternalExport.g:2963:2: iv_ruleIntegerLiteral= ruleIntegerLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getIntegerLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleIntegerLiteral_in_entryRuleIntegerLiteral6682);
+            pushFollow(FOLLOW_1);
             iv_ruleIntegerLiteral=ruleIntegerLiteral();
 
             state._fsp--;
@@ -8366,7 +8366,7 @@ public final EObject entryRuleIntegerLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleIntegerLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIntegerLiteral6692); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -8384,7 +8384,7 @@ public final EObject entryRuleIntegerLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleIntegerLiteral"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2970:1: ruleIntegerLiteral returns [EObject current=null] : ( (lv_val_0_0= RULE_INT ) ) ;
+    // InternalExport.g:2970:1: ruleIntegerLiteral returns [EObject current=null] : ( (lv_val_0_0= RULE_INT ) ) ;
     public final EObject ruleIntegerLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -8393,16 +8393,16 @@ public final EObject ruleIntegerLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2973:28: ( ( (lv_val_0_0= RULE_INT ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2974:1: ( (lv_val_0_0= RULE_INT ) )
+            // InternalExport.g:2973:28: ( ( (lv_val_0_0= RULE_INT ) ) )
+            // InternalExport.g:2974:1: ( (lv_val_0_0= RULE_INT ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2974:1: ( (lv_val_0_0= RULE_INT ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2975:1: (lv_val_0_0= RULE_INT )
+            // InternalExport.g:2974:1: ( (lv_val_0_0= RULE_INT ) )
+            // InternalExport.g:2975:1: (lv_val_0_0= RULE_INT )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2975:1: (lv_val_0_0= RULE_INT )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:2976:3: lv_val_0_0= RULE_INT
+            // InternalExport.g:2975:1: (lv_val_0_0= RULE_INT )
+            // InternalExport.g:2976:3: lv_val_0_0= RULE_INT
             {
-            lv_val_0_0=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleIntegerLiteral6733); if (state.failed) return current;
+            lv_val_0_0=(Token)match(input,RULE_INT,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(lv_val_0_0, grammarAccess.getIntegerLiteralAccess().getValINTTerminalRuleCall_0()); 
@@ -8417,7 +8417,7 @@ public final EObject ruleIntegerLiteral() throws RecognitionException {
                      			current, 
                      			"val",
                       		lv_val_0_0, 
-                      		"INT");
+                      		"org.eclipse.xtext.common.Terminals.INT");
               	    
             }
 
@@ -8446,7 +8446,7 @@ public final EObject ruleIntegerLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleNullLiteral"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3000:1: entryRuleNullLiteral returns [EObject current=null] : iv_ruleNullLiteral= ruleNullLiteral EOF ;
+    // InternalExport.g:3000:1: entryRuleNullLiteral returns [EObject current=null] : iv_ruleNullLiteral= ruleNullLiteral EOF ;
     public final EObject entryRuleNullLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -8454,13 +8454,13 @@ public final EObject entryRuleNullLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3001:2: (iv_ruleNullLiteral= ruleNullLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3002:2: iv_ruleNullLiteral= ruleNullLiteral EOF
+            // InternalExport.g:3001:2: (iv_ruleNullLiteral= ruleNullLiteral EOF )
+            // InternalExport.g:3002:2: iv_ruleNullLiteral= ruleNullLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getNullLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleNullLiteral_in_entryRuleNullLiteral6773);
+            pushFollow(FOLLOW_1);
             iv_ruleNullLiteral=ruleNullLiteral();
 
             state._fsp--;
@@ -8468,7 +8468,7 @@ public final EObject entryRuleNullLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleNullLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNullLiteral6783); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -8486,7 +8486,7 @@ public final EObject entryRuleNullLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleNullLiteral"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3009:1: ruleNullLiteral returns [EObject current=null] : ( (lv_val_0_0= 'null' ) ) ;
+    // InternalExport.g:3009:1: ruleNullLiteral returns [EObject current=null] : ( (lv_val_0_0= 'null' ) ) ;
     public final EObject ruleNullLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -8495,16 +8495,16 @@ public final EObject ruleNullLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3012:28: ( ( (lv_val_0_0= 'null' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3013:1: ( (lv_val_0_0= 'null' ) )
+            // InternalExport.g:3012:28: ( ( (lv_val_0_0= 'null' ) ) )
+            // InternalExport.g:3013:1: ( (lv_val_0_0= 'null' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3013:1: ( (lv_val_0_0= 'null' ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3014:1: (lv_val_0_0= 'null' )
+            // InternalExport.g:3013:1: ( (lv_val_0_0= 'null' ) )
+            // InternalExport.g:3014:1: (lv_val_0_0= 'null' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3014:1: (lv_val_0_0= 'null' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3015:3: lv_val_0_0= 'null'
+            // InternalExport.g:3014:1: (lv_val_0_0= 'null' )
+            // InternalExport.g:3015:3: lv_val_0_0= 'null'
             {
-            lv_val_0_0=(Token)match(input,76,FOLLOW_76_in_ruleNullLiteral6825); if (state.failed) return current;
+            lv_val_0_0=(Token)match(input,76,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                       newLeafNode(lv_val_0_0, grammarAccess.getNullLiteralAccess().getValNullKeyword_0());
@@ -8544,7 +8544,7 @@ public final EObject ruleNullLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleRealLiteral"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3036:1: entryRuleRealLiteral returns [EObject current=null] : iv_ruleRealLiteral= ruleRealLiteral EOF ;
+    // InternalExport.g:3036:1: entryRuleRealLiteral returns [EObject current=null] : iv_ruleRealLiteral= ruleRealLiteral EOF ;
     public final EObject entryRuleRealLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -8552,13 +8552,13 @@ public final EObject entryRuleRealLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3037:2: (iv_ruleRealLiteral= ruleRealLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3038:2: iv_ruleRealLiteral= ruleRealLiteral EOF
+            // InternalExport.g:3037:2: (iv_ruleRealLiteral= ruleRealLiteral EOF )
+            // InternalExport.g:3038:2: iv_ruleRealLiteral= ruleRealLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getRealLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleRealLiteral_in_entryRuleRealLiteral6873);
+            pushFollow(FOLLOW_1);
             iv_ruleRealLiteral=ruleRealLiteral();
 
             state._fsp--;
@@ -8566,7 +8566,7 @@ public final EObject entryRuleRealLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleRealLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRealLiteral6883); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -8584,7 +8584,7 @@ public final EObject entryRuleRealLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleRealLiteral"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3045:1: ruleRealLiteral returns [EObject current=null] : ( (lv_val_0_0= RULE_REAL ) ) ;
+    // InternalExport.g:3045:1: ruleRealLiteral returns [EObject current=null] : ( (lv_val_0_0= RULE_REAL ) ) ;
     public final EObject ruleRealLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -8593,16 +8593,16 @@ public final EObject ruleRealLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3048:28: ( ( (lv_val_0_0= RULE_REAL ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3049:1: ( (lv_val_0_0= RULE_REAL ) )
+            // InternalExport.g:3048:28: ( ( (lv_val_0_0= RULE_REAL ) ) )
+            // InternalExport.g:3049:1: ( (lv_val_0_0= RULE_REAL ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3049:1: ( (lv_val_0_0= RULE_REAL ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3050:1: (lv_val_0_0= RULE_REAL )
+            // InternalExport.g:3049:1: ( (lv_val_0_0= RULE_REAL ) )
+            // InternalExport.g:3050:1: (lv_val_0_0= RULE_REAL )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3050:1: (lv_val_0_0= RULE_REAL )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3051:3: lv_val_0_0= RULE_REAL
+            // InternalExport.g:3050:1: (lv_val_0_0= RULE_REAL )
+            // InternalExport.g:3051:3: lv_val_0_0= RULE_REAL
             {
-            lv_val_0_0=(Token)match(input,RULE_REAL,FOLLOW_RULE_REAL_in_ruleRealLiteral6924); if (state.failed) return current;
+            lv_val_0_0=(Token)match(input,RULE_REAL,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(lv_val_0_0, grammarAccess.getRealLiteralAccess().getValREALTerminalRuleCall_0()); 
@@ -8617,7 +8617,7 @@ public final EObject ruleRealLiteral() throws RecognitionException {
                      			current, 
                      			"val",
                       		lv_val_0_0, 
-                      		"REAL");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.REAL");
               	    
             }
 
@@ -8646,7 +8646,7 @@ public final EObject ruleRealLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleStringLiteral"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3075:1: entryRuleStringLiteral returns [EObject current=null] : iv_ruleStringLiteral= ruleStringLiteral EOF ;
+    // InternalExport.g:3075:1: entryRuleStringLiteral returns [EObject current=null] : iv_ruleStringLiteral= ruleStringLiteral EOF ;
     public final EObject entryRuleStringLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -8654,13 +8654,13 @@ public final EObject entryRuleStringLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3076:2: (iv_ruleStringLiteral= ruleStringLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3077:2: iv_ruleStringLiteral= ruleStringLiteral EOF
+            // InternalExport.g:3076:2: (iv_ruleStringLiteral= ruleStringLiteral EOF )
+            // InternalExport.g:3077:2: iv_ruleStringLiteral= ruleStringLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getStringLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral6964);
+            pushFollow(FOLLOW_1);
             iv_ruleStringLiteral=ruleStringLiteral();
 
             state._fsp--;
@@ -8668,7 +8668,7 @@ public final EObject entryRuleStringLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleStringLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleStringLiteral6974); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -8686,7 +8686,7 @@ public final EObject entryRuleStringLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleStringLiteral"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3084:1: ruleStringLiteral returns [EObject current=null] : ( (lv_val_0_0= RULE_STRING ) ) ;
+    // InternalExport.g:3084:1: ruleStringLiteral returns [EObject current=null] : ( (lv_val_0_0= RULE_STRING ) ) ;
     public final EObject ruleStringLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -8695,16 +8695,16 @@ public final EObject ruleStringLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3087:28: ( ( (lv_val_0_0= RULE_STRING ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3088:1: ( (lv_val_0_0= RULE_STRING ) )
+            // InternalExport.g:3087:28: ( ( (lv_val_0_0= RULE_STRING ) ) )
+            // InternalExport.g:3088:1: ( (lv_val_0_0= RULE_STRING ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3088:1: ( (lv_val_0_0= RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3089:1: (lv_val_0_0= RULE_STRING )
+            // InternalExport.g:3088:1: ( (lv_val_0_0= RULE_STRING ) )
+            // InternalExport.g:3089:1: (lv_val_0_0= RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3089:1: (lv_val_0_0= RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3090:3: lv_val_0_0= RULE_STRING
+            // InternalExport.g:3089:1: (lv_val_0_0= RULE_STRING )
+            // InternalExport.g:3090:3: lv_val_0_0= RULE_STRING
             {
-            lv_val_0_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleStringLiteral7015); if (state.failed) return current;
+            lv_val_0_0=(Token)match(input,RULE_STRING,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(lv_val_0_0, grammarAccess.getStringLiteralAccess().getValSTRINGTerminalRuleCall_0()); 
@@ -8719,7 +8719,7 @@ public final EObject ruleStringLiteral() throws RecognitionException {
                      			current, 
                      			"val",
                       		lv_val_0_0, 
-                      		"STRING");
+                      		"org.eclipse.xtext.common.Terminals.STRING");
               	    
             }
 
@@ -8748,7 +8748,7 @@ public final EObject ruleStringLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleParanthesizedExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3114:1: entryRuleParanthesizedExpression returns [EObject current=null] : iv_ruleParanthesizedExpression= ruleParanthesizedExpression EOF ;
+    // InternalExport.g:3114:1: entryRuleParanthesizedExpression returns [EObject current=null] : iv_ruleParanthesizedExpression= ruleParanthesizedExpression EOF ;
     public final EObject entryRuleParanthesizedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -8756,13 +8756,13 @@ public final EObject entryRuleParanthesizedExpression() throws RecognitionExcept
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3115:2: (iv_ruleParanthesizedExpression= ruleParanthesizedExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3116:2: iv_ruleParanthesizedExpression= ruleParanthesizedExpression EOF
+            // InternalExport.g:3115:2: (iv_ruleParanthesizedExpression= ruleParanthesizedExpression EOF )
+            // InternalExport.g:3116:2: iv_ruleParanthesizedExpression= ruleParanthesizedExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getParanthesizedExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleParanthesizedExpression_in_entryRuleParanthesizedExpression7055);
+            pushFollow(FOLLOW_1);
             iv_ruleParanthesizedExpression=ruleParanthesizedExpression();
 
             state._fsp--;
@@ -8770,7 +8770,7 @@ public final EObject entryRuleParanthesizedExpression() throws RecognitionExcept
             if ( state.backtracking==0 ) {
                current =iv_ruleParanthesizedExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleParanthesizedExpression7065); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -8788,7 +8788,7 @@ public final EObject entryRuleParanthesizedExpression() throws RecognitionExcept
 
 
     // $ANTLR start "ruleParanthesizedExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3123:1: ruleParanthesizedExpression returns [EObject current=null] : (otherlv_0= '(' this_Expression_1= ruleExpression otherlv_2= ')' ) ;
+    // InternalExport.g:3123:1: ruleParanthesizedExpression returns [EObject current=null] : (otherlv_0= '(' this_Expression_1= ruleExpression otherlv_2= ')' ) ;
     public final EObject ruleParanthesizedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -8800,13 +8800,13 @@ public final EObject ruleParanthesizedExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3126:28: ( (otherlv_0= '(' this_Expression_1= ruleExpression otherlv_2= ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3127:1: (otherlv_0= '(' this_Expression_1= ruleExpression otherlv_2= ')' )
+            // InternalExport.g:3126:28: ( (otherlv_0= '(' this_Expression_1= ruleExpression otherlv_2= ')' ) )
+            // InternalExport.g:3127:1: (otherlv_0= '(' this_Expression_1= ruleExpression otherlv_2= ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3127:1: (otherlv_0= '(' this_Expression_1= ruleExpression otherlv_2= ')' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3127:3: otherlv_0= '(' this_Expression_1= ruleExpression otherlv_2= ')'
+            // InternalExport.g:3127:1: (otherlv_0= '(' this_Expression_1= ruleExpression otherlv_2= ')' )
+            // InternalExport.g:3127:3: otherlv_0= '(' this_Expression_1= ruleExpression otherlv_2= ')'
             {
-            otherlv_0=(Token)match(input,28,FOLLOW_28_in_ruleParanthesizedExpression7102); if (state.failed) return current;
+            otherlv_0=(Token)match(input,28,FOLLOW_15); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getParanthesizedExpressionAccess().getLeftParenthesisKeyword_0());
@@ -8817,7 +8817,7 @@ public final EObject ruleParanthesizedExpression() throws RecognitionException {
                       newCompositeNode(grammarAccess.getParanthesizedExpressionAccess().getExpressionParserRuleCall_1()); 
                   
             }
-            pushFollow(FOLLOW_ruleExpression_in_ruleParanthesizedExpression7124);
+            pushFollow(FOLLOW_24);
             this_Expression_1=ruleExpression();
 
             state._fsp--;
@@ -8828,7 +8828,7 @@ public final EObject ruleParanthesizedExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            otherlv_2=(Token)match(input,29,FOLLOW_29_in_ruleParanthesizedExpression7135); if (state.failed) return current;
+            otherlv_2=(Token)match(input,29,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getParanthesizedExpressionAccess().getRightParenthesisKeyword_2());
@@ -8857,7 +8857,7 @@ public final EObject ruleParanthesizedExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleGlobalVarExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3152:1: entryRuleGlobalVarExpression returns [EObject current=null] : iv_ruleGlobalVarExpression= ruleGlobalVarExpression EOF ;
+    // InternalExport.g:3152:1: entryRuleGlobalVarExpression returns [EObject current=null] : iv_ruleGlobalVarExpression= ruleGlobalVarExpression EOF ;
     public final EObject entryRuleGlobalVarExpression() throws RecognitionException {
         EObject current = null;
 
@@ -8865,13 +8865,13 @@ public final EObject entryRuleGlobalVarExpression() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3153:2: (iv_ruleGlobalVarExpression= ruleGlobalVarExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3154:2: iv_ruleGlobalVarExpression= ruleGlobalVarExpression EOF
+            // InternalExport.g:3153:2: (iv_ruleGlobalVarExpression= ruleGlobalVarExpression EOF )
+            // InternalExport.g:3154:2: iv_ruleGlobalVarExpression= ruleGlobalVarExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getGlobalVarExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleGlobalVarExpression_in_entryRuleGlobalVarExpression7171);
+            pushFollow(FOLLOW_1);
             iv_ruleGlobalVarExpression=ruleGlobalVarExpression();
 
             state._fsp--;
@@ -8879,7 +8879,7 @@ public final EObject entryRuleGlobalVarExpression() throws RecognitionException
             if ( state.backtracking==0 ) {
                current =iv_ruleGlobalVarExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleGlobalVarExpression7181); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -8897,7 +8897,7 @@ public final EObject entryRuleGlobalVarExpression() throws RecognitionException
 
 
     // $ANTLR start "ruleGlobalVarExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3161:1: ruleGlobalVarExpression returns [EObject current=null] : (otherlv_0= 'GLOBALVAR' ( (lv_name_1_0= ruleIdentifier ) ) ) ;
+    // InternalExport.g:3161:1: ruleGlobalVarExpression returns [EObject current=null] : (otherlv_0= 'GLOBALVAR' ( (lv_name_1_0= ruleIdentifier ) ) ) ;
     public final EObject ruleGlobalVarExpression() throws RecognitionException {
         EObject current = null;
 
@@ -8908,30 +8908,30 @@ public final EObject ruleGlobalVarExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3164:28: ( (otherlv_0= 'GLOBALVAR' ( (lv_name_1_0= ruleIdentifier ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3165:1: (otherlv_0= 'GLOBALVAR' ( (lv_name_1_0= ruleIdentifier ) ) )
+            // InternalExport.g:3164:28: ( (otherlv_0= 'GLOBALVAR' ( (lv_name_1_0= ruleIdentifier ) ) ) )
+            // InternalExport.g:3165:1: (otherlv_0= 'GLOBALVAR' ( (lv_name_1_0= ruleIdentifier ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3165:1: (otherlv_0= 'GLOBALVAR' ( (lv_name_1_0= ruleIdentifier ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3165:3: otherlv_0= 'GLOBALVAR' ( (lv_name_1_0= ruleIdentifier ) )
+            // InternalExport.g:3165:1: (otherlv_0= 'GLOBALVAR' ( (lv_name_1_0= ruleIdentifier ) ) )
+            // InternalExport.g:3165:3: otherlv_0= 'GLOBALVAR' ( (lv_name_1_0= ruleIdentifier ) )
             {
-            otherlv_0=(Token)match(input,77,FOLLOW_77_in_ruleGlobalVarExpression7218); if (state.failed) return current;
+            otherlv_0=(Token)match(input,77,FOLLOW_4); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getGlobalVarExpressionAccess().getGLOBALVARKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3169:1: ( (lv_name_1_0= ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3170:1: (lv_name_1_0= ruleIdentifier )
+            // InternalExport.g:3169:1: ( (lv_name_1_0= ruleIdentifier ) )
+            // InternalExport.g:3170:1: (lv_name_1_0= ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3170:1: (lv_name_1_0= ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3171:3: lv_name_1_0= ruleIdentifier
+            // InternalExport.g:3170:1: (lv_name_1_0= ruleIdentifier )
+            // InternalExport.g:3171:3: lv_name_1_0= ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getGlobalVarExpressionAccess().getNameIdentifierParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_ruleGlobalVarExpression7239);
+            pushFollow(FOLLOW_2);
             lv_name_1_0=ruleIdentifier();
 
             state._fsp--;
@@ -8945,7 +8945,7 @@ public final EObject ruleGlobalVarExpression() throws RecognitionException {
                      			current, 
                      			"name",
                       		lv_name_1_0, 
-                      		"Identifier");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -8978,7 +8978,7 @@ public final EObject ruleGlobalVarExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleFeatureCall"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3195:1: entryRuleFeatureCall returns [EObject current=null] : iv_ruleFeatureCall= ruleFeatureCall EOF ;
+    // InternalExport.g:3195:1: entryRuleFeatureCall returns [EObject current=null] : iv_ruleFeatureCall= ruleFeatureCall EOF ;
     public final EObject entryRuleFeatureCall() throws RecognitionException {
         EObject current = null;
 
@@ -8986,13 +8986,13 @@ public final EObject entryRuleFeatureCall() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3196:2: (iv_ruleFeatureCall= ruleFeatureCall EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3197:2: iv_ruleFeatureCall= ruleFeatureCall EOF
+            // InternalExport.g:3196:2: (iv_ruleFeatureCall= ruleFeatureCall EOF )
+            // InternalExport.g:3197:2: iv_ruleFeatureCall= ruleFeatureCall EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getFeatureCallRule()); 
             }
-            pushFollow(FOLLOW_ruleFeatureCall_in_entryRuleFeatureCall7275);
+            pushFollow(FOLLOW_1);
             iv_ruleFeatureCall=ruleFeatureCall();
 
             state._fsp--;
@@ -9000,7 +9000,7 @@ public final EObject entryRuleFeatureCall() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleFeatureCall; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFeatureCall7285); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -9018,7 +9018,7 @@ public final EObject entryRuleFeatureCall() throws RecognitionException {
 
 
     // $ANTLR start "ruleFeatureCall"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3204:1: ruleFeatureCall returns [EObject current=null] : (this_OperationCall_0= ruleOperationCall | ( (lv_type_1_0= ruleType ) ) | this_CollectionExpression_2= ruleCollectionExpression | this_TypeSelectExpression_3= ruleTypeSelectExpression ) ;
+    // InternalExport.g:3204:1: ruleFeatureCall returns [EObject current=null] : (this_OperationCall_0= ruleOperationCall | ( (lv_type_1_0= ruleType ) ) | this_CollectionExpression_2= ruleCollectionExpression | this_TypeSelectExpression_3= ruleTypeSelectExpression ) ;
     public final EObject ruleFeatureCall() throws RecognitionException {
         EObject current = null;
 
@@ -9034,10 +9034,10 @@ public final EObject ruleFeatureCall() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3207:28: ( (this_OperationCall_0= ruleOperationCall | ( (lv_type_1_0= ruleType ) ) | this_CollectionExpression_2= ruleCollectionExpression | this_TypeSelectExpression_3= ruleTypeSelectExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3208:1: (this_OperationCall_0= ruleOperationCall | ( (lv_type_1_0= ruleType ) ) | this_CollectionExpression_2= ruleCollectionExpression | this_TypeSelectExpression_3= ruleTypeSelectExpression )
+            // InternalExport.g:3207:28: ( (this_OperationCall_0= ruleOperationCall | ( (lv_type_1_0= ruleType ) ) | this_CollectionExpression_2= ruleCollectionExpression | this_TypeSelectExpression_3= ruleTypeSelectExpression ) )
+            // InternalExport.g:3208:1: (this_OperationCall_0= ruleOperationCall | ( (lv_type_1_0= ruleType ) ) | this_CollectionExpression_2= ruleCollectionExpression | this_TypeSelectExpression_3= ruleTypeSelectExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3208:1: (this_OperationCall_0= ruleOperationCall | ( (lv_type_1_0= ruleType ) ) | this_CollectionExpression_2= ruleCollectionExpression | this_TypeSelectExpression_3= ruleTypeSelectExpression )
+            // InternalExport.g:3208:1: (this_OperationCall_0= ruleOperationCall | ( (lv_type_1_0= ruleType ) ) | this_CollectionExpression_2= ruleCollectionExpression | this_TypeSelectExpression_3= ruleTypeSelectExpression )
             int alt56=4;
             switch ( input.LA(1) ) {
             case RULE_ID:
@@ -9093,14 +9093,14 @@ else if ( (LA56_1==28) ) {
 
             switch (alt56) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3209:5: this_OperationCall_0= ruleOperationCall
+                    // InternalExport.g:3209:5: this_OperationCall_0= ruleOperationCall
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getFeatureCallAccess().getOperationCallParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleOperationCall_in_ruleFeatureCall7332);
+                    pushFollow(FOLLOW_2);
                     this_OperationCall_0=ruleOperationCall();
 
                     state._fsp--;
@@ -9115,20 +9115,20 @@ else if ( (LA56_1==28) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3218:6: ( (lv_type_1_0= ruleType ) )
+                    // InternalExport.g:3218:6: ( (lv_type_1_0= ruleType ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3218:6: ( (lv_type_1_0= ruleType ) )
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3219:1: (lv_type_1_0= ruleType )
+                    // InternalExport.g:3218:6: ( (lv_type_1_0= ruleType ) )
+                    // InternalExport.g:3219:1: (lv_type_1_0= ruleType )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3219:1: (lv_type_1_0= ruleType )
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3220:3: lv_type_1_0= ruleType
+                    // InternalExport.g:3219:1: (lv_type_1_0= ruleType )
+                    // InternalExport.g:3220:3: lv_type_1_0= ruleType
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getFeatureCallAccess().getTypeTypeParserRuleCall_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleType_in_ruleFeatureCall7358);
+                    pushFollow(FOLLOW_2);
                     lv_type_1_0=ruleType();
 
                     state._fsp--;
@@ -9142,7 +9142,7 @@ else if ( (LA56_1==28) ) {
                              			current, 
                              			"type",
                               		lv_type_1_0, 
-                              		"Type");
+                              		"com.avaloq.tools.ddk.xtext.expression.Expression.Type");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -9156,14 +9156,14 @@ else if ( (LA56_1==28) ) {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3238:5: this_CollectionExpression_2= ruleCollectionExpression
+                    // InternalExport.g:3238:5: this_CollectionExpression_2= ruleCollectionExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getFeatureCallAccess().getCollectionExpressionParserRuleCall_2()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleCollectionExpression_in_ruleFeatureCall7386);
+                    pushFollow(FOLLOW_2);
                     this_CollectionExpression_2=ruleCollectionExpression();
 
                     state._fsp--;
@@ -9178,14 +9178,14 @@ else if ( (LA56_1==28) ) {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3248:5: this_TypeSelectExpression_3= ruleTypeSelectExpression
+                    // InternalExport.g:3248:5: this_TypeSelectExpression_3= ruleTypeSelectExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getFeatureCallAccess().getTypeSelectExpressionParserRuleCall_3()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleTypeSelectExpression_in_ruleFeatureCall7413);
+                    pushFollow(FOLLOW_2);
                     this_TypeSelectExpression_3=ruleTypeSelectExpression();
 
                     state._fsp--;
@@ -9222,7 +9222,7 @@ else if ( (LA56_1==28) ) {
 
 
     // $ANTLR start "entryRuleOperationCall"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3264:1: entryRuleOperationCall returns [EObject current=null] : iv_ruleOperationCall= ruleOperationCall EOF ;
+    // InternalExport.g:3264:1: entryRuleOperationCall returns [EObject current=null] : iv_ruleOperationCall= ruleOperationCall EOF ;
     public final EObject entryRuleOperationCall() throws RecognitionException {
         EObject current = null;
 
@@ -9230,13 +9230,13 @@ public final EObject entryRuleOperationCall() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3265:2: (iv_ruleOperationCall= ruleOperationCall EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3266:2: iv_ruleOperationCall= ruleOperationCall EOF
+            // InternalExport.g:3265:2: (iv_ruleOperationCall= ruleOperationCall EOF )
+            // InternalExport.g:3266:2: iv_ruleOperationCall= ruleOperationCall EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOperationCallRule()); 
             }
-            pushFollow(FOLLOW_ruleOperationCall_in_entryRuleOperationCall7448);
+            pushFollow(FOLLOW_1);
             iv_ruleOperationCall=ruleOperationCall();
 
             state._fsp--;
@@ -9244,7 +9244,7 @@ public final EObject entryRuleOperationCall() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOperationCall; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOperationCall7458); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -9262,7 +9262,7 @@ public final EObject entryRuleOperationCall() throws RecognitionException {
 
 
     // $ANTLR start "ruleOperationCall"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3273:1: ruleOperationCall returns [EObject current=null] : ( ( (lv_name_0_0= ruleIdentifier ) ) otherlv_1= '(' ( ( (lv_params_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )* )? otherlv_5= ')' ) ;
+    // InternalExport.g:3273:1: ruleOperationCall returns [EObject current=null] : ( ( (lv_name_0_0= ruleIdentifier ) ) otherlv_1= '(' ( ( (lv_params_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )* )? otherlv_5= ')' ) ;
     public final EObject ruleOperationCall() throws RecognitionException {
         EObject current = null;
 
@@ -9279,24 +9279,24 @@ public final EObject ruleOperationCall() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3276:28: ( ( ( (lv_name_0_0= ruleIdentifier ) ) otherlv_1= '(' ( ( (lv_params_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )* )? otherlv_5= ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3277:1: ( ( (lv_name_0_0= ruleIdentifier ) ) otherlv_1= '(' ( ( (lv_params_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )* )? otherlv_5= ')' )
+            // InternalExport.g:3276:28: ( ( ( (lv_name_0_0= ruleIdentifier ) ) otherlv_1= '(' ( ( (lv_params_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )* )? otherlv_5= ')' ) )
+            // InternalExport.g:3277:1: ( ( (lv_name_0_0= ruleIdentifier ) ) otherlv_1= '(' ( ( (lv_params_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )* )? otherlv_5= ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3277:1: ( ( (lv_name_0_0= ruleIdentifier ) ) otherlv_1= '(' ( ( (lv_params_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )* )? otherlv_5= ')' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3277:2: ( (lv_name_0_0= ruleIdentifier ) ) otherlv_1= '(' ( ( (lv_params_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )* )? otherlv_5= ')'
+            // InternalExport.g:3277:1: ( ( (lv_name_0_0= ruleIdentifier ) ) otherlv_1= '(' ( ( (lv_params_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )* )? otherlv_5= ')' )
+            // InternalExport.g:3277:2: ( (lv_name_0_0= ruleIdentifier ) ) otherlv_1= '(' ( ( (lv_params_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )* )? otherlv_5= ')'
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3277:2: ( (lv_name_0_0= ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3278:1: (lv_name_0_0= ruleIdentifier )
+            // InternalExport.g:3277:2: ( (lv_name_0_0= ruleIdentifier ) )
+            // InternalExport.g:3278:1: (lv_name_0_0= ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3278:1: (lv_name_0_0= ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3279:3: lv_name_0_0= ruleIdentifier
+            // InternalExport.g:3278:1: (lv_name_0_0= ruleIdentifier )
+            // InternalExport.g:3279:3: lv_name_0_0= ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getOperationCallAccess().getNameIdentifierParserRuleCall_0_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_ruleOperationCall7504);
+            pushFollow(FOLLOW_23);
             lv_name_0_0=ruleIdentifier();
 
             state._fsp--;
@@ -9310,7 +9310,7 @@ public final EObject ruleOperationCall() throws RecognitionException {
                      			current, 
                      			"name",
                       		lv_name_0_0, 
-                      		"Identifier");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -9320,13 +9320,13 @@ public final EObject ruleOperationCall() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,28,FOLLOW_28_in_ruleOperationCall7516); if (state.failed) return current;
+            otherlv_1=(Token)match(input,28,FOLLOW_56); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getOperationCallAccess().getLeftParenthesisKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3299:1: ( ( (lv_params_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )* )?
+            // InternalExport.g:3299:1: ( ( (lv_params_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )* )?
             int alt58=2;
             int LA58_0 = input.LA(1);
 
@@ -9335,20 +9335,20 @@ public final EObject ruleOperationCall() throws RecognitionException {
             }
             switch (alt58) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3299:2: ( (lv_params_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )*
+                    // InternalExport.g:3299:2: ( (lv_params_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )*
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3299:2: ( (lv_params_2_0= ruleExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3300:1: (lv_params_2_0= ruleExpression )
+                    // InternalExport.g:3299:2: ( (lv_params_2_0= ruleExpression ) )
+                    // InternalExport.g:3300:1: (lv_params_2_0= ruleExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3300:1: (lv_params_2_0= ruleExpression )
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3301:3: lv_params_2_0= ruleExpression
+                    // InternalExport.g:3300:1: (lv_params_2_0= ruleExpression )
+                    // InternalExport.g:3301:3: lv_params_2_0= ruleExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getOperationCallAccess().getParamsExpressionParserRuleCall_2_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleExpression_in_ruleOperationCall7538);
+                    pushFollow(FOLLOW_57);
                     lv_params_2_0=ruleExpression();
 
                     state._fsp--;
@@ -9362,7 +9362,7 @@ public final EObject ruleOperationCall() throws RecognitionException {
                              			current, 
                              			"params",
                               		lv_params_2_0, 
-                              		"Expression");
+                              		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -9372,7 +9372,7 @@ public final EObject ruleOperationCall() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3317:2: (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )*
+                    // InternalExport.g:3317:2: (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )*
                     loop57:
                     do {
                         int alt57=2;
@@ -9385,26 +9385,26 @@ public final EObject ruleOperationCall() throws RecognitionException {
 
                         switch (alt57) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3317:4: otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) )
+                    	    // InternalExport.g:3317:4: otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) )
                     	    {
-                    	    otherlv_3=(Token)match(input,23,FOLLOW_23_in_ruleOperationCall7551); if (state.failed) return current;
+                    	    otherlv_3=(Token)match(input,23,FOLLOW_15); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_3, grammarAccess.getOperationCallAccess().getCommaKeyword_2_1_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3321:1: ( (lv_params_4_0= ruleExpression ) )
-                    	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3322:1: (lv_params_4_0= ruleExpression )
+                    	    // InternalExport.g:3321:1: ( (lv_params_4_0= ruleExpression ) )
+                    	    // InternalExport.g:3322:1: (lv_params_4_0= ruleExpression )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3322:1: (lv_params_4_0= ruleExpression )
-                    	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3323:3: lv_params_4_0= ruleExpression
+                    	    // InternalExport.g:3322:1: (lv_params_4_0= ruleExpression )
+                    	    // InternalExport.g:3323:3: lv_params_4_0= ruleExpression
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getOperationCallAccess().getParamsExpressionParserRuleCall_2_1_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleExpression_in_ruleOperationCall7572);
+                    	    pushFollow(FOLLOW_57);
                     	    lv_params_4_0=ruleExpression();
 
                     	    state._fsp--;
@@ -9418,7 +9418,7 @@ public final EObject ruleOperationCall() throws RecognitionException {
                     	             			current, 
                     	             			"params",
                     	              		lv_params_4_0, 
-                    	              		"Expression");
+                    	              		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -9443,7 +9443,7 @@ public final EObject ruleOperationCall() throws RecognitionException {
 
             }
 
-            otherlv_5=(Token)match(input,29,FOLLOW_29_in_ruleOperationCall7588); if (state.failed) return current;
+            otherlv_5=(Token)match(input,29,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_5, grammarAccess.getOperationCallAccess().getRightParenthesisKeyword_3());
@@ -9472,7 +9472,7 @@ public final EObject ruleOperationCall() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleListLiteral"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3351:1: entryRuleListLiteral returns [EObject current=null] : iv_ruleListLiteral= ruleListLiteral EOF ;
+    // InternalExport.g:3351:1: entryRuleListLiteral returns [EObject current=null] : iv_ruleListLiteral= ruleListLiteral EOF ;
     public final EObject entryRuleListLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -9480,13 +9480,13 @@ public final EObject entryRuleListLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3352:2: (iv_ruleListLiteral= ruleListLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3353:2: iv_ruleListLiteral= ruleListLiteral EOF
+            // InternalExport.g:3352:2: (iv_ruleListLiteral= ruleListLiteral EOF )
+            // InternalExport.g:3353:2: iv_ruleListLiteral= ruleListLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getListLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleListLiteral_in_entryRuleListLiteral7624);
+            pushFollow(FOLLOW_1);
             iv_ruleListLiteral=ruleListLiteral();
 
             state._fsp--;
@@ -9494,7 +9494,7 @@ public final EObject entryRuleListLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleListLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleListLiteral7634); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -9512,7 +9512,7 @@ public final EObject entryRuleListLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleListLiteral"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3360:1: ruleListLiteral returns [EObject current=null] : ( () otherlv_1= '{' ( ( (lv_elements_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )* )? otherlv_5= '}' ) ;
+    // InternalExport.g:3360:1: ruleListLiteral returns [EObject current=null] : ( () otherlv_1= '{' ( ( (lv_elements_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )* )? otherlv_5= '}' ) ;
     public final EObject ruleListLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -9527,14 +9527,14 @@ public final EObject ruleListLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3363:28: ( ( () otherlv_1= '{' ( ( (lv_elements_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )* )? otherlv_5= '}' ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3364:1: ( () otherlv_1= '{' ( ( (lv_elements_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )* )? otherlv_5= '}' )
+            // InternalExport.g:3363:28: ( ( () otherlv_1= '{' ( ( (lv_elements_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )* )? otherlv_5= '}' ) )
+            // InternalExport.g:3364:1: ( () otherlv_1= '{' ( ( (lv_elements_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )* )? otherlv_5= '}' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3364:1: ( () otherlv_1= '{' ( ( (lv_elements_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )* )? otherlv_5= '}' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3364:2: () otherlv_1= '{' ( ( (lv_elements_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )* )? otherlv_5= '}'
+            // InternalExport.g:3364:1: ( () otherlv_1= '{' ( ( (lv_elements_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )* )? otherlv_5= '}' )
+            // InternalExport.g:3364:2: () otherlv_1= '{' ( ( (lv_elements_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )* )? otherlv_5= '}'
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3364:2: ()
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3365:5: 
+            // InternalExport.g:3364:2: ()
+            // InternalExport.g:3365:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -9546,13 +9546,13 @@ public final EObject ruleListLiteral() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,16,FOLLOW_16_in_ruleListLiteral7680); if (state.failed) return current;
+            otherlv_1=(Token)match(input,16,FOLLOW_61); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getListLiteralAccess().getLeftCurlyBracketKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3374:1: ( ( (lv_elements_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )* )?
+            // InternalExport.g:3374:1: ( ( (lv_elements_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )* )?
             int alt60=2;
             int LA60_0 = input.LA(1);
 
@@ -9561,20 +9561,20 @@ public final EObject ruleListLiteral() throws RecognitionException {
             }
             switch (alt60) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3374:2: ( (lv_elements_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )*
+                    // InternalExport.g:3374:2: ( (lv_elements_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )*
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3374:2: ( (lv_elements_2_0= ruleExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3375:1: (lv_elements_2_0= ruleExpression )
+                    // InternalExport.g:3374:2: ( (lv_elements_2_0= ruleExpression ) )
+                    // InternalExport.g:3375:1: (lv_elements_2_0= ruleExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3375:1: (lv_elements_2_0= ruleExpression )
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3376:3: lv_elements_2_0= ruleExpression
+                    // InternalExport.g:3375:1: (lv_elements_2_0= ruleExpression )
+                    // InternalExport.g:3376:3: lv_elements_2_0= ruleExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getListLiteralAccess().getElementsExpressionParserRuleCall_2_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleExpression_in_ruleListLiteral7702);
+                    pushFollow(FOLLOW_62);
                     lv_elements_2_0=ruleExpression();
 
                     state._fsp--;
@@ -9588,7 +9588,7 @@ public final EObject ruleListLiteral() throws RecognitionException {
                              			current, 
                              			"elements",
                               		lv_elements_2_0, 
-                              		"Expression");
+                              		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -9598,7 +9598,7 @@ public final EObject ruleListLiteral() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3392:2: (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )*
+                    // InternalExport.g:3392:2: (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )*
                     loop59:
                     do {
                         int alt59=2;
@@ -9611,26 +9611,26 @@ public final EObject ruleListLiteral() throws RecognitionException {
 
                         switch (alt59) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3392:4: otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) )
+                    	    // InternalExport.g:3392:4: otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) )
                     	    {
-                    	    otherlv_3=(Token)match(input,23,FOLLOW_23_in_ruleListLiteral7715); if (state.failed) return current;
+                    	    otherlv_3=(Token)match(input,23,FOLLOW_15); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_3, grammarAccess.getListLiteralAccess().getCommaKeyword_2_1_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3396:1: ( (lv_elements_4_0= ruleExpression ) )
-                    	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3397:1: (lv_elements_4_0= ruleExpression )
+                    	    // InternalExport.g:3396:1: ( (lv_elements_4_0= ruleExpression ) )
+                    	    // InternalExport.g:3397:1: (lv_elements_4_0= ruleExpression )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3397:1: (lv_elements_4_0= ruleExpression )
-                    	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3398:3: lv_elements_4_0= ruleExpression
+                    	    // InternalExport.g:3397:1: (lv_elements_4_0= ruleExpression )
+                    	    // InternalExport.g:3398:3: lv_elements_4_0= ruleExpression
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getListLiteralAccess().getElementsExpressionParserRuleCall_2_1_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleExpression_in_ruleListLiteral7736);
+                    	    pushFollow(FOLLOW_62);
                     	    lv_elements_4_0=ruleExpression();
 
                     	    state._fsp--;
@@ -9644,7 +9644,7 @@ public final EObject ruleListLiteral() throws RecognitionException {
                     	             			current, 
                     	             			"elements",
                     	              		lv_elements_4_0, 
-                    	              		"Expression");
+                    	              		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -9669,7 +9669,7 @@ public final EObject ruleListLiteral() throws RecognitionException {
 
             }
 
-            otherlv_5=(Token)match(input,17,FOLLOW_17_in_ruleListLiteral7752); if (state.failed) return current;
+            otherlv_5=(Token)match(input,17,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_5, grammarAccess.getListLiteralAccess().getRightCurlyBracketKeyword_3());
@@ -9698,7 +9698,7 @@ public final EObject ruleListLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleConstructorCallExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3426:1: entryRuleConstructorCallExpression returns [EObject current=null] : iv_ruleConstructorCallExpression= ruleConstructorCallExpression EOF ;
+    // InternalExport.g:3426:1: entryRuleConstructorCallExpression returns [EObject current=null] : iv_ruleConstructorCallExpression= ruleConstructorCallExpression EOF ;
     public final EObject entryRuleConstructorCallExpression() throws RecognitionException {
         EObject current = null;
 
@@ -9706,13 +9706,13 @@ public final EObject entryRuleConstructorCallExpression() throws RecognitionExce
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3427:2: (iv_ruleConstructorCallExpression= ruleConstructorCallExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3428:2: iv_ruleConstructorCallExpression= ruleConstructorCallExpression EOF
+            // InternalExport.g:3427:2: (iv_ruleConstructorCallExpression= ruleConstructorCallExpression EOF )
+            // InternalExport.g:3428:2: iv_ruleConstructorCallExpression= ruleConstructorCallExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getConstructorCallExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleConstructorCallExpression_in_entryRuleConstructorCallExpression7788);
+            pushFollow(FOLLOW_1);
             iv_ruleConstructorCallExpression=ruleConstructorCallExpression();
 
             state._fsp--;
@@ -9720,7 +9720,7 @@ public final EObject entryRuleConstructorCallExpression() throws RecognitionExce
             if ( state.backtracking==0 ) {
                current =iv_ruleConstructorCallExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleConstructorCallExpression7798); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -9738,7 +9738,7 @@ public final EObject entryRuleConstructorCallExpression() throws RecognitionExce
 
 
     // $ANTLR start "ruleConstructorCallExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3435:1: ruleConstructorCallExpression returns [EObject current=null] : (otherlv_0= 'new' ( (lv_type_1_0= ruleSimpleType ) ) ) ;
+    // InternalExport.g:3435:1: ruleConstructorCallExpression returns [EObject current=null] : (otherlv_0= 'new' ( (lv_type_1_0= ruleSimpleType ) ) ) ;
     public final EObject ruleConstructorCallExpression() throws RecognitionException {
         EObject current = null;
 
@@ -9749,30 +9749,30 @@ public final EObject ruleConstructorCallExpression() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3438:28: ( (otherlv_0= 'new' ( (lv_type_1_0= ruleSimpleType ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3439:1: (otherlv_0= 'new' ( (lv_type_1_0= ruleSimpleType ) ) )
+            // InternalExport.g:3438:28: ( (otherlv_0= 'new' ( (lv_type_1_0= ruleSimpleType ) ) ) )
+            // InternalExport.g:3439:1: (otherlv_0= 'new' ( (lv_type_1_0= ruleSimpleType ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3439:1: (otherlv_0= 'new' ( (lv_type_1_0= ruleSimpleType ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3439:3: otherlv_0= 'new' ( (lv_type_1_0= ruleSimpleType ) )
+            // InternalExport.g:3439:1: (otherlv_0= 'new' ( (lv_type_1_0= ruleSimpleType ) ) )
+            // InternalExport.g:3439:3: otherlv_0= 'new' ( (lv_type_1_0= ruleSimpleType ) )
             {
-            otherlv_0=(Token)match(input,78,FOLLOW_78_in_ruleConstructorCallExpression7835); if (state.failed) return current;
+            otherlv_0=(Token)match(input,78,FOLLOW_40); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getConstructorCallExpressionAccess().getNewKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3443:1: ( (lv_type_1_0= ruleSimpleType ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3444:1: (lv_type_1_0= ruleSimpleType )
+            // InternalExport.g:3443:1: ( (lv_type_1_0= ruleSimpleType ) )
+            // InternalExport.g:3444:1: (lv_type_1_0= ruleSimpleType )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3444:1: (lv_type_1_0= ruleSimpleType )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3445:3: lv_type_1_0= ruleSimpleType
+            // InternalExport.g:3444:1: (lv_type_1_0= ruleSimpleType )
+            // InternalExport.g:3445:3: lv_type_1_0= ruleSimpleType
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getConstructorCallExpressionAccess().getTypeSimpleTypeParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleSimpleType_in_ruleConstructorCallExpression7856);
+            pushFollow(FOLLOW_2);
             lv_type_1_0=ruleSimpleType();
 
             state._fsp--;
@@ -9786,7 +9786,7 @@ public final EObject ruleConstructorCallExpression() throws RecognitionException
                      			current, 
                      			"type",
                       		lv_type_1_0, 
-                      		"SimpleType");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.SimpleType");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -9819,7 +9819,7 @@ public final EObject ruleConstructorCallExpression() throws RecognitionException
 
 
     // $ANTLR start "entryRuleTypeSelectExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3469:1: entryRuleTypeSelectExpression returns [EObject current=null] : iv_ruleTypeSelectExpression= ruleTypeSelectExpression EOF ;
+    // InternalExport.g:3469:1: entryRuleTypeSelectExpression returns [EObject current=null] : iv_ruleTypeSelectExpression= ruleTypeSelectExpression EOF ;
     public final EObject entryRuleTypeSelectExpression() throws RecognitionException {
         EObject current = null;
 
@@ -9827,13 +9827,13 @@ public final EObject entryRuleTypeSelectExpression() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3470:2: (iv_ruleTypeSelectExpression= ruleTypeSelectExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3471:2: iv_ruleTypeSelectExpression= ruleTypeSelectExpression EOF
+            // InternalExport.g:3470:2: (iv_ruleTypeSelectExpression= ruleTypeSelectExpression EOF )
+            // InternalExport.g:3471:2: iv_ruleTypeSelectExpression= ruleTypeSelectExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTypeSelectExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleTypeSelectExpression_in_entryRuleTypeSelectExpression7892);
+            pushFollow(FOLLOW_1);
             iv_ruleTypeSelectExpression=ruleTypeSelectExpression();
 
             state._fsp--;
@@ -9841,7 +9841,7 @@ public final EObject entryRuleTypeSelectExpression() throws RecognitionException
             if ( state.backtracking==0 ) {
                current =iv_ruleTypeSelectExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTypeSelectExpression7902); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -9859,7 +9859,7 @@ public final EObject entryRuleTypeSelectExpression() throws RecognitionException
 
 
     // $ANTLR start "ruleTypeSelectExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3478:1: ruleTypeSelectExpression returns [EObject current=null] : ( ( (lv_name_0_0= 'typeSelect' ) ) otherlv_1= '(' ( (lv_type_2_0= ruleType ) ) otherlv_3= ')' ) ;
+    // InternalExport.g:3478:1: ruleTypeSelectExpression returns [EObject current=null] : ( ( (lv_name_0_0= 'typeSelect' ) ) otherlv_1= '(' ( (lv_type_2_0= ruleType ) ) otherlv_3= ')' ) ;
     public final EObject ruleTypeSelectExpression() throws RecognitionException {
         EObject current = null;
 
@@ -9872,19 +9872,19 @@ public final EObject ruleTypeSelectExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3481:28: ( ( ( (lv_name_0_0= 'typeSelect' ) ) otherlv_1= '(' ( (lv_type_2_0= ruleType ) ) otherlv_3= ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3482:1: ( ( (lv_name_0_0= 'typeSelect' ) ) otherlv_1= '(' ( (lv_type_2_0= ruleType ) ) otherlv_3= ')' )
+            // InternalExport.g:3481:28: ( ( ( (lv_name_0_0= 'typeSelect' ) ) otherlv_1= '(' ( (lv_type_2_0= ruleType ) ) otherlv_3= ')' ) )
+            // InternalExport.g:3482:1: ( ( (lv_name_0_0= 'typeSelect' ) ) otherlv_1= '(' ( (lv_type_2_0= ruleType ) ) otherlv_3= ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3482:1: ( ( (lv_name_0_0= 'typeSelect' ) ) otherlv_1= '(' ( (lv_type_2_0= ruleType ) ) otherlv_3= ')' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3482:2: ( (lv_name_0_0= 'typeSelect' ) ) otherlv_1= '(' ( (lv_type_2_0= ruleType ) ) otherlv_3= ')'
+            // InternalExport.g:3482:1: ( ( (lv_name_0_0= 'typeSelect' ) ) otherlv_1= '(' ( (lv_type_2_0= ruleType ) ) otherlv_3= ')' )
+            // InternalExport.g:3482:2: ( (lv_name_0_0= 'typeSelect' ) ) otherlv_1= '(' ( (lv_type_2_0= ruleType ) ) otherlv_3= ')'
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3482:2: ( (lv_name_0_0= 'typeSelect' ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3483:1: (lv_name_0_0= 'typeSelect' )
+            // InternalExport.g:3482:2: ( (lv_name_0_0= 'typeSelect' ) )
+            // InternalExport.g:3483:1: (lv_name_0_0= 'typeSelect' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3483:1: (lv_name_0_0= 'typeSelect' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3484:3: lv_name_0_0= 'typeSelect'
+            // InternalExport.g:3483:1: (lv_name_0_0= 'typeSelect' )
+            // InternalExport.g:3484:3: lv_name_0_0= 'typeSelect'
             {
-            lv_name_0_0=(Token)match(input,64,FOLLOW_64_in_ruleTypeSelectExpression7945); if (state.failed) return current;
+            lv_name_0_0=(Token)match(input,64,FOLLOW_23); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                       newLeafNode(lv_name_0_0, grammarAccess.getTypeSelectExpressionAccess().getNameTypeSelectKeyword_0_0());
@@ -9904,24 +9904,24 @@ public final EObject ruleTypeSelectExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,28,FOLLOW_28_in_ruleTypeSelectExpression7970); if (state.failed) return current;
+            otherlv_1=(Token)match(input,28,FOLLOW_40); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getTypeSelectExpressionAccess().getLeftParenthesisKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3501:1: ( (lv_type_2_0= ruleType ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3502:1: (lv_type_2_0= ruleType )
+            // InternalExport.g:3501:1: ( (lv_type_2_0= ruleType ) )
+            // InternalExport.g:3502:1: (lv_type_2_0= ruleType )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3502:1: (lv_type_2_0= ruleType )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3503:3: lv_type_2_0= ruleType
+            // InternalExport.g:3502:1: (lv_type_2_0= ruleType )
+            // InternalExport.g:3503:3: lv_type_2_0= ruleType
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getTypeSelectExpressionAccess().getTypeTypeParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleType_in_ruleTypeSelectExpression7991);
+            pushFollow(FOLLOW_24);
             lv_type_2_0=ruleType();
 
             state._fsp--;
@@ -9935,7 +9935,7 @@ public final EObject ruleTypeSelectExpression() throws RecognitionException {
                      			current, 
                      			"type",
                       		lv_type_2_0, 
-                      		"Type");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Type");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -9945,7 +9945,7 @@ public final EObject ruleTypeSelectExpression() throws RecognitionException {
 
             }
 
-            otherlv_3=(Token)match(input,29,FOLLOW_29_in_ruleTypeSelectExpression8003); if (state.failed) return current;
+            otherlv_3=(Token)match(input,29,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_3, grammarAccess.getTypeSelectExpressionAccess().getRightParenthesisKeyword_3());
@@ -9974,7 +9974,7 @@ public final EObject ruleTypeSelectExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleCollectionExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3531:1: entryRuleCollectionExpression returns [EObject current=null] : iv_ruleCollectionExpression= ruleCollectionExpression EOF ;
+    // InternalExport.g:3531:1: entryRuleCollectionExpression returns [EObject current=null] : iv_ruleCollectionExpression= ruleCollectionExpression EOF ;
     public final EObject entryRuleCollectionExpression() throws RecognitionException {
         EObject current = null;
 
@@ -9982,13 +9982,13 @@ public final EObject entryRuleCollectionExpression() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3532:2: (iv_ruleCollectionExpression= ruleCollectionExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3533:2: iv_ruleCollectionExpression= ruleCollectionExpression EOF
+            // InternalExport.g:3532:2: (iv_ruleCollectionExpression= ruleCollectionExpression EOF )
+            // InternalExport.g:3533:2: iv_ruleCollectionExpression= ruleCollectionExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getCollectionExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleCollectionExpression_in_entryRuleCollectionExpression8039);
+            pushFollow(FOLLOW_1);
             iv_ruleCollectionExpression=ruleCollectionExpression();
 
             state._fsp--;
@@ -9996,7 +9996,7 @@ public final EObject entryRuleCollectionExpression() throws RecognitionException
             if ( state.backtracking==0 ) {
                current =iv_ruleCollectionExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleCollectionExpression8049); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -10014,7 +10014,7 @@ public final EObject entryRuleCollectionExpression() throws RecognitionException
 
 
     // $ANTLR start "ruleCollectionExpression"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3540:1: ruleCollectionExpression returns [EObject current=null] : ( ( ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) ) ) otherlv_1= '(' ( ( (lv_var_2_0= ruleIdentifier ) ) otherlv_3= '|' )? ( (lv_exp_4_0= ruleExpression ) ) otherlv_5= ')' ) ;
+    // InternalExport.g:3540:1: ruleCollectionExpression returns [EObject current=null] : ( ( ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) ) ) otherlv_1= '(' ( ( (lv_var_2_0= ruleIdentifier ) ) otherlv_3= '|' )? ( (lv_exp_4_0= ruleExpression ) ) otherlv_5= ')' ) ;
     public final EObject ruleCollectionExpression() throws RecognitionException {
         EObject current = null;
 
@@ -10037,19 +10037,19 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3543:28: ( ( ( ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) ) ) otherlv_1= '(' ( ( (lv_var_2_0= ruleIdentifier ) ) otherlv_3= '|' )? ( (lv_exp_4_0= ruleExpression ) ) otherlv_5= ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3544:1: ( ( ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) ) ) otherlv_1= '(' ( ( (lv_var_2_0= ruleIdentifier ) ) otherlv_3= '|' )? ( (lv_exp_4_0= ruleExpression ) ) otherlv_5= ')' )
+            // InternalExport.g:3543:28: ( ( ( ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) ) ) otherlv_1= '(' ( ( (lv_var_2_0= ruleIdentifier ) ) otherlv_3= '|' )? ( (lv_exp_4_0= ruleExpression ) ) otherlv_5= ')' ) )
+            // InternalExport.g:3544:1: ( ( ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) ) ) otherlv_1= '(' ( ( (lv_var_2_0= ruleIdentifier ) ) otherlv_3= '|' )? ( (lv_exp_4_0= ruleExpression ) ) otherlv_5= ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3544:1: ( ( ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) ) ) otherlv_1= '(' ( ( (lv_var_2_0= ruleIdentifier ) ) otherlv_3= '|' )? ( (lv_exp_4_0= ruleExpression ) ) otherlv_5= ')' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3544:2: ( ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) ) ) otherlv_1= '(' ( ( (lv_var_2_0= ruleIdentifier ) ) otherlv_3= '|' )? ( (lv_exp_4_0= ruleExpression ) ) otherlv_5= ')'
+            // InternalExport.g:3544:1: ( ( ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) ) ) otherlv_1= '(' ( ( (lv_var_2_0= ruleIdentifier ) ) otherlv_3= '|' )? ( (lv_exp_4_0= ruleExpression ) ) otherlv_5= ')' )
+            // InternalExport.g:3544:2: ( ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) ) ) otherlv_1= '(' ( ( (lv_var_2_0= ruleIdentifier ) ) otherlv_3= '|' )? ( (lv_exp_4_0= ruleExpression ) ) otherlv_5= ')'
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3544:2: ( ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3545:1: ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) )
+            // InternalExport.g:3544:2: ( ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) ) )
+            // InternalExport.g:3545:1: ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3545:1: ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3546:1: (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' )
+            // InternalExport.g:3545:1: ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) )
+            // InternalExport.g:3546:1: (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3546:1: (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' )
+            // InternalExport.g:3546:1: (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' )
             int alt61=8;
             switch ( input.LA(1) ) {
             case 65:
@@ -10102,9 +10102,9 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
 
             switch (alt61) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3547:3: lv_name_0_1= 'collect'
+                    // InternalExport.g:3547:3: lv_name_0_1= 'collect'
                     {
-                    lv_name_0_1=(Token)match(input,65,FOLLOW_65_in_ruleCollectionExpression8094); if (state.failed) return current;
+                    lv_name_0_1=(Token)match(input,65,FOLLOW_23); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_name_0_1, grammarAccess.getCollectionExpressionAccess().getNameCollectKeyword_0_0_0());
@@ -10122,9 +10122,9 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3559:8: lv_name_0_2= 'select'
+                    // InternalExport.g:3559:8: lv_name_0_2= 'select'
                     {
-                    lv_name_0_2=(Token)match(input,66,FOLLOW_66_in_ruleCollectionExpression8123); if (state.failed) return current;
+                    lv_name_0_2=(Token)match(input,66,FOLLOW_23); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_name_0_2, grammarAccess.getCollectionExpressionAccess().getNameSelectKeyword_0_0_1());
@@ -10142,9 +10142,9 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3571:8: lv_name_0_3= 'selectFirst'
+                    // InternalExport.g:3571:8: lv_name_0_3= 'selectFirst'
                     {
-                    lv_name_0_3=(Token)match(input,67,FOLLOW_67_in_ruleCollectionExpression8152); if (state.failed) return current;
+                    lv_name_0_3=(Token)match(input,67,FOLLOW_23); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_name_0_3, grammarAccess.getCollectionExpressionAccess().getNameSelectFirstKeyword_0_0_2());
@@ -10162,9 +10162,9 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3583:8: lv_name_0_4= 'reject'
+                    // InternalExport.g:3583:8: lv_name_0_4= 'reject'
                     {
-                    lv_name_0_4=(Token)match(input,68,FOLLOW_68_in_ruleCollectionExpression8181); if (state.failed) return current;
+                    lv_name_0_4=(Token)match(input,68,FOLLOW_23); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_name_0_4, grammarAccess.getCollectionExpressionAccess().getNameRejectKeyword_0_0_3());
@@ -10182,9 +10182,9 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3595:8: lv_name_0_5= 'exists'
+                    // InternalExport.g:3595:8: lv_name_0_5= 'exists'
                     {
-                    lv_name_0_5=(Token)match(input,69,FOLLOW_69_in_ruleCollectionExpression8210); if (state.failed) return current;
+                    lv_name_0_5=(Token)match(input,69,FOLLOW_23); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_name_0_5, grammarAccess.getCollectionExpressionAccess().getNameExistsKeyword_0_0_4());
@@ -10202,9 +10202,9 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3607:8: lv_name_0_6= 'notExists'
+                    // InternalExport.g:3607:8: lv_name_0_6= 'notExists'
                     {
-                    lv_name_0_6=(Token)match(input,70,FOLLOW_70_in_ruleCollectionExpression8239); if (state.failed) return current;
+                    lv_name_0_6=(Token)match(input,70,FOLLOW_23); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_name_0_6, grammarAccess.getCollectionExpressionAccess().getNameNotExistsKeyword_0_0_5());
@@ -10222,9 +10222,9 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3619:8: lv_name_0_7= 'sortBy'
+                    // InternalExport.g:3619:8: lv_name_0_7= 'sortBy'
                     {
-                    lv_name_0_7=(Token)match(input,71,FOLLOW_71_in_ruleCollectionExpression8268); if (state.failed) return current;
+                    lv_name_0_7=(Token)match(input,71,FOLLOW_23); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_name_0_7, grammarAccess.getCollectionExpressionAccess().getNameSortByKeyword_0_0_6());
@@ -10242,9 +10242,9 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
                     }
                     break;
                 case 8 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3631:8: lv_name_0_8= 'forAll'
+                    // InternalExport.g:3631:8: lv_name_0_8= 'forAll'
                     {
-                    lv_name_0_8=(Token)match(input,72,FOLLOW_72_in_ruleCollectionExpression8297); if (state.failed) return current;
+                    lv_name_0_8=(Token)match(input,72,FOLLOW_23); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_name_0_8, grammarAccess.getCollectionExpressionAccess().getNameForAllKeyword_0_0_7());
@@ -10270,13 +10270,13 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,28,FOLLOW_28_in_ruleCollectionExpression8325); if (state.failed) return current;
+            otherlv_1=(Token)match(input,28,FOLLOW_15); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getCollectionExpressionAccess().getLeftParenthesisKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3650:1: ( ( (lv_var_2_0= ruleIdentifier ) ) otherlv_3= '|' )?
+            // InternalExport.g:3650:1: ( ( (lv_var_2_0= ruleIdentifier ) ) otherlv_3= '|' )?
             int alt62=2;
             int LA62_0 = input.LA(1);
 
@@ -10289,20 +10289,20 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
             }
             switch (alt62) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3650:2: ( (lv_var_2_0= ruleIdentifier ) ) otherlv_3= '|'
+                    // InternalExport.g:3650:2: ( (lv_var_2_0= ruleIdentifier ) ) otherlv_3= '|'
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3650:2: ( (lv_var_2_0= ruleIdentifier ) )
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3651:1: (lv_var_2_0= ruleIdentifier )
+                    // InternalExport.g:3650:2: ( (lv_var_2_0= ruleIdentifier ) )
+                    // InternalExport.g:3651:1: (lv_var_2_0= ruleIdentifier )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3651:1: (lv_var_2_0= ruleIdentifier )
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3652:3: lv_var_2_0= ruleIdentifier
+                    // InternalExport.g:3651:1: (lv_var_2_0= ruleIdentifier )
+                    // InternalExport.g:3652:3: lv_var_2_0= ruleIdentifier
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getCollectionExpressionAccess().getVarIdentifierParserRuleCall_2_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleIdentifier_in_ruleCollectionExpression8347);
+                    pushFollow(FOLLOW_60);
                     lv_var_2_0=ruleIdentifier();
 
                     state._fsp--;
@@ -10316,7 +10316,7 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
                              			current, 
                              			"var",
                               		lv_var_2_0, 
-                              		"Identifier");
+                              		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -10326,7 +10326,7 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
 
                     }
 
-                    otherlv_3=(Token)match(input,73,FOLLOW_73_in_ruleCollectionExpression8359); if (state.failed) return current;
+                    otherlv_3=(Token)match(input,73,FOLLOW_15); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_3, grammarAccess.getCollectionExpressionAccess().getVerticalLineKeyword_2_1());
@@ -10338,18 +10338,18 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3672:3: ( (lv_exp_4_0= ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3673:1: (lv_exp_4_0= ruleExpression )
+            // InternalExport.g:3672:3: ( (lv_exp_4_0= ruleExpression ) )
+            // InternalExport.g:3673:1: (lv_exp_4_0= ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3673:1: (lv_exp_4_0= ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3674:3: lv_exp_4_0= ruleExpression
+            // InternalExport.g:3673:1: (lv_exp_4_0= ruleExpression )
+            // InternalExport.g:3674:3: lv_exp_4_0= ruleExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getCollectionExpressionAccess().getExpExpressionParserRuleCall_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleExpression_in_ruleCollectionExpression8382);
+            pushFollow(FOLLOW_24);
             lv_exp_4_0=ruleExpression();
 
             state._fsp--;
@@ -10363,7 +10363,7 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
                      			current, 
                      			"exp",
                       		lv_exp_4_0, 
-                      		"Expression");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -10373,7 +10373,7 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
 
             }
 
-            otherlv_5=(Token)match(input,29,FOLLOW_29_in_ruleCollectionExpression8394); if (state.failed) return current;
+            otherlv_5=(Token)match(input,29,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_5, grammarAccess.getCollectionExpressionAccess().getRightParenthesisKeyword_4());
@@ -10402,7 +10402,7 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleType"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3702:1: entryRuleType returns [EObject current=null] : iv_ruleType= ruleType EOF ;
+    // InternalExport.g:3702:1: entryRuleType returns [EObject current=null] : iv_ruleType= ruleType EOF ;
     public final EObject entryRuleType() throws RecognitionException {
         EObject current = null;
 
@@ -10410,13 +10410,13 @@ public final EObject entryRuleType() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3703:2: (iv_ruleType= ruleType EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3704:2: iv_ruleType= ruleType EOF
+            // InternalExport.g:3703:2: (iv_ruleType= ruleType EOF )
+            // InternalExport.g:3704:2: iv_ruleType= ruleType EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTypeRule()); 
             }
-            pushFollow(FOLLOW_ruleType_in_entryRuleType8430);
+            pushFollow(FOLLOW_1);
             iv_ruleType=ruleType();
 
             state._fsp--;
@@ -10424,7 +10424,7 @@ public final EObject entryRuleType() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleType; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleType8440); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -10442,7 +10442,7 @@ public final EObject entryRuleType() throws RecognitionException {
 
 
     // $ANTLR start "ruleType"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3711:1: ruleType returns [EObject current=null] : (this_CollectionType_0= ruleCollectionType | this_SimpleType_1= ruleSimpleType ) ;
+    // InternalExport.g:3711:1: ruleType returns [EObject current=null] : (this_CollectionType_0= ruleCollectionType | this_SimpleType_1= ruleSimpleType ) ;
     public final EObject ruleType() throws RecognitionException {
         EObject current = null;
 
@@ -10454,10 +10454,10 @@ public final EObject ruleType() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3714:28: ( (this_CollectionType_0= ruleCollectionType | this_SimpleType_1= ruleSimpleType ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3715:1: (this_CollectionType_0= ruleCollectionType | this_SimpleType_1= ruleSimpleType )
+            // InternalExport.g:3714:28: ( (this_CollectionType_0= ruleCollectionType | this_SimpleType_1= ruleSimpleType ) )
+            // InternalExport.g:3715:1: (this_CollectionType_0= ruleCollectionType | this_SimpleType_1= ruleSimpleType )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3715:1: (this_CollectionType_0= ruleCollectionType | this_SimpleType_1= ruleSimpleType )
+            // InternalExport.g:3715:1: (this_CollectionType_0= ruleCollectionType | this_SimpleType_1= ruleSimpleType )
             int alt63=2;
             int LA63_0 = input.LA(1);
 
@@ -10476,14 +10476,14 @@ else if ( (LA63_0==RULE_ID) ) {
             }
             switch (alt63) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3716:5: this_CollectionType_0= ruleCollectionType
+                    // InternalExport.g:3716:5: this_CollectionType_0= ruleCollectionType
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getTypeAccess().getCollectionTypeParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleCollectionType_in_ruleType8487);
+                    pushFollow(FOLLOW_2);
                     this_CollectionType_0=ruleCollectionType();
 
                     state._fsp--;
@@ -10498,14 +10498,14 @@ else if ( (LA63_0==RULE_ID) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3726:5: this_SimpleType_1= ruleSimpleType
+                    // InternalExport.g:3726:5: this_SimpleType_1= ruleSimpleType
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getTypeAccess().getSimpleTypeParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleSimpleType_in_ruleType8514);
+                    pushFollow(FOLLOW_2);
                     this_SimpleType_1=ruleSimpleType();
 
                     state._fsp--;
@@ -10542,7 +10542,7 @@ else if ( (LA63_0==RULE_ID) ) {
 
 
     // $ANTLR start "entryRuleCollectionType"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3742:1: entryRuleCollectionType returns [EObject current=null] : iv_ruleCollectionType= ruleCollectionType EOF ;
+    // InternalExport.g:3742:1: entryRuleCollectionType returns [EObject current=null] : iv_ruleCollectionType= ruleCollectionType EOF ;
     public final EObject entryRuleCollectionType() throws RecognitionException {
         EObject current = null;
 
@@ -10550,13 +10550,13 @@ public final EObject entryRuleCollectionType() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3743:2: (iv_ruleCollectionType= ruleCollectionType EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3744:2: iv_ruleCollectionType= ruleCollectionType EOF
+            // InternalExport.g:3743:2: (iv_ruleCollectionType= ruleCollectionType EOF )
+            // InternalExport.g:3744:2: iv_ruleCollectionType= ruleCollectionType EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getCollectionTypeRule()); 
             }
-            pushFollow(FOLLOW_ruleCollectionType_in_entryRuleCollectionType8549);
+            pushFollow(FOLLOW_1);
             iv_ruleCollectionType=ruleCollectionType();
 
             state._fsp--;
@@ -10564,7 +10564,7 @@ public final EObject entryRuleCollectionType() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleCollectionType; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleCollectionType8559); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -10582,7 +10582,7 @@ public final EObject entryRuleCollectionType() throws RecognitionException {
 
 
     // $ANTLR start "ruleCollectionType"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3751:1: ruleCollectionType returns [EObject current=null] : ( ( ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) ) ) otherlv_1= '[' ( (lv_id1_2_0= ruleSimpleType ) ) otherlv_3= ']' ) ;
+    // InternalExport.g:3751:1: ruleCollectionType returns [EObject current=null] : ( ( ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) ) ) otherlv_1= '[' ( (lv_id1_2_0= ruleSimpleType ) ) otherlv_3= ']' ) ;
     public final EObject ruleCollectionType() throws RecognitionException {
         EObject current = null;
 
@@ -10597,19 +10597,19 @@ public final EObject ruleCollectionType() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3754:28: ( ( ( ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) ) ) otherlv_1= '[' ( (lv_id1_2_0= ruleSimpleType ) ) otherlv_3= ']' ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3755:1: ( ( ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) ) ) otherlv_1= '[' ( (lv_id1_2_0= ruleSimpleType ) ) otherlv_3= ']' )
+            // InternalExport.g:3754:28: ( ( ( ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) ) ) otherlv_1= '[' ( (lv_id1_2_0= ruleSimpleType ) ) otherlv_3= ']' ) )
+            // InternalExport.g:3755:1: ( ( ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) ) ) otherlv_1= '[' ( (lv_id1_2_0= ruleSimpleType ) ) otherlv_3= ']' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3755:1: ( ( ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) ) ) otherlv_1= '[' ( (lv_id1_2_0= ruleSimpleType ) ) otherlv_3= ']' )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3755:2: ( ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) ) ) otherlv_1= '[' ( (lv_id1_2_0= ruleSimpleType ) ) otherlv_3= ']'
+            // InternalExport.g:3755:1: ( ( ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) ) ) otherlv_1= '[' ( (lv_id1_2_0= ruleSimpleType ) ) otherlv_3= ']' )
+            // InternalExport.g:3755:2: ( ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) ) ) otherlv_1= '[' ( (lv_id1_2_0= ruleSimpleType ) ) otherlv_3= ']'
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3755:2: ( ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3756:1: ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) )
+            // InternalExport.g:3755:2: ( ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) ) )
+            // InternalExport.g:3756:1: ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3756:1: ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3757:1: (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' )
+            // InternalExport.g:3756:1: ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) )
+            // InternalExport.g:3757:1: (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3757:1: (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' )
+            // InternalExport.g:3757:1: (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' )
             int alt64=3;
             switch ( input.LA(1) ) {
             case 79:
@@ -10637,9 +10637,9 @@ public final EObject ruleCollectionType() throws RecognitionException {
 
             switch (alt64) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3758:3: lv_cl_0_1= 'Collection'
+                    // InternalExport.g:3758:3: lv_cl_0_1= 'Collection'
                     {
-                    lv_cl_0_1=(Token)match(input,79,FOLLOW_79_in_ruleCollectionType8604); if (state.failed) return current;
+                    lv_cl_0_1=(Token)match(input,79,FOLLOW_63); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_cl_0_1, grammarAccess.getCollectionTypeAccess().getClCollectionKeyword_0_0_0());
@@ -10657,9 +10657,9 @@ public final EObject ruleCollectionType() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3770:8: lv_cl_0_2= 'List'
+                    // InternalExport.g:3770:8: lv_cl_0_2= 'List'
                     {
-                    lv_cl_0_2=(Token)match(input,80,FOLLOW_80_in_ruleCollectionType8633); if (state.failed) return current;
+                    lv_cl_0_2=(Token)match(input,80,FOLLOW_63); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_cl_0_2, grammarAccess.getCollectionTypeAccess().getClListKeyword_0_0_1());
@@ -10677,9 +10677,9 @@ public final EObject ruleCollectionType() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3782:8: lv_cl_0_3= 'Set'
+                    // InternalExport.g:3782:8: lv_cl_0_3= 'Set'
                     {
-                    lv_cl_0_3=(Token)match(input,81,FOLLOW_81_in_ruleCollectionType8662); if (state.failed) return current;
+                    lv_cl_0_3=(Token)match(input,81,FOLLOW_63); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_cl_0_3, grammarAccess.getCollectionTypeAccess().getClSetKeyword_0_0_2());
@@ -10705,24 +10705,24 @@ public final EObject ruleCollectionType() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,20,FOLLOW_20_in_ruleCollectionType8690); if (state.failed) return current;
+            otherlv_1=(Token)match(input,20,FOLLOW_40); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getCollectionTypeAccess().getLeftSquareBracketKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3801:1: ( (lv_id1_2_0= ruleSimpleType ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3802:1: (lv_id1_2_0= ruleSimpleType )
+            // InternalExport.g:3801:1: ( (lv_id1_2_0= ruleSimpleType ) )
+            // InternalExport.g:3802:1: (lv_id1_2_0= ruleSimpleType )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3802:1: (lv_id1_2_0= ruleSimpleType )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3803:3: lv_id1_2_0= ruleSimpleType
+            // InternalExport.g:3802:1: (lv_id1_2_0= ruleSimpleType )
+            // InternalExport.g:3803:3: lv_id1_2_0= ruleSimpleType
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getCollectionTypeAccess().getId1SimpleTypeParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleSimpleType_in_ruleCollectionType8711);
+            pushFollow(FOLLOW_16);
             lv_id1_2_0=ruleSimpleType();
 
             state._fsp--;
@@ -10736,7 +10736,7 @@ public final EObject ruleCollectionType() throws RecognitionException {
                      			current, 
                      			"id1",
                       		lv_id1_2_0, 
-                      		"SimpleType");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.SimpleType");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -10746,7 +10746,7 @@ public final EObject ruleCollectionType() throws RecognitionException {
 
             }
 
-            otherlv_3=(Token)match(input,21,FOLLOW_21_in_ruleCollectionType8723); if (state.failed) return current;
+            otherlv_3=(Token)match(input,21,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_3, grammarAccess.getCollectionTypeAccess().getRightSquareBracketKeyword_3());
@@ -10775,7 +10775,7 @@ public final EObject ruleCollectionType() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleSimpleType"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3831:1: entryRuleSimpleType returns [EObject current=null] : iv_ruleSimpleType= ruleSimpleType EOF ;
+    // InternalExport.g:3831:1: entryRuleSimpleType returns [EObject current=null] : iv_ruleSimpleType= ruleSimpleType EOF ;
     public final EObject entryRuleSimpleType() throws RecognitionException {
         EObject current = null;
 
@@ -10783,13 +10783,13 @@ public final EObject entryRuleSimpleType() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3832:2: (iv_ruleSimpleType= ruleSimpleType EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3833:2: iv_ruleSimpleType= ruleSimpleType EOF
+            // InternalExport.g:3832:2: (iv_ruleSimpleType= ruleSimpleType EOF )
+            // InternalExport.g:3833:2: iv_ruleSimpleType= ruleSimpleType EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getSimpleTypeRule()); 
             }
-            pushFollow(FOLLOW_ruleSimpleType_in_entryRuleSimpleType8759);
+            pushFollow(FOLLOW_1);
             iv_ruleSimpleType=ruleSimpleType();
 
             state._fsp--;
@@ -10797,7 +10797,7 @@ public final EObject entryRuleSimpleType() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleSimpleType; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSimpleType8769); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -10815,7 +10815,7 @@ public final EObject entryRuleSimpleType() throws RecognitionException {
 
 
     // $ANTLR start "ruleSimpleType"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3840:1: ruleSimpleType returns [EObject current=null] : ( ( (lv_id_0_0= ruleIdentifier ) ) (otherlv_1= '::' ( (lv_id_2_0= ruleIdentifier ) ) )* ) ;
+    // InternalExport.g:3840:1: ruleSimpleType returns [EObject current=null] : ( ( (lv_id_0_0= ruleIdentifier ) ) (otherlv_1= '::' ( (lv_id_2_0= ruleIdentifier ) ) )* ) ;
     public final EObject ruleSimpleType() throws RecognitionException {
         EObject current = null;
 
@@ -10828,24 +10828,24 @@ public final EObject ruleSimpleType() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3843:28: ( ( ( (lv_id_0_0= ruleIdentifier ) ) (otherlv_1= '::' ( (lv_id_2_0= ruleIdentifier ) ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3844:1: ( ( (lv_id_0_0= ruleIdentifier ) ) (otherlv_1= '::' ( (lv_id_2_0= ruleIdentifier ) ) )* )
+            // InternalExport.g:3843:28: ( ( ( (lv_id_0_0= ruleIdentifier ) ) (otherlv_1= '::' ( (lv_id_2_0= ruleIdentifier ) ) )* ) )
+            // InternalExport.g:3844:1: ( ( (lv_id_0_0= ruleIdentifier ) ) (otherlv_1= '::' ( (lv_id_2_0= ruleIdentifier ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3844:1: ( ( (lv_id_0_0= ruleIdentifier ) ) (otherlv_1= '::' ( (lv_id_2_0= ruleIdentifier ) ) )* )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3844:2: ( (lv_id_0_0= ruleIdentifier ) ) (otherlv_1= '::' ( (lv_id_2_0= ruleIdentifier ) ) )*
+            // InternalExport.g:3844:1: ( ( (lv_id_0_0= ruleIdentifier ) ) (otherlv_1= '::' ( (lv_id_2_0= ruleIdentifier ) ) )* )
+            // InternalExport.g:3844:2: ( (lv_id_0_0= ruleIdentifier ) ) (otherlv_1= '::' ( (lv_id_2_0= ruleIdentifier ) ) )*
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3844:2: ( (lv_id_0_0= ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3845:1: (lv_id_0_0= ruleIdentifier )
+            // InternalExport.g:3844:2: ( (lv_id_0_0= ruleIdentifier ) )
+            // InternalExport.g:3845:1: (lv_id_0_0= ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3845:1: (lv_id_0_0= ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3846:3: lv_id_0_0= ruleIdentifier
+            // InternalExport.g:3845:1: (lv_id_0_0= ruleIdentifier )
+            // InternalExport.g:3846:3: lv_id_0_0= ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getSimpleTypeAccess().getIdIdentifierParserRuleCall_0_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_ruleSimpleType8815);
+            pushFollow(FOLLOW_38);
             lv_id_0_0=ruleIdentifier();
 
             state._fsp--;
@@ -10859,7 +10859,7 @@ public final EObject ruleSimpleType() throws RecognitionException {
                      			current, 
                      			"id",
                       		lv_id_0_0, 
-                      		"Identifier");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -10869,7 +10869,7 @@ public final EObject ruleSimpleType() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3862:2: (otherlv_1= '::' ( (lv_id_2_0= ruleIdentifier ) ) )*
+            // InternalExport.g:3862:2: (otherlv_1= '::' ( (lv_id_2_0= ruleIdentifier ) ) )*
             loop65:
             do {
                 int alt65=2;
@@ -10882,26 +10882,26 @@ public final EObject ruleSimpleType() throws RecognitionException {
 
                 switch (alt65) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3862:4: otherlv_1= '::' ( (lv_id_2_0= ruleIdentifier ) )
+            	    // InternalExport.g:3862:4: otherlv_1= '::' ( (lv_id_2_0= ruleIdentifier ) )
             	    {
-            	    otherlv_1=(Token)match(input,39,FOLLOW_39_in_ruleSimpleType8828); if (state.failed) return current;
+            	    otherlv_1=(Token)match(input,39,FOLLOW_4); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_1, grammarAccess.getSimpleTypeAccess().getColonColonKeyword_1_0());
             	          
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3866:1: ( (lv_id_2_0= ruleIdentifier ) )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3867:1: (lv_id_2_0= ruleIdentifier )
+            	    // InternalExport.g:3866:1: ( (lv_id_2_0= ruleIdentifier ) )
+            	    // InternalExport.g:3867:1: (lv_id_2_0= ruleIdentifier )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3867:1: (lv_id_2_0= ruleIdentifier )
-            	    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3868:3: lv_id_2_0= ruleIdentifier
+            	    // InternalExport.g:3867:1: (lv_id_2_0= ruleIdentifier )
+            	    // InternalExport.g:3868:3: lv_id_2_0= ruleIdentifier
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getSimpleTypeAccess().getIdIdentifierParserRuleCall_1_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleIdentifier_in_ruleSimpleType8849);
+            	    pushFollow(FOLLOW_38);
             	    lv_id_2_0=ruleIdentifier();
 
             	    state._fsp--;
@@ -10915,7 +10915,7 @@ public final EObject ruleSimpleType() throws RecognitionException {
             	             			current, 
             	             			"id",
             	              		lv_id_2_0, 
-            	              		"Identifier");
+            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -10957,7 +10957,7 @@ public final EObject ruleSimpleType() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleIdentifier"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3892:1: entryRuleIdentifier returns [String current=null] : iv_ruleIdentifier= ruleIdentifier EOF ;
+    // InternalExport.g:3892:1: entryRuleIdentifier returns [String current=null] : iv_ruleIdentifier= ruleIdentifier EOF ;
     public final String entryRuleIdentifier() throws RecognitionException {
         String current = null;
 
@@ -10965,13 +10965,13 @@ public final String entryRuleIdentifier() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3893:2: (iv_ruleIdentifier= ruleIdentifier EOF )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3894:2: iv_ruleIdentifier= ruleIdentifier EOF
+            // InternalExport.g:3893:2: (iv_ruleIdentifier= ruleIdentifier EOF )
+            // InternalExport.g:3894:2: iv_ruleIdentifier= ruleIdentifier EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getIdentifierRule()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_entryRuleIdentifier8888);
+            pushFollow(FOLLOW_1);
             iv_ruleIdentifier=ruleIdentifier();
 
             state._fsp--;
@@ -10979,7 +10979,7 @@ public final String entryRuleIdentifier() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleIdentifier.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIdentifier8899); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -10997,7 +10997,7 @@ public final String entryRuleIdentifier() throws RecognitionException {
 
 
     // $ANTLR start "ruleIdentifier"
-    // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3901:1: ruleIdentifier returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_ID_0= RULE_ID ;
+    // InternalExport.g:3901:1: ruleIdentifier returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_ID_0= RULE_ID ;
     public final AntlrDatatypeRuleToken ruleIdentifier() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -11006,10 +11006,10 @@ public final AntlrDatatypeRuleToken ruleIdentifier() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3904:28: (this_ID_0= RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:3905:5: this_ID_0= RULE_ID
+            // InternalExport.g:3904:28: (this_ID_0= RULE_ID )
+            // InternalExport.g:3905:5: this_ID_0= RULE_ID
             {
-            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleIdentifier8938); if (state.failed) return current;
+            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               		current.merge(this_ID_0);
@@ -11040,10 +11040,10 @@ public final AntlrDatatypeRuleToken ruleIdentifier() throws RecognitionException
 
     // $ANTLR start synpred1_InternalExport
     public final void synpred1_InternalExport_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1171:7: ( ruleCastedExpression )
-        // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1171:9: ruleCastedExpression
+        // InternalExport.g:1171:7: ( ruleCastedExpression )
+        // InternalExport.g:1171:9: ruleCastedExpression
         {
-        pushFollow(FOLLOW_ruleCastedExpression_in_synpred1_InternalExport2582);
+        pushFollow(FOLLOW_2);
         ruleCastedExpression();
 
         state._fsp--;
@@ -11055,10 +11055,10 @@ public final void synpred1_InternalExport_fragment() throws RecognitionException
 
     // $ANTLR start synpred2_InternalExport
     public final void synpred2_InternalExport_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1597:3: ( 'else' )
-        // ../com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/parser/antlr/internal/InternalExport.g:1597:5: 'else'
+        // InternalExport.g:1597:3: ( 'else' )
+        // InternalExport.g:1597:5: 'else'
         {
-        match(input,46,FOLLOW_46_in_synpred2_InternalExport3536); if (state.failed) return ;
+        match(input,46,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -11097,21 +11097,13 @@ public final boolean synpred2_InternalExport() {
 
 
     protected DFA30 dfa30 = new DFA30(this);
-    static final String DFA30_eotS =
-        "\36\uffff";
-    static final String DFA30_eofS =
-        "\36\uffff";
-    static final String DFA30_minS =
-        "\1\4\1\uffff\1\0\33\uffff";
-    static final String DFA30_maxS =
-        "\1\121\1\uffff\1\0\33\uffff";
-    static final String DFA30_acceptS =
-        "\1\uffff\1\1\1\uffff\1\3\31\uffff\1\2";
-    static final String DFA30_specialS =
-        "\2\uffff\1\0\33\uffff}>";
-    static final String[] DFA30_transitionS = {
-            "\4\3\10\uffff\1\3\13\uffff\1\2\13\uffff\1\1\3\uffff\1\3\2\uffff"+
-            "\1\3\13\uffff\1\3\2\uffff\1\3\1\uffff\11\3\1\uffff\10\3",
+    static final String dfa_1s = "\36\uffff";
+    static final String dfa_2s = "\1\4\1\uffff\1\0\33\uffff";
+    static final String dfa_3s = "\1\121\1\uffff\1\0\33\uffff";
+    static final String dfa_4s = "\1\uffff\1\1\1\uffff\1\3\31\uffff\1\2";
+    static final String dfa_5s = "\2\uffff\1\0\33\uffff}>";
+    static final String[] dfa_6s = {
+            "\4\3\10\uffff\1\3\13\uffff\1\2\13\uffff\1\1\3\uffff\1\3\2\uffff\1\3\13\uffff\1\3\2\uffff\1\3\1\uffff\11\3\1\uffff\10\3",
             "",
             "\1\uffff",
             "",
@@ -11143,34 +11135,25 @@ public final boolean synpred2_InternalExport() {
             ""
     };
 
-    static final short[] DFA30_eot = DFA.unpackEncodedString(DFA30_eotS);
-    static final short[] DFA30_eof = DFA.unpackEncodedString(DFA30_eofS);
-    static final char[] DFA30_min = DFA.unpackEncodedStringToUnsignedChars(DFA30_minS);
-    static final char[] DFA30_max = DFA.unpackEncodedStringToUnsignedChars(DFA30_maxS);
-    static final short[] DFA30_accept = DFA.unpackEncodedString(DFA30_acceptS);
-    static final short[] DFA30_special = DFA.unpackEncodedString(DFA30_specialS);
-    static final short[][] DFA30_transition;
-
-    static {
-        int numStates = DFA30_transitionS.length;
-        DFA30_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA30_transition[i] = DFA.unpackEncodedString(DFA30_transitionS[i]);
-        }
-    }
+    static final short[] dfa_1 = DFA.unpackEncodedString(dfa_1s);
+    static final char[] dfa_2 = DFA.unpackEncodedStringToUnsignedChars(dfa_2s);
+    static final char[] dfa_3 = DFA.unpackEncodedStringToUnsignedChars(dfa_3s);
+    static final short[] dfa_4 = DFA.unpackEncodedString(dfa_4s);
+    static final short[] dfa_5 = DFA.unpackEncodedString(dfa_5s);
+    static final short[][] dfa_6 = unpackEncodedStringArray(dfa_6s);
 
     class DFA30 extends DFA {
 
         public DFA30(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 30;
-            this.eot = DFA30_eot;
-            this.eof = DFA30_eof;
-            this.min = DFA30_min;
-            this.max = DFA30_max;
-            this.accept = DFA30_accept;
-            this.special = DFA30_special;
-            this.transition = DFA30_transition;
+            this.eot = dfa_1;
+            this.eof = dfa_1;
+            this.min = dfa_2;
+            this.max = dfa_3;
+            this.accept = dfa_4;
+            this.special = dfa_5;
+            this.transition = dfa_6;
         }
         public String getDescription() {
             return "1161:1: (this_LetExpression_0= ruleLetExpression | ( ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression ) | this_ChainExpression_2= ruleChainExpression )";
@@ -11204,359 +11187,68 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
     }
  
 
-    public static final BitSet FOLLOW_ruleExportModel_in_entryRuleExportModel75 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleExportModel85 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_12_in_ruleExportModel123 = new BitSet(new long[]{0x0000000000002010L});
-    public static final BitSet FOLLOW_13_in_ruleExportModel141 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleExportModel172 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_14_in_ruleExportModel189 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleQualifiedID_in_ruleExportModel212 = new BitSet(new long[]{0x0000000000040000L});
-    public static final BitSet FOLLOW_ruleImport_in_ruleExportModel235 = new BitSet(new long[]{0x000000000004B000L});
-    public static final BitSet FOLLOW_ruleExtension_in_ruleExportModel257 = new BitSet(new long[]{0x000000000000B000L});
-    public static final BitSet FOLLOW_15_in_ruleExportModel271 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_16_in_ruleExportModel283 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleInterface_in_ruleExportModel304 = new BitSet(new long[]{0x0000000000020010L});
-    public static final BitSet FOLLOW_17_in_ruleExportModel317 = new BitSet(new long[]{0x000000000000B000L});
-    public static final BitSet FOLLOW_ruleExport_in_ruleExportModel340 = new BitSet(new long[]{0x000000000000B002L});
-    public static final BitSet FOLLOW_ruleImport_in_entryRuleImport377 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleImport387 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_18_in_ruleImport424 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleImport444 = new BitSet(new long[]{0x0000000000080002L});
-    public static final BitSet FOLLOW_19_in_ruleImport457 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleImport474 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExtension_in_entryRuleExtension517 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleExtension527 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_13_in_ruleExtension564 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleQualifiedID_in_ruleExtension585 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInterface_in_entryRuleInterface623 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInterface633 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedID_in_ruleInterface681 = new BitSet(new long[]{0x0000000001500000L});
-    public static final BitSet FOLLOW_20_in_ruleInterface694 = new BitSet(new long[]{0x48009100100100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleInterface715 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_21_in_ruleInterface727 = new BitSet(new long[]{0x0000000001400000L});
-    public static final BitSet FOLLOW_22_in_ruleInterface742 = new BitSet(new long[]{0x000000000E000010L});
-    public static final BitSet FOLLOW_ruleInterfaceItem_in_ruleInterface763 = new BitSet(new long[]{0x0000000001C00000L});
-    public static final BitSet FOLLOW_23_in_ruleInterface776 = new BitSet(new long[]{0x000000000E000010L});
-    public static final BitSet FOLLOW_ruleInterfaceItem_in_ruleInterface797 = new BitSet(new long[]{0x0000000001C00000L});
-    public static final BitSet FOLLOW_24_in_ruleInterface813 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInterfaceItem_in_entryRuleInterfaceItem849 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInterfaceItem859 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInterfaceField_in_ruleInterfaceItem906 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInterfaceNavigation_in_ruleInterfaceItem933 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInterfaceExpression_in_ruleInterfaceItem960 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInterfaceField_in_entryRuleInterfaceField995 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInterfaceField1005 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_25_in_ruleInterfaceField1048 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleInterfaceField1082 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInterfaceNavigation_in_entryRuleInterfaceNavigation1118 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInterfaceNavigation1128 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_ruleInterfaceNavigation1165 = new BitSet(new long[]{0x0000000002000010L});
-    public static final BitSet FOLLOW_25_in_ruleInterfaceNavigation1183 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleInterfaceNavigation1217 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInterfaceExpression_in_entryRuleInterfaceExpression1253 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInterfaceExpression1263 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_ruleInterfaceExpression1300 = new BitSet(new long[]{0x0000000016000000L});
-    public static final BitSet FOLLOW_26_in_ruleInterfaceExpression1318 = new BitSet(new long[]{0x0000000012000000L});
-    public static final BitSet FOLLOW_25_in_ruleInterfaceExpression1350 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_28_in_ruleInterfaceExpression1376 = new BitSet(new long[]{0x48009100100100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleInterfaceExpression1397 = new BitSet(new long[]{0x0000000020000000L});
-    public static final BitSet FOLLOW_29_in_ruleInterfaceExpression1409 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExport_in_entryRuleExport1445 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleExport1455 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_12_in_ruleExport1492 = new BitSet(new long[]{0x0000000040000010L});
-    public static final BitSet FOLLOW_30_in_ruleExport1511 = new BitSet(new long[]{0x0000000000100010L});
-    public static final BitSet FOLLOW_20_in_ruleExport1537 = new BitSet(new long[]{0x48009100100100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleExport1558 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_21_in_ruleExport1570 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleQualifiedID_in_ruleExport1597 = new BitSet(new long[]{0x0000000000190000L});
-    public static final BitSet FOLLOW_19_in_ruleExport1610 = new BitSet(new long[]{0x48009100900100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_31_in_ruleExport1628 = new BitSet(new long[]{0x48009100100100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleExport1663 = new BitSet(new long[]{0x0000000000110000L});
-    public static final BitSet FOLLOW_20_in_ruleExport1678 = new BitSet(new long[]{0x48009100100100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleExport1699 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_21_in_ruleExport1711 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_16_in_ruleExport1725 = new BitSet(new long[]{0x0000007900020000L});
-    public static final BitSet FOLLOW_32_in_ruleExport1738 = new BitSet(new long[]{0x0000000000400000L});
-    public static final BitSet FOLLOW_22_in_ruleExport1750 = new BitSet(new long[]{0x0000000600000000L});
-    public static final BitSet FOLLOW_33_in_ruleExport1768 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_34_in_ruleExport1794 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_28_in_ruleExport1806 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleExport1826 = new BitSet(new long[]{0x0000000020000000L});
-    public static final BitSet FOLLOW_29_in_ruleExport1838 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_24_in_ruleExport1850 = new BitSet(new long[]{0x0000007800020000L});
-    public static final BitSet FOLLOW_35_in_ruleExport1872 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_36_in_ruleExport1909 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_24_in_ruleExport1935 = new BitSet(new long[]{0x0000006000020000L});
-    public static final BitSet FOLLOW_37_in_ruleExport1951 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleAttribute_in_ruleExport1972 = new BitSet(new long[]{0x0000000001800000L});
-    public static final BitSet FOLLOW_23_in_ruleExport1985 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleAttribute_in_ruleExport2006 = new BitSet(new long[]{0x0000000001800000L});
-    public static final BitSet FOLLOW_24_in_ruleExport2020 = new BitSet(new long[]{0x0000006000020000L});
-    public static final BitSet FOLLOW_38_in_ruleExport2040 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleUserData_in_ruleExport2061 = new BitSet(new long[]{0x0000000001800000L});
-    public static final BitSet FOLLOW_23_in_ruleExport2074 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleUserData_in_ruleExport2095 = new BitSet(new long[]{0x0000000001800000L});
-    public static final BitSet FOLLOW_24_in_ruleExport2109 = new BitSet(new long[]{0x0000006000020000L});
-    public static final BitSet FOLLOW_17_in_ruleExport2124 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleUserData_in_entryRuleUserData2160 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleUserData2170 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleUserData2212 = new BitSet(new long[]{0x0000000000400000L});
-    public static final BitSet FOLLOW_22_in_ruleUserData2229 = new BitSet(new long[]{0x48009100100100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleUserData2250 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAttribute_in_entryRuleAttribute2286 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAttribute2296 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleAttribute2340 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedID_in_entryRuleQualifiedID2376 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedID2387 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleQualifiedID2427 = new BitSet(new long[]{0x0000008000000002L});
-    public static final BitSet FOLLOW_39_in_ruleQualifiedID2446 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleQualifiedID2461 = new BitSet(new long[]{0x0000008000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_entryRuleExpression2508 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleExpression2518 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLetExpression_in_ruleExpression2565 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCastedExpression_in_ruleExpression2598 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChainExpression_in_ruleExpression2626 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLetExpression_in_entryRuleLetExpression2663 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleLetExpression2673 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_40_in_ruleLetExpression2710 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleLetExpression2731 = new BitSet(new long[]{0x0000000000400000L});
-    public static final BitSet FOLLOW_22_in_ruleLetExpression2743 = new BitSet(new long[]{0x48009100100100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleLetExpression2764 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_41_in_ruleLetExpression2776 = new BitSet(new long[]{0x48009100100100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleLetExpression2797 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCastedExpression_in_entryRuleCastedExpression2833 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleCastedExpression2843 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_ruleCastedExpression2880 = new BitSet(new long[]{0x0000000000000010L,0x0000000000038000L});
-    public static final BitSet FOLLOW_ruleType_in_ruleCastedExpression2901 = new BitSet(new long[]{0x0000000020000000L});
-    public static final BitSet FOLLOW_29_in_ruleCastedExpression2913 = new BitSet(new long[]{0x48009100100100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleCastedExpression2934 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChainExpression_in_entryRuleChainExpression2970 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleChainExpression2980 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_ruleChainExpression3027 = new BitSet(new long[]{0x0000040000000002L});
-    public static final BitSet FOLLOW_42_in_ruleChainExpression3048 = new BitSet(new long[]{0x48009100100100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_ruleChainExpression3069 = new BitSet(new long[]{0x0000040000000002L});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_entryRuleChainedExpression3107 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleChainedExpression3117 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIfExpressionKw_in_ruleChainedExpression3164 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIfExpressionTri_in_ruleChainedExpression3191 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSwitchExpression_in_ruleChainedExpression3218 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIfExpressionTri_in_entryRuleIfExpressionTri3253 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIfExpressionTri3263 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOrExpression_in_ruleIfExpressionTri3310 = new BitSet(new long[]{0x0000080000000002L});
-    public static final BitSet FOLLOW_43_in_ruleIfExpressionTri3331 = new BitSet(new long[]{0x48009100100100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_ruleIfExpressionTri3352 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_41_in_ruleIfExpressionTri3364 = new BitSet(new long[]{0x48009100100100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_ruleIfExpressionTri3385 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIfExpressionKw_in_entryRuleIfExpressionKw3423 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIfExpressionKw3433 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_44_in_ruleIfExpressionKw3470 = new BitSet(new long[]{0x48009100100100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_ruleIfExpressionKw3491 = new BitSet(new long[]{0x0000200000000000L});
-    public static final BitSet FOLLOW_45_in_ruleIfExpressionKw3503 = new BitSet(new long[]{0x48009100100100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_ruleIfExpressionKw3524 = new BitSet(new long[]{0x0000400000000002L});
-    public static final BitSet FOLLOW_46_in_ruleIfExpressionKw3545 = new BitSet(new long[]{0x48009100100100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_ruleIfExpressionKw3566 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSwitchExpression_in_entryRuleSwitchExpression3605 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSwitchExpression3615 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_ruleSwitchExpression3652 = new BitSet(new long[]{0x0000000010010000L});
-    public static final BitSet FOLLOW_28_in_ruleSwitchExpression3665 = new BitSet(new long[]{0x48000000100100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_ruleOrExpression_in_ruleSwitchExpression3686 = new BitSet(new long[]{0x0000000020000000L});
-    public static final BitSet FOLLOW_29_in_ruleSwitchExpression3698 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_16_in_ruleSwitchExpression3712 = new BitSet(new long[]{0x0003000000000000L});
-    public static final BitSet FOLLOW_ruleCase_in_ruleSwitchExpression3733 = new BitSet(new long[]{0x0003000000000000L});
-    public static final BitSet FOLLOW_48_in_ruleSwitchExpression3746 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_41_in_ruleSwitchExpression3758 = new BitSet(new long[]{0x48000000100100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_ruleOrExpression_in_ruleSwitchExpression3779 = new BitSet(new long[]{0x0000000000020000L});
-    public static final BitSet FOLLOW_17_in_ruleSwitchExpression3791 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCase_in_entryRuleCase3827 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleCase3837 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_49_in_ruleCase3874 = new BitSet(new long[]{0x48000000100100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_ruleOrExpression_in_ruleCase3895 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_41_in_ruleCase3907 = new BitSet(new long[]{0x48000000100100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_ruleOrExpression_in_ruleCase3928 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOrExpression_in_entryRuleOrExpression3964 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOrExpression3974 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAndExpression_in_ruleOrExpression4021 = new BitSet(new long[]{0x0004000000000002L});
-    public static final BitSet FOLLOW_50_in_ruleOrExpression4048 = new BitSet(new long[]{0x48000000100100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_ruleAndExpression_in_ruleOrExpression4082 = new BitSet(new long[]{0x0004000000000002L});
-    public static final BitSet FOLLOW_ruleAndExpression_in_entryRuleAndExpression4120 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAndExpression4130 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImpliesExpression_in_ruleAndExpression4177 = new BitSet(new long[]{0x0008000000000002L});
-    public static final BitSet FOLLOW_51_in_ruleAndExpression4204 = new BitSet(new long[]{0x48000000100100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_ruleImpliesExpression_in_ruleAndExpression4238 = new BitSet(new long[]{0x0008000000000002L});
-    public static final BitSet FOLLOW_ruleImpliesExpression_in_entryRuleImpliesExpression4276 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleImpliesExpression4286 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRelationalExpression_in_ruleImpliesExpression4333 = new BitSet(new long[]{0x0010000000000002L});
-    public static final BitSet FOLLOW_52_in_ruleImpliesExpression4360 = new BitSet(new long[]{0x48000000100100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_ruleRelationalExpression_in_ruleImpliesExpression4394 = new BitSet(new long[]{0x0010000000000002L});
-    public static final BitSet FOLLOW_ruleRelationalExpression_in_entryRuleRelationalExpression4432 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRelationalExpression4442 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAdditiveExpression_in_ruleRelationalExpression4489 = new BitSet(new long[]{0x07E0000000000002L});
-    public static final BitSet FOLLOW_53_in_ruleRelationalExpression4518 = new BitSet(new long[]{0x48000000100100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_54_in_ruleRelationalExpression4547 = new BitSet(new long[]{0x48000000100100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_55_in_ruleRelationalExpression4576 = new BitSet(new long[]{0x48000000100100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_56_in_ruleRelationalExpression4605 = new BitSet(new long[]{0x48000000100100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_57_in_ruleRelationalExpression4634 = new BitSet(new long[]{0x48000000100100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_58_in_ruleRelationalExpression4663 = new BitSet(new long[]{0x48000000100100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_ruleAdditiveExpression_in_ruleRelationalExpression4700 = new BitSet(new long[]{0x07E0000000000002L});
-    public static final BitSet FOLLOW_ruleAdditiveExpression_in_entryRuleAdditiveExpression4738 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAdditiveExpression4748 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMultiplicativeExpression_in_ruleAdditiveExpression4795 = new BitSet(new long[]{0x0800000002000002L});
-    public static final BitSet FOLLOW_25_in_ruleAdditiveExpression4824 = new BitSet(new long[]{0x48000000100100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_59_in_ruleAdditiveExpression4853 = new BitSet(new long[]{0x48000000100100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_ruleMultiplicativeExpression_in_ruleAdditiveExpression4890 = new BitSet(new long[]{0x0800000002000002L});
-    public static final BitSet FOLLOW_ruleMultiplicativeExpression_in_entryRuleMultiplicativeExpression4928 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleMultiplicativeExpression4938 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleUnaryOrInfixExpression_in_ruleMultiplicativeExpression4985 = new BitSet(new long[]{0x3000000000000002L});
-    public static final BitSet FOLLOW_60_in_ruleMultiplicativeExpression5014 = new BitSet(new long[]{0x48000000100100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_61_in_ruleMultiplicativeExpression5043 = new BitSet(new long[]{0x48000000100100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_ruleUnaryOrInfixExpression_in_ruleMultiplicativeExpression5080 = new BitSet(new long[]{0x3000000000000002L});
-    public static final BitSet FOLLOW_ruleUnaryOrInfixExpression_in_entryRuleUnaryOrInfixExpression5118 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleUnaryOrInfixExpression5128 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleUnaryExpression_in_ruleUnaryOrInfixExpression5175 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInfixExpression_in_ruleUnaryOrInfixExpression5202 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleUnaryExpression_in_entryRuleUnaryExpression5237 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleUnaryExpression5247 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_62_in_ruleUnaryExpression5292 = new BitSet(new long[]{0x48000000100100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_59_in_ruleUnaryExpression5321 = new BitSet(new long[]{0x48000000100100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_ruleInfixExpression_in_ruleUnaryExpression5358 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInfixExpression_in_entryRuleInfixExpression5394 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInfixExpression5404 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePrimaryExpression_in_ruleInfixExpression5451 = new BitSet(new long[]{0x8000000000000002L});
-    public static final BitSet FOLLOW_63_in_ruleInfixExpression5473 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleInfixExpression5494 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_28_in_ruleInfixExpression5506 = new BitSet(new long[]{0x48009100300100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleInfixExpression5528 = new BitSet(new long[]{0x0000000020800000L});
-    public static final BitSet FOLLOW_23_in_ruleInfixExpression5541 = new BitSet(new long[]{0x48009100100100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleInfixExpression5562 = new BitSet(new long[]{0x0000000020800000L});
-    public static final BitSet FOLLOW_29_in_ruleInfixExpression5578 = new BitSet(new long[]{0x8000000000000002L});
-    public static final BitSet FOLLOW_63_in_ruleInfixExpression5607 = new BitSet(new long[]{0x0000000000000010L,0x0000000000038000L});
-    public static final BitSet FOLLOW_ruleType_in_ruleInfixExpression5628 = new BitSet(new long[]{0x8000000000000002L});
-    public static final BitSet FOLLOW_63_in_ruleInfixExpression5657 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_64_in_ruleInfixExpression5675 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_28_in_ruleInfixExpression5700 = new BitSet(new long[]{0x0000000000000010L,0x0000000000038000L});
-    public static final BitSet FOLLOW_ruleType_in_ruleInfixExpression5721 = new BitSet(new long[]{0x0000000020000000L});
-    public static final BitSet FOLLOW_29_in_ruleInfixExpression5733 = new BitSet(new long[]{0x8000000000000002L});
-    public static final BitSet FOLLOW_63_in_ruleInfixExpression5762 = new BitSet(new long[]{0x0000000000000000L,0x00000000000001FEL});
-    public static final BitSet FOLLOW_65_in_ruleInfixExpression5782 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_66_in_ruleInfixExpression5811 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_67_in_ruleInfixExpression5840 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_68_in_ruleInfixExpression5869 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_69_in_ruleInfixExpression5898 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_70_in_ruleInfixExpression5927 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_71_in_ruleInfixExpression5956 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_72_in_ruleInfixExpression5985 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_28_in_ruleInfixExpression6013 = new BitSet(new long[]{0x48009100100100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleInfixExpression6035 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000200L});
-    public static final BitSet FOLLOW_73_in_ruleInfixExpression6047 = new BitSet(new long[]{0x48009100100100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleInfixExpression6070 = new BitSet(new long[]{0x0000000020000000L});
-    public static final BitSet FOLLOW_29_in_ruleInfixExpression6082 = new BitSet(new long[]{0x8000000000000002L});
-    public static final BitSet FOLLOW_rulePrimaryExpression_in_entryRulePrimaryExpression6121 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRulePrimaryExpression6131 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteral_in_rulePrimaryExpression6178 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFeatureCall_in_rulePrimaryExpression6205 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleListLiteral_in_rulePrimaryExpression6232 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConstructorCallExpression_in_rulePrimaryExpression6259 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGlobalVarExpression_in_rulePrimaryExpression6286 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleParanthesizedExpression_in_rulePrimaryExpression6313 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteral_in_entryRuleLiteral6348 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleLiteral6358 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBooleanLiteral_in_ruleLiteral6405 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntegerLiteral_in_ruleLiteral6432 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNullLiteral_in_ruleLiteral6459 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRealLiteral_in_ruleLiteral6486 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStringLiteral_in_ruleLiteral6513 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBooleanLiteral_in_entryRuleBooleanLiteral6548 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleBooleanLiteral6558 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_ruleBooleanLiteral6602 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_75_in_ruleBooleanLiteral6631 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntegerLiteral_in_entryRuleIntegerLiteral6682 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIntegerLiteral6692 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleIntegerLiteral6733 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNullLiteral_in_entryRuleNullLiteral6773 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNullLiteral6783 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_76_in_ruleNullLiteral6825 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRealLiteral_in_entryRuleRealLiteral6873 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRealLiteral6883 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_REAL_in_ruleRealLiteral6924 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral6964 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleStringLiteral6974 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleStringLiteral7015 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleParanthesizedExpression_in_entryRuleParanthesizedExpression7055 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleParanthesizedExpression7065 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_ruleParanthesizedExpression7102 = new BitSet(new long[]{0x48009100100100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleParanthesizedExpression7124 = new BitSet(new long[]{0x0000000020000000L});
-    public static final BitSet FOLLOW_29_in_ruleParanthesizedExpression7135 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGlobalVarExpression_in_entryRuleGlobalVarExpression7171 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleGlobalVarExpression7181 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_77_in_ruleGlobalVarExpression7218 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleGlobalVarExpression7239 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFeatureCall_in_entryRuleFeatureCall7275 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFeatureCall7285 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOperationCall_in_ruleFeatureCall7332 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleType_in_ruleFeatureCall7358 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCollectionExpression_in_ruleFeatureCall7386 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTypeSelectExpression_in_ruleFeatureCall7413 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOperationCall_in_entryRuleOperationCall7448 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOperationCall7458 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleOperationCall7504 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_28_in_ruleOperationCall7516 = new BitSet(new long[]{0x48009100300100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleOperationCall7538 = new BitSet(new long[]{0x0000000020800000L});
-    public static final BitSet FOLLOW_23_in_ruleOperationCall7551 = new BitSet(new long[]{0x48009100100100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleOperationCall7572 = new BitSet(new long[]{0x0000000020800000L});
-    public static final BitSet FOLLOW_29_in_ruleOperationCall7588 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleListLiteral_in_entryRuleListLiteral7624 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleListLiteral7634 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_16_in_ruleListLiteral7680 = new BitSet(new long[]{0x48009100100300F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleListLiteral7702 = new BitSet(new long[]{0x0000000000820000L});
-    public static final BitSet FOLLOW_23_in_ruleListLiteral7715 = new BitSet(new long[]{0x48009100100100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleListLiteral7736 = new BitSet(new long[]{0x0000000000820000L});
-    public static final BitSet FOLLOW_17_in_ruleListLiteral7752 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConstructorCallExpression_in_entryRuleConstructorCallExpression7788 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleConstructorCallExpression7798 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_78_in_ruleConstructorCallExpression7835 = new BitSet(new long[]{0x0000000000000010L,0x0000000000038000L});
-    public static final BitSet FOLLOW_ruleSimpleType_in_ruleConstructorCallExpression7856 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTypeSelectExpression_in_entryRuleTypeSelectExpression7892 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTypeSelectExpression7902 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_64_in_ruleTypeSelectExpression7945 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_28_in_ruleTypeSelectExpression7970 = new BitSet(new long[]{0x0000000000000010L,0x0000000000038000L});
-    public static final BitSet FOLLOW_ruleType_in_ruleTypeSelectExpression7991 = new BitSet(new long[]{0x0000000020000000L});
-    public static final BitSet FOLLOW_29_in_ruleTypeSelectExpression8003 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCollectionExpression_in_entryRuleCollectionExpression8039 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleCollectionExpression8049 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_65_in_ruleCollectionExpression8094 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_66_in_ruleCollectionExpression8123 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_67_in_ruleCollectionExpression8152 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_68_in_ruleCollectionExpression8181 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_69_in_ruleCollectionExpression8210 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_70_in_ruleCollectionExpression8239 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_71_in_ruleCollectionExpression8268 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_72_in_ruleCollectionExpression8297 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_28_in_ruleCollectionExpression8325 = new BitSet(new long[]{0x48009100100100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleCollectionExpression8347 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000200L});
-    public static final BitSet FOLLOW_73_in_ruleCollectionExpression8359 = new BitSet(new long[]{0x48009100100100F0L,0x000000000003FDFFL});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleCollectionExpression8382 = new BitSet(new long[]{0x0000000020000000L});
-    public static final BitSet FOLLOW_29_in_ruleCollectionExpression8394 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleType_in_entryRuleType8430 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleType8440 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCollectionType_in_ruleType8487 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleType_in_ruleType8514 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCollectionType_in_entryRuleCollectionType8549 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleCollectionType8559 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_79_in_ruleCollectionType8604 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_80_in_ruleCollectionType8633 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_81_in_ruleCollectionType8662 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_20_in_ruleCollectionType8690 = new BitSet(new long[]{0x0000000000000010L,0x0000000000038000L});
-    public static final BitSet FOLLOW_ruleSimpleType_in_ruleCollectionType8711 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_21_in_ruleCollectionType8723 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleType_in_entryRuleSimpleType8759 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSimpleType8769 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleSimpleType8815 = new BitSet(new long[]{0x0000008000000002L});
-    public static final BitSet FOLLOW_39_in_ruleSimpleType8828 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleSimpleType8849 = new BitSet(new long[]{0x0000008000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_entryRuleIdentifier8888 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIdentifier8899 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleIdentifier8938 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCastedExpression_in_synpred1_InternalExport2582 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_synpred2_InternalExport3536 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_1 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_2 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x0000000000002010L});
+    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0000000000004000L});
+    public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000000040000L});
+    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x000000000004B000L});
+    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x000000000000B000L});
+    public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000000010000L});
+    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000000020010L});
+    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x000000000000B002L});
+    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000080002L});
+    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000001500000L});
+    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x48009100100100F0L,0x000000000003FDFFL});
+    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000000000200000L});
+    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000001400000L});
+    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x000000000E000010L});
+    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000001C00000L});
+    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000000002000010L});
+    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000000016000000L});
+    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000000012000000L});
+    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000000010000000L});
+    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0000000020000000L});
+    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000000040000010L});
+    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0000000000100010L});
+    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0000000000190000L});
+    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x48009100900100F0L,0x000000000003FDFFL});
+    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000000000110000L});
+    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000007900020000L});
+    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000000000400000L});
+    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0000000600000000L});
+    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0000000400000000L});
+    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0000000001000000L});
+    public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x0000007800020000L});
+    public static final BitSet FOLLOW_36 = new BitSet(new long[]{0x0000006000020000L});
+    public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x0000000001800000L});
+    public static final BitSet FOLLOW_38 = new BitSet(new long[]{0x0000008000000002L});
+    public static final BitSet FOLLOW_39 = new BitSet(new long[]{0x0000020000000000L});
+    public static final BitSet FOLLOW_40 = new BitSet(new long[]{0x0000000000000010L,0x0000000000038000L});
+    public static final BitSet FOLLOW_41 = new BitSet(new long[]{0x0000040000000002L});
+    public static final BitSet FOLLOW_42 = new BitSet(new long[]{0x0000080000000002L});
+    public static final BitSet FOLLOW_43 = new BitSet(new long[]{0x0000200000000000L});
+    public static final BitSet FOLLOW_44 = new BitSet(new long[]{0x0000400000000002L});
+    public static final BitSet FOLLOW_45 = new BitSet(new long[]{0x0000000010010000L});
+    public static final BitSet FOLLOW_46 = new BitSet(new long[]{0x48000000100100F0L,0x000000000003FDFFL});
+    public static final BitSet FOLLOW_47 = new BitSet(new long[]{0x0003000000000000L});
+    public static final BitSet FOLLOW_48 = new BitSet(new long[]{0x0000000000020000L});
+    public static final BitSet FOLLOW_49 = new BitSet(new long[]{0x0004000000000002L});
+    public static final BitSet FOLLOW_50 = new BitSet(new long[]{0x0008000000000002L});
+    public static final BitSet FOLLOW_51 = new BitSet(new long[]{0x0010000000000002L});
+    public static final BitSet FOLLOW_52 = new BitSet(new long[]{0x07E0000000000002L});
+    public static final BitSet FOLLOW_53 = new BitSet(new long[]{0x0800000002000002L});
+    public static final BitSet FOLLOW_54 = new BitSet(new long[]{0x3000000000000002L});
+    public static final BitSet FOLLOW_55 = new BitSet(new long[]{0x8000000000000002L});
+    public static final BitSet FOLLOW_56 = new BitSet(new long[]{0x48009100300100F0L,0x000000000003FDFFL});
+    public static final BitSet FOLLOW_57 = new BitSet(new long[]{0x0000000020800000L});
+    public static final BitSet FOLLOW_58 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000001L});
+    public static final BitSet FOLLOW_59 = new BitSet(new long[]{0x0000000000000000L,0x00000000000001FEL});
+    public static final BitSet FOLLOW_60 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000200L});
+    public static final BitSet FOLLOW_61 = new BitSet(new long[]{0x48009100100300F0L,0x000000000003FDFFL});
+    public static final BitSet FOLLOW_62 = new BitSet(new long[]{0x0000000000820000L});
+    public static final BitSet FOLLOW_63 = new BitSet(new long[]{0x0000000000100000L});
 
 }
\ No newline at end of file
diff --git a/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/serializer/AbstractExportSemanticSequencer.java b/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/serializer/AbstractExportSemanticSequencer.java
index 314733439..be2ffce93 100644
--- a/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/serializer/AbstractExportSemanticSequencer.java
+++ b/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/serializer/AbstractExportSemanticSequencer.java
@@ -38,431 +38,470 @@
 import com.avaloq.tools.ddk.xtext.expression.expression.TypeSelectExpression;
 import com.avaloq.tools.ddk.xtext.expression.serializer.ExpressionSemanticSequencer;
 import com.google.inject.Inject;
-import com.google.inject.Provider;
+import java.util.Set;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.xtext.serializer.acceptor.ISemanticSequenceAcceptor;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.xtext.Action;
+import org.eclipse.xtext.Parameter;
+import org.eclipse.xtext.ParserRule;
+import org.eclipse.xtext.serializer.ISerializationContext;
 import org.eclipse.xtext.serializer.acceptor.SequenceFeeder;
-import org.eclipse.xtext.serializer.diagnostic.ISemanticSequencerDiagnosticProvider;
-import org.eclipse.xtext.serializer.diagnostic.ISerializationDiagnostic.Acceptor;
-import org.eclipse.xtext.serializer.sequencer.GenericSequencer;
-import org.eclipse.xtext.serializer.sequencer.ISemanticNodeProvider.INodesForEObjectProvider;
-import org.eclipse.xtext.serializer.sequencer.ISemanticSequencer;
-import org.eclipse.xtext.serializer.sequencer.ITransientValueService;
 import org.eclipse.xtext.serializer.sequencer.ITransientValueService.ValueTransient;
 
 @SuppressWarnings("all")
 public abstract class AbstractExportSemanticSequencer extends ExpressionSemanticSequencer {
 
-  @Inject
-  private ExportGrammarAccess grammarAccess;
-
-  @Override
-  public void createSequence(EObject context, EObject semanticObject) {
-  	if(semanticObject.eClass().getEPackage() == ExportPackage.eINSTANCE) switch(semanticObject.eClass().getClassifierID()) {
-  		case ExportPackage.ATTRIBUTE:
-  			sequence_Attribute(context, (Attribute) semanticObject); 
-  			return; 
-  		case ExportPackage.EXPORT:
-  			sequence_Export(context, (Export) semanticObject); 
-  			return; 
-  		case ExportPackage.EXPORT_MODEL:
-  			sequence_ExportModel(context, (ExportModel) semanticObject); 
-  			return; 
-  		case ExportPackage.EXTENSION:
-  			sequence_Extension(context, (Extension) semanticObject); 
-  			return; 
-  		case ExportPackage.IMPORT:
-  			sequence_Import(context, (Import) semanticObject); 
-  			return; 
-  		case ExportPackage.INTERFACE:
-  			sequence_Interface(context, (Interface) semanticObject); 
-  			return; 
-  		case ExportPackage.INTERFACE_EXPRESSION:
-  			sequence_InterfaceExpression(context, (InterfaceExpression) semanticObject); 
-  			return; 
-  		case ExportPackage.INTERFACE_FIELD:
-  			sequence_InterfaceField(context, (InterfaceField) semanticObject); 
-  			return; 
-  		case ExportPackage.INTERFACE_NAVIGATION:
-  			sequence_InterfaceNavigation(context, (InterfaceNavigation) semanticObject); 
-  			return; 
-  		case ExportPackage.USER_DATA:
-  			sequence_UserData(context, (UserData) semanticObject); 
-  			return; 
-  		}
-  	else if(semanticObject.eClass().getEPackage() == ExpressionPackage.eINSTANCE) switch(semanticObject.eClass().getClassifierID()) {
-  		case ExpressionPackage.BOOLEAN_LITERAL:
-  			sequence_BooleanLiteral(context, (BooleanLiteral) semanticObject); 
-  			return; 
-  		case ExpressionPackage.BOOLEAN_OPERATION:
-  			sequence_AndExpression_ImpliesExpression_OrExpression_RelationalExpression(context, (BooleanOperation) semanticObject); 
-  			return; 
-  		case ExpressionPackage.CASE:
-  			sequence_Case(context, (Case) semanticObject); 
-  			return; 
-  		case ExpressionPackage.CASTED_EXPRESSION:
-  			sequence_CastedExpression(context, (CastedExpression) semanticObject); 
-  			return; 
-  		case ExpressionPackage.CHAIN_EXPRESSION:
-  			sequence_ChainExpression(context, (ChainExpression) semanticObject); 
-  			return; 
-  		case ExpressionPackage.COLLECTION_EXPRESSION:
-  			if(context == grammarAccess.getCollectionExpressionRule() ||
-  			   context == grammarAccess.getFeatureCallRule()) {
-  				sequence_CollectionExpression(context, (CollectionExpression) semanticObject); 
-  				return; 
-  			}
-  			else if(context == grammarAccess.getAdditiveExpressionRule() ||
-  			   context == grammarAccess.getAdditiveExpressionAccess().getOperationCallParamsAction_1_0() ||
-  			   context == grammarAccess.getAndExpressionRule() ||
-  			   context == grammarAccess.getAndExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-  			   context == grammarAccess.getChainExpressionRule() ||
-  			   context == grammarAccess.getChainExpressionAccess().getChainExpressionFirstAction_1_0() ||
-  			   context == grammarAccess.getChainedExpressionRule() ||
-  			   context == grammarAccess.getExpressionRule() ||
-  			   context == grammarAccess.getIfExpressionTriRule() ||
-  			   context == grammarAccess.getIfExpressionTriAccess().getIfExpressionConditionAction_1_0() ||
-  			   context == grammarAccess.getImpliesExpressionRule() ||
-  			   context == grammarAccess.getImpliesExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-  			   context == grammarAccess.getInfixExpressionRule() ||
-  			   context == grammarAccess.getInfixExpressionAccess().getCollectionExpressionTargetAction_1_3_0() ||
-  			   context == grammarAccess.getInfixExpressionAccess().getFeatureCallTargetAction_1_1_0() ||
-  			   context == grammarAccess.getInfixExpressionAccess().getOperationCallTargetAction_1_0_0() ||
-  			   context == grammarAccess.getInfixExpressionAccess().getTypeSelectExpressionTargetAction_1_2_0() ||
-  			   context == grammarAccess.getMultiplicativeExpressionRule() ||
-  			   context == grammarAccess.getMultiplicativeExpressionAccess().getOperationCallParamsAction_1_0() ||
-  			   context == grammarAccess.getOrExpressionRule() ||
-  			   context == grammarAccess.getOrExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-  			   context == grammarAccess.getParanthesizedExpressionRule() ||
-  			   context == grammarAccess.getPrimaryExpressionRule() ||
-  			   context == grammarAccess.getRelationalExpressionRule() ||
-  			   context == grammarAccess.getRelationalExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-  			   context == grammarAccess.getSyntaxElementRule() ||
-  			   context == grammarAccess.getUnaryOrInfixExpressionRule()) {
-  				sequence_CollectionExpression_InfixExpression(context, (CollectionExpression) semanticObject); 
-  				return; 
-  			}
-  			else break;
-  		case ExpressionPackage.CONSTRUCTOR_CALL_EXPRESSION:
-  			sequence_ConstructorCallExpression(context, (ConstructorCallExpression) semanticObject); 
-  			return; 
-  		case ExpressionPackage.FEATURE_CALL:
-  			if(context == grammarAccess.getFeatureCallRule()) {
-  				sequence_FeatureCall(context, (FeatureCall) semanticObject); 
-  				return; 
-  			}
-  			else if(context == grammarAccess.getAdditiveExpressionRule() ||
-  			   context == grammarAccess.getAdditiveExpressionAccess().getOperationCallParamsAction_1_0() ||
-  			   context == grammarAccess.getAndExpressionRule() ||
-  			   context == grammarAccess.getAndExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-  			   context == grammarAccess.getChainExpressionRule() ||
-  			   context == grammarAccess.getChainExpressionAccess().getChainExpressionFirstAction_1_0() ||
-  			   context == grammarAccess.getChainedExpressionRule() ||
-  			   context == grammarAccess.getExpressionRule() ||
-  			   context == grammarAccess.getIfExpressionTriRule() ||
-  			   context == grammarAccess.getIfExpressionTriAccess().getIfExpressionConditionAction_1_0() ||
-  			   context == grammarAccess.getImpliesExpressionRule() ||
-  			   context == grammarAccess.getImpliesExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-  			   context == grammarAccess.getInfixExpressionRule() ||
-  			   context == grammarAccess.getInfixExpressionAccess().getCollectionExpressionTargetAction_1_3_0() ||
-  			   context == grammarAccess.getInfixExpressionAccess().getFeatureCallTargetAction_1_1_0() ||
-  			   context == grammarAccess.getInfixExpressionAccess().getOperationCallTargetAction_1_0_0() ||
-  			   context == grammarAccess.getInfixExpressionAccess().getTypeSelectExpressionTargetAction_1_2_0() ||
-  			   context == grammarAccess.getMultiplicativeExpressionRule() ||
-  			   context == grammarAccess.getMultiplicativeExpressionAccess().getOperationCallParamsAction_1_0() ||
-  			   context == grammarAccess.getOrExpressionRule() ||
-  			   context == grammarAccess.getOrExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-  			   context == grammarAccess.getParanthesizedExpressionRule() ||
-  			   context == grammarAccess.getPrimaryExpressionRule() ||
-  			   context == grammarAccess.getRelationalExpressionRule() ||
-  			   context == grammarAccess.getRelationalExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-  			   context == grammarAccess.getSyntaxElementRule() ||
-  			   context == grammarAccess.getUnaryOrInfixExpressionRule()) {
-  				sequence_FeatureCall_InfixExpression(context, (FeatureCall) semanticObject); 
-  				return; 
-  			}
-  			else break;
-  		case ExpressionPackage.GLOBAL_VAR_EXPRESSION:
-  			sequence_GlobalVarExpression(context, (GlobalVarExpression) semanticObject); 
-  			return; 
-  		case ExpressionPackage.IDENTIFIER:
-  			if(context == grammarAccess.getCollectionTypeRule()) {
-  				sequence_CollectionType(context, (Identifier) semanticObject); 
-  				return; 
-  			}
-  			else if(context == grammarAccess.getSyntaxElementRule() ||
-  			   context == grammarAccess.getTypeRule()) {
-  				sequence_CollectionType_SimpleType_Type(context, (Identifier) semanticObject); 
-  				return; 
-  			}
-  			else if(context == grammarAccess.getSimpleTypeRule()) {
-  				sequence_SimpleType(context, (Identifier) semanticObject); 
-  				return; 
-  			}
-  			else break;
-  		case ExpressionPackage.IF_EXPRESSION:
-  			if(context == grammarAccess.getAdditiveExpressionRule() ||
-  			   context == grammarAccess.getAdditiveExpressionAccess().getOperationCallParamsAction_1_0() ||
-  			   context == grammarAccess.getAndExpressionRule() ||
-  			   context == grammarAccess.getAndExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-  			   context == grammarAccess.getChainExpressionRule() ||
-  			   context == grammarAccess.getChainExpressionAccess().getChainExpressionFirstAction_1_0() ||
-  			   context == grammarAccess.getChainedExpressionRule() ||
-  			   context == grammarAccess.getExpressionRule() ||
-  			   context == grammarAccess.getIfExpressionTriRule() ||
-  			   context == grammarAccess.getIfExpressionTriAccess().getIfExpressionConditionAction_1_0() ||
-  			   context == grammarAccess.getImpliesExpressionRule() ||
-  			   context == grammarAccess.getImpliesExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-  			   context == grammarAccess.getInfixExpressionRule() ||
-  			   context == grammarAccess.getInfixExpressionAccess().getCollectionExpressionTargetAction_1_3_0() ||
-  			   context == grammarAccess.getInfixExpressionAccess().getFeatureCallTargetAction_1_1_0() ||
-  			   context == grammarAccess.getInfixExpressionAccess().getOperationCallTargetAction_1_0_0() ||
-  			   context == grammarAccess.getInfixExpressionAccess().getTypeSelectExpressionTargetAction_1_2_0() ||
-  			   context == grammarAccess.getMultiplicativeExpressionRule() ||
-  			   context == grammarAccess.getMultiplicativeExpressionAccess().getOperationCallParamsAction_1_0() ||
-  			   context == grammarAccess.getOrExpressionRule() ||
-  			   context == grammarAccess.getOrExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-  			   context == grammarAccess.getParanthesizedExpressionRule() ||
-  			   context == grammarAccess.getPrimaryExpressionRule() ||
-  			   context == grammarAccess.getRelationalExpressionRule() ||
-  			   context == grammarAccess.getRelationalExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-  			   context == grammarAccess.getSyntaxElementRule() ||
-  			   context == grammarAccess.getUnaryOrInfixExpressionRule()) {
-  				sequence_ChainedExpression_IfExpressionKw_IfExpressionTri(context, (IfExpression) semanticObject); 
-  				return; 
-  			}
-  			else if(context == grammarAccess.getIfExpressionKwRule()) {
-  				sequence_IfExpressionKw(context, (IfExpression) semanticObject); 
-  				return; 
-  			}
-  			else break;
-  		case ExpressionPackage.INTEGER_LITERAL:
-  			sequence_IntegerLiteral(context, (IntegerLiteral) semanticObject); 
-  			return; 
-  		case ExpressionPackage.LET_EXPRESSION:
-  			sequence_LetExpression(context, (LetExpression) semanticObject); 
-  			return; 
-  		case ExpressionPackage.LIST_LITERAL:
-  			sequence_ListLiteral(context, (ListLiteral) semanticObject); 
-  			return; 
-  		case ExpressionPackage.NULL_LITERAL:
-  			sequence_NullLiteral(context, (NullLiteral) semanticObject); 
-  			return; 
-  		case ExpressionPackage.OPERATION_CALL:
-  			if(context == grammarAccess.getAdditiveExpressionRule() ||
-  			   context == grammarAccess.getAdditiveExpressionAccess().getOperationCallParamsAction_1_0() ||
-  			   context == grammarAccess.getAndExpressionRule() ||
-  			   context == grammarAccess.getAndExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-  			   context == grammarAccess.getChainExpressionRule() ||
-  			   context == grammarAccess.getChainExpressionAccess().getChainExpressionFirstAction_1_0() ||
-  			   context == grammarAccess.getChainedExpressionRule() ||
-  			   context == grammarAccess.getExpressionRule() ||
-  			   context == grammarAccess.getIfExpressionTriRule() ||
-  			   context == grammarAccess.getIfExpressionTriAccess().getIfExpressionConditionAction_1_0() ||
-  			   context == grammarAccess.getImpliesExpressionRule() ||
-  			   context == grammarAccess.getImpliesExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-  			   context == grammarAccess.getInfixExpressionRule() ||
-  			   context == grammarAccess.getInfixExpressionAccess().getCollectionExpressionTargetAction_1_3_0() ||
-  			   context == grammarAccess.getInfixExpressionAccess().getFeatureCallTargetAction_1_1_0() ||
-  			   context == grammarAccess.getInfixExpressionAccess().getOperationCallTargetAction_1_0_0() ||
-  			   context == grammarAccess.getInfixExpressionAccess().getTypeSelectExpressionTargetAction_1_2_0() ||
-  			   context == grammarAccess.getMultiplicativeExpressionRule() ||
-  			   context == grammarAccess.getMultiplicativeExpressionAccess().getOperationCallParamsAction_1_0() ||
-  			   context == grammarAccess.getOrExpressionRule() ||
-  			   context == grammarAccess.getOrExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-  			   context == grammarAccess.getParanthesizedExpressionRule() ||
-  			   context == grammarAccess.getPrimaryExpressionRule() ||
-  			   context == grammarAccess.getRelationalExpressionRule() ||
-  			   context == grammarAccess.getRelationalExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-  			   context == grammarAccess.getSyntaxElementRule() ||
-  			   context == grammarAccess.getUnaryOrInfixExpressionRule()) {
-  				sequence_AdditiveExpression_InfixExpression_MultiplicativeExpression_OperationCall_UnaryExpression_UnaryOrInfixExpression(context, (OperationCall) semanticObject); 
-  				return; 
-  			}
-  			else if(context == grammarAccess.getFeatureCallRule() ||
-  			   context == grammarAccess.getOperationCallRule()) {
-  				sequence_OperationCall(context, (OperationCall) semanticObject); 
-  				return; 
-  			}
-  			else if(context == grammarAccess.getUnaryExpressionRule()) {
-  				sequence_UnaryExpression(context, (OperationCall) semanticObject); 
-  				return; 
-  			}
-  			else break;
-  		case ExpressionPackage.REAL_LITERAL:
-  			sequence_RealLiteral(context, (RealLiteral) semanticObject); 
-  			return; 
-  		case ExpressionPackage.STRING_LITERAL:
-  			sequence_StringLiteral(context, (StringLiteral) semanticObject); 
-  			return; 
-  		case ExpressionPackage.SWITCH_EXPRESSION:
-  			sequence_SwitchExpression(context, (SwitchExpression) semanticObject); 
-  			return; 
-  		case ExpressionPackage.TYPE_SELECT_EXPRESSION:
-  			if(context == grammarAccess.getAdditiveExpressionRule() ||
-  			   context == grammarAccess.getAdditiveExpressionAccess().getOperationCallParamsAction_1_0() ||
-  			   context == grammarAccess.getAndExpressionRule() ||
-  			   context == grammarAccess.getAndExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-  			   context == grammarAccess.getChainExpressionRule() ||
-  			   context == grammarAccess.getChainExpressionAccess().getChainExpressionFirstAction_1_0() ||
-  			   context == grammarAccess.getChainedExpressionRule() ||
-  			   context == grammarAccess.getExpressionRule() ||
-  			   context == grammarAccess.getIfExpressionTriRule() ||
-  			   context == grammarAccess.getIfExpressionTriAccess().getIfExpressionConditionAction_1_0() ||
-  			   context == grammarAccess.getImpliesExpressionRule() ||
-  			   context == grammarAccess.getImpliesExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-  			   context == grammarAccess.getInfixExpressionRule() ||
-  			   context == grammarAccess.getInfixExpressionAccess().getCollectionExpressionTargetAction_1_3_0() ||
-  			   context == grammarAccess.getInfixExpressionAccess().getFeatureCallTargetAction_1_1_0() ||
-  			   context == grammarAccess.getInfixExpressionAccess().getOperationCallTargetAction_1_0_0() ||
-  			   context == grammarAccess.getInfixExpressionAccess().getTypeSelectExpressionTargetAction_1_2_0() ||
-  			   context == grammarAccess.getMultiplicativeExpressionRule() ||
-  			   context == grammarAccess.getMultiplicativeExpressionAccess().getOperationCallParamsAction_1_0() ||
-  			   context == grammarAccess.getOrExpressionRule() ||
-  			   context == grammarAccess.getOrExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-  			   context == grammarAccess.getParanthesizedExpressionRule() ||
-  			   context == grammarAccess.getPrimaryExpressionRule() ||
-  			   context == grammarAccess.getRelationalExpressionRule() ||
-  			   context == grammarAccess.getRelationalExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-  			   context == grammarAccess.getSyntaxElementRule() ||
-  			   context == grammarAccess.getUnaryOrInfixExpressionRule()) {
-  				sequence_InfixExpression_TypeSelectExpression(context, (TypeSelectExpression) semanticObject); 
-  				return; 
-  			}
-  			else if(context == grammarAccess.getFeatureCallRule() ||
-  			   context == grammarAccess.getTypeSelectExpressionRule()) {
-  				sequence_TypeSelectExpression(context, (TypeSelectExpression) semanticObject); 
-  				return; 
-  			}
-  			else break;
-  		}
-  	if (errorAcceptor != null) errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
-  }
-
-  /**
-   * Constraint:
-   *     attribute=[EAttribute|ID]
-   */
-  protected void sequence_Attribute(EObject context, Attribute semanticObject) {
-  	if(errorAcceptor != null) {
-  		if(transientValues.isValueTransient(semanticObject, ExportPackage.Literals.ATTRIBUTE__ATTRIBUTE) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ExportPackage.Literals.ATTRIBUTE__ATTRIBUTE));
-  	}
-  	INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-  	SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-  	feeder.accept(grammarAccess.getAttributeAccess().getAttributeEAttributeIDTerminalRuleCall_0_1(), semanticObject.getAttribute());
-  	feeder.finish();
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (
-   *         (extension?='extension'? name=ID targetGrammar=[Grammar|QualifiedID])? 
-   *         imports+=Import+ 
-   *         extensions+=Extension* 
-   *         interfaces+=Interface* 
-   *         exports+=Export+
-   *     )
-   */
-  protected void sequence_ExportModel(EObject context, ExportModel semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (
-   *         (lookup?='lookup' lookupPredicate=Expression?)? 
-   *         type=[EClass|QualifiedID] 
-   *         (qualifiedName?='qualified'? naming=Expression)? 
-   *         guard=Expression? 
-   *         (fragmentUnique?='unique'? fragmentAttribute=[EAttribute|ID])? 
-   *         (fingerprint?='object-fingerprint' | resourceFingerprint?='resource-fingerprint')? 
-   *         ((attributes+=Attribute attributes+=Attribute*) | (userData+=UserData userData+=UserData*))*
-   *     )
-   */
-  protected void sequence_Export(EObject context, Export semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     extension=QualifiedID
-   */
-  protected void sequence_Extension(EObject context, Extension semanticObject) {
-  	if(errorAcceptor != null) {
-  		if(transientValues.isValueTransient(semanticObject, ExportPackage.Literals.EXTENSION__EXTENSION) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ExportPackage.Literals.EXTENSION__EXTENSION));
-  	}
-  	INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-  	SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-  	feeder.accept(grammarAccess.getExtensionAccess().getExtensionQualifiedIDParserRuleCall_1_0(), semanticObject.getExtension());
-  	feeder.finish();
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (package=[EPackage|STRING] name=ID?)
-   */
-  protected void sequence_Import(EObject context, Import semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (ref?='@'? unordered?='+'? expr=Expression)
-   */
-  protected void sequence_InterfaceExpression(EObject context, InterfaceExpression semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (unordered?='+'? field=[EStructuralFeature|ID])
-   */
-  protected void sequence_InterfaceField(EObject context, InterfaceField semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (unordered?='+'? ref=[EReference|ID])
-   */
-  protected void sequence_InterfaceNavigation(EObject context, InterfaceNavigation semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (type=[EClass|QualifiedID] guard=Expression? (items+=InterfaceItem items+=InterfaceItem*)*)
-   */
-  protected void sequence_Interface(EObject context, Interface semanticObject) {
-  	genericSequencer.createSequence(context, semanticObject);
-  }
-  
-  
-  /**
-   * Constraint:
-   *     (name=ID expr=Expression)
-   */
-  protected void sequence_UserData(EObject context, UserData semanticObject) {
-  	if(errorAcceptor != null) {
-  		if(transientValues.isValueTransient(semanticObject, ExportPackage.Literals.USER_DATA__NAME) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ExportPackage.Literals.USER_DATA__NAME));
-  		if(transientValues.isValueTransient(semanticObject, ExportPackage.Literals.USER_DATA__EXPR) == ValueTransient.YES)
-  			errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ExportPackage.Literals.USER_DATA__EXPR));
-  	}
-  	INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-  	SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-  	feeder.accept(grammarAccess.getUserDataAccess().getNameIDTerminalRuleCall_0_0(), semanticObject.getName());
-  	feeder.accept(grammarAccess.getUserDataAccess().getExprExpressionParserRuleCall_2_0(), semanticObject.getExpr());
-  	feeder.finish();
-  }
+	@Inject
+	private ExportGrammarAccess grammarAccess;
+	
+	@Override
+	public void sequence(ISerializationContext context, EObject semanticObject) {
+		EPackage epackage = semanticObject.eClass().getEPackage();
+		ParserRule rule = context.getParserRule();
+		Action action = context.getAssignedAction();
+		Set<Parameter> parameters = context.getEnabledBooleanParameters();
+		if (epackage == ExportPackage.eINSTANCE)
+			switch (semanticObject.eClass().getClassifierID()) {
+			case ExportPackage.ATTRIBUTE:
+				sequence_Attribute(context, (Attribute) semanticObject); 
+				return; 
+			case ExportPackage.EXPORT:
+				sequence_Export(context, (Export) semanticObject); 
+				return; 
+			case ExportPackage.EXPORT_MODEL:
+				sequence_ExportModel(context, (ExportModel) semanticObject); 
+				return; 
+			case ExportPackage.EXTENSION:
+				sequence_Extension(context, (Extension) semanticObject); 
+				return; 
+			case ExportPackage.IMPORT:
+				sequence_Import(context, (Import) semanticObject); 
+				return; 
+			case ExportPackage.INTERFACE:
+				sequence_Interface(context, (Interface) semanticObject); 
+				return; 
+			case ExportPackage.INTERFACE_EXPRESSION:
+				sequence_InterfaceExpression(context, (InterfaceExpression) semanticObject); 
+				return; 
+			case ExportPackage.INTERFACE_FIELD:
+				sequence_InterfaceField(context, (InterfaceField) semanticObject); 
+				return; 
+			case ExportPackage.INTERFACE_NAVIGATION:
+				sequence_InterfaceNavigation(context, (InterfaceNavigation) semanticObject); 
+				return; 
+			case ExportPackage.USER_DATA:
+				sequence_UserData(context, (UserData) semanticObject); 
+				return; 
+			}
+		else if (epackage == ExpressionPackage.eINSTANCE)
+			switch (semanticObject.eClass().getClassifierID()) {
+			case ExpressionPackage.BOOLEAN_LITERAL:
+				sequence_BooleanLiteral(context, (BooleanLiteral) semanticObject); 
+				return; 
+			case ExpressionPackage.BOOLEAN_OPERATION:
+				sequence_AndExpression_ImpliesExpression_OrExpression_RelationalExpression(context, (BooleanOperation) semanticObject); 
+				return; 
+			case ExpressionPackage.CASE:
+				sequence_Case(context, (Case) semanticObject); 
+				return; 
+			case ExpressionPackage.CASTED_EXPRESSION:
+				sequence_CastedExpression(context, (CastedExpression) semanticObject); 
+				return; 
+			case ExpressionPackage.CHAIN_EXPRESSION:
+				sequence_ChainExpression(context, (ChainExpression) semanticObject); 
+				return; 
+			case ExpressionPackage.COLLECTION_EXPRESSION:
+				if (rule == grammarAccess.getFeatureCallRule()
+						|| rule == grammarAccess.getCollectionExpressionRule()) {
+					sequence_CollectionExpression(context, (CollectionExpression) semanticObject); 
+					return; 
+				}
+				else if (rule == grammarAccess.getExpressionRule()
+						|| rule == grammarAccess.getSyntaxElementRule()
+						|| rule == grammarAccess.getChainExpressionRule()
+						|| action == grammarAccess.getChainExpressionAccess().getChainExpressionFirstAction_1_0()
+						|| rule == grammarAccess.getChainedExpressionRule()
+						|| rule == grammarAccess.getIfExpressionTriRule()
+						|| action == grammarAccess.getIfExpressionTriAccess().getIfExpressionConditionAction_1_0()
+						|| rule == grammarAccess.getOrExpressionRule()
+						|| action == grammarAccess.getOrExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getAndExpressionRule()
+						|| action == grammarAccess.getAndExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getImpliesExpressionRule()
+						|| action == grammarAccess.getImpliesExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getRelationalExpressionRule()
+						|| action == grammarAccess.getRelationalExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getAdditiveExpressionRule()
+						|| action == grammarAccess.getAdditiveExpressionAccess().getOperationCallParamsAction_1_0()
+						|| rule == grammarAccess.getMultiplicativeExpressionRule()
+						|| action == grammarAccess.getMultiplicativeExpressionAccess().getOperationCallParamsAction_1_0()
+						|| rule == grammarAccess.getUnaryOrInfixExpressionRule()
+						|| rule == grammarAccess.getInfixExpressionRule()
+						|| action == grammarAccess.getInfixExpressionAccess().getOperationCallTargetAction_1_0_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getFeatureCallTargetAction_1_1_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getTypeSelectExpressionTargetAction_1_2_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getCollectionExpressionTargetAction_1_3_0()
+						|| rule == grammarAccess.getPrimaryExpressionRule()
+						|| rule == grammarAccess.getParanthesizedExpressionRule()) {
+					sequence_CollectionExpression_InfixExpression(context, (CollectionExpression) semanticObject); 
+					return; 
+				}
+				else break;
+			case ExpressionPackage.CONSTRUCTOR_CALL_EXPRESSION:
+				sequence_ConstructorCallExpression(context, (ConstructorCallExpression) semanticObject); 
+				return; 
+			case ExpressionPackage.FEATURE_CALL:
+				if (rule == grammarAccess.getFeatureCallRule()) {
+					sequence_FeatureCall(context, (FeatureCall) semanticObject); 
+					return; 
+				}
+				else if (rule == grammarAccess.getExpressionRule()
+						|| rule == grammarAccess.getSyntaxElementRule()
+						|| rule == grammarAccess.getChainExpressionRule()
+						|| action == grammarAccess.getChainExpressionAccess().getChainExpressionFirstAction_1_0()
+						|| rule == grammarAccess.getChainedExpressionRule()
+						|| rule == grammarAccess.getIfExpressionTriRule()
+						|| action == grammarAccess.getIfExpressionTriAccess().getIfExpressionConditionAction_1_0()
+						|| rule == grammarAccess.getOrExpressionRule()
+						|| action == grammarAccess.getOrExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getAndExpressionRule()
+						|| action == grammarAccess.getAndExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getImpliesExpressionRule()
+						|| action == grammarAccess.getImpliesExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getRelationalExpressionRule()
+						|| action == grammarAccess.getRelationalExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getAdditiveExpressionRule()
+						|| action == grammarAccess.getAdditiveExpressionAccess().getOperationCallParamsAction_1_0()
+						|| rule == grammarAccess.getMultiplicativeExpressionRule()
+						|| action == grammarAccess.getMultiplicativeExpressionAccess().getOperationCallParamsAction_1_0()
+						|| rule == grammarAccess.getUnaryOrInfixExpressionRule()
+						|| rule == grammarAccess.getInfixExpressionRule()
+						|| action == grammarAccess.getInfixExpressionAccess().getOperationCallTargetAction_1_0_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getFeatureCallTargetAction_1_1_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getTypeSelectExpressionTargetAction_1_2_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getCollectionExpressionTargetAction_1_3_0()
+						|| rule == grammarAccess.getPrimaryExpressionRule()
+						|| rule == grammarAccess.getParanthesizedExpressionRule()) {
+					sequence_FeatureCall_InfixExpression(context, (FeatureCall) semanticObject); 
+					return; 
+				}
+				else break;
+			case ExpressionPackage.GLOBAL_VAR_EXPRESSION:
+				sequence_GlobalVarExpression(context, (GlobalVarExpression) semanticObject); 
+				return; 
+			case ExpressionPackage.IDENTIFIER:
+				if (rule == grammarAccess.getCollectionTypeRule()) {
+					sequence_CollectionType(context, (Identifier) semanticObject); 
+					return; 
+				}
+				else if (rule == grammarAccess.getSyntaxElementRule()
+						|| rule == grammarAccess.getTypeRule()) {
+					sequence_CollectionType_SimpleType(context, (Identifier) semanticObject); 
+					return; 
+				}
+				else if (rule == grammarAccess.getSimpleTypeRule()) {
+					sequence_SimpleType(context, (Identifier) semanticObject); 
+					return; 
+				}
+				else break;
+			case ExpressionPackage.IF_EXPRESSION:
+				if (rule == grammarAccess.getIfExpressionKwRule()) {
+					sequence_IfExpressionKw(context, (IfExpression) semanticObject); 
+					return; 
+				}
+				else if (rule == grammarAccess.getExpressionRule()
+						|| rule == grammarAccess.getSyntaxElementRule()
+						|| rule == grammarAccess.getChainExpressionRule()
+						|| action == grammarAccess.getChainExpressionAccess().getChainExpressionFirstAction_1_0()
+						|| rule == grammarAccess.getChainedExpressionRule()
+						|| rule == grammarAccess.getIfExpressionTriRule()
+						|| action == grammarAccess.getIfExpressionTriAccess().getIfExpressionConditionAction_1_0()
+						|| rule == grammarAccess.getOrExpressionRule()
+						|| action == grammarAccess.getOrExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getAndExpressionRule()
+						|| action == grammarAccess.getAndExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getImpliesExpressionRule()
+						|| action == grammarAccess.getImpliesExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getRelationalExpressionRule()
+						|| action == grammarAccess.getRelationalExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getAdditiveExpressionRule()
+						|| action == grammarAccess.getAdditiveExpressionAccess().getOperationCallParamsAction_1_0()
+						|| rule == grammarAccess.getMultiplicativeExpressionRule()
+						|| action == grammarAccess.getMultiplicativeExpressionAccess().getOperationCallParamsAction_1_0()
+						|| rule == grammarAccess.getUnaryOrInfixExpressionRule()
+						|| rule == grammarAccess.getInfixExpressionRule()
+						|| action == grammarAccess.getInfixExpressionAccess().getOperationCallTargetAction_1_0_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getFeatureCallTargetAction_1_1_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getTypeSelectExpressionTargetAction_1_2_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getCollectionExpressionTargetAction_1_3_0()
+						|| rule == grammarAccess.getPrimaryExpressionRule()
+						|| rule == grammarAccess.getParanthesizedExpressionRule()) {
+					sequence_IfExpressionKw_IfExpressionTri(context, (IfExpression) semanticObject); 
+					return; 
+				}
+				else break;
+			case ExpressionPackage.INTEGER_LITERAL:
+				sequence_IntegerLiteral(context, (IntegerLiteral) semanticObject); 
+				return; 
+			case ExpressionPackage.LET_EXPRESSION:
+				sequence_LetExpression(context, (LetExpression) semanticObject); 
+				return; 
+			case ExpressionPackage.LIST_LITERAL:
+				sequence_ListLiteral(context, (ListLiteral) semanticObject); 
+				return; 
+			case ExpressionPackage.NULL_LITERAL:
+				sequence_NullLiteral(context, (NullLiteral) semanticObject); 
+				return; 
+			case ExpressionPackage.OPERATION_CALL:
+				if (rule == grammarAccess.getExpressionRule()
+						|| rule == grammarAccess.getSyntaxElementRule()
+						|| rule == grammarAccess.getChainExpressionRule()
+						|| action == grammarAccess.getChainExpressionAccess().getChainExpressionFirstAction_1_0()
+						|| rule == grammarAccess.getChainedExpressionRule()
+						|| rule == grammarAccess.getIfExpressionTriRule()
+						|| action == grammarAccess.getIfExpressionTriAccess().getIfExpressionConditionAction_1_0()
+						|| rule == grammarAccess.getOrExpressionRule()
+						|| action == grammarAccess.getOrExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getAndExpressionRule()
+						|| action == grammarAccess.getAndExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getImpliesExpressionRule()
+						|| action == grammarAccess.getImpliesExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getRelationalExpressionRule()
+						|| action == grammarAccess.getRelationalExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getAdditiveExpressionRule()
+						|| action == grammarAccess.getAdditiveExpressionAccess().getOperationCallParamsAction_1_0()
+						|| rule == grammarAccess.getMultiplicativeExpressionRule()
+						|| action == grammarAccess.getMultiplicativeExpressionAccess().getOperationCallParamsAction_1_0()
+						|| rule == grammarAccess.getUnaryOrInfixExpressionRule()
+						|| rule == grammarAccess.getInfixExpressionRule()
+						|| action == grammarAccess.getInfixExpressionAccess().getOperationCallTargetAction_1_0_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getFeatureCallTargetAction_1_1_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getTypeSelectExpressionTargetAction_1_2_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getCollectionExpressionTargetAction_1_3_0()
+						|| rule == grammarAccess.getPrimaryExpressionRule()
+						|| rule == grammarAccess.getParanthesizedExpressionRule()) {
+					sequence_AdditiveExpression_InfixExpression_MultiplicativeExpression_OperationCall_UnaryExpression(context, (OperationCall) semanticObject); 
+					return; 
+				}
+				else if (rule == grammarAccess.getFeatureCallRule()
+						|| rule == grammarAccess.getOperationCallRule()) {
+					sequence_OperationCall(context, (OperationCall) semanticObject); 
+					return; 
+				}
+				else if (rule == grammarAccess.getUnaryExpressionRule()) {
+					sequence_UnaryExpression(context, (OperationCall) semanticObject); 
+					return; 
+				}
+				else break;
+			case ExpressionPackage.REAL_LITERAL:
+				sequence_RealLiteral(context, (RealLiteral) semanticObject); 
+				return; 
+			case ExpressionPackage.STRING_LITERAL:
+				sequence_StringLiteral(context, (StringLiteral) semanticObject); 
+				return; 
+			case ExpressionPackage.SWITCH_EXPRESSION:
+				sequence_SwitchExpression(context, (SwitchExpression) semanticObject); 
+				return; 
+			case ExpressionPackage.TYPE_SELECT_EXPRESSION:
+				if (rule == grammarAccess.getExpressionRule()
+						|| rule == grammarAccess.getSyntaxElementRule()
+						|| rule == grammarAccess.getChainExpressionRule()
+						|| action == grammarAccess.getChainExpressionAccess().getChainExpressionFirstAction_1_0()
+						|| rule == grammarAccess.getChainedExpressionRule()
+						|| rule == grammarAccess.getIfExpressionTriRule()
+						|| action == grammarAccess.getIfExpressionTriAccess().getIfExpressionConditionAction_1_0()
+						|| rule == grammarAccess.getOrExpressionRule()
+						|| action == grammarAccess.getOrExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getAndExpressionRule()
+						|| action == grammarAccess.getAndExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getImpliesExpressionRule()
+						|| action == grammarAccess.getImpliesExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getRelationalExpressionRule()
+						|| action == grammarAccess.getRelationalExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getAdditiveExpressionRule()
+						|| action == grammarAccess.getAdditiveExpressionAccess().getOperationCallParamsAction_1_0()
+						|| rule == grammarAccess.getMultiplicativeExpressionRule()
+						|| action == grammarAccess.getMultiplicativeExpressionAccess().getOperationCallParamsAction_1_0()
+						|| rule == grammarAccess.getUnaryOrInfixExpressionRule()
+						|| rule == grammarAccess.getInfixExpressionRule()
+						|| action == grammarAccess.getInfixExpressionAccess().getOperationCallTargetAction_1_0_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getFeatureCallTargetAction_1_1_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getTypeSelectExpressionTargetAction_1_2_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getCollectionExpressionTargetAction_1_3_0()
+						|| rule == grammarAccess.getPrimaryExpressionRule()
+						|| rule == grammarAccess.getParanthesizedExpressionRule()) {
+					sequence_InfixExpression_TypeSelectExpression(context, (TypeSelectExpression) semanticObject); 
+					return; 
+				}
+				else if (rule == grammarAccess.getFeatureCallRule()
+						|| rule == grammarAccess.getTypeSelectExpressionRule()) {
+					sequence_TypeSelectExpression(context, (TypeSelectExpression) semanticObject); 
+					return; 
+				}
+				else break;
+			}
+		if (errorAcceptor != null)
+			errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
+	}
+	
+	/**
+	 * Contexts:
+	 *     Attribute returns Attribute
+	 *
+	 * Constraint:
+	 *     attribute=[EAttribute|ID]
+	 */
+	protected void sequence_Attribute(ISerializationContext context, Attribute semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, ExportPackage.Literals.ATTRIBUTE__ATTRIBUTE) == ValueTransient.YES)
+				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ExportPackage.Literals.ATTRIBUTE__ATTRIBUTE));
+		}
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
+		feeder.accept(grammarAccess.getAttributeAccess().getAttributeEAttributeIDTerminalRuleCall_0_1(), semanticObject.eGet(ExportPackage.Literals.ATTRIBUTE__ATTRIBUTE, false));
+		feeder.finish();
+	}
+	
+	
+	/**
+	 * Contexts:
+	 *     ExportModel returns ExportModel
+	 *
+	 * Constraint:
+	 *     (
+	 *         (extension?='extension'? name=ID targetGrammar=[Grammar|QualifiedID])? 
+	 *         imports+=Import+ 
+	 *         extensions+=Extension* 
+	 *         interfaces+=Interface* 
+	 *         exports+=Export+
+	 *     )
+	 */
+	protected void sequence_ExportModel(ISerializationContext context, ExportModel semanticObject) {
+		genericSequencer.createSequence(context, semanticObject);
+	}
+	
+	
+	/**
+	 * Contexts:
+	 *     DeclarationForType returns Export
+	 *     Export returns Export
+	 *
+	 * Constraint:
+	 *     (
+	 *         (lookup?='lookup' lookupPredicate=Expression?)? 
+	 *         type=[EClass|QualifiedID] 
+	 *         (qualifiedName?='qualified'? naming=Expression)? 
+	 *         guard=Expression? 
+	 *         (fragmentUnique?='unique'? fragmentAttribute=[EAttribute|ID])? 
+	 *         (fingerprint?='object-fingerprint' | resourceFingerprint?='resource-fingerprint')? 
+	 *         ((attributes+=Attribute attributes+=Attribute*) | (userData+=UserData userData+=UserData*))*
+	 *     )
+	 */
+	protected void sequence_Export(ISerializationContext context, Export semanticObject) {
+		genericSequencer.createSequence(context, semanticObject);
+	}
+	
+	
+	/**
+	 * Contexts:
+	 *     Extension returns Extension
+	 *
+	 * Constraint:
+	 *     extension=QualifiedID
+	 */
+	protected void sequence_Extension(ISerializationContext context, Extension semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, ExportPackage.Literals.EXTENSION__EXTENSION) == ValueTransient.YES)
+				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ExportPackage.Literals.EXTENSION__EXTENSION));
+		}
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
+		feeder.accept(grammarAccess.getExtensionAccess().getExtensionQualifiedIDParserRuleCall_1_0(), semanticObject.getExtension());
+		feeder.finish();
+	}
+	
+	
+	/**
+	 * Contexts:
+	 *     Import returns Import
+	 *
+	 * Constraint:
+	 *     (package=[EPackage|STRING] name=ID?)
+	 */
+	protected void sequence_Import(ISerializationContext context, Import semanticObject) {
+		genericSequencer.createSequence(context, semanticObject);
+	}
+	
+	
+	/**
+	 * Contexts:
+	 *     InterfaceItem returns InterfaceExpression
+	 *     InterfaceExpression returns InterfaceExpression
+	 *
+	 * Constraint:
+	 *     (ref?='@'? unordered?='+'? expr=Expression)
+	 */
+	protected void sequence_InterfaceExpression(ISerializationContext context, InterfaceExpression semanticObject) {
+		genericSequencer.createSequence(context, semanticObject);
+	}
+	
+	
+	/**
+	 * Contexts:
+	 *     InterfaceItem returns InterfaceField
+	 *     InterfaceField returns InterfaceField
+	 *
+	 * Constraint:
+	 *     (unordered?='+'? field=[EStructuralFeature|ID])
+	 */
+	protected void sequence_InterfaceField(ISerializationContext context, InterfaceField semanticObject) {
+		genericSequencer.createSequence(context, semanticObject);
+	}
+	
+	
+	/**
+	 * Contexts:
+	 *     InterfaceItem returns InterfaceNavigation
+	 *     InterfaceNavigation returns InterfaceNavigation
+	 *
+	 * Constraint:
+	 *     (unordered?='+'? ref=[EReference|ID])
+	 */
+	protected void sequence_InterfaceNavigation(ISerializationContext context, InterfaceNavigation semanticObject) {
+		genericSequencer.createSequence(context, semanticObject);
+	}
+	
+	
+	/**
+	 * Contexts:
+	 *     DeclarationForType returns Interface
+	 *     Interface returns Interface
+	 *
+	 * Constraint:
+	 *     (type=[EClass|QualifiedID] guard=Expression? (items+=InterfaceItem items+=InterfaceItem*)*)
+	 */
+	protected void sequence_Interface(ISerializationContext context, Interface semanticObject) {
+		genericSequencer.createSequence(context, semanticObject);
+	}
+	
+	
+	/**
+	 * Contexts:
+	 *     UserData returns UserData
+	 *
+	 * Constraint:
+	 *     (name=ID expr=Expression)
+	 */
+	protected void sequence_UserData(ISerializationContext context, UserData semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, ExportPackage.Literals.USER_DATA__NAME) == ValueTransient.YES)
+				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ExportPackage.Literals.USER_DATA__NAME));
+			if (transientValues.isValueTransient(semanticObject, ExportPackage.Literals.USER_DATA__EXPR) == ValueTransient.YES)
+				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ExportPackage.Literals.USER_DATA__EXPR));
+		}
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
+		feeder.accept(grammarAccess.getUserDataAccess().getNameIDTerminalRuleCall_0_0(), semanticObject.getName());
+		feeder.accept(grammarAccess.getUserDataAccess().getExprExpressionParserRuleCall_2_0(), semanticObject.getExpr());
+		feeder.finish();
+	}
+	
+	
 }
diff --git a/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/serializer/AbstractExportSyntacticSequencer.java b/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/serializer/AbstractExportSyntacticSequencer.java
index 1dfd63dcf..0f7b291cd 100644
--- a/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/serializer/AbstractExportSyntacticSequencer.java
+++ b/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/serializer/AbstractExportSyntacticSequencer.java
@@ -42,9 +42,9 @@ protected void emitUnassignedTokens(EObject semanticObject, ISynTransition trans
 		List<INode> transitionNodes = collectNodes(fromNode, toNode);
 		for (AbstractElementAlias syntax : transition.getAmbiguousSyntaxes()) {
 			List<INode> syntaxNodes = getNodesFor(transitionNodes, syntax);
-			if(match_ParanthesizedExpression_LeftParenthesisKeyword_0_a.equals(syntax))
+			if (match_ParanthesizedExpression_LeftParenthesisKeyword_0_a.equals(syntax))
 				emit_ParanthesizedExpression_LeftParenthesisKeyword_0_a(semanticObject, getLastNavigableState(), syntaxNodes);
-			else if(match_ParanthesizedExpression_LeftParenthesisKeyword_0_p.equals(syntax))
+			else if (match_ParanthesizedExpression_LeftParenthesisKeyword_0_p.equals(syntax))
 				emit_ParanthesizedExpression_LeftParenthesisKeyword_0_p(semanticObject, getLastNavigableState(), syntaxNodes);
 			else acceptNodes(getLastNavigableState(), syntaxNodes);
 		}
diff --git a/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/services/ExportGrammarAccess.java b/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/services/ExportGrammarAccess.java
index 29944187c..109b57fde 100644
--- a/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/services/ExportGrammarAccess.java
+++ b/com.avaloq.tools.ddk.xtext.export/src-gen/com/avaloq/tools/ddk/xtext/export/services/ExportGrammarAccess.java
@@ -13,13 +13,14 @@
 import org.eclipse.xtext.service.AbstractElementFinder.*;
 
 import com.avaloq.tools.ddk.xtext.expression.services.ExpressionGrammarAccess;
+import org.eclipse.xtext.common.services.TerminalsGrammarAccess;
 
 @Singleton
 public class ExportGrammarAccess extends AbstractGrammarElementFinder {
 	
 	
 	public class ExportModelElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ExportModel");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.export.Export.ExportModel");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Group cGroup_0 = (Group)cGroup.eContents().get(0);
 		private final Keyword cExportKeyword_0_0 = (Keyword)cGroup_0.eContents().get(0);
@@ -45,24 +46,24 @@ public class ExportModelElements extends AbstractParserRuleElementFinder {
 		private final RuleCall cExportsExportParserRuleCall_4_0 = (RuleCall)cExportsAssignment_4.eContents().get(0);
 		
 		//ExportModel:
-		//	("export" extension?="extension"? name=ID "for" targetGrammar=[xtext::Grammar|QualifiedID])? imports+=Import+
-		//	extensions+=Extension* ("interface" "{" interfaces+=Interface+ "}")? exports+=Export+;
+		//	('export' extension?='extension'? name=ID 'for' targetGrammar=[xtext::Grammar|QualifiedID])? imports+=Import+
+		//	extensions+=Extension* ('interface' '{' interfaces+=Interface+ '}')? exports+=Export+;
 		@Override public ParserRule getRule() { return rule; }
 
-		//("export" extension?="extension"? name=ID "for" targetGrammar=[xtext::Grammar|QualifiedID])? imports+=Import+
-		//extensions+=Extension* ("interface" "{" interfaces+=Interface+ "}")? exports+=Export+
+		//('export' extension?='extension'? name=ID 'for' targetGrammar=[xtext::Grammar|QualifiedID])? imports+=Import+
+		//extensions+=Extension* ('interface' '{' interfaces+=Interface+ '}')? exports+=Export+
 		public Group getGroup() { return cGroup; }
 
-		//("export" extension?="extension"? name=ID "for" targetGrammar=[xtext::Grammar|QualifiedID])?
+		//('export' extension?='extension'? name=ID 'for' targetGrammar=[xtext::Grammar|QualifiedID])?
 		public Group getGroup_0() { return cGroup_0; }
 
-		//"export"
+		//'export'
 		public Keyword getExportKeyword_0_0() { return cExportKeyword_0_0; }
 
-		//extension?="extension"?
+		//extension?='extension'?
 		public Assignment getExtensionAssignment_0_1() { return cExtensionAssignment_0_1; }
 
-		//"extension"
+		//'extension'
 		public Keyword getExtensionExtensionKeyword_0_1_0() { return cExtensionExtensionKeyword_0_1_0; }
 
 		//name=ID
@@ -71,7 +72,7 @@ public class ExportModelElements extends AbstractParserRuleElementFinder {
 		//ID
 		public RuleCall getNameIDTerminalRuleCall_0_2_0() { return cNameIDTerminalRuleCall_0_2_0; }
 
-		//"for"
+		//'for'
 		public Keyword getForKeyword_0_3() { return cForKeyword_0_3; }
 
 		//targetGrammar=[xtext::Grammar|QualifiedID]
@@ -95,13 +96,13 @@ public class ExportModelElements extends AbstractParserRuleElementFinder {
 		//Extension
 		public RuleCall getExtensionsExtensionParserRuleCall_2_0() { return cExtensionsExtensionParserRuleCall_2_0; }
 
-		//("interface" "{" interfaces+=Interface+ "}")?
+		//('interface' '{' interfaces+=Interface+ '}')?
 		public Group getGroup_3() { return cGroup_3; }
 
-		//"interface"
+		//'interface'
 		public Keyword getInterfaceKeyword_3_0() { return cInterfaceKeyword_3_0; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_3_1() { return cLeftCurlyBracketKeyword_3_1; }
 
 		//interfaces+=Interface+
@@ -110,7 +111,7 @@ public class ExportModelElements extends AbstractParserRuleElementFinder {
 		//Interface
 		public RuleCall getInterfacesInterfaceParserRuleCall_3_2_0() { return cInterfacesInterfaceParserRuleCall_3_2_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_3_3() { return cRightCurlyBracketKeyword_3_3; }
 
 		//exports+=Export+
@@ -121,7 +122,7 @@ public class ExportModelElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class ImportElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Import");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.export.Export.Import");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cImportKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cPackageAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -133,14 +134,14 @@ public class ImportElements extends AbstractParserRuleElementFinder {
 		private final RuleCall cNameIDTerminalRuleCall_2_1_0 = (RuleCall)cNameAssignment_2_1.eContents().get(0);
 		
 		//Import:
-		//	"import" package=[ecore::EPackage|STRING] ("as" name=ID)? // Use nsURIs
+		//	'import' package=[ecore::EPackage|STRING] ('as' name=ID)? // Use nsURIs
 		//;
 		@Override public ParserRule getRule() { return rule; }
 
-		//"import" package=[ecore::EPackage|STRING] ("as" name=ID)? // Use nsURIs
+		//'import' package=[ecore::EPackage|STRING] ('as' name=ID)?
 		public Group getGroup() { return cGroup; }
 
-		//"import"
+		//'import'
 		public Keyword getImportKeyword_0() { return cImportKeyword_0; }
 
 		//package=[ecore::EPackage|STRING]
@@ -152,10 +153,10 @@ public class ImportElements extends AbstractParserRuleElementFinder {
 		//STRING
 		public RuleCall getPackageEPackageSTRINGTerminalRuleCall_1_0_1() { return cPackageEPackageSTRINGTerminalRuleCall_1_0_1; }
 
-		//("as" name=ID)?
+		//('as' name=ID)?
 		public Group getGroup_2() { return cGroup_2; }
 
-		//"as"
+		//'as'
 		public Keyword getAsKeyword_2_0() { return cAsKeyword_2_0; }
 
 		//name=ID
@@ -166,35 +167,32 @@ public class ImportElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class ExtensionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Extension");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.export.Export.Extension");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cExtensionKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cExtensionAssignment_1 = (Assignment)cGroup.eContents().get(1);
 		private final RuleCall cExtensionQualifiedIDParserRuleCall_1_0 = (RuleCall)cExtensionAssignment_1.eContents().get(0);
 		
 		//Extension:
-		//	"extension" extension= // Alas, we can't link xtend files. Maybe simply as EResources?
-		// QualifiedID;
+		//	'extension' extension=QualifiedID // Alas, we can't link xtend files. Maybe simply as EResources?
+		//;
 		@Override public ParserRule getRule() { return rule; }
 
-		//"extension" extension= // Alas, we can't link xtend files. Maybe simply as EResources?
-		// QualifiedID
+		//'extension' extension=QualifiedID
 		public Group getGroup() { return cGroup; }
 
-		//"extension"
+		//'extension'
 		public Keyword getExtensionKeyword_0() { return cExtensionKeyword_0; }
 
-		//extension= // Alas, we can't link xtend files. Maybe simply as EResources?
-		// QualifiedID
+		//extension=QualifiedID
 		public Assignment getExtensionAssignment_1() { return cExtensionAssignment_1; }
 
-		//// Alas, we can't link xtend files. Maybe simply as EResources?
-		// QualifiedID
+		//QualifiedID
 		public RuleCall getExtensionQualifiedIDParserRuleCall_1_0() { return cExtensionQualifiedIDParserRuleCall_1_0; }
 	}
 
 	public class DeclarationForTypeElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "DeclarationForType");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.export.Export.DeclarationForType");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cInterfaceParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cExportParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
@@ -214,7 +212,7 @@ public class DeclarationForTypeElements extends AbstractParserRuleElementFinder
 	}
 
 	public class InterfaceElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Interface");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.export.Export.Interface");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cTypeAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final CrossReference cTypeEClassCrossReference_0_0 = (CrossReference)cTypeAssignment_0.eContents().get(0);
@@ -235,11 +233,11 @@ public class InterfaceElements extends AbstractParserRuleElementFinder {
 		private final Keyword cSemicolonKeyword_3 = (Keyword)cGroup.eContents().get(3);
 		
 		//Interface:
-		//	type=[ecore::EClass|QualifiedID] ("[" guard=Expression "]")? ("=" items+=InterfaceItem ("," items+=InterfaceItem)*)*
-		//	";";
+		//	type=[ecore::EClass|QualifiedID] ('[' guard=Expression ']')? ('=' items+=InterfaceItem (',' items+=InterfaceItem)*)*
+		//	';';
 		@Override public ParserRule getRule() { return rule; }
 
-		//type=[ecore::EClass|QualifiedID] ("[" guard=Expression "]")? ("=" items+=InterfaceItem ("," items+=InterfaceItem)*)* ";"
+		//type=[ecore::EClass|QualifiedID] ('[' guard=Expression ']')? ('=' items+=InterfaceItem (',' items+=InterfaceItem)*)* ';'
 		public Group getGroup() { return cGroup; }
 
 		//type=[ecore::EClass|QualifiedID]
@@ -251,10 +249,10 @@ public class InterfaceElements extends AbstractParserRuleElementFinder {
 		//QualifiedID
 		public RuleCall getTypeEClassQualifiedIDParserRuleCall_0_0_1() { return cTypeEClassQualifiedIDParserRuleCall_0_0_1; }
 
-		//("[" guard=Expression "]")?
+		//('[' guard=Expression ']')?
 		public Group getGroup_1() { return cGroup_1; }
 
-		//"["
+		//'['
 		public Keyword getLeftSquareBracketKeyword_1_0() { return cLeftSquareBracketKeyword_1_0; }
 
 		//guard=Expression
@@ -263,13 +261,13 @@ public class InterfaceElements extends AbstractParserRuleElementFinder {
 		//Expression
 		public RuleCall getGuardExpressionParserRuleCall_1_1_0() { return cGuardExpressionParserRuleCall_1_1_0; }
 
-		//"]"
+		//']'
 		public Keyword getRightSquareBracketKeyword_1_2() { return cRightSquareBracketKeyword_1_2; }
 
-		//("=" items+=InterfaceItem ("," items+=InterfaceItem)*)*
+		//('=' items+=InterfaceItem (',' items+=InterfaceItem)*)*
 		public Group getGroup_2() { return cGroup_2; }
 
-		//"="
+		//'='
 		public Keyword getEqualsSignKeyword_2_0() { return cEqualsSignKeyword_2_0; }
 
 		//items+=InterfaceItem
@@ -278,10 +276,10 @@ public class InterfaceElements extends AbstractParserRuleElementFinder {
 		//InterfaceItem
 		public RuleCall getItemsInterfaceItemParserRuleCall_2_1_0() { return cItemsInterfaceItemParserRuleCall_2_1_0; }
 
-		//("," items+=InterfaceItem)*
+		//(',' items+=InterfaceItem)*
 		public Group getGroup_2_2() { return cGroup_2_2; }
 
-		//","
+		//','
 		public Keyword getCommaKeyword_2_2_0() { return cCommaKeyword_2_2_0; }
 
 		//items+=InterfaceItem
@@ -290,12 +288,12 @@ public class InterfaceElements extends AbstractParserRuleElementFinder {
 		//InterfaceItem
 		public RuleCall getItemsInterfaceItemParserRuleCall_2_2_1_0() { return cItemsInterfaceItemParserRuleCall_2_2_1_0; }
 
-		//";"
+		//';'
 		public Keyword getSemicolonKeyword_3() { return cSemicolonKeyword_3; }
 	}
 
 	public class InterfaceItemElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "InterfaceItem");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.export.Export.InterfaceItem");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cInterfaceFieldParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cInterfaceNavigationParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
@@ -319,7 +317,7 @@ public class InterfaceItemElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class InterfaceFieldElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "InterfaceField");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.export.Export.InterfaceField");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cUnorderedAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final Keyword cUnorderedPlusSignKeyword_0_0 = (Keyword)cUnorderedAssignment_0.eContents().get(0);
@@ -328,16 +326,16 @@ public class InterfaceFieldElements extends AbstractParserRuleElementFinder {
 		private final RuleCall cFieldEStructuralFeatureIDTerminalRuleCall_1_0_1 = (RuleCall)cFieldEStructuralFeatureCrossReference_1_0.eContents().get(1);
 		
 		//InterfaceField:
-		//	unordered?="+"? field=[ecore::EStructuralFeature];
+		//	unordered?='+'? field=[ecore::EStructuralFeature];
 		@Override public ParserRule getRule() { return rule; }
 
-		//unordered?="+"? field=[ecore::EStructuralFeature]
+		//unordered?='+'? field=[ecore::EStructuralFeature]
 		public Group getGroup() { return cGroup; }
 
-		//unordered?="+"?
+		//unordered?='+'?
 		public Assignment getUnorderedAssignment_0() { return cUnorderedAssignment_0; }
 
-		//"+"
+		//'+'
 		public Keyword getUnorderedPlusSignKeyword_0_0() { return cUnorderedPlusSignKeyword_0_0; }
 
 		//field=[ecore::EStructuralFeature]
@@ -351,7 +349,7 @@ public class InterfaceFieldElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class InterfaceNavigationElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "InterfaceNavigation");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.export.Export.InterfaceNavigation");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cCommercialAtKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cUnorderedAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -361,19 +359,19 @@ public class InterfaceNavigationElements extends AbstractParserRuleElementFinder
 		private final RuleCall cRefEReferenceIDTerminalRuleCall_2_0_1 = (RuleCall)cRefEReferenceCrossReference_2_0.eContents().get(1);
 		
 		//InterfaceNavigation:
-		//	"@" unordered?="+"? ref=[ecore::EReference];
+		//	'@' unordered?='+'? ref=[ecore::EReference];
 		@Override public ParserRule getRule() { return rule; }
 
-		//"@" unordered?="+"? ref=[ecore::EReference]
+		//'@' unordered?='+'? ref=[ecore::EReference]
 		public Group getGroup() { return cGroup; }
 
-		//"@"
+		//'@'
 		public Keyword getCommercialAtKeyword_0() { return cCommercialAtKeyword_0; }
 
-		//unordered?="+"?
+		//unordered?='+'?
 		public Assignment getUnorderedAssignment_1() { return cUnorderedAssignment_1; }
 
-		//"+"
+		//'+'
 		public Keyword getUnorderedPlusSignKeyword_1_0() { return cUnorderedPlusSignKeyword_1_0; }
 
 		//ref=[ecore::EReference]
@@ -387,7 +385,7 @@ public class InterfaceNavigationElements extends AbstractParserRuleElementFinder
 	}
 
 	public class InterfaceExpressionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "InterfaceExpression");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.export.Export.InterfaceExpression");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cEvalKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cRefAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -400,28 +398,28 @@ public class InterfaceExpressionElements extends AbstractParserRuleElementFinder
 		private final Keyword cRightParenthesisKeyword_5 = (Keyword)cGroup.eContents().get(5);
 		
 		//InterfaceExpression:
-		//	"eval" ref?="@"? unordered?="+"? "(" expr=Expression ")";
+		//	'eval' ref?='@'? unordered?='+'? '(' expr=Expression ')';
 		@Override public ParserRule getRule() { return rule; }
 
-		//"eval" ref?="@"? unordered?="+"? "(" expr=Expression ")"
+		//'eval' ref?='@'? unordered?='+'? '(' expr=Expression ')'
 		public Group getGroup() { return cGroup; }
 
-		//"eval"
+		//'eval'
 		public Keyword getEvalKeyword_0() { return cEvalKeyword_0; }
 
-		//ref?="@"?
+		//ref?='@'?
 		public Assignment getRefAssignment_1() { return cRefAssignment_1; }
 
-		//"@"
+		//'@'
 		public Keyword getRefCommercialAtKeyword_1_0() { return cRefCommercialAtKeyword_1_0; }
 
-		//unordered?="+"?
+		//unordered?='+'?
 		public Assignment getUnorderedAssignment_2() { return cUnorderedAssignment_2; }
 
-		//"+"
+		//'+'
 		public Keyword getUnorderedPlusSignKeyword_2_0() { return cUnorderedPlusSignKeyword_2_0; }
 
-		//"("
+		//'('
 		public Keyword getLeftParenthesisKeyword_3() { return cLeftParenthesisKeyword_3; }
 
 		//expr=Expression
@@ -430,12 +428,12 @@ public class InterfaceExpressionElements extends AbstractParserRuleElementFinder
 		//Expression
 		public RuleCall getExprExpressionParserRuleCall_4_0() { return cExprExpressionParserRuleCall_4_0; }
 
-		//")"
+		//')'
 		public Keyword getRightParenthesisKeyword_5() { return cRightParenthesisKeyword_5; }
 	}
 
 	public class ExportElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Export");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.export.Export.Export");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cExportKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Group cGroup_1 = (Group)cGroup.eContents().get(1);
@@ -502,39 +500,37 @@ public class ExportElements extends AbstractParserRuleElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_9 = (Keyword)cGroup.eContents().get(9);
 		
 		//Export:
-		//	"export" (lookup?="lookup" ("[" lookupPredicate=Expression "]")?)? type=[ecore::EClass|QualifiedID] ("as"
-		//	qualifiedName?="qualified"? naming=Expression)? // Only one name for now
-		// ("[" guard=Expression "]")? "{"
-		//	("uri-fragment" "=" fragmentUnique?="unique"? "attribute" "(" fragmentAttribute=[ecore::EAttribute] ")" ";")?
-		//	((fingerprint?="object-fingerprint" | resourceFingerprint?="resource-fingerprint") ";")? ("field"
-		//	attributes+=Attribute ("," attributes+=Attribute)* ";" | "data" userData+=UserData ("," userData+=UserData)* ";")*
-		//	"}";
+		//	'export' (lookup?='lookup' ('[' lookupPredicate=Expression ']')?)? type=[ecore::EClass|QualifiedID] ('as'
+		//	qualifiedName?='qualified'? naming=Expression)? ('[' guard=Expression ']')? '{' ('uri-fragment' '='
+		//	fragmentUnique?='unique'? 'attribute' '(' fragmentAttribute=[ecore::EAttribute] ')' ';')?
+		//	((fingerprint?='object-fingerprint' | resourceFingerprint?='resource-fingerprint') ';')? ('field'
+		//	attributes+=Attribute (',' attributes+=Attribute)* ';' | 'data' userData+=UserData (',' userData+=UserData)* ';')*
+		//	'}';
 		@Override public ParserRule getRule() { return rule; }
 
-		//"export" (lookup?="lookup" ("[" lookupPredicate=Expression "]")?)? type=[ecore::EClass|QualifiedID] ("as"
-		//qualifiedName?="qualified"? naming=Expression)? // Only one name for now
-		// ("[" guard=Expression "]")? "{"
-		//("uri-fragment" "=" fragmentUnique?="unique"? "attribute" "(" fragmentAttribute=[ecore::EAttribute] ")" ";")?
-		//((fingerprint?="object-fingerprint" | resourceFingerprint?="resource-fingerprint") ";")? ("field"
-		//attributes+=Attribute ("," attributes+=Attribute)* ";" | "data" userData+=UserData ("," userData+=UserData)* ";")* "}"
+		//'export' (lookup?='lookup' ('[' lookupPredicate=Expression ']')?)? type=[ecore::EClass|QualifiedID] ('as'
+		//qualifiedName?='qualified'? naming=Expression)? ('[' guard=Expression ']')? '{' ('uri-fragment' '='
+		//fragmentUnique?='unique'? 'attribute' '(' fragmentAttribute=[ecore::EAttribute] ')' ';')?
+		//((fingerprint?='object-fingerprint' | resourceFingerprint?='resource-fingerprint') ';')? ('field'
+		//attributes+=Attribute (',' attributes+=Attribute)* ';' | 'data' userData+=UserData (',' userData+=UserData)* ';')* '}'
 		public Group getGroup() { return cGroup; }
 
-		//"export"
+		//'export'
 		public Keyword getExportKeyword_0() { return cExportKeyword_0; }
 
-		//(lookup?="lookup" ("[" lookupPredicate=Expression "]")?)?
+		//(lookup?='lookup' ('[' lookupPredicate=Expression ']')?)?
 		public Group getGroup_1() { return cGroup_1; }
 
-		//lookup?="lookup"
+		//lookup?='lookup'
 		public Assignment getLookupAssignment_1_0() { return cLookupAssignment_1_0; }
 
-		//"lookup"
+		//'lookup'
 		public Keyword getLookupLookupKeyword_1_0_0() { return cLookupLookupKeyword_1_0_0; }
 
-		//("[" lookupPredicate=Expression "]")?
+		//('[' lookupPredicate=Expression ']')?
 		public Group getGroup_1_1() { return cGroup_1_1; }
 
-		//"["
+		//'['
 		public Keyword getLeftSquareBracketKeyword_1_1_0() { return cLeftSquareBracketKeyword_1_1_0; }
 
 		//lookupPredicate=Expression
@@ -543,7 +539,7 @@ public class ExportElements extends AbstractParserRuleElementFinder {
 		//Expression
 		public RuleCall getLookupPredicateExpressionParserRuleCall_1_1_1_0() { return cLookupPredicateExpressionParserRuleCall_1_1_1_0; }
 
-		//"]"
+		//']'
 		public Keyword getRightSquareBracketKeyword_1_1_2() { return cRightSquareBracketKeyword_1_1_2; }
 
 		//type=[ecore::EClass|QualifiedID]
@@ -555,16 +551,16 @@ public class ExportElements extends AbstractParserRuleElementFinder {
 		//QualifiedID
 		public RuleCall getTypeEClassQualifiedIDParserRuleCall_2_0_1() { return cTypeEClassQualifiedIDParserRuleCall_2_0_1; }
 
-		//("as" qualifiedName?="qualified"? naming=Expression)?
+		//('as' qualifiedName?='qualified'? naming=Expression)?
 		public Group getGroup_3() { return cGroup_3; }
 
-		//"as"
+		//'as'
 		public Keyword getAsKeyword_3_0() { return cAsKeyword_3_0; }
 
-		//qualifiedName?="qualified"?
+		//qualifiedName?='qualified'?
 		public Assignment getQualifiedNameAssignment_3_1() { return cQualifiedNameAssignment_3_1; }
 
-		//"qualified"
+		//'qualified'
 		public Keyword getQualifiedNameQualifiedKeyword_3_1_0() { return cQualifiedNameQualifiedKeyword_3_1_0; }
 
 		//naming=Expression
@@ -573,10 +569,10 @@ public class ExportElements extends AbstractParserRuleElementFinder {
 		//Expression
 		public RuleCall getNamingExpressionParserRuleCall_3_2_0() { return cNamingExpressionParserRuleCall_3_2_0; }
 
-		//("[" guard=Expression "]")?
+		//('[' guard=Expression ']')?
 		public Group getGroup_4() { return cGroup_4; }
 
-		//"["
+		//'['
 		public Keyword getLeftSquareBracketKeyword_4_0() { return cLeftSquareBracketKeyword_4_0; }
 
 		//guard=Expression
@@ -585,31 +581,31 @@ public class ExportElements extends AbstractParserRuleElementFinder {
 		//Expression
 		public RuleCall getGuardExpressionParserRuleCall_4_1_0() { return cGuardExpressionParserRuleCall_4_1_0; }
 
-		//"]"
+		//']'
 		public Keyword getRightSquareBracketKeyword_4_2() { return cRightSquareBracketKeyword_4_2; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_5() { return cLeftCurlyBracketKeyword_5; }
 
-		//("uri-fragment" "=" fragmentUnique?="unique"? "attribute" "(" fragmentAttribute=[ecore::EAttribute] ")" ";")?
+		//('uri-fragment' '=' fragmentUnique?='unique'? 'attribute' '(' fragmentAttribute=[ecore::EAttribute] ')' ';')?
 		public Group getGroup_6() { return cGroup_6; }
 
-		//"uri-fragment"
+		//'uri-fragment'
 		public Keyword getUriFragmentKeyword_6_0() { return cUriFragmentKeyword_6_0; }
 
-		//"="
+		//'='
 		public Keyword getEqualsSignKeyword_6_1() { return cEqualsSignKeyword_6_1; }
 
-		//fragmentUnique?="unique"?
+		//fragmentUnique?='unique'?
 		public Assignment getFragmentUniqueAssignment_6_2() { return cFragmentUniqueAssignment_6_2; }
 
-		//"unique"
+		//'unique'
 		public Keyword getFragmentUniqueUniqueKeyword_6_2_0() { return cFragmentUniqueUniqueKeyword_6_2_0; }
 
-		//"attribute"
+		//'attribute'
 		public Keyword getAttributeKeyword_6_3() { return cAttributeKeyword_6_3; }
 
-		//"("
+		//'('
 		public Keyword getLeftParenthesisKeyword_6_4() { return cLeftParenthesisKeyword_6_4; }
 
 		//fragmentAttribute=[ecore::EAttribute]
@@ -621,41 +617,41 @@ public class ExportElements extends AbstractParserRuleElementFinder {
 		//ID
 		public RuleCall getFragmentAttributeEAttributeIDTerminalRuleCall_6_5_0_1() { return cFragmentAttributeEAttributeIDTerminalRuleCall_6_5_0_1; }
 
-		//")"
+		//')'
 		public Keyword getRightParenthesisKeyword_6_6() { return cRightParenthesisKeyword_6_6; }
 
-		//";"
+		//';'
 		public Keyword getSemicolonKeyword_6_7() { return cSemicolonKeyword_6_7; }
 
-		//((fingerprint?="object-fingerprint" | resourceFingerprint?="resource-fingerprint") ";")?
+		//((fingerprint?='object-fingerprint' | resourceFingerprint?='resource-fingerprint') ';')?
 		public Group getGroup_7() { return cGroup_7; }
 
-		//fingerprint?="object-fingerprint" | resourceFingerprint?="resource-fingerprint"
+		//fingerprint?='object-fingerprint' | resourceFingerprint?='resource-fingerprint'
 		public Alternatives getAlternatives_7_0() { return cAlternatives_7_0; }
 
-		//fingerprint?="object-fingerprint"
+		//fingerprint?='object-fingerprint'
 		public Assignment getFingerprintAssignment_7_0_0() { return cFingerprintAssignment_7_0_0; }
 
-		//"object-fingerprint"
+		//'object-fingerprint'
 		public Keyword getFingerprintObjectFingerprintKeyword_7_0_0_0() { return cFingerprintObjectFingerprintKeyword_7_0_0_0; }
 
-		//resourceFingerprint?="resource-fingerprint"
+		//resourceFingerprint?='resource-fingerprint'
 		public Assignment getResourceFingerprintAssignment_7_0_1() { return cResourceFingerprintAssignment_7_0_1; }
 
-		//"resource-fingerprint"
+		//'resource-fingerprint'
 		public Keyword getResourceFingerprintResourceFingerprintKeyword_7_0_1_0() { return cResourceFingerprintResourceFingerprintKeyword_7_0_1_0; }
 
-		//";"
+		//';'
 		public Keyword getSemicolonKeyword_7_1() { return cSemicolonKeyword_7_1; }
 
-		//("field" attributes+=Attribute ("," attributes+=Attribute)* ";" | "data" userData+=UserData ("," userData+=UserData)*
-		//";")*
+		//('field' attributes+=Attribute (',' attributes+=Attribute)* ';' | 'data' userData+=UserData (',' userData+=UserData)*
+		//';')*
 		public Alternatives getAlternatives_8() { return cAlternatives_8; }
 
-		//"field" attributes+=Attribute ("," attributes+=Attribute)* ";"
+		//'field' attributes+=Attribute (',' attributes+=Attribute)* ';'
 		public Group getGroup_8_0() { return cGroup_8_0; }
 
-		//"field"
+		//'field'
 		public Keyword getFieldKeyword_8_0_0() { return cFieldKeyword_8_0_0; }
 
 		//attributes+=Attribute
@@ -664,10 +660,10 @@ public class ExportElements extends AbstractParserRuleElementFinder {
 		//Attribute
 		public RuleCall getAttributesAttributeParserRuleCall_8_0_1_0() { return cAttributesAttributeParserRuleCall_8_0_1_0; }
 
-		//("," attributes+=Attribute)*
+		//(',' attributes+=Attribute)*
 		public Group getGroup_8_0_2() { return cGroup_8_0_2; }
 
-		//","
+		//','
 		public Keyword getCommaKeyword_8_0_2_0() { return cCommaKeyword_8_0_2_0; }
 
 		//attributes+=Attribute
@@ -676,13 +672,13 @@ public class ExportElements extends AbstractParserRuleElementFinder {
 		//Attribute
 		public RuleCall getAttributesAttributeParserRuleCall_8_0_2_1_0() { return cAttributesAttributeParserRuleCall_8_0_2_1_0; }
 
-		//";"
+		//';'
 		public Keyword getSemicolonKeyword_8_0_3() { return cSemicolonKeyword_8_0_3; }
 
-		//"data" userData+=UserData ("," userData+=UserData)* ";"
+		//'data' userData+=UserData (',' userData+=UserData)* ';'
 		public Group getGroup_8_1() { return cGroup_8_1; }
 
-		//"data"
+		//'data'
 		public Keyword getDataKeyword_8_1_0() { return cDataKeyword_8_1_0; }
 
 		//userData+=UserData
@@ -691,10 +687,10 @@ public class ExportElements extends AbstractParserRuleElementFinder {
 		//UserData
 		public RuleCall getUserDataUserDataParserRuleCall_8_1_1_0() { return cUserDataUserDataParserRuleCall_8_1_1_0; }
 
-		//("," userData+=UserData)*
+		//(',' userData+=UserData)*
 		public Group getGroup_8_1_2() { return cGroup_8_1_2; }
 
-		//","
+		//','
 		public Keyword getCommaKeyword_8_1_2_0() { return cCommaKeyword_8_1_2_0; }
 
 		//userData+=UserData
@@ -703,15 +699,15 @@ public class ExportElements extends AbstractParserRuleElementFinder {
 		//UserData
 		public RuleCall getUserDataUserDataParserRuleCall_8_1_2_1_0() { return cUserDataUserDataParserRuleCall_8_1_2_1_0; }
 
-		//";"
+		//';'
 		public Keyword getSemicolonKeyword_8_1_3() { return cSemicolonKeyword_8_1_3; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_9() { return cRightCurlyBracketKeyword_9; }
 	}
 
 	public class UserDataElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "UserData");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.export.Export.UserData");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cNameAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final RuleCall cNameIDTerminalRuleCall_0_0 = (RuleCall)cNameAssignment_0.eContents().get(0);
@@ -720,10 +716,10 @@ public class UserDataElements extends AbstractParserRuleElementFinder {
 		private final RuleCall cExprExpressionParserRuleCall_2_0 = (RuleCall)cExprAssignment_2.eContents().get(0);
 		
 		//UserData:
-		//	name=ID "=" expr=Expression;
+		//	name=ID '=' expr=Expression;
 		@Override public ParserRule getRule() { return rule; }
 
-		//name=ID "=" expr=Expression
+		//name=ID '=' expr=Expression
 		public Group getGroup() { return cGroup; }
 
 		//name=ID
@@ -732,7 +728,7 @@ public class UserDataElements extends AbstractParserRuleElementFinder {
 		//ID
 		public RuleCall getNameIDTerminalRuleCall_0_0() { return cNameIDTerminalRuleCall_0_0; }
 
-		//"="
+		//'='
 		public Keyword getEqualsSignKeyword_1() { return cEqualsSignKeyword_1; }
 
 		//expr=Expression
@@ -743,7 +739,7 @@ public class UserDataElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class AttributeElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Attribute");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.export.Export.Attribute");
 		private final Assignment cAttributeAssignment = (Assignment)rule.eContents().get(1);
 		private final CrossReference cAttributeEAttributeCrossReference_0 = (CrossReference)cAttributeAssignment.eContents().get(0);
 		private final RuleCall cAttributeEAttributeIDTerminalRuleCall_0_1 = (RuleCall)cAttributeEAttributeCrossReference_0.eContents().get(1);
@@ -763,27 +759,27 @@ public class AttributeElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class QualifiedIDElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "QualifiedID");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.export.Export.QualifiedID");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final RuleCall cIDTerminalRuleCall_0 = (RuleCall)cGroup.eContents().get(0);
 		private final Group cGroup_1 = (Group)cGroup.eContents().get(1);
 		private final Keyword cColonColonKeyword_1_0 = (Keyword)cGroup_1.eContents().get(0);
 		private final RuleCall cIDTerminalRuleCall_1_1 = (RuleCall)cGroup_1.eContents().get(1);
 		
-		//QualifiedID returns ecore::EString:
-		//	ID ("::" ID)*;
+		//QualifiedID:
+		//	ID ('::' ID)*;
 		@Override public ParserRule getRule() { return rule; }
 
-		//ID ("::" ID)*
+		//ID ('::' ID)*
 		public Group getGroup() { return cGroup; }
 
 		//ID
 		public RuleCall getIDTerminalRuleCall_0() { return cIDTerminalRuleCall_0; }
 
-		//("::" ID)*
+		//('::' ID)*
 		public Group getGroup_1() { return cGroup_1; }
 
-		//"::"
+		//'::'
 		public Keyword getColonColonKeyword_1_0() { return cColonColonKeyword_1_0; }
 
 		//ID
@@ -809,11 +805,15 @@ public class QualifiedIDElements extends AbstractParserRuleElementFinder {
 
 	private final ExpressionGrammarAccess gaExpression;
 
+	private final TerminalsGrammarAccess gaTerminals;
+
 	@Inject
 	public ExportGrammarAccess(GrammarProvider grammarProvider,
-		ExpressionGrammarAccess gaExpression) {
+		ExpressionGrammarAccess gaExpression,
+		TerminalsGrammarAccess gaTerminals) {
 		this.grammar = internalFindGrammar(grammarProvider);
 		this.gaExpression = gaExpression;
+		this.gaTerminals = gaTerminals;
 		this.pExportModel = new ExportModelElements();
 		this.pImport = new ImportElements();
 		this.pExtension = new ExtensionElements();
@@ -855,10 +855,14 @@ public ExpressionGrammarAccess getExpressionGrammarAccess() {
 		return gaExpression;
 	}
 
+	public TerminalsGrammarAccess getTerminalsGrammarAccess() {
+		return gaTerminals;
+	}
+
 	
 	//ExportModel:
-	//	("export" extension?="extension"? name=ID "for" targetGrammar=[xtext::Grammar|QualifiedID])? imports+=Import+
-	//	extensions+=Extension* ("interface" "{" interfaces+=Interface+ "}")? exports+=Export+;
+	//	('export' extension?='extension'? name=ID 'for' targetGrammar=[xtext::Grammar|QualifiedID])? imports+=Import+
+	//	extensions+=Extension* ('interface' '{' interfaces+=Interface+ '}')? exports+=Export+;
 	public ExportModelElements getExportModelAccess() {
 		return pExportModel;
 	}
@@ -868,7 +872,7 @@ public ParserRule getExportModelRule() {
 	}
 
 	//Import:
-	//	"import" package=[ecore::EPackage|STRING] ("as" name=ID)? // Use nsURIs
+	//	'import' package=[ecore::EPackage|STRING] ('as' name=ID)? // Use nsURIs
 	//;
 	public ImportElements getImportAccess() {
 		return pImport;
@@ -879,8 +883,8 @@ public ParserRule getImportRule() {
 	}
 
 	//Extension:
-	//	"extension" extension= // Alas, we can't link xtend files. Maybe simply as EResources?
-	// QualifiedID;
+	//	'extension' extension=QualifiedID // Alas, we can't link xtend files. Maybe simply as EResources?
+	//;
 	public ExtensionElements getExtensionAccess() {
 		return pExtension;
 	}
@@ -900,8 +904,8 @@ public ParserRule getDeclarationForTypeRule() {
 	}
 
 	//Interface:
-	//	type=[ecore::EClass|QualifiedID] ("[" guard=Expression "]")? ("=" items+=InterfaceItem ("," items+=InterfaceItem)*)*
-	//	";";
+	//	type=[ecore::EClass|QualifiedID] ('[' guard=Expression ']')? ('=' items+=InterfaceItem (',' items+=InterfaceItem)*)*
+	//	';';
 	public InterfaceElements getInterfaceAccess() {
 		return pInterface;
 	}
@@ -921,7 +925,7 @@ public ParserRule getInterfaceItemRule() {
 	}
 
 	//InterfaceField:
-	//	unordered?="+"? field=[ecore::EStructuralFeature];
+	//	unordered?='+'? field=[ecore::EStructuralFeature];
 	public InterfaceFieldElements getInterfaceFieldAccess() {
 		return pInterfaceField;
 	}
@@ -931,7 +935,7 @@ public ParserRule getInterfaceFieldRule() {
 	}
 
 	//InterfaceNavigation:
-	//	"@" unordered?="+"? ref=[ecore::EReference];
+	//	'@' unordered?='+'? ref=[ecore::EReference];
 	public InterfaceNavigationElements getInterfaceNavigationAccess() {
 		return pInterfaceNavigation;
 	}
@@ -941,7 +945,7 @@ public ParserRule getInterfaceNavigationRule() {
 	}
 
 	//InterfaceExpression:
-	//	"eval" ref?="@"? unordered?="+"? "(" expr=Expression ")";
+	//	'eval' ref?='@'? unordered?='+'? '(' expr=Expression ')';
 	public InterfaceExpressionElements getInterfaceExpressionAccess() {
 		return pInterfaceExpression;
 	}
@@ -951,13 +955,12 @@ public ParserRule getInterfaceExpressionRule() {
 	}
 
 	//Export:
-	//	"export" (lookup?="lookup" ("[" lookupPredicate=Expression "]")?)? type=[ecore::EClass|QualifiedID] ("as"
-	//	qualifiedName?="qualified"? naming=Expression)? // Only one name for now
-	// ("[" guard=Expression "]")? "{"
-	//	("uri-fragment" "=" fragmentUnique?="unique"? "attribute" "(" fragmentAttribute=[ecore::EAttribute] ")" ";")?
-	//	((fingerprint?="object-fingerprint" | resourceFingerprint?="resource-fingerprint") ";")? ("field"
-	//	attributes+=Attribute ("," attributes+=Attribute)* ";" | "data" userData+=UserData ("," userData+=UserData)* ";")*
-	//	"}";
+	//	'export' (lookup?='lookup' ('[' lookupPredicate=Expression ']')?)? type=[ecore::EClass|QualifiedID] ('as'
+	//	qualifiedName?='qualified'? naming=Expression)? ('[' guard=Expression ']')? '{' ('uri-fragment' '='
+	//	fragmentUnique?='unique'? 'attribute' '(' fragmentAttribute=[ecore::EAttribute] ')' ';')?
+	//	((fingerprint?='object-fingerprint' | resourceFingerprint?='resource-fingerprint') ';')? ('field'
+	//	attributes+=Attribute (',' attributes+=Attribute)* ';' | 'data' userData+=UserData (',' userData+=UserData)* ';')*
+	//	'}';
 	public ExportElements getExportAccess() {
 		return pExport;
 	}
@@ -967,7 +970,7 @@ public ParserRule getExportRule() {
 	}
 
 	//UserData:
-	//	name=ID "=" expr=Expression;
+	//	name=ID '=' expr=Expression;
 	public UserDataElements getUserDataAccess() {
 		return pUserData;
 	}
@@ -986,8 +989,8 @@ public ParserRule getAttributeRule() {
 		return getAttributeAccess().getRule();
 	}
 
-	//QualifiedID returns ecore::EString:
-	//	ID ("::" ID)*;
+	//QualifiedID:
+	//	ID ('::' ID)*;
 	public QualifiedIDElements getQualifiedIDAccess() {
 		return pQualifiedID;
 	}
@@ -1029,7 +1032,7 @@ public ParserRule getSyntaxElementRule() {
 	////   {$e=factory.createLetExpression(v,varExpr,target);}
 	// //|  x=castedExpression {$e=x;};
 	// LetExpression:
-	//	"let" identifier=Identifier "=" varExpr=Expression ":" target=Expression;
+	//	'let' identifier=Identifier '=' varExpr=Expression ':' target=Expression;
 	public ExpressionGrammarAccess.LetExpressionElements getLetExpressionAccess() {
 		return gaExpression.getLetExpressionAccess();
 	}
@@ -1045,7 +1048,7 @@ public ParserRule getLetExpressionRule() {
 	// //	| x=chainExpression {$e=x;};
 	//
 	//CastedExpression:
-	//	"(" type=Type ")" target=Expression;
+	//	'(' type=Type ')' target=Expression;
 	public ExpressionGrammarAccess.CastedExpressionElements getCastedExpressionAccess() {
 		return gaExpression.getCastedExpressionAccess();
 	}
@@ -1058,8 +1061,8 @@ public ParserRule getCastedExpressionRule() {
 	//
 	////	x=ifExpression {$e=x;} ( '->' right=ifExpression {$e=factory.createChainExpression($e,right);})*;
 	// ChainExpression
-	//returns Expression:
-	//	ChainedExpression ({ChainExpression.first=current} "->" next=ChainedExpression)*;
+	//Expression:
+	//	ChainedExpression ({ChainExpression.first=current} '->' next=ChainedExpression)*;
 	public ExpressionGrammarAccess.ChainExpressionElements getChainExpressionAccess() {
 		return gaExpression.getChainExpressionAccess();
 	}
@@ -1068,7 +1071,7 @@ public ParserRule getChainExpressionRule() {
 		return getChainExpressionAccess().getRule();
 	}
 
-	//ChainedExpression returns Expression:
+	//ChainedExpression Expression:
 	//	IfExpressionKw | IfExpressionTri | SwitchExpression;
 	public ExpressionGrammarAccess.ChainedExpressionElements getChainedExpressionAccess() {
 		return gaExpression.getChainedExpressionAccess();
@@ -1084,8 +1087,8 @@ public ParserRule getChainedExpressionRule() {
 	//
 	////|	'if' condition=switchExpression 'then' thenPart=switchExpression ('else' elsePart=expression)? {$e=factory.createIf(condition,thenPart,elsePart);};
 	//
-	//IfExpressionTri returns Expression:
-	//	OrExpression ({IfExpression.condition=current} "?" thenPart=ChainedExpression ":" elsePart=ChainedExpression)?;
+	//IfExpressionTri Expression:
+	//	OrExpression ({IfExpression.condition=current} '?' thenPart=ChainedExpression ':' elsePart=ChainedExpression)?;
 	public ExpressionGrammarAccess.IfExpressionTriElements getIfExpressionTriAccess() {
 		return gaExpression.getIfExpressionTriAccess();
 	}
@@ -1094,8 +1097,8 @@ public ParserRule getIfExpressionTriRule() {
 		return getIfExpressionTriAccess().getRule();
 	}
 
-	//IfExpressionKw returns IfExpression:
-	//	"if" condition=ChainedExpression "then" thenPart=ChainedExpression -> ("else" elsePart=ChainedExpression)?;
+	//IfExpressionKw IfExpression:
+	//	'if' condition=ChainedExpression 'then' thenPart=ChainedExpression -> ('else' elsePart=ChainedExpression)?;
 	public ExpressionGrammarAccess.IfExpressionKwElements getIfExpressionKwAccess() {
 		return gaExpression.getIfExpressionKwAccess();
 	}
@@ -1119,7 +1122,7 @@ public ParserRule getIfExpressionKwRule() {
 	////   {$e = factory.createSwitchExpression(pred,cases,def);}
 	// //|  x=orExpression {$e=x;};
 	// SwitchExpression:
-	//	"switch" ("(" switchExpr=OrExpression ")")? "{" case+=Case* "default" ":" defaultExpr=OrExpression "}";
+	//	'switch' ('(' switchExpr=OrExpression ')')? '{' case+=Case* 'default' ':' defaultExpr=OrExpression '}';
 	public ExpressionGrammarAccess.SwitchExpressionElements getSwitchExpressionAccess() {
 		return gaExpression.getSwitchExpressionAccess();
 	}
@@ -1129,7 +1132,7 @@ public ParserRule getSwitchExpressionRule() {
 	}
 
 	//Case:
-	//	"case" condition=OrExpression ":" thenPar=OrExpression;
+	//	'case' condition=OrExpression ':' thenPar=OrExpression;
 	public ExpressionGrammarAccess.CaseElements getCaseAccess() {
 		return gaExpression.getCaseAccess();
 	}
@@ -1142,8 +1145,8 @@ public ParserRule getCaseRule() {
 	//
 	////  	x=andExpression {$e=x;} (name='||' r=andExpression 	{$e = factory.createBooleanOperation(id(name),$e,r);})*;
 	//
-	//OrExpression returns Expression:
-	//	AndExpression ({BooleanOperation.left=current} operator="||" right=AndExpression)*;
+	//OrExpression Expression:
+	//	AndExpression ({BooleanOperation.left=current} operator='||' right=AndExpression)*;
 	public ExpressionGrammarAccess.OrExpressionElements getOrExpressionAccess() {
 		return gaExpression.getOrExpressionAccess();
 	}
@@ -1156,8 +1159,8 @@ public ParserRule getOrExpressionRule() {
 	//
 	////	x=impliesExpression {$e=x;} (name='&&' r=impliesExpression 	{$e = factory.createBooleanOperation(id(name),$e,r);})*;
 	//
-	//AndExpression returns Expression:
-	//	ImpliesExpression ({BooleanOperation.left=current} operator="&&" right=ImpliesExpression)*;
+	//AndExpression Expression:
+	//	ImpliesExpression ({BooleanOperation.left=current} operator='&&' right=ImpliesExpression)*;
 	public ExpressionGrammarAccess.AndExpressionElements getAndExpressionAccess() {
 		return gaExpression.getAndExpressionAccess();
 	}
@@ -1170,8 +1173,8 @@ public ParserRule getAndExpressionRule() {
 	//
 	////	x=relationalExpression {$e=x;} (name='implies' r=relationalExpression 	{$e = factory.createBooleanOperation(id(name),$e,r);})*;
 	//
-	//ImpliesExpression returns Expression:
-	//	RelationalExpression ({BooleanOperation.left=current} operator="implies" right=RelationalExpression)*;
+	//ImpliesExpression Expression:
+	//	RelationalExpression ({BooleanOperation.left=current} operator='implies' right=RelationalExpression)*;
 	public ExpressionGrammarAccess.ImpliesExpressionElements getImpliesExpressionAccess() {
 		return gaExpression.getImpliesExpressionAccess();
 	}
@@ -1185,8 +1188,8 @@ public ParserRule getImpliesExpressionRule() {
 	//
 	////	(name=('==' | '!=' | '>=' | '<=' | '>' | '<') r=additiveExpression {$e = factory.createBinaryOperation(id(name),$e,r);})*;
 	//
-	//RelationalExpression returns Expression:
-	//	AdditiveExpression ({BooleanOperation.left=current} operator=("==" | "!=" | ">=" | "<=" | ">" | "<")
+	//RelationalExpression Expression:
+	//	AdditiveExpression ({BooleanOperation.left=current} operator=('==' | '!=' | '>=' | '<=' | '>' | '<')
 	//	right=AdditiveExpression)*;
 	public ExpressionGrammarAccess.RelationalExpressionElements getRelationalExpressionAccess() {
 		return gaExpression.getRelationalExpressionAccess();
@@ -1201,8 +1204,8 @@ public ParserRule getRelationalExpressionRule() {
 	//
 	////   (name=('+'| '-') r=multiplicativeExpression {$e = factory.createBinaryOperation(id(name),$e,r);})*;
 	//
-	//AdditiveExpression returns Expression:
-	//	MultiplicativeExpression ({OperationCall.params+=current} name=("+" | "-") params+=MultiplicativeExpression)*;
+	//AdditiveExpression Expression:
+	//	MultiplicativeExpression ({OperationCall.params+=current} name=('+' | '-') params+=MultiplicativeExpression)*;
 	public ExpressionGrammarAccess.AdditiveExpressionElements getAdditiveExpressionAccess() {
 		return gaExpression.getAdditiveExpressionAccess();
 	}
@@ -1216,8 +1219,8 @@ public ParserRule getAdditiveExpressionRule() {
 	//
 	////	(name=('*' | '/') r=unaryExpression {$e = factory.createBinaryOperation(id(name),$e,r);})*;
 	//
-	//MultiplicativeExpression returns Expression:
-	//	UnaryOrInfixExpression ({OperationCall.params+=current} name=("*" | "/") params+=UnaryOrInfixExpression)*;
+	//MultiplicativeExpression Expression:
+	//	UnaryOrInfixExpression ({OperationCall.params+=current} name=('*' | '/') params+=UnaryOrInfixExpression)*;
 	public ExpressionGrammarAccess.MultiplicativeExpressionElements getMultiplicativeExpressionAccess() {
 		return gaExpression.getMultiplicativeExpressionAccess();
 	}
@@ -1232,8 +1235,7 @@ public ParserRule getMultiplicativeExpressionRule() {
 	////|	name='!' x=infixExpression	{$e = factory.createOperationCall(id(name),x);}
 	//
 	////|	name='-' x=infixExpression	{$e = factory.createOperationCall(id(name),x);};
-	// UnaryOrInfixExpression returns
-	//Expression:
+	// UnaryOrInfixExpression Expression:
 	//	UnaryExpression | InfixExpression;
 	public ExpressionGrammarAccess.UnaryOrInfixExpressionElements getUnaryOrInfixExpressionAccess() {
 		return gaExpression.getUnaryOrInfixExpressionAccess();
@@ -1243,8 +1245,8 @@ public ParserRule getUnaryOrInfixExpressionRule() {
 		return getUnaryOrInfixExpressionAccess().getRule();
 	}
 
-	//UnaryExpression returns OperationCall:
-	//	name=("!" | "-") params+=InfixExpression;
+	//UnaryExpression OperationCall:
+	//	name=('!' | '-') params+=InfixExpression;
 	public ExpressionGrammarAccess.UnaryExpressionElements getUnaryExpressionAccess() {
 		return gaExpression.getUnaryExpressionAccess();
 	}
@@ -1258,12 +1260,12 @@ public ParserRule getUnaryExpressionRule() {
 	////	x=primaryExpression {$e=x;} ( '.' op=featureCall { if (op!=null) { op.setTarget($e);$e=op;}} )*;
 	//
 	//// having support for fragments could avoid the redundancy at this point
-	// InfixExpression returns Expression:
-	//	PrimaryExpression ({OperationCall.target=current} "." name=Identifier "(" (params+=Expression (","
-	//	params+=Expression)*)? ")" | {FeatureCall.target=current} "." type=Type | {TypeSelectExpression.target=current} "."
-	//	name="typeSelect" "(" type=Type ")" | {CollectionExpression.target=current} "." name=("collect" | "select" |
-	//	"selectFirst" | "reject" | "exists" | "notExists" | "sortBy" | "forAll") "(" (var=Identifier "|")? exp=Expression
-	//	")")*;
+	// InfixExpression Expression:
+	//	PrimaryExpression ({OperationCall.target=current} '.' name=Identifier '(' (params+=Expression (','
+	//	params+=Expression)*)? ')' | {FeatureCall.target=current} '.' type=Type | {TypeSelectExpression.target=current} '.'
+	//	name='typeSelect' '(' type=Type ')' | {CollectionExpression.target=current} '.' name=('collect' | 'select' |
+	//	'selectFirst' | 'reject' | 'exists' | 'notExists' | 'sortBy' | 'forAll') '(' (var=Identifier '|')? exp=Expression
+	//	')')*;
 	public ExpressionGrammarAccess.InfixExpressionElements getInfixExpressionAccess() {
 		return gaExpression.getInfixExpressionAccess();
 	}
@@ -1285,7 +1287,7 @@ public ParserRule getInfixExpressionRule() {
 	//
 	////|   x=globalVarExpression {$e=x;}
 	// //|   x=paranthesizedExpression {$e=x;};
-	// PrimaryExpression returns Expression:
+	// PrimaryExpression Expression:
 	//	Literal | FeatureCall | ListLiteral | ConstructorCallExpression | GlobalVarExpression | ParanthesizedExpression;
 	public ExpressionGrammarAccess.PrimaryExpressionElements getPrimaryExpressionAccess() {
 		return gaExpression.getPrimaryExpressionAccess();
@@ -1306,7 +1308,7 @@ public ParserRule getLiteralRule() {
 	}
 
 	//BooleanLiteral:
-	//	val=("true" | "false");
+	//	val=('true' | 'false');
 	public ExpressionGrammarAccess.BooleanLiteralElements getBooleanLiteralAccess() {
 		return gaExpression.getBooleanLiteralAccess();
 	}
@@ -1326,7 +1328,7 @@ public ParserRule getIntegerLiteralRule() {
 	}
 
 	//NullLiteral:
-	//	val="null";
+	//	val='null';
 	public ExpressionGrammarAccess.NullLiteralElements getNullLiteralAccess() {
 		return gaExpression.getNullLiteralAccess();
 	}
@@ -1356,7 +1358,7 @@ public ParserRule getStringLiteralRule() {
 	}
 
 	//terminal REAL:
-	//	"0".."9"* "." "0".."9"*;
+	//	'0'..'9'* '.' '0'..'9'*;
 	public TerminalRule getREALRule() {
 		return gaExpression.getREALRule();
 	} 
@@ -1364,9 +1366,8 @@ public TerminalRule getREALRule() {
 	////paranthesizedExpression returns [Expression e] :
 	//
 	////    '(' x=expression ')' {$e=factory.createParanthesizedExpression(x);};
-	// ParanthesizedExpression returns
-	//Expression:
-	//	"(" Expression ")";
+	// ParanthesizedExpression Expression:
+	//	'(' Expression ')';
 	public ExpressionGrammarAccess.ParanthesizedExpressionElements getParanthesizedExpressionAccess() {
 		return gaExpression.getParanthesizedExpressionAccess();
 	}
@@ -1379,7 +1380,7 @@ public ParserRule getParanthesizedExpressionRule() {
 	//
 	////    '(' x=expression ')' {$e=factory.createParanthesizedExpression(x);};
 	// GlobalVarExpression:
-	//	"GLOBALVAR" name=Identifier;
+	//	'GLOBALVAR' name=Identifier;
 	public ExpressionGrammarAccess.GlobalVarExpressionElements getGlobalVarExpressionAccess() {
 		return gaExpression.getGlobalVarExpressionAccess();
 	}
@@ -1405,7 +1406,7 @@ public ParserRule getFeatureCallRule() {
 	}
 
 	//OperationCall:
-	//	name=Identifier "(" (params+=Expression ("," params+=Expression)*)? ")";
+	//	name=Identifier '(' (params+=Expression (',' params+=Expression)*)? ')';
 	public ExpressionGrammarAccess.OperationCallElements getOperationCallAccess() {
 		return gaExpression.getOperationCallAccess();
 	}
@@ -1417,7 +1418,7 @@ public ParserRule getOperationCallRule() {
 	////listLiteral  returns [Expression e] :
 	// //	'{' (l=parameterList)? '}' {$e=factory.createListLiteral(l);};
 	// ListLiteral:
-	//	{ListLiteral} "{" (elements+=Expression ("," elements+=Expression)*)? "}";
+	//	{ListLiteral} '{' (elements+=Expression (',' elements+=Expression)*)? '}';
 	public ExpressionGrammarAccess.ListLiteralElements getListLiteralAccess() {
 		return gaExpression.getListLiteralAccess();
 	}
@@ -1431,7 +1432,7 @@ public ParserRule getListLiteralRule() {
 	//
 	////	{$e= factory.createConstructorCallExpression(t);};
 	// ConstructorCallExpression:
-	//	"new" type=SimpleType;
+	//	'new' type=SimpleType;
 	public ExpressionGrammarAccess.ConstructorCallExpressionElements getConstructorCallExpressionAccess() {
 		return gaExpression.getConstructorCallExpressionAccess();
 	}
@@ -1457,7 +1458,7 @@ public ParserRule getConstructorCallExpressionRule() {
 	//
 	//// { $e = factory.createCollectionExpression(id(name),var,x);};
 	// TypeSelectExpression:
-	//	name="typeSelect" "(" type=Type ")";
+	//	name='typeSelect' '(' type=Type ')';
 	public ExpressionGrammarAccess.TypeSelectExpressionElements getTypeSelectExpressionAccess() {
 		return gaExpression.getTypeSelectExpressionAccess();
 	}
@@ -1467,8 +1468,8 @@ public ParserRule getTypeSelectExpressionRule() {
 	}
 
 	//CollectionExpression:
-	//	name=("collect" | "select" | "selectFirst" | "reject" | "exists" | "notExists" | "sortBy" | "forAll") "("
-	//	(var=Identifier "|")? exp=Expression ")";
+	//	name=('collect' | 'select' | 'selectFirst' | 'reject' | 'exists' | 'notExists' | 'sortBy' | 'forAll') '('
+	//	(var=Identifier '|')? exp=Expression ')';
 	public ExpressionGrammarAccess.CollectionExpressionElements getCollectionExpressionAccess() {
 		return gaExpression.getCollectionExpressionAccess();
 	}
@@ -1480,7 +1481,7 @@ public ParserRule getCollectionExpressionRule() {
 	////type returns [Identifier id] :
 	// //	a = collectionType {$id=a;}|
 	// //	b = simpleType {$id=b;};
-	// Type returns Identifier:
+	// Type Identifier:
 	//	CollectionType | SimpleType;
 	public ExpressionGrammarAccess.TypeElements getTypeAccess() {
 		return gaExpression.getTypeAccess();
@@ -1494,9 +1495,8 @@ public ParserRule getTypeRule() {
 	// //  cl=( 'Collection' | 'List' | 'Set' ) {$id = id(cl);}
 	//
 	////  (b='[' id1=simpleType c=']' { $id.append(id(b));$id.append(id1);$id.append(id(c));})?;
-	// CollectionType returns
-	//Identifier:
-	//	cl=("Collection" | "List" | "Set") "[" id1=SimpleType "]";
+	// CollectionType Identifier:
+	//	cl=('Collection' | 'List' | 'Set') '[' id1=SimpleType ']';
 	public ExpressionGrammarAccess.CollectionTypeElements getCollectionTypeAccess() {
 		return gaExpression.getCollectionTypeAccess();
 	}
@@ -1509,8 +1509,8 @@ public ParserRule getCollectionTypeRule() {
 	// //	x=identifier {$id=x;}
 	//
 	////	(d='::' end=identifier  {$id.append(id(d)); $id.append(end);})*;
-	// SimpleType returns Identifier:
-	//	id+=Identifier ("::" id+=Identifier)*;
+	// SimpleType Identifier:
+	//	id+=Identifier ('::' id+=Identifier)*;
 	public ExpressionGrammarAccess.SimpleTypeElements getSimpleTypeAccess() {
 		return gaExpression.getSimpleTypeAccess();
 	}
@@ -1519,7 +1519,7 @@ public ParserRule getSimpleTypeRule() {
 		return getSimpleTypeAccess().getRule();
 	}
 
-	//Identifier returns ecore::EString:
+	//Identifier:
 	//	ID;
 	public ExpressionGrammarAccess.IdentifierElements getIdentifierAccess() {
 		return gaExpression.getIdentifierAccess();
@@ -1530,45 +1530,44 @@ public ParserRule getIdentifierRule() {
 	}
 
 	//terminal ID:
-	//	"^"? ("a".."z" | "A".."Z" | "_") ("a".."z" | "A".."Z" | "_" | "0".."9")*;
+	//	'^'? ('a'..'z' | 'A'..'Z' | '_') ('a'..'z' | 'A'..'Z' | '_' | '0'..'9')*;
 	public TerminalRule getIDRule() {
-		return gaExpression.getIDRule();
+		return gaTerminals.getIDRule();
 	} 
 
 	//terminal INT returns ecore::EInt:
-	//	"0".."9"+;
+	//	'0'..'9'+;
 	public TerminalRule getINTRule() {
-		return gaExpression.getINTRule();
+		return gaTerminals.getINTRule();
 	} 
 
 	//terminal STRING:
-	//	"\"" ("\\" . / * 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' * / | !("\\" | "\""))* "\"" | "\'" ("\\" .
-	//	/ * 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' * / | !("\\" | "\'"))* "\'";
+	//	'"' ('\\' . | !('\\' | '"'))* '"' | "'" ('\\' . | !('\\' | "'"))* "'";
 	public TerminalRule getSTRINGRule() {
-		return gaExpression.getSTRINGRule();
+		return gaTerminals.getSTRINGRule();
 	} 
 
 	//terminal ML_COMMENT:
-	//	"/ *"->"* /";
+	//	'/*'->'*/';
 	public TerminalRule getML_COMMENTRule() {
-		return gaExpression.getML_COMMENTRule();
+		return gaTerminals.getML_COMMENTRule();
 	} 
 
 	//terminal SL_COMMENT:
-	//	"//" !("\n" | "\r")* ("\r"? "\n")?;
+	//	'//' !('\n' | '\r')* ('\r'? '\n')?;
 	public TerminalRule getSL_COMMENTRule() {
-		return gaExpression.getSL_COMMENTRule();
+		return gaTerminals.getSL_COMMENTRule();
 	} 
 
 	//terminal WS:
-	//	(" " | "\t" | "\r" | "\n")+;
+	//	' ' | '\t' | '\r' | '\n'+;
 	public TerminalRule getWSRule() {
-		return gaExpression.getWSRule();
+		return gaTerminals.getWSRule();
 	} 
 
 	//terminal ANY_OTHER:
 	//	.;
 	public TerminalRule getANY_OTHERRule() {
-		return gaExpression.getANY_OTHERRule();
+		return gaTerminals.getANY_OTHERRule();
 	} 
 }
diff --git a/com.avaloq.tools.ddk.xtext.expression.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.expression.ui/META-INF/MANIFEST.MF
index 2bd53a6ca..cfaca9b60 100644
--- a/com.avaloq.tools.ddk.xtext.expression.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.expression.ui/META-INF/MANIFEST.MF
@@ -17,5 +17,6 @@ Require-Bundle: org.eclipse.xtext.ui,
  org.eclipse.emf.codegen.ecore
 Export-Package: com.avaloq.tools.ddk.xtext.expression.ui.contentassist,
  com.avaloq.tools.ddk.xtext.expression.ui.contentassist.antlr,
- com.avaloq.tools.ddk.xtext.expression.ui.quickfix
+ com.avaloq.tools.ddk.xtext.expression.ui.quickfix,
+ com.avaloq.tools.ddk.xtext.expression.ui.contentassist.antlr.internal
 Import-Package: org.apache.log4j
diff --git a/com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpressionLexer.java b/com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpressionLexer.java
index 28e1a8000..2d3357d67 100644
--- a/com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpressionLexer.java
+++ b/com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpressionLexer.java
@@ -85,15 +85,15 @@ public InternalExpressionLexer(CharStream input, RecognizerSharedState state) {
         super(input,state);
 
     }
-    public String getGrammarFileName() { return "../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g"; }
+    public String getGrammarFileName() { return "InternalExpression.g"; }
 
     // $ANTLR start "T__12"
     public final void mT__12() throws RecognitionException {
         try {
             int _type = T__12;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:11:7: ( '==' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:11:9: '=='
+            // InternalExpression.g:11:7: ( '==' )
+            // InternalExpression.g:11:9: '=='
             {
             match("=="); 
 
@@ -113,8 +113,8 @@ public final void mT__13() throws RecognitionException {
         try {
             int _type = T__13;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:12:7: ( '!=' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:12:9: '!='
+            // InternalExpression.g:12:7: ( '!=' )
+            // InternalExpression.g:12:9: '!='
             {
             match("!="); 
 
@@ -134,8 +134,8 @@ public final void mT__14() throws RecognitionException {
         try {
             int _type = T__14;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:13:7: ( '>=' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:13:9: '>='
+            // InternalExpression.g:13:7: ( '>=' )
+            // InternalExpression.g:13:9: '>='
             {
             match(">="); 
 
@@ -155,8 +155,8 @@ public final void mT__15() throws RecognitionException {
         try {
             int _type = T__15;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:14:7: ( '<=' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:14:9: '<='
+            // InternalExpression.g:14:7: ( '<=' )
+            // InternalExpression.g:14:9: '<='
             {
             match("<="); 
 
@@ -176,8 +176,8 @@ public final void mT__16() throws RecognitionException {
         try {
             int _type = T__16;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:15:7: ( '>' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:15:9: '>'
+            // InternalExpression.g:15:7: ( '>' )
+            // InternalExpression.g:15:9: '>'
             {
             match('>'); 
 
@@ -196,8 +196,8 @@ public final void mT__17() throws RecognitionException {
         try {
             int _type = T__17;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:16:7: ( '<' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:16:9: '<'
+            // InternalExpression.g:16:7: ( '<' )
+            // InternalExpression.g:16:9: '<'
             {
             match('<'); 
 
@@ -216,8 +216,8 @@ public final void mT__18() throws RecognitionException {
         try {
             int _type = T__18;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:17:7: ( '+' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:17:9: '+'
+            // InternalExpression.g:17:7: ( '+' )
+            // InternalExpression.g:17:9: '+'
             {
             match('+'); 
 
@@ -236,8 +236,8 @@ public final void mT__19() throws RecognitionException {
         try {
             int _type = T__19;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:18:7: ( '-' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:18:9: '-'
+            // InternalExpression.g:18:7: ( '-' )
+            // InternalExpression.g:18:9: '-'
             {
             match('-'); 
 
@@ -256,8 +256,8 @@ public final void mT__20() throws RecognitionException {
         try {
             int _type = T__20;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:19:7: ( '*' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:19:9: '*'
+            // InternalExpression.g:19:7: ( '*' )
+            // InternalExpression.g:19:9: '*'
             {
             match('*'); 
 
@@ -276,8 +276,8 @@ public final void mT__21() throws RecognitionException {
         try {
             int _type = T__21;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:20:7: ( '/' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:20:9: '/'
+            // InternalExpression.g:20:7: ( '/' )
+            // InternalExpression.g:20:9: '/'
             {
             match('/'); 
 
@@ -296,8 +296,8 @@ public final void mT__22() throws RecognitionException {
         try {
             int _type = T__22;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:21:7: ( '!' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:21:9: '!'
+            // InternalExpression.g:21:7: ( '!' )
+            // InternalExpression.g:21:9: '!'
             {
             match('!'); 
 
@@ -316,8 +316,8 @@ public final void mT__23() throws RecognitionException {
         try {
             int _type = T__23;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:22:7: ( 'collect' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:22:9: 'collect'
+            // InternalExpression.g:22:7: ( 'collect' )
+            // InternalExpression.g:22:9: 'collect'
             {
             match("collect"); 
 
@@ -337,8 +337,8 @@ public final void mT__24() throws RecognitionException {
         try {
             int _type = T__24;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:23:7: ( 'select' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:23:9: 'select'
+            // InternalExpression.g:23:7: ( 'select' )
+            // InternalExpression.g:23:9: 'select'
             {
             match("select"); 
 
@@ -358,8 +358,8 @@ public final void mT__25() throws RecognitionException {
         try {
             int _type = T__25;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:24:7: ( 'selectFirst' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:24:9: 'selectFirst'
+            // InternalExpression.g:24:7: ( 'selectFirst' )
+            // InternalExpression.g:24:9: 'selectFirst'
             {
             match("selectFirst"); 
 
@@ -379,8 +379,8 @@ public final void mT__26() throws RecognitionException {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:25:7: ( 'reject' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:25:9: 'reject'
+            // InternalExpression.g:25:7: ( 'reject' )
+            // InternalExpression.g:25:9: 'reject'
             {
             match("reject"); 
 
@@ -400,8 +400,8 @@ public final void mT__27() throws RecognitionException {
         try {
             int _type = T__27;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:26:7: ( 'exists' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:26:9: 'exists'
+            // InternalExpression.g:26:7: ( 'exists' )
+            // InternalExpression.g:26:9: 'exists'
             {
             match("exists"); 
 
@@ -421,8 +421,8 @@ public final void mT__28() throws RecognitionException {
         try {
             int _type = T__28;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:27:7: ( 'notExists' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:27:9: 'notExists'
+            // InternalExpression.g:27:7: ( 'notExists' )
+            // InternalExpression.g:27:9: 'notExists'
             {
             match("notExists"); 
 
@@ -442,8 +442,8 @@ public final void mT__29() throws RecognitionException {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:28:7: ( 'sortBy' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:28:9: 'sortBy'
+            // InternalExpression.g:28:7: ( 'sortBy' )
+            // InternalExpression.g:28:9: 'sortBy'
             {
             match("sortBy"); 
 
@@ -463,8 +463,8 @@ public final void mT__30() throws RecognitionException {
         try {
             int _type = T__30;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:29:7: ( 'forAll' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:29:9: 'forAll'
+            // InternalExpression.g:29:7: ( 'forAll' )
+            // InternalExpression.g:29:9: 'forAll'
             {
             match("forAll"); 
 
@@ -484,8 +484,8 @@ public final void mT__31() throws RecognitionException {
         try {
             int _type = T__31;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:30:7: ( 'true' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:30:9: 'true'
+            // InternalExpression.g:30:7: ( 'true' )
+            // InternalExpression.g:30:9: 'true'
             {
             match("true"); 
 
@@ -505,8 +505,8 @@ public final void mT__32() throws RecognitionException {
         try {
             int _type = T__32;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:31:7: ( 'false' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:31:9: 'false'
+            // InternalExpression.g:31:7: ( 'false' )
+            // InternalExpression.g:31:9: 'false'
             {
             match("false"); 
 
@@ -526,8 +526,8 @@ public final void mT__33() throws RecognitionException {
         try {
             int _type = T__33;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:32:7: ( 'Collection' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:32:9: 'Collection'
+            // InternalExpression.g:32:7: ( 'Collection' )
+            // InternalExpression.g:32:9: 'Collection'
             {
             match("Collection"); 
 
@@ -547,8 +547,8 @@ public final void mT__34() throws RecognitionException {
         try {
             int _type = T__34;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:33:7: ( 'List' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:33:9: 'List'
+            // InternalExpression.g:33:7: ( 'List' )
+            // InternalExpression.g:33:9: 'List'
             {
             match("List"); 
 
@@ -568,8 +568,8 @@ public final void mT__35() throws RecognitionException {
         try {
             int _type = T__35;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:34:7: ( 'Set' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:34:9: 'Set'
+            // InternalExpression.g:34:7: ( 'Set' )
+            // InternalExpression.g:34:9: 'Set'
             {
             match("Set"); 
 
@@ -589,8 +589,8 @@ public final void mT__36() throws RecognitionException {
         try {
             int _type = T__36;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:35:7: ( 'let' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:35:9: 'let'
+            // InternalExpression.g:35:7: ( 'let' )
+            // InternalExpression.g:35:9: 'let'
             {
             match("let"); 
 
@@ -610,8 +610,8 @@ public final void mT__37() throws RecognitionException {
         try {
             int _type = T__37;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:36:7: ( '=' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:36:9: '='
+            // InternalExpression.g:36:7: ( '=' )
+            // InternalExpression.g:36:9: '='
             {
             match('='); 
 
@@ -630,8 +630,8 @@ public final void mT__38() throws RecognitionException {
         try {
             int _type = T__38;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:37:7: ( ':' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:37:9: ':'
+            // InternalExpression.g:37:7: ( ':' )
+            // InternalExpression.g:37:9: ':'
             {
             match(':'); 
 
@@ -650,8 +650,8 @@ public final void mT__39() throws RecognitionException {
         try {
             int _type = T__39;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:38:7: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:38:9: '('
+            // InternalExpression.g:38:7: ( '(' )
+            // InternalExpression.g:38:9: '('
             {
             match('('); 
 
@@ -670,8 +670,8 @@ public final void mT__40() throws RecognitionException {
         try {
             int _type = T__40;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:39:7: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:39:9: ')'
+            // InternalExpression.g:39:7: ( ')' )
+            // InternalExpression.g:39:9: ')'
             {
             match(')'); 
 
@@ -690,8 +690,8 @@ public final void mT__41() throws RecognitionException {
         try {
             int _type = T__41;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:40:7: ( '->' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:40:9: '->'
+            // InternalExpression.g:40:7: ( '->' )
+            // InternalExpression.g:40:9: '->'
             {
             match("->"); 
 
@@ -711,8 +711,8 @@ public final void mT__42() throws RecognitionException {
         try {
             int _type = T__42;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:41:7: ( '?' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:41:9: '?'
+            // InternalExpression.g:41:7: ( '?' )
+            // InternalExpression.g:41:9: '?'
             {
             match('?'); 
 
@@ -731,8 +731,8 @@ public final void mT__43() throws RecognitionException {
         try {
             int _type = T__43;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:42:7: ( 'if' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:42:9: 'if'
+            // InternalExpression.g:42:7: ( 'if' )
+            // InternalExpression.g:42:9: 'if'
             {
             match("if"); 
 
@@ -752,8 +752,8 @@ public final void mT__44() throws RecognitionException {
         try {
             int _type = T__44;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:43:7: ( 'then' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:43:9: 'then'
+            // InternalExpression.g:43:7: ( 'then' )
+            // InternalExpression.g:43:9: 'then'
             {
             match("then"); 
 
@@ -773,8 +773,8 @@ public final void mT__45() throws RecognitionException {
         try {
             int _type = T__45;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:44:7: ( 'else' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:44:9: 'else'
+            // InternalExpression.g:44:7: ( 'else' )
+            // InternalExpression.g:44:9: 'else'
             {
             match("else"); 
 
@@ -794,8 +794,8 @@ public final void mT__46() throws RecognitionException {
         try {
             int _type = T__46;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:45:7: ( 'switch' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:45:9: 'switch'
+            // InternalExpression.g:45:7: ( 'switch' )
+            // InternalExpression.g:45:9: 'switch'
             {
             match("switch"); 
 
@@ -815,8 +815,8 @@ public final void mT__47() throws RecognitionException {
         try {
             int _type = T__47;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:46:7: ( '{' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:46:9: '{'
+            // InternalExpression.g:46:7: ( '{' )
+            // InternalExpression.g:46:9: '{'
             {
             match('{'); 
 
@@ -835,8 +835,8 @@ public final void mT__48() throws RecognitionException {
         try {
             int _type = T__48;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:47:7: ( 'default' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:47:9: 'default'
+            // InternalExpression.g:47:7: ( 'default' )
+            // InternalExpression.g:47:9: 'default'
             {
             match("default"); 
 
@@ -856,8 +856,8 @@ public final void mT__49() throws RecognitionException {
         try {
             int _type = T__49;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:48:7: ( '}' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:48:9: '}'
+            // InternalExpression.g:48:7: ( '}' )
+            // InternalExpression.g:48:9: '}'
             {
             match('}'); 
 
@@ -876,8 +876,8 @@ public final void mT__50() throws RecognitionException {
         try {
             int _type = T__50;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:49:7: ( 'case' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:49:9: 'case'
+            // InternalExpression.g:49:7: ( 'case' )
+            // InternalExpression.g:49:9: 'case'
             {
             match("case"); 
 
@@ -897,8 +897,8 @@ public final void mT__51() throws RecognitionException {
         try {
             int _type = T__51;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:50:7: ( '.' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:50:9: '.'
+            // InternalExpression.g:50:7: ( '.' )
+            // InternalExpression.g:50:9: '.'
             {
             match('.'); 
 
@@ -917,8 +917,8 @@ public final void mT__52() throws RecognitionException {
         try {
             int _type = T__52;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:51:7: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:51:9: ','
+            // InternalExpression.g:51:7: ( ',' )
+            // InternalExpression.g:51:9: ','
             {
             match(','); 
 
@@ -937,8 +937,8 @@ public final void mT__53() throws RecognitionException {
         try {
             int _type = T__53;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:52:7: ( '|' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:52:9: '|'
+            // InternalExpression.g:52:7: ( '|' )
+            // InternalExpression.g:52:9: '|'
             {
             match('|'); 
 
@@ -957,8 +957,8 @@ public final void mT__54() throws RecognitionException {
         try {
             int _type = T__54;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:53:7: ( 'GLOBALVAR' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:53:9: 'GLOBALVAR'
+            // InternalExpression.g:53:7: ( 'GLOBALVAR' )
+            // InternalExpression.g:53:9: 'GLOBALVAR'
             {
             match("GLOBALVAR"); 
 
@@ -978,8 +978,8 @@ public final void mT__55() throws RecognitionException {
         try {
             int _type = T__55;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:54:7: ( 'new' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:54:9: 'new'
+            // InternalExpression.g:54:7: ( 'new' )
+            // InternalExpression.g:54:9: 'new'
             {
             match("new"); 
 
@@ -999,8 +999,8 @@ public final void mT__56() throws RecognitionException {
         try {
             int _type = T__56;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:55:7: ( '[' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:55:9: '['
+            // InternalExpression.g:55:7: ( '[' )
+            // InternalExpression.g:55:9: '['
             {
             match('['); 
 
@@ -1019,8 +1019,8 @@ public final void mT__57() throws RecognitionException {
         try {
             int _type = T__57;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:56:7: ( ']' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:56:9: ']'
+            // InternalExpression.g:56:7: ( ']' )
+            // InternalExpression.g:56:9: ']'
             {
             match(']'); 
 
@@ -1039,8 +1039,8 @@ public final void mT__58() throws RecognitionException {
         try {
             int _type = T__58;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:57:7: ( '::' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:57:9: '::'
+            // InternalExpression.g:57:7: ( '::' )
+            // InternalExpression.g:57:9: '::'
             {
             match("::"); 
 
@@ -1060,8 +1060,8 @@ public final void mT__59() throws RecognitionException {
         try {
             int _type = T__59;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:58:7: ( '||' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:58:9: '||'
+            // InternalExpression.g:58:7: ( '||' )
+            // InternalExpression.g:58:9: '||'
             {
             match("||"); 
 
@@ -1081,8 +1081,8 @@ public final void mT__60() throws RecognitionException {
         try {
             int _type = T__60;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:59:7: ( '&&' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:59:9: '&&'
+            // InternalExpression.g:59:7: ( '&&' )
+            // InternalExpression.g:59:9: '&&'
             {
             match("&&"); 
 
@@ -1102,8 +1102,8 @@ public final void mT__61() throws RecognitionException {
         try {
             int _type = T__61;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:60:7: ( 'implies' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:60:9: 'implies'
+            // InternalExpression.g:60:7: ( 'implies' )
+            // InternalExpression.g:60:9: 'implies'
             {
             match("implies"); 
 
@@ -1123,8 +1123,8 @@ public final void mT__62() throws RecognitionException {
         try {
             int _type = T__62;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:61:7: ( 'typeSelect' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:61:9: 'typeSelect'
+            // InternalExpression.g:61:7: ( 'typeSelect' )
+            // InternalExpression.g:61:9: 'typeSelect'
             {
             match("typeSelect"); 
 
@@ -1144,8 +1144,8 @@ public final void mT__63() throws RecognitionException {
         try {
             int _type = T__63;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:62:7: ( 'null' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:62:9: 'null'
+            // InternalExpression.g:62:7: ( 'null' )
+            // InternalExpression.g:62:9: 'null'
             {
             match("null"); 
 
@@ -1165,10 +1165,10 @@ public final void mRULE_REAL() throws RecognitionException {
         try {
             int _type = RULE_REAL;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7370:11: ( ( '0' .. '9' )* '.' ( '0' .. '9' )* )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7370:13: ( '0' .. '9' )* '.' ( '0' .. '9' )*
+            // InternalExpression.g:7370:11: ( ( '0' .. '9' )* '.' ( '0' .. '9' )* )
+            // InternalExpression.g:7370:13: ( '0' .. '9' )* '.' ( '0' .. '9' )*
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7370:13: ( '0' .. '9' )*
+            // InternalExpression.g:7370:13: ( '0' .. '9' )*
             loop1:
             do {
                 int alt1=2;
@@ -1181,7 +1181,7 @@ public final void mRULE_REAL() throws RecognitionException {
 
                 switch (alt1) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7370:14: '0' .. '9'
+            	    // InternalExpression.g:7370:14: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -1194,7 +1194,7 @@ public final void mRULE_REAL() throws RecognitionException {
             } while (true);
 
             match('.'); 
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7370:29: ( '0' .. '9' )*
+            // InternalExpression.g:7370:29: ( '0' .. '9' )*
             loop2:
             do {
                 int alt2=2;
@@ -1207,7 +1207,7 @@ public final void mRULE_REAL() throws RecognitionException {
 
                 switch (alt2) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7370:30: '0' .. '9'
+            	    // InternalExpression.g:7370:30: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -1235,10 +1235,10 @@ public final void mRULE_ID() throws RecognitionException {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7372:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7372:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalExpression.g:7372:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+            // InternalExpression.g:7372:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7372:11: ( '^' )?
+            // InternalExpression.g:7372:11: ( '^' )?
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -1247,7 +1247,7 @@ public final void mRULE_ID() throws RecognitionException {
             }
             switch (alt3) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7372:11: '^'
+                    // InternalExpression.g:7372:11: '^'
                     {
                     match('^'); 
 
@@ -1265,7 +1265,7 @@ public final void mRULE_ID() throws RecognitionException {
                 recover(mse);
                 throw mse;}
 
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7372:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalExpression.g:7372:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             loop4:
             do {
                 int alt4=2;
@@ -1278,7 +1278,7 @@ public final void mRULE_ID() throws RecognitionException {
 
                 switch (alt4) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:
+            	    // InternalExpression.g:
             	    {
             	    if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
             	        input.consume();
@@ -1314,10 +1314,10 @@ public final void mRULE_INT() throws RecognitionException {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7374:10: ( ( '0' .. '9' )+ )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7374:12: ( '0' .. '9' )+
+            // InternalExpression.g:7374:10: ( ( '0' .. '9' )+ )
+            // InternalExpression.g:7374:12: ( '0' .. '9' )+
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7374:12: ( '0' .. '9' )+
+            // InternalExpression.g:7374:12: ( '0' .. '9' )+
             int cnt5=0;
             loop5:
             do {
@@ -1331,7 +1331,7 @@ public final void mRULE_INT() throws RecognitionException {
 
                 switch (alt5) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7374:13: '0' .. '9'
+            	    // InternalExpression.g:7374:13: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -1363,10 +1363,10 @@ public final void mRULE_STRING() throws RecognitionException {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7376:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7376:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalExpression.g:7376:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+            // InternalExpression.g:7376:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7376:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalExpression.g:7376:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             int alt8=2;
             int LA8_0 = input.LA(1);
 
@@ -1384,10 +1384,10 @@ else if ( (LA8_0=='\'') ) {
             }
             switch (alt8) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7376:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+                    // InternalExpression.g:7376:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
                     {
                     match('\"'); 
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7376:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // InternalExpression.g:7376:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop6:
                     do {
                         int alt6=3;
@@ -1403,7 +1403,7 @@ else if ( ((LA6_0>='\u0000' && LA6_0<='!')||(LA6_0>='#' && LA6_0<='[')||(LA6_0>=
 
                         switch (alt6) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7376:21: '\\\\' .
+                    	    // InternalExpression.g:7376:21: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -1411,7 +1411,7 @@ else if ( ((LA6_0>='\u0000' && LA6_0<='!')||(LA6_0>='#' && LA6_0<='[')||(LA6_0>=
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7376:28: ~ ( ( '\\\\' | '\"' ) )
+                    	    // InternalExpression.g:7376:28: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -1436,10 +1436,10 @@ else if ( ((LA6_0>='\u0000' && LA6_0<='!')||(LA6_0>='#' && LA6_0<='[')||(LA6_0>=
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7376:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+                    // InternalExpression.g:7376:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
                     {
                     match('\''); 
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7376:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // InternalExpression.g:7376:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop7:
                     do {
                         int alt7=3;
@@ -1455,7 +1455,7 @@ else if ( ((LA7_0>='\u0000' && LA7_0<='&')||(LA7_0>='(' && LA7_0<='[')||(LA7_0>=
 
                         switch (alt7) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7376:54: '\\\\' .
+                    	    // InternalExpression.g:7376:54: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -1463,7 +1463,7 @@ else if ( ((LA7_0>='\u0000' && LA7_0<='&')||(LA7_0>='(' && LA7_0<='[')||(LA7_0>=
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7376:61: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // InternalExpression.g:7376:61: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -1506,12 +1506,12 @@ public final void mRULE_ML_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7378:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7378:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalExpression.g:7378:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalExpression.g:7378:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7378:24: ( options {greedy=false; } : . )*
+            // InternalExpression.g:7378:24: ( options {greedy=false; } : . )*
             loop9:
             do {
                 int alt9=2;
@@ -1536,7 +1536,7 @@ else if ( ((LA9_0>='\u0000' && LA9_0<=')')||(LA9_0>='+' && LA9_0<='\uFFFF')) ) {
 
                 switch (alt9) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7378:52: .
+            	    // InternalExpression.g:7378:52: .
             	    {
             	    matchAny(); 
 
@@ -1566,12 +1566,12 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7380:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7380:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalExpression.g:7380:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalExpression.g:7380:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7380:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // InternalExpression.g:7380:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop10:
             do {
                 int alt10=2;
@@ -1584,7 +1584,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
 
                 switch (alt10) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7380:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // InternalExpression.g:7380:24: ~ ( ( '\\n' | '\\r' ) )
             	    {
             	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
             	        input.consume();
@@ -1604,7 +1604,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
                 }
             } while (true);
 
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7380:40: ( ( '\\r' )? '\\n' )?
+            // InternalExpression.g:7380:40: ( ( '\\r' )? '\\n' )?
             int alt12=2;
             int LA12_0 = input.LA(1);
 
@@ -1613,9 +1613,9 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
             }
             switch (alt12) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7380:41: ( '\\r' )? '\\n'
+                    // InternalExpression.g:7380:41: ( '\\r' )? '\\n'
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7380:41: ( '\\r' )?
+                    // InternalExpression.g:7380:41: ( '\\r' )?
                     int alt11=2;
                     int LA11_0 = input.LA(1);
 
@@ -1624,7 +1624,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
                     }
                     switch (alt11) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7380:41: '\\r'
+                            // InternalExpression.g:7380:41: '\\r'
                             {
                             match('\r'); 
 
@@ -1656,10 +1656,10 @@ public final void mRULE_WS() throws RecognitionException {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7382:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7382:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalExpression.g:7382:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalExpression.g:7382:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7382:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalExpression.g:7382:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt13=0;
             loop13:
             do {
@@ -1673,7 +1673,7 @@ public final void mRULE_WS() throws RecognitionException {
 
                 switch (alt13) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:
+            	    // InternalExpression.g:
             	    {
             	    if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
             	        input.consume();
@@ -1713,8 +1713,8 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7384:16: ( . )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7384:18: .
+            // InternalExpression.g:7384:16: ( . )
+            // InternalExpression.g:7384:18: .
             {
             matchAny(); 
 
@@ -1729,425 +1729,425 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:8: ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | RULE_REAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        // InternalExpression.g:1:8: ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | RULE_REAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
         int alt14=60;
         alt14 = dfa14.predict(input);
         switch (alt14) {
             case 1 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:10: T__12
+                // InternalExpression.g:1:10: T__12
                 {
                 mT__12(); 
 
                 }
                 break;
             case 2 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:16: T__13
+                // InternalExpression.g:1:16: T__13
                 {
                 mT__13(); 
 
                 }
                 break;
             case 3 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:22: T__14
+                // InternalExpression.g:1:22: T__14
                 {
                 mT__14(); 
 
                 }
                 break;
             case 4 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:28: T__15
+                // InternalExpression.g:1:28: T__15
                 {
                 mT__15(); 
 
                 }
                 break;
             case 5 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:34: T__16
+                // InternalExpression.g:1:34: T__16
                 {
                 mT__16(); 
 
                 }
                 break;
             case 6 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:40: T__17
+                // InternalExpression.g:1:40: T__17
                 {
                 mT__17(); 
 
                 }
                 break;
             case 7 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:46: T__18
+                // InternalExpression.g:1:46: T__18
                 {
                 mT__18(); 
 
                 }
                 break;
             case 8 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:52: T__19
+                // InternalExpression.g:1:52: T__19
                 {
                 mT__19(); 
 
                 }
                 break;
             case 9 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:58: T__20
+                // InternalExpression.g:1:58: T__20
                 {
                 mT__20(); 
 
                 }
                 break;
             case 10 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:64: T__21
+                // InternalExpression.g:1:64: T__21
                 {
                 mT__21(); 
 
                 }
                 break;
             case 11 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:70: T__22
+                // InternalExpression.g:1:70: T__22
                 {
                 mT__22(); 
 
                 }
                 break;
             case 12 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:76: T__23
+                // InternalExpression.g:1:76: T__23
                 {
                 mT__23(); 
 
                 }
                 break;
             case 13 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:82: T__24
+                // InternalExpression.g:1:82: T__24
                 {
                 mT__24(); 
 
                 }
                 break;
             case 14 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:88: T__25
+                // InternalExpression.g:1:88: T__25
                 {
                 mT__25(); 
 
                 }
                 break;
             case 15 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:94: T__26
+                // InternalExpression.g:1:94: T__26
                 {
                 mT__26(); 
 
                 }
                 break;
             case 16 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:100: T__27
+                // InternalExpression.g:1:100: T__27
                 {
                 mT__27(); 
 
                 }
                 break;
             case 17 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:106: T__28
+                // InternalExpression.g:1:106: T__28
                 {
                 mT__28(); 
 
                 }
                 break;
             case 18 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:112: T__29
+                // InternalExpression.g:1:112: T__29
                 {
                 mT__29(); 
 
                 }
                 break;
             case 19 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:118: T__30
+                // InternalExpression.g:1:118: T__30
                 {
                 mT__30(); 
 
                 }
                 break;
             case 20 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:124: T__31
+                // InternalExpression.g:1:124: T__31
                 {
                 mT__31(); 
 
                 }
                 break;
             case 21 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:130: T__32
+                // InternalExpression.g:1:130: T__32
                 {
                 mT__32(); 
 
                 }
                 break;
             case 22 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:136: T__33
+                // InternalExpression.g:1:136: T__33
                 {
                 mT__33(); 
 
                 }
                 break;
             case 23 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:142: T__34
+                // InternalExpression.g:1:142: T__34
                 {
                 mT__34(); 
 
                 }
                 break;
             case 24 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:148: T__35
+                // InternalExpression.g:1:148: T__35
                 {
                 mT__35(); 
 
                 }
                 break;
             case 25 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:154: T__36
+                // InternalExpression.g:1:154: T__36
                 {
                 mT__36(); 
 
                 }
                 break;
             case 26 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:160: T__37
+                // InternalExpression.g:1:160: T__37
                 {
                 mT__37(); 
 
                 }
                 break;
             case 27 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:166: T__38
+                // InternalExpression.g:1:166: T__38
                 {
                 mT__38(); 
 
                 }
                 break;
             case 28 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:172: T__39
+                // InternalExpression.g:1:172: T__39
                 {
                 mT__39(); 
 
                 }
                 break;
             case 29 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:178: T__40
+                // InternalExpression.g:1:178: T__40
                 {
                 mT__40(); 
 
                 }
                 break;
             case 30 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:184: T__41
+                // InternalExpression.g:1:184: T__41
                 {
                 mT__41(); 
 
                 }
                 break;
             case 31 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:190: T__42
+                // InternalExpression.g:1:190: T__42
                 {
                 mT__42(); 
 
                 }
                 break;
             case 32 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:196: T__43
+                // InternalExpression.g:1:196: T__43
                 {
                 mT__43(); 
 
                 }
                 break;
             case 33 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:202: T__44
+                // InternalExpression.g:1:202: T__44
                 {
                 mT__44(); 
 
                 }
                 break;
             case 34 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:208: T__45
+                // InternalExpression.g:1:208: T__45
                 {
                 mT__45(); 
 
                 }
                 break;
             case 35 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:214: T__46
+                // InternalExpression.g:1:214: T__46
                 {
                 mT__46(); 
 
                 }
                 break;
             case 36 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:220: T__47
+                // InternalExpression.g:1:220: T__47
                 {
                 mT__47(); 
 
                 }
                 break;
             case 37 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:226: T__48
+                // InternalExpression.g:1:226: T__48
                 {
                 mT__48(); 
 
                 }
                 break;
             case 38 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:232: T__49
+                // InternalExpression.g:1:232: T__49
                 {
                 mT__49(); 
 
                 }
                 break;
             case 39 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:238: T__50
+                // InternalExpression.g:1:238: T__50
                 {
                 mT__50(); 
 
                 }
                 break;
             case 40 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:244: T__51
+                // InternalExpression.g:1:244: T__51
                 {
                 mT__51(); 
 
                 }
                 break;
             case 41 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:250: T__52
+                // InternalExpression.g:1:250: T__52
                 {
                 mT__52(); 
 
                 }
                 break;
             case 42 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:256: T__53
+                // InternalExpression.g:1:256: T__53
                 {
                 mT__53(); 
 
                 }
                 break;
             case 43 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:262: T__54
+                // InternalExpression.g:1:262: T__54
                 {
                 mT__54(); 
 
                 }
                 break;
             case 44 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:268: T__55
+                // InternalExpression.g:1:268: T__55
                 {
                 mT__55(); 
 
                 }
                 break;
             case 45 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:274: T__56
+                // InternalExpression.g:1:274: T__56
                 {
                 mT__56(); 
 
                 }
                 break;
             case 46 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:280: T__57
+                // InternalExpression.g:1:280: T__57
                 {
                 mT__57(); 
 
                 }
                 break;
             case 47 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:286: T__58
+                // InternalExpression.g:1:286: T__58
                 {
                 mT__58(); 
 
                 }
                 break;
             case 48 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:292: T__59
+                // InternalExpression.g:1:292: T__59
                 {
                 mT__59(); 
 
                 }
                 break;
             case 49 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:298: T__60
+                // InternalExpression.g:1:298: T__60
                 {
                 mT__60(); 
 
                 }
                 break;
             case 50 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:304: T__61
+                // InternalExpression.g:1:304: T__61
                 {
                 mT__61(); 
 
                 }
                 break;
             case 51 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:310: T__62
+                // InternalExpression.g:1:310: T__62
                 {
                 mT__62(); 
 
                 }
                 break;
             case 52 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:316: T__63
+                // InternalExpression.g:1:316: T__63
                 {
                 mT__63(); 
 
                 }
                 break;
             case 53 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:322: RULE_REAL
+                // InternalExpression.g:1:322: RULE_REAL
                 {
                 mRULE_REAL(); 
 
                 }
                 break;
             case 54 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:332: RULE_ID
+                // InternalExpression.g:1:332: RULE_ID
                 {
                 mRULE_ID(); 
 
                 }
                 break;
             case 55 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:340: RULE_INT
+                // InternalExpression.g:1:340: RULE_INT
                 {
                 mRULE_INT(); 
 
                 }
                 break;
             case 56 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:349: RULE_STRING
+                // InternalExpression.g:1:349: RULE_STRING
                 {
                 mRULE_STRING(); 
 
                 }
                 break;
             case 57 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:361: RULE_ML_COMMENT
+                // InternalExpression.g:1:361: RULE_ML_COMMENT
                 {
                 mRULE_ML_COMMENT(); 
 
                 }
                 break;
             case 58 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:377: RULE_SL_COMMENT
+                // InternalExpression.g:1:377: RULE_SL_COMMENT
                 {
                 mRULE_SL_COMMENT(); 
 
                 }
                 break;
             case 59 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:393: RULE_WS
+                // InternalExpression.g:1:393: RULE_WS
                 {
                 mRULE_WS(); 
 
                 }
                 break;
             case 60 :
-                // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1:401: RULE_ANY_OTHER
+                // InternalExpression.g:1:401: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -2161,73 +2161,19 @@ public void mTokens() throws RecognitionException {
 
     protected DFA14 dfa14 = new DFA14(this);
     static final String DFA14_eotS =
-        "\1\uffff\1\53\1\55\1\57\1\61\1\uffff\1\64\1\uffff\1\70\13\73\1"+
-        "\117\3\uffff\1\73\1\uffff\1\73\1\uffff\1\130\1\uffff\1\134\1\73"+
-        "\2\uffff\1\51\1\141\1\51\1\uffff\2\51\21\uffff\2\73\1\uffff\22\73"+
-        "\5\uffff\1\171\1\73\1\uffff\1\73\6\uffff\1\73\4\uffff\1\141\2\uffff"+
-        "\11\73\1\u0086\10\73\1\u008f\1\u0090\1\uffff\4\73\1\u0095\5\73\1"+
-        "\u009b\1\73\1\uffff\1\u009d\2\73\1\u00a0\1\u00a1\2\73\1\u00a4\2"+
-        "\uffff\4\73\1\uffff\5\73\1\uffff\1\73\1\uffff\1\73\1\u00b0\2\uffff"+
-        "\2\73\1\uffff\4\73\1\u00b8\1\u00b9\1\u00ba\1\u00bb\1\u00bc\1\73"+
-        "\1\u00be\1\uffff\5\73\1\u00c4\1\73\5\uffff\1\73\1\uffff\2\73\1\u00c9"+
-        "\1\u00ca\1\73\1\uffff\4\73\2\uffff\2\73\1\u00d2\2\73\1\u00d5\1\73"+
-        "\1\uffff\1\u00d7\1\u00d8\1\uffff\1\u00d9\3\uffff";
+        "\1\uffff\1\53\1\55\1\57\1\61\1\uffff\1\64\1\uffff\1\70\13\73\1\117\3\uffff\1\73\1\uffff\1\73\1\uffff\1\130\1\uffff\1\134\1\73\2\uffff\1\51\1\141\1\51\1\uffff\2\51\21\uffff\2\73\1\uffff\22\73\5\uffff\1\171\1\73\1\uffff\1\73\6\uffff\1\73\4\uffff\1\141\2\uffff\11\73\1\u0086\10\73\1\u008f\1\u0090\1\uffff\4\73\1\u0095\5\73\1\u009b\1\73\1\uffff\1\u009d\2\73\1\u00a0\1\u00a1\2\73\1\u00a4\2\uffff\4\73\1\uffff\5\73\1\uffff\1\73\1\uffff\1\73\1\u00b0\2\uffff\2\73\1\uffff\4\73\1\u00b8\1\u00b9\1\u00ba\1\u00bb\1\u00bc\1\73\1\u00be\1\uffff\5\73\1\u00c4\1\73\5\uffff\1\73\1\uffff\2\73\1\u00c9\1\u00ca\1\73\1\uffff\4\73\2\uffff\2\73\1\u00d2\2\73\1\u00d5\1\73\1\uffff\1\u00d7\1\u00d8\1\uffff\1\u00d9\3\uffff";
     static final String DFA14_eofS =
         "\u00da\uffff";
     static final String DFA14_minS =
-        "\1\0\4\75\1\uffff\1\76\1\uffff\1\52\1\141\2\145\1\154\1\145\1\141"+
-        "\1\150\1\157\1\151\2\145\1\72\3\uffff\1\146\1\uffff\1\145\1\uffff"+
-        "\1\60\1\uffff\1\174\1\114\2\uffff\1\46\1\56\1\101\1\uffff\2\0\21"+
-        "\uffff\1\154\1\163\1\uffff\1\154\1\162\1\151\1\152\1\151\1\163\1"+
-        "\164\1\167\1\154\1\162\1\154\1\165\1\145\1\160\1\154\1\163\2\164"+
-        "\5\uffff\1\60\1\160\1\uffff\1\146\6\uffff\1\117\4\uffff\1\56\2\uffff"+
-        "\1\154\2\145\2\164\1\145\1\163\1\145\1\105\1\60\1\154\1\101\1\163"+
-        "\1\145\1\156\1\145\1\154\1\164\2\60\1\uffff\1\154\1\141\1\102\1"+
-        "\145\1\60\1\143\1\102\2\143\1\164\1\60\1\170\1\uffff\1\60\1\154"+
-        "\1\145\2\60\1\123\1\145\1\60\2\uffff\1\151\1\165\1\101\1\143\1\uffff"+
-        "\1\164\1\171\1\150\1\164\1\163\1\uffff\1\151\1\uffff\1\154\1\60"+
-        "\2\uffff\1\145\1\143\1\uffff\1\145\1\154\1\114\1\164\5\60\1\163"+
-        "\1\60\1\uffff\1\154\1\164\1\163\1\164\1\126\1\60\1\151\5\uffff\1"+
-        "\164\1\uffff\1\145\1\151\2\60\1\101\1\uffff\1\162\1\163\1\143\1"+
-        "\157\2\uffff\1\122\1\163\1\60\1\164\1\156\1\60\1\164\1\uffff\2\60"+
-        "\1\uffff\1\60\3\uffff";
+        "\1\0\4\75\1\uffff\1\76\1\uffff\1\52\1\141\2\145\1\154\1\145\1\141\1\150\1\157\1\151\2\145\1\72\3\uffff\1\146\1\uffff\1\145\1\uffff\1\60\1\uffff\1\174\1\114\2\uffff\1\46\1\56\1\101\1\uffff\2\0\21\uffff\1\154\1\163\1\uffff\1\154\1\162\1\151\1\152\1\151\1\163\1\164\1\167\1\154\1\162\1\154\1\165\1\145\1\160\1\154\1\163\2\164\5\uffff\1\60\1\160\1\uffff\1\146\6\uffff\1\117\4\uffff\1\56\2\uffff\1\154\2\145\2\164\1\145\1\163\1\145\1\105\1\60\1\154\1\101\1\163\1\145\1\156\1\145\1\154\1\164\2\60\1\uffff\1\154\1\141\1\102\1\145\1\60\1\143\1\102\2\143\1\164\1\60\1\170\1\uffff\1\60\1\154\1\145\2\60\1\123\1\145\1\60\2\uffff\1\151\1\165\1\101\1\143\1\uffff\1\164\1\171\1\150\1\164\1\163\1\uffff\1\151\1\uffff\1\154\1\60\2\uffff\1\145\1\143\1\uffff\1\145\1\154\1\114\1\164\5\60\1\163\1\60\1\uffff\1\154\1\164\1\163\1\164\1\126\1\60\1\151\5\uffff\1\164\1\uffff\1\145\1\151\2\60\1\101\1\uffff\1\162\1\163\1\143\1\157\2\uffff\1\122\1\163\1\60\1\164\1\156\1\60\1\164\1\uffff\2\60\1\uffff\1\60\3\uffff";
     static final String DFA14_maxS =
-        "\1\uffff\4\75\1\uffff\1\76\1\uffff\1\57\1\157\1\167\1\145\1\170"+
-        "\1\165\1\157\1\171\1\157\1\151\2\145\1\72\3\uffff\1\155\1\uffff"+
-        "\1\145\1\uffff\1\71\1\uffff\1\174\1\114\2\uffff\1\46\1\71\1\172"+
-        "\1\uffff\2\uffff\21\uffff\1\154\1\163\1\uffff\1\154\1\162\1\151"+
-        "\1\152\1\151\1\163\1\164\1\167\1\154\1\162\1\154\1\165\1\145\1\160"+
-        "\1\154\1\163\2\164\5\uffff\1\172\1\160\1\uffff\1\146\6\uffff\1\117"+
-        "\4\uffff\1\71\2\uffff\1\154\2\145\2\164\1\145\1\163\1\145\1\105"+
-        "\1\172\1\154\1\101\1\163\1\145\1\156\1\145\1\154\1\164\2\172\1\uffff"+
-        "\1\154\1\141\1\102\1\145\1\172\1\143\1\102\2\143\1\164\1\172\1\170"+
-        "\1\uffff\1\172\1\154\1\145\2\172\1\123\1\145\1\172\2\uffff\1\151"+
-        "\1\165\1\101\1\143\1\uffff\1\164\1\171\1\150\1\164\1\163\1\uffff"+
-        "\1\151\1\uffff\1\154\1\172\2\uffff\1\145\1\143\1\uffff\1\145\1\154"+
-        "\1\114\1\164\5\172\1\163\1\172\1\uffff\1\154\1\164\1\163\1\164\1"+
-        "\126\1\172\1\151\5\uffff\1\164\1\uffff\1\145\1\151\2\172\1\101\1"+
-        "\uffff\1\162\1\163\1\143\1\157\2\uffff\1\122\1\163\1\172\1\164\1"+
-        "\156\1\172\1\164\1\uffff\2\172\1\uffff\1\172\3\uffff";
+        "\1\uffff\4\75\1\uffff\1\76\1\uffff\1\57\1\157\1\167\1\145\1\170\1\165\1\157\1\171\1\157\1\151\2\145\1\72\3\uffff\1\155\1\uffff\1\145\1\uffff\1\71\1\uffff\1\174\1\114\2\uffff\1\46\1\71\1\172\1\uffff\2\uffff\21\uffff\1\154\1\163\1\uffff\1\154\1\162\1\151\1\152\1\151\1\163\1\164\1\167\1\154\1\162\1\154\1\165\1\145\1\160\1\154\1\163\2\164\5\uffff\1\172\1\160\1\uffff\1\146\6\uffff\1\117\4\uffff\1\71\2\uffff\1\154\2\145\2\164\1\145\1\163\1\145\1\105\1\172\1\154\1\101\1\163\1\145\1\156\1\145\1\154\1\164\2\172\1\uffff\1\154\1\141\1\102\1\145\1\172\1\143\1\102\2\143\1\164\1\172\1\170\1\uffff\1\172\1\154\1\145\2\172\1\123\1\145\1\172\2\uffff\1\151\1\165\1\101\1\143\1\uffff\1\164\1\171\1\150\1\164\1\163\1\uffff\1\151\1\uffff\1\154\1\172\2\uffff\1\145\1\143\1\uffff\1\145\1\154\1\114\1\164\5\172\1\163\1\172\1\uffff\1\154\1\164\1\163\1\164\1\126\1\172\1\151\5\uffff\1\164\1\uffff\1\145\1\151\2\172\1\101\1\uffff\1\162\1\163\1\143\1\157\2\uffff\1\122\1\163\1\172\1\164\1\156\1\172\1\164\1\uffff\2\172\1\uffff\1\172\3\uffff";
     static final String DFA14_acceptS =
-        "\5\uffff\1\7\1\uffff\1\11\15\uffff\1\34\1\35\1\37\1\uffff\1\44"+
-        "\1\uffff\1\46\1\uffff\1\51\2\uffff\1\55\1\56\3\uffff\1\66\2\uffff"+
-        "\1\73\1\74\1\1\1\32\1\2\1\13\1\3\1\5\1\4\1\6\1\7\1\36\1\10\1\11"+
-        "\1\71\1\72\1\12\2\uffff\1\66\22\uffff\1\57\1\33\1\34\1\35\1\37\2"+
-        "\uffff\1\44\1\uffff\1\46\1\50\1\65\1\51\1\60\1\52\1\uffff\1\55\1"+
-        "\56\1\61\1\67\1\uffff\1\70\1\73\24\uffff\1\40\14\uffff\1\54\10\uffff"+
-        "\1\30\1\31\4\uffff\1\47\5\uffff\1\42\1\uffff\1\64\2\uffff\1\24\1"+
-        "\41\2\uffff\1\27\13\uffff\1\25\7\uffff\1\15\1\22\1\43\1\17\1\20"+
-        "\1\uffff\1\23\5\uffff\1\14\4\uffff\1\62\1\45\7\uffff\1\21\2\uffff"+
-        "\1\53\1\uffff\1\63\1\26\1\16";
+        "\5\uffff\1\7\1\uffff\1\11\15\uffff\1\34\1\35\1\37\1\uffff\1\44\1\uffff\1\46\1\uffff\1\51\2\uffff\1\55\1\56\3\uffff\1\66\2\uffff\1\73\1\74\1\1\1\32\1\2\1\13\1\3\1\5\1\4\1\6\1\7\1\36\1\10\1\11\1\71\1\72\1\12\2\uffff\1\66\22\uffff\1\57\1\33\1\34\1\35\1\37\2\uffff\1\44\1\uffff\1\46\1\50\1\65\1\51\1\60\1\52\1\uffff\1\55\1\56\1\61\1\67\1\uffff\1\70\1\73\24\uffff\1\40\14\uffff\1\54\10\uffff\1\30\1\31\4\uffff\1\47\5\uffff\1\42\1\uffff\1\64\2\uffff\1\24\1\41\2\uffff\1\27\13\uffff\1\25\7\uffff\1\15\1\22\1\43\1\17\1\20\1\uffff\1\23\5\uffff\1\14\4\uffff\1\62\1\45\7\uffff\1\21\2\uffff\1\53\1\uffff\1\63\1\26\1\16";
     static final String DFA14_specialS =
         "\1\0\45\uffff\1\1\1\2\u00b2\uffff}>";
     static final String[] DFA14_transitionS = {
-            "\11\51\2\50\2\51\1\50\22\51\1\50\1\2\1\46\3\51\1\42\1\47\1"+
-            "\25\1\26\1\7\1\5\1\35\1\6\1\34\1\10\12\43\1\24\1\51\1\4\1\1"+
-            "\1\3\1\27\1\51\2\45\1\20\3\45\1\37\4\45\1\21\6\45\1\22\7\45"+
-            "\1\40\1\51\1\41\1\44\1\45\1\51\2\45\1\11\1\32\1\14\1\16\2\45"+
-            "\1\30\2\45\1\23\1\45\1\15\3\45\1\13\1\12\1\17\6\45\1\31\1\36"+
-            "\1\33\uff82\51",
+            "\11\51\2\50\2\51\1\50\22\51\1\50\1\2\1\46\3\51\1\42\1\47\1\25\1\26\1\7\1\5\1\35\1\6\1\34\1\10\12\43\1\24\1\51\1\4\1\1\1\3\1\27\1\51\2\45\1\20\3\45\1\37\4\45\1\21\6\45\1\22\7\45\1\40\1\51\1\41\1\44\1\45\1\51\2\45\1\11\1\32\1\14\1\16\2\45\1\30\2\45\1\23\1\45\1\15\3\45\1\13\1\12\1\17\6\45\1\31\1\36\1\33\uff82\51",
             "\1\52",
             "\1\54",
             "\1\56",
@@ -2396,8 +2342,7 @@ public void mTokens() throws RecognitionException {
             "\1\u00b4",
             "\1\u00b5",
             "\1\u00b6",
-            "\12\73\7\uffff\5\73\1\u00b7\24\73\4\uffff\1\73\1\uffff\32"+
-            "\73",
+            "\12\73\7\uffff\5\73\1\u00b7\24\73\4\uffff\1\73\1\uffff\32\73",
             "\12\73\7\uffff\32\73\4\uffff\1\73\1\uffff\32\73",
             "\12\73\7\uffff\32\73\4\uffff\1\73\1\uffff\32\73",
             "\12\73\7\uffff\32\73\4\uffff\1\73\1\uffff\32\73",
diff --git a/com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpressionParser.java b/com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpressionParser.java
index 352f6a273..58170150c 100644
--- a/com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpressionParser.java
+++ b/com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpressionParser.java
@@ -101,7 +101,7 @@ public InternalExpressionParser(TokenStream input, RecognizerSharedState state)
         
 
     public String[] getTokenNames() { return InternalExpressionParser.tokenNames; }
-    public String getGrammarFileName() { return "../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g"; }
+    public String getGrammarFileName() { return "InternalExpression.g"; }
 
 
      
@@ -125,16 +125,16 @@ protected String getValueForTokenName(String tokenName) {
 
 
     // $ANTLR start "entryRuleExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:61:1: entryRuleExpression : ruleExpression EOF ;
+    // InternalExpression.g:61:1: entryRuleExpression : ruleExpression EOF ;
     public final void entryRuleExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:62:1: ( ruleExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:63:1: ruleExpression EOF
+            // InternalExpression.g:62:1: ( ruleExpression EOF )
+            // InternalExpression.g:63:1: ruleExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_entryRuleExpression67);
+            pushFollow(FOLLOW_1);
             ruleExpression();
 
             state._fsp--;
@@ -142,7 +142,7 @@ public final void entryRuleExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleExpression74); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -159,25 +159,25 @@ public final void entryRuleExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:70:1: ruleExpression : ( ( rule__Expression__Alternatives ) ) ;
+    // InternalExpression.g:70:1: ruleExpression : ( ( rule__Expression__Alternatives ) ) ;
     public final void ruleExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:74:2: ( ( ( rule__Expression__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:75:1: ( ( rule__Expression__Alternatives ) )
+            // InternalExpression.g:74:2: ( ( ( rule__Expression__Alternatives ) ) )
+            // InternalExpression.g:75:1: ( ( rule__Expression__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:75:1: ( ( rule__Expression__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:76:1: ( rule__Expression__Alternatives )
+            // InternalExpression.g:75:1: ( ( rule__Expression__Alternatives ) )
+            // InternalExpression.g:76:1: ( rule__Expression__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExpressionAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:77:1: ( rule__Expression__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:77:2: rule__Expression__Alternatives
+            // InternalExpression.g:77:1: ( rule__Expression__Alternatives )
+            // InternalExpression.g:77:2: rule__Expression__Alternatives
             {
-            pushFollow(FOLLOW_rule__Expression__Alternatives_in_ruleExpression100);
+            pushFollow(FOLLOW_2);
             rule__Expression__Alternatives();
 
             state._fsp--;
@@ -210,16 +210,16 @@ public final void ruleExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleLetExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:91:1: entryRuleLetExpression : ruleLetExpression EOF ;
+    // InternalExpression.g:91:1: entryRuleLetExpression : ruleLetExpression EOF ;
     public final void entryRuleLetExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:92:1: ( ruleLetExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:93:1: ruleLetExpression EOF
+            // InternalExpression.g:92:1: ( ruleLetExpression EOF )
+            // InternalExpression.g:93:1: ruleLetExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLetExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleLetExpression_in_entryRuleLetExpression129);
+            pushFollow(FOLLOW_1);
             ruleLetExpression();
 
             state._fsp--;
@@ -227,7 +227,7 @@ public final void entryRuleLetExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getLetExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleLetExpression136); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -244,25 +244,25 @@ public final void entryRuleLetExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleLetExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:100:1: ruleLetExpression : ( ( rule__LetExpression__Group__0 ) ) ;
+    // InternalExpression.g:100:1: ruleLetExpression : ( ( rule__LetExpression__Group__0 ) ) ;
     public final void ruleLetExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:104:2: ( ( ( rule__LetExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:105:1: ( ( rule__LetExpression__Group__0 ) )
+            // InternalExpression.g:104:2: ( ( ( rule__LetExpression__Group__0 ) ) )
+            // InternalExpression.g:105:1: ( ( rule__LetExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:105:1: ( ( rule__LetExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:106:1: ( rule__LetExpression__Group__0 )
+            // InternalExpression.g:105:1: ( ( rule__LetExpression__Group__0 ) )
+            // InternalExpression.g:106:1: ( rule__LetExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLetExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:107:1: ( rule__LetExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:107:2: rule__LetExpression__Group__0
+            // InternalExpression.g:107:1: ( rule__LetExpression__Group__0 )
+            // InternalExpression.g:107:2: rule__LetExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__LetExpression__Group__0_in_ruleLetExpression162);
+            pushFollow(FOLLOW_2);
             rule__LetExpression__Group__0();
 
             state._fsp--;
@@ -295,16 +295,16 @@ public final void ruleLetExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleCastedExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:119:1: entryRuleCastedExpression : ruleCastedExpression EOF ;
+    // InternalExpression.g:119:1: entryRuleCastedExpression : ruleCastedExpression EOF ;
     public final void entryRuleCastedExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:120:1: ( ruleCastedExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:121:1: ruleCastedExpression EOF
+            // InternalExpression.g:120:1: ( ruleCastedExpression EOF )
+            // InternalExpression.g:121:1: ruleCastedExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCastedExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleCastedExpression_in_entryRuleCastedExpression189);
+            pushFollow(FOLLOW_1);
             ruleCastedExpression();
 
             state._fsp--;
@@ -312,7 +312,7 @@ public final void entryRuleCastedExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCastedExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleCastedExpression196); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -329,25 +329,25 @@ public final void entryRuleCastedExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleCastedExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:128:1: ruleCastedExpression : ( ( rule__CastedExpression__Group__0 ) ) ;
+    // InternalExpression.g:128:1: ruleCastedExpression : ( ( rule__CastedExpression__Group__0 ) ) ;
     public final void ruleCastedExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:132:2: ( ( ( rule__CastedExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:133:1: ( ( rule__CastedExpression__Group__0 ) )
+            // InternalExpression.g:132:2: ( ( ( rule__CastedExpression__Group__0 ) ) )
+            // InternalExpression.g:133:1: ( ( rule__CastedExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:133:1: ( ( rule__CastedExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:134:1: ( rule__CastedExpression__Group__0 )
+            // InternalExpression.g:133:1: ( ( rule__CastedExpression__Group__0 ) )
+            // InternalExpression.g:134:1: ( rule__CastedExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCastedExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:135:1: ( rule__CastedExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:135:2: rule__CastedExpression__Group__0
+            // InternalExpression.g:135:1: ( rule__CastedExpression__Group__0 )
+            // InternalExpression.g:135:2: rule__CastedExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__CastedExpression__Group__0_in_ruleCastedExpression222);
+            pushFollow(FOLLOW_2);
             rule__CastedExpression__Group__0();
 
             state._fsp--;
@@ -380,16 +380,16 @@ public final void ruleCastedExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleChainExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:147:1: entryRuleChainExpression : ruleChainExpression EOF ;
+    // InternalExpression.g:147:1: entryRuleChainExpression : ruleChainExpression EOF ;
     public final void entryRuleChainExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:148:1: ( ruleChainExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:149:1: ruleChainExpression EOF
+            // InternalExpression.g:148:1: ( ruleChainExpression EOF )
+            // InternalExpression.g:149:1: ruleChainExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getChainExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleChainExpression_in_entryRuleChainExpression249);
+            pushFollow(FOLLOW_1);
             ruleChainExpression();
 
             state._fsp--;
@@ -397,7 +397,7 @@ public final void entryRuleChainExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getChainExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleChainExpression256); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -414,25 +414,25 @@ public final void entryRuleChainExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleChainExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:156:1: ruleChainExpression : ( ( rule__ChainExpression__Group__0 ) ) ;
+    // InternalExpression.g:156:1: ruleChainExpression : ( ( rule__ChainExpression__Group__0 ) ) ;
     public final void ruleChainExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:160:2: ( ( ( rule__ChainExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:161:1: ( ( rule__ChainExpression__Group__0 ) )
+            // InternalExpression.g:160:2: ( ( ( rule__ChainExpression__Group__0 ) ) )
+            // InternalExpression.g:161:1: ( ( rule__ChainExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:161:1: ( ( rule__ChainExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:162:1: ( rule__ChainExpression__Group__0 )
+            // InternalExpression.g:161:1: ( ( rule__ChainExpression__Group__0 ) )
+            // InternalExpression.g:162:1: ( rule__ChainExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getChainExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:163:1: ( rule__ChainExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:163:2: rule__ChainExpression__Group__0
+            // InternalExpression.g:163:1: ( rule__ChainExpression__Group__0 )
+            // InternalExpression.g:163:2: rule__ChainExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__ChainExpression__Group__0_in_ruleChainExpression282);
+            pushFollow(FOLLOW_2);
             rule__ChainExpression__Group__0();
 
             state._fsp--;
@@ -465,16 +465,16 @@ public final void ruleChainExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleChainedExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:175:1: entryRuleChainedExpression : ruleChainedExpression EOF ;
+    // InternalExpression.g:175:1: entryRuleChainedExpression : ruleChainedExpression EOF ;
     public final void entryRuleChainedExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:176:1: ( ruleChainedExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:177:1: ruleChainedExpression EOF
+            // InternalExpression.g:176:1: ( ruleChainedExpression EOF )
+            // InternalExpression.g:177:1: ruleChainedExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getChainedExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleChainedExpression_in_entryRuleChainedExpression309);
+            pushFollow(FOLLOW_1);
             ruleChainedExpression();
 
             state._fsp--;
@@ -482,7 +482,7 @@ public final void entryRuleChainedExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getChainedExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleChainedExpression316); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -499,25 +499,25 @@ public final void entryRuleChainedExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleChainedExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:184:1: ruleChainedExpression : ( ( rule__ChainedExpression__Alternatives ) ) ;
+    // InternalExpression.g:184:1: ruleChainedExpression : ( ( rule__ChainedExpression__Alternatives ) ) ;
     public final void ruleChainedExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:188:2: ( ( ( rule__ChainedExpression__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:189:1: ( ( rule__ChainedExpression__Alternatives ) )
+            // InternalExpression.g:188:2: ( ( ( rule__ChainedExpression__Alternatives ) ) )
+            // InternalExpression.g:189:1: ( ( rule__ChainedExpression__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:189:1: ( ( rule__ChainedExpression__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:190:1: ( rule__ChainedExpression__Alternatives )
+            // InternalExpression.g:189:1: ( ( rule__ChainedExpression__Alternatives ) )
+            // InternalExpression.g:190:1: ( rule__ChainedExpression__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getChainedExpressionAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:191:1: ( rule__ChainedExpression__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:191:2: rule__ChainedExpression__Alternatives
+            // InternalExpression.g:191:1: ( rule__ChainedExpression__Alternatives )
+            // InternalExpression.g:191:2: rule__ChainedExpression__Alternatives
             {
-            pushFollow(FOLLOW_rule__ChainedExpression__Alternatives_in_ruleChainedExpression342);
+            pushFollow(FOLLOW_2);
             rule__ChainedExpression__Alternatives();
 
             state._fsp--;
@@ -550,16 +550,16 @@ public final void ruleChainedExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleIfExpressionTri"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:203:1: entryRuleIfExpressionTri : ruleIfExpressionTri EOF ;
+    // InternalExpression.g:203:1: entryRuleIfExpressionTri : ruleIfExpressionTri EOF ;
     public final void entryRuleIfExpressionTri() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:204:1: ( ruleIfExpressionTri EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:205:1: ruleIfExpressionTri EOF
+            // InternalExpression.g:204:1: ( ruleIfExpressionTri EOF )
+            // InternalExpression.g:205:1: ruleIfExpressionTri EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionTriRule()); 
             }
-            pushFollow(FOLLOW_ruleIfExpressionTri_in_entryRuleIfExpressionTri369);
+            pushFollow(FOLLOW_1);
             ruleIfExpressionTri();
 
             state._fsp--;
@@ -567,7 +567,7 @@ public final void entryRuleIfExpressionTri() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIfExpressionTriRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIfExpressionTri376); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -584,25 +584,25 @@ public final void entryRuleIfExpressionTri() throws RecognitionException {
 
 
     // $ANTLR start "ruleIfExpressionTri"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:212:1: ruleIfExpressionTri : ( ( rule__IfExpressionTri__Group__0 ) ) ;
+    // InternalExpression.g:212:1: ruleIfExpressionTri : ( ( rule__IfExpressionTri__Group__0 ) ) ;
     public final void ruleIfExpressionTri() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:216:2: ( ( ( rule__IfExpressionTri__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:217:1: ( ( rule__IfExpressionTri__Group__0 ) )
+            // InternalExpression.g:216:2: ( ( ( rule__IfExpressionTri__Group__0 ) ) )
+            // InternalExpression.g:217:1: ( ( rule__IfExpressionTri__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:217:1: ( ( rule__IfExpressionTri__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:218:1: ( rule__IfExpressionTri__Group__0 )
+            // InternalExpression.g:217:1: ( ( rule__IfExpressionTri__Group__0 ) )
+            // InternalExpression.g:218:1: ( rule__IfExpressionTri__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionTriAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:219:1: ( rule__IfExpressionTri__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:219:2: rule__IfExpressionTri__Group__0
+            // InternalExpression.g:219:1: ( rule__IfExpressionTri__Group__0 )
+            // InternalExpression.g:219:2: rule__IfExpressionTri__Group__0
             {
-            pushFollow(FOLLOW_rule__IfExpressionTri__Group__0_in_ruleIfExpressionTri402);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionTri__Group__0();
 
             state._fsp--;
@@ -635,16 +635,16 @@ public final void ruleIfExpressionTri() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleIfExpressionKw"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:231:1: entryRuleIfExpressionKw : ruleIfExpressionKw EOF ;
+    // InternalExpression.g:231:1: entryRuleIfExpressionKw : ruleIfExpressionKw EOF ;
     public final void entryRuleIfExpressionKw() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:232:1: ( ruleIfExpressionKw EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:233:1: ruleIfExpressionKw EOF
+            // InternalExpression.g:232:1: ( ruleIfExpressionKw EOF )
+            // InternalExpression.g:233:1: ruleIfExpressionKw EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionKwRule()); 
             }
-            pushFollow(FOLLOW_ruleIfExpressionKw_in_entryRuleIfExpressionKw429);
+            pushFollow(FOLLOW_1);
             ruleIfExpressionKw();
 
             state._fsp--;
@@ -652,7 +652,7 @@ public final void entryRuleIfExpressionKw() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIfExpressionKwRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIfExpressionKw436); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -669,25 +669,25 @@ public final void entryRuleIfExpressionKw() throws RecognitionException {
 
 
     // $ANTLR start "ruleIfExpressionKw"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:240:1: ruleIfExpressionKw : ( ( rule__IfExpressionKw__Group__0 ) ) ;
+    // InternalExpression.g:240:1: ruleIfExpressionKw : ( ( rule__IfExpressionKw__Group__0 ) ) ;
     public final void ruleIfExpressionKw() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:244:2: ( ( ( rule__IfExpressionKw__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:245:1: ( ( rule__IfExpressionKw__Group__0 ) )
+            // InternalExpression.g:244:2: ( ( ( rule__IfExpressionKw__Group__0 ) ) )
+            // InternalExpression.g:245:1: ( ( rule__IfExpressionKw__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:245:1: ( ( rule__IfExpressionKw__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:246:1: ( rule__IfExpressionKw__Group__0 )
+            // InternalExpression.g:245:1: ( ( rule__IfExpressionKw__Group__0 ) )
+            // InternalExpression.g:246:1: ( rule__IfExpressionKw__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionKwAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:247:1: ( rule__IfExpressionKw__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:247:2: rule__IfExpressionKw__Group__0
+            // InternalExpression.g:247:1: ( rule__IfExpressionKw__Group__0 )
+            // InternalExpression.g:247:2: rule__IfExpressionKw__Group__0
             {
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group__0_in_ruleIfExpressionKw462);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionKw__Group__0();
 
             state._fsp--;
@@ -720,16 +720,16 @@ public final void ruleIfExpressionKw() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleSwitchExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:259:1: entryRuleSwitchExpression : ruleSwitchExpression EOF ;
+    // InternalExpression.g:259:1: entryRuleSwitchExpression : ruleSwitchExpression EOF ;
     public final void entryRuleSwitchExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:260:1: ( ruleSwitchExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:261:1: ruleSwitchExpression EOF
+            // InternalExpression.g:260:1: ( ruleSwitchExpression EOF )
+            // InternalExpression.g:261:1: ruleSwitchExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleSwitchExpression_in_entryRuleSwitchExpression489);
+            pushFollow(FOLLOW_1);
             ruleSwitchExpression();
 
             state._fsp--;
@@ -737,7 +737,7 @@ public final void entryRuleSwitchExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSwitchExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSwitchExpression496); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -754,25 +754,25 @@ public final void entryRuleSwitchExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleSwitchExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:268:1: ruleSwitchExpression : ( ( rule__SwitchExpression__Group__0 ) ) ;
+    // InternalExpression.g:268:1: ruleSwitchExpression : ( ( rule__SwitchExpression__Group__0 ) ) ;
     public final void ruleSwitchExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:272:2: ( ( ( rule__SwitchExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:273:1: ( ( rule__SwitchExpression__Group__0 ) )
+            // InternalExpression.g:272:2: ( ( ( rule__SwitchExpression__Group__0 ) ) )
+            // InternalExpression.g:273:1: ( ( rule__SwitchExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:273:1: ( ( rule__SwitchExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:274:1: ( rule__SwitchExpression__Group__0 )
+            // InternalExpression.g:273:1: ( ( rule__SwitchExpression__Group__0 ) )
+            // InternalExpression.g:274:1: ( rule__SwitchExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:275:1: ( rule__SwitchExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:275:2: rule__SwitchExpression__Group__0
+            // InternalExpression.g:275:1: ( rule__SwitchExpression__Group__0 )
+            // InternalExpression.g:275:2: rule__SwitchExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__0_in_ruleSwitchExpression522);
+            pushFollow(FOLLOW_2);
             rule__SwitchExpression__Group__0();
 
             state._fsp--;
@@ -805,16 +805,16 @@ public final void ruleSwitchExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleCase"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:287:1: entryRuleCase : ruleCase EOF ;
+    // InternalExpression.g:287:1: entryRuleCase : ruleCase EOF ;
     public final void entryRuleCase() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:288:1: ( ruleCase EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:289:1: ruleCase EOF
+            // InternalExpression.g:288:1: ( ruleCase EOF )
+            // InternalExpression.g:289:1: ruleCase EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCaseRule()); 
             }
-            pushFollow(FOLLOW_ruleCase_in_entryRuleCase549);
+            pushFollow(FOLLOW_1);
             ruleCase();
 
             state._fsp--;
@@ -822,7 +822,7 @@ public final void entryRuleCase() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCaseRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleCase556); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -839,25 +839,25 @@ public final void entryRuleCase() throws RecognitionException {
 
 
     // $ANTLR start "ruleCase"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:296:1: ruleCase : ( ( rule__Case__Group__0 ) ) ;
+    // InternalExpression.g:296:1: ruleCase : ( ( rule__Case__Group__0 ) ) ;
     public final void ruleCase() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:300:2: ( ( ( rule__Case__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:301:1: ( ( rule__Case__Group__0 ) )
+            // InternalExpression.g:300:2: ( ( ( rule__Case__Group__0 ) ) )
+            // InternalExpression.g:301:1: ( ( rule__Case__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:301:1: ( ( rule__Case__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:302:1: ( rule__Case__Group__0 )
+            // InternalExpression.g:301:1: ( ( rule__Case__Group__0 ) )
+            // InternalExpression.g:302:1: ( rule__Case__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCaseAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:303:1: ( rule__Case__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:303:2: rule__Case__Group__0
+            // InternalExpression.g:303:1: ( rule__Case__Group__0 )
+            // InternalExpression.g:303:2: rule__Case__Group__0
             {
-            pushFollow(FOLLOW_rule__Case__Group__0_in_ruleCase582);
+            pushFollow(FOLLOW_2);
             rule__Case__Group__0();
 
             state._fsp--;
@@ -890,16 +890,16 @@ public final void ruleCase() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOrExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:315:1: entryRuleOrExpression : ruleOrExpression EOF ;
+    // InternalExpression.g:315:1: entryRuleOrExpression : ruleOrExpression EOF ;
     public final void entryRuleOrExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:316:1: ( ruleOrExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:317:1: ruleOrExpression EOF
+            // InternalExpression.g:316:1: ( ruleOrExpression EOF )
+            // InternalExpression.g:317:1: ruleOrExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOrExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleOrExpression_in_entryRuleOrExpression609);
+            pushFollow(FOLLOW_1);
             ruleOrExpression();
 
             state._fsp--;
@@ -907,7 +907,7 @@ public final void entryRuleOrExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOrExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOrExpression616); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -924,25 +924,25 @@ public final void entryRuleOrExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleOrExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:324:1: ruleOrExpression : ( ( rule__OrExpression__Group__0 ) ) ;
+    // InternalExpression.g:324:1: ruleOrExpression : ( ( rule__OrExpression__Group__0 ) ) ;
     public final void ruleOrExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:328:2: ( ( ( rule__OrExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:329:1: ( ( rule__OrExpression__Group__0 ) )
+            // InternalExpression.g:328:2: ( ( ( rule__OrExpression__Group__0 ) ) )
+            // InternalExpression.g:329:1: ( ( rule__OrExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:329:1: ( ( rule__OrExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:330:1: ( rule__OrExpression__Group__0 )
+            // InternalExpression.g:329:1: ( ( rule__OrExpression__Group__0 ) )
+            // InternalExpression.g:330:1: ( rule__OrExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOrExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:331:1: ( rule__OrExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:331:2: rule__OrExpression__Group__0
+            // InternalExpression.g:331:1: ( rule__OrExpression__Group__0 )
+            // InternalExpression.g:331:2: rule__OrExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__OrExpression__Group__0_in_ruleOrExpression642);
+            pushFollow(FOLLOW_2);
             rule__OrExpression__Group__0();
 
             state._fsp--;
@@ -975,16 +975,16 @@ public final void ruleOrExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleAndExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:343:1: entryRuleAndExpression : ruleAndExpression EOF ;
+    // InternalExpression.g:343:1: entryRuleAndExpression : ruleAndExpression EOF ;
     public final void entryRuleAndExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:344:1: ( ruleAndExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:345:1: ruleAndExpression EOF
+            // InternalExpression.g:344:1: ( ruleAndExpression EOF )
+            // InternalExpression.g:345:1: ruleAndExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAndExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleAndExpression_in_entryRuleAndExpression669);
+            pushFollow(FOLLOW_1);
             ruleAndExpression();
 
             state._fsp--;
@@ -992,7 +992,7 @@ public final void entryRuleAndExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getAndExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAndExpression676); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1009,25 +1009,25 @@ public final void entryRuleAndExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleAndExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:352:1: ruleAndExpression : ( ( rule__AndExpression__Group__0 ) ) ;
+    // InternalExpression.g:352:1: ruleAndExpression : ( ( rule__AndExpression__Group__0 ) ) ;
     public final void ruleAndExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:356:2: ( ( ( rule__AndExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:357:1: ( ( rule__AndExpression__Group__0 ) )
+            // InternalExpression.g:356:2: ( ( ( rule__AndExpression__Group__0 ) ) )
+            // InternalExpression.g:357:1: ( ( rule__AndExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:357:1: ( ( rule__AndExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:358:1: ( rule__AndExpression__Group__0 )
+            // InternalExpression.g:357:1: ( ( rule__AndExpression__Group__0 ) )
+            // InternalExpression.g:358:1: ( rule__AndExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAndExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:359:1: ( rule__AndExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:359:2: rule__AndExpression__Group__0
+            // InternalExpression.g:359:1: ( rule__AndExpression__Group__0 )
+            // InternalExpression.g:359:2: rule__AndExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__AndExpression__Group__0_in_ruleAndExpression702);
+            pushFollow(FOLLOW_2);
             rule__AndExpression__Group__0();
 
             state._fsp--;
@@ -1060,16 +1060,16 @@ public final void ruleAndExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleImpliesExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:371:1: entryRuleImpliesExpression : ruleImpliesExpression EOF ;
+    // InternalExpression.g:371:1: entryRuleImpliesExpression : ruleImpliesExpression EOF ;
     public final void entryRuleImpliesExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:372:1: ( ruleImpliesExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:373:1: ruleImpliesExpression EOF
+            // InternalExpression.g:372:1: ( ruleImpliesExpression EOF )
+            // InternalExpression.g:373:1: ruleImpliesExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImpliesExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleImpliesExpression_in_entryRuleImpliesExpression729);
+            pushFollow(FOLLOW_1);
             ruleImpliesExpression();
 
             state._fsp--;
@@ -1077,7 +1077,7 @@ public final void entryRuleImpliesExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getImpliesExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleImpliesExpression736); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1094,25 +1094,25 @@ public final void entryRuleImpliesExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleImpliesExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:380:1: ruleImpliesExpression : ( ( rule__ImpliesExpression__Group__0 ) ) ;
+    // InternalExpression.g:380:1: ruleImpliesExpression : ( ( rule__ImpliesExpression__Group__0 ) ) ;
     public final void ruleImpliesExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:384:2: ( ( ( rule__ImpliesExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:385:1: ( ( rule__ImpliesExpression__Group__0 ) )
+            // InternalExpression.g:384:2: ( ( ( rule__ImpliesExpression__Group__0 ) ) )
+            // InternalExpression.g:385:1: ( ( rule__ImpliesExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:385:1: ( ( rule__ImpliesExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:386:1: ( rule__ImpliesExpression__Group__0 )
+            // InternalExpression.g:385:1: ( ( rule__ImpliesExpression__Group__0 ) )
+            // InternalExpression.g:386:1: ( rule__ImpliesExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImpliesExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:387:1: ( rule__ImpliesExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:387:2: rule__ImpliesExpression__Group__0
+            // InternalExpression.g:387:1: ( rule__ImpliesExpression__Group__0 )
+            // InternalExpression.g:387:2: rule__ImpliesExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__ImpliesExpression__Group__0_in_ruleImpliesExpression762);
+            pushFollow(FOLLOW_2);
             rule__ImpliesExpression__Group__0();
 
             state._fsp--;
@@ -1145,16 +1145,16 @@ public final void ruleImpliesExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleRelationalExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:399:1: entryRuleRelationalExpression : ruleRelationalExpression EOF ;
+    // InternalExpression.g:399:1: entryRuleRelationalExpression : ruleRelationalExpression EOF ;
     public final void entryRuleRelationalExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:400:1: ( ruleRelationalExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:401:1: ruleRelationalExpression EOF
+            // InternalExpression.g:400:1: ( ruleRelationalExpression EOF )
+            // InternalExpression.g:401:1: ruleRelationalExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRelationalExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleRelationalExpression_in_entryRuleRelationalExpression789);
+            pushFollow(FOLLOW_1);
             ruleRelationalExpression();
 
             state._fsp--;
@@ -1162,7 +1162,7 @@ public final void entryRuleRelationalExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getRelationalExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRelationalExpression796); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1179,25 +1179,25 @@ public final void entryRuleRelationalExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleRelationalExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:408:1: ruleRelationalExpression : ( ( rule__RelationalExpression__Group__0 ) ) ;
+    // InternalExpression.g:408:1: ruleRelationalExpression : ( ( rule__RelationalExpression__Group__0 ) ) ;
     public final void ruleRelationalExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:412:2: ( ( ( rule__RelationalExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:413:1: ( ( rule__RelationalExpression__Group__0 ) )
+            // InternalExpression.g:412:2: ( ( ( rule__RelationalExpression__Group__0 ) ) )
+            // InternalExpression.g:413:1: ( ( rule__RelationalExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:413:1: ( ( rule__RelationalExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:414:1: ( rule__RelationalExpression__Group__0 )
+            // InternalExpression.g:413:1: ( ( rule__RelationalExpression__Group__0 ) )
+            // InternalExpression.g:414:1: ( rule__RelationalExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRelationalExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:415:1: ( rule__RelationalExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:415:2: rule__RelationalExpression__Group__0
+            // InternalExpression.g:415:1: ( rule__RelationalExpression__Group__0 )
+            // InternalExpression.g:415:2: rule__RelationalExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__RelationalExpression__Group__0_in_ruleRelationalExpression822);
+            pushFollow(FOLLOW_2);
             rule__RelationalExpression__Group__0();
 
             state._fsp--;
@@ -1230,16 +1230,16 @@ public final void ruleRelationalExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleAdditiveExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:427:1: entryRuleAdditiveExpression : ruleAdditiveExpression EOF ;
+    // InternalExpression.g:427:1: entryRuleAdditiveExpression : ruleAdditiveExpression EOF ;
     public final void entryRuleAdditiveExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:428:1: ( ruleAdditiveExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:429:1: ruleAdditiveExpression EOF
+            // InternalExpression.g:428:1: ( ruleAdditiveExpression EOF )
+            // InternalExpression.g:429:1: ruleAdditiveExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAdditiveExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleAdditiveExpression_in_entryRuleAdditiveExpression849);
+            pushFollow(FOLLOW_1);
             ruleAdditiveExpression();
 
             state._fsp--;
@@ -1247,7 +1247,7 @@ public final void entryRuleAdditiveExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getAdditiveExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAdditiveExpression856); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1264,25 +1264,25 @@ public final void entryRuleAdditiveExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleAdditiveExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:436:1: ruleAdditiveExpression : ( ( rule__AdditiveExpression__Group__0 ) ) ;
+    // InternalExpression.g:436:1: ruleAdditiveExpression : ( ( rule__AdditiveExpression__Group__0 ) ) ;
     public final void ruleAdditiveExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:440:2: ( ( ( rule__AdditiveExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:441:1: ( ( rule__AdditiveExpression__Group__0 ) )
+            // InternalExpression.g:440:2: ( ( ( rule__AdditiveExpression__Group__0 ) ) )
+            // InternalExpression.g:441:1: ( ( rule__AdditiveExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:441:1: ( ( rule__AdditiveExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:442:1: ( rule__AdditiveExpression__Group__0 )
+            // InternalExpression.g:441:1: ( ( rule__AdditiveExpression__Group__0 ) )
+            // InternalExpression.g:442:1: ( rule__AdditiveExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAdditiveExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:443:1: ( rule__AdditiveExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:443:2: rule__AdditiveExpression__Group__0
+            // InternalExpression.g:443:1: ( rule__AdditiveExpression__Group__0 )
+            // InternalExpression.g:443:2: rule__AdditiveExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__AdditiveExpression__Group__0_in_ruleAdditiveExpression882);
+            pushFollow(FOLLOW_2);
             rule__AdditiveExpression__Group__0();
 
             state._fsp--;
@@ -1315,16 +1315,16 @@ public final void ruleAdditiveExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleMultiplicativeExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:455:1: entryRuleMultiplicativeExpression : ruleMultiplicativeExpression EOF ;
+    // InternalExpression.g:455:1: entryRuleMultiplicativeExpression : ruleMultiplicativeExpression EOF ;
     public final void entryRuleMultiplicativeExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:456:1: ( ruleMultiplicativeExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:457:1: ruleMultiplicativeExpression EOF
+            // InternalExpression.g:456:1: ( ruleMultiplicativeExpression EOF )
+            // InternalExpression.g:457:1: ruleMultiplicativeExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMultiplicativeExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleMultiplicativeExpression_in_entryRuleMultiplicativeExpression909);
+            pushFollow(FOLLOW_1);
             ruleMultiplicativeExpression();
 
             state._fsp--;
@@ -1332,7 +1332,7 @@ public final void entryRuleMultiplicativeExpression() throws RecognitionExceptio
             if ( state.backtracking==0 ) {
                after(grammarAccess.getMultiplicativeExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleMultiplicativeExpression916); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1349,25 +1349,25 @@ public final void entryRuleMultiplicativeExpression() throws RecognitionExceptio
 
 
     // $ANTLR start "ruleMultiplicativeExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:464:1: ruleMultiplicativeExpression : ( ( rule__MultiplicativeExpression__Group__0 ) ) ;
+    // InternalExpression.g:464:1: ruleMultiplicativeExpression : ( ( rule__MultiplicativeExpression__Group__0 ) ) ;
     public final void ruleMultiplicativeExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:468:2: ( ( ( rule__MultiplicativeExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:469:1: ( ( rule__MultiplicativeExpression__Group__0 ) )
+            // InternalExpression.g:468:2: ( ( ( rule__MultiplicativeExpression__Group__0 ) ) )
+            // InternalExpression.g:469:1: ( ( rule__MultiplicativeExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:469:1: ( ( rule__MultiplicativeExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:470:1: ( rule__MultiplicativeExpression__Group__0 )
+            // InternalExpression.g:469:1: ( ( rule__MultiplicativeExpression__Group__0 ) )
+            // InternalExpression.g:470:1: ( rule__MultiplicativeExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMultiplicativeExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:471:1: ( rule__MultiplicativeExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:471:2: rule__MultiplicativeExpression__Group__0
+            // InternalExpression.g:471:1: ( rule__MultiplicativeExpression__Group__0 )
+            // InternalExpression.g:471:2: rule__MultiplicativeExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__MultiplicativeExpression__Group__0_in_ruleMultiplicativeExpression942);
+            pushFollow(FOLLOW_2);
             rule__MultiplicativeExpression__Group__0();
 
             state._fsp--;
@@ -1400,16 +1400,16 @@ public final void ruleMultiplicativeExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleUnaryOrInfixExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:483:1: entryRuleUnaryOrInfixExpression : ruleUnaryOrInfixExpression EOF ;
+    // InternalExpression.g:483:1: entryRuleUnaryOrInfixExpression : ruleUnaryOrInfixExpression EOF ;
     public final void entryRuleUnaryOrInfixExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:484:1: ( ruleUnaryOrInfixExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:485:1: ruleUnaryOrInfixExpression EOF
+            // InternalExpression.g:484:1: ( ruleUnaryOrInfixExpression EOF )
+            // InternalExpression.g:485:1: ruleUnaryOrInfixExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getUnaryOrInfixExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleUnaryOrInfixExpression_in_entryRuleUnaryOrInfixExpression969);
+            pushFollow(FOLLOW_1);
             ruleUnaryOrInfixExpression();
 
             state._fsp--;
@@ -1417,7 +1417,7 @@ public final void entryRuleUnaryOrInfixExpression() throws RecognitionException
             if ( state.backtracking==0 ) {
                after(grammarAccess.getUnaryOrInfixExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleUnaryOrInfixExpression976); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1434,25 +1434,25 @@ public final void entryRuleUnaryOrInfixExpression() throws RecognitionException
 
 
     // $ANTLR start "ruleUnaryOrInfixExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:492:1: ruleUnaryOrInfixExpression : ( ( rule__UnaryOrInfixExpression__Alternatives ) ) ;
+    // InternalExpression.g:492:1: ruleUnaryOrInfixExpression : ( ( rule__UnaryOrInfixExpression__Alternatives ) ) ;
     public final void ruleUnaryOrInfixExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:496:2: ( ( ( rule__UnaryOrInfixExpression__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:497:1: ( ( rule__UnaryOrInfixExpression__Alternatives ) )
+            // InternalExpression.g:496:2: ( ( ( rule__UnaryOrInfixExpression__Alternatives ) ) )
+            // InternalExpression.g:497:1: ( ( rule__UnaryOrInfixExpression__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:497:1: ( ( rule__UnaryOrInfixExpression__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:498:1: ( rule__UnaryOrInfixExpression__Alternatives )
+            // InternalExpression.g:497:1: ( ( rule__UnaryOrInfixExpression__Alternatives ) )
+            // InternalExpression.g:498:1: ( rule__UnaryOrInfixExpression__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getUnaryOrInfixExpressionAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:499:1: ( rule__UnaryOrInfixExpression__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:499:2: rule__UnaryOrInfixExpression__Alternatives
+            // InternalExpression.g:499:1: ( rule__UnaryOrInfixExpression__Alternatives )
+            // InternalExpression.g:499:2: rule__UnaryOrInfixExpression__Alternatives
             {
-            pushFollow(FOLLOW_rule__UnaryOrInfixExpression__Alternatives_in_ruleUnaryOrInfixExpression1002);
+            pushFollow(FOLLOW_2);
             rule__UnaryOrInfixExpression__Alternatives();
 
             state._fsp--;
@@ -1485,16 +1485,16 @@ public final void ruleUnaryOrInfixExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleUnaryExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:511:1: entryRuleUnaryExpression : ruleUnaryExpression EOF ;
+    // InternalExpression.g:511:1: entryRuleUnaryExpression : ruleUnaryExpression EOF ;
     public final void entryRuleUnaryExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:512:1: ( ruleUnaryExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:513:1: ruleUnaryExpression EOF
+            // InternalExpression.g:512:1: ( ruleUnaryExpression EOF )
+            // InternalExpression.g:513:1: ruleUnaryExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getUnaryExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleUnaryExpression_in_entryRuleUnaryExpression1029);
+            pushFollow(FOLLOW_1);
             ruleUnaryExpression();
 
             state._fsp--;
@@ -1502,7 +1502,7 @@ public final void entryRuleUnaryExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getUnaryExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleUnaryExpression1036); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1519,25 +1519,25 @@ public final void entryRuleUnaryExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleUnaryExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:520:1: ruleUnaryExpression : ( ( rule__UnaryExpression__Group__0 ) ) ;
+    // InternalExpression.g:520:1: ruleUnaryExpression : ( ( rule__UnaryExpression__Group__0 ) ) ;
     public final void ruleUnaryExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:524:2: ( ( ( rule__UnaryExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:525:1: ( ( rule__UnaryExpression__Group__0 ) )
+            // InternalExpression.g:524:2: ( ( ( rule__UnaryExpression__Group__0 ) ) )
+            // InternalExpression.g:525:1: ( ( rule__UnaryExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:525:1: ( ( rule__UnaryExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:526:1: ( rule__UnaryExpression__Group__0 )
+            // InternalExpression.g:525:1: ( ( rule__UnaryExpression__Group__0 ) )
+            // InternalExpression.g:526:1: ( rule__UnaryExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getUnaryExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:527:1: ( rule__UnaryExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:527:2: rule__UnaryExpression__Group__0
+            // InternalExpression.g:527:1: ( rule__UnaryExpression__Group__0 )
+            // InternalExpression.g:527:2: rule__UnaryExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__UnaryExpression__Group__0_in_ruleUnaryExpression1062);
+            pushFollow(FOLLOW_2);
             rule__UnaryExpression__Group__0();
 
             state._fsp--;
@@ -1570,16 +1570,16 @@ public final void ruleUnaryExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleInfixExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:539:1: entryRuleInfixExpression : ruleInfixExpression EOF ;
+    // InternalExpression.g:539:1: entryRuleInfixExpression : ruleInfixExpression EOF ;
     public final void entryRuleInfixExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:540:1: ( ruleInfixExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:541:1: ruleInfixExpression EOF
+            // InternalExpression.g:540:1: ( ruleInfixExpression EOF )
+            // InternalExpression.g:541:1: ruleInfixExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleInfixExpression_in_entryRuleInfixExpression1089);
+            pushFollow(FOLLOW_1);
             ruleInfixExpression();
 
             state._fsp--;
@@ -1587,7 +1587,7 @@ public final void entryRuleInfixExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInfixExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInfixExpression1096); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1604,25 +1604,25 @@ public final void entryRuleInfixExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleInfixExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:548:1: ruleInfixExpression : ( ( rule__InfixExpression__Group__0 ) ) ;
+    // InternalExpression.g:548:1: ruleInfixExpression : ( ( rule__InfixExpression__Group__0 ) ) ;
     public final void ruleInfixExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:552:2: ( ( ( rule__InfixExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:553:1: ( ( rule__InfixExpression__Group__0 ) )
+            // InternalExpression.g:552:2: ( ( ( rule__InfixExpression__Group__0 ) ) )
+            // InternalExpression.g:553:1: ( ( rule__InfixExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:553:1: ( ( rule__InfixExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:554:1: ( rule__InfixExpression__Group__0 )
+            // InternalExpression.g:553:1: ( ( rule__InfixExpression__Group__0 ) )
+            // InternalExpression.g:554:1: ( rule__InfixExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:555:1: ( rule__InfixExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:555:2: rule__InfixExpression__Group__0
+            // InternalExpression.g:555:1: ( rule__InfixExpression__Group__0 )
+            // InternalExpression.g:555:2: rule__InfixExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group__0_in_ruleInfixExpression1122);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group__0();
 
             state._fsp--;
@@ -1655,16 +1655,16 @@ public final void ruleInfixExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRulePrimaryExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:567:1: entryRulePrimaryExpression : rulePrimaryExpression EOF ;
+    // InternalExpression.g:567:1: entryRulePrimaryExpression : rulePrimaryExpression EOF ;
     public final void entryRulePrimaryExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:568:1: ( rulePrimaryExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:569:1: rulePrimaryExpression EOF
+            // InternalExpression.g:568:1: ( rulePrimaryExpression EOF )
+            // InternalExpression.g:569:1: rulePrimaryExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPrimaryExpressionRule()); 
             }
-            pushFollow(FOLLOW_rulePrimaryExpression_in_entryRulePrimaryExpression1149);
+            pushFollow(FOLLOW_1);
             rulePrimaryExpression();
 
             state._fsp--;
@@ -1672,7 +1672,7 @@ public final void entryRulePrimaryExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getPrimaryExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRulePrimaryExpression1156); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1689,25 +1689,25 @@ public final void entryRulePrimaryExpression() throws RecognitionException {
 
 
     // $ANTLR start "rulePrimaryExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:576:1: rulePrimaryExpression : ( ( rule__PrimaryExpression__Alternatives ) ) ;
+    // InternalExpression.g:576:1: rulePrimaryExpression : ( ( rule__PrimaryExpression__Alternatives ) ) ;
     public final void rulePrimaryExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:580:2: ( ( ( rule__PrimaryExpression__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:581:1: ( ( rule__PrimaryExpression__Alternatives ) )
+            // InternalExpression.g:580:2: ( ( ( rule__PrimaryExpression__Alternatives ) ) )
+            // InternalExpression.g:581:1: ( ( rule__PrimaryExpression__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:581:1: ( ( rule__PrimaryExpression__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:582:1: ( rule__PrimaryExpression__Alternatives )
+            // InternalExpression.g:581:1: ( ( rule__PrimaryExpression__Alternatives ) )
+            // InternalExpression.g:582:1: ( rule__PrimaryExpression__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPrimaryExpressionAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:583:1: ( rule__PrimaryExpression__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:583:2: rule__PrimaryExpression__Alternatives
+            // InternalExpression.g:583:1: ( rule__PrimaryExpression__Alternatives )
+            // InternalExpression.g:583:2: rule__PrimaryExpression__Alternatives
             {
-            pushFollow(FOLLOW_rule__PrimaryExpression__Alternatives_in_rulePrimaryExpression1182);
+            pushFollow(FOLLOW_2);
             rule__PrimaryExpression__Alternatives();
 
             state._fsp--;
@@ -1740,16 +1740,16 @@ public final void rulePrimaryExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleLiteral"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:595:1: entryRuleLiteral : ruleLiteral EOF ;
+    // InternalExpression.g:595:1: entryRuleLiteral : ruleLiteral EOF ;
     public final void entryRuleLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:596:1: ( ruleLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:597:1: ruleLiteral EOF
+            // InternalExpression.g:596:1: ( ruleLiteral EOF )
+            // InternalExpression.g:597:1: ruleLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleLiteral_in_entryRuleLiteral1209);
+            pushFollow(FOLLOW_1);
             ruleLiteral();
 
             state._fsp--;
@@ -1757,7 +1757,7 @@ public final void entryRuleLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleLiteral1216); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1774,25 +1774,25 @@ public final void entryRuleLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleLiteral"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:604:1: ruleLiteral : ( ( rule__Literal__Alternatives ) ) ;
+    // InternalExpression.g:604:1: ruleLiteral : ( ( rule__Literal__Alternatives ) ) ;
     public final void ruleLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:608:2: ( ( ( rule__Literal__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:609:1: ( ( rule__Literal__Alternatives ) )
+            // InternalExpression.g:608:2: ( ( ( rule__Literal__Alternatives ) ) )
+            // InternalExpression.g:609:1: ( ( rule__Literal__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:609:1: ( ( rule__Literal__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:610:1: ( rule__Literal__Alternatives )
+            // InternalExpression.g:609:1: ( ( rule__Literal__Alternatives ) )
+            // InternalExpression.g:610:1: ( rule__Literal__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLiteralAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:611:1: ( rule__Literal__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:611:2: rule__Literal__Alternatives
+            // InternalExpression.g:611:1: ( rule__Literal__Alternatives )
+            // InternalExpression.g:611:2: rule__Literal__Alternatives
             {
-            pushFollow(FOLLOW_rule__Literal__Alternatives_in_ruleLiteral1242);
+            pushFollow(FOLLOW_2);
             rule__Literal__Alternatives();
 
             state._fsp--;
@@ -1825,16 +1825,16 @@ public final void ruleLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleBooleanLiteral"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:623:1: entryRuleBooleanLiteral : ruleBooleanLiteral EOF ;
+    // InternalExpression.g:623:1: entryRuleBooleanLiteral : ruleBooleanLiteral EOF ;
     public final void entryRuleBooleanLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:624:1: ( ruleBooleanLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:625:1: ruleBooleanLiteral EOF
+            // InternalExpression.g:624:1: ( ruleBooleanLiteral EOF )
+            // InternalExpression.g:625:1: ruleBooleanLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getBooleanLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleBooleanLiteral_in_entryRuleBooleanLiteral1269);
+            pushFollow(FOLLOW_1);
             ruleBooleanLiteral();
 
             state._fsp--;
@@ -1842,7 +1842,7 @@ public final void entryRuleBooleanLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getBooleanLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleBooleanLiteral1276); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1859,25 +1859,25 @@ public final void entryRuleBooleanLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleBooleanLiteral"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:632:1: ruleBooleanLiteral : ( ( rule__BooleanLiteral__ValAssignment ) ) ;
+    // InternalExpression.g:632:1: ruleBooleanLiteral : ( ( rule__BooleanLiteral__ValAssignment ) ) ;
     public final void ruleBooleanLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:636:2: ( ( ( rule__BooleanLiteral__ValAssignment ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:637:1: ( ( rule__BooleanLiteral__ValAssignment ) )
+            // InternalExpression.g:636:2: ( ( ( rule__BooleanLiteral__ValAssignment ) ) )
+            // InternalExpression.g:637:1: ( ( rule__BooleanLiteral__ValAssignment ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:637:1: ( ( rule__BooleanLiteral__ValAssignment ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:638:1: ( rule__BooleanLiteral__ValAssignment )
+            // InternalExpression.g:637:1: ( ( rule__BooleanLiteral__ValAssignment ) )
+            // InternalExpression.g:638:1: ( rule__BooleanLiteral__ValAssignment )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getBooleanLiteralAccess().getValAssignment()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:639:1: ( rule__BooleanLiteral__ValAssignment )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:639:2: rule__BooleanLiteral__ValAssignment
+            // InternalExpression.g:639:1: ( rule__BooleanLiteral__ValAssignment )
+            // InternalExpression.g:639:2: rule__BooleanLiteral__ValAssignment
             {
-            pushFollow(FOLLOW_rule__BooleanLiteral__ValAssignment_in_ruleBooleanLiteral1302);
+            pushFollow(FOLLOW_2);
             rule__BooleanLiteral__ValAssignment();
 
             state._fsp--;
@@ -1910,16 +1910,16 @@ public final void ruleBooleanLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleIntegerLiteral"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:651:1: entryRuleIntegerLiteral : ruleIntegerLiteral EOF ;
+    // InternalExpression.g:651:1: entryRuleIntegerLiteral : ruleIntegerLiteral EOF ;
     public final void entryRuleIntegerLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:652:1: ( ruleIntegerLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:653:1: ruleIntegerLiteral EOF
+            // InternalExpression.g:652:1: ( ruleIntegerLiteral EOF )
+            // InternalExpression.g:653:1: ruleIntegerLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIntegerLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleIntegerLiteral_in_entryRuleIntegerLiteral1329);
+            pushFollow(FOLLOW_1);
             ruleIntegerLiteral();
 
             state._fsp--;
@@ -1927,7 +1927,7 @@ public final void entryRuleIntegerLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIntegerLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIntegerLiteral1336); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1944,25 +1944,25 @@ public final void entryRuleIntegerLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleIntegerLiteral"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:660:1: ruleIntegerLiteral : ( ( rule__IntegerLiteral__ValAssignment ) ) ;
+    // InternalExpression.g:660:1: ruleIntegerLiteral : ( ( rule__IntegerLiteral__ValAssignment ) ) ;
     public final void ruleIntegerLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:664:2: ( ( ( rule__IntegerLiteral__ValAssignment ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:665:1: ( ( rule__IntegerLiteral__ValAssignment ) )
+            // InternalExpression.g:664:2: ( ( ( rule__IntegerLiteral__ValAssignment ) ) )
+            // InternalExpression.g:665:1: ( ( rule__IntegerLiteral__ValAssignment ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:665:1: ( ( rule__IntegerLiteral__ValAssignment ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:666:1: ( rule__IntegerLiteral__ValAssignment )
+            // InternalExpression.g:665:1: ( ( rule__IntegerLiteral__ValAssignment ) )
+            // InternalExpression.g:666:1: ( rule__IntegerLiteral__ValAssignment )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIntegerLiteralAccess().getValAssignment()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:667:1: ( rule__IntegerLiteral__ValAssignment )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:667:2: rule__IntegerLiteral__ValAssignment
+            // InternalExpression.g:667:1: ( rule__IntegerLiteral__ValAssignment )
+            // InternalExpression.g:667:2: rule__IntegerLiteral__ValAssignment
             {
-            pushFollow(FOLLOW_rule__IntegerLiteral__ValAssignment_in_ruleIntegerLiteral1362);
+            pushFollow(FOLLOW_2);
             rule__IntegerLiteral__ValAssignment();
 
             state._fsp--;
@@ -1995,16 +1995,16 @@ public final void ruleIntegerLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleNullLiteral"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:679:1: entryRuleNullLiteral : ruleNullLiteral EOF ;
+    // InternalExpression.g:679:1: entryRuleNullLiteral : ruleNullLiteral EOF ;
     public final void entryRuleNullLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:680:1: ( ruleNullLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:681:1: ruleNullLiteral EOF
+            // InternalExpression.g:680:1: ( ruleNullLiteral EOF )
+            // InternalExpression.g:681:1: ruleNullLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNullLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleNullLiteral_in_entryRuleNullLiteral1389);
+            pushFollow(FOLLOW_1);
             ruleNullLiteral();
 
             state._fsp--;
@@ -2012,7 +2012,7 @@ public final void entryRuleNullLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getNullLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNullLiteral1396); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2029,25 +2029,25 @@ public final void entryRuleNullLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleNullLiteral"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:688:1: ruleNullLiteral : ( ( rule__NullLiteral__ValAssignment ) ) ;
+    // InternalExpression.g:688:1: ruleNullLiteral : ( ( rule__NullLiteral__ValAssignment ) ) ;
     public final void ruleNullLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:692:2: ( ( ( rule__NullLiteral__ValAssignment ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:693:1: ( ( rule__NullLiteral__ValAssignment ) )
+            // InternalExpression.g:692:2: ( ( ( rule__NullLiteral__ValAssignment ) ) )
+            // InternalExpression.g:693:1: ( ( rule__NullLiteral__ValAssignment ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:693:1: ( ( rule__NullLiteral__ValAssignment ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:694:1: ( rule__NullLiteral__ValAssignment )
+            // InternalExpression.g:693:1: ( ( rule__NullLiteral__ValAssignment ) )
+            // InternalExpression.g:694:1: ( rule__NullLiteral__ValAssignment )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNullLiteralAccess().getValAssignment()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:695:1: ( rule__NullLiteral__ValAssignment )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:695:2: rule__NullLiteral__ValAssignment
+            // InternalExpression.g:695:1: ( rule__NullLiteral__ValAssignment )
+            // InternalExpression.g:695:2: rule__NullLiteral__ValAssignment
             {
-            pushFollow(FOLLOW_rule__NullLiteral__ValAssignment_in_ruleNullLiteral1422);
+            pushFollow(FOLLOW_2);
             rule__NullLiteral__ValAssignment();
 
             state._fsp--;
@@ -2080,16 +2080,16 @@ public final void ruleNullLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleRealLiteral"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:707:1: entryRuleRealLiteral : ruleRealLiteral EOF ;
+    // InternalExpression.g:707:1: entryRuleRealLiteral : ruleRealLiteral EOF ;
     public final void entryRuleRealLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:708:1: ( ruleRealLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:709:1: ruleRealLiteral EOF
+            // InternalExpression.g:708:1: ( ruleRealLiteral EOF )
+            // InternalExpression.g:709:1: ruleRealLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRealLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleRealLiteral_in_entryRuleRealLiteral1449);
+            pushFollow(FOLLOW_1);
             ruleRealLiteral();
 
             state._fsp--;
@@ -2097,7 +2097,7 @@ public final void entryRuleRealLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getRealLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRealLiteral1456); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2114,25 +2114,25 @@ public final void entryRuleRealLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleRealLiteral"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:716:1: ruleRealLiteral : ( ( rule__RealLiteral__ValAssignment ) ) ;
+    // InternalExpression.g:716:1: ruleRealLiteral : ( ( rule__RealLiteral__ValAssignment ) ) ;
     public final void ruleRealLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:720:2: ( ( ( rule__RealLiteral__ValAssignment ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:721:1: ( ( rule__RealLiteral__ValAssignment ) )
+            // InternalExpression.g:720:2: ( ( ( rule__RealLiteral__ValAssignment ) ) )
+            // InternalExpression.g:721:1: ( ( rule__RealLiteral__ValAssignment ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:721:1: ( ( rule__RealLiteral__ValAssignment ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:722:1: ( rule__RealLiteral__ValAssignment )
+            // InternalExpression.g:721:1: ( ( rule__RealLiteral__ValAssignment ) )
+            // InternalExpression.g:722:1: ( rule__RealLiteral__ValAssignment )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRealLiteralAccess().getValAssignment()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:723:1: ( rule__RealLiteral__ValAssignment )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:723:2: rule__RealLiteral__ValAssignment
+            // InternalExpression.g:723:1: ( rule__RealLiteral__ValAssignment )
+            // InternalExpression.g:723:2: rule__RealLiteral__ValAssignment
             {
-            pushFollow(FOLLOW_rule__RealLiteral__ValAssignment_in_ruleRealLiteral1482);
+            pushFollow(FOLLOW_2);
             rule__RealLiteral__ValAssignment();
 
             state._fsp--;
@@ -2165,16 +2165,16 @@ public final void ruleRealLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleStringLiteral"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:735:1: entryRuleStringLiteral : ruleStringLiteral EOF ;
+    // InternalExpression.g:735:1: entryRuleStringLiteral : ruleStringLiteral EOF ;
     public final void entryRuleStringLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:736:1: ( ruleStringLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:737:1: ruleStringLiteral EOF
+            // InternalExpression.g:736:1: ( ruleStringLiteral EOF )
+            // InternalExpression.g:737:1: ruleStringLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getStringLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral1509);
+            pushFollow(FOLLOW_1);
             ruleStringLiteral();
 
             state._fsp--;
@@ -2182,7 +2182,7 @@ public final void entryRuleStringLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getStringLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleStringLiteral1516); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2199,25 +2199,25 @@ public final void entryRuleStringLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleStringLiteral"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:744:1: ruleStringLiteral : ( ( rule__StringLiteral__ValAssignment ) ) ;
+    // InternalExpression.g:744:1: ruleStringLiteral : ( ( rule__StringLiteral__ValAssignment ) ) ;
     public final void ruleStringLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:748:2: ( ( ( rule__StringLiteral__ValAssignment ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:749:1: ( ( rule__StringLiteral__ValAssignment ) )
+            // InternalExpression.g:748:2: ( ( ( rule__StringLiteral__ValAssignment ) ) )
+            // InternalExpression.g:749:1: ( ( rule__StringLiteral__ValAssignment ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:749:1: ( ( rule__StringLiteral__ValAssignment ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:750:1: ( rule__StringLiteral__ValAssignment )
+            // InternalExpression.g:749:1: ( ( rule__StringLiteral__ValAssignment ) )
+            // InternalExpression.g:750:1: ( rule__StringLiteral__ValAssignment )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getStringLiteralAccess().getValAssignment()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:751:1: ( rule__StringLiteral__ValAssignment )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:751:2: rule__StringLiteral__ValAssignment
+            // InternalExpression.g:751:1: ( rule__StringLiteral__ValAssignment )
+            // InternalExpression.g:751:2: rule__StringLiteral__ValAssignment
             {
-            pushFollow(FOLLOW_rule__StringLiteral__ValAssignment_in_ruleStringLiteral1542);
+            pushFollow(FOLLOW_2);
             rule__StringLiteral__ValAssignment();
 
             state._fsp--;
@@ -2250,16 +2250,16 @@ public final void ruleStringLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleParanthesizedExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:763:1: entryRuleParanthesizedExpression : ruleParanthesizedExpression EOF ;
+    // InternalExpression.g:763:1: entryRuleParanthesizedExpression : ruleParanthesizedExpression EOF ;
     public final void entryRuleParanthesizedExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:764:1: ( ruleParanthesizedExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:765:1: ruleParanthesizedExpression EOF
+            // InternalExpression.g:764:1: ( ruleParanthesizedExpression EOF )
+            // InternalExpression.g:765:1: ruleParanthesizedExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getParanthesizedExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleParanthesizedExpression_in_entryRuleParanthesizedExpression1569);
+            pushFollow(FOLLOW_1);
             ruleParanthesizedExpression();
 
             state._fsp--;
@@ -2267,7 +2267,7 @@ public final void entryRuleParanthesizedExpression() throws RecognitionException
             if ( state.backtracking==0 ) {
                after(grammarAccess.getParanthesizedExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleParanthesizedExpression1576); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2284,25 +2284,25 @@ public final void entryRuleParanthesizedExpression() throws RecognitionException
 
 
     // $ANTLR start "ruleParanthesizedExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:772:1: ruleParanthesizedExpression : ( ( rule__ParanthesizedExpression__Group__0 ) ) ;
+    // InternalExpression.g:772:1: ruleParanthesizedExpression : ( ( rule__ParanthesizedExpression__Group__0 ) ) ;
     public final void ruleParanthesizedExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:776:2: ( ( ( rule__ParanthesizedExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:777:1: ( ( rule__ParanthesizedExpression__Group__0 ) )
+            // InternalExpression.g:776:2: ( ( ( rule__ParanthesizedExpression__Group__0 ) ) )
+            // InternalExpression.g:777:1: ( ( rule__ParanthesizedExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:777:1: ( ( rule__ParanthesizedExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:778:1: ( rule__ParanthesizedExpression__Group__0 )
+            // InternalExpression.g:777:1: ( ( rule__ParanthesizedExpression__Group__0 ) )
+            // InternalExpression.g:778:1: ( rule__ParanthesizedExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getParanthesizedExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:779:1: ( rule__ParanthesizedExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:779:2: rule__ParanthesizedExpression__Group__0
+            // InternalExpression.g:779:1: ( rule__ParanthesizedExpression__Group__0 )
+            // InternalExpression.g:779:2: rule__ParanthesizedExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__ParanthesizedExpression__Group__0_in_ruleParanthesizedExpression1602);
+            pushFollow(FOLLOW_2);
             rule__ParanthesizedExpression__Group__0();
 
             state._fsp--;
@@ -2335,16 +2335,16 @@ public final void ruleParanthesizedExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleGlobalVarExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:791:1: entryRuleGlobalVarExpression : ruleGlobalVarExpression EOF ;
+    // InternalExpression.g:791:1: entryRuleGlobalVarExpression : ruleGlobalVarExpression EOF ;
     public final void entryRuleGlobalVarExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:792:1: ( ruleGlobalVarExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:793:1: ruleGlobalVarExpression EOF
+            // InternalExpression.g:792:1: ( ruleGlobalVarExpression EOF )
+            // InternalExpression.g:793:1: ruleGlobalVarExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalVarExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleGlobalVarExpression_in_entryRuleGlobalVarExpression1629);
+            pushFollow(FOLLOW_1);
             ruleGlobalVarExpression();
 
             state._fsp--;
@@ -2352,7 +2352,7 @@ public final void entryRuleGlobalVarExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGlobalVarExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleGlobalVarExpression1636); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2369,25 +2369,25 @@ public final void entryRuleGlobalVarExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleGlobalVarExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:800:1: ruleGlobalVarExpression : ( ( rule__GlobalVarExpression__Group__0 ) ) ;
+    // InternalExpression.g:800:1: ruleGlobalVarExpression : ( ( rule__GlobalVarExpression__Group__0 ) ) ;
     public final void ruleGlobalVarExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:804:2: ( ( ( rule__GlobalVarExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:805:1: ( ( rule__GlobalVarExpression__Group__0 ) )
+            // InternalExpression.g:804:2: ( ( ( rule__GlobalVarExpression__Group__0 ) ) )
+            // InternalExpression.g:805:1: ( ( rule__GlobalVarExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:805:1: ( ( rule__GlobalVarExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:806:1: ( rule__GlobalVarExpression__Group__0 )
+            // InternalExpression.g:805:1: ( ( rule__GlobalVarExpression__Group__0 ) )
+            // InternalExpression.g:806:1: ( rule__GlobalVarExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalVarExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:807:1: ( rule__GlobalVarExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:807:2: rule__GlobalVarExpression__Group__0
+            // InternalExpression.g:807:1: ( rule__GlobalVarExpression__Group__0 )
+            // InternalExpression.g:807:2: rule__GlobalVarExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__GlobalVarExpression__Group__0_in_ruleGlobalVarExpression1662);
+            pushFollow(FOLLOW_2);
             rule__GlobalVarExpression__Group__0();
 
             state._fsp--;
@@ -2420,16 +2420,16 @@ public final void ruleGlobalVarExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleFeatureCall"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:819:1: entryRuleFeatureCall : ruleFeatureCall EOF ;
+    // InternalExpression.g:819:1: entryRuleFeatureCall : ruleFeatureCall EOF ;
     public final void entryRuleFeatureCall() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:820:1: ( ruleFeatureCall EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:821:1: ruleFeatureCall EOF
+            // InternalExpression.g:820:1: ( ruleFeatureCall EOF )
+            // InternalExpression.g:821:1: ruleFeatureCall EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFeatureCallRule()); 
             }
-            pushFollow(FOLLOW_ruleFeatureCall_in_entryRuleFeatureCall1689);
+            pushFollow(FOLLOW_1);
             ruleFeatureCall();
 
             state._fsp--;
@@ -2437,7 +2437,7 @@ public final void entryRuleFeatureCall() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getFeatureCallRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFeatureCall1696); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2454,25 +2454,25 @@ public final void entryRuleFeatureCall() throws RecognitionException {
 
 
     // $ANTLR start "ruleFeatureCall"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:828:1: ruleFeatureCall : ( ( rule__FeatureCall__Alternatives ) ) ;
+    // InternalExpression.g:828:1: ruleFeatureCall : ( ( rule__FeatureCall__Alternatives ) ) ;
     public final void ruleFeatureCall() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:832:2: ( ( ( rule__FeatureCall__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:833:1: ( ( rule__FeatureCall__Alternatives ) )
+            // InternalExpression.g:832:2: ( ( ( rule__FeatureCall__Alternatives ) ) )
+            // InternalExpression.g:833:1: ( ( rule__FeatureCall__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:833:1: ( ( rule__FeatureCall__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:834:1: ( rule__FeatureCall__Alternatives )
+            // InternalExpression.g:833:1: ( ( rule__FeatureCall__Alternatives ) )
+            // InternalExpression.g:834:1: ( rule__FeatureCall__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFeatureCallAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:835:1: ( rule__FeatureCall__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:835:2: rule__FeatureCall__Alternatives
+            // InternalExpression.g:835:1: ( rule__FeatureCall__Alternatives )
+            // InternalExpression.g:835:2: rule__FeatureCall__Alternatives
             {
-            pushFollow(FOLLOW_rule__FeatureCall__Alternatives_in_ruleFeatureCall1722);
+            pushFollow(FOLLOW_2);
             rule__FeatureCall__Alternatives();
 
             state._fsp--;
@@ -2505,16 +2505,16 @@ public final void ruleFeatureCall() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOperationCall"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:847:1: entryRuleOperationCall : ruleOperationCall EOF ;
+    // InternalExpression.g:847:1: entryRuleOperationCall : ruleOperationCall EOF ;
     public final void entryRuleOperationCall() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:848:1: ( ruleOperationCall EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:849:1: ruleOperationCall EOF
+            // InternalExpression.g:848:1: ( ruleOperationCall EOF )
+            // InternalExpression.g:849:1: ruleOperationCall EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOperationCallRule()); 
             }
-            pushFollow(FOLLOW_ruleOperationCall_in_entryRuleOperationCall1749);
+            pushFollow(FOLLOW_1);
             ruleOperationCall();
 
             state._fsp--;
@@ -2522,7 +2522,7 @@ public final void entryRuleOperationCall() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOperationCallRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOperationCall1756); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2539,25 +2539,25 @@ public final void entryRuleOperationCall() throws RecognitionException {
 
 
     // $ANTLR start "ruleOperationCall"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:856:1: ruleOperationCall : ( ( rule__OperationCall__Group__0 ) ) ;
+    // InternalExpression.g:856:1: ruleOperationCall : ( ( rule__OperationCall__Group__0 ) ) ;
     public final void ruleOperationCall() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:860:2: ( ( ( rule__OperationCall__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:861:1: ( ( rule__OperationCall__Group__0 ) )
+            // InternalExpression.g:860:2: ( ( ( rule__OperationCall__Group__0 ) ) )
+            // InternalExpression.g:861:1: ( ( rule__OperationCall__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:861:1: ( ( rule__OperationCall__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:862:1: ( rule__OperationCall__Group__0 )
+            // InternalExpression.g:861:1: ( ( rule__OperationCall__Group__0 ) )
+            // InternalExpression.g:862:1: ( rule__OperationCall__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOperationCallAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:863:1: ( rule__OperationCall__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:863:2: rule__OperationCall__Group__0
+            // InternalExpression.g:863:1: ( rule__OperationCall__Group__0 )
+            // InternalExpression.g:863:2: rule__OperationCall__Group__0
             {
-            pushFollow(FOLLOW_rule__OperationCall__Group__0_in_ruleOperationCall1782);
+            pushFollow(FOLLOW_2);
             rule__OperationCall__Group__0();
 
             state._fsp--;
@@ -2590,16 +2590,16 @@ public final void ruleOperationCall() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleListLiteral"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:875:1: entryRuleListLiteral : ruleListLiteral EOF ;
+    // InternalExpression.g:875:1: entryRuleListLiteral : ruleListLiteral EOF ;
     public final void entryRuleListLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:876:1: ( ruleListLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:877:1: ruleListLiteral EOF
+            // InternalExpression.g:876:1: ( ruleListLiteral EOF )
+            // InternalExpression.g:877:1: ruleListLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getListLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleListLiteral_in_entryRuleListLiteral1809);
+            pushFollow(FOLLOW_1);
             ruleListLiteral();
 
             state._fsp--;
@@ -2607,7 +2607,7 @@ public final void entryRuleListLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getListLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleListLiteral1816); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2624,25 +2624,25 @@ public final void entryRuleListLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleListLiteral"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:884:1: ruleListLiteral : ( ( rule__ListLiteral__Group__0 ) ) ;
+    // InternalExpression.g:884:1: ruleListLiteral : ( ( rule__ListLiteral__Group__0 ) ) ;
     public final void ruleListLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:888:2: ( ( ( rule__ListLiteral__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:889:1: ( ( rule__ListLiteral__Group__0 ) )
+            // InternalExpression.g:888:2: ( ( ( rule__ListLiteral__Group__0 ) ) )
+            // InternalExpression.g:889:1: ( ( rule__ListLiteral__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:889:1: ( ( rule__ListLiteral__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:890:1: ( rule__ListLiteral__Group__0 )
+            // InternalExpression.g:889:1: ( ( rule__ListLiteral__Group__0 ) )
+            // InternalExpression.g:890:1: ( rule__ListLiteral__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getListLiteralAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:891:1: ( rule__ListLiteral__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:891:2: rule__ListLiteral__Group__0
+            // InternalExpression.g:891:1: ( rule__ListLiteral__Group__0 )
+            // InternalExpression.g:891:2: rule__ListLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__ListLiteral__Group__0_in_ruleListLiteral1842);
+            pushFollow(FOLLOW_2);
             rule__ListLiteral__Group__0();
 
             state._fsp--;
@@ -2675,16 +2675,16 @@ public final void ruleListLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleConstructorCallExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:903:1: entryRuleConstructorCallExpression : ruleConstructorCallExpression EOF ;
+    // InternalExpression.g:903:1: entryRuleConstructorCallExpression : ruleConstructorCallExpression EOF ;
     public final void entryRuleConstructorCallExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:904:1: ( ruleConstructorCallExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:905:1: ruleConstructorCallExpression EOF
+            // InternalExpression.g:904:1: ( ruleConstructorCallExpression EOF )
+            // InternalExpression.g:905:1: ruleConstructorCallExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConstructorCallExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleConstructorCallExpression_in_entryRuleConstructorCallExpression1869);
+            pushFollow(FOLLOW_1);
             ruleConstructorCallExpression();
 
             state._fsp--;
@@ -2692,7 +2692,7 @@ public final void entryRuleConstructorCallExpression() throws RecognitionExcepti
             if ( state.backtracking==0 ) {
                after(grammarAccess.getConstructorCallExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleConstructorCallExpression1876); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2709,25 +2709,25 @@ public final void entryRuleConstructorCallExpression() throws RecognitionExcepti
 
 
     // $ANTLR start "ruleConstructorCallExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:912:1: ruleConstructorCallExpression : ( ( rule__ConstructorCallExpression__Group__0 ) ) ;
+    // InternalExpression.g:912:1: ruleConstructorCallExpression : ( ( rule__ConstructorCallExpression__Group__0 ) ) ;
     public final void ruleConstructorCallExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:916:2: ( ( ( rule__ConstructorCallExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:917:1: ( ( rule__ConstructorCallExpression__Group__0 ) )
+            // InternalExpression.g:916:2: ( ( ( rule__ConstructorCallExpression__Group__0 ) ) )
+            // InternalExpression.g:917:1: ( ( rule__ConstructorCallExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:917:1: ( ( rule__ConstructorCallExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:918:1: ( rule__ConstructorCallExpression__Group__0 )
+            // InternalExpression.g:917:1: ( ( rule__ConstructorCallExpression__Group__0 ) )
+            // InternalExpression.g:918:1: ( rule__ConstructorCallExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConstructorCallExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:919:1: ( rule__ConstructorCallExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:919:2: rule__ConstructorCallExpression__Group__0
+            // InternalExpression.g:919:1: ( rule__ConstructorCallExpression__Group__0 )
+            // InternalExpression.g:919:2: rule__ConstructorCallExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__ConstructorCallExpression__Group__0_in_ruleConstructorCallExpression1902);
+            pushFollow(FOLLOW_2);
             rule__ConstructorCallExpression__Group__0();
 
             state._fsp--;
@@ -2760,16 +2760,16 @@ public final void ruleConstructorCallExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleTypeSelectExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:931:1: entryRuleTypeSelectExpression : ruleTypeSelectExpression EOF ;
+    // InternalExpression.g:931:1: entryRuleTypeSelectExpression : ruleTypeSelectExpression EOF ;
     public final void entryRuleTypeSelectExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:932:1: ( ruleTypeSelectExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:933:1: ruleTypeSelectExpression EOF
+            // InternalExpression.g:932:1: ( ruleTypeSelectExpression EOF )
+            // InternalExpression.g:933:1: ruleTypeSelectExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTypeSelectExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleTypeSelectExpression_in_entryRuleTypeSelectExpression1929);
+            pushFollow(FOLLOW_1);
             ruleTypeSelectExpression();
 
             state._fsp--;
@@ -2777,7 +2777,7 @@ public final void entryRuleTypeSelectExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getTypeSelectExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTypeSelectExpression1936); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2794,25 +2794,25 @@ public final void entryRuleTypeSelectExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleTypeSelectExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:940:1: ruleTypeSelectExpression : ( ( rule__TypeSelectExpression__Group__0 ) ) ;
+    // InternalExpression.g:940:1: ruleTypeSelectExpression : ( ( rule__TypeSelectExpression__Group__0 ) ) ;
     public final void ruleTypeSelectExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:944:2: ( ( ( rule__TypeSelectExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:945:1: ( ( rule__TypeSelectExpression__Group__0 ) )
+            // InternalExpression.g:944:2: ( ( ( rule__TypeSelectExpression__Group__0 ) ) )
+            // InternalExpression.g:945:1: ( ( rule__TypeSelectExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:945:1: ( ( rule__TypeSelectExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:946:1: ( rule__TypeSelectExpression__Group__0 )
+            // InternalExpression.g:945:1: ( ( rule__TypeSelectExpression__Group__0 ) )
+            // InternalExpression.g:946:1: ( rule__TypeSelectExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTypeSelectExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:947:1: ( rule__TypeSelectExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:947:2: rule__TypeSelectExpression__Group__0
+            // InternalExpression.g:947:1: ( rule__TypeSelectExpression__Group__0 )
+            // InternalExpression.g:947:2: rule__TypeSelectExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__TypeSelectExpression__Group__0_in_ruleTypeSelectExpression1962);
+            pushFollow(FOLLOW_2);
             rule__TypeSelectExpression__Group__0();
 
             state._fsp--;
@@ -2845,16 +2845,16 @@ public final void ruleTypeSelectExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleCollectionExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:959:1: entryRuleCollectionExpression : ruleCollectionExpression EOF ;
+    // InternalExpression.g:959:1: entryRuleCollectionExpression : ruleCollectionExpression EOF ;
     public final void entryRuleCollectionExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:960:1: ( ruleCollectionExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:961:1: ruleCollectionExpression EOF
+            // InternalExpression.g:960:1: ( ruleCollectionExpression EOF )
+            // InternalExpression.g:961:1: ruleCollectionExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleCollectionExpression_in_entryRuleCollectionExpression1989);
+            pushFollow(FOLLOW_1);
             ruleCollectionExpression();
 
             state._fsp--;
@@ -2862,7 +2862,7 @@ public final void entryRuleCollectionExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCollectionExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleCollectionExpression1996); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2879,25 +2879,25 @@ public final void entryRuleCollectionExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleCollectionExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:968:1: ruleCollectionExpression : ( ( rule__CollectionExpression__Group__0 ) ) ;
+    // InternalExpression.g:968:1: ruleCollectionExpression : ( ( rule__CollectionExpression__Group__0 ) ) ;
     public final void ruleCollectionExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:972:2: ( ( ( rule__CollectionExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:973:1: ( ( rule__CollectionExpression__Group__0 ) )
+            // InternalExpression.g:972:2: ( ( ( rule__CollectionExpression__Group__0 ) ) )
+            // InternalExpression.g:973:1: ( ( rule__CollectionExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:973:1: ( ( rule__CollectionExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:974:1: ( rule__CollectionExpression__Group__0 )
+            // InternalExpression.g:973:1: ( ( rule__CollectionExpression__Group__0 ) )
+            // InternalExpression.g:974:1: ( rule__CollectionExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:975:1: ( rule__CollectionExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:975:2: rule__CollectionExpression__Group__0
+            // InternalExpression.g:975:1: ( rule__CollectionExpression__Group__0 )
+            // InternalExpression.g:975:2: rule__CollectionExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__CollectionExpression__Group__0_in_ruleCollectionExpression2022);
+            pushFollow(FOLLOW_2);
             rule__CollectionExpression__Group__0();
 
             state._fsp--;
@@ -2930,16 +2930,16 @@ public final void ruleCollectionExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleType"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:987:1: entryRuleType : ruleType EOF ;
+    // InternalExpression.g:987:1: entryRuleType : ruleType EOF ;
     public final void entryRuleType() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:988:1: ( ruleType EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:989:1: ruleType EOF
+            // InternalExpression.g:988:1: ( ruleType EOF )
+            // InternalExpression.g:989:1: ruleType EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTypeRule()); 
             }
-            pushFollow(FOLLOW_ruleType_in_entryRuleType2049);
+            pushFollow(FOLLOW_1);
             ruleType();
 
             state._fsp--;
@@ -2947,7 +2947,7 @@ public final void entryRuleType() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getTypeRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleType2056); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2964,25 +2964,25 @@ public final void entryRuleType() throws RecognitionException {
 
 
     // $ANTLR start "ruleType"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:996:1: ruleType : ( ( rule__Type__Alternatives ) ) ;
+    // InternalExpression.g:996:1: ruleType : ( ( rule__Type__Alternatives ) ) ;
     public final void ruleType() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1000:2: ( ( ( rule__Type__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1001:1: ( ( rule__Type__Alternatives ) )
+            // InternalExpression.g:1000:2: ( ( ( rule__Type__Alternatives ) ) )
+            // InternalExpression.g:1001:1: ( ( rule__Type__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1001:1: ( ( rule__Type__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1002:1: ( rule__Type__Alternatives )
+            // InternalExpression.g:1001:1: ( ( rule__Type__Alternatives ) )
+            // InternalExpression.g:1002:1: ( rule__Type__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTypeAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1003:1: ( rule__Type__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1003:2: rule__Type__Alternatives
+            // InternalExpression.g:1003:1: ( rule__Type__Alternatives )
+            // InternalExpression.g:1003:2: rule__Type__Alternatives
             {
-            pushFollow(FOLLOW_rule__Type__Alternatives_in_ruleType2082);
+            pushFollow(FOLLOW_2);
             rule__Type__Alternatives();
 
             state._fsp--;
@@ -3015,16 +3015,16 @@ public final void ruleType() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleCollectionType"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1015:1: entryRuleCollectionType : ruleCollectionType EOF ;
+    // InternalExpression.g:1015:1: entryRuleCollectionType : ruleCollectionType EOF ;
     public final void entryRuleCollectionType() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1016:1: ( ruleCollectionType EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1017:1: ruleCollectionType EOF
+            // InternalExpression.g:1016:1: ( ruleCollectionType EOF )
+            // InternalExpression.g:1017:1: ruleCollectionType EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionTypeRule()); 
             }
-            pushFollow(FOLLOW_ruleCollectionType_in_entryRuleCollectionType2109);
+            pushFollow(FOLLOW_1);
             ruleCollectionType();
 
             state._fsp--;
@@ -3032,7 +3032,7 @@ public final void entryRuleCollectionType() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCollectionTypeRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleCollectionType2116); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3049,25 +3049,25 @@ public final void entryRuleCollectionType() throws RecognitionException {
 
 
     // $ANTLR start "ruleCollectionType"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1024:1: ruleCollectionType : ( ( rule__CollectionType__Group__0 ) ) ;
+    // InternalExpression.g:1024:1: ruleCollectionType : ( ( rule__CollectionType__Group__0 ) ) ;
     public final void ruleCollectionType() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1028:2: ( ( ( rule__CollectionType__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1029:1: ( ( rule__CollectionType__Group__0 ) )
+            // InternalExpression.g:1028:2: ( ( ( rule__CollectionType__Group__0 ) ) )
+            // InternalExpression.g:1029:1: ( ( rule__CollectionType__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1029:1: ( ( rule__CollectionType__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1030:1: ( rule__CollectionType__Group__0 )
+            // InternalExpression.g:1029:1: ( ( rule__CollectionType__Group__0 ) )
+            // InternalExpression.g:1030:1: ( rule__CollectionType__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionTypeAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1031:1: ( rule__CollectionType__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1031:2: rule__CollectionType__Group__0
+            // InternalExpression.g:1031:1: ( rule__CollectionType__Group__0 )
+            // InternalExpression.g:1031:2: rule__CollectionType__Group__0
             {
-            pushFollow(FOLLOW_rule__CollectionType__Group__0_in_ruleCollectionType2142);
+            pushFollow(FOLLOW_2);
             rule__CollectionType__Group__0();
 
             state._fsp--;
@@ -3100,16 +3100,16 @@ public final void ruleCollectionType() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleSimpleType"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1043:1: entryRuleSimpleType : ruleSimpleType EOF ;
+    // InternalExpression.g:1043:1: entryRuleSimpleType : ruleSimpleType EOF ;
     public final void entryRuleSimpleType() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1044:1: ( ruleSimpleType EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1045:1: ruleSimpleType EOF
+            // InternalExpression.g:1044:1: ( ruleSimpleType EOF )
+            // InternalExpression.g:1045:1: ruleSimpleType EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSimpleTypeRule()); 
             }
-            pushFollow(FOLLOW_ruleSimpleType_in_entryRuleSimpleType2169);
+            pushFollow(FOLLOW_1);
             ruleSimpleType();
 
             state._fsp--;
@@ -3117,7 +3117,7 @@ public final void entryRuleSimpleType() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSimpleTypeRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSimpleType2176); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3134,25 +3134,25 @@ public final void entryRuleSimpleType() throws RecognitionException {
 
 
     // $ANTLR start "ruleSimpleType"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1052:1: ruleSimpleType : ( ( rule__SimpleType__Group__0 ) ) ;
+    // InternalExpression.g:1052:1: ruleSimpleType : ( ( rule__SimpleType__Group__0 ) ) ;
     public final void ruleSimpleType() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1056:2: ( ( ( rule__SimpleType__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1057:1: ( ( rule__SimpleType__Group__0 ) )
+            // InternalExpression.g:1056:2: ( ( ( rule__SimpleType__Group__0 ) ) )
+            // InternalExpression.g:1057:1: ( ( rule__SimpleType__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1057:1: ( ( rule__SimpleType__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1058:1: ( rule__SimpleType__Group__0 )
+            // InternalExpression.g:1057:1: ( ( rule__SimpleType__Group__0 ) )
+            // InternalExpression.g:1058:1: ( rule__SimpleType__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSimpleTypeAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1059:1: ( rule__SimpleType__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1059:2: rule__SimpleType__Group__0
+            // InternalExpression.g:1059:1: ( rule__SimpleType__Group__0 )
+            // InternalExpression.g:1059:2: rule__SimpleType__Group__0
             {
-            pushFollow(FOLLOW_rule__SimpleType__Group__0_in_ruleSimpleType2202);
+            pushFollow(FOLLOW_2);
             rule__SimpleType__Group__0();
 
             state._fsp--;
@@ -3185,16 +3185,16 @@ public final void ruleSimpleType() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleIdentifier"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1071:1: entryRuleIdentifier : ruleIdentifier EOF ;
+    // InternalExpression.g:1071:1: entryRuleIdentifier : ruleIdentifier EOF ;
     public final void entryRuleIdentifier() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1072:1: ( ruleIdentifier EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1073:1: ruleIdentifier EOF
+            // InternalExpression.g:1072:1: ( ruleIdentifier EOF )
+            // InternalExpression.g:1073:1: ruleIdentifier EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIdentifierRule()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_entryRuleIdentifier2229);
+            pushFollow(FOLLOW_1);
             ruleIdentifier();
 
             state._fsp--;
@@ -3202,7 +3202,7 @@ public final void entryRuleIdentifier() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIdentifierRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIdentifier2236); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3219,22 +3219,22 @@ public final void entryRuleIdentifier() throws RecognitionException {
 
 
     // $ANTLR start "ruleIdentifier"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1080:1: ruleIdentifier : ( RULE_ID ) ;
+    // InternalExpression.g:1080:1: ruleIdentifier : ( RULE_ID ) ;
     public final void ruleIdentifier() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1084:2: ( ( RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1085:1: ( RULE_ID )
+            // InternalExpression.g:1084:2: ( ( RULE_ID ) )
+            // InternalExpression.g:1085:1: ( RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1085:1: ( RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1086:1: RULE_ID
+            // InternalExpression.g:1085:1: ( RULE_ID )
+            // InternalExpression.g:1086:1: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIdentifierAccess().getIDTerminalRuleCall()); 
             }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleIdentifier2262); if (state.failed) return ;
+            match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIdentifierAccess().getIDTerminalRuleCall()); 
             }
@@ -3260,26 +3260,26 @@ public final void ruleIdentifier() throws RecognitionException {
 
 
     // $ANTLR start "rule__Expression__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1099:1: rule__Expression__Alternatives : ( ( ruleLetExpression ) | ( ( ruleCastedExpression ) ) | ( ruleChainExpression ) );
+    // InternalExpression.g:1099:1: rule__Expression__Alternatives : ( ( ruleLetExpression ) | ( ( ruleCastedExpression ) ) | ( ruleChainExpression ) );
     public final void rule__Expression__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1103:1: ( ( ruleLetExpression ) | ( ( ruleCastedExpression ) ) | ( ruleChainExpression ) )
+            // InternalExpression.g:1103:1: ( ( ruleLetExpression ) | ( ( ruleCastedExpression ) ) | ( ruleChainExpression ) )
             int alt1=3;
             alt1 = dfa1.predict(input);
             switch (alt1) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1104:1: ( ruleLetExpression )
+                    // InternalExpression.g:1104:1: ( ruleLetExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1104:1: ( ruleLetExpression )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1105:1: ruleLetExpression
+                    // InternalExpression.g:1104:1: ( ruleLetExpression )
+                    // InternalExpression.g:1105:1: ruleLetExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getExpressionAccess().getLetExpressionParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleLetExpression_in_rule__Expression__Alternatives2297);
+                    pushFollow(FOLLOW_2);
                     ruleLetExpression();
 
                     state._fsp--;
@@ -3294,18 +3294,18 @@ public final void rule__Expression__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1110:6: ( ( ruleCastedExpression ) )
+                    // InternalExpression.g:1110:6: ( ( ruleCastedExpression ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1110:6: ( ( ruleCastedExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1111:1: ( ruleCastedExpression )
+                    // InternalExpression.g:1110:6: ( ( ruleCastedExpression ) )
+                    // InternalExpression.g:1111:1: ( ruleCastedExpression )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getExpressionAccess().getCastedExpressionParserRuleCall_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1112:1: ( ruleCastedExpression )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1112:3: ruleCastedExpression
+                    // InternalExpression.g:1112:1: ( ruleCastedExpression )
+                    // InternalExpression.g:1112:3: ruleCastedExpression
                     {
-                    pushFollow(FOLLOW_ruleCastedExpression_in_rule__Expression__Alternatives2315);
+                    pushFollow(FOLLOW_2);
                     ruleCastedExpression();
 
                     state._fsp--;
@@ -3323,15 +3323,15 @@ public final void rule__Expression__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1116:6: ( ruleChainExpression )
+                    // InternalExpression.g:1116:6: ( ruleChainExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1116:6: ( ruleChainExpression )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1117:1: ruleChainExpression
+                    // InternalExpression.g:1116:6: ( ruleChainExpression )
+                    // InternalExpression.g:1117:1: ruleChainExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getExpressionAccess().getChainExpressionParserRuleCall_2()); 
                     }
-                    pushFollow(FOLLOW_ruleChainExpression_in_rule__Expression__Alternatives2333);
+                    pushFollow(FOLLOW_2);
                     ruleChainExpression();
 
                     state._fsp--;
@@ -3363,13 +3363,13 @@ public final void rule__Expression__Alternatives() throws RecognitionException {
 
 
     // $ANTLR start "rule__ChainedExpression__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1128:1: rule__ChainedExpression__Alternatives : ( ( ruleIfExpressionKw ) | ( ruleIfExpressionTri ) | ( ruleSwitchExpression ) );
+    // InternalExpression.g:1128:1: rule__ChainedExpression__Alternatives : ( ( ruleIfExpressionKw ) | ( ruleIfExpressionTri ) | ( ruleSwitchExpression ) );
     public final void rule__ChainedExpression__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1132:1: ( ( ruleIfExpressionKw ) | ( ruleIfExpressionTri ) | ( ruleSwitchExpression ) )
+            // InternalExpression.g:1132:1: ( ( ruleIfExpressionKw ) | ( ruleIfExpressionTri ) | ( ruleSwitchExpression ) )
             int alt2=3;
             switch ( input.LA(1) ) {
             case 43:
@@ -3421,15 +3421,15 @@ public final void rule__ChainedExpression__Alternatives() throws RecognitionExce
 
             switch (alt2) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1133:1: ( ruleIfExpressionKw )
+                    // InternalExpression.g:1133:1: ( ruleIfExpressionKw )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1133:1: ( ruleIfExpressionKw )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1134:1: ruleIfExpressionKw
+                    // InternalExpression.g:1133:1: ( ruleIfExpressionKw )
+                    // InternalExpression.g:1134:1: ruleIfExpressionKw
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getChainedExpressionAccess().getIfExpressionKwParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleIfExpressionKw_in_rule__ChainedExpression__Alternatives2366);
+                    pushFollow(FOLLOW_2);
                     ruleIfExpressionKw();
 
                     state._fsp--;
@@ -3444,15 +3444,15 @@ public final void rule__ChainedExpression__Alternatives() throws RecognitionExce
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1139:6: ( ruleIfExpressionTri )
+                    // InternalExpression.g:1139:6: ( ruleIfExpressionTri )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1139:6: ( ruleIfExpressionTri )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1140:1: ruleIfExpressionTri
+                    // InternalExpression.g:1139:6: ( ruleIfExpressionTri )
+                    // InternalExpression.g:1140:1: ruleIfExpressionTri
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getChainedExpressionAccess().getIfExpressionTriParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleIfExpressionTri_in_rule__ChainedExpression__Alternatives2383);
+                    pushFollow(FOLLOW_2);
                     ruleIfExpressionTri();
 
                     state._fsp--;
@@ -3467,15 +3467,15 @@ public final void rule__ChainedExpression__Alternatives() throws RecognitionExce
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1145:6: ( ruleSwitchExpression )
+                    // InternalExpression.g:1145:6: ( ruleSwitchExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1145:6: ( ruleSwitchExpression )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1146:1: ruleSwitchExpression
+                    // InternalExpression.g:1145:6: ( ruleSwitchExpression )
+                    // InternalExpression.g:1146:1: ruleSwitchExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getChainedExpressionAccess().getSwitchExpressionParserRuleCall_2()); 
                     }
-                    pushFollow(FOLLOW_ruleSwitchExpression_in_rule__ChainedExpression__Alternatives2400);
+                    pushFollow(FOLLOW_2);
                     ruleSwitchExpression();
 
                     state._fsp--;
@@ -3507,13 +3507,13 @@ public final void rule__ChainedExpression__Alternatives() throws RecognitionExce
 
 
     // $ANTLR start "rule__RelationalExpression__OperatorAlternatives_1_1_0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1156:1: rule__RelationalExpression__OperatorAlternatives_1_1_0 : ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) );
+    // InternalExpression.g:1156:1: rule__RelationalExpression__OperatorAlternatives_1_1_0 : ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) );
     public final void rule__RelationalExpression__OperatorAlternatives_1_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1160:1: ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) )
+            // InternalExpression.g:1160:1: ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) )
             int alt3=6;
             switch ( input.LA(1) ) {
             case 12:
@@ -3556,15 +3556,15 @@ public final void rule__RelationalExpression__OperatorAlternatives_1_1_0() throw
 
             switch (alt3) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1161:1: ( '==' )
+                    // InternalExpression.g:1161:1: ( '==' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1161:1: ( '==' )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1162:1: '=='
+                    // InternalExpression.g:1161:1: ( '==' )
+                    // InternalExpression.g:1162:1: '=='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getRelationalExpressionAccess().getOperatorEqualsSignEqualsSignKeyword_1_1_0_0()); 
                     }
-                    match(input,12,FOLLOW_12_in_rule__RelationalExpression__OperatorAlternatives_1_1_02433); if (state.failed) return ;
+                    match(input,12,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getRelationalExpressionAccess().getOperatorEqualsSignEqualsSignKeyword_1_1_0_0()); 
                     }
@@ -3575,15 +3575,15 @@ public final void rule__RelationalExpression__OperatorAlternatives_1_1_0() throw
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1169:6: ( '!=' )
+                    // InternalExpression.g:1169:6: ( '!=' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1169:6: ( '!=' )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1170:1: '!='
+                    // InternalExpression.g:1169:6: ( '!=' )
+                    // InternalExpression.g:1170:1: '!='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getRelationalExpressionAccess().getOperatorExclamationMarkEqualsSignKeyword_1_1_0_1()); 
                     }
-                    match(input,13,FOLLOW_13_in_rule__RelationalExpression__OperatorAlternatives_1_1_02453); if (state.failed) return ;
+                    match(input,13,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getRelationalExpressionAccess().getOperatorExclamationMarkEqualsSignKeyword_1_1_0_1()); 
                     }
@@ -3594,15 +3594,15 @@ public final void rule__RelationalExpression__OperatorAlternatives_1_1_0() throw
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1177:6: ( '>=' )
+                    // InternalExpression.g:1177:6: ( '>=' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1177:6: ( '>=' )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1178:1: '>='
+                    // InternalExpression.g:1177:6: ( '>=' )
+                    // InternalExpression.g:1178:1: '>='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getRelationalExpressionAccess().getOperatorGreaterThanSignEqualsSignKeyword_1_1_0_2()); 
                     }
-                    match(input,14,FOLLOW_14_in_rule__RelationalExpression__OperatorAlternatives_1_1_02473); if (state.failed) return ;
+                    match(input,14,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getRelationalExpressionAccess().getOperatorGreaterThanSignEqualsSignKeyword_1_1_0_2()); 
                     }
@@ -3613,15 +3613,15 @@ public final void rule__RelationalExpression__OperatorAlternatives_1_1_0() throw
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1185:6: ( '<=' )
+                    // InternalExpression.g:1185:6: ( '<=' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1185:6: ( '<=' )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1186:1: '<='
+                    // InternalExpression.g:1185:6: ( '<=' )
+                    // InternalExpression.g:1186:1: '<='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getRelationalExpressionAccess().getOperatorLessThanSignEqualsSignKeyword_1_1_0_3()); 
                     }
-                    match(input,15,FOLLOW_15_in_rule__RelationalExpression__OperatorAlternatives_1_1_02493); if (state.failed) return ;
+                    match(input,15,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getRelationalExpressionAccess().getOperatorLessThanSignEqualsSignKeyword_1_1_0_3()); 
                     }
@@ -3632,15 +3632,15 @@ public final void rule__RelationalExpression__OperatorAlternatives_1_1_0() throw
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1193:6: ( '>' )
+                    // InternalExpression.g:1193:6: ( '>' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1193:6: ( '>' )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1194:1: '>'
+                    // InternalExpression.g:1193:6: ( '>' )
+                    // InternalExpression.g:1194:1: '>'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getRelationalExpressionAccess().getOperatorGreaterThanSignKeyword_1_1_0_4()); 
                     }
-                    match(input,16,FOLLOW_16_in_rule__RelationalExpression__OperatorAlternatives_1_1_02513); if (state.failed) return ;
+                    match(input,16,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getRelationalExpressionAccess().getOperatorGreaterThanSignKeyword_1_1_0_4()); 
                     }
@@ -3651,15 +3651,15 @@ public final void rule__RelationalExpression__OperatorAlternatives_1_1_0() throw
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1201:6: ( '<' )
+                    // InternalExpression.g:1201:6: ( '<' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1201:6: ( '<' )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1202:1: '<'
+                    // InternalExpression.g:1201:6: ( '<' )
+                    // InternalExpression.g:1202:1: '<'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getRelationalExpressionAccess().getOperatorLessThanSignKeyword_1_1_0_5()); 
                     }
-                    match(input,17,FOLLOW_17_in_rule__RelationalExpression__OperatorAlternatives_1_1_02533); if (state.failed) return ;
+                    match(input,17,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getRelationalExpressionAccess().getOperatorLessThanSignKeyword_1_1_0_5()); 
                     }
@@ -3687,13 +3687,13 @@ public final void rule__RelationalExpression__OperatorAlternatives_1_1_0() throw
 
 
     // $ANTLR start "rule__AdditiveExpression__NameAlternatives_1_1_0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1214:1: rule__AdditiveExpression__NameAlternatives_1_1_0 : ( ( '+' ) | ( '-' ) );
+    // InternalExpression.g:1214:1: rule__AdditiveExpression__NameAlternatives_1_1_0 : ( ( '+' ) | ( '-' ) );
     public final void rule__AdditiveExpression__NameAlternatives_1_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1218:1: ( ( '+' ) | ( '-' ) )
+            // InternalExpression.g:1218:1: ( ( '+' ) | ( '-' ) )
             int alt4=2;
             int LA4_0 = input.LA(1);
 
@@ -3712,15 +3712,15 @@ else if ( (LA4_0==19) ) {
             }
             switch (alt4) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1219:1: ( '+' )
+                    // InternalExpression.g:1219:1: ( '+' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1219:1: ( '+' )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1220:1: '+'
+                    // InternalExpression.g:1219:1: ( '+' )
+                    // InternalExpression.g:1220:1: '+'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getAdditiveExpressionAccess().getNamePlusSignKeyword_1_1_0_0()); 
                     }
-                    match(input,18,FOLLOW_18_in_rule__AdditiveExpression__NameAlternatives_1_1_02568); if (state.failed) return ;
+                    match(input,18,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getAdditiveExpressionAccess().getNamePlusSignKeyword_1_1_0_0()); 
                     }
@@ -3731,15 +3731,15 @@ else if ( (LA4_0==19) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1227:6: ( '-' )
+                    // InternalExpression.g:1227:6: ( '-' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1227:6: ( '-' )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1228:1: '-'
+                    // InternalExpression.g:1227:6: ( '-' )
+                    // InternalExpression.g:1228:1: '-'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getAdditiveExpressionAccess().getNameHyphenMinusKeyword_1_1_0_1()); 
                     }
-                    match(input,19,FOLLOW_19_in_rule__AdditiveExpression__NameAlternatives_1_1_02588); if (state.failed) return ;
+                    match(input,19,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getAdditiveExpressionAccess().getNameHyphenMinusKeyword_1_1_0_1()); 
                     }
@@ -3767,13 +3767,13 @@ else if ( (LA4_0==19) ) {
 
 
     // $ANTLR start "rule__MultiplicativeExpression__NameAlternatives_1_1_0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1240:1: rule__MultiplicativeExpression__NameAlternatives_1_1_0 : ( ( '*' ) | ( '/' ) );
+    // InternalExpression.g:1240:1: rule__MultiplicativeExpression__NameAlternatives_1_1_0 : ( ( '*' ) | ( '/' ) );
     public final void rule__MultiplicativeExpression__NameAlternatives_1_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1244:1: ( ( '*' ) | ( '/' ) )
+            // InternalExpression.g:1244:1: ( ( '*' ) | ( '/' ) )
             int alt5=2;
             int LA5_0 = input.LA(1);
 
@@ -3792,15 +3792,15 @@ else if ( (LA5_0==21) ) {
             }
             switch (alt5) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1245:1: ( '*' )
+                    // InternalExpression.g:1245:1: ( '*' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1245:1: ( '*' )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1246:1: '*'
+                    // InternalExpression.g:1245:1: ( '*' )
+                    // InternalExpression.g:1246:1: '*'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getMultiplicativeExpressionAccess().getNameAsteriskKeyword_1_1_0_0()); 
                     }
-                    match(input,20,FOLLOW_20_in_rule__MultiplicativeExpression__NameAlternatives_1_1_02623); if (state.failed) return ;
+                    match(input,20,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getMultiplicativeExpressionAccess().getNameAsteriskKeyword_1_1_0_0()); 
                     }
@@ -3811,15 +3811,15 @@ else if ( (LA5_0==21) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1253:6: ( '/' )
+                    // InternalExpression.g:1253:6: ( '/' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1253:6: ( '/' )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1254:1: '/'
+                    // InternalExpression.g:1253:6: ( '/' )
+                    // InternalExpression.g:1254:1: '/'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getMultiplicativeExpressionAccess().getNameSolidusKeyword_1_1_0_1()); 
                     }
-                    match(input,21,FOLLOW_21_in_rule__MultiplicativeExpression__NameAlternatives_1_1_02643); if (state.failed) return ;
+                    match(input,21,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getMultiplicativeExpressionAccess().getNameSolidusKeyword_1_1_0_1()); 
                     }
@@ -3847,13 +3847,13 @@ else if ( (LA5_0==21) ) {
 
 
     // $ANTLR start "rule__UnaryOrInfixExpression__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1266:1: rule__UnaryOrInfixExpression__Alternatives : ( ( ruleUnaryExpression ) | ( ruleInfixExpression ) );
+    // InternalExpression.g:1266:1: rule__UnaryOrInfixExpression__Alternatives : ( ( ruleUnaryExpression ) | ( ruleInfixExpression ) );
     public final void rule__UnaryOrInfixExpression__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1270:1: ( ( ruleUnaryExpression ) | ( ruleInfixExpression ) )
+            // InternalExpression.g:1270:1: ( ( ruleUnaryExpression ) | ( ruleInfixExpression ) )
             int alt6=2;
             int LA6_0 = input.LA(1);
 
@@ -3872,15 +3872,15 @@ else if ( ((LA6_0>=RULE_ID && LA6_0<=RULE_STRING)||(LA6_0>=23 && LA6_0<=35)||LA6
             }
             switch (alt6) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1271:1: ( ruleUnaryExpression )
+                    // InternalExpression.g:1271:1: ( ruleUnaryExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1271:1: ( ruleUnaryExpression )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1272:1: ruleUnaryExpression
+                    // InternalExpression.g:1271:1: ( ruleUnaryExpression )
+                    // InternalExpression.g:1272:1: ruleUnaryExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getUnaryOrInfixExpressionAccess().getUnaryExpressionParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleUnaryExpression_in_rule__UnaryOrInfixExpression__Alternatives2677);
+                    pushFollow(FOLLOW_2);
                     ruleUnaryExpression();
 
                     state._fsp--;
@@ -3895,15 +3895,15 @@ else if ( ((LA6_0>=RULE_ID && LA6_0<=RULE_STRING)||(LA6_0>=23 && LA6_0<=35)||LA6
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1277:6: ( ruleInfixExpression )
+                    // InternalExpression.g:1277:6: ( ruleInfixExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1277:6: ( ruleInfixExpression )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1278:1: ruleInfixExpression
+                    // InternalExpression.g:1277:6: ( ruleInfixExpression )
+                    // InternalExpression.g:1278:1: ruleInfixExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getUnaryOrInfixExpressionAccess().getInfixExpressionParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleInfixExpression_in_rule__UnaryOrInfixExpression__Alternatives2694);
+                    pushFollow(FOLLOW_2);
                     ruleInfixExpression();
 
                     state._fsp--;
@@ -3935,13 +3935,13 @@ else if ( ((LA6_0>=RULE_ID && LA6_0<=RULE_STRING)||(LA6_0>=23 && LA6_0<=35)||LA6
 
 
     // $ANTLR start "rule__UnaryExpression__NameAlternatives_0_0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1288:1: rule__UnaryExpression__NameAlternatives_0_0 : ( ( '!' ) | ( '-' ) );
+    // InternalExpression.g:1288:1: rule__UnaryExpression__NameAlternatives_0_0 : ( ( '!' ) | ( '-' ) );
     public final void rule__UnaryExpression__NameAlternatives_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1292:1: ( ( '!' ) | ( '-' ) )
+            // InternalExpression.g:1292:1: ( ( '!' ) | ( '-' ) )
             int alt7=2;
             int LA7_0 = input.LA(1);
 
@@ -3960,15 +3960,15 @@ else if ( (LA7_0==19) ) {
             }
             switch (alt7) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1293:1: ( '!' )
+                    // InternalExpression.g:1293:1: ( '!' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1293:1: ( '!' )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1294:1: '!'
+                    // InternalExpression.g:1293:1: ( '!' )
+                    // InternalExpression.g:1294:1: '!'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getUnaryExpressionAccess().getNameExclamationMarkKeyword_0_0_0()); 
                     }
-                    match(input,22,FOLLOW_22_in_rule__UnaryExpression__NameAlternatives_0_02727); if (state.failed) return ;
+                    match(input,22,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getUnaryExpressionAccess().getNameExclamationMarkKeyword_0_0_0()); 
                     }
@@ -3979,15 +3979,15 @@ else if ( (LA7_0==19) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1301:6: ( '-' )
+                    // InternalExpression.g:1301:6: ( '-' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1301:6: ( '-' )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1302:1: '-'
+                    // InternalExpression.g:1301:6: ( '-' )
+                    // InternalExpression.g:1302:1: '-'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getUnaryExpressionAccess().getNameHyphenMinusKeyword_0_0_1()); 
                     }
-                    match(input,19,FOLLOW_19_in_rule__UnaryExpression__NameAlternatives_0_02747); if (state.failed) return ;
+                    match(input,19,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getUnaryExpressionAccess().getNameHyphenMinusKeyword_0_0_1()); 
                     }
@@ -4015,13 +4015,13 @@ else if ( (LA7_0==19) ) {
 
 
     // $ANTLR start "rule__InfixExpression__Alternatives_1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1314:1: rule__InfixExpression__Alternatives_1 : ( ( ( rule__InfixExpression__Group_1_0__0 ) ) | ( ( rule__InfixExpression__Group_1_1__0 ) ) | ( ( rule__InfixExpression__Group_1_2__0 ) ) | ( ( rule__InfixExpression__Group_1_3__0 ) ) );
+    // InternalExpression.g:1314:1: rule__InfixExpression__Alternatives_1 : ( ( ( rule__InfixExpression__Group_1_0__0 ) ) | ( ( rule__InfixExpression__Group_1_1__0 ) ) | ( ( rule__InfixExpression__Group_1_2__0 ) ) | ( ( rule__InfixExpression__Group_1_3__0 ) ) );
     public final void rule__InfixExpression__Alternatives_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1318:1: ( ( ( rule__InfixExpression__Group_1_0__0 ) ) | ( ( rule__InfixExpression__Group_1_1__0 ) ) | ( ( rule__InfixExpression__Group_1_2__0 ) ) | ( ( rule__InfixExpression__Group_1_3__0 ) ) )
+            // InternalExpression.g:1318:1: ( ( ( rule__InfixExpression__Group_1_0__0 ) ) | ( ( rule__InfixExpression__Group_1_1__0 ) ) | ( ( rule__InfixExpression__Group_1_2__0 ) ) | ( ( rule__InfixExpression__Group_1_3__0 ) ) )
             int alt8=4;
             int LA8_0 = input.LA(1);
 
@@ -4088,18 +4088,18 @@ else if ( (LA8_4==39) ) {
             }
             switch (alt8) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1319:1: ( ( rule__InfixExpression__Group_1_0__0 ) )
+                    // InternalExpression.g:1319:1: ( ( rule__InfixExpression__Group_1_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1319:1: ( ( rule__InfixExpression__Group_1_0__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1320:1: ( rule__InfixExpression__Group_1_0__0 )
+                    // InternalExpression.g:1319:1: ( ( rule__InfixExpression__Group_1_0__0 ) )
+                    // InternalExpression.g:1320:1: ( rule__InfixExpression__Group_1_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getInfixExpressionAccess().getGroup_1_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1321:1: ( rule__InfixExpression__Group_1_0__0 )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1321:2: rule__InfixExpression__Group_1_0__0
+                    // InternalExpression.g:1321:1: ( rule__InfixExpression__Group_1_0__0 )
+                    // InternalExpression.g:1321:2: rule__InfixExpression__Group_1_0__0
                     {
-                    pushFollow(FOLLOW_rule__InfixExpression__Group_1_0__0_in_rule__InfixExpression__Alternatives_12781);
+                    pushFollow(FOLLOW_2);
                     rule__InfixExpression__Group_1_0__0();
 
                     state._fsp--;
@@ -4117,18 +4117,18 @@ else if ( (LA8_4==39) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1325:6: ( ( rule__InfixExpression__Group_1_1__0 ) )
+                    // InternalExpression.g:1325:6: ( ( rule__InfixExpression__Group_1_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1325:6: ( ( rule__InfixExpression__Group_1_1__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1326:1: ( rule__InfixExpression__Group_1_1__0 )
+                    // InternalExpression.g:1325:6: ( ( rule__InfixExpression__Group_1_1__0 ) )
+                    // InternalExpression.g:1326:1: ( rule__InfixExpression__Group_1_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getInfixExpressionAccess().getGroup_1_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1327:1: ( rule__InfixExpression__Group_1_1__0 )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1327:2: rule__InfixExpression__Group_1_1__0
+                    // InternalExpression.g:1327:1: ( rule__InfixExpression__Group_1_1__0 )
+                    // InternalExpression.g:1327:2: rule__InfixExpression__Group_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__InfixExpression__Group_1_1__0_in_rule__InfixExpression__Alternatives_12799);
+                    pushFollow(FOLLOW_2);
                     rule__InfixExpression__Group_1_1__0();
 
                     state._fsp--;
@@ -4146,18 +4146,18 @@ else if ( (LA8_4==39) ) {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1331:6: ( ( rule__InfixExpression__Group_1_2__0 ) )
+                    // InternalExpression.g:1331:6: ( ( rule__InfixExpression__Group_1_2__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1331:6: ( ( rule__InfixExpression__Group_1_2__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1332:1: ( rule__InfixExpression__Group_1_2__0 )
+                    // InternalExpression.g:1331:6: ( ( rule__InfixExpression__Group_1_2__0 ) )
+                    // InternalExpression.g:1332:1: ( rule__InfixExpression__Group_1_2__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getInfixExpressionAccess().getGroup_1_2()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1333:1: ( rule__InfixExpression__Group_1_2__0 )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1333:2: rule__InfixExpression__Group_1_2__0
+                    // InternalExpression.g:1333:1: ( rule__InfixExpression__Group_1_2__0 )
+                    // InternalExpression.g:1333:2: rule__InfixExpression__Group_1_2__0
                     {
-                    pushFollow(FOLLOW_rule__InfixExpression__Group_1_2__0_in_rule__InfixExpression__Alternatives_12817);
+                    pushFollow(FOLLOW_2);
                     rule__InfixExpression__Group_1_2__0();
 
                     state._fsp--;
@@ -4175,18 +4175,18 @@ else if ( (LA8_4==39) ) {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1337:6: ( ( rule__InfixExpression__Group_1_3__0 ) )
+                    // InternalExpression.g:1337:6: ( ( rule__InfixExpression__Group_1_3__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1337:6: ( ( rule__InfixExpression__Group_1_3__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1338:1: ( rule__InfixExpression__Group_1_3__0 )
+                    // InternalExpression.g:1337:6: ( ( rule__InfixExpression__Group_1_3__0 ) )
+                    // InternalExpression.g:1338:1: ( rule__InfixExpression__Group_1_3__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getInfixExpressionAccess().getGroup_1_3()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1339:1: ( rule__InfixExpression__Group_1_3__0 )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1339:2: rule__InfixExpression__Group_1_3__0
+                    // InternalExpression.g:1339:1: ( rule__InfixExpression__Group_1_3__0 )
+                    // InternalExpression.g:1339:2: rule__InfixExpression__Group_1_3__0
                     {
-                    pushFollow(FOLLOW_rule__InfixExpression__Group_1_3__0_in_rule__InfixExpression__Alternatives_12835);
+                    pushFollow(FOLLOW_2);
                     rule__InfixExpression__Group_1_3__0();
 
                     state._fsp--;
@@ -4221,13 +4221,13 @@ else if ( (LA8_4==39) ) {
 
 
     // $ANTLR start "rule__InfixExpression__NameAlternatives_1_3_2_0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1348:1: rule__InfixExpression__NameAlternatives_1_3_2_0 : ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) );
+    // InternalExpression.g:1348:1: rule__InfixExpression__NameAlternatives_1_3_2_0 : ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) );
     public final void rule__InfixExpression__NameAlternatives_1_3_2_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1352:1: ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) )
+            // InternalExpression.g:1352:1: ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) )
             int alt9=8;
             switch ( input.LA(1) ) {
             case 23:
@@ -4280,15 +4280,15 @@ public final void rule__InfixExpression__NameAlternatives_1_3_2_0() throws Recog
 
             switch (alt9) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1353:1: ( 'collect' )
+                    // InternalExpression.g:1353:1: ( 'collect' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1353:1: ( 'collect' )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1354:1: 'collect'
+                    // InternalExpression.g:1353:1: ( 'collect' )
+                    // InternalExpression.g:1354:1: 'collect'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getInfixExpressionAccess().getNameCollectKeyword_1_3_2_0_0()); 
                     }
-                    match(input,23,FOLLOW_23_in_rule__InfixExpression__NameAlternatives_1_3_2_02869); if (state.failed) return ;
+                    match(input,23,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getInfixExpressionAccess().getNameCollectKeyword_1_3_2_0_0()); 
                     }
@@ -4299,15 +4299,15 @@ public final void rule__InfixExpression__NameAlternatives_1_3_2_0() throws Recog
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1361:6: ( 'select' )
+                    // InternalExpression.g:1361:6: ( 'select' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1361:6: ( 'select' )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1362:1: 'select'
+                    // InternalExpression.g:1361:6: ( 'select' )
+                    // InternalExpression.g:1362:1: 'select'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getInfixExpressionAccess().getNameSelectKeyword_1_3_2_0_1()); 
                     }
-                    match(input,24,FOLLOW_24_in_rule__InfixExpression__NameAlternatives_1_3_2_02889); if (state.failed) return ;
+                    match(input,24,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getInfixExpressionAccess().getNameSelectKeyword_1_3_2_0_1()); 
                     }
@@ -4318,15 +4318,15 @@ public final void rule__InfixExpression__NameAlternatives_1_3_2_0() throws Recog
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1369:6: ( 'selectFirst' )
+                    // InternalExpression.g:1369:6: ( 'selectFirst' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1369:6: ( 'selectFirst' )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1370:1: 'selectFirst'
+                    // InternalExpression.g:1369:6: ( 'selectFirst' )
+                    // InternalExpression.g:1370:1: 'selectFirst'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getInfixExpressionAccess().getNameSelectFirstKeyword_1_3_2_0_2()); 
                     }
-                    match(input,25,FOLLOW_25_in_rule__InfixExpression__NameAlternatives_1_3_2_02909); if (state.failed) return ;
+                    match(input,25,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getInfixExpressionAccess().getNameSelectFirstKeyword_1_3_2_0_2()); 
                     }
@@ -4337,15 +4337,15 @@ public final void rule__InfixExpression__NameAlternatives_1_3_2_0() throws Recog
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1377:6: ( 'reject' )
+                    // InternalExpression.g:1377:6: ( 'reject' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1377:6: ( 'reject' )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1378:1: 'reject'
+                    // InternalExpression.g:1377:6: ( 'reject' )
+                    // InternalExpression.g:1378:1: 'reject'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getInfixExpressionAccess().getNameRejectKeyword_1_3_2_0_3()); 
                     }
-                    match(input,26,FOLLOW_26_in_rule__InfixExpression__NameAlternatives_1_3_2_02929); if (state.failed) return ;
+                    match(input,26,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getInfixExpressionAccess().getNameRejectKeyword_1_3_2_0_3()); 
                     }
@@ -4356,15 +4356,15 @@ public final void rule__InfixExpression__NameAlternatives_1_3_2_0() throws Recog
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1385:6: ( 'exists' )
+                    // InternalExpression.g:1385:6: ( 'exists' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1385:6: ( 'exists' )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1386:1: 'exists'
+                    // InternalExpression.g:1385:6: ( 'exists' )
+                    // InternalExpression.g:1386:1: 'exists'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getInfixExpressionAccess().getNameExistsKeyword_1_3_2_0_4()); 
                     }
-                    match(input,27,FOLLOW_27_in_rule__InfixExpression__NameAlternatives_1_3_2_02949); if (state.failed) return ;
+                    match(input,27,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getInfixExpressionAccess().getNameExistsKeyword_1_3_2_0_4()); 
                     }
@@ -4375,15 +4375,15 @@ public final void rule__InfixExpression__NameAlternatives_1_3_2_0() throws Recog
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1393:6: ( 'notExists' )
+                    // InternalExpression.g:1393:6: ( 'notExists' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1393:6: ( 'notExists' )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1394:1: 'notExists'
+                    // InternalExpression.g:1393:6: ( 'notExists' )
+                    // InternalExpression.g:1394:1: 'notExists'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getInfixExpressionAccess().getNameNotExistsKeyword_1_3_2_0_5()); 
                     }
-                    match(input,28,FOLLOW_28_in_rule__InfixExpression__NameAlternatives_1_3_2_02969); if (state.failed) return ;
+                    match(input,28,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getInfixExpressionAccess().getNameNotExistsKeyword_1_3_2_0_5()); 
                     }
@@ -4394,15 +4394,15 @@ public final void rule__InfixExpression__NameAlternatives_1_3_2_0() throws Recog
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1401:6: ( 'sortBy' )
+                    // InternalExpression.g:1401:6: ( 'sortBy' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1401:6: ( 'sortBy' )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1402:1: 'sortBy'
+                    // InternalExpression.g:1401:6: ( 'sortBy' )
+                    // InternalExpression.g:1402:1: 'sortBy'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getInfixExpressionAccess().getNameSortByKeyword_1_3_2_0_6()); 
                     }
-                    match(input,29,FOLLOW_29_in_rule__InfixExpression__NameAlternatives_1_3_2_02989); if (state.failed) return ;
+                    match(input,29,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getInfixExpressionAccess().getNameSortByKeyword_1_3_2_0_6()); 
                     }
@@ -4413,15 +4413,15 @@ public final void rule__InfixExpression__NameAlternatives_1_3_2_0() throws Recog
                     }
                     break;
                 case 8 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1409:6: ( 'forAll' )
+                    // InternalExpression.g:1409:6: ( 'forAll' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1409:6: ( 'forAll' )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1410:1: 'forAll'
+                    // InternalExpression.g:1409:6: ( 'forAll' )
+                    // InternalExpression.g:1410:1: 'forAll'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getInfixExpressionAccess().getNameForAllKeyword_1_3_2_0_7()); 
                     }
-                    match(input,30,FOLLOW_30_in_rule__InfixExpression__NameAlternatives_1_3_2_03009); if (state.failed) return ;
+                    match(input,30,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getInfixExpressionAccess().getNameForAllKeyword_1_3_2_0_7()); 
                     }
@@ -4449,13 +4449,13 @@ public final void rule__InfixExpression__NameAlternatives_1_3_2_0() throws Recog
 
 
     // $ANTLR start "rule__PrimaryExpression__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1422:1: rule__PrimaryExpression__Alternatives : ( ( ruleLiteral ) | ( ruleFeatureCall ) | ( ruleListLiteral ) | ( ruleConstructorCallExpression ) | ( ruleGlobalVarExpression ) | ( ruleParanthesizedExpression ) );
+    // InternalExpression.g:1422:1: rule__PrimaryExpression__Alternatives : ( ( ruleLiteral ) | ( ruleFeatureCall ) | ( ruleListLiteral ) | ( ruleConstructorCallExpression ) | ( ruleGlobalVarExpression ) | ( ruleParanthesizedExpression ) );
     public final void rule__PrimaryExpression__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1426:1: ( ( ruleLiteral ) | ( ruleFeatureCall ) | ( ruleListLiteral ) | ( ruleConstructorCallExpression ) | ( ruleGlobalVarExpression ) | ( ruleParanthesizedExpression ) )
+            // InternalExpression.g:1426:1: ( ( ruleLiteral ) | ( ruleFeatureCall ) | ( ruleListLiteral ) | ( ruleConstructorCallExpression ) | ( ruleGlobalVarExpression ) | ( ruleParanthesizedExpression ) )
             int alt10=6;
             switch ( input.LA(1) ) {
             case RULE_INT:
@@ -4515,15 +4515,15 @@ public final void rule__PrimaryExpression__Alternatives() throws RecognitionExce
 
             switch (alt10) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1427:1: ( ruleLiteral )
+                    // InternalExpression.g:1427:1: ( ruleLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1427:1: ( ruleLiteral )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1428:1: ruleLiteral
+                    // InternalExpression.g:1427:1: ( ruleLiteral )
+                    // InternalExpression.g:1428:1: ruleLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getPrimaryExpressionAccess().getLiteralParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleLiteral_in_rule__PrimaryExpression__Alternatives3043);
+                    pushFollow(FOLLOW_2);
                     ruleLiteral();
 
                     state._fsp--;
@@ -4538,15 +4538,15 @@ public final void rule__PrimaryExpression__Alternatives() throws RecognitionExce
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1433:6: ( ruleFeatureCall )
+                    // InternalExpression.g:1433:6: ( ruleFeatureCall )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1433:6: ( ruleFeatureCall )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1434:1: ruleFeatureCall
+                    // InternalExpression.g:1433:6: ( ruleFeatureCall )
+                    // InternalExpression.g:1434:1: ruleFeatureCall
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getPrimaryExpressionAccess().getFeatureCallParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleFeatureCall_in_rule__PrimaryExpression__Alternatives3060);
+                    pushFollow(FOLLOW_2);
                     ruleFeatureCall();
 
                     state._fsp--;
@@ -4561,15 +4561,15 @@ public final void rule__PrimaryExpression__Alternatives() throws RecognitionExce
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1439:6: ( ruleListLiteral )
+                    // InternalExpression.g:1439:6: ( ruleListLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1439:6: ( ruleListLiteral )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1440:1: ruleListLiteral
+                    // InternalExpression.g:1439:6: ( ruleListLiteral )
+                    // InternalExpression.g:1440:1: ruleListLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getPrimaryExpressionAccess().getListLiteralParserRuleCall_2()); 
                     }
-                    pushFollow(FOLLOW_ruleListLiteral_in_rule__PrimaryExpression__Alternatives3077);
+                    pushFollow(FOLLOW_2);
                     ruleListLiteral();
 
                     state._fsp--;
@@ -4584,15 +4584,15 @@ public final void rule__PrimaryExpression__Alternatives() throws RecognitionExce
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1445:6: ( ruleConstructorCallExpression )
+                    // InternalExpression.g:1445:6: ( ruleConstructorCallExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1445:6: ( ruleConstructorCallExpression )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1446:1: ruleConstructorCallExpression
+                    // InternalExpression.g:1445:6: ( ruleConstructorCallExpression )
+                    // InternalExpression.g:1446:1: ruleConstructorCallExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getPrimaryExpressionAccess().getConstructorCallExpressionParserRuleCall_3()); 
                     }
-                    pushFollow(FOLLOW_ruleConstructorCallExpression_in_rule__PrimaryExpression__Alternatives3094);
+                    pushFollow(FOLLOW_2);
                     ruleConstructorCallExpression();
 
                     state._fsp--;
@@ -4607,15 +4607,15 @@ public final void rule__PrimaryExpression__Alternatives() throws RecognitionExce
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1451:6: ( ruleGlobalVarExpression )
+                    // InternalExpression.g:1451:6: ( ruleGlobalVarExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1451:6: ( ruleGlobalVarExpression )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1452:1: ruleGlobalVarExpression
+                    // InternalExpression.g:1451:6: ( ruleGlobalVarExpression )
+                    // InternalExpression.g:1452:1: ruleGlobalVarExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getPrimaryExpressionAccess().getGlobalVarExpressionParserRuleCall_4()); 
                     }
-                    pushFollow(FOLLOW_ruleGlobalVarExpression_in_rule__PrimaryExpression__Alternatives3111);
+                    pushFollow(FOLLOW_2);
                     ruleGlobalVarExpression();
 
                     state._fsp--;
@@ -4630,15 +4630,15 @@ public final void rule__PrimaryExpression__Alternatives() throws RecognitionExce
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1457:6: ( ruleParanthesizedExpression )
+                    // InternalExpression.g:1457:6: ( ruleParanthesizedExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1457:6: ( ruleParanthesizedExpression )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1458:1: ruleParanthesizedExpression
+                    // InternalExpression.g:1457:6: ( ruleParanthesizedExpression )
+                    // InternalExpression.g:1458:1: ruleParanthesizedExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getPrimaryExpressionAccess().getParanthesizedExpressionParserRuleCall_5()); 
                     }
-                    pushFollow(FOLLOW_ruleParanthesizedExpression_in_rule__PrimaryExpression__Alternatives3128);
+                    pushFollow(FOLLOW_2);
                     ruleParanthesizedExpression();
 
                     state._fsp--;
@@ -4670,13 +4670,13 @@ public final void rule__PrimaryExpression__Alternatives() throws RecognitionExce
 
 
     // $ANTLR start "rule__Literal__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1468:1: rule__Literal__Alternatives : ( ( ruleBooleanLiteral ) | ( ruleIntegerLiteral ) | ( ruleNullLiteral ) | ( ruleRealLiteral ) | ( ruleStringLiteral ) );
+    // InternalExpression.g:1468:1: rule__Literal__Alternatives : ( ( ruleBooleanLiteral ) | ( ruleIntegerLiteral ) | ( ruleNullLiteral ) | ( ruleRealLiteral ) | ( ruleStringLiteral ) );
     public final void rule__Literal__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1472:1: ( ( ruleBooleanLiteral ) | ( ruleIntegerLiteral ) | ( ruleNullLiteral ) | ( ruleRealLiteral ) | ( ruleStringLiteral ) )
+            // InternalExpression.g:1472:1: ( ( ruleBooleanLiteral ) | ( ruleIntegerLiteral ) | ( ruleNullLiteral ) | ( ruleRealLiteral ) | ( ruleStringLiteral ) )
             int alt11=5;
             switch ( input.LA(1) ) {
             case 31:
@@ -4715,15 +4715,15 @@ public final void rule__Literal__Alternatives() throws RecognitionException {
 
             switch (alt11) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1473:1: ( ruleBooleanLiteral )
+                    // InternalExpression.g:1473:1: ( ruleBooleanLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1473:1: ( ruleBooleanLiteral )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1474:1: ruleBooleanLiteral
+                    // InternalExpression.g:1473:1: ( ruleBooleanLiteral )
+                    // InternalExpression.g:1474:1: ruleBooleanLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getLiteralAccess().getBooleanLiteralParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleBooleanLiteral_in_rule__Literal__Alternatives3160);
+                    pushFollow(FOLLOW_2);
                     ruleBooleanLiteral();
 
                     state._fsp--;
@@ -4738,15 +4738,15 @@ public final void rule__Literal__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1479:6: ( ruleIntegerLiteral )
+                    // InternalExpression.g:1479:6: ( ruleIntegerLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1479:6: ( ruleIntegerLiteral )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1480:1: ruleIntegerLiteral
+                    // InternalExpression.g:1479:6: ( ruleIntegerLiteral )
+                    // InternalExpression.g:1480:1: ruleIntegerLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getLiteralAccess().getIntegerLiteralParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleIntegerLiteral_in_rule__Literal__Alternatives3177);
+                    pushFollow(FOLLOW_2);
                     ruleIntegerLiteral();
 
                     state._fsp--;
@@ -4761,15 +4761,15 @@ public final void rule__Literal__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1485:6: ( ruleNullLiteral )
+                    // InternalExpression.g:1485:6: ( ruleNullLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1485:6: ( ruleNullLiteral )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1486:1: ruleNullLiteral
+                    // InternalExpression.g:1485:6: ( ruleNullLiteral )
+                    // InternalExpression.g:1486:1: ruleNullLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getLiteralAccess().getNullLiteralParserRuleCall_2()); 
                     }
-                    pushFollow(FOLLOW_ruleNullLiteral_in_rule__Literal__Alternatives3194);
+                    pushFollow(FOLLOW_2);
                     ruleNullLiteral();
 
                     state._fsp--;
@@ -4784,15 +4784,15 @@ public final void rule__Literal__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1491:6: ( ruleRealLiteral )
+                    // InternalExpression.g:1491:6: ( ruleRealLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1491:6: ( ruleRealLiteral )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1492:1: ruleRealLiteral
+                    // InternalExpression.g:1491:6: ( ruleRealLiteral )
+                    // InternalExpression.g:1492:1: ruleRealLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getLiteralAccess().getRealLiteralParserRuleCall_3()); 
                     }
-                    pushFollow(FOLLOW_ruleRealLiteral_in_rule__Literal__Alternatives3211);
+                    pushFollow(FOLLOW_2);
                     ruleRealLiteral();
 
                     state._fsp--;
@@ -4807,15 +4807,15 @@ public final void rule__Literal__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1497:6: ( ruleStringLiteral )
+                    // InternalExpression.g:1497:6: ( ruleStringLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1497:6: ( ruleStringLiteral )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1498:1: ruleStringLiteral
+                    // InternalExpression.g:1497:6: ( ruleStringLiteral )
+                    // InternalExpression.g:1498:1: ruleStringLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getLiteralAccess().getStringLiteralParserRuleCall_4()); 
                     }
-                    pushFollow(FOLLOW_ruleStringLiteral_in_rule__Literal__Alternatives3228);
+                    pushFollow(FOLLOW_2);
                     ruleStringLiteral();
 
                     state._fsp--;
@@ -4847,13 +4847,13 @@ public final void rule__Literal__Alternatives() throws RecognitionException {
 
 
     // $ANTLR start "rule__BooleanLiteral__ValAlternatives_0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1508:1: rule__BooleanLiteral__ValAlternatives_0 : ( ( 'true' ) | ( 'false' ) );
+    // InternalExpression.g:1508:1: rule__BooleanLiteral__ValAlternatives_0 : ( ( 'true' ) | ( 'false' ) );
     public final void rule__BooleanLiteral__ValAlternatives_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1512:1: ( ( 'true' ) | ( 'false' ) )
+            // InternalExpression.g:1512:1: ( ( 'true' ) | ( 'false' ) )
             int alt12=2;
             int LA12_0 = input.LA(1);
 
@@ -4872,15 +4872,15 @@ else if ( (LA12_0==32) ) {
             }
             switch (alt12) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1513:1: ( 'true' )
+                    // InternalExpression.g:1513:1: ( 'true' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1513:1: ( 'true' )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1514:1: 'true'
+                    // InternalExpression.g:1513:1: ( 'true' )
+                    // InternalExpression.g:1514:1: 'true'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getBooleanLiteralAccess().getValTrueKeyword_0_0()); 
                     }
-                    match(input,31,FOLLOW_31_in_rule__BooleanLiteral__ValAlternatives_03261); if (state.failed) return ;
+                    match(input,31,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getBooleanLiteralAccess().getValTrueKeyword_0_0()); 
                     }
@@ -4891,15 +4891,15 @@ else if ( (LA12_0==32) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1521:6: ( 'false' )
+                    // InternalExpression.g:1521:6: ( 'false' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1521:6: ( 'false' )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1522:1: 'false'
+                    // InternalExpression.g:1521:6: ( 'false' )
+                    // InternalExpression.g:1522:1: 'false'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getBooleanLiteralAccess().getValFalseKeyword_0_1()); 
                     }
-                    match(input,32,FOLLOW_32_in_rule__BooleanLiteral__ValAlternatives_03281); if (state.failed) return ;
+                    match(input,32,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getBooleanLiteralAccess().getValFalseKeyword_0_1()); 
                     }
@@ -4927,13 +4927,13 @@ else if ( (LA12_0==32) ) {
 
 
     // $ANTLR start "rule__FeatureCall__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1534:1: rule__FeatureCall__Alternatives : ( ( ruleOperationCall ) | ( ( rule__FeatureCall__TypeAssignment_1 ) ) | ( ruleCollectionExpression ) | ( ruleTypeSelectExpression ) );
+    // InternalExpression.g:1534:1: rule__FeatureCall__Alternatives : ( ( ruleOperationCall ) | ( ( rule__FeatureCall__TypeAssignment_1 ) ) | ( ruleCollectionExpression ) | ( ruleTypeSelectExpression ) );
     public final void rule__FeatureCall__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1538:1: ( ( ruleOperationCall ) | ( ( rule__FeatureCall__TypeAssignment_1 ) ) | ( ruleCollectionExpression ) | ( ruleTypeSelectExpression ) )
+            // InternalExpression.g:1538:1: ( ( ruleOperationCall ) | ( ( rule__FeatureCall__TypeAssignment_1 ) ) | ( ruleCollectionExpression ) | ( ruleTypeSelectExpression ) )
             int alt13=4;
             switch ( input.LA(1) ) {
             case RULE_ID:
@@ -4989,15 +4989,15 @@ else if ( (LA13_1==39) ) {
 
             switch (alt13) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1539:1: ( ruleOperationCall )
+                    // InternalExpression.g:1539:1: ( ruleOperationCall )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1539:1: ( ruleOperationCall )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1540:1: ruleOperationCall
+                    // InternalExpression.g:1539:1: ( ruleOperationCall )
+                    // InternalExpression.g:1540:1: ruleOperationCall
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallAccess().getOperationCallParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleOperationCall_in_rule__FeatureCall__Alternatives3315);
+                    pushFollow(FOLLOW_2);
                     ruleOperationCall();
 
                     state._fsp--;
@@ -5012,18 +5012,18 @@ else if ( (LA13_1==39) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1545:6: ( ( rule__FeatureCall__TypeAssignment_1 ) )
+                    // InternalExpression.g:1545:6: ( ( rule__FeatureCall__TypeAssignment_1 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1545:6: ( ( rule__FeatureCall__TypeAssignment_1 ) )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1546:1: ( rule__FeatureCall__TypeAssignment_1 )
+                    // InternalExpression.g:1545:6: ( ( rule__FeatureCall__TypeAssignment_1 ) )
+                    // InternalExpression.g:1546:1: ( rule__FeatureCall__TypeAssignment_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallAccess().getTypeAssignment_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1547:1: ( rule__FeatureCall__TypeAssignment_1 )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1547:2: rule__FeatureCall__TypeAssignment_1
+                    // InternalExpression.g:1547:1: ( rule__FeatureCall__TypeAssignment_1 )
+                    // InternalExpression.g:1547:2: rule__FeatureCall__TypeAssignment_1
                     {
-                    pushFollow(FOLLOW_rule__FeatureCall__TypeAssignment_1_in_rule__FeatureCall__Alternatives3332);
+                    pushFollow(FOLLOW_2);
                     rule__FeatureCall__TypeAssignment_1();
 
                     state._fsp--;
@@ -5041,15 +5041,15 @@ else if ( (LA13_1==39) ) {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1551:6: ( ruleCollectionExpression )
+                    // InternalExpression.g:1551:6: ( ruleCollectionExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1551:6: ( ruleCollectionExpression )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1552:1: ruleCollectionExpression
+                    // InternalExpression.g:1551:6: ( ruleCollectionExpression )
+                    // InternalExpression.g:1552:1: ruleCollectionExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallAccess().getCollectionExpressionParserRuleCall_2()); 
                     }
-                    pushFollow(FOLLOW_ruleCollectionExpression_in_rule__FeatureCall__Alternatives3350);
+                    pushFollow(FOLLOW_2);
                     ruleCollectionExpression();
 
                     state._fsp--;
@@ -5064,15 +5064,15 @@ else if ( (LA13_1==39) ) {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1557:6: ( ruleTypeSelectExpression )
+                    // InternalExpression.g:1557:6: ( ruleTypeSelectExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1557:6: ( ruleTypeSelectExpression )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1558:1: ruleTypeSelectExpression
+                    // InternalExpression.g:1557:6: ( ruleTypeSelectExpression )
+                    // InternalExpression.g:1558:1: ruleTypeSelectExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallAccess().getTypeSelectExpressionParserRuleCall_3()); 
                     }
-                    pushFollow(FOLLOW_ruleTypeSelectExpression_in_rule__FeatureCall__Alternatives3367);
+                    pushFollow(FOLLOW_2);
                     ruleTypeSelectExpression();
 
                     state._fsp--;
@@ -5104,13 +5104,13 @@ else if ( (LA13_1==39) ) {
 
 
     // $ANTLR start "rule__CollectionExpression__NameAlternatives_0_0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1568:1: rule__CollectionExpression__NameAlternatives_0_0 : ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) );
+    // InternalExpression.g:1568:1: rule__CollectionExpression__NameAlternatives_0_0 : ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) );
     public final void rule__CollectionExpression__NameAlternatives_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1572:1: ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) )
+            // InternalExpression.g:1572:1: ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) )
             int alt14=8;
             switch ( input.LA(1) ) {
             case 23:
@@ -5163,15 +5163,15 @@ public final void rule__CollectionExpression__NameAlternatives_0_0() throws Reco
 
             switch (alt14) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1573:1: ( 'collect' )
+                    // InternalExpression.g:1573:1: ( 'collect' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1573:1: ( 'collect' )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1574:1: 'collect'
+                    // InternalExpression.g:1573:1: ( 'collect' )
+                    // InternalExpression.g:1574:1: 'collect'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getCollectionExpressionAccess().getNameCollectKeyword_0_0_0()); 
                     }
-                    match(input,23,FOLLOW_23_in_rule__CollectionExpression__NameAlternatives_0_03400); if (state.failed) return ;
+                    match(input,23,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getCollectionExpressionAccess().getNameCollectKeyword_0_0_0()); 
                     }
@@ -5182,15 +5182,15 @@ public final void rule__CollectionExpression__NameAlternatives_0_0() throws Reco
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1581:6: ( 'select' )
+                    // InternalExpression.g:1581:6: ( 'select' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1581:6: ( 'select' )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1582:1: 'select'
+                    // InternalExpression.g:1581:6: ( 'select' )
+                    // InternalExpression.g:1582:1: 'select'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getCollectionExpressionAccess().getNameSelectKeyword_0_0_1()); 
                     }
-                    match(input,24,FOLLOW_24_in_rule__CollectionExpression__NameAlternatives_0_03420); if (state.failed) return ;
+                    match(input,24,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getCollectionExpressionAccess().getNameSelectKeyword_0_0_1()); 
                     }
@@ -5201,15 +5201,15 @@ public final void rule__CollectionExpression__NameAlternatives_0_0() throws Reco
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1589:6: ( 'selectFirst' )
+                    // InternalExpression.g:1589:6: ( 'selectFirst' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1589:6: ( 'selectFirst' )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1590:1: 'selectFirst'
+                    // InternalExpression.g:1589:6: ( 'selectFirst' )
+                    // InternalExpression.g:1590:1: 'selectFirst'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getCollectionExpressionAccess().getNameSelectFirstKeyword_0_0_2()); 
                     }
-                    match(input,25,FOLLOW_25_in_rule__CollectionExpression__NameAlternatives_0_03440); if (state.failed) return ;
+                    match(input,25,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getCollectionExpressionAccess().getNameSelectFirstKeyword_0_0_2()); 
                     }
@@ -5220,15 +5220,15 @@ public final void rule__CollectionExpression__NameAlternatives_0_0() throws Reco
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1597:6: ( 'reject' )
+                    // InternalExpression.g:1597:6: ( 'reject' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1597:6: ( 'reject' )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1598:1: 'reject'
+                    // InternalExpression.g:1597:6: ( 'reject' )
+                    // InternalExpression.g:1598:1: 'reject'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getCollectionExpressionAccess().getNameRejectKeyword_0_0_3()); 
                     }
-                    match(input,26,FOLLOW_26_in_rule__CollectionExpression__NameAlternatives_0_03460); if (state.failed) return ;
+                    match(input,26,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getCollectionExpressionAccess().getNameRejectKeyword_0_0_3()); 
                     }
@@ -5239,15 +5239,15 @@ public final void rule__CollectionExpression__NameAlternatives_0_0() throws Reco
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1605:6: ( 'exists' )
+                    // InternalExpression.g:1605:6: ( 'exists' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1605:6: ( 'exists' )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1606:1: 'exists'
+                    // InternalExpression.g:1605:6: ( 'exists' )
+                    // InternalExpression.g:1606:1: 'exists'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getCollectionExpressionAccess().getNameExistsKeyword_0_0_4()); 
                     }
-                    match(input,27,FOLLOW_27_in_rule__CollectionExpression__NameAlternatives_0_03480); if (state.failed) return ;
+                    match(input,27,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getCollectionExpressionAccess().getNameExistsKeyword_0_0_4()); 
                     }
@@ -5258,15 +5258,15 @@ public final void rule__CollectionExpression__NameAlternatives_0_0() throws Reco
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1613:6: ( 'notExists' )
+                    // InternalExpression.g:1613:6: ( 'notExists' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1613:6: ( 'notExists' )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1614:1: 'notExists'
+                    // InternalExpression.g:1613:6: ( 'notExists' )
+                    // InternalExpression.g:1614:1: 'notExists'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getCollectionExpressionAccess().getNameNotExistsKeyword_0_0_5()); 
                     }
-                    match(input,28,FOLLOW_28_in_rule__CollectionExpression__NameAlternatives_0_03500); if (state.failed) return ;
+                    match(input,28,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getCollectionExpressionAccess().getNameNotExistsKeyword_0_0_5()); 
                     }
@@ -5277,15 +5277,15 @@ public final void rule__CollectionExpression__NameAlternatives_0_0() throws Reco
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1621:6: ( 'sortBy' )
+                    // InternalExpression.g:1621:6: ( 'sortBy' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1621:6: ( 'sortBy' )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1622:1: 'sortBy'
+                    // InternalExpression.g:1621:6: ( 'sortBy' )
+                    // InternalExpression.g:1622:1: 'sortBy'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getCollectionExpressionAccess().getNameSortByKeyword_0_0_6()); 
                     }
-                    match(input,29,FOLLOW_29_in_rule__CollectionExpression__NameAlternatives_0_03520); if (state.failed) return ;
+                    match(input,29,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getCollectionExpressionAccess().getNameSortByKeyword_0_0_6()); 
                     }
@@ -5296,15 +5296,15 @@ public final void rule__CollectionExpression__NameAlternatives_0_0() throws Reco
                     }
                     break;
                 case 8 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1629:6: ( 'forAll' )
+                    // InternalExpression.g:1629:6: ( 'forAll' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1629:6: ( 'forAll' )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1630:1: 'forAll'
+                    // InternalExpression.g:1629:6: ( 'forAll' )
+                    // InternalExpression.g:1630:1: 'forAll'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getCollectionExpressionAccess().getNameForAllKeyword_0_0_7()); 
                     }
-                    match(input,30,FOLLOW_30_in_rule__CollectionExpression__NameAlternatives_0_03540); if (state.failed) return ;
+                    match(input,30,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getCollectionExpressionAccess().getNameForAllKeyword_0_0_7()); 
                     }
@@ -5332,13 +5332,13 @@ public final void rule__CollectionExpression__NameAlternatives_0_0() throws Reco
 
 
     // $ANTLR start "rule__Type__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1642:1: rule__Type__Alternatives : ( ( ruleCollectionType ) | ( ruleSimpleType ) );
+    // InternalExpression.g:1642:1: rule__Type__Alternatives : ( ( ruleCollectionType ) | ( ruleSimpleType ) );
     public final void rule__Type__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1646:1: ( ( ruleCollectionType ) | ( ruleSimpleType ) )
+            // InternalExpression.g:1646:1: ( ( ruleCollectionType ) | ( ruleSimpleType ) )
             int alt15=2;
             int LA15_0 = input.LA(1);
 
@@ -5357,15 +5357,15 @@ else if ( (LA15_0==RULE_ID) ) {
             }
             switch (alt15) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1647:1: ( ruleCollectionType )
+                    // InternalExpression.g:1647:1: ( ruleCollectionType )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1647:1: ( ruleCollectionType )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1648:1: ruleCollectionType
+                    // InternalExpression.g:1647:1: ( ruleCollectionType )
+                    // InternalExpression.g:1648:1: ruleCollectionType
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTypeAccess().getCollectionTypeParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleCollectionType_in_rule__Type__Alternatives3574);
+                    pushFollow(FOLLOW_2);
                     ruleCollectionType();
 
                     state._fsp--;
@@ -5380,15 +5380,15 @@ else if ( (LA15_0==RULE_ID) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1653:6: ( ruleSimpleType )
+                    // InternalExpression.g:1653:6: ( ruleSimpleType )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1653:6: ( ruleSimpleType )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1654:1: ruleSimpleType
+                    // InternalExpression.g:1653:6: ( ruleSimpleType )
+                    // InternalExpression.g:1654:1: ruleSimpleType
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTypeAccess().getSimpleTypeParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleSimpleType_in_rule__Type__Alternatives3591);
+                    pushFollow(FOLLOW_2);
                     ruleSimpleType();
 
                     state._fsp--;
@@ -5420,13 +5420,13 @@ else if ( (LA15_0==RULE_ID) ) {
 
 
     // $ANTLR start "rule__CollectionType__ClAlternatives_0_0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1664:1: rule__CollectionType__ClAlternatives_0_0 : ( ( 'Collection' ) | ( 'List' ) | ( 'Set' ) );
+    // InternalExpression.g:1664:1: rule__CollectionType__ClAlternatives_0_0 : ( ( 'Collection' ) | ( 'List' ) | ( 'Set' ) );
     public final void rule__CollectionType__ClAlternatives_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1668:1: ( ( 'Collection' ) | ( 'List' ) | ( 'Set' ) )
+            // InternalExpression.g:1668:1: ( ( 'Collection' ) | ( 'List' ) | ( 'Set' ) )
             int alt16=3;
             switch ( input.LA(1) ) {
             case 33:
@@ -5454,15 +5454,15 @@ public final void rule__CollectionType__ClAlternatives_0_0() throws RecognitionE
 
             switch (alt16) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1669:1: ( 'Collection' )
+                    // InternalExpression.g:1669:1: ( 'Collection' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1669:1: ( 'Collection' )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1670:1: 'Collection'
+                    // InternalExpression.g:1669:1: ( 'Collection' )
+                    // InternalExpression.g:1670:1: 'Collection'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getCollectionTypeAccess().getClCollectionKeyword_0_0_0()); 
                     }
-                    match(input,33,FOLLOW_33_in_rule__CollectionType__ClAlternatives_0_03624); if (state.failed) return ;
+                    match(input,33,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getCollectionTypeAccess().getClCollectionKeyword_0_0_0()); 
                     }
@@ -5473,15 +5473,15 @@ public final void rule__CollectionType__ClAlternatives_0_0() throws RecognitionE
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1677:6: ( 'List' )
+                    // InternalExpression.g:1677:6: ( 'List' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1677:6: ( 'List' )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1678:1: 'List'
+                    // InternalExpression.g:1677:6: ( 'List' )
+                    // InternalExpression.g:1678:1: 'List'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getCollectionTypeAccess().getClListKeyword_0_0_1()); 
                     }
-                    match(input,34,FOLLOW_34_in_rule__CollectionType__ClAlternatives_0_03644); if (state.failed) return ;
+                    match(input,34,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getCollectionTypeAccess().getClListKeyword_0_0_1()); 
                     }
@@ -5492,15 +5492,15 @@ public final void rule__CollectionType__ClAlternatives_0_0() throws RecognitionE
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1685:6: ( 'Set' )
+                    // InternalExpression.g:1685:6: ( 'Set' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1685:6: ( 'Set' )
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1686:1: 'Set'
+                    // InternalExpression.g:1685:6: ( 'Set' )
+                    // InternalExpression.g:1686:1: 'Set'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getCollectionTypeAccess().getClSetKeyword_0_0_2()); 
                     }
-                    match(input,35,FOLLOW_35_in_rule__CollectionType__ClAlternatives_0_03664); if (state.failed) return ;
+                    match(input,35,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getCollectionTypeAccess().getClSetKeyword_0_0_2()); 
                     }
@@ -5528,21 +5528,21 @@ public final void rule__CollectionType__ClAlternatives_0_0() throws RecognitionE
 
 
     // $ANTLR start "rule__LetExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1700:1: rule__LetExpression__Group__0 : rule__LetExpression__Group__0__Impl rule__LetExpression__Group__1 ;
+    // InternalExpression.g:1700:1: rule__LetExpression__Group__0 : rule__LetExpression__Group__0__Impl rule__LetExpression__Group__1 ;
     public final void rule__LetExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1704:1: ( rule__LetExpression__Group__0__Impl rule__LetExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1705:2: rule__LetExpression__Group__0__Impl rule__LetExpression__Group__1
+            // InternalExpression.g:1704:1: ( rule__LetExpression__Group__0__Impl rule__LetExpression__Group__1 )
+            // InternalExpression.g:1705:2: rule__LetExpression__Group__0__Impl rule__LetExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__LetExpression__Group__0__Impl_in_rule__LetExpression__Group__03696);
+            pushFollow(FOLLOW_3);
             rule__LetExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__LetExpression__Group__1_in_rule__LetExpression__Group__03699);
+            pushFollow(FOLLOW_2);
             rule__LetExpression__Group__1();
 
             state._fsp--;
@@ -5566,22 +5566,22 @@ public final void rule__LetExpression__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__LetExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1712:1: rule__LetExpression__Group__0__Impl : ( 'let' ) ;
+    // InternalExpression.g:1712:1: rule__LetExpression__Group__0__Impl : ( 'let' ) ;
     public final void rule__LetExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1716:1: ( ( 'let' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1717:1: ( 'let' )
+            // InternalExpression.g:1716:1: ( ( 'let' ) )
+            // InternalExpression.g:1717:1: ( 'let' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1717:1: ( 'let' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1718:1: 'let'
+            // InternalExpression.g:1717:1: ( 'let' )
+            // InternalExpression.g:1718:1: 'let'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLetExpressionAccess().getLetKeyword_0()); 
             }
-            match(input,36,FOLLOW_36_in_rule__LetExpression__Group__0__Impl3727); if (state.failed) return ;
+            match(input,36,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getLetExpressionAccess().getLetKeyword_0()); 
             }
@@ -5607,21 +5607,21 @@ public final void rule__LetExpression__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__LetExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1731:1: rule__LetExpression__Group__1 : rule__LetExpression__Group__1__Impl rule__LetExpression__Group__2 ;
+    // InternalExpression.g:1731:1: rule__LetExpression__Group__1 : rule__LetExpression__Group__1__Impl rule__LetExpression__Group__2 ;
     public final void rule__LetExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1735:1: ( rule__LetExpression__Group__1__Impl rule__LetExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1736:2: rule__LetExpression__Group__1__Impl rule__LetExpression__Group__2
+            // InternalExpression.g:1735:1: ( rule__LetExpression__Group__1__Impl rule__LetExpression__Group__2 )
+            // InternalExpression.g:1736:2: rule__LetExpression__Group__1__Impl rule__LetExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__LetExpression__Group__1__Impl_in_rule__LetExpression__Group__13758);
+            pushFollow(FOLLOW_4);
             rule__LetExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__LetExpression__Group__2_in_rule__LetExpression__Group__13761);
+            pushFollow(FOLLOW_2);
             rule__LetExpression__Group__2();
 
             state._fsp--;
@@ -5645,25 +5645,25 @@ public final void rule__LetExpression__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__LetExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1743:1: rule__LetExpression__Group__1__Impl : ( ( rule__LetExpression__IdentifierAssignment_1 ) ) ;
+    // InternalExpression.g:1743:1: rule__LetExpression__Group__1__Impl : ( ( rule__LetExpression__IdentifierAssignment_1 ) ) ;
     public final void rule__LetExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1747:1: ( ( ( rule__LetExpression__IdentifierAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1748:1: ( ( rule__LetExpression__IdentifierAssignment_1 ) )
+            // InternalExpression.g:1747:1: ( ( ( rule__LetExpression__IdentifierAssignment_1 ) ) )
+            // InternalExpression.g:1748:1: ( ( rule__LetExpression__IdentifierAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1748:1: ( ( rule__LetExpression__IdentifierAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1749:1: ( rule__LetExpression__IdentifierAssignment_1 )
+            // InternalExpression.g:1748:1: ( ( rule__LetExpression__IdentifierAssignment_1 ) )
+            // InternalExpression.g:1749:1: ( rule__LetExpression__IdentifierAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLetExpressionAccess().getIdentifierAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1750:1: ( rule__LetExpression__IdentifierAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1750:2: rule__LetExpression__IdentifierAssignment_1
+            // InternalExpression.g:1750:1: ( rule__LetExpression__IdentifierAssignment_1 )
+            // InternalExpression.g:1750:2: rule__LetExpression__IdentifierAssignment_1
             {
-            pushFollow(FOLLOW_rule__LetExpression__IdentifierAssignment_1_in_rule__LetExpression__Group__1__Impl3788);
+            pushFollow(FOLLOW_2);
             rule__LetExpression__IdentifierAssignment_1();
 
             state._fsp--;
@@ -5696,21 +5696,21 @@ public final void rule__LetExpression__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__LetExpression__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1760:1: rule__LetExpression__Group__2 : rule__LetExpression__Group__2__Impl rule__LetExpression__Group__3 ;
+    // InternalExpression.g:1760:1: rule__LetExpression__Group__2 : rule__LetExpression__Group__2__Impl rule__LetExpression__Group__3 ;
     public final void rule__LetExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1764:1: ( rule__LetExpression__Group__2__Impl rule__LetExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1765:2: rule__LetExpression__Group__2__Impl rule__LetExpression__Group__3
+            // InternalExpression.g:1764:1: ( rule__LetExpression__Group__2__Impl rule__LetExpression__Group__3 )
+            // InternalExpression.g:1765:2: rule__LetExpression__Group__2__Impl rule__LetExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__LetExpression__Group__2__Impl_in_rule__LetExpression__Group__23818);
+            pushFollow(FOLLOW_5);
             rule__LetExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__LetExpression__Group__3_in_rule__LetExpression__Group__23821);
+            pushFollow(FOLLOW_2);
             rule__LetExpression__Group__3();
 
             state._fsp--;
@@ -5734,22 +5734,22 @@ public final void rule__LetExpression__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__LetExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1772:1: rule__LetExpression__Group__2__Impl : ( '=' ) ;
+    // InternalExpression.g:1772:1: rule__LetExpression__Group__2__Impl : ( '=' ) ;
     public final void rule__LetExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1776:1: ( ( '=' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1777:1: ( '=' )
+            // InternalExpression.g:1776:1: ( ( '=' ) )
+            // InternalExpression.g:1777:1: ( '=' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1777:1: ( '=' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1778:1: '='
+            // InternalExpression.g:1777:1: ( '=' )
+            // InternalExpression.g:1778:1: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLetExpressionAccess().getEqualsSignKeyword_2()); 
             }
-            match(input,37,FOLLOW_37_in_rule__LetExpression__Group__2__Impl3849); if (state.failed) return ;
+            match(input,37,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getLetExpressionAccess().getEqualsSignKeyword_2()); 
             }
@@ -5775,21 +5775,21 @@ public final void rule__LetExpression__Group__2__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__LetExpression__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1791:1: rule__LetExpression__Group__3 : rule__LetExpression__Group__3__Impl rule__LetExpression__Group__4 ;
+    // InternalExpression.g:1791:1: rule__LetExpression__Group__3 : rule__LetExpression__Group__3__Impl rule__LetExpression__Group__4 ;
     public final void rule__LetExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1795:1: ( rule__LetExpression__Group__3__Impl rule__LetExpression__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1796:2: rule__LetExpression__Group__3__Impl rule__LetExpression__Group__4
+            // InternalExpression.g:1795:1: ( rule__LetExpression__Group__3__Impl rule__LetExpression__Group__4 )
+            // InternalExpression.g:1796:2: rule__LetExpression__Group__3__Impl rule__LetExpression__Group__4
             {
-            pushFollow(FOLLOW_rule__LetExpression__Group__3__Impl_in_rule__LetExpression__Group__33880);
+            pushFollow(FOLLOW_6);
             rule__LetExpression__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__LetExpression__Group__4_in_rule__LetExpression__Group__33883);
+            pushFollow(FOLLOW_2);
             rule__LetExpression__Group__4();
 
             state._fsp--;
@@ -5813,25 +5813,25 @@ public final void rule__LetExpression__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__LetExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1803:1: rule__LetExpression__Group__3__Impl : ( ( rule__LetExpression__VarExprAssignment_3 ) ) ;
+    // InternalExpression.g:1803:1: rule__LetExpression__Group__3__Impl : ( ( rule__LetExpression__VarExprAssignment_3 ) ) ;
     public final void rule__LetExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1807:1: ( ( ( rule__LetExpression__VarExprAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1808:1: ( ( rule__LetExpression__VarExprAssignment_3 ) )
+            // InternalExpression.g:1807:1: ( ( ( rule__LetExpression__VarExprAssignment_3 ) ) )
+            // InternalExpression.g:1808:1: ( ( rule__LetExpression__VarExprAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1808:1: ( ( rule__LetExpression__VarExprAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1809:1: ( rule__LetExpression__VarExprAssignment_3 )
+            // InternalExpression.g:1808:1: ( ( rule__LetExpression__VarExprAssignment_3 ) )
+            // InternalExpression.g:1809:1: ( rule__LetExpression__VarExprAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLetExpressionAccess().getVarExprAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1810:1: ( rule__LetExpression__VarExprAssignment_3 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1810:2: rule__LetExpression__VarExprAssignment_3
+            // InternalExpression.g:1810:1: ( rule__LetExpression__VarExprAssignment_3 )
+            // InternalExpression.g:1810:2: rule__LetExpression__VarExprAssignment_3
             {
-            pushFollow(FOLLOW_rule__LetExpression__VarExprAssignment_3_in_rule__LetExpression__Group__3__Impl3910);
+            pushFollow(FOLLOW_2);
             rule__LetExpression__VarExprAssignment_3();
 
             state._fsp--;
@@ -5864,21 +5864,21 @@ public final void rule__LetExpression__Group__3__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__LetExpression__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1820:1: rule__LetExpression__Group__4 : rule__LetExpression__Group__4__Impl rule__LetExpression__Group__5 ;
+    // InternalExpression.g:1820:1: rule__LetExpression__Group__4 : rule__LetExpression__Group__4__Impl rule__LetExpression__Group__5 ;
     public final void rule__LetExpression__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1824:1: ( rule__LetExpression__Group__4__Impl rule__LetExpression__Group__5 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1825:2: rule__LetExpression__Group__4__Impl rule__LetExpression__Group__5
+            // InternalExpression.g:1824:1: ( rule__LetExpression__Group__4__Impl rule__LetExpression__Group__5 )
+            // InternalExpression.g:1825:2: rule__LetExpression__Group__4__Impl rule__LetExpression__Group__5
             {
-            pushFollow(FOLLOW_rule__LetExpression__Group__4__Impl_in_rule__LetExpression__Group__43940);
+            pushFollow(FOLLOW_5);
             rule__LetExpression__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__LetExpression__Group__5_in_rule__LetExpression__Group__43943);
+            pushFollow(FOLLOW_2);
             rule__LetExpression__Group__5();
 
             state._fsp--;
@@ -5902,22 +5902,22 @@ public final void rule__LetExpression__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__LetExpression__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1832:1: rule__LetExpression__Group__4__Impl : ( ':' ) ;
+    // InternalExpression.g:1832:1: rule__LetExpression__Group__4__Impl : ( ':' ) ;
     public final void rule__LetExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1836:1: ( ( ':' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1837:1: ( ':' )
+            // InternalExpression.g:1836:1: ( ( ':' ) )
+            // InternalExpression.g:1837:1: ( ':' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1837:1: ( ':' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1838:1: ':'
+            // InternalExpression.g:1837:1: ( ':' )
+            // InternalExpression.g:1838:1: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLetExpressionAccess().getColonKeyword_4()); 
             }
-            match(input,38,FOLLOW_38_in_rule__LetExpression__Group__4__Impl3971); if (state.failed) return ;
+            match(input,38,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getLetExpressionAccess().getColonKeyword_4()); 
             }
@@ -5943,16 +5943,16 @@ public final void rule__LetExpression__Group__4__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__LetExpression__Group__5"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1851:1: rule__LetExpression__Group__5 : rule__LetExpression__Group__5__Impl ;
+    // InternalExpression.g:1851:1: rule__LetExpression__Group__5 : rule__LetExpression__Group__5__Impl ;
     public final void rule__LetExpression__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1855:1: ( rule__LetExpression__Group__5__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1856:2: rule__LetExpression__Group__5__Impl
+            // InternalExpression.g:1855:1: ( rule__LetExpression__Group__5__Impl )
+            // InternalExpression.g:1856:2: rule__LetExpression__Group__5__Impl
             {
-            pushFollow(FOLLOW_rule__LetExpression__Group__5__Impl_in_rule__LetExpression__Group__54002);
+            pushFollow(FOLLOW_2);
             rule__LetExpression__Group__5__Impl();
 
             state._fsp--;
@@ -5976,25 +5976,25 @@ public final void rule__LetExpression__Group__5() throws RecognitionException {
 
 
     // $ANTLR start "rule__LetExpression__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1862:1: rule__LetExpression__Group__5__Impl : ( ( rule__LetExpression__TargetAssignment_5 ) ) ;
+    // InternalExpression.g:1862:1: rule__LetExpression__Group__5__Impl : ( ( rule__LetExpression__TargetAssignment_5 ) ) ;
     public final void rule__LetExpression__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1866:1: ( ( ( rule__LetExpression__TargetAssignment_5 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1867:1: ( ( rule__LetExpression__TargetAssignment_5 ) )
+            // InternalExpression.g:1866:1: ( ( ( rule__LetExpression__TargetAssignment_5 ) ) )
+            // InternalExpression.g:1867:1: ( ( rule__LetExpression__TargetAssignment_5 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1867:1: ( ( rule__LetExpression__TargetAssignment_5 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1868:1: ( rule__LetExpression__TargetAssignment_5 )
+            // InternalExpression.g:1867:1: ( ( rule__LetExpression__TargetAssignment_5 ) )
+            // InternalExpression.g:1868:1: ( rule__LetExpression__TargetAssignment_5 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLetExpressionAccess().getTargetAssignment_5()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1869:1: ( rule__LetExpression__TargetAssignment_5 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1869:2: rule__LetExpression__TargetAssignment_5
+            // InternalExpression.g:1869:1: ( rule__LetExpression__TargetAssignment_5 )
+            // InternalExpression.g:1869:2: rule__LetExpression__TargetAssignment_5
             {
-            pushFollow(FOLLOW_rule__LetExpression__TargetAssignment_5_in_rule__LetExpression__Group__5__Impl4029);
+            pushFollow(FOLLOW_2);
             rule__LetExpression__TargetAssignment_5();
 
             state._fsp--;
@@ -6027,21 +6027,21 @@ public final void rule__LetExpression__Group__5__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__CastedExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1891:1: rule__CastedExpression__Group__0 : rule__CastedExpression__Group__0__Impl rule__CastedExpression__Group__1 ;
+    // InternalExpression.g:1891:1: rule__CastedExpression__Group__0 : rule__CastedExpression__Group__0__Impl rule__CastedExpression__Group__1 ;
     public final void rule__CastedExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1895:1: ( rule__CastedExpression__Group__0__Impl rule__CastedExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1896:2: rule__CastedExpression__Group__0__Impl rule__CastedExpression__Group__1
+            // InternalExpression.g:1895:1: ( rule__CastedExpression__Group__0__Impl rule__CastedExpression__Group__1 )
+            // InternalExpression.g:1896:2: rule__CastedExpression__Group__0__Impl rule__CastedExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__CastedExpression__Group__0__Impl_in_rule__CastedExpression__Group__04071);
+            pushFollow(FOLLOW_7);
             rule__CastedExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CastedExpression__Group__1_in_rule__CastedExpression__Group__04074);
+            pushFollow(FOLLOW_2);
             rule__CastedExpression__Group__1();
 
             state._fsp--;
@@ -6065,22 +6065,22 @@ public final void rule__CastedExpression__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__CastedExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1903:1: rule__CastedExpression__Group__0__Impl : ( '(' ) ;
+    // InternalExpression.g:1903:1: rule__CastedExpression__Group__0__Impl : ( '(' ) ;
     public final void rule__CastedExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1907:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1908:1: ( '(' )
+            // InternalExpression.g:1907:1: ( ( '(' ) )
+            // InternalExpression.g:1908:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1908:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1909:1: '('
+            // InternalExpression.g:1908:1: ( '(' )
+            // InternalExpression.g:1909:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCastedExpressionAccess().getLeftParenthesisKeyword_0()); 
             }
-            match(input,39,FOLLOW_39_in_rule__CastedExpression__Group__0__Impl4102); if (state.failed) return ;
+            match(input,39,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCastedExpressionAccess().getLeftParenthesisKeyword_0()); 
             }
@@ -6106,21 +6106,21 @@ public final void rule__CastedExpression__Group__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__CastedExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1922:1: rule__CastedExpression__Group__1 : rule__CastedExpression__Group__1__Impl rule__CastedExpression__Group__2 ;
+    // InternalExpression.g:1922:1: rule__CastedExpression__Group__1 : rule__CastedExpression__Group__1__Impl rule__CastedExpression__Group__2 ;
     public final void rule__CastedExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1926:1: ( rule__CastedExpression__Group__1__Impl rule__CastedExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1927:2: rule__CastedExpression__Group__1__Impl rule__CastedExpression__Group__2
+            // InternalExpression.g:1926:1: ( rule__CastedExpression__Group__1__Impl rule__CastedExpression__Group__2 )
+            // InternalExpression.g:1927:2: rule__CastedExpression__Group__1__Impl rule__CastedExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__CastedExpression__Group__1__Impl_in_rule__CastedExpression__Group__14133);
+            pushFollow(FOLLOW_8);
             rule__CastedExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CastedExpression__Group__2_in_rule__CastedExpression__Group__14136);
+            pushFollow(FOLLOW_2);
             rule__CastedExpression__Group__2();
 
             state._fsp--;
@@ -6144,25 +6144,25 @@ public final void rule__CastedExpression__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__CastedExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1934:1: rule__CastedExpression__Group__1__Impl : ( ( rule__CastedExpression__TypeAssignment_1 ) ) ;
+    // InternalExpression.g:1934:1: rule__CastedExpression__Group__1__Impl : ( ( rule__CastedExpression__TypeAssignment_1 ) ) ;
     public final void rule__CastedExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1938:1: ( ( ( rule__CastedExpression__TypeAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1939:1: ( ( rule__CastedExpression__TypeAssignment_1 ) )
+            // InternalExpression.g:1938:1: ( ( ( rule__CastedExpression__TypeAssignment_1 ) ) )
+            // InternalExpression.g:1939:1: ( ( rule__CastedExpression__TypeAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1939:1: ( ( rule__CastedExpression__TypeAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1940:1: ( rule__CastedExpression__TypeAssignment_1 )
+            // InternalExpression.g:1939:1: ( ( rule__CastedExpression__TypeAssignment_1 ) )
+            // InternalExpression.g:1940:1: ( rule__CastedExpression__TypeAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCastedExpressionAccess().getTypeAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1941:1: ( rule__CastedExpression__TypeAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1941:2: rule__CastedExpression__TypeAssignment_1
+            // InternalExpression.g:1941:1: ( rule__CastedExpression__TypeAssignment_1 )
+            // InternalExpression.g:1941:2: rule__CastedExpression__TypeAssignment_1
             {
-            pushFollow(FOLLOW_rule__CastedExpression__TypeAssignment_1_in_rule__CastedExpression__Group__1__Impl4163);
+            pushFollow(FOLLOW_2);
             rule__CastedExpression__TypeAssignment_1();
 
             state._fsp--;
@@ -6195,21 +6195,21 @@ public final void rule__CastedExpression__Group__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__CastedExpression__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1951:1: rule__CastedExpression__Group__2 : rule__CastedExpression__Group__2__Impl rule__CastedExpression__Group__3 ;
+    // InternalExpression.g:1951:1: rule__CastedExpression__Group__2 : rule__CastedExpression__Group__2__Impl rule__CastedExpression__Group__3 ;
     public final void rule__CastedExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1955:1: ( rule__CastedExpression__Group__2__Impl rule__CastedExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1956:2: rule__CastedExpression__Group__2__Impl rule__CastedExpression__Group__3
+            // InternalExpression.g:1955:1: ( rule__CastedExpression__Group__2__Impl rule__CastedExpression__Group__3 )
+            // InternalExpression.g:1956:2: rule__CastedExpression__Group__2__Impl rule__CastedExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__CastedExpression__Group__2__Impl_in_rule__CastedExpression__Group__24193);
+            pushFollow(FOLLOW_5);
             rule__CastedExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CastedExpression__Group__3_in_rule__CastedExpression__Group__24196);
+            pushFollow(FOLLOW_2);
             rule__CastedExpression__Group__3();
 
             state._fsp--;
@@ -6233,22 +6233,22 @@ public final void rule__CastedExpression__Group__2() throws RecognitionException
 
 
     // $ANTLR start "rule__CastedExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1963:1: rule__CastedExpression__Group__2__Impl : ( ')' ) ;
+    // InternalExpression.g:1963:1: rule__CastedExpression__Group__2__Impl : ( ')' ) ;
     public final void rule__CastedExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1967:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1968:1: ( ')' )
+            // InternalExpression.g:1967:1: ( ( ')' ) )
+            // InternalExpression.g:1968:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1968:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1969:1: ')'
+            // InternalExpression.g:1968:1: ( ')' )
+            // InternalExpression.g:1969:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCastedExpressionAccess().getRightParenthesisKeyword_2()); 
             }
-            match(input,40,FOLLOW_40_in_rule__CastedExpression__Group__2__Impl4224); if (state.failed) return ;
+            match(input,40,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCastedExpressionAccess().getRightParenthesisKeyword_2()); 
             }
@@ -6274,16 +6274,16 @@ public final void rule__CastedExpression__Group__2__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__CastedExpression__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1982:1: rule__CastedExpression__Group__3 : rule__CastedExpression__Group__3__Impl ;
+    // InternalExpression.g:1982:1: rule__CastedExpression__Group__3 : rule__CastedExpression__Group__3__Impl ;
     public final void rule__CastedExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1986:1: ( rule__CastedExpression__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1987:2: rule__CastedExpression__Group__3__Impl
+            // InternalExpression.g:1986:1: ( rule__CastedExpression__Group__3__Impl )
+            // InternalExpression.g:1987:2: rule__CastedExpression__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__CastedExpression__Group__3__Impl_in_rule__CastedExpression__Group__34255);
+            pushFollow(FOLLOW_2);
             rule__CastedExpression__Group__3__Impl();
 
             state._fsp--;
@@ -6307,25 +6307,25 @@ public final void rule__CastedExpression__Group__3() throws RecognitionException
 
 
     // $ANTLR start "rule__CastedExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1993:1: rule__CastedExpression__Group__3__Impl : ( ( rule__CastedExpression__TargetAssignment_3 ) ) ;
+    // InternalExpression.g:1993:1: rule__CastedExpression__Group__3__Impl : ( ( rule__CastedExpression__TargetAssignment_3 ) ) ;
     public final void rule__CastedExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1997:1: ( ( ( rule__CastedExpression__TargetAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1998:1: ( ( rule__CastedExpression__TargetAssignment_3 ) )
+            // InternalExpression.g:1997:1: ( ( ( rule__CastedExpression__TargetAssignment_3 ) ) )
+            // InternalExpression.g:1998:1: ( ( rule__CastedExpression__TargetAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1998:1: ( ( rule__CastedExpression__TargetAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1999:1: ( rule__CastedExpression__TargetAssignment_3 )
+            // InternalExpression.g:1998:1: ( ( rule__CastedExpression__TargetAssignment_3 ) )
+            // InternalExpression.g:1999:1: ( rule__CastedExpression__TargetAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCastedExpressionAccess().getTargetAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2000:1: ( rule__CastedExpression__TargetAssignment_3 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2000:2: rule__CastedExpression__TargetAssignment_3
+            // InternalExpression.g:2000:1: ( rule__CastedExpression__TargetAssignment_3 )
+            // InternalExpression.g:2000:2: rule__CastedExpression__TargetAssignment_3
             {
-            pushFollow(FOLLOW_rule__CastedExpression__TargetAssignment_3_in_rule__CastedExpression__Group__3__Impl4282);
+            pushFollow(FOLLOW_2);
             rule__CastedExpression__TargetAssignment_3();
 
             state._fsp--;
@@ -6358,21 +6358,21 @@ public final void rule__CastedExpression__Group__3__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__ChainExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2018:1: rule__ChainExpression__Group__0 : rule__ChainExpression__Group__0__Impl rule__ChainExpression__Group__1 ;
+    // InternalExpression.g:2018:1: rule__ChainExpression__Group__0 : rule__ChainExpression__Group__0__Impl rule__ChainExpression__Group__1 ;
     public final void rule__ChainExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2022:1: ( rule__ChainExpression__Group__0__Impl rule__ChainExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2023:2: rule__ChainExpression__Group__0__Impl rule__ChainExpression__Group__1
+            // InternalExpression.g:2022:1: ( rule__ChainExpression__Group__0__Impl rule__ChainExpression__Group__1 )
+            // InternalExpression.g:2023:2: rule__ChainExpression__Group__0__Impl rule__ChainExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__ChainExpression__Group__0__Impl_in_rule__ChainExpression__Group__04320);
+            pushFollow(FOLLOW_9);
             rule__ChainExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ChainExpression__Group__1_in_rule__ChainExpression__Group__04323);
+            pushFollow(FOLLOW_2);
             rule__ChainExpression__Group__1();
 
             state._fsp--;
@@ -6396,22 +6396,22 @@ public final void rule__ChainExpression__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__ChainExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2030:1: rule__ChainExpression__Group__0__Impl : ( ruleChainedExpression ) ;
+    // InternalExpression.g:2030:1: rule__ChainExpression__Group__0__Impl : ( ruleChainedExpression ) ;
     public final void rule__ChainExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2034:1: ( ( ruleChainedExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2035:1: ( ruleChainedExpression )
+            // InternalExpression.g:2034:1: ( ( ruleChainedExpression ) )
+            // InternalExpression.g:2035:1: ( ruleChainedExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2035:1: ( ruleChainedExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2036:1: ruleChainedExpression
+            // InternalExpression.g:2035:1: ( ruleChainedExpression )
+            // InternalExpression.g:2036:1: ruleChainedExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getChainExpressionAccess().getChainedExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleChainedExpression_in_rule__ChainExpression__Group__0__Impl4350);
+            pushFollow(FOLLOW_2);
             ruleChainedExpression();
 
             state._fsp--;
@@ -6441,16 +6441,16 @@ public final void rule__ChainExpression__Group__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__ChainExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2047:1: rule__ChainExpression__Group__1 : rule__ChainExpression__Group__1__Impl ;
+    // InternalExpression.g:2047:1: rule__ChainExpression__Group__1 : rule__ChainExpression__Group__1__Impl ;
     public final void rule__ChainExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2051:1: ( rule__ChainExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2052:2: rule__ChainExpression__Group__1__Impl
+            // InternalExpression.g:2051:1: ( rule__ChainExpression__Group__1__Impl )
+            // InternalExpression.g:2052:2: rule__ChainExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__ChainExpression__Group__1__Impl_in_rule__ChainExpression__Group__14379);
+            pushFollow(FOLLOW_2);
             rule__ChainExpression__Group__1__Impl();
 
             state._fsp--;
@@ -6474,22 +6474,22 @@ public final void rule__ChainExpression__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__ChainExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2058:1: rule__ChainExpression__Group__1__Impl : ( ( rule__ChainExpression__Group_1__0 )* ) ;
+    // InternalExpression.g:2058:1: rule__ChainExpression__Group__1__Impl : ( ( rule__ChainExpression__Group_1__0 )* ) ;
     public final void rule__ChainExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2062:1: ( ( ( rule__ChainExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2063:1: ( ( rule__ChainExpression__Group_1__0 )* )
+            // InternalExpression.g:2062:1: ( ( ( rule__ChainExpression__Group_1__0 )* ) )
+            // InternalExpression.g:2063:1: ( ( rule__ChainExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2063:1: ( ( rule__ChainExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2064:1: ( rule__ChainExpression__Group_1__0 )*
+            // InternalExpression.g:2063:1: ( ( rule__ChainExpression__Group_1__0 )* )
+            // InternalExpression.g:2064:1: ( rule__ChainExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getChainExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2065:1: ( rule__ChainExpression__Group_1__0 )*
+            // InternalExpression.g:2065:1: ( rule__ChainExpression__Group_1__0 )*
             loop17:
             do {
                 int alt17=2;
@@ -6502,9 +6502,9 @@ public final void rule__ChainExpression__Group__1__Impl() throws RecognitionExce
 
                 switch (alt17) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2065:2: rule__ChainExpression__Group_1__0
+            	    // InternalExpression.g:2065:2: rule__ChainExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__ChainExpression__Group_1__0_in_rule__ChainExpression__Group__1__Impl4406);
+            	    pushFollow(FOLLOW_10);
             	    rule__ChainExpression__Group_1__0();
 
             	    state._fsp--;
@@ -6543,21 +6543,21 @@ public final void rule__ChainExpression__Group__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__ChainExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2079:1: rule__ChainExpression__Group_1__0 : rule__ChainExpression__Group_1__0__Impl rule__ChainExpression__Group_1__1 ;
+    // InternalExpression.g:2079:1: rule__ChainExpression__Group_1__0 : rule__ChainExpression__Group_1__0__Impl rule__ChainExpression__Group_1__1 ;
     public final void rule__ChainExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2083:1: ( rule__ChainExpression__Group_1__0__Impl rule__ChainExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2084:2: rule__ChainExpression__Group_1__0__Impl rule__ChainExpression__Group_1__1
+            // InternalExpression.g:2083:1: ( rule__ChainExpression__Group_1__0__Impl rule__ChainExpression__Group_1__1 )
+            // InternalExpression.g:2084:2: rule__ChainExpression__Group_1__0__Impl rule__ChainExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__ChainExpression__Group_1__0__Impl_in_rule__ChainExpression__Group_1__04441);
+            pushFollow(FOLLOW_9);
             rule__ChainExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ChainExpression__Group_1__1_in_rule__ChainExpression__Group_1__04444);
+            pushFollow(FOLLOW_2);
             rule__ChainExpression__Group_1__1();
 
             state._fsp--;
@@ -6581,23 +6581,23 @@ public final void rule__ChainExpression__Group_1__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ChainExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2091:1: rule__ChainExpression__Group_1__0__Impl : ( () ) ;
+    // InternalExpression.g:2091:1: rule__ChainExpression__Group_1__0__Impl : ( () ) ;
     public final void rule__ChainExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2095:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2096:1: ( () )
+            // InternalExpression.g:2095:1: ( ( () ) )
+            // InternalExpression.g:2096:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2096:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2097:1: ()
+            // InternalExpression.g:2096:1: ( () )
+            // InternalExpression.g:2097:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getChainExpressionAccess().getChainExpressionFirstAction_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2098:1: ()
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2100:1: 
+            // InternalExpression.g:2098:1: ()
+            // InternalExpression.g:2100:1: 
             {
             }
 
@@ -6622,21 +6622,21 @@ public final void rule__ChainExpression__Group_1__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__ChainExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2110:1: rule__ChainExpression__Group_1__1 : rule__ChainExpression__Group_1__1__Impl rule__ChainExpression__Group_1__2 ;
+    // InternalExpression.g:2110:1: rule__ChainExpression__Group_1__1 : rule__ChainExpression__Group_1__1__Impl rule__ChainExpression__Group_1__2 ;
     public final void rule__ChainExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2114:1: ( rule__ChainExpression__Group_1__1__Impl rule__ChainExpression__Group_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2115:2: rule__ChainExpression__Group_1__1__Impl rule__ChainExpression__Group_1__2
+            // InternalExpression.g:2114:1: ( rule__ChainExpression__Group_1__1__Impl rule__ChainExpression__Group_1__2 )
+            // InternalExpression.g:2115:2: rule__ChainExpression__Group_1__1__Impl rule__ChainExpression__Group_1__2
             {
-            pushFollow(FOLLOW_rule__ChainExpression__Group_1__1__Impl_in_rule__ChainExpression__Group_1__14502);
+            pushFollow(FOLLOW_5);
             rule__ChainExpression__Group_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ChainExpression__Group_1__2_in_rule__ChainExpression__Group_1__14505);
+            pushFollow(FOLLOW_2);
             rule__ChainExpression__Group_1__2();
 
             state._fsp--;
@@ -6660,22 +6660,22 @@ public final void rule__ChainExpression__Group_1__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ChainExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2122:1: rule__ChainExpression__Group_1__1__Impl : ( '->' ) ;
+    // InternalExpression.g:2122:1: rule__ChainExpression__Group_1__1__Impl : ( '->' ) ;
     public final void rule__ChainExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2126:1: ( ( '->' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2127:1: ( '->' )
+            // InternalExpression.g:2126:1: ( ( '->' ) )
+            // InternalExpression.g:2127:1: ( '->' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2127:1: ( '->' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2128:1: '->'
+            // InternalExpression.g:2127:1: ( '->' )
+            // InternalExpression.g:2128:1: '->'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getChainExpressionAccess().getHyphenMinusGreaterThanSignKeyword_1_1()); 
             }
-            match(input,41,FOLLOW_41_in_rule__ChainExpression__Group_1__1__Impl4533); if (state.failed) return ;
+            match(input,41,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getChainExpressionAccess().getHyphenMinusGreaterThanSignKeyword_1_1()); 
             }
@@ -6701,16 +6701,16 @@ public final void rule__ChainExpression__Group_1__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__ChainExpression__Group_1__2"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2141:1: rule__ChainExpression__Group_1__2 : rule__ChainExpression__Group_1__2__Impl ;
+    // InternalExpression.g:2141:1: rule__ChainExpression__Group_1__2 : rule__ChainExpression__Group_1__2__Impl ;
     public final void rule__ChainExpression__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2145:1: ( rule__ChainExpression__Group_1__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2146:2: rule__ChainExpression__Group_1__2__Impl
+            // InternalExpression.g:2145:1: ( rule__ChainExpression__Group_1__2__Impl )
+            // InternalExpression.g:2146:2: rule__ChainExpression__Group_1__2__Impl
             {
-            pushFollow(FOLLOW_rule__ChainExpression__Group_1__2__Impl_in_rule__ChainExpression__Group_1__24564);
+            pushFollow(FOLLOW_2);
             rule__ChainExpression__Group_1__2__Impl();
 
             state._fsp--;
@@ -6734,25 +6734,25 @@ public final void rule__ChainExpression__Group_1__2() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ChainExpression__Group_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2152:1: rule__ChainExpression__Group_1__2__Impl : ( ( rule__ChainExpression__NextAssignment_1_2 ) ) ;
+    // InternalExpression.g:2152:1: rule__ChainExpression__Group_1__2__Impl : ( ( rule__ChainExpression__NextAssignment_1_2 ) ) ;
     public final void rule__ChainExpression__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2156:1: ( ( ( rule__ChainExpression__NextAssignment_1_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2157:1: ( ( rule__ChainExpression__NextAssignment_1_2 ) )
+            // InternalExpression.g:2156:1: ( ( ( rule__ChainExpression__NextAssignment_1_2 ) ) )
+            // InternalExpression.g:2157:1: ( ( rule__ChainExpression__NextAssignment_1_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2157:1: ( ( rule__ChainExpression__NextAssignment_1_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2158:1: ( rule__ChainExpression__NextAssignment_1_2 )
+            // InternalExpression.g:2157:1: ( ( rule__ChainExpression__NextAssignment_1_2 ) )
+            // InternalExpression.g:2158:1: ( rule__ChainExpression__NextAssignment_1_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getChainExpressionAccess().getNextAssignment_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2159:1: ( rule__ChainExpression__NextAssignment_1_2 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2159:2: rule__ChainExpression__NextAssignment_1_2
+            // InternalExpression.g:2159:1: ( rule__ChainExpression__NextAssignment_1_2 )
+            // InternalExpression.g:2159:2: rule__ChainExpression__NextAssignment_1_2
             {
-            pushFollow(FOLLOW_rule__ChainExpression__NextAssignment_1_2_in_rule__ChainExpression__Group_1__2__Impl4591);
+            pushFollow(FOLLOW_2);
             rule__ChainExpression__NextAssignment_1_2();
 
             state._fsp--;
@@ -6785,21 +6785,21 @@ public final void rule__ChainExpression__Group_1__2__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__IfExpressionTri__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2175:1: rule__IfExpressionTri__Group__0 : rule__IfExpressionTri__Group__0__Impl rule__IfExpressionTri__Group__1 ;
+    // InternalExpression.g:2175:1: rule__IfExpressionTri__Group__0 : rule__IfExpressionTri__Group__0__Impl rule__IfExpressionTri__Group__1 ;
     public final void rule__IfExpressionTri__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2179:1: ( rule__IfExpressionTri__Group__0__Impl rule__IfExpressionTri__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2180:2: rule__IfExpressionTri__Group__0__Impl rule__IfExpressionTri__Group__1
+            // InternalExpression.g:2179:1: ( rule__IfExpressionTri__Group__0__Impl rule__IfExpressionTri__Group__1 )
+            // InternalExpression.g:2180:2: rule__IfExpressionTri__Group__0__Impl rule__IfExpressionTri__Group__1
             {
-            pushFollow(FOLLOW_rule__IfExpressionTri__Group__0__Impl_in_rule__IfExpressionTri__Group__04627);
+            pushFollow(FOLLOW_11);
             rule__IfExpressionTri__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__IfExpressionTri__Group__1_in_rule__IfExpressionTri__Group__04630);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionTri__Group__1();
 
             state._fsp--;
@@ -6823,22 +6823,22 @@ public final void rule__IfExpressionTri__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__IfExpressionTri__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2187:1: rule__IfExpressionTri__Group__0__Impl : ( ruleOrExpression ) ;
+    // InternalExpression.g:2187:1: rule__IfExpressionTri__Group__0__Impl : ( ruleOrExpression ) ;
     public final void rule__IfExpressionTri__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2191:1: ( ( ruleOrExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2192:1: ( ruleOrExpression )
+            // InternalExpression.g:2191:1: ( ( ruleOrExpression ) )
+            // InternalExpression.g:2192:1: ( ruleOrExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2192:1: ( ruleOrExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2193:1: ruleOrExpression
+            // InternalExpression.g:2192:1: ( ruleOrExpression )
+            // InternalExpression.g:2193:1: ruleOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionTriAccess().getOrExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleOrExpression_in_rule__IfExpressionTri__Group__0__Impl4657);
+            pushFollow(FOLLOW_2);
             ruleOrExpression();
 
             state._fsp--;
@@ -6868,16 +6868,16 @@ public final void rule__IfExpressionTri__Group__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__IfExpressionTri__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2204:1: rule__IfExpressionTri__Group__1 : rule__IfExpressionTri__Group__1__Impl ;
+    // InternalExpression.g:2204:1: rule__IfExpressionTri__Group__1 : rule__IfExpressionTri__Group__1__Impl ;
     public final void rule__IfExpressionTri__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2208:1: ( rule__IfExpressionTri__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2209:2: rule__IfExpressionTri__Group__1__Impl
+            // InternalExpression.g:2208:1: ( rule__IfExpressionTri__Group__1__Impl )
+            // InternalExpression.g:2209:2: rule__IfExpressionTri__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__IfExpressionTri__Group__1__Impl_in_rule__IfExpressionTri__Group__14686);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionTri__Group__1__Impl();
 
             state._fsp--;
@@ -6901,22 +6901,22 @@ public final void rule__IfExpressionTri__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__IfExpressionTri__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2215:1: rule__IfExpressionTri__Group__1__Impl : ( ( rule__IfExpressionTri__Group_1__0 )? ) ;
+    // InternalExpression.g:2215:1: rule__IfExpressionTri__Group__1__Impl : ( ( rule__IfExpressionTri__Group_1__0 )? ) ;
     public final void rule__IfExpressionTri__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2219:1: ( ( ( rule__IfExpressionTri__Group_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2220:1: ( ( rule__IfExpressionTri__Group_1__0 )? )
+            // InternalExpression.g:2219:1: ( ( ( rule__IfExpressionTri__Group_1__0 )? ) )
+            // InternalExpression.g:2220:1: ( ( rule__IfExpressionTri__Group_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2220:1: ( ( rule__IfExpressionTri__Group_1__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2221:1: ( rule__IfExpressionTri__Group_1__0 )?
+            // InternalExpression.g:2220:1: ( ( rule__IfExpressionTri__Group_1__0 )? )
+            // InternalExpression.g:2221:1: ( rule__IfExpressionTri__Group_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionTriAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2222:1: ( rule__IfExpressionTri__Group_1__0 )?
+            // InternalExpression.g:2222:1: ( rule__IfExpressionTri__Group_1__0 )?
             int alt18=2;
             int LA18_0 = input.LA(1);
 
@@ -6925,9 +6925,9 @@ public final void rule__IfExpressionTri__Group__1__Impl() throws RecognitionExce
             }
             switch (alt18) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2222:2: rule__IfExpressionTri__Group_1__0
+                    // InternalExpression.g:2222:2: rule__IfExpressionTri__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__IfExpressionTri__Group_1__0_in_rule__IfExpressionTri__Group__1__Impl4713);
+                    pushFollow(FOLLOW_2);
                     rule__IfExpressionTri__Group_1__0();
 
                     state._fsp--;
@@ -6963,21 +6963,21 @@ public final void rule__IfExpressionTri__Group__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__IfExpressionTri__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2236:1: rule__IfExpressionTri__Group_1__0 : rule__IfExpressionTri__Group_1__0__Impl rule__IfExpressionTri__Group_1__1 ;
+    // InternalExpression.g:2236:1: rule__IfExpressionTri__Group_1__0 : rule__IfExpressionTri__Group_1__0__Impl rule__IfExpressionTri__Group_1__1 ;
     public final void rule__IfExpressionTri__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2240:1: ( rule__IfExpressionTri__Group_1__0__Impl rule__IfExpressionTri__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2241:2: rule__IfExpressionTri__Group_1__0__Impl rule__IfExpressionTri__Group_1__1
+            // InternalExpression.g:2240:1: ( rule__IfExpressionTri__Group_1__0__Impl rule__IfExpressionTri__Group_1__1 )
+            // InternalExpression.g:2241:2: rule__IfExpressionTri__Group_1__0__Impl rule__IfExpressionTri__Group_1__1
             {
-            pushFollow(FOLLOW_rule__IfExpressionTri__Group_1__0__Impl_in_rule__IfExpressionTri__Group_1__04748);
+            pushFollow(FOLLOW_11);
             rule__IfExpressionTri__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__IfExpressionTri__Group_1__1_in_rule__IfExpressionTri__Group_1__04751);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionTri__Group_1__1();
 
             state._fsp--;
@@ -7001,23 +7001,23 @@ public final void rule__IfExpressionTri__Group_1__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__IfExpressionTri__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2248:1: rule__IfExpressionTri__Group_1__0__Impl : ( () ) ;
+    // InternalExpression.g:2248:1: rule__IfExpressionTri__Group_1__0__Impl : ( () ) ;
     public final void rule__IfExpressionTri__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2252:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2253:1: ( () )
+            // InternalExpression.g:2252:1: ( ( () ) )
+            // InternalExpression.g:2253:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2253:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2254:1: ()
+            // InternalExpression.g:2253:1: ( () )
+            // InternalExpression.g:2254:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionTriAccess().getIfExpressionConditionAction_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2255:1: ()
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2257:1: 
+            // InternalExpression.g:2255:1: ()
+            // InternalExpression.g:2257:1: 
             {
             }
 
@@ -7042,21 +7042,21 @@ public final void rule__IfExpressionTri__Group_1__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__IfExpressionTri__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2267:1: rule__IfExpressionTri__Group_1__1 : rule__IfExpressionTri__Group_1__1__Impl rule__IfExpressionTri__Group_1__2 ;
+    // InternalExpression.g:2267:1: rule__IfExpressionTri__Group_1__1 : rule__IfExpressionTri__Group_1__1__Impl rule__IfExpressionTri__Group_1__2 ;
     public final void rule__IfExpressionTri__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2271:1: ( rule__IfExpressionTri__Group_1__1__Impl rule__IfExpressionTri__Group_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2272:2: rule__IfExpressionTri__Group_1__1__Impl rule__IfExpressionTri__Group_1__2
+            // InternalExpression.g:2271:1: ( rule__IfExpressionTri__Group_1__1__Impl rule__IfExpressionTri__Group_1__2 )
+            // InternalExpression.g:2272:2: rule__IfExpressionTri__Group_1__1__Impl rule__IfExpressionTri__Group_1__2
             {
-            pushFollow(FOLLOW_rule__IfExpressionTri__Group_1__1__Impl_in_rule__IfExpressionTri__Group_1__14809);
+            pushFollow(FOLLOW_5);
             rule__IfExpressionTri__Group_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__IfExpressionTri__Group_1__2_in_rule__IfExpressionTri__Group_1__14812);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionTri__Group_1__2();
 
             state._fsp--;
@@ -7080,22 +7080,22 @@ public final void rule__IfExpressionTri__Group_1__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__IfExpressionTri__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2279:1: rule__IfExpressionTri__Group_1__1__Impl : ( '?' ) ;
+    // InternalExpression.g:2279:1: rule__IfExpressionTri__Group_1__1__Impl : ( '?' ) ;
     public final void rule__IfExpressionTri__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2283:1: ( ( '?' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2284:1: ( '?' )
+            // InternalExpression.g:2283:1: ( ( '?' ) )
+            // InternalExpression.g:2284:1: ( '?' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2284:1: ( '?' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2285:1: '?'
+            // InternalExpression.g:2284:1: ( '?' )
+            // InternalExpression.g:2285:1: '?'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionTriAccess().getQuestionMarkKeyword_1_1()); 
             }
-            match(input,42,FOLLOW_42_in_rule__IfExpressionTri__Group_1__1__Impl4840); if (state.failed) return ;
+            match(input,42,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIfExpressionTriAccess().getQuestionMarkKeyword_1_1()); 
             }
@@ -7121,21 +7121,21 @@ public final void rule__IfExpressionTri__Group_1__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__IfExpressionTri__Group_1__2"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2298:1: rule__IfExpressionTri__Group_1__2 : rule__IfExpressionTri__Group_1__2__Impl rule__IfExpressionTri__Group_1__3 ;
+    // InternalExpression.g:2298:1: rule__IfExpressionTri__Group_1__2 : rule__IfExpressionTri__Group_1__2__Impl rule__IfExpressionTri__Group_1__3 ;
     public final void rule__IfExpressionTri__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2302:1: ( rule__IfExpressionTri__Group_1__2__Impl rule__IfExpressionTri__Group_1__3 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2303:2: rule__IfExpressionTri__Group_1__2__Impl rule__IfExpressionTri__Group_1__3
+            // InternalExpression.g:2302:1: ( rule__IfExpressionTri__Group_1__2__Impl rule__IfExpressionTri__Group_1__3 )
+            // InternalExpression.g:2303:2: rule__IfExpressionTri__Group_1__2__Impl rule__IfExpressionTri__Group_1__3
             {
-            pushFollow(FOLLOW_rule__IfExpressionTri__Group_1__2__Impl_in_rule__IfExpressionTri__Group_1__24871);
+            pushFollow(FOLLOW_6);
             rule__IfExpressionTri__Group_1__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__IfExpressionTri__Group_1__3_in_rule__IfExpressionTri__Group_1__24874);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionTri__Group_1__3();
 
             state._fsp--;
@@ -7159,25 +7159,25 @@ public final void rule__IfExpressionTri__Group_1__2() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__IfExpressionTri__Group_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2310:1: rule__IfExpressionTri__Group_1__2__Impl : ( ( rule__IfExpressionTri__ThenPartAssignment_1_2 ) ) ;
+    // InternalExpression.g:2310:1: rule__IfExpressionTri__Group_1__2__Impl : ( ( rule__IfExpressionTri__ThenPartAssignment_1_2 ) ) ;
     public final void rule__IfExpressionTri__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2314:1: ( ( ( rule__IfExpressionTri__ThenPartAssignment_1_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2315:1: ( ( rule__IfExpressionTri__ThenPartAssignment_1_2 ) )
+            // InternalExpression.g:2314:1: ( ( ( rule__IfExpressionTri__ThenPartAssignment_1_2 ) ) )
+            // InternalExpression.g:2315:1: ( ( rule__IfExpressionTri__ThenPartAssignment_1_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2315:1: ( ( rule__IfExpressionTri__ThenPartAssignment_1_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2316:1: ( rule__IfExpressionTri__ThenPartAssignment_1_2 )
+            // InternalExpression.g:2315:1: ( ( rule__IfExpressionTri__ThenPartAssignment_1_2 ) )
+            // InternalExpression.g:2316:1: ( rule__IfExpressionTri__ThenPartAssignment_1_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionTriAccess().getThenPartAssignment_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2317:1: ( rule__IfExpressionTri__ThenPartAssignment_1_2 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2317:2: rule__IfExpressionTri__ThenPartAssignment_1_2
+            // InternalExpression.g:2317:1: ( rule__IfExpressionTri__ThenPartAssignment_1_2 )
+            // InternalExpression.g:2317:2: rule__IfExpressionTri__ThenPartAssignment_1_2
             {
-            pushFollow(FOLLOW_rule__IfExpressionTri__ThenPartAssignment_1_2_in_rule__IfExpressionTri__Group_1__2__Impl4901);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionTri__ThenPartAssignment_1_2();
 
             state._fsp--;
@@ -7210,21 +7210,21 @@ public final void rule__IfExpressionTri__Group_1__2__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__IfExpressionTri__Group_1__3"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2327:1: rule__IfExpressionTri__Group_1__3 : rule__IfExpressionTri__Group_1__3__Impl rule__IfExpressionTri__Group_1__4 ;
+    // InternalExpression.g:2327:1: rule__IfExpressionTri__Group_1__3 : rule__IfExpressionTri__Group_1__3__Impl rule__IfExpressionTri__Group_1__4 ;
     public final void rule__IfExpressionTri__Group_1__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2331:1: ( rule__IfExpressionTri__Group_1__3__Impl rule__IfExpressionTri__Group_1__4 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2332:2: rule__IfExpressionTri__Group_1__3__Impl rule__IfExpressionTri__Group_1__4
+            // InternalExpression.g:2331:1: ( rule__IfExpressionTri__Group_1__3__Impl rule__IfExpressionTri__Group_1__4 )
+            // InternalExpression.g:2332:2: rule__IfExpressionTri__Group_1__3__Impl rule__IfExpressionTri__Group_1__4
             {
-            pushFollow(FOLLOW_rule__IfExpressionTri__Group_1__3__Impl_in_rule__IfExpressionTri__Group_1__34931);
+            pushFollow(FOLLOW_5);
             rule__IfExpressionTri__Group_1__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__IfExpressionTri__Group_1__4_in_rule__IfExpressionTri__Group_1__34934);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionTri__Group_1__4();
 
             state._fsp--;
@@ -7248,22 +7248,22 @@ public final void rule__IfExpressionTri__Group_1__3() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__IfExpressionTri__Group_1__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2339:1: rule__IfExpressionTri__Group_1__3__Impl : ( ':' ) ;
+    // InternalExpression.g:2339:1: rule__IfExpressionTri__Group_1__3__Impl : ( ':' ) ;
     public final void rule__IfExpressionTri__Group_1__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2343:1: ( ( ':' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2344:1: ( ':' )
+            // InternalExpression.g:2343:1: ( ( ':' ) )
+            // InternalExpression.g:2344:1: ( ':' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2344:1: ( ':' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2345:1: ':'
+            // InternalExpression.g:2344:1: ( ':' )
+            // InternalExpression.g:2345:1: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionTriAccess().getColonKeyword_1_3()); 
             }
-            match(input,38,FOLLOW_38_in_rule__IfExpressionTri__Group_1__3__Impl4962); if (state.failed) return ;
+            match(input,38,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIfExpressionTriAccess().getColonKeyword_1_3()); 
             }
@@ -7289,16 +7289,16 @@ public final void rule__IfExpressionTri__Group_1__3__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__IfExpressionTri__Group_1__4"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2358:1: rule__IfExpressionTri__Group_1__4 : rule__IfExpressionTri__Group_1__4__Impl ;
+    // InternalExpression.g:2358:1: rule__IfExpressionTri__Group_1__4 : rule__IfExpressionTri__Group_1__4__Impl ;
     public final void rule__IfExpressionTri__Group_1__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2362:1: ( rule__IfExpressionTri__Group_1__4__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2363:2: rule__IfExpressionTri__Group_1__4__Impl
+            // InternalExpression.g:2362:1: ( rule__IfExpressionTri__Group_1__4__Impl )
+            // InternalExpression.g:2363:2: rule__IfExpressionTri__Group_1__4__Impl
             {
-            pushFollow(FOLLOW_rule__IfExpressionTri__Group_1__4__Impl_in_rule__IfExpressionTri__Group_1__44993);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionTri__Group_1__4__Impl();
 
             state._fsp--;
@@ -7322,25 +7322,25 @@ public final void rule__IfExpressionTri__Group_1__4() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__IfExpressionTri__Group_1__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2369:1: rule__IfExpressionTri__Group_1__4__Impl : ( ( rule__IfExpressionTri__ElsePartAssignment_1_4 ) ) ;
+    // InternalExpression.g:2369:1: rule__IfExpressionTri__Group_1__4__Impl : ( ( rule__IfExpressionTri__ElsePartAssignment_1_4 ) ) ;
     public final void rule__IfExpressionTri__Group_1__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2373:1: ( ( ( rule__IfExpressionTri__ElsePartAssignment_1_4 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2374:1: ( ( rule__IfExpressionTri__ElsePartAssignment_1_4 ) )
+            // InternalExpression.g:2373:1: ( ( ( rule__IfExpressionTri__ElsePartAssignment_1_4 ) ) )
+            // InternalExpression.g:2374:1: ( ( rule__IfExpressionTri__ElsePartAssignment_1_4 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2374:1: ( ( rule__IfExpressionTri__ElsePartAssignment_1_4 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2375:1: ( rule__IfExpressionTri__ElsePartAssignment_1_4 )
+            // InternalExpression.g:2374:1: ( ( rule__IfExpressionTri__ElsePartAssignment_1_4 ) )
+            // InternalExpression.g:2375:1: ( rule__IfExpressionTri__ElsePartAssignment_1_4 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionTriAccess().getElsePartAssignment_1_4()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2376:1: ( rule__IfExpressionTri__ElsePartAssignment_1_4 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2376:2: rule__IfExpressionTri__ElsePartAssignment_1_4
+            // InternalExpression.g:2376:1: ( rule__IfExpressionTri__ElsePartAssignment_1_4 )
+            // InternalExpression.g:2376:2: rule__IfExpressionTri__ElsePartAssignment_1_4
             {
-            pushFollow(FOLLOW_rule__IfExpressionTri__ElsePartAssignment_1_4_in_rule__IfExpressionTri__Group_1__4__Impl5020);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionTri__ElsePartAssignment_1_4();
 
             state._fsp--;
@@ -7373,21 +7373,21 @@ public final void rule__IfExpressionTri__Group_1__4__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__IfExpressionKw__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2396:1: rule__IfExpressionKw__Group__0 : rule__IfExpressionKw__Group__0__Impl rule__IfExpressionKw__Group__1 ;
+    // InternalExpression.g:2396:1: rule__IfExpressionKw__Group__0 : rule__IfExpressionKw__Group__0__Impl rule__IfExpressionKw__Group__1 ;
     public final void rule__IfExpressionKw__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2400:1: ( rule__IfExpressionKw__Group__0__Impl rule__IfExpressionKw__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2401:2: rule__IfExpressionKw__Group__0__Impl rule__IfExpressionKw__Group__1
+            // InternalExpression.g:2400:1: ( rule__IfExpressionKw__Group__0__Impl rule__IfExpressionKw__Group__1 )
+            // InternalExpression.g:2401:2: rule__IfExpressionKw__Group__0__Impl rule__IfExpressionKw__Group__1
             {
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group__0__Impl_in_rule__IfExpressionKw__Group__05060);
+            pushFollow(FOLLOW_5);
             rule__IfExpressionKw__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group__1_in_rule__IfExpressionKw__Group__05063);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionKw__Group__1();
 
             state._fsp--;
@@ -7411,22 +7411,22 @@ public final void rule__IfExpressionKw__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__IfExpressionKw__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2408:1: rule__IfExpressionKw__Group__0__Impl : ( 'if' ) ;
+    // InternalExpression.g:2408:1: rule__IfExpressionKw__Group__0__Impl : ( 'if' ) ;
     public final void rule__IfExpressionKw__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2412:1: ( ( 'if' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2413:1: ( 'if' )
+            // InternalExpression.g:2412:1: ( ( 'if' ) )
+            // InternalExpression.g:2413:1: ( 'if' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2413:1: ( 'if' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2414:1: 'if'
+            // InternalExpression.g:2413:1: ( 'if' )
+            // InternalExpression.g:2414:1: 'if'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionKwAccess().getIfKeyword_0()); 
             }
-            match(input,43,FOLLOW_43_in_rule__IfExpressionKw__Group__0__Impl5091); if (state.failed) return ;
+            match(input,43,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIfExpressionKwAccess().getIfKeyword_0()); 
             }
@@ -7452,21 +7452,21 @@ public final void rule__IfExpressionKw__Group__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__IfExpressionKw__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2427:1: rule__IfExpressionKw__Group__1 : rule__IfExpressionKw__Group__1__Impl rule__IfExpressionKw__Group__2 ;
+    // InternalExpression.g:2427:1: rule__IfExpressionKw__Group__1 : rule__IfExpressionKw__Group__1__Impl rule__IfExpressionKw__Group__2 ;
     public final void rule__IfExpressionKw__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2431:1: ( rule__IfExpressionKw__Group__1__Impl rule__IfExpressionKw__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2432:2: rule__IfExpressionKw__Group__1__Impl rule__IfExpressionKw__Group__2
+            // InternalExpression.g:2431:1: ( rule__IfExpressionKw__Group__1__Impl rule__IfExpressionKw__Group__2 )
+            // InternalExpression.g:2432:2: rule__IfExpressionKw__Group__1__Impl rule__IfExpressionKw__Group__2
             {
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group__1__Impl_in_rule__IfExpressionKw__Group__15122);
+            pushFollow(FOLLOW_12);
             rule__IfExpressionKw__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group__2_in_rule__IfExpressionKw__Group__15125);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionKw__Group__2();
 
             state._fsp--;
@@ -7490,25 +7490,25 @@ public final void rule__IfExpressionKw__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__IfExpressionKw__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2439:1: rule__IfExpressionKw__Group__1__Impl : ( ( rule__IfExpressionKw__ConditionAssignment_1 ) ) ;
+    // InternalExpression.g:2439:1: rule__IfExpressionKw__Group__1__Impl : ( ( rule__IfExpressionKw__ConditionAssignment_1 ) ) ;
     public final void rule__IfExpressionKw__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2443:1: ( ( ( rule__IfExpressionKw__ConditionAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2444:1: ( ( rule__IfExpressionKw__ConditionAssignment_1 ) )
+            // InternalExpression.g:2443:1: ( ( ( rule__IfExpressionKw__ConditionAssignment_1 ) ) )
+            // InternalExpression.g:2444:1: ( ( rule__IfExpressionKw__ConditionAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2444:1: ( ( rule__IfExpressionKw__ConditionAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2445:1: ( rule__IfExpressionKw__ConditionAssignment_1 )
+            // InternalExpression.g:2444:1: ( ( rule__IfExpressionKw__ConditionAssignment_1 ) )
+            // InternalExpression.g:2445:1: ( rule__IfExpressionKw__ConditionAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionKwAccess().getConditionAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2446:1: ( rule__IfExpressionKw__ConditionAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2446:2: rule__IfExpressionKw__ConditionAssignment_1
+            // InternalExpression.g:2446:1: ( rule__IfExpressionKw__ConditionAssignment_1 )
+            // InternalExpression.g:2446:2: rule__IfExpressionKw__ConditionAssignment_1
             {
-            pushFollow(FOLLOW_rule__IfExpressionKw__ConditionAssignment_1_in_rule__IfExpressionKw__Group__1__Impl5152);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionKw__ConditionAssignment_1();
 
             state._fsp--;
@@ -7541,21 +7541,21 @@ public final void rule__IfExpressionKw__Group__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__IfExpressionKw__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2456:1: rule__IfExpressionKw__Group__2 : rule__IfExpressionKw__Group__2__Impl rule__IfExpressionKw__Group__3 ;
+    // InternalExpression.g:2456:1: rule__IfExpressionKw__Group__2 : rule__IfExpressionKw__Group__2__Impl rule__IfExpressionKw__Group__3 ;
     public final void rule__IfExpressionKw__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2460:1: ( rule__IfExpressionKw__Group__2__Impl rule__IfExpressionKw__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2461:2: rule__IfExpressionKw__Group__2__Impl rule__IfExpressionKw__Group__3
+            // InternalExpression.g:2460:1: ( rule__IfExpressionKw__Group__2__Impl rule__IfExpressionKw__Group__3 )
+            // InternalExpression.g:2461:2: rule__IfExpressionKw__Group__2__Impl rule__IfExpressionKw__Group__3
             {
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group__2__Impl_in_rule__IfExpressionKw__Group__25182);
+            pushFollow(FOLLOW_5);
             rule__IfExpressionKw__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group__3_in_rule__IfExpressionKw__Group__25185);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionKw__Group__3();
 
             state._fsp--;
@@ -7579,22 +7579,22 @@ public final void rule__IfExpressionKw__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__IfExpressionKw__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2468:1: rule__IfExpressionKw__Group__2__Impl : ( 'then' ) ;
+    // InternalExpression.g:2468:1: rule__IfExpressionKw__Group__2__Impl : ( 'then' ) ;
     public final void rule__IfExpressionKw__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2472:1: ( ( 'then' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2473:1: ( 'then' )
+            // InternalExpression.g:2472:1: ( ( 'then' ) )
+            // InternalExpression.g:2473:1: ( 'then' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2473:1: ( 'then' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2474:1: 'then'
+            // InternalExpression.g:2473:1: ( 'then' )
+            // InternalExpression.g:2474:1: 'then'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionKwAccess().getThenKeyword_2()); 
             }
-            match(input,44,FOLLOW_44_in_rule__IfExpressionKw__Group__2__Impl5213); if (state.failed) return ;
+            match(input,44,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIfExpressionKwAccess().getThenKeyword_2()); 
             }
@@ -7620,21 +7620,21 @@ public final void rule__IfExpressionKw__Group__2__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__IfExpressionKw__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2487:1: rule__IfExpressionKw__Group__3 : rule__IfExpressionKw__Group__3__Impl rule__IfExpressionKw__Group__4 ;
+    // InternalExpression.g:2487:1: rule__IfExpressionKw__Group__3 : rule__IfExpressionKw__Group__3__Impl rule__IfExpressionKw__Group__4 ;
     public final void rule__IfExpressionKw__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2491:1: ( rule__IfExpressionKw__Group__3__Impl rule__IfExpressionKw__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2492:2: rule__IfExpressionKw__Group__3__Impl rule__IfExpressionKw__Group__4
+            // InternalExpression.g:2491:1: ( rule__IfExpressionKw__Group__3__Impl rule__IfExpressionKw__Group__4 )
+            // InternalExpression.g:2492:2: rule__IfExpressionKw__Group__3__Impl rule__IfExpressionKw__Group__4
             {
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group__3__Impl_in_rule__IfExpressionKw__Group__35244);
+            pushFollow(FOLLOW_13);
             rule__IfExpressionKw__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group__4_in_rule__IfExpressionKw__Group__35247);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionKw__Group__4();
 
             state._fsp--;
@@ -7658,25 +7658,25 @@ public final void rule__IfExpressionKw__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__IfExpressionKw__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2499:1: rule__IfExpressionKw__Group__3__Impl : ( ( rule__IfExpressionKw__ThenPartAssignment_3 ) ) ;
+    // InternalExpression.g:2499:1: rule__IfExpressionKw__Group__3__Impl : ( ( rule__IfExpressionKw__ThenPartAssignment_3 ) ) ;
     public final void rule__IfExpressionKw__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2503:1: ( ( ( rule__IfExpressionKw__ThenPartAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2504:1: ( ( rule__IfExpressionKw__ThenPartAssignment_3 ) )
+            // InternalExpression.g:2503:1: ( ( ( rule__IfExpressionKw__ThenPartAssignment_3 ) ) )
+            // InternalExpression.g:2504:1: ( ( rule__IfExpressionKw__ThenPartAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2504:1: ( ( rule__IfExpressionKw__ThenPartAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2505:1: ( rule__IfExpressionKw__ThenPartAssignment_3 )
+            // InternalExpression.g:2504:1: ( ( rule__IfExpressionKw__ThenPartAssignment_3 ) )
+            // InternalExpression.g:2505:1: ( rule__IfExpressionKw__ThenPartAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionKwAccess().getThenPartAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2506:1: ( rule__IfExpressionKw__ThenPartAssignment_3 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2506:2: rule__IfExpressionKw__ThenPartAssignment_3
+            // InternalExpression.g:2506:1: ( rule__IfExpressionKw__ThenPartAssignment_3 )
+            // InternalExpression.g:2506:2: rule__IfExpressionKw__ThenPartAssignment_3
             {
-            pushFollow(FOLLOW_rule__IfExpressionKw__ThenPartAssignment_3_in_rule__IfExpressionKw__Group__3__Impl5274);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionKw__ThenPartAssignment_3();
 
             state._fsp--;
@@ -7709,16 +7709,16 @@ public final void rule__IfExpressionKw__Group__3__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__IfExpressionKw__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2516:1: rule__IfExpressionKw__Group__4 : rule__IfExpressionKw__Group__4__Impl ;
+    // InternalExpression.g:2516:1: rule__IfExpressionKw__Group__4 : rule__IfExpressionKw__Group__4__Impl ;
     public final void rule__IfExpressionKw__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2520:1: ( rule__IfExpressionKw__Group__4__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2521:2: rule__IfExpressionKw__Group__4__Impl
+            // InternalExpression.g:2520:1: ( rule__IfExpressionKw__Group__4__Impl )
+            // InternalExpression.g:2521:2: rule__IfExpressionKw__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group__4__Impl_in_rule__IfExpressionKw__Group__45304);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionKw__Group__4__Impl();
 
             state._fsp--;
@@ -7742,22 +7742,22 @@ public final void rule__IfExpressionKw__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__IfExpressionKw__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2527:1: rule__IfExpressionKw__Group__4__Impl : ( ( rule__IfExpressionKw__Group_4__0 )? ) ;
+    // InternalExpression.g:2527:1: rule__IfExpressionKw__Group__4__Impl : ( ( rule__IfExpressionKw__Group_4__0 )? ) ;
     public final void rule__IfExpressionKw__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2531:1: ( ( ( rule__IfExpressionKw__Group_4__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2532:1: ( ( rule__IfExpressionKw__Group_4__0 )? )
+            // InternalExpression.g:2531:1: ( ( ( rule__IfExpressionKw__Group_4__0 )? ) )
+            // InternalExpression.g:2532:1: ( ( rule__IfExpressionKw__Group_4__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2532:1: ( ( rule__IfExpressionKw__Group_4__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2533:1: ( rule__IfExpressionKw__Group_4__0 )?
+            // InternalExpression.g:2532:1: ( ( rule__IfExpressionKw__Group_4__0 )? )
+            // InternalExpression.g:2533:1: ( rule__IfExpressionKw__Group_4__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionKwAccess().getGroup_4()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2534:1: ( rule__IfExpressionKw__Group_4__0 )?
+            // InternalExpression.g:2534:1: ( rule__IfExpressionKw__Group_4__0 )?
             int alt19=2;
             int LA19_0 = input.LA(1);
 
@@ -7770,9 +7770,9 @@ public final void rule__IfExpressionKw__Group__4__Impl() throws RecognitionExcep
             }
             switch (alt19) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2534:2: rule__IfExpressionKw__Group_4__0
+                    // InternalExpression.g:2534:2: rule__IfExpressionKw__Group_4__0
                     {
-                    pushFollow(FOLLOW_rule__IfExpressionKw__Group_4__0_in_rule__IfExpressionKw__Group__4__Impl5331);
+                    pushFollow(FOLLOW_2);
                     rule__IfExpressionKw__Group_4__0();
 
                     state._fsp--;
@@ -7808,16 +7808,16 @@ public final void rule__IfExpressionKw__Group__4__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__IfExpressionKw__Group_4__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2554:1: rule__IfExpressionKw__Group_4__0 : rule__IfExpressionKw__Group_4__0__Impl ;
+    // InternalExpression.g:2554:1: rule__IfExpressionKw__Group_4__0 : rule__IfExpressionKw__Group_4__0__Impl ;
     public final void rule__IfExpressionKw__Group_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2558:1: ( rule__IfExpressionKw__Group_4__0__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2559:2: rule__IfExpressionKw__Group_4__0__Impl
+            // InternalExpression.g:2558:1: ( rule__IfExpressionKw__Group_4__0__Impl )
+            // InternalExpression.g:2559:2: rule__IfExpressionKw__Group_4__0__Impl
             {
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group_4__0__Impl_in_rule__IfExpressionKw__Group_4__05372);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionKw__Group_4__0__Impl();
 
             state._fsp--;
@@ -7841,25 +7841,25 @@ public final void rule__IfExpressionKw__Group_4__0() throws RecognitionException
 
 
     // $ANTLR start "rule__IfExpressionKw__Group_4__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2565:1: rule__IfExpressionKw__Group_4__0__Impl : ( ( rule__IfExpressionKw__Group_4_0__0 ) ) ;
+    // InternalExpression.g:2565:1: rule__IfExpressionKw__Group_4__0__Impl : ( ( rule__IfExpressionKw__Group_4_0__0 ) ) ;
     public final void rule__IfExpressionKw__Group_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2569:1: ( ( ( rule__IfExpressionKw__Group_4_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2570:1: ( ( rule__IfExpressionKw__Group_4_0__0 ) )
+            // InternalExpression.g:2569:1: ( ( ( rule__IfExpressionKw__Group_4_0__0 ) ) )
+            // InternalExpression.g:2570:1: ( ( rule__IfExpressionKw__Group_4_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2570:1: ( ( rule__IfExpressionKw__Group_4_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2571:1: ( rule__IfExpressionKw__Group_4_0__0 )
+            // InternalExpression.g:2570:1: ( ( rule__IfExpressionKw__Group_4_0__0 ) )
+            // InternalExpression.g:2571:1: ( rule__IfExpressionKw__Group_4_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionKwAccess().getGroup_4_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2572:1: ( rule__IfExpressionKw__Group_4_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2572:2: rule__IfExpressionKw__Group_4_0__0
+            // InternalExpression.g:2572:1: ( rule__IfExpressionKw__Group_4_0__0 )
+            // InternalExpression.g:2572:2: rule__IfExpressionKw__Group_4_0__0
             {
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group_4_0__0_in_rule__IfExpressionKw__Group_4__0__Impl5399);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionKw__Group_4_0__0();
 
             state._fsp--;
@@ -7892,21 +7892,21 @@ public final void rule__IfExpressionKw__Group_4__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__IfExpressionKw__Group_4_0__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2584:1: rule__IfExpressionKw__Group_4_0__0 : rule__IfExpressionKw__Group_4_0__0__Impl rule__IfExpressionKw__Group_4_0__1 ;
+    // InternalExpression.g:2584:1: rule__IfExpressionKw__Group_4_0__0 : rule__IfExpressionKw__Group_4_0__0__Impl rule__IfExpressionKw__Group_4_0__1 ;
     public final void rule__IfExpressionKw__Group_4_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2588:1: ( rule__IfExpressionKw__Group_4_0__0__Impl rule__IfExpressionKw__Group_4_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2589:2: rule__IfExpressionKw__Group_4_0__0__Impl rule__IfExpressionKw__Group_4_0__1
+            // InternalExpression.g:2588:1: ( rule__IfExpressionKw__Group_4_0__0__Impl rule__IfExpressionKw__Group_4_0__1 )
+            // InternalExpression.g:2589:2: rule__IfExpressionKw__Group_4_0__0__Impl rule__IfExpressionKw__Group_4_0__1
             {
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group_4_0__0__Impl_in_rule__IfExpressionKw__Group_4_0__05431);
+            pushFollow(FOLLOW_5);
             rule__IfExpressionKw__Group_4_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group_4_0__1_in_rule__IfExpressionKw__Group_4_0__05434);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionKw__Group_4_0__1();
 
             state._fsp--;
@@ -7930,22 +7930,22 @@ public final void rule__IfExpressionKw__Group_4_0__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__IfExpressionKw__Group_4_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2596:1: rule__IfExpressionKw__Group_4_0__0__Impl : ( 'else' ) ;
+    // InternalExpression.g:2596:1: rule__IfExpressionKw__Group_4_0__0__Impl : ( 'else' ) ;
     public final void rule__IfExpressionKw__Group_4_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2600:1: ( ( 'else' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2601:1: ( 'else' )
+            // InternalExpression.g:2600:1: ( ( 'else' ) )
+            // InternalExpression.g:2601:1: ( 'else' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2601:1: ( 'else' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2602:1: 'else'
+            // InternalExpression.g:2601:1: ( 'else' )
+            // InternalExpression.g:2602:1: 'else'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionKwAccess().getElseKeyword_4_0_0()); 
             }
-            match(input,45,FOLLOW_45_in_rule__IfExpressionKw__Group_4_0__0__Impl5462); if (state.failed) return ;
+            match(input,45,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIfExpressionKwAccess().getElseKeyword_4_0_0()); 
             }
@@ -7971,16 +7971,16 @@ public final void rule__IfExpressionKw__Group_4_0__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__IfExpressionKw__Group_4_0__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2615:1: rule__IfExpressionKw__Group_4_0__1 : rule__IfExpressionKw__Group_4_0__1__Impl ;
+    // InternalExpression.g:2615:1: rule__IfExpressionKw__Group_4_0__1 : rule__IfExpressionKw__Group_4_0__1__Impl ;
     public final void rule__IfExpressionKw__Group_4_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2619:1: ( rule__IfExpressionKw__Group_4_0__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2620:2: rule__IfExpressionKw__Group_4_0__1__Impl
+            // InternalExpression.g:2619:1: ( rule__IfExpressionKw__Group_4_0__1__Impl )
+            // InternalExpression.g:2620:2: rule__IfExpressionKw__Group_4_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group_4_0__1__Impl_in_rule__IfExpressionKw__Group_4_0__15493);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionKw__Group_4_0__1__Impl();
 
             state._fsp--;
@@ -8004,25 +8004,25 @@ public final void rule__IfExpressionKw__Group_4_0__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__IfExpressionKw__Group_4_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2626:1: rule__IfExpressionKw__Group_4_0__1__Impl : ( ( rule__IfExpressionKw__ElsePartAssignment_4_0_1 ) ) ;
+    // InternalExpression.g:2626:1: rule__IfExpressionKw__Group_4_0__1__Impl : ( ( rule__IfExpressionKw__ElsePartAssignment_4_0_1 ) ) ;
     public final void rule__IfExpressionKw__Group_4_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2630:1: ( ( ( rule__IfExpressionKw__ElsePartAssignment_4_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2631:1: ( ( rule__IfExpressionKw__ElsePartAssignment_4_0_1 ) )
+            // InternalExpression.g:2630:1: ( ( ( rule__IfExpressionKw__ElsePartAssignment_4_0_1 ) ) )
+            // InternalExpression.g:2631:1: ( ( rule__IfExpressionKw__ElsePartAssignment_4_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2631:1: ( ( rule__IfExpressionKw__ElsePartAssignment_4_0_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2632:1: ( rule__IfExpressionKw__ElsePartAssignment_4_0_1 )
+            // InternalExpression.g:2631:1: ( ( rule__IfExpressionKw__ElsePartAssignment_4_0_1 ) )
+            // InternalExpression.g:2632:1: ( rule__IfExpressionKw__ElsePartAssignment_4_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionKwAccess().getElsePartAssignment_4_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2633:1: ( rule__IfExpressionKw__ElsePartAssignment_4_0_1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2633:2: rule__IfExpressionKw__ElsePartAssignment_4_0_1
+            // InternalExpression.g:2633:1: ( rule__IfExpressionKw__ElsePartAssignment_4_0_1 )
+            // InternalExpression.g:2633:2: rule__IfExpressionKw__ElsePartAssignment_4_0_1
             {
-            pushFollow(FOLLOW_rule__IfExpressionKw__ElsePartAssignment_4_0_1_in_rule__IfExpressionKw__Group_4_0__1__Impl5520);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionKw__ElsePartAssignment_4_0_1();
 
             state._fsp--;
@@ -8055,21 +8055,21 @@ public final void rule__IfExpressionKw__Group_4_0__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__SwitchExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2647:1: rule__SwitchExpression__Group__0 : rule__SwitchExpression__Group__0__Impl rule__SwitchExpression__Group__1 ;
+    // InternalExpression.g:2647:1: rule__SwitchExpression__Group__0 : rule__SwitchExpression__Group__0__Impl rule__SwitchExpression__Group__1 ;
     public final void rule__SwitchExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2651:1: ( rule__SwitchExpression__Group__0__Impl rule__SwitchExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2652:2: rule__SwitchExpression__Group__0__Impl rule__SwitchExpression__Group__1
+            // InternalExpression.g:2651:1: ( rule__SwitchExpression__Group__0__Impl rule__SwitchExpression__Group__1 )
+            // InternalExpression.g:2652:2: rule__SwitchExpression__Group__0__Impl rule__SwitchExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__0__Impl_in_rule__SwitchExpression__Group__05554);
+            pushFollow(FOLLOW_14);
             rule__SwitchExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__1_in_rule__SwitchExpression__Group__05557);
+            pushFollow(FOLLOW_2);
             rule__SwitchExpression__Group__1();
 
             state._fsp--;
@@ -8093,22 +8093,22 @@ public final void rule__SwitchExpression__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__SwitchExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2659:1: rule__SwitchExpression__Group__0__Impl : ( 'switch' ) ;
+    // InternalExpression.g:2659:1: rule__SwitchExpression__Group__0__Impl : ( 'switch' ) ;
     public final void rule__SwitchExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2663:1: ( ( 'switch' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2664:1: ( 'switch' )
+            // InternalExpression.g:2663:1: ( ( 'switch' ) )
+            // InternalExpression.g:2664:1: ( 'switch' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2664:1: ( 'switch' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2665:1: 'switch'
+            // InternalExpression.g:2664:1: ( 'switch' )
+            // InternalExpression.g:2665:1: 'switch'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getSwitchKeyword_0()); 
             }
-            match(input,46,FOLLOW_46_in_rule__SwitchExpression__Group__0__Impl5585); if (state.failed) return ;
+            match(input,46,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSwitchExpressionAccess().getSwitchKeyword_0()); 
             }
@@ -8134,21 +8134,21 @@ public final void rule__SwitchExpression__Group__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__SwitchExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2678:1: rule__SwitchExpression__Group__1 : rule__SwitchExpression__Group__1__Impl rule__SwitchExpression__Group__2 ;
+    // InternalExpression.g:2678:1: rule__SwitchExpression__Group__1 : rule__SwitchExpression__Group__1__Impl rule__SwitchExpression__Group__2 ;
     public final void rule__SwitchExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2682:1: ( rule__SwitchExpression__Group__1__Impl rule__SwitchExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2683:2: rule__SwitchExpression__Group__1__Impl rule__SwitchExpression__Group__2
+            // InternalExpression.g:2682:1: ( rule__SwitchExpression__Group__1__Impl rule__SwitchExpression__Group__2 )
+            // InternalExpression.g:2683:2: rule__SwitchExpression__Group__1__Impl rule__SwitchExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__1__Impl_in_rule__SwitchExpression__Group__15616);
+            pushFollow(FOLLOW_14);
             rule__SwitchExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__2_in_rule__SwitchExpression__Group__15619);
+            pushFollow(FOLLOW_2);
             rule__SwitchExpression__Group__2();
 
             state._fsp--;
@@ -8172,22 +8172,22 @@ public final void rule__SwitchExpression__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__SwitchExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2690:1: rule__SwitchExpression__Group__1__Impl : ( ( rule__SwitchExpression__Group_1__0 )? ) ;
+    // InternalExpression.g:2690:1: rule__SwitchExpression__Group__1__Impl : ( ( rule__SwitchExpression__Group_1__0 )? ) ;
     public final void rule__SwitchExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2694:1: ( ( ( rule__SwitchExpression__Group_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2695:1: ( ( rule__SwitchExpression__Group_1__0 )? )
+            // InternalExpression.g:2694:1: ( ( ( rule__SwitchExpression__Group_1__0 )? ) )
+            // InternalExpression.g:2695:1: ( ( rule__SwitchExpression__Group_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2695:1: ( ( rule__SwitchExpression__Group_1__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2696:1: ( rule__SwitchExpression__Group_1__0 )?
+            // InternalExpression.g:2695:1: ( ( rule__SwitchExpression__Group_1__0 )? )
+            // InternalExpression.g:2696:1: ( rule__SwitchExpression__Group_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2697:1: ( rule__SwitchExpression__Group_1__0 )?
+            // InternalExpression.g:2697:1: ( rule__SwitchExpression__Group_1__0 )?
             int alt20=2;
             int LA20_0 = input.LA(1);
 
@@ -8196,9 +8196,9 @@ public final void rule__SwitchExpression__Group__1__Impl() throws RecognitionExc
             }
             switch (alt20) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2697:2: rule__SwitchExpression__Group_1__0
+                    // InternalExpression.g:2697:2: rule__SwitchExpression__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__SwitchExpression__Group_1__0_in_rule__SwitchExpression__Group__1__Impl5646);
+                    pushFollow(FOLLOW_2);
                     rule__SwitchExpression__Group_1__0();
 
                     state._fsp--;
@@ -8234,21 +8234,21 @@ public final void rule__SwitchExpression__Group__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__SwitchExpression__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2707:1: rule__SwitchExpression__Group__2 : rule__SwitchExpression__Group__2__Impl rule__SwitchExpression__Group__3 ;
+    // InternalExpression.g:2707:1: rule__SwitchExpression__Group__2 : rule__SwitchExpression__Group__2__Impl rule__SwitchExpression__Group__3 ;
     public final void rule__SwitchExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2711:1: ( rule__SwitchExpression__Group__2__Impl rule__SwitchExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2712:2: rule__SwitchExpression__Group__2__Impl rule__SwitchExpression__Group__3
+            // InternalExpression.g:2711:1: ( rule__SwitchExpression__Group__2__Impl rule__SwitchExpression__Group__3 )
+            // InternalExpression.g:2712:2: rule__SwitchExpression__Group__2__Impl rule__SwitchExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__2__Impl_in_rule__SwitchExpression__Group__25677);
+            pushFollow(FOLLOW_15);
             rule__SwitchExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__3_in_rule__SwitchExpression__Group__25680);
+            pushFollow(FOLLOW_2);
             rule__SwitchExpression__Group__3();
 
             state._fsp--;
@@ -8272,22 +8272,22 @@ public final void rule__SwitchExpression__Group__2() throws RecognitionException
 
 
     // $ANTLR start "rule__SwitchExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2719:1: rule__SwitchExpression__Group__2__Impl : ( '{' ) ;
+    // InternalExpression.g:2719:1: rule__SwitchExpression__Group__2__Impl : ( '{' ) ;
     public final void rule__SwitchExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2723:1: ( ( '{' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2724:1: ( '{' )
+            // InternalExpression.g:2723:1: ( ( '{' ) )
+            // InternalExpression.g:2724:1: ( '{' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2724:1: ( '{' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2725:1: '{'
+            // InternalExpression.g:2724:1: ( '{' )
+            // InternalExpression.g:2725:1: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getLeftCurlyBracketKeyword_2()); 
             }
-            match(input,47,FOLLOW_47_in_rule__SwitchExpression__Group__2__Impl5708); if (state.failed) return ;
+            match(input,47,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSwitchExpressionAccess().getLeftCurlyBracketKeyword_2()); 
             }
@@ -8313,21 +8313,21 @@ public final void rule__SwitchExpression__Group__2__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__SwitchExpression__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2738:1: rule__SwitchExpression__Group__3 : rule__SwitchExpression__Group__3__Impl rule__SwitchExpression__Group__4 ;
+    // InternalExpression.g:2738:1: rule__SwitchExpression__Group__3 : rule__SwitchExpression__Group__3__Impl rule__SwitchExpression__Group__4 ;
     public final void rule__SwitchExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2742:1: ( rule__SwitchExpression__Group__3__Impl rule__SwitchExpression__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2743:2: rule__SwitchExpression__Group__3__Impl rule__SwitchExpression__Group__4
+            // InternalExpression.g:2742:1: ( rule__SwitchExpression__Group__3__Impl rule__SwitchExpression__Group__4 )
+            // InternalExpression.g:2743:2: rule__SwitchExpression__Group__3__Impl rule__SwitchExpression__Group__4
             {
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__3__Impl_in_rule__SwitchExpression__Group__35739);
+            pushFollow(FOLLOW_15);
             rule__SwitchExpression__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__4_in_rule__SwitchExpression__Group__35742);
+            pushFollow(FOLLOW_2);
             rule__SwitchExpression__Group__4();
 
             state._fsp--;
@@ -8351,22 +8351,22 @@ public final void rule__SwitchExpression__Group__3() throws RecognitionException
 
 
     // $ANTLR start "rule__SwitchExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2750:1: rule__SwitchExpression__Group__3__Impl : ( ( rule__SwitchExpression__CaseAssignment_3 )* ) ;
+    // InternalExpression.g:2750:1: rule__SwitchExpression__Group__3__Impl : ( ( rule__SwitchExpression__CaseAssignment_3 )* ) ;
     public final void rule__SwitchExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2754:1: ( ( ( rule__SwitchExpression__CaseAssignment_3 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2755:1: ( ( rule__SwitchExpression__CaseAssignment_3 )* )
+            // InternalExpression.g:2754:1: ( ( ( rule__SwitchExpression__CaseAssignment_3 )* ) )
+            // InternalExpression.g:2755:1: ( ( rule__SwitchExpression__CaseAssignment_3 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2755:1: ( ( rule__SwitchExpression__CaseAssignment_3 )* )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2756:1: ( rule__SwitchExpression__CaseAssignment_3 )*
+            // InternalExpression.g:2755:1: ( ( rule__SwitchExpression__CaseAssignment_3 )* )
+            // InternalExpression.g:2756:1: ( rule__SwitchExpression__CaseAssignment_3 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getCaseAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2757:1: ( rule__SwitchExpression__CaseAssignment_3 )*
+            // InternalExpression.g:2757:1: ( rule__SwitchExpression__CaseAssignment_3 )*
             loop21:
             do {
                 int alt21=2;
@@ -8379,9 +8379,9 @@ public final void rule__SwitchExpression__Group__3__Impl() throws RecognitionExc
 
                 switch (alt21) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2757:2: rule__SwitchExpression__CaseAssignment_3
+            	    // InternalExpression.g:2757:2: rule__SwitchExpression__CaseAssignment_3
             	    {
-            	    pushFollow(FOLLOW_rule__SwitchExpression__CaseAssignment_3_in_rule__SwitchExpression__Group__3__Impl5769);
+            	    pushFollow(FOLLOW_16);
             	    rule__SwitchExpression__CaseAssignment_3();
 
             	    state._fsp--;
@@ -8420,21 +8420,21 @@ public final void rule__SwitchExpression__Group__3__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__SwitchExpression__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2767:1: rule__SwitchExpression__Group__4 : rule__SwitchExpression__Group__4__Impl rule__SwitchExpression__Group__5 ;
+    // InternalExpression.g:2767:1: rule__SwitchExpression__Group__4 : rule__SwitchExpression__Group__4__Impl rule__SwitchExpression__Group__5 ;
     public final void rule__SwitchExpression__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2771:1: ( rule__SwitchExpression__Group__4__Impl rule__SwitchExpression__Group__5 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2772:2: rule__SwitchExpression__Group__4__Impl rule__SwitchExpression__Group__5
+            // InternalExpression.g:2771:1: ( rule__SwitchExpression__Group__4__Impl rule__SwitchExpression__Group__5 )
+            // InternalExpression.g:2772:2: rule__SwitchExpression__Group__4__Impl rule__SwitchExpression__Group__5
             {
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__4__Impl_in_rule__SwitchExpression__Group__45800);
+            pushFollow(FOLLOW_6);
             rule__SwitchExpression__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__5_in_rule__SwitchExpression__Group__45803);
+            pushFollow(FOLLOW_2);
             rule__SwitchExpression__Group__5();
 
             state._fsp--;
@@ -8458,22 +8458,22 @@ public final void rule__SwitchExpression__Group__4() throws RecognitionException
 
 
     // $ANTLR start "rule__SwitchExpression__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2779:1: rule__SwitchExpression__Group__4__Impl : ( 'default' ) ;
+    // InternalExpression.g:2779:1: rule__SwitchExpression__Group__4__Impl : ( 'default' ) ;
     public final void rule__SwitchExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2783:1: ( ( 'default' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2784:1: ( 'default' )
+            // InternalExpression.g:2783:1: ( ( 'default' ) )
+            // InternalExpression.g:2784:1: ( 'default' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2784:1: ( 'default' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2785:1: 'default'
+            // InternalExpression.g:2784:1: ( 'default' )
+            // InternalExpression.g:2785:1: 'default'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getDefaultKeyword_4()); 
             }
-            match(input,48,FOLLOW_48_in_rule__SwitchExpression__Group__4__Impl5831); if (state.failed) return ;
+            match(input,48,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSwitchExpressionAccess().getDefaultKeyword_4()); 
             }
@@ -8499,21 +8499,21 @@ public final void rule__SwitchExpression__Group__4__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__SwitchExpression__Group__5"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2798:1: rule__SwitchExpression__Group__5 : rule__SwitchExpression__Group__5__Impl rule__SwitchExpression__Group__6 ;
+    // InternalExpression.g:2798:1: rule__SwitchExpression__Group__5 : rule__SwitchExpression__Group__5__Impl rule__SwitchExpression__Group__6 ;
     public final void rule__SwitchExpression__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2802:1: ( rule__SwitchExpression__Group__5__Impl rule__SwitchExpression__Group__6 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2803:2: rule__SwitchExpression__Group__5__Impl rule__SwitchExpression__Group__6
+            // InternalExpression.g:2802:1: ( rule__SwitchExpression__Group__5__Impl rule__SwitchExpression__Group__6 )
+            // InternalExpression.g:2803:2: rule__SwitchExpression__Group__5__Impl rule__SwitchExpression__Group__6
             {
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__5__Impl_in_rule__SwitchExpression__Group__55862);
+            pushFollow(FOLLOW_17);
             rule__SwitchExpression__Group__5__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__6_in_rule__SwitchExpression__Group__55865);
+            pushFollow(FOLLOW_2);
             rule__SwitchExpression__Group__6();
 
             state._fsp--;
@@ -8537,22 +8537,22 @@ public final void rule__SwitchExpression__Group__5() throws RecognitionException
 
 
     // $ANTLR start "rule__SwitchExpression__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2810:1: rule__SwitchExpression__Group__5__Impl : ( ':' ) ;
+    // InternalExpression.g:2810:1: rule__SwitchExpression__Group__5__Impl : ( ':' ) ;
     public final void rule__SwitchExpression__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2814:1: ( ( ':' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2815:1: ( ':' )
+            // InternalExpression.g:2814:1: ( ( ':' ) )
+            // InternalExpression.g:2815:1: ( ':' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2815:1: ( ':' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2816:1: ':'
+            // InternalExpression.g:2815:1: ( ':' )
+            // InternalExpression.g:2816:1: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getColonKeyword_5()); 
             }
-            match(input,38,FOLLOW_38_in_rule__SwitchExpression__Group__5__Impl5893); if (state.failed) return ;
+            match(input,38,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSwitchExpressionAccess().getColonKeyword_5()); 
             }
@@ -8578,21 +8578,21 @@ public final void rule__SwitchExpression__Group__5__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__SwitchExpression__Group__6"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2829:1: rule__SwitchExpression__Group__6 : rule__SwitchExpression__Group__6__Impl rule__SwitchExpression__Group__7 ;
+    // InternalExpression.g:2829:1: rule__SwitchExpression__Group__6 : rule__SwitchExpression__Group__6__Impl rule__SwitchExpression__Group__7 ;
     public final void rule__SwitchExpression__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2833:1: ( rule__SwitchExpression__Group__6__Impl rule__SwitchExpression__Group__7 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2834:2: rule__SwitchExpression__Group__6__Impl rule__SwitchExpression__Group__7
+            // InternalExpression.g:2833:1: ( rule__SwitchExpression__Group__6__Impl rule__SwitchExpression__Group__7 )
+            // InternalExpression.g:2834:2: rule__SwitchExpression__Group__6__Impl rule__SwitchExpression__Group__7
             {
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__6__Impl_in_rule__SwitchExpression__Group__65924);
+            pushFollow(FOLLOW_18);
             rule__SwitchExpression__Group__6__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__7_in_rule__SwitchExpression__Group__65927);
+            pushFollow(FOLLOW_2);
             rule__SwitchExpression__Group__7();
 
             state._fsp--;
@@ -8616,25 +8616,25 @@ public final void rule__SwitchExpression__Group__6() throws RecognitionException
 
 
     // $ANTLR start "rule__SwitchExpression__Group__6__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2841:1: rule__SwitchExpression__Group__6__Impl : ( ( rule__SwitchExpression__DefaultExprAssignment_6 ) ) ;
+    // InternalExpression.g:2841:1: rule__SwitchExpression__Group__6__Impl : ( ( rule__SwitchExpression__DefaultExprAssignment_6 ) ) ;
     public final void rule__SwitchExpression__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2845:1: ( ( ( rule__SwitchExpression__DefaultExprAssignment_6 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2846:1: ( ( rule__SwitchExpression__DefaultExprAssignment_6 ) )
+            // InternalExpression.g:2845:1: ( ( ( rule__SwitchExpression__DefaultExprAssignment_6 ) ) )
+            // InternalExpression.g:2846:1: ( ( rule__SwitchExpression__DefaultExprAssignment_6 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2846:1: ( ( rule__SwitchExpression__DefaultExprAssignment_6 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2847:1: ( rule__SwitchExpression__DefaultExprAssignment_6 )
+            // InternalExpression.g:2846:1: ( ( rule__SwitchExpression__DefaultExprAssignment_6 ) )
+            // InternalExpression.g:2847:1: ( rule__SwitchExpression__DefaultExprAssignment_6 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getDefaultExprAssignment_6()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2848:1: ( rule__SwitchExpression__DefaultExprAssignment_6 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2848:2: rule__SwitchExpression__DefaultExprAssignment_6
+            // InternalExpression.g:2848:1: ( rule__SwitchExpression__DefaultExprAssignment_6 )
+            // InternalExpression.g:2848:2: rule__SwitchExpression__DefaultExprAssignment_6
             {
-            pushFollow(FOLLOW_rule__SwitchExpression__DefaultExprAssignment_6_in_rule__SwitchExpression__Group__6__Impl5954);
+            pushFollow(FOLLOW_2);
             rule__SwitchExpression__DefaultExprAssignment_6();
 
             state._fsp--;
@@ -8667,16 +8667,16 @@ public final void rule__SwitchExpression__Group__6__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__SwitchExpression__Group__7"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2858:1: rule__SwitchExpression__Group__7 : rule__SwitchExpression__Group__7__Impl ;
+    // InternalExpression.g:2858:1: rule__SwitchExpression__Group__7 : rule__SwitchExpression__Group__7__Impl ;
     public final void rule__SwitchExpression__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2862:1: ( rule__SwitchExpression__Group__7__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2863:2: rule__SwitchExpression__Group__7__Impl
+            // InternalExpression.g:2862:1: ( rule__SwitchExpression__Group__7__Impl )
+            // InternalExpression.g:2863:2: rule__SwitchExpression__Group__7__Impl
             {
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__7__Impl_in_rule__SwitchExpression__Group__75984);
+            pushFollow(FOLLOW_2);
             rule__SwitchExpression__Group__7__Impl();
 
             state._fsp--;
@@ -8700,22 +8700,22 @@ public final void rule__SwitchExpression__Group__7() throws RecognitionException
 
 
     // $ANTLR start "rule__SwitchExpression__Group__7__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2869:1: rule__SwitchExpression__Group__7__Impl : ( '}' ) ;
+    // InternalExpression.g:2869:1: rule__SwitchExpression__Group__7__Impl : ( '}' ) ;
     public final void rule__SwitchExpression__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2873:1: ( ( '}' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2874:1: ( '}' )
+            // InternalExpression.g:2873:1: ( ( '}' ) )
+            // InternalExpression.g:2874:1: ( '}' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2874:1: ( '}' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2875:1: '}'
+            // InternalExpression.g:2874:1: ( '}' )
+            // InternalExpression.g:2875:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getRightCurlyBracketKeyword_7()); 
             }
-            match(input,49,FOLLOW_49_in_rule__SwitchExpression__Group__7__Impl6012); if (state.failed) return ;
+            match(input,49,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSwitchExpressionAccess().getRightCurlyBracketKeyword_7()); 
             }
@@ -8741,21 +8741,21 @@ public final void rule__SwitchExpression__Group__7__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__SwitchExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2904:1: rule__SwitchExpression__Group_1__0 : rule__SwitchExpression__Group_1__0__Impl rule__SwitchExpression__Group_1__1 ;
+    // InternalExpression.g:2904:1: rule__SwitchExpression__Group_1__0 : rule__SwitchExpression__Group_1__0__Impl rule__SwitchExpression__Group_1__1 ;
     public final void rule__SwitchExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2908:1: ( rule__SwitchExpression__Group_1__0__Impl rule__SwitchExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2909:2: rule__SwitchExpression__Group_1__0__Impl rule__SwitchExpression__Group_1__1
+            // InternalExpression.g:2908:1: ( rule__SwitchExpression__Group_1__0__Impl rule__SwitchExpression__Group_1__1 )
+            // InternalExpression.g:2909:2: rule__SwitchExpression__Group_1__0__Impl rule__SwitchExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__SwitchExpression__Group_1__0__Impl_in_rule__SwitchExpression__Group_1__06059);
+            pushFollow(FOLLOW_17);
             rule__SwitchExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SwitchExpression__Group_1__1_in_rule__SwitchExpression__Group_1__06062);
+            pushFollow(FOLLOW_2);
             rule__SwitchExpression__Group_1__1();
 
             state._fsp--;
@@ -8779,22 +8779,22 @@ public final void rule__SwitchExpression__Group_1__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__SwitchExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2916:1: rule__SwitchExpression__Group_1__0__Impl : ( '(' ) ;
+    // InternalExpression.g:2916:1: rule__SwitchExpression__Group_1__0__Impl : ( '(' ) ;
     public final void rule__SwitchExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2920:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2921:1: ( '(' )
+            // InternalExpression.g:2920:1: ( ( '(' ) )
+            // InternalExpression.g:2921:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2921:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2922:1: '('
+            // InternalExpression.g:2921:1: ( '(' )
+            // InternalExpression.g:2922:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getLeftParenthesisKeyword_1_0()); 
             }
-            match(input,39,FOLLOW_39_in_rule__SwitchExpression__Group_1__0__Impl6090); if (state.failed) return ;
+            match(input,39,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSwitchExpressionAccess().getLeftParenthesisKeyword_1_0()); 
             }
@@ -8820,21 +8820,21 @@ public final void rule__SwitchExpression__Group_1__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__SwitchExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2935:1: rule__SwitchExpression__Group_1__1 : rule__SwitchExpression__Group_1__1__Impl rule__SwitchExpression__Group_1__2 ;
+    // InternalExpression.g:2935:1: rule__SwitchExpression__Group_1__1 : rule__SwitchExpression__Group_1__1__Impl rule__SwitchExpression__Group_1__2 ;
     public final void rule__SwitchExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2939:1: ( rule__SwitchExpression__Group_1__1__Impl rule__SwitchExpression__Group_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2940:2: rule__SwitchExpression__Group_1__1__Impl rule__SwitchExpression__Group_1__2
+            // InternalExpression.g:2939:1: ( rule__SwitchExpression__Group_1__1__Impl rule__SwitchExpression__Group_1__2 )
+            // InternalExpression.g:2940:2: rule__SwitchExpression__Group_1__1__Impl rule__SwitchExpression__Group_1__2
             {
-            pushFollow(FOLLOW_rule__SwitchExpression__Group_1__1__Impl_in_rule__SwitchExpression__Group_1__16121);
+            pushFollow(FOLLOW_8);
             rule__SwitchExpression__Group_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SwitchExpression__Group_1__2_in_rule__SwitchExpression__Group_1__16124);
+            pushFollow(FOLLOW_2);
             rule__SwitchExpression__Group_1__2();
 
             state._fsp--;
@@ -8858,25 +8858,25 @@ public final void rule__SwitchExpression__Group_1__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__SwitchExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2947:1: rule__SwitchExpression__Group_1__1__Impl : ( ( rule__SwitchExpression__SwitchExprAssignment_1_1 ) ) ;
+    // InternalExpression.g:2947:1: rule__SwitchExpression__Group_1__1__Impl : ( ( rule__SwitchExpression__SwitchExprAssignment_1_1 ) ) ;
     public final void rule__SwitchExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2951:1: ( ( ( rule__SwitchExpression__SwitchExprAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2952:1: ( ( rule__SwitchExpression__SwitchExprAssignment_1_1 ) )
+            // InternalExpression.g:2951:1: ( ( ( rule__SwitchExpression__SwitchExprAssignment_1_1 ) ) )
+            // InternalExpression.g:2952:1: ( ( rule__SwitchExpression__SwitchExprAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2952:1: ( ( rule__SwitchExpression__SwitchExprAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2953:1: ( rule__SwitchExpression__SwitchExprAssignment_1_1 )
+            // InternalExpression.g:2952:1: ( ( rule__SwitchExpression__SwitchExprAssignment_1_1 ) )
+            // InternalExpression.g:2953:1: ( rule__SwitchExpression__SwitchExprAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getSwitchExprAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2954:1: ( rule__SwitchExpression__SwitchExprAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2954:2: rule__SwitchExpression__SwitchExprAssignment_1_1
+            // InternalExpression.g:2954:1: ( rule__SwitchExpression__SwitchExprAssignment_1_1 )
+            // InternalExpression.g:2954:2: rule__SwitchExpression__SwitchExprAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__SwitchExpression__SwitchExprAssignment_1_1_in_rule__SwitchExpression__Group_1__1__Impl6151);
+            pushFollow(FOLLOW_2);
             rule__SwitchExpression__SwitchExprAssignment_1_1();
 
             state._fsp--;
@@ -8909,16 +8909,16 @@ public final void rule__SwitchExpression__Group_1__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__SwitchExpression__Group_1__2"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2964:1: rule__SwitchExpression__Group_1__2 : rule__SwitchExpression__Group_1__2__Impl ;
+    // InternalExpression.g:2964:1: rule__SwitchExpression__Group_1__2 : rule__SwitchExpression__Group_1__2__Impl ;
     public final void rule__SwitchExpression__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2968:1: ( rule__SwitchExpression__Group_1__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2969:2: rule__SwitchExpression__Group_1__2__Impl
+            // InternalExpression.g:2968:1: ( rule__SwitchExpression__Group_1__2__Impl )
+            // InternalExpression.g:2969:2: rule__SwitchExpression__Group_1__2__Impl
             {
-            pushFollow(FOLLOW_rule__SwitchExpression__Group_1__2__Impl_in_rule__SwitchExpression__Group_1__26181);
+            pushFollow(FOLLOW_2);
             rule__SwitchExpression__Group_1__2__Impl();
 
             state._fsp--;
@@ -8942,22 +8942,22 @@ public final void rule__SwitchExpression__Group_1__2() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__SwitchExpression__Group_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2975:1: rule__SwitchExpression__Group_1__2__Impl : ( ')' ) ;
+    // InternalExpression.g:2975:1: rule__SwitchExpression__Group_1__2__Impl : ( ')' ) ;
     public final void rule__SwitchExpression__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2979:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2980:1: ( ')' )
+            // InternalExpression.g:2979:1: ( ( ')' ) )
+            // InternalExpression.g:2980:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2980:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2981:1: ')'
+            // InternalExpression.g:2980:1: ( ')' )
+            // InternalExpression.g:2981:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getRightParenthesisKeyword_1_2()); 
             }
-            match(input,40,FOLLOW_40_in_rule__SwitchExpression__Group_1__2__Impl6209); if (state.failed) return ;
+            match(input,40,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSwitchExpressionAccess().getRightParenthesisKeyword_1_2()); 
             }
@@ -8983,21 +8983,21 @@ public final void rule__SwitchExpression__Group_1__2__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__Case__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3000:1: rule__Case__Group__0 : rule__Case__Group__0__Impl rule__Case__Group__1 ;
+    // InternalExpression.g:3000:1: rule__Case__Group__0 : rule__Case__Group__0__Impl rule__Case__Group__1 ;
     public final void rule__Case__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3004:1: ( rule__Case__Group__0__Impl rule__Case__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3005:2: rule__Case__Group__0__Impl rule__Case__Group__1
+            // InternalExpression.g:3004:1: ( rule__Case__Group__0__Impl rule__Case__Group__1 )
+            // InternalExpression.g:3005:2: rule__Case__Group__0__Impl rule__Case__Group__1
             {
-            pushFollow(FOLLOW_rule__Case__Group__0__Impl_in_rule__Case__Group__06246);
+            pushFollow(FOLLOW_17);
             rule__Case__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Case__Group__1_in_rule__Case__Group__06249);
+            pushFollow(FOLLOW_2);
             rule__Case__Group__1();
 
             state._fsp--;
@@ -9021,22 +9021,22 @@ public final void rule__Case__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Case__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3012:1: rule__Case__Group__0__Impl : ( 'case' ) ;
+    // InternalExpression.g:3012:1: rule__Case__Group__0__Impl : ( 'case' ) ;
     public final void rule__Case__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3016:1: ( ( 'case' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3017:1: ( 'case' )
+            // InternalExpression.g:3016:1: ( ( 'case' ) )
+            // InternalExpression.g:3017:1: ( 'case' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3017:1: ( 'case' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3018:1: 'case'
+            // InternalExpression.g:3017:1: ( 'case' )
+            // InternalExpression.g:3018:1: 'case'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCaseAccess().getCaseKeyword_0()); 
             }
-            match(input,50,FOLLOW_50_in_rule__Case__Group__0__Impl6277); if (state.failed) return ;
+            match(input,50,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCaseAccess().getCaseKeyword_0()); 
             }
@@ -9062,21 +9062,21 @@ public final void rule__Case__Group__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Case__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3031:1: rule__Case__Group__1 : rule__Case__Group__1__Impl rule__Case__Group__2 ;
+    // InternalExpression.g:3031:1: rule__Case__Group__1 : rule__Case__Group__1__Impl rule__Case__Group__2 ;
     public final void rule__Case__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3035:1: ( rule__Case__Group__1__Impl rule__Case__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3036:2: rule__Case__Group__1__Impl rule__Case__Group__2
+            // InternalExpression.g:3035:1: ( rule__Case__Group__1__Impl rule__Case__Group__2 )
+            // InternalExpression.g:3036:2: rule__Case__Group__1__Impl rule__Case__Group__2
             {
-            pushFollow(FOLLOW_rule__Case__Group__1__Impl_in_rule__Case__Group__16308);
+            pushFollow(FOLLOW_6);
             rule__Case__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Case__Group__2_in_rule__Case__Group__16311);
+            pushFollow(FOLLOW_2);
             rule__Case__Group__2();
 
             state._fsp--;
@@ -9100,25 +9100,25 @@ public final void rule__Case__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Case__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3043:1: rule__Case__Group__1__Impl : ( ( rule__Case__ConditionAssignment_1 ) ) ;
+    // InternalExpression.g:3043:1: rule__Case__Group__1__Impl : ( ( rule__Case__ConditionAssignment_1 ) ) ;
     public final void rule__Case__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3047:1: ( ( ( rule__Case__ConditionAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3048:1: ( ( rule__Case__ConditionAssignment_1 ) )
+            // InternalExpression.g:3047:1: ( ( ( rule__Case__ConditionAssignment_1 ) ) )
+            // InternalExpression.g:3048:1: ( ( rule__Case__ConditionAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3048:1: ( ( rule__Case__ConditionAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3049:1: ( rule__Case__ConditionAssignment_1 )
+            // InternalExpression.g:3048:1: ( ( rule__Case__ConditionAssignment_1 ) )
+            // InternalExpression.g:3049:1: ( rule__Case__ConditionAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCaseAccess().getConditionAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3050:1: ( rule__Case__ConditionAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3050:2: rule__Case__ConditionAssignment_1
+            // InternalExpression.g:3050:1: ( rule__Case__ConditionAssignment_1 )
+            // InternalExpression.g:3050:2: rule__Case__ConditionAssignment_1
             {
-            pushFollow(FOLLOW_rule__Case__ConditionAssignment_1_in_rule__Case__Group__1__Impl6338);
+            pushFollow(FOLLOW_2);
             rule__Case__ConditionAssignment_1();
 
             state._fsp--;
@@ -9151,21 +9151,21 @@ public final void rule__Case__Group__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Case__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3060:1: rule__Case__Group__2 : rule__Case__Group__2__Impl rule__Case__Group__3 ;
+    // InternalExpression.g:3060:1: rule__Case__Group__2 : rule__Case__Group__2__Impl rule__Case__Group__3 ;
     public final void rule__Case__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3064:1: ( rule__Case__Group__2__Impl rule__Case__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3065:2: rule__Case__Group__2__Impl rule__Case__Group__3
+            // InternalExpression.g:3064:1: ( rule__Case__Group__2__Impl rule__Case__Group__3 )
+            // InternalExpression.g:3065:2: rule__Case__Group__2__Impl rule__Case__Group__3
             {
-            pushFollow(FOLLOW_rule__Case__Group__2__Impl_in_rule__Case__Group__26368);
+            pushFollow(FOLLOW_17);
             rule__Case__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Case__Group__3_in_rule__Case__Group__26371);
+            pushFollow(FOLLOW_2);
             rule__Case__Group__3();
 
             state._fsp--;
@@ -9189,22 +9189,22 @@ public final void rule__Case__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__Case__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3072:1: rule__Case__Group__2__Impl : ( ':' ) ;
+    // InternalExpression.g:3072:1: rule__Case__Group__2__Impl : ( ':' ) ;
     public final void rule__Case__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3076:1: ( ( ':' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3077:1: ( ':' )
+            // InternalExpression.g:3076:1: ( ( ':' ) )
+            // InternalExpression.g:3077:1: ( ':' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3077:1: ( ':' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3078:1: ':'
+            // InternalExpression.g:3077:1: ( ':' )
+            // InternalExpression.g:3078:1: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCaseAccess().getColonKeyword_2()); 
             }
-            match(input,38,FOLLOW_38_in_rule__Case__Group__2__Impl6399); if (state.failed) return ;
+            match(input,38,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCaseAccess().getColonKeyword_2()); 
             }
@@ -9230,16 +9230,16 @@ public final void rule__Case__Group__2__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Case__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3091:1: rule__Case__Group__3 : rule__Case__Group__3__Impl ;
+    // InternalExpression.g:3091:1: rule__Case__Group__3 : rule__Case__Group__3__Impl ;
     public final void rule__Case__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3095:1: ( rule__Case__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3096:2: rule__Case__Group__3__Impl
+            // InternalExpression.g:3095:1: ( rule__Case__Group__3__Impl )
+            // InternalExpression.g:3096:2: rule__Case__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__Case__Group__3__Impl_in_rule__Case__Group__36430);
+            pushFollow(FOLLOW_2);
             rule__Case__Group__3__Impl();
 
             state._fsp--;
@@ -9263,25 +9263,25 @@ public final void rule__Case__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__Case__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3102:1: rule__Case__Group__3__Impl : ( ( rule__Case__ThenParAssignment_3 ) ) ;
+    // InternalExpression.g:3102:1: rule__Case__Group__3__Impl : ( ( rule__Case__ThenParAssignment_3 ) ) ;
     public final void rule__Case__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3106:1: ( ( ( rule__Case__ThenParAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3107:1: ( ( rule__Case__ThenParAssignment_3 ) )
+            // InternalExpression.g:3106:1: ( ( ( rule__Case__ThenParAssignment_3 ) ) )
+            // InternalExpression.g:3107:1: ( ( rule__Case__ThenParAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3107:1: ( ( rule__Case__ThenParAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3108:1: ( rule__Case__ThenParAssignment_3 )
+            // InternalExpression.g:3107:1: ( ( rule__Case__ThenParAssignment_3 ) )
+            // InternalExpression.g:3108:1: ( rule__Case__ThenParAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCaseAccess().getThenParAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3109:1: ( rule__Case__ThenParAssignment_3 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3109:2: rule__Case__ThenParAssignment_3
+            // InternalExpression.g:3109:1: ( rule__Case__ThenParAssignment_3 )
+            // InternalExpression.g:3109:2: rule__Case__ThenParAssignment_3
             {
-            pushFollow(FOLLOW_rule__Case__ThenParAssignment_3_in_rule__Case__Group__3__Impl6457);
+            pushFollow(FOLLOW_2);
             rule__Case__ThenParAssignment_3();
 
             state._fsp--;
@@ -9314,21 +9314,21 @@ public final void rule__Case__Group__3__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__OrExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3127:1: rule__OrExpression__Group__0 : rule__OrExpression__Group__0__Impl rule__OrExpression__Group__1 ;
+    // InternalExpression.g:3127:1: rule__OrExpression__Group__0 : rule__OrExpression__Group__0__Impl rule__OrExpression__Group__1 ;
     public final void rule__OrExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3131:1: ( rule__OrExpression__Group__0__Impl rule__OrExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3132:2: rule__OrExpression__Group__0__Impl rule__OrExpression__Group__1
+            // InternalExpression.g:3131:1: ( rule__OrExpression__Group__0__Impl rule__OrExpression__Group__1 )
+            // InternalExpression.g:3132:2: rule__OrExpression__Group__0__Impl rule__OrExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__OrExpression__Group__0__Impl_in_rule__OrExpression__Group__06495);
+            pushFollow(FOLLOW_19);
             rule__OrExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OrExpression__Group__1_in_rule__OrExpression__Group__06498);
+            pushFollow(FOLLOW_2);
             rule__OrExpression__Group__1();
 
             state._fsp--;
@@ -9352,22 +9352,22 @@ public final void rule__OrExpression__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__OrExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3139:1: rule__OrExpression__Group__0__Impl : ( ruleAndExpression ) ;
+    // InternalExpression.g:3139:1: rule__OrExpression__Group__0__Impl : ( ruleAndExpression ) ;
     public final void rule__OrExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3143:1: ( ( ruleAndExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3144:1: ( ruleAndExpression )
+            // InternalExpression.g:3143:1: ( ( ruleAndExpression ) )
+            // InternalExpression.g:3144:1: ( ruleAndExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3144:1: ( ruleAndExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3145:1: ruleAndExpression
+            // InternalExpression.g:3144:1: ( ruleAndExpression )
+            // InternalExpression.g:3145:1: ruleAndExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOrExpressionAccess().getAndExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleAndExpression_in_rule__OrExpression__Group__0__Impl6525);
+            pushFollow(FOLLOW_2);
             ruleAndExpression();
 
             state._fsp--;
@@ -9397,16 +9397,16 @@ public final void rule__OrExpression__Group__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__OrExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3156:1: rule__OrExpression__Group__1 : rule__OrExpression__Group__1__Impl ;
+    // InternalExpression.g:3156:1: rule__OrExpression__Group__1 : rule__OrExpression__Group__1__Impl ;
     public final void rule__OrExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3160:1: ( rule__OrExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3161:2: rule__OrExpression__Group__1__Impl
+            // InternalExpression.g:3160:1: ( rule__OrExpression__Group__1__Impl )
+            // InternalExpression.g:3161:2: rule__OrExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__OrExpression__Group__1__Impl_in_rule__OrExpression__Group__16554);
+            pushFollow(FOLLOW_2);
             rule__OrExpression__Group__1__Impl();
 
             state._fsp--;
@@ -9430,22 +9430,22 @@ public final void rule__OrExpression__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__OrExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3167:1: rule__OrExpression__Group__1__Impl : ( ( rule__OrExpression__Group_1__0 )* ) ;
+    // InternalExpression.g:3167:1: rule__OrExpression__Group__1__Impl : ( ( rule__OrExpression__Group_1__0 )* ) ;
     public final void rule__OrExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3171:1: ( ( ( rule__OrExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3172:1: ( ( rule__OrExpression__Group_1__0 )* )
+            // InternalExpression.g:3171:1: ( ( ( rule__OrExpression__Group_1__0 )* ) )
+            // InternalExpression.g:3172:1: ( ( rule__OrExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3172:1: ( ( rule__OrExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3173:1: ( rule__OrExpression__Group_1__0 )*
+            // InternalExpression.g:3172:1: ( ( rule__OrExpression__Group_1__0 )* )
+            // InternalExpression.g:3173:1: ( rule__OrExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOrExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3174:1: ( rule__OrExpression__Group_1__0 )*
+            // InternalExpression.g:3174:1: ( rule__OrExpression__Group_1__0 )*
             loop22:
             do {
                 int alt22=2;
@@ -9458,9 +9458,9 @@ public final void rule__OrExpression__Group__1__Impl() throws RecognitionExcepti
 
                 switch (alt22) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3174:2: rule__OrExpression__Group_1__0
+            	    // InternalExpression.g:3174:2: rule__OrExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__OrExpression__Group_1__0_in_rule__OrExpression__Group__1__Impl6581);
+            	    pushFollow(FOLLOW_20);
             	    rule__OrExpression__Group_1__0();
 
             	    state._fsp--;
@@ -9499,21 +9499,21 @@ public final void rule__OrExpression__Group__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__OrExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3188:1: rule__OrExpression__Group_1__0 : rule__OrExpression__Group_1__0__Impl rule__OrExpression__Group_1__1 ;
+    // InternalExpression.g:3188:1: rule__OrExpression__Group_1__0 : rule__OrExpression__Group_1__0__Impl rule__OrExpression__Group_1__1 ;
     public final void rule__OrExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3192:1: ( rule__OrExpression__Group_1__0__Impl rule__OrExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3193:2: rule__OrExpression__Group_1__0__Impl rule__OrExpression__Group_1__1
+            // InternalExpression.g:3192:1: ( rule__OrExpression__Group_1__0__Impl rule__OrExpression__Group_1__1 )
+            // InternalExpression.g:3193:2: rule__OrExpression__Group_1__0__Impl rule__OrExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__OrExpression__Group_1__0__Impl_in_rule__OrExpression__Group_1__06616);
+            pushFollow(FOLLOW_19);
             rule__OrExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OrExpression__Group_1__1_in_rule__OrExpression__Group_1__06619);
+            pushFollow(FOLLOW_2);
             rule__OrExpression__Group_1__1();
 
             state._fsp--;
@@ -9537,23 +9537,23 @@ public final void rule__OrExpression__Group_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__OrExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3200:1: rule__OrExpression__Group_1__0__Impl : ( () ) ;
+    // InternalExpression.g:3200:1: rule__OrExpression__Group_1__0__Impl : ( () ) ;
     public final void rule__OrExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3204:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3205:1: ( () )
+            // InternalExpression.g:3204:1: ( ( () ) )
+            // InternalExpression.g:3205:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3205:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3206:1: ()
+            // InternalExpression.g:3205:1: ( () )
+            // InternalExpression.g:3206:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOrExpressionAccess().getBooleanOperationLeftAction_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3207:1: ()
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3209:1: 
+            // InternalExpression.g:3207:1: ()
+            // InternalExpression.g:3209:1: 
             {
             }
 
@@ -9578,21 +9578,21 @@ public final void rule__OrExpression__Group_1__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__OrExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3219:1: rule__OrExpression__Group_1__1 : rule__OrExpression__Group_1__1__Impl rule__OrExpression__Group_1__2 ;
+    // InternalExpression.g:3219:1: rule__OrExpression__Group_1__1 : rule__OrExpression__Group_1__1__Impl rule__OrExpression__Group_1__2 ;
     public final void rule__OrExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3223:1: ( rule__OrExpression__Group_1__1__Impl rule__OrExpression__Group_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3224:2: rule__OrExpression__Group_1__1__Impl rule__OrExpression__Group_1__2
+            // InternalExpression.g:3223:1: ( rule__OrExpression__Group_1__1__Impl rule__OrExpression__Group_1__2 )
+            // InternalExpression.g:3224:2: rule__OrExpression__Group_1__1__Impl rule__OrExpression__Group_1__2
             {
-            pushFollow(FOLLOW_rule__OrExpression__Group_1__1__Impl_in_rule__OrExpression__Group_1__16677);
+            pushFollow(FOLLOW_17);
             rule__OrExpression__Group_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OrExpression__Group_1__2_in_rule__OrExpression__Group_1__16680);
+            pushFollow(FOLLOW_2);
             rule__OrExpression__Group_1__2();
 
             state._fsp--;
@@ -9616,25 +9616,25 @@ public final void rule__OrExpression__Group_1__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__OrExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3231:1: rule__OrExpression__Group_1__1__Impl : ( ( rule__OrExpression__OperatorAssignment_1_1 ) ) ;
+    // InternalExpression.g:3231:1: rule__OrExpression__Group_1__1__Impl : ( ( rule__OrExpression__OperatorAssignment_1_1 ) ) ;
     public final void rule__OrExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3235:1: ( ( ( rule__OrExpression__OperatorAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3236:1: ( ( rule__OrExpression__OperatorAssignment_1_1 ) )
+            // InternalExpression.g:3235:1: ( ( ( rule__OrExpression__OperatorAssignment_1_1 ) ) )
+            // InternalExpression.g:3236:1: ( ( rule__OrExpression__OperatorAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3236:1: ( ( rule__OrExpression__OperatorAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3237:1: ( rule__OrExpression__OperatorAssignment_1_1 )
+            // InternalExpression.g:3236:1: ( ( rule__OrExpression__OperatorAssignment_1_1 ) )
+            // InternalExpression.g:3237:1: ( rule__OrExpression__OperatorAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOrExpressionAccess().getOperatorAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3238:1: ( rule__OrExpression__OperatorAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3238:2: rule__OrExpression__OperatorAssignment_1_1
+            // InternalExpression.g:3238:1: ( rule__OrExpression__OperatorAssignment_1_1 )
+            // InternalExpression.g:3238:2: rule__OrExpression__OperatorAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__OrExpression__OperatorAssignment_1_1_in_rule__OrExpression__Group_1__1__Impl6707);
+            pushFollow(FOLLOW_2);
             rule__OrExpression__OperatorAssignment_1_1();
 
             state._fsp--;
@@ -9667,16 +9667,16 @@ public final void rule__OrExpression__Group_1__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__OrExpression__Group_1__2"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3248:1: rule__OrExpression__Group_1__2 : rule__OrExpression__Group_1__2__Impl ;
+    // InternalExpression.g:3248:1: rule__OrExpression__Group_1__2 : rule__OrExpression__Group_1__2__Impl ;
     public final void rule__OrExpression__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3252:1: ( rule__OrExpression__Group_1__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3253:2: rule__OrExpression__Group_1__2__Impl
+            // InternalExpression.g:3252:1: ( rule__OrExpression__Group_1__2__Impl )
+            // InternalExpression.g:3253:2: rule__OrExpression__Group_1__2__Impl
             {
-            pushFollow(FOLLOW_rule__OrExpression__Group_1__2__Impl_in_rule__OrExpression__Group_1__26737);
+            pushFollow(FOLLOW_2);
             rule__OrExpression__Group_1__2__Impl();
 
             state._fsp--;
@@ -9700,25 +9700,25 @@ public final void rule__OrExpression__Group_1__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__OrExpression__Group_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3259:1: rule__OrExpression__Group_1__2__Impl : ( ( rule__OrExpression__RightAssignment_1_2 ) ) ;
+    // InternalExpression.g:3259:1: rule__OrExpression__Group_1__2__Impl : ( ( rule__OrExpression__RightAssignment_1_2 ) ) ;
     public final void rule__OrExpression__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3263:1: ( ( ( rule__OrExpression__RightAssignment_1_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3264:1: ( ( rule__OrExpression__RightAssignment_1_2 ) )
+            // InternalExpression.g:3263:1: ( ( ( rule__OrExpression__RightAssignment_1_2 ) ) )
+            // InternalExpression.g:3264:1: ( ( rule__OrExpression__RightAssignment_1_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3264:1: ( ( rule__OrExpression__RightAssignment_1_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3265:1: ( rule__OrExpression__RightAssignment_1_2 )
+            // InternalExpression.g:3264:1: ( ( rule__OrExpression__RightAssignment_1_2 ) )
+            // InternalExpression.g:3265:1: ( rule__OrExpression__RightAssignment_1_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOrExpressionAccess().getRightAssignment_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3266:1: ( rule__OrExpression__RightAssignment_1_2 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3266:2: rule__OrExpression__RightAssignment_1_2
+            // InternalExpression.g:3266:1: ( rule__OrExpression__RightAssignment_1_2 )
+            // InternalExpression.g:3266:2: rule__OrExpression__RightAssignment_1_2
             {
-            pushFollow(FOLLOW_rule__OrExpression__RightAssignment_1_2_in_rule__OrExpression__Group_1__2__Impl6764);
+            pushFollow(FOLLOW_2);
             rule__OrExpression__RightAssignment_1_2();
 
             state._fsp--;
@@ -9751,21 +9751,21 @@ public final void rule__OrExpression__Group_1__2__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__AndExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3282:1: rule__AndExpression__Group__0 : rule__AndExpression__Group__0__Impl rule__AndExpression__Group__1 ;
+    // InternalExpression.g:3282:1: rule__AndExpression__Group__0 : rule__AndExpression__Group__0__Impl rule__AndExpression__Group__1 ;
     public final void rule__AndExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3286:1: ( rule__AndExpression__Group__0__Impl rule__AndExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3287:2: rule__AndExpression__Group__0__Impl rule__AndExpression__Group__1
+            // InternalExpression.g:3286:1: ( rule__AndExpression__Group__0__Impl rule__AndExpression__Group__1 )
+            // InternalExpression.g:3287:2: rule__AndExpression__Group__0__Impl rule__AndExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__AndExpression__Group__0__Impl_in_rule__AndExpression__Group__06800);
+            pushFollow(FOLLOW_21);
             rule__AndExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__AndExpression__Group__1_in_rule__AndExpression__Group__06803);
+            pushFollow(FOLLOW_2);
             rule__AndExpression__Group__1();
 
             state._fsp--;
@@ -9789,22 +9789,22 @@ public final void rule__AndExpression__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__AndExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3294:1: rule__AndExpression__Group__0__Impl : ( ruleImpliesExpression ) ;
+    // InternalExpression.g:3294:1: rule__AndExpression__Group__0__Impl : ( ruleImpliesExpression ) ;
     public final void rule__AndExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3298:1: ( ( ruleImpliesExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3299:1: ( ruleImpliesExpression )
+            // InternalExpression.g:3298:1: ( ( ruleImpliesExpression ) )
+            // InternalExpression.g:3299:1: ( ruleImpliesExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3299:1: ( ruleImpliesExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3300:1: ruleImpliesExpression
+            // InternalExpression.g:3299:1: ( ruleImpliesExpression )
+            // InternalExpression.g:3300:1: ruleImpliesExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAndExpressionAccess().getImpliesExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleImpliesExpression_in_rule__AndExpression__Group__0__Impl6830);
+            pushFollow(FOLLOW_2);
             ruleImpliesExpression();
 
             state._fsp--;
@@ -9834,16 +9834,16 @@ public final void rule__AndExpression__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__AndExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3311:1: rule__AndExpression__Group__1 : rule__AndExpression__Group__1__Impl ;
+    // InternalExpression.g:3311:1: rule__AndExpression__Group__1 : rule__AndExpression__Group__1__Impl ;
     public final void rule__AndExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3315:1: ( rule__AndExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3316:2: rule__AndExpression__Group__1__Impl
+            // InternalExpression.g:3315:1: ( rule__AndExpression__Group__1__Impl )
+            // InternalExpression.g:3316:2: rule__AndExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__AndExpression__Group__1__Impl_in_rule__AndExpression__Group__16859);
+            pushFollow(FOLLOW_2);
             rule__AndExpression__Group__1__Impl();
 
             state._fsp--;
@@ -9867,22 +9867,22 @@ public final void rule__AndExpression__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__AndExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3322:1: rule__AndExpression__Group__1__Impl : ( ( rule__AndExpression__Group_1__0 )* ) ;
+    // InternalExpression.g:3322:1: rule__AndExpression__Group__1__Impl : ( ( rule__AndExpression__Group_1__0 )* ) ;
     public final void rule__AndExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3326:1: ( ( ( rule__AndExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3327:1: ( ( rule__AndExpression__Group_1__0 )* )
+            // InternalExpression.g:3326:1: ( ( ( rule__AndExpression__Group_1__0 )* ) )
+            // InternalExpression.g:3327:1: ( ( rule__AndExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3327:1: ( ( rule__AndExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3328:1: ( rule__AndExpression__Group_1__0 )*
+            // InternalExpression.g:3327:1: ( ( rule__AndExpression__Group_1__0 )* )
+            // InternalExpression.g:3328:1: ( rule__AndExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAndExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3329:1: ( rule__AndExpression__Group_1__0 )*
+            // InternalExpression.g:3329:1: ( rule__AndExpression__Group_1__0 )*
             loop23:
             do {
                 int alt23=2;
@@ -9895,9 +9895,9 @@ public final void rule__AndExpression__Group__1__Impl() throws RecognitionExcept
 
                 switch (alt23) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3329:2: rule__AndExpression__Group_1__0
+            	    // InternalExpression.g:3329:2: rule__AndExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__AndExpression__Group_1__0_in_rule__AndExpression__Group__1__Impl6886);
+            	    pushFollow(FOLLOW_22);
             	    rule__AndExpression__Group_1__0();
 
             	    state._fsp--;
@@ -9936,21 +9936,21 @@ public final void rule__AndExpression__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__AndExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3343:1: rule__AndExpression__Group_1__0 : rule__AndExpression__Group_1__0__Impl rule__AndExpression__Group_1__1 ;
+    // InternalExpression.g:3343:1: rule__AndExpression__Group_1__0 : rule__AndExpression__Group_1__0__Impl rule__AndExpression__Group_1__1 ;
     public final void rule__AndExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3347:1: ( rule__AndExpression__Group_1__0__Impl rule__AndExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3348:2: rule__AndExpression__Group_1__0__Impl rule__AndExpression__Group_1__1
+            // InternalExpression.g:3347:1: ( rule__AndExpression__Group_1__0__Impl rule__AndExpression__Group_1__1 )
+            // InternalExpression.g:3348:2: rule__AndExpression__Group_1__0__Impl rule__AndExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__AndExpression__Group_1__0__Impl_in_rule__AndExpression__Group_1__06921);
+            pushFollow(FOLLOW_21);
             rule__AndExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__AndExpression__Group_1__1_in_rule__AndExpression__Group_1__06924);
+            pushFollow(FOLLOW_2);
             rule__AndExpression__Group_1__1();
 
             state._fsp--;
@@ -9974,23 +9974,23 @@ public final void rule__AndExpression__Group_1__0() throws RecognitionException
 
 
     // $ANTLR start "rule__AndExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3355:1: rule__AndExpression__Group_1__0__Impl : ( () ) ;
+    // InternalExpression.g:3355:1: rule__AndExpression__Group_1__0__Impl : ( () ) ;
     public final void rule__AndExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3359:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3360:1: ( () )
+            // InternalExpression.g:3359:1: ( ( () ) )
+            // InternalExpression.g:3360:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3360:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3361:1: ()
+            // InternalExpression.g:3360:1: ( () )
+            // InternalExpression.g:3361:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAndExpressionAccess().getBooleanOperationLeftAction_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3362:1: ()
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3364:1: 
+            // InternalExpression.g:3362:1: ()
+            // InternalExpression.g:3364:1: 
             {
             }
 
@@ -10015,21 +10015,21 @@ public final void rule__AndExpression__Group_1__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__AndExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3374:1: rule__AndExpression__Group_1__1 : rule__AndExpression__Group_1__1__Impl rule__AndExpression__Group_1__2 ;
+    // InternalExpression.g:3374:1: rule__AndExpression__Group_1__1 : rule__AndExpression__Group_1__1__Impl rule__AndExpression__Group_1__2 ;
     public final void rule__AndExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3378:1: ( rule__AndExpression__Group_1__1__Impl rule__AndExpression__Group_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3379:2: rule__AndExpression__Group_1__1__Impl rule__AndExpression__Group_1__2
+            // InternalExpression.g:3378:1: ( rule__AndExpression__Group_1__1__Impl rule__AndExpression__Group_1__2 )
+            // InternalExpression.g:3379:2: rule__AndExpression__Group_1__1__Impl rule__AndExpression__Group_1__2
             {
-            pushFollow(FOLLOW_rule__AndExpression__Group_1__1__Impl_in_rule__AndExpression__Group_1__16982);
+            pushFollow(FOLLOW_17);
             rule__AndExpression__Group_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__AndExpression__Group_1__2_in_rule__AndExpression__Group_1__16985);
+            pushFollow(FOLLOW_2);
             rule__AndExpression__Group_1__2();
 
             state._fsp--;
@@ -10053,25 +10053,25 @@ public final void rule__AndExpression__Group_1__1() throws RecognitionException
 
 
     // $ANTLR start "rule__AndExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3386:1: rule__AndExpression__Group_1__1__Impl : ( ( rule__AndExpression__OperatorAssignment_1_1 ) ) ;
+    // InternalExpression.g:3386:1: rule__AndExpression__Group_1__1__Impl : ( ( rule__AndExpression__OperatorAssignment_1_1 ) ) ;
     public final void rule__AndExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3390:1: ( ( ( rule__AndExpression__OperatorAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3391:1: ( ( rule__AndExpression__OperatorAssignment_1_1 ) )
+            // InternalExpression.g:3390:1: ( ( ( rule__AndExpression__OperatorAssignment_1_1 ) ) )
+            // InternalExpression.g:3391:1: ( ( rule__AndExpression__OperatorAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3391:1: ( ( rule__AndExpression__OperatorAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3392:1: ( rule__AndExpression__OperatorAssignment_1_1 )
+            // InternalExpression.g:3391:1: ( ( rule__AndExpression__OperatorAssignment_1_1 ) )
+            // InternalExpression.g:3392:1: ( rule__AndExpression__OperatorAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAndExpressionAccess().getOperatorAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3393:1: ( rule__AndExpression__OperatorAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3393:2: rule__AndExpression__OperatorAssignment_1_1
+            // InternalExpression.g:3393:1: ( rule__AndExpression__OperatorAssignment_1_1 )
+            // InternalExpression.g:3393:2: rule__AndExpression__OperatorAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__AndExpression__OperatorAssignment_1_1_in_rule__AndExpression__Group_1__1__Impl7012);
+            pushFollow(FOLLOW_2);
             rule__AndExpression__OperatorAssignment_1_1();
 
             state._fsp--;
@@ -10104,16 +10104,16 @@ public final void rule__AndExpression__Group_1__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__AndExpression__Group_1__2"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3403:1: rule__AndExpression__Group_1__2 : rule__AndExpression__Group_1__2__Impl ;
+    // InternalExpression.g:3403:1: rule__AndExpression__Group_1__2 : rule__AndExpression__Group_1__2__Impl ;
     public final void rule__AndExpression__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3407:1: ( rule__AndExpression__Group_1__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3408:2: rule__AndExpression__Group_1__2__Impl
+            // InternalExpression.g:3407:1: ( rule__AndExpression__Group_1__2__Impl )
+            // InternalExpression.g:3408:2: rule__AndExpression__Group_1__2__Impl
             {
-            pushFollow(FOLLOW_rule__AndExpression__Group_1__2__Impl_in_rule__AndExpression__Group_1__27042);
+            pushFollow(FOLLOW_2);
             rule__AndExpression__Group_1__2__Impl();
 
             state._fsp--;
@@ -10137,25 +10137,25 @@ public final void rule__AndExpression__Group_1__2() throws RecognitionException
 
 
     // $ANTLR start "rule__AndExpression__Group_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3414:1: rule__AndExpression__Group_1__2__Impl : ( ( rule__AndExpression__RightAssignment_1_2 ) ) ;
+    // InternalExpression.g:3414:1: rule__AndExpression__Group_1__2__Impl : ( ( rule__AndExpression__RightAssignment_1_2 ) ) ;
     public final void rule__AndExpression__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3418:1: ( ( ( rule__AndExpression__RightAssignment_1_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3419:1: ( ( rule__AndExpression__RightAssignment_1_2 ) )
+            // InternalExpression.g:3418:1: ( ( ( rule__AndExpression__RightAssignment_1_2 ) ) )
+            // InternalExpression.g:3419:1: ( ( rule__AndExpression__RightAssignment_1_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3419:1: ( ( rule__AndExpression__RightAssignment_1_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3420:1: ( rule__AndExpression__RightAssignment_1_2 )
+            // InternalExpression.g:3419:1: ( ( rule__AndExpression__RightAssignment_1_2 ) )
+            // InternalExpression.g:3420:1: ( rule__AndExpression__RightAssignment_1_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAndExpressionAccess().getRightAssignment_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3421:1: ( rule__AndExpression__RightAssignment_1_2 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3421:2: rule__AndExpression__RightAssignment_1_2
+            // InternalExpression.g:3421:1: ( rule__AndExpression__RightAssignment_1_2 )
+            // InternalExpression.g:3421:2: rule__AndExpression__RightAssignment_1_2
             {
-            pushFollow(FOLLOW_rule__AndExpression__RightAssignment_1_2_in_rule__AndExpression__Group_1__2__Impl7069);
+            pushFollow(FOLLOW_2);
             rule__AndExpression__RightAssignment_1_2();
 
             state._fsp--;
@@ -10188,21 +10188,21 @@ public final void rule__AndExpression__Group_1__2__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__ImpliesExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3437:1: rule__ImpliesExpression__Group__0 : rule__ImpliesExpression__Group__0__Impl rule__ImpliesExpression__Group__1 ;
+    // InternalExpression.g:3437:1: rule__ImpliesExpression__Group__0 : rule__ImpliesExpression__Group__0__Impl rule__ImpliesExpression__Group__1 ;
     public final void rule__ImpliesExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3441:1: ( rule__ImpliesExpression__Group__0__Impl rule__ImpliesExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3442:2: rule__ImpliesExpression__Group__0__Impl rule__ImpliesExpression__Group__1
+            // InternalExpression.g:3441:1: ( rule__ImpliesExpression__Group__0__Impl rule__ImpliesExpression__Group__1 )
+            // InternalExpression.g:3442:2: rule__ImpliesExpression__Group__0__Impl rule__ImpliesExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__ImpliesExpression__Group__0__Impl_in_rule__ImpliesExpression__Group__07105);
+            pushFollow(FOLLOW_23);
             rule__ImpliesExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ImpliesExpression__Group__1_in_rule__ImpliesExpression__Group__07108);
+            pushFollow(FOLLOW_2);
             rule__ImpliesExpression__Group__1();
 
             state._fsp--;
@@ -10226,22 +10226,22 @@ public final void rule__ImpliesExpression__Group__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ImpliesExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3449:1: rule__ImpliesExpression__Group__0__Impl : ( ruleRelationalExpression ) ;
+    // InternalExpression.g:3449:1: rule__ImpliesExpression__Group__0__Impl : ( ruleRelationalExpression ) ;
     public final void rule__ImpliesExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3453:1: ( ( ruleRelationalExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3454:1: ( ruleRelationalExpression )
+            // InternalExpression.g:3453:1: ( ( ruleRelationalExpression ) )
+            // InternalExpression.g:3454:1: ( ruleRelationalExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3454:1: ( ruleRelationalExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3455:1: ruleRelationalExpression
+            // InternalExpression.g:3454:1: ( ruleRelationalExpression )
+            // InternalExpression.g:3455:1: ruleRelationalExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImpliesExpressionAccess().getRelationalExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleRelationalExpression_in_rule__ImpliesExpression__Group__0__Impl7135);
+            pushFollow(FOLLOW_2);
             ruleRelationalExpression();
 
             state._fsp--;
@@ -10271,16 +10271,16 @@ public final void rule__ImpliesExpression__Group__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__ImpliesExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3466:1: rule__ImpliesExpression__Group__1 : rule__ImpliesExpression__Group__1__Impl ;
+    // InternalExpression.g:3466:1: rule__ImpliesExpression__Group__1 : rule__ImpliesExpression__Group__1__Impl ;
     public final void rule__ImpliesExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3470:1: ( rule__ImpliesExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3471:2: rule__ImpliesExpression__Group__1__Impl
+            // InternalExpression.g:3470:1: ( rule__ImpliesExpression__Group__1__Impl )
+            // InternalExpression.g:3471:2: rule__ImpliesExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__ImpliesExpression__Group__1__Impl_in_rule__ImpliesExpression__Group__17164);
+            pushFollow(FOLLOW_2);
             rule__ImpliesExpression__Group__1__Impl();
 
             state._fsp--;
@@ -10304,22 +10304,22 @@ public final void rule__ImpliesExpression__Group__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ImpliesExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3477:1: rule__ImpliesExpression__Group__1__Impl : ( ( rule__ImpliesExpression__Group_1__0 )* ) ;
+    // InternalExpression.g:3477:1: rule__ImpliesExpression__Group__1__Impl : ( ( rule__ImpliesExpression__Group_1__0 )* ) ;
     public final void rule__ImpliesExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3481:1: ( ( ( rule__ImpliesExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3482:1: ( ( rule__ImpliesExpression__Group_1__0 )* )
+            // InternalExpression.g:3481:1: ( ( ( rule__ImpliesExpression__Group_1__0 )* ) )
+            // InternalExpression.g:3482:1: ( ( rule__ImpliesExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3482:1: ( ( rule__ImpliesExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3483:1: ( rule__ImpliesExpression__Group_1__0 )*
+            // InternalExpression.g:3482:1: ( ( rule__ImpliesExpression__Group_1__0 )* )
+            // InternalExpression.g:3483:1: ( rule__ImpliesExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImpliesExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3484:1: ( rule__ImpliesExpression__Group_1__0 )*
+            // InternalExpression.g:3484:1: ( rule__ImpliesExpression__Group_1__0 )*
             loop24:
             do {
                 int alt24=2;
@@ -10332,9 +10332,9 @@ public final void rule__ImpliesExpression__Group__1__Impl() throws RecognitionEx
 
                 switch (alt24) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3484:2: rule__ImpliesExpression__Group_1__0
+            	    // InternalExpression.g:3484:2: rule__ImpliesExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__ImpliesExpression__Group_1__0_in_rule__ImpliesExpression__Group__1__Impl7191);
+            	    pushFollow(FOLLOW_24);
             	    rule__ImpliesExpression__Group_1__0();
 
             	    state._fsp--;
@@ -10373,21 +10373,21 @@ public final void rule__ImpliesExpression__Group__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__ImpliesExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3498:1: rule__ImpliesExpression__Group_1__0 : rule__ImpliesExpression__Group_1__0__Impl rule__ImpliesExpression__Group_1__1 ;
+    // InternalExpression.g:3498:1: rule__ImpliesExpression__Group_1__0 : rule__ImpliesExpression__Group_1__0__Impl rule__ImpliesExpression__Group_1__1 ;
     public final void rule__ImpliesExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3502:1: ( rule__ImpliesExpression__Group_1__0__Impl rule__ImpliesExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3503:2: rule__ImpliesExpression__Group_1__0__Impl rule__ImpliesExpression__Group_1__1
+            // InternalExpression.g:3502:1: ( rule__ImpliesExpression__Group_1__0__Impl rule__ImpliesExpression__Group_1__1 )
+            // InternalExpression.g:3503:2: rule__ImpliesExpression__Group_1__0__Impl rule__ImpliesExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__ImpliesExpression__Group_1__0__Impl_in_rule__ImpliesExpression__Group_1__07226);
+            pushFollow(FOLLOW_23);
             rule__ImpliesExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ImpliesExpression__Group_1__1_in_rule__ImpliesExpression__Group_1__07229);
+            pushFollow(FOLLOW_2);
             rule__ImpliesExpression__Group_1__1();
 
             state._fsp--;
@@ -10411,23 +10411,23 @@ public final void rule__ImpliesExpression__Group_1__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ImpliesExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3510:1: rule__ImpliesExpression__Group_1__0__Impl : ( () ) ;
+    // InternalExpression.g:3510:1: rule__ImpliesExpression__Group_1__0__Impl : ( () ) ;
     public final void rule__ImpliesExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3514:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3515:1: ( () )
+            // InternalExpression.g:3514:1: ( ( () ) )
+            // InternalExpression.g:3515:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3515:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3516:1: ()
+            // InternalExpression.g:3515:1: ( () )
+            // InternalExpression.g:3516:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImpliesExpressionAccess().getBooleanOperationLeftAction_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3517:1: ()
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3519:1: 
+            // InternalExpression.g:3517:1: ()
+            // InternalExpression.g:3519:1: 
             {
             }
 
@@ -10452,21 +10452,21 @@ public final void rule__ImpliesExpression__Group_1__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__ImpliesExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3529:1: rule__ImpliesExpression__Group_1__1 : rule__ImpliesExpression__Group_1__1__Impl rule__ImpliesExpression__Group_1__2 ;
+    // InternalExpression.g:3529:1: rule__ImpliesExpression__Group_1__1 : rule__ImpliesExpression__Group_1__1__Impl rule__ImpliesExpression__Group_1__2 ;
     public final void rule__ImpliesExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3533:1: ( rule__ImpliesExpression__Group_1__1__Impl rule__ImpliesExpression__Group_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3534:2: rule__ImpliesExpression__Group_1__1__Impl rule__ImpliesExpression__Group_1__2
+            // InternalExpression.g:3533:1: ( rule__ImpliesExpression__Group_1__1__Impl rule__ImpliesExpression__Group_1__2 )
+            // InternalExpression.g:3534:2: rule__ImpliesExpression__Group_1__1__Impl rule__ImpliesExpression__Group_1__2
             {
-            pushFollow(FOLLOW_rule__ImpliesExpression__Group_1__1__Impl_in_rule__ImpliesExpression__Group_1__17287);
+            pushFollow(FOLLOW_17);
             rule__ImpliesExpression__Group_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ImpliesExpression__Group_1__2_in_rule__ImpliesExpression__Group_1__17290);
+            pushFollow(FOLLOW_2);
             rule__ImpliesExpression__Group_1__2();
 
             state._fsp--;
@@ -10490,25 +10490,25 @@ public final void rule__ImpliesExpression__Group_1__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ImpliesExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3541:1: rule__ImpliesExpression__Group_1__1__Impl : ( ( rule__ImpliesExpression__OperatorAssignment_1_1 ) ) ;
+    // InternalExpression.g:3541:1: rule__ImpliesExpression__Group_1__1__Impl : ( ( rule__ImpliesExpression__OperatorAssignment_1_1 ) ) ;
     public final void rule__ImpliesExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3545:1: ( ( ( rule__ImpliesExpression__OperatorAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3546:1: ( ( rule__ImpliesExpression__OperatorAssignment_1_1 ) )
+            // InternalExpression.g:3545:1: ( ( ( rule__ImpliesExpression__OperatorAssignment_1_1 ) ) )
+            // InternalExpression.g:3546:1: ( ( rule__ImpliesExpression__OperatorAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3546:1: ( ( rule__ImpliesExpression__OperatorAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3547:1: ( rule__ImpliesExpression__OperatorAssignment_1_1 )
+            // InternalExpression.g:3546:1: ( ( rule__ImpliesExpression__OperatorAssignment_1_1 ) )
+            // InternalExpression.g:3547:1: ( rule__ImpliesExpression__OperatorAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImpliesExpressionAccess().getOperatorAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3548:1: ( rule__ImpliesExpression__OperatorAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3548:2: rule__ImpliesExpression__OperatorAssignment_1_1
+            // InternalExpression.g:3548:1: ( rule__ImpliesExpression__OperatorAssignment_1_1 )
+            // InternalExpression.g:3548:2: rule__ImpliesExpression__OperatorAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__ImpliesExpression__OperatorAssignment_1_1_in_rule__ImpliesExpression__Group_1__1__Impl7317);
+            pushFollow(FOLLOW_2);
             rule__ImpliesExpression__OperatorAssignment_1_1();
 
             state._fsp--;
@@ -10541,16 +10541,16 @@ public final void rule__ImpliesExpression__Group_1__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__ImpliesExpression__Group_1__2"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3558:1: rule__ImpliesExpression__Group_1__2 : rule__ImpliesExpression__Group_1__2__Impl ;
+    // InternalExpression.g:3558:1: rule__ImpliesExpression__Group_1__2 : rule__ImpliesExpression__Group_1__2__Impl ;
     public final void rule__ImpliesExpression__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3562:1: ( rule__ImpliesExpression__Group_1__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3563:2: rule__ImpliesExpression__Group_1__2__Impl
+            // InternalExpression.g:3562:1: ( rule__ImpliesExpression__Group_1__2__Impl )
+            // InternalExpression.g:3563:2: rule__ImpliesExpression__Group_1__2__Impl
             {
-            pushFollow(FOLLOW_rule__ImpliesExpression__Group_1__2__Impl_in_rule__ImpliesExpression__Group_1__27347);
+            pushFollow(FOLLOW_2);
             rule__ImpliesExpression__Group_1__2__Impl();
 
             state._fsp--;
@@ -10574,25 +10574,25 @@ public final void rule__ImpliesExpression__Group_1__2() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ImpliesExpression__Group_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3569:1: rule__ImpliesExpression__Group_1__2__Impl : ( ( rule__ImpliesExpression__RightAssignment_1_2 ) ) ;
+    // InternalExpression.g:3569:1: rule__ImpliesExpression__Group_1__2__Impl : ( ( rule__ImpliesExpression__RightAssignment_1_2 ) ) ;
     public final void rule__ImpliesExpression__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3573:1: ( ( ( rule__ImpliesExpression__RightAssignment_1_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3574:1: ( ( rule__ImpliesExpression__RightAssignment_1_2 ) )
+            // InternalExpression.g:3573:1: ( ( ( rule__ImpliesExpression__RightAssignment_1_2 ) ) )
+            // InternalExpression.g:3574:1: ( ( rule__ImpliesExpression__RightAssignment_1_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3574:1: ( ( rule__ImpliesExpression__RightAssignment_1_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3575:1: ( rule__ImpliesExpression__RightAssignment_1_2 )
+            // InternalExpression.g:3574:1: ( ( rule__ImpliesExpression__RightAssignment_1_2 ) )
+            // InternalExpression.g:3575:1: ( rule__ImpliesExpression__RightAssignment_1_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImpliesExpressionAccess().getRightAssignment_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3576:1: ( rule__ImpliesExpression__RightAssignment_1_2 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3576:2: rule__ImpliesExpression__RightAssignment_1_2
+            // InternalExpression.g:3576:1: ( rule__ImpliesExpression__RightAssignment_1_2 )
+            // InternalExpression.g:3576:2: rule__ImpliesExpression__RightAssignment_1_2
             {
-            pushFollow(FOLLOW_rule__ImpliesExpression__RightAssignment_1_2_in_rule__ImpliesExpression__Group_1__2__Impl7374);
+            pushFollow(FOLLOW_2);
             rule__ImpliesExpression__RightAssignment_1_2();
 
             state._fsp--;
@@ -10625,21 +10625,21 @@ public final void rule__ImpliesExpression__Group_1__2__Impl() throws Recognition
 
 
     // $ANTLR start "rule__RelationalExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3592:1: rule__RelationalExpression__Group__0 : rule__RelationalExpression__Group__0__Impl rule__RelationalExpression__Group__1 ;
+    // InternalExpression.g:3592:1: rule__RelationalExpression__Group__0 : rule__RelationalExpression__Group__0__Impl rule__RelationalExpression__Group__1 ;
     public final void rule__RelationalExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3596:1: ( rule__RelationalExpression__Group__0__Impl rule__RelationalExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3597:2: rule__RelationalExpression__Group__0__Impl rule__RelationalExpression__Group__1
+            // InternalExpression.g:3596:1: ( rule__RelationalExpression__Group__0__Impl rule__RelationalExpression__Group__1 )
+            // InternalExpression.g:3597:2: rule__RelationalExpression__Group__0__Impl rule__RelationalExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__RelationalExpression__Group__0__Impl_in_rule__RelationalExpression__Group__07410);
+            pushFollow(FOLLOW_25);
             rule__RelationalExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__RelationalExpression__Group__1_in_rule__RelationalExpression__Group__07413);
+            pushFollow(FOLLOW_2);
             rule__RelationalExpression__Group__1();
 
             state._fsp--;
@@ -10663,22 +10663,22 @@ public final void rule__RelationalExpression__Group__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__RelationalExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3604:1: rule__RelationalExpression__Group__0__Impl : ( ruleAdditiveExpression ) ;
+    // InternalExpression.g:3604:1: rule__RelationalExpression__Group__0__Impl : ( ruleAdditiveExpression ) ;
     public final void rule__RelationalExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3608:1: ( ( ruleAdditiveExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3609:1: ( ruleAdditiveExpression )
+            // InternalExpression.g:3608:1: ( ( ruleAdditiveExpression ) )
+            // InternalExpression.g:3609:1: ( ruleAdditiveExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3609:1: ( ruleAdditiveExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3610:1: ruleAdditiveExpression
+            // InternalExpression.g:3609:1: ( ruleAdditiveExpression )
+            // InternalExpression.g:3610:1: ruleAdditiveExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRelationalExpressionAccess().getAdditiveExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleAdditiveExpression_in_rule__RelationalExpression__Group__0__Impl7440);
+            pushFollow(FOLLOW_2);
             ruleAdditiveExpression();
 
             state._fsp--;
@@ -10708,16 +10708,16 @@ public final void rule__RelationalExpression__Group__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__RelationalExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3621:1: rule__RelationalExpression__Group__1 : rule__RelationalExpression__Group__1__Impl ;
+    // InternalExpression.g:3621:1: rule__RelationalExpression__Group__1 : rule__RelationalExpression__Group__1__Impl ;
     public final void rule__RelationalExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3625:1: ( rule__RelationalExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3626:2: rule__RelationalExpression__Group__1__Impl
+            // InternalExpression.g:3625:1: ( rule__RelationalExpression__Group__1__Impl )
+            // InternalExpression.g:3626:2: rule__RelationalExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__RelationalExpression__Group__1__Impl_in_rule__RelationalExpression__Group__17469);
+            pushFollow(FOLLOW_2);
             rule__RelationalExpression__Group__1__Impl();
 
             state._fsp--;
@@ -10741,22 +10741,22 @@ public final void rule__RelationalExpression__Group__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__RelationalExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3632:1: rule__RelationalExpression__Group__1__Impl : ( ( rule__RelationalExpression__Group_1__0 )* ) ;
+    // InternalExpression.g:3632:1: rule__RelationalExpression__Group__1__Impl : ( ( rule__RelationalExpression__Group_1__0 )* ) ;
     public final void rule__RelationalExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3636:1: ( ( ( rule__RelationalExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3637:1: ( ( rule__RelationalExpression__Group_1__0 )* )
+            // InternalExpression.g:3636:1: ( ( ( rule__RelationalExpression__Group_1__0 )* ) )
+            // InternalExpression.g:3637:1: ( ( rule__RelationalExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3637:1: ( ( rule__RelationalExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3638:1: ( rule__RelationalExpression__Group_1__0 )*
+            // InternalExpression.g:3637:1: ( ( rule__RelationalExpression__Group_1__0 )* )
+            // InternalExpression.g:3638:1: ( rule__RelationalExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRelationalExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3639:1: ( rule__RelationalExpression__Group_1__0 )*
+            // InternalExpression.g:3639:1: ( rule__RelationalExpression__Group_1__0 )*
             loop25:
             do {
                 int alt25=2;
@@ -10769,9 +10769,9 @@ public final void rule__RelationalExpression__Group__1__Impl() throws Recognitio
 
                 switch (alt25) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3639:2: rule__RelationalExpression__Group_1__0
+            	    // InternalExpression.g:3639:2: rule__RelationalExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__RelationalExpression__Group_1__0_in_rule__RelationalExpression__Group__1__Impl7496);
+            	    pushFollow(FOLLOW_26);
             	    rule__RelationalExpression__Group_1__0();
 
             	    state._fsp--;
@@ -10810,21 +10810,21 @@ public final void rule__RelationalExpression__Group__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__RelationalExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3653:1: rule__RelationalExpression__Group_1__0 : rule__RelationalExpression__Group_1__0__Impl rule__RelationalExpression__Group_1__1 ;
+    // InternalExpression.g:3653:1: rule__RelationalExpression__Group_1__0 : rule__RelationalExpression__Group_1__0__Impl rule__RelationalExpression__Group_1__1 ;
     public final void rule__RelationalExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3657:1: ( rule__RelationalExpression__Group_1__0__Impl rule__RelationalExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3658:2: rule__RelationalExpression__Group_1__0__Impl rule__RelationalExpression__Group_1__1
+            // InternalExpression.g:3657:1: ( rule__RelationalExpression__Group_1__0__Impl rule__RelationalExpression__Group_1__1 )
+            // InternalExpression.g:3658:2: rule__RelationalExpression__Group_1__0__Impl rule__RelationalExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__RelationalExpression__Group_1__0__Impl_in_rule__RelationalExpression__Group_1__07531);
+            pushFollow(FOLLOW_25);
             rule__RelationalExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__RelationalExpression__Group_1__1_in_rule__RelationalExpression__Group_1__07534);
+            pushFollow(FOLLOW_2);
             rule__RelationalExpression__Group_1__1();
 
             state._fsp--;
@@ -10848,23 +10848,23 @@ public final void rule__RelationalExpression__Group_1__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__RelationalExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3665:1: rule__RelationalExpression__Group_1__0__Impl : ( () ) ;
+    // InternalExpression.g:3665:1: rule__RelationalExpression__Group_1__0__Impl : ( () ) ;
     public final void rule__RelationalExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3669:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3670:1: ( () )
+            // InternalExpression.g:3669:1: ( ( () ) )
+            // InternalExpression.g:3670:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3670:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3671:1: ()
+            // InternalExpression.g:3670:1: ( () )
+            // InternalExpression.g:3671:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRelationalExpressionAccess().getBooleanOperationLeftAction_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3672:1: ()
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3674:1: 
+            // InternalExpression.g:3672:1: ()
+            // InternalExpression.g:3674:1: 
             {
             }
 
@@ -10889,21 +10889,21 @@ public final void rule__RelationalExpression__Group_1__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__RelationalExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3684:1: rule__RelationalExpression__Group_1__1 : rule__RelationalExpression__Group_1__1__Impl rule__RelationalExpression__Group_1__2 ;
+    // InternalExpression.g:3684:1: rule__RelationalExpression__Group_1__1 : rule__RelationalExpression__Group_1__1__Impl rule__RelationalExpression__Group_1__2 ;
     public final void rule__RelationalExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3688:1: ( rule__RelationalExpression__Group_1__1__Impl rule__RelationalExpression__Group_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3689:2: rule__RelationalExpression__Group_1__1__Impl rule__RelationalExpression__Group_1__2
+            // InternalExpression.g:3688:1: ( rule__RelationalExpression__Group_1__1__Impl rule__RelationalExpression__Group_1__2 )
+            // InternalExpression.g:3689:2: rule__RelationalExpression__Group_1__1__Impl rule__RelationalExpression__Group_1__2
             {
-            pushFollow(FOLLOW_rule__RelationalExpression__Group_1__1__Impl_in_rule__RelationalExpression__Group_1__17592);
+            pushFollow(FOLLOW_17);
             rule__RelationalExpression__Group_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__RelationalExpression__Group_1__2_in_rule__RelationalExpression__Group_1__17595);
+            pushFollow(FOLLOW_2);
             rule__RelationalExpression__Group_1__2();
 
             state._fsp--;
@@ -10927,25 +10927,25 @@ public final void rule__RelationalExpression__Group_1__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__RelationalExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3696:1: rule__RelationalExpression__Group_1__1__Impl : ( ( rule__RelationalExpression__OperatorAssignment_1_1 ) ) ;
+    // InternalExpression.g:3696:1: rule__RelationalExpression__Group_1__1__Impl : ( ( rule__RelationalExpression__OperatorAssignment_1_1 ) ) ;
     public final void rule__RelationalExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3700:1: ( ( ( rule__RelationalExpression__OperatorAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3701:1: ( ( rule__RelationalExpression__OperatorAssignment_1_1 ) )
+            // InternalExpression.g:3700:1: ( ( ( rule__RelationalExpression__OperatorAssignment_1_1 ) ) )
+            // InternalExpression.g:3701:1: ( ( rule__RelationalExpression__OperatorAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3701:1: ( ( rule__RelationalExpression__OperatorAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3702:1: ( rule__RelationalExpression__OperatorAssignment_1_1 )
+            // InternalExpression.g:3701:1: ( ( rule__RelationalExpression__OperatorAssignment_1_1 ) )
+            // InternalExpression.g:3702:1: ( rule__RelationalExpression__OperatorAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRelationalExpressionAccess().getOperatorAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3703:1: ( rule__RelationalExpression__OperatorAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3703:2: rule__RelationalExpression__OperatorAssignment_1_1
+            // InternalExpression.g:3703:1: ( rule__RelationalExpression__OperatorAssignment_1_1 )
+            // InternalExpression.g:3703:2: rule__RelationalExpression__OperatorAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__RelationalExpression__OperatorAssignment_1_1_in_rule__RelationalExpression__Group_1__1__Impl7622);
+            pushFollow(FOLLOW_2);
             rule__RelationalExpression__OperatorAssignment_1_1();
 
             state._fsp--;
@@ -10978,16 +10978,16 @@ public final void rule__RelationalExpression__Group_1__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__RelationalExpression__Group_1__2"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3713:1: rule__RelationalExpression__Group_1__2 : rule__RelationalExpression__Group_1__2__Impl ;
+    // InternalExpression.g:3713:1: rule__RelationalExpression__Group_1__2 : rule__RelationalExpression__Group_1__2__Impl ;
     public final void rule__RelationalExpression__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3717:1: ( rule__RelationalExpression__Group_1__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3718:2: rule__RelationalExpression__Group_1__2__Impl
+            // InternalExpression.g:3717:1: ( rule__RelationalExpression__Group_1__2__Impl )
+            // InternalExpression.g:3718:2: rule__RelationalExpression__Group_1__2__Impl
             {
-            pushFollow(FOLLOW_rule__RelationalExpression__Group_1__2__Impl_in_rule__RelationalExpression__Group_1__27652);
+            pushFollow(FOLLOW_2);
             rule__RelationalExpression__Group_1__2__Impl();
 
             state._fsp--;
@@ -11011,25 +11011,25 @@ public final void rule__RelationalExpression__Group_1__2() throws RecognitionExc
 
 
     // $ANTLR start "rule__RelationalExpression__Group_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3724:1: rule__RelationalExpression__Group_1__2__Impl : ( ( rule__RelationalExpression__RightAssignment_1_2 ) ) ;
+    // InternalExpression.g:3724:1: rule__RelationalExpression__Group_1__2__Impl : ( ( rule__RelationalExpression__RightAssignment_1_2 ) ) ;
     public final void rule__RelationalExpression__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3728:1: ( ( ( rule__RelationalExpression__RightAssignment_1_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3729:1: ( ( rule__RelationalExpression__RightAssignment_1_2 ) )
+            // InternalExpression.g:3728:1: ( ( ( rule__RelationalExpression__RightAssignment_1_2 ) ) )
+            // InternalExpression.g:3729:1: ( ( rule__RelationalExpression__RightAssignment_1_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3729:1: ( ( rule__RelationalExpression__RightAssignment_1_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3730:1: ( rule__RelationalExpression__RightAssignment_1_2 )
+            // InternalExpression.g:3729:1: ( ( rule__RelationalExpression__RightAssignment_1_2 ) )
+            // InternalExpression.g:3730:1: ( rule__RelationalExpression__RightAssignment_1_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRelationalExpressionAccess().getRightAssignment_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3731:1: ( rule__RelationalExpression__RightAssignment_1_2 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3731:2: rule__RelationalExpression__RightAssignment_1_2
+            // InternalExpression.g:3731:1: ( rule__RelationalExpression__RightAssignment_1_2 )
+            // InternalExpression.g:3731:2: rule__RelationalExpression__RightAssignment_1_2
             {
-            pushFollow(FOLLOW_rule__RelationalExpression__RightAssignment_1_2_in_rule__RelationalExpression__Group_1__2__Impl7679);
+            pushFollow(FOLLOW_2);
             rule__RelationalExpression__RightAssignment_1_2();
 
             state._fsp--;
@@ -11062,21 +11062,21 @@ public final void rule__RelationalExpression__Group_1__2__Impl() throws Recognit
 
 
     // $ANTLR start "rule__AdditiveExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3747:1: rule__AdditiveExpression__Group__0 : rule__AdditiveExpression__Group__0__Impl rule__AdditiveExpression__Group__1 ;
+    // InternalExpression.g:3747:1: rule__AdditiveExpression__Group__0 : rule__AdditiveExpression__Group__0__Impl rule__AdditiveExpression__Group__1 ;
     public final void rule__AdditiveExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3751:1: ( rule__AdditiveExpression__Group__0__Impl rule__AdditiveExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3752:2: rule__AdditiveExpression__Group__0__Impl rule__AdditiveExpression__Group__1
+            // InternalExpression.g:3751:1: ( rule__AdditiveExpression__Group__0__Impl rule__AdditiveExpression__Group__1 )
+            // InternalExpression.g:3752:2: rule__AdditiveExpression__Group__0__Impl rule__AdditiveExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__AdditiveExpression__Group__0__Impl_in_rule__AdditiveExpression__Group__07715);
+            pushFollow(FOLLOW_27);
             rule__AdditiveExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__AdditiveExpression__Group__1_in_rule__AdditiveExpression__Group__07718);
+            pushFollow(FOLLOW_2);
             rule__AdditiveExpression__Group__1();
 
             state._fsp--;
@@ -11100,22 +11100,22 @@ public final void rule__AdditiveExpression__Group__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__AdditiveExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3759:1: rule__AdditiveExpression__Group__0__Impl : ( ruleMultiplicativeExpression ) ;
+    // InternalExpression.g:3759:1: rule__AdditiveExpression__Group__0__Impl : ( ruleMultiplicativeExpression ) ;
     public final void rule__AdditiveExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3763:1: ( ( ruleMultiplicativeExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3764:1: ( ruleMultiplicativeExpression )
+            // InternalExpression.g:3763:1: ( ( ruleMultiplicativeExpression ) )
+            // InternalExpression.g:3764:1: ( ruleMultiplicativeExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3764:1: ( ruleMultiplicativeExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3765:1: ruleMultiplicativeExpression
+            // InternalExpression.g:3764:1: ( ruleMultiplicativeExpression )
+            // InternalExpression.g:3765:1: ruleMultiplicativeExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAdditiveExpressionAccess().getMultiplicativeExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleMultiplicativeExpression_in_rule__AdditiveExpression__Group__0__Impl7745);
+            pushFollow(FOLLOW_2);
             ruleMultiplicativeExpression();
 
             state._fsp--;
@@ -11145,16 +11145,16 @@ public final void rule__AdditiveExpression__Group__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__AdditiveExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3776:1: rule__AdditiveExpression__Group__1 : rule__AdditiveExpression__Group__1__Impl ;
+    // InternalExpression.g:3776:1: rule__AdditiveExpression__Group__1 : rule__AdditiveExpression__Group__1__Impl ;
     public final void rule__AdditiveExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3780:1: ( rule__AdditiveExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3781:2: rule__AdditiveExpression__Group__1__Impl
+            // InternalExpression.g:3780:1: ( rule__AdditiveExpression__Group__1__Impl )
+            // InternalExpression.g:3781:2: rule__AdditiveExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__AdditiveExpression__Group__1__Impl_in_rule__AdditiveExpression__Group__17774);
+            pushFollow(FOLLOW_2);
             rule__AdditiveExpression__Group__1__Impl();
 
             state._fsp--;
@@ -11178,22 +11178,22 @@ public final void rule__AdditiveExpression__Group__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__AdditiveExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3787:1: rule__AdditiveExpression__Group__1__Impl : ( ( rule__AdditiveExpression__Group_1__0 )* ) ;
+    // InternalExpression.g:3787:1: rule__AdditiveExpression__Group__1__Impl : ( ( rule__AdditiveExpression__Group_1__0 )* ) ;
     public final void rule__AdditiveExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3791:1: ( ( ( rule__AdditiveExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3792:1: ( ( rule__AdditiveExpression__Group_1__0 )* )
+            // InternalExpression.g:3791:1: ( ( ( rule__AdditiveExpression__Group_1__0 )* ) )
+            // InternalExpression.g:3792:1: ( ( rule__AdditiveExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3792:1: ( ( rule__AdditiveExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3793:1: ( rule__AdditiveExpression__Group_1__0 )*
+            // InternalExpression.g:3792:1: ( ( rule__AdditiveExpression__Group_1__0 )* )
+            // InternalExpression.g:3793:1: ( rule__AdditiveExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAdditiveExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3794:1: ( rule__AdditiveExpression__Group_1__0 )*
+            // InternalExpression.g:3794:1: ( rule__AdditiveExpression__Group_1__0 )*
             loop26:
             do {
                 int alt26=2;
@@ -11206,9 +11206,9 @@ public final void rule__AdditiveExpression__Group__1__Impl() throws RecognitionE
 
                 switch (alt26) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3794:2: rule__AdditiveExpression__Group_1__0
+            	    // InternalExpression.g:3794:2: rule__AdditiveExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__AdditiveExpression__Group_1__0_in_rule__AdditiveExpression__Group__1__Impl7801);
+            	    pushFollow(FOLLOW_28);
             	    rule__AdditiveExpression__Group_1__0();
 
             	    state._fsp--;
@@ -11247,21 +11247,21 @@ public final void rule__AdditiveExpression__Group__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__AdditiveExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3808:1: rule__AdditiveExpression__Group_1__0 : rule__AdditiveExpression__Group_1__0__Impl rule__AdditiveExpression__Group_1__1 ;
+    // InternalExpression.g:3808:1: rule__AdditiveExpression__Group_1__0 : rule__AdditiveExpression__Group_1__0__Impl rule__AdditiveExpression__Group_1__1 ;
     public final void rule__AdditiveExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3812:1: ( rule__AdditiveExpression__Group_1__0__Impl rule__AdditiveExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3813:2: rule__AdditiveExpression__Group_1__0__Impl rule__AdditiveExpression__Group_1__1
+            // InternalExpression.g:3812:1: ( rule__AdditiveExpression__Group_1__0__Impl rule__AdditiveExpression__Group_1__1 )
+            // InternalExpression.g:3813:2: rule__AdditiveExpression__Group_1__0__Impl rule__AdditiveExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__AdditiveExpression__Group_1__0__Impl_in_rule__AdditiveExpression__Group_1__07836);
+            pushFollow(FOLLOW_27);
             rule__AdditiveExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__AdditiveExpression__Group_1__1_in_rule__AdditiveExpression__Group_1__07839);
+            pushFollow(FOLLOW_2);
             rule__AdditiveExpression__Group_1__1();
 
             state._fsp--;
@@ -11285,23 +11285,23 @@ public final void rule__AdditiveExpression__Group_1__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__AdditiveExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3820:1: rule__AdditiveExpression__Group_1__0__Impl : ( () ) ;
+    // InternalExpression.g:3820:1: rule__AdditiveExpression__Group_1__0__Impl : ( () ) ;
     public final void rule__AdditiveExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3824:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3825:1: ( () )
+            // InternalExpression.g:3824:1: ( ( () ) )
+            // InternalExpression.g:3825:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3825:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3826:1: ()
+            // InternalExpression.g:3825:1: ( () )
+            // InternalExpression.g:3826:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAdditiveExpressionAccess().getOperationCallParamsAction_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3827:1: ()
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3829:1: 
+            // InternalExpression.g:3827:1: ()
+            // InternalExpression.g:3829:1: 
             {
             }
 
@@ -11326,21 +11326,21 @@ public final void rule__AdditiveExpression__Group_1__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__AdditiveExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3839:1: rule__AdditiveExpression__Group_1__1 : rule__AdditiveExpression__Group_1__1__Impl rule__AdditiveExpression__Group_1__2 ;
+    // InternalExpression.g:3839:1: rule__AdditiveExpression__Group_1__1 : rule__AdditiveExpression__Group_1__1__Impl rule__AdditiveExpression__Group_1__2 ;
     public final void rule__AdditiveExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3843:1: ( rule__AdditiveExpression__Group_1__1__Impl rule__AdditiveExpression__Group_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3844:2: rule__AdditiveExpression__Group_1__1__Impl rule__AdditiveExpression__Group_1__2
+            // InternalExpression.g:3843:1: ( rule__AdditiveExpression__Group_1__1__Impl rule__AdditiveExpression__Group_1__2 )
+            // InternalExpression.g:3844:2: rule__AdditiveExpression__Group_1__1__Impl rule__AdditiveExpression__Group_1__2
             {
-            pushFollow(FOLLOW_rule__AdditiveExpression__Group_1__1__Impl_in_rule__AdditiveExpression__Group_1__17897);
+            pushFollow(FOLLOW_17);
             rule__AdditiveExpression__Group_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__AdditiveExpression__Group_1__2_in_rule__AdditiveExpression__Group_1__17900);
+            pushFollow(FOLLOW_2);
             rule__AdditiveExpression__Group_1__2();
 
             state._fsp--;
@@ -11364,25 +11364,25 @@ public final void rule__AdditiveExpression__Group_1__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__AdditiveExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3851:1: rule__AdditiveExpression__Group_1__1__Impl : ( ( rule__AdditiveExpression__NameAssignment_1_1 ) ) ;
+    // InternalExpression.g:3851:1: rule__AdditiveExpression__Group_1__1__Impl : ( ( rule__AdditiveExpression__NameAssignment_1_1 ) ) ;
     public final void rule__AdditiveExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3855:1: ( ( ( rule__AdditiveExpression__NameAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3856:1: ( ( rule__AdditiveExpression__NameAssignment_1_1 ) )
+            // InternalExpression.g:3855:1: ( ( ( rule__AdditiveExpression__NameAssignment_1_1 ) ) )
+            // InternalExpression.g:3856:1: ( ( rule__AdditiveExpression__NameAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3856:1: ( ( rule__AdditiveExpression__NameAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3857:1: ( rule__AdditiveExpression__NameAssignment_1_1 )
+            // InternalExpression.g:3856:1: ( ( rule__AdditiveExpression__NameAssignment_1_1 ) )
+            // InternalExpression.g:3857:1: ( rule__AdditiveExpression__NameAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAdditiveExpressionAccess().getNameAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3858:1: ( rule__AdditiveExpression__NameAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3858:2: rule__AdditiveExpression__NameAssignment_1_1
+            // InternalExpression.g:3858:1: ( rule__AdditiveExpression__NameAssignment_1_1 )
+            // InternalExpression.g:3858:2: rule__AdditiveExpression__NameAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__AdditiveExpression__NameAssignment_1_1_in_rule__AdditiveExpression__Group_1__1__Impl7927);
+            pushFollow(FOLLOW_2);
             rule__AdditiveExpression__NameAssignment_1_1();
 
             state._fsp--;
@@ -11415,16 +11415,16 @@ public final void rule__AdditiveExpression__Group_1__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__AdditiveExpression__Group_1__2"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3868:1: rule__AdditiveExpression__Group_1__2 : rule__AdditiveExpression__Group_1__2__Impl ;
+    // InternalExpression.g:3868:1: rule__AdditiveExpression__Group_1__2 : rule__AdditiveExpression__Group_1__2__Impl ;
     public final void rule__AdditiveExpression__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3872:1: ( rule__AdditiveExpression__Group_1__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3873:2: rule__AdditiveExpression__Group_1__2__Impl
+            // InternalExpression.g:3872:1: ( rule__AdditiveExpression__Group_1__2__Impl )
+            // InternalExpression.g:3873:2: rule__AdditiveExpression__Group_1__2__Impl
             {
-            pushFollow(FOLLOW_rule__AdditiveExpression__Group_1__2__Impl_in_rule__AdditiveExpression__Group_1__27957);
+            pushFollow(FOLLOW_2);
             rule__AdditiveExpression__Group_1__2__Impl();
 
             state._fsp--;
@@ -11448,25 +11448,25 @@ public final void rule__AdditiveExpression__Group_1__2() throws RecognitionExcep
 
 
     // $ANTLR start "rule__AdditiveExpression__Group_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3879:1: rule__AdditiveExpression__Group_1__2__Impl : ( ( rule__AdditiveExpression__ParamsAssignment_1_2 ) ) ;
+    // InternalExpression.g:3879:1: rule__AdditiveExpression__Group_1__2__Impl : ( ( rule__AdditiveExpression__ParamsAssignment_1_2 ) ) ;
     public final void rule__AdditiveExpression__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3883:1: ( ( ( rule__AdditiveExpression__ParamsAssignment_1_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3884:1: ( ( rule__AdditiveExpression__ParamsAssignment_1_2 ) )
+            // InternalExpression.g:3883:1: ( ( ( rule__AdditiveExpression__ParamsAssignment_1_2 ) ) )
+            // InternalExpression.g:3884:1: ( ( rule__AdditiveExpression__ParamsAssignment_1_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3884:1: ( ( rule__AdditiveExpression__ParamsAssignment_1_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3885:1: ( rule__AdditiveExpression__ParamsAssignment_1_2 )
+            // InternalExpression.g:3884:1: ( ( rule__AdditiveExpression__ParamsAssignment_1_2 ) )
+            // InternalExpression.g:3885:1: ( rule__AdditiveExpression__ParamsAssignment_1_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAdditiveExpressionAccess().getParamsAssignment_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3886:1: ( rule__AdditiveExpression__ParamsAssignment_1_2 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3886:2: rule__AdditiveExpression__ParamsAssignment_1_2
+            // InternalExpression.g:3886:1: ( rule__AdditiveExpression__ParamsAssignment_1_2 )
+            // InternalExpression.g:3886:2: rule__AdditiveExpression__ParamsAssignment_1_2
             {
-            pushFollow(FOLLOW_rule__AdditiveExpression__ParamsAssignment_1_2_in_rule__AdditiveExpression__Group_1__2__Impl7984);
+            pushFollow(FOLLOW_2);
             rule__AdditiveExpression__ParamsAssignment_1_2();
 
             state._fsp--;
@@ -11499,21 +11499,21 @@ public final void rule__AdditiveExpression__Group_1__2__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__MultiplicativeExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3902:1: rule__MultiplicativeExpression__Group__0 : rule__MultiplicativeExpression__Group__0__Impl rule__MultiplicativeExpression__Group__1 ;
+    // InternalExpression.g:3902:1: rule__MultiplicativeExpression__Group__0 : rule__MultiplicativeExpression__Group__0__Impl rule__MultiplicativeExpression__Group__1 ;
     public final void rule__MultiplicativeExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3906:1: ( rule__MultiplicativeExpression__Group__0__Impl rule__MultiplicativeExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3907:2: rule__MultiplicativeExpression__Group__0__Impl rule__MultiplicativeExpression__Group__1
+            // InternalExpression.g:3906:1: ( rule__MultiplicativeExpression__Group__0__Impl rule__MultiplicativeExpression__Group__1 )
+            // InternalExpression.g:3907:2: rule__MultiplicativeExpression__Group__0__Impl rule__MultiplicativeExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__MultiplicativeExpression__Group__0__Impl_in_rule__MultiplicativeExpression__Group__08020);
+            pushFollow(FOLLOW_29);
             rule__MultiplicativeExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__MultiplicativeExpression__Group__1_in_rule__MultiplicativeExpression__Group__08023);
+            pushFollow(FOLLOW_2);
             rule__MultiplicativeExpression__Group__1();
 
             state._fsp--;
@@ -11537,22 +11537,22 @@ public final void rule__MultiplicativeExpression__Group__0() throws RecognitionE
 
 
     // $ANTLR start "rule__MultiplicativeExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3914:1: rule__MultiplicativeExpression__Group__0__Impl : ( ruleUnaryOrInfixExpression ) ;
+    // InternalExpression.g:3914:1: rule__MultiplicativeExpression__Group__0__Impl : ( ruleUnaryOrInfixExpression ) ;
     public final void rule__MultiplicativeExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3918:1: ( ( ruleUnaryOrInfixExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3919:1: ( ruleUnaryOrInfixExpression )
+            // InternalExpression.g:3918:1: ( ( ruleUnaryOrInfixExpression ) )
+            // InternalExpression.g:3919:1: ( ruleUnaryOrInfixExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3919:1: ( ruleUnaryOrInfixExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3920:1: ruleUnaryOrInfixExpression
+            // InternalExpression.g:3919:1: ( ruleUnaryOrInfixExpression )
+            // InternalExpression.g:3920:1: ruleUnaryOrInfixExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMultiplicativeExpressionAccess().getUnaryOrInfixExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleUnaryOrInfixExpression_in_rule__MultiplicativeExpression__Group__0__Impl8050);
+            pushFollow(FOLLOW_2);
             ruleUnaryOrInfixExpression();
 
             state._fsp--;
@@ -11582,16 +11582,16 @@ public final void rule__MultiplicativeExpression__Group__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__MultiplicativeExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3931:1: rule__MultiplicativeExpression__Group__1 : rule__MultiplicativeExpression__Group__1__Impl ;
+    // InternalExpression.g:3931:1: rule__MultiplicativeExpression__Group__1 : rule__MultiplicativeExpression__Group__1__Impl ;
     public final void rule__MultiplicativeExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3935:1: ( rule__MultiplicativeExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3936:2: rule__MultiplicativeExpression__Group__1__Impl
+            // InternalExpression.g:3935:1: ( rule__MultiplicativeExpression__Group__1__Impl )
+            // InternalExpression.g:3936:2: rule__MultiplicativeExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__MultiplicativeExpression__Group__1__Impl_in_rule__MultiplicativeExpression__Group__18079);
+            pushFollow(FOLLOW_2);
             rule__MultiplicativeExpression__Group__1__Impl();
 
             state._fsp--;
@@ -11615,22 +11615,22 @@ public final void rule__MultiplicativeExpression__Group__1() throws RecognitionE
 
 
     // $ANTLR start "rule__MultiplicativeExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3942:1: rule__MultiplicativeExpression__Group__1__Impl : ( ( rule__MultiplicativeExpression__Group_1__0 )* ) ;
+    // InternalExpression.g:3942:1: rule__MultiplicativeExpression__Group__1__Impl : ( ( rule__MultiplicativeExpression__Group_1__0 )* ) ;
     public final void rule__MultiplicativeExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3946:1: ( ( ( rule__MultiplicativeExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3947:1: ( ( rule__MultiplicativeExpression__Group_1__0 )* )
+            // InternalExpression.g:3946:1: ( ( ( rule__MultiplicativeExpression__Group_1__0 )* ) )
+            // InternalExpression.g:3947:1: ( ( rule__MultiplicativeExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3947:1: ( ( rule__MultiplicativeExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3948:1: ( rule__MultiplicativeExpression__Group_1__0 )*
+            // InternalExpression.g:3947:1: ( ( rule__MultiplicativeExpression__Group_1__0 )* )
+            // InternalExpression.g:3948:1: ( rule__MultiplicativeExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMultiplicativeExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3949:1: ( rule__MultiplicativeExpression__Group_1__0 )*
+            // InternalExpression.g:3949:1: ( rule__MultiplicativeExpression__Group_1__0 )*
             loop27:
             do {
                 int alt27=2;
@@ -11643,9 +11643,9 @@ public final void rule__MultiplicativeExpression__Group__1__Impl() throws Recogn
 
                 switch (alt27) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3949:2: rule__MultiplicativeExpression__Group_1__0
+            	    // InternalExpression.g:3949:2: rule__MultiplicativeExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__MultiplicativeExpression__Group_1__0_in_rule__MultiplicativeExpression__Group__1__Impl8106);
+            	    pushFollow(FOLLOW_30);
             	    rule__MultiplicativeExpression__Group_1__0();
 
             	    state._fsp--;
@@ -11684,21 +11684,21 @@ public final void rule__MultiplicativeExpression__Group__1__Impl() throws Recogn
 
 
     // $ANTLR start "rule__MultiplicativeExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3963:1: rule__MultiplicativeExpression__Group_1__0 : rule__MultiplicativeExpression__Group_1__0__Impl rule__MultiplicativeExpression__Group_1__1 ;
+    // InternalExpression.g:3963:1: rule__MultiplicativeExpression__Group_1__0 : rule__MultiplicativeExpression__Group_1__0__Impl rule__MultiplicativeExpression__Group_1__1 ;
     public final void rule__MultiplicativeExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3967:1: ( rule__MultiplicativeExpression__Group_1__0__Impl rule__MultiplicativeExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3968:2: rule__MultiplicativeExpression__Group_1__0__Impl rule__MultiplicativeExpression__Group_1__1
+            // InternalExpression.g:3967:1: ( rule__MultiplicativeExpression__Group_1__0__Impl rule__MultiplicativeExpression__Group_1__1 )
+            // InternalExpression.g:3968:2: rule__MultiplicativeExpression__Group_1__0__Impl rule__MultiplicativeExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__MultiplicativeExpression__Group_1__0__Impl_in_rule__MultiplicativeExpression__Group_1__08141);
+            pushFollow(FOLLOW_29);
             rule__MultiplicativeExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__MultiplicativeExpression__Group_1__1_in_rule__MultiplicativeExpression__Group_1__08144);
+            pushFollow(FOLLOW_2);
             rule__MultiplicativeExpression__Group_1__1();
 
             state._fsp--;
@@ -11722,23 +11722,23 @@ public final void rule__MultiplicativeExpression__Group_1__0() throws Recognitio
 
 
     // $ANTLR start "rule__MultiplicativeExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3975:1: rule__MultiplicativeExpression__Group_1__0__Impl : ( () ) ;
+    // InternalExpression.g:3975:1: rule__MultiplicativeExpression__Group_1__0__Impl : ( () ) ;
     public final void rule__MultiplicativeExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3979:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3980:1: ( () )
+            // InternalExpression.g:3979:1: ( ( () ) )
+            // InternalExpression.g:3980:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3980:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3981:1: ()
+            // InternalExpression.g:3980:1: ( () )
+            // InternalExpression.g:3981:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMultiplicativeExpressionAccess().getOperationCallParamsAction_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3982:1: ()
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3984:1: 
+            // InternalExpression.g:3982:1: ()
+            // InternalExpression.g:3984:1: 
             {
             }
 
@@ -11763,21 +11763,21 @@ public final void rule__MultiplicativeExpression__Group_1__0__Impl() throws Reco
 
 
     // $ANTLR start "rule__MultiplicativeExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3994:1: rule__MultiplicativeExpression__Group_1__1 : rule__MultiplicativeExpression__Group_1__1__Impl rule__MultiplicativeExpression__Group_1__2 ;
+    // InternalExpression.g:3994:1: rule__MultiplicativeExpression__Group_1__1 : rule__MultiplicativeExpression__Group_1__1__Impl rule__MultiplicativeExpression__Group_1__2 ;
     public final void rule__MultiplicativeExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3998:1: ( rule__MultiplicativeExpression__Group_1__1__Impl rule__MultiplicativeExpression__Group_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:3999:2: rule__MultiplicativeExpression__Group_1__1__Impl rule__MultiplicativeExpression__Group_1__2
+            // InternalExpression.g:3998:1: ( rule__MultiplicativeExpression__Group_1__1__Impl rule__MultiplicativeExpression__Group_1__2 )
+            // InternalExpression.g:3999:2: rule__MultiplicativeExpression__Group_1__1__Impl rule__MultiplicativeExpression__Group_1__2
             {
-            pushFollow(FOLLOW_rule__MultiplicativeExpression__Group_1__1__Impl_in_rule__MultiplicativeExpression__Group_1__18202);
+            pushFollow(FOLLOW_17);
             rule__MultiplicativeExpression__Group_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__MultiplicativeExpression__Group_1__2_in_rule__MultiplicativeExpression__Group_1__18205);
+            pushFollow(FOLLOW_2);
             rule__MultiplicativeExpression__Group_1__2();
 
             state._fsp--;
@@ -11801,25 +11801,25 @@ public final void rule__MultiplicativeExpression__Group_1__1() throws Recognitio
 
 
     // $ANTLR start "rule__MultiplicativeExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4006:1: rule__MultiplicativeExpression__Group_1__1__Impl : ( ( rule__MultiplicativeExpression__NameAssignment_1_1 ) ) ;
+    // InternalExpression.g:4006:1: rule__MultiplicativeExpression__Group_1__1__Impl : ( ( rule__MultiplicativeExpression__NameAssignment_1_1 ) ) ;
     public final void rule__MultiplicativeExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4010:1: ( ( ( rule__MultiplicativeExpression__NameAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4011:1: ( ( rule__MultiplicativeExpression__NameAssignment_1_1 ) )
+            // InternalExpression.g:4010:1: ( ( ( rule__MultiplicativeExpression__NameAssignment_1_1 ) ) )
+            // InternalExpression.g:4011:1: ( ( rule__MultiplicativeExpression__NameAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4011:1: ( ( rule__MultiplicativeExpression__NameAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4012:1: ( rule__MultiplicativeExpression__NameAssignment_1_1 )
+            // InternalExpression.g:4011:1: ( ( rule__MultiplicativeExpression__NameAssignment_1_1 ) )
+            // InternalExpression.g:4012:1: ( rule__MultiplicativeExpression__NameAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMultiplicativeExpressionAccess().getNameAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4013:1: ( rule__MultiplicativeExpression__NameAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4013:2: rule__MultiplicativeExpression__NameAssignment_1_1
+            // InternalExpression.g:4013:1: ( rule__MultiplicativeExpression__NameAssignment_1_1 )
+            // InternalExpression.g:4013:2: rule__MultiplicativeExpression__NameAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__MultiplicativeExpression__NameAssignment_1_1_in_rule__MultiplicativeExpression__Group_1__1__Impl8232);
+            pushFollow(FOLLOW_2);
             rule__MultiplicativeExpression__NameAssignment_1_1();
 
             state._fsp--;
@@ -11852,16 +11852,16 @@ public final void rule__MultiplicativeExpression__Group_1__1__Impl() throws Reco
 
 
     // $ANTLR start "rule__MultiplicativeExpression__Group_1__2"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4023:1: rule__MultiplicativeExpression__Group_1__2 : rule__MultiplicativeExpression__Group_1__2__Impl ;
+    // InternalExpression.g:4023:1: rule__MultiplicativeExpression__Group_1__2 : rule__MultiplicativeExpression__Group_1__2__Impl ;
     public final void rule__MultiplicativeExpression__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4027:1: ( rule__MultiplicativeExpression__Group_1__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4028:2: rule__MultiplicativeExpression__Group_1__2__Impl
+            // InternalExpression.g:4027:1: ( rule__MultiplicativeExpression__Group_1__2__Impl )
+            // InternalExpression.g:4028:2: rule__MultiplicativeExpression__Group_1__2__Impl
             {
-            pushFollow(FOLLOW_rule__MultiplicativeExpression__Group_1__2__Impl_in_rule__MultiplicativeExpression__Group_1__28262);
+            pushFollow(FOLLOW_2);
             rule__MultiplicativeExpression__Group_1__2__Impl();
 
             state._fsp--;
@@ -11885,25 +11885,25 @@ public final void rule__MultiplicativeExpression__Group_1__2() throws Recognitio
 
 
     // $ANTLR start "rule__MultiplicativeExpression__Group_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4034:1: rule__MultiplicativeExpression__Group_1__2__Impl : ( ( rule__MultiplicativeExpression__ParamsAssignment_1_2 ) ) ;
+    // InternalExpression.g:4034:1: rule__MultiplicativeExpression__Group_1__2__Impl : ( ( rule__MultiplicativeExpression__ParamsAssignment_1_2 ) ) ;
     public final void rule__MultiplicativeExpression__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4038:1: ( ( ( rule__MultiplicativeExpression__ParamsAssignment_1_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4039:1: ( ( rule__MultiplicativeExpression__ParamsAssignment_1_2 ) )
+            // InternalExpression.g:4038:1: ( ( ( rule__MultiplicativeExpression__ParamsAssignment_1_2 ) ) )
+            // InternalExpression.g:4039:1: ( ( rule__MultiplicativeExpression__ParamsAssignment_1_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4039:1: ( ( rule__MultiplicativeExpression__ParamsAssignment_1_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4040:1: ( rule__MultiplicativeExpression__ParamsAssignment_1_2 )
+            // InternalExpression.g:4039:1: ( ( rule__MultiplicativeExpression__ParamsAssignment_1_2 ) )
+            // InternalExpression.g:4040:1: ( rule__MultiplicativeExpression__ParamsAssignment_1_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMultiplicativeExpressionAccess().getParamsAssignment_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4041:1: ( rule__MultiplicativeExpression__ParamsAssignment_1_2 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4041:2: rule__MultiplicativeExpression__ParamsAssignment_1_2
+            // InternalExpression.g:4041:1: ( rule__MultiplicativeExpression__ParamsAssignment_1_2 )
+            // InternalExpression.g:4041:2: rule__MultiplicativeExpression__ParamsAssignment_1_2
             {
-            pushFollow(FOLLOW_rule__MultiplicativeExpression__ParamsAssignment_1_2_in_rule__MultiplicativeExpression__Group_1__2__Impl8289);
+            pushFollow(FOLLOW_2);
             rule__MultiplicativeExpression__ParamsAssignment_1_2();
 
             state._fsp--;
@@ -11936,21 +11936,21 @@ public final void rule__MultiplicativeExpression__Group_1__2__Impl() throws Reco
 
 
     // $ANTLR start "rule__UnaryExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4057:1: rule__UnaryExpression__Group__0 : rule__UnaryExpression__Group__0__Impl rule__UnaryExpression__Group__1 ;
+    // InternalExpression.g:4057:1: rule__UnaryExpression__Group__0 : rule__UnaryExpression__Group__0__Impl rule__UnaryExpression__Group__1 ;
     public final void rule__UnaryExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4061:1: ( rule__UnaryExpression__Group__0__Impl rule__UnaryExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4062:2: rule__UnaryExpression__Group__0__Impl rule__UnaryExpression__Group__1
+            // InternalExpression.g:4061:1: ( rule__UnaryExpression__Group__0__Impl rule__UnaryExpression__Group__1 )
+            // InternalExpression.g:4062:2: rule__UnaryExpression__Group__0__Impl rule__UnaryExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__UnaryExpression__Group__0__Impl_in_rule__UnaryExpression__Group__08325);
+            pushFollow(FOLLOW_17);
             rule__UnaryExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__UnaryExpression__Group__1_in_rule__UnaryExpression__Group__08328);
+            pushFollow(FOLLOW_2);
             rule__UnaryExpression__Group__1();
 
             state._fsp--;
@@ -11974,25 +11974,25 @@ public final void rule__UnaryExpression__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__UnaryExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4069:1: rule__UnaryExpression__Group__0__Impl : ( ( rule__UnaryExpression__NameAssignment_0 ) ) ;
+    // InternalExpression.g:4069:1: rule__UnaryExpression__Group__0__Impl : ( ( rule__UnaryExpression__NameAssignment_0 ) ) ;
     public final void rule__UnaryExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4073:1: ( ( ( rule__UnaryExpression__NameAssignment_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4074:1: ( ( rule__UnaryExpression__NameAssignment_0 ) )
+            // InternalExpression.g:4073:1: ( ( ( rule__UnaryExpression__NameAssignment_0 ) ) )
+            // InternalExpression.g:4074:1: ( ( rule__UnaryExpression__NameAssignment_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4074:1: ( ( rule__UnaryExpression__NameAssignment_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4075:1: ( rule__UnaryExpression__NameAssignment_0 )
+            // InternalExpression.g:4074:1: ( ( rule__UnaryExpression__NameAssignment_0 ) )
+            // InternalExpression.g:4075:1: ( rule__UnaryExpression__NameAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getUnaryExpressionAccess().getNameAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4076:1: ( rule__UnaryExpression__NameAssignment_0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4076:2: rule__UnaryExpression__NameAssignment_0
+            // InternalExpression.g:4076:1: ( rule__UnaryExpression__NameAssignment_0 )
+            // InternalExpression.g:4076:2: rule__UnaryExpression__NameAssignment_0
             {
-            pushFollow(FOLLOW_rule__UnaryExpression__NameAssignment_0_in_rule__UnaryExpression__Group__0__Impl8355);
+            pushFollow(FOLLOW_2);
             rule__UnaryExpression__NameAssignment_0();
 
             state._fsp--;
@@ -12025,16 +12025,16 @@ public final void rule__UnaryExpression__Group__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__UnaryExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4086:1: rule__UnaryExpression__Group__1 : rule__UnaryExpression__Group__1__Impl ;
+    // InternalExpression.g:4086:1: rule__UnaryExpression__Group__1 : rule__UnaryExpression__Group__1__Impl ;
     public final void rule__UnaryExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4090:1: ( rule__UnaryExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4091:2: rule__UnaryExpression__Group__1__Impl
+            // InternalExpression.g:4090:1: ( rule__UnaryExpression__Group__1__Impl )
+            // InternalExpression.g:4091:2: rule__UnaryExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__UnaryExpression__Group__1__Impl_in_rule__UnaryExpression__Group__18385);
+            pushFollow(FOLLOW_2);
             rule__UnaryExpression__Group__1__Impl();
 
             state._fsp--;
@@ -12058,25 +12058,25 @@ public final void rule__UnaryExpression__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__UnaryExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4097:1: rule__UnaryExpression__Group__1__Impl : ( ( rule__UnaryExpression__ParamsAssignment_1 ) ) ;
+    // InternalExpression.g:4097:1: rule__UnaryExpression__Group__1__Impl : ( ( rule__UnaryExpression__ParamsAssignment_1 ) ) ;
     public final void rule__UnaryExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4101:1: ( ( ( rule__UnaryExpression__ParamsAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4102:1: ( ( rule__UnaryExpression__ParamsAssignment_1 ) )
+            // InternalExpression.g:4101:1: ( ( ( rule__UnaryExpression__ParamsAssignment_1 ) ) )
+            // InternalExpression.g:4102:1: ( ( rule__UnaryExpression__ParamsAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4102:1: ( ( rule__UnaryExpression__ParamsAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4103:1: ( rule__UnaryExpression__ParamsAssignment_1 )
+            // InternalExpression.g:4102:1: ( ( rule__UnaryExpression__ParamsAssignment_1 ) )
+            // InternalExpression.g:4103:1: ( rule__UnaryExpression__ParamsAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getUnaryExpressionAccess().getParamsAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4104:1: ( rule__UnaryExpression__ParamsAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4104:2: rule__UnaryExpression__ParamsAssignment_1
+            // InternalExpression.g:4104:1: ( rule__UnaryExpression__ParamsAssignment_1 )
+            // InternalExpression.g:4104:2: rule__UnaryExpression__ParamsAssignment_1
             {
-            pushFollow(FOLLOW_rule__UnaryExpression__ParamsAssignment_1_in_rule__UnaryExpression__Group__1__Impl8412);
+            pushFollow(FOLLOW_2);
             rule__UnaryExpression__ParamsAssignment_1();
 
             state._fsp--;
@@ -12109,21 +12109,21 @@ public final void rule__UnaryExpression__Group__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__InfixExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4118:1: rule__InfixExpression__Group__0 : rule__InfixExpression__Group__0__Impl rule__InfixExpression__Group__1 ;
+    // InternalExpression.g:4118:1: rule__InfixExpression__Group__0 : rule__InfixExpression__Group__0__Impl rule__InfixExpression__Group__1 ;
     public final void rule__InfixExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4122:1: ( rule__InfixExpression__Group__0__Impl rule__InfixExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4123:2: rule__InfixExpression__Group__0__Impl rule__InfixExpression__Group__1
+            // InternalExpression.g:4122:1: ( rule__InfixExpression__Group__0__Impl rule__InfixExpression__Group__1 )
+            // InternalExpression.g:4123:2: rule__InfixExpression__Group__0__Impl rule__InfixExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group__0__Impl_in_rule__InfixExpression__Group__08446);
+            pushFollow(FOLLOW_31);
             rule__InfixExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group__1_in_rule__InfixExpression__Group__08449);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group__1();
 
             state._fsp--;
@@ -12147,22 +12147,22 @@ public final void rule__InfixExpression__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__InfixExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4130:1: rule__InfixExpression__Group__0__Impl : ( rulePrimaryExpression ) ;
+    // InternalExpression.g:4130:1: rule__InfixExpression__Group__0__Impl : ( rulePrimaryExpression ) ;
     public final void rule__InfixExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4134:1: ( ( rulePrimaryExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4135:1: ( rulePrimaryExpression )
+            // InternalExpression.g:4134:1: ( ( rulePrimaryExpression ) )
+            // InternalExpression.g:4135:1: ( rulePrimaryExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4135:1: ( rulePrimaryExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4136:1: rulePrimaryExpression
+            // InternalExpression.g:4135:1: ( rulePrimaryExpression )
+            // InternalExpression.g:4136:1: rulePrimaryExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getPrimaryExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_rulePrimaryExpression_in_rule__InfixExpression__Group__0__Impl8476);
+            pushFollow(FOLLOW_2);
             rulePrimaryExpression();
 
             state._fsp--;
@@ -12192,16 +12192,16 @@ public final void rule__InfixExpression__Group__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__InfixExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4147:1: rule__InfixExpression__Group__1 : rule__InfixExpression__Group__1__Impl ;
+    // InternalExpression.g:4147:1: rule__InfixExpression__Group__1 : rule__InfixExpression__Group__1__Impl ;
     public final void rule__InfixExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4151:1: ( rule__InfixExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4152:2: rule__InfixExpression__Group__1__Impl
+            // InternalExpression.g:4151:1: ( rule__InfixExpression__Group__1__Impl )
+            // InternalExpression.g:4152:2: rule__InfixExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group__1__Impl_in_rule__InfixExpression__Group__18505);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group__1__Impl();
 
             state._fsp--;
@@ -12225,22 +12225,22 @@ public final void rule__InfixExpression__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__InfixExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4158:1: rule__InfixExpression__Group__1__Impl : ( ( rule__InfixExpression__Alternatives_1 )* ) ;
+    // InternalExpression.g:4158:1: rule__InfixExpression__Group__1__Impl : ( ( rule__InfixExpression__Alternatives_1 )* ) ;
     public final void rule__InfixExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4162:1: ( ( ( rule__InfixExpression__Alternatives_1 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4163:1: ( ( rule__InfixExpression__Alternatives_1 )* )
+            // InternalExpression.g:4162:1: ( ( ( rule__InfixExpression__Alternatives_1 )* ) )
+            // InternalExpression.g:4163:1: ( ( rule__InfixExpression__Alternatives_1 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4163:1: ( ( rule__InfixExpression__Alternatives_1 )* )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4164:1: ( rule__InfixExpression__Alternatives_1 )*
+            // InternalExpression.g:4163:1: ( ( rule__InfixExpression__Alternatives_1 )* )
+            // InternalExpression.g:4164:1: ( rule__InfixExpression__Alternatives_1 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getAlternatives_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4165:1: ( rule__InfixExpression__Alternatives_1 )*
+            // InternalExpression.g:4165:1: ( rule__InfixExpression__Alternatives_1 )*
             loop28:
             do {
                 int alt28=2;
@@ -12253,9 +12253,9 @@ public final void rule__InfixExpression__Group__1__Impl() throws RecognitionExce
 
                 switch (alt28) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4165:2: rule__InfixExpression__Alternatives_1
+            	    // InternalExpression.g:4165:2: rule__InfixExpression__Alternatives_1
             	    {
-            	    pushFollow(FOLLOW_rule__InfixExpression__Alternatives_1_in_rule__InfixExpression__Group__1__Impl8532);
+            	    pushFollow(FOLLOW_32);
             	    rule__InfixExpression__Alternatives_1();
 
             	    state._fsp--;
@@ -12294,21 +12294,21 @@ public final void rule__InfixExpression__Group__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4179:1: rule__InfixExpression__Group_1_0__0 : rule__InfixExpression__Group_1_0__0__Impl rule__InfixExpression__Group_1_0__1 ;
+    // InternalExpression.g:4179:1: rule__InfixExpression__Group_1_0__0 : rule__InfixExpression__Group_1_0__0__Impl rule__InfixExpression__Group_1_0__1 ;
     public final void rule__InfixExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4183:1: ( rule__InfixExpression__Group_1_0__0__Impl rule__InfixExpression__Group_1_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4184:2: rule__InfixExpression__Group_1_0__0__Impl rule__InfixExpression__Group_1_0__1
+            // InternalExpression.g:4183:1: ( rule__InfixExpression__Group_1_0__0__Impl rule__InfixExpression__Group_1_0__1 )
+            // InternalExpression.g:4184:2: rule__InfixExpression__Group_1_0__0__Impl rule__InfixExpression__Group_1_0__1
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0__0__Impl_in_rule__InfixExpression__Group_1_0__08567);
+            pushFollow(FOLLOW_31);
             rule__InfixExpression__Group_1_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0__1_in_rule__InfixExpression__Group_1_0__08570);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_0__1();
 
             state._fsp--;
@@ -12332,23 +12332,23 @@ public final void rule__InfixExpression__Group_1_0__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4191:1: rule__InfixExpression__Group_1_0__0__Impl : ( () ) ;
+    // InternalExpression.g:4191:1: rule__InfixExpression__Group_1_0__0__Impl : ( () ) ;
     public final void rule__InfixExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4195:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4196:1: ( () )
+            // InternalExpression.g:4195:1: ( ( () ) )
+            // InternalExpression.g:4196:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4196:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4197:1: ()
+            // InternalExpression.g:4196:1: ( () )
+            // InternalExpression.g:4197:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getOperationCallTargetAction_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4198:1: ()
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4200:1: 
+            // InternalExpression.g:4198:1: ()
+            // InternalExpression.g:4200:1: 
             {
             }
 
@@ -12373,21 +12373,21 @@ public final void rule__InfixExpression__Group_1_0__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4210:1: rule__InfixExpression__Group_1_0__1 : rule__InfixExpression__Group_1_0__1__Impl rule__InfixExpression__Group_1_0__2 ;
+    // InternalExpression.g:4210:1: rule__InfixExpression__Group_1_0__1 : rule__InfixExpression__Group_1_0__1__Impl rule__InfixExpression__Group_1_0__2 ;
     public final void rule__InfixExpression__Group_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4214:1: ( rule__InfixExpression__Group_1_0__1__Impl rule__InfixExpression__Group_1_0__2 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4215:2: rule__InfixExpression__Group_1_0__1__Impl rule__InfixExpression__Group_1_0__2
+            // InternalExpression.g:4214:1: ( rule__InfixExpression__Group_1_0__1__Impl rule__InfixExpression__Group_1_0__2 )
+            // InternalExpression.g:4215:2: rule__InfixExpression__Group_1_0__1__Impl rule__InfixExpression__Group_1_0__2
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0__1__Impl_in_rule__InfixExpression__Group_1_0__18628);
+            pushFollow(FOLLOW_3);
             rule__InfixExpression__Group_1_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0__2_in_rule__InfixExpression__Group_1_0__18631);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_0__2();
 
             state._fsp--;
@@ -12411,22 +12411,22 @@ public final void rule__InfixExpression__Group_1_0__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4222:1: rule__InfixExpression__Group_1_0__1__Impl : ( '.' ) ;
+    // InternalExpression.g:4222:1: rule__InfixExpression__Group_1_0__1__Impl : ( '.' ) ;
     public final void rule__InfixExpression__Group_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4226:1: ( ( '.' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4227:1: ( '.' )
+            // InternalExpression.g:4226:1: ( ( '.' ) )
+            // InternalExpression.g:4227:1: ( '.' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4227:1: ( '.' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4228:1: '.'
+            // InternalExpression.g:4227:1: ( '.' )
+            // InternalExpression.g:4228:1: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getFullStopKeyword_1_0_1()); 
             }
-            match(input,51,FOLLOW_51_in_rule__InfixExpression__Group_1_0__1__Impl8659); if (state.failed) return ;
+            match(input,51,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInfixExpressionAccess().getFullStopKeyword_1_0_1()); 
             }
@@ -12452,21 +12452,21 @@ public final void rule__InfixExpression__Group_1_0__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0__2"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4241:1: rule__InfixExpression__Group_1_0__2 : rule__InfixExpression__Group_1_0__2__Impl rule__InfixExpression__Group_1_0__3 ;
+    // InternalExpression.g:4241:1: rule__InfixExpression__Group_1_0__2 : rule__InfixExpression__Group_1_0__2__Impl rule__InfixExpression__Group_1_0__3 ;
     public final void rule__InfixExpression__Group_1_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4245:1: ( rule__InfixExpression__Group_1_0__2__Impl rule__InfixExpression__Group_1_0__3 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4246:2: rule__InfixExpression__Group_1_0__2__Impl rule__InfixExpression__Group_1_0__3
+            // InternalExpression.g:4245:1: ( rule__InfixExpression__Group_1_0__2__Impl rule__InfixExpression__Group_1_0__3 )
+            // InternalExpression.g:4246:2: rule__InfixExpression__Group_1_0__2__Impl rule__InfixExpression__Group_1_0__3
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0__2__Impl_in_rule__InfixExpression__Group_1_0__28690);
+            pushFollow(FOLLOW_33);
             rule__InfixExpression__Group_1_0__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0__3_in_rule__InfixExpression__Group_1_0__28693);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_0__3();
 
             state._fsp--;
@@ -12490,25 +12490,25 @@ public final void rule__InfixExpression__Group_1_0__2() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4253:1: rule__InfixExpression__Group_1_0__2__Impl : ( ( rule__InfixExpression__NameAssignment_1_0_2 ) ) ;
+    // InternalExpression.g:4253:1: rule__InfixExpression__Group_1_0__2__Impl : ( ( rule__InfixExpression__NameAssignment_1_0_2 ) ) ;
     public final void rule__InfixExpression__Group_1_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4257:1: ( ( ( rule__InfixExpression__NameAssignment_1_0_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4258:1: ( ( rule__InfixExpression__NameAssignment_1_0_2 ) )
+            // InternalExpression.g:4257:1: ( ( ( rule__InfixExpression__NameAssignment_1_0_2 ) ) )
+            // InternalExpression.g:4258:1: ( ( rule__InfixExpression__NameAssignment_1_0_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4258:1: ( ( rule__InfixExpression__NameAssignment_1_0_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4259:1: ( rule__InfixExpression__NameAssignment_1_0_2 )
+            // InternalExpression.g:4258:1: ( ( rule__InfixExpression__NameAssignment_1_0_2 ) )
+            // InternalExpression.g:4259:1: ( rule__InfixExpression__NameAssignment_1_0_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getNameAssignment_1_0_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4260:1: ( rule__InfixExpression__NameAssignment_1_0_2 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4260:2: rule__InfixExpression__NameAssignment_1_0_2
+            // InternalExpression.g:4260:1: ( rule__InfixExpression__NameAssignment_1_0_2 )
+            // InternalExpression.g:4260:2: rule__InfixExpression__NameAssignment_1_0_2
             {
-            pushFollow(FOLLOW_rule__InfixExpression__NameAssignment_1_0_2_in_rule__InfixExpression__Group_1_0__2__Impl8720);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__NameAssignment_1_0_2();
 
             state._fsp--;
@@ -12541,21 +12541,21 @@ public final void rule__InfixExpression__Group_1_0__2__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0__3"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4270:1: rule__InfixExpression__Group_1_0__3 : rule__InfixExpression__Group_1_0__3__Impl rule__InfixExpression__Group_1_0__4 ;
+    // InternalExpression.g:4270:1: rule__InfixExpression__Group_1_0__3 : rule__InfixExpression__Group_1_0__3__Impl rule__InfixExpression__Group_1_0__4 ;
     public final void rule__InfixExpression__Group_1_0__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4274:1: ( rule__InfixExpression__Group_1_0__3__Impl rule__InfixExpression__Group_1_0__4 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4275:2: rule__InfixExpression__Group_1_0__3__Impl rule__InfixExpression__Group_1_0__4
+            // InternalExpression.g:4274:1: ( rule__InfixExpression__Group_1_0__3__Impl rule__InfixExpression__Group_1_0__4 )
+            // InternalExpression.g:4275:2: rule__InfixExpression__Group_1_0__3__Impl rule__InfixExpression__Group_1_0__4
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0__3__Impl_in_rule__InfixExpression__Group_1_0__38750);
+            pushFollow(FOLLOW_34);
             rule__InfixExpression__Group_1_0__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0__4_in_rule__InfixExpression__Group_1_0__38753);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_0__4();
 
             state._fsp--;
@@ -12579,22 +12579,22 @@ public final void rule__InfixExpression__Group_1_0__3() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4282:1: rule__InfixExpression__Group_1_0__3__Impl : ( '(' ) ;
+    // InternalExpression.g:4282:1: rule__InfixExpression__Group_1_0__3__Impl : ( '(' ) ;
     public final void rule__InfixExpression__Group_1_0__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4286:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4287:1: ( '(' )
+            // InternalExpression.g:4286:1: ( ( '(' ) )
+            // InternalExpression.g:4287:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4287:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4288:1: '('
+            // InternalExpression.g:4287:1: ( '(' )
+            // InternalExpression.g:4288:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getLeftParenthesisKeyword_1_0_3()); 
             }
-            match(input,39,FOLLOW_39_in_rule__InfixExpression__Group_1_0__3__Impl8781); if (state.failed) return ;
+            match(input,39,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInfixExpressionAccess().getLeftParenthesisKeyword_1_0_3()); 
             }
@@ -12620,21 +12620,21 @@ public final void rule__InfixExpression__Group_1_0__3__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0__4"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4301:1: rule__InfixExpression__Group_1_0__4 : rule__InfixExpression__Group_1_0__4__Impl rule__InfixExpression__Group_1_0__5 ;
+    // InternalExpression.g:4301:1: rule__InfixExpression__Group_1_0__4 : rule__InfixExpression__Group_1_0__4__Impl rule__InfixExpression__Group_1_0__5 ;
     public final void rule__InfixExpression__Group_1_0__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4305:1: ( rule__InfixExpression__Group_1_0__4__Impl rule__InfixExpression__Group_1_0__5 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4306:2: rule__InfixExpression__Group_1_0__4__Impl rule__InfixExpression__Group_1_0__5
+            // InternalExpression.g:4305:1: ( rule__InfixExpression__Group_1_0__4__Impl rule__InfixExpression__Group_1_0__5 )
+            // InternalExpression.g:4306:2: rule__InfixExpression__Group_1_0__4__Impl rule__InfixExpression__Group_1_0__5
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0__4__Impl_in_rule__InfixExpression__Group_1_0__48812);
+            pushFollow(FOLLOW_34);
             rule__InfixExpression__Group_1_0__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0__5_in_rule__InfixExpression__Group_1_0__48815);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_0__5();
 
             state._fsp--;
@@ -12658,22 +12658,22 @@ public final void rule__InfixExpression__Group_1_0__4() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4313:1: rule__InfixExpression__Group_1_0__4__Impl : ( ( rule__InfixExpression__Group_1_0_4__0 )? ) ;
+    // InternalExpression.g:4313:1: rule__InfixExpression__Group_1_0__4__Impl : ( ( rule__InfixExpression__Group_1_0_4__0 )? ) ;
     public final void rule__InfixExpression__Group_1_0__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4317:1: ( ( ( rule__InfixExpression__Group_1_0_4__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4318:1: ( ( rule__InfixExpression__Group_1_0_4__0 )? )
+            // InternalExpression.g:4317:1: ( ( ( rule__InfixExpression__Group_1_0_4__0 )? ) )
+            // InternalExpression.g:4318:1: ( ( rule__InfixExpression__Group_1_0_4__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4318:1: ( ( rule__InfixExpression__Group_1_0_4__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4319:1: ( rule__InfixExpression__Group_1_0_4__0 )?
+            // InternalExpression.g:4318:1: ( ( rule__InfixExpression__Group_1_0_4__0 )? )
+            // InternalExpression.g:4319:1: ( rule__InfixExpression__Group_1_0_4__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getGroup_1_0_4()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4320:1: ( rule__InfixExpression__Group_1_0_4__0 )?
+            // InternalExpression.g:4320:1: ( rule__InfixExpression__Group_1_0_4__0 )?
             int alt29=2;
             int LA29_0 = input.LA(1);
 
@@ -12682,9 +12682,9 @@ public final void rule__InfixExpression__Group_1_0__4__Impl() throws Recognition
             }
             switch (alt29) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4320:2: rule__InfixExpression__Group_1_0_4__0
+                    // InternalExpression.g:4320:2: rule__InfixExpression__Group_1_0_4__0
                     {
-                    pushFollow(FOLLOW_rule__InfixExpression__Group_1_0_4__0_in_rule__InfixExpression__Group_1_0__4__Impl8842);
+                    pushFollow(FOLLOW_2);
                     rule__InfixExpression__Group_1_0_4__0();
 
                     state._fsp--;
@@ -12720,16 +12720,16 @@ public final void rule__InfixExpression__Group_1_0__4__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0__5"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4330:1: rule__InfixExpression__Group_1_0__5 : rule__InfixExpression__Group_1_0__5__Impl ;
+    // InternalExpression.g:4330:1: rule__InfixExpression__Group_1_0__5 : rule__InfixExpression__Group_1_0__5__Impl ;
     public final void rule__InfixExpression__Group_1_0__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4334:1: ( rule__InfixExpression__Group_1_0__5__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4335:2: rule__InfixExpression__Group_1_0__5__Impl
+            // InternalExpression.g:4334:1: ( rule__InfixExpression__Group_1_0__5__Impl )
+            // InternalExpression.g:4335:2: rule__InfixExpression__Group_1_0__5__Impl
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0__5__Impl_in_rule__InfixExpression__Group_1_0__58873);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_0__5__Impl();
 
             state._fsp--;
@@ -12753,22 +12753,22 @@ public final void rule__InfixExpression__Group_1_0__5() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0__5__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4341:1: rule__InfixExpression__Group_1_0__5__Impl : ( ')' ) ;
+    // InternalExpression.g:4341:1: rule__InfixExpression__Group_1_0__5__Impl : ( ')' ) ;
     public final void rule__InfixExpression__Group_1_0__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4345:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4346:1: ( ')' )
+            // InternalExpression.g:4345:1: ( ( ')' ) )
+            // InternalExpression.g:4346:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4346:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4347:1: ')'
+            // InternalExpression.g:4346:1: ( ')' )
+            // InternalExpression.g:4347:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getRightParenthesisKeyword_1_0_5()); 
             }
-            match(input,40,FOLLOW_40_in_rule__InfixExpression__Group_1_0__5__Impl8901); if (state.failed) return ;
+            match(input,40,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInfixExpressionAccess().getRightParenthesisKeyword_1_0_5()); 
             }
@@ -12794,21 +12794,21 @@ public final void rule__InfixExpression__Group_1_0__5__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0_4__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4372:1: rule__InfixExpression__Group_1_0_4__0 : rule__InfixExpression__Group_1_0_4__0__Impl rule__InfixExpression__Group_1_0_4__1 ;
+    // InternalExpression.g:4372:1: rule__InfixExpression__Group_1_0_4__0 : rule__InfixExpression__Group_1_0_4__0__Impl rule__InfixExpression__Group_1_0_4__1 ;
     public final void rule__InfixExpression__Group_1_0_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4376:1: ( rule__InfixExpression__Group_1_0_4__0__Impl rule__InfixExpression__Group_1_0_4__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4377:2: rule__InfixExpression__Group_1_0_4__0__Impl rule__InfixExpression__Group_1_0_4__1
+            // InternalExpression.g:4376:1: ( rule__InfixExpression__Group_1_0_4__0__Impl rule__InfixExpression__Group_1_0_4__1 )
+            // InternalExpression.g:4377:2: rule__InfixExpression__Group_1_0_4__0__Impl rule__InfixExpression__Group_1_0_4__1
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0_4__0__Impl_in_rule__InfixExpression__Group_1_0_4__08944);
+            pushFollow(FOLLOW_35);
             rule__InfixExpression__Group_1_0_4__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0_4__1_in_rule__InfixExpression__Group_1_0_4__08947);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_0_4__1();
 
             state._fsp--;
@@ -12832,25 +12832,25 @@ public final void rule__InfixExpression__Group_1_0_4__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0_4__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4384:1: rule__InfixExpression__Group_1_0_4__0__Impl : ( ( rule__InfixExpression__ParamsAssignment_1_0_4_0 ) ) ;
+    // InternalExpression.g:4384:1: rule__InfixExpression__Group_1_0_4__0__Impl : ( ( rule__InfixExpression__ParamsAssignment_1_0_4_0 ) ) ;
     public final void rule__InfixExpression__Group_1_0_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4388:1: ( ( ( rule__InfixExpression__ParamsAssignment_1_0_4_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4389:1: ( ( rule__InfixExpression__ParamsAssignment_1_0_4_0 ) )
+            // InternalExpression.g:4388:1: ( ( ( rule__InfixExpression__ParamsAssignment_1_0_4_0 ) ) )
+            // InternalExpression.g:4389:1: ( ( rule__InfixExpression__ParamsAssignment_1_0_4_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4389:1: ( ( rule__InfixExpression__ParamsAssignment_1_0_4_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4390:1: ( rule__InfixExpression__ParamsAssignment_1_0_4_0 )
+            // InternalExpression.g:4389:1: ( ( rule__InfixExpression__ParamsAssignment_1_0_4_0 ) )
+            // InternalExpression.g:4390:1: ( rule__InfixExpression__ParamsAssignment_1_0_4_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getParamsAssignment_1_0_4_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4391:1: ( rule__InfixExpression__ParamsAssignment_1_0_4_0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4391:2: rule__InfixExpression__ParamsAssignment_1_0_4_0
+            // InternalExpression.g:4391:1: ( rule__InfixExpression__ParamsAssignment_1_0_4_0 )
+            // InternalExpression.g:4391:2: rule__InfixExpression__ParamsAssignment_1_0_4_0
             {
-            pushFollow(FOLLOW_rule__InfixExpression__ParamsAssignment_1_0_4_0_in_rule__InfixExpression__Group_1_0_4__0__Impl8974);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__ParamsAssignment_1_0_4_0();
 
             state._fsp--;
@@ -12883,16 +12883,16 @@ public final void rule__InfixExpression__Group_1_0_4__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0_4__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4401:1: rule__InfixExpression__Group_1_0_4__1 : rule__InfixExpression__Group_1_0_4__1__Impl ;
+    // InternalExpression.g:4401:1: rule__InfixExpression__Group_1_0_4__1 : rule__InfixExpression__Group_1_0_4__1__Impl ;
     public final void rule__InfixExpression__Group_1_0_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4405:1: ( rule__InfixExpression__Group_1_0_4__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4406:2: rule__InfixExpression__Group_1_0_4__1__Impl
+            // InternalExpression.g:4405:1: ( rule__InfixExpression__Group_1_0_4__1__Impl )
+            // InternalExpression.g:4406:2: rule__InfixExpression__Group_1_0_4__1__Impl
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0_4__1__Impl_in_rule__InfixExpression__Group_1_0_4__19004);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_0_4__1__Impl();
 
             state._fsp--;
@@ -12916,22 +12916,22 @@ public final void rule__InfixExpression__Group_1_0_4__1() throws RecognitionExce
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0_4__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4412:1: rule__InfixExpression__Group_1_0_4__1__Impl : ( ( rule__InfixExpression__Group_1_0_4_1__0 )* ) ;
+    // InternalExpression.g:4412:1: rule__InfixExpression__Group_1_0_4__1__Impl : ( ( rule__InfixExpression__Group_1_0_4_1__0 )* ) ;
     public final void rule__InfixExpression__Group_1_0_4__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4416:1: ( ( ( rule__InfixExpression__Group_1_0_4_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4417:1: ( ( rule__InfixExpression__Group_1_0_4_1__0 )* )
+            // InternalExpression.g:4416:1: ( ( ( rule__InfixExpression__Group_1_0_4_1__0 )* ) )
+            // InternalExpression.g:4417:1: ( ( rule__InfixExpression__Group_1_0_4_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4417:1: ( ( rule__InfixExpression__Group_1_0_4_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4418:1: ( rule__InfixExpression__Group_1_0_4_1__0 )*
+            // InternalExpression.g:4417:1: ( ( rule__InfixExpression__Group_1_0_4_1__0 )* )
+            // InternalExpression.g:4418:1: ( rule__InfixExpression__Group_1_0_4_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getGroup_1_0_4_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4419:1: ( rule__InfixExpression__Group_1_0_4_1__0 )*
+            // InternalExpression.g:4419:1: ( rule__InfixExpression__Group_1_0_4_1__0 )*
             loop30:
             do {
                 int alt30=2;
@@ -12944,9 +12944,9 @@ public final void rule__InfixExpression__Group_1_0_4__1__Impl() throws Recogniti
 
                 switch (alt30) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4419:2: rule__InfixExpression__Group_1_0_4_1__0
+            	    // InternalExpression.g:4419:2: rule__InfixExpression__Group_1_0_4_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__InfixExpression__Group_1_0_4_1__0_in_rule__InfixExpression__Group_1_0_4__1__Impl9031);
+            	    pushFollow(FOLLOW_36);
             	    rule__InfixExpression__Group_1_0_4_1__0();
 
             	    state._fsp--;
@@ -12985,21 +12985,21 @@ public final void rule__InfixExpression__Group_1_0_4__1__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0_4_1__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4433:1: rule__InfixExpression__Group_1_0_4_1__0 : rule__InfixExpression__Group_1_0_4_1__0__Impl rule__InfixExpression__Group_1_0_4_1__1 ;
+    // InternalExpression.g:4433:1: rule__InfixExpression__Group_1_0_4_1__0 : rule__InfixExpression__Group_1_0_4_1__0__Impl rule__InfixExpression__Group_1_0_4_1__1 ;
     public final void rule__InfixExpression__Group_1_0_4_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4437:1: ( rule__InfixExpression__Group_1_0_4_1__0__Impl rule__InfixExpression__Group_1_0_4_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4438:2: rule__InfixExpression__Group_1_0_4_1__0__Impl rule__InfixExpression__Group_1_0_4_1__1
+            // InternalExpression.g:4437:1: ( rule__InfixExpression__Group_1_0_4_1__0__Impl rule__InfixExpression__Group_1_0_4_1__1 )
+            // InternalExpression.g:4438:2: rule__InfixExpression__Group_1_0_4_1__0__Impl rule__InfixExpression__Group_1_0_4_1__1
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0_4_1__0__Impl_in_rule__InfixExpression__Group_1_0_4_1__09066);
+            pushFollow(FOLLOW_5);
             rule__InfixExpression__Group_1_0_4_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0_4_1__1_in_rule__InfixExpression__Group_1_0_4_1__09069);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_0_4_1__1();
 
             state._fsp--;
@@ -13023,22 +13023,22 @@ public final void rule__InfixExpression__Group_1_0_4_1__0() throws RecognitionEx
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0_4_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4445:1: rule__InfixExpression__Group_1_0_4_1__0__Impl : ( ',' ) ;
+    // InternalExpression.g:4445:1: rule__InfixExpression__Group_1_0_4_1__0__Impl : ( ',' ) ;
     public final void rule__InfixExpression__Group_1_0_4_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4449:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4450:1: ( ',' )
+            // InternalExpression.g:4449:1: ( ( ',' ) )
+            // InternalExpression.g:4450:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4450:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4451:1: ','
+            // InternalExpression.g:4450:1: ( ',' )
+            // InternalExpression.g:4451:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getCommaKeyword_1_0_4_1_0()); 
             }
-            match(input,52,FOLLOW_52_in_rule__InfixExpression__Group_1_0_4_1__0__Impl9097); if (state.failed) return ;
+            match(input,52,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInfixExpressionAccess().getCommaKeyword_1_0_4_1_0()); 
             }
@@ -13064,16 +13064,16 @@ public final void rule__InfixExpression__Group_1_0_4_1__0__Impl() throws Recogni
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0_4_1__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4464:1: rule__InfixExpression__Group_1_0_4_1__1 : rule__InfixExpression__Group_1_0_4_1__1__Impl ;
+    // InternalExpression.g:4464:1: rule__InfixExpression__Group_1_0_4_1__1 : rule__InfixExpression__Group_1_0_4_1__1__Impl ;
     public final void rule__InfixExpression__Group_1_0_4_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4468:1: ( rule__InfixExpression__Group_1_0_4_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4469:2: rule__InfixExpression__Group_1_0_4_1__1__Impl
+            // InternalExpression.g:4468:1: ( rule__InfixExpression__Group_1_0_4_1__1__Impl )
+            // InternalExpression.g:4469:2: rule__InfixExpression__Group_1_0_4_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0_4_1__1__Impl_in_rule__InfixExpression__Group_1_0_4_1__19128);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_0_4_1__1__Impl();
 
             state._fsp--;
@@ -13097,25 +13097,25 @@ public final void rule__InfixExpression__Group_1_0_4_1__1() throws RecognitionEx
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0_4_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4475:1: rule__InfixExpression__Group_1_0_4_1__1__Impl : ( ( rule__InfixExpression__ParamsAssignment_1_0_4_1_1 ) ) ;
+    // InternalExpression.g:4475:1: rule__InfixExpression__Group_1_0_4_1__1__Impl : ( ( rule__InfixExpression__ParamsAssignment_1_0_4_1_1 ) ) ;
     public final void rule__InfixExpression__Group_1_0_4_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4479:1: ( ( ( rule__InfixExpression__ParamsAssignment_1_0_4_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4480:1: ( ( rule__InfixExpression__ParamsAssignment_1_0_4_1_1 ) )
+            // InternalExpression.g:4479:1: ( ( ( rule__InfixExpression__ParamsAssignment_1_0_4_1_1 ) ) )
+            // InternalExpression.g:4480:1: ( ( rule__InfixExpression__ParamsAssignment_1_0_4_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4480:1: ( ( rule__InfixExpression__ParamsAssignment_1_0_4_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4481:1: ( rule__InfixExpression__ParamsAssignment_1_0_4_1_1 )
+            // InternalExpression.g:4480:1: ( ( rule__InfixExpression__ParamsAssignment_1_0_4_1_1 ) )
+            // InternalExpression.g:4481:1: ( rule__InfixExpression__ParamsAssignment_1_0_4_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getParamsAssignment_1_0_4_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4482:1: ( rule__InfixExpression__ParamsAssignment_1_0_4_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4482:2: rule__InfixExpression__ParamsAssignment_1_0_4_1_1
+            // InternalExpression.g:4482:1: ( rule__InfixExpression__ParamsAssignment_1_0_4_1_1 )
+            // InternalExpression.g:4482:2: rule__InfixExpression__ParamsAssignment_1_0_4_1_1
             {
-            pushFollow(FOLLOW_rule__InfixExpression__ParamsAssignment_1_0_4_1_1_in_rule__InfixExpression__Group_1_0_4_1__1__Impl9155);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__ParamsAssignment_1_0_4_1_1();
 
             state._fsp--;
@@ -13148,21 +13148,21 @@ public final void rule__InfixExpression__Group_1_0_4_1__1__Impl() throws Recogni
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_1__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4496:1: rule__InfixExpression__Group_1_1__0 : rule__InfixExpression__Group_1_1__0__Impl rule__InfixExpression__Group_1_1__1 ;
+    // InternalExpression.g:4496:1: rule__InfixExpression__Group_1_1__0 : rule__InfixExpression__Group_1_1__0__Impl rule__InfixExpression__Group_1_1__1 ;
     public final void rule__InfixExpression__Group_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4500:1: ( rule__InfixExpression__Group_1_1__0__Impl rule__InfixExpression__Group_1_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4501:2: rule__InfixExpression__Group_1_1__0__Impl rule__InfixExpression__Group_1_1__1
+            // InternalExpression.g:4500:1: ( rule__InfixExpression__Group_1_1__0__Impl rule__InfixExpression__Group_1_1__1 )
+            // InternalExpression.g:4501:2: rule__InfixExpression__Group_1_1__0__Impl rule__InfixExpression__Group_1_1__1
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_1__0__Impl_in_rule__InfixExpression__Group_1_1__09189);
+            pushFollow(FOLLOW_31);
             rule__InfixExpression__Group_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_1__1_in_rule__InfixExpression__Group_1_1__09192);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_1__1();
 
             state._fsp--;
@@ -13186,23 +13186,23 @@ public final void rule__InfixExpression__Group_1_1__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4508:1: rule__InfixExpression__Group_1_1__0__Impl : ( () ) ;
+    // InternalExpression.g:4508:1: rule__InfixExpression__Group_1_1__0__Impl : ( () ) ;
     public final void rule__InfixExpression__Group_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4512:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4513:1: ( () )
+            // InternalExpression.g:4512:1: ( ( () ) )
+            // InternalExpression.g:4513:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4513:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4514:1: ()
+            // InternalExpression.g:4513:1: ( () )
+            // InternalExpression.g:4514:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getFeatureCallTargetAction_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4515:1: ()
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4517:1: 
+            // InternalExpression.g:4515:1: ()
+            // InternalExpression.g:4517:1: 
             {
             }
 
@@ -13227,21 +13227,21 @@ public final void rule__InfixExpression__Group_1_1__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_1__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4527:1: rule__InfixExpression__Group_1_1__1 : rule__InfixExpression__Group_1_1__1__Impl rule__InfixExpression__Group_1_1__2 ;
+    // InternalExpression.g:4527:1: rule__InfixExpression__Group_1_1__1 : rule__InfixExpression__Group_1_1__1__Impl rule__InfixExpression__Group_1_1__2 ;
     public final void rule__InfixExpression__Group_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4531:1: ( rule__InfixExpression__Group_1_1__1__Impl rule__InfixExpression__Group_1_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4532:2: rule__InfixExpression__Group_1_1__1__Impl rule__InfixExpression__Group_1_1__2
+            // InternalExpression.g:4531:1: ( rule__InfixExpression__Group_1_1__1__Impl rule__InfixExpression__Group_1_1__2 )
+            // InternalExpression.g:4532:2: rule__InfixExpression__Group_1_1__1__Impl rule__InfixExpression__Group_1_1__2
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_1__1__Impl_in_rule__InfixExpression__Group_1_1__19250);
+            pushFollow(FOLLOW_7);
             rule__InfixExpression__Group_1_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_1__2_in_rule__InfixExpression__Group_1_1__19253);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_1__2();
 
             state._fsp--;
@@ -13265,22 +13265,22 @@ public final void rule__InfixExpression__Group_1_1__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4539:1: rule__InfixExpression__Group_1_1__1__Impl : ( '.' ) ;
+    // InternalExpression.g:4539:1: rule__InfixExpression__Group_1_1__1__Impl : ( '.' ) ;
     public final void rule__InfixExpression__Group_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4543:1: ( ( '.' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4544:1: ( '.' )
+            // InternalExpression.g:4543:1: ( ( '.' ) )
+            // InternalExpression.g:4544:1: ( '.' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4544:1: ( '.' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4545:1: '.'
+            // InternalExpression.g:4544:1: ( '.' )
+            // InternalExpression.g:4545:1: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getFullStopKeyword_1_1_1()); 
             }
-            match(input,51,FOLLOW_51_in_rule__InfixExpression__Group_1_1__1__Impl9281); if (state.failed) return ;
+            match(input,51,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInfixExpressionAccess().getFullStopKeyword_1_1_1()); 
             }
@@ -13306,16 +13306,16 @@ public final void rule__InfixExpression__Group_1_1__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_1__2"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4558:1: rule__InfixExpression__Group_1_1__2 : rule__InfixExpression__Group_1_1__2__Impl ;
+    // InternalExpression.g:4558:1: rule__InfixExpression__Group_1_1__2 : rule__InfixExpression__Group_1_1__2__Impl ;
     public final void rule__InfixExpression__Group_1_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4562:1: ( rule__InfixExpression__Group_1_1__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4563:2: rule__InfixExpression__Group_1_1__2__Impl
+            // InternalExpression.g:4562:1: ( rule__InfixExpression__Group_1_1__2__Impl )
+            // InternalExpression.g:4563:2: rule__InfixExpression__Group_1_1__2__Impl
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_1__2__Impl_in_rule__InfixExpression__Group_1_1__29312);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_1__2__Impl();
 
             state._fsp--;
@@ -13339,25 +13339,25 @@ public final void rule__InfixExpression__Group_1_1__2() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4569:1: rule__InfixExpression__Group_1_1__2__Impl : ( ( rule__InfixExpression__TypeAssignment_1_1_2 ) ) ;
+    // InternalExpression.g:4569:1: rule__InfixExpression__Group_1_1__2__Impl : ( ( rule__InfixExpression__TypeAssignment_1_1_2 ) ) ;
     public final void rule__InfixExpression__Group_1_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4573:1: ( ( ( rule__InfixExpression__TypeAssignment_1_1_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4574:1: ( ( rule__InfixExpression__TypeAssignment_1_1_2 ) )
+            // InternalExpression.g:4573:1: ( ( ( rule__InfixExpression__TypeAssignment_1_1_2 ) ) )
+            // InternalExpression.g:4574:1: ( ( rule__InfixExpression__TypeAssignment_1_1_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4574:1: ( ( rule__InfixExpression__TypeAssignment_1_1_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4575:1: ( rule__InfixExpression__TypeAssignment_1_1_2 )
+            // InternalExpression.g:4574:1: ( ( rule__InfixExpression__TypeAssignment_1_1_2 ) )
+            // InternalExpression.g:4575:1: ( rule__InfixExpression__TypeAssignment_1_1_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getTypeAssignment_1_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4576:1: ( rule__InfixExpression__TypeAssignment_1_1_2 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4576:2: rule__InfixExpression__TypeAssignment_1_1_2
+            // InternalExpression.g:4576:1: ( rule__InfixExpression__TypeAssignment_1_1_2 )
+            // InternalExpression.g:4576:2: rule__InfixExpression__TypeAssignment_1_1_2
             {
-            pushFollow(FOLLOW_rule__InfixExpression__TypeAssignment_1_1_2_in_rule__InfixExpression__Group_1_1__2__Impl9339);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__TypeAssignment_1_1_2();
 
             state._fsp--;
@@ -13390,21 +13390,21 @@ public final void rule__InfixExpression__Group_1_1__2__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_2__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4592:1: rule__InfixExpression__Group_1_2__0 : rule__InfixExpression__Group_1_2__0__Impl rule__InfixExpression__Group_1_2__1 ;
+    // InternalExpression.g:4592:1: rule__InfixExpression__Group_1_2__0 : rule__InfixExpression__Group_1_2__0__Impl rule__InfixExpression__Group_1_2__1 ;
     public final void rule__InfixExpression__Group_1_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4596:1: ( rule__InfixExpression__Group_1_2__0__Impl rule__InfixExpression__Group_1_2__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4597:2: rule__InfixExpression__Group_1_2__0__Impl rule__InfixExpression__Group_1_2__1
+            // InternalExpression.g:4596:1: ( rule__InfixExpression__Group_1_2__0__Impl rule__InfixExpression__Group_1_2__1 )
+            // InternalExpression.g:4597:2: rule__InfixExpression__Group_1_2__0__Impl rule__InfixExpression__Group_1_2__1
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_2__0__Impl_in_rule__InfixExpression__Group_1_2__09375);
+            pushFollow(FOLLOW_31);
             rule__InfixExpression__Group_1_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_2__1_in_rule__InfixExpression__Group_1_2__09378);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_2__1();
 
             state._fsp--;
@@ -13428,23 +13428,23 @@ public final void rule__InfixExpression__Group_1_2__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_2__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4604:1: rule__InfixExpression__Group_1_2__0__Impl : ( () ) ;
+    // InternalExpression.g:4604:1: rule__InfixExpression__Group_1_2__0__Impl : ( () ) ;
     public final void rule__InfixExpression__Group_1_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4608:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4609:1: ( () )
+            // InternalExpression.g:4608:1: ( ( () ) )
+            // InternalExpression.g:4609:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4609:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4610:1: ()
+            // InternalExpression.g:4609:1: ( () )
+            // InternalExpression.g:4610:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getTypeSelectExpressionTargetAction_1_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4611:1: ()
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4613:1: 
+            // InternalExpression.g:4611:1: ()
+            // InternalExpression.g:4613:1: 
             {
             }
 
@@ -13469,21 +13469,21 @@ public final void rule__InfixExpression__Group_1_2__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_2__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4623:1: rule__InfixExpression__Group_1_2__1 : rule__InfixExpression__Group_1_2__1__Impl rule__InfixExpression__Group_1_2__2 ;
+    // InternalExpression.g:4623:1: rule__InfixExpression__Group_1_2__1 : rule__InfixExpression__Group_1_2__1__Impl rule__InfixExpression__Group_1_2__2 ;
     public final void rule__InfixExpression__Group_1_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4627:1: ( rule__InfixExpression__Group_1_2__1__Impl rule__InfixExpression__Group_1_2__2 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4628:2: rule__InfixExpression__Group_1_2__1__Impl rule__InfixExpression__Group_1_2__2
+            // InternalExpression.g:4627:1: ( rule__InfixExpression__Group_1_2__1__Impl rule__InfixExpression__Group_1_2__2 )
+            // InternalExpression.g:4628:2: rule__InfixExpression__Group_1_2__1__Impl rule__InfixExpression__Group_1_2__2
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_2__1__Impl_in_rule__InfixExpression__Group_1_2__19436);
+            pushFollow(FOLLOW_37);
             rule__InfixExpression__Group_1_2__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_2__2_in_rule__InfixExpression__Group_1_2__19439);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_2__2();
 
             state._fsp--;
@@ -13507,22 +13507,22 @@ public final void rule__InfixExpression__Group_1_2__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_2__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4635:1: rule__InfixExpression__Group_1_2__1__Impl : ( '.' ) ;
+    // InternalExpression.g:4635:1: rule__InfixExpression__Group_1_2__1__Impl : ( '.' ) ;
     public final void rule__InfixExpression__Group_1_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4639:1: ( ( '.' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4640:1: ( '.' )
+            // InternalExpression.g:4639:1: ( ( '.' ) )
+            // InternalExpression.g:4640:1: ( '.' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4640:1: ( '.' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4641:1: '.'
+            // InternalExpression.g:4640:1: ( '.' )
+            // InternalExpression.g:4641:1: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getFullStopKeyword_1_2_1()); 
             }
-            match(input,51,FOLLOW_51_in_rule__InfixExpression__Group_1_2__1__Impl9467); if (state.failed) return ;
+            match(input,51,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInfixExpressionAccess().getFullStopKeyword_1_2_1()); 
             }
@@ -13548,21 +13548,21 @@ public final void rule__InfixExpression__Group_1_2__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_2__2"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4654:1: rule__InfixExpression__Group_1_2__2 : rule__InfixExpression__Group_1_2__2__Impl rule__InfixExpression__Group_1_2__3 ;
+    // InternalExpression.g:4654:1: rule__InfixExpression__Group_1_2__2 : rule__InfixExpression__Group_1_2__2__Impl rule__InfixExpression__Group_1_2__3 ;
     public final void rule__InfixExpression__Group_1_2__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4658:1: ( rule__InfixExpression__Group_1_2__2__Impl rule__InfixExpression__Group_1_2__3 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4659:2: rule__InfixExpression__Group_1_2__2__Impl rule__InfixExpression__Group_1_2__3
+            // InternalExpression.g:4658:1: ( rule__InfixExpression__Group_1_2__2__Impl rule__InfixExpression__Group_1_2__3 )
+            // InternalExpression.g:4659:2: rule__InfixExpression__Group_1_2__2__Impl rule__InfixExpression__Group_1_2__3
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_2__2__Impl_in_rule__InfixExpression__Group_1_2__29498);
+            pushFollow(FOLLOW_33);
             rule__InfixExpression__Group_1_2__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_2__3_in_rule__InfixExpression__Group_1_2__29501);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_2__3();
 
             state._fsp--;
@@ -13586,25 +13586,25 @@ public final void rule__InfixExpression__Group_1_2__2() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_2__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4666:1: rule__InfixExpression__Group_1_2__2__Impl : ( ( rule__InfixExpression__NameAssignment_1_2_2 ) ) ;
+    // InternalExpression.g:4666:1: rule__InfixExpression__Group_1_2__2__Impl : ( ( rule__InfixExpression__NameAssignment_1_2_2 ) ) ;
     public final void rule__InfixExpression__Group_1_2__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4670:1: ( ( ( rule__InfixExpression__NameAssignment_1_2_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4671:1: ( ( rule__InfixExpression__NameAssignment_1_2_2 ) )
+            // InternalExpression.g:4670:1: ( ( ( rule__InfixExpression__NameAssignment_1_2_2 ) ) )
+            // InternalExpression.g:4671:1: ( ( rule__InfixExpression__NameAssignment_1_2_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4671:1: ( ( rule__InfixExpression__NameAssignment_1_2_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4672:1: ( rule__InfixExpression__NameAssignment_1_2_2 )
+            // InternalExpression.g:4671:1: ( ( rule__InfixExpression__NameAssignment_1_2_2 ) )
+            // InternalExpression.g:4672:1: ( rule__InfixExpression__NameAssignment_1_2_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getNameAssignment_1_2_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4673:1: ( rule__InfixExpression__NameAssignment_1_2_2 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4673:2: rule__InfixExpression__NameAssignment_1_2_2
+            // InternalExpression.g:4673:1: ( rule__InfixExpression__NameAssignment_1_2_2 )
+            // InternalExpression.g:4673:2: rule__InfixExpression__NameAssignment_1_2_2
             {
-            pushFollow(FOLLOW_rule__InfixExpression__NameAssignment_1_2_2_in_rule__InfixExpression__Group_1_2__2__Impl9528);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__NameAssignment_1_2_2();
 
             state._fsp--;
@@ -13637,21 +13637,21 @@ public final void rule__InfixExpression__Group_1_2__2__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_2__3"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4683:1: rule__InfixExpression__Group_1_2__3 : rule__InfixExpression__Group_1_2__3__Impl rule__InfixExpression__Group_1_2__4 ;
+    // InternalExpression.g:4683:1: rule__InfixExpression__Group_1_2__3 : rule__InfixExpression__Group_1_2__3__Impl rule__InfixExpression__Group_1_2__4 ;
     public final void rule__InfixExpression__Group_1_2__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4687:1: ( rule__InfixExpression__Group_1_2__3__Impl rule__InfixExpression__Group_1_2__4 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4688:2: rule__InfixExpression__Group_1_2__3__Impl rule__InfixExpression__Group_1_2__4
+            // InternalExpression.g:4687:1: ( rule__InfixExpression__Group_1_2__3__Impl rule__InfixExpression__Group_1_2__4 )
+            // InternalExpression.g:4688:2: rule__InfixExpression__Group_1_2__3__Impl rule__InfixExpression__Group_1_2__4
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_2__3__Impl_in_rule__InfixExpression__Group_1_2__39558);
+            pushFollow(FOLLOW_7);
             rule__InfixExpression__Group_1_2__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_2__4_in_rule__InfixExpression__Group_1_2__39561);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_2__4();
 
             state._fsp--;
@@ -13675,22 +13675,22 @@ public final void rule__InfixExpression__Group_1_2__3() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_2__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4695:1: rule__InfixExpression__Group_1_2__3__Impl : ( '(' ) ;
+    // InternalExpression.g:4695:1: rule__InfixExpression__Group_1_2__3__Impl : ( '(' ) ;
     public final void rule__InfixExpression__Group_1_2__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4699:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4700:1: ( '(' )
+            // InternalExpression.g:4699:1: ( ( '(' ) )
+            // InternalExpression.g:4700:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4700:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4701:1: '('
+            // InternalExpression.g:4700:1: ( '(' )
+            // InternalExpression.g:4701:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getLeftParenthesisKeyword_1_2_3()); 
             }
-            match(input,39,FOLLOW_39_in_rule__InfixExpression__Group_1_2__3__Impl9589); if (state.failed) return ;
+            match(input,39,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInfixExpressionAccess().getLeftParenthesisKeyword_1_2_3()); 
             }
@@ -13716,21 +13716,21 @@ public final void rule__InfixExpression__Group_1_2__3__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_2__4"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4714:1: rule__InfixExpression__Group_1_2__4 : rule__InfixExpression__Group_1_2__4__Impl rule__InfixExpression__Group_1_2__5 ;
+    // InternalExpression.g:4714:1: rule__InfixExpression__Group_1_2__4 : rule__InfixExpression__Group_1_2__4__Impl rule__InfixExpression__Group_1_2__5 ;
     public final void rule__InfixExpression__Group_1_2__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4718:1: ( rule__InfixExpression__Group_1_2__4__Impl rule__InfixExpression__Group_1_2__5 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4719:2: rule__InfixExpression__Group_1_2__4__Impl rule__InfixExpression__Group_1_2__5
+            // InternalExpression.g:4718:1: ( rule__InfixExpression__Group_1_2__4__Impl rule__InfixExpression__Group_1_2__5 )
+            // InternalExpression.g:4719:2: rule__InfixExpression__Group_1_2__4__Impl rule__InfixExpression__Group_1_2__5
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_2__4__Impl_in_rule__InfixExpression__Group_1_2__49620);
+            pushFollow(FOLLOW_8);
             rule__InfixExpression__Group_1_2__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_2__5_in_rule__InfixExpression__Group_1_2__49623);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_2__5();
 
             state._fsp--;
@@ -13754,25 +13754,25 @@ public final void rule__InfixExpression__Group_1_2__4() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_2__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4726:1: rule__InfixExpression__Group_1_2__4__Impl : ( ( rule__InfixExpression__TypeAssignment_1_2_4 ) ) ;
+    // InternalExpression.g:4726:1: rule__InfixExpression__Group_1_2__4__Impl : ( ( rule__InfixExpression__TypeAssignment_1_2_4 ) ) ;
     public final void rule__InfixExpression__Group_1_2__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4730:1: ( ( ( rule__InfixExpression__TypeAssignment_1_2_4 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4731:1: ( ( rule__InfixExpression__TypeAssignment_1_2_4 ) )
+            // InternalExpression.g:4730:1: ( ( ( rule__InfixExpression__TypeAssignment_1_2_4 ) ) )
+            // InternalExpression.g:4731:1: ( ( rule__InfixExpression__TypeAssignment_1_2_4 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4731:1: ( ( rule__InfixExpression__TypeAssignment_1_2_4 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4732:1: ( rule__InfixExpression__TypeAssignment_1_2_4 )
+            // InternalExpression.g:4731:1: ( ( rule__InfixExpression__TypeAssignment_1_2_4 ) )
+            // InternalExpression.g:4732:1: ( rule__InfixExpression__TypeAssignment_1_2_4 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getTypeAssignment_1_2_4()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4733:1: ( rule__InfixExpression__TypeAssignment_1_2_4 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4733:2: rule__InfixExpression__TypeAssignment_1_2_4
+            // InternalExpression.g:4733:1: ( rule__InfixExpression__TypeAssignment_1_2_4 )
+            // InternalExpression.g:4733:2: rule__InfixExpression__TypeAssignment_1_2_4
             {
-            pushFollow(FOLLOW_rule__InfixExpression__TypeAssignment_1_2_4_in_rule__InfixExpression__Group_1_2__4__Impl9650);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__TypeAssignment_1_2_4();
 
             state._fsp--;
@@ -13805,16 +13805,16 @@ public final void rule__InfixExpression__Group_1_2__4__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_2__5"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4743:1: rule__InfixExpression__Group_1_2__5 : rule__InfixExpression__Group_1_2__5__Impl ;
+    // InternalExpression.g:4743:1: rule__InfixExpression__Group_1_2__5 : rule__InfixExpression__Group_1_2__5__Impl ;
     public final void rule__InfixExpression__Group_1_2__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4747:1: ( rule__InfixExpression__Group_1_2__5__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4748:2: rule__InfixExpression__Group_1_2__5__Impl
+            // InternalExpression.g:4747:1: ( rule__InfixExpression__Group_1_2__5__Impl )
+            // InternalExpression.g:4748:2: rule__InfixExpression__Group_1_2__5__Impl
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_2__5__Impl_in_rule__InfixExpression__Group_1_2__59680);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_2__5__Impl();
 
             state._fsp--;
@@ -13838,22 +13838,22 @@ public final void rule__InfixExpression__Group_1_2__5() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_2__5__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4754:1: rule__InfixExpression__Group_1_2__5__Impl : ( ')' ) ;
+    // InternalExpression.g:4754:1: rule__InfixExpression__Group_1_2__5__Impl : ( ')' ) ;
     public final void rule__InfixExpression__Group_1_2__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4758:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4759:1: ( ')' )
+            // InternalExpression.g:4758:1: ( ( ')' ) )
+            // InternalExpression.g:4759:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4759:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4760:1: ')'
+            // InternalExpression.g:4759:1: ( ')' )
+            // InternalExpression.g:4760:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getRightParenthesisKeyword_1_2_5()); 
             }
-            match(input,40,FOLLOW_40_in_rule__InfixExpression__Group_1_2__5__Impl9708); if (state.failed) return ;
+            match(input,40,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInfixExpressionAccess().getRightParenthesisKeyword_1_2_5()); 
             }
@@ -13879,21 +13879,21 @@ public final void rule__InfixExpression__Group_1_2__5__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4785:1: rule__InfixExpression__Group_1_3__0 : rule__InfixExpression__Group_1_3__0__Impl rule__InfixExpression__Group_1_3__1 ;
+    // InternalExpression.g:4785:1: rule__InfixExpression__Group_1_3__0 : rule__InfixExpression__Group_1_3__0__Impl rule__InfixExpression__Group_1_3__1 ;
     public final void rule__InfixExpression__Group_1_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4789:1: ( rule__InfixExpression__Group_1_3__0__Impl rule__InfixExpression__Group_1_3__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4790:2: rule__InfixExpression__Group_1_3__0__Impl rule__InfixExpression__Group_1_3__1
+            // InternalExpression.g:4789:1: ( rule__InfixExpression__Group_1_3__0__Impl rule__InfixExpression__Group_1_3__1 )
+            // InternalExpression.g:4790:2: rule__InfixExpression__Group_1_3__0__Impl rule__InfixExpression__Group_1_3__1
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3__0__Impl_in_rule__InfixExpression__Group_1_3__09751);
+            pushFollow(FOLLOW_31);
             rule__InfixExpression__Group_1_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3__1_in_rule__InfixExpression__Group_1_3__09754);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_3__1();
 
             state._fsp--;
@@ -13917,23 +13917,23 @@ public final void rule__InfixExpression__Group_1_3__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4797:1: rule__InfixExpression__Group_1_3__0__Impl : ( () ) ;
+    // InternalExpression.g:4797:1: rule__InfixExpression__Group_1_3__0__Impl : ( () ) ;
     public final void rule__InfixExpression__Group_1_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4801:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4802:1: ( () )
+            // InternalExpression.g:4801:1: ( ( () ) )
+            // InternalExpression.g:4802:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4802:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4803:1: ()
+            // InternalExpression.g:4802:1: ( () )
+            // InternalExpression.g:4803:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getCollectionExpressionTargetAction_1_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4804:1: ()
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4806:1: 
+            // InternalExpression.g:4804:1: ()
+            // InternalExpression.g:4806:1: 
             {
             }
 
@@ -13958,21 +13958,21 @@ public final void rule__InfixExpression__Group_1_3__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4816:1: rule__InfixExpression__Group_1_3__1 : rule__InfixExpression__Group_1_3__1__Impl rule__InfixExpression__Group_1_3__2 ;
+    // InternalExpression.g:4816:1: rule__InfixExpression__Group_1_3__1 : rule__InfixExpression__Group_1_3__1__Impl rule__InfixExpression__Group_1_3__2 ;
     public final void rule__InfixExpression__Group_1_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4820:1: ( rule__InfixExpression__Group_1_3__1__Impl rule__InfixExpression__Group_1_3__2 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4821:2: rule__InfixExpression__Group_1_3__1__Impl rule__InfixExpression__Group_1_3__2
+            // InternalExpression.g:4820:1: ( rule__InfixExpression__Group_1_3__1__Impl rule__InfixExpression__Group_1_3__2 )
+            // InternalExpression.g:4821:2: rule__InfixExpression__Group_1_3__1__Impl rule__InfixExpression__Group_1_3__2
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3__1__Impl_in_rule__InfixExpression__Group_1_3__19812);
+            pushFollow(FOLLOW_38);
             rule__InfixExpression__Group_1_3__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3__2_in_rule__InfixExpression__Group_1_3__19815);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_3__2();
 
             state._fsp--;
@@ -13996,22 +13996,22 @@ public final void rule__InfixExpression__Group_1_3__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4828:1: rule__InfixExpression__Group_1_3__1__Impl : ( '.' ) ;
+    // InternalExpression.g:4828:1: rule__InfixExpression__Group_1_3__1__Impl : ( '.' ) ;
     public final void rule__InfixExpression__Group_1_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4832:1: ( ( '.' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4833:1: ( '.' )
+            // InternalExpression.g:4832:1: ( ( '.' ) )
+            // InternalExpression.g:4833:1: ( '.' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4833:1: ( '.' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4834:1: '.'
+            // InternalExpression.g:4833:1: ( '.' )
+            // InternalExpression.g:4834:1: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getFullStopKeyword_1_3_1()); 
             }
-            match(input,51,FOLLOW_51_in_rule__InfixExpression__Group_1_3__1__Impl9843); if (state.failed) return ;
+            match(input,51,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInfixExpressionAccess().getFullStopKeyword_1_3_1()); 
             }
@@ -14037,21 +14037,21 @@ public final void rule__InfixExpression__Group_1_3__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3__2"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4847:1: rule__InfixExpression__Group_1_3__2 : rule__InfixExpression__Group_1_3__2__Impl rule__InfixExpression__Group_1_3__3 ;
+    // InternalExpression.g:4847:1: rule__InfixExpression__Group_1_3__2 : rule__InfixExpression__Group_1_3__2__Impl rule__InfixExpression__Group_1_3__3 ;
     public final void rule__InfixExpression__Group_1_3__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4851:1: ( rule__InfixExpression__Group_1_3__2__Impl rule__InfixExpression__Group_1_3__3 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4852:2: rule__InfixExpression__Group_1_3__2__Impl rule__InfixExpression__Group_1_3__3
+            // InternalExpression.g:4851:1: ( rule__InfixExpression__Group_1_3__2__Impl rule__InfixExpression__Group_1_3__3 )
+            // InternalExpression.g:4852:2: rule__InfixExpression__Group_1_3__2__Impl rule__InfixExpression__Group_1_3__3
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3__2__Impl_in_rule__InfixExpression__Group_1_3__29874);
+            pushFollow(FOLLOW_33);
             rule__InfixExpression__Group_1_3__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3__3_in_rule__InfixExpression__Group_1_3__29877);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_3__3();
 
             state._fsp--;
@@ -14075,25 +14075,25 @@ public final void rule__InfixExpression__Group_1_3__2() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4859:1: rule__InfixExpression__Group_1_3__2__Impl : ( ( rule__InfixExpression__NameAssignment_1_3_2 ) ) ;
+    // InternalExpression.g:4859:1: rule__InfixExpression__Group_1_3__2__Impl : ( ( rule__InfixExpression__NameAssignment_1_3_2 ) ) ;
     public final void rule__InfixExpression__Group_1_3__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4863:1: ( ( ( rule__InfixExpression__NameAssignment_1_3_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4864:1: ( ( rule__InfixExpression__NameAssignment_1_3_2 ) )
+            // InternalExpression.g:4863:1: ( ( ( rule__InfixExpression__NameAssignment_1_3_2 ) ) )
+            // InternalExpression.g:4864:1: ( ( rule__InfixExpression__NameAssignment_1_3_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4864:1: ( ( rule__InfixExpression__NameAssignment_1_3_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4865:1: ( rule__InfixExpression__NameAssignment_1_3_2 )
+            // InternalExpression.g:4864:1: ( ( rule__InfixExpression__NameAssignment_1_3_2 ) )
+            // InternalExpression.g:4865:1: ( rule__InfixExpression__NameAssignment_1_3_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getNameAssignment_1_3_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4866:1: ( rule__InfixExpression__NameAssignment_1_3_2 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4866:2: rule__InfixExpression__NameAssignment_1_3_2
+            // InternalExpression.g:4866:1: ( rule__InfixExpression__NameAssignment_1_3_2 )
+            // InternalExpression.g:4866:2: rule__InfixExpression__NameAssignment_1_3_2
             {
-            pushFollow(FOLLOW_rule__InfixExpression__NameAssignment_1_3_2_in_rule__InfixExpression__Group_1_3__2__Impl9904);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__NameAssignment_1_3_2();
 
             state._fsp--;
@@ -14126,21 +14126,21 @@ public final void rule__InfixExpression__Group_1_3__2__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3__3"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4876:1: rule__InfixExpression__Group_1_3__3 : rule__InfixExpression__Group_1_3__3__Impl rule__InfixExpression__Group_1_3__4 ;
+    // InternalExpression.g:4876:1: rule__InfixExpression__Group_1_3__3 : rule__InfixExpression__Group_1_3__3__Impl rule__InfixExpression__Group_1_3__4 ;
     public final void rule__InfixExpression__Group_1_3__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4880:1: ( rule__InfixExpression__Group_1_3__3__Impl rule__InfixExpression__Group_1_3__4 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4881:2: rule__InfixExpression__Group_1_3__3__Impl rule__InfixExpression__Group_1_3__4
+            // InternalExpression.g:4880:1: ( rule__InfixExpression__Group_1_3__3__Impl rule__InfixExpression__Group_1_3__4 )
+            // InternalExpression.g:4881:2: rule__InfixExpression__Group_1_3__3__Impl rule__InfixExpression__Group_1_3__4
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3__3__Impl_in_rule__InfixExpression__Group_1_3__39934);
+            pushFollow(FOLLOW_5);
             rule__InfixExpression__Group_1_3__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3__4_in_rule__InfixExpression__Group_1_3__39937);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_3__4();
 
             state._fsp--;
@@ -14164,22 +14164,22 @@ public final void rule__InfixExpression__Group_1_3__3() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4888:1: rule__InfixExpression__Group_1_3__3__Impl : ( '(' ) ;
+    // InternalExpression.g:4888:1: rule__InfixExpression__Group_1_3__3__Impl : ( '(' ) ;
     public final void rule__InfixExpression__Group_1_3__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4892:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4893:1: ( '(' )
+            // InternalExpression.g:4892:1: ( ( '(' ) )
+            // InternalExpression.g:4893:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4893:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4894:1: '('
+            // InternalExpression.g:4893:1: ( '(' )
+            // InternalExpression.g:4894:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getLeftParenthesisKeyword_1_3_3()); 
             }
-            match(input,39,FOLLOW_39_in_rule__InfixExpression__Group_1_3__3__Impl9965); if (state.failed) return ;
+            match(input,39,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInfixExpressionAccess().getLeftParenthesisKeyword_1_3_3()); 
             }
@@ -14205,21 +14205,21 @@ public final void rule__InfixExpression__Group_1_3__3__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3__4"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4907:1: rule__InfixExpression__Group_1_3__4 : rule__InfixExpression__Group_1_3__4__Impl rule__InfixExpression__Group_1_3__5 ;
+    // InternalExpression.g:4907:1: rule__InfixExpression__Group_1_3__4 : rule__InfixExpression__Group_1_3__4__Impl rule__InfixExpression__Group_1_3__5 ;
     public final void rule__InfixExpression__Group_1_3__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4911:1: ( rule__InfixExpression__Group_1_3__4__Impl rule__InfixExpression__Group_1_3__5 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4912:2: rule__InfixExpression__Group_1_3__4__Impl rule__InfixExpression__Group_1_3__5
+            // InternalExpression.g:4911:1: ( rule__InfixExpression__Group_1_3__4__Impl rule__InfixExpression__Group_1_3__5 )
+            // InternalExpression.g:4912:2: rule__InfixExpression__Group_1_3__4__Impl rule__InfixExpression__Group_1_3__5
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3__4__Impl_in_rule__InfixExpression__Group_1_3__49996);
+            pushFollow(FOLLOW_5);
             rule__InfixExpression__Group_1_3__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3__5_in_rule__InfixExpression__Group_1_3__49999);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_3__5();
 
             state._fsp--;
@@ -14243,22 +14243,22 @@ public final void rule__InfixExpression__Group_1_3__4() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4919:1: rule__InfixExpression__Group_1_3__4__Impl : ( ( rule__InfixExpression__Group_1_3_4__0 )? ) ;
+    // InternalExpression.g:4919:1: rule__InfixExpression__Group_1_3__4__Impl : ( ( rule__InfixExpression__Group_1_3_4__0 )? ) ;
     public final void rule__InfixExpression__Group_1_3__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4923:1: ( ( ( rule__InfixExpression__Group_1_3_4__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4924:1: ( ( rule__InfixExpression__Group_1_3_4__0 )? )
+            // InternalExpression.g:4923:1: ( ( ( rule__InfixExpression__Group_1_3_4__0 )? ) )
+            // InternalExpression.g:4924:1: ( ( rule__InfixExpression__Group_1_3_4__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4924:1: ( ( rule__InfixExpression__Group_1_3_4__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4925:1: ( rule__InfixExpression__Group_1_3_4__0 )?
+            // InternalExpression.g:4924:1: ( ( rule__InfixExpression__Group_1_3_4__0 )? )
+            // InternalExpression.g:4925:1: ( rule__InfixExpression__Group_1_3_4__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getGroup_1_3_4()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4926:1: ( rule__InfixExpression__Group_1_3_4__0 )?
+            // InternalExpression.g:4926:1: ( rule__InfixExpression__Group_1_3_4__0 )?
             int alt31=2;
             int LA31_0 = input.LA(1);
 
@@ -14271,9 +14271,9 @@ public final void rule__InfixExpression__Group_1_3__4__Impl() throws Recognition
             }
             switch (alt31) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4926:2: rule__InfixExpression__Group_1_3_4__0
+                    // InternalExpression.g:4926:2: rule__InfixExpression__Group_1_3_4__0
                     {
-                    pushFollow(FOLLOW_rule__InfixExpression__Group_1_3_4__0_in_rule__InfixExpression__Group_1_3__4__Impl10026);
+                    pushFollow(FOLLOW_2);
                     rule__InfixExpression__Group_1_3_4__0();
 
                     state._fsp--;
@@ -14309,21 +14309,21 @@ public final void rule__InfixExpression__Group_1_3__4__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3__5"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4936:1: rule__InfixExpression__Group_1_3__5 : rule__InfixExpression__Group_1_3__5__Impl rule__InfixExpression__Group_1_3__6 ;
+    // InternalExpression.g:4936:1: rule__InfixExpression__Group_1_3__5 : rule__InfixExpression__Group_1_3__5__Impl rule__InfixExpression__Group_1_3__6 ;
     public final void rule__InfixExpression__Group_1_3__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4940:1: ( rule__InfixExpression__Group_1_3__5__Impl rule__InfixExpression__Group_1_3__6 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4941:2: rule__InfixExpression__Group_1_3__5__Impl rule__InfixExpression__Group_1_3__6
+            // InternalExpression.g:4940:1: ( rule__InfixExpression__Group_1_3__5__Impl rule__InfixExpression__Group_1_3__6 )
+            // InternalExpression.g:4941:2: rule__InfixExpression__Group_1_3__5__Impl rule__InfixExpression__Group_1_3__6
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3__5__Impl_in_rule__InfixExpression__Group_1_3__510057);
+            pushFollow(FOLLOW_8);
             rule__InfixExpression__Group_1_3__5__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3__6_in_rule__InfixExpression__Group_1_3__510060);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_3__6();
 
             state._fsp--;
@@ -14347,25 +14347,25 @@ public final void rule__InfixExpression__Group_1_3__5() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3__5__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4948:1: rule__InfixExpression__Group_1_3__5__Impl : ( ( rule__InfixExpression__ExpAssignment_1_3_5 ) ) ;
+    // InternalExpression.g:4948:1: rule__InfixExpression__Group_1_3__5__Impl : ( ( rule__InfixExpression__ExpAssignment_1_3_5 ) ) ;
     public final void rule__InfixExpression__Group_1_3__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4952:1: ( ( ( rule__InfixExpression__ExpAssignment_1_3_5 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4953:1: ( ( rule__InfixExpression__ExpAssignment_1_3_5 ) )
+            // InternalExpression.g:4952:1: ( ( ( rule__InfixExpression__ExpAssignment_1_3_5 ) ) )
+            // InternalExpression.g:4953:1: ( ( rule__InfixExpression__ExpAssignment_1_3_5 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4953:1: ( ( rule__InfixExpression__ExpAssignment_1_3_5 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4954:1: ( rule__InfixExpression__ExpAssignment_1_3_5 )
+            // InternalExpression.g:4953:1: ( ( rule__InfixExpression__ExpAssignment_1_3_5 ) )
+            // InternalExpression.g:4954:1: ( rule__InfixExpression__ExpAssignment_1_3_5 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getExpAssignment_1_3_5()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4955:1: ( rule__InfixExpression__ExpAssignment_1_3_5 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4955:2: rule__InfixExpression__ExpAssignment_1_3_5
+            // InternalExpression.g:4955:1: ( rule__InfixExpression__ExpAssignment_1_3_5 )
+            // InternalExpression.g:4955:2: rule__InfixExpression__ExpAssignment_1_3_5
             {
-            pushFollow(FOLLOW_rule__InfixExpression__ExpAssignment_1_3_5_in_rule__InfixExpression__Group_1_3__5__Impl10087);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__ExpAssignment_1_3_5();
 
             state._fsp--;
@@ -14398,16 +14398,16 @@ public final void rule__InfixExpression__Group_1_3__5__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3__6"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4965:1: rule__InfixExpression__Group_1_3__6 : rule__InfixExpression__Group_1_3__6__Impl ;
+    // InternalExpression.g:4965:1: rule__InfixExpression__Group_1_3__6 : rule__InfixExpression__Group_1_3__6__Impl ;
     public final void rule__InfixExpression__Group_1_3__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4969:1: ( rule__InfixExpression__Group_1_3__6__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4970:2: rule__InfixExpression__Group_1_3__6__Impl
+            // InternalExpression.g:4969:1: ( rule__InfixExpression__Group_1_3__6__Impl )
+            // InternalExpression.g:4970:2: rule__InfixExpression__Group_1_3__6__Impl
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3__6__Impl_in_rule__InfixExpression__Group_1_3__610117);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_3__6__Impl();
 
             state._fsp--;
@@ -14431,22 +14431,22 @@ public final void rule__InfixExpression__Group_1_3__6() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3__6__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4976:1: rule__InfixExpression__Group_1_3__6__Impl : ( ')' ) ;
+    // InternalExpression.g:4976:1: rule__InfixExpression__Group_1_3__6__Impl : ( ')' ) ;
     public final void rule__InfixExpression__Group_1_3__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4980:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4981:1: ( ')' )
+            // InternalExpression.g:4980:1: ( ( ')' ) )
+            // InternalExpression.g:4981:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4981:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:4982:1: ')'
+            // InternalExpression.g:4981:1: ( ')' )
+            // InternalExpression.g:4982:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getRightParenthesisKeyword_1_3_6()); 
             }
-            match(input,40,FOLLOW_40_in_rule__InfixExpression__Group_1_3__6__Impl10145); if (state.failed) return ;
+            match(input,40,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInfixExpressionAccess().getRightParenthesisKeyword_1_3_6()); 
             }
@@ -14472,21 +14472,21 @@ public final void rule__InfixExpression__Group_1_3__6__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3_4__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5009:1: rule__InfixExpression__Group_1_3_4__0 : rule__InfixExpression__Group_1_3_4__0__Impl rule__InfixExpression__Group_1_3_4__1 ;
+    // InternalExpression.g:5009:1: rule__InfixExpression__Group_1_3_4__0 : rule__InfixExpression__Group_1_3_4__0__Impl rule__InfixExpression__Group_1_3_4__1 ;
     public final void rule__InfixExpression__Group_1_3_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5013:1: ( rule__InfixExpression__Group_1_3_4__0__Impl rule__InfixExpression__Group_1_3_4__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5014:2: rule__InfixExpression__Group_1_3_4__0__Impl rule__InfixExpression__Group_1_3_4__1
+            // InternalExpression.g:5013:1: ( rule__InfixExpression__Group_1_3_4__0__Impl rule__InfixExpression__Group_1_3_4__1 )
+            // InternalExpression.g:5014:2: rule__InfixExpression__Group_1_3_4__0__Impl rule__InfixExpression__Group_1_3_4__1
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3_4__0__Impl_in_rule__InfixExpression__Group_1_3_4__010190);
+            pushFollow(FOLLOW_39);
             rule__InfixExpression__Group_1_3_4__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3_4__1_in_rule__InfixExpression__Group_1_3_4__010193);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_3_4__1();
 
             state._fsp--;
@@ -14510,25 +14510,25 @@ public final void rule__InfixExpression__Group_1_3_4__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3_4__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5021:1: rule__InfixExpression__Group_1_3_4__0__Impl : ( ( rule__InfixExpression__VarAssignment_1_3_4_0 ) ) ;
+    // InternalExpression.g:5021:1: rule__InfixExpression__Group_1_3_4__0__Impl : ( ( rule__InfixExpression__VarAssignment_1_3_4_0 ) ) ;
     public final void rule__InfixExpression__Group_1_3_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5025:1: ( ( ( rule__InfixExpression__VarAssignment_1_3_4_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5026:1: ( ( rule__InfixExpression__VarAssignment_1_3_4_0 ) )
+            // InternalExpression.g:5025:1: ( ( ( rule__InfixExpression__VarAssignment_1_3_4_0 ) ) )
+            // InternalExpression.g:5026:1: ( ( rule__InfixExpression__VarAssignment_1_3_4_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5026:1: ( ( rule__InfixExpression__VarAssignment_1_3_4_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5027:1: ( rule__InfixExpression__VarAssignment_1_3_4_0 )
+            // InternalExpression.g:5026:1: ( ( rule__InfixExpression__VarAssignment_1_3_4_0 ) )
+            // InternalExpression.g:5027:1: ( rule__InfixExpression__VarAssignment_1_3_4_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getVarAssignment_1_3_4_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5028:1: ( rule__InfixExpression__VarAssignment_1_3_4_0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5028:2: rule__InfixExpression__VarAssignment_1_3_4_0
+            // InternalExpression.g:5028:1: ( rule__InfixExpression__VarAssignment_1_3_4_0 )
+            // InternalExpression.g:5028:2: rule__InfixExpression__VarAssignment_1_3_4_0
             {
-            pushFollow(FOLLOW_rule__InfixExpression__VarAssignment_1_3_4_0_in_rule__InfixExpression__Group_1_3_4__0__Impl10220);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__VarAssignment_1_3_4_0();
 
             state._fsp--;
@@ -14561,16 +14561,16 @@ public final void rule__InfixExpression__Group_1_3_4__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3_4__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5038:1: rule__InfixExpression__Group_1_3_4__1 : rule__InfixExpression__Group_1_3_4__1__Impl ;
+    // InternalExpression.g:5038:1: rule__InfixExpression__Group_1_3_4__1 : rule__InfixExpression__Group_1_3_4__1__Impl ;
     public final void rule__InfixExpression__Group_1_3_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5042:1: ( rule__InfixExpression__Group_1_3_4__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5043:2: rule__InfixExpression__Group_1_3_4__1__Impl
+            // InternalExpression.g:5042:1: ( rule__InfixExpression__Group_1_3_4__1__Impl )
+            // InternalExpression.g:5043:2: rule__InfixExpression__Group_1_3_4__1__Impl
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3_4__1__Impl_in_rule__InfixExpression__Group_1_3_4__110250);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_3_4__1__Impl();
 
             state._fsp--;
@@ -14594,22 +14594,22 @@ public final void rule__InfixExpression__Group_1_3_4__1() throws RecognitionExce
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3_4__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5049:1: rule__InfixExpression__Group_1_3_4__1__Impl : ( '|' ) ;
+    // InternalExpression.g:5049:1: rule__InfixExpression__Group_1_3_4__1__Impl : ( '|' ) ;
     public final void rule__InfixExpression__Group_1_3_4__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5053:1: ( ( '|' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5054:1: ( '|' )
+            // InternalExpression.g:5053:1: ( ( '|' ) )
+            // InternalExpression.g:5054:1: ( '|' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5054:1: ( '|' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5055:1: '|'
+            // InternalExpression.g:5054:1: ( '|' )
+            // InternalExpression.g:5055:1: '|'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getVerticalLineKeyword_1_3_4_1()); 
             }
-            match(input,53,FOLLOW_53_in_rule__InfixExpression__Group_1_3_4__1__Impl10278); if (state.failed) return ;
+            match(input,53,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInfixExpressionAccess().getVerticalLineKeyword_1_3_4_1()); 
             }
@@ -14635,21 +14635,21 @@ public final void rule__InfixExpression__Group_1_3_4__1__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__ParanthesizedExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5072:1: rule__ParanthesizedExpression__Group__0 : rule__ParanthesizedExpression__Group__0__Impl rule__ParanthesizedExpression__Group__1 ;
+    // InternalExpression.g:5072:1: rule__ParanthesizedExpression__Group__0 : rule__ParanthesizedExpression__Group__0__Impl rule__ParanthesizedExpression__Group__1 ;
     public final void rule__ParanthesizedExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5076:1: ( rule__ParanthesizedExpression__Group__0__Impl rule__ParanthesizedExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5077:2: rule__ParanthesizedExpression__Group__0__Impl rule__ParanthesizedExpression__Group__1
+            // InternalExpression.g:5076:1: ( rule__ParanthesizedExpression__Group__0__Impl rule__ParanthesizedExpression__Group__1 )
+            // InternalExpression.g:5077:2: rule__ParanthesizedExpression__Group__0__Impl rule__ParanthesizedExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__ParanthesizedExpression__Group__0__Impl_in_rule__ParanthesizedExpression__Group__010313);
+            pushFollow(FOLLOW_5);
             rule__ParanthesizedExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ParanthesizedExpression__Group__1_in_rule__ParanthesizedExpression__Group__010316);
+            pushFollow(FOLLOW_2);
             rule__ParanthesizedExpression__Group__1();
 
             state._fsp--;
@@ -14673,22 +14673,22 @@ public final void rule__ParanthesizedExpression__Group__0() throws RecognitionEx
 
 
     // $ANTLR start "rule__ParanthesizedExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5084:1: rule__ParanthesizedExpression__Group__0__Impl : ( '(' ) ;
+    // InternalExpression.g:5084:1: rule__ParanthesizedExpression__Group__0__Impl : ( '(' ) ;
     public final void rule__ParanthesizedExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5088:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5089:1: ( '(' )
+            // InternalExpression.g:5088:1: ( ( '(' ) )
+            // InternalExpression.g:5089:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5089:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5090:1: '('
+            // InternalExpression.g:5089:1: ( '(' )
+            // InternalExpression.g:5090:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getParanthesizedExpressionAccess().getLeftParenthesisKeyword_0()); 
             }
-            match(input,39,FOLLOW_39_in_rule__ParanthesizedExpression__Group__0__Impl10344); if (state.failed) return ;
+            match(input,39,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getParanthesizedExpressionAccess().getLeftParenthesisKeyword_0()); 
             }
@@ -14714,21 +14714,21 @@ public final void rule__ParanthesizedExpression__Group__0__Impl() throws Recogni
 
 
     // $ANTLR start "rule__ParanthesizedExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5103:1: rule__ParanthesizedExpression__Group__1 : rule__ParanthesizedExpression__Group__1__Impl rule__ParanthesizedExpression__Group__2 ;
+    // InternalExpression.g:5103:1: rule__ParanthesizedExpression__Group__1 : rule__ParanthesizedExpression__Group__1__Impl rule__ParanthesizedExpression__Group__2 ;
     public final void rule__ParanthesizedExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5107:1: ( rule__ParanthesizedExpression__Group__1__Impl rule__ParanthesizedExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5108:2: rule__ParanthesizedExpression__Group__1__Impl rule__ParanthesizedExpression__Group__2
+            // InternalExpression.g:5107:1: ( rule__ParanthesizedExpression__Group__1__Impl rule__ParanthesizedExpression__Group__2 )
+            // InternalExpression.g:5108:2: rule__ParanthesizedExpression__Group__1__Impl rule__ParanthesizedExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__ParanthesizedExpression__Group__1__Impl_in_rule__ParanthesizedExpression__Group__110375);
+            pushFollow(FOLLOW_8);
             rule__ParanthesizedExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ParanthesizedExpression__Group__2_in_rule__ParanthesizedExpression__Group__110378);
+            pushFollow(FOLLOW_2);
             rule__ParanthesizedExpression__Group__2();
 
             state._fsp--;
@@ -14752,22 +14752,22 @@ public final void rule__ParanthesizedExpression__Group__1() throws RecognitionEx
 
 
     // $ANTLR start "rule__ParanthesizedExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5115:1: rule__ParanthesizedExpression__Group__1__Impl : ( ruleExpression ) ;
+    // InternalExpression.g:5115:1: rule__ParanthesizedExpression__Group__1__Impl : ( ruleExpression ) ;
     public final void rule__ParanthesizedExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5119:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5120:1: ( ruleExpression )
+            // InternalExpression.g:5119:1: ( ( ruleExpression ) )
+            // InternalExpression.g:5120:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5120:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5121:1: ruleExpression
+            // InternalExpression.g:5120:1: ( ruleExpression )
+            // InternalExpression.g:5121:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getParanthesizedExpressionAccess().getExpressionParserRuleCall_1()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__ParanthesizedExpression__Group__1__Impl10405);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -14797,16 +14797,16 @@ public final void rule__ParanthesizedExpression__Group__1__Impl() throws Recogni
 
 
     // $ANTLR start "rule__ParanthesizedExpression__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5132:1: rule__ParanthesizedExpression__Group__2 : rule__ParanthesizedExpression__Group__2__Impl ;
+    // InternalExpression.g:5132:1: rule__ParanthesizedExpression__Group__2 : rule__ParanthesizedExpression__Group__2__Impl ;
     public final void rule__ParanthesizedExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5136:1: ( rule__ParanthesizedExpression__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5137:2: rule__ParanthesizedExpression__Group__2__Impl
+            // InternalExpression.g:5136:1: ( rule__ParanthesizedExpression__Group__2__Impl )
+            // InternalExpression.g:5137:2: rule__ParanthesizedExpression__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__ParanthesizedExpression__Group__2__Impl_in_rule__ParanthesizedExpression__Group__210434);
+            pushFollow(FOLLOW_2);
             rule__ParanthesizedExpression__Group__2__Impl();
 
             state._fsp--;
@@ -14830,22 +14830,22 @@ public final void rule__ParanthesizedExpression__Group__2() throws RecognitionEx
 
 
     // $ANTLR start "rule__ParanthesizedExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5143:1: rule__ParanthesizedExpression__Group__2__Impl : ( ')' ) ;
+    // InternalExpression.g:5143:1: rule__ParanthesizedExpression__Group__2__Impl : ( ')' ) ;
     public final void rule__ParanthesizedExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5147:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5148:1: ( ')' )
+            // InternalExpression.g:5147:1: ( ( ')' ) )
+            // InternalExpression.g:5148:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5148:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5149:1: ')'
+            // InternalExpression.g:5148:1: ( ')' )
+            // InternalExpression.g:5149:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getParanthesizedExpressionAccess().getRightParenthesisKeyword_2()); 
             }
-            match(input,40,FOLLOW_40_in_rule__ParanthesizedExpression__Group__2__Impl10462); if (state.failed) return ;
+            match(input,40,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getParanthesizedExpressionAccess().getRightParenthesisKeyword_2()); 
             }
@@ -14871,21 +14871,21 @@ public final void rule__ParanthesizedExpression__Group__2__Impl() throws Recogni
 
 
     // $ANTLR start "rule__GlobalVarExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5168:1: rule__GlobalVarExpression__Group__0 : rule__GlobalVarExpression__Group__0__Impl rule__GlobalVarExpression__Group__1 ;
+    // InternalExpression.g:5168:1: rule__GlobalVarExpression__Group__0 : rule__GlobalVarExpression__Group__0__Impl rule__GlobalVarExpression__Group__1 ;
     public final void rule__GlobalVarExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5172:1: ( rule__GlobalVarExpression__Group__0__Impl rule__GlobalVarExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5173:2: rule__GlobalVarExpression__Group__0__Impl rule__GlobalVarExpression__Group__1
+            // InternalExpression.g:5172:1: ( rule__GlobalVarExpression__Group__0__Impl rule__GlobalVarExpression__Group__1 )
+            // InternalExpression.g:5173:2: rule__GlobalVarExpression__Group__0__Impl rule__GlobalVarExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__GlobalVarExpression__Group__0__Impl_in_rule__GlobalVarExpression__Group__010499);
+            pushFollow(FOLLOW_3);
             rule__GlobalVarExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__GlobalVarExpression__Group__1_in_rule__GlobalVarExpression__Group__010502);
+            pushFollow(FOLLOW_2);
             rule__GlobalVarExpression__Group__1();
 
             state._fsp--;
@@ -14909,22 +14909,22 @@ public final void rule__GlobalVarExpression__Group__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__GlobalVarExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5180:1: rule__GlobalVarExpression__Group__0__Impl : ( 'GLOBALVAR' ) ;
+    // InternalExpression.g:5180:1: rule__GlobalVarExpression__Group__0__Impl : ( 'GLOBALVAR' ) ;
     public final void rule__GlobalVarExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5184:1: ( ( 'GLOBALVAR' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5185:1: ( 'GLOBALVAR' )
+            // InternalExpression.g:5184:1: ( ( 'GLOBALVAR' ) )
+            // InternalExpression.g:5185:1: ( 'GLOBALVAR' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5185:1: ( 'GLOBALVAR' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5186:1: 'GLOBALVAR'
+            // InternalExpression.g:5185:1: ( 'GLOBALVAR' )
+            // InternalExpression.g:5186:1: 'GLOBALVAR'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalVarExpressionAccess().getGLOBALVARKeyword_0()); 
             }
-            match(input,54,FOLLOW_54_in_rule__GlobalVarExpression__Group__0__Impl10530); if (state.failed) return ;
+            match(input,54,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGlobalVarExpressionAccess().getGLOBALVARKeyword_0()); 
             }
@@ -14950,16 +14950,16 @@ public final void rule__GlobalVarExpression__Group__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__GlobalVarExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5199:1: rule__GlobalVarExpression__Group__1 : rule__GlobalVarExpression__Group__1__Impl ;
+    // InternalExpression.g:5199:1: rule__GlobalVarExpression__Group__1 : rule__GlobalVarExpression__Group__1__Impl ;
     public final void rule__GlobalVarExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5203:1: ( rule__GlobalVarExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5204:2: rule__GlobalVarExpression__Group__1__Impl
+            // InternalExpression.g:5203:1: ( rule__GlobalVarExpression__Group__1__Impl )
+            // InternalExpression.g:5204:2: rule__GlobalVarExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__GlobalVarExpression__Group__1__Impl_in_rule__GlobalVarExpression__Group__110561);
+            pushFollow(FOLLOW_2);
             rule__GlobalVarExpression__Group__1__Impl();
 
             state._fsp--;
@@ -14983,25 +14983,25 @@ public final void rule__GlobalVarExpression__Group__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__GlobalVarExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5210:1: rule__GlobalVarExpression__Group__1__Impl : ( ( rule__GlobalVarExpression__NameAssignment_1 ) ) ;
+    // InternalExpression.g:5210:1: rule__GlobalVarExpression__Group__1__Impl : ( ( rule__GlobalVarExpression__NameAssignment_1 ) ) ;
     public final void rule__GlobalVarExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5214:1: ( ( ( rule__GlobalVarExpression__NameAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5215:1: ( ( rule__GlobalVarExpression__NameAssignment_1 ) )
+            // InternalExpression.g:5214:1: ( ( ( rule__GlobalVarExpression__NameAssignment_1 ) ) )
+            // InternalExpression.g:5215:1: ( ( rule__GlobalVarExpression__NameAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5215:1: ( ( rule__GlobalVarExpression__NameAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5216:1: ( rule__GlobalVarExpression__NameAssignment_1 )
+            // InternalExpression.g:5215:1: ( ( rule__GlobalVarExpression__NameAssignment_1 ) )
+            // InternalExpression.g:5216:1: ( rule__GlobalVarExpression__NameAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalVarExpressionAccess().getNameAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5217:1: ( rule__GlobalVarExpression__NameAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5217:2: rule__GlobalVarExpression__NameAssignment_1
+            // InternalExpression.g:5217:1: ( rule__GlobalVarExpression__NameAssignment_1 )
+            // InternalExpression.g:5217:2: rule__GlobalVarExpression__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__GlobalVarExpression__NameAssignment_1_in_rule__GlobalVarExpression__Group__1__Impl10588);
+            pushFollow(FOLLOW_2);
             rule__GlobalVarExpression__NameAssignment_1();
 
             state._fsp--;
@@ -15034,21 +15034,21 @@ public final void rule__GlobalVarExpression__Group__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__OperationCall__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5231:1: rule__OperationCall__Group__0 : rule__OperationCall__Group__0__Impl rule__OperationCall__Group__1 ;
+    // InternalExpression.g:5231:1: rule__OperationCall__Group__0 : rule__OperationCall__Group__0__Impl rule__OperationCall__Group__1 ;
     public final void rule__OperationCall__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5235:1: ( rule__OperationCall__Group__0__Impl rule__OperationCall__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5236:2: rule__OperationCall__Group__0__Impl rule__OperationCall__Group__1
+            // InternalExpression.g:5235:1: ( rule__OperationCall__Group__0__Impl rule__OperationCall__Group__1 )
+            // InternalExpression.g:5236:2: rule__OperationCall__Group__0__Impl rule__OperationCall__Group__1
             {
-            pushFollow(FOLLOW_rule__OperationCall__Group__0__Impl_in_rule__OperationCall__Group__010622);
+            pushFollow(FOLLOW_33);
             rule__OperationCall__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OperationCall__Group__1_in_rule__OperationCall__Group__010625);
+            pushFollow(FOLLOW_2);
             rule__OperationCall__Group__1();
 
             state._fsp--;
@@ -15072,25 +15072,25 @@ public final void rule__OperationCall__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__OperationCall__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5243:1: rule__OperationCall__Group__0__Impl : ( ( rule__OperationCall__NameAssignment_0 ) ) ;
+    // InternalExpression.g:5243:1: rule__OperationCall__Group__0__Impl : ( ( rule__OperationCall__NameAssignment_0 ) ) ;
     public final void rule__OperationCall__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5247:1: ( ( ( rule__OperationCall__NameAssignment_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5248:1: ( ( rule__OperationCall__NameAssignment_0 ) )
+            // InternalExpression.g:5247:1: ( ( ( rule__OperationCall__NameAssignment_0 ) ) )
+            // InternalExpression.g:5248:1: ( ( rule__OperationCall__NameAssignment_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5248:1: ( ( rule__OperationCall__NameAssignment_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5249:1: ( rule__OperationCall__NameAssignment_0 )
+            // InternalExpression.g:5248:1: ( ( rule__OperationCall__NameAssignment_0 ) )
+            // InternalExpression.g:5249:1: ( rule__OperationCall__NameAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOperationCallAccess().getNameAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5250:1: ( rule__OperationCall__NameAssignment_0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5250:2: rule__OperationCall__NameAssignment_0
+            // InternalExpression.g:5250:1: ( rule__OperationCall__NameAssignment_0 )
+            // InternalExpression.g:5250:2: rule__OperationCall__NameAssignment_0
             {
-            pushFollow(FOLLOW_rule__OperationCall__NameAssignment_0_in_rule__OperationCall__Group__0__Impl10652);
+            pushFollow(FOLLOW_2);
             rule__OperationCall__NameAssignment_0();
 
             state._fsp--;
@@ -15123,21 +15123,21 @@ public final void rule__OperationCall__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__OperationCall__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5260:1: rule__OperationCall__Group__1 : rule__OperationCall__Group__1__Impl rule__OperationCall__Group__2 ;
+    // InternalExpression.g:5260:1: rule__OperationCall__Group__1 : rule__OperationCall__Group__1__Impl rule__OperationCall__Group__2 ;
     public final void rule__OperationCall__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5264:1: ( rule__OperationCall__Group__1__Impl rule__OperationCall__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5265:2: rule__OperationCall__Group__1__Impl rule__OperationCall__Group__2
+            // InternalExpression.g:5264:1: ( rule__OperationCall__Group__1__Impl rule__OperationCall__Group__2 )
+            // InternalExpression.g:5265:2: rule__OperationCall__Group__1__Impl rule__OperationCall__Group__2
             {
-            pushFollow(FOLLOW_rule__OperationCall__Group__1__Impl_in_rule__OperationCall__Group__110682);
+            pushFollow(FOLLOW_34);
             rule__OperationCall__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OperationCall__Group__2_in_rule__OperationCall__Group__110685);
+            pushFollow(FOLLOW_2);
             rule__OperationCall__Group__2();
 
             state._fsp--;
@@ -15161,22 +15161,22 @@ public final void rule__OperationCall__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__OperationCall__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5272:1: rule__OperationCall__Group__1__Impl : ( '(' ) ;
+    // InternalExpression.g:5272:1: rule__OperationCall__Group__1__Impl : ( '(' ) ;
     public final void rule__OperationCall__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5276:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5277:1: ( '(' )
+            // InternalExpression.g:5276:1: ( ( '(' ) )
+            // InternalExpression.g:5277:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5277:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5278:1: '('
+            // InternalExpression.g:5277:1: ( '(' )
+            // InternalExpression.g:5278:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOperationCallAccess().getLeftParenthesisKeyword_1()); 
             }
-            match(input,39,FOLLOW_39_in_rule__OperationCall__Group__1__Impl10713); if (state.failed) return ;
+            match(input,39,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOperationCallAccess().getLeftParenthesisKeyword_1()); 
             }
@@ -15202,21 +15202,21 @@ public final void rule__OperationCall__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__OperationCall__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5291:1: rule__OperationCall__Group__2 : rule__OperationCall__Group__2__Impl rule__OperationCall__Group__3 ;
+    // InternalExpression.g:5291:1: rule__OperationCall__Group__2 : rule__OperationCall__Group__2__Impl rule__OperationCall__Group__3 ;
     public final void rule__OperationCall__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5295:1: ( rule__OperationCall__Group__2__Impl rule__OperationCall__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5296:2: rule__OperationCall__Group__2__Impl rule__OperationCall__Group__3
+            // InternalExpression.g:5295:1: ( rule__OperationCall__Group__2__Impl rule__OperationCall__Group__3 )
+            // InternalExpression.g:5296:2: rule__OperationCall__Group__2__Impl rule__OperationCall__Group__3
             {
-            pushFollow(FOLLOW_rule__OperationCall__Group__2__Impl_in_rule__OperationCall__Group__210744);
+            pushFollow(FOLLOW_34);
             rule__OperationCall__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OperationCall__Group__3_in_rule__OperationCall__Group__210747);
+            pushFollow(FOLLOW_2);
             rule__OperationCall__Group__3();
 
             state._fsp--;
@@ -15240,22 +15240,22 @@ public final void rule__OperationCall__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__OperationCall__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5303:1: rule__OperationCall__Group__2__Impl : ( ( rule__OperationCall__Group_2__0 )? ) ;
+    // InternalExpression.g:5303:1: rule__OperationCall__Group__2__Impl : ( ( rule__OperationCall__Group_2__0 )? ) ;
     public final void rule__OperationCall__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5307:1: ( ( ( rule__OperationCall__Group_2__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5308:1: ( ( rule__OperationCall__Group_2__0 )? )
+            // InternalExpression.g:5307:1: ( ( ( rule__OperationCall__Group_2__0 )? ) )
+            // InternalExpression.g:5308:1: ( ( rule__OperationCall__Group_2__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5308:1: ( ( rule__OperationCall__Group_2__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5309:1: ( rule__OperationCall__Group_2__0 )?
+            // InternalExpression.g:5308:1: ( ( rule__OperationCall__Group_2__0 )? )
+            // InternalExpression.g:5309:1: ( rule__OperationCall__Group_2__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOperationCallAccess().getGroup_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5310:1: ( rule__OperationCall__Group_2__0 )?
+            // InternalExpression.g:5310:1: ( rule__OperationCall__Group_2__0 )?
             int alt32=2;
             int LA32_0 = input.LA(1);
 
@@ -15264,9 +15264,9 @@ public final void rule__OperationCall__Group__2__Impl() throws RecognitionExcept
             }
             switch (alt32) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5310:2: rule__OperationCall__Group_2__0
+                    // InternalExpression.g:5310:2: rule__OperationCall__Group_2__0
                     {
-                    pushFollow(FOLLOW_rule__OperationCall__Group_2__0_in_rule__OperationCall__Group__2__Impl10774);
+                    pushFollow(FOLLOW_2);
                     rule__OperationCall__Group_2__0();
 
                     state._fsp--;
@@ -15302,16 +15302,16 @@ public final void rule__OperationCall__Group__2__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__OperationCall__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5320:1: rule__OperationCall__Group__3 : rule__OperationCall__Group__3__Impl ;
+    // InternalExpression.g:5320:1: rule__OperationCall__Group__3 : rule__OperationCall__Group__3__Impl ;
     public final void rule__OperationCall__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5324:1: ( rule__OperationCall__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5325:2: rule__OperationCall__Group__3__Impl
+            // InternalExpression.g:5324:1: ( rule__OperationCall__Group__3__Impl )
+            // InternalExpression.g:5325:2: rule__OperationCall__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__OperationCall__Group__3__Impl_in_rule__OperationCall__Group__310805);
+            pushFollow(FOLLOW_2);
             rule__OperationCall__Group__3__Impl();
 
             state._fsp--;
@@ -15335,22 +15335,22 @@ public final void rule__OperationCall__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__OperationCall__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5331:1: rule__OperationCall__Group__3__Impl : ( ')' ) ;
+    // InternalExpression.g:5331:1: rule__OperationCall__Group__3__Impl : ( ')' ) ;
     public final void rule__OperationCall__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5335:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5336:1: ( ')' )
+            // InternalExpression.g:5335:1: ( ( ')' ) )
+            // InternalExpression.g:5336:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5336:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5337:1: ')'
+            // InternalExpression.g:5336:1: ( ')' )
+            // InternalExpression.g:5337:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOperationCallAccess().getRightParenthesisKeyword_3()); 
             }
-            match(input,40,FOLLOW_40_in_rule__OperationCall__Group__3__Impl10833); if (state.failed) return ;
+            match(input,40,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOperationCallAccess().getRightParenthesisKeyword_3()); 
             }
@@ -15376,21 +15376,21 @@ public final void rule__OperationCall__Group__3__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__OperationCall__Group_2__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5358:1: rule__OperationCall__Group_2__0 : rule__OperationCall__Group_2__0__Impl rule__OperationCall__Group_2__1 ;
+    // InternalExpression.g:5358:1: rule__OperationCall__Group_2__0 : rule__OperationCall__Group_2__0__Impl rule__OperationCall__Group_2__1 ;
     public final void rule__OperationCall__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5362:1: ( rule__OperationCall__Group_2__0__Impl rule__OperationCall__Group_2__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5363:2: rule__OperationCall__Group_2__0__Impl rule__OperationCall__Group_2__1
+            // InternalExpression.g:5362:1: ( rule__OperationCall__Group_2__0__Impl rule__OperationCall__Group_2__1 )
+            // InternalExpression.g:5363:2: rule__OperationCall__Group_2__0__Impl rule__OperationCall__Group_2__1
             {
-            pushFollow(FOLLOW_rule__OperationCall__Group_2__0__Impl_in_rule__OperationCall__Group_2__010872);
+            pushFollow(FOLLOW_35);
             rule__OperationCall__Group_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OperationCall__Group_2__1_in_rule__OperationCall__Group_2__010875);
+            pushFollow(FOLLOW_2);
             rule__OperationCall__Group_2__1();
 
             state._fsp--;
@@ -15414,25 +15414,25 @@ public final void rule__OperationCall__Group_2__0() throws RecognitionException
 
 
     // $ANTLR start "rule__OperationCall__Group_2__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5370:1: rule__OperationCall__Group_2__0__Impl : ( ( rule__OperationCall__ParamsAssignment_2_0 ) ) ;
+    // InternalExpression.g:5370:1: rule__OperationCall__Group_2__0__Impl : ( ( rule__OperationCall__ParamsAssignment_2_0 ) ) ;
     public final void rule__OperationCall__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5374:1: ( ( ( rule__OperationCall__ParamsAssignment_2_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5375:1: ( ( rule__OperationCall__ParamsAssignment_2_0 ) )
+            // InternalExpression.g:5374:1: ( ( ( rule__OperationCall__ParamsAssignment_2_0 ) ) )
+            // InternalExpression.g:5375:1: ( ( rule__OperationCall__ParamsAssignment_2_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5375:1: ( ( rule__OperationCall__ParamsAssignment_2_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5376:1: ( rule__OperationCall__ParamsAssignment_2_0 )
+            // InternalExpression.g:5375:1: ( ( rule__OperationCall__ParamsAssignment_2_0 ) )
+            // InternalExpression.g:5376:1: ( rule__OperationCall__ParamsAssignment_2_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOperationCallAccess().getParamsAssignment_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5377:1: ( rule__OperationCall__ParamsAssignment_2_0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5377:2: rule__OperationCall__ParamsAssignment_2_0
+            // InternalExpression.g:5377:1: ( rule__OperationCall__ParamsAssignment_2_0 )
+            // InternalExpression.g:5377:2: rule__OperationCall__ParamsAssignment_2_0
             {
-            pushFollow(FOLLOW_rule__OperationCall__ParamsAssignment_2_0_in_rule__OperationCall__Group_2__0__Impl10902);
+            pushFollow(FOLLOW_2);
             rule__OperationCall__ParamsAssignment_2_0();
 
             state._fsp--;
@@ -15465,16 +15465,16 @@ public final void rule__OperationCall__Group_2__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__OperationCall__Group_2__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5387:1: rule__OperationCall__Group_2__1 : rule__OperationCall__Group_2__1__Impl ;
+    // InternalExpression.g:5387:1: rule__OperationCall__Group_2__1 : rule__OperationCall__Group_2__1__Impl ;
     public final void rule__OperationCall__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5391:1: ( rule__OperationCall__Group_2__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5392:2: rule__OperationCall__Group_2__1__Impl
+            // InternalExpression.g:5391:1: ( rule__OperationCall__Group_2__1__Impl )
+            // InternalExpression.g:5392:2: rule__OperationCall__Group_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__OperationCall__Group_2__1__Impl_in_rule__OperationCall__Group_2__110932);
+            pushFollow(FOLLOW_2);
             rule__OperationCall__Group_2__1__Impl();
 
             state._fsp--;
@@ -15498,22 +15498,22 @@ public final void rule__OperationCall__Group_2__1() throws RecognitionException
 
 
     // $ANTLR start "rule__OperationCall__Group_2__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5398:1: rule__OperationCall__Group_2__1__Impl : ( ( rule__OperationCall__Group_2_1__0 )* ) ;
+    // InternalExpression.g:5398:1: rule__OperationCall__Group_2__1__Impl : ( ( rule__OperationCall__Group_2_1__0 )* ) ;
     public final void rule__OperationCall__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5402:1: ( ( ( rule__OperationCall__Group_2_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5403:1: ( ( rule__OperationCall__Group_2_1__0 )* )
+            // InternalExpression.g:5402:1: ( ( ( rule__OperationCall__Group_2_1__0 )* ) )
+            // InternalExpression.g:5403:1: ( ( rule__OperationCall__Group_2_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5403:1: ( ( rule__OperationCall__Group_2_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5404:1: ( rule__OperationCall__Group_2_1__0 )*
+            // InternalExpression.g:5403:1: ( ( rule__OperationCall__Group_2_1__0 )* )
+            // InternalExpression.g:5404:1: ( rule__OperationCall__Group_2_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOperationCallAccess().getGroup_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5405:1: ( rule__OperationCall__Group_2_1__0 )*
+            // InternalExpression.g:5405:1: ( rule__OperationCall__Group_2_1__0 )*
             loop33:
             do {
                 int alt33=2;
@@ -15526,9 +15526,9 @@ public final void rule__OperationCall__Group_2__1__Impl() throws RecognitionExce
 
                 switch (alt33) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5405:2: rule__OperationCall__Group_2_1__0
+            	    // InternalExpression.g:5405:2: rule__OperationCall__Group_2_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__OperationCall__Group_2_1__0_in_rule__OperationCall__Group_2__1__Impl10959);
+            	    pushFollow(FOLLOW_36);
             	    rule__OperationCall__Group_2_1__0();
 
             	    state._fsp--;
@@ -15567,21 +15567,21 @@ public final void rule__OperationCall__Group_2__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__OperationCall__Group_2_1__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5419:1: rule__OperationCall__Group_2_1__0 : rule__OperationCall__Group_2_1__0__Impl rule__OperationCall__Group_2_1__1 ;
+    // InternalExpression.g:5419:1: rule__OperationCall__Group_2_1__0 : rule__OperationCall__Group_2_1__0__Impl rule__OperationCall__Group_2_1__1 ;
     public final void rule__OperationCall__Group_2_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5423:1: ( rule__OperationCall__Group_2_1__0__Impl rule__OperationCall__Group_2_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5424:2: rule__OperationCall__Group_2_1__0__Impl rule__OperationCall__Group_2_1__1
+            // InternalExpression.g:5423:1: ( rule__OperationCall__Group_2_1__0__Impl rule__OperationCall__Group_2_1__1 )
+            // InternalExpression.g:5424:2: rule__OperationCall__Group_2_1__0__Impl rule__OperationCall__Group_2_1__1
             {
-            pushFollow(FOLLOW_rule__OperationCall__Group_2_1__0__Impl_in_rule__OperationCall__Group_2_1__010994);
+            pushFollow(FOLLOW_5);
             rule__OperationCall__Group_2_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OperationCall__Group_2_1__1_in_rule__OperationCall__Group_2_1__010997);
+            pushFollow(FOLLOW_2);
             rule__OperationCall__Group_2_1__1();
 
             state._fsp--;
@@ -15605,22 +15605,22 @@ public final void rule__OperationCall__Group_2_1__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__OperationCall__Group_2_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5431:1: rule__OperationCall__Group_2_1__0__Impl : ( ',' ) ;
+    // InternalExpression.g:5431:1: rule__OperationCall__Group_2_1__0__Impl : ( ',' ) ;
     public final void rule__OperationCall__Group_2_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5435:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5436:1: ( ',' )
+            // InternalExpression.g:5435:1: ( ( ',' ) )
+            // InternalExpression.g:5436:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5436:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5437:1: ','
+            // InternalExpression.g:5436:1: ( ',' )
+            // InternalExpression.g:5437:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOperationCallAccess().getCommaKeyword_2_1_0()); 
             }
-            match(input,52,FOLLOW_52_in_rule__OperationCall__Group_2_1__0__Impl11025); if (state.failed) return ;
+            match(input,52,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOperationCallAccess().getCommaKeyword_2_1_0()); 
             }
@@ -15646,16 +15646,16 @@ public final void rule__OperationCall__Group_2_1__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__OperationCall__Group_2_1__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5450:1: rule__OperationCall__Group_2_1__1 : rule__OperationCall__Group_2_1__1__Impl ;
+    // InternalExpression.g:5450:1: rule__OperationCall__Group_2_1__1 : rule__OperationCall__Group_2_1__1__Impl ;
     public final void rule__OperationCall__Group_2_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5454:1: ( rule__OperationCall__Group_2_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5455:2: rule__OperationCall__Group_2_1__1__Impl
+            // InternalExpression.g:5454:1: ( rule__OperationCall__Group_2_1__1__Impl )
+            // InternalExpression.g:5455:2: rule__OperationCall__Group_2_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__OperationCall__Group_2_1__1__Impl_in_rule__OperationCall__Group_2_1__111056);
+            pushFollow(FOLLOW_2);
             rule__OperationCall__Group_2_1__1__Impl();
 
             state._fsp--;
@@ -15679,25 +15679,25 @@ public final void rule__OperationCall__Group_2_1__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__OperationCall__Group_2_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5461:1: rule__OperationCall__Group_2_1__1__Impl : ( ( rule__OperationCall__ParamsAssignment_2_1_1 ) ) ;
+    // InternalExpression.g:5461:1: rule__OperationCall__Group_2_1__1__Impl : ( ( rule__OperationCall__ParamsAssignment_2_1_1 ) ) ;
     public final void rule__OperationCall__Group_2_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5465:1: ( ( ( rule__OperationCall__ParamsAssignment_2_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5466:1: ( ( rule__OperationCall__ParamsAssignment_2_1_1 ) )
+            // InternalExpression.g:5465:1: ( ( ( rule__OperationCall__ParamsAssignment_2_1_1 ) ) )
+            // InternalExpression.g:5466:1: ( ( rule__OperationCall__ParamsAssignment_2_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5466:1: ( ( rule__OperationCall__ParamsAssignment_2_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5467:1: ( rule__OperationCall__ParamsAssignment_2_1_1 )
+            // InternalExpression.g:5466:1: ( ( rule__OperationCall__ParamsAssignment_2_1_1 ) )
+            // InternalExpression.g:5467:1: ( rule__OperationCall__ParamsAssignment_2_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOperationCallAccess().getParamsAssignment_2_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5468:1: ( rule__OperationCall__ParamsAssignment_2_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5468:2: rule__OperationCall__ParamsAssignment_2_1_1
+            // InternalExpression.g:5468:1: ( rule__OperationCall__ParamsAssignment_2_1_1 )
+            // InternalExpression.g:5468:2: rule__OperationCall__ParamsAssignment_2_1_1
             {
-            pushFollow(FOLLOW_rule__OperationCall__ParamsAssignment_2_1_1_in_rule__OperationCall__Group_2_1__1__Impl11083);
+            pushFollow(FOLLOW_2);
             rule__OperationCall__ParamsAssignment_2_1_1();
 
             state._fsp--;
@@ -15730,21 +15730,21 @@ public final void rule__OperationCall__Group_2_1__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__ListLiteral__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5482:1: rule__ListLiteral__Group__0 : rule__ListLiteral__Group__0__Impl rule__ListLiteral__Group__1 ;
+    // InternalExpression.g:5482:1: rule__ListLiteral__Group__0 : rule__ListLiteral__Group__0__Impl rule__ListLiteral__Group__1 ;
     public final void rule__ListLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5486:1: ( rule__ListLiteral__Group__0__Impl rule__ListLiteral__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5487:2: rule__ListLiteral__Group__0__Impl rule__ListLiteral__Group__1
+            // InternalExpression.g:5486:1: ( rule__ListLiteral__Group__0__Impl rule__ListLiteral__Group__1 )
+            // InternalExpression.g:5487:2: rule__ListLiteral__Group__0__Impl rule__ListLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__ListLiteral__Group__0__Impl_in_rule__ListLiteral__Group__011117);
+            pushFollow(FOLLOW_40);
             rule__ListLiteral__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ListLiteral__Group__1_in_rule__ListLiteral__Group__011120);
+            pushFollow(FOLLOW_2);
             rule__ListLiteral__Group__1();
 
             state._fsp--;
@@ -15768,23 +15768,23 @@ public final void rule__ListLiteral__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__ListLiteral__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5494:1: rule__ListLiteral__Group__0__Impl : ( () ) ;
+    // InternalExpression.g:5494:1: rule__ListLiteral__Group__0__Impl : ( () ) ;
     public final void rule__ListLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5498:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5499:1: ( () )
+            // InternalExpression.g:5498:1: ( ( () ) )
+            // InternalExpression.g:5499:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5499:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5500:1: ()
+            // InternalExpression.g:5499:1: ( () )
+            // InternalExpression.g:5500:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getListLiteralAccess().getListLiteralAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5501:1: ()
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5503:1: 
+            // InternalExpression.g:5501:1: ()
+            // InternalExpression.g:5503:1: 
             {
             }
 
@@ -15809,21 +15809,21 @@ public final void rule__ListLiteral__Group__0__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ListLiteral__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5513:1: rule__ListLiteral__Group__1 : rule__ListLiteral__Group__1__Impl rule__ListLiteral__Group__2 ;
+    // InternalExpression.g:5513:1: rule__ListLiteral__Group__1 : rule__ListLiteral__Group__1__Impl rule__ListLiteral__Group__2 ;
     public final void rule__ListLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5517:1: ( rule__ListLiteral__Group__1__Impl rule__ListLiteral__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5518:2: rule__ListLiteral__Group__1__Impl rule__ListLiteral__Group__2
+            // InternalExpression.g:5517:1: ( rule__ListLiteral__Group__1__Impl rule__ListLiteral__Group__2 )
+            // InternalExpression.g:5518:2: rule__ListLiteral__Group__1__Impl rule__ListLiteral__Group__2
             {
-            pushFollow(FOLLOW_rule__ListLiteral__Group__1__Impl_in_rule__ListLiteral__Group__111178);
+            pushFollow(FOLLOW_41);
             rule__ListLiteral__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ListLiteral__Group__2_in_rule__ListLiteral__Group__111181);
+            pushFollow(FOLLOW_2);
             rule__ListLiteral__Group__2();
 
             state._fsp--;
@@ -15847,22 +15847,22 @@ public final void rule__ListLiteral__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__ListLiteral__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5525:1: rule__ListLiteral__Group__1__Impl : ( '{' ) ;
+    // InternalExpression.g:5525:1: rule__ListLiteral__Group__1__Impl : ( '{' ) ;
     public final void rule__ListLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5529:1: ( ( '{' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5530:1: ( '{' )
+            // InternalExpression.g:5529:1: ( ( '{' ) )
+            // InternalExpression.g:5530:1: ( '{' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5530:1: ( '{' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5531:1: '{'
+            // InternalExpression.g:5530:1: ( '{' )
+            // InternalExpression.g:5531:1: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getListLiteralAccess().getLeftCurlyBracketKeyword_1()); 
             }
-            match(input,47,FOLLOW_47_in_rule__ListLiteral__Group__1__Impl11209); if (state.failed) return ;
+            match(input,47,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getListLiteralAccess().getLeftCurlyBracketKeyword_1()); 
             }
@@ -15888,21 +15888,21 @@ public final void rule__ListLiteral__Group__1__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ListLiteral__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5544:1: rule__ListLiteral__Group__2 : rule__ListLiteral__Group__2__Impl rule__ListLiteral__Group__3 ;
+    // InternalExpression.g:5544:1: rule__ListLiteral__Group__2 : rule__ListLiteral__Group__2__Impl rule__ListLiteral__Group__3 ;
     public final void rule__ListLiteral__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5548:1: ( rule__ListLiteral__Group__2__Impl rule__ListLiteral__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5549:2: rule__ListLiteral__Group__2__Impl rule__ListLiteral__Group__3
+            // InternalExpression.g:5548:1: ( rule__ListLiteral__Group__2__Impl rule__ListLiteral__Group__3 )
+            // InternalExpression.g:5549:2: rule__ListLiteral__Group__2__Impl rule__ListLiteral__Group__3
             {
-            pushFollow(FOLLOW_rule__ListLiteral__Group__2__Impl_in_rule__ListLiteral__Group__211240);
+            pushFollow(FOLLOW_41);
             rule__ListLiteral__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ListLiteral__Group__3_in_rule__ListLiteral__Group__211243);
+            pushFollow(FOLLOW_2);
             rule__ListLiteral__Group__3();
 
             state._fsp--;
@@ -15926,22 +15926,22 @@ public final void rule__ListLiteral__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__ListLiteral__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5556:1: rule__ListLiteral__Group__2__Impl : ( ( rule__ListLiteral__Group_2__0 )? ) ;
+    // InternalExpression.g:5556:1: rule__ListLiteral__Group__2__Impl : ( ( rule__ListLiteral__Group_2__0 )? ) ;
     public final void rule__ListLiteral__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5560:1: ( ( ( rule__ListLiteral__Group_2__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5561:1: ( ( rule__ListLiteral__Group_2__0 )? )
+            // InternalExpression.g:5560:1: ( ( ( rule__ListLiteral__Group_2__0 )? ) )
+            // InternalExpression.g:5561:1: ( ( rule__ListLiteral__Group_2__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5561:1: ( ( rule__ListLiteral__Group_2__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5562:1: ( rule__ListLiteral__Group_2__0 )?
+            // InternalExpression.g:5561:1: ( ( rule__ListLiteral__Group_2__0 )? )
+            // InternalExpression.g:5562:1: ( rule__ListLiteral__Group_2__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getListLiteralAccess().getGroup_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5563:1: ( rule__ListLiteral__Group_2__0 )?
+            // InternalExpression.g:5563:1: ( rule__ListLiteral__Group_2__0 )?
             int alt34=2;
             int LA34_0 = input.LA(1);
 
@@ -15950,9 +15950,9 @@ public final void rule__ListLiteral__Group__2__Impl() throws RecognitionExceptio
             }
             switch (alt34) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5563:2: rule__ListLiteral__Group_2__0
+                    // InternalExpression.g:5563:2: rule__ListLiteral__Group_2__0
                     {
-                    pushFollow(FOLLOW_rule__ListLiteral__Group_2__0_in_rule__ListLiteral__Group__2__Impl11270);
+                    pushFollow(FOLLOW_2);
                     rule__ListLiteral__Group_2__0();
 
                     state._fsp--;
@@ -15988,16 +15988,16 @@ public final void rule__ListLiteral__Group__2__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ListLiteral__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5573:1: rule__ListLiteral__Group__3 : rule__ListLiteral__Group__3__Impl ;
+    // InternalExpression.g:5573:1: rule__ListLiteral__Group__3 : rule__ListLiteral__Group__3__Impl ;
     public final void rule__ListLiteral__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5577:1: ( rule__ListLiteral__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5578:2: rule__ListLiteral__Group__3__Impl
+            // InternalExpression.g:5577:1: ( rule__ListLiteral__Group__3__Impl )
+            // InternalExpression.g:5578:2: rule__ListLiteral__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__ListLiteral__Group__3__Impl_in_rule__ListLiteral__Group__311301);
+            pushFollow(FOLLOW_2);
             rule__ListLiteral__Group__3__Impl();
 
             state._fsp--;
@@ -16021,22 +16021,22 @@ public final void rule__ListLiteral__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__ListLiteral__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5584:1: rule__ListLiteral__Group__3__Impl : ( '}' ) ;
+    // InternalExpression.g:5584:1: rule__ListLiteral__Group__3__Impl : ( '}' ) ;
     public final void rule__ListLiteral__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5588:1: ( ( '}' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5589:1: ( '}' )
+            // InternalExpression.g:5588:1: ( ( '}' ) )
+            // InternalExpression.g:5589:1: ( '}' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5589:1: ( '}' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5590:1: '}'
+            // InternalExpression.g:5589:1: ( '}' )
+            // InternalExpression.g:5590:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getListLiteralAccess().getRightCurlyBracketKeyword_3()); 
             }
-            match(input,49,FOLLOW_49_in_rule__ListLiteral__Group__3__Impl11329); if (state.failed) return ;
+            match(input,49,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getListLiteralAccess().getRightCurlyBracketKeyword_3()); 
             }
@@ -16062,21 +16062,21 @@ public final void rule__ListLiteral__Group__3__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ListLiteral__Group_2__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5611:1: rule__ListLiteral__Group_2__0 : rule__ListLiteral__Group_2__0__Impl rule__ListLiteral__Group_2__1 ;
+    // InternalExpression.g:5611:1: rule__ListLiteral__Group_2__0 : rule__ListLiteral__Group_2__0__Impl rule__ListLiteral__Group_2__1 ;
     public final void rule__ListLiteral__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5615:1: ( rule__ListLiteral__Group_2__0__Impl rule__ListLiteral__Group_2__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5616:2: rule__ListLiteral__Group_2__0__Impl rule__ListLiteral__Group_2__1
+            // InternalExpression.g:5615:1: ( rule__ListLiteral__Group_2__0__Impl rule__ListLiteral__Group_2__1 )
+            // InternalExpression.g:5616:2: rule__ListLiteral__Group_2__0__Impl rule__ListLiteral__Group_2__1
             {
-            pushFollow(FOLLOW_rule__ListLiteral__Group_2__0__Impl_in_rule__ListLiteral__Group_2__011368);
+            pushFollow(FOLLOW_35);
             rule__ListLiteral__Group_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ListLiteral__Group_2__1_in_rule__ListLiteral__Group_2__011371);
+            pushFollow(FOLLOW_2);
             rule__ListLiteral__Group_2__1();
 
             state._fsp--;
@@ -16100,25 +16100,25 @@ public final void rule__ListLiteral__Group_2__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__ListLiteral__Group_2__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5623:1: rule__ListLiteral__Group_2__0__Impl : ( ( rule__ListLiteral__ElementsAssignment_2_0 ) ) ;
+    // InternalExpression.g:5623:1: rule__ListLiteral__Group_2__0__Impl : ( ( rule__ListLiteral__ElementsAssignment_2_0 ) ) ;
     public final void rule__ListLiteral__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5627:1: ( ( ( rule__ListLiteral__ElementsAssignment_2_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5628:1: ( ( rule__ListLiteral__ElementsAssignment_2_0 ) )
+            // InternalExpression.g:5627:1: ( ( ( rule__ListLiteral__ElementsAssignment_2_0 ) ) )
+            // InternalExpression.g:5628:1: ( ( rule__ListLiteral__ElementsAssignment_2_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5628:1: ( ( rule__ListLiteral__ElementsAssignment_2_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5629:1: ( rule__ListLiteral__ElementsAssignment_2_0 )
+            // InternalExpression.g:5628:1: ( ( rule__ListLiteral__ElementsAssignment_2_0 ) )
+            // InternalExpression.g:5629:1: ( rule__ListLiteral__ElementsAssignment_2_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getListLiteralAccess().getElementsAssignment_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5630:1: ( rule__ListLiteral__ElementsAssignment_2_0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5630:2: rule__ListLiteral__ElementsAssignment_2_0
+            // InternalExpression.g:5630:1: ( rule__ListLiteral__ElementsAssignment_2_0 )
+            // InternalExpression.g:5630:2: rule__ListLiteral__ElementsAssignment_2_0
             {
-            pushFollow(FOLLOW_rule__ListLiteral__ElementsAssignment_2_0_in_rule__ListLiteral__Group_2__0__Impl11398);
+            pushFollow(FOLLOW_2);
             rule__ListLiteral__ElementsAssignment_2_0();
 
             state._fsp--;
@@ -16151,16 +16151,16 @@ public final void rule__ListLiteral__Group_2__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ListLiteral__Group_2__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5640:1: rule__ListLiteral__Group_2__1 : rule__ListLiteral__Group_2__1__Impl ;
+    // InternalExpression.g:5640:1: rule__ListLiteral__Group_2__1 : rule__ListLiteral__Group_2__1__Impl ;
     public final void rule__ListLiteral__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5644:1: ( rule__ListLiteral__Group_2__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5645:2: rule__ListLiteral__Group_2__1__Impl
+            // InternalExpression.g:5644:1: ( rule__ListLiteral__Group_2__1__Impl )
+            // InternalExpression.g:5645:2: rule__ListLiteral__Group_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__ListLiteral__Group_2__1__Impl_in_rule__ListLiteral__Group_2__111428);
+            pushFollow(FOLLOW_2);
             rule__ListLiteral__Group_2__1__Impl();
 
             state._fsp--;
@@ -16184,22 +16184,22 @@ public final void rule__ListLiteral__Group_2__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__ListLiteral__Group_2__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5651:1: rule__ListLiteral__Group_2__1__Impl : ( ( rule__ListLiteral__Group_2_1__0 )* ) ;
+    // InternalExpression.g:5651:1: rule__ListLiteral__Group_2__1__Impl : ( ( rule__ListLiteral__Group_2_1__0 )* ) ;
     public final void rule__ListLiteral__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5655:1: ( ( ( rule__ListLiteral__Group_2_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5656:1: ( ( rule__ListLiteral__Group_2_1__0 )* )
+            // InternalExpression.g:5655:1: ( ( ( rule__ListLiteral__Group_2_1__0 )* ) )
+            // InternalExpression.g:5656:1: ( ( rule__ListLiteral__Group_2_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5656:1: ( ( rule__ListLiteral__Group_2_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5657:1: ( rule__ListLiteral__Group_2_1__0 )*
+            // InternalExpression.g:5656:1: ( ( rule__ListLiteral__Group_2_1__0 )* )
+            // InternalExpression.g:5657:1: ( rule__ListLiteral__Group_2_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getListLiteralAccess().getGroup_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5658:1: ( rule__ListLiteral__Group_2_1__0 )*
+            // InternalExpression.g:5658:1: ( rule__ListLiteral__Group_2_1__0 )*
             loop35:
             do {
                 int alt35=2;
@@ -16212,9 +16212,9 @@ public final void rule__ListLiteral__Group_2__1__Impl() throws RecognitionExcept
 
                 switch (alt35) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5658:2: rule__ListLiteral__Group_2_1__0
+            	    // InternalExpression.g:5658:2: rule__ListLiteral__Group_2_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__ListLiteral__Group_2_1__0_in_rule__ListLiteral__Group_2__1__Impl11455);
+            	    pushFollow(FOLLOW_36);
             	    rule__ListLiteral__Group_2_1__0();
 
             	    state._fsp--;
@@ -16253,21 +16253,21 @@ public final void rule__ListLiteral__Group_2__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ListLiteral__Group_2_1__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5672:1: rule__ListLiteral__Group_2_1__0 : rule__ListLiteral__Group_2_1__0__Impl rule__ListLiteral__Group_2_1__1 ;
+    // InternalExpression.g:5672:1: rule__ListLiteral__Group_2_1__0 : rule__ListLiteral__Group_2_1__0__Impl rule__ListLiteral__Group_2_1__1 ;
     public final void rule__ListLiteral__Group_2_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5676:1: ( rule__ListLiteral__Group_2_1__0__Impl rule__ListLiteral__Group_2_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5677:2: rule__ListLiteral__Group_2_1__0__Impl rule__ListLiteral__Group_2_1__1
+            // InternalExpression.g:5676:1: ( rule__ListLiteral__Group_2_1__0__Impl rule__ListLiteral__Group_2_1__1 )
+            // InternalExpression.g:5677:2: rule__ListLiteral__Group_2_1__0__Impl rule__ListLiteral__Group_2_1__1
             {
-            pushFollow(FOLLOW_rule__ListLiteral__Group_2_1__0__Impl_in_rule__ListLiteral__Group_2_1__011490);
+            pushFollow(FOLLOW_5);
             rule__ListLiteral__Group_2_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ListLiteral__Group_2_1__1_in_rule__ListLiteral__Group_2_1__011493);
+            pushFollow(FOLLOW_2);
             rule__ListLiteral__Group_2_1__1();
 
             state._fsp--;
@@ -16291,22 +16291,22 @@ public final void rule__ListLiteral__Group_2_1__0() throws RecognitionException
 
 
     // $ANTLR start "rule__ListLiteral__Group_2_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5684:1: rule__ListLiteral__Group_2_1__0__Impl : ( ',' ) ;
+    // InternalExpression.g:5684:1: rule__ListLiteral__Group_2_1__0__Impl : ( ',' ) ;
     public final void rule__ListLiteral__Group_2_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5688:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5689:1: ( ',' )
+            // InternalExpression.g:5688:1: ( ( ',' ) )
+            // InternalExpression.g:5689:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5689:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5690:1: ','
+            // InternalExpression.g:5689:1: ( ',' )
+            // InternalExpression.g:5690:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getListLiteralAccess().getCommaKeyword_2_1_0()); 
             }
-            match(input,52,FOLLOW_52_in_rule__ListLiteral__Group_2_1__0__Impl11521); if (state.failed) return ;
+            match(input,52,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getListLiteralAccess().getCommaKeyword_2_1_0()); 
             }
@@ -16332,16 +16332,16 @@ public final void rule__ListLiteral__Group_2_1__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__ListLiteral__Group_2_1__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5703:1: rule__ListLiteral__Group_2_1__1 : rule__ListLiteral__Group_2_1__1__Impl ;
+    // InternalExpression.g:5703:1: rule__ListLiteral__Group_2_1__1 : rule__ListLiteral__Group_2_1__1__Impl ;
     public final void rule__ListLiteral__Group_2_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5707:1: ( rule__ListLiteral__Group_2_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5708:2: rule__ListLiteral__Group_2_1__1__Impl
+            // InternalExpression.g:5707:1: ( rule__ListLiteral__Group_2_1__1__Impl )
+            // InternalExpression.g:5708:2: rule__ListLiteral__Group_2_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__ListLiteral__Group_2_1__1__Impl_in_rule__ListLiteral__Group_2_1__111552);
+            pushFollow(FOLLOW_2);
             rule__ListLiteral__Group_2_1__1__Impl();
 
             state._fsp--;
@@ -16365,25 +16365,25 @@ public final void rule__ListLiteral__Group_2_1__1() throws RecognitionException
 
 
     // $ANTLR start "rule__ListLiteral__Group_2_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5714:1: rule__ListLiteral__Group_2_1__1__Impl : ( ( rule__ListLiteral__ElementsAssignment_2_1_1 ) ) ;
+    // InternalExpression.g:5714:1: rule__ListLiteral__Group_2_1__1__Impl : ( ( rule__ListLiteral__ElementsAssignment_2_1_1 ) ) ;
     public final void rule__ListLiteral__Group_2_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5718:1: ( ( ( rule__ListLiteral__ElementsAssignment_2_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5719:1: ( ( rule__ListLiteral__ElementsAssignment_2_1_1 ) )
+            // InternalExpression.g:5718:1: ( ( ( rule__ListLiteral__ElementsAssignment_2_1_1 ) ) )
+            // InternalExpression.g:5719:1: ( ( rule__ListLiteral__ElementsAssignment_2_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5719:1: ( ( rule__ListLiteral__ElementsAssignment_2_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5720:1: ( rule__ListLiteral__ElementsAssignment_2_1_1 )
+            // InternalExpression.g:5719:1: ( ( rule__ListLiteral__ElementsAssignment_2_1_1 ) )
+            // InternalExpression.g:5720:1: ( rule__ListLiteral__ElementsAssignment_2_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getListLiteralAccess().getElementsAssignment_2_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5721:1: ( rule__ListLiteral__ElementsAssignment_2_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5721:2: rule__ListLiteral__ElementsAssignment_2_1_1
+            // InternalExpression.g:5721:1: ( rule__ListLiteral__ElementsAssignment_2_1_1 )
+            // InternalExpression.g:5721:2: rule__ListLiteral__ElementsAssignment_2_1_1
             {
-            pushFollow(FOLLOW_rule__ListLiteral__ElementsAssignment_2_1_1_in_rule__ListLiteral__Group_2_1__1__Impl11579);
+            pushFollow(FOLLOW_2);
             rule__ListLiteral__ElementsAssignment_2_1_1();
 
             state._fsp--;
@@ -16416,21 +16416,21 @@ public final void rule__ListLiteral__Group_2_1__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__ConstructorCallExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5735:1: rule__ConstructorCallExpression__Group__0 : rule__ConstructorCallExpression__Group__0__Impl rule__ConstructorCallExpression__Group__1 ;
+    // InternalExpression.g:5735:1: rule__ConstructorCallExpression__Group__0 : rule__ConstructorCallExpression__Group__0__Impl rule__ConstructorCallExpression__Group__1 ;
     public final void rule__ConstructorCallExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5739:1: ( rule__ConstructorCallExpression__Group__0__Impl rule__ConstructorCallExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5740:2: rule__ConstructorCallExpression__Group__0__Impl rule__ConstructorCallExpression__Group__1
+            // InternalExpression.g:5739:1: ( rule__ConstructorCallExpression__Group__0__Impl rule__ConstructorCallExpression__Group__1 )
+            // InternalExpression.g:5740:2: rule__ConstructorCallExpression__Group__0__Impl rule__ConstructorCallExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__ConstructorCallExpression__Group__0__Impl_in_rule__ConstructorCallExpression__Group__011613);
+            pushFollow(FOLLOW_7);
             rule__ConstructorCallExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ConstructorCallExpression__Group__1_in_rule__ConstructorCallExpression__Group__011616);
+            pushFollow(FOLLOW_2);
             rule__ConstructorCallExpression__Group__1();
 
             state._fsp--;
@@ -16454,22 +16454,22 @@ public final void rule__ConstructorCallExpression__Group__0() throws Recognition
 
 
     // $ANTLR start "rule__ConstructorCallExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5747:1: rule__ConstructorCallExpression__Group__0__Impl : ( 'new' ) ;
+    // InternalExpression.g:5747:1: rule__ConstructorCallExpression__Group__0__Impl : ( 'new' ) ;
     public final void rule__ConstructorCallExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5751:1: ( ( 'new' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5752:1: ( 'new' )
+            // InternalExpression.g:5751:1: ( ( 'new' ) )
+            // InternalExpression.g:5752:1: ( 'new' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5752:1: ( 'new' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5753:1: 'new'
+            // InternalExpression.g:5752:1: ( 'new' )
+            // InternalExpression.g:5753:1: 'new'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConstructorCallExpressionAccess().getNewKeyword_0()); 
             }
-            match(input,55,FOLLOW_55_in_rule__ConstructorCallExpression__Group__0__Impl11644); if (state.failed) return ;
+            match(input,55,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getConstructorCallExpressionAccess().getNewKeyword_0()); 
             }
@@ -16495,16 +16495,16 @@ public final void rule__ConstructorCallExpression__Group__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__ConstructorCallExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5766:1: rule__ConstructorCallExpression__Group__1 : rule__ConstructorCallExpression__Group__1__Impl ;
+    // InternalExpression.g:5766:1: rule__ConstructorCallExpression__Group__1 : rule__ConstructorCallExpression__Group__1__Impl ;
     public final void rule__ConstructorCallExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5770:1: ( rule__ConstructorCallExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5771:2: rule__ConstructorCallExpression__Group__1__Impl
+            // InternalExpression.g:5770:1: ( rule__ConstructorCallExpression__Group__1__Impl )
+            // InternalExpression.g:5771:2: rule__ConstructorCallExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__ConstructorCallExpression__Group__1__Impl_in_rule__ConstructorCallExpression__Group__111675);
+            pushFollow(FOLLOW_2);
             rule__ConstructorCallExpression__Group__1__Impl();
 
             state._fsp--;
@@ -16528,25 +16528,25 @@ public final void rule__ConstructorCallExpression__Group__1() throws Recognition
 
 
     // $ANTLR start "rule__ConstructorCallExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5777:1: rule__ConstructorCallExpression__Group__1__Impl : ( ( rule__ConstructorCallExpression__TypeAssignment_1 ) ) ;
+    // InternalExpression.g:5777:1: rule__ConstructorCallExpression__Group__1__Impl : ( ( rule__ConstructorCallExpression__TypeAssignment_1 ) ) ;
     public final void rule__ConstructorCallExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5781:1: ( ( ( rule__ConstructorCallExpression__TypeAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5782:1: ( ( rule__ConstructorCallExpression__TypeAssignment_1 ) )
+            // InternalExpression.g:5781:1: ( ( ( rule__ConstructorCallExpression__TypeAssignment_1 ) ) )
+            // InternalExpression.g:5782:1: ( ( rule__ConstructorCallExpression__TypeAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5782:1: ( ( rule__ConstructorCallExpression__TypeAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5783:1: ( rule__ConstructorCallExpression__TypeAssignment_1 )
+            // InternalExpression.g:5782:1: ( ( rule__ConstructorCallExpression__TypeAssignment_1 ) )
+            // InternalExpression.g:5783:1: ( rule__ConstructorCallExpression__TypeAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConstructorCallExpressionAccess().getTypeAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5784:1: ( rule__ConstructorCallExpression__TypeAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5784:2: rule__ConstructorCallExpression__TypeAssignment_1
+            // InternalExpression.g:5784:1: ( rule__ConstructorCallExpression__TypeAssignment_1 )
+            // InternalExpression.g:5784:2: rule__ConstructorCallExpression__TypeAssignment_1
             {
-            pushFollow(FOLLOW_rule__ConstructorCallExpression__TypeAssignment_1_in_rule__ConstructorCallExpression__Group__1__Impl11702);
+            pushFollow(FOLLOW_2);
             rule__ConstructorCallExpression__TypeAssignment_1();
 
             state._fsp--;
@@ -16579,21 +16579,21 @@ public final void rule__ConstructorCallExpression__Group__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__TypeSelectExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5798:1: rule__TypeSelectExpression__Group__0 : rule__TypeSelectExpression__Group__0__Impl rule__TypeSelectExpression__Group__1 ;
+    // InternalExpression.g:5798:1: rule__TypeSelectExpression__Group__0 : rule__TypeSelectExpression__Group__0__Impl rule__TypeSelectExpression__Group__1 ;
     public final void rule__TypeSelectExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5802:1: ( rule__TypeSelectExpression__Group__0__Impl rule__TypeSelectExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5803:2: rule__TypeSelectExpression__Group__0__Impl rule__TypeSelectExpression__Group__1
+            // InternalExpression.g:5802:1: ( rule__TypeSelectExpression__Group__0__Impl rule__TypeSelectExpression__Group__1 )
+            // InternalExpression.g:5803:2: rule__TypeSelectExpression__Group__0__Impl rule__TypeSelectExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__TypeSelectExpression__Group__0__Impl_in_rule__TypeSelectExpression__Group__011736);
+            pushFollow(FOLLOW_33);
             rule__TypeSelectExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__TypeSelectExpression__Group__1_in_rule__TypeSelectExpression__Group__011739);
+            pushFollow(FOLLOW_2);
             rule__TypeSelectExpression__Group__1();
 
             state._fsp--;
@@ -16617,25 +16617,25 @@ public final void rule__TypeSelectExpression__Group__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__TypeSelectExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5810:1: rule__TypeSelectExpression__Group__0__Impl : ( ( rule__TypeSelectExpression__NameAssignment_0 ) ) ;
+    // InternalExpression.g:5810:1: rule__TypeSelectExpression__Group__0__Impl : ( ( rule__TypeSelectExpression__NameAssignment_0 ) ) ;
     public final void rule__TypeSelectExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5814:1: ( ( ( rule__TypeSelectExpression__NameAssignment_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5815:1: ( ( rule__TypeSelectExpression__NameAssignment_0 ) )
+            // InternalExpression.g:5814:1: ( ( ( rule__TypeSelectExpression__NameAssignment_0 ) ) )
+            // InternalExpression.g:5815:1: ( ( rule__TypeSelectExpression__NameAssignment_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5815:1: ( ( rule__TypeSelectExpression__NameAssignment_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5816:1: ( rule__TypeSelectExpression__NameAssignment_0 )
+            // InternalExpression.g:5815:1: ( ( rule__TypeSelectExpression__NameAssignment_0 ) )
+            // InternalExpression.g:5816:1: ( rule__TypeSelectExpression__NameAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTypeSelectExpressionAccess().getNameAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5817:1: ( rule__TypeSelectExpression__NameAssignment_0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5817:2: rule__TypeSelectExpression__NameAssignment_0
+            // InternalExpression.g:5817:1: ( rule__TypeSelectExpression__NameAssignment_0 )
+            // InternalExpression.g:5817:2: rule__TypeSelectExpression__NameAssignment_0
             {
-            pushFollow(FOLLOW_rule__TypeSelectExpression__NameAssignment_0_in_rule__TypeSelectExpression__Group__0__Impl11766);
+            pushFollow(FOLLOW_2);
             rule__TypeSelectExpression__NameAssignment_0();
 
             state._fsp--;
@@ -16668,21 +16668,21 @@ public final void rule__TypeSelectExpression__Group__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__TypeSelectExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5827:1: rule__TypeSelectExpression__Group__1 : rule__TypeSelectExpression__Group__1__Impl rule__TypeSelectExpression__Group__2 ;
+    // InternalExpression.g:5827:1: rule__TypeSelectExpression__Group__1 : rule__TypeSelectExpression__Group__1__Impl rule__TypeSelectExpression__Group__2 ;
     public final void rule__TypeSelectExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5831:1: ( rule__TypeSelectExpression__Group__1__Impl rule__TypeSelectExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5832:2: rule__TypeSelectExpression__Group__1__Impl rule__TypeSelectExpression__Group__2
+            // InternalExpression.g:5831:1: ( rule__TypeSelectExpression__Group__1__Impl rule__TypeSelectExpression__Group__2 )
+            // InternalExpression.g:5832:2: rule__TypeSelectExpression__Group__1__Impl rule__TypeSelectExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__TypeSelectExpression__Group__1__Impl_in_rule__TypeSelectExpression__Group__111796);
+            pushFollow(FOLLOW_7);
             rule__TypeSelectExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__TypeSelectExpression__Group__2_in_rule__TypeSelectExpression__Group__111799);
+            pushFollow(FOLLOW_2);
             rule__TypeSelectExpression__Group__2();
 
             state._fsp--;
@@ -16706,22 +16706,22 @@ public final void rule__TypeSelectExpression__Group__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__TypeSelectExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5839:1: rule__TypeSelectExpression__Group__1__Impl : ( '(' ) ;
+    // InternalExpression.g:5839:1: rule__TypeSelectExpression__Group__1__Impl : ( '(' ) ;
     public final void rule__TypeSelectExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5843:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5844:1: ( '(' )
+            // InternalExpression.g:5843:1: ( ( '(' ) )
+            // InternalExpression.g:5844:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5844:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5845:1: '('
+            // InternalExpression.g:5844:1: ( '(' )
+            // InternalExpression.g:5845:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTypeSelectExpressionAccess().getLeftParenthesisKeyword_1()); 
             }
-            match(input,39,FOLLOW_39_in_rule__TypeSelectExpression__Group__1__Impl11827); if (state.failed) return ;
+            match(input,39,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getTypeSelectExpressionAccess().getLeftParenthesisKeyword_1()); 
             }
@@ -16747,21 +16747,21 @@ public final void rule__TypeSelectExpression__Group__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__TypeSelectExpression__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5858:1: rule__TypeSelectExpression__Group__2 : rule__TypeSelectExpression__Group__2__Impl rule__TypeSelectExpression__Group__3 ;
+    // InternalExpression.g:5858:1: rule__TypeSelectExpression__Group__2 : rule__TypeSelectExpression__Group__2__Impl rule__TypeSelectExpression__Group__3 ;
     public final void rule__TypeSelectExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5862:1: ( rule__TypeSelectExpression__Group__2__Impl rule__TypeSelectExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5863:2: rule__TypeSelectExpression__Group__2__Impl rule__TypeSelectExpression__Group__3
+            // InternalExpression.g:5862:1: ( rule__TypeSelectExpression__Group__2__Impl rule__TypeSelectExpression__Group__3 )
+            // InternalExpression.g:5863:2: rule__TypeSelectExpression__Group__2__Impl rule__TypeSelectExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__TypeSelectExpression__Group__2__Impl_in_rule__TypeSelectExpression__Group__211858);
+            pushFollow(FOLLOW_8);
             rule__TypeSelectExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__TypeSelectExpression__Group__3_in_rule__TypeSelectExpression__Group__211861);
+            pushFollow(FOLLOW_2);
             rule__TypeSelectExpression__Group__3();
 
             state._fsp--;
@@ -16785,25 +16785,25 @@ public final void rule__TypeSelectExpression__Group__2() throws RecognitionExcep
 
 
     // $ANTLR start "rule__TypeSelectExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5870:1: rule__TypeSelectExpression__Group__2__Impl : ( ( rule__TypeSelectExpression__TypeAssignment_2 ) ) ;
+    // InternalExpression.g:5870:1: rule__TypeSelectExpression__Group__2__Impl : ( ( rule__TypeSelectExpression__TypeAssignment_2 ) ) ;
     public final void rule__TypeSelectExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5874:1: ( ( ( rule__TypeSelectExpression__TypeAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5875:1: ( ( rule__TypeSelectExpression__TypeAssignment_2 ) )
+            // InternalExpression.g:5874:1: ( ( ( rule__TypeSelectExpression__TypeAssignment_2 ) ) )
+            // InternalExpression.g:5875:1: ( ( rule__TypeSelectExpression__TypeAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5875:1: ( ( rule__TypeSelectExpression__TypeAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5876:1: ( rule__TypeSelectExpression__TypeAssignment_2 )
+            // InternalExpression.g:5875:1: ( ( rule__TypeSelectExpression__TypeAssignment_2 ) )
+            // InternalExpression.g:5876:1: ( rule__TypeSelectExpression__TypeAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTypeSelectExpressionAccess().getTypeAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5877:1: ( rule__TypeSelectExpression__TypeAssignment_2 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5877:2: rule__TypeSelectExpression__TypeAssignment_2
+            // InternalExpression.g:5877:1: ( rule__TypeSelectExpression__TypeAssignment_2 )
+            // InternalExpression.g:5877:2: rule__TypeSelectExpression__TypeAssignment_2
             {
-            pushFollow(FOLLOW_rule__TypeSelectExpression__TypeAssignment_2_in_rule__TypeSelectExpression__Group__2__Impl11888);
+            pushFollow(FOLLOW_2);
             rule__TypeSelectExpression__TypeAssignment_2();
 
             state._fsp--;
@@ -16836,16 +16836,16 @@ public final void rule__TypeSelectExpression__Group__2__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__TypeSelectExpression__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5887:1: rule__TypeSelectExpression__Group__3 : rule__TypeSelectExpression__Group__3__Impl ;
+    // InternalExpression.g:5887:1: rule__TypeSelectExpression__Group__3 : rule__TypeSelectExpression__Group__3__Impl ;
     public final void rule__TypeSelectExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5891:1: ( rule__TypeSelectExpression__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5892:2: rule__TypeSelectExpression__Group__3__Impl
+            // InternalExpression.g:5891:1: ( rule__TypeSelectExpression__Group__3__Impl )
+            // InternalExpression.g:5892:2: rule__TypeSelectExpression__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__TypeSelectExpression__Group__3__Impl_in_rule__TypeSelectExpression__Group__311918);
+            pushFollow(FOLLOW_2);
             rule__TypeSelectExpression__Group__3__Impl();
 
             state._fsp--;
@@ -16869,22 +16869,22 @@ public final void rule__TypeSelectExpression__Group__3() throws RecognitionExcep
 
 
     // $ANTLR start "rule__TypeSelectExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5898:1: rule__TypeSelectExpression__Group__3__Impl : ( ')' ) ;
+    // InternalExpression.g:5898:1: rule__TypeSelectExpression__Group__3__Impl : ( ')' ) ;
     public final void rule__TypeSelectExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5902:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5903:1: ( ')' )
+            // InternalExpression.g:5902:1: ( ( ')' ) )
+            // InternalExpression.g:5903:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5903:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5904:1: ')'
+            // InternalExpression.g:5903:1: ( ')' )
+            // InternalExpression.g:5904:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTypeSelectExpressionAccess().getRightParenthesisKeyword_3()); 
             }
-            match(input,40,FOLLOW_40_in_rule__TypeSelectExpression__Group__3__Impl11946); if (state.failed) return ;
+            match(input,40,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getTypeSelectExpressionAccess().getRightParenthesisKeyword_3()); 
             }
@@ -16910,21 +16910,21 @@ public final void rule__TypeSelectExpression__Group__3__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__CollectionExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5925:1: rule__CollectionExpression__Group__0 : rule__CollectionExpression__Group__0__Impl rule__CollectionExpression__Group__1 ;
+    // InternalExpression.g:5925:1: rule__CollectionExpression__Group__0 : rule__CollectionExpression__Group__0__Impl rule__CollectionExpression__Group__1 ;
     public final void rule__CollectionExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5929:1: ( rule__CollectionExpression__Group__0__Impl rule__CollectionExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5930:2: rule__CollectionExpression__Group__0__Impl rule__CollectionExpression__Group__1
+            // InternalExpression.g:5929:1: ( rule__CollectionExpression__Group__0__Impl rule__CollectionExpression__Group__1 )
+            // InternalExpression.g:5930:2: rule__CollectionExpression__Group__0__Impl rule__CollectionExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__CollectionExpression__Group__0__Impl_in_rule__CollectionExpression__Group__011985);
+            pushFollow(FOLLOW_33);
             rule__CollectionExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CollectionExpression__Group__1_in_rule__CollectionExpression__Group__011988);
+            pushFollow(FOLLOW_2);
             rule__CollectionExpression__Group__1();
 
             state._fsp--;
@@ -16948,25 +16948,25 @@ public final void rule__CollectionExpression__Group__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__CollectionExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5937:1: rule__CollectionExpression__Group__0__Impl : ( ( rule__CollectionExpression__NameAssignment_0 ) ) ;
+    // InternalExpression.g:5937:1: rule__CollectionExpression__Group__0__Impl : ( ( rule__CollectionExpression__NameAssignment_0 ) ) ;
     public final void rule__CollectionExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5941:1: ( ( ( rule__CollectionExpression__NameAssignment_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5942:1: ( ( rule__CollectionExpression__NameAssignment_0 ) )
+            // InternalExpression.g:5941:1: ( ( ( rule__CollectionExpression__NameAssignment_0 ) ) )
+            // InternalExpression.g:5942:1: ( ( rule__CollectionExpression__NameAssignment_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5942:1: ( ( rule__CollectionExpression__NameAssignment_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5943:1: ( rule__CollectionExpression__NameAssignment_0 )
+            // InternalExpression.g:5942:1: ( ( rule__CollectionExpression__NameAssignment_0 ) )
+            // InternalExpression.g:5943:1: ( rule__CollectionExpression__NameAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionExpressionAccess().getNameAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5944:1: ( rule__CollectionExpression__NameAssignment_0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5944:2: rule__CollectionExpression__NameAssignment_0
+            // InternalExpression.g:5944:1: ( rule__CollectionExpression__NameAssignment_0 )
+            // InternalExpression.g:5944:2: rule__CollectionExpression__NameAssignment_0
             {
-            pushFollow(FOLLOW_rule__CollectionExpression__NameAssignment_0_in_rule__CollectionExpression__Group__0__Impl12015);
+            pushFollow(FOLLOW_2);
             rule__CollectionExpression__NameAssignment_0();
 
             state._fsp--;
@@ -16999,21 +16999,21 @@ public final void rule__CollectionExpression__Group__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__CollectionExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5954:1: rule__CollectionExpression__Group__1 : rule__CollectionExpression__Group__1__Impl rule__CollectionExpression__Group__2 ;
+    // InternalExpression.g:5954:1: rule__CollectionExpression__Group__1 : rule__CollectionExpression__Group__1__Impl rule__CollectionExpression__Group__2 ;
     public final void rule__CollectionExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5958:1: ( rule__CollectionExpression__Group__1__Impl rule__CollectionExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5959:2: rule__CollectionExpression__Group__1__Impl rule__CollectionExpression__Group__2
+            // InternalExpression.g:5958:1: ( rule__CollectionExpression__Group__1__Impl rule__CollectionExpression__Group__2 )
+            // InternalExpression.g:5959:2: rule__CollectionExpression__Group__1__Impl rule__CollectionExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__CollectionExpression__Group__1__Impl_in_rule__CollectionExpression__Group__112045);
+            pushFollow(FOLLOW_5);
             rule__CollectionExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CollectionExpression__Group__2_in_rule__CollectionExpression__Group__112048);
+            pushFollow(FOLLOW_2);
             rule__CollectionExpression__Group__2();
 
             state._fsp--;
@@ -17037,22 +17037,22 @@ public final void rule__CollectionExpression__Group__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__CollectionExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5966:1: rule__CollectionExpression__Group__1__Impl : ( '(' ) ;
+    // InternalExpression.g:5966:1: rule__CollectionExpression__Group__1__Impl : ( '(' ) ;
     public final void rule__CollectionExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5970:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5971:1: ( '(' )
+            // InternalExpression.g:5970:1: ( ( '(' ) )
+            // InternalExpression.g:5971:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5971:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5972:1: '('
+            // InternalExpression.g:5971:1: ( '(' )
+            // InternalExpression.g:5972:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionExpressionAccess().getLeftParenthesisKeyword_1()); 
             }
-            match(input,39,FOLLOW_39_in_rule__CollectionExpression__Group__1__Impl12076); if (state.failed) return ;
+            match(input,39,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCollectionExpressionAccess().getLeftParenthesisKeyword_1()); 
             }
@@ -17078,21 +17078,21 @@ public final void rule__CollectionExpression__Group__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__CollectionExpression__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5985:1: rule__CollectionExpression__Group__2 : rule__CollectionExpression__Group__2__Impl rule__CollectionExpression__Group__3 ;
+    // InternalExpression.g:5985:1: rule__CollectionExpression__Group__2 : rule__CollectionExpression__Group__2__Impl rule__CollectionExpression__Group__3 ;
     public final void rule__CollectionExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5989:1: ( rule__CollectionExpression__Group__2__Impl rule__CollectionExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5990:2: rule__CollectionExpression__Group__2__Impl rule__CollectionExpression__Group__3
+            // InternalExpression.g:5989:1: ( rule__CollectionExpression__Group__2__Impl rule__CollectionExpression__Group__3 )
+            // InternalExpression.g:5990:2: rule__CollectionExpression__Group__2__Impl rule__CollectionExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__CollectionExpression__Group__2__Impl_in_rule__CollectionExpression__Group__212107);
+            pushFollow(FOLLOW_5);
             rule__CollectionExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CollectionExpression__Group__3_in_rule__CollectionExpression__Group__212110);
+            pushFollow(FOLLOW_2);
             rule__CollectionExpression__Group__3();
 
             state._fsp--;
@@ -17116,22 +17116,22 @@ public final void rule__CollectionExpression__Group__2() throws RecognitionExcep
 
 
     // $ANTLR start "rule__CollectionExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:5997:1: rule__CollectionExpression__Group__2__Impl : ( ( rule__CollectionExpression__Group_2__0 )? ) ;
+    // InternalExpression.g:5997:1: rule__CollectionExpression__Group__2__Impl : ( ( rule__CollectionExpression__Group_2__0 )? ) ;
     public final void rule__CollectionExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6001:1: ( ( ( rule__CollectionExpression__Group_2__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6002:1: ( ( rule__CollectionExpression__Group_2__0 )? )
+            // InternalExpression.g:6001:1: ( ( ( rule__CollectionExpression__Group_2__0 )? ) )
+            // InternalExpression.g:6002:1: ( ( rule__CollectionExpression__Group_2__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6002:1: ( ( rule__CollectionExpression__Group_2__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6003:1: ( rule__CollectionExpression__Group_2__0 )?
+            // InternalExpression.g:6002:1: ( ( rule__CollectionExpression__Group_2__0 )? )
+            // InternalExpression.g:6003:1: ( rule__CollectionExpression__Group_2__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionExpressionAccess().getGroup_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6004:1: ( rule__CollectionExpression__Group_2__0 )?
+            // InternalExpression.g:6004:1: ( rule__CollectionExpression__Group_2__0 )?
             int alt36=2;
             int LA36_0 = input.LA(1);
 
@@ -17144,9 +17144,9 @@ public final void rule__CollectionExpression__Group__2__Impl() throws Recognitio
             }
             switch (alt36) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6004:2: rule__CollectionExpression__Group_2__0
+                    // InternalExpression.g:6004:2: rule__CollectionExpression__Group_2__0
                     {
-                    pushFollow(FOLLOW_rule__CollectionExpression__Group_2__0_in_rule__CollectionExpression__Group__2__Impl12137);
+                    pushFollow(FOLLOW_2);
                     rule__CollectionExpression__Group_2__0();
 
                     state._fsp--;
@@ -17182,21 +17182,21 @@ public final void rule__CollectionExpression__Group__2__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__CollectionExpression__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6014:1: rule__CollectionExpression__Group__3 : rule__CollectionExpression__Group__3__Impl rule__CollectionExpression__Group__4 ;
+    // InternalExpression.g:6014:1: rule__CollectionExpression__Group__3 : rule__CollectionExpression__Group__3__Impl rule__CollectionExpression__Group__4 ;
     public final void rule__CollectionExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6018:1: ( rule__CollectionExpression__Group__3__Impl rule__CollectionExpression__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6019:2: rule__CollectionExpression__Group__3__Impl rule__CollectionExpression__Group__4
+            // InternalExpression.g:6018:1: ( rule__CollectionExpression__Group__3__Impl rule__CollectionExpression__Group__4 )
+            // InternalExpression.g:6019:2: rule__CollectionExpression__Group__3__Impl rule__CollectionExpression__Group__4
             {
-            pushFollow(FOLLOW_rule__CollectionExpression__Group__3__Impl_in_rule__CollectionExpression__Group__312168);
+            pushFollow(FOLLOW_8);
             rule__CollectionExpression__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CollectionExpression__Group__4_in_rule__CollectionExpression__Group__312171);
+            pushFollow(FOLLOW_2);
             rule__CollectionExpression__Group__4();
 
             state._fsp--;
@@ -17220,25 +17220,25 @@ public final void rule__CollectionExpression__Group__3() throws RecognitionExcep
 
 
     // $ANTLR start "rule__CollectionExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6026:1: rule__CollectionExpression__Group__3__Impl : ( ( rule__CollectionExpression__ExpAssignment_3 ) ) ;
+    // InternalExpression.g:6026:1: rule__CollectionExpression__Group__3__Impl : ( ( rule__CollectionExpression__ExpAssignment_3 ) ) ;
     public final void rule__CollectionExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6030:1: ( ( ( rule__CollectionExpression__ExpAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6031:1: ( ( rule__CollectionExpression__ExpAssignment_3 ) )
+            // InternalExpression.g:6030:1: ( ( ( rule__CollectionExpression__ExpAssignment_3 ) ) )
+            // InternalExpression.g:6031:1: ( ( rule__CollectionExpression__ExpAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6031:1: ( ( rule__CollectionExpression__ExpAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6032:1: ( rule__CollectionExpression__ExpAssignment_3 )
+            // InternalExpression.g:6031:1: ( ( rule__CollectionExpression__ExpAssignment_3 ) )
+            // InternalExpression.g:6032:1: ( rule__CollectionExpression__ExpAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionExpressionAccess().getExpAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6033:1: ( rule__CollectionExpression__ExpAssignment_3 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6033:2: rule__CollectionExpression__ExpAssignment_3
+            // InternalExpression.g:6033:1: ( rule__CollectionExpression__ExpAssignment_3 )
+            // InternalExpression.g:6033:2: rule__CollectionExpression__ExpAssignment_3
             {
-            pushFollow(FOLLOW_rule__CollectionExpression__ExpAssignment_3_in_rule__CollectionExpression__Group__3__Impl12198);
+            pushFollow(FOLLOW_2);
             rule__CollectionExpression__ExpAssignment_3();
 
             state._fsp--;
@@ -17271,16 +17271,16 @@ public final void rule__CollectionExpression__Group__3__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__CollectionExpression__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6043:1: rule__CollectionExpression__Group__4 : rule__CollectionExpression__Group__4__Impl ;
+    // InternalExpression.g:6043:1: rule__CollectionExpression__Group__4 : rule__CollectionExpression__Group__4__Impl ;
     public final void rule__CollectionExpression__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6047:1: ( rule__CollectionExpression__Group__4__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6048:2: rule__CollectionExpression__Group__4__Impl
+            // InternalExpression.g:6047:1: ( rule__CollectionExpression__Group__4__Impl )
+            // InternalExpression.g:6048:2: rule__CollectionExpression__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__CollectionExpression__Group__4__Impl_in_rule__CollectionExpression__Group__412228);
+            pushFollow(FOLLOW_2);
             rule__CollectionExpression__Group__4__Impl();
 
             state._fsp--;
@@ -17304,22 +17304,22 @@ public final void rule__CollectionExpression__Group__4() throws RecognitionExcep
 
 
     // $ANTLR start "rule__CollectionExpression__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6054:1: rule__CollectionExpression__Group__4__Impl : ( ')' ) ;
+    // InternalExpression.g:6054:1: rule__CollectionExpression__Group__4__Impl : ( ')' ) ;
     public final void rule__CollectionExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6058:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6059:1: ( ')' )
+            // InternalExpression.g:6058:1: ( ( ')' ) )
+            // InternalExpression.g:6059:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6059:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6060:1: ')'
+            // InternalExpression.g:6059:1: ( ')' )
+            // InternalExpression.g:6060:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionExpressionAccess().getRightParenthesisKeyword_4()); 
             }
-            match(input,40,FOLLOW_40_in_rule__CollectionExpression__Group__4__Impl12256); if (state.failed) return ;
+            match(input,40,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCollectionExpressionAccess().getRightParenthesisKeyword_4()); 
             }
@@ -17345,21 +17345,21 @@ public final void rule__CollectionExpression__Group__4__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__CollectionExpression__Group_2__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6083:1: rule__CollectionExpression__Group_2__0 : rule__CollectionExpression__Group_2__0__Impl rule__CollectionExpression__Group_2__1 ;
+    // InternalExpression.g:6083:1: rule__CollectionExpression__Group_2__0 : rule__CollectionExpression__Group_2__0__Impl rule__CollectionExpression__Group_2__1 ;
     public final void rule__CollectionExpression__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6087:1: ( rule__CollectionExpression__Group_2__0__Impl rule__CollectionExpression__Group_2__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6088:2: rule__CollectionExpression__Group_2__0__Impl rule__CollectionExpression__Group_2__1
+            // InternalExpression.g:6087:1: ( rule__CollectionExpression__Group_2__0__Impl rule__CollectionExpression__Group_2__1 )
+            // InternalExpression.g:6088:2: rule__CollectionExpression__Group_2__0__Impl rule__CollectionExpression__Group_2__1
             {
-            pushFollow(FOLLOW_rule__CollectionExpression__Group_2__0__Impl_in_rule__CollectionExpression__Group_2__012297);
+            pushFollow(FOLLOW_39);
             rule__CollectionExpression__Group_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CollectionExpression__Group_2__1_in_rule__CollectionExpression__Group_2__012300);
+            pushFollow(FOLLOW_2);
             rule__CollectionExpression__Group_2__1();
 
             state._fsp--;
@@ -17383,25 +17383,25 @@ public final void rule__CollectionExpression__Group_2__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__CollectionExpression__Group_2__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6095:1: rule__CollectionExpression__Group_2__0__Impl : ( ( rule__CollectionExpression__VarAssignment_2_0 ) ) ;
+    // InternalExpression.g:6095:1: rule__CollectionExpression__Group_2__0__Impl : ( ( rule__CollectionExpression__VarAssignment_2_0 ) ) ;
     public final void rule__CollectionExpression__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6099:1: ( ( ( rule__CollectionExpression__VarAssignment_2_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6100:1: ( ( rule__CollectionExpression__VarAssignment_2_0 ) )
+            // InternalExpression.g:6099:1: ( ( ( rule__CollectionExpression__VarAssignment_2_0 ) ) )
+            // InternalExpression.g:6100:1: ( ( rule__CollectionExpression__VarAssignment_2_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6100:1: ( ( rule__CollectionExpression__VarAssignment_2_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6101:1: ( rule__CollectionExpression__VarAssignment_2_0 )
+            // InternalExpression.g:6100:1: ( ( rule__CollectionExpression__VarAssignment_2_0 ) )
+            // InternalExpression.g:6101:1: ( rule__CollectionExpression__VarAssignment_2_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionExpressionAccess().getVarAssignment_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6102:1: ( rule__CollectionExpression__VarAssignment_2_0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6102:2: rule__CollectionExpression__VarAssignment_2_0
+            // InternalExpression.g:6102:1: ( rule__CollectionExpression__VarAssignment_2_0 )
+            // InternalExpression.g:6102:2: rule__CollectionExpression__VarAssignment_2_0
             {
-            pushFollow(FOLLOW_rule__CollectionExpression__VarAssignment_2_0_in_rule__CollectionExpression__Group_2__0__Impl12327);
+            pushFollow(FOLLOW_2);
             rule__CollectionExpression__VarAssignment_2_0();
 
             state._fsp--;
@@ -17434,16 +17434,16 @@ public final void rule__CollectionExpression__Group_2__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__CollectionExpression__Group_2__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6112:1: rule__CollectionExpression__Group_2__1 : rule__CollectionExpression__Group_2__1__Impl ;
+    // InternalExpression.g:6112:1: rule__CollectionExpression__Group_2__1 : rule__CollectionExpression__Group_2__1__Impl ;
     public final void rule__CollectionExpression__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6116:1: ( rule__CollectionExpression__Group_2__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6117:2: rule__CollectionExpression__Group_2__1__Impl
+            // InternalExpression.g:6116:1: ( rule__CollectionExpression__Group_2__1__Impl )
+            // InternalExpression.g:6117:2: rule__CollectionExpression__Group_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__CollectionExpression__Group_2__1__Impl_in_rule__CollectionExpression__Group_2__112357);
+            pushFollow(FOLLOW_2);
             rule__CollectionExpression__Group_2__1__Impl();
 
             state._fsp--;
@@ -17467,22 +17467,22 @@ public final void rule__CollectionExpression__Group_2__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__CollectionExpression__Group_2__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6123:1: rule__CollectionExpression__Group_2__1__Impl : ( '|' ) ;
+    // InternalExpression.g:6123:1: rule__CollectionExpression__Group_2__1__Impl : ( '|' ) ;
     public final void rule__CollectionExpression__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6127:1: ( ( '|' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6128:1: ( '|' )
+            // InternalExpression.g:6127:1: ( ( '|' ) )
+            // InternalExpression.g:6128:1: ( '|' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6128:1: ( '|' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6129:1: '|'
+            // InternalExpression.g:6128:1: ( '|' )
+            // InternalExpression.g:6129:1: '|'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionExpressionAccess().getVerticalLineKeyword_2_1()); 
             }
-            match(input,53,FOLLOW_53_in_rule__CollectionExpression__Group_2__1__Impl12385); if (state.failed) return ;
+            match(input,53,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCollectionExpressionAccess().getVerticalLineKeyword_2_1()); 
             }
@@ -17508,21 +17508,21 @@ public final void rule__CollectionExpression__Group_2__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__CollectionType__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6146:1: rule__CollectionType__Group__0 : rule__CollectionType__Group__0__Impl rule__CollectionType__Group__1 ;
+    // InternalExpression.g:6146:1: rule__CollectionType__Group__0 : rule__CollectionType__Group__0__Impl rule__CollectionType__Group__1 ;
     public final void rule__CollectionType__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6150:1: ( rule__CollectionType__Group__0__Impl rule__CollectionType__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6151:2: rule__CollectionType__Group__0__Impl rule__CollectionType__Group__1
+            // InternalExpression.g:6150:1: ( rule__CollectionType__Group__0__Impl rule__CollectionType__Group__1 )
+            // InternalExpression.g:6151:2: rule__CollectionType__Group__0__Impl rule__CollectionType__Group__1
             {
-            pushFollow(FOLLOW_rule__CollectionType__Group__0__Impl_in_rule__CollectionType__Group__012420);
+            pushFollow(FOLLOW_42);
             rule__CollectionType__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CollectionType__Group__1_in_rule__CollectionType__Group__012423);
+            pushFollow(FOLLOW_2);
             rule__CollectionType__Group__1();
 
             state._fsp--;
@@ -17546,25 +17546,25 @@ public final void rule__CollectionType__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__CollectionType__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6158:1: rule__CollectionType__Group__0__Impl : ( ( rule__CollectionType__ClAssignment_0 ) ) ;
+    // InternalExpression.g:6158:1: rule__CollectionType__Group__0__Impl : ( ( rule__CollectionType__ClAssignment_0 ) ) ;
     public final void rule__CollectionType__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6162:1: ( ( ( rule__CollectionType__ClAssignment_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6163:1: ( ( rule__CollectionType__ClAssignment_0 ) )
+            // InternalExpression.g:6162:1: ( ( ( rule__CollectionType__ClAssignment_0 ) ) )
+            // InternalExpression.g:6163:1: ( ( rule__CollectionType__ClAssignment_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6163:1: ( ( rule__CollectionType__ClAssignment_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6164:1: ( rule__CollectionType__ClAssignment_0 )
+            // InternalExpression.g:6163:1: ( ( rule__CollectionType__ClAssignment_0 ) )
+            // InternalExpression.g:6164:1: ( rule__CollectionType__ClAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionTypeAccess().getClAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6165:1: ( rule__CollectionType__ClAssignment_0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6165:2: rule__CollectionType__ClAssignment_0
+            // InternalExpression.g:6165:1: ( rule__CollectionType__ClAssignment_0 )
+            // InternalExpression.g:6165:2: rule__CollectionType__ClAssignment_0
             {
-            pushFollow(FOLLOW_rule__CollectionType__ClAssignment_0_in_rule__CollectionType__Group__0__Impl12450);
+            pushFollow(FOLLOW_2);
             rule__CollectionType__ClAssignment_0();
 
             state._fsp--;
@@ -17597,21 +17597,21 @@ public final void rule__CollectionType__Group__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__CollectionType__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6175:1: rule__CollectionType__Group__1 : rule__CollectionType__Group__1__Impl rule__CollectionType__Group__2 ;
+    // InternalExpression.g:6175:1: rule__CollectionType__Group__1 : rule__CollectionType__Group__1__Impl rule__CollectionType__Group__2 ;
     public final void rule__CollectionType__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6179:1: ( rule__CollectionType__Group__1__Impl rule__CollectionType__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6180:2: rule__CollectionType__Group__1__Impl rule__CollectionType__Group__2
+            // InternalExpression.g:6179:1: ( rule__CollectionType__Group__1__Impl rule__CollectionType__Group__2 )
+            // InternalExpression.g:6180:2: rule__CollectionType__Group__1__Impl rule__CollectionType__Group__2
             {
-            pushFollow(FOLLOW_rule__CollectionType__Group__1__Impl_in_rule__CollectionType__Group__112480);
+            pushFollow(FOLLOW_7);
             rule__CollectionType__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CollectionType__Group__2_in_rule__CollectionType__Group__112483);
+            pushFollow(FOLLOW_2);
             rule__CollectionType__Group__2();
 
             state._fsp--;
@@ -17635,22 +17635,22 @@ public final void rule__CollectionType__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__CollectionType__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6187:1: rule__CollectionType__Group__1__Impl : ( '[' ) ;
+    // InternalExpression.g:6187:1: rule__CollectionType__Group__1__Impl : ( '[' ) ;
     public final void rule__CollectionType__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6191:1: ( ( '[' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6192:1: ( '[' )
+            // InternalExpression.g:6191:1: ( ( '[' ) )
+            // InternalExpression.g:6192:1: ( '[' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6192:1: ( '[' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6193:1: '['
+            // InternalExpression.g:6192:1: ( '[' )
+            // InternalExpression.g:6193:1: '['
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionTypeAccess().getLeftSquareBracketKeyword_1()); 
             }
-            match(input,56,FOLLOW_56_in_rule__CollectionType__Group__1__Impl12511); if (state.failed) return ;
+            match(input,56,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCollectionTypeAccess().getLeftSquareBracketKeyword_1()); 
             }
@@ -17676,21 +17676,21 @@ public final void rule__CollectionType__Group__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__CollectionType__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6206:1: rule__CollectionType__Group__2 : rule__CollectionType__Group__2__Impl rule__CollectionType__Group__3 ;
+    // InternalExpression.g:6206:1: rule__CollectionType__Group__2 : rule__CollectionType__Group__2__Impl rule__CollectionType__Group__3 ;
     public final void rule__CollectionType__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6210:1: ( rule__CollectionType__Group__2__Impl rule__CollectionType__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6211:2: rule__CollectionType__Group__2__Impl rule__CollectionType__Group__3
+            // InternalExpression.g:6210:1: ( rule__CollectionType__Group__2__Impl rule__CollectionType__Group__3 )
+            // InternalExpression.g:6211:2: rule__CollectionType__Group__2__Impl rule__CollectionType__Group__3
             {
-            pushFollow(FOLLOW_rule__CollectionType__Group__2__Impl_in_rule__CollectionType__Group__212542);
+            pushFollow(FOLLOW_43);
             rule__CollectionType__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CollectionType__Group__3_in_rule__CollectionType__Group__212545);
+            pushFollow(FOLLOW_2);
             rule__CollectionType__Group__3();
 
             state._fsp--;
@@ -17714,25 +17714,25 @@ public final void rule__CollectionType__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__CollectionType__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6218:1: rule__CollectionType__Group__2__Impl : ( ( rule__CollectionType__Id1Assignment_2 ) ) ;
+    // InternalExpression.g:6218:1: rule__CollectionType__Group__2__Impl : ( ( rule__CollectionType__Id1Assignment_2 ) ) ;
     public final void rule__CollectionType__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6222:1: ( ( ( rule__CollectionType__Id1Assignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6223:1: ( ( rule__CollectionType__Id1Assignment_2 ) )
+            // InternalExpression.g:6222:1: ( ( ( rule__CollectionType__Id1Assignment_2 ) ) )
+            // InternalExpression.g:6223:1: ( ( rule__CollectionType__Id1Assignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6223:1: ( ( rule__CollectionType__Id1Assignment_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6224:1: ( rule__CollectionType__Id1Assignment_2 )
+            // InternalExpression.g:6223:1: ( ( rule__CollectionType__Id1Assignment_2 ) )
+            // InternalExpression.g:6224:1: ( rule__CollectionType__Id1Assignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionTypeAccess().getId1Assignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6225:1: ( rule__CollectionType__Id1Assignment_2 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6225:2: rule__CollectionType__Id1Assignment_2
+            // InternalExpression.g:6225:1: ( rule__CollectionType__Id1Assignment_2 )
+            // InternalExpression.g:6225:2: rule__CollectionType__Id1Assignment_2
             {
-            pushFollow(FOLLOW_rule__CollectionType__Id1Assignment_2_in_rule__CollectionType__Group__2__Impl12572);
+            pushFollow(FOLLOW_2);
             rule__CollectionType__Id1Assignment_2();
 
             state._fsp--;
@@ -17765,16 +17765,16 @@ public final void rule__CollectionType__Group__2__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__CollectionType__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6235:1: rule__CollectionType__Group__3 : rule__CollectionType__Group__3__Impl ;
+    // InternalExpression.g:6235:1: rule__CollectionType__Group__3 : rule__CollectionType__Group__3__Impl ;
     public final void rule__CollectionType__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6239:1: ( rule__CollectionType__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6240:2: rule__CollectionType__Group__3__Impl
+            // InternalExpression.g:6239:1: ( rule__CollectionType__Group__3__Impl )
+            // InternalExpression.g:6240:2: rule__CollectionType__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__CollectionType__Group__3__Impl_in_rule__CollectionType__Group__312602);
+            pushFollow(FOLLOW_2);
             rule__CollectionType__Group__3__Impl();
 
             state._fsp--;
@@ -17798,22 +17798,22 @@ public final void rule__CollectionType__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__CollectionType__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6246:1: rule__CollectionType__Group__3__Impl : ( ']' ) ;
+    // InternalExpression.g:6246:1: rule__CollectionType__Group__3__Impl : ( ']' ) ;
     public final void rule__CollectionType__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6250:1: ( ( ']' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6251:1: ( ']' )
+            // InternalExpression.g:6250:1: ( ( ']' ) )
+            // InternalExpression.g:6251:1: ( ']' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6251:1: ( ']' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6252:1: ']'
+            // InternalExpression.g:6251:1: ( ']' )
+            // InternalExpression.g:6252:1: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionTypeAccess().getRightSquareBracketKeyword_3()); 
             }
-            match(input,57,FOLLOW_57_in_rule__CollectionType__Group__3__Impl12630); if (state.failed) return ;
+            match(input,57,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCollectionTypeAccess().getRightSquareBracketKeyword_3()); 
             }
@@ -17839,21 +17839,21 @@ public final void rule__CollectionType__Group__3__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__SimpleType__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6273:1: rule__SimpleType__Group__0 : rule__SimpleType__Group__0__Impl rule__SimpleType__Group__1 ;
+    // InternalExpression.g:6273:1: rule__SimpleType__Group__0 : rule__SimpleType__Group__0__Impl rule__SimpleType__Group__1 ;
     public final void rule__SimpleType__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6277:1: ( rule__SimpleType__Group__0__Impl rule__SimpleType__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6278:2: rule__SimpleType__Group__0__Impl rule__SimpleType__Group__1
+            // InternalExpression.g:6277:1: ( rule__SimpleType__Group__0__Impl rule__SimpleType__Group__1 )
+            // InternalExpression.g:6278:2: rule__SimpleType__Group__0__Impl rule__SimpleType__Group__1
             {
-            pushFollow(FOLLOW_rule__SimpleType__Group__0__Impl_in_rule__SimpleType__Group__012669);
+            pushFollow(FOLLOW_44);
             rule__SimpleType__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SimpleType__Group__1_in_rule__SimpleType__Group__012672);
+            pushFollow(FOLLOW_2);
             rule__SimpleType__Group__1();
 
             state._fsp--;
@@ -17877,25 +17877,25 @@ public final void rule__SimpleType__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__SimpleType__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6285:1: rule__SimpleType__Group__0__Impl : ( ( rule__SimpleType__IdAssignment_0 ) ) ;
+    // InternalExpression.g:6285:1: rule__SimpleType__Group__0__Impl : ( ( rule__SimpleType__IdAssignment_0 ) ) ;
     public final void rule__SimpleType__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6289:1: ( ( ( rule__SimpleType__IdAssignment_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6290:1: ( ( rule__SimpleType__IdAssignment_0 ) )
+            // InternalExpression.g:6289:1: ( ( ( rule__SimpleType__IdAssignment_0 ) ) )
+            // InternalExpression.g:6290:1: ( ( rule__SimpleType__IdAssignment_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6290:1: ( ( rule__SimpleType__IdAssignment_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6291:1: ( rule__SimpleType__IdAssignment_0 )
+            // InternalExpression.g:6290:1: ( ( rule__SimpleType__IdAssignment_0 ) )
+            // InternalExpression.g:6291:1: ( rule__SimpleType__IdAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSimpleTypeAccess().getIdAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6292:1: ( rule__SimpleType__IdAssignment_0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6292:2: rule__SimpleType__IdAssignment_0
+            // InternalExpression.g:6292:1: ( rule__SimpleType__IdAssignment_0 )
+            // InternalExpression.g:6292:2: rule__SimpleType__IdAssignment_0
             {
-            pushFollow(FOLLOW_rule__SimpleType__IdAssignment_0_in_rule__SimpleType__Group__0__Impl12699);
+            pushFollow(FOLLOW_2);
             rule__SimpleType__IdAssignment_0();
 
             state._fsp--;
@@ -17928,16 +17928,16 @@ public final void rule__SimpleType__Group__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__SimpleType__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6302:1: rule__SimpleType__Group__1 : rule__SimpleType__Group__1__Impl ;
+    // InternalExpression.g:6302:1: rule__SimpleType__Group__1 : rule__SimpleType__Group__1__Impl ;
     public final void rule__SimpleType__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6306:1: ( rule__SimpleType__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6307:2: rule__SimpleType__Group__1__Impl
+            // InternalExpression.g:6306:1: ( rule__SimpleType__Group__1__Impl )
+            // InternalExpression.g:6307:2: rule__SimpleType__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__SimpleType__Group__1__Impl_in_rule__SimpleType__Group__112729);
+            pushFollow(FOLLOW_2);
             rule__SimpleType__Group__1__Impl();
 
             state._fsp--;
@@ -17961,22 +17961,22 @@ public final void rule__SimpleType__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__SimpleType__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6313:1: rule__SimpleType__Group__1__Impl : ( ( rule__SimpleType__Group_1__0 )* ) ;
+    // InternalExpression.g:6313:1: rule__SimpleType__Group__1__Impl : ( ( rule__SimpleType__Group_1__0 )* ) ;
     public final void rule__SimpleType__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6317:1: ( ( ( rule__SimpleType__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6318:1: ( ( rule__SimpleType__Group_1__0 )* )
+            // InternalExpression.g:6317:1: ( ( ( rule__SimpleType__Group_1__0 )* ) )
+            // InternalExpression.g:6318:1: ( ( rule__SimpleType__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6318:1: ( ( rule__SimpleType__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6319:1: ( rule__SimpleType__Group_1__0 )*
+            // InternalExpression.g:6318:1: ( ( rule__SimpleType__Group_1__0 )* )
+            // InternalExpression.g:6319:1: ( rule__SimpleType__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSimpleTypeAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6320:1: ( rule__SimpleType__Group_1__0 )*
+            // InternalExpression.g:6320:1: ( rule__SimpleType__Group_1__0 )*
             loop37:
             do {
                 int alt37=2;
@@ -17989,9 +17989,9 @@ public final void rule__SimpleType__Group__1__Impl() throws RecognitionException
 
                 switch (alt37) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6320:2: rule__SimpleType__Group_1__0
+            	    // InternalExpression.g:6320:2: rule__SimpleType__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__SimpleType__Group_1__0_in_rule__SimpleType__Group__1__Impl12756);
+            	    pushFollow(FOLLOW_45);
             	    rule__SimpleType__Group_1__0();
 
             	    state._fsp--;
@@ -18030,21 +18030,21 @@ public final void rule__SimpleType__Group__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__SimpleType__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6334:1: rule__SimpleType__Group_1__0 : rule__SimpleType__Group_1__0__Impl rule__SimpleType__Group_1__1 ;
+    // InternalExpression.g:6334:1: rule__SimpleType__Group_1__0 : rule__SimpleType__Group_1__0__Impl rule__SimpleType__Group_1__1 ;
     public final void rule__SimpleType__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6338:1: ( rule__SimpleType__Group_1__0__Impl rule__SimpleType__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6339:2: rule__SimpleType__Group_1__0__Impl rule__SimpleType__Group_1__1
+            // InternalExpression.g:6338:1: ( rule__SimpleType__Group_1__0__Impl rule__SimpleType__Group_1__1 )
+            // InternalExpression.g:6339:2: rule__SimpleType__Group_1__0__Impl rule__SimpleType__Group_1__1
             {
-            pushFollow(FOLLOW_rule__SimpleType__Group_1__0__Impl_in_rule__SimpleType__Group_1__012791);
+            pushFollow(FOLLOW_3);
             rule__SimpleType__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SimpleType__Group_1__1_in_rule__SimpleType__Group_1__012794);
+            pushFollow(FOLLOW_2);
             rule__SimpleType__Group_1__1();
 
             state._fsp--;
@@ -18068,22 +18068,22 @@ public final void rule__SimpleType__Group_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__SimpleType__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6346:1: rule__SimpleType__Group_1__0__Impl : ( '::' ) ;
+    // InternalExpression.g:6346:1: rule__SimpleType__Group_1__0__Impl : ( '::' ) ;
     public final void rule__SimpleType__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6350:1: ( ( '::' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6351:1: ( '::' )
+            // InternalExpression.g:6350:1: ( ( '::' ) )
+            // InternalExpression.g:6351:1: ( '::' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6351:1: ( '::' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6352:1: '::'
+            // InternalExpression.g:6351:1: ( '::' )
+            // InternalExpression.g:6352:1: '::'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSimpleTypeAccess().getColonColonKeyword_1_0()); 
             }
-            match(input,58,FOLLOW_58_in_rule__SimpleType__Group_1__0__Impl12822); if (state.failed) return ;
+            match(input,58,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSimpleTypeAccess().getColonColonKeyword_1_0()); 
             }
@@ -18109,16 +18109,16 @@ public final void rule__SimpleType__Group_1__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__SimpleType__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6365:1: rule__SimpleType__Group_1__1 : rule__SimpleType__Group_1__1__Impl ;
+    // InternalExpression.g:6365:1: rule__SimpleType__Group_1__1 : rule__SimpleType__Group_1__1__Impl ;
     public final void rule__SimpleType__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6369:1: ( rule__SimpleType__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6370:2: rule__SimpleType__Group_1__1__Impl
+            // InternalExpression.g:6369:1: ( rule__SimpleType__Group_1__1__Impl )
+            // InternalExpression.g:6370:2: rule__SimpleType__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__SimpleType__Group_1__1__Impl_in_rule__SimpleType__Group_1__112853);
+            pushFollow(FOLLOW_2);
             rule__SimpleType__Group_1__1__Impl();
 
             state._fsp--;
@@ -18142,25 +18142,25 @@ public final void rule__SimpleType__Group_1__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__SimpleType__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6376:1: rule__SimpleType__Group_1__1__Impl : ( ( rule__SimpleType__IdAssignment_1_1 ) ) ;
+    // InternalExpression.g:6376:1: rule__SimpleType__Group_1__1__Impl : ( ( rule__SimpleType__IdAssignment_1_1 ) ) ;
     public final void rule__SimpleType__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6380:1: ( ( ( rule__SimpleType__IdAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6381:1: ( ( rule__SimpleType__IdAssignment_1_1 ) )
+            // InternalExpression.g:6380:1: ( ( ( rule__SimpleType__IdAssignment_1_1 ) ) )
+            // InternalExpression.g:6381:1: ( ( rule__SimpleType__IdAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6381:1: ( ( rule__SimpleType__IdAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6382:1: ( rule__SimpleType__IdAssignment_1_1 )
+            // InternalExpression.g:6381:1: ( ( rule__SimpleType__IdAssignment_1_1 ) )
+            // InternalExpression.g:6382:1: ( rule__SimpleType__IdAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSimpleTypeAccess().getIdAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6383:1: ( rule__SimpleType__IdAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6383:2: rule__SimpleType__IdAssignment_1_1
+            // InternalExpression.g:6383:1: ( rule__SimpleType__IdAssignment_1_1 )
+            // InternalExpression.g:6383:2: rule__SimpleType__IdAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__SimpleType__IdAssignment_1_1_in_rule__SimpleType__Group_1__1__Impl12880);
+            pushFollow(FOLLOW_2);
             rule__SimpleType__IdAssignment_1_1();
 
             state._fsp--;
@@ -18193,22 +18193,22 @@ public final void rule__SimpleType__Group_1__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__LetExpression__IdentifierAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6398:1: rule__LetExpression__IdentifierAssignment_1 : ( ruleIdentifier ) ;
+    // InternalExpression.g:6398:1: rule__LetExpression__IdentifierAssignment_1 : ( ruleIdentifier ) ;
     public final void rule__LetExpression__IdentifierAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6402:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6403:1: ( ruleIdentifier )
+            // InternalExpression.g:6402:1: ( ( ruleIdentifier ) )
+            // InternalExpression.g:6403:1: ( ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6403:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6404:1: ruleIdentifier
+            // InternalExpression.g:6403:1: ( ruleIdentifier )
+            // InternalExpression.g:6404:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLetExpressionAccess().getIdentifierIdentifierParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__LetExpression__IdentifierAssignment_112919);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -18238,22 +18238,22 @@ public final void rule__LetExpression__IdentifierAssignment_1() throws Recogniti
 
 
     // $ANTLR start "rule__LetExpression__VarExprAssignment_3"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6413:1: rule__LetExpression__VarExprAssignment_3 : ( ruleExpression ) ;
+    // InternalExpression.g:6413:1: rule__LetExpression__VarExprAssignment_3 : ( ruleExpression ) ;
     public final void rule__LetExpression__VarExprAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6417:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6418:1: ( ruleExpression )
+            // InternalExpression.g:6417:1: ( ( ruleExpression ) )
+            // InternalExpression.g:6418:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6418:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6419:1: ruleExpression
+            // InternalExpression.g:6418:1: ( ruleExpression )
+            // InternalExpression.g:6419:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLetExpressionAccess().getVarExprExpressionParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__LetExpression__VarExprAssignment_312950);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -18283,22 +18283,22 @@ public final void rule__LetExpression__VarExprAssignment_3() throws RecognitionE
 
 
     // $ANTLR start "rule__LetExpression__TargetAssignment_5"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6428:1: rule__LetExpression__TargetAssignment_5 : ( ruleExpression ) ;
+    // InternalExpression.g:6428:1: rule__LetExpression__TargetAssignment_5 : ( ruleExpression ) ;
     public final void rule__LetExpression__TargetAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6432:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6433:1: ( ruleExpression )
+            // InternalExpression.g:6432:1: ( ( ruleExpression ) )
+            // InternalExpression.g:6433:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6433:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6434:1: ruleExpression
+            // InternalExpression.g:6433:1: ( ruleExpression )
+            // InternalExpression.g:6434:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLetExpressionAccess().getTargetExpressionParserRuleCall_5_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__LetExpression__TargetAssignment_512981);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -18328,22 +18328,22 @@ public final void rule__LetExpression__TargetAssignment_5() throws RecognitionEx
 
 
     // $ANTLR start "rule__CastedExpression__TypeAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6443:1: rule__CastedExpression__TypeAssignment_1 : ( ruleType ) ;
+    // InternalExpression.g:6443:1: rule__CastedExpression__TypeAssignment_1 : ( ruleType ) ;
     public final void rule__CastedExpression__TypeAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6447:1: ( ( ruleType ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6448:1: ( ruleType )
+            // InternalExpression.g:6447:1: ( ( ruleType ) )
+            // InternalExpression.g:6448:1: ( ruleType )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6448:1: ( ruleType )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6449:1: ruleType
+            // InternalExpression.g:6448:1: ( ruleType )
+            // InternalExpression.g:6449:1: ruleType
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCastedExpressionAccess().getTypeTypeParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleType_in_rule__CastedExpression__TypeAssignment_113012);
+            pushFollow(FOLLOW_2);
             ruleType();
 
             state._fsp--;
@@ -18373,22 +18373,22 @@ public final void rule__CastedExpression__TypeAssignment_1() throws RecognitionE
 
 
     // $ANTLR start "rule__CastedExpression__TargetAssignment_3"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6458:1: rule__CastedExpression__TargetAssignment_3 : ( ruleExpression ) ;
+    // InternalExpression.g:6458:1: rule__CastedExpression__TargetAssignment_3 : ( ruleExpression ) ;
     public final void rule__CastedExpression__TargetAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6462:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6463:1: ( ruleExpression )
+            // InternalExpression.g:6462:1: ( ( ruleExpression ) )
+            // InternalExpression.g:6463:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6463:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6464:1: ruleExpression
+            // InternalExpression.g:6463:1: ( ruleExpression )
+            // InternalExpression.g:6464:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCastedExpressionAccess().getTargetExpressionParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__CastedExpression__TargetAssignment_313043);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -18418,22 +18418,22 @@ public final void rule__CastedExpression__TargetAssignment_3() throws Recognitio
 
 
     // $ANTLR start "rule__ChainExpression__NextAssignment_1_2"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6473:1: rule__ChainExpression__NextAssignment_1_2 : ( ruleChainedExpression ) ;
+    // InternalExpression.g:6473:1: rule__ChainExpression__NextAssignment_1_2 : ( ruleChainedExpression ) ;
     public final void rule__ChainExpression__NextAssignment_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6477:1: ( ( ruleChainedExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6478:1: ( ruleChainedExpression )
+            // InternalExpression.g:6477:1: ( ( ruleChainedExpression ) )
+            // InternalExpression.g:6478:1: ( ruleChainedExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6478:1: ( ruleChainedExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6479:1: ruleChainedExpression
+            // InternalExpression.g:6478:1: ( ruleChainedExpression )
+            // InternalExpression.g:6479:1: ruleChainedExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getChainExpressionAccess().getNextChainedExpressionParserRuleCall_1_2_0()); 
             }
-            pushFollow(FOLLOW_ruleChainedExpression_in_rule__ChainExpression__NextAssignment_1_213074);
+            pushFollow(FOLLOW_2);
             ruleChainedExpression();
 
             state._fsp--;
@@ -18463,22 +18463,22 @@ public final void rule__ChainExpression__NextAssignment_1_2() throws Recognition
 
 
     // $ANTLR start "rule__IfExpressionTri__ThenPartAssignment_1_2"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6488:1: rule__IfExpressionTri__ThenPartAssignment_1_2 : ( ruleChainedExpression ) ;
+    // InternalExpression.g:6488:1: rule__IfExpressionTri__ThenPartAssignment_1_2 : ( ruleChainedExpression ) ;
     public final void rule__IfExpressionTri__ThenPartAssignment_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6492:1: ( ( ruleChainedExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6493:1: ( ruleChainedExpression )
+            // InternalExpression.g:6492:1: ( ( ruleChainedExpression ) )
+            // InternalExpression.g:6493:1: ( ruleChainedExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6493:1: ( ruleChainedExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6494:1: ruleChainedExpression
+            // InternalExpression.g:6493:1: ( ruleChainedExpression )
+            // InternalExpression.g:6494:1: ruleChainedExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionTriAccess().getThenPartChainedExpressionParserRuleCall_1_2_0()); 
             }
-            pushFollow(FOLLOW_ruleChainedExpression_in_rule__IfExpressionTri__ThenPartAssignment_1_213105);
+            pushFollow(FOLLOW_2);
             ruleChainedExpression();
 
             state._fsp--;
@@ -18508,22 +18508,22 @@ public final void rule__IfExpressionTri__ThenPartAssignment_1_2() throws Recogni
 
 
     // $ANTLR start "rule__IfExpressionTri__ElsePartAssignment_1_4"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6503:1: rule__IfExpressionTri__ElsePartAssignment_1_4 : ( ruleChainedExpression ) ;
+    // InternalExpression.g:6503:1: rule__IfExpressionTri__ElsePartAssignment_1_4 : ( ruleChainedExpression ) ;
     public final void rule__IfExpressionTri__ElsePartAssignment_1_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6507:1: ( ( ruleChainedExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6508:1: ( ruleChainedExpression )
+            // InternalExpression.g:6507:1: ( ( ruleChainedExpression ) )
+            // InternalExpression.g:6508:1: ( ruleChainedExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6508:1: ( ruleChainedExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6509:1: ruleChainedExpression
+            // InternalExpression.g:6508:1: ( ruleChainedExpression )
+            // InternalExpression.g:6509:1: ruleChainedExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionTriAccess().getElsePartChainedExpressionParserRuleCall_1_4_0()); 
             }
-            pushFollow(FOLLOW_ruleChainedExpression_in_rule__IfExpressionTri__ElsePartAssignment_1_413136);
+            pushFollow(FOLLOW_2);
             ruleChainedExpression();
 
             state._fsp--;
@@ -18553,22 +18553,22 @@ public final void rule__IfExpressionTri__ElsePartAssignment_1_4() throws Recogni
 
 
     // $ANTLR start "rule__IfExpressionKw__ConditionAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6518:1: rule__IfExpressionKw__ConditionAssignment_1 : ( ruleChainedExpression ) ;
+    // InternalExpression.g:6518:1: rule__IfExpressionKw__ConditionAssignment_1 : ( ruleChainedExpression ) ;
     public final void rule__IfExpressionKw__ConditionAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6522:1: ( ( ruleChainedExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6523:1: ( ruleChainedExpression )
+            // InternalExpression.g:6522:1: ( ( ruleChainedExpression ) )
+            // InternalExpression.g:6523:1: ( ruleChainedExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6523:1: ( ruleChainedExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6524:1: ruleChainedExpression
+            // InternalExpression.g:6523:1: ( ruleChainedExpression )
+            // InternalExpression.g:6524:1: ruleChainedExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionKwAccess().getConditionChainedExpressionParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleChainedExpression_in_rule__IfExpressionKw__ConditionAssignment_113167);
+            pushFollow(FOLLOW_2);
             ruleChainedExpression();
 
             state._fsp--;
@@ -18598,22 +18598,22 @@ public final void rule__IfExpressionKw__ConditionAssignment_1() throws Recogniti
 
 
     // $ANTLR start "rule__IfExpressionKw__ThenPartAssignment_3"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6533:1: rule__IfExpressionKw__ThenPartAssignment_3 : ( ruleChainedExpression ) ;
+    // InternalExpression.g:6533:1: rule__IfExpressionKw__ThenPartAssignment_3 : ( ruleChainedExpression ) ;
     public final void rule__IfExpressionKw__ThenPartAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6537:1: ( ( ruleChainedExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6538:1: ( ruleChainedExpression )
+            // InternalExpression.g:6537:1: ( ( ruleChainedExpression ) )
+            // InternalExpression.g:6538:1: ( ruleChainedExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6538:1: ( ruleChainedExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6539:1: ruleChainedExpression
+            // InternalExpression.g:6538:1: ( ruleChainedExpression )
+            // InternalExpression.g:6539:1: ruleChainedExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionKwAccess().getThenPartChainedExpressionParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleChainedExpression_in_rule__IfExpressionKw__ThenPartAssignment_313198);
+            pushFollow(FOLLOW_2);
             ruleChainedExpression();
 
             state._fsp--;
@@ -18643,22 +18643,22 @@ public final void rule__IfExpressionKw__ThenPartAssignment_3() throws Recognitio
 
 
     // $ANTLR start "rule__IfExpressionKw__ElsePartAssignment_4_0_1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6548:1: rule__IfExpressionKw__ElsePartAssignment_4_0_1 : ( ruleChainedExpression ) ;
+    // InternalExpression.g:6548:1: rule__IfExpressionKw__ElsePartAssignment_4_0_1 : ( ruleChainedExpression ) ;
     public final void rule__IfExpressionKw__ElsePartAssignment_4_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6552:1: ( ( ruleChainedExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6553:1: ( ruleChainedExpression )
+            // InternalExpression.g:6552:1: ( ( ruleChainedExpression ) )
+            // InternalExpression.g:6553:1: ( ruleChainedExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6553:1: ( ruleChainedExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6554:1: ruleChainedExpression
+            // InternalExpression.g:6553:1: ( ruleChainedExpression )
+            // InternalExpression.g:6554:1: ruleChainedExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionKwAccess().getElsePartChainedExpressionParserRuleCall_4_0_1_0()); 
             }
-            pushFollow(FOLLOW_ruleChainedExpression_in_rule__IfExpressionKw__ElsePartAssignment_4_0_113229);
+            pushFollow(FOLLOW_2);
             ruleChainedExpression();
 
             state._fsp--;
@@ -18688,22 +18688,22 @@ public final void rule__IfExpressionKw__ElsePartAssignment_4_0_1() throws Recogn
 
 
     // $ANTLR start "rule__SwitchExpression__SwitchExprAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6563:1: rule__SwitchExpression__SwitchExprAssignment_1_1 : ( ruleOrExpression ) ;
+    // InternalExpression.g:6563:1: rule__SwitchExpression__SwitchExprAssignment_1_1 : ( ruleOrExpression ) ;
     public final void rule__SwitchExpression__SwitchExprAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6567:1: ( ( ruleOrExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6568:1: ( ruleOrExpression )
+            // InternalExpression.g:6567:1: ( ( ruleOrExpression ) )
+            // InternalExpression.g:6568:1: ( ruleOrExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6568:1: ( ruleOrExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6569:1: ruleOrExpression
+            // InternalExpression.g:6568:1: ( ruleOrExpression )
+            // InternalExpression.g:6569:1: ruleOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getSwitchExprOrExpressionParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleOrExpression_in_rule__SwitchExpression__SwitchExprAssignment_1_113260);
+            pushFollow(FOLLOW_2);
             ruleOrExpression();
 
             state._fsp--;
@@ -18733,22 +18733,22 @@ public final void rule__SwitchExpression__SwitchExprAssignment_1_1() throws Reco
 
 
     // $ANTLR start "rule__SwitchExpression__CaseAssignment_3"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6578:1: rule__SwitchExpression__CaseAssignment_3 : ( ruleCase ) ;
+    // InternalExpression.g:6578:1: rule__SwitchExpression__CaseAssignment_3 : ( ruleCase ) ;
     public final void rule__SwitchExpression__CaseAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6582:1: ( ( ruleCase ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6583:1: ( ruleCase )
+            // InternalExpression.g:6582:1: ( ( ruleCase ) )
+            // InternalExpression.g:6583:1: ( ruleCase )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6583:1: ( ruleCase )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6584:1: ruleCase
+            // InternalExpression.g:6583:1: ( ruleCase )
+            // InternalExpression.g:6584:1: ruleCase
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getCaseCaseParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleCase_in_rule__SwitchExpression__CaseAssignment_313291);
+            pushFollow(FOLLOW_2);
             ruleCase();
 
             state._fsp--;
@@ -18778,22 +18778,22 @@ public final void rule__SwitchExpression__CaseAssignment_3() throws RecognitionE
 
 
     // $ANTLR start "rule__SwitchExpression__DefaultExprAssignment_6"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6593:1: rule__SwitchExpression__DefaultExprAssignment_6 : ( ruleOrExpression ) ;
+    // InternalExpression.g:6593:1: rule__SwitchExpression__DefaultExprAssignment_6 : ( ruleOrExpression ) ;
     public final void rule__SwitchExpression__DefaultExprAssignment_6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6597:1: ( ( ruleOrExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6598:1: ( ruleOrExpression )
+            // InternalExpression.g:6597:1: ( ( ruleOrExpression ) )
+            // InternalExpression.g:6598:1: ( ruleOrExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6598:1: ( ruleOrExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6599:1: ruleOrExpression
+            // InternalExpression.g:6598:1: ( ruleOrExpression )
+            // InternalExpression.g:6599:1: ruleOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getDefaultExprOrExpressionParserRuleCall_6_0()); 
             }
-            pushFollow(FOLLOW_ruleOrExpression_in_rule__SwitchExpression__DefaultExprAssignment_613322);
+            pushFollow(FOLLOW_2);
             ruleOrExpression();
 
             state._fsp--;
@@ -18823,22 +18823,22 @@ public final void rule__SwitchExpression__DefaultExprAssignment_6() throws Recog
 
 
     // $ANTLR start "rule__Case__ConditionAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6608:1: rule__Case__ConditionAssignment_1 : ( ruleOrExpression ) ;
+    // InternalExpression.g:6608:1: rule__Case__ConditionAssignment_1 : ( ruleOrExpression ) ;
     public final void rule__Case__ConditionAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6612:1: ( ( ruleOrExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6613:1: ( ruleOrExpression )
+            // InternalExpression.g:6612:1: ( ( ruleOrExpression ) )
+            // InternalExpression.g:6613:1: ( ruleOrExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6613:1: ( ruleOrExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6614:1: ruleOrExpression
+            // InternalExpression.g:6613:1: ( ruleOrExpression )
+            // InternalExpression.g:6614:1: ruleOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCaseAccess().getConditionOrExpressionParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleOrExpression_in_rule__Case__ConditionAssignment_113353);
+            pushFollow(FOLLOW_2);
             ruleOrExpression();
 
             state._fsp--;
@@ -18868,22 +18868,22 @@ public final void rule__Case__ConditionAssignment_1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__Case__ThenParAssignment_3"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6623:1: rule__Case__ThenParAssignment_3 : ( ruleOrExpression ) ;
+    // InternalExpression.g:6623:1: rule__Case__ThenParAssignment_3 : ( ruleOrExpression ) ;
     public final void rule__Case__ThenParAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6627:1: ( ( ruleOrExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6628:1: ( ruleOrExpression )
+            // InternalExpression.g:6627:1: ( ( ruleOrExpression ) )
+            // InternalExpression.g:6628:1: ( ruleOrExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6628:1: ( ruleOrExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6629:1: ruleOrExpression
+            // InternalExpression.g:6628:1: ( ruleOrExpression )
+            // InternalExpression.g:6629:1: ruleOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCaseAccess().getThenParOrExpressionParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleOrExpression_in_rule__Case__ThenParAssignment_313384);
+            pushFollow(FOLLOW_2);
             ruleOrExpression();
 
             state._fsp--;
@@ -18913,28 +18913,28 @@ public final void rule__Case__ThenParAssignment_3() throws RecognitionException
 
 
     // $ANTLR start "rule__OrExpression__OperatorAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6638:1: rule__OrExpression__OperatorAssignment_1_1 : ( ( '||' ) ) ;
+    // InternalExpression.g:6638:1: rule__OrExpression__OperatorAssignment_1_1 : ( ( '||' ) ) ;
     public final void rule__OrExpression__OperatorAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6642:1: ( ( ( '||' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6643:1: ( ( '||' ) )
+            // InternalExpression.g:6642:1: ( ( ( '||' ) ) )
+            // InternalExpression.g:6643:1: ( ( '||' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6643:1: ( ( '||' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6644:1: ( '||' )
+            // InternalExpression.g:6643:1: ( ( '||' ) )
+            // InternalExpression.g:6644:1: ( '||' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOrExpressionAccess().getOperatorVerticalLineVerticalLineKeyword_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6645:1: ( '||' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6646:1: '||'
+            // InternalExpression.g:6645:1: ( '||' )
+            // InternalExpression.g:6646:1: '||'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOrExpressionAccess().getOperatorVerticalLineVerticalLineKeyword_1_1_0()); 
             }
-            match(input,59,FOLLOW_59_in_rule__OrExpression__OperatorAssignment_1_113420); if (state.failed) return ;
+            match(input,59,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOrExpressionAccess().getOperatorVerticalLineVerticalLineKeyword_1_1_0()); 
             }
@@ -18966,22 +18966,22 @@ public final void rule__OrExpression__OperatorAssignment_1_1() throws Recognitio
 
 
     // $ANTLR start "rule__OrExpression__RightAssignment_1_2"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6661:1: rule__OrExpression__RightAssignment_1_2 : ( ruleAndExpression ) ;
+    // InternalExpression.g:6661:1: rule__OrExpression__RightAssignment_1_2 : ( ruleAndExpression ) ;
     public final void rule__OrExpression__RightAssignment_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6665:1: ( ( ruleAndExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6666:1: ( ruleAndExpression )
+            // InternalExpression.g:6665:1: ( ( ruleAndExpression ) )
+            // InternalExpression.g:6666:1: ( ruleAndExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6666:1: ( ruleAndExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6667:1: ruleAndExpression
+            // InternalExpression.g:6666:1: ( ruleAndExpression )
+            // InternalExpression.g:6667:1: ruleAndExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOrExpressionAccess().getRightAndExpressionParserRuleCall_1_2_0()); 
             }
-            pushFollow(FOLLOW_ruleAndExpression_in_rule__OrExpression__RightAssignment_1_213459);
+            pushFollow(FOLLOW_2);
             ruleAndExpression();
 
             state._fsp--;
@@ -19011,28 +19011,28 @@ public final void rule__OrExpression__RightAssignment_1_2() throws RecognitionEx
 
 
     // $ANTLR start "rule__AndExpression__OperatorAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6676:1: rule__AndExpression__OperatorAssignment_1_1 : ( ( '&&' ) ) ;
+    // InternalExpression.g:6676:1: rule__AndExpression__OperatorAssignment_1_1 : ( ( '&&' ) ) ;
     public final void rule__AndExpression__OperatorAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6680:1: ( ( ( '&&' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6681:1: ( ( '&&' ) )
+            // InternalExpression.g:6680:1: ( ( ( '&&' ) ) )
+            // InternalExpression.g:6681:1: ( ( '&&' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6681:1: ( ( '&&' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6682:1: ( '&&' )
+            // InternalExpression.g:6681:1: ( ( '&&' ) )
+            // InternalExpression.g:6682:1: ( '&&' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAndExpressionAccess().getOperatorAmpersandAmpersandKeyword_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6683:1: ( '&&' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6684:1: '&&'
+            // InternalExpression.g:6683:1: ( '&&' )
+            // InternalExpression.g:6684:1: '&&'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAndExpressionAccess().getOperatorAmpersandAmpersandKeyword_1_1_0()); 
             }
-            match(input,60,FOLLOW_60_in_rule__AndExpression__OperatorAssignment_1_113495); if (state.failed) return ;
+            match(input,60,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getAndExpressionAccess().getOperatorAmpersandAmpersandKeyword_1_1_0()); 
             }
@@ -19064,22 +19064,22 @@ public final void rule__AndExpression__OperatorAssignment_1_1() throws Recogniti
 
 
     // $ANTLR start "rule__AndExpression__RightAssignment_1_2"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6699:1: rule__AndExpression__RightAssignment_1_2 : ( ruleImpliesExpression ) ;
+    // InternalExpression.g:6699:1: rule__AndExpression__RightAssignment_1_2 : ( ruleImpliesExpression ) ;
     public final void rule__AndExpression__RightAssignment_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6703:1: ( ( ruleImpliesExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6704:1: ( ruleImpliesExpression )
+            // InternalExpression.g:6703:1: ( ( ruleImpliesExpression ) )
+            // InternalExpression.g:6704:1: ( ruleImpliesExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6704:1: ( ruleImpliesExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6705:1: ruleImpliesExpression
+            // InternalExpression.g:6704:1: ( ruleImpliesExpression )
+            // InternalExpression.g:6705:1: ruleImpliesExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAndExpressionAccess().getRightImpliesExpressionParserRuleCall_1_2_0()); 
             }
-            pushFollow(FOLLOW_ruleImpliesExpression_in_rule__AndExpression__RightAssignment_1_213534);
+            pushFollow(FOLLOW_2);
             ruleImpliesExpression();
 
             state._fsp--;
@@ -19109,28 +19109,28 @@ public final void rule__AndExpression__RightAssignment_1_2() throws RecognitionE
 
 
     // $ANTLR start "rule__ImpliesExpression__OperatorAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6714:1: rule__ImpliesExpression__OperatorAssignment_1_1 : ( ( 'implies' ) ) ;
+    // InternalExpression.g:6714:1: rule__ImpliesExpression__OperatorAssignment_1_1 : ( ( 'implies' ) ) ;
     public final void rule__ImpliesExpression__OperatorAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6718:1: ( ( ( 'implies' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6719:1: ( ( 'implies' ) )
+            // InternalExpression.g:6718:1: ( ( ( 'implies' ) ) )
+            // InternalExpression.g:6719:1: ( ( 'implies' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6719:1: ( ( 'implies' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6720:1: ( 'implies' )
+            // InternalExpression.g:6719:1: ( ( 'implies' ) )
+            // InternalExpression.g:6720:1: ( 'implies' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImpliesExpressionAccess().getOperatorImpliesKeyword_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6721:1: ( 'implies' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6722:1: 'implies'
+            // InternalExpression.g:6721:1: ( 'implies' )
+            // InternalExpression.g:6722:1: 'implies'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImpliesExpressionAccess().getOperatorImpliesKeyword_1_1_0()); 
             }
-            match(input,61,FOLLOW_61_in_rule__ImpliesExpression__OperatorAssignment_1_113570); if (state.failed) return ;
+            match(input,61,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getImpliesExpressionAccess().getOperatorImpliesKeyword_1_1_0()); 
             }
@@ -19162,22 +19162,22 @@ public final void rule__ImpliesExpression__OperatorAssignment_1_1() throws Recog
 
 
     // $ANTLR start "rule__ImpliesExpression__RightAssignment_1_2"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6737:1: rule__ImpliesExpression__RightAssignment_1_2 : ( ruleRelationalExpression ) ;
+    // InternalExpression.g:6737:1: rule__ImpliesExpression__RightAssignment_1_2 : ( ruleRelationalExpression ) ;
     public final void rule__ImpliesExpression__RightAssignment_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6741:1: ( ( ruleRelationalExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6742:1: ( ruleRelationalExpression )
+            // InternalExpression.g:6741:1: ( ( ruleRelationalExpression ) )
+            // InternalExpression.g:6742:1: ( ruleRelationalExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6742:1: ( ruleRelationalExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6743:1: ruleRelationalExpression
+            // InternalExpression.g:6742:1: ( ruleRelationalExpression )
+            // InternalExpression.g:6743:1: ruleRelationalExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImpliesExpressionAccess().getRightRelationalExpressionParserRuleCall_1_2_0()); 
             }
-            pushFollow(FOLLOW_ruleRelationalExpression_in_rule__ImpliesExpression__RightAssignment_1_213609);
+            pushFollow(FOLLOW_2);
             ruleRelationalExpression();
 
             state._fsp--;
@@ -19207,25 +19207,25 @@ public final void rule__ImpliesExpression__RightAssignment_1_2() throws Recognit
 
 
     // $ANTLR start "rule__RelationalExpression__OperatorAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6752:1: rule__RelationalExpression__OperatorAssignment_1_1 : ( ( rule__RelationalExpression__OperatorAlternatives_1_1_0 ) ) ;
+    // InternalExpression.g:6752:1: rule__RelationalExpression__OperatorAssignment_1_1 : ( ( rule__RelationalExpression__OperatorAlternatives_1_1_0 ) ) ;
     public final void rule__RelationalExpression__OperatorAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6756:1: ( ( ( rule__RelationalExpression__OperatorAlternatives_1_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6757:1: ( ( rule__RelationalExpression__OperatorAlternatives_1_1_0 ) )
+            // InternalExpression.g:6756:1: ( ( ( rule__RelationalExpression__OperatorAlternatives_1_1_0 ) ) )
+            // InternalExpression.g:6757:1: ( ( rule__RelationalExpression__OperatorAlternatives_1_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6757:1: ( ( rule__RelationalExpression__OperatorAlternatives_1_1_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6758:1: ( rule__RelationalExpression__OperatorAlternatives_1_1_0 )
+            // InternalExpression.g:6757:1: ( ( rule__RelationalExpression__OperatorAlternatives_1_1_0 ) )
+            // InternalExpression.g:6758:1: ( rule__RelationalExpression__OperatorAlternatives_1_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRelationalExpressionAccess().getOperatorAlternatives_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6759:1: ( rule__RelationalExpression__OperatorAlternatives_1_1_0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6759:2: rule__RelationalExpression__OperatorAlternatives_1_1_0
+            // InternalExpression.g:6759:1: ( rule__RelationalExpression__OperatorAlternatives_1_1_0 )
+            // InternalExpression.g:6759:2: rule__RelationalExpression__OperatorAlternatives_1_1_0
             {
-            pushFollow(FOLLOW_rule__RelationalExpression__OperatorAlternatives_1_1_0_in_rule__RelationalExpression__OperatorAssignment_1_113640);
+            pushFollow(FOLLOW_2);
             rule__RelationalExpression__OperatorAlternatives_1_1_0();
 
             state._fsp--;
@@ -19258,22 +19258,22 @@ public final void rule__RelationalExpression__OperatorAssignment_1_1() throws Re
 
 
     // $ANTLR start "rule__RelationalExpression__RightAssignment_1_2"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6768:1: rule__RelationalExpression__RightAssignment_1_2 : ( ruleAdditiveExpression ) ;
+    // InternalExpression.g:6768:1: rule__RelationalExpression__RightAssignment_1_2 : ( ruleAdditiveExpression ) ;
     public final void rule__RelationalExpression__RightAssignment_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6772:1: ( ( ruleAdditiveExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6773:1: ( ruleAdditiveExpression )
+            // InternalExpression.g:6772:1: ( ( ruleAdditiveExpression ) )
+            // InternalExpression.g:6773:1: ( ruleAdditiveExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6773:1: ( ruleAdditiveExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6774:1: ruleAdditiveExpression
+            // InternalExpression.g:6773:1: ( ruleAdditiveExpression )
+            // InternalExpression.g:6774:1: ruleAdditiveExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRelationalExpressionAccess().getRightAdditiveExpressionParserRuleCall_1_2_0()); 
             }
-            pushFollow(FOLLOW_ruleAdditiveExpression_in_rule__RelationalExpression__RightAssignment_1_213673);
+            pushFollow(FOLLOW_2);
             ruleAdditiveExpression();
 
             state._fsp--;
@@ -19303,25 +19303,25 @@ public final void rule__RelationalExpression__RightAssignment_1_2() throws Recog
 
 
     // $ANTLR start "rule__AdditiveExpression__NameAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6783:1: rule__AdditiveExpression__NameAssignment_1_1 : ( ( rule__AdditiveExpression__NameAlternatives_1_1_0 ) ) ;
+    // InternalExpression.g:6783:1: rule__AdditiveExpression__NameAssignment_1_1 : ( ( rule__AdditiveExpression__NameAlternatives_1_1_0 ) ) ;
     public final void rule__AdditiveExpression__NameAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6787:1: ( ( ( rule__AdditiveExpression__NameAlternatives_1_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6788:1: ( ( rule__AdditiveExpression__NameAlternatives_1_1_0 ) )
+            // InternalExpression.g:6787:1: ( ( ( rule__AdditiveExpression__NameAlternatives_1_1_0 ) ) )
+            // InternalExpression.g:6788:1: ( ( rule__AdditiveExpression__NameAlternatives_1_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6788:1: ( ( rule__AdditiveExpression__NameAlternatives_1_1_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6789:1: ( rule__AdditiveExpression__NameAlternatives_1_1_0 )
+            // InternalExpression.g:6788:1: ( ( rule__AdditiveExpression__NameAlternatives_1_1_0 ) )
+            // InternalExpression.g:6789:1: ( rule__AdditiveExpression__NameAlternatives_1_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAdditiveExpressionAccess().getNameAlternatives_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6790:1: ( rule__AdditiveExpression__NameAlternatives_1_1_0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6790:2: rule__AdditiveExpression__NameAlternatives_1_1_0
+            // InternalExpression.g:6790:1: ( rule__AdditiveExpression__NameAlternatives_1_1_0 )
+            // InternalExpression.g:6790:2: rule__AdditiveExpression__NameAlternatives_1_1_0
             {
-            pushFollow(FOLLOW_rule__AdditiveExpression__NameAlternatives_1_1_0_in_rule__AdditiveExpression__NameAssignment_1_113704);
+            pushFollow(FOLLOW_2);
             rule__AdditiveExpression__NameAlternatives_1_1_0();
 
             state._fsp--;
@@ -19354,22 +19354,22 @@ public final void rule__AdditiveExpression__NameAssignment_1_1() throws Recognit
 
 
     // $ANTLR start "rule__AdditiveExpression__ParamsAssignment_1_2"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6799:1: rule__AdditiveExpression__ParamsAssignment_1_2 : ( ruleMultiplicativeExpression ) ;
+    // InternalExpression.g:6799:1: rule__AdditiveExpression__ParamsAssignment_1_2 : ( ruleMultiplicativeExpression ) ;
     public final void rule__AdditiveExpression__ParamsAssignment_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6803:1: ( ( ruleMultiplicativeExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6804:1: ( ruleMultiplicativeExpression )
+            // InternalExpression.g:6803:1: ( ( ruleMultiplicativeExpression ) )
+            // InternalExpression.g:6804:1: ( ruleMultiplicativeExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6804:1: ( ruleMultiplicativeExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6805:1: ruleMultiplicativeExpression
+            // InternalExpression.g:6804:1: ( ruleMultiplicativeExpression )
+            // InternalExpression.g:6805:1: ruleMultiplicativeExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAdditiveExpressionAccess().getParamsMultiplicativeExpressionParserRuleCall_1_2_0()); 
             }
-            pushFollow(FOLLOW_ruleMultiplicativeExpression_in_rule__AdditiveExpression__ParamsAssignment_1_213737);
+            pushFollow(FOLLOW_2);
             ruleMultiplicativeExpression();
 
             state._fsp--;
@@ -19399,25 +19399,25 @@ public final void rule__AdditiveExpression__ParamsAssignment_1_2() throws Recogn
 
 
     // $ANTLR start "rule__MultiplicativeExpression__NameAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6814:1: rule__MultiplicativeExpression__NameAssignment_1_1 : ( ( rule__MultiplicativeExpression__NameAlternatives_1_1_0 ) ) ;
+    // InternalExpression.g:6814:1: rule__MultiplicativeExpression__NameAssignment_1_1 : ( ( rule__MultiplicativeExpression__NameAlternatives_1_1_0 ) ) ;
     public final void rule__MultiplicativeExpression__NameAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6818:1: ( ( ( rule__MultiplicativeExpression__NameAlternatives_1_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6819:1: ( ( rule__MultiplicativeExpression__NameAlternatives_1_1_0 ) )
+            // InternalExpression.g:6818:1: ( ( ( rule__MultiplicativeExpression__NameAlternatives_1_1_0 ) ) )
+            // InternalExpression.g:6819:1: ( ( rule__MultiplicativeExpression__NameAlternatives_1_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6819:1: ( ( rule__MultiplicativeExpression__NameAlternatives_1_1_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6820:1: ( rule__MultiplicativeExpression__NameAlternatives_1_1_0 )
+            // InternalExpression.g:6819:1: ( ( rule__MultiplicativeExpression__NameAlternatives_1_1_0 ) )
+            // InternalExpression.g:6820:1: ( rule__MultiplicativeExpression__NameAlternatives_1_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMultiplicativeExpressionAccess().getNameAlternatives_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6821:1: ( rule__MultiplicativeExpression__NameAlternatives_1_1_0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6821:2: rule__MultiplicativeExpression__NameAlternatives_1_1_0
+            // InternalExpression.g:6821:1: ( rule__MultiplicativeExpression__NameAlternatives_1_1_0 )
+            // InternalExpression.g:6821:2: rule__MultiplicativeExpression__NameAlternatives_1_1_0
             {
-            pushFollow(FOLLOW_rule__MultiplicativeExpression__NameAlternatives_1_1_0_in_rule__MultiplicativeExpression__NameAssignment_1_113768);
+            pushFollow(FOLLOW_2);
             rule__MultiplicativeExpression__NameAlternatives_1_1_0();
 
             state._fsp--;
@@ -19450,22 +19450,22 @@ public final void rule__MultiplicativeExpression__NameAssignment_1_1() throws Re
 
 
     // $ANTLR start "rule__MultiplicativeExpression__ParamsAssignment_1_2"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6830:1: rule__MultiplicativeExpression__ParamsAssignment_1_2 : ( ruleUnaryOrInfixExpression ) ;
+    // InternalExpression.g:6830:1: rule__MultiplicativeExpression__ParamsAssignment_1_2 : ( ruleUnaryOrInfixExpression ) ;
     public final void rule__MultiplicativeExpression__ParamsAssignment_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6834:1: ( ( ruleUnaryOrInfixExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6835:1: ( ruleUnaryOrInfixExpression )
+            // InternalExpression.g:6834:1: ( ( ruleUnaryOrInfixExpression ) )
+            // InternalExpression.g:6835:1: ( ruleUnaryOrInfixExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6835:1: ( ruleUnaryOrInfixExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6836:1: ruleUnaryOrInfixExpression
+            // InternalExpression.g:6835:1: ( ruleUnaryOrInfixExpression )
+            // InternalExpression.g:6836:1: ruleUnaryOrInfixExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMultiplicativeExpressionAccess().getParamsUnaryOrInfixExpressionParserRuleCall_1_2_0()); 
             }
-            pushFollow(FOLLOW_ruleUnaryOrInfixExpression_in_rule__MultiplicativeExpression__ParamsAssignment_1_213801);
+            pushFollow(FOLLOW_2);
             ruleUnaryOrInfixExpression();
 
             state._fsp--;
@@ -19495,25 +19495,25 @@ public final void rule__MultiplicativeExpression__ParamsAssignment_1_2() throws
 
 
     // $ANTLR start "rule__UnaryExpression__NameAssignment_0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6845:1: rule__UnaryExpression__NameAssignment_0 : ( ( rule__UnaryExpression__NameAlternatives_0_0 ) ) ;
+    // InternalExpression.g:6845:1: rule__UnaryExpression__NameAssignment_0 : ( ( rule__UnaryExpression__NameAlternatives_0_0 ) ) ;
     public final void rule__UnaryExpression__NameAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6849:1: ( ( ( rule__UnaryExpression__NameAlternatives_0_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6850:1: ( ( rule__UnaryExpression__NameAlternatives_0_0 ) )
+            // InternalExpression.g:6849:1: ( ( ( rule__UnaryExpression__NameAlternatives_0_0 ) ) )
+            // InternalExpression.g:6850:1: ( ( rule__UnaryExpression__NameAlternatives_0_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6850:1: ( ( rule__UnaryExpression__NameAlternatives_0_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6851:1: ( rule__UnaryExpression__NameAlternatives_0_0 )
+            // InternalExpression.g:6850:1: ( ( rule__UnaryExpression__NameAlternatives_0_0 ) )
+            // InternalExpression.g:6851:1: ( rule__UnaryExpression__NameAlternatives_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getUnaryExpressionAccess().getNameAlternatives_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6852:1: ( rule__UnaryExpression__NameAlternatives_0_0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6852:2: rule__UnaryExpression__NameAlternatives_0_0
+            // InternalExpression.g:6852:1: ( rule__UnaryExpression__NameAlternatives_0_0 )
+            // InternalExpression.g:6852:2: rule__UnaryExpression__NameAlternatives_0_0
             {
-            pushFollow(FOLLOW_rule__UnaryExpression__NameAlternatives_0_0_in_rule__UnaryExpression__NameAssignment_013832);
+            pushFollow(FOLLOW_2);
             rule__UnaryExpression__NameAlternatives_0_0();
 
             state._fsp--;
@@ -19546,22 +19546,22 @@ public final void rule__UnaryExpression__NameAssignment_0() throws RecognitionEx
 
 
     // $ANTLR start "rule__UnaryExpression__ParamsAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6861:1: rule__UnaryExpression__ParamsAssignment_1 : ( ruleInfixExpression ) ;
+    // InternalExpression.g:6861:1: rule__UnaryExpression__ParamsAssignment_1 : ( ruleInfixExpression ) ;
     public final void rule__UnaryExpression__ParamsAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6865:1: ( ( ruleInfixExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6866:1: ( ruleInfixExpression )
+            // InternalExpression.g:6865:1: ( ( ruleInfixExpression ) )
+            // InternalExpression.g:6866:1: ( ruleInfixExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6866:1: ( ruleInfixExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6867:1: ruleInfixExpression
+            // InternalExpression.g:6866:1: ( ruleInfixExpression )
+            // InternalExpression.g:6867:1: ruleInfixExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getUnaryExpressionAccess().getParamsInfixExpressionParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleInfixExpression_in_rule__UnaryExpression__ParamsAssignment_113865);
+            pushFollow(FOLLOW_2);
             ruleInfixExpression();
 
             state._fsp--;
@@ -19591,22 +19591,22 @@ public final void rule__UnaryExpression__ParamsAssignment_1() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__NameAssignment_1_0_2"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6876:1: rule__InfixExpression__NameAssignment_1_0_2 : ( ruleIdentifier ) ;
+    // InternalExpression.g:6876:1: rule__InfixExpression__NameAssignment_1_0_2 : ( ruleIdentifier ) ;
     public final void rule__InfixExpression__NameAssignment_1_0_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6880:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6881:1: ( ruleIdentifier )
+            // InternalExpression.g:6880:1: ( ( ruleIdentifier ) )
+            // InternalExpression.g:6881:1: ( ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6881:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6882:1: ruleIdentifier
+            // InternalExpression.g:6881:1: ( ruleIdentifier )
+            // InternalExpression.g:6882:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getNameIdentifierParserRuleCall_1_0_2_0()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__InfixExpression__NameAssignment_1_0_213896);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -19636,22 +19636,22 @@ public final void rule__InfixExpression__NameAssignment_1_0_2() throws Recogniti
 
 
     // $ANTLR start "rule__InfixExpression__ParamsAssignment_1_0_4_0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6891:1: rule__InfixExpression__ParamsAssignment_1_0_4_0 : ( ruleExpression ) ;
+    // InternalExpression.g:6891:1: rule__InfixExpression__ParamsAssignment_1_0_4_0 : ( ruleExpression ) ;
     public final void rule__InfixExpression__ParamsAssignment_1_0_4_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6895:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6896:1: ( ruleExpression )
+            // InternalExpression.g:6895:1: ( ( ruleExpression ) )
+            // InternalExpression.g:6896:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6896:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6897:1: ruleExpression
+            // InternalExpression.g:6896:1: ( ruleExpression )
+            // InternalExpression.g:6897:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getParamsExpressionParserRuleCall_1_0_4_0_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__InfixExpression__ParamsAssignment_1_0_4_013927);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -19681,22 +19681,22 @@ public final void rule__InfixExpression__ParamsAssignment_1_0_4_0() throws Recog
 
 
     // $ANTLR start "rule__InfixExpression__ParamsAssignment_1_0_4_1_1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6906:1: rule__InfixExpression__ParamsAssignment_1_0_4_1_1 : ( ruleExpression ) ;
+    // InternalExpression.g:6906:1: rule__InfixExpression__ParamsAssignment_1_0_4_1_1 : ( ruleExpression ) ;
     public final void rule__InfixExpression__ParamsAssignment_1_0_4_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6910:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6911:1: ( ruleExpression )
+            // InternalExpression.g:6910:1: ( ( ruleExpression ) )
+            // InternalExpression.g:6911:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6911:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6912:1: ruleExpression
+            // InternalExpression.g:6911:1: ( ruleExpression )
+            // InternalExpression.g:6912:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getParamsExpressionParserRuleCall_1_0_4_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__InfixExpression__ParamsAssignment_1_0_4_1_113958);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -19726,22 +19726,22 @@ public final void rule__InfixExpression__ParamsAssignment_1_0_4_1_1() throws Rec
 
 
     // $ANTLR start "rule__InfixExpression__TypeAssignment_1_1_2"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6921:1: rule__InfixExpression__TypeAssignment_1_1_2 : ( ruleType ) ;
+    // InternalExpression.g:6921:1: rule__InfixExpression__TypeAssignment_1_1_2 : ( ruleType ) ;
     public final void rule__InfixExpression__TypeAssignment_1_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6925:1: ( ( ruleType ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6926:1: ( ruleType )
+            // InternalExpression.g:6925:1: ( ( ruleType ) )
+            // InternalExpression.g:6926:1: ( ruleType )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6926:1: ( ruleType )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6927:1: ruleType
+            // InternalExpression.g:6926:1: ( ruleType )
+            // InternalExpression.g:6927:1: ruleType
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getTypeTypeParserRuleCall_1_1_2_0()); 
             }
-            pushFollow(FOLLOW_ruleType_in_rule__InfixExpression__TypeAssignment_1_1_213989);
+            pushFollow(FOLLOW_2);
             ruleType();
 
             state._fsp--;
@@ -19771,28 +19771,28 @@ public final void rule__InfixExpression__TypeAssignment_1_1_2() throws Recogniti
 
 
     // $ANTLR start "rule__InfixExpression__NameAssignment_1_2_2"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6936:1: rule__InfixExpression__NameAssignment_1_2_2 : ( ( 'typeSelect' ) ) ;
+    // InternalExpression.g:6936:1: rule__InfixExpression__NameAssignment_1_2_2 : ( ( 'typeSelect' ) ) ;
     public final void rule__InfixExpression__NameAssignment_1_2_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6940:1: ( ( ( 'typeSelect' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6941:1: ( ( 'typeSelect' ) )
+            // InternalExpression.g:6940:1: ( ( ( 'typeSelect' ) ) )
+            // InternalExpression.g:6941:1: ( ( 'typeSelect' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6941:1: ( ( 'typeSelect' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6942:1: ( 'typeSelect' )
+            // InternalExpression.g:6941:1: ( ( 'typeSelect' ) )
+            // InternalExpression.g:6942:1: ( 'typeSelect' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getNameTypeSelectKeyword_1_2_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6943:1: ( 'typeSelect' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6944:1: 'typeSelect'
+            // InternalExpression.g:6943:1: ( 'typeSelect' )
+            // InternalExpression.g:6944:1: 'typeSelect'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getNameTypeSelectKeyword_1_2_2_0()); 
             }
-            match(input,62,FOLLOW_62_in_rule__InfixExpression__NameAssignment_1_2_214025); if (state.failed) return ;
+            match(input,62,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInfixExpressionAccess().getNameTypeSelectKeyword_1_2_2_0()); 
             }
@@ -19824,22 +19824,22 @@ public final void rule__InfixExpression__NameAssignment_1_2_2() throws Recogniti
 
 
     // $ANTLR start "rule__InfixExpression__TypeAssignment_1_2_4"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6959:1: rule__InfixExpression__TypeAssignment_1_2_4 : ( ruleType ) ;
+    // InternalExpression.g:6959:1: rule__InfixExpression__TypeAssignment_1_2_4 : ( ruleType ) ;
     public final void rule__InfixExpression__TypeAssignment_1_2_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6963:1: ( ( ruleType ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6964:1: ( ruleType )
+            // InternalExpression.g:6963:1: ( ( ruleType ) )
+            // InternalExpression.g:6964:1: ( ruleType )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6964:1: ( ruleType )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6965:1: ruleType
+            // InternalExpression.g:6964:1: ( ruleType )
+            // InternalExpression.g:6965:1: ruleType
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getTypeTypeParserRuleCall_1_2_4_0()); 
             }
-            pushFollow(FOLLOW_ruleType_in_rule__InfixExpression__TypeAssignment_1_2_414064);
+            pushFollow(FOLLOW_2);
             ruleType();
 
             state._fsp--;
@@ -19869,25 +19869,25 @@ public final void rule__InfixExpression__TypeAssignment_1_2_4() throws Recogniti
 
 
     // $ANTLR start "rule__InfixExpression__NameAssignment_1_3_2"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6974:1: rule__InfixExpression__NameAssignment_1_3_2 : ( ( rule__InfixExpression__NameAlternatives_1_3_2_0 ) ) ;
+    // InternalExpression.g:6974:1: rule__InfixExpression__NameAssignment_1_3_2 : ( ( rule__InfixExpression__NameAlternatives_1_3_2_0 ) ) ;
     public final void rule__InfixExpression__NameAssignment_1_3_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6978:1: ( ( ( rule__InfixExpression__NameAlternatives_1_3_2_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6979:1: ( ( rule__InfixExpression__NameAlternatives_1_3_2_0 ) )
+            // InternalExpression.g:6978:1: ( ( ( rule__InfixExpression__NameAlternatives_1_3_2_0 ) ) )
+            // InternalExpression.g:6979:1: ( ( rule__InfixExpression__NameAlternatives_1_3_2_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6979:1: ( ( rule__InfixExpression__NameAlternatives_1_3_2_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6980:1: ( rule__InfixExpression__NameAlternatives_1_3_2_0 )
+            // InternalExpression.g:6979:1: ( ( rule__InfixExpression__NameAlternatives_1_3_2_0 ) )
+            // InternalExpression.g:6980:1: ( rule__InfixExpression__NameAlternatives_1_3_2_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getNameAlternatives_1_3_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6981:1: ( rule__InfixExpression__NameAlternatives_1_3_2_0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6981:2: rule__InfixExpression__NameAlternatives_1_3_2_0
+            // InternalExpression.g:6981:1: ( rule__InfixExpression__NameAlternatives_1_3_2_0 )
+            // InternalExpression.g:6981:2: rule__InfixExpression__NameAlternatives_1_3_2_0
             {
-            pushFollow(FOLLOW_rule__InfixExpression__NameAlternatives_1_3_2_0_in_rule__InfixExpression__NameAssignment_1_3_214095);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__NameAlternatives_1_3_2_0();
 
             state._fsp--;
@@ -19920,22 +19920,22 @@ public final void rule__InfixExpression__NameAssignment_1_3_2() throws Recogniti
 
 
     // $ANTLR start "rule__InfixExpression__VarAssignment_1_3_4_0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6990:1: rule__InfixExpression__VarAssignment_1_3_4_0 : ( ruleIdentifier ) ;
+    // InternalExpression.g:6990:1: rule__InfixExpression__VarAssignment_1_3_4_0 : ( ruleIdentifier ) ;
     public final void rule__InfixExpression__VarAssignment_1_3_4_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6994:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6995:1: ( ruleIdentifier )
+            // InternalExpression.g:6994:1: ( ( ruleIdentifier ) )
+            // InternalExpression.g:6995:1: ( ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6995:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:6996:1: ruleIdentifier
+            // InternalExpression.g:6995:1: ( ruleIdentifier )
+            // InternalExpression.g:6996:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getVarIdentifierParserRuleCall_1_3_4_0_0()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__InfixExpression__VarAssignment_1_3_4_014128);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -19965,22 +19965,22 @@ public final void rule__InfixExpression__VarAssignment_1_3_4_0() throws Recognit
 
 
     // $ANTLR start "rule__InfixExpression__ExpAssignment_1_3_5"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7005:1: rule__InfixExpression__ExpAssignment_1_3_5 : ( ruleExpression ) ;
+    // InternalExpression.g:7005:1: rule__InfixExpression__ExpAssignment_1_3_5 : ( ruleExpression ) ;
     public final void rule__InfixExpression__ExpAssignment_1_3_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7009:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7010:1: ( ruleExpression )
+            // InternalExpression.g:7009:1: ( ( ruleExpression ) )
+            // InternalExpression.g:7010:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7010:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7011:1: ruleExpression
+            // InternalExpression.g:7010:1: ( ruleExpression )
+            // InternalExpression.g:7011:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getExpExpressionParserRuleCall_1_3_5_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__InfixExpression__ExpAssignment_1_3_514159);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -20010,25 +20010,25 @@ public final void rule__InfixExpression__ExpAssignment_1_3_5() throws Recognitio
 
 
     // $ANTLR start "rule__BooleanLiteral__ValAssignment"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7020:1: rule__BooleanLiteral__ValAssignment : ( ( rule__BooleanLiteral__ValAlternatives_0 ) ) ;
+    // InternalExpression.g:7020:1: rule__BooleanLiteral__ValAssignment : ( ( rule__BooleanLiteral__ValAlternatives_0 ) ) ;
     public final void rule__BooleanLiteral__ValAssignment() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7024:1: ( ( ( rule__BooleanLiteral__ValAlternatives_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7025:1: ( ( rule__BooleanLiteral__ValAlternatives_0 ) )
+            // InternalExpression.g:7024:1: ( ( ( rule__BooleanLiteral__ValAlternatives_0 ) ) )
+            // InternalExpression.g:7025:1: ( ( rule__BooleanLiteral__ValAlternatives_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7025:1: ( ( rule__BooleanLiteral__ValAlternatives_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7026:1: ( rule__BooleanLiteral__ValAlternatives_0 )
+            // InternalExpression.g:7025:1: ( ( rule__BooleanLiteral__ValAlternatives_0 ) )
+            // InternalExpression.g:7026:1: ( rule__BooleanLiteral__ValAlternatives_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getBooleanLiteralAccess().getValAlternatives_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7027:1: ( rule__BooleanLiteral__ValAlternatives_0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7027:2: rule__BooleanLiteral__ValAlternatives_0
+            // InternalExpression.g:7027:1: ( rule__BooleanLiteral__ValAlternatives_0 )
+            // InternalExpression.g:7027:2: rule__BooleanLiteral__ValAlternatives_0
             {
-            pushFollow(FOLLOW_rule__BooleanLiteral__ValAlternatives_0_in_rule__BooleanLiteral__ValAssignment14190);
+            pushFollow(FOLLOW_2);
             rule__BooleanLiteral__ValAlternatives_0();
 
             state._fsp--;
@@ -20061,22 +20061,22 @@ public final void rule__BooleanLiteral__ValAssignment() throws RecognitionExcept
 
 
     // $ANTLR start "rule__IntegerLiteral__ValAssignment"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7036:1: rule__IntegerLiteral__ValAssignment : ( RULE_INT ) ;
+    // InternalExpression.g:7036:1: rule__IntegerLiteral__ValAssignment : ( RULE_INT ) ;
     public final void rule__IntegerLiteral__ValAssignment() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7040:1: ( ( RULE_INT ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7041:1: ( RULE_INT )
+            // InternalExpression.g:7040:1: ( ( RULE_INT ) )
+            // InternalExpression.g:7041:1: ( RULE_INT )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7041:1: ( RULE_INT )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7042:1: RULE_INT
+            // InternalExpression.g:7041:1: ( RULE_INT )
+            // InternalExpression.g:7042:1: RULE_INT
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIntegerLiteralAccess().getValINTTerminalRuleCall_0()); 
             }
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__IntegerLiteral__ValAssignment14223); if (state.failed) return ;
+            match(input,RULE_INT,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIntegerLiteralAccess().getValINTTerminalRuleCall_0()); 
             }
@@ -20102,28 +20102,28 @@ public final void rule__IntegerLiteral__ValAssignment() throws RecognitionExcept
 
 
     // $ANTLR start "rule__NullLiteral__ValAssignment"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7051:1: rule__NullLiteral__ValAssignment : ( ( 'null' ) ) ;
+    // InternalExpression.g:7051:1: rule__NullLiteral__ValAssignment : ( ( 'null' ) ) ;
     public final void rule__NullLiteral__ValAssignment() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7055:1: ( ( ( 'null' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7056:1: ( ( 'null' ) )
+            // InternalExpression.g:7055:1: ( ( ( 'null' ) ) )
+            // InternalExpression.g:7056:1: ( ( 'null' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7056:1: ( ( 'null' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7057:1: ( 'null' )
+            // InternalExpression.g:7056:1: ( ( 'null' ) )
+            // InternalExpression.g:7057:1: ( 'null' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNullLiteralAccess().getValNullKeyword_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7058:1: ( 'null' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7059:1: 'null'
+            // InternalExpression.g:7058:1: ( 'null' )
+            // InternalExpression.g:7059:1: 'null'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNullLiteralAccess().getValNullKeyword_0()); 
             }
-            match(input,63,FOLLOW_63_in_rule__NullLiteral__ValAssignment14259); if (state.failed) return ;
+            match(input,63,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getNullLiteralAccess().getValNullKeyword_0()); 
             }
@@ -20155,22 +20155,22 @@ public final void rule__NullLiteral__ValAssignment() throws RecognitionException
 
 
     // $ANTLR start "rule__RealLiteral__ValAssignment"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7074:1: rule__RealLiteral__ValAssignment : ( RULE_REAL ) ;
+    // InternalExpression.g:7074:1: rule__RealLiteral__ValAssignment : ( RULE_REAL ) ;
     public final void rule__RealLiteral__ValAssignment() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7078:1: ( ( RULE_REAL ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7079:1: ( RULE_REAL )
+            // InternalExpression.g:7078:1: ( ( RULE_REAL ) )
+            // InternalExpression.g:7079:1: ( RULE_REAL )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7079:1: ( RULE_REAL )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7080:1: RULE_REAL
+            // InternalExpression.g:7079:1: ( RULE_REAL )
+            // InternalExpression.g:7080:1: RULE_REAL
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRealLiteralAccess().getValREALTerminalRuleCall_0()); 
             }
-            match(input,RULE_REAL,FOLLOW_RULE_REAL_in_rule__RealLiteral__ValAssignment14298); if (state.failed) return ;
+            match(input,RULE_REAL,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getRealLiteralAccess().getValREALTerminalRuleCall_0()); 
             }
@@ -20196,22 +20196,22 @@ public final void rule__RealLiteral__ValAssignment() throws RecognitionException
 
 
     // $ANTLR start "rule__StringLiteral__ValAssignment"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7089:1: rule__StringLiteral__ValAssignment : ( RULE_STRING ) ;
+    // InternalExpression.g:7089:1: rule__StringLiteral__ValAssignment : ( RULE_STRING ) ;
     public final void rule__StringLiteral__ValAssignment() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7093:1: ( ( RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7094:1: ( RULE_STRING )
+            // InternalExpression.g:7093:1: ( ( RULE_STRING ) )
+            // InternalExpression.g:7094:1: ( RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7094:1: ( RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7095:1: RULE_STRING
+            // InternalExpression.g:7094:1: ( RULE_STRING )
+            // InternalExpression.g:7095:1: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getStringLiteralAccess().getValSTRINGTerminalRuleCall_0()); 
             }
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__StringLiteral__ValAssignment14329); if (state.failed) return ;
+            match(input,RULE_STRING,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getStringLiteralAccess().getValSTRINGTerminalRuleCall_0()); 
             }
@@ -20237,22 +20237,22 @@ public final void rule__StringLiteral__ValAssignment() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__GlobalVarExpression__NameAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7104:1: rule__GlobalVarExpression__NameAssignment_1 : ( ruleIdentifier ) ;
+    // InternalExpression.g:7104:1: rule__GlobalVarExpression__NameAssignment_1 : ( ruleIdentifier ) ;
     public final void rule__GlobalVarExpression__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7108:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7109:1: ( ruleIdentifier )
+            // InternalExpression.g:7108:1: ( ( ruleIdentifier ) )
+            // InternalExpression.g:7109:1: ( ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7109:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7110:1: ruleIdentifier
+            // InternalExpression.g:7109:1: ( ruleIdentifier )
+            // InternalExpression.g:7110:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalVarExpressionAccess().getNameIdentifierParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__GlobalVarExpression__NameAssignment_114360);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -20282,22 +20282,22 @@ public final void rule__GlobalVarExpression__NameAssignment_1() throws Recogniti
 
 
     // $ANTLR start "rule__FeatureCall__TypeAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7119:1: rule__FeatureCall__TypeAssignment_1 : ( ruleType ) ;
+    // InternalExpression.g:7119:1: rule__FeatureCall__TypeAssignment_1 : ( ruleType ) ;
     public final void rule__FeatureCall__TypeAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7123:1: ( ( ruleType ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7124:1: ( ruleType )
+            // InternalExpression.g:7123:1: ( ( ruleType ) )
+            // InternalExpression.g:7124:1: ( ruleType )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7124:1: ( ruleType )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7125:1: ruleType
+            // InternalExpression.g:7124:1: ( ruleType )
+            // InternalExpression.g:7125:1: ruleType
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFeatureCallAccess().getTypeTypeParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleType_in_rule__FeatureCall__TypeAssignment_114391);
+            pushFollow(FOLLOW_2);
             ruleType();
 
             state._fsp--;
@@ -20327,22 +20327,22 @@ public final void rule__FeatureCall__TypeAssignment_1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__OperationCall__NameAssignment_0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7134:1: rule__OperationCall__NameAssignment_0 : ( ruleIdentifier ) ;
+    // InternalExpression.g:7134:1: rule__OperationCall__NameAssignment_0 : ( ruleIdentifier ) ;
     public final void rule__OperationCall__NameAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7138:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7139:1: ( ruleIdentifier )
+            // InternalExpression.g:7138:1: ( ( ruleIdentifier ) )
+            // InternalExpression.g:7139:1: ( ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7139:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7140:1: ruleIdentifier
+            // InternalExpression.g:7139:1: ( ruleIdentifier )
+            // InternalExpression.g:7140:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOperationCallAccess().getNameIdentifierParserRuleCall_0_0()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__OperationCall__NameAssignment_014422);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -20372,22 +20372,22 @@ public final void rule__OperationCall__NameAssignment_0() throws RecognitionExce
 
 
     // $ANTLR start "rule__OperationCall__ParamsAssignment_2_0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7149:1: rule__OperationCall__ParamsAssignment_2_0 : ( ruleExpression ) ;
+    // InternalExpression.g:7149:1: rule__OperationCall__ParamsAssignment_2_0 : ( ruleExpression ) ;
     public final void rule__OperationCall__ParamsAssignment_2_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7153:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7154:1: ( ruleExpression )
+            // InternalExpression.g:7153:1: ( ( ruleExpression ) )
+            // InternalExpression.g:7154:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7154:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7155:1: ruleExpression
+            // InternalExpression.g:7154:1: ( ruleExpression )
+            // InternalExpression.g:7155:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOperationCallAccess().getParamsExpressionParserRuleCall_2_0_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__OperationCall__ParamsAssignment_2_014453);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -20417,22 +20417,22 @@ public final void rule__OperationCall__ParamsAssignment_2_0() throws Recognition
 
 
     // $ANTLR start "rule__OperationCall__ParamsAssignment_2_1_1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7164:1: rule__OperationCall__ParamsAssignment_2_1_1 : ( ruleExpression ) ;
+    // InternalExpression.g:7164:1: rule__OperationCall__ParamsAssignment_2_1_1 : ( ruleExpression ) ;
     public final void rule__OperationCall__ParamsAssignment_2_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7168:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7169:1: ( ruleExpression )
+            // InternalExpression.g:7168:1: ( ( ruleExpression ) )
+            // InternalExpression.g:7169:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7169:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7170:1: ruleExpression
+            // InternalExpression.g:7169:1: ( ruleExpression )
+            // InternalExpression.g:7170:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOperationCallAccess().getParamsExpressionParserRuleCall_2_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__OperationCall__ParamsAssignment_2_1_114484);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -20462,22 +20462,22 @@ public final void rule__OperationCall__ParamsAssignment_2_1_1() throws Recogniti
 
 
     // $ANTLR start "rule__ListLiteral__ElementsAssignment_2_0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7179:1: rule__ListLiteral__ElementsAssignment_2_0 : ( ruleExpression ) ;
+    // InternalExpression.g:7179:1: rule__ListLiteral__ElementsAssignment_2_0 : ( ruleExpression ) ;
     public final void rule__ListLiteral__ElementsAssignment_2_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7183:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7184:1: ( ruleExpression )
+            // InternalExpression.g:7183:1: ( ( ruleExpression ) )
+            // InternalExpression.g:7184:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7184:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7185:1: ruleExpression
+            // InternalExpression.g:7184:1: ( ruleExpression )
+            // InternalExpression.g:7185:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getListLiteralAccess().getElementsExpressionParserRuleCall_2_0_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__ListLiteral__ElementsAssignment_2_014515);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -20507,22 +20507,22 @@ public final void rule__ListLiteral__ElementsAssignment_2_0() throws Recognition
 
 
     // $ANTLR start "rule__ListLiteral__ElementsAssignment_2_1_1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7194:1: rule__ListLiteral__ElementsAssignment_2_1_1 : ( ruleExpression ) ;
+    // InternalExpression.g:7194:1: rule__ListLiteral__ElementsAssignment_2_1_1 : ( ruleExpression ) ;
     public final void rule__ListLiteral__ElementsAssignment_2_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7198:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7199:1: ( ruleExpression )
+            // InternalExpression.g:7198:1: ( ( ruleExpression ) )
+            // InternalExpression.g:7199:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7199:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7200:1: ruleExpression
+            // InternalExpression.g:7199:1: ( ruleExpression )
+            // InternalExpression.g:7200:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getListLiteralAccess().getElementsExpressionParserRuleCall_2_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__ListLiteral__ElementsAssignment_2_1_114546);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -20552,22 +20552,22 @@ public final void rule__ListLiteral__ElementsAssignment_2_1_1() throws Recogniti
 
 
     // $ANTLR start "rule__ConstructorCallExpression__TypeAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7209:1: rule__ConstructorCallExpression__TypeAssignment_1 : ( ruleSimpleType ) ;
+    // InternalExpression.g:7209:1: rule__ConstructorCallExpression__TypeAssignment_1 : ( ruleSimpleType ) ;
     public final void rule__ConstructorCallExpression__TypeAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7213:1: ( ( ruleSimpleType ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7214:1: ( ruleSimpleType )
+            // InternalExpression.g:7213:1: ( ( ruleSimpleType ) )
+            // InternalExpression.g:7214:1: ( ruleSimpleType )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7214:1: ( ruleSimpleType )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7215:1: ruleSimpleType
+            // InternalExpression.g:7214:1: ( ruleSimpleType )
+            // InternalExpression.g:7215:1: ruleSimpleType
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConstructorCallExpressionAccess().getTypeSimpleTypeParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleSimpleType_in_rule__ConstructorCallExpression__TypeAssignment_114577);
+            pushFollow(FOLLOW_2);
             ruleSimpleType();
 
             state._fsp--;
@@ -20597,28 +20597,28 @@ public final void rule__ConstructorCallExpression__TypeAssignment_1() throws Rec
 
 
     // $ANTLR start "rule__TypeSelectExpression__NameAssignment_0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7224:1: rule__TypeSelectExpression__NameAssignment_0 : ( ( 'typeSelect' ) ) ;
+    // InternalExpression.g:7224:1: rule__TypeSelectExpression__NameAssignment_0 : ( ( 'typeSelect' ) ) ;
     public final void rule__TypeSelectExpression__NameAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7228:1: ( ( ( 'typeSelect' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7229:1: ( ( 'typeSelect' ) )
+            // InternalExpression.g:7228:1: ( ( ( 'typeSelect' ) ) )
+            // InternalExpression.g:7229:1: ( ( 'typeSelect' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7229:1: ( ( 'typeSelect' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7230:1: ( 'typeSelect' )
+            // InternalExpression.g:7229:1: ( ( 'typeSelect' ) )
+            // InternalExpression.g:7230:1: ( 'typeSelect' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTypeSelectExpressionAccess().getNameTypeSelectKeyword_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7231:1: ( 'typeSelect' )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7232:1: 'typeSelect'
+            // InternalExpression.g:7231:1: ( 'typeSelect' )
+            // InternalExpression.g:7232:1: 'typeSelect'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTypeSelectExpressionAccess().getNameTypeSelectKeyword_0_0()); 
             }
-            match(input,62,FOLLOW_62_in_rule__TypeSelectExpression__NameAssignment_014613); if (state.failed) return ;
+            match(input,62,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getTypeSelectExpressionAccess().getNameTypeSelectKeyword_0_0()); 
             }
@@ -20650,22 +20650,22 @@ public final void rule__TypeSelectExpression__NameAssignment_0() throws Recognit
 
 
     // $ANTLR start "rule__TypeSelectExpression__TypeAssignment_2"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7247:1: rule__TypeSelectExpression__TypeAssignment_2 : ( ruleType ) ;
+    // InternalExpression.g:7247:1: rule__TypeSelectExpression__TypeAssignment_2 : ( ruleType ) ;
     public final void rule__TypeSelectExpression__TypeAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7251:1: ( ( ruleType ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7252:1: ( ruleType )
+            // InternalExpression.g:7251:1: ( ( ruleType ) )
+            // InternalExpression.g:7252:1: ( ruleType )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7252:1: ( ruleType )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7253:1: ruleType
+            // InternalExpression.g:7252:1: ( ruleType )
+            // InternalExpression.g:7253:1: ruleType
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTypeSelectExpressionAccess().getTypeTypeParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleType_in_rule__TypeSelectExpression__TypeAssignment_214652);
+            pushFollow(FOLLOW_2);
             ruleType();
 
             state._fsp--;
@@ -20695,25 +20695,25 @@ public final void rule__TypeSelectExpression__TypeAssignment_2() throws Recognit
 
 
     // $ANTLR start "rule__CollectionExpression__NameAssignment_0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7262:1: rule__CollectionExpression__NameAssignment_0 : ( ( rule__CollectionExpression__NameAlternatives_0_0 ) ) ;
+    // InternalExpression.g:7262:1: rule__CollectionExpression__NameAssignment_0 : ( ( rule__CollectionExpression__NameAlternatives_0_0 ) ) ;
     public final void rule__CollectionExpression__NameAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7266:1: ( ( ( rule__CollectionExpression__NameAlternatives_0_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7267:1: ( ( rule__CollectionExpression__NameAlternatives_0_0 ) )
+            // InternalExpression.g:7266:1: ( ( ( rule__CollectionExpression__NameAlternatives_0_0 ) ) )
+            // InternalExpression.g:7267:1: ( ( rule__CollectionExpression__NameAlternatives_0_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7267:1: ( ( rule__CollectionExpression__NameAlternatives_0_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7268:1: ( rule__CollectionExpression__NameAlternatives_0_0 )
+            // InternalExpression.g:7267:1: ( ( rule__CollectionExpression__NameAlternatives_0_0 ) )
+            // InternalExpression.g:7268:1: ( rule__CollectionExpression__NameAlternatives_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionExpressionAccess().getNameAlternatives_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7269:1: ( rule__CollectionExpression__NameAlternatives_0_0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7269:2: rule__CollectionExpression__NameAlternatives_0_0
+            // InternalExpression.g:7269:1: ( rule__CollectionExpression__NameAlternatives_0_0 )
+            // InternalExpression.g:7269:2: rule__CollectionExpression__NameAlternatives_0_0
             {
-            pushFollow(FOLLOW_rule__CollectionExpression__NameAlternatives_0_0_in_rule__CollectionExpression__NameAssignment_014683);
+            pushFollow(FOLLOW_2);
             rule__CollectionExpression__NameAlternatives_0_0();
 
             state._fsp--;
@@ -20746,22 +20746,22 @@ public final void rule__CollectionExpression__NameAssignment_0() throws Recognit
 
 
     // $ANTLR start "rule__CollectionExpression__VarAssignment_2_0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7278:1: rule__CollectionExpression__VarAssignment_2_0 : ( ruleIdentifier ) ;
+    // InternalExpression.g:7278:1: rule__CollectionExpression__VarAssignment_2_0 : ( ruleIdentifier ) ;
     public final void rule__CollectionExpression__VarAssignment_2_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7282:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7283:1: ( ruleIdentifier )
+            // InternalExpression.g:7282:1: ( ( ruleIdentifier ) )
+            // InternalExpression.g:7283:1: ( ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7283:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7284:1: ruleIdentifier
+            // InternalExpression.g:7283:1: ( ruleIdentifier )
+            // InternalExpression.g:7284:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionExpressionAccess().getVarIdentifierParserRuleCall_2_0_0()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__CollectionExpression__VarAssignment_2_014716);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -20791,22 +20791,22 @@ public final void rule__CollectionExpression__VarAssignment_2_0() throws Recogni
 
 
     // $ANTLR start "rule__CollectionExpression__ExpAssignment_3"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7293:1: rule__CollectionExpression__ExpAssignment_3 : ( ruleExpression ) ;
+    // InternalExpression.g:7293:1: rule__CollectionExpression__ExpAssignment_3 : ( ruleExpression ) ;
     public final void rule__CollectionExpression__ExpAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7297:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7298:1: ( ruleExpression )
+            // InternalExpression.g:7297:1: ( ( ruleExpression ) )
+            // InternalExpression.g:7298:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7298:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7299:1: ruleExpression
+            // InternalExpression.g:7298:1: ( ruleExpression )
+            // InternalExpression.g:7299:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionExpressionAccess().getExpExpressionParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__CollectionExpression__ExpAssignment_314747);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -20836,25 +20836,25 @@ public final void rule__CollectionExpression__ExpAssignment_3() throws Recogniti
 
 
     // $ANTLR start "rule__CollectionType__ClAssignment_0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7308:1: rule__CollectionType__ClAssignment_0 : ( ( rule__CollectionType__ClAlternatives_0_0 ) ) ;
+    // InternalExpression.g:7308:1: rule__CollectionType__ClAssignment_0 : ( ( rule__CollectionType__ClAlternatives_0_0 ) ) ;
     public final void rule__CollectionType__ClAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7312:1: ( ( ( rule__CollectionType__ClAlternatives_0_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7313:1: ( ( rule__CollectionType__ClAlternatives_0_0 ) )
+            // InternalExpression.g:7312:1: ( ( ( rule__CollectionType__ClAlternatives_0_0 ) ) )
+            // InternalExpression.g:7313:1: ( ( rule__CollectionType__ClAlternatives_0_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7313:1: ( ( rule__CollectionType__ClAlternatives_0_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7314:1: ( rule__CollectionType__ClAlternatives_0_0 )
+            // InternalExpression.g:7313:1: ( ( rule__CollectionType__ClAlternatives_0_0 ) )
+            // InternalExpression.g:7314:1: ( rule__CollectionType__ClAlternatives_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionTypeAccess().getClAlternatives_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7315:1: ( rule__CollectionType__ClAlternatives_0_0 )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7315:2: rule__CollectionType__ClAlternatives_0_0
+            // InternalExpression.g:7315:1: ( rule__CollectionType__ClAlternatives_0_0 )
+            // InternalExpression.g:7315:2: rule__CollectionType__ClAlternatives_0_0
             {
-            pushFollow(FOLLOW_rule__CollectionType__ClAlternatives_0_0_in_rule__CollectionType__ClAssignment_014778);
+            pushFollow(FOLLOW_2);
             rule__CollectionType__ClAlternatives_0_0();
 
             state._fsp--;
@@ -20887,22 +20887,22 @@ public final void rule__CollectionType__ClAssignment_0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__CollectionType__Id1Assignment_2"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7324:1: rule__CollectionType__Id1Assignment_2 : ( ruleSimpleType ) ;
+    // InternalExpression.g:7324:1: rule__CollectionType__Id1Assignment_2 : ( ruleSimpleType ) ;
     public final void rule__CollectionType__Id1Assignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7328:1: ( ( ruleSimpleType ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7329:1: ( ruleSimpleType )
+            // InternalExpression.g:7328:1: ( ( ruleSimpleType ) )
+            // InternalExpression.g:7329:1: ( ruleSimpleType )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7329:1: ( ruleSimpleType )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7330:1: ruleSimpleType
+            // InternalExpression.g:7329:1: ( ruleSimpleType )
+            // InternalExpression.g:7330:1: ruleSimpleType
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionTypeAccess().getId1SimpleTypeParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleSimpleType_in_rule__CollectionType__Id1Assignment_214811);
+            pushFollow(FOLLOW_2);
             ruleSimpleType();
 
             state._fsp--;
@@ -20932,22 +20932,22 @@ public final void rule__CollectionType__Id1Assignment_2() throws RecognitionExce
 
 
     // $ANTLR start "rule__SimpleType__IdAssignment_0"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7339:1: rule__SimpleType__IdAssignment_0 : ( ruleIdentifier ) ;
+    // InternalExpression.g:7339:1: rule__SimpleType__IdAssignment_0 : ( ruleIdentifier ) ;
     public final void rule__SimpleType__IdAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7343:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7344:1: ( ruleIdentifier )
+            // InternalExpression.g:7343:1: ( ( ruleIdentifier ) )
+            // InternalExpression.g:7344:1: ( ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7344:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7345:1: ruleIdentifier
+            // InternalExpression.g:7344:1: ( ruleIdentifier )
+            // InternalExpression.g:7345:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSimpleTypeAccess().getIdIdentifierParserRuleCall_0_0()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__SimpleType__IdAssignment_014842);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -20977,22 +20977,22 @@ public final void rule__SimpleType__IdAssignment_0() throws RecognitionException
 
 
     // $ANTLR start "rule__SimpleType__IdAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7354:1: rule__SimpleType__IdAssignment_1_1 : ( ruleIdentifier ) ;
+    // InternalExpression.g:7354:1: rule__SimpleType__IdAssignment_1_1 : ( ruleIdentifier ) ;
     public final void rule__SimpleType__IdAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7358:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7359:1: ( ruleIdentifier )
+            // InternalExpression.g:7358:1: ( ( ruleIdentifier ) )
+            // InternalExpression.g:7359:1: ( ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7359:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:7360:1: ruleIdentifier
+            // InternalExpression.g:7359:1: ( ruleIdentifier )
+            // InternalExpression.g:7360:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSimpleTypeAccess().getIdIdentifierParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__SimpleType__IdAssignment_1_114873);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -21022,19 +21022,19 @@ public final void rule__SimpleType__IdAssignment_1_1() throws RecognitionExcepti
 
     // $ANTLR start synpred2_InternalExpression
     public final void synpred2_InternalExpression_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1110:6: ( ( ( ruleCastedExpression ) ) )
-        // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1110:6: ( ( ruleCastedExpression ) )
+        // InternalExpression.g:1110:6: ( ( ( ruleCastedExpression ) ) )
+        // InternalExpression.g:1110:6: ( ( ruleCastedExpression ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1110:6: ( ( ruleCastedExpression ) )
-        // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1111:1: ( ruleCastedExpression )
+        // InternalExpression.g:1110:6: ( ( ruleCastedExpression ) )
+        // InternalExpression.g:1111:1: ( ruleCastedExpression )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getExpressionAccess().getCastedExpressionParserRuleCall_1()); 
         }
-        // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1112:1: ( ruleCastedExpression )
-        // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:1112:3: ruleCastedExpression
+        // InternalExpression.g:1112:1: ( ruleCastedExpression )
+        // InternalExpression.g:1112:3: ruleCastedExpression
         {
-        pushFollow(FOLLOW_ruleCastedExpression_in_synpred2_InternalExpression2315);
+        pushFollow(FOLLOW_2);
         ruleCastedExpression();
 
         state._fsp--;
@@ -21052,10 +21052,10 @@ public final void synpred2_InternalExpression_fragment() throws RecognitionExcep
 
     // $ANTLR start synpred49_InternalExpression
     public final void synpred49_InternalExpression_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2534:2: ( rule__IfExpressionKw__Group_4__0 )
-        // ../com.avaloq.tools.ddk.xtext.expression.ui/src-gen/com/avaloq/tools/ddk/xtext/expression/ui/contentassist/antlr/internal/InternalExpression.g:2534:2: rule__IfExpressionKw__Group_4__0
+        // InternalExpression.g:2534:2: ( rule__IfExpressionKw__Group_4__0 )
+        // InternalExpression.g:2534:2: rule__IfExpressionKw__Group_4__0
         {
-        pushFollow(FOLLOW_rule__IfExpressionKw__Group_4__0_in_synpred49_InternalExpression5331);
+        pushFollow(FOLLOW_2);
         rule__IfExpressionKw__Group_4__0();
 
         state._fsp--;
@@ -21098,21 +21098,13 @@ public final boolean synpred49_InternalExpression() {
 
 
     protected DFA1 dfa1 = new DFA1(this);
-    static final String DFA1_eotS =
-        "\36\uffff";
-    static final String DFA1_eofS =
-        "\36\uffff";
-    static final String DFA1_minS =
-        "\1\4\1\uffff\1\0\33\uffff";
-    static final String DFA1_maxS =
-        "\1\77\1\uffff\1\0\33\uffff";
-    static final String DFA1_acceptS =
-        "\1\uffff\1\1\1\uffff\1\3\31\uffff\1\2";
-    static final String DFA1_specialS =
-        "\2\uffff\1\0\33\uffff}>";
-    static final String[] DFA1_transitionS = {
-            "\4\3\13\uffff\1\3\2\uffff\16\3\1\1\2\uffff\1\2\3\uffff\1\3"+
-            "\2\uffff\2\3\6\uffff\2\3\6\uffff\2\3",
+    static final String dfa_1s = "\36\uffff";
+    static final String dfa_2s = "\1\4\1\uffff\1\0\33\uffff";
+    static final String dfa_3s = "\1\77\1\uffff\1\0\33\uffff";
+    static final String dfa_4s = "\1\uffff\1\1\1\uffff\1\3\31\uffff\1\2";
+    static final String dfa_5s = "\2\uffff\1\0\33\uffff}>";
+    static final String[] dfa_6s = {
+            "\4\3\13\uffff\1\3\2\uffff\16\3\1\1\2\uffff\1\2\3\uffff\1\3\2\uffff\2\3\6\uffff\2\3\6\uffff\2\3",
             "",
             "\1\uffff",
             "",
@@ -21144,34 +21136,25 @@ public final boolean synpred49_InternalExpression() {
             ""
     };
 
-    static final short[] DFA1_eot = DFA.unpackEncodedString(DFA1_eotS);
-    static final short[] DFA1_eof = DFA.unpackEncodedString(DFA1_eofS);
-    static final char[] DFA1_min = DFA.unpackEncodedStringToUnsignedChars(DFA1_minS);
-    static final char[] DFA1_max = DFA.unpackEncodedStringToUnsignedChars(DFA1_maxS);
-    static final short[] DFA1_accept = DFA.unpackEncodedString(DFA1_acceptS);
-    static final short[] DFA1_special = DFA.unpackEncodedString(DFA1_specialS);
-    static final short[][] DFA1_transition;
-
-    static {
-        int numStates = DFA1_transitionS.length;
-        DFA1_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA1_transition[i] = DFA.unpackEncodedString(DFA1_transitionS[i]);
-        }
-    }
+    static final short[] dfa_1 = DFA.unpackEncodedString(dfa_1s);
+    static final char[] dfa_2 = DFA.unpackEncodedStringToUnsignedChars(dfa_2s);
+    static final char[] dfa_3 = DFA.unpackEncodedStringToUnsignedChars(dfa_3s);
+    static final short[] dfa_4 = DFA.unpackEncodedString(dfa_4s);
+    static final short[] dfa_5 = DFA.unpackEncodedString(dfa_5s);
+    static final short[][] dfa_6 = unpackEncodedStringArray(dfa_6s);
 
     class DFA1 extends DFA {
 
         public DFA1(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 1;
-            this.eot = DFA1_eot;
-            this.eof = DFA1_eof;
-            this.min = DFA1_min;
-            this.max = DFA1_max;
-            this.accept = DFA1_accept;
-            this.special = DFA1_special;
-            this.transition = DFA1_transition;
+            this.eot = dfa_1;
+            this.eof = dfa_1;
+            this.min = dfa_2;
+            this.max = dfa_3;
+            this.accept = dfa_4;
+            this.special = dfa_5;
+            this.transition = dfa_6;
         }
         public String getDescription() {
             return "1099:1: rule__Expression__Alternatives : ( ( ruleLetExpression ) | ( ( ruleCastedExpression ) ) | ( ruleChainExpression ) );";
@@ -21205,627 +21188,50 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
     }
  
 
-    public static final BitSet FOLLOW_ruleExpression_in_entryRuleExpression67 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleExpression74 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Expression__Alternatives_in_ruleExpression100 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLetExpression_in_entryRuleLetExpression129 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleLetExpression136 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LetExpression__Group__0_in_ruleLetExpression162 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCastedExpression_in_entryRuleCastedExpression189 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleCastedExpression196 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CastedExpression__Group__0_in_ruleCastedExpression222 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChainExpression_in_entryRuleChainExpression249 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleChainExpression256 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChainExpression__Group__0_in_ruleChainExpression282 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_entryRuleChainedExpression309 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleChainedExpression316 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChainedExpression__Alternatives_in_ruleChainedExpression342 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIfExpressionTri_in_entryRuleIfExpressionTri369 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIfExpressionTri376 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__Group__0_in_ruleIfExpressionTri402 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIfExpressionKw_in_entryRuleIfExpressionKw429 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIfExpressionKw436 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group__0_in_ruleIfExpressionKw462 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSwitchExpression_in_entryRuleSwitchExpression489 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSwitchExpression496 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__0_in_ruleSwitchExpression522 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCase_in_entryRuleCase549 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleCase556 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Case__Group__0_in_ruleCase582 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOrExpression_in_entryRuleOrExpression609 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOrExpression616 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OrExpression__Group__0_in_ruleOrExpression642 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAndExpression_in_entryRuleAndExpression669 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAndExpression676 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AndExpression__Group__0_in_ruleAndExpression702 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImpliesExpression_in_entryRuleImpliesExpression729 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleImpliesExpression736 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ImpliesExpression__Group__0_in_ruleImpliesExpression762 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRelationalExpression_in_entryRuleRelationalExpression789 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRelationalExpression796 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RelationalExpression__Group__0_in_ruleRelationalExpression822 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAdditiveExpression_in_entryRuleAdditiveExpression849 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAdditiveExpression856 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AdditiveExpression__Group__0_in_ruleAdditiveExpression882 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMultiplicativeExpression_in_entryRuleMultiplicativeExpression909 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleMultiplicativeExpression916 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MultiplicativeExpression__Group__0_in_ruleMultiplicativeExpression942 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleUnaryOrInfixExpression_in_entryRuleUnaryOrInfixExpression969 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleUnaryOrInfixExpression976 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UnaryOrInfixExpression__Alternatives_in_ruleUnaryOrInfixExpression1002 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleUnaryExpression_in_entryRuleUnaryExpression1029 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleUnaryExpression1036 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UnaryExpression__Group__0_in_ruleUnaryExpression1062 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInfixExpression_in_entryRuleInfixExpression1089 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInfixExpression1096 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group__0_in_ruleInfixExpression1122 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePrimaryExpression_in_entryRulePrimaryExpression1149 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRulePrimaryExpression1156 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PrimaryExpression__Alternatives_in_rulePrimaryExpression1182 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteral_in_entryRuleLiteral1209 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleLiteral1216 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Literal__Alternatives_in_ruleLiteral1242 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBooleanLiteral_in_entryRuleBooleanLiteral1269 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleBooleanLiteral1276 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BooleanLiteral__ValAssignment_in_ruleBooleanLiteral1302 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntegerLiteral_in_entryRuleIntegerLiteral1329 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIntegerLiteral1336 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IntegerLiteral__ValAssignment_in_ruleIntegerLiteral1362 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNullLiteral_in_entryRuleNullLiteral1389 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNullLiteral1396 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NullLiteral__ValAssignment_in_ruleNullLiteral1422 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRealLiteral_in_entryRuleRealLiteral1449 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRealLiteral1456 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RealLiteral__ValAssignment_in_ruleRealLiteral1482 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral1509 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleStringLiteral1516 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StringLiteral__ValAssignment_in_ruleStringLiteral1542 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleParanthesizedExpression_in_entryRuleParanthesizedExpression1569 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleParanthesizedExpression1576 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ParanthesizedExpression__Group__0_in_ruleParanthesizedExpression1602 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGlobalVarExpression_in_entryRuleGlobalVarExpression1629 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleGlobalVarExpression1636 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalVarExpression__Group__0_in_ruleGlobalVarExpression1662 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFeatureCall_in_entryRuleFeatureCall1689 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFeatureCall1696 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FeatureCall__Alternatives_in_ruleFeatureCall1722 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOperationCall_in_entryRuleOperationCall1749 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOperationCall1756 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group__0_in_ruleOperationCall1782 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleListLiteral_in_entryRuleListLiteral1809 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleListLiteral1816 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group__0_in_ruleListLiteral1842 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConstructorCallExpression_in_entryRuleConstructorCallExpression1869 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleConstructorCallExpression1876 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConstructorCallExpression__Group__0_in_ruleConstructorCallExpression1902 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTypeSelectExpression_in_entryRuleTypeSelectExpression1929 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTypeSelectExpression1936 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TypeSelectExpression__Group__0_in_ruleTypeSelectExpression1962 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCollectionExpression_in_entryRuleCollectionExpression1989 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleCollectionExpression1996 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__Group__0_in_ruleCollectionExpression2022 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleType_in_entryRuleType2049 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleType2056 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Type__Alternatives_in_ruleType2082 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCollectionType_in_entryRuleCollectionType2109 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleCollectionType2116 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionType__Group__0_in_ruleCollectionType2142 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleType_in_entryRuleSimpleType2169 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSimpleType2176 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleType__Group__0_in_ruleSimpleType2202 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_entryRuleIdentifier2229 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIdentifier2236 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleIdentifier2262 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLetExpression_in_rule__Expression__Alternatives2297 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCastedExpression_in_rule__Expression__Alternatives2315 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChainExpression_in_rule__Expression__Alternatives2333 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIfExpressionKw_in_rule__ChainedExpression__Alternatives2366 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIfExpressionTri_in_rule__ChainedExpression__Alternatives2383 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSwitchExpression_in_rule__ChainedExpression__Alternatives2400 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_12_in_rule__RelationalExpression__OperatorAlternatives_1_1_02433 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_13_in_rule__RelationalExpression__OperatorAlternatives_1_1_02453 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_14_in_rule__RelationalExpression__OperatorAlternatives_1_1_02473 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_15_in_rule__RelationalExpression__OperatorAlternatives_1_1_02493 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_16_in_rule__RelationalExpression__OperatorAlternatives_1_1_02513 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_17_in_rule__RelationalExpression__OperatorAlternatives_1_1_02533 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_18_in_rule__AdditiveExpression__NameAlternatives_1_1_02568 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_rule__AdditiveExpression__NameAlternatives_1_1_02588 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_20_in_rule__MultiplicativeExpression__NameAlternatives_1_1_02623 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_21_in_rule__MultiplicativeExpression__NameAlternatives_1_1_02643 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleUnaryExpression_in_rule__UnaryOrInfixExpression__Alternatives2677 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInfixExpression_in_rule__UnaryOrInfixExpression__Alternatives2694 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_22_in_rule__UnaryExpression__NameAlternatives_0_02727 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_rule__UnaryExpression__NameAlternatives_0_02747 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0__0_in_rule__InfixExpression__Alternatives_12781 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_1__0_in_rule__InfixExpression__Alternatives_12799 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_2__0_in_rule__InfixExpression__Alternatives_12817 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3__0_in_rule__InfixExpression__Alternatives_12835 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_rule__InfixExpression__NameAlternatives_1_3_2_02869 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_rule__InfixExpression__NameAlternatives_1_3_2_02889 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_25_in_rule__InfixExpression__NameAlternatives_1_3_2_02909 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_rule__InfixExpression__NameAlternatives_1_3_2_02929 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__InfixExpression__NameAlternatives_1_3_2_02949 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__InfixExpression__NameAlternatives_1_3_2_02969 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_rule__InfixExpression__NameAlternatives_1_3_2_02989 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_rule__InfixExpression__NameAlternatives_1_3_2_03009 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteral_in_rule__PrimaryExpression__Alternatives3043 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFeatureCall_in_rule__PrimaryExpression__Alternatives3060 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleListLiteral_in_rule__PrimaryExpression__Alternatives3077 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConstructorCallExpression_in_rule__PrimaryExpression__Alternatives3094 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGlobalVarExpression_in_rule__PrimaryExpression__Alternatives3111 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleParanthesizedExpression_in_rule__PrimaryExpression__Alternatives3128 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBooleanLiteral_in_rule__Literal__Alternatives3160 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntegerLiteral_in_rule__Literal__Alternatives3177 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNullLiteral_in_rule__Literal__Alternatives3194 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRealLiteral_in_rule__Literal__Alternatives3211 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStringLiteral_in_rule__Literal__Alternatives3228 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_rule__BooleanLiteral__ValAlternatives_03261 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_rule__BooleanLiteral__ValAlternatives_03281 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOperationCall_in_rule__FeatureCall__Alternatives3315 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FeatureCall__TypeAssignment_1_in_rule__FeatureCall__Alternatives3332 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCollectionExpression_in_rule__FeatureCall__Alternatives3350 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTypeSelectExpression_in_rule__FeatureCall__Alternatives3367 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_rule__CollectionExpression__NameAlternatives_0_03400 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_rule__CollectionExpression__NameAlternatives_0_03420 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_25_in_rule__CollectionExpression__NameAlternatives_0_03440 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_rule__CollectionExpression__NameAlternatives_0_03460 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__CollectionExpression__NameAlternatives_0_03480 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__CollectionExpression__NameAlternatives_0_03500 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_rule__CollectionExpression__NameAlternatives_0_03520 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_rule__CollectionExpression__NameAlternatives_0_03540 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCollectionType_in_rule__Type__Alternatives3574 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleType_in_rule__Type__Alternatives3591 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_rule__CollectionType__ClAlternatives_0_03624 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_34_in_rule__CollectionType__ClAlternatives_0_03644 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_35_in_rule__CollectionType__ClAlternatives_0_03664 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LetExpression__Group__0__Impl_in_rule__LetExpression__Group__03696 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__LetExpression__Group__1_in_rule__LetExpression__Group__03699 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_rule__LetExpression__Group__0__Impl3727 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LetExpression__Group__1__Impl_in_rule__LetExpression__Group__13758 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_rule__LetExpression__Group__2_in_rule__LetExpression__Group__13761 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LetExpression__IdentifierAssignment_1_in_rule__LetExpression__Group__1__Impl3788 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LetExpression__Group__2__Impl_in_rule__LetExpression__Group__23818 = new BitSet(new long[]{0xC0C0C89FFFC800F0L});
-    public static final BitSet FOLLOW_rule__LetExpression__Group__3_in_rule__LetExpression__Group__23821 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_37_in_rule__LetExpression__Group__2__Impl3849 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LetExpression__Group__3__Impl_in_rule__LetExpression__Group__33880 = new BitSet(new long[]{0x0000004000000000L});
-    public static final BitSet FOLLOW_rule__LetExpression__Group__4_in_rule__LetExpression__Group__33883 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LetExpression__VarExprAssignment_3_in_rule__LetExpression__Group__3__Impl3910 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LetExpression__Group__4__Impl_in_rule__LetExpression__Group__43940 = new BitSet(new long[]{0xC0C0C89FFFC800F0L});
-    public static final BitSet FOLLOW_rule__LetExpression__Group__5_in_rule__LetExpression__Group__43943 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_38_in_rule__LetExpression__Group__4__Impl3971 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LetExpression__Group__5__Impl_in_rule__LetExpression__Group__54002 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LetExpression__TargetAssignment_5_in_rule__LetExpression__Group__5__Impl4029 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CastedExpression__Group__0__Impl_in_rule__CastedExpression__Group__04071 = new BitSet(new long[]{0x0000000E00000010L});
-    public static final BitSet FOLLOW_rule__CastedExpression__Group__1_in_rule__CastedExpression__Group__04074 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_39_in_rule__CastedExpression__Group__0__Impl4102 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CastedExpression__Group__1__Impl_in_rule__CastedExpression__Group__14133 = new BitSet(new long[]{0x0000010000000000L});
-    public static final BitSet FOLLOW_rule__CastedExpression__Group__2_in_rule__CastedExpression__Group__14136 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CastedExpression__TypeAssignment_1_in_rule__CastedExpression__Group__1__Impl4163 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CastedExpression__Group__2__Impl_in_rule__CastedExpression__Group__24193 = new BitSet(new long[]{0xC0C0C89FFFC800F0L});
-    public static final BitSet FOLLOW_rule__CastedExpression__Group__3_in_rule__CastedExpression__Group__24196 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_40_in_rule__CastedExpression__Group__2__Impl4224 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CastedExpression__Group__3__Impl_in_rule__CastedExpression__Group__34255 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CastedExpression__TargetAssignment_3_in_rule__CastedExpression__Group__3__Impl4282 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChainExpression__Group__0__Impl_in_rule__ChainExpression__Group__04320 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__ChainExpression__Group__1_in_rule__ChainExpression__Group__04323 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_rule__ChainExpression__Group__0__Impl4350 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChainExpression__Group__1__Impl_in_rule__ChainExpression__Group__14379 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChainExpression__Group_1__0_in_rule__ChainExpression__Group__1__Impl4406 = new BitSet(new long[]{0x0000020000000002L});
-    public static final BitSet FOLLOW_rule__ChainExpression__Group_1__0__Impl_in_rule__ChainExpression__Group_1__04441 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__ChainExpression__Group_1__1_in_rule__ChainExpression__Group_1__04444 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChainExpression__Group_1__1__Impl_in_rule__ChainExpression__Group_1__14502 = new BitSet(new long[]{0xC0C0C89FFFC800F0L});
-    public static final BitSet FOLLOW_rule__ChainExpression__Group_1__2_in_rule__ChainExpression__Group_1__14505 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__ChainExpression__Group_1__1__Impl4533 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChainExpression__Group_1__2__Impl_in_rule__ChainExpression__Group_1__24564 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChainExpression__NextAssignment_1_2_in_rule__ChainExpression__Group_1__2__Impl4591 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__Group__0__Impl_in_rule__IfExpressionTri__Group__04627 = new BitSet(new long[]{0x0000040000000000L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__Group__1_in_rule__IfExpressionTri__Group__04630 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOrExpression_in_rule__IfExpressionTri__Group__0__Impl4657 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__Group__1__Impl_in_rule__IfExpressionTri__Group__14686 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__Group_1__0_in_rule__IfExpressionTri__Group__1__Impl4713 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__Group_1__0__Impl_in_rule__IfExpressionTri__Group_1__04748 = new BitSet(new long[]{0x0000040000000000L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__Group_1__1_in_rule__IfExpressionTri__Group_1__04751 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__Group_1__1__Impl_in_rule__IfExpressionTri__Group_1__14809 = new BitSet(new long[]{0xC0C0C89FFFC800F0L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__Group_1__2_in_rule__IfExpressionTri__Group_1__14812 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__IfExpressionTri__Group_1__1__Impl4840 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__Group_1__2__Impl_in_rule__IfExpressionTri__Group_1__24871 = new BitSet(new long[]{0x0000004000000000L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__Group_1__3_in_rule__IfExpressionTri__Group_1__24874 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__ThenPartAssignment_1_2_in_rule__IfExpressionTri__Group_1__2__Impl4901 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__Group_1__3__Impl_in_rule__IfExpressionTri__Group_1__34931 = new BitSet(new long[]{0xC0C0C89FFFC800F0L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__Group_1__4_in_rule__IfExpressionTri__Group_1__34934 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_38_in_rule__IfExpressionTri__Group_1__3__Impl4962 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__Group_1__4__Impl_in_rule__IfExpressionTri__Group_1__44993 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__ElsePartAssignment_1_4_in_rule__IfExpressionTri__Group_1__4__Impl5020 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group__0__Impl_in_rule__IfExpressionKw__Group__05060 = new BitSet(new long[]{0xC0C0C89FFFC800F0L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group__1_in_rule__IfExpressionKw__Group__05063 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_rule__IfExpressionKw__Group__0__Impl5091 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group__1__Impl_in_rule__IfExpressionKw__Group__15122 = new BitSet(new long[]{0x0000100000000000L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group__2_in_rule__IfExpressionKw__Group__15125 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__ConditionAssignment_1_in_rule__IfExpressionKw__Group__1__Impl5152 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group__2__Impl_in_rule__IfExpressionKw__Group__25182 = new BitSet(new long[]{0xC0C0C89FFFC800F0L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group__3_in_rule__IfExpressionKw__Group__25185 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_44_in_rule__IfExpressionKw__Group__2__Impl5213 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group__3__Impl_in_rule__IfExpressionKw__Group__35244 = new BitSet(new long[]{0x0000200000000000L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group__4_in_rule__IfExpressionKw__Group__35247 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__ThenPartAssignment_3_in_rule__IfExpressionKw__Group__3__Impl5274 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group__4__Impl_in_rule__IfExpressionKw__Group__45304 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group_4__0_in_rule__IfExpressionKw__Group__4__Impl5331 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group_4__0__Impl_in_rule__IfExpressionKw__Group_4__05372 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group_4_0__0_in_rule__IfExpressionKw__Group_4__0__Impl5399 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group_4_0__0__Impl_in_rule__IfExpressionKw__Group_4_0__05431 = new BitSet(new long[]{0xC0C0C89FFFC800F0L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group_4_0__1_in_rule__IfExpressionKw__Group_4_0__05434 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_45_in_rule__IfExpressionKw__Group_4_0__0__Impl5462 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group_4_0__1__Impl_in_rule__IfExpressionKw__Group_4_0__15493 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__ElsePartAssignment_4_0_1_in_rule__IfExpressionKw__Group_4_0__1__Impl5520 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__0__Impl_in_rule__SwitchExpression__Group__05554 = new BitSet(new long[]{0x0000808000000000L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__1_in_rule__SwitchExpression__Group__05557 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rule__SwitchExpression__Group__0__Impl5585 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__1__Impl_in_rule__SwitchExpression__Group__15616 = new BitSet(new long[]{0x0000808000000000L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__2_in_rule__SwitchExpression__Group__15619 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group_1__0_in_rule__SwitchExpression__Group__1__Impl5646 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__2__Impl_in_rule__SwitchExpression__Group__25677 = new BitSet(new long[]{0x0005000000000000L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__3_in_rule__SwitchExpression__Group__25680 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__SwitchExpression__Group__2__Impl5708 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__3__Impl_in_rule__SwitchExpression__Group__35739 = new BitSet(new long[]{0x0005000000000000L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__4_in_rule__SwitchExpression__Group__35742 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__CaseAssignment_3_in_rule__SwitchExpression__Group__3__Impl5769 = new BitSet(new long[]{0x0004000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__4__Impl_in_rule__SwitchExpression__Group__45800 = new BitSet(new long[]{0x0000004000000000L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__5_in_rule__SwitchExpression__Group__45803 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_rule__SwitchExpression__Group__4__Impl5831 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__5__Impl_in_rule__SwitchExpression__Group__55862 = new BitSet(new long[]{0xC0C0808FFFC800F0L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__6_in_rule__SwitchExpression__Group__55865 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_38_in_rule__SwitchExpression__Group__5__Impl5893 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__6__Impl_in_rule__SwitchExpression__Group__65924 = new BitSet(new long[]{0x0002000000000000L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__7_in_rule__SwitchExpression__Group__65927 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__DefaultExprAssignment_6_in_rule__SwitchExpression__Group__6__Impl5954 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__7__Impl_in_rule__SwitchExpression__Group__75984 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_49_in_rule__SwitchExpression__Group__7__Impl6012 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group_1__0__Impl_in_rule__SwitchExpression__Group_1__06059 = new BitSet(new long[]{0xC0C0808FFFC800F0L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group_1__1_in_rule__SwitchExpression__Group_1__06062 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_39_in_rule__SwitchExpression__Group_1__0__Impl6090 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group_1__1__Impl_in_rule__SwitchExpression__Group_1__16121 = new BitSet(new long[]{0x0000010000000000L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group_1__2_in_rule__SwitchExpression__Group_1__16124 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__SwitchExprAssignment_1_1_in_rule__SwitchExpression__Group_1__1__Impl6151 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group_1__2__Impl_in_rule__SwitchExpression__Group_1__26181 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_40_in_rule__SwitchExpression__Group_1__2__Impl6209 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Case__Group__0__Impl_in_rule__Case__Group__06246 = new BitSet(new long[]{0xC0C0808FFFC800F0L});
-    public static final BitSet FOLLOW_rule__Case__Group__1_in_rule__Case__Group__06249 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_50_in_rule__Case__Group__0__Impl6277 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Case__Group__1__Impl_in_rule__Case__Group__16308 = new BitSet(new long[]{0x0000004000000000L});
-    public static final BitSet FOLLOW_rule__Case__Group__2_in_rule__Case__Group__16311 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Case__ConditionAssignment_1_in_rule__Case__Group__1__Impl6338 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Case__Group__2__Impl_in_rule__Case__Group__26368 = new BitSet(new long[]{0xC0C0808FFFC800F0L});
-    public static final BitSet FOLLOW_rule__Case__Group__3_in_rule__Case__Group__26371 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_38_in_rule__Case__Group__2__Impl6399 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Case__Group__3__Impl_in_rule__Case__Group__36430 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Case__ThenParAssignment_3_in_rule__Case__Group__3__Impl6457 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OrExpression__Group__0__Impl_in_rule__OrExpression__Group__06495 = new BitSet(new long[]{0x0800000000000000L});
-    public static final BitSet FOLLOW_rule__OrExpression__Group__1_in_rule__OrExpression__Group__06498 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAndExpression_in_rule__OrExpression__Group__0__Impl6525 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OrExpression__Group__1__Impl_in_rule__OrExpression__Group__16554 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OrExpression__Group_1__0_in_rule__OrExpression__Group__1__Impl6581 = new BitSet(new long[]{0x0800000000000002L});
-    public static final BitSet FOLLOW_rule__OrExpression__Group_1__0__Impl_in_rule__OrExpression__Group_1__06616 = new BitSet(new long[]{0x0800000000000000L});
-    public static final BitSet FOLLOW_rule__OrExpression__Group_1__1_in_rule__OrExpression__Group_1__06619 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OrExpression__Group_1__1__Impl_in_rule__OrExpression__Group_1__16677 = new BitSet(new long[]{0xC0C0808FFFC800F0L});
-    public static final BitSet FOLLOW_rule__OrExpression__Group_1__2_in_rule__OrExpression__Group_1__16680 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OrExpression__OperatorAssignment_1_1_in_rule__OrExpression__Group_1__1__Impl6707 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OrExpression__Group_1__2__Impl_in_rule__OrExpression__Group_1__26737 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OrExpression__RightAssignment_1_2_in_rule__OrExpression__Group_1__2__Impl6764 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AndExpression__Group__0__Impl_in_rule__AndExpression__Group__06800 = new BitSet(new long[]{0x1000000000000000L});
-    public static final BitSet FOLLOW_rule__AndExpression__Group__1_in_rule__AndExpression__Group__06803 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImpliesExpression_in_rule__AndExpression__Group__0__Impl6830 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AndExpression__Group__1__Impl_in_rule__AndExpression__Group__16859 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AndExpression__Group_1__0_in_rule__AndExpression__Group__1__Impl6886 = new BitSet(new long[]{0x1000000000000002L});
-    public static final BitSet FOLLOW_rule__AndExpression__Group_1__0__Impl_in_rule__AndExpression__Group_1__06921 = new BitSet(new long[]{0x1000000000000000L});
-    public static final BitSet FOLLOW_rule__AndExpression__Group_1__1_in_rule__AndExpression__Group_1__06924 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AndExpression__Group_1__1__Impl_in_rule__AndExpression__Group_1__16982 = new BitSet(new long[]{0xC0C0808FFFC800F0L});
-    public static final BitSet FOLLOW_rule__AndExpression__Group_1__2_in_rule__AndExpression__Group_1__16985 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AndExpression__OperatorAssignment_1_1_in_rule__AndExpression__Group_1__1__Impl7012 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AndExpression__Group_1__2__Impl_in_rule__AndExpression__Group_1__27042 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AndExpression__RightAssignment_1_2_in_rule__AndExpression__Group_1__2__Impl7069 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ImpliesExpression__Group__0__Impl_in_rule__ImpliesExpression__Group__07105 = new BitSet(new long[]{0x2000000000000000L});
-    public static final BitSet FOLLOW_rule__ImpliesExpression__Group__1_in_rule__ImpliesExpression__Group__07108 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRelationalExpression_in_rule__ImpliesExpression__Group__0__Impl7135 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ImpliesExpression__Group__1__Impl_in_rule__ImpliesExpression__Group__17164 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ImpliesExpression__Group_1__0_in_rule__ImpliesExpression__Group__1__Impl7191 = new BitSet(new long[]{0x2000000000000002L});
-    public static final BitSet FOLLOW_rule__ImpliesExpression__Group_1__0__Impl_in_rule__ImpliesExpression__Group_1__07226 = new BitSet(new long[]{0x2000000000000000L});
-    public static final BitSet FOLLOW_rule__ImpliesExpression__Group_1__1_in_rule__ImpliesExpression__Group_1__07229 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ImpliesExpression__Group_1__1__Impl_in_rule__ImpliesExpression__Group_1__17287 = new BitSet(new long[]{0xC0C0808FFFC800F0L});
-    public static final BitSet FOLLOW_rule__ImpliesExpression__Group_1__2_in_rule__ImpliesExpression__Group_1__17290 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ImpliesExpression__OperatorAssignment_1_1_in_rule__ImpliesExpression__Group_1__1__Impl7317 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ImpliesExpression__Group_1__2__Impl_in_rule__ImpliesExpression__Group_1__27347 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ImpliesExpression__RightAssignment_1_2_in_rule__ImpliesExpression__Group_1__2__Impl7374 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RelationalExpression__Group__0__Impl_in_rule__RelationalExpression__Group__07410 = new BitSet(new long[]{0x000000000003F000L});
-    public static final BitSet FOLLOW_rule__RelationalExpression__Group__1_in_rule__RelationalExpression__Group__07413 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAdditiveExpression_in_rule__RelationalExpression__Group__0__Impl7440 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RelationalExpression__Group__1__Impl_in_rule__RelationalExpression__Group__17469 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RelationalExpression__Group_1__0_in_rule__RelationalExpression__Group__1__Impl7496 = new BitSet(new long[]{0x000000000003F002L});
-    public static final BitSet FOLLOW_rule__RelationalExpression__Group_1__0__Impl_in_rule__RelationalExpression__Group_1__07531 = new BitSet(new long[]{0x000000000003F000L});
-    public static final BitSet FOLLOW_rule__RelationalExpression__Group_1__1_in_rule__RelationalExpression__Group_1__07534 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RelationalExpression__Group_1__1__Impl_in_rule__RelationalExpression__Group_1__17592 = new BitSet(new long[]{0xC0C0808FFFC800F0L});
-    public static final BitSet FOLLOW_rule__RelationalExpression__Group_1__2_in_rule__RelationalExpression__Group_1__17595 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RelationalExpression__OperatorAssignment_1_1_in_rule__RelationalExpression__Group_1__1__Impl7622 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RelationalExpression__Group_1__2__Impl_in_rule__RelationalExpression__Group_1__27652 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RelationalExpression__RightAssignment_1_2_in_rule__RelationalExpression__Group_1__2__Impl7679 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AdditiveExpression__Group__0__Impl_in_rule__AdditiveExpression__Group__07715 = new BitSet(new long[]{0x00000000000C0000L});
-    public static final BitSet FOLLOW_rule__AdditiveExpression__Group__1_in_rule__AdditiveExpression__Group__07718 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMultiplicativeExpression_in_rule__AdditiveExpression__Group__0__Impl7745 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AdditiveExpression__Group__1__Impl_in_rule__AdditiveExpression__Group__17774 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AdditiveExpression__Group_1__0_in_rule__AdditiveExpression__Group__1__Impl7801 = new BitSet(new long[]{0x00000000000C0002L});
-    public static final BitSet FOLLOW_rule__AdditiveExpression__Group_1__0__Impl_in_rule__AdditiveExpression__Group_1__07836 = new BitSet(new long[]{0x00000000000C0000L});
-    public static final BitSet FOLLOW_rule__AdditiveExpression__Group_1__1_in_rule__AdditiveExpression__Group_1__07839 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AdditiveExpression__Group_1__1__Impl_in_rule__AdditiveExpression__Group_1__17897 = new BitSet(new long[]{0xC0C0808FFFC800F0L});
-    public static final BitSet FOLLOW_rule__AdditiveExpression__Group_1__2_in_rule__AdditiveExpression__Group_1__17900 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AdditiveExpression__NameAssignment_1_1_in_rule__AdditiveExpression__Group_1__1__Impl7927 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AdditiveExpression__Group_1__2__Impl_in_rule__AdditiveExpression__Group_1__27957 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AdditiveExpression__ParamsAssignment_1_2_in_rule__AdditiveExpression__Group_1__2__Impl7984 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MultiplicativeExpression__Group__0__Impl_in_rule__MultiplicativeExpression__Group__08020 = new BitSet(new long[]{0x0000000000300000L});
-    public static final BitSet FOLLOW_rule__MultiplicativeExpression__Group__1_in_rule__MultiplicativeExpression__Group__08023 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleUnaryOrInfixExpression_in_rule__MultiplicativeExpression__Group__0__Impl8050 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MultiplicativeExpression__Group__1__Impl_in_rule__MultiplicativeExpression__Group__18079 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MultiplicativeExpression__Group_1__0_in_rule__MultiplicativeExpression__Group__1__Impl8106 = new BitSet(new long[]{0x0000000000300002L});
-    public static final BitSet FOLLOW_rule__MultiplicativeExpression__Group_1__0__Impl_in_rule__MultiplicativeExpression__Group_1__08141 = new BitSet(new long[]{0x0000000000300000L});
-    public static final BitSet FOLLOW_rule__MultiplicativeExpression__Group_1__1_in_rule__MultiplicativeExpression__Group_1__08144 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MultiplicativeExpression__Group_1__1__Impl_in_rule__MultiplicativeExpression__Group_1__18202 = new BitSet(new long[]{0xC0C0808FFFC800F0L});
-    public static final BitSet FOLLOW_rule__MultiplicativeExpression__Group_1__2_in_rule__MultiplicativeExpression__Group_1__18205 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MultiplicativeExpression__NameAssignment_1_1_in_rule__MultiplicativeExpression__Group_1__1__Impl8232 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MultiplicativeExpression__Group_1__2__Impl_in_rule__MultiplicativeExpression__Group_1__28262 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MultiplicativeExpression__ParamsAssignment_1_2_in_rule__MultiplicativeExpression__Group_1__2__Impl8289 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UnaryExpression__Group__0__Impl_in_rule__UnaryExpression__Group__08325 = new BitSet(new long[]{0xC0C0808FFFC800F0L});
-    public static final BitSet FOLLOW_rule__UnaryExpression__Group__1_in_rule__UnaryExpression__Group__08328 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UnaryExpression__NameAssignment_0_in_rule__UnaryExpression__Group__0__Impl8355 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UnaryExpression__Group__1__Impl_in_rule__UnaryExpression__Group__18385 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UnaryExpression__ParamsAssignment_1_in_rule__UnaryExpression__Group__1__Impl8412 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group__0__Impl_in_rule__InfixExpression__Group__08446 = new BitSet(new long[]{0x0008000000000000L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group__1_in_rule__InfixExpression__Group__08449 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePrimaryExpression_in_rule__InfixExpression__Group__0__Impl8476 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group__1__Impl_in_rule__InfixExpression__Group__18505 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Alternatives_1_in_rule__InfixExpression__Group__1__Impl8532 = new BitSet(new long[]{0x0008000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0__0__Impl_in_rule__InfixExpression__Group_1_0__08567 = new BitSet(new long[]{0x0008000000000000L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0__1_in_rule__InfixExpression__Group_1_0__08570 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0__1__Impl_in_rule__InfixExpression__Group_1_0__18628 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0__2_in_rule__InfixExpression__Group_1_0__18631 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__InfixExpression__Group_1_0__1__Impl8659 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0__2__Impl_in_rule__InfixExpression__Group_1_0__28690 = new BitSet(new long[]{0x0000008000000000L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0__3_in_rule__InfixExpression__Group_1_0__28693 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__NameAssignment_1_0_2_in_rule__InfixExpression__Group_1_0__2__Impl8720 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0__3__Impl_in_rule__InfixExpression__Group_1_0__38750 = new BitSet(new long[]{0xC0C0C99FFFC800F0L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0__4_in_rule__InfixExpression__Group_1_0__38753 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_39_in_rule__InfixExpression__Group_1_0__3__Impl8781 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0__4__Impl_in_rule__InfixExpression__Group_1_0__48812 = new BitSet(new long[]{0xC0C0C99FFFC800F0L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0__5_in_rule__InfixExpression__Group_1_0__48815 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0_4__0_in_rule__InfixExpression__Group_1_0__4__Impl8842 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0__5__Impl_in_rule__InfixExpression__Group_1_0__58873 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_40_in_rule__InfixExpression__Group_1_0__5__Impl8901 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0_4__0__Impl_in_rule__InfixExpression__Group_1_0_4__08944 = new BitSet(new long[]{0x0010000000000000L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0_4__1_in_rule__InfixExpression__Group_1_0_4__08947 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__ParamsAssignment_1_0_4_0_in_rule__InfixExpression__Group_1_0_4__0__Impl8974 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0_4__1__Impl_in_rule__InfixExpression__Group_1_0_4__19004 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0_4_1__0_in_rule__InfixExpression__Group_1_0_4__1__Impl9031 = new BitSet(new long[]{0x0010000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0_4_1__0__Impl_in_rule__InfixExpression__Group_1_0_4_1__09066 = new BitSet(new long[]{0xC0C0C89FFFC800F0L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0_4_1__1_in_rule__InfixExpression__Group_1_0_4_1__09069 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_rule__InfixExpression__Group_1_0_4_1__0__Impl9097 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0_4_1__1__Impl_in_rule__InfixExpression__Group_1_0_4_1__19128 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__ParamsAssignment_1_0_4_1_1_in_rule__InfixExpression__Group_1_0_4_1__1__Impl9155 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_1__0__Impl_in_rule__InfixExpression__Group_1_1__09189 = new BitSet(new long[]{0x0008000000000000L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_1__1_in_rule__InfixExpression__Group_1_1__09192 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_1__1__Impl_in_rule__InfixExpression__Group_1_1__19250 = new BitSet(new long[]{0x0000000E00000010L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_1__2_in_rule__InfixExpression__Group_1_1__19253 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__InfixExpression__Group_1_1__1__Impl9281 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_1__2__Impl_in_rule__InfixExpression__Group_1_1__29312 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__TypeAssignment_1_1_2_in_rule__InfixExpression__Group_1_1__2__Impl9339 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_2__0__Impl_in_rule__InfixExpression__Group_1_2__09375 = new BitSet(new long[]{0x0008000000000000L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_2__1_in_rule__InfixExpression__Group_1_2__09378 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_2__1__Impl_in_rule__InfixExpression__Group_1_2__19436 = new BitSet(new long[]{0x4000000000000000L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_2__2_in_rule__InfixExpression__Group_1_2__19439 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__InfixExpression__Group_1_2__1__Impl9467 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_2__2__Impl_in_rule__InfixExpression__Group_1_2__29498 = new BitSet(new long[]{0x0000008000000000L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_2__3_in_rule__InfixExpression__Group_1_2__29501 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__NameAssignment_1_2_2_in_rule__InfixExpression__Group_1_2__2__Impl9528 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_2__3__Impl_in_rule__InfixExpression__Group_1_2__39558 = new BitSet(new long[]{0x0000000E00000010L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_2__4_in_rule__InfixExpression__Group_1_2__39561 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_39_in_rule__InfixExpression__Group_1_2__3__Impl9589 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_2__4__Impl_in_rule__InfixExpression__Group_1_2__49620 = new BitSet(new long[]{0x0000010000000000L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_2__5_in_rule__InfixExpression__Group_1_2__49623 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__TypeAssignment_1_2_4_in_rule__InfixExpression__Group_1_2__4__Impl9650 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_2__5__Impl_in_rule__InfixExpression__Group_1_2__59680 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_40_in_rule__InfixExpression__Group_1_2__5__Impl9708 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3__0__Impl_in_rule__InfixExpression__Group_1_3__09751 = new BitSet(new long[]{0x0008000000000000L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3__1_in_rule__InfixExpression__Group_1_3__09754 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3__1__Impl_in_rule__InfixExpression__Group_1_3__19812 = new BitSet(new long[]{0x000000007F800000L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3__2_in_rule__InfixExpression__Group_1_3__19815 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__InfixExpression__Group_1_3__1__Impl9843 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3__2__Impl_in_rule__InfixExpression__Group_1_3__29874 = new BitSet(new long[]{0x0000008000000000L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3__3_in_rule__InfixExpression__Group_1_3__29877 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__NameAssignment_1_3_2_in_rule__InfixExpression__Group_1_3__2__Impl9904 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3__3__Impl_in_rule__InfixExpression__Group_1_3__39934 = new BitSet(new long[]{0xC0C0C89FFFC800F0L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3__4_in_rule__InfixExpression__Group_1_3__39937 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_39_in_rule__InfixExpression__Group_1_3__3__Impl9965 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3__4__Impl_in_rule__InfixExpression__Group_1_3__49996 = new BitSet(new long[]{0xC0C0C89FFFC800F0L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3__5_in_rule__InfixExpression__Group_1_3__49999 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3_4__0_in_rule__InfixExpression__Group_1_3__4__Impl10026 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3__5__Impl_in_rule__InfixExpression__Group_1_3__510057 = new BitSet(new long[]{0x0000010000000000L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3__6_in_rule__InfixExpression__Group_1_3__510060 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__ExpAssignment_1_3_5_in_rule__InfixExpression__Group_1_3__5__Impl10087 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3__6__Impl_in_rule__InfixExpression__Group_1_3__610117 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_40_in_rule__InfixExpression__Group_1_3__6__Impl10145 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3_4__0__Impl_in_rule__InfixExpression__Group_1_3_4__010190 = new BitSet(new long[]{0x0020000000000000L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3_4__1_in_rule__InfixExpression__Group_1_3_4__010193 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__VarAssignment_1_3_4_0_in_rule__InfixExpression__Group_1_3_4__0__Impl10220 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3_4__1__Impl_in_rule__InfixExpression__Group_1_3_4__110250 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_53_in_rule__InfixExpression__Group_1_3_4__1__Impl10278 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ParanthesizedExpression__Group__0__Impl_in_rule__ParanthesizedExpression__Group__010313 = new BitSet(new long[]{0xC0C0C89FFFC800F0L});
-    public static final BitSet FOLLOW_rule__ParanthesizedExpression__Group__1_in_rule__ParanthesizedExpression__Group__010316 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_39_in_rule__ParanthesizedExpression__Group__0__Impl10344 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ParanthesizedExpression__Group__1__Impl_in_rule__ParanthesizedExpression__Group__110375 = new BitSet(new long[]{0x0000010000000000L});
-    public static final BitSet FOLLOW_rule__ParanthesizedExpression__Group__2_in_rule__ParanthesizedExpression__Group__110378 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__ParanthesizedExpression__Group__1__Impl10405 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ParanthesizedExpression__Group__2__Impl_in_rule__ParanthesizedExpression__Group__210434 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_40_in_rule__ParanthesizedExpression__Group__2__Impl10462 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalVarExpression__Group__0__Impl_in_rule__GlobalVarExpression__Group__010499 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__GlobalVarExpression__Group__1_in_rule__GlobalVarExpression__Group__010502 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_54_in_rule__GlobalVarExpression__Group__0__Impl10530 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalVarExpression__Group__1__Impl_in_rule__GlobalVarExpression__Group__110561 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalVarExpression__NameAssignment_1_in_rule__GlobalVarExpression__Group__1__Impl10588 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group__0__Impl_in_rule__OperationCall__Group__010622 = new BitSet(new long[]{0x0000008000000000L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group__1_in_rule__OperationCall__Group__010625 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OperationCall__NameAssignment_0_in_rule__OperationCall__Group__0__Impl10652 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group__1__Impl_in_rule__OperationCall__Group__110682 = new BitSet(new long[]{0xC0C0C99FFFC800F0L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group__2_in_rule__OperationCall__Group__110685 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_39_in_rule__OperationCall__Group__1__Impl10713 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group__2__Impl_in_rule__OperationCall__Group__210744 = new BitSet(new long[]{0xC0C0C99FFFC800F0L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group__3_in_rule__OperationCall__Group__210747 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group_2__0_in_rule__OperationCall__Group__2__Impl10774 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group__3__Impl_in_rule__OperationCall__Group__310805 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_40_in_rule__OperationCall__Group__3__Impl10833 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group_2__0__Impl_in_rule__OperationCall__Group_2__010872 = new BitSet(new long[]{0x0010000000000000L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group_2__1_in_rule__OperationCall__Group_2__010875 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OperationCall__ParamsAssignment_2_0_in_rule__OperationCall__Group_2__0__Impl10902 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group_2__1__Impl_in_rule__OperationCall__Group_2__110932 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group_2_1__0_in_rule__OperationCall__Group_2__1__Impl10959 = new BitSet(new long[]{0x0010000000000002L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group_2_1__0__Impl_in_rule__OperationCall__Group_2_1__010994 = new BitSet(new long[]{0xC0C0C89FFFC800F0L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group_2_1__1_in_rule__OperationCall__Group_2_1__010997 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_rule__OperationCall__Group_2_1__0__Impl11025 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group_2_1__1__Impl_in_rule__OperationCall__Group_2_1__111056 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OperationCall__ParamsAssignment_2_1_1_in_rule__OperationCall__Group_2_1__1__Impl11083 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group__0__Impl_in_rule__ListLiteral__Group__011117 = new BitSet(new long[]{0x0000800000000000L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group__1_in_rule__ListLiteral__Group__011120 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group__1__Impl_in_rule__ListLiteral__Group__111178 = new BitSet(new long[]{0xC0C2C89FFFC800F0L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group__2_in_rule__ListLiteral__Group__111181 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__ListLiteral__Group__1__Impl11209 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group__2__Impl_in_rule__ListLiteral__Group__211240 = new BitSet(new long[]{0xC0C2C89FFFC800F0L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group__3_in_rule__ListLiteral__Group__211243 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group_2__0_in_rule__ListLiteral__Group__2__Impl11270 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group__3__Impl_in_rule__ListLiteral__Group__311301 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_49_in_rule__ListLiteral__Group__3__Impl11329 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group_2__0__Impl_in_rule__ListLiteral__Group_2__011368 = new BitSet(new long[]{0x0010000000000000L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group_2__1_in_rule__ListLiteral__Group_2__011371 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ListLiteral__ElementsAssignment_2_0_in_rule__ListLiteral__Group_2__0__Impl11398 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group_2__1__Impl_in_rule__ListLiteral__Group_2__111428 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group_2_1__0_in_rule__ListLiteral__Group_2__1__Impl11455 = new BitSet(new long[]{0x0010000000000002L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group_2_1__0__Impl_in_rule__ListLiteral__Group_2_1__011490 = new BitSet(new long[]{0xC0C0C89FFFC800F0L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group_2_1__1_in_rule__ListLiteral__Group_2_1__011493 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_rule__ListLiteral__Group_2_1__0__Impl11521 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group_2_1__1__Impl_in_rule__ListLiteral__Group_2_1__111552 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ListLiteral__ElementsAssignment_2_1_1_in_rule__ListLiteral__Group_2_1__1__Impl11579 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConstructorCallExpression__Group__0__Impl_in_rule__ConstructorCallExpression__Group__011613 = new BitSet(new long[]{0x0000000E00000010L});
-    public static final BitSet FOLLOW_rule__ConstructorCallExpression__Group__1_in_rule__ConstructorCallExpression__Group__011616 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_55_in_rule__ConstructorCallExpression__Group__0__Impl11644 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConstructorCallExpression__Group__1__Impl_in_rule__ConstructorCallExpression__Group__111675 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConstructorCallExpression__TypeAssignment_1_in_rule__ConstructorCallExpression__Group__1__Impl11702 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TypeSelectExpression__Group__0__Impl_in_rule__TypeSelectExpression__Group__011736 = new BitSet(new long[]{0x0000008000000000L});
-    public static final BitSet FOLLOW_rule__TypeSelectExpression__Group__1_in_rule__TypeSelectExpression__Group__011739 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TypeSelectExpression__NameAssignment_0_in_rule__TypeSelectExpression__Group__0__Impl11766 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TypeSelectExpression__Group__1__Impl_in_rule__TypeSelectExpression__Group__111796 = new BitSet(new long[]{0x0000000E00000010L});
-    public static final BitSet FOLLOW_rule__TypeSelectExpression__Group__2_in_rule__TypeSelectExpression__Group__111799 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_39_in_rule__TypeSelectExpression__Group__1__Impl11827 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TypeSelectExpression__Group__2__Impl_in_rule__TypeSelectExpression__Group__211858 = new BitSet(new long[]{0x0000010000000000L});
-    public static final BitSet FOLLOW_rule__TypeSelectExpression__Group__3_in_rule__TypeSelectExpression__Group__211861 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TypeSelectExpression__TypeAssignment_2_in_rule__TypeSelectExpression__Group__2__Impl11888 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TypeSelectExpression__Group__3__Impl_in_rule__TypeSelectExpression__Group__311918 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_40_in_rule__TypeSelectExpression__Group__3__Impl11946 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__Group__0__Impl_in_rule__CollectionExpression__Group__011985 = new BitSet(new long[]{0x0000008000000000L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__Group__1_in_rule__CollectionExpression__Group__011988 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__NameAssignment_0_in_rule__CollectionExpression__Group__0__Impl12015 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__Group__1__Impl_in_rule__CollectionExpression__Group__112045 = new BitSet(new long[]{0xC0C0C89FFFC800F0L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__Group__2_in_rule__CollectionExpression__Group__112048 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_39_in_rule__CollectionExpression__Group__1__Impl12076 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__Group__2__Impl_in_rule__CollectionExpression__Group__212107 = new BitSet(new long[]{0xC0C0C89FFFC800F0L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__Group__3_in_rule__CollectionExpression__Group__212110 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__Group_2__0_in_rule__CollectionExpression__Group__2__Impl12137 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__Group__3__Impl_in_rule__CollectionExpression__Group__312168 = new BitSet(new long[]{0x0000010000000000L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__Group__4_in_rule__CollectionExpression__Group__312171 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__ExpAssignment_3_in_rule__CollectionExpression__Group__3__Impl12198 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__Group__4__Impl_in_rule__CollectionExpression__Group__412228 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_40_in_rule__CollectionExpression__Group__4__Impl12256 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__Group_2__0__Impl_in_rule__CollectionExpression__Group_2__012297 = new BitSet(new long[]{0x0020000000000000L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__Group_2__1_in_rule__CollectionExpression__Group_2__012300 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__VarAssignment_2_0_in_rule__CollectionExpression__Group_2__0__Impl12327 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__Group_2__1__Impl_in_rule__CollectionExpression__Group_2__112357 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_53_in_rule__CollectionExpression__Group_2__1__Impl12385 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionType__Group__0__Impl_in_rule__CollectionType__Group__012420 = new BitSet(new long[]{0x0100000000000000L});
-    public static final BitSet FOLLOW_rule__CollectionType__Group__1_in_rule__CollectionType__Group__012423 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionType__ClAssignment_0_in_rule__CollectionType__Group__0__Impl12450 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionType__Group__1__Impl_in_rule__CollectionType__Group__112480 = new BitSet(new long[]{0x0000000E00000010L});
-    public static final BitSet FOLLOW_rule__CollectionType__Group__2_in_rule__CollectionType__Group__112483 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_rule__CollectionType__Group__1__Impl12511 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionType__Group__2__Impl_in_rule__CollectionType__Group__212542 = new BitSet(new long[]{0x0200000000000000L});
-    public static final BitSet FOLLOW_rule__CollectionType__Group__3_in_rule__CollectionType__Group__212545 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionType__Id1Assignment_2_in_rule__CollectionType__Group__2__Impl12572 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionType__Group__3__Impl_in_rule__CollectionType__Group__312602 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_57_in_rule__CollectionType__Group__3__Impl12630 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleType__Group__0__Impl_in_rule__SimpleType__Group__012669 = new BitSet(new long[]{0x0400000000000000L});
-    public static final BitSet FOLLOW_rule__SimpleType__Group__1_in_rule__SimpleType__Group__012672 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleType__IdAssignment_0_in_rule__SimpleType__Group__0__Impl12699 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleType__Group__1__Impl_in_rule__SimpleType__Group__112729 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleType__Group_1__0_in_rule__SimpleType__Group__1__Impl12756 = new BitSet(new long[]{0x0400000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleType__Group_1__0__Impl_in_rule__SimpleType__Group_1__012791 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__SimpleType__Group_1__1_in_rule__SimpleType__Group_1__012794 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_58_in_rule__SimpleType__Group_1__0__Impl12822 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleType__Group_1__1__Impl_in_rule__SimpleType__Group_1__112853 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleType__IdAssignment_1_1_in_rule__SimpleType__Group_1__1__Impl12880 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__LetExpression__IdentifierAssignment_112919 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__LetExpression__VarExprAssignment_312950 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__LetExpression__TargetAssignment_512981 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleType_in_rule__CastedExpression__TypeAssignment_113012 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__CastedExpression__TargetAssignment_313043 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_rule__ChainExpression__NextAssignment_1_213074 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_rule__IfExpressionTri__ThenPartAssignment_1_213105 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_rule__IfExpressionTri__ElsePartAssignment_1_413136 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_rule__IfExpressionKw__ConditionAssignment_113167 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_rule__IfExpressionKw__ThenPartAssignment_313198 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_rule__IfExpressionKw__ElsePartAssignment_4_0_113229 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOrExpression_in_rule__SwitchExpression__SwitchExprAssignment_1_113260 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCase_in_rule__SwitchExpression__CaseAssignment_313291 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOrExpression_in_rule__SwitchExpression__DefaultExprAssignment_613322 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOrExpression_in_rule__Case__ConditionAssignment_113353 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOrExpression_in_rule__Case__ThenParAssignment_313384 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_59_in_rule__OrExpression__OperatorAssignment_1_113420 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAndExpression_in_rule__OrExpression__RightAssignment_1_213459 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_60_in_rule__AndExpression__OperatorAssignment_1_113495 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImpliesExpression_in_rule__AndExpression__RightAssignment_1_213534 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_61_in_rule__ImpliesExpression__OperatorAssignment_1_113570 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRelationalExpression_in_rule__ImpliesExpression__RightAssignment_1_213609 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RelationalExpression__OperatorAlternatives_1_1_0_in_rule__RelationalExpression__OperatorAssignment_1_113640 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAdditiveExpression_in_rule__RelationalExpression__RightAssignment_1_213673 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AdditiveExpression__NameAlternatives_1_1_0_in_rule__AdditiveExpression__NameAssignment_1_113704 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMultiplicativeExpression_in_rule__AdditiveExpression__ParamsAssignment_1_213737 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MultiplicativeExpression__NameAlternatives_1_1_0_in_rule__MultiplicativeExpression__NameAssignment_1_113768 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleUnaryOrInfixExpression_in_rule__MultiplicativeExpression__ParamsAssignment_1_213801 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UnaryExpression__NameAlternatives_0_0_in_rule__UnaryExpression__NameAssignment_013832 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInfixExpression_in_rule__UnaryExpression__ParamsAssignment_113865 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__InfixExpression__NameAssignment_1_0_213896 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__InfixExpression__ParamsAssignment_1_0_4_013927 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__InfixExpression__ParamsAssignment_1_0_4_1_113958 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleType_in_rule__InfixExpression__TypeAssignment_1_1_213989 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_62_in_rule__InfixExpression__NameAssignment_1_2_214025 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleType_in_rule__InfixExpression__TypeAssignment_1_2_414064 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__NameAlternatives_1_3_2_0_in_rule__InfixExpression__NameAssignment_1_3_214095 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__InfixExpression__VarAssignment_1_3_4_014128 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__InfixExpression__ExpAssignment_1_3_514159 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BooleanLiteral__ValAlternatives_0_in_rule__BooleanLiteral__ValAssignment14190 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__IntegerLiteral__ValAssignment14223 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_rule__NullLiteral__ValAssignment14259 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_REAL_in_rule__RealLiteral__ValAssignment14298 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__StringLiteral__ValAssignment14329 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__GlobalVarExpression__NameAssignment_114360 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleType_in_rule__FeatureCall__TypeAssignment_114391 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__OperationCall__NameAssignment_014422 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__OperationCall__ParamsAssignment_2_014453 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__OperationCall__ParamsAssignment_2_1_114484 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__ListLiteral__ElementsAssignment_2_014515 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__ListLiteral__ElementsAssignment_2_1_114546 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleType_in_rule__ConstructorCallExpression__TypeAssignment_114577 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_62_in_rule__TypeSelectExpression__NameAssignment_014613 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleType_in_rule__TypeSelectExpression__TypeAssignment_214652 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__NameAlternatives_0_0_in_rule__CollectionExpression__NameAssignment_014683 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__CollectionExpression__VarAssignment_2_014716 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__CollectionExpression__ExpAssignment_314747 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionType__ClAlternatives_0_0_in_rule__CollectionType__ClAssignment_014778 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleType_in_rule__CollectionType__Id1Assignment_214811 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__SimpleType__IdAssignment_014842 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__SimpleType__IdAssignment_1_114873 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCastedExpression_in_synpred2_InternalExpression2315 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group_4__0_in_synpred49_InternalExpression5331 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_1 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_2 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000002000000000L});
+    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0xC0C0C89FFFC800F0L});
+    public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000004000000000L});
+    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000000E00000010L});
+    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000010000000000L});
+    public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000020000000000L});
+    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000020000000002L});
+    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000040000000000L});
+    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000100000000000L});
+    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000200000000000L});
+    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000808000000000L});
+    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0005000000000000L});
+    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0004000000000002L});
+    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0xC0C0808FFFC800F0L});
+    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0002000000000000L});
+    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0800000000000000L});
+    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0800000000000002L});
+    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x1000000000000000L});
+    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x1000000000000002L});
+    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x2000000000000000L});
+    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x2000000000000002L});
+    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x000000000003F000L});
+    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x000000000003F002L});
+    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x00000000000C0000L});
+    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x00000000000C0002L});
+    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000000000300000L});
+    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000000000300002L});
+    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0008000000000000L});
+    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0008000000000002L});
+    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0000008000000000L});
+    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0xC0C0C99FFFC800F0L});
+    public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x0010000000000000L});
+    public static final BitSet FOLLOW_36 = new BitSet(new long[]{0x0010000000000002L});
+    public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x4000000000000000L});
+    public static final BitSet FOLLOW_38 = new BitSet(new long[]{0x000000007F800000L});
+    public static final BitSet FOLLOW_39 = new BitSet(new long[]{0x0020000000000000L});
+    public static final BitSet FOLLOW_40 = new BitSet(new long[]{0x0000800000000000L});
+    public static final BitSet FOLLOW_41 = new BitSet(new long[]{0xC0C2C89FFFC800F0L});
+    public static final BitSet FOLLOW_42 = new BitSet(new long[]{0x0100000000000000L});
+    public static final BitSet FOLLOW_43 = new BitSet(new long[]{0x0200000000000000L});
+    public static final BitSet FOLLOW_44 = new BitSet(new long[]{0x0400000000000000L});
+    public static final BitSet FOLLOW_45 = new BitSet(new long[]{0x0400000000000002L});
 
 }
\ No newline at end of file
diff --git a/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/Expression.ecore b/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/Expression.ecore
index d30dc719c..29229d2e9 100644
--- a/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/Expression.ecore
+++ b/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/Expression.ecore
@@ -5,7 +5,7 @@
   <eClassifiers xsi:type="ecore:EClass" name="Expression" eSuperTypes="#//SyntaxElement"/>
   <eClassifiers xsi:type="ecore:EClass" name="SyntaxElement"/>
   <eClassifiers xsi:type="ecore:EClass" name="LetExpression" eSuperTypes="#//Expression">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="identifier" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="identifier" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="varExpr" eType="#//Expression"
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="target" eType="#//Expression"
@@ -45,29 +45,29 @@
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Literal" eSuperTypes="#//Expression"/>
   <eClassifiers xsi:type="ecore:EClass" name="BooleanLiteral" eSuperTypes="#//Literal">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="val" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="val" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="IntegerLiteral" eSuperTypes="#//Literal">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="val" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="val" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EInt"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="NullLiteral" eSuperTypes="#//Literal">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="val" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="val" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="RealLiteral" eSuperTypes="#//Literal">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="val" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="val" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="StringLiteral" eSuperTypes="#//Literal">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="val" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="val" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="GlobalVarExpression" eSuperTypes="#//Expression">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="FeatureCall" eSuperTypes="#//Expression">
     <eStructuralFeatures xsi:type="ecore:EReference" name="target" eType="#//Expression"
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="#//Identifier"
         containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ListLiteral" eSuperTypes="#//Expression">
     <eStructuralFeatures xsi:type="ecore:EReference" name="elements" upperBound="-1"
@@ -79,16 +79,16 @@
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="TypeSelectExpression" eSuperTypes="#//Expression #//FeatureCall"/>
   <eClassifiers xsi:type="ecore:EClass" name="CollectionExpression" eSuperTypes="#//Expression #//FeatureCall">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="var" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="var" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="exp" eType="#//Expression"
         containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Identifier" eSuperTypes="#//SyntaxElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cl" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cl" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="id1" eType="#//Identifier"
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" unique="false" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ChainExpression" eSuperTypes="#//Expression">
     <eStructuralFeatures xsi:type="ecore:EReference" name="first" eType="#//Expression"
@@ -99,7 +99,7 @@
   <eClassifiers xsi:type="ecore:EClass" name="BooleanOperation" eSuperTypes="#//Expression">
     <eStructuralFeatures xsi:type="ecore:EReference" name="left" eType="#//Expression"
         containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="operator" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="operator" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="right" eType="#//Expression"
         containment="true"/>
   </eClassifiers>
diff --git a/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/Expression.genmodel b/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/Expression.genmodel
index b71626052..6713a3139 100644
--- a/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/Expression.genmodel
+++ b/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/Expression.genmodel
@@ -5,7 +5,8 @@
     modelPluginID="com.avaloq.tools.ddk.xtext.expression" forceOverwrite="true" modelName="Expression"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     complianceLevel="6.0" copyrightFields="false" editPluginID="com.avaloq.tools.ddk.xtext.expression.edit"
-    editorPluginID="com.avaloq.tools.ddk.xtext.expression.editor" runtimeVersion="2.12">
+    editorPluginID="com.avaloq.tools.ddk.xtext.expression.editor" runtimeVersion="2.12"
+    usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <genPackages prefix="Expression" basePackage="com.avaloq.tools.ddk.xtext.expression"
       disposableProviderFactory="true" ecorePackage="Expression.ecore#/">
     <genClasses ecoreClass="Expression.ecore#//Expression"/>
diff --git a/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/ExpressionStandaloneSetupGenerated.java b/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/ExpressionStandaloneSetupGenerated.java
index a9e01fa21..9ee8cf2ed 100644
--- a/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/ExpressionStandaloneSetupGenerated.java
+++ b/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/ExpressionStandaloneSetupGenerated.java
@@ -4,8 +4,8 @@
 package com.avaloq.tools.ddk.xtext.expression;
 
 import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.xtext.ISetup;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.xtext.ISetup;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
diff --git a/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/expression/impl/ExpressionPackageImpl.java b/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/expression/impl/ExpressionPackageImpl.java
index be2d6004d..daee149be 100644
--- a/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/expression/impl/ExpressionPackageImpl.java
+++ b/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/expression/impl/ExpressionPackageImpl.java
@@ -32,6 +32,7 @@
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EcorePackage;
 
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 
@@ -252,6 +253,9 @@ public static ExpressionPackage init()
 
     isInited = true;
 
+    // Initialize simple dependencies
+    EcorePackage.eINSTANCE.eClass();
+
     // Create package meta-data objects
     theExpressionPackage.createPackageContents();
 
@@ -983,6 +987,9 @@ public void initializePackageContents()
     setNsPrefix(eNS_PREFIX);
     setNsURI(eNS_URI);
 
+    // Obtain other dependent packages
+    EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
+
     // Create type parameters
 
     // Set bounds for type parameters
@@ -1020,7 +1027,7 @@ public void initializePackageContents()
     initEClass(syntaxElementEClass, SyntaxElement.class, "SyntaxElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
     initEClass(letExpressionEClass, LetExpression.class, "LetExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getLetExpression_Identifier(), ecorePackage.getEString(), "identifier", null, 0, 1, LetExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getLetExpression_Identifier(), theEcorePackage.getEString(), "identifier", null, 0, 1, LetExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getLetExpression_VarExpr(), this.getExpression(), null, "varExpr", null, 0, 1, LetExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getLetExpression_Target(), this.getExpression(), null, "target", null, 0, 1, LetExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
@@ -1048,27 +1055,27 @@ public void initializePackageContents()
     initEClass(literalEClass, Literal.class, "Literal", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
     initEClass(booleanLiteralEClass, BooleanLiteral.class, "BooleanLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getBooleanLiteral_Val(), ecorePackage.getEString(), "val", null, 0, 1, BooleanLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getBooleanLiteral_Val(), theEcorePackage.getEString(), "val", null, 0, 1, BooleanLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(integerLiteralEClass, IntegerLiteral.class, "IntegerLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getIntegerLiteral_Val(), ecorePackage.getEInt(), "val", null, 0, 1, IntegerLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getIntegerLiteral_Val(), theEcorePackage.getEInt(), "val", null, 0, 1, IntegerLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(nullLiteralEClass, NullLiteral.class, "NullLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getNullLiteral_Val(), ecorePackage.getEString(), "val", null, 0, 1, NullLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNullLiteral_Val(), theEcorePackage.getEString(), "val", null, 0, 1, NullLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(realLiteralEClass, RealLiteral.class, "RealLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getRealLiteral_Val(), ecorePackage.getEString(), "val", null, 0, 1, RealLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getRealLiteral_Val(), theEcorePackage.getEString(), "val", null, 0, 1, RealLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(stringLiteralEClass, StringLiteral.class, "StringLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getStringLiteral_Val(), ecorePackage.getEString(), "val", null, 0, 1, StringLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getStringLiteral_Val(), theEcorePackage.getEString(), "val", null, 0, 1, StringLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(globalVarExpressionEClass, GlobalVarExpression.class, "GlobalVarExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getGlobalVarExpression_Name(), ecorePackage.getEString(), "name", null, 0, 1, GlobalVarExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getGlobalVarExpression_Name(), theEcorePackage.getEString(), "name", null, 0, 1, GlobalVarExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(featureCallEClass, FeatureCall.class, "FeatureCall", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEReference(getFeatureCall_Target(), this.getExpression(), null, "target", null, 0, 1, FeatureCall.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getFeatureCall_Type(), this.getIdentifier(), null, "type", null, 0, 1, FeatureCall.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getFeatureCall_Name(), ecorePackage.getEString(), "name", null, 0, 1, FeatureCall.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getFeatureCall_Name(), theEcorePackage.getEString(), "name", null, 0, 1, FeatureCall.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(listLiteralEClass, ListLiteral.class, "ListLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEReference(getListLiteral_Elements(), this.getExpression(), null, "elements", null, 0, -1, ListLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -1079,13 +1086,13 @@ public void initializePackageContents()
     initEClass(typeSelectExpressionEClass, TypeSelectExpression.class, "TypeSelectExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
     initEClass(collectionExpressionEClass, CollectionExpression.class, "CollectionExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getCollectionExpression_Var(), ecorePackage.getEString(), "var", null, 0, 1, CollectionExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getCollectionExpression_Var(), theEcorePackage.getEString(), "var", null, 0, 1, CollectionExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getCollectionExpression_Exp(), this.getExpression(), null, "exp", null, 0, 1, CollectionExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(identifierEClass, Identifier.class, "Identifier", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getIdentifier_Cl(), ecorePackage.getEString(), "cl", null, 0, 1, Identifier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getIdentifier_Cl(), theEcorePackage.getEString(), "cl", null, 0, 1, Identifier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getIdentifier_Id1(), this.getIdentifier(), null, "id1", null, 0, 1, Identifier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getIdentifier_Id(), ecorePackage.getEString(), "id", null, 0, -1, Identifier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getIdentifier_Id(), theEcorePackage.getEString(), "id", null, 0, -1, Identifier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(chainExpressionEClass, ChainExpression.class, "ChainExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEReference(getChainExpression_First(), this.getExpression(), null, "first", null, 0, 1, ChainExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -1093,7 +1100,7 @@ public void initializePackageContents()
 
     initEClass(booleanOperationEClass, BooleanOperation.class, "BooleanOperation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEReference(getBooleanOperation_Left(), this.getExpression(), null, "left", null, 0, 1, BooleanOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getBooleanOperation_Operator(), ecorePackage.getEString(), "operator", null, 0, 1, BooleanOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getBooleanOperation_Operator(), theEcorePackage.getEString(), "operator", null, 0, 1, BooleanOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getBooleanOperation_Right(), this.getExpression(), null, "right", null, 0, 1, BooleanOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     // Create resource
diff --git a/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g b/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g
index 1c11fa3e3..3b88fbc6b 100644
--- a/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g
+++ b/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g
@@ -146,7 +146,7 @@ ruleLetExpression returns [EObject current=null]
        			$current, 
        			"identifier",
         		lv_identifier_1_0, 
-        		"Identifier");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -168,7 +168,7 @@ ruleLetExpression returns [EObject current=null]
        			$current, 
        			"varExpr",
         		lv_varExpr_3_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -190,7 +190,7 @@ ruleLetExpression returns [EObject current=null]
        			$current, 
        			"target",
         		lv_target_5_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -233,7 +233,7 @@ ruleCastedExpression returns [EObject current=null]
        			$current, 
        			"type",
         		lv_type_1_0, 
-        		"Type");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Type");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -255,7 +255,7 @@ ruleCastedExpression returns [EObject current=null]
        			$current, 
        			"target",
         		lv_target_3_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -313,7 +313,7 @@ ruleChainExpression returns [EObject current=null]
        			$current, 
        			"next",
         		lv_next_3_0, 
-        		"ChainedExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.ChainedExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -421,7 +421,7 @@ ruleIfExpressionTri returns [EObject current=null]
        			$current, 
        			"thenPart",
         		lv_thenPart_3_0, 
-        		"ChainedExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.ChainedExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -443,7 +443,7 @@ ruleIfExpressionTri returns [EObject current=null]
        			$current, 
        			"elsePart",
         		lv_elsePart_5_0, 
-        		"ChainedExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.ChainedExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -486,7 +486,7 @@ ruleIfExpressionKw returns [EObject current=null]
        			$current, 
        			"condition",
         		lv_condition_1_0, 
-        		"ChainedExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.ChainedExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -508,7 +508,7 @@ ruleIfExpressionKw returns [EObject current=null]
        			$current, 
        			"thenPart",
         		lv_thenPart_3_0, 
-        		"ChainedExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.ChainedExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -531,7 +531,7 @@ ruleIfExpressionKw returns [EObject current=null]
        			$current, 
        			"elsePart",
         		lv_elsePart_5_0, 
-        		"ChainedExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.ChainedExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -578,7 +578,7 @@ ruleSwitchExpression returns [EObject current=null]
        			$current, 
        			"switchExpr",
         		lv_switchExpr_2_0, 
-        		"OrExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.OrExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -604,7 +604,7 @@ ruleSwitchExpression returns [EObject current=null]
        			$current, 
        			"case",
         		lv_case_5_0, 
-        		"Case");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Case");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -630,7 +630,7 @@ ruleSwitchExpression returns [EObject current=null]
        			$current, 
        			"defaultExpr",
         		lv_defaultExpr_8_0, 
-        		"OrExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.OrExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -677,7 +677,7 @@ ruleCase returns [EObject current=null]
        			$current, 
        			"condition",
         		lv_condition_1_0, 
-        		"OrExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.OrExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -699,7 +699,7 @@ ruleCase returns [EObject current=null]
        			$current, 
        			"thenPar",
         		lv_thenPar_3_0, 
-        		"OrExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.OrExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -768,7 +768,7 @@ ruleOrExpression returns [EObject current=null]
        			$current, 
        			"right",
         		lv_right_3_0, 
-        		"AndExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.AndExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -837,7 +837,7 @@ ruleAndExpression returns [EObject current=null]
        			$current, 
        			"right",
         		lv_right_3_0, 
-        		"ImpliesExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.ImpliesExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -906,7 +906,7 @@ ruleImpliesExpression returns [EObject current=null]
        			$current, 
        			"right",
         		lv_right_3_0, 
-        		"RelationalExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.RelationalExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1038,7 +1038,7 @@ ruleRelationalExpression returns [EObject current=null]
        			$current, 
        			"right",
         		lv_right_3_0, 
-        		"AdditiveExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.AdditiveExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1122,7 +1122,7 @@ ruleAdditiveExpression returns [EObject current=null]
        			$current, 
        			"params",
         		lv_params_3_0, 
-        		"MultiplicativeExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.MultiplicativeExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1206,7 +1206,7 @@ ruleMultiplicativeExpression returns [EObject current=null]
        			$current, 
        			"params",
         		lv_params_3_0, 
-        		"UnaryOrInfixExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.UnaryOrInfixExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1315,7 +1315,7 @@ ruleUnaryExpression returns [EObject current=null]
        			$current, 
        			"params",
         		lv_params_1_0, 
-        		"InfixExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.InfixExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1373,7 +1373,7 @@ ruleInfixExpression returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_3_0, 
-        		"Identifier");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1395,7 +1395,7 @@ ruleInfixExpression returns [EObject current=null]
        			$current, 
        			"params",
         		lv_params_5_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1417,7 +1417,7 @@ ruleInfixExpression returns [EObject current=null]
        			$current, 
        			"params",
         		lv_params_7_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1450,7 +1450,7 @@ ruleInfixExpression returns [EObject current=null]
        			$current, 
        			"type",
         		lv_type_11_0, 
-        		"Type");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Type");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1498,7 +1498,7 @@ ruleInfixExpression returns [EObject current=null]
        			$current, 
        			"type",
         		lv_type_16_0, 
-        		"Type");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Type");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1637,7 +1637,7 @@ ruleInfixExpression returns [EObject current=null]
        			$current, 
        			"var",
         		lv_var_22_0, 
-        		"Identifier");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1659,7 +1659,7 @@ ruleInfixExpression returns [EObject current=null]
        			$current, 
        			"exp",
         		lv_exp_24_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1904,7 +1904,7 @@ ruleIntegerLiteral returns [EObject current=null]
        			$current, 
        			"val",
         		lv_val_0_0, 
-        		"INT");
+        		"org.eclipse.xtext.common.Terminals.INT");
 	    }
 
 )
@@ -1979,7 +1979,7 @@ ruleRealLiteral returns [EObject current=null]
        			$current, 
        			"val",
         		lv_val_0_0, 
-        		"REAL");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.REAL");
 	    }
 
 )
@@ -2018,7 +2018,7 @@ ruleStringLiteral returns [EObject current=null]
        			$current, 
        			"val",
         		lv_val_0_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -2098,7 +2098,7 @@ ruleGlobalVarExpression returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"Identifier");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2147,7 +2147,7 @@ ruleFeatureCall returns [EObject current=null]
        			$current, 
        			"type",
         		lv_type_1_0, 
-        		"Type");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Type");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2206,7 +2206,7 @@ ruleOperationCall returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_0_0, 
-        		"Identifier");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2228,7 +2228,7 @@ ruleOperationCall returns [EObject current=null]
        			$current, 
        			"params",
         		lv_params_2_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2250,7 +2250,7 @@ ruleOperationCall returns [EObject current=null]
        			$current, 
        			"params",
         		lv_params_4_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2303,7 +2303,7 @@ ruleListLiteral returns [EObject current=null]
        			$current, 
        			"elements",
         		lv_elements_2_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2325,7 +2325,7 @@ ruleListLiteral returns [EObject current=null]
        			$current, 
        			"elements",
         		lv_elements_4_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2372,7 +2372,7 @@ ruleConstructorCallExpression returns [EObject current=null]
        			$current, 
        			"type",
         		lv_type_1_0, 
-        		"SimpleType");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.SimpleType");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2430,7 +2430,7 @@ ruleTypeSelectExpression returns [EObject current=null]
        			$current, 
        			"type",
         		lv_type_2_0, 
-        		"Type");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Type");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2579,7 +2579,7 @@ ruleCollectionExpression returns [EObject current=null]
        			$current, 
        			"var",
         		lv_var_2_0, 
-        		"Identifier");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2601,7 +2601,7 @@ ruleCollectionExpression returns [EObject current=null]
        			$current, 
        			"exp",
         		lv_exp_4_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2730,7 +2730,7 @@ ruleCollectionType returns [EObject current=null]
        			$current, 
        			"id1",
         		lv_id1_2_0, 
-        		"SimpleType");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.SimpleType");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2773,7 +2773,7 @@ ruleSimpleType returns [EObject current=null]
        			$current, 
        			"id",
         		lv_id_0_0, 
-        		"Identifier");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2795,7 +2795,7 @@ ruleSimpleType returns [EObject current=null]
        			$current, 
        			"id",
         		lv_id_2_0, 
-        		"Identifier");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
 	        afterParserOrEnumRuleCall();
 	    }
 
diff --git a/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpressionLexer.java b/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpressionLexer.java
index 9048188fa..ebc212718 100644
--- a/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpressionLexer.java
+++ b/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpressionLexer.java
@@ -85,15 +85,15 @@ public InternalExpressionLexer(CharStream input, RecognizerSharedState state) {
         super(input,state);
 
     }
-    public String getGrammarFileName() { return "../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g"; }
+    public String getGrammarFileName() { return "InternalExpression.g"; }
 
     // $ANTLR start "T__12"
     public final void mT__12() throws RecognitionException {
         try {
             int _type = T__12;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:11:7: ( 'let' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:11:9: 'let'
+            // InternalExpression.g:11:7: ( 'let' )
+            // InternalExpression.g:11:9: 'let'
             {
             match("let"); 
 
@@ -113,8 +113,8 @@ public final void mT__13() throws RecognitionException {
         try {
             int _type = T__13;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:12:7: ( '=' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:12:9: '='
+            // InternalExpression.g:12:7: ( '=' )
+            // InternalExpression.g:12:9: '='
             {
             match('='); 
 
@@ -133,8 +133,8 @@ public final void mT__14() throws RecognitionException {
         try {
             int _type = T__14;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:13:7: ( ':' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:13:9: ':'
+            // InternalExpression.g:13:7: ( ':' )
+            // InternalExpression.g:13:9: ':'
             {
             match(':'); 
 
@@ -153,8 +153,8 @@ public final void mT__15() throws RecognitionException {
         try {
             int _type = T__15;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:14:7: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:14:9: '('
+            // InternalExpression.g:14:7: ( '(' )
+            // InternalExpression.g:14:9: '('
             {
             match('('); 
 
@@ -173,8 +173,8 @@ public final void mT__16() throws RecognitionException {
         try {
             int _type = T__16;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:15:7: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:15:9: ')'
+            // InternalExpression.g:15:7: ( ')' )
+            // InternalExpression.g:15:9: ')'
             {
             match(')'); 
 
@@ -193,8 +193,8 @@ public final void mT__17() throws RecognitionException {
         try {
             int _type = T__17;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:16:7: ( '->' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:16:9: '->'
+            // InternalExpression.g:16:7: ( '->' )
+            // InternalExpression.g:16:9: '->'
             {
             match("->"); 
 
@@ -214,8 +214,8 @@ public final void mT__18() throws RecognitionException {
         try {
             int _type = T__18;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:17:7: ( '?' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:17:9: '?'
+            // InternalExpression.g:17:7: ( '?' )
+            // InternalExpression.g:17:9: '?'
             {
             match('?'); 
 
@@ -234,8 +234,8 @@ public final void mT__19() throws RecognitionException {
         try {
             int _type = T__19;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:18:7: ( 'if' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:18:9: 'if'
+            // InternalExpression.g:18:7: ( 'if' )
+            // InternalExpression.g:18:9: 'if'
             {
             match("if"); 
 
@@ -255,8 +255,8 @@ public final void mT__20() throws RecognitionException {
         try {
             int _type = T__20;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:19:7: ( 'then' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:19:9: 'then'
+            // InternalExpression.g:19:7: ( 'then' )
+            // InternalExpression.g:19:9: 'then'
             {
             match("then"); 
 
@@ -276,8 +276,8 @@ public final void mT__21() throws RecognitionException {
         try {
             int _type = T__21;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:20:7: ( 'else' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:20:9: 'else'
+            // InternalExpression.g:20:7: ( 'else' )
+            // InternalExpression.g:20:9: 'else'
             {
             match("else"); 
 
@@ -297,8 +297,8 @@ public final void mT__22() throws RecognitionException {
         try {
             int _type = T__22;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:21:7: ( 'switch' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:21:9: 'switch'
+            // InternalExpression.g:21:7: ( 'switch' )
+            // InternalExpression.g:21:9: 'switch'
             {
             match("switch"); 
 
@@ -318,8 +318,8 @@ public final void mT__23() throws RecognitionException {
         try {
             int _type = T__23;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:22:7: ( '{' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:22:9: '{'
+            // InternalExpression.g:22:7: ( '{' )
+            // InternalExpression.g:22:9: '{'
             {
             match('{'); 
 
@@ -338,8 +338,8 @@ public final void mT__24() throws RecognitionException {
         try {
             int _type = T__24;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:23:7: ( 'default' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:23:9: 'default'
+            // InternalExpression.g:23:7: ( 'default' )
+            // InternalExpression.g:23:9: 'default'
             {
             match("default"); 
 
@@ -359,8 +359,8 @@ public final void mT__25() throws RecognitionException {
         try {
             int _type = T__25;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:24:7: ( '}' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:24:9: '}'
+            // InternalExpression.g:24:7: ( '}' )
+            // InternalExpression.g:24:9: '}'
             {
             match('}'); 
 
@@ -379,8 +379,8 @@ public final void mT__26() throws RecognitionException {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:25:7: ( 'case' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:25:9: 'case'
+            // InternalExpression.g:25:7: ( 'case' )
+            // InternalExpression.g:25:9: 'case'
             {
             match("case"); 
 
@@ -400,8 +400,8 @@ public final void mT__27() throws RecognitionException {
         try {
             int _type = T__27;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:26:7: ( '||' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:26:9: '||'
+            // InternalExpression.g:26:7: ( '||' )
+            // InternalExpression.g:26:9: '||'
             {
             match("||"); 
 
@@ -421,8 +421,8 @@ public final void mT__28() throws RecognitionException {
         try {
             int _type = T__28;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:27:7: ( '&&' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:27:9: '&&'
+            // InternalExpression.g:27:7: ( '&&' )
+            // InternalExpression.g:27:9: '&&'
             {
             match("&&"); 
 
@@ -442,8 +442,8 @@ public final void mT__29() throws RecognitionException {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:28:7: ( 'implies' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:28:9: 'implies'
+            // InternalExpression.g:28:7: ( 'implies' )
+            // InternalExpression.g:28:9: 'implies'
             {
             match("implies"); 
 
@@ -463,8 +463,8 @@ public final void mT__30() throws RecognitionException {
         try {
             int _type = T__30;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:29:7: ( '==' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:29:9: '=='
+            // InternalExpression.g:29:7: ( '==' )
+            // InternalExpression.g:29:9: '=='
             {
             match("=="); 
 
@@ -484,8 +484,8 @@ public final void mT__31() throws RecognitionException {
         try {
             int _type = T__31;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:30:7: ( '!=' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:30:9: '!='
+            // InternalExpression.g:30:7: ( '!=' )
+            // InternalExpression.g:30:9: '!='
             {
             match("!="); 
 
@@ -505,8 +505,8 @@ public final void mT__32() throws RecognitionException {
         try {
             int _type = T__32;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:31:7: ( '>=' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:31:9: '>='
+            // InternalExpression.g:31:7: ( '>=' )
+            // InternalExpression.g:31:9: '>='
             {
             match(">="); 
 
@@ -526,8 +526,8 @@ public final void mT__33() throws RecognitionException {
         try {
             int _type = T__33;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:32:7: ( '<=' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:32:9: '<='
+            // InternalExpression.g:32:7: ( '<=' )
+            // InternalExpression.g:32:9: '<='
             {
             match("<="); 
 
@@ -547,8 +547,8 @@ public final void mT__34() throws RecognitionException {
         try {
             int _type = T__34;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:33:7: ( '>' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:33:9: '>'
+            // InternalExpression.g:33:7: ( '>' )
+            // InternalExpression.g:33:9: '>'
             {
             match('>'); 
 
@@ -567,8 +567,8 @@ public final void mT__35() throws RecognitionException {
         try {
             int _type = T__35;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:34:7: ( '<' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:34:9: '<'
+            // InternalExpression.g:34:7: ( '<' )
+            // InternalExpression.g:34:9: '<'
             {
             match('<'); 
 
@@ -587,8 +587,8 @@ public final void mT__36() throws RecognitionException {
         try {
             int _type = T__36;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:35:7: ( '+' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:35:9: '+'
+            // InternalExpression.g:35:7: ( '+' )
+            // InternalExpression.g:35:9: '+'
             {
             match('+'); 
 
@@ -607,8 +607,8 @@ public final void mT__37() throws RecognitionException {
         try {
             int _type = T__37;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:36:7: ( '-' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:36:9: '-'
+            // InternalExpression.g:36:7: ( '-' )
+            // InternalExpression.g:36:9: '-'
             {
             match('-'); 
 
@@ -627,8 +627,8 @@ public final void mT__38() throws RecognitionException {
         try {
             int _type = T__38;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:37:7: ( '*' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:37:9: '*'
+            // InternalExpression.g:37:7: ( '*' )
+            // InternalExpression.g:37:9: '*'
             {
             match('*'); 
 
@@ -647,8 +647,8 @@ public final void mT__39() throws RecognitionException {
         try {
             int _type = T__39;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:38:7: ( '/' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:38:9: '/'
+            // InternalExpression.g:38:7: ( '/' )
+            // InternalExpression.g:38:9: '/'
             {
             match('/'); 
 
@@ -667,8 +667,8 @@ public final void mT__40() throws RecognitionException {
         try {
             int _type = T__40;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:39:7: ( '!' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:39:9: '!'
+            // InternalExpression.g:39:7: ( '!' )
+            // InternalExpression.g:39:9: '!'
             {
             match('!'); 
 
@@ -687,8 +687,8 @@ public final void mT__41() throws RecognitionException {
         try {
             int _type = T__41;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:40:7: ( '.' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:40:9: '.'
+            // InternalExpression.g:40:7: ( '.' )
+            // InternalExpression.g:40:9: '.'
             {
             match('.'); 
 
@@ -707,8 +707,8 @@ public final void mT__42() throws RecognitionException {
         try {
             int _type = T__42;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:41:7: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:41:9: ','
+            // InternalExpression.g:41:7: ( ',' )
+            // InternalExpression.g:41:9: ','
             {
             match(','); 
 
@@ -727,8 +727,8 @@ public final void mT__43() throws RecognitionException {
         try {
             int _type = T__43;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:42:7: ( 'typeSelect' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:42:9: 'typeSelect'
+            // InternalExpression.g:42:7: ( 'typeSelect' )
+            // InternalExpression.g:42:9: 'typeSelect'
             {
             match("typeSelect"); 
 
@@ -748,8 +748,8 @@ public final void mT__44() throws RecognitionException {
         try {
             int _type = T__44;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:43:7: ( 'collect' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:43:9: 'collect'
+            // InternalExpression.g:43:7: ( 'collect' )
+            // InternalExpression.g:43:9: 'collect'
             {
             match("collect"); 
 
@@ -769,8 +769,8 @@ public final void mT__45() throws RecognitionException {
         try {
             int _type = T__45;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:44:7: ( 'select' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:44:9: 'select'
+            // InternalExpression.g:44:7: ( 'select' )
+            // InternalExpression.g:44:9: 'select'
             {
             match("select"); 
 
@@ -790,8 +790,8 @@ public final void mT__46() throws RecognitionException {
         try {
             int _type = T__46;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:45:7: ( 'selectFirst' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:45:9: 'selectFirst'
+            // InternalExpression.g:45:7: ( 'selectFirst' )
+            // InternalExpression.g:45:9: 'selectFirst'
             {
             match("selectFirst"); 
 
@@ -811,8 +811,8 @@ public final void mT__47() throws RecognitionException {
         try {
             int _type = T__47;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:46:7: ( 'reject' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:46:9: 'reject'
+            // InternalExpression.g:46:7: ( 'reject' )
+            // InternalExpression.g:46:9: 'reject'
             {
             match("reject"); 
 
@@ -832,8 +832,8 @@ public final void mT__48() throws RecognitionException {
         try {
             int _type = T__48;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:47:7: ( 'exists' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:47:9: 'exists'
+            // InternalExpression.g:47:7: ( 'exists' )
+            // InternalExpression.g:47:9: 'exists'
             {
             match("exists"); 
 
@@ -853,8 +853,8 @@ public final void mT__49() throws RecognitionException {
         try {
             int _type = T__49;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:48:7: ( 'notExists' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:48:9: 'notExists'
+            // InternalExpression.g:48:7: ( 'notExists' )
+            // InternalExpression.g:48:9: 'notExists'
             {
             match("notExists"); 
 
@@ -874,8 +874,8 @@ public final void mT__50() throws RecognitionException {
         try {
             int _type = T__50;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:49:7: ( 'sortBy' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:49:9: 'sortBy'
+            // InternalExpression.g:49:7: ( 'sortBy' )
+            // InternalExpression.g:49:9: 'sortBy'
             {
             match("sortBy"); 
 
@@ -895,8 +895,8 @@ public final void mT__51() throws RecognitionException {
         try {
             int _type = T__51;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:50:7: ( 'forAll' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:50:9: 'forAll'
+            // InternalExpression.g:50:7: ( 'forAll' )
+            // InternalExpression.g:50:9: 'forAll'
             {
             match("forAll"); 
 
@@ -916,8 +916,8 @@ public final void mT__52() throws RecognitionException {
         try {
             int _type = T__52;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:51:7: ( '|' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:51:9: '|'
+            // InternalExpression.g:51:7: ( '|' )
+            // InternalExpression.g:51:9: '|'
             {
             match('|'); 
 
@@ -936,8 +936,8 @@ public final void mT__53() throws RecognitionException {
         try {
             int _type = T__53;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:52:7: ( 'true' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:52:9: 'true'
+            // InternalExpression.g:52:7: ( 'true' )
+            // InternalExpression.g:52:9: 'true'
             {
             match("true"); 
 
@@ -957,8 +957,8 @@ public final void mT__54() throws RecognitionException {
         try {
             int _type = T__54;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:53:7: ( 'false' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:53:9: 'false'
+            // InternalExpression.g:53:7: ( 'false' )
+            // InternalExpression.g:53:9: 'false'
             {
             match("false"); 
 
@@ -978,8 +978,8 @@ public final void mT__55() throws RecognitionException {
         try {
             int _type = T__55;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:54:7: ( 'null' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:54:9: 'null'
+            // InternalExpression.g:54:7: ( 'null' )
+            // InternalExpression.g:54:9: 'null'
             {
             match("null"); 
 
@@ -999,8 +999,8 @@ public final void mT__56() throws RecognitionException {
         try {
             int _type = T__56;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:55:7: ( 'GLOBALVAR' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:55:9: 'GLOBALVAR'
+            // InternalExpression.g:55:7: ( 'GLOBALVAR' )
+            // InternalExpression.g:55:9: 'GLOBALVAR'
             {
             match("GLOBALVAR"); 
 
@@ -1020,8 +1020,8 @@ public final void mT__57() throws RecognitionException {
         try {
             int _type = T__57;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:56:7: ( 'new' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:56:9: 'new'
+            // InternalExpression.g:56:7: ( 'new' )
+            // InternalExpression.g:56:9: 'new'
             {
             match("new"); 
 
@@ -1041,8 +1041,8 @@ public final void mT__58() throws RecognitionException {
         try {
             int _type = T__58;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:57:7: ( 'Collection' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:57:9: 'Collection'
+            // InternalExpression.g:57:7: ( 'Collection' )
+            // InternalExpression.g:57:9: 'Collection'
             {
             match("Collection"); 
 
@@ -1062,8 +1062,8 @@ public final void mT__59() throws RecognitionException {
         try {
             int _type = T__59;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:58:7: ( 'List' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:58:9: 'List'
+            // InternalExpression.g:58:7: ( 'List' )
+            // InternalExpression.g:58:9: 'List'
             {
             match("List"); 
 
@@ -1083,8 +1083,8 @@ public final void mT__60() throws RecognitionException {
         try {
             int _type = T__60;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:59:7: ( 'Set' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:59:9: 'Set'
+            // InternalExpression.g:59:7: ( 'Set' )
+            // InternalExpression.g:59:9: 'Set'
             {
             match("Set"); 
 
@@ -1104,8 +1104,8 @@ public final void mT__61() throws RecognitionException {
         try {
             int _type = T__61;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:60:7: ( '[' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:60:9: '['
+            // InternalExpression.g:60:7: ( '[' )
+            // InternalExpression.g:60:9: '['
             {
             match('['); 
 
@@ -1124,8 +1124,8 @@ public final void mT__62() throws RecognitionException {
         try {
             int _type = T__62;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:61:7: ( ']' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:61:9: ']'
+            // InternalExpression.g:61:7: ( ']' )
+            // InternalExpression.g:61:9: ']'
             {
             match(']'); 
 
@@ -1144,8 +1144,8 @@ public final void mT__63() throws RecognitionException {
         try {
             int _type = T__63;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:62:7: ( '::' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:62:9: '::'
+            // InternalExpression.g:62:7: ( '::' )
+            // InternalExpression.g:62:9: '::'
             {
             match("::"); 
 
@@ -1165,10 +1165,10 @@ public final void mRULE_REAL() throws RecognitionException {
         try {
             int _type = RULE_REAL;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2838:11: ( ( '0' .. '9' )* '.' ( '0' .. '9' )* )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2838:13: ( '0' .. '9' )* '.' ( '0' .. '9' )*
+            // InternalExpression.g:2838:11: ( ( '0' .. '9' )* '.' ( '0' .. '9' )* )
+            // InternalExpression.g:2838:13: ( '0' .. '9' )* '.' ( '0' .. '9' )*
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2838:13: ( '0' .. '9' )*
+            // InternalExpression.g:2838:13: ( '0' .. '9' )*
             loop1:
             do {
                 int alt1=2;
@@ -1181,7 +1181,7 @@ public final void mRULE_REAL() throws RecognitionException {
 
                 switch (alt1) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2838:14: '0' .. '9'
+            	    // InternalExpression.g:2838:14: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -1194,7 +1194,7 @@ public final void mRULE_REAL() throws RecognitionException {
             } while (true);
 
             match('.'); 
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2838:29: ( '0' .. '9' )*
+            // InternalExpression.g:2838:29: ( '0' .. '9' )*
             loop2:
             do {
                 int alt2=2;
@@ -1207,7 +1207,7 @@ public final void mRULE_REAL() throws RecognitionException {
 
                 switch (alt2) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2838:30: '0' .. '9'
+            	    // InternalExpression.g:2838:30: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -1235,10 +1235,10 @@ public final void mRULE_ID() throws RecognitionException {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2840:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2840:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalExpression.g:2840:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+            // InternalExpression.g:2840:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2840:11: ( '^' )?
+            // InternalExpression.g:2840:11: ( '^' )?
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -1247,7 +1247,7 @@ public final void mRULE_ID() throws RecognitionException {
             }
             switch (alt3) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2840:11: '^'
+                    // InternalExpression.g:2840:11: '^'
                     {
                     match('^'); 
 
@@ -1265,7 +1265,7 @@ public final void mRULE_ID() throws RecognitionException {
                 recover(mse);
                 throw mse;}
 
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2840:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalExpression.g:2840:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             loop4:
             do {
                 int alt4=2;
@@ -1278,7 +1278,7 @@ public final void mRULE_ID() throws RecognitionException {
 
                 switch (alt4) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:
+            	    // InternalExpression.g:
             	    {
             	    if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
             	        input.consume();
@@ -1314,10 +1314,10 @@ public final void mRULE_INT() throws RecognitionException {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2842:10: ( ( '0' .. '9' )+ )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2842:12: ( '0' .. '9' )+
+            // InternalExpression.g:2842:10: ( ( '0' .. '9' )+ )
+            // InternalExpression.g:2842:12: ( '0' .. '9' )+
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2842:12: ( '0' .. '9' )+
+            // InternalExpression.g:2842:12: ( '0' .. '9' )+
             int cnt5=0;
             loop5:
             do {
@@ -1331,7 +1331,7 @@ public final void mRULE_INT() throws RecognitionException {
 
                 switch (alt5) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2842:13: '0' .. '9'
+            	    // InternalExpression.g:2842:13: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -1363,10 +1363,10 @@ public final void mRULE_STRING() throws RecognitionException {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2844:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2844:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalExpression.g:2844:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+            // InternalExpression.g:2844:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2844:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalExpression.g:2844:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             int alt8=2;
             int LA8_0 = input.LA(1);
 
@@ -1384,10 +1384,10 @@ else if ( (LA8_0=='\'') ) {
             }
             switch (alt8) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2844:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+                    // InternalExpression.g:2844:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
                     {
                     match('\"'); 
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2844:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // InternalExpression.g:2844:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop6:
                     do {
                         int alt6=3;
@@ -1403,7 +1403,7 @@ else if ( ((LA6_0>='\u0000' && LA6_0<='!')||(LA6_0>='#' && LA6_0<='[')||(LA6_0>=
 
                         switch (alt6) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2844:21: '\\\\' .
+                    	    // InternalExpression.g:2844:21: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -1411,7 +1411,7 @@ else if ( ((LA6_0>='\u0000' && LA6_0<='!')||(LA6_0>='#' && LA6_0<='[')||(LA6_0>=
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2844:28: ~ ( ( '\\\\' | '\"' ) )
+                    	    // InternalExpression.g:2844:28: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -1436,10 +1436,10 @@ else if ( ((LA6_0>='\u0000' && LA6_0<='!')||(LA6_0>='#' && LA6_0<='[')||(LA6_0>=
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2844:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+                    // InternalExpression.g:2844:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
                     {
                     match('\''); 
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2844:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // InternalExpression.g:2844:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop7:
                     do {
                         int alt7=3;
@@ -1455,7 +1455,7 @@ else if ( ((LA7_0>='\u0000' && LA7_0<='&')||(LA7_0>='(' && LA7_0<='[')||(LA7_0>=
 
                         switch (alt7) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2844:54: '\\\\' .
+                    	    // InternalExpression.g:2844:54: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -1463,7 +1463,7 @@ else if ( ((LA7_0>='\u0000' && LA7_0<='&')||(LA7_0>='(' && LA7_0<='[')||(LA7_0>=
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2844:61: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // InternalExpression.g:2844:61: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -1506,12 +1506,12 @@ public final void mRULE_ML_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2846:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2846:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalExpression.g:2846:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalExpression.g:2846:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2846:24: ( options {greedy=false; } : . )*
+            // InternalExpression.g:2846:24: ( options {greedy=false; } : . )*
             loop9:
             do {
                 int alt9=2;
@@ -1536,7 +1536,7 @@ else if ( ((LA9_0>='\u0000' && LA9_0<=')')||(LA9_0>='+' && LA9_0<='\uFFFF')) ) {
 
                 switch (alt9) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2846:52: .
+            	    // InternalExpression.g:2846:52: .
             	    {
             	    matchAny(); 
 
@@ -1566,12 +1566,12 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2848:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2848:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalExpression.g:2848:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalExpression.g:2848:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2848:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // InternalExpression.g:2848:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop10:
             do {
                 int alt10=2;
@@ -1584,7 +1584,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
 
                 switch (alt10) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2848:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // InternalExpression.g:2848:24: ~ ( ( '\\n' | '\\r' ) )
             	    {
             	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
             	        input.consume();
@@ -1604,7 +1604,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
                 }
             } while (true);
 
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2848:40: ( ( '\\r' )? '\\n' )?
+            // InternalExpression.g:2848:40: ( ( '\\r' )? '\\n' )?
             int alt12=2;
             int LA12_0 = input.LA(1);
 
@@ -1613,9 +1613,9 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
             }
             switch (alt12) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2848:41: ( '\\r' )? '\\n'
+                    // InternalExpression.g:2848:41: ( '\\r' )? '\\n'
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2848:41: ( '\\r' )?
+                    // InternalExpression.g:2848:41: ( '\\r' )?
                     int alt11=2;
                     int LA11_0 = input.LA(1);
 
@@ -1624,7 +1624,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
                     }
                     switch (alt11) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2848:41: '\\r'
+                            // InternalExpression.g:2848:41: '\\r'
                             {
                             match('\r'); 
 
@@ -1656,10 +1656,10 @@ public final void mRULE_WS() throws RecognitionException {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2850:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2850:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalExpression.g:2850:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalExpression.g:2850:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2850:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalExpression.g:2850:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt13=0;
             loop13:
             do {
@@ -1673,7 +1673,7 @@ public final void mRULE_WS() throws RecognitionException {
 
                 switch (alt13) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:
+            	    // InternalExpression.g:
             	    {
             	    if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
             	        input.consume();
@@ -1713,8 +1713,8 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2852:16: ( . )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2852:18: .
+            // InternalExpression.g:2852:16: ( . )
+            // InternalExpression.g:2852:18: .
             {
             matchAny(); 
 
@@ -1729,425 +1729,425 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:8: ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | RULE_REAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        // InternalExpression.g:1:8: ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | RULE_REAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
         int alt14=60;
         alt14 = dfa14.predict(input);
         switch (alt14) {
             case 1 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:10: T__12
+                // InternalExpression.g:1:10: T__12
                 {
                 mT__12(); 
 
                 }
                 break;
             case 2 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:16: T__13
+                // InternalExpression.g:1:16: T__13
                 {
                 mT__13(); 
 
                 }
                 break;
             case 3 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:22: T__14
+                // InternalExpression.g:1:22: T__14
                 {
                 mT__14(); 
 
                 }
                 break;
             case 4 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:28: T__15
+                // InternalExpression.g:1:28: T__15
                 {
                 mT__15(); 
 
                 }
                 break;
             case 5 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:34: T__16
+                // InternalExpression.g:1:34: T__16
                 {
                 mT__16(); 
 
                 }
                 break;
             case 6 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:40: T__17
+                // InternalExpression.g:1:40: T__17
                 {
                 mT__17(); 
 
                 }
                 break;
             case 7 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:46: T__18
+                // InternalExpression.g:1:46: T__18
                 {
                 mT__18(); 
 
                 }
                 break;
             case 8 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:52: T__19
+                // InternalExpression.g:1:52: T__19
                 {
                 mT__19(); 
 
                 }
                 break;
             case 9 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:58: T__20
+                // InternalExpression.g:1:58: T__20
                 {
                 mT__20(); 
 
                 }
                 break;
             case 10 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:64: T__21
+                // InternalExpression.g:1:64: T__21
                 {
                 mT__21(); 
 
                 }
                 break;
             case 11 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:70: T__22
+                // InternalExpression.g:1:70: T__22
                 {
                 mT__22(); 
 
                 }
                 break;
             case 12 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:76: T__23
+                // InternalExpression.g:1:76: T__23
                 {
                 mT__23(); 
 
                 }
                 break;
             case 13 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:82: T__24
+                // InternalExpression.g:1:82: T__24
                 {
                 mT__24(); 
 
                 }
                 break;
             case 14 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:88: T__25
+                // InternalExpression.g:1:88: T__25
                 {
                 mT__25(); 
 
                 }
                 break;
             case 15 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:94: T__26
+                // InternalExpression.g:1:94: T__26
                 {
                 mT__26(); 
 
                 }
                 break;
             case 16 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:100: T__27
+                // InternalExpression.g:1:100: T__27
                 {
                 mT__27(); 
 
                 }
                 break;
             case 17 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:106: T__28
+                // InternalExpression.g:1:106: T__28
                 {
                 mT__28(); 
 
                 }
                 break;
             case 18 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:112: T__29
+                // InternalExpression.g:1:112: T__29
                 {
                 mT__29(); 
 
                 }
                 break;
             case 19 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:118: T__30
+                // InternalExpression.g:1:118: T__30
                 {
                 mT__30(); 
 
                 }
                 break;
             case 20 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:124: T__31
+                // InternalExpression.g:1:124: T__31
                 {
                 mT__31(); 
 
                 }
                 break;
             case 21 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:130: T__32
+                // InternalExpression.g:1:130: T__32
                 {
                 mT__32(); 
 
                 }
                 break;
             case 22 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:136: T__33
+                // InternalExpression.g:1:136: T__33
                 {
                 mT__33(); 
 
                 }
                 break;
             case 23 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:142: T__34
+                // InternalExpression.g:1:142: T__34
                 {
                 mT__34(); 
 
                 }
                 break;
             case 24 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:148: T__35
+                // InternalExpression.g:1:148: T__35
                 {
                 mT__35(); 
 
                 }
                 break;
             case 25 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:154: T__36
+                // InternalExpression.g:1:154: T__36
                 {
                 mT__36(); 
 
                 }
                 break;
             case 26 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:160: T__37
+                // InternalExpression.g:1:160: T__37
                 {
                 mT__37(); 
 
                 }
                 break;
             case 27 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:166: T__38
+                // InternalExpression.g:1:166: T__38
                 {
                 mT__38(); 
 
                 }
                 break;
             case 28 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:172: T__39
+                // InternalExpression.g:1:172: T__39
                 {
                 mT__39(); 
 
                 }
                 break;
             case 29 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:178: T__40
+                // InternalExpression.g:1:178: T__40
                 {
                 mT__40(); 
 
                 }
                 break;
             case 30 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:184: T__41
+                // InternalExpression.g:1:184: T__41
                 {
                 mT__41(); 
 
                 }
                 break;
             case 31 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:190: T__42
+                // InternalExpression.g:1:190: T__42
                 {
                 mT__42(); 
 
                 }
                 break;
             case 32 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:196: T__43
+                // InternalExpression.g:1:196: T__43
                 {
                 mT__43(); 
 
                 }
                 break;
             case 33 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:202: T__44
+                // InternalExpression.g:1:202: T__44
                 {
                 mT__44(); 
 
                 }
                 break;
             case 34 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:208: T__45
+                // InternalExpression.g:1:208: T__45
                 {
                 mT__45(); 
 
                 }
                 break;
             case 35 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:214: T__46
+                // InternalExpression.g:1:214: T__46
                 {
                 mT__46(); 
 
                 }
                 break;
             case 36 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:220: T__47
+                // InternalExpression.g:1:220: T__47
                 {
                 mT__47(); 
 
                 }
                 break;
             case 37 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:226: T__48
+                // InternalExpression.g:1:226: T__48
                 {
                 mT__48(); 
 
                 }
                 break;
             case 38 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:232: T__49
+                // InternalExpression.g:1:232: T__49
                 {
                 mT__49(); 
 
                 }
                 break;
             case 39 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:238: T__50
+                // InternalExpression.g:1:238: T__50
                 {
                 mT__50(); 
 
                 }
                 break;
             case 40 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:244: T__51
+                // InternalExpression.g:1:244: T__51
                 {
                 mT__51(); 
 
                 }
                 break;
             case 41 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:250: T__52
+                // InternalExpression.g:1:250: T__52
                 {
                 mT__52(); 
 
                 }
                 break;
             case 42 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:256: T__53
+                // InternalExpression.g:1:256: T__53
                 {
                 mT__53(); 
 
                 }
                 break;
             case 43 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:262: T__54
+                // InternalExpression.g:1:262: T__54
                 {
                 mT__54(); 
 
                 }
                 break;
             case 44 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:268: T__55
+                // InternalExpression.g:1:268: T__55
                 {
                 mT__55(); 
 
                 }
                 break;
             case 45 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:274: T__56
+                // InternalExpression.g:1:274: T__56
                 {
                 mT__56(); 
 
                 }
                 break;
             case 46 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:280: T__57
+                // InternalExpression.g:1:280: T__57
                 {
                 mT__57(); 
 
                 }
                 break;
             case 47 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:286: T__58
+                // InternalExpression.g:1:286: T__58
                 {
                 mT__58(); 
 
                 }
                 break;
             case 48 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:292: T__59
+                // InternalExpression.g:1:292: T__59
                 {
                 mT__59(); 
 
                 }
                 break;
             case 49 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:298: T__60
+                // InternalExpression.g:1:298: T__60
                 {
                 mT__60(); 
 
                 }
                 break;
             case 50 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:304: T__61
+                // InternalExpression.g:1:304: T__61
                 {
                 mT__61(); 
 
                 }
                 break;
             case 51 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:310: T__62
+                // InternalExpression.g:1:310: T__62
                 {
                 mT__62(); 
 
                 }
                 break;
             case 52 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:316: T__63
+                // InternalExpression.g:1:316: T__63
                 {
                 mT__63(); 
 
                 }
                 break;
             case 53 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:322: RULE_REAL
+                // InternalExpression.g:1:322: RULE_REAL
                 {
                 mRULE_REAL(); 
 
                 }
                 break;
             case 54 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:332: RULE_ID
+                // InternalExpression.g:1:332: RULE_ID
                 {
                 mRULE_ID(); 
 
                 }
                 break;
             case 55 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:340: RULE_INT
+                // InternalExpression.g:1:340: RULE_INT
                 {
                 mRULE_INT(); 
 
                 }
                 break;
             case 56 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:349: RULE_STRING
+                // InternalExpression.g:1:349: RULE_STRING
                 {
                 mRULE_STRING(); 
 
                 }
                 break;
             case 57 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:361: RULE_ML_COMMENT
+                // InternalExpression.g:1:361: RULE_ML_COMMENT
                 {
                 mRULE_ML_COMMENT(); 
 
                 }
                 break;
             case 58 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:377: RULE_SL_COMMENT
+                // InternalExpression.g:1:377: RULE_SL_COMMENT
                 {
                 mRULE_SL_COMMENT(); 
 
                 }
                 break;
             case 59 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:393: RULE_WS
+                // InternalExpression.g:1:393: RULE_WS
                 {
                 mRULE_WS(); 
 
                 }
                 break;
             case 60 :
-                // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1:401: RULE_ANY_OTHER
+                // InternalExpression.g:1:401: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -2161,75 +2161,19 @@ public void mTokens() throws RecognitionException {
 
     protected DFA14 dfa14 = new DFA14(this);
     static final String DFA14_eotS =
-        "\1\uffff\1\53\1\55\1\57\2\uffff\1\63\1\uffff\4\53\1\uffff\1\53"+
-        "\1\uffff\1\53\1\105\1\51\1\110\1\112\1\114\2\uffff\1\121\1\122\1"+
-        "\uffff\7\53\2\uffff\1\141\1\51\1\uffff\2\51\2\uffff\1\53\12\uffff"+
-        "\1\146\11\53\1\uffff\1\53\1\uffff\2\53\21\uffff\12\53\3\uffff\1"+
-        "\141\2\uffff\1\175\1\uffff\17\53\1\u008d\5\53\1\u0093\1\uffff\1"+
-        "\53\1\u0095\1\53\1\u0097\1\u0098\5\53\1\u009e\3\53\1\u00a2\1\uffff"+
-        "\4\53\1\u00a7\1\uffff\1\53\1\uffff\1\53\2\uffff\5\53\1\uffff\3\53"+
-        "\1\uffff\1\53\1\u00b3\2\53\1\uffff\2\53\1\u00b8\1\u00b9\1\u00bb"+
-        "\1\u00bc\2\53\1\u00bf\1\53\1\u00c1\1\uffff\2\53\1\u00c4\1\53\2\uffff"+
-        "\1\53\2\uffff\1\u00c7\1\u00c8\1\uffff\1\53\1\uffff\2\53\1\uffff"+
-        "\2\53\2\uffff\5\53\1\u00d3\1\u00d4\1\53\1\u00d6\1\53\2\uffff\1\u00d8"+
-        "\1\uffff\1\u00d9\2\uffff";
+        "\1\uffff\1\53\1\55\1\57\2\uffff\1\63\1\uffff\4\53\1\uffff\1\53\1\uffff\1\53\1\105\1\51\1\110\1\112\1\114\2\uffff\1\121\1\122\1\uffff\7\53\2\uffff\1\141\1\51\1\uffff\2\51\2\uffff\1\53\12\uffff\1\146\11\53\1\uffff\1\53\1\uffff\2\53\21\uffff\12\53\3\uffff\1\141\2\uffff\1\175\1\uffff\17\53\1\u008d\5\53\1\u0093\1\uffff\1\53\1\u0095\1\53\1\u0097\1\u0098\5\53\1\u009e\3\53\1\u00a2\1\uffff\4\53\1\u00a7\1\uffff\1\53\1\uffff\1\53\2\uffff\5\53\1\uffff\3\53\1\uffff\1\53\1\u00b3\2\53\1\uffff\2\53\1\u00b8\1\u00b9\1\u00bb\1\u00bc\2\53\1\u00bf\1\53\1\u00c1\1\uffff\2\53\1\u00c4\1\53\2\uffff\1\53\2\uffff\1\u00c7\1\u00c8\1\uffff\1\53\1\uffff\2\53\1\uffff\2\53\2\uffff\5\53\1\u00d3\1\u00d4\1\53\1\u00d6\1\53\2\uffff\1\u00d8\1\uffff\1\u00d9\2\uffff";
     static final String DFA14_eofS =
         "\u00da\uffff";
     static final String DFA14_minS =
-        "\1\0\1\145\1\75\1\72\2\uffff\1\76\1\uffff\1\146\1\150\1\154\1\145"+
-        "\1\uffff\1\145\1\uffff\1\141\1\174\1\46\3\75\2\uffff\1\52\1\60\1"+
-        "\uffff\2\145\1\141\1\114\1\157\1\151\1\145\2\uffff\1\56\1\101\1"+
-        "\uffff\2\0\2\uffff\1\164\12\uffff\1\60\1\160\1\145\1\160\1\165\1"+
-        "\163\2\151\1\154\1\162\1\uffff\1\146\1\uffff\1\163\1\154\21\uffff"+
-        "\1\152\1\164\1\154\1\167\1\162\1\154\1\117\1\154\1\163\1\164\3\uffff"+
-        "\1\56\2\uffff\1\60\1\uffff\1\154\1\156\3\145\1\163\1\164\1\145\1"+
-        "\164\1\141\1\145\1\154\1\145\1\105\1\154\1\60\1\101\1\163\1\102"+
-        "\1\154\1\164\1\60\1\uffff\1\151\1\60\1\123\2\60\1\164\2\143\1\102"+
-        "\1\165\1\60\1\145\1\143\1\170\1\60\1\uffff\1\154\1\145\1\101\1\145"+
-        "\1\60\1\uffff\1\145\1\uffff\1\145\2\uffff\1\163\1\150\1\164\1\171"+
-        "\1\154\1\uffff\1\143\1\164\1\151\1\uffff\1\154\1\60\1\114\1\143"+
-        "\1\uffff\1\163\1\154\4\60\2\164\1\60\1\163\1\60\1\uffff\1\126\1"+
-        "\164\1\60\1\145\2\uffff\1\151\2\uffff\2\60\1\uffff\1\164\1\uffff"+
-        "\1\101\1\151\1\uffff\1\143\1\162\2\uffff\1\163\1\122\1\157\1\164"+
-        "\1\163\2\60\1\156\1\60\1\164\2\uffff\1\60\1\uffff\1\60\2\uffff";
+        "\1\0\1\145\1\75\1\72\2\uffff\1\76\1\uffff\1\146\1\150\1\154\1\145\1\uffff\1\145\1\uffff\1\141\1\174\1\46\3\75\2\uffff\1\52\1\60\1\uffff\2\145\1\141\1\114\1\157\1\151\1\145\2\uffff\1\56\1\101\1\uffff\2\0\2\uffff\1\164\12\uffff\1\60\1\160\1\145\1\160\1\165\1\163\2\151\1\154\1\162\1\uffff\1\146\1\uffff\1\163\1\154\21\uffff\1\152\1\164\1\154\1\167\1\162\1\154\1\117\1\154\1\163\1\164\3\uffff\1\56\2\uffff\1\60\1\uffff\1\154\1\156\3\145\1\163\1\164\1\145\1\164\1\141\1\145\1\154\1\145\1\105\1\154\1\60\1\101\1\163\1\102\1\154\1\164\1\60\1\uffff\1\151\1\60\1\123\2\60\1\164\2\143\1\102\1\165\1\60\1\145\1\143\1\170\1\60\1\uffff\1\154\1\145\1\101\1\145\1\60\1\uffff\1\145\1\uffff\1\145\2\uffff\1\163\1\150\1\164\1\171\1\154\1\uffff\1\143\1\164\1\151\1\uffff\1\154\1\60\1\114\1\143\1\uffff\1\163\1\154\4\60\2\164\1\60\1\163\1\60\1\uffff\1\126\1\164\1\60\1\145\2\uffff\1\151\2\uffff\2\60\1\uffff\1\164\1\uffff\1\101\1\151\1\uffff\1\143\1\162\2\uffff\1\163\1\122\1\157\1\164\1\163\2\60\1\156\1\60\1\164\2\uffff\1\60\1\uffff\1\60\2\uffff";
     static final String DFA14_maxS =
-        "\1\uffff\1\145\1\75\1\72\2\uffff\1\76\1\uffff\1\155\1\171\1\170"+
-        "\1\167\1\uffff\1\145\1\uffff\1\157\1\174\1\46\3\75\2\uffff\1\57"+
-        "\1\71\1\uffff\1\145\1\165\1\157\1\114\1\157\1\151\1\145\2\uffff"+
-        "\1\71\1\172\1\uffff\2\uffff\2\uffff\1\164\12\uffff\1\172\1\160\1"+
-        "\145\1\160\1\165\1\163\2\151\1\154\1\162\1\uffff\1\146\1\uffff\1"+
-        "\163\1\154\21\uffff\1\152\1\164\1\154\1\167\1\162\1\154\1\117\1"+
-        "\154\1\163\1\164\3\uffff\1\71\2\uffff\1\172\1\uffff\1\154\1\156"+
-        "\3\145\1\163\1\164\1\145\1\164\1\141\1\145\1\154\1\145\1\105\1\154"+
-        "\1\172\1\101\1\163\1\102\1\154\1\164\1\172\1\uffff\1\151\1\172\1"+
-        "\123\2\172\1\164\2\143\1\102\1\165\1\172\1\145\1\143\1\170\1\172"+
-        "\1\uffff\1\154\1\145\1\101\1\145\1\172\1\uffff\1\145\1\uffff\1\145"+
-        "\2\uffff\1\163\1\150\1\164\1\171\1\154\1\uffff\1\143\1\164\1\151"+
-        "\1\uffff\1\154\1\172\1\114\1\143\1\uffff\1\163\1\154\4\172\2\164"+
-        "\1\172\1\163\1\172\1\uffff\1\126\1\164\1\172\1\145\2\uffff\1\151"+
-        "\2\uffff\2\172\1\uffff\1\164\1\uffff\1\101\1\151\1\uffff\1\143\1"+
-        "\162\2\uffff\1\163\1\122\1\157\1\164\1\163\2\172\1\156\1\172\1\164"+
-        "\2\uffff\1\172\1\uffff\1\172\2\uffff";
+        "\1\uffff\1\145\1\75\1\72\2\uffff\1\76\1\uffff\1\155\1\171\1\170\1\167\1\uffff\1\145\1\uffff\1\157\1\174\1\46\3\75\2\uffff\1\57\1\71\1\uffff\1\145\1\165\1\157\1\114\1\157\1\151\1\145\2\uffff\1\71\1\172\1\uffff\2\uffff\2\uffff\1\164\12\uffff\1\172\1\160\1\145\1\160\1\165\1\163\2\151\1\154\1\162\1\uffff\1\146\1\uffff\1\163\1\154\21\uffff\1\152\1\164\1\154\1\167\1\162\1\154\1\117\1\154\1\163\1\164\3\uffff\1\71\2\uffff\1\172\1\uffff\1\154\1\156\3\145\1\163\1\164\1\145\1\164\1\141\1\145\1\154\1\145\1\105\1\154\1\172\1\101\1\163\1\102\1\154\1\164\1\172\1\uffff\1\151\1\172\1\123\2\172\1\164\2\143\1\102\1\165\1\172\1\145\1\143\1\170\1\172\1\uffff\1\154\1\145\1\101\1\145\1\172\1\uffff\1\145\1\uffff\1\145\2\uffff\1\163\1\150\1\164\1\171\1\154\1\uffff\1\143\1\164\1\151\1\uffff\1\154\1\172\1\114\1\143\1\uffff\1\163\1\154\4\172\2\164\1\172\1\163\1\172\1\uffff\1\126\1\164\1\172\1\145\2\uffff\1\151\2\uffff\2\172\1\uffff\1\164\1\uffff\1\101\1\151\1\uffff\1\143\1\162\2\uffff\1\163\1\122\1\157\1\164\1\163\2\172\1\156\1\172\1\164\2\uffff\1\172\1\uffff\1\172\2\uffff";
     static final String DFA14_acceptS =
-        "\4\uffff\1\4\1\5\1\uffff\1\7\4\uffff\1\14\1\uffff\1\16\6\uffff"+
-        "\1\31\1\33\2\uffff\1\37\7\uffff\1\62\1\63\2\uffff\1\66\2\uffff\1"+
-        "\73\1\74\1\uffff\1\66\1\23\1\2\1\64\1\3\1\4\1\5\1\6\1\32\1\7\12"+
-        "\uffff\1\14\1\uffff\1\16\2\uffff\1\20\1\51\1\21\1\24\1\35\1\25\1"+
-        "\27\1\26\1\30\1\31\1\33\1\71\1\72\1\34\1\36\1\65\1\37\12\uffff\1"+
-        "\62\1\63\1\67\1\uffff\1\70\1\73\1\uffff\1\10\26\uffff\1\1\17\uffff"+
-        "\1\56\5\uffff\1\61\1\uffff\1\11\1\uffff\1\52\1\12\5\uffff\1\17\3"+
-        "\uffff\1\54\4\uffff\1\60\13\uffff\1\53\4\uffff\1\45\1\13\1\uffff"+
-        "\1\42\1\47\2\uffff\1\44\1\uffff\1\50\2\uffff\1\22\2\uffff\1\15\1"+
-        "\41\12\uffff\1\46\1\55\1\uffff\1\40\1\uffff\1\57\1\43";
+        "\4\uffff\1\4\1\5\1\uffff\1\7\4\uffff\1\14\1\uffff\1\16\6\uffff\1\31\1\33\2\uffff\1\37\7\uffff\1\62\1\63\2\uffff\1\66\2\uffff\1\73\1\74\1\uffff\1\66\1\23\1\2\1\64\1\3\1\4\1\5\1\6\1\32\1\7\12\uffff\1\14\1\uffff\1\16\2\uffff\1\20\1\51\1\21\1\24\1\35\1\25\1\27\1\26\1\30\1\31\1\33\1\71\1\72\1\34\1\36\1\65\1\37\12\uffff\1\62\1\63\1\67\1\uffff\1\70\1\73\1\uffff\1\10\26\uffff\1\1\17\uffff\1\56\5\uffff\1\61\1\uffff\1\11\1\uffff\1\52\1\12\5\uffff\1\17\3\uffff\1\54\4\uffff\1\60\13\uffff\1\53\4\uffff\1\45\1\13\1\uffff\1\42\1\47\2\uffff\1\44\1\uffff\1\50\2\uffff\1\22\2\uffff\1\15\1\41\12\uffff\1\46\1\55\1\uffff\1\40\1\uffff\1\57\1\43";
     static final String DFA14_specialS =
         "\1\1\45\uffff\1\0\1\2\u00b2\uffff}>";
     static final String[] DFA14_transitionS = {
-            "\11\51\2\50\2\51\1\50\22\51\1\50\1\22\1\46\3\51\1\21\1\47\1"+
-            "\4\1\5\1\26\1\25\1\31\1\6\1\30\1\27\12\43\1\3\1\51\1\24\1\2"+
-            "\1\23\1\7\1\51\2\45\1\36\3\45\1\35\4\45\1\37\6\45\1\40\7\45"+
-            "\1\41\1\51\1\42\1\44\1\45\1\51\2\45\1\17\1\15\1\12\1\34\2\45"+
-            "\1\10\2\45\1\1\1\45\1\33\3\45\1\32\1\13\1\11\6\45\1\14\1\20"+
-            "\1\16\uff82\51",
+            "\11\51\2\50\2\51\1\50\22\51\1\50\1\22\1\46\3\51\1\21\1\47\1\4\1\5\1\26\1\25\1\31\1\6\1\30\1\27\12\43\1\3\1\51\1\24\1\2\1\23\1\7\1\51\2\45\1\36\3\45\1\35\4\45\1\37\6\45\1\40\7\45\1\41\1\51\1\42\1\44\1\45\1\51\2\45\1\17\1\15\1\12\1\34\2\45\1\10\2\45\1\1\1\45\1\33\3\45\1\32\1\13\1\11\6\45\1\14\1\20\1\16\uff82\51",
             "\1\52",
             "\1\54",
             "\1\56",
@@ -2401,8 +2345,7 @@ public void mTokens() throws RecognitionException {
             "\1\u00b7",
             "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
             "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
-            "\12\53\7\uffff\5\53\1\u00ba\24\53\4\uffff\1\53\1\uffff\32"+
-            "\53",
+            "\12\53\7\uffff\5\53\1\u00ba\24\53\4\uffff\1\53\1\uffff\32\53",
             "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
             "\1\u00bd",
             "\1\u00be",
diff --git a/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpressionParser.java b/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpressionParser.java
index 2107e7756..53c4fc662 100644
--- a/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpressionParser.java
+++ b/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpressionParser.java
@@ -100,7 +100,7 @@ public InternalExpressionParser(TokenStream input, RecognizerSharedState state)
         
 
     public String[] getTokenNames() { return InternalExpressionParser.tokenNames; }
-    public String getGrammarFileName() { return "../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g"; }
+    public String getGrammarFileName() { return "InternalExpression.g"; }
 
 
 
@@ -125,7 +125,7 @@ protected ExpressionGrammarAccess getGrammarAccess() {
 
 
     // $ANTLR start "entryRuleExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:67:1: entryRuleExpression returns [EObject current=null] : iv_ruleExpression= ruleExpression EOF ;
+    // InternalExpression.g:67:1: entryRuleExpression returns [EObject current=null] : iv_ruleExpression= ruleExpression EOF ;
     public final EObject entryRuleExpression() throws RecognitionException {
         EObject current = null;
 
@@ -133,13 +133,13 @@ public final EObject entryRuleExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:68:2: (iv_ruleExpression= ruleExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:69:2: iv_ruleExpression= ruleExpression EOF
+            // InternalExpression.g:68:2: (iv_ruleExpression= ruleExpression EOF )
+            // InternalExpression.g:69:2: iv_ruleExpression= ruleExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_entryRuleExpression75);
+            pushFollow(FOLLOW_1);
             iv_ruleExpression=ruleExpression();
 
             state._fsp--;
@@ -147,7 +147,7 @@ public final EObject entryRuleExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleExpression85); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -165,7 +165,7 @@ public final EObject entryRuleExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:76:1: ruleExpression returns [EObject current=null] : (this_LetExpression_0= ruleLetExpression | ( ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression ) | this_ChainExpression_2= ruleChainExpression ) ;
+    // InternalExpression.g:76:1: ruleExpression returns [EObject current=null] : (this_LetExpression_0= ruleLetExpression | ( ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression ) | this_ChainExpression_2= ruleChainExpression ) ;
     public final EObject ruleExpression() throws RecognitionException {
         EObject current = null;
 
@@ -179,22 +179,22 @@ public final EObject ruleExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:79:28: ( (this_LetExpression_0= ruleLetExpression | ( ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression ) | this_ChainExpression_2= ruleChainExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:80:1: (this_LetExpression_0= ruleLetExpression | ( ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression ) | this_ChainExpression_2= ruleChainExpression )
+            // InternalExpression.g:79:28: ( (this_LetExpression_0= ruleLetExpression | ( ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression ) | this_ChainExpression_2= ruleChainExpression ) )
+            // InternalExpression.g:80:1: (this_LetExpression_0= ruleLetExpression | ( ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression ) | this_ChainExpression_2= ruleChainExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:80:1: (this_LetExpression_0= ruleLetExpression | ( ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression ) | this_ChainExpression_2= ruleChainExpression )
+            // InternalExpression.g:80:1: (this_LetExpression_0= ruleLetExpression | ( ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression ) | this_ChainExpression_2= ruleChainExpression )
             int alt1=3;
             alt1 = dfa1.predict(input);
             switch (alt1) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:81:5: this_LetExpression_0= ruleLetExpression
+                    // InternalExpression.g:81:5: this_LetExpression_0= ruleLetExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getExpressionAccess().getLetExpressionParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleLetExpression_in_ruleExpression132);
+                    pushFollow(FOLLOW_2);
                     this_LetExpression_0=ruleLetExpression();
 
                     state._fsp--;
@@ -209,17 +209,17 @@ public final EObject ruleExpression() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:90:6: ( ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression )
+                    // InternalExpression.g:90:6: ( ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:90:6: ( ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression )
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:90:7: ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression
+                    // InternalExpression.g:90:6: ( ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression )
+                    // InternalExpression.g:90:7: ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getExpressionAccess().getCastedExpressionParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleCastedExpression_in_ruleExpression165);
+                    pushFollow(FOLLOW_2);
                     this_CastedExpression_1=ruleCastedExpression();
 
                     state._fsp--;
@@ -237,14 +237,14 @@ public final EObject ruleExpression() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:101:5: this_ChainExpression_2= ruleChainExpression
+                    // InternalExpression.g:101:5: this_ChainExpression_2= ruleChainExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getExpressionAccess().getChainExpressionParserRuleCall_2()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleChainExpression_in_ruleExpression193);
+                    pushFollow(FOLLOW_2);
                     this_ChainExpression_2=ruleChainExpression();
 
                     state._fsp--;
@@ -281,7 +281,7 @@ public final EObject ruleExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleLetExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:119:1: entryRuleLetExpression returns [EObject current=null] : iv_ruleLetExpression= ruleLetExpression EOF ;
+    // InternalExpression.g:119:1: entryRuleLetExpression returns [EObject current=null] : iv_ruleLetExpression= ruleLetExpression EOF ;
     public final EObject entryRuleLetExpression() throws RecognitionException {
         EObject current = null;
 
@@ -289,13 +289,13 @@ public final EObject entryRuleLetExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:120:2: (iv_ruleLetExpression= ruleLetExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:121:2: iv_ruleLetExpression= ruleLetExpression EOF
+            // InternalExpression.g:120:2: (iv_ruleLetExpression= ruleLetExpression EOF )
+            // InternalExpression.g:121:2: iv_ruleLetExpression= ruleLetExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getLetExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleLetExpression_in_entryRuleLetExpression230);
+            pushFollow(FOLLOW_1);
             iv_ruleLetExpression=ruleLetExpression();
 
             state._fsp--;
@@ -303,7 +303,7 @@ public final EObject entryRuleLetExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleLetExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleLetExpression240); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -321,7 +321,7 @@ public final EObject entryRuleLetExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleLetExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:128:1: ruleLetExpression returns [EObject current=null] : (otherlv_0= 'let' ( (lv_identifier_1_0= ruleIdentifier ) ) otherlv_2= '=' ( (lv_varExpr_3_0= ruleExpression ) ) otherlv_4= ':' ( (lv_target_5_0= ruleExpression ) ) ) ;
+    // InternalExpression.g:128:1: ruleLetExpression returns [EObject current=null] : (otherlv_0= 'let' ( (lv_identifier_1_0= ruleIdentifier ) ) otherlv_2= '=' ( (lv_varExpr_3_0= ruleExpression ) ) otherlv_4= ':' ( (lv_target_5_0= ruleExpression ) ) ) ;
     public final EObject ruleLetExpression() throws RecognitionException {
         EObject current = null;
 
@@ -338,30 +338,30 @@ public final EObject ruleLetExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:131:28: ( (otherlv_0= 'let' ( (lv_identifier_1_0= ruleIdentifier ) ) otherlv_2= '=' ( (lv_varExpr_3_0= ruleExpression ) ) otherlv_4= ':' ( (lv_target_5_0= ruleExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:132:1: (otherlv_0= 'let' ( (lv_identifier_1_0= ruleIdentifier ) ) otherlv_2= '=' ( (lv_varExpr_3_0= ruleExpression ) ) otherlv_4= ':' ( (lv_target_5_0= ruleExpression ) ) )
+            // InternalExpression.g:131:28: ( (otherlv_0= 'let' ( (lv_identifier_1_0= ruleIdentifier ) ) otherlv_2= '=' ( (lv_varExpr_3_0= ruleExpression ) ) otherlv_4= ':' ( (lv_target_5_0= ruleExpression ) ) ) )
+            // InternalExpression.g:132:1: (otherlv_0= 'let' ( (lv_identifier_1_0= ruleIdentifier ) ) otherlv_2= '=' ( (lv_varExpr_3_0= ruleExpression ) ) otherlv_4= ':' ( (lv_target_5_0= ruleExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:132:1: (otherlv_0= 'let' ( (lv_identifier_1_0= ruleIdentifier ) ) otherlv_2= '=' ( (lv_varExpr_3_0= ruleExpression ) ) otherlv_4= ':' ( (lv_target_5_0= ruleExpression ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:132:3: otherlv_0= 'let' ( (lv_identifier_1_0= ruleIdentifier ) ) otherlv_2= '=' ( (lv_varExpr_3_0= ruleExpression ) ) otherlv_4= ':' ( (lv_target_5_0= ruleExpression ) )
+            // InternalExpression.g:132:1: (otherlv_0= 'let' ( (lv_identifier_1_0= ruleIdentifier ) ) otherlv_2= '=' ( (lv_varExpr_3_0= ruleExpression ) ) otherlv_4= ':' ( (lv_target_5_0= ruleExpression ) ) )
+            // InternalExpression.g:132:3: otherlv_0= 'let' ( (lv_identifier_1_0= ruleIdentifier ) ) otherlv_2= '=' ( (lv_varExpr_3_0= ruleExpression ) ) otherlv_4= ':' ( (lv_target_5_0= ruleExpression ) )
             {
-            otherlv_0=(Token)match(input,12,FOLLOW_12_in_ruleLetExpression277); if (state.failed) return current;
+            otherlv_0=(Token)match(input,12,FOLLOW_3); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getLetExpressionAccess().getLetKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:136:1: ( (lv_identifier_1_0= ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:137:1: (lv_identifier_1_0= ruleIdentifier )
+            // InternalExpression.g:136:1: ( (lv_identifier_1_0= ruleIdentifier ) )
+            // InternalExpression.g:137:1: (lv_identifier_1_0= ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:137:1: (lv_identifier_1_0= ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:138:3: lv_identifier_1_0= ruleIdentifier
+            // InternalExpression.g:137:1: (lv_identifier_1_0= ruleIdentifier )
+            // InternalExpression.g:138:3: lv_identifier_1_0= ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getLetExpressionAccess().getIdentifierIdentifierParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_ruleLetExpression298);
+            pushFollow(FOLLOW_4);
             lv_identifier_1_0=ruleIdentifier();
 
             state._fsp--;
@@ -375,7 +375,7 @@ public final EObject ruleLetExpression() throws RecognitionException {
                      			current, 
                      			"identifier",
                       		lv_identifier_1_0, 
-                      		"Identifier");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -385,24 +385,24 @@ public final EObject ruleLetExpression() throws RecognitionException {
 
             }
 
-            otherlv_2=(Token)match(input,13,FOLLOW_13_in_ruleLetExpression310); if (state.failed) return current;
+            otherlv_2=(Token)match(input,13,FOLLOW_5); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getLetExpressionAccess().getEqualsSignKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:158:1: ( (lv_varExpr_3_0= ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:159:1: (lv_varExpr_3_0= ruleExpression )
+            // InternalExpression.g:158:1: ( (lv_varExpr_3_0= ruleExpression ) )
+            // InternalExpression.g:159:1: (lv_varExpr_3_0= ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:159:1: (lv_varExpr_3_0= ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:160:3: lv_varExpr_3_0= ruleExpression
+            // InternalExpression.g:159:1: (lv_varExpr_3_0= ruleExpression )
+            // InternalExpression.g:160:3: lv_varExpr_3_0= ruleExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getLetExpressionAccess().getVarExprExpressionParserRuleCall_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleExpression_in_ruleLetExpression331);
+            pushFollow(FOLLOW_6);
             lv_varExpr_3_0=ruleExpression();
 
             state._fsp--;
@@ -416,7 +416,7 @@ public final EObject ruleLetExpression() throws RecognitionException {
                      			current, 
                      			"varExpr",
                       		lv_varExpr_3_0, 
-                      		"Expression");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -426,24 +426,24 @@ public final EObject ruleLetExpression() throws RecognitionException {
 
             }
 
-            otherlv_4=(Token)match(input,14,FOLLOW_14_in_ruleLetExpression343); if (state.failed) return current;
+            otherlv_4=(Token)match(input,14,FOLLOW_5); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_4, grammarAccess.getLetExpressionAccess().getColonKeyword_4());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:180:1: ( (lv_target_5_0= ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:181:1: (lv_target_5_0= ruleExpression )
+            // InternalExpression.g:180:1: ( (lv_target_5_0= ruleExpression ) )
+            // InternalExpression.g:181:1: (lv_target_5_0= ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:181:1: (lv_target_5_0= ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:182:3: lv_target_5_0= ruleExpression
+            // InternalExpression.g:181:1: (lv_target_5_0= ruleExpression )
+            // InternalExpression.g:182:3: lv_target_5_0= ruleExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getLetExpressionAccess().getTargetExpressionParserRuleCall_5_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleExpression_in_ruleLetExpression364);
+            pushFollow(FOLLOW_2);
             lv_target_5_0=ruleExpression();
 
             state._fsp--;
@@ -457,7 +457,7 @@ public final EObject ruleLetExpression() throws RecognitionException {
                      			current, 
                      			"target",
                       		lv_target_5_0, 
-                      		"Expression");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -490,7 +490,7 @@ public final EObject ruleLetExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleCastedExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:206:1: entryRuleCastedExpression returns [EObject current=null] : iv_ruleCastedExpression= ruleCastedExpression EOF ;
+    // InternalExpression.g:206:1: entryRuleCastedExpression returns [EObject current=null] : iv_ruleCastedExpression= ruleCastedExpression EOF ;
     public final EObject entryRuleCastedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -498,13 +498,13 @@ public final EObject entryRuleCastedExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:207:2: (iv_ruleCastedExpression= ruleCastedExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:208:2: iv_ruleCastedExpression= ruleCastedExpression EOF
+            // InternalExpression.g:207:2: (iv_ruleCastedExpression= ruleCastedExpression EOF )
+            // InternalExpression.g:208:2: iv_ruleCastedExpression= ruleCastedExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getCastedExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleCastedExpression_in_entryRuleCastedExpression400);
+            pushFollow(FOLLOW_1);
             iv_ruleCastedExpression=ruleCastedExpression();
 
             state._fsp--;
@@ -512,7 +512,7 @@ public final EObject entryRuleCastedExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleCastedExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleCastedExpression410); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -530,7 +530,7 @@ public final EObject entryRuleCastedExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleCastedExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:215:1: ruleCastedExpression returns [EObject current=null] : (otherlv_0= '(' ( (lv_type_1_0= ruleType ) ) otherlv_2= ')' ( (lv_target_3_0= ruleExpression ) ) ) ;
+    // InternalExpression.g:215:1: ruleCastedExpression returns [EObject current=null] : (otherlv_0= '(' ( (lv_type_1_0= ruleType ) ) otherlv_2= ')' ( (lv_target_3_0= ruleExpression ) ) ) ;
     public final EObject ruleCastedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -544,30 +544,30 @@ public final EObject ruleCastedExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:218:28: ( (otherlv_0= '(' ( (lv_type_1_0= ruleType ) ) otherlv_2= ')' ( (lv_target_3_0= ruleExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:219:1: (otherlv_0= '(' ( (lv_type_1_0= ruleType ) ) otherlv_2= ')' ( (lv_target_3_0= ruleExpression ) ) )
+            // InternalExpression.g:218:28: ( (otherlv_0= '(' ( (lv_type_1_0= ruleType ) ) otherlv_2= ')' ( (lv_target_3_0= ruleExpression ) ) ) )
+            // InternalExpression.g:219:1: (otherlv_0= '(' ( (lv_type_1_0= ruleType ) ) otherlv_2= ')' ( (lv_target_3_0= ruleExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:219:1: (otherlv_0= '(' ( (lv_type_1_0= ruleType ) ) otherlv_2= ')' ( (lv_target_3_0= ruleExpression ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:219:3: otherlv_0= '(' ( (lv_type_1_0= ruleType ) ) otherlv_2= ')' ( (lv_target_3_0= ruleExpression ) )
+            // InternalExpression.g:219:1: (otherlv_0= '(' ( (lv_type_1_0= ruleType ) ) otherlv_2= ')' ( (lv_target_3_0= ruleExpression ) ) )
+            // InternalExpression.g:219:3: otherlv_0= '(' ( (lv_type_1_0= ruleType ) ) otherlv_2= ')' ( (lv_target_3_0= ruleExpression ) )
             {
-            otherlv_0=(Token)match(input,15,FOLLOW_15_in_ruleCastedExpression447); if (state.failed) return current;
+            otherlv_0=(Token)match(input,15,FOLLOW_7); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getCastedExpressionAccess().getLeftParenthesisKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:223:1: ( (lv_type_1_0= ruleType ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:224:1: (lv_type_1_0= ruleType )
+            // InternalExpression.g:223:1: ( (lv_type_1_0= ruleType ) )
+            // InternalExpression.g:224:1: (lv_type_1_0= ruleType )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:224:1: (lv_type_1_0= ruleType )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:225:3: lv_type_1_0= ruleType
+            // InternalExpression.g:224:1: (lv_type_1_0= ruleType )
+            // InternalExpression.g:225:3: lv_type_1_0= ruleType
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getCastedExpressionAccess().getTypeTypeParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleType_in_ruleCastedExpression468);
+            pushFollow(FOLLOW_8);
             lv_type_1_0=ruleType();
 
             state._fsp--;
@@ -581,7 +581,7 @@ public final EObject ruleCastedExpression() throws RecognitionException {
                      			current, 
                      			"type",
                       		lv_type_1_0, 
-                      		"Type");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Type");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -591,24 +591,24 @@ public final EObject ruleCastedExpression() throws RecognitionException {
 
             }
 
-            otherlv_2=(Token)match(input,16,FOLLOW_16_in_ruleCastedExpression480); if (state.failed) return current;
+            otherlv_2=(Token)match(input,16,FOLLOW_5); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getCastedExpressionAccess().getRightParenthesisKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:245:1: ( (lv_target_3_0= ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:246:1: (lv_target_3_0= ruleExpression )
+            // InternalExpression.g:245:1: ( (lv_target_3_0= ruleExpression ) )
+            // InternalExpression.g:246:1: (lv_target_3_0= ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:246:1: (lv_target_3_0= ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:247:3: lv_target_3_0= ruleExpression
+            // InternalExpression.g:246:1: (lv_target_3_0= ruleExpression )
+            // InternalExpression.g:247:3: lv_target_3_0= ruleExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getCastedExpressionAccess().getTargetExpressionParserRuleCall_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleExpression_in_ruleCastedExpression501);
+            pushFollow(FOLLOW_2);
             lv_target_3_0=ruleExpression();
 
             state._fsp--;
@@ -622,7 +622,7 @@ public final EObject ruleCastedExpression() throws RecognitionException {
                      			current, 
                      			"target",
                       		lv_target_3_0, 
-                      		"Expression");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -655,7 +655,7 @@ public final EObject ruleCastedExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleChainExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:271:1: entryRuleChainExpression returns [EObject current=null] : iv_ruleChainExpression= ruleChainExpression EOF ;
+    // InternalExpression.g:271:1: entryRuleChainExpression returns [EObject current=null] : iv_ruleChainExpression= ruleChainExpression EOF ;
     public final EObject entryRuleChainExpression() throws RecognitionException {
         EObject current = null;
 
@@ -663,13 +663,13 @@ public final EObject entryRuleChainExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:272:2: (iv_ruleChainExpression= ruleChainExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:273:2: iv_ruleChainExpression= ruleChainExpression EOF
+            // InternalExpression.g:272:2: (iv_ruleChainExpression= ruleChainExpression EOF )
+            // InternalExpression.g:273:2: iv_ruleChainExpression= ruleChainExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getChainExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleChainExpression_in_entryRuleChainExpression537);
+            pushFollow(FOLLOW_1);
             iv_ruleChainExpression=ruleChainExpression();
 
             state._fsp--;
@@ -677,7 +677,7 @@ public final EObject entryRuleChainExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleChainExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleChainExpression547); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -695,7 +695,7 @@ public final EObject entryRuleChainExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleChainExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:280:1: ruleChainExpression returns [EObject current=null] : (this_ChainedExpression_0= ruleChainedExpression ( () otherlv_2= '->' ( (lv_next_3_0= ruleChainedExpression ) ) )* ) ;
+    // InternalExpression.g:280:1: ruleChainExpression returns [EObject current=null] : (this_ChainedExpression_0= ruleChainedExpression ( () otherlv_2= '->' ( (lv_next_3_0= ruleChainedExpression ) ) )* ) ;
     public final EObject ruleChainExpression() throws RecognitionException {
         EObject current = null;
 
@@ -708,18 +708,18 @@ public final EObject ruleChainExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:283:28: ( (this_ChainedExpression_0= ruleChainedExpression ( () otherlv_2= '->' ( (lv_next_3_0= ruleChainedExpression ) ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:284:1: (this_ChainedExpression_0= ruleChainedExpression ( () otherlv_2= '->' ( (lv_next_3_0= ruleChainedExpression ) ) )* )
+            // InternalExpression.g:283:28: ( (this_ChainedExpression_0= ruleChainedExpression ( () otherlv_2= '->' ( (lv_next_3_0= ruleChainedExpression ) ) )* ) )
+            // InternalExpression.g:284:1: (this_ChainedExpression_0= ruleChainedExpression ( () otherlv_2= '->' ( (lv_next_3_0= ruleChainedExpression ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:284:1: (this_ChainedExpression_0= ruleChainedExpression ( () otherlv_2= '->' ( (lv_next_3_0= ruleChainedExpression ) ) )* )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:285:5: this_ChainedExpression_0= ruleChainedExpression ( () otherlv_2= '->' ( (lv_next_3_0= ruleChainedExpression ) ) )*
+            // InternalExpression.g:284:1: (this_ChainedExpression_0= ruleChainedExpression ( () otherlv_2= '->' ( (lv_next_3_0= ruleChainedExpression ) ) )* )
+            // InternalExpression.g:285:5: this_ChainedExpression_0= ruleChainedExpression ( () otherlv_2= '->' ( (lv_next_3_0= ruleChainedExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getChainExpressionAccess().getChainedExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleChainedExpression_in_ruleChainExpression594);
+            pushFollow(FOLLOW_9);
             this_ChainedExpression_0=ruleChainedExpression();
 
             state._fsp--;
@@ -730,7 +730,7 @@ public final EObject ruleChainExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:293:1: ( () otherlv_2= '->' ( (lv_next_3_0= ruleChainedExpression ) ) )*
+            // InternalExpression.g:293:1: ( () otherlv_2= '->' ( (lv_next_3_0= ruleChainedExpression ) ) )*
             loop2:
             do {
                 int alt2=2;
@@ -743,10 +743,10 @@ public final EObject ruleChainExpression() throws RecognitionException {
 
                 switch (alt2) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:293:2: () otherlv_2= '->' ( (lv_next_3_0= ruleChainedExpression ) )
+            	    // InternalExpression.g:293:2: () otherlv_2= '->' ( (lv_next_3_0= ruleChainedExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:293:2: ()
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:294:5: 
+            	    // InternalExpression.g:293:2: ()
+            	    // InternalExpression.g:294:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -758,24 +758,24 @@ public final EObject ruleChainExpression() throws RecognitionException {
 
             	    }
 
-            	    otherlv_2=(Token)match(input,17,FOLLOW_17_in_ruleChainExpression615); if (state.failed) return current;
+            	    otherlv_2=(Token)match(input,17,FOLLOW_5); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_2, grammarAccess.getChainExpressionAccess().getHyphenMinusGreaterThanSignKeyword_1_1());
             	          
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:303:1: ( (lv_next_3_0= ruleChainedExpression ) )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:304:1: (lv_next_3_0= ruleChainedExpression )
+            	    // InternalExpression.g:303:1: ( (lv_next_3_0= ruleChainedExpression ) )
+            	    // InternalExpression.g:304:1: (lv_next_3_0= ruleChainedExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:304:1: (lv_next_3_0= ruleChainedExpression )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:305:3: lv_next_3_0= ruleChainedExpression
+            	    // InternalExpression.g:304:1: (lv_next_3_0= ruleChainedExpression )
+            	    // InternalExpression.g:305:3: lv_next_3_0= ruleChainedExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getChainExpressionAccess().getNextChainedExpressionParserRuleCall_1_2_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleChainedExpression_in_ruleChainExpression636);
+            	    pushFollow(FOLLOW_9);
             	    lv_next_3_0=ruleChainedExpression();
 
             	    state._fsp--;
@@ -789,7 +789,7 @@ public final EObject ruleChainExpression() throws RecognitionException {
             	             			current, 
             	             			"next",
             	              		lv_next_3_0, 
-            	              		"ChainedExpression");
+            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.ChainedExpression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -831,7 +831,7 @@ public final EObject ruleChainExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleChainedExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:329:1: entryRuleChainedExpression returns [EObject current=null] : iv_ruleChainedExpression= ruleChainedExpression EOF ;
+    // InternalExpression.g:329:1: entryRuleChainedExpression returns [EObject current=null] : iv_ruleChainedExpression= ruleChainedExpression EOF ;
     public final EObject entryRuleChainedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -839,13 +839,13 @@ public final EObject entryRuleChainedExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:330:2: (iv_ruleChainedExpression= ruleChainedExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:331:2: iv_ruleChainedExpression= ruleChainedExpression EOF
+            // InternalExpression.g:330:2: (iv_ruleChainedExpression= ruleChainedExpression EOF )
+            // InternalExpression.g:331:2: iv_ruleChainedExpression= ruleChainedExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getChainedExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleChainedExpression_in_entryRuleChainedExpression674);
+            pushFollow(FOLLOW_1);
             iv_ruleChainedExpression=ruleChainedExpression();
 
             state._fsp--;
@@ -853,7 +853,7 @@ public final EObject entryRuleChainedExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleChainedExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleChainedExpression684); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -871,7 +871,7 @@ public final EObject entryRuleChainedExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleChainedExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:338:1: ruleChainedExpression returns [EObject current=null] : (this_IfExpressionKw_0= ruleIfExpressionKw | this_IfExpressionTri_1= ruleIfExpressionTri | this_SwitchExpression_2= ruleSwitchExpression ) ;
+    // InternalExpression.g:338:1: ruleChainedExpression returns [EObject current=null] : (this_IfExpressionKw_0= ruleIfExpressionKw | this_IfExpressionTri_1= ruleIfExpressionTri | this_SwitchExpression_2= ruleSwitchExpression ) ;
     public final EObject ruleChainedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -885,10 +885,10 @@ public final EObject ruleChainedExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:341:28: ( (this_IfExpressionKw_0= ruleIfExpressionKw | this_IfExpressionTri_1= ruleIfExpressionTri | this_SwitchExpression_2= ruleSwitchExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:342:1: (this_IfExpressionKw_0= ruleIfExpressionKw | this_IfExpressionTri_1= ruleIfExpressionTri | this_SwitchExpression_2= ruleSwitchExpression )
+            // InternalExpression.g:341:28: ( (this_IfExpressionKw_0= ruleIfExpressionKw | this_IfExpressionTri_1= ruleIfExpressionTri | this_SwitchExpression_2= ruleSwitchExpression ) )
+            // InternalExpression.g:342:1: (this_IfExpressionKw_0= ruleIfExpressionKw | this_IfExpressionTri_1= ruleIfExpressionTri | this_SwitchExpression_2= ruleSwitchExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:342:1: (this_IfExpressionKw_0= ruleIfExpressionKw | this_IfExpressionTri_1= ruleIfExpressionTri | this_SwitchExpression_2= ruleSwitchExpression )
+            // InternalExpression.g:342:1: (this_IfExpressionKw_0= ruleIfExpressionKw | this_IfExpressionTri_1= ruleIfExpressionTri | this_SwitchExpression_2= ruleSwitchExpression )
             int alt3=3;
             switch ( input.LA(1) ) {
             case 19:
@@ -940,14 +940,14 @@ public final EObject ruleChainedExpression() throws RecognitionException {
 
             switch (alt3) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:343:5: this_IfExpressionKw_0= ruleIfExpressionKw
+                    // InternalExpression.g:343:5: this_IfExpressionKw_0= ruleIfExpressionKw
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getChainedExpressionAccess().getIfExpressionKwParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleIfExpressionKw_in_ruleChainedExpression731);
+                    pushFollow(FOLLOW_2);
                     this_IfExpressionKw_0=ruleIfExpressionKw();
 
                     state._fsp--;
@@ -962,14 +962,14 @@ public final EObject ruleChainedExpression() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:353:5: this_IfExpressionTri_1= ruleIfExpressionTri
+                    // InternalExpression.g:353:5: this_IfExpressionTri_1= ruleIfExpressionTri
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getChainedExpressionAccess().getIfExpressionTriParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleIfExpressionTri_in_ruleChainedExpression758);
+                    pushFollow(FOLLOW_2);
                     this_IfExpressionTri_1=ruleIfExpressionTri();
 
                     state._fsp--;
@@ -984,14 +984,14 @@ public final EObject ruleChainedExpression() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:363:5: this_SwitchExpression_2= ruleSwitchExpression
+                    // InternalExpression.g:363:5: this_SwitchExpression_2= ruleSwitchExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getChainedExpressionAccess().getSwitchExpressionParserRuleCall_2()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleSwitchExpression_in_ruleChainedExpression785);
+                    pushFollow(FOLLOW_2);
                     this_SwitchExpression_2=ruleSwitchExpression();
 
                     state._fsp--;
@@ -1028,7 +1028,7 @@ public final EObject ruleChainedExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleIfExpressionTri"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:379:1: entryRuleIfExpressionTri returns [EObject current=null] : iv_ruleIfExpressionTri= ruleIfExpressionTri EOF ;
+    // InternalExpression.g:379:1: entryRuleIfExpressionTri returns [EObject current=null] : iv_ruleIfExpressionTri= ruleIfExpressionTri EOF ;
     public final EObject entryRuleIfExpressionTri() throws RecognitionException {
         EObject current = null;
 
@@ -1036,13 +1036,13 @@ public final EObject entryRuleIfExpressionTri() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:380:2: (iv_ruleIfExpressionTri= ruleIfExpressionTri EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:381:2: iv_ruleIfExpressionTri= ruleIfExpressionTri EOF
+            // InternalExpression.g:380:2: (iv_ruleIfExpressionTri= ruleIfExpressionTri EOF )
+            // InternalExpression.g:381:2: iv_ruleIfExpressionTri= ruleIfExpressionTri EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getIfExpressionTriRule()); 
             }
-            pushFollow(FOLLOW_ruleIfExpressionTri_in_entryRuleIfExpressionTri820);
+            pushFollow(FOLLOW_1);
             iv_ruleIfExpressionTri=ruleIfExpressionTri();
 
             state._fsp--;
@@ -1050,7 +1050,7 @@ public final EObject entryRuleIfExpressionTri() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleIfExpressionTri; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIfExpressionTri830); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -1068,7 +1068,7 @@ public final EObject entryRuleIfExpressionTri() throws RecognitionException {
 
 
     // $ANTLR start "ruleIfExpressionTri"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:388:1: ruleIfExpressionTri returns [EObject current=null] : (this_OrExpression_0= ruleOrExpression ( () otherlv_2= '?' ( (lv_thenPart_3_0= ruleChainedExpression ) ) otherlv_4= ':' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )? ) ;
+    // InternalExpression.g:388:1: ruleIfExpressionTri returns [EObject current=null] : (this_OrExpression_0= ruleOrExpression ( () otherlv_2= '?' ( (lv_thenPart_3_0= ruleChainedExpression ) ) otherlv_4= ':' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )? ) ;
     public final EObject ruleIfExpressionTri() throws RecognitionException {
         EObject current = null;
 
@@ -1084,18 +1084,18 @@ public final EObject ruleIfExpressionTri() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:391:28: ( (this_OrExpression_0= ruleOrExpression ( () otherlv_2= '?' ( (lv_thenPart_3_0= ruleChainedExpression ) ) otherlv_4= ':' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )? ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:392:1: (this_OrExpression_0= ruleOrExpression ( () otherlv_2= '?' ( (lv_thenPart_3_0= ruleChainedExpression ) ) otherlv_4= ':' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )? )
+            // InternalExpression.g:391:28: ( (this_OrExpression_0= ruleOrExpression ( () otherlv_2= '?' ( (lv_thenPart_3_0= ruleChainedExpression ) ) otherlv_4= ':' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )? ) )
+            // InternalExpression.g:392:1: (this_OrExpression_0= ruleOrExpression ( () otherlv_2= '?' ( (lv_thenPart_3_0= ruleChainedExpression ) ) otherlv_4= ':' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:392:1: (this_OrExpression_0= ruleOrExpression ( () otherlv_2= '?' ( (lv_thenPart_3_0= ruleChainedExpression ) ) otherlv_4= ':' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )? )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:393:5: this_OrExpression_0= ruleOrExpression ( () otherlv_2= '?' ( (lv_thenPart_3_0= ruleChainedExpression ) ) otherlv_4= ':' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )?
+            // InternalExpression.g:392:1: (this_OrExpression_0= ruleOrExpression ( () otherlv_2= '?' ( (lv_thenPart_3_0= ruleChainedExpression ) ) otherlv_4= ':' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )? )
+            // InternalExpression.g:393:5: this_OrExpression_0= ruleOrExpression ( () otherlv_2= '?' ( (lv_thenPart_3_0= ruleChainedExpression ) ) otherlv_4= ':' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )?
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getIfExpressionTriAccess().getOrExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleOrExpression_in_ruleIfExpressionTri877);
+            pushFollow(FOLLOW_10);
             this_OrExpression_0=ruleOrExpression();
 
             state._fsp--;
@@ -1106,7 +1106,7 @@ public final EObject ruleIfExpressionTri() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:401:1: ( () otherlv_2= '?' ( (lv_thenPart_3_0= ruleChainedExpression ) ) otherlv_4= ':' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )?
+            // InternalExpression.g:401:1: ( () otherlv_2= '?' ( (lv_thenPart_3_0= ruleChainedExpression ) ) otherlv_4= ':' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )?
             int alt4=2;
             int LA4_0 = input.LA(1);
 
@@ -1115,10 +1115,10 @@ public final EObject ruleIfExpressionTri() throws RecognitionException {
             }
             switch (alt4) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:401:2: () otherlv_2= '?' ( (lv_thenPart_3_0= ruleChainedExpression ) ) otherlv_4= ':' ( (lv_elsePart_5_0= ruleChainedExpression ) )
+                    // InternalExpression.g:401:2: () otherlv_2= '?' ( (lv_thenPart_3_0= ruleChainedExpression ) ) otherlv_4= ':' ( (lv_elsePart_5_0= ruleChainedExpression ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:401:2: ()
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:402:5: 
+                    // InternalExpression.g:401:2: ()
+                    // InternalExpression.g:402:5: 
                     {
                     if ( state.backtracking==0 ) {
 
@@ -1130,24 +1130,24 @@ public final EObject ruleIfExpressionTri() throws RecognitionException {
 
                     }
 
-                    otherlv_2=(Token)match(input,18,FOLLOW_18_in_ruleIfExpressionTri898); if (state.failed) return current;
+                    otherlv_2=(Token)match(input,18,FOLLOW_5); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_2, grammarAccess.getIfExpressionTriAccess().getQuestionMarkKeyword_1_1());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:411:1: ( (lv_thenPart_3_0= ruleChainedExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:412:1: (lv_thenPart_3_0= ruleChainedExpression )
+                    // InternalExpression.g:411:1: ( (lv_thenPart_3_0= ruleChainedExpression ) )
+                    // InternalExpression.g:412:1: (lv_thenPart_3_0= ruleChainedExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:412:1: (lv_thenPart_3_0= ruleChainedExpression )
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:413:3: lv_thenPart_3_0= ruleChainedExpression
+                    // InternalExpression.g:412:1: (lv_thenPart_3_0= ruleChainedExpression )
+                    // InternalExpression.g:413:3: lv_thenPart_3_0= ruleChainedExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getIfExpressionTriAccess().getThenPartChainedExpressionParserRuleCall_1_2_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleChainedExpression_in_ruleIfExpressionTri919);
+                    pushFollow(FOLLOW_6);
                     lv_thenPart_3_0=ruleChainedExpression();
 
                     state._fsp--;
@@ -1161,7 +1161,7 @@ public final EObject ruleIfExpressionTri() throws RecognitionException {
                              			current, 
                              			"thenPart",
                               		lv_thenPart_3_0, 
-                              		"ChainedExpression");
+                              		"com.avaloq.tools.ddk.xtext.expression.Expression.ChainedExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -1171,24 +1171,24 @@ public final EObject ruleIfExpressionTri() throws RecognitionException {
 
                     }
 
-                    otherlv_4=(Token)match(input,14,FOLLOW_14_in_ruleIfExpressionTri931); if (state.failed) return current;
+                    otherlv_4=(Token)match(input,14,FOLLOW_5); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_4, grammarAccess.getIfExpressionTriAccess().getColonKeyword_1_3());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:433:1: ( (lv_elsePart_5_0= ruleChainedExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:434:1: (lv_elsePart_5_0= ruleChainedExpression )
+                    // InternalExpression.g:433:1: ( (lv_elsePart_5_0= ruleChainedExpression ) )
+                    // InternalExpression.g:434:1: (lv_elsePart_5_0= ruleChainedExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:434:1: (lv_elsePart_5_0= ruleChainedExpression )
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:435:3: lv_elsePart_5_0= ruleChainedExpression
+                    // InternalExpression.g:434:1: (lv_elsePart_5_0= ruleChainedExpression )
+                    // InternalExpression.g:435:3: lv_elsePart_5_0= ruleChainedExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getIfExpressionTriAccess().getElsePartChainedExpressionParserRuleCall_1_4_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleChainedExpression_in_ruleIfExpressionTri952);
+                    pushFollow(FOLLOW_2);
                     lv_elsePart_5_0=ruleChainedExpression();
 
                     state._fsp--;
@@ -1202,7 +1202,7 @@ public final EObject ruleIfExpressionTri() throws RecognitionException {
                              			current, 
                              			"elsePart",
                               		lv_elsePart_5_0, 
-                              		"ChainedExpression");
+                              		"com.avaloq.tools.ddk.xtext.expression.Expression.ChainedExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -1241,7 +1241,7 @@ public final EObject ruleIfExpressionTri() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleIfExpressionKw"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:459:1: entryRuleIfExpressionKw returns [EObject current=null] : iv_ruleIfExpressionKw= ruleIfExpressionKw EOF ;
+    // InternalExpression.g:459:1: entryRuleIfExpressionKw returns [EObject current=null] : iv_ruleIfExpressionKw= ruleIfExpressionKw EOF ;
     public final EObject entryRuleIfExpressionKw() throws RecognitionException {
         EObject current = null;
 
@@ -1249,13 +1249,13 @@ public final EObject entryRuleIfExpressionKw() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:460:2: (iv_ruleIfExpressionKw= ruleIfExpressionKw EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:461:2: iv_ruleIfExpressionKw= ruleIfExpressionKw EOF
+            // InternalExpression.g:460:2: (iv_ruleIfExpressionKw= ruleIfExpressionKw EOF )
+            // InternalExpression.g:461:2: iv_ruleIfExpressionKw= ruleIfExpressionKw EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getIfExpressionKwRule()); 
             }
-            pushFollow(FOLLOW_ruleIfExpressionKw_in_entryRuleIfExpressionKw990);
+            pushFollow(FOLLOW_1);
             iv_ruleIfExpressionKw=ruleIfExpressionKw();
 
             state._fsp--;
@@ -1263,7 +1263,7 @@ public final EObject entryRuleIfExpressionKw() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleIfExpressionKw; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIfExpressionKw1000); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -1281,7 +1281,7 @@ public final EObject entryRuleIfExpressionKw() throws RecognitionException {
 
 
     // $ANTLR start "ruleIfExpressionKw"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:468:1: ruleIfExpressionKw returns [EObject current=null] : (otherlv_0= 'if' ( (lv_condition_1_0= ruleChainedExpression ) ) otherlv_2= 'then' ( (lv_thenPart_3_0= ruleChainedExpression ) ) ( ( 'else' )=> (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) ) )? ) ;
+    // InternalExpression.g:468:1: ruleIfExpressionKw returns [EObject current=null] : (otherlv_0= 'if' ( (lv_condition_1_0= ruleChainedExpression ) ) otherlv_2= 'then' ( (lv_thenPart_3_0= ruleChainedExpression ) ) ( ( 'else' )=> (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) ) )? ) ;
     public final EObject ruleIfExpressionKw() throws RecognitionException {
         EObject current = null;
 
@@ -1298,30 +1298,30 @@ public final EObject ruleIfExpressionKw() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:471:28: ( (otherlv_0= 'if' ( (lv_condition_1_0= ruleChainedExpression ) ) otherlv_2= 'then' ( (lv_thenPart_3_0= ruleChainedExpression ) ) ( ( 'else' )=> (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) ) )? ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:472:1: (otherlv_0= 'if' ( (lv_condition_1_0= ruleChainedExpression ) ) otherlv_2= 'then' ( (lv_thenPart_3_0= ruleChainedExpression ) ) ( ( 'else' )=> (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) ) )? )
+            // InternalExpression.g:471:28: ( (otherlv_0= 'if' ( (lv_condition_1_0= ruleChainedExpression ) ) otherlv_2= 'then' ( (lv_thenPart_3_0= ruleChainedExpression ) ) ( ( 'else' )=> (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) ) )? ) )
+            // InternalExpression.g:472:1: (otherlv_0= 'if' ( (lv_condition_1_0= ruleChainedExpression ) ) otherlv_2= 'then' ( (lv_thenPart_3_0= ruleChainedExpression ) ) ( ( 'else' )=> (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) ) )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:472:1: (otherlv_0= 'if' ( (lv_condition_1_0= ruleChainedExpression ) ) otherlv_2= 'then' ( (lv_thenPart_3_0= ruleChainedExpression ) ) ( ( 'else' )=> (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) ) )? )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:472:3: otherlv_0= 'if' ( (lv_condition_1_0= ruleChainedExpression ) ) otherlv_2= 'then' ( (lv_thenPart_3_0= ruleChainedExpression ) ) ( ( 'else' )=> (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) ) )?
+            // InternalExpression.g:472:1: (otherlv_0= 'if' ( (lv_condition_1_0= ruleChainedExpression ) ) otherlv_2= 'then' ( (lv_thenPart_3_0= ruleChainedExpression ) ) ( ( 'else' )=> (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) ) )? )
+            // InternalExpression.g:472:3: otherlv_0= 'if' ( (lv_condition_1_0= ruleChainedExpression ) ) otherlv_2= 'then' ( (lv_thenPart_3_0= ruleChainedExpression ) ) ( ( 'else' )=> (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) ) )?
             {
-            otherlv_0=(Token)match(input,19,FOLLOW_19_in_ruleIfExpressionKw1037); if (state.failed) return current;
+            otherlv_0=(Token)match(input,19,FOLLOW_5); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getIfExpressionKwAccess().getIfKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:476:1: ( (lv_condition_1_0= ruleChainedExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:477:1: (lv_condition_1_0= ruleChainedExpression )
+            // InternalExpression.g:476:1: ( (lv_condition_1_0= ruleChainedExpression ) )
+            // InternalExpression.g:477:1: (lv_condition_1_0= ruleChainedExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:477:1: (lv_condition_1_0= ruleChainedExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:478:3: lv_condition_1_0= ruleChainedExpression
+            // InternalExpression.g:477:1: (lv_condition_1_0= ruleChainedExpression )
+            // InternalExpression.g:478:3: lv_condition_1_0= ruleChainedExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getIfExpressionKwAccess().getConditionChainedExpressionParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleChainedExpression_in_ruleIfExpressionKw1058);
+            pushFollow(FOLLOW_11);
             lv_condition_1_0=ruleChainedExpression();
 
             state._fsp--;
@@ -1335,7 +1335,7 @@ public final EObject ruleIfExpressionKw() throws RecognitionException {
                      			current, 
                      			"condition",
                       		lv_condition_1_0, 
-                      		"ChainedExpression");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.ChainedExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -1345,24 +1345,24 @@ public final EObject ruleIfExpressionKw() throws RecognitionException {
 
             }
 
-            otherlv_2=(Token)match(input,20,FOLLOW_20_in_ruleIfExpressionKw1070); if (state.failed) return current;
+            otherlv_2=(Token)match(input,20,FOLLOW_5); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getIfExpressionKwAccess().getThenKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:498:1: ( (lv_thenPart_3_0= ruleChainedExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:499:1: (lv_thenPart_3_0= ruleChainedExpression )
+            // InternalExpression.g:498:1: ( (lv_thenPart_3_0= ruleChainedExpression ) )
+            // InternalExpression.g:499:1: (lv_thenPart_3_0= ruleChainedExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:499:1: (lv_thenPart_3_0= ruleChainedExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:500:3: lv_thenPart_3_0= ruleChainedExpression
+            // InternalExpression.g:499:1: (lv_thenPart_3_0= ruleChainedExpression )
+            // InternalExpression.g:500:3: lv_thenPart_3_0= ruleChainedExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getIfExpressionKwAccess().getThenPartChainedExpressionParserRuleCall_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleChainedExpression_in_ruleIfExpressionKw1091);
+            pushFollow(FOLLOW_12);
             lv_thenPart_3_0=ruleChainedExpression();
 
             state._fsp--;
@@ -1376,7 +1376,7 @@ public final EObject ruleIfExpressionKw() throws RecognitionException {
                      			current, 
                      			"thenPart",
                       		lv_thenPart_3_0, 
-                      		"ChainedExpression");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.ChainedExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -1386,7 +1386,7 @@ public final EObject ruleIfExpressionKw() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:516:2: ( ( 'else' )=> (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) ) )?
+            // InternalExpression.g:516:2: ( ( 'else' )=> (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) ) )?
             int alt5=2;
             int LA5_0 = input.LA(1);
 
@@ -1399,29 +1399,29 @@ public final EObject ruleIfExpressionKw() throws RecognitionException {
             }
             switch (alt5) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:516:3: ( 'else' )=> (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )
+                    // InternalExpression.g:516:3: ( 'else' )=> (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:517:4: (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:517:6: otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) )
+                    // InternalExpression.g:517:4: (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )
+                    // InternalExpression.g:517:6: otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) )
                     {
-                    otherlv_4=(Token)match(input,21,FOLLOW_21_in_ruleIfExpressionKw1112); if (state.failed) return current;
+                    otherlv_4=(Token)match(input,21,FOLLOW_5); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_4, grammarAccess.getIfExpressionKwAccess().getElseKeyword_4_0_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:521:1: ( (lv_elsePart_5_0= ruleChainedExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:522:1: (lv_elsePart_5_0= ruleChainedExpression )
+                    // InternalExpression.g:521:1: ( (lv_elsePart_5_0= ruleChainedExpression ) )
+                    // InternalExpression.g:522:1: (lv_elsePart_5_0= ruleChainedExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:522:1: (lv_elsePart_5_0= ruleChainedExpression )
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:523:3: lv_elsePart_5_0= ruleChainedExpression
+                    // InternalExpression.g:522:1: (lv_elsePart_5_0= ruleChainedExpression )
+                    // InternalExpression.g:523:3: lv_elsePart_5_0= ruleChainedExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getIfExpressionKwAccess().getElsePartChainedExpressionParserRuleCall_4_0_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleChainedExpression_in_ruleIfExpressionKw1133);
+                    pushFollow(FOLLOW_2);
                     lv_elsePart_5_0=ruleChainedExpression();
 
                     state._fsp--;
@@ -1435,7 +1435,7 @@ public final EObject ruleIfExpressionKw() throws RecognitionException {
                              			current, 
                              			"elsePart",
                               		lv_elsePart_5_0, 
-                              		"ChainedExpression");
+                              		"com.avaloq.tools.ddk.xtext.expression.Expression.ChainedExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -1477,7 +1477,7 @@ public final EObject ruleIfExpressionKw() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleSwitchExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:547:1: entryRuleSwitchExpression returns [EObject current=null] : iv_ruleSwitchExpression= ruleSwitchExpression EOF ;
+    // InternalExpression.g:547:1: entryRuleSwitchExpression returns [EObject current=null] : iv_ruleSwitchExpression= ruleSwitchExpression EOF ;
     public final EObject entryRuleSwitchExpression() throws RecognitionException {
         EObject current = null;
 
@@ -1485,13 +1485,13 @@ public final EObject entryRuleSwitchExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:548:2: (iv_ruleSwitchExpression= ruleSwitchExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:549:2: iv_ruleSwitchExpression= ruleSwitchExpression EOF
+            // InternalExpression.g:548:2: (iv_ruleSwitchExpression= ruleSwitchExpression EOF )
+            // InternalExpression.g:549:2: iv_ruleSwitchExpression= ruleSwitchExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getSwitchExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleSwitchExpression_in_entryRuleSwitchExpression1172);
+            pushFollow(FOLLOW_1);
             iv_ruleSwitchExpression=ruleSwitchExpression();
 
             state._fsp--;
@@ -1499,7 +1499,7 @@ public final EObject entryRuleSwitchExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleSwitchExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSwitchExpression1182); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -1517,7 +1517,7 @@ public final EObject entryRuleSwitchExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleSwitchExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:556:1: ruleSwitchExpression returns [EObject current=null] : (otherlv_0= 'switch' (otherlv_1= '(' ( (lv_switchExpr_2_0= ruleOrExpression ) ) otherlv_3= ')' )? otherlv_4= '{' ( (lv_case_5_0= ruleCase ) )* otherlv_6= 'default' otherlv_7= ':' ( (lv_defaultExpr_8_0= ruleOrExpression ) ) otherlv_9= '}' ) ;
+    // InternalExpression.g:556:1: ruleSwitchExpression returns [EObject current=null] : (otherlv_0= 'switch' (otherlv_1= '(' ( (lv_switchExpr_2_0= ruleOrExpression ) ) otherlv_3= ')' )? otherlv_4= '{' ( (lv_case_5_0= ruleCase ) )* otherlv_6= 'default' otherlv_7= ':' ( (lv_defaultExpr_8_0= ruleOrExpression ) ) otherlv_9= '}' ) ;
     public final EObject ruleSwitchExpression() throws RecognitionException {
         EObject current = null;
 
@@ -1538,19 +1538,19 @@ public final EObject ruleSwitchExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:559:28: ( (otherlv_0= 'switch' (otherlv_1= '(' ( (lv_switchExpr_2_0= ruleOrExpression ) ) otherlv_3= ')' )? otherlv_4= '{' ( (lv_case_5_0= ruleCase ) )* otherlv_6= 'default' otherlv_7= ':' ( (lv_defaultExpr_8_0= ruleOrExpression ) ) otherlv_9= '}' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:560:1: (otherlv_0= 'switch' (otherlv_1= '(' ( (lv_switchExpr_2_0= ruleOrExpression ) ) otherlv_3= ')' )? otherlv_4= '{' ( (lv_case_5_0= ruleCase ) )* otherlv_6= 'default' otherlv_7= ':' ( (lv_defaultExpr_8_0= ruleOrExpression ) ) otherlv_9= '}' )
+            // InternalExpression.g:559:28: ( (otherlv_0= 'switch' (otherlv_1= '(' ( (lv_switchExpr_2_0= ruleOrExpression ) ) otherlv_3= ')' )? otherlv_4= '{' ( (lv_case_5_0= ruleCase ) )* otherlv_6= 'default' otherlv_7= ':' ( (lv_defaultExpr_8_0= ruleOrExpression ) ) otherlv_9= '}' ) )
+            // InternalExpression.g:560:1: (otherlv_0= 'switch' (otherlv_1= '(' ( (lv_switchExpr_2_0= ruleOrExpression ) ) otherlv_3= ')' )? otherlv_4= '{' ( (lv_case_5_0= ruleCase ) )* otherlv_6= 'default' otherlv_7= ':' ( (lv_defaultExpr_8_0= ruleOrExpression ) ) otherlv_9= '}' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:560:1: (otherlv_0= 'switch' (otherlv_1= '(' ( (lv_switchExpr_2_0= ruleOrExpression ) ) otherlv_3= ')' )? otherlv_4= '{' ( (lv_case_5_0= ruleCase ) )* otherlv_6= 'default' otherlv_7= ':' ( (lv_defaultExpr_8_0= ruleOrExpression ) ) otherlv_9= '}' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:560:3: otherlv_0= 'switch' (otherlv_1= '(' ( (lv_switchExpr_2_0= ruleOrExpression ) ) otherlv_3= ')' )? otherlv_4= '{' ( (lv_case_5_0= ruleCase ) )* otherlv_6= 'default' otherlv_7= ':' ( (lv_defaultExpr_8_0= ruleOrExpression ) ) otherlv_9= '}'
+            // InternalExpression.g:560:1: (otherlv_0= 'switch' (otherlv_1= '(' ( (lv_switchExpr_2_0= ruleOrExpression ) ) otherlv_3= ')' )? otherlv_4= '{' ( (lv_case_5_0= ruleCase ) )* otherlv_6= 'default' otherlv_7= ':' ( (lv_defaultExpr_8_0= ruleOrExpression ) ) otherlv_9= '}' )
+            // InternalExpression.g:560:3: otherlv_0= 'switch' (otherlv_1= '(' ( (lv_switchExpr_2_0= ruleOrExpression ) ) otherlv_3= ')' )? otherlv_4= '{' ( (lv_case_5_0= ruleCase ) )* otherlv_6= 'default' otherlv_7= ':' ( (lv_defaultExpr_8_0= ruleOrExpression ) ) otherlv_9= '}'
             {
-            otherlv_0=(Token)match(input,22,FOLLOW_22_in_ruleSwitchExpression1219); if (state.failed) return current;
+            otherlv_0=(Token)match(input,22,FOLLOW_13); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getSwitchExpressionAccess().getSwitchKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:564:1: (otherlv_1= '(' ( (lv_switchExpr_2_0= ruleOrExpression ) ) otherlv_3= ')' )?
+            // InternalExpression.g:564:1: (otherlv_1= '(' ( (lv_switchExpr_2_0= ruleOrExpression ) ) otherlv_3= ')' )?
             int alt6=2;
             int LA6_0 = input.LA(1);
 
@@ -1559,26 +1559,26 @@ public final EObject ruleSwitchExpression() throws RecognitionException {
             }
             switch (alt6) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:564:3: otherlv_1= '(' ( (lv_switchExpr_2_0= ruleOrExpression ) ) otherlv_3= ')'
+                    // InternalExpression.g:564:3: otherlv_1= '(' ( (lv_switchExpr_2_0= ruleOrExpression ) ) otherlv_3= ')'
                     {
-                    otherlv_1=(Token)match(input,15,FOLLOW_15_in_ruleSwitchExpression1232); if (state.failed) return current;
+                    otherlv_1=(Token)match(input,15,FOLLOW_14); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_1, grammarAccess.getSwitchExpressionAccess().getLeftParenthesisKeyword_1_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:568:1: ( (lv_switchExpr_2_0= ruleOrExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:569:1: (lv_switchExpr_2_0= ruleOrExpression )
+                    // InternalExpression.g:568:1: ( (lv_switchExpr_2_0= ruleOrExpression ) )
+                    // InternalExpression.g:569:1: (lv_switchExpr_2_0= ruleOrExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:569:1: (lv_switchExpr_2_0= ruleOrExpression )
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:570:3: lv_switchExpr_2_0= ruleOrExpression
+                    // InternalExpression.g:569:1: (lv_switchExpr_2_0= ruleOrExpression )
+                    // InternalExpression.g:570:3: lv_switchExpr_2_0= ruleOrExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getSwitchExpressionAccess().getSwitchExprOrExpressionParserRuleCall_1_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleOrExpression_in_ruleSwitchExpression1253);
+                    pushFollow(FOLLOW_8);
                     lv_switchExpr_2_0=ruleOrExpression();
 
                     state._fsp--;
@@ -1592,7 +1592,7 @@ public final EObject ruleSwitchExpression() throws RecognitionException {
                              			current, 
                              			"switchExpr",
                               		lv_switchExpr_2_0, 
-                              		"OrExpression");
+                              		"com.avaloq.tools.ddk.xtext.expression.Expression.OrExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -1602,7 +1602,7 @@ public final EObject ruleSwitchExpression() throws RecognitionException {
 
                     }
 
-                    otherlv_3=(Token)match(input,16,FOLLOW_16_in_ruleSwitchExpression1265); if (state.failed) return current;
+                    otherlv_3=(Token)match(input,16,FOLLOW_15); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_3, grammarAccess.getSwitchExpressionAccess().getRightParenthesisKeyword_1_2());
@@ -1614,13 +1614,13 @@ public final EObject ruleSwitchExpression() throws RecognitionException {
 
             }
 
-            otherlv_4=(Token)match(input,23,FOLLOW_23_in_ruleSwitchExpression1279); if (state.failed) return current;
+            otherlv_4=(Token)match(input,23,FOLLOW_16); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_4, grammarAccess.getSwitchExpressionAccess().getLeftCurlyBracketKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:594:1: ( (lv_case_5_0= ruleCase ) )*
+            // InternalExpression.g:594:1: ( (lv_case_5_0= ruleCase ) )*
             loop7:
             do {
                 int alt7=2;
@@ -1633,17 +1633,17 @@ public final EObject ruleSwitchExpression() throws RecognitionException {
 
                 switch (alt7) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:595:1: (lv_case_5_0= ruleCase )
+            	    // InternalExpression.g:595:1: (lv_case_5_0= ruleCase )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:595:1: (lv_case_5_0= ruleCase )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:596:3: lv_case_5_0= ruleCase
+            	    // InternalExpression.g:595:1: (lv_case_5_0= ruleCase )
+            	    // InternalExpression.g:596:3: lv_case_5_0= ruleCase
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getSwitchExpressionAccess().getCaseCaseParserRuleCall_3_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleCase_in_ruleSwitchExpression1300);
+            	    pushFollow(FOLLOW_16);
             	    lv_case_5_0=ruleCase();
 
             	    state._fsp--;
@@ -1657,7 +1657,7 @@ public final EObject ruleSwitchExpression() throws RecognitionException {
             	             			current, 
             	             			"case",
             	              		lv_case_5_0, 
-            	              		"Case");
+            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.Case");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -1673,30 +1673,30 @@ public final EObject ruleSwitchExpression() throws RecognitionException {
                 }
             } while (true);
 
-            otherlv_6=(Token)match(input,24,FOLLOW_24_in_ruleSwitchExpression1313); if (state.failed) return current;
+            otherlv_6=(Token)match(input,24,FOLLOW_6); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_6, grammarAccess.getSwitchExpressionAccess().getDefaultKeyword_4());
                   
             }
-            otherlv_7=(Token)match(input,14,FOLLOW_14_in_ruleSwitchExpression1325); if (state.failed) return current;
+            otherlv_7=(Token)match(input,14,FOLLOW_14); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_7, grammarAccess.getSwitchExpressionAccess().getColonKeyword_5());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:620:1: ( (lv_defaultExpr_8_0= ruleOrExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:621:1: (lv_defaultExpr_8_0= ruleOrExpression )
+            // InternalExpression.g:620:1: ( (lv_defaultExpr_8_0= ruleOrExpression ) )
+            // InternalExpression.g:621:1: (lv_defaultExpr_8_0= ruleOrExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:621:1: (lv_defaultExpr_8_0= ruleOrExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:622:3: lv_defaultExpr_8_0= ruleOrExpression
+            // InternalExpression.g:621:1: (lv_defaultExpr_8_0= ruleOrExpression )
+            // InternalExpression.g:622:3: lv_defaultExpr_8_0= ruleOrExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getSwitchExpressionAccess().getDefaultExprOrExpressionParserRuleCall_6_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleOrExpression_in_ruleSwitchExpression1346);
+            pushFollow(FOLLOW_17);
             lv_defaultExpr_8_0=ruleOrExpression();
 
             state._fsp--;
@@ -1710,7 +1710,7 @@ public final EObject ruleSwitchExpression() throws RecognitionException {
                      			current, 
                      			"defaultExpr",
                       		lv_defaultExpr_8_0, 
-                      		"OrExpression");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.OrExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -1720,7 +1720,7 @@ public final EObject ruleSwitchExpression() throws RecognitionException {
 
             }
 
-            otherlv_9=(Token)match(input,25,FOLLOW_25_in_ruleSwitchExpression1358); if (state.failed) return current;
+            otherlv_9=(Token)match(input,25,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_9, grammarAccess.getSwitchExpressionAccess().getRightCurlyBracketKeyword_7());
@@ -1749,7 +1749,7 @@ public final EObject ruleSwitchExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleCase"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:650:1: entryRuleCase returns [EObject current=null] : iv_ruleCase= ruleCase EOF ;
+    // InternalExpression.g:650:1: entryRuleCase returns [EObject current=null] : iv_ruleCase= ruleCase EOF ;
     public final EObject entryRuleCase() throws RecognitionException {
         EObject current = null;
 
@@ -1757,13 +1757,13 @@ public final EObject entryRuleCase() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:651:2: (iv_ruleCase= ruleCase EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:652:2: iv_ruleCase= ruleCase EOF
+            // InternalExpression.g:651:2: (iv_ruleCase= ruleCase EOF )
+            // InternalExpression.g:652:2: iv_ruleCase= ruleCase EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getCaseRule()); 
             }
-            pushFollow(FOLLOW_ruleCase_in_entryRuleCase1394);
+            pushFollow(FOLLOW_1);
             iv_ruleCase=ruleCase();
 
             state._fsp--;
@@ -1771,7 +1771,7 @@ public final EObject entryRuleCase() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleCase; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleCase1404); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -1789,7 +1789,7 @@ public final EObject entryRuleCase() throws RecognitionException {
 
 
     // $ANTLR start "ruleCase"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:659:1: ruleCase returns [EObject current=null] : (otherlv_0= 'case' ( (lv_condition_1_0= ruleOrExpression ) ) otherlv_2= ':' ( (lv_thenPar_3_0= ruleOrExpression ) ) ) ;
+    // InternalExpression.g:659:1: ruleCase returns [EObject current=null] : (otherlv_0= 'case' ( (lv_condition_1_0= ruleOrExpression ) ) otherlv_2= ':' ( (lv_thenPar_3_0= ruleOrExpression ) ) ) ;
     public final EObject ruleCase() throws RecognitionException {
         EObject current = null;
 
@@ -1803,30 +1803,30 @@ public final EObject ruleCase() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:662:28: ( (otherlv_0= 'case' ( (lv_condition_1_0= ruleOrExpression ) ) otherlv_2= ':' ( (lv_thenPar_3_0= ruleOrExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:663:1: (otherlv_0= 'case' ( (lv_condition_1_0= ruleOrExpression ) ) otherlv_2= ':' ( (lv_thenPar_3_0= ruleOrExpression ) ) )
+            // InternalExpression.g:662:28: ( (otherlv_0= 'case' ( (lv_condition_1_0= ruleOrExpression ) ) otherlv_2= ':' ( (lv_thenPar_3_0= ruleOrExpression ) ) ) )
+            // InternalExpression.g:663:1: (otherlv_0= 'case' ( (lv_condition_1_0= ruleOrExpression ) ) otherlv_2= ':' ( (lv_thenPar_3_0= ruleOrExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:663:1: (otherlv_0= 'case' ( (lv_condition_1_0= ruleOrExpression ) ) otherlv_2= ':' ( (lv_thenPar_3_0= ruleOrExpression ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:663:3: otherlv_0= 'case' ( (lv_condition_1_0= ruleOrExpression ) ) otherlv_2= ':' ( (lv_thenPar_3_0= ruleOrExpression ) )
+            // InternalExpression.g:663:1: (otherlv_0= 'case' ( (lv_condition_1_0= ruleOrExpression ) ) otherlv_2= ':' ( (lv_thenPar_3_0= ruleOrExpression ) ) )
+            // InternalExpression.g:663:3: otherlv_0= 'case' ( (lv_condition_1_0= ruleOrExpression ) ) otherlv_2= ':' ( (lv_thenPar_3_0= ruleOrExpression ) )
             {
-            otherlv_0=(Token)match(input,26,FOLLOW_26_in_ruleCase1441); if (state.failed) return current;
+            otherlv_0=(Token)match(input,26,FOLLOW_14); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getCaseAccess().getCaseKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:667:1: ( (lv_condition_1_0= ruleOrExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:668:1: (lv_condition_1_0= ruleOrExpression )
+            // InternalExpression.g:667:1: ( (lv_condition_1_0= ruleOrExpression ) )
+            // InternalExpression.g:668:1: (lv_condition_1_0= ruleOrExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:668:1: (lv_condition_1_0= ruleOrExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:669:3: lv_condition_1_0= ruleOrExpression
+            // InternalExpression.g:668:1: (lv_condition_1_0= ruleOrExpression )
+            // InternalExpression.g:669:3: lv_condition_1_0= ruleOrExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getCaseAccess().getConditionOrExpressionParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleOrExpression_in_ruleCase1462);
+            pushFollow(FOLLOW_6);
             lv_condition_1_0=ruleOrExpression();
 
             state._fsp--;
@@ -1840,7 +1840,7 @@ public final EObject ruleCase() throws RecognitionException {
                      			current, 
                      			"condition",
                       		lv_condition_1_0, 
-                      		"OrExpression");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.OrExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -1850,24 +1850,24 @@ public final EObject ruleCase() throws RecognitionException {
 
             }
 
-            otherlv_2=(Token)match(input,14,FOLLOW_14_in_ruleCase1474); if (state.failed) return current;
+            otherlv_2=(Token)match(input,14,FOLLOW_14); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getCaseAccess().getColonKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:689:1: ( (lv_thenPar_3_0= ruleOrExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:690:1: (lv_thenPar_3_0= ruleOrExpression )
+            // InternalExpression.g:689:1: ( (lv_thenPar_3_0= ruleOrExpression ) )
+            // InternalExpression.g:690:1: (lv_thenPar_3_0= ruleOrExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:690:1: (lv_thenPar_3_0= ruleOrExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:691:3: lv_thenPar_3_0= ruleOrExpression
+            // InternalExpression.g:690:1: (lv_thenPar_3_0= ruleOrExpression )
+            // InternalExpression.g:691:3: lv_thenPar_3_0= ruleOrExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getCaseAccess().getThenParOrExpressionParserRuleCall_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleOrExpression_in_ruleCase1495);
+            pushFollow(FOLLOW_2);
             lv_thenPar_3_0=ruleOrExpression();
 
             state._fsp--;
@@ -1881,7 +1881,7 @@ public final EObject ruleCase() throws RecognitionException {
                      			current, 
                      			"thenPar",
                       		lv_thenPar_3_0, 
-                      		"OrExpression");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.OrExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -1914,7 +1914,7 @@ public final EObject ruleCase() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOrExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:715:1: entryRuleOrExpression returns [EObject current=null] : iv_ruleOrExpression= ruleOrExpression EOF ;
+    // InternalExpression.g:715:1: entryRuleOrExpression returns [EObject current=null] : iv_ruleOrExpression= ruleOrExpression EOF ;
     public final EObject entryRuleOrExpression() throws RecognitionException {
         EObject current = null;
 
@@ -1922,13 +1922,13 @@ public final EObject entryRuleOrExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:716:2: (iv_ruleOrExpression= ruleOrExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:717:2: iv_ruleOrExpression= ruleOrExpression EOF
+            // InternalExpression.g:716:2: (iv_ruleOrExpression= ruleOrExpression EOF )
+            // InternalExpression.g:717:2: iv_ruleOrExpression= ruleOrExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOrExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleOrExpression_in_entryRuleOrExpression1531);
+            pushFollow(FOLLOW_1);
             iv_ruleOrExpression=ruleOrExpression();
 
             state._fsp--;
@@ -1936,7 +1936,7 @@ public final EObject entryRuleOrExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOrExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOrExpression1541); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -1954,7 +1954,7 @@ public final EObject entryRuleOrExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleOrExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:724:1: ruleOrExpression returns [EObject current=null] : (this_AndExpression_0= ruleAndExpression ( () ( (lv_operator_2_0= '||' ) ) ( (lv_right_3_0= ruleAndExpression ) ) )* ) ;
+    // InternalExpression.g:724:1: ruleOrExpression returns [EObject current=null] : (this_AndExpression_0= ruleAndExpression ( () ( (lv_operator_2_0= '||' ) ) ( (lv_right_3_0= ruleAndExpression ) ) )* ) ;
     public final EObject ruleOrExpression() throws RecognitionException {
         EObject current = null;
 
@@ -1967,18 +1967,18 @@ public final EObject ruleOrExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:727:28: ( (this_AndExpression_0= ruleAndExpression ( () ( (lv_operator_2_0= '||' ) ) ( (lv_right_3_0= ruleAndExpression ) ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:728:1: (this_AndExpression_0= ruleAndExpression ( () ( (lv_operator_2_0= '||' ) ) ( (lv_right_3_0= ruleAndExpression ) ) )* )
+            // InternalExpression.g:727:28: ( (this_AndExpression_0= ruleAndExpression ( () ( (lv_operator_2_0= '||' ) ) ( (lv_right_3_0= ruleAndExpression ) ) )* ) )
+            // InternalExpression.g:728:1: (this_AndExpression_0= ruleAndExpression ( () ( (lv_operator_2_0= '||' ) ) ( (lv_right_3_0= ruleAndExpression ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:728:1: (this_AndExpression_0= ruleAndExpression ( () ( (lv_operator_2_0= '||' ) ) ( (lv_right_3_0= ruleAndExpression ) ) )* )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:729:5: this_AndExpression_0= ruleAndExpression ( () ( (lv_operator_2_0= '||' ) ) ( (lv_right_3_0= ruleAndExpression ) ) )*
+            // InternalExpression.g:728:1: (this_AndExpression_0= ruleAndExpression ( () ( (lv_operator_2_0= '||' ) ) ( (lv_right_3_0= ruleAndExpression ) ) )* )
+            // InternalExpression.g:729:5: this_AndExpression_0= ruleAndExpression ( () ( (lv_operator_2_0= '||' ) ) ( (lv_right_3_0= ruleAndExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getOrExpressionAccess().getAndExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleAndExpression_in_ruleOrExpression1588);
+            pushFollow(FOLLOW_18);
             this_AndExpression_0=ruleAndExpression();
 
             state._fsp--;
@@ -1989,7 +1989,7 @@ public final EObject ruleOrExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:737:1: ( () ( (lv_operator_2_0= '||' ) ) ( (lv_right_3_0= ruleAndExpression ) ) )*
+            // InternalExpression.g:737:1: ( () ( (lv_operator_2_0= '||' ) ) ( (lv_right_3_0= ruleAndExpression ) ) )*
             loop8:
             do {
                 int alt8=2;
@@ -2002,10 +2002,10 @@ public final EObject ruleOrExpression() throws RecognitionException {
 
                 switch (alt8) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:737:2: () ( (lv_operator_2_0= '||' ) ) ( (lv_right_3_0= ruleAndExpression ) )
+            	    // InternalExpression.g:737:2: () ( (lv_operator_2_0= '||' ) ) ( (lv_right_3_0= ruleAndExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:737:2: ()
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:738:5: 
+            	    // InternalExpression.g:737:2: ()
+            	    // InternalExpression.g:738:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -2017,13 +2017,13 @@ public final EObject ruleOrExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:743:2: ( (lv_operator_2_0= '||' ) )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:744:1: (lv_operator_2_0= '||' )
+            	    // InternalExpression.g:743:2: ( (lv_operator_2_0= '||' ) )
+            	    // InternalExpression.g:744:1: (lv_operator_2_0= '||' )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:744:1: (lv_operator_2_0= '||' )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:745:3: lv_operator_2_0= '||'
+            	    // InternalExpression.g:744:1: (lv_operator_2_0= '||' )
+            	    // InternalExpression.g:745:3: lv_operator_2_0= '||'
             	    {
-            	    lv_operator_2_0=(Token)match(input,27,FOLLOW_27_in_ruleOrExpression1615); if (state.failed) return current;
+            	    lv_operator_2_0=(Token)match(input,27,FOLLOW_14); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	              newLeafNode(lv_operator_2_0, grammarAccess.getOrExpressionAccess().getOperatorVerticalLineVerticalLineKeyword_1_1_0());
@@ -2043,18 +2043,18 @@ public final EObject ruleOrExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:758:2: ( (lv_right_3_0= ruleAndExpression ) )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:759:1: (lv_right_3_0= ruleAndExpression )
+            	    // InternalExpression.g:758:2: ( (lv_right_3_0= ruleAndExpression ) )
+            	    // InternalExpression.g:759:1: (lv_right_3_0= ruleAndExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:759:1: (lv_right_3_0= ruleAndExpression )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:760:3: lv_right_3_0= ruleAndExpression
+            	    // InternalExpression.g:759:1: (lv_right_3_0= ruleAndExpression )
+            	    // InternalExpression.g:760:3: lv_right_3_0= ruleAndExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getOrExpressionAccess().getRightAndExpressionParserRuleCall_1_2_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleAndExpression_in_ruleOrExpression1649);
+            	    pushFollow(FOLLOW_18);
             	    lv_right_3_0=ruleAndExpression();
 
             	    state._fsp--;
@@ -2068,7 +2068,7 @@ public final EObject ruleOrExpression() throws RecognitionException {
             	             			current, 
             	             			"right",
             	              		lv_right_3_0, 
-            	              		"AndExpression");
+            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.AndExpression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -2110,7 +2110,7 @@ public final EObject ruleOrExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleAndExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:784:1: entryRuleAndExpression returns [EObject current=null] : iv_ruleAndExpression= ruleAndExpression EOF ;
+    // InternalExpression.g:784:1: entryRuleAndExpression returns [EObject current=null] : iv_ruleAndExpression= ruleAndExpression EOF ;
     public final EObject entryRuleAndExpression() throws RecognitionException {
         EObject current = null;
 
@@ -2118,13 +2118,13 @@ public final EObject entryRuleAndExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:785:2: (iv_ruleAndExpression= ruleAndExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:786:2: iv_ruleAndExpression= ruleAndExpression EOF
+            // InternalExpression.g:785:2: (iv_ruleAndExpression= ruleAndExpression EOF )
+            // InternalExpression.g:786:2: iv_ruleAndExpression= ruleAndExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getAndExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleAndExpression_in_entryRuleAndExpression1687);
+            pushFollow(FOLLOW_1);
             iv_ruleAndExpression=ruleAndExpression();
 
             state._fsp--;
@@ -2132,7 +2132,7 @@ public final EObject entryRuleAndExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleAndExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAndExpression1697); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -2150,7 +2150,7 @@ public final EObject entryRuleAndExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleAndExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:793:1: ruleAndExpression returns [EObject current=null] : (this_ImpliesExpression_0= ruleImpliesExpression ( () ( (lv_operator_2_0= '&&' ) ) ( (lv_right_3_0= ruleImpliesExpression ) ) )* ) ;
+    // InternalExpression.g:793:1: ruleAndExpression returns [EObject current=null] : (this_ImpliesExpression_0= ruleImpliesExpression ( () ( (lv_operator_2_0= '&&' ) ) ( (lv_right_3_0= ruleImpliesExpression ) ) )* ) ;
     public final EObject ruleAndExpression() throws RecognitionException {
         EObject current = null;
 
@@ -2163,18 +2163,18 @@ public final EObject ruleAndExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:796:28: ( (this_ImpliesExpression_0= ruleImpliesExpression ( () ( (lv_operator_2_0= '&&' ) ) ( (lv_right_3_0= ruleImpliesExpression ) ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:797:1: (this_ImpliesExpression_0= ruleImpliesExpression ( () ( (lv_operator_2_0= '&&' ) ) ( (lv_right_3_0= ruleImpliesExpression ) ) )* )
+            // InternalExpression.g:796:28: ( (this_ImpliesExpression_0= ruleImpliesExpression ( () ( (lv_operator_2_0= '&&' ) ) ( (lv_right_3_0= ruleImpliesExpression ) ) )* ) )
+            // InternalExpression.g:797:1: (this_ImpliesExpression_0= ruleImpliesExpression ( () ( (lv_operator_2_0= '&&' ) ) ( (lv_right_3_0= ruleImpliesExpression ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:797:1: (this_ImpliesExpression_0= ruleImpliesExpression ( () ( (lv_operator_2_0= '&&' ) ) ( (lv_right_3_0= ruleImpliesExpression ) ) )* )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:798:5: this_ImpliesExpression_0= ruleImpliesExpression ( () ( (lv_operator_2_0= '&&' ) ) ( (lv_right_3_0= ruleImpliesExpression ) ) )*
+            // InternalExpression.g:797:1: (this_ImpliesExpression_0= ruleImpliesExpression ( () ( (lv_operator_2_0= '&&' ) ) ( (lv_right_3_0= ruleImpliesExpression ) ) )* )
+            // InternalExpression.g:798:5: this_ImpliesExpression_0= ruleImpliesExpression ( () ( (lv_operator_2_0= '&&' ) ) ( (lv_right_3_0= ruleImpliesExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getAndExpressionAccess().getImpliesExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleImpliesExpression_in_ruleAndExpression1744);
+            pushFollow(FOLLOW_19);
             this_ImpliesExpression_0=ruleImpliesExpression();
 
             state._fsp--;
@@ -2185,7 +2185,7 @@ public final EObject ruleAndExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:806:1: ( () ( (lv_operator_2_0= '&&' ) ) ( (lv_right_3_0= ruleImpliesExpression ) ) )*
+            // InternalExpression.g:806:1: ( () ( (lv_operator_2_0= '&&' ) ) ( (lv_right_3_0= ruleImpliesExpression ) ) )*
             loop9:
             do {
                 int alt9=2;
@@ -2198,10 +2198,10 @@ public final EObject ruleAndExpression() throws RecognitionException {
 
                 switch (alt9) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:806:2: () ( (lv_operator_2_0= '&&' ) ) ( (lv_right_3_0= ruleImpliesExpression ) )
+            	    // InternalExpression.g:806:2: () ( (lv_operator_2_0= '&&' ) ) ( (lv_right_3_0= ruleImpliesExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:806:2: ()
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:807:5: 
+            	    // InternalExpression.g:806:2: ()
+            	    // InternalExpression.g:807:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -2213,13 +2213,13 @@ public final EObject ruleAndExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:812:2: ( (lv_operator_2_0= '&&' ) )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:813:1: (lv_operator_2_0= '&&' )
+            	    // InternalExpression.g:812:2: ( (lv_operator_2_0= '&&' ) )
+            	    // InternalExpression.g:813:1: (lv_operator_2_0= '&&' )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:813:1: (lv_operator_2_0= '&&' )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:814:3: lv_operator_2_0= '&&'
+            	    // InternalExpression.g:813:1: (lv_operator_2_0= '&&' )
+            	    // InternalExpression.g:814:3: lv_operator_2_0= '&&'
             	    {
-            	    lv_operator_2_0=(Token)match(input,28,FOLLOW_28_in_ruleAndExpression1771); if (state.failed) return current;
+            	    lv_operator_2_0=(Token)match(input,28,FOLLOW_14); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	              newLeafNode(lv_operator_2_0, grammarAccess.getAndExpressionAccess().getOperatorAmpersandAmpersandKeyword_1_1_0());
@@ -2239,18 +2239,18 @@ public final EObject ruleAndExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:827:2: ( (lv_right_3_0= ruleImpliesExpression ) )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:828:1: (lv_right_3_0= ruleImpliesExpression )
+            	    // InternalExpression.g:827:2: ( (lv_right_3_0= ruleImpliesExpression ) )
+            	    // InternalExpression.g:828:1: (lv_right_3_0= ruleImpliesExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:828:1: (lv_right_3_0= ruleImpliesExpression )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:829:3: lv_right_3_0= ruleImpliesExpression
+            	    // InternalExpression.g:828:1: (lv_right_3_0= ruleImpliesExpression )
+            	    // InternalExpression.g:829:3: lv_right_3_0= ruleImpliesExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getAndExpressionAccess().getRightImpliesExpressionParserRuleCall_1_2_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleImpliesExpression_in_ruleAndExpression1805);
+            	    pushFollow(FOLLOW_19);
             	    lv_right_3_0=ruleImpliesExpression();
 
             	    state._fsp--;
@@ -2264,7 +2264,7 @@ public final EObject ruleAndExpression() throws RecognitionException {
             	             			current, 
             	             			"right",
             	              		lv_right_3_0, 
-            	              		"ImpliesExpression");
+            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.ImpliesExpression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -2306,7 +2306,7 @@ public final EObject ruleAndExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleImpliesExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:853:1: entryRuleImpliesExpression returns [EObject current=null] : iv_ruleImpliesExpression= ruleImpliesExpression EOF ;
+    // InternalExpression.g:853:1: entryRuleImpliesExpression returns [EObject current=null] : iv_ruleImpliesExpression= ruleImpliesExpression EOF ;
     public final EObject entryRuleImpliesExpression() throws RecognitionException {
         EObject current = null;
 
@@ -2314,13 +2314,13 @@ public final EObject entryRuleImpliesExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:854:2: (iv_ruleImpliesExpression= ruleImpliesExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:855:2: iv_ruleImpliesExpression= ruleImpliesExpression EOF
+            // InternalExpression.g:854:2: (iv_ruleImpliesExpression= ruleImpliesExpression EOF )
+            // InternalExpression.g:855:2: iv_ruleImpliesExpression= ruleImpliesExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getImpliesExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleImpliesExpression_in_entryRuleImpliesExpression1843);
+            pushFollow(FOLLOW_1);
             iv_ruleImpliesExpression=ruleImpliesExpression();
 
             state._fsp--;
@@ -2328,7 +2328,7 @@ public final EObject entryRuleImpliesExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleImpliesExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleImpliesExpression1853); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -2346,7 +2346,7 @@ public final EObject entryRuleImpliesExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleImpliesExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:862:1: ruleImpliesExpression returns [EObject current=null] : (this_RelationalExpression_0= ruleRelationalExpression ( () ( (lv_operator_2_0= 'implies' ) ) ( (lv_right_3_0= ruleRelationalExpression ) ) )* ) ;
+    // InternalExpression.g:862:1: ruleImpliesExpression returns [EObject current=null] : (this_RelationalExpression_0= ruleRelationalExpression ( () ( (lv_operator_2_0= 'implies' ) ) ( (lv_right_3_0= ruleRelationalExpression ) ) )* ) ;
     public final EObject ruleImpliesExpression() throws RecognitionException {
         EObject current = null;
 
@@ -2359,18 +2359,18 @@ public final EObject ruleImpliesExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:865:28: ( (this_RelationalExpression_0= ruleRelationalExpression ( () ( (lv_operator_2_0= 'implies' ) ) ( (lv_right_3_0= ruleRelationalExpression ) ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:866:1: (this_RelationalExpression_0= ruleRelationalExpression ( () ( (lv_operator_2_0= 'implies' ) ) ( (lv_right_3_0= ruleRelationalExpression ) ) )* )
+            // InternalExpression.g:865:28: ( (this_RelationalExpression_0= ruleRelationalExpression ( () ( (lv_operator_2_0= 'implies' ) ) ( (lv_right_3_0= ruleRelationalExpression ) ) )* ) )
+            // InternalExpression.g:866:1: (this_RelationalExpression_0= ruleRelationalExpression ( () ( (lv_operator_2_0= 'implies' ) ) ( (lv_right_3_0= ruleRelationalExpression ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:866:1: (this_RelationalExpression_0= ruleRelationalExpression ( () ( (lv_operator_2_0= 'implies' ) ) ( (lv_right_3_0= ruleRelationalExpression ) ) )* )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:867:5: this_RelationalExpression_0= ruleRelationalExpression ( () ( (lv_operator_2_0= 'implies' ) ) ( (lv_right_3_0= ruleRelationalExpression ) ) )*
+            // InternalExpression.g:866:1: (this_RelationalExpression_0= ruleRelationalExpression ( () ( (lv_operator_2_0= 'implies' ) ) ( (lv_right_3_0= ruleRelationalExpression ) ) )* )
+            // InternalExpression.g:867:5: this_RelationalExpression_0= ruleRelationalExpression ( () ( (lv_operator_2_0= 'implies' ) ) ( (lv_right_3_0= ruleRelationalExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getImpliesExpressionAccess().getRelationalExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleRelationalExpression_in_ruleImpliesExpression1900);
+            pushFollow(FOLLOW_20);
             this_RelationalExpression_0=ruleRelationalExpression();
 
             state._fsp--;
@@ -2381,7 +2381,7 @@ public final EObject ruleImpliesExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:875:1: ( () ( (lv_operator_2_0= 'implies' ) ) ( (lv_right_3_0= ruleRelationalExpression ) ) )*
+            // InternalExpression.g:875:1: ( () ( (lv_operator_2_0= 'implies' ) ) ( (lv_right_3_0= ruleRelationalExpression ) ) )*
             loop10:
             do {
                 int alt10=2;
@@ -2394,10 +2394,10 @@ public final EObject ruleImpliesExpression() throws RecognitionException {
 
                 switch (alt10) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:875:2: () ( (lv_operator_2_0= 'implies' ) ) ( (lv_right_3_0= ruleRelationalExpression ) )
+            	    // InternalExpression.g:875:2: () ( (lv_operator_2_0= 'implies' ) ) ( (lv_right_3_0= ruleRelationalExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:875:2: ()
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:876:5: 
+            	    // InternalExpression.g:875:2: ()
+            	    // InternalExpression.g:876:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -2409,13 +2409,13 @@ public final EObject ruleImpliesExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:881:2: ( (lv_operator_2_0= 'implies' ) )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:882:1: (lv_operator_2_0= 'implies' )
+            	    // InternalExpression.g:881:2: ( (lv_operator_2_0= 'implies' ) )
+            	    // InternalExpression.g:882:1: (lv_operator_2_0= 'implies' )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:882:1: (lv_operator_2_0= 'implies' )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:883:3: lv_operator_2_0= 'implies'
+            	    // InternalExpression.g:882:1: (lv_operator_2_0= 'implies' )
+            	    // InternalExpression.g:883:3: lv_operator_2_0= 'implies'
             	    {
-            	    lv_operator_2_0=(Token)match(input,29,FOLLOW_29_in_ruleImpliesExpression1927); if (state.failed) return current;
+            	    lv_operator_2_0=(Token)match(input,29,FOLLOW_14); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	              newLeafNode(lv_operator_2_0, grammarAccess.getImpliesExpressionAccess().getOperatorImpliesKeyword_1_1_0());
@@ -2435,18 +2435,18 @@ public final EObject ruleImpliesExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:896:2: ( (lv_right_3_0= ruleRelationalExpression ) )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:897:1: (lv_right_3_0= ruleRelationalExpression )
+            	    // InternalExpression.g:896:2: ( (lv_right_3_0= ruleRelationalExpression ) )
+            	    // InternalExpression.g:897:1: (lv_right_3_0= ruleRelationalExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:897:1: (lv_right_3_0= ruleRelationalExpression )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:898:3: lv_right_3_0= ruleRelationalExpression
+            	    // InternalExpression.g:897:1: (lv_right_3_0= ruleRelationalExpression )
+            	    // InternalExpression.g:898:3: lv_right_3_0= ruleRelationalExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getImpliesExpressionAccess().getRightRelationalExpressionParserRuleCall_1_2_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleRelationalExpression_in_ruleImpliesExpression1961);
+            	    pushFollow(FOLLOW_20);
             	    lv_right_3_0=ruleRelationalExpression();
 
             	    state._fsp--;
@@ -2460,7 +2460,7 @@ public final EObject ruleImpliesExpression() throws RecognitionException {
             	             			current, 
             	             			"right",
             	              		lv_right_3_0, 
-            	              		"RelationalExpression");
+            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.RelationalExpression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -2502,7 +2502,7 @@ public final EObject ruleImpliesExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleRelationalExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:922:1: entryRuleRelationalExpression returns [EObject current=null] : iv_ruleRelationalExpression= ruleRelationalExpression EOF ;
+    // InternalExpression.g:922:1: entryRuleRelationalExpression returns [EObject current=null] : iv_ruleRelationalExpression= ruleRelationalExpression EOF ;
     public final EObject entryRuleRelationalExpression() throws RecognitionException {
         EObject current = null;
 
@@ -2510,13 +2510,13 @@ public final EObject entryRuleRelationalExpression() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:923:2: (iv_ruleRelationalExpression= ruleRelationalExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:924:2: iv_ruleRelationalExpression= ruleRelationalExpression EOF
+            // InternalExpression.g:923:2: (iv_ruleRelationalExpression= ruleRelationalExpression EOF )
+            // InternalExpression.g:924:2: iv_ruleRelationalExpression= ruleRelationalExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getRelationalExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleRelationalExpression_in_entryRuleRelationalExpression1999);
+            pushFollow(FOLLOW_1);
             iv_ruleRelationalExpression=ruleRelationalExpression();
 
             state._fsp--;
@@ -2524,7 +2524,7 @@ public final EObject entryRuleRelationalExpression() throws RecognitionException
             if ( state.backtracking==0 ) {
                current =iv_ruleRelationalExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRelationalExpression2009); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -2542,7 +2542,7 @@ public final EObject entryRuleRelationalExpression() throws RecognitionException
 
 
     // $ANTLR start "ruleRelationalExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:931:1: ruleRelationalExpression returns [EObject current=null] : (this_AdditiveExpression_0= ruleAdditiveExpression ( () ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) ) ( (lv_right_3_0= ruleAdditiveExpression ) ) )* ) ;
+    // InternalExpression.g:931:1: ruleRelationalExpression returns [EObject current=null] : (this_AdditiveExpression_0= ruleAdditiveExpression ( () ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) ) ( (lv_right_3_0= ruleAdditiveExpression ) ) )* ) ;
     public final EObject ruleRelationalExpression() throws RecognitionException {
         EObject current = null;
 
@@ -2560,18 +2560,18 @@ public final EObject ruleRelationalExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:934:28: ( (this_AdditiveExpression_0= ruleAdditiveExpression ( () ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) ) ( (lv_right_3_0= ruleAdditiveExpression ) ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:935:1: (this_AdditiveExpression_0= ruleAdditiveExpression ( () ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) ) ( (lv_right_3_0= ruleAdditiveExpression ) ) )* )
+            // InternalExpression.g:934:28: ( (this_AdditiveExpression_0= ruleAdditiveExpression ( () ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) ) ( (lv_right_3_0= ruleAdditiveExpression ) ) )* ) )
+            // InternalExpression.g:935:1: (this_AdditiveExpression_0= ruleAdditiveExpression ( () ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) ) ( (lv_right_3_0= ruleAdditiveExpression ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:935:1: (this_AdditiveExpression_0= ruleAdditiveExpression ( () ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) ) ( (lv_right_3_0= ruleAdditiveExpression ) ) )* )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:936:5: this_AdditiveExpression_0= ruleAdditiveExpression ( () ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) ) ( (lv_right_3_0= ruleAdditiveExpression ) ) )*
+            // InternalExpression.g:935:1: (this_AdditiveExpression_0= ruleAdditiveExpression ( () ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) ) ( (lv_right_3_0= ruleAdditiveExpression ) ) )* )
+            // InternalExpression.g:936:5: this_AdditiveExpression_0= ruleAdditiveExpression ( () ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) ) ( (lv_right_3_0= ruleAdditiveExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getRelationalExpressionAccess().getAdditiveExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleAdditiveExpression_in_ruleRelationalExpression2056);
+            pushFollow(FOLLOW_21);
             this_AdditiveExpression_0=ruleAdditiveExpression();
 
             state._fsp--;
@@ -2582,7 +2582,7 @@ public final EObject ruleRelationalExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:944:1: ( () ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) ) ( (lv_right_3_0= ruleAdditiveExpression ) ) )*
+            // InternalExpression.g:944:1: ( () ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) ) ( (lv_right_3_0= ruleAdditiveExpression ) ) )*
             loop12:
             do {
                 int alt12=2;
@@ -2595,10 +2595,10 @@ public final EObject ruleRelationalExpression() throws RecognitionException {
 
                 switch (alt12) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:944:2: () ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) ) ( (lv_right_3_0= ruleAdditiveExpression ) )
+            	    // InternalExpression.g:944:2: () ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) ) ( (lv_right_3_0= ruleAdditiveExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:944:2: ()
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:945:5: 
+            	    // InternalExpression.g:944:2: ()
+            	    // InternalExpression.g:945:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -2610,13 +2610,13 @@ public final EObject ruleRelationalExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:950:2: ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:951:1: ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) )
+            	    // InternalExpression.g:950:2: ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) )
+            	    // InternalExpression.g:951:1: ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:951:1: ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:952:1: (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' )
+            	    // InternalExpression.g:951:1: ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) )
+            	    // InternalExpression.g:952:1: (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:952:1: (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' )
+            	    // InternalExpression.g:952:1: (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' )
             	    int alt11=6;
             	    switch ( input.LA(1) ) {
             	    case 30:
@@ -2659,9 +2659,9 @@ public final EObject ruleRelationalExpression() throws RecognitionException {
 
             	    switch (alt11) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:953:3: lv_operator_2_1= '=='
+            	            // InternalExpression.g:953:3: lv_operator_2_1= '=='
             	            {
-            	            lv_operator_2_1=(Token)match(input,30,FOLLOW_30_in_ruleRelationalExpression2085); if (state.failed) return current;
+            	            lv_operator_2_1=(Token)match(input,30,FOLLOW_14); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_operator_2_1, grammarAccess.getRelationalExpressionAccess().getOperatorEqualsSignEqualsSignKeyword_1_1_0_0());
@@ -2679,9 +2679,9 @@ public final EObject ruleRelationalExpression() throws RecognitionException {
             	            }
             	            break;
             	        case 2 :
-            	            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:965:8: lv_operator_2_2= '!='
+            	            // InternalExpression.g:965:8: lv_operator_2_2= '!='
             	            {
-            	            lv_operator_2_2=(Token)match(input,31,FOLLOW_31_in_ruleRelationalExpression2114); if (state.failed) return current;
+            	            lv_operator_2_2=(Token)match(input,31,FOLLOW_14); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_operator_2_2, grammarAccess.getRelationalExpressionAccess().getOperatorExclamationMarkEqualsSignKeyword_1_1_0_1());
@@ -2699,9 +2699,9 @@ public final EObject ruleRelationalExpression() throws RecognitionException {
             	            }
             	            break;
             	        case 3 :
-            	            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:977:8: lv_operator_2_3= '>='
+            	            // InternalExpression.g:977:8: lv_operator_2_3= '>='
             	            {
-            	            lv_operator_2_3=(Token)match(input,32,FOLLOW_32_in_ruleRelationalExpression2143); if (state.failed) return current;
+            	            lv_operator_2_3=(Token)match(input,32,FOLLOW_14); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_operator_2_3, grammarAccess.getRelationalExpressionAccess().getOperatorGreaterThanSignEqualsSignKeyword_1_1_0_2());
@@ -2719,9 +2719,9 @@ public final EObject ruleRelationalExpression() throws RecognitionException {
             	            }
             	            break;
             	        case 4 :
-            	            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:989:8: lv_operator_2_4= '<='
+            	            // InternalExpression.g:989:8: lv_operator_2_4= '<='
             	            {
-            	            lv_operator_2_4=(Token)match(input,33,FOLLOW_33_in_ruleRelationalExpression2172); if (state.failed) return current;
+            	            lv_operator_2_4=(Token)match(input,33,FOLLOW_14); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_operator_2_4, grammarAccess.getRelationalExpressionAccess().getOperatorLessThanSignEqualsSignKeyword_1_1_0_3());
@@ -2739,9 +2739,9 @@ public final EObject ruleRelationalExpression() throws RecognitionException {
             	            }
             	            break;
             	        case 5 :
-            	            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1001:8: lv_operator_2_5= '>'
+            	            // InternalExpression.g:1001:8: lv_operator_2_5= '>'
             	            {
-            	            lv_operator_2_5=(Token)match(input,34,FOLLOW_34_in_ruleRelationalExpression2201); if (state.failed) return current;
+            	            lv_operator_2_5=(Token)match(input,34,FOLLOW_14); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_operator_2_5, grammarAccess.getRelationalExpressionAccess().getOperatorGreaterThanSignKeyword_1_1_0_4());
@@ -2759,9 +2759,9 @@ public final EObject ruleRelationalExpression() throws RecognitionException {
             	            }
             	            break;
             	        case 6 :
-            	            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1013:8: lv_operator_2_6= '<'
+            	            // InternalExpression.g:1013:8: lv_operator_2_6= '<'
             	            {
-            	            lv_operator_2_6=(Token)match(input,35,FOLLOW_35_in_ruleRelationalExpression2230); if (state.failed) return current;
+            	            lv_operator_2_6=(Token)match(input,35,FOLLOW_14); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_operator_2_6, grammarAccess.getRelationalExpressionAccess().getOperatorLessThanSignKeyword_1_1_0_5());
@@ -2787,18 +2787,18 @@ public final EObject ruleRelationalExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1028:2: ( (lv_right_3_0= ruleAdditiveExpression ) )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1029:1: (lv_right_3_0= ruleAdditiveExpression )
+            	    // InternalExpression.g:1028:2: ( (lv_right_3_0= ruleAdditiveExpression ) )
+            	    // InternalExpression.g:1029:1: (lv_right_3_0= ruleAdditiveExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1029:1: (lv_right_3_0= ruleAdditiveExpression )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1030:3: lv_right_3_0= ruleAdditiveExpression
+            	    // InternalExpression.g:1029:1: (lv_right_3_0= ruleAdditiveExpression )
+            	    // InternalExpression.g:1030:3: lv_right_3_0= ruleAdditiveExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getRelationalExpressionAccess().getRightAdditiveExpressionParserRuleCall_1_2_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleAdditiveExpression_in_ruleRelationalExpression2267);
+            	    pushFollow(FOLLOW_21);
             	    lv_right_3_0=ruleAdditiveExpression();
 
             	    state._fsp--;
@@ -2812,7 +2812,7 @@ public final EObject ruleRelationalExpression() throws RecognitionException {
             	             			current, 
             	             			"right",
             	              		lv_right_3_0, 
-            	              		"AdditiveExpression");
+            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.AdditiveExpression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -2854,7 +2854,7 @@ public final EObject ruleRelationalExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleAdditiveExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1054:1: entryRuleAdditiveExpression returns [EObject current=null] : iv_ruleAdditiveExpression= ruleAdditiveExpression EOF ;
+    // InternalExpression.g:1054:1: entryRuleAdditiveExpression returns [EObject current=null] : iv_ruleAdditiveExpression= ruleAdditiveExpression EOF ;
     public final EObject entryRuleAdditiveExpression() throws RecognitionException {
         EObject current = null;
 
@@ -2862,13 +2862,13 @@ public final EObject entryRuleAdditiveExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1055:2: (iv_ruleAdditiveExpression= ruleAdditiveExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1056:2: iv_ruleAdditiveExpression= ruleAdditiveExpression EOF
+            // InternalExpression.g:1055:2: (iv_ruleAdditiveExpression= ruleAdditiveExpression EOF )
+            // InternalExpression.g:1056:2: iv_ruleAdditiveExpression= ruleAdditiveExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getAdditiveExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleAdditiveExpression_in_entryRuleAdditiveExpression2305);
+            pushFollow(FOLLOW_1);
             iv_ruleAdditiveExpression=ruleAdditiveExpression();
 
             state._fsp--;
@@ -2876,7 +2876,7 @@ public final EObject entryRuleAdditiveExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleAdditiveExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAdditiveExpression2315); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -2894,7 +2894,7 @@ public final EObject entryRuleAdditiveExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleAdditiveExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1063:1: ruleAdditiveExpression returns [EObject current=null] : (this_MultiplicativeExpression_0= ruleMultiplicativeExpression ( () ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) ) ( (lv_params_3_0= ruleMultiplicativeExpression ) ) )* ) ;
+    // InternalExpression.g:1063:1: ruleAdditiveExpression returns [EObject current=null] : (this_MultiplicativeExpression_0= ruleMultiplicativeExpression ( () ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) ) ( (lv_params_3_0= ruleMultiplicativeExpression ) ) )* ) ;
     public final EObject ruleAdditiveExpression() throws RecognitionException {
         EObject current = null;
 
@@ -2908,18 +2908,18 @@ public final EObject ruleAdditiveExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1066:28: ( (this_MultiplicativeExpression_0= ruleMultiplicativeExpression ( () ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) ) ( (lv_params_3_0= ruleMultiplicativeExpression ) ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1067:1: (this_MultiplicativeExpression_0= ruleMultiplicativeExpression ( () ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) ) ( (lv_params_3_0= ruleMultiplicativeExpression ) ) )* )
+            // InternalExpression.g:1066:28: ( (this_MultiplicativeExpression_0= ruleMultiplicativeExpression ( () ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) ) ( (lv_params_3_0= ruleMultiplicativeExpression ) ) )* ) )
+            // InternalExpression.g:1067:1: (this_MultiplicativeExpression_0= ruleMultiplicativeExpression ( () ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) ) ( (lv_params_3_0= ruleMultiplicativeExpression ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1067:1: (this_MultiplicativeExpression_0= ruleMultiplicativeExpression ( () ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) ) ( (lv_params_3_0= ruleMultiplicativeExpression ) ) )* )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1068:5: this_MultiplicativeExpression_0= ruleMultiplicativeExpression ( () ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) ) ( (lv_params_3_0= ruleMultiplicativeExpression ) ) )*
+            // InternalExpression.g:1067:1: (this_MultiplicativeExpression_0= ruleMultiplicativeExpression ( () ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) ) ( (lv_params_3_0= ruleMultiplicativeExpression ) ) )* )
+            // InternalExpression.g:1068:5: this_MultiplicativeExpression_0= ruleMultiplicativeExpression ( () ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) ) ( (lv_params_3_0= ruleMultiplicativeExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getAdditiveExpressionAccess().getMultiplicativeExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleMultiplicativeExpression_in_ruleAdditiveExpression2362);
+            pushFollow(FOLLOW_22);
             this_MultiplicativeExpression_0=ruleMultiplicativeExpression();
 
             state._fsp--;
@@ -2930,7 +2930,7 @@ public final EObject ruleAdditiveExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1076:1: ( () ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) ) ( (lv_params_3_0= ruleMultiplicativeExpression ) ) )*
+            // InternalExpression.g:1076:1: ( () ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) ) ( (lv_params_3_0= ruleMultiplicativeExpression ) ) )*
             loop14:
             do {
                 int alt14=2;
@@ -2943,10 +2943,10 @@ public final EObject ruleAdditiveExpression() throws RecognitionException {
 
                 switch (alt14) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1076:2: () ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) ) ( (lv_params_3_0= ruleMultiplicativeExpression ) )
+            	    // InternalExpression.g:1076:2: () ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) ) ( (lv_params_3_0= ruleMultiplicativeExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1076:2: ()
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1077:5: 
+            	    // InternalExpression.g:1076:2: ()
+            	    // InternalExpression.g:1077:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -2958,13 +2958,13 @@ public final EObject ruleAdditiveExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1082:2: ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1083:1: ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) )
+            	    // InternalExpression.g:1082:2: ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) )
+            	    // InternalExpression.g:1083:1: ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1083:1: ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1084:1: (lv_name_2_1= '+' | lv_name_2_2= '-' )
+            	    // InternalExpression.g:1083:1: ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) )
+            	    // InternalExpression.g:1084:1: (lv_name_2_1= '+' | lv_name_2_2= '-' )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1084:1: (lv_name_2_1= '+' | lv_name_2_2= '-' )
+            	    // InternalExpression.g:1084:1: (lv_name_2_1= '+' | lv_name_2_2= '-' )
             	    int alt13=2;
             	    int LA13_0 = input.LA(1);
 
@@ -2983,9 +2983,9 @@ else if ( (LA13_0==37) ) {
             	    }
             	    switch (alt13) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1085:3: lv_name_2_1= '+'
+            	            // InternalExpression.g:1085:3: lv_name_2_1= '+'
             	            {
-            	            lv_name_2_1=(Token)match(input,36,FOLLOW_36_in_ruleAdditiveExpression2391); if (state.failed) return current;
+            	            lv_name_2_1=(Token)match(input,36,FOLLOW_14); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_name_2_1, grammarAccess.getAdditiveExpressionAccess().getNamePlusSignKeyword_1_1_0_0());
@@ -3003,9 +3003,9 @@ else if ( (LA13_0==37) ) {
             	            }
             	            break;
             	        case 2 :
-            	            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1097:8: lv_name_2_2= '-'
+            	            // InternalExpression.g:1097:8: lv_name_2_2= '-'
             	            {
-            	            lv_name_2_2=(Token)match(input,37,FOLLOW_37_in_ruleAdditiveExpression2420); if (state.failed) return current;
+            	            lv_name_2_2=(Token)match(input,37,FOLLOW_14); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_name_2_2, grammarAccess.getAdditiveExpressionAccess().getNameHyphenMinusKeyword_1_1_0_1());
@@ -3031,18 +3031,18 @@ else if ( (LA13_0==37) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1112:2: ( (lv_params_3_0= ruleMultiplicativeExpression ) )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1113:1: (lv_params_3_0= ruleMultiplicativeExpression )
+            	    // InternalExpression.g:1112:2: ( (lv_params_3_0= ruleMultiplicativeExpression ) )
+            	    // InternalExpression.g:1113:1: (lv_params_3_0= ruleMultiplicativeExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1113:1: (lv_params_3_0= ruleMultiplicativeExpression )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1114:3: lv_params_3_0= ruleMultiplicativeExpression
+            	    // InternalExpression.g:1113:1: (lv_params_3_0= ruleMultiplicativeExpression )
+            	    // InternalExpression.g:1114:3: lv_params_3_0= ruleMultiplicativeExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getAdditiveExpressionAccess().getParamsMultiplicativeExpressionParserRuleCall_1_2_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleMultiplicativeExpression_in_ruleAdditiveExpression2457);
+            	    pushFollow(FOLLOW_22);
             	    lv_params_3_0=ruleMultiplicativeExpression();
 
             	    state._fsp--;
@@ -3056,7 +3056,7 @@ else if ( (LA13_0==37) ) {
             	             			current, 
             	             			"params",
             	              		lv_params_3_0, 
-            	              		"MultiplicativeExpression");
+            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.MultiplicativeExpression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -3098,7 +3098,7 @@ else if ( (LA13_0==37) ) {
 
 
     // $ANTLR start "entryRuleMultiplicativeExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1138:1: entryRuleMultiplicativeExpression returns [EObject current=null] : iv_ruleMultiplicativeExpression= ruleMultiplicativeExpression EOF ;
+    // InternalExpression.g:1138:1: entryRuleMultiplicativeExpression returns [EObject current=null] : iv_ruleMultiplicativeExpression= ruleMultiplicativeExpression EOF ;
     public final EObject entryRuleMultiplicativeExpression() throws RecognitionException {
         EObject current = null;
 
@@ -3106,13 +3106,13 @@ public final EObject entryRuleMultiplicativeExpression() throws RecognitionExcep
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1139:2: (iv_ruleMultiplicativeExpression= ruleMultiplicativeExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1140:2: iv_ruleMultiplicativeExpression= ruleMultiplicativeExpression EOF
+            // InternalExpression.g:1139:2: (iv_ruleMultiplicativeExpression= ruleMultiplicativeExpression EOF )
+            // InternalExpression.g:1140:2: iv_ruleMultiplicativeExpression= ruleMultiplicativeExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getMultiplicativeExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleMultiplicativeExpression_in_entryRuleMultiplicativeExpression2495);
+            pushFollow(FOLLOW_1);
             iv_ruleMultiplicativeExpression=ruleMultiplicativeExpression();
 
             state._fsp--;
@@ -3120,7 +3120,7 @@ public final EObject entryRuleMultiplicativeExpression() throws RecognitionExcep
             if ( state.backtracking==0 ) {
                current =iv_ruleMultiplicativeExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleMultiplicativeExpression2505); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -3138,7 +3138,7 @@ public final EObject entryRuleMultiplicativeExpression() throws RecognitionExcep
 
 
     // $ANTLR start "ruleMultiplicativeExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1147:1: ruleMultiplicativeExpression returns [EObject current=null] : (this_UnaryOrInfixExpression_0= ruleUnaryOrInfixExpression ( () ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) ) ( (lv_params_3_0= ruleUnaryOrInfixExpression ) ) )* ) ;
+    // InternalExpression.g:1147:1: ruleMultiplicativeExpression returns [EObject current=null] : (this_UnaryOrInfixExpression_0= ruleUnaryOrInfixExpression ( () ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) ) ( (lv_params_3_0= ruleUnaryOrInfixExpression ) ) )* ) ;
     public final EObject ruleMultiplicativeExpression() throws RecognitionException {
         EObject current = null;
 
@@ -3152,18 +3152,18 @@ public final EObject ruleMultiplicativeExpression() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1150:28: ( (this_UnaryOrInfixExpression_0= ruleUnaryOrInfixExpression ( () ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) ) ( (lv_params_3_0= ruleUnaryOrInfixExpression ) ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1151:1: (this_UnaryOrInfixExpression_0= ruleUnaryOrInfixExpression ( () ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) ) ( (lv_params_3_0= ruleUnaryOrInfixExpression ) ) )* )
+            // InternalExpression.g:1150:28: ( (this_UnaryOrInfixExpression_0= ruleUnaryOrInfixExpression ( () ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) ) ( (lv_params_3_0= ruleUnaryOrInfixExpression ) ) )* ) )
+            // InternalExpression.g:1151:1: (this_UnaryOrInfixExpression_0= ruleUnaryOrInfixExpression ( () ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) ) ( (lv_params_3_0= ruleUnaryOrInfixExpression ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1151:1: (this_UnaryOrInfixExpression_0= ruleUnaryOrInfixExpression ( () ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) ) ( (lv_params_3_0= ruleUnaryOrInfixExpression ) ) )* )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1152:5: this_UnaryOrInfixExpression_0= ruleUnaryOrInfixExpression ( () ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) ) ( (lv_params_3_0= ruleUnaryOrInfixExpression ) ) )*
+            // InternalExpression.g:1151:1: (this_UnaryOrInfixExpression_0= ruleUnaryOrInfixExpression ( () ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) ) ( (lv_params_3_0= ruleUnaryOrInfixExpression ) ) )* )
+            // InternalExpression.g:1152:5: this_UnaryOrInfixExpression_0= ruleUnaryOrInfixExpression ( () ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) ) ( (lv_params_3_0= ruleUnaryOrInfixExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getMultiplicativeExpressionAccess().getUnaryOrInfixExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleUnaryOrInfixExpression_in_ruleMultiplicativeExpression2552);
+            pushFollow(FOLLOW_23);
             this_UnaryOrInfixExpression_0=ruleUnaryOrInfixExpression();
 
             state._fsp--;
@@ -3174,7 +3174,7 @@ public final EObject ruleMultiplicativeExpression() throws RecognitionException
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1160:1: ( () ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) ) ( (lv_params_3_0= ruleUnaryOrInfixExpression ) ) )*
+            // InternalExpression.g:1160:1: ( () ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) ) ( (lv_params_3_0= ruleUnaryOrInfixExpression ) ) )*
             loop16:
             do {
                 int alt16=2;
@@ -3187,10 +3187,10 @@ public final EObject ruleMultiplicativeExpression() throws RecognitionException
 
                 switch (alt16) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1160:2: () ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) ) ( (lv_params_3_0= ruleUnaryOrInfixExpression ) )
+            	    // InternalExpression.g:1160:2: () ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) ) ( (lv_params_3_0= ruleUnaryOrInfixExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1160:2: ()
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1161:5: 
+            	    // InternalExpression.g:1160:2: ()
+            	    // InternalExpression.g:1161:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -3202,13 +3202,13 @@ public final EObject ruleMultiplicativeExpression() throws RecognitionException
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1166:2: ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1167:1: ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) )
+            	    // InternalExpression.g:1166:2: ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) )
+            	    // InternalExpression.g:1167:1: ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1167:1: ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1168:1: (lv_name_2_1= '*' | lv_name_2_2= '/' )
+            	    // InternalExpression.g:1167:1: ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) )
+            	    // InternalExpression.g:1168:1: (lv_name_2_1= '*' | lv_name_2_2= '/' )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1168:1: (lv_name_2_1= '*' | lv_name_2_2= '/' )
+            	    // InternalExpression.g:1168:1: (lv_name_2_1= '*' | lv_name_2_2= '/' )
             	    int alt15=2;
             	    int LA15_0 = input.LA(1);
 
@@ -3227,9 +3227,9 @@ else if ( (LA15_0==39) ) {
             	    }
             	    switch (alt15) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1169:3: lv_name_2_1= '*'
+            	            // InternalExpression.g:1169:3: lv_name_2_1= '*'
             	            {
-            	            lv_name_2_1=(Token)match(input,38,FOLLOW_38_in_ruleMultiplicativeExpression2581); if (state.failed) return current;
+            	            lv_name_2_1=(Token)match(input,38,FOLLOW_14); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_name_2_1, grammarAccess.getMultiplicativeExpressionAccess().getNameAsteriskKeyword_1_1_0_0());
@@ -3247,9 +3247,9 @@ else if ( (LA15_0==39) ) {
             	            }
             	            break;
             	        case 2 :
-            	            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1181:8: lv_name_2_2= '/'
+            	            // InternalExpression.g:1181:8: lv_name_2_2= '/'
             	            {
-            	            lv_name_2_2=(Token)match(input,39,FOLLOW_39_in_ruleMultiplicativeExpression2610); if (state.failed) return current;
+            	            lv_name_2_2=(Token)match(input,39,FOLLOW_14); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_name_2_2, grammarAccess.getMultiplicativeExpressionAccess().getNameSolidusKeyword_1_1_0_1());
@@ -3275,18 +3275,18 @@ else if ( (LA15_0==39) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1196:2: ( (lv_params_3_0= ruleUnaryOrInfixExpression ) )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1197:1: (lv_params_3_0= ruleUnaryOrInfixExpression )
+            	    // InternalExpression.g:1196:2: ( (lv_params_3_0= ruleUnaryOrInfixExpression ) )
+            	    // InternalExpression.g:1197:1: (lv_params_3_0= ruleUnaryOrInfixExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1197:1: (lv_params_3_0= ruleUnaryOrInfixExpression )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1198:3: lv_params_3_0= ruleUnaryOrInfixExpression
+            	    // InternalExpression.g:1197:1: (lv_params_3_0= ruleUnaryOrInfixExpression )
+            	    // InternalExpression.g:1198:3: lv_params_3_0= ruleUnaryOrInfixExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getMultiplicativeExpressionAccess().getParamsUnaryOrInfixExpressionParserRuleCall_1_2_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleUnaryOrInfixExpression_in_ruleMultiplicativeExpression2647);
+            	    pushFollow(FOLLOW_23);
             	    lv_params_3_0=ruleUnaryOrInfixExpression();
 
             	    state._fsp--;
@@ -3300,7 +3300,7 @@ else if ( (LA15_0==39) ) {
             	             			current, 
             	             			"params",
             	              		lv_params_3_0, 
-            	              		"UnaryOrInfixExpression");
+            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.UnaryOrInfixExpression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -3342,7 +3342,7 @@ else if ( (LA15_0==39) ) {
 
 
     // $ANTLR start "entryRuleUnaryOrInfixExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1222:1: entryRuleUnaryOrInfixExpression returns [EObject current=null] : iv_ruleUnaryOrInfixExpression= ruleUnaryOrInfixExpression EOF ;
+    // InternalExpression.g:1222:1: entryRuleUnaryOrInfixExpression returns [EObject current=null] : iv_ruleUnaryOrInfixExpression= ruleUnaryOrInfixExpression EOF ;
     public final EObject entryRuleUnaryOrInfixExpression() throws RecognitionException {
         EObject current = null;
 
@@ -3350,13 +3350,13 @@ public final EObject entryRuleUnaryOrInfixExpression() throws RecognitionExcepti
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1223:2: (iv_ruleUnaryOrInfixExpression= ruleUnaryOrInfixExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1224:2: iv_ruleUnaryOrInfixExpression= ruleUnaryOrInfixExpression EOF
+            // InternalExpression.g:1223:2: (iv_ruleUnaryOrInfixExpression= ruleUnaryOrInfixExpression EOF )
+            // InternalExpression.g:1224:2: iv_ruleUnaryOrInfixExpression= ruleUnaryOrInfixExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getUnaryOrInfixExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleUnaryOrInfixExpression_in_entryRuleUnaryOrInfixExpression2685);
+            pushFollow(FOLLOW_1);
             iv_ruleUnaryOrInfixExpression=ruleUnaryOrInfixExpression();
 
             state._fsp--;
@@ -3364,7 +3364,7 @@ public final EObject entryRuleUnaryOrInfixExpression() throws RecognitionExcepti
             if ( state.backtracking==0 ) {
                current =iv_ruleUnaryOrInfixExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleUnaryOrInfixExpression2695); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -3382,7 +3382,7 @@ public final EObject entryRuleUnaryOrInfixExpression() throws RecognitionExcepti
 
 
     // $ANTLR start "ruleUnaryOrInfixExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1231:1: ruleUnaryOrInfixExpression returns [EObject current=null] : (this_UnaryExpression_0= ruleUnaryExpression | this_InfixExpression_1= ruleInfixExpression ) ;
+    // InternalExpression.g:1231:1: ruleUnaryOrInfixExpression returns [EObject current=null] : (this_UnaryExpression_0= ruleUnaryExpression | this_InfixExpression_1= ruleInfixExpression ) ;
     public final EObject ruleUnaryOrInfixExpression() throws RecognitionException {
         EObject current = null;
 
@@ -3394,10 +3394,10 @@ public final EObject ruleUnaryOrInfixExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1234:28: ( (this_UnaryExpression_0= ruleUnaryExpression | this_InfixExpression_1= ruleInfixExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1235:1: (this_UnaryExpression_0= ruleUnaryExpression | this_InfixExpression_1= ruleInfixExpression )
+            // InternalExpression.g:1234:28: ( (this_UnaryExpression_0= ruleUnaryExpression | this_InfixExpression_1= ruleInfixExpression ) )
+            // InternalExpression.g:1235:1: (this_UnaryExpression_0= ruleUnaryExpression | this_InfixExpression_1= ruleInfixExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1235:1: (this_UnaryExpression_0= ruleUnaryExpression | this_InfixExpression_1= ruleInfixExpression )
+            // InternalExpression.g:1235:1: (this_UnaryExpression_0= ruleUnaryExpression | this_InfixExpression_1= ruleInfixExpression )
             int alt17=2;
             int LA17_0 = input.LA(1);
 
@@ -3416,14 +3416,14 @@ else if ( ((LA17_0>=RULE_INT && LA17_0<=RULE_ID)||LA17_0==15||LA17_0==23||(LA17_
             }
             switch (alt17) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1236:5: this_UnaryExpression_0= ruleUnaryExpression
+                    // InternalExpression.g:1236:5: this_UnaryExpression_0= ruleUnaryExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getUnaryOrInfixExpressionAccess().getUnaryExpressionParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleUnaryExpression_in_ruleUnaryOrInfixExpression2742);
+                    pushFollow(FOLLOW_2);
                     this_UnaryExpression_0=ruleUnaryExpression();
 
                     state._fsp--;
@@ -3438,14 +3438,14 @@ else if ( ((LA17_0>=RULE_INT && LA17_0<=RULE_ID)||LA17_0==15||LA17_0==23||(LA17_
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1246:5: this_InfixExpression_1= ruleInfixExpression
+                    // InternalExpression.g:1246:5: this_InfixExpression_1= ruleInfixExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getUnaryOrInfixExpressionAccess().getInfixExpressionParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleInfixExpression_in_ruleUnaryOrInfixExpression2769);
+                    pushFollow(FOLLOW_2);
                     this_InfixExpression_1=ruleInfixExpression();
 
                     state._fsp--;
@@ -3482,7 +3482,7 @@ else if ( ((LA17_0>=RULE_INT && LA17_0<=RULE_ID)||LA17_0==15||LA17_0==23||(LA17_
 
 
     // $ANTLR start "entryRuleUnaryExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1262:1: entryRuleUnaryExpression returns [EObject current=null] : iv_ruleUnaryExpression= ruleUnaryExpression EOF ;
+    // InternalExpression.g:1262:1: entryRuleUnaryExpression returns [EObject current=null] : iv_ruleUnaryExpression= ruleUnaryExpression EOF ;
     public final EObject entryRuleUnaryExpression() throws RecognitionException {
         EObject current = null;
 
@@ -3490,13 +3490,13 @@ public final EObject entryRuleUnaryExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1263:2: (iv_ruleUnaryExpression= ruleUnaryExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1264:2: iv_ruleUnaryExpression= ruleUnaryExpression EOF
+            // InternalExpression.g:1263:2: (iv_ruleUnaryExpression= ruleUnaryExpression EOF )
+            // InternalExpression.g:1264:2: iv_ruleUnaryExpression= ruleUnaryExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getUnaryExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleUnaryExpression_in_entryRuleUnaryExpression2804);
+            pushFollow(FOLLOW_1);
             iv_ruleUnaryExpression=ruleUnaryExpression();
 
             state._fsp--;
@@ -3504,7 +3504,7 @@ public final EObject entryRuleUnaryExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleUnaryExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleUnaryExpression2814); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -3522,7 +3522,7 @@ public final EObject entryRuleUnaryExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleUnaryExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1271:1: ruleUnaryExpression returns [EObject current=null] : ( ( ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) ) ) ( (lv_params_1_0= ruleInfixExpression ) ) ) ;
+    // InternalExpression.g:1271:1: ruleUnaryExpression returns [EObject current=null] : ( ( ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) ) ) ( (lv_params_1_0= ruleInfixExpression ) ) ) ;
     public final EObject ruleUnaryExpression() throws RecognitionException {
         EObject current = null;
 
@@ -3534,19 +3534,19 @@ public final EObject ruleUnaryExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1274:28: ( ( ( ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) ) ) ( (lv_params_1_0= ruleInfixExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1275:1: ( ( ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) ) ) ( (lv_params_1_0= ruleInfixExpression ) ) )
+            // InternalExpression.g:1274:28: ( ( ( ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) ) ) ( (lv_params_1_0= ruleInfixExpression ) ) ) )
+            // InternalExpression.g:1275:1: ( ( ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) ) ) ( (lv_params_1_0= ruleInfixExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1275:1: ( ( ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) ) ) ( (lv_params_1_0= ruleInfixExpression ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1275:2: ( ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) ) ) ( (lv_params_1_0= ruleInfixExpression ) )
+            // InternalExpression.g:1275:1: ( ( ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) ) ) ( (lv_params_1_0= ruleInfixExpression ) ) )
+            // InternalExpression.g:1275:2: ( ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) ) ) ( (lv_params_1_0= ruleInfixExpression ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1275:2: ( ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1276:1: ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) )
+            // InternalExpression.g:1275:2: ( ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) ) )
+            // InternalExpression.g:1276:1: ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1276:1: ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1277:1: (lv_name_0_1= '!' | lv_name_0_2= '-' )
+            // InternalExpression.g:1276:1: ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) )
+            // InternalExpression.g:1277:1: (lv_name_0_1= '!' | lv_name_0_2= '-' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1277:1: (lv_name_0_1= '!' | lv_name_0_2= '-' )
+            // InternalExpression.g:1277:1: (lv_name_0_1= '!' | lv_name_0_2= '-' )
             int alt18=2;
             int LA18_0 = input.LA(1);
 
@@ -3565,9 +3565,9 @@ else if ( (LA18_0==37) ) {
             }
             switch (alt18) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1278:3: lv_name_0_1= '!'
+                    // InternalExpression.g:1278:3: lv_name_0_1= '!'
                     {
-                    lv_name_0_1=(Token)match(input,40,FOLLOW_40_in_ruleUnaryExpression2859); if (state.failed) return current;
+                    lv_name_0_1=(Token)match(input,40,FOLLOW_14); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_name_0_1, grammarAccess.getUnaryExpressionAccess().getNameExclamationMarkKeyword_0_0_0());
@@ -3585,9 +3585,9 @@ else if ( (LA18_0==37) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1290:8: lv_name_0_2= '-'
+                    // InternalExpression.g:1290:8: lv_name_0_2= '-'
                     {
-                    lv_name_0_2=(Token)match(input,37,FOLLOW_37_in_ruleUnaryExpression2888); if (state.failed) return current;
+                    lv_name_0_2=(Token)match(input,37,FOLLOW_14); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_name_0_2, grammarAccess.getUnaryExpressionAccess().getNameHyphenMinusKeyword_0_0_1());
@@ -3613,18 +3613,18 @@ else if ( (LA18_0==37) ) {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1305:2: ( (lv_params_1_0= ruleInfixExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1306:1: (lv_params_1_0= ruleInfixExpression )
+            // InternalExpression.g:1305:2: ( (lv_params_1_0= ruleInfixExpression ) )
+            // InternalExpression.g:1306:1: (lv_params_1_0= ruleInfixExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1306:1: (lv_params_1_0= ruleInfixExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1307:3: lv_params_1_0= ruleInfixExpression
+            // InternalExpression.g:1306:1: (lv_params_1_0= ruleInfixExpression )
+            // InternalExpression.g:1307:3: lv_params_1_0= ruleInfixExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getUnaryExpressionAccess().getParamsInfixExpressionParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleInfixExpression_in_ruleUnaryExpression2925);
+            pushFollow(FOLLOW_2);
             lv_params_1_0=ruleInfixExpression();
 
             state._fsp--;
@@ -3638,7 +3638,7 @@ else if ( (LA18_0==37) ) {
                      			current, 
                      			"params",
                       		lv_params_1_0, 
-                      		"InfixExpression");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.InfixExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -3671,7 +3671,7 @@ else if ( (LA18_0==37) ) {
 
 
     // $ANTLR start "entryRuleInfixExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1331:1: entryRuleInfixExpression returns [EObject current=null] : iv_ruleInfixExpression= ruleInfixExpression EOF ;
+    // InternalExpression.g:1331:1: entryRuleInfixExpression returns [EObject current=null] : iv_ruleInfixExpression= ruleInfixExpression EOF ;
     public final EObject entryRuleInfixExpression() throws RecognitionException {
         EObject current = null;
 
@@ -3679,13 +3679,13 @@ public final EObject entryRuleInfixExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1332:2: (iv_ruleInfixExpression= ruleInfixExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1333:2: iv_ruleInfixExpression= ruleInfixExpression EOF
+            // InternalExpression.g:1332:2: (iv_ruleInfixExpression= ruleInfixExpression EOF )
+            // InternalExpression.g:1333:2: iv_ruleInfixExpression= ruleInfixExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getInfixExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleInfixExpression_in_entryRuleInfixExpression2961);
+            pushFollow(FOLLOW_1);
             iv_ruleInfixExpression=ruleInfixExpression();
 
             state._fsp--;
@@ -3693,7 +3693,7 @@ public final EObject entryRuleInfixExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleInfixExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInfixExpression2971); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -3711,7 +3711,7 @@ public final EObject entryRuleInfixExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleInfixExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1340:1: ruleInfixExpression returns [EObject current=null] : (this_PrimaryExpression_0= rulePrimaryExpression ( ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' ) | ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) ) | ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' ) | ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' ) )* ) ;
+    // InternalExpression.g:1340:1: ruleInfixExpression returns [EObject current=null] : (this_PrimaryExpression_0= rulePrimaryExpression ( ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' ) | ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) ) | ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' ) | ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' ) )* ) ;
     public final EObject ruleInfixExpression() throws RecognitionException {
         EObject current = null;
 
@@ -3756,18 +3756,18 @@ public final EObject ruleInfixExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1343:28: ( (this_PrimaryExpression_0= rulePrimaryExpression ( ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' ) | ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) ) | ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' ) | ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1344:1: (this_PrimaryExpression_0= rulePrimaryExpression ( ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' ) | ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) ) | ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' ) | ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' ) )* )
+            // InternalExpression.g:1343:28: ( (this_PrimaryExpression_0= rulePrimaryExpression ( ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' ) | ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) ) | ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' ) | ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' ) )* ) )
+            // InternalExpression.g:1344:1: (this_PrimaryExpression_0= rulePrimaryExpression ( ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' ) | ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) ) | ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' ) | ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1344:1: (this_PrimaryExpression_0= rulePrimaryExpression ( ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' ) | ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) ) | ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' ) | ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' ) )* )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1345:5: this_PrimaryExpression_0= rulePrimaryExpression ( ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' ) | ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) ) | ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' ) | ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' ) )*
+            // InternalExpression.g:1344:1: (this_PrimaryExpression_0= rulePrimaryExpression ( ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' ) | ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) ) | ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' ) | ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' ) )* )
+            // InternalExpression.g:1345:5: this_PrimaryExpression_0= rulePrimaryExpression ( ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' ) | ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) ) | ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' ) | ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getInfixExpressionAccess().getPrimaryExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_rulePrimaryExpression_in_ruleInfixExpression3018);
+            pushFollow(FOLLOW_24);
             this_PrimaryExpression_0=rulePrimaryExpression();
 
             state._fsp--;
@@ -3778,7 +3778,7 @@ public final EObject ruleInfixExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1353:1: ( ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' ) | ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) ) | ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' ) | ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' ) )*
+            // InternalExpression.g:1353:1: ( ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' ) | ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) ) | ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' ) | ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' ) )*
             loop23:
             do {
                 int alt23=5;
@@ -3832,13 +3832,13 @@ else if ( (LA23_4==15) ) {
 
                 switch (alt23) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1353:2: ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' )
+            	    // InternalExpression.g:1353:2: ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1353:2: ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1353:3: () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')'
+            	    // InternalExpression.g:1353:2: ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' )
+            	    // InternalExpression.g:1353:3: () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')'
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1353:3: ()
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1354:5: 
+            	    // InternalExpression.g:1353:3: ()
+            	    // InternalExpression.g:1354:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -3850,24 +3850,24 @@ else if ( (LA23_4==15) ) {
 
             	    }
 
-            	    otherlv_2=(Token)match(input,41,FOLLOW_41_in_ruleInfixExpression3040); if (state.failed) return current;
+            	    otherlv_2=(Token)match(input,41,FOLLOW_3); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_2, grammarAccess.getInfixExpressionAccess().getFullStopKeyword_1_0_1());
             	          
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1363:1: ( (lv_name_3_0= ruleIdentifier ) )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1364:1: (lv_name_3_0= ruleIdentifier )
+            	    // InternalExpression.g:1363:1: ( (lv_name_3_0= ruleIdentifier ) )
+            	    // InternalExpression.g:1364:1: (lv_name_3_0= ruleIdentifier )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1364:1: (lv_name_3_0= ruleIdentifier )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1365:3: lv_name_3_0= ruleIdentifier
+            	    // InternalExpression.g:1364:1: (lv_name_3_0= ruleIdentifier )
+            	    // InternalExpression.g:1365:3: lv_name_3_0= ruleIdentifier
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getInfixExpressionAccess().getNameIdentifierParserRuleCall_1_0_2_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleIdentifier_in_ruleInfixExpression3061);
+            	    pushFollow(FOLLOW_25);
             	    lv_name_3_0=ruleIdentifier();
 
             	    state._fsp--;
@@ -3881,7 +3881,7 @@ else if ( (LA23_4==15) ) {
             	             			current, 
             	             			"name",
             	              		lv_name_3_0, 
-            	              		"Identifier");
+            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -3891,13 +3891,13 @@ else if ( (LA23_4==15) ) {
 
             	    }
 
-            	    otherlv_4=(Token)match(input,15,FOLLOW_15_in_ruleInfixExpression3073); if (state.failed) return current;
+            	    otherlv_4=(Token)match(input,15,FOLLOW_26); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_4, grammarAccess.getInfixExpressionAccess().getLeftParenthesisKeyword_1_0_3());
             	          
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1385:1: ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )?
+            	    // InternalExpression.g:1385:1: ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )?
             	    int alt20=2;
             	    int LA20_0 = input.LA(1);
 
@@ -3906,20 +3906,20 @@ else if ( (LA23_4==15) ) {
             	    }
             	    switch (alt20) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1385:2: ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )*
+            	            // InternalExpression.g:1385:2: ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )*
             	            {
-            	            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1385:2: ( (lv_params_5_0= ruleExpression ) )
-            	            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1386:1: (lv_params_5_0= ruleExpression )
+            	            // InternalExpression.g:1385:2: ( (lv_params_5_0= ruleExpression ) )
+            	            // InternalExpression.g:1386:1: (lv_params_5_0= ruleExpression )
             	            {
-            	            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1386:1: (lv_params_5_0= ruleExpression )
-            	            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1387:3: lv_params_5_0= ruleExpression
+            	            // InternalExpression.g:1386:1: (lv_params_5_0= ruleExpression )
+            	            // InternalExpression.g:1387:3: lv_params_5_0= ruleExpression
             	            {
             	            if ( state.backtracking==0 ) {
             	               
             	              	        newCompositeNode(grammarAccess.getInfixExpressionAccess().getParamsExpressionParserRuleCall_1_0_4_0_0()); 
             	              	    
             	            }
-            	            pushFollow(FOLLOW_ruleExpression_in_ruleInfixExpression3095);
+            	            pushFollow(FOLLOW_27);
             	            lv_params_5_0=ruleExpression();
 
             	            state._fsp--;
@@ -3933,7 +3933,7 @@ else if ( (LA23_4==15) ) {
             	                     			current, 
             	                     			"params",
             	                      		lv_params_5_0, 
-            	                      		"Expression");
+            	                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
             	              	        afterParserOrEnumRuleCall();
             	              	    
             	            }
@@ -3943,7 +3943,7 @@ else if ( (LA23_4==15) ) {
 
             	            }
 
-            	            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1403:2: (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )*
+            	            // InternalExpression.g:1403:2: (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )*
             	            loop19:
             	            do {
             	                int alt19=2;
@@ -3956,26 +3956,26 @@ else if ( (LA23_4==15) ) {
 
             	                switch (alt19) {
             	            	case 1 :
-            	            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1403:4: otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) )
+            	            	    // InternalExpression.g:1403:4: otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) )
             	            	    {
-            	            	    otherlv_6=(Token)match(input,42,FOLLOW_42_in_ruleInfixExpression3108); if (state.failed) return current;
+            	            	    otherlv_6=(Token)match(input,42,FOLLOW_5); if (state.failed) return current;
             	            	    if ( state.backtracking==0 ) {
 
             	            	          	newLeafNode(otherlv_6, grammarAccess.getInfixExpressionAccess().getCommaKeyword_1_0_4_1_0());
             	            	          
             	            	    }
-            	            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1407:1: ( (lv_params_7_0= ruleExpression ) )
-            	            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1408:1: (lv_params_7_0= ruleExpression )
+            	            	    // InternalExpression.g:1407:1: ( (lv_params_7_0= ruleExpression ) )
+            	            	    // InternalExpression.g:1408:1: (lv_params_7_0= ruleExpression )
             	            	    {
-            	            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1408:1: (lv_params_7_0= ruleExpression )
-            	            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1409:3: lv_params_7_0= ruleExpression
+            	            	    // InternalExpression.g:1408:1: (lv_params_7_0= ruleExpression )
+            	            	    // InternalExpression.g:1409:3: lv_params_7_0= ruleExpression
             	            	    {
             	            	    if ( state.backtracking==0 ) {
             	            	       
             	            	      	        newCompositeNode(grammarAccess.getInfixExpressionAccess().getParamsExpressionParserRuleCall_1_0_4_1_1_0()); 
             	            	      	    
             	            	    }
-            	            	    pushFollow(FOLLOW_ruleExpression_in_ruleInfixExpression3129);
+            	            	    pushFollow(FOLLOW_27);
             	            	    lv_params_7_0=ruleExpression();
 
             	            	    state._fsp--;
@@ -3989,7 +3989,7 @@ else if ( (LA23_4==15) ) {
             	            	             			current, 
             	            	             			"params",
             	            	              		lv_params_7_0, 
-            	            	              		"Expression");
+            	            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
             	            	      	        afterParserOrEnumRuleCall();
             	            	      	    
             	            	    }
@@ -4014,7 +4014,7 @@ else if ( (LA23_4==15) ) {
 
             	    }
 
-            	    otherlv_8=(Token)match(input,16,FOLLOW_16_in_ruleInfixExpression3145); if (state.failed) return current;
+            	    otherlv_8=(Token)match(input,16,FOLLOW_24); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_8, grammarAccess.getInfixExpressionAccess().getRightParenthesisKeyword_1_0_5());
@@ -4027,13 +4027,13 @@ else if ( (LA23_4==15) ) {
             	    }
             	    break;
             	case 2 :
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1430:6: ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) )
+            	    // InternalExpression.g:1430:6: ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1430:6: ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1430:7: () otherlv_10= '.' ( (lv_type_11_0= ruleType ) )
+            	    // InternalExpression.g:1430:6: ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) )
+            	    // InternalExpression.g:1430:7: () otherlv_10= '.' ( (lv_type_11_0= ruleType ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1430:7: ()
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1431:5: 
+            	    // InternalExpression.g:1430:7: ()
+            	    // InternalExpression.g:1431:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -4045,24 +4045,24 @@ else if ( (LA23_4==15) ) {
 
             	    }
 
-            	    otherlv_10=(Token)match(input,41,FOLLOW_41_in_ruleInfixExpression3174); if (state.failed) return current;
+            	    otherlv_10=(Token)match(input,41,FOLLOW_7); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_10, grammarAccess.getInfixExpressionAccess().getFullStopKeyword_1_1_1());
             	          
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1440:1: ( (lv_type_11_0= ruleType ) )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1441:1: (lv_type_11_0= ruleType )
+            	    // InternalExpression.g:1440:1: ( (lv_type_11_0= ruleType ) )
+            	    // InternalExpression.g:1441:1: (lv_type_11_0= ruleType )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1441:1: (lv_type_11_0= ruleType )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1442:3: lv_type_11_0= ruleType
+            	    // InternalExpression.g:1441:1: (lv_type_11_0= ruleType )
+            	    // InternalExpression.g:1442:3: lv_type_11_0= ruleType
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getInfixExpressionAccess().getTypeTypeParserRuleCall_1_1_2_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleType_in_ruleInfixExpression3195);
+            	    pushFollow(FOLLOW_24);
             	    lv_type_11_0=ruleType();
 
             	    state._fsp--;
@@ -4076,7 +4076,7 @@ else if ( (LA23_4==15) ) {
             	             			current, 
             	             			"type",
             	              		lv_type_11_0, 
-            	              		"Type");
+            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.Type");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -4093,13 +4093,13 @@ else if ( (LA23_4==15) ) {
             	    }
             	    break;
             	case 3 :
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1459:6: ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' )
+            	    // InternalExpression.g:1459:6: ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1459:6: ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1459:7: () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')'
+            	    // InternalExpression.g:1459:6: ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' )
+            	    // InternalExpression.g:1459:7: () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')'
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1459:7: ()
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1460:5: 
+            	    // InternalExpression.g:1459:7: ()
+            	    // InternalExpression.g:1460:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -4111,19 +4111,19 @@ else if ( (LA23_4==15) ) {
 
             	    }
 
-            	    otherlv_13=(Token)match(input,41,FOLLOW_41_in_ruleInfixExpression3224); if (state.failed) return current;
+            	    otherlv_13=(Token)match(input,41,FOLLOW_28); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_13, grammarAccess.getInfixExpressionAccess().getFullStopKeyword_1_2_1());
             	          
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1469:1: ( (lv_name_14_0= 'typeSelect' ) )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1470:1: (lv_name_14_0= 'typeSelect' )
+            	    // InternalExpression.g:1469:1: ( (lv_name_14_0= 'typeSelect' ) )
+            	    // InternalExpression.g:1470:1: (lv_name_14_0= 'typeSelect' )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1470:1: (lv_name_14_0= 'typeSelect' )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1471:3: lv_name_14_0= 'typeSelect'
+            	    // InternalExpression.g:1470:1: (lv_name_14_0= 'typeSelect' )
+            	    // InternalExpression.g:1471:3: lv_name_14_0= 'typeSelect'
             	    {
-            	    lv_name_14_0=(Token)match(input,43,FOLLOW_43_in_ruleInfixExpression3242); if (state.failed) return current;
+            	    lv_name_14_0=(Token)match(input,43,FOLLOW_25); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	              newLeafNode(lv_name_14_0, grammarAccess.getInfixExpressionAccess().getNameTypeSelectKeyword_1_2_2_0());
@@ -4143,24 +4143,24 @@ else if ( (LA23_4==15) ) {
 
             	    }
 
-            	    otherlv_15=(Token)match(input,15,FOLLOW_15_in_ruleInfixExpression3267); if (state.failed) return current;
+            	    otherlv_15=(Token)match(input,15,FOLLOW_7); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_15, grammarAccess.getInfixExpressionAccess().getLeftParenthesisKeyword_1_2_3());
             	          
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1488:1: ( (lv_type_16_0= ruleType ) )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1489:1: (lv_type_16_0= ruleType )
+            	    // InternalExpression.g:1488:1: ( (lv_type_16_0= ruleType ) )
+            	    // InternalExpression.g:1489:1: (lv_type_16_0= ruleType )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1489:1: (lv_type_16_0= ruleType )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1490:3: lv_type_16_0= ruleType
+            	    // InternalExpression.g:1489:1: (lv_type_16_0= ruleType )
+            	    // InternalExpression.g:1490:3: lv_type_16_0= ruleType
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getInfixExpressionAccess().getTypeTypeParserRuleCall_1_2_4_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleType_in_ruleInfixExpression3288);
+            	    pushFollow(FOLLOW_8);
             	    lv_type_16_0=ruleType();
 
             	    state._fsp--;
@@ -4174,7 +4174,7 @@ else if ( (LA23_4==15) ) {
             	             			current, 
             	             			"type",
             	              		lv_type_16_0, 
-            	              		"Type");
+            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.Type");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -4184,7 +4184,7 @@ else if ( (LA23_4==15) ) {
 
             	    }
 
-            	    otherlv_17=(Token)match(input,16,FOLLOW_16_in_ruleInfixExpression3300); if (state.failed) return current;
+            	    otherlv_17=(Token)match(input,16,FOLLOW_24); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_17, grammarAccess.getInfixExpressionAccess().getRightParenthesisKeyword_1_2_5());
@@ -4197,13 +4197,13 @@ else if ( (LA23_4==15) ) {
             	    }
             	    break;
             	case 4 :
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1511:6: ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' )
+            	    // InternalExpression.g:1511:6: ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1511:6: ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1511:7: () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')'
+            	    // InternalExpression.g:1511:6: ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' )
+            	    // InternalExpression.g:1511:7: () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')'
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1511:7: ()
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1512:5: 
+            	    // InternalExpression.g:1511:7: ()
+            	    // InternalExpression.g:1512:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -4215,19 +4215,19 @@ else if ( (LA23_4==15) ) {
 
             	    }
 
-            	    otherlv_19=(Token)match(input,41,FOLLOW_41_in_ruleInfixExpression3329); if (state.failed) return current;
+            	    otherlv_19=(Token)match(input,41,FOLLOW_29); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_19, grammarAccess.getInfixExpressionAccess().getFullStopKeyword_1_3_1());
             	          
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1521:1: ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1522:1: ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) )
+            	    // InternalExpression.g:1521:1: ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) )
+            	    // InternalExpression.g:1522:1: ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1522:1: ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1523:1: (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' )
+            	    // InternalExpression.g:1522:1: ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) )
+            	    // InternalExpression.g:1523:1: (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1523:1: (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' )
+            	    // InternalExpression.g:1523:1: (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' )
             	    int alt21=8;
             	    switch ( input.LA(1) ) {
             	    case 44:
@@ -4280,9 +4280,9 @@ else if ( (LA23_4==15) ) {
 
             	    switch (alt21) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1524:3: lv_name_20_1= 'collect'
+            	            // InternalExpression.g:1524:3: lv_name_20_1= 'collect'
             	            {
-            	            lv_name_20_1=(Token)match(input,44,FOLLOW_44_in_ruleInfixExpression3349); if (state.failed) return current;
+            	            lv_name_20_1=(Token)match(input,44,FOLLOW_25); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_name_20_1, grammarAccess.getInfixExpressionAccess().getNameCollectKeyword_1_3_2_0_0());
@@ -4300,9 +4300,9 @@ else if ( (LA23_4==15) ) {
             	            }
             	            break;
             	        case 2 :
-            	            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1536:8: lv_name_20_2= 'select'
+            	            // InternalExpression.g:1536:8: lv_name_20_2= 'select'
             	            {
-            	            lv_name_20_2=(Token)match(input,45,FOLLOW_45_in_ruleInfixExpression3378); if (state.failed) return current;
+            	            lv_name_20_2=(Token)match(input,45,FOLLOW_25); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_name_20_2, grammarAccess.getInfixExpressionAccess().getNameSelectKeyword_1_3_2_0_1());
@@ -4320,9 +4320,9 @@ else if ( (LA23_4==15) ) {
             	            }
             	            break;
             	        case 3 :
-            	            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1548:8: lv_name_20_3= 'selectFirst'
+            	            // InternalExpression.g:1548:8: lv_name_20_3= 'selectFirst'
             	            {
-            	            lv_name_20_3=(Token)match(input,46,FOLLOW_46_in_ruleInfixExpression3407); if (state.failed) return current;
+            	            lv_name_20_3=(Token)match(input,46,FOLLOW_25); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_name_20_3, grammarAccess.getInfixExpressionAccess().getNameSelectFirstKeyword_1_3_2_0_2());
@@ -4340,9 +4340,9 @@ else if ( (LA23_4==15) ) {
             	            }
             	            break;
             	        case 4 :
-            	            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1560:8: lv_name_20_4= 'reject'
+            	            // InternalExpression.g:1560:8: lv_name_20_4= 'reject'
             	            {
-            	            lv_name_20_4=(Token)match(input,47,FOLLOW_47_in_ruleInfixExpression3436); if (state.failed) return current;
+            	            lv_name_20_4=(Token)match(input,47,FOLLOW_25); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_name_20_4, grammarAccess.getInfixExpressionAccess().getNameRejectKeyword_1_3_2_0_3());
@@ -4360,9 +4360,9 @@ else if ( (LA23_4==15) ) {
             	            }
             	            break;
             	        case 5 :
-            	            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1572:8: lv_name_20_5= 'exists'
+            	            // InternalExpression.g:1572:8: lv_name_20_5= 'exists'
             	            {
-            	            lv_name_20_5=(Token)match(input,48,FOLLOW_48_in_ruleInfixExpression3465); if (state.failed) return current;
+            	            lv_name_20_5=(Token)match(input,48,FOLLOW_25); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_name_20_5, grammarAccess.getInfixExpressionAccess().getNameExistsKeyword_1_3_2_0_4());
@@ -4380,9 +4380,9 @@ else if ( (LA23_4==15) ) {
             	            }
             	            break;
             	        case 6 :
-            	            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1584:8: lv_name_20_6= 'notExists'
+            	            // InternalExpression.g:1584:8: lv_name_20_6= 'notExists'
             	            {
-            	            lv_name_20_6=(Token)match(input,49,FOLLOW_49_in_ruleInfixExpression3494); if (state.failed) return current;
+            	            lv_name_20_6=(Token)match(input,49,FOLLOW_25); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_name_20_6, grammarAccess.getInfixExpressionAccess().getNameNotExistsKeyword_1_3_2_0_5());
@@ -4400,9 +4400,9 @@ else if ( (LA23_4==15) ) {
             	            }
             	            break;
             	        case 7 :
-            	            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1596:8: lv_name_20_7= 'sortBy'
+            	            // InternalExpression.g:1596:8: lv_name_20_7= 'sortBy'
             	            {
-            	            lv_name_20_7=(Token)match(input,50,FOLLOW_50_in_ruleInfixExpression3523); if (state.failed) return current;
+            	            lv_name_20_7=(Token)match(input,50,FOLLOW_25); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_name_20_7, grammarAccess.getInfixExpressionAccess().getNameSortByKeyword_1_3_2_0_6());
@@ -4420,9 +4420,9 @@ else if ( (LA23_4==15) ) {
             	            }
             	            break;
             	        case 8 :
-            	            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1608:8: lv_name_20_8= 'forAll'
+            	            // InternalExpression.g:1608:8: lv_name_20_8= 'forAll'
             	            {
-            	            lv_name_20_8=(Token)match(input,51,FOLLOW_51_in_ruleInfixExpression3552); if (state.failed) return current;
+            	            lv_name_20_8=(Token)match(input,51,FOLLOW_25); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_name_20_8, grammarAccess.getInfixExpressionAccess().getNameForAllKeyword_1_3_2_0_7());
@@ -4448,13 +4448,13 @@ else if ( (LA23_4==15) ) {
 
             	    }
 
-            	    otherlv_21=(Token)match(input,15,FOLLOW_15_in_ruleInfixExpression3580); if (state.failed) return current;
+            	    otherlv_21=(Token)match(input,15,FOLLOW_5); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_21, grammarAccess.getInfixExpressionAccess().getLeftParenthesisKeyword_1_3_3());
             	          
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1627:1: ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )?
+            	    // InternalExpression.g:1627:1: ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )?
             	    int alt22=2;
             	    int LA22_0 = input.LA(1);
 
@@ -4467,20 +4467,20 @@ else if ( (LA23_4==15) ) {
             	    }
             	    switch (alt22) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1627:2: ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|'
+            	            // InternalExpression.g:1627:2: ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|'
             	            {
-            	            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1627:2: ( (lv_var_22_0= ruleIdentifier ) )
-            	            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1628:1: (lv_var_22_0= ruleIdentifier )
+            	            // InternalExpression.g:1627:2: ( (lv_var_22_0= ruleIdentifier ) )
+            	            // InternalExpression.g:1628:1: (lv_var_22_0= ruleIdentifier )
             	            {
-            	            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1628:1: (lv_var_22_0= ruleIdentifier )
-            	            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1629:3: lv_var_22_0= ruleIdentifier
+            	            // InternalExpression.g:1628:1: (lv_var_22_0= ruleIdentifier )
+            	            // InternalExpression.g:1629:3: lv_var_22_0= ruleIdentifier
             	            {
             	            if ( state.backtracking==0 ) {
             	               
             	              	        newCompositeNode(grammarAccess.getInfixExpressionAccess().getVarIdentifierParserRuleCall_1_3_4_0_0()); 
             	              	    
             	            }
-            	            pushFollow(FOLLOW_ruleIdentifier_in_ruleInfixExpression3602);
+            	            pushFollow(FOLLOW_30);
             	            lv_var_22_0=ruleIdentifier();
 
             	            state._fsp--;
@@ -4494,7 +4494,7 @@ else if ( (LA23_4==15) ) {
             	                     			current, 
             	                     			"var",
             	                      		lv_var_22_0, 
-            	                      		"Identifier");
+            	                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
             	              	        afterParserOrEnumRuleCall();
             	              	    
             	            }
@@ -4504,7 +4504,7 @@ else if ( (LA23_4==15) ) {
 
             	            }
 
-            	            otherlv_23=(Token)match(input,52,FOLLOW_52_in_ruleInfixExpression3614); if (state.failed) return current;
+            	            otherlv_23=(Token)match(input,52,FOLLOW_5); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                  	newLeafNode(otherlv_23, grammarAccess.getInfixExpressionAccess().getVerticalLineKeyword_1_3_4_1());
@@ -4516,18 +4516,18 @@ else if ( (LA23_4==15) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1649:3: ( (lv_exp_24_0= ruleExpression ) )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1650:1: (lv_exp_24_0= ruleExpression )
+            	    // InternalExpression.g:1649:3: ( (lv_exp_24_0= ruleExpression ) )
+            	    // InternalExpression.g:1650:1: (lv_exp_24_0= ruleExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1650:1: (lv_exp_24_0= ruleExpression )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1651:3: lv_exp_24_0= ruleExpression
+            	    // InternalExpression.g:1650:1: (lv_exp_24_0= ruleExpression )
+            	    // InternalExpression.g:1651:3: lv_exp_24_0= ruleExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getInfixExpressionAccess().getExpExpressionParserRuleCall_1_3_5_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleExpression_in_ruleInfixExpression3637);
+            	    pushFollow(FOLLOW_8);
             	    lv_exp_24_0=ruleExpression();
 
             	    state._fsp--;
@@ -4541,7 +4541,7 @@ else if ( (LA23_4==15) ) {
             	             			current, 
             	             			"exp",
             	              		lv_exp_24_0, 
-            	              		"Expression");
+            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -4551,7 +4551,7 @@ else if ( (LA23_4==15) ) {
 
             	    }
 
-            	    otherlv_25=(Token)match(input,16,FOLLOW_16_in_ruleInfixExpression3649); if (state.failed) return current;
+            	    otherlv_25=(Token)match(input,16,FOLLOW_24); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_25, grammarAccess.getInfixExpressionAccess().getRightParenthesisKeyword_1_3_6());
@@ -4592,7 +4592,7 @@ else if ( (LA23_4==15) ) {
 
 
     // $ANTLR start "entryRulePrimaryExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1679:1: entryRulePrimaryExpression returns [EObject current=null] : iv_rulePrimaryExpression= rulePrimaryExpression EOF ;
+    // InternalExpression.g:1679:1: entryRulePrimaryExpression returns [EObject current=null] : iv_rulePrimaryExpression= rulePrimaryExpression EOF ;
     public final EObject entryRulePrimaryExpression() throws RecognitionException {
         EObject current = null;
 
@@ -4600,13 +4600,13 @@ public final EObject entryRulePrimaryExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1680:2: (iv_rulePrimaryExpression= rulePrimaryExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1681:2: iv_rulePrimaryExpression= rulePrimaryExpression EOF
+            // InternalExpression.g:1680:2: (iv_rulePrimaryExpression= rulePrimaryExpression EOF )
+            // InternalExpression.g:1681:2: iv_rulePrimaryExpression= rulePrimaryExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getPrimaryExpressionRule()); 
             }
-            pushFollow(FOLLOW_rulePrimaryExpression_in_entryRulePrimaryExpression3688);
+            pushFollow(FOLLOW_1);
             iv_rulePrimaryExpression=rulePrimaryExpression();
 
             state._fsp--;
@@ -4614,7 +4614,7 @@ public final EObject entryRulePrimaryExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_rulePrimaryExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRulePrimaryExpression3698); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -4632,7 +4632,7 @@ public final EObject entryRulePrimaryExpression() throws RecognitionException {
 
 
     // $ANTLR start "rulePrimaryExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1688:1: rulePrimaryExpression returns [EObject current=null] : (this_Literal_0= ruleLiteral | this_FeatureCall_1= ruleFeatureCall | this_ListLiteral_2= ruleListLiteral | this_ConstructorCallExpression_3= ruleConstructorCallExpression | this_GlobalVarExpression_4= ruleGlobalVarExpression | this_ParanthesizedExpression_5= ruleParanthesizedExpression ) ;
+    // InternalExpression.g:1688:1: rulePrimaryExpression returns [EObject current=null] : (this_Literal_0= ruleLiteral | this_FeatureCall_1= ruleFeatureCall | this_ListLiteral_2= ruleListLiteral | this_ConstructorCallExpression_3= ruleConstructorCallExpression | this_GlobalVarExpression_4= ruleGlobalVarExpression | this_ParanthesizedExpression_5= ruleParanthesizedExpression ) ;
     public final EObject rulePrimaryExpression() throws RecognitionException {
         EObject current = null;
 
@@ -4652,10 +4652,10 @@ public final EObject rulePrimaryExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1691:28: ( (this_Literal_0= ruleLiteral | this_FeatureCall_1= ruleFeatureCall | this_ListLiteral_2= ruleListLiteral | this_ConstructorCallExpression_3= ruleConstructorCallExpression | this_GlobalVarExpression_4= ruleGlobalVarExpression | this_ParanthesizedExpression_5= ruleParanthesizedExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1692:1: (this_Literal_0= ruleLiteral | this_FeatureCall_1= ruleFeatureCall | this_ListLiteral_2= ruleListLiteral | this_ConstructorCallExpression_3= ruleConstructorCallExpression | this_GlobalVarExpression_4= ruleGlobalVarExpression | this_ParanthesizedExpression_5= ruleParanthesizedExpression )
+            // InternalExpression.g:1691:28: ( (this_Literal_0= ruleLiteral | this_FeatureCall_1= ruleFeatureCall | this_ListLiteral_2= ruleListLiteral | this_ConstructorCallExpression_3= ruleConstructorCallExpression | this_GlobalVarExpression_4= ruleGlobalVarExpression | this_ParanthesizedExpression_5= ruleParanthesizedExpression ) )
+            // InternalExpression.g:1692:1: (this_Literal_0= ruleLiteral | this_FeatureCall_1= ruleFeatureCall | this_ListLiteral_2= ruleListLiteral | this_ConstructorCallExpression_3= ruleConstructorCallExpression | this_GlobalVarExpression_4= ruleGlobalVarExpression | this_ParanthesizedExpression_5= ruleParanthesizedExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1692:1: (this_Literal_0= ruleLiteral | this_FeatureCall_1= ruleFeatureCall | this_ListLiteral_2= ruleListLiteral | this_ConstructorCallExpression_3= ruleConstructorCallExpression | this_GlobalVarExpression_4= ruleGlobalVarExpression | this_ParanthesizedExpression_5= ruleParanthesizedExpression )
+            // InternalExpression.g:1692:1: (this_Literal_0= ruleLiteral | this_FeatureCall_1= ruleFeatureCall | this_ListLiteral_2= ruleListLiteral | this_ConstructorCallExpression_3= ruleConstructorCallExpression | this_GlobalVarExpression_4= ruleGlobalVarExpression | this_ParanthesizedExpression_5= ruleParanthesizedExpression )
             int alt24=6;
             switch ( input.LA(1) ) {
             case RULE_INT:
@@ -4715,14 +4715,14 @@ public final EObject rulePrimaryExpression() throws RecognitionException {
 
             switch (alt24) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1693:5: this_Literal_0= ruleLiteral
+                    // InternalExpression.g:1693:5: this_Literal_0= ruleLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getPrimaryExpressionAccess().getLiteralParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleLiteral_in_rulePrimaryExpression3745);
+                    pushFollow(FOLLOW_2);
                     this_Literal_0=ruleLiteral();
 
                     state._fsp--;
@@ -4737,14 +4737,14 @@ public final EObject rulePrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1703:5: this_FeatureCall_1= ruleFeatureCall
+                    // InternalExpression.g:1703:5: this_FeatureCall_1= ruleFeatureCall
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getPrimaryExpressionAccess().getFeatureCallParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleFeatureCall_in_rulePrimaryExpression3772);
+                    pushFollow(FOLLOW_2);
                     this_FeatureCall_1=ruleFeatureCall();
 
                     state._fsp--;
@@ -4759,14 +4759,14 @@ public final EObject rulePrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1713:5: this_ListLiteral_2= ruleListLiteral
+                    // InternalExpression.g:1713:5: this_ListLiteral_2= ruleListLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getPrimaryExpressionAccess().getListLiteralParserRuleCall_2()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleListLiteral_in_rulePrimaryExpression3799);
+                    pushFollow(FOLLOW_2);
                     this_ListLiteral_2=ruleListLiteral();
 
                     state._fsp--;
@@ -4781,14 +4781,14 @@ public final EObject rulePrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1723:5: this_ConstructorCallExpression_3= ruleConstructorCallExpression
+                    // InternalExpression.g:1723:5: this_ConstructorCallExpression_3= ruleConstructorCallExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getPrimaryExpressionAccess().getConstructorCallExpressionParserRuleCall_3()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleConstructorCallExpression_in_rulePrimaryExpression3826);
+                    pushFollow(FOLLOW_2);
                     this_ConstructorCallExpression_3=ruleConstructorCallExpression();
 
                     state._fsp--;
@@ -4803,14 +4803,14 @@ public final EObject rulePrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1733:5: this_GlobalVarExpression_4= ruleGlobalVarExpression
+                    // InternalExpression.g:1733:5: this_GlobalVarExpression_4= ruleGlobalVarExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getPrimaryExpressionAccess().getGlobalVarExpressionParserRuleCall_4()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleGlobalVarExpression_in_rulePrimaryExpression3853);
+                    pushFollow(FOLLOW_2);
                     this_GlobalVarExpression_4=ruleGlobalVarExpression();
 
                     state._fsp--;
@@ -4825,14 +4825,14 @@ public final EObject rulePrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1743:5: this_ParanthesizedExpression_5= ruleParanthesizedExpression
+                    // InternalExpression.g:1743:5: this_ParanthesizedExpression_5= ruleParanthesizedExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getPrimaryExpressionAccess().getParanthesizedExpressionParserRuleCall_5()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleParanthesizedExpression_in_rulePrimaryExpression3880);
+                    pushFollow(FOLLOW_2);
                     this_ParanthesizedExpression_5=ruleParanthesizedExpression();
 
                     state._fsp--;
@@ -4869,7 +4869,7 @@ public final EObject rulePrimaryExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleLiteral"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1759:1: entryRuleLiteral returns [EObject current=null] : iv_ruleLiteral= ruleLiteral EOF ;
+    // InternalExpression.g:1759:1: entryRuleLiteral returns [EObject current=null] : iv_ruleLiteral= ruleLiteral EOF ;
     public final EObject entryRuleLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -4877,13 +4877,13 @@ public final EObject entryRuleLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1760:2: (iv_ruleLiteral= ruleLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1761:2: iv_ruleLiteral= ruleLiteral EOF
+            // InternalExpression.g:1760:2: (iv_ruleLiteral= ruleLiteral EOF )
+            // InternalExpression.g:1761:2: iv_ruleLiteral= ruleLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleLiteral_in_entryRuleLiteral3915);
+            pushFollow(FOLLOW_1);
             iv_ruleLiteral=ruleLiteral();
 
             state._fsp--;
@@ -4891,7 +4891,7 @@ public final EObject entryRuleLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleLiteral3925); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -4909,7 +4909,7 @@ public final EObject entryRuleLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleLiteral"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1768:1: ruleLiteral returns [EObject current=null] : (this_BooleanLiteral_0= ruleBooleanLiteral | this_IntegerLiteral_1= ruleIntegerLiteral | this_NullLiteral_2= ruleNullLiteral | this_RealLiteral_3= ruleRealLiteral | this_StringLiteral_4= ruleStringLiteral ) ;
+    // InternalExpression.g:1768:1: ruleLiteral returns [EObject current=null] : (this_BooleanLiteral_0= ruleBooleanLiteral | this_IntegerLiteral_1= ruleIntegerLiteral | this_NullLiteral_2= ruleNullLiteral | this_RealLiteral_3= ruleRealLiteral | this_StringLiteral_4= ruleStringLiteral ) ;
     public final EObject ruleLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -4927,10 +4927,10 @@ public final EObject ruleLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1771:28: ( (this_BooleanLiteral_0= ruleBooleanLiteral | this_IntegerLiteral_1= ruleIntegerLiteral | this_NullLiteral_2= ruleNullLiteral | this_RealLiteral_3= ruleRealLiteral | this_StringLiteral_4= ruleStringLiteral ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1772:1: (this_BooleanLiteral_0= ruleBooleanLiteral | this_IntegerLiteral_1= ruleIntegerLiteral | this_NullLiteral_2= ruleNullLiteral | this_RealLiteral_3= ruleRealLiteral | this_StringLiteral_4= ruleStringLiteral )
+            // InternalExpression.g:1771:28: ( (this_BooleanLiteral_0= ruleBooleanLiteral | this_IntegerLiteral_1= ruleIntegerLiteral | this_NullLiteral_2= ruleNullLiteral | this_RealLiteral_3= ruleRealLiteral | this_StringLiteral_4= ruleStringLiteral ) )
+            // InternalExpression.g:1772:1: (this_BooleanLiteral_0= ruleBooleanLiteral | this_IntegerLiteral_1= ruleIntegerLiteral | this_NullLiteral_2= ruleNullLiteral | this_RealLiteral_3= ruleRealLiteral | this_StringLiteral_4= ruleStringLiteral )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1772:1: (this_BooleanLiteral_0= ruleBooleanLiteral | this_IntegerLiteral_1= ruleIntegerLiteral | this_NullLiteral_2= ruleNullLiteral | this_RealLiteral_3= ruleRealLiteral | this_StringLiteral_4= ruleStringLiteral )
+            // InternalExpression.g:1772:1: (this_BooleanLiteral_0= ruleBooleanLiteral | this_IntegerLiteral_1= ruleIntegerLiteral | this_NullLiteral_2= ruleNullLiteral | this_RealLiteral_3= ruleRealLiteral | this_StringLiteral_4= ruleStringLiteral )
             int alt25=5;
             switch ( input.LA(1) ) {
             case 53:
@@ -4969,14 +4969,14 @@ public final EObject ruleLiteral() throws RecognitionException {
 
             switch (alt25) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1773:5: this_BooleanLiteral_0= ruleBooleanLiteral
+                    // InternalExpression.g:1773:5: this_BooleanLiteral_0= ruleBooleanLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getLiteralAccess().getBooleanLiteralParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleBooleanLiteral_in_ruleLiteral3972);
+                    pushFollow(FOLLOW_2);
                     this_BooleanLiteral_0=ruleBooleanLiteral();
 
                     state._fsp--;
@@ -4991,14 +4991,14 @@ public final EObject ruleLiteral() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1783:5: this_IntegerLiteral_1= ruleIntegerLiteral
+                    // InternalExpression.g:1783:5: this_IntegerLiteral_1= ruleIntegerLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getLiteralAccess().getIntegerLiteralParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleIntegerLiteral_in_ruleLiteral3999);
+                    pushFollow(FOLLOW_2);
                     this_IntegerLiteral_1=ruleIntegerLiteral();
 
                     state._fsp--;
@@ -5013,14 +5013,14 @@ public final EObject ruleLiteral() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1793:5: this_NullLiteral_2= ruleNullLiteral
+                    // InternalExpression.g:1793:5: this_NullLiteral_2= ruleNullLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getLiteralAccess().getNullLiteralParserRuleCall_2()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleNullLiteral_in_ruleLiteral4026);
+                    pushFollow(FOLLOW_2);
                     this_NullLiteral_2=ruleNullLiteral();
 
                     state._fsp--;
@@ -5035,14 +5035,14 @@ public final EObject ruleLiteral() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1803:5: this_RealLiteral_3= ruleRealLiteral
+                    // InternalExpression.g:1803:5: this_RealLiteral_3= ruleRealLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getLiteralAccess().getRealLiteralParserRuleCall_3()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleRealLiteral_in_ruleLiteral4053);
+                    pushFollow(FOLLOW_2);
                     this_RealLiteral_3=ruleRealLiteral();
 
                     state._fsp--;
@@ -5057,14 +5057,14 @@ public final EObject ruleLiteral() throws RecognitionException {
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1813:5: this_StringLiteral_4= ruleStringLiteral
+                    // InternalExpression.g:1813:5: this_StringLiteral_4= ruleStringLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getLiteralAccess().getStringLiteralParserRuleCall_4()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleStringLiteral_in_ruleLiteral4080);
+                    pushFollow(FOLLOW_2);
                     this_StringLiteral_4=ruleStringLiteral();
 
                     state._fsp--;
@@ -5101,7 +5101,7 @@ public final EObject ruleLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleBooleanLiteral"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1829:1: entryRuleBooleanLiteral returns [EObject current=null] : iv_ruleBooleanLiteral= ruleBooleanLiteral EOF ;
+    // InternalExpression.g:1829:1: entryRuleBooleanLiteral returns [EObject current=null] : iv_ruleBooleanLiteral= ruleBooleanLiteral EOF ;
     public final EObject entryRuleBooleanLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -5109,13 +5109,13 @@ public final EObject entryRuleBooleanLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1830:2: (iv_ruleBooleanLiteral= ruleBooleanLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1831:2: iv_ruleBooleanLiteral= ruleBooleanLiteral EOF
+            // InternalExpression.g:1830:2: (iv_ruleBooleanLiteral= ruleBooleanLiteral EOF )
+            // InternalExpression.g:1831:2: iv_ruleBooleanLiteral= ruleBooleanLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getBooleanLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleBooleanLiteral_in_entryRuleBooleanLiteral4115);
+            pushFollow(FOLLOW_1);
             iv_ruleBooleanLiteral=ruleBooleanLiteral();
 
             state._fsp--;
@@ -5123,7 +5123,7 @@ public final EObject entryRuleBooleanLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleBooleanLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleBooleanLiteral4125); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -5141,7 +5141,7 @@ public final EObject entryRuleBooleanLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleBooleanLiteral"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1838:1: ruleBooleanLiteral returns [EObject current=null] : ( ( (lv_val_0_1= 'true' | lv_val_0_2= 'false' ) ) ) ;
+    // InternalExpression.g:1838:1: ruleBooleanLiteral returns [EObject current=null] : ( ( (lv_val_0_1= 'true' | lv_val_0_2= 'false' ) ) ) ;
     public final EObject ruleBooleanLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -5151,16 +5151,16 @@ public final EObject ruleBooleanLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1841:28: ( ( ( (lv_val_0_1= 'true' | lv_val_0_2= 'false' ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1842:1: ( ( (lv_val_0_1= 'true' | lv_val_0_2= 'false' ) ) )
+            // InternalExpression.g:1841:28: ( ( ( (lv_val_0_1= 'true' | lv_val_0_2= 'false' ) ) ) )
+            // InternalExpression.g:1842:1: ( ( (lv_val_0_1= 'true' | lv_val_0_2= 'false' ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1842:1: ( ( (lv_val_0_1= 'true' | lv_val_0_2= 'false' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1843:1: ( (lv_val_0_1= 'true' | lv_val_0_2= 'false' ) )
+            // InternalExpression.g:1842:1: ( ( (lv_val_0_1= 'true' | lv_val_0_2= 'false' ) ) )
+            // InternalExpression.g:1843:1: ( (lv_val_0_1= 'true' | lv_val_0_2= 'false' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1843:1: ( (lv_val_0_1= 'true' | lv_val_0_2= 'false' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1844:1: (lv_val_0_1= 'true' | lv_val_0_2= 'false' )
+            // InternalExpression.g:1843:1: ( (lv_val_0_1= 'true' | lv_val_0_2= 'false' ) )
+            // InternalExpression.g:1844:1: (lv_val_0_1= 'true' | lv_val_0_2= 'false' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1844:1: (lv_val_0_1= 'true' | lv_val_0_2= 'false' )
+            // InternalExpression.g:1844:1: (lv_val_0_1= 'true' | lv_val_0_2= 'false' )
             int alt26=2;
             int LA26_0 = input.LA(1);
 
@@ -5179,9 +5179,9 @@ else if ( (LA26_0==54) ) {
             }
             switch (alt26) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1845:3: lv_val_0_1= 'true'
+                    // InternalExpression.g:1845:3: lv_val_0_1= 'true'
                     {
-                    lv_val_0_1=(Token)match(input,53,FOLLOW_53_in_ruleBooleanLiteral4169); if (state.failed) return current;
+                    lv_val_0_1=(Token)match(input,53,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_val_0_1, grammarAccess.getBooleanLiteralAccess().getValTrueKeyword_0_0());
@@ -5199,9 +5199,9 @@ else if ( (LA26_0==54) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1857:8: lv_val_0_2= 'false'
+                    // InternalExpression.g:1857:8: lv_val_0_2= 'false'
                     {
-                    lv_val_0_2=(Token)match(input,54,FOLLOW_54_in_ruleBooleanLiteral4198); if (state.failed) return current;
+                    lv_val_0_2=(Token)match(input,54,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_val_0_2, grammarAccess.getBooleanLiteralAccess().getValFalseKeyword_0_1());
@@ -5247,7 +5247,7 @@ else if ( (LA26_0==54) ) {
 
 
     // $ANTLR start "entryRuleIntegerLiteral"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1880:1: entryRuleIntegerLiteral returns [EObject current=null] : iv_ruleIntegerLiteral= ruleIntegerLiteral EOF ;
+    // InternalExpression.g:1880:1: entryRuleIntegerLiteral returns [EObject current=null] : iv_ruleIntegerLiteral= ruleIntegerLiteral EOF ;
     public final EObject entryRuleIntegerLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -5255,13 +5255,13 @@ public final EObject entryRuleIntegerLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1881:2: (iv_ruleIntegerLiteral= ruleIntegerLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1882:2: iv_ruleIntegerLiteral= ruleIntegerLiteral EOF
+            // InternalExpression.g:1881:2: (iv_ruleIntegerLiteral= ruleIntegerLiteral EOF )
+            // InternalExpression.g:1882:2: iv_ruleIntegerLiteral= ruleIntegerLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getIntegerLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleIntegerLiteral_in_entryRuleIntegerLiteral4249);
+            pushFollow(FOLLOW_1);
             iv_ruleIntegerLiteral=ruleIntegerLiteral();
 
             state._fsp--;
@@ -5269,7 +5269,7 @@ public final EObject entryRuleIntegerLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleIntegerLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIntegerLiteral4259); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -5287,7 +5287,7 @@ public final EObject entryRuleIntegerLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleIntegerLiteral"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1889:1: ruleIntegerLiteral returns [EObject current=null] : ( (lv_val_0_0= RULE_INT ) ) ;
+    // InternalExpression.g:1889:1: ruleIntegerLiteral returns [EObject current=null] : ( (lv_val_0_0= RULE_INT ) ) ;
     public final EObject ruleIntegerLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -5296,16 +5296,16 @@ public final EObject ruleIntegerLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1892:28: ( ( (lv_val_0_0= RULE_INT ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1893:1: ( (lv_val_0_0= RULE_INT ) )
+            // InternalExpression.g:1892:28: ( ( (lv_val_0_0= RULE_INT ) ) )
+            // InternalExpression.g:1893:1: ( (lv_val_0_0= RULE_INT ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1893:1: ( (lv_val_0_0= RULE_INT ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1894:1: (lv_val_0_0= RULE_INT )
+            // InternalExpression.g:1893:1: ( (lv_val_0_0= RULE_INT ) )
+            // InternalExpression.g:1894:1: (lv_val_0_0= RULE_INT )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1894:1: (lv_val_0_0= RULE_INT )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1895:3: lv_val_0_0= RULE_INT
+            // InternalExpression.g:1894:1: (lv_val_0_0= RULE_INT )
+            // InternalExpression.g:1895:3: lv_val_0_0= RULE_INT
             {
-            lv_val_0_0=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleIntegerLiteral4300); if (state.failed) return current;
+            lv_val_0_0=(Token)match(input,RULE_INT,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(lv_val_0_0, grammarAccess.getIntegerLiteralAccess().getValINTTerminalRuleCall_0()); 
@@ -5320,7 +5320,7 @@ public final EObject ruleIntegerLiteral() throws RecognitionException {
                      			current, 
                      			"val",
                       		lv_val_0_0, 
-                      		"INT");
+                      		"org.eclipse.xtext.common.Terminals.INT");
               	    
             }
 
@@ -5349,7 +5349,7 @@ public final EObject ruleIntegerLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleNullLiteral"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1919:1: entryRuleNullLiteral returns [EObject current=null] : iv_ruleNullLiteral= ruleNullLiteral EOF ;
+    // InternalExpression.g:1919:1: entryRuleNullLiteral returns [EObject current=null] : iv_ruleNullLiteral= ruleNullLiteral EOF ;
     public final EObject entryRuleNullLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -5357,13 +5357,13 @@ public final EObject entryRuleNullLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1920:2: (iv_ruleNullLiteral= ruleNullLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1921:2: iv_ruleNullLiteral= ruleNullLiteral EOF
+            // InternalExpression.g:1920:2: (iv_ruleNullLiteral= ruleNullLiteral EOF )
+            // InternalExpression.g:1921:2: iv_ruleNullLiteral= ruleNullLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getNullLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleNullLiteral_in_entryRuleNullLiteral4340);
+            pushFollow(FOLLOW_1);
             iv_ruleNullLiteral=ruleNullLiteral();
 
             state._fsp--;
@@ -5371,7 +5371,7 @@ public final EObject entryRuleNullLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleNullLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNullLiteral4350); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -5389,7 +5389,7 @@ public final EObject entryRuleNullLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleNullLiteral"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1928:1: ruleNullLiteral returns [EObject current=null] : ( (lv_val_0_0= 'null' ) ) ;
+    // InternalExpression.g:1928:1: ruleNullLiteral returns [EObject current=null] : ( (lv_val_0_0= 'null' ) ) ;
     public final EObject ruleNullLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -5398,16 +5398,16 @@ public final EObject ruleNullLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1931:28: ( ( (lv_val_0_0= 'null' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1932:1: ( (lv_val_0_0= 'null' ) )
+            // InternalExpression.g:1931:28: ( ( (lv_val_0_0= 'null' ) ) )
+            // InternalExpression.g:1932:1: ( (lv_val_0_0= 'null' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1932:1: ( (lv_val_0_0= 'null' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1933:1: (lv_val_0_0= 'null' )
+            // InternalExpression.g:1932:1: ( (lv_val_0_0= 'null' ) )
+            // InternalExpression.g:1933:1: (lv_val_0_0= 'null' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1933:1: (lv_val_0_0= 'null' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1934:3: lv_val_0_0= 'null'
+            // InternalExpression.g:1933:1: (lv_val_0_0= 'null' )
+            // InternalExpression.g:1934:3: lv_val_0_0= 'null'
             {
-            lv_val_0_0=(Token)match(input,55,FOLLOW_55_in_ruleNullLiteral4392); if (state.failed) return current;
+            lv_val_0_0=(Token)match(input,55,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                       newLeafNode(lv_val_0_0, grammarAccess.getNullLiteralAccess().getValNullKeyword_0());
@@ -5447,7 +5447,7 @@ public final EObject ruleNullLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleRealLiteral"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1955:1: entryRuleRealLiteral returns [EObject current=null] : iv_ruleRealLiteral= ruleRealLiteral EOF ;
+    // InternalExpression.g:1955:1: entryRuleRealLiteral returns [EObject current=null] : iv_ruleRealLiteral= ruleRealLiteral EOF ;
     public final EObject entryRuleRealLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -5455,13 +5455,13 @@ public final EObject entryRuleRealLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1956:2: (iv_ruleRealLiteral= ruleRealLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1957:2: iv_ruleRealLiteral= ruleRealLiteral EOF
+            // InternalExpression.g:1956:2: (iv_ruleRealLiteral= ruleRealLiteral EOF )
+            // InternalExpression.g:1957:2: iv_ruleRealLiteral= ruleRealLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getRealLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleRealLiteral_in_entryRuleRealLiteral4440);
+            pushFollow(FOLLOW_1);
             iv_ruleRealLiteral=ruleRealLiteral();
 
             state._fsp--;
@@ -5469,7 +5469,7 @@ public final EObject entryRuleRealLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleRealLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRealLiteral4450); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -5487,7 +5487,7 @@ public final EObject entryRuleRealLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleRealLiteral"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1964:1: ruleRealLiteral returns [EObject current=null] : ( (lv_val_0_0= RULE_REAL ) ) ;
+    // InternalExpression.g:1964:1: ruleRealLiteral returns [EObject current=null] : ( (lv_val_0_0= RULE_REAL ) ) ;
     public final EObject ruleRealLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -5496,16 +5496,16 @@ public final EObject ruleRealLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1967:28: ( ( (lv_val_0_0= RULE_REAL ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1968:1: ( (lv_val_0_0= RULE_REAL ) )
+            // InternalExpression.g:1967:28: ( ( (lv_val_0_0= RULE_REAL ) ) )
+            // InternalExpression.g:1968:1: ( (lv_val_0_0= RULE_REAL ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1968:1: ( (lv_val_0_0= RULE_REAL ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1969:1: (lv_val_0_0= RULE_REAL )
+            // InternalExpression.g:1968:1: ( (lv_val_0_0= RULE_REAL ) )
+            // InternalExpression.g:1969:1: (lv_val_0_0= RULE_REAL )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1969:1: (lv_val_0_0= RULE_REAL )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1970:3: lv_val_0_0= RULE_REAL
+            // InternalExpression.g:1969:1: (lv_val_0_0= RULE_REAL )
+            // InternalExpression.g:1970:3: lv_val_0_0= RULE_REAL
             {
-            lv_val_0_0=(Token)match(input,RULE_REAL,FOLLOW_RULE_REAL_in_ruleRealLiteral4491); if (state.failed) return current;
+            lv_val_0_0=(Token)match(input,RULE_REAL,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(lv_val_0_0, grammarAccess.getRealLiteralAccess().getValREALTerminalRuleCall_0()); 
@@ -5520,7 +5520,7 @@ public final EObject ruleRealLiteral() throws RecognitionException {
                      			current, 
                      			"val",
                       		lv_val_0_0, 
-                      		"REAL");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.REAL");
               	    
             }
 
@@ -5549,7 +5549,7 @@ public final EObject ruleRealLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleStringLiteral"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1994:1: entryRuleStringLiteral returns [EObject current=null] : iv_ruleStringLiteral= ruleStringLiteral EOF ;
+    // InternalExpression.g:1994:1: entryRuleStringLiteral returns [EObject current=null] : iv_ruleStringLiteral= ruleStringLiteral EOF ;
     public final EObject entryRuleStringLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -5557,13 +5557,13 @@ public final EObject entryRuleStringLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1995:2: (iv_ruleStringLiteral= ruleStringLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:1996:2: iv_ruleStringLiteral= ruleStringLiteral EOF
+            // InternalExpression.g:1995:2: (iv_ruleStringLiteral= ruleStringLiteral EOF )
+            // InternalExpression.g:1996:2: iv_ruleStringLiteral= ruleStringLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getStringLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral4531);
+            pushFollow(FOLLOW_1);
             iv_ruleStringLiteral=ruleStringLiteral();
 
             state._fsp--;
@@ -5571,7 +5571,7 @@ public final EObject entryRuleStringLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleStringLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleStringLiteral4541); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -5589,7 +5589,7 @@ public final EObject entryRuleStringLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleStringLiteral"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2003:1: ruleStringLiteral returns [EObject current=null] : ( (lv_val_0_0= RULE_STRING ) ) ;
+    // InternalExpression.g:2003:1: ruleStringLiteral returns [EObject current=null] : ( (lv_val_0_0= RULE_STRING ) ) ;
     public final EObject ruleStringLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -5598,16 +5598,16 @@ public final EObject ruleStringLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2006:28: ( ( (lv_val_0_0= RULE_STRING ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2007:1: ( (lv_val_0_0= RULE_STRING ) )
+            // InternalExpression.g:2006:28: ( ( (lv_val_0_0= RULE_STRING ) ) )
+            // InternalExpression.g:2007:1: ( (lv_val_0_0= RULE_STRING ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2007:1: ( (lv_val_0_0= RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2008:1: (lv_val_0_0= RULE_STRING )
+            // InternalExpression.g:2007:1: ( (lv_val_0_0= RULE_STRING ) )
+            // InternalExpression.g:2008:1: (lv_val_0_0= RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2008:1: (lv_val_0_0= RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2009:3: lv_val_0_0= RULE_STRING
+            // InternalExpression.g:2008:1: (lv_val_0_0= RULE_STRING )
+            // InternalExpression.g:2009:3: lv_val_0_0= RULE_STRING
             {
-            lv_val_0_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleStringLiteral4582); if (state.failed) return current;
+            lv_val_0_0=(Token)match(input,RULE_STRING,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(lv_val_0_0, grammarAccess.getStringLiteralAccess().getValSTRINGTerminalRuleCall_0()); 
@@ -5622,7 +5622,7 @@ public final EObject ruleStringLiteral() throws RecognitionException {
                      			current, 
                      			"val",
                       		lv_val_0_0, 
-                      		"STRING");
+                      		"org.eclipse.xtext.common.Terminals.STRING");
               	    
             }
 
@@ -5651,7 +5651,7 @@ public final EObject ruleStringLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleParanthesizedExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2033:1: entryRuleParanthesizedExpression returns [EObject current=null] : iv_ruleParanthesizedExpression= ruleParanthesizedExpression EOF ;
+    // InternalExpression.g:2033:1: entryRuleParanthesizedExpression returns [EObject current=null] : iv_ruleParanthesizedExpression= ruleParanthesizedExpression EOF ;
     public final EObject entryRuleParanthesizedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -5659,13 +5659,13 @@ public final EObject entryRuleParanthesizedExpression() throws RecognitionExcept
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2034:2: (iv_ruleParanthesizedExpression= ruleParanthesizedExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2035:2: iv_ruleParanthesizedExpression= ruleParanthesizedExpression EOF
+            // InternalExpression.g:2034:2: (iv_ruleParanthesizedExpression= ruleParanthesizedExpression EOF )
+            // InternalExpression.g:2035:2: iv_ruleParanthesizedExpression= ruleParanthesizedExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getParanthesizedExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleParanthesizedExpression_in_entryRuleParanthesizedExpression4622);
+            pushFollow(FOLLOW_1);
             iv_ruleParanthesizedExpression=ruleParanthesizedExpression();
 
             state._fsp--;
@@ -5673,7 +5673,7 @@ public final EObject entryRuleParanthesizedExpression() throws RecognitionExcept
             if ( state.backtracking==0 ) {
                current =iv_ruleParanthesizedExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleParanthesizedExpression4632); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -5691,7 +5691,7 @@ public final EObject entryRuleParanthesizedExpression() throws RecognitionExcept
 
 
     // $ANTLR start "ruleParanthesizedExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2042:1: ruleParanthesizedExpression returns [EObject current=null] : (otherlv_0= '(' this_Expression_1= ruleExpression otherlv_2= ')' ) ;
+    // InternalExpression.g:2042:1: ruleParanthesizedExpression returns [EObject current=null] : (otherlv_0= '(' this_Expression_1= ruleExpression otherlv_2= ')' ) ;
     public final EObject ruleParanthesizedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -5703,13 +5703,13 @@ public final EObject ruleParanthesizedExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2045:28: ( (otherlv_0= '(' this_Expression_1= ruleExpression otherlv_2= ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2046:1: (otherlv_0= '(' this_Expression_1= ruleExpression otherlv_2= ')' )
+            // InternalExpression.g:2045:28: ( (otherlv_0= '(' this_Expression_1= ruleExpression otherlv_2= ')' ) )
+            // InternalExpression.g:2046:1: (otherlv_0= '(' this_Expression_1= ruleExpression otherlv_2= ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2046:1: (otherlv_0= '(' this_Expression_1= ruleExpression otherlv_2= ')' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2046:3: otherlv_0= '(' this_Expression_1= ruleExpression otherlv_2= ')'
+            // InternalExpression.g:2046:1: (otherlv_0= '(' this_Expression_1= ruleExpression otherlv_2= ')' )
+            // InternalExpression.g:2046:3: otherlv_0= '(' this_Expression_1= ruleExpression otherlv_2= ')'
             {
-            otherlv_0=(Token)match(input,15,FOLLOW_15_in_ruleParanthesizedExpression4669); if (state.failed) return current;
+            otherlv_0=(Token)match(input,15,FOLLOW_5); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getParanthesizedExpressionAccess().getLeftParenthesisKeyword_0());
@@ -5720,7 +5720,7 @@ public final EObject ruleParanthesizedExpression() throws RecognitionException {
                       newCompositeNode(grammarAccess.getParanthesizedExpressionAccess().getExpressionParserRuleCall_1()); 
                   
             }
-            pushFollow(FOLLOW_ruleExpression_in_ruleParanthesizedExpression4691);
+            pushFollow(FOLLOW_8);
             this_Expression_1=ruleExpression();
 
             state._fsp--;
@@ -5731,7 +5731,7 @@ public final EObject ruleParanthesizedExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            otherlv_2=(Token)match(input,16,FOLLOW_16_in_ruleParanthesizedExpression4702); if (state.failed) return current;
+            otherlv_2=(Token)match(input,16,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getParanthesizedExpressionAccess().getRightParenthesisKeyword_2());
@@ -5760,7 +5760,7 @@ public final EObject ruleParanthesizedExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleGlobalVarExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2071:1: entryRuleGlobalVarExpression returns [EObject current=null] : iv_ruleGlobalVarExpression= ruleGlobalVarExpression EOF ;
+    // InternalExpression.g:2071:1: entryRuleGlobalVarExpression returns [EObject current=null] : iv_ruleGlobalVarExpression= ruleGlobalVarExpression EOF ;
     public final EObject entryRuleGlobalVarExpression() throws RecognitionException {
         EObject current = null;
 
@@ -5768,13 +5768,13 @@ public final EObject entryRuleGlobalVarExpression() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2072:2: (iv_ruleGlobalVarExpression= ruleGlobalVarExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2073:2: iv_ruleGlobalVarExpression= ruleGlobalVarExpression EOF
+            // InternalExpression.g:2072:2: (iv_ruleGlobalVarExpression= ruleGlobalVarExpression EOF )
+            // InternalExpression.g:2073:2: iv_ruleGlobalVarExpression= ruleGlobalVarExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getGlobalVarExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleGlobalVarExpression_in_entryRuleGlobalVarExpression4738);
+            pushFollow(FOLLOW_1);
             iv_ruleGlobalVarExpression=ruleGlobalVarExpression();
 
             state._fsp--;
@@ -5782,7 +5782,7 @@ public final EObject entryRuleGlobalVarExpression() throws RecognitionException
             if ( state.backtracking==0 ) {
                current =iv_ruleGlobalVarExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleGlobalVarExpression4748); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -5800,7 +5800,7 @@ public final EObject entryRuleGlobalVarExpression() throws RecognitionException
 
 
     // $ANTLR start "ruleGlobalVarExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2080:1: ruleGlobalVarExpression returns [EObject current=null] : (otherlv_0= 'GLOBALVAR' ( (lv_name_1_0= ruleIdentifier ) ) ) ;
+    // InternalExpression.g:2080:1: ruleGlobalVarExpression returns [EObject current=null] : (otherlv_0= 'GLOBALVAR' ( (lv_name_1_0= ruleIdentifier ) ) ) ;
     public final EObject ruleGlobalVarExpression() throws RecognitionException {
         EObject current = null;
 
@@ -5811,30 +5811,30 @@ public final EObject ruleGlobalVarExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2083:28: ( (otherlv_0= 'GLOBALVAR' ( (lv_name_1_0= ruleIdentifier ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2084:1: (otherlv_0= 'GLOBALVAR' ( (lv_name_1_0= ruleIdentifier ) ) )
+            // InternalExpression.g:2083:28: ( (otherlv_0= 'GLOBALVAR' ( (lv_name_1_0= ruleIdentifier ) ) ) )
+            // InternalExpression.g:2084:1: (otherlv_0= 'GLOBALVAR' ( (lv_name_1_0= ruleIdentifier ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2084:1: (otherlv_0= 'GLOBALVAR' ( (lv_name_1_0= ruleIdentifier ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2084:3: otherlv_0= 'GLOBALVAR' ( (lv_name_1_0= ruleIdentifier ) )
+            // InternalExpression.g:2084:1: (otherlv_0= 'GLOBALVAR' ( (lv_name_1_0= ruleIdentifier ) ) )
+            // InternalExpression.g:2084:3: otherlv_0= 'GLOBALVAR' ( (lv_name_1_0= ruleIdentifier ) )
             {
-            otherlv_0=(Token)match(input,56,FOLLOW_56_in_ruleGlobalVarExpression4785); if (state.failed) return current;
+            otherlv_0=(Token)match(input,56,FOLLOW_3); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getGlobalVarExpressionAccess().getGLOBALVARKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2088:1: ( (lv_name_1_0= ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2089:1: (lv_name_1_0= ruleIdentifier )
+            // InternalExpression.g:2088:1: ( (lv_name_1_0= ruleIdentifier ) )
+            // InternalExpression.g:2089:1: (lv_name_1_0= ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2089:1: (lv_name_1_0= ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2090:3: lv_name_1_0= ruleIdentifier
+            // InternalExpression.g:2089:1: (lv_name_1_0= ruleIdentifier )
+            // InternalExpression.g:2090:3: lv_name_1_0= ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getGlobalVarExpressionAccess().getNameIdentifierParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_ruleGlobalVarExpression4806);
+            pushFollow(FOLLOW_2);
             lv_name_1_0=ruleIdentifier();
 
             state._fsp--;
@@ -5848,7 +5848,7 @@ public final EObject ruleGlobalVarExpression() throws RecognitionException {
                      			current, 
                      			"name",
                       		lv_name_1_0, 
-                      		"Identifier");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -5881,7 +5881,7 @@ public final EObject ruleGlobalVarExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleFeatureCall"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2114:1: entryRuleFeatureCall returns [EObject current=null] : iv_ruleFeatureCall= ruleFeatureCall EOF ;
+    // InternalExpression.g:2114:1: entryRuleFeatureCall returns [EObject current=null] : iv_ruleFeatureCall= ruleFeatureCall EOF ;
     public final EObject entryRuleFeatureCall() throws RecognitionException {
         EObject current = null;
 
@@ -5889,13 +5889,13 @@ public final EObject entryRuleFeatureCall() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2115:2: (iv_ruleFeatureCall= ruleFeatureCall EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2116:2: iv_ruleFeatureCall= ruleFeatureCall EOF
+            // InternalExpression.g:2115:2: (iv_ruleFeatureCall= ruleFeatureCall EOF )
+            // InternalExpression.g:2116:2: iv_ruleFeatureCall= ruleFeatureCall EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getFeatureCallRule()); 
             }
-            pushFollow(FOLLOW_ruleFeatureCall_in_entryRuleFeatureCall4842);
+            pushFollow(FOLLOW_1);
             iv_ruleFeatureCall=ruleFeatureCall();
 
             state._fsp--;
@@ -5903,7 +5903,7 @@ public final EObject entryRuleFeatureCall() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleFeatureCall; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFeatureCall4852); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -5921,7 +5921,7 @@ public final EObject entryRuleFeatureCall() throws RecognitionException {
 
 
     // $ANTLR start "ruleFeatureCall"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2123:1: ruleFeatureCall returns [EObject current=null] : (this_OperationCall_0= ruleOperationCall | ( (lv_type_1_0= ruleType ) ) | this_CollectionExpression_2= ruleCollectionExpression | this_TypeSelectExpression_3= ruleTypeSelectExpression ) ;
+    // InternalExpression.g:2123:1: ruleFeatureCall returns [EObject current=null] : (this_OperationCall_0= ruleOperationCall | ( (lv_type_1_0= ruleType ) ) | this_CollectionExpression_2= ruleCollectionExpression | this_TypeSelectExpression_3= ruleTypeSelectExpression ) ;
     public final EObject ruleFeatureCall() throws RecognitionException {
         EObject current = null;
 
@@ -5937,10 +5937,10 @@ public final EObject ruleFeatureCall() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2126:28: ( (this_OperationCall_0= ruleOperationCall | ( (lv_type_1_0= ruleType ) ) | this_CollectionExpression_2= ruleCollectionExpression | this_TypeSelectExpression_3= ruleTypeSelectExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2127:1: (this_OperationCall_0= ruleOperationCall | ( (lv_type_1_0= ruleType ) ) | this_CollectionExpression_2= ruleCollectionExpression | this_TypeSelectExpression_3= ruleTypeSelectExpression )
+            // InternalExpression.g:2126:28: ( (this_OperationCall_0= ruleOperationCall | ( (lv_type_1_0= ruleType ) ) | this_CollectionExpression_2= ruleCollectionExpression | this_TypeSelectExpression_3= ruleTypeSelectExpression ) )
+            // InternalExpression.g:2127:1: (this_OperationCall_0= ruleOperationCall | ( (lv_type_1_0= ruleType ) ) | this_CollectionExpression_2= ruleCollectionExpression | this_TypeSelectExpression_3= ruleTypeSelectExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2127:1: (this_OperationCall_0= ruleOperationCall | ( (lv_type_1_0= ruleType ) ) | this_CollectionExpression_2= ruleCollectionExpression | this_TypeSelectExpression_3= ruleTypeSelectExpression )
+            // InternalExpression.g:2127:1: (this_OperationCall_0= ruleOperationCall | ( (lv_type_1_0= ruleType ) ) | this_CollectionExpression_2= ruleCollectionExpression | this_TypeSelectExpression_3= ruleTypeSelectExpression )
             int alt27=4;
             switch ( input.LA(1) ) {
             case RULE_ID:
@@ -5996,14 +5996,14 @@ else if ( (LA27_1==EOF||LA27_1==14||(LA27_1>=16 && LA27_1<=18)||(LA27_1>=20 && L
 
             switch (alt27) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2128:5: this_OperationCall_0= ruleOperationCall
+                    // InternalExpression.g:2128:5: this_OperationCall_0= ruleOperationCall
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getFeatureCallAccess().getOperationCallParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleOperationCall_in_ruleFeatureCall4899);
+                    pushFollow(FOLLOW_2);
                     this_OperationCall_0=ruleOperationCall();
 
                     state._fsp--;
@@ -6018,20 +6018,20 @@ else if ( (LA27_1==EOF||LA27_1==14||(LA27_1>=16 && LA27_1<=18)||(LA27_1>=20 && L
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2137:6: ( (lv_type_1_0= ruleType ) )
+                    // InternalExpression.g:2137:6: ( (lv_type_1_0= ruleType ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2137:6: ( (lv_type_1_0= ruleType ) )
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2138:1: (lv_type_1_0= ruleType )
+                    // InternalExpression.g:2137:6: ( (lv_type_1_0= ruleType ) )
+                    // InternalExpression.g:2138:1: (lv_type_1_0= ruleType )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2138:1: (lv_type_1_0= ruleType )
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2139:3: lv_type_1_0= ruleType
+                    // InternalExpression.g:2138:1: (lv_type_1_0= ruleType )
+                    // InternalExpression.g:2139:3: lv_type_1_0= ruleType
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getFeatureCallAccess().getTypeTypeParserRuleCall_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleType_in_ruleFeatureCall4925);
+                    pushFollow(FOLLOW_2);
                     lv_type_1_0=ruleType();
 
                     state._fsp--;
@@ -6045,7 +6045,7 @@ else if ( (LA27_1==EOF||LA27_1==14||(LA27_1>=16 && LA27_1<=18)||(LA27_1>=20 && L
                              			current, 
                              			"type",
                               		lv_type_1_0, 
-                              		"Type");
+                              		"com.avaloq.tools.ddk.xtext.expression.Expression.Type");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -6059,14 +6059,14 @@ else if ( (LA27_1==EOF||LA27_1==14||(LA27_1>=16 && LA27_1<=18)||(LA27_1>=20 && L
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2157:5: this_CollectionExpression_2= ruleCollectionExpression
+                    // InternalExpression.g:2157:5: this_CollectionExpression_2= ruleCollectionExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getFeatureCallAccess().getCollectionExpressionParserRuleCall_2()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleCollectionExpression_in_ruleFeatureCall4953);
+                    pushFollow(FOLLOW_2);
                     this_CollectionExpression_2=ruleCollectionExpression();
 
                     state._fsp--;
@@ -6081,14 +6081,14 @@ else if ( (LA27_1==EOF||LA27_1==14||(LA27_1>=16 && LA27_1<=18)||(LA27_1>=20 && L
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2167:5: this_TypeSelectExpression_3= ruleTypeSelectExpression
+                    // InternalExpression.g:2167:5: this_TypeSelectExpression_3= ruleTypeSelectExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getFeatureCallAccess().getTypeSelectExpressionParserRuleCall_3()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleTypeSelectExpression_in_ruleFeatureCall4980);
+                    pushFollow(FOLLOW_2);
                     this_TypeSelectExpression_3=ruleTypeSelectExpression();
 
                     state._fsp--;
@@ -6125,7 +6125,7 @@ else if ( (LA27_1==EOF||LA27_1==14||(LA27_1>=16 && LA27_1<=18)||(LA27_1>=20 && L
 
 
     // $ANTLR start "entryRuleOperationCall"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2183:1: entryRuleOperationCall returns [EObject current=null] : iv_ruleOperationCall= ruleOperationCall EOF ;
+    // InternalExpression.g:2183:1: entryRuleOperationCall returns [EObject current=null] : iv_ruleOperationCall= ruleOperationCall EOF ;
     public final EObject entryRuleOperationCall() throws RecognitionException {
         EObject current = null;
 
@@ -6133,13 +6133,13 @@ public final EObject entryRuleOperationCall() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2184:2: (iv_ruleOperationCall= ruleOperationCall EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2185:2: iv_ruleOperationCall= ruleOperationCall EOF
+            // InternalExpression.g:2184:2: (iv_ruleOperationCall= ruleOperationCall EOF )
+            // InternalExpression.g:2185:2: iv_ruleOperationCall= ruleOperationCall EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOperationCallRule()); 
             }
-            pushFollow(FOLLOW_ruleOperationCall_in_entryRuleOperationCall5015);
+            pushFollow(FOLLOW_1);
             iv_ruleOperationCall=ruleOperationCall();
 
             state._fsp--;
@@ -6147,7 +6147,7 @@ public final EObject entryRuleOperationCall() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOperationCall; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOperationCall5025); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -6165,7 +6165,7 @@ public final EObject entryRuleOperationCall() throws RecognitionException {
 
 
     // $ANTLR start "ruleOperationCall"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2192:1: ruleOperationCall returns [EObject current=null] : ( ( (lv_name_0_0= ruleIdentifier ) ) otherlv_1= '(' ( ( (lv_params_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )* )? otherlv_5= ')' ) ;
+    // InternalExpression.g:2192:1: ruleOperationCall returns [EObject current=null] : ( ( (lv_name_0_0= ruleIdentifier ) ) otherlv_1= '(' ( ( (lv_params_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )* )? otherlv_5= ')' ) ;
     public final EObject ruleOperationCall() throws RecognitionException {
         EObject current = null;
 
@@ -6182,24 +6182,24 @@ public final EObject ruleOperationCall() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2195:28: ( ( ( (lv_name_0_0= ruleIdentifier ) ) otherlv_1= '(' ( ( (lv_params_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )* )? otherlv_5= ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2196:1: ( ( (lv_name_0_0= ruleIdentifier ) ) otherlv_1= '(' ( ( (lv_params_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )* )? otherlv_5= ')' )
+            // InternalExpression.g:2195:28: ( ( ( (lv_name_0_0= ruleIdentifier ) ) otherlv_1= '(' ( ( (lv_params_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )* )? otherlv_5= ')' ) )
+            // InternalExpression.g:2196:1: ( ( (lv_name_0_0= ruleIdentifier ) ) otherlv_1= '(' ( ( (lv_params_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )* )? otherlv_5= ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2196:1: ( ( (lv_name_0_0= ruleIdentifier ) ) otherlv_1= '(' ( ( (lv_params_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )* )? otherlv_5= ')' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2196:2: ( (lv_name_0_0= ruleIdentifier ) ) otherlv_1= '(' ( ( (lv_params_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )* )? otherlv_5= ')'
+            // InternalExpression.g:2196:1: ( ( (lv_name_0_0= ruleIdentifier ) ) otherlv_1= '(' ( ( (lv_params_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )* )? otherlv_5= ')' )
+            // InternalExpression.g:2196:2: ( (lv_name_0_0= ruleIdentifier ) ) otherlv_1= '(' ( ( (lv_params_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )* )? otherlv_5= ')'
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2196:2: ( (lv_name_0_0= ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2197:1: (lv_name_0_0= ruleIdentifier )
+            // InternalExpression.g:2196:2: ( (lv_name_0_0= ruleIdentifier ) )
+            // InternalExpression.g:2197:1: (lv_name_0_0= ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2197:1: (lv_name_0_0= ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2198:3: lv_name_0_0= ruleIdentifier
+            // InternalExpression.g:2197:1: (lv_name_0_0= ruleIdentifier )
+            // InternalExpression.g:2198:3: lv_name_0_0= ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getOperationCallAccess().getNameIdentifierParserRuleCall_0_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_ruleOperationCall5071);
+            pushFollow(FOLLOW_25);
             lv_name_0_0=ruleIdentifier();
 
             state._fsp--;
@@ -6213,7 +6213,7 @@ public final EObject ruleOperationCall() throws RecognitionException {
                      			current, 
                      			"name",
                       		lv_name_0_0, 
-                      		"Identifier");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -6223,13 +6223,13 @@ public final EObject ruleOperationCall() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,15,FOLLOW_15_in_ruleOperationCall5083); if (state.failed) return current;
+            otherlv_1=(Token)match(input,15,FOLLOW_26); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getOperationCallAccess().getLeftParenthesisKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2218:1: ( ( (lv_params_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )* )?
+            // InternalExpression.g:2218:1: ( ( (lv_params_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )* )?
             int alt29=2;
             int LA29_0 = input.LA(1);
 
@@ -6238,20 +6238,20 @@ public final EObject ruleOperationCall() throws RecognitionException {
             }
             switch (alt29) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2218:2: ( (lv_params_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )*
+                    // InternalExpression.g:2218:2: ( (lv_params_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )*
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2218:2: ( (lv_params_2_0= ruleExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2219:1: (lv_params_2_0= ruleExpression )
+                    // InternalExpression.g:2218:2: ( (lv_params_2_0= ruleExpression ) )
+                    // InternalExpression.g:2219:1: (lv_params_2_0= ruleExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2219:1: (lv_params_2_0= ruleExpression )
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2220:3: lv_params_2_0= ruleExpression
+                    // InternalExpression.g:2219:1: (lv_params_2_0= ruleExpression )
+                    // InternalExpression.g:2220:3: lv_params_2_0= ruleExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getOperationCallAccess().getParamsExpressionParserRuleCall_2_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleExpression_in_ruleOperationCall5105);
+                    pushFollow(FOLLOW_27);
                     lv_params_2_0=ruleExpression();
 
                     state._fsp--;
@@ -6265,7 +6265,7 @@ public final EObject ruleOperationCall() throws RecognitionException {
                              			current, 
                              			"params",
                               		lv_params_2_0, 
-                              		"Expression");
+                              		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -6275,7 +6275,7 @@ public final EObject ruleOperationCall() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2236:2: (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )*
+                    // InternalExpression.g:2236:2: (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )*
                     loop28:
                     do {
                         int alt28=2;
@@ -6288,26 +6288,26 @@ public final EObject ruleOperationCall() throws RecognitionException {
 
                         switch (alt28) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2236:4: otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) )
+                    	    // InternalExpression.g:2236:4: otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) )
                     	    {
-                    	    otherlv_3=(Token)match(input,42,FOLLOW_42_in_ruleOperationCall5118); if (state.failed) return current;
+                    	    otherlv_3=(Token)match(input,42,FOLLOW_5); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_3, grammarAccess.getOperationCallAccess().getCommaKeyword_2_1_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2240:1: ( (lv_params_4_0= ruleExpression ) )
-                    	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2241:1: (lv_params_4_0= ruleExpression )
+                    	    // InternalExpression.g:2240:1: ( (lv_params_4_0= ruleExpression ) )
+                    	    // InternalExpression.g:2241:1: (lv_params_4_0= ruleExpression )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2241:1: (lv_params_4_0= ruleExpression )
-                    	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2242:3: lv_params_4_0= ruleExpression
+                    	    // InternalExpression.g:2241:1: (lv_params_4_0= ruleExpression )
+                    	    // InternalExpression.g:2242:3: lv_params_4_0= ruleExpression
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getOperationCallAccess().getParamsExpressionParserRuleCall_2_1_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleExpression_in_ruleOperationCall5139);
+                    	    pushFollow(FOLLOW_27);
                     	    lv_params_4_0=ruleExpression();
 
                     	    state._fsp--;
@@ -6321,7 +6321,7 @@ public final EObject ruleOperationCall() throws RecognitionException {
                     	             			current, 
                     	             			"params",
                     	              		lv_params_4_0, 
-                    	              		"Expression");
+                    	              		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -6346,7 +6346,7 @@ public final EObject ruleOperationCall() throws RecognitionException {
 
             }
 
-            otherlv_5=(Token)match(input,16,FOLLOW_16_in_ruleOperationCall5155); if (state.failed) return current;
+            otherlv_5=(Token)match(input,16,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_5, grammarAccess.getOperationCallAccess().getRightParenthesisKeyword_3());
@@ -6375,7 +6375,7 @@ public final EObject ruleOperationCall() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleListLiteral"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2270:1: entryRuleListLiteral returns [EObject current=null] : iv_ruleListLiteral= ruleListLiteral EOF ;
+    // InternalExpression.g:2270:1: entryRuleListLiteral returns [EObject current=null] : iv_ruleListLiteral= ruleListLiteral EOF ;
     public final EObject entryRuleListLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -6383,13 +6383,13 @@ public final EObject entryRuleListLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2271:2: (iv_ruleListLiteral= ruleListLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2272:2: iv_ruleListLiteral= ruleListLiteral EOF
+            // InternalExpression.g:2271:2: (iv_ruleListLiteral= ruleListLiteral EOF )
+            // InternalExpression.g:2272:2: iv_ruleListLiteral= ruleListLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getListLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleListLiteral_in_entryRuleListLiteral5191);
+            pushFollow(FOLLOW_1);
             iv_ruleListLiteral=ruleListLiteral();
 
             state._fsp--;
@@ -6397,7 +6397,7 @@ public final EObject entryRuleListLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleListLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleListLiteral5201); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -6415,7 +6415,7 @@ public final EObject entryRuleListLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleListLiteral"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2279:1: ruleListLiteral returns [EObject current=null] : ( () otherlv_1= '{' ( ( (lv_elements_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )* )? otherlv_5= '}' ) ;
+    // InternalExpression.g:2279:1: ruleListLiteral returns [EObject current=null] : ( () otherlv_1= '{' ( ( (lv_elements_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )* )? otherlv_5= '}' ) ;
     public final EObject ruleListLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -6430,14 +6430,14 @@ public final EObject ruleListLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2282:28: ( ( () otherlv_1= '{' ( ( (lv_elements_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )* )? otherlv_5= '}' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2283:1: ( () otherlv_1= '{' ( ( (lv_elements_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )* )? otherlv_5= '}' )
+            // InternalExpression.g:2282:28: ( ( () otherlv_1= '{' ( ( (lv_elements_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )* )? otherlv_5= '}' ) )
+            // InternalExpression.g:2283:1: ( () otherlv_1= '{' ( ( (lv_elements_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )* )? otherlv_5= '}' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2283:1: ( () otherlv_1= '{' ( ( (lv_elements_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )* )? otherlv_5= '}' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2283:2: () otherlv_1= '{' ( ( (lv_elements_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )* )? otherlv_5= '}'
+            // InternalExpression.g:2283:1: ( () otherlv_1= '{' ( ( (lv_elements_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )* )? otherlv_5= '}' )
+            // InternalExpression.g:2283:2: () otherlv_1= '{' ( ( (lv_elements_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )* )? otherlv_5= '}'
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2283:2: ()
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2284:5: 
+            // InternalExpression.g:2283:2: ()
+            // InternalExpression.g:2284:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -6449,13 +6449,13 @@ public final EObject ruleListLiteral() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,23,FOLLOW_23_in_ruleListLiteral5247); if (state.failed) return current;
+            otherlv_1=(Token)match(input,23,FOLLOW_31); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getListLiteralAccess().getLeftCurlyBracketKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2293:1: ( ( (lv_elements_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )* )?
+            // InternalExpression.g:2293:1: ( ( (lv_elements_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )* )?
             int alt31=2;
             int LA31_0 = input.LA(1);
 
@@ -6464,20 +6464,20 @@ public final EObject ruleListLiteral() throws RecognitionException {
             }
             switch (alt31) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2293:2: ( (lv_elements_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )*
+                    // InternalExpression.g:2293:2: ( (lv_elements_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )*
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2293:2: ( (lv_elements_2_0= ruleExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2294:1: (lv_elements_2_0= ruleExpression )
+                    // InternalExpression.g:2293:2: ( (lv_elements_2_0= ruleExpression ) )
+                    // InternalExpression.g:2294:1: (lv_elements_2_0= ruleExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2294:1: (lv_elements_2_0= ruleExpression )
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2295:3: lv_elements_2_0= ruleExpression
+                    // InternalExpression.g:2294:1: (lv_elements_2_0= ruleExpression )
+                    // InternalExpression.g:2295:3: lv_elements_2_0= ruleExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getListLiteralAccess().getElementsExpressionParserRuleCall_2_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleExpression_in_ruleListLiteral5269);
+                    pushFollow(FOLLOW_32);
                     lv_elements_2_0=ruleExpression();
 
                     state._fsp--;
@@ -6491,7 +6491,7 @@ public final EObject ruleListLiteral() throws RecognitionException {
                              			current, 
                              			"elements",
                               		lv_elements_2_0, 
-                              		"Expression");
+                              		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -6501,7 +6501,7 @@ public final EObject ruleListLiteral() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2311:2: (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )*
+                    // InternalExpression.g:2311:2: (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )*
                     loop30:
                     do {
                         int alt30=2;
@@ -6514,26 +6514,26 @@ public final EObject ruleListLiteral() throws RecognitionException {
 
                         switch (alt30) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2311:4: otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) )
+                    	    // InternalExpression.g:2311:4: otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) )
                     	    {
-                    	    otherlv_3=(Token)match(input,42,FOLLOW_42_in_ruleListLiteral5282); if (state.failed) return current;
+                    	    otherlv_3=(Token)match(input,42,FOLLOW_5); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_3, grammarAccess.getListLiteralAccess().getCommaKeyword_2_1_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2315:1: ( (lv_elements_4_0= ruleExpression ) )
-                    	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2316:1: (lv_elements_4_0= ruleExpression )
+                    	    // InternalExpression.g:2315:1: ( (lv_elements_4_0= ruleExpression ) )
+                    	    // InternalExpression.g:2316:1: (lv_elements_4_0= ruleExpression )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2316:1: (lv_elements_4_0= ruleExpression )
-                    	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2317:3: lv_elements_4_0= ruleExpression
+                    	    // InternalExpression.g:2316:1: (lv_elements_4_0= ruleExpression )
+                    	    // InternalExpression.g:2317:3: lv_elements_4_0= ruleExpression
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getListLiteralAccess().getElementsExpressionParserRuleCall_2_1_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleExpression_in_ruleListLiteral5303);
+                    	    pushFollow(FOLLOW_32);
                     	    lv_elements_4_0=ruleExpression();
 
                     	    state._fsp--;
@@ -6547,7 +6547,7 @@ public final EObject ruleListLiteral() throws RecognitionException {
                     	             			current, 
                     	             			"elements",
                     	              		lv_elements_4_0, 
-                    	              		"Expression");
+                    	              		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -6572,7 +6572,7 @@ public final EObject ruleListLiteral() throws RecognitionException {
 
             }
 
-            otherlv_5=(Token)match(input,25,FOLLOW_25_in_ruleListLiteral5319); if (state.failed) return current;
+            otherlv_5=(Token)match(input,25,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_5, grammarAccess.getListLiteralAccess().getRightCurlyBracketKeyword_3());
@@ -6601,7 +6601,7 @@ public final EObject ruleListLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleConstructorCallExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2345:1: entryRuleConstructorCallExpression returns [EObject current=null] : iv_ruleConstructorCallExpression= ruleConstructorCallExpression EOF ;
+    // InternalExpression.g:2345:1: entryRuleConstructorCallExpression returns [EObject current=null] : iv_ruleConstructorCallExpression= ruleConstructorCallExpression EOF ;
     public final EObject entryRuleConstructorCallExpression() throws RecognitionException {
         EObject current = null;
 
@@ -6609,13 +6609,13 @@ public final EObject entryRuleConstructorCallExpression() throws RecognitionExce
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2346:2: (iv_ruleConstructorCallExpression= ruleConstructorCallExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2347:2: iv_ruleConstructorCallExpression= ruleConstructorCallExpression EOF
+            // InternalExpression.g:2346:2: (iv_ruleConstructorCallExpression= ruleConstructorCallExpression EOF )
+            // InternalExpression.g:2347:2: iv_ruleConstructorCallExpression= ruleConstructorCallExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getConstructorCallExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleConstructorCallExpression_in_entryRuleConstructorCallExpression5355);
+            pushFollow(FOLLOW_1);
             iv_ruleConstructorCallExpression=ruleConstructorCallExpression();
 
             state._fsp--;
@@ -6623,7 +6623,7 @@ public final EObject entryRuleConstructorCallExpression() throws RecognitionExce
             if ( state.backtracking==0 ) {
                current =iv_ruleConstructorCallExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleConstructorCallExpression5365); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -6641,7 +6641,7 @@ public final EObject entryRuleConstructorCallExpression() throws RecognitionExce
 
 
     // $ANTLR start "ruleConstructorCallExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2354:1: ruleConstructorCallExpression returns [EObject current=null] : (otherlv_0= 'new' ( (lv_type_1_0= ruleSimpleType ) ) ) ;
+    // InternalExpression.g:2354:1: ruleConstructorCallExpression returns [EObject current=null] : (otherlv_0= 'new' ( (lv_type_1_0= ruleSimpleType ) ) ) ;
     public final EObject ruleConstructorCallExpression() throws RecognitionException {
         EObject current = null;
 
@@ -6652,30 +6652,30 @@ public final EObject ruleConstructorCallExpression() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2357:28: ( (otherlv_0= 'new' ( (lv_type_1_0= ruleSimpleType ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2358:1: (otherlv_0= 'new' ( (lv_type_1_0= ruleSimpleType ) ) )
+            // InternalExpression.g:2357:28: ( (otherlv_0= 'new' ( (lv_type_1_0= ruleSimpleType ) ) ) )
+            // InternalExpression.g:2358:1: (otherlv_0= 'new' ( (lv_type_1_0= ruleSimpleType ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2358:1: (otherlv_0= 'new' ( (lv_type_1_0= ruleSimpleType ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2358:3: otherlv_0= 'new' ( (lv_type_1_0= ruleSimpleType ) )
+            // InternalExpression.g:2358:1: (otherlv_0= 'new' ( (lv_type_1_0= ruleSimpleType ) ) )
+            // InternalExpression.g:2358:3: otherlv_0= 'new' ( (lv_type_1_0= ruleSimpleType ) )
             {
-            otherlv_0=(Token)match(input,57,FOLLOW_57_in_ruleConstructorCallExpression5402); if (state.failed) return current;
+            otherlv_0=(Token)match(input,57,FOLLOW_7); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getConstructorCallExpressionAccess().getNewKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2362:1: ( (lv_type_1_0= ruleSimpleType ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2363:1: (lv_type_1_0= ruleSimpleType )
+            // InternalExpression.g:2362:1: ( (lv_type_1_0= ruleSimpleType ) )
+            // InternalExpression.g:2363:1: (lv_type_1_0= ruleSimpleType )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2363:1: (lv_type_1_0= ruleSimpleType )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2364:3: lv_type_1_0= ruleSimpleType
+            // InternalExpression.g:2363:1: (lv_type_1_0= ruleSimpleType )
+            // InternalExpression.g:2364:3: lv_type_1_0= ruleSimpleType
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getConstructorCallExpressionAccess().getTypeSimpleTypeParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleSimpleType_in_ruleConstructorCallExpression5423);
+            pushFollow(FOLLOW_2);
             lv_type_1_0=ruleSimpleType();
 
             state._fsp--;
@@ -6689,7 +6689,7 @@ public final EObject ruleConstructorCallExpression() throws RecognitionException
                      			current, 
                      			"type",
                       		lv_type_1_0, 
-                      		"SimpleType");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.SimpleType");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -6722,7 +6722,7 @@ public final EObject ruleConstructorCallExpression() throws RecognitionException
 
 
     // $ANTLR start "entryRuleTypeSelectExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2388:1: entryRuleTypeSelectExpression returns [EObject current=null] : iv_ruleTypeSelectExpression= ruleTypeSelectExpression EOF ;
+    // InternalExpression.g:2388:1: entryRuleTypeSelectExpression returns [EObject current=null] : iv_ruleTypeSelectExpression= ruleTypeSelectExpression EOF ;
     public final EObject entryRuleTypeSelectExpression() throws RecognitionException {
         EObject current = null;
 
@@ -6730,13 +6730,13 @@ public final EObject entryRuleTypeSelectExpression() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2389:2: (iv_ruleTypeSelectExpression= ruleTypeSelectExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2390:2: iv_ruleTypeSelectExpression= ruleTypeSelectExpression EOF
+            // InternalExpression.g:2389:2: (iv_ruleTypeSelectExpression= ruleTypeSelectExpression EOF )
+            // InternalExpression.g:2390:2: iv_ruleTypeSelectExpression= ruleTypeSelectExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTypeSelectExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleTypeSelectExpression_in_entryRuleTypeSelectExpression5459);
+            pushFollow(FOLLOW_1);
             iv_ruleTypeSelectExpression=ruleTypeSelectExpression();
 
             state._fsp--;
@@ -6744,7 +6744,7 @@ public final EObject entryRuleTypeSelectExpression() throws RecognitionException
             if ( state.backtracking==0 ) {
                current =iv_ruleTypeSelectExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTypeSelectExpression5469); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -6762,7 +6762,7 @@ public final EObject entryRuleTypeSelectExpression() throws RecognitionException
 
 
     // $ANTLR start "ruleTypeSelectExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2397:1: ruleTypeSelectExpression returns [EObject current=null] : ( ( (lv_name_0_0= 'typeSelect' ) ) otherlv_1= '(' ( (lv_type_2_0= ruleType ) ) otherlv_3= ')' ) ;
+    // InternalExpression.g:2397:1: ruleTypeSelectExpression returns [EObject current=null] : ( ( (lv_name_0_0= 'typeSelect' ) ) otherlv_1= '(' ( (lv_type_2_0= ruleType ) ) otherlv_3= ')' ) ;
     public final EObject ruleTypeSelectExpression() throws RecognitionException {
         EObject current = null;
 
@@ -6775,19 +6775,19 @@ public final EObject ruleTypeSelectExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2400:28: ( ( ( (lv_name_0_0= 'typeSelect' ) ) otherlv_1= '(' ( (lv_type_2_0= ruleType ) ) otherlv_3= ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2401:1: ( ( (lv_name_0_0= 'typeSelect' ) ) otherlv_1= '(' ( (lv_type_2_0= ruleType ) ) otherlv_3= ')' )
+            // InternalExpression.g:2400:28: ( ( ( (lv_name_0_0= 'typeSelect' ) ) otherlv_1= '(' ( (lv_type_2_0= ruleType ) ) otherlv_3= ')' ) )
+            // InternalExpression.g:2401:1: ( ( (lv_name_0_0= 'typeSelect' ) ) otherlv_1= '(' ( (lv_type_2_0= ruleType ) ) otherlv_3= ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2401:1: ( ( (lv_name_0_0= 'typeSelect' ) ) otherlv_1= '(' ( (lv_type_2_0= ruleType ) ) otherlv_3= ')' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2401:2: ( (lv_name_0_0= 'typeSelect' ) ) otherlv_1= '(' ( (lv_type_2_0= ruleType ) ) otherlv_3= ')'
+            // InternalExpression.g:2401:1: ( ( (lv_name_0_0= 'typeSelect' ) ) otherlv_1= '(' ( (lv_type_2_0= ruleType ) ) otherlv_3= ')' )
+            // InternalExpression.g:2401:2: ( (lv_name_0_0= 'typeSelect' ) ) otherlv_1= '(' ( (lv_type_2_0= ruleType ) ) otherlv_3= ')'
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2401:2: ( (lv_name_0_0= 'typeSelect' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2402:1: (lv_name_0_0= 'typeSelect' )
+            // InternalExpression.g:2401:2: ( (lv_name_0_0= 'typeSelect' ) )
+            // InternalExpression.g:2402:1: (lv_name_0_0= 'typeSelect' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2402:1: (lv_name_0_0= 'typeSelect' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2403:3: lv_name_0_0= 'typeSelect'
+            // InternalExpression.g:2402:1: (lv_name_0_0= 'typeSelect' )
+            // InternalExpression.g:2403:3: lv_name_0_0= 'typeSelect'
             {
-            lv_name_0_0=(Token)match(input,43,FOLLOW_43_in_ruleTypeSelectExpression5512); if (state.failed) return current;
+            lv_name_0_0=(Token)match(input,43,FOLLOW_25); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                       newLeafNode(lv_name_0_0, grammarAccess.getTypeSelectExpressionAccess().getNameTypeSelectKeyword_0_0());
@@ -6807,24 +6807,24 @@ public final EObject ruleTypeSelectExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,15,FOLLOW_15_in_ruleTypeSelectExpression5537); if (state.failed) return current;
+            otherlv_1=(Token)match(input,15,FOLLOW_7); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getTypeSelectExpressionAccess().getLeftParenthesisKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2420:1: ( (lv_type_2_0= ruleType ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2421:1: (lv_type_2_0= ruleType )
+            // InternalExpression.g:2420:1: ( (lv_type_2_0= ruleType ) )
+            // InternalExpression.g:2421:1: (lv_type_2_0= ruleType )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2421:1: (lv_type_2_0= ruleType )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2422:3: lv_type_2_0= ruleType
+            // InternalExpression.g:2421:1: (lv_type_2_0= ruleType )
+            // InternalExpression.g:2422:3: lv_type_2_0= ruleType
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getTypeSelectExpressionAccess().getTypeTypeParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleType_in_ruleTypeSelectExpression5558);
+            pushFollow(FOLLOW_8);
             lv_type_2_0=ruleType();
 
             state._fsp--;
@@ -6838,7 +6838,7 @@ public final EObject ruleTypeSelectExpression() throws RecognitionException {
                      			current, 
                      			"type",
                       		lv_type_2_0, 
-                      		"Type");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Type");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -6848,7 +6848,7 @@ public final EObject ruleTypeSelectExpression() throws RecognitionException {
 
             }
 
-            otherlv_3=(Token)match(input,16,FOLLOW_16_in_ruleTypeSelectExpression5570); if (state.failed) return current;
+            otherlv_3=(Token)match(input,16,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_3, grammarAccess.getTypeSelectExpressionAccess().getRightParenthesisKeyword_3());
@@ -6877,7 +6877,7 @@ public final EObject ruleTypeSelectExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleCollectionExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2450:1: entryRuleCollectionExpression returns [EObject current=null] : iv_ruleCollectionExpression= ruleCollectionExpression EOF ;
+    // InternalExpression.g:2450:1: entryRuleCollectionExpression returns [EObject current=null] : iv_ruleCollectionExpression= ruleCollectionExpression EOF ;
     public final EObject entryRuleCollectionExpression() throws RecognitionException {
         EObject current = null;
 
@@ -6885,13 +6885,13 @@ public final EObject entryRuleCollectionExpression() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2451:2: (iv_ruleCollectionExpression= ruleCollectionExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2452:2: iv_ruleCollectionExpression= ruleCollectionExpression EOF
+            // InternalExpression.g:2451:2: (iv_ruleCollectionExpression= ruleCollectionExpression EOF )
+            // InternalExpression.g:2452:2: iv_ruleCollectionExpression= ruleCollectionExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getCollectionExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleCollectionExpression_in_entryRuleCollectionExpression5606);
+            pushFollow(FOLLOW_1);
             iv_ruleCollectionExpression=ruleCollectionExpression();
 
             state._fsp--;
@@ -6899,7 +6899,7 @@ public final EObject entryRuleCollectionExpression() throws RecognitionException
             if ( state.backtracking==0 ) {
                current =iv_ruleCollectionExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleCollectionExpression5616); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -6917,7 +6917,7 @@ public final EObject entryRuleCollectionExpression() throws RecognitionException
 
 
     // $ANTLR start "ruleCollectionExpression"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2459:1: ruleCollectionExpression returns [EObject current=null] : ( ( ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) ) ) otherlv_1= '(' ( ( (lv_var_2_0= ruleIdentifier ) ) otherlv_3= '|' )? ( (lv_exp_4_0= ruleExpression ) ) otherlv_5= ')' ) ;
+    // InternalExpression.g:2459:1: ruleCollectionExpression returns [EObject current=null] : ( ( ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) ) ) otherlv_1= '(' ( ( (lv_var_2_0= ruleIdentifier ) ) otherlv_3= '|' )? ( (lv_exp_4_0= ruleExpression ) ) otherlv_5= ')' ) ;
     public final EObject ruleCollectionExpression() throws RecognitionException {
         EObject current = null;
 
@@ -6940,19 +6940,19 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2462:28: ( ( ( ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) ) ) otherlv_1= '(' ( ( (lv_var_2_0= ruleIdentifier ) ) otherlv_3= '|' )? ( (lv_exp_4_0= ruleExpression ) ) otherlv_5= ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2463:1: ( ( ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) ) ) otherlv_1= '(' ( ( (lv_var_2_0= ruleIdentifier ) ) otherlv_3= '|' )? ( (lv_exp_4_0= ruleExpression ) ) otherlv_5= ')' )
+            // InternalExpression.g:2462:28: ( ( ( ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) ) ) otherlv_1= '(' ( ( (lv_var_2_0= ruleIdentifier ) ) otherlv_3= '|' )? ( (lv_exp_4_0= ruleExpression ) ) otherlv_5= ')' ) )
+            // InternalExpression.g:2463:1: ( ( ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) ) ) otherlv_1= '(' ( ( (lv_var_2_0= ruleIdentifier ) ) otherlv_3= '|' )? ( (lv_exp_4_0= ruleExpression ) ) otherlv_5= ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2463:1: ( ( ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) ) ) otherlv_1= '(' ( ( (lv_var_2_0= ruleIdentifier ) ) otherlv_3= '|' )? ( (lv_exp_4_0= ruleExpression ) ) otherlv_5= ')' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2463:2: ( ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) ) ) otherlv_1= '(' ( ( (lv_var_2_0= ruleIdentifier ) ) otherlv_3= '|' )? ( (lv_exp_4_0= ruleExpression ) ) otherlv_5= ')'
+            // InternalExpression.g:2463:1: ( ( ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) ) ) otherlv_1= '(' ( ( (lv_var_2_0= ruleIdentifier ) ) otherlv_3= '|' )? ( (lv_exp_4_0= ruleExpression ) ) otherlv_5= ')' )
+            // InternalExpression.g:2463:2: ( ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) ) ) otherlv_1= '(' ( ( (lv_var_2_0= ruleIdentifier ) ) otherlv_3= '|' )? ( (lv_exp_4_0= ruleExpression ) ) otherlv_5= ')'
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2463:2: ( ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2464:1: ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) )
+            // InternalExpression.g:2463:2: ( ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) ) )
+            // InternalExpression.g:2464:1: ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2464:1: ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2465:1: (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' )
+            // InternalExpression.g:2464:1: ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) )
+            // InternalExpression.g:2465:1: (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2465:1: (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' )
+            // InternalExpression.g:2465:1: (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' )
             int alt32=8;
             switch ( input.LA(1) ) {
             case 44:
@@ -7005,9 +7005,9 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
 
             switch (alt32) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2466:3: lv_name_0_1= 'collect'
+                    // InternalExpression.g:2466:3: lv_name_0_1= 'collect'
                     {
-                    lv_name_0_1=(Token)match(input,44,FOLLOW_44_in_ruleCollectionExpression5661); if (state.failed) return current;
+                    lv_name_0_1=(Token)match(input,44,FOLLOW_25); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_name_0_1, grammarAccess.getCollectionExpressionAccess().getNameCollectKeyword_0_0_0());
@@ -7025,9 +7025,9 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2478:8: lv_name_0_2= 'select'
+                    // InternalExpression.g:2478:8: lv_name_0_2= 'select'
                     {
-                    lv_name_0_2=(Token)match(input,45,FOLLOW_45_in_ruleCollectionExpression5690); if (state.failed) return current;
+                    lv_name_0_2=(Token)match(input,45,FOLLOW_25); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_name_0_2, grammarAccess.getCollectionExpressionAccess().getNameSelectKeyword_0_0_1());
@@ -7045,9 +7045,9 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2490:8: lv_name_0_3= 'selectFirst'
+                    // InternalExpression.g:2490:8: lv_name_0_3= 'selectFirst'
                     {
-                    lv_name_0_3=(Token)match(input,46,FOLLOW_46_in_ruleCollectionExpression5719); if (state.failed) return current;
+                    lv_name_0_3=(Token)match(input,46,FOLLOW_25); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_name_0_3, grammarAccess.getCollectionExpressionAccess().getNameSelectFirstKeyword_0_0_2());
@@ -7065,9 +7065,9 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2502:8: lv_name_0_4= 'reject'
+                    // InternalExpression.g:2502:8: lv_name_0_4= 'reject'
                     {
-                    lv_name_0_4=(Token)match(input,47,FOLLOW_47_in_ruleCollectionExpression5748); if (state.failed) return current;
+                    lv_name_0_4=(Token)match(input,47,FOLLOW_25); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_name_0_4, grammarAccess.getCollectionExpressionAccess().getNameRejectKeyword_0_0_3());
@@ -7085,9 +7085,9 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2514:8: lv_name_0_5= 'exists'
+                    // InternalExpression.g:2514:8: lv_name_0_5= 'exists'
                     {
-                    lv_name_0_5=(Token)match(input,48,FOLLOW_48_in_ruleCollectionExpression5777); if (state.failed) return current;
+                    lv_name_0_5=(Token)match(input,48,FOLLOW_25); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_name_0_5, grammarAccess.getCollectionExpressionAccess().getNameExistsKeyword_0_0_4());
@@ -7105,9 +7105,9 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2526:8: lv_name_0_6= 'notExists'
+                    // InternalExpression.g:2526:8: lv_name_0_6= 'notExists'
                     {
-                    lv_name_0_6=(Token)match(input,49,FOLLOW_49_in_ruleCollectionExpression5806); if (state.failed) return current;
+                    lv_name_0_6=(Token)match(input,49,FOLLOW_25); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_name_0_6, grammarAccess.getCollectionExpressionAccess().getNameNotExistsKeyword_0_0_5());
@@ -7125,9 +7125,9 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2538:8: lv_name_0_7= 'sortBy'
+                    // InternalExpression.g:2538:8: lv_name_0_7= 'sortBy'
                     {
-                    lv_name_0_7=(Token)match(input,50,FOLLOW_50_in_ruleCollectionExpression5835); if (state.failed) return current;
+                    lv_name_0_7=(Token)match(input,50,FOLLOW_25); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_name_0_7, grammarAccess.getCollectionExpressionAccess().getNameSortByKeyword_0_0_6());
@@ -7145,9 +7145,9 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
                     }
                     break;
                 case 8 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2550:8: lv_name_0_8= 'forAll'
+                    // InternalExpression.g:2550:8: lv_name_0_8= 'forAll'
                     {
-                    lv_name_0_8=(Token)match(input,51,FOLLOW_51_in_ruleCollectionExpression5864); if (state.failed) return current;
+                    lv_name_0_8=(Token)match(input,51,FOLLOW_25); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_name_0_8, grammarAccess.getCollectionExpressionAccess().getNameForAllKeyword_0_0_7());
@@ -7173,13 +7173,13 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,15,FOLLOW_15_in_ruleCollectionExpression5892); if (state.failed) return current;
+            otherlv_1=(Token)match(input,15,FOLLOW_5); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getCollectionExpressionAccess().getLeftParenthesisKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2569:1: ( ( (lv_var_2_0= ruleIdentifier ) ) otherlv_3= '|' )?
+            // InternalExpression.g:2569:1: ( ( (lv_var_2_0= ruleIdentifier ) ) otherlv_3= '|' )?
             int alt33=2;
             int LA33_0 = input.LA(1);
 
@@ -7192,20 +7192,20 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
             }
             switch (alt33) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2569:2: ( (lv_var_2_0= ruleIdentifier ) ) otherlv_3= '|'
+                    // InternalExpression.g:2569:2: ( (lv_var_2_0= ruleIdentifier ) ) otherlv_3= '|'
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2569:2: ( (lv_var_2_0= ruleIdentifier ) )
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2570:1: (lv_var_2_0= ruleIdentifier )
+                    // InternalExpression.g:2569:2: ( (lv_var_2_0= ruleIdentifier ) )
+                    // InternalExpression.g:2570:1: (lv_var_2_0= ruleIdentifier )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2570:1: (lv_var_2_0= ruleIdentifier )
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2571:3: lv_var_2_0= ruleIdentifier
+                    // InternalExpression.g:2570:1: (lv_var_2_0= ruleIdentifier )
+                    // InternalExpression.g:2571:3: lv_var_2_0= ruleIdentifier
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getCollectionExpressionAccess().getVarIdentifierParserRuleCall_2_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleIdentifier_in_ruleCollectionExpression5914);
+                    pushFollow(FOLLOW_30);
                     lv_var_2_0=ruleIdentifier();
 
                     state._fsp--;
@@ -7219,7 +7219,7 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
                              			current, 
                              			"var",
                               		lv_var_2_0, 
-                              		"Identifier");
+                              		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -7229,7 +7229,7 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
 
                     }
 
-                    otherlv_3=(Token)match(input,52,FOLLOW_52_in_ruleCollectionExpression5926); if (state.failed) return current;
+                    otherlv_3=(Token)match(input,52,FOLLOW_5); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_3, grammarAccess.getCollectionExpressionAccess().getVerticalLineKeyword_2_1());
@@ -7241,18 +7241,18 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2591:3: ( (lv_exp_4_0= ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2592:1: (lv_exp_4_0= ruleExpression )
+            // InternalExpression.g:2591:3: ( (lv_exp_4_0= ruleExpression ) )
+            // InternalExpression.g:2592:1: (lv_exp_4_0= ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2592:1: (lv_exp_4_0= ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2593:3: lv_exp_4_0= ruleExpression
+            // InternalExpression.g:2592:1: (lv_exp_4_0= ruleExpression )
+            // InternalExpression.g:2593:3: lv_exp_4_0= ruleExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getCollectionExpressionAccess().getExpExpressionParserRuleCall_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleExpression_in_ruleCollectionExpression5949);
+            pushFollow(FOLLOW_8);
             lv_exp_4_0=ruleExpression();
 
             state._fsp--;
@@ -7266,7 +7266,7 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
                      			current, 
                      			"exp",
                       		lv_exp_4_0, 
-                      		"Expression");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -7276,7 +7276,7 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
 
             }
 
-            otherlv_5=(Token)match(input,16,FOLLOW_16_in_ruleCollectionExpression5961); if (state.failed) return current;
+            otherlv_5=(Token)match(input,16,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_5, grammarAccess.getCollectionExpressionAccess().getRightParenthesisKeyword_4());
@@ -7305,7 +7305,7 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleType"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2621:1: entryRuleType returns [EObject current=null] : iv_ruleType= ruleType EOF ;
+    // InternalExpression.g:2621:1: entryRuleType returns [EObject current=null] : iv_ruleType= ruleType EOF ;
     public final EObject entryRuleType() throws RecognitionException {
         EObject current = null;
 
@@ -7313,13 +7313,13 @@ public final EObject entryRuleType() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2622:2: (iv_ruleType= ruleType EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2623:2: iv_ruleType= ruleType EOF
+            // InternalExpression.g:2622:2: (iv_ruleType= ruleType EOF )
+            // InternalExpression.g:2623:2: iv_ruleType= ruleType EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTypeRule()); 
             }
-            pushFollow(FOLLOW_ruleType_in_entryRuleType5997);
+            pushFollow(FOLLOW_1);
             iv_ruleType=ruleType();
 
             state._fsp--;
@@ -7327,7 +7327,7 @@ public final EObject entryRuleType() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleType; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleType6007); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -7345,7 +7345,7 @@ public final EObject entryRuleType() throws RecognitionException {
 
 
     // $ANTLR start "ruleType"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2630:1: ruleType returns [EObject current=null] : (this_CollectionType_0= ruleCollectionType | this_SimpleType_1= ruleSimpleType ) ;
+    // InternalExpression.g:2630:1: ruleType returns [EObject current=null] : (this_CollectionType_0= ruleCollectionType | this_SimpleType_1= ruleSimpleType ) ;
     public final EObject ruleType() throws RecognitionException {
         EObject current = null;
 
@@ -7357,10 +7357,10 @@ public final EObject ruleType() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2633:28: ( (this_CollectionType_0= ruleCollectionType | this_SimpleType_1= ruleSimpleType ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2634:1: (this_CollectionType_0= ruleCollectionType | this_SimpleType_1= ruleSimpleType )
+            // InternalExpression.g:2633:28: ( (this_CollectionType_0= ruleCollectionType | this_SimpleType_1= ruleSimpleType ) )
+            // InternalExpression.g:2634:1: (this_CollectionType_0= ruleCollectionType | this_SimpleType_1= ruleSimpleType )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2634:1: (this_CollectionType_0= ruleCollectionType | this_SimpleType_1= ruleSimpleType )
+            // InternalExpression.g:2634:1: (this_CollectionType_0= ruleCollectionType | this_SimpleType_1= ruleSimpleType )
             int alt34=2;
             int LA34_0 = input.LA(1);
 
@@ -7379,14 +7379,14 @@ else if ( (LA34_0==RULE_ID) ) {
             }
             switch (alt34) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2635:5: this_CollectionType_0= ruleCollectionType
+                    // InternalExpression.g:2635:5: this_CollectionType_0= ruleCollectionType
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getTypeAccess().getCollectionTypeParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleCollectionType_in_ruleType6054);
+                    pushFollow(FOLLOW_2);
                     this_CollectionType_0=ruleCollectionType();
 
                     state._fsp--;
@@ -7401,14 +7401,14 @@ else if ( (LA34_0==RULE_ID) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2645:5: this_SimpleType_1= ruleSimpleType
+                    // InternalExpression.g:2645:5: this_SimpleType_1= ruleSimpleType
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getTypeAccess().getSimpleTypeParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleSimpleType_in_ruleType6081);
+                    pushFollow(FOLLOW_2);
                     this_SimpleType_1=ruleSimpleType();
 
                     state._fsp--;
@@ -7445,7 +7445,7 @@ else if ( (LA34_0==RULE_ID) ) {
 
 
     // $ANTLR start "entryRuleCollectionType"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2661:1: entryRuleCollectionType returns [EObject current=null] : iv_ruleCollectionType= ruleCollectionType EOF ;
+    // InternalExpression.g:2661:1: entryRuleCollectionType returns [EObject current=null] : iv_ruleCollectionType= ruleCollectionType EOF ;
     public final EObject entryRuleCollectionType() throws RecognitionException {
         EObject current = null;
 
@@ -7453,13 +7453,13 @@ public final EObject entryRuleCollectionType() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2662:2: (iv_ruleCollectionType= ruleCollectionType EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2663:2: iv_ruleCollectionType= ruleCollectionType EOF
+            // InternalExpression.g:2662:2: (iv_ruleCollectionType= ruleCollectionType EOF )
+            // InternalExpression.g:2663:2: iv_ruleCollectionType= ruleCollectionType EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getCollectionTypeRule()); 
             }
-            pushFollow(FOLLOW_ruleCollectionType_in_entryRuleCollectionType6116);
+            pushFollow(FOLLOW_1);
             iv_ruleCollectionType=ruleCollectionType();
 
             state._fsp--;
@@ -7467,7 +7467,7 @@ public final EObject entryRuleCollectionType() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleCollectionType; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleCollectionType6126); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -7485,7 +7485,7 @@ public final EObject entryRuleCollectionType() throws RecognitionException {
 
 
     // $ANTLR start "ruleCollectionType"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2670:1: ruleCollectionType returns [EObject current=null] : ( ( ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) ) ) otherlv_1= '[' ( (lv_id1_2_0= ruleSimpleType ) ) otherlv_3= ']' ) ;
+    // InternalExpression.g:2670:1: ruleCollectionType returns [EObject current=null] : ( ( ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) ) ) otherlv_1= '[' ( (lv_id1_2_0= ruleSimpleType ) ) otherlv_3= ']' ) ;
     public final EObject ruleCollectionType() throws RecognitionException {
         EObject current = null;
 
@@ -7500,19 +7500,19 @@ public final EObject ruleCollectionType() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2673:28: ( ( ( ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) ) ) otherlv_1= '[' ( (lv_id1_2_0= ruleSimpleType ) ) otherlv_3= ']' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2674:1: ( ( ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) ) ) otherlv_1= '[' ( (lv_id1_2_0= ruleSimpleType ) ) otherlv_3= ']' )
+            // InternalExpression.g:2673:28: ( ( ( ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) ) ) otherlv_1= '[' ( (lv_id1_2_0= ruleSimpleType ) ) otherlv_3= ']' ) )
+            // InternalExpression.g:2674:1: ( ( ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) ) ) otherlv_1= '[' ( (lv_id1_2_0= ruleSimpleType ) ) otherlv_3= ']' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2674:1: ( ( ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) ) ) otherlv_1= '[' ( (lv_id1_2_0= ruleSimpleType ) ) otherlv_3= ']' )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2674:2: ( ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) ) ) otherlv_1= '[' ( (lv_id1_2_0= ruleSimpleType ) ) otherlv_3= ']'
+            // InternalExpression.g:2674:1: ( ( ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) ) ) otherlv_1= '[' ( (lv_id1_2_0= ruleSimpleType ) ) otherlv_3= ']' )
+            // InternalExpression.g:2674:2: ( ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) ) ) otherlv_1= '[' ( (lv_id1_2_0= ruleSimpleType ) ) otherlv_3= ']'
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2674:2: ( ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2675:1: ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) )
+            // InternalExpression.g:2674:2: ( ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) ) )
+            // InternalExpression.g:2675:1: ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2675:1: ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2676:1: (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' )
+            // InternalExpression.g:2675:1: ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) )
+            // InternalExpression.g:2676:1: (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2676:1: (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' )
+            // InternalExpression.g:2676:1: (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' )
             int alt35=3;
             switch ( input.LA(1) ) {
             case 58:
@@ -7540,9 +7540,9 @@ public final EObject ruleCollectionType() throws RecognitionException {
 
             switch (alt35) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2677:3: lv_cl_0_1= 'Collection'
+                    // InternalExpression.g:2677:3: lv_cl_0_1= 'Collection'
                     {
-                    lv_cl_0_1=(Token)match(input,58,FOLLOW_58_in_ruleCollectionType6171); if (state.failed) return current;
+                    lv_cl_0_1=(Token)match(input,58,FOLLOW_33); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_cl_0_1, grammarAccess.getCollectionTypeAccess().getClCollectionKeyword_0_0_0());
@@ -7560,9 +7560,9 @@ public final EObject ruleCollectionType() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2689:8: lv_cl_0_2= 'List'
+                    // InternalExpression.g:2689:8: lv_cl_0_2= 'List'
                     {
-                    lv_cl_0_2=(Token)match(input,59,FOLLOW_59_in_ruleCollectionType6200); if (state.failed) return current;
+                    lv_cl_0_2=(Token)match(input,59,FOLLOW_33); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_cl_0_2, grammarAccess.getCollectionTypeAccess().getClListKeyword_0_0_1());
@@ -7580,9 +7580,9 @@ public final EObject ruleCollectionType() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2701:8: lv_cl_0_3= 'Set'
+                    // InternalExpression.g:2701:8: lv_cl_0_3= 'Set'
                     {
-                    lv_cl_0_3=(Token)match(input,60,FOLLOW_60_in_ruleCollectionType6229); if (state.failed) return current;
+                    lv_cl_0_3=(Token)match(input,60,FOLLOW_33); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_cl_0_3, grammarAccess.getCollectionTypeAccess().getClSetKeyword_0_0_2());
@@ -7608,24 +7608,24 @@ public final EObject ruleCollectionType() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,61,FOLLOW_61_in_ruleCollectionType6257); if (state.failed) return current;
+            otherlv_1=(Token)match(input,61,FOLLOW_7); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getCollectionTypeAccess().getLeftSquareBracketKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2720:1: ( (lv_id1_2_0= ruleSimpleType ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2721:1: (lv_id1_2_0= ruleSimpleType )
+            // InternalExpression.g:2720:1: ( (lv_id1_2_0= ruleSimpleType ) )
+            // InternalExpression.g:2721:1: (lv_id1_2_0= ruleSimpleType )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2721:1: (lv_id1_2_0= ruleSimpleType )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2722:3: lv_id1_2_0= ruleSimpleType
+            // InternalExpression.g:2721:1: (lv_id1_2_0= ruleSimpleType )
+            // InternalExpression.g:2722:3: lv_id1_2_0= ruleSimpleType
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getCollectionTypeAccess().getId1SimpleTypeParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleSimpleType_in_ruleCollectionType6278);
+            pushFollow(FOLLOW_34);
             lv_id1_2_0=ruleSimpleType();
 
             state._fsp--;
@@ -7639,7 +7639,7 @@ public final EObject ruleCollectionType() throws RecognitionException {
                      			current, 
                      			"id1",
                       		lv_id1_2_0, 
-                      		"SimpleType");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.SimpleType");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -7649,7 +7649,7 @@ public final EObject ruleCollectionType() throws RecognitionException {
 
             }
 
-            otherlv_3=(Token)match(input,62,FOLLOW_62_in_ruleCollectionType6290); if (state.failed) return current;
+            otherlv_3=(Token)match(input,62,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_3, grammarAccess.getCollectionTypeAccess().getRightSquareBracketKeyword_3());
@@ -7678,7 +7678,7 @@ public final EObject ruleCollectionType() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleSimpleType"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2750:1: entryRuleSimpleType returns [EObject current=null] : iv_ruleSimpleType= ruleSimpleType EOF ;
+    // InternalExpression.g:2750:1: entryRuleSimpleType returns [EObject current=null] : iv_ruleSimpleType= ruleSimpleType EOF ;
     public final EObject entryRuleSimpleType() throws RecognitionException {
         EObject current = null;
 
@@ -7686,13 +7686,13 @@ public final EObject entryRuleSimpleType() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2751:2: (iv_ruleSimpleType= ruleSimpleType EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2752:2: iv_ruleSimpleType= ruleSimpleType EOF
+            // InternalExpression.g:2751:2: (iv_ruleSimpleType= ruleSimpleType EOF )
+            // InternalExpression.g:2752:2: iv_ruleSimpleType= ruleSimpleType EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getSimpleTypeRule()); 
             }
-            pushFollow(FOLLOW_ruleSimpleType_in_entryRuleSimpleType6326);
+            pushFollow(FOLLOW_1);
             iv_ruleSimpleType=ruleSimpleType();
 
             state._fsp--;
@@ -7700,7 +7700,7 @@ public final EObject entryRuleSimpleType() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleSimpleType; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSimpleType6336); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -7718,7 +7718,7 @@ public final EObject entryRuleSimpleType() throws RecognitionException {
 
 
     // $ANTLR start "ruleSimpleType"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2759:1: ruleSimpleType returns [EObject current=null] : ( ( (lv_id_0_0= ruleIdentifier ) ) (otherlv_1= '::' ( (lv_id_2_0= ruleIdentifier ) ) )* ) ;
+    // InternalExpression.g:2759:1: ruleSimpleType returns [EObject current=null] : ( ( (lv_id_0_0= ruleIdentifier ) ) (otherlv_1= '::' ( (lv_id_2_0= ruleIdentifier ) ) )* ) ;
     public final EObject ruleSimpleType() throws RecognitionException {
         EObject current = null;
 
@@ -7731,24 +7731,24 @@ public final EObject ruleSimpleType() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2762:28: ( ( ( (lv_id_0_0= ruleIdentifier ) ) (otherlv_1= '::' ( (lv_id_2_0= ruleIdentifier ) ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2763:1: ( ( (lv_id_0_0= ruleIdentifier ) ) (otherlv_1= '::' ( (lv_id_2_0= ruleIdentifier ) ) )* )
+            // InternalExpression.g:2762:28: ( ( ( (lv_id_0_0= ruleIdentifier ) ) (otherlv_1= '::' ( (lv_id_2_0= ruleIdentifier ) ) )* ) )
+            // InternalExpression.g:2763:1: ( ( (lv_id_0_0= ruleIdentifier ) ) (otherlv_1= '::' ( (lv_id_2_0= ruleIdentifier ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2763:1: ( ( (lv_id_0_0= ruleIdentifier ) ) (otherlv_1= '::' ( (lv_id_2_0= ruleIdentifier ) ) )* )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2763:2: ( (lv_id_0_0= ruleIdentifier ) ) (otherlv_1= '::' ( (lv_id_2_0= ruleIdentifier ) ) )*
+            // InternalExpression.g:2763:1: ( ( (lv_id_0_0= ruleIdentifier ) ) (otherlv_1= '::' ( (lv_id_2_0= ruleIdentifier ) ) )* )
+            // InternalExpression.g:2763:2: ( (lv_id_0_0= ruleIdentifier ) ) (otherlv_1= '::' ( (lv_id_2_0= ruleIdentifier ) ) )*
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2763:2: ( (lv_id_0_0= ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2764:1: (lv_id_0_0= ruleIdentifier )
+            // InternalExpression.g:2763:2: ( (lv_id_0_0= ruleIdentifier ) )
+            // InternalExpression.g:2764:1: (lv_id_0_0= ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2764:1: (lv_id_0_0= ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2765:3: lv_id_0_0= ruleIdentifier
+            // InternalExpression.g:2764:1: (lv_id_0_0= ruleIdentifier )
+            // InternalExpression.g:2765:3: lv_id_0_0= ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getSimpleTypeAccess().getIdIdentifierParserRuleCall_0_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_ruleSimpleType6382);
+            pushFollow(FOLLOW_35);
             lv_id_0_0=ruleIdentifier();
 
             state._fsp--;
@@ -7762,7 +7762,7 @@ public final EObject ruleSimpleType() throws RecognitionException {
                      			current, 
                      			"id",
                       		lv_id_0_0, 
-                      		"Identifier");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -7772,7 +7772,7 @@ public final EObject ruleSimpleType() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2781:2: (otherlv_1= '::' ( (lv_id_2_0= ruleIdentifier ) ) )*
+            // InternalExpression.g:2781:2: (otherlv_1= '::' ( (lv_id_2_0= ruleIdentifier ) ) )*
             loop36:
             do {
                 int alt36=2;
@@ -7785,26 +7785,26 @@ public final EObject ruleSimpleType() throws RecognitionException {
 
                 switch (alt36) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2781:4: otherlv_1= '::' ( (lv_id_2_0= ruleIdentifier ) )
+            	    // InternalExpression.g:2781:4: otherlv_1= '::' ( (lv_id_2_0= ruleIdentifier ) )
             	    {
-            	    otherlv_1=(Token)match(input,63,FOLLOW_63_in_ruleSimpleType6395); if (state.failed) return current;
+            	    otherlv_1=(Token)match(input,63,FOLLOW_3); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_1, grammarAccess.getSimpleTypeAccess().getColonColonKeyword_1_0());
             	          
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2785:1: ( (lv_id_2_0= ruleIdentifier ) )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2786:1: (lv_id_2_0= ruleIdentifier )
+            	    // InternalExpression.g:2785:1: ( (lv_id_2_0= ruleIdentifier ) )
+            	    // InternalExpression.g:2786:1: (lv_id_2_0= ruleIdentifier )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2786:1: (lv_id_2_0= ruleIdentifier )
-            	    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2787:3: lv_id_2_0= ruleIdentifier
+            	    // InternalExpression.g:2786:1: (lv_id_2_0= ruleIdentifier )
+            	    // InternalExpression.g:2787:3: lv_id_2_0= ruleIdentifier
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getSimpleTypeAccess().getIdIdentifierParserRuleCall_1_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleIdentifier_in_ruleSimpleType6416);
+            	    pushFollow(FOLLOW_35);
             	    lv_id_2_0=ruleIdentifier();
 
             	    state._fsp--;
@@ -7818,7 +7818,7 @@ public final EObject ruleSimpleType() throws RecognitionException {
             	             			current, 
             	             			"id",
             	              		lv_id_2_0, 
-            	              		"Identifier");
+            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -7860,7 +7860,7 @@ public final EObject ruleSimpleType() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleIdentifier"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2811:1: entryRuleIdentifier returns [String current=null] : iv_ruleIdentifier= ruleIdentifier EOF ;
+    // InternalExpression.g:2811:1: entryRuleIdentifier returns [String current=null] : iv_ruleIdentifier= ruleIdentifier EOF ;
     public final String entryRuleIdentifier() throws RecognitionException {
         String current = null;
 
@@ -7868,13 +7868,13 @@ public final String entryRuleIdentifier() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2812:2: (iv_ruleIdentifier= ruleIdentifier EOF )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2813:2: iv_ruleIdentifier= ruleIdentifier EOF
+            // InternalExpression.g:2812:2: (iv_ruleIdentifier= ruleIdentifier EOF )
+            // InternalExpression.g:2813:2: iv_ruleIdentifier= ruleIdentifier EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getIdentifierRule()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_entryRuleIdentifier6455);
+            pushFollow(FOLLOW_1);
             iv_ruleIdentifier=ruleIdentifier();
 
             state._fsp--;
@@ -7882,7 +7882,7 @@ public final String entryRuleIdentifier() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleIdentifier.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIdentifier6466); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -7900,7 +7900,7 @@ public final String entryRuleIdentifier() throws RecognitionException {
 
 
     // $ANTLR start "ruleIdentifier"
-    // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2820:1: ruleIdentifier returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_ID_0= RULE_ID ;
+    // InternalExpression.g:2820:1: ruleIdentifier returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_ID_0= RULE_ID ;
     public final AntlrDatatypeRuleToken ruleIdentifier() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -7909,10 +7909,10 @@ public final AntlrDatatypeRuleToken ruleIdentifier() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2823:28: (this_ID_0= RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:2824:5: this_ID_0= RULE_ID
+            // InternalExpression.g:2823:28: (this_ID_0= RULE_ID )
+            // InternalExpression.g:2824:5: this_ID_0= RULE_ID
             {
-            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleIdentifier6505); if (state.failed) return current;
+            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               		current.merge(this_ID_0);
@@ -7943,10 +7943,10 @@ public final AntlrDatatypeRuleToken ruleIdentifier() throws RecognitionException
 
     // $ANTLR start synpred1_InternalExpression
     public final void synpred1_InternalExpression_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:90:7: ( ruleCastedExpression )
-        // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:90:9: ruleCastedExpression
+        // InternalExpression.g:90:7: ( ruleCastedExpression )
+        // InternalExpression.g:90:9: ruleCastedExpression
         {
-        pushFollow(FOLLOW_ruleCastedExpression_in_synpred1_InternalExpression149);
+        pushFollow(FOLLOW_2);
         ruleCastedExpression();
 
         state._fsp--;
@@ -7958,10 +7958,10 @@ public final void synpred1_InternalExpression_fragment() throws RecognitionExcep
 
     // $ANTLR start synpred2_InternalExpression
     public final void synpred2_InternalExpression_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:516:3: ( 'else' )
-        // ../com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/parser/antlr/internal/InternalExpression.g:516:5: 'else'
+        // InternalExpression.g:516:3: ( 'else' )
+        // InternalExpression.g:516:5: 'else'
         {
-        match(input,21,FOLLOW_21_in_synpred2_InternalExpression1103); if (state.failed) return ;
+        match(input,21,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -8000,21 +8000,13 @@ public final boolean synpred1_InternalExpression() {
 
 
     protected DFA1 dfa1 = new DFA1(this);
-    static final String DFA1_eotS =
-        "\36\uffff";
-    static final String DFA1_eofS =
-        "\36\uffff";
-    static final String DFA1_minS =
-        "\1\4\1\uffff\1\0\33\uffff";
-    static final String DFA1_maxS =
-        "\1\74\1\uffff\1\0\33\uffff";
-    static final String DFA1_acceptS =
-        "\1\uffff\1\1\1\uffff\1\3\31\uffff\1\2";
-    static final String DFA1_specialS =
-        "\2\uffff\1\0\33\uffff}>";
-    static final String[] DFA1_transitionS = {
-            "\4\3\4\uffff\1\1\2\uffff\1\2\3\uffff\1\3\2\uffff\2\3\15\uffff"+
-            "\1\3\2\uffff\1\3\2\uffff\11\3\1\uffff\10\3",
+    static final String dfa_1s = "\36\uffff";
+    static final String dfa_2s = "\1\4\1\uffff\1\0\33\uffff";
+    static final String dfa_3s = "\1\74\1\uffff\1\0\33\uffff";
+    static final String dfa_4s = "\1\uffff\1\1\1\uffff\1\3\31\uffff\1\2";
+    static final String dfa_5s = "\2\uffff\1\0\33\uffff}>";
+    static final String[] dfa_6s = {
+            "\4\3\4\uffff\1\1\2\uffff\1\2\3\uffff\1\3\2\uffff\2\3\15\uffff\1\3\2\uffff\1\3\2\uffff\11\3\1\uffff\10\3",
             "",
             "\1\uffff",
             "",
@@ -8046,34 +8038,25 @@ public final boolean synpred1_InternalExpression() {
             ""
     };
 
-    static final short[] DFA1_eot = DFA.unpackEncodedString(DFA1_eotS);
-    static final short[] DFA1_eof = DFA.unpackEncodedString(DFA1_eofS);
-    static final char[] DFA1_min = DFA.unpackEncodedStringToUnsignedChars(DFA1_minS);
-    static final char[] DFA1_max = DFA.unpackEncodedStringToUnsignedChars(DFA1_maxS);
-    static final short[] DFA1_accept = DFA.unpackEncodedString(DFA1_acceptS);
-    static final short[] DFA1_special = DFA.unpackEncodedString(DFA1_specialS);
-    static final short[][] DFA1_transition;
-
-    static {
-        int numStates = DFA1_transitionS.length;
-        DFA1_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA1_transition[i] = DFA.unpackEncodedString(DFA1_transitionS[i]);
-        }
-    }
+    static final short[] dfa_1 = DFA.unpackEncodedString(dfa_1s);
+    static final char[] dfa_2 = DFA.unpackEncodedStringToUnsignedChars(dfa_2s);
+    static final char[] dfa_3 = DFA.unpackEncodedStringToUnsignedChars(dfa_3s);
+    static final short[] dfa_4 = DFA.unpackEncodedString(dfa_4s);
+    static final short[] dfa_5 = DFA.unpackEncodedString(dfa_5s);
+    static final short[][] dfa_6 = unpackEncodedStringArray(dfa_6s);
 
     class DFA1 extends DFA {
 
         public DFA1(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 1;
-            this.eot = DFA1_eot;
-            this.eof = DFA1_eof;
-            this.min = DFA1_min;
-            this.max = DFA1_max;
-            this.accept = DFA1_accept;
-            this.special = DFA1_special;
-            this.transition = DFA1_transition;
+            this.eot = dfa_1;
+            this.eof = dfa_1;
+            this.min = dfa_2;
+            this.max = dfa_3;
+            this.accept = dfa_4;
+            this.special = dfa_5;
+            this.transition = dfa_6;
         }
         public String getDescription() {
             return "80:1: (this_LetExpression_0= ruleLetExpression | ( ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression ) | this_ChainExpression_2= ruleChainExpression )";
@@ -8107,252 +8090,40 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
     }
  
 
-    public static final BitSet FOLLOW_ruleExpression_in_entryRuleExpression75 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleExpression85 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLetExpression_in_ruleExpression132 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCastedExpression_in_ruleExpression165 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChainExpression_in_ruleExpression193 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLetExpression_in_entryRuleLetExpression230 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleLetExpression240 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_12_in_ruleLetExpression277 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleLetExpression298 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleLetExpression310 = new BitSet(new long[]{0x1FEFF92000C890F0L});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleLetExpression331 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_14_in_ruleLetExpression343 = new BitSet(new long[]{0x1FEFF92000C890F0L});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleLetExpression364 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCastedExpression_in_entryRuleCastedExpression400 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleCastedExpression410 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_15_in_ruleCastedExpression447 = new BitSet(new long[]{0x1C00000000000080L});
-    public static final BitSet FOLLOW_ruleType_in_ruleCastedExpression468 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_16_in_ruleCastedExpression480 = new BitSet(new long[]{0x1FEFF92000C890F0L});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleCastedExpression501 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChainExpression_in_entryRuleChainExpression537 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleChainExpression547 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_ruleChainExpression594 = new BitSet(new long[]{0x0000000000020002L});
-    public static final BitSet FOLLOW_17_in_ruleChainExpression615 = new BitSet(new long[]{0x1FEFF92000C890F0L});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_ruleChainExpression636 = new BitSet(new long[]{0x0000000000020002L});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_entryRuleChainedExpression674 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleChainedExpression684 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIfExpressionKw_in_ruleChainedExpression731 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIfExpressionTri_in_ruleChainedExpression758 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSwitchExpression_in_ruleChainedExpression785 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIfExpressionTri_in_entryRuleIfExpressionTri820 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIfExpressionTri830 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOrExpression_in_ruleIfExpressionTri877 = new BitSet(new long[]{0x0000000000040002L});
-    public static final BitSet FOLLOW_18_in_ruleIfExpressionTri898 = new BitSet(new long[]{0x1FEFF92000C890F0L});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_ruleIfExpressionTri919 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_14_in_ruleIfExpressionTri931 = new BitSet(new long[]{0x1FEFF92000C890F0L});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_ruleIfExpressionTri952 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIfExpressionKw_in_entryRuleIfExpressionKw990 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIfExpressionKw1000 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_ruleIfExpressionKw1037 = new BitSet(new long[]{0x1FEFF92000C890F0L});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_ruleIfExpressionKw1058 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_20_in_ruleIfExpressionKw1070 = new BitSet(new long[]{0x1FEFF92000C890F0L});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_ruleIfExpressionKw1091 = new BitSet(new long[]{0x0000000000200002L});
-    public static final BitSet FOLLOW_21_in_ruleIfExpressionKw1112 = new BitSet(new long[]{0x1FEFF92000C890F0L});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_ruleIfExpressionKw1133 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSwitchExpression_in_entryRuleSwitchExpression1172 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSwitchExpression1182 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_22_in_ruleSwitchExpression1219 = new BitSet(new long[]{0x0000000000808000L});
-    public static final BitSet FOLLOW_15_in_ruleSwitchExpression1232 = new BitSet(new long[]{0x1FEFF920008080F0L});
-    public static final BitSet FOLLOW_ruleOrExpression_in_ruleSwitchExpression1253 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_16_in_ruleSwitchExpression1265 = new BitSet(new long[]{0x0000000000800000L});
-    public static final BitSet FOLLOW_23_in_ruleSwitchExpression1279 = new BitSet(new long[]{0x0000000005000000L});
-    public static final BitSet FOLLOW_ruleCase_in_ruleSwitchExpression1300 = new BitSet(new long[]{0x0000000005000000L});
-    public static final BitSet FOLLOW_24_in_ruleSwitchExpression1313 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_14_in_ruleSwitchExpression1325 = new BitSet(new long[]{0x1FEFF920008080F0L});
-    public static final BitSet FOLLOW_ruleOrExpression_in_ruleSwitchExpression1346 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_ruleSwitchExpression1358 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCase_in_entryRuleCase1394 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleCase1404 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_ruleCase1441 = new BitSet(new long[]{0x1FEFF920008080F0L});
-    public static final BitSet FOLLOW_ruleOrExpression_in_ruleCase1462 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_14_in_ruleCase1474 = new BitSet(new long[]{0x1FEFF920008080F0L});
-    public static final BitSet FOLLOW_ruleOrExpression_in_ruleCase1495 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOrExpression_in_entryRuleOrExpression1531 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOrExpression1541 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAndExpression_in_ruleOrExpression1588 = new BitSet(new long[]{0x0000000008000002L});
-    public static final BitSet FOLLOW_27_in_ruleOrExpression1615 = new BitSet(new long[]{0x1FEFF920008080F0L});
-    public static final BitSet FOLLOW_ruleAndExpression_in_ruleOrExpression1649 = new BitSet(new long[]{0x0000000008000002L});
-    public static final BitSet FOLLOW_ruleAndExpression_in_entryRuleAndExpression1687 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAndExpression1697 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImpliesExpression_in_ruleAndExpression1744 = new BitSet(new long[]{0x0000000010000002L});
-    public static final BitSet FOLLOW_28_in_ruleAndExpression1771 = new BitSet(new long[]{0x1FEFF920008080F0L});
-    public static final BitSet FOLLOW_ruleImpliesExpression_in_ruleAndExpression1805 = new BitSet(new long[]{0x0000000010000002L});
-    public static final BitSet FOLLOW_ruleImpliesExpression_in_entryRuleImpliesExpression1843 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleImpliesExpression1853 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRelationalExpression_in_ruleImpliesExpression1900 = new BitSet(new long[]{0x0000000020000002L});
-    public static final BitSet FOLLOW_29_in_ruleImpliesExpression1927 = new BitSet(new long[]{0x1FEFF920008080F0L});
-    public static final BitSet FOLLOW_ruleRelationalExpression_in_ruleImpliesExpression1961 = new BitSet(new long[]{0x0000000020000002L});
-    public static final BitSet FOLLOW_ruleRelationalExpression_in_entryRuleRelationalExpression1999 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRelationalExpression2009 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAdditiveExpression_in_ruleRelationalExpression2056 = new BitSet(new long[]{0x0000000FC0000002L});
-    public static final BitSet FOLLOW_30_in_ruleRelationalExpression2085 = new BitSet(new long[]{0x1FEFF920008080F0L});
-    public static final BitSet FOLLOW_31_in_ruleRelationalExpression2114 = new BitSet(new long[]{0x1FEFF920008080F0L});
-    public static final BitSet FOLLOW_32_in_ruleRelationalExpression2143 = new BitSet(new long[]{0x1FEFF920008080F0L});
-    public static final BitSet FOLLOW_33_in_ruleRelationalExpression2172 = new BitSet(new long[]{0x1FEFF920008080F0L});
-    public static final BitSet FOLLOW_34_in_ruleRelationalExpression2201 = new BitSet(new long[]{0x1FEFF920008080F0L});
-    public static final BitSet FOLLOW_35_in_ruleRelationalExpression2230 = new BitSet(new long[]{0x1FEFF920008080F0L});
-    public static final BitSet FOLLOW_ruleAdditiveExpression_in_ruleRelationalExpression2267 = new BitSet(new long[]{0x0000000FC0000002L});
-    public static final BitSet FOLLOW_ruleAdditiveExpression_in_entryRuleAdditiveExpression2305 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAdditiveExpression2315 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMultiplicativeExpression_in_ruleAdditiveExpression2362 = new BitSet(new long[]{0x0000003000000002L});
-    public static final BitSet FOLLOW_36_in_ruleAdditiveExpression2391 = new BitSet(new long[]{0x1FEFF920008080F0L});
-    public static final BitSet FOLLOW_37_in_ruleAdditiveExpression2420 = new BitSet(new long[]{0x1FEFF920008080F0L});
-    public static final BitSet FOLLOW_ruleMultiplicativeExpression_in_ruleAdditiveExpression2457 = new BitSet(new long[]{0x0000003000000002L});
-    public static final BitSet FOLLOW_ruleMultiplicativeExpression_in_entryRuleMultiplicativeExpression2495 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleMultiplicativeExpression2505 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleUnaryOrInfixExpression_in_ruleMultiplicativeExpression2552 = new BitSet(new long[]{0x000000C000000002L});
-    public static final BitSet FOLLOW_38_in_ruleMultiplicativeExpression2581 = new BitSet(new long[]{0x1FEFF920008080F0L});
-    public static final BitSet FOLLOW_39_in_ruleMultiplicativeExpression2610 = new BitSet(new long[]{0x1FEFF920008080F0L});
-    public static final BitSet FOLLOW_ruleUnaryOrInfixExpression_in_ruleMultiplicativeExpression2647 = new BitSet(new long[]{0x000000C000000002L});
-    public static final BitSet FOLLOW_ruleUnaryOrInfixExpression_in_entryRuleUnaryOrInfixExpression2685 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleUnaryOrInfixExpression2695 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleUnaryExpression_in_ruleUnaryOrInfixExpression2742 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInfixExpression_in_ruleUnaryOrInfixExpression2769 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleUnaryExpression_in_entryRuleUnaryExpression2804 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleUnaryExpression2814 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_40_in_ruleUnaryExpression2859 = new BitSet(new long[]{0x1FEFF920008080F0L});
-    public static final BitSet FOLLOW_37_in_ruleUnaryExpression2888 = new BitSet(new long[]{0x1FEFF920008080F0L});
-    public static final BitSet FOLLOW_ruleInfixExpression_in_ruleUnaryExpression2925 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInfixExpression_in_entryRuleInfixExpression2961 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInfixExpression2971 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePrimaryExpression_in_ruleInfixExpression3018 = new BitSet(new long[]{0x0000020000000002L});
-    public static final BitSet FOLLOW_41_in_ruleInfixExpression3040 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleInfixExpression3061 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleInfixExpression3073 = new BitSet(new long[]{0x1FEFF92000C990F0L});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleInfixExpression3095 = new BitSet(new long[]{0x0000040000010000L});
-    public static final BitSet FOLLOW_42_in_ruleInfixExpression3108 = new BitSet(new long[]{0x1FEFF92000C890F0L});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleInfixExpression3129 = new BitSet(new long[]{0x0000040000010000L});
-    public static final BitSet FOLLOW_16_in_ruleInfixExpression3145 = new BitSet(new long[]{0x0000020000000002L});
-    public static final BitSet FOLLOW_41_in_ruleInfixExpression3174 = new BitSet(new long[]{0x1C00000000000080L});
-    public static final BitSet FOLLOW_ruleType_in_ruleInfixExpression3195 = new BitSet(new long[]{0x0000020000000002L});
-    public static final BitSet FOLLOW_41_in_ruleInfixExpression3224 = new BitSet(new long[]{0x0000080000000000L});
-    public static final BitSet FOLLOW_43_in_ruleInfixExpression3242 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleInfixExpression3267 = new BitSet(new long[]{0x1C00000000000080L});
-    public static final BitSet FOLLOW_ruleType_in_ruleInfixExpression3288 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_16_in_ruleInfixExpression3300 = new BitSet(new long[]{0x0000020000000002L});
-    public static final BitSet FOLLOW_41_in_ruleInfixExpression3329 = new BitSet(new long[]{0x000FF00000000000L});
-    public static final BitSet FOLLOW_44_in_ruleInfixExpression3349 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_45_in_ruleInfixExpression3378 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_46_in_ruleInfixExpression3407 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_47_in_ruleInfixExpression3436 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_48_in_ruleInfixExpression3465 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_49_in_ruleInfixExpression3494 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_50_in_ruleInfixExpression3523 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_51_in_ruleInfixExpression3552 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleInfixExpression3580 = new BitSet(new long[]{0x1FEFF92000C890F0L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleInfixExpression3602 = new BitSet(new long[]{0x0010000000000000L});
-    public static final BitSet FOLLOW_52_in_ruleInfixExpression3614 = new BitSet(new long[]{0x1FEFF92000C890F0L});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleInfixExpression3637 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_16_in_ruleInfixExpression3649 = new BitSet(new long[]{0x0000020000000002L});
-    public static final BitSet FOLLOW_rulePrimaryExpression_in_entryRulePrimaryExpression3688 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRulePrimaryExpression3698 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteral_in_rulePrimaryExpression3745 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFeatureCall_in_rulePrimaryExpression3772 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleListLiteral_in_rulePrimaryExpression3799 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConstructorCallExpression_in_rulePrimaryExpression3826 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGlobalVarExpression_in_rulePrimaryExpression3853 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleParanthesizedExpression_in_rulePrimaryExpression3880 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteral_in_entryRuleLiteral3915 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleLiteral3925 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBooleanLiteral_in_ruleLiteral3972 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntegerLiteral_in_ruleLiteral3999 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNullLiteral_in_ruleLiteral4026 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRealLiteral_in_ruleLiteral4053 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStringLiteral_in_ruleLiteral4080 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBooleanLiteral_in_entryRuleBooleanLiteral4115 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleBooleanLiteral4125 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_53_in_ruleBooleanLiteral4169 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_54_in_ruleBooleanLiteral4198 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntegerLiteral_in_entryRuleIntegerLiteral4249 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIntegerLiteral4259 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleIntegerLiteral4300 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNullLiteral_in_entryRuleNullLiteral4340 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNullLiteral4350 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_55_in_ruleNullLiteral4392 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRealLiteral_in_entryRuleRealLiteral4440 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRealLiteral4450 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_REAL_in_ruleRealLiteral4491 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral4531 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleStringLiteral4541 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleStringLiteral4582 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleParanthesizedExpression_in_entryRuleParanthesizedExpression4622 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleParanthesizedExpression4632 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_15_in_ruleParanthesizedExpression4669 = new BitSet(new long[]{0x1FEFF92000C890F0L});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleParanthesizedExpression4691 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_16_in_ruleParanthesizedExpression4702 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGlobalVarExpression_in_entryRuleGlobalVarExpression4738 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleGlobalVarExpression4748 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_ruleGlobalVarExpression4785 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleGlobalVarExpression4806 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFeatureCall_in_entryRuleFeatureCall4842 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFeatureCall4852 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOperationCall_in_ruleFeatureCall4899 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleType_in_ruleFeatureCall4925 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCollectionExpression_in_ruleFeatureCall4953 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTypeSelectExpression_in_ruleFeatureCall4980 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOperationCall_in_entryRuleOperationCall5015 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOperationCall5025 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleOperationCall5071 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleOperationCall5083 = new BitSet(new long[]{0x1FEFF92000C990F0L});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleOperationCall5105 = new BitSet(new long[]{0x0000040000010000L});
-    public static final BitSet FOLLOW_42_in_ruleOperationCall5118 = new BitSet(new long[]{0x1FEFF92000C890F0L});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleOperationCall5139 = new BitSet(new long[]{0x0000040000010000L});
-    public static final BitSet FOLLOW_16_in_ruleOperationCall5155 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleListLiteral_in_entryRuleListLiteral5191 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleListLiteral5201 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_ruleListLiteral5247 = new BitSet(new long[]{0x1FEFF92002C890F0L});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleListLiteral5269 = new BitSet(new long[]{0x0000040002000000L});
-    public static final BitSet FOLLOW_42_in_ruleListLiteral5282 = new BitSet(new long[]{0x1FEFF92000C890F0L});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleListLiteral5303 = new BitSet(new long[]{0x0000040002000000L});
-    public static final BitSet FOLLOW_25_in_ruleListLiteral5319 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConstructorCallExpression_in_entryRuleConstructorCallExpression5355 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleConstructorCallExpression5365 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_57_in_ruleConstructorCallExpression5402 = new BitSet(new long[]{0x1C00000000000080L});
-    public static final BitSet FOLLOW_ruleSimpleType_in_ruleConstructorCallExpression5423 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTypeSelectExpression_in_entryRuleTypeSelectExpression5459 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTypeSelectExpression5469 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_ruleTypeSelectExpression5512 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleTypeSelectExpression5537 = new BitSet(new long[]{0x1C00000000000080L});
-    public static final BitSet FOLLOW_ruleType_in_ruleTypeSelectExpression5558 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_16_in_ruleTypeSelectExpression5570 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCollectionExpression_in_entryRuleCollectionExpression5606 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleCollectionExpression5616 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_44_in_ruleCollectionExpression5661 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_45_in_ruleCollectionExpression5690 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_46_in_ruleCollectionExpression5719 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_47_in_ruleCollectionExpression5748 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_48_in_ruleCollectionExpression5777 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_49_in_ruleCollectionExpression5806 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_50_in_ruleCollectionExpression5835 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_51_in_ruleCollectionExpression5864 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleCollectionExpression5892 = new BitSet(new long[]{0x1FEFF92000C890F0L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleCollectionExpression5914 = new BitSet(new long[]{0x0010000000000000L});
-    public static final BitSet FOLLOW_52_in_ruleCollectionExpression5926 = new BitSet(new long[]{0x1FEFF92000C890F0L});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleCollectionExpression5949 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_16_in_ruleCollectionExpression5961 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleType_in_entryRuleType5997 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleType6007 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCollectionType_in_ruleType6054 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleType_in_ruleType6081 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCollectionType_in_entryRuleCollectionType6116 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleCollectionType6126 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_58_in_ruleCollectionType6171 = new BitSet(new long[]{0x2000000000000000L});
-    public static final BitSet FOLLOW_59_in_ruleCollectionType6200 = new BitSet(new long[]{0x2000000000000000L});
-    public static final BitSet FOLLOW_60_in_ruleCollectionType6229 = new BitSet(new long[]{0x2000000000000000L});
-    public static final BitSet FOLLOW_61_in_ruleCollectionType6257 = new BitSet(new long[]{0x1C00000000000080L});
-    public static final BitSet FOLLOW_ruleSimpleType_in_ruleCollectionType6278 = new BitSet(new long[]{0x4000000000000000L});
-    public static final BitSet FOLLOW_62_in_ruleCollectionType6290 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleType_in_entryRuleSimpleType6326 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSimpleType6336 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleSimpleType6382 = new BitSet(new long[]{0x8000000000000002L});
-    public static final BitSet FOLLOW_63_in_ruleSimpleType6395 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleSimpleType6416 = new BitSet(new long[]{0x8000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_entryRuleIdentifier6455 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIdentifier6466 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleIdentifier6505 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCastedExpression_in_synpred1_InternalExpression149 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_21_in_synpred2_InternalExpression1103 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_1 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_2 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x0000000000000080L});
+    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000000000002000L});
+    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x1FEFF92000C890F0L});
+    public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000000004000L});
+    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x1C00000000000080L});
+    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000000000010000L});
+    public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000000020002L});
+    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000000040002L});
+    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000000000100000L});
+    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000000200002L});
+    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000808000L});
+    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x1FEFF920008080F0L});
+    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000000800000L});
+    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000000005000000L});
+    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000008000002L});
+    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000010000002L});
+    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000000020000002L});
+    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000000FC0000002L});
+    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000003000000002L});
+    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x000000C000000002L});
+    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0000020000000002L});
+    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000000000008000L});
+    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x1FEFF92000C990F0L});
+    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0000040000010000L});
+    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0000080000000000L});
+    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x000FF00000000000L});
+    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0010000000000000L});
+    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x1FEFF92002C890F0L});
+    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0000040002000000L});
+    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x2000000000000000L});
+    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x4000000000000000L});
+    public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x8000000000000002L});
 
 }
\ No newline at end of file
diff --git a/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/serializer/AbstractExpressionSemanticSequencer.java b/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/serializer/AbstractExpressionSemanticSequencer.java
index c511cc381..852a66dc9 100644
--- a/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/serializer/AbstractExpressionSemanticSequencer.java
+++ b/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/serializer/AbstractExpressionSemanticSequencer.java
@@ -26,17 +26,15 @@
 import com.avaloq.tools.ddk.xtext.expression.expression.TypeSelectExpression;
 import com.avaloq.tools.ddk.xtext.expression.services.ExpressionGrammarAccess;
 import com.google.inject.Inject;
-import com.google.inject.Provider;
+import java.util.Set;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.xtext.serializer.acceptor.ISemanticSequenceAcceptor;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.xtext.Action;
+import org.eclipse.xtext.Parameter;
+import org.eclipse.xtext.ParserRule;
+import org.eclipse.xtext.serializer.ISerializationContext;
 import org.eclipse.xtext.serializer.acceptor.SequenceFeeder;
-import org.eclipse.xtext.serializer.diagnostic.ISemanticSequencerDiagnosticProvider;
-import org.eclipse.xtext.serializer.diagnostic.ISerializationDiagnostic.Acceptor;
 import org.eclipse.xtext.serializer.sequencer.AbstractDelegatingSemanticSequencer;
-import org.eclipse.xtext.serializer.sequencer.GenericSequencer;
-import org.eclipse.xtext.serializer.sequencer.ISemanticNodeProvider.INodesForEObjectProvider;
-import org.eclipse.xtext.serializer.sequencer.ISemanticSequencer;
-import org.eclipse.xtext.serializer.sequencer.ITransientValueService;
 import org.eclipse.xtext.serializer.sequencer.ITransientValueService.ValueTransient;
 
 @SuppressWarnings("all")
@@ -46,8 +44,13 @@ public abstract class AbstractExpressionSemanticSequencer extends AbstractDelega
 	private ExpressionGrammarAccess grammarAccess;
 	
 	@Override
-	public void createSequence(EObject context, EObject semanticObject) {
-		if(semanticObject.eClass().getEPackage() == ExpressionPackage.eINSTANCE) switch(semanticObject.eClass().getClassifierID()) {
+	public void sequence(ISerializationContext context, EObject semanticObject) {
+		EPackage epackage = semanticObject.eClass().getEPackage();
+		ParserRule rule = context.getParserRule();
+		Action action = context.getAssignedAction();
+		Set<Parameter> parameters = context.getEnabledBooleanParameters();
+		if (epackage == ExpressionPackage.eINSTANCE)
+			switch (semanticObject.eClass().getClassifierID()) {
 			case ExpressionPackage.BOOLEAN_LITERAL:
 				sequence_BooleanLiteral(context, (BooleanLiteral) semanticObject); 
 				return; 
@@ -64,38 +67,38 @@ public void createSequence(EObject context, EObject semanticObject) {
 				sequence_ChainExpression(context, (ChainExpression) semanticObject); 
 				return; 
 			case ExpressionPackage.COLLECTION_EXPRESSION:
-				if(context == grammarAccess.getCollectionExpressionRule() ||
-				   context == grammarAccess.getFeatureCallRule()) {
+				if (rule == grammarAccess.getFeatureCallRule()
+						|| rule == grammarAccess.getCollectionExpressionRule()) {
 					sequence_CollectionExpression(context, (CollectionExpression) semanticObject); 
 					return; 
 				}
-				else if(context == grammarAccess.getAdditiveExpressionRule() ||
-				   context == grammarAccess.getAdditiveExpressionAccess().getOperationCallParamsAction_1_0() ||
-				   context == grammarAccess.getAndExpressionRule() ||
-				   context == grammarAccess.getAndExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-				   context == grammarAccess.getChainExpressionRule() ||
-				   context == grammarAccess.getChainExpressionAccess().getChainExpressionFirstAction_1_0() ||
-				   context == grammarAccess.getChainedExpressionRule() ||
-				   context == grammarAccess.getExpressionRule() ||
-				   context == grammarAccess.getIfExpressionTriRule() ||
-				   context == grammarAccess.getIfExpressionTriAccess().getIfExpressionConditionAction_1_0() ||
-				   context == grammarAccess.getImpliesExpressionRule() ||
-				   context == grammarAccess.getImpliesExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-				   context == grammarAccess.getInfixExpressionRule() ||
-				   context == grammarAccess.getInfixExpressionAccess().getCollectionExpressionTargetAction_1_3_0() ||
-				   context == grammarAccess.getInfixExpressionAccess().getFeatureCallTargetAction_1_1_0() ||
-				   context == grammarAccess.getInfixExpressionAccess().getOperationCallTargetAction_1_0_0() ||
-				   context == grammarAccess.getInfixExpressionAccess().getTypeSelectExpressionTargetAction_1_2_0() ||
-				   context == grammarAccess.getMultiplicativeExpressionRule() ||
-				   context == grammarAccess.getMultiplicativeExpressionAccess().getOperationCallParamsAction_1_0() ||
-				   context == grammarAccess.getOrExpressionRule() ||
-				   context == grammarAccess.getOrExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-				   context == grammarAccess.getParanthesizedExpressionRule() ||
-				   context == grammarAccess.getPrimaryExpressionRule() ||
-				   context == grammarAccess.getRelationalExpressionRule() ||
-				   context == grammarAccess.getRelationalExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-				   context == grammarAccess.getSyntaxElementRule() ||
-				   context == grammarAccess.getUnaryOrInfixExpressionRule()) {
+				else if (rule == grammarAccess.getExpressionRule()
+						|| rule == grammarAccess.getSyntaxElementRule()
+						|| rule == grammarAccess.getChainExpressionRule()
+						|| action == grammarAccess.getChainExpressionAccess().getChainExpressionFirstAction_1_0()
+						|| rule == grammarAccess.getChainedExpressionRule()
+						|| rule == grammarAccess.getIfExpressionTriRule()
+						|| action == grammarAccess.getIfExpressionTriAccess().getIfExpressionConditionAction_1_0()
+						|| rule == grammarAccess.getOrExpressionRule()
+						|| action == grammarAccess.getOrExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getAndExpressionRule()
+						|| action == grammarAccess.getAndExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getImpliesExpressionRule()
+						|| action == grammarAccess.getImpliesExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getRelationalExpressionRule()
+						|| action == grammarAccess.getRelationalExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getAdditiveExpressionRule()
+						|| action == grammarAccess.getAdditiveExpressionAccess().getOperationCallParamsAction_1_0()
+						|| rule == grammarAccess.getMultiplicativeExpressionRule()
+						|| action == grammarAccess.getMultiplicativeExpressionAccess().getOperationCallParamsAction_1_0()
+						|| rule == grammarAccess.getUnaryOrInfixExpressionRule()
+						|| rule == grammarAccess.getInfixExpressionRule()
+						|| action == grammarAccess.getInfixExpressionAccess().getOperationCallTargetAction_1_0_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getFeatureCallTargetAction_1_1_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getTypeSelectExpressionTargetAction_1_2_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getCollectionExpressionTargetAction_1_3_0()
+						|| rule == grammarAccess.getPrimaryExpressionRule()
+						|| rule == grammarAccess.getParanthesizedExpressionRule()) {
 					sequence_CollectionExpression_InfixExpression(context, (CollectionExpression) semanticObject); 
 					return; 
 				}
@@ -104,37 +107,37 @@ else if(context == grammarAccess.getAdditiveExpressionRule() ||
 				sequence_ConstructorCallExpression(context, (ConstructorCallExpression) semanticObject); 
 				return; 
 			case ExpressionPackage.FEATURE_CALL:
-				if(context == grammarAccess.getFeatureCallRule()) {
+				if (rule == grammarAccess.getFeatureCallRule()) {
 					sequence_FeatureCall(context, (FeatureCall) semanticObject); 
 					return; 
 				}
-				else if(context == grammarAccess.getAdditiveExpressionRule() ||
-				   context == grammarAccess.getAdditiveExpressionAccess().getOperationCallParamsAction_1_0() ||
-				   context == grammarAccess.getAndExpressionRule() ||
-				   context == grammarAccess.getAndExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-				   context == grammarAccess.getChainExpressionRule() ||
-				   context == grammarAccess.getChainExpressionAccess().getChainExpressionFirstAction_1_0() ||
-				   context == grammarAccess.getChainedExpressionRule() ||
-				   context == grammarAccess.getExpressionRule() ||
-				   context == grammarAccess.getIfExpressionTriRule() ||
-				   context == grammarAccess.getIfExpressionTriAccess().getIfExpressionConditionAction_1_0() ||
-				   context == grammarAccess.getImpliesExpressionRule() ||
-				   context == grammarAccess.getImpliesExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-				   context == grammarAccess.getInfixExpressionRule() ||
-				   context == grammarAccess.getInfixExpressionAccess().getCollectionExpressionTargetAction_1_3_0() ||
-				   context == grammarAccess.getInfixExpressionAccess().getFeatureCallTargetAction_1_1_0() ||
-				   context == grammarAccess.getInfixExpressionAccess().getOperationCallTargetAction_1_0_0() ||
-				   context == grammarAccess.getInfixExpressionAccess().getTypeSelectExpressionTargetAction_1_2_0() ||
-				   context == grammarAccess.getMultiplicativeExpressionRule() ||
-				   context == grammarAccess.getMultiplicativeExpressionAccess().getOperationCallParamsAction_1_0() ||
-				   context == grammarAccess.getOrExpressionRule() ||
-				   context == grammarAccess.getOrExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-				   context == grammarAccess.getParanthesizedExpressionRule() ||
-				   context == grammarAccess.getPrimaryExpressionRule() ||
-				   context == grammarAccess.getRelationalExpressionRule() ||
-				   context == grammarAccess.getRelationalExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-				   context == grammarAccess.getSyntaxElementRule() ||
-				   context == grammarAccess.getUnaryOrInfixExpressionRule()) {
+				else if (rule == grammarAccess.getExpressionRule()
+						|| rule == grammarAccess.getSyntaxElementRule()
+						|| rule == grammarAccess.getChainExpressionRule()
+						|| action == grammarAccess.getChainExpressionAccess().getChainExpressionFirstAction_1_0()
+						|| rule == grammarAccess.getChainedExpressionRule()
+						|| rule == grammarAccess.getIfExpressionTriRule()
+						|| action == grammarAccess.getIfExpressionTriAccess().getIfExpressionConditionAction_1_0()
+						|| rule == grammarAccess.getOrExpressionRule()
+						|| action == grammarAccess.getOrExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getAndExpressionRule()
+						|| action == grammarAccess.getAndExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getImpliesExpressionRule()
+						|| action == grammarAccess.getImpliesExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getRelationalExpressionRule()
+						|| action == grammarAccess.getRelationalExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getAdditiveExpressionRule()
+						|| action == grammarAccess.getAdditiveExpressionAccess().getOperationCallParamsAction_1_0()
+						|| rule == grammarAccess.getMultiplicativeExpressionRule()
+						|| action == grammarAccess.getMultiplicativeExpressionAccess().getOperationCallParamsAction_1_0()
+						|| rule == grammarAccess.getUnaryOrInfixExpressionRule()
+						|| rule == grammarAccess.getInfixExpressionRule()
+						|| action == grammarAccess.getInfixExpressionAccess().getOperationCallTargetAction_1_0_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getFeatureCallTargetAction_1_1_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getTypeSelectExpressionTargetAction_1_2_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getCollectionExpressionTargetAction_1_3_0()
+						|| rule == grammarAccess.getPrimaryExpressionRule()
+						|| rule == grammarAccess.getParanthesizedExpressionRule()) {
 					sequence_FeatureCall_InfixExpression(context, (FeatureCall) semanticObject); 
 					return; 
 				}
@@ -143,53 +146,53 @@ else if(context == grammarAccess.getAdditiveExpressionRule() ||
 				sequence_GlobalVarExpression(context, (GlobalVarExpression) semanticObject); 
 				return; 
 			case ExpressionPackage.IDENTIFIER:
-				if(context == grammarAccess.getCollectionTypeRule()) {
+				if (rule == grammarAccess.getCollectionTypeRule()) {
 					sequence_CollectionType(context, (Identifier) semanticObject); 
 					return; 
 				}
-				else if(context == grammarAccess.getSyntaxElementRule() ||
-				   context == grammarAccess.getTypeRule()) {
-					sequence_CollectionType_SimpleType_Type(context, (Identifier) semanticObject); 
+				else if (rule == grammarAccess.getSyntaxElementRule()
+						|| rule == grammarAccess.getTypeRule()) {
+					sequence_CollectionType_SimpleType(context, (Identifier) semanticObject); 
 					return; 
 				}
-				else if(context == grammarAccess.getSimpleTypeRule()) {
+				else if (rule == grammarAccess.getSimpleTypeRule()) {
 					sequence_SimpleType(context, (Identifier) semanticObject); 
 					return; 
 				}
 				else break;
 			case ExpressionPackage.IF_EXPRESSION:
-				if(context == grammarAccess.getAdditiveExpressionRule() ||
-				   context == grammarAccess.getAdditiveExpressionAccess().getOperationCallParamsAction_1_0() ||
-				   context == grammarAccess.getAndExpressionRule() ||
-				   context == grammarAccess.getAndExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-				   context == grammarAccess.getChainExpressionRule() ||
-				   context == grammarAccess.getChainExpressionAccess().getChainExpressionFirstAction_1_0() ||
-				   context == grammarAccess.getChainedExpressionRule() ||
-				   context == grammarAccess.getExpressionRule() ||
-				   context == grammarAccess.getIfExpressionTriRule() ||
-				   context == grammarAccess.getIfExpressionTriAccess().getIfExpressionConditionAction_1_0() ||
-				   context == grammarAccess.getImpliesExpressionRule() ||
-				   context == grammarAccess.getImpliesExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-				   context == grammarAccess.getInfixExpressionRule() ||
-				   context == grammarAccess.getInfixExpressionAccess().getCollectionExpressionTargetAction_1_3_0() ||
-				   context == grammarAccess.getInfixExpressionAccess().getFeatureCallTargetAction_1_1_0() ||
-				   context == grammarAccess.getInfixExpressionAccess().getOperationCallTargetAction_1_0_0() ||
-				   context == grammarAccess.getInfixExpressionAccess().getTypeSelectExpressionTargetAction_1_2_0() ||
-				   context == grammarAccess.getMultiplicativeExpressionRule() ||
-				   context == grammarAccess.getMultiplicativeExpressionAccess().getOperationCallParamsAction_1_0() ||
-				   context == grammarAccess.getOrExpressionRule() ||
-				   context == grammarAccess.getOrExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-				   context == grammarAccess.getParanthesizedExpressionRule() ||
-				   context == grammarAccess.getPrimaryExpressionRule() ||
-				   context == grammarAccess.getRelationalExpressionRule() ||
-				   context == grammarAccess.getRelationalExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-				   context == grammarAccess.getSyntaxElementRule() ||
-				   context == grammarAccess.getUnaryOrInfixExpressionRule()) {
-					sequence_ChainedExpression_IfExpressionKw_IfExpressionTri(context, (IfExpression) semanticObject); 
+				if (rule == grammarAccess.getIfExpressionKwRule()) {
+					sequence_IfExpressionKw(context, (IfExpression) semanticObject); 
 					return; 
 				}
-				else if(context == grammarAccess.getIfExpressionKwRule()) {
-					sequence_IfExpressionKw(context, (IfExpression) semanticObject); 
+				else if (rule == grammarAccess.getExpressionRule()
+						|| rule == grammarAccess.getSyntaxElementRule()
+						|| rule == grammarAccess.getChainExpressionRule()
+						|| action == grammarAccess.getChainExpressionAccess().getChainExpressionFirstAction_1_0()
+						|| rule == grammarAccess.getChainedExpressionRule()
+						|| rule == grammarAccess.getIfExpressionTriRule()
+						|| action == grammarAccess.getIfExpressionTriAccess().getIfExpressionConditionAction_1_0()
+						|| rule == grammarAccess.getOrExpressionRule()
+						|| action == grammarAccess.getOrExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getAndExpressionRule()
+						|| action == grammarAccess.getAndExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getImpliesExpressionRule()
+						|| action == grammarAccess.getImpliesExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getRelationalExpressionRule()
+						|| action == grammarAccess.getRelationalExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getAdditiveExpressionRule()
+						|| action == grammarAccess.getAdditiveExpressionAccess().getOperationCallParamsAction_1_0()
+						|| rule == grammarAccess.getMultiplicativeExpressionRule()
+						|| action == grammarAccess.getMultiplicativeExpressionAccess().getOperationCallParamsAction_1_0()
+						|| rule == grammarAccess.getUnaryOrInfixExpressionRule()
+						|| rule == grammarAccess.getInfixExpressionRule()
+						|| action == grammarAccess.getInfixExpressionAccess().getOperationCallTargetAction_1_0_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getFeatureCallTargetAction_1_1_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getTypeSelectExpressionTargetAction_1_2_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getCollectionExpressionTargetAction_1_3_0()
+						|| rule == grammarAccess.getPrimaryExpressionRule()
+						|| rule == grammarAccess.getParanthesizedExpressionRule()) {
+					sequence_IfExpressionKw_IfExpressionTri(context, (IfExpression) semanticObject); 
 					return; 
 				}
 				else break;
@@ -206,42 +209,42 @@ else if(context == grammarAccess.getIfExpressionKwRule()) {
 				sequence_NullLiteral(context, (NullLiteral) semanticObject); 
 				return; 
 			case ExpressionPackage.OPERATION_CALL:
-				if(context == grammarAccess.getAdditiveExpressionRule() ||
-				   context == grammarAccess.getAdditiveExpressionAccess().getOperationCallParamsAction_1_0() ||
-				   context == grammarAccess.getAndExpressionRule() ||
-				   context == grammarAccess.getAndExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-				   context == grammarAccess.getChainExpressionRule() ||
-				   context == grammarAccess.getChainExpressionAccess().getChainExpressionFirstAction_1_0() ||
-				   context == grammarAccess.getChainedExpressionRule() ||
-				   context == grammarAccess.getExpressionRule() ||
-				   context == grammarAccess.getIfExpressionTriRule() ||
-				   context == grammarAccess.getIfExpressionTriAccess().getIfExpressionConditionAction_1_0() ||
-				   context == grammarAccess.getImpliesExpressionRule() ||
-				   context == grammarAccess.getImpliesExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-				   context == grammarAccess.getInfixExpressionRule() ||
-				   context == grammarAccess.getInfixExpressionAccess().getCollectionExpressionTargetAction_1_3_0() ||
-				   context == grammarAccess.getInfixExpressionAccess().getFeatureCallTargetAction_1_1_0() ||
-				   context == grammarAccess.getInfixExpressionAccess().getOperationCallTargetAction_1_0_0() ||
-				   context == grammarAccess.getInfixExpressionAccess().getTypeSelectExpressionTargetAction_1_2_0() ||
-				   context == grammarAccess.getMultiplicativeExpressionRule() ||
-				   context == grammarAccess.getMultiplicativeExpressionAccess().getOperationCallParamsAction_1_0() ||
-				   context == grammarAccess.getOrExpressionRule() ||
-				   context == grammarAccess.getOrExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-				   context == grammarAccess.getParanthesizedExpressionRule() ||
-				   context == grammarAccess.getPrimaryExpressionRule() ||
-				   context == grammarAccess.getRelationalExpressionRule() ||
-				   context == grammarAccess.getRelationalExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-				   context == grammarAccess.getSyntaxElementRule() ||
-				   context == grammarAccess.getUnaryOrInfixExpressionRule()) {
-					sequence_AdditiveExpression_InfixExpression_MultiplicativeExpression_OperationCall_UnaryExpression_UnaryOrInfixExpression(context, (OperationCall) semanticObject); 
+				if (rule == grammarAccess.getExpressionRule()
+						|| rule == grammarAccess.getSyntaxElementRule()
+						|| rule == grammarAccess.getChainExpressionRule()
+						|| action == grammarAccess.getChainExpressionAccess().getChainExpressionFirstAction_1_0()
+						|| rule == grammarAccess.getChainedExpressionRule()
+						|| rule == grammarAccess.getIfExpressionTriRule()
+						|| action == grammarAccess.getIfExpressionTriAccess().getIfExpressionConditionAction_1_0()
+						|| rule == grammarAccess.getOrExpressionRule()
+						|| action == grammarAccess.getOrExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getAndExpressionRule()
+						|| action == grammarAccess.getAndExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getImpliesExpressionRule()
+						|| action == grammarAccess.getImpliesExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getRelationalExpressionRule()
+						|| action == grammarAccess.getRelationalExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getAdditiveExpressionRule()
+						|| action == grammarAccess.getAdditiveExpressionAccess().getOperationCallParamsAction_1_0()
+						|| rule == grammarAccess.getMultiplicativeExpressionRule()
+						|| action == grammarAccess.getMultiplicativeExpressionAccess().getOperationCallParamsAction_1_0()
+						|| rule == grammarAccess.getUnaryOrInfixExpressionRule()
+						|| rule == grammarAccess.getInfixExpressionRule()
+						|| action == grammarAccess.getInfixExpressionAccess().getOperationCallTargetAction_1_0_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getFeatureCallTargetAction_1_1_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getTypeSelectExpressionTargetAction_1_2_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getCollectionExpressionTargetAction_1_3_0()
+						|| rule == grammarAccess.getPrimaryExpressionRule()
+						|| rule == grammarAccess.getParanthesizedExpressionRule()) {
+					sequence_AdditiveExpression_InfixExpression_MultiplicativeExpression_OperationCall_UnaryExpression(context, (OperationCall) semanticObject); 
 					return; 
 				}
-				else if(context == grammarAccess.getFeatureCallRule() ||
-				   context == grammarAccess.getOperationCallRule()) {
+				else if (rule == grammarAccess.getFeatureCallRule()
+						|| rule == grammarAccess.getOperationCallRule()) {
 					sequence_OperationCall(context, (OperationCall) semanticObject); 
 					return; 
 				}
-				else if(context == grammarAccess.getUnaryExpressionRule()) {
+				else if (rule == grammarAccess.getUnaryExpressionRule()) {
 					sequence_UnaryExpression(context, (OperationCall) semanticObject); 
 					return; 
 				}
@@ -256,64 +259,125 @@ else if(context == grammarAccess.getUnaryExpressionRule()) {
 				sequence_SwitchExpression(context, (SwitchExpression) semanticObject); 
 				return; 
 			case ExpressionPackage.TYPE_SELECT_EXPRESSION:
-				if(context == grammarAccess.getAdditiveExpressionRule() ||
-				   context == grammarAccess.getAdditiveExpressionAccess().getOperationCallParamsAction_1_0() ||
-				   context == grammarAccess.getAndExpressionRule() ||
-				   context == grammarAccess.getAndExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-				   context == grammarAccess.getChainExpressionRule() ||
-				   context == grammarAccess.getChainExpressionAccess().getChainExpressionFirstAction_1_0() ||
-				   context == grammarAccess.getChainedExpressionRule() ||
-				   context == grammarAccess.getExpressionRule() ||
-				   context == grammarAccess.getIfExpressionTriRule() ||
-				   context == grammarAccess.getIfExpressionTriAccess().getIfExpressionConditionAction_1_0() ||
-				   context == grammarAccess.getImpliesExpressionRule() ||
-				   context == grammarAccess.getImpliesExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-				   context == grammarAccess.getInfixExpressionRule() ||
-				   context == grammarAccess.getInfixExpressionAccess().getCollectionExpressionTargetAction_1_3_0() ||
-				   context == grammarAccess.getInfixExpressionAccess().getFeatureCallTargetAction_1_1_0() ||
-				   context == grammarAccess.getInfixExpressionAccess().getOperationCallTargetAction_1_0_0() ||
-				   context == grammarAccess.getInfixExpressionAccess().getTypeSelectExpressionTargetAction_1_2_0() ||
-				   context == grammarAccess.getMultiplicativeExpressionRule() ||
-				   context == grammarAccess.getMultiplicativeExpressionAccess().getOperationCallParamsAction_1_0() ||
-				   context == grammarAccess.getOrExpressionRule() ||
-				   context == grammarAccess.getOrExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-				   context == grammarAccess.getParanthesizedExpressionRule() ||
-				   context == grammarAccess.getPrimaryExpressionRule() ||
-				   context == grammarAccess.getRelationalExpressionRule() ||
-				   context == grammarAccess.getRelationalExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-				   context == grammarAccess.getSyntaxElementRule() ||
-				   context == grammarAccess.getUnaryOrInfixExpressionRule()) {
+				if (rule == grammarAccess.getExpressionRule()
+						|| rule == grammarAccess.getSyntaxElementRule()
+						|| rule == grammarAccess.getChainExpressionRule()
+						|| action == grammarAccess.getChainExpressionAccess().getChainExpressionFirstAction_1_0()
+						|| rule == grammarAccess.getChainedExpressionRule()
+						|| rule == grammarAccess.getIfExpressionTriRule()
+						|| action == grammarAccess.getIfExpressionTriAccess().getIfExpressionConditionAction_1_0()
+						|| rule == grammarAccess.getOrExpressionRule()
+						|| action == grammarAccess.getOrExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getAndExpressionRule()
+						|| action == grammarAccess.getAndExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getImpliesExpressionRule()
+						|| action == grammarAccess.getImpliesExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getRelationalExpressionRule()
+						|| action == grammarAccess.getRelationalExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getAdditiveExpressionRule()
+						|| action == grammarAccess.getAdditiveExpressionAccess().getOperationCallParamsAction_1_0()
+						|| rule == grammarAccess.getMultiplicativeExpressionRule()
+						|| action == grammarAccess.getMultiplicativeExpressionAccess().getOperationCallParamsAction_1_0()
+						|| rule == grammarAccess.getUnaryOrInfixExpressionRule()
+						|| rule == grammarAccess.getInfixExpressionRule()
+						|| action == grammarAccess.getInfixExpressionAccess().getOperationCallTargetAction_1_0_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getFeatureCallTargetAction_1_1_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getTypeSelectExpressionTargetAction_1_2_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getCollectionExpressionTargetAction_1_3_0()
+						|| rule == grammarAccess.getPrimaryExpressionRule()
+						|| rule == grammarAccess.getParanthesizedExpressionRule()) {
 					sequence_InfixExpression_TypeSelectExpression(context, (TypeSelectExpression) semanticObject); 
 					return; 
 				}
-				else if(context == grammarAccess.getFeatureCallRule() ||
-				   context == grammarAccess.getTypeSelectExpressionRule()) {
+				else if (rule == grammarAccess.getFeatureCallRule()
+						|| rule == grammarAccess.getTypeSelectExpressionRule()) {
 					sequence_TypeSelectExpression(context, (TypeSelectExpression) semanticObject); 
 					return; 
 				}
 				else break;
 			}
-		if (errorAcceptor != null) errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
+		if (errorAcceptor != null)
+			errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
 	}
 	
 	/**
+	 * Contexts:
+	 *     Expression returns OperationCall
+	 *     SyntaxElement returns OperationCall
+	 *     ChainExpression returns OperationCall
+	 *     ChainExpression.ChainExpression_1_0 returns OperationCall
+	 *     ChainedExpression returns OperationCall
+	 *     IfExpressionTri returns OperationCall
+	 *     IfExpressionTri.IfExpression_1_0 returns OperationCall
+	 *     OrExpression returns OperationCall
+	 *     OrExpression.BooleanOperation_1_0 returns OperationCall
+	 *     AndExpression returns OperationCall
+	 *     AndExpression.BooleanOperation_1_0 returns OperationCall
+	 *     ImpliesExpression returns OperationCall
+	 *     ImpliesExpression.BooleanOperation_1_0 returns OperationCall
+	 *     RelationalExpression returns OperationCall
+	 *     RelationalExpression.BooleanOperation_1_0 returns OperationCall
+	 *     AdditiveExpression returns OperationCall
+	 *     AdditiveExpression.OperationCall_1_0 returns OperationCall
+	 *     MultiplicativeExpression returns OperationCall
+	 *     MultiplicativeExpression.OperationCall_1_0 returns OperationCall
+	 *     UnaryOrInfixExpression returns OperationCall
+	 *     InfixExpression returns OperationCall
+	 *     InfixExpression.OperationCall_1_0_0 returns OperationCall
+	 *     InfixExpression.FeatureCall_1_1_0 returns OperationCall
+	 *     InfixExpression.TypeSelectExpression_1_2_0 returns OperationCall
+	 *     InfixExpression.CollectionExpression_1_3_0 returns OperationCall
+	 *     PrimaryExpression returns OperationCall
+	 *     ParanthesizedExpression returns OperationCall
+	 *
 	 * Constraint:
 	 *     (
+	 *         (params+=AdditiveExpression_OperationCall_1_0 (name='+' | name='-') params+=MultiplicativeExpression) | 
+	 *         (params+=MultiplicativeExpression_OperationCall_1_0 (name='*' | name='/') params+=UnaryOrInfixExpression) | 
 	 *         ((name='!' | name='-') params+=InfixExpression) | 
 	 *         (target=InfixExpression_OperationCall_1_0_0 name=Identifier (params+=Expression params+=Expression*)?) | 
-	 *         (name=Identifier (params+=Expression params+=Expression*)?) | 
-	 *         (params+=MultiplicativeExpression_OperationCall_1_0 (name='*' | name='/') params+=UnaryOrInfixExpression) | 
-	 *         (params+=AdditiveExpression_OperationCall_1_0 (name='+' | name='-') params+=MultiplicativeExpression)
+	 *         (name=Identifier (params+=Expression params+=Expression*)?)
 	 *     )
 	 */
-	protected void sequence_AdditiveExpression_InfixExpression_MultiplicativeExpression_OperationCall_UnaryExpression_UnaryOrInfixExpression(EObject context, OperationCall semanticObject) {
+	protected void sequence_AdditiveExpression_InfixExpression_MultiplicativeExpression_OperationCall_UnaryExpression(ISerializationContext context, OperationCall semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Expression returns BooleanOperation
+	 *     SyntaxElement returns BooleanOperation
+	 *     ChainExpression returns BooleanOperation
+	 *     ChainExpression.ChainExpression_1_0 returns BooleanOperation
+	 *     ChainedExpression returns BooleanOperation
+	 *     IfExpressionTri returns BooleanOperation
+	 *     IfExpressionTri.IfExpression_1_0 returns BooleanOperation
+	 *     OrExpression returns BooleanOperation
+	 *     OrExpression.BooleanOperation_1_0 returns BooleanOperation
+	 *     AndExpression returns BooleanOperation
+	 *     AndExpression.BooleanOperation_1_0 returns BooleanOperation
+	 *     ImpliesExpression returns BooleanOperation
+	 *     ImpliesExpression.BooleanOperation_1_0 returns BooleanOperation
+	 *     RelationalExpression returns BooleanOperation
+	 *     RelationalExpression.BooleanOperation_1_0 returns BooleanOperation
+	 *     AdditiveExpression returns BooleanOperation
+	 *     AdditiveExpression.OperationCall_1_0 returns BooleanOperation
+	 *     MultiplicativeExpression returns BooleanOperation
+	 *     MultiplicativeExpression.OperationCall_1_0 returns BooleanOperation
+	 *     UnaryOrInfixExpression returns BooleanOperation
+	 *     InfixExpression returns BooleanOperation
+	 *     InfixExpression.OperationCall_1_0_0 returns BooleanOperation
+	 *     InfixExpression.FeatureCall_1_1_0 returns BooleanOperation
+	 *     InfixExpression.TypeSelectExpression_1_2_0 returns BooleanOperation
+	 *     InfixExpression.CollectionExpression_1_3_0 returns BooleanOperation
+	 *     PrimaryExpression returns BooleanOperation
+	 *     ParanthesizedExpression returns BooleanOperation
+	 *
 	 * Constraint:
 	 *     (
+	 *         (left=OrExpression_BooleanOperation_1_0 operator='||' right=AndExpression) | 
+	 *         (left=AndExpression_BooleanOperation_1_0 operator='&&' right=ImpliesExpression) | 
 	 *         (left=ImpliesExpression_BooleanOperation_1_0 operator='implies' right=RelationalExpression) | 
 	 *         (
 	 *             left=RelationalExpression_BooleanOperation_1_0 
@@ -326,38 +390,70 @@ protected void sequence_AdditiveExpression_InfixExpression_MultiplicativeExpress
 	 *                 operator='<'
 	 *             ) 
 	 *             right=AdditiveExpression
-	 *         ) | 
-	 *         (left=AndExpression_BooleanOperation_1_0 operator='&&' right=ImpliesExpression) | 
-	 *         (left=OrExpression_BooleanOperation_1_0 operator='||' right=AndExpression)
+	 *         )
 	 *     )
 	 */
-	protected void sequence_AndExpression_ImpliesExpression_OrExpression_RelationalExpression(EObject context, BooleanOperation semanticObject) {
+	protected void sequence_AndExpression_ImpliesExpression_OrExpression_RelationalExpression(ISerializationContext context, BooleanOperation semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Expression returns BooleanLiteral
+	 *     SyntaxElement returns BooleanLiteral
+	 *     ChainExpression returns BooleanLiteral
+	 *     ChainExpression.ChainExpression_1_0 returns BooleanLiteral
+	 *     ChainedExpression returns BooleanLiteral
+	 *     IfExpressionTri returns BooleanLiteral
+	 *     IfExpressionTri.IfExpression_1_0 returns BooleanLiteral
+	 *     OrExpression returns BooleanLiteral
+	 *     OrExpression.BooleanOperation_1_0 returns BooleanLiteral
+	 *     AndExpression returns BooleanLiteral
+	 *     AndExpression.BooleanOperation_1_0 returns BooleanLiteral
+	 *     ImpliesExpression returns BooleanLiteral
+	 *     ImpliesExpression.BooleanOperation_1_0 returns BooleanLiteral
+	 *     RelationalExpression returns BooleanLiteral
+	 *     RelationalExpression.BooleanOperation_1_0 returns BooleanLiteral
+	 *     AdditiveExpression returns BooleanLiteral
+	 *     AdditiveExpression.OperationCall_1_0 returns BooleanLiteral
+	 *     MultiplicativeExpression returns BooleanLiteral
+	 *     MultiplicativeExpression.OperationCall_1_0 returns BooleanLiteral
+	 *     UnaryOrInfixExpression returns BooleanLiteral
+	 *     InfixExpression returns BooleanLiteral
+	 *     InfixExpression.OperationCall_1_0_0 returns BooleanLiteral
+	 *     InfixExpression.FeatureCall_1_1_0 returns BooleanLiteral
+	 *     InfixExpression.TypeSelectExpression_1_2_0 returns BooleanLiteral
+	 *     InfixExpression.CollectionExpression_1_3_0 returns BooleanLiteral
+	 *     PrimaryExpression returns BooleanLiteral
+	 *     Literal returns BooleanLiteral
+	 *     BooleanLiteral returns BooleanLiteral
+	 *     ParanthesizedExpression returns BooleanLiteral
+	 *
 	 * Constraint:
 	 *     (val='true' | val='false')
 	 */
-	protected void sequence_BooleanLiteral(EObject context, BooleanLiteral semanticObject) {
+	protected void sequence_BooleanLiteral(ISerializationContext context, BooleanLiteral semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     SyntaxElement returns Case
+	 *     Case returns Case
+	 *
 	 * Constraint:
 	 *     (condition=OrExpression thenPar=OrExpression)
 	 */
-	protected void sequence_Case(EObject context, Case semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, ExpressionPackage.Literals.CASE__CONDITION) == ValueTransient.YES)
+	protected void sequence_Case(ISerializationContext context, Case semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, ExpressionPackage.Literals.CASE__CONDITION) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ExpressionPackage.Literals.CASE__CONDITION));
-			if(transientValues.isValueTransient(semanticObject, ExpressionPackage.Literals.CASE__THEN_PAR) == ValueTransient.YES)
+			if (transientValues.isValueTransient(semanticObject, ExpressionPackage.Literals.CASE__THEN_PAR) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ExpressionPackage.Literals.CASE__THEN_PAR));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getCaseAccess().getConditionOrExpressionParserRuleCall_1_0(), semanticObject.getCondition());
 		feeder.accept(grammarAccess.getCaseAccess().getThenParOrExpressionParserRuleCall_3_0(), semanticObject.getThenPar());
 		feeder.finish();
@@ -365,18 +461,47 @@ protected void sequence_Case(EObject context, Case semanticObject) {
 	
 	
 	/**
+	 * Contexts:
+	 *     Expression returns CastedExpression
+	 *     SyntaxElement returns CastedExpression
+	 *     CastedExpression returns CastedExpression
+	 *     ChainExpression returns CastedExpression
+	 *     ChainExpression.ChainExpression_1_0 returns CastedExpression
+	 *     ChainedExpression returns CastedExpression
+	 *     IfExpressionTri returns CastedExpression
+	 *     IfExpressionTri.IfExpression_1_0 returns CastedExpression
+	 *     OrExpression returns CastedExpression
+	 *     OrExpression.BooleanOperation_1_0 returns CastedExpression
+	 *     AndExpression returns CastedExpression
+	 *     AndExpression.BooleanOperation_1_0 returns CastedExpression
+	 *     ImpliesExpression returns CastedExpression
+	 *     ImpliesExpression.BooleanOperation_1_0 returns CastedExpression
+	 *     RelationalExpression returns CastedExpression
+	 *     RelationalExpression.BooleanOperation_1_0 returns CastedExpression
+	 *     AdditiveExpression returns CastedExpression
+	 *     AdditiveExpression.OperationCall_1_0 returns CastedExpression
+	 *     MultiplicativeExpression returns CastedExpression
+	 *     MultiplicativeExpression.OperationCall_1_0 returns CastedExpression
+	 *     UnaryOrInfixExpression returns CastedExpression
+	 *     InfixExpression returns CastedExpression
+	 *     InfixExpression.OperationCall_1_0_0 returns CastedExpression
+	 *     InfixExpression.FeatureCall_1_1_0 returns CastedExpression
+	 *     InfixExpression.TypeSelectExpression_1_2_0 returns CastedExpression
+	 *     InfixExpression.CollectionExpression_1_3_0 returns CastedExpression
+	 *     PrimaryExpression returns CastedExpression
+	 *     ParanthesizedExpression returns CastedExpression
+	 *
 	 * Constraint:
 	 *     (type=Type target=Expression)
 	 */
-	protected void sequence_CastedExpression(EObject context, CastedExpression semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, ExpressionPackage.Literals.CASTED_EXPRESSION__TYPE) == ValueTransient.YES)
+	protected void sequence_CastedExpression(ISerializationContext context, CastedExpression semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, ExpressionPackage.Literals.CASTED_EXPRESSION__TYPE) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ExpressionPackage.Literals.CASTED_EXPRESSION__TYPE));
-			if(transientValues.isValueTransient(semanticObject, ExpressionPackage.Literals.CASTED_EXPRESSION__TARGET) == ValueTransient.YES)
+			if (transientValues.isValueTransient(semanticObject, ExpressionPackage.Literals.CASTED_EXPRESSION__TARGET) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ExpressionPackage.Literals.CASTED_EXPRESSION__TARGET));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getCastedExpressionAccess().getTypeTypeParserRuleCall_1_0(), semanticObject.getType());
 		feeder.accept(grammarAccess.getCastedExpressionAccess().getTargetExpressionParserRuleCall_3_0(), semanticObject.getTarget());
 		feeder.finish();
@@ -384,18 +509,46 @@ protected void sequence_CastedExpression(EObject context, CastedExpression seman
 	
 	
 	/**
+	 * Contexts:
+	 *     Expression returns ChainExpression
+	 *     SyntaxElement returns ChainExpression
+	 *     ChainExpression returns ChainExpression
+	 *     ChainExpression.ChainExpression_1_0 returns ChainExpression
+	 *     ChainedExpression returns ChainExpression
+	 *     IfExpressionTri returns ChainExpression
+	 *     IfExpressionTri.IfExpression_1_0 returns ChainExpression
+	 *     OrExpression returns ChainExpression
+	 *     OrExpression.BooleanOperation_1_0 returns ChainExpression
+	 *     AndExpression returns ChainExpression
+	 *     AndExpression.BooleanOperation_1_0 returns ChainExpression
+	 *     ImpliesExpression returns ChainExpression
+	 *     ImpliesExpression.BooleanOperation_1_0 returns ChainExpression
+	 *     RelationalExpression returns ChainExpression
+	 *     RelationalExpression.BooleanOperation_1_0 returns ChainExpression
+	 *     AdditiveExpression returns ChainExpression
+	 *     AdditiveExpression.OperationCall_1_0 returns ChainExpression
+	 *     MultiplicativeExpression returns ChainExpression
+	 *     MultiplicativeExpression.OperationCall_1_0 returns ChainExpression
+	 *     UnaryOrInfixExpression returns ChainExpression
+	 *     InfixExpression returns ChainExpression
+	 *     InfixExpression.OperationCall_1_0_0 returns ChainExpression
+	 *     InfixExpression.FeatureCall_1_1_0 returns ChainExpression
+	 *     InfixExpression.TypeSelectExpression_1_2_0 returns ChainExpression
+	 *     InfixExpression.CollectionExpression_1_3_0 returns ChainExpression
+	 *     PrimaryExpression returns ChainExpression
+	 *     ParanthesizedExpression returns ChainExpression
+	 *
 	 * Constraint:
 	 *     (first=ChainExpression_ChainExpression_1_0 next=ChainedExpression)
 	 */
-	protected void sequence_ChainExpression(EObject context, ChainExpression semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, ExpressionPackage.Literals.CHAIN_EXPRESSION__FIRST) == ValueTransient.YES)
+	protected void sequence_ChainExpression(ISerializationContext context, ChainExpression semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, ExpressionPackage.Literals.CHAIN_EXPRESSION__FIRST) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ExpressionPackage.Literals.CHAIN_EXPRESSION__FIRST));
-			if(transientValues.isValueTransient(semanticObject, ExpressionPackage.Literals.CHAIN_EXPRESSION__NEXT) == ValueTransient.YES)
+			if (transientValues.isValueTransient(semanticObject, ExpressionPackage.Literals.CHAIN_EXPRESSION__NEXT) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ExpressionPackage.Literals.CHAIN_EXPRESSION__NEXT));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getChainExpressionAccess().getChainExpressionFirstAction_1_0(), semanticObject.getFirst());
 		feeder.accept(grammarAccess.getChainExpressionAccess().getNextChainedExpressionParserRuleCall_1_2_0(), semanticObject.getNext());
 		feeder.finish();
@@ -403,18 +556,10 @@ protected void sequence_ChainExpression(EObject context, ChainExpression semanti
 	
 	
 	/**
-	 * Constraint:
-	 *     (
-	 *         (condition=ChainedExpression thenPart=ChainedExpression elsePart=ChainedExpression?) | 
-	 *         (condition=IfExpressionTri_IfExpression_1_0 thenPart=ChainedExpression elsePart=ChainedExpression)
-	 *     )
-	 */
-	protected void sequence_ChainedExpression_IfExpressionKw_IfExpressionTri(EObject context, IfExpression semanticObject) {
-		genericSequencer.createSequence(context, semanticObject);
-	}
-	
-	
-	/**
+	 * Contexts:
+	 *     FeatureCall returns CollectionExpression
+	 *     CollectionExpression returns CollectionExpression
+	 *
 	 * Constraint:
 	 *     (
 	 *         (
@@ -431,12 +576,41 @@ protected void sequence_ChainedExpression_IfExpressionKw_IfExpressionTri(EObject
 	 *         exp=Expression
 	 *     )
 	 */
-	protected void sequence_CollectionExpression(EObject context, CollectionExpression semanticObject) {
+	protected void sequence_CollectionExpression(ISerializationContext context, CollectionExpression semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Expression returns CollectionExpression
+	 *     SyntaxElement returns CollectionExpression
+	 *     ChainExpression returns CollectionExpression
+	 *     ChainExpression.ChainExpression_1_0 returns CollectionExpression
+	 *     ChainedExpression returns CollectionExpression
+	 *     IfExpressionTri returns CollectionExpression
+	 *     IfExpressionTri.IfExpression_1_0 returns CollectionExpression
+	 *     OrExpression returns CollectionExpression
+	 *     OrExpression.BooleanOperation_1_0 returns CollectionExpression
+	 *     AndExpression returns CollectionExpression
+	 *     AndExpression.BooleanOperation_1_0 returns CollectionExpression
+	 *     ImpliesExpression returns CollectionExpression
+	 *     ImpliesExpression.BooleanOperation_1_0 returns CollectionExpression
+	 *     RelationalExpression returns CollectionExpression
+	 *     RelationalExpression.BooleanOperation_1_0 returns CollectionExpression
+	 *     AdditiveExpression returns CollectionExpression
+	 *     AdditiveExpression.OperationCall_1_0 returns CollectionExpression
+	 *     MultiplicativeExpression returns CollectionExpression
+	 *     MultiplicativeExpression.OperationCall_1_0 returns CollectionExpression
+	 *     UnaryOrInfixExpression returns CollectionExpression
+	 *     InfixExpression returns CollectionExpression
+	 *     InfixExpression.OperationCall_1_0_0 returns CollectionExpression
+	 *     InfixExpression.FeatureCall_1_1_0 returns CollectionExpression
+	 *     InfixExpression.TypeSelectExpression_1_2_0 returns CollectionExpression
+	 *     InfixExpression.CollectionExpression_1_3_0 returns CollectionExpression
+	 *     PrimaryExpression returns CollectionExpression
+	 *     ParanthesizedExpression returns CollectionExpression
+	 *
 	 * Constraint:
 	 *     (
 	 *         (
@@ -470,128 +644,363 @@ protected void sequence_CollectionExpression(EObject context, CollectionExpressi
 	 *         )
 	 *     )
 	 */
-	protected void sequence_CollectionExpression_InfixExpression(EObject context, CollectionExpression semanticObject) {
+	protected void sequence_CollectionExpression_InfixExpression(ISerializationContext context, CollectionExpression semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     CollectionType returns Identifier
+	 *
 	 * Constraint:
 	 *     ((cl='Collection' | cl='List' | cl='Set') id1=SimpleType)
 	 */
-	protected void sequence_CollectionType(EObject context, Identifier semanticObject) {
+	protected void sequence_CollectionType(ISerializationContext context, Identifier semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     SyntaxElement returns Identifier
+	 *     Type returns Identifier
+	 *
 	 * Constraint:
 	 *     (((cl='Collection' | cl='List' | cl='Set') id1=SimpleType) | (id+=Identifier id+=Identifier*))
 	 */
-	protected void sequence_CollectionType_SimpleType_Type(EObject context, Identifier semanticObject) {
+	protected void sequence_CollectionType_SimpleType(ISerializationContext context, Identifier semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Expression returns ConstructorCallExpression
+	 *     SyntaxElement returns ConstructorCallExpression
+	 *     ChainExpression returns ConstructorCallExpression
+	 *     ChainExpression.ChainExpression_1_0 returns ConstructorCallExpression
+	 *     ChainedExpression returns ConstructorCallExpression
+	 *     IfExpressionTri returns ConstructorCallExpression
+	 *     IfExpressionTri.IfExpression_1_0 returns ConstructorCallExpression
+	 *     OrExpression returns ConstructorCallExpression
+	 *     OrExpression.BooleanOperation_1_0 returns ConstructorCallExpression
+	 *     AndExpression returns ConstructorCallExpression
+	 *     AndExpression.BooleanOperation_1_0 returns ConstructorCallExpression
+	 *     ImpliesExpression returns ConstructorCallExpression
+	 *     ImpliesExpression.BooleanOperation_1_0 returns ConstructorCallExpression
+	 *     RelationalExpression returns ConstructorCallExpression
+	 *     RelationalExpression.BooleanOperation_1_0 returns ConstructorCallExpression
+	 *     AdditiveExpression returns ConstructorCallExpression
+	 *     AdditiveExpression.OperationCall_1_0 returns ConstructorCallExpression
+	 *     MultiplicativeExpression returns ConstructorCallExpression
+	 *     MultiplicativeExpression.OperationCall_1_0 returns ConstructorCallExpression
+	 *     UnaryOrInfixExpression returns ConstructorCallExpression
+	 *     InfixExpression returns ConstructorCallExpression
+	 *     InfixExpression.OperationCall_1_0_0 returns ConstructorCallExpression
+	 *     InfixExpression.FeatureCall_1_1_0 returns ConstructorCallExpression
+	 *     InfixExpression.TypeSelectExpression_1_2_0 returns ConstructorCallExpression
+	 *     InfixExpression.CollectionExpression_1_3_0 returns ConstructorCallExpression
+	 *     PrimaryExpression returns ConstructorCallExpression
+	 *     ParanthesizedExpression returns ConstructorCallExpression
+	 *     ConstructorCallExpression returns ConstructorCallExpression
+	 *
 	 * Constraint:
 	 *     type=SimpleType
 	 */
-	protected void sequence_ConstructorCallExpression(EObject context, ConstructorCallExpression semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, ExpressionPackage.Literals.CONSTRUCTOR_CALL_EXPRESSION__TYPE) == ValueTransient.YES)
+	protected void sequence_ConstructorCallExpression(ISerializationContext context, ConstructorCallExpression semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, ExpressionPackage.Literals.CONSTRUCTOR_CALL_EXPRESSION__TYPE) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ExpressionPackage.Literals.CONSTRUCTOR_CALL_EXPRESSION__TYPE));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getConstructorCallExpressionAccess().getTypeSimpleTypeParserRuleCall_1_0(), semanticObject.getType());
 		feeder.finish();
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     FeatureCall returns FeatureCall
+	 *
 	 * Constraint:
 	 *     type=Type
 	 */
-	protected void sequence_FeatureCall(EObject context, FeatureCall semanticObject) {
-		genericSequencer.createSequence(context, semanticObject);
+	protected void sequence_FeatureCall(ISerializationContext context, FeatureCall semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, ExpressionPackage.Literals.FEATURE_CALL__TYPE) == ValueTransient.YES)
+				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ExpressionPackage.Literals.FEATURE_CALL__TYPE));
+		}
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
+		feeder.accept(grammarAccess.getFeatureCallAccess().getTypeTypeParserRuleCall_1_0(), semanticObject.getType());
+		feeder.finish();
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Expression returns FeatureCall
+	 *     SyntaxElement returns FeatureCall
+	 *     ChainExpression returns FeatureCall
+	 *     ChainExpression.ChainExpression_1_0 returns FeatureCall
+	 *     ChainedExpression returns FeatureCall
+	 *     IfExpressionTri returns FeatureCall
+	 *     IfExpressionTri.IfExpression_1_0 returns FeatureCall
+	 *     OrExpression returns FeatureCall
+	 *     OrExpression.BooleanOperation_1_0 returns FeatureCall
+	 *     AndExpression returns FeatureCall
+	 *     AndExpression.BooleanOperation_1_0 returns FeatureCall
+	 *     ImpliesExpression returns FeatureCall
+	 *     ImpliesExpression.BooleanOperation_1_0 returns FeatureCall
+	 *     RelationalExpression returns FeatureCall
+	 *     RelationalExpression.BooleanOperation_1_0 returns FeatureCall
+	 *     AdditiveExpression returns FeatureCall
+	 *     AdditiveExpression.OperationCall_1_0 returns FeatureCall
+	 *     MultiplicativeExpression returns FeatureCall
+	 *     MultiplicativeExpression.OperationCall_1_0 returns FeatureCall
+	 *     UnaryOrInfixExpression returns FeatureCall
+	 *     InfixExpression returns FeatureCall
+	 *     InfixExpression.OperationCall_1_0_0 returns FeatureCall
+	 *     InfixExpression.FeatureCall_1_1_0 returns FeatureCall
+	 *     InfixExpression.TypeSelectExpression_1_2_0 returns FeatureCall
+	 *     InfixExpression.CollectionExpression_1_3_0 returns FeatureCall
+	 *     PrimaryExpression returns FeatureCall
+	 *     ParanthesizedExpression returns FeatureCall
+	 *
 	 * Constraint:
 	 *     ((target=InfixExpression_FeatureCall_1_1_0 type=Type) | type=Type)
 	 */
-	protected void sequence_FeatureCall_InfixExpression(EObject context, FeatureCall semanticObject) {
+	protected void sequence_FeatureCall_InfixExpression(ISerializationContext context, FeatureCall semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Expression returns GlobalVarExpression
+	 *     SyntaxElement returns GlobalVarExpression
+	 *     ChainExpression returns GlobalVarExpression
+	 *     ChainExpression.ChainExpression_1_0 returns GlobalVarExpression
+	 *     ChainedExpression returns GlobalVarExpression
+	 *     IfExpressionTri returns GlobalVarExpression
+	 *     IfExpressionTri.IfExpression_1_0 returns GlobalVarExpression
+	 *     OrExpression returns GlobalVarExpression
+	 *     OrExpression.BooleanOperation_1_0 returns GlobalVarExpression
+	 *     AndExpression returns GlobalVarExpression
+	 *     AndExpression.BooleanOperation_1_0 returns GlobalVarExpression
+	 *     ImpliesExpression returns GlobalVarExpression
+	 *     ImpliesExpression.BooleanOperation_1_0 returns GlobalVarExpression
+	 *     RelationalExpression returns GlobalVarExpression
+	 *     RelationalExpression.BooleanOperation_1_0 returns GlobalVarExpression
+	 *     AdditiveExpression returns GlobalVarExpression
+	 *     AdditiveExpression.OperationCall_1_0 returns GlobalVarExpression
+	 *     MultiplicativeExpression returns GlobalVarExpression
+	 *     MultiplicativeExpression.OperationCall_1_0 returns GlobalVarExpression
+	 *     UnaryOrInfixExpression returns GlobalVarExpression
+	 *     InfixExpression returns GlobalVarExpression
+	 *     InfixExpression.OperationCall_1_0_0 returns GlobalVarExpression
+	 *     InfixExpression.FeatureCall_1_1_0 returns GlobalVarExpression
+	 *     InfixExpression.TypeSelectExpression_1_2_0 returns GlobalVarExpression
+	 *     InfixExpression.CollectionExpression_1_3_0 returns GlobalVarExpression
+	 *     PrimaryExpression returns GlobalVarExpression
+	 *     ParanthesizedExpression returns GlobalVarExpression
+	 *     GlobalVarExpression returns GlobalVarExpression
+	 *
 	 * Constraint:
 	 *     name=Identifier
 	 */
-	protected void sequence_GlobalVarExpression(EObject context, GlobalVarExpression semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, ExpressionPackage.Literals.GLOBAL_VAR_EXPRESSION__NAME) == ValueTransient.YES)
+	protected void sequence_GlobalVarExpression(ISerializationContext context, GlobalVarExpression semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, ExpressionPackage.Literals.GLOBAL_VAR_EXPRESSION__NAME) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ExpressionPackage.Literals.GLOBAL_VAR_EXPRESSION__NAME));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getGlobalVarExpressionAccess().getNameIdentifierParserRuleCall_1_0(), semanticObject.getName());
 		feeder.finish();
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     IfExpressionKw returns IfExpression
+	 *
 	 * Constraint:
 	 *     (condition=ChainedExpression thenPart=ChainedExpression elsePart=ChainedExpression?)
 	 */
-	protected void sequence_IfExpressionKw(EObject context, IfExpression semanticObject) {
+	protected void sequence_IfExpressionKw(ISerializationContext context, IfExpression semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Expression returns IfExpression
+	 *     SyntaxElement returns IfExpression
+	 *     ChainExpression returns IfExpression
+	 *     ChainExpression.ChainExpression_1_0 returns IfExpression
+	 *     ChainedExpression returns IfExpression
+	 *     IfExpressionTri returns IfExpression
+	 *     IfExpressionTri.IfExpression_1_0 returns IfExpression
+	 *     OrExpression returns IfExpression
+	 *     OrExpression.BooleanOperation_1_0 returns IfExpression
+	 *     AndExpression returns IfExpression
+	 *     AndExpression.BooleanOperation_1_0 returns IfExpression
+	 *     ImpliesExpression returns IfExpression
+	 *     ImpliesExpression.BooleanOperation_1_0 returns IfExpression
+	 *     RelationalExpression returns IfExpression
+	 *     RelationalExpression.BooleanOperation_1_0 returns IfExpression
+	 *     AdditiveExpression returns IfExpression
+	 *     AdditiveExpression.OperationCall_1_0 returns IfExpression
+	 *     MultiplicativeExpression returns IfExpression
+	 *     MultiplicativeExpression.OperationCall_1_0 returns IfExpression
+	 *     UnaryOrInfixExpression returns IfExpression
+	 *     InfixExpression returns IfExpression
+	 *     InfixExpression.OperationCall_1_0_0 returns IfExpression
+	 *     InfixExpression.FeatureCall_1_1_0 returns IfExpression
+	 *     InfixExpression.TypeSelectExpression_1_2_0 returns IfExpression
+	 *     InfixExpression.CollectionExpression_1_3_0 returns IfExpression
+	 *     PrimaryExpression returns IfExpression
+	 *     ParanthesizedExpression returns IfExpression
+	 *
+	 * Constraint:
+	 *     (
+	 *         (condition=IfExpressionTri_IfExpression_1_0 thenPart=ChainedExpression elsePart=ChainedExpression) | 
+	 *         (condition=ChainedExpression thenPart=ChainedExpression elsePart=ChainedExpression?)
+	 *     )
+	 */
+	protected void sequence_IfExpressionKw_IfExpressionTri(ISerializationContext context, IfExpression semanticObject) {
+		genericSequencer.createSequence(context, semanticObject);
+	}
+	
+	
+	/**
+	 * Contexts:
+	 *     Expression returns TypeSelectExpression
+	 *     SyntaxElement returns TypeSelectExpression
+	 *     ChainExpression returns TypeSelectExpression
+	 *     ChainExpression.ChainExpression_1_0 returns TypeSelectExpression
+	 *     ChainedExpression returns TypeSelectExpression
+	 *     IfExpressionTri returns TypeSelectExpression
+	 *     IfExpressionTri.IfExpression_1_0 returns TypeSelectExpression
+	 *     OrExpression returns TypeSelectExpression
+	 *     OrExpression.BooleanOperation_1_0 returns TypeSelectExpression
+	 *     AndExpression returns TypeSelectExpression
+	 *     AndExpression.BooleanOperation_1_0 returns TypeSelectExpression
+	 *     ImpliesExpression returns TypeSelectExpression
+	 *     ImpliesExpression.BooleanOperation_1_0 returns TypeSelectExpression
+	 *     RelationalExpression returns TypeSelectExpression
+	 *     RelationalExpression.BooleanOperation_1_0 returns TypeSelectExpression
+	 *     AdditiveExpression returns TypeSelectExpression
+	 *     AdditiveExpression.OperationCall_1_0 returns TypeSelectExpression
+	 *     MultiplicativeExpression returns TypeSelectExpression
+	 *     MultiplicativeExpression.OperationCall_1_0 returns TypeSelectExpression
+	 *     UnaryOrInfixExpression returns TypeSelectExpression
+	 *     InfixExpression returns TypeSelectExpression
+	 *     InfixExpression.OperationCall_1_0_0 returns TypeSelectExpression
+	 *     InfixExpression.FeatureCall_1_1_0 returns TypeSelectExpression
+	 *     InfixExpression.TypeSelectExpression_1_2_0 returns TypeSelectExpression
+	 *     InfixExpression.CollectionExpression_1_3_0 returns TypeSelectExpression
+	 *     PrimaryExpression returns TypeSelectExpression
+	 *     ParanthesizedExpression returns TypeSelectExpression
+	 *
 	 * Constraint:
 	 *     ((target=InfixExpression_TypeSelectExpression_1_2_0 name='typeSelect' type=Type) | (name='typeSelect' type=Type))
 	 */
-	protected void sequence_InfixExpression_TypeSelectExpression(EObject context, TypeSelectExpression semanticObject) {
+	protected void sequence_InfixExpression_TypeSelectExpression(ISerializationContext context, TypeSelectExpression semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Expression returns IntegerLiteral
+	 *     SyntaxElement returns IntegerLiteral
+	 *     ChainExpression returns IntegerLiteral
+	 *     ChainExpression.ChainExpression_1_0 returns IntegerLiteral
+	 *     ChainedExpression returns IntegerLiteral
+	 *     IfExpressionTri returns IntegerLiteral
+	 *     IfExpressionTri.IfExpression_1_0 returns IntegerLiteral
+	 *     OrExpression returns IntegerLiteral
+	 *     OrExpression.BooleanOperation_1_0 returns IntegerLiteral
+	 *     AndExpression returns IntegerLiteral
+	 *     AndExpression.BooleanOperation_1_0 returns IntegerLiteral
+	 *     ImpliesExpression returns IntegerLiteral
+	 *     ImpliesExpression.BooleanOperation_1_0 returns IntegerLiteral
+	 *     RelationalExpression returns IntegerLiteral
+	 *     RelationalExpression.BooleanOperation_1_0 returns IntegerLiteral
+	 *     AdditiveExpression returns IntegerLiteral
+	 *     AdditiveExpression.OperationCall_1_0 returns IntegerLiteral
+	 *     MultiplicativeExpression returns IntegerLiteral
+	 *     MultiplicativeExpression.OperationCall_1_0 returns IntegerLiteral
+	 *     UnaryOrInfixExpression returns IntegerLiteral
+	 *     InfixExpression returns IntegerLiteral
+	 *     InfixExpression.OperationCall_1_0_0 returns IntegerLiteral
+	 *     InfixExpression.FeatureCall_1_1_0 returns IntegerLiteral
+	 *     InfixExpression.TypeSelectExpression_1_2_0 returns IntegerLiteral
+	 *     InfixExpression.CollectionExpression_1_3_0 returns IntegerLiteral
+	 *     PrimaryExpression returns IntegerLiteral
+	 *     Literal returns IntegerLiteral
+	 *     IntegerLiteral returns IntegerLiteral
+	 *     ParanthesizedExpression returns IntegerLiteral
+	 *
 	 * Constraint:
 	 *     val=INT
 	 */
-	protected void sequence_IntegerLiteral(EObject context, IntegerLiteral semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, ExpressionPackage.Literals.INTEGER_LITERAL__VAL) == ValueTransient.YES)
+	protected void sequence_IntegerLiteral(ISerializationContext context, IntegerLiteral semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, ExpressionPackage.Literals.INTEGER_LITERAL__VAL) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ExpressionPackage.Literals.INTEGER_LITERAL__VAL));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getIntegerLiteralAccess().getValINTTerminalRuleCall_0(), semanticObject.getVal());
 		feeder.finish();
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Expression returns LetExpression
+	 *     SyntaxElement returns LetExpression
+	 *     LetExpression returns LetExpression
+	 *     ChainExpression returns LetExpression
+	 *     ChainExpression.ChainExpression_1_0 returns LetExpression
+	 *     ChainedExpression returns LetExpression
+	 *     IfExpressionTri returns LetExpression
+	 *     IfExpressionTri.IfExpression_1_0 returns LetExpression
+	 *     OrExpression returns LetExpression
+	 *     OrExpression.BooleanOperation_1_0 returns LetExpression
+	 *     AndExpression returns LetExpression
+	 *     AndExpression.BooleanOperation_1_0 returns LetExpression
+	 *     ImpliesExpression returns LetExpression
+	 *     ImpliesExpression.BooleanOperation_1_0 returns LetExpression
+	 *     RelationalExpression returns LetExpression
+	 *     RelationalExpression.BooleanOperation_1_0 returns LetExpression
+	 *     AdditiveExpression returns LetExpression
+	 *     AdditiveExpression.OperationCall_1_0 returns LetExpression
+	 *     MultiplicativeExpression returns LetExpression
+	 *     MultiplicativeExpression.OperationCall_1_0 returns LetExpression
+	 *     UnaryOrInfixExpression returns LetExpression
+	 *     InfixExpression returns LetExpression
+	 *     InfixExpression.OperationCall_1_0_0 returns LetExpression
+	 *     InfixExpression.FeatureCall_1_1_0 returns LetExpression
+	 *     InfixExpression.TypeSelectExpression_1_2_0 returns LetExpression
+	 *     InfixExpression.CollectionExpression_1_3_0 returns LetExpression
+	 *     PrimaryExpression returns LetExpression
+	 *     ParanthesizedExpression returns LetExpression
+	 *
 	 * Constraint:
 	 *     (identifier=Identifier varExpr=Expression target=Expression)
 	 */
-	protected void sequence_LetExpression(EObject context, LetExpression semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, ExpressionPackage.Literals.LET_EXPRESSION__IDENTIFIER) == ValueTransient.YES)
+	protected void sequence_LetExpression(ISerializationContext context, LetExpression semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, ExpressionPackage.Literals.LET_EXPRESSION__IDENTIFIER) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ExpressionPackage.Literals.LET_EXPRESSION__IDENTIFIER));
-			if(transientValues.isValueTransient(semanticObject, ExpressionPackage.Literals.LET_EXPRESSION__VAR_EXPR) == ValueTransient.YES)
+			if (transientValues.isValueTransient(semanticObject, ExpressionPackage.Literals.LET_EXPRESSION__VAR_EXPR) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ExpressionPackage.Literals.LET_EXPRESSION__VAR_EXPR));
-			if(transientValues.isValueTransient(semanticObject, ExpressionPackage.Literals.LET_EXPRESSION__TARGET) == ValueTransient.YES)
+			if (transientValues.isValueTransient(semanticObject, ExpressionPackage.Literals.LET_EXPRESSION__TARGET) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ExpressionPackage.Literals.LET_EXPRESSION__TARGET));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getLetExpressionAccess().getIdentifierIdentifierParserRuleCall_1_0(), semanticObject.getIdentifier());
 		feeder.accept(grammarAccess.getLetExpressionAccess().getVarExprExpressionParserRuleCall_3_0(), semanticObject.getVarExpr());
 		feeder.accept(grammarAccess.getLetExpressionAccess().getTargetExpressionParserRuleCall_5_0(), semanticObject.getTarget());
@@ -600,103 +1009,278 @@ protected void sequence_LetExpression(EObject context, LetExpression semanticObj
 	
 	
 	/**
+	 * Contexts:
+	 *     Expression returns ListLiteral
+	 *     SyntaxElement returns ListLiteral
+	 *     ChainExpression returns ListLiteral
+	 *     ChainExpression.ChainExpression_1_0 returns ListLiteral
+	 *     ChainedExpression returns ListLiteral
+	 *     IfExpressionTri returns ListLiteral
+	 *     IfExpressionTri.IfExpression_1_0 returns ListLiteral
+	 *     OrExpression returns ListLiteral
+	 *     OrExpression.BooleanOperation_1_0 returns ListLiteral
+	 *     AndExpression returns ListLiteral
+	 *     AndExpression.BooleanOperation_1_0 returns ListLiteral
+	 *     ImpliesExpression returns ListLiteral
+	 *     ImpliesExpression.BooleanOperation_1_0 returns ListLiteral
+	 *     RelationalExpression returns ListLiteral
+	 *     RelationalExpression.BooleanOperation_1_0 returns ListLiteral
+	 *     AdditiveExpression returns ListLiteral
+	 *     AdditiveExpression.OperationCall_1_0 returns ListLiteral
+	 *     MultiplicativeExpression returns ListLiteral
+	 *     MultiplicativeExpression.OperationCall_1_0 returns ListLiteral
+	 *     UnaryOrInfixExpression returns ListLiteral
+	 *     InfixExpression returns ListLiteral
+	 *     InfixExpression.OperationCall_1_0_0 returns ListLiteral
+	 *     InfixExpression.FeatureCall_1_1_0 returns ListLiteral
+	 *     InfixExpression.TypeSelectExpression_1_2_0 returns ListLiteral
+	 *     InfixExpression.CollectionExpression_1_3_0 returns ListLiteral
+	 *     PrimaryExpression returns ListLiteral
+	 *     ParanthesizedExpression returns ListLiteral
+	 *     ListLiteral returns ListLiteral
+	 *
 	 * Constraint:
-	 *     ((elements+=Expression elements+=Expression*)?)
+	 *     (elements+=Expression elements+=Expression*)?
 	 */
-	protected void sequence_ListLiteral(EObject context, ListLiteral semanticObject) {
+	protected void sequence_ListLiteral(ISerializationContext context, ListLiteral semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Expression returns NullLiteral
+	 *     SyntaxElement returns NullLiteral
+	 *     ChainExpression returns NullLiteral
+	 *     ChainExpression.ChainExpression_1_0 returns NullLiteral
+	 *     ChainedExpression returns NullLiteral
+	 *     IfExpressionTri returns NullLiteral
+	 *     IfExpressionTri.IfExpression_1_0 returns NullLiteral
+	 *     OrExpression returns NullLiteral
+	 *     OrExpression.BooleanOperation_1_0 returns NullLiteral
+	 *     AndExpression returns NullLiteral
+	 *     AndExpression.BooleanOperation_1_0 returns NullLiteral
+	 *     ImpliesExpression returns NullLiteral
+	 *     ImpliesExpression.BooleanOperation_1_0 returns NullLiteral
+	 *     RelationalExpression returns NullLiteral
+	 *     RelationalExpression.BooleanOperation_1_0 returns NullLiteral
+	 *     AdditiveExpression returns NullLiteral
+	 *     AdditiveExpression.OperationCall_1_0 returns NullLiteral
+	 *     MultiplicativeExpression returns NullLiteral
+	 *     MultiplicativeExpression.OperationCall_1_0 returns NullLiteral
+	 *     UnaryOrInfixExpression returns NullLiteral
+	 *     InfixExpression returns NullLiteral
+	 *     InfixExpression.OperationCall_1_0_0 returns NullLiteral
+	 *     InfixExpression.FeatureCall_1_1_0 returns NullLiteral
+	 *     InfixExpression.TypeSelectExpression_1_2_0 returns NullLiteral
+	 *     InfixExpression.CollectionExpression_1_3_0 returns NullLiteral
+	 *     PrimaryExpression returns NullLiteral
+	 *     Literal returns NullLiteral
+	 *     NullLiteral returns NullLiteral
+	 *     ParanthesizedExpression returns NullLiteral
+	 *
 	 * Constraint:
 	 *     val='null'
 	 */
-	protected void sequence_NullLiteral(EObject context, NullLiteral semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, ExpressionPackage.Literals.NULL_LITERAL__VAL) == ValueTransient.YES)
+	protected void sequence_NullLiteral(ISerializationContext context, NullLiteral semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, ExpressionPackage.Literals.NULL_LITERAL__VAL) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ExpressionPackage.Literals.NULL_LITERAL__VAL));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getNullLiteralAccess().getValNullKeyword_0(), semanticObject.getVal());
 		feeder.finish();
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     FeatureCall returns OperationCall
+	 *     OperationCall returns OperationCall
+	 *
 	 * Constraint:
 	 *     (name=Identifier (params+=Expression params+=Expression*)?)
 	 */
-	protected void sequence_OperationCall(EObject context, OperationCall semanticObject) {
+	protected void sequence_OperationCall(ISerializationContext context, OperationCall semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Expression returns RealLiteral
+	 *     SyntaxElement returns RealLiteral
+	 *     ChainExpression returns RealLiteral
+	 *     ChainExpression.ChainExpression_1_0 returns RealLiteral
+	 *     ChainedExpression returns RealLiteral
+	 *     IfExpressionTri returns RealLiteral
+	 *     IfExpressionTri.IfExpression_1_0 returns RealLiteral
+	 *     OrExpression returns RealLiteral
+	 *     OrExpression.BooleanOperation_1_0 returns RealLiteral
+	 *     AndExpression returns RealLiteral
+	 *     AndExpression.BooleanOperation_1_0 returns RealLiteral
+	 *     ImpliesExpression returns RealLiteral
+	 *     ImpliesExpression.BooleanOperation_1_0 returns RealLiteral
+	 *     RelationalExpression returns RealLiteral
+	 *     RelationalExpression.BooleanOperation_1_0 returns RealLiteral
+	 *     AdditiveExpression returns RealLiteral
+	 *     AdditiveExpression.OperationCall_1_0 returns RealLiteral
+	 *     MultiplicativeExpression returns RealLiteral
+	 *     MultiplicativeExpression.OperationCall_1_0 returns RealLiteral
+	 *     UnaryOrInfixExpression returns RealLiteral
+	 *     InfixExpression returns RealLiteral
+	 *     InfixExpression.OperationCall_1_0_0 returns RealLiteral
+	 *     InfixExpression.FeatureCall_1_1_0 returns RealLiteral
+	 *     InfixExpression.TypeSelectExpression_1_2_0 returns RealLiteral
+	 *     InfixExpression.CollectionExpression_1_3_0 returns RealLiteral
+	 *     PrimaryExpression returns RealLiteral
+	 *     Literal returns RealLiteral
+	 *     RealLiteral returns RealLiteral
+	 *     ParanthesizedExpression returns RealLiteral
+	 *
 	 * Constraint:
 	 *     val=REAL
 	 */
-	protected void sequence_RealLiteral(EObject context, RealLiteral semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, ExpressionPackage.Literals.REAL_LITERAL__VAL) == ValueTransient.YES)
+	protected void sequence_RealLiteral(ISerializationContext context, RealLiteral semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, ExpressionPackage.Literals.REAL_LITERAL__VAL) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ExpressionPackage.Literals.REAL_LITERAL__VAL));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getRealLiteralAccess().getValREALTerminalRuleCall_0(), semanticObject.getVal());
 		feeder.finish();
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     SimpleType returns Identifier
+	 *
 	 * Constraint:
 	 *     (id+=Identifier id+=Identifier*)
 	 */
-	protected void sequence_SimpleType(EObject context, Identifier semanticObject) {
+	protected void sequence_SimpleType(ISerializationContext context, Identifier semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Expression returns StringLiteral
+	 *     SyntaxElement returns StringLiteral
+	 *     ChainExpression returns StringLiteral
+	 *     ChainExpression.ChainExpression_1_0 returns StringLiteral
+	 *     ChainedExpression returns StringLiteral
+	 *     IfExpressionTri returns StringLiteral
+	 *     IfExpressionTri.IfExpression_1_0 returns StringLiteral
+	 *     OrExpression returns StringLiteral
+	 *     OrExpression.BooleanOperation_1_0 returns StringLiteral
+	 *     AndExpression returns StringLiteral
+	 *     AndExpression.BooleanOperation_1_0 returns StringLiteral
+	 *     ImpliesExpression returns StringLiteral
+	 *     ImpliesExpression.BooleanOperation_1_0 returns StringLiteral
+	 *     RelationalExpression returns StringLiteral
+	 *     RelationalExpression.BooleanOperation_1_0 returns StringLiteral
+	 *     AdditiveExpression returns StringLiteral
+	 *     AdditiveExpression.OperationCall_1_0 returns StringLiteral
+	 *     MultiplicativeExpression returns StringLiteral
+	 *     MultiplicativeExpression.OperationCall_1_0 returns StringLiteral
+	 *     UnaryOrInfixExpression returns StringLiteral
+	 *     InfixExpression returns StringLiteral
+	 *     InfixExpression.OperationCall_1_0_0 returns StringLiteral
+	 *     InfixExpression.FeatureCall_1_1_0 returns StringLiteral
+	 *     InfixExpression.TypeSelectExpression_1_2_0 returns StringLiteral
+	 *     InfixExpression.CollectionExpression_1_3_0 returns StringLiteral
+	 *     PrimaryExpression returns StringLiteral
+	 *     Literal returns StringLiteral
+	 *     StringLiteral returns StringLiteral
+	 *     ParanthesizedExpression returns StringLiteral
+	 *
 	 * Constraint:
 	 *     val=STRING
 	 */
-	protected void sequence_StringLiteral(EObject context, StringLiteral semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, ExpressionPackage.Literals.STRING_LITERAL__VAL) == ValueTransient.YES)
+	protected void sequence_StringLiteral(ISerializationContext context, StringLiteral semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, ExpressionPackage.Literals.STRING_LITERAL__VAL) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ExpressionPackage.Literals.STRING_LITERAL__VAL));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getStringLiteralAccess().getValSTRINGTerminalRuleCall_0(), semanticObject.getVal());
 		feeder.finish();
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Expression returns SwitchExpression
+	 *     SyntaxElement returns SwitchExpression
+	 *     ChainExpression returns SwitchExpression
+	 *     ChainExpression.ChainExpression_1_0 returns SwitchExpression
+	 *     ChainedExpression returns SwitchExpression
+	 *     IfExpressionTri returns SwitchExpression
+	 *     IfExpressionTri.IfExpression_1_0 returns SwitchExpression
+	 *     SwitchExpression returns SwitchExpression
+	 *     OrExpression returns SwitchExpression
+	 *     OrExpression.BooleanOperation_1_0 returns SwitchExpression
+	 *     AndExpression returns SwitchExpression
+	 *     AndExpression.BooleanOperation_1_0 returns SwitchExpression
+	 *     ImpliesExpression returns SwitchExpression
+	 *     ImpliesExpression.BooleanOperation_1_0 returns SwitchExpression
+	 *     RelationalExpression returns SwitchExpression
+	 *     RelationalExpression.BooleanOperation_1_0 returns SwitchExpression
+	 *     AdditiveExpression returns SwitchExpression
+	 *     AdditiveExpression.OperationCall_1_0 returns SwitchExpression
+	 *     MultiplicativeExpression returns SwitchExpression
+	 *     MultiplicativeExpression.OperationCall_1_0 returns SwitchExpression
+	 *     UnaryOrInfixExpression returns SwitchExpression
+	 *     InfixExpression returns SwitchExpression
+	 *     InfixExpression.OperationCall_1_0_0 returns SwitchExpression
+	 *     InfixExpression.FeatureCall_1_1_0 returns SwitchExpression
+	 *     InfixExpression.TypeSelectExpression_1_2_0 returns SwitchExpression
+	 *     InfixExpression.CollectionExpression_1_3_0 returns SwitchExpression
+	 *     PrimaryExpression returns SwitchExpression
+	 *     ParanthesizedExpression returns SwitchExpression
+	 *
 	 * Constraint:
 	 *     (switchExpr=OrExpression? case+=Case* defaultExpr=OrExpression)
 	 */
-	protected void sequence_SwitchExpression(EObject context, SwitchExpression semanticObject) {
+	protected void sequence_SwitchExpression(ISerializationContext context, SwitchExpression semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     FeatureCall returns TypeSelectExpression
+	 *     TypeSelectExpression returns TypeSelectExpression
+	 *
 	 * Constraint:
 	 *     (name='typeSelect' type=Type)
 	 */
-	protected void sequence_TypeSelectExpression(EObject context, TypeSelectExpression semanticObject) {
-		genericSequencer.createSequence(context, semanticObject);
+	protected void sequence_TypeSelectExpression(ISerializationContext context, TypeSelectExpression semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, ExpressionPackage.Literals.FEATURE_CALL__NAME) == ValueTransient.YES)
+				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ExpressionPackage.Literals.FEATURE_CALL__NAME));
+			if (transientValues.isValueTransient(semanticObject, ExpressionPackage.Literals.FEATURE_CALL__TYPE) == ValueTransient.YES)
+				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ExpressionPackage.Literals.FEATURE_CALL__TYPE));
+		}
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
+		feeder.accept(grammarAccess.getTypeSelectExpressionAccess().getNameTypeSelectKeyword_0_0(), semanticObject.getName());
+		feeder.accept(grammarAccess.getTypeSelectExpressionAccess().getTypeTypeParserRuleCall_2_0(), semanticObject.getType());
+		feeder.finish();
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     UnaryExpression returns OperationCall
+	 *
 	 * Constraint:
 	 *     ((name='!' | name='-') params+=InfixExpression)
 	 */
-	protected void sequence_UnaryExpression(EObject context, OperationCall semanticObject) {
+	protected void sequence_UnaryExpression(ISerializationContext context, OperationCall semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
+	
+	
 }
diff --git a/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/serializer/AbstractExpressionSyntacticSequencer.java b/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/serializer/AbstractExpressionSyntacticSequencer.java
index 26a5cdac3..fbbc36716 100644
--- a/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/serializer/AbstractExpressionSyntacticSequencer.java
+++ b/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/serializer/AbstractExpressionSyntacticSequencer.java
@@ -42,9 +42,9 @@ protected void emitUnassignedTokens(EObject semanticObject, ISynTransition trans
 		List<INode> transitionNodes = collectNodes(fromNode, toNode);
 		for (AbstractElementAlias syntax : transition.getAmbiguousSyntaxes()) {
 			List<INode> syntaxNodes = getNodesFor(transitionNodes, syntax);
-			if(match_ParanthesizedExpression_LeftParenthesisKeyword_0_a.equals(syntax))
+			if (match_ParanthesizedExpression_LeftParenthesisKeyword_0_a.equals(syntax))
 				emit_ParanthesizedExpression_LeftParenthesisKeyword_0_a(semanticObject, getLastNavigableState(), syntaxNodes);
-			else if(match_ParanthesizedExpression_LeftParenthesisKeyword_0_p.equals(syntax))
+			else if (match_ParanthesizedExpression_LeftParenthesisKeyword_0_p.equals(syntax))
 				emit_ParanthesizedExpression_LeftParenthesisKeyword_0_p(semanticObject, getLastNavigableState(), syntaxNodes);
 			else acceptNodes(getLastNavigableState(), syntaxNodes);
 		}
diff --git a/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/services/ExpressionGrammarAccess.java b/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/services/ExpressionGrammarAccess.java
index 83235aec4..17b77c7af 100644
--- a/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/services/ExpressionGrammarAccess.java
+++ b/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/services/ExpressionGrammarAccess.java
@@ -19,7 +19,7 @@ public class ExpressionGrammarAccess extends AbstractGrammarElementFinder {
 	
 	
 	public class ExpressionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Expression");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cLetExpressionParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cCastedExpressionParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
@@ -50,7 +50,7 @@ public class ExpressionElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class SyntaxElementElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "SyntaxElement");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.expression.Expression.SyntaxElement");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cExpressionParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cCaseParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
@@ -74,7 +74,7 @@ public class SyntaxElementElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class LetExpressionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "LetExpression");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.expression.Expression.LetExpression");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cLetKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cIdentifierAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -92,13 +92,13 @@ public class LetExpressionElements extends AbstractParserRuleElementFinder {
 		////   {$e=factory.createLetExpression(v,varExpr,target);}
 		// //|  x=castedExpression {$e=x;};
 		// LetExpression:
-		//	"let" identifier=Identifier "=" varExpr=Expression ":" target=Expression;
+		//	'let' identifier=Identifier '=' varExpr=Expression ':' target=Expression;
 		@Override public ParserRule getRule() { return rule; }
 
-		//"let" identifier=Identifier "=" varExpr=Expression ":" target=Expression
+		//'let' identifier=Identifier '=' varExpr=Expression ':' target=Expression
 		public Group getGroup() { return cGroup; }
 
-		//"let"
+		//'let'
 		public Keyword getLetKeyword_0() { return cLetKeyword_0; }
 
 		//identifier=Identifier
@@ -107,7 +107,7 @@ public class LetExpressionElements extends AbstractParserRuleElementFinder {
 		//Identifier
 		public RuleCall getIdentifierIdentifierParserRuleCall_1_0() { return cIdentifierIdentifierParserRuleCall_1_0; }
 
-		//"="
+		//'='
 		public Keyword getEqualsSignKeyword_2() { return cEqualsSignKeyword_2; }
 
 		//varExpr=Expression
@@ -116,7 +116,7 @@ public class LetExpressionElements extends AbstractParserRuleElementFinder {
 		//Expression
 		public RuleCall getVarExprExpressionParserRuleCall_3_0() { return cVarExprExpressionParserRuleCall_3_0; }
 
-		//":"
+		//':'
 		public Keyword getColonKeyword_4() { return cColonKeyword_4; }
 
 		//target=Expression
@@ -127,7 +127,7 @@ public class LetExpressionElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class CastedExpressionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "CastedExpression");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.expression.Expression.CastedExpression");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cLeftParenthesisKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cTypeAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -143,13 +143,13 @@ public class CastedExpressionElements extends AbstractParserRuleElementFinder {
 		// //	| x=chainExpression {$e=x;};
 		//
 		//CastedExpression:
-		//	"(" type=Type ")" target=Expression;
+		//	'(' type=Type ')' target=Expression;
 		@Override public ParserRule getRule() { return rule; }
 
-		//"(" type=Type ")" target=Expression
+		//'(' type=Type ')' target=Expression
 		public Group getGroup() { return cGroup; }
 
-		//"("
+		//'('
 		public Keyword getLeftParenthesisKeyword_0() { return cLeftParenthesisKeyword_0; }
 
 		//type=Type
@@ -158,7 +158,7 @@ public class CastedExpressionElements extends AbstractParserRuleElementFinder {
 		//Type
 		public RuleCall getTypeTypeParserRuleCall_1_0() { return cTypeTypeParserRuleCall_1_0; }
 
-		//")"
+		//')'
 		public Keyword getRightParenthesisKeyword_2() { return cRightParenthesisKeyword_2; }
 
 		//target=Expression
@@ -169,7 +169,7 @@ public class CastedExpressionElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class ChainExpressionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ChainExpression");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.expression.Expression.ChainExpression");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final RuleCall cChainedExpressionParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0);
 		private final Group cGroup_1 = (Group)cGroup.eContents().get(1);
@@ -182,23 +182,23 @@ public class ChainExpressionElements extends AbstractParserRuleElementFinder {
 		//
 		////	x=ifExpression {$e=x;} ( '->' right=ifExpression {$e=factory.createChainExpression($e,right);})*;
 		// ChainExpression
-		//returns Expression:
-		//	ChainedExpression ({ChainExpression.first=current} "->" next=ChainedExpression)*;
+		//Expression:
+		//	ChainedExpression ({ChainExpression.first=current} '->' next=ChainedExpression)*;
 		@Override public ParserRule getRule() { return rule; }
 
-		//ChainedExpression ({ChainExpression.first=current} "->" next=ChainedExpression)*
+		//ChainedExpression ({ChainExpression.first=current} '->' next=ChainedExpression)*
 		public Group getGroup() { return cGroup; }
 
 		//ChainedExpression
 		public RuleCall getChainedExpressionParserRuleCall_0() { return cChainedExpressionParserRuleCall_0; }
 
-		//({ChainExpression.first=current} "->" next=ChainedExpression)*
+		//({ChainExpression.first=current} '->' next=ChainedExpression)*
 		public Group getGroup_1() { return cGroup_1; }
 
 		//{ChainExpression.first=current}
 		public Action getChainExpressionFirstAction_1_0() { return cChainExpressionFirstAction_1_0; }
 
-		//"->"
+		//'->'
 		public Keyword getHyphenMinusGreaterThanSignKeyword_1_1() { return cHyphenMinusGreaterThanSignKeyword_1_1; }
 
 		//next=ChainedExpression
@@ -209,13 +209,13 @@ public class ChainExpressionElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class ChainedExpressionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ChainedExpression");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.expression.Expression.ChainedExpression");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cIfExpressionKwParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cIfExpressionTriParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
 		private final RuleCall cSwitchExpressionParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2);
 		
-		//ChainedExpression returns Expression:
+		//ChainedExpression Expression:
 		//	IfExpressionKw | IfExpressionTri | SwitchExpression;
 		@Override public ParserRule getRule() { return rule; }
 
@@ -233,7 +233,7 @@ public class ChainedExpressionElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class IfExpressionTriElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "IfExpressionTri");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.expression.Expression.IfExpressionTri");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final RuleCall cOrExpressionParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0);
 		private final Group cGroup_1 = (Group)cGroup.eContents().get(1);
@@ -251,23 +251,23 @@ public class IfExpressionTriElements extends AbstractParserRuleElementFinder {
 		//
 		////|	'if' condition=switchExpression 'then' thenPart=switchExpression ('else' elsePart=expression)? {$e=factory.createIf(condition,thenPart,elsePart);};
 		//
-		//IfExpressionTri returns Expression:
-		//	OrExpression ({IfExpression.condition=current} "?" thenPart=ChainedExpression ":" elsePart=ChainedExpression)?;
+		//IfExpressionTri Expression:
+		//	OrExpression ({IfExpression.condition=current} '?' thenPart=ChainedExpression ':' elsePart=ChainedExpression)?;
 		@Override public ParserRule getRule() { return rule; }
 
-		//OrExpression ({IfExpression.condition=current} "?" thenPart=ChainedExpression ":" elsePart=ChainedExpression)?
+		//OrExpression ({IfExpression.condition=current} '?' thenPart=ChainedExpression ':' elsePart=ChainedExpression)?
 		public Group getGroup() { return cGroup; }
 
 		//OrExpression
 		public RuleCall getOrExpressionParserRuleCall_0() { return cOrExpressionParserRuleCall_0; }
 
-		//({IfExpression.condition=current} "?" thenPart=ChainedExpression ":" elsePart=ChainedExpression)?
+		//({IfExpression.condition=current} '?' thenPart=ChainedExpression ':' elsePart=ChainedExpression)?
 		public Group getGroup_1() { return cGroup_1; }
 
 		//{IfExpression.condition=current}
 		public Action getIfExpressionConditionAction_1_0() { return cIfExpressionConditionAction_1_0; }
 
-		//"?"
+		//'?'
 		public Keyword getQuestionMarkKeyword_1_1() { return cQuestionMarkKeyword_1_1; }
 
 		//thenPart=ChainedExpression
@@ -276,7 +276,7 @@ public class IfExpressionTriElements extends AbstractParserRuleElementFinder {
 		//ChainedExpression
 		public RuleCall getThenPartChainedExpressionParserRuleCall_1_2_0() { return cThenPartChainedExpressionParserRuleCall_1_2_0; }
 
-		//":"
+		//':'
 		public Keyword getColonKeyword_1_3() { return cColonKeyword_1_3; }
 
 		//elsePart=ChainedExpression
@@ -287,7 +287,7 @@ public class IfExpressionTriElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class IfExpressionKwElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "IfExpressionKw");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.expression.Expression.IfExpressionKw");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cIfKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cConditionAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -301,14 +301,14 @@ public class IfExpressionKwElements extends AbstractParserRuleElementFinder {
 		private final Assignment cElsePartAssignment_4_0_1 = (Assignment)cGroup_4_0.eContents().get(1);
 		private final RuleCall cElsePartChainedExpressionParserRuleCall_4_0_1_0 = (RuleCall)cElsePartAssignment_4_0_1.eContents().get(0);
 		
-		//IfExpressionKw returns IfExpression:
-		//	"if" condition=ChainedExpression "then" thenPart=ChainedExpression -> ("else" elsePart=ChainedExpression)?;
+		//IfExpressionKw IfExpression:
+		//	'if' condition=ChainedExpression 'then' thenPart=ChainedExpression -> ('else' elsePart=ChainedExpression)?;
 		@Override public ParserRule getRule() { return rule; }
 
-		//"if" condition=ChainedExpression "then" thenPart=ChainedExpression -> ("else" elsePart=ChainedExpression)?
+		//'if' condition=ChainedExpression 'then' thenPart=ChainedExpression -> ('else' elsePart=ChainedExpression)?
 		public Group getGroup() { return cGroup; }
 
-		//"if"
+		//'if'
 		public Keyword getIfKeyword_0() { return cIfKeyword_0; }
 
 		//condition=ChainedExpression
@@ -317,7 +317,7 @@ public class IfExpressionKwElements extends AbstractParserRuleElementFinder {
 		//ChainedExpression
 		public RuleCall getConditionChainedExpressionParserRuleCall_1_0() { return cConditionChainedExpressionParserRuleCall_1_0; }
 
-		//"then"
+		//'then'
 		public Keyword getThenKeyword_2() { return cThenKeyword_2; }
 
 		//thenPart=ChainedExpression
@@ -326,13 +326,13 @@ public class IfExpressionKwElements extends AbstractParserRuleElementFinder {
 		//ChainedExpression
 		public RuleCall getThenPartChainedExpressionParserRuleCall_3_0() { return cThenPartChainedExpressionParserRuleCall_3_0; }
 
-		//-> ("else" elsePart=ChainedExpression)?
+		//-> ('else' elsePart=ChainedExpression)?
 		public Group getGroup_4() { return cGroup_4; }
 
-		//"else" elsePart=ChainedExpression
+		//'else' elsePart=ChainedExpression
 		public Group getGroup_4_0() { return cGroup_4_0; }
 
-		//"else"
+		//'else'
 		public Keyword getElseKeyword_4_0_0() { return cElseKeyword_4_0_0; }
 
 		//elsePart=ChainedExpression
@@ -343,7 +343,7 @@ public class IfExpressionKwElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class SwitchExpressionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "SwitchExpression");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.expression.Expression.SwitchExpression");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cSwitchKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Group cGroup_1 = (Group)cGroup.eContents().get(1);
@@ -375,19 +375,19 @@ public class SwitchExpressionElements extends AbstractParserRuleElementFinder {
 		////   {$e = factory.createSwitchExpression(pred,cases,def);}
 		// //|  x=orExpression {$e=x;};
 		// SwitchExpression:
-		//	"switch" ("(" switchExpr=OrExpression ")")? "{" case+=Case* "default" ":" defaultExpr=OrExpression "}";
+		//	'switch' ('(' switchExpr=OrExpression ')')? '{' case+=Case* 'default' ':' defaultExpr=OrExpression '}';
 		@Override public ParserRule getRule() { return rule; }
 
-		//"switch" ("(" switchExpr=OrExpression ")")? "{" case+=Case* "default" ":" defaultExpr=OrExpression "}"
+		//'switch' ('(' switchExpr=OrExpression ')')? '{' case+=Case* 'default' ':' defaultExpr=OrExpression '}'
 		public Group getGroup() { return cGroup; }
 
-		//"switch"
+		//'switch'
 		public Keyword getSwitchKeyword_0() { return cSwitchKeyword_0; }
 
-		//("(" switchExpr=OrExpression ")")?
+		//('(' switchExpr=OrExpression ')')?
 		public Group getGroup_1() { return cGroup_1; }
 
-		//"("
+		//'('
 		public Keyword getLeftParenthesisKeyword_1_0() { return cLeftParenthesisKeyword_1_0; }
 
 		//switchExpr=OrExpression
@@ -396,10 +396,10 @@ public class SwitchExpressionElements extends AbstractParserRuleElementFinder {
 		//OrExpression
 		public RuleCall getSwitchExprOrExpressionParserRuleCall_1_1_0() { return cSwitchExprOrExpressionParserRuleCall_1_1_0; }
 
-		//")"
+		//')'
 		public Keyword getRightParenthesisKeyword_1_2() { return cRightParenthesisKeyword_1_2; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_2() { return cLeftCurlyBracketKeyword_2; }
 
 		//case+=Case*
@@ -408,10 +408,10 @@ public class SwitchExpressionElements extends AbstractParserRuleElementFinder {
 		//Case
 		public RuleCall getCaseCaseParserRuleCall_3_0() { return cCaseCaseParserRuleCall_3_0; }
 
-		//"default"
+		//'default'
 		public Keyword getDefaultKeyword_4() { return cDefaultKeyword_4; }
 
-		//":"
+		//':'
 		public Keyword getColonKeyword_5() { return cColonKeyword_5; }
 
 		//defaultExpr=OrExpression
@@ -420,12 +420,12 @@ public class SwitchExpressionElements extends AbstractParserRuleElementFinder {
 		//OrExpression
 		public RuleCall getDefaultExprOrExpressionParserRuleCall_6_0() { return cDefaultExprOrExpressionParserRuleCall_6_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_7() { return cRightCurlyBracketKeyword_7; }
 	}
 
 	public class CaseElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Case");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.expression.Expression.Case");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cCaseKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cConditionAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -435,13 +435,13 @@ public class CaseElements extends AbstractParserRuleElementFinder {
 		private final RuleCall cThenParOrExpressionParserRuleCall_3_0 = (RuleCall)cThenParAssignment_3.eContents().get(0);
 		
 		//Case:
-		//	"case" condition=OrExpression ":" thenPar=OrExpression;
+		//	'case' condition=OrExpression ':' thenPar=OrExpression;
 		@Override public ParserRule getRule() { return rule; }
 
-		//"case" condition=OrExpression ":" thenPar=OrExpression
+		//'case' condition=OrExpression ':' thenPar=OrExpression
 		public Group getGroup() { return cGroup; }
 
-		//"case"
+		//'case'
 		public Keyword getCaseKeyword_0() { return cCaseKeyword_0; }
 
 		//condition=OrExpression
@@ -450,7 +450,7 @@ public class CaseElements extends AbstractParserRuleElementFinder {
 		//OrExpression
 		public RuleCall getConditionOrExpressionParserRuleCall_1_0() { return cConditionOrExpressionParserRuleCall_1_0; }
 
-		//":"
+		//':'
 		public Keyword getColonKeyword_2() { return cColonKeyword_2; }
 
 		//thenPar=OrExpression
@@ -461,7 +461,7 @@ public class CaseElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class OrExpressionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "OrExpression");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.expression.Expression.OrExpression");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final RuleCall cAndExpressionParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0);
 		private final Group cGroup_1 = (Group)cGroup.eContents().get(1);
@@ -475,26 +475,26 @@ public class OrExpressionElements extends AbstractParserRuleElementFinder {
 		//
 		////  	x=andExpression {$e=x;} (name='||' r=andExpression 	{$e = factory.createBooleanOperation(id(name),$e,r);})*;
 		//
-		//OrExpression returns Expression:
-		//	AndExpression ({BooleanOperation.left=current} operator="||" right=AndExpression)*;
+		//OrExpression Expression:
+		//	AndExpression ({BooleanOperation.left=current} operator='||' right=AndExpression)*;
 		@Override public ParserRule getRule() { return rule; }
 
-		//AndExpression ({BooleanOperation.left=current} operator="||" right=AndExpression)*
+		//AndExpression ({BooleanOperation.left=current} operator='||' right=AndExpression)*
 		public Group getGroup() { return cGroup; }
 
 		//AndExpression
 		public RuleCall getAndExpressionParserRuleCall_0() { return cAndExpressionParserRuleCall_0; }
 
-		//({BooleanOperation.left=current} operator="||" right=AndExpression)*
+		//({BooleanOperation.left=current} operator='||' right=AndExpression)*
 		public Group getGroup_1() { return cGroup_1; }
 
 		//{BooleanOperation.left=current}
 		public Action getBooleanOperationLeftAction_1_0() { return cBooleanOperationLeftAction_1_0; }
 
-		//operator="||"
+		//operator='||'
 		public Assignment getOperatorAssignment_1_1() { return cOperatorAssignment_1_1; }
 
-		//"||"
+		//'||'
 		public Keyword getOperatorVerticalLineVerticalLineKeyword_1_1_0() { return cOperatorVerticalLineVerticalLineKeyword_1_1_0; }
 
 		//right=AndExpression
@@ -505,7 +505,7 @@ public class OrExpressionElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class AndExpressionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "AndExpression");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.expression.Expression.AndExpression");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final RuleCall cImpliesExpressionParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0);
 		private final Group cGroup_1 = (Group)cGroup.eContents().get(1);
@@ -519,26 +519,26 @@ public class AndExpressionElements extends AbstractParserRuleElementFinder {
 		//
 		////	x=impliesExpression {$e=x;} (name='&&' r=impliesExpression 	{$e = factory.createBooleanOperation(id(name),$e,r);})*;
 		//
-		//AndExpression returns Expression:
-		//	ImpliesExpression ({BooleanOperation.left=current} operator="&&" right=ImpliesExpression)*;
+		//AndExpression Expression:
+		//	ImpliesExpression ({BooleanOperation.left=current} operator='&&' right=ImpliesExpression)*;
 		@Override public ParserRule getRule() { return rule; }
 
-		//ImpliesExpression ({BooleanOperation.left=current} operator="&&" right=ImpliesExpression)*
+		//ImpliesExpression ({BooleanOperation.left=current} operator='&&' right=ImpliesExpression)*
 		public Group getGroup() { return cGroup; }
 
 		//ImpliesExpression
 		public RuleCall getImpliesExpressionParserRuleCall_0() { return cImpliesExpressionParserRuleCall_0; }
 
-		//({BooleanOperation.left=current} operator="&&" right=ImpliesExpression)*
+		//({BooleanOperation.left=current} operator='&&' right=ImpliesExpression)*
 		public Group getGroup_1() { return cGroup_1; }
 
 		//{BooleanOperation.left=current}
 		public Action getBooleanOperationLeftAction_1_0() { return cBooleanOperationLeftAction_1_0; }
 
-		//operator="&&"
+		//operator='&&'
 		public Assignment getOperatorAssignment_1_1() { return cOperatorAssignment_1_1; }
 
-		//"&&"
+		//'&&'
 		public Keyword getOperatorAmpersandAmpersandKeyword_1_1_0() { return cOperatorAmpersandAmpersandKeyword_1_1_0; }
 
 		//right=ImpliesExpression
@@ -549,7 +549,7 @@ public class AndExpressionElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class ImpliesExpressionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ImpliesExpression");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.expression.Expression.ImpliesExpression");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final RuleCall cRelationalExpressionParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0);
 		private final Group cGroup_1 = (Group)cGroup.eContents().get(1);
@@ -563,26 +563,26 @@ public class ImpliesExpressionElements extends AbstractParserRuleElementFinder {
 		//
 		////	x=relationalExpression {$e=x;} (name='implies' r=relationalExpression 	{$e = factory.createBooleanOperation(id(name),$e,r);})*;
 		//
-		//ImpliesExpression returns Expression:
-		//	RelationalExpression ({BooleanOperation.left=current} operator="implies" right=RelationalExpression)*;
+		//ImpliesExpression Expression:
+		//	RelationalExpression ({BooleanOperation.left=current} operator='implies' right=RelationalExpression)*;
 		@Override public ParserRule getRule() { return rule; }
 
-		//RelationalExpression ({BooleanOperation.left=current} operator="implies" right=RelationalExpression)*
+		//RelationalExpression ({BooleanOperation.left=current} operator='implies' right=RelationalExpression)*
 		public Group getGroup() { return cGroup; }
 
 		//RelationalExpression
 		public RuleCall getRelationalExpressionParserRuleCall_0() { return cRelationalExpressionParserRuleCall_0; }
 
-		//({BooleanOperation.left=current} operator="implies" right=RelationalExpression)*
+		//({BooleanOperation.left=current} operator='implies' right=RelationalExpression)*
 		public Group getGroup_1() { return cGroup_1; }
 
 		//{BooleanOperation.left=current}
 		public Action getBooleanOperationLeftAction_1_0() { return cBooleanOperationLeftAction_1_0; }
 
-		//operator="implies"
+		//operator='implies'
 		public Assignment getOperatorAssignment_1_1() { return cOperatorAssignment_1_1; }
 
-		//"implies"
+		//'implies'
 		public Keyword getOperatorImpliesKeyword_1_1_0() { return cOperatorImpliesKeyword_1_1_0; }
 
 		//right=RelationalExpression
@@ -593,7 +593,7 @@ public class ImpliesExpressionElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class RelationalExpressionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "RelationalExpression");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.expression.Expression.RelationalExpression");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final RuleCall cAdditiveExpressionParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0);
 		private final Group cGroup_1 = (Group)cGroup.eContents().get(1);
@@ -614,46 +614,46 @@ public class RelationalExpressionElements extends AbstractParserRuleElementFinde
 		//
 		////	(name=('==' | '!=' | '>=' | '<=' | '>' | '<') r=additiveExpression {$e = factory.createBinaryOperation(id(name),$e,r);})*;
 		//
-		//RelationalExpression returns Expression:
-		//	AdditiveExpression ({BooleanOperation.left=current} operator=("==" | "!=" | ">=" | "<=" | ">" | "<")
+		//RelationalExpression Expression:
+		//	AdditiveExpression ({BooleanOperation.left=current} operator=('==' | '!=' | '>=' | '<=' | '>' | '<')
 		//	right=AdditiveExpression)*;
 		@Override public ParserRule getRule() { return rule; }
 
-		//AdditiveExpression ({BooleanOperation.left=current} operator=("==" | "!=" | ">=" | "<=" | ">" | "<")
+		//AdditiveExpression ({BooleanOperation.left=current} operator=('==' | '!=' | '>=' | '<=' | '>' | '<')
 		//right=AdditiveExpression)*
 		public Group getGroup() { return cGroup; }
 
 		//AdditiveExpression
 		public RuleCall getAdditiveExpressionParserRuleCall_0() { return cAdditiveExpressionParserRuleCall_0; }
 
-		//({BooleanOperation.left=current} operator=("==" | "!=" | ">=" | "<=" | ">" | "<") right=AdditiveExpression)*
+		//({BooleanOperation.left=current} operator=('==' | '!=' | '>=' | '<=' | '>' | '<') right=AdditiveExpression)*
 		public Group getGroup_1() { return cGroup_1; }
 
 		//{BooleanOperation.left=current}
 		public Action getBooleanOperationLeftAction_1_0() { return cBooleanOperationLeftAction_1_0; }
 
-		//operator=("==" | "!=" | ">=" | "<=" | ">" | "<")
+		//operator=('==' | '!=' | '>=' | '<=' | '>' | '<')
 		public Assignment getOperatorAssignment_1_1() { return cOperatorAssignment_1_1; }
 
-		//"==" | "!=" | ">=" | "<=" | ">" | "<"
+		//('==' | '!=' | '>=' | '<=' | '>' | '<')
 		public Alternatives getOperatorAlternatives_1_1_0() { return cOperatorAlternatives_1_1_0; }
 
-		//"=="
+		//'=='
 		public Keyword getOperatorEqualsSignEqualsSignKeyword_1_1_0_0() { return cOperatorEqualsSignEqualsSignKeyword_1_1_0_0; }
 
-		//"!="
+		//'!='
 		public Keyword getOperatorExclamationMarkEqualsSignKeyword_1_1_0_1() { return cOperatorExclamationMarkEqualsSignKeyword_1_1_0_1; }
 
-		//">="
+		//'>='
 		public Keyword getOperatorGreaterThanSignEqualsSignKeyword_1_1_0_2() { return cOperatorGreaterThanSignEqualsSignKeyword_1_1_0_2; }
 
-		//"<="
+		//'<='
 		public Keyword getOperatorLessThanSignEqualsSignKeyword_1_1_0_3() { return cOperatorLessThanSignEqualsSignKeyword_1_1_0_3; }
 
-		//">"
+		//'>'
 		public Keyword getOperatorGreaterThanSignKeyword_1_1_0_4() { return cOperatorGreaterThanSignKeyword_1_1_0_4; }
 
-		//"<"
+		//'<'
 		public Keyword getOperatorLessThanSignKeyword_1_1_0_5() { return cOperatorLessThanSignKeyword_1_1_0_5; }
 
 		//right=AdditiveExpression
@@ -664,7 +664,7 @@ public class RelationalExpressionElements extends AbstractParserRuleElementFinde
 	}
 
 	public class AdditiveExpressionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "AdditiveExpression");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.expression.Expression.AdditiveExpression");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final RuleCall cMultiplicativeExpressionParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0);
 		private final Group cGroup_1 = (Group)cGroup.eContents().get(1);
@@ -681,32 +681,32 @@ public class AdditiveExpressionElements extends AbstractParserRuleElementFinder
 		//
 		////   (name=('+'| '-') r=multiplicativeExpression {$e = factory.createBinaryOperation(id(name),$e,r);})*;
 		//
-		//AdditiveExpression returns Expression:
-		//	MultiplicativeExpression ({OperationCall.params+=current} name=("+" | "-") params+=MultiplicativeExpression)*;
+		//AdditiveExpression Expression:
+		//	MultiplicativeExpression ({OperationCall.params+=current} name=('+' | '-') params+=MultiplicativeExpression)*;
 		@Override public ParserRule getRule() { return rule; }
 
-		//MultiplicativeExpression ({OperationCall.params+=current} name=("+" | "-") params+=MultiplicativeExpression)*
+		//MultiplicativeExpression ({OperationCall.params+=current} name=('+' | '-') params+=MultiplicativeExpression)*
 		public Group getGroup() { return cGroup; }
 
 		//MultiplicativeExpression
 		public RuleCall getMultiplicativeExpressionParserRuleCall_0() { return cMultiplicativeExpressionParserRuleCall_0; }
 
-		//({OperationCall.params+=current} name=("+" | "-") params+=MultiplicativeExpression)*
+		//({OperationCall.params+=current} name=('+' | '-') params+=MultiplicativeExpression)*
 		public Group getGroup_1() { return cGroup_1; }
 
 		//{OperationCall.params+=current}
 		public Action getOperationCallParamsAction_1_0() { return cOperationCallParamsAction_1_0; }
 
-		//name=("+" | "-")
+		//name=('+' | '-')
 		public Assignment getNameAssignment_1_1() { return cNameAssignment_1_1; }
 
-		//"+" | "-"
+		//('+' | '-')
 		public Alternatives getNameAlternatives_1_1_0() { return cNameAlternatives_1_1_0; }
 
-		//"+"
+		//'+'
 		public Keyword getNamePlusSignKeyword_1_1_0_0() { return cNamePlusSignKeyword_1_1_0_0; }
 
-		//"-"
+		//'-'
 		public Keyword getNameHyphenMinusKeyword_1_1_0_1() { return cNameHyphenMinusKeyword_1_1_0_1; }
 
 		//params+=MultiplicativeExpression
@@ -717,7 +717,7 @@ public class AdditiveExpressionElements extends AbstractParserRuleElementFinder
 	}
 
 	public class MultiplicativeExpressionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "MultiplicativeExpression");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.expression.Expression.MultiplicativeExpression");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final RuleCall cUnaryOrInfixExpressionParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0);
 		private final Group cGroup_1 = (Group)cGroup.eContents().get(1);
@@ -734,32 +734,32 @@ public class MultiplicativeExpressionElements extends AbstractParserRuleElementF
 		//
 		////	(name=('*' | '/') r=unaryExpression {$e = factory.createBinaryOperation(id(name),$e,r);})*;
 		//
-		//MultiplicativeExpression returns Expression:
-		//	UnaryOrInfixExpression ({OperationCall.params+=current} name=("*" | "/") params+=UnaryOrInfixExpression)*;
+		//MultiplicativeExpression Expression:
+		//	UnaryOrInfixExpression ({OperationCall.params+=current} name=('*' | '/') params+=UnaryOrInfixExpression)*;
 		@Override public ParserRule getRule() { return rule; }
 
-		//UnaryOrInfixExpression ({OperationCall.params+=current} name=("*" | "/") params+=UnaryOrInfixExpression)*
+		//UnaryOrInfixExpression ({OperationCall.params+=current} name=('*' | '/') params+=UnaryOrInfixExpression)*
 		public Group getGroup() { return cGroup; }
 
 		//UnaryOrInfixExpression
 		public RuleCall getUnaryOrInfixExpressionParserRuleCall_0() { return cUnaryOrInfixExpressionParserRuleCall_0; }
 
-		//({OperationCall.params+=current} name=("*" | "/") params+=UnaryOrInfixExpression)*
+		//({OperationCall.params+=current} name=('*' | '/') params+=UnaryOrInfixExpression)*
 		public Group getGroup_1() { return cGroup_1; }
 
 		//{OperationCall.params+=current}
 		public Action getOperationCallParamsAction_1_0() { return cOperationCallParamsAction_1_0; }
 
-		//name=("*" | "/")
+		//name=('*' | '/')
 		public Assignment getNameAssignment_1_1() { return cNameAssignment_1_1; }
 
-		//"*" | "/"
+		//('*' | '/')
 		public Alternatives getNameAlternatives_1_1_0() { return cNameAlternatives_1_1_0; }
 
-		//"*"
+		//'*'
 		public Keyword getNameAsteriskKeyword_1_1_0_0() { return cNameAsteriskKeyword_1_1_0_0; }
 
-		//"/"
+		//'/'
 		public Keyword getNameSolidusKeyword_1_1_0_1() { return cNameSolidusKeyword_1_1_0_1; }
 
 		//params+=UnaryOrInfixExpression
@@ -770,7 +770,7 @@ public class MultiplicativeExpressionElements extends AbstractParserRuleElementF
 	}
 
 	public class UnaryOrInfixExpressionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "UnaryOrInfixExpression");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.expression.Expression.UnaryOrInfixExpression");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cUnaryExpressionParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cInfixExpressionParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
@@ -781,8 +781,7 @@ public class UnaryOrInfixExpressionElements extends AbstractParserRuleElementFin
 		////|	name='!' x=infixExpression	{$e = factory.createOperationCall(id(name),x);}
 		//
 		////|	name='-' x=infixExpression	{$e = factory.createOperationCall(id(name),x);};
-		// UnaryOrInfixExpression returns
-		//Expression:
+		// UnaryOrInfixExpression Expression:
 		//	UnaryExpression | InfixExpression;
 		@Override public ParserRule getRule() { return rule; }
 
@@ -797,7 +796,7 @@ public class UnaryOrInfixExpressionElements extends AbstractParserRuleElementFin
 	}
 
 	public class UnaryExpressionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "UnaryExpression");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.expression.Expression.UnaryExpression");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cNameAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final Alternatives cNameAlternatives_0_0 = (Alternatives)cNameAssignment_0.eContents().get(0);
@@ -806,23 +805,23 @@ public class UnaryExpressionElements extends AbstractParserRuleElementFinder {
 		private final Assignment cParamsAssignment_1 = (Assignment)cGroup.eContents().get(1);
 		private final RuleCall cParamsInfixExpressionParserRuleCall_1_0 = (RuleCall)cParamsAssignment_1.eContents().get(0);
 		
-		//UnaryExpression returns OperationCall:
-		//	name=("!" | "-") params+=InfixExpression;
+		//UnaryExpression OperationCall:
+		//	name=('!' | '-') params+=InfixExpression;
 		@Override public ParserRule getRule() { return rule; }
 
-		//name=("!" | "-") params+=InfixExpression
+		//name=('!' | '-') params+=InfixExpression
 		public Group getGroup() { return cGroup; }
 
-		//name=("!" | "-")
+		//name=('!' | '-')
 		public Assignment getNameAssignment_0() { return cNameAssignment_0; }
 
-		//"!" | "-"
+		//('!' | '-')
 		public Alternatives getNameAlternatives_0_0() { return cNameAlternatives_0_0; }
 
-		//"!"
+		//'!'
 		public Keyword getNameExclamationMarkKeyword_0_0_0() { return cNameExclamationMarkKeyword_0_0_0; }
 
-		//"-"
+		//'-'
 		public Keyword getNameHyphenMinusKeyword_0_0_1() { return cNameHyphenMinusKeyword_0_0_1; }
 
 		//params+=InfixExpression
@@ -833,7 +832,7 @@ public class UnaryExpressionElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class InfixExpressionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "InfixExpression");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.expression.Expression.InfixExpression");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final RuleCall cPrimaryExpressionParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0);
 		private final Alternatives cAlternatives_1 = (Alternatives)cGroup.eContents().get(1);
@@ -892,37 +891,37 @@ public class InfixExpressionElements extends AbstractParserRuleElementFinder {
 		////	x=primaryExpression {$e=x;} ( '.' op=featureCall { if (op!=null) { op.setTarget($e);$e=op;}} )*;
 		//
 		//// having support for fragments could avoid the redundancy at this point
-		// InfixExpression returns Expression:
-		//	PrimaryExpression ({OperationCall.target=current} "." name=Identifier "(" (params+=Expression (","
-		//	params+=Expression)*)? ")" | {FeatureCall.target=current} "." type=Type | {TypeSelectExpression.target=current} "."
-		//	name="typeSelect" "(" type=Type ")" | {CollectionExpression.target=current} "." name=("collect" | "select" |
-		//	"selectFirst" | "reject" | "exists" | "notExists" | "sortBy" | "forAll") "(" (var=Identifier "|")? exp=Expression
-		//	")")*;
+		// InfixExpression Expression:
+		//	PrimaryExpression ({OperationCall.target=current} '.' name=Identifier '(' (params+=Expression (','
+		//	params+=Expression)*)? ')' | {FeatureCall.target=current} '.' type=Type | {TypeSelectExpression.target=current} '.'
+		//	name='typeSelect' '(' type=Type ')' | {CollectionExpression.target=current} '.' name=('collect' | 'select' |
+		//	'selectFirst' | 'reject' | 'exists' | 'notExists' | 'sortBy' | 'forAll') '(' (var=Identifier '|')? exp=Expression
+		//	')')*;
 		@Override public ParserRule getRule() { return rule; }
 
-		//PrimaryExpression ({OperationCall.target=current} "." name=Identifier "(" (params+=Expression (","
-		//params+=Expression)*)? ")" | {FeatureCall.target=current} "." type=Type | {TypeSelectExpression.target=current} "."
-		//name="typeSelect" "(" type=Type ")" | {CollectionExpression.target=current} "." name=("collect" | "select" |
-		//"selectFirst" | "reject" | "exists" | "notExists" | "sortBy" | "forAll") "(" (var=Identifier "|")? exp=Expression
-		//")")*
+		//PrimaryExpression ({OperationCall.target=current} '.' name=Identifier '(' (params+=Expression (','
+		//params+=Expression)*)? ')' | {FeatureCall.target=current} '.' type=Type | {TypeSelectExpression.target=current} '.'
+		//name='typeSelect' '(' type=Type ')' | {CollectionExpression.target=current} '.' name=('collect' | 'select' |
+		//'selectFirst' | 'reject' | 'exists' | 'notExists' | 'sortBy' | 'forAll') '(' (var=Identifier '|')? exp=Expression
+		//')')*
 		public Group getGroup() { return cGroup; }
 
 		//PrimaryExpression
 		public RuleCall getPrimaryExpressionParserRuleCall_0() { return cPrimaryExpressionParserRuleCall_0; }
 
-		//({OperationCall.target=current} "." name=Identifier "(" (params+=Expression ("," params+=Expression)*)? ")" |
-		//{FeatureCall.target=current} "." type=Type | {TypeSelectExpression.target=current} "." name="typeSelect" "(" type=Type
-		//")" | {CollectionExpression.target=current} "." name=("collect" | "select" | "selectFirst" | "reject" | "exists" |
-		//"notExists" | "sortBy" | "forAll") "(" (var=Identifier "|")? exp=Expression ")")*
+		//({OperationCall.target=current} '.' name=Identifier '(' (params+=Expression (',' params+=Expression)*)? ')' |
+		//{FeatureCall.target=current} '.' type=Type | {TypeSelectExpression.target=current} '.' name='typeSelect' '(' type=Type
+		//')' | {CollectionExpression.target=current} '.' name=('collect' | 'select' | 'selectFirst' | 'reject' | 'exists' |
+		//'notExists' | 'sortBy' | 'forAll') '(' (var=Identifier '|')? exp=Expression ')')*
 		public Alternatives getAlternatives_1() { return cAlternatives_1; }
 
-		//{OperationCall.target=current} "." name=Identifier "(" (params+=Expression ("," params+=Expression)*)? ")"
+		//{OperationCall.target=current} '.' name=Identifier '(' (params+=Expression (',' params+=Expression)*)? ')'
 		public Group getGroup_1_0() { return cGroup_1_0; }
 
 		//{OperationCall.target=current}
 		public Action getOperationCallTargetAction_1_0_0() { return cOperationCallTargetAction_1_0_0; }
 
-		//"."
+		//'.'
 		public Keyword getFullStopKeyword_1_0_1() { return cFullStopKeyword_1_0_1; }
 
 		//name=Identifier
@@ -931,10 +930,10 @@ public class InfixExpressionElements extends AbstractParserRuleElementFinder {
 		//Identifier
 		public RuleCall getNameIdentifierParserRuleCall_1_0_2_0() { return cNameIdentifierParserRuleCall_1_0_2_0; }
 
-		//"("
+		//'('
 		public Keyword getLeftParenthesisKeyword_1_0_3() { return cLeftParenthesisKeyword_1_0_3; }
 
-		//(params+=Expression ("," params+=Expression)*)?
+		//(params+=Expression (',' params+=Expression)*)?
 		public Group getGroup_1_0_4() { return cGroup_1_0_4; }
 
 		//params+=Expression
@@ -943,10 +942,10 @@ public class InfixExpressionElements extends AbstractParserRuleElementFinder {
 		//Expression
 		public RuleCall getParamsExpressionParserRuleCall_1_0_4_0_0() { return cParamsExpressionParserRuleCall_1_0_4_0_0; }
 
-		//("," params+=Expression)*
+		//(',' params+=Expression)*
 		public Group getGroup_1_0_4_1() { return cGroup_1_0_4_1; }
 
-		//","
+		//','
 		public Keyword getCommaKeyword_1_0_4_1_0() { return cCommaKeyword_1_0_4_1_0; }
 
 		//params+=Expression
@@ -955,16 +954,16 @@ public class InfixExpressionElements extends AbstractParserRuleElementFinder {
 		//Expression
 		public RuleCall getParamsExpressionParserRuleCall_1_0_4_1_1_0() { return cParamsExpressionParserRuleCall_1_0_4_1_1_0; }
 
-		//")"
+		//')'
 		public Keyword getRightParenthesisKeyword_1_0_5() { return cRightParenthesisKeyword_1_0_5; }
 
-		//{FeatureCall.target=current} "." type=Type
+		//{FeatureCall.target=current} '.' type=Type
 		public Group getGroup_1_1() { return cGroup_1_1; }
 
 		//{FeatureCall.target=current}
 		public Action getFeatureCallTargetAction_1_1_0() { return cFeatureCallTargetAction_1_1_0; }
 
-		//"."
+		//'.'
 		public Keyword getFullStopKeyword_1_1_1() { return cFullStopKeyword_1_1_1; }
 
 		//type=Type
@@ -973,22 +972,22 @@ public class InfixExpressionElements extends AbstractParserRuleElementFinder {
 		//Type
 		public RuleCall getTypeTypeParserRuleCall_1_1_2_0() { return cTypeTypeParserRuleCall_1_1_2_0; }
 
-		//{TypeSelectExpression.target=current} "." name="typeSelect" "(" type=Type ")"
+		//{TypeSelectExpression.target=current} '.' name='typeSelect' '(' type=Type ')'
 		public Group getGroup_1_2() { return cGroup_1_2; }
 
 		//{TypeSelectExpression.target=current}
 		public Action getTypeSelectExpressionTargetAction_1_2_0() { return cTypeSelectExpressionTargetAction_1_2_0; }
 
-		//"."
+		//'.'
 		public Keyword getFullStopKeyword_1_2_1() { return cFullStopKeyword_1_2_1; }
 
-		//name="typeSelect"
+		//name='typeSelect'
 		public Assignment getNameAssignment_1_2_2() { return cNameAssignment_1_2_2; }
 
-		//"typeSelect"
+		//'typeSelect'
 		public Keyword getNameTypeSelectKeyword_1_2_2_0() { return cNameTypeSelectKeyword_1_2_2_0; }
 
-		//"("
+		//'('
 		public Keyword getLeftParenthesisKeyword_1_2_3() { return cLeftParenthesisKeyword_1_2_3; }
 
 		//type=Type
@@ -997,53 +996,53 @@ public class InfixExpressionElements extends AbstractParserRuleElementFinder {
 		//Type
 		public RuleCall getTypeTypeParserRuleCall_1_2_4_0() { return cTypeTypeParserRuleCall_1_2_4_0; }
 
-		//")"
+		//')'
 		public Keyword getRightParenthesisKeyword_1_2_5() { return cRightParenthesisKeyword_1_2_5; }
 
-		//{CollectionExpression.target=current} "." name=("collect" | "select" | "selectFirst" | "reject" | "exists" | "notExists"
-		//| "sortBy" | "forAll") "(" (var=Identifier "|")? exp=Expression ")"
+		//{CollectionExpression.target=current} '.' name=('collect' | 'select' | 'selectFirst' | 'reject' | 'exists' | 'notExists'
+		//| 'sortBy' | 'forAll') '(' (var=Identifier '|')? exp=Expression ')'
 		public Group getGroup_1_3() { return cGroup_1_3; }
 
 		//{CollectionExpression.target=current}
 		public Action getCollectionExpressionTargetAction_1_3_0() { return cCollectionExpressionTargetAction_1_3_0; }
 
-		//"."
+		//'.'
 		public Keyword getFullStopKeyword_1_3_1() { return cFullStopKeyword_1_3_1; }
 
-		//name=("collect" | "select" | "selectFirst" | "reject" | "exists" | "notExists" | "sortBy" | "forAll")
+		//name=('collect' | 'select' | 'selectFirst' | 'reject' | 'exists' | 'notExists' | 'sortBy' | 'forAll')
 		public Assignment getNameAssignment_1_3_2() { return cNameAssignment_1_3_2; }
 
-		//"collect" | "select" | "selectFirst" | "reject" | "exists" | "notExists" | "sortBy" | "forAll"
+		//('collect' | 'select' | 'selectFirst' | 'reject' | 'exists' | 'notExists' | 'sortBy' | 'forAll')
 		public Alternatives getNameAlternatives_1_3_2_0() { return cNameAlternatives_1_3_2_0; }
 
-		//"collect"
+		//'collect'
 		public Keyword getNameCollectKeyword_1_3_2_0_0() { return cNameCollectKeyword_1_3_2_0_0; }
 
-		//"select"
+		//'select'
 		public Keyword getNameSelectKeyword_1_3_2_0_1() { return cNameSelectKeyword_1_3_2_0_1; }
 
-		//"selectFirst"
+		//'selectFirst'
 		public Keyword getNameSelectFirstKeyword_1_3_2_0_2() { return cNameSelectFirstKeyword_1_3_2_0_2; }
 
-		//"reject"
+		//'reject'
 		public Keyword getNameRejectKeyword_1_3_2_0_3() { return cNameRejectKeyword_1_3_2_0_3; }
 
-		//"exists"
+		//'exists'
 		public Keyword getNameExistsKeyword_1_3_2_0_4() { return cNameExistsKeyword_1_3_2_0_4; }
 
-		//"notExists"
+		//'notExists'
 		public Keyword getNameNotExistsKeyword_1_3_2_0_5() { return cNameNotExistsKeyword_1_3_2_0_5; }
 
-		//"sortBy"
+		//'sortBy'
 		public Keyword getNameSortByKeyword_1_3_2_0_6() { return cNameSortByKeyword_1_3_2_0_6; }
 
-		//"forAll"
+		//'forAll'
 		public Keyword getNameForAllKeyword_1_3_2_0_7() { return cNameForAllKeyword_1_3_2_0_7; }
 
-		//"("
+		//'('
 		public Keyword getLeftParenthesisKeyword_1_3_3() { return cLeftParenthesisKeyword_1_3_3; }
 
-		//(var=Identifier "|")?
+		//(var=Identifier '|')?
 		public Group getGroup_1_3_4() { return cGroup_1_3_4; }
 
 		//var=Identifier
@@ -1052,7 +1051,7 @@ public class InfixExpressionElements extends AbstractParserRuleElementFinder {
 		//Identifier
 		public RuleCall getVarIdentifierParserRuleCall_1_3_4_0_0() { return cVarIdentifierParserRuleCall_1_3_4_0_0; }
 
-		//"|"
+		//'|'
 		public Keyword getVerticalLineKeyword_1_3_4_1() { return cVerticalLineKeyword_1_3_4_1; }
 
 		//exp=Expression
@@ -1061,12 +1060,12 @@ public class InfixExpressionElements extends AbstractParserRuleElementFinder {
 		//Expression
 		public RuleCall getExpExpressionParserRuleCall_1_3_5_0() { return cExpExpressionParserRuleCall_1_3_5_0; }
 
-		//")"
+		//')'
 		public Keyword getRightParenthesisKeyword_1_3_6() { return cRightParenthesisKeyword_1_3_6; }
 	}
 
 	public class PrimaryExpressionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "PrimaryExpression");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.expression.Expression.PrimaryExpression");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cLiteralParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cFeatureCallParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
@@ -1088,7 +1087,7 @@ public class PrimaryExpressionElements extends AbstractParserRuleElementFinder {
 		//
 		////|   x=globalVarExpression {$e=x;}
 		// //|   x=paranthesizedExpression {$e=x;};
-		// PrimaryExpression returns Expression:
+		// PrimaryExpression Expression:
 		//	Literal | FeatureCall | ListLiteral | ConstructorCallExpression | GlobalVarExpression | ParanthesizedExpression;
 		@Override public ParserRule getRule() { return rule; }
 
@@ -1115,7 +1114,7 @@ public class PrimaryExpressionElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class LiteralElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Literal");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.expression.Expression.Literal");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cBooleanLiteralParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cIntegerLiteralParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
@@ -1147,31 +1146,31 @@ public class LiteralElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class BooleanLiteralElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "BooleanLiteral");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.expression.Expression.BooleanLiteral");
 		private final Assignment cValAssignment = (Assignment)rule.eContents().get(1);
 		private final Alternatives cValAlternatives_0 = (Alternatives)cValAssignment.eContents().get(0);
 		private final Keyword cValTrueKeyword_0_0 = (Keyword)cValAlternatives_0.eContents().get(0);
 		private final Keyword cValFalseKeyword_0_1 = (Keyword)cValAlternatives_0.eContents().get(1);
 		
 		//BooleanLiteral:
-		//	val=("true" | "false");
+		//	val=('true' | 'false');
 		@Override public ParserRule getRule() { return rule; }
 
-		//val=("true" | "false")
+		//val=('true' | 'false')
 		public Assignment getValAssignment() { return cValAssignment; }
 
-		//"true" | "false"
+		//('true' | 'false')
 		public Alternatives getValAlternatives_0() { return cValAlternatives_0; }
 
-		//"true"
+		//'true'
 		public Keyword getValTrueKeyword_0_0() { return cValTrueKeyword_0_0; }
 
-		//"false"
+		//'false'
 		public Keyword getValFalseKeyword_0_1() { return cValFalseKeyword_0_1; }
 	}
 
 	public class IntegerLiteralElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "IntegerLiteral");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.expression.Expression.IntegerLiteral");
 		private final Assignment cValAssignment = (Assignment)rule.eContents().get(1);
 		private final RuleCall cValINTTerminalRuleCall_0 = (RuleCall)cValAssignment.eContents().get(0);
 		
@@ -1187,23 +1186,23 @@ public class IntegerLiteralElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class NullLiteralElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "NullLiteral");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.expression.Expression.NullLiteral");
 		private final Assignment cValAssignment = (Assignment)rule.eContents().get(1);
 		private final Keyword cValNullKeyword_0 = (Keyword)cValAssignment.eContents().get(0);
 		
 		//NullLiteral:
-		//	val="null";
+		//	val='null';
 		@Override public ParserRule getRule() { return rule; }
 
-		//val="null"
+		//val='null'
 		public Assignment getValAssignment() { return cValAssignment; }
 
-		//"null"
+		//'null'
 		public Keyword getValNullKeyword_0() { return cValNullKeyword_0; }
 	}
 
 	public class RealLiteralElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "RealLiteral");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.expression.Expression.RealLiteral");
 		private final Assignment cValAssignment = (Assignment)rule.eContents().get(1);
 		private final RuleCall cValREALTerminalRuleCall_0 = (RuleCall)cValAssignment.eContents().get(0);
 		
@@ -1219,7 +1218,7 @@ public class RealLiteralElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class StringLiteralElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "StringLiteral");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.expression.Expression.StringLiteral");
 		private final Assignment cValAssignment = (Assignment)rule.eContents().get(1);
 		private final RuleCall cValSTRINGTerminalRuleCall_0 = (RuleCall)cValAssignment.eContents().get(0);
 		
@@ -1235,7 +1234,7 @@ public class StringLiteralElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class ParanthesizedExpressionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ParanthesizedExpression");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.expression.Expression.ParanthesizedExpression");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cLeftParenthesisKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final RuleCall cExpressionParserRuleCall_1 = (RuleCall)cGroup.eContents().get(1);
@@ -1244,26 +1243,25 @@ public class ParanthesizedExpressionElements extends AbstractParserRuleElementFi
 		////paranthesizedExpression returns [Expression e] :
 		//
 		////    '(' x=expression ')' {$e=factory.createParanthesizedExpression(x);};
-		// ParanthesizedExpression returns
-		//Expression:
-		//	"(" Expression ")";
+		// ParanthesizedExpression Expression:
+		//	'(' Expression ')';
 		@Override public ParserRule getRule() { return rule; }
 
-		//"(" Expression ")"
+		//'(' Expression ')'
 		public Group getGroup() { return cGroup; }
 
-		//"("
+		//'('
 		public Keyword getLeftParenthesisKeyword_0() { return cLeftParenthesisKeyword_0; }
 
 		//Expression
 		public RuleCall getExpressionParserRuleCall_1() { return cExpressionParserRuleCall_1; }
 
-		//")"
+		//')'
 		public Keyword getRightParenthesisKeyword_2() { return cRightParenthesisKeyword_2; }
 	}
 
 	public class GlobalVarExpressionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "GlobalVarExpression");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.expression.Expression.GlobalVarExpression");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cGLOBALVARKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -1273,13 +1271,13 @@ public class GlobalVarExpressionElements extends AbstractParserRuleElementFinder
 		//
 		////    '(' x=expression ')' {$e=factory.createParanthesizedExpression(x);};
 		// GlobalVarExpression:
-		//	"GLOBALVAR" name=Identifier;
+		//	'GLOBALVAR' name=Identifier;
 		@Override public ParserRule getRule() { return rule; }
 
-		//"GLOBALVAR" name=Identifier
+		//'GLOBALVAR' name=Identifier
 		public Group getGroup() { return cGroup; }
 
-		//"GLOBALVAR"
+		//'GLOBALVAR'
 		public Keyword getGLOBALVARKeyword_0() { return cGLOBALVARKeyword_0; }
 
 		//name=Identifier
@@ -1290,7 +1288,7 @@ public class GlobalVarExpressionElements extends AbstractParserRuleElementFinder
 	}
 
 	public class FeatureCallElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "FeatureCall");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.expression.Expression.FeatureCall");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cOperationCallParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final Assignment cTypeAssignment_1 = (Assignment)cAlternatives.eContents().get(1);
@@ -1328,7 +1326,7 @@ public class FeatureCallElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class OperationCallElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "OperationCall");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.expression.Expression.OperationCall");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cNameAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final RuleCall cNameIdentifierParserRuleCall_0_0 = (RuleCall)cNameAssignment_0.eContents().get(0);
@@ -1343,10 +1341,10 @@ public class OperationCallElements extends AbstractParserRuleElementFinder {
 		private final Keyword cRightParenthesisKeyword_3 = (Keyword)cGroup.eContents().get(3);
 		
 		//OperationCall:
-		//	name=Identifier "(" (params+=Expression ("," params+=Expression)*)? ")";
+		//	name=Identifier '(' (params+=Expression (',' params+=Expression)*)? ')';
 		@Override public ParserRule getRule() { return rule; }
 
-		//name=Identifier "(" (params+=Expression ("," params+=Expression)*)? ")"
+		//name=Identifier '(' (params+=Expression (',' params+=Expression)*)? ')'
 		public Group getGroup() { return cGroup; }
 
 		//name=Identifier
@@ -1355,10 +1353,10 @@ public class OperationCallElements extends AbstractParserRuleElementFinder {
 		//Identifier
 		public RuleCall getNameIdentifierParserRuleCall_0_0() { return cNameIdentifierParserRuleCall_0_0; }
 
-		//"("
+		//'('
 		public Keyword getLeftParenthesisKeyword_1() { return cLeftParenthesisKeyword_1; }
 
-		//(params+=Expression ("," params+=Expression)*)?
+		//(params+=Expression (',' params+=Expression)*)?
 		public Group getGroup_2() { return cGroup_2; }
 
 		//params+=Expression
@@ -1367,10 +1365,10 @@ public class OperationCallElements extends AbstractParserRuleElementFinder {
 		//Expression
 		public RuleCall getParamsExpressionParserRuleCall_2_0_0() { return cParamsExpressionParserRuleCall_2_0_0; }
 
-		//("," params+=Expression)*
+		//(',' params+=Expression)*
 		public Group getGroup_2_1() { return cGroup_2_1; }
 
-		//","
+		//','
 		public Keyword getCommaKeyword_2_1_0() { return cCommaKeyword_2_1_0; }
 
 		//params+=Expression
@@ -1379,12 +1377,12 @@ public class OperationCallElements extends AbstractParserRuleElementFinder {
 		//Expression
 		public RuleCall getParamsExpressionParserRuleCall_2_1_1_0() { return cParamsExpressionParserRuleCall_2_1_1_0; }
 
-		//")"
+		//')'
 		public Keyword getRightParenthesisKeyword_3() { return cRightParenthesisKeyword_3; }
 	}
 
 	public class ListLiteralElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ListLiteral");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.expression.Expression.ListLiteral");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Action cListLiteralAction_0 = (Action)cGroup.eContents().get(0);
 		private final Keyword cLeftCurlyBracketKeyword_1 = (Keyword)cGroup.eContents().get(1);
@@ -1400,19 +1398,19 @@ public class ListLiteralElements extends AbstractParserRuleElementFinder {
 		////listLiteral  returns [Expression e] :
 		// //	'{' (l=parameterList)? '}' {$e=factory.createListLiteral(l);};
 		// ListLiteral:
-		//	{ListLiteral} "{" (elements+=Expression ("," elements+=Expression)*)? "}";
+		//	{ListLiteral} '{' (elements+=Expression (',' elements+=Expression)*)? '}';
 		@Override public ParserRule getRule() { return rule; }
 
-		//{ListLiteral} "{" (elements+=Expression ("," elements+=Expression)*)? "}"
+		//{ListLiteral} '{' (elements+=Expression (',' elements+=Expression)*)? '}'
 		public Group getGroup() { return cGroup; }
 
 		//{ListLiteral}
 		public Action getListLiteralAction_0() { return cListLiteralAction_0; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_1() { return cLeftCurlyBracketKeyword_1; }
 
-		//(elements+=Expression ("," elements+=Expression)*)?
+		//(elements+=Expression (',' elements+=Expression)*)?
 		public Group getGroup_2() { return cGroup_2; }
 
 		//elements+=Expression
@@ -1421,10 +1419,10 @@ public class ListLiteralElements extends AbstractParserRuleElementFinder {
 		//Expression
 		public RuleCall getElementsExpressionParserRuleCall_2_0_0() { return cElementsExpressionParserRuleCall_2_0_0; }
 
-		//("," elements+=Expression)*
+		//(',' elements+=Expression)*
 		public Group getGroup_2_1() { return cGroup_2_1; }
 
-		//","
+		//','
 		public Keyword getCommaKeyword_2_1_0() { return cCommaKeyword_2_1_0; }
 
 		//elements+=Expression
@@ -1433,12 +1431,12 @@ public class ListLiteralElements extends AbstractParserRuleElementFinder {
 		//Expression
 		public RuleCall getElementsExpressionParserRuleCall_2_1_1_0() { return cElementsExpressionParserRuleCall_2_1_1_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_3() { return cRightCurlyBracketKeyword_3; }
 	}
 
 	public class ConstructorCallExpressionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ConstructorCallExpression");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.expression.Expression.ConstructorCallExpression");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cNewKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cTypeAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -1449,13 +1447,13 @@ public class ConstructorCallExpressionElements extends AbstractParserRuleElement
 		//
 		////	{$e= factory.createConstructorCallExpression(t);};
 		// ConstructorCallExpression:
-		//	"new" type=SimpleType;
+		//	'new' type=SimpleType;
 		@Override public ParserRule getRule() { return rule; }
 
-		//"new" type=SimpleType
+		//'new' type=SimpleType
 		public Group getGroup() { return cGroup; }
 
-		//"new"
+		//'new'
 		public Keyword getNewKeyword_0() { return cNewKeyword_0; }
 
 		//type=SimpleType
@@ -1466,7 +1464,7 @@ public class ConstructorCallExpressionElements extends AbstractParserRuleElement
 	}
 
 	public class TypeSelectExpressionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "TypeSelectExpression");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.expression.Expression.TypeSelectExpression");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cNameAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final Keyword cNameTypeSelectKeyword_0_0 = (Keyword)cNameAssignment_0.eContents().get(0);
@@ -1492,19 +1490,19 @@ public class TypeSelectExpressionElements extends AbstractParserRuleElementFinde
 		//
 		//// { $e = factory.createCollectionExpression(id(name),var,x);};
 		// TypeSelectExpression:
-		//	name="typeSelect" "(" type=Type ")";
+		//	name='typeSelect' '(' type=Type ')';
 		@Override public ParserRule getRule() { return rule; }
 
-		//name="typeSelect" "(" type=Type ")"
+		//name='typeSelect' '(' type=Type ')'
 		public Group getGroup() { return cGroup; }
 
-		//name="typeSelect"
+		//name='typeSelect'
 		public Assignment getNameAssignment_0() { return cNameAssignment_0; }
 
-		//"typeSelect"
+		//'typeSelect'
 		public Keyword getNameTypeSelectKeyword_0_0() { return cNameTypeSelectKeyword_0_0; }
 
-		//"("
+		//'('
 		public Keyword getLeftParenthesisKeyword_1() { return cLeftParenthesisKeyword_1; }
 
 		//type=Type
@@ -1513,12 +1511,12 @@ public class TypeSelectExpressionElements extends AbstractParserRuleElementFinde
 		//Type
 		public RuleCall getTypeTypeParserRuleCall_2_0() { return cTypeTypeParserRuleCall_2_0; }
 
-		//")"
+		//')'
 		public Keyword getRightParenthesisKeyword_3() { return cRightParenthesisKeyword_3; }
 	}
 
 	public class CollectionExpressionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "CollectionExpression");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.expression.Expression.CollectionExpression");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cNameAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final Alternatives cNameAlternatives_0_0 = (Alternatives)cNameAssignment_0.eContents().get(0);
@@ -1540,48 +1538,48 @@ public class CollectionExpressionElements extends AbstractParserRuleElementFinde
 		private final Keyword cRightParenthesisKeyword_4 = (Keyword)cGroup.eContents().get(4);
 		
 		//CollectionExpression:
-		//	name=("collect" | "select" | "selectFirst" | "reject" | "exists" | "notExists" | "sortBy" | "forAll") "("
-		//	(var=Identifier "|")? exp=Expression ")";
+		//	name=('collect' | 'select' | 'selectFirst' | 'reject' | 'exists' | 'notExists' | 'sortBy' | 'forAll') '('
+		//	(var=Identifier '|')? exp=Expression ')';
 		@Override public ParserRule getRule() { return rule; }
 
-		//name=("collect" | "select" | "selectFirst" | "reject" | "exists" | "notExists" | "sortBy" | "forAll") "("
-		//(var=Identifier "|")? exp=Expression ")"
+		//name=('collect' | 'select' | 'selectFirst' | 'reject' | 'exists' | 'notExists' | 'sortBy' | 'forAll') '('
+		//(var=Identifier '|')? exp=Expression ')'
 		public Group getGroup() { return cGroup; }
 
-		//name=("collect" | "select" | "selectFirst" | "reject" | "exists" | "notExists" | "sortBy" | "forAll")
+		//name=('collect' | 'select' | 'selectFirst' | 'reject' | 'exists' | 'notExists' | 'sortBy' | 'forAll')
 		public Assignment getNameAssignment_0() { return cNameAssignment_0; }
 
-		//"collect" | "select" | "selectFirst" | "reject" | "exists" | "notExists" | "sortBy" | "forAll"
+		//('collect' | 'select' | 'selectFirst' | 'reject' | 'exists' | 'notExists' | 'sortBy' | 'forAll')
 		public Alternatives getNameAlternatives_0_0() { return cNameAlternatives_0_0; }
 
-		//"collect"
+		//'collect'
 		public Keyword getNameCollectKeyword_0_0_0() { return cNameCollectKeyword_0_0_0; }
 
-		//"select"
+		//'select'
 		public Keyword getNameSelectKeyword_0_0_1() { return cNameSelectKeyword_0_0_1; }
 
-		//"selectFirst"
+		//'selectFirst'
 		public Keyword getNameSelectFirstKeyword_0_0_2() { return cNameSelectFirstKeyword_0_0_2; }
 
-		//"reject"
+		//'reject'
 		public Keyword getNameRejectKeyword_0_0_3() { return cNameRejectKeyword_0_0_3; }
 
-		//"exists"
+		//'exists'
 		public Keyword getNameExistsKeyword_0_0_4() { return cNameExistsKeyword_0_0_4; }
 
-		//"notExists"
+		//'notExists'
 		public Keyword getNameNotExistsKeyword_0_0_5() { return cNameNotExistsKeyword_0_0_5; }
 
-		//"sortBy"
+		//'sortBy'
 		public Keyword getNameSortByKeyword_0_0_6() { return cNameSortByKeyword_0_0_6; }
 
-		//"forAll"
+		//'forAll'
 		public Keyword getNameForAllKeyword_0_0_7() { return cNameForAllKeyword_0_0_7; }
 
-		//"("
+		//'('
 		public Keyword getLeftParenthesisKeyword_1() { return cLeftParenthesisKeyword_1; }
 
-		//(var=Identifier "|")?
+		//(var=Identifier '|')?
 		public Group getGroup_2() { return cGroup_2; }
 
 		//var=Identifier
@@ -1590,7 +1588,7 @@ public class CollectionExpressionElements extends AbstractParserRuleElementFinde
 		//Identifier
 		public RuleCall getVarIdentifierParserRuleCall_2_0_0() { return cVarIdentifierParserRuleCall_2_0_0; }
 
-		//"|"
+		//'|'
 		public Keyword getVerticalLineKeyword_2_1() { return cVerticalLineKeyword_2_1; }
 
 		//exp=Expression
@@ -1599,12 +1597,12 @@ public class CollectionExpressionElements extends AbstractParserRuleElementFinde
 		//Expression
 		public RuleCall getExpExpressionParserRuleCall_3_0() { return cExpExpressionParserRuleCall_3_0; }
 
-		//")"
+		//')'
 		public Keyword getRightParenthesisKeyword_4() { return cRightParenthesisKeyword_4; }
 	}
 
 	public class TypeElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Type");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.expression.Expression.Type");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cCollectionTypeParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cSimpleTypeParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
@@ -1612,7 +1610,7 @@ public class TypeElements extends AbstractParserRuleElementFinder {
 		////type returns [Identifier id] :
 		// //	a = collectionType {$id=a;}|
 		// //	b = simpleType {$id=b;};
-		// Type returns Identifier:
+		// Type Identifier:
 		//	CollectionType | SimpleType;
 		@Override public ParserRule getRule() { return rule; }
 
@@ -1627,7 +1625,7 @@ public class TypeElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class CollectionTypeElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "CollectionType");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.expression.Expression.CollectionType");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cClAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final Alternatives cClAlternatives_0_0 = (Alternatives)cClAssignment_0.eContents().get(0);
@@ -1643,30 +1641,29 @@ public class CollectionTypeElements extends AbstractParserRuleElementFinder {
 		// //  cl=( 'Collection' | 'List' | 'Set' ) {$id = id(cl);}
 		//
 		////  (b='[' id1=simpleType c=']' { $id.append(id(b));$id.append(id1);$id.append(id(c));})?;
-		// CollectionType returns
-		//Identifier:
-		//	cl=("Collection" | "List" | "Set") "[" id1=SimpleType "]";
+		// CollectionType Identifier:
+		//	cl=('Collection' | 'List' | 'Set') '[' id1=SimpleType ']';
 		@Override public ParserRule getRule() { return rule; }
 
-		//cl=("Collection" | "List" | "Set") "[" id1=SimpleType "]"
+		//cl=('Collection' | 'List' | 'Set') '[' id1=SimpleType ']'
 		public Group getGroup() { return cGroup; }
 
-		//cl=("Collection" | "List" | "Set")
+		//cl=('Collection' | 'List' | 'Set')
 		public Assignment getClAssignment_0() { return cClAssignment_0; }
 
-		//"Collection" | "List" | "Set"
+		//('Collection' | 'List' | 'Set')
 		public Alternatives getClAlternatives_0_0() { return cClAlternatives_0_0; }
 
-		//"Collection"
+		//'Collection'
 		public Keyword getClCollectionKeyword_0_0_0() { return cClCollectionKeyword_0_0_0; }
 
-		//"List"
+		//'List'
 		public Keyword getClListKeyword_0_0_1() { return cClListKeyword_0_0_1; }
 
-		//"Set"
+		//'Set'
 		public Keyword getClSetKeyword_0_0_2() { return cClSetKeyword_0_0_2; }
 
-		//"["
+		//'['
 		public Keyword getLeftSquareBracketKeyword_1() { return cLeftSquareBracketKeyword_1; }
 
 		//id1=SimpleType
@@ -1675,12 +1672,12 @@ public class CollectionTypeElements extends AbstractParserRuleElementFinder {
 		//SimpleType
 		public RuleCall getId1SimpleTypeParserRuleCall_2_0() { return cId1SimpleTypeParserRuleCall_2_0; }
 
-		//"]"
+		//']'
 		public Keyword getRightSquareBracketKeyword_3() { return cRightSquareBracketKeyword_3; }
 	}
 
 	public class SimpleTypeElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "SimpleType");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.expression.Expression.SimpleType");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cIdAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final RuleCall cIdIdentifierParserRuleCall_0_0 = (RuleCall)cIdAssignment_0.eContents().get(0);
@@ -1693,11 +1690,11 @@ public class SimpleTypeElements extends AbstractParserRuleElementFinder {
 		// //	x=identifier {$id=x;}
 		//
 		////	(d='::' end=identifier  {$id.append(id(d)); $id.append(end);})*;
-		// SimpleType returns Identifier:
-		//	id+=Identifier ("::" id+=Identifier)*;
+		// SimpleType Identifier:
+		//	id+=Identifier ('::' id+=Identifier)*;
 		@Override public ParserRule getRule() { return rule; }
 
-		//id+=Identifier ("::" id+=Identifier)*
+		//id+=Identifier ('::' id+=Identifier)*
 		public Group getGroup() { return cGroup; }
 
 		//id+=Identifier
@@ -1706,10 +1703,10 @@ public class SimpleTypeElements extends AbstractParserRuleElementFinder {
 		//Identifier
 		public RuleCall getIdIdentifierParserRuleCall_0_0() { return cIdIdentifierParserRuleCall_0_0; }
 
-		//("::" id+=Identifier)*
+		//('::' id+=Identifier)*
 		public Group getGroup_1() { return cGroup_1; }
 
-		//"::"
+		//'::'
 		public Keyword getColonColonKeyword_1_0() { return cColonColonKeyword_1_0; }
 
 		//id+=Identifier
@@ -1720,10 +1717,10 @@ public class SimpleTypeElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class IdentifierElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Identifier");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
 		private final RuleCall cIDTerminalRuleCall = (RuleCall)rule.eContents().get(1);
 		
-		//Identifier returns ecore::EString:
+		//Identifier:
 		//	ID;
 		@Override public ParserRule getRule() { return rule; }
 
@@ -1807,7 +1804,7 @@ public ExpressionGrammarAccess(GrammarProvider grammarProvider,
 		this.pNullLiteral = new NullLiteralElements();
 		this.pRealLiteral = new RealLiteralElements();
 		this.pStringLiteral = new StringLiteralElements();
-		this.tREAL = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "REAL");
+		this.tREAL = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.expression.Expression.REAL");
 		this.pParanthesizedExpression = new ParanthesizedExpressionElements();
 		this.pGlobalVarExpression = new GlobalVarExpressionElements();
 		this.pFeatureCall = new FeatureCallElements();
@@ -1882,7 +1879,7 @@ public ParserRule getSyntaxElementRule() {
 	////   {$e=factory.createLetExpression(v,varExpr,target);}
 	// //|  x=castedExpression {$e=x;};
 	// LetExpression:
-	//	"let" identifier=Identifier "=" varExpr=Expression ":" target=Expression;
+	//	'let' identifier=Identifier '=' varExpr=Expression ':' target=Expression;
 	public LetExpressionElements getLetExpressionAccess() {
 		return pLetExpression;
 	}
@@ -1898,7 +1895,7 @@ public ParserRule getLetExpressionRule() {
 	// //	| x=chainExpression {$e=x;};
 	//
 	//CastedExpression:
-	//	"(" type=Type ")" target=Expression;
+	//	'(' type=Type ')' target=Expression;
 	public CastedExpressionElements getCastedExpressionAccess() {
 		return pCastedExpression;
 	}
@@ -1911,8 +1908,8 @@ public ParserRule getCastedExpressionRule() {
 	//
 	////	x=ifExpression {$e=x;} ( '->' right=ifExpression {$e=factory.createChainExpression($e,right);})*;
 	// ChainExpression
-	//returns Expression:
-	//	ChainedExpression ({ChainExpression.first=current} "->" next=ChainedExpression)*;
+	//Expression:
+	//	ChainedExpression ({ChainExpression.first=current} '->' next=ChainedExpression)*;
 	public ChainExpressionElements getChainExpressionAccess() {
 		return pChainExpression;
 	}
@@ -1921,7 +1918,7 @@ public ParserRule getChainExpressionRule() {
 		return getChainExpressionAccess().getRule();
 	}
 
-	//ChainedExpression returns Expression:
+	//ChainedExpression Expression:
 	//	IfExpressionKw | IfExpressionTri | SwitchExpression;
 	public ChainedExpressionElements getChainedExpressionAccess() {
 		return pChainedExpression;
@@ -1937,8 +1934,8 @@ public ParserRule getChainedExpressionRule() {
 	//
 	////|	'if' condition=switchExpression 'then' thenPart=switchExpression ('else' elsePart=expression)? {$e=factory.createIf(condition,thenPart,elsePart);};
 	//
-	//IfExpressionTri returns Expression:
-	//	OrExpression ({IfExpression.condition=current} "?" thenPart=ChainedExpression ":" elsePart=ChainedExpression)?;
+	//IfExpressionTri Expression:
+	//	OrExpression ({IfExpression.condition=current} '?' thenPart=ChainedExpression ':' elsePart=ChainedExpression)?;
 	public IfExpressionTriElements getIfExpressionTriAccess() {
 		return pIfExpressionTri;
 	}
@@ -1947,8 +1944,8 @@ public ParserRule getIfExpressionTriRule() {
 		return getIfExpressionTriAccess().getRule();
 	}
 
-	//IfExpressionKw returns IfExpression:
-	//	"if" condition=ChainedExpression "then" thenPart=ChainedExpression -> ("else" elsePart=ChainedExpression)?;
+	//IfExpressionKw IfExpression:
+	//	'if' condition=ChainedExpression 'then' thenPart=ChainedExpression -> ('else' elsePart=ChainedExpression)?;
 	public IfExpressionKwElements getIfExpressionKwAccess() {
 		return pIfExpressionKw;
 	}
@@ -1972,7 +1969,7 @@ public ParserRule getIfExpressionKwRule() {
 	////   {$e = factory.createSwitchExpression(pred,cases,def);}
 	// //|  x=orExpression {$e=x;};
 	// SwitchExpression:
-	//	"switch" ("(" switchExpr=OrExpression ")")? "{" case+=Case* "default" ":" defaultExpr=OrExpression "}";
+	//	'switch' ('(' switchExpr=OrExpression ')')? '{' case+=Case* 'default' ':' defaultExpr=OrExpression '}';
 	public SwitchExpressionElements getSwitchExpressionAccess() {
 		return pSwitchExpression;
 	}
@@ -1982,7 +1979,7 @@ public ParserRule getSwitchExpressionRule() {
 	}
 
 	//Case:
-	//	"case" condition=OrExpression ":" thenPar=OrExpression;
+	//	'case' condition=OrExpression ':' thenPar=OrExpression;
 	public CaseElements getCaseAccess() {
 		return pCase;
 	}
@@ -1995,8 +1992,8 @@ public ParserRule getCaseRule() {
 	//
 	////  	x=andExpression {$e=x;} (name='||' r=andExpression 	{$e = factory.createBooleanOperation(id(name),$e,r);})*;
 	//
-	//OrExpression returns Expression:
-	//	AndExpression ({BooleanOperation.left=current} operator="||" right=AndExpression)*;
+	//OrExpression Expression:
+	//	AndExpression ({BooleanOperation.left=current} operator='||' right=AndExpression)*;
 	public OrExpressionElements getOrExpressionAccess() {
 		return pOrExpression;
 	}
@@ -2009,8 +2006,8 @@ public ParserRule getOrExpressionRule() {
 	//
 	////	x=impliesExpression {$e=x;} (name='&&' r=impliesExpression 	{$e = factory.createBooleanOperation(id(name),$e,r);})*;
 	//
-	//AndExpression returns Expression:
-	//	ImpliesExpression ({BooleanOperation.left=current} operator="&&" right=ImpliesExpression)*;
+	//AndExpression Expression:
+	//	ImpliesExpression ({BooleanOperation.left=current} operator='&&' right=ImpliesExpression)*;
 	public AndExpressionElements getAndExpressionAccess() {
 		return pAndExpression;
 	}
@@ -2023,8 +2020,8 @@ public ParserRule getAndExpressionRule() {
 	//
 	////	x=relationalExpression {$e=x;} (name='implies' r=relationalExpression 	{$e = factory.createBooleanOperation(id(name),$e,r);})*;
 	//
-	//ImpliesExpression returns Expression:
-	//	RelationalExpression ({BooleanOperation.left=current} operator="implies" right=RelationalExpression)*;
+	//ImpliesExpression Expression:
+	//	RelationalExpression ({BooleanOperation.left=current} operator='implies' right=RelationalExpression)*;
 	public ImpliesExpressionElements getImpliesExpressionAccess() {
 		return pImpliesExpression;
 	}
@@ -2038,8 +2035,8 @@ public ParserRule getImpliesExpressionRule() {
 	//
 	////	(name=('==' | '!=' | '>=' | '<=' | '>' | '<') r=additiveExpression {$e = factory.createBinaryOperation(id(name),$e,r);})*;
 	//
-	//RelationalExpression returns Expression:
-	//	AdditiveExpression ({BooleanOperation.left=current} operator=("==" | "!=" | ">=" | "<=" | ">" | "<")
+	//RelationalExpression Expression:
+	//	AdditiveExpression ({BooleanOperation.left=current} operator=('==' | '!=' | '>=' | '<=' | '>' | '<')
 	//	right=AdditiveExpression)*;
 	public RelationalExpressionElements getRelationalExpressionAccess() {
 		return pRelationalExpression;
@@ -2054,8 +2051,8 @@ public ParserRule getRelationalExpressionRule() {
 	//
 	////   (name=('+'| '-') r=multiplicativeExpression {$e = factory.createBinaryOperation(id(name),$e,r);})*;
 	//
-	//AdditiveExpression returns Expression:
-	//	MultiplicativeExpression ({OperationCall.params+=current} name=("+" | "-") params+=MultiplicativeExpression)*;
+	//AdditiveExpression Expression:
+	//	MultiplicativeExpression ({OperationCall.params+=current} name=('+' | '-') params+=MultiplicativeExpression)*;
 	public AdditiveExpressionElements getAdditiveExpressionAccess() {
 		return pAdditiveExpression;
 	}
@@ -2069,8 +2066,8 @@ public ParserRule getAdditiveExpressionRule() {
 	//
 	////	(name=('*' | '/') r=unaryExpression {$e = factory.createBinaryOperation(id(name),$e,r);})*;
 	//
-	//MultiplicativeExpression returns Expression:
-	//	UnaryOrInfixExpression ({OperationCall.params+=current} name=("*" | "/") params+=UnaryOrInfixExpression)*;
+	//MultiplicativeExpression Expression:
+	//	UnaryOrInfixExpression ({OperationCall.params+=current} name=('*' | '/') params+=UnaryOrInfixExpression)*;
 	public MultiplicativeExpressionElements getMultiplicativeExpressionAccess() {
 		return pMultiplicativeExpression;
 	}
@@ -2085,8 +2082,7 @@ public ParserRule getMultiplicativeExpressionRule() {
 	////|	name='!' x=infixExpression	{$e = factory.createOperationCall(id(name),x);}
 	//
 	////|	name='-' x=infixExpression	{$e = factory.createOperationCall(id(name),x);};
-	// UnaryOrInfixExpression returns
-	//Expression:
+	// UnaryOrInfixExpression Expression:
 	//	UnaryExpression | InfixExpression;
 	public UnaryOrInfixExpressionElements getUnaryOrInfixExpressionAccess() {
 		return pUnaryOrInfixExpression;
@@ -2096,8 +2092,8 @@ public ParserRule getUnaryOrInfixExpressionRule() {
 		return getUnaryOrInfixExpressionAccess().getRule();
 	}
 
-	//UnaryExpression returns OperationCall:
-	//	name=("!" | "-") params+=InfixExpression;
+	//UnaryExpression OperationCall:
+	//	name=('!' | '-') params+=InfixExpression;
 	public UnaryExpressionElements getUnaryExpressionAccess() {
 		return pUnaryExpression;
 	}
@@ -2111,12 +2107,12 @@ public ParserRule getUnaryExpressionRule() {
 	////	x=primaryExpression {$e=x;} ( '.' op=featureCall { if (op!=null) { op.setTarget($e);$e=op;}} )*;
 	//
 	//// having support for fragments could avoid the redundancy at this point
-	// InfixExpression returns Expression:
-	//	PrimaryExpression ({OperationCall.target=current} "." name=Identifier "(" (params+=Expression (","
-	//	params+=Expression)*)? ")" | {FeatureCall.target=current} "." type=Type | {TypeSelectExpression.target=current} "."
-	//	name="typeSelect" "(" type=Type ")" | {CollectionExpression.target=current} "." name=("collect" | "select" |
-	//	"selectFirst" | "reject" | "exists" | "notExists" | "sortBy" | "forAll") "(" (var=Identifier "|")? exp=Expression
-	//	")")*;
+	// InfixExpression Expression:
+	//	PrimaryExpression ({OperationCall.target=current} '.' name=Identifier '(' (params+=Expression (','
+	//	params+=Expression)*)? ')' | {FeatureCall.target=current} '.' type=Type | {TypeSelectExpression.target=current} '.'
+	//	name='typeSelect' '(' type=Type ')' | {CollectionExpression.target=current} '.' name=('collect' | 'select' |
+	//	'selectFirst' | 'reject' | 'exists' | 'notExists' | 'sortBy' | 'forAll') '(' (var=Identifier '|')? exp=Expression
+	//	')')*;
 	public InfixExpressionElements getInfixExpressionAccess() {
 		return pInfixExpression;
 	}
@@ -2138,7 +2134,7 @@ public ParserRule getInfixExpressionRule() {
 	//
 	////|   x=globalVarExpression {$e=x;}
 	// //|   x=paranthesizedExpression {$e=x;};
-	// PrimaryExpression returns Expression:
+	// PrimaryExpression Expression:
 	//	Literal | FeatureCall | ListLiteral | ConstructorCallExpression | GlobalVarExpression | ParanthesizedExpression;
 	public PrimaryExpressionElements getPrimaryExpressionAccess() {
 		return pPrimaryExpression;
@@ -2159,7 +2155,7 @@ public ParserRule getLiteralRule() {
 	}
 
 	//BooleanLiteral:
-	//	val=("true" | "false");
+	//	val=('true' | 'false');
 	public BooleanLiteralElements getBooleanLiteralAccess() {
 		return pBooleanLiteral;
 	}
@@ -2179,7 +2175,7 @@ public ParserRule getIntegerLiteralRule() {
 	}
 
 	//NullLiteral:
-	//	val="null";
+	//	val='null';
 	public NullLiteralElements getNullLiteralAccess() {
 		return pNullLiteral;
 	}
@@ -2209,7 +2205,7 @@ public ParserRule getStringLiteralRule() {
 	}
 
 	//terminal REAL:
-	//	"0".."9"* "." "0".."9"*;
+	//	'0'..'9'* '.' '0'..'9'*;
 	public TerminalRule getREALRule() {
 		return tREAL;
 	} 
@@ -2217,9 +2213,8 @@ public TerminalRule getREALRule() {
 	////paranthesizedExpression returns [Expression e] :
 	//
 	////    '(' x=expression ')' {$e=factory.createParanthesizedExpression(x);};
-	// ParanthesizedExpression returns
-	//Expression:
-	//	"(" Expression ")";
+	// ParanthesizedExpression Expression:
+	//	'(' Expression ')';
 	public ParanthesizedExpressionElements getParanthesizedExpressionAccess() {
 		return pParanthesizedExpression;
 	}
@@ -2232,7 +2227,7 @@ public ParserRule getParanthesizedExpressionRule() {
 	//
 	////    '(' x=expression ')' {$e=factory.createParanthesizedExpression(x);};
 	// GlobalVarExpression:
-	//	"GLOBALVAR" name=Identifier;
+	//	'GLOBALVAR' name=Identifier;
 	public GlobalVarExpressionElements getGlobalVarExpressionAccess() {
 		return pGlobalVarExpression;
 	}
@@ -2258,7 +2253,7 @@ public ParserRule getFeatureCallRule() {
 	}
 
 	//OperationCall:
-	//	name=Identifier "(" (params+=Expression ("," params+=Expression)*)? ")";
+	//	name=Identifier '(' (params+=Expression (',' params+=Expression)*)? ')';
 	public OperationCallElements getOperationCallAccess() {
 		return pOperationCall;
 	}
@@ -2270,7 +2265,7 @@ public ParserRule getOperationCallRule() {
 	////listLiteral  returns [Expression e] :
 	// //	'{' (l=parameterList)? '}' {$e=factory.createListLiteral(l);};
 	// ListLiteral:
-	//	{ListLiteral} "{" (elements+=Expression ("," elements+=Expression)*)? "}";
+	//	{ListLiteral} '{' (elements+=Expression (',' elements+=Expression)*)? '}';
 	public ListLiteralElements getListLiteralAccess() {
 		return pListLiteral;
 	}
@@ -2284,7 +2279,7 @@ public ParserRule getListLiteralRule() {
 	//
 	////	{$e= factory.createConstructorCallExpression(t);};
 	// ConstructorCallExpression:
-	//	"new" type=SimpleType;
+	//	'new' type=SimpleType;
 	public ConstructorCallExpressionElements getConstructorCallExpressionAccess() {
 		return pConstructorCallExpression;
 	}
@@ -2310,7 +2305,7 @@ public ParserRule getConstructorCallExpressionRule() {
 	//
 	//// { $e = factory.createCollectionExpression(id(name),var,x);};
 	// TypeSelectExpression:
-	//	name="typeSelect" "(" type=Type ")";
+	//	name='typeSelect' '(' type=Type ')';
 	public TypeSelectExpressionElements getTypeSelectExpressionAccess() {
 		return pTypeSelectExpression;
 	}
@@ -2320,8 +2315,8 @@ public ParserRule getTypeSelectExpressionRule() {
 	}
 
 	//CollectionExpression:
-	//	name=("collect" | "select" | "selectFirst" | "reject" | "exists" | "notExists" | "sortBy" | "forAll") "("
-	//	(var=Identifier "|")? exp=Expression ")";
+	//	name=('collect' | 'select' | 'selectFirst' | 'reject' | 'exists' | 'notExists' | 'sortBy' | 'forAll') '('
+	//	(var=Identifier '|')? exp=Expression ')';
 	public CollectionExpressionElements getCollectionExpressionAccess() {
 		return pCollectionExpression;
 	}
@@ -2333,7 +2328,7 @@ public ParserRule getCollectionExpressionRule() {
 	////type returns [Identifier id] :
 	// //	a = collectionType {$id=a;}|
 	// //	b = simpleType {$id=b;};
-	// Type returns Identifier:
+	// Type Identifier:
 	//	CollectionType | SimpleType;
 	public TypeElements getTypeAccess() {
 		return pType;
@@ -2347,9 +2342,8 @@ public ParserRule getTypeRule() {
 	// //  cl=( 'Collection' | 'List' | 'Set' ) {$id = id(cl);}
 	//
 	////  (b='[' id1=simpleType c=']' { $id.append(id(b));$id.append(id1);$id.append(id(c));})?;
-	// CollectionType returns
-	//Identifier:
-	//	cl=("Collection" | "List" | "Set") "[" id1=SimpleType "]";
+	// CollectionType Identifier:
+	//	cl=('Collection' | 'List' | 'Set') '[' id1=SimpleType ']';
 	public CollectionTypeElements getCollectionTypeAccess() {
 		return pCollectionType;
 	}
@@ -2362,8 +2356,8 @@ public ParserRule getCollectionTypeRule() {
 	// //	x=identifier {$id=x;}
 	//
 	////	(d='::' end=identifier  {$id.append(id(d)); $id.append(end);})*;
-	// SimpleType returns Identifier:
-	//	id+=Identifier ("::" id+=Identifier)*;
+	// SimpleType Identifier:
+	//	id+=Identifier ('::' id+=Identifier)*;
 	public SimpleTypeElements getSimpleTypeAccess() {
 		return pSimpleType;
 	}
@@ -2372,7 +2366,7 @@ public ParserRule getSimpleTypeRule() {
 		return getSimpleTypeAccess().getRule();
 	}
 
-	//Identifier returns ecore::EString:
+	//Identifier:
 	//	ID;
 	public IdentifierElements getIdentifierAccess() {
 		return pIdentifier;
@@ -2383,38 +2377,37 @@ public ParserRule getIdentifierRule() {
 	}
 
 	//terminal ID:
-	//	"^"? ("a".."z" | "A".."Z" | "_") ("a".."z" | "A".."Z" | "_" | "0".."9")*;
+	//	'^'? ('a'..'z' | 'A'..'Z' | '_') ('a'..'z' | 'A'..'Z' | '_' | '0'..'9')*;
 	public TerminalRule getIDRule() {
 		return gaTerminals.getIDRule();
 	} 
 
 	//terminal INT returns ecore::EInt:
-	//	"0".."9"+;
+	//	'0'..'9'+;
 	public TerminalRule getINTRule() {
 		return gaTerminals.getINTRule();
 	} 
 
 	//terminal STRING:
-	//	"\"" ("\\" . / * 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' * / | !("\\" | "\""))* "\"" | "\'" ("\\" .
-	//	/ * 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' * / | !("\\" | "\'"))* "\'";
+	//	'"' ('\\' . | !('\\' | '"'))* '"' | "'" ('\\' . | !('\\' | "'"))* "'";
 	public TerminalRule getSTRINGRule() {
 		return gaTerminals.getSTRINGRule();
 	} 
 
 	//terminal ML_COMMENT:
-	//	"/ *"->"* /";
+	//	'/*'->'*/';
 	public TerminalRule getML_COMMENTRule() {
 		return gaTerminals.getML_COMMENTRule();
 	} 
 
 	//terminal SL_COMMENT:
-	//	"//" !("\n" | "\r")* ("\r"? "\n")?;
+	//	'//' !('\n' | '\r')* ('\r'? '\n')?;
 	public TerminalRule getSL_COMMENTRule() {
 		return gaTerminals.getSL_COMMENTRule();
 	} 
 
 	//terminal WS:
-	//	(" " | "\t" | "\r" | "\n")+;
+	//	' ' | '\t' | '\r' | '\n'+;
 	public TerminalRule getWSRule() {
 		return gaTerminals.getWSRule();
 	} 
diff --git a/com.avaloq.tools.ddk.xtext.format.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.format.ui/META-INF/MANIFEST.MF
index d541d2f7e..cfd8f7426 100644
--- a/com.avaloq.tools.ddk.xtext.format.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.format.ui/META-INF/MANIFEST.MF
@@ -28,8 +28,6 @@ Export-Package: com.avaloq.tools.ddk.xtext.format.ui.contentassist.antlr,
  com.avaloq.tools.ddk.xtext.format.ui.builder,
  com.avaloq.tools.ddk.xtext.format.ui.contentassist,
  com.avaloq.tools.ddk.xtext.format.ui.quickfix,
- com.avaloq.tools.ddk.xtext.format.ui.quickfix,
- com.avaloq.tools.ddk.xtext.format.ui.contentassist,
- com.avaloq.tools.ddk.xtext.format.ui.contentassist.antlr
+ com.avaloq.tools.ddk.xtext.format.ui.contentassist.antlr.internal
 Bundle-Activator: com.avaloq.tools.ddk.xtext.format.ui.internal.FormatActivator
 Eclipse-ExtensibleAPI: true
diff --git a/com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/AbstractFormatUiModule.java b/com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/AbstractFormatUiModule.java
index df8503180..83e6a0d04 100644
--- a/com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/AbstractFormatUiModule.java
+++ b/com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/AbstractFormatUiModule.java
@@ -225,5 +225,10 @@ public Class<? extends org.eclipse.compare.IViewerCreator> bindIViewerCreator()
 		return org.eclipse.xtext.ui.compare.DefaultViewerCreator.class;
 	}
 
+	// contributed by org.eclipse.xtext.ui.generator.compare.CompareFragment
+	public void configureCompareViewerTitle(com.google.inject.Binder binder) {
+		binder.bind(String.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.UIBindings.COMPARE_VIEWER_TITLE)).toInstance("Format Compare");
+	}
+
 
 }
diff --git a/com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/AbstractFormatProposalProvider.java b/com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/AbstractFormatProposalProvider.java
index 0c4c687c0..bcde02811 100644
--- a/com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/AbstractFormatProposalProvider.java
+++ b/com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/AbstractFormatProposalProvider.java
@@ -299,7 +299,4 @@ public void complete_IntObject(EObject model, RuleCall ruleCall, ContentAssistCo
 	public void complete_RuleSelfIdentifier(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
-	public void complete_ValidID(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
 }
diff --git a/com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g b/com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g
index 1369357a4..8e1719314 100644
--- a/com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g
+++ b/com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g
@@ -27692,10 +27692,10 @@ finally {
 }
 
 
-RULE_HEX : ('0x'|'0X') ('0'..'9'|'a'..'f'|'A'..'F'|'_')+ ('#' (('b'|'B') ('i'|'I')|('l'|'L')))?;
-
 RULE_INT : '0'..'9' ('0'..'9'|'_')*;
 
+RULE_HEX : ('0x'|'0X') ('0'..'9'|'a'..'f'|'A'..'F'|'_')+ ('#' (('b'|'B') ('i'|'I')|('l'|'L')))?;
+
 RULE_DECIMAL : RULE_INT (('e'|'E') ('+'|'-')? RULE_INT)? (('b'|'B') ('i'|'I'|'d'|'D')|('l'|'L'|'d'|'D'|'f'|'F'))?;
 
 RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'$'|'_') ('a'..'z'|'A'..'Z'|'$'|'_'|'0'..'9')*;
diff --git a/com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormatLexer.java b/com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormatLexer.java
index 05755a0c0..3d39d6eef 100644
--- a/com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormatLexer.java
+++ b/com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormatLexer.java
@@ -139,15 +139,15 @@ public InternalFormatLexer(CharStream input, RecognizerSharedState state) {
         super(input,state);
 
     }
-    public String getGrammarFileName() { return "../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g"; }
+    public String getGrammarFileName() { return "InternalFormat.g"; }
 
     // $ANTLR start "T__13"
     public final void mT__13() throws RecognitionException {
         try {
             int _type = T__13;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11:7: ( 'rule' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11:9: 'rule'
+            // InternalFormat.g:11:7: ( 'rule' )
+            // InternalFormat.g:11:9: 'rule'
             {
             match("rule"); 
 
@@ -167,8 +167,8 @@ public final void mT__14() throws RecognitionException {
         try {
             int _type = T__14;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12:7: ( '=' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12:9: '='
+            // InternalFormat.g:12:7: ( '=' )
+            // InternalFormat.g:12:9: '='
             {
             match('='); 
 
@@ -187,8 +187,8 @@ public final void mT__15() throws RecognitionException {
         try {
             int _type = T__15;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13:7: ( '||' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13:9: '||'
+            // InternalFormat.g:13:7: ( '||' )
+            // InternalFormat.g:13:9: '||'
             {
             match("||"); 
 
@@ -208,8 +208,8 @@ public final void mT__16() throws RecognitionException {
         try {
             int _type = T__16;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14:7: ( '&&' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14:9: '&&'
+            // InternalFormat.g:14:7: ( '&&' )
+            // InternalFormat.g:14:9: '&&'
             {
             match("&&"); 
 
@@ -229,8 +229,8 @@ public final void mT__17() throws RecognitionException {
         try {
             int _type = T__17;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15:7: ( 'decrement' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15:9: 'decrement'
+            // InternalFormat.g:15:7: ( 'decrement' )
+            // InternalFormat.g:15:9: 'decrement'
             {
             match("decrement"); 
 
@@ -250,8 +250,8 @@ public final void mT__18() throws RecognitionException {
         try {
             int _type = T__18;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16:7: ( 'default' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16:9: 'default'
+            // InternalFormat.g:16:7: ( 'default' )
+            // InternalFormat.g:16:9: 'default'
             {
             match("default"); 
 
@@ -271,8 +271,8 @@ public final void mT__19() throws RecognitionException {
         try {
             int _type = T__19;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17:7: ( 'val' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17:9: 'val'
+            // InternalFormat.g:17:7: ( 'val' )
+            // InternalFormat.g:17:9: 'val'
             {
             match("val"); 
 
@@ -292,8 +292,8 @@ public final void mT__20() throws RecognitionException {
         try {
             int _type = T__20;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18:7: ( 'context' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18:9: 'context'
+            // InternalFormat.g:18:7: ( 'context' )
+            // InternalFormat.g:18:9: 'context'
             {
             match("context"); 
 
@@ -313,8 +313,8 @@ public final void mT__21() throws RecognitionException {
         try {
             int _type = T__21;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19:7: ( 'currentColumn' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19:9: 'currentColumn'
+            // InternalFormat.g:19:7: ( 'currentColumn' )
+            // InternalFormat.g:19:9: 'currentColumn'
             {
             match("currentColumn"); 
 
@@ -334,8 +334,8 @@ public final void mT__22() throws RecognitionException {
         try {
             int _type = T__22;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20:7: ( '+=' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20:9: '+='
+            // InternalFormat.g:20:7: ( '+=' )
+            // InternalFormat.g:20:9: '+='
             {
             match("+="); 
 
@@ -355,8 +355,8 @@ public final void mT__23() throws RecognitionException {
         try {
             int _type = T__23;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21:7: ( '-=' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21:9: '-='
+            // InternalFormat.g:21:7: ( '-=' )
+            // InternalFormat.g:21:9: '-='
             {
             match("-="); 
 
@@ -376,8 +376,8 @@ public final void mT__24() throws RecognitionException {
         try {
             int _type = T__24;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22:7: ( '*=' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22:9: '*='
+            // InternalFormat.g:22:7: ( '*=' )
+            // InternalFormat.g:22:9: '*='
             {
             match("*="); 
 
@@ -397,8 +397,8 @@ public final void mT__25() throws RecognitionException {
         try {
             int _type = T__25;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23:7: ( '/=' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23:9: '/='
+            // InternalFormat.g:23:7: ( '/=' )
+            // InternalFormat.g:23:9: '/='
             {
             match("/="); 
 
@@ -418,8 +418,8 @@ public final void mT__26() throws RecognitionException {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24:7: ( '%=' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24:9: '%='
+            // InternalFormat.g:24:7: ( '%=' )
+            // InternalFormat.g:24:9: '%='
             {
             match("%="); 
 
@@ -439,8 +439,8 @@ public final void mT__27() throws RecognitionException {
         try {
             int _type = T__27;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25:7: ( '==' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25:9: '=='
+            // InternalFormat.g:25:7: ( '==' )
+            // InternalFormat.g:25:9: '=='
             {
             match("=="); 
 
@@ -460,8 +460,8 @@ public final void mT__28() throws RecognitionException {
         try {
             int _type = T__28;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26:7: ( '!=' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26:9: '!='
+            // InternalFormat.g:26:7: ( '!=' )
+            // InternalFormat.g:26:9: '!='
             {
             match("!="); 
 
@@ -481,8 +481,8 @@ public final void mT__29() throws RecognitionException {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27:7: ( '===' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27:9: '==='
+            // InternalFormat.g:27:7: ( '===' )
+            // InternalFormat.g:27:9: '==='
             {
             match("==="); 
 
@@ -502,8 +502,8 @@ public final void mT__30() throws RecognitionException {
         try {
             int _type = T__30;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:28:7: ( '!==' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:28:9: '!=='
+            // InternalFormat.g:28:7: ( '!==' )
+            // InternalFormat.g:28:9: '!=='
             {
             match("!=="); 
 
@@ -523,8 +523,8 @@ public final void mT__31() throws RecognitionException {
         try {
             int _type = T__31;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:29:7: ( '>=' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:29:9: '>='
+            // InternalFormat.g:29:7: ( '>=' )
+            // InternalFormat.g:29:9: '>='
             {
             match(">="); 
 
@@ -544,8 +544,8 @@ public final void mT__32() throws RecognitionException {
         try {
             int _type = T__32;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:30:7: ( '>' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:30:9: '>'
+            // InternalFormat.g:30:7: ( '>' )
+            // InternalFormat.g:30:9: '>'
             {
             match('>'); 
 
@@ -564,8 +564,8 @@ public final void mT__33() throws RecognitionException {
         try {
             int _type = T__33;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:31:7: ( '<' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:31:9: '<'
+            // InternalFormat.g:31:7: ( '<' )
+            // InternalFormat.g:31:9: '<'
             {
             match('<'); 
 
@@ -584,8 +584,8 @@ public final void mT__34() throws RecognitionException {
         try {
             int _type = T__34;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:32:7: ( '->' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:32:9: '->'
+            // InternalFormat.g:32:7: ( '->' )
+            // InternalFormat.g:32:9: '->'
             {
             match("->"); 
 
@@ -605,8 +605,8 @@ public final void mT__35() throws RecognitionException {
         try {
             int _type = T__35;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:33:7: ( '..<' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:33:9: '..<'
+            // InternalFormat.g:33:7: ( '..<' )
+            // InternalFormat.g:33:9: '..<'
             {
             match("..<"); 
 
@@ -626,8 +626,8 @@ public final void mT__36() throws RecognitionException {
         try {
             int _type = T__36;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:34:7: ( '..' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:34:9: '..'
+            // InternalFormat.g:34:7: ( '..' )
+            // InternalFormat.g:34:9: '..'
             {
             match(".."); 
 
@@ -647,8 +647,8 @@ public final void mT__37() throws RecognitionException {
         try {
             int _type = T__37;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:35:7: ( '=>' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:35:9: '=>'
+            // InternalFormat.g:35:7: ( '=>' )
+            // InternalFormat.g:35:9: '=>'
             {
             match("=>"); 
 
@@ -668,8 +668,8 @@ public final void mT__38() throws RecognitionException {
         try {
             int _type = T__38;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:36:7: ( '<>' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:36:9: '<>'
+            // InternalFormat.g:36:7: ( '<>' )
+            // InternalFormat.g:36:9: '<>'
             {
             match("<>"); 
 
@@ -689,8 +689,8 @@ public final void mT__39() throws RecognitionException {
         try {
             int _type = T__39;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:37:7: ( '?:' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:37:9: '?:'
+            // InternalFormat.g:37:7: ( '?:' )
+            // InternalFormat.g:37:9: '?:'
             {
             match("?:"); 
 
@@ -710,8 +710,8 @@ public final void mT__40() throws RecognitionException {
         try {
             int _type = T__40;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:38:7: ( '+' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:38:9: '+'
+            // InternalFormat.g:38:7: ( '+' )
+            // InternalFormat.g:38:9: '+'
             {
             match('+'); 
 
@@ -730,8 +730,8 @@ public final void mT__41() throws RecognitionException {
         try {
             int _type = T__41;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:39:7: ( '-' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:39:9: '-'
+            // InternalFormat.g:39:7: ( '-' )
+            // InternalFormat.g:39:9: '-'
             {
             match('-'); 
 
@@ -750,8 +750,8 @@ public final void mT__42() throws RecognitionException {
         try {
             int _type = T__42;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:40:7: ( '*' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:40:9: '*'
+            // InternalFormat.g:40:7: ( '*' )
+            // InternalFormat.g:40:9: '*'
             {
             match('*'); 
 
@@ -770,8 +770,8 @@ public final void mT__43() throws RecognitionException {
         try {
             int _type = T__43;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:41:7: ( '**' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:41:9: '**'
+            // InternalFormat.g:41:7: ( '**' )
+            // InternalFormat.g:41:9: '**'
             {
             match("**"); 
 
@@ -791,8 +791,8 @@ public final void mT__44() throws RecognitionException {
         try {
             int _type = T__44;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:42:7: ( '/' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:42:9: '/'
+            // InternalFormat.g:42:7: ( '/' )
+            // InternalFormat.g:42:9: '/'
             {
             match('/'); 
 
@@ -811,8 +811,8 @@ public final void mT__45() throws RecognitionException {
         try {
             int _type = T__45;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:43:7: ( '%' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:43:9: '%'
+            // InternalFormat.g:43:7: ( '%' )
+            // InternalFormat.g:43:9: '%'
             {
             match('%'); 
 
@@ -831,8 +831,8 @@ public final void mT__46() throws RecognitionException {
         try {
             int _type = T__46;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:44:7: ( '!' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:44:9: '!'
+            // InternalFormat.g:44:7: ( '!' )
+            // InternalFormat.g:44:9: '!'
             {
             match('!'); 
 
@@ -851,8 +851,8 @@ public final void mT__47() throws RecognitionException {
         try {
             int _type = T__47;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:45:7: ( '++' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:45:9: '++'
+            // InternalFormat.g:45:7: ( '++' )
+            // InternalFormat.g:45:9: '++'
             {
             match("++"); 
 
@@ -872,8 +872,8 @@ public final void mT__48() throws RecognitionException {
         try {
             int _type = T__48;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:46:7: ( '--' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:46:9: '--'
+            // InternalFormat.g:46:7: ( '--' )
+            // InternalFormat.g:46:9: '--'
             {
             match("--"); 
 
@@ -893,8 +893,8 @@ public final void mT__49() throws RecognitionException {
         try {
             int _type = T__49;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:47:7: ( '.' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:47:9: '.'
+            // InternalFormat.g:47:7: ( '.' )
+            // InternalFormat.g:47:9: '.'
             {
             match('.'); 
 
@@ -913,8 +913,8 @@ public final void mT__50() throws RecognitionException {
         try {
             int _type = T__50;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:48:7: ( 'extends' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:48:9: 'extends'
+            // InternalFormat.g:48:7: ( 'extends' )
+            // InternalFormat.g:48:9: 'extends'
             {
             match("extends"); 
 
@@ -934,8 +934,8 @@ public final void mT__51() throws RecognitionException {
         try {
             int _type = T__51;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:49:7: ( 'static' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:49:9: 'static'
+            // InternalFormat.g:49:7: ( 'static' )
+            // InternalFormat.g:49:9: 'static'
             {
             match("static"); 
 
@@ -955,8 +955,8 @@ public final void mT__52() throws RecognitionException {
         try {
             int _type = T__52;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:50:7: ( 'import' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:50:9: 'import'
+            // InternalFormat.g:50:7: ( 'import' )
+            // InternalFormat.g:50:9: 'import'
             {
             match("import"); 
 
@@ -976,8 +976,8 @@ public final void mT__53() throws RecognitionException {
         try {
             int _type = T__53;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:51:7: ( 'extension' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:51:9: 'extension'
+            // InternalFormat.g:51:7: ( 'extension' )
+            // InternalFormat.g:51:9: 'extension'
             {
             match("extension"); 
 
@@ -997,8 +997,8 @@ public final void mT__54() throws RecognitionException {
         try {
             int _type = T__54;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:52:7: ( 'super' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:52:9: 'super'
+            // InternalFormat.g:52:7: ( 'super' )
+            // InternalFormat.g:52:9: 'super'
             {
             match("super"); 
 
@@ -1018,8 +1018,8 @@ public final void mT__55() throws RecognitionException {
         try {
             int _type = T__55;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:53:7: ( 'false' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:53:9: 'false'
+            // InternalFormat.g:53:7: ( 'false' )
+            // InternalFormat.g:53:9: 'false'
             {
             match("false"); 
 
@@ -1039,8 +1039,8 @@ public final void mT__56() throws RecognitionException {
         try {
             int _type = T__56;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:54:7: ( 'before' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:54:9: 'before'
+            // InternalFormat.g:54:7: ( 'before' )
+            // InternalFormat.g:54:9: 'before'
             {
             match("before"); 
 
@@ -1060,8 +1060,8 @@ public final void mT__57() throws RecognitionException {
         try {
             int _type = T__57;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:55:7: ( 'after' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:55:9: 'after'
+            // InternalFormat.g:55:7: ( 'after' )
+            // InternalFormat.g:55:9: 'after'
             {
             match("after"); 
 
@@ -1081,8 +1081,8 @@ public final void mT__58() throws RecognitionException {
         try {
             int _type = T__58;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:56:7: ( 'around' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:56:9: 'around'
+            // InternalFormat.g:56:7: ( 'around' )
+            // InternalFormat.g:56:9: 'around'
             {
             match("around"); 
 
@@ -1102,8 +1102,8 @@ public final void mT__59() throws RecognitionException {
         try {
             int _type = T__59;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:57:7: ( 'between' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:57:9: 'between'
+            // InternalFormat.g:57:7: ( 'between' )
+            // InternalFormat.g:57:9: 'between'
             {
             match("between"); 
 
@@ -1123,8 +1123,8 @@ public final void mT__60() throws RecognitionException {
         try {
             int _type = T__60;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:58:7: ( 'range' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:58:9: 'range'
+            // InternalFormat.g:58:7: ( 'range' )
+            // InternalFormat.g:58:9: 'range'
             {
             match("range"); 
 
@@ -1144,8 +1144,8 @@ public final void mT__61() throws RecognitionException {
         try {
             int _type = T__61;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:59:7: ( 'formatter' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:59:9: 'formatter'
+            // InternalFormat.g:59:7: ( 'formatter' )
+            // InternalFormat.g:59:9: 'formatter'
             {
             match("formatter"); 
 
@@ -1165,8 +1165,8 @@ public final void mT__62() throws RecognitionException {
         try {
             int _type = T__62;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:60:7: ( 'for' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:60:9: 'for'
+            // InternalFormat.g:60:7: ( 'for' )
+            // InternalFormat.g:60:9: 'for'
             {
             match("for"); 
 
@@ -1186,8 +1186,8 @@ public final void mT__63() throws RecognitionException {
         try {
             int _type = T__63;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:61:7: ( 'with' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:61:9: 'with'
+            // InternalFormat.g:61:7: ( 'with' )
+            // InternalFormat.g:61:9: 'with'
             {
             match("with"); 
 
@@ -1207,8 +1207,8 @@ public final void mT__64() throws RecognitionException {
         try {
             int _type = T__64;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:62:7: ( 'const' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:62:9: 'const'
+            // InternalFormat.g:62:7: ( 'const' )
+            // InternalFormat.g:62:9: 'const'
             {
             match("const"); 
 
@@ -1228,8 +1228,8 @@ public final void mT__65() throws RecognitionException {
         try {
             int _type = T__65;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:63:7: ( ';' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:63:9: ';'
+            // InternalFormat.g:63:7: ( ';' )
+            // InternalFormat.g:63:9: ';'
             {
             match(';'); 
 
@@ -1248,8 +1248,8 @@ public final void mT__66() throws RecognitionException {
         try {
             int _type = T__66;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:64:7: ( '{' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:64:9: '{'
+            // InternalFormat.g:64:7: ( '{' )
+            // InternalFormat.g:64:9: '{'
             {
             match('{'); 
 
@@ -1268,8 +1268,8 @@ public final void mT__67() throws RecognitionException {
         try {
             int _type = T__67;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:65:7: ( '}' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:65:9: '}'
+            // InternalFormat.g:65:7: ( '}' )
+            // InternalFormat.g:65:9: '}'
             {
             match('}'); 
 
@@ -1288,8 +1288,8 @@ public final void mT__68() throws RecognitionException {
         try {
             int _type = T__68;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:66:7: ( '@' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:66:9: '@'
+            // InternalFormat.g:66:7: ( '@' )
+            // InternalFormat.g:66:9: '@'
             {
             match('@'); 
 
@@ -1308,8 +1308,8 @@ public final void mT__69() throws RecognitionException {
         try {
             int _type = T__69;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:67:7: ( '[' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:67:9: '['
+            // InternalFormat.g:67:7: ( '[' )
+            // InternalFormat.g:67:9: '['
             {
             match('['); 
 
@@ -1328,8 +1328,8 @@ public final void mT__70() throws RecognitionException {
         try {
             int _type = T__70;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:68:7: ( ']' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:68:9: ']'
+            // InternalFormat.g:68:7: ( ']' )
+            // InternalFormat.g:68:9: ']'
             {
             match(']'); 
 
@@ -1348,8 +1348,8 @@ public final void mT__71() throws RecognitionException {
         try {
             int _type = T__71;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:69:7: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:69:9: ','
+            // InternalFormat.g:69:7: ( ',' )
+            // InternalFormat.g:69:9: ','
             {
             match(','); 
 
@@ -1368,8 +1368,8 @@ public final void mT__72() throws RecognitionException {
         try {
             int _type = T__72;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:70:7: ( ':' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:70:9: ':'
+            // InternalFormat.g:70:7: ( ':' )
+            // InternalFormat.g:70:9: ':'
             {
             match(':'); 
 
@@ -1388,8 +1388,8 @@ public final void mT__73() throws RecognitionException {
         try {
             int _type = T__73;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:71:7: ( 'group' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:71:9: 'group'
+            // InternalFormat.g:71:7: ( 'group' )
+            // InternalFormat.g:71:9: 'group'
             {
             match("group"); 
 
@@ -1409,8 +1409,8 @@ public final void mT__74() throws RecognitionException {
         try {
             int _type = T__74;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:72:7: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:72:9: '('
+            // InternalFormat.g:72:7: ( '(' )
+            // InternalFormat.g:72:9: '('
             {
             match('('); 
 
@@ -1429,8 +1429,8 @@ public final void mT__75() throws RecognitionException {
         try {
             int _type = T__75;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:73:7: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:73:9: ')'
+            // InternalFormat.g:73:7: ( ')' )
+            // InternalFormat.g:73:9: ')'
             {
             match(')'); 
 
@@ -1449,8 +1449,8 @@ public final void mT__76() throws RecognitionException {
         try {
             int _type = T__76;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:74:7: ( 'left' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:74:9: 'left'
+            // InternalFormat.g:74:7: ( 'left' )
+            // InternalFormat.g:74:9: 'left'
             {
             match("left"); 
 
@@ -1470,8 +1470,8 @@ public final void mT__77() throws RecognitionException {
         try {
             int _type = T__77;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:75:7: ( 'right' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:75:9: 'right'
+            // InternalFormat.g:75:7: ( 'right' )
+            // InternalFormat.g:75:9: 'right'
             {
             match("right"); 
 
@@ -1491,8 +1491,8 @@ public final void mT__78() throws RecognitionException {
         try {
             int _type = T__78;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:76:7: ( 'no_format' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:76:9: 'no_format'
+            // InternalFormat.g:76:7: ( 'no_format' )
+            // InternalFormat.g:76:9: 'no_format'
             {
             match("no_format"); 
 
@@ -1512,8 +1512,8 @@ public final void mT__79() throws RecognitionException {
         try {
             int _type = T__79;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:77:7: ( 'space' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:77:9: 'space'
+            // InternalFormat.g:77:7: ( 'space' )
+            // InternalFormat.g:77:9: 'space'
             {
             match("space"); 
 
@@ -1533,8 +1533,8 @@ public final void mT__80() throws RecognitionException {
         try {
             int _type = T__80;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:78:7: ( 'right_padding' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:78:9: 'right_padding'
+            // InternalFormat.g:78:7: ( 'right_padding' )
+            // InternalFormat.g:78:9: 'right_padding'
             {
             match("right_padding"); 
 
@@ -1554,8 +1554,8 @@ public final void mT__81() throws RecognitionException {
         try {
             int _type = T__81;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:79:7: ( 'linewrap' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:79:9: 'linewrap'
+            // InternalFormat.g:79:7: ( 'linewrap' )
+            // InternalFormat.g:79:9: 'linewrap'
             {
             match("linewrap"); 
 
@@ -1575,8 +1575,8 @@ public final void mT__82() throws RecognitionException {
         try {
             int _type = T__82;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:80:7: ( 'column' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:80:9: 'column'
+            // InternalFormat.g:80:7: ( 'column' )
+            // InternalFormat.g:80:9: 'column'
             {
             match("column"); 
 
@@ -1596,8 +1596,8 @@ public final void mT__83() throws RecognitionException {
         try {
             int _type = T__83;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:81:7: ( 'offset' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:81:9: 'offset'
+            // InternalFormat.g:81:7: ( 'offset' )
+            // InternalFormat.g:81:9: 'offset'
             {
             match("offset"); 
 
@@ -1617,8 +1617,8 @@ public final void mT__84() throws RecognitionException {
         try {
             int _type = T__84;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:82:7: ( '#' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:82:9: '#'
+            // InternalFormat.g:82:7: ( '#' )
+            // InternalFormat.g:82:9: '#'
             {
             match('#'); 
 
@@ -1637,8 +1637,8 @@ public final void mT__85() throws RecognitionException {
         try {
             int _type = T__85;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:83:7: ( 'instanceof' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:83:9: 'instanceof'
+            // InternalFormat.g:83:7: ( 'instanceof' )
+            // InternalFormat.g:83:9: 'instanceof'
             {
             match("instanceof"); 
 
@@ -1658,8 +1658,8 @@ public final void mT__86() throws RecognitionException {
         try {
             int _type = T__86;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:84:7: ( 'as' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:84:9: 'as'
+            // InternalFormat.g:84:7: ( 'as' )
+            // InternalFormat.g:84:9: 'as'
             {
             match("as"); 
 
@@ -1679,8 +1679,8 @@ public final void mT__87() throws RecognitionException {
         try {
             int _type = T__87;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:85:7: ( 'if' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:85:9: 'if'
+            // InternalFormat.g:85:7: ( 'if' )
+            // InternalFormat.g:85:9: 'if'
             {
             match("if"); 
 
@@ -1700,8 +1700,8 @@ public final void mT__88() throws RecognitionException {
         try {
             int _type = T__88;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:86:7: ( 'else' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:86:9: 'else'
+            // InternalFormat.g:86:7: ( 'else' )
+            // InternalFormat.g:86:9: 'else'
             {
             match("else"); 
 
@@ -1721,8 +1721,8 @@ public final void mT__89() throws RecognitionException {
         try {
             int _type = T__89;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:87:7: ( 'switch' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:87:9: 'switch'
+            // InternalFormat.g:87:7: ( 'switch' )
+            // InternalFormat.g:87:9: 'switch'
             {
             match("switch"); 
 
@@ -1742,8 +1742,8 @@ public final void mT__90() throws RecognitionException {
         try {
             int _type = T__90;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:88:7: ( 'case' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:88:9: 'case'
+            // InternalFormat.g:88:7: ( 'case' )
+            // InternalFormat.g:88:9: 'case'
             {
             match("case"); 
 
@@ -1763,8 +1763,8 @@ public final void mT__91() throws RecognitionException {
         try {
             int _type = T__91;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:89:7: ( 'while' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:89:9: 'while'
+            // InternalFormat.g:89:7: ( 'while' )
+            // InternalFormat.g:89:9: 'while'
             {
             match("while"); 
 
@@ -1784,8 +1784,8 @@ public final void mT__92() throws RecognitionException {
         try {
             int _type = T__92;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:90:7: ( 'do' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:90:9: 'do'
+            // InternalFormat.g:90:7: ( 'do' )
+            // InternalFormat.g:90:9: 'do'
             {
             match("do"); 
 
@@ -1805,8 +1805,8 @@ public final void mT__93() throws RecognitionException {
         try {
             int _type = T__93;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:91:7: ( 'new' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:91:9: 'new'
+            // InternalFormat.g:91:7: ( 'new' )
+            // InternalFormat.g:91:9: 'new'
             {
             match("new"); 
 
@@ -1826,8 +1826,8 @@ public final void mT__94() throws RecognitionException {
         try {
             int _type = T__94;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:92:7: ( 'null' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:92:9: 'null'
+            // InternalFormat.g:92:7: ( 'null' )
+            // InternalFormat.g:92:9: 'null'
             {
             match("null"); 
 
@@ -1847,8 +1847,8 @@ public final void mT__95() throws RecognitionException {
         try {
             int _type = T__95;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:93:7: ( 'typeof' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:93:9: 'typeof'
+            // InternalFormat.g:93:7: ( 'typeof' )
+            // InternalFormat.g:93:9: 'typeof'
             {
             match("typeof"); 
 
@@ -1868,8 +1868,8 @@ public final void mT__96() throws RecognitionException {
         try {
             int _type = T__96;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:94:7: ( 'throw' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:94:9: 'throw'
+            // InternalFormat.g:94:7: ( 'throw' )
+            // InternalFormat.g:94:9: 'throw'
             {
             match("throw"); 
 
@@ -1889,8 +1889,8 @@ public final void mT__97() throws RecognitionException {
         try {
             int _type = T__97;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:95:7: ( 'return' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:95:9: 'return'
+            // InternalFormat.g:95:7: ( 'return' )
+            // InternalFormat.g:95:9: 'return'
             {
             match("return"); 
 
@@ -1910,8 +1910,8 @@ public final void mT__98() throws RecognitionException {
         try {
             int _type = T__98;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:96:7: ( 'try' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:96:9: 'try'
+            // InternalFormat.g:96:7: ( 'try' )
+            // InternalFormat.g:96:9: 'try'
             {
             match("try"); 
 
@@ -1931,8 +1931,8 @@ public final void mT__99() throws RecognitionException {
         try {
             int _type = T__99;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:97:7: ( 'finally' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:97:9: 'finally'
+            // InternalFormat.g:97:7: ( 'finally' )
+            // InternalFormat.g:97:9: 'finally'
             {
             match("finally"); 
 
@@ -1952,8 +1952,8 @@ public final void mT__100() throws RecognitionException {
         try {
             int _type = T__100;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:98:8: ( 'synchronized' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:98:10: 'synchronized'
+            // InternalFormat.g:98:8: ( 'synchronized' )
+            // InternalFormat.g:98:10: 'synchronized'
             {
             match("synchronized"); 
 
@@ -1973,8 +1973,8 @@ public final void mT__101() throws RecognitionException {
         try {
             int _type = T__101;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:99:8: ( 'catch' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:99:10: 'catch'
+            // InternalFormat.g:99:8: ( 'catch' )
+            // InternalFormat.g:99:10: 'catch'
             {
             match("catch"); 
 
@@ -1994,8 +1994,8 @@ public final void mT__102() throws RecognitionException {
         try {
             int _type = T__102;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:100:8: ( '?' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:100:10: '?'
+            // InternalFormat.g:100:8: ( '?' )
+            // InternalFormat.g:100:10: '?'
             {
             match('?'); 
 
@@ -2014,8 +2014,8 @@ public final void mT__103() throws RecognitionException {
         try {
             int _type = T__103;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:101:8: ( '&' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:101:10: '&'
+            // InternalFormat.g:101:8: ( '&' )
+            // InternalFormat.g:101:10: '&'
             {
             match('&'); 
 
@@ -2034,8 +2034,8 @@ public final void mT__104() throws RecognitionException {
         try {
             int _type = T__104;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:102:8: ( 'int' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:102:10: 'int'
+            // InternalFormat.g:102:8: ( 'int' )
+            // InternalFormat.g:102:10: 'int'
             {
             match("int"); 
 
@@ -2055,8 +2055,8 @@ public final void mT__105() throws RecognitionException {
         try {
             int _type = T__105;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:103:8: ( 'String' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:103:10: 'String'
+            // InternalFormat.g:103:8: ( 'String' )
+            // InternalFormat.g:103:10: 'String'
             {
             match("String"); 
 
@@ -2076,8 +2076,8 @@ public final void mT__106() throws RecognitionException {
         try {
             int _type = T__106;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:104:8: ( 'override' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:104:10: 'override'
+            // InternalFormat.g:104:8: ( 'override' )
+            // InternalFormat.g:104:10: 'override'
             {
             match("override"); 
 
@@ -2097,8 +2097,8 @@ public final void mT__107() throws RecognitionException {
         try {
             int _type = T__107;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:105:8: ( 'no_space' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:105:10: 'no_space'
+            // InternalFormat.g:105:8: ( 'no_space' )
+            // InternalFormat.g:105:10: 'no_space'
             {
             match("no_space"); 
 
@@ -2118,8 +2118,8 @@ public final void mT__108() throws RecognitionException {
         try {
             int _type = T__108;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:106:8: ( 'no_linewrap' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:106:10: 'no_linewrap'
+            // InternalFormat.g:106:8: ( 'no_linewrap' )
+            // InternalFormat.g:106:10: 'no_linewrap'
             {
             match("no_linewrap"); 
 
@@ -2139,8 +2139,8 @@ public final void mT__109() throws RecognitionException {
         try {
             int _type = T__109;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:107:8: ( 'fixed' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:107:10: 'fixed'
+            // InternalFormat.g:107:8: ( 'fixed' )
+            // InternalFormat.g:107:10: 'fixed'
             {
             match("fixed"); 
 
@@ -2160,8 +2160,8 @@ public final void mT__110() throws RecognitionException {
         try {
             int _type = T__110;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:108:8: ( 'relative' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:108:10: 'relative'
+            // InternalFormat.g:108:8: ( 'relative' )
+            // InternalFormat.g:108:10: 'relative'
             {
             match("relative"); 
 
@@ -2181,8 +2181,8 @@ public final void mT__111() throws RecognitionException {
         try {
             int _type = T__111;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:109:8: ( 'nobreak' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:109:10: 'nobreak'
+            // InternalFormat.g:109:8: ( 'nobreak' )
+            // InternalFormat.g:109:10: 'nobreak'
             {
             match("nobreak"); 
 
@@ -2202,8 +2202,8 @@ public final void mT__112() throws RecognitionException {
         try {
             int _type = T__112;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:110:8: ( 'increment' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:110:10: 'increment'
+            // InternalFormat.g:110:8: ( 'increment' )
+            // InternalFormat.g:110:10: 'increment'
             {
             match("increment"); 
 
@@ -2223,8 +2223,8 @@ public final void mT__113() throws RecognitionException {
         try {
             int _type = T__113;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:111:8: ( '::' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:111:10: '::'
+            // InternalFormat.g:111:8: ( '::' )
+            // InternalFormat.g:111:10: '::'
             {
             match("::"); 
 
@@ -2244,8 +2244,8 @@ public final void mT__114() throws RecognitionException {
         try {
             int _type = T__114;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:112:8: ( '?.' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:112:10: '?.'
+            // InternalFormat.g:112:8: ( '?.' )
+            // InternalFormat.g:112:10: '?.'
             {
             match("?."); 
 
@@ -2265,8 +2265,8 @@ public final void mT__115() throws RecognitionException {
         try {
             int _type = T__115;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:113:8: ( '|' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:113:10: '|'
+            // InternalFormat.g:113:8: ( '|' )
+            // InternalFormat.g:113:10: '|'
             {
             match('|'); 
 
@@ -2285,8 +2285,8 @@ public final void mT__116() throws RecognitionException {
         try {
             int _type = T__116;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:114:8: ( 'var' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:114:10: 'var'
+            // InternalFormat.g:114:8: ( 'var' )
+            // InternalFormat.g:114:10: 'var'
             {
             match("var"); 
 
@@ -2306,8 +2306,8 @@ public final void mT__117() throws RecognitionException {
         try {
             int _type = T__117;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:115:8: ( 'true' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:115:10: 'true'
+            // InternalFormat.g:115:8: ( 'true' )
+            // InternalFormat.g:115:10: 'true'
             {
             match("true"); 
 
@@ -2322,43 +2322,96 @@ public final void mT__117() throws RecognitionException {
     }
     // $ANTLR end "T__117"
 
+    // $ANTLR start "RULE_INT"
+    public final void mRULE_INT() throws RecognitionException {
+        try {
+            int _type = RULE_INT;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalFormat.g:27695:10: ( '0' .. '9' ( '0' .. '9' | '_' )* )
+            // InternalFormat.g:27695:12: '0' .. '9' ( '0' .. '9' | '_' )*
+            {
+            matchRange('0','9'); 
+            // InternalFormat.g:27695:21: ( '0' .. '9' | '_' )*
+            loop1:
+            do {
+                int alt1=2;
+                int LA1_0 = input.LA(1);
+
+                if ( ((LA1_0>='0' && LA1_0<='9')||LA1_0=='_') ) {
+                    alt1=1;
+                }
+
+
+                switch (alt1) {
+            	case 1 :
+            	    // InternalFormat.g:
+            	    {
+            	    if ( (input.LA(1)>='0' && input.LA(1)<='9')||input.LA(1)=='_' ) {
+            	        input.consume();
+
+            	    }
+            	    else {
+            	        MismatchedSetException mse = new MismatchedSetException(null,input);
+            	        recover(mse);
+            	        throw mse;}
+
+
+            	    }
+            	    break;
+
+            	default :
+            	    break loop1;
+                }
+            } while (true);
+
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "RULE_INT"
+
     // $ANTLR start "RULE_HEX"
     public final void mRULE_HEX() throws RecognitionException {
         try {
             int _type = RULE_HEX;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27695:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27695:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
+            // InternalFormat.g:27697:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )? )
+            // InternalFormat.g:27697:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27695:12: ( '0x' | '0X' )
-            int alt1=2;
-            int LA1_0 = input.LA(1);
+            // InternalFormat.g:27697:12: ( '0x' | '0X' )
+            int alt2=2;
+            int LA2_0 = input.LA(1);
 
-            if ( (LA1_0=='0') ) {
-                int LA1_1 = input.LA(2);
+            if ( (LA2_0=='0') ) {
+                int LA2_1 = input.LA(2);
 
-                if ( (LA1_1=='x') ) {
-                    alt1=1;
+                if ( (LA2_1=='x') ) {
+                    alt2=1;
                 }
-                else if ( (LA1_1=='X') ) {
-                    alt1=2;
+                else if ( (LA2_1=='X') ) {
+                    alt2=2;
                 }
                 else {
                     NoViableAltException nvae =
-                        new NoViableAltException("", 1, 1, input);
+                        new NoViableAltException("", 2, 1, input);
 
                     throw nvae;
                 }
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 1, 0, input);
+                    new NoViableAltException("", 2, 0, input);
 
                 throw nvae;
             }
-            switch (alt1) {
+            switch (alt2) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27695:13: '0x'
+                    // InternalFormat.g:27697:13: '0x'
                     {
                     match("0x"); 
 
@@ -2366,7 +2419,7 @@ else if ( (LA1_1=='X') ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27695:18: '0X'
+                    // InternalFormat.g:27697:18: '0X'
                     {
                     match("0X"); 
 
@@ -2376,21 +2429,21 @@ else if ( (LA1_1=='X') ) {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27695:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+
-            int cnt2=0;
-            loop2:
+            // InternalFormat.g:27697:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+
+            int cnt3=0;
+            loop3:
             do {
-                int alt2=2;
-                int LA2_0 = input.LA(1);
+                int alt3=2;
+                int LA3_0 = input.LA(1);
 
-                if ( ((LA2_0>='0' && LA2_0<='9')||(LA2_0>='A' && LA2_0<='F')||LA2_0=='_'||(LA2_0>='a' && LA2_0<='f')) ) {
-                    alt2=1;
+                if ( ((LA3_0>='0' && LA3_0<='9')||(LA3_0>='A' && LA3_0<='F')||LA3_0=='_'||(LA3_0>='a' && LA3_0<='f')) ) {
+                    alt3=1;
                 }
 
 
-                switch (alt2) {
+                switch (alt3) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:
+            	    // InternalFormat.g:
             	    {
             	    if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='F')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='f') ) {
             	        input.consume();
@@ -2406,45 +2459,45 @@ else if ( (LA1_1=='X') ) {
             	    break;
 
             	default :
-            	    if ( cnt2 >= 1 ) break loop2;
+            	    if ( cnt3 >= 1 ) break loop3;
                         EarlyExitException eee =
-                            new EarlyExitException(2, input);
+                            new EarlyExitException(3, input);
                         throw eee;
                 }
-                cnt2++;
+                cnt3++;
             } while (true);
 
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27695:58: ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
-            int alt4=2;
-            int LA4_0 = input.LA(1);
+            // InternalFormat.g:27697:58: ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
+            int alt5=2;
+            int LA5_0 = input.LA(1);
 
-            if ( (LA4_0=='#') ) {
-                alt4=1;
+            if ( (LA5_0=='#') ) {
+                alt5=1;
             }
-            switch (alt4) {
+            switch (alt5) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27695:59: '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
+                    // InternalFormat.g:27697:59: '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
                     {
                     match('#'); 
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27695:63: ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
-                    int alt3=2;
-                    int LA3_0 = input.LA(1);
+                    // InternalFormat.g:27697:63: ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
+                    int alt4=2;
+                    int LA4_0 = input.LA(1);
 
-                    if ( (LA3_0=='B'||LA3_0=='b') ) {
-                        alt3=1;
+                    if ( (LA4_0=='B'||LA4_0=='b') ) {
+                        alt4=1;
                     }
-                    else if ( (LA3_0=='L'||LA3_0=='l') ) {
-                        alt3=2;
+                    else if ( (LA4_0=='L'||LA4_0=='l') ) {
+                        alt4=2;
                     }
                     else {
                         NoViableAltException nvae =
-                            new NoViableAltException("", 3, 0, input);
+                            new NoViableAltException("", 4, 0, input);
 
                         throw nvae;
                     }
-                    switch (alt3) {
+                    switch (alt4) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27695:64: ( 'b' | 'B' ) ( 'i' | 'I' )
+                            // InternalFormat.g:27697:64: ( 'b' | 'B' ) ( 'i' | 'I' )
                             {
                             if ( input.LA(1)=='B'||input.LA(1)=='b' ) {
                                 input.consume();
@@ -2468,7 +2521,7 @@ else if ( (LA3_0=='L'||LA3_0=='l') ) {
                             }
                             break;
                         case 2 :
-                            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27695:84: ( 'l' | 'L' )
+                            // InternalFormat.g:27697:84: ( 'l' | 'L' )
                             {
                             if ( input.LA(1)=='L'||input.LA(1)=='l' ) {
                                 input.consume();
@@ -2502,69 +2555,16 @@ else if ( (LA3_0=='L'||LA3_0=='l') ) {
     }
     // $ANTLR end "RULE_HEX"
 
-    // $ANTLR start "RULE_INT"
-    public final void mRULE_INT() throws RecognitionException {
-        try {
-            int _type = RULE_INT;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27697:10: ( '0' .. '9' ( '0' .. '9' | '_' )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27697:12: '0' .. '9' ( '0' .. '9' | '_' )*
-            {
-            matchRange('0','9'); 
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27697:21: ( '0' .. '9' | '_' )*
-            loop5:
-            do {
-                int alt5=2;
-                int LA5_0 = input.LA(1);
-
-                if ( ((LA5_0>='0' && LA5_0<='9')||LA5_0=='_') ) {
-                    alt5=1;
-                }
-
-
-                switch (alt5) {
-            	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:
-            	    {
-            	    if ( (input.LA(1)>='0' && input.LA(1)<='9')||input.LA(1)=='_' ) {
-            	        input.consume();
-
-            	    }
-            	    else {
-            	        MismatchedSetException mse = new MismatchedSetException(null,input);
-            	        recover(mse);
-            	        throw mse;}
-
-
-            	    }
-            	    break;
-
-            	default :
-            	    break loop5;
-                }
-            } while (true);
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "RULE_INT"
-
     // $ANTLR start "RULE_DECIMAL"
     public final void mRULE_DECIMAL() throws RecognitionException {
         try {
             int _type = RULE_DECIMAL;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27699:14: ( RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27699:16: RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
+            // InternalFormat.g:27699:14: ( RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )? )
+            // InternalFormat.g:27699:16: RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
             {
             mRULE_INT(); 
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27699:25: ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )?
+            // InternalFormat.g:27699:25: ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )?
             int alt7=2;
             int LA7_0 = input.LA(1);
 
@@ -2573,7 +2573,7 @@ public final void mRULE_DECIMAL() throws RecognitionException {
             }
             switch (alt7) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27699:26: ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT
+                    // InternalFormat.g:27699:26: ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT
                     {
                     if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
                         input.consume();
@@ -2584,7 +2584,7 @@ public final void mRULE_DECIMAL() throws RecognitionException {
                         recover(mse);
                         throw mse;}
 
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27699:36: ( '+' | '-' )?
+                    // InternalFormat.g:27699:36: ( '+' | '-' )?
                     int alt6=2;
                     int LA6_0 = input.LA(1);
 
@@ -2593,7 +2593,7 @@ public final void mRULE_DECIMAL() throws RecognitionException {
                     }
                     switch (alt6) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:
+                            // InternalFormat.g:
                             {
                             if ( input.LA(1)=='+'||input.LA(1)=='-' ) {
                                 input.consume();
@@ -2617,7 +2617,7 @@ public final void mRULE_DECIMAL() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27699:58: ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
+            // InternalFormat.g:27699:58: ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
             int alt8=3;
             int LA8_0 = input.LA(1);
 
@@ -2629,7 +2629,7 @@ else if ( (LA8_0=='D'||LA8_0=='F'||LA8_0=='L'||LA8_0=='d'||LA8_0=='f'||LA8_0=='l
             }
             switch (alt8) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27699:59: ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' )
+                    // InternalFormat.g:27699:59: ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' )
                     {
                     if ( input.LA(1)=='B'||input.LA(1)=='b' ) {
                         input.consume();
@@ -2653,7 +2653,7 @@ else if ( (LA8_0=='D'||LA8_0=='F'||LA8_0=='L'||LA8_0=='d'||LA8_0=='f'||LA8_0=='l
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27699:87: ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' )
+                    // InternalFormat.g:27699:87: ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' )
                     {
                     if ( input.LA(1)=='D'||input.LA(1)=='F'||input.LA(1)=='L'||input.LA(1)=='d'||input.LA(1)=='f'||input.LA(1)=='l' ) {
                         input.consume();
@@ -2686,10 +2686,10 @@ public final void mRULE_ID() throws RecognitionException {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27701:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27701:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
+            // InternalFormat.g:27701:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )* )
+            // InternalFormat.g:27701:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27701:11: ( '^' )?
+            // InternalFormat.g:27701:11: ( '^' )?
             int alt9=2;
             int LA9_0 = input.LA(1);
 
@@ -2698,7 +2698,7 @@ public final void mRULE_ID() throws RecognitionException {
             }
             switch (alt9) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27701:11: '^'
+                    // InternalFormat.g:27701:11: '^'
                     {
                     match('^'); 
 
@@ -2716,7 +2716,7 @@ public final void mRULE_ID() throws RecognitionException {
                 recover(mse);
                 throw mse;}
 
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27701:44: ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
+            // InternalFormat.g:27701:44: ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
             loop10:
             do {
                 int alt10=2;
@@ -2729,7 +2729,7 @@ public final void mRULE_ID() throws RecognitionException {
 
                 switch (alt10) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:
+            	    // InternalFormat.g:
             	    {
             	    if ( input.LA(1)=='$'||(input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
             	        input.consume();
@@ -2765,10 +2765,10 @@ public final void mRULE_STRING() throws RecognitionException {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27703:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27703:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
+            // InternalFormat.g:27703:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? ) )
+            // InternalFormat.g:27703:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27703:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
+            // InternalFormat.g:27703:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
             int alt15=2;
             int LA15_0 = input.LA(1);
 
@@ -2786,10 +2786,10 @@ else if ( (LA15_0=='\'') ) {
             }
             switch (alt15) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27703:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )?
+                    // InternalFormat.g:27703:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )?
                     {
                     match('\"'); 
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27703:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // InternalFormat.g:27703:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop11:
                     do {
                         int alt11=3;
@@ -2805,7 +2805,7 @@ else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA1
 
                         switch (alt11) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27703:21: '\\\\' .
+                    	    // InternalFormat.g:27703:21: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -2813,7 +2813,7 @@ else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA1
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27703:28: ~ ( ( '\\\\' | '\"' ) )
+                    	    // InternalFormat.g:27703:28: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -2833,7 +2833,7 @@ else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA1
                         }
                     } while (true);
 
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27703:44: ( '\"' )?
+                    // InternalFormat.g:27703:44: ( '\"' )?
                     int alt12=2;
                     int LA12_0 = input.LA(1);
 
@@ -2842,7 +2842,7 @@ else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA1
                     }
                     switch (alt12) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27703:44: '\"'
+                            // InternalFormat.g:27703:44: '\"'
                             {
                             match('\"'); 
 
@@ -2855,10 +2855,10 @@ else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA1
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27703:49: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )?
+                    // InternalFormat.g:27703:49: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )?
                     {
                     match('\''); 
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27703:54: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // InternalFormat.g:27703:54: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop13:
                     do {
                         int alt13=3;
@@ -2874,7 +2874,7 @@ else if ( ((LA13_0>='\u0000' && LA13_0<='&')||(LA13_0>='(' && LA13_0<='[')||(LA1
 
                         switch (alt13) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27703:55: '\\\\' .
+                    	    // InternalFormat.g:27703:55: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -2882,7 +2882,7 @@ else if ( ((LA13_0>='\u0000' && LA13_0<='&')||(LA13_0>='(' && LA13_0<='[')||(LA1
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27703:62: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // InternalFormat.g:27703:62: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -2902,7 +2902,7 @@ else if ( ((LA13_0>='\u0000' && LA13_0<='&')||(LA13_0>='(' && LA13_0<='[')||(LA1
                         }
                     } while (true);
 
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27703:79: ( '\\'' )?
+                    // InternalFormat.g:27703:79: ( '\\'' )?
                     int alt14=2;
                     int LA14_0 = input.LA(1);
 
@@ -2911,7 +2911,7 @@ else if ( ((LA13_0>='\u0000' && LA13_0<='&')||(LA13_0>='(' && LA13_0<='[')||(LA1
                     }
                     switch (alt14) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27703:79: '\\''
+                            // InternalFormat.g:27703:79: '\\''
                             {
                             match('\''); 
 
@@ -2942,12 +2942,12 @@ public final void mRULE_ML_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27705:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27705:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalFormat.g:27705:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalFormat.g:27705:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27705:24: ( options {greedy=false; } : . )*
+            // InternalFormat.g:27705:24: ( options {greedy=false; } : . )*
             loop16:
             do {
                 int alt16=2;
@@ -2972,7 +2972,7 @@ else if ( ((LA16_0>='\u0000' && LA16_0<=')')||(LA16_0>='+' && LA16_0<='\uFFFF'))
 
                 switch (alt16) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27705:52: .
+            	    // InternalFormat.g:27705:52: .
             	    {
             	    matchAny(); 
 
@@ -3002,12 +3002,12 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27707:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27707:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalFormat.g:27707:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalFormat.g:27707:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27707:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // InternalFormat.g:27707:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop17:
             do {
                 int alt17=2;
@@ -3020,7 +3020,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
 
                 switch (alt17) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27707:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // InternalFormat.g:27707:24: ~ ( ( '\\n' | '\\r' ) )
             	    {
             	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
             	        input.consume();
@@ -3040,7 +3040,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
                 }
             } while (true);
 
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27707:40: ( ( '\\r' )? '\\n' )?
+            // InternalFormat.g:27707:40: ( ( '\\r' )? '\\n' )?
             int alt19=2;
             int LA19_0 = input.LA(1);
 
@@ -3049,9 +3049,9 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
             }
             switch (alt19) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27707:41: ( '\\r' )? '\\n'
+                    // InternalFormat.g:27707:41: ( '\\r' )? '\\n'
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27707:41: ( '\\r' )?
+                    // InternalFormat.g:27707:41: ( '\\r' )?
                     int alt18=2;
                     int LA18_0 = input.LA(1);
 
@@ -3060,7 +3060,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
                     }
                     switch (alt18) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27707:41: '\\r'
+                            // InternalFormat.g:27707:41: '\\r'
                             {
                             match('\r'); 
 
@@ -3092,10 +3092,10 @@ public final void mRULE_WS() throws RecognitionException {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27709:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27709:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalFormat.g:27709:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalFormat.g:27709:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27709:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalFormat.g:27709:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt20=0;
             loop20:
             do {
@@ -3109,7 +3109,7 @@ public final void mRULE_WS() throws RecognitionException {
 
                 switch (alt20) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:
+            	    // InternalFormat.g:
             	    {
             	    if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
             	        input.consume();
@@ -3149,8 +3149,8 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27711:16: ( . )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27711:18: .
+            // InternalFormat.g:27711:16: ( . )
+            // InternalFormat.g:27711:18: .
             {
             matchAny(); 
 
@@ -3165,803 +3165,803 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:8: ( T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | T__97 | T__98 | T__99 | T__100 | T__101 | T__102 | T__103 | T__104 | T__105 | T__106 | T__107 | T__108 | T__109 | T__110 | T__111 | T__112 | T__113 | T__114 | T__115 | T__116 | T__117 | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        // InternalFormat.g:1:8: ( T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | T__97 | T__98 | T__99 | T__100 | T__101 | T__102 | T__103 | T__104 | T__105 | T__106 | T__107 | T__108 | T__109 | T__110 | T__111 | T__112 | T__113 | T__114 | T__115 | T__116 | T__117 | RULE_INT | RULE_HEX | RULE_DECIMAL | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
         int alt21=114;
         alt21 = dfa21.predict(input);
         switch (alt21) {
             case 1 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:10: T__13
+                // InternalFormat.g:1:10: T__13
                 {
                 mT__13(); 
 
                 }
                 break;
             case 2 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:16: T__14
+                // InternalFormat.g:1:16: T__14
                 {
                 mT__14(); 
 
                 }
                 break;
             case 3 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:22: T__15
+                // InternalFormat.g:1:22: T__15
                 {
                 mT__15(); 
 
                 }
                 break;
             case 4 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:28: T__16
+                // InternalFormat.g:1:28: T__16
                 {
                 mT__16(); 
 
                 }
                 break;
             case 5 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:34: T__17
+                // InternalFormat.g:1:34: T__17
                 {
                 mT__17(); 
 
                 }
                 break;
             case 6 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:40: T__18
+                // InternalFormat.g:1:40: T__18
                 {
                 mT__18(); 
 
                 }
                 break;
             case 7 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:46: T__19
+                // InternalFormat.g:1:46: T__19
                 {
                 mT__19(); 
 
                 }
                 break;
             case 8 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:52: T__20
+                // InternalFormat.g:1:52: T__20
                 {
                 mT__20(); 
 
                 }
                 break;
             case 9 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:58: T__21
+                // InternalFormat.g:1:58: T__21
                 {
                 mT__21(); 
 
                 }
                 break;
             case 10 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:64: T__22
+                // InternalFormat.g:1:64: T__22
                 {
                 mT__22(); 
 
                 }
                 break;
             case 11 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:70: T__23
+                // InternalFormat.g:1:70: T__23
                 {
                 mT__23(); 
 
                 }
                 break;
             case 12 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:76: T__24
+                // InternalFormat.g:1:76: T__24
                 {
                 mT__24(); 
 
                 }
                 break;
             case 13 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:82: T__25
+                // InternalFormat.g:1:82: T__25
                 {
                 mT__25(); 
 
                 }
                 break;
             case 14 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:88: T__26
+                // InternalFormat.g:1:88: T__26
                 {
                 mT__26(); 
 
                 }
                 break;
             case 15 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:94: T__27
+                // InternalFormat.g:1:94: T__27
                 {
                 mT__27(); 
 
                 }
                 break;
             case 16 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:100: T__28
+                // InternalFormat.g:1:100: T__28
                 {
                 mT__28(); 
 
                 }
                 break;
             case 17 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:106: T__29
+                // InternalFormat.g:1:106: T__29
                 {
                 mT__29(); 
 
                 }
                 break;
             case 18 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:112: T__30
+                // InternalFormat.g:1:112: T__30
                 {
                 mT__30(); 
 
                 }
                 break;
             case 19 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:118: T__31
+                // InternalFormat.g:1:118: T__31
                 {
                 mT__31(); 
 
                 }
                 break;
             case 20 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:124: T__32
+                // InternalFormat.g:1:124: T__32
                 {
                 mT__32(); 
 
                 }
                 break;
             case 21 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:130: T__33
+                // InternalFormat.g:1:130: T__33
                 {
                 mT__33(); 
 
                 }
                 break;
             case 22 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:136: T__34
+                // InternalFormat.g:1:136: T__34
                 {
                 mT__34(); 
 
                 }
                 break;
             case 23 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:142: T__35
+                // InternalFormat.g:1:142: T__35
                 {
                 mT__35(); 
 
                 }
                 break;
             case 24 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:148: T__36
+                // InternalFormat.g:1:148: T__36
                 {
                 mT__36(); 
 
                 }
                 break;
             case 25 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:154: T__37
+                // InternalFormat.g:1:154: T__37
                 {
                 mT__37(); 
 
                 }
                 break;
             case 26 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:160: T__38
+                // InternalFormat.g:1:160: T__38
                 {
                 mT__38(); 
 
                 }
                 break;
             case 27 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:166: T__39
+                // InternalFormat.g:1:166: T__39
                 {
                 mT__39(); 
 
                 }
                 break;
             case 28 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:172: T__40
+                // InternalFormat.g:1:172: T__40
                 {
                 mT__40(); 
 
                 }
                 break;
             case 29 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:178: T__41
+                // InternalFormat.g:1:178: T__41
                 {
                 mT__41(); 
 
                 }
                 break;
             case 30 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:184: T__42
+                // InternalFormat.g:1:184: T__42
                 {
                 mT__42(); 
 
                 }
                 break;
             case 31 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:190: T__43
+                // InternalFormat.g:1:190: T__43
                 {
                 mT__43(); 
 
                 }
                 break;
             case 32 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:196: T__44
+                // InternalFormat.g:1:196: T__44
                 {
                 mT__44(); 
 
                 }
                 break;
             case 33 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:202: T__45
+                // InternalFormat.g:1:202: T__45
                 {
                 mT__45(); 
 
                 }
                 break;
             case 34 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:208: T__46
+                // InternalFormat.g:1:208: T__46
                 {
                 mT__46(); 
 
                 }
                 break;
             case 35 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:214: T__47
+                // InternalFormat.g:1:214: T__47
                 {
                 mT__47(); 
 
                 }
                 break;
             case 36 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:220: T__48
+                // InternalFormat.g:1:220: T__48
                 {
                 mT__48(); 
 
                 }
                 break;
             case 37 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:226: T__49
+                // InternalFormat.g:1:226: T__49
                 {
                 mT__49(); 
 
                 }
                 break;
             case 38 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:232: T__50
+                // InternalFormat.g:1:232: T__50
                 {
                 mT__50(); 
 
                 }
                 break;
             case 39 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:238: T__51
+                // InternalFormat.g:1:238: T__51
                 {
                 mT__51(); 
 
                 }
                 break;
             case 40 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:244: T__52
+                // InternalFormat.g:1:244: T__52
                 {
                 mT__52(); 
 
                 }
                 break;
             case 41 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:250: T__53
+                // InternalFormat.g:1:250: T__53
                 {
                 mT__53(); 
 
                 }
                 break;
             case 42 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:256: T__54
+                // InternalFormat.g:1:256: T__54
                 {
                 mT__54(); 
 
                 }
                 break;
             case 43 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:262: T__55
+                // InternalFormat.g:1:262: T__55
                 {
                 mT__55(); 
 
                 }
                 break;
             case 44 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:268: T__56
+                // InternalFormat.g:1:268: T__56
                 {
                 mT__56(); 
 
                 }
                 break;
             case 45 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:274: T__57
+                // InternalFormat.g:1:274: T__57
                 {
                 mT__57(); 
 
                 }
                 break;
             case 46 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:280: T__58
+                // InternalFormat.g:1:280: T__58
                 {
                 mT__58(); 
 
                 }
                 break;
             case 47 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:286: T__59
+                // InternalFormat.g:1:286: T__59
                 {
                 mT__59(); 
 
                 }
                 break;
             case 48 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:292: T__60
+                // InternalFormat.g:1:292: T__60
                 {
                 mT__60(); 
 
                 }
                 break;
             case 49 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:298: T__61
+                // InternalFormat.g:1:298: T__61
                 {
                 mT__61(); 
 
                 }
                 break;
             case 50 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:304: T__62
+                // InternalFormat.g:1:304: T__62
                 {
                 mT__62(); 
 
                 }
                 break;
             case 51 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:310: T__63
+                // InternalFormat.g:1:310: T__63
                 {
                 mT__63(); 
 
                 }
                 break;
             case 52 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:316: T__64
+                // InternalFormat.g:1:316: T__64
                 {
                 mT__64(); 
 
                 }
                 break;
             case 53 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:322: T__65
+                // InternalFormat.g:1:322: T__65
                 {
                 mT__65(); 
 
                 }
                 break;
             case 54 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:328: T__66
+                // InternalFormat.g:1:328: T__66
                 {
                 mT__66(); 
 
                 }
                 break;
             case 55 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:334: T__67
+                // InternalFormat.g:1:334: T__67
                 {
                 mT__67(); 
 
                 }
                 break;
             case 56 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:340: T__68
+                // InternalFormat.g:1:340: T__68
                 {
                 mT__68(); 
 
                 }
                 break;
             case 57 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:346: T__69
+                // InternalFormat.g:1:346: T__69
                 {
                 mT__69(); 
 
                 }
                 break;
             case 58 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:352: T__70
+                // InternalFormat.g:1:352: T__70
                 {
                 mT__70(); 
 
                 }
                 break;
             case 59 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:358: T__71
+                // InternalFormat.g:1:358: T__71
                 {
                 mT__71(); 
 
                 }
                 break;
             case 60 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:364: T__72
+                // InternalFormat.g:1:364: T__72
                 {
                 mT__72(); 
 
                 }
                 break;
             case 61 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:370: T__73
+                // InternalFormat.g:1:370: T__73
                 {
                 mT__73(); 
 
                 }
                 break;
             case 62 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:376: T__74
+                // InternalFormat.g:1:376: T__74
                 {
                 mT__74(); 
 
                 }
                 break;
             case 63 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:382: T__75
+                // InternalFormat.g:1:382: T__75
                 {
                 mT__75(); 
 
                 }
                 break;
             case 64 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:388: T__76
+                // InternalFormat.g:1:388: T__76
                 {
                 mT__76(); 
 
                 }
                 break;
             case 65 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:394: T__77
+                // InternalFormat.g:1:394: T__77
                 {
                 mT__77(); 
 
                 }
                 break;
             case 66 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:400: T__78
+                // InternalFormat.g:1:400: T__78
                 {
                 mT__78(); 
 
                 }
                 break;
             case 67 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:406: T__79
+                // InternalFormat.g:1:406: T__79
                 {
                 mT__79(); 
 
                 }
                 break;
             case 68 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:412: T__80
+                // InternalFormat.g:1:412: T__80
                 {
                 mT__80(); 
 
                 }
                 break;
             case 69 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:418: T__81
+                // InternalFormat.g:1:418: T__81
                 {
                 mT__81(); 
 
                 }
                 break;
             case 70 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:424: T__82
+                // InternalFormat.g:1:424: T__82
                 {
                 mT__82(); 
 
                 }
                 break;
             case 71 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:430: T__83
+                // InternalFormat.g:1:430: T__83
                 {
                 mT__83(); 
 
                 }
                 break;
             case 72 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:436: T__84
+                // InternalFormat.g:1:436: T__84
                 {
                 mT__84(); 
 
                 }
                 break;
             case 73 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:442: T__85
+                // InternalFormat.g:1:442: T__85
                 {
                 mT__85(); 
 
                 }
                 break;
             case 74 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:448: T__86
+                // InternalFormat.g:1:448: T__86
                 {
                 mT__86(); 
 
                 }
                 break;
             case 75 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:454: T__87
+                // InternalFormat.g:1:454: T__87
                 {
                 mT__87(); 
 
                 }
                 break;
             case 76 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:460: T__88
+                // InternalFormat.g:1:460: T__88
                 {
                 mT__88(); 
 
                 }
                 break;
             case 77 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:466: T__89
+                // InternalFormat.g:1:466: T__89
                 {
                 mT__89(); 
 
                 }
                 break;
             case 78 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:472: T__90
+                // InternalFormat.g:1:472: T__90
                 {
                 mT__90(); 
 
                 }
                 break;
             case 79 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:478: T__91
+                // InternalFormat.g:1:478: T__91
                 {
                 mT__91(); 
 
                 }
                 break;
             case 80 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:484: T__92
+                // InternalFormat.g:1:484: T__92
                 {
                 mT__92(); 
 
                 }
                 break;
             case 81 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:490: T__93
+                // InternalFormat.g:1:490: T__93
                 {
                 mT__93(); 
 
                 }
                 break;
             case 82 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:496: T__94
+                // InternalFormat.g:1:496: T__94
                 {
                 mT__94(); 
 
                 }
                 break;
             case 83 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:502: T__95
+                // InternalFormat.g:1:502: T__95
                 {
                 mT__95(); 
 
                 }
                 break;
             case 84 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:508: T__96
+                // InternalFormat.g:1:508: T__96
                 {
                 mT__96(); 
 
                 }
                 break;
             case 85 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:514: T__97
+                // InternalFormat.g:1:514: T__97
                 {
                 mT__97(); 
 
                 }
                 break;
             case 86 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:520: T__98
+                // InternalFormat.g:1:520: T__98
                 {
                 mT__98(); 
 
                 }
                 break;
             case 87 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:526: T__99
+                // InternalFormat.g:1:526: T__99
                 {
                 mT__99(); 
 
                 }
                 break;
             case 88 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:532: T__100
+                // InternalFormat.g:1:532: T__100
                 {
                 mT__100(); 
 
                 }
                 break;
             case 89 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:539: T__101
+                // InternalFormat.g:1:539: T__101
                 {
                 mT__101(); 
 
                 }
                 break;
             case 90 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:546: T__102
+                // InternalFormat.g:1:546: T__102
                 {
                 mT__102(); 
 
                 }
                 break;
             case 91 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:553: T__103
+                // InternalFormat.g:1:553: T__103
                 {
                 mT__103(); 
 
                 }
                 break;
             case 92 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:560: T__104
+                // InternalFormat.g:1:560: T__104
                 {
                 mT__104(); 
 
                 }
                 break;
             case 93 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:567: T__105
+                // InternalFormat.g:1:567: T__105
                 {
                 mT__105(); 
 
                 }
                 break;
             case 94 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:574: T__106
+                // InternalFormat.g:1:574: T__106
                 {
                 mT__106(); 
 
                 }
                 break;
             case 95 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:581: T__107
+                // InternalFormat.g:1:581: T__107
                 {
                 mT__107(); 
 
                 }
                 break;
             case 96 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:588: T__108
+                // InternalFormat.g:1:588: T__108
                 {
                 mT__108(); 
 
                 }
                 break;
             case 97 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:595: T__109
+                // InternalFormat.g:1:595: T__109
                 {
                 mT__109(); 
 
                 }
                 break;
             case 98 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:602: T__110
+                // InternalFormat.g:1:602: T__110
                 {
                 mT__110(); 
 
                 }
                 break;
             case 99 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:609: T__111
+                // InternalFormat.g:1:609: T__111
                 {
                 mT__111(); 
 
                 }
                 break;
             case 100 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:616: T__112
+                // InternalFormat.g:1:616: T__112
                 {
                 mT__112(); 
 
                 }
                 break;
             case 101 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:623: T__113
+                // InternalFormat.g:1:623: T__113
                 {
                 mT__113(); 
 
                 }
                 break;
             case 102 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:630: T__114
+                // InternalFormat.g:1:630: T__114
                 {
                 mT__114(); 
 
                 }
                 break;
             case 103 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:637: T__115
+                // InternalFormat.g:1:637: T__115
                 {
                 mT__115(); 
 
                 }
                 break;
             case 104 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:644: T__116
+                // InternalFormat.g:1:644: T__116
                 {
                 mT__116(); 
 
                 }
                 break;
             case 105 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:651: T__117
+                // InternalFormat.g:1:651: T__117
                 {
                 mT__117(); 
 
                 }
                 break;
             case 106 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:658: RULE_HEX
+                // InternalFormat.g:1:658: RULE_INT
                 {
-                mRULE_HEX(); 
+                mRULE_INT(); 
 
                 }
                 break;
             case 107 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:667: RULE_INT
+                // InternalFormat.g:1:667: RULE_HEX
                 {
-                mRULE_INT(); 
+                mRULE_HEX(); 
 
                 }
                 break;
             case 108 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:676: RULE_DECIMAL
+                // InternalFormat.g:1:676: RULE_DECIMAL
                 {
                 mRULE_DECIMAL(); 
 
                 }
                 break;
             case 109 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:689: RULE_ID
+                // InternalFormat.g:1:689: RULE_ID
                 {
                 mRULE_ID(); 
 
                 }
                 break;
             case 110 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:697: RULE_STRING
+                // InternalFormat.g:1:697: RULE_STRING
                 {
                 mRULE_STRING(); 
 
                 }
                 break;
             case 111 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:709: RULE_ML_COMMENT
+                // InternalFormat.g:1:709: RULE_ML_COMMENT
                 {
                 mRULE_ML_COMMENT(); 
 
                 }
                 break;
             case 112 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:725: RULE_SL_COMMENT
+                // InternalFormat.g:1:725: RULE_SL_COMMENT
                 {
                 mRULE_SL_COMMENT(); 
 
                 }
                 break;
             case 113 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:741: RULE_WS
+                // InternalFormat.g:1:741: RULE_WS
                 {
                 mRULE_WS(); 
 
                 }
                 break;
             case 114 :
-                // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1:749: RULE_ANY_OTHER
+                // InternalFormat.g:1:749: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -3975,132 +3975,19 @@ public void mTokens() throws RecognitionException {
 
     protected DFA21 dfa21 = new DFA21(this);
     static final String DFA21_eotS =
-        "\1\uffff\1\66\1\71\1\73\1\75\3\66\1\106\1\112\1\115\1\121\1\123"+
-        "\1\125\1\127\1\131\1\133\1\136\7\66\7\uffff\1\172\1\66\2\uffff\3"+
-        "\66\1\uffff\2\66\2\u008c\1\61\5\uffff\4\66\1\uffff\1\u0096\6\uffff"+
-        "\1\66\1\u0099\4\66\20\uffff\1\u00a2\5\uffff\1\u00a4\4\uffff\11\66"+
-        "\1\u00b0\6\66\1\u00b9\2\66\11\uffff\1\66\2\uffff\7\66\1\uffff\4"+
-        "\66\1\uffff\1\u008c\4\uffff\5\66\2\uffff\2\66\1\uffff\1\u00d1\1"+
-        "\u00d2\5\66\4\uffff\11\66\1\u00e2\1\66\1\uffff\1\66\1\u00e6\6\66"+
-        "\1\uffff\7\66\1\u00f6\5\66\1\u00fc\2\66\1\u00ff\6\66\2\uffff\4\66"+
-        "\1\u010a\2\66\1\u010d\7\66\1\uffff\3\66\1\uffff\6\66\1\u011e\2\66"+
-        "\1\u0121\5\66\1\uffff\1\u0127\4\66\1\uffff\1\u012c\1\66\1\uffff"+
-        "\1\u012e\1\u0130\5\66\1\u0136\2\66\1\uffff\1\u0139\1\66\1\uffff"+
-        "\1\66\1\u013d\1\u013e\5\66\1\u0144\2\66\1\u0147\2\66\1\u014a\1\66"+
-        "\1\uffff\1\u014c\1\u014d\1\uffff\5\66\1\uffff\3\66\1\u0156\1\uffff"+
-        "\1\66\1\uffff\1\66\1\uffff\1\u0159\4\66\1\uffff\1\u015e\1\66\1\uffff"+
-        "\2\66\1\u0162\2\uffff\1\u0163\1\66\1\u0165\2\66\1\uffff\2\66\1\uffff"+
-        "\1\u016a\1\66\1\uffff\1\u016c\2\uffff\5\66\1\u0172\1\66\1\u0174"+
-        "\1\uffff\1\u0175\1\66\1\uffff\2\66\1\u0179\1\u017a\1\uffff\1\66"+
-        "\1\u017c\1\66\2\uffff\1\66\1\uffff\3\66\1\u0182\1\uffff\1\u0183"+
-        "\1\uffff\4\66\1\u0188\1\uffff\1\66\2\uffff\1\66\1\u018b\1\66\2\uffff"+
-        "\1\66\1\uffff\5\66\2\uffff\1\u0193\1\66\1\u0195\1\66\1\uffff\1\u0197"+
-        "\1\66\1\uffff\1\u0199\1\66\1\u019b\2\66\1\u019e\1\u019f\1\uffff"+
-        "\1\u01a0\1\uffff\1\66\1\uffff\1\66\1\uffff\1\66\1\uffff\1\66\1\u01a5"+
-        "\3\uffff\4\66\1\uffff\1\u01aa\2\66\1\u01ad\1\uffff\1\u01ae\1\u01af"+
-        "\3\uffff";
+        "\1\uffff\1\66\1\71\1\73\1\75\3\66\1\106\1\112\1\115\1\121\1\123\1\125\1\127\1\131\1\133\1\136\7\66\7\uffff\1\172\1\66\2\uffff\3\66\1\uffff\2\66\2\u008c\1\61\5\uffff\4\66\1\uffff\1\u0096\6\uffff\1\66\1\u0099\4\66\20\uffff\1\u00a2\5\uffff\1\u00a4\4\uffff\11\66\1\u00b0\6\66\1\u00b9\2\66\11\uffff\1\66\2\uffff\7\66\1\uffff\4\66\1\uffff\1\u008c\4\uffff\5\66\2\uffff\2\66\1\uffff\1\u00d1\1\u00d2\5\66\4\uffff\11\66\1\u00e2\1\66\1\uffff\1\66\1\u00e6\6\66\1\uffff\7\66\1\u00f6\5\66\1\u00fc\2\66\1\u00ff\6\66\2\uffff\4\66\1\u010a\2\66\1\u010d\7\66\1\uffff\3\66\1\uffff\6\66\1\u011e\2\66\1\u0121\5\66\1\uffff\1\u0127\4\66\1\uffff\1\u012c\1\66\1\uffff\1\u012e\1\u0130\5\66\1\u0136\2\66\1\uffff\1\u0139\1\66\1\uffff\1\66\1\u013d\1\u013e\5\66\1\u0144\2\66\1\u0147\2\66\1\u014a\1\66\1\uffff\1\u014c\1\u014d\1\uffff\5\66\1\uffff\3\66\1\u0156\1\uffff\1\66\1\uffff\1\66\1\uffff\1\u0159\4\66\1\uffff\1\u015e\1\66\1\uffff\2\66\1\u0162\2\uffff\1\u0163\1\66\1\u0165\2\66\1\uffff\2\66\1\uffff\1\u016a\1\66\1\uffff\1\u016c\2\uffff\5\66\1\u0172\1\66\1\u0174\1\uffff\1\u0175\1\66\1\uffff\2\66\1\u0179\1\u017a\1\uffff\1\66\1\u017c\1\66\2\uffff\1\66\1\uffff\3\66\1\u0182\1\uffff\1\u0183\1\uffff\4\66\1\u0188\1\uffff\1\66\2\uffff\1\66\1\u018b\1\66\2\uffff\1\66\1\uffff\5\66\2\uffff\1\u0193\1\66\1\u0195\1\66\1\uffff\1\u0197\1\66\1\uffff\1\u0199\1\66\1\u019b\2\66\1\u019e\1\u019f\1\uffff\1\u01a0\1\uffff\1\66\1\uffff\1\66\1\uffff\1\66\1\uffff\1\66\1\u01a5\3\uffff\4\66\1\uffff\1\u01aa\2\66\1\u01ad\1\uffff\1\u01ae\1\u01af\3\uffff";
     static final String DFA21_eofS =
         "\u01b0\uffff";
     static final String DFA21_minS =
-        "\1\0\1\141\1\75\1\174\1\46\1\145\2\141\1\53\1\55\2\52\3\75\1\76"+
-        "\2\56\1\154\1\160\1\146\1\141\1\145\1\146\1\150\7\uffff\1\72\1\162"+
-        "\2\uffff\2\145\1\146\1\uffff\1\150\1\164\2\60\1\44\5\uffff\1\154"+
-        "\1\156\1\147\1\154\1\uffff\1\75\6\uffff\1\143\1\44\2\154\1\162\1"+
-        "\163\20\uffff\1\75\5\uffff\1\74\4\uffff\1\164\1\163\1\141\1\160"+
-        "\1\141\1\151\1\156\1\160\1\143\1\44\1\154\1\162\1\156\1\146\1\164"+
-        "\1\157\1\44\1\164\1\151\11\uffff\1\157\2\uffff\1\146\1\156\1\137"+
-        "\1\167\1\154\1\146\1\145\1\uffff\1\160\1\162\1\165\1\162\1\uffff"+
-        "\1\60\4\uffff\1\145\1\147\1\150\1\165\1\141\2\uffff\1\162\1\141"+
-        "\1\uffff\2\44\1\163\1\165\1\162\1\145\1\143\4\uffff\2\145\1\164"+
-        "\1\145\1\143\1\164\1\143\1\157\1\164\1\44\1\162\1\uffff\1\163\1"+
-        "\44\1\141\1\145\1\157\1\167\1\145\1\165\1\uffff\1\150\1\154\1\165"+
-        "\1\164\1\145\1\146\1\162\1\44\1\154\1\163\1\162\1\145\1\157\1\44"+
-        "\1\145\1\151\1\44\1\145\1\164\1\162\1\164\1\145\1\165\2\uffff\1"+
-        "\145\1\164\1\155\1\145\1\44\1\150\1\156\1\44\1\151\1\162\1\145\1"+
-        "\143\1\150\1\162\1\141\1\uffff\2\145\1\141\1\uffff\1\154\1\144\1"+
-        "\162\1\145\1\162\1\156\1\44\1\145\1\160\1\44\1\167\1\157\1\160\1"+
-        "\151\1\145\1\uffff\1\44\1\145\1\162\1\157\1\167\1\uffff\1\44\1\156"+
-        "\1\uffff\2\44\1\156\1\151\1\155\1\154\1\170\1\44\2\156\1\uffff\1"+
-        "\44\1\144\1\uffff\1\143\2\44\1\150\1\162\1\164\1\156\1\155\1\44"+
-        "\1\164\1\154\1\44\2\145\1\44\1\144\1\uffff\2\44\1\uffff\2\162\1"+
-        "\141\1\156\1\141\1\uffff\1\164\1\151\1\146\1\44\1\uffff\1\147\1"+
-        "\uffff\1\160\1\uffff\1\44\1\166\1\145\2\164\1\uffff\1\44\1\164\1"+
-        "\uffff\1\163\1\151\1\44\2\uffff\1\44\1\157\1\44\1\143\1\145\1\uffff"+
-        "\1\164\1\171\1\uffff\1\44\1\156\1\uffff\1\44\2\uffff\1\141\1\155"+
-        "\1\143\1\145\1\153\1\44\1\144\1\44\1\uffff\1\44\1\141\1\uffff\1"+
-        "\145\1\156\2\44\1\uffff\1\103\1\44\1\157\2\uffff\1\156\1\uffff\1"+
-        "\145\1\156\1\145\1\44\1\uffff\1\44\1\uffff\1\160\1\141\1\145\1\167"+
-        "\1\44\1\uffff\1\145\2\uffff\1\144\1\44\1\164\2\uffff\1\157\1\uffff"+
-        "\1\156\1\151\1\157\1\164\1\162\2\uffff\1\44\1\164\1\44\1\162\1\uffff"+
-        "\1\44\1\144\1\uffff\1\44\1\154\1\44\1\172\1\146\2\44\1\uffff\1\44"+
-        "\1\uffff\1\141\1\uffff\1\151\1\uffff\1\165\1\uffff\1\145\1\44\3"+
-        "\uffff\1\160\1\156\1\155\1\144\1\uffff\1\44\1\147\1\156\1\44\1\uffff"+
-        "\2\44\3\uffff";
+        "\1\0\1\141\1\75\1\174\1\46\1\145\2\141\1\53\1\55\2\52\3\75\1\76\2\56\1\154\1\160\1\146\1\141\1\145\1\146\1\150\7\uffff\1\72\1\162\2\uffff\2\145\1\146\1\uffff\1\150\1\164\2\60\1\44\5\uffff\1\154\1\156\1\147\1\154\1\uffff\1\75\6\uffff\1\143\1\44\2\154\1\162\1\163\20\uffff\1\75\5\uffff\1\74\4\uffff\1\164\1\163\1\141\1\160\1\141\1\151\1\156\1\160\1\143\1\44\1\154\1\162\1\156\1\146\1\164\1\157\1\44\1\164\1\151\11\uffff\1\157\2\uffff\1\146\1\156\1\137\1\167\1\154\1\146\1\145\1\uffff\1\160\1\162\1\165\1\162\1\uffff\1\60\4\uffff\1\145\1\147\1\150\1\165\1\141\2\uffff\1\162\1\141\1\uffff\2\44\1\163\1\165\1\162\1\145\1\143\4\uffff\2\145\1\164\1\145\1\143\1\164\1\143\1\157\1\164\1\44\1\162\1\uffff\1\163\1\44\1\141\1\145\1\157\1\167\1\145\1\165\1\uffff\1\150\1\154\1\165\1\164\1\145\1\146\1\162\1\44\1\154\1\163\1\162\1\145\1\157\1\44\1\145\1\151\1\44\1\145\1\164\1\162\1\164\1\145\1\165\2\uffff\1\145\1\164\1\155\1\145\1\44\1\150\1\156\1\44\1\151\1\162\1\145\1\143\1\150\1\162\1\141\1\uffff\2\145\1\141\1\uffff\1\154\1\144\1\162\1\145\1\162\1\156\1\44\1\145\1\160\1\44\1\167\1\157\1\160\1\151\1\145\1\uffff\1\44\1\145\1\162\1\157\1\167\1\uffff\1\44\1\156\1\uffff\2\44\1\156\1\151\1\155\1\154\1\170\1\44\2\156\1\uffff\1\44\1\144\1\uffff\1\143\2\44\1\150\1\162\1\164\1\156\1\155\1\44\1\164\1\154\1\44\2\145\1\44\1\144\1\uffff\2\44\1\uffff\2\162\1\141\1\156\1\141\1\uffff\1\164\1\151\1\146\1\44\1\uffff\1\147\1\uffff\1\160\1\uffff\1\44\1\166\1\145\2\164\1\uffff\1\44\1\164\1\uffff\1\163\1\151\1\44\2\uffff\1\44\1\157\1\44\1\143\1\145\1\uffff\1\164\1\171\1\uffff\1\44\1\156\1\uffff\1\44\2\uffff\1\141\1\155\1\143\1\145\1\153\1\44\1\144\1\44\1\uffff\1\44\1\141\1\uffff\1\145\1\156\2\44\1\uffff\1\103\1\44\1\157\2\uffff\1\156\1\uffff\1\145\1\156\1\145\1\44\1\uffff\1\44\1\uffff\1\160\1\141\1\145\1\167\1\44\1\uffff\1\145\2\uffff\1\144\1\44\1\164\2\uffff\1\157\1\uffff\1\156\1\151\1\157\1\164\1\162\2\uffff\1\44\1\164\1\44\1\162\1\uffff\1\44\1\144\1\uffff\1\44\1\154\1\44\1\172\1\146\2\44\1\uffff\1\44\1\uffff\1\141\1\uffff\1\151\1\uffff\1\165\1\uffff\1\145\1\44\3\uffff\1\160\1\156\1\155\1\144\1\uffff\1\44\1\147\1\156\1\44\1\uffff\2\44\3\uffff";
     static final String DFA21_maxS =
-        "\1\uffff\1\165\1\76\1\174\1\46\1\157\1\141\1\165\1\75\1\76\5\75"+
-        "\1\76\1\56\1\72\1\170\1\171\1\156\1\157\1\145\1\163\1\151\7\uffff"+
-        "\1\72\1\162\2\uffff\1\151\1\165\1\166\1\uffff\1\171\1\164\1\170"+
-        "\1\154\1\172\5\uffff\1\154\1\156\1\147\1\164\1\uffff\1\75\6\uffff"+
-        "\1\146\1\172\1\162\1\156\1\162\1\164\20\uffff\1\75\5\uffff\1\74"+
-        "\4\uffff\1\164\1\163\1\141\1\160\1\141\1\151\1\156\1\160\1\164\1"+
-        "\172\1\154\1\162\1\170\2\164\1\157\1\172\1\164\1\151\11\uffff\1"+
-        "\157\2\uffff\1\146\1\156\1\142\1\167\1\154\1\146\1\145\1\uffff\1"+
-        "\160\1\162\1\171\1\162\1\uffff\1\154\4\uffff\1\145\1\147\1\150\1"+
-        "\165\1\141\2\uffff\1\162\1\141\1\uffff\2\172\1\164\1\165\1\162\1"+
-        "\145\1\143\4\uffff\2\145\1\164\1\145\1\143\1\164\1\143\1\157\1\164"+
-        "\1\172\1\162\1\uffff\1\163\1\172\1\141\1\145\1\157\1\167\1\145\1"+
-        "\165\1\uffff\1\150\1\154\1\165\1\164\1\145\1\163\1\162\1\172\1\154"+
-        "\1\163\1\162\1\145\1\157\1\172\1\145\1\151\1\172\1\145\1\164\1\162"+
-        "\1\164\1\145\1\165\2\uffff\1\145\1\164\1\155\1\145\1\172\1\150\1"+
-        "\156\1\172\1\151\1\162\1\145\1\143\1\150\1\162\1\141\1\uffff\2\145"+
-        "\1\141\1\uffff\1\154\1\144\1\162\1\145\1\162\1\156\1\172\1\145\1"+
-        "\160\1\172\1\167\1\157\1\160\1\151\1\145\1\uffff\1\172\1\145\1\162"+
-        "\1\157\1\167\1\uffff\1\172\1\156\1\uffff\2\172\1\156\1\151\1\155"+
-        "\1\154\1\170\1\172\2\156\1\uffff\1\172\1\163\1\uffff\1\143\2\172"+
-        "\1\150\1\162\1\164\1\156\1\155\1\172\1\164\1\154\1\172\2\145\1\172"+
-        "\1\144\1\uffff\2\172\1\uffff\2\162\1\141\1\156\1\141\1\uffff\1\164"+
-        "\1\151\1\146\1\172\1\uffff\1\147\1\uffff\1\160\1\uffff\1\172\1\166"+
-        "\1\145\2\164\1\uffff\1\172\1\164\1\uffff\1\163\1\151\1\172\2\uffff"+
-        "\1\172\1\157\1\172\1\143\1\145\1\uffff\1\164\1\171\1\uffff\1\172"+
-        "\1\156\1\uffff\1\172\2\uffff\1\141\1\155\1\143\1\145\1\153\1\172"+
-        "\1\144\1\172\1\uffff\1\172\1\141\1\uffff\1\145\1\156\2\172\1\uffff"+
-        "\1\103\1\172\1\157\2\uffff\1\156\1\uffff\1\145\1\156\1\145\1\172"+
-        "\1\uffff\1\172\1\uffff\1\160\1\141\1\145\1\167\1\172\1\uffff\1\145"+
-        "\2\uffff\1\144\1\172\1\164\2\uffff\1\157\1\uffff\1\156\1\151\1\157"+
-        "\1\164\1\162\2\uffff\1\172\1\164\1\172\1\162\1\uffff\1\172\1\144"+
-        "\1\uffff\1\172\1\154\2\172\1\146\2\172\1\uffff\1\172\1\uffff\1\141"+
-        "\1\uffff\1\151\1\uffff\1\165\1\uffff\1\145\1\172\3\uffff\1\160\1"+
-        "\156\1\155\1\144\1\uffff\1\172\1\147\1\156\1\172\1\uffff\2\172\3"+
-        "\uffff";
+        "\1\uffff\1\165\1\76\1\174\1\46\1\157\1\141\1\165\1\75\1\76\5\75\1\76\1\56\1\72\1\170\1\171\1\156\1\157\1\145\1\163\1\151\7\uffff\1\72\1\162\2\uffff\1\151\1\165\1\166\1\uffff\1\171\1\164\1\170\1\154\1\172\5\uffff\1\154\1\156\1\147\1\164\1\uffff\1\75\6\uffff\1\146\1\172\1\162\1\156\1\162\1\164\20\uffff\1\75\5\uffff\1\74\4\uffff\1\164\1\163\1\141\1\160\1\141\1\151\1\156\1\160\1\164\1\172\1\154\1\162\1\170\2\164\1\157\1\172\1\164\1\151\11\uffff\1\157\2\uffff\1\146\1\156\1\142\1\167\1\154\1\146\1\145\1\uffff\1\160\1\162\1\171\1\162\1\uffff\1\154\4\uffff\1\145\1\147\1\150\1\165\1\141\2\uffff\1\162\1\141\1\uffff\2\172\1\164\1\165\1\162\1\145\1\143\4\uffff\2\145\1\164\1\145\1\143\1\164\1\143\1\157\1\164\1\172\1\162\1\uffff\1\163\1\172\1\141\1\145\1\157\1\167\1\145\1\165\1\uffff\1\150\1\154\1\165\1\164\1\145\1\163\1\162\1\172\1\154\1\163\1\162\1\145\1\157\1\172\1\145\1\151\1\172\1\145\1\164\1\162\1\164\1\145\1\165\2\uffff\1\145\1\164\1\155\1\145\1\172\1\150\1\156\1\172\1\151\1\162\1\145\1\143\1\150\1\162\1\141\1\uffff\2\145\1\141\1\uffff\1\154\1\144\1\162\1\145\1\162\1\156\1\172\1\145\1\160\1\172\1\167\1\157\1\160\1\151\1\145\1\uffff\1\172\1\145\1\162\1\157\1\167\1\uffff\1\172\1\156\1\uffff\2\172\1\156\1\151\1\155\1\154\1\170\1\172\2\156\1\uffff\1\172\1\163\1\uffff\1\143\2\172\1\150\1\162\1\164\1\156\1\155\1\172\1\164\1\154\1\172\2\145\1\172\1\144\1\uffff\2\172\1\uffff\2\162\1\141\1\156\1\141\1\uffff\1\164\1\151\1\146\1\172\1\uffff\1\147\1\uffff\1\160\1\uffff\1\172\1\166\1\145\2\164\1\uffff\1\172\1\164\1\uffff\1\163\1\151\1\172\2\uffff\1\172\1\157\1\172\1\143\1\145\1\uffff\1\164\1\171\1\uffff\1\172\1\156\1\uffff\1\172\2\uffff\1\141\1\155\1\143\1\145\1\153\1\172\1\144\1\172\1\uffff\1\172\1\141\1\uffff\1\145\1\156\2\172\1\uffff\1\103\1\172\1\157\2\uffff\1\156\1\uffff\1\145\1\156\1\145\1\172\1\uffff\1\172\1\uffff\1\160\1\141\1\145\1\167\1\172\1\uffff\1\145\2\uffff\1\144\1\172\1\164\2\uffff\1\157\1\uffff\1\156\1\151\1\157\1\164\1\162\2\uffff\1\172\1\164\1\172\1\162\1\uffff\1\172\1\144\1\uffff\1\172\1\154\2\172\1\146\2\172\1\uffff\1\172\1\uffff\1\141\1\uffff\1\151\1\uffff\1\165\1\uffff\1\145\1\172\3\uffff\1\160\1\156\1\155\1\144\1\uffff\1\172\1\147\1\156\1\172\1\uffff\2\172\3\uffff";
     static final String DFA21_acceptS =
-        "\31\uffff\1\65\1\66\1\67\1\70\1\71\1\72\1\73\2\uffff\1\76\1\77"+
-        "\3\uffff\1\110\5\uffff\1\155\2\156\1\161\1\162\4\uffff\1\155\1\uffff"+
-        "\1\31\1\2\1\3\1\147\1\4\1\133\6\uffff\1\12\1\43\1\34\1\13\1\26\1"+
-        "\44\1\35\1\14\1\37\1\36\1\15\1\157\1\160\1\40\1\16\1\41\1\uffff"+
-        "\1\42\1\23\1\24\1\32\1\25\1\uffff\1\45\1\33\1\146\1\132\23\uffff"+
-        "\1\65\1\66\1\67\1\70\1\71\1\72\1\73\1\145\1\74\1\uffff\1\76\1\77"+
-        "\7\uffff\1\110\4\uffff\1\152\1\uffff\1\153\1\154\1\156\1\161\5\uffff"+
-        "\1\21\1\17\2\uffff\1\120\7\uffff\1\22\1\20\1\27\1\30\13\uffff\1"+
-        "\113\10\uffff\1\112\27\uffff\1\7\1\150\17\uffff\1\134\3\uffff\1"+
-        "\62\17\uffff\1\121\5\uffff\1\126\2\uffff\1\1\12\uffff\1\116\2\uffff"+
-        "\1\114\20\uffff\1\63\2\uffff\1\100\5\uffff\1\122\4\uffff\1\151\1"+
-        "\uffff\1\60\1\uffff\1\101\5\uffff\1\64\2\uffff\1\131\3\uffff\1\52"+
-        "\1\103\5\uffff\1\53\2\uffff\1\141\2\uffff\1\55\1\uffff\1\117\1\75"+
-        "\10\uffff\1\124\2\uffff\1\125\4\uffff\1\106\3\uffff\1\47\1\115\1"+
-        "\uffff\1\50\4\uffff\1\54\1\uffff\1\56\5\uffff\1\107\1\uffff\1\123"+
-        "\1\135\3\uffff\1\6\1\10\1\uffff\1\46\5\uffff\1\127\1\57\4\uffff"+
-        "\1\143\2\uffff\1\142\7\uffff\1\105\1\uffff\1\137\1\uffff\1\136\1"+
-        "\uffff\1\5\1\uffff\1\51\2\uffff\1\144\1\61\1\102\4\uffff\1\111\4"+
-        "\uffff\1\140\2\uffff\1\130\1\104\1\11";
+        "\31\uffff\1\65\1\66\1\67\1\70\1\71\1\72\1\73\2\uffff\1\76\1\77\3\uffff\1\110\5\uffff\1\155\2\156\1\161\1\162\4\uffff\1\155\1\uffff\1\31\1\2\1\3\1\147\1\4\1\133\6\uffff\1\12\1\43\1\34\1\13\1\26\1\44\1\35\1\14\1\37\1\36\1\15\1\157\1\160\1\40\1\16\1\41\1\uffff\1\42\1\23\1\24\1\32\1\25\1\uffff\1\45\1\33\1\146\1\132\23\uffff\1\65\1\66\1\67\1\70\1\71\1\72\1\73\1\145\1\74\1\uffff\1\76\1\77\7\uffff\1\110\4\uffff\1\153\1\uffff\1\152\1\154\1\156\1\161\5\uffff\1\21\1\17\2\uffff\1\120\7\uffff\1\22\1\20\1\27\1\30\13\uffff\1\113\10\uffff\1\112\27\uffff\1\7\1\150\17\uffff\1\134\3\uffff\1\62\17\uffff\1\121\5\uffff\1\126\2\uffff\1\1\12\uffff\1\116\2\uffff\1\114\20\uffff\1\63\2\uffff\1\100\5\uffff\1\122\4\uffff\1\151\1\uffff\1\60\1\uffff\1\101\5\uffff\1\64\2\uffff\1\131\3\uffff\1\52\1\103\5\uffff\1\53\2\uffff\1\141\2\uffff\1\55\1\uffff\1\117\1\75\10\uffff\1\124\2\uffff\1\125\4\uffff\1\106\3\uffff\1\47\1\115\1\uffff\1\50\4\uffff\1\54\1\uffff\1\56\5\uffff\1\107\1\uffff\1\123\1\135\3\uffff\1\6\1\10\1\uffff\1\46\5\uffff\1\127\1\57\4\uffff\1\143\2\uffff\1\142\7\uffff\1\105\1\uffff\1\137\1\uffff\1\136\1\uffff\1\5\1\uffff\1\51\2\uffff\1\144\1\61\1\102\4\uffff\1\111\4\uffff\1\140\2\uffff\1\130\1\104\1\11";
     static final String DFA21_specialS =
         "\1\0\u01af\uffff}>";
     static final String[] DFA21_transitionS = {
-            "\11\61\2\60\2\61\1\60\22\61\1\60\1\15\1\56\1\47\1\55\1\14\1"+
-            "\4\1\57\1\42\1\43\1\12\1\10\1\37\1\11\1\20\1\13\1\52\11\53\1"+
-            "\40\1\31\1\17\1\2\1\16\1\21\1\34\22\55\1\51\7\55\1\35\1\61\1"+
-            "\36\1\54\1\55\1\61\1\27\1\26\1\7\1\5\1\22\1\25\1\41\1\55\1\24"+
-            "\2\55\1\44\1\55\1\45\1\46\2\55\1\1\1\23\1\50\1\55\1\6\1\30\3"+
-            "\55\1\32\1\3\1\33\uff82\61",
+            "\11\61\2\60\2\61\1\60\22\61\1\60\1\15\1\56\1\47\1\55\1\14\1\4\1\57\1\42\1\43\1\12\1\10\1\37\1\11\1\20\1\13\1\52\11\53\1\40\1\31\1\17\1\2\1\16\1\21\1\34\22\55\1\51\7\55\1\35\1\61\1\36\1\54\1\55\1\61\1\27\1\26\1\7\1\5\1\22\1\25\1\41\1\55\1\24\2\55\1\44\1\55\1\45\1\46\2\55\1\1\1\23\1\50\1\55\1\6\1\30\3\55\1\32\1\3\1\33\uff82\61",
             "\1\63\3\uffff\1\65\3\uffff\1\64\13\uffff\1\62",
             "\1\67\1\70",
             "\1\72",
@@ -4142,12 +4029,8 @@ public void mTokens() throws RecognitionException {
             "",
             "\1\u0087\11\uffff\1\u0088\6\uffff\1\u0086",
             "\1\u0089",
-            "\12\u008b\10\uffff\1\u008d\1\uffff\3\u008d\5\uffff\1\u008d"+
-            "\13\uffff\1\u008a\6\uffff\1\u008b\2\uffff\1\u008d\1\uffff\3"+
-            "\u008d\5\uffff\1\u008d\13\uffff\1\u008a",
-            "\12\u008b\10\uffff\1\u008d\1\uffff\3\u008d\5\uffff\1\u008d"+
-            "\22\uffff\1\u008b\2\uffff\1\u008d\1\uffff\3\u008d\5\uffff\1"+
-            "\u008d",
+            "\12\u008b\10\uffff\1\u008d\1\uffff\3\u008d\5\uffff\1\u008d\13\uffff\1\u008a\6\uffff\1\u008b\2\uffff\1\u008d\1\uffff\3\u008d\5\uffff\1\u008d\13\uffff\1\u008a",
+            "\12\u008b\10\uffff\1\u008d\1\uffff\3\u008d\5\uffff\1\u008d\22\uffff\1\u008b\2\uffff\1\u008d\1\uffff\3\u008d\5\uffff\1\u008d",
             "\1\66\34\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "",
             "",
@@ -4167,8 +4050,7 @@ public void mTokens() throws RecognitionException {
             "",
             "",
             "\1\u0097\2\uffff\1\u0098",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "\1\u009a\5\uffff\1\u009b",
             "\1\u009d\1\uffff\1\u009c",
             "\1\u009e",
@@ -4209,16 +4091,14 @@ public void mTokens() throws RecognitionException {
             "\1\u00ab",
             "\1\u00ac",
             "\1\u00af\17\uffff\1\u00ad\1\u00ae",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "\1\u00b1",
             "\1\u00b2",
             "\1\u00b3\11\uffff\1\u00b4",
             "\1\u00b5\15\uffff\1\u00b6",
             "\1\u00b7",
             "\1\u00b8",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "\1\u00ba",
             "\1\u00bb",
             "",
@@ -4246,9 +4126,7 @@ public void mTokens() throws RecognitionException {
             "\1\u00c8\3\uffff\1\u00c7",
             "\1\u00c9",
             "",
-            "\12\u008b\10\uffff\1\u008d\1\uffff\3\u008d\5\uffff\1\u008d"+
-            "\22\uffff\1\u008b\2\uffff\1\u008d\1\uffff\3\u008d\5\uffff\1"+
-            "\u008d",
+            "\12\u008b\10\uffff\1\u008d\1\uffff\3\u008d\5\uffff\1\u008d\22\uffff\1\u008b\2\uffff\1\u008d\1\uffff\3\u008d\5\uffff\1\u008d",
             "",
             "",
             "",
@@ -4263,10 +4141,8 @@ public void mTokens() throws RecognitionException {
             "\1\u00cf",
             "\1\u00d0",
             "",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "\1\u00d4\1\u00d3",
             "\1\u00d5",
             "\1\u00d6",
@@ -4285,13 +4161,11 @@ public void mTokens() throws RecognitionException {
             "\1\u00df",
             "\1\u00e0",
             "\1\u00e1",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "\1\u00e3",
             "",
             "\1\u00e4",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\14"+
-            "\66\1\u00e5\15\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\14\66\1\u00e5\15\66",
             "\1\u00e7",
             "\1\u00e8",
             "\1\u00e9",
@@ -4306,19 +4180,16 @@ public void mTokens() throws RecognitionException {
             "\1\u00f1",
             "\1\u00f2\5\uffff\1\u00f4\6\uffff\1\u00f3",
             "\1\u00f5",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "\1\u00f7",
             "\1\u00f8",
             "\1\u00f9",
             "\1\u00fa",
             "\1\u00fb",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "\1\u00fd",
             "\1\u00fe",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "\1\u0100",
             "\1\u0101",
             "\1\u0102",
@@ -4331,12 +4202,10 @@ public void mTokens() throws RecognitionException {
             "\1\u0107",
             "\1\u0108",
             "\1\u0109",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "\1\u010b",
             "\1\u010c",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "\1\u010e",
             "\1\u010f",
             "\1\u0110",
@@ -4355,73 +4224,58 @@ public void mTokens() throws RecognitionException {
             "\1\u011b",
             "\1\u011c",
             "\1\u011d",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "\1\u011f",
             "\1\u0120",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "\1\u0122",
             "\1\u0123",
             "\1\u0124",
             "\1\u0125",
             "\1\u0126",
             "",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "\1\u0128",
             "\1\u0129",
             "\1\u012a",
             "\1\u012b",
             "",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "\1\u012d",
             "",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\u012f\1\uffff"+
-            "\32\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\u012f\1\uffff\32\66",
             "\1\u0131",
             "\1\u0132",
             "\1\u0133",
             "\1\u0134",
             "\1\u0135",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "\1\u0137",
             "\1\u0138",
             "",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "\1\u013a\16\uffff\1\u013b",
             "",
             "\1\u013c",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "\1\u013f",
             "\1\u0140",
             "\1\u0141",
             "\1\u0142",
             "\1\u0143",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "\1\u0145",
             "\1\u0146",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "\1\u0148",
             "\1\u0149",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "\1\u014b",
             "",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "",
             "\1\u014e",
             "\1\u014f",
@@ -4432,47 +4286,39 @@ public void mTokens() throws RecognitionException {
             "\1\u0153",
             "\1\u0154",
             "\1\u0155",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "",
             "\1\u0157",
             "",
             "\1\u0158",
             "",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "\1\u015a",
             "\1\u015b",
             "\1\u015c",
             "\1\u015d",
             "",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "\1\u015f",
             "",
             "\1\u0160",
             "\1\u0161",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "",
             "",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "\1\u0164",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "\1\u0166",
             "\1\u0167",
             "",
             "\1\u0168",
             "\1\u0169",
             "",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "\1\u016b",
             "",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "",
             "",
             "\1\u016d",
@@ -4480,26 +4326,20 @@ public void mTokens() throws RecognitionException {
             "\1\u016f",
             "\1\u0170",
             "\1\u0171",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "\1\u0173",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "\1\u0176",
             "",
             "\1\u0177",
             "\1\u0178",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "",
             "\1\u017b",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "\1\u017d",
             "",
             "",
@@ -4508,25 +4348,21 @@ public void mTokens() throws RecognitionException {
             "\1\u017f",
             "\1\u0180",
             "\1\u0181",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "",
             "\1\u0184",
             "\1\u0185",
             "\1\u0186",
             "\1\u0187",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "",
             "\1\u0189",
             "",
             "",
             "\1\u018a",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "\1\u018c",
             "",
             "",
@@ -4539,31 +4375,23 @@ public void mTokens() throws RecognitionException {
             "\1\u0192",
             "",
             "",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "\1\u0194",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "\1\u0196",
             "",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "\1\u0198",
             "",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "\1\u019a",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "\1\u019c",
             "\1\u019d",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "",
             "\1\u01a1",
             "",
@@ -4572,8 +4400,7 @@ public void mTokens() throws RecognitionException {
             "\1\u01a3",
             "",
             "\1\u01a4",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "",
             "",
             "",
@@ -4582,17 +4409,13 @@ public void mTokens() throws RecognitionException {
             "\1\u01a8",
             "\1\u01a9",
             "",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "\1\u01ab",
             "\1\u01ac",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
-            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32"+
-            "\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
+            "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66",
             "",
             "",
             ""
@@ -4628,7 +4451,7 @@ public DFA21(BaseRecognizer recognizer) {
             this.transition = DFA21_transition;
         }
         public String getDescription() {
-            return "1:1: Tokens : ( T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | T__97 | T__98 | T__99 | T__100 | T__101 | T__102 | T__103 | T__104 | T__105 | T__106 | T__107 | T__108 | T__109 | T__110 | T__111 | T__112 | T__113 | T__114 | T__115 | T__116 | T__117 | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
+            return "1:1: Tokens : ( T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | T__97 | T__98 | T__99 | T__100 | T__101 | T__102 | T__103 | T__104 | T__105 | T__106 | T__107 | T__108 | T__109 | T__110 | T__111 | T__112 | T__113 | T__114 | T__115 | T__116 | T__117 | RULE_INT | RULE_HEX | RULE_DECIMAL | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             IntStream input = _input;
diff --git a/com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormatParser.java b/com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormatParser.java
index 8f28d9e58..14246312a 100644
--- a/com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormatParser.java
+++ b/com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormatParser.java
@@ -155,7 +155,7 @@ public InternalFormatParser(TokenStream input, RecognizerSharedState state) {
         
 
     public String[] getTokenNames() { return InternalFormatParser.tokenNames; }
-    public String getGrammarFileName() { return "../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g"; }
+    public String getGrammarFileName() { return "InternalFormat.g"; }
 
 
      
@@ -179,16 +179,16 @@ protected String getValueForTokenName(String tokenName) {
 
 
     // $ANTLR start "entryRuleFormatConfiguration"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:61:1: entryRuleFormatConfiguration : ruleFormatConfiguration EOF ;
+    // InternalFormat.g:61:1: entryRuleFormatConfiguration : ruleFormatConfiguration EOF ;
     public final void entryRuleFormatConfiguration() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:62:1: ( ruleFormatConfiguration EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:63:1: ruleFormatConfiguration EOF
+            // InternalFormat.g:62:1: ( ruleFormatConfiguration EOF )
+            // InternalFormat.g:63:1: ruleFormatConfiguration EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormatConfigurationRule()); 
             }
-            pushFollow(FOLLOW_ruleFormatConfiguration_in_entryRuleFormatConfiguration67);
+            pushFollow(FOLLOW_1);
             ruleFormatConfiguration();
 
             state._fsp--;
@@ -196,7 +196,7 @@ public final void entryRuleFormatConfiguration() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getFormatConfigurationRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFormatConfiguration74); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -213,25 +213,25 @@ public final void entryRuleFormatConfiguration() throws RecognitionException {
 
 
     // $ANTLR start "ruleFormatConfiguration"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:70:1: ruleFormatConfiguration : ( ( rule__FormatConfiguration__Group__0 ) ) ;
+    // InternalFormat.g:70:1: ruleFormatConfiguration : ( ( rule__FormatConfiguration__Group__0 ) ) ;
     public final void ruleFormatConfiguration() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:74:2: ( ( ( rule__FormatConfiguration__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:75:1: ( ( rule__FormatConfiguration__Group__0 ) )
+            // InternalFormat.g:74:2: ( ( ( rule__FormatConfiguration__Group__0 ) ) )
+            // InternalFormat.g:75:1: ( ( rule__FormatConfiguration__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:75:1: ( ( rule__FormatConfiguration__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:76:1: ( rule__FormatConfiguration__Group__0 )
+            // InternalFormat.g:75:1: ( ( rule__FormatConfiguration__Group__0 ) )
+            // InternalFormat.g:76:1: ( rule__FormatConfiguration__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormatConfigurationAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:77:1: ( rule__FormatConfiguration__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:77:2: rule__FormatConfiguration__Group__0
+            // InternalFormat.g:77:1: ( rule__FormatConfiguration__Group__0 )
+            // InternalFormat.g:77:2: rule__FormatConfiguration__Group__0
             {
-            pushFollow(FOLLOW_rule__FormatConfiguration__Group__0_in_ruleFormatConfiguration100);
+            pushFollow(FOLLOW_2);
             rule__FormatConfiguration__Group__0();
 
             state._fsp--;
@@ -264,16 +264,16 @@ public final void ruleFormatConfiguration() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleConstant"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:89:1: entryRuleConstant : ruleConstant EOF ;
+    // InternalFormat.g:89:1: entryRuleConstant : ruleConstant EOF ;
     public final void entryRuleConstant() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:90:1: ( ruleConstant EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:91:1: ruleConstant EOF
+            // InternalFormat.g:90:1: ( ruleConstant EOF )
+            // InternalFormat.g:91:1: ruleConstant EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConstantRule()); 
             }
-            pushFollow(FOLLOW_ruleConstant_in_entryRuleConstant127);
+            pushFollow(FOLLOW_1);
             ruleConstant();
 
             state._fsp--;
@@ -281,7 +281,7 @@ public final void entryRuleConstant() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getConstantRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleConstant134); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -298,25 +298,25 @@ public final void entryRuleConstant() throws RecognitionException {
 
 
     // $ANTLR start "ruleConstant"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:98:1: ruleConstant : ( ( rule__Constant__Group__0 ) ) ;
+    // InternalFormat.g:98:1: ruleConstant : ( ( rule__Constant__Group__0 ) ) ;
     public final void ruleConstant() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:102:2: ( ( ( rule__Constant__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:103:1: ( ( rule__Constant__Group__0 ) )
+            // InternalFormat.g:102:2: ( ( ( rule__Constant__Group__0 ) ) )
+            // InternalFormat.g:103:1: ( ( rule__Constant__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:103:1: ( ( rule__Constant__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:104:1: ( rule__Constant__Group__0 )
+            // InternalFormat.g:103:1: ( ( rule__Constant__Group__0 ) )
+            // InternalFormat.g:104:1: ( rule__Constant__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConstantAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:105:1: ( rule__Constant__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:105:2: rule__Constant__Group__0
+            // InternalFormat.g:105:1: ( rule__Constant__Group__0 )
+            // InternalFormat.g:105:2: rule__Constant__Group__0
             {
-            pushFollow(FOLLOW_rule__Constant__Group__0_in_ruleConstant160);
+            pushFollow(FOLLOW_2);
             rule__Constant__Group__0();
 
             state._fsp--;
@@ -349,16 +349,16 @@ public final void ruleConstant() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleIntValue"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:117:1: entryRuleIntValue : ruleIntValue EOF ;
+    // InternalFormat.g:117:1: entryRuleIntValue : ruleIntValue EOF ;
     public final void entryRuleIntValue() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:118:1: ( ruleIntValue EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:119:1: ruleIntValue EOF
+            // InternalFormat.g:118:1: ( ruleIntValue EOF )
+            // InternalFormat.g:119:1: ruleIntValue EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIntValueRule()); 
             }
-            pushFollow(FOLLOW_ruleIntValue_in_entryRuleIntValue187);
+            pushFollow(FOLLOW_1);
             ruleIntValue();
 
             state._fsp--;
@@ -366,7 +366,7 @@ public final void entryRuleIntValue() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIntValueRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIntValue194); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -383,25 +383,25 @@ public final void entryRuleIntValue() throws RecognitionException {
 
 
     // $ANTLR start "ruleIntValue"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:126:1: ruleIntValue : ( ( rule__IntValue__Alternatives ) ) ;
+    // InternalFormat.g:126:1: ruleIntValue : ( ( rule__IntValue__Alternatives ) ) ;
     public final void ruleIntValue() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:130:2: ( ( ( rule__IntValue__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:131:1: ( ( rule__IntValue__Alternatives ) )
+            // InternalFormat.g:130:2: ( ( ( rule__IntValue__Alternatives ) ) )
+            // InternalFormat.g:131:1: ( ( rule__IntValue__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:131:1: ( ( rule__IntValue__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:132:1: ( rule__IntValue__Alternatives )
+            // InternalFormat.g:131:1: ( ( rule__IntValue__Alternatives ) )
+            // InternalFormat.g:132:1: ( rule__IntValue__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIntValueAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:133:1: ( rule__IntValue__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:133:2: rule__IntValue__Alternatives
+            // InternalFormat.g:133:1: ( rule__IntValue__Alternatives )
+            // InternalFormat.g:133:2: rule__IntValue__Alternatives
             {
-            pushFollow(FOLLOW_rule__IntValue__Alternatives_in_ruleIntValue220);
+            pushFollow(FOLLOW_2);
             rule__IntValue__Alternatives();
 
             state._fsp--;
@@ -434,16 +434,16 @@ public final void ruleIntValue() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleStringValue"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:145:1: entryRuleStringValue : ruleStringValue EOF ;
+    // InternalFormat.g:145:1: entryRuleStringValue : ruleStringValue EOF ;
     public final void entryRuleStringValue() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:146:1: ( ruleStringValue EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:147:1: ruleStringValue EOF
+            // InternalFormat.g:146:1: ( ruleStringValue EOF )
+            // InternalFormat.g:147:1: ruleStringValue EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getStringValueRule()); 
             }
-            pushFollow(FOLLOW_ruleStringValue_in_entryRuleStringValue247);
+            pushFollow(FOLLOW_1);
             ruleStringValue();
 
             state._fsp--;
@@ -451,7 +451,7 @@ public final void entryRuleStringValue() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getStringValueRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleStringValue254); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -468,25 +468,25 @@ public final void entryRuleStringValue() throws RecognitionException {
 
 
     // $ANTLR start "ruleStringValue"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:154:1: ruleStringValue : ( ( rule__StringValue__Alternatives ) ) ;
+    // InternalFormat.g:154:1: ruleStringValue : ( ( rule__StringValue__Alternatives ) ) ;
     public final void ruleStringValue() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:158:2: ( ( ( rule__StringValue__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:159:1: ( ( rule__StringValue__Alternatives ) )
+            // InternalFormat.g:158:2: ( ( ( rule__StringValue__Alternatives ) ) )
+            // InternalFormat.g:159:1: ( ( rule__StringValue__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:159:1: ( ( rule__StringValue__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:160:1: ( rule__StringValue__Alternatives )
+            // InternalFormat.g:159:1: ( ( rule__StringValue__Alternatives ) )
+            // InternalFormat.g:160:1: ( rule__StringValue__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getStringValueAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:161:1: ( rule__StringValue__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:161:2: rule__StringValue__Alternatives
+            // InternalFormat.g:161:1: ( rule__StringValue__Alternatives )
+            // InternalFormat.g:161:2: rule__StringValue__Alternatives
             {
-            pushFollow(FOLLOW_rule__StringValue__Alternatives_in_ruleStringValue280);
+            pushFollow(FOLLOW_2);
             rule__StringValue__Alternatives();
 
             state._fsp--;
@@ -519,16 +519,16 @@ public final void ruleStringValue() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleRule"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:173:1: entryRuleRule : ruleRule EOF ;
+    // InternalFormat.g:173:1: entryRuleRule : ruleRule EOF ;
     public final void entryRuleRule() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:174:1: ( ruleRule EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:175:1: ruleRule EOF
+            // InternalFormat.g:174:1: ( ruleRule EOF )
+            // InternalFormat.g:175:1: ruleRule EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRuleRule()); 
             }
-            pushFollow(FOLLOW_ruleRule_in_entryRuleRule307);
+            pushFollow(FOLLOW_1);
             ruleRule();
 
             state._fsp--;
@@ -536,7 +536,7 @@ public final void entryRuleRule() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getRuleRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRule314); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -553,25 +553,25 @@ public final void entryRuleRule() throws RecognitionException {
 
 
     // $ANTLR start "ruleRule"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:182:1: ruleRule : ( ( rule__Rule__Alternatives ) ) ;
+    // InternalFormat.g:182:1: ruleRule : ( ( rule__Rule__Alternatives ) ) ;
     public final void ruleRule() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:186:2: ( ( ( rule__Rule__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:187:1: ( ( rule__Rule__Alternatives ) )
+            // InternalFormat.g:186:2: ( ( ( rule__Rule__Alternatives ) ) )
+            // InternalFormat.g:187:1: ( ( rule__Rule__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:187:1: ( ( rule__Rule__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:188:1: ( rule__Rule__Alternatives )
+            // InternalFormat.g:187:1: ( ( rule__Rule__Alternatives ) )
+            // InternalFormat.g:188:1: ( rule__Rule__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRuleAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:189:1: ( rule__Rule__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:189:2: rule__Rule__Alternatives
+            // InternalFormat.g:189:1: ( rule__Rule__Alternatives )
+            // InternalFormat.g:189:2: rule__Rule__Alternatives
             {
-            pushFollow(FOLLOW_rule__Rule__Alternatives_in_ruleRule340);
+            pushFollow(FOLLOW_2);
             rule__Rule__Alternatives();
 
             state._fsp--;
@@ -604,16 +604,16 @@ public final void ruleRule() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleGrammarRule"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:201:1: entryRuleGrammarRule : ruleGrammarRule EOF ;
+    // InternalFormat.g:201:1: entryRuleGrammarRule : ruleGrammarRule EOF ;
     public final void entryRuleGrammarRule() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:202:1: ( ruleGrammarRule EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:203:1: ruleGrammarRule EOF
+            // InternalFormat.g:202:1: ( ruleGrammarRule EOF )
+            // InternalFormat.g:203:1: ruleGrammarRule EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGrammarRuleRule()); 
             }
-            pushFollow(FOLLOW_ruleGrammarRule_in_entryRuleGrammarRule367);
+            pushFollow(FOLLOW_1);
             ruleGrammarRule();
 
             state._fsp--;
@@ -621,7 +621,7 @@ public final void entryRuleGrammarRule() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGrammarRuleRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleGrammarRule374); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -638,25 +638,25 @@ public final void entryRuleGrammarRule() throws RecognitionException {
 
 
     // $ANTLR start "ruleGrammarRule"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:210:1: ruleGrammarRule : ( ( rule__GrammarRule__Group__0 ) ) ;
+    // InternalFormat.g:210:1: ruleGrammarRule : ( ( rule__GrammarRule__Group__0 ) ) ;
     public final void ruleGrammarRule() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:214:2: ( ( ( rule__GrammarRule__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:215:1: ( ( rule__GrammarRule__Group__0 ) )
+            // InternalFormat.g:214:2: ( ( ( rule__GrammarRule__Group__0 ) ) )
+            // InternalFormat.g:215:1: ( ( rule__GrammarRule__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:215:1: ( ( rule__GrammarRule__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:216:1: ( rule__GrammarRule__Group__0 )
+            // InternalFormat.g:215:1: ( ( rule__GrammarRule__Group__0 ) )
+            // InternalFormat.g:216:1: ( rule__GrammarRule__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGrammarRuleAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:217:1: ( rule__GrammarRule__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:217:2: rule__GrammarRule__Group__0
+            // InternalFormat.g:217:1: ( rule__GrammarRule__Group__0 )
+            // InternalFormat.g:217:2: rule__GrammarRule__Group__0
             {
-            pushFollow(FOLLOW_rule__GrammarRule__Group__0_in_ruleGrammarRule400);
+            pushFollow(FOLLOW_2);
             rule__GrammarRule__Group__0();
 
             state._fsp--;
@@ -689,16 +689,16 @@ public final void ruleGrammarRule() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleWildcardRule"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:229:1: entryRuleWildcardRule : ruleWildcardRule EOF ;
+    // InternalFormat.g:229:1: entryRuleWildcardRule : ruleWildcardRule EOF ;
     public final void entryRuleWildcardRule() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:230:1: ( ruleWildcardRule EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:231:1: ruleWildcardRule EOF
+            // InternalFormat.g:230:1: ( ruleWildcardRule EOF )
+            // InternalFormat.g:231:1: ruleWildcardRule EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getWildcardRuleRule()); 
             }
-            pushFollow(FOLLOW_ruleWildcardRule_in_entryRuleWildcardRule427);
+            pushFollow(FOLLOW_1);
             ruleWildcardRule();
 
             state._fsp--;
@@ -706,7 +706,7 @@ public final void entryRuleWildcardRule() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getWildcardRuleRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleWildcardRule434); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -723,25 +723,25 @@ public final void entryRuleWildcardRule() throws RecognitionException {
 
 
     // $ANTLR start "ruleWildcardRule"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:238:1: ruleWildcardRule : ( ( rule__WildcardRule__Group__0 ) ) ;
+    // InternalFormat.g:238:1: ruleWildcardRule : ( ( rule__WildcardRule__Group__0 ) ) ;
     public final void ruleWildcardRule() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:242:2: ( ( ( rule__WildcardRule__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:243:1: ( ( rule__WildcardRule__Group__0 ) )
+            // InternalFormat.g:242:2: ( ( ( rule__WildcardRule__Group__0 ) ) )
+            // InternalFormat.g:243:1: ( ( rule__WildcardRule__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:243:1: ( ( rule__WildcardRule__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:244:1: ( rule__WildcardRule__Group__0 )
+            // InternalFormat.g:243:1: ( ( rule__WildcardRule__Group__0 ) )
+            // InternalFormat.g:244:1: ( rule__WildcardRule__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getWildcardRuleAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:245:1: ( rule__WildcardRule__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:245:2: rule__WildcardRule__Group__0
+            // InternalFormat.g:245:1: ( rule__WildcardRule__Group__0 )
+            // InternalFormat.g:245:2: rule__WildcardRule__Group__0
             {
-            pushFollow(FOLLOW_rule__WildcardRule__Group__0_in_ruleWildcardRule460);
+            pushFollow(FOLLOW_2);
             rule__WildcardRule__Group__0();
 
             state._fsp--;
@@ -774,16 +774,16 @@ public final void ruleWildcardRule() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleGrammarRuleDirective"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:257:1: entryRuleGrammarRuleDirective : ruleGrammarRuleDirective EOF ;
+    // InternalFormat.g:257:1: entryRuleGrammarRuleDirective : ruleGrammarRuleDirective EOF ;
     public final void entryRuleGrammarRuleDirective() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:258:1: ( ruleGrammarRuleDirective EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:259:1: ruleGrammarRuleDirective EOF
+            // InternalFormat.g:258:1: ( ruleGrammarRuleDirective EOF )
+            // InternalFormat.g:259:1: ruleGrammarRuleDirective EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGrammarRuleDirectiveRule()); 
             }
-            pushFollow(FOLLOW_ruleGrammarRuleDirective_in_entryRuleGrammarRuleDirective487);
+            pushFollow(FOLLOW_1);
             ruleGrammarRuleDirective();
 
             state._fsp--;
@@ -791,7 +791,7 @@ public final void entryRuleGrammarRuleDirective() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGrammarRuleDirectiveRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleGrammarRuleDirective494); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -808,25 +808,25 @@ public final void entryRuleGrammarRuleDirective() throws RecognitionException {
 
 
     // $ANTLR start "ruleGrammarRuleDirective"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:266:1: ruleGrammarRuleDirective : ( ( rule__GrammarRuleDirective__Alternatives ) ) ;
+    // InternalFormat.g:266:1: ruleGrammarRuleDirective : ( ( rule__GrammarRuleDirective__Alternatives ) ) ;
     public final void ruleGrammarRuleDirective() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:270:2: ( ( ( rule__GrammarRuleDirective__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:271:1: ( ( rule__GrammarRuleDirective__Alternatives ) )
+            // InternalFormat.g:270:2: ( ( ( rule__GrammarRuleDirective__Alternatives ) ) )
+            // InternalFormat.g:271:1: ( ( rule__GrammarRuleDirective__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:271:1: ( ( rule__GrammarRuleDirective__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:272:1: ( rule__GrammarRuleDirective__Alternatives )
+            // InternalFormat.g:271:1: ( ( rule__GrammarRuleDirective__Alternatives ) )
+            // InternalFormat.g:272:1: ( rule__GrammarRuleDirective__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGrammarRuleDirectiveAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:273:1: ( rule__GrammarRuleDirective__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:273:2: rule__GrammarRuleDirective__Alternatives
+            // InternalFormat.g:273:1: ( rule__GrammarRuleDirective__Alternatives )
+            // InternalFormat.g:273:2: rule__GrammarRuleDirective__Alternatives
             {
-            pushFollow(FOLLOW_rule__GrammarRuleDirective__Alternatives_in_ruleGrammarRuleDirective520);
+            pushFollow(FOLLOW_2);
             rule__GrammarRuleDirective__Alternatives();
 
             state._fsp--;
@@ -859,16 +859,16 @@ public final void ruleGrammarRuleDirective() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleWildcardRuleDirective"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:285:1: entryRuleWildcardRuleDirective : ruleWildcardRuleDirective EOF ;
+    // InternalFormat.g:285:1: entryRuleWildcardRuleDirective : ruleWildcardRuleDirective EOF ;
     public final void entryRuleWildcardRuleDirective() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:286:1: ( ruleWildcardRuleDirective EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:287:1: ruleWildcardRuleDirective EOF
+            // InternalFormat.g:286:1: ( ruleWildcardRuleDirective EOF )
+            // InternalFormat.g:287:1: ruleWildcardRuleDirective EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getWildcardRuleDirectiveRule()); 
             }
-            pushFollow(FOLLOW_ruleWildcardRuleDirective_in_entryRuleWildcardRuleDirective547);
+            pushFollow(FOLLOW_1);
             ruleWildcardRuleDirective();
 
             state._fsp--;
@@ -876,7 +876,7 @@ public final void entryRuleWildcardRuleDirective() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getWildcardRuleDirectiveRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleWildcardRuleDirective554); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -893,25 +893,25 @@ public final void entryRuleWildcardRuleDirective() throws RecognitionException {
 
 
     // $ANTLR start "ruleWildcardRuleDirective"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:294:1: ruleWildcardRuleDirective : ( ( rule__WildcardRuleDirective__Alternatives ) ) ;
+    // InternalFormat.g:294:1: ruleWildcardRuleDirective : ( ( rule__WildcardRuleDirective__Alternatives ) ) ;
     public final void ruleWildcardRuleDirective() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:298:2: ( ( ( rule__WildcardRuleDirective__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:299:1: ( ( rule__WildcardRuleDirective__Alternatives ) )
+            // InternalFormat.g:298:2: ( ( ( rule__WildcardRuleDirective__Alternatives ) ) )
+            // InternalFormat.g:299:1: ( ( rule__WildcardRuleDirective__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:299:1: ( ( rule__WildcardRuleDirective__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:300:1: ( rule__WildcardRuleDirective__Alternatives )
+            // InternalFormat.g:299:1: ( ( rule__WildcardRuleDirective__Alternatives ) )
+            // InternalFormat.g:300:1: ( rule__WildcardRuleDirective__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getWildcardRuleDirectiveAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:301:1: ( rule__WildcardRuleDirective__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:301:2: rule__WildcardRuleDirective__Alternatives
+            // InternalFormat.g:301:1: ( rule__WildcardRuleDirective__Alternatives )
+            // InternalFormat.g:301:2: rule__WildcardRuleDirective__Alternatives
             {
-            pushFollow(FOLLOW_rule__WildcardRuleDirective__Alternatives_in_ruleWildcardRuleDirective580);
+            pushFollow(FOLLOW_2);
             rule__WildcardRuleDirective__Alternatives();
 
             state._fsp--;
@@ -944,16 +944,16 @@ public final void ruleWildcardRuleDirective() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleGrammarElementReference"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:313:1: entryRuleGrammarElementReference : ruleGrammarElementReference EOF ;
+    // InternalFormat.g:313:1: entryRuleGrammarElementReference : ruleGrammarElementReference EOF ;
     public final void entryRuleGrammarElementReference() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:314:1: ( ruleGrammarElementReference EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:315:1: ruleGrammarElementReference EOF
+            // InternalFormat.g:314:1: ( ruleGrammarElementReference EOF )
+            // InternalFormat.g:315:1: ruleGrammarElementReference EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGrammarElementReferenceRule()); 
             }
-            pushFollow(FOLLOW_ruleGrammarElementReference_in_entryRuleGrammarElementReference607);
+            pushFollow(FOLLOW_1);
             ruleGrammarElementReference();
 
             state._fsp--;
@@ -961,7 +961,7 @@ public final void entryRuleGrammarElementReference() throws RecognitionException
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGrammarElementReferenceRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleGrammarElementReference614); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -978,25 +978,25 @@ public final void entryRuleGrammarElementReference() throws RecognitionException
 
 
     // $ANTLR start "ruleGrammarElementReference"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:322:1: ruleGrammarElementReference : ( ( rule__GrammarElementReference__Alternatives ) ) ;
+    // InternalFormat.g:322:1: ruleGrammarElementReference : ( ( rule__GrammarElementReference__Alternatives ) ) ;
     public final void ruleGrammarElementReference() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:326:2: ( ( ( rule__GrammarElementReference__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:327:1: ( ( rule__GrammarElementReference__Alternatives ) )
+            // InternalFormat.g:326:2: ( ( ( rule__GrammarElementReference__Alternatives ) ) )
+            // InternalFormat.g:327:1: ( ( rule__GrammarElementReference__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:327:1: ( ( rule__GrammarElementReference__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:328:1: ( rule__GrammarElementReference__Alternatives )
+            // InternalFormat.g:327:1: ( ( rule__GrammarElementReference__Alternatives ) )
+            // InternalFormat.g:328:1: ( rule__GrammarElementReference__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGrammarElementReferenceAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:329:1: ( rule__GrammarElementReference__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:329:2: rule__GrammarElementReference__Alternatives
+            // InternalFormat.g:329:1: ( rule__GrammarElementReference__Alternatives )
+            // InternalFormat.g:329:2: rule__GrammarElementReference__Alternatives
             {
-            pushFollow(FOLLOW_rule__GrammarElementReference__Alternatives_in_ruleGrammarElementReference640);
+            pushFollow(FOLLOW_2);
             rule__GrammarElementReference__Alternatives();
 
             state._fsp--;
@@ -1029,16 +1029,16 @@ public final void ruleGrammarElementReference() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleGrammarElementLookup"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:341:1: entryRuleGrammarElementLookup : ruleGrammarElementLookup EOF ;
+    // InternalFormat.g:341:1: entryRuleGrammarElementLookup : ruleGrammarElementLookup EOF ;
     public final void entryRuleGrammarElementLookup() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:342:1: ( ruleGrammarElementLookup EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:343:1: ruleGrammarElementLookup EOF
+            // InternalFormat.g:342:1: ( ruleGrammarElementLookup EOF )
+            // InternalFormat.g:343:1: ruleGrammarElementLookup EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGrammarElementLookupRule()); 
             }
-            pushFollow(FOLLOW_ruleGrammarElementLookup_in_entryRuleGrammarElementLookup667);
+            pushFollow(FOLLOW_1);
             ruleGrammarElementLookup();
 
             state._fsp--;
@@ -1046,7 +1046,7 @@ public final void entryRuleGrammarElementLookup() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGrammarElementLookupRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleGrammarElementLookup674); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1063,25 +1063,25 @@ public final void entryRuleGrammarElementLookup() throws RecognitionException {
 
 
     // $ANTLR start "ruleGrammarElementLookup"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:350:1: ruleGrammarElementLookup : ( ( rule__GrammarElementLookup__Alternatives ) ) ;
+    // InternalFormat.g:350:1: ruleGrammarElementLookup : ( ( rule__GrammarElementLookup__Alternatives ) ) ;
     public final void ruleGrammarElementLookup() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:354:2: ( ( ( rule__GrammarElementLookup__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:355:1: ( ( rule__GrammarElementLookup__Alternatives ) )
+            // InternalFormat.g:354:2: ( ( ( rule__GrammarElementLookup__Alternatives ) ) )
+            // InternalFormat.g:355:1: ( ( rule__GrammarElementLookup__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:355:1: ( ( rule__GrammarElementLookup__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:356:1: ( rule__GrammarElementLookup__Alternatives )
+            // InternalFormat.g:355:1: ( ( rule__GrammarElementLookup__Alternatives ) )
+            // InternalFormat.g:356:1: ( rule__GrammarElementLookup__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGrammarElementLookupAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:357:1: ( rule__GrammarElementLookup__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:357:2: rule__GrammarElementLookup__Alternatives
+            // InternalFormat.g:357:1: ( rule__GrammarElementLookup__Alternatives )
+            // InternalFormat.g:357:2: rule__GrammarElementLookup__Alternatives
             {
-            pushFollow(FOLLOW_rule__GrammarElementLookup__Alternatives_in_ruleGrammarElementLookup700);
+            pushFollow(FOLLOW_2);
             rule__GrammarElementLookup__Alternatives();
 
             state._fsp--;
@@ -1114,16 +1114,16 @@ public final void ruleGrammarElementLookup() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleContextFreeDirective"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:369:1: entryRuleContextFreeDirective : ruleContextFreeDirective EOF ;
+    // InternalFormat.g:369:1: entryRuleContextFreeDirective : ruleContextFreeDirective EOF ;
     public final void entryRuleContextFreeDirective() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:370:1: ( ruleContextFreeDirective EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:371:1: ruleContextFreeDirective EOF
+            // InternalFormat.g:370:1: ( ruleContextFreeDirective EOF )
+            // InternalFormat.g:371:1: ruleContextFreeDirective EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getContextFreeDirectiveRule()); 
             }
-            pushFollow(FOLLOW_ruleContextFreeDirective_in_entryRuleContextFreeDirective727);
+            pushFollow(FOLLOW_1);
             ruleContextFreeDirective();
 
             state._fsp--;
@@ -1131,7 +1131,7 @@ public final void entryRuleContextFreeDirective() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getContextFreeDirectiveRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleContextFreeDirective734); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1148,25 +1148,25 @@ public final void entryRuleContextFreeDirective() throws RecognitionException {
 
 
     // $ANTLR start "ruleContextFreeDirective"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:378:1: ruleContextFreeDirective : ( ( rule__ContextFreeDirective__Group__0 ) ) ;
+    // InternalFormat.g:378:1: ruleContextFreeDirective : ( ( rule__ContextFreeDirective__Group__0 ) ) ;
     public final void ruleContextFreeDirective() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:382:2: ( ( ( rule__ContextFreeDirective__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:383:1: ( ( rule__ContextFreeDirective__Group__0 ) )
+            // InternalFormat.g:382:2: ( ( ( rule__ContextFreeDirective__Group__0 ) ) )
+            // InternalFormat.g:383:1: ( ( rule__ContextFreeDirective__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:383:1: ( ( rule__ContextFreeDirective__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:384:1: ( rule__ContextFreeDirective__Group__0 )
+            // InternalFormat.g:383:1: ( ( rule__ContextFreeDirective__Group__0 ) )
+            // InternalFormat.g:384:1: ( rule__ContextFreeDirective__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getContextFreeDirectiveAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:385:1: ( rule__ContextFreeDirective__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:385:2: rule__ContextFreeDirective__Group__0
+            // InternalFormat.g:385:1: ( rule__ContextFreeDirective__Group__0 )
+            // InternalFormat.g:385:2: rule__ContextFreeDirective__Group__0
             {
-            pushFollow(FOLLOW_rule__ContextFreeDirective__Group__0_in_ruleContextFreeDirective760);
+            pushFollow(FOLLOW_2);
             rule__ContextFreeDirective__Group__0();
 
             state._fsp--;
@@ -1199,16 +1199,16 @@ public final void ruleContextFreeDirective() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleSpecificDirective"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:397:1: entryRuleSpecificDirective : ruleSpecificDirective EOF ;
+    // InternalFormat.g:397:1: entryRuleSpecificDirective : ruleSpecificDirective EOF ;
     public final void entryRuleSpecificDirective() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:398:1: ( ruleSpecificDirective EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:399:1: ruleSpecificDirective EOF
+            // InternalFormat.g:398:1: ( ruleSpecificDirective EOF )
+            // InternalFormat.g:399:1: ruleSpecificDirective EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSpecificDirectiveRule()); 
             }
-            pushFollow(FOLLOW_ruleSpecificDirective_in_entryRuleSpecificDirective787);
+            pushFollow(FOLLOW_1);
             ruleSpecificDirective();
 
             state._fsp--;
@@ -1216,7 +1216,7 @@ public final void entryRuleSpecificDirective() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSpecificDirectiveRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSpecificDirective794); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1233,25 +1233,25 @@ public final void entryRuleSpecificDirective() throws RecognitionException {
 
 
     // $ANTLR start "ruleSpecificDirective"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:406:1: ruleSpecificDirective : ( ( rule__SpecificDirective__Group__0 ) ) ;
+    // InternalFormat.g:406:1: ruleSpecificDirective : ( ( rule__SpecificDirective__Group__0 ) ) ;
     public final void ruleSpecificDirective() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:410:2: ( ( ( rule__SpecificDirective__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:411:1: ( ( rule__SpecificDirective__Group__0 ) )
+            // InternalFormat.g:410:2: ( ( ( rule__SpecificDirective__Group__0 ) ) )
+            // InternalFormat.g:411:1: ( ( rule__SpecificDirective__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:411:1: ( ( rule__SpecificDirective__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:412:1: ( rule__SpecificDirective__Group__0 )
+            // InternalFormat.g:411:1: ( ( rule__SpecificDirective__Group__0 ) )
+            // InternalFormat.g:412:1: ( rule__SpecificDirective__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSpecificDirectiveAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:413:1: ( rule__SpecificDirective__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:413:2: rule__SpecificDirective__Group__0
+            // InternalFormat.g:413:1: ( rule__SpecificDirective__Group__0 )
+            // InternalFormat.g:413:2: rule__SpecificDirective__Group__0
             {
-            pushFollow(FOLLOW_rule__SpecificDirective__Group__0_in_ruleSpecificDirective820);
+            pushFollow(FOLLOW_2);
             rule__SpecificDirective__Group__0();
 
             state._fsp--;
@@ -1284,16 +1284,16 @@ public final void ruleSpecificDirective() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleMatcherList"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:425:1: entryRuleMatcherList : ruleMatcherList EOF ;
+    // InternalFormat.g:425:1: entryRuleMatcherList : ruleMatcherList EOF ;
     public final void entryRuleMatcherList() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:426:1: ( ruleMatcherList EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:427:1: ruleMatcherList EOF
+            // InternalFormat.g:426:1: ( ruleMatcherList EOF )
+            // InternalFormat.g:427:1: ruleMatcherList EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMatcherListRule()); 
             }
-            pushFollow(FOLLOW_ruleMatcherList_in_entryRuleMatcherList847);
+            pushFollow(FOLLOW_1);
             ruleMatcherList();
 
             state._fsp--;
@@ -1301,7 +1301,7 @@ public final void entryRuleMatcherList() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getMatcherListRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleMatcherList854); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1318,25 +1318,25 @@ public final void entryRuleMatcherList() throws RecognitionException {
 
 
     // $ANTLR start "ruleMatcherList"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:434:1: ruleMatcherList : ( ( rule__MatcherList__Group__0 ) ) ;
+    // InternalFormat.g:434:1: ruleMatcherList : ( ( rule__MatcherList__Group__0 ) ) ;
     public final void ruleMatcherList() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:438:2: ( ( ( rule__MatcherList__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:439:1: ( ( rule__MatcherList__Group__0 ) )
+            // InternalFormat.g:438:2: ( ( ( rule__MatcherList__Group__0 ) ) )
+            // InternalFormat.g:439:1: ( ( rule__MatcherList__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:439:1: ( ( rule__MatcherList__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:440:1: ( rule__MatcherList__Group__0 )
+            // InternalFormat.g:439:1: ( ( rule__MatcherList__Group__0 ) )
+            // InternalFormat.g:440:1: ( rule__MatcherList__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMatcherListAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:441:1: ( rule__MatcherList__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:441:2: rule__MatcherList__Group__0
+            // InternalFormat.g:441:1: ( rule__MatcherList__Group__0 )
+            // InternalFormat.g:441:2: rule__MatcherList__Group__0
             {
-            pushFollow(FOLLOW_rule__MatcherList__Group__0_in_ruleMatcherList880);
+            pushFollow(FOLLOW_2);
             rule__MatcherList__Group__0();
 
             state._fsp--;
@@ -1369,16 +1369,16 @@ public final void ruleMatcherList() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleGroupBlock"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:453:1: entryRuleGroupBlock : ruleGroupBlock EOF ;
+    // InternalFormat.g:453:1: entryRuleGroupBlock : ruleGroupBlock EOF ;
     public final void entryRuleGroupBlock() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:454:1: ( ruleGroupBlock EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:455:1: ruleGroupBlock EOF
+            // InternalFormat.g:454:1: ( ruleGroupBlock EOF )
+            // InternalFormat.g:455:1: ruleGroupBlock EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGroupBlockRule()); 
             }
-            pushFollow(FOLLOW_ruleGroupBlock_in_entryRuleGroupBlock907);
+            pushFollow(FOLLOW_1);
             ruleGroupBlock();
 
             state._fsp--;
@@ -1386,7 +1386,7 @@ public final void entryRuleGroupBlock() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGroupBlockRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleGroupBlock914); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1403,25 +1403,25 @@ public final void entryRuleGroupBlock() throws RecognitionException {
 
 
     // $ANTLR start "ruleGroupBlock"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:462:1: ruleGroupBlock : ( ( rule__GroupBlock__Group__0 ) ) ;
+    // InternalFormat.g:462:1: ruleGroupBlock : ( ( rule__GroupBlock__Group__0 ) ) ;
     public final void ruleGroupBlock() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:466:2: ( ( ( rule__GroupBlock__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:467:1: ( ( rule__GroupBlock__Group__0 ) )
+            // InternalFormat.g:466:2: ( ( ( rule__GroupBlock__Group__0 ) ) )
+            // InternalFormat.g:467:1: ( ( rule__GroupBlock__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:467:1: ( ( rule__GroupBlock__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:468:1: ( rule__GroupBlock__Group__0 )
+            // InternalFormat.g:467:1: ( ( rule__GroupBlock__Group__0 ) )
+            // InternalFormat.g:468:1: ( rule__GroupBlock__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGroupBlockAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:469:1: ( rule__GroupBlock__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:469:2: rule__GroupBlock__Group__0
+            // InternalFormat.g:469:1: ( rule__GroupBlock__Group__0 )
+            // InternalFormat.g:469:2: rule__GroupBlock__Group__0
             {
-            pushFollow(FOLLOW_rule__GroupBlock__Group__0_in_ruleGroupBlock940);
+            pushFollow(FOLLOW_2);
             rule__GroupBlock__Group__0();
 
             state._fsp--;
@@ -1454,16 +1454,16 @@ public final void ruleGroupBlock() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleKeywordPair"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:481:1: entryRuleKeywordPair : ruleKeywordPair EOF ;
+    // InternalFormat.g:481:1: entryRuleKeywordPair : ruleKeywordPair EOF ;
     public final void entryRuleKeywordPair() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:482:1: ( ruleKeywordPair EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:483:1: ruleKeywordPair EOF
+            // InternalFormat.g:482:1: ( ruleKeywordPair EOF )
+            // InternalFormat.g:483:1: ruleKeywordPair EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getKeywordPairRule()); 
             }
-            pushFollow(FOLLOW_ruleKeywordPair_in_entryRuleKeywordPair967);
+            pushFollow(FOLLOW_1);
             ruleKeywordPair();
 
             state._fsp--;
@@ -1471,7 +1471,7 @@ public final void entryRuleKeywordPair() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getKeywordPairRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleKeywordPair974); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1488,25 +1488,25 @@ public final void entryRuleKeywordPair() throws RecognitionException {
 
 
     // $ANTLR start "ruleKeywordPair"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:490:1: ruleKeywordPair : ( ( rule__KeywordPair__Group__0 ) ) ;
+    // InternalFormat.g:490:1: ruleKeywordPair : ( ( rule__KeywordPair__Group__0 ) ) ;
     public final void ruleKeywordPair() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:494:2: ( ( ( rule__KeywordPair__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:495:1: ( ( rule__KeywordPair__Group__0 ) )
+            // InternalFormat.g:494:2: ( ( ( rule__KeywordPair__Group__0 ) ) )
+            // InternalFormat.g:495:1: ( ( rule__KeywordPair__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:495:1: ( ( rule__KeywordPair__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:496:1: ( rule__KeywordPair__Group__0 )
+            // InternalFormat.g:495:1: ( ( rule__KeywordPair__Group__0 ) )
+            // InternalFormat.g:496:1: ( rule__KeywordPair__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getKeywordPairAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:497:1: ( rule__KeywordPair__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:497:2: rule__KeywordPair__Group__0
+            // InternalFormat.g:497:1: ( rule__KeywordPair__Group__0 )
+            // InternalFormat.g:497:2: rule__KeywordPair__Group__0
             {
-            pushFollow(FOLLOW_rule__KeywordPair__Group__0_in_ruleKeywordPair1000);
+            pushFollow(FOLLOW_2);
             rule__KeywordPair__Group__0();
 
             state._fsp--;
@@ -1539,16 +1539,16 @@ public final void ruleKeywordPair() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleMatcher"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:509:1: entryRuleMatcher : ruleMatcher EOF ;
+    // InternalFormat.g:509:1: entryRuleMatcher : ruleMatcher EOF ;
     public final void entryRuleMatcher() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:510:1: ( ruleMatcher EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:511:1: ruleMatcher EOF
+            // InternalFormat.g:510:1: ( ruleMatcher EOF )
+            // InternalFormat.g:511:1: ruleMatcher EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMatcherRule()); 
             }
-            pushFollow(FOLLOW_ruleMatcher_in_entryRuleMatcher1027);
+            pushFollow(FOLLOW_1);
             ruleMatcher();
 
             state._fsp--;
@@ -1556,7 +1556,7 @@ public final void entryRuleMatcher() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getMatcherRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleMatcher1034); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1573,25 +1573,25 @@ public final void entryRuleMatcher() throws RecognitionException {
 
 
     // $ANTLR start "ruleMatcher"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:518:1: ruleMatcher : ( ( rule__Matcher__Group__0 ) ) ;
+    // InternalFormat.g:518:1: ruleMatcher : ( ( rule__Matcher__Group__0 ) ) ;
     public final void ruleMatcher() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:522:2: ( ( ( rule__Matcher__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:523:1: ( ( rule__Matcher__Group__0 ) )
+            // InternalFormat.g:522:2: ( ( ( rule__Matcher__Group__0 ) ) )
+            // InternalFormat.g:523:1: ( ( rule__Matcher__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:523:1: ( ( rule__Matcher__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:524:1: ( rule__Matcher__Group__0 )
+            // InternalFormat.g:523:1: ( ( rule__Matcher__Group__0 ) )
+            // InternalFormat.g:524:1: ( rule__Matcher__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMatcherAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:525:1: ( rule__Matcher__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:525:2: rule__Matcher__Group__0
+            // InternalFormat.g:525:1: ( rule__Matcher__Group__0 )
+            // InternalFormat.g:525:2: rule__Matcher__Group__0
             {
-            pushFollow(FOLLOW_rule__Matcher__Group__0_in_ruleMatcher1060);
+            pushFollow(FOLLOW_2);
             rule__Matcher__Group__0();
 
             state._fsp--;
@@ -1624,16 +1624,16 @@ public final void ruleMatcher() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleLocator"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:537:1: entryRuleLocator : ruleLocator EOF ;
+    // InternalFormat.g:537:1: entryRuleLocator : ruleLocator EOF ;
     public final void entryRuleLocator() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:538:1: ( ruleLocator EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:539:1: ruleLocator EOF
+            // InternalFormat.g:538:1: ( ruleLocator EOF )
+            // InternalFormat.g:539:1: ruleLocator EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLocatorRule()); 
             }
-            pushFollow(FOLLOW_ruleLocator_in_entryRuleLocator1087);
+            pushFollow(FOLLOW_1);
             ruleLocator();
 
             state._fsp--;
@@ -1641,7 +1641,7 @@ public final void entryRuleLocator() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getLocatorRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleLocator1094); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1658,25 +1658,25 @@ public final void entryRuleLocator() throws RecognitionException {
 
 
     // $ANTLR start "ruleLocator"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:546:1: ruleLocator : ( ( rule__Locator__Alternatives ) ) ;
+    // InternalFormat.g:546:1: ruleLocator : ( ( rule__Locator__Alternatives ) ) ;
     public final void ruleLocator() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:550:2: ( ( ( rule__Locator__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:551:1: ( ( rule__Locator__Alternatives ) )
+            // InternalFormat.g:550:2: ( ( ( rule__Locator__Alternatives ) ) )
+            // InternalFormat.g:551:1: ( ( rule__Locator__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:551:1: ( ( rule__Locator__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:552:1: ( rule__Locator__Alternatives )
+            // InternalFormat.g:551:1: ( ( rule__Locator__Alternatives ) )
+            // InternalFormat.g:552:1: ( rule__Locator__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLocatorAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:553:1: ( rule__Locator__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:553:2: rule__Locator__Alternatives
+            // InternalFormat.g:553:1: ( rule__Locator__Alternatives )
+            // InternalFormat.g:553:2: rule__Locator__Alternatives
             {
-            pushFollow(FOLLOW_rule__Locator__Alternatives_in_ruleLocator1120);
+            pushFollow(FOLLOW_2);
             rule__Locator__Alternatives();
 
             state._fsp--;
@@ -1709,16 +1709,16 @@ public final void ruleLocator() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleNoFormatLocator"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:565:1: entryRuleNoFormatLocator : ruleNoFormatLocator EOF ;
+    // InternalFormat.g:565:1: entryRuleNoFormatLocator : ruleNoFormatLocator EOF ;
     public final void entryRuleNoFormatLocator() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:566:1: ( ruleNoFormatLocator EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:567:1: ruleNoFormatLocator EOF
+            // InternalFormat.g:566:1: ( ruleNoFormatLocator EOF )
+            // InternalFormat.g:567:1: ruleNoFormatLocator EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNoFormatLocatorRule()); 
             }
-            pushFollow(FOLLOW_ruleNoFormatLocator_in_entryRuleNoFormatLocator1147);
+            pushFollow(FOLLOW_1);
             ruleNoFormatLocator();
 
             state._fsp--;
@@ -1726,7 +1726,7 @@ public final void entryRuleNoFormatLocator() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getNoFormatLocatorRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNoFormatLocator1154); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1743,25 +1743,25 @@ public final void entryRuleNoFormatLocator() throws RecognitionException {
 
 
     // $ANTLR start "ruleNoFormatLocator"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:574:1: ruleNoFormatLocator : ( ( rule__NoFormatLocator__Group__0 ) ) ;
+    // InternalFormat.g:574:1: ruleNoFormatLocator : ( ( rule__NoFormatLocator__Group__0 ) ) ;
     public final void ruleNoFormatLocator() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:578:2: ( ( ( rule__NoFormatLocator__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:579:1: ( ( rule__NoFormatLocator__Group__0 ) )
+            // InternalFormat.g:578:2: ( ( ( rule__NoFormatLocator__Group__0 ) ) )
+            // InternalFormat.g:579:1: ( ( rule__NoFormatLocator__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:579:1: ( ( rule__NoFormatLocator__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:580:1: ( rule__NoFormatLocator__Group__0 )
+            // InternalFormat.g:579:1: ( ( rule__NoFormatLocator__Group__0 ) )
+            // InternalFormat.g:580:1: ( rule__NoFormatLocator__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNoFormatLocatorAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:581:1: ( rule__NoFormatLocator__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:581:2: rule__NoFormatLocator__Group__0
+            // InternalFormat.g:581:1: ( rule__NoFormatLocator__Group__0 )
+            // InternalFormat.g:581:2: rule__NoFormatLocator__Group__0
             {
-            pushFollow(FOLLOW_rule__NoFormatLocator__Group__0_in_ruleNoFormatLocator1180);
+            pushFollow(FOLLOW_2);
             rule__NoFormatLocator__Group__0();
 
             state._fsp--;
@@ -1794,16 +1794,16 @@ public final void ruleNoFormatLocator() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleSpaceLocator"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:593:1: entryRuleSpaceLocator : ruleSpaceLocator EOF ;
+    // InternalFormat.g:593:1: entryRuleSpaceLocator : ruleSpaceLocator EOF ;
     public final void entryRuleSpaceLocator() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:594:1: ( ruleSpaceLocator EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:595:1: ruleSpaceLocator EOF
+            // InternalFormat.g:594:1: ( ruleSpaceLocator EOF )
+            // InternalFormat.g:595:1: ruleSpaceLocator EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSpaceLocatorRule()); 
             }
-            pushFollow(FOLLOW_ruleSpaceLocator_in_entryRuleSpaceLocator1207);
+            pushFollow(FOLLOW_1);
             ruleSpaceLocator();
 
             state._fsp--;
@@ -1811,7 +1811,7 @@ public final void entryRuleSpaceLocator() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSpaceLocatorRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSpaceLocator1214); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1828,25 +1828,25 @@ public final void entryRuleSpaceLocator() throws RecognitionException {
 
 
     // $ANTLR start "ruleSpaceLocator"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:602:1: ruleSpaceLocator : ( ( rule__SpaceLocator__Alternatives ) ) ;
+    // InternalFormat.g:602:1: ruleSpaceLocator : ( ( rule__SpaceLocator__Alternatives ) ) ;
     public final void ruleSpaceLocator() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:606:2: ( ( ( rule__SpaceLocator__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:607:1: ( ( rule__SpaceLocator__Alternatives ) )
+            // InternalFormat.g:606:2: ( ( ( rule__SpaceLocator__Alternatives ) ) )
+            // InternalFormat.g:607:1: ( ( rule__SpaceLocator__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:607:1: ( ( rule__SpaceLocator__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:608:1: ( rule__SpaceLocator__Alternatives )
+            // InternalFormat.g:607:1: ( ( rule__SpaceLocator__Alternatives ) )
+            // InternalFormat.g:608:1: ( rule__SpaceLocator__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSpaceLocatorAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:609:1: ( rule__SpaceLocator__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:609:2: rule__SpaceLocator__Alternatives
+            // InternalFormat.g:609:1: ( rule__SpaceLocator__Alternatives )
+            // InternalFormat.g:609:2: rule__SpaceLocator__Alternatives
             {
-            pushFollow(FOLLOW_rule__SpaceLocator__Alternatives_in_ruleSpaceLocator1240);
+            pushFollow(FOLLOW_2);
             rule__SpaceLocator__Alternatives();
 
             state._fsp--;
@@ -1879,16 +1879,16 @@ public final void ruleSpaceLocator() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleRightPaddingLocator"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:621:1: entryRuleRightPaddingLocator : ruleRightPaddingLocator EOF ;
+    // InternalFormat.g:621:1: entryRuleRightPaddingLocator : ruleRightPaddingLocator EOF ;
     public final void entryRuleRightPaddingLocator() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:622:1: ( ruleRightPaddingLocator EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:623:1: ruleRightPaddingLocator EOF
+            // InternalFormat.g:622:1: ( ruleRightPaddingLocator EOF )
+            // InternalFormat.g:623:1: ruleRightPaddingLocator EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRightPaddingLocatorRule()); 
             }
-            pushFollow(FOLLOW_ruleRightPaddingLocator_in_entryRuleRightPaddingLocator1267);
+            pushFollow(FOLLOW_1);
             ruleRightPaddingLocator();
 
             state._fsp--;
@@ -1896,7 +1896,7 @@ public final void entryRuleRightPaddingLocator() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getRightPaddingLocatorRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRightPaddingLocator1274); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1913,25 +1913,25 @@ public final void entryRuleRightPaddingLocator() throws RecognitionException {
 
 
     // $ANTLR start "ruleRightPaddingLocator"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:630:1: ruleRightPaddingLocator : ( ( rule__RightPaddingLocator__Group__0 ) ) ;
+    // InternalFormat.g:630:1: ruleRightPaddingLocator : ( ( rule__RightPaddingLocator__Group__0 ) ) ;
     public final void ruleRightPaddingLocator() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:634:2: ( ( ( rule__RightPaddingLocator__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:635:1: ( ( rule__RightPaddingLocator__Group__0 ) )
+            // InternalFormat.g:634:2: ( ( ( rule__RightPaddingLocator__Group__0 ) ) )
+            // InternalFormat.g:635:1: ( ( rule__RightPaddingLocator__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:635:1: ( ( rule__RightPaddingLocator__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:636:1: ( rule__RightPaddingLocator__Group__0 )
+            // InternalFormat.g:635:1: ( ( rule__RightPaddingLocator__Group__0 ) )
+            // InternalFormat.g:636:1: ( rule__RightPaddingLocator__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRightPaddingLocatorAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:637:1: ( rule__RightPaddingLocator__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:637:2: rule__RightPaddingLocator__Group__0
+            // InternalFormat.g:637:1: ( rule__RightPaddingLocator__Group__0 )
+            // InternalFormat.g:637:2: rule__RightPaddingLocator__Group__0
             {
-            pushFollow(FOLLOW_rule__RightPaddingLocator__Group__0_in_ruleRightPaddingLocator1300);
+            pushFollow(FOLLOW_2);
             rule__RightPaddingLocator__Group__0();
 
             state._fsp--;
@@ -1964,16 +1964,16 @@ public final void ruleRightPaddingLocator() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleLinewrapLocator"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:649:1: entryRuleLinewrapLocator : ruleLinewrapLocator EOF ;
+    // InternalFormat.g:649:1: entryRuleLinewrapLocator : ruleLinewrapLocator EOF ;
     public final void entryRuleLinewrapLocator() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:650:1: ( ruleLinewrapLocator EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:651:1: ruleLinewrapLocator EOF
+            // InternalFormat.g:650:1: ( ruleLinewrapLocator EOF )
+            // InternalFormat.g:651:1: ruleLinewrapLocator EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLinewrapLocatorRule()); 
             }
-            pushFollow(FOLLOW_ruleLinewrapLocator_in_entryRuleLinewrapLocator1327);
+            pushFollow(FOLLOW_1);
             ruleLinewrapLocator();
 
             state._fsp--;
@@ -1981,7 +1981,7 @@ public final void entryRuleLinewrapLocator() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getLinewrapLocatorRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleLinewrapLocator1334); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1998,25 +1998,25 @@ public final void entryRuleLinewrapLocator() throws RecognitionException {
 
 
     // $ANTLR start "ruleLinewrapLocator"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:658:1: ruleLinewrapLocator : ( ( rule__LinewrapLocator__Alternatives ) ) ;
+    // InternalFormat.g:658:1: ruleLinewrapLocator : ( ( rule__LinewrapLocator__Alternatives ) ) ;
     public final void ruleLinewrapLocator() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:662:2: ( ( ( rule__LinewrapLocator__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:663:1: ( ( rule__LinewrapLocator__Alternatives ) )
+            // InternalFormat.g:662:2: ( ( ( rule__LinewrapLocator__Alternatives ) ) )
+            // InternalFormat.g:663:1: ( ( rule__LinewrapLocator__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:663:1: ( ( rule__LinewrapLocator__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:664:1: ( rule__LinewrapLocator__Alternatives )
+            // InternalFormat.g:663:1: ( ( rule__LinewrapLocator__Alternatives ) )
+            // InternalFormat.g:664:1: ( rule__LinewrapLocator__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLinewrapLocatorAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:665:1: ( rule__LinewrapLocator__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:665:2: rule__LinewrapLocator__Alternatives
+            // InternalFormat.g:665:1: ( rule__LinewrapLocator__Alternatives )
+            // InternalFormat.g:665:2: rule__LinewrapLocator__Alternatives
             {
-            pushFollow(FOLLOW_rule__LinewrapLocator__Alternatives_in_ruleLinewrapLocator1360);
+            pushFollow(FOLLOW_2);
             rule__LinewrapLocator__Alternatives();
 
             state._fsp--;
@@ -2049,16 +2049,16 @@ public final void ruleLinewrapLocator() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleColumnLocator"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:677:1: entryRuleColumnLocator : ruleColumnLocator EOF ;
+    // InternalFormat.g:677:1: entryRuleColumnLocator : ruleColumnLocator EOF ;
     public final void entryRuleColumnLocator() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:678:1: ( ruleColumnLocator EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:679:1: ruleColumnLocator EOF
+            // InternalFormat.g:678:1: ( ruleColumnLocator EOF )
+            // InternalFormat.g:679:1: ruleColumnLocator EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getColumnLocatorRule()); 
             }
-            pushFollow(FOLLOW_ruleColumnLocator_in_entryRuleColumnLocator1387);
+            pushFollow(FOLLOW_1);
             ruleColumnLocator();
 
             state._fsp--;
@@ -2066,7 +2066,7 @@ public final void entryRuleColumnLocator() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getColumnLocatorRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleColumnLocator1394); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2083,25 +2083,25 @@ public final void entryRuleColumnLocator() throws RecognitionException {
 
 
     // $ANTLR start "ruleColumnLocator"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:686:1: ruleColumnLocator : ( ( rule__ColumnLocator__Group__0 ) ) ;
+    // InternalFormat.g:686:1: ruleColumnLocator : ( ( rule__ColumnLocator__Group__0 ) ) ;
     public final void ruleColumnLocator() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:690:2: ( ( ( rule__ColumnLocator__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:691:1: ( ( rule__ColumnLocator__Group__0 ) )
+            // InternalFormat.g:690:2: ( ( ( rule__ColumnLocator__Group__0 ) ) )
+            // InternalFormat.g:691:1: ( ( rule__ColumnLocator__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:691:1: ( ( rule__ColumnLocator__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:692:1: ( rule__ColumnLocator__Group__0 )
+            // InternalFormat.g:691:1: ( ( rule__ColumnLocator__Group__0 ) )
+            // InternalFormat.g:692:1: ( rule__ColumnLocator__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getColumnLocatorAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:693:1: ( rule__ColumnLocator__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:693:2: rule__ColumnLocator__Group__0
+            // InternalFormat.g:693:1: ( rule__ColumnLocator__Group__0 )
+            // InternalFormat.g:693:2: rule__ColumnLocator__Group__0
             {
-            pushFollow(FOLLOW_rule__ColumnLocator__Group__0_in_ruleColumnLocator1420);
+            pushFollow(FOLLOW_2);
             rule__ColumnLocator__Group__0();
 
             state._fsp--;
@@ -2134,16 +2134,16 @@ public final void ruleColumnLocator() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOffsetLocator"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:705:1: entryRuleOffsetLocator : ruleOffsetLocator EOF ;
+    // InternalFormat.g:705:1: entryRuleOffsetLocator : ruleOffsetLocator EOF ;
     public final void entryRuleOffsetLocator() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:706:1: ( ruleOffsetLocator EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:707:1: ruleOffsetLocator EOF
+            // InternalFormat.g:706:1: ( ruleOffsetLocator EOF )
+            // InternalFormat.g:707:1: ruleOffsetLocator EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOffsetLocatorRule()); 
             }
-            pushFollow(FOLLOW_ruleOffsetLocator_in_entryRuleOffsetLocator1447);
+            pushFollow(FOLLOW_1);
             ruleOffsetLocator();
 
             state._fsp--;
@@ -2151,7 +2151,7 @@ public final void entryRuleOffsetLocator() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOffsetLocatorRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOffsetLocator1454); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2168,25 +2168,25 @@ public final void entryRuleOffsetLocator() throws RecognitionException {
 
 
     // $ANTLR start "ruleOffsetLocator"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:714:1: ruleOffsetLocator : ( ( rule__OffsetLocator__Group__0 ) ) ;
+    // InternalFormat.g:714:1: ruleOffsetLocator : ( ( rule__OffsetLocator__Group__0 ) ) ;
     public final void ruleOffsetLocator() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:718:2: ( ( ( rule__OffsetLocator__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:719:1: ( ( rule__OffsetLocator__Group__0 ) )
+            // InternalFormat.g:718:2: ( ( ( rule__OffsetLocator__Group__0 ) ) )
+            // InternalFormat.g:719:1: ( ( rule__OffsetLocator__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:719:1: ( ( rule__OffsetLocator__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:720:1: ( rule__OffsetLocator__Group__0 )
+            // InternalFormat.g:719:1: ( ( rule__OffsetLocator__Group__0 ) )
+            // InternalFormat.g:720:1: ( rule__OffsetLocator__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOffsetLocatorAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:721:1: ( rule__OffsetLocator__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:721:2: rule__OffsetLocator__Group__0
+            // InternalFormat.g:721:1: ( rule__OffsetLocator__Group__0 )
+            // InternalFormat.g:721:2: rule__OffsetLocator__Group__0
             {
-            pushFollow(FOLLOW_rule__OffsetLocator__Group__0_in_ruleOffsetLocator1480);
+            pushFollow(FOLLOW_2);
             rule__OffsetLocator__Group__0();
 
             state._fsp--;
@@ -2219,16 +2219,16 @@ public final void ruleOffsetLocator() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleIndentLocator"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:733:1: entryRuleIndentLocator : ruleIndentLocator EOF ;
+    // InternalFormat.g:733:1: entryRuleIndentLocator : ruleIndentLocator EOF ;
     public final void entryRuleIndentLocator() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:734:1: ( ruleIndentLocator EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:735:1: ruleIndentLocator EOF
+            // InternalFormat.g:734:1: ( ruleIndentLocator EOF )
+            // InternalFormat.g:735:1: ruleIndentLocator EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIndentLocatorRule()); 
             }
-            pushFollow(FOLLOW_ruleIndentLocator_in_entryRuleIndentLocator1507);
+            pushFollow(FOLLOW_1);
             ruleIndentLocator();
 
             state._fsp--;
@@ -2236,7 +2236,7 @@ public final void entryRuleIndentLocator() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIndentLocatorRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIndentLocator1514); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2253,25 +2253,25 @@ public final void entryRuleIndentLocator() throws RecognitionException {
 
 
     // $ANTLR start "ruleIndentLocator"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:742:1: ruleIndentLocator : ( ( rule__IndentLocator__Group__0 ) ) ;
+    // InternalFormat.g:742:1: ruleIndentLocator : ( ( rule__IndentLocator__Group__0 ) ) ;
     public final void ruleIndentLocator() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:746:2: ( ( ( rule__IndentLocator__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:747:1: ( ( rule__IndentLocator__Group__0 ) )
+            // InternalFormat.g:746:2: ( ( ( rule__IndentLocator__Group__0 ) ) )
+            // InternalFormat.g:747:1: ( ( rule__IndentLocator__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:747:1: ( ( rule__IndentLocator__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:748:1: ( rule__IndentLocator__Group__0 )
+            // InternalFormat.g:747:1: ( ( rule__IndentLocator__Group__0 ) )
+            // InternalFormat.g:748:1: ( rule__IndentLocator__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIndentLocatorAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:749:1: ( rule__IndentLocator__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:749:2: rule__IndentLocator__Group__0
+            // InternalFormat.g:749:1: ( rule__IndentLocator__Group__0 )
+            // InternalFormat.g:749:2: rule__IndentLocator__Group__0
             {
-            pushFollow(FOLLOW_rule__IndentLocator__Group__0_in_ruleIndentLocator1540);
+            pushFollow(FOLLOW_2);
             rule__IndentLocator__Group__0();
 
             state._fsp--;
@@ -2304,16 +2304,16 @@ public final void ruleIndentLocator() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleParameterizedIdentifier"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:761:1: entryRuleParameterizedIdentifier : ruleParameterizedIdentifier EOF ;
+    // InternalFormat.g:761:1: entryRuleParameterizedIdentifier : ruleParameterizedIdentifier EOF ;
     public final void entryRuleParameterizedIdentifier() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:762:1: ( ruleParameterizedIdentifier EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:763:1: ruleParameterizedIdentifier EOF
+            // InternalFormat.g:762:1: ( ruleParameterizedIdentifier EOF )
+            // InternalFormat.g:763:1: ruleParameterizedIdentifier EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getParameterizedIdentifierRule()); 
             }
-            pushFollow(FOLLOW_ruleParameterizedIdentifier_in_entryRuleParameterizedIdentifier1567);
+            pushFollow(FOLLOW_1);
             ruleParameterizedIdentifier();
 
             state._fsp--;
@@ -2321,7 +2321,7 @@ public final void entryRuleParameterizedIdentifier() throws RecognitionException
             if ( state.backtracking==0 ) {
                after(grammarAccess.getParameterizedIdentifierRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleParameterizedIdentifier1574); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2338,25 +2338,25 @@ public final void entryRuleParameterizedIdentifier() throws RecognitionException
 
 
     // $ANTLR start "ruleParameterizedIdentifier"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:770:1: ruleParameterizedIdentifier : ( ( rule__ParameterizedIdentifier__Group__0 ) ) ;
+    // InternalFormat.g:770:1: ruleParameterizedIdentifier : ( ( rule__ParameterizedIdentifier__Group__0 ) ) ;
     public final void ruleParameterizedIdentifier() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:774:2: ( ( ( rule__ParameterizedIdentifier__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:775:1: ( ( rule__ParameterizedIdentifier__Group__0 ) )
+            // InternalFormat.g:774:2: ( ( ( rule__ParameterizedIdentifier__Group__0 ) ) )
+            // InternalFormat.g:775:1: ( ( rule__ParameterizedIdentifier__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:775:1: ( ( rule__ParameterizedIdentifier__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:776:1: ( rule__ParameterizedIdentifier__Group__0 )
+            // InternalFormat.g:775:1: ( ( rule__ParameterizedIdentifier__Group__0 ) )
+            // InternalFormat.g:776:1: ( rule__ParameterizedIdentifier__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getParameterizedIdentifierAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:777:1: ( rule__ParameterizedIdentifier__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:777:2: rule__ParameterizedIdentifier__Group__0
+            // InternalFormat.g:777:1: ( rule__ParameterizedIdentifier__Group__0 )
+            // InternalFormat.g:777:2: rule__ParameterizedIdentifier__Group__0
             {
-            pushFollow(FOLLOW_rule__ParameterizedIdentifier__Group__0_in_ruleParameterizedIdentifier1600);
+            pushFollow(FOLLOW_2);
             rule__ParameterizedIdentifier__Group__0();
 
             state._fsp--;
@@ -2389,16 +2389,16 @@ public final void ruleParameterizedIdentifier() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleParameterizedString"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:789:1: entryRuleParameterizedString : ruleParameterizedString EOF ;
+    // InternalFormat.g:789:1: entryRuleParameterizedString : ruleParameterizedString EOF ;
     public final void entryRuleParameterizedString() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:790:1: ( ruleParameterizedString EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:791:1: ruleParameterizedString EOF
+            // InternalFormat.g:790:1: ( ruleParameterizedString EOF )
+            // InternalFormat.g:791:1: ruleParameterizedString EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getParameterizedStringRule()); 
             }
-            pushFollow(FOLLOW_ruleParameterizedString_in_entryRuleParameterizedString1627);
+            pushFollow(FOLLOW_1);
             ruleParameterizedString();
 
             state._fsp--;
@@ -2406,7 +2406,7 @@ public final void entryRuleParameterizedString() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getParameterizedStringRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleParameterizedString1634); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2423,25 +2423,25 @@ public final void entryRuleParameterizedString() throws RecognitionException {
 
 
     // $ANTLR start "ruleParameterizedString"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:798:1: ruleParameterizedString : ( ( rule__ParameterizedString__Group__0 ) ) ;
+    // InternalFormat.g:798:1: ruleParameterizedString : ( ( rule__ParameterizedString__Group__0 ) ) ;
     public final void ruleParameterizedString() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:802:2: ( ( ( rule__ParameterizedString__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:803:1: ( ( rule__ParameterizedString__Group__0 ) )
+            // InternalFormat.g:802:2: ( ( ( rule__ParameterizedString__Group__0 ) ) )
+            // InternalFormat.g:803:1: ( ( rule__ParameterizedString__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:803:1: ( ( rule__ParameterizedString__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:804:1: ( rule__ParameterizedString__Group__0 )
+            // InternalFormat.g:803:1: ( ( rule__ParameterizedString__Group__0 ) )
+            // InternalFormat.g:804:1: ( rule__ParameterizedString__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getParameterizedStringAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:805:1: ( rule__ParameterizedString__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:805:2: rule__ParameterizedString__Group__0
+            // InternalFormat.g:805:1: ( rule__ParameterizedString__Group__0 )
+            // InternalFormat.g:805:2: rule__ParameterizedString__Group__0
             {
-            pushFollow(FOLLOW_rule__ParameterizedString__Group__0_in_ruleParameterizedString1660);
+            pushFollow(FOLLOW_2);
             rule__ParameterizedString__Group__0();
 
             state._fsp--;
@@ -2474,16 +2474,16 @@ public final void ruleParameterizedString() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleIdentifier"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:817:1: entryRuleIdentifier : ruleIdentifier EOF ;
+    // InternalFormat.g:817:1: entryRuleIdentifier : ruleIdentifier EOF ;
     public final void entryRuleIdentifier() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:818:1: ( ruleIdentifier EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:819:1: ruleIdentifier EOF
+            // InternalFormat.g:818:1: ( ruleIdentifier EOF )
+            // InternalFormat.g:819:1: ruleIdentifier EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIdentifierRule()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_entryRuleIdentifier1687);
+            pushFollow(FOLLOW_1);
             ruleIdentifier();
 
             state._fsp--;
@@ -2491,7 +2491,7 @@ public final void entryRuleIdentifier() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIdentifierRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIdentifier1694); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2508,25 +2508,25 @@ public final void entryRuleIdentifier() throws RecognitionException {
 
 
     // $ANTLR start "ruleIdentifier"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:826:1: ruleIdentifier : ( ( rule__Identifier__Alternatives ) ) ;
+    // InternalFormat.g:826:1: ruleIdentifier : ( ( rule__Identifier__Alternatives ) ) ;
     public final void ruleIdentifier() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:830:2: ( ( ( rule__Identifier__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:831:1: ( ( rule__Identifier__Alternatives ) )
+            // InternalFormat.g:830:2: ( ( ( rule__Identifier__Alternatives ) ) )
+            // InternalFormat.g:831:1: ( ( rule__Identifier__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:831:1: ( ( rule__Identifier__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:832:1: ( rule__Identifier__Alternatives )
+            // InternalFormat.g:831:1: ( ( rule__Identifier__Alternatives ) )
+            // InternalFormat.g:832:1: ( rule__Identifier__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIdentifierAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:833:1: ( rule__Identifier__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:833:2: rule__Identifier__Alternatives
+            // InternalFormat.g:833:1: ( rule__Identifier__Alternatives )
+            // InternalFormat.g:833:2: rule__Identifier__Alternatives
             {
-            pushFollow(FOLLOW_rule__Identifier__Alternatives_in_ruleIdentifier1720);
+            pushFollow(FOLLOW_2);
             rule__Identifier__Alternatives();
 
             state._fsp--;
@@ -2559,16 +2559,16 @@ public final void ruleIdentifier() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleDottedID"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:845:1: entryRuleDottedID : ruleDottedID EOF ;
+    // InternalFormat.g:845:1: entryRuleDottedID : ruleDottedID EOF ;
     public final void entryRuleDottedID() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:846:1: ( ruleDottedID EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:847:1: ruleDottedID EOF
+            // InternalFormat.g:846:1: ( ruleDottedID EOF )
+            // InternalFormat.g:847:1: ruleDottedID EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDottedIDRule()); 
             }
-            pushFollow(FOLLOW_ruleDottedID_in_entryRuleDottedID1747);
+            pushFollow(FOLLOW_1);
             ruleDottedID();
 
             state._fsp--;
@@ -2576,7 +2576,7 @@ public final void entryRuleDottedID() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getDottedIDRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDottedID1754); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2593,25 +2593,25 @@ public final void entryRuleDottedID() throws RecognitionException {
 
 
     // $ANTLR start "ruleDottedID"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:854:1: ruleDottedID : ( ( rule__DottedID__Group__0 ) ) ;
+    // InternalFormat.g:854:1: ruleDottedID : ( ( rule__DottedID__Group__0 ) ) ;
     public final void ruleDottedID() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:858:2: ( ( ( rule__DottedID__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:859:1: ( ( rule__DottedID__Group__0 ) )
+            // InternalFormat.g:858:2: ( ( ( rule__DottedID__Group__0 ) ) )
+            // InternalFormat.g:859:1: ( ( rule__DottedID__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:859:1: ( ( rule__DottedID__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:860:1: ( rule__DottedID__Group__0 )
+            // InternalFormat.g:859:1: ( ( rule__DottedID__Group__0 ) )
+            // InternalFormat.g:860:1: ( rule__DottedID__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDottedIDAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:861:1: ( rule__DottedID__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:861:2: rule__DottedID__Group__0
+            // InternalFormat.g:861:1: ( rule__DottedID__Group__0 )
+            // InternalFormat.g:861:2: rule__DottedID__Group__0
             {
-            pushFollow(FOLLOW_rule__DottedID__Group__0_in_ruleDottedID1780);
+            pushFollow(FOLLOW_2);
             rule__DottedID__Group__0();
 
             state._fsp--;
@@ -2644,16 +2644,16 @@ public final void ruleDottedID() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleIntIdentifier"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:873:1: entryRuleIntIdentifier : ruleIntIdentifier EOF ;
+    // InternalFormat.g:873:1: entryRuleIntIdentifier : ruleIntIdentifier EOF ;
     public final void entryRuleIntIdentifier() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:874:1: ( ruleIntIdentifier EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:875:1: ruleIntIdentifier EOF
+            // InternalFormat.g:874:1: ( ruleIntIdentifier EOF )
+            // InternalFormat.g:875:1: ruleIntIdentifier EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIntIdentifierRule()); 
             }
-            pushFollow(FOLLOW_ruleIntIdentifier_in_entryRuleIntIdentifier1807);
+            pushFollow(FOLLOW_1);
             ruleIntIdentifier();
 
             state._fsp--;
@@ -2661,7 +2661,7 @@ public final void entryRuleIntIdentifier() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIntIdentifierRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIntIdentifier1814); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2678,22 +2678,22 @@ public final void entryRuleIntIdentifier() throws RecognitionException {
 
 
     // $ANTLR start "ruleIntIdentifier"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:882:1: ruleIntIdentifier : ( RULE_INT ) ;
+    // InternalFormat.g:882:1: ruleIntIdentifier : ( RULE_INT ) ;
     public final void ruleIntIdentifier() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:886:2: ( ( RULE_INT ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:887:1: ( RULE_INT )
+            // InternalFormat.g:886:2: ( ( RULE_INT ) )
+            // InternalFormat.g:887:1: ( RULE_INT )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:887:1: ( RULE_INT )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:888:1: RULE_INT
+            // InternalFormat.g:887:1: ( RULE_INT )
+            // InternalFormat.g:888:1: RULE_INT
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIntIdentifierAccess().getINTTerminalRuleCall()); 
             }
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleIntIdentifier1840); if (state.failed) return ;
+            match(input,RULE_INT,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIntIdentifierAccess().getINTTerminalRuleCall()); 
             }
@@ -2719,16 +2719,16 @@ public final void ruleIntIdentifier() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleIntObject"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:901:1: entryRuleIntObject : ruleIntObject EOF ;
+    // InternalFormat.g:901:1: entryRuleIntObject : ruleIntObject EOF ;
     public final void entryRuleIntObject() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:902:1: ( ruleIntObject EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:903:1: ruleIntObject EOF
+            // InternalFormat.g:902:1: ( ruleIntObject EOF )
+            // InternalFormat.g:903:1: ruleIntObject EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIntObjectRule()); 
             }
-            pushFollow(FOLLOW_ruleIntObject_in_entryRuleIntObject1866);
+            pushFollow(FOLLOW_1);
             ruleIntObject();
 
             state._fsp--;
@@ -2736,7 +2736,7 @@ public final void entryRuleIntObject() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIntObjectRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIntObject1873); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2753,22 +2753,22 @@ public final void entryRuleIntObject() throws RecognitionException {
 
 
     // $ANTLR start "ruleIntObject"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:910:1: ruleIntObject : ( RULE_INT ) ;
+    // InternalFormat.g:910:1: ruleIntObject : ( RULE_INT ) ;
     public final void ruleIntObject() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:914:2: ( ( RULE_INT ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:915:1: ( RULE_INT )
+            // InternalFormat.g:914:2: ( ( RULE_INT ) )
+            // InternalFormat.g:915:1: ( RULE_INT )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:915:1: ( RULE_INT )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:916:1: RULE_INT
+            // InternalFormat.g:915:1: ( RULE_INT )
+            // InternalFormat.g:916:1: RULE_INT
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIntObjectAccess().getINTTerminalRuleCall()); 
             }
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleIntObject1899); if (state.failed) return ;
+            match(input,RULE_INT,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIntObjectAccess().getINTTerminalRuleCall()); 
             }
@@ -2794,16 +2794,16 @@ public final void ruleIntObject() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleRuleSelfIdentifier"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:929:1: entryRuleRuleSelfIdentifier : ruleRuleSelfIdentifier EOF ;
+    // InternalFormat.g:929:1: entryRuleRuleSelfIdentifier : ruleRuleSelfIdentifier EOF ;
     public final void entryRuleRuleSelfIdentifier() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:930:1: ( ruleRuleSelfIdentifier EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:931:1: ruleRuleSelfIdentifier EOF
+            // InternalFormat.g:930:1: ( ruleRuleSelfIdentifier EOF )
+            // InternalFormat.g:931:1: ruleRuleSelfIdentifier EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRuleSelfIdentifierRule()); 
             }
-            pushFollow(FOLLOW_ruleRuleSelfIdentifier_in_entryRuleRuleSelfIdentifier1925);
+            pushFollow(FOLLOW_1);
             ruleRuleSelfIdentifier();
 
             state._fsp--;
@@ -2811,7 +2811,7 @@ public final void entryRuleRuleSelfIdentifier() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getRuleSelfIdentifierRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRuleSelfIdentifier1932); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2828,22 +2828,22 @@ public final void entryRuleRuleSelfIdentifier() throws RecognitionException {
 
 
     // $ANTLR start "ruleRuleSelfIdentifier"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:938:1: ruleRuleSelfIdentifier : ( 'rule' ) ;
+    // InternalFormat.g:938:1: ruleRuleSelfIdentifier : ( 'rule' ) ;
     public final void ruleRuleSelfIdentifier() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:942:2: ( ( 'rule' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:943:1: ( 'rule' )
+            // InternalFormat.g:942:2: ( ( 'rule' ) )
+            // InternalFormat.g:943:1: ( 'rule' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:943:1: ( 'rule' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:944:1: 'rule'
+            // InternalFormat.g:943:1: ( 'rule' )
+            // InternalFormat.g:944:1: 'rule'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRuleSelfIdentifierAccess().getRuleKeyword()); 
             }
-            match(input,13,FOLLOW_13_in_ruleRuleSelfIdentifier1959); if (state.failed) return ;
+            match(input,13,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getRuleSelfIdentifierAccess().getRuleKeyword()); 
             }
@@ -2869,16 +2869,16 @@ public final void ruleRuleSelfIdentifier() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleValidID"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:959:1: entryRuleValidID : ruleValidID EOF ;
+    // InternalFormat.g:959:1: entryRuleValidID : ruleValidID EOF ;
     public final void entryRuleValidID() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:960:1: ( ruleValidID EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:961:1: ruleValidID EOF
+            // InternalFormat.g:960:1: ( ruleValidID EOF )
+            // InternalFormat.g:961:1: ruleValidID EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getValidIDRule()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_entryRuleValidID1987);
+            pushFollow(FOLLOW_1);
             ruleValidID();
 
             state._fsp--;
@@ -2886,7 +2886,7 @@ public final void entryRuleValidID() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getValidIDRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleValidID1994); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2903,25 +2903,25 @@ public final void entryRuleValidID() throws RecognitionException {
 
 
     // $ANTLR start "ruleValidID"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:968:1: ruleValidID : ( ( rule__ValidID__Alternatives ) ) ;
+    // InternalFormat.g:968:1: ruleValidID : ( ( rule__ValidID__Alternatives ) ) ;
     public final void ruleValidID() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:972:2: ( ( ( rule__ValidID__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:973:1: ( ( rule__ValidID__Alternatives ) )
+            // InternalFormat.g:972:2: ( ( ( rule__ValidID__Alternatives ) ) )
+            // InternalFormat.g:973:1: ( ( rule__ValidID__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:973:1: ( ( rule__ValidID__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:974:1: ( rule__ValidID__Alternatives )
+            // InternalFormat.g:973:1: ( ( rule__ValidID__Alternatives ) )
+            // InternalFormat.g:974:1: ( rule__ValidID__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getValidIDAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:975:1: ( rule__ValidID__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:975:2: rule__ValidID__Alternatives
+            // InternalFormat.g:975:1: ( rule__ValidID__Alternatives )
+            // InternalFormat.g:975:2: rule__ValidID__Alternatives
             {
-            pushFollow(FOLLOW_rule__ValidID__Alternatives_in_ruleValidID2020);
+            pushFollow(FOLLOW_2);
             rule__ValidID__Alternatives();
 
             state._fsp--;
@@ -2954,16 +2954,16 @@ public final void ruleValidID() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXAnnotation"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:987:1: entryRuleXAnnotation : ruleXAnnotation EOF ;
+    // InternalFormat.g:987:1: entryRuleXAnnotation : ruleXAnnotation EOF ;
     public final void entryRuleXAnnotation() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:988:1: ( ruleXAnnotation EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:989:1: ruleXAnnotation EOF
+            // InternalFormat.g:988:1: ( ruleXAnnotation EOF )
+            // InternalFormat.g:989:1: ruleXAnnotation EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationRule()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotation_in_entryRuleXAnnotation2047);
+            pushFollow(FOLLOW_1);
             ruleXAnnotation();
 
             state._fsp--;
@@ -2971,7 +2971,7 @@ public final void entryRuleXAnnotation() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAnnotation2054); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2988,25 +2988,25 @@ public final void entryRuleXAnnotation() throws RecognitionException {
 
 
     // $ANTLR start "ruleXAnnotation"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:996:1: ruleXAnnotation : ( ( rule__XAnnotation__Group__0 ) ) ;
+    // InternalFormat.g:996:1: ruleXAnnotation : ( ( rule__XAnnotation__Group__0 ) ) ;
     public final void ruleXAnnotation() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1000:2: ( ( ( rule__XAnnotation__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1001:1: ( ( rule__XAnnotation__Group__0 ) )
+            // InternalFormat.g:1000:2: ( ( ( rule__XAnnotation__Group__0 ) ) )
+            // InternalFormat.g:1001:1: ( ( rule__XAnnotation__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1001:1: ( ( rule__XAnnotation__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1002:1: ( rule__XAnnotation__Group__0 )
+            // InternalFormat.g:1001:1: ( ( rule__XAnnotation__Group__0 ) )
+            // InternalFormat.g:1002:1: ( rule__XAnnotation__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1003:1: ( rule__XAnnotation__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1003:2: rule__XAnnotation__Group__0
+            // InternalFormat.g:1003:1: ( rule__XAnnotation__Group__0 )
+            // InternalFormat.g:1003:2: rule__XAnnotation__Group__0
             {
-            pushFollow(FOLLOW_rule__XAnnotation__Group__0_in_ruleXAnnotation2080);
+            pushFollow(FOLLOW_2);
             rule__XAnnotation__Group__0();
 
             state._fsp--;
@@ -3039,16 +3039,16 @@ public final void ruleXAnnotation() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXAnnotationElementValuePair"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1015:1: entryRuleXAnnotationElementValuePair : ruleXAnnotationElementValuePair EOF ;
+    // InternalFormat.g:1015:1: entryRuleXAnnotationElementValuePair : ruleXAnnotationElementValuePair EOF ;
     public final void entryRuleXAnnotationElementValuePair() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1016:1: ( ruleXAnnotationElementValuePair EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1017:1: ruleXAnnotationElementValuePair EOF
+            // InternalFormat.g:1016:1: ( ruleXAnnotationElementValuePair EOF )
+            // InternalFormat.g:1017:1: ruleXAnnotationElementValuePair EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairRule()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationElementValuePair_in_entryRuleXAnnotationElementValuePair2107);
+            pushFollow(FOLLOW_1);
             ruleXAnnotationElementValuePair();
 
             state._fsp--;
@@ -3056,7 +3056,7 @@ public final void entryRuleXAnnotationElementValuePair() throws RecognitionExcep
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValuePairRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAnnotationElementValuePair2114); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3073,25 +3073,25 @@ public final void entryRuleXAnnotationElementValuePair() throws RecognitionExcep
 
 
     // $ANTLR start "ruleXAnnotationElementValuePair"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1024:1: ruleXAnnotationElementValuePair : ( ( rule__XAnnotationElementValuePair__Group__0 ) ) ;
+    // InternalFormat.g:1024:1: ruleXAnnotationElementValuePair : ( ( rule__XAnnotationElementValuePair__Group__0 ) ) ;
     public final void ruleXAnnotationElementValuePair() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1028:2: ( ( ( rule__XAnnotationElementValuePair__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1029:1: ( ( rule__XAnnotationElementValuePair__Group__0 ) )
+            // InternalFormat.g:1028:2: ( ( ( rule__XAnnotationElementValuePair__Group__0 ) ) )
+            // InternalFormat.g:1029:1: ( ( rule__XAnnotationElementValuePair__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1029:1: ( ( rule__XAnnotationElementValuePair__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1030:1: ( rule__XAnnotationElementValuePair__Group__0 )
+            // InternalFormat.g:1029:1: ( ( rule__XAnnotationElementValuePair__Group__0 ) )
+            // InternalFormat.g:1030:1: ( rule__XAnnotationElementValuePair__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1031:1: ( rule__XAnnotationElementValuePair__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1031:2: rule__XAnnotationElementValuePair__Group__0
+            // InternalFormat.g:1031:1: ( rule__XAnnotationElementValuePair__Group__0 )
+            // InternalFormat.g:1031:2: rule__XAnnotationElementValuePair__Group__0
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__Group__0_in_ruleXAnnotationElementValuePair2140);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValuePair__Group__0();
 
             state._fsp--;
@@ -3124,16 +3124,16 @@ public final void ruleXAnnotationElementValuePair() throws RecognitionException
 
 
     // $ANTLR start "entryRuleXAnnotationElementValueOrCommaList"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1043:1: entryRuleXAnnotationElementValueOrCommaList : ruleXAnnotationElementValueOrCommaList EOF ;
+    // InternalFormat.g:1043:1: entryRuleXAnnotationElementValueOrCommaList : ruleXAnnotationElementValueOrCommaList EOF ;
     public final void entryRuleXAnnotationElementValueOrCommaList() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1044:1: ( ruleXAnnotationElementValueOrCommaList EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1045:1: ruleXAnnotationElementValueOrCommaList EOF
+            // InternalFormat.g:1044:1: ( ruleXAnnotationElementValueOrCommaList EOF )
+            // InternalFormat.g:1045:1: ruleXAnnotationElementValueOrCommaList EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListRule()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationElementValueOrCommaList_in_entryRuleXAnnotationElementValueOrCommaList2167);
+            pushFollow(FOLLOW_1);
             ruleXAnnotationElementValueOrCommaList();
 
             state._fsp--;
@@ -3141,7 +3141,7 @@ public final void entryRuleXAnnotationElementValueOrCommaList() throws Recogniti
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValueOrCommaListRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAnnotationElementValueOrCommaList2174); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3158,25 +3158,25 @@ public final void entryRuleXAnnotationElementValueOrCommaList() throws Recogniti
 
 
     // $ANTLR start "ruleXAnnotationElementValueOrCommaList"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1052:1: ruleXAnnotationElementValueOrCommaList : ( ( rule__XAnnotationElementValueOrCommaList__Alternatives ) ) ;
+    // InternalFormat.g:1052:1: ruleXAnnotationElementValueOrCommaList : ( ( rule__XAnnotationElementValueOrCommaList__Alternatives ) ) ;
     public final void ruleXAnnotationElementValueOrCommaList() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1056:2: ( ( ( rule__XAnnotationElementValueOrCommaList__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1057:1: ( ( rule__XAnnotationElementValueOrCommaList__Alternatives ) )
+            // InternalFormat.g:1056:2: ( ( ( rule__XAnnotationElementValueOrCommaList__Alternatives ) ) )
+            // InternalFormat.g:1057:1: ( ( rule__XAnnotationElementValueOrCommaList__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1057:1: ( ( rule__XAnnotationElementValueOrCommaList__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1058:1: ( rule__XAnnotationElementValueOrCommaList__Alternatives )
+            // InternalFormat.g:1057:1: ( ( rule__XAnnotationElementValueOrCommaList__Alternatives ) )
+            // InternalFormat.g:1058:1: ( rule__XAnnotationElementValueOrCommaList__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1059:1: ( rule__XAnnotationElementValueOrCommaList__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1059:2: rule__XAnnotationElementValueOrCommaList__Alternatives
+            // InternalFormat.g:1059:1: ( rule__XAnnotationElementValueOrCommaList__Alternatives )
+            // InternalFormat.g:1059:2: rule__XAnnotationElementValueOrCommaList__Alternatives
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Alternatives_in_ruleXAnnotationElementValueOrCommaList2200);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Alternatives();
 
             state._fsp--;
@@ -3209,16 +3209,16 @@ public final void ruleXAnnotationElementValueOrCommaList() throws RecognitionExc
 
 
     // $ANTLR start "entryRuleXAnnotationElementValue"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1071:1: entryRuleXAnnotationElementValue : ruleXAnnotationElementValue EOF ;
+    // InternalFormat.g:1071:1: entryRuleXAnnotationElementValue : ruleXAnnotationElementValue EOF ;
     public final void entryRuleXAnnotationElementValue() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1072:1: ( ruleXAnnotationElementValue EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1073:1: ruleXAnnotationElementValue EOF
+            // InternalFormat.g:1072:1: ( ruleXAnnotationElementValue EOF )
+            // InternalFormat.g:1073:1: ruleXAnnotationElementValue EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueRule()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationElementValue_in_entryRuleXAnnotationElementValue2227);
+            pushFollow(FOLLOW_1);
             ruleXAnnotationElementValue();
 
             state._fsp--;
@@ -3226,7 +3226,7 @@ public final void entryRuleXAnnotationElementValue() throws RecognitionException
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValueRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAnnotationElementValue2234); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3243,25 +3243,25 @@ public final void entryRuleXAnnotationElementValue() throws RecognitionException
 
 
     // $ANTLR start "ruleXAnnotationElementValue"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1080:1: ruleXAnnotationElementValue : ( ( rule__XAnnotationElementValue__Alternatives ) ) ;
+    // InternalFormat.g:1080:1: ruleXAnnotationElementValue : ( ( rule__XAnnotationElementValue__Alternatives ) ) ;
     public final void ruleXAnnotationElementValue() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1084:2: ( ( ( rule__XAnnotationElementValue__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1085:1: ( ( rule__XAnnotationElementValue__Alternatives ) )
+            // InternalFormat.g:1084:2: ( ( ( rule__XAnnotationElementValue__Alternatives ) ) )
+            // InternalFormat.g:1085:1: ( ( rule__XAnnotationElementValue__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1085:1: ( ( rule__XAnnotationElementValue__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1086:1: ( rule__XAnnotationElementValue__Alternatives )
+            // InternalFormat.g:1085:1: ( ( rule__XAnnotationElementValue__Alternatives ) )
+            // InternalFormat.g:1086:1: ( rule__XAnnotationElementValue__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1087:1: ( rule__XAnnotationElementValue__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1087:2: rule__XAnnotationElementValue__Alternatives
+            // InternalFormat.g:1087:1: ( rule__XAnnotationElementValue__Alternatives )
+            // InternalFormat.g:1087:2: rule__XAnnotationElementValue__Alternatives
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Alternatives_in_ruleXAnnotationElementValue2260);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Alternatives();
 
             state._fsp--;
@@ -3294,16 +3294,16 @@ public final void ruleXAnnotationElementValue() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXAnnotationOrExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1099:1: entryRuleXAnnotationOrExpression : ruleXAnnotationOrExpression EOF ;
+    // InternalFormat.g:1099:1: entryRuleXAnnotationOrExpression : ruleXAnnotationOrExpression EOF ;
     public final void entryRuleXAnnotationOrExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1100:1: ( ruleXAnnotationOrExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1101:1: ruleXAnnotationOrExpression EOF
+            // InternalFormat.g:1100:1: ( ruleXAnnotationOrExpression EOF )
+            // InternalFormat.g:1101:1: ruleXAnnotationOrExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationOrExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_entryRuleXAnnotationOrExpression2287);
+            pushFollow(FOLLOW_1);
             ruleXAnnotationOrExpression();
 
             state._fsp--;
@@ -3311,7 +3311,7 @@ public final void entryRuleXAnnotationOrExpression() throws RecognitionException
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationOrExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAnnotationOrExpression2294); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3328,25 +3328,25 @@ public final void entryRuleXAnnotationOrExpression() throws RecognitionException
 
 
     // $ANTLR start "ruleXAnnotationOrExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1108:1: ruleXAnnotationOrExpression : ( ( rule__XAnnotationOrExpression__Alternatives ) ) ;
+    // InternalFormat.g:1108:1: ruleXAnnotationOrExpression : ( ( rule__XAnnotationOrExpression__Alternatives ) ) ;
     public final void ruleXAnnotationOrExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1112:2: ( ( ( rule__XAnnotationOrExpression__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1113:1: ( ( rule__XAnnotationOrExpression__Alternatives ) )
+            // InternalFormat.g:1112:2: ( ( ( rule__XAnnotationOrExpression__Alternatives ) ) )
+            // InternalFormat.g:1113:1: ( ( rule__XAnnotationOrExpression__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1113:1: ( ( rule__XAnnotationOrExpression__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1114:1: ( rule__XAnnotationOrExpression__Alternatives )
+            // InternalFormat.g:1113:1: ( ( rule__XAnnotationOrExpression__Alternatives ) )
+            // InternalFormat.g:1114:1: ( rule__XAnnotationOrExpression__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationOrExpressionAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1115:1: ( rule__XAnnotationOrExpression__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1115:2: rule__XAnnotationOrExpression__Alternatives
+            // InternalFormat.g:1115:1: ( rule__XAnnotationOrExpression__Alternatives )
+            // InternalFormat.g:1115:2: rule__XAnnotationOrExpression__Alternatives
             {
-            pushFollow(FOLLOW_rule__XAnnotationOrExpression__Alternatives_in_ruleXAnnotationOrExpression2320);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationOrExpression__Alternatives();
 
             state._fsp--;
@@ -3379,16 +3379,16 @@ public final void ruleXAnnotationOrExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1127:1: entryRuleXExpression : ruleXExpression EOF ;
+    // InternalFormat.g:1127:1: entryRuleXExpression : ruleXExpression EOF ;
     public final void entryRuleXExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1128:1: ( ruleXExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1129:1: ruleXExpression EOF
+            // InternalFormat.g:1128:1: ( ruleXExpression EOF )
+            // InternalFormat.g:1129:1: ruleXExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_entryRuleXExpression2347);
+            pushFollow(FOLLOW_1);
             ruleXExpression();
 
             state._fsp--;
@@ -3396,7 +3396,7 @@ public final void entryRuleXExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXExpression2354); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3413,22 +3413,22 @@ public final void entryRuleXExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1136:1: ruleXExpression : ( ruleXAssignment ) ;
+    // InternalFormat.g:1136:1: ruleXExpression : ( ruleXAssignment ) ;
     public final void ruleXExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1140:2: ( ( ruleXAssignment ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1141:1: ( ruleXAssignment )
+            // InternalFormat.g:1140:2: ( ( ruleXAssignment ) )
+            // InternalFormat.g:1141:1: ( ruleXAssignment )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1141:1: ( ruleXAssignment )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1142:1: ruleXAssignment
+            // InternalFormat.g:1141:1: ( ruleXAssignment )
+            // InternalFormat.g:1142:1: ruleXAssignment
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionAccess().getXAssignmentParserRuleCall()); 
             }
-            pushFollow(FOLLOW_ruleXAssignment_in_ruleXExpression2380);
+            pushFollow(FOLLOW_2);
             ruleXAssignment();
 
             state._fsp--;
@@ -3458,16 +3458,16 @@ public final void ruleXExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXAssignment"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1155:1: entryRuleXAssignment : ruleXAssignment EOF ;
+    // InternalFormat.g:1155:1: entryRuleXAssignment : ruleXAssignment EOF ;
     public final void entryRuleXAssignment() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1156:1: ( ruleXAssignment EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1157:1: ruleXAssignment EOF
+            // InternalFormat.g:1156:1: ( ruleXAssignment EOF )
+            // InternalFormat.g:1157:1: ruleXAssignment EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentRule()); 
             }
-            pushFollow(FOLLOW_ruleXAssignment_in_entryRuleXAssignment2406);
+            pushFollow(FOLLOW_1);
             ruleXAssignment();
 
             state._fsp--;
@@ -3475,7 +3475,7 @@ public final void entryRuleXAssignment() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAssignmentRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAssignment2413); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3492,25 +3492,25 @@ public final void entryRuleXAssignment() throws RecognitionException {
 
 
     // $ANTLR start "ruleXAssignment"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1164:1: ruleXAssignment : ( ( rule__XAssignment__Alternatives ) ) ;
+    // InternalFormat.g:1164:1: ruleXAssignment : ( ( rule__XAssignment__Alternatives ) ) ;
     public final void ruleXAssignment() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1168:2: ( ( ( rule__XAssignment__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1169:1: ( ( rule__XAssignment__Alternatives ) )
+            // InternalFormat.g:1168:2: ( ( ( rule__XAssignment__Alternatives ) ) )
+            // InternalFormat.g:1169:1: ( ( rule__XAssignment__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1169:1: ( ( rule__XAssignment__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1170:1: ( rule__XAssignment__Alternatives )
+            // InternalFormat.g:1169:1: ( ( rule__XAssignment__Alternatives ) )
+            // InternalFormat.g:1170:1: ( rule__XAssignment__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1171:1: ( rule__XAssignment__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1171:2: rule__XAssignment__Alternatives
+            // InternalFormat.g:1171:1: ( rule__XAssignment__Alternatives )
+            // InternalFormat.g:1171:2: rule__XAssignment__Alternatives
             {
-            pushFollow(FOLLOW_rule__XAssignment__Alternatives_in_ruleXAssignment2439);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__Alternatives();
 
             state._fsp--;
@@ -3543,16 +3543,16 @@ public final void ruleXAssignment() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpSingleAssign"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1183:1: entryRuleOpSingleAssign : ruleOpSingleAssign EOF ;
+    // InternalFormat.g:1183:1: entryRuleOpSingleAssign : ruleOpSingleAssign EOF ;
     public final void entryRuleOpSingleAssign() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1184:1: ( ruleOpSingleAssign EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1185:1: ruleOpSingleAssign EOF
+            // InternalFormat.g:1184:1: ( ruleOpSingleAssign EOF )
+            // InternalFormat.g:1185:1: ruleOpSingleAssign EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpSingleAssignRule()); 
             }
-            pushFollow(FOLLOW_ruleOpSingleAssign_in_entryRuleOpSingleAssign2466);
+            pushFollow(FOLLOW_1);
             ruleOpSingleAssign();
 
             state._fsp--;
@@ -3560,7 +3560,7 @@ public final void entryRuleOpSingleAssign() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpSingleAssignRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpSingleAssign2473); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3577,22 +3577,22 @@ public final void entryRuleOpSingleAssign() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpSingleAssign"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1192:1: ruleOpSingleAssign : ( '=' ) ;
+    // InternalFormat.g:1192:1: ruleOpSingleAssign : ( '=' ) ;
     public final void ruleOpSingleAssign() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1196:2: ( ( '=' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1197:1: ( '=' )
+            // InternalFormat.g:1196:2: ( ( '=' ) )
+            // InternalFormat.g:1197:1: ( '=' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1197:1: ( '=' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1198:1: '='
+            // InternalFormat.g:1197:1: ( '=' )
+            // InternalFormat.g:1198:1: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpSingleAssignAccess().getEqualsSignKeyword()); 
             }
-            match(input,14,FOLLOW_14_in_ruleOpSingleAssign2500); if (state.failed) return ;
+            match(input,14,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpSingleAssignAccess().getEqualsSignKeyword()); 
             }
@@ -3618,16 +3618,16 @@ public final void ruleOpSingleAssign() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpMultiAssign"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1213:1: entryRuleOpMultiAssign : ruleOpMultiAssign EOF ;
+    // InternalFormat.g:1213:1: entryRuleOpMultiAssign : ruleOpMultiAssign EOF ;
     public final void entryRuleOpMultiAssign() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1214:1: ( ruleOpMultiAssign EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1215:1: ruleOpMultiAssign EOF
+            // InternalFormat.g:1214:1: ( ruleOpMultiAssign EOF )
+            // InternalFormat.g:1215:1: ruleOpMultiAssign EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignRule()); 
             }
-            pushFollow(FOLLOW_ruleOpMultiAssign_in_entryRuleOpMultiAssign2528);
+            pushFollow(FOLLOW_1);
             ruleOpMultiAssign();
 
             state._fsp--;
@@ -3635,7 +3635,7 @@ public final void entryRuleOpMultiAssign() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpMultiAssignRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpMultiAssign2535); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3652,25 +3652,25 @@ public final void entryRuleOpMultiAssign() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpMultiAssign"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1222:1: ruleOpMultiAssign : ( ( rule__OpMultiAssign__Alternatives ) ) ;
+    // InternalFormat.g:1222:1: ruleOpMultiAssign : ( ( rule__OpMultiAssign__Alternatives ) ) ;
     public final void ruleOpMultiAssign() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1226:2: ( ( ( rule__OpMultiAssign__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1227:1: ( ( rule__OpMultiAssign__Alternatives ) )
+            // InternalFormat.g:1226:2: ( ( ( rule__OpMultiAssign__Alternatives ) ) )
+            // InternalFormat.g:1227:1: ( ( rule__OpMultiAssign__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1227:1: ( ( rule__OpMultiAssign__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1228:1: ( rule__OpMultiAssign__Alternatives )
+            // InternalFormat.g:1227:1: ( ( rule__OpMultiAssign__Alternatives ) )
+            // InternalFormat.g:1228:1: ( rule__OpMultiAssign__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1229:1: ( rule__OpMultiAssign__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1229:2: rule__OpMultiAssign__Alternatives
+            // InternalFormat.g:1229:1: ( rule__OpMultiAssign__Alternatives )
+            // InternalFormat.g:1229:2: rule__OpMultiAssign__Alternatives
             {
-            pushFollow(FOLLOW_rule__OpMultiAssign__Alternatives_in_ruleOpMultiAssign2561);
+            pushFollow(FOLLOW_2);
             rule__OpMultiAssign__Alternatives();
 
             state._fsp--;
@@ -3703,16 +3703,16 @@ public final void ruleOpMultiAssign() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXOrExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1241:1: entryRuleXOrExpression : ruleXOrExpression EOF ;
+    // InternalFormat.g:1241:1: entryRuleXOrExpression : ruleXOrExpression EOF ;
     public final void entryRuleXOrExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1242:1: ( ruleXOrExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1243:1: ruleXOrExpression EOF
+            // InternalFormat.g:1242:1: ( ruleXOrExpression EOF )
+            // InternalFormat.g:1243:1: ruleXOrExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXOrExpression_in_entryRuleXOrExpression2588);
+            pushFollow(FOLLOW_1);
             ruleXOrExpression();
 
             state._fsp--;
@@ -3720,7 +3720,7 @@ public final void entryRuleXOrExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXOrExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXOrExpression2595); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3737,25 +3737,25 @@ public final void entryRuleXOrExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXOrExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1250:1: ruleXOrExpression : ( ( rule__XOrExpression__Group__0 ) ) ;
+    // InternalFormat.g:1250:1: ruleXOrExpression : ( ( rule__XOrExpression__Group__0 ) ) ;
     public final void ruleXOrExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1254:2: ( ( ( rule__XOrExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1255:1: ( ( rule__XOrExpression__Group__0 ) )
+            // InternalFormat.g:1254:2: ( ( ( rule__XOrExpression__Group__0 ) ) )
+            // InternalFormat.g:1255:1: ( ( rule__XOrExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1255:1: ( ( rule__XOrExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1256:1: ( rule__XOrExpression__Group__0 )
+            // InternalFormat.g:1255:1: ( ( rule__XOrExpression__Group__0 ) )
+            // InternalFormat.g:1256:1: ( rule__XOrExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1257:1: ( rule__XOrExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1257:2: rule__XOrExpression__Group__0
+            // InternalFormat.g:1257:1: ( rule__XOrExpression__Group__0 )
+            // InternalFormat.g:1257:2: rule__XOrExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XOrExpression__Group__0_in_ruleXOrExpression2621);
+            pushFollow(FOLLOW_2);
             rule__XOrExpression__Group__0();
 
             state._fsp--;
@@ -3788,16 +3788,16 @@ public final void ruleXOrExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpOr"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1269:1: entryRuleOpOr : ruleOpOr EOF ;
+    // InternalFormat.g:1269:1: entryRuleOpOr : ruleOpOr EOF ;
     public final void entryRuleOpOr() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1270:1: ( ruleOpOr EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1271:1: ruleOpOr EOF
+            // InternalFormat.g:1270:1: ( ruleOpOr EOF )
+            // InternalFormat.g:1271:1: ruleOpOr EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOrRule()); 
             }
-            pushFollow(FOLLOW_ruleOpOr_in_entryRuleOpOr2648);
+            pushFollow(FOLLOW_1);
             ruleOpOr();
 
             state._fsp--;
@@ -3805,7 +3805,7 @@ public final void entryRuleOpOr() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpOrRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpOr2655); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3822,22 +3822,22 @@ public final void entryRuleOpOr() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpOr"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1278:1: ruleOpOr : ( '||' ) ;
+    // InternalFormat.g:1278:1: ruleOpOr : ( '||' ) ;
     public final void ruleOpOr() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1282:2: ( ( '||' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1283:1: ( '||' )
+            // InternalFormat.g:1282:2: ( ( '||' ) )
+            // InternalFormat.g:1283:1: ( '||' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1283:1: ( '||' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1284:1: '||'
+            // InternalFormat.g:1283:1: ( '||' )
+            // InternalFormat.g:1284:1: '||'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOrAccess().getVerticalLineVerticalLineKeyword()); 
             }
-            match(input,15,FOLLOW_15_in_ruleOpOr2682); if (state.failed) return ;
+            match(input,15,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpOrAccess().getVerticalLineVerticalLineKeyword()); 
             }
@@ -3863,16 +3863,16 @@ public final void ruleOpOr() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXAndExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1299:1: entryRuleXAndExpression : ruleXAndExpression EOF ;
+    // InternalFormat.g:1299:1: entryRuleXAndExpression : ruleXAndExpression EOF ;
     public final void entryRuleXAndExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1300:1: ( ruleXAndExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1301:1: ruleXAndExpression EOF
+            // InternalFormat.g:1300:1: ( ruleXAndExpression EOF )
+            // InternalFormat.g:1301:1: ruleXAndExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXAndExpression_in_entryRuleXAndExpression2710);
+            pushFollow(FOLLOW_1);
             ruleXAndExpression();
 
             state._fsp--;
@@ -3880,7 +3880,7 @@ public final void entryRuleXAndExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAndExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAndExpression2717); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3897,25 +3897,25 @@ public final void entryRuleXAndExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXAndExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1308:1: ruleXAndExpression : ( ( rule__XAndExpression__Group__0 ) ) ;
+    // InternalFormat.g:1308:1: ruleXAndExpression : ( ( rule__XAndExpression__Group__0 ) ) ;
     public final void ruleXAndExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1312:2: ( ( ( rule__XAndExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1313:1: ( ( rule__XAndExpression__Group__0 ) )
+            // InternalFormat.g:1312:2: ( ( ( rule__XAndExpression__Group__0 ) ) )
+            // InternalFormat.g:1313:1: ( ( rule__XAndExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1313:1: ( ( rule__XAndExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1314:1: ( rule__XAndExpression__Group__0 )
+            // InternalFormat.g:1313:1: ( ( rule__XAndExpression__Group__0 ) )
+            // InternalFormat.g:1314:1: ( rule__XAndExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1315:1: ( rule__XAndExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1315:2: rule__XAndExpression__Group__0
+            // InternalFormat.g:1315:1: ( rule__XAndExpression__Group__0 )
+            // InternalFormat.g:1315:2: rule__XAndExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XAndExpression__Group__0_in_ruleXAndExpression2743);
+            pushFollow(FOLLOW_2);
             rule__XAndExpression__Group__0();
 
             state._fsp--;
@@ -3948,16 +3948,16 @@ public final void ruleXAndExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpAnd"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1327:1: entryRuleOpAnd : ruleOpAnd EOF ;
+    // InternalFormat.g:1327:1: entryRuleOpAnd : ruleOpAnd EOF ;
     public final void entryRuleOpAnd() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1328:1: ( ruleOpAnd EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1329:1: ruleOpAnd EOF
+            // InternalFormat.g:1328:1: ( ruleOpAnd EOF )
+            // InternalFormat.g:1329:1: ruleOpAnd EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpAndRule()); 
             }
-            pushFollow(FOLLOW_ruleOpAnd_in_entryRuleOpAnd2770);
+            pushFollow(FOLLOW_1);
             ruleOpAnd();
 
             state._fsp--;
@@ -3965,7 +3965,7 @@ public final void entryRuleOpAnd() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpAndRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpAnd2777); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3982,22 +3982,22 @@ public final void entryRuleOpAnd() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpAnd"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1336:1: ruleOpAnd : ( '&&' ) ;
+    // InternalFormat.g:1336:1: ruleOpAnd : ( '&&' ) ;
     public final void ruleOpAnd() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1340:2: ( ( '&&' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1341:1: ( '&&' )
+            // InternalFormat.g:1340:2: ( ( '&&' ) )
+            // InternalFormat.g:1341:1: ( '&&' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1341:1: ( '&&' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1342:1: '&&'
+            // InternalFormat.g:1341:1: ( '&&' )
+            // InternalFormat.g:1342:1: '&&'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpAndAccess().getAmpersandAmpersandKeyword()); 
             }
-            match(input,16,FOLLOW_16_in_ruleOpAnd2804); if (state.failed) return ;
+            match(input,16,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpAndAccess().getAmpersandAmpersandKeyword()); 
             }
@@ -4023,16 +4023,16 @@ public final void ruleOpAnd() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXEqualityExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1357:1: entryRuleXEqualityExpression : ruleXEqualityExpression EOF ;
+    // InternalFormat.g:1357:1: entryRuleXEqualityExpression : ruleXEqualityExpression EOF ;
     public final void entryRuleXEqualityExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1358:1: ( ruleXEqualityExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1359:1: ruleXEqualityExpression EOF
+            // InternalFormat.g:1358:1: ( ruleXEqualityExpression EOF )
+            // InternalFormat.g:1359:1: ruleXEqualityExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXEqualityExpression_in_entryRuleXEqualityExpression2832);
+            pushFollow(FOLLOW_1);
             ruleXEqualityExpression();
 
             state._fsp--;
@@ -4040,7 +4040,7 @@ public final void entryRuleXEqualityExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXEqualityExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXEqualityExpression2839); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4057,25 +4057,25 @@ public final void entryRuleXEqualityExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXEqualityExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1366:1: ruleXEqualityExpression : ( ( rule__XEqualityExpression__Group__0 ) ) ;
+    // InternalFormat.g:1366:1: ruleXEqualityExpression : ( ( rule__XEqualityExpression__Group__0 ) ) ;
     public final void ruleXEqualityExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1370:2: ( ( ( rule__XEqualityExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1371:1: ( ( rule__XEqualityExpression__Group__0 ) )
+            // InternalFormat.g:1370:2: ( ( ( rule__XEqualityExpression__Group__0 ) ) )
+            // InternalFormat.g:1371:1: ( ( rule__XEqualityExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1371:1: ( ( rule__XEqualityExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1372:1: ( rule__XEqualityExpression__Group__0 )
+            // InternalFormat.g:1371:1: ( ( rule__XEqualityExpression__Group__0 ) )
+            // InternalFormat.g:1372:1: ( rule__XEqualityExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1373:1: ( rule__XEqualityExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1373:2: rule__XEqualityExpression__Group__0
+            // InternalFormat.g:1373:1: ( rule__XEqualityExpression__Group__0 )
+            // InternalFormat.g:1373:2: rule__XEqualityExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group__0_in_ruleXEqualityExpression2865);
+            pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group__0();
 
             state._fsp--;
@@ -4108,16 +4108,16 @@ public final void ruleXEqualityExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpEquality"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1385:1: entryRuleOpEquality : ruleOpEquality EOF ;
+    // InternalFormat.g:1385:1: entryRuleOpEquality : ruleOpEquality EOF ;
     public final void entryRuleOpEquality() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1386:1: ( ruleOpEquality EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1387:1: ruleOpEquality EOF
+            // InternalFormat.g:1386:1: ( ruleOpEquality EOF )
+            // InternalFormat.g:1387:1: ruleOpEquality EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpEqualityRule()); 
             }
-            pushFollow(FOLLOW_ruleOpEquality_in_entryRuleOpEquality2892);
+            pushFollow(FOLLOW_1);
             ruleOpEquality();
 
             state._fsp--;
@@ -4125,7 +4125,7 @@ public final void entryRuleOpEquality() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpEqualityRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpEquality2899); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4142,25 +4142,25 @@ public final void entryRuleOpEquality() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpEquality"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1394:1: ruleOpEquality : ( ( rule__OpEquality__Alternatives ) ) ;
+    // InternalFormat.g:1394:1: ruleOpEquality : ( ( rule__OpEquality__Alternatives ) ) ;
     public final void ruleOpEquality() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1398:2: ( ( ( rule__OpEquality__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1399:1: ( ( rule__OpEquality__Alternatives ) )
+            // InternalFormat.g:1398:2: ( ( ( rule__OpEquality__Alternatives ) ) )
+            // InternalFormat.g:1399:1: ( ( rule__OpEquality__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1399:1: ( ( rule__OpEquality__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1400:1: ( rule__OpEquality__Alternatives )
+            // InternalFormat.g:1399:1: ( ( rule__OpEquality__Alternatives ) )
+            // InternalFormat.g:1400:1: ( rule__OpEquality__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpEqualityAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1401:1: ( rule__OpEquality__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1401:2: rule__OpEquality__Alternatives
+            // InternalFormat.g:1401:1: ( rule__OpEquality__Alternatives )
+            // InternalFormat.g:1401:2: rule__OpEquality__Alternatives
             {
-            pushFollow(FOLLOW_rule__OpEquality__Alternatives_in_ruleOpEquality2925);
+            pushFollow(FOLLOW_2);
             rule__OpEquality__Alternatives();
 
             state._fsp--;
@@ -4193,16 +4193,16 @@ public final void ruleOpEquality() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXRelationalExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1413:1: entryRuleXRelationalExpression : ruleXRelationalExpression EOF ;
+    // InternalFormat.g:1413:1: entryRuleXRelationalExpression : ruleXRelationalExpression EOF ;
     public final void entryRuleXRelationalExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1414:1: ( ruleXRelationalExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1415:1: ruleXRelationalExpression EOF
+            // InternalFormat.g:1414:1: ( ruleXRelationalExpression EOF )
+            // InternalFormat.g:1415:1: ruleXRelationalExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXRelationalExpression_in_entryRuleXRelationalExpression2952);
+            pushFollow(FOLLOW_1);
             ruleXRelationalExpression();
 
             state._fsp--;
@@ -4210,7 +4210,7 @@ public final void entryRuleXRelationalExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXRelationalExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXRelationalExpression2959); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4227,25 +4227,25 @@ public final void entryRuleXRelationalExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXRelationalExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1422:1: ruleXRelationalExpression : ( ( rule__XRelationalExpression__Group__0 ) ) ;
+    // InternalFormat.g:1422:1: ruleXRelationalExpression : ( ( rule__XRelationalExpression__Group__0 ) ) ;
     public final void ruleXRelationalExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1426:2: ( ( ( rule__XRelationalExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1427:1: ( ( rule__XRelationalExpression__Group__0 ) )
+            // InternalFormat.g:1426:2: ( ( ( rule__XRelationalExpression__Group__0 ) ) )
+            // InternalFormat.g:1427:1: ( ( rule__XRelationalExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1427:1: ( ( rule__XRelationalExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1428:1: ( rule__XRelationalExpression__Group__0 )
+            // InternalFormat.g:1427:1: ( ( rule__XRelationalExpression__Group__0 ) )
+            // InternalFormat.g:1428:1: ( rule__XRelationalExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1429:1: ( rule__XRelationalExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1429:2: rule__XRelationalExpression__Group__0
+            // InternalFormat.g:1429:1: ( rule__XRelationalExpression__Group__0 )
+            // InternalFormat.g:1429:2: rule__XRelationalExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group__0_in_ruleXRelationalExpression2985);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group__0();
 
             state._fsp--;
@@ -4278,16 +4278,16 @@ public final void ruleXRelationalExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpCompare"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1441:1: entryRuleOpCompare : ruleOpCompare EOF ;
+    // InternalFormat.g:1441:1: entryRuleOpCompare : ruleOpCompare EOF ;
     public final void entryRuleOpCompare() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1442:1: ( ruleOpCompare EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1443:1: ruleOpCompare EOF
+            // InternalFormat.g:1442:1: ( ruleOpCompare EOF )
+            // InternalFormat.g:1443:1: ruleOpCompare EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpCompareRule()); 
             }
-            pushFollow(FOLLOW_ruleOpCompare_in_entryRuleOpCompare3012);
+            pushFollow(FOLLOW_1);
             ruleOpCompare();
 
             state._fsp--;
@@ -4295,7 +4295,7 @@ public final void entryRuleOpCompare() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpCompareRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpCompare3019); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4312,25 +4312,25 @@ public final void entryRuleOpCompare() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpCompare"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1450:1: ruleOpCompare : ( ( rule__OpCompare__Alternatives ) ) ;
+    // InternalFormat.g:1450:1: ruleOpCompare : ( ( rule__OpCompare__Alternatives ) ) ;
     public final void ruleOpCompare() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1454:2: ( ( ( rule__OpCompare__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1455:1: ( ( rule__OpCompare__Alternatives ) )
+            // InternalFormat.g:1454:2: ( ( ( rule__OpCompare__Alternatives ) ) )
+            // InternalFormat.g:1455:1: ( ( rule__OpCompare__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1455:1: ( ( rule__OpCompare__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1456:1: ( rule__OpCompare__Alternatives )
+            // InternalFormat.g:1455:1: ( ( rule__OpCompare__Alternatives ) )
+            // InternalFormat.g:1456:1: ( rule__OpCompare__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpCompareAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1457:1: ( rule__OpCompare__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1457:2: rule__OpCompare__Alternatives
+            // InternalFormat.g:1457:1: ( rule__OpCompare__Alternatives )
+            // InternalFormat.g:1457:2: rule__OpCompare__Alternatives
             {
-            pushFollow(FOLLOW_rule__OpCompare__Alternatives_in_ruleOpCompare3045);
+            pushFollow(FOLLOW_2);
             rule__OpCompare__Alternatives();
 
             state._fsp--;
@@ -4363,16 +4363,16 @@ public final void ruleOpCompare() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXOtherOperatorExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1469:1: entryRuleXOtherOperatorExpression : ruleXOtherOperatorExpression EOF ;
+    // InternalFormat.g:1469:1: entryRuleXOtherOperatorExpression : ruleXOtherOperatorExpression EOF ;
     public final void entryRuleXOtherOperatorExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1470:1: ( ruleXOtherOperatorExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1471:1: ruleXOtherOperatorExpression EOF
+            // InternalFormat.g:1470:1: ( ruleXOtherOperatorExpression EOF )
+            // InternalFormat.g:1471:1: ruleXOtherOperatorExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXOtherOperatorExpression_in_entryRuleXOtherOperatorExpression3072);
+            pushFollow(FOLLOW_1);
             ruleXOtherOperatorExpression();
 
             state._fsp--;
@@ -4380,7 +4380,7 @@ public final void entryRuleXOtherOperatorExpression() throws RecognitionExceptio
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXOtherOperatorExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXOtherOperatorExpression3079); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4397,25 +4397,25 @@ public final void entryRuleXOtherOperatorExpression() throws RecognitionExceptio
 
 
     // $ANTLR start "ruleXOtherOperatorExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1478:1: ruleXOtherOperatorExpression : ( ( rule__XOtherOperatorExpression__Group__0 ) ) ;
+    // InternalFormat.g:1478:1: ruleXOtherOperatorExpression : ( ( rule__XOtherOperatorExpression__Group__0 ) ) ;
     public final void ruleXOtherOperatorExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1482:2: ( ( ( rule__XOtherOperatorExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1483:1: ( ( rule__XOtherOperatorExpression__Group__0 ) )
+            // InternalFormat.g:1482:2: ( ( ( rule__XOtherOperatorExpression__Group__0 ) ) )
+            // InternalFormat.g:1483:1: ( ( rule__XOtherOperatorExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1483:1: ( ( rule__XOtherOperatorExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1484:1: ( rule__XOtherOperatorExpression__Group__0 )
+            // InternalFormat.g:1483:1: ( ( rule__XOtherOperatorExpression__Group__0 ) )
+            // InternalFormat.g:1484:1: ( rule__XOtherOperatorExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1485:1: ( rule__XOtherOperatorExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1485:2: rule__XOtherOperatorExpression__Group__0
+            // InternalFormat.g:1485:1: ( rule__XOtherOperatorExpression__Group__0 )
+            // InternalFormat.g:1485:2: rule__XOtherOperatorExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group__0_in_ruleXOtherOperatorExpression3105);
+            pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group__0();
 
             state._fsp--;
@@ -4448,16 +4448,16 @@ public final void ruleXOtherOperatorExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpOther"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1497:1: entryRuleOpOther : ruleOpOther EOF ;
+    // InternalFormat.g:1497:1: entryRuleOpOther : ruleOpOther EOF ;
     public final void entryRuleOpOther() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1498:1: ( ruleOpOther EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1499:1: ruleOpOther EOF
+            // InternalFormat.g:1498:1: ( ruleOpOther EOF )
+            // InternalFormat.g:1499:1: ruleOpOther EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherRule()); 
             }
-            pushFollow(FOLLOW_ruleOpOther_in_entryRuleOpOther3132);
+            pushFollow(FOLLOW_1);
             ruleOpOther();
 
             state._fsp--;
@@ -4465,7 +4465,7 @@ public final void entryRuleOpOther() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpOtherRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpOther3139); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4482,25 +4482,25 @@ public final void entryRuleOpOther() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpOther"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1506:1: ruleOpOther : ( ( rule__OpOther__Alternatives ) ) ;
+    // InternalFormat.g:1506:1: ruleOpOther : ( ( rule__OpOther__Alternatives ) ) ;
     public final void ruleOpOther() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1510:2: ( ( ( rule__OpOther__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1511:1: ( ( rule__OpOther__Alternatives ) )
+            // InternalFormat.g:1510:2: ( ( ( rule__OpOther__Alternatives ) ) )
+            // InternalFormat.g:1511:1: ( ( rule__OpOther__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1511:1: ( ( rule__OpOther__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1512:1: ( rule__OpOther__Alternatives )
+            // InternalFormat.g:1511:1: ( ( rule__OpOther__Alternatives ) )
+            // InternalFormat.g:1512:1: ( rule__OpOther__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1513:1: ( rule__OpOther__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1513:2: rule__OpOther__Alternatives
+            // InternalFormat.g:1513:1: ( rule__OpOther__Alternatives )
+            // InternalFormat.g:1513:2: rule__OpOther__Alternatives
             {
-            pushFollow(FOLLOW_rule__OpOther__Alternatives_in_ruleOpOther3165);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Alternatives();
 
             state._fsp--;
@@ -4533,16 +4533,16 @@ public final void ruleOpOther() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXAdditiveExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1525:1: entryRuleXAdditiveExpression : ruleXAdditiveExpression EOF ;
+    // InternalFormat.g:1525:1: entryRuleXAdditiveExpression : ruleXAdditiveExpression EOF ;
     public final void entryRuleXAdditiveExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1526:1: ( ruleXAdditiveExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1527:1: ruleXAdditiveExpression EOF
+            // InternalFormat.g:1526:1: ( ruleXAdditiveExpression EOF )
+            // InternalFormat.g:1527:1: ruleXAdditiveExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXAdditiveExpression_in_entryRuleXAdditiveExpression3192);
+            pushFollow(FOLLOW_1);
             ruleXAdditiveExpression();
 
             state._fsp--;
@@ -4550,7 +4550,7 @@ public final void entryRuleXAdditiveExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAdditiveExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAdditiveExpression3199); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4567,25 +4567,25 @@ public final void entryRuleXAdditiveExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXAdditiveExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1534:1: ruleXAdditiveExpression : ( ( rule__XAdditiveExpression__Group__0 ) ) ;
+    // InternalFormat.g:1534:1: ruleXAdditiveExpression : ( ( rule__XAdditiveExpression__Group__0 ) ) ;
     public final void ruleXAdditiveExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1538:2: ( ( ( rule__XAdditiveExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1539:1: ( ( rule__XAdditiveExpression__Group__0 ) )
+            // InternalFormat.g:1538:2: ( ( ( rule__XAdditiveExpression__Group__0 ) ) )
+            // InternalFormat.g:1539:1: ( ( rule__XAdditiveExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1539:1: ( ( rule__XAdditiveExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1540:1: ( rule__XAdditiveExpression__Group__0 )
+            // InternalFormat.g:1539:1: ( ( rule__XAdditiveExpression__Group__0 ) )
+            // InternalFormat.g:1540:1: ( rule__XAdditiveExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1541:1: ( rule__XAdditiveExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1541:2: rule__XAdditiveExpression__Group__0
+            // InternalFormat.g:1541:1: ( rule__XAdditiveExpression__Group__0 )
+            // InternalFormat.g:1541:2: rule__XAdditiveExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group__0_in_ruleXAdditiveExpression3225);
+            pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group__0();
 
             state._fsp--;
@@ -4618,16 +4618,16 @@ public final void ruleXAdditiveExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpAdd"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1553:1: entryRuleOpAdd : ruleOpAdd EOF ;
+    // InternalFormat.g:1553:1: entryRuleOpAdd : ruleOpAdd EOF ;
     public final void entryRuleOpAdd() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1554:1: ( ruleOpAdd EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1555:1: ruleOpAdd EOF
+            // InternalFormat.g:1554:1: ( ruleOpAdd EOF )
+            // InternalFormat.g:1555:1: ruleOpAdd EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpAddRule()); 
             }
-            pushFollow(FOLLOW_ruleOpAdd_in_entryRuleOpAdd3252);
+            pushFollow(FOLLOW_1);
             ruleOpAdd();
 
             state._fsp--;
@@ -4635,7 +4635,7 @@ public final void entryRuleOpAdd() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpAddRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpAdd3259); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4652,25 +4652,25 @@ public final void entryRuleOpAdd() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpAdd"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1562:1: ruleOpAdd : ( ( rule__OpAdd__Alternatives ) ) ;
+    // InternalFormat.g:1562:1: ruleOpAdd : ( ( rule__OpAdd__Alternatives ) ) ;
     public final void ruleOpAdd() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1566:2: ( ( ( rule__OpAdd__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1567:1: ( ( rule__OpAdd__Alternatives ) )
+            // InternalFormat.g:1566:2: ( ( ( rule__OpAdd__Alternatives ) ) )
+            // InternalFormat.g:1567:1: ( ( rule__OpAdd__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1567:1: ( ( rule__OpAdd__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1568:1: ( rule__OpAdd__Alternatives )
+            // InternalFormat.g:1567:1: ( ( rule__OpAdd__Alternatives ) )
+            // InternalFormat.g:1568:1: ( rule__OpAdd__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpAddAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1569:1: ( rule__OpAdd__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1569:2: rule__OpAdd__Alternatives
+            // InternalFormat.g:1569:1: ( rule__OpAdd__Alternatives )
+            // InternalFormat.g:1569:2: rule__OpAdd__Alternatives
             {
-            pushFollow(FOLLOW_rule__OpAdd__Alternatives_in_ruleOpAdd3285);
+            pushFollow(FOLLOW_2);
             rule__OpAdd__Alternatives();
 
             state._fsp--;
@@ -4703,16 +4703,16 @@ public final void ruleOpAdd() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXMultiplicativeExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1581:1: entryRuleXMultiplicativeExpression : ruleXMultiplicativeExpression EOF ;
+    // InternalFormat.g:1581:1: entryRuleXMultiplicativeExpression : ruleXMultiplicativeExpression EOF ;
     public final void entryRuleXMultiplicativeExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1582:1: ( ruleXMultiplicativeExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1583:1: ruleXMultiplicativeExpression EOF
+            // InternalFormat.g:1582:1: ( ruleXMultiplicativeExpression EOF )
+            // InternalFormat.g:1583:1: ruleXMultiplicativeExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXMultiplicativeExpression_in_entryRuleXMultiplicativeExpression3312);
+            pushFollow(FOLLOW_1);
             ruleXMultiplicativeExpression();
 
             state._fsp--;
@@ -4720,7 +4720,7 @@ public final void entryRuleXMultiplicativeExpression() throws RecognitionExcepti
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMultiplicativeExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXMultiplicativeExpression3319); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4737,25 +4737,25 @@ public final void entryRuleXMultiplicativeExpression() throws RecognitionExcepti
 
 
     // $ANTLR start "ruleXMultiplicativeExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1590:1: ruleXMultiplicativeExpression : ( ( rule__XMultiplicativeExpression__Group__0 ) ) ;
+    // InternalFormat.g:1590:1: ruleXMultiplicativeExpression : ( ( rule__XMultiplicativeExpression__Group__0 ) ) ;
     public final void ruleXMultiplicativeExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1594:2: ( ( ( rule__XMultiplicativeExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1595:1: ( ( rule__XMultiplicativeExpression__Group__0 ) )
+            // InternalFormat.g:1594:2: ( ( ( rule__XMultiplicativeExpression__Group__0 ) ) )
+            // InternalFormat.g:1595:1: ( ( rule__XMultiplicativeExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1595:1: ( ( rule__XMultiplicativeExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1596:1: ( rule__XMultiplicativeExpression__Group__0 )
+            // InternalFormat.g:1595:1: ( ( rule__XMultiplicativeExpression__Group__0 ) )
+            // InternalFormat.g:1596:1: ( rule__XMultiplicativeExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1597:1: ( rule__XMultiplicativeExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1597:2: rule__XMultiplicativeExpression__Group__0
+            // InternalFormat.g:1597:1: ( rule__XMultiplicativeExpression__Group__0 )
+            // InternalFormat.g:1597:2: rule__XMultiplicativeExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group__0_in_ruleXMultiplicativeExpression3345);
+            pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group__0();
 
             state._fsp--;
@@ -4788,16 +4788,16 @@ public final void ruleXMultiplicativeExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpMulti"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1609:1: entryRuleOpMulti : ruleOpMulti EOF ;
+    // InternalFormat.g:1609:1: entryRuleOpMulti : ruleOpMulti EOF ;
     public final void entryRuleOpMulti() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1610:1: ( ruleOpMulti EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1611:1: ruleOpMulti EOF
+            // InternalFormat.g:1610:1: ( ruleOpMulti EOF )
+            // InternalFormat.g:1611:1: ruleOpMulti EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiRule()); 
             }
-            pushFollow(FOLLOW_ruleOpMulti_in_entryRuleOpMulti3372);
+            pushFollow(FOLLOW_1);
             ruleOpMulti();
 
             state._fsp--;
@@ -4805,7 +4805,7 @@ public final void entryRuleOpMulti() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpMultiRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpMulti3379); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4822,25 +4822,25 @@ public final void entryRuleOpMulti() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpMulti"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1618:1: ruleOpMulti : ( ( rule__OpMulti__Alternatives ) ) ;
+    // InternalFormat.g:1618:1: ruleOpMulti : ( ( rule__OpMulti__Alternatives ) ) ;
     public final void ruleOpMulti() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1622:2: ( ( ( rule__OpMulti__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1623:1: ( ( rule__OpMulti__Alternatives ) )
+            // InternalFormat.g:1622:2: ( ( ( rule__OpMulti__Alternatives ) ) )
+            // InternalFormat.g:1623:1: ( ( rule__OpMulti__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1623:1: ( ( rule__OpMulti__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1624:1: ( rule__OpMulti__Alternatives )
+            // InternalFormat.g:1623:1: ( ( rule__OpMulti__Alternatives ) )
+            // InternalFormat.g:1624:1: ( rule__OpMulti__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1625:1: ( rule__OpMulti__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1625:2: rule__OpMulti__Alternatives
+            // InternalFormat.g:1625:1: ( rule__OpMulti__Alternatives )
+            // InternalFormat.g:1625:2: rule__OpMulti__Alternatives
             {
-            pushFollow(FOLLOW_rule__OpMulti__Alternatives_in_ruleOpMulti3405);
+            pushFollow(FOLLOW_2);
             rule__OpMulti__Alternatives();
 
             state._fsp--;
@@ -4873,16 +4873,16 @@ public final void ruleOpMulti() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXUnaryOperation"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1637:1: entryRuleXUnaryOperation : ruleXUnaryOperation EOF ;
+    // InternalFormat.g:1637:1: entryRuleXUnaryOperation : ruleXUnaryOperation EOF ;
     public final void entryRuleXUnaryOperation() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1638:1: ( ruleXUnaryOperation EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1639:1: ruleXUnaryOperation EOF
+            // InternalFormat.g:1638:1: ( ruleXUnaryOperation EOF )
+            // InternalFormat.g:1639:1: ruleXUnaryOperation EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationRule()); 
             }
-            pushFollow(FOLLOW_ruleXUnaryOperation_in_entryRuleXUnaryOperation3432);
+            pushFollow(FOLLOW_1);
             ruleXUnaryOperation();
 
             state._fsp--;
@@ -4890,7 +4890,7 @@ public final void entryRuleXUnaryOperation() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXUnaryOperationRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXUnaryOperation3439); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4907,25 +4907,25 @@ public final void entryRuleXUnaryOperation() throws RecognitionException {
 
 
     // $ANTLR start "ruleXUnaryOperation"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1646:1: ruleXUnaryOperation : ( ( rule__XUnaryOperation__Alternatives ) ) ;
+    // InternalFormat.g:1646:1: ruleXUnaryOperation : ( ( rule__XUnaryOperation__Alternatives ) ) ;
     public final void ruleXUnaryOperation() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1650:2: ( ( ( rule__XUnaryOperation__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1651:1: ( ( rule__XUnaryOperation__Alternatives ) )
+            // InternalFormat.g:1650:2: ( ( ( rule__XUnaryOperation__Alternatives ) ) )
+            // InternalFormat.g:1651:1: ( ( rule__XUnaryOperation__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1651:1: ( ( rule__XUnaryOperation__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1652:1: ( rule__XUnaryOperation__Alternatives )
+            // InternalFormat.g:1651:1: ( ( rule__XUnaryOperation__Alternatives ) )
+            // InternalFormat.g:1652:1: ( rule__XUnaryOperation__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1653:1: ( rule__XUnaryOperation__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1653:2: rule__XUnaryOperation__Alternatives
+            // InternalFormat.g:1653:1: ( rule__XUnaryOperation__Alternatives )
+            // InternalFormat.g:1653:2: rule__XUnaryOperation__Alternatives
             {
-            pushFollow(FOLLOW_rule__XUnaryOperation__Alternatives_in_ruleXUnaryOperation3465);
+            pushFollow(FOLLOW_2);
             rule__XUnaryOperation__Alternatives();
 
             state._fsp--;
@@ -4958,16 +4958,16 @@ public final void ruleXUnaryOperation() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpUnary"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1665:1: entryRuleOpUnary : ruleOpUnary EOF ;
+    // InternalFormat.g:1665:1: entryRuleOpUnary : ruleOpUnary EOF ;
     public final void entryRuleOpUnary() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1666:1: ( ruleOpUnary EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1667:1: ruleOpUnary EOF
+            // InternalFormat.g:1666:1: ( ruleOpUnary EOF )
+            // InternalFormat.g:1667:1: ruleOpUnary EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpUnaryRule()); 
             }
-            pushFollow(FOLLOW_ruleOpUnary_in_entryRuleOpUnary3492);
+            pushFollow(FOLLOW_1);
             ruleOpUnary();
 
             state._fsp--;
@@ -4975,7 +4975,7 @@ public final void entryRuleOpUnary() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpUnaryRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpUnary3499); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4992,25 +4992,25 @@ public final void entryRuleOpUnary() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpUnary"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1674:1: ruleOpUnary : ( ( rule__OpUnary__Alternatives ) ) ;
+    // InternalFormat.g:1674:1: ruleOpUnary : ( ( rule__OpUnary__Alternatives ) ) ;
     public final void ruleOpUnary() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1678:2: ( ( ( rule__OpUnary__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1679:1: ( ( rule__OpUnary__Alternatives ) )
+            // InternalFormat.g:1678:2: ( ( ( rule__OpUnary__Alternatives ) ) )
+            // InternalFormat.g:1679:1: ( ( rule__OpUnary__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1679:1: ( ( rule__OpUnary__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1680:1: ( rule__OpUnary__Alternatives )
+            // InternalFormat.g:1679:1: ( ( rule__OpUnary__Alternatives ) )
+            // InternalFormat.g:1680:1: ( rule__OpUnary__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpUnaryAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1681:1: ( rule__OpUnary__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1681:2: rule__OpUnary__Alternatives
+            // InternalFormat.g:1681:1: ( rule__OpUnary__Alternatives )
+            // InternalFormat.g:1681:2: rule__OpUnary__Alternatives
             {
-            pushFollow(FOLLOW_rule__OpUnary__Alternatives_in_ruleOpUnary3525);
+            pushFollow(FOLLOW_2);
             rule__OpUnary__Alternatives();
 
             state._fsp--;
@@ -5043,16 +5043,16 @@ public final void ruleOpUnary() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXCastedExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1693:1: entryRuleXCastedExpression : ruleXCastedExpression EOF ;
+    // InternalFormat.g:1693:1: entryRuleXCastedExpression : ruleXCastedExpression EOF ;
     public final void entryRuleXCastedExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1694:1: ( ruleXCastedExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1695:1: ruleXCastedExpression EOF
+            // InternalFormat.g:1694:1: ( ruleXCastedExpression EOF )
+            // InternalFormat.g:1695:1: ruleXCastedExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXCastedExpression_in_entryRuleXCastedExpression3552);
+            pushFollow(FOLLOW_1);
             ruleXCastedExpression();
 
             state._fsp--;
@@ -5060,7 +5060,7 @@ public final void entryRuleXCastedExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXCastedExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXCastedExpression3559); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -5077,25 +5077,25 @@ public final void entryRuleXCastedExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXCastedExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1702:1: ruleXCastedExpression : ( ( rule__XCastedExpression__Group__0 ) ) ;
+    // InternalFormat.g:1702:1: ruleXCastedExpression : ( ( rule__XCastedExpression__Group__0 ) ) ;
     public final void ruleXCastedExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1706:2: ( ( ( rule__XCastedExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1707:1: ( ( rule__XCastedExpression__Group__0 ) )
+            // InternalFormat.g:1706:2: ( ( ( rule__XCastedExpression__Group__0 ) ) )
+            // InternalFormat.g:1707:1: ( ( rule__XCastedExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1707:1: ( ( rule__XCastedExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1708:1: ( rule__XCastedExpression__Group__0 )
+            // InternalFormat.g:1707:1: ( ( rule__XCastedExpression__Group__0 ) )
+            // InternalFormat.g:1708:1: ( rule__XCastedExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1709:1: ( rule__XCastedExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1709:2: rule__XCastedExpression__Group__0
+            // InternalFormat.g:1709:1: ( rule__XCastedExpression__Group__0 )
+            // InternalFormat.g:1709:2: rule__XCastedExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__Group__0_in_ruleXCastedExpression3585);
+            pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group__0();
 
             state._fsp--;
@@ -5128,16 +5128,16 @@ public final void ruleXCastedExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXPostfixOperation"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1721:1: entryRuleXPostfixOperation : ruleXPostfixOperation EOF ;
+    // InternalFormat.g:1721:1: entryRuleXPostfixOperation : ruleXPostfixOperation EOF ;
     public final void entryRuleXPostfixOperation() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1722:1: ( ruleXPostfixOperation EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1723:1: ruleXPostfixOperation EOF
+            // InternalFormat.g:1722:1: ( ruleXPostfixOperation EOF )
+            // InternalFormat.g:1723:1: ruleXPostfixOperation EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationRule()); 
             }
-            pushFollow(FOLLOW_ruleXPostfixOperation_in_entryRuleXPostfixOperation3612);
+            pushFollow(FOLLOW_1);
             ruleXPostfixOperation();
 
             state._fsp--;
@@ -5145,7 +5145,7 @@ public final void entryRuleXPostfixOperation() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXPostfixOperationRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXPostfixOperation3619); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -5162,25 +5162,25 @@ public final void entryRuleXPostfixOperation() throws RecognitionException {
 
 
     // $ANTLR start "ruleXPostfixOperation"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1730:1: ruleXPostfixOperation : ( ( rule__XPostfixOperation__Group__0 ) ) ;
+    // InternalFormat.g:1730:1: ruleXPostfixOperation : ( ( rule__XPostfixOperation__Group__0 ) ) ;
     public final void ruleXPostfixOperation() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1734:2: ( ( ( rule__XPostfixOperation__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1735:1: ( ( rule__XPostfixOperation__Group__0 ) )
+            // InternalFormat.g:1734:2: ( ( ( rule__XPostfixOperation__Group__0 ) ) )
+            // InternalFormat.g:1735:1: ( ( rule__XPostfixOperation__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1735:1: ( ( rule__XPostfixOperation__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1736:1: ( rule__XPostfixOperation__Group__0 )
+            // InternalFormat.g:1735:1: ( ( rule__XPostfixOperation__Group__0 ) )
+            // InternalFormat.g:1736:1: ( rule__XPostfixOperation__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1737:1: ( rule__XPostfixOperation__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1737:2: rule__XPostfixOperation__Group__0
+            // InternalFormat.g:1737:1: ( rule__XPostfixOperation__Group__0 )
+            // InternalFormat.g:1737:2: rule__XPostfixOperation__Group__0
             {
-            pushFollow(FOLLOW_rule__XPostfixOperation__Group__0_in_ruleXPostfixOperation3645);
+            pushFollow(FOLLOW_2);
             rule__XPostfixOperation__Group__0();
 
             state._fsp--;
@@ -5213,16 +5213,16 @@ public final void ruleXPostfixOperation() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpPostfix"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1749:1: entryRuleOpPostfix : ruleOpPostfix EOF ;
+    // InternalFormat.g:1749:1: entryRuleOpPostfix : ruleOpPostfix EOF ;
     public final void entryRuleOpPostfix() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1750:1: ( ruleOpPostfix EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1751:1: ruleOpPostfix EOF
+            // InternalFormat.g:1750:1: ( ruleOpPostfix EOF )
+            // InternalFormat.g:1751:1: ruleOpPostfix EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpPostfixRule()); 
             }
-            pushFollow(FOLLOW_ruleOpPostfix_in_entryRuleOpPostfix3672);
+            pushFollow(FOLLOW_1);
             ruleOpPostfix();
 
             state._fsp--;
@@ -5230,7 +5230,7 @@ public final void entryRuleOpPostfix() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpPostfixRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpPostfix3679); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -5247,25 +5247,25 @@ public final void entryRuleOpPostfix() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpPostfix"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1758:1: ruleOpPostfix : ( ( rule__OpPostfix__Alternatives ) ) ;
+    // InternalFormat.g:1758:1: ruleOpPostfix : ( ( rule__OpPostfix__Alternatives ) ) ;
     public final void ruleOpPostfix() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1762:2: ( ( ( rule__OpPostfix__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1763:1: ( ( rule__OpPostfix__Alternatives ) )
+            // InternalFormat.g:1762:2: ( ( ( rule__OpPostfix__Alternatives ) ) )
+            // InternalFormat.g:1763:1: ( ( rule__OpPostfix__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1763:1: ( ( rule__OpPostfix__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1764:1: ( rule__OpPostfix__Alternatives )
+            // InternalFormat.g:1763:1: ( ( rule__OpPostfix__Alternatives ) )
+            // InternalFormat.g:1764:1: ( rule__OpPostfix__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpPostfixAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1765:1: ( rule__OpPostfix__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1765:2: rule__OpPostfix__Alternatives
+            // InternalFormat.g:1765:1: ( rule__OpPostfix__Alternatives )
+            // InternalFormat.g:1765:2: rule__OpPostfix__Alternatives
             {
-            pushFollow(FOLLOW_rule__OpPostfix__Alternatives_in_ruleOpPostfix3705);
+            pushFollow(FOLLOW_2);
             rule__OpPostfix__Alternatives();
 
             state._fsp--;
@@ -5298,16 +5298,16 @@ public final void ruleOpPostfix() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXMemberFeatureCall"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1777:1: entryRuleXMemberFeatureCall : ruleXMemberFeatureCall EOF ;
+    // InternalFormat.g:1777:1: entryRuleXMemberFeatureCall : ruleXMemberFeatureCall EOF ;
     public final void entryRuleXMemberFeatureCall() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1778:1: ( ruleXMemberFeatureCall EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1779:1: ruleXMemberFeatureCall EOF
+            // InternalFormat.g:1778:1: ( ruleXMemberFeatureCall EOF )
+            // InternalFormat.g:1779:1: ruleXMemberFeatureCall EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallRule()); 
             }
-            pushFollow(FOLLOW_ruleXMemberFeatureCall_in_entryRuleXMemberFeatureCall3732);
+            pushFollow(FOLLOW_1);
             ruleXMemberFeatureCall();
 
             state._fsp--;
@@ -5315,7 +5315,7 @@ public final void entryRuleXMemberFeatureCall() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXMemberFeatureCall3739); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -5332,25 +5332,25 @@ public final void entryRuleXMemberFeatureCall() throws RecognitionException {
 
 
     // $ANTLR start "ruleXMemberFeatureCall"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1786:1: ruleXMemberFeatureCall : ( ( rule__XMemberFeatureCall__Group__0 ) ) ;
+    // InternalFormat.g:1786:1: ruleXMemberFeatureCall : ( ( rule__XMemberFeatureCall__Group__0 ) ) ;
     public final void ruleXMemberFeatureCall() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1790:2: ( ( ( rule__XMemberFeatureCall__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1791:1: ( ( rule__XMemberFeatureCall__Group__0 ) )
+            // InternalFormat.g:1790:2: ( ( ( rule__XMemberFeatureCall__Group__0 ) ) )
+            // InternalFormat.g:1791:1: ( ( rule__XMemberFeatureCall__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1791:1: ( ( rule__XMemberFeatureCall__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1792:1: ( rule__XMemberFeatureCall__Group__0 )
+            // InternalFormat.g:1791:1: ( ( rule__XMemberFeatureCall__Group__0 ) )
+            // InternalFormat.g:1792:1: ( rule__XMemberFeatureCall__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1793:1: ( rule__XMemberFeatureCall__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1793:2: rule__XMemberFeatureCall__Group__0
+            // InternalFormat.g:1793:1: ( rule__XMemberFeatureCall__Group__0 )
+            // InternalFormat.g:1793:2: rule__XMemberFeatureCall__Group__0
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group__0_in_ruleXMemberFeatureCall3765);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group__0();
 
             state._fsp--;
@@ -5383,16 +5383,16 @@ public final void ruleXMemberFeatureCall() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXPrimaryExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1805:1: entryRuleXPrimaryExpression : ruleXPrimaryExpression EOF ;
+    // InternalFormat.g:1805:1: entryRuleXPrimaryExpression : ruleXPrimaryExpression EOF ;
     public final void entryRuleXPrimaryExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1806:1: ( ruleXPrimaryExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1807:1: ruleXPrimaryExpression EOF
+            // InternalFormat.g:1806:1: ( ruleXPrimaryExpression EOF )
+            // InternalFormat.g:1807:1: ruleXPrimaryExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPrimaryExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXPrimaryExpression_in_entryRuleXPrimaryExpression3792);
+            pushFollow(FOLLOW_1);
             ruleXPrimaryExpression();
 
             state._fsp--;
@@ -5400,7 +5400,7 @@ public final void entryRuleXPrimaryExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXPrimaryExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXPrimaryExpression3799); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -5417,25 +5417,25 @@ public final void entryRuleXPrimaryExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXPrimaryExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1814:1: ruleXPrimaryExpression : ( ( rule__XPrimaryExpression__Alternatives ) ) ;
+    // InternalFormat.g:1814:1: ruleXPrimaryExpression : ( ( rule__XPrimaryExpression__Alternatives ) ) ;
     public final void ruleXPrimaryExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1818:2: ( ( ( rule__XPrimaryExpression__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1819:1: ( ( rule__XPrimaryExpression__Alternatives ) )
+            // InternalFormat.g:1818:2: ( ( ( rule__XPrimaryExpression__Alternatives ) ) )
+            // InternalFormat.g:1819:1: ( ( rule__XPrimaryExpression__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1819:1: ( ( rule__XPrimaryExpression__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1820:1: ( rule__XPrimaryExpression__Alternatives )
+            // InternalFormat.g:1819:1: ( ( rule__XPrimaryExpression__Alternatives ) )
+            // InternalFormat.g:1820:1: ( rule__XPrimaryExpression__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPrimaryExpressionAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1821:1: ( rule__XPrimaryExpression__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1821:2: rule__XPrimaryExpression__Alternatives
+            // InternalFormat.g:1821:1: ( rule__XPrimaryExpression__Alternatives )
+            // InternalFormat.g:1821:2: rule__XPrimaryExpression__Alternatives
             {
-            pushFollow(FOLLOW_rule__XPrimaryExpression__Alternatives_in_ruleXPrimaryExpression3825);
+            pushFollow(FOLLOW_2);
             rule__XPrimaryExpression__Alternatives();
 
             state._fsp--;
@@ -5468,16 +5468,16 @@ public final void ruleXPrimaryExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXLiteral"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1833:1: entryRuleXLiteral : ruleXLiteral EOF ;
+    // InternalFormat.g:1833:1: entryRuleXLiteral : ruleXLiteral EOF ;
     public final void entryRuleXLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1834:1: ( ruleXLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1835:1: ruleXLiteral EOF
+            // InternalFormat.g:1834:1: ( ruleXLiteral EOF )
+            // InternalFormat.g:1835:1: ruleXLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXLiteral_in_entryRuleXLiteral3852);
+            pushFollow(FOLLOW_1);
             ruleXLiteral();
 
             state._fsp--;
@@ -5485,7 +5485,7 @@ public final void entryRuleXLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXLiteral3859); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -5502,25 +5502,25 @@ public final void entryRuleXLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXLiteral"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1842:1: ruleXLiteral : ( ( rule__XLiteral__Alternatives ) ) ;
+    // InternalFormat.g:1842:1: ruleXLiteral : ( ( rule__XLiteral__Alternatives ) ) ;
     public final void ruleXLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1846:2: ( ( ( rule__XLiteral__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1847:1: ( ( rule__XLiteral__Alternatives ) )
+            // InternalFormat.g:1846:2: ( ( ( rule__XLiteral__Alternatives ) ) )
+            // InternalFormat.g:1847:1: ( ( rule__XLiteral__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1847:1: ( ( rule__XLiteral__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1848:1: ( rule__XLiteral__Alternatives )
+            // InternalFormat.g:1847:1: ( ( rule__XLiteral__Alternatives ) )
+            // InternalFormat.g:1848:1: ( rule__XLiteral__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXLiteralAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1849:1: ( rule__XLiteral__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1849:2: rule__XLiteral__Alternatives
+            // InternalFormat.g:1849:1: ( rule__XLiteral__Alternatives )
+            // InternalFormat.g:1849:2: rule__XLiteral__Alternatives
             {
-            pushFollow(FOLLOW_rule__XLiteral__Alternatives_in_ruleXLiteral3885);
+            pushFollow(FOLLOW_2);
             rule__XLiteral__Alternatives();
 
             state._fsp--;
@@ -5553,16 +5553,16 @@ public final void ruleXLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXCollectionLiteral"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1861:1: entryRuleXCollectionLiteral : ruleXCollectionLiteral EOF ;
+    // InternalFormat.g:1861:1: entryRuleXCollectionLiteral : ruleXCollectionLiteral EOF ;
     public final void entryRuleXCollectionLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1862:1: ( ruleXCollectionLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1863:1: ruleXCollectionLiteral EOF
+            // InternalFormat.g:1862:1: ( ruleXCollectionLiteral EOF )
+            // InternalFormat.g:1863:1: ruleXCollectionLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCollectionLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXCollectionLiteral_in_entryRuleXCollectionLiteral3912);
+            pushFollow(FOLLOW_1);
             ruleXCollectionLiteral();
 
             state._fsp--;
@@ -5570,7 +5570,7 @@ public final void entryRuleXCollectionLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXCollectionLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXCollectionLiteral3919); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -5587,25 +5587,25 @@ public final void entryRuleXCollectionLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXCollectionLiteral"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1870:1: ruleXCollectionLiteral : ( ( rule__XCollectionLiteral__Alternatives ) ) ;
+    // InternalFormat.g:1870:1: ruleXCollectionLiteral : ( ( rule__XCollectionLiteral__Alternatives ) ) ;
     public final void ruleXCollectionLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1874:2: ( ( ( rule__XCollectionLiteral__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1875:1: ( ( rule__XCollectionLiteral__Alternatives ) )
+            // InternalFormat.g:1874:2: ( ( ( rule__XCollectionLiteral__Alternatives ) ) )
+            // InternalFormat.g:1875:1: ( ( rule__XCollectionLiteral__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1875:1: ( ( rule__XCollectionLiteral__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1876:1: ( rule__XCollectionLiteral__Alternatives )
+            // InternalFormat.g:1875:1: ( ( rule__XCollectionLiteral__Alternatives ) )
+            // InternalFormat.g:1876:1: ( rule__XCollectionLiteral__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCollectionLiteralAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1877:1: ( rule__XCollectionLiteral__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1877:2: rule__XCollectionLiteral__Alternatives
+            // InternalFormat.g:1877:1: ( rule__XCollectionLiteral__Alternatives )
+            // InternalFormat.g:1877:2: rule__XCollectionLiteral__Alternatives
             {
-            pushFollow(FOLLOW_rule__XCollectionLiteral__Alternatives_in_ruleXCollectionLiteral3945);
+            pushFollow(FOLLOW_2);
             rule__XCollectionLiteral__Alternatives();
 
             state._fsp--;
@@ -5638,16 +5638,16 @@ public final void ruleXCollectionLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXSetLiteral"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1889:1: entryRuleXSetLiteral : ruleXSetLiteral EOF ;
+    // InternalFormat.g:1889:1: entryRuleXSetLiteral : ruleXSetLiteral EOF ;
     public final void entryRuleXSetLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1890:1: ( ruleXSetLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1891:1: ruleXSetLiteral EOF
+            // InternalFormat.g:1890:1: ( ruleXSetLiteral EOF )
+            // InternalFormat.g:1891:1: ruleXSetLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXSetLiteral_in_entryRuleXSetLiteral3972);
+            pushFollow(FOLLOW_1);
             ruleXSetLiteral();
 
             state._fsp--;
@@ -5655,7 +5655,7 @@ public final void entryRuleXSetLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSetLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXSetLiteral3979); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -5672,25 +5672,25 @@ public final void entryRuleXSetLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXSetLiteral"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1898:1: ruleXSetLiteral : ( ( rule__XSetLiteral__Group__0 ) ) ;
+    // InternalFormat.g:1898:1: ruleXSetLiteral : ( ( rule__XSetLiteral__Group__0 ) ) ;
     public final void ruleXSetLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1902:2: ( ( ( rule__XSetLiteral__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1903:1: ( ( rule__XSetLiteral__Group__0 ) )
+            // InternalFormat.g:1902:2: ( ( ( rule__XSetLiteral__Group__0 ) ) )
+            // InternalFormat.g:1903:1: ( ( rule__XSetLiteral__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1903:1: ( ( rule__XSetLiteral__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1904:1: ( rule__XSetLiteral__Group__0 )
+            // InternalFormat.g:1903:1: ( ( rule__XSetLiteral__Group__0 ) )
+            // InternalFormat.g:1904:1: ( rule__XSetLiteral__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1905:1: ( rule__XSetLiteral__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1905:2: rule__XSetLiteral__Group__0
+            // InternalFormat.g:1905:1: ( rule__XSetLiteral__Group__0 )
+            // InternalFormat.g:1905:2: rule__XSetLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__Group__0_in_ruleXSetLiteral4005);
+            pushFollow(FOLLOW_2);
             rule__XSetLiteral__Group__0();
 
             state._fsp--;
@@ -5723,16 +5723,16 @@ public final void ruleXSetLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXListLiteral"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1917:1: entryRuleXListLiteral : ruleXListLiteral EOF ;
+    // InternalFormat.g:1917:1: entryRuleXListLiteral : ruleXListLiteral EOF ;
     public final void entryRuleXListLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1918:1: ( ruleXListLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1919:1: ruleXListLiteral EOF
+            // InternalFormat.g:1918:1: ( ruleXListLiteral EOF )
+            // InternalFormat.g:1919:1: ruleXListLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXListLiteral_in_entryRuleXListLiteral4032);
+            pushFollow(FOLLOW_1);
             ruleXListLiteral();
 
             state._fsp--;
@@ -5740,7 +5740,7 @@ public final void entryRuleXListLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXListLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXListLiteral4039); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -5757,25 +5757,25 @@ public final void entryRuleXListLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXListLiteral"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1926:1: ruleXListLiteral : ( ( rule__XListLiteral__Group__0 ) ) ;
+    // InternalFormat.g:1926:1: ruleXListLiteral : ( ( rule__XListLiteral__Group__0 ) ) ;
     public final void ruleXListLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1930:2: ( ( ( rule__XListLiteral__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1931:1: ( ( rule__XListLiteral__Group__0 ) )
+            // InternalFormat.g:1930:2: ( ( ( rule__XListLiteral__Group__0 ) ) )
+            // InternalFormat.g:1931:1: ( ( rule__XListLiteral__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1931:1: ( ( rule__XListLiteral__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1932:1: ( rule__XListLiteral__Group__0 )
+            // InternalFormat.g:1931:1: ( ( rule__XListLiteral__Group__0 ) )
+            // InternalFormat.g:1932:1: ( rule__XListLiteral__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1933:1: ( rule__XListLiteral__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1933:2: rule__XListLiteral__Group__0
+            // InternalFormat.g:1933:1: ( rule__XListLiteral__Group__0 )
+            // InternalFormat.g:1933:2: rule__XListLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__XListLiteral__Group__0_in_ruleXListLiteral4065);
+            pushFollow(FOLLOW_2);
             rule__XListLiteral__Group__0();
 
             state._fsp--;
@@ -5808,16 +5808,16 @@ public final void ruleXListLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXClosure"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1945:1: entryRuleXClosure : ruleXClosure EOF ;
+    // InternalFormat.g:1945:1: entryRuleXClosure : ruleXClosure EOF ;
     public final void entryRuleXClosure() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1946:1: ( ruleXClosure EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1947:1: ruleXClosure EOF
+            // InternalFormat.g:1946:1: ( ruleXClosure EOF )
+            // InternalFormat.g:1947:1: ruleXClosure EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureRule()); 
             }
-            pushFollow(FOLLOW_ruleXClosure_in_entryRuleXClosure4092);
+            pushFollow(FOLLOW_1);
             ruleXClosure();
 
             state._fsp--;
@@ -5825,7 +5825,7 @@ public final void entryRuleXClosure() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXClosureRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXClosure4099); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -5842,25 +5842,25 @@ public final void entryRuleXClosure() throws RecognitionException {
 
 
     // $ANTLR start "ruleXClosure"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1954:1: ruleXClosure : ( ( rule__XClosure__Group__0 ) ) ;
+    // InternalFormat.g:1954:1: ruleXClosure : ( ( rule__XClosure__Group__0 ) ) ;
     public final void ruleXClosure() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1958:2: ( ( ( rule__XClosure__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1959:1: ( ( rule__XClosure__Group__0 ) )
+            // InternalFormat.g:1958:2: ( ( ( rule__XClosure__Group__0 ) ) )
+            // InternalFormat.g:1959:1: ( ( rule__XClosure__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1959:1: ( ( rule__XClosure__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1960:1: ( rule__XClosure__Group__0 )
+            // InternalFormat.g:1959:1: ( ( rule__XClosure__Group__0 ) )
+            // InternalFormat.g:1960:1: ( rule__XClosure__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1961:1: ( rule__XClosure__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1961:2: rule__XClosure__Group__0
+            // InternalFormat.g:1961:1: ( rule__XClosure__Group__0 )
+            // InternalFormat.g:1961:2: rule__XClosure__Group__0
             {
-            pushFollow(FOLLOW_rule__XClosure__Group__0_in_ruleXClosure4125);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group__0();
 
             state._fsp--;
@@ -5893,16 +5893,16 @@ public final void ruleXClosure() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXExpressionInClosure"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1973:1: entryRuleXExpressionInClosure : ruleXExpressionInClosure EOF ;
+    // InternalFormat.g:1973:1: entryRuleXExpressionInClosure : ruleXExpressionInClosure EOF ;
     public final void entryRuleXExpressionInClosure() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1974:1: ( ruleXExpressionInClosure EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1975:1: ruleXExpressionInClosure EOF
+            // InternalFormat.g:1974:1: ( ruleXExpressionInClosure EOF )
+            // InternalFormat.g:1975:1: ruleXExpressionInClosure EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionInClosureRule()); 
             }
-            pushFollow(FOLLOW_ruleXExpressionInClosure_in_entryRuleXExpressionInClosure4152);
+            pushFollow(FOLLOW_1);
             ruleXExpressionInClosure();
 
             state._fsp--;
@@ -5910,7 +5910,7 @@ public final void entryRuleXExpressionInClosure() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXExpressionInClosureRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXExpressionInClosure4159); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -5927,25 +5927,25 @@ public final void entryRuleXExpressionInClosure() throws RecognitionException {
 
 
     // $ANTLR start "ruleXExpressionInClosure"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1982:1: ruleXExpressionInClosure : ( ( rule__XExpressionInClosure__Group__0 ) ) ;
+    // InternalFormat.g:1982:1: ruleXExpressionInClosure : ( ( rule__XExpressionInClosure__Group__0 ) ) ;
     public final void ruleXExpressionInClosure() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1986:2: ( ( ( rule__XExpressionInClosure__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1987:1: ( ( rule__XExpressionInClosure__Group__0 ) )
+            // InternalFormat.g:1986:2: ( ( ( rule__XExpressionInClosure__Group__0 ) ) )
+            // InternalFormat.g:1987:1: ( ( rule__XExpressionInClosure__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1987:1: ( ( rule__XExpressionInClosure__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1988:1: ( rule__XExpressionInClosure__Group__0 )
+            // InternalFormat.g:1987:1: ( ( rule__XExpressionInClosure__Group__0 ) )
+            // InternalFormat.g:1988:1: ( rule__XExpressionInClosure__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionInClosureAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1989:1: ( rule__XExpressionInClosure__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:1989:2: rule__XExpressionInClosure__Group__0
+            // InternalFormat.g:1989:1: ( rule__XExpressionInClosure__Group__0 )
+            // InternalFormat.g:1989:2: rule__XExpressionInClosure__Group__0
             {
-            pushFollow(FOLLOW_rule__XExpressionInClosure__Group__0_in_ruleXExpressionInClosure4185);
+            pushFollow(FOLLOW_2);
             rule__XExpressionInClosure__Group__0();
 
             state._fsp--;
@@ -5978,16 +5978,16 @@ public final void ruleXExpressionInClosure() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXShortClosure"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2001:1: entryRuleXShortClosure : ruleXShortClosure EOF ;
+    // InternalFormat.g:2001:1: entryRuleXShortClosure : ruleXShortClosure EOF ;
     public final void entryRuleXShortClosure() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2002:1: ( ruleXShortClosure EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2003:1: ruleXShortClosure EOF
+            // InternalFormat.g:2002:1: ( ruleXShortClosure EOF )
+            // InternalFormat.g:2003:1: ruleXShortClosure EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureRule()); 
             }
-            pushFollow(FOLLOW_ruleXShortClosure_in_entryRuleXShortClosure4212);
+            pushFollow(FOLLOW_1);
             ruleXShortClosure();
 
             state._fsp--;
@@ -5995,7 +5995,7 @@ public final void entryRuleXShortClosure() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXShortClosureRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXShortClosure4219); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -6012,25 +6012,25 @@ public final void entryRuleXShortClosure() throws RecognitionException {
 
 
     // $ANTLR start "ruleXShortClosure"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2010:1: ruleXShortClosure : ( ( rule__XShortClosure__Group__0 ) ) ;
+    // InternalFormat.g:2010:1: ruleXShortClosure : ( ( rule__XShortClosure__Group__0 ) ) ;
     public final void ruleXShortClosure() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2014:2: ( ( ( rule__XShortClosure__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2015:1: ( ( rule__XShortClosure__Group__0 ) )
+            // InternalFormat.g:2014:2: ( ( ( rule__XShortClosure__Group__0 ) ) )
+            // InternalFormat.g:2015:1: ( ( rule__XShortClosure__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2015:1: ( ( rule__XShortClosure__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2016:1: ( rule__XShortClosure__Group__0 )
+            // InternalFormat.g:2015:1: ( ( rule__XShortClosure__Group__0 ) )
+            // InternalFormat.g:2016:1: ( rule__XShortClosure__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2017:1: ( rule__XShortClosure__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2017:2: rule__XShortClosure__Group__0
+            // InternalFormat.g:2017:1: ( rule__XShortClosure__Group__0 )
+            // InternalFormat.g:2017:2: rule__XShortClosure__Group__0
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group__0_in_ruleXShortClosure4245);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__Group__0();
 
             state._fsp--;
@@ -6063,16 +6063,16 @@ public final void ruleXShortClosure() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXParenthesizedExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2029:1: entryRuleXParenthesizedExpression : ruleXParenthesizedExpression EOF ;
+    // InternalFormat.g:2029:1: entryRuleXParenthesizedExpression : ruleXParenthesizedExpression EOF ;
     public final void entryRuleXParenthesizedExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2030:1: ( ruleXParenthesizedExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2031:1: ruleXParenthesizedExpression EOF
+            // InternalFormat.g:2030:1: ( ruleXParenthesizedExpression EOF )
+            // InternalFormat.g:2031:1: ruleXParenthesizedExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXParenthesizedExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXParenthesizedExpression_in_entryRuleXParenthesizedExpression4272);
+            pushFollow(FOLLOW_1);
             ruleXParenthesizedExpression();
 
             state._fsp--;
@@ -6080,7 +6080,7 @@ public final void entryRuleXParenthesizedExpression() throws RecognitionExceptio
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXParenthesizedExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXParenthesizedExpression4279); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -6097,25 +6097,25 @@ public final void entryRuleXParenthesizedExpression() throws RecognitionExceptio
 
 
     // $ANTLR start "ruleXParenthesizedExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2038:1: ruleXParenthesizedExpression : ( ( rule__XParenthesizedExpression__Group__0 ) ) ;
+    // InternalFormat.g:2038:1: ruleXParenthesizedExpression : ( ( rule__XParenthesizedExpression__Group__0 ) ) ;
     public final void ruleXParenthesizedExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2042:2: ( ( ( rule__XParenthesizedExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2043:1: ( ( rule__XParenthesizedExpression__Group__0 ) )
+            // InternalFormat.g:2042:2: ( ( ( rule__XParenthesizedExpression__Group__0 ) ) )
+            // InternalFormat.g:2043:1: ( ( rule__XParenthesizedExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2043:1: ( ( rule__XParenthesizedExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2044:1: ( rule__XParenthesizedExpression__Group__0 )
+            // InternalFormat.g:2043:1: ( ( rule__XParenthesizedExpression__Group__0 ) )
+            // InternalFormat.g:2044:1: ( rule__XParenthesizedExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXParenthesizedExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2045:1: ( rule__XParenthesizedExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2045:2: rule__XParenthesizedExpression__Group__0
+            // InternalFormat.g:2045:1: ( rule__XParenthesizedExpression__Group__0 )
+            // InternalFormat.g:2045:2: rule__XParenthesizedExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XParenthesizedExpression__Group__0_in_ruleXParenthesizedExpression4305);
+            pushFollow(FOLLOW_2);
             rule__XParenthesizedExpression__Group__0();
 
             state._fsp--;
@@ -6148,16 +6148,16 @@ public final void ruleXParenthesizedExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXIfExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2057:1: entryRuleXIfExpression : ruleXIfExpression EOF ;
+    // InternalFormat.g:2057:1: entryRuleXIfExpression : ruleXIfExpression EOF ;
     public final void entryRuleXIfExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2058:1: ( ruleXIfExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2059:1: ruleXIfExpression EOF
+            // InternalFormat.g:2058:1: ( ruleXIfExpression EOF )
+            // InternalFormat.g:2059:1: ruleXIfExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXIfExpression_in_entryRuleXIfExpression4332);
+            pushFollow(FOLLOW_1);
             ruleXIfExpression();
 
             state._fsp--;
@@ -6165,7 +6165,7 @@ public final void entryRuleXIfExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXIfExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXIfExpression4339); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -6182,25 +6182,25 @@ public final void entryRuleXIfExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXIfExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2066:1: ruleXIfExpression : ( ( rule__XIfExpression__Group__0 ) ) ;
+    // InternalFormat.g:2066:1: ruleXIfExpression : ( ( rule__XIfExpression__Group__0 ) ) ;
     public final void ruleXIfExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2070:2: ( ( ( rule__XIfExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2071:1: ( ( rule__XIfExpression__Group__0 ) )
+            // InternalFormat.g:2070:2: ( ( ( rule__XIfExpression__Group__0 ) ) )
+            // InternalFormat.g:2071:1: ( ( rule__XIfExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2071:1: ( ( rule__XIfExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2072:1: ( rule__XIfExpression__Group__0 )
+            // InternalFormat.g:2071:1: ( ( rule__XIfExpression__Group__0 ) )
+            // InternalFormat.g:2072:1: ( rule__XIfExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2073:1: ( rule__XIfExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2073:2: rule__XIfExpression__Group__0
+            // InternalFormat.g:2073:1: ( rule__XIfExpression__Group__0 )
+            // InternalFormat.g:2073:2: rule__XIfExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XIfExpression__Group__0_in_ruleXIfExpression4365);
+            pushFollow(FOLLOW_2);
             rule__XIfExpression__Group__0();
 
             state._fsp--;
@@ -6233,16 +6233,16 @@ public final void ruleXIfExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXSwitchExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2085:1: entryRuleXSwitchExpression : ruleXSwitchExpression EOF ;
+    // InternalFormat.g:2085:1: entryRuleXSwitchExpression : ruleXSwitchExpression EOF ;
     public final void entryRuleXSwitchExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2086:1: ( ruleXSwitchExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2087:1: ruleXSwitchExpression EOF
+            // InternalFormat.g:2086:1: ( ruleXSwitchExpression EOF )
+            // InternalFormat.g:2087:1: ruleXSwitchExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXSwitchExpression_in_entryRuleXSwitchExpression4392);
+            pushFollow(FOLLOW_1);
             ruleXSwitchExpression();
 
             state._fsp--;
@@ -6250,7 +6250,7 @@ public final void entryRuleXSwitchExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXSwitchExpression4399); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -6267,25 +6267,25 @@ public final void entryRuleXSwitchExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXSwitchExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2094:1: ruleXSwitchExpression : ( ( rule__XSwitchExpression__Group__0 ) ) ;
+    // InternalFormat.g:2094:1: ruleXSwitchExpression : ( ( rule__XSwitchExpression__Group__0 ) ) ;
     public final void ruleXSwitchExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2098:2: ( ( ( rule__XSwitchExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2099:1: ( ( rule__XSwitchExpression__Group__0 ) )
+            // InternalFormat.g:2098:2: ( ( ( rule__XSwitchExpression__Group__0 ) ) )
+            // InternalFormat.g:2099:1: ( ( rule__XSwitchExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2099:1: ( ( rule__XSwitchExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2100:1: ( rule__XSwitchExpression__Group__0 )
+            // InternalFormat.g:2099:1: ( ( rule__XSwitchExpression__Group__0 ) )
+            // InternalFormat.g:2100:1: ( rule__XSwitchExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2101:1: ( rule__XSwitchExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2101:2: rule__XSwitchExpression__Group__0
+            // InternalFormat.g:2101:1: ( rule__XSwitchExpression__Group__0 )
+            // InternalFormat.g:2101:2: rule__XSwitchExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__0_in_ruleXSwitchExpression4425);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group__0();
 
             state._fsp--;
@@ -6318,16 +6318,16 @@ public final void ruleXSwitchExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXCasePart"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2113:1: entryRuleXCasePart : ruleXCasePart EOF ;
+    // InternalFormat.g:2113:1: entryRuleXCasePart : ruleXCasePart EOF ;
     public final void entryRuleXCasePart() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2114:1: ( ruleXCasePart EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2115:1: ruleXCasePart EOF
+            // InternalFormat.g:2114:1: ( ruleXCasePart EOF )
+            // InternalFormat.g:2115:1: ruleXCasePart EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartRule()); 
             }
-            pushFollow(FOLLOW_ruleXCasePart_in_entryRuleXCasePart4452);
+            pushFollow(FOLLOW_1);
             ruleXCasePart();
 
             state._fsp--;
@@ -6335,7 +6335,7 @@ public final void entryRuleXCasePart() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXCasePartRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXCasePart4459); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -6352,25 +6352,25 @@ public final void entryRuleXCasePart() throws RecognitionException {
 
 
     // $ANTLR start "ruleXCasePart"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2122:1: ruleXCasePart : ( ( rule__XCasePart__Group__0 ) ) ;
+    // InternalFormat.g:2122:1: ruleXCasePart : ( ( rule__XCasePart__Group__0 ) ) ;
     public final void ruleXCasePart() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2126:2: ( ( ( rule__XCasePart__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2127:1: ( ( rule__XCasePart__Group__0 ) )
+            // InternalFormat.g:2126:2: ( ( ( rule__XCasePart__Group__0 ) ) )
+            // InternalFormat.g:2127:1: ( ( rule__XCasePart__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2127:1: ( ( rule__XCasePart__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2128:1: ( rule__XCasePart__Group__0 )
+            // InternalFormat.g:2127:1: ( ( rule__XCasePart__Group__0 ) )
+            // InternalFormat.g:2128:1: ( rule__XCasePart__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2129:1: ( rule__XCasePart__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2129:2: rule__XCasePart__Group__0
+            // InternalFormat.g:2129:1: ( rule__XCasePart__Group__0 )
+            // InternalFormat.g:2129:2: rule__XCasePart__Group__0
             {
-            pushFollow(FOLLOW_rule__XCasePart__Group__0_in_ruleXCasePart4485);
+            pushFollow(FOLLOW_2);
             rule__XCasePart__Group__0();
 
             state._fsp--;
@@ -6403,16 +6403,16 @@ public final void ruleXCasePart() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXForLoopExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2141:1: entryRuleXForLoopExpression : ruleXForLoopExpression EOF ;
+    // InternalFormat.g:2141:1: entryRuleXForLoopExpression : ruleXForLoopExpression EOF ;
     public final void entryRuleXForLoopExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2142:1: ( ruleXForLoopExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2143:1: ruleXForLoopExpression EOF
+            // InternalFormat.g:2142:1: ( ruleXForLoopExpression EOF )
+            // InternalFormat.g:2143:1: ruleXForLoopExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXForLoopExpression_in_entryRuleXForLoopExpression4512);
+            pushFollow(FOLLOW_1);
             ruleXForLoopExpression();
 
             state._fsp--;
@@ -6420,7 +6420,7 @@ public final void entryRuleXForLoopExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXForLoopExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXForLoopExpression4519); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -6437,25 +6437,25 @@ public final void entryRuleXForLoopExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXForLoopExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2150:1: ruleXForLoopExpression : ( ( rule__XForLoopExpression__Group__0 ) ) ;
+    // InternalFormat.g:2150:1: ruleXForLoopExpression : ( ( rule__XForLoopExpression__Group__0 ) ) ;
     public final void ruleXForLoopExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2154:2: ( ( ( rule__XForLoopExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2155:1: ( ( rule__XForLoopExpression__Group__0 ) )
+            // InternalFormat.g:2154:2: ( ( ( rule__XForLoopExpression__Group__0 ) ) )
+            // InternalFormat.g:2155:1: ( ( rule__XForLoopExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2155:1: ( ( rule__XForLoopExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2156:1: ( rule__XForLoopExpression__Group__0 )
+            // InternalFormat.g:2155:1: ( ( rule__XForLoopExpression__Group__0 ) )
+            // InternalFormat.g:2156:1: ( rule__XForLoopExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2157:1: ( rule__XForLoopExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2157:2: rule__XForLoopExpression__Group__0
+            // InternalFormat.g:2157:1: ( rule__XForLoopExpression__Group__0 )
+            // InternalFormat.g:2157:2: rule__XForLoopExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group__0_in_ruleXForLoopExpression4545);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group__0();
 
             state._fsp--;
@@ -6488,16 +6488,16 @@ public final void ruleXForLoopExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXBasicForLoopExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2169:1: entryRuleXBasicForLoopExpression : ruleXBasicForLoopExpression EOF ;
+    // InternalFormat.g:2169:1: entryRuleXBasicForLoopExpression : ruleXBasicForLoopExpression EOF ;
     public final void entryRuleXBasicForLoopExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2170:1: ( ruleXBasicForLoopExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2171:1: ruleXBasicForLoopExpression EOF
+            // InternalFormat.g:2170:1: ( ruleXBasicForLoopExpression EOF )
+            // InternalFormat.g:2171:1: ruleXBasicForLoopExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXBasicForLoopExpression_in_entryRuleXBasicForLoopExpression4572);
+            pushFollow(FOLLOW_1);
             ruleXBasicForLoopExpression();
 
             state._fsp--;
@@ -6505,7 +6505,7 @@ public final void entryRuleXBasicForLoopExpression() throws RecognitionException
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBasicForLoopExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXBasicForLoopExpression4579); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -6522,25 +6522,25 @@ public final void entryRuleXBasicForLoopExpression() throws RecognitionException
 
 
     // $ANTLR start "ruleXBasicForLoopExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2178:1: ruleXBasicForLoopExpression : ( ( rule__XBasicForLoopExpression__Group__0 ) ) ;
+    // InternalFormat.g:2178:1: ruleXBasicForLoopExpression : ( ( rule__XBasicForLoopExpression__Group__0 ) ) ;
     public final void ruleXBasicForLoopExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2182:2: ( ( ( rule__XBasicForLoopExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2183:1: ( ( rule__XBasicForLoopExpression__Group__0 ) )
+            // InternalFormat.g:2182:2: ( ( ( rule__XBasicForLoopExpression__Group__0 ) ) )
+            // InternalFormat.g:2183:1: ( ( rule__XBasicForLoopExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2183:1: ( ( rule__XBasicForLoopExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2184:1: ( rule__XBasicForLoopExpression__Group__0 )
+            // InternalFormat.g:2183:1: ( ( rule__XBasicForLoopExpression__Group__0 ) )
+            // InternalFormat.g:2184:1: ( rule__XBasicForLoopExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2185:1: ( rule__XBasicForLoopExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2185:2: rule__XBasicForLoopExpression__Group__0
+            // InternalFormat.g:2185:1: ( rule__XBasicForLoopExpression__Group__0 )
+            // InternalFormat.g:2185:2: rule__XBasicForLoopExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__0_in_ruleXBasicForLoopExpression4605);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group__0();
 
             state._fsp--;
@@ -6573,16 +6573,16 @@ public final void ruleXBasicForLoopExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXWhileExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2197:1: entryRuleXWhileExpression : ruleXWhileExpression EOF ;
+    // InternalFormat.g:2197:1: entryRuleXWhileExpression : ruleXWhileExpression EOF ;
     public final void entryRuleXWhileExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2198:1: ( ruleXWhileExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2199:1: ruleXWhileExpression EOF
+            // InternalFormat.g:2198:1: ( ruleXWhileExpression EOF )
+            // InternalFormat.g:2199:1: ruleXWhileExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXWhileExpression_in_entryRuleXWhileExpression4632);
+            pushFollow(FOLLOW_1);
             ruleXWhileExpression();
 
             state._fsp--;
@@ -6590,7 +6590,7 @@ public final void entryRuleXWhileExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXWhileExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXWhileExpression4639); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -6607,25 +6607,25 @@ public final void entryRuleXWhileExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXWhileExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2206:1: ruleXWhileExpression : ( ( rule__XWhileExpression__Group__0 ) ) ;
+    // InternalFormat.g:2206:1: ruleXWhileExpression : ( ( rule__XWhileExpression__Group__0 ) ) ;
     public final void ruleXWhileExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2210:2: ( ( ( rule__XWhileExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2211:1: ( ( rule__XWhileExpression__Group__0 ) )
+            // InternalFormat.g:2210:2: ( ( ( rule__XWhileExpression__Group__0 ) ) )
+            // InternalFormat.g:2211:1: ( ( rule__XWhileExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2211:1: ( ( rule__XWhileExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2212:1: ( rule__XWhileExpression__Group__0 )
+            // InternalFormat.g:2211:1: ( ( rule__XWhileExpression__Group__0 ) )
+            // InternalFormat.g:2212:1: ( rule__XWhileExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2213:1: ( rule__XWhileExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2213:2: rule__XWhileExpression__Group__0
+            // InternalFormat.g:2213:1: ( rule__XWhileExpression__Group__0 )
+            // InternalFormat.g:2213:2: rule__XWhileExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__0_in_ruleXWhileExpression4665);
+            pushFollow(FOLLOW_2);
             rule__XWhileExpression__Group__0();
 
             state._fsp--;
@@ -6658,16 +6658,16 @@ public final void ruleXWhileExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXDoWhileExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2225:1: entryRuleXDoWhileExpression : ruleXDoWhileExpression EOF ;
+    // InternalFormat.g:2225:1: entryRuleXDoWhileExpression : ruleXDoWhileExpression EOF ;
     public final void entryRuleXDoWhileExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2226:1: ( ruleXDoWhileExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2227:1: ruleXDoWhileExpression EOF
+            // InternalFormat.g:2226:1: ( ruleXDoWhileExpression EOF )
+            // InternalFormat.g:2227:1: ruleXDoWhileExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXDoWhileExpression_in_entryRuleXDoWhileExpression4692);
+            pushFollow(FOLLOW_1);
             ruleXDoWhileExpression();
 
             state._fsp--;
@@ -6675,7 +6675,7 @@ public final void entryRuleXDoWhileExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXDoWhileExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXDoWhileExpression4699); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -6692,25 +6692,25 @@ public final void entryRuleXDoWhileExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXDoWhileExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2234:1: ruleXDoWhileExpression : ( ( rule__XDoWhileExpression__Group__0 ) ) ;
+    // InternalFormat.g:2234:1: ruleXDoWhileExpression : ( ( rule__XDoWhileExpression__Group__0 ) ) ;
     public final void ruleXDoWhileExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2238:2: ( ( ( rule__XDoWhileExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2239:1: ( ( rule__XDoWhileExpression__Group__0 ) )
+            // InternalFormat.g:2238:2: ( ( ( rule__XDoWhileExpression__Group__0 ) ) )
+            // InternalFormat.g:2239:1: ( ( rule__XDoWhileExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2239:1: ( ( rule__XDoWhileExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2240:1: ( rule__XDoWhileExpression__Group__0 )
+            // InternalFormat.g:2239:1: ( ( rule__XDoWhileExpression__Group__0 ) )
+            // InternalFormat.g:2240:1: ( rule__XDoWhileExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2241:1: ( rule__XDoWhileExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2241:2: rule__XDoWhileExpression__Group__0
+            // InternalFormat.g:2241:1: ( rule__XDoWhileExpression__Group__0 )
+            // InternalFormat.g:2241:2: rule__XDoWhileExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__0_in_ruleXDoWhileExpression4725);
+            pushFollow(FOLLOW_2);
             rule__XDoWhileExpression__Group__0();
 
             state._fsp--;
@@ -6743,16 +6743,16 @@ public final void ruleXDoWhileExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXBlockExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2253:1: entryRuleXBlockExpression : ruleXBlockExpression EOF ;
+    // InternalFormat.g:2253:1: entryRuleXBlockExpression : ruleXBlockExpression EOF ;
     public final void entryRuleXBlockExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2254:1: ( ruleXBlockExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2255:1: ruleXBlockExpression EOF
+            // InternalFormat.g:2254:1: ( ruleXBlockExpression EOF )
+            // InternalFormat.g:2255:1: ruleXBlockExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXBlockExpression_in_entryRuleXBlockExpression4752);
+            pushFollow(FOLLOW_1);
             ruleXBlockExpression();
 
             state._fsp--;
@@ -6760,7 +6760,7 @@ public final void entryRuleXBlockExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBlockExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXBlockExpression4759); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -6777,25 +6777,25 @@ public final void entryRuleXBlockExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXBlockExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2262:1: ruleXBlockExpression : ( ( rule__XBlockExpression__Group__0 ) ) ;
+    // InternalFormat.g:2262:1: ruleXBlockExpression : ( ( rule__XBlockExpression__Group__0 ) ) ;
     public final void ruleXBlockExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2266:2: ( ( ( rule__XBlockExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2267:1: ( ( rule__XBlockExpression__Group__0 ) )
+            // InternalFormat.g:2266:2: ( ( ( rule__XBlockExpression__Group__0 ) ) )
+            // InternalFormat.g:2267:1: ( ( rule__XBlockExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2267:1: ( ( rule__XBlockExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2268:1: ( rule__XBlockExpression__Group__0 )
+            // InternalFormat.g:2267:1: ( ( rule__XBlockExpression__Group__0 ) )
+            // InternalFormat.g:2268:1: ( rule__XBlockExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2269:1: ( rule__XBlockExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2269:2: rule__XBlockExpression__Group__0
+            // InternalFormat.g:2269:1: ( rule__XBlockExpression__Group__0 )
+            // InternalFormat.g:2269:2: rule__XBlockExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XBlockExpression__Group__0_in_ruleXBlockExpression4785);
+            pushFollow(FOLLOW_2);
             rule__XBlockExpression__Group__0();
 
             state._fsp--;
@@ -6828,16 +6828,16 @@ public final void ruleXBlockExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXExpressionOrVarDeclaration"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2281:1: entryRuleXExpressionOrVarDeclaration : ruleXExpressionOrVarDeclaration EOF ;
+    // InternalFormat.g:2281:1: entryRuleXExpressionOrVarDeclaration : ruleXExpressionOrVarDeclaration EOF ;
     public final void entryRuleXExpressionOrVarDeclaration() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2282:1: ( ruleXExpressionOrVarDeclaration EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2283:1: ruleXExpressionOrVarDeclaration EOF
+            // InternalFormat.g:2282:1: ( ruleXExpressionOrVarDeclaration EOF )
+            // InternalFormat.g:2283:1: ruleXExpressionOrVarDeclaration EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionOrVarDeclarationRule()); 
             }
-            pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_entryRuleXExpressionOrVarDeclaration4812);
+            pushFollow(FOLLOW_1);
             ruleXExpressionOrVarDeclaration();
 
             state._fsp--;
@@ -6845,7 +6845,7 @@ public final void entryRuleXExpressionOrVarDeclaration() throws RecognitionExcep
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXExpressionOrVarDeclarationRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXExpressionOrVarDeclaration4819); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -6862,25 +6862,25 @@ public final void entryRuleXExpressionOrVarDeclaration() throws RecognitionExcep
 
 
     // $ANTLR start "ruleXExpressionOrVarDeclaration"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2290:1: ruleXExpressionOrVarDeclaration : ( ( rule__XExpressionOrVarDeclaration__Alternatives ) ) ;
+    // InternalFormat.g:2290:1: ruleXExpressionOrVarDeclaration : ( ( rule__XExpressionOrVarDeclaration__Alternatives ) ) ;
     public final void ruleXExpressionOrVarDeclaration() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2294:2: ( ( ( rule__XExpressionOrVarDeclaration__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2295:1: ( ( rule__XExpressionOrVarDeclaration__Alternatives ) )
+            // InternalFormat.g:2294:2: ( ( ( rule__XExpressionOrVarDeclaration__Alternatives ) ) )
+            // InternalFormat.g:2295:1: ( ( rule__XExpressionOrVarDeclaration__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2295:1: ( ( rule__XExpressionOrVarDeclaration__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2296:1: ( rule__XExpressionOrVarDeclaration__Alternatives )
+            // InternalFormat.g:2295:1: ( ( rule__XExpressionOrVarDeclaration__Alternatives ) )
+            // InternalFormat.g:2296:1: ( rule__XExpressionOrVarDeclaration__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionOrVarDeclarationAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2297:1: ( rule__XExpressionOrVarDeclaration__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2297:2: rule__XExpressionOrVarDeclaration__Alternatives
+            // InternalFormat.g:2297:1: ( rule__XExpressionOrVarDeclaration__Alternatives )
+            // InternalFormat.g:2297:2: rule__XExpressionOrVarDeclaration__Alternatives
             {
-            pushFollow(FOLLOW_rule__XExpressionOrVarDeclaration__Alternatives_in_ruleXExpressionOrVarDeclaration4845);
+            pushFollow(FOLLOW_2);
             rule__XExpressionOrVarDeclaration__Alternatives();
 
             state._fsp--;
@@ -6913,16 +6913,16 @@ public final void ruleXExpressionOrVarDeclaration() throws RecognitionException
 
 
     // $ANTLR start "entryRuleXVariableDeclaration"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2309:1: entryRuleXVariableDeclaration : ruleXVariableDeclaration EOF ;
+    // InternalFormat.g:2309:1: entryRuleXVariableDeclaration : ruleXVariableDeclaration EOF ;
     public final void entryRuleXVariableDeclaration() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2310:1: ( ruleXVariableDeclaration EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2311:1: ruleXVariableDeclaration EOF
+            // InternalFormat.g:2310:1: ( ruleXVariableDeclaration EOF )
+            // InternalFormat.g:2311:1: ruleXVariableDeclaration EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationRule()); 
             }
-            pushFollow(FOLLOW_ruleXVariableDeclaration_in_entryRuleXVariableDeclaration4872);
+            pushFollow(FOLLOW_1);
             ruleXVariableDeclaration();
 
             state._fsp--;
@@ -6930,7 +6930,7 @@ public final void entryRuleXVariableDeclaration() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXVariableDeclarationRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXVariableDeclaration4879); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -6947,25 +6947,25 @@ public final void entryRuleXVariableDeclaration() throws RecognitionException {
 
 
     // $ANTLR start "ruleXVariableDeclaration"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2318:1: ruleXVariableDeclaration : ( ( rule__XVariableDeclaration__Group__0 ) ) ;
+    // InternalFormat.g:2318:1: ruleXVariableDeclaration : ( ( rule__XVariableDeclaration__Group__0 ) ) ;
     public final void ruleXVariableDeclaration() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2322:2: ( ( ( rule__XVariableDeclaration__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2323:1: ( ( rule__XVariableDeclaration__Group__0 ) )
+            // InternalFormat.g:2322:2: ( ( ( rule__XVariableDeclaration__Group__0 ) ) )
+            // InternalFormat.g:2323:1: ( ( rule__XVariableDeclaration__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2323:1: ( ( rule__XVariableDeclaration__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2324:1: ( rule__XVariableDeclaration__Group__0 )
+            // InternalFormat.g:2323:1: ( ( rule__XVariableDeclaration__Group__0 ) )
+            // InternalFormat.g:2324:1: ( rule__XVariableDeclaration__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2325:1: ( rule__XVariableDeclaration__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2325:2: rule__XVariableDeclaration__Group__0
+            // InternalFormat.g:2325:1: ( rule__XVariableDeclaration__Group__0 )
+            // InternalFormat.g:2325:2: rule__XVariableDeclaration__Group__0
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group__0_in_ruleXVariableDeclaration4905);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group__0();
 
             state._fsp--;
@@ -6998,16 +6998,16 @@ public final void ruleXVariableDeclaration() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleJvmFormalParameter"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2337:1: entryRuleJvmFormalParameter : ruleJvmFormalParameter EOF ;
+    // InternalFormat.g:2337:1: entryRuleJvmFormalParameter : ruleJvmFormalParameter EOF ;
     public final void entryRuleJvmFormalParameter() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2338:1: ( ruleJvmFormalParameter EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2339:1: ruleJvmFormalParameter EOF
+            // InternalFormat.g:2338:1: ( ruleJvmFormalParameter EOF )
+            // InternalFormat.g:2339:1: ruleJvmFormalParameter EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmFormalParameterRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmFormalParameter_in_entryRuleJvmFormalParameter4932);
+            pushFollow(FOLLOW_1);
             ruleJvmFormalParameter();
 
             state._fsp--;
@@ -7015,7 +7015,7 @@ public final void entryRuleJvmFormalParameter() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmFormalParameterRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmFormalParameter4939); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -7032,25 +7032,25 @@ public final void entryRuleJvmFormalParameter() throws RecognitionException {
 
 
     // $ANTLR start "ruleJvmFormalParameter"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2346:1: ruleJvmFormalParameter : ( ( rule__JvmFormalParameter__Group__0 ) ) ;
+    // InternalFormat.g:2346:1: ruleJvmFormalParameter : ( ( rule__JvmFormalParameter__Group__0 ) ) ;
     public final void ruleJvmFormalParameter() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2350:2: ( ( ( rule__JvmFormalParameter__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2351:1: ( ( rule__JvmFormalParameter__Group__0 ) )
+            // InternalFormat.g:2350:2: ( ( ( rule__JvmFormalParameter__Group__0 ) ) )
+            // InternalFormat.g:2351:1: ( ( rule__JvmFormalParameter__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2351:1: ( ( rule__JvmFormalParameter__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2352:1: ( rule__JvmFormalParameter__Group__0 )
+            // InternalFormat.g:2351:1: ( ( rule__JvmFormalParameter__Group__0 ) )
+            // InternalFormat.g:2352:1: ( rule__JvmFormalParameter__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmFormalParameterAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2353:1: ( rule__JvmFormalParameter__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2353:2: rule__JvmFormalParameter__Group__0
+            // InternalFormat.g:2353:1: ( rule__JvmFormalParameter__Group__0 )
+            // InternalFormat.g:2353:2: rule__JvmFormalParameter__Group__0
             {
-            pushFollow(FOLLOW_rule__JvmFormalParameter__Group__0_in_ruleJvmFormalParameter4965);
+            pushFollow(FOLLOW_2);
             rule__JvmFormalParameter__Group__0();
 
             state._fsp--;
@@ -7083,16 +7083,16 @@ public final void ruleJvmFormalParameter() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleFullJvmFormalParameter"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2365:1: entryRuleFullJvmFormalParameter : ruleFullJvmFormalParameter EOF ;
+    // InternalFormat.g:2365:1: entryRuleFullJvmFormalParameter : ruleFullJvmFormalParameter EOF ;
     public final void entryRuleFullJvmFormalParameter() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2366:1: ( ruleFullJvmFormalParameter EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2367:1: ruleFullJvmFormalParameter EOF
+            // InternalFormat.g:2366:1: ( ruleFullJvmFormalParameter EOF )
+            // InternalFormat.g:2367:1: ruleFullJvmFormalParameter EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFullJvmFormalParameterRule()); 
             }
-            pushFollow(FOLLOW_ruleFullJvmFormalParameter_in_entryRuleFullJvmFormalParameter4992);
+            pushFollow(FOLLOW_1);
             ruleFullJvmFormalParameter();
 
             state._fsp--;
@@ -7100,7 +7100,7 @@ public final void entryRuleFullJvmFormalParameter() throws RecognitionException
             if ( state.backtracking==0 ) {
                after(grammarAccess.getFullJvmFormalParameterRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFullJvmFormalParameter4999); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -7117,25 +7117,25 @@ public final void entryRuleFullJvmFormalParameter() throws RecognitionException
 
 
     // $ANTLR start "ruleFullJvmFormalParameter"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2374:1: ruleFullJvmFormalParameter : ( ( rule__FullJvmFormalParameter__Group__0 ) ) ;
+    // InternalFormat.g:2374:1: ruleFullJvmFormalParameter : ( ( rule__FullJvmFormalParameter__Group__0 ) ) ;
     public final void ruleFullJvmFormalParameter() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2378:2: ( ( ( rule__FullJvmFormalParameter__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2379:1: ( ( rule__FullJvmFormalParameter__Group__0 ) )
+            // InternalFormat.g:2378:2: ( ( ( rule__FullJvmFormalParameter__Group__0 ) ) )
+            // InternalFormat.g:2379:1: ( ( rule__FullJvmFormalParameter__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2379:1: ( ( rule__FullJvmFormalParameter__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2380:1: ( rule__FullJvmFormalParameter__Group__0 )
+            // InternalFormat.g:2379:1: ( ( rule__FullJvmFormalParameter__Group__0 ) )
+            // InternalFormat.g:2380:1: ( rule__FullJvmFormalParameter__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFullJvmFormalParameterAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2381:1: ( rule__FullJvmFormalParameter__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2381:2: rule__FullJvmFormalParameter__Group__0
+            // InternalFormat.g:2381:1: ( rule__FullJvmFormalParameter__Group__0 )
+            // InternalFormat.g:2381:2: rule__FullJvmFormalParameter__Group__0
             {
-            pushFollow(FOLLOW_rule__FullJvmFormalParameter__Group__0_in_ruleFullJvmFormalParameter5025);
+            pushFollow(FOLLOW_2);
             rule__FullJvmFormalParameter__Group__0();
 
             state._fsp--;
@@ -7168,16 +7168,16 @@ public final void ruleFullJvmFormalParameter() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXFeatureCall"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2393:1: entryRuleXFeatureCall : ruleXFeatureCall EOF ;
+    // InternalFormat.g:2393:1: entryRuleXFeatureCall : ruleXFeatureCall EOF ;
     public final void entryRuleXFeatureCall() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2394:1: ( ruleXFeatureCall EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2395:1: ruleXFeatureCall EOF
+            // InternalFormat.g:2394:1: ( ruleXFeatureCall EOF )
+            // InternalFormat.g:2395:1: ruleXFeatureCall EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallRule()); 
             }
-            pushFollow(FOLLOW_ruleXFeatureCall_in_entryRuleXFeatureCall5052);
+            pushFollow(FOLLOW_1);
             ruleXFeatureCall();
 
             state._fsp--;
@@ -7185,7 +7185,7 @@ public final void entryRuleXFeatureCall() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFeatureCallRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXFeatureCall5059); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -7202,25 +7202,25 @@ public final void entryRuleXFeatureCall() throws RecognitionException {
 
 
     // $ANTLR start "ruleXFeatureCall"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2402:1: ruleXFeatureCall : ( ( rule__XFeatureCall__Group__0 ) ) ;
+    // InternalFormat.g:2402:1: ruleXFeatureCall : ( ( rule__XFeatureCall__Group__0 ) ) ;
     public final void ruleXFeatureCall() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2406:2: ( ( ( rule__XFeatureCall__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2407:1: ( ( rule__XFeatureCall__Group__0 ) )
+            // InternalFormat.g:2406:2: ( ( ( rule__XFeatureCall__Group__0 ) ) )
+            // InternalFormat.g:2407:1: ( ( rule__XFeatureCall__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2407:1: ( ( rule__XFeatureCall__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2408:1: ( rule__XFeatureCall__Group__0 )
+            // InternalFormat.g:2407:1: ( ( rule__XFeatureCall__Group__0 ) )
+            // InternalFormat.g:2408:1: ( rule__XFeatureCall__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2409:1: ( rule__XFeatureCall__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2409:2: rule__XFeatureCall__Group__0
+            // InternalFormat.g:2409:1: ( rule__XFeatureCall__Group__0 )
+            // InternalFormat.g:2409:2: rule__XFeatureCall__Group__0
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group__0_in_ruleXFeatureCall5085);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group__0();
 
             state._fsp--;
@@ -7253,16 +7253,16 @@ public final void ruleXFeatureCall() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleFeatureCallID"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2421:1: entryRuleFeatureCallID : ruleFeatureCallID EOF ;
+    // InternalFormat.g:2421:1: entryRuleFeatureCallID : ruleFeatureCallID EOF ;
     public final void entryRuleFeatureCallID() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2422:1: ( ruleFeatureCallID EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2423:1: ruleFeatureCallID EOF
+            // InternalFormat.g:2422:1: ( ruleFeatureCallID EOF )
+            // InternalFormat.g:2423:1: ruleFeatureCallID EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFeatureCallIDRule()); 
             }
-            pushFollow(FOLLOW_ruleFeatureCallID_in_entryRuleFeatureCallID5112);
+            pushFollow(FOLLOW_1);
             ruleFeatureCallID();
 
             state._fsp--;
@@ -7270,7 +7270,7 @@ public final void entryRuleFeatureCallID() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getFeatureCallIDRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFeatureCallID5119); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -7287,25 +7287,25 @@ public final void entryRuleFeatureCallID() throws RecognitionException {
 
 
     // $ANTLR start "ruleFeatureCallID"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2430:1: ruleFeatureCallID : ( ( rule__FeatureCallID__Alternatives ) ) ;
+    // InternalFormat.g:2430:1: ruleFeatureCallID : ( ( rule__FeatureCallID__Alternatives ) ) ;
     public final void ruleFeatureCallID() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2434:2: ( ( ( rule__FeatureCallID__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2435:1: ( ( rule__FeatureCallID__Alternatives ) )
+            // InternalFormat.g:2434:2: ( ( ( rule__FeatureCallID__Alternatives ) ) )
+            // InternalFormat.g:2435:1: ( ( rule__FeatureCallID__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2435:1: ( ( rule__FeatureCallID__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2436:1: ( rule__FeatureCallID__Alternatives )
+            // InternalFormat.g:2435:1: ( ( rule__FeatureCallID__Alternatives ) )
+            // InternalFormat.g:2436:1: ( rule__FeatureCallID__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFeatureCallIDAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2437:1: ( rule__FeatureCallID__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2437:2: rule__FeatureCallID__Alternatives
+            // InternalFormat.g:2437:1: ( rule__FeatureCallID__Alternatives )
+            // InternalFormat.g:2437:2: rule__FeatureCallID__Alternatives
             {
-            pushFollow(FOLLOW_rule__FeatureCallID__Alternatives_in_ruleFeatureCallID5145);
+            pushFollow(FOLLOW_2);
             rule__FeatureCallID__Alternatives();
 
             state._fsp--;
@@ -7338,16 +7338,16 @@ public final void ruleFeatureCallID() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleIdOrSuper"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2449:1: entryRuleIdOrSuper : ruleIdOrSuper EOF ;
+    // InternalFormat.g:2449:1: entryRuleIdOrSuper : ruleIdOrSuper EOF ;
     public final void entryRuleIdOrSuper() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2450:1: ( ruleIdOrSuper EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2451:1: ruleIdOrSuper EOF
+            // InternalFormat.g:2450:1: ( ruleIdOrSuper EOF )
+            // InternalFormat.g:2451:1: ruleIdOrSuper EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIdOrSuperRule()); 
             }
-            pushFollow(FOLLOW_ruleIdOrSuper_in_entryRuleIdOrSuper5172);
+            pushFollow(FOLLOW_1);
             ruleIdOrSuper();
 
             state._fsp--;
@@ -7355,7 +7355,7 @@ public final void entryRuleIdOrSuper() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIdOrSuperRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIdOrSuper5179); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -7372,25 +7372,25 @@ public final void entryRuleIdOrSuper() throws RecognitionException {
 
 
     // $ANTLR start "ruleIdOrSuper"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2458:1: ruleIdOrSuper : ( ( rule__IdOrSuper__Alternatives ) ) ;
+    // InternalFormat.g:2458:1: ruleIdOrSuper : ( ( rule__IdOrSuper__Alternatives ) ) ;
     public final void ruleIdOrSuper() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2462:2: ( ( ( rule__IdOrSuper__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2463:1: ( ( rule__IdOrSuper__Alternatives ) )
+            // InternalFormat.g:2462:2: ( ( ( rule__IdOrSuper__Alternatives ) ) )
+            // InternalFormat.g:2463:1: ( ( rule__IdOrSuper__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2463:1: ( ( rule__IdOrSuper__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2464:1: ( rule__IdOrSuper__Alternatives )
+            // InternalFormat.g:2463:1: ( ( rule__IdOrSuper__Alternatives ) )
+            // InternalFormat.g:2464:1: ( rule__IdOrSuper__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIdOrSuperAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2465:1: ( rule__IdOrSuper__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2465:2: rule__IdOrSuper__Alternatives
+            // InternalFormat.g:2465:1: ( rule__IdOrSuper__Alternatives )
+            // InternalFormat.g:2465:2: rule__IdOrSuper__Alternatives
             {
-            pushFollow(FOLLOW_rule__IdOrSuper__Alternatives_in_ruleIdOrSuper5205);
+            pushFollow(FOLLOW_2);
             rule__IdOrSuper__Alternatives();
 
             state._fsp--;
@@ -7423,16 +7423,16 @@ public final void ruleIdOrSuper() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXConstructorCall"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2477:1: entryRuleXConstructorCall : ruleXConstructorCall EOF ;
+    // InternalFormat.g:2477:1: entryRuleXConstructorCall : ruleXConstructorCall EOF ;
     public final void entryRuleXConstructorCall() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2478:1: ( ruleXConstructorCall EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2479:1: ruleXConstructorCall EOF
+            // InternalFormat.g:2478:1: ( ruleXConstructorCall EOF )
+            // InternalFormat.g:2479:1: ruleXConstructorCall EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallRule()); 
             }
-            pushFollow(FOLLOW_ruleXConstructorCall_in_entryRuleXConstructorCall5232);
+            pushFollow(FOLLOW_1);
             ruleXConstructorCall();
 
             state._fsp--;
@@ -7440,7 +7440,7 @@ public final void entryRuleXConstructorCall() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstructorCallRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXConstructorCall5239); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -7457,25 +7457,25 @@ public final void entryRuleXConstructorCall() throws RecognitionException {
 
 
     // $ANTLR start "ruleXConstructorCall"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2486:1: ruleXConstructorCall : ( ( rule__XConstructorCall__Group__0 ) ) ;
+    // InternalFormat.g:2486:1: ruleXConstructorCall : ( ( rule__XConstructorCall__Group__0 ) ) ;
     public final void ruleXConstructorCall() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2490:2: ( ( ( rule__XConstructorCall__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2491:1: ( ( rule__XConstructorCall__Group__0 ) )
+            // InternalFormat.g:2490:2: ( ( ( rule__XConstructorCall__Group__0 ) ) )
+            // InternalFormat.g:2491:1: ( ( rule__XConstructorCall__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2491:1: ( ( rule__XConstructorCall__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2492:1: ( rule__XConstructorCall__Group__0 )
+            // InternalFormat.g:2491:1: ( ( rule__XConstructorCall__Group__0 ) )
+            // InternalFormat.g:2492:1: ( rule__XConstructorCall__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2493:1: ( rule__XConstructorCall__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2493:2: rule__XConstructorCall__Group__0
+            // InternalFormat.g:2493:1: ( rule__XConstructorCall__Group__0 )
+            // InternalFormat.g:2493:2: rule__XConstructorCall__Group__0
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__0_in_ruleXConstructorCall5265);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group__0();
 
             state._fsp--;
@@ -7508,16 +7508,16 @@ public final void ruleXConstructorCall() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXBooleanLiteral"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2505:1: entryRuleXBooleanLiteral : ruleXBooleanLiteral EOF ;
+    // InternalFormat.g:2505:1: entryRuleXBooleanLiteral : ruleXBooleanLiteral EOF ;
     public final void entryRuleXBooleanLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2506:1: ( ruleXBooleanLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2507:1: ruleXBooleanLiteral EOF
+            // InternalFormat.g:2506:1: ( ruleXBooleanLiteral EOF )
+            // InternalFormat.g:2507:1: ruleXBooleanLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBooleanLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXBooleanLiteral_in_entryRuleXBooleanLiteral5292);
+            pushFollow(FOLLOW_1);
             ruleXBooleanLiteral();
 
             state._fsp--;
@@ -7525,7 +7525,7 @@ public final void entryRuleXBooleanLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBooleanLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXBooleanLiteral5299); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -7542,25 +7542,25 @@ public final void entryRuleXBooleanLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXBooleanLiteral"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2514:1: ruleXBooleanLiteral : ( ( rule__XBooleanLiteral__Group__0 ) ) ;
+    // InternalFormat.g:2514:1: ruleXBooleanLiteral : ( ( rule__XBooleanLiteral__Group__0 ) ) ;
     public final void ruleXBooleanLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2518:2: ( ( ( rule__XBooleanLiteral__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2519:1: ( ( rule__XBooleanLiteral__Group__0 ) )
+            // InternalFormat.g:2518:2: ( ( ( rule__XBooleanLiteral__Group__0 ) ) )
+            // InternalFormat.g:2519:1: ( ( rule__XBooleanLiteral__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2519:1: ( ( rule__XBooleanLiteral__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2520:1: ( rule__XBooleanLiteral__Group__0 )
+            // InternalFormat.g:2519:1: ( ( rule__XBooleanLiteral__Group__0 ) )
+            // InternalFormat.g:2520:1: ( rule__XBooleanLiteral__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBooleanLiteralAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2521:1: ( rule__XBooleanLiteral__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2521:2: rule__XBooleanLiteral__Group__0
+            // InternalFormat.g:2521:1: ( rule__XBooleanLiteral__Group__0 )
+            // InternalFormat.g:2521:2: rule__XBooleanLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__XBooleanLiteral__Group__0_in_ruleXBooleanLiteral5325);
+            pushFollow(FOLLOW_2);
             rule__XBooleanLiteral__Group__0();
 
             state._fsp--;
@@ -7593,16 +7593,16 @@ public final void ruleXBooleanLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXNullLiteral"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2533:1: entryRuleXNullLiteral : ruleXNullLiteral EOF ;
+    // InternalFormat.g:2533:1: entryRuleXNullLiteral : ruleXNullLiteral EOF ;
     public final void entryRuleXNullLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2534:1: ( ruleXNullLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2535:1: ruleXNullLiteral EOF
+            // InternalFormat.g:2534:1: ( ruleXNullLiteral EOF )
+            // InternalFormat.g:2535:1: ruleXNullLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNullLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXNullLiteral_in_entryRuleXNullLiteral5352);
+            pushFollow(FOLLOW_1);
             ruleXNullLiteral();
 
             state._fsp--;
@@ -7610,7 +7610,7 @@ public final void entryRuleXNullLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXNullLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXNullLiteral5359); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -7627,25 +7627,25 @@ public final void entryRuleXNullLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXNullLiteral"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2542:1: ruleXNullLiteral : ( ( rule__XNullLiteral__Group__0 ) ) ;
+    // InternalFormat.g:2542:1: ruleXNullLiteral : ( ( rule__XNullLiteral__Group__0 ) ) ;
     public final void ruleXNullLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2546:2: ( ( ( rule__XNullLiteral__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2547:1: ( ( rule__XNullLiteral__Group__0 ) )
+            // InternalFormat.g:2546:2: ( ( ( rule__XNullLiteral__Group__0 ) ) )
+            // InternalFormat.g:2547:1: ( ( rule__XNullLiteral__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2547:1: ( ( rule__XNullLiteral__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2548:1: ( rule__XNullLiteral__Group__0 )
+            // InternalFormat.g:2547:1: ( ( rule__XNullLiteral__Group__0 ) )
+            // InternalFormat.g:2548:1: ( rule__XNullLiteral__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNullLiteralAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2549:1: ( rule__XNullLiteral__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2549:2: rule__XNullLiteral__Group__0
+            // InternalFormat.g:2549:1: ( rule__XNullLiteral__Group__0 )
+            // InternalFormat.g:2549:2: rule__XNullLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__XNullLiteral__Group__0_in_ruleXNullLiteral5385);
+            pushFollow(FOLLOW_2);
             rule__XNullLiteral__Group__0();
 
             state._fsp--;
@@ -7678,16 +7678,16 @@ public final void ruleXNullLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXNumberLiteral"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2561:1: entryRuleXNumberLiteral : ruleXNumberLiteral EOF ;
+    // InternalFormat.g:2561:1: entryRuleXNumberLiteral : ruleXNumberLiteral EOF ;
     public final void entryRuleXNumberLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2562:1: ( ruleXNumberLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2563:1: ruleXNumberLiteral EOF
+            // InternalFormat.g:2562:1: ( ruleXNumberLiteral EOF )
+            // InternalFormat.g:2563:1: ruleXNumberLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNumberLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXNumberLiteral_in_entryRuleXNumberLiteral5412);
+            pushFollow(FOLLOW_1);
             ruleXNumberLiteral();
 
             state._fsp--;
@@ -7695,7 +7695,7 @@ public final void entryRuleXNumberLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXNumberLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXNumberLiteral5419); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -7712,25 +7712,25 @@ public final void entryRuleXNumberLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXNumberLiteral"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2570:1: ruleXNumberLiteral : ( ( rule__XNumberLiteral__Group__0 ) ) ;
+    // InternalFormat.g:2570:1: ruleXNumberLiteral : ( ( rule__XNumberLiteral__Group__0 ) ) ;
     public final void ruleXNumberLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2574:2: ( ( ( rule__XNumberLiteral__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2575:1: ( ( rule__XNumberLiteral__Group__0 ) )
+            // InternalFormat.g:2574:2: ( ( ( rule__XNumberLiteral__Group__0 ) ) )
+            // InternalFormat.g:2575:1: ( ( rule__XNumberLiteral__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2575:1: ( ( rule__XNumberLiteral__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2576:1: ( rule__XNumberLiteral__Group__0 )
+            // InternalFormat.g:2575:1: ( ( rule__XNumberLiteral__Group__0 ) )
+            // InternalFormat.g:2576:1: ( rule__XNumberLiteral__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNumberLiteralAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2577:1: ( rule__XNumberLiteral__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2577:2: rule__XNumberLiteral__Group__0
+            // InternalFormat.g:2577:1: ( rule__XNumberLiteral__Group__0 )
+            // InternalFormat.g:2577:2: rule__XNumberLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__XNumberLiteral__Group__0_in_ruleXNumberLiteral5445);
+            pushFollow(FOLLOW_2);
             rule__XNumberLiteral__Group__0();
 
             state._fsp--;
@@ -7763,16 +7763,16 @@ public final void ruleXNumberLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXStringLiteral"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2589:1: entryRuleXStringLiteral : ruleXStringLiteral EOF ;
+    // InternalFormat.g:2589:1: entryRuleXStringLiteral : ruleXStringLiteral EOF ;
     public final void entryRuleXStringLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2590:1: ( ruleXStringLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2591:1: ruleXStringLiteral EOF
+            // InternalFormat.g:2590:1: ( ruleXStringLiteral EOF )
+            // InternalFormat.g:2591:1: ruleXStringLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXStringLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXStringLiteral_in_entryRuleXStringLiteral5472);
+            pushFollow(FOLLOW_1);
             ruleXStringLiteral();
 
             state._fsp--;
@@ -7780,7 +7780,7 @@ public final void entryRuleXStringLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXStringLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXStringLiteral5479); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -7797,25 +7797,25 @@ public final void entryRuleXStringLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXStringLiteral"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2598:1: ruleXStringLiteral : ( ( rule__XStringLiteral__Group__0 ) ) ;
+    // InternalFormat.g:2598:1: ruleXStringLiteral : ( ( rule__XStringLiteral__Group__0 ) ) ;
     public final void ruleXStringLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2602:2: ( ( ( rule__XStringLiteral__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2603:1: ( ( rule__XStringLiteral__Group__0 ) )
+            // InternalFormat.g:2602:2: ( ( ( rule__XStringLiteral__Group__0 ) ) )
+            // InternalFormat.g:2603:1: ( ( rule__XStringLiteral__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2603:1: ( ( rule__XStringLiteral__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2604:1: ( rule__XStringLiteral__Group__0 )
+            // InternalFormat.g:2603:1: ( ( rule__XStringLiteral__Group__0 ) )
+            // InternalFormat.g:2604:1: ( rule__XStringLiteral__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXStringLiteralAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2605:1: ( rule__XStringLiteral__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2605:2: rule__XStringLiteral__Group__0
+            // InternalFormat.g:2605:1: ( rule__XStringLiteral__Group__0 )
+            // InternalFormat.g:2605:2: rule__XStringLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__XStringLiteral__Group__0_in_ruleXStringLiteral5505);
+            pushFollow(FOLLOW_2);
             rule__XStringLiteral__Group__0();
 
             state._fsp--;
@@ -7848,16 +7848,16 @@ public final void ruleXStringLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXTypeLiteral"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2617:1: entryRuleXTypeLiteral : ruleXTypeLiteral EOF ;
+    // InternalFormat.g:2617:1: entryRuleXTypeLiteral : ruleXTypeLiteral EOF ;
     public final void entryRuleXTypeLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2618:1: ( ruleXTypeLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2619:1: ruleXTypeLiteral EOF
+            // InternalFormat.g:2618:1: ( ruleXTypeLiteral EOF )
+            // InternalFormat.g:2619:1: ruleXTypeLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXTypeLiteral_in_entryRuleXTypeLiteral5532);
+            pushFollow(FOLLOW_1);
             ruleXTypeLiteral();
 
             state._fsp--;
@@ -7865,7 +7865,7 @@ public final void entryRuleXTypeLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXTypeLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXTypeLiteral5539); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -7882,25 +7882,25 @@ public final void entryRuleXTypeLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXTypeLiteral"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2626:1: ruleXTypeLiteral : ( ( rule__XTypeLiteral__Group__0 ) ) ;
+    // InternalFormat.g:2626:1: ruleXTypeLiteral : ( ( rule__XTypeLiteral__Group__0 ) ) ;
     public final void ruleXTypeLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2630:2: ( ( ( rule__XTypeLiteral__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2631:1: ( ( rule__XTypeLiteral__Group__0 ) )
+            // InternalFormat.g:2630:2: ( ( ( rule__XTypeLiteral__Group__0 ) ) )
+            // InternalFormat.g:2631:1: ( ( rule__XTypeLiteral__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2631:1: ( ( rule__XTypeLiteral__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2632:1: ( rule__XTypeLiteral__Group__0 )
+            // InternalFormat.g:2631:1: ( ( rule__XTypeLiteral__Group__0 ) )
+            // InternalFormat.g:2632:1: ( rule__XTypeLiteral__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2633:1: ( rule__XTypeLiteral__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2633:2: rule__XTypeLiteral__Group__0
+            // InternalFormat.g:2633:1: ( rule__XTypeLiteral__Group__0 )
+            // InternalFormat.g:2633:2: rule__XTypeLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__0_in_ruleXTypeLiteral5565);
+            pushFollow(FOLLOW_2);
             rule__XTypeLiteral__Group__0();
 
             state._fsp--;
@@ -7933,16 +7933,16 @@ public final void ruleXTypeLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXThrowExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2645:1: entryRuleXThrowExpression : ruleXThrowExpression EOF ;
+    // InternalFormat.g:2645:1: entryRuleXThrowExpression : ruleXThrowExpression EOF ;
     public final void entryRuleXThrowExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2646:1: ( ruleXThrowExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2647:1: ruleXThrowExpression EOF
+            // InternalFormat.g:2646:1: ( ruleXThrowExpression EOF )
+            // InternalFormat.g:2647:1: ruleXThrowExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXThrowExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXThrowExpression_in_entryRuleXThrowExpression5592);
+            pushFollow(FOLLOW_1);
             ruleXThrowExpression();
 
             state._fsp--;
@@ -7950,7 +7950,7 @@ public final void entryRuleXThrowExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXThrowExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXThrowExpression5599); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -7967,25 +7967,25 @@ public final void entryRuleXThrowExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXThrowExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2654:1: ruleXThrowExpression : ( ( rule__XThrowExpression__Group__0 ) ) ;
+    // InternalFormat.g:2654:1: ruleXThrowExpression : ( ( rule__XThrowExpression__Group__0 ) ) ;
     public final void ruleXThrowExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2658:2: ( ( ( rule__XThrowExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2659:1: ( ( rule__XThrowExpression__Group__0 ) )
+            // InternalFormat.g:2658:2: ( ( ( rule__XThrowExpression__Group__0 ) ) )
+            // InternalFormat.g:2659:1: ( ( rule__XThrowExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2659:1: ( ( rule__XThrowExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2660:1: ( rule__XThrowExpression__Group__0 )
+            // InternalFormat.g:2659:1: ( ( rule__XThrowExpression__Group__0 ) )
+            // InternalFormat.g:2660:1: ( rule__XThrowExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXThrowExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2661:1: ( rule__XThrowExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2661:2: rule__XThrowExpression__Group__0
+            // InternalFormat.g:2661:1: ( rule__XThrowExpression__Group__0 )
+            // InternalFormat.g:2661:2: rule__XThrowExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XThrowExpression__Group__0_in_ruleXThrowExpression5625);
+            pushFollow(FOLLOW_2);
             rule__XThrowExpression__Group__0();
 
             state._fsp--;
@@ -8018,16 +8018,16 @@ public final void ruleXThrowExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXReturnExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2673:1: entryRuleXReturnExpression : ruleXReturnExpression EOF ;
+    // InternalFormat.g:2673:1: entryRuleXReturnExpression : ruleXReturnExpression EOF ;
     public final void entryRuleXReturnExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2674:1: ( ruleXReturnExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2675:1: ruleXReturnExpression EOF
+            // InternalFormat.g:2674:1: ( ruleXReturnExpression EOF )
+            // InternalFormat.g:2675:1: ruleXReturnExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXReturnExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXReturnExpression_in_entryRuleXReturnExpression5652);
+            pushFollow(FOLLOW_1);
             ruleXReturnExpression();
 
             state._fsp--;
@@ -8035,7 +8035,7 @@ public final void entryRuleXReturnExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXReturnExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXReturnExpression5659); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -8052,25 +8052,25 @@ public final void entryRuleXReturnExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXReturnExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2682:1: ruleXReturnExpression : ( ( rule__XReturnExpression__Group__0 ) ) ;
+    // InternalFormat.g:2682:1: ruleXReturnExpression : ( ( rule__XReturnExpression__Group__0 ) ) ;
     public final void ruleXReturnExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2686:2: ( ( ( rule__XReturnExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2687:1: ( ( rule__XReturnExpression__Group__0 ) )
+            // InternalFormat.g:2686:2: ( ( ( rule__XReturnExpression__Group__0 ) ) )
+            // InternalFormat.g:2687:1: ( ( rule__XReturnExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2687:1: ( ( rule__XReturnExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2688:1: ( rule__XReturnExpression__Group__0 )
+            // InternalFormat.g:2687:1: ( ( rule__XReturnExpression__Group__0 ) )
+            // InternalFormat.g:2688:1: ( rule__XReturnExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXReturnExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2689:1: ( rule__XReturnExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2689:2: rule__XReturnExpression__Group__0
+            // InternalFormat.g:2689:1: ( rule__XReturnExpression__Group__0 )
+            // InternalFormat.g:2689:2: rule__XReturnExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XReturnExpression__Group__0_in_ruleXReturnExpression5685);
+            pushFollow(FOLLOW_2);
             rule__XReturnExpression__Group__0();
 
             state._fsp--;
@@ -8103,16 +8103,16 @@ public final void ruleXReturnExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXTryCatchFinallyExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2701:1: entryRuleXTryCatchFinallyExpression : ruleXTryCatchFinallyExpression EOF ;
+    // InternalFormat.g:2701:1: entryRuleXTryCatchFinallyExpression : ruleXTryCatchFinallyExpression EOF ;
     public final void entryRuleXTryCatchFinallyExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2702:1: ( ruleXTryCatchFinallyExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2703:1: ruleXTryCatchFinallyExpression EOF
+            // InternalFormat.g:2702:1: ( ruleXTryCatchFinallyExpression EOF )
+            // InternalFormat.g:2703:1: ruleXTryCatchFinallyExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXTryCatchFinallyExpression_in_entryRuleXTryCatchFinallyExpression5712);
+            pushFollow(FOLLOW_1);
             ruleXTryCatchFinallyExpression();
 
             state._fsp--;
@@ -8120,7 +8120,7 @@ public final void entryRuleXTryCatchFinallyExpression() throws RecognitionExcept
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXTryCatchFinallyExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXTryCatchFinallyExpression5719); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -8137,25 +8137,25 @@ public final void entryRuleXTryCatchFinallyExpression() throws RecognitionExcept
 
 
     // $ANTLR start "ruleXTryCatchFinallyExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2710:1: ruleXTryCatchFinallyExpression : ( ( rule__XTryCatchFinallyExpression__Group__0 ) ) ;
+    // InternalFormat.g:2710:1: ruleXTryCatchFinallyExpression : ( ( rule__XTryCatchFinallyExpression__Group__0 ) ) ;
     public final void ruleXTryCatchFinallyExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2714:2: ( ( ( rule__XTryCatchFinallyExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2715:1: ( ( rule__XTryCatchFinallyExpression__Group__0 ) )
+            // InternalFormat.g:2714:2: ( ( ( rule__XTryCatchFinallyExpression__Group__0 ) ) )
+            // InternalFormat.g:2715:1: ( ( rule__XTryCatchFinallyExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2715:1: ( ( rule__XTryCatchFinallyExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2716:1: ( rule__XTryCatchFinallyExpression__Group__0 )
+            // InternalFormat.g:2715:1: ( ( rule__XTryCatchFinallyExpression__Group__0 ) )
+            // InternalFormat.g:2716:1: ( rule__XTryCatchFinallyExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2717:1: ( rule__XTryCatchFinallyExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2717:2: rule__XTryCatchFinallyExpression__Group__0
+            // InternalFormat.g:2717:1: ( rule__XTryCatchFinallyExpression__Group__0 )
+            // InternalFormat.g:2717:2: rule__XTryCatchFinallyExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group__0_in_ruleXTryCatchFinallyExpression5745);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Group__0();
 
             state._fsp--;
@@ -8188,16 +8188,16 @@ public final void ruleXTryCatchFinallyExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXSynchronizedExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2729:1: entryRuleXSynchronizedExpression : ruleXSynchronizedExpression EOF ;
+    // InternalFormat.g:2729:1: entryRuleXSynchronizedExpression : ruleXSynchronizedExpression EOF ;
     public final void entryRuleXSynchronizedExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2730:1: ( ruleXSynchronizedExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2731:1: ruleXSynchronizedExpression EOF
+            // InternalFormat.g:2730:1: ( ruleXSynchronizedExpression EOF )
+            // InternalFormat.g:2731:1: ruleXSynchronizedExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXSynchronizedExpression_in_entryRuleXSynchronizedExpression5772);
+            pushFollow(FOLLOW_1);
             ruleXSynchronizedExpression();
 
             state._fsp--;
@@ -8205,7 +8205,7 @@ public final void entryRuleXSynchronizedExpression() throws RecognitionException
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSynchronizedExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXSynchronizedExpression5779); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -8222,25 +8222,25 @@ public final void entryRuleXSynchronizedExpression() throws RecognitionException
 
 
     // $ANTLR start "ruleXSynchronizedExpression"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2738:1: ruleXSynchronizedExpression : ( ( rule__XSynchronizedExpression__Group__0 ) ) ;
+    // InternalFormat.g:2738:1: ruleXSynchronizedExpression : ( ( rule__XSynchronizedExpression__Group__0 ) ) ;
     public final void ruleXSynchronizedExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2742:2: ( ( ( rule__XSynchronizedExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2743:1: ( ( rule__XSynchronizedExpression__Group__0 ) )
+            // InternalFormat.g:2742:2: ( ( ( rule__XSynchronizedExpression__Group__0 ) ) )
+            // InternalFormat.g:2743:1: ( ( rule__XSynchronizedExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2743:1: ( ( rule__XSynchronizedExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2744:1: ( rule__XSynchronizedExpression__Group__0 )
+            // InternalFormat.g:2743:1: ( ( rule__XSynchronizedExpression__Group__0 ) )
+            // InternalFormat.g:2744:1: ( rule__XSynchronizedExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2745:1: ( rule__XSynchronizedExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2745:2: rule__XSynchronizedExpression__Group__0
+            // InternalFormat.g:2745:1: ( rule__XSynchronizedExpression__Group__0 )
+            // InternalFormat.g:2745:2: rule__XSynchronizedExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group__0_in_ruleXSynchronizedExpression5805);
+            pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group__0();
 
             state._fsp--;
@@ -8273,16 +8273,16 @@ public final void ruleXSynchronizedExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXCatchClause"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2757:1: entryRuleXCatchClause : ruleXCatchClause EOF ;
+    // InternalFormat.g:2757:1: entryRuleXCatchClause : ruleXCatchClause EOF ;
     public final void entryRuleXCatchClause() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2758:1: ( ruleXCatchClause EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2759:1: ruleXCatchClause EOF
+            // InternalFormat.g:2758:1: ( ruleXCatchClause EOF )
+            // InternalFormat.g:2759:1: ruleXCatchClause EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseRule()); 
             }
-            pushFollow(FOLLOW_ruleXCatchClause_in_entryRuleXCatchClause5832);
+            pushFollow(FOLLOW_1);
             ruleXCatchClause();
 
             state._fsp--;
@@ -8290,7 +8290,7 @@ public final void entryRuleXCatchClause() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXCatchClauseRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXCatchClause5839); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -8307,25 +8307,25 @@ public final void entryRuleXCatchClause() throws RecognitionException {
 
 
     // $ANTLR start "ruleXCatchClause"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2766:1: ruleXCatchClause : ( ( rule__XCatchClause__Group__0 ) ) ;
+    // InternalFormat.g:2766:1: ruleXCatchClause : ( ( rule__XCatchClause__Group__0 ) ) ;
     public final void ruleXCatchClause() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2770:2: ( ( ( rule__XCatchClause__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2771:1: ( ( rule__XCatchClause__Group__0 ) )
+            // InternalFormat.g:2770:2: ( ( ( rule__XCatchClause__Group__0 ) ) )
+            // InternalFormat.g:2771:1: ( ( rule__XCatchClause__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2771:1: ( ( rule__XCatchClause__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2772:1: ( rule__XCatchClause__Group__0 )
+            // InternalFormat.g:2771:1: ( ( rule__XCatchClause__Group__0 ) )
+            // InternalFormat.g:2772:1: ( rule__XCatchClause__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2773:1: ( rule__XCatchClause__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2773:2: rule__XCatchClause__Group__0
+            // InternalFormat.g:2773:1: ( rule__XCatchClause__Group__0 )
+            // InternalFormat.g:2773:2: rule__XCatchClause__Group__0
             {
-            pushFollow(FOLLOW_rule__XCatchClause__Group__0_in_ruleXCatchClause5865);
+            pushFollow(FOLLOW_2);
             rule__XCatchClause__Group__0();
 
             state._fsp--;
@@ -8358,16 +8358,16 @@ public final void ruleXCatchClause() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleQualifiedName"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2785:1: entryRuleQualifiedName : ruleQualifiedName EOF ;
+    // InternalFormat.g:2785:1: entryRuleQualifiedName : ruleQualifiedName EOF ;
     public final void entryRuleQualifiedName() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2786:1: ( ruleQualifiedName EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2787:1: ruleQualifiedName EOF
+            // InternalFormat.g:2786:1: ( ruleQualifiedName EOF )
+            // InternalFormat.g:2787:1: ruleQualifiedName EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameRule()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName5892);
+            pushFollow(FOLLOW_1);
             ruleQualifiedName();
 
             state._fsp--;
@@ -8375,7 +8375,7 @@ public final void entryRuleQualifiedName() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getQualifiedNameRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedName5899); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -8392,25 +8392,25 @@ public final void entryRuleQualifiedName() throws RecognitionException {
 
 
     // $ANTLR start "ruleQualifiedName"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2794:1: ruleQualifiedName : ( ( rule__QualifiedName__Group__0 ) ) ;
+    // InternalFormat.g:2794:1: ruleQualifiedName : ( ( rule__QualifiedName__Group__0 ) ) ;
     public final void ruleQualifiedName() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2798:2: ( ( ( rule__QualifiedName__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2799:1: ( ( rule__QualifiedName__Group__0 ) )
+            // InternalFormat.g:2798:2: ( ( ( rule__QualifiedName__Group__0 ) ) )
+            // InternalFormat.g:2799:1: ( ( rule__QualifiedName__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2799:1: ( ( rule__QualifiedName__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2800:1: ( rule__QualifiedName__Group__0 )
+            // InternalFormat.g:2799:1: ( ( rule__QualifiedName__Group__0 ) )
+            // InternalFormat.g:2800:1: ( rule__QualifiedName__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2801:1: ( rule__QualifiedName__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2801:2: rule__QualifiedName__Group__0
+            // InternalFormat.g:2801:1: ( rule__QualifiedName__Group__0 )
+            // InternalFormat.g:2801:2: rule__QualifiedName__Group__0
             {
-            pushFollow(FOLLOW_rule__QualifiedName__Group__0_in_ruleQualifiedName5925);
+            pushFollow(FOLLOW_2);
             rule__QualifiedName__Group__0();
 
             state._fsp--;
@@ -8443,19 +8443,19 @@ public final void ruleQualifiedName() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleNumber"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2813:1: entryRuleNumber : ruleNumber EOF ;
+    // InternalFormat.g:2813:1: entryRuleNumber : ruleNumber EOF ;
     public final void entryRuleNumber() throws RecognitionException {
 
         	HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2817:1: ( ruleNumber EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2818:1: ruleNumber EOF
+            // InternalFormat.g:2817:1: ( ruleNumber EOF )
+            // InternalFormat.g:2818:1: ruleNumber EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNumberRule()); 
             }
-            pushFollow(FOLLOW_ruleNumber_in_entryRuleNumber5957);
+            pushFollow(FOLLOW_1);
             ruleNumber();
 
             state._fsp--;
@@ -8463,7 +8463,7 @@ public final void entryRuleNumber() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getNumberRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNumber5964); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -8483,26 +8483,26 @@ public final void entryRuleNumber() throws RecognitionException {
 
 
     // $ANTLR start "ruleNumber"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2828:1: ruleNumber : ( ( rule__Number__Alternatives ) ) ;
+    // InternalFormat.g:2828:1: ruleNumber : ( ( rule__Number__Alternatives ) ) ;
     public final void ruleNumber() throws RecognitionException {
 
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2833:2: ( ( ( rule__Number__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2834:1: ( ( rule__Number__Alternatives ) )
+            // InternalFormat.g:2833:2: ( ( ( rule__Number__Alternatives ) ) )
+            // InternalFormat.g:2834:1: ( ( rule__Number__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2834:1: ( ( rule__Number__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2835:1: ( rule__Number__Alternatives )
+            // InternalFormat.g:2834:1: ( ( rule__Number__Alternatives ) )
+            // InternalFormat.g:2835:1: ( rule__Number__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNumberAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2836:1: ( rule__Number__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2836:2: rule__Number__Alternatives
+            // InternalFormat.g:2836:1: ( rule__Number__Alternatives )
+            // InternalFormat.g:2836:2: rule__Number__Alternatives
             {
-            pushFollow(FOLLOW_rule__Number__Alternatives_in_ruleNumber5994);
+            pushFollow(FOLLOW_2);
             rule__Number__Alternatives();
 
             state._fsp--;
@@ -8536,16 +8536,16 @@ public final void ruleNumber() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleJvmTypeReference"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2851:1: entryRuleJvmTypeReference : ruleJvmTypeReference EOF ;
+    // InternalFormat.g:2851:1: entryRuleJvmTypeReference : ruleJvmTypeReference EOF ;
     public final void entryRuleJvmTypeReference() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2852:1: ( ruleJvmTypeReference EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2853:1: ruleJvmTypeReference EOF
+            // InternalFormat.g:2852:1: ( ruleJvmTypeReference EOF )
+            // InternalFormat.g:2853:1: ruleJvmTypeReference EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmTypeReferenceRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_entryRuleJvmTypeReference6023);
+            pushFollow(FOLLOW_1);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -8553,7 +8553,7 @@ public final void entryRuleJvmTypeReference() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmTypeReferenceRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmTypeReference6030); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -8570,25 +8570,25 @@ public final void entryRuleJvmTypeReference() throws RecognitionException {
 
 
     // $ANTLR start "ruleJvmTypeReference"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2860:1: ruleJvmTypeReference : ( ( rule__JvmTypeReference__Alternatives ) ) ;
+    // InternalFormat.g:2860:1: ruleJvmTypeReference : ( ( rule__JvmTypeReference__Alternatives ) ) ;
     public final void ruleJvmTypeReference() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2864:2: ( ( ( rule__JvmTypeReference__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2865:1: ( ( rule__JvmTypeReference__Alternatives ) )
+            // InternalFormat.g:2864:2: ( ( ( rule__JvmTypeReference__Alternatives ) ) )
+            // InternalFormat.g:2865:1: ( ( rule__JvmTypeReference__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2865:1: ( ( rule__JvmTypeReference__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2866:1: ( rule__JvmTypeReference__Alternatives )
+            // InternalFormat.g:2865:1: ( ( rule__JvmTypeReference__Alternatives ) )
+            // InternalFormat.g:2866:1: ( rule__JvmTypeReference__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmTypeReferenceAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2867:1: ( rule__JvmTypeReference__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2867:2: rule__JvmTypeReference__Alternatives
+            // InternalFormat.g:2867:1: ( rule__JvmTypeReference__Alternatives )
+            // InternalFormat.g:2867:2: rule__JvmTypeReference__Alternatives
             {
-            pushFollow(FOLLOW_rule__JvmTypeReference__Alternatives_in_ruleJvmTypeReference6056);
+            pushFollow(FOLLOW_2);
             rule__JvmTypeReference__Alternatives();
 
             state._fsp--;
@@ -8621,16 +8621,16 @@ public final void ruleJvmTypeReference() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleArrayBrackets"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2879:1: entryRuleArrayBrackets : ruleArrayBrackets EOF ;
+    // InternalFormat.g:2879:1: entryRuleArrayBrackets : ruleArrayBrackets EOF ;
     public final void entryRuleArrayBrackets() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2880:1: ( ruleArrayBrackets EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2881:1: ruleArrayBrackets EOF
+            // InternalFormat.g:2880:1: ( ruleArrayBrackets EOF )
+            // InternalFormat.g:2881:1: ruleArrayBrackets EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getArrayBracketsRule()); 
             }
-            pushFollow(FOLLOW_ruleArrayBrackets_in_entryRuleArrayBrackets6083);
+            pushFollow(FOLLOW_1);
             ruleArrayBrackets();
 
             state._fsp--;
@@ -8638,7 +8638,7 @@ public final void entryRuleArrayBrackets() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getArrayBracketsRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleArrayBrackets6090); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -8655,25 +8655,25 @@ public final void entryRuleArrayBrackets() throws RecognitionException {
 
 
     // $ANTLR start "ruleArrayBrackets"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2888:1: ruleArrayBrackets : ( ( rule__ArrayBrackets__Group__0 ) ) ;
+    // InternalFormat.g:2888:1: ruleArrayBrackets : ( ( rule__ArrayBrackets__Group__0 ) ) ;
     public final void ruleArrayBrackets() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2892:2: ( ( ( rule__ArrayBrackets__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2893:1: ( ( rule__ArrayBrackets__Group__0 ) )
+            // InternalFormat.g:2892:2: ( ( ( rule__ArrayBrackets__Group__0 ) ) )
+            // InternalFormat.g:2893:1: ( ( rule__ArrayBrackets__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2893:1: ( ( rule__ArrayBrackets__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2894:1: ( rule__ArrayBrackets__Group__0 )
+            // InternalFormat.g:2893:1: ( ( rule__ArrayBrackets__Group__0 ) )
+            // InternalFormat.g:2894:1: ( rule__ArrayBrackets__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getArrayBracketsAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2895:1: ( rule__ArrayBrackets__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2895:2: rule__ArrayBrackets__Group__0
+            // InternalFormat.g:2895:1: ( rule__ArrayBrackets__Group__0 )
+            // InternalFormat.g:2895:2: rule__ArrayBrackets__Group__0
             {
-            pushFollow(FOLLOW_rule__ArrayBrackets__Group__0_in_ruleArrayBrackets6116);
+            pushFollow(FOLLOW_2);
             rule__ArrayBrackets__Group__0();
 
             state._fsp--;
@@ -8706,16 +8706,16 @@ public final void ruleArrayBrackets() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXFunctionTypeRef"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2907:1: entryRuleXFunctionTypeRef : ruleXFunctionTypeRef EOF ;
+    // InternalFormat.g:2907:1: entryRuleXFunctionTypeRef : ruleXFunctionTypeRef EOF ;
     public final void entryRuleXFunctionTypeRef() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2908:1: ( ruleXFunctionTypeRef EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2909:1: ruleXFunctionTypeRef EOF
+            // InternalFormat.g:2908:1: ( ruleXFunctionTypeRef EOF )
+            // InternalFormat.g:2909:1: ruleXFunctionTypeRef EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefRule()); 
             }
-            pushFollow(FOLLOW_ruleXFunctionTypeRef_in_entryRuleXFunctionTypeRef6143);
+            pushFollow(FOLLOW_1);
             ruleXFunctionTypeRef();
 
             state._fsp--;
@@ -8723,7 +8723,7 @@ public final void entryRuleXFunctionTypeRef() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFunctionTypeRefRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXFunctionTypeRef6150); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -8740,25 +8740,25 @@ public final void entryRuleXFunctionTypeRef() throws RecognitionException {
 
 
     // $ANTLR start "ruleXFunctionTypeRef"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2916:1: ruleXFunctionTypeRef : ( ( rule__XFunctionTypeRef__Group__0 ) ) ;
+    // InternalFormat.g:2916:1: ruleXFunctionTypeRef : ( ( rule__XFunctionTypeRef__Group__0 ) ) ;
     public final void ruleXFunctionTypeRef() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2920:2: ( ( ( rule__XFunctionTypeRef__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2921:1: ( ( rule__XFunctionTypeRef__Group__0 ) )
+            // InternalFormat.g:2920:2: ( ( ( rule__XFunctionTypeRef__Group__0 ) ) )
+            // InternalFormat.g:2921:1: ( ( rule__XFunctionTypeRef__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2921:1: ( ( rule__XFunctionTypeRef__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2922:1: ( rule__XFunctionTypeRef__Group__0 )
+            // InternalFormat.g:2921:1: ( ( rule__XFunctionTypeRef__Group__0 ) )
+            // InternalFormat.g:2922:1: ( rule__XFunctionTypeRef__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2923:1: ( rule__XFunctionTypeRef__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2923:2: rule__XFunctionTypeRef__Group__0
+            // InternalFormat.g:2923:1: ( rule__XFunctionTypeRef__Group__0 )
+            // InternalFormat.g:2923:2: rule__XFunctionTypeRef__Group__0
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group__0_in_ruleXFunctionTypeRef6176);
+            pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__Group__0();
 
             state._fsp--;
@@ -8791,16 +8791,16 @@ public final void ruleXFunctionTypeRef() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleJvmParameterizedTypeReference"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2935:1: entryRuleJvmParameterizedTypeReference : ruleJvmParameterizedTypeReference EOF ;
+    // InternalFormat.g:2935:1: entryRuleJvmParameterizedTypeReference : ruleJvmParameterizedTypeReference EOF ;
     public final void entryRuleJvmParameterizedTypeReference() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2936:1: ( ruleJvmParameterizedTypeReference EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2937:1: ruleJvmParameterizedTypeReference EOF
+            // InternalFormat.g:2936:1: ( ruleJvmParameterizedTypeReference EOF )
+            // InternalFormat.g:2937:1: ruleJvmParameterizedTypeReference EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmParameterizedTypeReference_in_entryRuleJvmParameterizedTypeReference6203);
+            pushFollow(FOLLOW_1);
             ruleJvmParameterizedTypeReference();
 
             state._fsp--;
@@ -8808,7 +8808,7 @@ public final void entryRuleJvmParameterizedTypeReference() throws RecognitionExc
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmParameterizedTypeReferenceRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmParameterizedTypeReference6210); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -8825,25 +8825,25 @@ public final void entryRuleJvmParameterizedTypeReference() throws RecognitionExc
 
 
     // $ANTLR start "ruleJvmParameterizedTypeReference"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2944:1: ruleJvmParameterizedTypeReference : ( ( rule__JvmParameterizedTypeReference__Group__0 ) ) ;
+    // InternalFormat.g:2944:1: ruleJvmParameterizedTypeReference : ( ( rule__JvmParameterizedTypeReference__Group__0 ) ) ;
     public final void ruleJvmParameterizedTypeReference() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2948:2: ( ( ( rule__JvmParameterizedTypeReference__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2949:1: ( ( rule__JvmParameterizedTypeReference__Group__0 ) )
+            // InternalFormat.g:2948:2: ( ( ( rule__JvmParameterizedTypeReference__Group__0 ) ) )
+            // InternalFormat.g:2949:1: ( ( rule__JvmParameterizedTypeReference__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2949:1: ( ( rule__JvmParameterizedTypeReference__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2950:1: ( rule__JvmParameterizedTypeReference__Group__0 )
+            // InternalFormat.g:2949:1: ( ( rule__JvmParameterizedTypeReference__Group__0 ) )
+            // InternalFormat.g:2950:1: ( rule__JvmParameterizedTypeReference__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2951:1: ( rule__JvmParameterizedTypeReference__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2951:2: rule__JvmParameterizedTypeReference__Group__0
+            // InternalFormat.g:2951:1: ( rule__JvmParameterizedTypeReference__Group__0 )
+            // InternalFormat.g:2951:2: rule__JvmParameterizedTypeReference__Group__0
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group__0_in_ruleJvmParameterizedTypeReference6236);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group__0();
 
             state._fsp--;
@@ -8876,16 +8876,16 @@ public final void ruleJvmParameterizedTypeReference() throws RecognitionExceptio
 
 
     // $ANTLR start "entryRuleJvmArgumentTypeReference"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2963:1: entryRuleJvmArgumentTypeReference : ruleJvmArgumentTypeReference EOF ;
+    // InternalFormat.g:2963:1: entryRuleJvmArgumentTypeReference : ruleJvmArgumentTypeReference EOF ;
     public final void entryRuleJvmArgumentTypeReference() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2964:1: ( ruleJvmArgumentTypeReference EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2965:1: ruleJvmArgumentTypeReference EOF
+            // InternalFormat.g:2964:1: ( ruleJvmArgumentTypeReference EOF )
+            // InternalFormat.g:2965:1: ruleJvmArgumentTypeReference EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmArgumentTypeReferenceRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_entryRuleJvmArgumentTypeReference6263);
+            pushFollow(FOLLOW_1);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -8893,7 +8893,7 @@ public final void entryRuleJvmArgumentTypeReference() throws RecognitionExceptio
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmArgumentTypeReferenceRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmArgumentTypeReference6270); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -8910,25 +8910,25 @@ public final void entryRuleJvmArgumentTypeReference() throws RecognitionExceptio
 
 
     // $ANTLR start "ruleJvmArgumentTypeReference"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2972:1: ruleJvmArgumentTypeReference : ( ( rule__JvmArgumentTypeReference__Alternatives ) ) ;
+    // InternalFormat.g:2972:1: ruleJvmArgumentTypeReference : ( ( rule__JvmArgumentTypeReference__Alternatives ) ) ;
     public final void ruleJvmArgumentTypeReference() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2976:2: ( ( ( rule__JvmArgumentTypeReference__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2977:1: ( ( rule__JvmArgumentTypeReference__Alternatives ) )
+            // InternalFormat.g:2976:2: ( ( ( rule__JvmArgumentTypeReference__Alternatives ) ) )
+            // InternalFormat.g:2977:1: ( ( rule__JvmArgumentTypeReference__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2977:1: ( ( rule__JvmArgumentTypeReference__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2978:1: ( rule__JvmArgumentTypeReference__Alternatives )
+            // InternalFormat.g:2977:1: ( ( rule__JvmArgumentTypeReference__Alternatives ) )
+            // InternalFormat.g:2978:1: ( rule__JvmArgumentTypeReference__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmArgumentTypeReferenceAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2979:1: ( rule__JvmArgumentTypeReference__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2979:2: rule__JvmArgumentTypeReference__Alternatives
+            // InternalFormat.g:2979:1: ( rule__JvmArgumentTypeReference__Alternatives )
+            // InternalFormat.g:2979:2: rule__JvmArgumentTypeReference__Alternatives
             {
-            pushFollow(FOLLOW_rule__JvmArgumentTypeReference__Alternatives_in_ruleJvmArgumentTypeReference6296);
+            pushFollow(FOLLOW_2);
             rule__JvmArgumentTypeReference__Alternatives();
 
             state._fsp--;
@@ -8961,16 +8961,16 @@ public final void ruleJvmArgumentTypeReference() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleJvmWildcardTypeReference"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2991:1: entryRuleJvmWildcardTypeReference : ruleJvmWildcardTypeReference EOF ;
+    // InternalFormat.g:2991:1: entryRuleJvmWildcardTypeReference : ruleJvmWildcardTypeReference EOF ;
     public final void entryRuleJvmWildcardTypeReference() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2992:1: ( ruleJvmWildcardTypeReference EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:2993:1: ruleJvmWildcardTypeReference EOF
+            // InternalFormat.g:2992:1: ( ruleJvmWildcardTypeReference EOF )
+            // InternalFormat.g:2993:1: ruleJvmWildcardTypeReference EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmWildcardTypeReference_in_entryRuleJvmWildcardTypeReference6323);
+            pushFollow(FOLLOW_1);
             ruleJvmWildcardTypeReference();
 
             state._fsp--;
@@ -8978,7 +8978,7 @@ public final void entryRuleJvmWildcardTypeReference() throws RecognitionExceptio
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmWildcardTypeReferenceRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmWildcardTypeReference6330); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -8995,25 +8995,25 @@ public final void entryRuleJvmWildcardTypeReference() throws RecognitionExceptio
 
 
     // $ANTLR start "ruleJvmWildcardTypeReference"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3000:1: ruleJvmWildcardTypeReference : ( ( rule__JvmWildcardTypeReference__Group__0 ) ) ;
+    // InternalFormat.g:3000:1: ruleJvmWildcardTypeReference : ( ( rule__JvmWildcardTypeReference__Group__0 ) ) ;
     public final void ruleJvmWildcardTypeReference() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3004:2: ( ( ( rule__JvmWildcardTypeReference__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3005:1: ( ( rule__JvmWildcardTypeReference__Group__0 ) )
+            // InternalFormat.g:3004:2: ( ( ( rule__JvmWildcardTypeReference__Group__0 ) ) )
+            // InternalFormat.g:3005:1: ( ( rule__JvmWildcardTypeReference__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3005:1: ( ( rule__JvmWildcardTypeReference__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3006:1: ( rule__JvmWildcardTypeReference__Group__0 )
+            // InternalFormat.g:3005:1: ( ( rule__JvmWildcardTypeReference__Group__0 ) )
+            // InternalFormat.g:3006:1: ( rule__JvmWildcardTypeReference__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3007:1: ( rule__JvmWildcardTypeReference__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3007:2: rule__JvmWildcardTypeReference__Group__0
+            // InternalFormat.g:3007:1: ( rule__JvmWildcardTypeReference__Group__0 )
+            // InternalFormat.g:3007:2: rule__JvmWildcardTypeReference__Group__0
             {
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group__0_in_ruleJvmWildcardTypeReference6356);
+            pushFollow(FOLLOW_2);
             rule__JvmWildcardTypeReference__Group__0();
 
             state._fsp--;
@@ -9046,16 +9046,16 @@ public final void ruleJvmWildcardTypeReference() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleJvmUpperBound"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3019:1: entryRuleJvmUpperBound : ruleJvmUpperBound EOF ;
+    // InternalFormat.g:3019:1: entryRuleJvmUpperBound : ruleJvmUpperBound EOF ;
     public final void entryRuleJvmUpperBound() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3020:1: ( ruleJvmUpperBound EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3021:1: ruleJvmUpperBound EOF
+            // InternalFormat.g:3020:1: ( ruleJvmUpperBound EOF )
+            // InternalFormat.g:3021:1: ruleJvmUpperBound EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmUpperBound_in_entryRuleJvmUpperBound6383);
+            pushFollow(FOLLOW_1);
             ruleJvmUpperBound();
 
             state._fsp--;
@@ -9063,7 +9063,7 @@ public final void entryRuleJvmUpperBound() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmUpperBoundRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmUpperBound6390); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -9080,25 +9080,25 @@ public final void entryRuleJvmUpperBound() throws RecognitionException {
 
 
     // $ANTLR start "ruleJvmUpperBound"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3028:1: ruleJvmUpperBound : ( ( rule__JvmUpperBound__Group__0 ) ) ;
+    // InternalFormat.g:3028:1: ruleJvmUpperBound : ( ( rule__JvmUpperBound__Group__0 ) ) ;
     public final void ruleJvmUpperBound() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3032:2: ( ( ( rule__JvmUpperBound__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3033:1: ( ( rule__JvmUpperBound__Group__0 ) )
+            // InternalFormat.g:3032:2: ( ( ( rule__JvmUpperBound__Group__0 ) ) )
+            // InternalFormat.g:3033:1: ( ( rule__JvmUpperBound__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3033:1: ( ( rule__JvmUpperBound__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3034:1: ( rule__JvmUpperBound__Group__0 )
+            // InternalFormat.g:3033:1: ( ( rule__JvmUpperBound__Group__0 ) )
+            // InternalFormat.g:3034:1: ( rule__JvmUpperBound__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3035:1: ( rule__JvmUpperBound__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3035:2: rule__JvmUpperBound__Group__0
+            // InternalFormat.g:3035:1: ( rule__JvmUpperBound__Group__0 )
+            // InternalFormat.g:3035:2: rule__JvmUpperBound__Group__0
             {
-            pushFollow(FOLLOW_rule__JvmUpperBound__Group__0_in_ruleJvmUpperBound6416);
+            pushFollow(FOLLOW_2);
             rule__JvmUpperBound__Group__0();
 
             state._fsp--;
@@ -9131,16 +9131,16 @@ public final void ruleJvmUpperBound() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleJvmUpperBoundAnded"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3047:1: entryRuleJvmUpperBoundAnded : ruleJvmUpperBoundAnded EOF ;
+    // InternalFormat.g:3047:1: entryRuleJvmUpperBoundAnded : ruleJvmUpperBoundAnded EOF ;
     public final void entryRuleJvmUpperBoundAnded() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3048:1: ( ruleJvmUpperBoundAnded EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3049:1: ruleJvmUpperBoundAnded EOF
+            // InternalFormat.g:3048:1: ( ruleJvmUpperBoundAnded EOF )
+            // InternalFormat.g:3049:1: ruleJvmUpperBoundAnded EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAndedRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmUpperBoundAnded_in_entryRuleJvmUpperBoundAnded6443);
+            pushFollow(FOLLOW_1);
             ruleJvmUpperBoundAnded();
 
             state._fsp--;
@@ -9148,7 +9148,7 @@ public final void entryRuleJvmUpperBoundAnded() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmUpperBoundAndedRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmUpperBoundAnded6450); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -9165,25 +9165,25 @@ public final void entryRuleJvmUpperBoundAnded() throws RecognitionException {
 
 
     // $ANTLR start "ruleJvmUpperBoundAnded"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3056:1: ruleJvmUpperBoundAnded : ( ( rule__JvmUpperBoundAnded__Group__0 ) ) ;
+    // InternalFormat.g:3056:1: ruleJvmUpperBoundAnded : ( ( rule__JvmUpperBoundAnded__Group__0 ) ) ;
     public final void ruleJvmUpperBoundAnded() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3060:2: ( ( ( rule__JvmUpperBoundAnded__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3061:1: ( ( rule__JvmUpperBoundAnded__Group__0 ) )
+            // InternalFormat.g:3060:2: ( ( ( rule__JvmUpperBoundAnded__Group__0 ) ) )
+            // InternalFormat.g:3061:1: ( ( rule__JvmUpperBoundAnded__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3061:1: ( ( rule__JvmUpperBoundAnded__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3062:1: ( rule__JvmUpperBoundAnded__Group__0 )
+            // InternalFormat.g:3061:1: ( ( rule__JvmUpperBoundAnded__Group__0 ) )
+            // InternalFormat.g:3062:1: ( rule__JvmUpperBoundAnded__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAndedAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3063:1: ( rule__JvmUpperBoundAnded__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3063:2: rule__JvmUpperBoundAnded__Group__0
+            // InternalFormat.g:3063:1: ( rule__JvmUpperBoundAnded__Group__0 )
+            // InternalFormat.g:3063:2: rule__JvmUpperBoundAnded__Group__0
             {
-            pushFollow(FOLLOW_rule__JvmUpperBoundAnded__Group__0_in_ruleJvmUpperBoundAnded6476);
+            pushFollow(FOLLOW_2);
             rule__JvmUpperBoundAnded__Group__0();
 
             state._fsp--;
@@ -9216,16 +9216,16 @@ public final void ruleJvmUpperBoundAnded() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleJvmLowerBound"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3075:1: entryRuleJvmLowerBound : ruleJvmLowerBound EOF ;
+    // InternalFormat.g:3075:1: entryRuleJvmLowerBound : ruleJvmLowerBound EOF ;
     public final void entryRuleJvmLowerBound() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3076:1: ( ruleJvmLowerBound EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3077:1: ruleJvmLowerBound EOF
+            // InternalFormat.g:3076:1: ( ruleJvmLowerBound EOF )
+            // InternalFormat.g:3077:1: ruleJvmLowerBound EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmLowerBound_in_entryRuleJvmLowerBound6503);
+            pushFollow(FOLLOW_1);
             ruleJvmLowerBound();
 
             state._fsp--;
@@ -9233,7 +9233,7 @@ public final void entryRuleJvmLowerBound() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmLowerBoundRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmLowerBound6510); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -9250,25 +9250,25 @@ public final void entryRuleJvmLowerBound() throws RecognitionException {
 
 
     // $ANTLR start "ruleJvmLowerBound"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3084:1: ruleJvmLowerBound : ( ( rule__JvmLowerBound__Group__0 ) ) ;
+    // InternalFormat.g:3084:1: ruleJvmLowerBound : ( ( rule__JvmLowerBound__Group__0 ) ) ;
     public final void ruleJvmLowerBound() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3088:2: ( ( ( rule__JvmLowerBound__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3089:1: ( ( rule__JvmLowerBound__Group__0 ) )
+            // InternalFormat.g:3088:2: ( ( ( rule__JvmLowerBound__Group__0 ) ) )
+            // InternalFormat.g:3089:1: ( ( rule__JvmLowerBound__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3089:1: ( ( rule__JvmLowerBound__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3090:1: ( rule__JvmLowerBound__Group__0 )
+            // InternalFormat.g:3089:1: ( ( rule__JvmLowerBound__Group__0 ) )
+            // InternalFormat.g:3090:1: ( rule__JvmLowerBound__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3091:1: ( rule__JvmLowerBound__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3091:2: rule__JvmLowerBound__Group__0
+            // InternalFormat.g:3091:1: ( rule__JvmLowerBound__Group__0 )
+            // InternalFormat.g:3091:2: rule__JvmLowerBound__Group__0
             {
-            pushFollow(FOLLOW_rule__JvmLowerBound__Group__0_in_ruleJvmLowerBound6536);
+            pushFollow(FOLLOW_2);
             rule__JvmLowerBound__Group__0();
 
             state._fsp--;
@@ -9301,16 +9301,16 @@ public final void ruleJvmLowerBound() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleJvmLowerBoundAnded"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3103:1: entryRuleJvmLowerBoundAnded : ruleJvmLowerBoundAnded EOF ;
+    // InternalFormat.g:3103:1: entryRuleJvmLowerBoundAnded : ruleJvmLowerBoundAnded EOF ;
     public final void entryRuleJvmLowerBoundAnded() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3104:1: ( ruleJvmLowerBoundAnded EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3105:1: ruleJvmLowerBoundAnded EOF
+            // InternalFormat.g:3104:1: ( ruleJvmLowerBoundAnded EOF )
+            // InternalFormat.g:3105:1: ruleJvmLowerBoundAnded EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAndedRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmLowerBoundAnded_in_entryRuleJvmLowerBoundAnded6563);
+            pushFollow(FOLLOW_1);
             ruleJvmLowerBoundAnded();
 
             state._fsp--;
@@ -9318,7 +9318,7 @@ public final void entryRuleJvmLowerBoundAnded() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmLowerBoundAndedRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmLowerBoundAnded6570); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -9335,25 +9335,25 @@ public final void entryRuleJvmLowerBoundAnded() throws RecognitionException {
 
 
     // $ANTLR start "ruleJvmLowerBoundAnded"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3112:1: ruleJvmLowerBoundAnded : ( ( rule__JvmLowerBoundAnded__Group__0 ) ) ;
+    // InternalFormat.g:3112:1: ruleJvmLowerBoundAnded : ( ( rule__JvmLowerBoundAnded__Group__0 ) ) ;
     public final void ruleJvmLowerBoundAnded() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3116:2: ( ( ( rule__JvmLowerBoundAnded__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3117:1: ( ( rule__JvmLowerBoundAnded__Group__0 ) )
+            // InternalFormat.g:3116:2: ( ( ( rule__JvmLowerBoundAnded__Group__0 ) ) )
+            // InternalFormat.g:3117:1: ( ( rule__JvmLowerBoundAnded__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3117:1: ( ( rule__JvmLowerBoundAnded__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3118:1: ( rule__JvmLowerBoundAnded__Group__0 )
+            // InternalFormat.g:3117:1: ( ( rule__JvmLowerBoundAnded__Group__0 ) )
+            // InternalFormat.g:3118:1: ( rule__JvmLowerBoundAnded__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAndedAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3119:1: ( rule__JvmLowerBoundAnded__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3119:2: rule__JvmLowerBoundAnded__Group__0
+            // InternalFormat.g:3119:1: ( rule__JvmLowerBoundAnded__Group__0 )
+            // InternalFormat.g:3119:2: rule__JvmLowerBoundAnded__Group__0
             {
-            pushFollow(FOLLOW_rule__JvmLowerBoundAnded__Group__0_in_ruleJvmLowerBoundAnded6596);
+            pushFollow(FOLLOW_2);
             rule__JvmLowerBoundAnded__Group__0();
 
             state._fsp--;
@@ -9386,16 +9386,16 @@ public final void ruleJvmLowerBoundAnded() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleQualifiedNameWithWildcard"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3133:1: entryRuleQualifiedNameWithWildcard : ruleQualifiedNameWithWildcard EOF ;
+    // InternalFormat.g:3133:1: entryRuleQualifiedNameWithWildcard : ruleQualifiedNameWithWildcard EOF ;
     public final void entryRuleQualifiedNameWithWildcard() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3134:1: ( ruleQualifiedNameWithWildcard EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3135:1: ruleQualifiedNameWithWildcard EOF
+            // InternalFormat.g:3134:1: ( ruleQualifiedNameWithWildcard EOF )
+            // InternalFormat.g:3135:1: ruleQualifiedNameWithWildcard EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameWithWildcardRule()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedNameWithWildcard_in_entryRuleQualifiedNameWithWildcard6625);
+            pushFollow(FOLLOW_1);
             ruleQualifiedNameWithWildcard();
 
             state._fsp--;
@@ -9403,7 +9403,7 @@ public final void entryRuleQualifiedNameWithWildcard() throws RecognitionExcepti
             if ( state.backtracking==0 ) {
                after(grammarAccess.getQualifiedNameWithWildcardRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedNameWithWildcard6632); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -9420,25 +9420,25 @@ public final void entryRuleQualifiedNameWithWildcard() throws RecognitionExcepti
 
 
     // $ANTLR start "ruleQualifiedNameWithWildcard"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3142:1: ruleQualifiedNameWithWildcard : ( ( rule__QualifiedNameWithWildcard__Group__0 ) ) ;
+    // InternalFormat.g:3142:1: ruleQualifiedNameWithWildcard : ( ( rule__QualifiedNameWithWildcard__Group__0 ) ) ;
     public final void ruleQualifiedNameWithWildcard() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3146:2: ( ( ( rule__QualifiedNameWithWildcard__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3147:1: ( ( rule__QualifiedNameWithWildcard__Group__0 ) )
+            // InternalFormat.g:3146:2: ( ( ( rule__QualifiedNameWithWildcard__Group__0 ) ) )
+            // InternalFormat.g:3147:1: ( ( rule__QualifiedNameWithWildcard__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3147:1: ( ( rule__QualifiedNameWithWildcard__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3148:1: ( rule__QualifiedNameWithWildcard__Group__0 )
+            // InternalFormat.g:3147:1: ( ( rule__QualifiedNameWithWildcard__Group__0 ) )
+            // InternalFormat.g:3148:1: ( rule__QualifiedNameWithWildcard__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameWithWildcardAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3149:1: ( rule__QualifiedNameWithWildcard__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3149:2: rule__QualifiedNameWithWildcard__Group__0
+            // InternalFormat.g:3149:1: ( rule__QualifiedNameWithWildcard__Group__0 )
+            // InternalFormat.g:3149:2: rule__QualifiedNameWithWildcard__Group__0
             {
-            pushFollow(FOLLOW_rule__QualifiedNameWithWildcard__Group__0_in_ruleQualifiedNameWithWildcard6658);
+            pushFollow(FOLLOW_2);
             rule__QualifiedNameWithWildcard__Group__0();
 
             state._fsp--;
@@ -9471,16 +9471,16 @@ public final void ruleQualifiedNameWithWildcard() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXImportDeclaration"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3163:1: entryRuleXImportDeclaration : ruleXImportDeclaration EOF ;
+    // InternalFormat.g:3163:1: entryRuleXImportDeclaration : ruleXImportDeclaration EOF ;
     public final void entryRuleXImportDeclaration() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3164:1: ( ruleXImportDeclaration EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3165:1: ruleXImportDeclaration EOF
+            // InternalFormat.g:3164:1: ( ruleXImportDeclaration EOF )
+            // InternalFormat.g:3165:1: ruleXImportDeclaration EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationRule()); 
             }
-            pushFollow(FOLLOW_ruleXImportDeclaration_in_entryRuleXImportDeclaration6687);
+            pushFollow(FOLLOW_1);
             ruleXImportDeclaration();
 
             state._fsp--;
@@ -9488,7 +9488,7 @@ public final void entryRuleXImportDeclaration() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXImportDeclarationRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXImportDeclaration6694); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -9505,25 +9505,25 @@ public final void entryRuleXImportDeclaration() throws RecognitionException {
 
 
     // $ANTLR start "ruleXImportDeclaration"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3172:1: ruleXImportDeclaration : ( ( rule__XImportDeclaration__Group__0 ) ) ;
+    // InternalFormat.g:3172:1: ruleXImportDeclaration : ( ( rule__XImportDeclaration__Group__0 ) ) ;
     public final void ruleXImportDeclaration() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3176:2: ( ( ( rule__XImportDeclaration__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3177:1: ( ( rule__XImportDeclaration__Group__0 ) )
+            // InternalFormat.g:3176:2: ( ( ( rule__XImportDeclaration__Group__0 ) ) )
+            // InternalFormat.g:3177:1: ( ( rule__XImportDeclaration__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3177:1: ( ( rule__XImportDeclaration__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3178:1: ( rule__XImportDeclaration__Group__0 )
+            // InternalFormat.g:3177:1: ( ( rule__XImportDeclaration__Group__0 ) )
+            // InternalFormat.g:3178:1: ( rule__XImportDeclaration__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3179:1: ( rule__XImportDeclaration__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3179:2: rule__XImportDeclaration__Group__0
+            // InternalFormat.g:3179:1: ( rule__XImportDeclaration__Group__0 )
+            // InternalFormat.g:3179:2: rule__XImportDeclaration__Group__0
             {
-            pushFollow(FOLLOW_rule__XImportDeclaration__Group__0_in_ruleXImportDeclaration6720);
+            pushFollow(FOLLOW_2);
             rule__XImportDeclaration__Group__0();
 
             state._fsp--;
@@ -9556,16 +9556,16 @@ public final void ruleXImportDeclaration() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleQualifiedNameInStaticImport"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3191:1: entryRuleQualifiedNameInStaticImport : ruleQualifiedNameInStaticImport EOF ;
+    // InternalFormat.g:3191:1: entryRuleQualifiedNameInStaticImport : ruleQualifiedNameInStaticImport EOF ;
     public final void entryRuleQualifiedNameInStaticImport() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3192:1: ( ruleQualifiedNameInStaticImport EOF )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3193:1: ruleQualifiedNameInStaticImport EOF
+            // InternalFormat.g:3192:1: ( ruleQualifiedNameInStaticImport EOF )
+            // InternalFormat.g:3193:1: ruleQualifiedNameInStaticImport EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameInStaticImportRule()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedNameInStaticImport_in_entryRuleQualifiedNameInStaticImport6747);
+            pushFollow(FOLLOW_1);
             ruleQualifiedNameInStaticImport();
 
             state._fsp--;
@@ -9573,7 +9573,7 @@ public final void entryRuleQualifiedNameInStaticImport() throws RecognitionExcep
             if ( state.backtracking==0 ) {
                after(grammarAccess.getQualifiedNameInStaticImportRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedNameInStaticImport6754); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -9590,28 +9590,28 @@ public final void entryRuleQualifiedNameInStaticImport() throws RecognitionExcep
 
 
     // $ANTLR start "ruleQualifiedNameInStaticImport"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3200:1: ruleQualifiedNameInStaticImport : ( ( ( rule__QualifiedNameInStaticImport__Group__0 ) ) ( ( rule__QualifiedNameInStaticImport__Group__0 )* ) ) ;
+    // InternalFormat.g:3200:1: ruleQualifiedNameInStaticImport : ( ( ( rule__QualifiedNameInStaticImport__Group__0 ) ) ( ( rule__QualifiedNameInStaticImport__Group__0 )* ) ) ;
     public final void ruleQualifiedNameInStaticImport() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3204:2: ( ( ( ( rule__QualifiedNameInStaticImport__Group__0 ) ) ( ( rule__QualifiedNameInStaticImport__Group__0 )* ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3205:1: ( ( ( rule__QualifiedNameInStaticImport__Group__0 ) ) ( ( rule__QualifiedNameInStaticImport__Group__0 )* ) )
+            // InternalFormat.g:3204:2: ( ( ( ( rule__QualifiedNameInStaticImport__Group__0 ) ) ( ( rule__QualifiedNameInStaticImport__Group__0 )* ) ) )
+            // InternalFormat.g:3205:1: ( ( ( rule__QualifiedNameInStaticImport__Group__0 ) ) ( ( rule__QualifiedNameInStaticImport__Group__0 )* ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3205:1: ( ( ( rule__QualifiedNameInStaticImport__Group__0 ) ) ( ( rule__QualifiedNameInStaticImport__Group__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3206:1: ( ( rule__QualifiedNameInStaticImport__Group__0 ) ) ( ( rule__QualifiedNameInStaticImport__Group__0 )* )
+            // InternalFormat.g:3205:1: ( ( ( rule__QualifiedNameInStaticImport__Group__0 ) ) ( ( rule__QualifiedNameInStaticImport__Group__0 )* ) )
+            // InternalFormat.g:3206:1: ( ( rule__QualifiedNameInStaticImport__Group__0 ) ) ( ( rule__QualifiedNameInStaticImport__Group__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3206:1: ( ( rule__QualifiedNameInStaticImport__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3207:1: ( rule__QualifiedNameInStaticImport__Group__0 )
+            // InternalFormat.g:3206:1: ( ( rule__QualifiedNameInStaticImport__Group__0 ) )
+            // InternalFormat.g:3207:1: ( rule__QualifiedNameInStaticImport__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameInStaticImportAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3208:1: ( rule__QualifiedNameInStaticImport__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3208:2: rule__QualifiedNameInStaticImport__Group__0
+            // InternalFormat.g:3208:1: ( rule__QualifiedNameInStaticImport__Group__0 )
+            // InternalFormat.g:3208:2: rule__QualifiedNameInStaticImport__Group__0
             {
-            pushFollow(FOLLOW_rule__QualifiedNameInStaticImport__Group__0_in_ruleQualifiedNameInStaticImport6782);
+            pushFollow(FOLLOW_3);
             rule__QualifiedNameInStaticImport__Group__0();
 
             state._fsp--;
@@ -9625,13 +9625,13 @@ public final void ruleQualifiedNameInStaticImport() throws RecognitionException
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3211:1: ( ( rule__QualifiedNameInStaticImport__Group__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3212:1: ( rule__QualifiedNameInStaticImport__Group__0 )*
+            // InternalFormat.g:3211:1: ( ( rule__QualifiedNameInStaticImport__Group__0 )* )
+            // InternalFormat.g:3212:1: ( rule__QualifiedNameInStaticImport__Group__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameInStaticImportAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3213:1: ( rule__QualifiedNameInStaticImport__Group__0 )*
+            // InternalFormat.g:3213:1: ( rule__QualifiedNameInStaticImport__Group__0 )*
             loop1:
             do {
                 int alt1=2;
@@ -9674,9 +9674,9 @@ public final void ruleQualifiedNameInStaticImport() throws RecognitionException
 
                 switch (alt1) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3213:2: rule__QualifiedNameInStaticImport__Group__0
+            	    // InternalFormat.g:3213:2: rule__QualifiedNameInStaticImport__Group__0
             	    {
-            	    pushFollow(FOLLOW_rule__QualifiedNameInStaticImport__Group__0_in_ruleQualifiedNameInStaticImport6794);
+            	    pushFollow(FOLLOW_3);
             	    rule__QualifiedNameInStaticImport__Group__0();
 
             	    state._fsp--;
@@ -9718,25 +9718,25 @@ public final void ruleQualifiedNameInStaticImport() throws RecognitionException
 
 
     // $ANTLR start "ruleMatcherType"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3227:1: ruleMatcherType : ( ( rule__MatcherType__Alternatives ) ) ;
+    // InternalFormat.g:3227:1: ruleMatcherType : ( ( rule__MatcherType__Alternatives ) ) ;
     public final void ruleMatcherType() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3231:1: ( ( ( rule__MatcherType__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3232:1: ( ( rule__MatcherType__Alternatives ) )
+            // InternalFormat.g:3231:1: ( ( ( rule__MatcherType__Alternatives ) ) )
+            // InternalFormat.g:3232:1: ( ( rule__MatcherType__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3232:1: ( ( rule__MatcherType__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3233:1: ( rule__MatcherType__Alternatives )
+            // InternalFormat.g:3232:1: ( ( rule__MatcherType__Alternatives ) )
+            // InternalFormat.g:3233:1: ( rule__MatcherType__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMatcherTypeAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3234:1: ( rule__MatcherType__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3234:2: rule__MatcherType__Alternatives
+            // InternalFormat.g:3234:1: ( rule__MatcherType__Alternatives )
+            // InternalFormat.g:3234:2: rule__MatcherType__Alternatives
             {
-            pushFollow(FOLLOW_rule__MatcherType__Alternatives_in_ruleMatcherType6834);
+            pushFollow(FOLLOW_2);
             rule__MatcherType__Alternatives();
 
             state._fsp--;
@@ -9769,13 +9769,13 @@ public final void ruleMatcherType() throws RecognitionException {
 
 
     // $ANTLR start "rule__Constant__Alternatives_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3245:1: rule__Constant__Alternatives_0 : ( ( ( rule__Constant__IntTypeAssignment_0_0 ) ) | ( ( rule__Constant__StringTypeAssignment_0_1 ) ) );
+    // InternalFormat.g:3245:1: rule__Constant__Alternatives_0 : ( ( ( rule__Constant__IntTypeAssignment_0_0 ) ) | ( ( rule__Constant__StringTypeAssignment_0_1 ) ) );
     public final void rule__Constant__Alternatives_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3249:1: ( ( ( rule__Constant__IntTypeAssignment_0_0 ) ) | ( ( rule__Constant__StringTypeAssignment_0_1 ) ) )
+            // InternalFormat.g:3249:1: ( ( ( rule__Constant__IntTypeAssignment_0_0 ) ) | ( ( rule__Constant__StringTypeAssignment_0_1 ) ) )
             int alt2=2;
             int LA2_0 = input.LA(1);
 
@@ -9794,18 +9794,18 @@ else if ( (LA2_0==105) ) {
             }
             switch (alt2) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3250:1: ( ( rule__Constant__IntTypeAssignment_0_0 ) )
+                    // InternalFormat.g:3250:1: ( ( rule__Constant__IntTypeAssignment_0_0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3250:1: ( ( rule__Constant__IntTypeAssignment_0_0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3251:1: ( rule__Constant__IntTypeAssignment_0_0 )
+                    // InternalFormat.g:3250:1: ( ( rule__Constant__IntTypeAssignment_0_0 ) )
+                    // InternalFormat.g:3251:1: ( rule__Constant__IntTypeAssignment_0_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getConstantAccess().getIntTypeAssignment_0_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3252:1: ( rule__Constant__IntTypeAssignment_0_0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3252:2: rule__Constant__IntTypeAssignment_0_0
+                    // InternalFormat.g:3252:1: ( rule__Constant__IntTypeAssignment_0_0 )
+                    // InternalFormat.g:3252:2: rule__Constant__IntTypeAssignment_0_0
                     {
-                    pushFollow(FOLLOW_rule__Constant__IntTypeAssignment_0_0_in_rule__Constant__Alternatives_06869);
+                    pushFollow(FOLLOW_2);
                     rule__Constant__IntTypeAssignment_0_0();
 
                     state._fsp--;
@@ -9823,18 +9823,18 @@ else if ( (LA2_0==105) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3256:6: ( ( rule__Constant__StringTypeAssignment_0_1 ) )
+                    // InternalFormat.g:3256:6: ( ( rule__Constant__StringTypeAssignment_0_1 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3256:6: ( ( rule__Constant__StringTypeAssignment_0_1 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3257:1: ( rule__Constant__StringTypeAssignment_0_1 )
+                    // InternalFormat.g:3256:6: ( ( rule__Constant__StringTypeAssignment_0_1 ) )
+                    // InternalFormat.g:3257:1: ( rule__Constant__StringTypeAssignment_0_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getConstantAccess().getStringTypeAssignment_0_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3258:1: ( rule__Constant__StringTypeAssignment_0_1 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3258:2: rule__Constant__StringTypeAssignment_0_1
+                    // InternalFormat.g:3258:1: ( rule__Constant__StringTypeAssignment_0_1 )
+                    // InternalFormat.g:3258:2: rule__Constant__StringTypeAssignment_0_1
                     {
-                    pushFollow(FOLLOW_rule__Constant__StringTypeAssignment_0_1_in_rule__Constant__Alternatives_06887);
+                    pushFollow(FOLLOW_2);
                     rule__Constant__StringTypeAssignment_0_1();
 
                     state._fsp--;
@@ -9869,13 +9869,13 @@ else if ( (LA2_0==105) ) {
 
 
     // $ANTLR start "rule__Constant__Alternatives_3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3267:1: rule__Constant__Alternatives_3 : ( ( ( rule__Constant__IntValueAssignment_3_0 ) ) | ( ( rule__Constant__StringValueAssignment_3_1 ) ) );
+    // InternalFormat.g:3267:1: rule__Constant__Alternatives_3 : ( ( ( rule__Constant__IntValueAssignment_3_0 ) ) | ( ( rule__Constant__StringValueAssignment_3_1 ) ) );
     public final void rule__Constant__Alternatives_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3271:1: ( ( ( rule__Constant__IntValueAssignment_3_0 ) ) | ( ( rule__Constant__StringValueAssignment_3_1 ) ) )
+            // InternalFormat.g:3271:1: ( ( ( rule__Constant__IntValueAssignment_3_0 ) ) | ( ( rule__Constant__StringValueAssignment_3_1 ) ) )
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -9894,18 +9894,18 @@ else if ( (LA3_0==RULE_STRING) ) {
             }
             switch (alt3) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3272:1: ( ( rule__Constant__IntValueAssignment_3_0 ) )
+                    // InternalFormat.g:3272:1: ( ( rule__Constant__IntValueAssignment_3_0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3272:1: ( ( rule__Constant__IntValueAssignment_3_0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3273:1: ( rule__Constant__IntValueAssignment_3_0 )
+                    // InternalFormat.g:3272:1: ( ( rule__Constant__IntValueAssignment_3_0 ) )
+                    // InternalFormat.g:3273:1: ( rule__Constant__IntValueAssignment_3_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getConstantAccess().getIntValueAssignment_3_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3274:1: ( rule__Constant__IntValueAssignment_3_0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3274:2: rule__Constant__IntValueAssignment_3_0
+                    // InternalFormat.g:3274:1: ( rule__Constant__IntValueAssignment_3_0 )
+                    // InternalFormat.g:3274:2: rule__Constant__IntValueAssignment_3_0
                     {
-                    pushFollow(FOLLOW_rule__Constant__IntValueAssignment_3_0_in_rule__Constant__Alternatives_36920);
+                    pushFollow(FOLLOW_2);
                     rule__Constant__IntValueAssignment_3_0();
 
                     state._fsp--;
@@ -9923,18 +9923,18 @@ else if ( (LA3_0==RULE_STRING) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3278:6: ( ( rule__Constant__StringValueAssignment_3_1 ) )
+                    // InternalFormat.g:3278:6: ( ( rule__Constant__StringValueAssignment_3_1 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3278:6: ( ( rule__Constant__StringValueAssignment_3_1 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3279:1: ( rule__Constant__StringValueAssignment_3_1 )
+                    // InternalFormat.g:3278:6: ( ( rule__Constant__StringValueAssignment_3_1 ) )
+                    // InternalFormat.g:3279:1: ( rule__Constant__StringValueAssignment_3_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getConstantAccess().getStringValueAssignment_3_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3280:1: ( rule__Constant__StringValueAssignment_3_1 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3280:2: rule__Constant__StringValueAssignment_3_1
+                    // InternalFormat.g:3280:1: ( rule__Constant__StringValueAssignment_3_1 )
+                    // InternalFormat.g:3280:2: rule__Constant__StringValueAssignment_3_1
                     {
-                    pushFollow(FOLLOW_rule__Constant__StringValueAssignment_3_1_in_rule__Constant__Alternatives_36938);
+                    pushFollow(FOLLOW_2);
                     rule__Constant__StringValueAssignment_3_1();
 
                     state._fsp--;
@@ -9969,13 +9969,13 @@ else if ( (LA3_0==RULE_STRING) ) {
 
 
     // $ANTLR start "rule__IntValue__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3289:1: rule__IntValue__Alternatives : ( ( ( rule__IntValue__LiteralAssignment_0 ) ) | ( ( rule__IntValue__ReferenceAssignment_1 ) ) );
+    // InternalFormat.g:3289:1: rule__IntValue__Alternatives : ( ( ( rule__IntValue__LiteralAssignment_0 ) ) | ( ( rule__IntValue__ReferenceAssignment_1 ) ) );
     public final void rule__IntValue__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3293:1: ( ( ( rule__IntValue__LiteralAssignment_0 ) ) | ( ( rule__IntValue__ReferenceAssignment_1 ) ) )
+            // InternalFormat.g:3293:1: ( ( ( rule__IntValue__LiteralAssignment_0 ) ) | ( ( rule__IntValue__ReferenceAssignment_1 ) ) )
             int alt4=2;
             int LA4_0 = input.LA(1);
 
@@ -9994,18 +9994,18 @@ else if ( (LA4_0==RULE_ID||(LA4_0>=18 && LA4_0<=19)) ) {
             }
             switch (alt4) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3294:1: ( ( rule__IntValue__LiteralAssignment_0 ) )
+                    // InternalFormat.g:3294:1: ( ( rule__IntValue__LiteralAssignment_0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3294:1: ( ( rule__IntValue__LiteralAssignment_0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3295:1: ( rule__IntValue__LiteralAssignment_0 )
+                    // InternalFormat.g:3294:1: ( ( rule__IntValue__LiteralAssignment_0 ) )
+                    // InternalFormat.g:3295:1: ( rule__IntValue__LiteralAssignment_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getIntValueAccess().getLiteralAssignment_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3296:1: ( rule__IntValue__LiteralAssignment_0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3296:2: rule__IntValue__LiteralAssignment_0
+                    // InternalFormat.g:3296:1: ( rule__IntValue__LiteralAssignment_0 )
+                    // InternalFormat.g:3296:2: rule__IntValue__LiteralAssignment_0
                     {
-                    pushFollow(FOLLOW_rule__IntValue__LiteralAssignment_0_in_rule__IntValue__Alternatives6971);
+                    pushFollow(FOLLOW_2);
                     rule__IntValue__LiteralAssignment_0();
 
                     state._fsp--;
@@ -10023,18 +10023,18 @@ else if ( (LA4_0==RULE_ID||(LA4_0>=18 && LA4_0<=19)) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3300:6: ( ( rule__IntValue__ReferenceAssignment_1 ) )
+                    // InternalFormat.g:3300:6: ( ( rule__IntValue__ReferenceAssignment_1 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3300:6: ( ( rule__IntValue__ReferenceAssignment_1 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3301:1: ( rule__IntValue__ReferenceAssignment_1 )
+                    // InternalFormat.g:3300:6: ( ( rule__IntValue__ReferenceAssignment_1 ) )
+                    // InternalFormat.g:3301:1: ( rule__IntValue__ReferenceAssignment_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getIntValueAccess().getReferenceAssignment_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3302:1: ( rule__IntValue__ReferenceAssignment_1 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3302:2: rule__IntValue__ReferenceAssignment_1
+                    // InternalFormat.g:3302:1: ( rule__IntValue__ReferenceAssignment_1 )
+                    // InternalFormat.g:3302:2: rule__IntValue__ReferenceAssignment_1
                     {
-                    pushFollow(FOLLOW_rule__IntValue__ReferenceAssignment_1_in_rule__IntValue__Alternatives6989);
+                    pushFollow(FOLLOW_2);
                     rule__IntValue__ReferenceAssignment_1();
 
                     state._fsp--;
@@ -10069,13 +10069,13 @@ else if ( (LA4_0==RULE_ID||(LA4_0>=18 && LA4_0<=19)) ) {
 
 
     // $ANTLR start "rule__StringValue__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3311:1: rule__StringValue__Alternatives : ( ( ( rule__StringValue__LiteralAssignment_0 ) ) | ( ( rule__StringValue__ReferenceAssignment_1 ) ) );
+    // InternalFormat.g:3311:1: rule__StringValue__Alternatives : ( ( ( rule__StringValue__LiteralAssignment_0 ) ) | ( ( rule__StringValue__ReferenceAssignment_1 ) ) );
     public final void rule__StringValue__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3315:1: ( ( ( rule__StringValue__LiteralAssignment_0 ) ) | ( ( rule__StringValue__ReferenceAssignment_1 ) ) )
+            // InternalFormat.g:3315:1: ( ( ( rule__StringValue__LiteralAssignment_0 ) ) | ( ( rule__StringValue__ReferenceAssignment_1 ) ) )
             int alt5=2;
             int LA5_0 = input.LA(1);
 
@@ -10094,18 +10094,18 @@ else if ( (LA5_0==RULE_ID||(LA5_0>=18 && LA5_0<=19)) ) {
             }
             switch (alt5) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3316:1: ( ( rule__StringValue__LiteralAssignment_0 ) )
+                    // InternalFormat.g:3316:1: ( ( rule__StringValue__LiteralAssignment_0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3316:1: ( ( rule__StringValue__LiteralAssignment_0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3317:1: ( rule__StringValue__LiteralAssignment_0 )
+                    // InternalFormat.g:3316:1: ( ( rule__StringValue__LiteralAssignment_0 ) )
+                    // InternalFormat.g:3317:1: ( rule__StringValue__LiteralAssignment_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getStringValueAccess().getLiteralAssignment_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3318:1: ( rule__StringValue__LiteralAssignment_0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3318:2: rule__StringValue__LiteralAssignment_0
+                    // InternalFormat.g:3318:1: ( rule__StringValue__LiteralAssignment_0 )
+                    // InternalFormat.g:3318:2: rule__StringValue__LiteralAssignment_0
                     {
-                    pushFollow(FOLLOW_rule__StringValue__LiteralAssignment_0_in_rule__StringValue__Alternatives7022);
+                    pushFollow(FOLLOW_2);
                     rule__StringValue__LiteralAssignment_0();
 
                     state._fsp--;
@@ -10123,18 +10123,18 @@ else if ( (LA5_0==RULE_ID||(LA5_0>=18 && LA5_0<=19)) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3322:6: ( ( rule__StringValue__ReferenceAssignment_1 ) )
+                    // InternalFormat.g:3322:6: ( ( rule__StringValue__ReferenceAssignment_1 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3322:6: ( ( rule__StringValue__ReferenceAssignment_1 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3323:1: ( rule__StringValue__ReferenceAssignment_1 )
+                    // InternalFormat.g:3322:6: ( ( rule__StringValue__ReferenceAssignment_1 ) )
+                    // InternalFormat.g:3323:1: ( rule__StringValue__ReferenceAssignment_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getStringValueAccess().getReferenceAssignment_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3324:1: ( rule__StringValue__ReferenceAssignment_1 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3324:2: rule__StringValue__ReferenceAssignment_1
+                    // InternalFormat.g:3324:1: ( rule__StringValue__ReferenceAssignment_1 )
+                    // InternalFormat.g:3324:2: rule__StringValue__ReferenceAssignment_1
                     {
-                    pushFollow(FOLLOW_rule__StringValue__ReferenceAssignment_1_in_rule__StringValue__Alternatives7040);
+                    pushFollow(FOLLOW_2);
                     rule__StringValue__ReferenceAssignment_1();
 
                     state._fsp--;
@@ -10169,13 +10169,13 @@ else if ( (LA5_0==RULE_ID||(LA5_0>=18 && LA5_0<=19)) ) {
 
 
     // $ANTLR start "rule__Rule__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3333:1: rule__Rule__Alternatives : ( ( ruleWildcardRule ) | ( ruleGrammarRule ) );
+    // InternalFormat.g:3333:1: rule__Rule__Alternatives : ( ( ruleWildcardRule ) | ( ruleGrammarRule ) );
     public final void rule__Rule__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3337:1: ( ( ruleWildcardRule ) | ( ruleGrammarRule ) )
+            // InternalFormat.g:3337:1: ( ( ruleWildcardRule ) | ( ruleGrammarRule ) )
             int alt6=2;
             switch ( input.LA(1) ) {
             case 106:
@@ -10217,15 +10217,15 @@ else if ( (LA6_1==42) ) {
 
             switch (alt6) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3338:1: ( ruleWildcardRule )
+                    // InternalFormat.g:3338:1: ( ruleWildcardRule )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3338:1: ( ruleWildcardRule )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3339:1: ruleWildcardRule
+                    // InternalFormat.g:3338:1: ( ruleWildcardRule )
+                    // InternalFormat.g:3339:1: ruleWildcardRule
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getRuleAccess().getWildcardRuleParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleWildcardRule_in_rule__Rule__Alternatives7073);
+                    pushFollow(FOLLOW_2);
                     ruleWildcardRule();
 
                     state._fsp--;
@@ -10240,15 +10240,15 @@ else if ( (LA6_1==42) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3344:6: ( ruleGrammarRule )
+                    // InternalFormat.g:3344:6: ( ruleGrammarRule )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3344:6: ( ruleGrammarRule )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3345:1: ruleGrammarRule
+                    // InternalFormat.g:3344:6: ( ruleGrammarRule )
+                    // InternalFormat.g:3345:1: ruleGrammarRule
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getRuleAccess().getGrammarRuleParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleGrammarRule_in_rule__Rule__Alternatives7090);
+                    pushFollow(FOLLOW_2);
                     ruleGrammarRule();
 
                     state._fsp--;
@@ -10280,13 +10280,13 @@ else if ( (LA6_1==42) ) {
 
 
     // $ANTLR start "rule__GrammarRule__Alternatives_3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3355:1: rule__GrammarRule__Alternatives_3 : ( ( ( rule__GrammarRule__DirectivesAssignment_3_0 ) ) | ( ( rule__GrammarRule__DirectivesAssignment_3_1 ) ) );
+    // InternalFormat.g:3355:1: rule__GrammarRule__Alternatives_3 : ( ( ( rule__GrammarRule__DirectivesAssignment_3_0 ) ) | ( ( rule__GrammarRule__DirectivesAssignment_3_1 ) ) );
     public final void rule__GrammarRule__Alternatives_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3359:1: ( ( ( rule__GrammarRule__DirectivesAssignment_3_0 ) ) | ( ( rule__GrammarRule__DirectivesAssignment_3_1 ) ) )
+            // InternalFormat.g:3359:1: ( ( ( rule__GrammarRule__DirectivesAssignment_3_0 ) ) | ( ( rule__GrammarRule__DirectivesAssignment_3_1 ) ) )
             int alt7=2;
             int LA7_0 = input.LA(1);
 
@@ -10305,18 +10305,18 @@ else if ( (LA7_0==73) ) {
             }
             switch (alt7) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3360:1: ( ( rule__GrammarRule__DirectivesAssignment_3_0 ) )
+                    // InternalFormat.g:3360:1: ( ( rule__GrammarRule__DirectivesAssignment_3_0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3360:1: ( ( rule__GrammarRule__DirectivesAssignment_3_0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3361:1: ( rule__GrammarRule__DirectivesAssignment_3_0 )
+                    // InternalFormat.g:3360:1: ( ( rule__GrammarRule__DirectivesAssignment_3_0 ) )
+                    // InternalFormat.g:3361:1: ( rule__GrammarRule__DirectivesAssignment_3_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getGrammarRuleAccess().getDirectivesAssignment_3_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3362:1: ( rule__GrammarRule__DirectivesAssignment_3_0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3362:2: rule__GrammarRule__DirectivesAssignment_3_0
+                    // InternalFormat.g:3362:1: ( rule__GrammarRule__DirectivesAssignment_3_0 )
+                    // InternalFormat.g:3362:2: rule__GrammarRule__DirectivesAssignment_3_0
                     {
-                    pushFollow(FOLLOW_rule__GrammarRule__DirectivesAssignment_3_0_in_rule__GrammarRule__Alternatives_37122);
+                    pushFollow(FOLLOW_2);
                     rule__GrammarRule__DirectivesAssignment_3_0();
 
                     state._fsp--;
@@ -10334,18 +10334,18 @@ else if ( (LA7_0==73) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3366:6: ( ( rule__GrammarRule__DirectivesAssignment_3_1 ) )
+                    // InternalFormat.g:3366:6: ( ( rule__GrammarRule__DirectivesAssignment_3_1 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3366:6: ( ( rule__GrammarRule__DirectivesAssignment_3_1 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3367:1: ( rule__GrammarRule__DirectivesAssignment_3_1 )
+                    // InternalFormat.g:3366:6: ( ( rule__GrammarRule__DirectivesAssignment_3_1 ) )
+                    // InternalFormat.g:3367:1: ( rule__GrammarRule__DirectivesAssignment_3_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getGrammarRuleAccess().getDirectivesAssignment_3_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3368:1: ( rule__GrammarRule__DirectivesAssignment_3_1 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3368:2: rule__GrammarRule__DirectivesAssignment_3_1
+                    // InternalFormat.g:3368:1: ( rule__GrammarRule__DirectivesAssignment_3_1 )
+                    // InternalFormat.g:3368:2: rule__GrammarRule__DirectivesAssignment_3_1
                     {
-                    pushFollow(FOLLOW_rule__GrammarRule__DirectivesAssignment_3_1_in_rule__GrammarRule__Alternatives_37140);
+                    pushFollow(FOLLOW_2);
                     rule__GrammarRule__DirectivesAssignment_3_1();
 
                     state._fsp--;
@@ -10380,13 +10380,13 @@ else if ( (LA7_0==73) ) {
 
 
     // $ANTLR start "rule__GrammarRuleDirective__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3377:1: rule__GrammarRuleDirective__Alternatives : ( ( ruleSpecificDirective ) | ( ruleContextFreeDirective ) | ( ruleKeywordPair ) );
+    // InternalFormat.g:3377:1: rule__GrammarRuleDirective__Alternatives : ( ( ruleSpecificDirective ) | ( ruleContextFreeDirective ) | ( ruleKeywordPair ) );
     public final void rule__GrammarRuleDirective__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3381:1: ( ( ruleSpecificDirective ) | ( ruleContextFreeDirective ) | ( ruleKeywordPair ) )
+            // InternalFormat.g:3381:1: ( ( ruleSpecificDirective ) | ( ruleContextFreeDirective ) | ( ruleKeywordPair ) )
             int alt8=3;
             switch ( input.LA(1) ) {
             case RULE_ID:
@@ -10420,15 +10420,15 @@ public final void rule__GrammarRuleDirective__Alternatives() throws RecognitionE
 
             switch (alt8) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3382:1: ( ruleSpecificDirective )
+                    // InternalFormat.g:3382:1: ( ruleSpecificDirective )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3382:1: ( ruleSpecificDirective )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3383:1: ruleSpecificDirective
+                    // InternalFormat.g:3382:1: ( ruleSpecificDirective )
+                    // InternalFormat.g:3383:1: ruleSpecificDirective
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getGrammarRuleDirectiveAccess().getSpecificDirectiveParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleSpecificDirective_in_rule__GrammarRuleDirective__Alternatives7173);
+                    pushFollow(FOLLOW_2);
                     ruleSpecificDirective();
 
                     state._fsp--;
@@ -10443,15 +10443,15 @@ public final void rule__GrammarRuleDirective__Alternatives() throws RecognitionE
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3388:6: ( ruleContextFreeDirective )
+                    // InternalFormat.g:3388:6: ( ruleContextFreeDirective )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3388:6: ( ruleContextFreeDirective )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3389:1: ruleContextFreeDirective
+                    // InternalFormat.g:3388:6: ( ruleContextFreeDirective )
+                    // InternalFormat.g:3389:1: ruleContextFreeDirective
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getGrammarRuleDirectiveAccess().getContextFreeDirectiveParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleContextFreeDirective_in_rule__GrammarRuleDirective__Alternatives7190);
+                    pushFollow(FOLLOW_2);
                     ruleContextFreeDirective();
 
                     state._fsp--;
@@ -10466,15 +10466,15 @@ public final void rule__GrammarRuleDirective__Alternatives() throws RecognitionE
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3394:6: ( ruleKeywordPair )
+                    // InternalFormat.g:3394:6: ( ruleKeywordPair )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3394:6: ( ruleKeywordPair )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3395:1: ruleKeywordPair
+                    // InternalFormat.g:3394:6: ( ruleKeywordPair )
+                    // InternalFormat.g:3395:1: ruleKeywordPair
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getGrammarRuleDirectiveAccess().getKeywordPairParserRuleCall_2()); 
                     }
-                    pushFollow(FOLLOW_ruleKeywordPair_in_rule__GrammarRuleDirective__Alternatives7207);
+                    pushFollow(FOLLOW_2);
                     ruleKeywordPair();
 
                     state._fsp--;
@@ -10506,13 +10506,13 @@ public final void rule__GrammarRuleDirective__Alternatives() throws RecognitionE
 
 
     // $ANTLR start "rule__WildcardRuleDirective__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3405:1: rule__WildcardRuleDirective__Alternatives : ( ( ruleContextFreeDirective ) | ( ruleKeywordPair ) );
+    // InternalFormat.g:3405:1: rule__WildcardRuleDirective__Alternatives : ( ( ruleContextFreeDirective ) | ( ruleKeywordPair ) );
     public final void rule__WildcardRuleDirective__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3409:1: ( ( ruleContextFreeDirective ) | ( ruleKeywordPair ) )
+            // InternalFormat.g:3409:1: ( ( ruleContextFreeDirective ) | ( ruleKeywordPair ) )
             int alt9=2;
             int LA9_0 = input.LA(1);
 
@@ -10531,15 +10531,15 @@ else if ( (LA9_0==74) ) {
             }
             switch (alt9) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3410:1: ( ruleContextFreeDirective )
+                    // InternalFormat.g:3410:1: ( ruleContextFreeDirective )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3410:1: ( ruleContextFreeDirective )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3411:1: ruleContextFreeDirective
+                    // InternalFormat.g:3410:1: ( ruleContextFreeDirective )
+                    // InternalFormat.g:3411:1: ruleContextFreeDirective
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getWildcardRuleDirectiveAccess().getContextFreeDirectiveParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleContextFreeDirective_in_rule__WildcardRuleDirective__Alternatives7239);
+                    pushFollow(FOLLOW_2);
                     ruleContextFreeDirective();
 
                     state._fsp--;
@@ -10554,15 +10554,15 @@ else if ( (LA9_0==74) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3416:6: ( ruleKeywordPair )
+                    // InternalFormat.g:3416:6: ( ruleKeywordPair )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3416:6: ( ruleKeywordPair )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3417:1: ruleKeywordPair
+                    // InternalFormat.g:3416:6: ( ruleKeywordPair )
+                    // InternalFormat.g:3417:1: ruleKeywordPair
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getWildcardRuleDirectiveAccess().getKeywordPairParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleKeywordPair_in_rule__WildcardRuleDirective__Alternatives7256);
+                    pushFollow(FOLLOW_2);
                     ruleKeywordPair();
 
                     state._fsp--;
@@ -10594,13 +10594,13 @@ else if ( (LA9_0==74) ) {
 
 
     // $ANTLR start "rule__GrammarElementReference__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3427:1: rule__GrammarElementReference__Alternatives : ( ( ( rule__GrammarElementReference__Group_0__0 ) ) | ( ( rule__GrammarElementReference__Group_1__0 ) ) | ( ( rule__GrammarElementReference__SelfAssignment_2 ) ) | ( ( rule__GrammarElementReference__RuleAssignment_3 ) ) | ( ( rule__GrammarElementReference__KeywordAssignment_4 ) ) );
+    // InternalFormat.g:3427:1: rule__GrammarElementReference__Alternatives : ( ( ( rule__GrammarElementReference__Group_0__0 ) ) | ( ( rule__GrammarElementReference__Group_1__0 ) ) | ( ( rule__GrammarElementReference__SelfAssignment_2 ) ) | ( ( rule__GrammarElementReference__RuleAssignment_3 ) ) | ( ( rule__GrammarElementReference__KeywordAssignment_4 ) ) );
     public final void rule__GrammarElementReference__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3431:1: ( ( ( rule__GrammarElementReference__Group_0__0 ) ) | ( ( rule__GrammarElementReference__Group_1__0 ) ) | ( ( rule__GrammarElementReference__SelfAssignment_2 ) ) | ( ( rule__GrammarElementReference__RuleAssignment_3 ) ) | ( ( rule__GrammarElementReference__KeywordAssignment_4 ) ) )
+            // InternalFormat.g:3431:1: ( ( ( rule__GrammarElementReference__Group_0__0 ) ) | ( ( rule__GrammarElementReference__Group_1__0 ) ) | ( ( rule__GrammarElementReference__SelfAssignment_2 ) ) | ( ( rule__GrammarElementReference__RuleAssignment_3 ) ) | ( ( rule__GrammarElementReference__KeywordAssignment_4 ) ) )
             int alt10=5;
             switch ( input.LA(1) ) {
             case 14:
@@ -10640,18 +10640,18 @@ public final void rule__GrammarElementReference__Alternatives() throws Recogniti
 
             switch (alt10) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3432:1: ( ( rule__GrammarElementReference__Group_0__0 ) )
+                    // InternalFormat.g:3432:1: ( ( rule__GrammarElementReference__Group_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3432:1: ( ( rule__GrammarElementReference__Group_0__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3433:1: ( rule__GrammarElementReference__Group_0__0 )
+                    // InternalFormat.g:3432:1: ( ( rule__GrammarElementReference__Group_0__0 ) )
+                    // InternalFormat.g:3433:1: ( rule__GrammarElementReference__Group_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getGrammarElementReferenceAccess().getGroup_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3434:1: ( rule__GrammarElementReference__Group_0__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3434:2: rule__GrammarElementReference__Group_0__0
+                    // InternalFormat.g:3434:1: ( rule__GrammarElementReference__Group_0__0 )
+                    // InternalFormat.g:3434:2: rule__GrammarElementReference__Group_0__0
                     {
-                    pushFollow(FOLLOW_rule__GrammarElementReference__Group_0__0_in_rule__GrammarElementReference__Alternatives7288);
+                    pushFollow(FOLLOW_2);
                     rule__GrammarElementReference__Group_0__0();
 
                     state._fsp--;
@@ -10669,18 +10669,18 @@ public final void rule__GrammarElementReference__Alternatives() throws Recogniti
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3438:6: ( ( rule__GrammarElementReference__Group_1__0 ) )
+                    // InternalFormat.g:3438:6: ( ( rule__GrammarElementReference__Group_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3438:6: ( ( rule__GrammarElementReference__Group_1__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3439:1: ( rule__GrammarElementReference__Group_1__0 )
+                    // InternalFormat.g:3438:6: ( ( rule__GrammarElementReference__Group_1__0 ) )
+                    // InternalFormat.g:3439:1: ( rule__GrammarElementReference__Group_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getGrammarElementReferenceAccess().getGroup_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3440:1: ( rule__GrammarElementReference__Group_1__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3440:2: rule__GrammarElementReference__Group_1__0
+                    // InternalFormat.g:3440:1: ( rule__GrammarElementReference__Group_1__0 )
+                    // InternalFormat.g:3440:2: rule__GrammarElementReference__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__GrammarElementReference__Group_1__0_in_rule__GrammarElementReference__Alternatives7306);
+                    pushFollow(FOLLOW_2);
                     rule__GrammarElementReference__Group_1__0();
 
                     state._fsp--;
@@ -10698,18 +10698,18 @@ public final void rule__GrammarElementReference__Alternatives() throws Recogniti
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3444:6: ( ( rule__GrammarElementReference__SelfAssignment_2 ) )
+                    // InternalFormat.g:3444:6: ( ( rule__GrammarElementReference__SelfAssignment_2 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3444:6: ( ( rule__GrammarElementReference__SelfAssignment_2 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3445:1: ( rule__GrammarElementReference__SelfAssignment_2 )
+                    // InternalFormat.g:3444:6: ( ( rule__GrammarElementReference__SelfAssignment_2 ) )
+                    // InternalFormat.g:3445:1: ( rule__GrammarElementReference__SelfAssignment_2 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getGrammarElementReferenceAccess().getSelfAssignment_2()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3446:1: ( rule__GrammarElementReference__SelfAssignment_2 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3446:2: rule__GrammarElementReference__SelfAssignment_2
+                    // InternalFormat.g:3446:1: ( rule__GrammarElementReference__SelfAssignment_2 )
+                    // InternalFormat.g:3446:2: rule__GrammarElementReference__SelfAssignment_2
                     {
-                    pushFollow(FOLLOW_rule__GrammarElementReference__SelfAssignment_2_in_rule__GrammarElementReference__Alternatives7324);
+                    pushFollow(FOLLOW_2);
                     rule__GrammarElementReference__SelfAssignment_2();
 
                     state._fsp--;
@@ -10727,18 +10727,18 @@ public final void rule__GrammarElementReference__Alternatives() throws Recogniti
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3450:6: ( ( rule__GrammarElementReference__RuleAssignment_3 ) )
+                    // InternalFormat.g:3450:6: ( ( rule__GrammarElementReference__RuleAssignment_3 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3450:6: ( ( rule__GrammarElementReference__RuleAssignment_3 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3451:1: ( rule__GrammarElementReference__RuleAssignment_3 )
+                    // InternalFormat.g:3450:6: ( ( rule__GrammarElementReference__RuleAssignment_3 ) )
+                    // InternalFormat.g:3451:1: ( rule__GrammarElementReference__RuleAssignment_3 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getGrammarElementReferenceAccess().getRuleAssignment_3()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3452:1: ( rule__GrammarElementReference__RuleAssignment_3 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3452:2: rule__GrammarElementReference__RuleAssignment_3
+                    // InternalFormat.g:3452:1: ( rule__GrammarElementReference__RuleAssignment_3 )
+                    // InternalFormat.g:3452:2: rule__GrammarElementReference__RuleAssignment_3
                     {
-                    pushFollow(FOLLOW_rule__GrammarElementReference__RuleAssignment_3_in_rule__GrammarElementReference__Alternatives7342);
+                    pushFollow(FOLLOW_2);
                     rule__GrammarElementReference__RuleAssignment_3();
 
                     state._fsp--;
@@ -10756,18 +10756,18 @@ public final void rule__GrammarElementReference__Alternatives() throws Recogniti
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3456:6: ( ( rule__GrammarElementReference__KeywordAssignment_4 ) )
+                    // InternalFormat.g:3456:6: ( ( rule__GrammarElementReference__KeywordAssignment_4 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3456:6: ( ( rule__GrammarElementReference__KeywordAssignment_4 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3457:1: ( rule__GrammarElementReference__KeywordAssignment_4 )
+                    // InternalFormat.g:3456:6: ( ( rule__GrammarElementReference__KeywordAssignment_4 ) )
+                    // InternalFormat.g:3457:1: ( rule__GrammarElementReference__KeywordAssignment_4 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getGrammarElementReferenceAccess().getKeywordAssignment_4()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3458:1: ( rule__GrammarElementReference__KeywordAssignment_4 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3458:2: rule__GrammarElementReference__KeywordAssignment_4
+                    // InternalFormat.g:3458:1: ( rule__GrammarElementReference__KeywordAssignment_4 )
+                    // InternalFormat.g:3458:2: rule__GrammarElementReference__KeywordAssignment_4
                     {
-                    pushFollow(FOLLOW_rule__GrammarElementReference__KeywordAssignment_4_in_rule__GrammarElementReference__Alternatives7360);
+                    pushFollow(FOLLOW_2);
                     rule__GrammarElementReference__KeywordAssignment_4();
 
                     state._fsp--;
@@ -10802,13 +10802,13 @@ public final void rule__GrammarElementReference__Alternatives() throws Recogniti
 
 
     // $ANTLR start "rule__GrammarElementLookup__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3467:1: rule__GrammarElementLookup__Alternatives : ( ( ( rule__GrammarElementLookup__RuleAssignment_0 ) ) | ( ( rule__GrammarElementLookup__KeywordAssignment_1 ) ) );
+    // InternalFormat.g:3467:1: rule__GrammarElementLookup__Alternatives : ( ( ( rule__GrammarElementLookup__RuleAssignment_0 ) ) | ( ( rule__GrammarElementLookup__KeywordAssignment_1 ) ) );
     public final void rule__GrammarElementLookup__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3471:1: ( ( ( rule__GrammarElementLookup__RuleAssignment_0 ) ) | ( ( rule__GrammarElementLookup__KeywordAssignment_1 ) ) )
+            // InternalFormat.g:3471:1: ( ( ( rule__GrammarElementLookup__RuleAssignment_0 ) ) | ( ( rule__GrammarElementLookup__KeywordAssignment_1 ) ) )
             int alt11=2;
             int LA11_0 = input.LA(1);
 
@@ -10827,18 +10827,18 @@ else if ( (LA11_0==RULE_STRING) ) {
             }
             switch (alt11) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3472:1: ( ( rule__GrammarElementLookup__RuleAssignment_0 ) )
+                    // InternalFormat.g:3472:1: ( ( rule__GrammarElementLookup__RuleAssignment_0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3472:1: ( ( rule__GrammarElementLookup__RuleAssignment_0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3473:1: ( rule__GrammarElementLookup__RuleAssignment_0 )
+                    // InternalFormat.g:3472:1: ( ( rule__GrammarElementLookup__RuleAssignment_0 ) )
+                    // InternalFormat.g:3473:1: ( rule__GrammarElementLookup__RuleAssignment_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getGrammarElementLookupAccess().getRuleAssignment_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3474:1: ( rule__GrammarElementLookup__RuleAssignment_0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3474:2: rule__GrammarElementLookup__RuleAssignment_0
+                    // InternalFormat.g:3474:1: ( rule__GrammarElementLookup__RuleAssignment_0 )
+                    // InternalFormat.g:3474:2: rule__GrammarElementLookup__RuleAssignment_0
                     {
-                    pushFollow(FOLLOW_rule__GrammarElementLookup__RuleAssignment_0_in_rule__GrammarElementLookup__Alternatives7393);
+                    pushFollow(FOLLOW_2);
                     rule__GrammarElementLookup__RuleAssignment_0();
 
                     state._fsp--;
@@ -10856,18 +10856,18 @@ else if ( (LA11_0==RULE_STRING) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3478:6: ( ( rule__GrammarElementLookup__KeywordAssignment_1 ) )
+                    // InternalFormat.g:3478:6: ( ( rule__GrammarElementLookup__KeywordAssignment_1 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3478:6: ( ( rule__GrammarElementLookup__KeywordAssignment_1 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3479:1: ( rule__GrammarElementLookup__KeywordAssignment_1 )
+                    // InternalFormat.g:3478:6: ( ( rule__GrammarElementLookup__KeywordAssignment_1 ) )
+                    // InternalFormat.g:3479:1: ( rule__GrammarElementLookup__KeywordAssignment_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getGrammarElementLookupAccess().getKeywordAssignment_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3480:1: ( rule__GrammarElementLookup__KeywordAssignment_1 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3480:2: rule__GrammarElementLookup__KeywordAssignment_1
+                    // InternalFormat.g:3480:1: ( rule__GrammarElementLookup__KeywordAssignment_1 )
+                    // InternalFormat.g:3480:2: rule__GrammarElementLookup__KeywordAssignment_1
                     {
-                    pushFollow(FOLLOW_rule__GrammarElementLookup__KeywordAssignment_1_in_rule__GrammarElementLookup__Alternatives7411);
+                    pushFollow(FOLLOW_2);
                     rule__GrammarElementLookup__KeywordAssignment_1();
 
                     state._fsp--;
@@ -10902,13 +10902,13 @@ else if ( (LA11_0==RULE_STRING) ) {
 
 
     // $ANTLR start "rule__GroupBlock__Alternatives_2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3489:1: rule__GroupBlock__Alternatives_2 : ( ( ( rule__GroupBlock__MatcherListAssignment_2_0 ) ) | ( ( rule__GroupBlock__Group_2_1__0 ) ) | ( ( rule__GroupBlock__Group_2_2__0 ) ) );
+    // InternalFormat.g:3489:1: rule__GroupBlock__Alternatives_2 : ( ( ( rule__GroupBlock__MatcherListAssignment_2_0 ) ) | ( ( rule__GroupBlock__Group_2_1__0 ) ) | ( ( rule__GroupBlock__Group_2_2__0 ) ) );
     public final void rule__GroupBlock__Alternatives_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3493:1: ( ( ( rule__GroupBlock__MatcherListAssignment_2_0 ) ) | ( ( rule__GroupBlock__Group_2_1__0 ) ) | ( ( rule__GroupBlock__Group_2_2__0 ) ) )
+            // InternalFormat.g:3493:1: ( ( ( rule__GroupBlock__MatcherListAssignment_2_0 ) ) | ( ( rule__GroupBlock__Group_2_1__0 ) ) | ( ( rule__GroupBlock__Group_2_2__0 ) ) )
             int alt12=3;
             switch ( input.LA(1) ) {
             case 72:
@@ -10936,18 +10936,18 @@ public final void rule__GroupBlock__Alternatives_2() throws RecognitionException
 
             switch (alt12) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3494:1: ( ( rule__GroupBlock__MatcherListAssignment_2_0 ) )
+                    // InternalFormat.g:3494:1: ( ( rule__GroupBlock__MatcherListAssignment_2_0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3494:1: ( ( rule__GroupBlock__MatcherListAssignment_2_0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3495:1: ( rule__GroupBlock__MatcherListAssignment_2_0 )
+                    // InternalFormat.g:3494:1: ( ( rule__GroupBlock__MatcherListAssignment_2_0 ) )
+                    // InternalFormat.g:3495:1: ( rule__GroupBlock__MatcherListAssignment_2_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getGroupBlockAccess().getMatcherListAssignment_2_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3496:1: ( rule__GroupBlock__MatcherListAssignment_2_0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3496:2: rule__GroupBlock__MatcherListAssignment_2_0
+                    // InternalFormat.g:3496:1: ( rule__GroupBlock__MatcherListAssignment_2_0 )
+                    // InternalFormat.g:3496:2: rule__GroupBlock__MatcherListAssignment_2_0
                     {
-                    pushFollow(FOLLOW_rule__GroupBlock__MatcherListAssignment_2_0_in_rule__GroupBlock__Alternatives_27444);
+                    pushFollow(FOLLOW_2);
                     rule__GroupBlock__MatcherListAssignment_2_0();
 
                     state._fsp--;
@@ -10965,18 +10965,18 @@ public final void rule__GroupBlock__Alternatives_2() throws RecognitionException
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3500:6: ( ( rule__GroupBlock__Group_2_1__0 ) )
+                    // InternalFormat.g:3500:6: ( ( rule__GroupBlock__Group_2_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3500:6: ( ( rule__GroupBlock__Group_2_1__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3501:1: ( rule__GroupBlock__Group_2_1__0 )
+                    // InternalFormat.g:3500:6: ( ( rule__GroupBlock__Group_2_1__0 ) )
+                    // InternalFormat.g:3501:1: ( rule__GroupBlock__Group_2_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getGroupBlockAccess().getGroup_2_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3502:1: ( rule__GroupBlock__Group_2_1__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3502:2: rule__GroupBlock__Group_2_1__0
+                    // InternalFormat.g:3502:1: ( rule__GroupBlock__Group_2_1__0 )
+                    // InternalFormat.g:3502:2: rule__GroupBlock__Group_2_1__0
                     {
-                    pushFollow(FOLLOW_rule__GroupBlock__Group_2_1__0_in_rule__GroupBlock__Alternatives_27462);
+                    pushFollow(FOLLOW_2);
                     rule__GroupBlock__Group_2_1__0();
 
                     state._fsp--;
@@ -10994,18 +10994,18 @@ public final void rule__GroupBlock__Alternatives_2() throws RecognitionException
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3506:6: ( ( rule__GroupBlock__Group_2_2__0 ) )
+                    // InternalFormat.g:3506:6: ( ( rule__GroupBlock__Group_2_2__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3506:6: ( ( rule__GroupBlock__Group_2_2__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3507:1: ( rule__GroupBlock__Group_2_2__0 )
+                    // InternalFormat.g:3506:6: ( ( rule__GroupBlock__Group_2_2__0 ) )
+                    // InternalFormat.g:3507:1: ( rule__GroupBlock__Group_2_2__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getGroupBlockAccess().getGroup_2_2()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3508:1: ( rule__GroupBlock__Group_2_2__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3508:2: rule__GroupBlock__Group_2_2__0
+                    // InternalFormat.g:3508:1: ( rule__GroupBlock__Group_2_2__0 )
+                    // InternalFormat.g:3508:2: rule__GroupBlock__Group_2_2__0
                     {
-                    pushFollow(FOLLOW_rule__GroupBlock__Group_2_2__0_in_rule__GroupBlock__Alternatives_27480);
+                    pushFollow(FOLLOW_2);
                     rule__GroupBlock__Group_2_2__0();
 
                     state._fsp--;
@@ -11040,13 +11040,13 @@ public final void rule__GroupBlock__Alternatives_2() throws RecognitionException
 
 
     // $ANTLR start "rule__KeywordPair__Alternatives_5"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3517:1: rule__KeywordPair__Alternatives_5 : ( ( ( rule__KeywordPair__Group_5_0__0 ) ) | ( ( rule__KeywordPair__Group_5_1__0 ) ) );
+    // InternalFormat.g:3517:1: rule__KeywordPair__Alternatives_5 : ( ( ( rule__KeywordPair__Group_5_0__0 ) ) | ( ( rule__KeywordPair__Group_5_1__0 ) ) );
     public final void rule__KeywordPair__Alternatives_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3521:1: ( ( ( rule__KeywordPair__Group_5_0__0 ) ) | ( ( rule__KeywordPair__Group_5_1__0 ) ) )
+            // InternalFormat.g:3521:1: ( ( ( rule__KeywordPair__Group_5_0__0 ) ) | ( ( rule__KeywordPair__Group_5_1__0 ) ) )
             int alt13=2;
             int LA13_0 = input.LA(1);
 
@@ -11065,18 +11065,18 @@ else if ( (LA13_0==77) ) {
             }
             switch (alt13) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3522:1: ( ( rule__KeywordPair__Group_5_0__0 ) )
+                    // InternalFormat.g:3522:1: ( ( rule__KeywordPair__Group_5_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3522:1: ( ( rule__KeywordPair__Group_5_0__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3523:1: ( rule__KeywordPair__Group_5_0__0 )
+                    // InternalFormat.g:3522:1: ( ( rule__KeywordPair__Group_5_0__0 ) )
+                    // InternalFormat.g:3523:1: ( rule__KeywordPair__Group_5_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getKeywordPairAccess().getGroup_5_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3524:1: ( rule__KeywordPair__Group_5_0__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3524:2: rule__KeywordPair__Group_5_0__0
+                    // InternalFormat.g:3524:1: ( rule__KeywordPair__Group_5_0__0 )
+                    // InternalFormat.g:3524:2: rule__KeywordPair__Group_5_0__0
                     {
-                    pushFollow(FOLLOW_rule__KeywordPair__Group_5_0__0_in_rule__KeywordPair__Alternatives_57513);
+                    pushFollow(FOLLOW_2);
                     rule__KeywordPair__Group_5_0__0();
 
                     state._fsp--;
@@ -11094,18 +11094,18 @@ else if ( (LA13_0==77) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3528:6: ( ( rule__KeywordPair__Group_5_1__0 ) )
+                    // InternalFormat.g:3528:6: ( ( rule__KeywordPair__Group_5_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3528:6: ( ( rule__KeywordPair__Group_5_1__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3529:1: ( rule__KeywordPair__Group_5_1__0 )
+                    // InternalFormat.g:3528:6: ( ( rule__KeywordPair__Group_5_1__0 ) )
+                    // InternalFormat.g:3529:1: ( rule__KeywordPair__Group_5_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getKeywordPairAccess().getGroup_5_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3530:1: ( rule__KeywordPair__Group_5_1__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3530:2: rule__KeywordPair__Group_5_1__0
+                    // InternalFormat.g:3530:1: ( rule__KeywordPair__Group_5_1__0 )
+                    // InternalFormat.g:3530:2: rule__KeywordPair__Group_5_1__0
                     {
-                    pushFollow(FOLLOW_rule__KeywordPair__Group_5_1__0_in_rule__KeywordPair__Alternatives_57531);
+                    pushFollow(FOLLOW_2);
                     rule__KeywordPair__Group_5_1__0();
 
                     state._fsp--;
@@ -11140,13 +11140,13 @@ else if ( (LA13_0==77) ) {
 
 
     // $ANTLR start "rule__KeywordPair__Alternatives_6_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3539:1: rule__KeywordPair__Alternatives_6_1 : ( ( ( rule__KeywordPair__Group_6_1_0__0 ) ) | ( ( rule__KeywordPair__Group_6_1_1__0 ) ) );
+    // InternalFormat.g:3539:1: rule__KeywordPair__Alternatives_6_1 : ( ( ( rule__KeywordPair__Group_6_1_0__0 ) ) | ( ( rule__KeywordPair__Group_6_1_1__0 ) ) );
     public final void rule__KeywordPair__Alternatives_6_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3543:1: ( ( ( rule__KeywordPair__Group_6_1_0__0 ) ) | ( ( rule__KeywordPair__Group_6_1_1__0 ) ) )
+            // InternalFormat.g:3543:1: ( ( ( rule__KeywordPair__Group_6_1_0__0 ) ) | ( ( rule__KeywordPair__Group_6_1_1__0 ) ) )
             int alt14=2;
             int LA14_0 = input.LA(1);
 
@@ -11165,18 +11165,18 @@ else if ( (LA14_0==77) ) {
             }
             switch (alt14) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3544:1: ( ( rule__KeywordPair__Group_6_1_0__0 ) )
+                    // InternalFormat.g:3544:1: ( ( rule__KeywordPair__Group_6_1_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3544:1: ( ( rule__KeywordPair__Group_6_1_0__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3545:1: ( rule__KeywordPair__Group_6_1_0__0 )
+                    // InternalFormat.g:3544:1: ( ( rule__KeywordPair__Group_6_1_0__0 ) )
+                    // InternalFormat.g:3545:1: ( rule__KeywordPair__Group_6_1_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getKeywordPairAccess().getGroup_6_1_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3546:1: ( rule__KeywordPair__Group_6_1_0__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3546:2: rule__KeywordPair__Group_6_1_0__0
+                    // InternalFormat.g:3546:1: ( rule__KeywordPair__Group_6_1_0__0 )
+                    // InternalFormat.g:3546:2: rule__KeywordPair__Group_6_1_0__0
                     {
-                    pushFollow(FOLLOW_rule__KeywordPair__Group_6_1_0__0_in_rule__KeywordPair__Alternatives_6_17564);
+                    pushFollow(FOLLOW_2);
                     rule__KeywordPair__Group_6_1_0__0();
 
                     state._fsp--;
@@ -11194,18 +11194,18 @@ else if ( (LA14_0==77) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3550:6: ( ( rule__KeywordPair__Group_6_1_1__0 ) )
+                    // InternalFormat.g:3550:6: ( ( rule__KeywordPair__Group_6_1_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3550:6: ( ( rule__KeywordPair__Group_6_1_1__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3551:1: ( rule__KeywordPair__Group_6_1_1__0 )
+                    // InternalFormat.g:3550:6: ( ( rule__KeywordPair__Group_6_1_1__0 ) )
+                    // InternalFormat.g:3551:1: ( rule__KeywordPair__Group_6_1_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getKeywordPairAccess().getGroup_6_1_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3552:1: ( rule__KeywordPair__Group_6_1_1__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3552:2: rule__KeywordPair__Group_6_1_1__0
+                    // InternalFormat.g:3552:1: ( rule__KeywordPair__Group_6_1_1__0 )
+                    // InternalFormat.g:3552:2: rule__KeywordPair__Group_6_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__KeywordPair__Group_6_1_1__0_in_rule__KeywordPair__Alternatives_6_17582);
+                    pushFollow(FOLLOW_2);
                     rule__KeywordPair__Group_6_1_1__0();
 
                     state._fsp--;
@@ -11240,13 +11240,13 @@ else if ( (LA14_0==77) ) {
 
 
     // $ANTLR start "rule__Locator__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3561:1: rule__Locator__Alternatives : ( ( ruleSpaceLocator ) | ( ruleRightPaddingLocator ) | ( ruleLinewrapLocator ) | ( ruleColumnLocator ) | ( ruleOffsetLocator ) | ( ruleIndentLocator ) | ( ruleNoFormatLocator ) );
+    // InternalFormat.g:3561:1: rule__Locator__Alternatives : ( ( ruleSpaceLocator ) | ( ruleRightPaddingLocator ) | ( ruleLinewrapLocator ) | ( ruleColumnLocator ) | ( ruleOffsetLocator ) | ( ruleIndentLocator ) | ( ruleNoFormatLocator ) );
     public final void rule__Locator__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3565:1: ( ( ruleSpaceLocator ) | ( ruleRightPaddingLocator ) | ( ruleLinewrapLocator ) | ( ruleColumnLocator ) | ( ruleOffsetLocator ) | ( ruleIndentLocator ) | ( ruleNoFormatLocator ) )
+            // InternalFormat.g:3565:1: ( ( ruleSpaceLocator ) | ( ruleRightPaddingLocator ) | ( ruleLinewrapLocator ) | ( ruleColumnLocator ) | ( ruleOffsetLocator ) | ( ruleIndentLocator ) | ( ruleNoFormatLocator ) )
             int alt15=7;
             switch ( input.LA(1) ) {
             case 79:
@@ -11297,15 +11297,15 @@ public final void rule__Locator__Alternatives() throws RecognitionException {
 
             switch (alt15) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3566:1: ( ruleSpaceLocator )
+                    // InternalFormat.g:3566:1: ( ruleSpaceLocator )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3566:1: ( ruleSpaceLocator )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3567:1: ruleSpaceLocator
+                    // InternalFormat.g:3566:1: ( ruleSpaceLocator )
+                    // InternalFormat.g:3567:1: ruleSpaceLocator
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getLocatorAccess().getSpaceLocatorParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleSpaceLocator_in_rule__Locator__Alternatives7615);
+                    pushFollow(FOLLOW_2);
                     ruleSpaceLocator();
 
                     state._fsp--;
@@ -11320,15 +11320,15 @@ public final void rule__Locator__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3572:6: ( ruleRightPaddingLocator )
+                    // InternalFormat.g:3572:6: ( ruleRightPaddingLocator )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3572:6: ( ruleRightPaddingLocator )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3573:1: ruleRightPaddingLocator
+                    // InternalFormat.g:3572:6: ( ruleRightPaddingLocator )
+                    // InternalFormat.g:3573:1: ruleRightPaddingLocator
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getLocatorAccess().getRightPaddingLocatorParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleRightPaddingLocator_in_rule__Locator__Alternatives7632);
+                    pushFollow(FOLLOW_2);
                     ruleRightPaddingLocator();
 
                     state._fsp--;
@@ -11343,15 +11343,15 @@ public final void rule__Locator__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3578:6: ( ruleLinewrapLocator )
+                    // InternalFormat.g:3578:6: ( ruleLinewrapLocator )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3578:6: ( ruleLinewrapLocator )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3579:1: ruleLinewrapLocator
+                    // InternalFormat.g:3578:6: ( ruleLinewrapLocator )
+                    // InternalFormat.g:3579:1: ruleLinewrapLocator
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getLocatorAccess().getLinewrapLocatorParserRuleCall_2()); 
                     }
-                    pushFollow(FOLLOW_ruleLinewrapLocator_in_rule__Locator__Alternatives7649);
+                    pushFollow(FOLLOW_2);
                     ruleLinewrapLocator();
 
                     state._fsp--;
@@ -11366,15 +11366,15 @@ public final void rule__Locator__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3584:6: ( ruleColumnLocator )
+                    // InternalFormat.g:3584:6: ( ruleColumnLocator )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3584:6: ( ruleColumnLocator )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3585:1: ruleColumnLocator
+                    // InternalFormat.g:3584:6: ( ruleColumnLocator )
+                    // InternalFormat.g:3585:1: ruleColumnLocator
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getLocatorAccess().getColumnLocatorParserRuleCall_3()); 
                     }
-                    pushFollow(FOLLOW_ruleColumnLocator_in_rule__Locator__Alternatives7666);
+                    pushFollow(FOLLOW_2);
                     ruleColumnLocator();
 
                     state._fsp--;
@@ -11389,15 +11389,15 @@ public final void rule__Locator__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3590:6: ( ruleOffsetLocator )
+                    // InternalFormat.g:3590:6: ( ruleOffsetLocator )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3590:6: ( ruleOffsetLocator )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3591:1: ruleOffsetLocator
+                    // InternalFormat.g:3590:6: ( ruleOffsetLocator )
+                    // InternalFormat.g:3591:1: ruleOffsetLocator
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getLocatorAccess().getOffsetLocatorParserRuleCall_4()); 
                     }
-                    pushFollow(FOLLOW_ruleOffsetLocator_in_rule__Locator__Alternatives7683);
+                    pushFollow(FOLLOW_2);
                     ruleOffsetLocator();
 
                     state._fsp--;
@@ -11412,15 +11412,15 @@ public final void rule__Locator__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3596:6: ( ruleIndentLocator )
+                    // InternalFormat.g:3596:6: ( ruleIndentLocator )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3596:6: ( ruleIndentLocator )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3597:1: ruleIndentLocator
+                    // InternalFormat.g:3596:6: ( ruleIndentLocator )
+                    // InternalFormat.g:3597:1: ruleIndentLocator
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getLocatorAccess().getIndentLocatorParserRuleCall_5()); 
                     }
-                    pushFollow(FOLLOW_ruleIndentLocator_in_rule__Locator__Alternatives7700);
+                    pushFollow(FOLLOW_2);
                     ruleIndentLocator();
 
                     state._fsp--;
@@ -11435,15 +11435,15 @@ public final void rule__Locator__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3602:6: ( ruleNoFormatLocator )
+                    // InternalFormat.g:3602:6: ( ruleNoFormatLocator )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3602:6: ( ruleNoFormatLocator )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3603:1: ruleNoFormatLocator
+                    // InternalFormat.g:3602:6: ( ruleNoFormatLocator )
+                    // InternalFormat.g:3603:1: ruleNoFormatLocator
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getLocatorAccess().getNoFormatLocatorParserRuleCall_6()); 
                     }
-                    pushFollow(FOLLOW_ruleNoFormatLocator_in_rule__Locator__Alternatives7717);
+                    pushFollow(FOLLOW_2);
                     ruleNoFormatLocator();
 
                     state._fsp--;
@@ -11475,13 +11475,13 @@ public final void rule__Locator__Alternatives() throws RecognitionException {
 
 
     // $ANTLR start "rule__SpaceLocator__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3613:1: rule__SpaceLocator__Alternatives : ( ( ( rule__SpaceLocator__Group_0__0 ) ) | ( ( rule__SpaceLocator__NoSpaceAssignment_1 ) ) );
+    // InternalFormat.g:3613:1: rule__SpaceLocator__Alternatives : ( ( ( rule__SpaceLocator__Group_0__0 ) ) | ( ( rule__SpaceLocator__NoSpaceAssignment_1 ) ) );
     public final void rule__SpaceLocator__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3617:1: ( ( ( rule__SpaceLocator__Group_0__0 ) ) | ( ( rule__SpaceLocator__NoSpaceAssignment_1 ) ) )
+            // InternalFormat.g:3617:1: ( ( ( rule__SpaceLocator__Group_0__0 ) ) | ( ( rule__SpaceLocator__NoSpaceAssignment_1 ) ) )
             int alt16=2;
             int LA16_0 = input.LA(1);
 
@@ -11500,18 +11500,18 @@ else if ( (LA16_0==107) ) {
             }
             switch (alt16) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3618:1: ( ( rule__SpaceLocator__Group_0__0 ) )
+                    // InternalFormat.g:3618:1: ( ( rule__SpaceLocator__Group_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3618:1: ( ( rule__SpaceLocator__Group_0__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3619:1: ( rule__SpaceLocator__Group_0__0 )
+                    // InternalFormat.g:3618:1: ( ( rule__SpaceLocator__Group_0__0 ) )
+                    // InternalFormat.g:3619:1: ( rule__SpaceLocator__Group_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getSpaceLocatorAccess().getGroup_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3620:1: ( rule__SpaceLocator__Group_0__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3620:2: rule__SpaceLocator__Group_0__0
+                    // InternalFormat.g:3620:1: ( rule__SpaceLocator__Group_0__0 )
+                    // InternalFormat.g:3620:2: rule__SpaceLocator__Group_0__0
                     {
-                    pushFollow(FOLLOW_rule__SpaceLocator__Group_0__0_in_rule__SpaceLocator__Alternatives7749);
+                    pushFollow(FOLLOW_2);
                     rule__SpaceLocator__Group_0__0();
 
                     state._fsp--;
@@ -11529,18 +11529,18 @@ else if ( (LA16_0==107) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3624:6: ( ( rule__SpaceLocator__NoSpaceAssignment_1 ) )
+                    // InternalFormat.g:3624:6: ( ( rule__SpaceLocator__NoSpaceAssignment_1 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3624:6: ( ( rule__SpaceLocator__NoSpaceAssignment_1 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3625:1: ( rule__SpaceLocator__NoSpaceAssignment_1 )
+                    // InternalFormat.g:3624:6: ( ( rule__SpaceLocator__NoSpaceAssignment_1 ) )
+                    // InternalFormat.g:3625:1: ( rule__SpaceLocator__NoSpaceAssignment_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getSpaceLocatorAccess().getNoSpaceAssignment_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3626:1: ( rule__SpaceLocator__NoSpaceAssignment_1 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3626:2: rule__SpaceLocator__NoSpaceAssignment_1
+                    // InternalFormat.g:3626:1: ( rule__SpaceLocator__NoSpaceAssignment_1 )
+                    // InternalFormat.g:3626:2: rule__SpaceLocator__NoSpaceAssignment_1
                     {
-                    pushFollow(FOLLOW_rule__SpaceLocator__NoSpaceAssignment_1_in_rule__SpaceLocator__Alternatives7767);
+                    pushFollow(FOLLOW_2);
                     rule__SpaceLocator__NoSpaceAssignment_1();
 
                     state._fsp--;
@@ -11575,13 +11575,13 @@ else if ( (LA16_0==107) ) {
 
 
     // $ANTLR start "rule__LinewrapLocator__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3635:1: rule__LinewrapLocator__Alternatives : ( ( ( rule__LinewrapLocator__Group_0__0 ) ) | ( ( rule__LinewrapLocator__NoLinewrapAssignment_1 ) ) );
+    // InternalFormat.g:3635:1: rule__LinewrapLocator__Alternatives : ( ( ( rule__LinewrapLocator__Group_0__0 ) ) | ( ( rule__LinewrapLocator__NoLinewrapAssignment_1 ) ) );
     public final void rule__LinewrapLocator__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3639:1: ( ( ( rule__LinewrapLocator__Group_0__0 ) ) | ( ( rule__LinewrapLocator__NoLinewrapAssignment_1 ) ) )
+            // InternalFormat.g:3639:1: ( ( ( rule__LinewrapLocator__Group_0__0 ) ) | ( ( rule__LinewrapLocator__NoLinewrapAssignment_1 ) ) )
             int alt17=2;
             int LA17_0 = input.LA(1);
 
@@ -11600,18 +11600,18 @@ else if ( (LA17_0==108) ) {
             }
             switch (alt17) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3640:1: ( ( rule__LinewrapLocator__Group_0__0 ) )
+                    // InternalFormat.g:3640:1: ( ( rule__LinewrapLocator__Group_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3640:1: ( ( rule__LinewrapLocator__Group_0__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3641:1: ( rule__LinewrapLocator__Group_0__0 )
+                    // InternalFormat.g:3640:1: ( ( rule__LinewrapLocator__Group_0__0 ) )
+                    // InternalFormat.g:3641:1: ( rule__LinewrapLocator__Group_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getLinewrapLocatorAccess().getGroup_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3642:1: ( rule__LinewrapLocator__Group_0__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3642:2: rule__LinewrapLocator__Group_0__0
+                    // InternalFormat.g:3642:1: ( rule__LinewrapLocator__Group_0__0 )
+                    // InternalFormat.g:3642:2: rule__LinewrapLocator__Group_0__0
                     {
-                    pushFollow(FOLLOW_rule__LinewrapLocator__Group_0__0_in_rule__LinewrapLocator__Alternatives7800);
+                    pushFollow(FOLLOW_2);
                     rule__LinewrapLocator__Group_0__0();
 
                     state._fsp--;
@@ -11629,18 +11629,18 @@ else if ( (LA17_0==108) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3646:6: ( ( rule__LinewrapLocator__NoLinewrapAssignment_1 ) )
+                    // InternalFormat.g:3646:6: ( ( rule__LinewrapLocator__NoLinewrapAssignment_1 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3646:6: ( ( rule__LinewrapLocator__NoLinewrapAssignment_1 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3647:1: ( rule__LinewrapLocator__NoLinewrapAssignment_1 )
+                    // InternalFormat.g:3646:6: ( ( rule__LinewrapLocator__NoLinewrapAssignment_1 ) )
+                    // InternalFormat.g:3647:1: ( rule__LinewrapLocator__NoLinewrapAssignment_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getLinewrapLocatorAccess().getNoLinewrapAssignment_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3648:1: ( rule__LinewrapLocator__NoLinewrapAssignment_1 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3648:2: rule__LinewrapLocator__NoLinewrapAssignment_1
+                    // InternalFormat.g:3648:1: ( rule__LinewrapLocator__NoLinewrapAssignment_1 )
+                    // InternalFormat.g:3648:2: rule__LinewrapLocator__NoLinewrapAssignment_1
                     {
-                    pushFollow(FOLLOW_rule__LinewrapLocator__NoLinewrapAssignment_1_in_rule__LinewrapLocator__Alternatives7818);
+                    pushFollow(FOLLOW_2);
                     rule__LinewrapLocator__NoLinewrapAssignment_1();
 
                     state._fsp--;
@@ -11675,29 +11675,29 @@ else if ( (LA17_0==108) ) {
 
 
     // $ANTLR start "rule__LinewrapLocator__Alternatives_0_1_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3657:1: rule__LinewrapLocator__Alternatives_0_1_1 : ( ( ( rule__LinewrapLocator__ValueAssignment_0_1_1_0 ) ) | ( ( rule__LinewrapLocator__Group_0_1_1_1__0 ) ) );
+    // InternalFormat.g:3657:1: rule__LinewrapLocator__Alternatives_0_1_1 : ( ( ( rule__LinewrapLocator__ValueAssignment_0_1_1_0 ) ) | ( ( rule__LinewrapLocator__Group_0_1_1_1__0 ) ) );
     public final void rule__LinewrapLocator__Alternatives_0_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3661:1: ( ( ( rule__LinewrapLocator__ValueAssignment_0_1_1_0 ) ) | ( ( rule__LinewrapLocator__Group_0_1_1_1__0 ) ) )
+            // InternalFormat.g:3661:1: ( ( ( rule__LinewrapLocator__ValueAssignment_0_1_1_0 ) ) | ( ( rule__LinewrapLocator__Group_0_1_1_1__0 ) ) )
             int alt18=2;
             alt18 = dfa18.predict(input);
             switch (alt18) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3662:1: ( ( rule__LinewrapLocator__ValueAssignment_0_1_1_0 ) )
+                    // InternalFormat.g:3662:1: ( ( rule__LinewrapLocator__ValueAssignment_0_1_1_0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3662:1: ( ( rule__LinewrapLocator__ValueAssignment_0_1_1_0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3663:1: ( rule__LinewrapLocator__ValueAssignment_0_1_1_0 )
+                    // InternalFormat.g:3662:1: ( ( rule__LinewrapLocator__ValueAssignment_0_1_1_0 ) )
+                    // InternalFormat.g:3663:1: ( rule__LinewrapLocator__ValueAssignment_0_1_1_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getLinewrapLocatorAccess().getValueAssignment_0_1_1_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3664:1: ( rule__LinewrapLocator__ValueAssignment_0_1_1_0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3664:2: rule__LinewrapLocator__ValueAssignment_0_1_1_0
+                    // InternalFormat.g:3664:1: ( rule__LinewrapLocator__ValueAssignment_0_1_1_0 )
+                    // InternalFormat.g:3664:2: rule__LinewrapLocator__ValueAssignment_0_1_1_0
                     {
-                    pushFollow(FOLLOW_rule__LinewrapLocator__ValueAssignment_0_1_1_0_in_rule__LinewrapLocator__Alternatives_0_1_17851);
+                    pushFollow(FOLLOW_2);
                     rule__LinewrapLocator__ValueAssignment_0_1_1_0();
 
                     state._fsp--;
@@ -11715,18 +11715,18 @@ public final void rule__LinewrapLocator__Alternatives_0_1_1() throws Recognition
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3668:6: ( ( rule__LinewrapLocator__Group_0_1_1_1__0 ) )
+                    // InternalFormat.g:3668:6: ( ( rule__LinewrapLocator__Group_0_1_1_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3668:6: ( ( rule__LinewrapLocator__Group_0_1_1_1__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3669:1: ( rule__LinewrapLocator__Group_0_1_1_1__0 )
+                    // InternalFormat.g:3668:6: ( ( rule__LinewrapLocator__Group_0_1_1_1__0 ) )
+                    // InternalFormat.g:3669:1: ( rule__LinewrapLocator__Group_0_1_1_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getLinewrapLocatorAccess().getGroup_0_1_1_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3670:1: ( rule__LinewrapLocator__Group_0_1_1_1__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3670:2: rule__LinewrapLocator__Group_0_1_1_1__0
+                    // InternalFormat.g:3670:1: ( rule__LinewrapLocator__Group_0_1_1_1__0 )
+                    // InternalFormat.g:3670:2: rule__LinewrapLocator__Group_0_1_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__LinewrapLocator__Group_0_1_1_1__0_in_rule__LinewrapLocator__Alternatives_0_1_17869);
+                    pushFollow(FOLLOW_2);
                     rule__LinewrapLocator__Group_0_1_1_1__0();
 
                     state._fsp--;
@@ -11761,13 +11761,13 @@ public final void rule__LinewrapLocator__Alternatives_0_1_1() throws Recognition
 
 
     // $ANTLR start "rule__ColumnLocator__Alternatives_2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3679:1: rule__ColumnLocator__Alternatives_2 : ( ( ( rule__ColumnLocator__ValueAssignment_2_0 ) ) | ( ( rule__ColumnLocator__ParameterAssignment_2_1 ) ) );
+    // InternalFormat.g:3679:1: rule__ColumnLocator__Alternatives_2 : ( ( ( rule__ColumnLocator__ValueAssignment_2_0 ) ) | ( ( rule__ColumnLocator__ParameterAssignment_2_1 ) ) );
     public final void rule__ColumnLocator__Alternatives_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3683:1: ( ( ( rule__ColumnLocator__ValueAssignment_2_0 ) ) | ( ( rule__ColumnLocator__ParameterAssignment_2_1 ) ) )
+            // InternalFormat.g:3683:1: ( ( ( rule__ColumnLocator__ValueAssignment_2_0 ) ) | ( ( rule__ColumnLocator__ParameterAssignment_2_1 ) ) )
             int alt19=2;
             int LA19_0 = input.LA(1);
 
@@ -11786,18 +11786,18 @@ else if ( (LA19_0==66) ) {
             }
             switch (alt19) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3684:1: ( ( rule__ColumnLocator__ValueAssignment_2_0 ) )
+                    // InternalFormat.g:3684:1: ( ( rule__ColumnLocator__ValueAssignment_2_0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3684:1: ( ( rule__ColumnLocator__ValueAssignment_2_0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3685:1: ( rule__ColumnLocator__ValueAssignment_2_0 )
+                    // InternalFormat.g:3684:1: ( ( rule__ColumnLocator__ValueAssignment_2_0 ) )
+                    // InternalFormat.g:3685:1: ( rule__ColumnLocator__ValueAssignment_2_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getColumnLocatorAccess().getValueAssignment_2_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3686:1: ( rule__ColumnLocator__ValueAssignment_2_0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3686:2: rule__ColumnLocator__ValueAssignment_2_0
+                    // InternalFormat.g:3686:1: ( rule__ColumnLocator__ValueAssignment_2_0 )
+                    // InternalFormat.g:3686:2: rule__ColumnLocator__ValueAssignment_2_0
                     {
-                    pushFollow(FOLLOW_rule__ColumnLocator__ValueAssignment_2_0_in_rule__ColumnLocator__Alternatives_27902);
+                    pushFollow(FOLLOW_2);
                     rule__ColumnLocator__ValueAssignment_2_0();
 
                     state._fsp--;
@@ -11815,18 +11815,18 @@ else if ( (LA19_0==66) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3690:6: ( ( rule__ColumnLocator__ParameterAssignment_2_1 ) )
+                    // InternalFormat.g:3690:6: ( ( rule__ColumnLocator__ParameterAssignment_2_1 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3690:6: ( ( rule__ColumnLocator__ParameterAssignment_2_1 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3691:1: ( rule__ColumnLocator__ParameterAssignment_2_1 )
+                    // InternalFormat.g:3690:6: ( ( rule__ColumnLocator__ParameterAssignment_2_1 ) )
+                    // InternalFormat.g:3691:1: ( rule__ColumnLocator__ParameterAssignment_2_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getColumnLocatorAccess().getParameterAssignment_2_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3692:1: ( rule__ColumnLocator__ParameterAssignment_2_1 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3692:2: rule__ColumnLocator__ParameterAssignment_2_1
+                    // InternalFormat.g:3692:1: ( rule__ColumnLocator__ParameterAssignment_2_1 )
+                    // InternalFormat.g:3692:2: rule__ColumnLocator__ParameterAssignment_2_1
                     {
-                    pushFollow(FOLLOW_rule__ColumnLocator__ParameterAssignment_2_1_in_rule__ColumnLocator__Alternatives_27920);
+                    pushFollow(FOLLOW_2);
                     rule__ColumnLocator__ParameterAssignment_2_1();
 
                     state._fsp--;
@@ -11861,13 +11861,13 @@ else if ( (LA19_0==66) ) {
 
 
     // $ANTLR start "rule__IndentLocator__Alternatives_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3701:1: rule__IndentLocator__Alternatives_1 : ( ( ( rule__IndentLocator__IncrementAssignment_1_0 ) ) | ( 'decrement' ) );
+    // InternalFormat.g:3701:1: rule__IndentLocator__Alternatives_1 : ( ( ( rule__IndentLocator__IncrementAssignment_1_0 ) ) | ( 'decrement' ) );
     public final void rule__IndentLocator__Alternatives_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3705:1: ( ( ( rule__IndentLocator__IncrementAssignment_1_0 ) ) | ( 'decrement' ) )
+            // InternalFormat.g:3705:1: ( ( ( rule__IndentLocator__IncrementAssignment_1_0 ) ) | ( 'decrement' ) )
             int alt20=2;
             int LA20_0 = input.LA(1);
 
@@ -11886,18 +11886,18 @@ else if ( (LA20_0==17) ) {
             }
             switch (alt20) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3706:1: ( ( rule__IndentLocator__IncrementAssignment_1_0 ) )
+                    // InternalFormat.g:3706:1: ( ( rule__IndentLocator__IncrementAssignment_1_0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3706:1: ( ( rule__IndentLocator__IncrementAssignment_1_0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3707:1: ( rule__IndentLocator__IncrementAssignment_1_0 )
+                    // InternalFormat.g:3706:1: ( ( rule__IndentLocator__IncrementAssignment_1_0 ) )
+                    // InternalFormat.g:3707:1: ( rule__IndentLocator__IncrementAssignment_1_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getIndentLocatorAccess().getIncrementAssignment_1_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3708:1: ( rule__IndentLocator__IncrementAssignment_1_0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3708:2: rule__IndentLocator__IncrementAssignment_1_0
+                    // InternalFormat.g:3708:1: ( rule__IndentLocator__IncrementAssignment_1_0 )
+                    // InternalFormat.g:3708:2: rule__IndentLocator__IncrementAssignment_1_0
                     {
-                    pushFollow(FOLLOW_rule__IndentLocator__IncrementAssignment_1_0_in_rule__IndentLocator__Alternatives_17953);
+                    pushFollow(FOLLOW_2);
                     rule__IndentLocator__IncrementAssignment_1_0();
 
                     state._fsp--;
@@ -11915,15 +11915,15 @@ else if ( (LA20_0==17) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3712:6: ( 'decrement' )
+                    // InternalFormat.g:3712:6: ( 'decrement' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3712:6: ( 'decrement' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3713:1: 'decrement'
+                    // InternalFormat.g:3712:6: ( 'decrement' )
+                    // InternalFormat.g:3713:1: 'decrement'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getIndentLocatorAccess().getDecrementKeyword_1_1()); 
                     }
-                    match(input,17,FOLLOW_17_in_rule__IndentLocator__Alternatives_17972); if (state.failed) return ;
+                    match(input,17,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getIndentLocatorAccess().getDecrementKeyword_1_1()); 
                     }
@@ -11951,13 +11951,13 @@ else if ( (LA20_0==17) ) {
 
 
     // $ANTLR start "rule__IndentLocator__Alternatives_2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3725:1: rule__IndentLocator__Alternatives_2 : ( ( ( rule__IndentLocator__ValueAssignment_2_0 ) ) | ( ( rule__IndentLocator__ParameterAssignment_2_1 ) ) );
+    // InternalFormat.g:3725:1: rule__IndentLocator__Alternatives_2 : ( ( ( rule__IndentLocator__ValueAssignment_2_0 ) ) | ( ( rule__IndentLocator__ParameterAssignment_2_1 ) ) );
     public final void rule__IndentLocator__Alternatives_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3729:1: ( ( ( rule__IndentLocator__ValueAssignment_2_0 ) ) | ( ( rule__IndentLocator__ParameterAssignment_2_1 ) ) )
+            // InternalFormat.g:3729:1: ( ( ( rule__IndentLocator__ValueAssignment_2_0 ) ) | ( ( rule__IndentLocator__ParameterAssignment_2_1 ) ) )
             int alt21=2;
             int LA21_0 = input.LA(1);
 
@@ -11976,18 +11976,18 @@ else if ( (LA21_0==66) ) {
             }
             switch (alt21) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3730:1: ( ( rule__IndentLocator__ValueAssignment_2_0 ) )
+                    // InternalFormat.g:3730:1: ( ( rule__IndentLocator__ValueAssignment_2_0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3730:1: ( ( rule__IndentLocator__ValueAssignment_2_0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3731:1: ( rule__IndentLocator__ValueAssignment_2_0 )
+                    // InternalFormat.g:3730:1: ( ( rule__IndentLocator__ValueAssignment_2_0 ) )
+                    // InternalFormat.g:3731:1: ( rule__IndentLocator__ValueAssignment_2_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getIndentLocatorAccess().getValueAssignment_2_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3732:1: ( rule__IndentLocator__ValueAssignment_2_0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3732:2: rule__IndentLocator__ValueAssignment_2_0
+                    // InternalFormat.g:3732:1: ( rule__IndentLocator__ValueAssignment_2_0 )
+                    // InternalFormat.g:3732:2: rule__IndentLocator__ValueAssignment_2_0
                     {
-                    pushFollow(FOLLOW_rule__IndentLocator__ValueAssignment_2_0_in_rule__IndentLocator__Alternatives_28006);
+                    pushFollow(FOLLOW_2);
                     rule__IndentLocator__ValueAssignment_2_0();
 
                     state._fsp--;
@@ -12005,18 +12005,18 @@ else if ( (LA21_0==66) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3736:6: ( ( rule__IndentLocator__ParameterAssignment_2_1 ) )
+                    // InternalFormat.g:3736:6: ( ( rule__IndentLocator__ParameterAssignment_2_1 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3736:6: ( ( rule__IndentLocator__ParameterAssignment_2_1 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3737:1: ( rule__IndentLocator__ParameterAssignment_2_1 )
+                    // InternalFormat.g:3736:6: ( ( rule__IndentLocator__ParameterAssignment_2_1 ) )
+                    // InternalFormat.g:3737:1: ( rule__IndentLocator__ParameterAssignment_2_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getIndentLocatorAccess().getParameterAssignment_2_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3738:1: ( rule__IndentLocator__ParameterAssignment_2_1 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3738:2: rule__IndentLocator__ParameterAssignment_2_1
+                    // InternalFormat.g:3738:1: ( rule__IndentLocator__ParameterAssignment_2_1 )
+                    // InternalFormat.g:3738:2: rule__IndentLocator__ParameterAssignment_2_1
                     {
-                    pushFollow(FOLLOW_rule__IndentLocator__ParameterAssignment_2_1_in_rule__IndentLocator__Alternatives_28024);
+                    pushFollow(FOLLOW_2);
                     rule__IndentLocator__ParameterAssignment_2_1();
 
                     state._fsp--;
@@ -12051,13 +12051,13 @@ else if ( (LA21_0==66) ) {
 
 
     // $ANTLR start "rule__Identifier__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3747:1: rule__Identifier__Alternatives : ( ( RULE_ID ) | ( 'default' ) | ( 'val' ) );
+    // InternalFormat.g:3747:1: rule__Identifier__Alternatives : ( ( RULE_ID ) | ( 'default' ) | ( 'val' ) );
     public final void rule__Identifier__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3751:1: ( ( RULE_ID ) | ( 'default' ) | ( 'val' ) )
+            // InternalFormat.g:3751:1: ( ( RULE_ID ) | ( 'default' ) | ( 'val' ) )
             int alt22=3;
             switch ( input.LA(1) ) {
             case RULE_ID:
@@ -12085,15 +12085,15 @@ public final void rule__Identifier__Alternatives() throws RecognitionException {
 
             switch (alt22) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3752:1: ( RULE_ID )
+                    // InternalFormat.g:3752:1: ( RULE_ID )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3752:1: ( RULE_ID )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3753:1: RULE_ID
+                    // InternalFormat.g:3752:1: ( RULE_ID )
+                    // InternalFormat.g:3753:1: RULE_ID
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getIdentifierAccess().getIDTerminalRuleCall_0()); 
                     }
-                    match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__Identifier__Alternatives8057); if (state.failed) return ;
+                    match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getIdentifierAccess().getIDTerminalRuleCall_0()); 
                     }
@@ -12104,15 +12104,15 @@ public final void rule__Identifier__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3758:6: ( 'default' )
+                    // InternalFormat.g:3758:6: ( 'default' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3758:6: ( 'default' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3759:1: 'default'
+                    // InternalFormat.g:3758:6: ( 'default' )
+                    // InternalFormat.g:3759:1: 'default'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getIdentifierAccess().getDefaultKeyword_1()); 
                     }
-                    match(input,18,FOLLOW_18_in_rule__Identifier__Alternatives8075); if (state.failed) return ;
+                    match(input,18,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getIdentifierAccess().getDefaultKeyword_1()); 
                     }
@@ -12123,15 +12123,15 @@ public final void rule__Identifier__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3766:6: ( 'val' )
+                    // InternalFormat.g:3766:6: ( 'val' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3766:6: ( 'val' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3767:1: 'val'
+                    // InternalFormat.g:3766:6: ( 'val' )
+                    // InternalFormat.g:3767:1: 'val'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getIdentifierAccess().getValKeyword_2()); 
                     }
-                    match(input,19,FOLLOW_19_in_rule__Identifier__Alternatives8095); if (state.failed) return ;
+                    match(input,19,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getIdentifierAccess().getValKeyword_2()); 
                     }
@@ -12159,13 +12159,13 @@ public final void rule__Identifier__Alternatives() throws RecognitionException {
 
 
     // $ANTLR start "rule__ValidID__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3779:1: rule__ValidID__Alternatives : ( ( 'context' ) | ( 'currentColumn' ) | ( RULE_ID ) );
+    // InternalFormat.g:3779:1: rule__ValidID__Alternatives : ( ( 'context' ) | ( 'currentColumn' ) | ( RULE_ID ) );
     public final void rule__ValidID__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3783:1: ( ( 'context' ) | ( 'currentColumn' ) | ( RULE_ID ) )
+            // InternalFormat.g:3783:1: ( ( 'context' ) | ( 'currentColumn' ) | ( RULE_ID ) )
             int alt23=3;
             switch ( input.LA(1) ) {
             case 20:
@@ -12193,15 +12193,15 @@ public final void rule__ValidID__Alternatives() throws RecognitionException {
 
             switch (alt23) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3784:1: ( 'context' )
+                    // InternalFormat.g:3784:1: ( 'context' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3784:1: ( 'context' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3785:1: 'context'
+                    // InternalFormat.g:3784:1: ( 'context' )
+                    // InternalFormat.g:3785:1: 'context'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getValidIDAccess().getContextKeyword_0()); 
                     }
-                    match(input,20,FOLLOW_20_in_rule__ValidID__Alternatives8130); if (state.failed) return ;
+                    match(input,20,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getValidIDAccess().getContextKeyword_0()); 
                     }
@@ -12212,15 +12212,15 @@ public final void rule__ValidID__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3792:6: ( 'currentColumn' )
+                    // InternalFormat.g:3792:6: ( 'currentColumn' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3792:6: ( 'currentColumn' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3793:1: 'currentColumn'
+                    // InternalFormat.g:3792:6: ( 'currentColumn' )
+                    // InternalFormat.g:3793:1: 'currentColumn'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getValidIDAccess().getCurrentColumnKeyword_1()); 
                     }
-                    match(input,21,FOLLOW_21_in_rule__ValidID__Alternatives8150); if (state.failed) return ;
+                    match(input,21,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getValidIDAccess().getCurrentColumnKeyword_1()); 
                     }
@@ -12231,15 +12231,15 @@ public final void rule__ValidID__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3800:6: ( RULE_ID )
+                    // InternalFormat.g:3800:6: ( RULE_ID )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3800:6: ( RULE_ID )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3801:1: RULE_ID
+                    // InternalFormat.g:3800:6: ( RULE_ID )
+                    // InternalFormat.g:3801:1: RULE_ID
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getValidIDAccess().getIDTerminalRuleCall_2()); 
                     }
-                    match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__ValidID__Alternatives8169); if (state.failed) return ;
+                    match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getValidIDAccess().getIDTerminalRuleCall_2()); 
                     }
@@ -12267,29 +12267,29 @@ public final void rule__ValidID__Alternatives() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAnnotation__Alternatives_3_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3811:1: rule__XAnnotation__Alternatives_3_1 : ( ( ( rule__XAnnotation__Group_3_1_0__0 ) ) | ( ( rule__XAnnotation__ValueAssignment_3_1_1 ) ) );
+    // InternalFormat.g:3811:1: rule__XAnnotation__Alternatives_3_1 : ( ( ( rule__XAnnotation__Group_3_1_0__0 ) ) | ( ( rule__XAnnotation__ValueAssignment_3_1_1 ) ) );
     public final void rule__XAnnotation__Alternatives_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3815:1: ( ( ( rule__XAnnotation__Group_3_1_0__0 ) ) | ( ( rule__XAnnotation__ValueAssignment_3_1_1 ) ) )
+            // InternalFormat.g:3815:1: ( ( ( rule__XAnnotation__Group_3_1_0__0 ) ) | ( ( rule__XAnnotation__ValueAssignment_3_1_1 ) ) )
             int alt24=2;
             alt24 = dfa24.predict(input);
             switch (alt24) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3816:1: ( ( rule__XAnnotation__Group_3_1_0__0 ) )
+                    // InternalFormat.g:3816:1: ( ( rule__XAnnotation__Group_3_1_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3816:1: ( ( rule__XAnnotation__Group_3_1_0__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3817:1: ( rule__XAnnotation__Group_3_1_0__0 )
+                    // InternalFormat.g:3816:1: ( ( rule__XAnnotation__Group_3_1_0__0 ) )
+                    // InternalFormat.g:3817:1: ( rule__XAnnotation__Group_3_1_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXAnnotationAccess().getGroup_3_1_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3818:1: ( rule__XAnnotation__Group_3_1_0__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3818:2: rule__XAnnotation__Group_3_1_0__0
+                    // InternalFormat.g:3818:1: ( rule__XAnnotation__Group_3_1_0__0 )
+                    // InternalFormat.g:3818:2: rule__XAnnotation__Group_3_1_0__0
                     {
-                    pushFollow(FOLLOW_rule__XAnnotation__Group_3_1_0__0_in_rule__XAnnotation__Alternatives_3_18201);
+                    pushFollow(FOLLOW_2);
                     rule__XAnnotation__Group_3_1_0__0();
 
                     state._fsp--;
@@ -12307,18 +12307,18 @@ public final void rule__XAnnotation__Alternatives_3_1() throws RecognitionExcept
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3822:6: ( ( rule__XAnnotation__ValueAssignment_3_1_1 ) )
+                    // InternalFormat.g:3822:6: ( ( rule__XAnnotation__ValueAssignment_3_1_1 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3822:6: ( ( rule__XAnnotation__ValueAssignment_3_1_1 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3823:1: ( rule__XAnnotation__ValueAssignment_3_1_1 )
+                    // InternalFormat.g:3822:6: ( ( rule__XAnnotation__ValueAssignment_3_1_1 ) )
+                    // InternalFormat.g:3823:1: ( rule__XAnnotation__ValueAssignment_3_1_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXAnnotationAccess().getValueAssignment_3_1_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3824:1: ( rule__XAnnotation__ValueAssignment_3_1_1 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3824:2: rule__XAnnotation__ValueAssignment_3_1_1
+                    // InternalFormat.g:3824:1: ( rule__XAnnotation__ValueAssignment_3_1_1 )
+                    // InternalFormat.g:3824:2: rule__XAnnotation__ValueAssignment_3_1_1
                     {
-                    pushFollow(FOLLOW_rule__XAnnotation__ValueAssignment_3_1_1_in_rule__XAnnotation__Alternatives_3_18219);
+                    pushFollow(FOLLOW_2);
                     rule__XAnnotation__ValueAssignment_3_1_1();
 
                     state._fsp--;
@@ -12353,29 +12353,29 @@ public final void rule__XAnnotation__Alternatives_3_1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3833:1: rule__XAnnotationElementValueOrCommaList__Alternatives : ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) ) | ( ( rule__XAnnotationElementValueOrCommaList__Group_1__0 ) ) );
+    // InternalFormat.g:3833:1: rule__XAnnotationElementValueOrCommaList__Alternatives : ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) ) | ( ( rule__XAnnotationElementValueOrCommaList__Group_1__0 ) ) );
     public final void rule__XAnnotationElementValueOrCommaList__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3837:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) ) | ( ( rule__XAnnotationElementValueOrCommaList__Group_1__0 ) ) )
+            // InternalFormat.g:3837:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) ) | ( ( rule__XAnnotationElementValueOrCommaList__Group_1__0 ) ) )
             int alt25=2;
             alt25 = dfa25.predict(input);
             switch (alt25) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3838:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) )
+                    // InternalFormat.g:3838:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3838:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3839:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__0 )
+                    // InternalFormat.g:3838:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) )
+                    // InternalFormat.g:3839:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3840:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3840:2: rule__XAnnotationElementValueOrCommaList__Group_0__0
+                    // InternalFormat.g:3840:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__0 )
+                    // InternalFormat.g:3840:2: rule__XAnnotationElementValueOrCommaList__Group_0__0
                     {
-                    pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__0_in_rule__XAnnotationElementValueOrCommaList__Alternatives8252);
+                    pushFollow(FOLLOW_2);
                     rule__XAnnotationElementValueOrCommaList__Group_0__0();
 
                     state._fsp--;
@@ -12393,18 +12393,18 @@ public final void rule__XAnnotationElementValueOrCommaList__Alternatives() throw
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3844:6: ( ( rule__XAnnotationElementValueOrCommaList__Group_1__0 ) )
+                    // InternalFormat.g:3844:6: ( ( rule__XAnnotationElementValueOrCommaList__Group_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3844:6: ( ( rule__XAnnotationElementValueOrCommaList__Group_1__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3845:1: ( rule__XAnnotationElementValueOrCommaList__Group_1__0 )
+                    // InternalFormat.g:3844:6: ( ( rule__XAnnotationElementValueOrCommaList__Group_1__0 ) )
+                    // InternalFormat.g:3845:1: ( rule__XAnnotationElementValueOrCommaList__Group_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3846:1: ( rule__XAnnotationElementValueOrCommaList__Group_1__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3846:2: rule__XAnnotationElementValueOrCommaList__Group_1__0
+                    // InternalFormat.g:3846:1: ( rule__XAnnotationElementValueOrCommaList__Group_1__0 )
+                    // InternalFormat.g:3846:2: rule__XAnnotationElementValueOrCommaList__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1__0_in_rule__XAnnotationElementValueOrCommaList__Alternatives8270);
+                    pushFollow(FOLLOW_2);
                     rule__XAnnotationElementValueOrCommaList__Group_1__0();
 
                     state._fsp--;
@@ -12439,29 +12439,29 @@ public final void rule__XAnnotationElementValueOrCommaList__Alternatives() throw
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3855:1: rule__XAnnotationElementValue__Alternatives : ( ( ( rule__XAnnotationElementValue__Group_0__0 ) ) | ( ruleXAnnotationOrExpression ) );
+    // InternalFormat.g:3855:1: rule__XAnnotationElementValue__Alternatives : ( ( ( rule__XAnnotationElementValue__Group_0__0 ) ) | ( ruleXAnnotationOrExpression ) );
     public final void rule__XAnnotationElementValue__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3859:1: ( ( ( rule__XAnnotationElementValue__Group_0__0 ) ) | ( ruleXAnnotationOrExpression ) )
+            // InternalFormat.g:3859:1: ( ( ( rule__XAnnotationElementValue__Group_0__0 ) ) | ( ruleXAnnotationOrExpression ) )
             int alt26=2;
             alt26 = dfa26.predict(input);
             switch (alt26) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3860:1: ( ( rule__XAnnotationElementValue__Group_0__0 ) )
+                    // InternalFormat.g:3860:1: ( ( rule__XAnnotationElementValue__Group_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3860:1: ( ( rule__XAnnotationElementValue__Group_0__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3861:1: ( rule__XAnnotationElementValue__Group_0__0 )
+                    // InternalFormat.g:3860:1: ( ( rule__XAnnotationElementValue__Group_0__0 ) )
+                    // InternalFormat.g:3861:1: ( rule__XAnnotationElementValue__Group_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXAnnotationElementValueAccess().getGroup_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3862:1: ( rule__XAnnotationElementValue__Group_0__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3862:2: rule__XAnnotationElementValue__Group_0__0
+                    // InternalFormat.g:3862:1: ( rule__XAnnotationElementValue__Group_0__0 )
+                    // InternalFormat.g:3862:2: rule__XAnnotationElementValue__Group_0__0
                     {
-                    pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0__0_in_rule__XAnnotationElementValue__Alternatives8303);
+                    pushFollow(FOLLOW_2);
                     rule__XAnnotationElementValue__Group_0__0();
 
                     state._fsp--;
@@ -12479,15 +12479,15 @@ public final void rule__XAnnotationElementValue__Alternatives() throws Recogniti
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3866:6: ( ruleXAnnotationOrExpression )
+                    // InternalFormat.g:3866:6: ( ruleXAnnotationOrExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3866:6: ( ruleXAnnotationOrExpression )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3867:1: ruleXAnnotationOrExpression
+                    // InternalFormat.g:3866:6: ( ruleXAnnotationOrExpression )
+                    // InternalFormat.g:3867:1: ruleXAnnotationOrExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXAnnotationElementValueAccess().getXAnnotationOrExpressionParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValue__Alternatives8321);
+                    pushFollow(FOLLOW_2);
                     ruleXAnnotationOrExpression();
 
                     state._fsp--;
@@ -12519,13 +12519,13 @@ public final void rule__XAnnotationElementValue__Alternatives() throws Recogniti
 
 
     // $ANTLR start "rule__XAnnotationOrExpression__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3877:1: rule__XAnnotationOrExpression__Alternatives : ( ( ruleXAnnotation ) | ( ruleXExpression ) );
+    // InternalFormat.g:3877:1: rule__XAnnotationOrExpression__Alternatives : ( ( ruleXAnnotation ) | ( ruleXExpression ) );
     public final void rule__XAnnotationOrExpression__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3881:1: ( ( ruleXAnnotation ) | ( ruleXExpression ) )
+            // InternalFormat.g:3881:1: ( ( ruleXAnnotation ) | ( ruleXExpression ) )
             int alt27=2;
             int LA27_0 = input.LA(1);
 
@@ -12544,15 +12544,15 @@ else if ( ((LA27_0>=RULE_INT && LA27_0<=RULE_STRING)||(LA27_0>=20 && LA27_0<=21)
             }
             switch (alt27) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3882:1: ( ruleXAnnotation )
+                    // InternalFormat.g:3882:1: ( ruleXAnnotation )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3882:1: ( ruleXAnnotation )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3883:1: ruleXAnnotation
+                    // InternalFormat.g:3882:1: ( ruleXAnnotation )
+                    // InternalFormat.g:3883:1: ruleXAnnotation
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXAnnotationOrExpressionAccess().getXAnnotationParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleXAnnotation_in_rule__XAnnotationOrExpression__Alternatives8353);
+                    pushFollow(FOLLOW_2);
                     ruleXAnnotation();
 
                     state._fsp--;
@@ -12567,15 +12567,15 @@ else if ( ((LA27_0>=RULE_INT && LA27_0<=RULE_STRING)||(LA27_0>=20 && LA27_0<=21)
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3888:6: ( ruleXExpression )
+                    // InternalFormat.g:3888:6: ( ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3888:6: ( ruleXExpression )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3889:1: ruleXExpression
+                    // InternalFormat.g:3888:6: ( ruleXExpression )
+                    // InternalFormat.g:3889:1: ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXAnnotationOrExpressionAccess().getXExpressionParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_rule__XAnnotationOrExpression__Alternatives8370);
+                    pushFollow(FOLLOW_2);
                     ruleXExpression();
 
                     state._fsp--;
@@ -12607,29 +12607,29 @@ else if ( ((LA27_0>=RULE_INT && LA27_0<=RULE_STRING)||(LA27_0>=20 && LA27_0<=21)
 
 
     // $ANTLR start "rule__XAssignment__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3899:1: rule__XAssignment__Alternatives : ( ( ( rule__XAssignment__Group_0__0 ) ) | ( ( rule__XAssignment__Group_1__0 ) ) );
+    // InternalFormat.g:3899:1: rule__XAssignment__Alternatives : ( ( ( rule__XAssignment__Group_0__0 ) ) | ( ( rule__XAssignment__Group_1__0 ) ) );
     public final void rule__XAssignment__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3903:1: ( ( ( rule__XAssignment__Group_0__0 ) ) | ( ( rule__XAssignment__Group_1__0 ) ) )
+            // InternalFormat.g:3903:1: ( ( ( rule__XAssignment__Group_0__0 ) ) | ( ( rule__XAssignment__Group_1__0 ) ) )
             int alt28=2;
             alt28 = dfa28.predict(input);
             switch (alt28) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3904:1: ( ( rule__XAssignment__Group_0__0 ) )
+                    // InternalFormat.g:3904:1: ( ( rule__XAssignment__Group_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3904:1: ( ( rule__XAssignment__Group_0__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3905:1: ( rule__XAssignment__Group_0__0 )
+                    // InternalFormat.g:3904:1: ( ( rule__XAssignment__Group_0__0 ) )
+                    // InternalFormat.g:3905:1: ( rule__XAssignment__Group_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXAssignmentAccess().getGroup_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3906:1: ( rule__XAssignment__Group_0__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3906:2: rule__XAssignment__Group_0__0
+                    // InternalFormat.g:3906:1: ( rule__XAssignment__Group_0__0 )
+                    // InternalFormat.g:3906:2: rule__XAssignment__Group_0__0
                     {
-                    pushFollow(FOLLOW_rule__XAssignment__Group_0__0_in_rule__XAssignment__Alternatives8402);
+                    pushFollow(FOLLOW_2);
                     rule__XAssignment__Group_0__0();
 
                     state._fsp--;
@@ -12647,18 +12647,18 @@ public final void rule__XAssignment__Alternatives() throws RecognitionException
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3910:6: ( ( rule__XAssignment__Group_1__0 ) )
+                    // InternalFormat.g:3910:6: ( ( rule__XAssignment__Group_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3910:6: ( ( rule__XAssignment__Group_1__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3911:1: ( rule__XAssignment__Group_1__0 )
+                    // InternalFormat.g:3910:6: ( ( rule__XAssignment__Group_1__0 ) )
+                    // InternalFormat.g:3911:1: ( rule__XAssignment__Group_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXAssignmentAccess().getGroup_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3912:1: ( rule__XAssignment__Group_1__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3912:2: rule__XAssignment__Group_1__0
+                    // InternalFormat.g:3912:1: ( rule__XAssignment__Group_1__0 )
+                    // InternalFormat.g:3912:2: rule__XAssignment__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__XAssignment__Group_1__0_in_rule__XAssignment__Alternatives8420);
+                    pushFollow(FOLLOW_2);
                     rule__XAssignment__Group_1__0();
 
                     state._fsp--;
@@ -12693,13 +12693,13 @@ public final void rule__XAssignment__Alternatives() throws RecognitionException
 
 
     // $ANTLR start "rule__OpMultiAssign__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3921:1: rule__OpMultiAssign__Alternatives : ( ( '+=' ) | ( '-=' ) | ( '*=' ) | ( '/=' ) | ( '%=' ) | ( ( rule__OpMultiAssign__Group_5__0 ) ) | ( ( rule__OpMultiAssign__Group_6__0 ) ) );
+    // InternalFormat.g:3921:1: rule__OpMultiAssign__Alternatives : ( ( '+=' ) | ( '-=' ) | ( '*=' ) | ( '/=' ) | ( '%=' ) | ( ( rule__OpMultiAssign__Group_5__0 ) ) | ( ( rule__OpMultiAssign__Group_6__0 ) ) );
     public final void rule__OpMultiAssign__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3925:1: ( ( '+=' ) | ( '-=' ) | ( '*=' ) | ( '/=' ) | ( '%=' ) | ( ( rule__OpMultiAssign__Group_5__0 ) ) | ( ( rule__OpMultiAssign__Group_6__0 ) ) )
+            // InternalFormat.g:3925:1: ( ( '+=' ) | ( '-=' ) | ( '*=' ) | ( '/=' ) | ( '%=' ) | ( ( rule__OpMultiAssign__Group_5__0 ) ) | ( ( rule__OpMultiAssign__Group_6__0 ) ) )
             int alt29=7;
             switch ( input.LA(1) ) {
             case 22:
@@ -12747,15 +12747,15 @@ public final void rule__OpMultiAssign__Alternatives() throws RecognitionExceptio
 
             switch (alt29) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3926:1: ( '+=' )
+                    // InternalFormat.g:3926:1: ( '+=' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3926:1: ( '+=' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3927:1: '+='
+                    // InternalFormat.g:3926:1: ( '+=' )
+                    // InternalFormat.g:3927:1: '+='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAssignAccess().getPlusSignEqualsSignKeyword_0()); 
                     }
-                    match(input,22,FOLLOW_22_in_rule__OpMultiAssign__Alternatives8454); if (state.failed) return ;
+                    match(input,22,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpMultiAssignAccess().getPlusSignEqualsSignKeyword_0()); 
                     }
@@ -12766,15 +12766,15 @@ public final void rule__OpMultiAssign__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3934:6: ( '-=' )
+                    // InternalFormat.g:3934:6: ( '-=' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3934:6: ( '-=' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3935:1: '-='
+                    // InternalFormat.g:3934:6: ( '-=' )
+                    // InternalFormat.g:3935:1: '-='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAssignAccess().getHyphenMinusEqualsSignKeyword_1()); 
                     }
-                    match(input,23,FOLLOW_23_in_rule__OpMultiAssign__Alternatives8474); if (state.failed) return ;
+                    match(input,23,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpMultiAssignAccess().getHyphenMinusEqualsSignKeyword_1()); 
                     }
@@ -12785,15 +12785,15 @@ public final void rule__OpMultiAssign__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3942:6: ( '*=' )
+                    // InternalFormat.g:3942:6: ( '*=' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3942:6: ( '*=' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3943:1: '*='
+                    // InternalFormat.g:3942:6: ( '*=' )
+                    // InternalFormat.g:3943:1: '*='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAssignAccess().getAsteriskEqualsSignKeyword_2()); 
                     }
-                    match(input,24,FOLLOW_24_in_rule__OpMultiAssign__Alternatives8494); if (state.failed) return ;
+                    match(input,24,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpMultiAssignAccess().getAsteriskEqualsSignKeyword_2()); 
                     }
@@ -12804,15 +12804,15 @@ public final void rule__OpMultiAssign__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3950:6: ( '/=' )
+                    // InternalFormat.g:3950:6: ( '/=' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3950:6: ( '/=' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3951:1: '/='
+                    // InternalFormat.g:3950:6: ( '/=' )
+                    // InternalFormat.g:3951:1: '/='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAssignAccess().getSolidusEqualsSignKeyword_3()); 
                     }
-                    match(input,25,FOLLOW_25_in_rule__OpMultiAssign__Alternatives8514); if (state.failed) return ;
+                    match(input,25,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpMultiAssignAccess().getSolidusEqualsSignKeyword_3()); 
                     }
@@ -12823,15 +12823,15 @@ public final void rule__OpMultiAssign__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3958:6: ( '%=' )
+                    // InternalFormat.g:3958:6: ( '%=' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3958:6: ( '%=' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3959:1: '%='
+                    // InternalFormat.g:3958:6: ( '%=' )
+                    // InternalFormat.g:3959:1: '%='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAssignAccess().getPercentSignEqualsSignKeyword_4()); 
                     }
-                    match(input,26,FOLLOW_26_in_rule__OpMultiAssign__Alternatives8534); if (state.failed) return ;
+                    match(input,26,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpMultiAssignAccess().getPercentSignEqualsSignKeyword_4()); 
                     }
@@ -12842,18 +12842,18 @@ public final void rule__OpMultiAssign__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3966:6: ( ( rule__OpMultiAssign__Group_5__0 ) )
+                    // InternalFormat.g:3966:6: ( ( rule__OpMultiAssign__Group_5__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3966:6: ( ( rule__OpMultiAssign__Group_5__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3967:1: ( rule__OpMultiAssign__Group_5__0 )
+                    // InternalFormat.g:3966:6: ( ( rule__OpMultiAssign__Group_5__0 ) )
+                    // InternalFormat.g:3967:1: ( rule__OpMultiAssign__Group_5__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAssignAccess().getGroup_5()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3968:1: ( rule__OpMultiAssign__Group_5__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3968:2: rule__OpMultiAssign__Group_5__0
+                    // InternalFormat.g:3968:1: ( rule__OpMultiAssign__Group_5__0 )
+                    // InternalFormat.g:3968:2: rule__OpMultiAssign__Group_5__0
                     {
-                    pushFollow(FOLLOW_rule__OpMultiAssign__Group_5__0_in_rule__OpMultiAssign__Alternatives8553);
+                    pushFollow(FOLLOW_2);
                     rule__OpMultiAssign__Group_5__0();
 
                     state._fsp--;
@@ -12871,18 +12871,18 @@ public final void rule__OpMultiAssign__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3972:6: ( ( rule__OpMultiAssign__Group_6__0 ) )
+                    // InternalFormat.g:3972:6: ( ( rule__OpMultiAssign__Group_6__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3972:6: ( ( rule__OpMultiAssign__Group_6__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3973:1: ( rule__OpMultiAssign__Group_6__0 )
+                    // InternalFormat.g:3972:6: ( ( rule__OpMultiAssign__Group_6__0 ) )
+                    // InternalFormat.g:3973:1: ( rule__OpMultiAssign__Group_6__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAssignAccess().getGroup_6()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3974:1: ( rule__OpMultiAssign__Group_6__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3974:2: rule__OpMultiAssign__Group_6__0
+                    // InternalFormat.g:3974:1: ( rule__OpMultiAssign__Group_6__0 )
+                    // InternalFormat.g:3974:2: rule__OpMultiAssign__Group_6__0
                     {
-                    pushFollow(FOLLOW_rule__OpMultiAssign__Group_6__0_in_rule__OpMultiAssign__Alternatives8571);
+                    pushFollow(FOLLOW_2);
                     rule__OpMultiAssign__Group_6__0();
 
                     state._fsp--;
@@ -12917,13 +12917,13 @@ public final void rule__OpMultiAssign__Alternatives() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__OpEquality__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3983:1: rule__OpEquality__Alternatives : ( ( '==' ) | ( '!=' ) | ( '===' ) | ( '!==' ) );
+    // InternalFormat.g:3983:1: rule__OpEquality__Alternatives : ( ( '==' ) | ( '!=' ) | ( '===' ) | ( '!==' ) );
     public final void rule__OpEquality__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3987:1: ( ( '==' ) | ( '!=' ) | ( '===' ) | ( '!==' ) )
+            // InternalFormat.g:3987:1: ( ( '==' ) | ( '!=' ) | ( '===' ) | ( '!==' ) )
             int alt30=4;
             switch ( input.LA(1) ) {
             case 27:
@@ -12956,15 +12956,15 @@ public final void rule__OpEquality__Alternatives() throws RecognitionException {
 
             switch (alt30) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3988:1: ( '==' )
+                    // InternalFormat.g:3988:1: ( '==' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3988:1: ( '==' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3989:1: '=='
+                    // InternalFormat.g:3988:1: ( '==' )
+                    // InternalFormat.g:3989:1: '=='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpEqualityAccess().getEqualsSignEqualsSignKeyword_0()); 
                     }
-                    match(input,27,FOLLOW_27_in_rule__OpEquality__Alternatives8605); if (state.failed) return ;
+                    match(input,27,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpEqualityAccess().getEqualsSignEqualsSignKeyword_0()); 
                     }
@@ -12975,15 +12975,15 @@ public final void rule__OpEquality__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3996:6: ( '!=' )
+                    // InternalFormat.g:3996:6: ( '!=' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3996:6: ( '!=' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3997:1: '!='
+                    // InternalFormat.g:3996:6: ( '!=' )
+                    // InternalFormat.g:3997:1: '!='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpEqualityAccess().getExclamationMarkEqualsSignKeyword_1()); 
                     }
-                    match(input,28,FOLLOW_28_in_rule__OpEquality__Alternatives8625); if (state.failed) return ;
+                    match(input,28,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpEqualityAccess().getExclamationMarkEqualsSignKeyword_1()); 
                     }
@@ -12994,15 +12994,15 @@ public final void rule__OpEquality__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4004:6: ( '===' )
+                    // InternalFormat.g:4004:6: ( '===' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4004:6: ( '===' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4005:1: '==='
+                    // InternalFormat.g:4004:6: ( '===' )
+                    // InternalFormat.g:4005:1: '==='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpEqualityAccess().getEqualsSignEqualsSignEqualsSignKeyword_2()); 
                     }
-                    match(input,29,FOLLOW_29_in_rule__OpEquality__Alternatives8645); if (state.failed) return ;
+                    match(input,29,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpEqualityAccess().getEqualsSignEqualsSignEqualsSignKeyword_2()); 
                     }
@@ -13013,15 +13013,15 @@ public final void rule__OpEquality__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4012:6: ( '!==' )
+                    // InternalFormat.g:4012:6: ( '!==' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4012:6: ( '!==' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4013:1: '!=='
+                    // InternalFormat.g:4012:6: ( '!==' )
+                    // InternalFormat.g:4013:1: '!=='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpEqualityAccess().getExclamationMarkEqualsSignEqualsSignKeyword_3()); 
                     }
-                    match(input,30,FOLLOW_30_in_rule__OpEquality__Alternatives8665); if (state.failed) return ;
+                    match(input,30,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpEqualityAccess().getExclamationMarkEqualsSignEqualsSignKeyword_3()); 
                     }
@@ -13049,13 +13049,13 @@ public final void rule__OpEquality__Alternatives() throws RecognitionException {
 
 
     // $ANTLR start "rule__XRelationalExpression__Alternatives_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4025:1: rule__XRelationalExpression__Alternatives_1 : ( ( ( rule__XRelationalExpression__Group_1_0__0 ) ) | ( ( rule__XRelationalExpression__Group_1_1__0 ) ) );
+    // InternalFormat.g:4025:1: rule__XRelationalExpression__Alternatives_1 : ( ( ( rule__XRelationalExpression__Group_1_0__0 ) ) | ( ( rule__XRelationalExpression__Group_1_1__0 ) ) );
     public final void rule__XRelationalExpression__Alternatives_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4029:1: ( ( ( rule__XRelationalExpression__Group_1_0__0 ) ) | ( ( rule__XRelationalExpression__Group_1_1__0 ) ) )
+            // InternalFormat.g:4029:1: ( ( ( rule__XRelationalExpression__Group_1_0__0 ) ) | ( ( rule__XRelationalExpression__Group_1_1__0 ) ) )
             int alt31=2;
             int LA31_0 = input.LA(1);
 
@@ -13074,18 +13074,18 @@ else if ( ((LA31_0>=31 && LA31_0<=33)) ) {
             }
             switch (alt31) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4030:1: ( ( rule__XRelationalExpression__Group_1_0__0 ) )
+                    // InternalFormat.g:4030:1: ( ( rule__XRelationalExpression__Group_1_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4030:1: ( ( rule__XRelationalExpression__Group_1_0__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4031:1: ( rule__XRelationalExpression__Group_1_0__0 )
+                    // InternalFormat.g:4030:1: ( ( rule__XRelationalExpression__Group_1_0__0 ) )
+                    // InternalFormat.g:4031:1: ( rule__XRelationalExpression__Group_1_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXRelationalExpressionAccess().getGroup_1_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4032:1: ( rule__XRelationalExpression__Group_1_0__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4032:2: rule__XRelationalExpression__Group_1_0__0
+                    // InternalFormat.g:4032:1: ( rule__XRelationalExpression__Group_1_0__0 )
+                    // InternalFormat.g:4032:2: rule__XRelationalExpression__Group_1_0__0
                     {
-                    pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0__0_in_rule__XRelationalExpression__Alternatives_18699);
+                    pushFollow(FOLLOW_2);
                     rule__XRelationalExpression__Group_1_0__0();
 
                     state._fsp--;
@@ -13103,18 +13103,18 @@ else if ( ((LA31_0>=31 && LA31_0<=33)) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4036:6: ( ( rule__XRelationalExpression__Group_1_1__0 ) )
+                    // InternalFormat.g:4036:6: ( ( rule__XRelationalExpression__Group_1_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4036:6: ( ( rule__XRelationalExpression__Group_1_1__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4037:1: ( rule__XRelationalExpression__Group_1_1__0 )
+                    // InternalFormat.g:4036:6: ( ( rule__XRelationalExpression__Group_1_1__0 ) )
+                    // InternalFormat.g:4037:1: ( rule__XRelationalExpression__Group_1_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXRelationalExpressionAccess().getGroup_1_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4038:1: ( rule__XRelationalExpression__Group_1_1__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4038:2: rule__XRelationalExpression__Group_1_1__0
+                    // InternalFormat.g:4038:1: ( rule__XRelationalExpression__Group_1_1__0 )
+                    // InternalFormat.g:4038:2: rule__XRelationalExpression__Group_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1__0_in_rule__XRelationalExpression__Alternatives_18717);
+                    pushFollow(FOLLOW_2);
                     rule__XRelationalExpression__Group_1_1__0();
 
                     state._fsp--;
@@ -13149,13 +13149,13 @@ else if ( ((LA31_0>=31 && LA31_0<=33)) ) {
 
 
     // $ANTLR start "rule__OpCompare__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4047:1: rule__OpCompare__Alternatives : ( ( '>=' ) | ( ( rule__OpCompare__Group_1__0 ) ) | ( '>' ) | ( '<' ) );
+    // InternalFormat.g:4047:1: rule__OpCompare__Alternatives : ( ( '>=' ) | ( ( rule__OpCompare__Group_1__0 ) ) | ( '>' ) | ( '<' ) );
     public final void rule__OpCompare__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4051:1: ( ( '>=' ) | ( ( rule__OpCompare__Group_1__0 ) ) | ( '>' ) | ( '<' ) )
+            // InternalFormat.g:4051:1: ( ( '>=' ) | ( ( rule__OpCompare__Group_1__0 ) ) | ( '>' ) | ( '<' ) )
             int alt32=4;
             switch ( input.LA(1) ) {
             case 31:
@@ -13197,15 +13197,15 @@ else if ( (LA32_2==14) ) {
 
             switch (alt32) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4052:1: ( '>=' )
+                    // InternalFormat.g:4052:1: ( '>=' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4052:1: ( '>=' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4053:1: '>='
+                    // InternalFormat.g:4052:1: ( '>=' )
+                    // InternalFormat.g:4053:1: '>='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpCompareAccess().getGreaterThanSignEqualsSignKeyword_0()); 
                     }
-                    match(input,31,FOLLOW_31_in_rule__OpCompare__Alternatives8751); if (state.failed) return ;
+                    match(input,31,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpCompareAccess().getGreaterThanSignEqualsSignKeyword_0()); 
                     }
@@ -13216,18 +13216,18 @@ else if ( (LA32_2==14) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4060:6: ( ( rule__OpCompare__Group_1__0 ) )
+                    // InternalFormat.g:4060:6: ( ( rule__OpCompare__Group_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4060:6: ( ( rule__OpCompare__Group_1__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4061:1: ( rule__OpCompare__Group_1__0 )
+                    // InternalFormat.g:4060:6: ( ( rule__OpCompare__Group_1__0 ) )
+                    // InternalFormat.g:4061:1: ( rule__OpCompare__Group_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpCompareAccess().getGroup_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4062:1: ( rule__OpCompare__Group_1__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4062:2: rule__OpCompare__Group_1__0
+                    // InternalFormat.g:4062:1: ( rule__OpCompare__Group_1__0 )
+                    // InternalFormat.g:4062:2: rule__OpCompare__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__OpCompare__Group_1__0_in_rule__OpCompare__Alternatives8770);
+                    pushFollow(FOLLOW_2);
                     rule__OpCompare__Group_1__0();
 
                     state._fsp--;
@@ -13245,15 +13245,15 @@ else if ( (LA32_2==14) ) {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4066:6: ( '>' )
+                    // InternalFormat.g:4066:6: ( '>' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4066:6: ( '>' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4067:1: '>'
+                    // InternalFormat.g:4066:6: ( '>' )
+                    // InternalFormat.g:4067:1: '>'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpCompareAccess().getGreaterThanSignKeyword_2()); 
                     }
-                    match(input,32,FOLLOW_32_in_rule__OpCompare__Alternatives8789); if (state.failed) return ;
+                    match(input,32,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpCompareAccess().getGreaterThanSignKeyword_2()); 
                     }
@@ -13264,15 +13264,15 @@ else if ( (LA32_2==14) ) {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4074:6: ( '<' )
+                    // InternalFormat.g:4074:6: ( '<' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4074:6: ( '<' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4075:1: '<'
+                    // InternalFormat.g:4074:6: ( '<' )
+                    // InternalFormat.g:4075:1: '<'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpCompareAccess().getLessThanSignKeyword_3()); 
                     }
-                    match(input,33,FOLLOW_33_in_rule__OpCompare__Alternatives8809); if (state.failed) return ;
+                    match(input,33,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpCompareAccess().getLessThanSignKeyword_3()); 
                     }
@@ -13300,26 +13300,26 @@ else if ( (LA32_2==14) ) {
 
 
     // $ANTLR start "rule__OpOther__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4087:1: rule__OpOther__Alternatives : ( ( '->' ) | ( '..<' ) | ( ( rule__OpOther__Group_2__0 ) ) | ( '..' ) | ( '=>' ) | ( ( rule__OpOther__Group_5__0 ) ) | ( ( rule__OpOther__Group_6__0 ) ) | ( '<>' ) | ( '?:' ) );
+    // InternalFormat.g:4087:1: rule__OpOther__Alternatives : ( ( '->' ) | ( '..<' ) | ( ( rule__OpOther__Group_2__0 ) ) | ( '..' ) | ( '=>' ) | ( ( rule__OpOther__Group_5__0 ) ) | ( ( rule__OpOther__Group_6__0 ) ) | ( '<>' ) | ( '?:' ) );
     public final void rule__OpOther__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4091:1: ( ( '->' ) | ( '..<' ) | ( ( rule__OpOther__Group_2__0 ) ) | ( '..' ) | ( '=>' ) | ( ( rule__OpOther__Group_5__0 ) ) | ( ( rule__OpOther__Group_6__0 ) ) | ( '<>' ) | ( '?:' ) )
+            // InternalFormat.g:4091:1: ( ( '->' ) | ( '..<' ) | ( ( rule__OpOther__Group_2__0 ) ) | ( '..' ) | ( '=>' ) | ( ( rule__OpOther__Group_5__0 ) ) | ( ( rule__OpOther__Group_6__0 ) ) | ( '<>' ) | ( '?:' ) )
             int alt33=9;
             alt33 = dfa33.predict(input);
             switch (alt33) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4092:1: ( '->' )
+                    // InternalFormat.g:4092:1: ( '->' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4092:1: ( '->' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4093:1: '->'
+                    // InternalFormat.g:4092:1: ( '->' )
+                    // InternalFormat.g:4093:1: '->'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getHyphenMinusGreaterThanSignKeyword_0()); 
                     }
-                    match(input,34,FOLLOW_34_in_rule__OpOther__Alternatives8844); if (state.failed) return ;
+                    match(input,34,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpOtherAccess().getHyphenMinusGreaterThanSignKeyword_0()); 
                     }
@@ -13330,15 +13330,15 @@ public final void rule__OpOther__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4100:6: ( '..<' )
+                    // InternalFormat.g:4100:6: ( '..<' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4100:6: ( '..<' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4101:1: '..<'
+                    // InternalFormat.g:4100:6: ( '..<' )
+                    // InternalFormat.g:4101:1: '..<'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getFullStopFullStopLessThanSignKeyword_1()); 
                     }
-                    match(input,35,FOLLOW_35_in_rule__OpOther__Alternatives8864); if (state.failed) return ;
+                    match(input,35,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpOtherAccess().getFullStopFullStopLessThanSignKeyword_1()); 
                     }
@@ -13349,18 +13349,18 @@ public final void rule__OpOther__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4108:6: ( ( rule__OpOther__Group_2__0 ) )
+                    // InternalFormat.g:4108:6: ( ( rule__OpOther__Group_2__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4108:6: ( ( rule__OpOther__Group_2__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4109:1: ( rule__OpOther__Group_2__0 )
+                    // InternalFormat.g:4108:6: ( ( rule__OpOther__Group_2__0 ) )
+                    // InternalFormat.g:4109:1: ( rule__OpOther__Group_2__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getGroup_2()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4110:1: ( rule__OpOther__Group_2__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4110:2: rule__OpOther__Group_2__0
+                    // InternalFormat.g:4110:1: ( rule__OpOther__Group_2__0 )
+                    // InternalFormat.g:4110:2: rule__OpOther__Group_2__0
                     {
-                    pushFollow(FOLLOW_rule__OpOther__Group_2__0_in_rule__OpOther__Alternatives8883);
+                    pushFollow(FOLLOW_2);
                     rule__OpOther__Group_2__0();
 
                     state._fsp--;
@@ -13378,15 +13378,15 @@ public final void rule__OpOther__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4114:6: ( '..' )
+                    // InternalFormat.g:4114:6: ( '..' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4114:6: ( '..' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4115:1: '..'
+                    // InternalFormat.g:4114:6: ( '..' )
+                    // InternalFormat.g:4115:1: '..'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getFullStopFullStopKeyword_3()); 
                     }
-                    match(input,36,FOLLOW_36_in_rule__OpOther__Alternatives8902); if (state.failed) return ;
+                    match(input,36,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpOtherAccess().getFullStopFullStopKeyword_3()); 
                     }
@@ -13397,15 +13397,15 @@ public final void rule__OpOther__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4122:6: ( '=>' )
+                    // InternalFormat.g:4122:6: ( '=>' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4122:6: ( '=>' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4123:1: '=>'
+                    // InternalFormat.g:4122:6: ( '=>' )
+                    // InternalFormat.g:4123:1: '=>'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getEqualsSignGreaterThanSignKeyword_4()); 
                     }
-                    match(input,37,FOLLOW_37_in_rule__OpOther__Alternatives8922); if (state.failed) return ;
+                    match(input,37,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpOtherAccess().getEqualsSignGreaterThanSignKeyword_4()); 
                     }
@@ -13416,18 +13416,18 @@ public final void rule__OpOther__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4130:6: ( ( rule__OpOther__Group_5__0 ) )
+                    // InternalFormat.g:4130:6: ( ( rule__OpOther__Group_5__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4130:6: ( ( rule__OpOther__Group_5__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4131:1: ( rule__OpOther__Group_5__0 )
+                    // InternalFormat.g:4130:6: ( ( rule__OpOther__Group_5__0 ) )
+                    // InternalFormat.g:4131:1: ( rule__OpOther__Group_5__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getGroup_5()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4132:1: ( rule__OpOther__Group_5__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4132:2: rule__OpOther__Group_5__0
+                    // InternalFormat.g:4132:1: ( rule__OpOther__Group_5__0 )
+                    // InternalFormat.g:4132:2: rule__OpOther__Group_5__0
                     {
-                    pushFollow(FOLLOW_rule__OpOther__Group_5__0_in_rule__OpOther__Alternatives8941);
+                    pushFollow(FOLLOW_2);
                     rule__OpOther__Group_5__0();
 
                     state._fsp--;
@@ -13445,18 +13445,18 @@ public final void rule__OpOther__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4136:6: ( ( rule__OpOther__Group_6__0 ) )
+                    // InternalFormat.g:4136:6: ( ( rule__OpOther__Group_6__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4136:6: ( ( rule__OpOther__Group_6__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4137:1: ( rule__OpOther__Group_6__0 )
+                    // InternalFormat.g:4136:6: ( ( rule__OpOther__Group_6__0 ) )
+                    // InternalFormat.g:4137:1: ( rule__OpOther__Group_6__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getGroup_6()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4138:1: ( rule__OpOther__Group_6__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4138:2: rule__OpOther__Group_6__0
+                    // InternalFormat.g:4138:1: ( rule__OpOther__Group_6__0 )
+                    // InternalFormat.g:4138:2: rule__OpOther__Group_6__0
                     {
-                    pushFollow(FOLLOW_rule__OpOther__Group_6__0_in_rule__OpOther__Alternatives8959);
+                    pushFollow(FOLLOW_2);
                     rule__OpOther__Group_6__0();
 
                     state._fsp--;
@@ -13474,15 +13474,15 @@ public final void rule__OpOther__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 8 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4142:6: ( '<>' )
+                    // InternalFormat.g:4142:6: ( '<>' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4142:6: ( '<>' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4143:1: '<>'
+                    // InternalFormat.g:4142:6: ( '<>' )
+                    // InternalFormat.g:4143:1: '<>'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getLessThanSignGreaterThanSignKeyword_7()); 
                     }
-                    match(input,38,FOLLOW_38_in_rule__OpOther__Alternatives8978); if (state.failed) return ;
+                    match(input,38,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpOtherAccess().getLessThanSignGreaterThanSignKeyword_7()); 
                     }
@@ -13493,15 +13493,15 @@ public final void rule__OpOther__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 9 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4150:6: ( '?:' )
+                    // InternalFormat.g:4150:6: ( '?:' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4150:6: ( '?:' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4151:1: '?:'
+                    // InternalFormat.g:4150:6: ( '?:' )
+                    // InternalFormat.g:4151:1: '?:'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getQuestionMarkColonKeyword_8()); 
                     }
-                    match(input,39,FOLLOW_39_in_rule__OpOther__Alternatives8998); if (state.failed) return ;
+                    match(input,39,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpOtherAccess().getQuestionMarkColonKeyword_8()); 
                     }
@@ -13529,13 +13529,13 @@ public final void rule__OpOther__Alternatives() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpOther__Alternatives_5_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4163:1: rule__OpOther__Alternatives_5_1 : ( ( ( rule__OpOther__Group_5_1_0__0 ) ) | ( '>' ) );
+    // InternalFormat.g:4163:1: rule__OpOther__Alternatives_5_1 : ( ( ( rule__OpOther__Group_5_1_0__0 ) ) | ( '>' ) );
     public final void rule__OpOther__Alternatives_5_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4167:1: ( ( ( rule__OpOther__Group_5_1_0__0 ) ) | ( '>' ) )
+            // InternalFormat.g:4167:1: ( ( ( rule__OpOther__Group_5_1_0__0 ) ) | ( '>' ) )
             int alt34=2;
             int LA34_0 = input.LA(1);
 
@@ -13565,18 +13565,18 @@ else if ( (LA34_1==32) ) {
             }
             switch (alt34) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4168:1: ( ( rule__OpOther__Group_5_1_0__0 ) )
+                    // InternalFormat.g:4168:1: ( ( rule__OpOther__Group_5_1_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4168:1: ( ( rule__OpOther__Group_5_1_0__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4169:1: ( rule__OpOther__Group_5_1_0__0 )
+                    // InternalFormat.g:4168:1: ( ( rule__OpOther__Group_5_1_0__0 ) )
+                    // InternalFormat.g:4169:1: ( rule__OpOther__Group_5_1_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getGroup_5_1_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4170:1: ( rule__OpOther__Group_5_1_0__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4170:2: rule__OpOther__Group_5_1_0__0
+                    // InternalFormat.g:4170:1: ( rule__OpOther__Group_5_1_0__0 )
+                    // InternalFormat.g:4170:2: rule__OpOther__Group_5_1_0__0
                     {
-                    pushFollow(FOLLOW_rule__OpOther__Group_5_1_0__0_in_rule__OpOther__Alternatives_5_19032);
+                    pushFollow(FOLLOW_2);
                     rule__OpOther__Group_5_1_0__0();
 
                     state._fsp--;
@@ -13594,15 +13594,15 @@ else if ( (LA34_1==32) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4174:6: ( '>' )
+                    // InternalFormat.g:4174:6: ( '>' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4174:6: ( '>' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4175:1: '>'
+                    // InternalFormat.g:4174:6: ( '>' )
+                    // InternalFormat.g:4175:1: '>'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_1_1()); 
                     }
-                    match(input,32,FOLLOW_32_in_rule__OpOther__Alternatives_5_19051); if (state.failed) return ;
+                    match(input,32,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_1_1()); 
                     }
@@ -13630,13 +13630,13 @@ else if ( (LA34_1==32) ) {
 
 
     // $ANTLR start "rule__OpOther__Alternatives_6_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4187:1: rule__OpOther__Alternatives_6_1 : ( ( ( rule__OpOther__Group_6_1_0__0 ) ) | ( '<' ) | ( '=>' ) );
+    // InternalFormat.g:4187:1: rule__OpOther__Alternatives_6_1 : ( ( ( rule__OpOther__Group_6_1_0__0 ) ) | ( '<' ) | ( '=>' ) );
     public final void rule__OpOther__Alternatives_6_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4191:1: ( ( ( rule__OpOther__Group_6_1_0__0 ) ) | ( '<' ) | ( '=>' ) )
+            // InternalFormat.g:4191:1: ( ( ( rule__OpOther__Group_6_1_0__0 ) ) | ( '<' ) | ( '=>' ) )
             int alt35=3;
             int LA35_0 = input.LA(1);
 
@@ -13669,18 +13669,18 @@ else if ( (LA35_0==37) ) {
             }
             switch (alt35) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4192:1: ( ( rule__OpOther__Group_6_1_0__0 ) )
+                    // InternalFormat.g:4192:1: ( ( rule__OpOther__Group_6_1_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4192:1: ( ( rule__OpOther__Group_6_1_0__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4193:1: ( rule__OpOther__Group_6_1_0__0 )
+                    // InternalFormat.g:4192:1: ( ( rule__OpOther__Group_6_1_0__0 ) )
+                    // InternalFormat.g:4193:1: ( rule__OpOther__Group_6_1_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getGroup_6_1_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4194:1: ( rule__OpOther__Group_6_1_0__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4194:2: rule__OpOther__Group_6_1_0__0
+                    // InternalFormat.g:4194:1: ( rule__OpOther__Group_6_1_0__0 )
+                    // InternalFormat.g:4194:2: rule__OpOther__Group_6_1_0__0
                     {
-                    pushFollow(FOLLOW_rule__OpOther__Group_6_1_0__0_in_rule__OpOther__Alternatives_6_19085);
+                    pushFollow(FOLLOW_2);
                     rule__OpOther__Group_6_1_0__0();
 
                     state._fsp--;
@@ -13698,15 +13698,15 @@ else if ( (LA35_0==37) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4198:6: ( '<' )
+                    // InternalFormat.g:4198:6: ( '<' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4198:6: ( '<' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4199:1: '<'
+                    // InternalFormat.g:4198:6: ( '<' )
+                    // InternalFormat.g:4199:1: '<'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_1_1()); 
                     }
-                    match(input,33,FOLLOW_33_in_rule__OpOther__Alternatives_6_19104); if (state.failed) return ;
+                    match(input,33,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_1_1()); 
                     }
@@ -13717,15 +13717,15 @@ else if ( (LA35_0==37) ) {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4206:6: ( '=>' )
+                    // InternalFormat.g:4206:6: ( '=>' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4206:6: ( '=>' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4207:1: '=>'
+                    // InternalFormat.g:4206:6: ( '=>' )
+                    // InternalFormat.g:4207:1: '=>'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpOtherAccess().getEqualsSignGreaterThanSignKeyword_6_1_2()); 
                     }
-                    match(input,37,FOLLOW_37_in_rule__OpOther__Alternatives_6_19124); if (state.failed) return ;
+                    match(input,37,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpOtherAccess().getEqualsSignGreaterThanSignKeyword_6_1_2()); 
                     }
@@ -13753,13 +13753,13 @@ else if ( (LA35_0==37) ) {
 
 
     // $ANTLR start "rule__OpAdd__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4219:1: rule__OpAdd__Alternatives : ( ( '+' ) | ( '-' ) );
+    // InternalFormat.g:4219:1: rule__OpAdd__Alternatives : ( ( '+' ) | ( '-' ) );
     public final void rule__OpAdd__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4223:1: ( ( '+' ) | ( '-' ) )
+            // InternalFormat.g:4223:1: ( ( '+' ) | ( '-' ) )
             int alt36=2;
             int LA36_0 = input.LA(1);
 
@@ -13778,15 +13778,15 @@ else if ( (LA36_0==41) ) {
             }
             switch (alt36) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4224:1: ( '+' )
+                    // InternalFormat.g:4224:1: ( '+' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4224:1: ( '+' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4225:1: '+'
+                    // InternalFormat.g:4224:1: ( '+' )
+                    // InternalFormat.g:4225:1: '+'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpAddAccess().getPlusSignKeyword_0()); 
                     }
-                    match(input,40,FOLLOW_40_in_rule__OpAdd__Alternatives9159); if (state.failed) return ;
+                    match(input,40,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpAddAccess().getPlusSignKeyword_0()); 
                     }
@@ -13797,15 +13797,15 @@ else if ( (LA36_0==41) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4232:6: ( '-' )
+                    // InternalFormat.g:4232:6: ( '-' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4232:6: ( '-' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4233:1: '-'
+                    // InternalFormat.g:4232:6: ( '-' )
+                    // InternalFormat.g:4233:1: '-'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpAddAccess().getHyphenMinusKeyword_1()); 
                     }
-                    match(input,41,FOLLOW_41_in_rule__OpAdd__Alternatives9179); if (state.failed) return ;
+                    match(input,41,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpAddAccess().getHyphenMinusKeyword_1()); 
                     }
@@ -13833,13 +13833,13 @@ else if ( (LA36_0==41) ) {
 
 
     // $ANTLR start "rule__OpMulti__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4245:1: rule__OpMulti__Alternatives : ( ( '*' ) | ( '**' ) | ( '/' ) | ( '%' ) );
+    // InternalFormat.g:4245:1: rule__OpMulti__Alternatives : ( ( '*' ) | ( '**' ) | ( '/' ) | ( '%' ) );
     public final void rule__OpMulti__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4249:1: ( ( '*' ) | ( '**' ) | ( '/' ) | ( '%' ) )
+            // InternalFormat.g:4249:1: ( ( '*' ) | ( '**' ) | ( '/' ) | ( '%' ) )
             int alt37=4;
             switch ( input.LA(1) ) {
             case 42:
@@ -13872,15 +13872,15 @@ public final void rule__OpMulti__Alternatives() throws RecognitionException {
 
             switch (alt37) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4250:1: ( '*' )
+                    // InternalFormat.g:4250:1: ( '*' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4250:1: ( '*' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4251:1: '*'
+                    // InternalFormat.g:4250:1: ( '*' )
+                    // InternalFormat.g:4251:1: '*'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAccess().getAsteriskKeyword_0()); 
                     }
-                    match(input,42,FOLLOW_42_in_rule__OpMulti__Alternatives9214); if (state.failed) return ;
+                    match(input,42,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpMultiAccess().getAsteriskKeyword_0()); 
                     }
@@ -13891,15 +13891,15 @@ public final void rule__OpMulti__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4258:6: ( '**' )
+                    // InternalFormat.g:4258:6: ( '**' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4258:6: ( '**' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4259:1: '**'
+                    // InternalFormat.g:4258:6: ( '**' )
+                    // InternalFormat.g:4259:1: '**'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAccess().getAsteriskAsteriskKeyword_1()); 
                     }
-                    match(input,43,FOLLOW_43_in_rule__OpMulti__Alternatives9234); if (state.failed) return ;
+                    match(input,43,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpMultiAccess().getAsteriskAsteriskKeyword_1()); 
                     }
@@ -13910,15 +13910,15 @@ public final void rule__OpMulti__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4266:6: ( '/' )
+                    // InternalFormat.g:4266:6: ( '/' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4266:6: ( '/' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4267:1: '/'
+                    // InternalFormat.g:4266:6: ( '/' )
+                    // InternalFormat.g:4267:1: '/'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAccess().getSolidusKeyword_2()); 
                     }
-                    match(input,44,FOLLOW_44_in_rule__OpMulti__Alternatives9254); if (state.failed) return ;
+                    match(input,44,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpMultiAccess().getSolidusKeyword_2()); 
                     }
@@ -13929,15 +13929,15 @@ public final void rule__OpMulti__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4274:6: ( '%' )
+                    // InternalFormat.g:4274:6: ( '%' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4274:6: ( '%' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4275:1: '%'
+                    // InternalFormat.g:4274:6: ( '%' )
+                    // InternalFormat.g:4275:1: '%'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpMultiAccess().getPercentSignKeyword_3()); 
                     }
-                    match(input,45,FOLLOW_45_in_rule__OpMulti__Alternatives9274); if (state.failed) return ;
+                    match(input,45,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpMultiAccess().getPercentSignKeyword_3()); 
                     }
@@ -13965,13 +13965,13 @@ public final void rule__OpMulti__Alternatives() throws RecognitionException {
 
 
     // $ANTLR start "rule__XUnaryOperation__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4287:1: rule__XUnaryOperation__Alternatives : ( ( ( rule__XUnaryOperation__Group_0__0 ) ) | ( ruleXCastedExpression ) );
+    // InternalFormat.g:4287:1: rule__XUnaryOperation__Alternatives : ( ( ( rule__XUnaryOperation__Group_0__0 ) ) | ( ruleXCastedExpression ) );
     public final void rule__XUnaryOperation__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4291:1: ( ( ( rule__XUnaryOperation__Group_0__0 ) ) | ( ruleXCastedExpression ) )
+            // InternalFormat.g:4291:1: ( ( ( rule__XUnaryOperation__Group_0__0 ) ) | ( ruleXCastedExpression ) )
             int alt38=2;
             int LA38_0 = input.LA(1);
 
@@ -13990,18 +13990,18 @@ else if ( ((LA38_0>=RULE_INT && LA38_0<=RULE_STRING)||(LA38_0>=20 && LA38_0<=21)
             }
             switch (alt38) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4292:1: ( ( rule__XUnaryOperation__Group_0__0 ) )
+                    // InternalFormat.g:4292:1: ( ( rule__XUnaryOperation__Group_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4292:1: ( ( rule__XUnaryOperation__Group_0__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4293:1: ( rule__XUnaryOperation__Group_0__0 )
+                    // InternalFormat.g:4292:1: ( ( rule__XUnaryOperation__Group_0__0 ) )
+                    // InternalFormat.g:4293:1: ( rule__XUnaryOperation__Group_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXUnaryOperationAccess().getGroup_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4294:1: ( rule__XUnaryOperation__Group_0__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4294:2: rule__XUnaryOperation__Group_0__0
+                    // InternalFormat.g:4294:1: ( rule__XUnaryOperation__Group_0__0 )
+                    // InternalFormat.g:4294:2: rule__XUnaryOperation__Group_0__0
                     {
-                    pushFollow(FOLLOW_rule__XUnaryOperation__Group_0__0_in_rule__XUnaryOperation__Alternatives9308);
+                    pushFollow(FOLLOW_2);
                     rule__XUnaryOperation__Group_0__0();
 
                     state._fsp--;
@@ -14019,15 +14019,15 @@ else if ( ((LA38_0>=RULE_INT && LA38_0<=RULE_STRING)||(LA38_0>=20 && LA38_0<=21)
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4298:6: ( ruleXCastedExpression )
+                    // InternalFormat.g:4298:6: ( ruleXCastedExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4298:6: ( ruleXCastedExpression )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4299:1: ruleXCastedExpression
+                    // InternalFormat.g:4298:6: ( ruleXCastedExpression )
+                    // InternalFormat.g:4299:1: ruleXCastedExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXUnaryOperationAccess().getXCastedExpressionParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleXCastedExpression_in_rule__XUnaryOperation__Alternatives9326);
+                    pushFollow(FOLLOW_2);
                     ruleXCastedExpression();
 
                     state._fsp--;
@@ -14059,13 +14059,13 @@ else if ( ((LA38_0>=RULE_INT && LA38_0<=RULE_STRING)||(LA38_0>=20 && LA38_0<=21)
 
 
     // $ANTLR start "rule__OpUnary__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4309:1: rule__OpUnary__Alternatives : ( ( '!' ) | ( '-' ) | ( '+' ) );
+    // InternalFormat.g:4309:1: rule__OpUnary__Alternatives : ( ( '!' ) | ( '-' ) | ( '+' ) );
     public final void rule__OpUnary__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4313:1: ( ( '!' ) | ( '-' ) | ( '+' ) )
+            // InternalFormat.g:4313:1: ( ( '!' ) | ( '-' ) | ( '+' ) )
             int alt39=3;
             switch ( input.LA(1) ) {
             case 46:
@@ -14093,15 +14093,15 @@ public final void rule__OpUnary__Alternatives() throws RecognitionException {
 
             switch (alt39) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4314:1: ( '!' )
+                    // InternalFormat.g:4314:1: ( '!' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4314:1: ( '!' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4315:1: '!'
+                    // InternalFormat.g:4314:1: ( '!' )
+                    // InternalFormat.g:4315:1: '!'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpUnaryAccess().getExclamationMarkKeyword_0()); 
                     }
-                    match(input,46,FOLLOW_46_in_rule__OpUnary__Alternatives9359); if (state.failed) return ;
+                    match(input,46,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpUnaryAccess().getExclamationMarkKeyword_0()); 
                     }
@@ -14112,15 +14112,15 @@ public final void rule__OpUnary__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4322:6: ( '-' )
+                    // InternalFormat.g:4322:6: ( '-' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4322:6: ( '-' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4323:1: '-'
+                    // InternalFormat.g:4322:6: ( '-' )
+                    // InternalFormat.g:4323:1: '-'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpUnaryAccess().getHyphenMinusKeyword_1()); 
                     }
-                    match(input,41,FOLLOW_41_in_rule__OpUnary__Alternatives9379); if (state.failed) return ;
+                    match(input,41,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpUnaryAccess().getHyphenMinusKeyword_1()); 
                     }
@@ -14131,15 +14131,15 @@ public final void rule__OpUnary__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4330:6: ( '+' )
+                    // InternalFormat.g:4330:6: ( '+' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4330:6: ( '+' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4331:1: '+'
+                    // InternalFormat.g:4330:6: ( '+' )
+                    // InternalFormat.g:4331:1: '+'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpUnaryAccess().getPlusSignKeyword_2()); 
                     }
-                    match(input,40,FOLLOW_40_in_rule__OpUnary__Alternatives9399); if (state.failed) return ;
+                    match(input,40,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpUnaryAccess().getPlusSignKeyword_2()); 
                     }
@@ -14167,13 +14167,13 @@ public final void rule__OpUnary__Alternatives() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpPostfix__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4343:1: rule__OpPostfix__Alternatives : ( ( '++' ) | ( '--' ) );
+    // InternalFormat.g:4343:1: rule__OpPostfix__Alternatives : ( ( '++' ) | ( '--' ) );
     public final void rule__OpPostfix__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4347:1: ( ( '++' ) | ( '--' ) )
+            // InternalFormat.g:4347:1: ( ( '++' ) | ( '--' ) )
             int alt40=2;
             int LA40_0 = input.LA(1);
 
@@ -14192,15 +14192,15 @@ else if ( (LA40_0==48) ) {
             }
             switch (alt40) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4348:1: ( '++' )
+                    // InternalFormat.g:4348:1: ( '++' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4348:1: ( '++' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4349:1: '++'
+                    // InternalFormat.g:4348:1: ( '++' )
+                    // InternalFormat.g:4349:1: '++'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpPostfixAccess().getPlusSignPlusSignKeyword_0()); 
                     }
-                    match(input,47,FOLLOW_47_in_rule__OpPostfix__Alternatives9434); if (state.failed) return ;
+                    match(input,47,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpPostfixAccess().getPlusSignPlusSignKeyword_0()); 
                     }
@@ -14211,15 +14211,15 @@ else if ( (LA40_0==48) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4356:6: ( '--' )
+                    // InternalFormat.g:4356:6: ( '--' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4356:6: ( '--' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4357:1: '--'
+                    // InternalFormat.g:4356:6: ( '--' )
+                    // InternalFormat.g:4357:1: '--'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getOpPostfixAccess().getHyphenMinusHyphenMinusKeyword_1()); 
                     }
-                    match(input,48,FOLLOW_48_in_rule__OpPostfix__Alternatives9454); if (state.failed) return ;
+                    match(input,48,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getOpPostfixAccess().getHyphenMinusHyphenMinusKeyword_1()); 
                     }
@@ -14247,29 +14247,29 @@ else if ( (LA40_0==48) ) {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Alternatives_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4369:1: rule__XMemberFeatureCall__Alternatives_1 : ( ( ( rule__XMemberFeatureCall__Group_1_0__0 ) ) | ( ( rule__XMemberFeatureCall__Group_1_1__0 ) ) );
+    // InternalFormat.g:4369:1: rule__XMemberFeatureCall__Alternatives_1 : ( ( ( rule__XMemberFeatureCall__Group_1_0__0 ) ) | ( ( rule__XMemberFeatureCall__Group_1_1__0 ) ) );
     public final void rule__XMemberFeatureCall__Alternatives_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4373:1: ( ( ( rule__XMemberFeatureCall__Group_1_0__0 ) ) | ( ( rule__XMemberFeatureCall__Group_1_1__0 ) ) )
+            // InternalFormat.g:4373:1: ( ( ( rule__XMemberFeatureCall__Group_1_0__0 ) ) | ( ( rule__XMemberFeatureCall__Group_1_1__0 ) ) )
             int alt41=2;
             alt41 = dfa41.predict(input);
             switch (alt41) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4374:1: ( ( rule__XMemberFeatureCall__Group_1_0__0 ) )
+                    // InternalFormat.g:4374:1: ( ( rule__XMemberFeatureCall__Group_1_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4374:1: ( ( rule__XMemberFeatureCall__Group_1_0__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4375:1: ( rule__XMemberFeatureCall__Group_1_0__0 )
+                    // InternalFormat.g:4374:1: ( ( rule__XMemberFeatureCall__Group_1_0__0 ) )
+                    // InternalFormat.g:4375:1: ( rule__XMemberFeatureCall__Group_1_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4376:1: ( rule__XMemberFeatureCall__Group_1_0__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4376:2: rule__XMemberFeatureCall__Group_1_0__0
+                    // InternalFormat.g:4376:1: ( rule__XMemberFeatureCall__Group_1_0__0 )
+                    // InternalFormat.g:4376:2: rule__XMemberFeatureCall__Group_1_0__0
                     {
-                    pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0__0_in_rule__XMemberFeatureCall__Alternatives_19488);
+                    pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__Group_1_0__0();
 
                     state._fsp--;
@@ -14287,18 +14287,18 @@ public final void rule__XMemberFeatureCall__Alternatives_1() throws RecognitionE
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4380:6: ( ( rule__XMemberFeatureCall__Group_1_1__0 ) )
+                    // InternalFormat.g:4380:6: ( ( rule__XMemberFeatureCall__Group_1_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4380:6: ( ( rule__XMemberFeatureCall__Group_1_1__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4381:1: ( rule__XMemberFeatureCall__Group_1_1__0 )
+                    // InternalFormat.g:4380:6: ( ( rule__XMemberFeatureCall__Group_1_1__0 ) )
+                    // InternalFormat.g:4381:1: ( rule__XMemberFeatureCall__Group_1_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4382:1: ( rule__XMemberFeatureCall__Group_1_1__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4382:2: rule__XMemberFeatureCall__Group_1_1__0
+                    // InternalFormat.g:4382:1: ( rule__XMemberFeatureCall__Group_1_1__0 )
+                    // InternalFormat.g:4382:2: rule__XMemberFeatureCall__Group_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__0_in_rule__XMemberFeatureCall__Alternatives_19506);
+                    pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__Group_1_1__0();
 
                     state._fsp--;
@@ -14333,13 +14333,13 @@ public final void rule__XMemberFeatureCall__Alternatives_1() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Alternatives_1_0_0_0_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4391:1: rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 : ( ( '.' ) | ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 ) ) );
+    // InternalFormat.g:4391:1: rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 : ( ( '.' ) | ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 ) ) );
     public final void rule__XMemberFeatureCall__Alternatives_1_0_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4395:1: ( ( '.' ) | ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 ) ) )
+            // InternalFormat.g:4395:1: ( ( '.' ) | ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 ) ) )
             int alt42=2;
             int LA42_0 = input.LA(1);
 
@@ -14358,15 +14358,15 @@ else if ( (LA42_0==113) ) {
             }
             switch (alt42) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4396:1: ( '.' )
+                    // InternalFormat.g:4396:1: ( '.' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4396:1: ( '.' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4397:1: '.'
+                    // InternalFormat.g:4396:1: ( '.' )
+                    // InternalFormat.g:4397:1: '.'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXMemberFeatureCallAccess().getFullStopKeyword_1_0_0_0_1_0()); 
                     }
-                    match(input,49,FOLLOW_49_in_rule__XMemberFeatureCall__Alternatives_1_0_0_0_19540); if (state.failed) return ;
+                    match(input,49,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getXMemberFeatureCallAccess().getFullStopKeyword_1_0_0_0_1_0()); 
                     }
@@ -14377,18 +14377,18 @@ else if ( (LA42_0==113) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4404:6: ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 ) )
+                    // InternalFormat.g:4404:6: ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4404:6: ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4405:1: ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 )
+                    // InternalFormat.g:4404:6: ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 ) )
+                    // InternalFormat.g:4405:1: ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticAssignment_1_0_0_0_1_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4406:1: ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4406:2: rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1
+                    // InternalFormat.g:4406:1: ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 )
+                    // InternalFormat.g:4406:2: rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1
                     {
-                    pushFollow(FOLLOW_rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1_in_rule__XMemberFeatureCall__Alternatives_1_0_0_0_19559);
+                    pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1();
 
                     state._fsp--;
@@ -14423,13 +14423,13 @@ else if ( (LA42_0==113) ) {
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Alternatives_1_1_0_0_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4415:1: rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 : ( ( '.' ) | ( ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 ) ) | ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 ) ) );
+    // InternalFormat.g:4415:1: rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 : ( ( '.' ) | ( ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 ) ) | ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 ) ) );
     public final void rule__XMemberFeatureCall__Alternatives_1_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4419:1: ( ( '.' ) | ( ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 ) ) | ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 ) ) )
+            // InternalFormat.g:4419:1: ( ( '.' ) | ( ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 ) ) | ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 ) ) )
             int alt43=3;
             switch ( input.LA(1) ) {
             case 49:
@@ -14457,15 +14457,15 @@ public final void rule__XMemberFeatureCall__Alternatives_1_1_0_0_1() throws Reco
 
             switch (alt43) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4420:1: ( '.' )
+                    // InternalFormat.g:4420:1: ( '.' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4420:1: ( '.' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4421:1: '.'
+                    // InternalFormat.g:4420:1: ( '.' )
+                    // InternalFormat.g:4421:1: '.'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXMemberFeatureCallAccess().getFullStopKeyword_1_1_0_0_1_0()); 
                     }
-                    match(input,49,FOLLOW_49_in_rule__XMemberFeatureCall__Alternatives_1_1_0_0_19593); if (state.failed) return ;
+                    match(input,49,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getXMemberFeatureCallAccess().getFullStopKeyword_1_1_0_0_1_0()); 
                     }
@@ -14476,18 +14476,18 @@ public final void rule__XMemberFeatureCall__Alternatives_1_1_0_0_1() throws Reco
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4428:6: ( ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 ) )
+                    // InternalFormat.g:4428:6: ( ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4428:6: ( ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4429:1: ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 )
+                    // InternalFormat.g:4428:6: ( ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 ) )
+                    // InternalFormat.g:4429:1: ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXMemberFeatureCallAccess().getNullSafeAssignment_1_1_0_0_1_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4430:1: ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4430:2: rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1
+                    // InternalFormat.g:4430:1: ( rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 )
+                    // InternalFormat.g:4430:2: rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1
                     {
-                    pushFollow(FOLLOW_rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1_in_rule__XMemberFeatureCall__Alternatives_1_1_0_0_19612);
+                    pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1();
 
                     state._fsp--;
@@ -14505,18 +14505,18 @@ public final void rule__XMemberFeatureCall__Alternatives_1_1_0_0_1() throws Reco
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4434:6: ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 ) )
+                    // InternalFormat.g:4434:6: ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4434:6: ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4435:1: ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 )
+                    // InternalFormat.g:4434:6: ( ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 ) )
+                    // InternalFormat.g:4435:1: ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticAssignment_1_1_0_0_1_2()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4436:1: ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4436:2: rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2
+                    // InternalFormat.g:4436:1: ( rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 )
+                    // InternalFormat.g:4436:2: rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2
                     {
-                    pushFollow(FOLLOW_rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2_in_rule__XMemberFeatureCall__Alternatives_1_1_0_0_19630);
+                    pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2();
 
                     state._fsp--;
@@ -14551,29 +14551,29 @@ public final void rule__XMemberFeatureCall__Alternatives_1_1_0_0_1() throws Reco
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Alternatives_1_1_3_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4445:1: rule__XMemberFeatureCall__Alternatives_1_1_3_1 : ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) ) | ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 ) ) );
+    // InternalFormat.g:4445:1: rule__XMemberFeatureCall__Alternatives_1_1_3_1 : ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) ) | ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 ) ) );
     public final void rule__XMemberFeatureCall__Alternatives_1_1_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4449:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) ) | ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 ) ) )
+            // InternalFormat.g:4449:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) ) | ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 ) ) )
             int alt44=2;
             alt44 = dfa44.predict(input);
             switch (alt44) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4450:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) )
+                    // InternalFormat.g:4450:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4450:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4451:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 )
+                    // InternalFormat.g:4450:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) )
+                    // InternalFormat.g:4451:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsAssignment_1_1_3_1_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4452:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4452:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0
+                    // InternalFormat.g:4452:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 )
+                    // InternalFormat.g:4452:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0
                     {
-                    pushFollow(FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0_in_rule__XMemberFeatureCall__Alternatives_1_1_3_19663);
+                    pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0();
 
                     state._fsp--;
@@ -14591,18 +14591,18 @@ public final void rule__XMemberFeatureCall__Alternatives_1_1_3_1() throws Recogn
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4456:6: ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 ) )
+                    // InternalFormat.g:4456:6: ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4456:6: ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4457:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 )
+                    // InternalFormat.g:4456:6: ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 ) )
+                    // InternalFormat.g:4457:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1_3_1_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4458:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4458:2: rule__XMemberFeatureCall__Group_1_1_3_1_1__0
+                    // InternalFormat.g:4458:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 )
+                    // InternalFormat.g:4458:2: rule__XMemberFeatureCall__Group_1_1_3_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1__0_in_rule__XMemberFeatureCall__Alternatives_1_1_3_19681);
+                    pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__Group_1_1_3_1_1__0();
 
                     state._fsp--;
@@ -14637,26 +14637,26 @@ public final void rule__XMemberFeatureCall__Alternatives_1_1_3_1() throws Recogn
 
 
     // $ANTLR start "rule__XPrimaryExpression__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4467:1: rule__XPrimaryExpression__Alternatives : ( ( ruleXConstructorCall ) | ( ruleXBlockExpression ) | ( ruleXSwitchExpression ) | ( ( ruleXSynchronizedExpression ) ) | ( ruleXFeatureCall ) | ( ruleXLiteral ) | ( ruleXIfExpression ) | ( ( ruleXForLoopExpression ) ) | ( ruleXBasicForLoopExpression ) | ( ruleXWhileExpression ) | ( ruleXDoWhileExpression ) | ( ruleXThrowExpression ) | ( ruleXReturnExpression ) | ( ruleXTryCatchFinallyExpression ) | ( ruleXParenthesizedExpression ) );
+    // InternalFormat.g:4467:1: rule__XPrimaryExpression__Alternatives : ( ( ruleXConstructorCall ) | ( ruleXBlockExpression ) | ( ruleXSwitchExpression ) | ( ( ruleXSynchronizedExpression ) ) | ( ruleXFeatureCall ) | ( ruleXLiteral ) | ( ruleXIfExpression ) | ( ( ruleXForLoopExpression ) ) | ( ruleXBasicForLoopExpression ) | ( ruleXWhileExpression ) | ( ruleXDoWhileExpression ) | ( ruleXThrowExpression ) | ( ruleXReturnExpression ) | ( ruleXTryCatchFinallyExpression ) | ( ruleXParenthesizedExpression ) );
     public final void rule__XPrimaryExpression__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4471:1: ( ( ruleXConstructorCall ) | ( ruleXBlockExpression ) | ( ruleXSwitchExpression ) | ( ( ruleXSynchronizedExpression ) ) | ( ruleXFeatureCall ) | ( ruleXLiteral ) | ( ruleXIfExpression ) | ( ( ruleXForLoopExpression ) ) | ( ruleXBasicForLoopExpression ) | ( ruleXWhileExpression ) | ( ruleXDoWhileExpression ) | ( ruleXThrowExpression ) | ( ruleXReturnExpression ) | ( ruleXTryCatchFinallyExpression ) | ( ruleXParenthesizedExpression ) )
+            // InternalFormat.g:4471:1: ( ( ruleXConstructorCall ) | ( ruleXBlockExpression ) | ( ruleXSwitchExpression ) | ( ( ruleXSynchronizedExpression ) ) | ( ruleXFeatureCall ) | ( ruleXLiteral ) | ( ruleXIfExpression ) | ( ( ruleXForLoopExpression ) ) | ( ruleXBasicForLoopExpression ) | ( ruleXWhileExpression ) | ( ruleXDoWhileExpression ) | ( ruleXThrowExpression ) | ( ruleXReturnExpression ) | ( ruleXTryCatchFinallyExpression ) | ( ruleXParenthesizedExpression ) )
             int alt45=15;
             alt45 = dfa45.predict(input);
             switch (alt45) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4472:1: ( ruleXConstructorCall )
+                    // InternalFormat.g:4472:1: ( ruleXConstructorCall )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4472:1: ( ruleXConstructorCall )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4473:1: ruleXConstructorCall
+                    // InternalFormat.g:4472:1: ( ruleXConstructorCall )
+                    // InternalFormat.g:4473:1: ruleXConstructorCall
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXConstructorCallParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleXConstructorCall_in_rule__XPrimaryExpression__Alternatives9714);
+                    pushFollow(FOLLOW_2);
                     ruleXConstructorCall();
 
                     state._fsp--;
@@ -14671,15 +14671,15 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4478:6: ( ruleXBlockExpression )
+                    // InternalFormat.g:4478:6: ( ruleXBlockExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4478:6: ( ruleXBlockExpression )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4479:1: ruleXBlockExpression
+                    // InternalFormat.g:4478:6: ( ruleXBlockExpression )
+                    // InternalFormat.g:4479:1: ruleXBlockExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXBlockExpressionParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleXBlockExpression_in_rule__XPrimaryExpression__Alternatives9731);
+                    pushFollow(FOLLOW_2);
                     ruleXBlockExpression();
 
                     state._fsp--;
@@ -14694,15 +14694,15 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4484:6: ( ruleXSwitchExpression )
+                    // InternalFormat.g:4484:6: ( ruleXSwitchExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4484:6: ( ruleXSwitchExpression )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4485:1: ruleXSwitchExpression
+                    // InternalFormat.g:4484:6: ( ruleXSwitchExpression )
+                    // InternalFormat.g:4485:1: ruleXSwitchExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXSwitchExpressionParserRuleCall_2()); 
                     }
-                    pushFollow(FOLLOW_ruleXSwitchExpression_in_rule__XPrimaryExpression__Alternatives9748);
+                    pushFollow(FOLLOW_2);
                     ruleXSwitchExpression();
 
                     state._fsp--;
@@ -14717,18 +14717,18 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4490:6: ( ( ruleXSynchronizedExpression ) )
+                    // InternalFormat.g:4490:6: ( ( ruleXSynchronizedExpression ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4490:6: ( ( ruleXSynchronizedExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4491:1: ( ruleXSynchronizedExpression )
+                    // InternalFormat.g:4490:6: ( ( ruleXSynchronizedExpression ) )
+                    // InternalFormat.g:4491:1: ( ruleXSynchronizedExpression )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXSynchronizedExpressionParserRuleCall_3()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4492:1: ( ruleXSynchronizedExpression )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4492:3: ruleXSynchronizedExpression
+                    // InternalFormat.g:4492:1: ( ruleXSynchronizedExpression )
+                    // InternalFormat.g:4492:3: ruleXSynchronizedExpression
                     {
-                    pushFollow(FOLLOW_ruleXSynchronizedExpression_in_rule__XPrimaryExpression__Alternatives9766);
+                    pushFollow(FOLLOW_2);
                     ruleXSynchronizedExpression();
 
                     state._fsp--;
@@ -14746,15 +14746,15 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4496:6: ( ruleXFeatureCall )
+                    // InternalFormat.g:4496:6: ( ruleXFeatureCall )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4496:6: ( ruleXFeatureCall )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4497:1: ruleXFeatureCall
+                    // InternalFormat.g:4496:6: ( ruleXFeatureCall )
+                    // InternalFormat.g:4497:1: ruleXFeatureCall
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXFeatureCallParserRuleCall_4()); 
                     }
-                    pushFollow(FOLLOW_ruleXFeatureCall_in_rule__XPrimaryExpression__Alternatives9784);
+                    pushFollow(FOLLOW_2);
                     ruleXFeatureCall();
 
                     state._fsp--;
@@ -14769,15 +14769,15 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4502:6: ( ruleXLiteral )
+                    // InternalFormat.g:4502:6: ( ruleXLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4502:6: ( ruleXLiteral )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4503:1: ruleXLiteral
+                    // InternalFormat.g:4502:6: ( ruleXLiteral )
+                    // InternalFormat.g:4503:1: ruleXLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXLiteralParserRuleCall_5()); 
                     }
-                    pushFollow(FOLLOW_ruleXLiteral_in_rule__XPrimaryExpression__Alternatives9801);
+                    pushFollow(FOLLOW_2);
                     ruleXLiteral();
 
                     state._fsp--;
@@ -14792,15 +14792,15 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4508:6: ( ruleXIfExpression )
+                    // InternalFormat.g:4508:6: ( ruleXIfExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4508:6: ( ruleXIfExpression )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4509:1: ruleXIfExpression
+                    // InternalFormat.g:4508:6: ( ruleXIfExpression )
+                    // InternalFormat.g:4509:1: ruleXIfExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXIfExpressionParserRuleCall_6()); 
                     }
-                    pushFollow(FOLLOW_ruleXIfExpression_in_rule__XPrimaryExpression__Alternatives9818);
+                    pushFollow(FOLLOW_2);
                     ruleXIfExpression();
 
                     state._fsp--;
@@ -14815,18 +14815,18 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 8 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4514:6: ( ( ruleXForLoopExpression ) )
+                    // InternalFormat.g:4514:6: ( ( ruleXForLoopExpression ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4514:6: ( ( ruleXForLoopExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4515:1: ( ruleXForLoopExpression )
+                    // InternalFormat.g:4514:6: ( ( ruleXForLoopExpression ) )
+                    // InternalFormat.g:4515:1: ( ruleXForLoopExpression )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXForLoopExpressionParserRuleCall_7()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4516:1: ( ruleXForLoopExpression )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4516:3: ruleXForLoopExpression
+                    // InternalFormat.g:4516:1: ( ruleXForLoopExpression )
+                    // InternalFormat.g:4516:3: ruleXForLoopExpression
                     {
-                    pushFollow(FOLLOW_ruleXForLoopExpression_in_rule__XPrimaryExpression__Alternatives9836);
+                    pushFollow(FOLLOW_2);
                     ruleXForLoopExpression();
 
                     state._fsp--;
@@ -14844,15 +14844,15 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 9 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4520:6: ( ruleXBasicForLoopExpression )
+                    // InternalFormat.g:4520:6: ( ruleXBasicForLoopExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4520:6: ( ruleXBasicForLoopExpression )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4521:1: ruleXBasicForLoopExpression
+                    // InternalFormat.g:4520:6: ( ruleXBasicForLoopExpression )
+                    // InternalFormat.g:4521:1: ruleXBasicForLoopExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXBasicForLoopExpressionParserRuleCall_8()); 
                     }
-                    pushFollow(FOLLOW_ruleXBasicForLoopExpression_in_rule__XPrimaryExpression__Alternatives9854);
+                    pushFollow(FOLLOW_2);
                     ruleXBasicForLoopExpression();
 
                     state._fsp--;
@@ -14867,15 +14867,15 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 10 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4526:6: ( ruleXWhileExpression )
+                    // InternalFormat.g:4526:6: ( ruleXWhileExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4526:6: ( ruleXWhileExpression )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4527:1: ruleXWhileExpression
+                    // InternalFormat.g:4526:6: ( ruleXWhileExpression )
+                    // InternalFormat.g:4527:1: ruleXWhileExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXWhileExpressionParserRuleCall_9()); 
                     }
-                    pushFollow(FOLLOW_ruleXWhileExpression_in_rule__XPrimaryExpression__Alternatives9871);
+                    pushFollow(FOLLOW_2);
                     ruleXWhileExpression();
 
                     state._fsp--;
@@ -14890,15 +14890,15 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 11 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4532:6: ( ruleXDoWhileExpression )
+                    // InternalFormat.g:4532:6: ( ruleXDoWhileExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4532:6: ( ruleXDoWhileExpression )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4533:1: ruleXDoWhileExpression
+                    // InternalFormat.g:4532:6: ( ruleXDoWhileExpression )
+                    // InternalFormat.g:4533:1: ruleXDoWhileExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXDoWhileExpressionParserRuleCall_10()); 
                     }
-                    pushFollow(FOLLOW_ruleXDoWhileExpression_in_rule__XPrimaryExpression__Alternatives9888);
+                    pushFollow(FOLLOW_2);
                     ruleXDoWhileExpression();
 
                     state._fsp--;
@@ -14913,15 +14913,15 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 12 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4538:6: ( ruleXThrowExpression )
+                    // InternalFormat.g:4538:6: ( ruleXThrowExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4538:6: ( ruleXThrowExpression )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4539:1: ruleXThrowExpression
+                    // InternalFormat.g:4538:6: ( ruleXThrowExpression )
+                    // InternalFormat.g:4539:1: ruleXThrowExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXThrowExpressionParserRuleCall_11()); 
                     }
-                    pushFollow(FOLLOW_ruleXThrowExpression_in_rule__XPrimaryExpression__Alternatives9905);
+                    pushFollow(FOLLOW_2);
                     ruleXThrowExpression();
 
                     state._fsp--;
@@ -14936,15 +14936,15 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 13 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4544:6: ( ruleXReturnExpression )
+                    // InternalFormat.g:4544:6: ( ruleXReturnExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4544:6: ( ruleXReturnExpression )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4545:1: ruleXReturnExpression
+                    // InternalFormat.g:4544:6: ( ruleXReturnExpression )
+                    // InternalFormat.g:4545:1: ruleXReturnExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXReturnExpressionParserRuleCall_12()); 
                     }
-                    pushFollow(FOLLOW_ruleXReturnExpression_in_rule__XPrimaryExpression__Alternatives9922);
+                    pushFollow(FOLLOW_2);
                     ruleXReturnExpression();
 
                     state._fsp--;
@@ -14959,15 +14959,15 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 14 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4550:6: ( ruleXTryCatchFinallyExpression )
+                    // InternalFormat.g:4550:6: ( ruleXTryCatchFinallyExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4550:6: ( ruleXTryCatchFinallyExpression )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4551:1: ruleXTryCatchFinallyExpression
+                    // InternalFormat.g:4550:6: ( ruleXTryCatchFinallyExpression )
+                    // InternalFormat.g:4551:1: ruleXTryCatchFinallyExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXTryCatchFinallyExpressionParserRuleCall_13()); 
                     }
-                    pushFollow(FOLLOW_ruleXTryCatchFinallyExpression_in_rule__XPrimaryExpression__Alternatives9939);
+                    pushFollow(FOLLOW_2);
                     ruleXTryCatchFinallyExpression();
 
                     state._fsp--;
@@ -14982,15 +14982,15 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
                     }
                     break;
                 case 15 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4556:6: ( ruleXParenthesizedExpression )
+                    // InternalFormat.g:4556:6: ( ruleXParenthesizedExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4556:6: ( ruleXParenthesizedExpression )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4557:1: ruleXParenthesizedExpression
+                    // InternalFormat.g:4556:6: ( ruleXParenthesizedExpression )
+                    // InternalFormat.g:4557:1: ruleXParenthesizedExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXPrimaryExpressionAccess().getXParenthesizedExpressionParserRuleCall_14()); 
                     }
-                    pushFollow(FOLLOW_ruleXParenthesizedExpression_in_rule__XPrimaryExpression__Alternatives9956);
+                    pushFollow(FOLLOW_2);
                     ruleXParenthesizedExpression();
 
                     state._fsp--;
@@ -15022,13 +15022,13 @@ public final void rule__XPrimaryExpression__Alternatives() throws RecognitionExc
 
 
     // $ANTLR start "rule__XLiteral__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4567:1: rule__XLiteral__Alternatives : ( ( ruleXCollectionLiteral ) | ( ( ruleXClosure ) ) | ( ruleXBooleanLiteral ) | ( ruleXNumberLiteral ) | ( ruleXNullLiteral ) | ( ruleXStringLiteral ) | ( ruleXTypeLiteral ) );
+    // InternalFormat.g:4567:1: rule__XLiteral__Alternatives : ( ( ruleXCollectionLiteral ) | ( ( ruleXClosure ) ) | ( ruleXBooleanLiteral ) | ( ruleXNumberLiteral ) | ( ruleXNullLiteral ) | ( ruleXStringLiteral ) | ( ruleXTypeLiteral ) );
     public final void rule__XLiteral__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4571:1: ( ( ruleXCollectionLiteral ) | ( ( ruleXClosure ) ) | ( ruleXBooleanLiteral ) | ( ruleXNumberLiteral ) | ( ruleXNullLiteral ) | ( ruleXStringLiteral ) | ( ruleXTypeLiteral ) )
+            // InternalFormat.g:4571:1: ( ( ruleXCollectionLiteral ) | ( ( ruleXClosure ) ) | ( ruleXBooleanLiteral ) | ( ruleXNumberLiteral ) | ( ruleXNullLiteral ) | ( ruleXStringLiteral ) | ( ruleXTypeLiteral ) )
             int alt46=7;
             switch ( input.LA(1) ) {
             case 84:
@@ -15079,15 +15079,15 @@ public final void rule__XLiteral__Alternatives() throws RecognitionException {
 
             switch (alt46) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4572:1: ( ruleXCollectionLiteral )
+                    // InternalFormat.g:4572:1: ( ruleXCollectionLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4572:1: ( ruleXCollectionLiteral )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4573:1: ruleXCollectionLiteral
+                    // InternalFormat.g:4572:1: ( ruleXCollectionLiteral )
+                    // InternalFormat.g:4573:1: ruleXCollectionLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXLiteralAccess().getXCollectionLiteralParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleXCollectionLiteral_in_rule__XLiteral__Alternatives9988);
+                    pushFollow(FOLLOW_2);
                     ruleXCollectionLiteral();
 
                     state._fsp--;
@@ -15102,18 +15102,18 @@ public final void rule__XLiteral__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4578:6: ( ( ruleXClosure ) )
+                    // InternalFormat.g:4578:6: ( ( ruleXClosure ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4578:6: ( ( ruleXClosure ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4579:1: ( ruleXClosure )
+                    // InternalFormat.g:4578:6: ( ( ruleXClosure ) )
+                    // InternalFormat.g:4579:1: ( ruleXClosure )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXLiteralAccess().getXClosureParserRuleCall_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4580:1: ( ruleXClosure )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4580:3: ruleXClosure
+                    // InternalFormat.g:4580:1: ( ruleXClosure )
+                    // InternalFormat.g:4580:3: ruleXClosure
                     {
-                    pushFollow(FOLLOW_ruleXClosure_in_rule__XLiteral__Alternatives10006);
+                    pushFollow(FOLLOW_2);
                     ruleXClosure();
 
                     state._fsp--;
@@ -15131,15 +15131,15 @@ public final void rule__XLiteral__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4584:6: ( ruleXBooleanLiteral )
+                    // InternalFormat.g:4584:6: ( ruleXBooleanLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4584:6: ( ruleXBooleanLiteral )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4585:1: ruleXBooleanLiteral
+                    // InternalFormat.g:4584:6: ( ruleXBooleanLiteral )
+                    // InternalFormat.g:4585:1: ruleXBooleanLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXLiteralAccess().getXBooleanLiteralParserRuleCall_2()); 
                     }
-                    pushFollow(FOLLOW_ruleXBooleanLiteral_in_rule__XLiteral__Alternatives10024);
+                    pushFollow(FOLLOW_2);
                     ruleXBooleanLiteral();
 
                     state._fsp--;
@@ -15154,15 +15154,15 @@ public final void rule__XLiteral__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4590:6: ( ruleXNumberLiteral )
+                    // InternalFormat.g:4590:6: ( ruleXNumberLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4590:6: ( ruleXNumberLiteral )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4591:1: ruleXNumberLiteral
+                    // InternalFormat.g:4590:6: ( ruleXNumberLiteral )
+                    // InternalFormat.g:4591:1: ruleXNumberLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXLiteralAccess().getXNumberLiteralParserRuleCall_3()); 
                     }
-                    pushFollow(FOLLOW_ruleXNumberLiteral_in_rule__XLiteral__Alternatives10041);
+                    pushFollow(FOLLOW_2);
                     ruleXNumberLiteral();
 
                     state._fsp--;
@@ -15177,15 +15177,15 @@ public final void rule__XLiteral__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4596:6: ( ruleXNullLiteral )
+                    // InternalFormat.g:4596:6: ( ruleXNullLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4596:6: ( ruleXNullLiteral )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4597:1: ruleXNullLiteral
+                    // InternalFormat.g:4596:6: ( ruleXNullLiteral )
+                    // InternalFormat.g:4597:1: ruleXNullLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXLiteralAccess().getXNullLiteralParserRuleCall_4()); 
                     }
-                    pushFollow(FOLLOW_ruleXNullLiteral_in_rule__XLiteral__Alternatives10058);
+                    pushFollow(FOLLOW_2);
                     ruleXNullLiteral();
 
                     state._fsp--;
@@ -15200,15 +15200,15 @@ public final void rule__XLiteral__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4602:6: ( ruleXStringLiteral )
+                    // InternalFormat.g:4602:6: ( ruleXStringLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4602:6: ( ruleXStringLiteral )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4603:1: ruleXStringLiteral
+                    // InternalFormat.g:4602:6: ( ruleXStringLiteral )
+                    // InternalFormat.g:4603:1: ruleXStringLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXLiteralAccess().getXStringLiteralParserRuleCall_5()); 
                     }
-                    pushFollow(FOLLOW_ruleXStringLiteral_in_rule__XLiteral__Alternatives10075);
+                    pushFollow(FOLLOW_2);
                     ruleXStringLiteral();
 
                     state._fsp--;
@@ -15223,15 +15223,15 @@ public final void rule__XLiteral__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4608:6: ( ruleXTypeLiteral )
+                    // InternalFormat.g:4608:6: ( ruleXTypeLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4608:6: ( ruleXTypeLiteral )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4609:1: ruleXTypeLiteral
+                    // InternalFormat.g:4608:6: ( ruleXTypeLiteral )
+                    // InternalFormat.g:4609:1: ruleXTypeLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXLiteralAccess().getXTypeLiteralParserRuleCall_6()); 
                     }
-                    pushFollow(FOLLOW_ruleXTypeLiteral_in_rule__XLiteral__Alternatives10092);
+                    pushFollow(FOLLOW_2);
                     ruleXTypeLiteral();
 
                     state._fsp--;
@@ -15263,13 +15263,13 @@ public final void rule__XLiteral__Alternatives() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCollectionLiteral__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4619:1: rule__XCollectionLiteral__Alternatives : ( ( ruleXSetLiteral ) | ( ruleXListLiteral ) );
+    // InternalFormat.g:4619:1: rule__XCollectionLiteral__Alternatives : ( ( ruleXSetLiteral ) | ( ruleXListLiteral ) );
     public final void rule__XCollectionLiteral__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4623:1: ( ( ruleXSetLiteral ) | ( ruleXListLiteral ) )
+            // InternalFormat.g:4623:1: ( ( ruleXSetLiteral ) | ( ruleXListLiteral ) )
             int alt47=2;
             int LA47_0 = input.LA(1);
 
@@ -15299,15 +15299,15 @@ else if ( (LA47_1==69) ) {
             }
             switch (alt47) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4624:1: ( ruleXSetLiteral )
+                    // InternalFormat.g:4624:1: ( ruleXSetLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4624:1: ( ruleXSetLiteral )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4625:1: ruleXSetLiteral
+                    // InternalFormat.g:4624:1: ( ruleXSetLiteral )
+                    // InternalFormat.g:4625:1: ruleXSetLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXCollectionLiteralAccess().getXSetLiteralParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleXSetLiteral_in_rule__XCollectionLiteral__Alternatives10124);
+                    pushFollow(FOLLOW_2);
                     ruleXSetLiteral();
 
                     state._fsp--;
@@ -15322,15 +15322,15 @@ else if ( (LA47_1==69) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4630:6: ( ruleXListLiteral )
+                    // InternalFormat.g:4630:6: ( ruleXListLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4630:6: ( ruleXListLiteral )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4631:1: ruleXListLiteral
+                    // InternalFormat.g:4630:6: ( ruleXListLiteral )
+                    // InternalFormat.g:4631:1: ruleXListLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXCollectionLiteralAccess().getXListLiteralParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleXListLiteral_in_rule__XCollectionLiteral__Alternatives10141);
+                    pushFollow(FOLLOW_2);
                     ruleXListLiteral();
 
                     state._fsp--;
@@ -15362,29 +15362,29 @@ else if ( (LA47_1==69) ) {
 
 
     // $ANTLR start "rule__XSwitchExpression__Alternatives_2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4641:1: rule__XSwitchExpression__Alternatives_2 : ( ( ( rule__XSwitchExpression__Group_2_0__0 ) ) | ( ( rule__XSwitchExpression__Group_2_1__0 ) ) );
+    // InternalFormat.g:4641:1: rule__XSwitchExpression__Alternatives_2 : ( ( ( rule__XSwitchExpression__Group_2_0__0 ) ) | ( ( rule__XSwitchExpression__Group_2_1__0 ) ) );
     public final void rule__XSwitchExpression__Alternatives_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4645:1: ( ( ( rule__XSwitchExpression__Group_2_0__0 ) ) | ( ( rule__XSwitchExpression__Group_2_1__0 ) ) )
+            // InternalFormat.g:4645:1: ( ( ( rule__XSwitchExpression__Group_2_0__0 ) ) | ( ( rule__XSwitchExpression__Group_2_1__0 ) ) )
             int alt48=2;
             alt48 = dfa48.predict(input);
             switch (alt48) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4646:1: ( ( rule__XSwitchExpression__Group_2_0__0 ) )
+                    // InternalFormat.g:4646:1: ( ( rule__XSwitchExpression__Group_2_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4646:1: ( ( rule__XSwitchExpression__Group_2_0__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4647:1: ( rule__XSwitchExpression__Group_2_0__0 )
+                    // InternalFormat.g:4646:1: ( ( rule__XSwitchExpression__Group_2_0__0 ) )
+                    // InternalFormat.g:4647:1: ( rule__XSwitchExpression__Group_2_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXSwitchExpressionAccess().getGroup_2_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4648:1: ( rule__XSwitchExpression__Group_2_0__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4648:2: rule__XSwitchExpression__Group_2_0__0
+                    // InternalFormat.g:4648:1: ( rule__XSwitchExpression__Group_2_0__0 )
+                    // InternalFormat.g:4648:2: rule__XSwitchExpression__Group_2_0__0
                     {
-                    pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0__0_in_rule__XSwitchExpression__Alternatives_210173);
+                    pushFollow(FOLLOW_2);
                     rule__XSwitchExpression__Group_2_0__0();
 
                     state._fsp--;
@@ -15402,18 +15402,18 @@ public final void rule__XSwitchExpression__Alternatives_2() throws RecognitionEx
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4652:6: ( ( rule__XSwitchExpression__Group_2_1__0 ) )
+                    // InternalFormat.g:4652:6: ( ( rule__XSwitchExpression__Group_2_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4652:6: ( ( rule__XSwitchExpression__Group_2_1__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4653:1: ( rule__XSwitchExpression__Group_2_1__0 )
+                    // InternalFormat.g:4652:6: ( ( rule__XSwitchExpression__Group_2_1__0 ) )
+                    // InternalFormat.g:4653:1: ( rule__XSwitchExpression__Group_2_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXSwitchExpressionAccess().getGroup_2_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4654:1: ( rule__XSwitchExpression__Group_2_1__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4654:2: rule__XSwitchExpression__Group_2_1__0
+                    // InternalFormat.g:4654:1: ( rule__XSwitchExpression__Group_2_1__0 )
+                    // InternalFormat.g:4654:2: rule__XSwitchExpression__Group_2_1__0
                     {
-                    pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1__0_in_rule__XSwitchExpression__Alternatives_210191);
+                    pushFollow(FOLLOW_2);
                     rule__XSwitchExpression__Group_2_1__0();
 
                     state._fsp--;
@@ -15448,13 +15448,13 @@ public final void rule__XSwitchExpression__Alternatives_2() throws RecognitionEx
 
 
     // $ANTLR start "rule__XCasePart__Alternatives_3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4663:1: rule__XCasePart__Alternatives_3 : ( ( ( rule__XCasePart__Group_3_0__0 ) ) | ( ( rule__XCasePart__FallThroughAssignment_3_1 ) ) );
+    // InternalFormat.g:4663:1: rule__XCasePart__Alternatives_3 : ( ( ( rule__XCasePart__Group_3_0__0 ) ) | ( ( rule__XCasePart__FallThroughAssignment_3_1 ) ) );
     public final void rule__XCasePart__Alternatives_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4667:1: ( ( ( rule__XCasePart__Group_3_0__0 ) ) | ( ( rule__XCasePart__FallThroughAssignment_3_1 ) ) )
+            // InternalFormat.g:4667:1: ( ( ( rule__XCasePart__Group_3_0__0 ) ) | ( ( rule__XCasePart__FallThroughAssignment_3_1 ) ) )
             int alt49=2;
             int LA49_0 = input.LA(1);
 
@@ -15473,18 +15473,18 @@ else if ( (LA49_0==71) ) {
             }
             switch (alt49) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4668:1: ( ( rule__XCasePart__Group_3_0__0 ) )
+                    // InternalFormat.g:4668:1: ( ( rule__XCasePart__Group_3_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4668:1: ( ( rule__XCasePart__Group_3_0__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4669:1: ( rule__XCasePart__Group_3_0__0 )
+                    // InternalFormat.g:4668:1: ( ( rule__XCasePart__Group_3_0__0 ) )
+                    // InternalFormat.g:4669:1: ( rule__XCasePart__Group_3_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXCasePartAccess().getGroup_3_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4670:1: ( rule__XCasePart__Group_3_0__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4670:2: rule__XCasePart__Group_3_0__0
+                    // InternalFormat.g:4670:1: ( rule__XCasePart__Group_3_0__0 )
+                    // InternalFormat.g:4670:2: rule__XCasePart__Group_3_0__0
                     {
-                    pushFollow(FOLLOW_rule__XCasePart__Group_3_0__0_in_rule__XCasePart__Alternatives_310224);
+                    pushFollow(FOLLOW_2);
                     rule__XCasePart__Group_3_0__0();
 
                     state._fsp--;
@@ -15502,18 +15502,18 @@ else if ( (LA49_0==71) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4674:6: ( ( rule__XCasePart__FallThroughAssignment_3_1 ) )
+                    // InternalFormat.g:4674:6: ( ( rule__XCasePart__FallThroughAssignment_3_1 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4674:6: ( ( rule__XCasePart__FallThroughAssignment_3_1 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4675:1: ( rule__XCasePart__FallThroughAssignment_3_1 )
+                    // InternalFormat.g:4674:6: ( ( rule__XCasePart__FallThroughAssignment_3_1 ) )
+                    // InternalFormat.g:4675:1: ( rule__XCasePart__FallThroughAssignment_3_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXCasePartAccess().getFallThroughAssignment_3_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4676:1: ( rule__XCasePart__FallThroughAssignment_3_1 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4676:2: rule__XCasePart__FallThroughAssignment_3_1
+                    // InternalFormat.g:4676:1: ( rule__XCasePart__FallThroughAssignment_3_1 )
+                    // InternalFormat.g:4676:2: rule__XCasePart__FallThroughAssignment_3_1
                     {
-                    pushFollow(FOLLOW_rule__XCasePart__FallThroughAssignment_3_1_in_rule__XCasePart__Alternatives_310242);
+                    pushFollow(FOLLOW_2);
                     rule__XCasePart__FallThroughAssignment_3_1();
 
                     state._fsp--;
@@ -15548,13 +15548,13 @@ else if ( (LA49_0==71) ) {
 
 
     // $ANTLR start "rule__XExpressionOrVarDeclaration__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4685:1: rule__XExpressionOrVarDeclaration__Alternatives : ( ( ruleXVariableDeclaration ) | ( ruleXExpression ) );
+    // InternalFormat.g:4685:1: rule__XExpressionOrVarDeclaration__Alternatives : ( ( ruleXVariableDeclaration ) | ( ruleXExpression ) );
     public final void rule__XExpressionOrVarDeclaration__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4689:1: ( ( ruleXVariableDeclaration ) | ( ruleXExpression ) )
+            // InternalFormat.g:4689:1: ( ( ruleXVariableDeclaration ) | ( ruleXExpression ) )
             int alt50=2;
             int LA50_0 = input.LA(1);
 
@@ -15573,15 +15573,15 @@ else if ( ((LA50_0>=RULE_INT && LA50_0<=RULE_STRING)||(LA50_0>=20 && LA50_0<=21)
             }
             switch (alt50) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4690:1: ( ruleXVariableDeclaration )
+                    // InternalFormat.g:4690:1: ( ruleXVariableDeclaration )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4690:1: ( ruleXVariableDeclaration )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4691:1: ruleXVariableDeclaration
+                    // InternalFormat.g:4690:1: ( ruleXVariableDeclaration )
+                    // InternalFormat.g:4691:1: ruleXVariableDeclaration
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXExpressionOrVarDeclarationAccess().getXVariableDeclarationParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleXVariableDeclaration_in_rule__XExpressionOrVarDeclaration__Alternatives10275);
+                    pushFollow(FOLLOW_2);
                     ruleXVariableDeclaration();
 
                     state._fsp--;
@@ -15596,15 +15596,15 @@ else if ( ((LA50_0>=RULE_INT && LA50_0<=RULE_STRING)||(LA50_0>=20 && LA50_0<=21)
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4696:6: ( ruleXExpression )
+                    // InternalFormat.g:4696:6: ( ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4696:6: ( ruleXExpression )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4697:1: ruleXExpression
+                    // InternalFormat.g:4696:6: ( ruleXExpression )
+                    // InternalFormat.g:4697:1: ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXExpressionOrVarDeclarationAccess().getXExpressionParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_rule__XExpressionOrVarDeclaration__Alternatives10292);
+                    pushFollow(FOLLOW_2);
                     ruleXExpression();
 
                     state._fsp--;
@@ -15636,13 +15636,13 @@ else if ( ((LA50_0>=RULE_INT && LA50_0<=RULE_STRING)||(LA50_0>=20 && LA50_0<=21)
 
 
     // $ANTLR start "rule__XVariableDeclaration__Alternatives_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4707:1: rule__XVariableDeclaration__Alternatives_1 : ( ( ( rule__XVariableDeclaration__WriteableAssignment_1_0 ) ) | ( 'val' ) );
+    // InternalFormat.g:4707:1: rule__XVariableDeclaration__Alternatives_1 : ( ( ( rule__XVariableDeclaration__WriteableAssignment_1_0 ) ) | ( 'val' ) );
     public final void rule__XVariableDeclaration__Alternatives_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4711:1: ( ( ( rule__XVariableDeclaration__WriteableAssignment_1_0 ) ) | ( 'val' ) )
+            // InternalFormat.g:4711:1: ( ( ( rule__XVariableDeclaration__WriteableAssignment_1_0 ) ) | ( 'val' ) )
             int alt51=2;
             int LA51_0 = input.LA(1);
 
@@ -15661,18 +15661,18 @@ else if ( (LA51_0==19) ) {
             }
             switch (alt51) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4712:1: ( ( rule__XVariableDeclaration__WriteableAssignment_1_0 ) )
+                    // InternalFormat.g:4712:1: ( ( rule__XVariableDeclaration__WriteableAssignment_1_0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4712:1: ( ( rule__XVariableDeclaration__WriteableAssignment_1_0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4713:1: ( rule__XVariableDeclaration__WriteableAssignment_1_0 )
+                    // InternalFormat.g:4712:1: ( ( rule__XVariableDeclaration__WriteableAssignment_1_0 ) )
+                    // InternalFormat.g:4713:1: ( rule__XVariableDeclaration__WriteableAssignment_1_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXVariableDeclarationAccess().getWriteableAssignment_1_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4714:1: ( rule__XVariableDeclaration__WriteableAssignment_1_0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4714:2: rule__XVariableDeclaration__WriteableAssignment_1_0
+                    // InternalFormat.g:4714:1: ( rule__XVariableDeclaration__WriteableAssignment_1_0 )
+                    // InternalFormat.g:4714:2: rule__XVariableDeclaration__WriteableAssignment_1_0
                     {
-                    pushFollow(FOLLOW_rule__XVariableDeclaration__WriteableAssignment_1_0_in_rule__XVariableDeclaration__Alternatives_110324);
+                    pushFollow(FOLLOW_2);
                     rule__XVariableDeclaration__WriteableAssignment_1_0();
 
                     state._fsp--;
@@ -15690,15 +15690,15 @@ else if ( (LA51_0==19) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4718:6: ( 'val' )
+                    // InternalFormat.g:4718:6: ( 'val' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4718:6: ( 'val' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4719:1: 'val'
+                    // InternalFormat.g:4718:6: ( 'val' )
+                    // InternalFormat.g:4719:1: 'val'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXVariableDeclarationAccess().getValKeyword_1_1()); 
                     }
-                    match(input,19,FOLLOW_19_in_rule__XVariableDeclaration__Alternatives_110343); if (state.failed) return ;
+                    match(input,19,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getXVariableDeclarationAccess().getValKeyword_1_1()); 
                     }
@@ -15726,13 +15726,13 @@ else if ( (LA51_0==19) ) {
 
 
     // $ANTLR start "rule__XVariableDeclaration__Alternatives_2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4731:1: rule__XVariableDeclaration__Alternatives_2 : ( ( ( rule__XVariableDeclaration__Group_2_0__0 ) ) | ( ( rule__XVariableDeclaration__NameAssignment_2_1 ) ) );
+    // InternalFormat.g:4731:1: rule__XVariableDeclaration__Alternatives_2 : ( ( ( rule__XVariableDeclaration__Group_2_0__0 ) ) | ( ( rule__XVariableDeclaration__NameAssignment_2_1 ) ) );
     public final void rule__XVariableDeclaration__Alternatives_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4735:1: ( ( ( rule__XVariableDeclaration__Group_2_0__0 ) ) | ( ( rule__XVariableDeclaration__NameAssignment_2_1 ) ) )
+            // InternalFormat.g:4735:1: ( ( ( rule__XVariableDeclaration__Group_2_0__0 ) ) | ( ( rule__XVariableDeclaration__NameAssignment_2_1 ) ) )
             int alt52=2;
             switch ( input.LA(1) ) {
             case 20:
@@ -15808,18 +15808,18 @@ else if ( (true) ) {
 
             switch (alt52) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4736:1: ( ( rule__XVariableDeclaration__Group_2_0__0 ) )
+                    // InternalFormat.g:4736:1: ( ( rule__XVariableDeclaration__Group_2_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4736:1: ( ( rule__XVariableDeclaration__Group_2_0__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4737:1: ( rule__XVariableDeclaration__Group_2_0__0 )
+                    // InternalFormat.g:4736:1: ( ( rule__XVariableDeclaration__Group_2_0__0 ) )
+                    // InternalFormat.g:4737:1: ( rule__XVariableDeclaration__Group_2_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXVariableDeclarationAccess().getGroup_2_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4738:1: ( rule__XVariableDeclaration__Group_2_0__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4738:2: rule__XVariableDeclaration__Group_2_0__0
+                    // InternalFormat.g:4738:1: ( rule__XVariableDeclaration__Group_2_0__0 )
+                    // InternalFormat.g:4738:2: rule__XVariableDeclaration__Group_2_0__0
                     {
-                    pushFollow(FOLLOW_rule__XVariableDeclaration__Group_2_0__0_in_rule__XVariableDeclaration__Alternatives_210377);
+                    pushFollow(FOLLOW_2);
                     rule__XVariableDeclaration__Group_2_0__0();
 
                     state._fsp--;
@@ -15837,18 +15837,18 @@ else if ( (true) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4742:6: ( ( rule__XVariableDeclaration__NameAssignment_2_1 ) )
+                    // InternalFormat.g:4742:6: ( ( rule__XVariableDeclaration__NameAssignment_2_1 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4742:6: ( ( rule__XVariableDeclaration__NameAssignment_2_1 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4743:1: ( rule__XVariableDeclaration__NameAssignment_2_1 )
+                    // InternalFormat.g:4742:6: ( ( rule__XVariableDeclaration__NameAssignment_2_1 ) )
+                    // InternalFormat.g:4743:1: ( rule__XVariableDeclaration__NameAssignment_2_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXVariableDeclarationAccess().getNameAssignment_2_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4744:1: ( rule__XVariableDeclaration__NameAssignment_2_1 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4744:2: rule__XVariableDeclaration__NameAssignment_2_1
+                    // InternalFormat.g:4744:1: ( rule__XVariableDeclaration__NameAssignment_2_1 )
+                    // InternalFormat.g:4744:2: rule__XVariableDeclaration__NameAssignment_2_1
                     {
-                    pushFollow(FOLLOW_rule__XVariableDeclaration__NameAssignment_2_1_in_rule__XVariableDeclaration__Alternatives_210395);
+                    pushFollow(FOLLOW_2);
                     rule__XVariableDeclaration__NameAssignment_2_1();
 
                     state._fsp--;
@@ -15883,29 +15883,29 @@ else if ( (true) ) {
 
 
     // $ANTLR start "rule__XFeatureCall__Alternatives_3_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4753:1: rule__XFeatureCall__Alternatives_3_1 : ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) ) | ( ( rule__XFeatureCall__Group_3_1_1__0 ) ) );
+    // InternalFormat.g:4753:1: rule__XFeatureCall__Alternatives_3_1 : ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) ) | ( ( rule__XFeatureCall__Group_3_1_1__0 ) ) );
     public final void rule__XFeatureCall__Alternatives_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4757:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) ) | ( ( rule__XFeatureCall__Group_3_1_1__0 ) ) )
+            // InternalFormat.g:4757:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) ) | ( ( rule__XFeatureCall__Group_3_1_1__0 ) ) )
             int alt53=2;
             alt53 = dfa53.predict(input);
             switch (alt53) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4758:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) )
+                    // InternalFormat.g:4758:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4758:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4759:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 )
+                    // InternalFormat.g:4758:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) )
+                    // InternalFormat.g:4759:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsAssignment_3_1_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4760:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4760:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0
+                    // InternalFormat.g:4760:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 )
+                    // InternalFormat.g:4760:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0
                     {
-                    pushFollow(FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0_in_rule__XFeatureCall__Alternatives_3_110428);
+                    pushFollow(FOLLOW_2);
                     rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0();
 
                     state._fsp--;
@@ -15923,18 +15923,18 @@ public final void rule__XFeatureCall__Alternatives_3_1() throws RecognitionExcep
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4764:6: ( ( rule__XFeatureCall__Group_3_1_1__0 ) )
+                    // InternalFormat.g:4764:6: ( ( rule__XFeatureCall__Group_3_1_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4764:6: ( ( rule__XFeatureCall__Group_3_1_1__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4765:1: ( rule__XFeatureCall__Group_3_1_1__0 )
+                    // InternalFormat.g:4764:6: ( ( rule__XFeatureCall__Group_3_1_1__0 ) )
+                    // InternalFormat.g:4765:1: ( rule__XFeatureCall__Group_3_1_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXFeatureCallAccess().getGroup_3_1_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4766:1: ( rule__XFeatureCall__Group_3_1_1__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4766:2: rule__XFeatureCall__Group_3_1_1__0
+                    // InternalFormat.g:4766:1: ( rule__XFeatureCall__Group_3_1_1__0 )
+                    // InternalFormat.g:4766:2: rule__XFeatureCall__Group_3_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__XFeatureCall__Group_3_1_1__0_in_rule__XFeatureCall__Alternatives_3_110446);
+                    pushFollow(FOLLOW_2);
                     rule__XFeatureCall__Group_3_1_1__0();
 
                     state._fsp--;
@@ -15969,13 +15969,13 @@ public final void rule__XFeatureCall__Alternatives_3_1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__FeatureCallID__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4775:1: rule__FeatureCallID__Alternatives : ( ( ruleValidID ) | ( 'extends' ) | ( 'static' ) | ( 'import' ) | ( 'extension' ) );
+    // InternalFormat.g:4775:1: rule__FeatureCallID__Alternatives : ( ( ruleValidID ) | ( 'extends' ) | ( 'static' ) | ( 'import' ) | ( 'extension' ) );
     public final void rule__FeatureCallID__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4779:1: ( ( ruleValidID ) | ( 'extends' ) | ( 'static' ) | ( 'import' ) | ( 'extension' ) )
+            // InternalFormat.g:4779:1: ( ( ruleValidID ) | ( 'extends' ) | ( 'static' ) | ( 'import' ) | ( 'extension' ) )
             int alt54=5;
             switch ( input.LA(1) ) {
             case RULE_ID:
@@ -16015,15 +16015,15 @@ public final void rule__FeatureCallID__Alternatives() throws RecognitionExceptio
 
             switch (alt54) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4780:1: ( ruleValidID )
+                    // InternalFormat.g:4780:1: ( ruleValidID )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4780:1: ( ruleValidID )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4781:1: ruleValidID
+                    // InternalFormat.g:4780:1: ( ruleValidID )
+                    // InternalFormat.g:4781:1: ruleValidID
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallIDAccess().getValidIDParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleValidID_in_rule__FeatureCallID__Alternatives10479);
+                    pushFollow(FOLLOW_2);
                     ruleValidID();
 
                     state._fsp--;
@@ -16038,15 +16038,15 @@ public final void rule__FeatureCallID__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4786:6: ( 'extends' )
+                    // InternalFormat.g:4786:6: ( 'extends' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4786:6: ( 'extends' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4787:1: 'extends'
+                    // InternalFormat.g:4786:6: ( 'extends' )
+                    // InternalFormat.g:4787:1: 'extends'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallIDAccess().getExtendsKeyword_1()); 
                     }
-                    match(input,50,FOLLOW_50_in_rule__FeatureCallID__Alternatives10497); if (state.failed) return ;
+                    match(input,50,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getFeatureCallIDAccess().getExtendsKeyword_1()); 
                     }
@@ -16057,15 +16057,15 @@ public final void rule__FeatureCallID__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4794:6: ( 'static' )
+                    // InternalFormat.g:4794:6: ( 'static' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4794:6: ( 'static' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4795:1: 'static'
+                    // InternalFormat.g:4794:6: ( 'static' )
+                    // InternalFormat.g:4795:1: 'static'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallIDAccess().getStaticKeyword_2()); 
                     }
-                    match(input,51,FOLLOW_51_in_rule__FeatureCallID__Alternatives10517); if (state.failed) return ;
+                    match(input,51,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getFeatureCallIDAccess().getStaticKeyword_2()); 
                     }
@@ -16076,15 +16076,15 @@ public final void rule__FeatureCallID__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4802:6: ( 'import' )
+                    // InternalFormat.g:4802:6: ( 'import' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4802:6: ( 'import' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4803:1: 'import'
+                    // InternalFormat.g:4802:6: ( 'import' )
+                    // InternalFormat.g:4803:1: 'import'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallIDAccess().getImportKeyword_3()); 
                     }
-                    match(input,52,FOLLOW_52_in_rule__FeatureCallID__Alternatives10537); if (state.failed) return ;
+                    match(input,52,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getFeatureCallIDAccess().getImportKeyword_3()); 
                     }
@@ -16095,15 +16095,15 @@ public final void rule__FeatureCallID__Alternatives() throws RecognitionExceptio
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4810:6: ( 'extension' )
+                    // InternalFormat.g:4810:6: ( 'extension' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4810:6: ( 'extension' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4811:1: 'extension'
+                    // InternalFormat.g:4810:6: ( 'extension' )
+                    // InternalFormat.g:4811:1: 'extension'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallIDAccess().getExtensionKeyword_4()); 
                     }
-                    match(input,53,FOLLOW_53_in_rule__FeatureCallID__Alternatives10557); if (state.failed) return ;
+                    match(input,53,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getFeatureCallIDAccess().getExtensionKeyword_4()); 
                     }
@@ -16131,13 +16131,13 @@ public final void rule__FeatureCallID__Alternatives() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__IdOrSuper__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4823:1: rule__IdOrSuper__Alternatives : ( ( ruleFeatureCallID ) | ( 'super' ) );
+    // InternalFormat.g:4823:1: rule__IdOrSuper__Alternatives : ( ( ruleFeatureCallID ) | ( 'super' ) );
     public final void rule__IdOrSuper__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4827:1: ( ( ruleFeatureCallID ) | ( 'super' ) )
+            // InternalFormat.g:4827:1: ( ( ruleFeatureCallID ) | ( 'super' ) )
             int alt55=2;
             int LA55_0 = input.LA(1);
 
@@ -16156,15 +16156,15 @@ else if ( (LA55_0==54) ) {
             }
             switch (alt55) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4828:1: ( ruleFeatureCallID )
+                    // InternalFormat.g:4828:1: ( ruleFeatureCallID )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4828:1: ( ruleFeatureCallID )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4829:1: ruleFeatureCallID
+                    // InternalFormat.g:4828:1: ( ruleFeatureCallID )
+                    // InternalFormat.g:4829:1: ruleFeatureCallID
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getIdOrSuperAccess().getFeatureCallIDParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleFeatureCallID_in_rule__IdOrSuper__Alternatives10591);
+                    pushFollow(FOLLOW_2);
                     ruleFeatureCallID();
 
                     state._fsp--;
@@ -16179,15 +16179,15 @@ else if ( (LA55_0==54) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4834:6: ( 'super' )
+                    // InternalFormat.g:4834:6: ( 'super' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4834:6: ( 'super' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4835:1: 'super'
+                    // InternalFormat.g:4834:6: ( 'super' )
+                    // InternalFormat.g:4835:1: 'super'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getIdOrSuperAccess().getSuperKeyword_1()); 
                     }
-                    match(input,54,FOLLOW_54_in_rule__IdOrSuper__Alternatives10609); if (state.failed) return ;
+                    match(input,54,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getIdOrSuperAccess().getSuperKeyword_1()); 
                     }
@@ -16215,29 +16215,29 @@ else if ( (LA55_0==54) ) {
 
 
     // $ANTLR start "rule__XConstructorCall__Alternatives_4_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4847:1: rule__XConstructorCall__Alternatives_4_1 : ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) ) | ( ( rule__XConstructorCall__Group_4_1_1__0 ) ) );
+    // InternalFormat.g:4847:1: rule__XConstructorCall__Alternatives_4_1 : ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) ) | ( ( rule__XConstructorCall__Group_4_1_1__0 ) ) );
     public final void rule__XConstructorCall__Alternatives_4_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4851:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) ) | ( ( rule__XConstructorCall__Group_4_1_1__0 ) ) )
+            // InternalFormat.g:4851:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) ) | ( ( rule__XConstructorCall__Group_4_1_1__0 ) ) )
             int alt56=2;
             alt56 = dfa56.predict(input);
             switch (alt56) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4852:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) )
+                    // InternalFormat.g:4852:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4852:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4853:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 )
+                    // InternalFormat.g:4852:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) )
+                    // InternalFormat.g:4853:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXConstructorCallAccess().getArgumentsAssignment_4_1_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4854:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4854:2: rule__XConstructorCall__ArgumentsAssignment_4_1_0
+                    // InternalFormat.g:4854:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 )
+                    // InternalFormat.g:4854:2: rule__XConstructorCall__ArgumentsAssignment_4_1_0
                     {
-                    pushFollow(FOLLOW_rule__XConstructorCall__ArgumentsAssignment_4_1_0_in_rule__XConstructorCall__Alternatives_4_110643);
+                    pushFollow(FOLLOW_2);
                     rule__XConstructorCall__ArgumentsAssignment_4_1_0();
 
                     state._fsp--;
@@ -16255,18 +16255,18 @@ public final void rule__XConstructorCall__Alternatives_4_1() throws RecognitionE
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4858:6: ( ( rule__XConstructorCall__Group_4_1_1__0 ) )
+                    // InternalFormat.g:4858:6: ( ( rule__XConstructorCall__Group_4_1_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4858:6: ( ( rule__XConstructorCall__Group_4_1_1__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4859:1: ( rule__XConstructorCall__Group_4_1_1__0 )
+                    // InternalFormat.g:4858:6: ( ( rule__XConstructorCall__Group_4_1_1__0 ) )
+                    // InternalFormat.g:4859:1: ( rule__XConstructorCall__Group_4_1_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXConstructorCallAccess().getGroup_4_1_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4860:1: ( rule__XConstructorCall__Group_4_1_1__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4860:2: rule__XConstructorCall__Group_4_1_1__0
+                    // InternalFormat.g:4860:1: ( rule__XConstructorCall__Group_4_1_1__0 )
+                    // InternalFormat.g:4860:2: rule__XConstructorCall__Group_4_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__XConstructorCall__Group_4_1_1__0_in_rule__XConstructorCall__Alternatives_4_110661);
+                    pushFollow(FOLLOW_2);
                     rule__XConstructorCall__Group_4_1_1__0();
 
                     state._fsp--;
@@ -16301,13 +16301,13 @@ public final void rule__XConstructorCall__Alternatives_4_1() throws RecognitionE
 
 
     // $ANTLR start "rule__XBooleanLiteral__Alternatives_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4869:1: rule__XBooleanLiteral__Alternatives_1 : ( ( 'false' ) | ( ( rule__XBooleanLiteral__IsTrueAssignment_1_1 ) ) );
+    // InternalFormat.g:4869:1: rule__XBooleanLiteral__Alternatives_1 : ( ( 'false' ) | ( ( rule__XBooleanLiteral__IsTrueAssignment_1_1 ) ) );
     public final void rule__XBooleanLiteral__Alternatives_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4873:1: ( ( 'false' ) | ( ( rule__XBooleanLiteral__IsTrueAssignment_1_1 ) ) )
+            // InternalFormat.g:4873:1: ( ( 'false' ) | ( ( rule__XBooleanLiteral__IsTrueAssignment_1_1 ) ) )
             int alt57=2;
             int LA57_0 = input.LA(1);
 
@@ -16326,15 +16326,15 @@ else if ( (LA57_0==117) ) {
             }
             switch (alt57) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4874:1: ( 'false' )
+                    // InternalFormat.g:4874:1: ( 'false' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4874:1: ( 'false' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4875:1: 'false'
+                    // InternalFormat.g:4874:1: ( 'false' )
+                    // InternalFormat.g:4875:1: 'false'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXBooleanLiteralAccess().getFalseKeyword_1_0()); 
                     }
-                    match(input,55,FOLLOW_55_in_rule__XBooleanLiteral__Alternatives_110695); if (state.failed) return ;
+                    match(input,55,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getXBooleanLiteralAccess().getFalseKeyword_1_0()); 
                     }
@@ -16345,18 +16345,18 @@ else if ( (LA57_0==117) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4882:6: ( ( rule__XBooleanLiteral__IsTrueAssignment_1_1 ) )
+                    // InternalFormat.g:4882:6: ( ( rule__XBooleanLiteral__IsTrueAssignment_1_1 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4882:6: ( ( rule__XBooleanLiteral__IsTrueAssignment_1_1 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4883:1: ( rule__XBooleanLiteral__IsTrueAssignment_1_1 )
+                    // InternalFormat.g:4882:6: ( ( rule__XBooleanLiteral__IsTrueAssignment_1_1 ) )
+                    // InternalFormat.g:4883:1: ( rule__XBooleanLiteral__IsTrueAssignment_1_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXBooleanLiteralAccess().getIsTrueAssignment_1_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4884:1: ( rule__XBooleanLiteral__IsTrueAssignment_1_1 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4884:2: rule__XBooleanLiteral__IsTrueAssignment_1_1
+                    // InternalFormat.g:4884:1: ( rule__XBooleanLiteral__IsTrueAssignment_1_1 )
+                    // InternalFormat.g:4884:2: rule__XBooleanLiteral__IsTrueAssignment_1_1
                     {
-                    pushFollow(FOLLOW_rule__XBooleanLiteral__IsTrueAssignment_1_1_in_rule__XBooleanLiteral__Alternatives_110714);
+                    pushFollow(FOLLOW_2);
                     rule__XBooleanLiteral__IsTrueAssignment_1_1();
 
                     state._fsp--;
@@ -16391,13 +16391,13 @@ else if ( (LA57_0==117) ) {
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Alternatives_3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4893:1: rule__XTryCatchFinallyExpression__Alternatives_3 : ( ( ( rule__XTryCatchFinallyExpression__Group_3_0__0 ) ) | ( ( rule__XTryCatchFinallyExpression__Group_3_1__0 ) ) );
+    // InternalFormat.g:4893:1: rule__XTryCatchFinallyExpression__Alternatives_3 : ( ( ( rule__XTryCatchFinallyExpression__Group_3_0__0 ) ) | ( ( rule__XTryCatchFinallyExpression__Group_3_1__0 ) ) );
     public final void rule__XTryCatchFinallyExpression__Alternatives_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4897:1: ( ( ( rule__XTryCatchFinallyExpression__Group_3_0__0 ) ) | ( ( rule__XTryCatchFinallyExpression__Group_3_1__0 ) ) )
+            // InternalFormat.g:4897:1: ( ( ( rule__XTryCatchFinallyExpression__Group_3_0__0 ) ) | ( ( rule__XTryCatchFinallyExpression__Group_3_1__0 ) ) )
             int alt58=2;
             int LA58_0 = input.LA(1);
 
@@ -16416,18 +16416,18 @@ else if ( (LA58_0==99) ) {
             }
             switch (alt58) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4898:1: ( ( rule__XTryCatchFinallyExpression__Group_3_0__0 ) )
+                    // InternalFormat.g:4898:1: ( ( rule__XTryCatchFinallyExpression__Group_3_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4898:1: ( ( rule__XTryCatchFinallyExpression__Group_3_0__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4899:1: ( rule__XTryCatchFinallyExpression__Group_3_0__0 )
+                    // InternalFormat.g:4898:1: ( ( rule__XTryCatchFinallyExpression__Group_3_0__0 ) )
+                    // InternalFormat.g:4899:1: ( rule__XTryCatchFinallyExpression__Group_3_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXTryCatchFinallyExpressionAccess().getGroup_3_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4900:1: ( rule__XTryCatchFinallyExpression__Group_3_0__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4900:2: rule__XTryCatchFinallyExpression__Group_3_0__0
+                    // InternalFormat.g:4900:1: ( rule__XTryCatchFinallyExpression__Group_3_0__0 )
+                    // InternalFormat.g:4900:2: rule__XTryCatchFinallyExpression__Group_3_0__0
                     {
-                    pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0__0_in_rule__XTryCatchFinallyExpression__Alternatives_310747);
+                    pushFollow(FOLLOW_2);
                     rule__XTryCatchFinallyExpression__Group_3_0__0();
 
                     state._fsp--;
@@ -16445,18 +16445,18 @@ else if ( (LA58_0==99) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4904:6: ( ( rule__XTryCatchFinallyExpression__Group_3_1__0 ) )
+                    // InternalFormat.g:4904:6: ( ( rule__XTryCatchFinallyExpression__Group_3_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4904:6: ( ( rule__XTryCatchFinallyExpression__Group_3_1__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4905:1: ( rule__XTryCatchFinallyExpression__Group_3_1__0 )
+                    // InternalFormat.g:4904:6: ( ( rule__XTryCatchFinallyExpression__Group_3_1__0 ) )
+                    // InternalFormat.g:4905:1: ( rule__XTryCatchFinallyExpression__Group_3_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXTryCatchFinallyExpressionAccess().getGroup_3_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4906:1: ( rule__XTryCatchFinallyExpression__Group_3_1__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4906:2: rule__XTryCatchFinallyExpression__Group_3_1__0
+                    // InternalFormat.g:4906:1: ( rule__XTryCatchFinallyExpression__Group_3_1__0 )
+                    // InternalFormat.g:4906:2: rule__XTryCatchFinallyExpression__Group_3_1__0
                     {
-                    pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_1__0_in_rule__XTryCatchFinallyExpression__Alternatives_310765);
+                    pushFollow(FOLLOW_2);
                     rule__XTryCatchFinallyExpression__Group_3_1__0();
 
                     state._fsp--;
@@ -16491,13 +16491,13 @@ else if ( (LA58_0==99) ) {
 
 
     // $ANTLR start "rule__Number__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4915:1: rule__Number__Alternatives : ( ( RULE_HEX ) | ( ( rule__Number__Group_1__0 ) ) );
+    // InternalFormat.g:4915:1: rule__Number__Alternatives : ( ( RULE_HEX ) | ( ( rule__Number__Group_1__0 ) ) );
     public final void rule__Number__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4919:1: ( ( RULE_HEX ) | ( ( rule__Number__Group_1__0 ) ) )
+            // InternalFormat.g:4919:1: ( ( RULE_HEX ) | ( ( rule__Number__Group_1__0 ) ) )
             int alt59=2;
             int LA59_0 = input.LA(1);
 
@@ -16516,15 +16516,15 @@ else if ( (LA59_0==RULE_INT||LA59_0==RULE_DECIMAL) ) {
             }
             switch (alt59) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4920:1: ( RULE_HEX )
+                    // InternalFormat.g:4920:1: ( RULE_HEX )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4920:1: ( RULE_HEX )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4921:1: RULE_HEX
+                    // InternalFormat.g:4920:1: ( RULE_HEX )
+                    // InternalFormat.g:4921:1: RULE_HEX
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getNumberAccess().getHEXTerminalRuleCall_0()); 
                     }
-                    match(input,RULE_HEX,FOLLOW_RULE_HEX_in_rule__Number__Alternatives10798); if (state.failed) return ;
+                    match(input,RULE_HEX,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getNumberAccess().getHEXTerminalRuleCall_0()); 
                     }
@@ -16535,18 +16535,18 @@ else if ( (LA59_0==RULE_INT||LA59_0==RULE_DECIMAL) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4926:6: ( ( rule__Number__Group_1__0 ) )
+                    // InternalFormat.g:4926:6: ( ( rule__Number__Group_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4926:6: ( ( rule__Number__Group_1__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4927:1: ( rule__Number__Group_1__0 )
+                    // InternalFormat.g:4926:6: ( ( rule__Number__Group_1__0 ) )
+                    // InternalFormat.g:4927:1: ( rule__Number__Group_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getNumberAccess().getGroup_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4928:1: ( rule__Number__Group_1__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4928:2: rule__Number__Group_1__0
+                    // InternalFormat.g:4928:1: ( rule__Number__Group_1__0 )
+                    // InternalFormat.g:4928:2: rule__Number__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__Number__Group_1__0_in_rule__Number__Alternatives10815);
+                    pushFollow(FOLLOW_2);
                     rule__Number__Group_1__0();
 
                     state._fsp--;
@@ -16581,13 +16581,13 @@ else if ( (LA59_0==RULE_INT||LA59_0==RULE_DECIMAL) ) {
 
 
     // $ANTLR start "rule__Number__Alternatives_1_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4937:1: rule__Number__Alternatives_1_0 : ( ( RULE_INT ) | ( RULE_DECIMAL ) );
+    // InternalFormat.g:4937:1: rule__Number__Alternatives_1_0 : ( ( RULE_INT ) | ( RULE_DECIMAL ) );
     public final void rule__Number__Alternatives_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4941:1: ( ( RULE_INT ) | ( RULE_DECIMAL ) )
+            // InternalFormat.g:4941:1: ( ( RULE_INT ) | ( RULE_DECIMAL ) )
             int alt60=2;
             int LA60_0 = input.LA(1);
 
@@ -16606,15 +16606,15 @@ else if ( (LA60_0==RULE_DECIMAL) ) {
             }
             switch (alt60) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4942:1: ( RULE_INT )
+                    // InternalFormat.g:4942:1: ( RULE_INT )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4942:1: ( RULE_INT )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4943:1: RULE_INT
+                    // InternalFormat.g:4942:1: ( RULE_INT )
+                    // InternalFormat.g:4943:1: RULE_INT
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getNumberAccess().getINTTerminalRuleCall_1_0_0()); 
                     }
-                    match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__Number__Alternatives_1_010848); if (state.failed) return ;
+                    match(input,RULE_INT,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getNumberAccess().getINTTerminalRuleCall_1_0_0()); 
                     }
@@ -16625,15 +16625,15 @@ else if ( (LA60_0==RULE_DECIMAL) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4948:6: ( RULE_DECIMAL )
+                    // InternalFormat.g:4948:6: ( RULE_DECIMAL )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4948:6: ( RULE_DECIMAL )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4949:1: RULE_DECIMAL
+                    // InternalFormat.g:4948:6: ( RULE_DECIMAL )
+                    // InternalFormat.g:4949:1: RULE_DECIMAL
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getNumberAccess().getDECIMALTerminalRuleCall_1_0_1()); 
                     }
-                    match(input,RULE_DECIMAL,FOLLOW_RULE_DECIMAL_in_rule__Number__Alternatives_1_010865); if (state.failed) return ;
+                    match(input,RULE_DECIMAL,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getNumberAccess().getDECIMALTerminalRuleCall_1_0_1()); 
                     }
@@ -16661,13 +16661,13 @@ else if ( (LA60_0==RULE_DECIMAL) ) {
 
 
     // $ANTLR start "rule__Number__Alternatives_1_1_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4959:1: rule__Number__Alternatives_1_1_1 : ( ( RULE_INT ) | ( RULE_DECIMAL ) );
+    // InternalFormat.g:4959:1: rule__Number__Alternatives_1_1_1 : ( ( RULE_INT ) | ( RULE_DECIMAL ) );
     public final void rule__Number__Alternatives_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4963:1: ( ( RULE_INT ) | ( RULE_DECIMAL ) )
+            // InternalFormat.g:4963:1: ( ( RULE_INT ) | ( RULE_DECIMAL ) )
             int alt61=2;
             int LA61_0 = input.LA(1);
 
@@ -16686,15 +16686,15 @@ else if ( (LA61_0==RULE_DECIMAL) ) {
             }
             switch (alt61) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4964:1: ( RULE_INT )
+                    // InternalFormat.g:4964:1: ( RULE_INT )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4964:1: ( RULE_INT )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4965:1: RULE_INT
+                    // InternalFormat.g:4964:1: ( RULE_INT )
+                    // InternalFormat.g:4965:1: RULE_INT
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getNumberAccess().getINTTerminalRuleCall_1_1_1_0()); 
                     }
-                    match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__Number__Alternatives_1_1_110897); if (state.failed) return ;
+                    match(input,RULE_INT,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getNumberAccess().getINTTerminalRuleCall_1_1_1_0()); 
                     }
@@ -16705,15 +16705,15 @@ else if ( (LA61_0==RULE_DECIMAL) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4970:6: ( RULE_DECIMAL )
+                    // InternalFormat.g:4970:6: ( RULE_DECIMAL )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4970:6: ( RULE_DECIMAL )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4971:1: RULE_DECIMAL
+                    // InternalFormat.g:4970:6: ( RULE_DECIMAL )
+                    // InternalFormat.g:4971:1: RULE_DECIMAL
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getNumberAccess().getDECIMALTerminalRuleCall_1_1_1_1()); 
                     }
-                    match(input,RULE_DECIMAL,FOLLOW_RULE_DECIMAL_in_rule__Number__Alternatives_1_1_110914); if (state.failed) return ;
+                    match(input,RULE_DECIMAL,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getNumberAccess().getDECIMALTerminalRuleCall_1_1_1_1()); 
                     }
@@ -16741,13 +16741,13 @@ else if ( (LA61_0==RULE_DECIMAL) ) {
 
 
     // $ANTLR start "rule__JvmTypeReference__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4981:1: rule__JvmTypeReference__Alternatives : ( ( ( rule__JvmTypeReference__Group_0__0 ) ) | ( ruleXFunctionTypeRef ) );
+    // InternalFormat.g:4981:1: rule__JvmTypeReference__Alternatives : ( ( ( rule__JvmTypeReference__Group_0__0 ) ) | ( ruleXFunctionTypeRef ) );
     public final void rule__JvmTypeReference__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4985:1: ( ( ( rule__JvmTypeReference__Group_0__0 ) ) | ( ruleXFunctionTypeRef ) )
+            // InternalFormat.g:4985:1: ( ( ( rule__JvmTypeReference__Group_0__0 ) ) | ( ruleXFunctionTypeRef ) )
             int alt62=2;
             int LA62_0 = input.LA(1);
 
@@ -16766,18 +16766,18 @@ else if ( (LA62_0==37||LA62_0==74) ) {
             }
             switch (alt62) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4986:1: ( ( rule__JvmTypeReference__Group_0__0 ) )
+                    // InternalFormat.g:4986:1: ( ( rule__JvmTypeReference__Group_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4986:1: ( ( rule__JvmTypeReference__Group_0__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4987:1: ( rule__JvmTypeReference__Group_0__0 )
+                    // InternalFormat.g:4986:1: ( ( rule__JvmTypeReference__Group_0__0 ) )
+                    // InternalFormat.g:4987:1: ( rule__JvmTypeReference__Group_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getJvmTypeReferenceAccess().getGroup_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4988:1: ( rule__JvmTypeReference__Group_0__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4988:2: rule__JvmTypeReference__Group_0__0
+                    // InternalFormat.g:4988:1: ( rule__JvmTypeReference__Group_0__0 )
+                    // InternalFormat.g:4988:2: rule__JvmTypeReference__Group_0__0
                     {
-                    pushFollow(FOLLOW_rule__JvmTypeReference__Group_0__0_in_rule__JvmTypeReference__Alternatives10946);
+                    pushFollow(FOLLOW_2);
                     rule__JvmTypeReference__Group_0__0();
 
                     state._fsp--;
@@ -16795,15 +16795,15 @@ else if ( (LA62_0==37||LA62_0==74) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4992:6: ( ruleXFunctionTypeRef )
+                    // InternalFormat.g:4992:6: ( ruleXFunctionTypeRef )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4992:6: ( ruleXFunctionTypeRef )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4993:1: ruleXFunctionTypeRef
+                    // InternalFormat.g:4992:6: ( ruleXFunctionTypeRef )
+                    // InternalFormat.g:4993:1: ruleXFunctionTypeRef
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getJvmTypeReferenceAccess().getXFunctionTypeRefParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleXFunctionTypeRef_in_rule__JvmTypeReference__Alternatives10964);
+                    pushFollow(FOLLOW_2);
                     ruleXFunctionTypeRef();
 
                     state._fsp--;
@@ -16835,13 +16835,13 @@ else if ( (LA62_0==37||LA62_0==74) ) {
 
 
     // $ANTLR start "rule__JvmArgumentTypeReference__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5003:1: rule__JvmArgumentTypeReference__Alternatives : ( ( ruleJvmTypeReference ) | ( ruleJvmWildcardTypeReference ) );
+    // InternalFormat.g:5003:1: rule__JvmArgumentTypeReference__Alternatives : ( ( ruleJvmTypeReference ) | ( ruleJvmWildcardTypeReference ) );
     public final void rule__JvmArgumentTypeReference__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5007:1: ( ( ruleJvmTypeReference ) | ( ruleJvmWildcardTypeReference ) )
+            // InternalFormat.g:5007:1: ( ( ruleJvmTypeReference ) | ( ruleJvmWildcardTypeReference ) )
             int alt63=2;
             int LA63_0 = input.LA(1);
 
@@ -16860,15 +16860,15 @@ else if ( (LA63_0==102) ) {
             }
             switch (alt63) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5008:1: ( ruleJvmTypeReference )
+                    // InternalFormat.g:5008:1: ( ruleJvmTypeReference )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5008:1: ( ruleJvmTypeReference )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5009:1: ruleJvmTypeReference
+                    // InternalFormat.g:5008:1: ( ruleJvmTypeReference )
+                    // InternalFormat.g:5009:1: ruleJvmTypeReference
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getJvmArgumentTypeReferenceAccess().getJvmTypeReferenceParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__JvmArgumentTypeReference__Alternatives10996);
+                    pushFollow(FOLLOW_2);
                     ruleJvmTypeReference();
 
                     state._fsp--;
@@ -16883,15 +16883,15 @@ else if ( (LA63_0==102) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5014:6: ( ruleJvmWildcardTypeReference )
+                    // InternalFormat.g:5014:6: ( ruleJvmWildcardTypeReference )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5014:6: ( ruleJvmWildcardTypeReference )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5015:1: ruleJvmWildcardTypeReference
+                    // InternalFormat.g:5014:6: ( ruleJvmWildcardTypeReference )
+                    // InternalFormat.g:5015:1: ruleJvmWildcardTypeReference
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getJvmArgumentTypeReferenceAccess().getJvmWildcardTypeReferenceParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleJvmWildcardTypeReference_in_rule__JvmArgumentTypeReference__Alternatives11013);
+                    pushFollow(FOLLOW_2);
                     ruleJvmWildcardTypeReference();
 
                     state._fsp--;
@@ -16923,13 +16923,13 @@ else if ( (LA63_0==102) ) {
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Alternatives_2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5025:1: rule__JvmWildcardTypeReference__Alternatives_2 : ( ( ( rule__JvmWildcardTypeReference__Group_2_0__0 ) ) | ( ( rule__JvmWildcardTypeReference__Group_2_1__0 ) ) );
+    // InternalFormat.g:5025:1: rule__JvmWildcardTypeReference__Alternatives_2 : ( ( ( rule__JvmWildcardTypeReference__Group_2_0__0 ) ) | ( ( rule__JvmWildcardTypeReference__Group_2_1__0 ) ) );
     public final void rule__JvmWildcardTypeReference__Alternatives_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5029:1: ( ( ( rule__JvmWildcardTypeReference__Group_2_0__0 ) ) | ( ( rule__JvmWildcardTypeReference__Group_2_1__0 ) ) )
+            // InternalFormat.g:5029:1: ( ( ( rule__JvmWildcardTypeReference__Group_2_0__0 ) ) | ( ( rule__JvmWildcardTypeReference__Group_2_1__0 ) ) )
             int alt64=2;
             int LA64_0 = input.LA(1);
 
@@ -16948,18 +16948,18 @@ else if ( (LA64_0==54) ) {
             }
             switch (alt64) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5030:1: ( ( rule__JvmWildcardTypeReference__Group_2_0__0 ) )
+                    // InternalFormat.g:5030:1: ( ( rule__JvmWildcardTypeReference__Group_2_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5030:1: ( ( rule__JvmWildcardTypeReference__Group_2_0__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5031:1: ( rule__JvmWildcardTypeReference__Group_2_0__0 )
+                    // InternalFormat.g:5030:1: ( ( rule__JvmWildcardTypeReference__Group_2_0__0 ) )
+                    // InternalFormat.g:5031:1: ( rule__JvmWildcardTypeReference__Group_2_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getJvmWildcardTypeReferenceAccess().getGroup_2_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5032:1: ( rule__JvmWildcardTypeReference__Group_2_0__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5032:2: rule__JvmWildcardTypeReference__Group_2_0__0
+                    // InternalFormat.g:5032:1: ( rule__JvmWildcardTypeReference__Group_2_0__0 )
+                    // InternalFormat.g:5032:2: rule__JvmWildcardTypeReference__Group_2_0__0
                     {
-                    pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group_2_0__0_in_rule__JvmWildcardTypeReference__Alternatives_211045);
+                    pushFollow(FOLLOW_2);
                     rule__JvmWildcardTypeReference__Group_2_0__0();
 
                     state._fsp--;
@@ -16977,18 +16977,18 @@ else if ( (LA64_0==54) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5036:6: ( ( rule__JvmWildcardTypeReference__Group_2_1__0 ) )
+                    // InternalFormat.g:5036:6: ( ( rule__JvmWildcardTypeReference__Group_2_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5036:6: ( ( rule__JvmWildcardTypeReference__Group_2_1__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5037:1: ( rule__JvmWildcardTypeReference__Group_2_1__0 )
+                    // InternalFormat.g:5036:6: ( ( rule__JvmWildcardTypeReference__Group_2_1__0 ) )
+                    // InternalFormat.g:5037:1: ( rule__JvmWildcardTypeReference__Group_2_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getJvmWildcardTypeReferenceAccess().getGroup_2_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5038:1: ( rule__JvmWildcardTypeReference__Group_2_1__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5038:2: rule__JvmWildcardTypeReference__Group_2_1__0
+                    // InternalFormat.g:5038:1: ( rule__JvmWildcardTypeReference__Group_2_1__0 )
+                    // InternalFormat.g:5038:2: rule__JvmWildcardTypeReference__Group_2_1__0
                     {
-                    pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group_2_1__0_in_rule__JvmWildcardTypeReference__Alternatives_211063);
+                    pushFollow(FOLLOW_2);
                     rule__JvmWildcardTypeReference__Group_2_1__0();
 
                     state._fsp--;
@@ -17023,29 +17023,29 @@ else if ( (LA64_0==54) ) {
 
 
     // $ANTLR start "rule__XImportDeclaration__Alternatives_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5047:1: rule__XImportDeclaration__Alternatives_1 : ( ( ( rule__XImportDeclaration__Group_1_0__0 ) ) | ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_1 ) ) | ( ( rule__XImportDeclaration__ImportedNamespaceAssignment_1_2 ) ) );
+    // InternalFormat.g:5047:1: rule__XImportDeclaration__Alternatives_1 : ( ( ( rule__XImportDeclaration__Group_1_0__0 ) ) | ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_1 ) ) | ( ( rule__XImportDeclaration__ImportedNamespaceAssignment_1_2 ) ) );
     public final void rule__XImportDeclaration__Alternatives_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5051:1: ( ( ( rule__XImportDeclaration__Group_1_0__0 ) ) | ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_1 ) ) | ( ( rule__XImportDeclaration__ImportedNamespaceAssignment_1_2 ) ) )
+            // InternalFormat.g:5051:1: ( ( ( rule__XImportDeclaration__Group_1_0__0 ) ) | ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_1 ) ) | ( ( rule__XImportDeclaration__ImportedNamespaceAssignment_1_2 ) ) )
             int alt65=3;
             alt65 = dfa65.predict(input);
             switch (alt65) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5052:1: ( ( rule__XImportDeclaration__Group_1_0__0 ) )
+                    // InternalFormat.g:5052:1: ( ( rule__XImportDeclaration__Group_1_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5052:1: ( ( rule__XImportDeclaration__Group_1_0__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5053:1: ( rule__XImportDeclaration__Group_1_0__0 )
+                    // InternalFormat.g:5052:1: ( ( rule__XImportDeclaration__Group_1_0__0 ) )
+                    // InternalFormat.g:5053:1: ( rule__XImportDeclaration__Group_1_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXImportDeclarationAccess().getGroup_1_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5054:1: ( rule__XImportDeclaration__Group_1_0__0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5054:2: rule__XImportDeclaration__Group_1_0__0
+                    // InternalFormat.g:5054:1: ( rule__XImportDeclaration__Group_1_0__0 )
+                    // InternalFormat.g:5054:2: rule__XImportDeclaration__Group_1_0__0
                     {
-                    pushFollow(FOLLOW_rule__XImportDeclaration__Group_1_0__0_in_rule__XImportDeclaration__Alternatives_111096);
+                    pushFollow(FOLLOW_2);
                     rule__XImportDeclaration__Group_1_0__0();
 
                     state._fsp--;
@@ -17063,18 +17063,18 @@ public final void rule__XImportDeclaration__Alternatives_1() throws RecognitionE
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5058:6: ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_1 ) )
+                    // InternalFormat.g:5058:6: ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_1 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5058:6: ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_1 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5059:1: ( rule__XImportDeclaration__ImportedTypeAssignment_1_1 )
+                    // InternalFormat.g:5058:6: ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_1 ) )
+                    // InternalFormat.g:5059:1: ( rule__XImportDeclaration__ImportedTypeAssignment_1_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXImportDeclarationAccess().getImportedTypeAssignment_1_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5060:1: ( rule__XImportDeclaration__ImportedTypeAssignment_1_1 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5060:2: rule__XImportDeclaration__ImportedTypeAssignment_1_1
+                    // InternalFormat.g:5060:1: ( rule__XImportDeclaration__ImportedTypeAssignment_1_1 )
+                    // InternalFormat.g:5060:2: rule__XImportDeclaration__ImportedTypeAssignment_1_1
                     {
-                    pushFollow(FOLLOW_rule__XImportDeclaration__ImportedTypeAssignment_1_1_in_rule__XImportDeclaration__Alternatives_111114);
+                    pushFollow(FOLLOW_2);
                     rule__XImportDeclaration__ImportedTypeAssignment_1_1();
 
                     state._fsp--;
@@ -17092,18 +17092,18 @@ public final void rule__XImportDeclaration__Alternatives_1() throws RecognitionE
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5064:6: ( ( rule__XImportDeclaration__ImportedNamespaceAssignment_1_2 ) )
+                    // InternalFormat.g:5064:6: ( ( rule__XImportDeclaration__ImportedNamespaceAssignment_1_2 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5064:6: ( ( rule__XImportDeclaration__ImportedNamespaceAssignment_1_2 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5065:1: ( rule__XImportDeclaration__ImportedNamespaceAssignment_1_2 )
+                    // InternalFormat.g:5064:6: ( ( rule__XImportDeclaration__ImportedNamespaceAssignment_1_2 ) )
+                    // InternalFormat.g:5065:1: ( rule__XImportDeclaration__ImportedNamespaceAssignment_1_2 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXImportDeclarationAccess().getImportedNamespaceAssignment_1_2()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5066:1: ( rule__XImportDeclaration__ImportedNamespaceAssignment_1_2 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5066:2: rule__XImportDeclaration__ImportedNamespaceAssignment_1_2
+                    // InternalFormat.g:5066:1: ( rule__XImportDeclaration__ImportedNamespaceAssignment_1_2 )
+                    // InternalFormat.g:5066:2: rule__XImportDeclaration__ImportedNamespaceAssignment_1_2
                     {
-                    pushFollow(FOLLOW_rule__XImportDeclaration__ImportedNamespaceAssignment_1_2_in_rule__XImportDeclaration__Alternatives_111132);
+                    pushFollow(FOLLOW_2);
                     rule__XImportDeclaration__ImportedNamespaceAssignment_1_2();
 
                     state._fsp--;
@@ -17138,13 +17138,13 @@ public final void rule__XImportDeclaration__Alternatives_1() throws RecognitionE
 
 
     // $ANTLR start "rule__XImportDeclaration__Alternatives_1_0_3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5075:1: rule__XImportDeclaration__Alternatives_1_0_3 : ( ( ( rule__XImportDeclaration__WildcardAssignment_1_0_3_0 ) ) | ( ( rule__XImportDeclaration__MemberNameAssignment_1_0_3_1 ) ) );
+    // InternalFormat.g:5075:1: rule__XImportDeclaration__Alternatives_1_0_3 : ( ( ( rule__XImportDeclaration__WildcardAssignment_1_0_3_0 ) ) | ( ( rule__XImportDeclaration__MemberNameAssignment_1_0_3_1 ) ) );
     public final void rule__XImportDeclaration__Alternatives_1_0_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5079:1: ( ( ( rule__XImportDeclaration__WildcardAssignment_1_0_3_0 ) ) | ( ( rule__XImportDeclaration__MemberNameAssignment_1_0_3_1 ) ) )
+            // InternalFormat.g:5079:1: ( ( ( rule__XImportDeclaration__WildcardAssignment_1_0_3_0 ) ) | ( ( rule__XImportDeclaration__MemberNameAssignment_1_0_3_1 ) ) )
             int alt66=2;
             int LA66_0 = input.LA(1);
 
@@ -17163,18 +17163,18 @@ else if ( (LA66_0==RULE_ID||(LA66_0>=20 && LA66_0<=21)) ) {
             }
             switch (alt66) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5080:1: ( ( rule__XImportDeclaration__WildcardAssignment_1_0_3_0 ) )
+                    // InternalFormat.g:5080:1: ( ( rule__XImportDeclaration__WildcardAssignment_1_0_3_0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5080:1: ( ( rule__XImportDeclaration__WildcardAssignment_1_0_3_0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5081:1: ( rule__XImportDeclaration__WildcardAssignment_1_0_3_0 )
+                    // InternalFormat.g:5080:1: ( ( rule__XImportDeclaration__WildcardAssignment_1_0_3_0 ) )
+                    // InternalFormat.g:5081:1: ( rule__XImportDeclaration__WildcardAssignment_1_0_3_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXImportDeclarationAccess().getWildcardAssignment_1_0_3_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5082:1: ( rule__XImportDeclaration__WildcardAssignment_1_0_3_0 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5082:2: rule__XImportDeclaration__WildcardAssignment_1_0_3_0
+                    // InternalFormat.g:5082:1: ( rule__XImportDeclaration__WildcardAssignment_1_0_3_0 )
+                    // InternalFormat.g:5082:2: rule__XImportDeclaration__WildcardAssignment_1_0_3_0
                     {
-                    pushFollow(FOLLOW_rule__XImportDeclaration__WildcardAssignment_1_0_3_0_in_rule__XImportDeclaration__Alternatives_1_0_311165);
+                    pushFollow(FOLLOW_2);
                     rule__XImportDeclaration__WildcardAssignment_1_0_3_0();
 
                     state._fsp--;
@@ -17192,18 +17192,18 @@ else if ( (LA66_0==RULE_ID||(LA66_0>=20 && LA66_0<=21)) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5086:6: ( ( rule__XImportDeclaration__MemberNameAssignment_1_0_3_1 ) )
+                    // InternalFormat.g:5086:6: ( ( rule__XImportDeclaration__MemberNameAssignment_1_0_3_1 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5086:6: ( ( rule__XImportDeclaration__MemberNameAssignment_1_0_3_1 ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5087:1: ( rule__XImportDeclaration__MemberNameAssignment_1_0_3_1 )
+                    // InternalFormat.g:5086:6: ( ( rule__XImportDeclaration__MemberNameAssignment_1_0_3_1 ) )
+                    // InternalFormat.g:5087:1: ( rule__XImportDeclaration__MemberNameAssignment_1_0_3_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getXImportDeclarationAccess().getMemberNameAssignment_1_0_3_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5088:1: ( rule__XImportDeclaration__MemberNameAssignment_1_0_3_1 )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5088:2: rule__XImportDeclaration__MemberNameAssignment_1_0_3_1
+                    // InternalFormat.g:5088:1: ( rule__XImportDeclaration__MemberNameAssignment_1_0_3_1 )
+                    // InternalFormat.g:5088:2: rule__XImportDeclaration__MemberNameAssignment_1_0_3_1
                     {
-                    pushFollow(FOLLOW_rule__XImportDeclaration__MemberNameAssignment_1_0_3_1_in_rule__XImportDeclaration__Alternatives_1_0_311183);
+                    pushFollow(FOLLOW_2);
                     rule__XImportDeclaration__MemberNameAssignment_1_0_3_1();
 
                     state._fsp--;
@@ -17238,13 +17238,13 @@ else if ( (LA66_0==RULE_ID||(LA66_0>=20 && LA66_0<=21)) ) {
 
 
     // $ANTLR start "rule__MatcherType__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5097:1: rule__MatcherType__Alternatives : ( ( ( 'before' ) ) | ( ( 'after' ) ) | ( ( 'around' ) ) | ( ( 'between' ) ) | ( ( 'range' ) ) );
+    // InternalFormat.g:5097:1: rule__MatcherType__Alternatives : ( ( ( 'before' ) ) | ( ( 'after' ) ) | ( ( 'around' ) ) | ( ( 'between' ) ) | ( ( 'range' ) ) );
     public final void rule__MatcherType__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5101:1: ( ( ( 'before' ) ) | ( ( 'after' ) ) | ( ( 'around' ) ) | ( ( 'between' ) ) | ( ( 'range' ) ) )
+            // InternalFormat.g:5101:1: ( ( ( 'before' ) ) | ( ( 'after' ) ) | ( ( 'around' ) ) | ( ( 'between' ) ) | ( ( 'range' ) ) )
             int alt67=5;
             switch ( input.LA(1) ) {
             case 56:
@@ -17282,18 +17282,18 @@ public final void rule__MatcherType__Alternatives() throws RecognitionException
 
             switch (alt67) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5102:1: ( ( 'before' ) )
+                    // InternalFormat.g:5102:1: ( ( 'before' ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5102:1: ( ( 'before' ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5103:1: ( 'before' )
+                    // InternalFormat.g:5102:1: ( ( 'before' ) )
+                    // InternalFormat.g:5103:1: ( 'before' )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getMatcherTypeAccess().getBeforeEnumLiteralDeclaration_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5104:1: ( 'before' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5104:3: 'before'
+                    // InternalFormat.g:5104:1: ( 'before' )
+                    // InternalFormat.g:5104:3: 'before'
                     {
-                    match(input,56,FOLLOW_56_in_rule__MatcherType__Alternatives11217); if (state.failed) return ;
+                    match(input,56,FOLLOW_2); if (state.failed) return ;
 
                     }
 
@@ -17307,18 +17307,18 @@ public final void rule__MatcherType__Alternatives() throws RecognitionException
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5109:6: ( ( 'after' ) )
+                    // InternalFormat.g:5109:6: ( ( 'after' ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5109:6: ( ( 'after' ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5110:1: ( 'after' )
+                    // InternalFormat.g:5109:6: ( ( 'after' ) )
+                    // InternalFormat.g:5110:1: ( 'after' )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getMatcherTypeAccess().getAfterEnumLiteralDeclaration_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5111:1: ( 'after' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5111:3: 'after'
+                    // InternalFormat.g:5111:1: ( 'after' )
+                    // InternalFormat.g:5111:3: 'after'
                     {
-                    match(input,57,FOLLOW_57_in_rule__MatcherType__Alternatives11238); if (state.failed) return ;
+                    match(input,57,FOLLOW_2); if (state.failed) return ;
 
                     }
 
@@ -17332,18 +17332,18 @@ public final void rule__MatcherType__Alternatives() throws RecognitionException
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5116:6: ( ( 'around' ) )
+                    // InternalFormat.g:5116:6: ( ( 'around' ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5116:6: ( ( 'around' ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5117:1: ( 'around' )
+                    // InternalFormat.g:5116:6: ( ( 'around' ) )
+                    // InternalFormat.g:5117:1: ( 'around' )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getMatcherTypeAccess().getAroundEnumLiteralDeclaration_2()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5118:1: ( 'around' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5118:3: 'around'
+                    // InternalFormat.g:5118:1: ( 'around' )
+                    // InternalFormat.g:5118:3: 'around'
                     {
-                    match(input,58,FOLLOW_58_in_rule__MatcherType__Alternatives11259); if (state.failed) return ;
+                    match(input,58,FOLLOW_2); if (state.failed) return ;
 
                     }
 
@@ -17357,18 +17357,18 @@ public final void rule__MatcherType__Alternatives() throws RecognitionException
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5123:6: ( ( 'between' ) )
+                    // InternalFormat.g:5123:6: ( ( 'between' ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5123:6: ( ( 'between' ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5124:1: ( 'between' )
+                    // InternalFormat.g:5123:6: ( ( 'between' ) )
+                    // InternalFormat.g:5124:1: ( 'between' )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getMatcherTypeAccess().getBetweenEnumLiteralDeclaration_3()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5125:1: ( 'between' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5125:3: 'between'
+                    // InternalFormat.g:5125:1: ( 'between' )
+                    // InternalFormat.g:5125:3: 'between'
                     {
-                    match(input,59,FOLLOW_59_in_rule__MatcherType__Alternatives11280); if (state.failed) return ;
+                    match(input,59,FOLLOW_2); if (state.failed) return ;
 
                     }
 
@@ -17382,18 +17382,18 @@ public final void rule__MatcherType__Alternatives() throws RecognitionException
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5130:6: ( ( 'range' ) )
+                    // InternalFormat.g:5130:6: ( ( 'range' ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5130:6: ( ( 'range' ) )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5131:1: ( 'range' )
+                    // InternalFormat.g:5130:6: ( ( 'range' ) )
+                    // InternalFormat.g:5131:1: ( 'range' )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getMatcherTypeAccess().getRangeEnumLiteralDeclaration_4()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5132:1: ( 'range' )
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5132:3: 'range'
+                    // InternalFormat.g:5132:1: ( 'range' )
+                    // InternalFormat.g:5132:3: 'range'
                     {
-                    match(input,60,FOLLOW_60_in_rule__MatcherType__Alternatives11301); if (state.failed) return ;
+                    match(input,60,FOLLOW_2); if (state.failed) return ;
 
                     }
 
@@ -17424,21 +17424,21 @@ public final void rule__MatcherType__Alternatives() throws RecognitionException
 
 
     // $ANTLR start "rule__FormatConfiguration__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5144:1: rule__FormatConfiguration__Group__0 : rule__FormatConfiguration__Group__0__Impl rule__FormatConfiguration__Group__1 ;
+    // InternalFormat.g:5144:1: rule__FormatConfiguration__Group__0 : rule__FormatConfiguration__Group__0__Impl rule__FormatConfiguration__Group__1 ;
     public final void rule__FormatConfiguration__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5148:1: ( rule__FormatConfiguration__Group__0__Impl rule__FormatConfiguration__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5149:2: rule__FormatConfiguration__Group__0__Impl rule__FormatConfiguration__Group__1
+            // InternalFormat.g:5148:1: ( rule__FormatConfiguration__Group__0__Impl rule__FormatConfiguration__Group__1 )
+            // InternalFormat.g:5149:2: rule__FormatConfiguration__Group__0__Impl rule__FormatConfiguration__Group__1
             {
-            pushFollow(FOLLOW_rule__FormatConfiguration__Group__0__Impl_in_rule__FormatConfiguration__Group__011334);
+            pushFollow(FOLLOW_4);
             rule__FormatConfiguration__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__FormatConfiguration__Group__1_in_rule__FormatConfiguration__Group__011337);
+            pushFollow(FOLLOW_2);
             rule__FormatConfiguration__Group__1();
 
             state._fsp--;
@@ -17462,22 +17462,22 @@ public final void rule__FormatConfiguration__Group__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__FormatConfiguration__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5156:1: rule__FormatConfiguration__Group__0__Impl : ( 'formatter' ) ;
+    // InternalFormat.g:5156:1: rule__FormatConfiguration__Group__0__Impl : ( 'formatter' ) ;
     public final void rule__FormatConfiguration__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5160:1: ( ( 'formatter' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5161:1: ( 'formatter' )
+            // InternalFormat.g:5160:1: ( ( 'formatter' ) )
+            // InternalFormat.g:5161:1: ( 'formatter' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5161:1: ( 'formatter' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5162:1: 'formatter'
+            // InternalFormat.g:5161:1: ( 'formatter' )
+            // InternalFormat.g:5162:1: 'formatter'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormatConfigurationAccess().getFormatterKeyword_0()); 
             }
-            match(input,61,FOLLOW_61_in_rule__FormatConfiguration__Group__0__Impl11365); if (state.failed) return ;
+            match(input,61,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getFormatConfigurationAccess().getFormatterKeyword_0()); 
             }
@@ -17503,21 +17503,21 @@ public final void rule__FormatConfiguration__Group__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__FormatConfiguration__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5175:1: rule__FormatConfiguration__Group__1 : rule__FormatConfiguration__Group__1__Impl rule__FormatConfiguration__Group__2 ;
+    // InternalFormat.g:5175:1: rule__FormatConfiguration__Group__1 : rule__FormatConfiguration__Group__1__Impl rule__FormatConfiguration__Group__2 ;
     public final void rule__FormatConfiguration__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5179:1: ( rule__FormatConfiguration__Group__1__Impl rule__FormatConfiguration__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5180:2: rule__FormatConfiguration__Group__1__Impl rule__FormatConfiguration__Group__2
+            // InternalFormat.g:5179:1: ( rule__FormatConfiguration__Group__1__Impl rule__FormatConfiguration__Group__2 )
+            // InternalFormat.g:5180:2: rule__FormatConfiguration__Group__1__Impl rule__FormatConfiguration__Group__2
             {
-            pushFollow(FOLLOW_rule__FormatConfiguration__Group__1__Impl_in_rule__FormatConfiguration__Group__111396);
+            pushFollow(FOLLOW_5);
             rule__FormatConfiguration__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__FormatConfiguration__Group__2_in_rule__FormatConfiguration__Group__111399);
+            pushFollow(FOLLOW_2);
             rule__FormatConfiguration__Group__2();
 
             state._fsp--;
@@ -17541,22 +17541,22 @@ public final void rule__FormatConfiguration__Group__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__FormatConfiguration__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5187:1: rule__FormatConfiguration__Group__1__Impl : ( 'for' ) ;
+    // InternalFormat.g:5187:1: rule__FormatConfiguration__Group__1__Impl : ( 'for' ) ;
     public final void rule__FormatConfiguration__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5191:1: ( ( 'for' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5192:1: ( 'for' )
+            // InternalFormat.g:5191:1: ( ( 'for' ) )
+            // InternalFormat.g:5192:1: ( 'for' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5192:1: ( 'for' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5193:1: 'for'
+            // InternalFormat.g:5192:1: ( 'for' )
+            // InternalFormat.g:5193:1: 'for'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormatConfigurationAccess().getForKeyword_1()); 
             }
-            match(input,62,FOLLOW_62_in_rule__FormatConfiguration__Group__1__Impl11427); if (state.failed) return ;
+            match(input,62,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getFormatConfigurationAccess().getForKeyword_1()); 
             }
@@ -17582,21 +17582,21 @@ public final void rule__FormatConfiguration__Group__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__FormatConfiguration__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5206:1: rule__FormatConfiguration__Group__2 : rule__FormatConfiguration__Group__2__Impl rule__FormatConfiguration__Group__3 ;
+    // InternalFormat.g:5206:1: rule__FormatConfiguration__Group__2 : rule__FormatConfiguration__Group__2__Impl rule__FormatConfiguration__Group__3 ;
     public final void rule__FormatConfiguration__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5210:1: ( rule__FormatConfiguration__Group__2__Impl rule__FormatConfiguration__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5211:2: rule__FormatConfiguration__Group__2__Impl rule__FormatConfiguration__Group__3
+            // InternalFormat.g:5210:1: ( rule__FormatConfiguration__Group__2__Impl rule__FormatConfiguration__Group__3 )
+            // InternalFormat.g:5211:2: rule__FormatConfiguration__Group__2__Impl rule__FormatConfiguration__Group__3
             {
-            pushFollow(FOLLOW_rule__FormatConfiguration__Group__2__Impl_in_rule__FormatConfiguration__Group__211458);
+            pushFollow(FOLLOW_6);
             rule__FormatConfiguration__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__FormatConfiguration__Group__3_in_rule__FormatConfiguration__Group__211461);
+            pushFollow(FOLLOW_2);
             rule__FormatConfiguration__Group__3();
 
             state._fsp--;
@@ -17620,25 +17620,25 @@ public final void rule__FormatConfiguration__Group__2() throws RecognitionExcept
 
 
     // $ANTLR start "rule__FormatConfiguration__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5218:1: rule__FormatConfiguration__Group__2__Impl : ( ( rule__FormatConfiguration__TargetGrammarAssignment_2 ) ) ;
+    // InternalFormat.g:5218:1: rule__FormatConfiguration__Group__2__Impl : ( ( rule__FormatConfiguration__TargetGrammarAssignment_2 ) ) ;
     public final void rule__FormatConfiguration__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5222:1: ( ( ( rule__FormatConfiguration__TargetGrammarAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5223:1: ( ( rule__FormatConfiguration__TargetGrammarAssignment_2 ) )
+            // InternalFormat.g:5222:1: ( ( ( rule__FormatConfiguration__TargetGrammarAssignment_2 ) ) )
+            // InternalFormat.g:5223:1: ( ( rule__FormatConfiguration__TargetGrammarAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5223:1: ( ( rule__FormatConfiguration__TargetGrammarAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5224:1: ( rule__FormatConfiguration__TargetGrammarAssignment_2 )
+            // InternalFormat.g:5223:1: ( ( rule__FormatConfiguration__TargetGrammarAssignment_2 ) )
+            // InternalFormat.g:5224:1: ( rule__FormatConfiguration__TargetGrammarAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormatConfigurationAccess().getTargetGrammarAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5225:1: ( rule__FormatConfiguration__TargetGrammarAssignment_2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5225:2: rule__FormatConfiguration__TargetGrammarAssignment_2
+            // InternalFormat.g:5225:1: ( rule__FormatConfiguration__TargetGrammarAssignment_2 )
+            // InternalFormat.g:5225:2: rule__FormatConfiguration__TargetGrammarAssignment_2
             {
-            pushFollow(FOLLOW_rule__FormatConfiguration__TargetGrammarAssignment_2_in_rule__FormatConfiguration__Group__2__Impl11488);
+            pushFollow(FOLLOW_2);
             rule__FormatConfiguration__TargetGrammarAssignment_2();
 
             state._fsp--;
@@ -17671,21 +17671,21 @@ public final void rule__FormatConfiguration__Group__2__Impl() throws Recognition
 
 
     // $ANTLR start "rule__FormatConfiguration__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5235:1: rule__FormatConfiguration__Group__3 : rule__FormatConfiguration__Group__3__Impl rule__FormatConfiguration__Group__4 ;
+    // InternalFormat.g:5235:1: rule__FormatConfiguration__Group__3 : rule__FormatConfiguration__Group__3__Impl rule__FormatConfiguration__Group__4 ;
     public final void rule__FormatConfiguration__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5239:1: ( rule__FormatConfiguration__Group__3__Impl rule__FormatConfiguration__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5240:2: rule__FormatConfiguration__Group__3__Impl rule__FormatConfiguration__Group__4
+            // InternalFormat.g:5239:1: ( rule__FormatConfiguration__Group__3__Impl rule__FormatConfiguration__Group__4 )
+            // InternalFormat.g:5240:2: rule__FormatConfiguration__Group__3__Impl rule__FormatConfiguration__Group__4
             {
-            pushFollow(FOLLOW_rule__FormatConfiguration__Group__3__Impl_in_rule__FormatConfiguration__Group__311518);
+            pushFollow(FOLLOW_6);
             rule__FormatConfiguration__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__FormatConfiguration__Group__4_in_rule__FormatConfiguration__Group__311521);
+            pushFollow(FOLLOW_2);
             rule__FormatConfiguration__Group__4();
 
             state._fsp--;
@@ -17709,22 +17709,22 @@ public final void rule__FormatConfiguration__Group__3() throws RecognitionExcept
 
 
     // $ANTLR start "rule__FormatConfiguration__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5247:1: rule__FormatConfiguration__Group__3__Impl : ( ( rule__FormatConfiguration__Group_3__0 )? ) ;
+    // InternalFormat.g:5247:1: rule__FormatConfiguration__Group__3__Impl : ( ( rule__FormatConfiguration__Group_3__0 )? ) ;
     public final void rule__FormatConfiguration__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5251:1: ( ( ( rule__FormatConfiguration__Group_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5252:1: ( ( rule__FormatConfiguration__Group_3__0 )? )
+            // InternalFormat.g:5251:1: ( ( ( rule__FormatConfiguration__Group_3__0 )? ) )
+            // InternalFormat.g:5252:1: ( ( rule__FormatConfiguration__Group_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5252:1: ( ( rule__FormatConfiguration__Group_3__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5253:1: ( rule__FormatConfiguration__Group_3__0 )?
+            // InternalFormat.g:5252:1: ( ( rule__FormatConfiguration__Group_3__0 )? )
+            // InternalFormat.g:5253:1: ( rule__FormatConfiguration__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormatConfigurationAccess().getGroup_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5254:1: ( rule__FormatConfiguration__Group_3__0 )?
+            // InternalFormat.g:5254:1: ( rule__FormatConfiguration__Group_3__0 )?
             int alt68=2;
             int LA68_0 = input.LA(1);
 
@@ -17733,9 +17733,9 @@ public final void rule__FormatConfiguration__Group__3__Impl() throws Recognition
             }
             switch (alt68) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5254:2: rule__FormatConfiguration__Group_3__0
+                    // InternalFormat.g:5254:2: rule__FormatConfiguration__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__FormatConfiguration__Group_3__0_in_rule__FormatConfiguration__Group__3__Impl11548);
+                    pushFollow(FOLLOW_2);
                     rule__FormatConfiguration__Group_3__0();
 
                     state._fsp--;
@@ -17771,21 +17771,21 @@ public final void rule__FormatConfiguration__Group__3__Impl() throws Recognition
 
 
     // $ANTLR start "rule__FormatConfiguration__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5264:1: rule__FormatConfiguration__Group__4 : rule__FormatConfiguration__Group__4__Impl rule__FormatConfiguration__Group__5 ;
+    // InternalFormat.g:5264:1: rule__FormatConfiguration__Group__4 : rule__FormatConfiguration__Group__4__Impl rule__FormatConfiguration__Group__5 ;
     public final void rule__FormatConfiguration__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5268:1: ( rule__FormatConfiguration__Group__4__Impl rule__FormatConfiguration__Group__5 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5269:2: rule__FormatConfiguration__Group__4__Impl rule__FormatConfiguration__Group__5
+            // InternalFormat.g:5268:1: ( rule__FormatConfiguration__Group__4__Impl rule__FormatConfiguration__Group__5 )
+            // InternalFormat.g:5269:2: rule__FormatConfiguration__Group__4__Impl rule__FormatConfiguration__Group__5
             {
-            pushFollow(FOLLOW_rule__FormatConfiguration__Group__4__Impl_in_rule__FormatConfiguration__Group__411579);
+            pushFollow(FOLLOW_6);
             rule__FormatConfiguration__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__FormatConfiguration__Group__5_in_rule__FormatConfiguration__Group__411582);
+            pushFollow(FOLLOW_2);
             rule__FormatConfiguration__Group__5();
 
             state._fsp--;
@@ -17809,22 +17809,22 @@ public final void rule__FormatConfiguration__Group__4() throws RecognitionExcept
 
 
     // $ANTLR start "rule__FormatConfiguration__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5276:1: rule__FormatConfiguration__Group__4__Impl : ( ( rule__FormatConfiguration__Group_4__0 )? ) ;
+    // InternalFormat.g:5276:1: rule__FormatConfiguration__Group__4__Impl : ( ( rule__FormatConfiguration__Group_4__0 )? ) ;
     public final void rule__FormatConfiguration__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5280:1: ( ( ( rule__FormatConfiguration__Group_4__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5281:1: ( ( rule__FormatConfiguration__Group_4__0 )? )
+            // InternalFormat.g:5280:1: ( ( ( rule__FormatConfiguration__Group_4__0 )? ) )
+            // InternalFormat.g:5281:1: ( ( rule__FormatConfiguration__Group_4__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5281:1: ( ( rule__FormatConfiguration__Group_4__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5282:1: ( rule__FormatConfiguration__Group_4__0 )?
+            // InternalFormat.g:5281:1: ( ( rule__FormatConfiguration__Group_4__0 )? )
+            // InternalFormat.g:5282:1: ( rule__FormatConfiguration__Group_4__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormatConfigurationAccess().getGroup_4()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5283:1: ( rule__FormatConfiguration__Group_4__0 )?
+            // InternalFormat.g:5283:1: ( rule__FormatConfiguration__Group_4__0 )?
             int alt69=2;
             int LA69_0 = input.LA(1);
 
@@ -17833,9 +17833,9 @@ public final void rule__FormatConfiguration__Group__4__Impl() throws Recognition
             }
             switch (alt69) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5283:2: rule__FormatConfiguration__Group_4__0
+                    // InternalFormat.g:5283:2: rule__FormatConfiguration__Group_4__0
                     {
-                    pushFollow(FOLLOW_rule__FormatConfiguration__Group_4__0_in_rule__FormatConfiguration__Group__4__Impl11609);
+                    pushFollow(FOLLOW_2);
                     rule__FormatConfiguration__Group_4__0();
 
                     state._fsp--;
@@ -17871,21 +17871,21 @@ public final void rule__FormatConfiguration__Group__4__Impl() throws Recognition
 
 
     // $ANTLR start "rule__FormatConfiguration__Group__5"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5293:1: rule__FormatConfiguration__Group__5 : rule__FormatConfiguration__Group__5__Impl rule__FormatConfiguration__Group__6 ;
+    // InternalFormat.g:5293:1: rule__FormatConfiguration__Group__5 : rule__FormatConfiguration__Group__5__Impl rule__FormatConfiguration__Group__6 ;
     public final void rule__FormatConfiguration__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5297:1: ( rule__FormatConfiguration__Group__5__Impl rule__FormatConfiguration__Group__6 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5298:2: rule__FormatConfiguration__Group__5__Impl rule__FormatConfiguration__Group__6
+            // InternalFormat.g:5297:1: ( rule__FormatConfiguration__Group__5__Impl rule__FormatConfiguration__Group__6 )
+            // InternalFormat.g:5298:2: rule__FormatConfiguration__Group__5__Impl rule__FormatConfiguration__Group__6
             {
-            pushFollow(FOLLOW_rule__FormatConfiguration__Group__5__Impl_in_rule__FormatConfiguration__Group__511640);
+            pushFollow(FOLLOW_6);
             rule__FormatConfiguration__Group__5__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__FormatConfiguration__Group__6_in_rule__FormatConfiguration__Group__511643);
+            pushFollow(FOLLOW_2);
             rule__FormatConfiguration__Group__6();
 
             state._fsp--;
@@ -17909,22 +17909,22 @@ public final void rule__FormatConfiguration__Group__5() throws RecognitionExcept
 
 
     // $ANTLR start "rule__FormatConfiguration__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5305:1: rule__FormatConfiguration__Group__5__Impl : ( ( rule__FormatConfiguration__Group_5__0 )* ) ;
+    // InternalFormat.g:5305:1: rule__FormatConfiguration__Group__5__Impl : ( ( rule__FormatConfiguration__Group_5__0 )* ) ;
     public final void rule__FormatConfiguration__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5309:1: ( ( ( rule__FormatConfiguration__Group_5__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5310:1: ( ( rule__FormatConfiguration__Group_5__0 )* )
+            // InternalFormat.g:5309:1: ( ( ( rule__FormatConfiguration__Group_5__0 )* ) )
+            // InternalFormat.g:5310:1: ( ( rule__FormatConfiguration__Group_5__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5310:1: ( ( rule__FormatConfiguration__Group_5__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5311:1: ( rule__FormatConfiguration__Group_5__0 )*
+            // InternalFormat.g:5310:1: ( ( rule__FormatConfiguration__Group_5__0 )* )
+            // InternalFormat.g:5311:1: ( rule__FormatConfiguration__Group_5__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormatConfigurationAccess().getGroup_5()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5312:1: ( rule__FormatConfiguration__Group_5__0 )*
+            // InternalFormat.g:5312:1: ( rule__FormatConfiguration__Group_5__0 )*
             loop70:
             do {
                 int alt70=2;
@@ -17937,9 +17937,9 @@ public final void rule__FormatConfiguration__Group__5__Impl() throws Recognition
 
                 switch (alt70) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5312:2: rule__FormatConfiguration__Group_5__0
+            	    // InternalFormat.g:5312:2: rule__FormatConfiguration__Group_5__0
             	    {
-            	    pushFollow(FOLLOW_rule__FormatConfiguration__Group_5__0_in_rule__FormatConfiguration__Group__5__Impl11670);
+            	    pushFollow(FOLLOW_7);
             	    rule__FormatConfiguration__Group_5__0();
 
             	    state._fsp--;
@@ -17978,16 +17978,16 @@ public final void rule__FormatConfiguration__Group__5__Impl() throws Recognition
 
 
     // $ANTLR start "rule__FormatConfiguration__Group__6"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5322:1: rule__FormatConfiguration__Group__6 : rule__FormatConfiguration__Group__6__Impl ;
+    // InternalFormat.g:5322:1: rule__FormatConfiguration__Group__6 : rule__FormatConfiguration__Group__6__Impl ;
     public final void rule__FormatConfiguration__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5326:1: ( rule__FormatConfiguration__Group__6__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5327:2: rule__FormatConfiguration__Group__6__Impl
+            // InternalFormat.g:5326:1: ( rule__FormatConfiguration__Group__6__Impl )
+            // InternalFormat.g:5327:2: rule__FormatConfiguration__Group__6__Impl
             {
-            pushFollow(FOLLOW_rule__FormatConfiguration__Group__6__Impl_in_rule__FormatConfiguration__Group__611701);
+            pushFollow(FOLLOW_2);
             rule__FormatConfiguration__Group__6__Impl();
 
             state._fsp--;
@@ -18011,22 +18011,22 @@ public final void rule__FormatConfiguration__Group__6() throws RecognitionExcept
 
 
     // $ANTLR start "rule__FormatConfiguration__Group__6__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5333:1: rule__FormatConfiguration__Group__6__Impl : ( ( rule__FormatConfiguration__RulesAssignment_6 )* ) ;
+    // InternalFormat.g:5333:1: rule__FormatConfiguration__Group__6__Impl : ( ( rule__FormatConfiguration__RulesAssignment_6 )* ) ;
     public final void rule__FormatConfiguration__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5337:1: ( ( ( rule__FormatConfiguration__RulesAssignment_6 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5338:1: ( ( rule__FormatConfiguration__RulesAssignment_6 )* )
+            // InternalFormat.g:5337:1: ( ( ( rule__FormatConfiguration__RulesAssignment_6 )* ) )
+            // InternalFormat.g:5338:1: ( ( rule__FormatConfiguration__RulesAssignment_6 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5338:1: ( ( rule__FormatConfiguration__RulesAssignment_6 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5339:1: ( rule__FormatConfiguration__RulesAssignment_6 )*
+            // InternalFormat.g:5338:1: ( ( rule__FormatConfiguration__RulesAssignment_6 )* )
+            // InternalFormat.g:5339:1: ( rule__FormatConfiguration__RulesAssignment_6 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormatConfigurationAccess().getRulesAssignment_6()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5340:1: ( rule__FormatConfiguration__RulesAssignment_6 )*
+            // InternalFormat.g:5340:1: ( rule__FormatConfiguration__RulesAssignment_6 )*
             loop71:
             do {
                 int alt71=2;
@@ -18039,9 +18039,9 @@ public final void rule__FormatConfiguration__Group__6__Impl() throws Recognition
 
                 switch (alt71) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5340:2: rule__FormatConfiguration__RulesAssignment_6
+            	    // InternalFormat.g:5340:2: rule__FormatConfiguration__RulesAssignment_6
             	    {
-            	    pushFollow(FOLLOW_rule__FormatConfiguration__RulesAssignment_6_in_rule__FormatConfiguration__Group__6__Impl11728);
+            	    pushFollow(FOLLOW_8);
             	    rule__FormatConfiguration__RulesAssignment_6();
 
             	    state._fsp--;
@@ -18080,21 +18080,21 @@ public final void rule__FormatConfiguration__Group__6__Impl() throws Recognition
 
 
     // $ANTLR start "rule__FormatConfiguration__Group_3__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5364:1: rule__FormatConfiguration__Group_3__0 : rule__FormatConfiguration__Group_3__0__Impl rule__FormatConfiguration__Group_3__1 ;
+    // InternalFormat.g:5364:1: rule__FormatConfiguration__Group_3__0 : rule__FormatConfiguration__Group_3__0__Impl rule__FormatConfiguration__Group_3__1 ;
     public final void rule__FormatConfiguration__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5368:1: ( rule__FormatConfiguration__Group_3__0__Impl rule__FormatConfiguration__Group_3__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5369:2: rule__FormatConfiguration__Group_3__0__Impl rule__FormatConfiguration__Group_3__1
+            // InternalFormat.g:5368:1: ( rule__FormatConfiguration__Group_3__0__Impl rule__FormatConfiguration__Group_3__1 )
+            // InternalFormat.g:5369:2: rule__FormatConfiguration__Group_3__0__Impl rule__FormatConfiguration__Group_3__1
             {
-            pushFollow(FOLLOW_rule__FormatConfiguration__Group_3__0__Impl_in_rule__FormatConfiguration__Group_3__011773);
+            pushFollow(FOLLOW_5);
             rule__FormatConfiguration__Group_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__FormatConfiguration__Group_3__1_in_rule__FormatConfiguration__Group_3__011776);
+            pushFollow(FOLLOW_2);
             rule__FormatConfiguration__Group_3__1();
 
             state._fsp--;
@@ -18118,22 +18118,22 @@ public final void rule__FormatConfiguration__Group_3__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__FormatConfiguration__Group_3__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5376:1: rule__FormatConfiguration__Group_3__0__Impl : ( 'with' ) ;
+    // InternalFormat.g:5376:1: rule__FormatConfiguration__Group_3__0__Impl : ( 'with' ) ;
     public final void rule__FormatConfiguration__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5380:1: ( ( 'with' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5381:1: ( 'with' )
+            // InternalFormat.g:5380:1: ( ( 'with' ) )
+            // InternalFormat.g:5381:1: ( 'with' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5381:1: ( 'with' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5382:1: 'with'
+            // InternalFormat.g:5381:1: ( 'with' )
+            // InternalFormat.g:5382:1: 'with'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormatConfigurationAccess().getWithKeyword_3_0()); 
             }
-            match(input,63,FOLLOW_63_in_rule__FormatConfiguration__Group_3__0__Impl11804); if (state.failed) return ;
+            match(input,63,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getFormatConfigurationAccess().getWithKeyword_3_0()); 
             }
@@ -18159,16 +18159,16 @@ public final void rule__FormatConfiguration__Group_3__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__FormatConfiguration__Group_3__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5395:1: rule__FormatConfiguration__Group_3__1 : rule__FormatConfiguration__Group_3__1__Impl ;
+    // InternalFormat.g:5395:1: rule__FormatConfiguration__Group_3__1 : rule__FormatConfiguration__Group_3__1__Impl ;
     public final void rule__FormatConfiguration__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5399:1: ( rule__FormatConfiguration__Group_3__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5400:2: rule__FormatConfiguration__Group_3__1__Impl
+            // InternalFormat.g:5399:1: ( rule__FormatConfiguration__Group_3__1__Impl )
+            // InternalFormat.g:5400:2: rule__FormatConfiguration__Group_3__1__Impl
             {
-            pushFollow(FOLLOW_rule__FormatConfiguration__Group_3__1__Impl_in_rule__FormatConfiguration__Group_3__111835);
+            pushFollow(FOLLOW_2);
             rule__FormatConfiguration__Group_3__1__Impl();
 
             state._fsp--;
@@ -18192,25 +18192,25 @@ public final void rule__FormatConfiguration__Group_3__1() throws RecognitionExce
 
 
     // $ANTLR start "rule__FormatConfiguration__Group_3__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5406:1: rule__FormatConfiguration__Group_3__1__Impl : ( ( rule__FormatConfiguration__ExtendedFormatConfigurationAssignment_3_1 ) ) ;
+    // InternalFormat.g:5406:1: rule__FormatConfiguration__Group_3__1__Impl : ( ( rule__FormatConfiguration__ExtendedFormatConfigurationAssignment_3_1 ) ) ;
     public final void rule__FormatConfiguration__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5410:1: ( ( ( rule__FormatConfiguration__ExtendedFormatConfigurationAssignment_3_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5411:1: ( ( rule__FormatConfiguration__ExtendedFormatConfigurationAssignment_3_1 ) )
+            // InternalFormat.g:5410:1: ( ( ( rule__FormatConfiguration__ExtendedFormatConfigurationAssignment_3_1 ) ) )
+            // InternalFormat.g:5411:1: ( ( rule__FormatConfiguration__ExtendedFormatConfigurationAssignment_3_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5411:1: ( ( rule__FormatConfiguration__ExtendedFormatConfigurationAssignment_3_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5412:1: ( rule__FormatConfiguration__ExtendedFormatConfigurationAssignment_3_1 )
+            // InternalFormat.g:5411:1: ( ( rule__FormatConfiguration__ExtendedFormatConfigurationAssignment_3_1 ) )
+            // InternalFormat.g:5412:1: ( rule__FormatConfiguration__ExtendedFormatConfigurationAssignment_3_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormatConfigurationAccess().getExtendedFormatConfigurationAssignment_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5413:1: ( rule__FormatConfiguration__ExtendedFormatConfigurationAssignment_3_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5413:2: rule__FormatConfiguration__ExtendedFormatConfigurationAssignment_3_1
+            // InternalFormat.g:5413:1: ( rule__FormatConfiguration__ExtendedFormatConfigurationAssignment_3_1 )
+            // InternalFormat.g:5413:2: rule__FormatConfiguration__ExtendedFormatConfigurationAssignment_3_1
             {
-            pushFollow(FOLLOW_rule__FormatConfiguration__ExtendedFormatConfigurationAssignment_3_1_in_rule__FormatConfiguration__Group_3__1__Impl11862);
+            pushFollow(FOLLOW_2);
             rule__FormatConfiguration__ExtendedFormatConfigurationAssignment_3_1();
 
             state._fsp--;
@@ -18243,21 +18243,21 @@ public final void rule__FormatConfiguration__Group_3__1__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__FormatConfiguration__Group_4__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5427:1: rule__FormatConfiguration__Group_4__0 : rule__FormatConfiguration__Group_4__0__Impl rule__FormatConfiguration__Group_4__1 ;
+    // InternalFormat.g:5427:1: rule__FormatConfiguration__Group_4__0 : rule__FormatConfiguration__Group_4__0__Impl rule__FormatConfiguration__Group_4__1 ;
     public final void rule__FormatConfiguration__Group_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5431:1: ( rule__FormatConfiguration__Group_4__0__Impl rule__FormatConfiguration__Group_4__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5432:2: rule__FormatConfiguration__Group_4__0__Impl rule__FormatConfiguration__Group_4__1
+            // InternalFormat.g:5431:1: ( rule__FormatConfiguration__Group_4__0__Impl rule__FormatConfiguration__Group_4__1 )
+            // InternalFormat.g:5432:2: rule__FormatConfiguration__Group_4__0__Impl rule__FormatConfiguration__Group_4__1
             {
-            pushFollow(FOLLOW_rule__FormatConfiguration__Group_4__0__Impl_in_rule__FormatConfiguration__Group_4__011896);
+            pushFollow(FOLLOW_9);
             rule__FormatConfiguration__Group_4__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__FormatConfiguration__Group_4__1_in_rule__FormatConfiguration__Group_4__011899);
+            pushFollow(FOLLOW_2);
             rule__FormatConfiguration__Group_4__1();
 
             state._fsp--;
@@ -18281,22 +18281,22 @@ public final void rule__FormatConfiguration__Group_4__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__FormatConfiguration__Group_4__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5439:1: rule__FormatConfiguration__Group_4__0__Impl : ( 'extends' ) ;
+    // InternalFormat.g:5439:1: rule__FormatConfiguration__Group_4__0__Impl : ( 'extends' ) ;
     public final void rule__FormatConfiguration__Group_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5443:1: ( ( 'extends' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5444:1: ( 'extends' )
+            // InternalFormat.g:5443:1: ( ( 'extends' ) )
+            // InternalFormat.g:5444:1: ( 'extends' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5444:1: ( 'extends' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5445:1: 'extends'
+            // InternalFormat.g:5444:1: ( 'extends' )
+            // InternalFormat.g:5445:1: 'extends'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormatConfigurationAccess().getExtendsKeyword_4_0()); 
             }
-            match(input,50,FOLLOW_50_in_rule__FormatConfiguration__Group_4__0__Impl11927); if (state.failed) return ;
+            match(input,50,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getFormatConfigurationAccess().getExtendsKeyword_4_0()); 
             }
@@ -18322,16 +18322,16 @@ public final void rule__FormatConfiguration__Group_4__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__FormatConfiguration__Group_4__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5458:1: rule__FormatConfiguration__Group_4__1 : rule__FormatConfiguration__Group_4__1__Impl ;
+    // InternalFormat.g:5458:1: rule__FormatConfiguration__Group_4__1 : rule__FormatConfiguration__Group_4__1__Impl ;
     public final void rule__FormatConfiguration__Group_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5462:1: ( rule__FormatConfiguration__Group_4__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5463:2: rule__FormatConfiguration__Group_4__1__Impl
+            // InternalFormat.g:5462:1: ( rule__FormatConfiguration__Group_4__1__Impl )
+            // InternalFormat.g:5463:2: rule__FormatConfiguration__Group_4__1__Impl
             {
-            pushFollow(FOLLOW_rule__FormatConfiguration__Group_4__1__Impl_in_rule__FormatConfiguration__Group_4__111958);
+            pushFollow(FOLLOW_2);
             rule__FormatConfiguration__Group_4__1__Impl();
 
             state._fsp--;
@@ -18355,25 +18355,25 @@ public final void rule__FormatConfiguration__Group_4__1() throws RecognitionExce
 
 
     // $ANTLR start "rule__FormatConfiguration__Group_4__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5469:1: rule__FormatConfiguration__Group_4__1__Impl : ( ( rule__FormatConfiguration__FormatterBaseClassAssignment_4_1 ) ) ;
+    // InternalFormat.g:5469:1: rule__FormatConfiguration__Group_4__1__Impl : ( ( rule__FormatConfiguration__FormatterBaseClassAssignment_4_1 ) ) ;
     public final void rule__FormatConfiguration__Group_4__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5473:1: ( ( ( rule__FormatConfiguration__FormatterBaseClassAssignment_4_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5474:1: ( ( rule__FormatConfiguration__FormatterBaseClassAssignment_4_1 ) )
+            // InternalFormat.g:5473:1: ( ( ( rule__FormatConfiguration__FormatterBaseClassAssignment_4_1 ) ) )
+            // InternalFormat.g:5474:1: ( ( rule__FormatConfiguration__FormatterBaseClassAssignment_4_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5474:1: ( ( rule__FormatConfiguration__FormatterBaseClassAssignment_4_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5475:1: ( rule__FormatConfiguration__FormatterBaseClassAssignment_4_1 )
+            // InternalFormat.g:5474:1: ( ( rule__FormatConfiguration__FormatterBaseClassAssignment_4_1 ) )
+            // InternalFormat.g:5475:1: ( rule__FormatConfiguration__FormatterBaseClassAssignment_4_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormatConfigurationAccess().getFormatterBaseClassAssignment_4_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5476:1: ( rule__FormatConfiguration__FormatterBaseClassAssignment_4_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5476:2: rule__FormatConfiguration__FormatterBaseClassAssignment_4_1
+            // InternalFormat.g:5476:1: ( rule__FormatConfiguration__FormatterBaseClassAssignment_4_1 )
+            // InternalFormat.g:5476:2: rule__FormatConfiguration__FormatterBaseClassAssignment_4_1
             {
-            pushFollow(FOLLOW_rule__FormatConfiguration__FormatterBaseClassAssignment_4_1_in_rule__FormatConfiguration__Group_4__1__Impl11985);
+            pushFollow(FOLLOW_2);
             rule__FormatConfiguration__FormatterBaseClassAssignment_4_1();
 
             state._fsp--;
@@ -18406,21 +18406,21 @@ public final void rule__FormatConfiguration__Group_4__1__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__FormatConfiguration__Group_5__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5490:1: rule__FormatConfiguration__Group_5__0 : rule__FormatConfiguration__Group_5__0__Impl rule__FormatConfiguration__Group_5__1 ;
+    // InternalFormat.g:5490:1: rule__FormatConfiguration__Group_5__0 : rule__FormatConfiguration__Group_5__0__Impl rule__FormatConfiguration__Group_5__1 ;
     public final void rule__FormatConfiguration__Group_5__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5494:1: ( rule__FormatConfiguration__Group_5__0__Impl rule__FormatConfiguration__Group_5__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5495:2: rule__FormatConfiguration__Group_5__0__Impl rule__FormatConfiguration__Group_5__1
+            // InternalFormat.g:5494:1: ( rule__FormatConfiguration__Group_5__0__Impl rule__FormatConfiguration__Group_5__1 )
+            // InternalFormat.g:5495:2: rule__FormatConfiguration__Group_5__0__Impl rule__FormatConfiguration__Group_5__1
             {
-            pushFollow(FOLLOW_rule__FormatConfiguration__Group_5__0__Impl_in_rule__FormatConfiguration__Group_5__012019);
+            pushFollow(FOLLOW_10);
             rule__FormatConfiguration__Group_5__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__FormatConfiguration__Group_5__1_in_rule__FormatConfiguration__Group_5__012022);
+            pushFollow(FOLLOW_2);
             rule__FormatConfiguration__Group_5__1();
 
             state._fsp--;
@@ -18444,22 +18444,22 @@ public final void rule__FormatConfiguration__Group_5__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__FormatConfiguration__Group_5__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5502:1: rule__FormatConfiguration__Group_5__0__Impl : ( 'const' ) ;
+    // InternalFormat.g:5502:1: rule__FormatConfiguration__Group_5__0__Impl : ( 'const' ) ;
     public final void rule__FormatConfiguration__Group_5__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5506:1: ( ( 'const' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5507:1: ( 'const' )
+            // InternalFormat.g:5506:1: ( ( 'const' ) )
+            // InternalFormat.g:5507:1: ( 'const' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5507:1: ( 'const' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5508:1: 'const'
+            // InternalFormat.g:5507:1: ( 'const' )
+            // InternalFormat.g:5508:1: 'const'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormatConfigurationAccess().getConstKeyword_5_0()); 
             }
-            match(input,64,FOLLOW_64_in_rule__FormatConfiguration__Group_5__0__Impl12050); if (state.failed) return ;
+            match(input,64,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getFormatConfigurationAccess().getConstKeyword_5_0()); 
             }
@@ -18485,21 +18485,21 @@ public final void rule__FormatConfiguration__Group_5__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__FormatConfiguration__Group_5__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5521:1: rule__FormatConfiguration__Group_5__1 : rule__FormatConfiguration__Group_5__1__Impl rule__FormatConfiguration__Group_5__2 ;
+    // InternalFormat.g:5521:1: rule__FormatConfiguration__Group_5__1 : rule__FormatConfiguration__Group_5__1__Impl rule__FormatConfiguration__Group_5__2 ;
     public final void rule__FormatConfiguration__Group_5__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5525:1: ( rule__FormatConfiguration__Group_5__1__Impl rule__FormatConfiguration__Group_5__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5526:2: rule__FormatConfiguration__Group_5__1__Impl rule__FormatConfiguration__Group_5__2
+            // InternalFormat.g:5525:1: ( rule__FormatConfiguration__Group_5__1__Impl rule__FormatConfiguration__Group_5__2 )
+            // InternalFormat.g:5526:2: rule__FormatConfiguration__Group_5__1__Impl rule__FormatConfiguration__Group_5__2
             {
-            pushFollow(FOLLOW_rule__FormatConfiguration__Group_5__1__Impl_in_rule__FormatConfiguration__Group_5__112081);
+            pushFollow(FOLLOW_11);
             rule__FormatConfiguration__Group_5__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__FormatConfiguration__Group_5__2_in_rule__FormatConfiguration__Group_5__112084);
+            pushFollow(FOLLOW_2);
             rule__FormatConfiguration__Group_5__2();
 
             state._fsp--;
@@ -18523,25 +18523,25 @@ public final void rule__FormatConfiguration__Group_5__1() throws RecognitionExce
 
 
     // $ANTLR start "rule__FormatConfiguration__Group_5__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5533:1: rule__FormatConfiguration__Group_5__1__Impl : ( ( rule__FormatConfiguration__ConstantsAssignment_5_1 ) ) ;
+    // InternalFormat.g:5533:1: rule__FormatConfiguration__Group_5__1__Impl : ( ( rule__FormatConfiguration__ConstantsAssignment_5_1 ) ) ;
     public final void rule__FormatConfiguration__Group_5__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5537:1: ( ( ( rule__FormatConfiguration__ConstantsAssignment_5_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5538:1: ( ( rule__FormatConfiguration__ConstantsAssignment_5_1 ) )
+            // InternalFormat.g:5537:1: ( ( ( rule__FormatConfiguration__ConstantsAssignment_5_1 ) ) )
+            // InternalFormat.g:5538:1: ( ( rule__FormatConfiguration__ConstantsAssignment_5_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5538:1: ( ( rule__FormatConfiguration__ConstantsAssignment_5_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5539:1: ( rule__FormatConfiguration__ConstantsAssignment_5_1 )
+            // InternalFormat.g:5538:1: ( ( rule__FormatConfiguration__ConstantsAssignment_5_1 ) )
+            // InternalFormat.g:5539:1: ( rule__FormatConfiguration__ConstantsAssignment_5_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormatConfigurationAccess().getConstantsAssignment_5_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5540:1: ( rule__FormatConfiguration__ConstantsAssignment_5_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5540:2: rule__FormatConfiguration__ConstantsAssignment_5_1
+            // InternalFormat.g:5540:1: ( rule__FormatConfiguration__ConstantsAssignment_5_1 )
+            // InternalFormat.g:5540:2: rule__FormatConfiguration__ConstantsAssignment_5_1
             {
-            pushFollow(FOLLOW_rule__FormatConfiguration__ConstantsAssignment_5_1_in_rule__FormatConfiguration__Group_5__1__Impl12111);
+            pushFollow(FOLLOW_2);
             rule__FormatConfiguration__ConstantsAssignment_5_1();
 
             state._fsp--;
@@ -18574,16 +18574,16 @@ public final void rule__FormatConfiguration__Group_5__1__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__FormatConfiguration__Group_5__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5550:1: rule__FormatConfiguration__Group_5__2 : rule__FormatConfiguration__Group_5__2__Impl ;
+    // InternalFormat.g:5550:1: rule__FormatConfiguration__Group_5__2 : rule__FormatConfiguration__Group_5__2__Impl ;
     public final void rule__FormatConfiguration__Group_5__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5554:1: ( rule__FormatConfiguration__Group_5__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5555:2: rule__FormatConfiguration__Group_5__2__Impl
+            // InternalFormat.g:5554:1: ( rule__FormatConfiguration__Group_5__2__Impl )
+            // InternalFormat.g:5555:2: rule__FormatConfiguration__Group_5__2__Impl
             {
-            pushFollow(FOLLOW_rule__FormatConfiguration__Group_5__2__Impl_in_rule__FormatConfiguration__Group_5__212141);
+            pushFollow(FOLLOW_2);
             rule__FormatConfiguration__Group_5__2__Impl();
 
             state._fsp--;
@@ -18607,22 +18607,22 @@ public final void rule__FormatConfiguration__Group_5__2() throws RecognitionExce
 
 
     // $ANTLR start "rule__FormatConfiguration__Group_5__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5561:1: rule__FormatConfiguration__Group_5__2__Impl : ( ';' ) ;
+    // InternalFormat.g:5561:1: rule__FormatConfiguration__Group_5__2__Impl : ( ';' ) ;
     public final void rule__FormatConfiguration__Group_5__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5565:1: ( ( ';' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5566:1: ( ';' )
+            // InternalFormat.g:5565:1: ( ( ';' ) )
+            // InternalFormat.g:5566:1: ( ';' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5566:1: ( ';' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5567:1: ';'
+            // InternalFormat.g:5566:1: ( ';' )
+            // InternalFormat.g:5567:1: ';'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormatConfigurationAccess().getSemicolonKeyword_5_2()); 
             }
-            match(input,65,FOLLOW_65_in_rule__FormatConfiguration__Group_5__2__Impl12169); if (state.failed) return ;
+            match(input,65,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getFormatConfigurationAccess().getSemicolonKeyword_5_2()); 
             }
@@ -18648,21 +18648,21 @@ public final void rule__FormatConfiguration__Group_5__2__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__Constant__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5586:1: rule__Constant__Group__0 : rule__Constant__Group__0__Impl rule__Constant__Group__1 ;
+    // InternalFormat.g:5586:1: rule__Constant__Group__0 : rule__Constant__Group__0__Impl rule__Constant__Group__1 ;
     public final void rule__Constant__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5590:1: ( rule__Constant__Group__0__Impl rule__Constant__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5591:2: rule__Constant__Group__0__Impl rule__Constant__Group__1
+            // InternalFormat.g:5590:1: ( rule__Constant__Group__0__Impl rule__Constant__Group__1 )
+            // InternalFormat.g:5591:2: rule__Constant__Group__0__Impl rule__Constant__Group__1
             {
-            pushFollow(FOLLOW_rule__Constant__Group__0__Impl_in_rule__Constant__Group__012206);
+            pushFollow(FOLLOW_10);
             rule__Constant__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Constant__Group__1_in_rule__Constant__Group__012209);
+            pushFollow(FOLLOW_2);
             rule__Constant__Group__1();
 
             state._fsp--;
@@ -18686,22 +18686,22 @@ public final void rule__Constant__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Constant__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5598:1: rule__Constant__Group__0__Impl : ( ( rule__Constant__Alternatives_0 )? ) ;
+    // InternalFormat.g:5598:1: rule__Constant__Group__0__Impl : ( ( rule__Constant__Alternatives_0 )? ) ;
     public final void rule__Constant__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5602:1: ( ( ( rule__Constant__Alternatives_0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5603:1: ( ( rule__Constant__Alternatives_0 )? )
+            // InternalFormat.g:5602:1: ( ( ( rule__Constant__Alternatives_0 )? ) )
+            // InternalFormat.g:5603:1: ( ( rule__Constant__Alternatives_0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5603:1: ( ( rule__Constant__Alternatives_0 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5604:1: ( rule__Constant__Alternatives_0 )?
+            // InternalFormat.g:5603:1: ( ( rule__Constant__Alternatives_0 )? )
+            // InternalFormat.g:5604:1: ( rule__Constant__Alternatives_0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConstantAccess().getAlternatives_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5605:1: ( rule__Constant__Alternatives_0 )?
+            // InternalFormat.g:5605:1: ( rule__Constant__Alternatives_0 )?
             int alt72=2;
             int LA72_0 = input.LA(1);
 
@@ -18710,9 +18710,9 @@ public final void rule__Constant__Group__0__Impl() throws RecognitionException {
             }
             switch (alt72) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5605:2: rule__Constant__Alternatives_0
+                    // InternalFormat.g:5605:2: rule__Constant__Alternatives_0
                     {
-                    pushFollow(FOLLOW_rule__Constant__Alternatives_0_in_rule__Constant__Group__0__Impl12236);
+                    pushFollow(FOLLOW_2);
                     rule__Constant__Alternatives_0();
 
                     state._fsp--;
@@ -18748,21 +18748,21 @@ public final void rule__Constant__Group__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Constant__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5615:1: rule__Constant__Group__1 : rule__Constant__Group__1__Impl rule__Constant__Group__2 ;
+    // InternalFormat.g:5615:1: rule__Constant__Group__1 : rule__Constant__Group__1__Impl rule__Constant__Group__2 ;
     public final void rule__Constant__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5619:1: ( rule__Constant__Group__1__Impl rule__Constant__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5620:2: rule__Constant__Group__1__Impl rule__Constant__Group__2
+            // InternalFormat.g:5619:1: ( rule__Constant__Group__1__Impl rule__Constant__Group__2 )
+            // InternalFormat.g:5620:2: rule__Constant__Group__1__Impl rule__Constant__Group__2
             {
-            pushFollow(FOLLOW_rule__Constant__Group__1__Impl_in_rule__Constant__Group__112267);
+            pushFollow(FOLLOW_12);
             rule__Constant__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Constant__Group__2_in_rule__Constant__Group__112270);
+            pushFollow(FOLLOW_2);
             rule__Constant__Group__2();
 
             state._fsp--;
@@ -18786,25 +18786,25 @@ public final void rule__Constant__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Constant__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5627:1: rule__Constant__Group__1__Impl : ( ( rule__Constant__NameAssignment_1 ) ) ;
+    // InternalFormat.g:5627:1: rule__Constant__Group__1__Impl : ( ( rule__Constant__NameAssignment_1 ) ) ;
     public final void rule__Constant__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5631:1: ( ( ( rule__Constant__NameAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5632:1: ( ( rule__Constant__NameAssignment_1 ) )
+            // InternalFormat.g:5631:1: ( ( ( rule__Constant__NameAssignment_1 ) ) )
+            // InternalFormat.g:5632:1: ( ( rule__Constant__NameAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5632:1: ( ( rule__Constant__NameAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5633:1: ( rule__Constant__NameAssignment_1 )
+            // InternalFormat.g:5632:1: ( ( rule__Constant__NameAssignment_1 ) )
+            // InternalFormat.g:5633:1: ( rule__Constant__NameAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConstantAccess().getNameAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5634:1: ( rule__Constant__NameAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5634:2: rule__Constant__NameAssignment_1
+            // InternalFormat.g:5634:1: ( rule__Constant__NameAssignment_1 )
+            // InternalFormat.g:5634:2: rule__Constant__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__Constant__NameAssignment_1_in_rule__Constant__Group__1__Impl12297);
+            pushFollow(FOLLOW_2);
             rule__Constant__NameAssignment_1();
 
             state._fsp--;
@@ -18837,21 +18837,21 @@ public final void rule__Constant__Group__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Constant__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5644:1: rule__Constant__Group__2 : rule__Constant__Group__2__Impl rule__Constant__Group__3 ;
+    // InternalFormat.g:5644:1: rule__Constant__Group__2 : rule__Constant__Group__2__Impl rule__Constant__Group__3 ;
     public final void rule__Constant__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5648:1: ( rule__Constant__Group__2__Impl rule__Constant__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5649:2: rule__Constant__Group__2__Impl rule__Constant__Group__3
+            // InternalFormat.g:5648:1: ( rule__Constant__Group__2__Impl rule__Constant__Group__3 )
+            // InternalFormat.g:5649:2: rule__Constant__Group__2__Impl rule__Constant__Group__3
             {
-            pushFollow(FOLLOW_rule__Constant__Group__2__Impl_in_rule__Constant__Group__212327);
+            pushFollow(FOLLOW_13);
             rule__Constant__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Constant__Group__3_in_rule__Constant__Group__212330);
+            pushFollow(FOLLOW_2);
             rule__Constant__Group__3();
 
             state._fsp--;
@@ -18875,22 +18875,22 @@ public final void rule__Constant__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__Constant__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5656:1: rule__Constant__Group__2__Impl : ( '=' ) ;
+    // InternalFormat.g:5656:1: rule__Constant__Group__2__Impl : ( '=' ) ;
     public final void rule__Constant__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5660:1: ( ( '=' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5661:1: ( '=' )
+            // InternalFormat.g:5660:1: ( ( '=' ) )
+            // InternalFormat.g:5661:1: ( '=' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5661:1: ( '=' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5662:1: '='
+            // InternalFormat.g:5661:1: ( '=' )
+            // InternalFormat.g:5662:1: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConstantAccess().getEqualsSignKeyword_2()); 
             }
-            match(input,14,FOLLOW_14_in_rule__Constant__Group__2__Impl12358); if (state.failed) return ;
+            match(input,14,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getConstantAccess().getEqualsSignKeyword_2()); 
             }
@@ -18916,16 +18916,16 @@ public final void rule__Constant__Group__2__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Constant__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5675:1: rule__Constant__Group__3 : rule__Constant__Group__3__Impl ;
+    // InternalFormat.g:5675:1: rule__Constant__Group__3 : rule__Constant__Group__3__Impl ;
     public final void rule__Constant__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5679:1: ( rule__Constant__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5680:2: rule__Constant__Group__3__Impl
+            // InternalFormat.g:5679:1: ( rule__Constant__Group__3__Impl )
+            // InternalFormat.g:5680:2: rule__Constant__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__Constant__Group__3__Impl_in_rule__Constant__Group__312389);
+            pushFollow(FOLLOW_2);
             rule__Constant__Group__3__Impl();
 
             state._fsp--;
@@ -18949,25 +18949,25 @@ public final void rule__Constant__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__Constant__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5686:1: rule__Constant__Group__3__Impl : ( ( rule__Constant__Alternatives_3 ) ) ;
+    // InternalFormat.g:5686:1: rule__Constant__Group__3__Impl : ( ( rule__Constant__Alternatives_3 ) ) ;
     public final void rule__Constant__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5690:1: ( ( ( rule__Constant__Alternatives_3 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5691:1: ( ( rule__Constant__Alternatives_3 ) )
+            // InternalFormat.g:5690:1: ( ( ( rule__Constant__Alternatives_3 ) ) )
+            // InternalFormat.g:5691:1: ( ( rule__Constant__Alternatives_3 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5691:1: ( ( rule__Constant__Alternatives_3 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5692:1: ( rule__Constant__Alternatives_3 )
+            // InternalFormat.g:5691:1: ( ( rule__Constant__Alternatives_3 ) )
+            // InternalFormat.g:5692:1: ( rule__Constant__Alternatives_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConstantAccess().getAlternatives_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5693:1: ( rule__Constant__Alternatives_3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5693:2: rule__Constant__Alternatives_3
+            // InternalFormat.g:5693:1: ( rule__Constant__Alternatives_3 )
+            // InternalFormat.g:5693:2: rule__Constant__Alternatives_3
             {
-            pushFollow(FOLLOW_rule__Constant__Alternatives_3_in_rule__Constant__Group__3__Impl12416);
+            pushFollow(FOLLOW_2);
             rule__Constant__Alternatives_3();
 
             state._fsp--;
@@ -19000,21 +19000,21 @@ public final void rule__Constant__Group__3__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__GrammarRule__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5711:1: rule__GrammarRule__Group__0 : rule__GrammarRule__Group__0__Impl rule__GrammarRule__Group__1 ;
+    // InternalFormat.g:5711:1: rule__GrammarRule__Group__0 : rule__GrammarRule__Group__0__Impl rule__GrammarRule__Group__1 ;
     public final void rule__GrammarRule__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5715:1: ( rule__GrammarRule__Group__0__Impl rule__GrammarRule__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5716:2: rule__GrammarRule__Group__0__Impl rule__GrammarRule__Group__1
+            // InternalFormat.g:5715:1: ( rule__GrammarRule__Group__0__Impl rule__GrammarRule__Group__1 )
+            // InternalFormat.g:5716:2: rule__GrammarRule__Group__0__Impl rule__GrammarRule__Group__1
             {
-            pushFollow(FOLLOW_rule__GrammarRule__Group__0__Impl_in_rule__GrammarRule__Group__012454);
+            pushFollow(FOLLOW_14);
             rule__GrammarRule__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__GrammarRule__Group__1_in_rule__GrammarRule__Group__012457);
+            pushFollow(FOLLOW_2);
             rule__GrammarRule__Group__1();
 
             state._fsp--;
@@ -19038,22 +19038,22 @@ public final void rule__GrammarRule__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__GrammarRule__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5723:1: rule__GrammarRule__Group__0__Impl : ( ( rule__GrammarRule__OverrideAssignment_0 )? ) ;
+    // InternalFormat.g:5723:1: rule__GrammarRule__Group__0__Impl : ( ( rule__GrammarRule__OverrideAssignment_0 )? ) ;
     public final void rule__GrammarRule__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5727:1: ( ( ( rule__GrammarRule__OverrideAssignment_0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5728:1: ( ( rule__GrammarRule__OverrideAssignment_0 )? )
+            // InternalFormat.g:5727:1: ( ( ( rule__GrammarRule__OverrideAssignment_0 )? ) )
+            // InternalFormat.g:5728:1: ( ( rule__GrammarRule__OverrideAssignment_0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5728:1: ( ( rule__GrammarRule__OverrideAssignment_0 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5729:1: ( rule__GrammarRule__OverrideAssignment_0 )?
+            // InternalFormat.g:5728:1: ( ( rule__GrammarRule__OverrideAssignment_0 )? )
+            // InternalFormat.g:5729:1: ( rule__GrammarRule__OverrideAssignment_0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGrammarRuleAccess().getOverrideAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5730:1: ( rule__GrammarRule__OverrideAssignment_0 )?
+            // InternalFormat.g:5730:1: ( rule__GrammarRule__OverrideAssignment_0 )?
             int alt73=2;
             int LA73_0 = input.LA(1);
 
@@ -19062,9 +19062,9 @@ public final void rule__GrammarRule__Group__0__Impl() throws RecognitionExceptio
             }
             switch (alt73) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5730:2: rule__GrammarRule__OverrideAssignment_0
+                    // InternalFormat.g:5730:2: rule__GrammarRule__OverrideAssignment_0
                     {
-                    pushFollow(FOLLOW_rule__GrammarRule__OverrideAssignment_0_in_rule__GrammarRule__Group__0__Impl12484);
+                    pushFollow(FOLLOW_2);
                     rule__GrammarRule__OverrideAssignment_0();
 
                     state._fsp--;
@@ -19100,21 +19100,21 @@ public final void rule__GrammarRule__Group__0__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__GrammarRule__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5740:1: rule__GrammarRule__Group__1 : rule__GrammarRule__Group__1__Impl rule__GrammarRule__Group__2 ;
+    // InternalFormat.g:5740:1: rule__GrammarRule__Group__1 : rule__GrammarRule__Group__1__Impl rule__GrammarRule__Group__2 ;
     public final void rule__GrammarRule__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5744:1: ( rule__GrammarRule__Group__1__Impl rule__GrammarRule__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5745:2: rule__GrammarRule__Group__1__Impl rule__GrammarRule__Group__2
+            // InternalFormat.g:5744:1: ( rule__GrammarRule__Group__1__Impl rule__GrammarRule__Group__2 )
+            // InternalFormat.g:5745:2: rule__GrammarRule__Group__1__Impl rule__GrammarRule__Group__2
             {
-            pushFollow(FOLLOW_rule__GrammarRule__Group__1__Impl_in_rule__GrammarRule__Group__112515);
+            pushFollow(FOLLOW_15);
             rule__GrammarRule__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__GrammarRule__Group__2_in_rule__GrammarRule__Group__112518);
+            pushFollow(FOLLOW_2);
             rule__GrammarRule__Group__2();
 
             state._fsp--;
@@ -19138,25 +19138,25 @@ public final void rule__GrammarRule__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__GrammarRule__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5752:1: rule__GrammarRule__Group__1__Impl : ( ( rule__GrammarRule__TargetRuleAssignment_1 ) ) ;
+    // InternalFormat.g:5752:1: rule__GrammarRule__Group__1__Impl : ( ( rule__GrammarRule__TargetRuleAssignment_1 ) ) ;
     public final void rule__GrammarRule__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5756:1: ( ( ( rule__GrammarRule__TargetRuleAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5757:1: ( ( rule__GrammarRule__TargetRuleAssignment_1 ) )
+            // InternalFormat.g:5756:1: ( ( ( rule__GrammarRule__TargetRuleAssignment_1 ) ) )
+            // InternalFormat.g:5757:1: ( ( rule__GrammarRule__TargetRuleAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5757:1: ( ( rule__GrammarRule__TargetRuleAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5758:1: ( rule__GrammarRule__TargetRuleAssignment_1 )
+            // InternalFormat.g:5757:1: ( ( rule__GrammarRule__TargetRuleAssignment_1 ) )
+            // InternalFormat.g:5758:1: ( rule__GrammarRule__TargetRuleAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGrammarRuleAccess().getTargetRuleAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5759:1: ( rule__GrammarRule__TargetRuleAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5759:2: rule__GrammarRule__TargetRuleAssignment_1
+            // InternalFormat.g:5759:1: ( rule__GrammarRule__TargetRuleAssignment_1 )
+            // InternalFormat.g:5759:2: rule__GrammarRule__TargetRuleAssignment_1
             {
-            pushFollow(FOLLOW_rule__GrammarRule__TargetRuleAssignment_1_in_rule__GrammarRule__Group__1__Impl12545);
+            pushFollow(FOLLOW_2);
             rule__GrammarRule__TargetRuleAssignment_1();
 
             state._fsp--;
@@ -19189,21 +19189,21 @@ public final void rule__GrammarRule__Group__1__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__GrammarRule__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5769:1: rule__GrammarRule__Group__2 : rule__GrammarRule__Group__2__Impl rule__GrammarRule__Group__3 ;
+    // InternalFormat.g:5769:1: rule__GrammarRule__Group__2 : rule__GrammarRule__Group__2__Impl rule__GrammarRule__Group__3 ;
     public final void rule__GrammarRule__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5773:1: ( rule__GrammarRule__Group__2__Impl rule__GrammarRule__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5774:2: rule__GrammarRule__Group__2__Impl rule__GrammarRule__Group__3
+            // InternalFormat.g:5773:1: ( rule__GrammarRule__Group__2__Impl rule__GrammarRule__Group__3 )
+            // InternalFormat.g:5774:2: rule__GrammarRule__Group__2__Impl rule__GrammarRule__Group__3
             {
-            pushFollow(FOLLOW_rule__GrammarRule__Group__2__Impl_in_rule__GrammarRule__Group__212575);
+            pushFollow(FOLLOW_16);
             rule__GrammarRule__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__GrammarRule__Group__3_in_rule__GrammarRule__Group__212578);
+            pushFollow(FOLLOW_2);
             rule__GrammarRule__Group__3();
 
             state._fsp--;
@@ -19227,22 +19227,22 @@ public final void rule__GrammarRule__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__GrammarRule__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5781:1: rule__GrammarRule__Group__2__Impl : ( '{' ) ;
+    // InternalFormat.g:5781:1: rule__GrammarRule__Group__2__Impl : ( '{' ) ;
     public final void rule__GrammarRule__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5785:1: ( ( '{' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5786:1: ( '{' )
+            // InternalFormat.g:5785:1: ( ( '{' ) )
+            // InternalFormat.g:5786:1: ( '{' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5786:1: ( '{' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5787:1: '{'
+            // InternalFormat.g:5786:1: ( '{' )
+            // InternalFormat.g:5787:1: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGrammarRuleAccess().getLeftCurlyBracketKeyword_2()); 
             }
-            match(input,66,FOLLOW_66_in_rule__GrammarRule__Group__2__Impl12606); if (state.failed) return ;
+            match(input,66,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGrammarRuleAccess().getLeftCurlyBracketKeyword_2()); 
             }
@@ -19268,21 +19268,21 @@ public final void rule__GrammarRule__Group__2__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__GrammarRule__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5800:1: rule__GrammarRule__Group__3 : rule__GrammarRule__Group__3__Impl rule__GrammarRule__Group__4 ;
+    // InternalFormat.g:5800:1: rule__GrammarRule__Group__3 : rule__GrammarRule__Group__3__Impl rule__GrammarRule__Group__4 ;
     public final void rule__GrammarRule__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5804:1: ( rule__GrammarRule__Group__3__Impl rule__GrammarRule__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5805:2: rule__GrammarRule__Group__3__Impl rule__GrammarRule__Group__4
+            // InternalFormat.g:5804:1: ( rule__GrammarRule__Group__3__Impl rule__GrammarRule__Group__4 )
+            // InternalFormat.g:5805:2: rule__GrammarRule__Group__3__Impl rule__GrammarRule__Group__4
             {
-            pushFollow(FOLLOW_rule__GrammarRule__Group__3__Impl_in_rule__GrammarRule__Group__312637);
+            pushFollow(FOLLOW_16);
             rule__GrammarRule__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__GrammarRule__Group__4_in_rule__GrammarRule__Group__312640);
+            pushFollow(FOLLOW_2);
             rule__GrammarRule__Group__4();
 
             state._fsp--;
@@ -19306,22 +19306,22 @@ public final void rule__GrammarRule__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__GrammarRule__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5812:1: rule__GrammarRule__Group__3__Impl : ( ( rule__GrammarRule__Alternatives_3 )* ) ;
+    // InternalFormat.g:5812:1: rule__GrammarRule__Group__3__Impl : ( ( rule__GrammarRule__Alternatives_3 )* ) ;
     public final void rule__GrammarRule__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5816:1: ( ( ( rule__GrammarRule__Alternatives_3 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5817:1: ( ( rule__GrammarRule__Alternatives_3 )* )
+            // InternalFormat.g:5816:1: ( ( ( rule__GrammarRule__Alternatives_3 )* ) )
+            // InternalFormat.g:5817:1: ( ( rule__GrammarRule__Alternatives_3 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5817:1: ( ( rule__GrammarRule__Alternatives_3 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5818:1: ( rule__GrammarRule__Alternatives_3 )*
+            // InternalFormat.g:5817:1: ( ( rule__GrammarRule__Alternatives_3 )* )
+            // InternalFormat.g:5818:1: ( rule__GrammarRule__Alternatives_3 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGrammarRuleAccess().getAlternatives_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5819:1: ( rule__GrammarRule__Alternatives_3 )*
+            // InternalFormat.g:5819:1: ( rule__GrammarRule__Alternatives_3 )*
             loop74:
             do {
                 int alt74=2;
@@ -19334,9 +19334,9 @@ public final void rule__GrammarRule__Group__3__Impl() throws RecognitionExceptio
 
                 switch (alt74) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5819:2: rule__GrammarRule__Alternatives_3
+            	    // InternalFormat.g:5819:2: rule__GrammarRule__Alternatives_3
             	    {
-            	    pushFollow(FOLLOW_rule__GrammarRule__Alternatives_3_in_rule__GrammarRule__Group__3__Impl12667);
+            	    pushFollow(FOLLOW_17);
             	    rule__GrammarRule__Alternatives_3();
 
             	    state._fsp--;
@@ -19375,16 +19375,16 @@ public final void rule__GrammarRule__Group__3__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__GrammarRule__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5829:1: rule__GrammarRule__Group__4 : rule__GrammarRule__Group__4__Impl ;
+    // InternalFormat.g:5829:1: rule__GrammarRule__Group__4 : rule__GrammarRule__Group__4__Impl ;
     public final void rule__GrammarRule__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5833:1: ( rule__GrammarRule__Group__4__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5834:2: rule__GrammarRule__Group__4__Impl
+            // InternalFormat.g:5833:1: ( rule__GrammarRule__Group__4__Impl )
+            // InternalFormat.g:5834:2: rule__GrammarRule__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__GrammarRule__Group__4__Impl_in_rule__GrammarRule__Group__412698);
+            pushFollow(FOLLOW_2);
             rule__GrammarRule__Group__4__Impl();
 
             state._fsp--;
@@ -19408,22 +19408,22 @@ public final void rule__GrammarRule__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__GrammarRule__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5840:1: rule__GrammarRule__Group__4__Impl : ( '}' ) ;
+    // InternalFormat.g:5840:1: rule__GrammarRule__Group__4__Impl : ( '}' ) ;
     public final void rule__GrammarRule__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5844:1: ( ( '}' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5845:1: ( '}' )
+            // InternalFormat.g:5844:1: ( ( '}' ) )
+            // InternalFormat.g:5845:1: ( '}' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5845:1: ( '}' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5846:1: '}'
+            // InternalFormat.g:5845:1: ( '}' )
+            // InternalFormat.g:5846:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGrammarRuleAccess().getRightCurlyBracketKeyword_4()); 
             }
-            match(input,67,FOLLOW_67_in_rule__GrammarRule__Group__4__Impl12726); if (state.failed) return ;
+            match(input,67,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGrammarRuleAccess().getRightCurlyBracketKeyword_4()); 
             }
@@ -19449,21 +19449,21 @@ public final void rule__GrammarRule__Group__4__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__WildcardRule__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5869:1: rule__WildcardRule__Group__0 : rule__WildcardRule__Group__0__Impl rule__WildcardRule__Group__1 ;
+    // InternalFormat.g:5869:1: rule__WildcardRule__Group__0 : rule__WildcardRule__Group__0__Impl rule__WildcardRule__Group__1 ;
     public final void rule__WildcardRule__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5873:1: ( rule__WildcardRule__Group__0__Impl rule__WildcardRule__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5874:2: rule__WildcardRule__Group__0__Impl rule__WildcardRule__Group__1
+            // InternalFormat.g:5873:1: ( rule__WildcardRule__Group__0__Impl rule__WildcardRule__Group__1 )
+            // InternalFormat.g:5874:2: rule__WildcardRule__Group__0__Impl rule__WildcardRule__Group__1
             {
-            pushFollow(FOLLOW_rule__WildcardRule__Group__0__Impl_in_rule__WildcardRule__Group__012767);
+            pushFollow(FOLLOW_18);
             rule__WildcardRule__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__WildcardRule__Group__1_in_rule__WildcardRule__Group__012770);
+            pushFollow(FOLLOW_2);
             rule__WildcardRule__Group__1();
 
             state._fsp--;
@@ -19487,23 +19487,23 @@ public final void rule__WildcardRule__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__WildcardRule__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5881:1: rule__WildcardRule__Group__0__Impl : ( () ) ;
+    // InternalFormat.g:5881:1: rule__WildcardRule__Group__0__Impl : ( () ) ;
     public final void rule__WildcardRule__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5885:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5886:1: ( () )
+            // InternalFormat.g:5885:1: ( ( () ) )
+            // InternalFormat.g:5886:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5886:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5887:1: ()
+            // InternalFormat.g:5886:1: ( () )
+            // InternalFormat.g:5887:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getWildcardRuleAccess().getWildcardRuleAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5888:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5890:1: 
+            // InternalFormat.g:5888:1: ()
+            // InternalFormat.g:5890:1: 
             {
             }
 
@@ -19528,21 +19528,21 @@ public final void rule__WildcardRule__Group__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__WildcardRule__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5900:1: rule__WildcardRule__Group__1 : rule__WildcardRule__Group__1__Impl rule__WildcardRule__Group__2 ;
+    // InternalFormat.g:5900:1: rule__WildcardRule__Group__1 : rule__WildcardRule__Group__1__Impl rule__WildcardRule__Group__2 ;
     public final void rule__WildcardRule__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5904:1: ( rule__WildcardRule__Group__1__Impl rule__WildcardRule__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5905:2: rule__WildcardRule__Group__1__Impl rule__WildcardRule__Group__2
+            // InternalFormat.g:5904:1: ( rule__WildcardRule__Group__1__Impl rule__WildcardRule__Group__2 )
+            // InternalFormat.g:5905:2: rule__WildcardRule__Group__1__Impl rule__WildcardRule__Group__2
             {
-            pushFollow(FOLLOW_rule__WildcardRule__Group__1__Impl_in_rule__WildcardRule__Group__112828);
+            pushFollow(FOLLOW_18);
             rule__WildcardRule__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__WildcardRule__Group__2_in_rule__WildcardRule__Group__112831);
+            pushFollow(FOLLOW_2);
             rule__WildcardRule__Group__2();
 
             state._fsp--;
@@ -19566,22 +19566,22 @@ public final void rule__WildcardRule__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__WildcardRule__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5912:1: rule__WildcardRule__Group__1__Impl : ( ( rule__WildcardRule__OverrideAssignment_1 )? ) ;
+    // InternalFormat.g:5912:1: rule__WildcardRule__Group__1__Impl : ( ( rule__WildcardRule__OverrideAssignment_1 )? ) ;
     public final void rule__WildcardRule__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5916:1: ( ( ( rule__WildcardRule__OverrideAssignment_1 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5917:1: ( ( rule__WildcardRule__OverrideAssignment_1 )? )
+            // InternalFormat.g:5916:1: ( ( ( rule__WildcardRule__OverrideAssignment_1 )? ) )
+            // InternalFormat.g:5917:1: ( ( rule__WildcardRule__OverrideAssignment_1 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5917:1: ( ( rule__WildcardRule__OverrideAssignment_1 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5918:1: ( rule__WildcardRule__OverrideAssignment_1 )?
+            // InternalFormat.g:5917:1: ( ( rule__WildcardRule__OverrideAssignment_1 )? )
+            // InternalFormat.g:5918:1: ( rule__WildcardRule__OverrideAssignment_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getWildcardRuleAccess().getOverrideAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5919:1: ( rule__WildcardRule__OverrideAssignment_1 )?
+            // InternalFormat.g:5919:1: ( rule__WildcardRule__OverrideAssignment_1 )?
             int alt75=2;
             int LA75_0 = input.LA(1);
 
@@ -19590,9 +19590,9 @@ public final void rule__WildcardRule__Group__1__Impl() throws RecognitionExcepti
             }
             switch (alt75) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5919:2: rule__WildcardRule__OverrideAssignment_1
+                    // InternalFormat.g:5919:2: rule__WildcardRule__OverrideAssignment_1
                     {
-                    pushFollow(FOLLOW_rule__WildcardRule__OverrideAssignment_1_in_rule__WildcardRule__Group__1__Impl12858);
+                    pushFollow(FOLLOW_2);
                     rule__WildcardRule__OverrideAssignment_1();
 
                     state._fsp--;
@@ -19628,21 +19628,21 @@ public final void rule__WildcardRule__Group__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__WildcardRule__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5929:1: rule__WildcardRule__Group__2 : rule__WildcardRule__Group__2__Impl rule__WildcardRule__Group__3 ;
+    // InternalFormat.g:5929:1: rule__WildcardRule__Group__2 : rule__WildcardRule__Group__2__Impl rule__WildcardRule__Group__3 ;
     public final void rule__WildcardRule__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5933:1: ( rule__WildcardRule__Group__2__Impl rule__WildcardRule__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5934:2: rule__WildcardRule__Group__2__Impl rule__WildcardRule__Group__3
+            // InternalFormat.g:5933:1: ( rule__WildcardRule__Group__2__Impl rule__WildcardRule__Group__3 )
+            // InternalFormat.g:5934:2: rule__WildcardRule__Group__2__Impl rule__WildcardRule__Group__3
             {
-            pushFollow(FOLLOW_rule__WildcardRule__Group__2__Impl_in_rule__WildcardRule__Group__212889);
+            pushFollow(FOLLOW_15);
             rule__WildcardRule__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__WildcardRule__Group__3_in_rule__WildcardRule__Group__212892);
+            pushFollow(FOLLOW_2);
             rule__WildcardRule__Group__3();
 
             state._fsp--;
@@ -19666,22 +19666,22 @@ public final void rule__WildcardRule__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__WildcardRule__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5941:1: rule__WildcardRule__Group__2__Impl : ( '*' ) ;
+    // InternalFormat.g:5941:1: rule__WildcardRule__Group__2__Impl : ( '*' ) ;
     public final void rule__WildcardRule__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5945:1: ( ( '*' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5946:1: ( '*' )
+            // InternalFormat.g:5945:1: ( ( '*' ) )
+            // InternalFormat.g:5946:1: ( '*' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5946:1: ( '*' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5947:1: '*'
+            // InternalFormat.g:5946:1: ( '*' )
+            // InternalFormat.g:5947:1: '*'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getWildcardRuleAccess().getAsteriskKeyword_2()); 
             }
-            match(input,42,FOLLOW_42_in_rule__WildcardRule__Group__2__Impl12920); if (state.failed) return ;
+            match(input,42,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getWildcardRuleAccess().getAsteriskKeyword_2()); 
             }
@@ -19707,21 +19707,21 @@ public final void rule__WildcardRule__Group__2__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__WildcardRule__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5960:1: rule__WildcardRule__Group__3 : rule__WildcardRule__Group__3__Impl rule__WildcardRule__Group__4 ;
+    // InternalFormat.g:5960:1: rule__WildcardRule__Group__3 : rule__WildcardRule__Group__3__Impl rule__WildcardRule__Group__4 ;
     public final void rule__WildcardRule__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5964:1: ( rule__WildcardRule__Group__3__Impl rule__WildcardRule__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5965:2: rule__WildcardRule__Group__3__Impl rule__WildcardRule__Group__4
+            // InternalFormat.g:5964:1: ( rule__WildcardRule__Group__3__Impl rule__WildcardRule__Group__4 )
+            // InternalFormat.g:5965:2: rule__WildcardRule__Group__3__Impl rule__WildcardRule__Group__4
             {
-            pushFollow(FOLLOW_rule__WildcardRule__Group__3__Impl_in_rule__WildcardRule__Group__312951);
+            pushFollow(FOLLOW_19);
             rule__WildcardRule__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__WildcardRule__Group__4_in_rule__WildcardRule__Group__312954);
+            pushFollow(FOLLOW_2);
             rule__WildcardRule__Group__4();
 
             state._fsp--;
@@ -19745,22 +19745,22 @@ public final void rule__WildcardRule__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__WildcardRule__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5972:1: rule__WildcardRule__Group__3__Impl : ( '{' ) ;
+    // InternalFormat.g:5972:1: rule__WildcardRule__Group__3__Impl : ( '{' ) ;
     public final void rule__WildcardRule__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5976:1: ( ( '{' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5977:1: ( '{' )
+            // InternalFormat.g:5976:1: ( ( '{' ) )
+            // InternalFormat.g:5977:1: ( '{' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5977:1: ( '{' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5978:1: '{'
+            // InternalFormat.g:5977:1: ( '{' )
+            // InternalFormat.g:5978:1: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getWildcardRuleAccess().getLeftCurlyBracketKeyword_3()); 
             }
-            match(input,66,FOLLOW_66_in_rule__WildcardRule__Group__3__Impl12982); if (state.failed) return ;
+            match(input,66,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getWildcardRuleAccess().getLeftCurlyBracketKeyword_3()); 
             }
@@ -19786,21 +19786,21 @@ public final void rule__WildcardRule__Group__3__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__WildcardRule__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5991:1: rule__WildcardRule__Group__4 : rule__WildcardRule__Group__4__Impl rule__WildcardRule__Group__5 ;
+    // InternalFormat.g:5991:1: rule__WildcardRule__Group__4 : rule__WildcardRule__Group__4__Impl rule__WildcardRule__Group__5 ;
     public final void rule__WildcardRule__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5995:1: ( rule__WildcardRule__Group__4__Impl rule__WildcardRule__Group__5 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:5996:2: rule__WildcardRule__Group__4__Impl rule__WildcardRule__Group__5
+            // InternalFormat.g:5995:1: ( rule__WildcardRule__Group__4__Impl rule__WildcardRule__Group__5 )
+            // InternalFormat.g:5996:2: rule__WildcardRule__Group__4__Impl rule__WildcardRule__Group__5
             {
-            pushFollow(FOLLOW_rule__WildcardRule__Group__4__Impl_in_rule__WildcardRule__Group__413013);
+            pushFollow(FOLLOW_19);
             rule__WildcardRule__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__WildcardRule__Group__5_in_rule__WildcardRule__Group__413016);
+            pushFollow(FOLLOW_2);
             rule__WildcardRule__Group__5();
 
             state._fsp--;
@@ -19824,22 +19824,22 @@ public final void rule__WildcardRule__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__WildcardRule__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6003:1: rule__WildcardRule__Group__4__Impl : ( ( rule__WildcardRule__DirectivesAssignment_4 )* ) ;
+    // InternalFormat.g:6003:1: rule__WildcardRule__Group__4__Impl : ( ( rule__WildcardRule__DirectivesAssignment_4 )* ) ;
     public final void rule__WildcardRule__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6007:1: ( ( ( rule__WildcardRule__DirectivesAssignment_4 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6008:1: ( ( rule__WildcardRule__DirectivesAssignment_4 )* )
+            // InternalFormat.g:6007:1: ( ( ( rule__WildcardRule__DirectivesAssignment_4 )* ) )
+            // InternalFormat.g:6008:1: ( ( rule__WildcardRule__DirectivesAssignment_4 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6008:1: ( ( rule__WildcardRule__DirectivesAssignment_4 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6009:1: ( rule__WildcardRule__DirectivesAssignment_4 )*
+            // InternalFormat.g:6008:1: ( ( rule__WildcardRule__DirectivesAssignment_4 )* )
+            // InternalFormat.g:6009:1: ( rule__WildcardRule__DirectivesAssignment_4 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getWildcardRuleAccess().getDirectivesAssignment_4()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6010:1: ( rule__WildcardRule__DirectivesAssignment_4 )*
+            // InternalFormat.g:6010:1: ( rule__WildcardRule__DirectivesAssignment_4 )*
             loop76:
             do {
                 int alt76=2;
@@ -19852,9 +19852,9 @@ public final void rule__WildcardRule__Group__4__Impl() throws RecognitionExcepti
 
                 switch (alt76) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6010:2: rule__WildcardRule__DirectivesAssignment_4
+            	    // InternalFormat.g:6010:2: rule__WildcardRule__DirectivesAssignment_4
             	    {
-            	    pushFollow(FOLLOW_rule__WildcardRule__DirectivesAssignment_4_in_rule__WildcardRule__Group__4__Impl13043);
+            	    pushFollow(FOLLOW_20);
             	    rule__WildcardRule__DirectivesAssignment_4();
 
             	    state._fsp--;
@@ -19893,16 +19893,16 @@ public final void rule__WildcardRule__Group__4__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__WildcardRule__Group__5"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6020:1: rule__WildcardRule__Group__5 : rule__WildcardRule__Group__5__Impl ;
+    // InternalFormat.g:6020:1: rule__WildcardRule__Group__5 : rule__WildcardRule__Group__5__Impl ;
     public final void rule__WildcardRule__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6024:1: ( rule__WildcardRule__Group__5__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6025:2: rule__WildcardRule__Group__5__Impl
+            // InternalFormat.g:6024:1: ( rule__WildcardRule__Group__5__Impl )
+            // InternalFormat.g:6025:2: rule__WildcardRule__Group__5__Impl
             {
-            pushFollow(FOLLOW_rule__WildcardRule__Group__5__Impl_in_rule__WildcardRule__Group__513074);
+            pushFollow(FOLLOW_2);
             rule__WildcardRule__Group__5__Impl();
 
             state._fsp--;
@@ -19926,22 +19926,22 @@ public final void rule__WildcardRule__Group__5() throws RecognitionException {
 
 
     // $ANTLR start "rule__WildcardRule__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6031:1: rule__WildcardRule__Group__5__Impl : ( '}' ) ;
+    // InternalFormat.g:6031:1: rule__WildcardRule__Group__5__Impl : ( '}' ) ;
     public final void rule__WildcardRule__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6035:1: ( ( '}' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6036:1: ( '}' )
+            // InternalFormat.g:6035:1: ( ( '}' ) )
+            // InternalFormat.g:6036:1: ( '}' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6036:1: ( '}' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6037:1: '}'
+            // InternalFormat.g:6036:1: ( '}' )
+            // InternalFormat.g:6037:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getWildcardRuleAccess().getRightCurlyBracketKeyword_5()); 
             }
-            match(input,67,FOLLOW_67_in_rule__WildcardRule__Group__5__Impl13102); if (state.failed) return ;
+            match(input,67,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getWildcardRuleAccess().getRightCurlyBracketKeyword_5()); 
             }
@@ -19967,21 +19967,21 @@ public final void rule__WildcardRule__Group__5__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__GrammarElementReference__Group_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6062:1: rule__GrammarElementReference__Group_0__0 : rule__GrammarElementReference__Group_0__0__Impl rule__GrammarElementReference__Group_0__1 ;
+    // InternalFormat.g:6062:1: rule__GrammarElementReference__Group_0__0 : rule__GrammarElementReference__Group_0__0__Impl rule__GrammarElementReference__Group_0__1 ;
     public final void rule__GrammarElementReference__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6066:1: ( rule__GrammarElementReference__Group_0__0__Impl rule__GrammarElementReference__Group_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6067:2: rule__GrammarElementReference__Group_0__0__Impl rule__GrammarElementReference__Group_0__1
+            // InternalFormat.g:6066:1: ( rule__GrammarElementReference__Group_0__0__Impl rule__GrammarElementReference__Group_0__1 )
+            // InternalFormat.g:6067:2: rule__GrammarElementReference__Group_0__0__Impl rule__GrammarElementReference__Group_0__1
             {
-            pushFollow(FOLLOW_rule__GrammarElementReference__Group_0__0__Impl_in_rule__GrammarElementReference__Group_0__013145);
+            pushFollow(FOLLOW_5);
             rule__GrammarElementReference__Group_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__GrammarElementReference__Group_0__1_in_rule__GrammarElementReference__Group_0__013148);
+            pushFollow(FOLLOW_2);
             rule__GrammarElementReference__Group_0__1();
 
             state._fsp--;
@@ -20005,22 +20005,22 @@ public final void rule__GrammarElementReference__Group_0__0() throws Recognition
 
 
     // $ANTLR start "rule__GrammarElementReference__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6074:1: rule__GrammarElementReference__Group_0__0__Impl : ( '=' ) ;
+    // InternalFormat.g:6074:1: rule__GrammarElementReference__Group_0__0__Impl : ( '=' ) ;
     public final void rule__GrammarElementReference__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6078:1: ( ( '=' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6079:1: ( '=' )
+            // InternalFormat.g:6078:1: ( ( '=' ) )
+            // InternalFormat.g:6079:1: ( '=' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6079:1: ( '=' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6080:1: '='
+            // InternalFormat.g:6079:1: ( '=' )
+            // InternalFormat.g:6080:1: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGrammarElementReferenceAccess().getEqualsSignKeyword_0_0()); 
             }
-            match(input,14,FOLLOW_14_in_rule__GrammarElementReference__Group_0__0__Impl13176); if (state.failed) return ;
+            match(input,14,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGrammarElementReferenceAccess().getEqualsSignKeyword_0_0()); 
             }
@@ -20046,16 +20046,16 @@ public final void rule__GrammarElementReference__Group_0__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__GrammarElementReference__Group_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6093:1: rule__GrammarElementReference__Group_0__1 : rule__GrammarElementReference__Group_0__1__Impl ;
+    // InternalFormat.g:6093:1: rule__GrammarElementReference__Group_0__1 : rule__GrammarElementReference__Group_0__1__Impl ;
     public final void rule__GrammarElementReference__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6097:1: ( rule__GrammarElementReference__Group_0__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6098:2: rule__GrammarElementReference__Group_0__1__Impl
+            // InternalFormat.g:6097:1: ( rule__GrammarElementReference__Group_0__1__Impl )
+            // InternalFormat.g:6098:2: rule__GrammarElementReference__Group_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__GrammarElementReference__Group_0__1__Impl_in_rule__GrammarElementReference__Group_0__113207);
+            pushFollow(FOLLOW_2);
             rule__GrammarElementReference__Group_0__1__Impl();
 
             state._fsp--;
@@ -20079,25 +20079,25 @@ public final void rule__GrammarElementReference__Group_0__1() throws Recognition
 
 
     // $ANTLR start "rule__GrammarElementReference__Group_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6104:1: rule__GrammarElementReference__Group_0__1__Impl : ( ( rule__GrammarElementReference__AssignmentAssignment_0_1 ) ) ;
+    // InternalFormat.g:6104:1: rule__GrammarElementReference__Group_0__1__Impl : ( ( rule__GrammarElementReference__AssignmentAssignment_0_1 ) ) ;
     public final void rule__GrammarElementReference__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6108:1: ( ( ( rule__GrammarElementReference__AssignmentAssignment_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6109:1: ( ( rule__GrammarElementReference__AssignmentAssignment_0_1 ) )
+            // InternalFormat.g:6108:1: ( ( ( rule__GrammarElementReference__AssignmentAssignment_0_1 ) ) )
+            // InternalFormat.g:6109:1: ( ( rule__GrammarElementReference__AssignmentAssignment_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6109:1: ( ( rule__GrammarElementReference__AssignmentAssignment_0_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6110:1: ( rule__GrammarElementReference__AssignmentAssignment_0_1 )
+            // InternalFormat.g:6109:1: ( ( rule__GrammarElementReference__AssignmentAssignment_0_1 ) )
+            // InternalFormat.g:6110:1: ( rule__GrammarElementReference__AssignmentAssignment_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGrammarElementReferenceAccess().getAssignmentAssignment_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6111:1: ( rule__GrammarElementReference__AssignmentAssignment_0_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6111:2: rule__GrammarElementReference__AssignmentAssignment_0_1
+            // InternalFormat.g:6111:1: ( rule__GrammarElementReference__AssignmentAssignment_0_1 )
+            // InternalFormat.g:6111:2: rule__GrammarElementReference__AssignmentAssignment_0_1
             {
-            pushFollow(FOLLOW_rule__GrammarElementReference__AssignmentAssignment_0_1_in_rule__GrammarElementReference__Group_0__1__Impl13234);
+            pushFollow(FOLLOW_2);
             rule__GrammarElementReference__AssignmentAssignment_0_1();
 
             state._fsp--;
@@ -20130,21 +20130,21 @@ public final void rule__GrammarElementReference__Group_0__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__GrammarElementReference__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6125:1: rule__GrammarElementReference__Group_1__0 : rule__GrammarElementReference__Group_1__0__Impl rule__GrammarElementReference__Group_1__1 ;
+    // InternalFormat.g:6125:1: rule__GrammarElementReference__Group_1__0 : rule__GrammarElementReference__Group_1__0__Impl rule__GrammarElementReference__Group_1__1 ;
     public final void rule__GrammarElementReference__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6129:1: ( rule__GrammarElementReference__Group_1__0__Impl rule__GrammarElementReference__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6130:2: rule__GrammarElementReference__Group_1__0__Impl rule__GrammarElementReference__Group_1__1
+            // InternalFormat.g:6129:1: ( rule__GrammarElementReference__Group_1__0__Impl rule__GrammarElementReference__Group_1__1 )
+            // InternalFormat.g:6130:2: rule__GrammarElementReference__Group_1__0__Impl rule__GrammarElementReference__Group_1__1
             {
-            pushFollow(FOLLOW_rule__GrammarElementReference__Group_1__0__Impl_in_rule__GrammarElementReference__Group_1__013268);
+            pushFollow(FOLLOW_5);
             rule__GrammarElementReference__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__GrammarElementReference__Group_1__1_in_rule__GrammarElementReference__Group_1__013271);
+            pushFollow(FOLLOW_2);
             rule__GrammarElementReference__Group_1__1();
 
             state._fsp--;
@@ -20168,22 +20168,22 @@ public final void rule__GrammarElementReference__Group_1__0() throws Recognition
 
 
     // $ANTLR start "rule__GrammarElementReference__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6137:1: rule__GrammarElementReference__Group_1__0__Impl : ( '@' ) ;
+    // InternalFormat.g:6137:1: rule__GrammarElementReference__Group_1__0__Impl : ( '@' ) ;
     public final void rule__GrammarElementReference__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6141:1: ( ( '@' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6142:1: ( '@' )
+            // InternalFormat.g:6141:1: ( ( '@' ) )
+            // InternalFormat.g:6142:1: ( '@' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6142:1: ( '@' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6143:1: '@'
+            // InternalFormat.g:6142:1: ( '@' )
+            // InternalFormat.g:6143:1: '@'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGrammarElementReferenceAccess().getCommercialAtKeyword_1_0()); 
             }
-            match(input,68,FOLLOW_68_in_rule__GrammarElementReference__Group_1__0__Impl13299); if (state.failed) return ;
+            match(input,68,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGrammarElementReferenceAccess().getCommercialAtKeyword_1_0()); 
             }
@@ -20209,16 +20209,16 @@ public final void rule__GrammarElementReference__Group_1__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__GrammarElementReference__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6156:1: rule__GrammarElementReference__Group_1__1 : rule__GrammarElementReference__Group_1__1__Impl ;
+    // InternalFormat.g:6156:1: rule__GrammarElementReference__Group_1__1 : rule__GrammarElementReference__Group_1__1__Impl ;
     public final void rule__GrammarElementReference__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6160:1: ( rule__GrammarElementReference__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6161:2: rule__GrammarElementReference__Group_1__1__Impl
+            // InternalFormat.g:6160:1: ( rule__GrammarElementReference__Group_1__1__Impl )
+            // InternalFormat.g:6161:2: rule__GrammarElementReference__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__GrammarElementReference__Group_1__1__Impl_in_rule__GrammarElementReference__Group_1__113330);
+            pushFollow(FOLLOW_2);
             rule__GrammarElementReference__Group_1__1__Impl();
 
             state._fsp--;
@@ -20242,25 +20242,25 @@ public final void rule__GrammarElementReference__Group_1__1() throws Recognition
 
 
     // $ANTLR start "rule__GrammarElementReference__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6167:1: rule__GrammarElementReference__Group_1__1__Impl : ( ( rule__GrammarElementReference__RuleCallAssignment_1_1 ) ) ;
+    // InternalFormat.g:6167:1: rule__GrammarElementReference__Group_1__1__Impl : ( ( rule__GrammarElementReference__RuleCallAssignment_1_1 ) ) ;
     public final void rule__GrammarElementReference__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6171:1: ( ( ( rule__GrammarElementReference__RuleCallAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6172:1: ( ( rule__GrammarElementReference__RuleCallAssignment_1_1 ) )
+            // InternalFormat.g:6171:1: ( ( ( rule__GrammarElementReference__RuleCallAssignment_1_1 ) ) )
+            // InternalFormat.g:6172:1: ( ( rule__GrammarElementReference__RuleCallAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6172:1: ( ( rule__GrammarElementReference__RuleCallAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6173:1: ( rule__GrammarElementReference__RuleCallAssignment_1_1 )
+            // InternalFormat.g:6172:1: ( ( rule__GrammarElementReference__RuleCallAssignment_1_1 ) )
+            // InternalFormat.g:6173:1: ( rule__GrammarElementReference__RuleCallAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGrammarElementReferenceAccess().getRuleCallAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6174:1: ( rule__GrammarElementReference__RuleCallAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6174:2: rule__GrammarElementReference__RuleCallAssignment_1_1
+            // InternalFormat.g:6174:1: ( rule__GrammarElementReference__RuleCallAssignment_1_1 )
+            // InternalFormat.g:6174:2: rule__GrammarElementReference__RuleCallAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__GrammarElementReference__RuleCallAssignment_1_1_in_rule__GrammarElementReference__Group_1__1__Impl13357);
+            pushFollow(FOLLOW_2);
             rule__GrammarElementReference__RuleCallAssignment_1_1();
 
             state._fsp--;
@@ -20293,21 +20293,21 @@ public final void rule__GrammarElementReference__Group_1__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__ContextFreeDirective__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6188:1: rule__ContextFreeDirective__Group__0 : rule__ContextFreeDirective__Group__0__Impl rule__ContextFreeDirective__Group__1 ;
+    // InternalFormat.g:6188:1: rule__ContextFreeDirective__Group__0 : rule__ContextFreeDirective__Group__0__Impl rule__ContextFreeDirective__Group__1 ;
     public final void rule__ContextFreeDirective__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6192:1: ( rule__ContextFreeDirective__Group__0__Impl rule__ContextFreeDirective__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6193:2: rule__ContextFreeDirective__Group__0__Impl rule__ContextFreeDirective__Group__1
+            // InternalFormat.g:6192:1: ( rule__ContextFreeDirective__Group__0__Impl rule__ContextFreeDirective__Group__1 )
+            // InternalFormat.g:6193:2: rule__ContextFreeDirective__Group__0__Impl rule__ContextFreeDirective__Group__1
             {
-            pushFollow(FOLLOW_rule__ContextFreeDirective__Group__0__Impl_in_rule__ContextFreeDirective__Group__013391);
+            pushFollow(FOLLOW_21);
             rule__ContextFreeDirective__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ContextFreeDirective__Group__1_in_rule__ContextFreeDirective__Group__013394);
+            pushFollow(FOLLOW_2);
             rule__ContextFreeDirective__Group__1();
 
             state._fsp--;
@@ -20331,22 +20331,22 @@ public final void rule__ContextFreeDirective__Group__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__ContextFreeDirective__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6200:1: rule__ContextFreeDirective__Group__0__Impl : ( '[' ) ;
+    // InternalFormat.g:6200:1: rule__ContextFreeDirective__Group__0__Impl : ( '[' ) ;
     public final void rule__ContextFreeDirective__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6204:1: ( ( '[' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6205:1: ( '[' )
+            // InternalFormat.g:6204:1: ( ( '[' ) )
+            // InternalFormat.g:6205:1: ( '[' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6205:1: ( '[' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6206:1: '['
+            // InternalFormat.g:6205:1: ( '[' )
+            // InternalFormat.g:6206:1: '['
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getContextFreeDirectiveAccess().getLeftSquareBracketKeyword_0()); 
             }
-            match(input,69,FOLLOW_69_in_rule__ContextFreeDirective__Group__0__Impl13422); if (state.failed) return ;
+            match(input,69,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getContextFreeDirectiveAccess().getLeftSquareBracketKeyword_0()); 
             }
@@ -20372,21 +20372,21 @@ public final void rule__ContextFreeDirective__Group__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__ContextFreeDirective__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6219:1: rule__ContextFreeDirective__Group__1 : rule__ContextFreeDirective__Group__1__Impl rule__ContextFreeDirective__Group__2 ;
+    // InternalFormat.g:6219:1: rule__ContextFreeDirective__Group__1 : rule__ContextFreeDirective__Group__1__Impl rule__ContextFreeDirective__Group__2 ;
     public final void rule__ContextFreeDirective__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6223:1: ( rule__ContextFreeDirective__Group__1__Impl rule__ContextFreeDirective__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6224:2: rule__ContextFreeDirective__Group__1__Impl rule__ContextFreeDirective__Group__2
+            // InternalFormat.g:6223:1: ( rule__ContextFreeDirective__Group__1__Impl rule__ContextFreeDirective__Group__2 )
+            // InternalFormat.g:6224:2: rule__ContextFreeDirective__Group__1__Impl rule__ContextFreeDirective__Group__2
             {
-            pushFollow(FOLLOW_rule__ContextFreeDirective__Group__1__Impl_in_rule__ContextFreeDirective__Group__113453);
+            pushFollow(FOLLOW_22);
             rule__ContextFreeDirective__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ContextFreeDirective__Group__2_in_rule__ContextFreeDirective__Group__113456);
+            pushFollow(FOLLOW_2);
             rule__ContextFreeDirective__Group__2();
 
             state._fsp--;
@@ -20410,25 +20410,25 @@ public final void rule__ContextFreeDirective__Group__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__ContextFreeDirective__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6231:1: rule__ContextFreeDirective__Group__1__Impl : ( ( rule__ContextFreeDirective__GrammarElementsAssignment_1 ) ) ;
+    // InternalFormat.g:6231:1: rule__ContextFreeDirective__Group__1__Impl : ( ( rule__ContextFreeDirective__GrammarElementsAssignment_1 ) ) ;
     public final void rule__ContextFreeDirective__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6235:1: ( ( ( rule__ContextFreeDirective__GrammarElementsAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6236:1: ( ( rule__ContextFreeDirective__GrammarElementsAssignment_1 ) )
+            // InternalFormat.g:6235:1: ( ( ( rule__ContextFreeDirective__GrammarElementsAssignment_1 ) ) )
+            // InternalFormat.g:6236:1: ( ( rule__ContextFreeDirective__GrammarElementsAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6236:1: ( ( rule__ContextFreeDirective__GrammarElementsAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6237:1: ( rule__ContextFreeDirective__GrammarElementsAssignment_1 )
+            // InternalFormat.g:6236:1: ( ( rule__ContextFreeDirective__GrammarElementsAssignment_1 ) )
+            // InternalFormat.g:6237:1: ( rule__ContextFreeDirective__GrammarElementsAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getContextFreeDirectiveAccess().getGrammarElementsAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6238:1: ( rule__ContextFreeDirective__GrammarElementsAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6238:2: rule__ContextFreeDirective__GrammarElementsAssignment_1
+            // InternalFormat.g:6238:1: ( rule__ContextFreeDirective__GrammarElementsAssignment_1 )
+            // InternalFormat.g:6238:2: rule__ContextFreeDirective__GrammarElementsAssignment_1
             {
-            pushFollow(FOLLOW_rule__ContextFreeDirective__GrammarElementsAssignment_1_in_rule__ContextFreeDirective__Group__1__Impl13483);
+            pushFollow(FOLLOW_2);
             rule__ContextFreeDirective__GrammarElementsAssignment_1();
 
             state._fsp--;
@@ -20461,21 +20461,21 @@ public final void rule__ContextFreeDirective__Group__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__ContextFreeDirective__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6248:1: rule__ContextFreeDirective__Group__2 : rule__ContextFreeDirective__Group__2__Impl rule__ContextFreeDirective__Group__3 ;
+    // InternalFormat.g:6248:1: rule__ContextFreeDirective__Group__2 : rule__ContextFreeDirective__Group__2__Impl rule__ContextFreeDirective__Group__3 ;
     public final void rule__ContextFreeDirective__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6252:1: ( rule__ContextFreeDirective__Group__2__Impl rule__ContextFreeDirective__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6253:2: rule__ContextFreeDirective__Group__2__Impl rule__ContextFreeDirective__Group__3
+            // InternalFormat.g:6252:1: ( rule__ContextFreeDirective__Group__2__Impl rule__ContextFreeDirective__Group__3 )
+            // InternalFormat.g:6253:2: rule__ContextFreeDirective__Group__2__Impl rule__ContextFreeDirective__Group__3
             {
-            pushFollow(FOLLOW_rule__ContextFreeDirective__Group__2__Impl_in_rule__ContextFreeDirective__Group__213513);
+            pushFollow(FOLLOW_22);
             rule__ContextFreeDirective__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ContextFreeDirective__Group__3_in_rule__ContextFreeDirective__Group__213516);
+            pushFollow(FOLLOW_2);
             rule__ContextFreeDirective__Group__3();
 
             state._fsp--;
@@ -20499,22 +20499,22 @@ public final void rule__ContextFreeDirective__Group__2() throws RecognitionExcep
 
 
     // $ANTLR start "rule__ContextFreeDirective__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6260:1: rule__ContextFreeDirective__Group__2__Impl : ( ( rule__ContextFreeDirective__Group_2__0 )* ) ;
+    // InternalFormat.g:6260:1: rule__ContextFreeDirective__Group__2__Impl : ( ( rule__ContextFreeDirective__Group_2__0 )* ) ;
     public final void rule__ContextFreeDirective__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6264:1: ( ( ( rule__ContextFreeDirective__Group_2__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6265:1: ( ( rule__ContextFreeDirective__Group_2__0 )* )
+            // InternalFormat.g:6264:1: ( ( ( rule__ContextFreeDirective__Group_2__0 )* ) )
+            // InternalFormat.g:6265:1: ( ( rule__ContextFreeDirective__Group_2__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6265:1: ( ( rule__ContextFreeDirective__Group_2__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6266:1: ( rule__ContextFreeDirective__Group_2__0 )*
+            // InternalFormat.g:6265:1: ( ( rule__ContextFreeDirective__Group_2__0 )* )
+            // InternalFormat.g:6266:1: ( rule__ContextFreeDirective__Group_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getContextFreeDirectiveAccess().getGroup_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6267:1: ( rule__ContextFreeDirective__Group_2__0 )*
+            // InternalFormat.g:6267:1: ( rule__ContextFreeDirective__Group_2__0 )*
             loop77:
             do {
                 int alt77=2;
@@ -20527,9 +20527,9 @@ public final void rule__ContextFreeDirective__Group__2__Impl() throws Recognitio
 
                 switch (alt77) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6267:2: rule__ContextFreeDirective__Group_2__0
+            	    // InternalFormat.g:6267:2: rule__ContextFreeDirective__Group_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__ContextFreeDirective__Group_2__0_in_rule__ContextFreeDirective__Group__2__Impl13543);
+            	    pushFollow(FOLLOW_23);
             	    rule__ContextFreeDirective__Group_2__0();
 
             	    state._fsp--;
@@ -20568,21 +20568,21 @@ public final void rule__ContextFreeDirective__Group__2__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__ContextFreeDirective__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6277:1: rule__ContextFreeDirective__Group__3 : rule__ContextFreeDirective__Group__3__Impl rule__ContextFreeDirective__Group__4 ;
+    // InternalFormat.g:6277:1: rule__ContextFreeDirective__Group__3 : rule__ContextFreeDirective__Group__3__Impl rule__ContextFreeDirective__Group__4 ;
     public final void rule__ContextFreeDirective__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6281:1: ( rule__ContextFreeDirective__Group__3__Impl rule__ContextFreeDirective__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6282:2: rule__ContextFreeDirective__Group__3__Impl rule__ContextFreeDirective__Group__4
+            // InternalFormat.g:6281:1: ( rule__ContextFreeDirective__Group__3__Impl rule__ContextFreeDirective__Group__4 )
+            // InternalFormat.g:6282:2: rule__ContextFreeDirective__Group__3__Impl rule__ContextFreeDirective__Group__4
             {
-            pushFollow(FOLLOW_rule__ContextFreeDirective__Group__3__Impl_in_rule__ContextFreeDirective__Group__313574);
+            pushFollow(FOLLOW_24);
             rule__ContextFreeDirective__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ContextFreeDirective__Group__4_in_rule__ContextFreeDirective__Group__313577);
+            pushFollow(FOLLOW_2);
             rule__ContextFreeDirective__Group__4();
 
             state._fsp--;
@@ -20606,22 +20606,22 @@ public final void rule__ContextFreeDirective__Group__3() throws RecognitionExcep
 
 
     // $ANTLR start "rule__ContextFreeDirective__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6289:1: rule__ContextFreeDirective__Group__3__Impl : ( ']' ) ;
+    // InternalFormat.g:6289:1: rule__ContextFreeDirective__Group__3__Impl : ( ']' ) ;
     public final void rule__ContextFreeDirective__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6293:1: ( ( ']' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6294:1: ( ']' )
+            // InternalFormat.g:6293:1: ( ( ']' ) )
+            // InternalFormat.g:6294:1: ( ']' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6294:1: ( ']' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6295:1: ']'
+            // InternalFormat.g:6294:1: ( ']' )
+            // InternalFormat.g:6295:1: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getContextFreeDirectiveAccess().getRightSquareBracketKeyword_3()); 
             }
-            match(input,70,FOLLOW_70_in_rule__ContextFreeDirective__Group__3__Impl13605); if (state.failed) return ;
+            match(input,70,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getContextFreeDirectiveAccess().getRightSquareBracketKeyword_3()); 
             }
@@ -20647,16 +20647,16 @@ public final void rule__ContextFreeDirective__Group__3__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__ContextFreeDirective__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6308:1: rule__ContextFreeDirective__Group__4 : rule__ContextFreeDirective__Group__4__Impl ;
+    // InternalFormat.g:6308:1: rule__ContextFreeDirective__Group__4 : rule__ContextFreeDirective__Group__4__Impl ;
     public final void rule__ContextFreeDirective__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6312:1: ( rule__ContextFreeDirective__Group__4__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6313:2: rule__ContextFreeDirective__Group__4__Impl
+            // InternalFormat.g:6312:1: ( rule__ContextFreeDirective__Group__4__Impl )
+            // InternalFormat.g:6313:2: rule__ContextFreeDirective__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__ContextFreeDirective__Group__4__Impl_in_rule__ContextFreeDirective__Group__413636);
+            pushFollow(FOLLOW_2);
             rule__ContextFreeDirective__Group__4__Impl();
 
             state._fsp--;
@@ -20680,25 +20680,25 @@ public final void rule__ContextFreeDirective__Group__4() throws RecognitionExcep
 
 
     // $ANTLR start "rule__ContextFreeDirective__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6319:1: rule__ContextFreeDirective__Group__4__Impl : ( ( rule__ContextFreeDirective__MatcherListAssignment_4 ) ) ;
+    // InternalFormat.g:6319:1: rule__ContextFreeDirective__Group__4__Impl : ( ( rule__ContextFreeDirective__MatcherListAssignment_4 ) ) ;
     public final void rule__ContextFreeDirective__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6323:1: ( ( ( rule__ContextFreeDirective__MatcherListAssignment_4 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6324:1: ( ( rule__ContextFreeDirective__MatcherListAssignment_4 ) )
+            // InternalFormat.g:6323:1: ( ( ( rule__ContextFreeDirective__MatcherListAssignment_4 ) ) )
+            // InternalFormat.g:6324:1: ( ( rule__ContextFreeDirective__MatcherListAssignment_4 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6324:1: ( ( rule__ContextFreeDirective__MatcherListAssignment_4 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6325:1: ( rule__ContextFreeDirective__MatcherListAssignment_4 )
+            // InternalFormat.g:6324:1: ( ( rule__ContextFreeDirective__MatcherListAssignment_4 ) )
+            // InternalFormat.g:6325:1: ( rule__ContextFreeDirective__MatcherListAssignment_4 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getContextFreeDirectiveAccess().getMatcherListAssignment_4()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6326:1: ( rule__ContextFreeDirective__MatcherListAssignment_4 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6326:2: rule__ContextFreeDirective__MatcherListAssignment_4
+            // InternalFormat.g:6326:1: ( rule__ContextFreeDirective__MatcherListAssignment_4 )
+            // InternalFormat.g:6326:2: rule__ContextFreeDirective__MatcherListAssignment_4
             {
-            pushFollow(FOLLOW_rule__ContextFreeDirective__MatcherListAssignment_4_in_rule__ContextFreeDirective__Group__4__Impl13663);
+            pushFollow(FOLLOW_2);
             rule__ContextFreeDirective__MatcherListAssignment_4();
 
             state._fsp--;
@@ -20731,21 +20731,21 @@ public final void rule__ContextFreeDirective__Group__4__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__ContextFreeDirective__Group_2__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6346:1: rule__ContextFreeDirective__Group_2__0 : rule__ContextFreeDirective__Group_2__0__Impl rule__ContextFreeDirective__Group_2__1 ;
+    // InternalFormat.g:6346:1: rule__ContextFreeDirective__Group_2__0 : rule__ContextFreeDirective__Group_2__0__Impl rule__ContextFreeDirective__Group_2__1 ;
     public final void rule__ContextFreeDirective__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6350:1: ( rule__ContextFreeDirective__Group_2__0__Impl rule__ContextFreeDirective__Group_2__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6351:2: rule__ContextFreeDirective__Group_2__0__Impl rule__ContextFreeDirective__Group_2__1
+            // InternalFormat.g:6350:1: ( rule__ContextFreeDirective__Group_2__0__Impl rule__ContextFreeDirective__Group_2__1 )
+            // InternalFormat.g:6351:2: rule__ContextFreeDirective__Group_2__0__Impl rule__ContextFreeDirective__Group_2__1
             {
-            pushFollow(FOLLOW_rule__ContextFreeDirective__Group_2__0__Impl_in_rule__ContextFreeDirective__Group_2__013703);
+            pushFollow(FOLLOW_21);
             rule__ContextFreeDirective__Group_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ContextFreeDirective__Group_2__1_in_rule__ContextFreeDirective__Group_2__013706);
+            pushFollow(FOLLOW_2);
             rule__ContextFreeDirective__Group_2__1();
 
             state._fsp--;
@@ -20769,22 +20769,22 @@ public final void rule__ContextFreeDirective__Group_2__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__ContextFreeDirective__Group_2__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6358:1: rule__ContextFreeDirective__Group_2__0__Impl : ( ',' ) ;
+    // InternalFormat.g:6358:1: rule__ContextFreeDirective__Group_2__0__Impl : ( ',' ) ;
     public final void rule__ContextFreeDirective__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6362:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6363:1: ( ',' )
+            // InternalFormat.g:6362:1: ( ( ',' ) )
+            // InternalFormat.g:6363:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6363:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6364:1: ','
+            // InternalFormat.g:6363:1: ( ',' )
+            // InternalFormat.g:6364:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getContextFreeDirectiveAccess().getCommaKeyword_2_0()); 
             }
-            match(input,71,FOLLOW_71_in_rule__ContextFreeDirective__Group_2__0__Impl13734); if (state.failed) return ;
+            match(input,71,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getContextFreeDirectiveAccess().getCommaKeyword_2_0()); 
             }
@@ -20810,16 +20810,16 @@ public final void rule__ContextFreeDirective__Group_2__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__ContextFreeDirective__Group_2__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6377:1: rule__ContextFreeDirective__Group_2__1 : rule__ContextFreeDirective__Group_2__1__Impl ;
+    // InternalFormat.g:6377:1: rule__ContextFreeDirective__Group_2__1 : rule__ContextFreeDirective__Group_2__1__Impl ;
     public final void rule__ContextFreeDirective__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6381:1: ( rule__ContextFreeDirective__Group_2__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6382:2: rule__ContextFreeDirective__Group_2__1__Impl
+            // InternalFormat.g:6381:1: ( rule__ContextFreeDirective__Group_2__1__Impl )
+            // InternalFormat.g:6382:2: rule__ContextFreeDirective__Group_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__ContextFreeDirective__Group_2__1__Impl_in_rule__ContextFreeDirective__Group_2__113765);
+            pushFollow(FOLLOW_2);
             rule__ContextFreeDirective__Group_2__1__Impl();
 
             state._fsp--;
@@ -20843,25 +20843,25 @@ public final void rule__ContextFreeDirective__Group_2__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__ContextFreeDirective__Group_2__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6388:1: rule__ContextFreeDirective__Group_2__1__Impl : ( ( rule__ContextFreeDirective__GrammarElementsAssignment_2_1 ) ) ;
+    // InternalFormat.g:6388:1: rule__ContextFreeDirective__Group_2__1__Impl : ( ( rule__ContextFreeDirective__GrammarElementsAssignment_2_1 ) ) ;
     public final void rule__ContextFreeDirective__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6392:1: ( ( ( rule__ContextFreeDirective__GrammarElementsAssignment_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6393:1: ( ( rule__ContextFreeDirective__GrammarElementsAssignment_2_1 ) )
+            // InternalFormat.g:6392:1: ( ( ( rule__ContextFreeDirective__GrammarElementsAssignment_2_1 ) ) )
+            // InternalFormat.g:6393:1: ( ( rule__ContextFreeDirective__GrammarElementsAssignment_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6393:1: ( ( rule__ContextFreeDirective__GrammarElementsAssignment_2_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6394:1: ( rule__ContextFreeDirective__GrammarElementsAssignment_2_1 )
+            // InternalFormat.g:6393:1: ( ( rule__ContextFreeDirective__GrammarElementsAssignment_2_1 ) )
+            // InternalFormat.g:6394:1: ( rule__ContextFreeDirective__GrammarElementsAssignment_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getContextFreeDirectiveAccess().getGrammarElementsAssignment_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6395:1: ( rule__ContextFreeDirective__GrammarElementsAssignment_2_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6395:2: rule__ContextFreeDirective__GrammarElementsAssignment_2_1
+            // InternalFormat.g:6395:1: ( rule__ContextFreeDirective__GrammarElementsAssignment_2_1 )
+            // InternalFormat.g:6395:2: rule__ContextFreeDirective__GrammarElementsAssignment_2_1
             {
-            pushFollow(FOLLOW_rule__ContextFreeDirective__GrammarElementsAssignment_2_1_in_rule__ContextFreeDirective__Group_2__1__Impl13792);
+            pushFollow(FOLLOW_2);
             rule__ContextFreeDirective__GrammarElementsAssignment_2_1();
 
             state._fsp--;
@@ -20894,21 +20894,21 @@ public final void rule__ContextFreeDirective__Group_2__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__SpecificDirective__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6409:1: rule__SpecificDirective__Group__0 : rule__SpecificDirective__Group__0__Impl rule__SpecificDirective__Group__1 ;
+    // InternalFormat.g:6409:1: rule__SpecificDirective__Group__0 : rule__SpecificDirective__Group__0__Impl rule__SpecificDirective__Group__1 ;
     public final void rule__SpecificDirective__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6413:1: ( rule__SpecificDirective__Group__0__Impl rule__SpecificDirective__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6414:2: rule__SpecificDirective__Group__0__Impl rule__SpecificDirective__Group__1
+            // InternalFormat.g:6413:1: ( rule__SpecificDirective__Group__0__Impl rule__SpecificDirective__Group__1 )
+            // InternalFormat.g:6414:2: rule__SpecificDirective__Group__0__Impl rule__SpecificDirective__Group__1
             {
-            pushFollow(FOLLOW_rule__SpecificDirective__Group__0__Impl_in_rule__SpecificDirective__Group__013826);
+            pushFollow(FOLLOW_25);
             rule__SpecificDirective__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SpecificDirective__Group__1_in_rule__SpecificDirective__Group__013829);
+            pushFollow(FOLLOW_2);
             rule__SpecificDirective__Group__1();
 
             state._fsp--;
@@ -20932,25 +20932,25 @@ public final void rule__SpecificDirective__Group__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__SpecificDirective__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6421:1: rule__SpecificDirective__Group__0__Impl : ( ( rule__SpecificDirective__GrammarElementsAssignment_0 ) ) ;
+    // InternalFormat.g:6421:1: rule__SpecificDirective__Group__0__Impl : ( ( rule__SpecificDirective__GrammarElementsAssignment_0 ) ) ;
     public final void rule__SpecificDirective__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6425:1: ( ( ( rule__SpecificDirective__GrammarElementsAssignment_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6426:1: ( ( rule__SpecificDirective__GrammarElementsAssignment_0 ) )
+            // InternalFormat.g:6425:1: ( ( ( rule__SpecificDirective__GrammarElementsAssignment_0 ) ) )
+            // InternalFormat.g:6426:1: ( ( rule__SpecificDirective__GrammarElementsAssignment_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6426:1: ( ( rule__SpecificDirective__GrammarElementsAssignment_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6427:1: ( rule__SpecificDirective__GrammarElementsAssignment_0 )
+            // InternalFormat.g:6426:1: ( ( rule__SpecificDirective__GrammarElementsAssignment_0 ) )
+            // InternalFormat.g:6427:1: ( rule__SpecificDirective__GrammarElementsAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSpecificDirectiveAccess().getGrammarElementsAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6428:1: ( rule__SpecificDirective__GrammarElementsAssignment_0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6428:2: rule__SpecificDirective__GrammarElementsAssignment_0
+            // InternalFormat.g:6428:1: ( rule__SpecificDirective__GrammarElementsAssignment_0 )
+            // InternalFormat.g:6428:2: rule__SpecificDirective__GrammarElementsAssignment_0
             {
-            pushFollow(FOLLOW_rule__SpecificDirective__GrammarElementsAssignment_0_in_rule__SpecificDirective__Group__0__Impl13856);
+            pushFollow(FOLLOW_2);
             rule__SpecificDirective__GrammarElementsAssignment_0();
 
             state._fsp--;
@@ -20983,21 +20983,21 @@ public final void rule__SpecificDirective__Group__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__SpecificDirective__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6438:1: rule__SpecificDirective__Group__1 : rule__SpecificDirective__Group__1__Impl rule__SpecificDirective__Group__2 ;
+    // InternalFormat.g:6438:1: rule__SpecificDirective__Group__1 : rule__SpecificDirective__Group__1__Impl rule__SpecificDirective__Group__2 ;
     public final void rule__SpecificDirective__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6442:1: ( rule__SpecificDirective__Group__1__Impl rule__SpecificDirective__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6443:2: rule__SpecificDirective__Group__1__Impl rule__SpecificDirective__Group__2
+            // InternalFormat.g:6442:1: ( rule__SpecificDirective__Group__1__Impl rule__SpecificDirective__Group__2 )
+            // InternalFormat.g:6443:2: rule__SpecificDirective__Group__1__Impl rule__SpecificDirective__Group__2
             {
-            pushFollow(FOLLOW_rule__SpecificDirective__Group__1__Impl_in_rule__SpecificDirective__Group__113886);
+            pushFollow(FOLLOW_25);
             rule__SpecificDirective__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SpecificDirective__Group__2_in_rule__SpecificDirective__Group__113889);
+            pushFollow(FOLLOW_2);
             rule__SpecificDirective__Group__2();
 
             state._fsp--;
@@ -21021,22 +21021,22 @@ public final void rule__SpecificDirective__Group__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__SpecificDirective__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6450:1: rule__SpecificDirective__Group__1__Impl : ( ( rule__SpecificDirective__Group_1__0 )* ) ;
+    // InternalFormat.g:6450:1: rule__SpecificDirective__Group__1__Impl : ( ( rule__SpecificDirective__Group_1__0 )* ) ;
     public final void rule__SpecificDirective__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6454:1: ( ( ( rule__SpecificDirective__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6455:1: ( ( rule__SpecificDirective__Group_1__0 )* )
+            // InternalFormat.g:6454:1: ( ( ( rule__SpecificDirective__Group_1__0 )* ) )
+            // InternalFormat.g:6455:1: ( ( rule__SpecificDirective__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6455:1: ( ( rule__SpecificDirective__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6456:1: ( rule__SpecificDirective__Group_1__0 )*
+            // InternalFormat.g:6455:1: ( ( rule__SpecificDirective__Group_1__0 )* )
+            // InternalFormat.g:6456:1: ( rule__SpecificDirective__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSpecificDirectiveAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6457:1: ( rule__SpecificDirective__Group_1__0 )*
+            // InternalFormat.g:6457:1: ( rule__SpecificDirective__Group_1__0 )*
             loop78:
             do {
                 int alt78=2;
@@ -21049,9 +21049,9 @@ public final void rule__SpecificDirective__Group__1__Impl() throws RecognitionEx
 
                 switch (alt78) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6457:2: rule__SpecificDirective__Group_1__0
+            	    // InternalFormat.g:6457:2: rule__SpecificDirective__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__SpecificDirective__Group_1__0_in_rule__SpecificDirective__Group__1__Impl13916);
+            	    pushFollow(FOLLOW_23);
             	    rule__SpecificDirective__Group_1__0();
 
             	    state._fsp--;
@@ -21090,16 +21090,16 @@ public final void rule__SpecificDirective__Group__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__SpecificDirective__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6467:1: rule__SpecificDirective__Group__2 : rule__SpecificDirective__Group__2__Impl ;
+    // InternalFormat.g:6467:1: rule__SpecificDirective__Group__2 : rule__SpecificDirective__Group__2__Impl ;
     public final void rule__SpecificDirective__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6471:1: ( rule__SpecificDirective__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6472:2: rule__SpecificDirective__Group__2__Impl
+            // InternalFormat.g:6471:1: ( rule__SpecificDirective__Group__2__Impl )
+            // InternalFormat.g:6472:2: rule__SpecificDirective__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__SpecificDirective__Group__2__Impl_in_rule__SpecificDirective__Group__213947);
+            pushFollow(FOLLOW_2);
             rule__SpecificDirective__Group__2__Impl();
 
             state._fsp--;
@@ -21123,25 +21123,25 @@ public final void rule__SpecificDirective__Group__2() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__SpecificDirective__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6478:1: rule__SpecificDirective__Group__2__Impl : ( ( rule__SpecificDirective__MatcherListAssignment_2 ) ) ;
+    // InternalFormat.g:6478:1: rule__SpecificDirective__Group__2__Impl : ( ( rule__SpecificDirective__MatcherListAssignment_2 ) ) ;
     public final void rule__SpecificDirective__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6482:1: ( ( ( rule__SpecificDirective__MatcherListAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6483:1: ( ( rule__SpecificDirective__MatcherListAssignment_2 ) )
+            // InternalFormat.g:6482:1: ( ( ( rule__SpecificDirective__MatcherListAssignment_2 ) ) )
+            // InternalFormat.g:6483:1: ( ( rule__SpecificDirective__MatcherListAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6483:1: ( ( rule__SpecificDirective__MatcherListAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6484:1: ( rule__SpecificDirective__MatcherListAssignment_2 )
+            // InternalFormat.g:6483:1: ( ( rule__SpecificDirective__MatcherListAssignment_2 ) )
+            // InternalFormat.g:6484:1: ( rule__SpecificDirective__MatcherListAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSpecificDirectiveAccess().getMatcherListAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6485:1: ( rule__SpecificDirective__MatcherListAssignment_2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6485:2: rule__SpecificDirective__MatcherListAssignment_2
+            // InternalFormat.g:6485:1: ( rule__SpecificDirective__MatcherListAssignment_2 )
+            // InternalFormat.g:6485:2: rule__SpecificDirective__MatcherListAssignment_2
             {
-            pushFollow(FOLLOW_rule__SpecificDirective__MatcherListAssignment_2_in_rule__SpecificDirective__Group__2__Impl13974);
+            pushFollow(FOLLOW_2);
             rule__SpecificDirective__MatcherListAssignment_2();
 
             state._fsp--;
@@ -21174,21 +21174,21 @@ public final void rule__SpecificDirective__Group__2__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__SpecificDirective__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6501:1: rule__SpecificDirective__Group_1__0 : rule__SpecificDirective__Group_1__0__Impl rule__SpecificDirective__Group_1__1 ;
+    // InternalFormat.g:6501:1: rule__SpecificDirective__Group_1__0 : rule__SpecificDirective__Group_1__0__Impl rule__SpecificDirective__Group_1__1 ;
     public final void rule__SpecificDirective__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6505:1: ( rule__SpecificDirective__Group_1__0__Impl rule__SpecificDirective__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6506:2: rule__SpecificDirective__Group_1__0__Impl rule__SpecificDirective__Group_1__1
+            // InternalFormat.g:6505:1: ( rule__SpecificDirective__Group_1__0__Impl rule__SpecificDirective__Group_1__1 )
+            // InternalFormat.g:6506:2: rule__SpecificDirective__Group_1__0__Impl rule__SpecificDirective__Group_1__1
             {
-            pushFollow(FOLLOW_rule__SpecificDirective__Group_1__0__Impl_in_rule__SpecificDirective__Group_1__014010);
+            pushFollow(FOLLOW_26);
             rule__SpecificDirective__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SpecificDirective__Group_1__1_in_rule__SpecificDirective__Group_1__014013);
+            pushFollow(FOLLOW_2);
             rule__SpecificDirective__Group_1__1();
 
             state._fsp--;
@@ -21212,22 +21212,22 @@ public final void rule__SpecificDirective__Group_1__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__SpecificDirective__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6513:1: rule__SpecificDirective__Group_1__0__Impl : ( ',' ) ;
+    // InternalFormat.g:6513:1: rule__SpecificDirective__Group_1__0__Impl : ( ',' ) ;
     public final void rule__SpecificDirective__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6517:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6518:1: ( ',' )
+            // InternalFormat.g:6517:1: ( ( ',' ) )
+            // InternalFormat.g:6518:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6518:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6519:1: ','
+            // InternalFormat.g:6518:1: ( ',' )
+            // InternalFormat.g:6519:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSpecificDirectiveAccess().getCommaKeyword_1_0()); 
             }
-            match(input,71,FOLLOW_71_in_rule__SpecificDirective__Group_1__0__Impl14041); if (state.failed) return ;
+            match(input,71,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSpecificDirectiveAccess().getCommaKeyword_1_0()); 
             }
@@ -21253,16 +21253,16 @@ public final void rule__SpecificDirective__Group_1__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__SpecificDirective__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6532:1: rule__SpecificDirective__Group_1__1 : rule__SpecificDirective__Group_1__1__Impl ;
+    // InternalFormat.g:6532:1: rule__SpecificDirective__Group_1__1 : rule__SpecificDirective__Group_1__1__Impl ;
     public final void rule__SpecificDirective__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6536:1: ( rule__SpecificDirective__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6537:2: rule__SpecificDirective__Group_1__1__Impl
+            // InternalFormat.g:6536:1: ( rule__SpecificDirective__Group_1__1__Impl )
+            // InternalFormat.g:6537:2: rule__SpecificDirective__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__SpecificDirective__Group_1__1__Impl_in_rule__SpecificDirective__Group_1__114072);
+            pushFollow(FOLLOW_2);
             rule__SpecificDirective__Group_1__1__Impl();
 
             state._fsp--;
@@ -21286,25 +21286,25 @@ public final void rule__SpecificDirective__Group_1__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__SpecificDirective__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6543:1: rule__SpecificDirective__Group_1__1__Impl : ( ( rule__SpecificDirective__GrammarElementsAssignment_1_1 ) ) ;
+    // InternalFormat.g:6543:1: rule__SpecificDirective__Group_1__1__Impl : ( ( rule__SpecificDirective__GrammarElementsAssignment_1_1 ) ) ;
     public final void rule__SpecificDirective__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6547:1: ( ( ( rule__SpecificDirective__GrammarElementsAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6548:1: ( ( rule__SpecificDirective__GrammarElementsAssignment_1_1 ) )
+            // InternalFormat.g:6547:1: ( ( ( rule__SpecificDirective__GrammarElementsAssignment_1_1 ) ) )
+            // InternalFormat.g:6548:1: ( ( rule__SpecificDirective__GrammarElementsAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6548:1: ( ( rule__SpecificDirective__GrammarElementsAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6549:1: ( rule__SpecificDirective__GrammarElementsAssignment_1_1 )
+            // InternalFormat.g:6548:1: ( ( rule__SpecificDirective__GrammarElementsAssignment_1_1 ) )
+            // InternalFormat.g:6549:1: ( rule__SpecificDirective__GrammarElementsAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSpecificDirectiveAccess().getGrammarElementsAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6550:1: ( rule__SpecificDirective__GrammarElementsAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6550:2: rule__SpecificDirective__GrammarElementsAssignment_1_1
+            // InternalFormat.g:6550:1: ( rule__SpecificDirective__GrammarElementsAssignment_1_1 )
+            // InternalFormat.g:6550:2: rule__SpecificDirective__GrammarElementsAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__SpecificDirective__GrammarElementsAssignment_1_1_in_rule__SpecificDirective__Group_1__1__Impl14099);
+            pushFollow(FOLLOW_2);
             rule__SpecificDirective__GrammarElementsAssignment_1_1();
 
             state._fsp--;
@@ -21337,21 +21337,21 @@ public final void rule__SpecificDirective__Group_1__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__MatcherList__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6564:1: rule__MatcherList__Group__0 : rule__MatcherList__Group__0__Impl rule__MatcherList__Group__1 ;
+    // InternalFormat.g:6564:1: rule__MatcherList__Group__0 : rule__MatcherList__Group__0__Impl rule__MatcherList__Group__1 ;
     public final void rule__MatcherList__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6568:1: ( rule__MatcherList__Group__0__Impl rule__MatcherList__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6569:2: rule__MatcherList__Group__0__Impl rule__MatcherList__Group__1
+            // InternalFormat.g:6568:1: ( rule__MatcherList__Group__0__Impl rule__MatcherList__Group__1 )
+            // InternalFormat.g:6569:2: rule__MatcherList__Group__0__Impl rule__MatcherList__Group__1
             {
-            pushFollow(FOLLOW_rule__MatcherList__Group__0__Impl_in_rule__MatcherList__Group__014133);
+            pushFollow(FOLLOW_27);
             rule__MatcherList__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__MatcherList__Group__1_in_rule__MatcherList__Group__014136);
+            pushFollow(FOLLOW_2);
             rule__MatcherList__Group__1();
 
             state._fsp--;
@@ -21375,22 +21375,22 @@ public final void rule__MatcherList__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__MatcherList__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6576:1: rule__MatcherList__Group__0__Impl : ( ':' ) ;
+    // InternalFormat.g:6576:1: rule__MatcherList__Group__0__Impl : ( ':' ) ;
     public final void rule__MatcherList__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6580:1: ( ( ':' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6581:1: ( ':' )
+            // InternalFormat.g:6580:1: ( ( ':' ) )
+            // InternalFormat.g:6581:1: ( ':' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6581:1: ( ':' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6582:1: ':'
+            // InternalFormat.g:6581:1: ( ':' )
+            // InternalFormat.g:6582:1: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMatcherListAccess().getColonKeyword_0()); 
             }
-            match(input,72,FOLLOW_72_in_rule__MatcherList__Group__0__Impl14164); if (state.failed) return ;
+            match(input,72,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getMatcherListAccess().getColonKeyword_0()); 
             }
@@ -21416,21 +21416,21 @@ public final void rule__MatcherList__Group__0__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__MatcherList__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6595:1: rule__MatcherList__Group__1 : rule__MatcherList__Group__1__Impl rule__MatcherList__Group__2 ;
+    // InternalFormat.g:6595:1: rule__MatcherList__Group__1 : rule__MatcherList__Group__1__Impl rule__MatcherList__Group__2 ;
     public final void rule__MatcherList__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6599:1: ( rule__MatcherList__Group__1__Impl rule__MatcherList__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6600:2: rule__MatcherList__Group__1__Impl rule__MatcherList__Group__2
+            // InternalFormat.g:6599:1: ( rule__MatcherList__Group__1__Impl rule__MatcherList__Group__2 )
+            // InternalFormat.g:6600:2: rule__MatcherList__Group__1__Impl rule__MatcherList__Group__2
             {
-            pushFollow(FOLLOW_rule__MatcherList__Group__1__Impl_in_rule__MatcherList__Group__114195);
+            pushFollow(FOLLOW_28);
             rule__MatcherList__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__MatcherList__Group__2_in_rule__MatcherList__Group__114198);
+            pushFollow(FOLLOW_2);
             rule__MatcherList__Group__2();
 
             state._fsp--;
@@ -21454,25 +21454,25 @@ public final void rule__MatcherList__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__MatcherList__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6607:1: rule__MatcherList__Group__1__Impl : ( ( rule__MatcherList__MatchersAssignment_1 ) ) ;
+    // InternalFormat.g:6607:1: rule__MatcherList__Group__1__Impl : ( ( rule__MatcherList__MatchersAssignment_1 ) ) ;
     public final void rule__MatcherList__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6611:1: ( ( ( rule__MatcherList__MatchersAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6612:1: ( ( rule__MatcherList__MatchersAssignment_1 ) )
+            // InternalFormat.g:6611:1: ( ( ( rule__MatcherList__MatchersAssignment_1 ) ) )
+            // InternalFormat.g:6612:1: ( ( rule__MatcherList__MatchersAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6612:1: ( ( rule__MatcherList__MatchersAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6613:1: ( rule__MatcherList__MatchersAssignment_1 )
+            // InternalFormat.g:6612:1: ( ( rule__MatcherList__MatchersAssignment_1 ) )
+            // InternalFormat.g:6613:1: ( rule__MatcherList__MatchersAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMatcherListAccess().getMatchersAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6614:1: ( rule__MatcherList__MatchersAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6614:2: rule__MatcherList__MatchersAssignment_1
+            // InternalFormat.g:6614:1: ( rule__MatcherList__MatchersAssignment_1 )
+            // InternalFormat.g:6614:2: rule__MatcherList__MatchersAssignment_1
             {
-            pushFollow(FOLLOW_rule__MatcherList__MatchersAssignment_1_in_rule__MatcherList__Group__1__Impl14225);
+            pushFollow(FOLLOW_2);
             rule__MatcherList__MatchersAssignment_1();
 
             state._fsp--;
@@ -21505,21 +21505,21 @@ public final void rule__MatcherList__Group__1__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__MatcherList__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6624:1: rule__MatcherList__Group__2 : rule__MatcherList__Group__2__Impl rule__MatcherList__Group__3 ;
+    // InternalFormat.g:6624:1: rule__MatcherList__Group__2 : rule__MatcherList__Group__2__Impl rule__MatcherList__Group__3 ;
     public final void rule__MatcherList__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6628:1: ( rule__MatcherList__Group__2__Impl rule__MatcherList__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6629:2: rule__MatcherList__Group__2__Impl rule__MatcherList__Group__3
+            // InternalFormat.g:6628:1: ( rule__MatcherList__Group__2__Impl rule__MatcherList__Group__3 )
+            // InternalFormat.g:6629:2: rule__MatcherList__Group__2__Impl rule__MatcherList__Group__3
             {
-            pushFollow(FOLLOW_rule__MatcherList__Group__2__Impl_in_rule__MatcherList__Group__214255);
+            pushFollow(FOLLOW_28);
             rule__MatcherList__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__MatcherList__Group__3_in_rule__MatcherList__Group__214258);
+            pushFollow(FOLLOW_2);
             rule__MatcherList__Group__3();
 
             state._fsp--;
@@ -21543,22 +21543,22 @@ public final void rule__MatcherList__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__MatcherList__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6636:1: rule__MatcherList__Group__2__Impl : ( ( rule__MatcherList__Group_2__0 )* ) ;
+    // InternalFormat.g:6636:1: rule__MatcherList__Group__2__Impl : ( ( rule__MatcherList__Group_2__0 )* ) ;
     public final void rule__MatcherList__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6640:1: ( ( ( rule__MatcherList__Group_2__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6641:1: ( ( rule__MatcherList__Group_2__0 )* )
+            // InternalFormat.g:6640:1: ( ( ( rule__MatcherList__Group_2__0 )* ) )
+            // InternalFormat.g:6641:1: ( ( rule__MatcherList__Group_2__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6641:1: ( ( rule__MatcherList__Group_2__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6642:1: ( rule__MatcherList__Group_2__0 )*
+            // InternalFormat.g:6641:1: ( ( rule__MatcherList__Group_2__0 )* )
+            // InternalFormat.g:6642:1: ( rule__MatcherList__Group_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMatcherListAccess().getGroup_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6643:1: ( rule__MatcherList__Group_2__0 )*
+            // InternalFormat.g:6643:1: ( rule__MatcherList__Group_2__0 )*
             loop79:
             do {
                 int alt79=2;
@@ -21571,9 +21571,9 @@ public final void rule__MatcherList__Group__2__Impl() throws RecognitionExceptio
 
                 switch (alt79) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6643:2: rule__MatcherList__Group_2__0
+            	    // InternalFormat.g:6643:2: rule__MatcherList__Group_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__MatcherList__Group_2__0_in_rule__MatcherList__Group__2__Impl14285);
+            	    pushFollow(FOLLOW_23);
             	    rule__MatcherList__Group_2__0();
 
             	    state._fsp--;
@@ -21612,16 +21612,16 @@ public final void rule__MatcherList__Group__2__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__MatcherList__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6653:1: rule__MatcherList__Group__3 : rule__MatcherList__Group__3__Impl ;
+    // InternalFormat.g:6653:1: rule__MatcherList__Group__3 : rule__MatcherList__Group__3__Impl ;
     public final void rule__MatcherList__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6657:1: ( rule__MatcherList__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6658:2: rule__MatcherList__Group__3__Impl
+            // InternalFormat.g:6657:1: ( rule__MatcherList__Group__3__Impl )
+            // InternalFormat.g:6658:2: rule__MatcherList__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__MatcherList__Group__3__Impl_in_rule__MatcherList__Group__314316);
+            pushFollow(FOLLOW_2);
             rule__MatcherList__Group__3__Impl();
 
             state._fsp--;
@@ -21645,22 +21645,22 @@ public final void rule__MatcherList__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__MatcherList__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6664:1: rule__MatcherList__Group__3__Impl : ( ';' ) ;
+    // InternalFormat.g:6664:1: rule__MatcherList__Group__3__Impl : ( ';' ) ;
     public final void rule__MatcherList__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6668:1: ( ( ';' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6669:1: ( ';' )
+            // InternalFormat.g:6668:1: ( ( ';' ) )
+            // InternalFormat.g:6669:1: ( ';' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6669:1: ( ';' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6670:1: ';'
+            // InternalFormat.g:6669:1: ( ';' )
+            // InternalFormat.g:6670:1: ';'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMatcherListAccess().getSemicolonKeyword_3()); 
             }
-            match(input,65,FOLLOW_65_in_rule__MatcherList__Group__3__Impl14344); if (state.failed) return ;
+            match(input,65,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getMatcherListAccess().getSemicolonKeyword_3()); 
             }
@@ -21686,21 +21686,21 @@ public final void rule__MatcherList__Group__3__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__MatcherList__Group_2__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6691:1: rule__MatcherList__Group_2__0 : rule__MatcherList__Group_2__0__Impl rule__MatcherList__Group_2__1 ;
+    // InternalFormat.g:6691:1: rule__MatcherList__Group_2__0 : rule__MatcherList__Group_2__0__Impl rule__MatcherList__Group_2__1 ;
     public final void rule__MatcherList__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6695:1: ( rule__MatcherList__Group_2__0__Impl rule__MatcherList__Group_2__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6696:2: rule__MatcherList__Group_2__0__Impl rule__MatcherList__Group_2__1
+            // InternalFormat.g:6695:1: ( rule__MatcherList__Group_2__0__Impl rule__MatcherList__Group_2__1 )
+            // InternalFormat.g:6696:2: rule__MatcherList__Group_2__0__Impl rule__MatcherList__Group_2__1
             {
-            pushFollow(FOLLOW_rule__MatcherList__Group_2__0__Impl_in_rule__MatcherList__Group_2__014383);
+            pushFollow(FOLLOW_27);
             rule__MatcherList__Group_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__MatcherList__Group_2__1_in_rule__MatcherList__Group_2__014386);
+            pushFollow(FOLLOW_2);
             rule__MatcherList__Group_2__1();
 
             state._fsp--;
@@ -21724,22 +21724,22 @@ public final void rule__MatcherList__Group_2__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__MatcherList__Group_2__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6703:1: rule__MatcherList__Group_2__0__Impl : ( ',' ) ;
+    // InternalFormat.g:6703:1: rule__MatcherList__Group_2__0__Impl : ( ',' ) ;
     public final void rule__MatcherList__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6707:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6708:1: ( ',' )
+            // InternalFormat.g:6707:1: ( ( ',' ) )
+            // InternalFormat.g:6708:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6708:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6709:1: ','
+            // InternalFormat.g:6708:1: ( ',' )
+            // InternalFormat.g:6709:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMatcherListAccess().getCommaKeyword_2_0()); 
             }
-            match(input,71,FOLLOW_71_in_rule__MatcherList__Group_2__0__Impl14414); if (state.failed) return ;
+            match(input,71,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getMatcherListAccess().getCommaKeyword_2_0()); 
             }
@@ -21765,16 +21765,16 @@ public final void rule__MatcherList__Group_2__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__MatcherList__Group_2__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6722:1: rule__MatcherList__Group_2__1 : rule__MatcherList__Group_2__1__Impl ;
+    // InternalFormat.g:6722:1: rule__MatcherList__Group_2__1 : rule__MatcherList__Group_2__1__Impl ;
     public final void rule__MatcherList__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6726:1: ( rule__MatcherList__Group_2__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6727:2: rule__MatcherList__Group_2__1__Impl
+            // InternalFormat.g:6726:1: ( rule__MatcherList__Group_2__1__Impl )
+            // InternalFormat.g:6727:2: rule__MatcherList__Group_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__MatcherList__Group_2__1__Impl_in_rule__MatcherList__Group_2__114445);
+            pushFollow(FOLLOW_2);
             rule__MatcherList__Group_2__1__Impl();
 
             state._fsp--;
@@ -21798,25 +21798,25 @@ public final void rule__MatcherList__Group_2__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__MatcherList__Group_2__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6733:1: rule__MatcherList__Group_2__1__Impl : ( ( rule__MatcherList__MatchersAssignment_2_1 ) ) ;
+    // InternalFormat.g:6733:1: rule__MatcherList__Group_2__1__Impl : ( ( rule__MatcherList__MatchersAssignment_2_1 ) ) ;
     public final void rule__MatcherList__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6737:1: ( ( ( rule__MatcherList__MatchersAssignment_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6738:1: ( ( rule__MatcherList__MatchersAssignment_2_1 ) )
+            // InternalFormat.g:6737:1: ( ( ( rule__MatcherList__MatchersAssignment_2_1 ) ) )
+            // InternalFormat.g:6738:1: ( ( rule__MatcherList__MatchersAssignment_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6738:1: ( ( rule__MatcherList__MatchersAssignment_2_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6739:1: ( rule__MatcherList__MatchersAssignment_2_1 )
+            // InternalFormat.g:6738:1: ( ( rule__MatcherList__MatchersAssignment_2_1 ) )
+            // InternalFormat.g:6739:1: ( rule__MatcherList__MatchersAssignment_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMatcherListAccess().getMatchersAssignment_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6740:1: ( rule__MatcherList__MatchersAssignment_2_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6740:2: rule__MatcherList__MatchersAssignment_2_1
+            // InternalFormat.g:6740:1: ( rule__MatcherList__MatchersAssignment_2_1 )
+            // InternalFormat.g:6740:2: rule__MatcherList__MatchersAssignment_2_1
             {
-            pushFollow(FOLLOW_rule__MatcherList__MatchersAssignment_2_1_in_rule__MatcherList__Group_2__1__Impl14472);
+            pushFollow(FOLLOW_2);
             rule__MatcherList__MatchersAssignment_2_1();
 
             state._fsp--;
@@ -21849,21 +21849,21 @@ public final void rule__MatcherList__Group_2__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__GroupBlock__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6754:1: rule__GroupBlock__Group__0 : rule__GroupBlock__Group__0__Impl rule__GroupBlock__Group__1 ;
+    // InternalFormat.g:6754:1: rule__GroupBlock__Group__0 : rule__GroupBlock__Group__0__Impl rule__GroupBlock__Group__1 ;
     public final void rule__GroupBlock__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6758:1: ( rule__GroupBlock__Group__0__Impl rule__GroupBlock__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6759:2: rule__GroupBlock__Group__0__Impl rule__GroupBlock__Group__1
+            // InternalFormat.g:6758:1: ( rule__GroupBlock__Group__0__Impl rule__GroupBlock__Group__1 )
+            // InternalFormat.g:6759:2: rule__GroupBlock__Group__0__Impl rule__GroupBlock__Group__1
             {
-            pushFollow(FOLLOW_rule__GroupBlock__Group__0__Impl_in_rule__GroupBlock__Group__014506);
+            pushFollow(FOLLOW_29);
             rule__GroupBlock__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__GroupBlock__Group__1_in_rule__GroupBlock__Group__014509);
+            pushFollow(FOLLOW_2);
             rule__GroupBlock__Group__1();
 
             state._fsp--;
@@ -21887,22 +21887,22 @@ public final void rule__GroupBlock__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__GroupBlock__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6766:1: rule__GroupBlock__Group__0__Impl : ( 'group' ) ;
+    // InternalFormat.g:6766:1: rule__GroupBlock__Group__0__Impl : ( 'group' ) ;
     public final void rule__GroupBlock__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6770:1: ( ( 'group' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6771:1: ( 'group' )
+            // InternalFormat.g:6770:1: ( ( 'group' ) )
+            // InternalFormat.g:6771:1: ( 'group' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6771:1: ( 'group' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6772:1: 'group'
+            // InternalFormat.g:6771:1: ( 'group' )
+            // InternalFormat.g:6772:1: 'group'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGroupBlockAccess().getGroupKeyword_0()); 
             }
-            match(input,73,FOLLOW_73_in_rule__GroupBlock__Group__0__Impl14537); if (state.failed) return ;
+            match(input,73,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGroupBlockAccess().getGroupKeyword_0()); 
             }
@@ -21928,21 +21928,21 @@ public final void rule__GroupBlock__Group__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__GroupBlock__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6785:1: rule__GroupBlock__Group__1 : rule__GroupBlock__Group__1__Impl rule__GroupBlock__Group__2 ;
+    // InternalFormat.g:6785:1: rule__GroupBlock__Group__1 : rule__GroupBlock__Group__1__Impl rule__GroupBlock__Group__2 ;
     public final void rule__GroupBlock__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6789:1: ( rule__GroupBlock__Group__1__Impl rule__GroupBlock__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6790:2: rule__GroupBlock__Group__1__Impl rule__GroupBlock__Group__2
+            // InternalFormat.g:6789:1: ( rule__GroupBlock__Group__1__Impl rule__GroupBlock__Group__2 )
+            // InternalFormat.g:6790:2: rule__GroupBlock__Group__1__Impl rule__GroupBlock__Group__2
             {
-            pushFollow(FOLLOW_rule__GroupBlock__Group__1__Impl_in_rule__GroupBlock__Group__114568);
+            pushFollow(FOLLOW_30);
             rule__GroupBlock__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__GroupBlock__Group__2_in_rule__GroupBlock__Group__114571);
+            pushFollow(FOLLOW_2);
             rule__GroupBlock__Group__2();
 
             state._fsp--;
@@ -21966,25 +21966,25 @@ public final void rule__GroupBlock__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__GroupBlock__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6797:1: rule__GroupBlock__Group__1__Impl : ( ( rule__GroupBlock__GrammarElementAssignment_1 ) ) ;
+    // InternalFormat.g:6797:1: rule__GroupBlock__Group__1__Impl : ( ( rule__GroupBlock__GrammarElementAssignment_1 ) ) ;
     public final void rule__GroupBlock__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6801:1: ( ( ( rule__GroupBlock__GrammarElementAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6802:1: ( ( rule__GroupBlock__GrammarElementAssignment_1 ) )
+            // InternalFormat.g:6801:1: ( ( ( rule__GroupBlock__GrammarElementAssignment_1 ) ) )
+            // InternalFormat.g:6802:1: ( ( rule__GroupBlock__GrammarElementAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6802:1: ( ( rule__GroupBlock__GrammarElementAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6803:1: ( rule__GroupBlock__GrammarElementAssignment_1 )
+            // InternalFormat.g:6802:1: ( ( rule__GroupBlock__GrammarElementAssignment_1 ) )
+            // InternalFormat.g:6803:1: ( rule__GroupBlock__GrammarElementAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGroupBlockAccess().getGrammarElementAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6804:1: ( rule__GroupBlock__GrammarElementAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6804:2: rule__GroupBlock__GrammarElementAssignment_1
+            // InternalFormat.g:6804:1: ( rule__GroupBlock__GrammarElementAssignment_1 )
+            // InternalFormat.g:6804:2: rule__GroupBlock__GrammarElementAssignment_1
             {
-            pushFollow(FOLLOW_rule__GroupBlock__GrammarElementAssignment_1_in_rule__GroupBlock__Group__1__Impl14598);
+            pushFollow(FOLLOW_2);
             rule__GroupBlock__GrammarElementAssignment_1();
 
             state._fsp--;
@@ -22017,16 +22017,16 @@ public final void rule__GroupBlock__Group__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__GroupBlock__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6814:1: rule__GroupBlock__Group__2 : rule__GroupBlock__Group__2__Impl ;
+    // InternalFormat.g:6814:1: rule__GroupBlock__Group__2 : rule__GroupBlock__Group__2__Impl ;
     public final void rule__GroupBlock__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6818:1: ( rule__GroupBlock__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6819:2: rule__GroupBlock__Group__2__Impl
+            // InternalFormat.g:6818:1: ( rule__GroupBlock__Group__2__Impl )
+            // InternalFormat.g:6819:2: rule__GroupBlock__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__GroupBlock__Group__2__Impl_in_rule__GroupBlock__Group__214628);
+            pushFollow(FOLLOW_2);
             rule__GroupBlock__Group__2__Impl();
 
             state._fsp--;
@@ -22050,25 +22050,25 @@ public final void rule__GroupBlock__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__GroupBlock__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6825:1: rule__GroupBlock__Group__2__Impl : ( ( rule__GroupBlock__Alternatives_2 ) ) ;
+    // InternalFormat.g:6825:1: rule__GroupBlock__Group__2__Impl : ( ( rule__GroupBlock__Alternatives_2 ) ) ;
     public final void rule__GroupBlock__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6829:1: ( ( ( rule__GroupBlock__Alternatives_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6830:1: ( ( rule__GroupBlock__Alternatives_2 ) )
+            // InternalFormat.g:6829:1: ( ( ( rule__GroupBlock__Alternatives_2 ) ) )
+            // InternalFormat.g:6830:1: ( ( rule__GroupBlock__Alternatives_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6830:1: ( ( rule__GroupBlock__Alternatives_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6831:1: ( rule__GroupBlock__Alternatives_2 )
+            // InternalFormat.g:6830:1: ( ( rule__GroupBlock__Alternatives_2 ) )
+            // InternalFormat.g:6831:1: ( rule__GroupBlock__Alternatives_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGroupBlockAccess().getAlternatives_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6832:1: ( rule__GroupBlock__Alternatives_2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6832:2: rule__GroupBlock__Alternatives_2
+            // InternalFormat.g:6832:1: ( rule__GroupBlock__Alternatives_2 )
+            // InternalFormat.g:6832:2: rule__GroupBlock__Alternatives_2
             {
-            pushFollow(FOLLOW_rule__GroupBlock__Alternatives_2_in_rule__GroupBlock__Group__2__Impl14655);
+            pushFollow(FOLLOW_2);
             rule__GroupBlock__Alternatives_2();
 
             state._fsp--;
@@ -22101,21 +22101,21 @@ public final void rule__GroupBlock__Group__2__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__GroupBlock__Group_2_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6848:1: rule__GroupBlock__Group_2_1__0 : rule__GroupBlock__Group_2_1__0__Impl rule__GroupBlock__Group_2_1__1 ;
+    // InternalFormat.g:6848:1: rule__GroupBlock__Group_2_1__0 : rule__GroupBlock__Group_2_1__0__Impl rule__GroupBlock__Group_2_1__1 ;
     public final void rule__GroupBlock__Group_2_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6852:1: ( rule__GroupBlock__Group_2_1__0__Impl rule__GroupBlock__Group_2_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6853:2: rule__GroupBlock__Group_2_1__0__Impl rule__GroupBlock__Group_2_1__1
+            // InternalFormat.g:6852:1: ( rule__GroupBlock__Group_2_1__0__Impl rule__GroupBlock__Group_2_1__1 )
+            // InternalFormat.g:6853:2: rule__GroupBlock__Group_2_1__0__Impl rule__GroupBlock__Group_2_1__1
             {
-            pushFollow(FOLLOW_rule__GroupBlock__Group_2_1__0__Impl_in_rule__GroupBlock__Group_2_1__014691);
+            pushFollow(FOLLOW_31);
             rule__GroupBlock__Group_2_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__GroupBlock__Group_2_1__1_in_rule__GroupBlock__Group_2_1__014694);
+            pushFollow(FOLLOW_2);
             rule__GroupBlock__Group_2_1__1();
 
             state._fsp--;
@@ -22139,22 +22139,22 @@ public final void rule__GroupBlock__Group_2_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__GroupBlock__Group_2_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6860:1: rule__GroupBlock__Group_2_1__0__Impl : ( '=>' ) ;
+    // InternalFormat.g:6860:1: rule__GroupBlock__Group_2_1__0__Impl : ( '=>' ) ;
     public final void rule__GroupBlock__Group_2_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6864:1: ( ( '=>' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6865:1: ( '=>' )
+            // InternalFormat.g:6864:1: ( ( '=>' ) )
+            // InternalFormat.g:6865:1: ( '=>' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6865:1: ( '=>' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6866:1: '=>'
+            // InternalFormat.g:6865:1: ( '=>' )
+            // InternalFormat.g:6866:1: '=>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGroupBlockAccess().getEqualsSignGreaterThanSignKeyword_2_1_0()); 
             }
-            match(input,37,FOLLOW_37_in_rule__GroupBlock__Group_2_1__0__Impl14722); if (state.failed) return ;
+            match(input,37,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGroupBlockAccess().getEqualsSignGreaterThanSignKeyword_2_1_0()); 
             }
@@ -22180,16 +22180,16 @@ public final void rule__GroupBlock__Group_2_1__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__GroupBlock__Group_2_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6879:1: rule__GroupBlock__Group_2_1__1 : rule__GroupBlock__Group_2_1__1__Impl ;
+    // InternalFormat.g:6879:1: rule__GroupBlock__Group_2_1__1 : rule__GroupBlock__Group_2_1__1__Impl ;
     public final void rule__GroupBlock__Group_2_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6883:1: ( rule__GroupBlock__Group_2_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6884:2: rule__GroupBlock__Group_2_1__1__Impl
+            // InternalFormat.g:6883:1: ( rule__GroupBlock__Group_2_1__1__Impl )
+            // InternalFormat.g:6884:2: rule__GroupBlock__Group_2_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__GroupBlock__Group_2_1__1__Impl_in_rule__GroupBlock__Group_2_1__114753);
+            pushFollow(FOLLOW_2);
             rule__GroupBlock__Group_2_1__1__Impl();
 
             state._fsp--;
@@ -22213,25 +22213,25 @@ public final void rule__GroupBlock__Group_2_1__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__GroupBlock__Group_2_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6890:1: rule__GroupBlock__Group_2_1__1__Impl : ( ( rule__GroupBlock__SubGroupAssignment_2_1_1 ) ) ;
+    // InternalFormat.g:6890:1: rule__GroupBlock__Group_2_1__1__Impl : ( ( rule__GroupBlock__SubGroupAssignment_2_1_1 ) ) ;
     public final void rule__GroupBlock__Group_2_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6894:1: ( ( ( rule__GroupBlock__SubGroupAssignment_2_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6895:1: ( ( rule__GroupBlock__SubGroupAssignment_2_1_1 ) )
+            // InternalFormat.g:6894:1: ( ( ( rule__GroupBlock__SubGroupAssignment_2_1_1 ) ) )
+            // InternalFormat.g:6895:1: ( ( rule__GroupBlock__SubGroupAssignment_2_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6895:1: ( ( rule__GroupBlock__SubGroupAssignment_2_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6896:1: ( rule__GroupBlock__SubGroupAssignment_2_1_1 )
+            // InternalFormat.g:6895:1: ( ( rule__GroupBlock__SubGroupAssignment_2_1_1 ) )
+            // InternalFormat.g:6896:1: ( rule__GroupBlock__SubGroupAssignment_2_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGroupBlockAccess().getSubGroupAssignment_2_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6897:1: ( rule__GroupBlock__SubGroupAssignment_2_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6897:2: rule__GroupBlock__SubGroupAssignment_2_1_1
+            // InternalFormat.g:6897:1: ( rule__GroupBlock__SubGroupAssignment_2_1_1 )
+            // InternalFormat.g:6897:2: rule__GroupBlock__SubGroupAssignment_2_1_1
             {
-            pushFollow(FOLLOW_rule__GroupBlock__SubGroupAssignment_2_1_1_in_rule__GroupBlock__Group_2_1__1__Impl14780);
+            pushFollow(FOLLOW_2);
             rule__GroupBlock__SubGroupAssignment_2_1_1();
 
             state._fsp--;
@@ -22264,21 +22264,21 @@ public final void rule__GroupBlock__Group_2_1__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__GroupBlock__Group_2_2__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6911:1: rule__GroupBlock__Group_2_2__0 : rule__GroupBlock__Group_2_2__0__Impl rule__GroupBlock__Group_2_2__1 ;
+    // InternalFormat.g:6911:1: rule__GroupBlock__Group_2_2__0 : rule__GroupBlock__Group_2_2__0__Impl rule__GroupBlock__Group_2_2__1 ;
     public final void rule__GroupBlock__Group_2_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6915:1: ( rule__GroupBlock__Group_2_2__0__Impl rule__GroupBlock__Group_2_2__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6916:2: rule__GroupBlock__Group_2_2__0__Impl rule__GroupBlock__Group_2_2__1
+            // InternalFormat.g:6915:1: ( rule__GroupBlock__Group_2_2__0__Impl rule__GroupBlock__Group_2_2__1 )
+            // InternalFormat.g:6916:2: rule__GroupBlock__Group_2_2__0__Impl rule__GroupBlock__Group_2_2__1
             {
-            pushFollow(FOLLOW_rule__GroupBlock__Group_2_2__0__Impl_in_rule__GroupBlock__Group_2_2__014814);
+            pushFollow(FOLLOW_19);
             rule__GroupBlock__Group_2_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__GroupBlock__Group_2_2__1_in_rule__GroupBlock__Group_2_2__014817);
+            pushFollow(FOLLOW_2);
             rule__GroupBlock__Group_2_2__1();
 
             state._fsp--;
@@ -22302,22 +22302,22 @@ public final void rule__GroupBlock__Group_2_2__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__GroupBlock__Group_2_2__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6923:1: rule__GroupBlock__Group_2_2__0__Impl : ( '{' ) ;
+    // InternalFormat.g:6923:1: rule__GroupBlock__Group_2_2__0__Impl : ( '{' ) ;
     public final void rule__GroupBlock__Group_2_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6927:1: ( ( '{' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6928:1: ( '{' )
+            // InternalFormat.g:6927:1: ( ( '{' ) )
+            // InternalFormat.g:6928:1: ( '{' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6928:1: ( '{' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6929:1: '{'
+            // InternalFormat.g:6928:1: ( '{' )
+            // InternalFormat.g:6929:1: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGroupBlockAccess().getLeftCurlyBracketKeyword_2_2_0()); 
             }
-            match(input,66,FOLLOW_66_in_rule__GroupBlock__Group_2_2__0__Impl14845); if (state.failed) return ;
+            match(input,66,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGroupBlockAccess().getLeftCurlyBracketKeyword_2_2_0()); 
             }
@@ -22343,21 +22343,21 @@ public final void rule__GroupBlock__Group_2_2__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__GroupBlock__Group_2_2__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6942:1: rule__GroupBlock__Group_2_2__1 : rule__GroupBlock__Group_2_2__1__Impl rule__GroupBlock__Group_2_2__2 ;
+    // InternalFormat.g:6942:1: rule__GroupBlock__Group_2_2__1 : rule__GroupBlock__Group_2_2__1__Impl rule__GroupBlock__Group_2_2__2 ;
     public final void rule__GroupBlock__Group_2_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6946:1: ( rule__GroupBlock__Group_2_2__1__Impl rule__GroupBlock__Group_2_2__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6947:2: rule__GroupBlock__Group_2_2__1__Impl rule__GroupBlock__Group_2_2__2
+            // InternalFormat.g:6946:1: ( rule__GroupBlock__Group_2_2__1__Impl rule__GroupBlock__Group_2_2__2 )
+            // InternalFormat.g:6947:2: rule__GroupBlock__Group_2_2__1__Impl rule__GroupBlock__Group_2_2__2
             {
-            pushFollow(FOLLOW_rule__GroupBlock__Group_2_2__1__Impl_in_rule__GroupBlock__Group_2_2__114876);
+            pushFollow(FOLLOW_19);
             rule__GroupBlock__Group_2_2__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__GroupBlock__Group_2_2__2_in_rule__GroupBlock__Group_2_2__114879);
+            pushFollow(FOLLOW_2);
             rule__GroupBlock__Group_2_2__2();
 
             state._fsp--;
@@ -22381,22 +22381,22 @@ public final void rule__GroupBlock__Group_2_2__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__GroupBlock__Group_2_2__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6954:1: rule__GroupBlock__Group_2_2__1__Impl : ( ( rule__GroupBlock__DirectivesAssignment_2_2_1 )* ) ;
+    // InternalFormat.g:6954:1: rule__GroupBlock__Group_2_2__1__Impl : ( ( rule__GroupBlock__DirectivesAssignment_2_2_1 )* ) ;
     public final void rule__GroupBlock__Group_2_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6958:1: ( ( ( rule__GroupBlock__DirectivesAssignment_2_2_1 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6959:1: ( ( rule__GroupBlock__DirectivesAssignment_2_2_1 )* )
+            // InternalFormat.g:6958:1: ( ( ( rule__GroupBlock__DirectivesAssignment_2_2_1 )* ) )
+            // InternalFormat.g:6959:1: ( ( rule__GroupBlock__DirectivesAssignment_2_2_1 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6959:1: ( ( rule__GroupBlock__DirectivesAssignment_2_2_1 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6960:1: ( rule__GroupBlock__DirectivesAssignment_2_2_1 )*
+            // InternalFormat.g:6959:1: ( ( rule__GroupBlock__DirectivesAssignment_2_2_1 )* )
+            // InternalFormat.g:6960:1: ( rule__GroupBlock__DirectivesAssignment_2_2_1 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGroupBlockAccess().getDirectivesAssignment_2_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6961:1: ( rule__GroupBlock__DirectivesAssignment_2_2_1 )*
+            // InternalFormat.g:6961:1: ( rule__GroupBlock__DirectivesAssignment_2_2_1 )*
             loop80:
             do {
                 int alt80=2;
@@ -22409,9 +22409,9 @@ public final void rule__GroupBlock__Group_2_2__1__Impl() throws RecognitionExcep
 
                 switch (alt80) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6961:2: rule__GroupBlock__DirectivesAssignment_2_2_1
+            	    // InternalFormat.g:6961:2: rule__GroupBlock__DirectivesAssignment_2_2_1
             	    {
-            	    pushFollow(FOLLOW_rule__GroupBlock__DirectivesAssignment_2_2_1_in_rule__GroupBlock__Group_2_2__1__Impl14906);
+            	    pushFollow(FOLLOW_20);
             	    rule__GroupBlock__DirectivesAssignment_2_2_1();
 
             	    state._fsp--;
@@ -22450,16 +22450,16 @@ public final void rule__GroupBlock__Group_2_2__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__GroupBlock__Group_2_2__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6971:1: rule__GroupBlock__Group_2_2__2 : rule__GroupBlock__Group_2_2__2__Impl ;
+    // InternalFormat.g:6971:1: rule__GroupBlock__Group_2_2__2 : rule__GroupBlock__Group_2_2__2__Impl ;
     public final void rule__GroupBlock__Group_2_2__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6975:1: ( rule__GroupBlock__Group_2_2__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6976:2: rule__GroupBlock__Group_2_2__2__Impl
+            // InternalFormat.g:6975:1: ( rule__GroupBlock__Group_2_2__2__Impl )
+            // InternalFormat.g:6976:2: rule__GroupBlock__Group_2_2__2__Impl
             {
-            pushFollow(FOLLOW_rule__GroupBlock__Group_2_2__2__Impl_in_rule__GroupBlock__Group_2_2__214937);
+            pushFollow(FOLLOW_2);
             rule__GroupBlock__Group_2_2__2__Impl();
 
             state._fsp--;
@@ -22483,22 +22483,22 @@ public final void rule__GroupBlock__Group_2_2__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__GroupBlock__Group_2_2__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6982:1: rule__GroupBlock__Group_2_2__2__Impl : ( '}' ) ;
+    // InternalFormat.g:6982:1: rule__GroupBlock__Group_2_2__2__Impl : ( '}' ) ;
     public final void rule__GroupBlock__Group_2_2__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6986:1: ( ( '}' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6987:1: ( '}' )
+            // InternalFormat.g:6986:1: ( ( '}' ) )
+            // InternalFormat.g:6987:1: ( '}' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6987:1: ( '}' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:6988:1: '}'
+            // InternalFormat.g:6987:1: ( '}' )
+            // InternalFormat.g:6988:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGroupBlockAccess().getRightCurlyBracketKeyword_2_2_2()); 
             }
-            match(input,67,FOLLOW_67_in_rule__GroupBlock__Group_2_2__2__Impl14965); if (state.failed) return ;
+            match(input,67,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGroupBlockAccess().getRightCurlyBracketKeyword_2_2_2()); 
             }
@@ -22524,21 +22524,21 @@ public final void rule__GroupBlock__Group_2_2__2__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__KeywordPair__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7007:1: rule__KeywordPair__Group__0 : rule__KeywordPair__Group__0__Impl rule__KeywordPair__Group__1 ;
+    // InternalFormat.g:7007:1: rule__KeywordPair__Group__0 : rule__KeywordPair__Group__0__Impl rule__KeywordPair__Group__1 ;
     public final void rule__KeywordPair__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7011:1: ( rule__KeywordPair__Group__0__Impl rule__KeywordPair__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7012:2: rule__KeywordPair__Group__0__Impl rule__KeywordPair__Group__1
+            // InternalFormat.g:7011:1: ( rule__KeywordPair__Group__0__Impl rule__KeywordPair__Group__1 )
+            // InternalFormat.g:7012:2: rule__KeywordPair__Group__0__Impl rule__KeywordPair__Group__1
             {
-            pushFollow(FOLLOW_rule__KeywordPair__Group__0__Impl_in_rule__KeywordPair__Group__015002);
+            pushFollow(FOLLOW_32);
             rule__KeywordPair__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__KeywordPair__Group__1_in_rule__KeywordPair__Group__015005);
+            pushFollow(FOLLOW_2);
             rule__KeywordPair__Group__1();
 
             state._fsp--;
@@ -22562,22 +22562,22 @@ public final void rule__KeywordPair__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__KeywordPair__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7019:1: rule__KeywordPair__Group__0__Impl : ( '(' ) ;
+    // InternalFormat.g:7019:1: rule__KeywordPair__Group__0__Impl : ( '(' ) ;
     public final void rule__KeywordPair__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7023:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7024:1: ( '(' )
+            // InternalFormat.g:7023:1: ( ( '(' ) )
+            // InternalFormat.g:7024:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7024:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7025:1: '('
+            // InternalFormat.g:7024:1: ( '(' )
+            // InternalFormat.g:7025:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getKeywordPairAccess().getLeftParenthesisKeyword_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__KeywordPair__Group__0__Impl15033); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getKeywordPairAccess().getLeftParenthesisKeyword_0()); 
             }
@@ -22603,21 +22603,21 @@ public final void rule__KeywordPair__Group__0__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__KeywordPair__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7038:1: rule__KeywordPair__Group__1 : rule__KeywordPair__Group__1__Impl rule__KeywordPair__Group__2 ;
+    // InternalFormat.g:7038:1: rule__KeywordPair__Group__1 : rule__KeywordPair__Group__1__Impl rule__KeywordPair__Group__2 ;
     public final void rule__KeywordPair__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7042:1: ( rule__KeywordPair__Group__1__Impl rule__KeywordPair__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7043:2: rule__KeywordPair__Group__1__Impl rule__KeywordPair__Group__2
+            // InternalFormat.g:7042:1: ( rule__KeywordPair__Group__1__Impl rule__KeywordPair__Group__2 )
+            // InternalFormat.g:7043:2: rule__KeywordPair__Group__1__Impl rule__KeywordPair__Group__2
             {
-            pushFollow(FOLLOW_rule__KeywordPair__Group__1__Impl_in_rule__KeywordPair__Group__115064);
+            pushFollow(FOLLOW_32);
             rule__KeywordPair__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__KeywordPair__Group__2_in_rule__KeywordPair__Group__115067);
+            pushFollow(FOLLOW_2);
             rule__KeywordPair__Group__2();
 
             state._fsp--;
@@ -22641,25 +22641,25 @@ public final void rule__KeywordPair__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__KeywordPair__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7050:1: rule__KeywordPair__Group__1__Impl : ( ( rule__KeywordPair__LeftAssignment_1 ) ) ;
+    // InternalFormat.g:7050:1: rule__KeywordPair__Group__1__Impl : ( ( rule__KeywordPair__LeftAssignment_1 ) ) ;
     public final void rule__KeywordPair__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7054:1: ( ( ( rule__KeywordPair__LeftAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7055:1: ( ( rule__KeywordPair__LeftAssignment_1 ) )
+            // InternalFormat.g:7054:1: ( ( ( rule__KeywordPair__LeftAssignment_1 ) ) )
+            // InternalFormat.g:7055:1: ( ( rule__KeywordPair__LeftAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7055:1: ( ( rule__KeywordPair__LeftAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7056:1: ( rule__KeywordPair__LeftAssignment_1 )
+            // InternalFormat.g:7055:1: ( ( rule__KeywordPair__LeftAssignment_1 ) )
+            // InternalFormat.g:7056:1: ( rule__KeywordPair__LeftAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getKeywordPairAccess().getLeftAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7057:1: ( rule__KeywordPair__LeftAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7057:2: rule__KeywordPair__LeftAssignment_1
+            // InternalFormat.g:7057:1: ( rule__KeywordPair__LeftAssignment_1 )
+            // InternalFormat.g:7057:2: rule__KeywordPair__LeftAssignment_1
             {
-            pushFollow(FOLLOW_rule__KeywordPair__LeftAssignment_1_in_rule__KeywordPair__Group__1__Impl15094);
+            pushFollow(FOLLOW_2);
             rule__KeywordPair__LeftAssignment_1();
 
             state._fsp--;
@@ -22692,21 +22692,21 @@ public final void rule__KeywordPair__Group__1__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__KeywordPair__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7067:1: rule__KeywordPair__Group__2 : rule__KeywordPair__Group__2__Impl rule__KeywordPair__Group__3 ;
+    // InternalFormat.g:7067:1: rule__KeywordPair__Group__2 : rule__KeywordPair__Group__2__Impl rule__KeywordPair__Group__3 ;
     public final void rule__KeywordPair__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7071:1: ( rule__KeywordPair__Group__2__Impl rule__KeywordPair__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7072:2: rule__KeywordPair__Group__2__Impl rule__KeywordPair__Group__3
+            // InternalFormat.g:7071:1: ( rule__KeywordPair__Group__2__Impl rule__KeywordPair__Group__3 )
+            // InternalFormat.g:7072:2: rule__KeywordPair__Group__2__Impl rule__KeywordPair__Group__3
             {
-            pushFollow(FOLLOW_rule__KeywordPair__Group__2__Impl_in_rule__KeywordPair__Group__215124);
+            pushFollow(FOLLOW_33);
             rule__KeywordPair__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__KeywordPair__Group__3_in_rule__KeywordPair__Group__215127);
+            pushFollow(FOLLOW_2);
             rule__KeywordPair__Group__3();
 
             state._fsp--;
@@ -22730,25 +22730,25 @@ public final void rule__KeywordPair__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__KeywordPair__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7079:1: rule__KeywordPair__Group__2__Impl : ( ( rule__KeywordPair__RightAssignment_2 ) ) ;
+    // InternalFormat.g:7079:1: rule__KeywordPair__Group__2__Impl : ( ( rule__KeywordPair__RightAssignment_2 ) ) ;
     public final void rule__KeywordPair__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7083:1: ( ( ( rule__KeywordPair__RightAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7084:1: ( ( rule__KeywordPair__RightAssignment_2 ) )
+            // InternalFormat.g:7083:1: ( ( ( rule__KeywordPair__RightAssignment_2 ) ) )
+            // InternalFormat.g:7084:1: ( ( rule__KeywordPair__RightAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7084:1: ( ( rule__KeywordPair__RightAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7085:1: ( rule__KeywordPair__RightAssignment_2 )
+            // InternalFormat.g:7084:1: ( ( rule__KeywordPair__RightAssignment_2 ) )
+            // InternalFormat.g:7085:1: ( rule__KeywordPair__RightAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getKeywordPairAccess().getRightAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7086:1: ( rule__KeywordPair__RightAssignment_2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7086:2: rule__KeywordPair__RightAssignment_2
+            // InternalFormat.g:7086:1: ( rule__KeywordPair__RightAssignment_2 )
+            // InternalFormat.g:7086:2: rule__KeywordPair__RightAssignment_2
             {
-            pushFollow(FOLLOW_rule__KeywordPair__RightAssignment_2_in_rule__KeywordPair__Group__2__Impl15154);
+            pushFollow(FOLLOW_2);
             rule__KeywordPair__RightAssignment_2();
 
             state._fsp--;
@@ -22781,21 +22781,21 @@ public final void rule__KeywordPair__Group__2__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__KeywordPair__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7096:1: rule__KeywordPair__Group__3 : rule__KeywordPair__Group__3__Impl rule__KeywordPair__Group__4 ;
+    // InternalFormat.g:7096:1: rule__KeywordPair__Group__3 : rule__KeywordPair__Group__3__Impl rule__KeywordPair__Group__4 ;
     public final void rule__KeywordPair__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7100:1: ( rule__KeywordPair__Group__3__Impl rule__KeywordPair__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7101:2: rule__KeywordPair__Group__3__Impl rule__KeywordPair__Group__4
+            // InternalFormat.g:7100:1: ( rule__KeywordPair__Group__3__Impl rule__KeywordPair__Group__4 )
+            // InternalFormat.g:7101:2: rule__KeywordPair__Group__3__Impl rule__KeywordPair__Group__4
             {
-            pushFollow(FOLLOW_rule__KeywordPair__Group__3__Impl_in_rule__KeywordPair__Group__315184);
+            pushFollow(FOLLOW_24);
             rule__KeywordPair__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__KeywordPair__Group__4_in_rule__KeywordPair__Group__315187);
+            pushFollow(FOLLOW_2);
             rule__KeywordPair__Group__4();
 
             state._fsp--;
@@ -22819,22 +22819,22 @@ public final void rule__KeywordPair__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__KeywordPair__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7108:1: rule__KeywordPair__Group__3__Impl : ( ')' ) ;
+    // InternalFormat.g:7108:1: rule__KeywordPair__Group__3__Impl : ( ')' ) ;
     public final void rule__KeywordPair__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7112:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7113:1: ( ')' )
+            // InternalFormat.g:7112:1: ( ( ')' ) )
+            // InternalFormat.g:7113:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7113:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7114:1: ')'
+            // InternalFormat.g:7113:1: ( ')' )
+            // InternalFormat.g:7114:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getKeywordPairAccess().getRightParenthesisKeyword_3()); 
             }
-            match(input,75,FOLLOW_75_in_rule__KeywordPair__Group__3__Impl15215); if (state.failed) return ;
+            match(input,75,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getKeywordPairAccess().getRightParenthesisKeyword_3()); 
             }
@@ -22860,21 +22860,21 @@ public final void rule__KeywordPair__Group__3__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__KeywordPair__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7127:1: rule__KeywordPair__Group__4 : rule__KeywordPair__Group__4__Impl rule__KeywordPair__Group__5 ;
+    // InternalFormat.g:7127:1: rule__KeywordPair__Group__4 : rule__KeywordPair__Group__4__Impl rule__KeywordPair__Group__5 ;
     public final void rule__KeywordPair__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7131:1: ( rule__KeywordPair__Group__4__Impl rule__KeywordPair__Group__5 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7132:2: rule__KeywordPair__Group__4__Impl rule__KeywordPair__Group__5
+            // InternalFormat.g:7131:1: ( rule__KeywordPair__Group__4__Impl rule__KeywordPair__Group__5 )
+            // InternalFormat.g:7132:2: rule__KeywordPair__Group__4__Impl rule__KeywordPair__Group__5
             {
-            pushFollow(FOLLOW_rule__KeywordPair__Group__4__Impl_in_rule__KeywordPair__Group__415246);
+            pushFollow(FOLLOW_34);
             rule__KeywordPair__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__KeywordPair__Group__5_in_rule__KeywordPair__Group__415249);
+            pushFollow(FOLLOW_2);
             rule__KeywordPair__Group__5();
 
             state._fsp--;
@@ -22898,22 +22898,22 @@ public final void rule__KeywordPair__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__KeywordPair__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7139:1: rule__KeywordPair__Group__4__Impl : ( ':' ) ;
+    // InternalFormat.g:7139:1: rule__KeywordPair__Group__4__Impl : ( ':' ) ;
     public final void rule__KeywordPair__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7143:1: ( ( ':' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7144:1: ( ':' )
+            // InternalFormat.g:7143:1: ( ( ':' ) )
+            // InternalFormat.g:7144:1: ( ':' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7144:1: ( ':' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7145:1: ':'
+            // InternalFormat.g:7144:1: ( ':' )
+            // InternalFormat.g:7145:1: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getKeywordPairAccess().getColonKeyword_4()); 
             }
-            match(input,72,FOLLOW_72_in_rule__KeywordPair__Group__4__Impl15277); if (state.failed) return ;
+            match(input,72,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getKeywordPairAccess().getColonKeyword_4()); 
             }
@@ -22939,21 +22939,21 @@ public final void rule__KeywordPair__Group__4__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__KeywordPair__Group__5"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7158:1: rule__KeywordPair__Group__5 : rule__KeywordPair__Group__5__Impl rule__KeywordPair__Group__6 ;
+    // InternalFormat.g:7158:1: rule__KeywordPair__Group__5 : rule__KeywordPair__Group__5__Impl rule__KeywordPair__Group__6 ;
     public final void rule__KeywordPair__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7162:1: ( rule__KeywordPair__Group__5__Impl rule__KeywordPair__Group__6 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7163:2: rule__KeywordPair__Group__5__Impl rule__KeywordPair__Group__6
+            // InternalFormat.g:7162:1: ( rule__KeywordPair__Group__5__Impl rule__KeywordPair__Group__6 )
+            // InternalFormat.g:7163:2: rule__KeywordPair__Group__5__Impl rule__KeywordPair__Group__6
             {
-            pushFollow(FOLLOW_rule__KeywordPair__Group__5__Impl_in_rule__KeywordPair__Group__515308);
+            pushFollow(FOLLOW_28);
             rule__KeywordPair__Group__5__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__KeywordPair__Group__6_in_rule__KeywordPair__Group__515311);
+            pushFollow(FOLLOW_2);
             rule__KeywordPair__Group__6();
 
             state._fsp--;
@@ -22977,25 +22977,25 @@ public final void rule__KeywordPair__Group__5() throws RecognitionException {
 
 
     // $ANTLR start "rule__KeywordPair__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7170:1: rule__KeywordPair__Group__5__Impl : ( ( rule__KeywordPair__Alternatives_5 ) ) ;
+    // InternalFormat.g:7170:1: rule__KeywordPair__Group__5__Impl : ( ( rule__KeywordPair__Alternatives_5 ) ) ;
     public final void rule__KeywordPair__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7174:1: ( ( ( rule__KeywordPair__Alternatives_5 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7175:1: ( ( rule__KeywordPair__Alternatives_5 ) )
+            // InternalFormat.g:7174:1: ( ( ( rule__KeywordPair__Alternatives_5 ) ) )
+            // InternalFormat.g:7175:1: ( ( rule__KeywordPair__Alternatives_5 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7175:1: ( ( rule__KeywordPair__Alternatives_5 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7176:1: ( rule__KeywordPair__Alternatives_5 )
+            // InternalFormat.g:7175:1: ( ( rule__KeywordPair__Alternatives_5 ) )
+            // InternalFormat.g:7176:1: ( rule__KeywordPair__Alternatives_5 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getKeywordPairAccess().getAlternatives_5()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7177:1: ( rule__KeywordPair__Alternatives_5 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7177:2: rule__KeywordPair__Alternatives_5
+            // InternalFormat.g:7177:1: ( rule__KeywordPair__Alternatives_5 )
+            // InternalFormat.g:7177:2: rule__KeywordPair__Alternatives_5
             {
-            pushFollow(FOLLOW_rule__KeywordPair__Alternatives_5_in_rule__KeywordPair__Group__5__Impl15338);
+            pushFollow(FOLLOW_2);
             rule__KeywordPair__Alternatives_5();
 
             state._fsp--;
@@ -23028,21 +23028,21 @@ public final void rule__KeywordPair__Group__5__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__KeywordPair__Group__6"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7187:1: rule__KeywordPair__Group__6 : rule__KeywordPair__Group__6__Impl rule__KeywordPair__Group__7 ;
+    // InternalFormat.g:7187:1: rule__KeywordPair__Group__6 : rule__KeywordPair__Group__6__Impl rule__KeywordPair__Group__7 ;
     public final void rule__KeywordPair__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7191:1: ( rule__KeywordPair__Group__6__Impl rule__KeywordPair__Group__7 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7192:2: rule__KeywordPair__Group__6__Impl rule__KeywordPair__Group__7
+            // InternalFormat.g:7191:1: ( rule__KeywordPair__Group__6__Impl rule__KeywordPair__Group__7 )
+            // InternalFormat.g:7192:2: rule__KeywordPair__Group__6__Impl rule__KeywordPair__Group__7
             {
-            pushFollow(FOLLOW_rule__KeywordPair__Group__6__Impl_in_rule__KeywordPair__Group__615368);
+            pushFollow(FOLLOW_28);
             rule__KeywordPair__Group__6__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__KeywordPair__Group__7_in_rule__KeywordPair__Group__615371);
+            pushFollow(FOLLOW_2);
             rule__KeywordPair__Group__7();
 
             state._fsp--;
@@ -23066,22 +23066,22 @@ public final void rule__KeywordPair__Group__6() throws RecognitionException {
 
 
     // $ANTLR start "rule__KeywordPair__Group__6__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7199:1: rule__KeywordPair__Group__6__Impl : ( ( rule__KeywordPair__Group_6__0 )* ) ;
+    // InternalFormat.g:7199:1: rule__KeywordPair__Group__6__Impl : ( ( rule__KeywordPair__Group_6__0 )* ) ;
     public final void rule__KeywordPair__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7203:1: ( ( ( rule__KeywordPair__Group_6__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7204:1: ( ( rule__KeywordPair__Group_6__0 )* )
+            // InternalFormat.g:7203:1: ( ( ( rule__KeywordPair__Group_6__0 )* ) )
+            // InternalFormat.g:7204:1: ( ( rule__KeywordPair__Group_6__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7204:1: ( ( rule__KeywordPair__Group_6__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7205:1: ( rule__KeywordPair__Group_6__0 )*
+            // InternalFormat.g:7204:1: ( ( rule__KeywordPair__Group_6__0 )* )
+            // InternalFormat.g:7205:1: ( rule__KeywordPair__Group_6__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getKeywordPairAccess().getGroup_6()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7206:1: ( rule__KeywordPair__Group_6__0 )*
+            // InternalFormat.g:7206:1: ( rule__KeywordPair__Group_6__0 )*
             loop81:
             do {
                 int alt81=2;
@@ -23094,9 +23094,9 @@ public final void rule__KeywordPair__Group__6__Impl() throws RecognitionExceptio
 
                 switch (alt81) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7206:2: rule__KeywordPair__Group_6__0
+            	    // InternalFormat.g:7206:2: rule__KeywordPair__Group_6__0
             	    {
-            	    pushFollow(FOLLOW_rule__KeywordPair__Group_6__0_in_rule__KeywordPair__Group__6__Impl15398);
+            	    pushFollow(FOLLOW_23);
             	    rule__KeywordPair__Group_6__0();
 
             	    state._fsp--;
@@ -23135,16 +23135,16 @@ public final void rule__KeywordPair__Group__6__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__KeywordPair__Group__7"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7216:1: rule__KeywordPair__Group__7 : rule__KeywordPair__Group__7__Impl ;
+    // InternalFormat.g:7216:1: rule__KeywordPair__Group__7 : rule__KeywordPair__Group__7__Impl ;
     public final void rule__KeywordPair__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7220:1: ( rule__KeywordPair__Group__7__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7221:2: rule__KeywordPair__Group__7__Impl
+            // InternalFormat.g:7220:1: ( rule__KeywordPair__Group__7__Impl )
+            // InternalFormat.g:7221:2: rule__KeywordPair__Group__7__Impl
             {
-            pushFollow(FOLLOW_rule__KeywordPair__Group__7__Impl_in_rule__KeywordPair__Group__715429);
+            pushFollow(FOLLOW_2);
             rule__KeywordPair__Group__7__Impl();
 
             state._fsp--;
@@ -23168,22 +23168,22 @@ public final void rule__KeywordPair__Group__7() throws RecognitionException {
 
 
     // $ANTLR start "rule__KeywordPair__Group__7__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7227:1: rule__KeywordPair__Group__7__Impl : ( ';' ) ;
+    // InternalFormat.g:7227:1: rule__KeywordPair__Group__7__Impl : ( ';' ) ;
     public final void rule__KeywordPair__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7231:1: ( ( ';' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7232:1: ( ';' )
+            // InternalFormat.g:7231:1: ( ( ';' ) )
+            // InternalFormat.g:7232:1: ( ';' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7232:1: ( ';' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7233:1: ';'
+            // InternalFormat.g:7232:1: ( ';' )
+            // InternalFormat.g:7233:1: ';'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getKeywordPairAccess().getSemicolonKeyword_7()); 
             }
-            match(input,65,FOLLOW_65_in_rule__KeywordPair__Group__7__Impl15457); if (state.failed) return ;
+            match(input,65,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getKeywordPairAccess().getSemicolonKeyword_7()); 
             }
@@ -23209,21 +23209,21 @@ public final void rule__KeywordPair__Group__7__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__KeywordPair__Group_5_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7262:1: rule__KeywordPair__Group_5_0__0 : rule__KeywordPair__Group_5_0__0__Impl rule__KeywordPair__Group_5_0__1 ;
+    // InternalFormat.g:7262:1: rule__KeywordPair__Group_5_0__0 : rule__KeywordPair__Group_5_0__0__Impl rule__KeywordPair__Group_5_0__1 ;
     public final void rule__KeywordPair__Group_5_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7266:1: ( rule__KeywordPair__Group_5_0__0__Impl rule__KeywordPair__Group_5_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7267:2: rule__KeywordPair__Group_5_0__0__Impl rule__KeywordPair__Group_5_0__1
+            // InternalFormat.g:7266:1: ( rule__KeywordPair__Group_5_0__0__Impl rule__KeywordPair__Group_5_0__1 )
+            // InternalFormat.g:7267:2: rule__KeywordPair__Group_5_0__0__Impl rule__KeywordPair__Group_5_0__1
             {
-            pushFollow(FOLLOW_rule__KeywordPair__Group_5_0__0__Impl_in_rule__KeywordPair__Group_5_0__015504);
+            pushFollow(FOLLOW_35);
             rule__KeywordPair__Group_5_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__KeywordPair__Group_5_0__1_in_rule__KeywordPair__Group_5_0__015507);
+            pushFollow(FOLLOW_2);
             rule__KeywordPair__Group_5_0__1();
 
             state._fsp--;
@@ -23247,22 +23247,22 @@ public final void rule__KeywordPair__Group_5_0__0() throws RecognitionException
 
 
     // $ANTLR start "rule__KeywordPair__Group_5_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7274:1: rule__KeywordPair__Group_5_0__0__Impl : ( 'left' ) ;
+    // InternalFormat.g:7274:1: rule__KeywordPair__Group_5_0__0__Impl : ( 'left' ) ;
     public final void rule__KeywordPair__Group_5_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7278:1: ( ( 'left' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7279:1: ( 'left' )
+            // InternalFormat.g:7278:1: ( ( 'left' ) )
+            // InternalFormat.g:7279:1: ( 'left' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7279:1: ( 'left' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7280:1: 'left'
+            // InternalFormat.g:7279:1: ( 'left' )
+            // InternalFormat.g:7280:1: 'left'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getKeywordPairAccess().getLeftKeyword_5_0_0()); 
             }
-            match(input,76,FOLLOW_76_in_rule__KeywordPair__Group_5_0__0__Impl15535); if (state.failed) return ;
+            match(input,76,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getKeywordPairAccess().getLeftKeyword_5_0_0()); 
             }
@@ -23288,21 +23288,21 @@ public final void rule__KeywordPair__Group_5_0__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__KeywordPair__Group_5_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7293:1: rule__KeywordPair__Group_5_0__1 : rule__KeywordPair__Group_5_0__1__Impl rule__KeywordPair__Group_5_0__2 ;
+    // InternalFormat.g:7293:1: rule__KeywordPair__Group_5_0__1 : rule__KeywordPair__Group_5_0__1__Impl rule__KeywordPair__Group_5_0__2 ;
     public final void rule__KeywordPair__Group_5_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7297:1: ( rule__KeywordPair__Group_5_0__1__Impl rule__KeywordPair__Group_5_0__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7298:2: rule__KeywordPair__Group_5_0__1__Impl rule__KeywordPair__Group_5_0__2
+            // InternalFormat.g:7297:1: ( rule__KeywordPair__Group_5_0__1__Impl rule__KeywordPair__Group_5_0__2 )
+            // InternalFormat.g:7298:2: rule__KeywordPair__Group_5_0__1__Impl rule__KeywordPair__Group_5_0__2
             {
-            pushFollow(FOLLOW_rule__KeywordPair__Group_5_0__1__Impl_in_rule__KeywordPair__Group_5_0__115566);
+            pushFollow(FOLLOW_27);
             rule__KeywordPair__Group_5_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__KeywordPair__Group_5_0__2_in_rule__KeywordPair__Group_5_0__115569);
+            pushFollow(FOLLOW_2);
             rule__KeywordPair__Group_5_0__2();
 
             state._fsp--;
@@ -23326,22 +23326,22 @@ public final void rule__KeywordPair__Group_5_0__1() throws RecognitionException
 
 
     // $ANTLR start "rule__KeywordPair__Group_5_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7305:1: rule__KeywordPair__Group_5_0__1__Impl : ( '.' ) ;
+    // InternalFormat.g:7305:1: rule__KeywordPair__Group_5_0__1__Impl : ( '.' ) ;
     public final void rule__KeywordPair__Group_5_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7309:1: ( ( '.' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7310:1: ( '.' )
+            // InternalFormat.g:7309:1: ( ( '.' ) )
+            // InternalFormat.g:7310:1: ( '.' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7310:1: ( '.' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7311:1: '.'
+            // InternalFormat.g:7310:1: ( '.' )
+            // InternalFormat.g:7311:1: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getKeywordPairAccess().getFullStopKeyword_5_0_1()); 
             }
-            match(input,49,FOLLOW_49_in_rule__KeywordPair__Group_5_0__1__Impl15597); if (state.failed) return ;
+            match(input,49,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getKeywordPairAccess().getFullStopKeyword_5_0_1()); 
             }
@@ -23367,16 +23367,16 @@ public final void rule__KeywordPair__Group_5_0__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__KeywordPair__Group_5_0__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7324:1: rule__KeywordPair__Group_5_0__2 : rule__KeywordPair__Group_5_0__2__Impl ;
+    // InternalFormat.g:7324:1: rule__KeywordPair__Group_5_0__2 : rule__KeywordPair__Group_5_0__2__Impl ;
     public final void rule__KeywordPair__Group_5_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7328:1: ( rule__KeywordPair__Group_5_0__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7329:2: rule__KeywordPair__Group_5_0__2__Impl
+            // InternalFormat.g:7328:1: ( rule__KeywordPair__Group_5_0__2__Impl )
+            // InternalFormat.g:7329:2: rule__KeywordPair__Group_5_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__KeywordPair__Group_5_0__2__Impl_in_rule__KeywordPair__Group_5_0__215628);
+            pushFollow(FOLLOW_2);
             rule__KeywordPair__Group_5_0__2__Impl();
 
             state._fsp--;
@@ -23400,25 +23400,25 @@ public final void rule__KeywordPair__Group_5_0__2() throws RecognitionException
 
 
     // $ANTLR start "rule__KeywordPair__Group_5_0__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7335:1: rule__KeywordPair__Group_5_0__2__Impl : ( ( rule__KeywordPair__LeftMatchersAssignment_5_0_2 ) ) ;
+    // InternalFormat.g:7335:1: rule__KeywordPair__Group_5_0__2__Impl : ( ( rule__KeywordPair__LeftMatchersAssignment_5_0_2 ) ) ;
     public final void rule__KeywordPair__Group_5_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7339:1: ( ( ( rule__KeywordPair__LeftMatchersAssignment_5_0_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7340:1: ( ( rule__KeywordPair__LeftMatchersAssignment_5_0_2 ) )
+            // InternalFormat.g:7339:1: ( ( ( rule__KeywordPair__LeftMatchersAssignment_5_0_2 ) ) )
+            // InternalFormat.g:7340:1: ( ( rule__KeywordPair__LeftMatchersAssignment_5_0_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7340:1: ( ( rule__KeywordPair__LeftMatchersAssignment_5_0_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7341:1: ( rule__KeywordPair__LeftMatchersAssignment_5_0_2 )
+            // InternalFormat.g:7340:1: ( ( rule__KeywordPair__LeftMatchersAssignment_5_0_2 ) )
+            // InternalFormat.g:7341:1: ( rule__KeywordPair__LeftMatchersAssignment_5_0_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getKeywordPairAccess().getLeftMatchersAssignment_5_0_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7342:1: ( rule__KeywordPair__LeftMatchersAssignment_5_0_2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7342:2: rule__KeywordPair__LeftMatchersAssignment_5_0_2
+            // InternalFormat.g:7342:1: ( rule__KeywordPair__LeftMatchersAssignment_5_0_2 )
+            // InternalFormat.g:7342:2: rule__KeywordPair__LeftMatchersAssignment_5_0_2
             {
-            pushFollow(FOLLOW_rule__KeywordPair__LeftMatchersAssignment_5_0_2_in_rule__KeywordPair__Group_5_0__2__Impl15655);
+            pushFollow(FOLLOW_2);
             rule__KeywordPair__LeftMatchersAssignment_5_0_2();
 
             state._fsp--;
@@ -23451,21 +23451,21 @@ public final void rule__KeywordPair__Group_5_0__2__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__KeywordPair__Group_5_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7358:1: rule__KeywordPair__Group_5_1__0 : rule__KeywordPair__Group_5_1__0__Impl rule__KeywordPair__Group_5_1__1 ;
+    // InternalFormat.g:7358:1: rule__KeywordPair__Group_5_1__0 : rule__KeywordPair__Group_5_1__0__Impl rule__KeywordPair__Group_5_1__1 ;
     public final void rule__KeywordPair__Group_5_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7362:1: ( rule__KeywordPair__Group_5_1__0__Impl rule__KeywordPair__Group_5_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7363:2: rule__KeywordPair__Group_5_1__0__Impl rule__KeywordPair__Group_5_1__1
+            // InternalFormat.g:7362:1: ( rule__KeywordPair__Group_5_1__0__Impl rule__KeywordPair__Group_5_1__1 )
+            // InternalFormat.g:7363:2: rule__KeywordPair__Group_5_1__0__Impl rule__KeywordPair__Group_5_1__1
             {
-            pushFollow(FOLLOW_rule__KeywordPair__Group_5_1__0__Impl_in_rule__KeywordPair__Group_5_1__015691);
+            pushFollow(FOLLOW_35);
             rule__KeywordPair__Group_5_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__KeywordPair__Group_5_1__1_in_rule__KeywordPair__Group_5_1__015694);
+            pushFollow(FOLLOW_2);
             rule__KeywordPair__Group_5_1__1();
 
             state._fsp--;
@@ -23489,22 +23489,22 @@ public final void rule__KeywordPair__Group_5_1__0() throws RecognitionException
 
 
     // $ANTLR start "rule__KeywordPair__Group_5_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7370:1: rule__KeywordPair__Group_5_1__0__Impl : ( 'right' ) ;
+    // InternalFormat.g:7370:1: rule__KeywordPair__Group_5_1__0__Impl : ( 'right' ) ;
     public final void rule__KeywordPair__Group_5_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7374:1: ( ( 'right' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7375:1: ( 'right' )
+            // InternalFormat.g:7374:1: ( ( 'right' ) )
+            // InternalFormat.g:7375:1: ( 'right' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7375:1: ( 'right' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7376:1: 'right'
+            // InternalFormat.g:7375:1: ( 'right' )
+            // InternalFormat.g:7376:1: 'right'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getKeywordPairAccess().getRightKeyword_5_1_0()); 
             }
-            match(input,77,FOLLOW_77_in_rule__KeywordPair__Group_5_1__0__Impl15722); if (state.failed) return ;
+            match(input,77,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getKeywordPairAccess().getRightKeyword_5_1_0()); 
             }
@@ -23530,21 +23530,21 @@ public final void rule__KeywordPair__Group_5_1__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__KeywordPair__Group_5_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7389:1: rule__KeywordPair__Group_5_1__1 : rule__KeywordPair__Group_5_1__1__Impl rule__KeywordPair__Group_5_1__2 ;
+    // InternalFormat.g:7389:1: rule__KeywordPair__Group_5_1__1 : rule__KeywordPair__Group_5_1__1__Impl rule__KeywordPair__Group_5_1__2 ;
     public final void rule__KeywordPair__Group_5_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7393:1: ( rule__KeywordPair__Group_5_1__1__Impl rule__KeywordPair__Group_5_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7394:2: rule__KeywordPair__Group_5_1__1__Impl rule__KeywordPair__Group_5_1__2
+            // InternalFormat.g:7393:1: ( rule__KeywordPair__Group_5_1__1__Impl rule__KeywordPair__Group_5_1__2 )
+            // InternalFormat.g:7394:2: rule__KeywordPair__Group_5_1__1__Impl rule__KeywordPair__Group_5_1__2
             {
-            pushFollow(FOLLOW_rule__KeywordPair__Group_5_1__1__Impl_in_rule__KeywordPair__Group_5_1__115753);
+            pushFollow(FOLLOW_27);
             rule__KeywordPair__Group_5_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__KeywordPair__Group_5_1__2_in_rule__KeywordPair__Group_5_1__115756);
+            pushFollow(FOLLOW_2);
             rule__KeywordPair__Group_5_1__2();
 
             state._fsp--;
@@ -23568,22 +23568,22 @@ public final void rule__KeywordPair__Group_5_1__1() throws RecognitionException
 
 
     // $ANTLR start "rule__KeywordPair__Group_5_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7401:1: rule__KeywordPair__Group_5_1__1__Impl : ( '.' ) ;
+    // InternalFormat.g:7401:1: rule__KeywordPair__Group_5_1__1__Impl : ( '.' ) ;
     public final void rule__KeywordPair__Group_5_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7405:1: ( ( '.' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7406:1: ( '.' )
+            // InternalFormat.g:7405:1: ( ( '.' ) )
+            // InternalFormat.g:7406:1: ( '.' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7406:1: ( '.' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7407:1: '.'
+            // InternalFormat.g:7406:1: ( '.' )
+            // InternalFormat.g:7407:1: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getKeywordPairAccess().getFullStopKeyword_5_1_1()); 
             }
-            match(input,49,FOLLOW_49_in_rule__KeywordPair__Group_5_1__1__Impl15784); if (state.failed) return ;
+            match(input,49,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getKeywordPairAccess().getFullStopKeyword_5_1_1()); 
             }
@@ -23609,16 +23609,16 @@ public final void rule__KeywordPair__Group_5_1__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__KeywordPair__Group_5_1__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7420:1: rule__KeywordPair__Group_5_1__2 : rule__KeywordPair__Group_5_1__2__Impl ;
+    // InternalFormat.g:7420:1: rule__KeywordPair__Group_5_1__2 : rule__KeywordPair__Group_5_1__2__Impl ;
     public final void rule__KeywordPair__Group_5_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7424:1: ( rule__KeywordPair__Group_5_1__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7425:2: rule__KeywordPair__Group_5_1__2__Impl
+            // InternalFormat.g:7424:1: ( rule__KeywordPair__Group_5_1__2__Impl )
+            // InternalFormat.g:7425:2: rule__KeywordPair__Group_5_1__2__Impl
             {
-            pushFollow(FOLLOW_rule__KeywordPair__Group_5_1__2__Impl_in_rule__KeywordPair__Group_5_1__215815);
+            pushFollow(FOLLOW_2);
             rule__KeywordPair__Group_5_1__2__Impl();
 
             state._fsp--;
@@ -23642,25 +23642,25 @@ public final void rule__KeywordPair__Group_5_1__2() throws RecognitionException
 
 
     // $ANTLR start "rule__KeywordPair__Group_5_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7431:1: rule__KeywordPair__Group_5_1__2__Impl : ( ( rule__KeywordPair__RightMatchersAssignment_5_1_2 ) ) ;
+    // InternalFormat.g:7431:1: rule__KeywordPair__Group_5_1__2__Impl : ( ( rule__KeywordPair__RightMatchersAssignment_5_1_2 ) ) ;
     public final void rule__KeywordPair__Group_5_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7435:1: ( ( ( rule__KeywordPair__RightMatchersAssignment_5_1_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7436:1: ( ( rule__KeywordPair__RightMatchersAssignment_5_1_2 ) )
+            // InternalFormat.g:7435:1: ( ( ( rule__KeywordPair__RightMatchersAssignment_5_1_2 ) ) )
+            // InternalFormat.g:7436:1: ( ( rule__KeywordPair__RightMatchersAssignment_5_1_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7436:1: ( ( rule__KeywordPair__RightMatchersAssignment_5_1_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7437:1: ( rule__KeywordPair__RightMatchersAssignment_5_1_2 )
+            // InternalFormat.g:7436:1: ( ( rule__KeywordPair__RightMatchersAssignment_5_1_2 ) )
+            // InternalFormat.g:7437:1: ( rule__KeywordPair__RightMatchersAssignment_5_1_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getKeywordPairAccess().getRightMatchersAssignment_5_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7438:1: ( rule__KeywordPair__RightMatchersAssignment_5_1_2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7438:2: rule__KeywordPair__RightMatchersAssignment_5_1_2
+            // InternalFormat.g:7438:1: ( rule__KeywordPair__RightMatchersAssignment_5_1_2 )
+            // InternalFormat.g:7438:2: rule__KeywordPair__RightMatchersAssignment_5_1_2
             {
-            pushFollow(FOLLOW_rule__KeywordPair__RightMatchersAssignment_5_1_2_in_rule__KeywordPair__Group_5_1__2__Impl15842);
+            pushFollow(FOLLOW_2);
             rule__KeywordPair__RightMatchersAssignment_5_1_2();
 
             state._fsp--;
@@ -23693,21 +23693,21 @@ public final void rule__KeywordPair__Group_5_1__2__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__KeywordPair__Group_6__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7454:1: rule__KeywordPair__Group_6__0 : rule__KeywordPair__Group_6__0__Impl rule__KeywordPair__Group_6__1 ;
+    // InternalFormat.g:7454:1: rule__KeywordPair__Group_6__0 : rule__KeywordPair__Group_6__0__Impl rule__KeywordPair__Group_6__1 ;
     public final void rule__KeywordPair__Group_6__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7458:1: ( rule__KeywordPair__Group_6__0__Impl rule__KeywordPair__Group_6__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7459:2: rule__KeywordPair__Group_6__0__Impl rule__KeywordPair__Group_6__1
+            // InternalFormat.g:7458:1: ( rule__KeywordPair__Group_6__0__Impl rule__KeywordPair__Group_6__1 )
+            // InternalFormat.g:7459:2: rule__KeywordPair__Group_6__0__Impl rule__KeywordPair__Group_6__1
             {
-            pushFollow(FOLLOW_rule__KeywordPair__Group_6__0__Impl_in_rule__KeywordPair__Group_6__015878);
+            pushFollow(FOLLOW_34);
             rule__KeywordPair__Group_6__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__KeywordPair__Group_6__1_in_rule__KeywordPair__Group_6__015881);
+            pushFollow(FOLLOW_2);
             rule__KeywordPair__Group_6__1();
 
             state._fsp--;
@@ -23731,22 +23731,22 @@ public final void rule__KeywordPair__Group_6__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__KeywordPair__Group_6__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7466:1: rule__KeywordPair__Group_6__0__Impl : ( ',' ) ;
+    // InternalFormat.g:7466:1: rule__KeywordPair__Group_6__0__Impl : ( ',' ) ;
     public final void rule__KeywordPair__Group_6__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7470:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7471:1: ( ',' )
+            // InternalFormat.g:7470:1: ( ( ',' ) )
+            // InternalFormat.g:7471:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7471:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7472:1: ','
+            // InternalFormat.g:7471:1: ( ',' )
+            // InternalFormat.g:7472:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getKeywordPairAccess().getCommaKeyword_6_0()); 
             }
-            match(input,71,FOLLOW_71_in_rule__KeywordPair__Group_6__0__Impl15909); if (state.failed) return ;
+            match(input,71,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getKeywordPairAccess().getCommaKeyword_6_0()); 
             }
@@ -23772,16 +23772,16 @@ public final void rule__KeywordPair__Group_6__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__KeywordPair__Group_6__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7485:1: rule__KeywordPair__Group_6__1 : rule__KeywordPair__Group_6__1__Impl ;
+    // InternalFormat.g:7485:1: rule__KeywordPair__Group_6__1 : rule__KeywordPair__Group_6__1__Impl ;
     public final void rule__KeywordPair__Group_6__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7489:1: ( rule__KeywordPair__Group_6__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7490:2: rule__KeywordPair__Group_6__1__Impl
+            // InternalFormat.g:7489:1: ( rule__KeywordPair__Group_6__1__Impl )
+            // InternalFormat.g:7490:2: rule__KeywordPair__Group_6__1__Impl
             {
-            pushFollow(FOLLOW_rule__KeywordPair__Group_6__1__Impl_in_rule__KeywordPair__Group_6__115940);
+            pushFollow(FOLLOW_2);
             rule__KeywordPair__Group_6__1__Impl();
 
             state._fsp--;
@@ -23805,25 +23805,25 @@ public final void rule__KeywordPair__Group_6__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__KeywordPair__Group_6__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7496:1: rule__KeywordPair__Group_6__1__Impl : ( ( rule__KeywordPair__Alternatives_6_1 ) ) ;
+    // InternalFormat.g:7496:1: rule__KeywordPair__Group_6__1__Impl : ( ( rule__KeywordPair__Alternatives_6_1 ) ) ;
     public final void rule__KeywordPair__Group_6__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7500:1: ( ( ( rule__KeywordPair__Alternatives_6_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7501:1: ( ( rule__KeywordPair__Alternatives_6_1 ) )
+            // InternalFormat.g:7500:1: ( ( ( rule__KeywordPair__Alternatives_6_1 ) ) )
+            // InternalFormat.g:7501:1: ( ( rule__KeywordPair__Alternatives_6_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7501:1: ( ( rule__KeywordPair__Alternatives_6_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7502:1: ( rule__KeywordPair__Alternatives_6_1 )
+            // InternalFormat.g:7501:1: ( ( rule__KeywordPair__Alternatives_6_1 ) )
+            // InternalFormat.g:7502:1: ( rule__KeywordPair__Alternatives_6_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getKeywordPairAccess().getAlternatives_6_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7503:1: ( rule__KeywordPair__Alternatives_6_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7503:2: rule__KeywordPair__Alternatives_6_1
+            // InternalFormat.g:7503:1: ( rule__KeywordPair__Alternatives_6_1 )
+            // InternalFormat.g:7503:2: rule__KeywordPair__Alternatives_6_1
             {
-            pushFollow(FOLLOW_rule__KeywordPair__Alternatives_6_1_in_rule__KeywordPair__Group_6__1__Impl15967);
+            pushFollow(FOLLOW_2);
             rule__KeywordPair__Alternatives_6_1();
 
             state._fsp--;
@@ -23856,21 +23856,21 @@ public final void rule__KeywordPair__Group_6__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__KeywordPair__Group_6_1_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7517:1: rule__KeywordPair__Group_6_1_0__0 : rule__KeywordPair__Group_6_1_0__0__Impl rule__KeywordPair__Group_6_1_0__1 ;
+    // InternalFormat.g:7517:1: rule__KeywordPair__Group_6_1_0__0 : rule__KeywordPair__Group_6_1_0__0__Impl rule__KeywordPair__Group_6_1_0__1 ;
     public final void rule__KeywordPair__Group_6_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7521:1: ( rule__KeywordPair__Group_6_1_0__0__Impl rule__KeywordPair__Group_6_1_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7522:2: rule__KeywordPair__Group_6_1_0__0__Impl rule__KeywordPair__Group_6_1_0__1
+            // InternalFormat.g:7521:1: ( rule__KeywordPair__Group_6_1_0__0__Impl rule__KeywordPair__Group_6_1_0__1 )
+            // InternalFormat.g:7522:2: rule__KeywordPair__Group_6_1_0__0__Impl rule__KeywordPair__Group_6_1_0__1
             {
-            pushFollow(FOLLOW_rule__KeywordPair__Group_6_1_0__0__Impl_in_rule__KeywordPair__Group_6_1_0__016001);
+            pushFollow(FOLLOW_35);
             rule__KeywordPair__Group_6_1_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__KeywordPair__Group_6_1_0__1_in_rule__KeywordPair__Group_6_1_0__016004);
+            pushFollow(FOLLOW_2);
             rule__KeywordPair__Group_6_1_0__1();
 
             state._fsp--;
@@ -23894,22 +23894,22 @@ public final void rule__KeywordPair__Group_6_1_0__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__KeywordPair__Group_6_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7529:1: rule__KeywordPair__Group_6_1_0__0__Impl : ( 'left' ) ;
+    // InternalFormat.g:7529:1: rule__KeywordPair__Group_6_1_0__0__Impl : ( 'left' ) ;
     public final void rule__KeywordPair__Group_6_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7533:1: ( ( 'left' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7534:1: ( 'left' )
+            // InternalFormat.g:7533:1: ( ( 'left' ) )
+            // InternalFormat.g:7534:1: ( 'left' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7534:1: ( 'left' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7535:1: 'left'
+            // InternalFormat.g:7534:1: ( 'left' )
+            // InternalFormat.g:7535:1: 'left'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getKeywordPairAccess().getLeftKeyword_6_1_0_0()); 
             }
-            match(input,76,FOLLOW_76_in_rule__KeywordPair__Group_6_1_0__0__Impl16032); if (state.failed) return ;
+            match(input,76,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getKeywordPairAccess().getLeftKeyword_6_1_0_0()); 
             }
@@ -23935,21 +23935,21 @@ public final void rule__KeywordPair__Group_6_1_0__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__KeywordPair__Group_6_1_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7548:1: rule__KeywordPair__Group_6_1_0__1 : rule__KeywordPair__Group_6_1_0__1__Impl rule__KeywordPair__Group_6_1_0__2 ;
+    // InternalFormat.g:7548:1: rule__KeywordPair__Group_6_1_0__1 : rule__KeywordPair__Group_6_1_0__1__Impl rule__KeywordPair__Group_6_1_0__2 ;
     public final void rule__KeywordPair__Group_6_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7552:1: ( rule__KeywordPair__Group_6_1_0__1__Impl rule__KeywordPair__Group_6_1_0__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7553:2: rule__KeywordPair__Group_6_1_0__1__Impl rule__KeywordPair__Group_6_1_0__2
+            // InternalFormat.g:7552:1: ( rule__KeywordPair__Group_6_1_0__1__Impl rule__KeywordPair__Group_6_1_0__2 )
+            // InternalFormat.g:7553:2: rule__KeywordPair__Group_6_1_0__1__Impl rule__KeywordPair__Group_6_1_0__2
             {
-            pushFollow(FOLLOW_rule__KeywordPair__Group_6_1_0__1__Impl_in_rule__KeywordPair__Group_6_1_0__116063);
+            pushFollow(FOLLOW_27);
             rule__KeywordPair__Group_6_1_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__KeywordPair__Group_6_1_0__2_in_rule__KeywordPair__Group_6_1_0__116066);
+            pushFollow(FOLLOW_2);
             rule__KeywordPair__Group_6_1_0__2();
 
             state._fsp--;
@@ -23973,22 +23973,22 @@ public final void rule__KeywordPair__Group_6_1_0__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__KeywordPair__Group_6_1_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7560:1: rule__KeywordPair__Group_6_1_0__1__Impl : ( '.' ) ;
+    // InternalFormat.g:7560:1: rule__KeywordPair__Group_6_1_0__1__Impl : ( '.' ) ;
     public final void rule__KeywordPair__Group_6_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7564:1: ( ( '.' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7565:1: ( '.' )
+            // InternalFormat.g:7564:1: ( ( '.' ) )
+            // InternalFormat.g:7565:1: ( '.' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7565:1: ( '.' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7566:1: '.'
+            // InternalFormat.g:7565:1: ( '.' )
+            // InternalFormat.g:7566:1: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getKeywordPairAccess().getFullStopKeyword_6_1_0_1()); 
             }
-            match(input,49,FOLLOW_49_in_rule__KeywordPair__Group_6_1_0__1__Impl16094); if (state.failed) return ;
+            match(input,49,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getKeywordPairAccess().getFullStopKeyword_6_1_0_1()); 
             }
@@ -24014,16 +24014,16 @@ public final void rule__KeywordPair__Group_6_1_0__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__KeywordPair__Group_6_1_0__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7579:1: rule__KeywordPair__Group_6_1_0__2 : rule__KeywordPair__Group_6_1_0__2__Impl ;
+    // InternalFormat.g:7579:1: rule__KeywordPair__Group_6_1_0__2 : rule__KeywordPair__Group_6_1_0__2__Impl ;
     public final void rule__KeywordPair__Group_6_1_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7583:1: ( rule__KeywordPair__Group_6_1_0__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7584:2: rule__KeywordPair__Group_6_1_0__2__Impl
+            // InternalFormat.g:7583:1: ( rule__KeywordPair__Group_6_1_0__2__Impl )
+            // InternalFormat.g:7584:2: rule__KeywordPair__Group_6_1_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__KeywordPair__Group_6_1_0__2__Impl_in_rule__KeywordPair__Group_6_1_0__216125);
+            pushFollow(FOLLOW_2);
             rule__KeywordPair__Group_6_1_0__2__Impl();
 
             state._fsp--;
@@ -24047,25 +24047,25 @@ public final void rule__KeywordPair__Group_6_1_0__2() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__KeywordPair__Group_6_1_0__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7590:1: rule__KeywordPair__Group_6_1_0__2__Impl : ( ( rule__KeywordPair__LeftMatchersAssignment_6_1_0_2 ) ) ;
+    // InternalFormat.g:7590:1: rule__KeywordPair__Group_6_1_0__2__Impl : ( ( rule__KeywordPair__LeftMatchersAssignment_6_1_0_2 ) ) ;
     public final void rule__KeywordPair__Group_6_1_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7594:1: ( ( ( rule__KeywordPair__LeftMatchersAssignment_6_1_0_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7595:1: ( ( rule__KeywordPair__LeftMatchersAssignment_6_1_0_2 ) )
+            // InternalFormat.g:7594:1: ( ( ( rule__KeywordPair__LeftMatchersAssignment_6_1_0_2 ) ) )
+            // InternalFormat.g:7595:1: ( ( rule__KeywordPair__LeftMatchersAssignment_6_1_0_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7595:1: ( ( rule__KeywordPair__LeftMatchersAssignment_6_1_0_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7596:1: ( rule__KeywordPair__LeftMatchersAssignment_6_1_0_2 )
+            // InternalFormat.g:7595:1: ( ( rule__KeywordPair__LeftMatchersAssignment_6_1_0_2 ) )
+            // InternalFormat.g:7596:1: ( rule__KeywordPair__LeftMatchersAssignment_6_1_0_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getKeywordPairAccess().getLeftMatchersAssignment_6_1_0_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7597:1: ( rule__KeywordPair__LeftMatchersAssignment_6_1_0_2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7597:2: rule__KeywordPair__LeftMatchersAssignment_6_1_0_2
+            // InternalFormat.g:7597:1: ( rule__KeywordPair__LeftMatchersAssignment_6_1_0_2 )
+            // InternalFormat.g:7597:2: rule__KeywordPair__LeftMatchersAssignment_6_1_0_2
             {
-            pushFollow(FOLLOW_rule__KeywordPair__LeftMatchersAssignment_6_1_0_2_in_rule__KeywordPair__Group_6_1_0__2__Impl16152);
+            pushFollow(FOLLOW_2);
             rule__KeywordPair__LeftMatchersAssignment_6_1_0_2();
 
             state._fsp--;
@@ -24098,21 +24098,21 @@ public final void rule__KeywordPair__Group_6_1_0__2__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__KeywordPair__Group_6_1_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7613:1: rule__KeywordPair__Group_6_1_1__0 : rule__KeywordPair__Group_6_1_1__0__Impl rule__KeywordPair__Group_6_1_1__1 ;
+    // InternalFormat.g:7613:1: rule__KeywordPair__Group_6_1_1__0 : rule__KeywordPair__Group_6_1_1__0__Impl rule__KeywordPair__Group_6_1_1__1 ;
     public final void rule__KeywordPair__Group_6_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7617:1: ( rule__KeywordPair__Group_6_1_1__0__Impl rule__KeywordPair__Group_6_1_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7618:2: rule__KeywordPair__Group_6_1_1__0__Impl rule__KeywordPair__Group_6_1_1__1
+            // InternalFormat.g:7617:1: ( rule__KeywordPair__Group_6_1_1__0__Impl rule__KeywordPair__Group_6_1_1__1 )
+            // InternalFormat.g:7618:2: rule__KeywordPair__Group_6_1_1__0__Impl rule__KeywordPair__Group_6_1_1__1
             {
-            pushFollow(FOLLOW_rule__KeywordPair__Group_6_1_1__0__Impl_in_rule__KeywordPair__Group_6_1_1__016188);
+            pushFollow(FOLLOW_35);
             rule__KeywordPair__Group_6_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__KeywordPair__Group_6_1_1__1_in_rule__KeywordPair__Group_6_1_1__016191);
+            pushFollow(FOLLOW_2);
             rule__KeywordPair__Group_6_1_1__1();
 
             state._fsp--;
@@ -24136,22 +24136,22 @@ public final void rule__KeywordPair__Group_6_1_1__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__KeywordPair__Group_6_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7625:1: rule__KeywordPair__Group_6_1_1__0__Impl : ( 'right' ) ;
+    // InternalFormat.g:7625:1: rule__KeywordPair__Group_6_1_1__0__Impl : ( 'right' ) ;
     public final void rule__KeywordPair__Group_6_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7629:1: ( ( 'right' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7630:1: ( 'right' )
+            // InternalFormat.g:7629:1: ( ( 'right' ) )
+            // InternalFormat.g:7630:1: ( 'right' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7630:1: ( 'right' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7631:1: 'right'
+            // InternalFormat.g:7630:1: ( 'right' )
+            // InternalFormat.g:7631:1: 'right'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getKeywordPairAccess().getRightKeyword_6_1_1_0()); 
             }
-            match(input,77,FOLLOW_77_in_rule__KeywordPair__Group_6_1_1__0__Impl16219); if (state.failed) return ;
+            match(input,77,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getKeywordPairAccess().getRightKeyword_6_1_1_0()); 
             }
@@ -24177,21 +24177,21 @@ public final void rule__KeywordPair__Group_6_1_1__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__KeywordPair__Group_6_1_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7644:1: rule__KeywordPair__Group_6_1_1__1 : rule__KeywordPair__Group_6_1_1__1__Impl rule__KeywordPair__Group_6_1_1__2 ;
+    // InternalFormat.g:7644:1: rule__KeywordPair__Group_6_1_1__1 : rule__KeywordPair__Group_6_1_1__1__Impl rule__KeywordPair__Group_6_1_1__2 ;
     public final void rule__KeywordPair__Group_6_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7648:1: ( rule__KeywordPair__Group_6_1_1__1__Impl rule__KeywordPair__Group_6_1_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7649:2: rule__KeywordPair__Group_6_1_1__1__Impl rule__KeywordPair__Group_6_1_1__2
+            // InternalFormat.g:7648:1: ( rule__KeywordPair__Group_6_1_1__1__Impl rule__KeywordPair__Group_6_1_1__2 )
+            // InternalFormat.g:7649:2: rule__KeywordPair__Group_6_1_1__1__Impl rule__KeywordPair__Group_6_1_1__2
             {
-            pushFollow(FOLLOW_rule__KeywordPair__Group_6_1_1__1__Impl_in_rule__KeywordPair__Group_6_1_1__116250);
+            pushFollow(FOLLOW_27);
             rule__KeywordPair__Group_6_1_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__KeywordPair__Group_6_1_1__2_in_rule__KeywordPair__Group_6_1_1__116253);
+            pushFollow(FOLLOW_2);
             rule__KeywordPair__Group_6_1_1__2();
 
             state._fsp--;
@@ -24215,22 +24215,22 @@ public final void rule__KeywordPair__Group_6_1_1__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__KeywordPair__Group_6_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7656:1: rule__KeywordPair__Group_6_1_1__1__Impl : ( '.' ) ;
+    // InternalFormat.g:7656:1: rule__KeywordPair__Group_6_1_1__1__Impl : ( '.' ) ;
     public final void rule__KeywordPair__Group_6_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7660:1: ( ( '.' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7661:1: ( '.' )
+            // InternalFormat.g:7660:1: ( ( '.' ) )
+            // InternalFormat.g:7661:1: ( '.' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7661:1: ( '.' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7662:1: '.'
+            // InternalFormat.g:7661:1: ( '.' )
+            // InternalFormat.g:7662:1: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getKeywordPairAccess().getFullStopKeyword_6_1_1_1()); 
             }
-            match(input,49,FOLLOW_49_in_rule__KeywordPair__Group_6_1_1__1__Impl16281); if (state.failed) return ;
+            match(input,49,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getKeywordPairAccess().getFullStopKeyword_6_1_1_1()); 
             }
@@ -24256,16 +24256,16 @@ public final void rule__KeywordPair__Group_6_1_1__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__KeywordPair__Group_6_1_1__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7675:1: rule__KeywordPair__Group_6_1_1__2 : rule__KeywordPair__Group_6_1_1__2__Impl ;
+    // InternalFormat.g:7675:1: rule__KeywordPair__Group_6_1_1__2 : rule__KeywordPair__Group_6_1_1__2__Impl ;
     public final void rule__KeywordPair__Group_6_1_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7679:1: ( rule__KeywordPair__Group_6_1_1__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7680:2: rule__KeywordPair__Group_6_1_1__2__Impl
+            // InternalFormat.g:7679:1: ( rule__KeywordPair__Group_6_1_1__2__Impl )
+            // InternalFormat.g:7680:2: rule__KeywordPair__Group_6_1_1__2__Impl
             {
-            pushFollow(FOLLOW_rule__KeywordPair__Group_6_1_1__2__Impl_in_rule__KeywordPair__Group_6_1_1__216312);
+            pushFollow(FOLLOW_2);
             rule__KeywordPair__Group_6_1_1__2__Impl();
 
             state._fsp--;
@@ -24289,25 +24289,25 @@ public final void rule__KeywordPair__Group_6_1_1__2() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__KeywordPair__Group_6_1_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7686:1: rule__KeywordPair__Group_6_1_1__2__Impl : ( ( rule__KeywordPair__RightMatchersAssignment_6_1_1_2 ) ) ;
+    // InternalFormat.g:7686:1: rule__KeywordPair__Group_6_1_1__2__Impl : ( ( rule__KeywordPair__RightMatchersAssignment_6_1_1_2 ) ) ;
     public final void rule__KeywordPair__Group_6_1_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7690:1: ( ( ( rule__KeywordPair__RightMatchersAssignment_6_1_1_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7691:1: ( ( rule__KeywordPair__RightMatchersAssignment_6_1_1_2 ) )
+            // InternalFormat.g:7690:1: ( ( ( rule__KeywordPair__RightMatchersAssignment_6_1_1_2 ) ) )
+            // InternalFormat.g:7691:1: ( ( rule__KeywordPair__RightMatchersAssignment_6_1_1_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7691:1: ( ( rule__KeywordPair__RightMatchersAssignment_6_1_1_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7692:1: ( rule__KeywordPair__RightMatchersAssignment_6_1_1_2 )
+            // InternalFormat.g:7691:1: ( ( rule__KeywordPair__RightMatchersAssignment_6_1_1_2 ) )
+            // InternalFormat.g:7692:1: ( rule__KeywordPair__RightMatchersAssignment_6_1_1_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getKeywordPairAccess().getRightMatchersAssignment_6_1_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7693:1: ( rule__KeywordPair__RightMatchersAssignment_6_1_1_2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7693:2: rule__KeywordPair__RightMatchersAssignment_6_1_1_2
+            // InternalFormat.g:7693:1: ( rule__KeywordPair__RightMatchersAssignment_6_1_1_2 )
+            // InternalFormat.g:7693:2: rule__KeywordPair__RightMatchersAssignment_6_1_1_2
             {
-            pushFollow(FOLLOW_rule__KeywordPair__RightMatchersAssignment_6_1_1_2_in_rule__KeywordPair__Group_6_1_1__2__Impl16339);
+            pushFollow(FOLLOW_2);
             rule__KeywordPair__RightMatchersAssignment_6_1_1_2();
 
             state._fsp--;
@@ -24340,21 +24340,21 @@ public final void rule__KeywordPair__Group_6_1_1__2__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__Matcher__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7709:1: rule__Matcher__Group__0 : rule__Matcher__Group__0__Impl rule__Matcher__Group__1 ;
+    // InternalFormat.g:7709:1: rule__Matcher__Group__0 : rule__Matcher__Group__0__Impl rule__Matcher__Group__1 ;
     public final void rule__Matcher__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7713:1: ( rule__Matcher__Group__0__Impl rule__Matcher__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7714:2: rule__Matcher__Group__0__Impl rule__Matcher__Group__1
+            // InternalFormat.g:7713:1: ( rule__Matcher__Group__0__Impl rule__Matcher__Group__1 )
+            // InternalFormat.g:7714:2: rule__Matcher__Group__0__Impl rule__Matcher__Group__1
             {
-            pushFollow(FOLLOW_rule__Matcher__Group__0__Impl_in_rule__Matcher__Group__016375);
+            pushFollow(FOLLOW_36);
             rule__Matcher__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Matcher__Group__1_in_rule__Matcher__Group__016378);
+            pushFollow(FOLLOW_2);
             rule__Matcher__Group__1();
 
             state._fsp--;
@@ -24378,25 +24378,25 @@ public final void rule__Matcher__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Matcher__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7721:1: rule__Matcher__Group__0__Impl : ( ( rule__Matcher__LocatorAssignment_0 ) ) ;
+    // InternalFormat.g:7721:1: rule__Matcher__Group__0__Impl : ( ( rule__Matcher__LocatorAssignment_0 ) ) ;
     public final void rule__Matcher__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7725:1: ( ( ( rule__Matcher__LocatorAssignment_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7726:1: ( ( rule__Matcher__LocatorAssignment_0 ) )
+            // InternalFormat.g:7725:1: ( ( ( rule__Matcher__LocatorAssignment_0 ) ) )
+            // InternalFormat.g:7726:1: ( ( rule__Matcher__LocatorAssignment_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7726:1: ( ( rule__Matcher__LocatorAssignment_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7727:1: ( rule__Matcher__LocatorAssignment_0 )
+            // InternalFormat.g:7726:1: ( ( rule__Matcher__LocatorAssignment_0 ) )
+            // InternalFormat.g:7727:1: ( rule__Matcher__LocatorAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMatcherAccess().getLocatorAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7728:1: ( rule__Matcher__LocatorAssignment_0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7728:2: rule__Matcher__LocatorAssignment_0
+            // InternalFormat.g:7728:1: ( rule__Matcher__LocatorAssignment_0 )
+            // InternalFormat.g:7728:2: rule__Matcher__LocatorAssignment_0
             {
-            pushFollow(FOLLOW_rule__Matcher__LocatorAssignment_0_in_rule__Matcher__Group__0__Impl16405);
+            pushFollow(FOLLOW_2);
             rule__Matcher__LocatorAssignment_0();
 
             state._fsp--;
@@ -24429,21 +24429,21 @@ public final void rule__Matcher__Group__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Matcher__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7738:1: rule__Matcher__Group__1 : rule__Matcher__Group__1__Impl rule__Matcher__Group__2 ;
+    // InternalFormat.g:7738:1: rule__Matcher__Group__1 : rule__Matcher__Group__1__Impl rule__Matcher__Group__2 ;
     public final void rule__Matcher__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7742:1: ( rule__Matcher__Group__1__Impl rule__Matcher__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7743:2: rule__Matcher__Group__1__Impl rule__Matcher__Group__2
+            // InternalFormat.g:7742:1: ( rule__Matcher__Group__1__Impl rule__Matcher__Group__2 )
+            // InternalFormat.g:7743:2: rule__Matcher__Group__1__Impl rule__Matcher__Group__2
             {
-            pushFollow(FOLLOW_rule__Matcher__Group__1__Impl_in_rule__Matcher__Group__116435);
+            pushFollow(FOLLOW_15);
             rule__Matcher__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Matcher__Group__2_in_rule__Matcher__Group__116438);
+            pushFollow(FOLLOW_2);
             rule__Matcher__Group__2();
 
             state._fsp--;
@@ -24467,25 +24467,25 @@ public final void rule__Matcher__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Matcher__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7750:1: rule__Matcher__Group__1__Impl : ( ( rule__Matcher__TypeAssignment_1 ) ) ;
+    // InternalFormat.g:7750:1: rule__Matcher__Group__1__Impl : ( ( rule__Matcher__TypeAssignment_1 ) ) ;
     public final void rule__Matcher__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7754:1: ( ( ( rule__Matcher__TypeAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7755:1: ( ( rule__Matcher__TypeAssignment_1 ) )
+            // InternalFormat.g:7754:1: ( ( ( rule__Matcher__TypeAssignment_1 ) ) )
+            // InternalFormat.g:7755:1: ( ( rule__Matcher__TypeAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7755:1: ( ( rule__Matcher__TypeAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7756:1: ( rule__Matcher__TypeAssignment_1 )
+            // InternalFormat.g:7755:1: ( ( rule__Matcher__TypeAssignment_1 ) )
+            // InternalFormat.g:7756:1: ( rule__Matcher__TypeAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMatcherAccess().getTypeAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7757:1: ( rule__Matcher__TypeAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7757:2: rule__Matcher__TypeAssignment_1
+            // InternalFormat.g:7757:1: ( rule__Matcher__TypeAssignment_1 )
+            // InternalFormat.g:7757:2: rule__Matcher__TypeAssignment_1
             {
-            pushFollow(FOLLOW_rule__Matcher__TypeAssignment_1_in_rule__Matcher__Group__1__Impl16465);
+            pushFollow(FOLLOW_2);
             rule__Matcher__TypeAssignment_1();
 
             state._fsp--;
@@ -24518,16 +24518,16 @@ public final void rule__Matcher__Group__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Matcher__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7767:1: rule__Matcher__Group__2 : rule__Matcher__Group__2__Impl ;
+    // InternalFormat.g:7767:1: rule__Matcher__Group__2 : rule__Matcher__Group__2__Impl ;
     public final void rule__Matcher__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7771:1: ( rule__Matcher__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7772:2: rule__Matcher__Group__2__Impl
+            // InternalFormat.g:7771:1: ( rule__Matcher__Group__2__Impl )
+            // InternalFormat.g:7772:2: rule__Matcher__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__Matcher__Group__2__Impl_in_rule__Matcher__Group__216495);
+            pushFollow(FOLLOW_2);
             rule__Matcher__Group__2__Impl();
 
             state._fsp--;
@@ -24551,22 +24551,22 @@ public final void rule__Matcher__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__Matcher__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7778:1: rule__Matcher__Group__2__Impl : ( ( rule__Matcher__ConditionAssignment_2 )? ) ;
+    // InternalFormat.g:7778:1: rule__Matcher__Group__2__Impl : ( ( rule__Matcher__ConditionAssignment_2 )? ) ;
     public final void rule__Matcher__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7782:1: ( ( ( rule__Matcher__ConditionAssignment_2 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7783:1: ( ( rule__Matcher__ConditionAssignment_2 )? )
+            // InternalFormat.g:7782:1: ( ( ( rule__Matcher__ConditionAssignment_2 )? ) )
+            // InternalFormat.g:7783:1: ( ( rule__Matcher__ConditionAssignment_2 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7783:1: ( ( rule__Matcher__ConditionAssignment_2 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7784:1: ( rule__Matcher__ConditionAssignment_2 )?
+            // InternalFormat.g:7783:1: ( ( rule__Matcher__ConditionAssignment_2 )? )
+            // InternalFormat.g:7784:1: ( rule__Matcher__ConditionAssignment_2 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMatcherAccess().getConditionAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7785:1: ( rule__Matcher__ConditionAssignment_2 )?
+            // InternalFormat.g:7785:1: ( rule__Matcher__ConditionAssignment_2 )?
             int alt82=2;
             int LA82_0 = input.LA(1);
 
@@ -24575,9 +24575,9 @@ public final void rule__Matcher__Group__2__Impl() throws RecognitionException {
             }
             switch (alt82) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7785:2: rule__Matcher__ConditionAssignment_2
+                    // InternalFormat.g:7785:2: rule__Matcher__ConditionAssignment_2
                     {
-                    pushFollow(FOLLOW_rule__Matcher__ConditionAssignment_2_in_rule__Matcher__Group__2__Impl16522);
+                    pushFollow(FOLLOW_2);
                     rule__Matcher__ConditionAssignment_2();
 
                     state._fsp--;
@@ -24613,21 +24613,21 @@ public final void rule__Matcher__Group__2__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__NoFormatLocator__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7801:1: rule__NoFormatLocator__Group__0 : rule__NoFormatLocator__Group__0__Impl rule__NoFormatLocator__Group__1 ;
+    // InternalFormat.g:7801:1: rule__NoFormatLocator__Group__0 : rule__NoFormatLocator__Group__0__Impl rule__NoFormatLocator__Group__1 ;
     public final void rule__NoFormatLocator__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7805:1: ( rule__NoFormatLocator__Group__0__Impl rule__NoFormatLocator__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7806:2: rule__NoFormatLocator__Group__0__Impl rule__NoFormatLocator__Group__1
+            // InternalFormat.g:7805:1: ( rule__NoFormatLocator__Group__0__Impl rule__NoFormatLocator__Group__1 )
+            // InternalFormat.g:7806:2: rule__NoFormatLocator__Group__0__Impl rule__NoFormatLocator__Group__1
             {
-            pushFollow(FOLLOW_rule__NoFormatLocator__Group__0__Impl_in_rule__NoFormatLocator__Group__016559);
+            pushFollow(FOLLOW_27);
             rule__NoFormatLocator__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__NoFormatLocator__Group__1_in_rule__NoFormatLocator__Group__016562);
+            pushFollow(FOLLOW_2);
             rule__NoFormatLocator__Group__1();
 
             state._fsp--;
@@ -24651,23 +24651,23 @@ public final void rule__NoFormatLocator__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__NoFormatLocator__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7813:1: rule__NoFormatLocator__Group__0__Impl : ( () ) ;
+    // InternalFormat.g:7813:1: rule__NoFormatLocator__Group__0__Impl : ( () ) ;
     public final void rule__NoFormatLocator__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7817:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7818:1: ( () )
+            // InternalFormat.g:7817:1: ( ( () ) )
+            // InternalFormat.g:7818:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7818:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7819:1: ()
+            // InternalFormat.g:7818:1: ( () )
+            // InternalFormat.g:7819:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNoFormatLocatorAccess().getNoFormatLocatorAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7820:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7822:1: 
+            // InternalFormat.g:7820:1: ()
+            // InternalFormat.g:7822:1: 
             {
             }
 
@@ -24692,16 +24692,16 @@ public final void rule__NoFormatLocator__Group__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__NoFormatLocator__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7832:1: rule__NoFormatLocator__Group__1 : rule__NoFormatLocator__Group__1__Impl ;
+    // InternalFormat.g:7832:1: rule__NoFormatLocator__Group__1 : rule__NoFormatLocator__Group__1__Impl ;
     public final void rule__NoFormatLocator__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7836:1: ( rule__NoFormatLocator__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7837:2: rule__NoFormatLocator__Group__1__Impl
+            // InternalFormat.g:7836:1: ( rule__NoFormatLocator__Group__1__Impl )
+            // InternalFormat.g:7837:2: rule__NoFormatLocator__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__NoFormatLocator__Group__1__Impl_in_rule__NoFormatLocator__Group__116620);
+            pushFollow(FOLLOW_2);
             rule__NoFormatLocator__Group__1__Impl();
 
             state._fsp--;
@@ -24725,22 +24725,22 @@ public final void rule__NoFormatLocator__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__NoFormatLocator__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7843:1: rule__NoFormatLocator__Group__1__Impl : ( 'no_format' ) ;
+    // InternalFormat.g:7843:1: rule__NoFormatLocator__Group__1__Impl : ( 'no_format' ) ;
     public final void rule__NoFormatLocator__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7847:1: ( ( 'no_format' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7848:1: ( 'no_format' )
+            // InternalFormat.g:7847:1: ( ( 'no_format' ) )
+            // InternalFormat.g:7848:1: ( 'no_format' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7848:1: ( 'no_format' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7849:1: 'no_format'
+            // InternalFormat.g:7848:1: ( 'no_format' )
+            // InternalFormat.g:7849:1: 'no_format'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNoFormatLocatorAccess().getNo_formatKeyword_1()); 
             }
-            match(input,78,FOLLOW_78_in_rule__NoFormatLocator__Group__1__Impl16648); if (state.failed) return ;
+            match(input,78,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getNoFormatLocatorAccess().getNo_formatKeyword_1()); 
             }
@@ -24766,21 +24766,21 @@ public final void rule__NoFormatLocator__Group__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__SpaceLocator__Group_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7866:1: rule__SpaceLocator__Group_0__0 : rule__SpaceLocator__Group_0__0__Impl rule__SpaceLocator__Group_0__1 ;
+    // InternalFormat.g:7866:1: rule__SpaceLocator__Group_0__0 : rule__SpaceLocator__Group_0__0__Impl rule__SpaceLocator__Group_0__1 ;
     public final void rule__SpaceLocator__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7870:1: ( rule__SpaceLocator__Group_0__0__Impl rule__SpaceLocator__Group_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7871:2: rule__SpaceLocator__Group_0__0__Impl rule__SpaceLocator__Group_0__1
+            // InternalFormat.g:7870:1: ( rule__SpaceLocator__Group_0__0__Impl rule__SpaceLocator__Group_0__1 )
+            // InternalFormat.g:7871:2: rule__SpaceLocator__Group_0__0__Impl rule__SpaceLocator__Group_0__1
             {
-            pushFollow(FOLLOW_rule__SpaceLocator__Group_0__0__Impl_in_rule__SpaceLocator__Group_0__016683);
+            pushFollow(FOLLOW_21);
             rule__SpaceLocator__Group_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SpaceLocator__Group_0__1_in_rule__SpaceLocator__Group_0__016686);
+            pushFollow(FOLLOW_2);
             rule__SpaceLocator__Group_0__1();
 
             state._fsp--;
@@ -24804,22 +24804,22 @@ public final void rule__SpaceLocator__Group_0__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__SpaceLocator__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7878:1: rule__SpaceLocator__Group_0__0__Impl : ( 'space' ) ;
+    // InternalFormat.g:7878:1: rule__SpaceLocator__Group_0__0__Impl : ( 'space' ) ;
     public final void rule__SpaceLocator__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7882:1: ( ( 'space' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7883:1: ( 'space' )
+            // InternalFormat.g:7882:1: ( ( 'space' ) )
+            // InternalFormat.g:7883:1: ( 'space' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7883:1: ( 'space' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7884:1: 'space'
+            // InternalFormat.g:7883:1: ( 'space' )
+            // InternalFormat.g:7884:1: 'space'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSpaceLocatorAccess().getSpaceKeyword_0_0()); 
             }
-            match(input,79,FOLLOW_79_in_rule__SpaceLocator__Group_0__0__Impl16714); if (state.failed) return ;
+            match(input,79,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSpaceLocatorAccess().getSpaceKeyword_0_0()); 
             }
@@ -24845,16 +24845,16 @@ public final void rule__SpaceLocator__Group_0__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__SpaceLocator__Group_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7897:1: rule__SpaceLocator__Group_0__1 : rule__SpaceLocator__Group_0__1__Impl ;
+    // InternalFormat.g:7897:1: rule__SpaceLocator__Group_0__1 : rule__SpaceLocator__Group_0__1__Impl ;
     public final void rule__SpaceLocator__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7901:1: ( rule__SpaceLocator__Group_0__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7902:2: rule__SpaceLocator__Group_0__1__Impl
+            // InternalFormat.g:7901:1: ( rule__SpaceLocator__Group_0__1__Impl )
+            // InternalFormat.g:7902:2: rule__SpaceLocator__Group_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__SpaceLocator__Group_0__1__Impl_in_rule__SpaceLocator__Group_0__116745);
+            pushFollow(FOLLOW_2);
             rule__SpaceLocator__Group_0__1__Impl();
 
             state._fsp--;
@@ -24878,25 +24878,25 @@ public final void rule__SpaceLocator__Group_0__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__SpaceLocator__Group_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7908:1: rule__SpaceLocator__Group_0__1__Impl : ( ( rule__SpaceLocator__ValueAssignment_0_1 ) ) ;
+    // InternalFormat.g:7908:1: rule__SpaceLocator__Group_0__1__Impl : ( ( rule__SpaceLocator__ValueAssignment_0_1 ) ) ;
     public final void rule__SpaceLocator__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7912:1: ( ( ( rule__SpaceLocator__ValueAssignment_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7913:1: ( ( rule__SpaceLocator__ValueAssignment_0_1 ) )
+            // InternalFormat.g:7912:1: ( ( ( rule__SpaceLocator__ValueAssignment_0_1 ) ) )
+            // InternalFormat.g:7913:1: ( ( rule__SpaceLocator__ValueAssignment_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7913:1: ( ( rule__SpaceLocator__ValueAssignment_0_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7914:1: ( rule__SpaceLocator__ValueAssignment_0_1 )
+            // InternalFormat.g:7913:1: ( ( rule__SpaceLocator__ValueAssignment_0_1 ) )
+            // InternalFormat.g:7914:1: ( rule__SpaceLocator__ValueAssignment_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSpaceLocatorAccess().getValueAssignment_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7915:1: ( rule__SpaceLocator__ValueAssignment_0_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7915:2: rule__SpaceLocator__ValueAssignment_0_1
+            // InternalFormat.g:7915:1: ( rule__SpaceLocator__ValueAssignment_0_1 )
+            // InternalFormat.g:7915:2: rule__SpaceLocator__ValueAssignment_0_1
             {
-            pushFollow(FOLLOW_rule__SpaceLocator__ValueAssignment_0_1_in_rule__SpaceLocator__Group_0__1__Impl16772);
+            pushFollow(FOLLOW_2);
             rule__SpaceLocator__ValueAssignment_0_1();
 
             state._fsp--;
@@ -24929,21 +24929,21 @@ public final void rule__SpaceLocator__Group_0__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__RightPaddingLocator__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7929:1: rule__RightPaddingLocator__Group__0 : rule__RightPaddingLocator__Group__0__Impl rule__RightPaddingLocator__Group__1 ;
+    // InternalFormat.g:7929:1: rule__RightPaddingLocator__Group__0 : rule__RightPaddingLocator__Group__0__Impl rule__RightPaddingLocator__Group__1 ;
     public final void rule__RightPaddingLocator__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7933:1: ( rule__RightPaddingLocator__Group__0__Impl rule__RightPaddingLocator__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7934:2: rule__RightPaddingLocator__Group__0__Impl rule__RightPaddingLocator__Group__1
+            // InternalFormat.g:7933:1: ( rule__RightPaddingLocator__Group__0__Impl rule__RightPaddingLocator__Group__1 )
+            // InternalFormat.g:7934:2: rule__RightPaddingLocator__Group__0__Impl rule__RightPaddingLocator__Group__1
             {
-            pushFollow(FOLLOW_rule__RightPaddingLocator__Group__0__Impl_in_rule__RightPaddingLocator__Group__016806);
+            pushFollow(FOLLOW_37);
             rule__RightPaddingLocator__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__RightPaddingLocator__Group__1_in_rule__RightPaddingLocator__Group__016809);
+            pushFollow(FOLLOW_2);
             rule__RightPaddingLocator__Group__1();
 
             state._fsp--;
@@ -24967,22 +24967,22 @@ public final void rule__RightPaddingLocator__Group__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__RightPaddingLocator__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7941:1: rule__RightPaddingLocator__Group__0__Impl : ( 'right_padding' ) ;
+    // InternalFormat.g:7941:1: rule__RightPaddingLocator__Group__0__Impl : ( 'right_padding' ) ;
     public final void rule__RightPaddingLocator__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7945:1: ( ( 'right_padding' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7946:1: ( 'right_padding' )
+            // InternalFormat.g:7945:1: ( ( 'right_padding' ) )
+            // InternalFormat.g:7946:1: ( 'right_padding' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7946:1: ( 'right_padding' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7947:1: 'right_padding'
+            // InternalFormat.g:7946:1: ( 'right_padding' )
+            // InternalFormat.g:7947:1: 'right_padding'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRightPaddingLocatorAccess().getRight_paddingKeyword_0()); 
             }
-            match(input,80,FOLLOW_80_in_rule__RightPaddingLocator__Group__0__Impl16837); if (state.failed) return ;
+            match(input,80,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getRightPaddingLocatorAccess().getRight_paddingKeyword_0()); 
             }
@@ -25008,16 +25008,16 @@ public final void rule__RightPaddingLocator__Group__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__RightPaddingLocator__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7960:1: rule__RightPaddingLocator__Group__1 : rule__RightPaddingLocator__Group__1__Impl ;
+    // InternalFormat.g:7960:1: rule__RightPaddingLocator__Group__1 : rule__RightPaddingLocator__Group__1__Impl ;
     public final void rule__RightPaddingLocator__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7964:1: ( rule__RightPaddingLocator__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7965:2: rule__RightPaddingLocator__Group__1__Impl
+            // InternalFormat.g:7964:1: ( rule__RightPaddingLocator__Group__1__Impl )
+            // InternalFormat.g:7965:2: rule__RightPaddingLocator__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__RightPaddingLocator__Group__1__Impl_in_rule__RightPaddingLocator__Group__116868);
+            pushFollow(FOLLOW_2);
             rule__RightPaddingLocator__Group__1__Impl();
 
             state._fsp--;
@@ -25041,25 +25041,25 @@ public final void rule__RightPaddingLocator__Group__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__RightPaddingLocator__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7971:1: rule__RightPaddingLocator__Group__1__Impl : ( ( rule__RightPaddingLocator__ValueAssignment_1 ) ) ;
+    // InternalFormat.g:7971:1: rule__RightPaddingLocator__Group__1__Impl : ( ( rule__RightPaddingLocator__ValueAssignment_1 ) ) ;
     public final void rule__RightPaddingLocator__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7975:1: ( ( ( rule__RightPaddingLocator__ValueAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7976:1: ( ( rule__RightPaddingLocator__ValueAssignment_1 ) )
+            // InternalFormat.g:7975:1: ( ( ( rule__RightPaddingLocator__ValueAssignment_1 ) ) )
+            // InternalFormat.g:7976:1: ( ( rule__RightPaddingLocator__ValueAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7976:1: ( ( rule__RightPaddingLocator__ValueAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7977:1: ( rule__RightPaddingLocator__ValueAssignment_1 )
+            // InternalFormat.g:7976:1: ( ( rule__RightPaddingLocator__ValueAssignment_1 ) )
+            // InternalFormat.g:7977:1: ( rule__RightPaddingLocator__ValueAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRightPaddingLocatorAccess().getValueAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7978:1: ( rule__RightPaddingLocator__ValueAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7978:2: rule__RightPaddingLocator__ValueAssignment_1
+            // InternalFormat.g:7978:1: ( rule__RightPaddingLocator__ValueAssignment_1 )
+            // InternalFormat.g:7978:2: rule__RightPaddingLocator__ValueAssignment_1
             {
-            pushFollow(FOLLOW_rule__RightPaddingLocator__ValueAssignment_1_in_rule__RightPaddingLocator__Group__1__Impl16895);
+            pushFollow(FOLLOW_2);
             rule__RightPaddingLocator__ValueAssignment_1();
 
             state._fsp--;
@@ -25092,21 +25092,21 @@ public final void rule__RightPaddingLocator__Group__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__LinewrapLocator__Group_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7992:1: rule__LinewrapLocator__Group_0__0 : rule__LinewrapLocator__Group_0__0__Impl rule__LinewrapLocator__Group_0__1 ;
+    // InternalFormat.g:7992:1: rule__LinewrapLocator__Group_0__0 : rule__LinewrapLocator__Group_0__0__Impl rule__LinewrapLocator__Group_0__1 ;
     public final void rule__LinewrapLocator__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7996:1: ( rule__LinewrapLocator__Group_0__0__Impl rule__LinewrapLocator__Group_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:7997:2: rule__LinewrapLocator__Group_0__0__Impl rule__LinewrapLocator__Group_0__1
+            // InternalFormat.g:7996:1: ( rule__LinewrapLocator__Group_0__0__Impl rule__LinewrapLocator__Group_0__1 )
+            // InternalFormat.g:7997:2: rule__LinewrapLocator__Group_0__0__Impl rule__LinewrapLocator__Group_0__1
             {
-            pushFollow(FOLLOW_rule__LinewrapLocator__Group_0__0__Impl_in_rule__LinewrapLocator__Group_0__016929);
+            pushFollow(FOLLOW_38);
             rule__LinewrapLocator__Group_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__LinewrapLocator__Group_0__1_in_rule__LinewrapLocator__Group_0__016932);
+            pushFollow(FOLLOW_2);
             rule__LinewrapLocator__Group_0__1();
 
             state._fsp--;
@@ -25130,23 +25130,23 @@ public final void rule__LinewrapLocator__Group_0__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__LinewrapLocator__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8004:1: rule__LinewrapLocator__Group_0__0__Impl : ( () ) ;
+    // InternalFormat.g:8004:1: rule__LinewrapLocator__Group_0__0__Impl : ( () ) ;
     public final void rule__LinewrapLocator__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8008:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8009:1: ( () )
+            // InternalFormat.g:8008:1: ( ( () ) )
+            // InternalFormat.g:8009:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8009:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8010:1: ()
+            // InternalFormat.g:8009:1: ( () )
+            // InternalFormat.g:8010:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLinewrapLocatorAccess().getLinewrapLocatorAction_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8011:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8013:1: 
+            // InternalFormat.g:8011:1: ()
+            // InternalFormat.g:8013:1: 
             {
             }
 
@@ -25171,16 +25171,16 @@ public final void rule__LinewrapLocator__Group_0__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__LinewrapLocator__Group_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8023:1: rule__LinewrapLocator__Group_0__1 : rule__LinewrapLocator__Group_0__1__Impl ;
+    // InternalFormat.g:8023:1: rule__LinewrapLocator__Group_0__1 : rule__LinewrapLocator__Group_0__1__Impl ;
     public final void rule__LinewrapLocator__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8027:1: ( rule__LinewrapLocator__Group_0__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8028:2: rule__LinewrapLocator__Group_0__1__Impl
+            // InternalFormat.g:8027:1: ( rule__LinewrapLocator__Group_0__1__Impl )
+            // InternalFormat.g:8028:2: rule__LinewrapLocator__Group_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__LinewrapLocator__Group_0__1__Impl_in_rule__LinewrapLocator__Group_0__116990);
+            pushFollow(FOLLOW_2);
             rule__LinewrapLocator__Group_0__1__Impl();
 
             state._fsp--;
@@ -25204,25 +25204,25 @@ public final void rule__LinewrapLocator__Group_0__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__LinewrapLocator__Group_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8034:1: rule__LinewrapLocator__Group_0__1__Impl : ( ( rule__LinewrapLocator__Group_0_1__0 ) ) ;
+    // InternalFormat.g:8034:1: rule__LinewrapLocator__Group_0__1__Impl : ( ( rule__LinewrapLocator__Group_0_1__0 ) ) ;
     public final void rule__LinewrapLocator__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8038:1: ( ( ( rule__LinewrapLocator__Group_0_1__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8039:1: ( ( rule__LinewrapLocator__Group_0_1__0 ) )
+            // InternalFormat.g:8038:1: ( ( ( rule__LinewrapLocator__Group_0_1__0 ) ) )
+            // InternalFormat.g:8039:1: ( ( rule__LinewrapLocator__Group_0_1__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8039:1: ( ( rule__LinewrapLocator__Group_0_1__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8040:1: ( rule__LinewrapLocator__Group_0_1__0 )
+            // InternalFormat.g:8039:1: ( ( rule__LinewrapLocator__Group_0_1__0 ) )
+            // InternalFormat.g:8040:1: ( rule__LinewrapLocator__Group_0_1__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLinewrapLocatorAccess().getGroup_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8041:1: ( rule__LinewrapLocator__Group_0_1__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8041:2: rule__LinewrapLocator__Group_0_1__0
+            // InternalFormat.g:8041:1: ( rule__LinewrapLocator__Group_0_1__0 )
+            // InternalFormat.g:8041:2: rule__LinewrapLocator__Group_0_1__0
             {
-            pushFollow(FOLLOW_rule__LinewrapLocator__Group_0_1__0_in_rule__LinewrapLocator__Group_0__1__Impl17017);
+            pushFollow(FOLLOW_2);
             rule__LinewrapLocator__Group_0_1__0();
 
             state._fsp--;
@@ -25255,21 +25255,21 @@ public final void rule__LinewrapLocator__Group_0__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__LinewrapLocator__Group_0_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8055:1: rule__LinewrapLocator__Group_0_1__0 : rule__LinewrapLocator__Group_0_1__0__Impl rule__LinewrapLocator__Group_0_1__1 ;
+    // InternalFormat.g:8055:1: rule__LinewrapLocator__Group_0_1__0 : rule__LinewrapLocator__Group_0_1__0__Impl rule__LinewrapLocator__Group_0_1__1 ;
     public final void rule__LinewrapLocator__Group_0_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8059:1: ( rule__LinewrapLocator__Group_0_1__0__Impl rule__LinewrapLocator__Group_0_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8060:2: rule__LinewrapLocator__Group_0_1__0__Impl rule__LinewrapLocator__Group_0_1__1
+            // InternalFormat.g:8059:1: ( rule__LinewrapLocator__Group_0_1__0__Impl rule__LinewrapLocator__Group_0_1__1 )
+            // InternalFormat.g:8060:2: rule__LinewrapLocator__Group_0_1__0__Impl rule__LinewrapLocator__Group_0_1__1
             {
-            pushFollow(FOLLOW_rule__LinewrapLocator__Group_0_1__0__Impl_in_rule__LinewrapLocator__Group_0_1__017051);
+            pushFollow(FOLLOW_37);
             rule__LinewrapLocator__Group_0_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__LinewrapLocator__Group_0_1__1_in_rule__LinewrapLocator__Group_0_1__017054);
+            pushFollow(FOLLOW_2);
             rule__LinewrapLocator__Group_0_1__1();
 
             state._fsp--;
@@ -25293,22 +25293,22 @@ public final void rule__LinewrapLocator__Group_0_1__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__LinewrapLocator__Group_0_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8067:1: rule__LinewrapLocator__Group_0_1__0__Impl : ( 'linewrap' ) ;
+    // InternalFormat.g:8067:1: rule__LinewrapLocator__Group_0_1__0__Impl : ( 'linewrap' ) ;
     public final void rule__LinewrapLocator__Group_0_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8071:1: ( ( 'linewrap' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8072:1: ( 'linewrap' )
+            // InternalFormat.g:8071:1: ( ( 'linewrap' ) )
+            // InternalFormat.g:8072:1: ( 'linewrap' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8072:1: ( 'linewrap' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8073:1: 'linewrap'
+            // InternalFormat.g:8072:1: ( 'linewrap' )
+            // InternalFormat.g:8073:1: 'linewrap'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLinewrapLocatorAccess().getLinewrapKeyword_0_1_0()); 
             }
-            match(input,81,FOLLOW_81_in_rule__LinewrapLocator__Group_0_1__0__Impl17082); if (state.failed) return ;
+            match(input,81,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getLinewrapLocatorAccess().getLinewrapKeyword_0_1_0()); 
             }
@@ -25334,16 +25334,16 @@ public final void rule__LinewrapLocator__Group_0_1__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__LinewrapLocator__Group_0_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8086:1: rule__LinewrapLocator__Group_0_1__1 : rule__LinewrapLocator__Group_0_1__1__Impl ;
+    // InternalFormat.g:8086:1: rule__LinewrapLocator__Group_0_1__1 : rule__LinewrapLocator__Group_0_1__1__Impl ;
     public final void rule__LinewrapLocator__Group_0_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8090:1: ( rule__LinewrapLocator__Group_0_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8091:2: rule__LinewrapLocator__Group_0_1__1__Impl
+            // InternalFormat.g:8090:1: ( rule__LinewrapLocator__Group_0_1__1__Impl )
+            // InternalFormat.g:8091:2: rule__LinewrapLocator__Group_0_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__LinewrapLocator__Group_0_1__1__Impl_in_rule__LinewrapLocator__Group_0_1__117113);
+            pushFollow(FOLLOW_2);
             rule__LinewrapLocator__Group_0_1__1__Impl();
 
             state._fsp--;
@@ -25367,22 +25367,22 @@ public final void rule__LinewrapLocator__Group_0_1__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__LinewrapLocator__Group_0_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8097:1: rule__LinewrapLocator__Group_0_1__1__Impl : ( ( rule__LinewrapLocator__Alternatives_0_1_1 )? ) ;
+    // InternalFormat.g:8097:1: rule__LinewrapLocator__Group_0_1__1__Impl : ( ( rule__LinewrapLocator__Alternatives_0_1_1 )? ) ;
     public final void rule__LinewrapLocator__Group_0_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8101:1: ( ( ( rule__LinewrapLocator__Alternatives_0_1_1 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8102:1: ( ( rule__LinewrapLocator__Alternatives_0_1_1 )? )
+            // InternalFormat.g:8101:1: ( ( ( rule__LinewrapLocator__Alternatives_0_1_1 )? ) )
+            // InternalFormat.g:8102:1: ( ( rule__LinewrapLocator__Alternatives_0_1_1 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8102:1: ( ( rule__LinewrapLocator__Alternatives_0_1_1 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8103:1: ( rule__LinewrapLocator__Alternatives_0_1_1 )?
+            // InternalFormat.g:8102:1: ( ( rule__LinewrapLocator__Alternatives_0_1_1 )? )
+            // InternalFormat.g:8103:1: ( rule__LinewrapLocator__Alternatives_0_1_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLinewrapLocatorAccess().getAlternatives_0_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8104:1: ( rule__LinewrapLocator__Alternatives_0_1_1 )?
+            // InternalFormat.g:8104:1: ( rule__LinewrapLocator__Alternatives_0_1_1 )?
             int alt83=2;
             int LA83_0 = input.LA(1);
 
@@ -25391,9 +25391,9 @@ public final void rule__LinewrapLocator__Group_0_1__1__Impl() throws Recognition
             }
             switch (alt83) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8104:2: rule__LinewrapLocator__Alternatives_0_1_1
+                    // InternalFormat.g:8104:2: rule__LinewrapLocator__Alternatives_0_1_1
                     {
-                    pushFollow(FOLLOW_rule__LinewrapLocator__Alternatives_0_1_1_in_rule__LinewrapLocator__Group_0_1__1__Impl17140);
+                    pushFollow(FOLLOW_2);
                     rule__LinewrapLocator__Alternatives_0_1_1();
 
                     state._fsp--;
@@ -25429,21 +25429,21 @@ public final void rule__LinewrapLocator__Group_0_1__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__LinewrapLocator__Group_0_1_1_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8118:1: rule__LinewrapLocator__Group_0_1_1_1__0 : rule__LinewrapLocator__Group_0_1_1_1__0__Impl rule__LinewrapLocator__Group_0_1_1_1__1 ;
+    // InternalFormat.g:8118:1: rule__LinewrapLocator__Group_0_1_1_1__0 : rule__LinewrapLocator__Group_0_1_1_1__0__Impl rule__LinewrapLocator__Group_0_1_1_1__1 ;
     public final void rule__LinewrapLocator__Group_0_1_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8122:1: ( rule__LinewrapLocator__Group_0_1_1_1__0__Impl rule__LinewrapLocator__Group_0_1_1_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8123:2: rule__LinewrapLocator__Group_0_1_1_1__0__Impl rule__LinewrapLocator__Group_0_1_1_1__1
+            // InternalFormat.g:8122:1: ( rule__LinewrapLocator__Group_0_1_1_1__0__Impl rule__LinewrapLocator__Group_0_1_1_1__1 )
+            // InternalFormat.g:8123:2: rule__LinewrapLocator__Group_0_1_1_1__0__Impl rule__LinewrapLocator__Group_0_1_1_1__1
             {
-            pushFollow(FOLLOW_rule__LinewrapLocator__Group_0_1_1_1__0__Impl_in_rule__LinewrapLocator__Group_0_1_1_1__017175);
+            pushFollow(FOLLOW_37);
             rule__LinewrapLocator__Group_0_1_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__LinewrapLocator__Group_0_1_1_1__1_in_rule__LinewrapLocator__Group_0_1_1_1__017178);
+            pushFollow(FOLLOW_2);
             rule__LinewrapLocator__Group_0_1_1_1__1();
 
             state._fsp--;
@@ -25467,25 +25467,25 @@ public final void rule__LinewrapLocator__Group_0_1_1_1__0() throws RecognitionEx
 
 
     // $ANTLR start "rule__LinewrapLocator__Group_0_1_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8130:1: rule__LinewrapLocator__Group_0_1_1_1__0__Impl : ( ( rule__LinewrapLocator__MinimumAssignment_0_1_1_1_0 ) ) ;
+    // InternalFormat.g:8130:1: rule__LinewrapLocator__Group_0_1_1_1__0__Impl : ( ( rule__LinewrapLocator__MinimumAssignment_0_1_1_1_0 ) ) ;
     public final void rule__LinewrapLocator__Group_0_1_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8134:1: ( ( ( rule__LinewrapLocator__MinimumAssignment_0_1_1_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8135:1: ( ( rule__LinewrapLocator__MinimumAssignment_0_1_1_1_0 ) )
+            // InternalFormat.g:8134:1: ( ( ( rule__LinewrapLocator__MinimumAssignment_0_1_1_1_0 ) ) )
+            // InternalFormat.g:8135:1: ( ( rule__LinewrapLocator__MinimumAssignment_0_1_1_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8135:1: ( ( rule__LinewrapLocator__MinimumAssignment_0_1_1_1_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8136:1: ( rule__LinewrapLocator__MinimumAssignment_0_1_1_1_0 )
+            // InternalFormat.g:8135:1: ( ( rule__LinewrapLocator__MinimumAssignment_0_1_1_1_0 ) )
+            // InternalFormat.g:8136:1: ( rule__LinewrapLocator__MinimumAssignment_0_1_1_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLinewrapLocatorAccess().getMinimumAssignment_0_1_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8137:1: ( rule__LinewrapLocator__MinimumAssignment_0_1_1_1_0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8137:2: rule__LinewrapLocator__MinimumAssignment_0_1_1_1_0
+            // InternalFormat.g:8137:1: ( rule__LinewrapLocator__MinimumAssignment_0_1_1_1_0 )
+            // InternalFormat.g:8137:2: rule__LinewrapLocator__MinimumAssignment_0_1_1_1_0
             {
-            pushFollow(FOLLOW_rule__LinewrapLocator__MinimumAssignment_0_1_1_1_0_in_rule__LinewrapLocator__Group_0_1_1_1__0__Impl17205);
+            pushFollow(FOLLOW_2);
             rule__LinewrapLocator__MinimumAssignment_0_1_1_1_0();
 
             state._fsp--;
@@ -25518,21 +25518,21 @@ public final void rule__LinewrapLocator__Group_0_1_1_1__0__Impl() throws Recogni
 
 
     // $ANTLR start "rule__LinewrapLocator__Group_0_1_1_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8147:1: rule__LinewrapLocator__Group_0_1_1_1__1 : rule__LinewrapLocator__Group_0_1_1_1__1__Impl rule__LinewrapLocator__Group_0_1_1_1__2 ;
+    // InternalFormat.g:8147:1: rule__LinewrapLocator__Group_0_1_1_1__1 : rule__LinewrapLocator__Group_0_1_1_1__1__Impl rule__LinewrapLocator__Group_0_1_1_1__2 ;
     public final void rule__LinewrapLocator__Group_0_1_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8151:1: ( rule__LinewrapLocator__Group_0_1_1_1__1__Impl rule__LinewrapLocator__Group_0_1_1_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8152:2: rule__LinewrapLocator__Group_0_1_1_1__1__Impl rule__LinewrapLocator__Group_0_1_1_1__2
+            // InternalFormat.g:8151:1: ( rule__LinewrapLocator__Group_0_1_1_1__1__Impl rule__LinewrapLocator__Group_0_1_1_1__2 )
+            // InternalFormat.g:8152:2: rule__LinewrapLocator__Group_0_1_1_1__1__Impl rule__LinewrapLocator__Group_0_1_1_1__2
             {
-            pushFollow(FOLLOW_rule__LinewrapLocator__Group_0_1_1_1__1__Impl_in_rule__LinewrapLocator__Group_0_1_1_1__117235);
+            pushFollow(FOLLOW_37);
             rule__LinewrapLocator__Group_0_1_1_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__LinewrapLocator__Group_0_1_1_1__2_in_rule__LinewrapLocator__Group_0_1_1_1__117238);
+            pushFollow(FOLLOW_2);
             rule__LinewrapLocator__Group_0_1_1_1__2();
 
             state._fsp--;
@@ -25556,25 +25556,25 @@ public final void rule__LinewrapLocator__Group_0_1_1_1__1() throws RecognitionEx
 
 
     // $ANTLR start "rule__LinewrapLocator__Group_0_1_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8159:1: rule__LinewrapLocator__Group_0_1_1_1__1__Impl : ( ( rule__LinewrapLocator__DefaultAssignment_0_1_1_1_1 ) ) ;
+    // InternalFormat.g:8159:1: rule__LinewrapLocator__Group_0_1_1_1__1__Impl : ( ( rule__LinewrapLocator__DefaultAssignment_0_1_1_1_1 ) ) ;
     public final void rule__LinewrapLocator__Group_0_1_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8163:1: ( ( ( rule__LinewrapLocator__DefaultAssignment_0_1_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8164:1: ( ( rule__LinewrapLocator__DefaultAssignment_0_1_1_1_1 ) )
+            // InternalFormat.g:8163:1: ( ( ( rule__LinewrapLocator__DefaultAssignment_0_1_1_1_1 ) ) )
+            // InternalFormat.g:8164:1: ( ( rule__LinewrapLocator__DefaultAssignment_0_1_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8164:1: ( ( rule__LinewrapLocator__DefaultAssignment_0_1_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8165:1: ( rule__LinewrapLocator__DefaultAssignment_0_1_1_1_1 )
+            // InternalFormat.g:8164:1: ( ( rule__LinewrapLocator__DefaultAssignment_0_1_1_1_1 ) )
+            // InternalFormat.g:8165:1: ( rule__LinewrapLocator__DefaultAssignment_0_1_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLinewrapLocatorAccess().getDefaultAssignment_0_1_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8166:1: ( rule__LinewrapLocator__DefaultAssignment_0_1_1_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8166:2: rule__LinewrapLocator__DefaultAssignment_0_1_1_1_1
+            // InternalFormat.g:8166:1: ( rule__LinewrapLocator__DefaultAssignment_0_1_1_1_1 )
+            // InternalFormat.g:8166:2: rule__LinewrapLocator__DefaultAssignment_0_1_1_1_1
             {
-            pushFollow(FOLLOW_rule__LinewrapLocator__DefaultAssignment_0_1_1_1_1_in_rule__LinewrapLocator__Group_0_1_1_1__1__Impl17265);
+            pushFollow(FOLLOW_2);
             rule__LinewrapLocator__DefaultAssignment_0_1_1_1_1();
 
             state._fsp--;
@@ -25607,16 +25607,16 @@ public final void rule__LinewrapLocator__Group_0_1_1_1__1__Impl() throws Recogni
 
 
     // $ANTLR start "rule__LinewrapLocator__Group_0_1_1_1__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8176:1: rule__LinewrapLocator__Group_0_1_1_1__2 : rule__LinewrapLocator__Group_0_1_1_1__2__Impl ;
+    // InternalFormat.g:8176:1: rule__LinewrapLocator__Group_0_1_1_1__2 : rule__LinewrapLocator__Group_0_1_1_1__2__Impl ;
     public final void rule__LinewrapLocator__Group_0_1_1_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8180:1: ( rule__LinewrapLocator__Group_0_1_1_1__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8181:2: rule__LinewrapLocator__Group_0_1_1_1__2__Impl
+            // InternalFormat.g:8180:1: ( rule__LinewrapLocator__Group_0_1_1_1__2__Impl )
+            // InternalFormat.g:8181:2: rule__LinewrapLocator__Group_0_1_1_1__2__Impl
             {
-            pushFollow(FOLLOW_rule__LinewrapLocator__Group_0_1_1_1__2__Impl_in_rule__LinewrapLocator__Group_0_1_1_1__217295);
+            pushFollow(FOLLOW_2);
             rule__LinewrapLocator__Group_0_1_1_1__2__Impl();
 
             state._fsp--;
@@ -25640,25 +25640,25 @@ public final void rule__LinewrapLocator__Group_0_1_1_1__2() throws RecognitionEx
 
 
     // $ANTLR start "rule__LinewrapLocator__Group_0_1_1_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8187:1: rule__LinewrapLocator__Group_0_1_1_1__2__Impl : ( ( rule__LinewrapLocator__MaximumAssignment_0_1_1_1_2 ) ) ;
+    // InternalFormat.g:8187:1: rule__LinewrapLocator__Group_0_1_1_1__2__Impl : ( ( rule__LinewrapLocator__MaximumAssignment_0_1_1_1_2 ) ) ;
     public final void rule__LinewrapLocator__Group_0_1_1_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8191:1: ( ( ( rule__LinewrapLocator__MaximumAssignment_0_1_1_1_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8192:1: ( ( rule__LinewrapLocator__MaximumAssignment_0_1_1_1_2 ) )
+            // InternalFormat.g:8191:1: ( ( ( rule__LinewrapLocator__MaximumAssignment_0_1_1_1_2 ) ) )
+            // InternalFormat.g:8192:1: ( ( rule__LinewrapLocator__MaximumAssignment_0_1_1_1_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8192:1: ( ( rule__LinewrapLocator__MaximumAssignment_0_1_1_1_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8193:1: ( rule__LinewrapLocator__MaximumAssignment_0_1_1_1_2 )
+            // InternalFormat.g:8192:1: ( ( rule__LinewrapLocator__MaximumAssignment_0_1_1_1_2 ) )
+            // InternalFormat.g:8193:1: ( rule__LinewrapLocator__MaximumAssignment_0_1_1_1_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLinewrapLocatorAccess().getMaximumAssignment_0_1_1_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8194:1: ( rule__LinewrapLocator__MaximumAssignment_0_1_1_1_2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8194:2: rule__LinewrapLocator__MaximumAssignment_0_1_1_1_2
+            // InternalFormat.g:8194:1: ( rule__LinewrapLocator__MaximumAssignment_0_1_1_1_2 )
+            // InternalFormat.g:8194:2: rule__LinewrapLocator__MaximumAssignment_0_1_1_1_2
             {
-            pushFollow(FOLLOW_rule__LinewrapLocator__MaximumAssignment_0_1_1_1_2_in_rule__LinewrapLocator__Group_0_1_1_1__2__Impl17322);
+            pushFollow(FOLLOW_2);
             rule__LinewrapLocator__MaximumAssignment_0_1_1_1_2();
 
             state._fsp--;
@@ -25691,21 +25691,21 @@ public final void rule__LinewrapLocator__Group_0_1_1_1__2__Impl() throws Recogni
 
 
     // $ANTLR start "rule__ColumnLocator__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8210:1: rule__ColumnLocator__Group__0 : rule__ColumnLocator__Group__0__Impl rule__ColumnLocator__Group__1 ;
+    // InternalFormat.g:8210:1: rule__ColumnLocator__Group__0 : rule__ColumnLocator__Group__0__Impl rule__ColumnLocator__Group__1 ;
     public final void rule__ColumnLocator__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8214:1: ( rule__ColumnLocator__Group__0__Impl rule__ColumnLocator__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8215:2: rule__ColumnLocator__Group__0__Impl rule__ColumnLocator__Group__1
+            // InternalFormat.g:8214:1: ( rule__ColumnLocator__Group__0__Impl rule__ColumnLocator__Group__1 )
+            // InternalFormat.g:8215:2: rule__ColumnLocator__Group__0__Impl rule__ColumnLocator__Group__1
             {
-            pushFollow(FOLLOW_rule__ColumnLocator__Group__0__Impl_in_rule__ColumnLocator__Group__017358);
+            pushFollow(FOLLOW_39);
             rule__ColumnLocator__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ColumnLocator__Group__1_in_rule__ColumnLocator__Group__017361);
+            pushFollow(FOLLOW_2);
             rule__ColumnLocator__Group__1();
 
             state._fsp--;
@@ -25729,22 +25729,22 @@ public final void rule__ColumnLocator__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__ColumnLocator__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8222:1: rule__ColumnLocator__Group__0__Impl : ( 'column' ) ;
+    // InternalFormat.g:8222:1: rule__ColumnLocator__Group__0__Impl : ( 'column' ) ;
     public final void rule__ColumnLocator__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8226:1: ( ( 'column' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8227:1: ( 'column' )
+            // InternalFormat.g:8226:1: ( ( 'column' ) )
+            // InternalFormat.g:8227:1: ( 'column' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8227:1: ( 'column' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8228:1: 'column'
+            // InternalFormat.g:8227:1: ( 'column' )
+            // InternalFormat.g:8228:1: 'column'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getColumnLocatorAccess().getColumnKeyword_0()); 
             }
-            match(input,82,FOLLOW_82_in_rule__ColumnLocator__Group__0__Impl17389); if (state.failed) return ;
+            match(input,82,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getColumnLocatorAccess().getColumnKeyword_0()); 
             }
@@ -25770,21 +25770,21 @@ public final void rule__ColumnLocator__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ColumnLocator__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8241:1: rule__ColumnLocator__Group__1 : rule__ColumnLocator__Group__1__Impl rule__ColumnLocator__Group__2 ;
+    // InternalFormat.g:8241:1: rule__ColumnLocator__Group__1 : rule__ColumnLocator__Group__1__Impl rule__ColumnLocator__Group__2 ;
     public final void rule__ColumnLocator__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8245:1: ( rule__ColumnLocator__Group__1__Impl rule__ColumnLocator__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8246:2: rule__ColumnLocator__Group__1__Impl rule__ColumnLocator__Group__2
+            // InternalFormat.g:8245:1: ( rule__ColumnLocator__Group__1__Impl rule__ColumnLocator__Group__2 )
+            // InternalFormat.g:8246:2: rule__ColumnLocator__Group__1__Impl rule__ColumnLocator__Group__2
             {
-            pushFollow(FOLLOW_rule__ColumnLocator__Group__1__Impl_in_rule__ColumnLocator__Group__117420);
+            pushFollow(FOLLOW_39);
             rule__ColumnLocator__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ColumnLocator__Group__2_in_rule__ColumnLocator__Group__117423);
+            pushFollow(FOLLOW_2);
             rule__ColumnLocator__Group__2();
 
             state._fsp--;
@@ -25808,22 +25808,22 @@ public final void rule__ColumnLocator__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__ColumnLocator__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8253:1: rule__ColumnLocator__Group__1__Impl : ( ( rule__ColumnLocator__FixedAssignment_1 )? ) ;
+    // InternalFormat.g:8253:1: rule__ColumnLocator__Group__1__Impl : ( ( rule__ColumnLocator__FixedAssignment_1 )? ) ;
     public final void rule__ColumnLocator__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8257:1: ( ( ( rule__ColumnLocator__FixedAssignment_1 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8258:1: ( ( rule__ColumnLocator__FixedAssignment_1 )? )
+            // InternalFormat.g:8257:1: ( ( ( rule__ColumnLocator__FixedAssignment_1 )? ) )
+            // InternalFormat.g:8258:1: ( ( rule__ColumnLocator__FixedAssignment_1 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8258:1: ( ( rule__ColumnLocator__FixedAssignment_1 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8259:1: ( rule__ColumnLocator__FixedAssignment_1 )?
+            // InternalFormat.g:8258:1: ( ( rule__ColumnLocator__FixedAssignment_1 )? )
+            // InternalFormat.g:8259:1: ( rule__ColumnLocator__FixedAssignment_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getColumnLocatorAccess().getFixedAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8260:1: ( rule__ColumnLocator__FixedAssignment_1 )?
+            // InternalFormat.g:8260:1: ( rule__ColumnLocator__FixedAssignment_1 )?
             int alt84=2;
             int LA84_0 = input.LA(1);
 
@@ -25832,9 +25832,9 @@ public final void rule__ColumnLocator__Group__1__Impl() throws RecognitionExcept
             }
             switch (alt84) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8260:2: rule__ColumnLocator__FixedAssignment_1
+                    // InternalFormat.g:8260:2: rule__ColumnLocator__FixedAssignment_1
                     {
-                    pushFollow(FOLLOW_rule__ColumnLocator__FixedAssignment_1_in_rule__ColumnLocator__Group__1__Impl17450);
+                    pushFollow(FOLLOW_2);
                     rule__ColumnLocator__FixedAssignment_1();
 
                     state._fsp--;
@@ -25870,21 +25870,21 @@ public final void rule__ColumnLocator__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ColumnLocator__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8270:1: rule__ColumnLocator__Group__2 : rule__ColumnLocator__Group__2__Impl rule__ColumnLocator__Group__3 ;
+    // InternalFormat.g:8270:1: rule__ColumnLocator__Group__2 : rule__ColumnLocator__Group__2__Impl rule__ColumnLocator__Group__3 ;
     public final void rule__ColumnLocator__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8274:1: ( rule__ColumnLocator__Group__2__Impl rule__ColumnLocator__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8275:2: rule__ColumnLocator__Group__2__Impl rule__ColumnLocator__Group__3
+            // InternalFormat.g:8274:1: ( rule__ColumnLocator__Group__2__Impl rule__ColumnLocator__Group__3 )
+            // InternalFormat.g:8275:2: rule__ColumnLocator__Group__2__Impl rule__ColumnLocator__Group__3
             {
-            pushFollow(FOLLOW_rule__ColumnLocator__Group__2__Impl_in_rule__ColumnLocator__Group__217481);
+            pushFollow(FOLLOW_40);
             rule__ColumnLocator__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ColumnLocator__Group__3_in_rule__ColumnLocator__Group__217484);
+            pushFollow(FOLLOW_2);
             rule__ColumnLocator__Group__3();
 
             state._fsp--;
@@ -25908,25 +25908,25 @@ public final void rule__ColumnLocator__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__ColumnLocator__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8282:1: rule__ColumnLocator__Group__2__Impl : ( ( rule__ColumnLocator__Alternatives_2 ) ) ;
+    // InternalFormat.g:8282:1: rule__ColumnLocator__Group__2__Impl : ( ( rule__ColumnLocator__Alternatives_2 ) ) ;
     public final void rule__ColumnLocator__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8286:1: ( ( ( rule__ColumnLocator__Alternatives_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8287:1: ( ( rule__ColumnLocator__Alternatives_2 ) )
+            // InternalFormat.g:8286:1: ( ( ( rule__ColumnLocator__Alternatives_2 ) ) )
+            // InternalFormat.g:8287:1: ( ( rule__ColumnLocator__Alternatives_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8287:1: ( ( rule__ColumnLocator__Alternatives_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8288:1: ( rule__ColumnLocator__Alternatives_2 )
+            // InternalFormat.g:8287:1: ( ( rule__ColumnLocator__Alternatives_2 ) )
+            // InternalFormat.g:8288:1: ( rule__ColumnLocator__Alternatives_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getColumnLocatorAccess().getAlternatives_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8289:1: ( rule__ColumnLocator__Alternatives_2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8289:2: rule__ColumnLocator__Alternatives_2
+            // InternalFormat.g:8289:1: ( rule__ColumnLocator__Alternatives_2 )
+            // InternalFormat.g:8289:2: rule__ColumnLocator__Alternatives_2
             {
-            pushFollow(FOLLOW_rule__ColumnLocator__Alternatives_2_in_rule__ColumnLocator__Group__2__Impl17511);
+            pushFollow(FOLLOW_2);
             rule__ColumnLocator__Alternatives_2();
 
             state._fsp--;
@@ -25959,21 +25959,21 @@ public final void rule__ColumnLocator__Group__2__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ColumnLocator__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8299:1: rule__ColumnLocator__Group__3 : rule__ColumnLocator__Group__3__Impl rule__ColumnLocator__Group__4 ;
+    // InternalFormat.g:8299:1: rule__ColumnLocator__Group__3 : rule__ColumnLocator__Group__3__Impl rule__ColumnLocator__Group__4 ;
     public final void rule__ColumnLocator__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8303:1: ( rule__ColumnLocator__Group__3__Impl rule__ColumnLocator__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8304:2: rule__ColumnLocator__Group__3__Impl rule__ColumnLocator__Group__4
+            // InternalFormat.g:8303:1: ( rule__ColumnLocator__Group__3__Impl rule__ColumnLocator__Group__4 )
+            // InternalFormat.g:8304:2: rule__ColumnLocator__Group__3__Impl rule__ColumnLocator__Group__4
             {
-            pushFollow(FOLLOW_rule__ColumnLocator__Group__3__Impl_in_rule__ColumnLocator__Group__317541);
+            pushFollow(FOLLOW_40);
             rule__ColumnLocator__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ColumnLocator__Group__4_in_rule__ColumnLocator__Group__317544);
+            pushFollow(FOLLOW_2);
             rule__ColumnLocator__Group__4();
 
             state._fsp--;
@@ -25997,22 +25997,22 @@ public final void rule__ColumnLocator__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__ColumnLocator__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8311:1: rule__ColumnLocator__Group__3__Impl : ( ( rule__ColumnLocator__RelativeAssignment_3 )? ) ;
+    // InternalFormat.g:8311:1: rule__ColumnLocator__Group__3__Impl : ( ( rule__ColumnLocator__RelativeAssignment_3 )? ) ;
     public final void rule__ColumnLocator__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8315:1: ( ( ( rule__ColumnLocator__RelativeAssignment_3 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8316:1: ( ( rule__ColumnLocator__RelativeAssignment_3 )? )
+            // InternalFormat.g:8315:1: ( ( ( rule__ColumnLocator__RelativeAssignment_3 )? ) )
+            // InternalFormat.g:8316:1: ( ( rule__ColumnLocator__RelativeAssignment_3 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8316:1: ( ( rule__ColumnLocator__RelativeAssignment_3 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8317:1: ( rule__ColumnLocator__RelativeAssignment_3 )?
+            // InternalFormat.g:8316:1: ( ( rule__ColumnLocator__RelativeAssignment_3 )? )
+            // InternalFormat.g:8317:1: ( rule__ColumnLocator__RelativeAssignment_3 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getColumnLocatorAccess().getRelativeAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8318:1: ( rule__ColumnLocator__RelativeAssignment_3 )?
+            // InternalFormat.g:8318:1: ( rule__ColumnLocator__RelativeAssignment_3 )?
             int alt85=2;
             int LA85_0 = input.LA(1);
 
@@ -26021,9 +26021,9 @@ public final void rule__ColumnLocator__Group__3__Impl() throws RecognitionExcept
             }
             switch (alt85) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8318:2: rule__ColumnLocator__RelativeAssignment_3
+                    // InternalFormat.g:8318:2: rule__ColumnLocator__RelativeAssignment_3
                     {
-                    pushFollow(FOLLOW_rule__ColumnLocator__RelativeAssignment_3_in_rule__ColumnLocator__Group__3__Impl17571);
+                    pushFollow(FOLLOW_2);
                     rule__ColumnLocator__RelativeAssignment_3();
 
                     state._fsp--;
@@ -26059,16 +26059,16 @@ public final void rule__ColumnLocator__Group__3__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ColumnLocator__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8328:1: rule__ColumnLocator__Group__4 : rule__ColumnLocator__Group__4__Impl ;
+    // InternalFormat.g:8328:1: rule__ColumnLocator__Group__4 : rule__ColumnLocator__Group__4__Impl ;
     public final void rule__ColumnLocator__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8332:1: ( rule__ColumnLocator__Group__4__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8333:2: rule__ColumnLocator__Group__4__Impl
+            // InternalFormat.g:8332:1: ( rule__ColumnLocator__Group__4__Impl )
+            // InternalFormat.g:8333:2: rule__ColumnLocator__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__ColumnLocator__Group__4__Impl_in_rule__ColumnLocator__Group__417602);
+            pushFollow(FOLLOW_2);
             rule__ColumnLocator__Group__4__Impl();
 
             state._fsp--;
@@ -26092,22 +26092,22 @@ public final void rule__ColumnLocator__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__ColumnLocator__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8339:1: rule__ColumnLocator__Group__4__Impl : ( ( rule__ColumnLocator__NobreakAssignment_4 )? ) ;
+    // InternalFormat.g:8339:1: rule__ColumnLocator__Group__4__Impl : ( ( rule__ColumnLocator__NobreakAssignment_4 )? ) ;
     public final void rule__ColumnLocator__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8343:1: ( ( ( rule__ColumnLocator__NobreakAssignment_4 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8344:1: ( ( rule__ColumnLocator__NobreakAssignment_4 )? )
+            // InternalFormat.g:8343:1: ( ( ( rule__ColumnLocator__NobreakAssignment_4 )? ) )
+            // InternalFormat.g:8344:1: ( ( rule__ColumnLocator__NobreakAssignment_4 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8344:1: ( ( rule__ColumnLocator__NobreakAssignment_4 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8345:1: ( rule__ColumnLocator__NobreakAssignment_4 )?
+            // InternalFormat.g:8344:1: ( ( rule__ColumnLocator__NobreakAssignment_4 )? )
+            // InternalFormat.g:8345:1: ( rule__ColumnLocator__NobreakAssignment_4 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getColumnLocatorAccess().getNobreakAssignment_4()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8346:1: ( rule__ColumnLocator__NobreakAssignment_4 )?
+            // InternalFormat.g:8346:1: ( rule__ColumnLocator__NobreakAssignment_4 )?
             int alt86=2;
             int LA86_0 = input.LA(1);
 
@@ -26116,9 +26116,9 @@ public final void rule__ColumnLocator__Group__4__Impl() throws RecognitionExcept
             }
             switch (alt86) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8346:2: rule__ColumnLocator__NobreakAssignment_4
+                    // InternalFormat.g:8346:2: rule__ColumnLocator__NobreakAssignment_4
                     {
-                    pushFollow(FOLLOW_rule__ColumnLocator__NobreakAssignment_4_in_rule__ColumnLocator__Group__4__Impl17629);
+                    pushFollow(FOLLOW_2);
                     rule__ColumnLocator__NobreakAssignment_4();
 
                     state._fsp--;
@@ -26154,21 +26154,21 @@ public final void rule__ColumnLocator__Group__4__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__OffsetLocator__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8366:1: rule__OffsetLocator__Group__0 : rule__OffsetLocator__Group__0__Impl rule__OffsetLocator__Group__1 ;
+    // InternalFormat.g:8366:1: rule__OffsetLocator__Group__0 : rule__OffsetLocator__Group__0__Impl rule__OffsetLocator__Group__1 ;
     public final void rule__OffsetLocator__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8370:1: ( rule__OffsetLocator__Group__0__Impl rule__OffsetLocator__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8371:2: rule__OffsetLocator__Group__0__Impl rule__OffsetLocator__Group__1
+            // InternalFormat.g:8370:1: ( rule__OffsetLocator__Group__0__Impl rule__OffsetLocator__Group__1 )
+            // InternalFormat.g:8371:2: rule__OffsetLocator__Group__0__Impl rule__OffsetLocator__Group__1
             {
-            pushFollow(FOLLOW_rule__OffsetLocator__Group__0__Impl_in_rule__OffsetLocator__Group__017670);
+            pushFollow(FOLLOW_41);
             rule__OffsetLocator__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OffsetLocator__Group__1_in_rule__OffsetLocator__Group__017673);
+            pushFollow(FOLLOW_2);
             rule__OffsetLocator__Group__1();
 
             state._fsp--;
@@ -26192,22 +26192,22 @@ public final void rule__OffsetLocator__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__OffsetLocator__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8378:1: rule__OffsetLocator__Group__0__Impl : ( 'offset' ) ;
+    // InternalFormat.g:8378:1: rule__OffsetLocator__Group__0__Impl : ( 'offset' ) ;
     public final void rule__OffsetLocator__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8382:1: ( ( 'offset' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8383:1: ( 'offset' )
+            // InternalFormat.g:8382:1: ( ( 'offset' ) )
+            // InternalFormat.g:8383:1: ( 'offset' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8383:1: ( 'offset' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8384:1: 'offset'
+            // InternalFormat.g:8383:1: ( 'offset' )
+            // InternalFormat.g:8384:1: 'offset'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOffsetLocatorAccess().getOffsetKeyword_0()); 
             }
-            match(input,83,FOLLOW_83_in_rule__OffsetLocator__Group__0__Impl17701); if (state.failed) return ;
+            match(input,83,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOffsetLocatorAccess().getOffsetKeyword_0()); 
             }
@@ -26233,21 +26233,21 @@ public final void rule__OffsetLocator__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__OffsetLocator__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8397:1: rule__OffsetLocator__Group__1 : rule__OffsetLocator__Group__1__Impl rule__OffsetLocator__Group__2 ;
+    // InternalFormat.g:8397:1: rule__OffsetLocator__Group__1 : rule__OffsetLocator__Group__1__Impl rule__OffsetLocator__Group__2 ;
     public final void rule__OffsetLocator__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8401:1: ( rule__OffsetLocator__Group__1__Impl rule__OffsetLocator__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8402:2: rule__OffsetLocator__Group__1__Impl rule__OffsetLocator__Group__2
+            // InternalFormat.g:8401:1: ( rule__OffsetLocator__Group__1__Impl rule__OffsetLocator__Group__2 )
+            // InternalFormat.g:8402:2: rule__OffsetLocator__Group__1__Impl rule__OffsetLocator__Group__2
             {
-            pushFollow(FOLLOW_rule__OffsetLocator__Group__1__Impl_in_rule__OffsetLocator__Group__117732);
+            pushFollow(FOLLOW_41);
             rule__OffsetLocator__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OffsetLocator__Group__2_in_rule__OffsetLocator__Group__117735);
+            pushFollow(FOLLOW_2);
             rule__OffsetLocator__Group__2();
 
             state._fsp--;
@@ -26271,22 +26271,22 @@ public final void rule__OffsetLocator__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__OffsetLocator__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8409:1: rule__OffsetLocator__Group__1__Impl : ( ( rule__OffsetLocator__FixedAssignment_1 )? ) ;
+    // InternalFormat.g:8409:1: rule__OffsetLocator__Group__1__Impl : ( ( rule__OffsetLocator__FixedAssignment_1 )? ) ;
     public final void rule__OffsetLocator__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8413:1: ( ( ( rule__OffsetLocator__FixedAssignment_1 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8414:1: ( ( rule__OffsetLocator__FixedAssignment_1 )? )
+            // InternalFormat.g:8413:1: ( ( ( rule__OffsetLocator__FixedAssignment_1 )? ) )
+            // InternalFormat.g:8414:1: ( ( rule__OffsetLocator__FixedAssignment_1 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8414:1: ( ( rule__OffsetLocator__FixedAssignment_1 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8415:1: ( rule__OffsetLocator__FixedAssignment_1 )?
+            // InternalFormat.g:8414:1: ( ( rule__OffsetLocator__FixedAssignment_1 )? )
+            // InternalFormat.g:8415:1: ( rule__OffsetLocator__FixedAssignment_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOffsetLocatorAccess().getFixedAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8416:1: ( rule__OffsetLocator__FixedAssignment_1 )?
+            // InternalFormat.g:8416:1: ( rule__OffsetLocator__FixedAssignment_1 )?
             int alt87=2;
             int LA87_0 = input.LA(1);
 
@@ -26295,9 +26295,9 @@ public final void rule__OffsetLocator__Group__1__Impl() throws RecognitionExcept
             }
             switch (alt87) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8416:2: rule__OffsetLocator__FixedAssignment_1
+                    // InternalFormat.g:8416:2: rule__OffsetLocator__FixedAssignment_1
                     {
-                    pushFollow(FOLLOW_rule__OffsetLocator__FixedAssignment_1_in_rule__OffsetLocator__Group__1__Impl17762);
+                    pushFollow(FOLLOW_2);
                     rule__OffsetLocator__FixedAssignment_1();
 
                     state._fsp--;
@@ -26333,21 +26333,21 @@ public final void rule__OffsetLocator__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__OffsetLocator__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8426:1: rule__OffsetLocator__Group__2 : rule__OffsetLocator__Group__2__Impl rule__OffsetLocator__Group__3 ;
+    // InternalFormat.g:8426:1: rule__OffsetLocator__Group__2 : rule__OffsetLocator__Group__2__Impl rule__OffsetLocator__Group__3 ;
     public final void rule__OffsetLocator__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8430:1: ( rule__OffsetLocator__Group__2__Impl rule__OffsetLocator__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8431:2: rule__OffsetLocator__Group__2__Impl rule__OffsetLocator__Group__3
+            // InternalFormat.g:8430:1: ( rule__OffsetLocator__Group__2__Impl rule__OffsetLocator__Group__3 )
+            // InternalFormat.g:8431:2: rule__OffsetLocator__Group__2__Impl rule__OffsetLocator__Group__3
             {
-            pushFollow(FOLLOW_rule__OffsetLocator__Group__2__Impl_in_rule__OffsetLocator__Group__217793);
+            pushFollow(FOLLOW_42);
             rule__OffsetLocator__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OffsetLocator__Group__3_in_rule__OffsetLocator__Group__217796);
+            pushFollow(FOLLOW_2);
             rule__OffsetLocator__Group__3();
 
             state._fsp--;
@@ -26371,25 +26371,25 @@ public final void rule__OffsetLocator__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__OffsetLocator__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8438:1: rule__OffsetLocator__Group__2__Impl : ( ( rule__OffsetLocator__ValueAssignment_2 ) ) ;
+    // InternalFormat.g:8438:1: rule__OffsetLocator__Group__2__Impl : ( ( rule__OffsetLocator__ValueAssignment_2 ) ) ;
     public final void rule__OffsetLocator__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8442:1: ( ( ( rule__OffsetLocator__ValueAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8443:1: ( ( rule__OffsetLocator__ValueAssignment_2 ) )
+            // InternalFormat.g:8442:1: ( ( ( rule__OffsetLocator__ValueAssignment_2 ) ) )
+            // InternalFormat.g:8443:1: ( ( rule__OffsetLocator__ValueAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8443:1: ( ( rule__OffsetLocator__ValueAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8444:1: ( rule__OffsetLocator__ValueAssignment_2 )
+            // InternalFormat.g:8443:1: ( ( rule__OffsetLocator__ValueAssignment_2 ) )
+            // InternalFormat.g:8444:1: ( rule__OffsetLocator__ValueAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOffsetLocatorAccess().getValueAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8445:1: ( rule__OffsetLocator__ValueAssignment_2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8445:2: rule__OffsetLocator__ValueAssignment_2
+            // InternalFormat.g:8445:1: ( rule__OffsetLocator__ValueAssignment_2 )
+            // InternalFormat.g:8445:2: rule__OffsetLocator__ValueAssignment_2
             {
-            pushFollow(FOLLOW_rule__OffsetLocator__ValueAssignment_2_in_rule__OffsetLocator__Group__2__Impl17823);
+            pushFollow(FOLLOW_2);
             rule__OffsetLocator__ValueAssignment_2();
 
             state._fsp--;
@@ -26422,16 +26422,16 @@ public final void rule__OffsetLocator__Group__2__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__OffsetLocator__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8455:1: rule__OffsetLocator__Group__3 : rule__OffsetLocator__Group__3__Impl ;
+    // InternalFormat.g:8455:1: rule__OffsetLocator__Group__3 : rule__OffsetLocator__Group__3__Impl ;
     public final void rule__OffsetLocator__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8459:1: ( rule__OffsetLocator__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8460:2: rule__OffsetLocator__Group__3__Impl
+            // InternalFormat.g:8459:1: ( rule__OffsetLocator__Group__3__Impl )
+            // InternalFormat.g:8460:2: rule__OffsetLocator__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__OffsetLocator__Group__3__Impl_in_rule__OffsetLocator__Group__317853);
+            pushFollow(FOLLOW_2);
             rule__OffsetLocator__Group__3__Impl();
 
             state._fsp--;
@@ -26455,22 +26455,22 @@ public final void rule__OffsetLocator__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__OffsetLocator__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8466:1: rule__OffsetLocator__Group__3__Impl : ( ( rule__OffsetLocator__NobreakAssignment_3 )? ) ;
+    // InternalFormat.g:8466:1: rule__OffsetLocator__Group__3__Impl : ( ( rule__OffsetLocator__NobreakAssignment_3 )? ) ;
     public final void rule__OffsetLocator__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8470:1: ( ( ( rule__OffsetLocator__NobreakAssignment_3 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8471:1: ( ( rule__OffsetLocator__NobreakAssignment_3 )? )
+            // InternalFormat.g:8470:1: ( ( ( rule__OffsetLocator__NobreakAssignment_3 )? ) )
+            // InternalFormat.g:8471:1: ( ( rule__OffsetLocator__NobreakAssignment_3 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8471:1: ( ( rule__OffsetLocator__NobreakAssignment_3 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8472:1: ( rule__OffsetLocator__NobreakAssignment_3 )?
+            // InternalFormat.g:8471:1: ( ( rule__OffsetLocator__NobreakAssignment_3 )? )
+            // InternalFormat.g:8472:1: ( rule__OffsetLocator__NobreakAssignment_3 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOffsetLocatorAccess().getNobreakAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8473:1: ( rule__OffsetLocator__NobreakAssignment_3 )?
+            // InternalFormat.g:8473:1: ( rule__OffsetLocator__NobreakAssignment_3 )?
             int alt88=2;
             int LA88_0 = input.LA(1);
 
@@ -26479,9 +26479,9 @@ public final void rule__OffsetLocator__Group__3__Impl() throws RecognitionExcept
             }
             switch (alt88) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8473:2: rule__OffsetLocator__NobreakAssignment_3
+                    // InternalFormat.g:8473:2: rule__OffsetLocator__NobreakAssignment_3
                     {
-                    pushFollow(FOLLOW_rule__OffsetLocator__NobreakAssignment_3_in_rule__OffsetLocator__Group__3__Impl17880);
+                    pushFollow(FOLLOW_2);
                     rule__OffsetLocator__NobreakAssignment_3();
 
                     state._fsp--;
@@ -26517,21 +26517,21 @@ public final void rule__OffsetLocator__Group__3__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__IndentLocator__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8491:1: rule__IndentLocator__Group__0 : rule__IndentLocator__Group__0__Impl rule__IndentLocator__Group__1 ;
+    // InternalFormat.g:8491:1: rule__IndentLocator__Group__0 : rule__IndentLocator__Group__0__Impl rule__IndentLocator__Group__1 ;
     public final void rule__IndentLocator__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8495:1: ( rule__IndentLocator__Group__0__Impl rule__IndentLocator__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8496:2: rule__IndentLocator__Group__0__Impl rule__IndentLocator__Group__1
+            // InternalFormat.g:8495:1: ( rule__IndentLocator__Group__0__Impl rule__IndentLocator__Group__1 )
+            // InternalFormat.g:8496:2: rule__IndentLocator__Group__0__Impl rule__IndentLocator__Group__1
             {
-            pushFollow(FOLLOW_rule__IndentLocator__Group__0__Impl_in_rule__IndentLocator__Group__017919);
+            pushFollow(FOLLOW_43);
             rule__IndentLocator__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__IndentLocator__Group__1_in_rule__IndentLocator__Group__017922);
+            pushFollow(FOLLOW_2);
             rule__IndentLocator__Group__1();
 
             state._fsp--;
@@ -26555,23 +26555,23 @@ public final void rule__IndentLocator__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__IndentLocator__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8503:1: rule__IndentLocator__Group__0__Impl : ( () ) ;
+    // InternalFormat.g:8503:1: rule__IndentLocator__Group__0__Impl : ( () ) ;
     public final void rule__IndentLocator__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8507:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8508:1: ( () )
+            // InternalFormat.g:8507:1: ( ( () ) )
+            // InternalFormat.g:8508:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8508:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8509:1: ()
+            // InternalFormat.g:8508:1: ( () )
+            // InternalFormat.g:8509:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIndentLocatorAccess().getIndentLocatorAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8510:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8512:1: 
+            // InternalFormat.g:8510:1: ()
+            // InternalFormat.g:8512:1: 
             {
             }
 
@@ -26596,21 +26596,21 @@ public final void rule__IndentLocator__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__IndentLocator__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8522:1: rule__IndentLocator__Group__1 : rule__IndentLocator__Group__1__Impl rule__IndentLocator__Group__2 ;
+    // InternalFormat.g:8522:1: rule__IndentLocator__Group__1 : rule__IndentLocator__Group__1__Impl rule__IndentLocator__Group__2 ;
     public final void rule__IndentLocator__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8526:1: ( rule__IndentLocator__Group__1__Impl rule__IndentLocator__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8527:2: rule__IndentLocator__Group__1__Impl rule__IndentLocator__Group__2
+            // InternalFormat.g:8526:1: ( rule__IndentLocator__Group__1__Impl rule__IndentLocator__Group__2 )
+            // InternalFormat.g:8527:2: rule__IndentLocator__Group__1__Impl rule__IndentLocator__Group__2
             {
-            pushFollow(FOLLOW_rule__IndentLocator__Group__1__Impl_in_rule__IndentLocator__Group__117980);
+            pushFollow(FOLLOW_44);
             rule__IndentLocator__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__IndentLocator__Group__2_in_rule__IndentLocator__Group__117983);
+            pushFollow(FOLLOW_2);
             rule__IndentLocator__Group__2();
 
             state._fsp--;
@@ -26634,25 +26634,25 @@ public final void rule__IndentLocator__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__IndentLocator__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8534:1: rule__IndentLocator__Group__1__Impl : ( ( rule__IndentLocator__Alternatives_1 ) ) ;
+    // InternalFormat.g:8534:1: rule__IndentLocator__Group__1__Impl : ( ( rule__IndentLocator__Alternatives_1 ) ) ;
     public final void rule__IndentLocator__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8538:1: ( ( ( rule__IndentLocator__Alternatives_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8539:1: ( ( rule__IndentLocator__Alternatives_1 ) )
+            // InternalFormat.g:8538:1: ( ( ( rule__IndentLocator__Alternatives_1 ) ) )
+            // InternalFormat.g:8539:1: ( ( rule__IndentLocator__Alternatives_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8539:1: ( ( rule__IndentLocator__Alternatives_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8540:1: ( rule__IndentLocator__Alternatives_1 )
+            // InternalFormat.g:8539:1: ( ( rule__IndentLocator__Alternatives_1 ) )
+            // InternalFormat.g:8540:1: ( rule__IndentLocator__Alternatives_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIndentLocatorAccess().getAlternatives_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8541:1: ( rule__IndentLocator__Alternatives_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8541:2: rule__IndentLocator__Alternatives_1
+            // InternalFormat.g:8541:1: ( rule__IndentLocator__Alternatives_1 )
+            // InternalFormat.g:8541:2: rule__IndentLocator__Alternatives_1
             {
-            pushFollow(FOLLOW_rule__IndentLocator__Alternatives_1_in_rule__IndentLocator__Group__1__Impl18010);
+            pushFollow(FOLLOW_2);
             rule__IndentLocator__Alternatives_1();
 
             state._fsp--;
@@ -26685,16 +26685,16 @@ public final void rule__IndentLocator__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__IndentLocator__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8551:1: rule__IndentLocator__Group__2 : rule__IndentLocator__Group__2__Impl ;
+    // InternalFormat.g:8551:1: rule__IndentLocator__Group__2 : rule__IndentLocator__Group__2__Impl ;
     public final void rule__IndentLocator__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8555:1: ( rule__IndentLocator__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8556:2: rule__IndentLocator__Group__2__Impl
+            // InternalFormat.g:8555:1: ( rule__IndentLocator__Group__2__Impl )
+            // InternalFormat.g:8556:2: rule__IndentLocator__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__IndentLocator__Group__2__Impl_in_rule__IndentLocator__Group__218040);
+            pushFollow(FOLLOW_2);
             rule__IndentLocator__Group__2__Impl();
 
             state._fsp--;
@@ -26718,22 +26718,22 @@ public final void rule__IndentLocator__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__IndentLocator__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8562:1: rule__IndentLocator__Group__2__Impl : ( ( rule__IndentLocator__Alternatives_2 )? ) ;
+    // InternalFormat.g:8562:1: rule__IndentLocator__Group__2__Impl : ( ( rule__IndentLocator__Alternatives_2 )? ) ;
     public final void rule__IndentLocator__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8566:1: ( ( ( rule__IndentLocator__Alternatives_2 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8567:1: ( ( rule__IndentLocator__Alternatives_2 )? )
+            // InternalFormat.g:8566:1: ( ( ( rule__IndentLocator__Alternatives_2 )? ) )
+            // InternalFormat.g:8567:1: ( ( rule__IndentLocator__Alternatives_2 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8567:1: ( ( rule__IndentLocator__Alternatives_2 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8568:1: ( rule__IndentLocator__Alternatives_2 )?
+            // InternalFormat.g:8567:1: ( ( rule__IndentLocator__Alternatives_2 )? )
+            // InternalFormat.g:8568:1: ( rule__IndentLocator__Alternatives_2 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIndentLocatorAccess().getAlternatives_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8569:1: ( rule__IndentLocator__Alternatives_2 )?
+            // InternalFormat.g:8569:1: ( rule__IndentLocator__Alternatives_2 )?
             int alt89=2;
             int LA89_0 = input.LA(1);
 
@@ -26742,9 +26742,9 @@ public final void rule__IndentLocator__Group__2__Impl() throws RecognitionExcept
             }
             switch (alt89) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8569:2: rule__IndentLocator__Alternatives_2
+                    // InternalFormat.g:8569:2: rule__IndentLocator__Alternatives_2
                     {
-                    pushFollow(FOLLOW_rule__IndentLocator__Alternatives_2_in_rule__IndentLocator__Group__2__Impl18067);
+                    pushFollow(FOLLOW_2);
                     rule__IndentLocator__Alternatives_2();
 
                     state._fsp--;
@@ -26780,21 +26780,21 @@ public final void rule__IndentLocator__Group__2__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ParameterizedIdentifier__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8585:1: rule__ParameterizedIdentifier__Group__0 : rule__ParameterizedIdentifier__Group__0__Impl rule__ParameterizedIdentifier__Group__1 ;
+    // InternalFormat.g:8585:1: rule__ParameterizedIdentifier__Group__0 : rule__ParameterizedIdentifier__Group__0__Impl rule__ParameterizedIdentifier__Group__1 ;
     public final void rule__ParameterizedIdentifier__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8589:1: ( rule__ParameterizedIdentifier__Group__0__Impl rule__ParameterizedIdentifier__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8590:2: rule__ParameterizedIdentifier__Group__0__Impl rule__ParameterizedIdentifier__Group__1
+            // InternalFormat.g:8589:1: ( rule__ParameterizedIdentifier__Group__0__Impl rule__ParameterizedIdentifier__Group__1 )
+            // InternalFormat.g:8590:2: rule__ParameterizedIdentifier__Group__0__Impl rule__ParameterizedIdentifier__Group__1
             {
-            pushFollow(FOLLOW_rule__ParameterizedIdentifier__Group__0__Impl_in_rule__ParameterizedIdentifier__Group__018104);
+            pushFollow(FOLLOW_45);
             rule__ParameterizedIdentifier__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ParameterizedIdentifier__Group__1_in_rule__ParameterizedIdentifier__Group__018107);
+            pushFollow(FOLLOW_2);
             rule__ParameterizedIdentifier__Group__1();
 
             state._fsp--;
@@ -26818,22 +26818,22 @@ public final void rule__ParameterizedIdentifier__Group__0() throws RecognitionEx
 
 
     // $ANTLR start "rule__ParameterizedIdentifier__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8597:1: rule__ParameterizedIdentifier__Group__0__Impl : ( ruleIdentifier ) ;
+    // InternalFormat.g:8597:1: rule__ParameterizedIdentifier__Group__0__Impl : ( ruleIdentifier ) ;
     public final void rule__ParameterizedIdentifier__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8601:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8602:1: ( ruleIdentifier )
+            // InternalFormat.g:8601:1: ( ( ruleIdentifier ) )
+            // InternalFormat.g:8602:1: ( ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8602:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8603:1: ruleIdentifier
+            // InternalFormat.g:8602:1: ( ruleIdentifier )
+            // InternalFormat.g:8603:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getParameterizedIdentifierAccess().getIdentifierParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__ParameterizedIdentifier__Group__0__Impl18134);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -26863,16 +26863,16 @@ public final void rule__ParameterizedIdentifier__Group__0__Impl() throws Recogni
 
 
     // $ANTLR start "rule__ParameterizedIdentifier__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8614:1: rule__ParameterizedIdentifier__Group__1 : rule__ParameterizedIdentifier__Group__1__Impl ;
+    // InternalFormat.g:8614:1: rule__ParameterizedIdentifier__Group__1 : rule__ParameterizedIdentifier__Group__1__Impl ;
     public final void rule__ParameterizedIdentifier__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8618:1: ( rule__ParameterizedIdentifier__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8619:2: rule__ParameterizedIdentifier__Group__1__Impl
+            // InternalFormat.g:8618:1: ( rule__ParameterizedIdentifier__Group__1__Impl )
+            // InternalFormat.g:8619:2: rule__ParameterizedIdentifier__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__ParameterizedIdentifier__Group__1__Impl_in_rule__ParameterizedIdentifier__Group__118163);
+            pushFollow(FOLLOW_2);
             rule__ParameterizedIdentifier__Group__1__Impl();
 
             state._fsp--;
@@ -26896,22 +26896,22 @@ public final void rule__ParameterizedIdentifier__Group__1() throws RecognitionEx
 
 
     // $ANTLR start "rule__ParameterizedIdentifier__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8625:1: rule__ParameterizedIdentifier__Group__1__Impl : ( ( rule__ParameterizedIdentifier__Group_1__0 )? ) ;
+    // InternalFormat.g:8625:1: rule__ParameterizedIdentifier__Group__1__Impl : ( ( rule__ParameterizedIdentifier__Group_1__0 )? ) ;
     public final void rule__ParameterizedIdentifier__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8629:1: ( ( ( rule__ParameterizedIdentifier__Group_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8630:1: ( ( rule__ParameterizedIdentifier__Group_1__0 )? )
+            // InternalFormat.g:8629:1: ( ( ( rule__ParameterizedIdentifier__Group_1__0 )? ) )
+            // InternalFormat.g:8630:1: ( ( rule__ParameterizedIdentifier__Group_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8630:1: ( ( rule__ParameterizedIdentifier__Group_1__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8631:1: ( rule__ParameterizedIdentifier__Group_1__0 )?
+            // InternalFormat.g:8630:1: ( ( rule__ParameterizedIdentifier__Group_1__0 )? )
+            // InternalFormat.g:8631:1: ( rule__ParameterizedIdentifier__Group_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getParameterizedIdentifierAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8632:1: ( rule__ParameterizedIdentifier__Group_1__0 )?
+            // InternalFormat.g:8632:1: ( rule__ParameterizedIdentifier__Group_1__0 )?
             int alt90=2;
             int LA90_0 = input.LA(1);
 
@@ -26920,9 +26920,9 @@ public final void rule__ParameterizedIdentifier__Group__1__Impl() throws Recogni
             }
             switch (alt90) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8632:2: rule__ParameterizedIdentifier__Group_1__0
+                    // InternalFormat.g:8632:2: rule__ParameterizedIdentifier__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__ParameterizedIdentifier__Group_1__0_in_rule__ParameterizedIdentifier__Group__1__Impl18190);
+                    pushFollow(FOLLOW_2);
                     rule__ParameterizedIdentifier__Group_1__0();
 
                     state._fsp--;
@@ -26958,21 +26958,21 @@ public final void rule__ParameterizedIdentifier__Group__1__Impl() throws Recogni
 
 
     // $ANTLR start "rule__ParameterizedIdentifier__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8646:1: rule__ParameterizedIdentifier__Group_1__0 : rule__ParameterizedIdentifier__Group_1__0__Impl rule__ParameterizedIdentifier__Group_1__1 ;
+    // InternalFormat.g:8646:1: rule__ParameterizedIdentifier__Group_1__0 : rule__ParameterizedIdentifier__Group_1__0__Impl rule__ParameterizedIdentifier__Group_1__1 ;
     public final void rule__ParameterizedIdentifier__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8650:1: ( rule__ParameterizedIdentifier__Group_1__0__Impl rule__ParameterizedIdentifier__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8651:2: rule__ParameterizedIdentifier__Group_1__0__Impl rule__ParameterizedIdentifier__Group_1__1
+            // InternalFormat.g:8650:1: ( rule__ParameterizedIdentifier__Group_1__0__Impl rule__ParameterizedIdentifier__Group_1__1 )
+            // InternalFormat.g:8651:2: rule__ParameterizedIdentifier__Group_1__0__Impl rule__ParameterizedIdentifier__Group_1__1
             {
-            pushFollow(FOLLOW_rule__ParameterizedIdentifier__Group_1__0__Impl_in_rule__ParameterizedIdentifier__Group_1__018225);
+            pushFollow(FOLLOW_29);
             rule__ParameterizedIdentifier__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ParameterizedIdentifier__Group_1__1_in_rule__ParameterizedIdentifier__Group_1__018228);
+            pushFollow(FOLLOW_2);
             rule__ParameterizedIdentifier__Group_1__1();
 
             state._fsp--;
@@ -26996,22 +26996,22 @@ public final void rule__ParameterizedIdentifier__Group_1__0() throws Recognition
 
 
     // $ANTLR start "rule__ParameterizedIdentifier__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8658:1: rule__ParameterizedIdentifier__Group_1__0__Impl : ( '(' ) ;
+    // InternalFormat.g:8658:1: rule__ParameterizedIdentifier__Group_1__0__Impl : ( '(' ) ;
     public final void rule__ParameterizedIdentifier__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8662:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8663:1: ( '(' )
+            // InternalFormat.g:8662:1: ( ( '(' ) )
+            // InternalFormat.g:8663:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8663:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8664:1: '('
+            // InternalFormat.g:8663:1: ( '(' )
+            // InternalFormat.g:8664:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getParameterizedIdentifierAccess().getLeftParenthesisKeyword_1_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__ParameterizedIdentifier__Group_1__0__Impl18256); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getParameterizedIdentifierAccess().getLeftParenthesisKeyword_1_0()); 
             }
@@ -27037,21 +27037,21 @@ public final void rule__ParameterizedIdentifier__Group_1__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__ParameterizedIdentifier__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8677:1: rule__ParameterizedIdentifier__Group_1__1 : rule__ParameterizedIdentifier__Group_1__1__Impl rule__ParameterizedIdentifier__Group_1__2 ;
+    // InternalFormat.g:8677:1: rule__ParameterizedIdentifier__Group_1__1 : rule__ParameterizedIdentifier__Group_1__1__Impl rule__ParameterizedIdentifier__Group_1__2 ;
     public final void rule__ParameterizedIdentifier__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8681:1: ( rule__ParameterizedIdentifier__Group_1__1__Impl rule__ParameterizedIdentifier__Group_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8682:2: rule__ParameterizedIdentifier__Group_1__1__Impl rule__ParameterizedIdentifier__Group_1__2
+            // InternalFormat.g:8681:1: ( rule__ParameterizedIdentifier__Group_1__1__Impl rule__ParameterizedIdentifier__Group_1__2 )
+            // InternalFormat.g:8682:2: rule__ParameterizedIdentifier__Group_1__1__Impl rule__ParameterizedIdentifier__Group_1__2
             {
-            pushFollow(FOLLOW_rule__ParameterizedIdentifier__Group_1__1__Impl_in_rule__ParameterizedIdentifier__Group_1__118287);
+            pushFollow(FOLLOW_46);
             rule__ParameterizedIdentifier__Group_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ParameterizedIdentifier__Group_1__2_in_rule__ParameterizedIdentifier__Group_1__118290);
+            pushFollow(FOLLOW_2);
             rule__ParameterizedIdentifier__Group_1__2();
 
             state._fsp--;
@@ -27075,22 +27075,22 @@ public final void rule__ParameterizedIdentifier__Group_1__1() throws Recognition
 
 
     // $ANTLR start "rule__ParameterizedIdentifier__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8689:1: rule__ParameterizedIdentifier__Group_1__1__Impl : ( RULE_INT ) ;
+    // InternalFormat.g:8689:1: rule__ParameterizedIdentifier__Group_1__1__Impl : ( RULE_INT ) ;
     public final void rule__ParameterizedIdentifier__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8693:1: ( ( RULE_INT ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8694:1: ( RULE_INT )
+            // InternalFormat.g:8693:1: ( ( RULE_INT ) )
+            // InternalFormat.g:8694:1: ( RULE_INT )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8694:1: ( RULE_INT )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8695:1: RULE_INT
+            // InternalFormat.g:8694:1: ( RULE_INT )
+            // InternalFormat.g:8695:1: RULE_INT
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getParameterizedIdentifierAccess().getINTTerminalRuleCall_1_1()); 
             }
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__ParameterizedIdentifier__Group_1__1__Impl18317); if (state.failed) return ;
+            match(input,RULE_INT,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getParameterizedIdentifierAccess().getINTTerminalRuleCall_1_1()); 
             }
@@ -27116,21 +27116,21 @@ public final void rule__ParameterizedIdentifier__Group_1__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__ParameterizedIdentifier__Group_1__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8706:1: rule__ParameterizedIdentifier__Group_1__2 : rule__ParameterizedIdentifier__Group_1__2__Impl rule__ParameterizedIdentifier__Group_1__3 ;
+    // InternalFormat.g:8706:1: rule__ParameterizedIdentifier__Group_1__2 : rule__ParameterizedIdentifier__Group_1__2__Impl rule__ParameterizedIdentifier__Group_1__3 ;
     public final void rule__ParameterizedIdentifier__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8710:1: ( rule__ParameterizedIdentifier__Group_1__2__Impl rule__ParameterizedIdentifier__Group_1__3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8711:2: rule__ParameterizedIdentifier__Group_1__2__Impl rule__ParameterizedIdentifier__Group_1__3
+            // InternalFormat.g:8710:1: ( rule__ParameterizedIdentifier__Group_1__2__Impl rule__ParameterizedIdentifier__Group_1__3 )
+            // InternalFormat.g:8711:2: rule__ParameterizedIdentifier__Group_1__2__Impl rule__ParameterizedIdentifier__Group_1__3
             {
-            pushFollow(FOLLOW_rule__ParameterizedIdentifier__Group_1__2__Impl_in_rule__ParameterizedIdentifier__Group_1__218346);
+            pushFollow(FOLLOW_29);
             rule__ParameterizedIdentifier__Group_1__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ParameterizedIdentifier__Group_1__3_in_rule__ParameterizedIdentifier__Group_1__218349);
+            pushFollow(FOLLOW_2);
             rule__ParameterizedIdentifier__Group_1__3();
 
             state._fsp--;
@@ -27154,22 +27154,22 @@ public final void rule__ParameterizedIdentifier__Group_1__2() throws Recognition
 
 
     // $ANTLR start "rule__ParameterizedIdentifier__Group_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8718:1: rule__ParameterizedIdentifier__Group_1__2__Impl : ( ',' ) ;
+    // InternalFormat.g:8718:1: rule__ParameterizedIdentifier__Group_1__2__Impl : ( ',' ) ;
     public final void rule__ParameterizedIdentifier__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8722:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8723:1: ( ',' )
+            // InternalFormat.g:8722:1: ( ( ',' ) )
+            // InternalFormat.g:8723:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8723:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8724:1: ','
+            // InternalFormat.g:8723:1: ( ',' )
+            // InternalFormat.g:8724:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getParameterizedIdentifierAccess().getCommaKeyword_1_2()); 
             }
-            match(input,71,FOLLOW_71_in_rule__ParameterizedIdentifier__Group_1__2__Impl18377); if (state.failed) return ;
+            match(input,71,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getParameterizedIdentifierAccess().getCommaKeyword_1_2()); 
             }
@@ -27195,21 +27195,21 @@ public final void rule__ParameterizedIdentifier__Group_1__2__Impl() throws Recog
 
 
     // $ANTLR start "rule__ParameterizedIdentifier__Group_1__3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8737:1: rule__ParameterizedIdentifier__Group_1__3 : rule__ParameterizedIdentifier__Group_1__3__Impl rule__ParameterizedIdentifier__Group_1__4 ;
+    // InternalFormat.g:8737:1: rule__ParameterizedIdentifier__Group_1__3 : rule__ParameterizedIdentifier__Group_1__3__Impl rule__ParameterizedIdentifier__Group_1__4 ;
     public final void rule__ParameterizedIdentifier__Group_1__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8741:1: ( rule__ParameterizedIdentifier__Group_1__3__Impl rule__ParameterizedIdentifier__Group_1__4 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8742:2: rule__ParameterizedIdentifier__Group_1__3__Impl rule__ParameterizedIdentifier__Group_1__4
+            // InternalFormat.g:8741:1: ( rule__ParameterizedIdentifier__Group_1__3__Impl rule__ParameterizedIdentifier__Group_1__4 )
+            // InternalFormat.g:8742:2: rule__ParameterizedIdentifier__Group_1__3__Impl rule__ParameterizedIdentifier__Group_1__4
             {
-            pushFollow(FOLLOW_rule__ParameterizedIdentifier__Group_1__3__Impl_in_rule__ParameterizedIdentifier__Group_1__318408);
+            pushFollow(FOLLOW_33);
             rule__ParameterizedIdentifier__Group_1__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ParameterizedIdentifier__Group_1__4_in_rule__ParameterizedIdentifier__Group_1__318411);
+            pushFollow(FOLLOW_2);
             rule__ParameterizedIdentifier__Group_1__4();
 
             state._fsp--;
@@ -27233,22 +27233,22 @@ public final void rule__ParameterizedIdentifier__Group_1__3() throws Recognition
 
 
     // $ANTLR start "rule__ParameterizedIdentifier__Group_1__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8749:1: rule__ParameterizedIdentifier__Group_1__3__Impl : ( RULE_INT ) ;
+    // InternalFormat.g:8749:1: rule__ParameterizedIdentifier__Group_1__3__Impl : ( RULE_INT ) ;
     public final void rule__ParameterizedIdentifier__Group_1__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8753:1: ( ( RULE_INT ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8754:1: ( RULE_INT )
+            // InternalFormat.g:8753:1: ( ( RULE_INT ) )
+            // InternalFormat.g:8754:1: ( RULE_INT )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8754:1: ( RULE_INT )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8755:1: RULE_INT
+            // InternalFormat.g:8754:1: ( RULE_INT )
+            // InternalFormat.g:8755:1: RULE_INT
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getParameterizedIdentifierAccess().getINTTerminalRuleCall_1_3()); 
             }
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__ParameterizedIdentifier__Group_1__3__Impl18438); if (state.failed) return ;
+            match(input,RULE_INT,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getParameterizedIdentifierAccess().getINTTerminalRuleCall_1_3()); 
             }
@@ -27274,16 +27274,16 @@ public final void rule__ParameterizedIdentifier__Group_1__3__Impl() throws Recog
 
 
     // $ANTLR start "rule__ParameterizedIdentifier__Group_1__4"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8766:1: rule__ParameterizedIdentifier__Group_1__4 : rule__ParameterizedIdentifier__Group_1__4__Impl ;
+    // InternalFormat.g:8766:1: rule__ParameterizedIdentifier__Group_1__4 : rule__ParameterizedIdentifier__Group_1__4__Impl ;
     public final void rule__ParameterizedIdentifier__Group_1__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8770:1: ( rule__ParameterizedIdentifier__Group_1__4__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8771:2: rule__ParameterizedIdentifier__Group_1__4__Impl
+            // InternalFormat.g:8770:1: ( rule__ParameterizedIdentifier__Group_1__4__Impl )
+            // InternalFormat.g:8771:2: rule__ParameterizedIdentifier__Group_1__4__Impl
             {
-            pushFollow(FOLLOW_rule__ParameterizedIdentifier__Group_1__4__Impl_in_rule__ParameterizedIdentifier__Group_1__418467);
+            pushFollow(FOLLOW_2);
             rule__ParameterizedIdentifier__Group_1__4__Impl();
 
             state._fsp--;
@@ -27307,22 +27307,22 @@ public final void rule__ParameterizedIdentifier__Group_1__4() throws Recognition
 
 
     // $ANTLR start "rule__ParameterizedIdentifier__Group_1__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8777:1: rule__ParameterizedIdentifier__Group_1__4__Impl : ( ')' ) ;
+    // InternalFormat.g:8777:1: rule__ParameterizedIdentifier__Group_1__4__Impl : ( ')' ) ;
     public final void rule__ParameterizedIdentifier__Group_1__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8781:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8782:1: ( ')' )
+            // InternalFormat.g:8781:1: ( ( ')' ) )
+            // InternalFormat.g:8782:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8782:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8783:1: ')'
+            // InternalFormat.g:8782:1: ( ')' )
+            // InternalFormat.g:8783:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getParameterizedIdentifierAccess().getRightParenthesisKeyword_1_4()); 
             }
-            match(input,75,FOLLOW_75_in_rule__ParameterizedIdentifier__Group_1__4__Impl18495); if (state.failed) return ;
+            match(input,75,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getParameterizedIdentifierAccess().getRightParenthesisKeyword_1_4()); 
             }
@@ -27348,21 +27348,21 @@ public final void rule__ParameterizedIdentifier__Group_1__4__Impl() throws Recog
 
 
     // $ANTLR start "rule__ParameterizedString__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8806:1: rule__ParameterizedString__Group__0 : rule__ParameterizedString__Group__0__Impl rule__ParameterizedString__Group__1 ;
+    // InternalFormat.g:8806:1: rule__ParameterizedString__Group__0 : rule__ParameterizedString__Group__0__Impl rule__ParameterizedString__Group__1 ;
     public final void rule__ParameterizedString__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8810:1: ( rule__ParameterizedString__Group__0__Impl rule__ParameterizedString__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8811:2: rule__ParameterizedString__Group__0__Impl rule__ParameterizedString__Group__1
+            // InternalFormat.g:8810:1: ( rule__ParameterizedString__Group__0__Impl rule__ParameterizedString__Group__1 )
+            // InternalFormat.g:8811:2: rule__ParameterizedString__Group__0__Impl rule__ParameterizedString__Group__1
             {
-            pushFollow(FOLLOW_rule__ParameterizedString__Group__0__Impl_in_rule__ParameterizedString__Group__018536);
+            pushFollow(FOLLOW_45);
             rule__ParameterizedString__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ParameterizedString__Group__1_in_rule__ParameterizedString__Group__018539);
+            pushFollow(FOLLOW_2);
             rule__ParameterizedString__Group__1();
 
             state._fsp--;
@@ -27386,22 +27386,22 @@ public final void rule__ParameterizedString__Group__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ParameterizedString__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8818:1: rule__ParameterizedString__Group__0__Impl : ( RULE_STRING ) ;
+    // InternalFormat.g:8818:1: rule__ParameterizedString__Group__0__Impl : ( RULE_STRING ) ;
     public final void rule__ParameterizedString__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8822:1: ( ( RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8823:1: ( RULE_STRING )
+            // InternalFormat.g:8822:1: ( ( RULE_STRING ) )
+            // InternalFormat.g:8823:1: ( RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8823:1: ( RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8824:1: RULE_STRING
+            // InternalFormat.g:8823:1: ( RULE_STRING )
+            // InternalFormat.g:8824:1: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getParameterizedStringAccess().getSTRINGTerminalRuleCall_0()); 
             }
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__ParameterizedString__Group__0__Impl18566); if (state.failed) return ;
+            match(input,RULE_STRING,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getParameterizedStringAccess().getSTRINGTerminalRuleCall_0()); 
             }
@@ -27427,16 +27427,16 @@ public final void rule__ParameterizedString__Group__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__ParameterizedString__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8835:1: rule__ParameterizedString__Group__1 : rule__ParameterizedString__Group__1__Impl ;
+    // InternalFormat.g:8835:1: rule__ParameterizedString__Group__1 : rule__ParameterizedString__Group__1__Impl ;
     public final void rule__ParameterizedString__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8839:1: ( rule__ParameterizedString__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8840:2: rule__ParameterizedString__Group__1__Impl
+            // InternalFormat.g:8839:1: ( rule__ParameterizedString__Group__1__Impl )
+            // InternalFormat.g:8840:2: rule__ParameterizedString__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__ParameterizedString__Group__1__Impl_in_rule__ParameterizedString__Group__118595);
+            pushFollow(FOLLOW_2);
             rule__ParameterizedString__Group__1__Impl();
 
             state._fsp--;
@@ -27460,22 +27460,22 @@ public final void rule__ParameterizedString__Group__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ParameterizedString__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8846:1: rule__ParameterizedString__Group__1__Impl : ( ( rule__ParameterizedString__Group_1__0 )? ) ;
+    // InternalFormat.g:8846:1: rule__ParameterizedString__Group__1__Impl : ( ( rule__ParameterizedString__Group_1__0 )? ) ;
     public final void rule__ParameterizedString__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8850:1: ( ( ( rule__ParameterizedString__Group_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8851:1: ( ( rule__ParameterizedString__Group_1__0 )? )
+            // InternalFormat.g:8850:1: ( ( ( rule__ParameterizedString__Group_1__0 )? ) )
+            // InternalFormat.g:8851:1: ( ( rule__ParameterizedString__Group_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8851:1: ( ( rule__ParameterizedString__Group_1__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8852:1: ( rule__ParameterizedString__Group_1__0 )?
+            // InternalFormat.g:8851:1: ( ( rule__ParameterizedString__Group_1__0 )? )
+            // InternalFormat.g:8852:1: ( rule__ParameterizedString__Group_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getParameterizedStringAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8853:1: ( rule__ParameterizedString__Group_1__0 )?
+            // InternalFormat.g:8853:1: ( rule__ParameterizedString__Group_1__0 )?
             int alt91=2;
             int LA91_0 = input.LA(1);
 
@@ -27484,9 +27484,9 @@ public final void rule__ParameterizedString__Group__1__Impl() throws Recognition
             }
             switch (alt91) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8853:2: rule__ParameterizedString__Group_1__0
+                    // InternalFormat.g:8853:2: rule__ParameterizedString__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__ParameterizedString__Group_1__0_in_rule__ParameterizedString__Group__1__Impl18622);
+                    pushFollow(FOLLOW_2);
                     rule__ParameterizedString__Group_1__0();
 
                     state._fsp--;
@@ -27522,21 +27522,21 @@ public final void rule__ParameterizedString__Group__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__ParameterizedString__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8867:1: rule__ParameterizedString__Group_1__0 : rule__ParameterizedString__Group_1__0__Impl rule__ParameterizedString__Group_1__1 ;
+    // InternalFormat.g:8867:1: rule__ParameterizedString__Group_1__0 : rule__ParameterizedString__Group_1__0__Impl rule__ParameterizedString__Group_1__1 ;
     public final void rule__ParameterizedString__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8871:1: ( rule__ParameterizedString__Group_1__0__Impl rule__ParameterizedString__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8872:2: rule__ParameterizedString__Group_1__0__Impl rule__ParameterizedString__Group_1__1
+            // InternalFormat.g:8871:1: ( rule__ParameterizedString__Group_1__0__Impl rule__ParameterizedString__Group_1__1 )
+            // InternalFormat.g:8872:2: rule__ParameterizedString__Group_1__0__Impl rule__ParameterizedString__Group_1__1
             {
-            pushFollow(FOLLOW_rule__ParameterizedString__Group_1__0__Impl_in_rule__ParameterizedString__Group_1__018657);
+            pushFollow(FOLLOW_29);
             rule__ParameterizedString__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ParameterizedString__Group_1__1_in_rule__ParameterizedString__Group_1__018660);
+            pushFollow(FOLLOW_2);
             rule__ParameterizedString__Group_1__1();
 
             state._fsp--;
@@ -27560,22 +27560,22 @@ public final void rule__ParameterizedString__Group_1__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__ParameterizedString__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8879:1: rule__ParameterizedString__Group_1__0__Impl : ( '(' ) ;
+    // InternalFormat.g:8879:1: rule__ParameterizedString__Group_1__0__Impl : ( '(' ) ;
     public final void rule__ParameterizedString__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8883:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8884:1: ( '(' )
+            // InternalFormat.g:8883:1: ( ( '(' ) )
+            // InternalFormat.g:8884:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8884:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8885:1: '('
+            // InternalFormat.g:8884:1: ( '(' )
+            // InternalFormat.g:8885:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getParameterizedStringAccess().getLeftParenthesisKeyword_1_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__ParameterizedString__Group_1__0__Impl18688); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getParameterizedStringAccess().getLeftParenthesisKeyword_1_0()); 
             }
@@ -27601,21 +27601,21 @@ public final void rule__ParameterizedString__Group_1__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__ParameterizedString__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8898:1: rule__ParameterizedString__Group_1__1 : rule__ParameterizedString__Group_1__1__Impl rule__ParameterizedString__Group_1__2 ;
+    // InternalFormat.g:8898:1: rule__ParameterizedString__Group_1__1 : rule__ParameterizedString__Group_1__1__Impl rule__ParameterizedString__Group_1__2 ;
     public final void rule__ParameterizedString__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8902:1: ( rule__ParameterizedString__Group_1__1__Impl rule__ParameterizedString__Group_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8903:2: rule__ParameterizedString__Group_1__1__Impl rule__ParameterizedString__Group_1__2
+            // InternalFormat.g:8902:1: ( rule__ParameterizedString__Group_1__1__Impl rule__ParameterizedString__Group_1__2 )
+            // InternalFormat.g:8903:2: rule__ParameterizedString__Group_1__1__Impl rule__ParameterizedString__Group_1__2
             {
-            pushFollow(FOLLOW_rule__ParameterizedString__Group_1__1__Impl_in_rule__ParameterizedString__Group_1__118719);
+            pushFollow(FOLLOW_46);
             rule__ParameterizedString__Group_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ParameterizedString__Group_1__2_in_rule__ParameterizedString__Group_1__118722);
+            pushFollow(FOLLOW_2);
             rule__ParameterizedString__Group_1__2();
 
             state._fsp--;
@@ -27639,22 +27639,22 @@ public final void rule__ParameterizedString__Group_1__1() throws RecognitionExce
 
 
     // $ANTLR start "rule__ParameterizedString__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8910:1: rule__ParameterizedString__Group_1__1__Impl : ( RULE_INT ) ;
+    // InternalFormat.g:8910:1: rule__ParameterizedString__Group_1__1__Impl : ( RULE_INT ) ;
     public final void rule__ParameterizedString__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8914:1: ( ( RULE_INT ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8915:1: ( RULE_INT )
+            // InternalFormat.g:8914:1: ( ( RULE_INT ) )
+            // InternalFormat.g:8915:1: ( RULE_INT )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8915:1: ( RULE_INT )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8916:1: RULE_INT
+            // InternalFormat.g:8915:1: ( RULE_INT )
+            // InternalFormat.g:8916:1: RULE_INT
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getParameterizedStringAccess().getINTTerminalRuleCall_1_1()); 
             }
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__ParameterizedString__Group_1__1__Impl18749); if (state.failed) return ;
+            match(input,RULE_INT,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getParameterizedStringAccess().getINTTerminalRuleCall_1_1()); 
             }
@@ -27680,21 +27680,21 @@ public final void rule__ParameterizedString__Group_1__1__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__ParameterizedString__Group_1__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8927:1: rule__ParameterizedString__Group_1__2 : rule__ParameterizedString__Group_1__2__Impl rule__ParameterizedString__Group_1__3 ;
+    // InternalFormat.g:8927:1: rule__ParameterizedString__Group_1__2 : rule__ParameterizedString__Group_1__2__Impl rule__ParameterizedString__Group_1__3 ;
     public final void rule__ParameterizedString__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8931:1: ( rule__ParameterizedString__Group_1__2__Impl rule__ParameterizedString__Group_1__3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8932:2: rule__ParameterizedString__Group_1__2__Impl rule__ParameterizedString__Group_1__3
+            // InternalFormat.g:8931:1: ( rule__ParameterizedString__Group_1__2__Impl rule__ParameterizedString__Group_1__3 )
+            // InternalFormat.g:8932:2: rule__ParameterizedString__Group_1__2__Impl rule__ParameterizedString__Group_1__3
             {
-            pushFollow(FOLLOW_rule__ParameterizedString__Group_1__2__Impl_in_rule__ParameterizedString__Group_1__218778);
+            pushFollow(FOLLOW_29);
             rule__ParameterizedString__Group_1__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ParameterizedString__Group_1__3_in_rule__ParameterizedString__Group_1__218781);
+            pushFollow(FOLLOW_2);
             rule__ParameterizedString__Group_1__3();
 
             state._fsp--;
@@ -27718,22 +27718,22 @@ public final void rule__ParameterizedString__Group_1__2() throws RecognitionExce
 
 
     // $ANTLR start "rule__ParameterizedString__Group_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8939:1: rule__ParameterizedString__Group_1__2__Impl : ( ',' ) ;
+    // InternalFormat.g:8939:1: rule__ParameterizedString__Group_1__2__Impl : ( ',' ) ;
     public final void rule__ParameterizedString__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8943:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8944:1: ( ',' )
+            // InternalFormat.g:8943:1: ( ( ',' ) )
+            // InternalFormat.g:8944:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8944:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8945:1: ','
+            // InternalFormat.g:8944:1: ( ',' )
+            // InternalFormat.g:8945:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getParameterizedStringAccess().getCommaKeyword_1_2()); 
             }
-            match(input,71,FOLLOW_71_in_rule__ParameterizedString__Group_1__2__Impl18809); if (state.failed) return ;
+            match(input,71,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getParameterizedStringAccess().getCommaKeyword_1_2()); 
             }
@@ -27759,21 +27759,21 @@ public final void rule__ParameterizedString__Group_1__2__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__ParameterizedString__Group_1__3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8958:1: rule__ParameterizedString__Group_1__3 : rule__ParameterizedString__Group_1__3__Impl rule__ParameterizedString__Group_1__4 ;
+    // InternalFormat.g:8958:1: rule__ParameterizedString__Group_1__3 : rule__ParameterizedString__Group_1__3__Impl rule__ParameterizedString__Group_1__4 ;
     public final void rule__ParameterizedString__Group_1__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8962:1: ( rule__ParameterizedString__Group_1__3__Impl rule__ParameterizedString__Group_1__4 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8963:2: rule__ParameterizedString__Group_1__3__Impl rule__ParameterizedString__Group_1__4
+            // InternalFormat.g:8962:1: ( rule__ParameterizedString__Group_1__3__Impl rule__ParameterizedString__Group_1__4 )
+            // InternalFormat.g:8963:2: rule__ParameterizedString__Group_1__3__Impl rule__ParameterizedString__Group_1__4
             {
-            pushFollow(FOLLOW_rule__ParameterizedString__Group_1__3__Impl_in_rule__ParameterizedString__Group_1__318840);
+            pushFollow(FOLLOW_33);
             rule__ParameterizedString__Group_1__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ParameterizedString__Group_1__4_in_rule__ParameterizedString__Group_1__318843);
+            pushFollow(FOLLOW_2);
             rule__ParameterizedString__Group_1__4();
 
             state._fsp--;
@@ -27797,22 +27797,22 @@ public final void rule__ParameterizedString__Group_1__3() throws RecognitionExce
 
 
     // $ANTLR start "rule__ParameterizedString__Group_1__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8970:1: rule__ParameterizedString__Group_1__3__Impl : ( RULE_INT ) ;
+    // InternalFormat.g:8970:1: rule__ParameterizedString__Group_1__3__Impl : ( RULE_INT ) ;
     public final void rule__ParameterizedString__Group_1__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8974:1: ( ( RULE_INT ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8975:1: ( RULE_INT )
+            // InternalFormat.g:8974:1: ( ( RULE_INT ) )
+            // InternalFormat.g:8975:1: ( RULE_INT )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8975:1: ( RULE_INT )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8976:1: RULE_INT
+            // InternalFormat.g:8975:1: ( RULE_INT )
+            // InternalFormat.g:8976:1: RULE_INT
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getParameterizedStringAccess().getINTTerminalRuleCall_1_3()); 
             }
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__ParameterizedString__Group_1__3__Impl18870); if (state.failed) return ;
+            match(input,RULE_INT,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getParameterizedStringAccess().getINTTerminalRuleCall_1_3()); 
             }
@@ -27838,16 +27838,16 @@ public final void rule__ParameterizedString__Group_1__3__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__ParameterizedString__Group_1__4"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8987:1: rule__ParameterizedString__Group_1__4 : rule__ParameterizedString__Group_1__4__Impl ;
+    // InternalFormat.g:8987:1: rule__ParameterizedString__Group_1__4 : rule__ParameterizedString__Group_1__4__Impl ;
     public final void rule__ParameterizedString__Group_1__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8991:1: ( rule__ParameterizedString__Group_1__4__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8992:2: rule__ParameterizedString__Group_1__4__Impl
+            // InternalFormat.g:8991:1: ( rule__ParameterizedString__Group_1__4__Impl )
+            // InternalFormat.g:8992:2: rule__ParameterizedString__Group_1__4__Impl
             {
-            pushFollow(FOLLOW_rule__ParameterizedString__Group_1__4__Impl_in_rule__ParameterizedString__Group_1__418899);
+            pushFollow(FOLLOW_2);
             rule__ParameterizedString__Group_1__4__Impl();
 
             state._fsp--;
@@ -27871,22 +27871,22 @@ public final void rule__ParameterizedString__Group_1__4() throws RecognitionExce
 
 
     // $ANTLR start "rule__ParameterizedString__Group_1__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:8998:1: rule__ParameterizedString__Group_1__4__Impl : ( ')' ) ;
+    // InternalFormat.g:8998:1: rule__ParameterizedString__Group_1__4__Impl : ( ')' ) ;
     public final void rule__ParameterizedString__Group_1__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9002:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9003:1: ( ')' )
+            // InternalFormat.g:9002:1: ( ( ')' ) )
+            // InternalFormat.g:9003:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9003:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9004:1: ')'
+            // InternalFormat.g:9003:1: ( ')' )
+            // InternalFormat.g:9004:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getParameterizedStringAccess().getRightParenthesisKeyword_1_4()); 
             }
-            match(input,75,FOLLOW_75_in_rule__ParameterizedString__Group_1__4__Impl18927); if (state.failed) return ;
+            match(input,75,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getParameterizedStringAccess().getRightParenthesisKeyword_1_4()); 
             }
@@ -27912,21 +27912,21 @@ public final void rule__ParameterizedString__Group_1__4__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__DottedID__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9027:1: rule__DottedID__Group__0 : rule__DottedID__Group__0__Impl rule__DottedID__Group__1 ;
+    // InternalFormat.g:9027:1: rule__DottedID__Group__0 : rule__DottedID__Group__0__Impl rule__DottedID__Group__1 ;
     public final void rule__DottedID__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9031:1: ( rule__DottedID__Group__0__Impl rule__DottedID__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9032:2: rule__DottedID__Group__0__Impl rule__DottedID__Group__1
+            // InternalFormat.g:9031:1: ( rule__DottedID__Group__0__Impl rule__DottedID__Group__1 )
+            // InternalFormat.g:9032:2: rule__DottedID__Group__0__Impl rule__DottedID__Group__1
             {
-            pushFollow(FOLLOW_rule__DottedID__Group__0__Impl_in_rule__DottedID__Group__018968);
+            pushFollow(FOLLOW_35);
             rule__DottedID__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__DottedID__Group__1_in_rule__DottedID__Group__018971);
+            pushFollow(FOLLOW_2);
             rule__DottedID__Group__1();
 
             state._fsp--;
@@ -27950,22 +27950,22 @@ public final void rule__DottedID__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__DottedID__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9039:1: rule__DottedID__Group__0__Impl : ( ruleIdentifier ) ;
+    // InternalFormat.g:9039:1: rule__DottedID__Group__0__Impl : ( ruleIdentifier ) ;
     public final void rule__DottedID__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9043:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9044:1: ( ruleIdentifier )
+            // InternalFormat.g:9043:1: ( ( ruleIdentifier ) )
+            // InternalFormat.g:9044:1: ( ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9044:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9045:1: ruleIdentifier
+            // InternalFormat.g:9044:1: ( ruleIdentifier )
+            // InternalFormat.g:9045:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDottedIDAccess().getIdentifierParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__DottedID__Group__0__Impl18998);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -27995,16 +27995,16 @@ public final void rule__DottedID__Group__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__DottedID__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9056:1: rule__DottedID__Group__1 : rule__DottedID__Group__1__Impl ;
+    // InternalFormat.g:9056:1: rule__DottedID__Group__1 : rule__DottedID__Group__1__Impl ;
     public final void rule__DottedID__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9060:1: ( rule__DottedID__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9061:2: rule__DottedID__Group__1__Impl
+            // InternalFormat.g:9060:1: ( rule__DottedID__Group__1__Impl )
+            // InternalFormat.g:9061:2: rule__DottedID__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__DottedID__Group__1__Impl_in_rule__DottedID__Group__119027);
+            pushFollow(FOLLOW_2);
             rule__DottedID__Group__1__Impl();
 
             state._fsp--;
@@ -28028,22 +28028,22 @@ public final void rule__DottedID__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__DottedID__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9067:1: rule__DottedID__Group__1__Impl : ( ( rule__DottedID__Group_1__0 )* ) ;
+    // InternalFormat.g:9067:1: rule__DottedID__Group__1__Impl : ( ( rule__DottedID__Group_1__0 )* ) ;
     public final void rule__DottedID__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9071:1: ( ( ( rule__DottedID__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9072:1: ( ( rule__DottedID__Group_1__0 )* )
+            // InternalFormat.g:9071:1: ( ( ( rule__DottedID__Group_1__0 )* ) )
+            // InternalFormat.g:9072:1: ( ( rule__DottedID__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9072:1: ( ( rule__DottedID__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9073:1: ( rule__DottedID__Group_1__0 )*
+            // InternalFormat.g:9072:1: ( ( rule__DottedID__Group_1__0 )* )
+            // InternalFormat.g:9073:1: ( rule__DottedID__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDottedIDAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9074:1: ( rule__DottedID__Group_1__0 )*
+            // InternalFormat.g:9074:1: ( rule__DottedID__Group_1__0 )*
             loop92:
             do {
                 int alt92=2;
@@ -28056,9 +28056,9 @@ public final void rule__DottedID__Group__1__Impl() throws RecognitionException {
 
                 switch (alt92) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9074:2: rule__DottedID__Group_1__0
+            	    // InternalFormat.g:9074:2: rule__DottedID__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__DottedID__Group_1__0_in_rule__DottedID__Group__1__Impl19054);
+            	    pushFollow(FOLLOW_47);
             	    rule__DottedID__Group_1__0();
 
             	    state._fsp--;
@@ -28097,21 +28097,21 @@ public final void rule__DottedID__Group__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__DottedID__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9088:1: rule__DottedID__Group_1__0 : rule__DottedID__Group_1__0__Impl rule__DottedID__Group_1__1 ;
+    // InternalFormat.g:9088:1: rule__DottedID__Group_1__0 : rule__DottedID__Group_1__0__Impl rule__DottedID__Group_1__1 ;
     public final void rule__DottedID__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9092:1: ( rule__DottedID__Group_1__0__Impl rule__DottedID__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9093:2: rule__DottedID__Group_1__0__Impl rule__DottedID__Group_1__1
+            // InternalFormat.g:9092:1: ( rule__DottedID__Group_1__0__Impl rule__DottedID__Group_1__1 )
+            // InternalFormat.g:9093:2: rule__DottedID__Group_1__0__Impl rule__DottedID__Group_1__1
             {
-            pushFollow(FOLLOW_rule__DottedID__Group_1__0__Impl_in_rule__DottedID__Group_1__019089);
+            pushFollow(FOLLOW_5);
             rule__DottedID__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__DottedID__Group_1__1_in_rule__DottedID__Group_1__019092);
+            pushFollow(FOLLOW_2);
             rule__DottedID__Group_1__1();
 
             state._fsp--;
@@ -28135,22 +28135,22 @@ public final void rule__DottedID__Group_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__DottedID__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9100:1: rule__DottedID__Group_1__0__Impl : ( '.' ) ;
+    // InternalFormat.g:9100:1: rule__DottedID__Group_1__0__Impl : ( '.' ) ;
     public final void rule__DottedID__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9104:1: ( ( '.' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9105:1: ( '.' )
+            // InternalFormat.g:9104:1: ( ( '.' ) )
+            // InternalFormat.g:9105:1: ( '.' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9105:1: ( '.' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9106:1: '.'
+            // InternalFormat.g:9105:1: ( '.' )
+            // InternalFormat.g:9106:1: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDottedIDAccess().getFullStopKeyword_1_0()); 
             }
-            match(input,49,FOLLOW_49_in_rule__DottedID__Group_1__0__Impl19120); if (state.failed) return ;
+            match(input,49,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getDottedIDAccess().getFullStopKeyword_1_0()); 
             }
@@ -28176,16 +28176,16 @@ public final void rule__DottedID__Group_1__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__DottedID__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9119:1: rule__DottedID__Group_1__1 : rule__DottedID__Group_1__1__Impl ;
+    // InternalFormat.g:9119:1: rule__DottedID__Group_1__1 : rule__DottedID__Group_1__1__Impl ;
     public final void rule__DottedID__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9123:1: ( rule__DottedID__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9124:2: rule__DottedID__Group_1__1__Impl
+            // InternalFormat.g:9123:1: ( rule__DottedID__Group_1__1__Impl )
+            // InternalFormat.g:9124:2: rule__DottedID__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__DottedID__Group_1__1__Impl_in_rule__DottedID__Group_1__119151);
+            pushFollow(FOLLOW_2);
             rule__DottedID__Group_1__1__Impl();
 
             state._fsp--;
@@ -28209,22 +28209,22 @@ public final void rule__DottedID__Group_1__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__DottedID__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9130:1: rule__DottedID__Group_1__1__Impl : ( ruleIdentifier ) ;
+    // InternalFormat.g:9130:1: rule__DottedID__Group_1__1__Impl : ( ruleIdentifier ) ;
     public final void rule__DottedID__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9134:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9135:1: ( ruleIdentifier )
+            // InternalFormat.g:9134:1: ( ( ruleIdentifier ) )
+            // InternalFormat.g:9135:1: ( ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9135:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9136:1: ruleIdentifier
+            // InternalFormat.g:9135:1: ( ruleIdentifier )
+            // InternalFormat.g:9136:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDottedIDAccess().getIdentifierParserRuleCall_1_1()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__DottedID__Group_1__1__Impl19178);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -28254,21 +28254,21 @@ public final void rule__DottedID__Group_1__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__XAnnotation__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9151:1: rule__XAnnotation__Group__0 : rule__XAnnotation__Group__0__Impl rule__XAnnotation__Group__1 ;
+    // InternalFormat.g:9151:1: rule__XAnnotation__Group__0 : rule__XAnnotation__Group__0__Impl rule__XAnnotation__Group__1 ;
     public final void rule__XAnnotation__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9155:1: ( rule__XAnnotation__Group__0__Impl rule__XAnnotation__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9156:2: rule__XAnnotation__Group__0__Impl rule__XAnnotation__Group__1
+            // InternalFormat.g:9155:1: ( rule__XAnnotation__Group__0__Impl rule__XAnnotation__Group__1 )
+            // InternalFormat.g:9156:2: rule__XAnnotation__Group__0__Impl rule__XAnnotation__Group__1
             {
-            pushFollow(FOLLOW_rule__XAnnotation__Group__0__Impl_in_rule__XAnnotation__Group__019211);
+            pushFollow(FOLLOW_48);
             rule__XAnnotation__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotation__Group__1_in_rule__XAnnotation__Group__019214);
+            pushFollow(FOLLOW_2);
             rule__XAnnotation__Group__1();
 
             state._fsp--;
@@ -28292,23 +28292,23 @@ public final void rule__XAnnotation__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAnnotation__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9163:1: rule__XAnnotation__Group__0__Impl : ( () ) ;
+    // InternalFormat.g:9163:1: rule__XAnnotation__Group__0__Impl : ( () ) ;
     public final void rule__XAnnotation__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9167:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9168:1: ( () )
+            // InternalFormat.g:9167:1: ( ( () ) )
+            // InternalFormat.g:9168:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9168:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9169:1: ()
+            // InternalFormat.g:9168:1: ( () )
+            // InternalFormat.g:9169:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getXAnnotationAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9170:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9172:1: 
+            // InternalFormat.g:9170:1: ()
+            // InternalFormat.g:9172:1: 
             {
             }
 
@@ -28333,21 +28333,21 @@ public final void rule__XAnnotation__Group__0__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XAnnotation__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9182:1: rule__XAnnotation__Group__1 : rule__XAnnotation__Group__1__Impl rule__XAnnotation__Group__2 ;
+    // InternalFormat.g:9182:1: rule__XAnnotation__Group__1 : rule__XAnnotation__Group__1__Impl rule__XAnnotation__Group__2 ;
     public final void rule__XAnnotation__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9186:1: ( rule__XAnnotation__Group__1__Impl rule__XAnnotation__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9187:2: rule__XAnnotation__Group__1__Impl rule__XAnnotation__Group__2
+            // InternalFormat.g:9186:1: ( rule__XAnnotation__Group__1__Impl rule__XAnnotation__Group__2 )
+            // InternalFormat.g:9187:2: rule__XAnnotation__Group__1__Impl rule__XAnnotation__Group__2
             {
-            pushFollow(FOLLOW_rule__XAnnotation__Group__1__Impl_in_rule__XAnnotation__Group__119272);
+            pushFollow(FOLLOW_9);
             rule__XAnnotation__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotation__Group__2_in_rule__XAnnotation__Group__119275);
+            pushFollow(FOLLOW_2);
             rule__XAnnotation__Group__2();
 
             state._fsp--;
@@ -28371,22 +28371,22 @@ public final void rule__XAnnotation__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAnnotation__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9194:1: rule__XAnnotation__Group__1__Impl : ( '@' ) ;
+    // InternalFormat.g:9194:1: rule__XAnnotation__Group__1__Impl : ( '@' ) ;
     public final void rule__XAnnotation__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9198:1: ( ( '@' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9199:1: ( '@' )
+            // InternalFormat.g:9198:1: ( ( '@' ) )
+            // InternalFormat.g:9199:1: ( '@' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9199:1: ( '@' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9200:1: '@'
+            // InternalFormat.g:9199:1: ( '@' )
+            // InternalFormat.g:9200:1: '@'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getCommercialAtKeyword_1()); 
             }
-            match(input,68,FOLLOW_68_in_rule__XAnnotation__Group__1__Impl19303); if (state.failed) return ;
+            match(input,68,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationAccess().getCommercialAtKeyword_1()); 
             }
@@ -28412,21 +28412,21 @@ public final void rule__XAnnotation__Group__1__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XAnnotation__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9213:1: rule__XAnnotation__Group__2 : rule__XAnnotation__Group__2__Impl rule__XAnnotation__Group__3 ;
+    // InternalFormat.g:9213:1: rule__XAnnotation__Group__2 : rule__XAnnotation__Group__2__Impl rule__XAnnotation__Group__3 ;
     public final void rule__XAnnotation__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9217:1: ( rule__XAnnotation__Group__2__Impl rule__XAnnotation__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9218:2: rule__XAnnotation__Group__2__Impl rule__XAnnotation__Group__3
+            // InternalFormat.g:9217:1: ( rule__XAnnotation__Group__2__Impl rule__XAnnotation__Group__3 )
+            // InternalFormat.g:9218:2: rule__XAnnotation__Group__2__Impl rule__XAnnotation__Group__3
             {
-            pushFollow(FOLLOW_rule__XAnnotation__Group__2__Impl_in_rule__XAnnotation__Group__219334);
+            pushFollow(FOLLOW_45);
             rule__XAnnotation__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotation__Group__3_in_rule__XAnnotation__Group__219337);
+            pushFollow(FOLLOW_2);
             rule__XAnnotation__Group__3();
 
             state._fsp--;
@@ -28450,25 +28450,25 @@ public final void rule__XAnnotation__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAnnotation__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9225:1: rule__XAnnotation__Group__2__Impl : ( ( rule__XAnnotation__AnnotationTypeAssignment_2 ) ) ;
+    // InternalFormat.g:9225:1: rule__XAnnotation__Group__2__Impl : ( ( rule__XAnnotation__AnnotationTypeAssignment_2 ) ) ;
     public final void rule__XAnnotation__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9229:1: ( ( ( rule__XAnnotation__AnnotationTypeAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9230:1: ( ( rule__XAnnotation__AnnotationTypeAssignment_2 ) )
+            // InternalFormat.g:9229:1: ( ( ( rule__XAnnotation__AnnotationTypeAssignment_2 ) ) )
+            // InternalFormat.g:9230:1: ( ( rule__XAnnotation__AnnotationTypeAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9230:1: ( ( rule__XAnnotation__AnnotationTypeAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9231:1: ( rule__XAnnotation__AnnotationTypeAssignment_2 )
+            // InternalFormat.g:9230:1: ( ( rule__XAnnotation__AnnotationTypeAssignment_2 ) )
+            // InternalFormat.g:9231:1: ( rule__XAnnotation__AnnotationTypeAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getAnnotationTypeAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9232:1: ( rule__XAnnotation__AnnotationTypeAssignment_2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9232:2: rule__XAnnotation__AnnotationTypeAssignment_2
+            // InternalFormat.g:9232:1: ( rule__XAnnotation__AnnotationTypeAssignment_2 )
+            // InternalFormat.g:9232:2: rule__XAnnotation__AnnotationTypeAssignment_2
             {
-            pushFollow(FOLLOW_rule__XAnnotation__AnnotationTypeAssignment_2_in_rule__XAnnotation__Group__2__Impl19364);
+            pushFollow(FOLLOW_2);
             rule__XAnnotation__AnnotationTypeAssignment_2();
 
             state._fsp--;
@@ -28501,16 +28501,16 @@ public final void rule__XAnnotation__Group__2__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XAnnotation__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9242:1: rule__XAnnotation__Group__3 : rule__XAnnotation__Group__3__Impl ;
+    // InternalFormat.g:9242:1: rule__XAnnotation__Group__3 : rule__XAnnotation__Group__3__Impl ;
     public final void rule__XAnnotation__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9246:1: ( rule__XAnnotation__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9247:2: rule__XAnnotation__Group__3__Impl
+            // InternalFormat.g:9246:1: ( rule__XAnnotation__Group__3__Impl )
+            // InternalFormat.g:9247:2: rule__XAnnotation__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotation__Group__3__Impl_in_rule__XAnnotation__Group__319394);
+            pushFollow(FOLLOW_2);
             rule__XAnnotation__Group__3__Impl();
 
             state._fsp--;
@@ -28534,22 +28534,22 @@ public final void rule__XAnnotation__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAnnotation__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9253:1: rule__XAnnotation__Group__3__Impl : ( ( rule__XAnnotation__Group_3__0 )? ) ;
+    // InternalFormat.g:9253:1: rule__XAnnotation__Group__3__Impl : ( ( rule__XAnnotation__Group_3__0 )? ) ;
     public final void rule__XAnnotation__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9257:1: ( ( ( rule__XAnnotation__Group_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9258:1: ( ( rule__XAnnotation__Group_3__0 )? )
+            // InternalFormat.g:9257:1: ( ( ( rule__XAnnotation__Group_3__0 )? ) )
+            // InternalFormat.g:9258:1: ( ( rule__XAnnotation__Group_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9258:1: ( ( rule__XAnnotation__Group_3__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9259:1: ( rule__XAnnotation__Group_3__0 )?
+            // InternalFormat.g:9258:1: ( ( rule__XAnnotation__Group_3__0 )? )
+            // InternalFormat.g:9259:1: ( rule__XAnnotation__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getGroup_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9260:1: ( rule__XAnnotation__Group_3__0 )?
+            // InternalFormat.g:9260:1: ( rule__XAnnotation__Group_3__0 )?
             int alt93=2;
             int LA93_0 = input.LA(1);
 
@@ -28558,9 +28558,9 @@ public final void rule__XAnnotation__Group__3__Impl() throws RecognitionExceptio
             }
             switch (alt93) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9260:2: rule__XAnnotation__Group_3__0
+                    // InternalFormat.g:9260:2: rule__XAnnotation__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__XAnnotation__Group_3__0_in_rule__XAnnotation__Group__3__Impl19421);
+                    pushFollow(FOLLOW_2);
                     rule__XAnnotation__Group_3__0();
 
                     state._fsp--;
@@ -28596,21 +28596,21 @@ public final void rule__XAnnotation__Group__3__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XAnnotation__Group_3__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9278:1: rule__XAnnotation__Group_3__0 : rule__XAnnotation__Group_3__0__Impl rule__XAnnotation__Group_3__1 ;
+    // InternalFormat.g:9278:1: rule__XAnnotation__Group_3__0 : rule__XAnnotation__Group_3__0__Impl rule__XAnnotation__Group_3__1 ;
     public final void rule__XAnnotation__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9282:1: ( rule__XAnnotation__Group_3__0__Impl rule__XAnnotation__Group_3__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9283:2: rule__XAnnotation__Group_3__0__Impl rule__XAnnotation__Group_3__1
+            // InternalFormat.g:9282:1: ( rule__XAnnotation__Group_3__0__Impl rule__XAnnotation__Group_3__1 )
+            // InternalFormat.g:9283:2: rule__XAnnotation__Group_3__0__Impl rule__XAnnotation__Group_3__1
             {
-            pushFollow(FOLLOW_rule__XAnnotation__Group_3__0__Impl_in_rule__XAnnotation__Group_3__019460);
+            pushFollow(FOLLOW_49);
             rule__XAnnotation__Group_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotation__Group_3__1_in_rule__XAnnotation__Group_3__019463);
+            pushFollow(FOLLOW_2);
             rule__XAnnotation__Group_3__1();
 
             state._fsp--;
@@ -28634,25 +28634,25 @@ public final void rule__XAnnotation__Group_3__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAnnotation__Group_3__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9290:1: rule__XAnnotation__Group_3__0__Impl : ( ( '(' ) ) ;
+    // InternalFormat.g:9290:1: rule__XAnnotation__Group_3__0__Impl : ( ( '(' ) ) ;
     public final void rule__XAnnotation__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9294:1: ( ( ( '(' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9295:1: ( ( '(' ) )
+            // InternalFormat.g:9294:1: ( ( ( '(' ) ) )
+            // InternalFormat.g:9295:1: ( ( '(' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9295:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9296:1: ( '(' )
+            // InternalFormat.g:9295:1: ( ( '(' ) )
+            // InternalFormat.g:9296:1: ( '(' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getLeftParenthesisKeyword_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9297:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9298:2: '('
+            // InternalFormat.g:9297:1: ( '(' )
+            // InternalFormat.g:9298:2: '('
             {
-            match(input,74,FOLLOW_74_in_rule__XAnnotation__Group_3__0__Impl19492); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -28681,21 +28681,21 @@ public final void rule__XAnnotation__Group_3__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAnnotation__Group_3__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9309:1: rule__XAnnotation__Group_3__1 : rule__XAnnotation__Group_3__1__Impl rule__XAnnotation__Group_3__2 ;
+    // InternalFormat.g:9309:1: rule__XAnnotation__Group_3__1 : rule__XAnnotation__Group_3__1__Impl rule__XAnnotation__Group_3__2 ;
     public final void rule__XAnnotation__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9313:1: ( rule__XAnnotation__Group_3__1__Impl rule__XAnnotation__Group_3__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9314:2: rule__XAnnotation__Group_3__1__Impl rule__XAnnotation__Group_3__2
+            // InternalFormat.g:9313:1: ( rule__XAnnotation__Group_3__1__Impl rule__XAnnotation__Group_3__2 )
+            // InternalFormat.g:9314:2: rule__XAnnotation__Group_3__1__Impl rule__XAnnotation__Group_3__2
             {
-            pushFollow(FOLLOW_rule__XAnnotation__Group_3__1__Impl_in_rule__XAnnotation__Group_3__119524);
+            pushFollow(FOLLOW_49);
             rule__XAnnotation__Group_3__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotation__Group_3__2_in_rule__XAnnotation__Group_3__119527);
+            pushFollow(FOLLOW_2);
             rule__XAnnotation__Group_3__2();
 
             state._fsp--;
@@ -28719,22 +28719,22 @@ public final void rule__XAnnotation__Group_3__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAnnotation__Group_3__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9321:1: rule__XAnnotation__Group_3__1__Impl : ( ( rule__XAnnotation__Alternatives_3_1 )? ) ;
+    // InternalFormat.g:9321:1: rule__XAnnotation__Group_3__1__Impl : ( ( rule__XAnnotation__Alternatives_3_1 )? ) ;
     public final void rule__XAnnotation__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9325:1: ( ( ( rule__XAnnotation__Alternatives_3_1 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9326:1: ( ( rule__XAnnotation__Alternatives_3_1 )? )
+            // InternalFormat.g:9325:1: ( ( ( rule__XAnnotation__Alternatives_3_1 )? ) )
+            // InternalFormat.g:9326:1: ( ( rule__XAnnotation__Alternatives_3_1 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9326:1: ( ( rule__XAnnotation__Alternatives_3_1 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9327:1: ( rule__XAnnotation__Alternatives_3_1 )?
+            // InternalFormat.g:9326:1: ( ( rule__XAnnotation__Alternatives_3_1 )? )
+            // InternalFormat.g:9327:1: ( rule__XAnnotation__Alternatives_3_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getAlternatives_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9328:1: ( rule__XAnnotation__Alternatives_3_1 )?
+            // InternalFormat.g:9328:1: ( rule__XAnnotation__Alternatives_3_1 )?
             int alt94=2;
             int LA94_0 = input.LA(1);
 
@@ -28743,9 +28743,9 @@ public final void rule__XAnnotation__Group_3__1__Impl() throws RecognitionExcept
             }
             switch (alt94) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9328:2: rule__XAnnotation__Alternatives_3_1
+                    // InternalFormat.g:9328:2: rule__XAnnotation__Alternatives_3_1
                     {
-                    pushFollow(FOLLOW_rule__XAnnotation__Alternatives_3_1_in_rule__XAnnotation__Group_3__1__Impl19554);
+                    pushFollow(FOLLOW_2);
                     rule__XAnnotation__Alternatives_3_1();
 
                     state._fsp--;
@@ -28781,16 +28781,16 @@ public final void rule__XAnnotation__Group_3__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAnnotation__Group_3__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9338:1: rule__XAnnotation__Group_3__2 : rule__XAnnotation__Group_3__2__Impl ;
+    // InternalFormat.g:9338:1: rule__XAnnotation__Group_3__2 : rule__XAnnotation__Group_3__2__Impl ;
     public final void rule__XAnnotation__Group_3__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9342:1: ( rule__XAnnotation__Group_3__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9343:2: rule__XAnnotation__Group_3__2__Impl
+            // InternalFormat.g:9342:1: ( rule__XAnnotation__Group_3__2__Impl )
+            // InternalFormat.g:9343:2: rule__XAnnotation__Group_3__2__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotation__Group_3__2__Impl_in_rule__XAnnotation__Group_3__219585);
+            pushFollow(FOLLOW_2);
             rule__XAnnotation__Group_3__2__Impl();
 
             state._fsp--;
@@ -28814,22 +28814,22 @@ public final void rule__XAnnotation__Group_3__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAnnotation__Group_3__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9349:1: rule__XAnnotation__Group_3__2__Impl : ( ')' ) ;
+    // InternalFormat.g:9349:1: rule__XAnnotation__Group_3__2__Impl : ( ')' ) ;
     public final void rule__XAnnotation__Group_3__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9353:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9354:1: ( ')' )
+            // InternalFormat.g:9353:1: ( ( ')' ) )
+            // InternalFormat.g:9354:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9354:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9355:1: ')'
+            // InternalFormat.g:9354:1: ( ')' )
+            // InternalFormat.g:9355:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getRightParenthesisKeyword_3_2()); 
             }
-            match(input,75,FOLLOW_75_in_rule__XAnnotation__Group_3__2__Impl19613); if (state.failed) return ;
+            match(input,75,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationAccess().getRightParenthesisKeyword_3_2()); 
             }
@@ -28855,21 +28855,21 @@ public final void rule__XAnnotation__Group_3__2__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAnnotation__Group_3_1_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9374:1: rule__XAnnotation__Group_3_1_0__0 : rule__XAnnotation__Group_3_1_0__0__Impl rule__XAnnotation__Group_3_1_0__1 ;
+    // InternalFormat.g:9374:1: rule__XAnnotation__Group_3_1_0__0 : rule__XAnnotation__Group_3_1_0__0__Impl rule__XAnnotation__Group_3_1_0__1 ;
     public final void rule__XAnnotation__Group_3_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9378:1: ( rule__XAnnotation__Group_3_1_0__0__Impl rule__XAnnotation__Group_3_1_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9379:2: rule__XAnnotation__Group_3_1_0__0__Impl rule__XAnnotation__Group_3_1_0__1
+            // InternalFormat.g:9378:1: ( rule__XAnnotation__Group_3_1_0__0__Impl rule__XAnnotation__Group_3_1_0__1 )
+            // InternalFormat.g:9379:2: rule__XAnnotation__Group_3_1_0__0__Impl rule__XAnnotation__Group_3_1_0__1
             {
-            pushFollow(FOLLOW_rule__XAnnotation__Group_3_1_0__0__Impl_in_rule__XAnnotation__Group_3_1_0__019650);
+            pushFollow(FOLLOW_46);
             rule__XAnnotation__Group_3_1_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotation__Group_3_1_0__1_in_rule__XAnnotation__Group_3_1_0__019653);
+            pushFollow(FOLLOW_2);
             rule__XAnnotation__Group_3_1_0__1();
 
             state._fsp--;
@@ -28893,25 +28893,25 @@ public final void rule__XAnnotation__Group_3_1_0__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XAnnotation__Group_3_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9386:1: rule__XAnnotation__Group_3_1_0__0__Impl : ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 ) ) ;
+    // InternalFormat.g:9386:1: rule__XAnnotation__Group_3_1_0__0__Impl : ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 ) ) ;
     public final void rule__XAnnotation__Group_3_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9390:1: ( ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9391:1: ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 ) )
+            // InternalFormat.g:9390:1: ( ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 ) ) )
+            // InternalFormat.g:9391:1: ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9391:1: ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9392:1: ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 )
+            // InternalFormat.g:9391:1: ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 ) )
+            // InternalFormat.g:9392:1: ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getElementValuePairsAssignment_3_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9393:1: ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9393:2: rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0
+            // InternalFormat.g:9393:1: ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 )
+            // InternalFormat.g:9393:2: rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0
             {
-            pushFollow(FOLLOW_rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0_in_rule__XAnnotation__Group_3_1_0__0__Impl19680);
+            pushFollow(FOLLOW_2);
             rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0();
 
             state._fsp--;
@@ -28944,16 +28944,16 @@ public final void rule__XAnnotation__Group_3_1_0__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XAnnotation__Group_3_1_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9403:1: rule__XAnnotation__Group_3_1_0__1 : rule__XAnnotation__Group_3_1_0__1__Impl ;
+    // InternalFormat.g:9403:1: rule__XAnnotation__Group_3_1_0__1 : rule__XAnnotation__Group_3_1_0__1__Impl ;
     public final void rule__XAnnotation__Group_3_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9407:1: ( rule__XAnnotation__Group_3_1_0__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9408:2: rule__XAnnotation__Group_3_1_0__1__Impl
+            // InternalFormat.g:9407:1: ( rule__XAnnotation__Group_3_1_0__1__Impl )
+            // InternalFormat.g:9408:2: rule__XAnnotation__Group_3_1_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotation__Group_3_1_0__1__Impl_in_rule__XAnnotation__Group_3_1_0__119710);
+            pushFollow(FOLLOW_2);
             rule__XAnnotation__Group_3_1_0__1__Impl();
 
             state._fsp--;
@@ -28977,22 +28977,22 @@ public final void rule__XAnnotation__Group_3_1_0__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XAnnotation__Group_3_1_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9414:1: rule__XAnnotation__Group_3_1_0__1__Impl : ( ( rule__XAnnotation__Group_3_1_0_1__0 )* ) ;
+    // InternalFormat.g:9414:1: rule__XAnnotation__Group_3_1_0__1__Impl : ( ( rule__XAnnotation__Group_3_1_0_1__0 )* ) ;
     public final void rule__XAnnotation__Group_3_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9418:1: ( ( ( rule__XAnnotation__Group_3_1_0_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9419:1: ( ( rule__XAnnotation__Group_3_1_0_1__0 )* )
+            // InternalFormat.g:9418:1: ( ( ( rule__XAnnotation__Group_3_1_0_1__0 )* ) )
+            // InternalFormat.g:9419:1: ( ( rule__XAnnotation__Group_3_1_0_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9419:1: ( ( rule__XAnnotation__Group_3_1_0_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9420:1: ( rule__XAnnotation__Group_3_1_0_1__0 )*
+            // InternalFormat.g:9419:1: ( ( rule__XAnnotation__Group_3_1_0_1__0 )* )
+            // InternalFormat.g:9420:1: ( rule__XAnnotation__Group_3_1_0_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getGroup_3_1_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9421:1: ( rule__XAnnotation__Group_3_1_0_1__0 )*
+            // InternalFormat.g:9421:1: ( rule__XAnnotation__Group_3_1_0_1__0 )*
             loop95:
             do {
                 int alt95=2;
@@ -29005,9 +29005,9 @@ public final void rule__XAnnotation__Group_3_1_0__1__Impl() throws RecognitionEx
 
                 switch (alt95) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9421:2: rule__XAnnotation__Group_3_1_0_1__0
+            	    // InternalFormat.g:9421:2: rule__XAnnotation__Group_3_1_0_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XAnnotation__Group_3_1_0_1__0_in_rule__XAnnotation__Group_3_1_0__1__Impl19737);
+            	    pushFollow(FOLLOW_23);
             	    rule__XAnnotation__Group_3_1_0_1__0();
 
             	    state._fsp--;
@@ -29046,21 +29046,21 @@ public final void rule__XAnnotation__Group_3_1_0__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XAnnotation__Group_3_1_0_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9435:1: rule__XAnnotation__Group_3_1_0_1__0 : rule__XAnnotation__Group_3_1_0_1__0__Impl rule__XAnnotation__Group_3_1_0_1__1 ;
+    // InternalFormat.g:9435:1: rule__XAnnotation__Group_3_1_0_1__0 : rule__XAnnotation__Group_3_1_0_1__0__Impl rule__XAnnotation__Group_3_1_0_1__1 ;
     public final void rule__XAnnotation__Group_3_1_0_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9439:1: ( rule__XAnnotation__Group_3_1_0_1__0__Impl rule__XAnnotation__Group_3_1_0_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9440:2: rule__XAnnotation__Group_3_1_0_1__0__Impl rule__XAnnotation__Group_3_1_0_1__1
+            // InternalFormat.g:9439:1: ( rule__XAnnotation__Group_3_1_0_1__0__Impl rule__XAnnotation__Group_3_1_0_1__1 )
+            // InternalFormat.g:9440:2: rule__XAnnotation__Group_3_1_0_1__0__Impl rule__XAnnotation__Group_3_1_0_1__1
             {
-            pushFollow(FOLLOW_rule__XAnnotation__Group_3_1_0_1__0__Impl_in_rule__XAnnotation__Group_3_1_0_1__019772);
+            pushFollow(FOLLOW_9);
             rule__XAnnotation__Group_3_1_0_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotation__Group_3_1_0_1__1_in_rule__XAnnotation__Group_3_1_0_1__019775);
+            pushFollow(FOLLOW_2);
             rule__XAnnotation__Group_3_1_0_1__1();
 
             state._fsp--;
@@ -29084,22 +29084,22 @@ public final void rule__XAnnotation__Group_3_1_0_1__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAnnotation__Group_3_1_0_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9447:1: rule__XAnnotation__Group_3_1_0_1__0__Impl : ( ',' ) ;
+    // InternalFormat.g:9447:1: rule__XAnnotation__Group_3_1_0_1__0__Impl : ( ',' ) ;
     public final void rule__XAnnotation__Group_3_1_0_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9451:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9452:1: ( ',' )
+            // InternalFormat.g:9451:1: ( ( ',' ) )
+            // InternalFormat.g:9452:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9452:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9453:1: ','
+            // InternalFormat.g:9452:1: ( ',' )
+            // InternalFormat.g:9453:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getCommaKeyword_3_1_0_1_0()); 
             }
-            match(input,71,FOLLOW_71_in_rule__XAnnotation__Group_3_1_0_1__0__Impl19803); if (state.failed) return ;
+            match(input,71,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationAccess().getCommaKeyword_3_1_0_1_0()); 
             }
@@ -29125,16 +29125,16 @@ public final void rule__XAnnotation__Group_3_1_0_1__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XAnnotation__Group_3_1_0_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9466:1: rule__XAnnotation__Group_3_1_0_1__1 : rule__XAnnotation__Group_3_1_0_1__1__Impl ;
+    // InternalFormat.g:9466:1: rule__XAnnotation__Group_3_1_0_1__1 : rule__XAnnotation__Group_3_1_0_1__1__Impl ;
     public final void rule__XAnnotation__Group_3_1_0_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9470:1: ( rule__XAnnotation__Group_3_1_0_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9471:2: rule__XAnnotation__Group_3_1_0_1__1__Impl
+            // InternalFormat.g:9470:1: ( rule__XAnnotation__Group_3_1_0_1__1__Impl )
+            // InternalFormat.g:9471:2: rule__XAnnotation__Group_3_1_0_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotation__Group_3_1_0_1__1__Impl_in_rule__XAnnotation__Group_3_1_0_1__119834);
+            pushFollow(FOLLOW_2);
             rule__XAnnotation__Group_3_1_0_1__1__Impl();
 
             state._fsp--;
@@ -29158,25 +29158,25 @@ public final void rule__XAnnotation__Group_3_1_0_1__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAnnotation__Group_3_1_0_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9477:1: rule__XAnnotation__Group_3_1_0_1__1__Impl : ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 ) ) ;
+    // InternalFormat.g:9477:1: rule__XAnnotation__Group_3_1_0_1__1__Impl : ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 ) ) ;
     public final void rule__XAnnotation__Group_3_1_0_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9481:1: ( ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9482:1: ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 ) )
+            // InternalFormat.g:9481:1: ( ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 ) ) )
+            // InternalFormat.g:9482:1: ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9482:1: ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9483:1: ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 )
+            // InternalFormat.g:9482:1: ( ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 ) )
+            // InternalFormat.g:9483:1: ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getElementValuePairsAssignment_3_1_0_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9484:1: ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9484:2: rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1
+            // InternalFormat.g:9484:1: ( rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 )
+            // InternalFormat.g:9484:2: rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1
             {
-            pushFollow(FOLLOW_rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1_in_rule__XAnnotation__Group_3_1_0_1__1__Impl19861);
+            pushFollow(FOLLOW_2);
             rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1();
 
             state._fsp--;
@@ -29209,21 +29209,21 @@ public final void rule__XAnnotation__Group_3_1_0_1__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9498:1: rule__XAnnotationElementValuePair__Group__0 : rule__XAnnotationElementValuePair__Group__0__Impl rule__XAnnotationElementValuePair__Group__1 ;
+    // InternalFormat.g:9498:1: rule__XAnnotationElementValuePair__Group__0 : rule__XAnnotationElementValuePair__Group__0__Impl rule__XAnnotationElementValuePair__Group__1 ;
     public final void rule__XAnnotationElementValuePair__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9502:1: ( rule__XAnnotationElementValuePair__Group__0__Impl rule__XAnnotationElementValuePair__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9503:2: rule__XAnnotationElementValuePair__Group__0__Impl rule__XAnnotationElementValuePair__Group__1
+            // InternalFormat.g:9502:1: ( rule__XAnnotationElementValuePair__Group__0__Impl rule__XAnnotationElementValuePair__Group__1 )
+            // InternalFormat.g:9503:2: rule__XAnnotationElementValuePair__Group__0__Impl rule__XAnnotationElementValuePair__Group__1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__Group__0__Impl_in_rule__XAnnotationElementValuePair__Group__019895);
+            pushFollow(FOLLOW_50);
             rule__XAnnotationElementValuePair__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__Group__1_in_rule__XAnnotationElementValuePair__Group__019898);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValuePair__Group__1();
 
             state._fsp--;
@@ -29247,25 +29247,25 @@ public final void rule__XAnnotationElementValuePair__Group__0() throws Recogniti
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9510:1: rule__XAnnotationElementValuePair__Group__0__Impl : ( ( rule__XAnnotationElementValuePair__Group_0__0 ) ) ;
+    // InternalFormat.g:9510:1: rule__XAnnotationElementValuePair__Group__0__Impl : ( ( rule__XAnnotationElementValuePair__Group_0__0 ) ) ;
     public final void rule__XAnnotationElementValuePair__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9514:1: ( ( ( rule__XAnnotationElementValuePair__Group_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9515:1: ( ( rule__XAnnotationElementValuePair__Group_0__0 ) )
+            // InternalFormat.g:9514:1: ( ( ( rule__XAnnotationElementValuePair__Group_0__0 ) ) )
+            // InternalFormat.g:9515:1: ( ( rule__XAnnotationElementValuePair__Group_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9515:1: ( ( rule__XAnnotationElementValuePair__Group_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9516:1: ( rule__XAnnotationElementValuePair__Group_0__0 )
+            // InternalFormat.g:9515:1: ( ( rule__XAnnotationElementValuePair__Group_0__0 ) )
+            // InternalFormat.g:9516:1: ( rule__XAnnotationElementValuePair__Group_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getGroup_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9517:1: ( rule__XAnnotationElementValuePair__Group_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9517:2: rule__XAnnotationElementValuePair__Group_0__0
+            // InternalFormat.g:9517:1: ( rule__XAnnotationElementValuePair__Group_0__0 )
+            // InternalFormat.g:9517:2: rule__XAnnotationElementValuePair__Group_0__0
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__Group_0__0_in_rule__XAnnotationElementValuePair__Group__0__Impl19925);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValuePair__Group_0__0();
 
             state._fsp--;
@@ -29298,16 +29298,16 @@ public final void rule__XAnnotationElementValuePair__Group__0__Impl() throws Rec
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9527:1: rule__XAnnotationElementValuePair__Group__1 : rule__XAnnotationElementValuePair__Group__1__Impl ;
+    // InternalFormat.g:9527:1: rule__XAnnotationElementValuePair__Group__1 : rule__XAnnotationElementValuePair__Group__1__Impl ;
     public final void rule__XAnnotationElementValuePair__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9531:1: ( rule__XAnnotationElementValuePair__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9532:2: rule__XAnnotationElementValuePair__Group__1__Impl
+            // InternalFormat.g:9531:1: ( rule__XAnnotationElementValuePair__Group__1__Impl )
+            // InternalFormat.g:9532:2: rule__XAnnotationElementValuePair__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__Group__1__Impl_in_rule__XAnnotationElementValuePair__Group__119955);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValuePair__Group__1__Impl();
 
             state._fsp--;
@@ -29331,25 +29331,25 @@ public final void rule__XAnnotationElementValuePair__Group__1() throws Recogniti
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9538:1: rule__XAnnotationElementValuePair__Group__1__Impl : ( ( rule__XAnnotationElementValuePair__ValueAssignment_1 ) ) ;
+    // InternalFormat.g:9538:1: rule__XAnnotationElementValuePair__Group__1__Impl : ( ( rule__XAnnotationElementValuePair__ValueAssignment_1 ) ) ;
     public final void rule__XAnnotationElementValuePair__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9542:1: ( ( ( rule__XAnnotationElementValuePair__ValueAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9543:1: ( ( rule__XAnnotationElementValuePair__ValueAssignment_1 ) )
+            // InternalFormat.g:9542:1: ( ( ( rule__XAnnotationElementValuePair__ValueAssignment_1 ) ) )
+            // InternalFormat.g:9543:1: ( ( rule__XAnnotationElementValuePair__ValueAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9543:1: ( ( rule__XAnnotationElementValuePair__ValueAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9544:1: ( rule__XAnnotationElementValuePair__ValueAssignment_1 )
+            // InternalFormat.g:9543:1: ( ( rule__XAnnotationElementValuePair__ValueAssignment_1 ) )
+            // InternalFormat.g:9544:1: ( rule__XAnnotationElementValuePair__ValueAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getValueAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9545:1: ( rule__XAnnotationElementValuePair__ValueAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9545:2: rule__XAnnotationElementValuePair__ValueAssignment_1
+            // InternalFormat.g:9545:1: ( rule__XAnnotationElementValuePair__ValueAssignment_1 )
+            // InternalFormat.g:9545:2: rule__XAnnotationElementValuePair__ValueAssignment_1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__ValueAssignment_1_in_rule__XAnnotationElementValuePair__Group__1__Impl19982);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValuePair__ValueAssignment_1();
 
             state._fsp--;
@@ -29382,16 +29382,16 @@ public final void rule__XAnnotationElementValuePair__Group__1__Impl() throws Rec
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9559:1: rule__XAnnotationElementValuePair__Group_0__0 : rule__XAnnotationElementValuePair__Group_0__0__Impl ;
+    // InternalFormat.g:9559:1: rule__XAnnotationElementValuePair__Group_0__0 : rule__XAnnotationElementValuePair__Group_0__0__Impl ;
     public final void rule__XAnnotationElementValuePair__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9563:1: ( rule__XAnnotationElementValuePair__Group_0__0__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9564:2: rule__XAnnotationElementValuePair__Group_0__0__Impl
+            // InternalFormat.g:9563:1: ( rule__XAnnotationElementValuePair__Group_0__0__Impl )
+            // InternalFormat.g:9564:2: rule__XAnnotationElementValuePair__Group_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__Group_0__0__Impl_in_rule__XAnnotationElementValuePair__Group_0__020016);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValuePair__Group_0__0__Impl();
 
             state._fsp--;
@@ -29415,25 +29415,25 @@ public final void rule__XAnnotationElementValuePair__Group_0__0() throws Recogni
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9570:1: rule__XAnnotationElementValuePair__Group_0__0__Impl : ( ( rule__XAnnotationElementValuePair__Group_0_0__0 ) ) ;
+    // InternalFormat.g:9570:1: rule__XAnnotationElementValuePair__Group_0__0__Impl : ( ( rule__XAnnotationElementValuePair__Group_0_0__0 ) ) ;
     public final void rule__XAnnotationElementValuePair__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9574:1: ( ( ( rule__XAnnotationElementValuePair__Group_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9575:1: ( ( rule__XAnnotationElementValuePair__Group_0_0__0 ) )
+            // InternalFormat.g:9574:1: ( ( ( rule__XAnnotationElementValuePair__Group_0_0__0 ) ) )
+            // InternalFormat.g:9575:1: ( ( rule__XAnnotationElementValuePair__Group_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9575:1: ( ( rule__XAnnotationElementValuePair__Group_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9576:1: ( rule__XAnnotationElementValuePair__Group_0_0__0 )
+            // InternalFormat.g:9575:1: ( ( rule__XAnnotationElementValuePair__Group_0_0__0 ) )
+            // InternalFormat.g:9576:1: ( rule__XAnnotationElementValuePair__Group_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getGroup_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9577:1: ( rule__XAnnotationElementValuePair__Group_0_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9577:2: rule__XAnnotationElementValuePair__Group_0_0__0
+            // InternalFormat.g:9577:1: ( rule__XAnnotationElementValuePair__Group_0_0__0 )
+            // InternalFormat.g:9577:2: rule__XAnnotationElementValuePair__Group_0_0__0
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__Group_0_0__0_in_rule__XAnnotationElementValuePair__Group_0__0__Impl20043);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValuePair__Group_0_0__0();
 
             state._fsp--;
@@ -29466,21 +29466,21 @@ public final void rule__XAnnotationElementValuePair__Group_0__0__Impl() throws R
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group_0_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9589:1: rule__XAnnotationElementValuePair__Group_0_0__0 : rule__XAnnotationElementValuePair__Group_0_0__0__Impl rule__XAnnotationElementValuePair__Group_0_0__1 ;
+    // InternalFormat.g:9589:1: rule__XAnnotationElementValuePair__Group_0_0__0 : rule__XAnnotationElementValuePair__Group_0_0__0__Impl rule__XAnnotationElementValuePair__Group_0_0__1 ;
     public final void rule__XAnnotationElementValuePair__Group_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9593:1: ( rule__XAnnotationElementValuePair__Group_0_0__0__Impl rule__XAnnotationElementValuePair__Group_0_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9594:2: rule__XAnnotationElementValuePair__Group_0_0__0__Impl rule__XAnnotationElementValuePair__Group_0_0__1
+            // InternalFormat.g:9593:1: ( rule__XAnnotationElementValuePair__Group_0_0__0__Impl rule__XAnnotationElementValuePair__Group_0_0__1 )
+            // InternalFormat.g:9594:2: rule__XAnnotationElementValuePair__Group_0_0__0__Impl rule__XAnnotationElementValuePair__Group_0_0__1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__Group_0_0__0__Impl_in_rule__XAnnotationElementValuePair__Group_0_0__020075);
+            pushFollow(FOLLOW_12);
             rule__XAnnotationElementValuePair__Group_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__Group_0_0__1_in_rule__XAnnotationElementValuePair__Group_0_0__020078);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValuePair__Group_0_0__1();
 
             state._fsp--;
@@ -29504,25 +29504,25 @@ public final void rule__XAnnotationElementValuePair__Group_0_0__0() throws Recog
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9601:1: rule__XAnnotationElementValuePair__Group_0_0__0__Impl : ( ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 ) ) ;
+    // InternalFormat.g:9601:1: rule__XAnnotationElementValuePair__Group_0_0__0__Impl : ( ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 ) ) ;
     public final void rule__XAnnotationElementValuePair__Group_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9605:1: ( ( ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9606:1: ( ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 ) )
+            // InternalFormat.g:9605:1: ( ( ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 ) ) )
+            // InternalFormat.g:9606:1: ( ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9606:1: ( ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9607:1: ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 )
+            // InternalFormat.g:9606:1: ( ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 ) )
+            // InternalFormat.g:9607:1: ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getElementAssignment_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9608:1: ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9608:2: rule__XAnnotationElementValuePair__ElementAssignment_0_0_0
+            // InternalFormat.g:9608:1: ( rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 )
+            // InternalFormat.g:9608:2: rule__XAnnotationElementValuePair__ElementAssignment_0_0_0
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__ElementAssignment_0_0_0_in_rule__XAnnotationElementValuePair__Group_0_0__0__Impl20105);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValuePair__ElementAssignment_0_0_0();
 
             state._fsp--;
@@ -29555,16 +29555,16 @@ public final void rule__XAnnotationElementValuePair__Group_0_0__0__Impl() throws
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group_0_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9618:1: rule__XAnnotationElementValuePair__Group_0_0__1 : rule__XAnnotationElementValuePair__Group_0_0__1__Impl ;
+    // InternalFormat.g:9618:1: rule__XAnnotationElementValuePair__Group_0_0__1 : rule__XAnnotationElementValuePair__Group_0_0__1__Impl ;
     public final void rule__XAnnotationElementValuePair__Group_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9622:1: ( rule__XAnnotationElementValuePair__Group_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9623:2: rule__XAnnotationElementValuePair__Group_0_0__1__Impl
+            // InternalFormat.g:9622:1: ( rule__XAnnotationElementValuePair__Group_0_0__1__Impl )
+            // InternalFormat.g:9623:2: rule__XAnnotationElementValuePair__Group_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValuePair__Group_0_0__1__Impl_in_rule__XAnnotationElementValuePair__Group_0_0__120135);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValuePair__Group_0_0__1__Impl();
 
             state._fsp--;
@@ -29588,22 +29588,22 @@ public final void rule__XAnnotationElementValuePair__Group_0_0__1() throws Recog
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__Group_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9629:1: rule__XAnnotationElementValuePair__Group_0_0__1__Impl : ( '=' ) ;
+    // InternalFormat.g:9629:1: rule__XAnnotationElementValuePair__Group_0_0__1__Impl : ( '=' ) ;
     public final void rule__XAnnotationElementValuePair__Group_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9633:1: ( ( '=' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9634:1: ( '=' )
+            // InternalFormat.g:9633:1: ( ( '=' ) )
+            // InternalFormat.g:9634:1: ( '=' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9634:1: ( '=' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9635:1: '='
+            // InternalFormat.g:9634:1: ( '=' )
+            // InternalFormat.g:9635:1: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getEqualsSignKeyword_0_0_1()); 
             }
-            match(input,14,FOLLOW_14_in_rule__XAnnotationElementValuePair__Group_0_0__1__Impl20163); if (state.failed) return ;
+            match(input,14,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValuePairAccess().getEqualsSignKeyword_0_0_1()); 
             }
@@ -29629,21 +29629,21 @@ public final void rule__XAnnotationElementValuePair__Group_0_0__1__Impl() throws
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9652:1: rule__XAnnotationElementValueOrCommaList__Group_0__0 : rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0__1 ;
+    // InternalFormat.g:9652:1: rule__XAnnotationElementValueOrCommaList__Group_0__0 : rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0__1 ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9656:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9657:2: rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0__1
+            // InternalFormat.g:9656:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0__1 )
+            // InternalFormat.g:9657:2: rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0__1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0__020198);
+            pushFollow(FOLLOW_51);
             rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__1_in_rule__XAnnotationElementValueOrCommaList__Group_0__020201);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_0__1();
 
             state._fsp--;
@@ -29667,25 +29667,25 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0__0() throws
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9664:1: rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 ) ) ;
+    // InternalFormat.g:9664:1: rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 ) ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9668:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9669:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 ) )
+            // InternalFormat.g:9668:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 ) ) )
+            // InternalFormat.g:9669:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9669:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9670:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 )
+            // InternalFormat.g:9669:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 ) )
+            // InternalFormat.g:9670:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9671:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9671:2: rule__XAnnotationElementValueOrCommaList__Group_0_0__0
+            // InternalFormat.g:9671:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0 )
+            // InternalFormat.g:9671:2: rule__XAnnotationElementValueOrCommaList__Group_0_0__0
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0__0_in_rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl20228);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_0_0__0();
 
             state._fsp--;
@@ -29718,21 +29718,21 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl() t
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9681:1: rule__XAnnotationElementValueOrCommaList__Group_0__1 : rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0__2 ;
+    // InternalFormat.g:9681:1: rule__XAnnotationElementValueOrCommaList__Group_0__1 : rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0__2 ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9685:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9686:2: rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0__2
+            // InternalFormat.g:9685:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0__2 )
+            // InternalFormat.g:9686:2: rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0__2
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0__120258);
+            pushFollow(FOLLOW_51);
             rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__2_in_rule__XAnnotationElementValueOrCommaList__Group_0__120261);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_0__2();
 
             state._fsp--;
@@ -29756,22 +29756,22 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0__1() throws
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9693:1: rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )? ) ;
+    // InternalFormat.g:9693:1: rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )? ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9697:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9698:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )? )
+            // InternalFormat.g:9697:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )? ) )
+            // InternalFormat.g:9698:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9698:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9699:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )?
+            // InternalFormat.g:9698:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )? )
+            // InternalFormat.g:9699:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9700:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )?
+            // InternalFormat.g:9700:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0 )?
             int alt96=2;
             int LA96_0 = input.LA(1);
 
@@ -29780,9 +29780,9 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl() t
             }
             switch (alt96) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9700:2: rule__XAnnotationElementValueOrCommaList__Group_0_1__0
+                    // InternalFormat.g:9700:2: rule__XAnnotationElementValueOrCommaList__Group_0_1__0
                     {
-                    pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1__0_in_rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl20288);
+                    pushFollow(FOLLOW_2);
                     rule__XAnnotationElementValueOrCommaList__Group_0_1__0();
 
                     state._fsp--;
@@ -29818,16 +29818,16 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl() t
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9710:1: rule__XAnnotationElementValueOrCommaList__Group_0__2 : rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl ;
+    // InternalFormat.g:9710:1: rule__XAnnotationElementValueOrCommaList__Group_0__2 : rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9714:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9715:2: rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl
+            // InternalFormat.g:9714:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl )
+            // InternalFormat.g:9715:2: rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0__220319);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl();
 
             state._fsp--;
@@ -29851,22 +29851,22 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0__2() throws
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9721:1: rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl : ( ']' ) ;
+    // InternalFormat.g:9721:1: rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl : ( ']' ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9725:1: ( ( ']' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9726:1: ( ']' )
+            // InternalFormat.g:9725:1: ( ( ']' ) )
+            // InternalFormat.g:9726:1: ( ']' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9726:1: ( ']' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9727:1: ']'
+            // InternalFormat.g:9726:1: ( ']' )
+            // InternalFormat.g:9727:1: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getRightSquareBracketKeyword_0_2()); 
             }
-            match(input,70,FOLLOW_70_in_rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl20347); if (state.failed) return ;
+            match(input,70,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getRightSquareBracketKeyword_0_2()); 
             }
@@ -29892,16 +29892,16 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl() t
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9746:1: rule__XAnnotationElementValueOrCommaList__Group_0_0__0 : rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl ;
+    // InternalFormat.g:9746:1: rule__XAnnotationElementValueOrCommaList__Group_0_0__0 : rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9750:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9751:2: rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl
+            // InternalFormat.g:9750:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl )
+            // InternalFormat.g:9751:2: rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_0__020384);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl();
 
             state._fsp--;
@@ -29925,25 +29925,25 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_0__0() throw
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9757:1: rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 ) ) ;
+    // InternalFormat.g:9757:1: rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 ) ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9761:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9762:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 ) )
+            // InternalFormat.g:9761:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 ) ) )
+            // InternalFormat.g:9762:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9762:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9763:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 )
+            // InternalFormat.g:9762:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 ) )
+            // InternalFormat.g:9763:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9764:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9764:2: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0
+            // InternalFormat.g:9764:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 )
+            // InternalFormat.g:9764:2: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0_in_rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl20411);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0();
 
             state._fsp--;
@@ -29976,21 +29976,21 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl()
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9776:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 : rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1 ;
+    // InternalFormat.g:9776:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0 : rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1 ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9780:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9781:2: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1
+            // InternalFormat.g:9780:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1 )
+            // InternalFormat.g:9781:2: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__020443);
+            pushFollow(FOLLOW_52);
             rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__020446);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1();
 
             state._fsp--;
@@ -30014,23 +30014,23 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0() thr
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9788:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl : ( () ) ;
+    // InternalFormat.g:9788:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl : ( () ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9792:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9793:1: ( () )
+            // InternalFormat.g:9792:1: ( ( () ) )
+            // InternalFormat.g:9793:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9793:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9794:1: ()
+            // InternalFormat.g:9793:1: ( () )
+            // InternalFormat.g:9794:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getXListLiteralAction_0_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9795:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9797:1: 
+            // InternalFormat.g:9795:1: ()
+            // InternalFormat.g:9797:1: 
             {
             }
 
@@ -30055,21 +30055,21 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9807:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1 : rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2 ;
+    // InternalFormat.g:9807:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1 : rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2 ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9811:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9812:2: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2
+            // InternalFormat.g:9811:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2 )
+            // InternalFormat.g:9812:2: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__120504);
+            pushFollow(FOLLOW_53);
             rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__120507);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2();
 
             state._fsp--;
@@ -30093,22 +30093,22 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1() thr
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9819:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl : ( '#' ) ;
+    // InternalFormat.g:9819:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl : ( '#' ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9823:1: ( ( '#' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9824:1: ( '#' )
+            // InternalFormat.g:9823:1: ( ( '#' ) )
+            // InternalFormat.g:9824:1: ( '#' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9824:1: ( '#' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9825:1: '#'
+            // InternalFormat.g:9824:1: ( '#' )
+            // InternalFormat.g:9825:1: '#'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getNumberSignKeyword_0_0_0_1()); 
             }
-            match(input,84,FOLLOW_84_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl20535); if (state.failed) return ;
+            match(input,84,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getNumberSignKeyword_0_0_0_1()); 
             }
@@ -30134,16 +30134,16 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9838:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2 : rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl ;
+    // InternalFormat.g:9838:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2 : rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9842:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9843:2: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl
+            // InternalFormat.g:9842:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl )
+            // InternalFormat.g:9843:2: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__220566);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl();
 
             state._fsp--;
@@ -30167,22 +30167,22 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2() thr
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9849:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl : ( '[' ) ;
+    // InternalFormat.g:9849:1: rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl : ( '[' ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9853:1: ( ( '[' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9854:1: ( '[' )
+            // InternalFormat.g:9853:1: ( ( '[' ) )
+            // InternalFormat.g:9854:1: ( '[' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9854:1: ( '[' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9855:1: '['
+            // InternalFormat.g:9854:1: ( '[' )
+            // InternalFormat.g:9855:1: '['
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getLeftSquareBracketKeyword_0_0_0_2()); 
             }
-            match(input,69,FOLLOW_69_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl20594); if (state.failed) return ;
+            match(input,69,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getLeftSquareBracketKeyword_0_0_0_2()); 
             }
@@ -30208,21 +30208,21 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9874:1: rule__XAnnotationElementValueOrCommaList__Group_0_1__0 : rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1__1 ;
+    // InternalFormat.g:9874:1: rule__XAnnotationElementValueOrCommaList__Group_0_1__0 : rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1__1 ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9878:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9879:2: rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1__1
+            // InternalFormat.g:9878:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1__1 )
+            // InternalFormat.g:9879:2: rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1__1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_1__020631);
+            pushFollow(FOLLOW_46);
             rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1__1_in_rule__XAnnotationElementValueOrCommaList__Group_0_1__020634);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_0_1__1();
 
             state._fsp--;
@@ -30246,25 +30246,25 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_1__0() throw
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9886:1: rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl : ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 ) ) ;
+    // InternalFormat.g:9886:1: rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl : ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 ) ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9890:1: ( ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9891:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 ) )
+            // InternalFormat.g:9890:1: ( ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 ) ) )
+            // InternalFormat.g:9891:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9891:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9892:1: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 )
+            // InternalFormat.g:9891:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 ) )
+            // InternalFormat.g:9892:1: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsAssignment_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9893:1: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9893:2: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0
+            // InternalFormat.g:9893:1: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 )
+            // InternalFormat.g:9893:2: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0_in_rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl20661);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0();
 
             state._fsp--;
@@ -30297,16 +30297,16 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl()
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9903:1: rule__XAnnotationElementValueOrCommaList__Group_0_1__1 : rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl ;
+    // InternalFormat.g:9903:1: rule__XAnnotationElementValueOrCommaList__Group_0_1__1 : rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9907:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9908:2: rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl
+            // InternalFormat.g:9907:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl )
+            // InternalFormat.g:9908:2: rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_1__120691);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl();
 
             state._fsp--;
@@ -30330,22 +30330,22 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_1__1() throw
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9914:1: rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )* ) ;
+    // InternalFormat.g:9914:1: rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )* ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9918:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9919:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )* )
+            // InternalFormat.g:9918:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )* ) )
+            // InternalFormat.g:9919:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9919:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9920:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )*
+            // InternalFormat.g:9919:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )* )
+            // InternalFormat.g:9920:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_0_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9921:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )*
+            // InternalFormat.g:9921:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 )*
             loop97:
             do {
                 int alt97=2;
@@ -30358,9 +30358,9 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl()
 
                 switch (alt97) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9921:2: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0
+            	    // InternalFormat.g:9921:2: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0_in_rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl20718);
+            	    pushFollow(FOLLOW_23);
             	    rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0();
 
             	    state._fsp--;
@@ -30399,21 +30399,21 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl()
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9935:1: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 : rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1 ;
+    // InternalFormat.g:9935:1: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0 : rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1 ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9939:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9940:2: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1
+            // InternalFormat.g:9939:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1 )
+            // InternalFormat.g:9940:2: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__020753);
+            pushFollow(FOLLOW_50);
             rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1_in_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__020756);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1();
 
             state._fsp--;
@@ -30437,22 +30437,22 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0() thr
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9947:1: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl : ( ',' ) ;
+    // InternalFormat.g:9947:1: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl : ( ',' ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9951:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9952:1: ( ',' )
+            // InternalFormat.g:9951:1: ( ( ',' ) )
+            // InternalFormat.g:9952:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9952:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9953:1: ','
+            // InternalFormat.g:9952:1: ( ',' )
+            // InternalFormat.g:9953:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getCommaKeyword_0_1_1_0()); 
             }
-            match(input,71,FOLLOW_71_in_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl20784); if (state.failed) return ;
+            match(input,71,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getCommaKeyword_0_1_1_0()); 
             }
@@ -30478,16 +30478,16 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9966:1: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1 : rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl ;
+    // InternalFormat.g:9966:1: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1 : rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9970:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9971:2: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl
+            // InternalFormat.g:9970:1: ( rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl )
+            // InternalFormat.g:9971:2: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__120815);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl();
 
             state._fsp--;
@@ -30511,25 +30511,25 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1() thr
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9977:1: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 ) ) ;
+    // InternalFormat.g:9977:1: rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 ) ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9981:1: ( ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9982:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 ) )
+            // InternalFormat.g:9981:1: ( ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 ) ) )
+            // InternalFormat.g:9982:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9982:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9983:1: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 )
+            // InternalFormat.g:9982:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 ) )
+            // InternalFormat.g:9983:1: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsAssignment_0_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9984:1: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9984:2: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1
+            // InternalFormat.g:9984:1: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 )
+            // InternalFormat.g:9984:2: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1_in_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl20842);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1();
 
             state._fsp--;
@@ -30562,21 +30562,21 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:9998:1: rule__XAnnotationElementValueOrCommaList__Group_1__0 : rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1__1 ;
+    // InternalFormat.g:9998:1: rule__XAnnotationElementValueOrCommaList__Group_1__0 : rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1__1 ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10002:1: ( rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10003:2: rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1__1
+            // InternalFormat.g:10002:1: ( rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1__1 )
+            // InternalFormat.g:10003:2: rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1__020876);
+            pushFollow(FOLLOW_46);
             rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1__1_in_rule__XAnnotationElementValueOrCommaList__Group_1__020879);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_1__1();
 
             state._fsp--;
@@ -30600,22 +30600,22 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1__0() throws
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10010:1: rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl : ( ruleXAnnotationOrExpression ) ;
+    // InternalFormat.g:10010:1: rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl : ( ruleXAnnotationOrExpression ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10014:1: ( ( ruleXAnnotationOrExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10015:1: ( ruleXAnnotationOrExpression )
+            // InternalFormat.g:10014:1: ( ( ruleXAnnotationOrExpression ) )
+            // InternalFormat.g:10015:1: ( ruleXAnnotationOrExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10015:1: ( ruleXAnnotationOrExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10016:1: ruleXAnnotationOrExpression
+            // InternalFormat.g:10015:1: ( ruleXAnnotationOrExpression )
+            // InternalFormat.g:10016:1: ruleXAnnotationOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getXAnnotationOrExpressionParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl20906);
+            pushFollow(FOLLOW_2);
             ruleXAnnotationOrExpression();
 
             state._fsp--;
@@ -30645,16 +30645,16 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl() t
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10027:1: rule__XAnnotationElementValueOrCommaList__Group_1__1 : rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl ;
+    // InternalFormat.g:10027:1: rule__XAnnotationElementValueOrCommaList__Group_1__1 : rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10031:1: ( rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10032:2: rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl
+            // InternalFormat.g:10031:1: ( rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl )
+            // InternalFormat.g:10032:2: rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1__120935);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl();
 
             state._fsp--;
@@ -30678,22 +30678,22 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1__1() throws
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10038:1: rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )? ) ;
+    // InternalFormat.g:10038:1: rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )? ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10042:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10043:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )? )
+            // InternalFormat.g:10042:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )? ) )
+            // InternalFormat.g:10043:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10043:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10044:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )?
+            // InternalFormat.g:10043:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )? )
+            // InternalFormat.g:10044:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10045:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )?
+            // InternalFormat.g:10045:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0 )?
             int alt98=2;
             int LA98_0 = input.LA(1);
 
@@ -30702,9 +30702,9 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl() t
             }
             switch (alt98) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10045:2: rule__XAnnotationElementValueOrCommaList__Group_1_1__0
+                    // InternalFormat.g:10045:2: rule__XAnnotationElementValueOrCommaList__Group_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1__0_in_rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl20962);
+                    pushFollow(FOLLOW_2);
                     rule__XAnnotationElementValueOrCommaList__Group_1_1__0();
 
                     state._fsp--;
@@ -30740,21 +30740,21 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl() t
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10059:1: rule__XAnnotationElementValueOrCommaList__Group_1_1__0 : rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1__1 ;
+    // InternalFormat.g:10059:1: rule__XAnnotationElementValueOrCommaList__Group_1_1__0 : rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1__1 ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10063:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10064:2: rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1__1
+            // InternalFormat.g:10063:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1__1 )
+            // InternalFormat.g:10064:2: rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1__1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1_1__020997);
+            pushFollow(FOLLOW_46);
             rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1__1_in_rule__XAnnotationElementValueOrCommaList__Group_1_1__021000);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_1_1__1();
 
             state._fsp--;
@@ -30778,23 +30778,23 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1_1__0() throw
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10071:1: rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl : ( () ) ;
+    // InternalFormat.g:10071:1: rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl : ( () ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10075:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10076:1: ( () )
+            // InternalFormat.g:10075:1: ( ( () ) )
+            // InternalFormat.g:10076:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10076:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10077:1: ()
+            // InternalFormat.g:10076:1: ( () )
+            // InternalFormat.g:10077:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getXListLiteralElementsAction_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10078:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10080:1: 
+            // InternalFormat.g:10078:1: ()
+            // InternalFormat.g:10080:1: 
             {
             }
 
@@ -30819,16 +30819,16 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl()
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10090:1: rule__XAnnotationElementValueOrCommaList__Group_1_1__1 : rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl ;
+    // InternalFormat.g:10090:1: rule__XAnnotationElementValueOrCommaList__Group_1_1__1 : rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10094:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10095:2: rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl
+            // InternalFormat.g:10094:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl )
+            // InternalFormat.g:10095:2: rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1_1__121058);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl();
 
             state._fsp--;
@@ -30852,28 +30852,28 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1_1__1() throw
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10101:1: rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl : ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* ) ) ;
+    // InternalFormat.g:10101:1: rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl : ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* ) ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10105:1: ( ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10106:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* ) )
+            // InternalFormat.g:10105:1: ( ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* ) ) )
+            // InternalFormat.g:10106:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10106:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10107:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* )
+            // InternalFormat.g:10106:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* ) )
+            // InternalFormat.g:10107:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) ) ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10107:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10108:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )
+            // InternalFormat.g:10107:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 ) )
+            // InternalFormat.g:10108:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10109:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10109:2: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0
+            // InternalFormat.g:10109:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )
+            // InternalFormat.g:10109:2: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0_in_rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl21087);
+            pushFollow(FOLLOW_23);
             rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0();
 
             state._fsp--;
@@ -30887,13 +30887,13 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl()
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10112:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10113:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )*
+            // InternalFormat.g:10112:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )* )
+            // InternalFormat.g:10113:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10114:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )*
+            // InternalFormat.g:10114:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 )*
             loop99:
             do {
                 int alt99=2;
@@ -30906,9 +30906,9 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl()
 
                 switch (alt99) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10114:2: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0
+            	    // InternalFormat.g:10114:2: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0_in_rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl21099);
+            	    pushFollow(FOLLOW_23);
             	    rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0();
 
             	    state._fsp--;
@@ -30950,21 +30950,21 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl()
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10129:1: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 : rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1 ;
+    // InternalFormat.g:10129:1: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0 : rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1 ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10133:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10134:2: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1
+            // InternalFormat.g:10133:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1 )
+            // InternalFormat.g:10134:2: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__021136);
+            pushFollow(FOLLOW_50);
             rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1_in_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__021139);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1();
 
             state._fsp--;
@@ -30988,22 +30988,22 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0() thr
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10141:1: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl : ( ',' ) ;
+    // InternalFormat.g:10141:1: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl : ( ',' ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10145:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10146:1: ( ',' )
+            // InternalFormat.g:10145:1: ( ( ',' ) )
+            // InternalFormat.g:10146:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10146:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10147:1: ','
+            // InternalFormat.g:10146:1: ( ',' )
+            // InternalFormat.g:10147:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getCommaKeyword_1_1_1_0()); 
             }
-            match(input,71,FOLLOW_71_in_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl21167); if (state.failed) return ;
+            match(input,71,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getCommaKeyword_1_1_1_0()); 
             }
@@ -31029,16 +31029,16 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10160:1: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1 : rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl ;
+    // InternalFormat.g:10160:1: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1 : rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10164:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10165:2: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl
+            // InternalFormat.g:10164:1: ( rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl )
+            // InternalFormat.g:10165:2: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__121198);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl();
 
             state._fsp--;
@@ -31062,25 +31062,25 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1() thr
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10171:1: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 ) ) ;
+    // InternalFormat.g:10171:1: rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl : ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 ) ) ;
     public final void rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10175:1: ( ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10176:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 ) )
+            // InternalFormat.g:10175:1: ( ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 ) ) )
+            // InternalFormat.g:10176:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10176:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10177:1: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 )
+            // InternalFormat.g:10176:1: ( ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 ) )
+            // InternalFormat.g:10177:1: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsAssignment_1_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10178:1: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10178:2: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1
+            // InternalFormat.g:10178:1: ( rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 )
+            // InternalFormat.g:10178:2: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1_in_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl21225);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1();
 
             state._fsp--;
@@ -31113,21 +31113,21 @@ public final void rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10192:1: rule__XAnnotationElementValue__Group_0__0 : rule__XAnnotationElementValue__Group_0__0__Impl rule__XAnnotationElementValue__Group_0__1 ;
+    // InternalFormat.g:10192:1: rule__XAnnotationElementValue__Group_0__0 : rule__XAnnotationElementValue__Group_0__0__Impl rule__XAnnotationElementValue__Group_0__1 ;
     public final void rule__XAnnotationElementValue__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10196:1: ( rule__XAnnotationElementValue__Group_0__0__Impl rule__XAnnotationElementValue__Group_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10197:2: rule__XAnnotationElementValue__Group_0__0__Impl rule__XAnnotationElementValue__Group_0__1
+            // InternalFormat.g:10196:1: ( rule__XAnnotationElementValue__Group_0__0__Impl rule__XAnnotationElementValue__Group_0__1 )
+            // InternalFormat.g:10197:2: rule__XAnnotationElementValue__Group_0__0__Impl rule__XAnnotationElementValue__Group_0__1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0__0__Impl_in_rule__XAnnotationElementValue__Group_0__021259);
+            pushFollow(FOLLOW_51);
             rule__XAnnotationElementValue__Group_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0__1_in_rule__XAnnotationElementValue__Group_0__021262);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Group_0__1();
 
             state._fsp--;
@@ -31151,25 +31151,25 @@ public final void rule__XAnnotationElementValue__Group_0__0() throws Recognition
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10204:1: rule__XAnnotationElementValue__Group_0__0__Impl : ( ( rule__XAnnotationElementValue__Group_0_0__0 ) ) ;
+    // InternalFormat.g:10204:1: rule__XAnnotationElementValue__Group_0__0__Impl : ( ( rule__XAnnotationElementValue__Group_0_0__0 ) ) ;
     public final void rule__XAnnotationElementValue__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10208:1: ( ( ( rule__XAnnotationElementValue__Group_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10209:1: ( ( rule__XAnnotationElementValue__Group_0_0__0 ) )
+            // InternalFormat.g:10208:1: ( ( ( rule__XAnnotationElementValue__Group_0_0__0 ) ) )
+            // InternalFormat.g:10209:1: ( ( rule__XAnnotationElementValue__Group_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10209:1: ( ( rule__XAnnotationElementValue__Group_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10210:1: ( rule__XAnnotationElementValue__Group_0_0__0 )
+            // InternalFormat.g:10209:1: ( ( rule__XAnnotationElementValue__Group_0_0__0 ) )
+            // InternalFormat.g:10210:1: ( rule__XAnnotationElementValue__Group_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getGroup_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10211:1: ( rule__XAnnotationElementValue__Group_0_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10211:2: rule__XAnnotationElementValue__Group_0_0__0
+            // InternalFormat.g:10211:1: ( rule__XAnnotationElementValue__Group_0_0__0 )
+            // InternalFormat.g:10211:2: rule__XAnnotationElementValue__Group_0_0__0
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_0__0_in_rule__XAnnotationElementValue__Group_0__0__Impl21289);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Group_0_0__0();
 
             state._fsp--;
@@ -31202,21 +31202,21 @@ public final void rule__XAnnotationElementValue__Group_0__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10221:1: rule__XAnnotationElementValue__Group_0__1 : rule__XAnnotationElementValue__Group_0__1__Impl rule__XAnnotationElementValue__Group_0__2 ;
+    // InternalFormat.g:10221:1: rule__XAnnotationElementValue__Group_0__1 : rule__XAnnotationElementValue__Group_0__1__Impl rule__XAnnotationElementValue__Group_0__2 ;
     public final void rule__XAnnotationElementValue__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10225:1: ( rule__XAnnotationElementValue__Group_0__1__Impl rule__XAnnotationElementValue__Group_0__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10226:2: rule__XAnnotationElementValue__Group_0__1__Impl rule__XAnnotationElementValue__Group_0__2
+            // InternalFormat.g:10225:1: ( rule__XAnnotationElementValue__Group_0__1__Impl rule__XAnnotationElementValue__Group_0__2 )
+            // InternalFormat.g:10226:2: rule__XAnnotationElementValue__Group_0__1__Impl rule__XAnnotationElementValue__Group_0__2
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0__1__Impl_in_rule__XAnnotationElementValue__Group_0__121319);
+            pushFollow(FOLLOW_51);
             rule__XAnnotationElementValue__Group_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0__2_in_rule__XAnnotationElementValue__Group_0__121322);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Group_0__2();
 
             state._fsp--;
@@ -31240,22 +31240,22 @@ public final void rule__XAnnotationElementValue__Group_0__1() throws Recognition
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10233:1: rule__XAnnotationElementValue__Group_0__1__Impl : ( ( rule__XAnnotationElementValue__Group_0_1__0 )? ) ;
+    // InternalFormat.g:10233:1: rule__XAnnotationElementValue__Group_0__1__Impl : ( ( rule__XAnnotationElementValue__Group_0_1__0 )? ) ;
     public final void rule__XAnnotationElementValue__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10237:1: ( ( ( rule__XAnnotationElementValue__Group_0_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10238:1: ( ( rule__XAnnotationElementValue__Group_0_1__0 )? )
+            // InternalFormat.g:10237:1: ( ( ( rule__XAnnotationElementValue__Group_0_1__0 )? ) )
+            // InternalFormat.g:10238:1: ( ( rule__XAnnotationElementValue__Group_0_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10238:1: ( ( rule__XAnnotationElementValue__Group_0_1__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10239:1: ( rule__XAnnotationElementValue__Group_0_1__0 )?
+            // InternalFormat.g:10238:1: ( ( rule__XAnnotationElementValue__Group_0_1__0 )? )
+            // InternalFormat.g:10239:1: ( rule__XAnnotationElementValue__Group_0_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getGroup_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10240:1: ( rule__XAnnotationElementValue__Group_0_1__0 )?
+            // InternalFormat.g:10240:1: ( rule__XAnnotationElementValue__Group_0_1__0 )?
             int alt100=2;
             int LA100_0 = input.LA(1);
 
@@ -31264,9 +31264,9 @@ public final void rule__XAnnotationElementValue__Group_0__1__Impl() throws Recog
             }
             switch (alt100) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10240:2: rule__XAnnotationElementValue__Group_0_1__0
+                    // InternalFormat.g:10240:2: rule__XAnnotationElementValue__Group_0_1__0
                     {
-                    pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_1__0_in_rule__XAnnotationElementValue__Group_0__1__Impl21349);
+                    pushFollow(FOLLOW_2);
                     rule__XAnnotationElementValue__Group_0_1__0();
 
                     state._fsp--;
@@ -31302,16 +31302,16 @@ public final void rule__XAnnotationElementValue__Group_0__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10250:1: rule__XAnnotationElementValue__Group_0__2 : rule__XAnnotationElementValue__Group_0__2__Impl ;
+    // InternalFormat.g:10250:1: rule__XAnnotationElementValue__Group_0__2 : rule__XAnnotationElementValue__Group_0__2__Impl ;
     public final void rule__XAnnotationElementValue__Group_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10254:1: ( rule__XAnnotationElementValue__Group_0__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10255:2: rule__XAnnotationElementValue__Group_0__2__Impl
+            // InternalFormat.g:10254:1: ( rule__XAnnotationElementValue__Group_0__2__Impl )
+            // InternalFormat.g:10255:2: rule__XAnnotationElementValue__Group_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0__2__Impl_in_rule__XAnnotationElementValue__Group_0__221380);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Group_0__2__Impl();
 
             state._fsp--;
@@ -31335,22 +31335,22 @@ public final void rule__XAnnotationElementValue__Group_0__2() throws Recognition
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10261:1: rule__XAnnotationElementValue__Group_0__2__Impl : ( ']' ) ;
+    // InternalFormat.g:10261:1: rule__XAnnotationElementValue__Group_0__2__Impl : ( ']' ) ;
     public final void rule__XAnnotationElementValue__Group_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10265:1: ( ( ']' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10266:1: ( ']' )
+            // InternalFormat.g:10265:1: ( ( ']' ) )
+            // InternalFormat.g:10266:1: ( ']' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10266:1: ( ']' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10267:1: ']'
+            // InternalFormat.g:10266:1: ( ']' )
+            // InternalFormat.g:10267:1: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getRightSquareBracketKeyword_0_2()); 
             }
-            match(input,70,FOLLOW_70_in_rule__XAnnotationElementValue__Group_0__2__Impl21408); if (state.failed) return ;
+            match(input,70,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValueAccess().getRightSquareBracketKeyword_0_2()); 
             }
@@ -31376,16 +31376,16 @@ public final void rule__XAnnotationElementValue__Group_0__2__Impl() throws Recog
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10286:1: rule__XAnnotationElementValue__Group_0_0__0 : rule__XAnnotationElementValue__Group_0_0__0__Impl ;
+    // InternalFormat.g:10286:1: rule__XAnnotationElementValue__Group_0_0__0 : rule__XAnnotationElementValue__Group_0_0__0__Impl ;
     public final void rule__XAnnotationElementValue__Group_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10290:1: ( rule__XAnnotationElementValue__Group_0_0__0__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10291:2: rule__XAnnotationElementValue__Group_0_0__0__Impl
+            // InternalFormat.g:10290:1: ( rule__XAnnotationElementValue__Group_0_0__0__Impl )
+            // InternalFormat.g:10291:2: rule__XAnnotationElementValue__Group_0_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_0__0__Impl_in_rule__XAnnotationElementValue__Group_0_0__021445);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Group_0_0__0__Impl();
 
             state._fsp--;
@@ -31409,25 +31409,25 @@ public final void rule__XAnnotationElementValue__Group_0_0__0() throws Recogniti
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10297:1: rule__XAnnotationElementValue__Group_0_0__0__Impl : ( ( rule__XAnnotationElementValue__Group_0_0_0__0 ) ) ;
+    // InternalFormat.g:10297:1: rule__XAnnotationElementValue__Group_0_0__0__Impl : ( ( rule__XAnnotationElementValue__Group_0_0_0__0 ) ) ;
     public final void rule__XAnnotationElementValue__Group_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10301:1: ( ( ( rule__XAnnotationElementValue__Group_0_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10302:1: ( ( rule__XAnnotationElementValue__Group_0_0_0__0 ) )
+            // InternalFormat.g:10301:1: ( ( ( rule__XAnnotationElementValue__Group_0_0_0__0 ) ) )
+            // InternalFormat.g:10302:1: ( ( rule__XAnnotationElementValue__Group_0_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10302:1: ( ( rule__XAnnotationElementValue__Group_0_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10303:1: ( rule__XAnnotationElementValue__Group_0_0_0__0 )
+            // InternalFormat.g:10302:1: ( ( rule__XAnnotationElementValue__Group_0_0_0__0 ) )
+            // InternalFormat.g:10303:1: ( rule__XAnnotationElementValue__Group_0_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getGroup_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10304:1: ( rule__XAnnotationElementValue__Group_0_0_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10304:2: rule__XAnnotationElementValue__Group_0_0_0__0
+            // InternalFormat.g:10304:1: ( rule__XAnnotationElementValue__Group_0_0_0__0 )
+            // InternalFormat.g:10304:2: rule__XAnnotationElementValue__Group_0_0_0__0
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__0_in_rule__XAnnotationElementValue__Group_0_0__0__Impl21472);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Group_0_0_0__0();
 
             state._fsp--;
@@ -31460,21 +31460,21 @@ public final void rule__XAnnotationElementValue__Group_0_0__0__Impl() throws Rec
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_0_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10316:1: rule__XAnnotationElementValue__Group_0_0_0__0 : rule__XAnnotationElementValue__Group_0_0_0__0__Impl rule__XAnnotationElementValue__Group_0_0_0__1 ;
+    // InternalFormat.g:10316:1: rule__XAnnotationElementValue__Group_0_0_0__0 : rule__XAnnotationElementValue__Group_0_0_0__0__Impl rule__XAnnotationElementValue__Group_0_0_0__1 ;
     public final void rule__XAnnotationElementValue__Group_0_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10320:1: ( rule__XAnnotationElementValue__Group_0_0_0__0__Impl rule__XAnnotationElementValue__Group_0_0_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10321:2: rule__XAnnotationElementValue__Group_0_0_0__0__Impl rule__XAnnotationElementValue__Group_0_0_0__1
+            // InternalFormat.g:10320:1: ( rule__XAnnotationElementValue__Group_0_0_0__0__Impl rule__XAnnotationElementValue__Group_0_0_0__1 )
+            // InternalFormat.g:10321:2: rule__XAnnotationElementValue__Group_0_0_0__0__Impl rule__XAnnotationElementValue__Group_0_0_0__1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__0__Impl_in_rule__XAnnotationElementValue__Group_0_0_0__021504);
+            pushFollow(FOLLOW_52);
             rule__XAnnotationElementValue__Group_0_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__1_in_rule__XAnnotationElementValue__Group_0_0_0__021507);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Group_0_0_0__1();
 
             state._fsp--;
@@ -31498,23 +31498,23 @@ public final void rule__XAnnotationElementValue__Group_0_0_0__0() throws Recogni
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10328:1: rule__XAnnotationElementValue__Group_0_0_0__0__Impl : ( () ) ;
+    // InternalFormat.g:10328:1: rule__XAnnotationElementValue__Group_0_0_0__0__Impl : ( () ) ;
     public final void rule__XAnnotationElementValue__Group_0_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10332:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10333:1: ( () )
+            // InternalFormat.g:10332:1: ( ( () ) )
+            // InternalFormat.g:10333:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10333:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10334:1: ()
+            // InternalFormat.g:10333:1: ( () )
+            // InternalFormat.g:10334:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getXListLiteralAction_0_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10335:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10337:1: 
+            // InternalFormat.g:10335:1: ()
+            // InternalFormat.g:10337:1: 
             {
             }
 
@@ -31539,21 +31539,21 @@ public final void rule__XAnnotationElementValue__Group_0_0_0__0__Impl() throws R
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_0_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10347:1: rule__XAnnotationElementValue__Group_0_0_0__1 : rule__XAnnotationElementValue__Group_0_0_0__1__Impl rule__XAnnotationElementValue__Group_0_0_0__2 ;
+    // InternalFormat.g:10347:1: rule__XAnnotationElementValue__Group_0_0_0__1 : rule__XAnnotationElementValue__Group_0_0_0__1__Impl rule__XAnnotationElementValue__Group_0_0_0__2 ;
     public final void rule__XAnnotationElementValue__Group_0_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10351:1: ( rule__XAnnotationElementValue__Group_0_0_0__1__Impl rule__XAnnotationElementValue__Group_0_0_0__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10352:2: rule__XAnnotationElementValue__Group_0_0_0__1__Impl rule__XAnnotationElementValue__Group_0_0_0__2
+            // InternalFormat.g:10351:1: ( rule__XAnnotationElementValue__Group_0_0_0__1__Impl rule__XAnnotationElementValue__Group_0_0_0__2 )
+            // InternalFormat.g:10352:2: rule__XAnnotationElementValue__Group_0_0_0__1__Impl rule__XAnnotationElementValue__Group_0_0_0__2
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__1__Impl_in_rule__XAnnotationElementValue__Group_0_0_0__121565);
+            pushFollow(FOLLOW_53);
             rule__XAnnotationElementValue__Group_0_0_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__2_in_rule__XAnnotationElementValue__Group_0_0_0__121568);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Group_0_0_0__2();
 
             state._fsp--;
@@ -31577,22 +31577,22 @@ public final void rule__XAnnotationElementValue__Group_0_0_0__1() throws Recogni
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10359:1: rule__XAnnotationElementValue__Group_0_0_0__1__Impl : ( '#' ) ;
+    // InternalFormat.g:10359:1: rule__XAnnotationElementValue__Group_0_0_0__1__Impl : ( '#' ) ;
     public final void rule__XAnnotationElementValue__Group_0_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10363:1: ( ( '#' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10364:1: ( '#' )
+            // InternalFormat.g:10363:1: ( ( '#' ) )
+            // InternalFormat.g:10364:1: ( '#' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10364:1: ( '#' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10365:1: '#'
+            // InternalFormat.g:10364:1: ( '#' )
+            // InternalFormat.g:10365:1: '#'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getNumberSignKeyword_0_0_0_1()); 
             }
-            match(input,84,FOLLOW_84_in_rule__XAnnotationElementValue__Group_0_0_0__1__Impl21596); if (state.failed) return ;
+            match(input,84,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValueAccess().getNumberSignKeyword_0_0_0_1()); 
             }
@@ -31618,16 +31618,16 @@ public final void rule__XAnnotationElementValue__Group_0_0_0__1__Impl() throws R
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_0_0__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10378:1: rule__XAnnotationElementValue__Group_0_0_0__2 : rule__XAnnotationElementValue__Group_0_0_0__2__Impl ;
+    // InternalFormat.g:10378:1: rule__XAnnotationElementValue__Group_0_0_0__2 : rule__XAnnotationElementValue__Group_0_0_0__2__Impl ;
     public final void rule__XAnnotationElementValue__Group_0_0_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10382:1: ( rule__XAnnotationElementValue__Group_0_0_0__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10383:2: rule__XAnnotationElementValue__Group_0_0_0__2__Impl
+            // InternalFormat.g:10382:1: ( rule__XAnnotationElementValue__Group_0_0_0__2__Impl )
+            // InternalFormat.g:10383:2: rule__XAnnotationElementValue__Group_0_0_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__2__Impl_in_rule__XAnnotationElementValue__Group_0_0_0__221627);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Group_0_0_0__2__Impl();
 
             state._fsp--;
@@ -31651,22 +31651,22 @@ public final void rule__XAnnotationElementValue__Group_0_0_0__2() throws Recogni
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_0_0__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10389:1: rule__XAnnotationElementValue__Group_0_0_0__2__Impl : ( '[' ) ;
+    // InternalFormat.g:10389:1: rule__XAnnotationElementValue__Group_0_0_0__2__Impl : ( '[' ) ;
     public final void rule__XAnnotationElementValue__Group_0_0_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10393:1: ( ( '[' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10394:1: ( '[' )
+            // InternalFormat.g:10393:1: ( ( '[' ) )
+            // InternalFormat.g:10394:1: ( '[' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10394:1: ( '[' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10395:1: '['
+            // InternalFormat.g:10394:1: ( '[' )
+            // InternalFormat.g:10395:1: '['
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getLeftSquareBracketKeyword_0_0_0_2()); 
             }
-            match(input,69,FOLLOW_69_in_rule__XAnnotationElementValue__Group_0_0_0__2__Impl21655); if (state.failed) return ;
+            match(input,69,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValueAccess().getLeftSquareBracketKeyword_0_0_0_2()); 
             }
@@ -31692,21 +31692,21 @@ public final void rule__XAnnotationElementValue__Group_0_0_0__2__Impl() throws R
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10414:1: rule__XAnnotationElementValue__Group_0_1__0 : rule__XAnnotationElementValue__Group_0_1__0__Impl rule__XAnnotationElementValue__Group_0_1__1 ;
+    // InternalFormat.g:10414:1: rule__XAnnotationElementValue__Group_0_1__0 : rule__XAnnotationElementValue__Group_0_1__0__Impl rule__XAnnotationElementValue__Group_0_1__1 ;
     public final void rule__XAnnotationElementValue__Group_0_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10418:1: ( rule__XAnnotationElementValue__Group_0_1__0__Impl rule__XAnnotationElementValue__Group_0_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10419:2: rule__XAnnotationElementValue__Group_0_1__0__Impl rule__XAnnotationElementValue__Group_0_1__1
+            // InternalFormat.g:10418:1: ( rule__XAnnotationElementValue__Group_0_1__0__Impl rule__XAnnotationElementValue__Group_0_1__1 )
+            // InternalFormat.g:10419:2: rule__XAnnotationElementValue__Group_0_1__0__Impl rule__XAnnotationElementValue__Group_0_1__1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_1__0__Impl_in_rule__XAnnotationElementValue__Group_0_1__021692);
+            pushFollow(FOLLOW_46);
             rule__XAnnotationElementValue__Group_0_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_1__1_in_rule__XAnnotationElementValue__Group_0_1__021695);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Group_0_1__1();
 
             state._fsp--;
@@ -31730,25 +31730,25 @@ public final void rule__XAnnotationElementValue__Group_0_1__0() throws Recogniti
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10426:1: rule__XAnnotationElementValue__Group_0_1__0__Impl : ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 ) ) ;
+    // InternalFormat.g:10426:1: rule__XAnnotationElementValue__Group_0_1__0__Impl : ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 ) ) ;
     public final void rule__XAnnotationElementValue__Group_0_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10430:1: ( ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10431:1: ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 ) )
+            // InternalFormat.g:10430:1: ( ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 ) ) )
+            // InternalFormat.g:10431:1: ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10431:1: ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10432:1: ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 )
+            // InternalFormat.g:10431:1: ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 ) )
+            // InternalFormat.g:10432:1: ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getElementsAssignment_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10433:1: ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10433:2: rule__XAnnotationElementValue__ElementsAssignment_0_1_0
+            // InternalFormat.g:10433:1: ( rule__XAnnotationElementValue__ElementsAssignment_0_1_0 )
+            // InternalFormat.g:10433:2: rule__XAnnotationElementValue__ElementsAssignment_0_1_0
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__ElementsAssignment_0_1_0_in_rule__XAnnotationElementValue__Group_0_1__0__Impl21722);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__ElementsAssignment_0_1_0();
 
             state._fsp--;
@@ -31781,16 +31781,16 @@ public final void rule__XAnnotationElementValue__Group_0_1__0__Impl() throws Rec
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10443:1: rule__XAnnotationElementValue__Group_0_1__1 : rule__XAnnotationElementValue__Group_0_1__1__Impl ;
+    // InternalFormat.g:10443:1: rule__XAnnotationElementValue__Group_0_1__1 : rule__XAnnotationElementValue__Group_0_1__1__Impl ;
     public final void rule__XAnnotationElementValue__Group_0_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10447:1: ( rule__XAnnotationElementValue__Group_0_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10448:2: rule__XAnnotationElementValue__Group_0_1__1__Impl
+            // InternalFormat.g:10447:1: ( rule__XAnnotationElementValue__Group_0_1__1__Impl )
+            // InternalFormat.g:10448:2: rule__XAnnotationElementValue__Group_0_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_1__1__Impl_in_rule__XAnnotationElementValue__Group_0_1__121752);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Group_0_1__1__Impl();
 
             state._fsp--;
@@ -31814,22 +31814,22 @@ public final void rule__XAnnotationElementValue__Group_0_1__1() throws Recogniti
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10454:1: rule__XAnnotationElementValue__Group_0_1__1__Impl : ( ( rule__XAnnotationElementValue__Group_0_1_1__0 )* ) ;
+    // InternalFormat.g:10454:1: rule__XAnnotationElementValue__Group_0_1__1__Impl : ( ( rule__XAnnotationElementValue__Group_0_1_1__0 )* ) ;
     public final void rule__XAnnotationElementValue__Group_0_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10458:1: ( ( ( rule__XAnnotationElementValue__Group_0_1_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10459:1: ( ( rule__XAnnotationElementValue__Group_0_1_1__0 )* )
+            // InternalFormat.g:10458:1: ( ( ( rule__XAnnotationElementValue__Group_0_1_1__0 )* ) )
+            // InternalFormat.g:10459:1: ( ( rule__XAnnotationElementValue__Group_0_1_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10459:1: ( ( rule__XAnnotationElementValue__Group_0_1_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10460:1: ( rule__XAnnotationElementValue__Group_0_1_1__0 )*
+            // InternalFormat.g:10459:1: ( ( rule__XAnnotationElementValue__Group_0_1_1__0 )* )
+            // InternalFormat.g:10460:1: ( rule__XAnnotationElementValue__Group_0_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getGroup_0_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10461:1: ( rule__XAnnotationElementValue__Group_0_1_1__0 )*
+            // InternalFormat.g:10461:1: ( rule__XAnnotationElementValue__Group_0_1_1__0 )*
             loop101:
             do {
                 int alt101=2;
@@ -31842,9 +31842,9 @@ public final void rule__XAnnotationElementValue__Group_0_1__1__Impl() throws Rec
 
                 switch (alt101) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10461:2: rule__XAnnotationElementValue__Group_0_1_1__0
+            	    // InternalFormat.g:10461:2: rule__XAnnotationElementValue__Group_0_1_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_1_1__0_in_rule__XAnnotationElementValue__Group_0_1__1__Impl21779);
+            	    pushFollow(FOLLOW_23);
             	    rule__XAnnotationElementValue__Group_0_1_1__0();
 
             	    state._fsp--;
@@ -31883,21 +31883,21 @@ public final void rule__XAnnotationElementValue__Group_0_1__1__Impl() throws Rec
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_1_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10475:1: rule__XAnnotationElementValue__Group_0_1_1__0 : rule__XAnnotationElementValue__Group_0_1_1__0__Impl rule__XAnnotationElementValue__Group_0_1_1__1 ;
+    // InternalFormat.g:10475:1: rule__XAnnotationElementValue__Group_0_1_1__0 : rule__XAnnotationElementValue__Group_0_1_1__0__Impl rule__XAnnotationElementValue__Group_0_1_1__1 ;
     public final void rule__XAnnotationElementValue__Group_0_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10479:1: ( rule__XAnnotationElementValue__Group_0_1_1__0__Impl rule__XAnnotationElementValue__Group_0_1_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10480:2: rule__XAnnotationElementValue__Group_0_1_1__0__Impl rule__XAnnotationElementValue__Group_0_1_1__1
+            // InternalFormat.g:10479:1: ( rule__XAnnotationElementValue__Group_0_1_1__0__Impl rule__XAnnotationElementValue__Group_0_1_1__1 )
+            // InternalFormat.g:10480:2: rule__XAnnotationElementValue__Group_0_1_1__0__Impl rule__XAnnotationElementValue__Group_0_1_1__1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_1_1__0__Impl_in_rule__XAnnotationElementValue__Group_0_1_1__021814);
+            pushFollow(FOLLOW_50);
             rule__XAnnotationElementValue__Group_0_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_1_1__1_in_rule__XAnnotationElementValue__Group_0_1_1__021817);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Group_0_1_1__1();
 
             state._fsp--;
@@ -31921,22 +31921,22 @@ public final void rule__XAnnotationElementValue__Group_0_1_1__0() throws Recogni
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10487:1: rule__XAnnotationElementValue__Group_0_1_1__0__Impl : ( ',' ) ;
+    // InternalFormat.g:10487:1: rule__XAnnotationElementValue__Group_0_1_1__0__Impl : ( ',' ) ;
     public final void rule__XAnnotationElementValue__Group_0_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10491:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10492:1: ( ',' )
+            // InternalFormat.g:10491:1: ( ( ',' ) )
+            // InternalFormat.g:10492:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10492:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10493:1: ','
+            // InternalFormat.g:10492:1: ( ',' )
+            // InternalFormat.g:10493:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getCommaKeyword_0_1_1_0()); 
             }
-            match(input,71,FOLLOW_71_in_rule__XAnnotationElementValue__Group_0_1_1__0__Impl21845); if (state.failed) return ;
+            match(input,71,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXAnnotationElementValueAccess().getCommaKeyword_0_1_1_0()); 
             }
@@ -31962,16 +31962,16 @@ public final void rule__XAnnotationElementValue__Group_0_1_1__0__Impl() throws R
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_1_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10506:1: rule__XAnnotationElementValue__Group_0_1_1__1 : rule__XAnnotationElementValue__Group_0_1_1__1__Impl ;
+    // InternalFormat.g:10506:1: rule__XAnnotationElementValue__Group_0_1_1__1 : rule__XAnnotationElementValue__Group_0_1_1__1__Impl ;
     public final void rule__XAnnotationElementValue__Group_0_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10510:1: ( rule__XAnnotationElementValue__Group_0_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10511:2: rule__XAnnotationElementValue__Group_0_1_1__1__Impl
+            // InternalFormat.g:10510:1: ( rule__XAnnotationElementValue__Group_0_1_1__1__Impl )
+            // InternalFormat.g:10511:2: rule__XAnnotationElementValue__Group_0_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0_1_1__1__Impl_in_rule__XAnnotationElementValue__Group_0_1_1__121876);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__Group_0_1_1__1__Impl();
 
             state._fsp--;
@@ -31995,25 +31995,25 @@ public final void rule__XAnnotationElementValue__Group_0_1_1__1() throws Recogni
 
 
     // $ANTLR start "rule__XAnnotationElementValue__Group_0_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10517:1: rule__XAnnotationElementValue__Group_0_1_1__1__Impl : ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 ) ) ;
+    // InternalFormat.g:10517:1: rule__XAnnotationElementValue__Group_0_1_1__1__Impl : ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 ) ) ;
     public final void rule__XAnnotationElementValue__Group_0_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10521:1: ( ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10522:1: ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 ) )
+            // InternalFormat.g:10521:1: ( ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 ) ) )
+            // InternalFormat.g:10522:1: ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10522:1: ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10523:1: ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 )
+            // InternalFormat.g:10522:1: ( ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 ) )
+            // InternalFormat.g:10523:1: ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getElementsAssignment_0_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10524:1: ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10524:2: rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1
+            // InternalFormat.g:10524:1: ( rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 )
+            // InternalFormat.g:10524:2: rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1
             {
-            pushFollow(FOLLOW_rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1_in_rule__XAnnotationElementValue__Group_0_1_1__1__Impl21903);
+            pushFollow(FOLLOW_2);
             rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1();
 
             state._fsp--;
@@ -32046,21 +32046,21 @@ public final void rule__XAnnotationElementValue__Group_0_1_1__1__Impl() throws R
 
 
     // $ANTLR start "rule__XAssignment__Group_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10538:1: rule__XAssignment__Group_0__0 : rule__XAssignment__Group_0__0__Impl rule__XAssignment__Group_0__1 ;
+    // InternalFormat.g:10538:1: rule__XAssignment__Group_0__0 : rule__XAssignment__Group_0__0__Impl rule__XAssignment__Group_0__1 ;
     public final void rule__XAssignment__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10542:1: ( rule__XAssignment__Group_0__0__Impl rule__XAssignment__Group_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10543:2: rule__XAssignment__Group_0__0__Impl rule__XAssignment__Group_0__1
+            // InternalFormat.g:10542:1: ( rule__XAssignment__Group_0__0__Impl rule__XAssignment__Group_0__1 )
+            // InternalFormat.g:10543:2: rule__XAssignment__Group_0__0__Impl rule__XAssignment__Group_0__1
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_0__0__Impl_in_rule__XAssignment__Group_0__021937);
+            pushFollow(FOLLOW_54);
             rule__XAssignment__Group_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAssignment__Group_0__1_in_rule__XAssignment__Group_0__021940);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__Group_0__1();
 
             state._fsp--;
@@ -32084,23 +32084,23 @@ public final void rule__XAssignment__Group_0__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAssignment__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10550:1: rule__XAssignment__Group_0__0__Impl : ( () ) ;
+    // InternalFormat.g:10550:1: rule__XAssignment__Group_0__0__Impl : ( () ) ;
     public final void rule__XAssignment__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10554:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10555:1: ( () )
+            // InternalFormat.g:10554:1: ( ( () ) )
+            // InternalFormat.g:10555:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10555:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10556:1: ()
+            // InternalFormat.g:10555:1: ( () )
+            // InternalFormat.g:10556:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getXAssignmentAction_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10557:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10559:1: 
+            // InternalFormat.g:10557:1: ()
+            // InternalFormat.g:10559:1: 
             {
             }
 
@@ -32125,21 +32125,21 @@ public final void rule__XAssignment__Group_0__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAssignment__Group_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10569:1: rule__XAssignment__Group_0__1 : rule__XAssignment__Group_0__1__Impl rule__XAssignment__Group_0__2 ;
+    // InternalFormat.g:10569:1: rule__XAssignment__Group_0__1 : rule__XAssignment__Group_0__1__Impl rule__XAssignment__Group_0__2 ;
     public final void rule__XAssignment__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10573:1: ( rule__XAssignment__Group_0__1__Impl rule__XAssignment__Group_0__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10574:2: rule__XAssignment__Group_0__1__Impl rule__XAssignment__Group_0__2
+            // InternalFormat.g:10573:1: ( rule__XAssignment__Group_0__1__Impl rule__XAssignment__Group_0__2 )
+            // InternalFormat.g:10574:2: rule__XAssignment__Group_0__1__Impl rule__XAssignment__Group_0__2
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_0__1__Impl_in_rule__XAssignment__Group_0__121998);
+            pushFollow(FOLLOW_12);
             rule__XAssignment__Group_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAssignment__Group_0__2_in_rule__XAssignment__Group_0__122001);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__Group_0__2();
 
             state._fsp--;
@@ -32163,25 +32163,25 @@ public final void rule__XAssignment__Group_0__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAssignment__Group_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10581:1: rule__XAssignment__Group_0__1__Impl : ( ( rule__XAssignment__FeatureAssignment_0_1 ) ) ;
+    // InternalFormat.g:10581:1: rule__XAssignment__Group_0__1__Impl : ( ( rule__XAssignment__FeatureAssignment_0_1 ) ) ;
     public final void rule__XAssignment__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10585:1: ( ( ( rule__XAssignment__FeatureAssignment_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10586:1: ( ( rule__XAssignment__FeatureAssignment_0_1 ) )
+            // InternalFormat.g:10585:1: ( ( ( rule__XAssignment__FeatureAssignment_0_1 ) ) )
+            // InternalFormat.g:10586:1: ( ( rule__XAssignment__FeatureAssignment_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10586:1: ( ( rule__XAssignment__FeatureAssignment_0_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10587:1: ( rule__XAssignment__FeatureAssignment_0_1 )
+            // InternalFormat.g:10586:1: ( ( rule__XAssignment__FeatureAssignment_0_1 ) )
+            // InternalFormat.g:10587:1: ( rule__XAssignment__FeatureAssignment_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getFeatureAssignment_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10588:1: ( rule__XAssignment__FeatureAssignment_0_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10588:2: rule__XAssignment__FeatureAssignment_0_1
+            // InternalFormat.g:10588:1: ( rule__XAssignment__FeatureAssignment_0_1 )
+            // InternalFormat.g:10588:2: rule__XAssignment__FeatureAssignment_0_1
             {
-            pushFollow(FOLLOW_rule__XAssignment__FeatureAssignment_0_1_in_rule__XAssignment__Group_0__1__Impl22028);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__FeatureAssignment_0_1();
 
             state._fsp--;
@@ -32214,21 +32214,21 @@ public final void rule__XAssignment__Group_0__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAssignment__Group_0__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10598:1: rule__XAssignment__Group_0__2 : rule__XAssignment__Group_0__2__Impl rule__XAssignment__Group_0__3 ;
+    // InternalFormat.g:10598:1: rule__XAssignment__Group_0__2 : rule__XAssignment__Group_0__2__Impl rule__XAssignment__Group_0__3 ;
     public final void rule__XAssignment__Group_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10602:1: ( rule__XAssignment__Group_0__2__Impl rule__XAssignment__Group_0__3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10603:2: rule__XAssignment__Group_0__2__Impl rule__XAssignment__Group_0__3
+            // InternalFormat.g:10602:1: ( rule__XAssignment__Group_0__2__Impl rule__XAssignment__Group_0__3 )
+            // InternalFormat.g:10603:2: rule__XAssignment__Group_0__2__Impl rule__XAssignment__Group_0__3
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_0__2__Impl_in_rule__XAssignment__Group_0__222058);
+            pushFollow(FOLLOW_50);
             rule__XAssignment__Group_0__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAssignment__Group_0__3_in_rule__XAssignment__Group_0__222061);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__Group_0__3();
 
             state._fsp--;
@@ -32252,22 +32252,22 @@ public final void rule__XAssignment__Group_0__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAssignment__Group_0__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10610:1: rule__XAssignment__Group_0__2__Impl : ( ruleOpSingleAssign ) ;
+    // InternalFormat.g:10610:1: rule__XAssignment__Group_0__2__Impl : ( ruleOpSingleAssign ) ;
     public final void rule__XAssignment__Group_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10614:1: ( ( ruleOpSingleAssign ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10615:1: ( ruleOpSingleAssign )
+            // InternalFormat.g:10614:1: ( ( ruleOpSingleAssign ) )
+            // InternalFormat.g:10615:1: ( ruleOpSingleAssign )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10615:1: ( ruleOpSingleAssign )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10616:1: ruleOpSingleAssign
+            // InternalFormat.g:10615:1: ( ruleOpSingleAssign )
+            // InternalFormat.g:10616:1: ruleOpSingleAssign
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getOpSingleAssignParserRuleCall_0_2()); 
             }
-            pushFollow(FOLLOW_ruleOpSingleAssign_in_rule__XAssignment__Group_0__2__Impl22088);
+            pushFollow(FOLLOW_2);
             ruleOpSingleAssign();
 
             state._fsp--;
@@ -32297,16 +32297,16 @@ public final void rule__XAssignment__Group_0__2__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAssignment__Group_0__3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10627:1: rule__XAssignment__Group_0__3 : rule__XAssignment__Group_0__3__Impl ;
+    // InternalFormat.g:10627:1: rule__XAssignment__Group_0__3 : rule__XAssignment__Group_0__3__Impl ;
     public final void rule__XAssignment__Group_0__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10631:1: ( rule__XAssignment__Group_0__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10632:2: rule__XAssignment__Group_0__3__Impl
+            // InternalFormat.g:10631:1: ( rule__XAssignment__Group_0__3__Impl )
+            // InternalFormat.g:10632:2: rule__XAssignment__Group_0__3__Impl
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_0__3__Impl_in_rule__XAssignment__Group_0__322117);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__Group_0__3__Impl();
 
             state._fsp--;
@@ -32330,25 +32330,25 @@ public final void rule__XAssignment__Group_0__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAssignment__Group_0__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10638:1: rule__XAssignment__Group_0__3__Impl : ( ( rule__XAssignment__ValueAssignment_0_3 ) ) ;
+    // InternalFormat.g:10638:1: rule__XAssignment__Group_0__3__Impl : ( ( rule__XAssignment__ValueAssignment_0_3 ) ) ;
     public final void rule__XAssignment__Group_0__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10642:1: ( ( ( rule__XAssignment__ValueAssignment_0_3 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10643:1: ( ( rule__XAssignment__ValueAssignment_0_3 ) )
+            // InternalFormat.g:10642:1: ( ( ( rule__XAssignment__ValueAssignment_0_3 ) ) )
+            // InternalFormat.g:10643:1: ( ( rule__XAssignment__ValueAssignment_0_3 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10643:1: ( ( rule__XAssignment__ValueAssignment_0_3 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10644:1: ( rule__XAssignment__ValueAssignment_0_3 )
+            // InternalFormat.g:10643:1: ( ( rule__XAssignment__ValueAssignment_0_3 ) )
+            // InternalFormat.g:10644:1: ( rule__XAssignment__ValueAssignment_0_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getValueAssignment_0_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10645:1: ( rule__XAssignment__ValueAssignment_0_3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10645:2: rule__XAssignment__ValueAssignment_0_3
+            // InternalFormat.g:10645:1: ( rule__XAssignment__ValueAssignment_0_3 )
+            // InternalFormat.g:10645:2: rule__XAssignment__ValueAssignment_0_3
             {
-            pushFollow(FOLLOW_rule__XAssignment__ValueAssignment_0_3_in_rule__XAssignment__Group_0__3__Impl22144);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__ValueAssignment_0_3();
 
             state._fsp--;
@@ -32381,21 +32381,21 @@ public final void rule__XAssignment__Group_0__3__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAssignment__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10663:1: rule__XAssignment__Group_1__0 : rule__XAssignment__Group_1__0__Impl rule__XAssignment__Group_1__1 ;
+    // InternalFormat.g:10663:1: rule__XAssignment__Group_1__0 : rule__XAssignment__Group_1__0__Impl rule__XAssignment__Group_1__1 ;
     public final void rule__XAssignment__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10667:1: ( rule__XAssignment__Group_1__0__Impl rule__XAssignment__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10668:2: rule__XAssignment__Group_1__0__Impl rule__XAssignment__Group_1__1
+            // InternalFormat.g:10667:1: ( rule__XAssignment__Group_1__0__Impl rule__XAssignment__Group_1__1 )
+            // InternalFormat.g:10668:2: rule__XAssignment__Group_1__0__Impl rule__XAssignment__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_1__0__Impl_in_rule__XAssignment__Group_1__022182);
+            pushFollow(FOLLOW_55);
             rule__XAssignment__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAssignment__Group_1__1_in_rule__XAssignment__Group_1__022185);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__Group_1__1();
 
             state._fsp--;
@@ -32419,22 +32419,22 @@ public final void rule__XAssignment__Group_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAssignment__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10675:1: rule__XAssignment__Group_1__0__Impl : ( ruleXOrExpression ) ;
+    // InternalFormat.g:10675:1: rule__XAssignment__Group_1__0__Impl : ( ruleXOrExpression ) ;
     public final void rule__XAssignment__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10679:1: ( ( ruleXOrExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10680:1: ( ruleXOrExpression )
+            // InternalFormat.g:10679:1: ( ( ruleXOrExpression ) )
+            // InternalFormat.g:10680:1: ( ruleXOrExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10680:1: ( ruleXOrExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10681:1: ruleXOrExpression
+            // InternalFormat.g:10680:1: ( ruleXOrExpression )
+            // InternalFormat.g:10681:1: ruleXOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getXOrExpressionParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXOrExpression_in_rule__XAssignment__Group_1__0__Impl22212);
+            pushFollow(FOLLOW_2);
             ruleXOrExpression();
 
             state._fsp--;
@@ -32464,16 +32464,16 @@ public final void rule__XAssignment__Group_1__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAssignment__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10692:1: rule__XAssignment__Group_1__1 : rule__XAssignment__Group_1__1__Impl ;
+    // InternalFormat.g:10692:1: rule__XAssignment__Group_1__1 : rule__XAssignment__Group_1__1__Impl ;
     public final void rule__XAssignment__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10696:1: ( rule__XAssignment__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10697:2: rule__XAssignment__Group_1__1__Impl
+            // InternalFormat.g:10696:1: ( rule__XAssignment__Group_1__1__Impl )
+            // InternalFormat.g:10697:2: rule__XAssignment__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_1__1__Impl_in_rule__XAssignment__Group_1__122241);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__Group_1__1__Impl();
 
             state._fsp--;
@@ -32497,29 +32497,29 @@ public final void rule__XAssignment__Group_1__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAssignment__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10703:1: rule__XAssignment__Group_1__1__Impl : ( ( rule__XAssignment__Group_1_1__0 )? ) ;
+    // InternalFormat.g:10703:1: rule__XAssignment__Group_1__1__Impl : ( ( rule__XAssignment__Group_1_1__0 )? ) ;
     public final void rule__XAssignment__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10707:1: ( ( ( rule__XAssignment__Group_1_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10708:1: ( ( rule__XAssignment__Group_1_1__0 )? )
+            // InternalFormat.g:10707:1: ( ( ( rule__XAssignment__Group_1_1__0 )? ) )
+            // InternalFormat.g:10708:1: ( ( rule__XAssignment__Group_1_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10708:1: ( ( rule__XAssignment__Group_1_1__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10709:1: ( rule__XAssignment__Group_1_1__0 )?
+            // InternalFormat.g:10708:1: ( ( rule__XAssignment__Group_1_1__0 )? )
+            // InternalFormat.g:10709:1: ( rule__XAssignment__Group_1_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getGroup_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10710:1: ( rule__XAssignment__Group_1_1__0 )?
+            // InternalFormat.g:10710:1: ( rule__XAssignment__Group_1_1__0 )?
             int alt102=2;
             alt102 = dfa102.predict(input);
             switch (alt102) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10710:2: rule__XAssignment__Group_1_1__0
+                    // InternalFormat.g:10710:2: rule__XAssignment__Group_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__XAssignment__Group_1_1__0_in_rule__XAssignment__Group_1__1__Impl22268);
+                    pushFollow(FOLLOW_2);
                     rule__XAssignment__Group_1_1__0();
 
                     state._fsp--;
@@ -32555,21 +32555,21 @@ public final void rule__XAssignment__Group_1__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10724:1: rule__XAssignment__Group_1_1__0 : rule__XAssignment__Group_1_1__0__Impl rule__XAssignment__Group_1_1__1 ;
+    // InternalFormat.g:10724:1: rule__XAssignment__Group_1_1__0 : rule__XAssignment__Group_1_1__0__Impl rule__XAssignment__Group_1_1__1 ;
     public final void rule__XAssignment__Group_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10728:1: ( rule__XAssignment__Group_1_1__0__Impl rule__XAssignment__Group_1_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10729:2: rule__XAssignment__Group_1_1__0__Impl rule__XAssignment__Group_1_1__1
+            // InternalFormat.g:10728:1: ( rule__XAssignment__Group_1_1__0__Impl rule__XAssignment__Group_1_1__1 )
+            // InternalFormat.g:10729:2: rule__XAssignment__Group_1_1__0__Impl rule__XAssignment__Group_1_1__1
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_1_1__0__Impl_in_rule__XAssignment__Group_1_1__022303);
+            pushFollow(FOLLOW_50);
             rule__XAssignment__Group_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAssignment__Group_1_1__1_in_rule__XAssignment__Group_1_1__022306);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__Group_1_1__1();
 
             state._fsp--;
@@ -32593,25 +32593,25 @@ public final void rule__XAssignment__Group_1_1__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10736:1: rule__XAssignment__Group_1_1__0__Impl : ( ( rule__XAssignment__Group_1_1_0__0 ) ) ;
+    // InternalFormat.g:10736:1: rule__XAssignment__Group_1_1__0__Impl : ( ( rule__XAssignment__Group_1_1_0__0 ) ) ;
     public final void rule__XAssignment__Group_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10740:1: ( ( ( rule__XAssignment__Group_1_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10741:1: ( ( rule__XAssignment__Group_1_1_0__0 ) )
+            // InternalFormat.g:10740:1: ( ( ( rule__XAssignment__Group_1_1_0__0 ) ) )
+            // InternalFormat.g:10741:1: ( ( rule__XAssignment__Group_1_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10741:1: ( ( rule__XAssignment__Group_1_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10742:1: ( rule__XAssignment__Group_1_1_0__0 )
+            // InternalFormat.g:10741:1: ( ( rule__XAssignment__Group_1_1_0__0 ) )
+            // InternalFormat.g:10742:1: ( rule__XAssignment__Group_1_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getGroup_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10743:1: ( rule__XAssignment__Group_1_1_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10743:2: rule__XAssignment__Group_1_1_0__0
+            // InternalFormat.g:10743:1: ( rule__XAssignment__Group_1_1_0__0 )
+            // InternalFormat.g:10743:2: rule__XAssignment__Group_1_1_0__0
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_1_1_0__0_in_rule__XAssignment__Group_1_1__0__Impl22333);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__Group_1_1_0__0();
 
             state._fsp--;
@@ -32644,16 +32644,16 @@ public final void rule__XAssignment__Group_1_1__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10753:1: rule__XAssignment__Group_1_1__1 : rule__XAssignment__Group_1_1__1__Impl ;
+    // InternalFormat.g:10753:1: rule__XAssignment__Group_1_1__1 : rule__XAssignment__Group_1_1__1__Impl ;
     public final void rule__XAssignment__Group_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10757:1: ( rule__XAssignment__Group_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10758:2: rule__XAssignment__Group_1_1__1__Impl
+            // InternalFormat.g:10757:1: ( rule__XAssignment__Group_1_1__1__Impl )
+            // InternalFormat.g:10758:2: rule__XAssignment__Group_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_1_1__1__Impl_in_rule__XAssignment__Group_1_1__122363);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__Group_1_1__1__Impl();
 
             state._fsp--;
@@ -32677,25 +32677,25 @@ public final void rule__XAssignment__Group_1_1__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10764:1: rule__XAssignment__Group_1_1__1__Impl : ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) ) ;
+    // InternalFormat.g:10764:1: rule__XAssignment__Group_1_1__1__Impl : ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) ) ;
     public final void rule__XAssignment__Group_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10768:1: ( ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10769:1: ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) )
+            // InternalFormat.g:10768:1: ( ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) ) )
+            // InternalFormat.g:10769:1: ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10769:1: ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10770:1: ( rule__XAssignment__RightOperandAssignment_1_1_1 )
+            // InternalFormat.g:10769:1: ( ( rule__XAssignment__RightOperandAssignment_1_1_1 ) )
+            // InternalFormat.g:10770:1: ( rule__XAssignment__RightOperandAssignment_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getRightOperandAssignment_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10771:1: ( rule__XAssignment__RightOperandAssignment_1_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10771:2: rule__XAssignment__RightOperandAssignment_1_1_1
+            // InternalFormat.g:10771:1: ( rule__XAssignment__RightOperandAssignment_1_1_1 )
+            // InternalFormat.g:10771:2: rule__XAssignment__RightOperandAssignment_1_1_1
             {
-            pushFollow(FOLLOW_rule__XAssignment__RightOperandAssignment_1_1_1_in_rule__XAssignment__Group_1_1__1__Impl22390);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__RightOperandAssignment_1_1_1();
 
             state._fsp--;
@@ -32728,16 +32728,16 @@ public final void rule__XAssignment__Group_1_1__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10785:1: rule__XAssignment__Group_1_1_0__0 : rule__XAssignment__Group_1_1_0__0__Impl ;
+    // InternalFormat.g:10785:1: rule__XAssignment__Group_1_1_0__0 : rule__XAssignment__Group_1_1_0__0__Impl ;
     public final void rule__XAssignment__Group_1_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10789:1: ( rule__XAssignment__Group_1_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10790:2: rule__XAssignment__Group_1_1_0__0__Impl
+            // InternalFormat.g:10789:1: ( rule__XAssignment__Group_1_1_0__0__Impl )
+            // InternalFormat.g:10790:2: rule__XAssignment__Group_1_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_1_1_0__0__Impl_in_rule__XAssignment__Group_1_1_0__022424);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__Group_1_1_0__0__Impl();
 
             state._fsp--;
@@ -32761,25 +32761,25 @@ public final void rule__XAssignment__Group_1_1_0__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10796:1: rule__XAssignment__Group_1_1_0__0__Impl : ( ( rule__XAssignment__Group_1_1_0_0__0 ) ) ;
+    // InternalFormat.g:10796:1: rule__XAssignment__Group_1_1_0__0__Impl : ( ( rule__XAssignment__Group_1_1_0_0__0 ) ) ;
     public final void rule__XAssignment__Group_1_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10800:1: ( ( ( rule__XAssignment__Group_1_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10801:1: ( ( rule__XAssignment__Group_1_1_0_0__0 ) )
+            // InternalFormat.g:10800:1: ( ( ( rule__XAssignment__Group_1_1_0_0__0 ) ) )
+            // InternalFormat.g:10801:1: ( ( rule__XAssignment__Group_1_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10801:1: ( ( rule__XAssignment__Group_1_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10802:1: ( rule__XAssignment__Group_1_1_0_0__0 )
+            // InternalFormat.g:10801:1: ( ( rule__XAssignment__Group_1_1_0_0__0 ) )
+            // InternalFormat.g:10802:1: ( rule__XAssignment__Group_1_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getGroup_1_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10803:1: ( rule__XAssignment__Group_1_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10803:2: rule__XAssignment__Group_1_1_0_0__0
+            // InternalFormat.g:10803:1: ( rule__XAssignment__Group_1_1_0_0__0 )
+            // InternalFormat.g:10803:2: rule__XAssignment__Group_1_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_1_1_0_0__0_in_rule__XAssignment__Group_1_1_0__0__Impl22451);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__Group_1_1_0_0__0();
 
             state._fsp--;
@@ -32812,21 +32812,21 @@ public final void rule__XAssignment__Group_1_1_0__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1_0_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10815:1: rule__XAssignment__Group_1_1_0_0__0 : rule__XAssignment__Group_1_1_0_0__0__Impl rule__XAssignment__Group_1_1_0_0__1 ;
+    // InternalFormat.g:10815:1: rule__XAssignment__Group_1_1_0_0__0 : rule__XAssignment__Group_1_1_0_0__0__Impl rule__XAssignment__Group_1_1_0_0__1 ;
     public final void rule__XAssignment__Group_1_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10819:1: ( rule__XAssignment__Group_1_1_0_0__0__Impl rule__XAssignment__Group_1_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10820:2: rule__XAssignment__Group_1_1_0_0__0__Impl rule__XAssignment__Group_1_1_0_0__1
+            // InternalFormat.g:10819:1: ( rule__XAssignment__Group_1_1_0_0__0__Impl rule__XAssignment__Group_1_1_0_0__1 )
+            // InternalFormat.g:10820:2: rule__XAssignment__Group_1_1_0_0__0__Impl rule__XAssignment__Group_1_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_1_1_0_0__0__Impl_in_rule__XAssignment__Group_1_1_0_0__022483);
+            pushFollow(FOLLOW_55);
             rule__XAssignment__Group_1_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAssignment__Group_1_1_0_0__1_in_rule__XAssignment__Group_1_1_0_0__022486);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__Group_1_1_0_0__1();
 
             state._fsp--;
@@ -32850,23 +32850,23 @@ public final void rule__XAssignment__Group_1_1_0_0__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10827:1: rule__XAssignment__Group_1_1_0_0__0__Impl : ( () ) ;
+    // InternalFormat.g:10827:1: rule__XAssignment__Group_1_1_0_0__0__Impl : ( () ) ;
     public final void rule__XAssignment__Group_1_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10831:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10832:1: ( () )
+            // InternalFormat.g:10831:1: ( ( () ) )
+            // InternalFormat.g:10832:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10832:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10833:1: ()
+            // InternalFormat.g:10832:1: ( () )
+            // InternalFormat.g:10833:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10834:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10836:1: 
+            // InternalFormat.g:10834:1: ()
+            // InternalFormat.g:10836:1: 
             {
             }
 
@@ -32891,16 +32891,16 @@ public final void rule__XAssignment__Group_1_1_0_0__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1_0_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10846:1: rule__XAssignment__Group_1_1_0_0__1 : rule__XAssignment__Group_1_1_0_0__1__Impl ;
+    // InternalFormat.g:10846:1: rule__XAssignment__Group_1_1_0_0__1 : rule__XAssignment__Group_1_1_0_0__1__Impl ;
     public final void rule__XAssignment__Group_1_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10850:1: ( rule__XAssignment__Group_1_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10851:2: rule__XAssignment__Group_1_1_0_0__1__Impl
+            // InternalFormat.g:10850:1: ( rule__XAssignment__Group_1_1_0_0__1__Impl )
+            // InternalFormat.g:10851:2: rule__XAssignment__Group_1_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAssignment__Group_1_1_0_0__1__Impl_in_rule__XAssignment__Group_1_1_0_0__122544);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__Group_1_1_0_0__1__Impl();
 
             state._fsp--;
@@ -32924,25 +32924,25 @@ public final void rule__XAssignment__Group_1_1_0_0__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAssignment__Group_1_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10857:1: rule__XAssignment__Group_1_1_0_0__1__Impl : ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) ) ;
+    // InternalFormat.g:10857:1: rule__XAssignment__Group_1_1_0_0__1__Impl : ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) ) ;
     public final void rule__XAssignment__Group_1_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10861:1: ( ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10862:1: ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) )
+            // InternalFormat.g:10861:1: ( ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) ) )
+            // InternalFormat.g:10862:1: ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10862:1: ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10863:1: ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 )
+            // InternalFormat.g:10862:1: ( ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 ) )
+            // InternalFormat.g:10863:1: ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getFeatureAssignment_1_1_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10864:1: ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10864:2: rule__XAssignment__FeatureAssignment_1_1_0_0_1
+            // InternalFormat.g:10864:1: ( rule__XAssignment__FeatureAssignment_1_1_0_0_1 )
+            // InternalFormat.g:10864:2: rule__XAssignment__FeatureAssignment_1_1_0_0_1
             {
-            pushFollow(FOLLOW_rule__XAssignment__FeatureAssignment_1_1_0_0_1_in_rule__XAssignment__Group_1_1_0_0__1__Impl22571);
+            pushFollow(FOLLOW_2);
             rule__XAssignment__FeatureAssignment_1_1_0_0_1();
 
             state._fsp--;
@@ -32975,21 +32975,21 @@ public final void rule__XAssignment__Group_1_1_0_0__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_5__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10878:1: rule__OpMultiAssign__Group_5__0 : rule__OpMultiAssign__Group_5__0__Impl rule__OpMultiAssign__Group_5__1 ;
+    // InternalFormat.g:10878:1: rule__OpMultiAssign__Group_5__0 : rule__OpMultiAssign__Group_5__0__Impl rule__OpMultiAssign__Group_5__1 ;
     public final void rule__OpMultiAssign__Group_5__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10882:1: ( rule__OpMultiAssign__Group_5__0__Impl rule__OpMultiAssign__Group_5__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10883:2: rule__OpMultiAssign__Group_5__0__Impl rule__OpMultiAssign__Group_5__1
+            // InternalFormat.g:10882:1: ( rule__OpMultiAssign__Group_5__0__Impl rule__OpMultiAssign__Group_5__1 )
+            // InternalFormat.g:10883:2: rule__OpMultiAssign__Group_5__0__Impl rule__OpMultiAssign__Group_5__1
             {
-            pushFollow(FOLLOW_rule__OpMultiAssign__Group_5__0__Impl_in_rule__OpMultiAssign__Group_5__022605);
+            pushFollow(FOLLOW_56);
             rule__OpMultiAssign__Group_5__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OpMultiAssign__Group_5__1_in_rule__OpMultiAssign__Group_5__022608);
+            pushFollow(FOLLOW_2);
             rule__OpMultiAssign__Group_5__1();
 
             state._fsp--;
@@ -33013,22 +33013,22 @@ public final void rule__OpMultiAssign__Group_5__0() throws RecognitionException
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_5__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10890:1: rule__OpMultiAssign__Group_5__0__Impl : ( '<' ) ;
+    // InternalFormat.g:10890:1: rule__OpMultiAssign__Group_5__0__Impl : ( '<' ) ;
     public final void rule__OpMultiAssign__Group_5__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10894:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10895:1: ( '<' )
+            // InternalFormat.g:10894:1: ( ( '<' ) )
+            // InternalFormat.g:10895:1: ( '<' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10895:1: ( '<' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10896:1: '<'
+            // InternalFormat.g:10895:1: ( '<' )
+            // InternalFormat.g:10896:1: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignAccess().getLessThanSignKeyword_5_0()); 
             }
-            match(input,33,FOLLOW_33_in_rule__OpMultiAssign__Group_5__0__Impl22636); if (state.failed) return ;
+            match(input,33,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpMultiAssignAccess().getLessThanSignKeyword_5_0()); 
             }
@@ -33054,21 +33054,21 @@ public final void rule__OpMultiAssign__Group_5__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_5__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10909:1: rule__OpMultiAssign__Group_5__1 : rule__OpMultiAssign__Group_5__1__Impl rule__OpMultiAssign__Group_5__2 ;
+    // InternalFormat.g:10909:1: rule__OpMultiAssign__Group_5__1 : rule__OpMultiAssign__Group_5__1__Impl rule__OpMultiAssign__Group_5__2 ;
     public final void rule__OpMultiAssign__Group_5__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10913:1: ( rule__OpMultiAssign__Group_5__1__Impl rule__OpMultiAssign__Group_5__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10914:2: rule__OpMultiAssign__Group_5__1__Impl rule__OpMultiAssign__Group_5__2
+            // InternalFormat.g:10913:1: ( rule__OpMultiAssign__Group_5__1__Impl rule__OpMultiAssign__Group_5__2 )
+            // InternalFormat.g:10914:2: rule__OpMultiAssign__Group_5__1__Impl rule__OpMultiAssign__Group_5__2
             {
-            pushFollow(FOLLOW_rule__OpMultiAssign__Group_5__1__Impl_in_rule__OpMultiAssign__Group_5__122667);
+            pushFollow(FOLLOW_12);
             rule__OpMultiAssign__Group_5__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OpMultiAssign__Group_5__2_in_rule__OpMultiAssign__Group_5__122670);
+            pushFollow(FOLLOW_2);
             rule__OpMultiAssign__Group_5__2();
 
             state._fsp--;
@@ -33092,22 +33092,22 @@ public final void rule__OpMultiAssign__Group_5__1() throws RecognitionException
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_5__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10921:1: rule__OpMultiAssign__Group_5__1__Impl : ( '<' ) ;
+    // InternalFormat.g:10921:1: rule__OpMultiAssign__Group_5__1__Impl : ( '<' ) ;
     public final void rule__OpMultiAssign__Group_5__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10925:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10926:1: ( '<' )
+            // InternalFormat.g:10925:1: ( ( '<' ) )
+            // InternalFormat.g:10926:1: ( '<' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10926:1: ( '<' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10927:1: '<'
+            // InternalFormat.g:10926:1: ( '<' )
+            // InternalFormat.g:10927:1: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignAccess().getLessThanSignKeyword_5_1()); 
             }
-            match(input,33,FOLLOW_33_in_rule__OpMultiAssign__Group_5__1__Impl22698); if (state.failed) return ;
+            match(input,33,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpMultiAssignAccess().getLessThanSignKeyword_5_1()); 
             }
@@ -33133,16 +33133,16 @@ public final void rule__OpMultiAssign__Group_5__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_5__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10940:1: rule__OpMultiAssign__Group_5__2 : rule__OpMultiAssign__Group_5__2__Impl ;
+    // InternalFormat.g:10940:1: rule__OpMultiAssign__Group_5__2 : rule__OpMultiAssign__Group_5__2__Impl ;
     public final void rule__OpMultiAssign__Group_5__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10944:1: ( rule__OpMultiAssign__Group_5__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10945:2: rule__OpMultiAssign__Group_5__2__Impl
+            // InternalFormat.g:10944:1: ( rule__OpMultiAssign__Group_5__2__Impl )
+            // InternalFormat.g:10945:2: rule__OpMultiAssign__Group_5__2__Impl
             {
-            pushFollow(FOLLOW_rule__OpMultiAssign__Group_5__2__Impl_in_rule__OpMultiAssign__Group_5__222729);
+            pushFollow(FOLLOW_2);
             rule__OpMultiAssign__Group_5__2__Impl();
 
             state._fsp--;
@@ -33166,22 +33166,22 @@ public final void rule__OpMultiAssign__Group_5__2() throws RecognitionException
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_5__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10951:1: rule__OpMultiAssign__Group_5__2__Impl : ( '=' ) ;
+    // InternalFormat.g:10951:1: rule__OpMultiAssign__Group_5__2__Impl : ( '=' ) ;
     public final void rule__OpMultiAssign__Group_5__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10955:1: ( ( '=' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10956:1: ( '=' )
+            // InternalFormat.g:10955:1: ( ( '=' ) )
+            // InternalFormat.g:10956:1: ( '=' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10956:1: ( '=' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10957:1: '='
+            // InternalFormat.g:10956:1: ( '=' )
+            // InternalFormat.g:10957:1: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignAccess().getEqualsSignKeyword_5_2()); 
             }
-            match(input,14,FOLLOW_14_in_rule__OpMultiAssign__Group_5__2__Impl22757); if (state.failed) return ;
+            match(input,14,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpMultiAssignAccess().getEqualsSignKeyword_5_2()); 
             }
@@ -33207,21 +33207,21 @@ public final void rule__OpMultiAssign__Group_5__2__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_6__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10976:1: rule__OpMultiAssign__Group_6__0 : rule__OpMultiAssign__Group_6__0__Impl rule__OpMultiAssign__Group_6__1 ;
+    // InternalFormat.g:10976:1: rule__OpMultiAssign__Group_6__0 : rule__OpMultiAssign__Group_6__0__Impl rule__OpMultiAssign__Group_6__1 ;
     public final void rule__OpMultiAssign__Group_6__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10980:1: ( rule__OpMultiAssign__Group_6__0__Impl rule__OpMultiAssign__Group_6__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10981:2: rule__OpMultiAssign__Group_6__0__Impl rule__OpMultiAssign__Group_6__1
+            // InternalFormat.g:10980:1: ( rule__OpMultiAssign__Group_6__0__Impl rule__OpMultiAssign__Group_6__1 )
+            // InternalFormat.g:10981:2: rule__OpMultiAssign__Group_6__0__Impl rule__OpMultiAssign__Group_6__1
             {
-            pushFollow(FOLLOW_rule__OpMultiAssign__Group_6__0__Impl_in_rule__OpMultiAssign__Group_6__022794);
+            pushFollow(FOLLOW_57);
             rule__OpMultiAssign__Group_6__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OpMultiAssign__Group_6__1_in_rule__OpMultiAssign__Group_6__022797);
+            pushFollow(FOLLOW_2);
             rule__OpMultiAssign__Group_6__1();
 
             state._fsp--;
@@ -33245,22 +33245,22 @@ public final void rule__OpMultiAssign__Group_6__0() throws RecognitionException
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_6__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10988:1: rule__OpMultiAssign__Group_6__0__Impl : ( '>' ) ;
+    // InternalFormat.g:10988:1: rule__OpMultiAssign__Group_6__0__Impl : ( '>' ) ;
     public final void rule__OpMultiAssign__Group_6__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10992:1: ( ( '>' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10993:1: ( '>' )
+            // InternalFormat.g:10992:1: ( ( '>' ) )
+            // InternalFormat.g:10993:1: ( '>' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10993:1: ( '>' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10994:1: '>'
+            // InternalFormat.g:10993:1: ( '>' )
+            // InternalFormat.g:10994:1: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignAccess().getGreaterThanSignKeyword_6_0()); 
             }
-            match(input,32,FOLLOW_32_in_rule__OpMultiAssign__Group_6__0__Impl22825); if (state.failed) return ;
+            match(input,32,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpMultiAssignAccess().getGreaterThanSignKeyword_6_0()); 
             }
@@ -33286,21 +33286,21 @@ public final void rule__OpMultiAssign__Group_6__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_6__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11007:1: rule__OpMultiAssign__Group_6__1 : rule__OpMultiAssign__Group_6__1__Impl rule__OpMultiAssign__Group_6__2 ;
+    // InternalFormat.g:11007:1: rule__OpMultiAssign__Group_6__1 : rule__OpMultiAssign__Group_6__1__Impl rule__OpMultiAssign__Group_6__2 ;
     public final void rule__OpMultiAssign__Group_6__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11011:1: ( rule__OpMultiAssign__Group_6__1__Impl rule__OpMultiAssign__Group_6__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11012:2: rule__OpMultiAssign__Group_6__1__Impl rule__OpMultiAssign__Group_6__2
+            // InternalFormat.g:11011:1: ( rule__OpMultiAssign__Group_6__1__Impl rule__OpMultiAssign__Group_6__2 )
+            // InternalFormat.g:11012:2: rule__OpMultiAssign__Group_6__1__Impl rule__OpMultiAssign__Group_6__2
             {
-            pushFollow(FOLLOW_rule__OpMultiAssign__Group_6__1__Impl_in_rule__OpMultiAssign__Group_6__122856);
+            pushFollow(FOLLOW_57);
             rule__OpMultiAssign__Group_6__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OpMultiAssign__Group_6__2_in_rule__OpMultiAssign__Group_6__122859);
+            pushFollow(FOLLOW_2);
             rule__OpMultiAssign__Group_6__2();
 
             state._fsp--;
@@ -33324,22 +33324,22 @@ public final void rule__OpMultiAssign__Group_6__1() throws RecognitionException
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_6__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11019:1: rule__OpMultiAssign__Group_6__1__Impl : ( ( '>' )? ) ;
+    // InternalFormat.g:11019:1: rule__OpMultiAssign__Group_6__1__Impl : ( ( '>' )? ) ;
     public final void rule__OpMultiAssign__Group_6__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11023:1: ( ( ( '>' )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11024:1: ( ( '>' )? )
+            // InternalFormat.g:11023:1: ( ( ( '>' )? ) )
+            // InternalFormat.g:11024:1: ( ( '>' )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11024:1: ( ( '>' )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11025:1: ( '>' )?
+            // InternalFormat.g:11024:1: ( ( '>' )? )
+            // InternalFormat.g:11025:1: ( '>' )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignAccess().getGreaterThanSignKeyword_6_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11026:1: ( '>' )?
+            // InternalFormat.g:11026:1: ( '>' )?
             int alt103=2;
             int LA103_0 = input.LA(1);
 
@@ -33348,9 +33348,9 @@ public final void rule__OpMultiAssign__Group_6__1__Impl() throws RecognitionExce
             }
             switch (alt103) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11027:2: '>'
+                    // InternalFormat.g:11027:2: '>'
                     {
-                    match(input,32,FOLLOW_32_in_rule__OpMultiAssign__Group_6__1__Impl22888); if (state.failed) return ;
+                    match(input,32,FOLLOW_2); if (state.failed) return ;
 
                     }
                     break;
@@ -33382,16 +33382,16 @@ public final void rule__OpMultiAssign__Group_6__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_6__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11038:1: rule__OpMultiAssign__Group_6__2 : rule__OpMultiAssign__Group_6__2__Impl ;
+    // InternalFormat.g:11038:1: rule__OpMultiAssign__Group_6__2 : rule__OpMultiAssign__Group_6__2__Impl ;
     public final void rule__OpMultiAssign__Group_6__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11042:1: ( rule__OpMultiAssign__Group_6__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11043:2: rule__OpMultiAssign__Group_6__2__Impl
+            // InternalFormat.g:11042:1: ( rule__OpMultiAssign__Group_6__2__Impl )
+            // InternalFormat.g:11043:2: rule__OpMultiAssign__Group_6__2__Impl
             {
-            pushFollow(FOLLOW_rule__OpMultiAssign__Group_6__2__Impl_in_rule__OpMultiAssign__Group_6__222921);
+            pushFollow(FOLLOW_2);
             rule__OpMultiAssign__Group_6__2__Impl();
 
             state._fsp--;
@@ -33415,22 +33415,22 @@ public final void rule__OpMultiAssign__Group_6__2() throws RecognitionException
 
 
     // $ANTLR start "rule__OpMultiAssign__Group_6__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11049:1: rule__OpMultiAssign__Group_6__2__Impl : ( '>=' ) ;
+    // InternalFormat.g:11049:1: rule__OpMultiAssign__Group_6__2__Impl : ( '>=' ) ;
     public final void rule__OpMultiAssign__Group_6__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11053:1: ( ( '>=' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11054:1: ( '>=' )
+            // InternalFormat.g:11053:1: ( ( '>=' ) )
+            // InternalFormat.g:11054:1: ( '>=' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11054:1: ( '>=' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11055:1: '>='
+            // InternalFormat.g:11054:1: ( '>=' )
+            // InternalFormat.g:11055:1: '>='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpMultiAssignAccess().getGreaterThanSignEqualsSignKeyword_6_2()); 
             }
-            match(input,31,FOLLOW_31_in_rule__OpMultiAssign__Group_6__2__Impl22949); if (state.failed) return ;
+            match(input,31,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpMultiAssignAccess().getGreaterThanSignEqualsSignKeyword_6_2()); 
             }
@@ -33456,21 +33456,21 @@ public final void rule__OpMultiAssign__Group_6__2__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XOrExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11074:1: rule__XOrExpression__Group__0 : rule__XOrExpression__Group__0__Impl rule__XOrExpression__Group__1 ;
+    // InternalFormat.g:11074:1: rule__XOrExpression__Group__0 : rule__XOrExpression__Group__0__Impl rule__XOrExpression__Group__1 ;
     public final void rule__XOrExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11078:1: ( rule__XOrExpression__Group__0__Impl rule__XOrExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11079:2: rule__XOrExpression__Group__0__Impl rule__XOrExpression__Group__1
+            // InternalFormat.g:11078:1: ( rule__XOrExpression__Group__0__Impl rule__XOrExpression__Group__1 )
+            // InternalFormat.g:11079:2: rule__XOrExpression__Group__0__Impl rule__XOrExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XOrExpression__Group__0__Impl_in_rule__XOrExpression__Group__022986);
+            pushFollow(FOLLOW_58);
             rule__XOrExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XOrExpression__Group__1_in_rule__XOrExpression__Group__022989);
+            pushFollow(FOLLOW_2);
             rule__XOrExpression__Group__1();
 
             state._fsp--;
@@ -33494,22 +33494,22 @@ public final void rule__XOrExpression__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XOrExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11086:1: rule__XOrExpression__Group__0__Impl : ( ruleXAndExpression ) ;
+    // InternalFormat.g:11086:1: rule__XOrExpression__Group__0__Impl : ( ruleXAndExpression ) ;
     public final void rule__XOrExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11090:1: ( ( ruleXAndExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11091:1: ( ruleXAndExpression )
+            // InternalFormat.g:11090:1: ( ( ruleXAndExpression ) )
+            // InternalFormat.g:11091:1: ( ruleXAndExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11091:1: ( ruleXAndExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11092:1: ruleXAndExpression
+            // InternalFormat.g:11091:1: ( ruleXAndExpression )
+            // InternalFormat.g:11092:1: ruleXAndExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getXAndExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleXAndExpression_in_rule__XOrExpression__Group__0__Impl23016);
+            pushFollow(FOLLOW_2);
             ruleXAndExpression();
 
             state._fsp--;
@@ -33539,16 +33539,16 @@ public final void rule__XOrExpression__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XOrExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11103:1: rule__XOrExpression__Group__1 : rule__XOrExpression__Group__1__Impl ;
+    // InternalFormat.g:11103:1: rule__XOrExpression__Group__1 : rule__XOrExpression__Group__1__Impl ;
     public final void rule__XOrExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11107:1: ( rule__XOrExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11108:2: rule__XOrExpression__Group__1__Impl
+            // InternalFormat.g:11107:1: ( rule__XOrExpression__Group__1__Impl )
+            // InternalFormat.g:11108:2: rule__XOrExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XOrExpression__Group__1__Impl_in_rule__XOrExpression__Group__123045);
+            pushFollow(FOLLOW_2);
             rule__XOrExpression__Group__1__Impl();
 
             state._fsp--;
@@ -33572,22 +33572,22 @@ public final void rule__XOrExpression__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XOrExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11114:1: rule__XOrExpression__Group__1__Impl : ( ( rule__XOrExpression__Group_1__0 )* ) ;
+    // InternalFormat.g:11114:1: rule__XOrExpression__Group__1__Impl : ( ( rule__XOrExpression__Group_1__0 )* ) ;
     public final void rule__XOrExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11118:1: ( ( ( rule__XOrExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11119:1: ( ( rule__XOrExpression__Group_1__0 )* )
+            // InternalFormat.g:11118:1: ( ( ( rule__XOrExpression__Group_1__0 )* ) )
+            // InternalFormat.g:11119:1: ( ( rule__XOrExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11119:1: ( ( rule__XOrExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11120:1: ( rule__XOrExpression__Group_1__0 )*
+            // InternalFormat.g:11119:1: ( ( rule__XOrExpression__Group_1__0 )* )
+            // InternalFormat.g:11120:1: ( rule__XOrExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11121:1: ( rule__XOrExpression__Group_1__0 )*
+            // InternalFormat.g:11121:1: ( rule__XOrExpression__Group_1__0 )*
             loop104:
             do {
                 int alt104=2;
@@ -33606,9 +33606,9 @@ public final void rule__XOrExpression__Group__1__Impl() throws RecognitionExcept
 
                 switch (alt104) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11121:2: rule__XOrExpression__Group_1__0
+            	    // InternalFormat.g:11121:2: rule__XOrExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XOrExpression__Group_1__0_in_rule__XOrExpression__Group__1__Impl23072);
+            	    pushFollow(FOLLOW_59);
             	    rule__XOrExpression__Group_1__0();
 
             	    state._fsp--;
@@ -33647,21 +33647,21 @@ public final void rule__XOrExpression__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XOrExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11135:1: rule__XOrExpression__Group_1__0 : rule__XOrExpression__Group_1__0__Impl rule__XOrExpression__Group_1__1 ;
+    // InternalFormat.g:11135:1: rule__XOrExpression__Group_1__0 : rule__XOrExpression__Group_1__0__Impl rule__XOrExpression__Group_1__1 ;
     public final void rule__XOrExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11139:1: ( rule__XOrExpression__Group_1__0__Impl rule__XOrExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11140:2: rule__XOrExpression__Group_1__0__Impl rule__XOrExpression__Group_1__1
+            // InternalFormat.g:11139:1: ( rule__XOrExpression__Group_1__0__Impl rule__XOrExpression__Group_1__1 )
+            // InternalFormat.g:11140:2: rule__XOrExpression__Group_1__0__Impl rule__XOrExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XOrExpression__Group_1__0__Impl_in_rule__XOrExpression__Group_1__023107);
+            pushFollow(FOLLOW_50);
             rule__XOrExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XOrExpression__Group_1__1_in_rule__XOrExpression__Group_1__023110);
+            pushFollow(FOLLOW_2);
             rule__XOrExpression__Group_1__1();
 
             state._fsp--;
@@ -33685,25 +33685,25 @@ public final void rule__XOrExpression__Group_1__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XOrExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11147:1: rule__XOrExpression__Group_1__0__Impl : ( ( rule__XOrExpression__Group_1_0__0 ) ) ;
+    // InternalFormat.g:11147:1: rule__XOrExpression__Group_1__0__Impl : ( ( rule__XOrExpression__Group_1_0__0 ) ) ;
     public final void rule__XOrExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11151:1: ( ( ( rule__XOrExpression__Group_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11152:1: ( ( rule__XOrExpression__Group_1_0__0 ) )
+            // InternalFormat.g:11151:1: ( ( ( rule__XOrExpression__Group_1_0__0 ) ) )
+            // InternalFormat.g:11152:1: ( ( rule__XOrExpression__Group_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11152:1: ( ( rule__XOrExpression__Group_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11153:1: ( rule__XOrExpression__Group_1_0__0 )
+            // InternalFormat.g:11152:1: ( ( rule__XOrExpression__Group_1_0__0 ) )
+            // InternalFormat.g:11153:1: ( rule__XOrExpression__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getGroup_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11154:1: ( rule__XOrExpression__Group_1_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11154:2: rule__XOrExpression__Group_1_0__0
+            // InternalFormat.g:11154:1: ( rule__XOrExpression__Group_1_0__0 )
+            // InternalFormat.g:11154:2: rule__XOrExpression__Group_1_0__0
             {
-            pushFollow(FOLLOW_rule__XOrExpression__Group_1_0__0_in_rule__XOrExpression__Group_1__0__Impl23137);
+            pushFollow(FOLLOW_2);
             rule__XOrExpression__Group_1_0__0();
 
             state._fsp--;
@@ -33736,16 +33736,16 @@ public final void rule__XOrExpression__Group_1__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XOrExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11164:1: rule__XOrExpression__Group_1__1 : rule__XOrExpression__Group_1__1__Impl ;
+    // InternalFormat.g:11164:1: rule__XOrExpression__Group_1__1 : rule__XOrExpression__Group_1__1__Impl ;
     public final void rule__XOrExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11168:1: ( rule__XOrExpression__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11169:2: rule__XOrExpression__Group_1__1__Impl
+            // InternalFormat.g:11168:1: ( rule__XOrExpression__Group_1__1__Impl )
+            // InternalFormat.g:11169:2: rule__XOrExpression__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XOrExpression__Group_1__1__Impl_in_rule__XOrExpression__Group_1__123167);
+            pushFollow(FOLLOW_2);
             rule__XOrExpression__Group_1__1__Impl();
 
             state._fsp--;
@@ -33769,25 +33769,25 @@ public final void rule__XOrExpression__Group_1__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XOrExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11175:1: rule__XOrExpression__Group_1__1__Impl : ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) ) ;
+    // InternalFormat.g:11175:1: rule__XOrExpression__Group_1__1__Impl : ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) ) ;
     public final void rule__XOrExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11179:1: ( ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11180:1: ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) )
+            // InternalFormat.g:11179:1: ( ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) ) )
+            // InternalFormat.g:11180:1: ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11180:1: ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11181:1: ( rule__XOrExpression__RightOperandAssignment_1_1 )
+            // InternalFormat.g:11180:1: ( ( rule__XOrExpression__RightOperandAssignment_1_1 ) )
+            // InternalFormat.g:11181:1: ( rule__XOrExpression__RightOperandAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getRightOperandAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11182:1: ( rule__XOrExpression__RightOperandAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11182:2: rule__XOrExpression__RightOperandAssignment_1_1
+            // InternalFormat.g:11182:1: ( rule__XOrExpression__RightOperandAssignment_1_1 )
+            // InternalFormat.g:11182:2: rule__XOrExpression__RightOperandAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__XOrExpression__RightOperandAssignment_1_1_in_rule__XOrExpression__Group_1__1__Impl23194);
+            pushFollow(FOLLOW_2);
             rule__XOrExpression__RightOperandAssignment_1_1();
 
             state._fsp--;
@@ -33820,16 +33820,16 @@ public final void rule__XOrExpression__Group_1__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XOrExpression__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11196:1: rule__XOrExpression__Group_1_0__0 : rule__XOrExpression__Group_1_0__0__Impl ;
+    // InternalFormat.g:11196:1: rule__XOrExpression__Group_1_0__0 : rule__XOrExpression__Group_1_0__0__Impl ;
     public final void rule__XOrExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11200:1: ( rule__XOrExpression__Group_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11201:2: rule__XOrExpression__Group_1_0__0__Impl
+            // InternalFormat.g:11200:1: ( rule__XOrExpression__Group_1_0__0__Impl )
+            // InternalFormat.g:11201:2: rule__XOrExpression__Group_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XOrExpression__Group_1_0__0__Impl_in_rule__XOrExpression__Group_1_0__023228);
+            pushFollow(FOLLOW_2);
             rule__XOrExpression__Group_1_0__0__Impl();
 
             state._fsp--;
@@ -33853,25 +33853,25 @@ public final void rule__XOrExpression__Group_1_0__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XOrExpression__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11207:1: rule__XOrExpression__Group_1_0__0__Impl : ( ( rule__XOrExpression__Group_1_0_0__0 ) ) ;
+    // InternalFormat.g:11207:1: rule__XOrExpression__Group_1_0__0__Impl : ( ( rule__XOrExpression__Group_1_0_0__0 ) ) ;
     public final void rule__XOrExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11211:1: ( ( ( rule__XOrExpression__Group_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11212:1: ( ( rule__XOrExpression__Group_1_0_0__0 ) )
+            // InternalFormat.g:11211:1: ( ( ( rule__XOrExpression__Group_1_0_0__0 ) ) )
+            // InternalFormat.g:11212:1: ( ( rule__XOrExpression__Group_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11212:1: ( ( rule__XOrExpression__Group_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11213:1: ( rule__XOrExpression__Group_1_0_0__0 )
+            // InternalFormat.g:11212:1: ( ( rule__XOrExpression__Group_1_0_0__0 ) )
+            // InternalFormat.g:11213:1: ( rule__XOrExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getGroup_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11214:1: ( rule__XOrExpression__Group_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11214:2: rule__XOrExpression__Group_1_0_0__0
+            // InternalFormat.g:11214:1: ( rule__XOrExpression__Group_1_0_0__0 )
+            // InternalFormat.g:11214:2: rule__XOrExpression__Group_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XOrExpression__Group_1_0_0__0_in_rule__XOrExpression__Group_1_0__0__Impl23255);
+            pushFollow(FOLLOW_2);
             rule__XOrExpression__Group_1_0_0__0();
 
             state._fsp--;
@@ -33904,21 +33904,21 @@ public final void rule__XOrExpression__Group_1_0__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XOrExpression__Group_1_0_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11226:1: rule__XOrExpression__Group_1_0_0__0 : rule__XOrExpression__Group_1_0_0__0__Impl rule__XOrExpression__Group_1_0_0__1 ;
+    // InternalFormat.g:11226:1: rule__XOrExpression__Group_1_0_0__0 : rule__XOrExpression__Group_1_0_0__0__Impl rule__XOrExpression__Group_1_0_0__1 ;
     public final void rule__XOrExpression__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11230:1: ( rule__XOrExpression__Group_1_0_0__0__Impl rule__XOrExpression__Group_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11231:2: rule__XOrExpression__Group_1_0_0__0__Impl rule__XOrExpression__Group_1_0_0__1
+            // InternalFormat.g:11230:1: ( rule__XOrExpression__Group_1_0_0__0__Impl rule__XOrExpression__Group_1_0_0__1 )
+            // InternalFormat.g:11231:2: rule__XOrExpression__Group_1_0_0__0__Impl rule__XOrExpression__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XOrExpression__Group_1_0_0__0__Impl_in_rule__XOrExpression__Group_1_0_0__023287);
+            pushFollow(FOLLOW_58);
             rule__XOrExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XOrExpression__Group_1_0_0__1_in_rule__XOrExpression__Group_1_0_0__023290);
+            pushFollow(FOLLOW_2);
             rule__XOrExpression__Group_1_0_0__1();
 
             state._fsp--;
@@ -33942,23 +33942,23 @@ public final void rule__XOrExpression__Group_1_0_0__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XOrExpression__Group_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11238:1: rule__XOrExpression__Group_1_0_0__0__Impl : ( () ) ;
+    // InternalFormat.g:11238:1: rule__XOrExpression__Group_1_0_0__0__Impl : ( () ) ;
     public final void rule__XOrExpression__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11242:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11243:1: ( () )
+            // InternalFormat.g:11242:1: ( ( () ) )
+            // InternalFormat.g:11243:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11243:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11244:1: ()
+            // InternalFormat.g:11243:1: ( () )
+            // InternalFormat.g:11244:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11245:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11247:1: 
+            // InternalFormat.g:11245:1: ()
+            // InternalFormat.g:11247:1: 
             {
             }
 
@@ -33983,16 +33983,16 @@ public final void rule__XOrExpression__Group_1_0_0__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XOrExpression__Group_1_0_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11257:1: rule__XOrExpression__Group_1_0_0__1 : rule__XOrExpression__Group_1_0_0__1__Impl ;
+    // InternalFormat.g:11257:1: rule__XOrExpression__Group_1_0_0__1 : rule__XOrExpression__Group_1_0_0__1__Impl ;
     public final void rule__XOrExpression__Group_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11261:1: ( rule__XOrExpression__Group_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11262:2: rule__XOrExpression__Group_1_0_0__1__Impl
+            // InternalFormat.g:11261:1: ( rule__XOrExpression__Group_1_0_0__1__Impl )
+            // InternalFormat.g:11262:2: rule__XOrExpression__Group_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XOrExpression__Group_1_0_0__1__Impl_in_rule__XOrExpression__Group_1_0_0__123348);
+            pushFollow(FOLLOW_2);
             rule__XOrExpression__Group_1_0_0__1__Impl();
 
             state._fsp--;
@@ -34016,25 +34016,25 @@ public final void rule__XOrExpression__Group_1_0_0__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XOrExpression__Group_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11268:1: rule__XOrExpression__Group_1_0_0__1__Impl : ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) ) ;
+    // InternalFormat.g:11268:1: rule__XOrExpression__Group_1_0_0__1__Impl : ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) ) ;
     public final void rule__XOrExpression__Group_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11272:1: ( ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11273:1: ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalFormat.g:11272:1: ( ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) ) )
+            // InternalFormat.g:11273:1: ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11273:1: ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11274:1: ( rule__XOrExpression__FeatureAssignment_1_0_0_1 )
+            // InternalFormat.g:11273:1: ( ( rule__XOrExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalFormat.g:11274:1: ( rule__XOrExpression__FeatureAssignment_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getFeatureAssignment_1_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11275:1: ( rule__XOrExpression__FeatureAssignment_1_0_0_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11275:2: rule__XOrExpression__FeatureAssignment_1_0_0_1
+            // InternalFormat.g:11275:1: ( rule__XOrExpression__FeatureAssignment_1_0_0_1 )
+            // InternalFormat.g:11275:2: rule__XOrExpression__FeatureAssignment_1_0_0_1
             {
-            pushFollow(FOLLOW_rule__XOrExpression__FeatureAssignment_1_0_0_1_in_rule__XOrExpression__Group_1_0_0__1__Impl23375);
+            pushFollow(FOLLOW_2);
             rule__XOrExpression__FeatureAssignment_1_0_0_1();
 
             state._fsp--;
@@ -34067,21 +34067,21 @@ public final void rule__XOrExpression__Group_1_0_0__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XAndExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11289:1: rule__XAndExpression__Group__0 : rule__XAndExpression__Group__0__Impl rule__XAndExpression__Group__1 ;
+    // InternalFormat.g:11289:1: rule__XAndExpression__Group__0 : rule__XAndExpression__Group__0__Impl rule__XAndExpression__Group__1 ;
     public final void rule__XAndExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11293:1: ( rule__XAndExpression__Group__0__Impl rule__XAndExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11294:2: rule__XAndExpression__Group__0__Impl rule__XAndExpression__Group__1
+            // InternalFormat.g:11293:1: ( rule__XAndExpression__Group__0__Impl rule__XAndExpression__Group__1 )
+            // InternalFormat.g:11294:2: rule__XAndExpression__Group__0__Impl rule__XAndExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XAndExpression__Group__0__Impl_in_rule__XAndExpression__Group__023409);
+            pushFollow(FOLLOW_60);
             rule__XAndExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAndExpression__Group__1_in_rule__XAndExpression__Group__023412);
+            pushFollow(FOLLOW_2);
             rule__XAndExpression__Group__1();
 
             state._fsp--;
@@ -34105,22 +34105,22 @@ public final void rule__XAndExpression__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAndExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11301:1: rule__XAndExpression__Group__0__Impl : ( ruleXEqualityExpression ) ;
+    // InternalFormat.g:11301:1: rule__XAndExpression__Group__0__Impl : ( ruleXEqualityExpression ) ;
     public final void rule__XAndExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11305:1: ( ( ruleXEqualityExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11306:1: ( ruleXEqualityExpression )
+            // InternalFormat.g:11305:1: ( ( ruleXEqualityExpression ) )
+            // InternalFormat.g:11306:1: ( ruleXEqualityExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11306:1: ( ruleXEqualityExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11307:1: ruleXEqualityExpression
+            // InternalFormat.g:11306:1: ( ruleXEqualityExpression )
+            // InternalFormat.g:11307:1: ruleXEqualityExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getXEqualityExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleXEqualityExpression_in_rule__XAndExpression__Group__0__Impl23439);
+            pushFollow(FOLLOW_2);
             ruleXEqualityExpression();
 
             state._fsp--;
@@ -34150,16 +34150,16 @@ public final void rule__XAndExpression__Group__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XAndExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11318:1: rule__XAndExpression__Group__1 : rule__XAndExpression__Group__1__Impl ;
+    // InternalFormat.g:11318:1: rule__XAndExpression__Group__1 : rule__XAndExpression__Group__1__Impl ;
     public final void rule__XAndExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11322:1: ( rule__XAndExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11323:2: rule__XAndExpression__Group__1__Impl
+            // InternalFormat.g:11322:1: ( rule__XAndExpression__Group__1__Impl )
+            // InternalFormat.g:11323:2: rule__XAndExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAndExpression__Group__1__Impl_in_rule__XAndExpression__Group__123468);
+            pushFollow(FOLLOW_2);
             rule__XAndExpression__Group__1__Impl();
 
             state._fsp--;
@@ -34183,22 +34183,22 @@ public final void rule__XAndExpression__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XAndExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11329:1: rule__XAndExpression__Group__1__Impl : ( ( rule__XAndExpression__Group_1__0 )* ) ;
+    // InternalFormat.g:11329:1: rule__XAndExpression__Group__1__Impl : ( ( rule__XAndExpression__Group_1__0 )* ) ;
     public final void rule__XAndExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11333:1: ( ( ( rule__XAndExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11334:1: ( ( rule__XAndExpression__Group_1__0 )* )
+            // InternalFormat.g:11333:1: ( ( ( rule__XAndExpression__Group_1__0 )* ) )
+            // InternalFormat.g:11334:1: ( ( rule__XAndExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11334:1: ( ( rule__XAndExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11335:1: ( rule__XAndExpression__Group_1__0 )*
+            // InternalFormat.g:11334:1: ( ( rule__XAndExpression__Group_1__0 )* )
+            // InternalFormat.g:11335:1: ( rule__XAndExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11336:1: ( rule__XAndExpression__Group_1__0 )*
+            // InternalFormat.g:11336:1: ( rule__XAndExpression__Group_1__0 )*
             loop105:
             do {
                 int alt105=2;
@@ -34217,9 +34217,9 @@ public final void rule__XAndExpression__Group__1__Impl() throws RecognitionExcep
 
                 switch (alt105) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11336:2: rule__XAndExpression__Group_1__0
+            	    // InternalFormat.g:11336:2: rule__XAndExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XAndExpression__Group_1__0_in_rule__XAndExpression__Group__1__Impl23495);
+            	    pushFollow(FOLLOW_61);
             	    rule__XAndExpression__Group_1__0();
 
             	    state._fsp--;
@@ -34258,21 +34258,21 @@ public final void rule__XAndExpression__Group__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XAndExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11350:1: rule__XAndExpression__Group_1__0 : rule__XAndExpression__Group_1__0__Impl rule__XAndExpression__Group_1__1 ;
+    // InternalFormat.g:11350:1: rule__XAndExpression__Group_1__0 : rule__XAndExpression__Group_1__0__Impl rule__XAndExpression__Group_1__1 ;
     public final void rule__XAndExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11354:1: ( rule__XAndExpression__Group_1__0__Impl rule__XAndExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11355:2: rule__XAndExpression__Group_1__0__Impl rule__XAndExpression__Group_1__1
+            // InternalFormat.g:11354:1: ( rule__XAndExpression__Group_1__0__Impl rule__XAndExpression__Group_1__1 )
+            // InternalFormat.g:11355:2: rule__XAndExpression__Group_1__0__Impl rule__XAndExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XAndExpression__Group_1__0__Impl_in_rule__XAndExpression__Group_1__023530);
+            pushFollow(FOLLOW_50);
             rule__XAndExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAndExpression__Group_1__1_in_rule__XAndExpression__Group_1__023533);
+            pushFollow(FOLLOW_2);
             rule__XAndExpression__Group_1__1();
 
             state._fsp--;
@@ -34296,25 +34296,25 @@ public final void rule__XAndExpression__Group_1__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XAndExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11362:1: rule__XAndExpression__Group_1__0__Impl : ( ( rule__XAndExpression__Group_1_0__0 ) ) ;
+    // InternalFormat.g:11362:1: rule__XAndExpression__Group_1__0__Impl : ( ( rule__XAndExpression__Group_1_0__0 ) ) ;
     public final void rule__XAndExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11366:1: ( ( ( rule__XAndExpression__Group_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11367:1: ( ( rule__XAndExpression__Group_1_0__0 ) )
+            // InternalFormat.g:11366:1: ( ( ( rule__XAndExpression__Group_1_0__0 ) ) )
+            // InternalFormat.g:11367:1: ( ( rule__XAndExpression__Group_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11367:1: ( ( rule__XAndExpression__Group_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11368:1: ( rule__XAndExpression__Group_1_0__0 )
+            // InternalFormat.g:11367:1: ( ( rule__XAndExpression__Group_1_0__0 ) )
+            // InternalFormat.g:11368:1: ( rule__XAndExpression__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getGroup_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11369:1: ( rule__XAndExpression__Group_1_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11369:2: rule__XAndExpression__Group_1_0__0
+            // InternalFormat.g:11369:1: ( rule__XAndExpression__Group_1_0__0 )
+            // InternalFormat.g:11369:2: rule__XAndExpression__Group_1_0__0
             {
-            pushFollow(FOLLOW_rule__XAndExpression__Group_1_0__0_in_rule__XAndExpression__Group_1__0__Impl23560);
+            pushFollow(FOLLOW_2);
             rule__XAndExpression__Group_1_0__0();
 
             state._fsp--;
@@ -34347,16 +34347,16 @@ public final void rule__XAndExpression__Group_1__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XAndExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11379:1: rule__XAndExpression__Group_1__1 : rule__XAndExpression__Group_1__1__Impl ;
+    // InternalFormat.g:11379:1: rule__XAndExpression__Group_1__1 : rule__XAndExpression__Group_1__1__Impl ;
     public final void rule__XAndExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11383:1: ( rule__XAndExpression__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11384:2: rule__XAndExpression__Group_1__1__Impl
+            // InternalFormat.g:11383:1: ( rule__XAndExpression__Group_1__1__Impl )
+            // InternalFormat.g:11384:2: rule__XAndExpression__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAndExpression__Group_1__1__Impl_in_rule__XAndExpression__Group_1__123590);
+            pushFollow(FOLLOW_2);
             rule__XAndExpression__Group_1__1__Impl();
 
             state._fsp--;
@@ -34380,25 +34380,25 @@ public final void rule__XAndExpression__Group_1__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XAndExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11390:1: rule__XAndExpression__Group_1__1__Impl : ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) ) ;
+    // InternalFormat.g:11390:1: rule__XAndExpression__Group_1__1__Impl : ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) ) ;
     public final void rule__XAndExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11394:1: ( ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11395:1: ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) )
+            // InternalFormat.g:11394:1: ( ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) ) )
+            // InternalFormat.g:11395:1: ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11395:1: ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11396:1: ( rule__XAndExpression__RightOperandAssignment_1_1 )
+            // InternalFormat.g:11395:1: ( ( rule__XAndExpression__RightOperandAssignment_1_1 ) )
+            // InternalFormat.g:11396:1: ( rule__XAndExpression__RightOperandAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getRightOperandAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11397:1: ( rule__XAndExpression__RightOperandAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11397:2: rule__XAndExpression__RightOperandAssignment_1_1
+            // InternalFormat.g:11397:1: ( rule__XAndExpression__RightOperandAssignment_1_1 )
+            // InternalFormat.g:11397:2: rule__XAndExpression__RightOperandAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__XAndExpression__RightOperandAssignment_1_1_in_rule__XAndExpression__Group_1__1__Impl23617);
+            pushFollow(FOLLOW_2);
             rule__XAndExpression__RightOperandAssignment_1_1();
 
             state._fsp--;
@@ -34431,16 +34431,16 @@ public final void rule__XAndExpression__Group_1__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XAndExpression__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11411:1: rule__XAndExpression__Group_1_0__0 : rule__XAndExpression__Group_1_0__0__Impl ;
+    // InternalFormat.g:11411:1: rule__XAndExpression__Group_1_0__0 : rule__XAndExpression__Group_1_0__0__Impl ;
     public final void rule__XAndExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11415:1: ( rule__XAndExpression__Group_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11416:2: rule__XAndExpression__Group_1_0__0__Impl
+            // InternalFormat.g:11415:1: ( rule__XAndExpression__Group_1_0__0__Impl )
+            // InternalFormat.g:11416:2: rule__XAndExpression__Group_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XAndExpression__Group_1_0__0__Impl_in_rule__XAndExpression__Group_1_0__023651);
+            pushFollow(FOLLOW_2);
             rule__XAndExpression__Group_1_0__0__Impl();
 
             state._fsp--;
@@ -34464,25 +34464,25 @@ public final void rule__XAndExpression__Group_1_0__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XAndExpression__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11422:1: rule__XAndExpression__Group_1_0__0__Impl : ( ( rule__XAndExpression__Group_1_0_0__0 ) ) ;
+    // InternalFormat.g:11422:1: rule__XAndExpression__Group_1_0__0__Impl : ( ( rule__XAndExpression__Group_1_0_0__0 ) ) ;
     public final void rule__XAndExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11426:1: ( ( ( rule__XAndExpression__Group_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11427:1: ( ( rule__XAndExpression__Group_1_0_0__0 ) )
+            // InternalFormat.g:11426:1: ( ( ( rule__XAndExpression__Group_1_0_0__0 ) ) )
+            // InternalFormat.g:11427:1: ( ( rule__XAndExpression__Group_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11427:1: ( ( rule__XAndExpression__Group_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11428:1: ( rule__XAndExpression__Group_1_0_0__0 )
+            // InternalFormat.g:11427:1: ( ( rule__XAndExpression__Group_1_0_0__0 ) )
+            // InternalFormat.g:11428:1: ( rule__XAndExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getGroup_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11429:1: ( rule__XAndExpression__Group_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11429:2: rule__XAndExpression__Group_1_0_0__0
+            // InternalFormat.g:11429:1: ( rule__XAndExpression__Group_1_0_0__0 )
+            // InternalFormat.g:11429:2: rule__XAndExpression__Group_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XAndExpression__Group_1_0_0__0_in_rule__XAndExpression__Group_1_0__0__Impl23678);
+            pushFollow(FOLLOW_2);
             rule__XAndExpression__Group_1_0_0__0();
 
             state._fsp--;
@@ -34515,21 +34515,21 @@ public final void rule__XAndExpression__Group_1_0__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XAndExpression__Group_1_0_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11441:1: rule__XAndExpression__Group_1_0_0__0 : rule__XAndExpression__Group_1_0_0__0__Impl rule__XAndExpression__Group_1_0_0__1 ;
+    // InternalFormat.g:11441:1: rule__XAndExpression__Group_1_0_0__0 : rule__XAndExpression__Group_1_0_0__0__Impl rule__XAndExpression__Group_1_0_0__1 ;
     public final void rule__XAndExpression__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11445:1: ( rule__XAndExpression__Group_1_0_0__0__Impl rule__XAndExpression__Group_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11446:2: rule__XAndExpression__Group_1_0_0__0__Impl rule__XAndExpression__Group_1_0_0__1
+            // InternalFormat.g:11445:1: ( rule__XAndExpression__Group_1_0_0__0__Impl rule__XAndExpression__Group_1_0_0__1 )
+            // InternalFormat.g:11446:2: rule__XAndExpression__Group_1_0_0__0__Impl rule__XAndExpression__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XAndExpression__Group_1_0_0__0__Impl_in_rule__XAndExpression__Group_1_0_0__023710);
+            pushFollow(FOLLOW_60);
             rule__XAndExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAndExpression__Group_1_0_0__1_in_rule__XAndExpression__Group_1_0_0__023713);
+            pushFollow(FOLLOW_2);
             rule__XAndExpression__Group_1_0_0__1();
 
             state._fsp--;
@@ -34553,23 +34553,23 @@ public final void rule__XAndExpression__Group_1_0_0__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XAndExpression__Group_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11453:1: rule__XAndExpression__Group_1_0_0__0__Impl : ( () ) ;
+    // InternalFormat.g:11453:1: rule__XAndExpression__Group_1_0_0__0__Impl : ( () ) ;
     public final void rule__XAndExpression__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11457:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11458:1: ( () )
+            // InternalFormat.g:11457:1: ( ( () ) )
+            // InternalFormat.g:11458:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11458:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11459:1: ()
+            // InternalFormat.g:11458:1: ( () )
+            // InternalFormat.g:11459:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11460:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11462:1: 
+            // InternalFormat.g:11460:1: ()
+            // InternalFormat.g:11462:1: 
             {
             }
 
@@ -34594,16 +34594,16 @@ public final void rule__XAndExpression__Group_1_0_0__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XAndExpression__Group_1_0_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11472:1: rule__XAndExpression__Group_1_0_0__1 : rule__XAndExpression__Group_1_0_0__1__Impl ;
+    // InternalFormat.g:11472:1: rule__XAndExpression__Group_1_0_0__1 : rule__XAndExpression__Group_1_0_0__1__Impl ;
     public final void rule__XAndExpression__Group_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11476:1: ( rule__XAndExpression__Group_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11477:2: rule__XAndExpression__Group_1_0_0__1__Impl
+            // InternalFormat.g:11476:1: ( rule__XAndExpression__Group_1_0_0__1__Impl )
+            // InternalFormat.g:11477:2: rule__XAndExpression__Group_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAndExpression__Group_1_0_0__1__Impl_in_rule__XAndExpression__Group_1_0_0__123771);
+            pushFollow(FOLLOW_2);
             rule__XAndExpression__Group_1_0_0__1__Impl();
 
             state._fsp--;
@@ -34627,25 +34627,25 @@ public final void rule__XAndExpression__Group_1_0_0__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XAndExpression__Group_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11483:1: rule__XAndExpression__Group_1_0_0__1__Impl : ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) ) ;
+    // InternalFormat.g:11483:1: rule__XAndExpression__Group_1_0_0__1__Impl : ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) ) ;
     public final void rule__XAndExpression__Group_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11487:1: ( ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11488:1: ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalFormat.g:11487:1: ( ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) ) )
+            // InternalFormat.g:11488:1: ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11488:1: ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11489:1: ( rule__XAndExpression__FeatureAssignment_1_0_0_1 )
+            // InternalFormat.g:11488:1: ( ( rule__XAndExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalFormat.g:11489:1: ( rule__XAndExpression__FeatureAssignment_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getFeatureAssignment_1_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11490:1: ( rule__XAndExpression__FeatureAssignment_1_0_0_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11490:2: rule__XAndExpression__FeatureAssignment_1_0_0_1
+            // InternalFormat.g:11490:1: ( rule__XAndExpression__FeatureAssignment_1_0_0_1 )
+            // InternalFormat.g:11490:2: rule__XAndExpression__FeatureAssignment_1_0_0_1
             {
-            pushFollow(FOLLOW_rule__XAndExpression__FeatureAssignment_1_0_0_1_in_rule__XAndExpression__Group_1_0_0__1__Impl23798);
+            pushFollow(FOLLOW_2);
             rule__XAndExpression__FeatureAssignment_1_0_0_1();
 
             state._fsp--;
@@ -34678,21 +34678,21 @@ public final void rule__XAndExpression__Group_1_0_0__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XEqualityExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11504:1: rule__XEqualityExpression__Group__0 : rule__XEqualityExpression__Group__0__Impl rule__XEqualityExpression__Group__1 ;
+    // InternalFormat.g:11504:1: rule__XEqualityExpression__Group__0 : rule__XEqualityExpression__Group__0__Impl rule__XEqualityExpression__Group__1 ;
     public final void rule__XEqualityExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11508:1: ( rule__XEqualityExpression__Group__0__Impl rule__XEqualityExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11509:2: rule__XEqualityExpression__Group__0__Impl rule__XEqualityExpression__Group__1
+            // InternalFormat.g:11508:1: ( rule__XEqualityExpression__Group__0__Impl rule__XEqualityExpression__Group__1 )
+            // InternalFormat.g:11509:2: rule__XEqualityExpression__Group__0__Impl rule__XEqualityExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group__0__Impl_in_rule__XEqualityExpression__Group__023832);
+            pushFollow(FOLLOW_62);
             rule__XEqualityExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group__1_in_rule__XEqualityExpression__Group__023835);
+            pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group__1();
 
             state._fsp--;
@@ -34716,22 +34716,22 @@ public final void rule__XEqualityExpression__Group__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XEqualityExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11516:1: rule__XEqualityExpression__Group__0__Impl : ( ruleXRelationalExpression ) ;
+    // InternalFormat.g:11516:1: rule__XEqualityExpression__Group__0__Impl : ( ruleXRelationalExpression ) ;
     public final void rule__XEqualityExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11520:1: ( ( ruleXRelationalExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11521:1: ( ruleXRelationalExpression )
+            // InternalFormat.g:11520:1: ( ( ruleXRelationalExpression ) )
+            // InternalFormat.g:11521:1: ( ruleXRelationalExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11521:1: ( ruleXRelationalExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11522:1: ruleXRelationalExpression
+            // InternalFormat.g:11521:1: ( ruleXRelationalExpression )
+            // InternalFormat.g:11522:1: ruleXRelationalExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getXRelationalExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleXRelationalExpression_in_rule__XEqualityExpression__Group__0__Impl23862);
+            pushFollow(FOLLOW_2);
             ruleXRelationalExpression();
 
             state._fsp--;
@@ -34761,16 +34761,16 @@ public final void rule__XEqualityExpression__Group__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XEqualityExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11533:1: rule__XEqualityExpression__Group__1 : rule__XEqualityExpression__Group__1__Impl ;
+    // InternalFormat.g:11533:1: rule__XEqualityExpression__Group__1 : rule__XEqualityExpression__Group__1__Impl ;
     public final void rule__XEqualityExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11537:1: ( rule__XEqualityExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11538:2: rule__XEqualityExpression__Group__1__Impl
+            // InternalFormat.g:11537:1: ( rule__XEqualityExpression__Group__1__Impl )
+            // InternalFormat.g:11538:2: rule__XEqualityExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group__1__Impl_in_rule__XEqualityExpression__Group__123891);
+            pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group__1__Impl();
 
             state._fsp--;
@@ -34794,22 +34794,22 @@ public final void rule__XEqualityExpression__Group__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XEqualityExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11544:1: rule__XEqualityExpression__Group__1__Impl : ( ( rule__XEqualityExpression__Group_1__0 )* ) ;
+    // InternalFormat.g:11544:1: rule__XEqualityExpression__Group__1__Impl : ( ( rule__XEqualityExpression__Group_1__0 )* ) ;
     public final void rule__XEqualityExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11548:1: ( ( ( rule__XEqualityExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11549:1: ( ( rule__XEqualityExpression__Group_1__0 )* )
+            // InternalFormat.g:11548:1: ( ( ( rule__XEqualityExpression__Group_1__0 )* ) )
+            // InternalFormat.g:11549:1: ( ( rule__XEqualityExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11549:1: ( ( rule__XEqualityExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11550:1: ( rule__XEqualityExpression__Group_1__0 )*
+            // InternalFormat.g:11549:1: ( ( rule__XEqualityExpression__Group_1__0 )* )
+            // InternalFormat.g:11550:1: ( rule__XEqualityExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11551:1: ( rule__XEqualityExpression__Group_1__0 )*
+            // InternalFormat.g:11551:1: ( rule__XEqualityExpression__Group_1__0 )*
             loop106:
             do {
                 int alt106=2;
@@ -34863,9 +34863,9 @@ public final void rule__XEqualityExpression__Group__1__Impl() throws Recognition
 
                 switch (alt106) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11551:2: rule__XEqualityExpression__Group_1__0
+            	    // InternalFormat.g:11551:2: rule__XEqualityExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XEqualityExpression__Group_1__0_in_rule__XEqualityExpression__Group__1__Impl23918);
+            	    pushFollow(FOLLOW_63);
             	    rule__XEqualityExpression__Group_1__0();
 
             	    state._fsp--;
@@ -34904,21 +34904,21 @@ public final void rule__XEqualityExpression__Group__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11565:1: rule__XEqualityExpression__Group_1__0 : rule__XEqualityExpression__Group_1__0__Impl rule__XEqualityExpression__Group_1__1 ;
+    // InternalFormat.g:11565:1: rule__XEqualityExpression__Group_1__0 : rule__XEqualityExpression__Group_1__0__Impl rule__XEqualityExpression__Group_1__1 ;
     public final void rule__XEqualityExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11569:1: ( rule__XEqualityExpression__Group_1__0__Impl rule__XEqualityExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11570:2: rule__XEqualityExpression__Group_1__0__Impl rule__XEqualityExpression__Group_1__1
+            // InternalFormat.g:11569:1: ( rule__XEqualityExpression__Group_1__0__Impl rule__XEqualityExpression__Group_1__1 )
+            // InternalFormat.g:11570:2: rule__XEqualityExpression__Group_1__0__Impl rule__XEqualityExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1__0__Impl_in_rule__XEqualityExpression__Group_1__023953);
+            pushFollow(FOLLOW_50);
             rule__XEqualityExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1__1_in_rule__XEqualityExpression__Group_1__023956);
+            pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group_1__1();
 
             state._fsp--;
@@ -34942,25 +34942,25 @@ public final void rule__XEqualityExpression__Group_1__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11577:1: rule__XEqualityExpression__Group_1__0__Impl : ( ( rule__XEqualityExpression__Group_1_0__0 ) ) ;
+    // InternalFormat.g:11577:1: rule__XEqualityExpression__Group_1__0__Impl : ( ( rule__XEqualityExpression__Group_1_0__0 ) ) ;
     public final void rule__XEqualityExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11581:1: ( ( ( rule__XEqualityExpression__Group_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11582:1: ( ( rule__XEqualityExpression__Group_1_0__0 ) )
+            // InternalFormat.g:11581:1: ( ( ( rule__XEqualityExpression__Group_1_0__0 ) ) )
+            // InternalFormat.g:11582:1: ( ( rule__XEqualityExpression__Group_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11582:1: ( ( rule__XEqualityExpression__Group_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11583:1: ( rule__XEqualityExpression__Group_1_0__0 )
+            // InternalFormat.g:11582:1: ( ( rule__XEqualityExpression__Group_1_0__0 ) )
+            // InternalFormat.g:11583:1: ( rule__XEqualityExpression__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getGroup_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11584:1: ( rule__XEqualityExpression__Group_1_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11584:2: rule__XEqualityExpression__Group_1_0__0
+            // InternalFormat.g:11584:1: ( rule__XEqualityExpression__Group_1_0__0 )
+            // InternalFormat.g:11584:2: rule__XEqualityExpression__Group_1_0__0
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1_0__0_in_rule__XEqualityExpression__Group_1__0__Impl23983);
+            pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group_1_0__0();
 
             state._fsp--;
@@ -34993,16 +34993,16 @@ public final void rule__XEqualityExpression__Group_1__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11594:1: rule__XEqualityExpression__Group_1__1 : rule__XEqualityExpression__Group_1__1__Impl ;
+    // InternalFormat.g:11594:1: rule__XEqualityExpression__Group_1__1 : rule__XEqualityExpression__Group_1__1__Impl ;
     public final void rule__XEqualityExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11598:1: ( rule__XEqualityExpression__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11599:2: rule__XEqualityExpression__Group_1__1__Impl
+            // InternalFormat.g:11598:1: ( rule__XEqualityExpression__Group_1__1__Impl )
+            // InternalFormat.g:11599:2: rule__XEqualityExpression__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1__1__Impl_in_rule__XEqualityExpression__Group_1__124013);
+            pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group_1__1__Impl();
 
             state._fsp--;
@@ -35026,25 +35026,25 @@ public final void rule__XEqualityExpression__Group_1__1() throws RecognitionExce
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11605:1: rule__XEqualityExpression__Group_1__1__Impl : ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) ) ;
+    // InternalFormat.g:11605:1: rule__XEqualityExpression__Group_1__1__Impl : ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) ) ;
     public final void rule__XEqualityExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11609:1: ( ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11610:1: ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) )
+            // InternalFormat.g:11609:1: ( ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) ) )
+            // InternalFormat.g:11610:1: ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11610:1: ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11611:1: ( rule__XEqualityExpression__RightOperandAssignment_1_1 )
+            // InternalFormat.g:11610:1: ( ( rule__XEqualityExpression__RightOperandAssignment_1_1 ) )
+            // InternalFormat.g:11611:1: ( rule__XEqualityExpression__RightOperandAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getRightOperandAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11612:1: ( rule__XEqualityExpression__RightOperandAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11612:2: rule__XEqualityExpression__RightOperandAssignment_1_1
+            // InternalFormat.g:11612:1: ( rule__XEqualityExpression__RightOperandAssignment_1_1 )
+            // InternalFormat.g:11612:2: rule__XEqualityExpression__RightOperandAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__RightOperandAssignment_1_1_in_rule__XEqualityExpression__Group_1__1__Impl24040);
+            pushFollow(FOLLOW_2);
             rule__XEqualityExpression__RightOperandAssignment_1_1();
 
             state._fsp--;
@@ -35077,16 +35077,16 @@ public final void rule__XEqualityExpression__Group_1__1__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11626:1: rule__XEqualityExpression__Group_1_0__0 : rule__XEqualityExpression__Group_1_0__0__Impl ;
+    // InternalFormat.g:11626:1: rule__XEqualityExpression__Group_1_0__0 : rule__XEqualityExpression__Group_1_0__0__Impl ;
     public final void rule__XEqualityExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11630:1: ( rule__XEqualityExpression__Group_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11631:2: rule__XEqualityExpression__Group_1_0__0__Impl
+            // InternalFormat.g:11630:1: ( rule__XEqualityExpression__Group_1_0__0__Impl )
+            // InternalFormat.g:11631:2: rule__XEqualityExpression__Group_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1_0__0__Impl_in_rule__XEqualityExpression__Group_1_0__024074);
+            pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group_1_0__0__Impl();
 
             state._fsp--;
@@ -35110,25 +35110,25 @@ public final void rule__XEqualityExpression__Group_1_0__0() throws RecognitionEx
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11637:1: rule__XEqualityExpression__Group_1_0__0__Impl : ( ( rule__XEqualityExpression__Group_1_0_0__0 ) ) ;
+    // InternalFormat.g:11637:1: rule__XEqualityExpression__Group_1_0__0__Impl : ( ( rule__XEqualityExpression__Group_1_0_0__0 ) ) ;
     public final void rule__XEqualityExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11641:1: ( ( ( rule__XEqualityExpression__Group_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11642:1: ( ( rule__XEqualityExpression__Group_1_0_0__0 ) )
+            // InternalFormat.g:11641:1: ( ( ( rule__XEqualityExpression__Group_1_0_0__0 ) ) )
+            // InternalFormat.g:11642:1: ( ( rule__XEqualityExpression__Group_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11642:1: ( ( rule__XEqualityExpression__Group_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11643:1: ( rule__XEqualityExpression__Group_1_0_0__0 )
+            // InternalFormat.g:11642:1: ( ( rule__XEqualityExpression__Group_1_0_0__0 ) )
+            // InternalFormat.g:11643:1: ( rule__XEqualityExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getGroup_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11644:1: ( rule__XEqualityExpression__Group_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11644:2: rule__XEqualityExpression__Group_1_0_0__0
+            // InternalFormat.g:11644:1: ( rule__XEqualityExpression__Group_1_0_0__0 )
+            // InternalFormat.g:11644:2: rule__XEqualityExpression__Group_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1_0_0__0_in_rule__XEqualityExpression__Group_1_0__0__Impl24101);
+            pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group_1_0_0__0();
 
             state._fsp--;
@@ -35161,21 +35161,21 @@ public final void rule__XEqualityExpression__Group_1_0__0__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1_0_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11656:1: rule__XEqualityExpression__Group_1_0_0__0 : rule__XEqualityExpression__Group_1_0_0__0__Impl rule__XEqualityExpression__Group_1_0_0__1 ;
+    // InternalFormat.g:11656:1: rule__XEqualityExpression__Group_1_0_0__0 : rule__XEqualityExpression__Group_1_0_0__0__Impl rule__XEqualityExpression__Group_1_0_0__1 ;
     public final void rule__XEqualityExpression__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11660:1: ( rule__XEqualityExpression__Group_1_0_0__0__Impl rule__XEqualityExpression__Group_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11661:2: rule__XEqualityExpression__Group_1_0_0__0__Impl rule__XEqualityExpression__Group_1_0_0__1
+            // InternalFormat.g:11660:1: ( rule__XEqualityExpression__Group_1_0_0__0__Impl rule__XEqualityExpression__Group_1_0_0__1 )
+            // InternalFormat.g:11661:2: rule__XEqualityExpression__Group_1_0_0__0__Impl rule__XEqualityExpression__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1_0_0__0__Impl_in_rule__XEqualityExpression__Group_1_0_0__024133);
+            pushFollow(FOLLOW_62);
             rule__XEqualityExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1_0_0__1_in_rule__XEqualityExpression__Group_1_0_0__024136);
+            pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group_1_0_0__1();
 
             state._fsp--;
@@ -35199,23 +35199,23 @@ public final void rule__XEqualityExpression__Group_1_0_0__0() throws Recognition
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11668:1: rule__XEqualityExpression__Group_1_0_0__0__Impl : ( () ) ;
+    // InternalFormat.g:11668:1: rule__XEqualityExpression__Group_1_0_0__0__Impl : ( () ) ;
     public final void rule__XEqualityExpression__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11672:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11673:1: ( () )
+            // InternalFormat.g:11672:1: ( ( () ) )
+            // InternalFormat.g:11673:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11673:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11674:1: ()
+            // InternalFormat.g:11673:1: ( () )
+            // InternalFormat.g:11674:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11675:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11677:1: 
+            // InternalFormat.g:11675:1: ()
+            // InternalFormat.g:11677:1: 
             {
             }
 
@@ -35240,16 +35240,16 @@ public final void rule__XEqualityExpression__Group_1_0_0__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1_0_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11687:1: rule__XEqualityExpression__Group_1_0_0__1 : rule__XEqualityExpression__Group_1_0_0__1__Impl ;
+    // InternalFormat.g:11687:1: rule__XEqualityExpression__Group_1_0_0__1 : rule__XEqualityExpression__Group_1_0_0__1__Impl ;
     public final void rule__XEqualityExpression__Group_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11691:1: ( rule__XEqualityExpression__Group_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11692:2: rule__XEqualityExpression__Group_1_0_0__1__Impl
+            // InternalFormat.g:11691:1: ( rule__XEqualityExpression__Group_1_0_0__1__Impl )
+            // InternalFormat.g:11692:2: rule__XEqualityExpression__Group_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__Group_1_0_0__1__Impl_in_rule__XEqualityExpression__Group_1_0_0__124194);
+            pushFollow(FOLLOW_2);
             rule__XEqualityExpression__Group_1_0_0__1__Impl();
 
             state._fsp--;
@@ -35273,25 +35273,25 @@ public final void rule__XEqualityExpression__Group_1_0_0__1() throws Recognition
 
 
     // $ANTLR start "rule__XEqualityExpression__Group_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11698:1: rule__XEqualityExpression__Group_1_0_0__1__Impl : ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) ) ;
+    // InternalFormat.g:11698:1: rule__XEqualityExpression__Group_1_0_0__1__Impl : ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) ) ;
     public final void rule__XEqualityExpression__Group_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11702:1: ( ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11703:1: ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalFormat.g:11702:1: ( ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) ) )
+            // InternalFormat.g:11703:1: ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11703:1: ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11704:1: ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 )
+            // InternalFormat.g:11703:1: ( ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalFormat.g:11704:1: ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getFeatureAssignment_1_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11705:1: ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11705:2: rule__XEqualityExpression__FeatureAssignment_1_0_0_1
+            // InternalFormat.g:11705:1: ( rule__XEqualityExpression__FeatureAssignment_1_0_0_1 )
+            // InternalFormat.g:11705:2: rule__XEqualityExpression__FeatureAssignment_1_0_0_1
             {
-            pushFollow(FOLLOW_rule__XEqualityExpression__FeatureAssignment_1_0_0_1_in_rule__XEqualityExpression__Group_1_0_0__1__Impl24221);
+            pushFollow(FOLLOW_2);
             rule__XEqualityExpression__FeatureAssignment_1_0_0_1();
 
             state._fsp--;
@@ -35324,21 +35324,21 @@ public final void rule__XEqualityExpression__Group_1_0_0__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__XRelationalExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11719:1: rule__XRelationalExpression__Group__0 : rule__XRelationalExpression__Group__0__Impl rule__XRelationalExpression__Group__1 ;
+    // InternalFormat.g:11719:1: rule__XRelationalExpression__Group__0 : rule__XRelationalExpression__Group__0__Impl rule__XRelationalExpression__Group__1 ;
     public final void rule__XRelationalExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11723:1: ( rule__XRelationalExpression__Group__0__Impl rule__XRelationalExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11724:2: rule__XRelationalExpression__Group__0__Impl rule__XRelationalExpression__Group__1
+            // InternalFormat.g:11723:1: ( rule__XRelationalExpression__Group__0__Impl rule__XRelationalExpression__Group__1 )
+            // InternalFormat.g:11724:2: rule__XRelationalExpression__Group__0__Impl rule__XRelationalExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group__0__Impl_in_rule__XRelationalExpression__Group__024255);
+            pushFollow(FOLLOW_64);
             rule__XRelationalExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group__1_in_rule__XRelationalExpression__Group__024258);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group__1();
 
             state._fsp--;
@@ -35362,22 +35362,22 @@ public final void rule__XRelationalExpression__Group__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__XRelationalExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11731:1: rule__XRelationalExpression__Group__0__Impl : ( ruleXOtherOperatorExpression ) ;
+    // InternalFormat.g:11731:1: rule__XRelationalExpression__Group__0__Impl : ( ruleXOtherOperatorExpression ) ;
     public final void rule__XRelationalExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11735:1: ( ( ruleXOtherOperatorExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11736:1: ( ruleXOtherOperatorExpression )
+            // InternalFormat.g:11735:1: ( ( ruleXOtherOperatorExpression ) )
+            // InternalFormat.g:11736:1: ( ruleXOtherOperatorExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11736:1: ( ruleXOtherOperatorExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11737:1: ruleXOtherOperatorExpression
+            // InternalFormat.g:11736:1: ( ruleXOtherOperatorExpression )
+            // InternalFormat.g:11737:1: ruleXOtherOperatorExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getXOtherOperatorExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleXOtherOperatorExpression_in_rule__XRelationalExpression__Group__0__Impl24285);
+            pushFollow(FOLLOW_2);
             ruleXOtherOperatorExpression();
 
             state._fsp--;
@@ -35407,16 +35407,16 @@ public final void rule__XRelationalExpression__Group__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XRelationalExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11748:1: rule__XRelationalExpression__Group__1 : rule__XRelationalExpression__Group__1__Impl ;
+    // InternalFormat.g:11748:1: rule__XRelationalExpression__Group__1 : rule__XRelationalExpression__Group__1__Impl ;
     public final void rule__XRelationalExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11752:1: ( rule__XRelationalExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11753:2: rule__XRelationalExpression__Group__1__Impl
+            // InternalFormat.g:11752:1: ( rule__XRelationalExpression__Group__1__Impl )
+            // InternalFormat.g:11753:2: rule__XRelationalExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group__1__Impl_in_rule__XRelationalExpression__Group__124314);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group__1__Impl();
 
             state._fsp--;
@@ -35440,22 +35440,22 @@ public final void rule__XRelationalExpression__Group__1() throws RecognitionExce
 
 
     // $ANTLR start "rule__XRelationalExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11759:1: rule__XRelationalExpression__Group__1__Impl : ( ( rule__XRelationalExpression__Alternatives_1 )* ) ;
+    // InternalFormat.g:11759:1: rule__XRelationalExpression__Group__1__Impl : ( ( rule__XRelationalExpression__Alternatives_1 )* ) ;
     public final void rule__XRelationalExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11763:1: ( ( ( rule__XRelationalExpression__Alternatives_1 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11764:1: ( ( rule__XRelationalExpression__Alternatives_1 )* )
+            // InternalFormat.g:11763:1: ( ( ( rule__XRelationalExpression__Alternatives_1 )* ) )
+            // InternalFormat.g:11764:1: ( ( rule__XRelationalExpression__Alternatives_1 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11764:1: ( ( rule__XRelationalExpression__Alternatives_1 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11765:1: ( rule__XRelationalExpression__Alternatives_1 )*
+            // InternalFormat.g:11764:1: ( ( rule__XRelationalExpression__Alternatives_1 )* )
+            // InternalFormat.g:11765:1: ( rule__XRelationalExpression__Alternatives_1 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getAlternatives_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11766:1: ( rule__XRelationalExpression__Alternatives_1 )*
+            // InternalFormat.g:11766:1: ( rule__XRelationalExpression__Alternatives_1 )*
             loop107:
             do {
                 int alt107=2;
@@ -35509,9 +35509,9 @@ public final void rule__XRelationalExpression__Group__1__Impl() throws Recogniti
 
                 switch (alt107) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11766:2: rule__XRelationalExpression__Alternatives_1
+            	    // InternalFormat.g:11766:2: rule__XRelationalExpression__Alternatives_1
             	    {
-            	    pushFollow(FOLLOW_rule__XRelationalExpression__Alternatives_1_in_rule__XRelationalExpression__Group__1__Impl24341);
+            	    pushFollow(FOLLOW_65);
             	    rule__XRelationalExpression__Alternatives_1();
 
             	    state._fsp--;
@@ -35550,21 +35550,21 @@ public final void rule__XRelationalExpression__Group__1__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11780:1: rule__XRelationalExpression__Group_1_0__0 : rule__XRelationalExpression__Group_1_0__0__Impl rule__XRelationalExpression__Group_1_0__1 ;
+    // InternalFormat.g:11780:1: rule__XRelationalExpression__Group_1_0__0 : rule__XRelationalExpression__Group_1_0__0__Impl rule__XRelationalExpression__Group_1_0__1 ;
     public final void rule__XRelationalExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11784:1: ( rule__XRelationalExpression__Group_1_0__0__Impl rule__XRelationalExpression__Group_1_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11785:2: rule__XRelationalExpression__Group_1_0__0__Impl rule__XRelationalExpression__Group_1_0__1
+            // InternalFormat.g:11784:1: ( rule__XRelationalExpression__Group_1_0__0__Impl rule__XRelationalExpression__Group_1_0__1 )
+            // InternalFormat.g:11785:2: rule__XRelationalExpression__Group_1_0__0__Impl rule__XRelationalExpression__Group_1_0__1
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0__0__Impl_in_rule__XRelationalExpression__Group_1_0__024376);
+            pushFollow(FOLLOW_66);
             rule__XRelationalExpression__Group_1_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0__1_in_rule__XRelationalExpression__Group_1_0__024379);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_0__1();
 
             state._fsp--;
@@ -35588,25 +35588,25 @@ public final void rule__XRelationalExpression__Group_1_0__0() throws Recognition
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11792:1: rule__XRelationalExpression__Group_1_0__0__Impl : ( ( rule__XRelationalExpression__Group_1_0_0__0 ) ) ;
+    // InternalFormat.g:11792:1: rule__XRelationalExpression__Group_1_0__0__Impl : ( ( rule__XRelationalExpression__Group_1_0_0__0 ) ) ;
     public final void rule__XRelationalExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11796:1: ( ( ( rule__XRelationalExpression__Group_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11797:1: ( ( rule__XRelationalExpression__Group_1_0_0__0 ) )
+            // InternalFormat.g:11796:1: ( ( ( rule__XRelationalExpression__Group_1_0_0__0 ) ) )
+            // InternalFormat.g:11797:1: ( ( rule__XRelationalExpression__Group_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11797:1: ( ( rule__XRelationalExpression__Group_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11798:1: ( rule__XRelationalExpression__Group_1_0_0__0 )
+            // InternalFormat.g:11797:1: ( ( rule__XRelationalExpression__Group_1_0_0__0 ) )
+            // InternalFormat.g:11798:1: ( rule__XRelationalExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getGroup_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11799:1: ( rule__XRelationalExpression__Group_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11799:2: rule__XRelationalExpression__Group_1_0_0__0
+            // InternalFormat.g:11799:1: ( rule__XRelationalExpression__Group_1_0_0__0 )
+            // InternalFormat.g:11799:2: rule__XRelationalExpression__Group_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0_0__0_in_rule__XRelationalExpression__Group_1_0__0__Impl24406);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_0_0__0();
 
             state._fsp--;
@@ -35639,16 +35639,16 @@ public final void rule__XRelationalExpression__Group_1_0__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11809:1: rule__XRelationalExpression__Group_1_0__1 : rule__XRelationalExpression__Group_1_0__1__Impl ;
+    // InternalFormat.g:11809:1: rule__XRelationalExpression__Group_1_0__1 : rule__XRelationalExpression__Group_1_0__1__Impl ;
     public final void rule__XRelationalExpression__Group_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11813:1: ( rule__XRelationalExpression__Group_1_0__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11814:2: rule__XRelationalExpression__Group_1_0__1__Impl
+            // InternalFormat.g:11813:1: ( rule__XRelationalExpression__Group_1_0__1__Impl )
+            // InternalFormat.g:11814:2: rule__XRelationalExpression__Group_1_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0__1__Impl_in_rule__XRelationalExpression__Group_1_0__124436);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_0__1__Impl();
 
             state._fsp--;
@@ -35672,25 +35672,25 @@ public final void rule__XRelationalExpression__Group_1_0__1() throws Recognition
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11820:1: rule__XRelationalExpression__Group_1_0__1__Impl : ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) ) ;
+    // InternalFormat.g:11820:1: rule__XRelationalExpression__Group_1_0__1__Impl : ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) ) ;
     public final void rule__XRelationalExpression__Group_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11824:1: ( ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11825:1: ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) )
+            // InternalFormat.g:11824:1: ( ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) ) )
+            // InternalFormat.g:11825:1: ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11825:1: ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11826:1: ( rule__XRelationalExpression__TypeAssignment_1_0_1 )
+            // InternalFormat.g:11825:1: ( ( rule__XRelationalExpression__TypeAssignment_1_0_1 ) )
+            // InternalFormat.g:11826:1: ( rule__XRelationalExpression__TypeAssignment_1_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getTypeAssignment_1_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11827:1: ( rule__XRelationalExpression__TypeAssignment_1_0_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11827:2: rule__XRelationalExpression__TypeAssignment_1_0_1
+            // InternalFormat.g:11827:1: ( rule__XRelationalExpression__TypeAssignment_1_0_1 )
+            // InternalFormat.g:11827:2: rule__XRelationalExpression__TypeAssignment_1_0_1
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__TypeAssignment_1_0_1_in_rule__XRelationalExpression__Group_1_0__1__Impl24463);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__TypeAssignment_1_0_1();
 
             state._fsp--;
@@ -35723,16 +35723,16 @@ public final void rule__XRelationalExpression__Group_1_0__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11841:1: rule__XRelationalExpression__Group_1_0_0__0 : rule__XRelationalExpression__Group_1_0_0__0__Impl ;
+    // InternalFormat.g:11841:1: rule__XRelationalExpression__Group_1_0_0__0 : rule__XRelationalExpression__Group_1_0_0__0__Impl ;
     public final void rule__XRelationalExpression__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11845:1: ( rule__XRelationalExpression__Group_1_0_0__0__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11846:2: rule__XRelationalExpression__Group_1_0_0__0__Impl
+            // InternalFormat.g:11845:1: ( rule__XRelationalExpression__Group_1_0_0__0__Impl )
+            // InternalFormat.g:11846:2: rule__XRelationalExpression__Group_1_0_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0_0__0__Impl_in_rule__XRelationalExpression__Group_1_0_0__024497);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
@@ -35756,25 +35756,25 @@ public final void rule__XRelationalExpression__Group_1_0_0__0() throws Recogniti
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11852:1: rule__XRelationalExpression__Group_1_0_0__0__Impl : ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) ) ;
+    // InternalFormat.g:11852:1: rule__XRelationalExpression__Group_1_0_0__0__Impl : ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) ) ;
     public final void rule__XRelationalExpression__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11856:1: ( ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11857:1: ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) )
+            // InternalFormat.g:11856:1: ( ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) ) )
+            // InternalFormat.g:11857:1: ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11857:1: ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11858:1: ( rule__XRelationalExpression__Group_1_0_0_0__0 )
+            // InternalFormat.g:11857:1: ( ( rule__XRelationalExpression__Group_1_0_0_0__0 ) )
+            // InternalFormat.g:11858:1: ( rule__XRelationalExpression__Group_1_0_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getGroup_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11859:1: ( rule__XRelationalExpression__Group_1_0_0_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11859:2: rule__XRelationalExpression__Group_1_0_0_0__0
+            // InternalFormat.g:11859:1: ( rule__XRelationalExpression__Group_1_0_0_0__0 )
+            // InternalFormat.g:11859:2: rule__XRelationalExpression__Group_1_0_0_0__0
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0_0_0__0_in_rule__XRelationalExpression__Group_1_0_0__0__Impl24524);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_0_0_0__0();
 
             state._fsp--;
@@ -35807,21 +35807,21 @@ public final void rule__XRelationalExpression__Group_1_0_0__0__Impl() throws Rec
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0_0_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11871:1: rule__XRelationalExpression__Group_1_0_0_0__0 : rule__XRelationalExpression__Group_1_0_0_0__0__Impl rule__XRelationalExpression__Group_1_0_0_0__1 ;
+    // InternalFormat.g:11871:1: rule__XRelationalExpression__Group_1_0_0_0__0 : rule__XRelationalExpression__Group_1_0_0_0__0__Impl rule__XRelationalExpression__Group_1_0_0_0__1 ;
     public final void rule__XRelationalExpression__Group_1_0_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11875:1: ( rule__XRelationalExpression__Group_1_0_0_0__0__Impl rule__XRelationalExpression__Group_1_0_0_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11876:2: rule__XRelationalExpression__Group_1_0_0_0__0__Impl rule__XRelationalExpression__Group_1_0_0_0__1
+            // InternalFormat.g:11875:1: ( rule__XRelationalExpression__Group_1_0_0_0__0__Impl rule__XRelationalExpression__Group_1_0_0_0__1 )
+            // InternalFormat.g:11876:2: rule__XRelationalExpression__Group_1_0_0_0__0__Impl rule__XRelationalExpression__Group_1_0_0_0__1
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0_0_0__0__Impl_in_rule__XRelationalExpression__Group_1_0_0_0__024556);
+            pushFollow(FOLLOW_67);
             rule__XRelationalExpression__Group_1_0_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0_0_0__1_in_rule__XRelationalExpression__Group_1_0_0_0__024559);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_0_0_0__1();
 
             state._fsp--;
@@ -35845,23 +35845,23 @@ public final void rule__XRelationalExpression__Group_1_0_0_0__0() throws Recogni
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11883:1: rule__XRelationalExpression__Group_1_0_0_0__0__Impl : ( () ) ;
+    // InternalFormat.g:11883:1: rule__XRelationalExpression__Group_1_0_0_0__0__Impl : ( () ) ;
     public final void rule__XRelationalExpression__Group_1_0_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11887:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11888:1: ( () )
+            // InternalFormat.g:11887:1: ( ( () ) )
+            // InternalFormat.g:11888:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11888:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11889:1: ()
+            // InternalFormat.g:11888:1: ( () )
+            // InternalFormat.g:11889:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getXInstanceOfExpressionExpressionAction_1_0_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11890:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11892:1: 
+            // InternalFormat.g:11890:1: ()
+            // InternalFormat.g:11892:1: 
             {
             }
 
@@ -35886,16 +35886,16 @@ public final void rule__XRelationalExpression__Group_1_0_0_0__0__Impl() throws R
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0_0_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11902:1: rule__XRelationalExpression__Group_1_0_0_0__1 : rule__XRelationalExpression__Group_1_0_0_0__1__Impl ;
+    // InternalFormat.g:11902:1: rule__XRelationalExpression__Group_1_0_0_0__1 : rule__XRelationalExpression__Group_1_0_0_0__1__Impl ;
     public final void rule__XRelationalExpression__Group_1_0_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11906:1: ( rule__XRelationalExpression__Group_1_0_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11907:2: rule__XRelationalExpression__Group_1_0_0_0__1__Impl
+            // InternalFormat.g:11906:1: ( rule__XRelationalExpression__Group_1_0_0_0__1__Impl )
+            // InternalFormat.g:11907:2: rule__XRelationalExpression__Group_1_0_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_0_0_0__1__Impl_in_rule__XRelationalExpression__Group_1_0_0_0__124617);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_0_0_0__1__Impl();
 
             state._fsp--;
@@ -35919,22 +35919,22 @@ public final void rule__XRelationalExpression__Group_1_0_0_0__1() throws Recogni
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_0_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11913:1: rule__XRelationalExpression__Group_1_0_0_0__1__Impl : ( 'instanceof' ) ;
+    // InternalFormat.g:11913:1: rule__XRelationalExpression__Group_1_0_0_0__1__Impl : ( 'instanceof' ) ;
     public final void rule__XRelationalExpression__Group_1_0_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11917:1: ( ( 'instanceof' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11918:1: ( 'instanceof' )
+            // InternalFormat.g:11917:1: ( ( 'instanceof' ) )
+            // InternalFormat.g:11918:1: ( 'instanceof' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11918:1: ( 'instanceof' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11919:1: 'instanceof'
+            // InternalFormat.g:11918:1: ( 'instanceof' )
+            // InternalFormat.g:11919:1: 'instanceof'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getInstanceofKeyword_1_0_0_0_1()); 
             }
-            match(input,85,FOLLOW_85_in_rule__XRelationalExpression__Group_1_0_0_0__1__Impl24645); if (state.failed) return ;
+            match(input,85,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXRelationalExpressionAccess().getInstanceofKeyword_1_0_0_0_1()); 
             }
@@ -35960,21 +35960,21 @@ public final void rule__XRelationalExpression__Group_1_0_0_0__1__Impl() throws R
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11936:1: rule__XRelationalExpression__Group_1_1__0 : rule__XRelationalExpression__Group_1_1__0__Impl rule__XRelationalExpression__Group_1_1__1 ;
+    // InternalFormat.g:11936:1: rule__XRelationalExpression__Group_1_1__0 : rule__XRelationalExpression__Group_1_1__0__Impl rule__XRelationalExpression__Group_1_1__1 ;
     public final void rule__XRelationalExpression__Group_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11940:1: ( rule__XRelationalExpression__Group_1_1__0__Impl rule__XRelationalExpression__Group_1_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11941:2: rule__XRelationalExpression__Group_1_1__0__Impl rule__XRelationalExpression__Group_1_1__1
+            // InternalFormat.g:11940:1: ( rule__XRelationalExpression__Group_1_1__0__Impl rule__XRelationalExpression__Group_1_1__1 )
+            // InternalFormat.g:11941:2: rule__XRelationalExpression__Group_1_1__0__Impl rule__XRelationalExpression__Group_1_1__1
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1__0__Impl_in_rule__XRelationalExpression__Group_1_1__024680);
+            pushFollow(FOLLOW_50);
             rule__XRelationalExpression__Group_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1__1_in_rule__XRelationalExpression__Group_1_1__024683);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_1__1();
 
             state._fsp--;
@@ -35998,25 +35998,25 @@ public final void rule__XRelationalExpression__Group_1_1__0() throws Recognition
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11948:1: rule__XRelationalExpression__Group_1_1__0__Impl : ( ( rule__XRelationalExpression__Group_1_1_0__0 ) ) ;
+    // InternalFormat.g:11948:1: rule__XRelationalExpression__Group_1_1__0__Impl : ( ( rule__XRelationalExpression__Group_1_1_0__0 ) ) ;
     public final void rule__XRelationalExpression__Group_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11952:1: ( ( ( rule__XRelationalExpression__Group_1_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11953:1: ( ( rule__XRelationalExpression__Group_1_1_0__0 ) )
+            // InternalFormat.g:11952:1: ( ( ( rule__XRelationalExpression__Group_1_1_0__0 ) ) )
+            // InternalFormat.g:11953:1: ( ( rule__XRelationalExpression__Group_1_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11953:1: ( ( rule__XRelationalExpression__Group_1_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11954:1: ( rule__XRelationalExpression__Group_1_1_0__0 )
+            // InternalFormat.g:11953:1: ( ( rule__XRelationalExpression__Group_1_1_0__0 ) )
+            // InternalFormat.g:11954:1: ( rule__XRelationalExpression__Group_1_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getGroup_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11955:1: ( rule__XRelationalExpression__Group_1_1_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11955:2: rule__XRelationalExpression__Group_1_1_0__0
+            // InternalFormat.g:11955:1: ( rule__XRelationalExpression__Group_1_1_0__0 )
+            // InternalFormat.g:11955:2: rule__XRelationalExpression__Group_1_1_0__0
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1_0__0_in_rule__XRelationalExpression__Group_1_1__0__Impl24710);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_1_0__0();
 
             state._fsp--;
@@ -36049,16 +36049,16 @@ public final void rule__XRelationalExpression__Group_1_1__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11965:1: rule__XRelationalExpression__Group_1_1__1 : rule__XRelationalExpression__Group_1_1__1__Impl ;
+    // InternalFormat.g:11965:1: rule__XRelationalExpression__Group_1_1__1 : rule__XRelationalExpression__Group_1_1__1__Impl ;
     public final void rule__XRelationalExpression__Group_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11969:1: ( rule__XRelationalExpression__Group_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11970:2: rule__XRelationalExpression__Group_1_1__1__Impl
+            // InternalFormat.g:11969:1: ( rule__XRelationalExpression__Group_1_1__1__Impl )
+            // InternalFormat.g:11970:2: rule__XRelationalExpression__Group_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1__1__Impl_in_rule__XRelationalExpression__Group_1_1__124740);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_1__1__Impl();
 
             state._fsp--;
@@ -36082,25 +36082,25 @@ public final void rule__XRelationalExpression__Group_1_1__1() throws Recognition
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11976:1: rule__XRelationalExpression__Group_1_1__1__Impl : ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) ) ;
+    // InternalFormat.g:11976:1: rule__XRelationalExpression__Group_1_1__1__Impl : ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) ) ;
     public final void rule__XRelationalExpression__Group_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11980:1: ( ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11981:1: ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) )
+            // InternalFormat.g:11980:1: ( ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) ) )
+            // InternalFormat.g:11981:1: ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11981:1: ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11982:1: ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 )
+            // InternalFormat.g:11981:1: ( ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 ) )
+            // InternalFormat.g:11982:1: ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getRightOperandAssignment_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11983:1: ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11983:2: rule__XRelationalExpression__RightOperandAssignment_1_1_1
+            // InternalFormat.g:11983:1: ( rule__XRelationalExpression__RightOperandAssignment_1_1_1 )
+            // InternalFormat.g:11983:2: rule__XRelationalExpression__RightOperandAssignment_1_1_1
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__RightOperandAssignment_1_1_1_in_rule__XRelationalExpression__Group_1_1__1__Impl24767);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__RightOperandAssignment_1_1_1();
 
             state._fsp--;
@@ -36133,16 +36133,16 @@ public final void rule__XRelationalExpression__Group_1_1__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11997:1: rule__XRelationalExpression__Group_1_1_0__0 : rule__XRelationalExpression__Group_1_1_0__0__Impl ;
+    // InternalFormat.g:11997:1: rule__XRelationalExpression__Group_1_1_0__0 : rule__XRelationalExpression__Group_1_1_0__0__Impl ;
     public final void rule__XRelationalExpression__Group_1_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12001:1: ( rule__XRelationalExpression__Group_1_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12002:2: rule__XRelationalExpression__Group_1_1_0__0__Impl
+            // InternalFormat.g:12001:1: ( rule__XRelationalExpression__Group_1_1_0__0__Impl )
+            // InternalFormat.g:12002:2: rule__XRelationalExpression__Group_1_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1_0__0__Impl_in_rule__XRelationalExpression__Group_1_1_0__024801);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_1_0__0__Impl();
 
             state._fsp--;
@@ -36166,25 +36166,25 @@ public final void rule__XRelationalExpression__Group_1_1_0__0() throws Recogniti
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12008:1: rule__XRelationalExpression__Group_1_1_0__0__Impl : ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) ) ;
+    // InternalFormat.g:12008:1: rule__XRelationalExpression__Group_1_1_0__0__Impl : ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) ) ;
     public final void rule__XRelationalExpression__Group_1_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12012:1: ( ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12013:1: ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) )
+            // InternalFormat.g:12012:1: ( ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) ) )
+            // InternalFormat.g:12013:1: ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12013:1: ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12014:1: ( rule__XRelationalExpression__Group_1_1_0_0__0 )
+            // InternalFormat.g:12013:1: ( ( rule__XRelationalExpression__Group_1_1_0_0__0 ) )
+            // InternalFormat.g:12014:1: ( rule__XRelationalExpression__Group_1_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getGroup_1_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12015:1: ( rule__XRelationalExpression__Group_1_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12015:2: rule__XRelationalExpression__Group_1_1_0_0__0
+            // InternalFormat.g:12015:1: ( rule__XRelationalExpression__Group_1_1_0_0__0 )
+            // InternalFormat.g:12015:2: rule__XRelationalExpression__Group_1_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1_0_0__0_in_rule__XRelationalExpression__Group_1_1_0__0__Impl24828);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_1_0_0__0();
 
             state._fsp--;
@@ -36217,21 +36217,21 @@ public final void rule__XRelationalExpression__Group_1_1_0__0__Impl() throws Rec
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1_0_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12027:1: rule__XRelationalExpression__Group_1_1_0_0__0 : rule__XRelationalExpression__Group_1_1_0_0__0__Impl rule__XRelationalExpression__Group_1_1_0_0__1 ;
+    // InternalFormat.g:12027:1: rule__XRelationalExpression__Group_1_1_0_0__0 : rule__XRelationalExpression__Group_1_1_0_0__0__Impl rule__XRelationalExpression__Group_1_1_0_0__1 ;
     public final void rule__XRelationalExpression__Group_1_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12031:1: ( rule__XRelationalExpression__Group_1_1_0_0__0__Impl rule__XRelationalExpression__Group_1_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12032:2: rule__XRelationalExpression__Group_1_1_0_0__0__Impl rule__XRelationalExpression__Group_1_1_0_0__1
+            // InternalFormat.g:12031:1: ( rule__XRelationalExpression__Group_1_1_0_0__0__Impl rule__XRelationalExpression__Group_1_1_0_0__1 )
+            // InternalFormat.g:12032:2: rule__XRelationalExpression__Group_1_1_0_0__0__Impl rule__XRelationalExpression__Group_1_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1_0_0__0__Impl_in_rule__XRelationalExpression__Group_1_1_0_0__024860);
+            pushFollow(FOLLOW_64);
             rule__XRelationalExpression__Group_1_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1_0_0__1_in_rule__XRelationalExpression__Group_1_1_0_0__024863);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_1_0_0__1();
 
             state._fsp--;
@@ -36255,23 +36255,23 @@ public final void rule__XRelationalExpression__Group_1_1_0_0__0() throws Recogni
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12039:1: rule__XRelationalExpression__Group_1_1_0_0__0__Impl : ( () ) ;
+    // InternalFormat.g:12039:1: rule__XRelationalExpression__Group_1_1_0_0__0__Impl : ( () ) ;
     public final void rule__XRelationalExpression__Group_1_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12043:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12044:1: ( () )
+            // InternalFormat.g:12043:1: ( ( () ) )
+            // InternalFormat.g:12044:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12044:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12045:1: ()
+            // InternalFormat.g:12044:1: ( () )
+            // InternalFormat.g:12045:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12046:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12048:1: 
+            // InternalFormat.g:12046:1: ()
+            // InternalFormat.g:12048:1: 
             {
             }
 
@@ -36296,16 +36296,16 @@ public final void rule__XRelationalExpression__Group_1_1_0_0__0__Impl() throws R
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1_0_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12058:1: rule__XRelationalExpression__Group_1_1_0_0__1 : rule__XRelationalExpression__Group_1_1_0_0__1__Impl ;
+    // InternalFormat.g:12058:1: rule__XRelationalExpression__Group_1_1_0_0__1 : rule__XRelationalExpression__Group_1_1_0_0__1__Impl ;
     public final void rule__XRelationalExpression__Group_1_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12062:1: ( rule__XRelationalExpression__Group_1_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12063:2: rule__XRelationalExpression__Group_1_1_0_0__1__Impl
+            // InternalFormat.g:12062:1: ( rule__XRelationalExpression__Group_1_1_0_0__1__Impl )
+            // InternalFormat.g:12063:2: rule__XRelationalExpression__Group_1_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__Group_1_1_0_0__1__Impl_in_rule__XRelationalExpression__Group_1_1_0_0__124921);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__Group_1_1_0_0__1__Impl();
 
             state._fsp--;
@@ -36329,25 +36329,25 @@ public final void rule__XRelationalExpression__Group_1_1_0_0__1() throws Recogni
 
 
     // $ANTLR start "rule__XRelationalExpression__Group_1_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12069:1: rule__XRelationalExpression__Group_1_1_0_0__1__Impl : ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) ) ;
+    // InternalFormat.g:12069:1: rule__XRelationalExpression__Group_1_1_0_0__1__Impl : ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) ) ;
     public final void rule__XRelationalExpression__Group_1_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12073:1: ( ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12074:1: ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) )
+            // InternalFormat.g:12073:1: ( ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) ) )
+            // InternalFormat.g:12074:1: ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12074:1: ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12075:1: ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 )
+            // InternalFormat.g:12074:1: ( ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 ) )
+            // InternalFormat.g:12075:1: ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getFeatureAssignment_1_1_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12076:1: ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12076:2: rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1
+            // InternalFormat.g:12076:1: ( rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 )
+            // InternalFormat.g:12076:2: rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1
             {
-            pushFollow(FOLLOW_rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1_in_rule__XRelationalExpression__Group_1_1_0_0__1__Impl24948);
+            pushFollow(FOLLOW_2);
             rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1();
 
             state._fsp--;
@@ -36380,21 +36380,21 @@ public final void rule__XRelationalExpression__Group_1_1_0_0__1__Impl() throws R
 
 
     // $ANTLR start "rule__OpCompare__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12090:1: rule__OpCompare__Group_1__0 : rule__OpCompare__Group_1__0__Impl rule__OpCompare__Group_1__1 ;
+    // InternalFormat.g:12090:1: rule__OpCompare__Group_1__0 : rule__OpCompare__Group_1__0__Impl rule__OpCompare__Group_1__1 ;
     public final void rule__OpCompare__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12094:1: ( rule__OpCompare__Group_1__0__Impl rule__OpCompare__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12095:2: rule__OpCompare__Group_1__0__Impl rule__OpCompare__Group_1__1
+            // InternalFormat.g:12094:1: ( rule__OpCompare__Group_1__0__Impl rule__OpCompare__Group_1__1 )
+            // InternalFormat.g:12095:2: rule__OpCompare__Group_1__0__Impl rule__OpCompare__Group_1__1
             {
-            pushFollow(FOLLOW_rule__OpCompare__Group_1__0__Impl_in_rule__OpCompare__Group_1__024982);
+            pushFollow(FOLLOW_12);
             rule__OpCompare__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OpCompare__Group_1__1_in_rule__OpCompare__Group_1__024985);
+            pushFollow(FOLLOW_2);
             rule__OpCompare__Group_1__1();
 
             state._fsp--;
@@ -36418,22 +36418,22 @@ public final void rule__OpCompare__Group_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpCompare__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12102:1: rule__OpCompare__Group_1__0__Impl : ( '<' ) ;
+    // InternalFormat.g:12102:1: rule__OpCompare__Group_1__0__Impl : ( '<' ) ;
     public final void rule__OpCompare__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12106:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12107:1: ( '<' )
+            // InternalFormat.g:12106:1: ( ( '<' ) )
+            // InternalFormat.g:12107:1: ( '<' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12107:1: ( '<' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12108:1: '<'
+            // InternalFormat.g:12107:1: ( '<' )
+            // InternalFormat.g:12108:1: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpCompareAccess().getLessThanSignKeyword_1_0()); 
             }
-            match(input,33,FOLLOW_33_in_rule__OpCompare__Group_1__0__Impl25013); if (state.failed) return ;
+            match(input,33,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpCompareAccess().getLessThanSignKeyword_1_0()); 
             }
@@ -36459,16 +36459,16 @@ public final void rule__OpCompare__Group_1__0__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__OpCompare__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12121:1: rule__OpCompare__Group_1__1 : rule__OpCompare__Group_1__1__Impl ;
+    // InternalFormat.g:12121:1: rule__OpCompare__Group_1__1 : rule__OpCompare__Group_1__1__Impl ;
     public final void rule__OpCompare__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12125:1: ( rule__OpCompare__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12126:2: rule__OpCompare__Group_1__1__Impl
+            // InternalFormat.g:12125:1: ( rule__OpCompare__Group_1__1__Impl )
+            // InternalFormat.g:12126:2: rule__OpCompare__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__OpCompare__Group_1__1__Impl_in_rule__OpCompare__Group_1__125044);
+            pushFollow(FOLLOW_2);
             rule__OpCompare__Group_1__1__Impl();
 
             state._fsp--;
@@ -36492,22 +36492,22 @@ public final void rule__OpCompare__Group_1__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpCompare__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12132:1: rule__OpCompare__Group_1__1__Impl : ( '=' ) ;
+    // InternalFormat.g:12132:1: rule__OpCompare__Group_1__1__Impl : ( '=' ) ;
     public final void rule__OpCompare__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12136:1: ( ( '=' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12137:1: ( '=' )
+            // InternalFormat.g:12136:1: ( ( '=' ) )
+            // InternalFormat.g:12137:1: ( '=' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12137:1: ( '=' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12138:1: '='
+            // InternalFormat.g:12137:1: ( '=' )
+            // InternalFormat.g:12138:1: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpCompareAccess().getEqualsSignKeyword_1_1()); 
             }
-            match(input,14,FOLLOW_14_in_rule__OpCompare__Group_1__1__Impl25072); if (state.failed) return ;
+            match(input,14,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpCompareAccess().getEqualsSignKeyword_1_1()); 
             }
@@ -36533,21 +36533,21 @@ public final void rule__OpCompare__Group_1__1__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12155:1: rule__XOtherOperatorExpression__Group__0 : rule__XOtherOperatorExpression__Group__0__Impl rule__XOtherOperatorExpression__Group__1 ;
+    // InternalFormat.g:12155:1: rule__XOtherOperatorExpression__Group__0 : rule__XOtherOperatorExpression__Group__0__Impl rule__XOtherOperatorExpression__Group__1 ;
     public final void rule__XOtherOperatorExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12159:1: ( rule__XOtherOperatorExpression__Group__0__Impl rule__XOtherOperatorExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12160:2: rule__XOtherOperatorExpression__Group__0__Impl rule__XOtherOperatorExpression__Group__1
+            // InternalFormat.g:12159:1: ( rule__XOtherOperatorExpression__Group__0__Impl rule__XOtherOperatorExpression__Group__1 )
+            // InternalFormat.g:12160:2: rule__XOtherOperatorExpression__Group__0__Impl rule__XOtherOperatorExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group__0__Impl_in_rule__XOtherOperatorExpression__Group__025107);
+            pushFollow(FOLLOW_68);
             rule__XOtherOperatorExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group__1_in_rule__XOtherOperatorExpression__Group__025110);
+            pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group__1();
 
             state._fsp--;
@@ -36571,22 +36571,22 @@ public final void rule__XOtherOperatorExpression__Group__0() throws RecognitionE
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12167:1: rule__XOtherOperatorExpression__Group__0__Impl : ( ruleXAdditiveExpression ) ;
+    // InternalFormat.g:12167:1: rule__XOtherOperatorExpression__Group__0__Impl : ( ruleXAdditiveExpression ) ;
     public final void rule__XOtherOperatorExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12171:1: ( ( ruleXAdditiveExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12172:1: ( ruleXAdditiveExpression )
+            // InternalFormat.g:12171:1: ( ( ruleXAdditiveExpression ) )
+            // InternalFormat.g:12172:1: ( ruleXAdditiveExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12172:1: ( ruleXAdditiveExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12173:1: ruleXAdditiveExpression
+            // InternalFormat.g:12172:1: ( ruleXAdditiveExpression )
+            // InternalFormat.g:12173:1: ruleXAdditiveExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getXAdditiveExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleXAdditiveExpression_in_rule__XOtherOperatorExpression__Group__0__Impl25137);
+            pushFollow(FOLLOW_2);
             ruleXAdditiveExpression();
 
             state._fsp--;
@@ -36616,16 +36616,16 @@ public final void rule__XOtherOperatorExpression__Group__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12184:1: rule__XOtherOperatorExpression__Group__1 : rule__XOtherOperatorExpression__Group__1__Impl ;
+    // InternalFormat.g:12184:1: rule__XOtherOperatorExpression__Group__1 : rule__XOtherOperatorExpression__Group__1__Impl ;
     public final void rule__XOtherOperatorExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12188:1: ( rule__XOtherOperatorExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12189:2: rule__XOtherOperatorExpression__Group__1__Impl
+            // InternalFormat.g:12188:1: ( rule__XOtherOperatorExpression__Group__1__Impl )
+            // InternalFormat.g:12189:2: rule__XOtherOperatorExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group__1__Impl_in_rule__XOtherOperatorExpression__Group__125166);
+            pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group__1__Impl();
 
             state._fsp--;
@@ -36649,31 +36649,31 @@ public final void rule__XOtherOperatorExpression__Group__1() throws RecognitionE
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12195:1: rule__XOtherOperatorExpression__Group__1__Impl : ( ( rule__XOtherOperatorExpression__Group_1__0 )* ) ;
+    // InternalFormat.g:12195:1: rule__XOtherOperatorExpression__Group__1__Impl : ( ( rule__XOtherOperatorExpression__Group_1__0 )* ) ;
     public final void rule__XOtherOperatorExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12199:1: ( ( ( rule__XOtherOperatorExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12200:1: ( ( rule__XOtherOperatorExpression__Group_1__0 )* )
+            // InternalFormat.g:12199:1: ( ( ( rule__XOtherOperatorExpression__Group_1__0 )* ) )
+            // InternalFormat.g:12200:1: ( ( rule__XOtherOperatorExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12200:1: ( ( rule__XOtherOperatorExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12201:1: ( rule__XOtherOperatorExpression__Group_1__0 )*
+            // InternalFormat.g:12200:1: ( ( rule__XOtherOperatorExpression__Group_1__0 )* )
+            // InternalFormat.g:12201:1: ( rule__XOtherOperatorExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12202:1: ( rule__XOtherOperatorExpression__Group_1__0 )*
+            // InternalFormat.g:12202:1: ( rule__XOtherOperatorExpression__Group_1__0 )*
             loop108:
             do {
                 int alt108=2;
                 alt108 = dfa108.predict(input);
                 switch (alt108) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12202:2: rule__XOtherOperatorExpression__Group_1__0
+            	    // InternalFormat.g:12202:2: rule__XOtherOperatorExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1__0_in_rule__XOtherOperatorExpression__Group__1__Impl25193);
+            	    pushFollow(FOLLOW_69);
             	    rule__XOtherOperatorExpression__Group_1__0();
 
             	    state._fsp--;
@@ -36712,21 +36712,21 @@ public final void rule__XOtherOperatorExpression__Group__1__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12216:1: rule__XOtherOperatorExpression__Group_1__0 : rule__XOtherOperatorExpression__Group_1__0__Impl rule__XOtherOperatorExpression__Group_1__1 ;
+    // InternalFormat.g:12216:1: rule__XOtherOperatorExpression__Group_1__0 : rule__XOtherOperatorExpression__Group_1__0__Impl rule__XOtherOperatorExpression__Group_1__1 ;
     public final void rule__XOtherOperatorExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12220:1: ( rule__XOtherOperatorExpression__Group_1__0__Impl rule__XOtherOperatorExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12221:2: rule__XOtherOperatorExpression__Group_1__0__Impl rule__XOtherOperatorExpression__Group_1__1
+            // InternalFormat.g:12220:1: ( rule__XOtherOperatorExpression__Group_1__0__Impl rule__XOtherOperatorExpression__Group_1__1 )
+            // InternalFormat.g:12221:2: rule__XOtherOperatorExpression__Group_1__0__Impl rule__XOtherOperatorExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1__0__Impl_in_rule__XOtherOperatorExpression__Group_1__025228);
+            pushFollow(FOLLOW_50);
             rule__XOtherOperatorExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1__1_in_rule__XOtherOperatorExpression__Group_1__025231);
+            pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group_1__1();
 
             state._fsp--;
@@ -36750,25 +36750,25 @@ public final void rule__XOtherOperatorExpression__Group_1__0() throws Recognitio
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12228:1: rule__XOtherOperatorExpression__Group_1__0__Impl : ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) ) ;
+    // InternalFormat.g:12228:1: rule__XOtherOperatorExpression__Group_1__0__Impl : ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) ) ;
     public final void rule__XOtherOperatorExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12232:1: ( ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12233:1: ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) )
+            // InternalFormat.g:12232:1: ( ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) ) )
+            // InternalFormat.g:12233:1: ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12233:1: ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12234:1: ( rule__XOtherOperatorExpression__Group_1_0__0 )
+            // InternalFormat.g:12233:1: ( ( rule__XOtherOperatorExpression__Group_1_0__0 ) )
+            // InternalFormat.g:12234:1: ( rule__XOtherOperatorExpression__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getGroup_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12235:1: ( rule__XOtherOperatorExpression__Group_1_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12235:2: rule__XOtherOperatorExpression__Group_1_0__0
+            // InternalFormat.g:12235:1: ( rule__XOtherOperatorExpression__Group_1_0__0 )
+            // InternalFormat.g:12235:2: rule__XOtherOperatorExpression__Group_1_0__0
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1_0__0_in_rule__XOtherOperatorExpression__Group_1__0__Impl25258);
+            pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group_1_0__0();
 
             state._fsp--;
@@ -36801,16 +36801,16 @@ public final void rule__XOtherOperatorExpression__Group_1__0__Impl() throws Reco
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12245:1: rule__XOtherOperatorExpression__Group_1__1 : rule__XOtherOperatorExpression__Group_1__1__Impl ;
+    // InternalFormat.g:12245:1: rule__XOtherOperatorExpression__Group_1__1 : rule__XOtherOperatorExpression__Group_1__1__Impl ;
     public final void rule__XOtherOperatorExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12249:1: ( rule__XOtherOperatorExpression__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12250:2: rule__XOtherOperatorExpression__Group_1__1__Impl
+            // InternalFormat.g:12249:1: ( rule__XOtherOperatorExpression__Group_1__1__Impl )
+            // InternalFormat.g:12250:2: rule__XOtherOperatorExpression__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1__1__Impl_in_rule__XOtherOperatorExpression__Group_1__125288);
+            pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group_1__1__Impl();
 
             state._fsp--;
@@ -36834,25 +36834,25 @@ public final void rule__XOtherOperatorExpression__Group_1__1() throws Recognitio
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12256:1: rule__XOtherOperatorExpression__Group_1__1__Impl : ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) ) ;
+    // InternalFormat.g:12256:1: rule__XOtherOperatorExpression__Group_1__1__Impl : ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) ) ;
     public final void rule__XOtherOperatorExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12260:1: ( ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12261:1: ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) )
+            // InternalFormat.g:12260:1: ( ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) ) )
+            // InternalFormat.g:12261:1: ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12261:1: ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12262:1: ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 )
+            // InternalFormat.g:12261:1: ( ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 ) )
+            // InternalFormat.g:12262:1: ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getRightOperandAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12263:1: ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12263:2: rule__XOtherOperatorExpression__RightOperandAssignment_1_1
+            // InternalFormat.g:12263:1: ( rule__XOtherOperatorExpression__RightOperandAssignment_1_1 )
+            // InternalFormat.g:12263:2: rule__XOtherOperatorExpression__RightOperandAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__RightOperandAssignment_1_1_in_rule__XOtherOperatorExpression__Group_1__1__Impl25315);
+            pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__RightOperandAssignment_1_1();
 
             state._fsp--;
@@ -36885,16 +36885,16 @@ public final void rule__XOtherOperatorExpression__Group_1__1__Impl() throws Reco
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12277:1: rule__XOtherOperatorExpression__Group_1_0__0 : rule__XOtherOperatorExpression__Group_1_0__0__Impl ;
+    // InternalFormat.g:12277:1: rule__XOtherOperatorExpression__Group_1_0__0 : rule__XOtherOperatorExpression__Group_1_0__0__Impl ;
     public final void rule__XOtherOperatorExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12281:1: ( rule__XOtherOperatorExpression__Group_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12282:2: rule__XOtherOperatorExpression__Group_1_0__0__Impl
+            // InternalFormat.g:12281:1: ( rule__XOtherOperatorExpression__Group_1_0__0__Impl )
+            // InternalFormat.g:12282:2: rule__XOtherOperatorExpression__Group_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1_0__0__Impl_in_rule__XOtherOperatorExpression__Group_1_0__025349);
+            pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group_1_0__0__Impl();
 
             state._fsp--;
@@ -36918,25 +36918,25 @@ public final void rule__XOtherOperatorExpression__Group_1_0__0() throws Recognit
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12288:1: rule__XOtherOperatorExpression__Group_1_0__0__Impl : ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) ) ;
+    // InternalFormat.g:12288:1: rule__XOtherOperatorExpression__Group_1_0__0__Impl : ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) ) ;
     public final void rule__XOtherOperatorExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12292:1: ( ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12293:1: ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) )
+            // InternalFormat.g:12292:1: ( ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) ) )
+            // InternalFormat.g:12293:1: ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12293:1: ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12294:1: ( rule__XOtherOperatorExpression__Group_1_0_0__0 )
+            // InternalFormat.g:12293:1: ( ( rule__XOtherOperatorExpression__Group_1_0_0__0 ) )
+            // InternalFormat.g:12294:1: ( rule__XOtherOperatorExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getGroup_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12295:1: ( rule__XOtherOperatorExpression__Group_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12295:2: rule__XOtherOperatorExpression__Group_1_0_0__0
+            // InternalFormat.g:12295:1: ( rule__XOtherOperatorExpression__Group_1_0_0__0 )
+            // InternalFormat.g:12295:2: rule__XOtherOperatorExpression__Group_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1_0_0__0_in_rule__XOtherOperatorExpression__Group_1_0__0__Impl25376);
+            pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group_1_0_0__0();
 
             state._fsp--;
@@ -36969,21 +36969,21 @@ public final void rule__XOtherOperatorExpression__Group_1_0__0__Impl() throws Re
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1_0_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12307:1: rule__XOtherOperatorExpression__Group_1_0_0__0 : rule__XOtherOperatorExpression__Group_1_0_0__0__Impl rule__XOtherOperatorExpression__Group_1_0_0__1 ;
+    // InternalFormat.g:12307:1: rule__XOtherOperatorExpression__Group_1_0_0__0 : rule__XOtherOperatorExpression__Group_1_0_0__0__Impl rule__XOtherOperatorExpression__Group_1_0_0__1 ;
     public final void rule__XOtherOperatorExpression__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12311:1: ( rule__XOtherOperatorExpression__Group_1_0_0__0__Impl rule__XOtherOperatorExpression__Group_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12312:2: rule__XOtherOperatorExpression__Group_1_0_0__0__Impl rule__XOtherOperatorExpression__Group_1_0_0__1
+            // InternalFormat.g:12311:1: ( rule__XOtherOperatorExpression__Group_1_0_0__0__Impl rule__XOtherOperatorExpression__Group_1_0_0__1 )
+            // InternalFormat.g:12312:2: rule__XOtherOperatorExpression__Group_1_0_0__0__Impl rule__XOtherOperatorExpression__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1_0_0__0__Impl_in_rule__XOtherOperatorExpression__Group_1_0_0__025408);
+            pushFollow(FOLLOW_68);
             rule__XOtherOperatorExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1_0_0__1_in_rule__XOtherOperatorExpression__Group_1_0_0__025411);
+            pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group_1_0_0__1();
 
             state._fsp--;
@@ -37007,23 +37007,23 @@ public final void rule__XOtherOperatorExpression__Group_1_0_0__0() throws Recogn
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12319:1: rule__XOtherOperatorExpression__Group_1_0_0__0__Impl : ( () ) ;
+    // InternalFormat.g:12319:1: rule__XOtherOperatorExpression__Group_1_0_0__0__Impl : ( () ) ;
     public final void rule__XOtherOperatorExpression__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12323:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12324:1: ( () )
+            // InternalFormat.g:12323:1: ( ( () ) )
+            // InternalFormat.g:12324:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12324:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12325:1: ()
+            // InternalFormat.g:12324:1: ( () )
+            // InternalFormat.g:12325:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12326:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12328:1: 
+            // InternalFormat.g:12326:1: ()
+            // InternalFormat.g:12328:1: 
             {
             }
 
@@ -37048,16 +37048,16 @@ public final void rule__XOtherOperatorExpression__Group_1_0_0__0__Impl() throws
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1_0_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12338:1: rule__XOtherOperatorExpression__Group_1_0_0__1 : rule__XOtherOperatorExpression__Group_1_0_0__1__Impl ;
+    // InternalFormat.g:12338:1: rule__XOtherOperatorExpression__Group_1_0_0__1 : rule__XOtherOperatorExpression__Group_1_0_0__1__Impl ;
     public final void rule__XOtherOperatorExpression__Group_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12342:1: ( rule__XOtherOperatorExpression__Group_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12343:2: rule__XOtherOperatorExpression__Group_1_0_0__1__Impl
+            // InternalFormat.g:12342:1: ( rule__XOtherOperatorExpression__Group_1_0_0__1__Impl )
+            // InternalFormat.g:12343:2: rule__XOtherOperatorExpression__Group_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1_0_0__1__Impl_in_rule__XOtherOperatorExpression__Group_1_0_0__125469);
+            pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__Group_1_0_0__1__Impl();
 
             state._fsp--;
@@ -37081,25 +37081,25 @@ public final void rule__XOtherOperatorExpression__Group_1_0_0__1() throws Recogn
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__Group_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12349:1: rule__XOtherOperatorExpression__Group_1_0_0__1__Impl : ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) ) ;
+    // InternalFormat.g:12349:1: rule__XOtherOperatorExpression__Group_1_0_0__1__Impl : ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) ) ;
     public final void rule__XOtherOperatorExpression__Group_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12353:1: ( ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12354:1: ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalFormat.g:12353:1: ( ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) ) )
+            // InternalFormat.g:12354:1: ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12354:1: ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12355:1: ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 )
+            // InternalFormat.g:12354:1: ( ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalFormat.g:12355:1: ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getFeatureAssignment_1_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12356:1: ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12356:2: rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1
+            // InternalFormat.g:12356:1: ( rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 )
+            // InternalFormat.g:12356:2: rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1
             {
-            pushFollow(FOLLOW_rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1_in_rule__XOtherOperatorExpression__Group_1_0_0__1__Impl25496);
+            pushFollow(FOLLOW_2);
             rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1();
 
             state._fsp--;
@@ -37132,21 +37132,21 @@ public final void rule__XOtherOperatorExpression__Group_1_0_0__1__Impl() throws
 
 
     // $ANTLR start "rule__OpOther__Group_2__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12370:1: rule__OpOther__Group_2__0 : rule__OpOther__Group_2__0__Impl rule__OpOther__Group_2__1 ;
+    // InternalFormat.g:12370:1: rule__OpOther__Group_2__0 : rule__OpOther__Group_2__0__Impl rule__OpOther__Group_2__1 ;
     public final void rule__OpOther__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12374:1: ( rule__OpOther__Group_2__0__Impl rule__OpOther__Group_2__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12375:2: rule__OpOther__Group_2__0__Impl rule__OpOther__Group_2__1
+            // InternalFormat.g:12374:1: ( rule__OpOther__Group_2__0__Impl rule__OpOther__Group_2__1 )
+            // InternalFormat.g:12375:2: rule__OpOther__Group_2__0__Impl rule__OpOther__Group_2__1
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_2__0__Impl_in_rule__OpOther__Group_2__025530);
+            pushFollow(FOLLOW_70);
             rule__OpOther__Group_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OpOther__Group_2__1_in_rule__OpOther__Group_2__025533);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Group_2__1();
 
             state._fsp--;
@@ -37170,22 +37170,22 @@ public final void rule__OpOther__Group_2__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpOther__Group_2__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12382:1: rule__OpOther__Group_2__0__Impl : ( '>' ) ;
+    // InternalFormat.g:12382:1: rule__OpOther__Group_2__0__Impl : ( '>' ) ;
     public final void rule__OpOther__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12386:1: ( ( '>' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12387:1: ( '>' )
+            // InternalFormat.g:12386:1: ( ( '>' ) )
+            // InternalFormat.g:12387:1: ( '>' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12387:1: ( '>' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12388:1: '>'
+            // InternalFormat.g:12387:1: ( '>' )
+            // InternalFormat.g:12388:1: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_2_0()); 
             }
-            match(input,32,FOLLOW_32_in_rule__OpOther__Group_2__0__Impl25561); if (state.failed) return ;
+            match(input,32,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_2_0()); 
             }
@@ -37211,16 +37211,16 @@ public final void rule__OpOther__Group_2__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__OpOther__Group_2__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12401:1: rule__OpOther__Group_2__1 : rule__OpOther__Group_2__1__Impl ;
+    // InternalFormat.g:12401:1: rule__OpOther__Group_2__1 : rule__OpOther__Group_2__1__Impl ;
     public final void rule__OpOther__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12405:1: ( rule__OpOther__Group_2__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12406:2: rule__OpOther__Group_2__1__Impl
+            // InternalFormat.g:12405:1: ( rule__OpOther__Group_2__1__Impl )
+            // InternalFormat.g:12406:2: rule__OpOther__Group_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_2__1__Impl_in_rule__OpOther__Group_2__125592);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Group_2__1__Impl();
 
             state._fsp--;
@@ -37244,22 +37244,22 @@ public final void rule__OpOther__Group_2__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpOther__Group_2__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12412:1: rule__OpOther__Group_2__1__Impl : ( '..' ) ;
+    // InternalFormat.g:12412:1: rule__OpOther__Group_2__1__Impl : ( '..' ) ;
     public final void rule__OpOther__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12416:1: ( ( '..' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12417:1: ( '..' )
+            // InternalFormat.g:12416:1: ( ( '..' ) )
+            // InternalFormat.g:12417:1: ( '..' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12417:1: ( '..' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12418:1: '..'
+            // InternalFormat.g:12417:1: ( '..' )
+            // InternalFormat.g:12418:1: '..'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getFullStopFullStopKeyword_2_1()); 
             }
-            match(input,36,FOLLOW_36_in_rule__OpOther__Group_2__1__Impl25620); if (state.failed) return ;
+            match(input,36,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpOtherAccess().getFullStopFullStopKeyword_2_1()); 
             }
@@ -37285,21 +37285,21 @@ public final void rule__OpOther__Group_2__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__OpOther__Group_5__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12435:1: rule__OpOther__Group_5__0 : rule__OpOther__Group_5__0__Impl rule__OpOther__Group_5__1 ;
+    // InternalFormat.g:12435:1: rule__OpOther__Group_5__0 : rule__OpOther__Group_5__0__Impl rule__OpOther__Group_5__1 ;
     public final void rule__OpOther__Group_5__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12439:1: ( rule__OpOther__Group_5__0__Impl rule__OpOther__Group_5__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12440:2: rule__OpOther__Group_5__0__Impl rule__OpOther__Group_5__1
+            // InternalFormat.g:12439:1: ( rule__OpOther__Group_5__0__Impl rule__OpOther__Group_5__1 )
+            // InternalFormat.g:12440:2: rule__OpOther__Group_5__0__Impl rule__OpOther__Group_5__1
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_5__0__Impl_in_rule__OpOther__Group_5__025655);
+            pushFollow(FOLLOW_71);
             rule__OpOther__Group_5__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OpOther__Group_5__1_in_rule__OpOther__Group_5__025658);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Group_5__1();
 
             state._fsp--;
@@ -37323,22 +37323,22 @@ public final void rule__OpOther__Group_5__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpOther__Group_5__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12447:1: rule__OpOther__Group_5__0__Impl : ( '>' ) ;
+    // InternalFormat.g:12447:1: rule__OpOther__Group_5__0__Impl : ( '>' ) ;
     public final void rule__OpOther__Group_5__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12451:1: ( ( '>' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12452:1: ( '>' )
+            // InternalFormat.g:12451:1: ( ( '>' ) )
+            // InternalFormat.g:12452:1: ( '>' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12452:1: ( '>' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12453:1: '>'
+            // InternalFormat.g:12452:1: ( '>' )
+            // InternalFormat.g:12453:1: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_0()); 
             }
-            match(input,32,FOLLOW_32_in_rule__OpOther__Group_5__0__Impl25686); if (state.failed) return ;
+            match(input,32,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_0()); 
             }
@@ -37364,16 +37364,16 @@ public final void rule__OpOther__Group_5__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__OpOther__Group_5__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12466:1: rule__OpOther__Group_5__1 : rule__OpOther__Group_5__1__Impl ;
+    // InternalFormat.g:12466:1: rule__OpOther__Group_5__1 : rule__OpOther__Group_5__1__Impl ;
     public final void rule__OpOther__Group_5__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12470:1: ( rule__OpOther__Group_5__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12471:2: rule__OpOther__Group_5__1__Impl
+            // InternalFormat.g:12470:1: ( rule__OpOther__Group_5__1__Impl )
+            // InternalFormat.g:12471:2: rule__OpOther__Group_5__1__Impl
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_5__1__Impl_in_rule__OpOther__Group_5__125717);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Group_5__1__Impl();
 
             state._fsp--;
@@ -37397,25 +37397,25 @@ public final void rule__OpOther__Group_5__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpOther__Group_5__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12477:1: rule__OpOther__Group_5__1__Impl : ( ( rule__OpOther__Alternatives_5_1 ) ) ;
+    // InternalFormat.g:12477:1: rule__OpOther__Group_5__1__Impl : ( ( rule__OpOther__Alternatives_5_1 ) ) ;
     public final void rule__OpOther__Group_5__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12481:1: ( ( ( rule__OpOther__Alternatives_5_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12482:1: ( ( rule__OpOther__Alternatives_5_1 ) )
+            // InternalFormat.g:12481:1: ( ( ( rule__OpOther__Alternatives_5_1 ) ) )
+            // InternalFormat.g:12482:1: ( ( rule__OpOther__Alternatives_5_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12482:1: ( ( rule__OpOther__Alternatives_5_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12483:1: ( rule__OpOther__Alternatives_5_1 )
+            // InternalFormat.g:12482:1: ( ( rule__OpOther__Alternatives_5_1 ) )
+            // InternalFormat.g:12483:1: ( rule__OpOther__Alternatives_5_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getAlternatives_5_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12484:1: ( rule__OpOther__Alternatives_5_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12484:2: rule__OpOther__Alternatives_5_1
+            // InternalFormat.g:12484:1: ( rule__OpOther__Alternatives_5_1 )
+            // InternalFormat.g:12484:2: rule__OpOther__Alternatives_5_1
             {
-            pushFollow(FOLLOW_rule__OpOther__Alternatives_5_1_in_rule__OpOther__Group_5__1__Impl25744);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Alternatives_5_1();
 
             state._fsp--;
@@ -37448,16 +37448,16 @@ public final void rule__OpOther__Group_5__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__OpOther__Group_5_1_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12498:1: rule__OpOther__Group_5_1_0__0 : rule__OpOther__Group_5_1_0__0__Impl ;
+    // InternalFormat.g:12498:1: rule__OpOther__Group_5_1_0__0 : rule__OpOther__Group_5_1_0__0__Impl ;
     public final void rule__OpOther__Group_5_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12502:1: ( rule__OpOther__Group_5_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12503:2: rule__OpOther__Group_5_1_0__0__Impl
+            // InternalFormat.g:12502:1: ( rule__OpOther__Group_5_1_0__0__Impl )
+            // InternalFormat.g:12503:2: rule__OpOther__Group_5_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_5_1_0__0__Impl_in_rule__OpOther__Group_5_1_0__025778);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Group_5_1_0__0__Impl();
 
             state._fsp--;
@@ -37481,25 +37481,25 @@ public final void rule__OpOther__Group_5_1_0__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpOther__Group_5_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12509:1: rule__OpOther__Group_5_1_0__0__Impl : ( ( rule__OpOther__Group_5_1_0_0__0 ) ) ;
+    // InternalFormat.g:12509:1: rule__OpOther__Group_5_1_0__0__Impl : ( ( rule__OpOther__Group_5_1_0_0__0 ) ) ;
     public final void rule__OpOther__Group_5_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12513:1: ( ( ( rule__OpOther__Group_5_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12514:1: ( ( rule__OpOther__Group_5_1_0_0__0 ) )
+            // InternalFormat.g:12513:1: ( ( ( rule__OpOther__Group_5_1_0_0__0 ) ) )
+            // InternalFormat.g:12514:1: ( ( rule__OpOther__Group_5_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12514:1: ( ( rule__OpOther__Group_5_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12515:1: ( rule__OpOther__Group_5_1_0_0__0 )
+            // InternalFormat.g:12514:1: ( ( rule__OpOther__Group_5_1_0_0__0 ) )
+            // InternalFormat.g:12515:1: ( rule__OpOther__Group_5_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getGroup_5_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12516:1: ( rule__OpOther__Group_5_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12516:2: rule__OpOther__Group_5_1_0_0__0
+            // InternalFormat.g:12516:1: ( rule__OpOther__Group_5_1_0_0__0 )
+            // InternalFormat.g:12516:2: rule__OpOther__Group_5_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_5_1_0_0__0_in_rule__OpOther__Group_5_1_0__0__Impl25805);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Group_5_1_0_0__0();
 
             state._fsp--;
@@ -37532,21 +37532,21 @@ public final void rule__OpOther__Group_5_1_0__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__OpOther__Group_5_1_0_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12528:1: rule__OpOther__Group_5_1_0_0__0 : rule__OpOther__Group_5_1_0_0__0__Impl rule__OpOther__Group_5_1_0_0__1 ;
+    // InternalFormat.g:12528:1: rule__OpOther__Group_5_1_0_0__0 : rule__OpOther__Group_5_1_0_0__0__Impl rule__OpOther__Group_5_1_0_0__1 ;
     public final void rule__OpOther__Group_5_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12532:1: ( rule__OpOther__Group_5_1_0_0__0__Impl rule__OpOther__Group_5_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12533:2: rule__OpOther__Group_5_1_0_0__0__Impl rule__OpOther__Group_5_1_0_0__1
+            // InternalFormat.g:12532:1: ( rule__OpOther__Group_5_1_0_0__0__Impl rule__OpOther__Group_5_1_0_0__1 )
+            // InternalFormat.g:12533:2: rule__OpOther__Group_5_1_0_0__0__Impl rule__OpOther__Group_5_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_5_1_0_0__0__Impl_in_rule__OpOther__Group_5_1_0_0__025837);
+            pushFollow(FOLLOW_71);
             rule__OpOther__Group_5_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OpOther__Group_5_1_0_0__1_in_rule__OpOther__Group_5_1_0_0__025840);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Group_5_1_0_0__1();
 
             state._fsp--;
@@ -37570,22 +37570,22 @@ public final void rule__OpOther__Group_5_1_0_0__0() throws RecognitionException
 
 
     // $ANTLR start "rule__OpOther__Group_5_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12540:1: rule__OpOther__Group_5_1_0_0__0__Impl : ( '>' ) ;
+    // InternalFormat.g:12540:1: rule__OpOther__Group_5_1_0_0__0__Impl : ( '>' ) ;
     public final void rule__OpOther__Group_5_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12544:1: ( ( '>' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12545:1: ( '>' )
+            // InternalFormat.g:12544:1: ( ( '>' ) )
+            // InternalFormat.g:12545:1: ( '>' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12545:1: ( '>' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12546:1: '>'
+            // InternalFormat.g:12545:1: ( '>' )
+            // InternalFormat.g:12546:1: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_1_0_0_0()); 
             }
-            match(input,32,FOLLOW_32_in_rule__OpOther__Group_5_1_0_0__0__Impl25868); if (state.failed) return ;
+            match(input,32,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_1_0_0_0()); 
             }
@@ -37611,16 +37611,16 @@ public final void rule__OpOther__Group_5_1_0_0__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__OpOther__Group_5_1_0_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12559:1: rule__OpOther__Group_5_1_0_0__1 : rule__OpOther__Group_5_1_0_0__1__Impl ;
+    // InternalFormat.g:12559:1: rule__OpOther__Group_5_1_0_0__1 : rule__OpOther__Group_5_1_0_0__1__Impl ;
     public final void rule__OpOther__Group_5_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12563:1: ( rule__OpOther__Group_5_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12564:2: rule__OpOther__Group_5_1_0_0__1__Impl
+            // InternalFormat.g:12563:1: ( rule__OpOther__Group_5_1_0_0__1__Impl )
+            // InternalFormat.g:12564:2: rule__OpOther__Group_5_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_5_1_0_0__1__Impl_in_rule__OpOther__Group_5_1_0_0__125899);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Group_5_1_0_0__1__Impl();
 
             state._fsp--;
@@ -37644,22 +37644,22 @@ public final void rule__OpOther__Group_5_1_0_0__1() throws RecognitionException
 
 
     // $ANTLR start "rule__OpOther__Group_5_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12570:1: rule__OpOther__Group_5_1_0_0__1__Impl : ( '>' ) ;
+    // InternalFormat.g:12570:1: rule__OpOther__Group_5_1_0_0__1__Impl : ( '>' ) ;
     public final void rule__OpOther__Group_5_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12574:1: ( ( '>' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12575:1: ( '>' )
+            // InternalFormat.g:12574:1: ( ( '>' ) )
+            // InternalFormat.g:12575:1: ( '>' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12575:1: ( '>' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12576:1: '>'
+            // InternalFormat.g:12575:1: ( '>' )
+            // InternalFormat.g:12576:1: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_1_0_0_1()); 
             }
-            match(input,32,FOLLOW_32_in_rule__OpOther__Group_5_1_0_0__1__Impl25927); if (state.failed) return ;
+            match(input,32,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_1_0_0_1()); 
             }
@@ -37685,21 +37685,21 @@ public final void rule__OpOther__Group_5_1_0_0__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__OpOther__Group_6__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12593:1: rule__OpOther__Group_6__0 : rule__OpOther__Group_6__0__Impl rule__OpOther__Group_6__1 ;
+    // InternalFormat.g:12593:1: rule__OpOther__Group_6__0 : rule__OpOther__Group_6__0__Impl rule__OpOther__Group_6__1 ;
     public final void rule__OpOther__Group_6__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12597:1: ( rule__OpOther__Group_6__0__Impl rule__OpOther__Group_6__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12598:2: rule__OpOther__Group_6__0__Impl rule__OpOther__Group_6__1
+            // InternalFormat.g:12597:1: ( rule__OpOther__Group_6__0__Impl rule__OpOther__Group_6__1 )
+            // InternalFormat.g:12598:2: rule__OpOther__Group_6__0__Impl rule__OpOther__Group_6__1
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_6__0__Impl_in_rule__OpOther__Group_6__025962);
+            pushFollow(FOLLOW_72);
             rule__OpOther__Group_6__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OpOther__Group_6__1_in_rule__OpOther__Group_6__025965);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Group_6__1();
 
             state._fsp--;
@@ -37723,22 +37723,22 @@ public final void rule__OpOther__Group_6__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpOther__Group_6__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12605:1: rule__OpOther__Group_6__0__Impl : ( '<' ) ;
+    // InternalFormat.g:12605:1: rule__OpOther__Group_6__0__Impl : ( '<' ) ;
     public final void rule__OpOther__Group_6__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12609:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12610:1: ( '<' )
+            // InternalFormat.g:12609:1: ( ( '<' ) )
+            // InternalFormat.g:12610:1: ( '<' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12610:1: ( '<' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12611:1: '<'
+            // InternalFormat.g:12610:1: ( '<' )
+            // InternalFormat.g:12611:1: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_0()); 
             }
-            match(input,33,FOLLOW_33_in_rule__OpOther__Group_6__0__Impl25993); if (state.failed) return ;
+            match(input,33,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_0()); 
             }
@@ -37764,16 +37764,16 @@ public final void rule__OpOther__Group_6__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__OpOther__Group_6__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12624:1: rule__OpOther__Group_6__1 : rule__OpOther__Group_6__1__Impl ;
+    // InternalFormat.g:12624:1: rule__OpOther__Group_6__1 : rule__OpOther__Group_6__1__Impl ;
     public final void rule__OpOther__Group_6__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12628:1: ( rule__OpOther__Group_6__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12629:2: rule__OpOther__Group_6__1__Impl
+            // InternalFormat.g:12628:1: ( rule__OpOther__Group_6__1__Impl )
+            // InternalFormat.g:12629:2: rule__OpOther__Group_6__1__Impl
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_6__1__Impl_in_rule__OpOther__Group_6__126024);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Group_6__1__Impl();
 
             state._fsp--;
@@ -37797,25 +37797,25 @@ public final void rule__OpOther__Group_6__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpOther__Group_6__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12635:1: rule__OpOther__Group_6__1__Impl : ( ( rule__OpOther__Alternatives_6_1 ) ) ;
+    // InternalFormat.g:12635:1: rule__OpOther__Group_6__1__Impl : ( ( rule__OpOther__Alternatives_6_1 ) ) ;
     public final void rule__OpOther__Group_6__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12639:1: ( ( ( rule__OpOther__Alternatives_6_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12640:1: ( ( rule__OpOther__Alternatives_6_1 ) )
+            // InternalFormat.g:12639:1: ( ( ( rule__OpOther__Alternatives_6_1 ) ) )
+            // InternalFormat.g:12640:1: ( ( rule__OpOther__Alternatives_6_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12640:1: ( ( rule__OpOther__Alternatives_6_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12641:1: ( rule__OpOther__Alternatives_6_1 )
+            // InternalFormat.g:12640:1: ( ( rule__OpOther__Alternatives_6_1 ) )
+            // InternalFormat.g:12641:1: ( rule__OpOther__Alternatives_6_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getAlternatives_6_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12642:1: ( rule__OpOther__Alternatives_6_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12642:2: rule__OpOther__Alternatives_6_1
+            // InternalFormat.g:12642:1: ( rule__OpOther__Alternatives_6_1 )
+            // InternalFormat.g:12642:2: rule__OpOther__Alternatives_6_1
             {
-            pushFollow(FOLLOW_rule__OpOther__Alternatives_6_1_in_rule__OpOther__Group_6__1__Impl26051);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Alternatives_6_1();
 
             state._fsp--;
@@ -37848,16 +37848,16 @@ public final void rule__OpOther__Group_6__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__OpOther__Group_6_1_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12656:1: rule__OpOther__Group_6_1_0__0 : rule__OpOther__Group_6_1_0__0__Impl ;
+    // InternalFormat.g:12656:1: rule__OpOther__Group_6_1_0__0 : rule__OpOther__Group_6_1_0__0__Impl ;
     public final void rule__OpOther__Group_6_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12660:1: ( rule__OpOther__Group_6_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12661:2: rule__OpOther__Group_6_1_0__0__Impl
+            // InternalFormat.g:12660:1: ( rule__OpOther__Group_6_1_0__0__Impl )
+            // InternalFormat.g:12661:2: rule__OpOther__Group_6_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_6_1_0__0__Impl_in_rule__OpOther__Group_6_1_0__026085);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Group_6_1_0__0__Impl();
 
             state._fsp--;
@@ -37881,25 +37881,25 @@ public final void rule__OpOther__Group_6_1_0__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__OpOther__Group_6_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12667:1: rule__OpOther__Group_6_1_0__0__Impl : ( ( rule__OpOther__Group_6_1_0_0__0 ) ) ;
+    // InternalFormat.g:12667:1: rule__OpOther__Group_6_1_0__0__Impl : ( ( rule__OpOther__Group_6_1_0_0__0 ) ) ;
     public final void rule__OpOther__Group_6_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12671:1: ( ( ( rule__OpOther__Group_6_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12672:1: ( ( rule__OpOther__Group_6_1_0_0__0 ) )
+            // InternalFormat.g:12671:1: ( ( ( rule__OpOther__Group_6_1_0_0__0 ) ) )
+            // InternalFormat.g:12672:1: ( ( rule__OpOther__Group_6_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12672:1: ( ( rule__OpOther__Group_6_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12673:1: ( rule__OpOther__Group_6_1_0_0__0 )
+            // InternalFormat.g:12672:1: ( ( rule__OpOther__Group_6_1_0_0__0 ) )
+            // InternalFormat.g:12673:1: ( rule__OpOther__Group_6_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getGroup_6_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12674:1: ( rule__OpOther__Group_6_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12674:2: rule__OpOther__Group_6_1_0_0__0
+            // InternalFormat.g:12674:1: ( rule__OpOther__Group_6_1_0_0__0 )
+            // InternalFormat.g:12674:2: rule__OpOther__Group_6_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_6_1_0_0__0_in_rule__OpOther__Group_6_1_0__0__Impl26112);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Group_6_1_0_0__0();
 
             state._fsp--;
@@ -37932,21 +37932,21 @@ public final void rule__OpOther__Group_6_1_0__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__OpOther__Group_6_1_0_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12686:1: rule__OpOther__Group_6_1_0_0__0 : rule__OpOther__Group_6_1_0_0__0__Impl rule__OpOther__Group_6_1_0_0__1 ;
+    // InternalFormat.g:12686:1: rule__OpOther__Group_6_1_0_0__0 : rule__OpOther__Group_6_1_0_0__0__Impl rule__OpOther__Group_6_1_0_0__1 ;
     public final void rule__OpOther__Group_6_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12690:1: ( rule__OpOther__Group_6_1_0_0__0__Impl rule__OpOther__Group_6_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12691:2: rule__OpOther__Group_6_1_0_0__0__Impl rule__OpOther__Group_6_1_0_0__1
+            // InternalFormat.g:12690:1: ( rule__OpOther__Group_6_1_0_0__0__Impl rule__OpOther__Group_6_1_0_0__1 )
+            // InternalFormat.g:12691:2: rule__OpOther__Group_6_1_0_0__0__Impl rule__OpOther__Group_6_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_6_1_0_0__0__Impl_in_rule__OpOther__Group_6_1_0_0__026144);
+            pushFollow(FOLLOW_56);
             rule__OpOther__Group_6_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OpOther__Group_6_1_0_0__1_in_rule__OpOther__Group_6_1_0_0__026147);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Group_6_1_0_0__1();
 
             state._fsp--;
@@ -37970,22 +37970,22 @@ public final void rule__OpOther__Group_6_1_0_0__0() throws RecognitionException
 
 
     // $ANTLR start "rule__OpOther__Group_6_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12698:1: rule__OpOther__Group_6_1_0_0__0__Impl : ( '<' ) ;
+    // InternalFormat.g:12698:1: rule__OpOther__Group_6_1_0_0__0__Impl : ( '<' ) ;
     public final void rule__OpOther__Group_6_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12702:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12703:1: ( '<' )
+            // InternalFormat.g:12702:1: ( ( '<' ) )
+            // InternalFormat.g:12703:1: ( '<' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12703:1: ( '<' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12704:1: '<'
+            // InternalFormat.g:12703:1: ( '<' )
+            // InternalFormat.g:12704:1: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_1_0_0_0()); 
             }
-            match(input,33,FOLLOW_33_in_rule__OpOther__Group_6_1_0_0__0__Impl26175); if (state.failed) return ;
+            match(input,33,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_1_0_0_0()); 
             }
@@ -38011,16 +38011,16 @@ public final void rule__OpOther__Group_6_1_0_0__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__OpOther__Group_6_1_0_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12717:1: rule__OpOther__Group_6_1_0_0__1 : rule__OpOther__Group_6_1_0_0__1__Impl ;
+    // InternalFormat.g:12717:1: rule__OpOther__Group_6_1_0_0__1 : rule__OpOther__Group_6_1_0_0__1__Impl ;
     public final void rule__OpOther__Group_6_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12721:1: ( rule__OpOther__Group_6_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12722:2: rule__OpOther__Group_6_1_0_0__1__Impl
+            // InternalFormat.g:12721:1: ( rule__OpOther__Group_6_1_0_0__1__Impl )
+            // InternalFormat.g:12722:2: rule__OpOther__Group_6_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__OpOther__Group_6_1_0_0__1__Impl_in_rule__OpOther__Group_6_1_0_0__126206);
+            pushFollow(FOLLOW_2);
             rule__OpOther__Group_6_1_0_0__1__Impl();
 
             state._fsp--;
@@ -38044,22 +38044,22 @@ public final void rule__OpOther__Group_6_1_0_0__1() throws RecognitionException
 
 
     // $ANTLR start "rule__OpOther__Group_6_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12728:1: rule__OpOther__Group_6_1_0_0__1__Impl : ( '<' ) ;
+    // InternalFormat.g:12728:1: rule__OpOther__Group_6_1_0_0__1__Impl : ( '<' ) ;
     public final void rule__OpOther__Group_6_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12732:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12733:1: ( '<' )
+            // InternalFormat.g:12732:1: ( ( '<' ) )
+            // InternalFormat.g:12733:1: ( '<' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12733:1: ( '<' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12734:1: '<'
+            // InternalFormat.g:12733:1: ( '<' )
+            // InternalFormat.g:12734:1: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_1_0_0_1()); 
             }
-            match(input,33,FOLLOW_33_in_rule__OpOther__Group_6_1_0_0__1__Impl26234); if (state.failed) return ;
+            match(input,33,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_1_0_0_1()); 
             }
@@ -38085,21 +38085,21 @@ public final void rule__OpOther__Group_6_1_0_0__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12751:1: rule__XAdditiveExpression__Group__0 : rule__XAdditiveExpression__Group__0__Impl rule__XAdditiveExpression__Group__1 ;
+    // InternalFormat.g:12751:1: rule__XAdditiveExpression__Group__0 : rule__XAdditiveExpression__Group__0__Impl rule__XAdditiveExpression__Group__1 ;
     public final void rule__XAdditiveExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12755:1: ( rule__XAdditiveExpression__Group__0__Impl rule__XAdditiveExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12756:2: rule__XAdditiveExpression__Group__0__Impl rule__XAdditiveExpression__Group__1
+            // InternalFormat.g:12755:1: ( rule__XAdditiveExpression__Group__0__Impl rule__XAdditiveExpression__Group__1 )
+            // InternalFormat.g:12756:2: rule__XAdditiveExpression__Group__0__Impl rule__XAdditiveExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group__0__Impl_in_rule__XAdditiveExpression__Group__026269);
+            pushFollow(FOLLOW_73);
             rule__XAdditiveExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group__1_in_rule__XAdditiveExpression__Group__026272);
+            pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group__1();
 
             state._fsp--;
@@ -38123,22 +38123,22 @@ public final void rule__XAdditiveExpression__Group__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12763:1: rule__XAdditiveExpression__Group__0__Impl : ( ruleXMultiplicativeExpression ) ;
+    // InternalFormat.g:12763:1: rule__XAdditiveExpression__Group__0__Impl : ( ruleXMultiplicativeExpression ) ;
     public final void rule__XAdditiveExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12767:1: ( ( ruleXMultiplicativeExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12768:1: ( ruleXMultiplicativeExpression )
+            // InternalFormat.g:12767:1: ( ( ruleXMultiplicativeExpression ) )
+            // InternalFormat.g:12768:1: ( ruleXMultiplicativeExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12768:1: ( ruleXMultiplicativeExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12769:1: ruleXMultiplicativeExpression
+            // InternalFormat.g:12768:1: ( ruleXMultiplicativeExpression )
+            // InternalFormat.g:12769:1: ruleXMultiplicativeExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getXMultiplicativeExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleXMultiplicativeExpression_in_rule__XAdditiveExpression__Group__0__Impl26299);
+            pushFollow(FOLLOW_2);
             ruleXMultiplicativeExpression();
 
             state._fsp--;
@@ -38168,16 +38168,16 @@ public final void rule__XAdditiveExpression__Group__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12780:1: rule__XAdditiveExpression__Group__1 : rule__XAdditiveExpression__Group__1__Impl ;
+    // InternalFormat.g:12780:1: rule__XAdditiveExpression__Group__1 : rule__XAdditiveExpression__Group__1__Impl ;
     public final void rule__XAdditiveExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12784:1: ( rule__XAdditiveExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12785:2: rule__XAdditiveExpression__Group__1__Impl
+            // InternalFormat.g:12784:1: ( rule__XAdditiveExpression__Group__1__Impl )
+            // InternalFormat.g:12785:2: rule__XAdditiveExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group__1__Impl_in_rule__XAdditiveExpression__Group__126328);
+            pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group__1__Impl();
 
             state._fsp--;
@@ -38201,22 +38201,22 @@ public final void rule__XAdditiveExpression__Group__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12791:1: rule__XAdditiveExpression__Group__1__Impl : ( ( rule__XAdditiveExpression__Group_1__0 )* ) ;
+    // InternalFormat.g:12791:1: rule__XAdditiveExpression__Group__1__Impl : ( ( rule__XAdditiveExpression__Group_1__0 )* ) ;
     public final void rule__XAdditiveExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12795:1: ( ( ( rule__XAdditiveExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12796:1: ( ( rule__XAdditiveExpression__Group_1__0 )* )
+            // InternalFormat.g:12795:1: ( ( ( rule__XAdditiveExpression__Group_1__0 )* ) )
+            // InternalFormat.g:12796:1: ( ( rule__XAdditiveExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12796:1: ( ( rule__XAdditiveExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12797:1: ( rule__XAdditiveExpression__Group_1__0 )*
+            // InternalFormat.g:12796:1: ( ( rule__XAdditiveExpression__Group_1__0 )* )
+            // InternalFormat.g:12797:1: ( rule__XAdditiveExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12798:1: ( rule__XAdditiveExpression__Group_1__0 )*
+            // InternalFormat.g:12798:1: ( rule__XAdditiveExpression__Group_1__0 )*
             loop109:
             do {
                 int alt109=2;
@@ -38244,9 +38244,9 @@ else if ( (LA109_0==40) ) {
 
                 switch (alt109) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12798:2: rule__XAdditiveExpression__Group_1__0
+            	    // InternalFormat.g:12798:2: rule__XAdditiveExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1__0_in_rule__XAdditiveExpression__Group__1__Impl26355);
+            	    pushFollow(FOLLOW_74);
             	    rule__XAdditiveExpression__Group_1__0();
 
             	    state._fsp--;
@@ -38285,21 +38285,21 @@ else if ( (LA109_0==40) ) {
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12812:1: rule__XAdditiveExpression__Group_1__0 : rule__XAdditiveExpression__Group_1__0__Impl rule__XAdditiveExpression__Group_1__1 ;
+    // InternalFormat.g:12812:1: rule__XAdditiveExpression__Group_1__0 : rule__XAdditiveExpression__Group_1__0__Impl rule__XAdditiveExpression__Group_1__1 ;
     public final void rule__XAdditiveExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12816:1: ( rule__XAdditiveExpression__Group_1__0__Impl rule__XAdditiveExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12817:2: rule__XAdditiveExpression__Group_1__0__Impl rule__XAdditiveExpression__Group_1__1
+            // InternalFormat.g:12816:1: ( rule__XAdditiveExpression__Group_1__0__Impl rule__XAdditiveExpression__Group_1__1 )
+            // InternalFormat.g:12817:2: rule__XAdditiveExpression__Group_1__0__Impl rule__XAdditiveExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1__0__Impl_in_rule__XAdditiveExpression__Group_1__026390);
+            pushFollow(FOLLOW_50);
             rule__XAdditiveExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1__1_in_rule__XAdditiveExpression__Group_1__026393);
+            pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group_1__1();
 
             state._fsp--;
@@ -38323,25 +38323,25 @@ public final void rule__XAdditiveExpression__Group_1__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12824:1: rule__XAdditiveExpression__Group_1__0__Impl : ( ( rule__XAdditiveExpression__Group_1_0__0 ) ) ;
+    // InternalFormat.g:12824:1: rule__XAdditiveExpression__Group_1__0__Impl : ( ( rule__XAdditiveExpression__Group_1_0__0 ) ) ;
     public final void rule__XAdditiveExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12828:1: ( ( ( rule__XAdditiveExpression__Group_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12829:1: ( ( rule__XAdditiveExpression__Group_1_0__0 ) )
+            // InternalFormat.g:12828:1: ( ( ( rule__XAdditiveExpression__Group_1_0__0 ) ) )
+            // InternalFormat.g:12829:1: ( ( rule__XAdditiveExpression__Group_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12829:1: ( ( rule__XAdditiveExpression__Group_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12830:1: ( rule__XAdditiveExpression__Group_1_0__0 )
+            // InternalFormat.g:12829:1: ( ( rule__XAdditiveExpression__Group_1_0__0 ) )
+            // InternalFormat.g:12830:1: ( rule__XAdditiveExpression__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getGroup_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12831:1: ( rule__XAdditiveExpression__Group_1_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12831:2: rule__XAdditiveExpression__Group_1_0__0
+            // InternalFormat.g:12831:1: ( rule__XAdditiveExpression__Group_1_0__0 )
+            // InternalFormat.g:12831:2: rule__XAdditiveExpression__Group_1_0__0
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1_0__0_in_rule__XAdditiveExpression__Group_1__0__Impl26420);
+            pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group_1_0__0();
 
             state._fsp--;
@@ -38374,16 +38374,16 @@ public final void rule__XAdditiveExpression__Group_1__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12841:1: rule__XAdditiveExpression__Group_1__1 : rule__XAdditiveExpression__Group_1__1__Impl ;
+    // InternalFormat.g:12841:1: rule__XAdditiveExpression__Group_1__1 : rule__XAdditiveExpression__Group_1__1__Impl ;
     public final void rule__XAdditiveExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12845:1: ( rule__XAdditiveExpression__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12846:2: rule__XAdditiveExpression__Group_1__1__Impl
+            // InternalFormat.g:12845:1: ( rule__XAdditiveExpression__Group_1__1__Impl )
+            // InternalFormat.g:12846:2: rule__XAdditiveExpression__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1__1__Impl_in_rule__XAdditiveExpression__Group_1__126450);
+            pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group_1__1__Impl();
 
             state._fsp--;
@@ -38407,25 +38407,25 @@ public final void rule__XAdditiveExpression__Group_1__1() throws RecognitionExce
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12852:1: rule__XAdditiveExpression__Group_1__1__Impl : ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) ) ;
+    // InternalFormat.g:12852:1: rule__XAdditiveExpression__Group_1__1__Impl : ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) ) ;
     public final void rule__XAdditiveExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12856:1: ( ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12857:1: ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) )
+            // InternalFormat.g:12856:1: ( ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) ) )
+            // InternalFormat.g:12857:1: ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12857:1: ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12858:1: ( rule__XAdditiveExpression__RightOperandAssignment_1_1 )
+            // InternalFormat.g:12857:1: ( ( rule__XAdditiveExpression__RightOperandAssignment_1_1 ) )
+            // InternalFormat.g:12858:1: ( rule__XAdditiveExpression__RightOperandAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getRightOperandAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12859:1: ( rule__XAdditiveExpression__RightOperandAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12859:2: rule__XAdditiveExpression__RightOperandAssignment_1_1
+            // InternalFormat.g:12859:1: ( rule__XAdditiveExpression__RightOperandAssignment_1_1 )
+            // InternalFormat.g:12859:2: rule__XAdditiveExpression__RightOperandAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__RightOperandAssignment_1_1_in_rule__XAdditiveExpression__Group_1__1__Impl26477);
+            pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__RightOperandAssignment_1_1();
 
             state._fsp--;
@@ -38458,16 +38458,16 @@ public final void rule__XAdditiveExpression__Group_1__1__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12873:1: rule__XAdditiveExpression__Group_1_0__0 : rule__XAdditiveExpression__Group_1_0__0__Impl ;
+    // InternalFormat.g:12873:1: rule__XAdditiveExpression__Group_1_0__0 : rule__XAdditiveExpression__Group_1_0__0__Impl ;
     public final void rule__XAdditiveExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12877:1: ( rule__XAdditiveExpression__Group_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12878:2: rule__XAdditiveExpression__Group_1_0__0__Impl
+            // InternalFormat.g:12877:1: ( rule__XAdditiveExpression__Group_1_0__0__Impl )
+            // InternalFormat.g:12878:2: rule__XAdditiveExpression__Group_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1_0__0__Impl_in_rule__XAdditiveExpression__Group_1_0__026511);
+            pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group_1_0__0__Impl();
 
             state._fsp--;
@@ -38491,25 +38491,25 @@ public final void rule__XAdditiveExpression__Group_1_0__0() throws RecognitionEx
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12884:1: rule__XAdditiveExpression__Group_1_0__0__Impl : ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) ) ;
+    // InternalFormat.g:12884:1: rule__XAdditiveExpression__Group_1_0__0__Impl : ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) ) ;
     public final void rule__XAdditiveExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12888:1: ( ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12889:1: ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) )
+            // InternalFormat.g:12888:1: ( ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) ) )
+            // InternalFormat.g:12889:1: ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12889:1: ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12890:1: ( rule__XAdditiveExpression__Group_1_0_0__0 )
+            // InternalFormat.g:12889:1: ( ( rule__XAdditiveExpression__Group_1_0_0__0 ) )
+            // InternalFormat.g:12890:1: ( rule__XAdditiveExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getGroup_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12891:1: ( rule__XAdditiveExpression__Group_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12891:2: rule__XAdditiveExpression__Group_1_0_0__0
+            // InternalFormat.g:12891:1: ( rule__XAdditiveExpression__Group_1_0_0__0 )
+            // InternalFormat.g:12891:2: rule__XAdditiveExpression__Group_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1_0_0__0_in_rule__XAdditiveExpression__Group_1_0__0__Impl26538);
+            pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group_1_0_0__0();
 
             state._fsp--;
@@ -38542,21 +38542,21 @@ public final void rule__XAdditiveExpression__Group_1_0__0__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1_0_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12903:1: rule__XAdditiveExpression__Group_1_0_0__0 : rule__XAdditiveExpression__Group_1_0_0__0__Impl rule__XAdditiveExpression__Group_1_0_0__1 ;
+    // InternalFormat.g:12903:1: rule__XAdditiveExpression__Group_1_0_0__0 : rule__XAdditiveExpression__Group_1_0_0__0__Impl rule__XAdditiveExpression__Group_1_0_0__1 ;
     public final void rule__XAdditiveExpression__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12907:1: ( rule__XAdditiveExpression__Group_1_0_0__0__Impl rule__XAdditiveExpression__Group_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12908:2: rule__XAdditiveExpression__Group_1_0_0__0__Impl rule__XAdditiveExpression__Group_1_0_0__1
+            // InternalFormat.g:12907:1: ( rule__XAdditiveExpression__Group_1_0_0__0__Impl rule__XAdditiveExpression__Group_1_0_0__1 )
+            // InternalFormat.g:12908:2: rule__XAdditiveExpression__Group_1_0_0__0__Impl rule__XAdditiveExpression__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1_0_0__0__Impl_in_rule__XAdditiveExpression__Group_1_0_0__026570);
+            pushFollow(FOLLOW_73);
             rule__XAdditiveExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1_0_0__1_in_rule__XAdditiveExpression__Group_1_0_0__026573);
+            pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group_1_0_0__1();
 
             state._fsp--;
@@ -38580,23 +38580,23 @@ public final void rule__XAdditiveExpression__Group_1_0_0__0() throws Recognition
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12915:1: rule__XAdditiveExpression__Group_1_0_0__0__Impl : ( () ) ;
+    // InternalFormat.g:12915:1: rule__XAdditiveExpression__Group_1_0_0__0__Impl : ( () ) ;
     public final void rule__XAdditiveExpression__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12919:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12920:1: ( () )
+            // InternalFormat.g:12919:1: ( ( () ) )
+            // InternalFormat.g:12920:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12920:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12921:1: ()
+            // InternalFormat.g:12920:1: ( () )
+            // InternalFormat.g:12921:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12922:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12924:1: 
+            // InternalFormat.g:12922:1: ()
+            // InternalFormat.g:12924:1: 
             {
             }
 
@@ -38621,16 +38621,16 @@ public final void rule__XAdditiveExpression__Group_1_0_0__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1_0_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12934:1: rule__XAdditiveExpression__Group_1_0_0__1 : rule__XAdditiveExpression__Group_1_0_0__1__Impl ;
+    // InternalFormat.g:12934:1: rule__XAdditiveExpression__Group_1_0_0__1 : rule__XAdditiveExpression__Group_1_0_0__1__Impl ;
     public final void rule__XAdditiveExpression__Group_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12938:1: ( rule__XAdditiveExpression__Group_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12939:2: rule__XAdditiveExpression__Group_1_0_0__1__Impl
+            // InternalFormat.g:12938:1: ( rule__XAdditiveExpression__Group_1_0_0__1__Impl )
+            // InternalFormat.g:12939:2: rule__XAdditiveExpression__Group_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1_0_0__1__Impl_in_rule__XAdditiveExpression__Group_1_0_0__126631);
+            pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__Group_1_0_0__1__Impl();
 
             state._fsp--;
@@ -38654,25 +38654,25 @@ public final void rule__XAdditiveExpression__Group_1_0_0__1() throws Recognition
 
 
     // $ANTLR start "rule__XAdditiveExpression__Group_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12945:1: rule__XAdditiveExpression__Group_1_0_0__1__Impl : ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) ) ;
+    // InternalFormat.g:12945:1: rule__XAdditiveExpression__Group_1_0_0__1__Impl : ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) ) ;
     public final void rule__XAdditiveExpression__Group_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12949:1: ( ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12950:1: ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalFormat.g:12949:1: ( ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) ) )
+            // InternalFormat.g:12950:1: ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12950:1: ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12951:1: ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 )
+            // InternalFormat.g:12950:1: ( ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalFormat.g:12951:1: ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getFeatureAssignment_1_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12952:1: ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12952:2: rule__XAdditiveExpression__FeatureAssignment_1_0_0_1
+            // InternalFormat.g:12952:1: ( rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 )
+            // InternalFormat.g:12952:2: rule__XAdditiveExpression__FeatureAssignment_1_0_0_1
             {
-            pushFollow(FOLLOW_rule__XAdditiveExpression__FeatureAssignment_1_0_0_1_in_rule__XAdditiveExpression__Group_1_0_0__1__Impl26658);
+            pushFollow(FOLLOW_2);
             rule__XAdditiveExpression__FeatureAssignment_1_0_0_1();
 
             state._fsp--;
@@ -38705,21 +38705,21 @@ public final void rule__XAdditiveExpression__Group_1_0_0__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12966:1: rule__XMultiplicativeExpression__Group__0 : rule__XMultiplicativeExpression__Group__0__Impl rule__XMultiplicativeExpression__Group__1 ;
+    // InternalFormat.g:12966:1: rule__XMultiplicativeExpression__Group__0 : rule__XMultiplicativeExpression__Group__0__Impl rule__XMultiplicativeExpression__Group__1 ;
     public final void rule__XMultiplicativeExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12970:1: ( rule__XMultiplicativeExpression__Group__0__Impl rule__XMultiplicativeExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12971:2: rule__XMultiplicativeExpression__Group__0__Impl rule__XMultiplicativeExpression__Group__1
+            // InternalFormat.g:12970:1: ( rule__XMultiplicativeExpression__Group__0__Impl rule__XMultiplicativeExpression__Group__1 )
+            // InternalFormat.g:12971:2: rule__XMultiplicativeExpression__Group__0__Impl rule__XMultiplicativeExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group__0__Impl_in_rule__XMultiplicativeExpression__Group__026692);
+            pushFollow(FOLLOW_75);
             rule__XMultiplicativeExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group__1_in_rule__XMultiplicativeExpression__Group__026695);
+            pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group__1();
 
             state._fsp--;
@@ -38743,22 +38743,22 @@ public final void rule__XMultiplicativeExpression__Group__0() throws Recognition
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12978:1: rule__XMultiplicativeExpression__Group__0__Impl : ( ruleXUnaryOperation ) ;
+    // InternalFormat.g:12978:1: rule__XMultiplicativeExpression__Group__0__Impl : ( ruleXUnaryOperation ) ;
     public final void rule__XMultiplicativeExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12982:1: ( ( ruleXUnaryOperation ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12983:1: ( ruleXUnaryOperation )
+            // InternalFormat.g:12982:1: ( ( ruleXUnaryOperation ) )
+            // InternalFormat.g:12983:1: ( ruleXUnaryOperation )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12983:1: ( ruleXUnaryOperation )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12984:1: ruleXUnaryOperation
+            // InternalFormat.g:12983:1: ( ruleXUnaryOperation )
+            // InternalFormat.g:12984:1: ruleXUnaryOperation
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getXUnaryOperationParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleXUnaryOperation_in_rule__XMultiplicativeExpression__Group__0__Impl26722);
+            pushFollow(FOLLOW_2);
             ruleXUnaryOperation();
 
             state._fsp--;
@@ -38788,16 +38788,16 @@ public final void rule__XMultiplicativeExpression__Group__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12995:1: rule__XMultiplicativeExpression__Group__1 : rule__XMultiplicativeExpression__Group__1__Impl ;
+    // InternalFormat.g:12995:1: rule__XMultiplicativeExpression__Group__1 : rule__XMultiplicativeExpression__Group__1__Impl ;
     public final void rule__XMultiplicativeExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12999:1: ( rule__XMultiplicativeExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13000:2: rule__XMultiplicativeExpression__Group__1__Impl
+            // InternalFormat.g:12999:1: ( rule__XMultiplicativeExpression__Group__1__Impl )
+            // InternalFormat.g:13000:2: rule__XMultiplicativeExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group__1__Impl_in_rule__XMultiplicativeExpression__Group__126751);
+            pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group__1__Impl();
 
             state._fsp--;
@@ -38821,22 +38821,22 @@ public final void rule__XMultiplicativeExpression__Group__1() throws Recognition
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13006:1: rule__XMultiplicativeExpression__Group__1__Impl : ( ( rule__XMultiplicativeExpression__Group_1__0 )* ) ;
+    // InternalFormat.g:13006:1: rule__XMultiplicativeExpression__Group__1__Impl : ( ( rule__XMultiplicativeExpression__Group_1__0 )* ) ;
     public final void rule__XMultiplicativeExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13010:1: ( ( ( rule__XMultiplicativeExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13011:1: ( ( rule__XMultiplicativeExpression__Group_1__0 )* )
+            // InternalFormat.g:13010:1: ( ( ( rule__XMultiplicativeExpression__Group_1__0 )* ) )
+            // InternalFormat.g:13011:1: ( ( rule__XMultiplicativeExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13011:1: ( ( rule__XMultiplicativeExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13012:1: ( rule__XMultiplicativeExpression__Group_1__0 )*
+            // InternalFormat.g:13011:1: ( ( rule__XMultiplicativeExpression__Group_1__0 )* )
+            // InternalFormat.g:13012:1: ( rule__XMultiplicativeExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13013:1: ( rule__XMultiplicativeExpression__Group_1__0 )*
+            // InternalFormat.g:13013:1: ( rule__XMultiplicativeExpression__Group_1__0 )*
             loop110:
             do {
                 int alt110=2;
@@ -38890,9 +38890,9 @@ public final void rule__XMultiplicativeExpression__Group__1__Impl() throws Recog
 
                 switch (alt110) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13013:2: rule__XMultiplicativeExpression__Group_1__0
+            	    // InternalFormat.g:13013:2: rule__XMultiplicativeExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1__0_in_rule__XMultiplicativeExpression__Group__1__Impl26778);
+            	    pushFollow(FOLLOW_76);
             	    rule__XMultiplicativeExpression__Group_1__0();
 
             	    state._fsp--;
@@ -38931,21 +38931,21 @@ public final void rule__XMultiplicativeExpression__Group__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13027:1: rule__XMultiplicativeExpression__Group_1__0 : rule__XMultiplicativeExpression__Group_1__0__Impl rule__XMultiplicativeExpression__Group_1__1 ;
+    // InternalFormat.g:13027:1: rule__XMultiplicativeExpression__Group_1__0 : rule__XMultiplicativeExpression__Group_1__0__Impl rule__XMultiplicativeExpression__Group_1__1 ;
     public final void rule__XMultiplicativeExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13031:1: ( rule__XMultiplicativeExpression__Group_1__0__Impl rule__XMultiplicativeExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13032:2: rule__XMultiplicativeExpression__Group_1__0__Impl rule__XMultiplicativeExpression__Group_1__1
+            // InternalFormat.g:13031:1: ( rule__XMultiplicativeExpression__Group_1__0__Impl rule__XMultiplicativeExpression__Group_1__1 )
+            // InternalFormat.g:13032:2: rule__XMultiplicativeExpression__Group_1__0__Impl rule__XMultiplicativeExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1__0__Impl_in_rule__XMultiplicativeExpression__Group_1__026813);
+            pushFollow(FOLLOW_50);
             rule__XMultiplicativeExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1__1_in_rule__XMultiplicativeExpression__Group_1__026816);
+            pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group_1__1();
 
             state._fsp--;
@@ -38969,25 +38969,25 @@ public final void rule__XMultiplicativeExpression__Group_1__0() throws Recogniti
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13039:1: rule__XMultiplicativeExpression__Group_1__0__Impl : ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) ) ;
+    // InternalFormat.g:13039:1: rule__XMultiplicativeExpression__Group_1__0__Impl : ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) ) ;
     public final void rule__XMultiplicativeExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13043:1: ( ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13044:1: ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) )
+            // InternalFormat.g:13043:1: ( ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) ) )
+            // InternalFormat.g:13044:1: ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13044:1: ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13045:1: ( rule__XMultiplicativeExpression__Group_1_0__0 )
+            // InternalFormat.g:13044:1: ( ( rule__XMultiplicativeExpression__Group_1_0__0 ) )
+            // InternalFormat.g:13045:1: ( rule__XMultiplicativeExpression__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getGroup_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13046:1: ( rule__XMultiplicativeExpression__Group_1_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13046:2: rule__XMultiplicativeExpression__Group_1_0__0
+            // InternalFormat.g:13046:1: ( rule__XMultiplicativeExpression__Group_1_0__0 )
+            // InternalFormat.g:13046:2: rule__XMultiplicativeExpression__Group_1_0__0
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1_0__0_in_rule__XMultiplicativeExpression__Group_1__0__Impl26843);
+            pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group_1_0__0();
 
             state._fsp--;
@@ -39020,16 +39020,16 @@ public final void rule__XMultiplicativeExpression__Group_1__0__Impl() throws Rec
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13056:1: rule__XMultiplicativeExpression__Group_1__1 : rule__XMultiplicativeExpression__Group_1__1__Impl ;
+    // InternalFormat.g:13056:1: rule__XMultiplicativeExpression__Group_1__1 : rule__XMultiplicativeExpression__Group_1__1__Impl ;
     public final void rule__XMultiplicativeExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13060:1: ( rule__XMultiplicativeExpression__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13061:2: rule__XMultiplicativeExpression__Group_1__1__Impl
+            // InternalFormat.g:13060:1: ( rule__XMultiplicativeExpression__Group_1__1__Impl )
+            // InternalFormat.g:13061:2: rule__XMultiplicativeExpression__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1__1__Impl_in_rule__XMultiplicativeExpression__Group_1__126873);
+            pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group_1__1__Impl();
 
             state._fsp--;
@@ -39053,25 +39053,25 @@ public final void rule__XMultiplicativeExpression__Group_1__1() throws Recogniti
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13067:1: rule__XMultiplicativeExpression__Group_1__1__Impl : ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) ) ;
+    // InternalFormat.g:13067:1: rule__XMultiplicativeExpression__Group_1__1__Impl : ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) ) ;
     public final void rule__XMultiplicativeExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13071:1: ( ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13072:1: ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) )
+            // InternalFormat.g:13071:1: ( ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) ) )
+            // InternalFormat.g:13072:1: ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13072:1: ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13073:1: ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 )
+            // InternalFormat.g:13072:1: ( ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 ) )
+            // InternalFormat.g:13073:1: ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getRightOperandAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13074:1: ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13074:2: rule__XMultiplicativeExpression__RightOperandAssignment_1_1
+            // InternalFormat.g:13074:1: ( rule__XMultiplicativeExpression__RightOperandAssignment_1_1 )
+            // InternalFormat.g:13074:2: rule__XMultiplicativeExpression__RightOperandAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__RightOperandAssignment_1_1_in_rule__XMultiplicativeExpression__Group_1__1__Impl26900);
+            pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__RightOperandAssignment_1_1();
 
             state._fsp--;
@@ -39104,16 +39104,16 @@ public final void rule__XMultiplicativeExpression__Group_1__1__Impl() throws Rec
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13088:1: rule__XMultiplicativeExpression__Group_1_0__0 : rule__XMultiplicativeExpression__Group_1_0__0__Impl ;
+    // InternalFormat.g:13088:1: rule__XMultiplicativeExpression__Group_1_0__0 : rule__XMultiplicativeExpression__Group_1_0__0__Impl ;
     public final void rule__XMultiplicativeExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13092:1: ( rule__XMultiplicativeExpression__Group_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13093:2: rule__XMultiplicativeExpression__Group_1_0__0__Impl
+            // InternalFormat.g:13092:1: ( rule__XMultiplicativeExpression__Group_1_0__0__Impl )
+            // InternalFormat.g:13093:2: rule__XMultiplicativeExpression__Group_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1_0__0__Impl_in_rule__XMultiplicativeExpression__Group_1_0__026934);
+            pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group_1_0__0__Impl();
 
             state._fsp--;
@@ -39137,25 +39137,25 @@ public final void rule__XMultiplicativeExpression__Group_1_0__0() throws Recogni
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13099:1: rule__XMultiplicativeExpression__Group_1_0__0__Impl : ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) ) ;
+    // InternalFormat.g:13099:1: rule__XMultiplicativeExpression__Group_1_0__0__Impl : ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) ) ;
     public final void rule__XMultiplicativeExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13103:1: ( ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13104:1: ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) )
+            // InternalFormat.g:13103:1: ( ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) ) )
+            // InternalFormat.g:13104:1: ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13104:1: ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13105:1: ( rule__XMultiplicativeExpression__Group_1_0_0__0 )
+            // InternalFormat.g:13104:1: ( ( rule__XMultiplicativeExpression__Group_1_0_0__0 ) )
+            // InternalFormat.g:13105:1: ( rule__XMultiplicativeExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getGroup_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13106:1: ( rule__XMultiplicativeExpression__Group_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13106:2: rule__XMultiplicativeExpression__Group_1_0_0__0
+            // InternalFormat.g:13106:1: ( rule__XMultiplicativeExpression__Group_1_0_0__0 )
+            // InternalFormat.g:13106:2: rule__XMultiplicativeExpression__Group_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1_0_0__0_in_rule__XMultiplicativeExpression__Group_1_0__0__Impl26961);
+            pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group_1_0_0__0();
 
             state._fsp--;
@@ -39188,21 +39188,21 @@ public final void rule__XMultiplicativeExpression__Group_1_0__0__Impl() throws R
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1_0_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13118:1: rule__XMultiplicativeExpression__Group_1_0_0__0 : rule__XMultiplicativeExpression__Group_1_0_0__0__Impl rule__XMultiplicativeExpression__Group_1_0_0__1 ;
+    // InternalFormat.g:13118:1: rule__XMultiplicativeExpression__Group_1_0_0__0 : rule__XMultiplicativeExpression__Group_1_0_0__0__Impl rule__XMultiplicativeExpression__Group_1_0_0__1 ;
     public final void rule__XMultiplicativeExpression__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13122:1: ( rule__XMultiplicativeExpression__Group_1_0_0__0__Impl rule__XMultiplicativeExpression__Group_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13123:2: rule__XMultiplicativeExpression__Group_1_0_0__0__Impl rule__XMultiplicativeExpression__Group_1_0_0__1
+            // InternalFormat.g:13122:1: ( rule__XMultiplicativeExpression__Group_1_0_0__0__Impl rule__XMultiplicativeExpression__Group_1_0_0__1 )
+            // InternalFormat.g:13123:2: rule__XMultiplicativeExpression__Group_1_0_0__0__Impl rule__XMultiplicativeExpression__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1_0_0__0__Impl_in_rule__XMultiplicativeExpression__Group_1_0_0__026993);
+            pushFollow(FOLLOW_75);
             rule__XMultiplicativeExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1_0_0__1_in_rule__XMultiplicativeExpression__Group_1_0_0__026996);
+            pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group_1_0_0__1();
 
             state._fsp--;
@@ -39226,23 +39226,23 @@ public final void rule__XMultiplicativeExpression__Group_1_0_0__0() throws Recog
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13130:1: rule__XMultiplicativeExpression__Group_1_0_0__0__Impl : ( () ) ;
+    // InternalFormat.g:13130:1: rule__XMultiplicativeExpression__Group_1_0_0__0__Impl : ( () ) ;
     public final void rule__XMultiplicativeExpression__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13134:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13135:1: ( () )
+            // InternalFormat.g:13134:1: ( ( () ) )
+            // InternalFormat.g:13135:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13135:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13136:1: ()
+            // InternalFormat.g:13135:1: ( () )
+            // InternalFormat.g:13136:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13137:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13139:1: 
+            // InternalFormat.g:13137:1: ()
+            // InternalFormat.g:13139:1: 
             {
             }
 
@@ -39267,16 +39267,16 @@ public final void rule__XMultiplicativeExpression__Group_1_0_0__0__Impl() throws
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1_0_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13149:1: rule__XMultiplicativeExpression__Group_1_0_0__1 : rule__XMultiplicativeExpression__Group_1_0_0__1__Impl ;
+    // InternalFormat.g:13149:1: rule__XMultiplicativeExpression__Group_1_0_0__1 : rule__XMultiplicativeExpression__Group_1_0_0__1__Impl ;
     public final void rule__XMultiplicativeExpression__Group_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13153:1: ( rule__XMultiplicativeExpression__Group_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13154:2: rule__XMultiplicativeExpression__Group_1_0_0__1__Impl
+            // InternalFormat.g:13153:1: ( rule__XMultiplicativeExpression__Group_1_0_0__1__Impl )
+            // InternalFormat.g:13154:2: rule__XMultiplicativeExpression__Group_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1_0_0__1__Impl_in_rule__XMultiplicativeExpression__Group_1_0_0__127054);
+            pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__Group_1_0_0__1__Impl();
 
             state._fsp--;
@@ -39300,25 +39300,25 @@ public final void rule__XMultiplicativeExpression__Group_1_0_0__1() throws Recog
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__Group_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13160:1: rule__XMultiplicativeExpression__Group_1_0_0__1__Impl : ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) ) ;
+    // InternalFormat.g:13160:1: rule__XMultiplicativeExpression__Group_1_0_0__1__Impl : ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) ) ;
     public final void rule__XMultiplicativeExpression__Group_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13164:1: ( ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13165:1: ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalFormat.g:13164:1: ( ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) ) )
+            // InternalFormat.g:13165:1: ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13165:1: ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13166:1: ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 )
+            // InternalFormat.g:13165:1: ( ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 ) )
+            // InternalFormat.g:13166:1: ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getFeatureAssignment_1_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13167:1: ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13167:2: rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1
+            // InternalFormat.g:13167:1: ( rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 )
+            // InternalFormat.g:13167:2: rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1
             {
-            pushFollow(FOLLOW_rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1_in_rule__XMultiplicativeExpression__Group_1_0_0__1__Impl27081);
+            pushFollow(FOLLOW_2);
             rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1();
 
             state._fsp--;
@@ -39351,21 +39351,21 @@ public final void rule__XMultiplicativeExpression__Group_1_0_0__1__Impl() throws
 
 
     // $ANTLR start "rule__XUnaryOperation__Group_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13181:1: rule__XUnaryOperation__Group_0__0 : rule__XUnaryOperation__Group_0__0__Impl rule__XUnaryOperation__Group_0__1 ;
+    // InternalFormat.g:13181:1: rule__XUnaryOperation__Group_0__0 : rule__XUnaryOperation__Group_0__0__Impl rule__XUnaryOperation__Group_0__1 ;
     public final void rule__XUnaryOperation__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13185:1: ( rule__XUnaryOperation__Group_0__0__Impl rule__XUnaryOperation__Group_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13186:2: rule__XUnaryOperation__Group_0__0__Impl rule__XUnaryOperation__Group_0__1
+            // InternalFormat.g:13185:1: ( rule__XUnaryOperation__Group_0__0__Impl rule__XUnaryOperation__Group_0__1 )
+            // InternalFormat.g:13186:2: rule__XUnaryOperation__Group_0__0__Impl rule__XUnaryOperation__Group_0__1
             {
-            pushFollow(FOLLOW_rule__XUnaryOperation__Group_0__0__Impl_in_rule__XUnaryOperation__Group_0__027115);
+            pushFollow(FOLLOW_77);
             rule__XUnaryOperation__Group_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XUnaryOperation__Group_0__1_in_rule__XUnaryOperation__Group_0__027118);
+            pushFollow(FOLLOW_2);
             rule__XUnaryOperation__Group_0__1();
 
             state._fsp--;
@@ -39389,23 +39389,23 @@ public final void rule__XUnaryOperation__Group_0__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XUnaryOperation__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13193:1: rule__XUnaryOperation__Group_0__0__Impl : ( () ) ;
+    // InternalFormat.g:13193:1: rule__XUnaryOperation__Group_0__0__Impl : ( () ) ;
     public final void rule__XUnaryOperation__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13197:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13198:1: ( () )
+            // InternalFormat.g:13197:1: ( ( () ) )
+            // InternalFormat.g:13198:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13198:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13199:1: ()
+            // InternalFormat.g:13198:1: ( () )
+            // InternalFormat.g:13199:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationAccess().getXUnaryOperationAction_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13200:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13202:1: 
+            // InternalFormat.g:13200:1: ()
+            // InternalFormat.g:13202:1: 
             {
             }
 
@@ -39430,21 +39430,21 @@ public final void rule__XUnaryOperation__Group_0__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XUnaryOperation__Group_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13212:1: rule__XUnaryOperation__Group_0__1 : rule__XUnaryOperation__Group_0__1__Impl rule__XUnaryOperation__Group_0__2 ;
+    // InternalFormat.g:13212:1: rule__XUnaryOperation__Group_0__1 : rule__XUnaryOperation__Group_0__1__Impl rule__XUnaryOperation__Group_0__2 ;
     public final void rule__XUnaryOperation__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13216:1: ( rule__XUnaryOperation__Group_0__1__Impl rule__XUnaryOperation__Group_0__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13217:2: rule__XUnaryOperation__Group_0__1__Impl rule__XUnaryOperation__Group_0__2
+            // InternalFormat.g:13216:1: ( rule__XUnaryOperation__Group_0__1__Impl rule__XUnaryOperation__Group_0__2 )
+            // InternalFormat.g:13217:2: rule__XUnaryOperation__Group_0__1__Impl rule__XUnaryOperation__Group_0__2
             {
-            pushFollow(FOLLOW_rule__XUnaryOperation__Group_0__1__Impl_in_rule__XUnaryOperation__Group_0__127176);
+            pushFollow(FOLLOW_50);
             rule__XUnaryOperation__Group_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XUnaryOperation__Group_0__2_in_rule__XUnaryOperation__Group_0__127179);
+            pushFollow(FOLLOW_2);
             rule__XUnaryOperation__Group_0__2();
 
             state._fsp--;
@@ -39468,25 +39468,25 @@ public final void rule__XUnaryOperation__Group_0__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XUnaryOperation__Group_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13224:1: rule__XUnaryOperation__Group_0__1__Impl : ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) ) ;
+    // InternalFormat.g:13224:1: rule__XUnaryOperation__Group_0__1__Impl : ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) ) ;
     public final void rule__XUnaryOperation__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13228:1: ( ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13229:1: ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) )
+            // InternalFormat.g:13228:1: ( ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) ) )
+            // InternalFormat.g:13229:1: ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13229:1: ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13230:1: ( rule__XUnaryOperation__FeatureAssignment_0_1 )
+            // InternalFormat.g:13229:1: ( ( rule__XUnaryOperation__FeatureAssignment_0_1 ) )
+            // InternalFormat.g:13230:1: ( rule__XUnaryOperation__FeatureAssignment_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationAccess().getFeatureAssignment_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13231:1: ( rule__XUnaryOperation__FeatureAssignment_0_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13231:2: rule__XUnaryOperation__FeatureAssignment_0_1
+            // InternalFormat.g:13231:1: ( rule__XUnaryOperation__FeatureAssignment_0_1 )
+            // InternalFormat.g:13231:2: rule__XUnaryOperation__FeatureAssignment_0_1
             {
-            pushFollow(FOLLOW_rule__XUnaryOperation__FeatureAssignment_0_1_in_rule__XUnaryOperation__Group_0__1__Impl27206);
+            pushFollow(FOLLOW_2);
             rule__XUnaryOperation__FeatureAssignment_0_1();
 
             state._fsp--;
@@ -39519,16 +39519,16 @@ public final void rule__XUnaryOperation__Group_0__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XUnaryOperation__Group_0__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13241:1: rule__XUnaryOperation__Group_0__2 : rule__XUnaryOperation__Group_0__2__Impl ;
+    // InternalFormat.g:13241:1: rule__XUnaryOperation__Group_0__2 : rule__XUnaryOperation__Group_0__2__Impl ;
     public final void rule__XUnaryOperation__Group_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13245:1: ( rule__XUnaryOperation__Group_0__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13246:2: rule__XUnaryOperation__Group_0__2__Impl
+            // InternalFormat.g:13245:1: ( rule__XUnaryOperation__Group_0__2__Impl )
+            // InternalFormat.g:13246:2: rule__XUnaryOperation__Group_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__XUnaryOperation__Group_0__2__Impl_in_rule__XUnaryOperation__Group_0__227236);
+            pushFollow(FOLLOW_2);
             rule__XUnaryOperation__Group_0__2__Impl();
 
             state._fsp--;
@@ -39552,25 +39552,25 @@ public final void rule__XUnaryOperation__Group_0__2() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XUnaryOperation__Group_0__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13252:1: rule__XUnaryOperation__Group_0__2__Impl : ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) ) ;
+    // InternalFormat.g:13252:1: rule__XUnaryOperation__Group_0__2__Impl : ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) ) ;
     public final void rule__XUnaryOperation__Group_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13256:1: ( ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13257:1: ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) )
+            // InternalFormat.g:13256:1: ( ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) ) )
+            // InternalFormat.g:13257:1: ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13257:1: ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13258:1: ( rule__XUnaryOperation__OperandAssignment_0_2 )
+            // InternalFormat.g:13257:1: ( ( rule__XUnaryOperation__OperandAssignment_0_2 ) )
+            // InternalFormat.g:13258:1: ( rule__XUnaryOperation__OperandAssignment_0_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationAccess().getOperandAssignment_0_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13259:1: ( rule__XUnaryOperation__OperandAssignment_0_2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13259:2: rule__XUnaryOperation__OperandAssignment_0_2
+            // InternalFormat.g:13259:1: ( rule__XUnaryOperation__OperandAssignment_0_2 )
+            // InternalFormat.g:13259:2: rule__XUnaryOperation__OperandAssignment_0_2
             {
-            pushFollow(FOLLOW_rule__XUnaryOperation__OperandAssignment_0_2_in_rule__XUnaryOperation__Group_0__2__Impl27263);
+            pushFollow(FOLLOW_2);
             rule__XUnaryOperation__OperandAssignment_0_2();
 
             state._fsp--;
@@ -39603,21 +39603,21 @@ public final void rule__XUnaryOperation__Group_0__2__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XCastedExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13275:1: rule__XCastedExpression__Group__0 : rule__XCastedExpression__Group__0__Impl rule__XCastedExpression__Group__1 ;
+    // InternalFormat.g:13275:1: rule__XCastedExpression__Group__0 : rule__XCastedExpression__Group__0__Impl rule__XCastedExpression__Group__1 ;
     public final void rule__XCastedExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13279:1: ( rule__XCastedExpression__Group__0__Impl rule__XCastedExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13280:2: rule__XCastedExpression__Group__0__Impl rule__XCastedExpression__Group__1
+            // InternalFormat.g:13279:1: ( rule__XCastedExpression__Group__0__Impl rule__XCastedExpression__Group__1 )
+            // InternalFormat.g:13280:2: rule__XCastedExpression__Group__0__Impl rule__XCastedExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__Group__0__Impl_in_rule__XCastedExpression__Group__027299);
+            pushFollow(FOLLOW_78);
             rule__XCastedExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCastedExpression__Group__1_in_rule__XCastedExpression__Group__027302);
+            pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group__1();
 
             state._fsp--;
@@ -39641,22 +39641,22 @@ public final void rule__XCastedExpression__Group__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XCastedExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13287:1: rule__XCastedExpression__Group__0__Impl : ( ruleXPostfixOperation ) ;
+    // InternalFormat.g:13287:1: rule__XCastedExpression__Group__0__Impl : ( ruleXPostfixOperation ) ;
     public final void rule__XCastedExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13291:1: ( ( ruleXPostfixOperation ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13292:1: ( ruleXPostfixOperation )
+            // InternalFormat.g:13291:1: ( ( ruleXPostfixOperation ) )
+            // InternalFormat.g:13292:1: ( ruleXPostfixOperation )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13292:1: ( ruleXPostfixOperation )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13293:1: ruleXPostfixOperation
+            // InternalFormat.g:13292:1: ( ruleXPostfixOperation )
+            // InternalFormat.g:13293:1: ruleXPostfixOperation
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getXPostfixOperationParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleXPostfixOperation_in_rule__XCastedExpression__Group__0__Impl27329);
+            pushFollow(FOLLOW_2);
             ruleXPostfixOperation();
 
             state._fsp--;
@@ -39686,16 +39686,16 @@ public final void rule__XCastedExpression__Group__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XCastedExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13304:1: rule__XCastedExpression__Group__1 : rule__XCastedExpression__Group__1__Impl ;
+    // InternalFormat.g:13304:1: rule__XCastedExpression__Group__1 : rule__XCastedExpression__Group__1__Impl ;
     public final void rule__XCastedExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13308:1: ( rule__XCastedExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13309:2: rule__XCastedExpression__Group__1__Impl
+            // InternalFormat.g:13308:1: ( rule__XCastedExpression__Group__1__Impl )
+            // InternalFormat.g:13309:2: rule__XCastedExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__Group__1__Impl_in_rule__XCastedExpression__Group__127358);
+            pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group__1__Impl();
 
             state._fsp--;
@@ -39719,22 +39719,22 @@ public final void rule__XCastedExpression__Group__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XCastedExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13315:1: rule__XCastedExpression__Group__1__Impl : ( ( rule__XCastedExpression__Group_1__0 )* ) ;
+    // InternalFormat.g:13315:1: rule__XCastedExpression__Group__1__Impl : ( ( rule__XCastedExpression__Group_1__0 )* ) ;
     public final void rule__XCastedExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13319:1: ( ( ( rule__XCastedExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13320:1: ( ( rule__XCastedExpression__Group_1__0 )* )
+            // InternalFormat.g:13319:1: ( ( ( rule__XCastedExpression__Group_1__0 )* ) )
+            // InternalFormat.g:13320:1: ( ( rule__XCastedExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13320:1: ( ( rule__XCastedExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13321:1: ( rule__XCastedExpression__Group_1__0 )*
+            // InternalFormat.g:13320:1: ( ( rule__XCastedExpression__Group_1__0 )* )
+            // InternalFormat.g:13321:1: ( rule__XCastedExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13322:1: ( rule__XCastedExpression__Group_1__0 )*
+            // InternalFormat.g:13322:1: ( rule__XCastedExpression__Group_1__0 )*
             loop111:
             do {
                 int alt111=2;
@@ -39753,9 +39753,9 @@ public final void rule__XCastedExpression__Group__1__Impl() throws RecognitionEx
 
                 switch (alt111) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13322:2: rule__XCastedExpression__Group_1__0
+            	    // InternalFormat.g:13322:2: rule__XCastedExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XCastedExpression__Group_1__0_in_rule__XCastedExpression__Group__1__Impl27385);
+            	    pushFollow(FOLLOW_79);
             	    rule__XCastedExpression__Group_1__0();
 
             	    state._fsp--;
@@ -39794,21 +39794,21 @@ public final void rule__XCastedExpression__Group__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13336:1: rule__XCastedExpression__Group_1__0 : rule__XCastedExpression__Group_1__0__Impl rule__XCastedExpression__Group_1__1 ;
+    // InternalFormat.g:13336:1: rule__XCastedExpression__Group_1__0 : rule__XCastedExpression__Group_1__0__Impl rule__XCastedExpression__Group_1__1 ;
     public final void rule__XCastedExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13340:1: ( rule__XCastedExpression__Group_1__0__Impl rule__XCastedExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13341:2: rule__XCastedExpression__Group_1__0__Impl rule__XCastedExpression__Group_1__1
+            // InternalFormat.g:13340:1: ( rule__XCastedExpression__Group_1__0__Impl rule__XCastedExpression__Group_1__1 )
+            // InternalFormat.g:13341:2: rule__XCastedExpression__Group_1__0__Impl rule__XCastedExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__Group_1__0__Impl_in_rule__XCastedExpression__Group_1__027420);
+            pushFollow(FOLLOW_66);
             rule__XCastedExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCastedExpression__Group_1__1_in_rule__XCastedExpression__Group_1__027423);
+            pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group_1__1();
 
             state._fsp--;
@@ -39832,25 +39832,25 @@ public final void rule__XCastedExpression__Group_1__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13348:1: rule__XCastedExpression__Group_1__0__Impl : ( ( rule__XCastedExpression__Group_1_0__0 ) ) ;
+    // InternalFormat.g:13348:1: rule__XCastedExpression__Group_1__0__Impl : ( ( rule__XCastedExpression__Group_1_0__0 ) ) ;
     public final void rule__XCastedExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13352:1: ( ( ( rule__XCastedExpression__Group_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13353:1: ( ( rule__XCastedExpression__Group_1_0__0 ) )
+            // InternalFormat.g:13352:1: ( ( ( rule__XCastedExpression__Group_1_0__0 ) ) )
+            // InternalFormat.g:13353:1: ( ( rule__XCastedExpression__Group_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13353:1: ( ( rule__XCastedExpression__Group_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13354:1: ( rule__XCastedExpression__Group_1_0__0 )
+            // InternalFormat.g:13353:1: ( ( rule__XCastedExpression__Group_1_0__0 ) )
+            // InternalFormat.g:13354:1: ( rule__XCastedExpression__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getGroup_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13355:1: ( rule__XCastedExpression__Group_1_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13355:2: rule__XCastedExpression__Group_1_0__0
+            // InternalFormat.g:13355:1: ( rule__XCastedExpression__Group_1_0__0 )
+            // InternalFormat.g:13355:2: rule__XCastedExpression__Group_1_0__0
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__Group_1_0__0_in_rule__XCastedExpression__Group_1__0__Impl27450);
+            pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group_1_0__0();
 
             state._fsp--;
@@ -39883,16 +39883,16 @@ public final void rule__XCastedExpression__Group_1__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13365:1: rule__XCastedExpression__Group_1__1 : rule__XCastedExpression__Group_1__1__Impl ;
+    // InternalFormat.g:13365:1: rule__XCastedExpression__Group_1__1 : rule__XCastedExpression__Group_1__1__Impl ;
     public final void rule__XCastedExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13369:1: ( rule__XCastedExpression__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13370:2: rule__XCastedExpression__Group_1__1__Impl
+            // InternalFormat.g:13369:1: ( rule__XCastedExpression__Group_1__1__Impl )
+            // InternalFormat.g:13370:2: rule__XCastedExpression__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__Group_1__1__Impl_in_rule__XCastedExpression__Group_1__127480);
+            pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group_1__1__Impl();
 
             state._fsp--;
@@ -39916,25 +39916,25 @@ public final void rule__XCastedExpression__Group_1__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13376:1: rule__XCastedExpression__Group_1__1__Impl : ( ( rule__XCastedExpression__TypeAssignment_1_1 ) ) ;
+    // InternalFormat.g:13376:1: rule__XCastedExpression__Group_1__1__Impl : ( ( rule__XCastedExpression__TypeAssignment_1_1 ) ) ;
     public final void rule__XCastedExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13380:1: ( ( ( rule__XCastedExpression__TypeAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13381:1: ( ( rule__XCastedExpression__TypeAssignment_1_1 ) )
+            // InternalFormat.g:13380:1: ( ( ( rule__XCastedExpression__TypeAssignment_1_1 ) ) )
+            // InternalFormat.g:13381:1: ( ( rule__XCastedExpression__TypeAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13381:1: ( ( rule__XCastedExpression__TypeAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13382:1: ( rule__XCastedExpression__TypeAssignment_1_1 )
+            // InternalFormat.g:13381:1: ( ( rule__XCastedExpression__TypeAssignment_1_1 ) )
+            // InternalFormat.g:13382:1: ( rule__XCastedExpression__TypeAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getTypeAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13383:1: ( rule__XCastedExpression__TypeAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13383:2: rule__XCastedExpression__TypeAssignment_1_1
+            // InternalFormat.g:13383:1: ( rule__XCastedExpression__TypeAssignment_1_1 )
+            // InternalFormat.g:13383:2: rule__XCastedExpression__TypeAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__TypeAssignment_1_1_in_rule__XCastedExpression__Group_1__1__Impl27507);
+            pushFollow(FOLLOW_2);
             rule__XCastedExpression__TypeAssignment_1_1();
 
             state._fsp--;
@@ -39967,16 +39967,16 @@ public final void rule__XCastedExpression__Group_1__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13397:1: rule__XCastedExpression__Group_1_0__0 : rule__XCastedExpression__Group_1_0__0__Impl ;
+    // InternalFormat.g:13397:1: rule__XCastedExpression__Group_1_0__0 : rule__XCastedExpression__Group_1_0__0__Impl ;
     public final void rule__XCastedExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13401:1: ( rule__XCastedExpression__Group_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13402:2: rule__XCastedExpression__Group_1_0__0__Impl
+            // InternalFormat.g:13401:1: ( rule__XCastedExpression__Group_1_0__0__Impl )
+            // InternalFormat.g:13402:2: rule__XCastedExpression__Group_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__Group_1_0__0__Impl_in_rule__XCastedExpression__Group_1_0__027541);
+            pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group_1_0__0__Impl();
 
             state._fsp--;
@@ -40000,25 +40000,25 @@ public final void rule__XCastedExpression__Group_1_0__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13408:1: rule__XCastedExpression__Group_1_0__0__Impl : ( ( rule__XCastedExpression__Group_1_0_0__0 ) ) ;
+    // InternalFormat.g:13408:1: rule__XCastedExpression__Group_1_0__0__Impl : ( ( rule__XCastedExpression__Group_1_0_0__0 ) ) ;
     public final void rule__XCastedExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13412:1: ( ( ( rule__XCastedExpression__Group_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13413:1: ( ( rule__XCastedExpression__Group_1_0_0__0 ) )
+            // InternalFormat.g:13412:1: ( ( ( rule__XCastedExpression__Group_1_0_0__0 ) ) )
+            // InternalFormat.g:13413:1: ( ( rule__XCastedExpression__Group_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13413:1: ( ( rule__XCastedExpression__Group_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13414:1: ( rule__XCastedExpression__Group_1_0_0__0 )
+            // InternalFormat.g:13413:1: ( ( rule__XCastedExpression__Group_1_0_0__0 ) )
+            // InternalFormat.g:13414:1: ( rule__XCastedExpression__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getGroup_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13415:1: ( rule__XCastedExpression__Group_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13415:2: rule__XCastedExpression__Group_1_0_0__0
+            // InternalFormat.g:13415:1: ( rule__XCastedExpression__Group_1_0_0__0 )
+            // InternalFormat.g:13415:2: rule__XCastedExpression__Group_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__Group_1_0_0__0_in_rule__XCastedExpression__Group_1_0__0__Impl27568);
+            pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group_1_0_0__0();
 
             state._fsp--;
@@ -40051,21 +40051,21 @@ public final void rule__XCastedExpression__Group_1_0__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1_0_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13427:1: rule__XCastedExpression__Group_1_0_0__0 : rule__XCastedExpression__Group_1_0_0__0__Impl rule__XCastedExpression__Group_1_0_0__1 ;
+    // InternalFormat.g:13427:1: rule__XCastedExpression__Group_1_0_0__0 : rule__XCastedExpression__Group_1_0_0__0__Impl rule__XCastedExpression__Group_1_0_0__1 ;
     public final void rule__XCastedExpression__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13431:1: ( rule__XCastedExpression__Group_1_0_0__0__Impl rule__XCastedExpression__Group_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13432:2: rule__XCastedExpression__Group_1_0_0__0__Impl rule__XCastedExpression__Group_1_0_0__1
+            // InternalFormat.g:13431:1: ( rule__XCastedExpression__Group_1_0_0__0__Impl rule__XCastedExpression__Group_1_0_0__1 )
+            // InternalFormat.g:13432:2: rule__XCastedExpression__Group_1_0_0__0__Impl rule__XCastedExpression__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__Group_1_0_0__0__Impl_in_rule__XCastedExpression__Group_1_0_0__027600);
+            pushFollow(FOLLOW_78);
             rule__XCastedExpression__Group_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCastedExpression__Group_1_0_0__1_in_rule__XCastedExpression__Group_1_0_0__027603);
+            pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group_1_0_0__1();
 
             state._fsp--;
@@ -40089,23 +40089,23 @@ public final void rule__XCastedExpression__Group_1_0_0__0() throws RecognitionEx
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13439:1: rule__XCastedExpression__Group_1_0_0__0__Impl : ( () ) ;
+    // InternalFormat.g:13439:1: rule__XCastedExpression__Group_1_0_0__0__Impl : ( () ) ;
     public final void rule__XCastedExpression__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13443:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13444:1: ( () )
+            // InternalFormat.g:13443:1: ( ( () ) )
+            // InternalFormat.g:13444:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13444:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13445:1: ()
+            // InternalFormat.g:13444:1: ( () )
+            // InternalFormat.g:13445:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getXCastedExpressionTargetAction_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13446:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13448:1: 
+            // InternalFormat.g:13446:1: ()
+            // InternalFormat.g:13448:1: 
             {
             }
 
@@ -40130,16 +40130,16 @@ public final void rule__XCastedExpression__Group_1_0_0__0__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1_0_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13458:1: rule__XCastedExpression__Group_1_0_0__1 : rule__XCastedExpression__Group_1_0_0__1__Impl ;
+    // InternalFormat.g:13458:1: rule__XCastedExpression__Group_1_0_0__1 : rule__XCastedExpression__Group_1_0_0__1__Impl ;
     public final void rule__XCastedExpression__Group_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13462:1: ( rule__XCastedExpression__Group_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13463:2: rule__XCastedExpression__Group_1_0_0__1__Impl
+            // InternalFormat.g:13462:1: ( rule__XCastedExpression__Group_1_0_0__1__Impl )
+            // InternalFormat.g:13463:2: rule__XCastedExpression__Group_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XCastedExpression__Group_1_0_0__1__Impl_in_rule__XCastedExpression__Group_1_0_0__127661);
+            pushFollow(FOLLOW_2);
             rule__XCastedExpression__Group_1_0_0__1__Impl();
 
             state._fsp--;
@@ -40163,22 +40163,22 @@ public final void rule__XCastedExpression__Group_1_0_0__1() throws RecognitionEx
 
 
     // $ANTLR start "rule__XCastedExpression__Group_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13469:1: rule__XCastedExpression__Group_1_0_0__1__Impl : ( 'as' ) ;
+    // InternalFormat.g:13469:1: rule__XCastedExpression__Group_1_0_0__1__Impl : ( 'as' ) ;
     public final void rule__XCastedExpression__Group_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13473:1: ( ( 'as' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13474:1: ( 'as' )
+            // InternalFormat.g:13473:1: ( ( 'as' ) )
+            // InternalFormat.g:13474:1: ( 'as' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13474:1: ( 'as' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13475:1: 'as'
+            // InternalFormat.g:13474:1: ( 'as' )
+            // InternalFormat.g:13475:1: 'as'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getAsKeyword_1_0_0_1()); 
             }
-            match(input,86,FOLLOW_86_in_rule__XCastedExpression__Group_1_0_0__1__Impl27689); if (state.failed) return ;
+            match(input,86,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXCastedExpressionAccess().getAsKeyword_1_0_0_1()); 
             }
@@ -40204,21 +40204,21 @@ public final void rule__XCastedExpression__Group_1_0_0__1__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XPostfixOperation__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13492:1: rule__XPostfixOperation__Group__0 : rule__XPostfixOperation__Group__0__Impl rule__XPostfixOperation__Group__1 ;
+    // InternalFormat.g:13492:1: rule__XPostfixOperation__Group__0 : rule__XPostfixOperation__Group__0__Impl rule__XPostfixOperation__Group__1 ;
     public final void rule__XPostfixOperation__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13496:1: ( rule__XPostfixOperation__Group__0__Impl rule__XPostfixOperation__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13497:2: rule__XPostfixOperation__Group__0__Impl rule__XPostfixOperation__Group__1
+            // InternalFormat.g:13496:1: ( rule__XPostfixOperation__Group__0__Impl rule__XPostfixOperation__Group__1 )
+            // InternalFormat.g:13497:2: rule__XPostfixOperation__Group__0__Impl rule__XPostfixOperation__Group__1
             {
-            pushFollow(FOLLOW_rule__XPostfixOperation__Group__0__Impl_in_rule__XPostfixOperation__Group__027724);
+            pushFollow(FOLLOW_80);
             rule__XPostfixOperation__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XPostfixOperation__Group__1_in_rule__XPostfixOperation__Group__027727);
+            pushFollow(FOLLOW_2);
             rule__XPostfixOperation__Group__1();
 
             state._fsp--;
@@ -40242,22 +40242,22 @@ public final void rule__XPostfixOperation__Group__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XPostfixOperation__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13504:1: rule__XPostfixOperation__Group__0__Impl : ( ruleXMemberFeatureCall ) ;
+    // InternalFormat.g:13504:1: rule__XPostfixOperation__Group__0__Impl : ( ruleXMemberFeatureCall ) ;
     public final void rule__XPostfixOperation__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13508:1: ( ( ruleXMemberFeatureCall ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13509:1: ( ruleXMemberFeatureCall )
+            // InternalFormat.g:13508:1: ( ( ruleXMemberFeatureCall ) )
+            // InternalFormat.g:13509:1: ( ruleXMemberFeatureCall )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13509:1: ( ruleXMemberFeatureCall )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13510:1: ruleXMemberFeatureCall
+            // InternalFormat.g:13509:1: ( ruleXMemberFeatureCall )
+            // InternalFormat.g:13510:1: ruleXMemberFeatureCall
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getXMemberFeatureCallParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleXMemberFeatureCall_in_rule__XPostfixOperation__Group__0__Impl27754);
+            pushFollow(FOLLOW_2);
             ruleXMemberFeatureCall();
 
             state._fsp--;
@@ -40287,16 +40287,16 @@ public final void rule__XPostfixOperation__Group__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XPostfixOperation__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13521:1: rule__XPostfixOperation__Group__1 : rule__XPostfixOperation__Group__1__Impl ;
+    // InternalFormat.g:13521:1: rule__XPostfixOperation__Group__1 : rule__XPostfixOperation__Group__1__Impl ;
     public final void rule__XPostfixOperation__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13525:1: ( rule__XPostfixOperation__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13526:2: rule__XPostfixOperation__Group__1__Impl
+            // InternalFormat.g:13525:1: ( rule__XPostfixOperation__Group__1__Impl )
+            // InternalFormat.g:13526:2: rule__XPostfixOperation__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XPostfixOperation__Group__1__Impl_in_rule__XPostfixOperation__Group__127783);
+            pushFollow(FOLLOW_2);
             rule__XPostfixOperation__Group__1__Impl();
 
             state._fsp--;
@@ -40320,22 +40320,22 @@ public final void rule__XPostfixOperation__Group__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XPostfixOperation__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13532:1: rule__XPostfixOperation__Group__1__Impl : ( ( rule__XPostfixOperation__Group_1__0 )? ) ;
+    // InternalFormat.g:13532:1: rule__XPostfixOperation__Group__1__Impl : ( ( rule__XPostfixOperation__Group_1__0 )? ) ;
     public final void rule__XPostfixOperation__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13536:1: ( ( ( rule__XPostfixOperation__Group_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13537:1: ( ( rule__XPostfixOperation__Group_1__0 )? )
+            // InternalFormat.g:13536:1: ( ( ( rule__XPostfixOperation__Group_1__0 )? ) )
+            // InternalFormat.g:13537:1: ( ( rule__XPostfixOperation__Group_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13537:1: ( ( rule__XPostfixOperation__Group_1__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13538:1: ( rule__XPostfixOperation__Group_1__0 )?
+            // InternalFormat.g:13537:1: ( ( rule__XPostfixOperation__Group_1__0 )? )
+            // InternalFormat.g:13538:1: ( rule__XPostfixOperation__Group_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13539:1: ( rule__XPostfixOperation__Group_1__0 )?
+            // InternalFormat.g:13539:1: ( rule__XPostfixOperation__Group_1__0 )?
             int alt112=2;
             int LA112_0 = input.LA(1);
 
@@ -40355,9 +40355,9 @@ else if ( (LA112_0==48) ) {
             }
             switch (alt112) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13539:2: rule__XPostfixOperation__Group_1__0
+                    // InternalFormat.g:13539:2: rule__XPostfixOperation__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__XPostfixOperation__Group_1__0_in_rule__XPostfixOperation__Group__1__Impl27810);
+                    pushFollow(FOLLOW_2);
                     rule__XPostfixOperation__Group_1__0();
 
                     state._fsp--;
@@ -40393,16 +40393,16 @@ else if ( (LA112_0==48) ) {
 
 
     // $ANTLR start "rule__XPostfixOperation__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13553:1: rule__XPostfixOperation__Group_1__0 : rule__XPostfixOperation__Group_1__0__Impl ;
+    // InternalFormat.g:13553:1: rule__XPostfixOperation__Group_1__0 : rule__XPostfixOperation__Group_1__0__Impl ;
     public final void rule__XPostfixOperation__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13557:1: ( rule__XPostfixOperation__Group_1__0__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13558:2: rule__XPostfixOperation__Group_1__0__Impl
+            // InternalFormat.g:13557:1: ( rule__XPostfixOperation__Group_1__0__Impl )
+            // InternalFormat.g:13558:2: rule__XPostfixOperation__Group_1__0__Impl
             {
-            pushFollow(FOLLOW_rule__XPostfixOperation__Group_1__0__Impl_in_rule__XPostfixOperation__Group_1__027845);
+            pushFollow(FOLLOW_2);
             rule__XPostfixOperation__Group_1__0__Impl();
 
             state._fsp--;
@@ -40426,25 +40426,25 @@ public final void rule__XPostfixOperation__Group_1__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XPostfixOperation__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13564:1: rule__XPostfixOperation__Group_1__0__Impl : ( ( rule__XPostfixOperation__Group_1_0__0 ) ) ;
+    // InternalFormat.g:13564:1: rule__XPostfixOperation__Group_1__0__Impl : ( ( rule__XPostfixOperation__Group_1_0__0 ) ) ;
     public final void rule__XPostfixOperation__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13568:1: ( ( ( rule__XPostfixOperation__Group_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13569:1: ( ( rule__XPostfixOperation__Group_1_0__0 ) )
+            // InternalFormat.g:13568:1: ( ( ( rule__XPostfixOperation__Group_1_0__0 ) ) )
+            // InternalFormat.g:13569:1: ( ( rule__XPostfixOperation__Group_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13569:1: ( ( rule__XPostfixOperation__Group_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13570:1: ( rule__XPostfixOperation__Group_1_0__0 )
+            // InternalFormat.g:13569:1: ( ( rule__XPostfixOperation__Group_1_0__0 ) )
+            // InternalFormat.g:13570:1: ( rule__XPostfixOperation__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getGroup_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13571:1: ( rule__XPostfixOperation__Group_1_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13571:2: rule__XPostfixOperation__Group_1_0__0
+            // InternalFormat.g:13571:1: ( rule__XPostfixOperation__Group_1_0__0 )
+            // InternalFormat.g:13571:2: rule__XPostfixOperation__Group_1_0__0
             {
-            pushFollow(FOLLOW_rule__XPostfixOperation__Group_1_0__0_in_rule__XPostfixOperation__Group_1__0__Impl27872);
+            pushFollow(FOLLOW_2);
             rule__XPostfixOperation__Group_1_0__0();
 
             state._fsp--;
@@ -40477,21 +40477,21 @@ public final void rule__XPostfixOperation__Group_1__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XPostfixOperation__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13583:1: rule__XPostfixOperation__Group_1_0__0 : rule__XPostfixOperation__Group_1_0__0__Impl rule__XPostfixOperation__Group_1_0__1 ;
+    // InternalFormat.g:13583:1: rule__XPostfixOperation__Group_1_0__0 : rule__XPostfixOperation__Group_1_0__0__Impl rule__XPostfixOperation__Group_1_0__1 ;
     public final void rule__XPostfixOperation__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13587:1: ( rule__XPostfixOperation__Group_1_0__0__Impl rule__XPostfixOperation__Group_1_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13588:2: rule__XPostfixOperation__Group_1_0__0__Impl rule__XPostfixOperation__Group_1_0__1
+            // InternalFormat.g:13587:1: ( rule__XPostfixOperation__Group_1_0__0__Impl rule__XPostfixOperation__Group_1_0__1 )
+            // InternalFormat.g:13588:2: rule__XPostfixOperation__Group_1_0__0__Impl rule__XPostfixOperation__Group_1_0__1
             {
-            pushFollow(FOLLOW_rule__XPostfixOperation__Group_1_0__0__Impl_in_rule__XPostfixOperation__Group_1_0__027904);
+            pushFollow(FOLLOW_80);
             rule__XPostfixOperation__Group_1_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XPostfixOperation__Group_1_0__1_in_rule__XPostfixOperation__Group_1_0__027907);
+            pushFollow(FOLLOW_2);
             rule__XPostfixOperation__Group_1_0__1();
 
             state._fsp--;
@@ -40515,23 +40515,23 @@ public final void rule__XPostfixOperation__Group_1_0__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__XPostfixOperation__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13595:1: rule__XPostfixOperation__Group_1_0__0__Impl : ( () ) ;
+    // InternalFormat.g:13595:1: rule__XPostfixOperation__Group_1_0__0__Impl : ( () ) ;
     public final void rule__XPostfixOperation__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13599:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13600:1: ( () )
+            // InternalFormat.g:13599:1: ( ( () ) )
+            // InternalFormat.g:13600:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13600:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13601:1: ()
+            // InternalFormat.g:13600:1: ( () )
+            // InternalFormat.g:13601:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getXPostfixOperationOperandAction_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13602:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13604:1: 
+            // InternalFormat.g:13602:1: ()
+            // InternalFormat.g:13604:1: 
             {
             }
 
@@ -40556,16 +40556,16 @@ public final void rule__XPostfixOperation__Group_1_0__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XPostfixOperation__Group_1_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13614:1: rule__XPostfixOperation__Group_1_0__1 : rule__XPostfixOperation__Group_1_0__1__Impl ;
+    // InternalFormat.g:13614:1: rule__XPostfixOperation__Group_1_0__1 : rule__XPostfixOperation__Group_1_0__1__Impl ;
     public final void rule__XPostfixOperation__Group_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13618:1: ( rule__XPostfixOperation__Group_1_0__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13619:2: rule__XPostfixOperation__Group_1_0__1__Impl
+            // InternalFormat.g:13618:1: ( rule__XPostfixOperation__Group_1_0__1__Impl )
+            // InternalFormat.g:13619:2: rule__XPostfixOperation__Group_1_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XPostfixOperation__Group_1_0__1__Impl_in_rule__XPostfixOperation__Group_1_0__127965);
+            pushFollow(FOLLOW_2);
             rule__XPostfixOperation__Group_1_0__1__Impl();
 
             state._fsp--;
@@ -40589,25 +40589,25 @@ public final void rule__XPostfixOperation__Group_1_0__1() throws RecognitionExce
 
 
     // $ANTLR start "rule__XPostfixOperation__Group_1_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13625:1: rule__XPostfixOperation__Group_1_0__1__Impl : ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) ) ;
+    // InternalFormat.g:13625:1: rule__XPostfixOperation__Group_1_0__1__Impl : ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) ) ;
     public final void rule__XPostfixOperation__Group_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13629:1: ( ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13630:1: ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) )
+            // InternalFormat.g:13629:1: ( ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) ) )
+            // InternalFormat.g:13630:1: ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13630:1: ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13631:1: ( rule__XPostfixOperation__FeatureAssignment_1_0_1 )
+            // InternalFormat.g:13630:1: ( ( rule__XPostfixOperation__FeatureAssignment_1_0_1 ) )
+            // InternalFormat.g:13631:1: ( rule__XPostfixOperation__FeatureAssignment_1_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getFeatureAssignment_1_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13632:1: ( rule__XPostfixOperation__FeatureAssignment_1_0_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13632:2: rule__XPostfixOperation__FeatureAssignment_1_0_1
+            // InternalFormat.g:13632:1: ( rule__XPostfixOperation__FeatureAssignment_1_0_1 )
+            // InternalFormat.g:13632:2: rule__XPostfixOperation__FeatureAssignment_1_0_1
             {
-            pushFollow(FOLLOW_rule__XPostfixOperation__FeatureAssignment_1_0_1_in_rule__XPostfixOperation__Group_1_0__1__Impl27992);
+            pushFollow(FOLLOW_2);
             rule__XPostfixOperation__FeatureAssignment_1_0_1();
 
             state._fsp--;
@@ -40640,21 +40640,21 @@ public final void rule__XPostfixOperation__Group_1_0__1__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13646:1: rule__XMemberFeatureCall__Group__0 : rule__XMemberFeatureCall__Group__0__Impl rule__XMemberFeatureCall__Group__1 ;
+    // InternalFormat.g:13646:1: rule__XMemberFeatureCall__Group__0 : rule__XMemberFeatureCall__Group__0__Impl rule__XMemberFeatureCall__Group__1 ;
     public final void rule__XMemberFeatureCall__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13650:1: ( rule__XMemberFeatureCall__Group__0__Impl rule__XMemberFeatureCall__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13651:2: rule__XMemberFeatureCall__Group__0__Impl rule__XMemberFeatureCall__Group__1
+            // InternalFormat.g:13650:1: ( rule__XMemberFeatureCall__Group__0__Impl rule__XMemberFeatureCall__Group__1 )
+            // InternalFormat.g:13651:2: rule__XMemberFeatureCall__Group__0__Impl rule__XMemberFeatureCall__Group__1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group__0__Impl_in_rule__XMemberFeatureCall__Group__028026);
+            pushFollow(FOLLOW_81);
             rule__XMemberFeatureCall__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group__1_in_rule__XMemberFeatureCall__Group__028029);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group__1();
 
             state._fsp--;
@@ -40678,22 +40678,22 @@ public final void rule__XMemberFeatureCall__Group__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13658:1: rule__XMemberFeatureCall__Group__0__Impl : ( ruleXPrimaryExpression ) ;
+    // InternalFormat.g:13658:1: rule__XMemberFeatureCall__Group__0__Impl : ( ruleXPrimaryExpression ) ;
     public final void rule__XMemberFeatureCall__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13662:1: ( ( ruleXPrimaryExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13663:1: ( ruleXPrimaryExpression )
+            // InternalFormat.g:13662:1: ( ( ruleXPrimaryExpression ) )
+            // InternalFormat.g:13663:1: ( ruleXPrimaryExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13663:1: ( ruleXPrimaryExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13664:1: ruleXPrimaryExpression
+            // InternalFormat.g:13663:1: ( ruleXPrimaryExpression )
+            // InternalFormat.g:13664:1: ruleXPrimaryExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getXPrimaryExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleXPrimaryExpression_in_rule__XMemberFeatureCall__Group__0__Impl28056);
+            pushFollow(FOLLOW_2);
             ruleXPrimaryExpression();
 
             state._fsp--;
@@ -40723,16 +40723,16 @@ public final void rule__XMemberFeatureCall__Group__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13675:1: rule__XMemberFeatureCall__Group__1 : rule__XMemberFeatureCall__Group__1__Impl ;
+    // InternalFormat.g:13675:1: rule__XMemberFeatureCall__Group__1 : rule__XMemberFeatureCall__Group__1__Impl ;
     public final void rule__XMemberFeatureCall__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13679:1: ( rule__XMemberFeatureCall__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13680:2: rule__XMemberFeatureCall__Group__1__Impl
+            // InternalFormat.g:13679:1: ( rule__XMemberFeatureCall__Group__1__Impl )
+            // InternalFormat.g:13680:2: rule__XMemberFeatureCall__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group__1__Impl_in_rule__XMemberFeatureCall__Group__128085);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group__1__Impl();
 
             state._fsp--;
@@ -40756,22 +40756,22 @@ public final void rule__XMemberFeatureCall__Group__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13686:1: rule__XMemberFeatureCall__Group__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1 )* ) ;
+    // InternalFormat.g:13686:1: rule__XMemberFeatureCall__Group__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1 )* ) ;
     public final void rule__XMemberFeatureCall__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13690:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13691:1: ( ( rule__XMemberFeatureCall__Alternatives_1 )* )
+            // InternalFormat.g:13690:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1 )* ) )
+            // InternalFormat.g:13691:1: ( ( rule__XMemberFeatureCall__Alternatives_1 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13691:1: ( ( rule__XMemberFeatureCall__Alternatives_1 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13692:1: ( rule__XMemberFeatureCall__Alternatives_1 )*
+            // InternalFormat.g:13691:1: ( ( rule__XMemberFeatureCall__Alternatives_1 )* )
+            // InternalFormat.g:13692:1: ( rule__XMemberFeatureCall__Alternatives_1 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getAlternatives_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13693:1: ( rule__XMemberFeatureCall__Alternatives_1 )*
+            // InternalFormat.g:13693:1: ( rule__XMemberFeatureCall__Alternatives_1 )*
             loop113:
             do {
                 int alt113=2;
@@ -40814,9 +40814,9 @@ public final void rule__XMemberFeatureCall__Group__1__Impl() throws RecognitionE
 
                 switch (alt113) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13693:2: rule__XMemberFeatureCall__Alternatives_1
+            	    // InternalFormat.g:13693:2: rule__XMemberFeatureCall__Alternatives_1
             	    {
-            	    pushFollow(FOLLOW_rule__XMemberFeatureCall__Alternatives_1_in_rule__XMemberFeatureCall__Group__1__Impl28112);
+            	    pushFollow(FOLLOW_82);
             	    rule__XMemberFeatureCall__Alternatives_1();
 
             	    state._fsp--;
@@ -40855,21 +40855,21 @@ public final void rule__XMemberFeatureCall__Group__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13707:1: rule__XMemberFeatureCall__Group_1_0__0 : rule__XMemberFeatureCall__Group_1_0__0__Impl rule__XMemberFeatureCall__Group_1_0__1 ;
+    // InternalFormat.g:13707:1: rule__XMemberFeatureCall__Group_1_0__0 : rule__XMemberFeatureCall__Group_1_0__0__Impl rule__XMemberFeatureCall__Group_1_0__1 ;
     public final void rule__XMemberFeatureCall__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13711:1: ( rule__XMemberFeatureCall__Group_1_0__0__Impl rule__XMemberFeatureCall__Group_1_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13712:2: rule__XMemberFeatureCall__Group_1_0__0__Impl rule__XMemberFeatureCall__Group_1_0__1
+            // InternalFormat.g:13711:1: ( rule__XMemberFeatureCall__Group_1_0__0__Impl rule__XMemberFeatureCall__Group_1_0__1 )
+            // InternalFormat.g:13712:2: rule__XMemberFeatureCall__Group_1_0__0__Impl rule__XMemberFeatureCall__Group_1_0__1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_0__028147);
+            pushFollow(FOLLOW_50);
             rule__XMemberFeatureCall__Group_1_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0__1_in_rule__XMemberFeatureCall__Group_1_0__028150);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_0__1();
 
             state._fsp--;
@@ -40893,25 +40893,25 @@ public final void rule__XMemberFeatureCall__Group_1_0__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13719:1: rule__XMemberFeatureCall__Group_1_0__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) ) ;
+    // InternalFormat.g:13719:1: rule__XMemberFeatureCall__Group_1_0__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13723:1: ( ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13724:1: ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) )
+            // InternalFormat.g:13723:1: ( ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) ) )
+            // InternalFormat.g:13724:1: ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13724:1: ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13725:1: ( rule__XMemberFeatureCall__Group_1_0_0__0 )
+            // InternalFormat.g:13724:1: ( ( rule__XMemberFeatureCall__Group_1_0_0__0 ) )
+            // InternalFormat.g:13725:1: ( rule__XMemberFeatureCall__Group_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13726:1: ( rule__XMemberFeatureCall__Group_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13726:2: rule__XMemberFeatureCall__Group_1_0_0__0
+            // InternalFormat.g:13726:1: ( rule__XMemberFeatureCall__Group_1_0_0__0 )
+            // InternalFormat.g:13726:2: rule__XMemberFeatureCall__Group_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0__0_in_rule__XMemberFeatureCall__Group_1_0__0__Impl28177);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_0_0__0();
 
             state._fsp--;
@@ -40944,16 +40944,16 @@ public final void rule__XMemberFeatureCall__Group_1_0__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13736:1: rule__XMemberFeatureCall__Group_1_0__1 : rule__XMemberFeatureCall__Group_1_0__1__Impl ;
+    // InternalFormat.g:13736:1: rule__XMemberFeatureCall__Group_1_0__1 : rule__XMemberFeatureCall__Group_1_0__1__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13740:1: ( rule__XMemberFeatureCall__Group_1_0__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13741:2: rule__XMemberFeatureCall__Group_1_0__1__Impl
+            // InternalFormat.g:13740:1: ( rule__XMemberFeatureCall__Group_1_0__1__Impl )
+            // InternalFormat.g:13741:2: rule__XMemberFeatureCall__Group_1_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0__1__Impl_in_rule__XMemberFeatureCall__Group_1_0__128207);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_0__1__Impl();
 
             state._fsp--;
@@ -40977,25 +40977,25 @@ public final void rule__XMemberFeatureCall__Group_1_0__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13747:1: rule__XMemberFeatureCall__Group_1_0__1__Impl : ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) ) ;
+    // InternalFormat.g:13747:1: rule__XMemberFeatureCall__Group_1_0__1__Impl : ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13751:1: ( ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13752:1: ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) )
+            // InternalFormat.g:13751:1: ( ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) ) )
+            // InternalFormat.g:13752:1: ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13752:1: ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13753:1: ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 )
+            // InternalFormat.g:13752:1: ( ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 ) )
+            // InternalFormat.g:13753:1: ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getValueAssignment_1_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13754:1: ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13754:2: rule__XMemberFeatureCall__ValueAssignment_1_0_1
+            // InternalFormat.g:13754:1: ( rule__XMemberFeatureCall__ValueAssignment_1_0_1 )
+            // InternalFormat.g:13754:2: rule__XMemberFeatureCall__ValueAssignment_1_0_1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__ValueAssignment_1_0_1_in_rule__XMemberFeatureCall__Group_1_0__1__Impl28234);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__ValueAssignment_1_0_1();
 
             state._fsp--;
@@ -41028,16 +41028,16 @@ public final void rule__XMemberFeatureCall__Group_1_0__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13768:1: rule__XMemberFeatureCall__Group_1_0_0__0 : rule__XMemberFeatureCall__Group_1_0_0__0__Impl ;
+    // InternalFormat.g:13768:1: rule__XMemberFeatureCall__Group_1_0_0__0 : rule__XMemberFeatureCall__Group_1_0_0__0__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13772:1: ( rule__XMemberFeatureCall__Group_1_0_0__0__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13773:2: rule__XMemberFeatureCall__Group_1_0_0__0__Impl
+            // InternalFormat.g:13772:1: ( rule__XMemberFeatureCall__Group_1_0_0__0__Impl )
+            // InternalFormat.g:13773:2: rule__XMemberFeatureCall__Group_1_0_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_0_0__028268);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_0_0__0__Impl();
 
             state._fsp--;
@@ -41061,25 +41061,25 @@ public final void rule__XMemberFeatureCall__Group_1_0_0__0() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13779:1: rule__XMemberFeatureCall__Group_1_0_0__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) ) ;
+    // InternalFormat.g:13779:1: rule__XMemberFeatureCall__Group_1_0_0__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13783:1: ( ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13784:1: ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) )
+            // InternalFormat.g:13783:1: ( ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) ) )
+            // InternalFormat.g:13784:1: ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13784:1: ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13785:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__0 )
+            // InternalFormat.g:13784:1: ( ( rule__XMemberFeatureCall__Group_1_0_0_0__0 ) )
+            // InternalFormat.g:13785:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13786:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13786:2: rule__XMemberFeatureCall__Group_1_0_0_0__0
+            // InternalFormat.g:13786:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__0 )
+            // InternalFormat.g:13786:2: rule__XMemberFeatureCall__Group_1_0_0_0__0
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__0_in_rule__XMemberFeatureCall__Group_1_0_0__0__Impl28295);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_0_0_0__0();
 
             state._fsp--;
@@ -41112,21 +41112,21 @@ public final void rule__XMemberFeatureCall__Group_1_0_0__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13798:1: rule__XMemberFeatureCall__Group_1_0_0_0__0 : rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl rule__XMemberFeatureCall__Group_1_0_0_0__1 ;
+    // InternalFormat.g:13798:1: rule__XMemberFeatureCall__Group_1_0_0_0__0 : rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl rule__XMemberFeatureCall__Group_1_0_0_0__1 ;
     public final void rule__XMemberFeatureCall__Group_1_0_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13802:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl rule__XMemberFeatureCall__Group_1_0_0_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13803:2: rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl rule__XMemberFeatureCall__Group_1_0_0_0__1
+            // InternalFormat.g:13802:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl rule__XMemberFeatureCall__Group_1_0_0_0__1 )
+            // InternalFormat.g:13803:2: rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl rule__XMemberFeatureCall__Group_1_0_0_0__1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_0_0_0__028327);
+            pushFollow(FOLLOW_83);
             rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__1_in_rule__XMemberFeatureCall__Group_1_0_0_0__028330);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_0_0_0__1();
 
             state._fsp--;
@@ -41150,23 +41150,23 @@ public final void rule__XMemberFeatureCall__Group_1_0_0_0__0() throws Recognitio
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13810:1: rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl : ( () ) ;
+    // InternalFormat.g:13810:1: rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl : ( () ) ;
     public final void rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13814:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13815:1: ( () )
+            // InternalFormat.g:13814:1: ( ( () ) )
+            // InternalFormat.g:13815:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13815:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13816:1: ()
+            // InternalFormat.g:13815:1: ( () )
+            // InternalFormat.g:13816:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getXAssignmentAssignableAction_1_0_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13817:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13819:1: 
+            // InternalFormat.g:13817:1: ()
+            // InternalFormat.g:13819:1: 
             {
             }
 
@@ -41191,21 +41191,21 @@ public final void rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl() throws Reco
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13829:1: rule__XMemberFeatureCall__Group_1_0_0_0__1 : rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl rule__XMemberFeatureCall__Group_1_0_0_0__2 ;
+    // InternalFormat.g:13829:1: rule__XMemberFeatureCall__Group_1_0_0_0__1 : rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl rule__XMemberFeatureCall__Group_1_0_0_0__2 ;
     public final void rule__XMemberFeatureCall__Group_1_0_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13833:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl rule__XMemberFeatureCall__Group_1_0_0_0__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13834:2: rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl rule__XMemberFeatureCall__Group_1_0_0_0__2
+            // InternalFormat.g:13833:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl rule__XMemberFeatureCall__Group_1_0_0_0__2 )
+            // InternalFormat.g:13834:2: rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl rule__XMemberFeatureCall__Group_1_0_0_0__2
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl_in_rule__XMemberFeatureCall__Group_1_0_0_0__128388);
+            pushFollow(FOLLOW_54);
             rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__2_in_rule__XMemberFeatureCall__Group_1_0_0_0__128391);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_0_0_0__2();
 
             state._fsp--;
@@ -41229,25 +41229,25 @@ public final void rule__XMemberFeatureCall__Group_1_0_0_0__1() throws Recognitio
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13841:1: rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) ) ;
+    // InternalFormat.g:13841:1: rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13845:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13846:1: ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) )
+            // InternalFormat.g:13845:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) ) )
+            // InternalFormat.g:13846:1: ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13846:1: ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13847:1: ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 )
+            // InternalFormat.g:13846:1: ( ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 ) )
+            // InternalFormat.g:13847:1: ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getAlternatives_1_0_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13848:1: ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13848:2: rule__XMemberFeatureCall__Alternatives_1_0_0_0_1
+            // InternalFormat.g:13848:1: ( rule__XMemberFeatureCall__Alternatives_1_0_0_0_1 )
+            // InternalFormat.g:13848:2: rule__XMemberFeatureCall__Alternatives_1_0_0_0_1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Alternatives_1_0_0_0_1_in_rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl28418);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Alternatives_1_0_0_0_1();
 
             state._fsp--;
@@ -41280,21 +41280,21 @@ public final void rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl() throws Reco
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13858:1: rule__XMemberFeatureCall__Group_1_0_0_0__2 : rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl rule__XMemberFeatureCall__Group_1_0_0_0__3 ;
+    // InternalFormat.g:13858:1: rule__XMemberFeatureCall__Group_1_0_0_0__2 : rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl rule__XMemberFeatureCall__Group_1_0_0_0__3 ;
     public final void rule__XMemberFeatureCall__Group_1_0_0_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13862:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl rule__XMemberFeatureCall__Group_1_0_0_0__3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13863:2: rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl rule__XMemberFeatureCall__Group_1_0_0_0__3
+            // InternalFormat.g:13862:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl rule__XMemberFeatureCall__Group_1_0_0_0__3 )
+            // InternalFormat.g:13863:2: rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl rule__XMemberFeatureCall__Group_1_0_0_0__3
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl_in_rule__XMemberFeatureCall__Group_1_0_0_0__228448);
+            pushFollow(FOLLOW_12);
             rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__3_in_rule__XMemberFeatureCall__Group_1_0_0_0__228451);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_0_0_0__3();
 
             state._fsp--;
@@ -41318,25 +41318,25 @@ public final void rule__XMemberFeatureCall__Group_1_0_0_0__2() throws Recognitio
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13870:1: rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl : ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) ) ;
+    // InternalFormat.g:13870:1: rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl : ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13874:1: ( ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13875:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) )
+            // InternalFormat.g:13874:1: ( ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) ) )
+            // InternalFormat.g:13875:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13875:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13876:1: ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 )
+            // InternalFormat.g:13875:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 ) )
+            // InternalFormat.g:13876:1: ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getFeatureAssignment_1_0_0_0_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13877:1: ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13877:2: rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2
+            // InternalFormat.g:13877:1: ( rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 )
+            // InternalFormat.g:13877:2: rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2_in_rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl28478);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2();
 
             state._fsp--;
@@ -41369,16 +41369,16 @@ public final void rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl() throws Reco
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13887:1: rule__XMemberFeatureCall__Group_1_0_0_0__3 : rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl ;
+    // InternalFormat.g:13887:1: rule__XMemberFeatureCall__Group_1_0_0_0__3 : rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_0_0_0__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13891:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13892:2: rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl
+            // InternalFormat.g:13891:1: ( rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl )
+            // InternalFormat.g:13892:2: rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl_in_rule__XMemberFeatureCall__Group_1_0_0_0__328508);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl();
 
             state._fsp--;
@@ -41402,22 +41402,22 @@ public final void rule__XMemberFeatureCall__Group_1_0_0_0__3() throws Recognitio
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13898:1: rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl : ( ruleOpSingleAssign ) ;
+    // InternalFormat.g:13898:1: rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl : ( ruleOpSingleAssign ) ;
     public final void rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13902:1: ( ( ruleOpSingleAssign ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13903:1: ( ruleOpSingleAssign )
+            // InternalFormat.g:13902:1: ( ( ruleOpSingleAssign ) )
+            // InternalFormat.g:13903:1: ( ruleOpSingleAssign )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13903:1: ( ruleOpSingleAssign )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13904:1: ruleOpSingleAssign
+            // InternalFormat.g:13903:1: ( ruleOpSingleAssign )
+            // InternalFormat.g:13904:1: ruleOpSingleAssign
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getOpSingleAssignParserRuleCall_1_0_0_0_3()); 
             }
-            pushFollow(FOLLOW_ruleOpSingleAssign_in_rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl28535);
+            pushFollow(FOLLOW_2);
             ruleOpSingleAssign();
 
             state._fsp--;
@@ -41447,21 +41447,21 @@ public final void rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl() throws Reco
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13923:1: rule__XMemberFeatureCall__Group_1_1__0 : rule__XMemberFeatureCall__Group_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1__1 ;
+    // InternalFormat.g:13923:1: rule__XMemberFeatureCall__Group_1_1__0 : rule__XMemberFeatureCall__Group_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1__1 ;
     public final void rule__XMemberFeatureCall__Group_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13927:1: ( rule__XMemberFeatureCall__Group_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13928:2: rule__XMemberFeatureCall__Group_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1__1
+            // InternalFormat.g:13927:1: ( rule__XMemberFeatureCall__Group_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1__1 )
+            // InternalFormat.g:13928:2: rule__XMemberFeatureCall__Group_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1__1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__0__Impl_in_rule__XMemberFeatureCall__Group_1_1__028572);
+            pushFollow(FOLLOW_84);
             rule__XMemberFeatureCall__Group_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__1_in_rule__XMemberFeatureCall__Group_1_1__028575);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1__1();
 
             state._fsp--;
@@ -41485,25 +41485,25 @@ public final void rule__XMemberFeatureCall__Group_1_1__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13935:1: rule__XMemberFeatureCall__Group_1_1__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) ) ;
+    // InternalFormat.g:13935:1: rule__XMemberFeatureCall__Group_1_1__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13939:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13940:1: ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) )
+            // InternalFormat.g:13939:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) ) )
+            // InternalFormat.g:13940:1: ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13940:1: ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13941:1: ( rule__XMemberFeatureCall__Group_1_1_0__0 )
+            // InternalFormat.g:13940:1: ( ( rule__XMemberFeatureCall__Group_1_1_0__0 ) )
+            // InternalFormat.g:13941:1: ( rule__XMemberFeatureCall__Group_1_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13942:1: ( rule__XMemberFeatureCall__Group_1_1_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13942:2: rule__XMemberFeatureCall__Group_1_1_0__0
+            // InternalFormat.g:13942:1: ( rule__XMemberFeatureCall__Group_1_1_0__0 )
+            // InternalFormat.g:13942:2: rule__XMemberFeatureCall__Group_1_1_0__0
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_0__0_in_rule__XMemberFeatureCall__Group_1_1__0__Impl28602);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_0__0();
 
             state._fsp--;
@@ -41536,21 +41536,21 @@ public final void rule__XMemberFeatureCall__Group_1_1__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13952:1: rule__XMemberFeatureCall__Group_1_1__1 : rule__XMemberFeatureCall__Group_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1__2 ;
+    // InternalFormat.g:13952:1: rule__XMemberFeatureCall__Group_1_1__1 : rule__XMemberFeatureCall__Group_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1__2 ;
     public final void rule__XMemberFeatureCall__Group_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13956:1: ( rule__XMemberFeatureCall__Group_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13957:2: rule__XMemberFeatureCall__Group_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1__2
+            // InternalFormat.g:13956:1: ( rule__XMemberFeatureCall__Group_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1__2 )
+            // InternalFormat.g:13957:2: rule__XMemberFeatureCall__Group_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1__2
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__1__Impl_in_rule__XMemberFeatureCall__Group_1_1__128632);
+            pushFollow(FOLLOW_84);
             rule__XMemberFeatureCall__Group_1_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__2_in_rule__XMemberFeatureCall__Group_1_1__128635);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1__2();
 
             state._fsp--;
@@ -41574,22 +41574,22 @@ public final void rule__XMemberFeatureCall__Group_1_1__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13964:1: rule__XMemberFeatureCall__Group_1_1__1__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? ) ;
+    // InternalFormat.g:13964:1: rule__XMemberFeatureCall__Group_1_1__1__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? ) ;
     public final void rule__XMemberFeatureCall__Group_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13968:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13969:1: ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? )
+            // InternalFormat.g:13968:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? ) )
+            // InternalFormat.g:13969:1: ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13969:1: ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13970:1: ( rule__XMemberFeatureCall__Group_1_1_1__0 )?
+            // InternalFormat.g:13969:1: ( ( rule__XMemberFeatureCall__Group_1_1_1__0 )? )
+            // InternalFormat.g:13970:1: ( rule__XMemberFeatureCall__Group_1_1_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13971:1: ( rule__XMemberFeatureCall__Group_1_1_1__0 )?
+            // InternalFormat.g:13971:1: ( rule__XMemberFeatureCall__Group_1_1_1__0 )?
             int alt114=2;
             int LA114_0 = input.LA(1);
 
@@ -41598,9 +41598,9 @@ public final void rule__XMemberFeatureCall__Group_1_1__1__Impl() throws Recognit
             }
             switch (alt114) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13971:2: rule__XMemberFeatureCall__Group_1_1_1__0
+                    // InternalFormat.g:13971:2: rule__XMemberFeatureCall__Group_1_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__0_in_rule__XMemberFeatureCall__Group_1_1__1__Impl28662);
+                    pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__Group_1_1_1__0();
 
                     state._fsp--;
@@ -41636,21 +41636,21 @@ public final void rule__XMemberFeatureCall__Group_1_1__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13981:1: rule__XMemberFeatureCall__Group_1_1__2 : rule__XMemberFeatureCall__Group_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1__3 ;
+    // InternalFormat.g:13981:1: rule__XMemberFeatureCall__Group_1_1__2 : rule__XMemberFeatureCall__Group_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1__3 ;
     public final void rule__XMemberFeatureCall__Group_1_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13985:1: ( rule__XMemberFeatureCall__Group_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1__3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13986:2: rule__XMemberFeatureCall__Group_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1__3
+            // InternalFormat.g:13985:1: ( rule__XMemberFeatureCall__Group_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1__3 )
+            // InternalFormat.g:13986:2: rule__XMemberFeatureCall__Group_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1__3
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__2__Impl_in_rule__XMemberFeatureCall__Group_1_1__228693);
+            pushFollow(FOLLOW_85);
             rule__XMemberFeatureCall__Group_1_1__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__3_in_rule__XMemberFeatureCall__Group_1_1__228696);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1__3();
 
             state._fsp--;
@@ -41674,25 +41674,25 @@ public final void rule__XMemberFeatureCall__Group_1_1__2() throws RecognitionExc
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13993:1: rule__XMemberFeatureCall__Group_1_1__2__Impl : ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) ) ;
+    // InternalFormat.g:13993:1: rule__XMemberFeatureCall__Group_1_1__2__Impl : ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13997:1: ( ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13998:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) )
+            // InternalFormat.g:13997:1: ( ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) ) )
+            // InternalFormat.g:13998:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13998:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13999:1: ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 )
+            // InternalFormat.g:13998:1: ( ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 ) )
+            // InternalFormat.g:13999:1: ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getFeatureAssignment_1_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14000:1: ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14000:2: rule__XMemberFeatureCall__FeatureAssignment_1_1_2
+            // InternalFormat.g:14000:1: ( rule__XMemberFeatureCall__FeatureAssignment_1_1_2 )
+            // InternalFormat.g:14000:2: rule__XMemberFeatureCall__FeatureAssignment_1_1_2
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__FeatureAssignment_1_1_2_in_rule__XMemberFeatureCall__Group_1_1__2__Impl28723);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__FeatureAssignment_1_1_2();
 
             state._fsp--;
@@ -41725,21 +41725,21 @@ public final void rule__XMemberFeatureCall__Group_1_1__2__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14010:1: rule__XMemberFeatureCall__Group_1_1__3 : rule__XMemberFeatureCall__Group_1_1__3__Impl rule__XMemberFeatureCall__Group_1_1__4 ;
+    // InternalFormat.g:14010:1: rule__XMemberFeatureCall__Group_1_1__3 : rule__XMemberFeatureCall__Group_1_1__3__Impl rule__XMemberFeatureCall__Group_1_1__4 ;
     public final void rule__XMemberFeatureCall__Group_1_1__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14014:1: ( rule__XMemberFeatureCall__Group_1_1__3__Impl rule__XMemberFeatureCall__Group_1_1__4 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14015:2: rule__XMemberFeatureCall__Group_1_1__3__Impl rule__XMemberFeatureCall__Group_1_1__4
+            // InternalFormat.g:14014:1: ( rule__XMemberFeatureCall__Group_1_1__3__Impl rule__XMemberFeatureCall__Group_1_1__4 )
+            // InternalFormat.g:14015:2: rule__XMemberFeatureCall__Group_1_1__3__Impl rule__XMemberFeatureCall__Group_1_1__4
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__3__Impl_in_rule__XMemberFeatureCall__Group_1_1__328753);
+            pushFollow(FOLLOW_85);
             rule__XMemberFeatureCall__Group_1_1__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__4_in_rule__XMemberFeatureCall__Group_1_1__328756);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1__4();
 
             state._fsp--;
@@ -41763,29 +41763,29 @@ public final void rule__XMemberFeatureCall__Group_1_1__3() throws RecognitionExc
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14022:1: rule__XMemberFeatureCall__Group_1_1__3__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? ) ;
+    // InternalFormat.g:14022:1: rule__XMemberFeatureCall__Group_1_1__3__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? ) ;
     public final void rule__XMemberFeatureCall__Group_1_1__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14026:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14027:1: ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? )
+            // InternalFormat.g:14026:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? ) )
+            // InternalFormat.g:14027:1: ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14027:1: ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14028:1: ( rule__XMemberFeatureCall__Group_1_1_3__0 )?
+            // InternalFormat.g:14027:1: ( ( rule__XMemberFeatureCall__Group_1_1_3__0 )? )
+            // InternalFormat.g:14028:1: ( rule__XMemberFeatureCall__Group_1_1_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14029:1: ( rule__XMemberFeatureCall__Group_1_1_3__0 )?
+            // InternalFormat.g:14029:1: ( rule__XMemberFeatureCall__Group_1_1_3__0 )?
             int alt115=2;
             alt115 = dfa115.predict(input);
             switch (alt115) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14029:2: rule__XMemberFeatureCall__Group_1_1_3__0
+                    // InternalFormat.g:14029:2: rule__XMemberFeatureCall__Group_1_1_3__0
                     {
-                    pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__0_in_rule__XMemberFeatureCall__Group_1_1__3__Impl28783);
+                    pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__Group_1_1_3__0();
 
                     state._fsp--;
@@ -41821,16 +41821,16 @@ public final void rule__XMemberFeatureCall__Group_1_1__3__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__4"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14039:1: rule__XMemberFeatureCall__Group_1_1__4 : rule__XMemberFeatureCall__Group_1_1__4__Impl ;
+    // InternalFormat.g:14039:1: rule__XMemberFeatureCall__Group_1_1__4 : rule__XMemberFeatureCall__Group_1_1__4__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_1__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14043:1: ( rule__XMemberFeatureCall__Group_1_1__4__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14044:2: rule__XMemberFeatureCall__Group_1_1__4__Impl
+            // InternalFormat.g:14043:1: ( rule__XMemberFeatureCall__Group_1_1__4__Impl )
+            // InternalFormat.g:14044:2: rule__XMemberFeatureCall__Group_1_1__4__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1__4__Impl_in_rule__XMemberFeatureCall__Group_1_1__428814);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1__4__Impl();
 
             state._fsp--;
@@ -41854,29 +41854,29 @@ public final void rule__XMemberFeatureCall__Group_1_1__4() throws RecognitionExc
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14050:1: rule__XMemberFeatureCall__Group_1_1__4__Impl : ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? ) ;
+    // InternalFormat.g:14050:1: rule__XMemberFeatureCall__Group_1_1__4__Impl : ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? ) ;
     public final void rule__XMemberFeatureCall__Group_1_1__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14054:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14055:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? )
+            // InternalFormat.g:14054:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? ) )
+            // InternalFormat.g:14055:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14055:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14056:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )?
+            // InternalFormat.g:14055:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )? )
+            // InternalFormat.g:14056:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsAssignment_1_1_4()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14057:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )?
+            // InternalFormat.g:14057:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )?
             int alt116=2;
             alt116 = dfa116.predict(input);
             switch (alt116) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14057:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4
+                    // InternalFormat.g:14057:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4
                     {
-                    pushFollow(FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4_in_rule__XMemberFeatureCall__Group_1_1__4__Impl28841);
+                    pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4();
 
                     state._fsp--;
@@ -41912,16 +41912,16 @@ public final void rule__XMemberFeatureCall__Group_1_1__4__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14077:1: rule__XMemberFeatureCall__Group_1_1_0__0 : rule__XMemberFeatureCall__Group_1_1_0__0__Impl ;
+    // InternalFormat.g:14077:1: rule__XMemberFeatureCall__Group_1_1_0__0 : rule__XMemberFeatureCall__Group_1_1_0__0__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14081:1: ( rule__XMemberFeatureCall__Group_1_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14082:2: rule__XMemberFeatureCall__Group_1_1_0__0__Impl
+            // InternalFormat.g:14081:1: ( rule__XMemberFeatureCall__Group_1_1_0__0__Impl )
+            // InternalFormat.g:14082:2: rule__XMemberFeatureCall__Group_1_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_0__028882);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_0__0__Impl();
 
             state._fsp--;
@@ -41945,25 +41945,25 @@ public final void rule__XMemberFeatureCall__Group_1_1_0__0() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14088:1: rule__XMemberFeatureCall__Group_1_1_0__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) ) ;
+    // InternalFormat.g:14088:1: rule__XMemberFeatureCall__Group_1_1_0__0__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14092:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14093:1: ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) )
+            // InternalFormat.g:14092:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) ) )
+            // InternalFormat.g:14093:1: ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14093:1: ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14094:1: ( rule__XMemberFeatureCall__Group_1_1_0_0__0 )
+            // InternalFormat.g:14093:1: ( ( rule__XMemberFeatureCall__Group_1_1_0_0__0 ) )
+            // InternalFormat.g:14094:1: ( rule__XMemberFeatureCall__Group_1_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14095:1: ( rule__XMemberFeatureCall__Group_1_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14095:2: rule__XMemberFeatureCall__Group_1_1_0_0__0
+            // InternalFormat.g:14095:1: ( rule__XMemberFeatureCall__Group_1_1_0_0__0 )
+            // InternalFormat.g:14095:2: rule__XMemberFeatureCall__Group_1_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_0_0__0_in_rule__XMemberFeatureCall__Group_1_1_0__0__Impl28909);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_0_0__0();
 
             state._fsp--;
@@ -41996,21 +41996,21 @@ public final void rule__XMemberFeatureCall__Group_1_1_0__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_0_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14107:1: rule__XMemberFeatureCall__Group_1_1_0_0__0 : rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl rule__XMemberFeatureCall__Group_1_1_0_0__1 ;
+    // InternalFormat.g:14107:1: rule__XMemberFeatureCall__Group_1_1_0_0__0 : rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl rule__XMemberFeatureCall__Group_1_1_0_0__1 ;
     public final void rule__XMemberFeatureCall__Group_1_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14111:1: ( rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl rule__XMemberFeatureCall__Group_1_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14112:2: rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl rule__XMemberFeatureCall__Group_1_1_0_0__1
+            // InternalFormat.g:14111:1: ( rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl rule__XMemberFeatureCall__Group_1_1_0_0__1 )
+            // InternalFormat.g:14112:2: rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl rule__XMemberFeatureCall__Group_1_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_0_0__028941);
+            pushFollow(FOLLOW_81);
             rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_0_0__1_in_rule__XMemberFeatureCall__Group_1_1_0_0__028944);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_0_0__1();
 
             state._fsp--;
@@ -42034,23 +42034,23 @@ public final void rule__XMemberFeatureCall__Group_1_1_0_0__0() throws Recognitio
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14119:1: rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl : ( () ) ;
+    // InternalFormat.g:14119:1: rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl : ( () ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14123:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14124:1: ( () )
+            // InternalFormat.g:14123:1: ( ( () ) )
+            // InternalFormat.g:14124:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14124:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14125:1: ()
+            // InternalFormat.g:14124:1: ( () )
+            // InternalFormat.g:14125:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getXMemberFeatureCallMemberCallTargetAction_1_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14126:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14128:1: 
+            // InternalFormat.g:14126:1: ()
+            // InternalFormat.g:14128:1: 
             {
             }
 
@@ -42075,16 +42075,16 @@ public final void rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl() throws Reco
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_0_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14138:1: rule__XMemberFeatureCall__Group_1_1_0_0__1 : rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl ;
+    // InternalFormat.g:14138:1: rule__XMemberFeatureCall__Group_1_1_0_0__1 : rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14142:1: ( rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14143:2: rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl
+            // InternalFormat.g:14142:1: ( rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl )
+            // InternalFormat.g:14143:2: rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_0_0__129002);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl();
 
             state._fsp--;
@@ -42108,25 +42108,25 @@ public final void rule__XMemberFeatureCall__Group_1_1_0_0__1() throws Recognitio
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14149:1: rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) ) ;
+    // InternalFormat.g:14149:1: rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14153:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14154:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) )
+            // InternalFormat.g:14153:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) ) )
+            // InternalFormat.g:14154:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14154:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14155:1: ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 )
+            // InternalFormat.g:14154:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 ) )
+            // InternalFormat.g:14155:1: ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getAlternatives_1_1_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14156:1: ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14156:2: rule__XMemberFeatureCall__Alternatives_1_1_0_0_1
+            // InternalFormat.g:14156:1: ( rule__XMemberFeatureCall__Alternatives_1_1_0_0_1 )
+            // InternalFormat.g:14156:2: rule__XMemberFeatureCall__Alternatives_1_1_0_0_1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Alternatives_1_1_0_0_1_in_rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl29029);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Alternatives_1_1_0_0_1();
 
             state._fsp--;
@@ -42159,21 +42159,21 @@ public final void rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl() throws Reco
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14170:1: rule__XMemberFeatureCall__Group_1_1_1__0 : rule__XMemberFeatureCall__Group_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_1__1 ;
+    // InternalFormat.g:14170:1: rule__XMemberFeatureCall__Group_1_1_1__0 : rule__XMemberFeatureCall__Group_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_1__1 ;
     public final void rule__XMemberFeatureCall__Group_1_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14174:1: ( rule__XMemberFeatureCall__Group_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14175:2: rule__XMemberFeatureCall__Group_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_1__1
+            // InternalFormat.g:14174:1: ( rule__XMemberFeatureCall__Group_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_1__1 )
+            // InternalFormat.g:14175:2: rule__XMemberFeatureCall__Group_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_1__1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_1__029063);
+            pushFollow(FOLLOW_86);
             rule__XMemberFeatureCall__Group_1_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__1_in_rule__XMemberFeatureCall__Group_1_1_1__029066);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_1__1();
 
             state._fsp--;
@@ -42197,22 +42197,22 @@ public final void rule__XMemberFeatureCall__Group_1_1_1__0() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14182:1: rule__XMemberFeatureCall__Group_1_1_1__0__Impl : ( '<' ) ;
+    // InternalFormat.g:14182:1: rule__XMemberFeatureCall__Group_1_1_1__0__Impl : ( '<' ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14186:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14187:1: ( '<' )
+            // InternalFormat.g:14186:1: ( ( '<' ) )
+            // InternalFormat.g:14187:1: ( '<' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14187:1: ( '<' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14188:1: '<'
+            // InternalFormat.g:14187:1: ( '<' )
+            // InternalFormat.g:14188:1: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getLessThanSignKeyword_1_1_1_0()); 
             }
-            match(input,33,FOLLOW_33_in_rule__XMemberFeatureCall__Group_1_1_1__0__Impl29094); if (state.failed) return ;
+            match(input,33,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getLessThanSignKeyword_1_1_1_0()); 
             }
@@ -42238,21 +42238,21 @@ public final void rule__XMemberFeatureCall__Group_1_1_1__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14201:1: rule__XMemberFeatureCall__Group_1_1_1__1 : rule__XMemberFeatureCall__Group_1_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1_1__2 ;
+    // InternalFormat.g:14201:1: rule__XMemberFeatureCall__Group_1_1_1__1 : rule__XMemberFeatureCall__Group_1_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1_1__2 ;
     public final void rule__XMemberFeatureCall__Group_1_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14205:1: ( rule__XMemberFeatureCall__Group_1_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14206:2: rule__XMemberFeatureCall__Group_1_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1_1__2
+            // InternalFormat.g:14205:1: ( rule__XMemberFeatureCall__Group_1_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1_1__2 )
+            // InternalFormat.g:14206:2: rule__XMemberFeatureCall__Group_1_1_1__1__Impl rule__XMemberFeatureCall__Group_1_1_1__2
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_1__129125);
+            pushFollow(FOLLOW_87);
             rule__XMemberFeatureCall__Group_1_1_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__2_in_rule__XMemberFeatureCall__Group_1_1_1__129128);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_1__2();
 
             state._fsp--;
@@ -42276,25 +42276,25 @@ public final void rule__XMemberFeatureCall__Group_1_1_1__1() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14213:1: rule__XMemberFeatureCall__Group_1_1_1__1__Impl : ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) ) ;
+    // InternalFormat.g:14213:1: rule__XMemberFeatureCall__Group_1_1_1__1__Impl : ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14217:1: ( ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14218:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) )
+            // InternalFormat.g:14217:1: ( ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) ) )
+            // InternalFormat.g:14218:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14218:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14219:1: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 )
+            // InternalFormat.g:14218:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 ) )
+            // InternalFormat.g:14219:1: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getTypeArgumentsAssignment_1_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14220:1: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14220:2: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1
+            // InternalFormat.g:14220:1: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 )
+            // InternalFormat.g:14220:2: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1_in_rule__XMemberFeatureCall__Group_1_1_1__1__Impl29155);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1();
 
             state._fsp--;
@@ -42327,21 +42327,21 @@ public final void rule__XMemberFeatureCall__Group_1_1_1__1__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14230:1: rule__XMemberFeatureCall__Group_1_1_1__2 : rule__XMemberFeatureCall__Group_1_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1_1__3 ;
+    // InternalFormat.g:14230:1: rule__XMemberFeatureCall__Group_1_1_1__2 : rule__XMemberFeatureCall__Group_1_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1_1__3 ;
     public final void rule__XMemberFeatureCall__Group_1_1_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14234:1: ( rule__XMemberFeatureCall__Group_1_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1_1__3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14235:2: rule__XMemberFeatureCall__Group_1_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1_1__3
+            // InternalFormat.g:14234:1: ( rule__XMemberFeatureCall__Group_1_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1_1__3 )
+            // InternalFormat.g:14235:2: rule__XMemberFeatureCall__Group_1_1_1__2__Impl rule__XMemberFeatureCall__Group_1_1_1__3
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__2__Impl_in_rule__XMemberFeatureCall__Group_1_1_1__229185);
+            pushFollow(FOLLOW_87);
             rule__XMemberFeatureCall__Group_1_1_1__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__3_in_rule__XMemberFeatureCall__Group_1_1_1__229188);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_1__3();
 
             state._fsp--;
@@ -42365,22 +42365,22 @@ public final void rule__XMemberFeatureCall__Group_1_1_1__2() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14242:1: rule__XMemberFeatureCall__Group_1_1_1__2__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* ) ;
+    // InternalFormat.g:14242:1: rule__XMemberFeatureCall__Group_1_1_1__2__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14246:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14247:1: ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* )
+            // InternalFormat.g:14246:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* ) )
+            // InternalFormat.g:14247:1: ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14247:1: ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14248:1: ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )*
+            // InternalFormat.g:14247:1: ( ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )* )
+            // InternalFormat.g:14248:1: ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14249:1: ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )*
+            // InternalFormat.g:14249:1: ( rule__XMemberFeatureCall__Group_1_1_1_2__0 )*
             loop117:
             do {
                 int alt117=2;
@@ -42393,9 +42393,9 @@ public final void rule__XMemberFeatureCall__Group_1_1_1__2__Impl() throws Recogn
 
                 switch (alt117) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14249:2: rule__XMemberFeatureCall__Group_1_1_1_2__0
+            	    // InternalFormat.g:14249:2: rule__XMemberFeatureCall__Group_1_1_1_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1_2__0_in_rule__XMemberFeatureCall__Group_1_1_1__2__Impl29215);
+            	    pushFollow(FOLLOW_23);
             	    rule__XMemberFeatureCall__Group_1_1_1_2__0();
 
             	    state._fsp--;
@@ -42434,16 +42434,16 @@ public final void rule__XMemberFeatureCall__Group_1_1_1__2__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14259:1: rule__XMemberFeatureCall__Group_1_1_1__3 : rule__XMemberFeatureCall__Group_1_1_1__3__Impl ;
+    // InternalFormat.g:14259:1: rule__XMemberFeatureCall__Group_1_1_1__3 : rule__XMemberFeatureCall__Group_1_1_1__3__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_1_1__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14263:1: ( rule__XMemberFeatureCall__Group_1_1_1__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14264:2: rule__XMemberFeatureCall__Group_1_1_1__3__Impl
+            // InternalFormat.g:14263:1: ( rule__XMemberFeatureCall__Group_1_1_1__3__Impl )
+            // InternalFormat.g:14264:2: rule__XMemberFeatureCall__Group_1_1_1__3__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__3__Impl_in_rule__XMemberFeatureCall__Group_1_1_1__329246);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_1__3__Impl();
 
             state._fsp--;
@@ -42467,22 +42467,22 @@ public final void rule__XMemberFeatureCall__Group_1_1_1__3() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14270:1: rule__XMemberFeatureCall__Group_1_1_1__3__Impl : ( '>' ) ;
+    // InternalFormat.g:14270:1: rule__XMemberFeatureCall__Group_1_1_1__3__Impl : ( '>' ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_1__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14274:1: ( ( '>' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14275:1: ( '>' )
+            // InternalFormat.g:14274:1: ( ( '>' ) )
+            // InternalFormat.g:14275:1: ( '>' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14275:1: ( '>' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14276:1: '>'
+            // InternalFormat.g:14275:1: ( '>' )
+            // InternalFormat.g:14276:1: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGreaterThanSignKeyword_1_1_1_3()); 
             }
-            match(input,32,FOLLOW_32_in_rule__XMemberFeatureCall__Group_1_1_1__3__Impl29274); if (state.failed) return ;
+            match(input,32,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getGreaterThanSignKeyword_1_1_1_3()); 
             }
@@ -42508,21 +42508,21 @@ public final void rule__XMemberFeatureCall__Group_1_1_1__3__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1_2__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14297:1: rule__XMemberFeatureCall__Group_1_1_1_2__0 : rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl rule__XMemberFeatureCall__Group_1_1_1_2__1 ;
+    // InternalFormat.g:14297:1: rule__XMemberFeatureCall__Group_1_1_1_2__0 : rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl rule__XMemberFeatureCall__Group_1_1_1_2__1 ;
     public final void rule__XMemberFeatureCall__Group_1_1_1_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14301:1: ( rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl rule__XMemberFeatureCall__Group_1_1_1_2__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14302:2: rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl rule__XMemberFeatureCall__Group_1_1_1_2__1
+            // InternalFormat.g:14301:1: ( rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl rule__XMemberFeatureCall__Group_1_1_1_2__1 )
+            // InternalFormat.g:14302:2: rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl rule__XMemberFeatureCall__Group_1_1_1_2__1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_1_2__029313);
+            pushFollow(FOLLOW_86);
             rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1_2__1_in_rule__XMemberFeatureCall__Group_1_1_1_2__029316);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_1_2__1();
 
             state._fsp--;
@@ -42546,22 +42546,22 @@ public final void rule__XMemberFeatureCall__Group_1_1_1_2__0() throws Recognitio
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14309:1: rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl : ( ',' ) ;
+    // InternalFormat.g:14309:1: rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl : ( ',' ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14313:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14314:1: ( ',' )
+            // InternalFormat.g:14313:1: ( ( ',' ) )
+            // InternalFormat.g:14314:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14314:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14315:1: ','
+            // InternalFormat.g:14314:1: ( ',' )
+            // InternalFormat.g:14315:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getCommaKeyword_1_1_1_2_0()); 
             }
-            match(input,71,FOLLOW_71_in_rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl29344); if (state.failed) return ;
+            match(input,71,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getCommaKeyword_1_1_1_2_0()); 
             }
@@ -42587,16 +42587,16 @@ public final void rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl() throws Reco
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1_2__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14328:1: rule__XMemberFeatureCall__Group_1_1_1_2__1 : rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl ;
+    // InternalFormat.g:14328:1: rule__XMemberFeatureCall__Group_1_1_1_2__1 : rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_1_1_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14332:1: ( rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14333:2: rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl
+            // InternalFormat.g:14332:1: ( rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl )
+            // InternalFormat.g:14333:2: rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_1_2__129375);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl();
 
             state._fsp--;
@@ -42620,25 +42620,25 @@ public final void rule__XMemberFeatureCall__Group_1_1_1_2__1() throws Recognitio
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14339:1: rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl : ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) ) ;
+    // InternalFormat.g:14339:1: rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl : ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14343:1: ( ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14344:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) )
+            // InternalFormat.g:14343:1: ( ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) ) )
+            // InternalFormat.g:14344:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14344:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14345:1: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 )
+            // InternalFormat.g:14344:1: ( ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 ) )
+            // InternalFormat.g:14345:1: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getTypeArgumentsAssignment_1_1_1_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14346:1: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14346:2: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1
+            // InternalFormat.g:14346:1: ( rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 )
+            // InternalFormat.g:14346:2: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1_in_rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl29402);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1();
 
             state._fsp--;
@@ -42671,21 +42671,21 @@ public final void rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl() throws Reco
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14360:1: rule__XMemberFeatureCall__Group_1_1_3__0 : rule__XMemberFeatureCall__Group_1_1_3__0__Impl rule__XMemberFeatureCall__Group_1_1_3__1 ;
+    // InternalFormat.g:14360:1: rule__XMemberFeatureCall__Group_1_1_3__0 : rule__XMemberFeatureCall__Group_1_1_3__0__Impl rule__XMemberFeatureCall__Group_1_1_3__1 ;
     public final void rule__XMemberFeatureCall__Group_1_1_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14364:1: ( rule__XMemberFeatureCall__Group_1_1_3__0__Impl rule__XMemberFeatureCall__Group_1_1_3__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14365:2: rule__XMemberFeatureCall__Group_1_1_3__0__Impl rule__XMemberFeatureCall__Group_1_1_3__1
+            // InternalFormat.g:14364:1: ( rule__XMemberFeatureCall__Group_1_1_3__0__Impl rule__XMemberFeatureCall__Group_1_1_3__1 )
+            // InternalFormat.g:14365:2: rule__XMemberFeatureCall__Group_1_1_3__0__Impl rule__XMemberFeatureCall__Group_1_1_3__1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_3__029436);
+            pushFollow(FOLLOW_88);
             rule__XMemberFeatureCall__Group_1_1_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__1_in_rule__XMemberFeatureCall__Group_1_1_3__029439);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_3__1();
 
             state._fsp--;
@@ -42709,25 +42709,25 @@ public final void rule__XMemberFeatureCall__Group_1_1_3__0() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14372:1: rule__XMemberFeatureCall__Group_1_1_3__0__Impl : ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) ) ;
+    // InternalFormat.g:14372:1: rule__XMemberFeatureCall__Group_1_1_3__0__Impl : ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14376:1: ( ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14377:1: ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) )
+            // InternalFormat.g:14376:1: ( ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) ) )
+            // InternalFormat.g:14377:1: ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14377:1: ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14378:1: ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 )
+            // InternalFormat.g:14377:1: ( ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 ) )
+            // InternalFormat.g:14378:1: ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getExplicitOperationCallAssignment_1_1_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14379:1: ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14379:2: rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0
+            // InternalFormat.g:14379:1: ( rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 )
+            // InternalFormat.g:14379:2: rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0_in_rule__XMemberFeatureCall__Group_1_1_3__0__Impl29466);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0();
 
             state._fsp--;
@@ -42760,21 +42760,21 @@ public final void rule__XMemberFeatureCall__Group_1_1_3__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14389:1: rule__XMemberFeatureCall__Group_1_1_3__1 : rule__XMemberFeatureCall__Group_1_1_3__1__Impl rule__XMemberFeatureCall__Group_1_1_3__2 ;
+    // InternalFormat.g:14389:1: rule__XMemberFeatureCall__Group_1_1_3__1 : rule__XMemberFeatureCall__Group_1_1_3__1__Impl rule__XMemberFeatureCall__Group_1_1_3__2 ;
     public final void rule__XMemberFeatureCall__Group_1_1_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14393:1: ( rule__XMemberFeatureCall__Group_1_1_3__1__Impl rule__XMemberFeatureCall__Group_1_1_3__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14394:2: rule__XMemberFeatureCall__Group_1_1_3__1__Impl rule__XMemberFeatureCall__Group_1_1_3__2
+            // InternalFormat.g:14393:1: ( rule__XMemberFeatureCall__Group_1_1_3__1__Impl rule__XMemberFeatureCall__Group_1_1_3__2 )
+            // InternalFormat.g:14394:2: rule__XMemberFeatureCall__Group_1_1_3__1__Impl rule__XMemberFeatureCall__Group_1_1_3__2
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_3__129496);
+            pushFollow(FOLLOW_88);
             rule__XMemberFeatureCall__Group_1_1_3__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__2_in_rule__XMemberFeatureCall__Group_1_1_3__129499);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_3__2();
 
             state._fsp--;
@@ -42798,22 +42798,22 @@ public final void rule__XMemberFeatureCall__Group_1_1_3__1() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14401:1: rule__XMemberFeatureCall__Group_1_1_3__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? ) ;
+    // InternalFormat.g:14401:1: rule__XMemberFeatureCall__Group_1_1_3__1__Impl : ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14405:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14406:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? )
+            // InternalFormat.g:14405:1: ( ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? ) )
+            // InternalFormat.g:14406:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14406:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14407:1: ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )?
+            // InternalFormat.g:14406:1: ( ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )? )
+            // InternalFormat.g:14407:1: ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getAlternatives_1_1_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14408:1: ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )?
+            // InternalFormat.g:14408:1: ( rule__XMemberFeatureCall__Alternatives_1_1_3_1 )?
             int alt118=2;
             int LA118_0 = input.LA(1);
 
@@ -42822,9 +42822,9 @@ public final void rule__XMemberFeatureCall__Group_1_1_3__1__Impl() throws Recogn
             }
             switch (alt118) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14408:2: rule__XMemberFeatureCall__Alternatives_1_1_3_1
+                    // InternalFormat.g:14408:2: rule__XMemberFeatureCall__Alternatives_1_1_3_1
                     {
-                    pushFollow(FOLLOW_rule__XMemberFeatureCall__Alternatives_1_1_3_1_in_rule__XMemberFeatureCall__Group_1_1_3__1__Impl29526);
+                    pushFollow(FOLLOW_2);
                     rule__XMemberFeatureCall__Alternatives_1_1_3_1();
 
                     state._fsp--;
@@ -42860,16 +42860,16 @@ public final void rule__XMemberFeatureCall__Group_1_1_3__1__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14418:1: rule__XMemberFeatureCall__Group_1_1_3__2 : rule__XMemberFeatureCall__Group_1_1_3__2__Impl ;
+    // InternalFormat.g:14418:1: rule__XMemberFeatureCall__Group_1_1_3__2 : rule__XMemberFeatureCall__Group_1_1_3__2__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_1_3__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14422:1: ( rule__XMemberFeatureCall__Group_1_1_3__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14423:2: rule__XMemberFeatureCall__Group_1_1_3__2__Impl
+            // InternalFormat.g:14422:1: ( rule__XMemberFeatureCall__Group_1_1_3__2__Impl )
+            // InternalFormat.g:14423:2: rule__XMemberFeatureCall__Group_1_1_3__2__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__2__Impl_in_rule__XMemberFeatureCall__Group_1_1_3__229557);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_3__2__Impl();
 
             state._fsp--;
@@ -42893,22 +42893,22 @@ public final void rule__XMemberFeatureCall__Group_1_1_3__2() throws RecognitionE
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14429:1: rule__XMemberFeatureCall__Group_1_1_3__2__Impl : ( ')' ) ;
+    // InternalFormat.g:14429:1: rule__XMemberFeatureCall__Group_1_1_3__2__Impl : ( ')' ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_3__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14433:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14434:1: ( ')' )
+            // InternalFormat.g:14433:1: ( ( ')' ) )
+            // InternalFormat.g:14434:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14434:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14435:1: ')'
+            // InternalFormat.g:14434:1: ( ')' )
+            // InternalFormat.g:14435:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getRightParenthesisKeyword_1_1_3_2()); 
             }
-            match(input,75,FOLLOW_75_in_rule__XMemberFeatureCall__Group_1_1_3__2__Impl29585); if (state.failed) return ;
+            match(input,75,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getRightParenthesisKeyword_1_1_3_2()); 
             }
@@ -42934,21 +42934,21 @@ public final void rule__XMemberFeatureCall__Group_1_1_3__2__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14454:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__0 : rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1__1 ;
+    // InternalFormat.g:14454:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__0 : rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1__1 ;
     public final void rule__XMemberFeatureCall__Group_1_1_3_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14458:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14459:2: rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1__1
+            // InternalFormat.g:14458:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1__1 )
+            // InternalFormat.g:14459:2: rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1__1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__029622);
+            pushFollow(FOLLOW_46);
             rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1__1_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__029625);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_3_1_1__1();
 
             state._fsp--;
@@ -42972,25 +42972,25 @@ public final void rule__XMemberFeatureCall__Group_1_1_3_1_1__0() throws Recognit
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14466:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl : ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) ) ;
+    // InternalFormat.g:14466:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl : ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14470:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14471:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) )
+            // InternalFormat.g:14470:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) ) )
+            // InternalFormat.g:14471:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14471:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14472:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 )
+            // InternalFormat.g:14471:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 ) )
+            // InternalFormat.g:14472:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsAssignment_1_1_3_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14473:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14473:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0
+            // InternalFormat.g:14473:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 )
+            // InternalFormat.g:14473:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl29652);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0();
 
             state._fsp--;
@@ -43023,16 +43023,16 @@ public final void rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl() throws Re
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14483:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__1 : rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl ;
+    // InternalFormat.g:14483:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__1 : rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_1_3_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14487:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14488:2: rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl
+            // InternalFormat.g:14487:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl )
+            // InternalFormat.g:14488:2: rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__129682);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl();
 
             state._fsp--;
@@ -43056,22 +43056,22 @@ public final void rule__XMemberFeatureCall__Group_1_1_3_1_1__1() throws Recognit
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14494:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* ) ;
+    // InternalFormat.g:14494:1: rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl : ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14498:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14499:1: ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* )
+            // InternalFormat.g:14498:1: ( ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* ) )
+            // InternalFormat.g:14499:1: ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14499:1: ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14500:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )*
+            // InternalFormat.g:14499:1: ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )* )
+            // InternalFormat.g:14500:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getGroup_1_1_3_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14501:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )*
+            // InternalFormat.g:14501:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 )*
             loop119:
             do {
                 int alt119=2;
@@ -43084,9 +43084,9 @@ public final void rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl() throws Re
 
                 switch (alt119) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14501:2: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0
+            	    // InternalFormat.g:14501:2: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl29709);
+            	    pushFollow(FOLLOW_23);
             	    rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0();
 
             	    state._fsp--;
@@ -43125,21 +43125,21 @@ public final void rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl() throws Re
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14515:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 : rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1 ;
+    // InternalFormat.g:14515:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0 : rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1 ;
     public final void rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14519:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14520:2: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1
+            // InternalFormat.g:14519:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1 )
+            // InternalFormat.g:14520:2: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__029744);
+            pushFollow(FOLLOW_50);
             rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__029747);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1();
 
             state._fsp--;
@@ -43163,22 +43163,22 @@ public final void rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14527:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl : ( ',' ) ;
+    // InternalFormat.g:14527:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl : ( ',' ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14531:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14532:1: ( ',' )
+            // InternalFormat.g:14531:1: ( ( ',' ) )
+            // InternalFormat.g:14532:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14532:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14533:1: ','
+            // InternalFormat.g:14532:1: ( ',' )
+            // InternalFormat.g:14533:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getCommaKeyword_1_1_3_1_1_1_0()); 
             }
-            match(input,71,FOLLOW_71_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl29775); if (state.failed) return ;
+            match(input,71,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getCommaKeyword_1_1_3_1_1_1_0()); 
             }
@@ -43204,16 +43204,16 @@ public final void rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl() throws
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14546:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1 : rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl ;
+    // InternalFormat.g:14546:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1 : rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl ;
     public final void rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14550:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14551:2: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl
+            // InternalFormat.g:14550:1: ( rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl )
+            // InternalFormat.g:14551:2: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__129806);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl();
 
             state._fsp--;
@@ -43237,25 +43237,25 @@ public final void rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1() throws Recogn
 
 
     // $ANTLR start "rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14557:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl : ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) ) ;
+    // InternalFormat.g:14557:1: rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl : ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) ) ;
     public final void rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14561:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14562:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) )
+            // InternalFormat.g:14561:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) ) )
+            // InternalFormat.g:14562:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14562:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14563:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 )
+            // InternalFormat.g:14562:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 ) )
+            // InternalFormat.g:14563:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsAssignment_1_1_3_1_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14564:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14564:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1
+            // InternalFormat.g:14564:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 )
+            // InternalFormat.g:14564:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1
             {
-            pushFollow(FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl29833);
+            pushFollow(FOLLOW_2);
             rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1();
 
             state._fsp--;
@@ -43288,21 +43288,21 @@ public final void rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl() throws
 
 
     // $ANTLR start "rule__XSetLiteral__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14578:1: rule__XSetLiteral__Group__0 : rule__XSetLiteral__Group__0__Impl rule__XSetLiteral__Group__1 ;
+    // InternalFormat.g:14578:1: rule__XSetLiteral__Group__0 : rule__XSetLiteral__Group__0__Impl rule__XSetLiteral__Group__1 ;
     public final void rule__XSetLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14582:1: ( rule__XSetLiteral__Group__0__Impl rule__XSetLiteral__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14583:2: rule__XSetLiteral__Group__0__Impl rule__XSetLiteral__Group__1
+            // InternalFormat.g:14582:1: ( rule__XSetLiteral__Group__0__Impl rule__XSetLiteral__Group__1 )
+            // InternalFormat.g:14583:2: rule__XSetLiteral__Group__0__Impl rule__XSetLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__Group__0__Impl_in_rule__XSetLiteral__Group__029867);
+            pushFollow(FOLLOW_52);
             rule__XSetLiteral__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSetLiteral__Group__1_in_rule__XSetLiteral__Group__029870);
+            pushFollow(FOLLOW_2);
             rule__XSetLiteral__Group__1();
 
             state._fsp--;
@@ -43326,23 +43326,23 @@ public final void rule__XSetLiteral__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XSetLiteral__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14590:1: rule__XSetLiteral__Group__0__Impl : ( () ) ;
+    // InternalFormat.g:14590:1: rule__XSetLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XSetLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14594:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14595:1: ( () )
+            // InternalFormat.g:14594:1: ( ( () ) )
+            // InternalFormat.g:14595:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14595:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14596:1: ()
+            // InternalFormat.g:14595:1: ( () )
+            // InternalFormat.g:14596:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getXSetLiteralAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14597:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14599:1: 
+            // InternalFormat.g:14597:1: ()
+            // InternalFormat.g:14599:1: 
             {
             }
 
@@ -43367,21 +43367,21 @@ public final void rule__XSetLiteral__Group__0__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSetLiteral__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14609:1: rule__XSetLiteral__Group__1 : rule__XSetLiteral__Group__1__Impl rule__XSetLiteral__Group__2 ;
+    // InternalFormat.g:14609:1: rule__XSetLiteral__Group__1 : rule__XSetLiteral__Group__1__Impl rule__XSetLiteral__Group__2 ;
     public final void rule__XSetLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14613:1: ( rule__XSetLiteral__Group__1__Impl rule__XSetLiteral__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14614:2: rule__XSetLiteral__Group__1__Impl rule__XSetLiteral__Group__2
+            // InternalFormat.g:14613:1: ( rule__XSetLiteral__Group__1__Impl rule__XSetLiteral__Group__2 )
+            // InternalFormat.g:14614:2: rule__XSetLiteral__Group__1__Impl rule__XSetLiteral__Group__2
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__Group__1__Impl_in_rule__XSetLiteral__Group__129928);
+            pushFollow(FOLLOW_15);
             rule__XSetLiteral__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSetLiteral__Group__2_in_rule__XSetLiteral__Group__129931);
+            pushFollow(FOLLOW_2);
             rule__XSetLiteral__Group__2();
 
             state._fsp--;
@@ -43405,22 +43405,22 @@ public final void rule__XSetLiteral__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XSetLiteral__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14621:1: rule__XSetLiteral__Group__1__Impl : ( '#' ) ;
+    // InternalFormat.g:14621:1: rule__XSetLiteral__Group__1__Impl : ( '#' ) ;
     public final void rule__XSetLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14625:1: ( ( '#' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14626:1: ( '#' )
+            // InternalFormat.g:14625:1: ( ( '#' ) )
+            // InternalFormat.g:14626:1: ( '#' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14626:1: ( '#' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14627:1: '#'
+            // InternalFormat.g:14626:1: ( '#' )
+            // InternalFormat.g:14627:1: '#'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getNumberSignKeyword_1()); 
             }
-            match(input,84,FOLLOW_84_in_rule__XSetLiteral__Group__1__Impl29959); if (state.failed) return ;
+            match(input,84,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSetLiteralAccess().getNumberSignKeyword_1()); 
             }
@@ -43446,21 +43446,21 @@ public final void rule__XSetLiteral__Group__1__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSetLiteral__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14640:1: rule__XSetLiteral__Group__2 : rule__XSetLiteral__Group__2__Impl rule__XSetLiteral__Group__3 ;
+    // InternalFormat.g:14640:1: rule__XSetLiteral__Group__2 : rule__XSetLiteral__Group__2__Impl rule__XSetLiteral__Group__3 ;
     public final void rule__XSetLiteral__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14644:1: ( rule__XSetLiteral__Group__2__Impl rule__XSetLiteral__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14645:2: rule__XSetLiteral__Group__2__Impl rule__XSetLiteral__Group__3
+            // InternalFormat.g:14644:1: ( rule__XSetLiteral__Group__2__Impl rule__XSetLiteral__Group__3 )
+            // InternalFormat.g:14645:2: rule__XSetLiteral__Group__2__Impl rule__XSetLiteral__Group__3
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__Group__2__Impl_in_rule__XSetLiteral__Group__229990);
+            pushFollow(FOLLOW_89);
             rule__XSetLiteral__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSetLiteral__Group__3_in_rule__XSetLiteral__Group__229993);
+            pushFollow(FOLLOW_2);
             rule__XSetLiteral__Group__3();
 
             state._fsp--;
@@ -43484,22 +43484,22 @@ public final void rule__XSetLiteral__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XSetLiteral__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14652:1: rule__XSetLiteral__Group__2__Impl : ( '{' ) ;
+    // InternalFormat.g:14652:1: rule__XSetLiteral__Group__2__Impl : ( '{' ) ;
     public final void rule__XSetLiteral__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14656:1: ( ( '{' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14657:1: ( '{' )
+            // InternalFormat.g:14656:1: ( ( '{' ) )
+            // InternalFormat.g:14657:1: ( '{' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14657:1: ( '{' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14658:1: '{'
+            // InternalFormat.g:14657:1: ( '{' )
+            // InternalFormat.g:14658:1: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getLeftCurlyBracketKeyword_2()); 
             }
-            match(input,66,FOLLOW_66_in_rule__XSetLiteral__Group__2__Impl30021); if (state.failed) return ;
+            match(input,66,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSetLiteralAccess().getLeftCurlyBracketKeyword_2()); 
             }
@@ -43525,21 +43525,21 @@ public final void rule__XSetLiteral__Group__2__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSetLiteral__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14671:1: rule__XSetLiteral__Group__3 : rule__XSetLiteral__Group__3__Impl rule__XSetLiteral__Group__4 ;
+    // InternalFormat.g:14671:1: rule__XSetLiteral__Group__3 : rule__XSetLiteral__Group__3__Impl rule__XSetLiteral__Group__4 ;
     public final void rule__XSetLiteral__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14675:1: ( rule__XSetLiteral__Group__3__Impl rule__XSetLiteral__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14676:2: rule__XSetLiteral__Group__3__Impl rule__XSetLiteral__Group__4
+            // InternalFormat.g:14675:1: ( rule__XSetLiteral__Group__3__Impl rule__XSetLiteral__Group__4 )
+            // InternalFormat.g:14676:2: rule__XSetLiteral__Group__3__Impl rule__XSetLiteral__Group__4
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__Group__3__Impl_in_rule__XSetLiteral__Group__330052);
+            pushFollow(FOLLOW_89);
             rule__XSetLiteral__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSetLiteral__Group__4_in_rule__XSetLiteral__Group__330055);
+            pushFollow(FOLLOW_2);
             rule__XSetLiteral__Group__4();
 
             state._fsp--;
@@ -43563,22 +43563,22 @@ public final void rule__XSetLiteral__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XSetLiteral__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14683:1: rule__XSetLiteral__Group__3__Impl : ( ( rule__XSetLiteral__Group_3__0 )? ) ;
+    // InternalFormat.g:14683:1: rule__XSetLiteral__Group__3__Impl : ( ( rule__XSetLiteral__Group_3__0 )? ) ;
     public final void rule__XSetLiteral__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14687:1: ( ( ( rule__XSetLiteral__Group_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14688:1: ( ( rule__XSetLiteral__Group_3__0 )? )
+            // InternalFormat.g:14687:1: ( ( ( rule__XSetLiteral__Group_3__0 )? ) )
+            // InternalFormat.g:14688:1: ( ( rule__XSetLiteral__Group_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14688:1: ( ( rule__XSetLiteral__Group_3__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14689:1: ( rule__XSetLiteral__Group_3__0 )?
+            // InternalFormat.g:14688:1: ( ( rule__XSetLiteral__Group_3__0 )? )
+            // InternalFormat.g:14689:1: ( rule__XSetLiteral__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getGroup_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14690:1: ( rule__XSetLiteral__Group_3__0 )?
+            // InternalFormat.g:14690:1: ( rule__XSetLiteral__Group_3__0 )?
             int alt120=2;
             int LA120_0 = input.LA(1);
 
@@ -43587,9 +43587,9 @@ public final void rule__XSetLiteral__Group__3__Impl() throws RecognitionExceptio
             }
             switch (alt120) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14690:2: rule__XSetLiteral__Group_3__0
+                    // InternalFormat.g:14690:2: rule__XSetLiteral__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__XSetLiteral__Group_3__0_in_rule__XSetLiteral__Group__3__Impl30082);
+                    pushFollow(FOLLOW_2);
                     rule__XSetLiteral__Group_3__0();
 
                     state._fsp--;
@@ -43625,16 +43625,16 @@ public final void rule__XSetLiteral__Group__3__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSetLiteral__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14700:1: rule__XSetLiteral__Group__4 : rule__XSetLiteral__Group__4__Impl ;
+    // InternalFormat.g:14700:1: rule__XSetLiteral__Group__4 : rule__XSetLiteral__Group__4__Impl ;
     public final void rule__XSetLiteral__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14704:1: ( rule__XSetLiteral__Group__4__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14705:2: rule__XSetLiteral__Group__4__Impl
+            // InternalFormat.g:14704:1: ( rule__XSetLiteral__Group__4__Impl )
+            // InternalFormat.g:14705:2: rule__XSetLiteral__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__Group__4__Impl_in_rule__XSetLiteral__Group__430113);
+            pushFollow(FOLLOW_2);
             rule__XSetLiteral__Group__4__Impl();
 
             state._fsp--;
@@ -43658,22 +43658,22 @@ public final void rule__XSetLiteral__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__XSetLiteral__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14711:1: rule__XSetLiteral__Group__4__Impl : ( '}' ) ;
+    // InternalFormat.g:14711:1: rule__XSetLiteral__Group__4__Impl : ( '}' ) ;
     public final void rule__XSetLiteral__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14715:1: ( ( '}' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14716:1: ( '}' )
+            // InternalFormat.g:14715:1: ( ( '}' ) )
+            // InternalFormat.g:14716:1: ( '}' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14716:1: ( '}' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14717:1: '}'
+            // InternalFormat.g:14716:1: ( '}' )
+            // InternalFormat.g:14717:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getRightCurlyBracketKeyword_4()); 
             }
-            match(input,67,FOLLOW_67_in_rule__XSetLiteral__Group__4__Impl30141); if (state.failed) return ;
+            match(input,67,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSetLiteralAccess().getRightCurlyBracketKeyword_4()); 
             }
@@ -43699,21 +43699,21 @@ public final void rule__XSetLiteral__Group__4__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14740:1: rule__XSetLiteral__Group_3__0 : rule__XSetLiteral__Group_3__0__Impl rule__XSetLiteral__Group_3__1 ;
+    // InternalFormat.g:14740:1: rule__XSetLiteral__Group_3__0 : rule__XSetLiteral__Group_3__0__Impl rule__XSetLiteral__Group_3__1 ;
     public final void rule__XSetLiteral__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14744:1: ( rule__XSetLiteral__Group_3__0__Impl rule__XSetLiteral__Group_3__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14745:2: rule__XSetLiteral__Group_3__0__Impl rule__XSetLiteral__Group_3__1
+            // InternalFormat.g:14744:1: ( rule__XSetLiteral__Group_3__0__Impl rule__XSetLiteral__Group_3__1 )
+            // InternalFormat.g:14745:2: rule__XSetLiteral__Group_3__0__Impl rule__XSetLiteral__Group_3__1
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__Group_3__0__Impl_in_rule__XSetLiteral__Group_3__030182);
+            pushFollow(FOLLOW_46);
             rule__XSetLiteral__Group_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSetLiteral__Group_3__1_in_rule__XSetLiteral__Group_3__030185);
+            pushFollow(FOLLOW_2);
             rule__XSetLiteral__Group_3__1();
 
             state._fsp--;
@@ -43737,25 +43737,25 @@ public final void rule__XSetLiteral__Group_3__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14752:1: rule__XSetLiteral__Group_3__0__Impl : ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) ) ;
+    // InternalFormat.g:14752:1: rule__XSetLiteral__Group_3__0__Impl : ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) ) ;
     public final void rule__XSetLiteral__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14756:1: ( ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14757:1: ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) )
+            // InternalFormat.g:14756:1: ( ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) ) )
+            // InternalFormat.g:14757:1: ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14757:1: ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14758:1: ( rule__XSetLiteral__ElementsAssignment_3_0 )
+            // InternalFormat.g:14757:1: ( ( rule__XSetLiteral__ElementsAssignment_3_0 ) )
+            // InternalFormat.g:14758:1: ( rule__XSetLiteral__ElementsAssignment_3_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getElementsAssignment_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14759:1: ( rule__XSetLiteral__ElementsAssignment_3_0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14759:2: rule__XSetLiteral__ElementsAssignment_3_0
+            // InternalFormat.g:14759:1: ( rule__XSetLiteral__ElementsAssignment_3_0 )
+            // InternalFormat.g:14759:2: rule__XSetLiteral__ElementsAssignment_3_0
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__ElementsAssignment_3_0_in_rule__XSetLiteral__Group_3__0__Impl30212);
+            pushFollow(FOLLOW_2);
             rule__XSetLiteral__ElementsAssignment_3_0();
 
             state._fsp--;
@@ -43788,16 +43788,16 @@ public final void rule__XSetLiteral__Group_3__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14769:1: rule__XSetLiteral__Group_3__1 : rule__XSetLiteral__Group_3__1__Impl ;
+    // InternalFormat.g:14769:1: rule__XSetLiteral__Group_3__1 : rule__XSetLiteral__Group_3__1__Impl ;
     public final void rule__XSetLiteral__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14773:1: ( rule__XSetLiteral__Group_3__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14774:2: rule__XSetLiteral__Group_3__1__Impl
+            // InternalFormat.g:14773:1: ( rule__XSetLiteral__Group_3__1__Impl )
+            // InternalFormat.g:14774:2: rule__XSetLiteral__Group_3__1__Impl
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__Group_3__1__Impl_in_rule__XSetLiteral__Group_3__130242);
+            pushFollow(FOLLOW_2);
             rule__XSetLiteral__Group_3__1__Impl();
 
             state._fsp--;
@@ -43821,22 +43821,22 @@ public final void rule__XSetLiteral__Group_3__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14780:1: rule__XSetLiteral__Group_3__1__Impl : ( ( rule__XSetLiteral__Group_3_1__0 )* ) ;
+    // InternalFormat.g:14780:1: rule__XSetLiteral__Group_3__1__Impl : ( ( rule__XSetLiteral__Group_3_1__0 )* ) ;
     public final void rule__XSetLiteral__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14784:1: ( ( ( rule__XSetLiteral__Group_3_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14785:1: ( ( rule__XSetLiteral__Group_3_1__0 )* )
+            // InternalFormat.g:14784:1: ( ( ( rule__XSetLiteral__Group_3_1__0 )* ) )
+            // InternalFormat.g:14785:1: ( ( rule__XSetLiteral__Group_3_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14785:1: ( ( rule__XSetLiteral__Group_3_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14786:1: ( rule__XSetLiteral__Group_3_1__0 )*
+            // InternalFormat.g:14785:1: ( ( rule__XSetLiteral__Group_3_1__0 )* )
+            // InternalFormat.g:14786:1: ( rule__XSetLiteral__Group_3_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getGroup_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14787:1: ( rule__XSetLiteral__Group_3_1__0 )*
+            // InternalFormat.g:14787:1: ( rule__XSetLiteral__Group_3_1__0 )*
             loop121:
             do {
                 int alt121=2;
@@ -43849,9 +43849,9 @@ public final void rule__XSetLiteral__Group_3__1__Impl() throws RecognitionExcept
 
                 switch (alt121) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14787:2: rule__XSetLiteral__Group_3_1__0
+            	    // InternalFormat.g:14787:2: rule__XSetLiteral__Group_3_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XSetLiteral__Group_3_1__0_in_rule__XSetLiteral__Group_3__1__Impl30269);
+            	    pushFollow(FOLLOW_23);
             	    rule__XSetLiteral__Group_3_1__0();
 
             	    state._fsp--;
@@ -43890,21 +43890,21 @@ public final void rule__XSetLiteral__Group_3__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14801:1: rule__XSetLiteral__Group_3_1__0 : rule__XSetLiteral__Group_3_1__0__Impl rule__XSetLiteral__Group_3_1__1 ;
+    // InternalFormat.g:14801:1: rule__XSetLiteral__Group_3_1__0 : rule__XSetLiteral__Group_3_1__0__Impl rule__XSetLiteral__Group_3_1__1 ;
     public final void rule__XSetLiteral__Group_3_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14805:1: ( rule__XSetLiteral__Group_3_1__0__Impl rule__XSetLiteral__Group_3_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14806:2: rule__XSetLiteral__Group_3_1__0__Impl rule__XSetLiteral__Group_3_1__1
+            // InternalFormat.g:14805:1: ( rule__XSetLiteral__Group_3_1__0__Impl rule__XSetLiteral__Group_3_1__1 )
+            // InternalFormat.g:14806:2: rule__XSetLiteral__Group_3_1__0__Impl rule__XSetLiteral__Group_3_1__1
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__Group_3_1__0__Impl_in_rule__XSetLiteral__Group_3_1__030304);
+            pushFollow(FOLLOW_50);
             rule__XSetLiteral__Group_3_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSetLiteral__Group_3_1__1_in_rule__XSetLiteral__Group_3_1__030307);
+            pushFollow(FOLLOW_2);
             rule__XSetLiteral__Group_3_1__1();
 
             state._fsp--;
@@ -43928,22 +43928,22 @@ public final void rule__XSetLiteral__Group_3_1__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14813:1: rule__XSetLiteral__Group_3_1__0__Impl : ( ',' ) ;
+    // InternalFormat.g:14813:1: rule__XSetLiteral__Group_3_1__0__Impl : ( ',' ) ;
     public final void rule__XSetLiteral__Group_3_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14817:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14818:1: ( ',' )
+            // InternalFormat.g:14817:1: ( ( ',' ) )
+            // InternalFormat.g:14818:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14818:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14819:1: ','
+            // InternalFormat.g:14818:1: ( ',' )
+            // InternalFormat.g:14819:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getCommaKeyword_3_1_0()); 
             }
-            match(input,71,FOLLOW_71_in_rule__XSetLiteral__Group_3_1__0__Impl30335); if (state.failed) return ;
+            match(input,71,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSetLiteralAccess().getCommaKeyword_3_1_0()); 
             }
@@ -43969,16 +43969,16 @@ public final void rule__XSetLiteral__Group_3_1__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14832:1: rule__XSetLiteral__Group_3_1__1 : rule__XSetLiteral__Group_3_1__1__Impl ;
+    // InternalFormat.g:14832:1: rule__XSetLiteral__Group_3_1__1 : rule__XSetLiteral__Group_3_1__1__Impl ;
     public final void rule__XSetLiteral__Group_3_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14836:1: ( rule__XSetLiteral__Group_3_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14837:2: rule__XSetLiteral__Group_3_1__1__Impl
+            // InternalFormat.g:14836:1: ( rule__XSetLiteral__Group_3_1__1__Impl )
+            // InternalFormat.g:14837:2: rule__XSetLiteral__Group_3_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__Group_3_1__1__Impl_in_rule__XSetLiteral__Group_3_1__130366);
+            pushFollow(FOLLOW_2);
             rule__XSetLiteral__Group_3_1__1__Impl();
 
             state._fsp--;
@@ -44002,25 +44002,25 @@ public final void rule__XSetLiteral__Group_3_1__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XSetLiteral__Group_3_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14843:1: rule__XSetLiteral__Group_3_1__1__Impl : ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) ) ;
+    // InternalFormat.g:14843:1: rule__XSetLiteral__Group_3_1__1__Impl : ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) ) ;
     public final void rule__XSetLiteral__Group_3_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14847:1: ( ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14848:1: ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) )
+            // InternalFormat.g:14847:1: ( ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) ) )
+            // InternalFormat.g:14848:1: ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14848:1: ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14849:1: ( rule__XSetLiteral__ElementsAssignment_3_1_1 )
+            // InternalFormat.g:14848:1: ( ( rule__XSetLiteral__ElementsAssignment_3_1_1 ) )
+            // InternalFormat.g:14849:1: ( rule__XSetLiteral__ElementsAssignment_3_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getElementsAssignment_3_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14850:1: ( rule__XSetLiteral__ElementsAssignment_3_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14850:2: rule__XSetLiteral__ElementsAssignment_3_1_1
+            // InternalFormat.g:14850:1: ( rule__XSetLiteral__ElementsAssignment_3_1_1 )
+            // InternalFormat.g:14850:2: rule__XSetLiteral__ElementsAssignment_3_1_1
             {
-            pushFollow(FOLLOW_rule__XSetLiteral__ElementsAssignment_3_1_1_in_rule__XSetLiteral__Group_3_1__1__Impl30393);
+            pushFollow(FOLLOW_2);
             rule__XSetLiteral__ElementsAssignment_3_1_1();
 
             state._fsp--;
@@ -44053,21 +44053,21 @@ public final void rule__XSetLiteral__Group_3_1__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XListLiteral__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14864:1: rule__XListLiteral__Group__0 : rule__XListLiteral__Group__0__Impl rule__XListLiteral__Group__1 ;
+    // InternalFormat.g:14864:1: rule__XListLiteral__Group__0 : rule__XListLiteral__Group__0__Impl rule__XListLiteral__Group__1 ;
     public final void rule__XListLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14868:1: ( rule__XListLiteral__Group__0__Impl rule__XListLiteral__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14869:2: rule__XListLiteral__Group__0__Impl rule__XListLiteral__Group__1
+            // InternalFormat.g:14868:1: ( rule__XListLiteral__Group__0__Impl rule__XListLiteral__Group__1 )
+            // InternalFormat.g:14869:2: rule__XListLiteral__Group__0__Impl rule__XListLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__XListLiteral__Group__0__Impl_in_rule__XListLiteral__Group__030427);
+            pushFollow(FOLLOW_52);
             rule__XListLiteral__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XListLiteral__Group__1_in_rule__XListLiteral__Group__030430);
+            pushFollow(FOLLOW_2);
             rule__XListLiteral__Group__1();
 
             state._fsp--;
@@ -44091,23 +44091,23 @@ public final void rule__XListLiteral__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XListLiteral__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14876:1: rule__XListLiteral__Group__0__Impl : ( () ) ;
+    // InternalFormat.g:14876:1: rule__XListLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XListLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14880:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14881:1: ( () )
+            // InternalFormat.g:14880:1: ( ( () ) )
+            // InternalFormat.g:14881:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14881:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14882:1: ()
+            // InternalFormat.g:14881:1: ( () )
+            // InternalFormat.g:14882:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getXListLiteralAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14883:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14885:1: 
+            // InternalFormat.g:14883:1: ()
+            // InternalFormat.g:14885:1: 
             {
             }
 
@@ -44132,21 +44132,21 @@ public final void rule__XListLiteral__Group__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XListLiteral__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14895:1: rule__XListLiteral__Group__1 : rule__XListLiteral__Group__1__Impl rule__XListLiteral__Group__2 ;
+    // InternalFormat.g:14895:1: rule__XListLiteral__Group__1 : rule__XListLiteral__Group__1__Impl rule__XListLiteral__Group__2 ;
     public final void rule__XListLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14899:1: ( rule__XListLiteral__Group__1__Impl rule__XListLiteral__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14900:2: rule__XListLiteral__Group__1__Impl rule__XListLiteral__Group__2
+            // InternalFormat.g:14899:1: ( rule__XListLiteral__Group__1__Impl rule__XListLiteral__Group__2 )
+            // InternalFormat.g:14900:2: rule__XListLiteral__Group__1__Impl rule__XListLiteral__Group__2
             {
-            pushFollow(FOLLOW_rule__XListLiteral__Group__1__Impl_in_rule__XListLiteral__Group__130488);
+            pushFollow(FOLLOW_53);
             rule__XListLiteral__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XListLiteral__Group__2_in_rule__XListLiteral__Group__130491);
+            pushFollow(FOLLOW_2);
             rule__XListLiteral__Group__2();
 
             state._fsp--;
@@ -44170,22 +44170,22 @@ public final void rule__XListLiteral__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XListLiteral__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14907:1: rule__XListLiteral__Group__1__Impl : ( '#' ) ;
+    // InternalFormat.g:14907:1: rule__XListLiteral__Group__1__Impl : ( '#' ) ;
     public final void rule__XListLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14911:1: ( ( '#' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14912:1: ( '#' )
+            // InternalFormat.g:14911:1: ( ( '#' ) )
+            // InternalFormat.g:14912:1: ( '#' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14912:1: ( '#' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14913:1: '#'
+            // InternalFormat.g:14912:1: ( '#' )
+            // InternalFormat.g:14913:1: '#'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getNumberSignKeyword_1()); 
             }
-            match(input,84,FOLLOW_84_in_rule__XListLiteral__Group__1__Impl30519); if (state.failed) return ;
+            match(input,84,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXListLiteralAccess().getNumberSignKeyword_1()); 
             }
@@ -44211,21 +44211,21 @@ public final void rule__XListLiteral__Group__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XListLiteral__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14926:1: rule__XListLiteral__Group__2 : rule__XListLiteral__Group__2__Impl rule__XListLiteral__Group__3 ;
+    // InternalFormat.g:14926:1: rule__XListLiteral__Group__2 : rule__XListLiteral__Group__2__Impl rule__XListLiteral__Group__3 ;
     public final void rule__XListLiteral__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14930:1: ( rule__XListLiteral__Group__2__Impl rule__XListLiteral__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14931:2: rule__XListLiteral__Group__2__Impl rule__XListLiteral__Group__3
+            // InternalFormat.g:14930:1: ( rule__XListLiteral__Group__2__Impl rule__XListLiteral__Group__3 )
+            // InternalFormat.g:14931:2: rule__XListLiteral__Group__2__Impl rule__XListLiteral__Group__3
             {
-            pushFollow(FOLLOW_rule__XListLiteral__Group__2__Impl_in_rule__XListLiteral__Group__230550);
+            pushFollow(FOLLOW_51);
             rule__XListLiteral__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XListLiteral__Group__3_in_rule__XListLiteral__Group__230553);
+            pushFollow(FOLLOW_2);
             rule__XListLiteral__Group__3();
 
             state._fsp--;
@@ -44249,22 +44249,22 @@ public final void rule__XListLiteral__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XListLiteral__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14938:1: rule__XListLiteral__Group__2__Impl : ( '[' ) ;
+    // InternalFormat.g:14938:1: rule__XListLiteral__Group__2__Impl : ( '[' ) ;
     public final void rule__XListLiteral__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14942:1: ( ( '[' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14943:1: ( '[' )
+            // InternalFormat.g:14942:1: ( ( '[' ) )
+            // InternalFormat.g:14943:1: ( '[' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14943:1: ( '[' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14944:1: '['
+            // InternalFormat.g:14943:1: ( '[' )
+            // InternalFormat.g:14944:1: '['
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getLeftSquareBracketKeyword_2()); 
             }
-            match(input,69,FOLLOW_69_in_rule__XListLiteral__Group__2__Impl30581); if (state.failed) return ;
+            match(input,69,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXListLiteralAccess().getLeftSquareBracketKeyword_2()); 
             }
@@ -44290,21 +44290,21 @@ public final void rule__XListLiteral__Group__2__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XListLiteral__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14957:1: rule__XListLiteral__Group__3 : rule__XListLiteral__Group__3__Impl rule__XListLiteral__Group__4 ;
+    // InternalFormat.g:14957:1: rule__XListLiteral__Group__3 : rule__XListLiteral__Group__3__Impl rule__XListLiteral__Group__4 ;
     public final void rule__XListLiteral__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14961:1: ( rule__XListLiteral__Group__3__Impl rule__XListLiteral__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14962:2: rule__XListLiteral__Group__3__Impl rule__XListLiteral__Group__4
+            // InternalFormat.g:14961:1: ( rule__XListLiteral__Group__3__Impl rule__XListLiteral__Group__4 )
+            // InternalFormat.g:14962:2: rule__XListLiteral__Group__3__Impl rule__XListLiteral__Group__4
             {
-            pushFollow(FOLLOW_rule__XListLiteral__Group__3__Impl_in_rule__XListLiteral__Group__330612);
+            pushFollow(FOLLOW_51);
             rule__XListLiteral__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XListLiteral__Group__4_in_rule__XListLiteral__Group__330615);
+            pushFollow(FOLLOW_2);
             rule__XListLiteral__Group__4();
 
             state._fsp--;
@@ -44328,22 +44328,22 @@ public final void rule__XListLiteral__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XListLiteral__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14969:1: rule__XListLiteral__Group__3__Impl : ( ( rule__XListLiteral__Group_3__0 )? ) ;
+    // InternalFormat.g:14969:1: rule__XListLiteral__Group__3__Impl : ( ( rule__XListLiteral__Group_3__0 )? ) ;
     public final void rule__XListLiteral__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14973:1: ( ( ( rule__XListLiteral__Group_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14974:1: ( ( rule__XListLiteral__Group_3__0 )? )
+            // InternalFormat.g:14973:1: ( ( ( rule__XListLiteral__Group_3__0 )? ) )
+            // InternalFormat.g:14974:1: ( ( rule__XListLiteral__Group_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14974:1: ( ( rule__XListLiteral__Group_3__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14975:1: ( rule__XListLiteral__Group_3__0 )?
+            // InternalFormat.g:14974:1: ( ( rule__XListLiteral__Group_3__0 )? )
+            // InternalFormat.g:14975:1: ( rule__XListLiteral__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getGroup_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14976:1: ( rule__XListLiteral__Group_3__0 )?
+            // InternalFormat.g:14976:1: ( rule__XListLiteral__Group_3__0 )?
             int alt122=2;
             int LA122_0 = input.LA(1);
 
@@ -44352,9 +44352,9 @@ public final void rule__XListLiteral__Group__3__Impl() throws RecognitionExcepti
             }
             switch (alt122) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14976:2: rule__XListLiteral__Group_3__0
+                    // InternalFormat.g:14976:2: rule__XListLiteral__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__XListLiteral__Group_3__0_in_rule__XListLiteral__Group__3__Impl30642);
+                    pushFollow(FOLLOW_2);
                     rule__XListLiteral__Group_3__0();
 
                     state._fsp--;
@@ -44390,16 +44390,16 @@ public final void rule__XListLiteral__Group__3__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XListLiteral__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14986:1: rule__XListLiteral__Group__4 : rule__XListLiteral__Group__4__Impl ;
+    // InternalFormat.g:14986:1: rule__XListLiteral__Group__4 : rule__XListLiteral__Group__4__Impl ;
     public final void rule__XListLiteral__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14990:1: ( rule__XListLiteral__Group__4__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14991:2: rule__XListLiteral__Group__4__Impl
+            // InternalFormat.g:14990:1: ( rule__XListLiteral__Group__4__Impl )
+            // InternalFormat.g:14991:2: rule__XListLiteral__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__XListLiteral__Group__4__Impl_in_rule__XListLiteral__Group__430673);
+            pushFollow(FOLLOW_2);
             rule__XListLiteral__Group__4__Impl();
 
             state._fsp--;
@@ -44423,22 +44423,22 @@ public final void rule__XListLiteral__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__XListLiteral__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14997:1: rule__XListLiteral__Group__4__Impl : ( ']' ) ;
+    // InternalFormat.g:14997:1: rule__XListLiteral__Group__4__Impl : ( ']' ) ;
     public final void rule__XListLiteral__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15001:1: ( ( ']' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15002:1: ( ']' )
+            // InternalFormat.g:15001:1: ( ( ']' ) )
+            // InternalFormat.g:15002:1: ( ']' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15002:1: ( ']' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15003:1: ']'
+            // InternalFormat.g:15002:1: ( ']' )
+            // InternalFormat.g:15003:1: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getRightSquareBracketKeyword_4()); 
             }
-            match(input,70,FOLLOW_70_in_rule__XListLiteral__Group__4__Impl30701); if (state.failed) return ;
+            match(input,70,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXListLiteralAccess().getRightSquareBracketKeyword_4()); 
             }
@@ -44464,21 +44464,21 @@ public final void rule__XListLiteral__Group__4__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XListLiteral__Group_3__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15026:1: rule__XListLiteral__Group_3__0 : rule__XListLiteral__Group_3__0__Impl rule__XListLiteral__Group_3__1 ;
+    // InternalFormat.g:15026:1: rule__XListLiteral__Group_3__0 : rule__XListLiteral__Group_3__0__Impl rule__XListLiteral__Group_3__1 ;
     public final void rule__XListLiteral__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15030:1: ( rule__XListLiteral__Group_3__0__Impl rule__XListLiteral__Group_3__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15031:2: rule__XListLiteral__Group_3__0__Impl rule__XListLiteral__Group_3__1
+            // InternalFormat.g:15030:1: ( rule__XListLiteral__Group_3__0__Impl rule__XListLiteral__Group_3__1 )
+            // InternalFormat.g:15031:2: rule__XListLiteral__Group_3__0__Impl rule__XListLiteral__Group_3__1
             {
-            pushFollow(FOLLOW_rule__XListLiteral__Group_3__0__Impl_in_rule__XListLiteral__Group_3__030742);
+            pushFollow(FOLLOW_46);
             rule__XListLiteral__Group_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XListLiteral__Group_3__1_in_rule__XListLiteral__Group_3__030745);
+            pushFollow(FOLLOW_2);
             rule__XListLiteral__Group_3__1();
 
             state._fsp--;
@@ -44502,25 +44502,25 @@ public final void rule__XListLiteral__Group_3__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XListLiteral__Group_3__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15038:1: rule__XListLiteral__Group_3__0__Impl : ( ( rule__XListLiteral__ElementsAssignment_3_0 ) ) ;
+    // InternalFormat.g:15038:1: rule__XListLiteral__Group_3__0__Impl : ( ( rule__XListLiteral__ElementsAssignment_3_0 ) ) ;
     public final void rule__XListLiteral__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15042:1: ( ( ( rule__XListLiteral__ElementsAssignment_3_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15043:1: ( ( rule__XListLiteral__ElementsAssignment_3_0 ) )
+            // InternalFormat.g:15042:1: ( ( ( rule__XListLiteral__ElementsAssignment_3_0 ) ) )
+            // InternalFormat.g:15043:1: ( ( rule__XListLiteral__ElementsAssignment_3_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15043:1: ( ( rule__XListLiteral__ElementsAssignment_3_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15044:1: ( rule__XListLiteral__ElementsAssignment_3_0 )
+            // InternalFormat.g:15043:1: ( ( rule__XListLiteral__ElementsAssignment_3_0 ) )
+            // InternalFormat.g:15044:1: ( rule__XListLiteral__ElementsAssignment_3_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getElementsAssignment_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15045:1: ( rule__XListLiteral__ElementsAssignment_3_0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15045:2: rule__XListLiteral__ElementsAssignment_3_0
+            // InternalFormat.g:15045:1: ( rule__XListLiteral__ElementsAssignment_3_0 )
+            // InternalFormat.g:15045:2: rule__XListLiteral__ElementsAssignment_3_0
             {
-            pushFollow(FOLLOW_rule__XListLiteral__ElementsAssignment_3_0_in_rule__XListLiteral__Group_3__0__Impl30772);
+            pushFollow(FOLLOW_2);
             rule__XListLiteral__ElementsAssignment_3_0();
 
             state._fsp--;
@@ -44553,16 +44553,16 @@ public final void rule__XListLiteral__Group_3__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XListLiteral__Group_3__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15055:1: rule__XListLiteral__Group_3__1 : rule__XListLiteral__Group_3__1__Impl ;
+    // InternalFormat.g:15055:1: rule__XListLiteral__Group_3__1 : rule__XListLiteral__Group_3__1__Impl ;
     public final void rule__XListLiteral__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15059:1: ( rule__XListLiteral__Group_3__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15060:2: rule__XListLiteral__Group_3__1__Impl
+            // InternalFormat.g:15059:1: ( rule__XListLiteral__Group_3__1__Impl )
+            // InternalFormat.g:15060:2: rule__XListLiteral__Group_3__1__Impl
             {
-            pushFollow(FOLLOW_rule__XListLiteral__Group_3__1__Impl_in_rule__XListLiteral__Group_3__130802);
+            pushFollow(FOLLOW_2);
             rule__XListLiteral__Group_3__1__Impl();
 
             state._fsp--;
@@ -44586,22 +44586,22 @@ public final void rule__XListLiteral__Group_3__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XListLiteral__Group_3__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15066:1: rule__XListLiteral__Group_3__1__Impl : ( ( rule__XListLiteral__Group_3_1__0 )* ) ;
+    // InternalFormat.g:15066:1: rule__XListLiteral__Group_3__1__Impl : ( ( rule__XListLiteral__Group_3_1__0 )* ) ;
     public final void rule__XListLiteral__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15070:1: ( ( ( rule__XListLiteral__Group_3_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15071:1: ( ( rule__XListLiteral__Group_3_1__0 )* )
+            // InternalFormat.g:15070:1: ( ( ( rule__XListLiteral__Group_3_1__0 )* ) )
+            // InternalFormat.g:15071:1: ( ( rule__XListLiteral__Group_3_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15071:1: ( ( rule__XListLiteral__Group_3_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15072:1: ( rule__XListLiteral__Group_3_1__0 )*
+            // InternalFormat.g:15071:1: ( ( rule__XListLiteral__Group_3_1__0 )* )
+            // InternalFormat.g:15072:1: ( rule__XListLiteral__Group_3_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getGroup_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15073:1: ( rule__XListLiteral__Group_3_1__0 )*
+            // InternalFormat.g:15073:1: ( rule__XListLiteral__Group_3_1__0 )*
             loop123:
             do {
                 int alt123=2;
@@ -44614,9 +44614,9 @@ public final void rule__XListLiteral__Group_3__1__Impl() throws RecognitionExcep
 
                 switch (alt123) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15073:2: rule__XListLiteral__Group_3_1__0
+            	    // InternalFormat.g:15073:2: rule__XListLiteral__Group_3_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XListLiteral__Group_3_1__0_in_rule__XListLiteral__Group_3__1__Impl30829);
+            	    pushFollow(FOLLOW_23);
             	    rule__XListLiteral__Group_3_1__0();
 
             	    state._fsp--;
@@ -44655,21 +44655,21 @@ public final void rule__XListLiteral__Group_3__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XListLiteral__Group_3_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15087:1: rule__XListLiteral__Group_3_1__0 : rule__XListLiteral__Group_3_1__0__Impl rule__XListLiteral__Group_3_1__1 ;
+    // InternalFormat.g:15087:1: rule__XListLiteral__Group_3_1__0 : rule__XListLiteral__Group_3_1__0__Impl rule__XListLiteral__Group_3_1__1 ;
     public final void rule__XListLiteral__Group_3_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15091:1: ( rule__XListLiteral__Group_3_1__0__Impl rule__XListLiteral__Group_3_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15092:2: rule__XListLiteral__Group_3_1__0__Impl rule__XListLiteral__Group_3_1__1
+            // InternalFormat.g:15091:1: ( rule__XListLiteral__Group_3_1__0__Impl rule__XListLiteral__Group_3_1__1 )
+            // InternalFormat.g:15092:2: rule__XListLiteral__Group_3_1__0__Impl rule__XListLiteral__Group_3_1__1
             {
-            pushFollow(FOLLOW_rule__XListLiteral__Group_3_1__0__Impl_in_rule__XListLiteral__Group_3_1__030864);
+            pushFollow(FOLLOW_50);
             rule__XListLiteral__Group_3_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XListLiteral__Group_3_1__1_in_rule__XListLiteral__Group_3_1__030867);
+            pushFollow(FOLLOW_2);
             rule__XListLiteral__Group_3_1__1();
 
             state._fsp--;
@@ -44693,22 +44693,22 @@ public final void rule__XListLiteral__Group_3_1__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XListLiteral__Group_3_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15099:1: rule__XListLiteral__Group_3_1__0__Impl : ( ',' ) ;
+    // InternalFormat.g:15099:1: rule__XListLiteral__Group_3_1__0__Impl : ( ',' ) ;
     public final void rule__XListLiteral__Group_3_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15103:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15104:1: ( ',' )
+            // InternalFormat.g:15103:1: ( ( ',' ) )
+            // InternalFormat.g:15104:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15104:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15105:1: ','
+            // InternalFormat.g:15104:1: ( ',' )
+            // InternalFormat.g:15105:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getCommaKeyword_3_1_0()); 
             }
-            match(input,71,FOLLOW_71_in_rule__XListLiteral__Group_3_1__0__Impl30895); if (state.failed) return ;
+            match(input,71,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXListLiteralAccess().getCommaKeyword_3_1_0()); 
             }
@@ -44734,16 +44734,16 @@ public final void rule__XListLiteral__Group_3_1__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XListLiteral__Group_3_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15118:1: rule__XListLiteral__Group_3_1__1 : rule__XListLiteral__Group_3_1__1__Impl ;
+    // InternalFormat.g:15118:1: rule__XListLiteral__Group_3_1__1 : rule__XListLiteral__Group_3_1__1__Impl ;
     public final void rule__XListLiteral__Group_3_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15122:1: ( rule__XListLiteral__Group_3_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15123:2: rule__XListLiteral__Group_3_1__1__Impl
+            // InternalFormat.g:15122:1: ( rule__XListLiteral__Group_3_1__1__Impl )
+            // InternalFormat.g:15123:2: rule__XListLiteral__Group_3_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XListLiteral__Group_3_1__1__Impl_in_rule__XListLiteral__Group_3_1__130926);
+            pushFollow(FOLLOW_2);
             rule__XListLiteral__Group_3_1__1__Impl();
 
             state._fsp--;
@@ -44767,25 +44767,25 @@ public final void rule__XListLiteral__Group_3_1__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XListLiteral__Group_3_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15129:1: rule__XListLiteral__Group_3_1__1__Impl : ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) ) ;
+    // InternalFormat.g:15129:1: rule__XListLiteral__Group_3_1__1__Impl : ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) ) ;
     public final void rule__XListLiteral__Group_3_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15133:1: ( ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15134:1: ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) )
+            // InternalFormat.g:15133:1: ( ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) ) )
+            // InternalFormat.g:15134:1: ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15134:1: ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15135:1: ( rule__XListLiteral__ElementsAssignment_3_1_1 )
+            // InternalFormat.g:15134:1: ( ( rule__XListLiteral__ElementsAssignment_3_1_1 ) )
+            // InternalFormat.g:15135:1: ( rule__XListLiteral__ElementsAssignment_3_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getElementsAssignment_3_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15136:1: ( rule__XListLiteral__ElementsAssignment_3_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15136:2: rule__XListLiteral__ElementsAssignment_3_1_1
+            // InternalFormat.g:15136:1: ( rule__XListLiteral__ElementsAssignment_3_1_1 )
+            // InternalFormat.g:15136:2: rule__XListLiteral__ElementsAssignment_3_1_1
             {
-            pushFollow(FOLLOW_rule__XListLiteral__ElementsAssignment_3_1_1_in_rule__XListLiteral__Group_3_1__1__Impl30953);
+            pushFollow(FOLLOW_2);
             rule__XListLiteral__ElementsAssignment_3_1_1();
 
             state._fsp--;
@@ -44818,21 +44818,21 @@ public final void rule__XListLiteral__Group_3_1__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XClosure__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15150:1: rule__XClosure__Group__0 : rule__XClosure__Group__0__Impl rule__XClosure__Group__1 ;
+    // InternalFormat.g:15150:1: rule__XClosure__Group__0 : rule__XClosure__Group__0__Impl rule__XClosure__Group__1 ;
     public final void rule__XClosure__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15154:1: ( rule__XClosure__Group__0__Impl rule__XClosure__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15155:2: rule__XClosure__Group__0__Impl rule__XClosure__Group__1
+            // InternalFormat.g:15154:1: ( rule__XClosure__Group__0__Impl rule__XClosure__Group__1 )
+            // InternalFormat.g:15155:2: rule__XClosure__Group__0__Impl rule__XClosure__Group__1
             {
-            pushFollow(FOLLOW_rule__XClosure__Group__0__Impl_in_rule__XClosure__Group__030987);
+            pushFollow(FOLLOW_90);
             rule__XClosure__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XClosure__Group__1_in_rule__XClosure__Group__030990);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group__1();
 
             state._fsp--;
@@ -44856,25 +44856,25 @@ public final void rule__XClosure__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15162:1: rule__XClosure__Group__0__Impl : ( ( rule__XClosure__Group_0__0 ) ) ;
+    // InternalFormat.g:15162:1: rule__XClosure__Group__0__Impl : ( ( rule__XClosure__Group_0__0 ) ) ;
     public final void rule__XClosure__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15166:1: ( ( ( rule__XClosure__Group_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15167:1: ( ( rule__XClosure__Group_0__0 ) )
+            // InternalFormat.g:15166:1: ( ( ( rule__XClosure__Group_0__0 ) ) )
+            // InternalFormat.g:15167:1: ( ( rule__XClosure__Group_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15167:1: ( ( rule__XClosure__Group_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15168:1: ( rule__XClosure__Group_0__0 )
+            // InternalFormat.g:15167:1: ( ( rule__XClosure__Group_0__0 ) )
+            // InternalFormat.g:15168:1: ( rule__XClosure__Group_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getGroup_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15169:1: ( rule__XClosure__Group_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15169:2: rule__XClosure__Group_0__0
+            // InternalFormat.g:15169:1: ( rule__XClosure__Group_0__0 )
+            // InternalFormat.g:15169:2: rule__XClosure__Group_0__0
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_0__0_in_rule__XClosure__Group__0__Impl31017);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group_0__0();
 
             state._fsp--;
@@ -44907,21 +44907,21 @@ public final void rule__XClosure__Group__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15179:1: rule__XClosure__Group__1 : rule__XClosure__Group__1__Impl rule__XClosure__Group__2 ;
+    // InternalFormat.g:15179:1: rule__XClosure__Group__1 : rule__XClosure__Group__1__Impl rule__XClosure__Group__2 ;
     public final void rule__XClosure__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15183:1: ( rule__XClosure__Group__1__Impl rule__XClosure__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15184:2: rule__XClosure__Group__1__Impl rule__XClosure__Group__2
+            // InternalFormat.g:15183:1: ( rule__XClosure__Group__1__Impl rule__XClosure__Group__2 )
+            // InternalFormat.g:15184:2: rule__XClosure__Group__1__Impl rule__XClosure__Group__2
             {
-            pushFollow(FOLLOW_rule__XClosure__Group__1__Impl_in_rule__XClosure__Group__131047);
+            pushFollow(FOLLOW_90);
             rule__XClosure__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XClosure__Group__2_in_rule__XClosure__Group__131050);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group__2();
 
             state._fsp--;
@@ -44945,29 +44945,29 @@ public final void rule__XClosure__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15191:1: rule__XClosure__Group__1__Impl : ( ( rule__XClosure__Group_1__0 )? ) ;
+    // InternalFormat.g:15191:1: rule__XClosure__Group__1__Impl : ( ( rule__XClosure__Group_1__0 )? ) ;
     public final void rule__XClosure__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15195:1: ( ( ( rule__XClosure__Group_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15196:1: ( ( rule__XClosure__Group_1__0 )? )
+            // InternalFormat.g:15195:1: ( ( ( rule__XClosure__Group_1__0 )? ) )
+            // InternalFormat.g:15196:1: ( ( rule__XClosure__Group_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15196:1: ( ( rule__XClosure__Group_1__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15197:1: ( rule__XClosure__Group_1__0 )?
+            // InternalFormat.g:15196:1: ( ( rule__XClosure__Group_1__0 )? )
+            // InternalFormat.g:15197:1: ( rule__XClosure__Group_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15198:1: ( rule__XClosure__Group_1__0 )?
+            // InternalFormat.g:15198:1: ( rule__XClosure__Group_1__0 )?
             int alt124=2;
             alt124 = dfa124.predict(input);
             switch (alt124) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15198:2: rule__XClosure__Group_1__0
+                    // InternalFormat.g:15198:2: rule__XClosure__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__XClosure__Group_1__0_in_rule__XClosure__Group__1__Impl31077);
+                    pushFollow(FOLLOW_2);
                     rule__XClosure__Group_1__0();
 
                     state._fsp--;
@@ -45003,21 +45003,21 @@ public final void rule__XClosure__Group__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15208:1: rule__XClosure__Group__2 : rule__XClosure__Group__2__Impl rule__XClosure__Group__3 ;
+    // InternalFormat.g:15208:1: rule__XClosure__Group__2 : rule__XClosure__Group__2__Impl rule__XClosure__Group__3 ;
     public final void rule__XClosure__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15212:1: ( rule__XClosure__Group__2__Impl rule__XClosure__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15213:2: rule__XClosure__Group__2__Impl rule__XClosure__Group__3
+            // InternalFormat.g:15212:1: ( rule__XClosure__Group__2__Impl rule__XClosure__Group__3 )
+            // InternalFormat.g:15213:2: rule__XClosure__Group__2__Impl rule__XClosure__Group__3
             {
-            pushFollow(FOLLOW_rule__XClosure__Group__2__Impl_in_rule__XClosure__Group__231108);
+            pushFollow(FOLLOW_91);
             rule__XClosure__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XClosure__Group__3_in_rule__XClosure__Group__231111);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group__3();
 
             state._fsp--;
@@ -45041,25 +45041,25 @@ public final void rule__XClosure__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15220:1: rule__XClosure__Group__2__Impl : ( ( rule__XClosure__ExpressionAssignment_2 ) ) ;
+    // InternalFormat.g:15220:1: rule__XClosure__Group__2__Impl : ( ( rule__XClosure__ExpressionAssignment_2 ) ) ;
     public final void rule__XClosure__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15224:1: ( ( ( rule__XClosure__ExpressionAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15225:1: ( ( rule__XClosure__ExpressionAssignment_2 ) )
+            // InternalFormat.g:15224:1: ( ( ( rule__XClosure__ExpressionAssignment_2 ) ) )
+            // InternalFormat.g:15225:1: ( ( rule__XClosure__ExpressionAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15225:1: ( ( rule__XClosure__ExpressionAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15226:1: ( rule__XClosure__ExpressionAssignment_2 )
+            // InternalFormat.g:15225:1: ( ( rule__XClosure__ExpressionAssignment_2 ) )
+            // InternalFormat.g:15226:1: ( rule__XClosure__ExpressionAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getExpressionAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15227:1: ( rule__XClosure__ExpressionAssignment_2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15227:2: rule__XClosure__ExpressionAssignment_2
+            // InternalFormat.g:15227:1: ( rule__XClosure__ExpressionAssignment_2 )
+            // InternalFormat.g:15227:2: rule__XClosure__ExpressionAssignment_2
             {
-            pushFollow(FOLLOW_rule__XClosure__ExpressionAssignment_2_in_rule__XClosure__Group__2__Impl31138);
+            pushFollow(FOLLOW_2);
             rule__XClosure__ExpressionAssignment_2();
 
             state._fsp--;
@@ -45092,16 +45092,16 @@ public final void rule__XClosure__Group__2__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15237:1: rule__XClosure__Group__3 : rule__XClosure__Group__3__Impl ;
+    // InternalFormat.g:15237:1: rule__XClosure__Group__3 : rule__XClosure__Group__3__Impl ;
     public final void rule__XClosure__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15241:1: ( rule__XClosure__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15242:2: rule__XClosure__Group__3__Impl
+            // InternalFormat.g:15241:1: ( rule__XClosure__Group__3__Impl )
+            // InternalFormat.g:15242:2: rule__XClosure__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__XClosure__Group__3__Impl_in_rule__XClosure__Group__331168);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group__3__Impl();
 
             state._fsp--;
@@ -45125,22 +45125,22 @@ public final void rule__XClosure__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15248:1: rule__XClosure__Group__3__Impl : ( ']' ) ;
+    // InternalFormat.g:15248:1: rule__XClosure__Group__3__Impl : ( ']' ) ;
     public final void rule__XClosure__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15252:1: ( ( ']' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15253:1: ( ']' )
+            // InternalFormat.g:15252:1: ( ( ']' ) )
+            // InternalFormat.g:15253:1: ( ']' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15253:1: ( ']' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15254:1: ']'
+            // InternalFormat.g:15253:1: ( ']' )
+            // InternalFormat.g:15254:1: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getRightSquareBracketKeyword_3()); 
             }
-            match(input,70,FOLLOW_70_in_rule__XClosure__Group__3__Impl31196); if (state.failed) return ;
+            match(input,70,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXClosureAccess().getRightSquareBracketKeyword_3()); 
             }
@@ -45166,16 +45166,16 @@ public final void rule__XClosure__Group__3__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15275:1: rule__XClosure__Group_0__0 : rule__XClosure__Group_0__0__Impl ;
+    // InternalFormat.g:15275:1: rule__XClosure__Group_0__0 : rule__XClosure__Group_0__0__Impl ;
     public final void rule__XClosure__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15279:1: ( rule__XClosure__Group_0__0__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15280:2: rule__XClosure__Group_0__0__Impl
+            // InternalFormat.g:15279:1: ( rule__XClosure__Group_0__0__Impl )
+            // InternalFormat.g:15280:2: rule__XClosure__Group_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_0__0__Impl_in_rule__XClosure__Group_0__031235);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group_0__0__Impl();
 
             state._fsp--;
@@ -45199,25 +45199,25 @@ public final void rule__XClosure__Group_0__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15286:1: rule__XClosure__Group_0__0__Impl : ( ( rule__XClosure__Group_0_0__0 ) ) ;
+    // InternalFormat.g:15286:1: rule__XClosure__Group_0__0__Impl : ( ( rule__XClosure__Group_0_0__0 ) ) ;
     public final void rule__XClosure__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15290:1: ( ( ( rule__XClosure__Group_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15291:1: ( ( rule__XClosure__Group_0_0__0 ) )
+            // InternalFormat.g:15290:1: ( ( ( rule__XClosure__Group_0_0__0 ) ) )
+            // InternalFormat.g:15291:1: ( ( rule__XClosure__Group_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15291:1: ( ( rule__XClosure__Group_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15292:1: ( rule__XClosure__Group_0_0__0 )
+            // InternalFormat.g:15291:1: ( ( rule__XClosure__Group_0_0__0 ) )
+            // InternalFormat.g:15292:1: ( rule__XClosure__Group_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getGroup_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15293:1: ( rule__XClosure__Group_0_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15293:2: rule__XClosure__Group_0_0__0
+            // InternalFormat.g:15293:1: ( rule__XClosure__Group_0_0__0 )
+            // InternalFormat.g:15293:2: rule__XClosure__Group_0_0__0
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_0_0__0_in_rule__XClosure__Group_0__0__Impl31262);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group_0_0__0();
 
             state._fsp--;
@@ -45250,21 +45250,21 @@ public final void rule__XClosure__Group_0__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__XClosure__Group_0_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15305:1: rule__XClosure__Group_0_0__0 : rule__XClosure__Group_0_0__0__Impl rule__XClosure__Group_0_0__1 ;
+    // InternalFormat.g:15305:1: rule__XClosure__Group_0_0__0 : rule__XClosure__Group_0_0__0__Impl rule__XClosure__Group_0_0__1 ;
     public final void rule__XClosure__Group_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15309:1: ( rule__XClosure__Group_0_0__0__Impl rule__XClosure__Group_0_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15310:2: rule__XClosure__Group_0_0__0__Impl rule__XClosure__Group_0_0__1
+            // InternalFormat.g:15309:1: ( rule__XClosure__Group_0_0__0__Impl rule__XClosure__Group_0_0__1 )
+            // InternalFormat.g:15310:2: rule__XClosure__Group_0_0__0__Impl rule__XClosure__Group_0_0__1
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_0_0__0__Impl_in_rule__XClosure__Group_0_0__031294);
+            pushFollow(FOLLOW_53);
             rule__XClosure__Group_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XClosure__Group_0_0__1_in_rule__XClosure__Group_0_0__031297);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group_0_0__1();
 
             state._fsp--;
@@ -45288,23 +45288,23 @@ public final void rule__XClosure__Group_0_0__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15317:1: rule__XClosure__Group_0_0__0__Impl : ( () ) ;
+    // InternalFormat.g:15317:1: rule__XClosure__Group_0_0__0__Impl : ( () ) ;
     public final void rule__XClosure__Group_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15321:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15322:1: ( () )
+            // InternalFormat.g:15321:1: ( ( () ) )
+            // InternalFormat.g:15322:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15322:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15323:1: ()
+            // InternalFormat.g:15322:1: ( () )
+            // InternalFormat.g:15323:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getXClosureAction_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15324:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15326:1: 
+            // InternalFormat.g:15324:1: ()
+            // InternalFormat.g:15326:1: 
             {
             }
 
@@ -45329,16 +45329,16 @@ public final void rule__XClosure__Group_0_0__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XClosure__Group_0_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15336:1: rule__XClosure__Group_0_0__1 : rule__XClosure__Group_0_0__1__Impl ;
+    // InternalFormat.g:15336:1: rule__XClosure__Group_0_0__1 : rule__XClosure__Group_0_0__1__Impl ;
     public final void rule__XClosure__Group_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15340:1: ( rule__XClosure__Group_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15341:2: rule__XClosure__Group_0_0__1__Impl
+            // InternalFormat.g:15340:1: ( rule__XClosure__Group_0_0__1__Impl )
+            // InternalFormat.g:15341:2: rule__XClosure__Group_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_0_0__1__Impl_in_rule__XClosure__Group_0_0__131355);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group_0_0__1__Impl();
 
             state._fsp--;
@@ -45362,22 +45362,22 @@ public final void rule__XClosure__Group_0_0__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15347:1: rule__XClosure__Group_0_0__1__Impl : ( '[' ) ;
+    // InternalFormat.g:15347:1: rule__XClosure__Group_0_0__1__Impl : ( '[' ) ;
     public final void rule__XClosure__Group_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15351:1: ( ( '[' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15352:1: ( '[' )
+            // InternalFormat.g:15351:1: ( ( '[' ) )
+            // InternalFormat.g:15352:1: ( '[' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15352:1: ( '[' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15353:1: '['
+            // InternalFormat.g:15352:1: ( '[' )
+            // InternalFormat.g:15353:1: '['
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getLeftSquareBracketKeyword_0_0_1()); 
             }
-            match(input,69,FOLLOW_69_in_rule__XClosure__Group_0_0__1__Impl31383); if (state.failed) return ;
+            match(input,69,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXClosureAccess().getLeftSquareBracketKeyword_0_0_1()); 
             }
@@ -45403,16 +45403,16 @@ public final void rule__XClosure__Group_0_0__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XClosure__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15370:1: rule__XClosure__Group_1__0 : rule__XClosure__Group_1__0__Impl ;
+    // InternalFormat.g:15370:1: rule__XClosure__Group_1__0 : rule__XClosure__Group_1__0__Impl ;
     public final void rule__XClosure__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15374:1: ( rule__XClosure__Group_1__0__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15375:2: rule__XClosure__Group_1__0__Impl
+            // InternalFormat.g:15374:1: ( rule__XClosure__Group_1__0__Impl )
+            // InternalFormat.g:15375:2: rule__XClosure__Group_1__0__Impl
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_1__0__Impl_in_rule__XClosure__Group_1__031418);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group_1__0__Impl();
 
             state._fsp--;
@@ -45436,25 +45436,25 @@ public final void rule__XClosure__Group_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15381:1: rule__XClosure__Group_1__0__Impl : ( ( rule__XClosure__Group_1_0__0 ) ) ;
+    // InternalFormat.g:15381:1: rule__XClosure__Group_1__0__Impl : ( ( rule__XClosure__Group_1_0__0 ) ) ;
     public final void rule__XClosure__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15385:1: ( ( ( rule__XClosure__Group_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15386:1: ( ( rule__XClosure__Group_1_0__0 ) )
+            // InternalFormat.g:15385:1: ( ( ( rule__XClosure__Group_1_0__0 ) ) )
+            // InternalFormat.g:15386:1: ( ( rule__XClosure__Group_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15386:1: ( ( rule__XClosure__Group_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15387:1: ( rule__XClosure__Group_1_0__0 )
+            // InternalFormat.g:15386:1: ( ( rule__XClosure__Group_1_0__0 ) )
+            // InternalFormat.g:15387:1: ( rule__XClosure__Group_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getGroup_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15388:1: ( rule__XClosure__Group_1_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15388:2: rule__XClosure__Group_1_0__0
+            // InternalFormat.g:15388:1: ( rule__XClosure__Group_1_0__0 )
+            // InternalFormat.g:15388:2: rule__XClosure__Group_1_0__0
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_1_0__0_in_rule__XClosure__Group_1__0__Impl31445);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group_1_0__0();
 
             state._fsp--;
@@ -45487,21 +45487,21 @@ public final void rule__XClosure__Group_1__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__XClosure__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15400:1: rule__XClosure__Group_1_0__0 : rule__XClosure__Group_1_0__0__Impl rule__XClosure__Group_1_0__1 ;
+    // InternalFormat.g:15400:1: rule__XClosure__Group_1_0__0 : rule__XClosure__Group_1_0__0__Impl rule__XClosure__Group_1_0__1 ;
     public final void rule__XClosure__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15404:1: ( rule__XClosure__Group_1_0__0__Impl rule__XClosure__Group_1_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15405:2: rule__XClosure__Group_1_0__0__Impl rule__XClosure__Group_1_0__1
+            // InternalFormat.g:15404:1: ( rule__XClosure__Group_1_0__0__Impl rule__XClosure__Group_1_0__1 )
+            // InternalFormat.g:15405:2: rule__XClosure__Group_1_0__0__Impl rule__XClosure__Group_1_0__1
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_1_0__0__Impl_in_rule__XClosure__Group_1_0__031477);
+            pushFollow(FOLLOW_92);
             rule__XClosure__Group_1_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XClosure__Group_1_0__1_in_rule__XClosure__Group_1_0__031480);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group_1_0__1();
 
             state._fsp--;
@@ -45525,22 +45525,22 @@ public final void rule__XClosure__Group_1_0__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15412:1: rule__XClosure__Group_1_0__0__Impl : ( ( rule__XClosure__Group_1_0_0__0 )? ) ;
+    // InternalFormat.g:15412:1: rule__XClosure__Group_1_0__0__Impl : ( ( rule__XClosure__Group_1_0_0__0 )? ) ;
     public final void rule__XClosure__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15416:1: ( ( ( rule__XClosure__Group_1_0_0__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15417:1: ( ( rule__XClosure__Group_1_0_0__0 )? )
+            // InternalFormat.g:15416:1: ( ( ( rule__XClosure__Group_1_0_0__0 )? ) )
+            // InternalFormat.g:15417:1: ( ( rule__XClosure__Group_1_0_0__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15417:1: ( ( rule__XClosure__Group_1_0_0__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15418:1: ( rule__XClosure__Group_1_0_0__0 )?
+            // InternalFormat.g:15417:1: ( ( rule__XClosure__Group_1_0_0__0 )? )
+            // InternalFormat.g:15418:1: ( rule__XClosure__Group_1_0_0__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getGroup_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15419:1: ( rule__XClosure__Group_1_0_0__0 )?
+            // InternalFormat.g:15419:1: ( rule__XClosure__Group_1_0_0__0 )?
             int alt125=2;
             int LA125_0 = input.LA(1);
 
@@ -45549,9 +45549,9 @@ public final void rule__XClosure__Group_1_0__0__Impl() throws RecognitionExcepti
             }
             switch (alt125) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15419:2: rule__XClosure__Group_1_0_0__0
+                    // InternalFormat.g:15419:2: rule__XClosure__Group_1_0_0__0
                     {
-                    pushFollow(FOLLOW_rule__XClosure__Group_1_0_0__0_in_rule__XClosure__Group_1_0__0__Impl31507);
+                    pushFollow(FOLLOW_2);
                     rule__XClosure__Group_1_0_0__0();
 
                     state._fsp--;
@@ -45587,16 +45587,16 @@ public final void rule__XClosure__Group_1_0__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XClosure__Group_1_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15429:1: rule__XClosure__Group_1_0__1 : rule__XClosure__Group_1_0__1__Impl ;
+    // InternalFormat.g:15429:1: rule__XClosure__Group_1_0__1 : rule__XClosure__Group_1_0__1__Impl ;
     public final void rule__XClosure__Group_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15433:1: ( rule__XClosure__Group_1_0__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15434:2: rule__XClosure__Group_1_0__1__Impl
+            // InternalFormat.g:15433:1: ( rule__XClosure__Group_1_0__1__Impl )
+            // InternalFormat.g:15434:2: rule__XClosure__Group_1_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_1_0__1__Impl_in_rule__XClosure__Group_1_0__131538);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group_1_0__1__Impl();
 
             state._fsp--;
@@ -45620,25 +45620,25 @@ public final void rule__XClosure__Group_1_0__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group_1_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15440:1: rule__XClosure__Group_1_0__1__Impl : ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) ) ;
+    // InternalFormat.g:15440:1: rule__XClosure__Group_1_0__1__Impl : ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) ) ;
     public final void rule__XClosure__Group_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15444:1: ( ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15445:1: ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) )
+            // InternalFormat.g:15444:1: ( ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) ) )
+            // InternalFormat.g:15445:1: ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15445:1: ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15446:1: ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 )
+            // InternalFormat.g:15445:1: ( ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 ) )
+            // InternalFormat.g:15446:1: ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getExplicitSyntaxAssignment_1_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15447:1: ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15447:2: rule__XClosure__ExplicitSyntaxAssignment_1_0_1
+            // InternalFormat.g:15447:1: ( rule__XClosure__ExplicitSyntaxAssignment_1_0_1 )
+            // InternalFormat.g:15447:2: rule__XClosure__ExplicitSyntaxAssignment_1_0_1
             {
-            pushFollow(FOLLOW_rule__XClosure__ExplicitSyntaxAssignment_1_0_1_in_rule__XClosure__Group_1_0__1__Impl31565);
+            pushFollow(FOLLOW_2);
             rule__XClosure__ExplicitSyntaxAssignment_1_0_1();
 
             state._fsp--;
@@ -45671,21 +45671,21 @@ public final void rule__XClosure__Group_1_0__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15461:1: rule__XClosure__Group_1_0_0__0 : rule__XClosure__Group_1_0_0__0__Impl rule__XClosure__Group_1_0_0__1 ;
+    // InternalFormat.g:15461:1: rule__XClosure__Group_1_0_0__0 : rule__XClosure__Group_1_0_0__0__Impl rule__XClosure__Group_1_0_0__1 ;
     public final void rule__XClosure__Group_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15465:1: ( rule__XClosure__Group_1_0_0__0__Impl rule__XClosure__Group_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15466:2: rule__XClosure__Group_1_0_0__0__Impl rule__XClosure__Group_1_0_0__1
+            // InternalFormat.g:15465:1: ( rule__XClosure__Group_1_0_0__0__Impl rule__XClosure__Group_1_0_0__1 )
+            // InternalFormat.g:15466:2: rule__XClosure__Group_1_0_0__0__Impl rule__XClosure__Group_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_1_0_0__0__Impl_in_rule__XClosure__Group_1_0_0__031599);
+            pushFollow(FOLLOW_46);
             rule__XClosure__Group_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XClosure__Group_1_0_0__1_in_rule__XClosure__Group_1_0_0__031602);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group_1_0_0__1();
 
             state._fsp--;
@@ -45709,25 +45709,25 @@ public final void rule__XClosure__Group_1_0_0__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15473:1: rule__XClosure__Group_1_0_0__0__Impl : ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) ) ;
+    // InternalFormat.g:15473:1: rule__XClosure__Group_1_0_0__0__Impl : ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) ) ;
     public final void rule__XClosure__Group_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15477:1: ( ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15478:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) )
+            // InternalFormat.g:15477:1: ( ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) ) )
+            // InternalFormat.g:15478:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15478:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15479:1: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 )
+            // InternalFormat.g:15478:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 ) )
+            // InternalFormat.g:15479:1: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getDeclaredFormalParametersAssignment_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15480:1: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15480:2: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0
+            // InternalFormat.g:15480:1: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 )
+            // InternalFormat.g:15480:2: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0
             {
-            pushFollow(FOLLOW_rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0_in_rule__XClosure__Group_1_0_0__0__Impl31629);
+            pushFollow(FOLLOW_2);
             rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0();
 
             state._fsp--;
@@ -45760,16 +45760,16 @@ public final void rule__XClosure__Group_1_0_0__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15490:1: rule__XClosure__Group_1_0_0__1 : rule__XClosure__Group_1_0_0__1__Impl ;
+    // InternalFormat.g:15490:1: rule__XClosure__Group_1_0_0__1 : rule__XClosure__Group_1_0_0__1__Impl ;
     public final void rule__XClosure__Group_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15494:1: ( rule__XClosure__Group_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15495:2: rule__XClosure__Group_1_0_0__1__Impl
+            // InternalFormat.g:15494:1: ( rule__XClosure__Group_1_0_0__1__Impl )
+            // InternalFormat.g:15495:2: rule__XClosure__Group_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_1_0_0__1__Impl_in_rule__XClosure__Group_1_0_0__131659);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group_1_0_0__1__Impl();
 
             state._fsp--;
@@ -45793,22 +45793,22 @@ public final void rule__XClosure__Group_1_0_0__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15501:1: rule__XClosure__Group_1_0_0__1__Impl : ( ( rule__XClosure__Group_1_0_0_1__0 )* ) ;
+    // InternalFormat.g:15501:1: rule__XClosure__Group_1_0_0__1__Impl : ( ( rule__XClosure__Group_1_0_0_1__0 )* ) ;
     public final void rule__XClosure__Group_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15505:1: ( ( ( rule__XClosure__Group_1_0_0_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15506:1: ( ( rule__XClosure__Group_1_0_0_1__0 )* )
+            // InternalFormat.g:15505:1: ( ( ( rule__XClosure__Group_1_0_0_1__0 )* ) )
+            // InternalFormat.g:15506:1: ( ( rule__XClosure__Group_1_0_0_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15506:1: ( ( rule__XClosure__Group_1_0_0_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15507:1: ( rule__XClosure__Group_1_0_0_1__0 )*
+            // InternalFormat.g:15506:1: ( ( rule__XClosure__Group_1_0_0_1__0 )* )
+            // InternalFormat.g:15507:1: ( rule__XClosure__Group_1_0_0_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getGroup_1_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15508:1: ( rule__XClosure__Group_1_0_0_1__0 )*
+            // InternalFormat.g:15508:1: ( rule__XClosure__Group_1_0_0_1__0 )*
             loop126:
             do {
                 int alt126=2;
@@ -45821,9 +45821,9 @@ public final void rule__XClosure__Group_1_0_0__1__Impl() throws RecognitionExcep
 
                 switch (alt126) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15508:2: rule__XClosure__Group_1_0_0_1__0
+            	    // InternalFormat.g:15508:2: rule__XClosure__Group_1_0_0_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XClosure__Group_1_0_0_1__0_in_rule__XClosure__Group_1_0_0__1__Impl31686);
+            	    pushFollow(FOLLOW_23);
             	    rule__XClosure__Group_1_0_0_1__0();
 
             	    state._fsp--;
@@ -45862,21 +45862,21 @@ public final void rule__XClosure__Group_1_0_0__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15522:1: rule__XClosure__Group_1_0_0_1__0 : rule__XClosure__Group_1_0_0_1__0__Impl rule__XClosure__Group_1_0_0_1__1 ;
+    // InternalFormat.g:15522:1: rule__XClosure__Group_1_0_0_1__0 : rule__XClosure__Group_1_0_0_1__0__Impl rule__XClosure__Group_1_0_0_1__1 ;
     public final void rule__XClosure__Group_1_0_0_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15526:1: ( rule__XClosure__Group_1_0_0_1__0__Impl rule__XClosure__Group_1_0_0_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15527:2: rule__XClosure__Group_1_0_0_1__0__Impl rule__XClosure__Group_1_0_0_1__1
+            // InternalFormat.g:15526:1: ( rule__XClosure__Group_1_0_0_1__0__Impl rule__XClosure__Group_1_0_0_1__1 )
+            // InternalFormat.g:15527:2: rule__XClosure__Group_1_0_0_1__0__Impl rule__XClosure__Group_1_0_0_1__1
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_1_0_0_1__0__Impl_in_rule__XClosure__Group_1_0_0_1__031721);
+            pushFollow(FOLLOW_66);
             rule__XClosure__Group_1_0_0_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XClosure__Group_1_0_0_1__1_in_rule__XClosure__Group_1_0_0_1__031724);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group_1_0_0_1__1();
 
             state._fsp--;
@@ -45900,22 +45900,22 @@ public final void rule__XClosure__Group_1_0_0_1__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15534:1: rule__XClosure__Group_1_0_0_1__0__Impl : ( ',' ) ;
+    // InternalFormat.g:15534:1: rule__XClosure__Group_1_0_0_1__0__Impl : ( ',' ) ;
     public final void rule__XClosure__Group_1_0_0_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15538:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15539:1: ( ',' )
+            // InternalFormat.g:15538:1: ( ( ',' ) )
+            // InternalFormat.g:15539:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15539:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15540:1: ','
+            // InternalFormat.g:15539:1: ( ',' )
+            // InternalFormat.g:15540:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getCommaKeyword_1_0_0_1_0()); 
             }
-            match(input,71,FOLLOW_71_in_rule__XClosure__Group_1_0_0_1__0__Impl31752); if (state.failed) return ;
+            match(input,71,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXClosureAccess().getCommaKeyword_1_0_0_1_0()); 
             }
@@ -45941,16 +45941,16 @@ public final void rule__XClosure__Group_1_0_0_1__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15553:1: rule__XClosure__Group_1_0_0_1__1 : rule__XClosure__Group_1_0_0_1__1__Impl ;
+    // InternalFormat.g:15553:1: rule__XClosure__Group_1_0_0_1__1 : rule__XClosure__Group_1_0_0_1__1__Impl ;
     public final void rule__XClosure__Group_1_0_0_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15557:1: ( rule__XClosure__Group_1_0_0_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15558:2: rule__XClosure__Group_1_0_0_1__1__Impl
+            // InternalFormat.g:15557:1: ( rule__XClosure__Group_1_0_0_1__1__Impl )
+            // InternalFormat.g:15558:2: rule__XClosure__Group_1_0_0_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XClosure__Group_1_0_0_1__1__Impl_in_rule__XClosure__Group_1_0_0_1__131783);
+            pushFollow(FOLLOW_2);
             rule__XClosure__Group_1_0_0_1__1__Impl();
 
             state._fsp--;
@@ -45974,25 +45974,25 @@ public final void rule__XClosure__Group_1_0_0_1__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XClosure__Group_1_0_0_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15564:1: rule__XClosure__Group_1_0_0_1__1__Impl : ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) ) ;
+    // InternalFormat.g:15564:1: rule__XClosure__Group_1_0_0_1__1__Impl : ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) ) ;
     public final void rule__XClosure__Group_1_0_0_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15568:1: ( ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15569:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) )
+            // InternalFormat.g:15568:1: ( ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) ) )
+            // InternalFormat.g:15569:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15569:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15570:1: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 )
+            // InternalFormat.g:15569:1: ( ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 ) )
+            // InternalFormat.g:15570:1: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getDeclaredFormalParametersAssignment_1_0_0_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15571:1: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15571:2: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1
+            // InternalFormat.g:15571:1: ( rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 )
+            // InternalFormat.g:15571:2: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1
             {
-            pushFollow(FOLLOW_rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1_in_rule__XClosure__Group_1_0_0_1__1__Impl31810);
+            pushFollow(FOLLOW_2);
             rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1();
 
             state._fsp--;
@@ -46025,21 +46025,21 @@ public final void rule__XClosure__Group_1_0_0_1__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15585:1: rule__XExpressionInClosure__Group__0 : rule__XExpressionInClosure__Group__0__Impl rule__XExpressionInClosure__Group__1 ;
+    // InternalFormat.g:15585:1: rule__XExpressionInClosure__Group__0 : rule__XExpressionInClosure__Group__0__Impl rule__XExpressionInClosure__Group__1 ;
     public final void rule__XExpressionInClosure__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15589:1: ( rule__XExpressionInClosure__Group__0__Impl rule__XExpressionInClosure__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15590:2: rule__XExpressionInClosure__Group__0__Impl rule__XExpressionInClosure__Group__1
+            // InternalFormat.g:15589:1: ( rule__XExpressionInClosure__Group__0__Impl rule__XExpressionInClosure__Group__1 )
+            // InternalFormat.g:15590:2: rule__XExpressionInClosure__Group__0__Impl rule__XExpressionInClosure__Group__1
             {
-            pushFollow(FOLLOW_rule__XExpressionInClosure__Group__0__Impl_in_rule__XExpressionInClosure__Group__031844);
+            pushFollow(FOLLOW_90);
             rule__XExpressionInClosure__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XExpressionInClosure__Group__1_in_rule__XExpressionInClosure__Group__031847);
+            pushFollow(FOLLOW_2);
             rule__XExpressionInClosure__Group__1();
 
             state._fsp--;
@@ -46063,23 +46063,23 @@ public final void rule__XExpressionInClosure__Group__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15597:1: rule__XExpressionInClosure__Group__0__Impl : ( () ) ;
+    // InternalFormat.g:15597:1: rule__XExpressionInClosure__Group__0__Impl : ( () ) ;
     public final void rule__XExpressionInClosure__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15601:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15602:1: ( () )
+            // InternalFormat.g:15601:1: ( ( () ) )
+            // InternalFormat.g:15602:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15602:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15603:1: ()
+            // InternalFormat.g:15602:1: ( () )
+            // InternalFormat.g:15603:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionInClosureAccess().getXBlockExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15604:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15606:1: 
+            // InternalFormat.g:15604:1: ()
+            // InternalFormat.g:15606:1: 
             {
             }
 
@@ -46104,16 +46104,16 @@ public final void rule__XExpressionInClosure__Group__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15616:1: rule__XExpressionInClosure__Group__1 : rule__XExpressionInClosure__Group__1__Impl ;
+    // InternalFormat.g:15616:1: rule__XExpressionInClosure__Group__1 : rule__XExpressionInClosure__Group__1__Impl ;
     public final void rule__XExpressionInClosure__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15620:1: ( rule__XExpressionInClosure__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15621:2: rule__XExpressionInClosure__Group__1__Impl
+            // InternalFormat.g:15620:1: ( rule__XExpressionInClosure__Group__1__Impl )
+            // InternalFormat.g:15621:2: rule__XExpressionInClosure__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XExpressionInClosure__Group__1__Impl_in_rule__XExpressionInClosure__Group__131905);
+            pushFollow(FOLLOW_2);
             rule__XExpressionInClosure__Group__1__Impl();
 
             state._fsp--;
@@ -46137,22 +46137,22 @@ public final void rule__XExpressionInClosure__Group__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15627:1: rule__XExpressionInClosure__Group__1__Impl : ( ( rule__XExpressionInClosure__Group_1__0 )* ) ;
+    // InternalFormat.g:15627:1: rule__XExpressionInClosure__Group__1__Impl : ( ( rule__XExpressionInClosure__Group_1__0 )* ) ;
     public final void rule__XExpressionInClosure__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15631:1: ( ( ( rule__XExpressionInClosure__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15632:1: ( ( rule__XExpressionInClosure__Group_1__0 )* )
+            // InternalFormat.g:15631:1: ( ( ( rule__XExpressionInClosure__Group_1__0 )* ) )
+            // InternalFormat.g:15632:1: ( ( rule__XExpressionInClosure__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15632:1: ( ( rule__XExpressionInClosure__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15633:1: ( rule__XExpressionInClosure__Group_1__0 )*
+            // InternalFormat.g:15632:1: ( ( rule__XExpressionInClosure__Group_1__0 )* )
+            // InternalFormat.g:15633:1: ( rule__XExpressionInClosure__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionInClosureAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15634:1: ( rule__XExpressionInClosure__Group_1__0 )*
+            // InternalFormat.g:15634:1: ( rule__XExpressionInClosure__Group_1__0 )*
             loop127:
             do {
                 int alt127=2;
@@ -46165,9 +46165,9 @@ public final void rule__XExpressionInClosure__Group__1__Impl() throws Recognitio
 
                 switch (alt127) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15634:2: rule__XExpressionInClosure__Group_1__0
+            	    // InternalFormat.g:15634:2: rule__XExpressionInClosure__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XExpressionInClosure__Group_1__0_in_rule__XExpressionInClosure__Group__1__Impl31932);
+            	    pushFollow(FOLLOW_93);
             	    rule__XExpressionInClosure__Group_1__0();
 
             	    state._fsp--;
@@ -46206,21 +46206,21 @@ public final void rule__XExpressionInClosure__Group__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15648:1: rule__XExpressionInClosure__Group_1__0 : rule__XExpressionInClosure__Group_1__0__Impl rule__XExpressionInClosure__Group_1__1 ;
+    // InternalFormat.g:15648:1: rule__XExpressionInClosure__Group_1__0 : rule__XExpressionInClosure__Group_1__0__Impl rule__XExpressionInClosure__Group_1__1 ;
     public final void rule__XExpressionInClosure__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15652:1: ( rule__XExpressionInClosure__Group_1__0__Impl rule__XExpressionInClosure__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15653:2: rule__XExpressionInClosure__Group_1__0__Impl rule__XExpressionInClosure__Group_1__1
+            // InternalFormat.g:15652:1: ( rule__XExpressionInClosure__Group_1__0__Impl rule__XExpressionInClosure__Group_1__1 )
+            // InternalFormat.g:15653:2: rule__XExpressionInClosure__Group_1__0__Impl rule__XExpressionInClosure__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XExpressionInClosure__Group_1__0__Impl_in_rule__XExpressionInClosure__Group_1__031967);
+            pushFollow(FOLLOW_11);
             rule__XExpressionInClosure__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XExpressionInClosure__Group_1__1_in_rule__XExpressionInClosure__Group_1__031970);
+            pushFollow(FOLLOW_2);
             rule__XExpressionInClosure__Group_1__1();
 
             state._fsp--;
@@ -46244,25 +46244,25 @@ public final void rule__XExpressionInClosure__Group_1__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15660:1: rule__XExpressionInClosure__Group_1__0__Impl : ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) ) ;
+    // InternalFormat.g:15660:1: rule__XExpressionInClosure__Group_1__0__Impl : ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) ) ;
     public final void rule__XExpressionInClosure__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15664:1: ( ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15665:1: ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) )
+            // InternalFormat.g:15664:1: ( ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) ) )
+            // InternalFormat.g:15665:1: ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15665:1: ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15666:1: ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 )
+            // InternalFormat.g:15665:1: ( ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 ) )
+            // InternalFormat.g:15666:1: ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionInClosureAccess().getExpressionsAssignment_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15667:1: ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15667:2: rule__XExpressionInClosure__ExpressionsAssignment_1_0
+            // InternalFormat.g:15667:1: ( rule__XExpressionInClosure__ExpressionsAssignment_1_0 )
+            // InternalFormat.g:15667:2: rule__XExpressionInClosure__ExpressionsAssignment_1_0
             {
-            pushFollow(FOLLOW_rule__XExpressionInClosure__ExpressionsAssignment_1_0_in_rule__XExpressionInClosure__Group_1__0__Impl31997);
+            pushFollow(FOLLOW_2);
             rule__XExpressionInClosure__ExpressionsAssignment_1_0();
 
             state._fsp--;
@@ -46295,16 +46295,16 @@ public final void rule__XExpressionInClosure__Group_1__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15677:1: rule__XExpressionInClosure__Group_1__1 : rule__XExpressionInClosure__Group_1__1__Impl ;
+    // InternalFormat.g:15677:1: rule__XExpressionInClosure__Group_1__1 : rule__XExpressionInClosure__Group_1__1__Impl ;
     public final void rule__XExpressionInClosure__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15681:1: ( rule__XExpressionInClosure__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15682:2: rule__XExpressionInClosure__Group_1__1__Impl
+            // InternalFormat.g:15681:1: ( rule__XExpressionInClosure__Group_1__1__Impl )
+            // InternalFormat.g:15682:2: rule__XExpressionInClosure__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XExpressionInClosure__Group_1__1__Impl_in_rule__XExpressionInClosure__Group_1__132027);
+            pushFollow(FOLLOW_2);
             rule__XExpressionInClosure__Group_1__1__Impl();
 
             state._fsp--;
@@ -46328,22 +46328,22 @@ public final void rule__XExpressionInClosure__Group_1__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__XExpressionInClosure__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15688:1: rule__XExpressionInClosure__Group_1__1__Impl : ( ( ';' )? ) ;
+    // InternalFormat.g:15688:1: rule__XExpressionInClosure__Group_1__1__Impl : ( ( ';' )? ) ;
     public final void rule__XExpressionInClosure__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15692:1: ( ( ( ';' )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15693:1: ( ( ';' )? )
+            // InternalFormat.g:15692:1: ( ( ( ';' )? ) )
+            // InternalFormat.g:15693:1: ( ( ';' )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15693:1: ( ( ';' )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15694:1: ( ';' )?
+            // InternalFormat.g:15693:1: ( ( ';' )? )
+            // InternalFormat.g:15694:1: ( ';' )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionInClosureAccess().getSemicolonKeyword_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15695:1: ( ';' )?
+            // InternalFormat.g:15695:1: ( ';' )?
             int alt128=2;
             int LA128_0 = input.LA(1);
 
@@ -46352,9 +46352,9 @@ public final void rule__XExpressionInClosure__Group_1__1__Impl() throws Recognit
             }
             switch (alt128) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15696:2: ';'
+                    // InternalFormat.g:15696:2: ';'
                     {
-                    match(input,65,FOLLOW_65_in_rule__XExpressionInClosure__Group_1__1__Impl32056); if (state.failed) return ;
+                    match(input,65,FOLLOW_2); if (state.failed) return ;
 
                     }
                     break;
@@ -46386,21 +46386,21 @@ public final void rule__XExpressionInClosure__Group_1__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XShortClosure__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15711:1: rule__XShortClosure__Group__0 : rule__XShortClosure__Group__0__Impl rule__XShortClosure__Group__1 ;
+    // InternalFormat.g:15711:1: rule__XShortClosure__Group__0 : rule__XShortClosure__Group__0__Impl rule__XShortClosure__Group__1 ;
     public final void rule__XShortClosure__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15715:1: ( rule__XShortClosure__Group__0__Impl rule__XShortClosure__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15716:2: rule__XShortClosure__Group__0__Impl rule__XShortClosure__Group__1
+            // InternalFormat.g:15715:1: ( rule__XShortClosure__Group__0__Impl rule__XShortClosure__Group__1 )
+            // InternalFormat.g:15716:2: rule__XShortClosure__Group__0__Impl rule__XShortClosure__Group__1
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group__0__Impl_in_rule__XShortClosure__Group__032093);
+            pushFollow(FOLLOW_50);
             rule__XShortClosure__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XShortClosure__Group__1_in_rule__XShortClosure__Group__032096);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__Group__1();
 
             state._fsp--;
@@ -46424,25 +46424,25 @@ public final void rule__XShortClosure__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XShortClosure__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15723:1: rule__XShortClosure__Group__0__Impl : ( ( rule__XShortClosure__Group_0__0 ) ) ;
+    // InternalFormat.g:15723:1: rule__XShortClosure__Group__0__Impl : ( ( rule__XShortClosure__Group_0__0 ) ) ;
     public final void rule__XShortClosure__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15727:1: ( ( ( rule__XShortClosure__Group_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15728:1: ( ( rule__XShortClosure__Group_0__0 ) )
+            // InternalFormat.g:15727:1: ( ( ( rule__XShortClosure__Group_0__0 ) ) )
+            // InternalFormat.g:15728:1: ( ( rule__XShortClosure__Group_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15728:1: ( ( rule__XShortClosure__Group_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15729:1: ( rule__XShortClosure__Group_0__0 )
+            // InternalFormat.g:15728:1: ( ( rule__XShortClosure__Group_0__0 ) )
+            // InternalFormat.g:15729:1: ( rule__XShortClosure__Group_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getGroup_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15730:1: ( rule__XShortClosure__Group_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15730:2: rule__XShortClosure__Group_0__0
+            // InternalFormat.g:15730:1: ( rule__XShortClosure__Group_0__0 )
+            // InternalFormat.g:15730:2: rule__XShortClosure__Group_0__0
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0__0_in_rule__XShortClosure__Group__0__Impl32123);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__Group_0__0();
 
             state._fsp--;
@@ -46475,16 +46475,16 @@ public final void rule__XShortClosure__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XShortClosure__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15740:1: rule__XShortClosure__Group__1 : rule__XShortClosure__Group__1__Impl ;
+    // InternalFormat.g:15740:1: rule__XShortClosure__Group__1 : rule__XShortClosure__Group__1__Impl ;
     public final void rule__XShortClosure__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15744:1: ( rule__XShortClosure__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15745:2: rule__XShortClosure__Group__1__Impl
+            // InternalFormat.g:15744:1: ( rule__XShortClosure__Group__1__Impl )
+            // InternalFormat.g:15745:2: rule__XShortClosure__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group__1__Impl_in_rule__XShortClosure__Group__132153);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__Group__1__Impl();
 
             state._fsp--;
@@ -46508,25 +46508,25 @@ public final void rule__XShortClosure__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XShortClosure__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15751:1: rule__XShortClosure__Group__1__Impl : ( ( rule__XShortClosure__ExpressionAssignment_1 ) ) ;
+    // InternalFormat.g:15751:1: rule__XShortClosure__Group__1__Impl : ( ( rule__XShortClosure__ExpressionAssignment_1 ) ) ;
     public final void rule__XShortClosure__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15755:1: ( ( ( rule__XShortClosure__ExpressionAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15756:1: ( ( rule__XShortClosure__ExpressionAssignment_1 ) )
+            // InternalFormat.g:15755:1: ( ( ( rule__XShortClosure__ExpressionAssignment_1 ) ) )
+            // InternalFormat.g:15756:1: ( ( rule__XShortClosure__ExpressionAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15756:1: ( ( rule__XShortClosure__ExpressionAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15757:1: ( rule__XShortClosure__ExpressionAssignment_1 )
+            // InternalFormat.g:15756:1: ( ( rule__XShortClosure__ExpressionAssignment_1 ) )
+            // InternalFormat.g:15757:1: ( rule__XShortClosure__ExpressionAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getExpressionAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15758:1: ( rule__XShortClosure__ExpressionAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15758:2: rule__XShortClosure__ExpressionAssignment_1
+            // InternalFormat.g:15758:1: ( rule__XShortClosure__ExpressionAssignment_1 )
+            // InternalFormat.g:15758:2: rule__XShortClosure__ExpressionAssignment_1
             {
-            pushFollow(FOLLOW_rule__XShortClosure__ExpressionAssignment_1_in_rule__XShortClosure__Group__1__Impl32180);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__ExpressionAssignment_1();
 
             state._fsp--;
@@ -46559,16 +46559,16 @@ public final void rule__XShortClosure__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XShortClosure__Group_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15772:1: rule__XShortClosure__Group_0__0 : rule__XShortClosure__Group_0__0__Impl ;
+    // InternalFormat.g:15772:1: rule__XShortClosure__Group_0__0 : rule__XShortClosure__Group_0__0__Impl ;
     public final void rule__XShortClosure__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15776:1: ( rule__XShortClosure__Group_0__0__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15777:2: rule__XShortClosure__Group_0__0__Impl
+            // InternalFormat.g:15776:1: ( rule__XShortClosure__Group_0__0__Impl )
+            // InternalFormat.g:15777:2: rule__XShortClosure__Group_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0__0__Impl_in_rule__XShortClosure__Group_0__032214);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__Group_0__0__Impl();
 
             state._fsp--;
@@ -46592,25 +46592,25 @@ public final void rule__XShortClosure__Group_0__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XShortClosure__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15783:1: rule__XShortClosure__Group_0__0__Impl : ( ( rule__XShortClosure__Group_0_0__0 ) ) ;
+    // InternalFormat.g:15783:1: rule__XShortClosure__Group_0__0__Impl : ( ( rule__XShortClosure__Group_0_0__0 ) ) ;
     public final void rule__XShortClosure__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15787:1: ( ( ( rule__XShortClosure__Group_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15788:1: ( ( rule__XShortClosure__Group_0_0__0 ) )
+            // InternalFormat.g:15787:1: ( ( ( rule__XShortClosure__Group_0_0__0 ) ) )
+            // InternalFormat.g:15788:1: ( ( rule__XShortClosure__Group_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15788:1: ( ( rule__XShortClosure__Group_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15789:1: ( rule__XShortClosure__Group_0_0__0 )
+            // InternalFormat.g:15788:1: ( ( rule__XShortClosure__Group_0_0__0 ) )
+            // InternalFormat.g:15789:1: ( rule__XShortClosure__Group_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getGroup_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15790:1: ( rule__XShortClosure__Group_0_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15790:2: rule__XShortClosure__Group_0_0__0
+            // InternalFormat.g:15790:1: ( rule__XShortClosure__Group_0_0__0 )
+            // InternalFormat.g:15790:2: rule__XShortClosure__Group_0_0__0
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0__0_in_rule__XShortClosure__Group_0__0__Impl32241);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__Group_0_0__0();
 
             state._fsp--;
@@ -46643,21 +46643,21 @@ public final void rule__XShortClosure__Group_0__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15802:1: rule__XShortClosure__Group_0_0__0 : rule__XShortClosure__Group_0_0__0__Impl rule__XShortClosure__Group_0_0__1 ;
+    // InternalFormat.g:15802:1: rule__XShortClosure__Group_0_0__0 : rule__XShortClosure__Group_0_0__0__Impl rule__XShortClosure__Group_0_0__1 ;
     public final void rule__XShortClosure__Group_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15806:1: ( rule__XShortClosure__Group_0_0__0__Impl rule__XShortClosure__Group_0_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15807:2: rule__XShortClosure__Group_0_0__0__Impl rule__XShortClosure__Group_0_0__1
+            // InternalFormat.g:15806:1: ( rule__XShortClosure__Group_0_0__0__Impl rule__XShortClosure__Group_0_0__1 )
+            // InternalFormat.g:15807:2: rule__XShortClosure__Group_0_0__0__Impl rule__XShortClosure__Group_0_0__1
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0__0__Impl_in_rule__XShortClosure__Group_0_0__032273);
+            pushFollow(FOLLOW_92);
             rule__XShortClosure__Group_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0__1_in_rule__XShortClosure__Group_0_0__032276);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__Group_0_0__1();
 
             state._fsp--;
@@ -46681,23 +46681,23 @@ public final void rule__XShortClosure__Group_0_0__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15814:1: rule__XShortClosure__Group_0_0__0__Impl : ( () ) ;
+    // InternalFormat.g:15814:1: rule__XShortClosure__Group_0_0__0__Impl : ( () ) ;
     public final void rule__XShortClosure__Group_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15818:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15819:1: ( () )
+            // InternalFormat.g:15818:1: ( ( () ) )
+            // InternalFormat.g:15819:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15819:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15820:1: ()
+            // InternalFormat.g:15819:1: ( () )
+            // InternalFormat.g:15820:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getXClosureAction_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15821:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15823:1: 
+            // InternalFormat.g:15821:1: ()
+            // InternalFormat.g:15823:1: 
             {
             }
 
@@ -46722,21 +46722,21 @@ public final void rule__XShortClosure__Group_0_0__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15833:1: rule__XShortClosure__Group_0_0__1 : rule__XShortClosure__Group_0_0__1__Impl rule__XShortClosure__Group_0_0__2 ;
+    // InternalFormat.g:15833:1: rule__XShortClosure__Group_0_0__1 : rule__XShortClosure__Group_0_0__1__Impl rule__XShortClosure__Group_0_0__2 ;
     public final void rule__XShortClosure__Group_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15837:1: ( rule__XShortClosure__Group_0_0__1__Impl rule__XShortClosure__Group_0_0__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15838:2: rule__XShortClosure__Group_0_0__1__Impl rule__XShortClosure__Group_0_0__2
+            // InternalFormat.g:15837:1: ( rule__XShortClosure__Group_0_0__1__Impl rule__XShortClosure__Group_0_0__2 )
+            // InternalFormat.g:15838:2: rule__XShortClosure__Group_0_0__1__Impl rule__XShortClosure__Group_0_0__2
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0__1__Impl_in_rule__XShortClosure__Group_0_0__132334);
+            pushFollow(FOLLOW_92);
             rule__XShortClosure__Group_0_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0__2_in_rule__XShortClosure__Group_0_0__132337);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__Group_0_0__2();
 
             state._fsp--;
@@ -46760,22 +46760,22 @@ public final void rule__XShortClosure__Group_0_0__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15845:1: rule__XShortClosure__Group_0_0__1__Impl : ( ( rule__XShortClosure__Group_0_0_1__0 )? ) ;
+    // InternalFormat.g:15845:1: rule__XShortClosure__Group_0_0__1__Impl : ( ( rule__XShortClosure__Group_0_0_1__0 )? ) ;
     public final void rule__XShortClosure__Group_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15849:1: ( ( ( rule__XShortClosure__Group_0_0_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15850:1: ( ( rule__XShortClosure__Group_0_0_1__0 )? )
+            // InternalFormat.g:15849:1: ( ( ( rule__XShortClosure__Group_0_0_1__0 )? ) )
+            // InternalFormat.g:15850:1: ( ( rule__XShortClosure__Group_0_0_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15850:1: ( ( rule__XShortClosure__Group_0_0_1__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15851:1: ( rule__XShortClosure__Group_0_0_1__0 )?
+            // InternalFormat.g:15850:1: ( ( rule__XShortClosure__Group_0_0_1__0 )? )
+            // InternalFormat.g:15851:1: ( rule__XShortClosure__Group_0_0_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getGroup_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15852:1: ( rule__XShortClosure__Group_0_0_1__0 )?
+            // InternalFormat.g:15852:1: ( rule__XShortClosure__Group_0_0_1__0 )?
             int alt129=2;
             int LA129_0 = input.LA(1);
 
@@ -46784,9 +46784,9 @@ public final void rule__XShortClosure__Group_0_0__1__Impl() throws RecognitionEx
             }
             switch (alt129) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15852:2: rule__XShortClosure__Group_0_0_1__0
+                    // InternalFormat.g:15852:2: rule__XShortClosure__Group_0_0_1__0
                     {
-                    pushFollow(FOLLOW_rule__XShortClosure__Group_0_0_1__0_in_rule__XShortClosure__Group_0_0__1__Impl32364);
+                    pushFollow(FOLLOW_2);
                     rule__XShortClosure__Group_0_0_1__0();
 
                     state._fsp--;
@@ -46822,16 +46822,16 @@ public final void rule__XShortClosure__Group_0_0__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15862:1: rule__XShortClosure__Group_0_0__2 : rule__XShortClosure__Group_0_0__2__Impl ;
+    // InternalFormat.g:15862:1: rule__XShortClosure__Group_0_0__2 : rule__XShortClosure__Group_0_0__2__Impl ;
     public final void rule__XShortClosure__Group_0_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15866:1: ( rule__XShortClosure__Group_0_0__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15867:2: rule__XShortClosure__Group_0_0__2__Impl
+            // InternalFormat.g:15866:1: ( rule__XShortClosure__Group_0_0__2__Impl )
+            // InternalFormat.g:15867:2: rule__XShortClosure__Group_0_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0__2__Impl_in_rule__XShortClosure__Group_0_0__232395);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__Group_0_0__2__Impl();
 
             state._fsp--;
@@ -46855,25 +46855,25 @@ public final void rule__XShortClosure__Group_0_0__2() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15873:1: rule__XShortClosure__Group_0_0__2__Impl : ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) ) ;
+    // InternalFormat.g:15873:1: rule__XShortClosure__Group_0_0__2__Impl : ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) ) ;
     public final void rule__XShortClosure__Group_0_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15877:1: ( ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15878:1: ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) )
+            // InternalFormat.g:15877:1: ( ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) ) )
+            // InternalFormat.g:15878:1: ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15878:1: ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15879:1: ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 )
+            // InternalFormat.g:15878:1: ( ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 ) )
+            // InternalFormat.g:15879:1: ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getExplicitSyntaxAssignment_0_0_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15880:1: ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15880:2: rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2
+            // InternalFormat.g:15880:1: ( rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 )
+            // InternalFormat.g:15880:2: rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2
             {
-            pushFollow(FOLLOW_rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2_in_rule__XShortClosure__Group_0_0__2__Impl32422);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2();
 
             state._fsp--;
@@ -46906,21 +46906,21 @@ public final void rule__XShortClosure__Group_0_0__2__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15896:1: rule__XShortClosure__Group_0_0_1__0 : rule__XShortClosure__Group_0_0_1__0__Impl rule__XShortClosure__Group_0_0_1__1 ;
+    // InternalFormat.g:15896:1: rule__XShortClosure__Group_0_0_1__0 : rule__XShortClosure__Group_0_0_1__0__Impl rule__XShortClosure__Group_0_0_1__1 ;
     public final void rule__XShortClosure__Group_0_0_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15900:1: ( rule__XShortClosure__Group_0_0_1__0__Impl rule__XShortClosure__Group_0_0_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15901:2: rule__XShortClosure__Group_0_0_1__0__Impl rule__XShortClosure__Group_0_0_1__1
+            // InternalFormat.g:15900:1: ( rule__XShortClosure__Group_0_0_1__0__Impl rule__XShortClosure__Group_0_0_1__1 )
+            // InternalFormat.g:15901:2: rule__XShortClosure__Group_0_0_1__0__Impl rule__XShortClosure__Group_0_0_1__1
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0_1__0__Impl_in_rule__XShortClosure__Group_0_0_1__032458);
+            pushFollow(FOLLOW_46);
             rule__XShortClosure__Group_0_0_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0_1__1_in_rule__XShortClosure__Group_0_0_1__032461);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__Group_0_0_1__1();
 
             state._fsp--;
@@ -46944,25 +46944,25 @@ public final void rule__XShortClosure__Group_0_0_1__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15908:1: rule__XShortClosure__Group_0_0_1__0__Impl : ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) ) ;
+    // InternalFormat.g:15908:1: rule__XShortClosure__Group_0_0_1__0__Impl : ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) ) ;
     public final void rule__XShortClosure__Group_0_0_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15912:1: ( ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15913:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) )
+            // InternalFormat.g:15912:1: ( ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) ) )
+            // InternalFormat.g:15913:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15913:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15914:1: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 )
+            // InternalFormat.g:15913:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 ) )
+            // InternalFormat.g:15914:1: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getDeclaredFormalParametersAssignment_0_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15915:1: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15915:2: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0
+            // InternalFormat.g:15915:1: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 )
+            // InternalFormat.g:15915:2: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0
             {
-            pushFollow(FOLLOW_rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0_in_rule__XShortClosure__Group_0_0_1__0__Impl32488);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0();
 
             state._fsp--;
@@ -46995,16 +46995,16 @@ public final void rule__XShortClosure__Group_0_0_1__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15925:1: rule__XShortClosure__Group_0_0_1__1 : rule__XShortClosure__Group_0_0_1__1__Impl ;
+    // InternalFormat.g:15925:1: rule__XShortClosure__Group_0_0_1__1 : rule__XShortClosure__Group_0_0_1__1__Impl ;
     public final void rule__XShortClosure__Group_0_0_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15929:1: ( rule__XShortClosure__Group_0_0_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15930:2: rule__XShortClosure__Group_0_0_1__1__Impl
+            // InternalFormat.g:15929:1: ( rule__XShortClosure__Group_0_0_1__1__Impl )
+            // InternalFormat.g:15930:2: rule__XShortClosure__Group_0_0_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0_1__1__Impl_in_rule__XShortClosure__Group_0_0_1__132518);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__Group_0_0_1__1__Impl();
 
             state._fsp--;
@@ -47028,22 +47028,22 @@ public final void rule__XShortClosure__Group_0_0_1__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15936:1: rule__XShortClosure__Group_0_0_1__1__Impl : ( ( rule__XShortClosure__Group_0_0_1_1__0 )* ) ;
+    // InternalFormat.g:15936:1: rule__XShortClosure__Group_0_0_1__1__Impl : ( ( rule__XShortClosure__Group_0_0_1_1__0 )* ) ;
     public final void rule__XShortClosure__Group_0_0_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15940:1: ( ( ( rule__XShortClosure__Group_0_0_1_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15941:1: ( ( rule__XShortClosure__Group_0_0_1_1__0 )* )
+            // InternalFormat.g:15940:1: ( ( ( rule__XShortClosure__Group_0_0_1_1__0 )* ) )
+            // InternalFormat.g:15941:1: ( ( rule__XShortClosure__Group_0_0_1_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15941:1: ( ( rule__XShortClosure__Group_0_0_1_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15942:1: ( rule__XShortClosure__Group_0_0_1_1__0 )*
+            // InternalFormat.g:15941:1: ( ( rule__XShortClosure__Group_0_0_1_1__0 )* )
+            // InternalFormat.g:15942:1: ( rule__XShortClosure__Group_0_0_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getGroup_0_0_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15943:1: ( rule__XShortClosure__Group_0_0_1_1__0 )*
+            // InternalFormat.g:15943:1: ( rule__XShortClosure__Group_0_0_1_1__0 )*
             loop130:
             do {
                 int alt130=2;
@@ -47056,9 +47056,9 @@ public final void rule__XShortClosure__Group_0_0_1__1__Impl() throws Recognition
 
                 switch (alt130) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15943:2: rule__XShortClosure__Group_0_0_1_1__0
+            	    // InternalFormat.g:15943:2: rule__XShortClosure__Group_0_0_1_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XShortClosure__Group_0_0_1_1__0_in_rule__XShortClosure__Group_0_0_1__1__Impl32545);
+            	    pushFollow(FOLLOW_23);
             	    rule__XShortClosure__Group_0_0_1_1__0();
 
             	    state._fsp--;
@@ -47097,21 +47097,21 @@ public final void rule__XShortClosure__Group_0_0_1__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15957:1: rule__XShortClosure__Group_0_0_1_1__0 : rule__XShortClosure__Group_0_0_1_1__0__Impl rule__XShortClosure__Group_0_0_1_1__1 ;
+    // InternalFormat.g:15957:1: rule__XShortClosure__Group_0_0_1_1__0 : rule__XShortClosure__Group_0_0_1_1__0__Impl rule__XShortClosure__Group_0_0_1_1__1 ;
     public final void rule__XShortClosure__Group_0_0_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15961:1: ( rule__XShortClosure__Group_0_0_1_1__0__Impl rule__XShortClosure__Group_0_0_1_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15962:2: rule__XShortClosure__Group_0_0_1_1__0__Impl rule__XShortClosure__Group_0_0_1_1__1
+            // InternalFormat.g:15961:1: ( rule__XShortClosure__Group_0_0_1_1__0__Impl rule__XShortClosure__Group_0_0_1_1__1 )
+            // InternalFormat.g:15962:2: rule__XShortClosure__Group_0_0_1_1__0__Impl rule__XShortClosure__Group_0_0_1_1__1
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0_1_1__0__Impl_in_rule__XShortClosure__Group_0_0_1_1__032580);
+            pushFollow(FOLLOW_66);
             rule__XShortClosure__Group_0_0_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0_1_1__1_in_rule__XShortClosure__Group_0_0_1_1__032583);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__Group_0_0_1_1__1();
 
             state._fsp--;
@@ -47135,22 +47135,22 @@ public final void rule__XShortClosure__Group_0_0_1_1__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15969:1: rule__XShortClosure__Group_0_0_1_1__0__Impl : ( ',' ) ;
+    // InternalFormat.g:15969:1: rule__XShortClosure__Group_0_0_1_1__0__Impl : ( ',' ) ;
     public final void rule__XShortClosure__Group_0_0_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15973:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15974:1: ( ',' )
+            // InternalFormat.g:15973:1: ( ( ',' ) )
+            // InternalFormat.g:15974:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15974:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15975:1: ','
+            // InternalFormat.g:15974:1: ( ',' )
+            // InternalFormat.g:15975:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getCommaKeyword_0_0_1_1_0()); 
             }
-            match(input,71,FOLLOW_71_in_rule__XShortClosure__Group_0_0_1_1__0__Impl32611); if (state.failed) return ;
+            match(input,71,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXShortClosureAccess().getCommaKeyword_0_0_1_1_0()); 
             }
@@ -47176,16 +47176,16 @@ public final void rule__XShortClosure__Group_0_0_1_1__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15988:1: rule__XShortClosure__Group_0_0_1_1__1 : rule__XShortClosure__Group_0_0_1_1__1__Impl ;
+    // InternalFormat.g:15988:1: rule__XShortClosure__Group_0_0_1_1__1 : rule__XShortClosure__Group_0_0_1_1__1__Impl ;
     public final void rule__XShortClosure__Group_0_0_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15992:1: ( rule__XShortClosure__Group_0_0_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15993:2: rule__XShortClosure__Group_0_0_1_1__1__Impl
+            // InternalFormat.g:15992:1: ( rule__XShortClosure__Group_0_0_1_1__1__Impl )
+            // InternalFormat.g:15993:2: rule__XShortClosure__Group_0_0_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XShortClosure__Group_0_0_1_1__1__Impl_in_rule__XShortClosure__Group_0_0_1_1__132642);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__Group_0_0_1_1__1__Impl();
 
             state._fsp--;
@@ -47209,25 +47209,25 @@ public final void rule__XShortClosure__Group_0_0_1_1__1() throws RecognitionExce
 
 
     // $ANTLR start "rule__XShortClosure__Group_0_0_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15999:1: rule__XShortClosure__Group_0_0_1_1__1__Impl : ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) ) ;
+    // InternalFormat.g:15999:1: rule__XShortClosure__Group_0_0_1_1__1__Impl : ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) ) ;
     public final void rule__XShortClosure__Group_0_0_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16003:1: ( ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16004:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) )
+            // InternalFormat.g:16003:1: ( ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) ) )
+            // InternalFormat.g:16004:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16004:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16005:1: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 )
+            // InternalFormat.g:16004:1: ( ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 ) )
+            // InternalFormat.g:16005:1: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getDeclaredFormalParametersAssignment_0_0_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16006:1: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16006:2: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1
+            // InternalFormat.g:16006:1: ( rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 )
+            // InternalFormat.g:16006:2: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1
             {
-            pushFollow(FOLLOW_rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1_in_rule__XShortClosure__Group_0_0_1_1__1__Impl32669);
+            pushFollow(FOLLOW_2);
             rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1();
 
             state._fsp--;
@@ -47260,21 +47260,21 @@ public final void rule__XShortClosure__Group_0_0_1_1__1__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XParenthesizedExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16020:1: rule__XParenthesizedExpression__Group__0 : rule__XParenthesizedExpression__Group__0__Impl rule__XParenthesizedExpression__Group__1 ;
+    // InternalFormat.g:16020:1: rule__XParenthesizedExpression__Group__0 : rule__XParenthesizedExpression__Group__0__Impl rule__XParenthesizedExpression__Group__1 ;
     public final void rule__XParenthesizedExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16024:1: ( rule__XParenthesizedExpression__Group__0__Impl rule__XParenthesizedExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16025:2: rule__XParenthesizedExpression__Group__0__Impl rule__XParenthesizedExpression__Group__1
+            // InternalFormat.g:16024:1: ( rule__XParenthesizedExpression__Group__0__Impl rule__XParenthesizedExpression__Group__1 )
+            // InternalFormat.g:16025:2: rule__XParenthesizedExpression__Group__0__Impl rule__XParenthesizedExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XParenthesizedExpression__Group__0__Impl_in_rule__XParenthesizedExpression__Group__032703);
+            pushFollow(FOLLOW_50);
             rule__XParenthesizedExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XParenthesizedExpression__Group__1_in_rule__XParenthesizedExpression__Group__032706);
+            pushFollow(FOLLOW_2);
             rule__XParenthesizedExpression__Group__1();
 
             state._fsp--;
@@ -47298,22 +47298,22 @@ public final void rule__XParenthesizedExpression__Group__0() throws RecognitionE
 
 
     // $ANTLR start "rule__XParenthesizedExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16032:1: rule__XParenthesizedExpression__Group__0__Impl : ( '(' ) ;
+    // InternalFormat.g:16032:1: rule__XParenthesizedExpression__Group__0__Impl : ( '(' ) ;
     public final void rule__XParenthesizedExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16036:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16037:1: ( '(' )
+            // InternalFormat.g:16036:1: ( ( '(' ) )
+            // InternalFormat.g:16037:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16037:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16038:1: '('
+            // InternalFormat.g:16037:1: ( '(' )
+            // InternalFormat.g:16038:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXParenthesizedExpressionAccess().getLeftParenthesisKeyword_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XParenthesizedExpression__Group__0__Impl32734); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXParenthesizedExpressionAccess().getLeftParenthesisKeyword_0()); 
             }
@@ -47339,21 +47339,21 @@ public final void rule__XParenthesizedExpression__Group__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XParenthesizedExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16051:1: rule__XParenthesizedExpression__Group__1 : rule__XParenthesizedExpression__Group__1__Impl rule__XParenthesizedExpression__Group__2 ;
+    // InternalFormat.g:16051:1: rule__XParenthesizedExpression__Group__1 : rule__XParenthesizedExpression__Group__1__Impl rule__XParenthesizedExpression__Group__2 ;
     public final void rule__XParenthesizedExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16055:1: ( rule__XParenthesizedExpression__Group__1__Impl rule__XParenthesizedExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16056:2: rule__XParenthesizedExpression__Group__1__Impl rule__XParenthesizedExpression__Group__2
+            // InternalFormat.g:16055:1: ( rule__XParenthesizedExpression__Group__1__Impl rule__XParenthesizedExpression__Group__2 )
+            // InternalFormat.g:16056:2: rule__XParenthesizedExpression__Group__1__Impl rule__XParenthesizedExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XParenthesizedExpression__Group__1__Impl_in_rule__XParenthesizedExpression__Group__132765);
+            pushFollow(FOLLOW_33);
             rule__XParenthesizedExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XParenthesizedExpression__Group__2_in_rule__XParenthesizedExpression__Group__132768);
+            pushFollow(FOLLOW_2);
             rule__XParenthesizedExpression__Group__2();
 
             state._fsp--;
@@ -47377,22 +47377,22 @@ public final void rule__XParenthesizedExpression__Group__1() throws RecognitionE
 
 
     // $ANTLR start "rule__XParenthesizedExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16063:1: rule__XParenthesizedExpression__Group__1__Impl : ( ruleXExpression ) ;
+    // InternalFormat.g:16063:1: rule__XParenthesizedExpression__Group__1__Impl : ( ruleXExpression ) ;
     public final void rule__XParenthesizedExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16067:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16068:1: ( ruleXExpression )
+            // InternalFormat.g:16067:1: ( ( ruleXExpression ) )
+            // InternalFormat.g:16068:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16068:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16069:1: ruleXExpression
+            // InternalFormat.g:16068:1: ( ruleXExpression )
+            // InternalFormat.g:16069:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXParenthesizedExpressionAccess().getXExpressionParserRuleCall_1()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XParenthesizedExpression__Group__1__Impl32795);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -47422,16 +47422,16 @@ public final void rule__XParenthesizedExpression__Group__1__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XParenthesizedExpression__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16080:1: rule__XParenthesizedExpression__Group__2 : rule__XParenthesizedExpression__Group__2__Impl ;
+    // InternalFormat.g:16080:1: rule__XParenthesizedExpression__Group__2 : rule__XParenthesizedExpression__Group__2__Impl ;
     public final void rule__XParenthesizedExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16084:1: ( rule__XParenthesizedExpression__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16085:2: rule__XParenthesizedExpression__Group__2__Impl
+            // InternalFormat.g:16084:1: ( rule__XParenthesizedExpression__Group__2__Impl )
+            // InternalFormat.g:16085:2: rule__XParenthesizedExpression__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__XParenthesizedExpression__Group__2__Impl_in_rule__XParenthesizedExpression__Group__232824);
+            pushFollow(FOLLOW_2);
             rule__XParenthesizedExpression__Group__2__Impl();
 
             state._fsp--;
@@ -47455,22 +47455,22 @@ public final void rule__XParenthesizedExpression__Group__2() throws RecognitionE
 
 
     // $ANTLR start "rule__XParenthesizedExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16091:1: rule__XParenthesizedExpression__Group__2__Impl : ( ')' ) ;
+    // InternalFormat.g:16091:1: rule__XParenthesizedExpression__Group__2__Impl : ( ')' ) ;
     public final void rule__XParenthesizedExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16095:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16096:1: ( ')' )
+            // InternalFormat.g:16095:1: ( ( ')' ) )
+            // InternalFormat.g:16096:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16096:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16097:1: ')'
+            // InternalFormat.g:16096:1: ( ')' )
+            // InternalFormat.g:16097:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXParenthesizedExpressionAccess().getRightParenthesisKeyword_2()); 
             }
-            match(input,75,FOLLOW_75_in_rule__XParenthesizedExpression__Group__2__Impl32852); if (state.failed) return ;
+            match(input,75,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXParenthesizedExpressionAccess().getRightParenthesisKeyword_2()); 
             }
@@ -47496,21 +47496,21 @@ public final void rule__XParenthesizedExpression__Group__2__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XIfExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16116:1: rule__XIfExpression__Group__0 : rule__XIfExpression__Group__0__Impl rule__XIfExpression__Group__1 ;
+    // InternalFormat.g:16116:1: rule__XIfExpression__Group__0 : rule__XIfExpression__Group__0__Impl rule__XIfExpression__Group__1 ;
     public final void rule__XIfExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16120:1: ( rule__XIfExpression__Group__0__Impl rule__XIfExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16121:2: rule__XIfExpression__Group__0__Impl rule__XIfExpression__Group__1
+            // InternalFormat.g:16120:1: ( rule__XIfExpression__Group__0__Impl rule__XIfExpression__Group__1 )
+            // InternalFormat.g:16121:2: rule__XIfExpression__Group__0__Impl rule__XIfExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XIfExpression__Group__0__Impl_in_rule__XIfExpression__Group__032889);
+            pushFollow(FOLLOW_94);
             rule__XIfExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIfExpression__Group__1_in_rule__XIfExpression__Group__032892);
+            pushFollow(FOLLOW_2);
             rule__XIfExpression__Group__1();
 
             state._fsp--;
@@ -47534,23 +47534,23 @@ public final void rule__XIfExpression__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XIfExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16128:1: rule__XIfExpression__Group__0__Impl : ( () ) ;
+    // InternalFormat.g:16128:1: rule__XIfExpression__Group__0__Impl : ( () ) ;
     public final void rule__XIfExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16132:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16133:1: ( () )
+            // InternalFormat.g:16132:1: ( ( () ) )
+            // InternalFormat.g:16133:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16133:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16134:1: ()
+            // InternalFormat.g:16133:1: ( () )
+            // InternalFormat.g:16134:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getXIfExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16135:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16137:1: 
+            // InternalFormat.g:16135:1: ()
+            // InternalFormat.g:16137:1: 
             {
             }
 
@@ -47575,21 +47575,21 @@ public final void rule__XIfExpression__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XIfExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16147:1: rule__XIfExpression__Group__1 : rule__XIfExpression__Group__1__Impl rule__XIfExpression__Group__2 ;
+    // InternalFormat.g:16147:1: rule__XIfExpression__Group__1 : rule__XIfExpression__Group__1__Impl rule__XIfExpression__Group__2 ;
     public final void rule__XIfExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16151:1: ( rule__XIfExpression__Group__1__Impl rule__XIfExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16152:2: rule__XIfExpression__Group__1__Impl rule__XIfExpression__Group__2
+            // InternalFormat.g:16151:1: ( rule__XIfExpression__Group__1__Impl rule__XIfExpression__Group__2 )
+            // InternalFormat.g:16152:2: rule__XIfExpression__Group__1__Impl rule__XIfExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XIfExpression__Group__1__Impl_in_rule__XIfExpression__Group__132950);
+            pushFollow(FOLLOW_45);
             rule__XIfExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIfExpression__Group__2_in_rule__XIfExpression__Group__132953);
+            pushFollow(FOLLOW_2);
             rule__XIfExpression__Group__2();
 
             state._fsp--;
@@ -47613,22 +47613,22 @@ public final void rule__XIfExpression__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XIfExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16159:1: rule__XIfExpression__Group__1__Impl : ( 'if' ) ;
+    // InternalFormat.g:16159:1: rule__XIfExpression__Group__1__Impl : ( 'if' ) ;
     public final void rule__XIfExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16163:1: ( ( 'if' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16164:1: ( 'if' )
+            // InternalFormat.g:16163:1: ( ( 'if' ) )
+            // InternalFormat.g:16164:1: ( 'if' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16164:1: ( 'if' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16165:1: 'if'
+            // InternalFormat.g:16164:1: ( 'if' )
+            // InternalFormat.g:16165:1: 'if'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getIfKeyword_1()); 
             }
-            match(input,87,FOLLOW_87_in_rule__XIfExpression__Group__1__Impl32981); if (state.failed) return ;
+            match(input,87,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXIfExpressionAccess().getIfKeyword_1()); 
             }
@@ -47654,21 +47654,21 @@ public final void rule__XIfExpression__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XIfExpression__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16178:1: rule__XIfExpression__Group__2 : rule__XIfExpression__Group__2__Impl rule__XIfExpression__Group__3 ;
+    // InternalFormat.g:16178:1: rule__XIfExpression__Group__2 : rule__XIfExpression__Group__2__Impl rule__XIfExpression__Group__3 ;
     public final void rule__XIfExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16182:1: ( rule__XIfExpression__Group__2__Impl rule__XIfExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16183:2: rule__XIfExpression__Group__2__Impl rule__XIfExpression__Group__3
+            // InternalFormat.g:16182:1: ( rule__XIfExpression__Group__2__Impl rule__XIfExpression__Group__3 )
+            // InternalFormat.g:16183:2: rule__XIfExpression__Group__2__Impl rule__XIfExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__XIfExpression__Group__2__Impl_in_rule__XIfExpression__Group__233012);
+            pushFollow(FOLLOW_50);
             rule__XIfExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIfExpression__Group__3_in_rule__XIfExpression__Group__233015);
+            pushFollow(FOLLOW_2);
             rule__XIfExpression__Group__3();
 
             state._fsp--;
@@ -47692,22 +47692,22 @@ public final void rule__XIfExpression__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XIfExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16190:1: rule__XIfExpression__Group__2__Impl : ( '(' ) ;
+    // InternalFormat.g:16190:1: rule__XIfExpression__Group__2__Impl : ( '(' ) ;
     public final void rule__XIfExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16194:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16195:1: ( '(' )
+            // InternalFormat.g:16194:1: ( ( '(' ) )
+            // InternalFormat.g:16195:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16195:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16196:1: '('
+            // InternalFormat.g:16195:1: ( '(' )
+            // InternalFormat.g:16196:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getLeftParenthesisKeyword_2()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XIfExpression__Group__2__Impl33043); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXIfExpressionAccess().getLeftParenthesisKeyword_2()); 
             }
@@ -47733,21 +47733,21 @@ public final void rule__XIfExpression__Group__2__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XIfExpression__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16209:1: rule__XIfExpression__Group__3 : rule__XIfExpression__Group__3__Impl rule__XIfExpression__Group__4 ;
+    // InternalFormat.g:16209:1: rule__XIfExpression__Group__3 : rule__XIfExpression__Group__3__Impl rule__XIfExpression__Group__4 ;
     public final void rule__XIfExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16213:1: ( rule__XIfExpression__Group__3__Impl rule__XIfExpression__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16214:2: rule__XIfExpression__Group__3__Impl rule__XIfExpression__Group__4
+            // InternalFormat.g:16213:1: ( rule__XIfExpression__Group__3__Impl rule__XIfExpression__Group__4 )
+            // InternalFormat.g:16214:2: rule__XIfExpression__Group__3__Impl rule__XIfExpression__Group__4
             {
-            pushFollow(FOLLOW_rule__XIfExpression__Group__3__Impl_in_rule__XIfExpression__Group__333074);
+            pushFollow(FOLLOW_33);
             rule__XIfExpression__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIfExpression__Group__4_in_rule__XIfExpression__Group__333077);
+            pushFollow(FOLLOW_2);
             rule__XIfExpression__Group__4();
 
             state._fsp--;
@@ -47771,25 +47771,25 @@ public final void rule__XIfExpression__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XIfExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16221:1: rule__XIfExpression__Group__3__Impl : ( ( rule__XIfExpression__IfAssignment_3 ) ) ;
+    // InternalFormat.g:16221:1: rule__XIfExpression__Group__3__Impl : ( ( rule__XIfExpression__IfAssignment_3 ) ) ;
     public final void rule__XIfExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16225:1: ( ( ( rule__XIfExpression__IfAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16226:1: ( ( rule__XIfExpression__IfAssignment_3 ) )
+            // InternalFormat.g:16225:1: ( ( ( rule__XIfExpression__IfAssignment_3 ) ) )
+            // InternalFormat.g:16226:1: ( ( rule__XIfExpression__IfAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16226:1: ( ( rule__XIfExpression__IfAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16227:1: ( rule__XIfExpression__IfAssignment_3 )
+            // InternalFormat.g:16226:1: ( ( rule__XIfExpression__IfAssignment_3 ) )
+            // InternalFormat.g:16227:1: ( rule__XIfExpression__IfAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getIfAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16228:1: ( rule__XIfExpression__IfAssignment_3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16228:2: rule__XIfExpression__IfAssignment_3
+            // InternalFormat.g:16228:1: ( rule__XIfExpression__IfAssignment_3 )
+            // InternalFormat.g:16228:2: rule__XIfExpression__IfAssignment_3
             {
-            pushFollow(FOLLOW_rule__XIfExpression__IfAssignment_3_in_rule__XIfExpression__Group__3__Impl33104);
+            pushFollow(FOLLOW_2);
             rule__XIfExpression__IfAssignment_3();
 
             state._fsp--;
@@ -47822,21 +47822,21 @@ public final void rule__XIfExpression__Group__3__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XIfExpression__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16238:1: rule__XIfExpression__Group__4 : rule__XIfExpression__Group__4__Impl rule__XIfExpression__Group__5 ;
+    // InternalFormat.g:16238:1: rule__XIfExpression__Group__4 : rule__XIfExpression__Group__4__Impl rule__XIfExpression__Group__5 ;
     public final void rule__XIfExpression__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16242:1: ( rule__XIfExpression__Group__4__Impl rule__XIfExpression__Group__5 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16243:2: rule__XIfExpression__Group__4__Impl rule__XIfExpression__Group__5
+            // InternalFormat.g:16242:1: ( rule__XIfExpression__Group__4__Impl rule__XIfExpression__Group__5 )
+            // InternalFormat.g:16243:2: rule__XIfExpression__Group__4__Impl rule__XIfExpression__Group__5
             {
-            pushFollow(FOLLOW_rule__XIfExpression__Group__4__Impl_in_rule__XIfExpression__Group__433134);
+            pushFollow(FOLLOW_50);
             rule__XIfExpression__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIfExpression__Group__5_in_rule__XIfExpression__Group__433137);
+            pushFollow(FOLLOW_2);
             rule__XIfExpression__Group__5();
 
             state._fsp--;
@@ -47860,22 +47860,22 @@ public final void rule__XIfExpression__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__XIfExpression__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16250:1: rule__XIfExpression__Group__4__Impl : ( ')' ) ;
+    // InternalFormat.g:16250:1: rule__XIfExpression__Group__4__Impl : ( ')' ) ;
     public final void rule__XIfExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16254:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16255:1: ( ')' )
+            // InternalFormat.g:16254:1: ( ( ')' ) )
+            // InternalFormat.g:16255:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16255:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16256:1: ')'
+            // InternalFormat.g:16255:1: ( ')' )
+            // InternalFormat.g:16256:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getRightParenthesisKeyword_4()); 
             }
-            match(input,75,FOLLOW_75_in_rule__XIfExpression__Group__4__Impl33165); if (state.failed) return ;
+            match(input,75,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXIfExpressionAccess().getRightParenthesisKeyword_4()); 
             }
@@ -47901,21 +47901,21 @@ public final void rule__XIfExpression__Group__4__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XIfExpression__Group__5"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16269:1: rule__XIfExpression__Group__5 : rule__XIfExpression__Group__5__Impl rule__XIfExpression__Group__6 ;
+    // InternalFormat.g:16269:1: rule__XIfExpression__Group__5 : rule__XIfExpression__Group__5__Impl rule__XIfExpression__Group__6 ;
     public final void rule__XIfExpression__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16273:1: ( rule__XIfExpression__Group__5__Impl rule__XIfExpression__Group__6 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16274:2: rule__XIfExpression__Group__5__Impl rule__XIfExpression__Group__6
+            // InternalFormat.g:16273:1: ( rule__XIfExpression__Group__5__Impl rule__XIfExpression__Group__6 )
+            // InternalFormat.g:16274:2: rule__XIfExpression__Group__5__Impl rule__XIfExpression__Group__6
             {
-            pushFollow(FOLLOW_rule__XIfExpression__Group__5__Impl_in_rule__XIfExpression__Group__533196);
+            pushFollow(FOLLOW_95);
             rule__XIfExpression__Group__5__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIfExpression__Group__6_in_rule__XIfExpression__Group__533199);
+            pushFollow(FOLLOW_2);
             rule__XIfExpression__Group__6();
 
             state._fsp--;
@@ -47939,25 +47939,25 @@ public final void rule__XIfExpression__Group__5() throws RecognitionException {
 
 
     // $ANTLR start "rule__XIfExpression__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16281:1: rule__XIfExpression__Group__5__Impl : ( ( rule__XIfExpression__ThenAssignment_5 ) ) ;
+    // InternalFormat.g:16281:1: rule__XIfExpression__Group__5__Impl : ( ( rule__XIfExpression__ThenAssignment_5 ) ) ;
     public final void rule__XIfExpression__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16285:1: ( ( ( rule__XIfExpression__ThenAssignment_5 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16286:1: ( ( rule__XIfExpression__ThenAssignment_5 ) )
+            // InternalFormat.g:16285:1: ( ( ( rule__XIfExpression__ThenAssignment_5 ) ) )
+            // InternalFormat.g:16286:1: ( ( rule__XIfExpression__ThenAssignment_5 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16286:1: ( ( rule__XIfExpression__ThenAssignment_5 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16287:1: ( rule__XIfExpression__ThenAssignment_5 )
+            // InternalFormat.g:16286:1: ( ( rule__XIfExpression__ThenAssignment_5 ) )
+            // InternalFormat.g:16287:1: ( rule__XIfExpression__ThenAssignment_5 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getThenAssignment_5()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16288:1: ( rule__XIfExpression__ThenAssignment_5 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16288:2: rule__XIfExpression__ThenAssignment_5
+            // InternalFormat.g:16288:1: ( rule__XIfExpression__ThenAssignment_5 )
+            // InternalFormat.g:16288:2: rule__XIfExpression__ThenAssignment_5
             {
-            pushFollow(FOLLOW_rule__XIfExpression__ThenAssignment_5_in_rule__XIfExpression__Group__5__Impl33226);
+            pushFollow(FOLLOW_2);
             rule__XIfExpression__ThenAssignment_5();
 
             state._fsp--;
@@ -47990,16 +47990,16 @@ public final void rule__XIfExpression__Group__5__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XIfExpression__Group__6"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16298:1: rule__XIfExpression__Group__6 : rule__XIfExpression__Group__6__Impl ;
+    // InternalFormat.g:16298:1: rule__XIfExpression__Group__6 : rule__XIfExpression__Group__6__Impl ;
     public final void rule__XIfExpression__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16302:1: ( rule__XIfExpression__Group__6__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16303:2: rule__XIfExpression__Group__6__Impl
+            // InternalFormat.g:16302:1: ( rule__XIfExpression__Group__6__Impl )
+            // InternalFormat.g:16303:2: rule__XIfExpression__Group__6__Impl
             {
-            pushFollow(FOLLOW_rule__XIfExpression__Group__6__Impl_in_rule__XIfExpression__Group__633256);
+            pushFollow(FOLLOW_2);
             rule__XIfExpression__Group__6__Impl();
 
             state._fsp--;
@@ -48023,22 +48023,22 @@ public final void rule__XIfExpression__Group__6() throws RecognitionException {
 
 
     // $ANTLR start "rule__XIfExpression__Group__6__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16309:1: rule__XIfExpression__Group__6__Impl : ( ( rule__XIfExpression__Group_6__0 )? ) ;
+    // InternalFormat.g:16309:1: rule__XIfExpression__Group__6__Impl : ( ( rule__XIfExpression__Group_6__0 )? ) ;
     public final void rule__XIfExpression__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16313:1: ( ( ( rule__XIfExpression__Group_6__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16314:1: ( ( rule__XIfExpression__Group_6__0 )? )
+            // InternalFormat.g:16313:1: ( ( ( rule__XIfExpression__Group_6__0 )? ) )
+            // InternalFormat.g:16314:1: ( ( rule__XIfExpression__Group_6__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16314:1: ( ( rule__XIfExpression__Group_6__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16315:1: ( rule__XIfExpression__Group_6__0 )?
+            // InternalFormat.g:16314:1: ( ( rule__XIfExpression__Group_6__0 )? )
+            // InternalFormat.g:16315:1: ( rule__XIfExpression__Group_6__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getGroup_6()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16316:1: ( rule__XIfExpression__Group_6__0 )?
+            // InternalFormat.g:16316:1: ( rule__XIfExpression__Group_6__0 )?
             int alt131=2;
             int LA131_0 = input.LA(1);
 
@@ -48051,9 +48051,9 @@ public final void rule__XIfExpression__Group__6__Impl() throws RecognitionExcept
             }
             switch (alt131) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16316:2: rule__XIfExpression__Group_6__0
+                    // InternalFormat.g:16316:2: rule__XIfExpression__Group_6__0
                     {
-                    pushFollow(FOLLOW_rule__XIfExpression__Group_6__0_in_rule__XIfExpression__Group__6__Impl33283);
+                    pushFollow(FOLLOW_2);
                     rule__XIfExpression__Group_6__0();
 
                     state._fsp--;
@@ -48089,21 +48089,21 @@ public final void rule__XIfExpression__Group__6__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XIfExpression__Group_6__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16340:1: rule__XIfExpression__Group_6__0 : rule__XIfExpression__Group_6__0__Impl rule__XIfExpression__Group_6__1 ;
+    // InternalFormat.g:16340:1: rule__XIfExpression__Group_6__0 : rule__XIfExpression__Group_6__0__Impl rule__XIfExpression__Group_6__1 ;
     public final void rule__XIfExpression__Group_6__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16344:1: ( rule__XIfExpression__Group_6__0__Impl rule__XIfExpression__Group_6__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16345:2: rule__XIfExpression__Group_6__0__Impl rule__XIfExpression__Group_6__1
+            // InternalFormat.g:16344:1: ( rule__XIfExpression__Group_6__0__Impl rule__XIfExpression__Group_6__1 )
+            // InternalFormat.g:16345:2: rule__XIfExpression__Group_6__0__Impl rule__XIfExpression__Group_6__1
             {
-            pushFollow(FOLLOW_rule__XIfExpression__Group_6__0__Impl_in_rule__XIfExpression__Group_6__033328);
+            pushFollow(FOLLOW_50);
             rule__XIfExpression__Group_6__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XIfExpression__Group_6__1_in_rule__XIfExpression__Group_6__033331);
+            pushFollow(FOLLOW_2);
             rule__XIfExpression__Group_6__1();
 
             state._fsp--;
@@ -48127,25 +48127,25 @@ public final void rule__XIfExpression__Group_6__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XIfExpression__Group_6__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16352:1: rule__XIfExpression__Group_6__0__Impl : ( ( 'else' ) ) ;
+    // InternalFormat.g:16352:1: rule__XIfExpression__Group_6__0__Impl : ( ( 'else' ) ) ;
     public final void rule__XIfExpression__Group_6__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16356:1: ( ( ( 'else' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16357:1: ( ( 'else' ) )
+            // InternalFormat.g:16356:1: ( ( ( 'else' ) ) )
+            // InternalFormat.g:16357:1: ( ( 'else' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16357:1: ( ( 'else' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16358:1: ( 'else' )
+            // InternalFormat.g:16357:1: ( ( 'else' ) )
+            // InternalFormat.g:16358:1: ( 'else' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getElseKeyword_6_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16359:1: ( 'else' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16360:2: 'else'
+            // InternalFormat.g:16359:1: ( 'else' )
+            // InternalFormat.g:16360:2: 'else'
             {
-            match(input,88,FOLLOW_88_in_rule__XIfExpression__Group_6__0__Impl33360); if (state.failed) return ;
+            match(input,88,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -48174,16 +48174,16 @@ public final void rule__XIfExpression__Group_6__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XIfExpression__Group_6__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16371:1: rule__XIfExpression__Group_6__1 : rule__XIfExpression__Group_6__1__Impl ;
+    // InternalFormat.g:16371:1: rule__XIfExpression__Group_6__1 : rule__XIfExpression__Group_6__1__Impl ;
     public final void rule__XIfExpression__Group_6__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16375:1: ( rule__XIfExpression__Group_6__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16376:2: rule__XIfExpression__Group_6__1__Impl
+            // InternalFormat.g:16375:1: ( rule__XIfExpression__Group_6__1__Impl )
+            // InternalFormat.g:16376:2: rule__XIfExpression__Group_6__1__Impl
             {
-            pushFollow(FOLLOW_rule__XIfExpression__Group_6__1__Impl_in_rule__XIfExpression__Group_6__133392);
+            pushFollow(FOLLOW_2);
             rule__XIfExpression__Group_6__1__Impl();
 
             state._fsp--;
@@ -48207,25 +48207,25 @@ public final void rule__XIfExpression__Group_6__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XIfExpression__Group_6__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16382:1: rule__XIfExpression__Group_6__1__Impl : ( ( rule__XIfExpression__ElseAssignment_6_1 ) ) ;
+    // InternalFormat.g:16382:1: rule__XIfExpression__Group_6__1__Impl : ( ( rule__XIfExpression__ElseAssignment_6_1 ) ) ;
     public final void rule__XIfExpression__Group_6__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16386:1: ( ( ( rule__XIfExpression__ElseAssignment_6_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16387:1: ( ( rule__XIfExpression__ElseAssignment_6_1 ) )
+            // InternalFormat.g:16386:1: ( ( ( rule__XIfExpression__ElseAssignment_6_1 ) ) )
+            // InternalFormat.g:16387:1: ( ( rule__XIfExpression__ElseAssignment_6_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16387:1: ( ( rule__XIfExpression__ElseAssignment_6_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16388:1: ( rule__XIfExpression__ElseAssignment_6_1 )
+            // InternalFormat.g:16387:1: ( ( rule__XIfExpression__ElseAssignment_6_1 ) )
+            // InternalFormat.g:16388:1: ( rule__XIfExpression__ElseAssignment_6_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getElseAssignment_6_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16389:1: ( rule__XIfExpression__ElseAssignment_6_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16389:2: rule__XIfExpression__ElseAssignment_6_1
+            // InternalFormat.g:16389:1: ( rule__XIfExpression__ElseAssignment_6_1 )
+            // InternalFormat.g:16389:2: rule__XIfExpression__ElseAssignment_6_1
             {
-            pushFollow(FOLLOW_rule__XIfExpression__ElseAssignment_6_1_in_rule__XIfExpression__Group_6__1__Impl33419);
+            pushFollow(FOLLOW_2);
             rule__XIfExpression__ElseAssignment_6_1();
 
             state._fsp--;
@@ -48258,21 +48258,21 @@ public final void rule__XIfExpression__Group_6__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16403:1: rule__XSwitchExpression__Group__0 : rule__XSwitchExpression__Group__0__Impl rule__XSwitchExpression__Group__1 ;
+    // InternalFormat.g:16403:1: rule__XSwitchExpression__Group__0 : rule__XSwitchExpression__Group__0__Impl rule__XSwitchExpression__Group__1 ;
     public final void rule__XSwitchExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16407:1: ( rule__XSwitchExpression__Group__0__Impl rule__XSwitchExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16408:2: rule__XSwitchExpression__Group__0__Impl rule__XSwitchExpression__Group__1
+            // InternalFormat.g:16407:1: ( rule__XSwitchExpression__Group__0__Impl rule__XSwitchExpression__Group__1 )
+            // InternalFormat.g:16408:2: rule__XSwitchExpression__Group__0__Impl rule__XSwitchExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__0__Impl_in_rule__XSwitchExpression__Group__033453);
+            pushFollow(FOLLOW_96);
             rule__XSwitchExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__1_in_rule__XSwitchExpression__Group__033456);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group__1();
 
             state._fsp--;
@@ -48296,23 +48296,23 @@ public final void rule__XSwitchExpression__Group__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16415:1: rule__XSwitchExpression__Group__0__Impl : ( () ) ;
+    // InternalFormat.g:16415:1: rule__XSwitchExpression__Group__0__Impl : ( () ) ;
     public final void rule__XSwitchExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16419:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16420:1: ( () )
+            // InternalFormat.g:16419:1: ( ( () ) )
+            // InternalFormat.g:16420:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16420:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16421:1: ()
+            // InternalFormat.g:16420:1: ( () )
+            // InternalFormat.g:16421:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getXSwitchExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16422:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16424:1: 
+            // InternalFormat.g:16422:1: ()
+            // InternalFormat.g:16424:1: 
             {
             }
 
@@ -48337,21 +48337,21 @@ public final void rule__XSwitchExpression__Group__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16434:1: rule__XSwitchExpression__Group__1 : rule__XSwitchExpression__Group__1__Impl rule__XSwitchExpression__Group__2 ;
+    // InternalFormat.g:16434:1: rule__XSwitchExpression__Group__1 : rule__XSwitchExpression__Group__1__Impl rule__XSwitchExpression__Group__2 ;
     public final void rule__XSwitchExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16438:1: ( rule__XSwitchExpression__Group__1__Impl rule__XSwitchExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16439:2: rule__XSwitchExpression__Group__1__Impl rule__XSwitchExpression__Group__2
+            // InternalFormat.g:16438:1: ( rule__XSwitchExpression__Group__1__Impl rule__XSwitchExpression__Group__2 )
+            // InternalFormat.g:16439:2: rule__XSwitchExpression__Group__1__Impl rule__XSwitchExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__1__Impl_in_rule__XSwitchExpression__Group__133514);
+            pushFollow(FOLLOW_97);
             rule__XSwitchExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__2_in_rule__XSwitchExpression__Group__133517);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group__2();
 
             state._fsp--;
@@ -48375,22 +48375,22 @@ public final void rule__XSwitchExpression__Group__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16446:1: rule__XSwitchExpression__Group__1__Impl : ( 'switch' ) ;
+    // InternalFormat.g:16446:1: rule__XSwitchExpression__Group__1__Impl : ( 'switch' ) ;
     public final void rule__XSwitchExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16450:1: ( ( 'switch' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16451:1: ( 'switch' )
+            // InternalFormat.g:16450:1: ( ( 'switch' ) )
+            // InternalFormat.g:16451:1: ( 'switch' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16451:1: ( 'switch' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16452:1: 'switch'
+            // InternalFormat.g:16451:1: ( 'switch' )
+            // InternalFormat.g:16452:1: 'switch'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getSwitchKeyword_1()); 
             }
-            match(input,89,FOLLOW_89_in_rule__XSwitchExpression__Group__1__Impl33545); if (state.failed) return ;
+            match(input,89,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getSwitchKeyword_1()); 
             }
@@ -48416,21 +48416,21 @@ public final void rule__XSwitchExpression__Group__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16465:1: rule__XSwitchExpression__Group__2 : rule__XSwitchExpression__Group__2__Impl rule__XSwitchExpression__Group__3 ;
+    // InternalFormat.g:16465:1: rule__XSwitchExpression__Group__2 : rule__XSwitchExpression__Group__2__Impl rule__XSwitchExpression__Group__3 ;
     public final void rule__XSwitchExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16469:1: ( rule__XSwitchExpression__Group__2__Impl rule__XSwitchExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16470:2: rule__XSwitchExpression__Group__2__Impl rule__XSwitchExpression__Group__3
+            // InternalFormat.g:16469:1: ( rule__XSwitchExpression__Group__2__Impl rule__XSwitchExpression__Group__3 )
+            // InternalFormat.g:16470:2: rule__XSwitchExpression__Group__2__Impl rule__XSwitchExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__2__Impl_in_rule__XSwitchExpression__Group__233576);
+            pushFollow(FOLLOW_15);
             rule__XSwitchExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__3_in_rule__XSwitchExpression__Group__233579);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group__3();
 
             state._fsp--;
@@ -48454,25 +48454,25 @@ public final void rule__XSwitchExpression__Group__2() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16477:1: rule__XSwitchExpression__Group__2__Impl : ( ( rule__XSwitchExpression__Alternatives_2 ) ) ;
+    // InternalFormat.g:16477:1: rule__XSwitchExpression__Group__2__Impl : ( ( rule__XSwitchExpression__Alternatives_2 ) ) ;
     public final void rule__XSwitchExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16481:1: ( ( ( rule__XSwitchExpression__Alternatives_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16482:1: ( ( rule__XSwitchExpression__Alternatives_2 ) )
+            // InternalFormat.g:16481:1: ( ( ( rule__XSwitchExpression__Alternatives_2 ) ) )
+            // InternalFormat.g:16482:1: ( ( rule__XSwitchExpression__Alternatives_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16482:1: ( ( rule__XSwitchExpression__Alternatives_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16483:1: ( rule__XSwitchExpression__Alternatives_2 )
+            // InternalFormat.g:16482:1: ( ( rule__XSwitchExpression__Alternatives_2 ) )
+            // InternalFormat.g:16483:1: ( rule__XSwitchExpression__Alternatives_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getAlternatives_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16484:1: ( rule__XSwitchExpression__Alternatives_2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16484:2: rule__XSwitchExpression__Alternatives_2
+            // InternalFormat.g:16484:1: ( rule__XSwitchExpression__Alternatives_2 )
+            // InternalFormat.g:16484:2: rule__XSwitchExpression__Alternatives_2
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Alternatives_2_in_rule__XSwitchExpression__Group__2__Impl33606);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Alternatives_2();
 
             state._fsp--;
@@ -48505,21 +48505,21 @@ public final void rule__XSwitchExpression__Group__2__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16494:1: rule__XSwitchExpression__Group__3 : rule__XSwitchExpression__Group__3__Impl rule__XSwitchExpression__Group__4 ;
+    // InternalFormat.g:16494:1: rule__XSwitchExpression__Group__3 : rule__XSwitchExpression__Group__3__Impl rule__XSwitchExpression__Group__4 ;
     public final void rule__XSwitchExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16498:1: ( rule__XSwitchExpression__Group__3__Impl rule__XSwitchExpression__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16499:2: rule__XSwitchExpression__Group__3__Impl rule__XSwitchExpression__Group__4
+            // InternalFormat.g:16498:1: ( rule__XSwitchExpression__Group__3__Impl rule__XSwitchExpression__Group__4 )
+            // InternalFormat.g:16499:2: rule__XSwitchExpression__Group__3__Impl rule__XSwitchExpression__Group__4
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__3__Impl_in_rule__XSwitchExpression__Group__333636);
+            pushFollow(FOLLOW_98);
             rule__XSwitchExpression__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__4_in_rule__XSwitchExpression__Group__333639);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group__4();
 
             state._fsp--;
@@ -48543,22 +48543,22 @@ public final void rule__XSwitchExpression__Group__3() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16506:1: rule__XSwitchExpression__Group__3__Impl : ( '{' ) ;
+    // InternalFormat.g:16506:1: rule__XSwitchExpression__Group__3__Impl : ( '{' ) ;
     public final void rule__XSwitchExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16510:1: ( ( '{' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16511:1: ( '{' )
+            // InternalFormat.g:16510:1: ( ( '{' ) )
+            // InternalFormat.g:16511:1: ( '{' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16511:1: ( '{' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16512:1: '{'
+            // InternalFormat.g:16511:1: ( '{' )
+            // InternalFormat.g:16512:1: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getLeftCurlyBracketKeyword_3()); 
             }
-            match(input,66,FOLLOW_66_in_rule__XSwitchExpression__Group__3__Impl33667); if (state.failed) return ;
+            match(input,66,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getLeftCurlyBracketKeyword_3()); 
             }
@@ -48584,21 +48584,21 @@ public final void rule__XSwitchExpression__Group__3__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16525:1: rule__XSwitchExpression__Group__4 : rule__XSwitchExpression__Group__4__Impl rule__XSwitchExpression__Group__5 ;
+    // InternalFormat.g:16525:1: rule__XSwitchExpression__Group__4 : rule__XSwitchExpression__Group__4__Impl rule__XSwitchExpression__Group__5 ;
     public final void rule__XSwitchExpression__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16529:1: ( rule__XSwitchExpression__Group__4__Impl rule__XSwitchExpression__Group__5 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16530:2: rule__XSwitchExpression__Group__4__Impl rule__XSwitchExpression__Group__5
+            // InternalFormat.g:16529:1: ( rule__XSwitchExpression__Group__4__Impl rule__XSwitchExpression__Group__5 )
+            // InternalFormat.g:16530:2: rule__XSwitchExpression__Group__4__Impl rule__XSwitchExpression__Group__5
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__4__Impl_in_rule__XSwitchExpression__Group__433698);
+            pushFollow(FOLLOW_98);
             rule__XSwitchExpression__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__5_in_rule__XSwitchExpression__Group__433701);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group__5();
 
             state._fsp--;
@@ -48622,22 +48622,22 @@ public final void rule__XSwitchExpression__Group__4() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16537:1: rule__XSwitchExpression__Group__4__Impl : ( ( rule__XSwitchExpression__CasesAssignment_4 )* ) ;
+    // InternalFormat.g:16537:1: rule__XSwitchExpression__Group__4__Impl : ( ( rule__XSwitchExpression__CasesAssignment_4 )* ) ;
     public final void rule__XSwitchExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16541:1: ( ( ( rule__XSwitchExpression__CasesAssignment_4 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16542:1: ( ( rule__XSwitchExpression__CasesAssignment_4 )* )
+            // InternalFormat.g:16541:1: ( ( ( rule__XSwitchExpression__CasesAssignment_4 )* ) )
+            // InternalFormat.g:16542:1: ( ( rule__XSwitchExpression__CasesAssignment_4 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16542:1: ( ( rule__XSwitchExpression__CasesAssignment_4 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16543:1: ( rule__XSwitchExpression__CasesAssignment_4 )*
+            // InternalFormat.g:16542:1: ( ( rule__XSwitchExpression__CasesAssignment_4 )* )
+            // InternalFormat.g:16543:1: ( rule__XSwitchExpression__CasesAssignment_4 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getCasesAssignment_4()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16544:1: ( rule__XSwitchExpression__CasesAssignment_4 )*
+            // InternalFormat.g:16544:1: ( rule__XSwitchExpression__CasesAssignment_4 )*
             loop132:
             do {
                 int alt132=2;
@@ -48650,9 +48650,9 @@ public final void rule__XSwitchExpression__Group__4__Impl() throws RecognitionEx
 
                 switch (alt132) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16544:2: rule__XSwitchExpression__CasesAssignment_4
+            	    // InternalFormat.g:16544:2: rule__XSwitchExpression__CasesAssignment_4
             	    {
-            	    pushFollow(FOLLOW_rule__XSwitchExpression__CasesAssignment_4_in_rule__XSwitchExpression__Group__4__Impl33728);
+            	    pushFollow(FOLLOW_99);
             	    rule__XSwitchExpression__CasesAssignment_4();
 
             	    state._fsp--;
@@ -48691,21 +48691,21 @@ public final void rule__XSwitchExpression__Group__4__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__5"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16554:1: rule__XSwitchExpression__Group__5 : rule__XSwitchExpression__Group__5__Impl rule__XSwitchExpression__Group__6 ;
+    // InternalFormat.g:16554:1: rule__XSwitchExpression__Group__5 : rule__XSwitchExpression__Group__5__Impl rule__XSwitchExpression__Group__6 ;
     public final void rule__XSwitchExpression__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16558:1: ( rule__XSwitchExpression__Group__5__Impl rule__XSwitchExpression__Group__6 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16559:2: rule__XSwitchExpression__Group__5__Impl rule__XSwitchExpression__Group__6
+            // InternalFormat.g:16558:1: ( rule__XSwitchExpression__Group__5__Impl rule__XSwitchExpression__Group__6 )
+            // InternalFormat.g:16559:2: rule__XSwitchExpression__Group__5__Impl rule__XSwitchExpression__Group__6
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__5__Impl_in_rule__XSwitchExpression__Group__533759);
+            pushFollow(FOLLOW_98);
             rule__XSwitchExpression__Group__5__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__6_in_rule__XSwitchExpression__Group__533762);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group__6();
 
             state._fsp--;
@@ -48729,22 +48729,22 @@ public final void rule__XSwitchExpression__Group__5() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16566:1: rule__XSwitchExpression__Group__5__Impl : ( ( rule__XSwitchExpression__Group_5__0 )? ) ;
+    // InternalFormat.g:16566:1: rule__XSwitchExpression__Group__5__Impl : ( ( rule__XSwitchExpression__Group_5__0 )? ) ;
     public final void rule__XSwitchExpression__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16570:1: ( ( ( rule__XSwitchExpression__Group_5__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16571:1: ( ( rule__XSwitchExpression__Group_5__0 )? )
+            // InternalFormat.g:16570:1: ( ( ( rule__XSwitchExpression__Group_5__0 )? ) )
+            // InternalFormat.g:16571:1: ( ( rule__XSwitchExpression__Group_5__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16571:1: ( ( rule__XSwitchExpression__Group_5__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16572:1: ( rule__XSwitchExpression__Group_5__0 )?
+            // InternalFormat.g:16571:1: ( ( rule__XSwitchExpression__Group_5__0 )? )
+            // InternalFormat.g:16572:1: ( rule__XSwitchExpression__Group_5__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getGroup_5()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16573:1: ( rule__XSwitchExpression__Group_5__0 )?
+            // InternalFormat.g:16573:1: ( rule__XSwitchExpression__Group_5__0 )?
             int alt133=2;
             int LA133_0 = input.LA(1);
 
@@ -48753,9 +48753,9 @@ public final void rule__XSwitchExpression__Group__5__Impl() throws RecognitionEx
             }
             switch (alt133) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16573:2: rule__XSwitchExpression__Group_5__0
+                    // InternalFormat.g:16573:2: rule__XSwitchExpression__Group_5__0
                     {
-                    pushFollow(FOLLOW_rule__XSwitchExpression__Group_5__0_in_rule__XSwitchExpression__Group__5__Impl33789);
+                    pushFollow(FOLLOW_2);
                     rule__XSwitchExpression__Group_5__0();
 
                     state._fsp--;
@@ -48791,16 +48791,16 @@ public final void rule__XSwitchExpression__Group__5__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__6"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16583:1: rule__XSwitchExpression__Group__6 : rule__XSwitchExpression__Group__6__Impl ;
+    // InternalFormat.g:16583:1: rule__XSwitchExpression__Group__6 : rule__XSwitchExpression__Group__6__Impl ;
     public final void rule__XSwitchExpression__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16587:1: ( rule__XSwitchExpression__Group__6__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16588:2: rule__XSwitchExpression__Group__6__Impl
+            // InternalFormat.g:16587:1: ( rule__XSwitchExpression__Group__6__Impl )
+            // InternalFormat.g:16588:2: rule__XSwitchExpression__Group__6__Impl
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group__6__Impl_in_rule__XSwitchExpression__Group__633820);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group__6__Impl();
 
             state._fsp--;
@@ -48824,22 +48824,22 @@ public final void rule__XSwitchExpression__Group__6() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XSwitchExpression__Group__6__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16594:1: rule__XSwitchExpression__Group__6__Impl : ( '}' ) ;
+    // InternalFormat.g:16594:1: rule__XSwitchExpression__Group__6__Impl : ( '}' ) ;
     public final void rule__XSwitchExpression__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16598:1: ( ( '}' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16599:1: ( '}' )
+            // InternalFormat.g:16598:1: ( ( '}' ) )
+            // InternalFormat.g:16599:1: ( '}' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16599:1: ( '}' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16600:1: '}'
+            // InternalFormat.g:16599:1: ( '}' )
+            // InternalFormat.g:16600:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getRightCurlyBracketKeyword_6()); 
             }
-            match(input,67,FOLLOW_67_in_rule__XSwitchExpression__Group__6__Impl33848); if (state.failed) return ;
+            match(input,67,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getRightCurlyBracketKeyword_6()); 
             }
@@ -48865,21 +48865,21 @@ public final void rule__XSwitchExpression__Group__6__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16627:1: rule__XSwitchExpression__Group_2_0__0 : rule__XSwitchExpression__Group_2_0__0__Impl rule__XSwitchExpression__Group_2_0__1 ;
+    // InternalFormat.g:16627:1: rule__XSwitchExpression__Group_2_0__0 : rule__XSwitchExpression__Group_2_0__0__Impl rule__XSwitchExpression__Group_2_0__1 ;
     public final void rule__XSwitchExpression__Group_2_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16631:1: ( rule__XSwitchExpression__Group_2_0__0__Impl rule__XSwitchExpression__Group_2_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16632:2: rule__XSwitchExpression__Group_2_0__0__Impl rule__XSwitchExpression__Group_2_0__1
+            // InternalFormat.g:16631:1: ( rule__XSwitchExpression__Group_2_0__0__Impl rule__XSwitchExpression__Group_2_0__1 )
+            // InternalFormat.g:16632:2: rule__XSwitchExpression__Group_2_0__0__Impl rule__XSwitchExpression__Group_2_0__1
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0__0__Impl_in_rule__XSwitchExpression__Group_2_0__033893);
+            pushFollow(FOLLOW_50);
             rule__XSwitchExpression__Group_2_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0__1_in_rule__XSwitchExpression__Group_2_0__033896);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_0__1();
 
             state._fsp--;
@@ -48903,25 +48903,25 @@ public final void rule__XSwitchExpression__Group_2_0__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16639:1: rule__XSwitchExpression__Group_2_0__0__Impl : ( ( rule__XSwitchExpression__Group_2_0_0__0 ) ) ;
+    // InternalFormat.g:16639:1: rule__XSwitchExpression__Group_2_0__0__Impl : ( ( rule__XSwitchExpression__Group_2_0_0__0 ) ) ;
     public final void rule__XSwitchExpression__Group_2_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16643:1: ( ( ( rule__XSwitchExpression__Group_2_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16644:1: ( ( rule__XSwitchExpression__Group_2_0_0__0 ) )
+            // InternalFormat.g:16643:1: ( ( ( rule__XSwitchExpression__Group_2_0_0__0 ) ) )
+            // InternalFormat.g:16644:1: ( ( rule__XSwitchExpression__Group_2_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16644:1: ( ( rule__XSwitchExpression__Group_2_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16645:1: ( rule__XSwitchExpression__Group_2_0_0__0 )
+            // InternalFormat.g:16644:1: ( ( rule__XSwitchExpression__Group_2_0_0__0 ) )
+            // InternalFormat.g:16645:1: ( rule__XSwitchExpression__Group_2_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getGroup_2_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16646:1: ( rule__XSwitchExpression__Group_2_0_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16646:2: rule__XSwitchExpression__Group_2_0_0__0
+            // InternalFormat.g:16646:1: ( rule__XSwitchExpression__Group_2_0_0__0 )
+            // InternalFormat.g:16646:2: rule__XSwitchExpression__Group_2_0_0__0
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0_0__0_in_rule__XSwitchExpression__Group_2_0__0__Impl33923);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_0_0__0();
 
             state._fsp--;
@@ -48954,21 +48954,21 @@ public final void rule__XSwitchExpression__Group_2_0__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16656:1: rule__XSwitchExpression__Group_2_0__1 : rule__XSwitchExpression__Group_2_0__1__Impl rule__XSwitchExpression__Group_2_0__2 ;
+    // InternalFormat.g:16656:1: rule__XSwitchExpression__Group_2_0__1 : rule__XSwitchExpression__Group_2_0__1__Impl rule__XSwitchExpression__Group_2_0__2 ;
     public final void rule__XSwitchExpression__Group_2_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16660:1: ( rule__XSwitchExpression__Group_2_0__1__Impl rule__XSwitchExpression__Group_2_0__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16661:2: rule__XSwitchExpression__Group_2_0__1__Impl rule__XSwitchExpression__Group_2_0__2
+            // InternalFormat.g:16660:1: ( rule__XSwitchExpression__Group_2_0__1__Impl rule__XSwitchExpression__Group_2_0__2 )
+            // InternalFormat.g:16661:2: rule__XSwitchExpression__Group_2_0__1__Impl rule__XSwitchExpression__Group_2_0__2
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0__1__Impl_in_rule__XSwitchExpression__Group_2_0__133953);
+            pushFollow(FOLLOW_33);
             rule__XSwitchExpression__Group_2_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0__2_in_rule__XSwitchExpression__Group_2_0__133956);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_0__2();
 
             state._fsp--;
@@ -48992,25 +48992,25 @@ public final void rule__XSwitchExpression__Group_2_0__1() throws RecognitionExce
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16668:1: rule__XSwitchExpression__Group_2_0__1__Impl : ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) ) ;
+    // InternalFormat.g:16668:1: rule__XSwitchExpression__Group_2_0__1__Impl : ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) ) ;
     public final void rule__XSwitchExpression__Group_2_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16672:1: ( ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16673:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) )
+            // InternalFormat.g:16672:1: ( ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) ) )
+            // InternalFormat.g:16673:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16673:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16674:1: ( rule__XSwitchExpression__SwitchAssignment_2_0_1 )
+            // InternalFormat.g:16673:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_0_1 ) )
+            // InternalFormat.g:16674:1: ( rule__XSwitchExpression__SwitchAssignment_2_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getSwitchAssignment_2_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16675:1: ( rule__XSwitchExpression__SwitchAssignment_2_0_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16675:2: rule__XSwitchExpression__SwitchAssignment_2_0_1
+            // InternalFormat.g:16675:1: ( rule__XSwitchExpression__SwitchAssignment_2_0_1 )
+            // InternalFormat.g:16675:2: rule__XSwitchExpression__SwitchAssignment_2_0_1
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__SwitchAssignment_2_0_1_in_rule__XSwitchExpression__Group_2_0__1__Impl33983);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__SwitchAssignment_2_0_1();
 
             state._fsp--;
@@ -49043,16 +49043,16 @@ public final void rule__XSwitchExpression__Group_2_0__1__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16685:1: rule__XSwitchExpression__Group_2_0__2 : rule__XSwitchExpression__Group_2_0__2__Impl ;
+    // InternalFormat.g:16685:1: rule__XSwitchExpression__Group_2_0__2 : rule__XSwitchExpression__Group_2_0__2__Impl ;
     public final void rule__XSwitchExpression__Group_2_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16689:1: ( rule__XSwitchExpression__Group_2_0__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16690:2: rule__XSwitchExpression__Group_2_0__2__Impl
+            // InternalFormat.g:16689:1: ( rule__XSwitchExpression__Group_2_0__2__Impl )
+            // InternalFormat.g:16690:2: rule__XSwitchExpression__Group_2_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0__2__Impl_in_rule__XSwitchExpression__Group_2_0__234013);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_0__2__Impl();
 
             state._fsp--;
@@ -49076,22 +49076,22 @@ public final void rule__XSwitchExpression__Group_2_0__2() throws RecognitionExce
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16696:1: rule__XSwitchExpression__Group_2_0__2__Impl : ( ')' ) ;
+    // InternalFormat.g:16696:1: rule__XSwitchExpression__Group_2_0__2__Impl : ( ')' ) ;
     public final void rule__XSwitchExpression__Group_2_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16700:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16701:1: ( ')' )
+            // InternalFormat.g:16700:1: ( ( ')' ) )
+            // InternalFormat.g:16701:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16701:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16702:1: ')'
+            // InternalFormat.g:16701:1: ( ')' )
+            // InternalFormat.g:16702:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getRightParenthesisKeyword_2_0_2()); 
             }
-            match(input,75,FOLLOW_75_in_rule__XSwitchExpression__Group_2_0__2__Impl34041); if (state.failed) return ;
+            match(input,75,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getRightParenthesisKeyword_2_0_2()); 
             }
@@ -49117,16 +49117,16 @@ public final void rule__XSwitchExpression__Group_2_0__2__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16721:1: rule__XSwitchExpression__Group_2_0_0__0 : rule__XSwitchExpression__Group_2_0_0__0__Impl ;
+    // InternalFormat.g:16721:1: rule__XSwitchExpression__Group_2_0_0__0 : rule__XSwitchExpression__Group_2_0_0__0__Impl ;
     public final void rule__XSwitchExpression__Group_2_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16725:1: ( rule__XSwitchExpression__Group_2_0_0__0__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16726:2: rule__XSwitchExpression__Group_2_0_0__0__Impl
+            // InternalFormat.g:16725:1: ( rule__XSwitchExpression__Group_2_0_0__0__Impl )
+            // InternalFormat.g:16726:2: rule__XSwitchExpression__Group_2_0_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0_0__0__Impl_in_rule__XSwitchExpression__Group_2_0_0__034078);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_0_0__0__Impl();
 
             state._fsp--;
@@ -49150,25 +49150,25 @@ public final void rule__XSwitchExpression__Group_2_0_0__0() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16732:1: rule__XSwitchExpression__Group_2_0_0__0__Impl : ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) ) ;
+    // InternalFormat.g:16732:1: rule__XSwitchExpression__Group_2_0_0__0__Impl : ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) ) ;
     public final void rule__XSwitchExpression__Group_2_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16736:1: ( ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16737:1: ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) )
+            // InternalFormat.g:16736:1: ( ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) ) )
+            // InternalFormat.g:16737:1: ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16737:1: ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16738:1: ( rule__XSwitchExpression__Group_2_0_0_0__0 )
+            // InternalFormat.g:16737:1: ( ( rule__XSwitchExpression__Group_2_0_0_0__0 ) )
+            // InternalFormat.g:16738:1: ( rule__XSwitchExpression__Group_2_0_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getGroup_2_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16739:1: ( rule__XSwitchExpression__Group_2_0_0_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16739:2: rule__XSwitchExpression__Group_2_0_0_0__0
+            // InternalFormat.g:16739:1: ( rule__XSwitchExpression__Group_2_0_0_0__0 )
+            // InternalFormat.g:16739:2: rule__XSwitchExpression__Group_2_0_0_0__0
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__0_in_rule__XSwitchExpression__Group_2_0_0__0__Impl34105);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_0_0_0__0();
 
             state._fsp--;
@@ -49201,21 +49201,21 @@ public final void rule__XSwitchExpression__Group_2_0_0__0__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16751:1: rule__XSwitchExpression__Group_2_0_0_0__0 : rule__XSwitchExpression__Group_2_0_0_0__0__Impl rule__XSwitchExpression__Group_2_0_0_0__1 ;
+    // InternalFormat.g:16751:1: rule__XSwitchExpression__Group_2_0_0_0__0 : rule__XSwitchExpression__Group_2_0_0_0__0__Impl rule__XSwitchExpression__Group_2_0_0_0__1 ;
     public final void rule__XSwitchExpression__Group_2_0_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16755:1: ( rule__XSwitchExpression__Group_2_0_0_0__0__Impl rule__XSwitchExpression__Group_2_0_0_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16756:2: rule__XSwitchExpression__Group_2_0_0_0__0__Impl rule__XSwitchExpression__Group_2_0_0_0__1
+            // InternalFormat.g:16755:1: ( rule__XSwitchExpression__Group_2_0_0_0__0__Impl rule__XSwitchExpression__Group_2_0_0_0__1 )
+            // InternalFormat.g:16756:2: rule__XSwitchExpression__Group_2_0_0_0__0__Impl rule__XSwitchExpression__Group_2_0_0_0__1
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__0__Impl_in_rule__XSwitchExpression__Group_2_0_0_0__034137);
+            pushFollow(FOLLOW_66);
             rule__XSwitchExpression__Group_2_0_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__1_in_rule__XSwitchExpression__Group_2_0_0_0__034140);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_0_0_0__1();
 
             state._fsp--;
@@ -49239,22 +49239,22 @@ public final void rule__XSwitchExpression__Group_2_0_0_0__0() throws Recognition
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16763:1: rule__XSwitchExpression__Group_2_0_0_0__0__Impl : ( '(' ) ;
+    // InternalFormat.g:16763:1: rule__XSwitchExpression__Group_2_0_0_0__0__Impl : ( '(' ) ;
     public final void rule__XSwitchExpression__Group_2_0_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16767:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16768:1: ( '(' )
+            // InternalFormat.g:16767:1: ( ( '(' ) )
+            // InternalFormat.g:16768:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16768:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16769:1: '('
+            // InternalFormat.g:16768:1: ( '(' )
+            // InternalFormat.g:16769:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getLeftParenthesisKeyword_2_0_0_0_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XSwitchExpression__Group_2_0_0_0__0__Impl34168); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getLeftParenthesisKeyword_2_0_0_0_0()); 
             }
@@ -49280,21 +49280,21 @@ public final void rule__XSwitchExpression__Group_2_0_0_0__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16782:1: rule__XSwitchExpression__Group_2_0_0_0__1 : rule__XSwitchExpression__Group_2_0_0_0__1__Impl rule__XSwitchExpression__Group_2_0_0_0__2 ;
+    // InternalFormat.g:16782:1: rule__XSwitchExpression__Group_2_0_0_0__1 : rule__XSwitchExpression__Group_2_0_0_0__1__Impl rule__XSwitchExpression__Group_2_0_0_0__2 ;
     public final void rule__XSwitchExpression__Group_2_0_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16786:1: ( rule__XSwitchExpression__Group_2_0_0_0__1__Impl rule__XSwitchExpression__Group_2_0_0_0__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16787:2: rule__XSwitchExpression__Group_2_0_0_0__1__Impl rule__XSwitchExpression__Group_2_0_0_0__2
+            // InternalFormat.g:16786:1: ( rule__XSwitchExpression__Group_2_0_0_0__1__Impl rule__XSwitchExpression__Group_2_0_0_0__2 )
+            // InternalFormat.g:16787:2: rule__XSwitchExpression__Group_2_0_0_0__1__Impl rule__XSwitchExpression__Group_2_0_0_0__2
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__1__Impl_in_rule__XSwitchExpression__Group_2_0_0_0__134199);
+            pushFollow(FOLLOW_24);
             rule__XSwitchExpression__Group_2_0_0_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__2_in_rule__XSwitchExpression__Group_2_0_0_0__134202);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_0_0_0__2();
 
             state._fsp--;
@@ -49318,25 +49318,25 @@ public final void rule__XSwitchExpression__Group_2_0_0_0__1() throws Recognition
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16794:1: rule__XSwitchExpression__Group_2_0_0_0__1__Impl : ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) ) ;
+    // InternalFormat.g:16794:1: rule__XSwitchExpression__Group_2_0_0_0__1__Impl : ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) ) ;
     public final void rule__XSwitchExpression__Group_2_0_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16798:1: ( ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16799:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) )
+            // InternalFormat.g:16798:1: ( ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) ) )
+            // InternalFormat.g:16799:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16799:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16800:1: ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 )
+            // InternalFormat.g:16799:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 ) )
+            // InternalFormat.g:16800:1: ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getDeclaredParamAssignment_2_0_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16801:1: ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16801:2: rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1
+            // InternalFormat.g:16801:1: ( rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 )
+            // InternalFormat.g:16801:2: rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1_in_rule__XSwitchExpression__Group_2_0_0_0__1__Impl34229);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1();
 
             state._fsp--;
@@ -49369,16 +49369,16 @@ public final void rule__XSwitchExpression__Group_2_0_0_0__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0_0__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16811:1: rule__XSwitchExpression__Group_2_0_0_0__2 : rule__XSwitchExpression__Group_2_0_0_0__2__Impl ;
+    // InternalFormat.g:16811:1: rule__XSwitchExpression__Group_2_0_0_0__2 : rule__XSwitchExpression__Group_2_0_0_0__2__Impl ;
     public final void rule__XSwitchExpression__Group_2_0_0_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16815:1: ( rule__XSwitchExpression__Group_2_0_0_0__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16816:2: rule__XSwitchExpression__Group_2_0_0_0__2__Impl
+            // InternalFormat.g:16815:1: ( rule__XSwitchExpression__Group_2_0_0_0__2__Impl )
+            // InternalFormat.g:16816:2: rule__XSwitchExpression__Group_2_0_0_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__2__Impl_in_rule__XSwitchExpression__Group_2_0_0_0__234259);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_0_0_0__2__Impl();
 
             state._fsp--;
@@ -49402,22 +49402,22 @@ public final void rule__XSwitchExpression__Group_2_0_0_0__2() throws Recognition
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_0_0_0__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16822:1: rule__XSwitchExpression__Group_2_0_0_0__2__Impl : ( ':' ) ;
+    // InternalFormat.g:16822:1: rule__XSwitchExpression__Group_2_0_0_0__2__Impl : ( ':' ) ;
     public final void rule__XSwitchExpression__Group_2_0_0_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16826:1: ( ( ':' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16827:1: ( ':' )
+            // InternalFormat.g:16826:1: ( ( ':' ) )
+            // InternalFormat.g:16827:1: ( ':' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16827:1: ( ':' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16828:1: ':'
+            // InternalFormat.g:16827:1: ( ':' )
+            // InternalFormat.g:16828:1: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getColonKeyword_2_0_0_0_2()); 
             }
-            match(input,72,FOLLOW_72_in_rule__XSwitchExpression__Group_2_0_0_0__2__Impl34287); if (state.failed) return ;
+            match(input,72,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getColonKeyword_2_0_0_0_2()); 
             }
@@ -49443,21 +49443,21 @@ public final void rule__XSwitchExpression__Group_2_0_0_0__2__Impl() throws Recog
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16847:1: rule__XSwitchExpression__Group_2_1__0 : rule__XSwitchExpression__Group_2_1__0__Impl rule__XSwitchExpression__Group_2_1__1 ;
+    // InternalFormat.g:16847:1: rule__XSwitchExpression__Group_2_1__0 : rule__XSwitchExpression__Group_2_1__0__Impl rule__XSwitchExpression__Group_2_1__1 ;
     public final void rule__XSwitchExpression__Group_2_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16851:1: ( rule__XSwitchExpression__Group_2_1__0__Impl rule__XSwitchExpression__Group_2_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16852:2: rule__XSwitchExpression__Group_2_1__0__Impl rule__XSwitchExpression__Group_2_1__1
+            // InternalFormat.g:16851:1: ( rule__XSwitchExpression__Group_2_1__0__Impl rule__XSwitchExpression__Group_2_1__1 )
+            // InternalFormat.g:16852:2: rule__XSwitchExpression__Group_2_1__0__Impl rule__XSwitchExpression__Group_2_1__1
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1__0__Impl_in_rule__XSwitchExpression__Group_2_1__034324);
+            pushFollow(FOLLOW_97);
             rule__XSwitchExpression__Group_2_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1__1_in_rule__XSwitchExpression__Group_2_1__034327);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_1__1();
 
             state._fsp--;
@@ -49481,29 +49481,29 @@ public final void rule__XSwitchExpression__Group_2_1__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16859:1: rule__XSwitchExpression__Group_2_1__0__Impl : ( ( rule__XSwitchExpression__Group_2_1_0__0 )? ) ;
+    // InternalFormat.g:16859:1: rule__XSwitchExpression__Group_2_1__0__Impl : ( ( rule__XSwitchExpression__Group_2_1_0__0 )? ) ;
     public final void rule__XSwitchExpression__Group_2_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16863:1: ( ( ( rule__XSwitchExpression__Group_2_1_0__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16864:1: ( ( rule__XSwitchExpression__Group_2_1_0__0 )? )
+            // InternalFormat.g:16863:1: ( ( ( rule__XSwitchExpression__Group_2_1_0__0 )? ) )
+            // InternalFormat.g:16864:1: ( ( rule__XSwitchExpression__Group_2_1_0__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16864:1: ( ( rule__XSwitchExpression__Group_2_1_0__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16865:1: ( rule__XSwitchExpression__Group_2_1_0__0 )?
+            // InternalFormat.g:16864:1: ( ( rule__XSwitchExpression__Group_2_1_0__0 )? )
+            // InternalFormat.g:16865:1: ( rule__XSwitchExpression__Group_2_1_0__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getGroup_2_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16866:1: ( rule__XSwitchExpression__Group_2_1_0__0 )?
+            // InternalFormat.g:16866:1: ( rule__XSwitchExpression__Group_2_1_0__0 )?
             int alt134=2;
             alt134 = dfa134.predict(input);
             switch (alt134) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16866:2: rule__XSwitchExpression__Group_2_1_0__0
+                    // InternalFormat.g:16866:2: rule__XSwitchExpression__Group_2_1_0__0
                     {
-                    pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1_0__0_in_rule__XSwitchExpression__Group_2_1__0__Impl34354);
+                    pushFollow(FOLLOW_2);
                     rule__XSwitchExpression__Group_2_1_0__0();
 
                     state._fsp--;
@@ -49539,16 +49539,16 @@ public final void rule__XSwitchExpression__Group_2_1__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16876:1: rule__XSwitchExpression__Group_2_1__1 : rule__XSwitchExpression__Group_2_1__1__Impl ;
+    // InternalFormat.g:16876:1: rule__XSwitchExpression__Group_2_1__1 : rule__XSwitchExpression__Group_2_1__1__Impl ;
     public final void rule__XSwitchExpression__Group_2_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16880:1: ( rule__XSwitchExpression__Group_2_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16881:2: rule__XSwitchExpression__Group_2_1__1__Impl
+            // InternalFormat.g:16880:1: ( rule__XSwitchExpression__Group_2_1__1__Impl )
+            // InternalFormat.g:16881:2: rule__XSwitchExpression__Group_2_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1__1__Impl_in_rule__XSwitchExpression__Group_2_1__134385);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_1__1__Impl();
 
             state._fsp--;
@@ -49572,25 +49572,25 @@ public final void rule__XSwitchExpression__Group_2_1__1() throws RecognitionExce
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16887:1: rule__XSwitchExpression__Group_2_1__1__Impl : ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) ) ;
+    // InternalFormat.g:16887:1: rule__XSwitchExpression__Group_2_1__1__Impl : ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) ) ;
     public final void rule__XSwitchExpression__Group_2_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16891:1: ( ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16892:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) )
+            // InternalFormat.g:16891:1: ( ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) ) )
+            // InternalFormat.g:16892:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16892:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16893:1: ( rule__XSwitchExpression__SwitchAssignment_2_1_1 )
+            // InternalFormat.g:16892:1: ( ( rule__XSwitchExpression__SwitchAssignment_2_1_1 ) )
+            // InternalFormat.g:16893:1: ( rule__XSwitchExpression__SwitchAssignment_2_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getSwitchAssignment_2_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16894:1: ( rule__XSwitchExpression__SwitchAssignment_2_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16894:2: rule__XSwitchExpression__SwitchAssignment_2_1_1
+            // InternalFormat.g:16894:1: ( rule__XSwitchExpression__SwitchAssignment_2_1_1 )
+            // InternalFormat.g:16894:2: rule__XSwitchExpression__SwitchAssignment_2_1_1
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__SwitchAssignment_2_1_1_in_rule__XSwitchExpression__Group_2_1__1__Impl34412);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__SwitchAssignment_2_1_1();
 
             state._fsp--;
@@ -49623,16 +49623,16 @@ public final void rule__XSwitchExpression__Group_2_1__1__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16908:1: rule__XSwitchExpression__Group_2_1_0__0 : rule__XSwitchExpression__Group_2_1_0__0__Impl ;
+    // InternalFormat.g:16908:1: rule__XSwitchExpression__Group_2_1_0__0 : rule__XSwitchExpression__Group_2_1_0__0__Impl ;
     public final void rule__XSwitchExpression__Group_2_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16912:1: ( rule__XSwitchExpression__Group_2_1_0__0__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16913:2: rule__XSwitchExpression__Group_2_1_0__0__Impl
+            // InternalFormat.g:16912:1: ( rule__XSwitchExpression__Group_2_1_0__0__Impl )
+            // InternalFormat.g:16913:2: rule__XSwitchExpression__Group_2_1_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1_0__0__Impl_in_rule__XSwitchExpression__Group_2_1_0__034446);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_1_0__0__Impl();
 
             state._fsp--;
@@ -49656,25 +49656,25 @@ public final void rule__XSwitchExpression__Group_2_1_0__0() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16919:1: rule__XSwitchExpression__Group_2_1_0__0__Impl : ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) ) ;
+    // InternalFormat.g:16919:1: rule__XSwitchExpression__Group_2_1_0__0__Impl : ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) ) ;
     public final void rule__XSwitchExpression__Group_2_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16923:1: ( ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16924:1: ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) )
+            // InternalFormat.g:16923:1: ( ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) ) )
+            // InternalFormat.g:16924:1: ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16924:1: ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16925:1: ( rule__XSwitchExpression__Group_2_1_0_0__0 )
+            // InternalFormat.g:16924:1: ( ( rule__XSwitchExpression__Group_2_1_0_0__0 ) )
+            // InternalFormat.g:16925:1: ( rule__XSwitchExpression__Group_2_1_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getGroup_2_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16926:1: ( rule__XSwitchExpression__Group_2_1_0_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16926:2: rule__XSwitchExpression__Group_2_1_0_0__0
+            // InternalFormat.g:16926:1: ( rule__XSwitchExpression__Group_2_1_0_0__0 )
+            // InternalFormat.g:16926:2: rule__XSwitchExpression__Group_2_1_0_0__0
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1_0_0__0_in_rule__XSwitchExpression__Group_2_1_0__0__Impl34473);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_1_0_0__0();
 
             state._fsp--;
@@ -49707,21 +49707,21 @@ public final void rule__XSwitchExpression__Group_2_1_0__0__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1_0_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16938:1: rule__XSwitchExpression__Group_2_1_0_0__0 : rule__XSwitchExpression__Group_2_1_0_0__0__Impl rule__XSwitchExpression__Group_2_1_0_0__1 ;
+    // InternalFormat.g:16938:1: rule__XSwitchExpression__Group_2_1_0_0__0 : rule__XSwitchExpression__Group_2_1_0_0__0__Impl rule__XSwitchExpression__Group_2_1_0_0__1 ;
     public final void rule__XSwitchExpression__Group_2_1_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16942:1: ( rule__XSwitchExpression__Group_2_1_0_0__0__Impl rule__XSwitchExpression__Group_2_1_0_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16943:2: rule__XSwitchExpression__Group_2_1_0_0__0__Impl rule__XSwitchExpression__Group_2_1_0_0__1
+            // InternalFormat.g:16942:1: ( rule__XSwitchExpression__Group_2_1_0_0__0__Impl rule__XSwitchExpression__Group_2_1_0_0__1 )
+            // InternalFormat.g:16943:2: rule__XSwitchExpression__Group_2_1_0_0__0__Impl rule__XSwitchExpression__Group_2_1_0_0__1
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1_0_0__0__Impl_in_rule__XSwitchExpression__Group_2_1_0_0__034505);
+            pushFollow(FOLLOW_24);
             rule__XSwitchExpression__Group_2_1_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1_0_0__1_in_rule__XSwitchExpression__Group_2_1_0_0__034508);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_1_0_0__1();
 
             state._fsp--;
@@ -49745,25 +49745,25 @@ public final void rule__XSwitchExpression__Group_2_1_0_0__0() throws Recognition
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16950:1: rule__XSwitchExpression__Group_2_1_0_0__0__Impl : ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) ) ;
+    // InternalFormat.g:16950:1: rule__XSwitchExpression__Group_2_1_0_0__0__Impl : ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) ) ;
     public final void rule__XSwitchExpression__Group_2_1_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16954:1: ( ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16955:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) )
+            // InternalFormat.g:16954:1: ( ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) ) )
+            // InternalFormat.g:16955:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16955:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16956:1: ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 )
+            // InternalFormat.g:16955:1: ( ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 ) )
+            // InternalFormat.g:16956:1: ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getDeclaredParamAssignment_2_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16957:1: ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16957:2: rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0
+            // InternalFormat.g:16957:1: ( rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 )
+            // InternalFormat.g:16957:2: rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0_in_rule__XSwitchExpression__Group_2_1_0_0__0__Impl34535);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0();
 
             state._fsp--;
@@ -49796,16 +49796,16 @@ public final void rule__XSwitchExpression__Group_2_1_0_0__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1_0_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16967:1: rule__XSwitchExpression__Group_2_1_0_0__1 : rule__XSwitchExpression__Group_2_1_0_0__1__Impl ;
+    // InternalFormat.g:16967:1: rule__XSwitchExpression__Group_2_1_0_0__1 : rule__XSwitchExpression__Group_2_1_0_0__1__Impl ;
     public final void rule__XSwitchExpression__Group_2_1_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16971:1: ( rule__XSwitchExpression__Group_2_1_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16972:2: rule__XSwitchExpression__Group_2_1_0_0__1__Impl
+            // InternalFormat.g:16971:1: ( rule__XSwitchExpression__Group_2_1_0_0__1__Impl )
+            // InternalFormat.g:16972:2: rule__XSwitchExpression__Group_2_1_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1_0_0__1__Impl_in_rule__XSwitchExpression__Group_2_1_0_0__134565);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_2_1_0_0__1__Impl();
 
             state._fsp--;
@@ -49829,22 +49829,22 @@ public final void rule__XSwitchExpression__Group_2_1_0_0__1() throws Recognition
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_2_1_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16978:1: rule__XSwitchExpression__Group_2_1_0_0__1__Impl : ( ':' ) ;
+    // InternalFormat.g:16978:1: rule__XSwitchExpression__Group_2_1_0_0__1__Impl : ( ':' ) ;
     public final void rule__XSwitchExpression__Group_2_1_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16982:1: ( ( ':' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16983:1: ( ':' )
+            // InternalFormat.g:16982:1: ( ( ':' ) )
+            // InternalFormat.g:16983:1: ( ':' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16983:1: ( ':' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16984:1: ':'
+            // InternalFormat.g:16983:1: ( ':' )
+            // InternalFormat.g:16984:1: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getColonKeyword_2_1_0_0_1()); 
             }
-            match(input,72,FOLLOW_72_in_rule__XSwitchExpression__Group_2_1_0_0__1__Impl34593); if (state.failed) return ;
+            match(input,72,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getColonKeyword_2_1_0_0_1()); 
             }
@@ -49870,21 +49870,21 @@ public final void rule__XSwitchExpression__Group_2_1_0_0__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_5__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17001:1: rule__XSwitchExpression__Group_5__0 : rule__XSwitchExpression__Group_5__0__Impl rule__XSwitchExpression__Group_5__1 ;
+    // InternalFormat.g:17001:1: rule__XSwitchExpression__Group_5__0 : rule__XSwitchExpression__Group_5__0__Impl rule__XSwitchExpression__Group_5__1 ;
     public final void rule__XSwitchExpression__Group_5__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17005:1: ( rule__XSwitchExpression__Group_5__0__Impl rule__XSwitchExpression__Group_5__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17006:2: rule__XSwitchExpression__Group_5__0__Impl rule__XSwitchExpression__Group_5__1
+            // InternalFormat.g:17005:1: ( rule__XSwitchExpression__Group_5__0__Impl rule__XSwitchExpression__Group_5__1 )
+            // InternalFormat.g:17006:2: rule__XSwitchExpression__Group_5__0__Impl rule__XSwitchExpression__Group_5__1
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_5__0__Impl_in_rule__XSwitchExpression__Group_5__034628);
+            pushFollow(FOLLOW_24);
             rule__XSwitchExpression__Group_5__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_5__1_in_rule__XSwitchExpression__Group_5__034631);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_5__1();
 
             state._fsp--;
@@ -49908,22 +49908,22 @@ public final void rule__XSwitchExpression__Group_5__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_5__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17013:1: rule__XSwitchExpression__Group_5__0__Impl : ( 'default' ) ;
+    // InternalFormat.g:17013:1: rule__XSwitchExpression__Group_5__0__Impl : ( 'default' ) ;
     public final void rule__XSwitchExpression__Group_5__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17017:1: ( ( 'default' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17018:1: ( 'default' )
+            // InternalFormat.g:17017:1: ( ( 'default' ) )
+            // InternalFormat.g:17018:1: ( 'default' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17018:1: ( 'default' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17019:1: 'default'
+            // InternalFormat.g:17018:1: ( 'default' )
+            // InternalFormat.g:17019:1: 'default'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getDefaultKeyword_5_0()); 
             }
-            match(input,18,FOLLOW_18_in_rule__XSwitchExpression__Group_5__0__Impl34659); if (state.failed) return ;
+            match(input,18,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getDefaultKeyword_5_0()); 
             }
@@ -49949,21 +49949,21 @@ public final void rule__XSwitchExpression__Group_5__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_5__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17032:1: rule__XSwitchExpression__Group_5__1 : rule__XSwitchExpression__Group_5__1__Impl rule__XSwitchExpression__Group_5__2 ;
+    // InternalFormat.g:17032:1: rule__XSwitchExpression__Group_5__1 : rule__XSwitchExpression__Group_5__1__Impl rule__XSwitchExpression__Group_5__2 ;
     public final void rule__XSwitchExpression__Group_5__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17036:1: ( rule__XSwitchExpression__Group_5__1__Impl rule__XSwitchExpression__Group_5__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17037:2: rule__XSwitchExpression__Group_5__1__Impl rule__XSwitchExpression__Group_5__2
+            // InternalFormat.g:17036:1: ( rule__XSwitchExpression__Group_5__1__Impl rule__XSwitchExpression__Group_5__2 )
+            // InternalFormat.g:17037:2: rule__XSwitchExpression__Group_5__1__Impl rule__XSwitchExpression__Group_5__2
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_5__1__Impl_in_rule__XSwitchExpression__Group_5__134690);
+            pushFollow(FOLLOW_50);
             rule__XSwitchExpression__Group_5__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_5__2_in_rule__XSwitchExpression__Group_5__134693);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_5__2();
 
             state._fsp--;
@@ -49987,22 +49987,22 @@ public final void rule__XSwitchExpression__Group_5__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_5__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17044:1: rule__XSwitchExpression__Group_5__1__Impl : ( ':' ) ;
+    // InternalFormat.g:17044:1: rule__XSwitchExpression__Group_5__1__Impl : ( ':' ) ;
     public final void rule__XSwitchExpression__Group_5__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17048:1: ( ( ':' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17049:1: ( ':' )
+            // InternalFormat.g:17048:1: ( ( ':' ) )
+            // InternalFormat.g:17049:1: ( ':' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17049:1: ( ':' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17050:1: ':'
+            // InternalFormat.g:17049:1: ( ':' )
+            // InternalFormat.g:17050:1: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getColonKeyword_5_1()); 
             }
-            match(input,72,FOLLOW_72_in_rule__XSwitchExpression__Group_5__1__Impl34721); if (state.failed) return ;
+            match(input,72,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSwitchExpressionAccess().getColonKeyword_5_1()); 
             }
@@ -50028,16 +50028,16 @@ public final void rule__XSwitchExpression__Group_5__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_5__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17063:1: rule__XSwitchExpression__Group_5__2 : rule__XSwitchExpression__Group_5__2__Impl ;
+    // InternalFormat.g:17063:1: rule__XSwitchExpression__Group_5__2 : rule__XSwitchExpression__Group_5__2__Impl ;
     public final void rule__XSwitchExpression__Group_5__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17067:1: ( rule__XSwitchExpression__Group_5__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17068:2: rule__XSwitchExpression__Group_5__2__Impl
+            // InternalFormat.g:17067:1: ( rule__XSwitchExpression__Group_5__2__Impl )
+            // InternalFormat.g:17068:2: rule__XSwitchExpression__Group_5__2__Impl
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__Group_5__2__Impl_in_rule__XSwitchExpression__Group_5__234752);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__Group_5__2__Impl();
 
             state._fsp--;
@@ -50061,25 +50061,25 @@ public final void rule__XSwitchExpression__Group_5__2() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XSwitchExpression__Group_5__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17074:1: rule__XSwitchExpression__Group_5__2__Impl : ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) ) ;
+    // InternalFormat.g:17074:1: rule__XSwitchExpression__Group_5__2__Impl : ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) ) ;
     public final void rule__XSwitchExpression__Group_5__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17078:1: ( ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17079:1: ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) )
+            // InternalFormat.g:17078:1: ( ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) ) )
+            // InternalFormat.g:17079:1: ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17079:1: ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17080:1: ( rule__XSwitchExpression__DefaultAssignment_5_2 )
+            // InternalFormat.g:17079:1: ( ( rule__XSwitchExpression__DefaultAssignment_5_2 ) )
+            // InternalFormat.g:17080:1: ( rule__XSwitchExpression__DefaultAssignment_5_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getDefaultAssignment_5_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17081:1: ( rule__XSwitchExpression__DefaultAssignment_5_2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17081:2: rule__XSwitchExpression__DefaultAssignment_5_2
+            // InternalFormat.g:17081:1: ( rule__XSwitchExpression__DefaultAssignment_5_2 )
+            // InternalFormat.g:17081:2: rule__XSwitchExpression__DefaultAssignment_5_2
             {
-            pushFollow(FOLLOW_rule__XSwitchExpression__DefaultAssignment_5_2_in_rule__XSwitchExpression__Group_5__2__Impl34779);
+            pushFollow(FOLLOW_2);
             rule__XSwitchExpression__DefaultAssignment_5_2();
 
             state._fsp--;
@@ -50112,21 +50112,21 @@ public final void rule__XSwitchExpression__Group_5__2__Impl() throws Recognition
 
 
     // $ANTLR start "rule__XCasePart__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17097:1: rule__XCasePart__Group__0 : rule__XCasePart__Group__0__Impl rule__XCasePart__Group__1 ;
+    // InternalFormat.g:17097:1: rule__XCasePart__Group__0 : rule__XCasePart__Group__0__Impl rule__XCasePart__Group__1 ;
     public final void rule__XCasePart__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17101:1: ( rule__XCasePart__Group__0__Impl rule__XCasePart__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17102:2: rule__XCasePart__Group__0__Impl rule__XCasePart__Group__1
+            // InternalFormat.g:17101:1: ( rule__XCasePart__Group__0__Impl rule__XCasePart__Group__1 )
+            // InternalFormat.g:17102:2: rule__XCasePart__Group__0__Impl rule__XCasePart__Group__1
             {
-            pushFollow(FOLLOW_rule__XCasePart__Group__0__Impl_in_rule__XCasePart__Group__034815);
+            pushFollow(FOLLOW_100);
             rule__XCasePart__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCasePart__Group__1_in_rule__XCasePart__Group__034818);
+            pushFollow(FOLLOW_2);
             rule__XCasePart__Group__1();
 
             state._fsp--;
@@ -50150,23 +50150,23 @@ public final void rule__XCasePart__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCasePart__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17109:1: rule__XCasePart__Group__0__Impl : ( () ) ;
+    // InternalFormat.g:17109:1: rule__XCasePart__Group__0__Impl : ( () ) ;
     public final void rule__XCasePart__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17113:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17114:1: ( () )
+            // InternalFormat.g:17113:1: ( ( () ) )
+            // InternalFormat.g:17114:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17114:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17115:1: ()
+            // InternalFormat.g:17114:1: ( () )
+            // InternalFormat.g:17115:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getXCasePartAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17116:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17118:1: 
+            // InternalFormat.g:17116:1: ()
+            // InternalFormat.g:17118:1: 
             {
             }
 
@@ -50191,21 +50191,21 @@ public final void rule__XCasePart__Group__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__XCasePart__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17128:1: rule__XCasePart__Group__1 : rule__XCasePart__Group__1__Impl rule__XCasePart__Group__2 ;
+    // InternalFormat.g:17128:1: rule__XCasePart__Group__1 : rule__XCasePart__Group__1__Impl rule__XCasePart__Group__2 ;
     public final void rule__XCasePart__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17132:1: ( rule__XCasePart__Group__1__Impl rule__XCasePart__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17133:2: rule__XCasePart__Group__1__Impl rule__XCasePart__Group__2
+            // InternalFormat.g:17132:1: ( rule__XCasePart__Group__1__Impl rule__XCasePart__Group__2 )
+            // InternalFormat.g:17133:2: rule__XCasePart__Group__1__Impl rule__XCasePart__Group__2
             {
-            pushFollow(FOLLOW_rule__XCasePart__Group__1__Impl_in_rule__XCasePart__Group__134876);
+            pushFollow(FOLLOW_100);
             rule__XCasePart__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCasePart__Group__2_in_rule__XCasePart__Group__134879);
+            pushFollow(FOLLOW_2);
             rule__XCasePart__Group__2();
 
             state._fsp--;
@@ -50229,22 +50229,22 @@ public final void rule__XCasePart__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCasePart__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17140:1: rule__XCasePart__Group__1__Impl : ( ( rule__XCasePart__TypeGuardAssignment_1 )? ) ;
+    // InternalFormat.g:17140:1: rule__XCasePart__Group__1__Impl : ( ( rule__XCasePart__TypeGuardAssignment_1 )? ) ;
     public final void rule__XCasePart__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17144:1: ( ( ( rule__XCasePart__TypeGuardAssignment_1 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17145:1: ( ( rule__XCasePart__TypeGuardAssignment_1 )? )
+            // InternalFormat.g:17144:1: ( ( ( rule__XCasePart__TypeGuardAssignment_1 )? ) )
+            // InternalFormat.g:17145:1: ( ( rule__XCasePart__TypeGuardAssignment_1 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17145:1: ( ( rule__XCasePart__TypeGuardAssignment_1 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17146:1: ( rule__XCasePart__TypeGuardAssignment_1 )?
+            // InternalFormat.g:17145:1: ( ( rule__XCasePart__TypeGuardAssignment_1 )? )
+            // InternalFormat.g:17146:1: ( rule__XCasePart__TypeGuardAssignment_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getTypeGuardAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17147:1: ( rule__XCasePart__TypeGuardAssignment_1 )?
+            // InternalFormat.g:17147:1: ( rule__XCasePart__TypeGuardAssignment_1 )?
             int alt135=2;
             int LA135_0 = input.LA(1);
 
@@ -50253,9 +50253,9 @@ public final void rule__XCasePart__Group__1__Impl() throws RecognitionException
             }
             switch (alt135) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17147:2: rule__XCasePart__TypeGuardAssignment_1
+                    // InternalFormat.g:17147:2: rule__XCasePart__TypeGuardAssignment_1
                     {
-                    pushFollow(FOLLOW_rule__XCasePart__TypeGuardAssignment_1_in_rule__XCasePart__Group__1__Impl34906);
+                    pushFollow(FOLLOW_2);
                     rule__XCasePart__TypeGuardAssignment_1();
 
                     state._fsp--;
@@ -50291,21 +50291,21 @@ public final void rule__XCasePart__Group__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__XCasePart__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17157:1: rule__XCasePart__Group__2 : rule__XCasePart__Group__2__Impl rule__XCasePart__Group__3 ;
+    // InternalFormat.g:17157:1: rule__XCasePart__Group__2 : rule__XCasePart__Group__2__Impl rule__XCasePart__Group__3 ;
     public final void rule__XCasePart__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17161:1: ( rule__XCasePart__Group__2__Impl rule__XCasePart__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17162:2: rule__XCasePart__Group__2__Impl rule__XCasePart__Group__3
+            // InternalFormat.g:17161:1: ( rule__XCasePart__Group__2__Impl rule__XCasePart__Group__3 )
+            // InternalFormat.g:17162:2: rule__XCasePart__Group__2__Impl rule__XCasePart__Group__3
             {
-            pushFollow(FOLLOW_rule__XCasePart__Group__2__Impl_in_rule__XCasePart__Group__234937);
+            pushFollow(FOLLOW_100);
             rule__XCasePart__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCasePart__Group__3_in_rule__XCasePart__Group__234940);
+            pushFollow(FOLLOW_2);
             rule__XCasePart__Group__3();
 
             state._fsp--;
@@ -50329,22 +50329,22 @@ public final void rule__XCasePart__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCasePart__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17169:1: rule__XCasePart__Group__2__Impl : ( ( rule__XCasePart__Group_2__0 )? ) ;
+    // InternalFormat.g:17169:1: rule__XCasePart__Group__2__Impl : ( ( rule__XCasePart__Group_2__0 )? ) ;
     public final void rule__XCasePart__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17173:1: ( ( ( rule__XCasePart__Group_2__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17174:1: ( ( rule__XCasePart__Group_2__0 )? )
+            // InternalFormat.g:17173:1: ( ( ( rule__XCasePart__Group_2__0 )? ) )
+            // InternalFormat.g:17174:1: ( ( rule__XCasePart__Group_2__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17174:1: ( ( rule__XCasePart__Group_2__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17175:1: ( rule__XCasePart__Group_2__0 )?
+            // InternalFormat.g:17174:1: ( ( rule__XCasePart__Group_2__0 )? )
+            // InternalFormat.g:17175:1: ( rule__XCasePart__Group_2__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getGroup_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17176:1: ( rule__XCasePart__Group_2__0 )?
+            // InternalFormat.g:17176:1: ( rule__XCasePart__Group_2__0 )?
             int alt136=2;
             int LA136_0 = input.LA(1);
 
@@ -50353,9 +50353,9 @@ public final void rule__XCasePart__Group__2__Impl() throws RecognitionException
             }
             switch (alt136) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17176:2: rule__XCasePart__Group_2__0
+                    // InternalFormat.g:17176:2: rule__XCasePart__Group_2__0
                     {
-                    pushFollow(FOLLOW_rule__XCasePart__Group_2__0_in_rule__XCasePart__Group__2__Impl34967);
+                    pushFollow(FOLLOW_2);
                     rule__XCasePart__Group_2__0();
 
                     state._fsp--;
@@ -50391,16 +50391,16 @@ public final void rule__XCasePart__Group__2__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__XCasePart__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17186:1: rule__XCasePart__Group__3 : rule__XCasePart__Group__3__Impl ;
+    // InternalFormat.g:17186:1: rule__XCasePart__Group__3 : rule__XCasePart__Group__3__Impl ;
     public final void rule__XCasePart__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17190:1: ( rule__XCasePart__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17191:2: rule__XCasePart__Group__3__Impl
+            // InternalFormat.g:17190:1: ( rule__XCasePart__Group__3__Impl )
+            // InternalFormat.g:17191:2: rule__XCasePart__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__XCasePart__Group__3__Impl_in_rule__XCasePart__Group__334998);
+            pushFollow(FOLLOW_2);
             rule__XCasePart__Group__3__Impl();
 
             state._fsp--;
@@ -50424,25 +50424,25 @@ public final void rule__XCasePart__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCasePart__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17197:1: rule__XCasePart__Group__3__Impl : ( ( rule__XCasePart__Alternatives_3 ) ) ;
+    // InternalFormat.g:17197:1: rule__XCasePart__Group__3__Impl : ( ( rule__XCasePart__Alternatives_3 ) ) ;
     public final void rule__XCasePart__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17201:1: ( ( ( rule__XCasePart__Alternatives_3 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17202:1: ( ( rule__XCasePart__Alternatives_3 ) )
+            // InternalFormat.g:17201:1: ( ( ( rule__XCasePart__Alternatives_3 ) ) )
+            // InternalFormat.g:17202:1: ( ( rule__XCasePart__Alternatives_3 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17202:1: ( ( rule__XCasePart__Alternatives_3 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17203:1: ( rule__XCasePart__Alternatives_3 )
+            // InternalFormat.g:17202:1: ( ( rule__XCasePart__Alternatives_3 ) )
+            // InternalFormat.g:17203:1: ( rule__XCasePart__Alternatives_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getAlternatives_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17204:1: ( rule__XCasePart__Alternatives_3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17204:2: rule__XCasePart__Alternatives_3
+            // InternalFormat.g:17204:1: ( rule__XCasePart__Alternatives_3 )
+            // InternalFormat.g:17204:2: rule__XCasePart__Alternatives_3
             {
-            pushFollow(FOLLOW_rule__XCasePart__Alternatives_3_in_rule__XCasePart__Group__3__Impl35025);
+            pushFollow(FOLLOW_2);
             rule__XCasePart__Alternatives_3();
 
             state._fsp--;
@@ -50475,21 +50475,21 @@ public final void rule__XCasePart__Group__3__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__XCasePart__Group_2__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17222:1: rule__XCasePart__Group_2__0 : rule__XCasePart__Group_2__0__Impl rule__XCasePart__Group_2__1 ;
+    // InternalFormat.g:17222:1: rule__XCasePart__Group_2__0 : rule__XCasePart__Group_2__0__Impl rule__XCasePart__Group_2__1 ;
     public final void rule__XCasePart__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17226:1: ( rule__XCasePart__Group_2__0__Impl rule__XCasePart__Group_2__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17227:2: rule__XCasePart__Group_2__0__Impl rule__XCasePart__Group_2__1
+            // InternalFormat.g:17226:1: ( rule__XCasePart__Group_2__0__Impl rule__XCasePart__Group_2__1 )
+            // InternalFormat.g:17227:2: rule__XCasePart__Group_2__0__Impl rule__XCasePart__Group_2__1
             {
-            pushFollow(FOLLOW_rule__XCasePart__Group_2__0__Impl_in_rule__XCasePart__Group_2__035063);
+            pushFollow(FOLLOW_50);
             rule__XCasePart__Group_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCasePart__Group_2__1_in_rule__XCasePart__Group_2__035066);
+            pushFollow(FOLLOW_2);
             rule__XCasePart__Group_2__1();
 
             state._fsp--;
@@ -50513,22 +50513,22 @@ public final void rule__XCasePart__Group_2__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCasePart__Group_2__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17234:1: rule__XCasePart__Group_2__0__Impl : ( 'case' ) ;
+    // InternalFormat.g:17234:1: rule__XCasePart__Group_2__0__Impl : ( 'case' ) ;
     public final void rule__XCasePart__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17238:1: ( ( 'case' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17239:1: ( 'case' )
+            // InternalFormat.g:17238:1: ( ( 'case' ) )
+            // InternalFormat.g:17239:1: ( 'case' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17239:1: ( 'case' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17240:1: 'case'
+            // InternalFormat.g:17239:1: ( 'case' )
+            // InternalFormat.g:17240:1: 'case'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getCaseKeyword_2_0()); 
             }
-            match(input,90,FOLLOW_90_in_rule__XCasePart__Group_2__0__Impl35094); if (state.failed) return ;
+            match(input,90,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXCasePartAccess().getCaseKeyword_2_0()); 
             }
@@ -50554,16 +50554,16 @@ public final void rule__XCasePart__Group_2__0__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XCasePart__Group_2__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17253:1: rule__XCasePart__Group_2__1 : rule__XCasePart__Group_2__1__Impl ;
+    // InternalFormat.g:17253:1: rule__XCasePart__Group_2__1 : rule__XCasePart__Group_2__1__Impl ;
     public final void rule__XCasePart__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17257:1: ( rule__XCasePart__Group_2__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17258:2: rule__XCasePart__Group_2__1__Impl
+            // InternalFormat.g:17257:1: ( rule__XCasePart__Group_2__1__Impl )
+            // InternalFormat.g:17258:2: rule__XCasePart__Group_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__XCasePart__Group_2__1__Impl_in_rule__XCasePart__Group_2__135125);
+            pushFollow(FOLLOW_2);
             rule__XCasePart__Group_2__1__Impl();
 
             state._fsp--;
@@ -50587,25 +50587,25 @@ public final void rule__XCasePart__Group_2__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCasePart__Group_2__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17264:1: rule__XCasePart__Group_2__1__Impl : ( ( rule__XCasePart__CaseAssignment_2_1 ) ) ;
+    // InternalFormat.g:17264:1: rule__XCasePart__Group_2__1__Impl : ( ( rule__XCasePart__CaseAssignment_2_1 ) ) ;
     public final void rule__XCasePart__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17268:1: ( ( ( rule__XCasePart__CaseAssignment_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17269:1: ( ( rule__XCasePart__CaseAssignment_2_1 ) )
+            // InternalFormat.g:17268:1: ( ( ( rule__XCasePart__CaseAssignment_2_1 ) ) )
+            // InternalFormat.g:17269:1: ( ( rule__XCasePart__CaseAssignment_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17269:1: ( ( rule__XCasePart__CaseAssignment_2_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17270:1: ( rule__XCasePart__CaseAssignment_2_1 )
+            // InternalFormat.g:17269:1: ( ( rule__XCasePart__CaseAssignment_2_1 ) )
+            // InternalFormat.g:17270:1: ( rule__XCasePart__CaseAssignment_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getCaseAssignment_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17271:1: ( rule__XCasePart__CaseAssignment_2_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17271:2: rule__XCasePart__CaseAssignment_2_1
+            // InternalFormat.g:17271:1: ( rule__XCasePart__CaseAssignment_2_1 )
+            // InternalFormat.g:17271:2: rule__XCasePart__CaseAssignment_2_1
             {
-            pushFollow(FOLLOW_rule__XCasePart__CaseAssignment_2_1_in_rule__XCasePart__Group_2__1__Impl35152);
+            pushFollow(FOLLOW_2);
             rule__XCasePart__CaseAssignment_2_1();
 
             state._fsp--;
@@ -50638,21 +50638,21 @@ public final void rule__XCasePart__Group_2__1__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XCasePart__Group_3_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17285:1: rule__XCasePart__Group_3_0__0 : rule__XCasePart__Group_3_0__0__Impl rule__XCasePart__Group_3_0__1 ;
+    // InternalFormat.g:17285:1: rule__XCasePart__Group_3_0__0 : rule__XCasePart__Group_3_0__0__Impl rule__XCasePart__Group_3_0__1 ;
     public final void rule__XCasePart__Group_3_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17289:1: ( rule__XCasePart__Group_3_0__0__Impl rule__XCasePart__Group_3_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17290:2: rule__XCasePart__Group_3_0__0__Impl rule__XCasePart__Group_3_0__1
+            // InternalFormat.g:17289:1: ( rule__XCasePart__Group_3_0__0__Impl rule__XCasePart__Group_3_0__1 )
+            // InternalFormat.g:17290:2: rule__XCasePart__Group_3_0__0__Impl rule__XCasePart__Group_3_0__1
             {
-            pushFollow(FOLLOW_rule__XCasePart__Group_3_0__0__Impl_in_rule__XCasePart__Group_3_0__035186);
+            pushFollow(FOLLOW_50);
             rule__XCasePart__Group_3_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCasePart__Group_3_0__1_in_rule__XCasePart__Group_3_0__035189);
+            pushFollow(FOLLOW_2);
             rule__XCasePart__Group_3_0__1();
 
             state._fsp--;
@@ -50676,22 +50676,22 @@ public final void rule__XCasePart__Group_3_0__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCasePart__Group_3_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17297:1: rule__XCasePart__Group_3_0__0__Impl : ( ':' ) ;
+    // InternalFormat.g:17297:1: rule__XCasePart__Group_3_0__0__Impl : ( ':' ) ;
     public final void rule__XCasePart__Group_3_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17301:1: ( ( ':' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17302:1: ( ':' )
+            // InternalFormat.g:17301:1: ( ( ':' ) )
+            // InternalFormat.g:17302:1: ( ':' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17302:1: ( ':' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17303:1: ':'
+            // InternalFormat.g:17302:1: ( ':' )
+            // InternalFormat.g:17303:1: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getColonKeyword_3_0_0()); 
             }
-            match(input,72,FOLLOW_72_in_rule__XCasePart__Group_3_0__0__Impl35217); if (state.failed) return ;
+            match(input,72,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXCasePartAccess().getColonKeyword_3_0_0()); 
             }
@@ -50717,16 +50717,16 @@ public final void rule__XCasePart__Group_3_0__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XCasePart__Group_3_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17316:1: rule__XCasePart__Group_3_0__1 : rule__XCasePart__Group_3_0__1__Impl ;
+    // InternalFormat.g:17316:1: rule__XCasePart__Group_3_0__1 : rule__XCasePart__Group_3_0__1__Impl ;
     public final void rule__XCasePart__Group_3_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17320:1: ( rule__XCasePart__Group_3_0__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17321:2: rule__XCasePart__Group_3_0__1__Impl
+            // InternalFormat.g:17320:1: ( rule__XCasePart__Group_3_0__1__Impl )
+            // InternalFormat.g:17321:2: rule__XCasePart__Group_3_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XCasePart__Group_3_0__1__Impl_in_rule__XCasePart__Group_3_0__135248);
+            pushFollow(FOLLOW_2);
             rule__XCasePart__Group_3_0__1__Impl();
 
             state._fsp--;
@@ -50750,25 +50750,25 @@ public final void rule__XCasePart__Group_3_0__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCasePart__Group_3_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17327:1: rule__XCasePart__Group_3_0__1__Impl : ( ( rule__XCasePart__ThenAssignment_3_0_1 ) ) ;
+    // InternalFormat.g:17327:1: rule__XCasePart__Group_3_0__1__Impl : ( ( rule__XCasePart__ThenAssignment_3_0_1 ) ) ;
     public final void rule__XCasePart__Group_3_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17331:1: ( ( ( rule__XCasePart__ThenAssignment_3_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17332:1: ( ( rule__XCasePart__ThenAssignment_3_0_1 ) )
+            // InternalFormat.g:17331:1: ( ( ( rule__XCasePart__ThenAssignment_3_0_1 ) ) )
+            // InternalFormat.g:17332:1: ( ( rule__XCasePart__ThenAssignment_3_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17332:1: ( ( rule__XCasePart__ThenAssignment_3_0_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17333:1: ( rule__XCasePart__ThenAssignment_3_0_1 )
+            // InternalFormat.g:17332:1: ( ( rule__XCasePart__ThenAssignment_3_0_1 ) )
+            // InternalFormat.g:17333:1: ( rule__XCasePart__ThenAssignment_3_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getThenAssignment_3_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17334:1: ( rule__XCasePart__ThenAssignment_3_0_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17334:2: rule__XCasePart__ThenAssignment_3_0_1
+            // InternalFormat.g:17334:1: ( rule__XCasePart__ThenAssignment_3_0_1 )
+            // InternalFormat.g:17334:2: rule__XCasePart__ThenAssignment_3_0_1
             {
-            pushFollow(FOLLOW_rule__XCasePart__ThenAssignment_3_0_1_in_rule__XCasePart__Group_3_0__1__Impl35275);
+            pushFollow(FOLLOW_2);
             rule__XCasePart__ThenAssignment_3_0_1();
 
             state._fsp--;
@@ -50801,21 +50801,21 @@ public final void rule__XCasePart__Group_3_0__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17348:1: rule__XForLoopExpression__Group__0 : rule__XForLoopExpression__Group__0__Impl rule__XForLoopExpression__Group__1 ;
+    // InternalFormat.g:17348:1: rule__XForLoopExpression__Group__0 : rule__XForLoopExpression__Group__0__Impl rule__XForLoopExpression__Group__1 ;
     public final void rule__XForLoopExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17352:1: ( rule__XForLoopExpression__Group__0__Impl rule__XForLoopExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17353:2: rule__XForLoopExpression__Group__0__Impl rule__XForLoopExpression__Group__1
+            // InternalFormat.g:17352:1: ( rule__XForLoopExpression__Group__0__Impl rule__XForLoopExpression__Group__1 )
+            // InternalFormat.g:17353:2: rule__XForLoopExpression__Group__0__Impl rule__XForLoopExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group__0__Impl_in_rule__XForLoopExpression__Group__035309);
+            pushFollow(FOLLOW_50);
             rule__XForLoopExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group__1_in_rule__XForLoopExpression__Group__035312);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group__1();
 
             state._fsp--;
@@ -50839,25 +50839,25 @@ public final void rule__XForLoopExpression__Group__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17360:1: rule__XForLoopExpression__Group__0__Impl : ( ( rule__XForLoopExpression__Group_0__0 ) ) ;
+    // InternalFormat.g:17360:1: rule__XForLoopExpression__Group__0__Impl : ( ( rule__XForLoopExpression__Group_0__0 ) ) ;
     public final void rule__XForLoopExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17364:1: ( ( ( rule__XForLoopExpression__Group_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17365:1: ( ( rule__XForLoopExpression__Group_0__0 ) )
+            // InternalFormat.g:17364:1: ( ( ( rule__XForLoopExpression__Group_0__0 ) ) )
+            // InternalFormat.g:17365:1: ( ( rule__XForLoopExpression__Group_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17365:1: ( ( rule__XForLoopExpression__Group_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17366:1: ( rule__XForLoopExpression__Group_0__0 )
+            // InternalFormat.g:17365:1: ( ( rule__XForLoopExpression__Group_0__0 ) )
+            // InternalFormat.g:17366:1: ( rule__XForLoopExpression__Group_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getGroup_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17367:1: ( rule__XForLoopExpression__Group_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17367:2: rule__XForLoopExpression__Group_0__0
+            // InternalFormat.g:17367:1: ( rule__XForLoopExpression__Group_0__0 )
+            // InternalFormat.g:17367:2: rule__XForLoopExpression__Group_0__0
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0__0_in_rule__XForLoopExpression__Group__0__Impl35339);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group_0__0();
 
             state._fsp--;
@@ -50890,21 +50890,21 @@ public final void rule__XForLoopExpression__Group__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17377:1: rule__XForLoopExpression__Group__1 : rule__XForLoopExpression__Group__1__Impl rule__XForLoopExpression__Group__2 ;
+    // InternalFormat.g:17377:1: rule__XForLoopExpression__Group__1 : rule__XForLoopExpression__Group__1__Impl rule__XForLoopExpression__Group__2 ;
     public final void rule__XForLoopExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17381:1: ( rule__XForLoopExpression__Group__1__Impl rule__XForLoopExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17382:2: rule__XForLoopExpression__Group__1__Impl rule__XForLoopExpression__Group__2
+            // InternalFormat.g:17381:1: ( rule__XForLoopExpression__Group__1__Impl rule__XForLoopExpression__Group__2 )
+            // InternalFormat.g:17382:2: rule__XForLoopExpression__Group__1__Impl rule__XForLoopExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group__1__Impl_in_rule__XForLoopExpression__Group__135369);
+            pushFollow(FOLLOW_33);
             rule__XForLoopExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group__2_in_rule__XForLoopExpression__Group__135372);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group__2();
 
             state._fsp--;
@@ -50928,25 +50928,25 @@ public final void rule__XForLoopExpression__Group__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17389:1: rule__XForLoopExpression__Group__1__Impl : ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) ) ;
+    // InternalFormat.g:17389:1: rule__XForLoopExpression__Group__1__Impl : ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) ) ;
     public final void rule__XForLoopExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17393:1: ( ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17394:1: ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) )
+            // InternalFormat.g:17393:1: ( ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) ) )
+            // InternalFormat.g:17394:1: ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17394:1: ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17395:1: ( rule__XForLoopExpression__ForExpressionAssignment_1 )
+            // InternalFormat.g:17394:1: ( ( rule__XForLoopExpression__ForExpressionAssignment_1 ) )
+            // InternalFormat.g:17395:1: ( rule__XForLoopExpression__ForExpressionAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getForExpressionAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17396:1: ( rule__XForLoopExpression__ForExpressionAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17396:2: rule__XForLoopExpression__ForExpressionAssignment_1
+            // InternalFormat.g:17396:1: ( rule__XForLoopExpression__ForExpressionAssignment_1 )
+            // InternalFormat.g:17396:2: rule__XForLoopExpression__ForExpressionAssignment_1
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__ForExpressionAssignment_1_in_rule__XForLoopExpression__Group__1__Impl35399);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__ForExpressionAssignment_1();
 
             state._fsp--;
@@ -50979,21 +50979,21 @@ public final void rule__XForLoopExpression__Group__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17406:1: rule__XForLoopExpression__Group__2 : rule__XForLoopExpression__Group__2__Impl rule__XForLoopExpression__Group__3 ;
+    // InternalFormat.g:17406:1: rule__XForLoopExpression__Group__2 : rule__XForLoopExpression__Group__2__Impl rule__XForLoopExpression__Group__3 ;
     public final void rule__XForLoopExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17410:1: ( rule__XForLoopExpression__Group__2__Impl rule__XForLoopExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17411:2: rule__XForLoopExpression__Group__2__Impl rule__XForLoopExpression__Group__3
+            // InternalFormat.g:17410:1: ( rule__XForLoopExpression__Group__2__Impl rule__XForLoopExpression__Group__3 )
+            // InternalFormat.g:17411:2: rule__XForLoopExpression__Group__2__Impl rule__XForLoopExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group__2__Impl_in_rule__XForLoopExpression__Group__235429);
+            pushFollow(FOLLOW_50);
             rule__XForLoopExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group__3_in_rule__XForLoopExpression__Group__235432);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group__3();
 
             state._fsp--;
@@ -51017,22 +51017,22 @@ public final void rule__XForLoopExpression__Group__2() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17418:1: rule__XForLoopExpression__Group__2__Impl : ( ')' ) ;
+    // InternalFormat.g:17418:1: rule__XForLoopExpression__Group__2__Impl : ( ')' ) ;
     public final void rule__XForLoopExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17422:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17423:1: ( ')' )
+            // InternalFormat.g:17422:1: ( ( ')' ) )
+            // InternalFormat.g:17423:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17423:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17424:1: ')'
+            // InternalFormat.g:17423:1: ( ')' )
+            // InternalFormat.g:17424:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getRightParenthesisKeyword_2()); 
             }
-            match(input,75,FOLLOW_75_in_rule__XForLoopExpression__Group__2__Impl35460); if (state.failed) return ;
+            match(input,75,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXForLoopExpressionAccess().getRightParenthesisKeyword_2()); 
             }
@@ -51058,16 +51058,16 @@ public final void rule__XForLoopExpression__Group__2__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17437:1: rule__XForLoopExpression__Group__3 : rule__XForLoopExpression__Group__3__Impl ;
+    // InternalFormat.g:17437:1: rule__XForLoopExpression__Group__3 : rule__XForLoopExpression__Group__3__Impl ;
     public final void rule__XForLoopExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17441:1: ( rule__XForLoopExpression__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17442:2: rule__XForLoopExpression__Group__3__Impl
+            // InternalFormat.g:17441:1: ( rule__XForLoopExpression__Group__3__Impl )
+            // InternalFormat.g:17442:2: rule__XForLoopExpression__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group__3__Impl_in_rule__XForLoopExpression__Group__335491);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group__3__Impl();
 
             state._fsp--;
@@ -51091,25 +51091,25 @@ public final void rule__XForLoopExpression__Group__3() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XForLoopExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17448:1: rule__XForLoopExpression__Group__3__Impl : ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) ) ;
+    // InternalFormat.g:17448:1: rule__XForLoopExpression__Group__3__Impl : ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) ) ;
     public final void rule__XForLoopExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17452:1: ( ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17453:1: ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) )
+            // InternalFormat.g:17452:1: ( ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) ) )
+            // InternalFormat.g:17453:1: ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17453:1: ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17454:1: ( rule__XForLoopExpression__EachExpressionAssignment_3 )
+            // InternalFormat.g:17453:1: ( ( rule__XForLoopExpression__EachExpressionAssignment_3 ) )
+            // InternalFormat.g:17454:1: ( rule__XForLoopExpression__EachExpressionAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getEachExpressionAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17455:1: ( rule__XForLoopExpression__EachExpressionAssignment_3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17455:2: rule__XForLoopExpression__EachExpressionAssignment_3
+            // InternalFormat.g:17455:1: ( rule__XForLoopExpression__EachExpressionAssignment_3 )
+            // InternalFormat.g:17455:2: rule__XForLoopExpression__EachExpressionAssignment_3
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__EachExpressionAssignment_3_in_rule__XForLoopExpression__Group__3__Impl35518);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__EachExpressionAssignment_3();
 
             state._fsp--;
@@ -51142,16 +51142,16 @@ public final void rule__XForLoopExpression__Group__3__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17473:1: rule__XForLoopExpression__Group_0__0 : rule__XForLoopExpression__Group_0__0__Impl ;
+    // InternalFormat.g:17473:1: rule__XForLoopExpression__Group_0__0 : rule__XForLoopExpression__Group_0__0__Impl ;
     public final void rule__XForLoopExpression__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17477:1: ( rule__XForLoopExpression__Group_0__0__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17478:2: rule__XForLoopExpression__Group_0__0__Impl
+            // InternalFormat.g:17477:1: ( rule__XForLoopExpression__Group_0__0__Impl )
+            // InternalFormat.g:17478:2: rule__XForLoopExpression__Group_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0__0__Impl_in_rule__XForLoopExpression__Group_0__035556);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group_0__0__Impl();
 
             state._fsp--;
@@ -51175,25 +51175,25 @@ public final void rule__XForLoopExpression__Group_0__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17484:1: rule__XForLoopExpression__Group_0__0__Impl : ( ( rule__XForLoopExpression__Group_0_0__0 ) ) ;
+    // InternalFormat.g:17484:1: rule__XForLoopExpression__Group_0__0__Impl : ( ( rule__XForLoopExpression__Group_0_0__0 ) ) ;
     public final void rule__XForLoopExpression__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17488:1: ( ( ( rule__XForLoopExpression__Group_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17489:1: ( ( rule__XForLoopExpression__Group_0_0__0 ) )
+            // InternalFormat.g:17488:1: ( ( ( rule__XForLoopExpression__Group_0_0__0 ) ) )
+            // InternalFormat.g:17489:1: ( ( rule__XForLoopExpression__Group_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17489:1: ( ( rule__XForLoopExpression__Group_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17490:1: ( rule__XForLoopExpression__Group_0_0__0 )
+            // InternalFormat.g:17489:1: ( ( rule__XForLoopExpression__Group_0_0__0 ) )
+            // InternalFormat.g:17490:1: ( rule__XForLoopExpression__Group_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getGroup_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17491:1: ( rule__XForLoopExpression__Group_0_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17491:2: rule__XForLoopExpression__Group_0_0__0
+            // InternalFormat.g:17491:1: ( rule__XForLoopExpression__Group_0_0__0 )
+            // InternalFormat.g:17491:2: rule__XForLoopExpression__Group_0_0__0
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__0_in_rule__XForLoopExpression__Group_0__0__Impl35583);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group_0_0__0();
 
             state._fsp--;
@@ -51226,21 +51226,21 @@ public final void rule__XForLoopExpression__Group_0__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17503:1: rule__XForLoopExpression__Group_0_0__0 : rule__XForLoopExpression__Group_0_0__0__Impl rule__XForLoopExpression__Group_0_0__1 ;
+    // InternalFormat.g:17503:1: rule__XForLoopExpression__Group_0_0__0 : rule__XForLoopExpression__Group_0_0__0__Impl rule__XForLoopExpression__Group_0_0__1 ;
     public final void rule__XForLoopExpression__Group_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17507:1: ( rule__XForLoopExpression__Group_0_0__0__Impl rule__XForLoopExpression__Group_0_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17508:2: rule__XForLoopExpression__Group_0_0__0__Impl rule__XForLoopExpression__Group_0_0__1
+            // InternalFormat.g:17507:1: ( rule__XForLoopExpression__Group_0_0__0__Impl rule__XForLoopExpression__Group_0_0__1 )
+            // InternalFormat.g:17508:2: rule__XForLoopExpression__Group_0_0__0__Impl rule__XForLoopExpression__Group_0_0__1
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__0__Impl_in_rule__XForLoopExpression__Group_0_0__035615);
+            pushFollow(FOLLOW_4);
             rule__XForLoopExpression__Group_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__1_in_rule__XForLoopExpression__Group_0_0__035618);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group_0_0__1();
 
             state._fsp--;
@@ -51264,23 +51264,23 @@ public final void rule__XForLoopExpression__Group_0_0__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17515:1: rule__XForLoopExpression__Group_0_0__0__Impl : ( () ) ;
+    // InternalFormat.g:17515:1: rule__XForLoopExpression__Group_0_0__0__Impl : ( () ) ;
     public final void rule__XForLoopExpression__Group_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17519:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17520:1: ( () )
+            // InternalFormat.g:17519:1: ( ( () ) )
+            // InternalFormat.g:17520:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17520:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17521:1: ()
+            // InternalFormat.g:17520:1: ( () )
+            // InternalFormat.g:17521:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getXForLoopExpressionAction_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17522:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17524:1: 
+            // InternalFormat.g:17522:1: ()
+            // InternalFormat.g:17524:1: 
             {
             }
 
@@ -51305,21 +51305,21 @@ public final void rule__XForLoopExpression__Group_0_0__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17534:1: rule__XForLoopExpression__Group_0_0__1 : rule__XForLoopExpression__Group_0_0__1__Impl rule__XForLoopExpression__Group_0_0__2 ;
+    // InternalFormat.g:17534:1: rule__XForLoopExpression__Group_0_0__1 : rule__XForLoopExpression__Group_0_0__1__Impl rule__XForLoopExpression__Group_0_0__2 ;
     public final void rule__XForLoopExpression__Group_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17538:1: ( rule__XForLoopExpression__Group_0_0__1__Impl rule__XForLoopExpression__Group_0_0__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17539:2: rule__XForLoopExpression__Group_0_0__1__Impl rule__XForLoopExpression__Group_0_0__2
+            // InternalFormat.g:17538:1: ( rule__XForLoopExpression__Group_0_0__1__Impl rule__XForLoopExpression__Group_0_0__2 )
+            // InternalFormat.g:17539:2: rule__XForLoopExpression__Group_0_0__1__Impl rule__XForLoopExpression__Group_0_0__2
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__1__Impl_in_rule__XForLoopExpression__Group_0_0__135676);
+            pushFollow(FOLLOW_45);
             rule__XForLoopExpression__Group_0_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__2_in_rule__XForLoopExpression__Group_0_0__135679);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group_0_0__2();
 
             state._fsp--;
@@ -51343,22 +51343,22 @@ public final void rule__XForLoopExpression__Group_0_0__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17546:1: rule__XForLoopExpression__Group_0_0__1__Impl : ( 'for' ) ;
+    // InternalFormat.g:17546:1: rule__XForLoopExpression__Group_0_0__1__Impl : ( 'for' ) ;
     public final void rule__XForLoopExpression__Group_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17550:1: ( ( 'for' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17551:1: ( 'for' )
+            // InternalFormat.g:17550:1: ( ( 'for' ) )
+            // InternalFormat.g:17551:1: ( 'for' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17551:1: ( 'for' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17552:1: 'for'
+            // InternalFormat.g:17551:1: ( 'for' )
+            // InternalFormat.g:17552:1: 'for'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getForKeyword_0_0_1()); 
             }
-            match(input,62,FOLLOW_62_in_rule__XForLoopExpression__Group_0_0__1__Impl35707); if (state.failed) return ;
+            match(input,62,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXForLoopExpressionAccess().getForKeyword_0_0_1()); 
             }
@@ -51384,21 +51384,21 @@ public final void rule__XForLoopExpression__Group_0_0__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17565:1: rule__XForLoopExpression__Group_0_0__2 : rule__XForLoopExpression__Group_0_0__2__Impl rule__XForLoopExpression__Group_0_0__3 ;
+    // InternalFormat.g:17565:1: rule__XForLoopExpression__Group_0_0__2 : rule__XForLoopExpression__Group_0_0__2__Impl rule__XForLoopExpression__Group_0_0__3 ;
     public final void rule__XForLoopExpression__Group_0_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17569:1: ( rule__XForLoopExpression__Group_0_0__2__Impl rule__XForLoopExpression__Group_0_0__3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17570:2: rule__XForLoopExpression__Group_0_0__2__Impl rule__XForLoopExpression__Group_0_0__3
+            // InternalFormat.g:17569:1: ( rule__XForLoopExpression__Group_0_0__2__Impl rule__XForLoopExpression__Group_0_0__3 )
+            // InternalFormat.g:17570:2: rule__XForLoopExpression__Group_0_0__2__Impl rule__XForLoopExpression__Group_0_0__3
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__2__Impl_in_rule__XForLoopExpression__Group_0_0__235738);
+            pushFollow(FOLLOW_66);
             rule__XForLoopExpression__Group_0_0__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__3_in_rule__XForLoopExpression__Group_0_0__235741);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group_0_0__3();
 
             state._fsp--;
@@ -51422,22 +51422,22 @@ public final void rule__XForLoopExpression__Group_0_0__2() throws RecognitionExc
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17577:1: rule__XForLoopExpression__Group_0_0__2__Impl : ( '(' ) ;
+    // InternalFormat.g:17577:1: rule__XForLoopExpression__Group_0_0__2__Impl : ( '(' ) ;
     public final void rule__XForLoopExpression__Group_0_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17581:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17582:1: ( '(' )
+            // InternalFormat.g:17581:1: ( ( '(' ) )
+            // InternalFormat.g:17582:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17582:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17583:1: '('
+            // InternalFormat.g:17582:1: ( '(' )
+            // InternalFormat.g:17583:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getLeftParenthesisKeyword_0_0_2()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XForLoopExpression__Group_0_0__2__Impl35769); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXForLoopExpressionAccess().getLeftParenthesisKeyword_0_0_2()); 
             }
@@ -51463,21 +51463,21 @@ public final void rule__XForLoopExpression__Group_0_0__2__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17596:1: rule__XForLoopExpression__Group_0_0__3 : rule__XForLoopExpression__Group_0_0__3__Impl rule__XForLoopExpression__Group_0_0__4 ;
+    // InternalFormat.g:17596:1: rule__XForLoopExpression__Group_0_0__3 : rule__XForLoopExpression__Group_0_0__3__Impl rule__XForLoopExpression__Group_0_0__4 ;
     public final void rule__XForLoopExpression__Group_0_0__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17600:1: ( rule__XForLoopExpression__Group_0_0__3__Impl rule__XForLoopExpression__Group_0_0__4 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17601:2: rule__XForLoopExpression__Group_0_0__3__Impl rule__XForLoopExpression__Group_0_0__4
+            // InternalFormat.g:17600:1: ( rule__XForLoopExpression__Group_0_0__3__Impl rule__XForLoopExpression__Group_0_0__4 )
+            // InternalFormat.g:17601:2: rule__XForLoopExpression__Group_0_0__3__Impl rule__XForLoopExpression__Group_0_0__4
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__3__Impl_in_rule__XForLoopExpression__Group_0_0__335800);
+            pushFollow(FOLLOW_24);
             rule__XForLoopExpression__Group_0_0__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__4_in_rule__XForLoopExpression__Group_0_0__335803);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group_0_0__4();
 
             state._fsp--;
@@ -51501,25 +51501,25 @@ public final void rule__XForLoopExpression__Group_0_0__3() throws RecognitionExc
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17608:1: rule__XForLoopExpression__Group_0_0__3__Impl : ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) ) ;
+    // InternalFormat.g:17608:1: rule__XForLoopExpression__Group_0_0__3__Impl : ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) ) ;
     public final void rule__XForLoopExpression__Group_0_0__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17612:1: ( ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17613:1: ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) )
+            // InternalFormat.g:17612:1: ( ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) ) )
+            // InternalFormat.g:17613:1: ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17613:1: ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17614:1: ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 )
+            // InternalFormat.g:17613:1: ( ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 ) )
+            // InternalFormat.g:17614:1: ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getDeclaredParamAssignment_0_0_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17615:1: ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17615:2: rule__XForLoopExpression__DeclaredParamAssignment_0_0_3
+            // InternalFormat.g:17615:1: ( rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 )
+            // InternalFormat.g:17615:2: rule__XForLoopExpression__DeclaredParamAssignment_0_0_3
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__DeclaredParamAssignment_0_0_3_in_rule__XForLoopExpression__Group_0_0__3__Impl35830);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__DeclaredParamAssignment_0_0_3();
 
             state._fsp--;
@@ -51552,16 +51552,16 @@ public final void rule__XForLoopExpression__Group_0_0__3__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__4"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17625:1: rule__XForLoopExpression__Group_0_0__4 : rule__XForLoopExpression__Group_0_0__4__Impl ;
+    // InternalFormat.g:17625:1: rule__XForLoopExpression__Group_0_0__4 : rule__XForLoopExpression__Group_0_0__4__Impl ;
     public final void rule__XForLoopExpression__Group_0_0__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17629:1: ( rule__XForLoopExpression__Group_0_0__4__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17630:2: rule__XForLoopExpression__Group_0_0__4__Impl
+            // InternalFormat.g:17629:1: ( rule__XForLoopExpression__Group_0_0__4__Impl )
+            // InternalFormat.g:17630:2: rule__XForLoopExpression__Group_0_0__4__Impl
             {
-            pushFollow(FOLLOW_rule__XForLoopExpression__Group_0_0__4__Impl_in_rule__XForLoopExpression__Group_0_0__435860);
+            pushFollow(FOLLOW_2);
             rule__XForLoopExpression__Group_0_0__4__Impl();
 
             state._fsp--;
@@ -51585,22 +51585,22 @@ public final void rule__XForLoopExpression__Group_0_0__4() throws RecognitionExc
 
 
     // $ANTLR start "rule__XForLoopExpression__Group_0_0__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17636:1: rule__XForLoopExpression__Group_0_0__4__Impl : ( ':' ) ;
+    // InternalFormat.g:17636:1: rule__XForLoopExpression__Group_0_0__4__Impl : ( ':' ) ;
     public final void rule__XForLoopExpression__Group_0_0__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17640:1: ( ( ':' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17641:1: ( ':' )
+            // InternalFormat.g:17640:1: ( ( ':' ) )
+            // InternalFormat.g:17641:1: ( ':' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17641:1: ( ':' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17642:1: ':'
+            // InternalFormat.g:17641:1: ( ':' )
+            // InternalFormat.g:17642:1: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getColonKeyword_0_0_4()); 
             }
-            match(input,72,FOLLOW_72_in_rule__XForLoopExpression__Group_0_0__4__Impl35888); if (state.failed) return ;
+            match(input,72,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXForLoopExpressionAccess().getColonKeyword_0_0_4()); 
             }
@@ -51626,21 +51626,21 @@ public final void rule__XForLoopExpression__Group_0_0__4__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17665:1: rule__XBasicForLoopExpression__Group__0 : rule__XBasicForLoopExpression__Group__0__Impl rule__XBasicForLoopExpression__Group__1 ;
+    // InternalFormat.g:17665:1: rule__XBasicForLoopExpression__Group__0 : rule__XBasicForLoopExpression__Group__0__Impl rule__XBasicForLoopExpression__Group__1 ;
     public final void rule__XBasicForLoopExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17669:1: ( rule__XBasicForLoopExpression__Group__0__Impl rule__XBasicForLoopExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17670:2: rule__XBasicForLoopExpression__Group__0__Impl rule__XBasicForLoopExpression__Group__1
+            // InternalFormat.g:17669:1: ( rule__XBasicForLoopExpression__Group__0__Impl rule__XBasicForLoopExpression__Group__1 )
+            // InternalFormat.g:17670:2: rule__XBasicForLoopExpression__Group__0__Impl rule__XBasicForLoopExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__0__Impl_in_rule__XBasicForLoopExpression__Group__035929);
+            pushFollow(FOLLOW_4);
             rule__XBasicForLoopExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__1_in_rule__XBasicForLoopExpression__Group__035932);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group__1();
 
             state._fsp--;
@@ -51664,23 +51664,23 @@ public final void rule__XBasicForLoopExpression__Group__0() throws RecognitionEx
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17677:1: rule__XBasicForLoopExpression__Group__0__Impl : ( () ) ;
+    // InternalFormat.g:17677:1: rule__XBasicForLoopExpression__Group__0__Impl : ( () ) ;
     public final void rule__XBasicForLoopExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17681:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17682:1: ( () )
+            // InternalFormat.g:17681:1: ( ( () ) )
+            // InternalFormat.g:17682:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17682:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17683:1: ()
+            // InternalFormat.g:17682:1: ( () )
+            // InternalFormat.g:17683:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getXBasicForLoopExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17684:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17686:1: 
+            // InternalFormat.g:17684:1: ()
+            // InternalFormat.g:17686:1: 
             {
             }
 
@@ -51705,21 +51705,21 @@ public final void rule__XBasicForLoopExpression__Group__0__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17696:1: rule__XBasicForLoopExpression__Group__1 : rule__XBasicForLoopExpression__Group__1__Impl rule__XBasicForLoopExpression__Group__2 ;
+    // InternalFormat.g:17696:1: rule__XBasicForLoopExpression__Group__1 : rule__XBasicForLoopExpression__Group__1__Impl rule__XBasicForLoopExpression__Group__2 ;
     public final void rule__XBasicForLoopExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17700:1: ( rule__XBasicForLoopExpression__Group__1__Impl rule__XBasicForLoopExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17701:2: rule__XBasicForLoopExpression__Group__1__Impl rule__XBasicForLoopExpression__Group__2
+            // InternalFormat.g:17700:1: ( rule__XBasicForLoopExpression__Group__1__Impl rule__XBasicForLoopExpression__Group__2 )
+            // InternalFormat.g:17701:2: rule__XBasicForLoopExpression__Group__1__Impl rule__XBasicForLoopExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__1__Impl_in_rule__XBasicForLoopExpression__Group__135990);
+            pushFollow(FOLLOW_45);
             rule__XBasicForLoopExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__2_in_rule__XBasicForLoopExpression__Group__135993);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group__2();
 
             state._fsp--;
@@ -51743,22 +51743,22 @@ public final void rule__XBasicForLoopExpression__Group__1() throws RecognitionEx
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17708:1: rule__XBasicForLoopExpression__Group__1__Impl : ( 'for' ) ;
+    // InternalFormat.g:17708:1: rule__XBasicForLoopExpression__Group__1__Impl : ( 'for' ) ;
     public final void rule__XBasicForLoopExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17712:1: ( ( 'for' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17713:1: ( 'for' )
+            // InternalFormat.g:17712:1: ( ( 'for' ) )
+            // InternalFormat.g:17713:1: ( 'for' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17713:1: ( 'for' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17714:1: 'for'
+            // InternalFormat.g:17713:1: ( 'for' )
+            // InternalFormat.g:17714:1: 'for'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getForKeyword_1()); 
             }
-            match(input,62,FOLLOW_62_in_rule__XBasicForLoopExpression__Group__1__Impl36021); if (state.failed) return ;
+            match(input,62,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBasicForLoopExpressionAccess().getForKeyword_1()); 
             }
@@ -51784,21 +51784,21 @@ public final void rule__XBasicForLoopExpression__Group__1__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17727:1: rule__XBasicForLoopExpression__Group__2 : rule__XBasicForLoopExpression__Group__2__Impl rule__XBasicForLoopExpression__Group__3 ;
+    // InternalFormat.g:17727:1: rule__XBasicForLoopExpression__Group__2 : rule__XBasicForLoopExpression__Group__2__Impl rule__XBasicForLoopExpression__Group__3 ;
     public final void rule__XBasicForLoopExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17731:1: ( rule__XBasicForLoopExpression__Group__2__Impl rule__XBasicForLoopExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17732:2: rule__XBasicForLoopExpression__Group__2__Impl rule__XBasicForLoopExpression__Group__3
+            // InternalFormat.g:17731:1: ( rule__XBasicForLoopExpression__Group__2__Impl rule__XBasicForLoopExpression__Group__3 )
+            // InternalFormat.g:17732:2: rule__XBasicForLoopExpression__Group__2__Impl rule__XBasicForLoopExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__2__Impl_in_rule__XBasicForLoopExpression__Group__236052);
+            pushFollow(FOLLOW_101);
             rule__XBasicForLoopExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__3_in_rule__XBasicForLoopExpression__Group__236055);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group__3();
 
             state._fsp--;
@@ -51822,22 +51822,22 @@ public final void rule__XBasicForLoopExpression__Group__2() throws RecognitionEx
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17739:1: rule__XBasicForLoopExpression__Group__2__Impl : ( '(' ) ;
+    // InternalFormat.g:17739:1: rule__XBasicForLoopExpression__Group__2__Impl : ( '(' ) ;
     public final void rule__XBasicForLoopExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17743:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17744:1: ( '(' )
+            // InternalFormat.g:17743:1: ( ( '(' ) )
+            // InternalFormat.g:17744:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17744:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17745:1: '('
+            // InternalFormat.g:17744:1: ( '(' )
+            // InternalFormat.g:17745:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getLeftParenthesisKeyword_2()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XBasicForLoopExpression__Group__2__Impl36083); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBasicForLoopExpressionAccess().getLeftParenthesisKeyword_2()); 
             }
@@ -51863,21 +51863,21 @@ public final void rule__XBasicForLoopExpression__Group__2__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17758:1: rule__XBasicForLoopExpression__Group__3 : rule__XBasicForLoopExpression__Group__3__Impl rule__XBasicForLoopExpression__Group__4 ;
+    // InternalFormat.g:17758:1: rule__XBasicForLoopExpression__Group__3 : rule__XBasicForLoopExpression__Group__3__Impl rule__XBasicForLoopExpression__Group__4 ;
     public final void rule__XBasicForLoopExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17762:1: ( rule__XBasicForLoopExpression__Group__3__Impl rule__XBasicForLoopExpression__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17763:2: rule__XBasicForLoopExpression__Group__3__Impl rule__XBasicForLoopExpression__Group__4
+            // InternalFormat.g:17762:1: ( rule__XBasicForLoopExpression__Group__3__Impl rule__XBasicForLoopExpression__Group__4 )
+            // InternalFormat.g:17763:2: rule__XBasicForLoopExpression__Group__3__Impl rule__XBasicForLoopExpression__Group__4
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__3__Impl_in_rule__XBasicForLoopExpression__Group__336114);
+            pushFollow(FOLLOW_101);
             rule__XBasicForLoopExpression__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__4_in_rule__XBasicForLoopExpression__Group__336117);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group__4();
 
             state._fsp--;
@@ -51901,22 +51901,22 @@ public final void rule__XBasicForLoopExpression__Group__3() throws RecognitionEx
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17770:1: rule__XBasicForLoopExpression__Group__3__Impl : ( ( rule__XBasicForLoopExpression__Group_3__0 )? ) ;
+    // InternalFormat.g:17770:1: rule__XBasicForLoopExpression__Group__3__Impl : ( ( rule__XBasicForLoopExpression__Group_3__0 )? ) ;
     public final void rule__XBasicForLoopExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17774:1: ( ( ( rule__XBasicForLoopExpression__Group_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17775:1: ( ( rule__XBasicForLoopExpression__Group_3__0 )? )
+            // InternalFormat.g:17774:1: ( ( ( rule__XBasicForLoopExpression__Group_3__0 )? ) )
+            // InternalFormat.g:17775:1: ( ( rule__XBasicForLoopExpression__Group_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17775:1: ( ( rule__XBasicForLoopExpression__Group_3__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17776:1: ( rule__XBasicForLoopExpression__Group_3__0 )?
+            // InternalFormat.g:17775:1: ( ( rule__XBasicForLoopExpression__Group_3__0 )? )
+            // InternalFormat.g:17776:1: ( rule__XBasicForLoopExpression__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getGroup_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17777:1: ( rule__XBasicForLoopExpression__Group_3__0 )?
+            // InternalFormat.g:17777:1: ( rule__XBasicForLoopExpression__Group_3__0 )?
             int alt137=2;
             int LA137_0 = input.LA(1);
 
@@ -51925,9 +51925,9 @@ public final void rule__XBasicForLoopExpression__Group__3__Impl() throws Recogni
             }
             switch (alt137) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17777:2: rule__XBasicForLoopExpression__Group_3__0
+                    // InternalFormat.g:17777:2: rule__XBasicForLoopExpression__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_3__0_in_rule__XBasicForLoopExpression__Group__3__Impl36144);
+                    pushFollow(FOLLOW_2);
                     rule__XBasicForLoopExpression__Group_3__0();
 
                     state._fsp--;
@@ -51963,21 +51963,21 @@ public final void rule__XBasicForLoopExpression__Group__3__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17787:1: rule__XBasicForLoopExpression__Group__4 : rule__XBasicForLoopExpression__Group__4__Impl rule__XBasicForLoopExpression__Group__5 ;
+    // InternalFormat.g:17787:1: rule__XBasicForLoopExpression__Group__4 : rule__XBasicForLoopExpression__Group__4__Impl rule__XBasicForLoopExpression__Group__5 ;
     public final void rule__XBasicForLoopExpression__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17791:1: ( rule__XBasicForLoopExpression__Group__4__Impl rule__XBasicForLoopExpression__Group__5 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17792:2: rule__XBasicForLoopExpression__Group__4__Impl rule__XBasicForLoopExpression__Group__5
+            // InternalFormat.g:17791:1: ( rule__XBasicForLoopExpression__Group__4__Impl rule__XBasicForLoopExpression__Group__5 )
+            // InternalFormat.g:17792:2: rule__XBasicForLoopExpression__Group__4__Impl rule__XBasicForLoopExpression__Group__5
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__4__Impl_in_rule__XBasicForLoopExpression__Group__436175);
+            pushFollow(FOLLOW_102);
             rule__XBasicForLoopExpression__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__5_in_rule__XBasicForLoopExpression__Group__436178);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group__5();
 
             state._fsp--;
@@ -52001,22 +52001,22 @@ public final void rule__XBasicForLoopExpression__Group__4() throws RecognitionEx
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17799:1: rule__XBasicForLoopExpression__Group__4__Impl : ( ';' ) ;
+    // InternalFormat.g:17799:1: rule__XBasicForLoopExpression__Group__4__Impl : ( ';' ) ;
     public final void rule__XBasicForLoopExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17803:1: ( ( ';' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17804:1: ( ';' )
+            // InternalFormat.g:17803:1: ( ( ';' ) )
+            // InternalFormat.g:17804:1: ( ';' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17804:1: ( ';' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17805:1: ';'
+            // InternalFormat.g:17804:1: ( ';' )
+            // InternalFormat.g:17805:1: ';'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getSemicolonKeyword_4()); 
             }
-            match(input,65,FOLLOW_65_in_rule__XBasicForLoopExpression__Group__4__Impl36206); if (state.failed) return ;
+            match(input,65,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBasicForLoopExpressionAccess().getSemicolonKeyword_4()); 
             }
@@ -52042,21 +52042,21 @@ public final void rule__XBasicForLoopExpression__Group__4__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__5"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17818:1: rule__XBasicForLoopExpression__Group__5 : rule__XBasicForLoopExpression__Group__5__Impl rule__XBasicForLoopExpression__Group__6 ;
+    // InternalFormat.g:17818:1: rule__XBasicForLoopExpression__Group__5 : rule__XBasicForLoopExpression__Group__5__Impl rule__XBasicForLoopExpression__Group__6 ;
     public final void rule__XBasicForLoopExpression__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17822:1: ( rule__XBasicForLoopExpression__Group__5__Impl rule__XBasicForLoopExpression__Group__6 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17823:2: rule__XBasicForLoopExpression__Group__5__Impl rule__XBasicForLoopExpression__Group__6
+            // InternalFormat.g:17822:1: ( rule__XBasicForLoopExpression__Group__5__Impl rule__XBasicForLoopExpression__Group__6 )
+            // InternalFormat.g:17823:2: rule__XBasicForLoopExpression__Group__5__Impl rule__XBasicForLoopExpression__Group__6
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__5__Impl_in_rule__XBasicForLoopExpression__Group__536237);
+            pushFollow(FOLLOW_102);
             rule__XBasicForLoopExpression__Group__5__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__6_in_rule__XBasicForLoopExpression__Group__536240);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group__6();
 
             state._fsp--;
@@ -52080,22 +52080,22 @@ public final void rule__XBasicForLoopExpression__Group__5() throws RecognitionEx
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17830:1: rule__XBasicForLoopExpression__Group__5__Impl : ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? ) ;
+    // InternalFormat.g:17830:1: rule__XBasicForLoopExpression__Group__5__Impl : ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? ) ;
     public final void rule__XBasicForLoopExpression__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17834:1: ( ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17835:1: ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? )
+            // InternalFormat.g:17834:1: ( ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? ) )
+            // InternalFormat.g:17835:1: ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17835:1: ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17836:1: ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )?
+            // InternalFormat.g:17835:1: ( ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )? )
+            // InternalFormat.g:17836:1: ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getExpressionAssignment_5()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17837:1: ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )?
+            // InternalFormat.g:17837:1: ( rule__XBasicForLoopExpression__ExpressionAssignment_5 )?
             int alt138=2;
             int LA138_0 = input.LA(1);
 
@@ -52104,9 +52104,9 @@ public final void rule__XBasicForLoopExpression__Group__5__Impl() throws Recogni
             }
             switch (alt138) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17837:2: rule__XBasicForLoopExpression__ExpressionAssignment_5
+                    // InternalFormat.g:17837:2: rule__XBasicForLoopExpression__ExpressionAssignment_5
                     {
-                    pushFollow(FOLLOW_rule__XBasicForLoopExpression__ExpressionAssignment_5_in_rule__XBasicForLoopExpression__Group__5__Impl36267);
+                    pushFollow(FOLLOW_2);
                     rule__XBasicForLoopExpression__ExpressionAssignment_5();
 
                     state._fsp--;
@@ -52142,21 +52142,21 @@ public final void rule__XBasicForLoopExpression__Group__5__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__6"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17847:1: rule__XBasicForLoopExpression__Group__6 : rule__XBasicForLoopExpression__Group__6__Impl rule__XBasicForLoopExpression__Group__7 ;
+    // InternalFormat.g:17847:1: rule__XBasicForLoopExpression__Group__6 : rule__XBasicForLoopExpression__Group__6__Impl rule__XBasicForLoopExpression__Group__7 ;
     public final void rule__XBasicForLoopExpression__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17851:1: ( rule__XBasicForLoopExpression__Group__6__Impl rule__XBasicForLoopExpression__Group__7 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17852:2: rule__XBasicForLoopExpression__Group__6__Impl rule__XBasicForLoopExpression__Group__7
+            // InternalFormat.g:17851:1: ( rule__XBasicForLoopExpression__Group__6__Impl rule__XBasicForLoopExpression__Group__7 )
+            // InternalFormat.g:17852:2: rule__XBasicForLoopExpression__Group__6__Impl rule__XBasicForLoopExpression__Group__7
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__6__Impl_in_rule__XBasicForLoopExpression__Group__636298);
+            pushFollow(FOLLOW_49);
             rule__XBasicForLoopExpression__Group__6__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__7_in_rule__XBasicForLoopExpression__Group__636301);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group__7();
 
             state._fsp--;
@@ -52180,22 +52180,22 @@ public final void rule__XBasicForLoopExpression__Group__6() throws RecognitionEx
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__6__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17859:1: rule__XBasicForLoopExpression__Group__6__Impl : ( ';' ) ;
+    // InternalFormat.g:17859:1: rule__XBasicForLoopExpression__Group__6__Impl : ( ';' ) ;
     public final void rule__XBasicForLoopExpression__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17863:1: ( ( ';' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17864:1: ( ';' )
+            // InternalFormat.g:17863:1: ( ( ';' ) )
+            // InternalFormat.g:17864:1: ( ';' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17864:1: ( ';' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17865:1: ';'
+            // InternalFormat.g:17864:1: ( ';' )
+            // InternalFormat.g:17865:1: ';'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getSemicolonKeyword_6()); 
             }
-            match(input,65,FOLLOW_65_in_rule__XBasicForLoopExpression__Group__6__Impl36329); if (state.failed) return ;
+            match(input,65,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBasicForLoopExpressionAccess().getSemicolonKeyword_6()); 
             }
@@ -52221,21 +52221,21 @@ public final void rule__XBasicForLoopExpression__Group__6__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__7"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17878:1: rule__XBasicForLoopExpression__Group__7 : rule__XBasicForLoopExpression__Group__7__Impl rule__XBasicForLoopExpression__Group__8 ;
+    // InternalFormat.g:17878:1: rule__XBasicForLoopExpression__Group__7 : rule__XBasicForLoopExpression__Group__7__Impl rule__XBasicForLoopExpression__Group__8 ;
     public final void rule__XBasicForLoopExpression__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17882:1: ( rule__XBasicForLoopExpression__Group__7__Impl rule__XBasicForLoopExpression__Group__8 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17883:2: rule__XBasicForLoopExpression__Group__7__Impl rule__XBasicForLoopExpression__Group__8
+            // InternalFormat.g:17882:1: ( rule__XBasicForLoopExpression__Group__7__Impl rule__XBasicForLoopExpression__Group__8 )
+            // InternalFormat.g:17883:2: rule__XBasicForLoopExpression__Group__7__Impl rule__XBasicForLoopExpression__Group__8
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__7__Impl_in_rule__XBasicForLoopExpression__Group__736360);
+            pushFollow(FOLLOW_49);
             rule__XBasicForLoopExpression__Group__7__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__8_in_rule__XBasicForLoopExpression__Group__736363);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group__8();
 
             state._fsp--;
@@ -52259,22 +52259,22 @@ public final void rule__XBasicForLoopExpression__Group__7() throws RecognitionEx
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__7__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17890:1: rule__XBasicForLoopExpression__Group__7__Impl : ( ( rule__XBasicForLoopExpression__Group_7__0 )? ) ;
+    // InternalFormat.g:17890:1: rule__XBasicForLoopExpression__Group__7__Impl : ( ( rule__XBasicForLoopExpression__Group_7__0 )? ) ;
     public final void rule__XBasicForLoopExpression__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17894:1: ( ( ( rule__XBasicForLoopExpression__Group_7__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17895:1: ( ( rule__XBasicForLoopExpression__Group_7__0 )? )
+            // InternalFormat.g:17894:1: ( ( ( rule__XBasicForLoopExpression__Group_7__0 )? ) )
+            // InternalFormat.g:17895:1: ( ( rule__XBasicForLoopExpression__Group_7__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17895:1: ( ( rule__XBasicForLoopExpression__Group_7__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17896:1: ( rule__XBasicForLoopExpression__Group_7__0 )?
+            // InternalFormat.g:17895:1: ( ( rule__XBasicForLoopExpression__Group_7__0 )? )
+            // InternalFormat.g:17896:1: ( rule__XBasicForLoopExpression__Group_7__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getGroup_7()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17897:1: ( rule__XBasicForLoopExpression__Group_7__0 )?
+            // InternalFormat.g:17897:1: ( rule__XBasicForLoopExpression__Group_7__0 )?
             int alt139=2;
             int LA139_0 = input.LA(1);
 
@@ -52283,9 +52283,9 @@ public final void rule__XBasicForLoopExpression__Group__7__Impl() throws Recogni
             }
             switch (alt139) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17897:2: rule__XBasicForLoopExpression__Group_7__0
+                    // InternalFormat.g:17897:2: rule__XBasicForLoopExpression__Group_7__0
                     {
-                    pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_7__0_in_rule__XBasicForLoopExpression__Group__7__Impl36390);
+                    pushFollow(FOLLOW_2);
                     rule__XBasicForLoopExpression__Group_7__0();
 
                     state._fsp--;
@@ -52321,21 +52321,21 @@ public final void rule__XBasicForLoopExpression__Group__7__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__8"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17907:1: rule__XBasicForLoopExpression__Group__8 : rule__XBasicForLoopExpression__Group__8__Impl rule__XBasicForLoopExpression__Group__9 ;
+    // InternalFormat.g:17907:1: rule__XBasicForLoopExpression__Group__8 : rule__XBasicForLoopExpression__Group__8__Impl rule__XBasicForLoopExpression__Group__9 ;
     public final void rule__XBasicForLoopExpression__Group__8() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17911:1: ( rule__XBasicForLoopExpression__Group__8__Impl rule__XBasicForLoopExpression__Group__9 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17912:2: rule__XBasicForLoopExpression__Group__8__Impl rule__XBasicForLoopExpression__Group__9
+            // InternalFormat.g:17911:1: ( rule__XBasicForLoopExpression__Group__8__Impl rule__XBasicForLoopExpression__Group__9 )
+            // InternalFormat.g:17912:2: rule__XBasicForLoopExpression__Group__8__Impl rule__XBasicForLoopExpression__Group__9
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__8__Impl_in_rule__XBasicForLoopExpression__Group__836421);
+            pushFollow(FOLLOW_50);
             rule__XBasicForLoopExpression__Group__8__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__9_in_rule__XBasicForLoopExpression__Group__836424);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group__9();
 
             state._fsp--;
@@ -52359,22 +52359,22 @@ public final void rule__XBasicForLoopExpression__Group__8() throws RecognitionEx
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__8__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17919:1: rule__XBasicForLoopExpression__Group__8__Impl : ( ')' ) ;
+    // InternalFormat.g:17919:1: rule__XBasicForLoopExpression__Group__8__Impl : ( ')' ) ;
     public final void rule__XBasicForLoopExpression__Group__8__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17923:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17924:1: ( ')' )
+            // InternalFormat.g:17923:1: ( ( ')' ) )
+            // InternalFormat.g:17924:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17924:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17925:1: ')'
+            // InternalFormat.g:17924:1: ( ')' )
+            // InternalFormat.g:17925:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getRightParenthesisKeyword_8()); 
             }
-            match(input,75,FOLLOW_75_in_rule__XBasicForLoopExpression__Group__8__Impl36452); if (state.failed) return ;
+            match(input,75,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBasicForLoopExpressionAccess().getRightParenthesisKeyword_8()); 
             }
@@ -52400,16 +52400,16 @@ public final void rule__XBasicForLoopExpression__Group__8__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__9"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17938:1: rule__XBasicForLoopExpression__Group__9 : rule__XBasicForLoopExpression__Group__9__Impl ;
+    // InternalFormat.g:17938:1: rule__XBasicForLoopExpression__Group__9 : rule__XBasicForLoopExpression__Group__9__Impl ;
     public final void rule__XBasicForLoopExpression__Group__9() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17942:1: ( rule__XBasicForLoopExpression__Group__9__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17943:2: rule__XBasicForLoopExpression__Group__9__Impl
+            // InternalFormat.g:17942:1: ( rule__XBasicForLoopExpression__Group__9__Impl )
+            // InternalFormat.g:17943:2: rule__XBasicForLoopExpression__Group__9__Impl
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group__9__Impl_in_rule__XBasicForLoopExpression__Group__936483);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group__9__Impl();
 
             state._fsp--;
@@ -52433,25 +52433,25 @@ public final void rule__XBasicForLoopExpression__Group__9() throws RecognitionEx
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group__9__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17949:1: rule__XBasicForLoopExpression__Group__9__Impl : ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) ) ;
+    // InternalFormat.g:17949:1: rule__XBasicForLoopExpression__Group__9__Impl : ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) ) ;
     public final void rule__XBasicForLoopExpression__Group__9__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17953:1: ( ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17954:1: ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) )
+            // InternalFormat.g:17953:1: ( ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) ) )
+            // InternalFormat.g:17954:1: ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17954:1: ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17955:1: ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 )
+            // InternalFormat.g:17954:1: ( ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 ) )
+            // InternalFormat.g:17955:1: ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getEachExpressionAssignment_9()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17956:1: ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17956:2: rule__XBasicForLoopExpression__EachExpressionAssignment_9
+            // InternalFormat.g:17956:1: ( rule__XBasicForLoopExpression__EachExpressionAssignment_9 )
+            // InternalFormat.g:17956:2: rule__XBasicForLoopExpression__EachExpressionAssignment_9
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__EachExpressionAssignment_9_in_rule__XBasicForLoopExpression__Group__9__Impl36510);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__EachExpressionAssignment_9();
 
             state._fsp--;
@@ -52484,21 +52484,21 @@ public final void rule__XBasicForLoopExpression__Group__9__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17986:1: rule__XBasicForLoopExpression__Group_3__0 : rule__XBasicForLoopExpression__Group_3__0__Impl rule__XBasicForLoopExpression__Group_3__1 ;
+    // InternalFormat.g:17986:1: rule__XBasicForLoopExpression__Group_3__0 : rule__XBasicForLoopExpression__Group_3__0__Impl rule__XBasicForLoopExpression__Group_3__1 ;
     public final void rule__XBasicForLoopExpression__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17990:1: ( rule__XBasicForLoopExpression__Group_3__0__Impl rule__XBasicForLoopExpression__Group_3__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17991:2: rule__XBasicForLoopExpression__Group_3__0__Impl rule__XBasicForLoopExpression__Group_3__1
+            // InternalFormat.g:17990:1: ( rule__XBasicForLoopExpression__Group_3__0__Impl rule__XBasicForLoopExpression__Group_3__1 )
+            // InternalFormat.g:17991:2: rule__XBasicForLoopExpression__Group_3__0__Impl rule__XBasicForLoopExpression__Group_3__1
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_3__0__Impl_in_rule__XBasicForLoopExpression__Group_3__036560);
+            pushFollow(FOLLOW_46);
             rule__XBasicForLoopExpression__Group_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_3__1_in_rule__XBasicForLoopExpression__Group_3__036563);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group_3__1();
 
             state._fsp--;
@@ -52522,25 +52522,25 @@ public final void rule__XBasicForLoopExpression__Group_3__0() throws Recognition
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:17998:1: rule__XBasicForLoopExpression__Group_3__0__Impl : ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) ) ;
+    // InternalFormat.g:17998:1: rule__XBasicForLoopExpression__Group_3__0__Impl : ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) ) ;
     public final void rule__XBasicForLoopExpression__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18002:1: ( ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18003:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) )
+            // InternalFormat.g:18002:1: ( ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) ) )
+            // InternalFormat.g:18003:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18003:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18004:1: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 )
+            // InternalFormat.g:18003:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 ) )
+            // InternalFormat.g:18004:1: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getInitExpressionsAssignment_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18005:1: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18005:2: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0
+            // InternalFormat.g:18005:1: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 )
+            // InternalFormat.g:18005:2: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0_in_rule__XBasicForLoopExpression__Group_3__0__Impl36590);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0();
 
             state._fsp--;
@@ -52573,16 +52573,16 @@ public final void rule__XBasicForLoopExpression__Group_3__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18015:1: rule__XBasicForLoopExpression__Group_3__1 : rule__XBasicForLoopExpression__Group_3__1__Impl ;
+    // InternalFormat.g:18015:1: rule__XBasicForLoopExpression__Group_3__1 : rule__XBasicForLoopExpression__Group_3__1__Impl ;
     public final void rule__XBasicForLoopExpression__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18019:1: ( rule__XBasicForLoopExpression__Group_3__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18020:2: rule__XBasicForLoopExpression__Group_3__1__Impl
+            // InternalFormat.g:18019:1: ( rule__XBasicForLoopExpression__Group_3__1__Impl )
+            // InternalFormat.g:18020:2: rule__XBasicForLoopExpression__Group_3__1__Impl
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_3__1__Impl_in_rule__XBasicForLoopExpression__Group_3__136620);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group_3__1__Impl();
 
             state._fsp--;
@@ -52606,22 +52606,22 @@ public final void rule__XBasicForLoopExpression__Group_3__1() throws Recognition
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18026:1: rule__XBasicForLoopExpression__Group_3__1__Impl : ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* ) ;
+    // InternalFormat.g:18026:1: rule__XBasicForLoopExpression__Group_3__1__Impl : ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* ) ;
     public final void rule__XBasicForLoopExpression__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18030:1: ( ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18031:1: ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* )
+            // InternalFormat.g:18030:1: ( ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* ) )
+            // InternalFormat.g:18031:1: ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18031:1: ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18032:1: ( rule__XBasicForLoopExpression__Group_3_1__0 )*
+            // InternalFormat.g:18031:1: ( ( rule__XBasicForLoopExpression__Group_3_1__0 )* )
+            // InternalFormat.g:18032:1: ( rule__XBasicForLoopExpression__Group_3_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getGroup_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18033:1: ( rule__XBasicForLoopExpression__Group_3_1__0 )*
+            // InternalFormat.g:18033:1: ( rule__XBasicForLoopExpression__Group_3_1__0 )*
             loop140:
             do {
                 int alt140=2;
@@ -52634,9 +52634,9 @@ public final void rule__XBasicForLoopExpression__Group_3__1__Impl() throws Recog
 
                 switch (alt140) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18033:2: rule__XBasicForLoopExpression__Group_3_1__0
+            	    // InternalFormat.g:18033:2: rule__XBasicForLoopExpression__Group_3_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_3_1__0_in_rule__XBasicForLoopExpression__Group_3__1__Impl36647);
+            	    pushFollow(FOLLOW_23);
             	    rule__XBasicForLoopExpression__Group_3_1__0();
 
             	    state._fsp--;
@@ -52675,21 +52675,21 @@ public final void rule__XBasicForLoopExpression__Group_3__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18047:1: rule__XBasicForLoopExpression__Group_3_1__0 : rule__XBasicForLoopExpression__Group_3_1__0__Impl rule__XBasicForLoopExpression__Group_3_1__1 ;
+    // InternalFormat.g:18047:1: rule__XBasicForLoopExpression__Group_3_1__0 : rule__XBasicForLoopExpression__Group_3_1__0__Impl rule__XBasicForLoopExpression__Group_3_1__1 ;
     public final void rule__XBasicForLoopExpression__Group_3_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18051:1: ( rule__XBasicForLoopExpression__Group_3_1__0__Impl rule__XBasicForLoopExpression__Group_3_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18052:2: rule__XBasicForLoopExpression__Group_3_1__0__Impl rule__XBasicForLoopExpression__Group_3_1__1
+            // InternalFormat.g:18051:1: ( rule__XBasicForLoopExpression__Group_3_1__0__Impl rule__XBasicForLoopExpression__Group_3_1__1 )
+            // InternalFormat.g:18052:2: rule__XBasicForLoopExpression__Group_3_1__0__Impl rule__XBasicForLoopExpression__Group_3_1__1
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_3_1__0__Impl_in_rule__XBasicForLoopExpression__Group_3_1__036682);
+            pushFollow(FOLLOW_103);
             rule__XBasicForLoopExpression__Group_3_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_3_1__1_in_rule__XBasicForLoopExpression__Group_3_1__036685);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group_3_1__1();
 
             state._fsp--;
@@ -52713,22 +52713,22 @@ public final void rule__XBasicForLoopExpression__Group_3_1__0() throws Recogniti
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18059:1: rule__XBasicForLoopExpression__Group_3_1__0__Impl : ( ',' ) ;
+    // InternalFormat.g:18059:1: rule__XBasicForLoopExpression__Group_3_1__0__Impl : ( ',' ) ;
     public final void rule__XBasicForLoopExpression__Group_3_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18063:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18064:1: ( ',' )
+            // InternalFormat.g:18063:1: ( ( ',' ) )
+            // InternalFormat.g:18064:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18064:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18065:1: ','
+            // InternalFormat.g:18064:1: ( ',' )
+            // InternalFormat.g:18065:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getCommaKeyword_3_1_0()); 
             }
-            match(input,71,FOLLOW_71_in_rule__XBasicForLoopExpression__Group_3_1__0__Impl36713); if (state.failed) return ;
+            match(input,71,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBasicForLoopExpressionAccess().getCommaKeyword_3_1_0()); 
             }
@@ -52754,16 +52754,16 @@ public final void rule__XBasicForLoopExpression__Group_3_1__0__Impl() throws Rec
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18078:1: rule__XBasicForLoopExpression__Group_3_1__1 : rule__XBasicForLoopExpression__Group_3_1__1__Impl ;
+    // InternalFormat.g:18078:1: rule__XBasicForLoopExpression__Group_3_1__1 : rule__XBasicForLoopExpression__Group_3_1__1__Impl ;
     public final void rule__XBasicForLoopExpression__Group_3_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18082:1: ( rule__XBasicForLoopExpression__Group_3_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18083:2: rule__XBasicForLoopExpression__Group_3_1__1__Impl
+            // InternalFormat.g:18082:1: ( rule__XBasicForLoopExpression__Group_3_1__1__Impl )
+            // InternalFormat.g:18083:2: rule__XBasicForLoopExpression__Group_3_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_3_1__1__Impl_in_rule__XBasicForLoopExpression__Group_3_1__136744);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group_3_1__1__Impl();
 
             state._fsp--;
@@ -52787,25 +52787,25 @@ public final void rule__XBasicForLoopExpression__Group_3_1__1() throws Recogniti
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_3_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18089:1: rule__XBasicForLoopExpression__Group_3_1__1__Impl : ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) ) ;
+    // InternalFormat.g:18089:1: rule__XBasicForLoopExpression__Group_3_1__1__Impl : ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) ) ;
     public final void rule__XBasicForLoopExpression__Group_3_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18093:1: ( ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18094:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) )
+            // InternalFormat.g:18093:1: ( ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) ) )
+            // InternalFormat.g:18094:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18094:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18095:1: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 )
+            // InternalFormat.g:18094:1: ( ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 ) )
+            // InternalFormat.g:18095:1: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getInitExpressionsAssignment_3_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18096:1: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18096:2: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1
+            // InternalFormat.g:18096:1: ( rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 )
+            // InternalFormat.g:18096:2: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1_in_rule__XBasicForLoopExpression__Group_3_1__1__Impl36771);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1();
 
             state._fsp--;
@@ -52838,21 +52838,21 @@ public final void rule__XBasicForLoopExpression__Group_3_1__1__Impl() throws Rec
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18110:1: rule__XBasicForLoopExpression__Group_7__0 : rule__XBasicForLoopExpression__Group_7__0__Impl rule__XBasicForLoopExpression__Group_7__1 ;
+    // InternalFormat.g:18110:1: rule__XBasicForLoopExpression__Group_7__0 : rule__XBasicForLoopExpression__Group_7__0__Impl rule__XBasicForLoopExpression__Group_7__1 ;
     public final void rule__XBasicForLoopExpression__Group_7__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18114:1: ( rule__XBasicForLoopExpression__Group_7__0__Impl rule__XBasicForLoopExpression__Group_7__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18115:2: rule__XBasicForLoopExpression__Group_7__0__Impl rule__XBasicForLoopExpression__Group_7__1
+            // InternalFormat.g:18114:1: ( rule__XBasicForLoopExpression__Group_7__0__Impl rule__XBasicForLoopExpression__Group_7__1 )
+            // InternalFormat.g:18115:2: rule__XBasicForLoopExpression__Group_7__0__Impl rule__XBasicForLoopExpression__Group_7__1
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_7__0__Impl_in_rule__XBasicForLoopExpression__Group_7__036805);
+            pushFollow(FOLLOW_46);
             rule__XBasicForLoopExpression__Group_7__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_7__1_in_rule__XBasicForLoopExpression__Group_7__036808);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group_7__1();
 
             state._fsp--;
@@ -52876,25 +52876,25 @@ public final void rule__XBasicForLoopExpression__Group_7__0() throws Recognition
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18122:1: rule__XBasicForLoopExpression__Group_7__0__Impl : ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) ) ;
+    // InternalFormat.g:18122:1: rule__XBasicForLoopExpression__Group_7__0__Impl : ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) ) ;
     public final void rule__XBasicForLoopExpression__Group_7__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18126:1: ( ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18127:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) )
+            // InternalFormat.g:18126:1: ( ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) ) )
+            // InternalFormat.g:18127:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18127:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18128:1: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 )
+            // InternalFormat.g:18127:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 ) )
+            // InternalFormat.g:18128:1: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getUpdateExpressionsAssignment_7_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18129:1: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18129:2: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0
+            // InternalFormat.g:18129:1: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 )
+            // InternalFormat.g:18129:2: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0_in_rule__XBasicForLoopExpression__Group_7__0__Impl36835);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0();
 
             state._fsp--;
@@ -52927,16 +52927,16 @@ public final void rule__XBasicForLoopExpression__Group_7__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18139:1: rule__XBasicForLoopExpression__Group_7__1 : rule__XBasicForLoopExpression__Group_7__1__Impl ;
+    // InternalFormat.g:18139:1: rule__XBasicForLoopExpression__Group_7__1 : rule__XBasicForLoopExpression__Group_7__1__Impl ;
     public final void rule__XBasicForLoopExpression__Group_7__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18143:1: ( rule__XBasicForLoopExpression__Group_7__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18144:2: rule__XBasicForLoopExpression__Group_7__1__Impl
+            // InternalFormat.g:18143:1: ( rule__XBasicForLoopExpression__Group_7__1__Impl )
+            // InternalFormat.g:18144:2: rule__XBasicForLoopExpression__Group_7__1__Impl
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_7__1__Impl_in_rule__XBasicForLoopExpression__Group_7__136865);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group_7__1__Impl();
 
             state._fsp--;
@@ -52960,22 +52960,22 @@ public final void rule__XBasicForLoopExpression__Group_7__1() throws Recognition
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18150:1: rule__XBasicForLoopExpression__Group_7__1__Impl : ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* ) ;
+    // InternalFormat.g:18150:1: rule__XBasicForLoopExpression__Group_7__1__Impl : ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* ) ;
     public final void rule__XBasicForLoopExpression__Group_7__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18154:1: ( ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18155:1: ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* )
+            // InternalFormat.g:18154:1: ( ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* ) )
+            // InternalFormat.g:18155:1: ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18155:1: ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18156:1: ( rule__XBasicForLoopExpression__Group_7_1__0 )*
+            // InternalFormat.g:18155:1: ( ( rule__XBasicForLoopExpression__Group_7_1__0 )* )
+            // InternalFormat.g:18156:1: ( rule__XBasicForLoopExpression__Group_7_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getGroup_7_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18157:1: ( rule__XBasicForLoopExpression__Group_7_1__0 )*
+            // InternalFormat.g:18157:1: ( rule__XBasicForLoopExpression__Group_7_1__0 )*
             loop141:
             do {
                 int alt141=2;
@@ -52988,9 +52988,9 @@ public final void rule__XBasicForLoopExpression__Group_7__1__Impl() throws Recog
 
                 switch (alt141) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18157:2: rule__XBasicForLoopExpression__Group_7_1__0
+            	    // InternalFormat.g:18157:2: rule__XBasicForLoopExpression__Group_7_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_7_1__0_in_rule__XBasicForLoopExpression__Group_7__1__Impl36892);
+            	    pushFollow(FOLLOW_23);
             	    rule__XBasicForLoopExpression__Group_7_1__0();
 
             	    state._fsp--;
@@ -53029,21 +53029,21 @@ public final void rule__XBasicForLoopExpression__Group_7__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18171:1: rule__XBasicForLoopExpression__Group_7_1__0 : rule__XBasicForLoopExpression__Group_7_1__0__Impl rule__XBasicForLoopExpression__Group_7_1__1 ;
+    // InternalFormat.g:18171:1: rule__XBasicForLoopExpression__Group_7_1__0 : rule__XBasicForLoopExpression__Group_7_1__0__Impl rule__XBasicForLoopExpression__Group_7_1__1 ;
     public final void rule__XBasicForLoopExpression__Group_7_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18175:1: ( rule__XBasicForLoopExpression__Group_7_1__0__Impl rule__XBasicForLoopExpression__Group_7_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18176:2: rule__XBasicForLoopExpression__Group_7_1__0__Impl rule__XBasicForLoopExpression__Group_7_1__1
+            // InternalFormat.g:18175:1: ( rule__XBasicForLoopExpression__Group_7_1__0__Impl rule__XBasicForLoopExpression__Group_7_1__1 )
+            // InternalFormat.g:18176:2: rule__XBasicForLoopExpression__Group_7_1__0__Impl rule__XBasicForLoopExpression__Group_7_1__1
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_7_1__0__Impl_in_rule__XBasicForLoopExpression__Group_7_1__036927);
+            pushFollow(FOLLOW_50);
             rule__XBasicForLoopExpression__Group_7_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_7_1__1_in_rule__XBasicForLoopExpression__Group_7_1__036930);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group_7_1__1();
 
             state._fsp--;
@@ -53067,22 +53067,22 @@ public final void rule__XBasicForLoopExpression__Group_7_1__0() throws Recogniti
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18183:1: rule__XBasicForLoopExpression__Group_7_1__0__Impl : ( ',' ) ;
+    // InternalFormat.g:18183:1: rule__XBasicForLoopExpression__Group_7_1__0__Impl : ( ',' ) ;
     public final void rule__XBasicForLoopExpression__Group_7_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18187:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18188:1: ( ',' )
+            // InternalFormat.g:18187:1: ( ( ',' ) )
+            // InternalFormat.g:18188:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18188:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18189:1: ','
+            // InternalFormat.g:18188:1: ( ',' )
+            // InternalFormat.g:18189:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getCommaKeyword_7_1_0()); 
             }
-            match(input,71,FOLLOW_71_in_rule__XBasicForLoopExpression__Group_7_1__0__Impl36958); if (state.failed) return ;
+            match(input,71,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBasicForLoopExpressionAccess().getCommaKeyword_7_1_0()); 
             }
@@ -53108,16 +53108,16 @@ public final void rule__XBasicForLoopExpression__Group_7_1__0__Impl() throws Rec
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18202:1: rule__XBasicForLoopExpression__Group_7_1__1 : rule__XBasicForLoopExpression__Group_7_1__1__Impl ;
+    // InternalFormat.g:18202:1: rule__XBasicForLoopExpression__Group_7_1__1 : rule__XBasicForLoopExpression__Group_7_1__1__Impl ;
     public final void rule__XBasicForLoopExpression__Group_7_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18206:1: ( rule__XBasicForLoopExpression__Group_7_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18207:2: rule__XBasicForLoopExpression__Group_7_1__1__Impl
+            // InternalFormat.g:18206:1: ( rule__XBasicForLoopExpression__Group_7_1__1__Impl )
+            // InternalFormat.g:18207:2: rule__XBasicForLoopExpression__Group_7_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__Group_7_1__1__Impl_in_rule__XBasicForLoopExpression__Group_7_1__136989);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__Group_7_1__1__Impl();
 
             state._fsp--;
@@ -53141,25 +53141,25 @@ public final void rule__XBasicForLoopExpression__Group_7_1__1() throws Recogniti
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__Group_7_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18213:1: rule__XBasicForLoopExpression__Group_7_1__1__Impl : ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) ) ;
+    // InternalFormat.g:18213:1: rule__XBasicForLoopExpression__Group_7_1__1__Impl : ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) ) ;
     public final void rule__XBasicForLoopExpression__Group_7_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18217:1: ( ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18218:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) )
+            // InternalFormat.g:18217:1: ( ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) ) )
+            // InternalFormat.g:18218:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18218:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18219:1: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 )
+            // InternalFormat.g:18218:1: ( ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 ) )
+            // InternalFormat.g:18219:1: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getUpdateExpressionsAssignment_7_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18220:1: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18220:2: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1
+            // InternalFormat.g:18220:1: ( rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 )
+            // InternalFormat.g:18220:2: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1
             {
-            pushFollow(FOLLOW_rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1_in_rule__XBasicForLoopExpression__Group_7_1__1__Impl37016);
+            pushFollow(FOLLOW_2);
             rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1();
 
             state._fsp--;
@@ -53192,21 +53192,21 @@ public final void rule__XBasicForLoopExpression__Group_7_1__1__Impl() throws Rec
 
 
     // $ANTLR start "rule__XWhileExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18234:1: rule__XWhileExpression__Group__0 : rule__XWhileExpression__Group__0__Impl rule__XWhileExpression__Group__1 ;
+    // InternalFormat.g:18234:1: rule__XWhileExpression__Group__0 : rule__XWhileExpression__Group__0__Impl rule__XWhileExpression__Group__1 ;
     public final void rule__XWhileExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18238:1: ( rule__XWhileExpression__Group__0__Impl rule__XWhileExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18239:2: rule__XWhileExpression__Group__0__Impl rule__XWhileExpression__Group__1
+            // InternalFormat.g:18238:1: ( rule__XWhileExpression__Group__0__Impl rule__XWhileExpression__Group__1 )
+            // InternalFormat.g:18239:2: rule__XWhileExpression__Group__0__Impl rule__XWhileExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__0__Impl_in_rule__XWhileExpression__Group__037050);
+            pushFollow(FOLLOW_104);
             rule__XWhileExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__1_in_rule__XWhileExpression__Group__037053);
+            pushFollow(FOLLOW_2);
             rule__XWhileExpression__Group__1();
 
             state._fsp--;
@@ -53230,23 +53230,23 @@ public final void rule__XWhileExpression__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XWhileExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18246:1: rule__XWhileExpression__Group__0__Impl : ( () ) ;
+    // InternalFormat.g:18246:1: rule__XWhileExpression__Group__0__Impl : ( () ) ;
     public final void rule__XWhileExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18250:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18251:1: ( () )
+            // InternalFormat.g:18250:1: ( ( () ) )
+            // InternalFormat.g:18251:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18251:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18252:1: ()
+            // InternalFormat.g:18251:1: ( () )
+            // InternalFormat.g:18252:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getXWhileExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18253:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18255:1: 
+            // InternalFormat.g:18253:1: ()
+            // InternalFormat.g:18255:1: 
             {
             }
 
@@ -53271,21 +53271,21 @@ public final void rule__XWhileExpression__Group__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XWhileExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18265:1: rule__XWhileExpression__Group__1 : rule__XWhileExpression__Group__1__Impl rule__XWhileExpression__Group__2 ;
+    // InternalFormat.g:18265:1: rule__XWhileExpression__Group__1 : rule__XWhileExpression__Group__1__Impl rule__XWhileExpression__Group__2 ;
     public final void rule__XWhileExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18269:1: ( rule__XWhileExpression__Group__1__Impl rule__XWhileExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18270:2: rule__XWhileExpression__Group__1__Impl rule__XWhileExpression__Group__2
+            // InternalFormat.g:18269:1: ( rule__XWhileExpression__Group__1__Impl rule__XWhileExpression__Group__2 )
+            // InternalFormat.g:18270:2: rule__XWhileExpression__Group__1__Impl rule__XWhileExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__1__Impl_in_rule__XWhileExpression__Group__137111);
+            pushFollow(FOLLOW_45);
             rule__XWhileExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__2_in_rule__XWhileExpression__Group__137114);
+            pushFollow(FOLLOW_2);
             rule__XWhileExpression__Group__2();
 
             state._fsp--;
@@ -53309,22 +53309,22 @@ public final void rule__XWhileExpression__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XWhileExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18277:1: rule__XWhileExpression__Group__1__Impl : ( 'while' ) ;
+    // InternalFormat.g:18277:1: rule__XWhileExpression__Group__1__Impl : ( 'while' ) ;
     public final void rule__XWhileExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18281:1: ( ( 'while' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18282:1: ( 'while' )
+            // InternalFormat.g:18281:1: ( ( 'while' ) )
+            // InternalFormat.g:18282:1: ( 'while' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18282:1: ( 'while' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18283:1: 'while'
+            // InternalFormat.g:18282:1: ( 'while' )
+            // InternalFormat.g:18283:1: 'while'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getWhileKeyword_1()); 
             }
-            match(input,91,FOLLOW_91_in_rule__XWhileExpression__Group__1__Impl37142); if (state.failed) return ;
+            match(input,91,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXWhileExpressionAccess().getWhileKeyword_1()); 
             }
@@ -53350,21 +53350,21 @@ public final void rule__XWhileExpression__Group__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XWhileExpression__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18296:1: rule__XWhileExpression__Group__2 : rule__XWhileExpression__Group__2__Impl rule__XWhileExpression__Group__3 ;
+    // InternalFormat.g:18296:1: rule__XWhileExpression__Group__2 : rule__XWhileExpression__Group__2__Impl rule__XWhileExpression__Group__3 ;
     public final void rule__XWhileExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18300:1: ( rule__XWhileExpression__Group__2__Impl rule__XWhileExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18301:2: rule__XWhileExpression__Group__2__Impl rule__XWhileExpression__Group__3
+            // InternalFormat.g:18300:1: ( rule__XWhileExpression__Group__2__Impl rule__XWhileExpression__Group__3 )
+            // InternalFormat.g:18301:2: rule__XWhileExpression__Group__2__Impl rule__XWhileExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__2__Impl_in_rule__XWhileExpression__Group__237173);
+            pushFollow(FOLLOW_50);
             rule__XWhileExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__3_in_rule__XWhileExpression__Group__237176);
+            pushFollow(FOLLOW_2);
             rule__XWhileExpression__Group__3();
 
             state._fsp--;
@@ -53388,22 +53388,22 @@ public final void rule__XWhileExpression__Group__2() throws RecognitionException
 
 
     // $ANTLR start "rule__XWhileExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18308:1: rule__XWhileExpression__Group__2__Impl : ( '(' ) ;
+    // InternalFormat.g:18308:1: rule__XWhileExpression__Group__2__Impl : ( '(' ) ;
     public final void rule__XWhileExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18312:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18313:1: ( '(' )
+            // InternalFormat.g:18312:1: ( ( '(' ) )
+            // InternalFormat.g:18313:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18313:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18314:1: '('
+            // InternalFormat.g:18313:1: ( '(' )
+            // InternalFormat.g:18314:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getLeftParenthesisKeyword_2()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XWhileExpression__Group__2__Impl37204); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXWhileExpressionAccess().getLeftParenthesisKeyword_2()); 
             }
@@ -53429,21 +53429,21 @@ public final void rule__XWhileExpression__Group__2__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XWhileExpression__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18327:1: rule__XWhileExpression__Group__3 : rule__XWhileExpression__Group__3__Impl rule__XWhileExpression__Group__4 ;
+    // InternalFormat.g:18327:1: rule__XWhileExpression__Group__3 : rule__XWhileExpression__Group__3__Impl rule__XWhileExpression__Group__4 ;
     public final void rule__XWhileExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18331:1: ( rule__XWhileExpression__Group__3__Impl rule__XWhileExpression__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18332:2: rule__XWhileExpression__Group__3__Impl rule__XWhileExpression__Group__4
+            // InternalFormat.g:18331:1: ( rule__XWhileExpression__Group__3__Impl rule__XWhileExpression__Group__4 )
+            // InternalFormat.g:18332:2: rule__XWhileExpression__Group__3__Impl rule__XWhileExpression__Group__4
             {
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__3__Impl_in_rule__XWhileExpression__Group__337235);
+            pushFollow(FOLLOW_33);
             rule__XWhileExpression__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__4_in_rule__XWhileExpression__Group__337238);
+            pushFollow(FOLLOW_2);
             rule__XWhileExpression__Group__4();
 
             state._fsp--;
@@ -53467,25 +53467,25 @@ public final void rule__XWhileExpression__Group__3() throws RecognitionException
 
 
     // $ANTLR start "rule__XWhileExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18339:1: rule__XWhileExpression__Group__3__Impl : ( ( rule__XWhileExpression__PredicateAssignment_3 ) ) ;
+    // InternalFormat.g:18339:1: rule__XWhileExpression__Group__3__Impl : ( ( rule__XWhileExpression__PredicateAssignment_3 ) ) ;
     public final void rule__XWhileExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18343:1: ( ( ( rule__XWhileExpression__PredicateAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18344:1: ( ( rule__XWhileExpression__PredicateAssignment_3 ) )
+            // InternalFormat.g:18343:1: ( ( ( rule__XWhileExpression__PredicateAssignment_3 ) ) )
+            // InternalFormat.g:18344:1: ( ( rule__XWhileExpression__PredicateAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18344:1: ( ( rule__XWhileExpression__PredicateAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18345:1: ( rule__XWhileExpression__PredicateAssignment_3 )
+            // InternalFormat.g:18344:1: ( ( rule__XWhileExpression__PredicateAssignment_3 ) )
+            // InternalFormat.g:18345:1: ( rule__XWhileExpression__PredicateAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getPredicateAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18346:1: ( rule__XWhileExpression__PredicateAssignment_3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18346:2: rule__XWhileExpression__PredicateAssignment_3
+            // InternalFormat.g:18346:1: ( rule__XWhileExpression__PredicateAssignment_3 )
+            // InternalFormat.g:18346:2: rule__XWhileExpression__PredicateAssignment_3
             {
-            pushFollow(FOLLOW_rule__XWhileExpression__PredicateAssignment_3_in_rule__XWhileExpression__Group__3__Impl37265);
+            pushFollow(FOLLOW_2);
             rule__XWhileExpression__PredicateAssignment_3();
 
             state._fsp--;
@@ -53518,21 +53518,21 @@ public final void rule__XWhileExpression__Group__3__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XWhileExpression__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18356:1: rule__XWhileExpression__Group__4 : rule__XWhileExpression__Group__4__Impl rule__XWhileExpression__Group__5 ;
+    // InternalFormat.g:18356:1: rule__XWhileExpression__Group__4 : rule__XWhileExpression__Group__4__Impl rule__XWhileExpression__Group__5 ;
     public final void rule__XWhileExpression__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18360:1: ( rule__XWhileExpression__Group__4__Impl rule__XWhileExpression__Group__5 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18361:2: rule__XWhileExpression__Group__4__Impl rule__XWhileExpression__Group__5
+            // InternalFormat.g:18360:1: ( rule__XWhileExpression__Group__4__Impl rule__XWhileExpression__Group__5 )
+            // InternalFormat.g:18361:2: rule__XWhileExpression__Group__4__Impl rule__XWhileExpression__Group__5
             {
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__4__Impl_in_rule__XWhileExpression__Group__437295);
+            pushFollow(FOLLOW_50);
             rule__XWhileExpression__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__5_in_rule__XWhileExpression__Group__437298);
+            pushFollow(FOLLOW_2);
             rule__XWhileExpression__Group__5();
 
             state._fsp--;
@@ -53556,22 +53556,22 @@ public final void rule__XWhileExpression__Group__4() throws RecognitionException
 
 
     // $ANTLR start "rule__XWhileExpression__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18368:1: rule__XWhileExpression__Group__4__Impl : ( ')' ) ;
+    // InternalFormat.g:18368:1: rule__XWhileExpression__Group__4__Impl : ( ')' ) ;
     public final void rule__XWhileExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18372:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18373:1: ( ')' )
+            // InternalFormat.g:18372:1: ( ( ')' ) )
+            // InternalFormat.g:18373:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18373:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18374:1: ')'
+            // InternalFormat.g:18373:1: ( ')' )
+            // InternalFormat.g:18374:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getRightParenthesisKeyword_4()); 
             }
-            match(input,75,FOLLOW_75_in_rule__XWhileExpression__Group__4__Impl37326); if (state.failed) return ;
+            match(input,75,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXWhileExpressionAccess().getRightParenthesisKeyword_4()); 
             }
@@ -53597,16 +53597,16 @@ public final void rule__XWhileExpression__Group__4__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XWhileExpression__Group__5"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18387:1: rule__XWhileExpression__Group__5 : rule__XWhileExpression__Group__5__Impl ;
+    // InternalFormat.g:18387:1: rule__XWhileExpression__Group__5 : rule__XWhileExpression__Group__5__Impl ;
     public final void rule__XWhileExpression__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18391:1: ( rule__XWhileExpression__Group__5__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18392:2: rule__XWhileExpression__Group__5__Impl
+            // InternalFormat.g:18391:1: ( rule__XWhileExpression__Group__5__Impl )
+            // InternalFormat.g:18392:2: rule__XWhileExpression__Group__5__Impl
             {
-            pushFollow(FOLLOW_rule__XWhileExpression__Group__5__Impl_in_rule__XWhileExpression__Group__537357);
+            pushFollow(FOLLOW_2);
             rule__XWhileExpression__Group__5__Impl();
 
             state._fsp--;
@@ -53630,25 +53630,25 @@ public final void rule__XWhileExpression__Group__5() throws RecognitionException
 
 
     // $ANTLR start "rule__XWhileExpression__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18398:1: rule__XWhileExpression__Group__5__Impl : ( ( rule__XWhileExpression__BodyAssignment_5 ) ) ;
+    // InternalFormat.g:18398:1: rule__XWhileExpression__Group__5__Impl : ( ( rule__XWhileExpression__BodyAssignment_5 ) ) ;
     public final void rule__XWhileExpression__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18402:1: ( ( ( rule__XWhileExpression__BodyAssignment_5 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18403:1: ( ( rule__XWhileExpression__BodyAssignment_5 ) )
+            // InternalFormat.g:18402:1: ( ( ( rule__XWhileExpression__BodyAssignment_5 ) ) )
+            // InternalFormat.g:18403:1: ( ( rule__XWhileExpression__BodyAssignment_5 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18403:1: ( ( rule__XWhileExpression__BodyAssignment_5 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18404:1: ( rule__XWhileExpression__BodyAssignment_5 )
+            // InternalFormat.g:18403:1: ( ( rule__XWhileExpression__BodyAssignment_5 ) )
+            // InternalFormat.g:18404:1: ( rule__XWhileExpression__BodyAssignment_5 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getBodyAssignment_5()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18405:1: ( rule__XWhileExpression__BodyAssignment_5 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18405:2: rule__XWhileExpression__BodyAssignment_5
+            // InternalFormat.g:18405:1: ( rule__XWhileExpression__BodyAssignment_5 )
+            // InternalFormat.g:18405:2: rule__XWhileExpression__BodyAssignment_5
             {
-            pushFollow(FOLLOW_rule__XWhileExpression__BodyAssignment_5_in_rule__XWhileExpression__Group__5__Impl37384);
+            pushFollow(FOLLOW_2);
             rule__XWhileExpression__BodyAssignment_5();
 
             state._fsp--;
@@ -53681,21 +53681,21 @@ public final void rule__XWhileExpression__Group__5__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18427:1: rule__XDoWhileExpression__Group__0 : rule__XDoWhileExpression__Group__0__Impl rule__XDoWhileExpression__Group__1 ;
+    // InternalFormat.g:18427:1: rule__XDoWhileExpression__Group__0 : rule__XDoWhileExpression__Group__0__Impl rule__XDoWhileExpression__Group__1 ;
     public final void rule__XDoWhileExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18431:1: ( rule__XDoWhileExpression__Group__0__Impl rule__XDoWhileExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18432:2: rule__XDoWhileExpression__Group__0__Impl rule__XDoWhileExpression__Group__1
+            // InternalFormat.g:18431:1: ( rule__XDoWhileExpression__Group__0__Impl rule__XDoWhileExpression__Group__1 )
+            // InternalFormat.g:18432:2: rule__XDoWhileExpression__Group__0__Impl rule__XDoWhileExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__0__Impl_in_rule__XDoWhileExpression__Group__037426);
+            pushFollow(FOLLOW_105);
             rule__XDoWhileExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__1_in_rule__XDoWhileExpression__Group__037429);
+            pushFollow(FOLLOW_2);
             rule__XDoWhileExpression__Group__1();
 
             state._fsp--;
@@ -53719,23 +53719,23 @@ public final void rule__XDoWhileExpression__Group__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18439:1: rule__XDoWhileExpression__Group__0__Impl : ( () ) ;
+    // InternalFormat.g:18439:1: rule__XDoWhileExpression__Group__0__Impl : ( () ) ;
     public final void rule__XDoWhileExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18443:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18444:1: ( () )
+            // InternalFormat.g:18443:1: ( ( () ) )
+            // InternalFormat.g:18444:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18444:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18445:1: ()
+            // InternalFormat.g:18444:1: ( () )
+            // InternalFormat.g:18445:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getXDoWhileExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18446:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18448:1: 
+            // InternalFormat.g:18446:1: ()
+            // InternalFormat.g:18448:1: 
             {
             }
 
@@ -53760,21 +53760,21 @@ public final void rule__XDoWhileExpression__Group__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18458:1: rule__XDoWhileExpression__Group__1 : rule__XDoWhileExpression__Group__1__Impl rule__XDoWhileExpression__Group__2 ;
+    // InternalFormat.g:18458:1: rule__XDoWhileExpression__Group__1 : rule__XDoWhileExpression__Group__1__Impl rule__XDoWhileExpression__Group__2 ;
     public final void rule__XDoWhileExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18462:1: ( rule__XDoWhileExpression__Group__1__Impl rule__XDoWhileExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18463:2: rule__XDoWhileExpression__Group__1__Impl rule__XDoWhileExpression__Group__2
+            // InternalFormat.g:18462:1: ( rule__XDoWhileExpression__Group__1__Impl rule__XDoWhileExpression__Group__2 )
+            // InternalFormat.g:18463:2: rule__XDoWhileExpression__Group__1__Impl rule__XDoWhileExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__1__Impl_in_rule__XDoWhileExpression__Group__137487);
+            pushFollow(FOLLOW_50);
             rule__XDoWhileExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__2_in_rule__XDoWhileExpression__Group__137490);
+            pushFollow(FOLLOW_2);
             rule__XDoWhileExpression__Group__2();
 
             state._fsp--;
@@ -53798,22 +53798,22 @@ public final void rule__XDoWhileExpression__Group__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18470:1: rule__XDoWhileExpression__Group__1__Impl : ( 'do' ) ;
+    // InternalFormat.g:18470:1: rule__XDoWhileExpression__Group__1__Impl : ( 'do' ) ;
     public final void rule__XDoWhileExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18474:1: ( ( 'do' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18475:1: ( 'do' )
+            // InternalFormat.g:18474:1: ( ( 'do' ) )
+            // InternalFormat.g:18475:1: ( 'do' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18475:1: ( 'do' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18476:1: 'do'
+            // InternalFormat.g:18475:1: ( 'do' )
+            // InternalFormat.g:18476:1: 'do'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getDoKeyword_1()); 
             }
-            match(input,92,FOLLOW_92_in_rule__XDoWhileExpression__Group__1__Impl37518); if (state.failed) return ;
+            match(input,92,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXDoWhileExpressionAccess().getDoKeyword_1()); 
             }
@@ -53839,21 +53839,21 @@ public final void rule__XDoWhileExpression__Group__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18489:1: rule__XDoWhileExpression__Group__2 : rule__XDoWhileExpression__Group__2__Impl rule__XDoWhileExpression__Group__3 ;
+    // InternalFormat.g:18489:1: rule__XDoWhileExpression__Group__2 : rule__XDoWhileExpression__Group__2__Impl rule__XDoWhileExpression__Group__3 ;
     public final void rule__XDoWhileExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18493:1: ( rule__XDoWhileExpression__Group__2__Impl rule__XDoWhileExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18494:2: rule__XDoWhileExpression__Group__2__Impl rule__XDoWhileExpression__Group__3
+            // InternalFormat.g:18493:1: ( rule__XDoWhileExpression__Group__2__Impl rule__XDoWhileExpression__Group__3 )
+            // InternalFormat.g:18494:2: rule__XDoWhileExpression__Group__2__Impl rule__XDoWhileExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__2__Impl_in_rule__XDoWhileExpression__Group__237549);
+            pushFollow(FOLLOW_104);
             rule__XDoWhileExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__3_in_rule__XDoWhileExpression__Group__237552);
+            pushFollow(FOLLOW_2);
             rule__XDoWhileExpression__Group__3();
 
             state._fsp--;
@@ -53877,25 +53877,25 @@ public final void rule__XDoWhileExpression__Group__2() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18501:1: rule__XDoWhileExpression__Group__2__Impl : ( ( rule__XDoWhileExpression__BodyAssignment_2 ) ) ;
+    // InternalFormat.g:18501:1: rule__XDoWhileExpression__Group__2__Impl : ( ( rule__XDoWhileExpression__BodyAssignment_2 ) ) ;
     public final void rule__XDoWhileExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18505:1: ( ( ( rule__XDoWhileExpression__BodyAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18506:1: ( ( rule__XDoWhileExpression__BodyAssignment_2 ) )
+            // InternalFormat.g:18505:1: ( ( ( rule__XDoWhileExpression__BodyAssignment_2 ) ) )
+            // InternalFormat.g:18506:1: ( ( rule__XDoWhileExpression__BodyAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18506:1: ( ( rule__XDoWhileExpression__BodyAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18507:1: ( rule__XDoWhileExpression__BodyAssignment_2 )
+            // InternalFormat.g:18506:1: ( ( rule__XDoWhileExpression__BodyAssignment_2 ) )
+            // InternalFormat.g:18507:1: ( rule__XDoWhileExpression__BodyAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getBodyAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18508:1: ( rule__XDoWhileExpression__BodyAssignment_2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18508:2: rule__XDoWhileExpression__BodyAssignment_2
+            // InternalFormat.g:18508:1: ( rule__XDoWhileExpression__BodyAssignment_2 )
+            // InternalFormat.g:18508:2: rule__XDoWhileExpression__BodyAssignment_2
             {
-            pushFollow(FOLLOW_rule__XDoWhileExpression__BodyAssignment_2_in_rule__XDoWhileExpression__Group__2__Impl37579);
+            pushFollow(FOLLOW_2);
             rule__XDoWhileExpression__BodyAssignment_2();
 
             state._fsp--;
@@ -53928,21 +53928,21 @@ public final void rule__XDoWhileExpression__Group__2__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18518:1: rule__XDoWhileExpression__Group__3 : rule__XDoWhileExpression__Group__3__Impl rule__XDoWhileExpression__Group__4 ;
+    // InternalFormat.g:18518:1: rule__XDoWhileExpression__Group__3 : rule__XDoWhileExpression__Group__3__Impl rule__XDoWhileExpression__Group__4 ;
     public final void rule__XDoWhileExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18522:1: ( rule__XDoWhileExpression__Group__3__Impl rule__XDoWhileExpression__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18523:2: rule__XDoWhileExpression__Group__3__Impl rule__XDoWhileExpression__Group__4
+            // InternalFormat.g:18522:1: ( rule__XDoWhileExpression__Group__3__Impl rule__XDoWhileExpression__Group__4 )
+            // InternalFormat.g:18523:2: rule__XDoWhileExpression__Group__3__Impl rule__XDoWhileExpression__Group__4
             {
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__3__Impl_in_rule__XDoWhileExpression__Group__337609);
+            pushFollow(FOLLOW_45);
             rule__XDoWhileExpression__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__4_in_rule__XDoWhileExpression__Group__337612);
+            pushFollow(FOLLOW_2);
             rule__XDoWhileExpression__Group__4();
 
             state._fsp--;
@@ -53966,22 +53966,22 @@ public final void rule__XDoWhileExpression__Group__3() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18530:1: rule__XDoWhileExpression__Group__3__Impl : ( 'while' ) ;
+    // InternalFormat.g:18530:1: rule__XDoWhileExpression__Group__3__Impl : ( 'while' ) ;
     public final void rule__XDoWhileExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18534:1: ( ( 'while' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18535:1: ( 'while' )
+            // InternalFormat.g:18534:1: ( ( 'while' ) )
+            // InternalFormat.g:18535:1: ( 'while' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18535:1: ( 'while' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18536:1: 'while'
+            // InternalFormat.g:18535:1: ( 'while' )
+            // InternalFormat.g:18536:1: 'while'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getWhileKeyword_3()); 
             }
-            match(input,91,FOLLOW_91_in_rule__XDoWhileExpression__Group__3__Impl37640); if (state.failed) return ;
+            match(input,91,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXDoWhileExpressionAccess().getWhileKeyword_3()); 
             }
@@ -54007,21 +54007,21 @@ public final void rule__XDoWhileExpression__Group__3__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18549:1: rule__XDoWhileExpression__Group__4 : rule__XDoWhileExpression__Group__4__Impl rule__XDoWhileExpression__Group__5 ;
+    // InternalFormat.g:18549:1: rule__XDoWhileExpression__Group__4 : rule__XDoWhileExpression__Group__4__Impl rule__XDoWhileExpression__Group__5 ;
     public final void rule__XDoWhileExpression__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18553:1: ( rule__XDoWhileExpression__Group__4__Impl rule__XDoWhileExpression__Group__5 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18554:2: rule__XDoWhileExpression__Group__4__Impl rule__XDoWhileExpression__Group__5
+            // InternalFormat.g:18553:1: ( rule__XDoWhileExpression__Group__4__Impl rule__XDoWhileExpression__Group__5 )
+            // InternalFormat.g:18554:2: rule__XDoWhileExpression__Group__4__Impl rule__XDoWhileExpression__Group__5
             {
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__4__Impl_in_rule__XDoWhileExpression__Group__437671);
+            pushFollow(FOLLOW_50);
             rule__XDoWhileExpression__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__5_in_rule__XDoWhileExpression__Group__437674);
+            pushFollow(FOLLOW_2);
             rule__XDoWhileExpression__Group__5();
 
             state._fsp--;
@@ -54045,22 +54045,22 @@ public final void rule__XDoWhileExpression__Group__4() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18561:1: rule__XDoWhileExpression__Group__4__Impl : ( '(' ) ;
+    // InternalFormat.g:18561:1: rule__XDoWhileExpression__Group__4__Impl : ( '(' ) ;
     public final void rule__XDoWhileExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18565:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18566:1: ( '(' )
+            // InternalFormat.g:18565:1: ( ( '(' ) )
+            // InternalFormat.g:18566:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18566:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18567:1: '('
+            // InternalFormat.g:18566:1: ( '(' )
+            // InternalFormat.g:18567:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getLeftParenthesisKeyword_4()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XDoWhileExpression__Group__4__Impl37702); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXDoWhileExpressionAccess().getLeftParenthesisKeyword_4()); 
             }
@@ -54086,21 +54086,21 @@ public final void rule__XDoWhileExpression__Group__4__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__5"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18580:1: rule__XDoWhileExpression__Group__5 : rule__XDoWhileExpression__Group__5__Impl rule__XDoWhileExpression__Group__6 ;
+    // InternalFormat.g:18580:1: rule__XDoWhileExpression__Group__5 : rule__XDoWhileExpression__Group__5__Impl rule__XDoWhileExpression__Group__6 ;
     public final void rule__XDoWhileExpression__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18584:1: ( rule__XDoWhileExpression__Group__5__Impl rule__XDoWhileExpression__Group__6 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18585:2: rule__XDoWhileExpression__Group__5__Impl rule__XDoWhileExpression__Group__6
+            // InternalFormat.g:18584:1: ( rule__XDoWhileExpression__Group__5__Impl rule__XDoWhileExpression__Group__6 )
+            // InternalFormat.g:18585:2: rule__XDoWhileExpression__Group__5__Impl rule__XDoWhileExpression__Group__6
             {
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__5__Impl_in_rule__XDoWhileExpression__Group__537733);
+            pushFollow(FOLLOW_33);
             rule__XDoWhileExpression__Group__5__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__6_in_rule__XDoWhileExpression__Group__537736);
+            pushFollow(FOLLOW_2);
             rule__XDoWhileExpression__Group__6();
 
             state._fsp--;
@@ -54124,25 +54124,25 @@ public final void rule__XDoWhileExpression__Group__5() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18592:1: rule__XDoWhileExpression__Group__5__Impl : ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) ) ;
+    // InternalFormat.g:18592:1: rule__XDoWhileExpression__Group__5__Impl : ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) ) ;
     public final void rule__XDoWhileExpression__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18596:1: ( ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18597:1: ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) )
+            // InternalFormat.g:18596:1: ( ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) ) )
+            // InternalFormat.g:18597:1: ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18597:1: ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18598:1: ( rule__XDoWhileExpression__PredicateAssignment_5 )
+            // InternalFormat.g:18597:1: ( ( rule__XDoWhileExpression__PredicateAssignment_5 ) )
+            // InternalFormat.g:18598:1: ( rule__XDoWhileExpression__PredicateAssignment_5 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getPredicateAssignment_5()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18599:1: ( rule__XDoWhileExpression__PredicateAssignment_5 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18599:2: rule__XDoWhileExpression__PredicateAssignment_5
+            // InternalFormat.g:18599:1: ( rule__XDoWhileExpression__PredicateAssignment_5 )
+            // InternalFormat.g:18599:2: rule__XDoWhileExpression__PredicateAssignment_5
             {
-            pushFollow(FOLLOW_rule__XDoWhileExpression__PredicateAssignment_5_in_rule__XDoWhileExpression__Group__5__Impl37763);
+            pushFollow(FOLLOW_2);
             rule__XDoWhileExpression__PredicateAssignment_5();
 
             state._fsp--;
@@ -54175,16 +54175,16 @@ public final void rule__XDoWhileExpression__Group__5__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__6"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18609:1: rule__XDoWhileExpression__Group__6 : rule__XDoWhileExpression__Group__6__Impl ;
+    // InternalFormat.g:18609:1: rule__XDoWhileExpression__Group__6 : rule__XDoWhileExpression__Group__6__Impl ;
     public final void rule__XDoWhileExpression__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18613:1: ( rule__XDoWhileExpression__Group__6__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18614:2: rule__XDoWhileExpression__Group__6__Impl
+            // InternalFormat.g:18613:1: ( rule__XDoWhileExpression__Group__6__Impl )
+            // InternalFormat.g:18614:2: rule__XDoWhileExpression__Group__6__Impl
             {
-            pushFollow(FOLLOW_rule__XDoWhileExpression__Group__6__Impl_in_rule__XDoWhileExpression__Group__637793);
+            pushFollow(FOLLOW_2);
             rule__XDoWhileExpression__Group__6__Impl();
 
             state._fsp--;
@@ -54208,22 +54208,22 @@ public final void rule__XDoWhileExpression__Group__6() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XDoWhileExpression__Group__6__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18620:1: rule__XDoWhileExpression__Group__6__Impl : ( ')' ) ;
+    // InternalFormat.g:18620:1: rule__XDoWhileExpression__Group__6__Impl : ( ')' ) ;
     public final void rule__XDoWhileExpression__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18624:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18625:1: ( ')' )
+            // InternalFormat.g:18624:1: ( ( ')' ) )
+            // InternalFormat.g:18625:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18625:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18626:1: ')'
+            // InternalFormat.g:18625:1: ( ')' )
+            // InternalFormat.g:18626:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getRightParenthesisKeyword_6()); 
             }
-            match(input,75,FOLLOW_75_in_rule__XDoWhileExpression__Group__6__Impl37821); if (state.failed) return ;
+            match(input,75,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXDoWhileExpressionAccess().getRightParenthesisKeyword_6()); 
             }
@@ -54249,21 +54249,21 @@ public final void rule__XDoWhileExpression__Group__6__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XBlockExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18653:1: rule__XBlockExpression__Group__0 : rule__XBlockExpression__Group__0__Impl rule__XBlockExpression__Group__1 ;
+    // InternalFormat.g:18653:1: rule__XBlockExpression__Group__0 : rule__XBlockExpression__Group__0__Impl rule__XBlockExpression__Group__1 ;
     public final void rule__XBlockExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18657:1: ( rule__XBlockExpression__Group__0__Impl rule__XBlockExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18658:2: rule__XBlockExpression__Group__0__Impl rule__XBlockExpression__Group__1
+            // InternalFormat.g:18657:1: ( rule__XBlockExpression__Group__0__Impl rule__XBlockExpression__Group__1 )
+            // InternalFormat.g:18658:2: rule__XBlockExpression__Group__0__Impl rule__XBlockExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XBlockExpression__Group__0__Impl_in_rule__XBlockExpression__Group__037866);
+            pushFollow(FOLLOW_15);
             rule__XBlockExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBlockExpression__Group__1_in_rule__XBlockExpression__Group__037869);
+            pushFollow(FOLLOW_2);
             rule__XBlockExpression__Group__1();
 
             state._fsp--;
@@ -54287,23 +54287,23 @@ public final void rule__XBlockExpression__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XBlockExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18665:1: rule__XBlockExpression__Group__0__Impl : ( () ) ;
+    // InternalFormat.g:18665:1: rule__XBlockExpression__Group__0__Impl : ( () ) ;
     public final void rule__XBlockExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18669:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18670:1: ( () )
+            // InternalFormat.g:18669:1: ( ( () ) )
+            // InternalFormat.g:18670:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18670:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18671:1: ()
+            // InternalFormat.g:18670:1: ( () )
+            // InternalFormat.g:18671:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getXBlockExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18672:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18674:1: 
+            // InternalFormat.g:18672:1: ()
+            // InternalFormat.g:18674:1: 
             {
             }
 
@@ -54328,21 +54328,21 @@ public final void rule__XBlockExpression__Group__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XBlockExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18684:1: rule__XBlockExpression__Group__1 : rule__XBlockExpression__Group__1__Impl rule__XBlockExpression__Group__2 ;
+    // InternalFormat.g:18684:1: rule__XBlockExpression__Group__1 : rule__XBlockExpression__Group__1__Impl rule__XBlockExpression__Group__2 ;
     public final void rule__XBlockExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18688:1: ( rule__XBlockExpression__Group__1__Impl rule__XBlockExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18689:2: rule__XBlockExpression__Group__1__Impl rule__XBlockExpression__Group__2
+            // InternalFormat.g:18688:1: ( rule__XBlockExpression__Group__1__Impl rule__XBlockExpression__Group__2 )
+            // InternalFormat.g:18689:2: rule__XBlockExpression__Group__1__Impl rule__XBlockExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XBlockExpression__Group__1__Impl_in_rule__XBlockExpression__Group__137927);
+            pushFollow(FOLLOW_106);
             rule__XBlockExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBlockExpression__Group__2_in_rule__XBlockExpression__Group__137930);
+            pushFollow(FOLLOW_2);
             rule__XBlockExpression__Group__2();
 
             state._fsp--;
@@ -54366,22 +54366,22 @@ public final void rule__XBlockExpression__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XBlockExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18696:1: rule__XBlockExpression__Group__1__Impl : ( '{' ) ;
+    // InternalFormat.g:18696:1: rule__XBlockExpression__Group__1__Impl : ( '{' ) ;
     public final void rule__XBlockExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18700:1: ( ( '{' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18701:1: ( '{' )
+            // InternalFormat.g:18700:1: ( ( '{' ) )
+            // InternalFormat.g:18701:1: ( '{' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18701:1: ( '{' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18702:1: '{'
+            // InternalFormat.g:18701:1: ( '{' )
+            // InternalFormat.g:18702:1: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getLeftCurlyBracketKeyword_1()); 
             }
-            match(input,66,FOLLOW_66_in_rule__XBlockExpression__Group__1__Impl37958); if (state.failed) return ;
+            match(input,66,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBlockExpressionAccess().getLeftCurlyBracketKeyword_1()); 
             }
@@ -54407,21 +54407,21 @@ public final void rule__XBlockExpression__Group__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XBlockExpression__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18715:1: rule__XBlockExpression__Group__2 : rule__XBlockExpression__Group__2__Impl rule__XBlockExpression__Group__3 ;
+    // InternalFormat.g:18715:1: rule__XBlockExpression__Group__2 : rule__XBlockExpression__Group__2__Impl rule__XBlockExpression__Group__3 ;
     public final void rule__XBlockExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18719:1: ( rule__XBlockExpression__Group__2__Impl rule__XBlockExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18720:2: rule__XBlockExpression__Group__2__Impl rule__XBlockExpression__Group__3
+            // InternalFormat.g:18719:1: ( rule__XBlockExpression__Group__2__Impl rule__XBlockExpression__Group__3 )
+            // InternalFormat.g:18720:2: rule__XBlockExpression__Group__2__Impl rule__XBlockExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__XBlockExpression__Group__2__Impl_in_rule__XBlockExpression__Group__237989);
+            pushFollow(FOLLOW_106);
             rule__XBlockExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBlockExpression__Group__3_in_rule__XBlockExpression__Group__237992);
+            pushFollow(FOLLOW_2);
             rule__XBlockExpression__Group__3();
 
             state._fsp--;
@@ -54445,22 +54445,22 @@ public final void rule__XBlockExpression__Group__2() throws RecognitionException
 
 
     // $ANTLR start "rule__XBlockExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18727:1: rule__XBlockExpression__Group__2__Impl : ( ( rule__XBlockExpression__Group_2__0 )* ) ;
+    // InternalFormat.g:18727:1: rule__XBlockExpression__Group__2__Impl : ( ( rule__XBlockExpression__Group_2__0 )* ) ;
     public final void rule__XBlockExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18731:1: ( ( ( rule__XBlockExpression__Group_2__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18732:1: ( ( rule__XBlockExpression__Group_2__0 )* )
+            // InternalFormat.g:18731:1: ( ( ( rule__XBlockExpression__Group_2__0 )* ) )
+            // InternalFormat.g:18732:1: ( ( rule__XBlockExpression__Group_2__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18732:1: ( ( rule__XBlockExpression__Group_2__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18733:1: ( rule__XBlockExpression__Group_2__0 )*
+            // InternalFormat.g:18732:1: ( ( rule__XBlockExpression__Group_2__0 )* )
+            // InternalFormat.g:18733:1: ( rule__XBlockExpression__Group_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getGroup_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18734:1: ( rule__XBlockExpression__Group_2__0 )*
+            // InternalFormat.g:18734:1: ( rule__XBlockExpression__Group_2__0 )*
             loop142:
             do {
                 int alt142=2;
@@ -54473,9 +54473,9 @@ public final void rule__XBlockExpression__Group__2__Impl() throws RecognitionExc
 
                 switch (alt142) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18734:2: rule__XBlockExpression__Group_2__0
+            	    // InternalFormat.g:18734:2: rule__XBlockExpression__Group_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__XBlockExpression__Group_2__0_in_rule__XBlockExpression__Group__2__Impl38019);
+            	    pushFollow(FOLLOW_93);
             	    rule__XBlockExpression__Group_2__0();
 
             	    state._fsp--;
@@ -54514,16 +54514,16 @@ public final void rule__XBlockExpression__Group__2__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XBlockExpression__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18744:1: rule__XBlockExpression__Group__3 : rule__XBlockExpression__Group__3__Impl ;
+    // InternalFormat.g:18744:1: rule__XBlockExpression__Group__3 : rule__XBlockExpression__Group__3__Impl ;
     public final void rule__XBlockExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18748:1: ( rule__XBlockExpression__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18749:2: rule__XBlockExpression__Group__3__Impl
+            // InternalFormat.g:18748:1: ( rule__XBlockExpression__Group__3__Impl )
+            // InternalFormat.g:18749:2: rule__XBlockExpression__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__XBlockExpression__Group__3__Impl_in_rule__XBlockExpression__Group__338050);
+            pushFollow(FOLLOW_2);
             rule__XBlockExpression__Group__3__Impl();
 
             state._fsp--;
@@ -54547,22 +54547,22 @@ public final void rule__XBlockExpression__Group__3() throws RecognitionException
 
 
     // $ANTLR start "rule__XBlockExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18755:1: rule__XBlockExpression__Group__3__Impl : ( '}' ) ;
+    // InternalFormat.g:18755:1: rule__XBlockExpression__Group__3__Impl : ( '}' ) ;
     public final void rule__XBlockExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18759:1: ( ( '}' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18760:1: ( '}' )
+            // InternalFormat.g:18759:1: ( ( '}' ) )
+            // InternalFormat.g:18760:1: ( '}' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18760:1: ( '}' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18761:1: '}'
+            // InternalFormat.g:18760:1: ( '}' )
+            // InternalFormat.g:18761:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getRightCurlyBracketKeyword_3()); 
             }
-            match(input,67,FOLLOW_67_in_rule__XBlockExpression__Group__3__Impl38078); if (state.failed) return ;
+            match(input,67,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBlockExpressionAccess().getRightCurlyBracketKeyword_3()); 
             }
@@ -54588,21 +54588,21 @@ public final void rule__XBlockExpression__Group__3__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XBlockExpression__Group_2__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18782:1: rule__XBlockExpression__Group_2__0 : rule__XBlockExpression__Group_2__0__Impl rule__XBlockExpression__Group_2__1 ;
+    // InternalFormat.g:18782:1: rule__XBlockExpression__Group_2__0 : rule__XBlockExpression__Group_2__0__Impl rule__XBlockExpression__Group_2__1 ;
     public final void rule__XBlockExpression__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18786:1: ( rule__XBlockExpression__Group_2__0__Impl rule__XBlockExpression__Group_2__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18787:2: rule__XBlockExpression__Group_2__0__Impl rule__XBlockExpression__Group_2__1
+            // InternalFormat.g:18786:1: ( rule__XBlockExpression__Group_2__0__Impl rule__XBlockExpression__Group_2__1 )
+            // InternalFormat.g:18787:2: rule__XBlockExpression__Group_2__0__Impl rule__XBlockExpression__Group_2__1
             {
-            pushFollow(FOLLOW_rule__XBlockExpression__Group_2__0__Impl_in_rule__XBlockExpression__Group_2__038117);
+            pushFollow(FOLLOW_11);
             rule__XBlockExpression__Group_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBlockExpression__Group_2__1_in_rule__XBlockExpression__Group_2__038120);
+            pushFollow(FOLLOW_2);
             rule__XBlockExpression__Group_2__1();
 
             state._fsp--;
@@ -54626,25 +54626,25 @@ public final void rule__XBlockExpression__Group_2__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XBlockExpression__Group_2__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18794:1: rule__XBlockExpression__Group_2__0__Impl : ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) ) ;
+    // InternalFormat.g:18794:1: rule__XBlockExpression__Group_2__0__Impl : ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) ) ;
     public final void rule__XBlockExpression__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18798:1: ( ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18799:1: ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) )
+            // InternalFormat.g:18798:1: ( ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) ) )
+            // InternalFormat.g:18799:1: ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18799:1: ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18800:1: ( rule__XBlockExpression__ExpressionsAssignment_2_0 )
+            // InternalFormat.g:18799:1: ( ( rule__XBlockExpression__ExpressionsAssignment_2_0 ) )
+            // InternalFormat.g:18800:1: ( rule__XBlockExpression__ExpressionsAssignment_2_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getExpressionsAssignment_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18801:1: ( rule__XBlockExpression__ExpressionsAssignment_2_0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18801:2: rule__XBlockExpression__ExpressionsAssignment_2_0
+            // InternalFormat.g:18801:1: ( rule__XBlockExpression__ExpressionsAssignment_2_0 )
+            // InternalFormat.g:18801:2: rule__XBlockExpression__ExpressionsAssignment_2_0
             {
-            pushFollow(FOLLOW_rule__XBlockExpression__ExpressionsAssignment_2_0_in_rule__XBlockExpression__Group_2__0__Impl38147);
+            pushFollow(FOLLOW_2);
             rule__XBlockExpression__ExpressionsAssignment_2_0();
 
             state._fsp--;
@@ -54677,16 +54677,16 @@ public final void rule__XBlockExpression__Group_2__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XBlockExpression__Group_2__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18811:1: rule__XBlockExpression__Group_2__1 : rule__XBlockExpression__Group_2__1__Impl ;
+    // InternalFormat.g:18811:1: rule__XBlockExpression__Group_2__1 : rule__XBlockExpression__Group_2__1__Impl ;
     public final void rule__XBlockExpression__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18815:1: ( rule__XBlockExpression__Group_2__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18816:2: rule__XBlockExpression__Group_2__1__Impl
+            // InternalFormat.g:18815:1: ( rule__XBlockExpression__Group_2__1__Impl )
+            // InternalFormat.g:18816:2: rule__XBlockExpression__Group_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__XBlockExpression__Group_2__1__Impl_in_rule__XBlockExpression__Group_2__138177);
+            pushFollow(FOLLOW_2);
             rule__XBlockExpression__Group_2__1__Impl();
 
             state._fsp--;
@@ -54710,22 +54710,22 @@ public final void rule__XBlockExpression__Group_2__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XBlockExpression__Group_2__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18822:1: rule__XBlockExpression__Group_2__1__Impl : ( ( ';' )? ) ;
+    // InternalFormat.g:18822:1: rule__XBlockExpression__Group_2__1__Impl : ( ( ';' )? ) ;
     public final void rule__XBlockExpression__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18826:1: ( ( ( ';' )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18827:1: ( ( ';' )? )
+            // InternalFormat.g:18826:1: ( ( ( ';' )? ) )
+            // InternalFormat.g:18827:1: ( ( ';' )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18827:1: ( ( ';' )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18828:1: ( ';' )?
+            // InternalFormat.g:18827:1: ( ( ';' )? )
+            // InternalFormat.g:18828:1: ( ';' )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getSemicolonKeyword_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18829:1: ( ';' )?
+            // InternalFormat.g:18829:1: ( ';' )?
             int alt143=2;
             int LA143_0 = input.LA(1);
 
@@ -54734,9 +54734,9 @@ public final void rule__XBlockExpression__Group_2__1__Impl() throws RecognitionE
             }
             switch (alt143) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18830:2: ';'
+                    // InternalFormat.g:18830:2: ';'
                     {
-                    match(input,65,FOLLOW_65_in_rule__XBlockExpression__Group_2__1__Impl38206); if (state.failed) return ;
+                    match(input,65,FOLLOW_2); if (state.failed) return ;
 
                     }
                     break;
@@ -54768,21 +54768,21 @@ public final void rule__XBlockExpression__Group_2__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18845:1: rule__XVariableDeclaration__Group__0 : rule__XVariableDeclaration__Group__0__Impl rule__XVariableDeclaration__Group__1 ;
+    // InternalFormat.g:18845:1: rule__XVariableDeclaration__Group__0 : rule__XVariableDeclaration__Group__0__Impl rule__XVariableDeclaration__Group__1 ;
     public final void rule__XVariableDeclaration__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18849:1: ( rule__XVariableDeclaration__Group__0__Impl rule__XVariableDeclaration__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18850:2: rule__XVariableDeclaration__Group__0__Impl rule__XVariableDeclaration__Group__1
+            // InternalFormat.g:18849:1: ( rule__XVariableDeclaration__Group__0__Impl rule__XVariableDeclaration__Group__1 )
+            // InternalFormat.g:18850:2: rule__XVariableDeclaration__Group__0__Impl rule__XVariableDeclaration__Group__1
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group__0__Impl_in_rule__XVariableDeclaration__Group__038243);
+            pushFollow(FOLLOW_107);
             rule__XVariableDeclaration__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group__1_in_rule__XVariableDeclaration__Group__038246);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group__1();
 
             state._fsp--;
@@ -54806,23 +54806,23 @@ public final void rule__XVariableDeclaration__Group__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18857:1: rule__XVariableDeclaration__Group__0__Impl : ( () ) ;
+    // InternalFormat.g:18857:1: rule__XVariableDeclaration__Group__0__Impl : ( () ) ;
     public final void rule__XVariableDeclaration__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18861:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18862:1: ( () )
+            // InternalFormat.g:18861:1: ( ( () ) )
+            // InternalFormat.g:18862:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18862:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18863:1: ()
+            // InternalFormat.g:18862:1: ( () )
+            // InternalFormat.g:18863:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getXVariableDeclarationAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18864:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18866:1: 
+            // InternalFormat.g:18864:1: ()
+            // InternalFormat.g:18866:1: 
             {
             }
 
@@ -54847,21 +54847,21 @@ public final void rule__XVariableDeclaration__Group__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18876:1: rule__XVariableDeclaration__Group__1 : rule__XVariableDeclaration__Group__1__Impl rule__XVariableDeclaration__Group__2 ;
+    // InternalFormat.g:18876:1: rule__XVariableDeclaration__Group__1 : rule__XVariableDeclaration__Group__1__Impl rule__XVariableDeclaration__Group__2 ;
     public final void rule__XVariableDeclaration__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18880:1: ( rule__XVariableDeclaration__Group__1__Impl rule__XVariableDeclaration__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18881:2: rule__XVariableDeclaration__Group__1__Impl rule__XVariableDeclaration__Group__2
+            // InternalFormat.g:18880:1: ( rule__XVariableDeclaration__Group__1__Impl rule__XVariableDeclaration__Group__2 )
+            // InternalFormat.g:18881:2: rule__XVariableDeclaration__Group__1__Impl rule__XVariableDeclaration__Group__2
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group__1__Impl_in_rule__XVariableDeclaration__Group__138304);
+            pushFollow(FOLLOW_66);
             rule__XVariableDeclaration__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group__2_in_rule__XVariableDeclaration__Group__138307);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group__2();
 
             state._fsp--;
@@ -54885,25 +54885,25 @@ public final void rule__XVariableDeclaration__Group__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18888:1: rule__XVariableDeclaration__Group__1__Impl : ( ( rule__XVariableDeclaration__Alternatives_1 ) ) ;
+    // InternalFormat.g:18888:1: rule__XVariableDeclaration__Group__1__Impl : ( ( rule__XVariableDeclaration__Alternatives_1 ) ) ;
     public final void rule__XVariableDeclaration__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18892:1: ( ( ( rule__XVariableDeclaration__Alternatives_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18893:1: ( ( rule__XVariableDeclaration__Alternatives_1 ) )
+            // InternalFormat.g:18892:1: ( ( ( rule__XVariableDeclaration__Alternatives_1 ) ) )
+            // InternalFormat.g:18893:1: ( ( rule__XVariableDeclaration__Alternatives_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18893:1: ( ( rule__XVariableDeclaration__Alternatives_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18894:1: ( rule__XVariableDeclaration__Alternatives_1 )
+            // InternalFormat.g:18893:1: ( ( rule__XVariableDeclaration__Alternatives_1 ) )
+            // InternalFormat.g:18894:1: ( rule__XVariableDeclaration__Alternatives_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getAlternatives_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18895:1: ( rule__XVariableDeclaration__Alternatives_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18895:2: rule__XVariableDeclaration__Alternatives_1
+            // InternalFormat.g:18895:1: ( rule__XVariableDeclaration__Alternatives_1 )
+            // InternalFormat.g:18895:2: rule__XVariableDeclaration__Alternatives_1
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Alternatives_1_in_rule__XVariableDeclaration__Group__1__Impl38334);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Alternatives_1();
 
             state._fsp--;
@@ -54936,21 +54936,21 @@ public final void rule__XVariableDeclaration__Group__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18905:1: rule__XVariableDeclaration__Group__2 : rule__XVariableDeclaration__Group__2__Impl rule__XVariableDeclaration__Group__3 ;
+    // InternalFormat.g:18905:1: rule__XVariableDeclaration__Group__2 : rule__XVariableDeclaration__Group__2__Impl rule__XVariableDeclaration__Group__3 ;
     public final void rule__XVariableDeclaration__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18909:1: ( rule__XVariableDeclaration__Group__2__Impl rule__XVariableDeclaration__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18910:2: rule__XVariableDeclaration__Group__2__Impl rule__XVariableDeclaration__Group__3
+            // InternalFormat.g:18909:1: ( rule__XVariableDeclaration__Group__2__Impl rule__XVariableDeclaration__Group__3 )
+            // InternalFormat.g:18910:2: rule__XVariableDeclaration__Group__2__Impl rule__XVariableDeclaration__Group__3
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group__2__Impl_in_rule__XVariableDeclaration__Group__238364);
+            pushFollow(FOLLOW_12);
             rule__XVariableDeclaration__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group__3_in_rule__XVariableDeclaration__Group__238367);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group__3();
 
             state._fsp--;
@@ -54974,25 +54974,25 @@ public final void rule__XVariableDeclaration__Group__2() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18917:1: rule__XVariableDeclaration__Group__2__Impl : ( ( rule__XVariableDeclaration__Alternatives_2 ) ) ;
+    // InternalFormat.g:18917:1: rule__XVariableDeclaration__Group__2__Impl : ( ( rule__XVariableDeclaration__Alternatives_2 ) ) ;
     public final void rule__XVariableDeclaration__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18921:1: ( ( ( rule__XVariableDeclaration__Alternatives_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18922:1: ( ( rule__XVariableDeclaration__Alternatives_2 ) )
+            // InternalFormat.g:18921:1: ( ( ( rule__XVariableDeclaration__Alternatives_2 ) ) )
+            // InternalFormat.g:18922:1: ( ( rule__XVariableDeclaration__Alternatives_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18922:1: ( ( rule__XVariableDeclaration__Alternatives_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18923:1: ( rule__XVariableDeclaration__Alternatives_2 )
+            // InternalFormat.g:18922:1: ( ( rule__XVariableDeclaration__Alternatives_2 ) )
+            // InternalFormat.g:18923:1: ( rule__XVariableDeclaration__Alternatives_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getAlternatives_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18924:1: ( rule__XVariableDeclaration__Alternatives_2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18924:2: rule__XVariableDeclaration__Alternatives_2
+            // InternalFormat.g:18924:1: ( rule__XVariableDeclaration__Alternatives_2 )
+            // InternalFormat.g:18924:2: rule__XVariableDeclaration__Alternatives_2
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Alternatives_2_in_rule__XVariableDeclaration__Group__2__Impl38394);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Alternatives_2();
 
             state._fsp--;
@@ -55025,16 +55025,16 @@ public final void rule__XVariableDeclaration__Group__2__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18934:1: rule__XVariableDeclaration__Group__3 : rule__XVariableDeclaration__Group__3__Impl ;
+    // InternalFormat.g:18934:1: rule__XVariableDeclaration__Group__3 : rule__XVariableDeclaration__Group__3__Impl ;
     public final void rule__XVariableDeclaration__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18938:1: ( rule__XVariableDeclaration__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18939:2: rule__XVariableDeclaration__Group__3__Impl
+            // InternalFormat.g:18938:1: ( rule__XVariableDeclaration__Group__3__Impl )
+            // InternalFormat.g:18939:2: rule__XVariableDeclaration__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group__3__Impl_in_rule__XVariableDeclaration__Group__338424);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group__3__Impl();
 
             state._fsp--;
@@ -55058,22 +55058,22 @@ public final void rule__XVariableDeclaration__Group__3() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18945:1: rule__XVariableDeclaration__Group__3__Impl : ( ( rule__XVariableDeclaration__Group_3__0 )? ) ;
+    // InternalFormat.g:18945:1: rule__XVariableDeclaration__Group__3__Impl : ( ( rule__XVariableDeclaration__Group_3__0 )? ) ;
     public final void rule__XVariableDeclaration__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18949:1: ( ( ( rule__XVariableDeclaration__Group_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18950:1: ( ( rule__XVariableDeclaration__Group_3__0 )? )
+            // InternalFormat.g:18949:1: ( ( ( rule__XVariableDeclaration__Group_3__0 )? ) )
+            // InternalFormat.g:18950:1: ( ( rule__XVariableDeclaration__Group_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18950:1: ( ( rule__XVariableDeclaration__Group_3__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18951:1: ( rule__XVariableDeclaration__Group_3__0 )?
+            // InternalFormat.g:18950:1: ( ( rule__XVariableDeclaration__Group_3__0 )? )
+            // InternalFormat.g:18951:1: ( rule__XVariableDeclaration__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getGroup_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18952:1: ( rule__XVariableDeclaration__Group_3__0 )?
+            // InternalFormat.g:18952:1: ( rule__XVariableDeclaration__Group_3__0 )?
             int alt144=2;
             int LA144_0 = input.LA(1);
 
@@ -55082,9 +55082,9 @@ public final void rule__XVariableDeclaration__Group__3__Impl() throws Recognitio
             }
             switch (alt144) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18952:2: rule__XVariableDeclaration__Group_3__0
+                    // InternalFormat.g:18952:2: rule__XVariableDeclaration__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__XVariableDeclaration__Group_3__0_in_rule__XVariableDeclaration__Group__3__Impl38451);
+                    pushFollow(FOLLOW_2);
                     rule__XVariableDeclaration__Group_3__0();
 
                     state._fsp--;
@@ -55120,16 +55120,16 @@ public final void rule__XVariableDeclaration__Group__3__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_2_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18970:1: rule__XVariableDeclaration__Group_2_0__0 : rule__XVariableDeclaration__Group_2_0__0__Impl ;
+    // InternalFormat.g:18970:1: rule__XVariableDeclaration__Group_2_0__0 : rule__XVariableDeclaration__Group_2_0__0__Impl ;
     public final void rule__XVariableDeclaration__Group_2_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18974:1: ( rule__XVariableDeclaration__Group_2_0__0__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18975:2: rule__XVariableDeclaration__Group_2_0__0__Impl
+            // InternalFormat.g:18974:1: ( rule__XVariableDeclaration__Group_2_0__0__Impl )
+            // InternalFormat.g:18975:2: rule__XVariableDeclaration__Group_2_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group_2_0__0__Impl_in_rule__XVariableDeclaration__Group_2_0__038490);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group_2_0__0__Impl();
 
             state._fsp--;
@@ -55153,25 +55153,25 @@ public final void rule__XVariableDeclaration__Group_2_0__0() throws RecognitionE
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_2_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18981:1: rule__XVariableDeclaration__Group_2_0__0__Impl : ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) ) ;
+    // InternalFormat.g:18981:1: rule__XVariableDeclaration__Group_2_0__0__Impl : ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) ) ;
     public final void rule__XVariableDeclaration__Group_2_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18985:1: ( ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18986:1: ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) )
+            // InternalFormat.g:18985:1: ( ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) ) )
+            // InternalFormat.g:18986:1: ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18986:1: ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18987:1: ( rule__XVariableDeclaration__Group_2_0_0__0 )
+            // InternalFormat.g:18986:1: ( ( rule__XVariableDeclaration__Group_2_0_0__0 ) )
+            // InternalFormat.g:18987:1: ( rule__XVariableDeclaration__Group_2_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getGroup_2_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18988:1: ( rule__XVariableDeclaration__Group_2_0_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:18988:2: rule__XVariableDeclaration__Group_2_0_0__0
+            // InternalFormat.g:18988:1: ( rule__XVariableDeclaration__Group_2_0_0__0 )
+            // InternalFormat.g:18988:2: rule__XVariableDeclaration__Group_2_0_0__0
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group_2_0_0__0_in_rule__XVariableDeclaration__Group_2_0__0__Impl38517);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group_2_0_0__0();
 
             state._fsp--;
@@ -55204,21 +55204,21 @@ public final void rule__XVariableDeclaration__Group_2_0__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_2_0_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19000:1: rule__XVariableDeclaration__Group_2_0_0__0 : rule__XVariableDeclaration__Group_2_0_0__0__Impl rule__XVariableDeclaration__Group_2_0_0__1 ;
+    // InternalFormat.g:19000:1: rule__XVariableDeclaration__Group_2_0_0__0 : rule__XVariableDeclaration__Group_2_0_0__0__Impl rule__XVariableDeclaration__Group_2_0_0__1 ;
     public final void rule__XVariableDeclaration__Group_2_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19004:1: ( rule__XVariableDeclaration__Group_2_0_0__0__Impl rule__XVariableDeclaration__Group_2_0_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19005:2: rule__XVariableDeclaration__Group_2_0_0__0__Impl rule__XVariableDeclaration__Group_2_0_0__1
+            // InternalFormat.g:19004:1: ( rule__XVariableDeclaration__Group_2_0_0__0__Impl rule__XVariableDeclaration__Group_2_0_0__1 )
+            // InternalFormat.g:19005:2: rule__XVariableDeclaration__Group_2_0_0__0__Impl rule__XVariableDeclaration__Group_2_0_0__1
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group_2_0_0__0__Impl_in_rule__XVariableDeclaration__Group_2_0_0__038549);
+            pushFollow(FOLLOW_9);
             rule__XVariableDeclaration__Group_2_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group_2_0_0__1_in_rule__XVariableDeclaration__Group_2_0_0__038552);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group_2_0_0__1();
 
             state._fsp--;
@@ -55242,25 +55242,25 @@ public final void rule__XVariableDeclaration__Group_2_0_0__0() throws Recognitio
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_2_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19012:1: rule__XVariableDeclaration__Group_2_0_0__0__Impl : ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) ) ;
+    // InternalFormat.g:19012:1: rule__XVariableDeclaration__Group_2_0_0__0__Impl : ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) ) ;
     public final void rule__XVariableDeclaration__Group_2_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19016:1: ( ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19017:1: ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) )
+            // InternalFormat.g:19016:1: ( ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) ) )
+            // InternalFormat.g:19017:1: ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19017:1: ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19018:1: ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 )
+            // InternalFormat.g:19017:1: ( ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 ) )
+            // InternalFormat.g:19018:1: ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getTypeAssignment_2_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19019:1: ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19019:2: rule__XVariableDeclaration__TypeAssignment_2_0_0_0
+            // InternalFormat.g:19019:1: ( rule__XVariableDeclaration__TypeAssignment_2_0_0_0 )
+            // InternalFormat.g:19019:2: rule__XVariableDeclaration__TypeAssignment_2_0_0_0
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__TypeAssignment_2_0_0_0_in_rule__XVariableDeclaration__Group_2_0_0__0__Impl38579);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__TypeAssignment_2_0_0_0();
 
             state._fsp--;
@@ -55293,16 +55293,16 @@ public final void rule__XVariableDeclaration__Group_2_0_0__0__Impl() throws Reco
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_2_0_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19029:1: rule__XVariableDeclaration__Group_2_0_0__1 : rule__XVariableDeclaration__Group_2_0_0__1__Impl ;
+    // InternalFormat.g:19029:1: rule__XVariableDeclaration__Group_2_0_0__1 : rule__XVariableDeclaration__Group_2_0_0__1__Impl ;
     public final void rule__XVariableDeclaration__Group_2_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19033:1: ( rule__XVariableDeclaration__Group_2_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19034:2: rule__XVariableDeclaration__Group_2_0_0__1__Impl
+            // InternalFormat.g:19033:1: ( rule__XVariableDeclaration__Group_2_0_0__1__Impl )
+            // InternalFormat.g:19034:2: rule__XVariableDeclaration__Group_2_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group_2_0_0__1__Impl_in_rule__XVariableDeclaration__Group_2_0_0__138609);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group_2_0_0__1__Impl();
 
             state._fsp--;
@@ -55326,25 +55326,25 @@ public final void rule__XVariableDeclaration__Group_2_0_0__1() throws Recognitio
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_2_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19040:1: rule__XVariableDeclaration__Group_2_0_0__1__Impl : ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) ) ;
+    // InternalFormat.g:19040:1: rule__XVariableDeclaration__Group_2_0_0__1__Impl : ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) ) ;
     public final void rule__XVariableDeclaration__Group_2_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19044:1: ( ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19045:1: ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) )
+            // InternalFormat.g:19044:1: ( ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) ) )
+            // InternalFormat.g:19045:1: ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19045:1: ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19046:1: ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 )
+            // InternalFormat.g:19045:1: ( ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 ) )
+            // InternalFormat.g:19046:1: ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getNameAssignment_2_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19047:1: ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19047:2: rule__XVariableDeclaration__NameAssignment_2_0_0_1
+            // InternalFormat.g:19047:1: ( rule__XVariableDeclaration__NameAssignment_2_0_0_1 )
+            // InternalFormat.g:19047:2: rule__XVariableDeclaration__NameAssignment_2_0_0_1
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__NameAssignment_2_0_0_1_in_rule__XVariableDeclaration__Group_2_0_0__1__Impl38636);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__NameAssignment_2_0_0_1();
 
             state._fsp--;
@@ -55377,21 +55377,21 @@ public final void rule__XVariableDeclaration__Group_2_0_0__1__Impl() throws Reco
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_3__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19061:1: rule__XVariableDeclaration__Group_3__0 : rule__XVariableDeclaration__Group_3__0__Impl rule__XVariableDeclaration__Group_3__1 ;
+    // InternalFormat.g:19061:1: rule__XVariableDeclaration__Group_3__0 : rule__XVariableDeclaration__Group_3__0__Impl rule__XVariableDeclaration__Group_3__1 ;
     public final void rule__XVariableDeclaration__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19065:1: ( rule__XVariableDeclaration__Group_3__0__Impl rule__XVariableDeclaration__Group_3__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19066:2: rule__XVariableDeclaration__Group_3__0__Impl rule__XVariableDeclaration__Group_3__1
+            // InternalFormat.g:19065:1: ( rule__XVariableDeclaration__Group_3__0__Impl rule__XVariableDeclaration__Group_3__1 )
+            // InternalFormat.g:19066:2: rule__XVariableDeclaration__Group_3__0__Impl rule__XVariableDeclaration__Group_3__1
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group_3__0__Impl_in_rule__XVariableDeclaration__Group_3__038670);
+            pushFollow(FOLLOW_50);
             rule__XVariableDeclaration__Group_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group_3__1_in_rule__XVariableDeclaration__Group_3__038673);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group_3__1();
 
             state._fsp--;
@@ -55415,22 +55415,22 @@ public final void rule__XVariableDeclaration__Group_3__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_3__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19073:1: rule__XVariableDeclaration__Group_3__0__Impl : ( '=' ) ;
+    // InternalFormat.g:19073:1: rule__XVariableDeclaration__Group_3__0__Impl : ( '=' ) ;
     public final void rule__XVariableDeclaration__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19077:1: ( ( '=' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19078:1: ( '=' )
+            // InternalFormat.g:19077:1: ( ( '=' ) )
+            // InternalFormat.g:19078:1: ( '=' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19078:1: ( '=' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19079:1: '='
+            // InternalFormat.g:19078:1: ( '=' )
+            // InternalFormat.g:19079:1: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getEqualsSignKeyword_3_0()); 
             }
-            match(input,14,FOLLOW_14_in_rule__XVariableDeclaration__Group_3__0__Impl38701); if (state.failed) return ;
+            match(input,14,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXVariableDeclarationAccess().getEqualsSignKeyword_3_0()); 
             }
@@ -55456,16 +55456,16 @@ public final void rule__XVariableDeclaration__Group_3__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_3__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19092:1: rule__XVariableDeclaration__Group_3__1 : rule__XVariableDeclaration__Group_3__1__Impl ;
+    // InternalFormat.g:19092:1: rule__XVariableDeclaration__Group_3__1 : rule__XVariableDeclaration__Group_3__1__Impl ;
     public final void rule__XVariableDeclaration__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19096:1: ( rule__XVariableDeclaration__Group_3__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19097:2: rule__XVariableDeclaration__Group_3__1__Impl
+            // InternalFormat.g:19096:1: ( rule__XVariableDeclaration__Group_3__1__Impl )
+            // InternalFormat.g:19097:2: rule__XVariableDeclaration__Group_3__1__Impl
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__Group_3__1__Impl_in_rule__XVariableDeclaration__Group_3__138732);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__Group_3__1__Impl();
 
             state._fsp--;
@@ -55489,25 +55489,25 @@ public final void rule__XVariableDeclaration__Group_3__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__XVariableDeclaration__Group_3__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19103:1: rule__XVariableDeclaration__Group_3__1__Impl : ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) ) ;
+    // InternalFormat.g:19103:1: rule__XVariableDeclaration__Group_3__1__Impl : ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) ) ;
     public final void rule__XVariableDeclaration__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19107:1: ( ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19108:1: ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) )
+            // InternalFormat.g:19107:1: ( ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) ) )
+            // InternalFormat.g:19108:1: ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19108:1: ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19109:1: ( rule__XVariableDeclaration__RightAssignment_3_1 )
+            // InternalFormat.g:19108:1: ( ( rule__XVariableDeclaration__RightAssignment_3_1 ) )
+            // InternalFormat.g:19109:1: ( rule__XVariableDeclaration__RightAssignment_3_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getRightAssignment_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19110:1: ( rule__XVariableDeclaration__RightAssignment_3_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19110:2: rule__XVariableDeclaration__RightAssignment_3_1
+            // InternalFormat.g:19110:1: ( rule__XVariableDeclaration__RightAssignment_3_1 )
+            // InternalFormat.g:19110:2: rule__XVariableDeclaration__RightAssignment_3_1
             {
-            pushFollow(FOLLOW_rule__XVariableDeclaration__RightAssignment_3_1_in_rule__XVariableDeclaration__Group_3__1__Impl38759);
+            pushFollow(FOLLOW_2);
             rule__XVariableDeclaration__RightAssignment_3_1();
 
             state._fsp--;
@@ -55540,21 +55540,21 @@ public final void rule__XVariableDeclaration__Group_3__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__JvmFormalParameter__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19124:1: rule__JvmFormalParameter__Group__0 : rule__JvmFormalParameter__Group__0__Impl rule__JvmFormalParameter__Group__1 ;
+    // InternalFormat.g:19124:1: rule__JvmFormalParameter__Group__0 : rule__JvmFormalParameter__Group__0__Impl rule__JvmFormalParameter__Group__1 ;
     public final void rule__JvmFormalParameter__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19128:1: ( rule__JvmFormalParameter__Group__0__Impl rule__JvmFormalParameter__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19129:2: rule__JvmFormalParameter__Group__0__Impl rule__JvmFormalParameter__Group__1
+            // InternalFormat.g:19128:1: ( rule__JvmFormalParameter__Group__0__Impl rule__JvmFormalParameter__Group__1 )
+            // InternalFormat.g:19129:2: rule__JvmFormalParameter__Group__0__Impl rule__JvmFormalParameter__Group__1
             {
-            pushFollow(FOLLOW_rule__JvmFormalParameter__Group__0__Impl_in_rule__JvmFormalParameter__Group__038793);
+            pushFollow(FOLLOW_66);
             rule__JvmFormalParameter__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmFormalParameter__Group__1_in_rule__JvmFormalParameter__Group__038796);
+            pushFollow(FOLLOW_2);
             rule__JvmFormalParameter__Group__1();
 
             state._fsp--;
@@ -55578,22 +55578,22 @@ public final void rule__JvmFormalParameter__Group__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__JvmFormalParameter__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19136:1: rule__JvmFormalParameter__Group__0__Impl : ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? ) ;
+    // InternalFormat.g:19136:1: rule__JvmFormalParameter__Group__0__Impl : ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? ) ;
     public final void rule__JvmFormalParameter__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19140:1: ( ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19141:1: ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? )
+            // InternalFormat.g:19140:1: ( ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? ) )
+            // InternalFormat.g:19141:1: ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19141:1: ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19142:1: ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )?
+            // InternalFormat.g:19141:1: ( ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )? )
+            // InternalFormat.g:19142:1: ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmFormalParameterAccess().getParameterTypeAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19143:1: ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )?
+            // InternalFormat.g:19143:1: ( rule__JvmFormalParameter__ParameterTypeAssignment_0 )?
             int alt145=2;
             switch ( input.LA(1) ) {
                 case 20:
@@ -55633,9 +55633,9 @@ public final void rule__JvmFormalParameter__Group__0__Impl() throws RecognitionE
 
             switch (alt145) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19143:2: rule__JvmFormalParameter__ParameterTypeAssignment_0
+                    // InternalFormat.g:19143:2: rule__JvmFormalParameter__ParameterTypeAssignment_0
                     {
-                    pushFollow(FOLLOW_rule__JvmFormalParameter__ParameterTypeAssignment_0_in_rule__JvmFormalParameter__Group__0__Impl38823);
+                    pushFollow(FOLLOW_2);
                     rule__JvmFormalParameter__ParameterTypeAssignment_0();
 
                     state._fsp--;
@@ -55671,16 +55671,16 @@ public final void rule__JvmFormalParameter__Group__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__JvmFormalParameter__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19153:1: rule__JvmFormalParameter__Group__1 : rule__JvmFormalParameter__Group__1__Impl ;
+    // InternalFormat.g:19153:1: rule__JvmFormalParameter__Group__1 : rule__JvmFormalParameter__Group__1__Impl ;
     public final void rule__JvmFormalParameter__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19157:1: ( rule__JvmFormalParameter__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19158:2: rule__JvmFormalParameter__Group__1__Impl
+            // InternalFormat.g:19157:1: ( rule__JvmFormalParameter__Group__1__Impl )
+            // InternalFormat.g:19158:2: rule__JvmFormalParameter__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmFormalParameter__Group__1__Impl_in_rule__JvmFormalParameter__Group__138854);
+            pushFollow(FOLLOW_2);
             rule__JvmFormalParameter__Group__1__Impl();
 
             state._fsp--;
@@ -55704,25 +55704,25 @@ public final void rule__JvmFormalParameter__Group__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__JvmFormalParameter__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19164:1: rule__JvmFormalParameter__Group__1__Impl : ( ( rule__JvmFormalParameter__NameAssignment_1 ) ) ;
+    // InternalFormat.g:19164:1: rule__JvmFormalParameter__Group__1__Impl : ( ( rule__JvmFormalParameter__NameAssignment_1 ) ) ;
     public final void rule__JvmFormalParameter__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19168:1: ( ( ( rule__JvmFormalParameter__NameAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19169:1: ( ( rule__JvmFormalParameter__NameAssignment_1 ) )
+            // InternalFormat.g:19168:1: ( ( ( rule__JvmFormalParameter__NameAssignment_1 ) ) )
+            // InternalFormat.g:19169:1: ( ( rule__JvmFormalParameter__NameAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19169:1: ( ( rule__JvmFormalParameter__NameAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19170:1: ( rule__JvmFormalParameter__NameAssignment_1 )
+            // InternalFormat.g:19169:1: ( ( rule__JvmFormalParameter__NameAssignment_1 ) )
+            // InternalFormat.g:19170:1: ( rule__JvmFormalParameter__NameAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmFormalParameterAccess().getNameAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19171:1: ( rule__JvmFormalParameter__NameAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19171:2: rule__JvmFormalParameter__NameAssignment_1
+            // InternalFormat.g:19171:1: ( rule__JvmFormalParameter__NameAssignment_1 )
+            // InternalFormat.g:19171:2: rule__JvmFormalParameter__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__JvmFormalParameter__NameAssignment_1_in_rule__JvmFormalParameter__Group__1__Impl38881);
+            pushFollow(FOLLOW_2);
             rule__JvmFormalParameter__NameAssignment_1();
 
             state._fsp--;
@@ -55755,21 +55755,21 @@ public final void rule__JvmFormalParameter__Group__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__FullJvmFormalParameter__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19185:1: rule__FullJvmFormalParameter__Group__0 : rule__FullJvmFormalParameter__Group__0__Impl rule__FullJvmFormalParameter__Group__1 ;
+    // InternalFormat.g:19185:1: rule__FullJvmFormalParameter__Group__0 : rule__FullJvmFormalParameter__Group__0__Impl rule__FullJvmFormalParameter__Group__1 ;
     public final void rule__FullJvmFormalParameter__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19189:1: ( rule__FullJvmFormalParameter__Group__0__Impl rule__FullJvmFormalParameter__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19190:2: rule__FullJvmFormalParameter__Group__0__Impl rule__FullJvmFormalParameter__Group__1
+            // InternalFormat.g:19189:1: ( rule__FullJvmFormalParameter__Group__0__Impl rule__FullJvmFormalParameter__Group__1 )
+            // InternalFormat.g:19190:2: rule__FullJvmFormalParameter__Group__0__Impl rule__FullJvmFormalParameter__Group__1
             {
-            pushFollow(FOLLOW_rule__FullJvmFormalParameter__Group__0__Impl_in_rule__FullJvmFormalParameter__Group__038915);
+            pushFollow(FOLLOW_9);
             rule__FullJvmFormalParameter__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__FullJvmFormalParameter__Group__1_in_rule__FullJvmFormalParameter__Group__038918);
+            pushFollow(FOLLOW_2);
             rule__FullJvmFormalParameter__Group__1();
 
             state._fsp--;
@@ -55793,25 +55793,25 @@ public final void rule__FullJvmFormalParameter__Group__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__FullJvmFormalParameter__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19197:1: rule__FullJvmFormalParameter__Group__0__Impl : ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) ) ;
+    // InternalFormat.g:19197:1: rule__FullJvmFormalParameter__Group__0__Impl : ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) ) ;
     public final void rule__FullJvmFormalParameter__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19201:1: ( ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19202:1: ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) )
+            // InternalFormat.g:19201:1: ( ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) ) )
+            // InternalFormat.g:19202:1: ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19202:1: ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19203:1: ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 )
+            // InternalFormat.g:19202:1: ( ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 ) )
+            // InternalFormat.g:19203:1: ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFullJvmFormalParameterAccess().getParameterTypeAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19204:1: ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19204:2: rule__FullJvmFormalParameter__ParameterTypeAssignment_0
+            // InternalFormat.g:19204:1: ( rule__FullJvmFormalParameter__ParameterTypeAssignment_0 )
+            // InternalFormat.g:19204:2: rule__FullJvmFormalParameter__ParameterTypeAssignment_0
             {
-            pushFollow(FOLLOW_rule__FullJvmFormalParameter__ParameterTypeAssignment_0_in_rule__FullJvmFormalParameter__Group__0__Impl38945);
+            pushFollow(FOLLOW_2);
             rule__FullJvmFormalParameter__ParameterTypeAssignment_0();
 
             state._fsp--;
@@ -55844,16 +55844,16 @@ public final void rule__FullJvmFormalParameter__Group__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__FullJvmFormalParameter__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19214:1: rule__FullJvmFormalParameter__Group__1 : rule__FullJvmFormalParameter__Group__1__Impl ;
+    // InternalFormat.g:19214:1: rule__FullJvmFormalParameter__Group__1 : rule__FullJvmFormalParameter__Group__1__Impl ;
     public final void rule__FullJvmFormalParameter__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19218:1: ( rule__FullJvmFormalParameter__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19219:2: rule__FullJvmFormalParameter__Group__1__Impl
+            // InternalFormat.g:19218:1: ( rule__FullJvmFormalParameter__Group__1__Impl )
+            // InternalFormat.g:19219:2: rule__FullJvmFormalParameter__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__FullJvmFormalParameter__Group__1__Impl_in_rule__FullJvmFormalParameter__Group__138975);
+            pushFollow(FOLLOW_2);
             rule__FullJvmFormalParameter__Group__1__Impl();
 
             state._fsp--;
@@ -55877,25 +55877,25 @@ public final void rule__FullJvmFormalParameter__Group__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__FullJvmFormalParameter__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19225:1: rule__FullJvmFormalParameter__Group__1__Impl : ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) ) ;
+    // InternalFormat.g:19225:1: rule__FullJvmFormalParameter__Group__1__Impl : ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) ) ;
     public final void rule__FullJvmFormalParameter__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19229:1: ( ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19230:1: ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) )
+            // InternalFormat.g:19229:1: ( ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) ) )
+            // InternalFormat.g:19230:1: ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19230:1: ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19231:1: ( rule__FullJvmFormalParameter__NameAssignment_1 )
+            // InternalFormat.g:19230:1: ( ( rule__FullJvmFormalParameter__NameAssignment_1 ) )
+            // InternalFormat.g:19231:1: ( rule__FullJvmFormalParameter__NameAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFullJvmFormalParameterAccess().getNameAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19232:1: ( rule__FullJvmFormalParameter__NameAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19232:2: rule__FullJvmFormalParameter__NameAssignment_1
+            // InternalFormat.g:19232:1: ( rule__FullJvmFormalParameter__NameAssignment_1 )
+            // InternalFormat.g:19232:2: rule__FullJvmFormalParameter__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__FullJvmFormalParameter__NameAssignment_1_in_rule__FullJvmFormalParameter__Group__1__Impl39002);
+            pushFollow(FOLLOW_2);
             rule__FullJvmFormalParameter__NameAssignment_1();
 
             state._fsp--;
@@ -55928,21 +55928,21 @@ public final void rule__FullJvmFormalParameter__Group__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XFeatureCall__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19246:1: rule__XFeatureCall__Group__0 : rule__XFeatureCall__Group__0__Impl rule__XFeatureCall__Group__1 ;
+    // InternalFormat.g:19246:1: rule__XFeatureCall__Group__0 : rule__XFeatureCall__Group__0__Impl rule__XFeatureCall__Group__1 ;
     public final void rule__XFeatureCall__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19250:1: ( rule__XFeatureCall__Group__0__Impl rule__XFeatureCall__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19251:2: rule__XFeatureCall__Group__0__Impl rule__XFeatureCall__Group__1
+            // InternalFormat.g:19250:1: ( rule__XFeatureCall__Group__0__Impl rule__XFeatureCall__Group__1 )
+            // InternalFormat.g:19251:2: rule__XFeatureCall__Group__0__Impl rule__XFeatureCall__Group__1
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group__0__Impl_in_rule__XFeatureCall__Group__039036);
+            pushFollow(FOLLOW_84);
             rule__XFeatureCall__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group__1_in_rule__XFeatureCall__Group__039039);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group__1();
 
             state._fsp--;
@@ -55966,23 +55966,23 @@ public final void rule__XFeatureCall__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19258:1: rule__XFeatureCall__Group__0__Impl : ( () ) ;
+    // InternalFormat.g:19258:1: rule__XFeatureCall__Group__0__Impl : ( () ) ;
     public final void rule__XFeatureCall__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19262:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19263:1: ( () )
+            // InternalFormat.g:19262:1: ( ( () ) )
+            // InternalFormat.g:19263:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19263:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19264:1: ()
+            // InternalFormat.g:19263:1: ( () )
+            // InternalFormat.g:19264:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getXFeatureCallAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19265:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19267:1: 
+            // InternalFormat.g:19265:1: ()
+            // InternalFormat.g:19267:1: 
             {
             }
 
@@ -56007,21 +56007,21 @@ public final void rule__XFeatureCall__Group__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XFeatureCall__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19277:1: rule__XFeatureCall__Group__1 : rule__XFeatureCall__Group__1__Impl rule__XFeatureCall__Group__2 ;
+    // InternalFormat.g:19277:1: rule__XFeatureCall__Group__1 : rule__XFeatureCall__Group__1__Impl rule__XFeatureCall__Group__2 ;
     public final void rule__XFeatureCall__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19281:1: ( rule__XFeatureCall__Group__1__Impl rule__XFeatureCall__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19282:2: rule__XFeatureCall__Group__1__Impl rule__XFeatureCall__Group__2
+            // InternalFormat.g:19281:1: ( rule__XFeatureCall__Group__1__Impl rule__XFeatureCall__Group__2 )
+            // InternalFormat.g:19282:2: rule__XFeatureCall__Group__1__Impl rule__XFeatureCall__Group__2
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group__1__Impl_in_rule__XFeatureCall__Group__139097);
+            pushFollow(FOLLOW_84);
             rule__XFeatureCall__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group__2_in_rule__XFeatureCall__Group__139100);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group__2();
 
             state._fsp--;
@@ -56045,22 +56045,22 @@ public final void rule__XFeatureCall__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19289:1: rule__XFeatureCall__Group__1__Impl : ( ( rule__XFeatureCall__Group_1__0 )? ) ;
+    // InternalFormat.g:19289:1: rule__XFeatureCall__Group__1__Impl : ( ( rule__XFeatureCall__Group_1__0 )? ) ;
     public final void rule__XFeatureCall__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19293:1: ( ( ( rule__XFeatureCall__Group_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19294:1: ( ( rule__XFeatureCall__Group_1__0 )? )
+            // InternalFormat.g:19293:1: ( ( ( rule__XFeatureCall__Group_1__0 )? ) )
+            // InternalFormat.g:19294:1: ( ( rule__XFeatureCall__Group_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19294:1: ( ( rule__XFeatureCall__Group_1__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19295:1: ( rule__XFeatureCall__Group_1__0 )?
+            // InternalFormat.g:19294:1: ( ( rule__XFeatureCall__Group_1__0 )? )
+            // InternalFormat.g:19295:1: ( rule__XFeatureCall__Group_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19296:1: ( rule__XFeatureCall__Group_1__0 )?
+            // InternalFormat.g:19296:1: ( rule__XFeatureCall__Group_1__0 )?
             int alt146=2;
             int LA146_0 = input.LA(1);
 
@@ -56069,9 +56069,9 @@ public final void rule__XFeatureCall__Group__1__Impl() throws RecognitionExcepti
             }
             switch (alt146) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19296:2: rule__XFeatureCall__Group_1__0
+                    // InternalFormat.g:19296:2: rule__XFeatureCall__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__XFeatureCall__Group_1__0_in_rule__XFeatureCall__Group__1__Impl39127);
+                    pushFollow(FOLLOW_2);
                     rule__XFeatureCall__Group_1__0();
 
                     state._fsp--;
@@ -56107,21 +56107,21 @@ public final void rule__XFeatureCall__Group__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XFeatureCall__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19306:1: rule__XFeatureCall__Group__2 : rule__XFeatureCall__Group__2__Impl rule__XFeatureCall__Group__3 ;
+    // InternalFormat.g:19306:1: rule__XFeatureCall__Group__2 : rule__XFeatureCall__Group__2__Impl rule__XFeatureCall__Group__3 ;
     public final void rule__XFeatureCall__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19310:1: ( rule__XFeatureCall__Group__2__Impl rule__XFeatureCall__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19311:2: rule__XFeatureCall__Group__2__Impl rule__XFeatureCall__Group__3
+            // InternalFormat.g:19310:1: ( rule__XFeatureCall__Group__2__Impl rule__XFeatureCall__Group__3 )
+            // InternalFormat.g:19311:2: rule__XFeatureCall__Group__2__Impl rule__XFeatureCall__Group__3
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group__2__Impl_in_rule__XFeatureCall__Group__239158);
+            pushFollow(FOLLOW_85);
             rule__XFeatureCall__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group__3_in_rule__XFeatureCall__Group__239161);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group__3();
 
             state._fsp--;
@@ -56145,25 +56145,25 @@ public final void rule__XFeatureCall__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19318:1: rule__XFeatureCall__Group__2__Impl : ( ( rule__XFeatureCall__FeatureAssignment_2 ) ) ;
+    // InternalFormat.g:19318:1: rule__XFeatureCall__Group__2__Impl : ( ( rule__XFeatureCall__FeatureAssignment_2 ) ) ;
     public final void rule__XFeatureCall__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19322:1: ( ( ( rule__XFeatureCall__FeatureAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19323:1: ( ( rule__XFeatureCall__FeatureAssignment_2 ) )
+            // InternalFormat.g:19322:1: ( ( ( rule__XFeatureCall__FeatureAssignment_2 ) ) )
+            // InternalFormat.g:19323:1: ( ( rule__XFeatureCall__FeatureAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19323:1: ( ( rule__XFeatureCall__FeatureAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19324:1: ( rule__XFeatureCall__FeatureAssignment_2 )
+            // InternalFormat.g:19323:1: ( ( rule__XFeatureCall__FeatureAssignment_2 ) )
+            // InternalFormat.g:19324:1: ( rule__XFeatureCall__FeatureAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19325:1: ( rule__XFeatureCall__FeatureAssignment_2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19325:2: rule__XFeatureCall__FeatureAssignment_2
+            // InternalFormat.g:19325:1: ( rule__XFeatureCall__FeatureAssignment_2 )
+            // InternalFormat.g:19325:2: rule__XFeatureCall__FeatureAssignment_2
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__FeatureAssignment_2_in_rule__XFeatureCall__Group__2__Impl39188);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__FeatureAssignment_2();
 
             state._fsp--;
@@ -56196,21 +56196,21 @@ public final void rule__XFeatureCall__Group__2__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XFeatureCall__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19335:1: rule__XFeatureCall__Group__3 : rule__XFeatureCall__Group__3__Impl rule__XFeatureCall__Group__4 ;
+    // InternalFormat.g:19335:1: rule__XFeatureCall__Group__3 : rule__XFeatureCall__Group__3__Impl rule__XFeatureCall__Group__4 ;
     public final void rule__XFeatureCall__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19339:1: ( rule__XFeatureCall__Group__3__Impl rule__XFeatureCall__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19340:2: rule__XFeatureCall__Group__3__Impl rule__XFeatureCall__Group__4
+            // InternalFormat.g:19339:1: ( rule__XFeatureCall__Group__3__Impl rule__XFeatureCall__Group__4 )
+            // InternalFormat.g:19340:2: rule__XFeatureCall__Group__3__Impl rule__XFeatureCall__Group__4
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group__3__Impl_in_rule__XFeatureCall__Group__339218);
+            pushFollow(FOLLOW_85);
             rule__XFeatureCall__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group__4_in_rule__XFeatureCall__Group__339221);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group__4();
 
             state._fsp--;
@@ -56234,29 +56234,29 @@ public final void rule__XFeatureCall__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19347:1: rule__XFeatureCall__Group__3__Impl : ( ( rule__XFeatureCall__Group_3__0 )? ) ;
+    // InternalFormat.g:19347:1: rule__XFeatureCall__Group__3__Impl : ( ( rule__XFeatureCall__Group_3__0 )? ) ;
     public final void rule__XFeatureCall__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19351:1: ( ( ( rule__XFeatureCall__Group_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19352:1: ( ( rule__XFeatureCall__Group_3__0 )? )
+            // InternalFormat.g:19351:1: ( ( ( rule__XFeatureCall__Group_3__0 )? ) )
+            // InternalFormat.g:19352:1: ( ( rule__XFeatureCall__Group_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19352:1: ( ( rule__XFeatureCall__Group_3__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19353:1: ( rule__XFeatureCall__Group_3__0 )?
+            // InternalFormat.g:19352:1: ( ( rule__XFeatureCall__Group_3__0 )? )
+            // InternalFormat.g:19353:1: ( rule__XFeatureCall__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getGroup_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19354:1: ( rule__XFeatureCall__Group_3__0 )?
+            // InternalFormat.g:19354:1: ( rule__XFeatureCall__Group_3__0 )?
             int alt147=2;
             alt147 = dfa147.predict(input);
             switch (alt147) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19354:2: rule__XFeatureCall__Group_3__0
+                    // InternalFormat.g:19354:2: rule__XFeatureCall__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__XFeatureCall__Group_3__0_in_rule__XFeatureCall__Group__3__Impl39248);
+                    pushFollow(FOLLOW_2);
                     rule__XFeatureCall__Group_3__0();
 
                     state._fsp--;
@@ -56292,16 +56292,16 @@ public final void rule__XFeatureCall__Group__3__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XFeatureCall__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19364:1: rule__XFeatureCall__Group__4 : rule__XFeatureCall__Group__4__Impl ;
+    // InternalFormat.g:19364:1: rule__XFeatureCall__Group__4 : rule__XFeatureCall__Group__4__Impl ;
     public final void rule__XFeatureCall__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19368:1: ( rule__XFeatureCall__Group__4__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19369:2: rule__XFeatureCall__Group__4__Impl
+            // InternalFormat.g:19368:1: ( rule__XFeatureCall__Group__4__Impl )
+            // InternalFormat.g:19369:2: rule__XFeatureCall__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group__4__Impl_in_rule__XFeatureCall__Group__439279);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group__4__Impl();
 
             state._fsp--;
@@ -56325,29 +56325,29 @@ public final void rule__XFeatureCall__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19375:1: rule__XFeatureCall__Group__4__Impl : ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? ) ;
+    // InternalFormat.g:19375:1: rule__XFeatureCall__Group__4__Impl : ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? ) ;
     public final void rule__XFeatureCall__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19379:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19380:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? )
+            // InternalFormat.g:19379:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? ) )
+            // InternalFormat.g:19380:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19380:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19381:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )?
+            // InternalFormat.g:19380:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )? )
+            // InternalFormat.g:19381:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsAssignment_4()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19382:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )?
+            // InternalFormat.g:19382:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )?
             int alt148=2;
             alt148 = dfa148.predict(input);
             switch (alt148) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19382:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_4
+                    // InternalFormat.g:19382:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_4
                     {
-                    pushFollow(FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_4_in_rule__XFeatureCall__Group__4__Impl39306);
+                    pushFollow(FOLLOW_2);
                     rule__XFeatureCall__FeatureCallArgumentsAssignment_4();
 
                     state._fsp--;
@@ -56383,21 +56383,21 @@ public final void rule__XFeatureCall__Group__4__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19402:1: rule__XFeatureCall__Group_1__0 : rule__XFeatureCall__Group_1__0__Impl rule__XFeatureCall__Group_1__1 ;
+    // InternalFormat.g:19402:1: rule__XFeatureCall__Group_1__0 : rule__XFeatureCall__Group_1__0__Impl rule__XFeatureCall__Group_1__1 ;
     public final void rule__XFeatureCall__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19406:1: ( rule__XFeatureCall__Group_1__0__Impl rule__XFeatureCall__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19407:2: rule__XFeatureCall__Group_1__0__Impl rule__XFeatureCall__Group_1__1
+            // InternalFormat.g:19406:1: ( rule__XFeatureCall__Group_1__0__Impl rule__XFeatureCall__Group_1__1 )
+            // InternalFormat.g:19407:2: rule__XFeatureCall__Group_1__0__Impl rule__XFeatureCall__Group_1__1
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_1__0__Impl_in_rule__XFeatureCall__Group_1__039347);
+            pushFollow(FOLLOW_86);
             rule__XFeatureCall__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_1__1_in_rule__XFeatureCall__Group_1__039350);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_1__1();
 
             state._fsp--;
@@ -56421,22 +56421,22 @@ public final void rule__XFeatureCall__Group_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19414:1: rule__XFeatureCall__Group_1__0__Impl : ( '<' ) ;
+    // InternalFormat.g:19414:1: rule__XFeatureCall__Group_1__0__Impl : ( '<' ) ;
     public final void rule__XFeatureCall__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19418:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19419:1: ( '<' )
+            // InternalFormat.g:19418:1: ( ( '<' ) )
+            // InternalFormat.g:19419:1: ( '<' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19419:1: ( '<' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19420:1: '<'
+            // InternalFormat.g:19419:1: ( '<' )
+            // InternalFormat.g:19420:1: '<'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getLessThanSignKeyword_1_0()); 
             }
-            match(input,33,FOLLOW_33_in_rule__XFeatureCall__Group_1__0__Impl39378); if (state.failed) return ;
+            match(input,33,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFeatureCallAccess().getLessThanSignKeyword_1_0()); 
             }
@@ -56462,21 +56462,21 @@ public final void rule__XFeatureCall__Group_1__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19433:1: rule__XFeatureCall__Group_1__1 : rule__XFeatureCall__Group_1__1__Impl rule__XFeatureCall__Group_1__2 ;
+    // InternalFormat.g:19433:1: rule__XFeatureCall__Group_1__1 : rule__XFeatureCall__Group_1__1__Impl rule__XFeatureCall__Group_1__2 ;
     public final void rule__XFeatureCall__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19437:1: ( rule__XFeatureCall__Group_1__1__Impl rule__XFeatureCall__Group_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19438:2: rule__XFeatureCall__Group_1__1__Impl rule__XFeatureCall__Group_1__2
+            // InternalFormat.g:19437:1: ( rule__XFeatureCall__Group_1__1__Impl rule__XFeatureCall__Group_1__2 )
+            // InternalFormat.g:19438:2: rule__XFeatureCall__Group_1__1__Impl rule__XFeatureCall__Group_1__2
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_1__1__Impl_in_rule__XFeatureCall__Group_1__139409);
+            pushFollow(FOLLOW_87);
             rule__XFeatureCall__Group_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_1__2_in_rule__XFeatureCall__Group_1__139412);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_1__2();
 
             state._fsp--;
@@ -56500,25 +56500,25 @@ public final void rule__XFeatureCall__Group_1__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19445:1: rule__XFeatureCall__Group_1__1__Impl : ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) ) ;
+    // InternalFormat.g:19445:1: rule__XFeatureCall__Group_1__1__Impl : ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) ) ;
     public final void rule__XFeatureCall__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19449:1: ( ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19450:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) )
+            // InternalFormat.g:19449:1: ( ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) ) )
+            // InternalFormat.g:19450:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19450:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19451:1: ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 )
+            // InternalFormat.g:19450:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 ) )
+            // InternalFormat.g:19451:1: ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getTypeArgumentsAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19452:1: ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19452:2: rule__XFeatureCall__TypeArgumentsAssignment_1_1
+            // InternalFormat.g:19452:1: ( rule__XFeatureCall__TypeArgumentsAssignment_1_1 )
+            // InternalFormat.g:19452:2: rule__XFeatureCall__TypeArgumentsAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__TypeArgumentsAssignment_1_1_in_rule__XFeatureCall__Group_1__1__Impl39439);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__TypeArgumentsAssignment_1_1();
 
             state._fsp--;
@@ -56551,21 +56551,21 @@ public final void rule__XFeatureCall__Group_1__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19462:1: rule__XFeatureCall__Group_1__2 : rule__XFeatureCall__Group_1__2__Impl rule__XFeatureCall__Group_1__3 ;
+    // InternalFormat.g:19462:1: rule__XFeatureCall__Group_1__2 : rule__XFeatureCall__Group_1__2__Impl rule__XFeatureCall__Group_1__3 ;
     public final void rule__XFeatureCall__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19466:1: ( rule__XFeatureCall__Group_1__2__Impl rule__XFeatureCall__Group_1__3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19467:2: rule__XFeatureCall__Group_1__2__Impl rule__XFeatureCall__Group_1__3
+            // InternalFormat.g:19466:1: ( rule__XFeatureCall__Group_1__2__Impl rule__XFeatureCall__Group_1__3 )
+            // InternalFormat.g:19467:2: rule__XFeatureCall__Group_1__2__Impl rule__XFeatureCall__Group_1__3
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_1__2__Impl_in_rule__XFeatureCall__Group_1__239469);
+            pushFollow(FOLLOW_87);
             rule__XFeatureCall__Group_1__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_1__3_in_rule__XFeatureCall__Group_1__239472);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_1__3();
 
             state._fsp--;
@@ -56589,22 +56589,22 @@ public final void rule__XFeatureCall__Group_1__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19474:1: rule__XFeatureCall__Group_1__2__Impl : ( ( rule__XFeatureCall__Group_1_2__0 )* ) ;
+    // InternalFormat.g:19474:1: rule__XFeatureCall__Group_1__2__Impl : ( ( rule__XFeatureCall__Group_1_2__0 )* ) ;
     public final void rule__XFeatureCall__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19478:1: ( ( ( rule__XFeatureCall__Group_1_2__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19479:1: ( ( rule__XFeatureCall__Group_1_2__0 )* )
+            // InternalFormat.g:19478:1: ( ( ( rule__XFeatureCall__Group_1_2__0 )* ) )
+            // InternalFormat.g:19479:1: ( ( rule__XFeatureCall__Group_1_2__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19479:1: ( ( rule__XFeatureCall__Group_1_2__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19480:1: ( rule__XFeatureCall__Group_1_2__0 )*
+            // InternalFormat.g:19479:1: ( ( rule__XFeatureCall__Group_1_2__0 )* )
+            // InternalFormat.g:19480:1: ( rule__XFeatureCall__Group_1_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getGroup_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19481:1: ( rule__XFeatureCall__Group_1_2__0 )*
+            // InternalFormat.g:19481:1: ( rule__XFeatureCall__Group_1_2__0 )*
             loop149:
             do {
                 int alt149=2;
@@ -56617,9 +56617,9 @@ public final void rule__XFeatureCall__Group_1__2__Impl() throws RecognitionExcep
 
                 switch (alt149) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19481:2: rule__XFeatureCall__Group_1_2__0
+            	    // InternalFormat.g:19481:2: rule__XFeatureCall__Group_1_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__XFeatureCall__Group_1_2__0_in_rule__XFeatureCall__Group_1__2__Impl39499);
+            	    pushFollow(FOLLOW_23);
             	    rule__XFeatureCall__Group_1_2__0();
 
             	    state._fsp--;
@@ -56658,16 +56658,16 @@ public final void rule__XFeatureCall__Group_1__2__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19491:1: rule__XFeatureCall__Group_1__3 : rule__XFeatureCall__Group_1__3__Impl ;
+    // InternalFormat.g:19491:1: rule__XFeatureCall__Group_1__3 : rule__XFeatureCall__Group_1__3__Impl ;
     public final void rule__XFeatureCall__Group_1__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19495:1: ( rule__XFeatureCall__Group_1__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19496:2: rule__XFeatureCall__Group_1__3__Impl
+            // InternalFormat.g:19495:1: ( rule__XFeatureCall__Group_1__3__Impl )
+            // InternalFormat.g:19496:2: rule__XFeatureCall__Group_1__3__Impl
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_1__3__Impl_in_rule__XFeatureCall__Group_1__339530);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_1__3__Impl();
 
             state._fsp--;
@@ -56691,22 +56691,22 @@ public final void rule__XFeatureCall__Group_1__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19502:1: rule__XFeatureCall__Group_1__3__Impl : ( '>' ) ;
+    // InternalFormat.g:19502:1: rule__XFeatureCall__Group_1__3__Impl : ( '>' ) ;
     public final void rule__XFeatureCall__Group_1__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19506:1: ( ( '>' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19507:1: ( '>' )
+            // InternalFormat.g:19506:1: ( ( '>' ) )
+            // InternalFormat.g:19507:1: ( '>' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19507:1: ( '>' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19508:1: '>'
+            // InternalFormat.g:19507:1: ( '>' )
+            // InternalFormat.g:19508:1: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getGreaterThanSignKeyword_1_3()); 
             }
-            match(input,32,FOLLOW_32_in_rule__XFeatureCall__Group_1__3__Impl39558); if (state.failed) return ;
+            match(input,32,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFeatureCallAccess().getGreaterThanSignKeyword_1_3()); 
             }
@@ -56732,21 +56732,21 @@ public final void rule__XFeatureCall__Group_1__3__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1_2__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19529:1: rule__XFeatureCall__Group_1_2__0 : rule__XFeatureCall__Group_1_2__0__Impl rule__XFeatureCall__Group_1_2__1 ;
+    // InternalFormat.g:19529:1: rule__XFeatureCall__Group_1_2__0 : rule__XFeatureCall__Group_1_2__0__Impl rule__XFeatureCall__Group_1_2__1 ;
     public final void rule__XFeatureCall__Group_1_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19533:1: ( rule__XFeatureCall__Group_1_2__0__Impl rule__XFeatureCall__Group_1_2__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19534:2: rule__XFeatureCall__Group_1_2__0__Impl rule__XFeatureCall__Group_1_2__1
+            // InternalFormat.g:19533:1: ( rule__XFeatureCall__Group_1_2__0__Impl rule__XFeatureCall__Group_1_2__1 )
+            // InternalFormat.g:19534:2: rule__XFeatureCall__Group_1_2__0__Impl rule__XFeatureCall__Group_1_2__1
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_1_2__0__Impl_in_rule__XFeatureCall__Group_1_2__039597);
+            pushFollow(FOLLOW_86);
             rule__XFeatureCall__Group_1_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_1_2__1_in_rule__XFeatureCall__Group_1_2__039600);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_1_2__1();
 
             state._fsp--;
@@ -56770,22 +56770,22 @@ public final void rule__XFeatureCall__Group_1_2__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1_2__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19541:1: rule__XFeatureCall__Group_1_2__0__Impl : ( ',' ) ;
+    // InternalFormat.g:19541:1: rule__XFeatureCall__Group_1_2__0__Impl : ( ',' ) ;
     public final void rule__XFeatureCall__Group_1_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19545:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19546:1: ( ',' )
+            // InternalFormat.g:19545:1: ( ( ',' ) )
+            // InternalFormat.g:19546:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19546:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19547:1: ','
+            // InternalFormat.g:19546:1: ( ',' )
+            // InternalFormat.g:19547:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getCommaKeyword_1_2_0()); 
             }
-            match(input,71,FOLLOW_71_in_rule__XFeatureCall__Group_1_2__0__Impl39628); if (state.failed) return ;
+            match(input,71,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFeatureCallAccess().getCommaKeyword_1_2_0()); 
             }
@@ -56811,16 +56811,16 @@ public final void rule__XFeatureCall__Group_1_2__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1_2__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19560:1: rule__XFeatureCall__Group_1_2__1 : rule__XFeatureCall__Group_1_2__1__Impl ;
+    // InternalFormat.g:19560:1: rule__XFeatureCall__Group_1_2__1 : rule__XFeatureCall__Group_1_2__1__Impl ;
     public final void rule__XFeatureCall__Group_1_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19564:1: ( rule__XFeatureCall__Group_1_2__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19565:2: rule__XFeatureCall__Group_1_2__1__Impl
+            // InternalFormat.g:19564:1: ( rule__XFeatureCall__Group_1_2__1__Impl )
+            // InternalFormat.g:19565:2: rule__XFeatureCall__Group_1_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_1_2__1__Impl_in_rule__XFeatureCall__Group_1_2__139659);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_1_2__1__Impl();
 
             state._fsp--;
@@ -56844,25 +56844,25 @@ public final void rule__XFeatureCall__Group_1_2__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XFeatureCall__Group_1_2__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19571:1: rule__XFeatureCall__Group_1_2__1__Impl : ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) ) ;
+    // InternalFormat.g:19571:1: rule__XFeatureCall__Group_1_2__1__Impl : ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) ) ;
     public final void rule__XFeatureCall__Group_1_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19575:1: ( ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19576:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) )
+            // InternalFormat.g:19575:1: ( ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) ) )
+            // InternalFormat.g:19576:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19576:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19577:1: ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 )
+            // InternalFormat.g:19576:1: ( ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 ) )
+            // InternalFormat.g:19577:1: ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getTypeArgumentsAssignment_1_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19578:1: ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19578:2: rule__XFeatureCall__TypeArgumentsAssignment_1_2_1
+            // InternalFormat.g:19578:1: ( rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 )
+            // InternalFormat.g:19578:2: rule__XFeatureCall__TypeArgumentsAssignment_1_2_1
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__TypeArgumentsAssignment_1_2_1_in_rule__XFeatureCall__Group_1_2__1__Impl39686);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__TypeArgumentsAssignment_1_2_1();
 
             state._fsp--;
@@ -56895,21 +56895,21 @@ public final void rule__XFeatureCall__Group_1_2__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19592:1: rule__XFeatureCall__Group_3__0 : rule__XFeatureCall__Group_3__0__Impl rule__XFeatureCall__Group_3__1 ;
+    // InternalFormat.g:19592:1: rule__XFeatureCall__Group_3__0 : rule__XFeatureCall__Group_3__0__Impl rule__XFeatureCall__Group_3__1 ;
     public final void rule__XFeatureCall__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19596:1: ( rule__XFeatureCall__Group_3__0__Impl rule__XFeatureCall__Group_3__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19597:2: rule__XFeatureCall__Group_3__0__Impl rule__XFeatureCall__Group_3__1
+            // InternalFormat.g:19596:1: ( rule__XFeatureCall__Group_3__0__Impl rule__XFeatureCall__Group_3__1 )
+            // InternalFormat.g:19597:2: rule__XFeatureCall__Group_3__0__Impl rule__XFeatureCall__Group_3__1
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3__0__Impl_in_rule__XFeatureCall__Group_3__039720);
+            pushFollow(FOLLOW_88);
             rule__XFeatureCall__Group_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3__1_in_rule__XFeatureCall__Group_3__039723);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_3__1();
 
             state._fsp--;
@@ -56933,25 +56933,25 @@ public final void rule__XFeatureCall__Group_3__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19604:1: rule__XFeatureCall__Group_3__0__Impl : ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) ) ;
+    // InternalFormat.g:19604:1: rule__XFeatureCall__Group_3__0__Impl : ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) ) ;
     public final void rule__XFeatureCall__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19608:1: ( ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19609:1: ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) )
+            // InternalFormat.g:19608:1: ( ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) ) )
+            // InternalFormat.g:19609:1: ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19609:1: ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19610:1: ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 )
+            // InternalFormat.g:19609:1: ( ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 ) )
+            // InternalFormat.g:19610:1: ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getExplicitOperationCallAssignment_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19611:1: ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19611:2: rule__XFeatureCall__ExplicitOperationCallAssignment_3_0
+            // InternalFormat.g:19611:1: ( rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 )
+            // InternalFormat.g:19611:2: rule__XFeatureCall__ExplicitOperationCallAssignment_3_0
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__ExplicitOperationCallAssignment_3_0_in_rule__XFeatureCall__Group_3__0__Impl39750);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__ExplicitOperationCallAssignment_3_0();
 
             state._fsp--;
@@ -56984,21 +56984,21 @@ public final void rule__XFeatureCall__Group_3__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19621:1: rule__XFeatureCall__Group_3__1 : rule__XFeatureCall__Group_3__1__Impl rule__XFeatureCall__Group_3__2 ;
+    // InternalFormat.g:19621:1: rule__XFeatureCall__Group_3__1 : rule__XFeatureCall__Group_3__1__Impl rule__XFeatureCall__Group_3__2 ;
     public final void rule__XFeatureCall__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19625:1: ( rule__XFeatureCall__Group_3__1__Impl rule__XFeatureCall__Group_3__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19626:2: rule__XFeatureCall__Group_3__1__Impl rule__XFeatureCall__Group_3__2
+            // InternalFormat.g:19625:1: ( rule__XFeatureCall__Group_3__1__Impl rule__XFeatureCall__Group_3__2 )
+            // InternalFormat.g:19626:2: rule__XFeatureCall__Group_3__1__Impl rule__XFeatureCall__Group_3__2
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3__1__Impl_in_rule__XFeatureCall__Group_3__139780);
+            pushFollow(FOLLOW_88);
             rule__XFeatureCall__Group_3__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3__2_in_rule__XFeatureCall__Group_3__139783);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_3__2();
 
             state._fsp--;
@@ -57022,22 +57022,22 @@ public final void rule__XFeatureCall__Group_3__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19633:1: rule__XFeatureCall__Group_3__1__Impl : ( ( rule__XFeatureCall__Alternatives_3_1 )? ) ;
+    // InternalFormat.g:19633:1: rule__XFeatureCall__Group_3__1__Impl : ( ( rule__XFeatureCall__Alternatives_3_1 )? ) ;
     public final void rule__XFeatureCall__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19637:1: ( ( ( rule__XFeatureCall__Alternatives_3_1 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19638:1: ( ( rule__XFeatureCall__Alternatives_3_1 )? )
+            // InternalFormat.g:19637:1: ( ( ( rule__XFeatureCall__Alternatives_3_1 )? ) )
+            // InternalFormat.g:19638:1: ( ( rule__XFeatureCall__Alternatives_3_1 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19638:1: ( ( rule__XFeatureCall__Alternatives_3_1 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19639:1: ( rule__XFeatureCall__Alternatives_3_1 )?
+            // InternalFormat.g:19638:1: ( ( rule__XFeatureCall__Alternatives_3_1 )? )
+            // InternalFormat.g:19639:1: ( rule__XFeatureCall__Alternatives_3_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getAlternatives_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19640:1: ( rule__XFeatureCall__Alternatives_3_1 )?
+            // InternalFormat.g:19640:1: ( rule__XFeatureCall__Alternatives_3_1 )?
             int alt150=2;
             int LA150_0 = input.LA(1);
 
@@ -57046,9 +57046,9 @@ public final void rule__XFeatureCall__Group_3__1__Impl() throws RecognitionExcep
             }
             switch (alt150) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19640:2: rule__XFeatureCall__Alternatives_3_1
+                    // InternalFormat.g:19640:2: rule__XFeatureCall__Alternatives_3_1
                     {
-                    pushFollow(FOLLOW_rule__XFeatureCall__Alternatives_3_1_in_rule__XFeatureCall__Group_3__1__Impl39810);
+                    pushFollow(FOLLOW_2);
                     rule__XFeatureCall__Alternatives_3_1();
 
                     state._fsp--;
@@ -57084,16 +57084,16 @@ public final void rule__XFeatureCall__Group_3__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19650:1: rule__XFeatureCall__Group_3__2 : rule__XFeatureCall__Group_3__2__Impl ;
+    // InternalFormat.g:19650:1: rule__XFeatureCall__Group_3__2 : rule__XFeatureCall__Group_3__2__Impl ;
     public final void rule__XFeatureCall__Group_3__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19654:1: ( rule__XFeatureCall__Group_3__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19655:2: rule__XFeatureCall__Group_3__2__Impl
+            // InternalFormat.g:19654:1: ( rule__XFeatureCall__Group_3__2__Impl )
+            // InternalFormat.g:19655:2: rule__XFeatureCall__Group_3__2__Impl
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3__2__Impl_in_rule__XFeatureCall__Group_3__239841);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_3__2__Impl();
 
             state._fsp--;
@@ -57117,22 +57117,22 @@ public final void rule__XFeatureCall__Group_3__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19661:1: rule__XFeatureCall__Group_3__2__Impl : ( ')' ) ;
+    // InternalFormat.g:19661:1: rule__XFeatureCall__Group_3__2__Impl : ( ')' ) ;
     public final void rule__XFeatureCall__Group_3__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19665:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19666:1: ( ')' )
+            // InternalFormat.g:19665:1: ( ( ')' ) )
+            // InternalFormat.g:19666:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19666:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19667:1: ')'
+            // InternalFormat.g:19666:1: ( ')' )
+            // InternalFormat.g:19667:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getRightParenthesisKeyword_3_2()); 
             }
-            match(input,75,FOLLOW_75_in_rule__XFeatureCall__Group_3__2__Impl39869); if (state.failed) return ;
+            match(input,75,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFeatureCallAccess().getRightParenthesisKeyword_3_2()); 
             }
@@ -57158,21 +57158,21 @@ public final void rule__XFeatureCall__Group_3__2__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19686:1: rule__XFeatureCall__Group_3_1_1__0 : rule__XFeatureCall__Group_3_1_1__0__Impl rule__XFeatureCall__Group_3_1_1__1 ;
+    // InternalFormat.g:19686:1: rule__XFeatureCall__Group_3_1_1__0 : rule__XFeatureCall__Group_3_1_1__0__Impl rule__XFeatureCall__Group_3_1_1__1 ;
     public final void rule__XFeatureCall__Group_3_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19690:1: ( rule__XFeatureCall__Group_3_1_1__0__Impl rule__XFeatureCall__Group_3_1_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19691:2: rule__XFeatureCall__Group_3_1_1__0__Impl rule__XFeatureCall__Group_3_1_1__1
+            // InternalFormat.g:19690:1: ( rule__XFeatureCall__Group_3_1_1__0__Impl rule__XFeatureCall__Group_3_1_1__1 )
+            // InternalFormat.g:19691:2: rule__XFeatureCall__Group_3_1_1__0__Impl rule__XFeatureCall__Group_3_1_1__1
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3_1_1__0__Impl_in_rule__XFeatureCall__Group_3_1_1__039906);
+            pushFollow(FOLLOW_46);
             rule__XFeatureCall__Group_3_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3_1_1__1_in_rule__XFeatureCall__Group_3_1_1__039909);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_3_1_1__1();
 
             state._fsp--;
@@ -57196,25 +57196,25 @@ public final void rule__XFeatureCall__Group_3_1_1__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19698:1: rule__XFeatureCall__Group_3_1_1__0__Impl : ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) ) ;
+    // InternalFormat.g:19698:1: rule__XFeatureCall__Group_3_1_1__0__Impl : ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) ) ;
     public final void rule__XFeatureCall__Group_3_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19702:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19703:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) )
+            // InternalFormat.g:19702:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) ) )
+            // InternalFormat.g:19703:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19703:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19704:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 )
+            // InternalFormat.g:19703:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 ) )
+            // InternalFormat.g:19704:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsAssignment_3_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19705:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19705:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0
+            // InternalFormat.g:19705:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 )
+            // InternalFormat.g:19705:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0_in_rule__XFeatureCall__Group_3_1_1__0__Impl39936);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0();
 
             state._fsp--;
@@ -57247,16 +57247,16 @@ public final void rule__XFeatureCall__Group_3_1_1__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19715:1: rule__XFeatureCall__Group_3_1_1__1 : rule__XFeatureCall__Group_3_1_1__1__Impl ;
+    // InternalFormat.g:19715:1: rule__XFeatureCall__Group_3_1_1__1 : rule__XFeatureCall__Group_3_1_1__1__Impl ;
     public final void rule__XFeatureCall__Group_3_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19719:1: ( rule__XFeatureCall__Group_3_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19720:2: rule__XFeatureCall__Group_3_1_1__1__Impl
+            // InternalFormat.g:19719:1: ( rule__XFeatureCall__Group_3_1_1__1__Impl )
+            // InternalFormat.g:19720:2: rule__XFeatureCall__Group_3_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3_1_1__1__Impl_in_rule__XFeatureCall__Group_3_1_1__139966);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_3_1_1__1__Impl();
 
             state._fsp--;
@@ -57280,22 +57280,22 @@ public final void rule__XFeatureCall__Group_3_1_1__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19726:1: rule__XFeatureCall__Group_3_1_1__1__Impl : ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* ) ;
+    // InternalFormat.g:19726:1: rule__XFeatureCall__Group_3_1_1__1__Impl : ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* ) ;
     public final void rule__XFeatureCall__Group_3_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19730:1: ( ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19731:1: ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* )
+            // InternalFormat.g:19730:1: ( ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* ) )
+            // InternalFormat.g:19731:1: ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19731:1: ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19732:1: ( rule__XFeatureCall__Group_3_1_1_1__0 )*
+            // InternalFormat.g:19731:1: ( ( rule__XFeatureCall__Group_3_1_1_1__0 )* )
+            // InternalFormat.g:19732:1: ( rule__XFeatureCall__Group_3_1_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getGroup_3_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19733:1: ( rule__XFeatureCall__Group_3_1_1_1__0 )*
+            // InternalFormat.g:19733:1: ( rule__XFeatureCall__Group_3_1_1_1__0 )*
             loop151:
             do {
                 int alt151=2;
@@ -57308,9 +57308,9 @@ public final void rule__XFeatureCall__Group_3_1_1__1__Impl() throws RecognitionE
 
                 switch (alt151) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19733:2: rule__XFeatureCall__Group_3_1_1_1__0
+            	    // InternalFormat.g:19733:2: rule__XFeatureCall__Group_3_1_1_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XFeatureCall__Group_3_1_1_1__0_in_rule__XFeatureCall__Group_3_1_1__1__Impl39993);
+            	    pushFollow(FOLLOW_23);
             	    rule__XFeatureCall__Group_3_1_1_1__0();
 
             	    state._fsp--;
@@ -57349,21 +57349,21 @@ public final void rule__XFeatureCall__Group_3_1_1__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19747:1: rule__XFeatureCall__Group_3_1_1_1__0 : rule__XFeatureCall__Group_3_1_1_1__0__Impl rule__XFeatureCall__Group_3_1_1_1__1 ;
+    // InternalFormat.g:19747:1: rule__XFeatureCall__Group_3_1_1_1__0 : rule__XFeatureCall__Group_3_1_1_1__0__Impl rule__XFeatureCall__Group_3_1_1_1__1 ;
     public final void rule__XFeatureCall__Group_3_1_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19751:1: ( rule__XFeatureCall__Group_3_1_1_1__0__Impl rule__XFeatureCall__Group_3_1_1_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19752:2: rule__XFeatureCall__Group_3_1_1_1__0__Impl rule__XFeatureCall__Group_3_1_1_1__1
+            // InternalFormat.g:19751:1: ( rule__XFeatureCall__Group_3_1_1_1__0__Impl rule__XFeatureCall__Group_3_1_1_1__1 )
+            // InternalFormat.g:19752:2: rule__XFeatureCall__Group_3_1_1_1__0__Impl rule__XFeatureCall__Group_3_1_1_1__1
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3_1_1_1__0__Impl_in_rule__XFeatureCall__Group_3_1_1_1__040028);
+            pushFollow(FOLLOW_50);
             rule__XFeatureCall__Group_3_1_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3_1_1_1__1_in_rule__XFeatureCall__Group_3_1_1_1__040031);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_3_1_1_1__1();
 
             state._fsp--;
@@ -57387,22 +57387,22 @@ public final void rule__XFeatureCall__Group_3_1_1_1__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19759:1: rule__XFeatureCall__Group_3_1_1_1__0__Impl : ( ',' ) ;
+    // InternalFormat.g:19759:1: rule__XFeatureCall__Group_3_1_1_1__0__Impl : ( ',' ) ;
     public final void rule__XFeatureCall__Group_3_1_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19763:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19764:1: ( ',' )
+            // InternalFormat.g:19763:1: ( ( ',' ) )
+            // InternalFormat.g:19764:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19764:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19765:1: ','
+            // InternalFormat.g:19764:1: ( ',' )
+            // InternalFormat.g:19765:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getCommaKeyword_3_1_1_1_0()); 
             }
-            match(input,71,FOLLOW_71_in_rule__XFeatureCall__Group_3_1_1_1__0__Impl40059); if (state.failed) return ;
+            match(input,71,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFeatureCallAccess().getCommaKeyword_3_1_1_1_0()); 
             }
@@ -57428,16 +57428,16 @@ public final void rule__XFeatureCall__Group_3_1_1_1__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19778:1: rule__XFeatureCall__Group_3_1_1_1__1 : rule__XFeatureCall__Group_3_1_1_1__1__Impl ;
+    // InternalFormat.g:19778:1: rule__XFeatureCall__Group_3_1_1_1__1 : rule__XFeatureCall__Group_3_1_1_1__1__Impl ;
     public final void rule__XFeatureCall__Group_3_1_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19782:1: ( rule__XFeatureCall__Group_3_1_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19783:2: rule__XFeatureCall__Group_3_1_1_1__1__Impl
+            // InternalFormat.g:19782:1: ( rule__XFeatureCall__Group_3_1_1_1__1__Impl )
+            // InternalFormat.g:19783:2: rule__XFeatureCall__Group_3_1_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__Group_3_1_1_1__1__Impl_in_rule__XFeatureCall__Group_3_1_1_1__140090);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__Group_3_1_1_1__1__Impl();
 
             state._fsp--;
@@ -57461,25 +57461,25 @@ public final void rule__XFeatureCall__Group_3_1_1_1__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFeatureCall__Group_3_1_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19789:1: rule__XFeatureCall__Group_3_1_1_1__1__Impl : ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) ) ;
+    // InternalFormat.g:19789:1: rule__XFeatureCall__Group_3_1_1_1__1__Impl : ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) ) ;
     public final void rule__XFeatureCall__Group_3_1_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19793:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19794:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) )
+            // InternalFormat.g:19793:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) ) )
+            // InternalFormat.g:19794:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19794:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19795:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 )
+            // InternalFormat.g:19794:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 ) )
+            // InternalFormat.g:19795:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsAssignment_3_1_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19796:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19796:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1
+            // InternalFormat.g:19796:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 )
+            // InternalFormat.g:19796:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1
             {
-            pushFollow(FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1_in_rule__XFeatureCall__Group_3_1_1_1__1__Impl40117);
+            pushFollow(FOLLOW_2);
             rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1();
 
             state._fsp--;
@@ -57512,21 +57512,21 @@ public final void rule__XFeatureCall__Group_3_1_1_1__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XConstructorCall__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19810:1: rule__XConstructorCall__Group__0 : rule__XConstructorCall__Group__0__Impl rule__XConstructorCall__Group__1 ;
+    // InternalFormat.g:19810:1: rule__XConstructorCall__Group__0 : rule__XConstructorCall__Group__0__Impl rule__XConstructorCall__Group__1 ;
     public final void rule__XConstructorCall__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19814:1: ( rule__XConstructorCall__Group__0__Impl rule__XConstructorCall__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19815:2: rule__XConstructorCall__Group__0__Impl rule__XConstructorCall__Group__1
+            // InternalFormat.g:19814:1: ( rule__XConstructorCall__Group__0__Impl rule__XConstructorCall__Group__1 )
+            // InternalFormat.g:19815:2: rule__XConstructorCall__Group__0__Impl rule__XConstructorCall__Group__1
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__0__Impl_in_rule__XConstructorCall__Group__040151);
+            pushFollow(FOLLOW_108);
             rule__XConstructorCall__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__1_in_rule__XConstructorCall__Group__040154);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group__1();
 
             state._fsp--;
@@ -57550,23 +57550,23 @@ public final void rule__XConstructorCall__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XConstructorCall__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19822:1: rule__XConstructorCall__Group__0__Impl : ( () ) ;
+    // InternalFormat.g:19822:1: rule__XConstructorCall__Group__0__Impl : ( () ) ;
     public final void rule__XConstructorCall__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19826:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19827:1: ( () )
+            // InternalFormat.g:19826:1: ( ( () ) )
+            // InternalFormat.g:19827:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19827:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19828:1: ()
+            // InternalFormat.g:19827:1: ( () )
+            // InternalFormat.g:19828:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getXConstructorCallAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19829:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19831:1: 
+            // InternalFormat.g:19829:1: ()
+            // InternalFormat.g:19831:1: 
             {
             }
 
@@ -57591,21 +57591,21 @@ public final void rule__XConstructorCall__Group__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XConstructorCall__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19841:1: rule__XConstructorCall__Group__1 : rule__XConstructorCall__Group__1__Impl rule__XConstructorCall__Group__2 ;
+    // InternalFormat.g:19841:1: rule__XConstructorCall__Group__1 : rule__XConstructorCall__Group__1__Impl rule__XConstructorCall__Group__2 ;
     public final void rule__XConstructorCall__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19845:1: ( rule__XConstructorCall__Group__1__Impl rule__XConstructorCall__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19846:2: rule__XConstructorCall__Group__1__Impl rule__XConstructorCall__Group__2
+            // InternalFormat.g:19845:1: ( rule__XConstructorCall__Group__1__Impl rule__XConstructorCall__Group__2 )
+            // InternalFormat.g:19846:2: rule__XConstructorCall__Group__1__Impl rule__XConstructorCall__Group__2
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__1__Impl_in_rule__XConstructorCall__Group__140212);
+            pushFollow(FOLLOW_9);
             rule__XConstructorCall__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__2_in_rule__XConstructorCall__Group__140215);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group__2();
 
             state._fsp--;
@@ -57629,22 +57629,22 @@ public final void rule__XConstructorCall__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XConstructorCall__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19853:1: rule__XConstructorCall__Group__1__Impl : ( 'new' ) ;
+    // InternalFormat.g:19853:1: rule__XConstructorCall__Group__1__Impl : ( 'new' ) ;
     public final void rule__XConstructorCall__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19857:1: ( ( 'new' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19858:1: ( 'new' )
+            // InternalFormat.g:19857:1: ( ( 'new' ) )
+            // InternalFormat.g:19858:1: ( 'new' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19858:1: ( 'new' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19859:1: 'new'
+            // InternalFormat.g:19858:1: ( 'new' )
+            // InternalFormat.g:19859:1: 'new'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getNewKeyword_1()); 
             }
-            match(input,93,FOLLOW_93_in_rule__XConstructorCall__Group__1__Impl40243); if (state.failed) return ;
+            match(input,93,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstructorCallAccess().getNewKeyword_1()); 
             }
@@ -57670,21 +57670,21 @@ public final void rule__XConstructorCall__Group__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XConstructorCall__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19872:1: rule__XConstructorCall__Group__2 : rule__XConstructorCall__Group__2__Impl rule__XConstructorCall__Group__3 ;
+    // InternalFormat.g:19872:1: rule__XConstructorCall__Group__2 : rule__XConstructorCall__Group__2__Impl rule__XConstructorCall__Group__3 ;
     public final void rule__XConstructorCall__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19876:1: ( rule__XConstructorCall__Group__2__Impl rule__XConstructorCall__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19877:2: rule__XConstructorCall__Group__2__Impl rule__XConstructorCall__Group__3
+            // InternalFormat.g:19876:1: ( rule__XConstructorCall__Group__2__Impl rule__XConstructorCall__Group__3 )
+            // InternalFormat.g:19877:2: rule__XConstructorCall__Group__2__Impl rule__XConstructorCall__Group__3
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__2__Impl_in_rule__XConstructorCall__Group__240274);
+            pushFollow(FOLLOW_109);
             rule__XConstructorCall__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__3_in_rule__XConstructorCall__Group__240277);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group__3();
 
             state._fsp--;
@@ -57708,25 +57708,25 @@ public final void rule__XConstructorCall__Group__2() throws RecognitionException
 
 
     // $ANTLR start "rule__XConstructorCall__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19884:1: rule__XConstructorCall__Group__2__Impl : ( ( rule__XConstructorCall__ConstructorAssignment_2 ) ) ;
+    // InternalFormat.g:19884:1: rule__XConstructorCall__Group__2__Impl : ( ( rule__XConstructorCall__ConstructorAssignment_2 ) ) ;
     public final void rule__XConstructorCall__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19888:1: ( ( ( rule__XConstructorCall__ConstructorAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19889:1: ( ( rule__XConstructorCall__ConstructorAssignment_2 ) )
+            // InternalFormat.g:19888:1: ( ( ( rule__XConstructorCall__ConstructorAssignment_2 ) ) )
+            // InternalFormat.g:19889:1: ( ( rule__XConstructorCall__ConstructorAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19889:1: ( ( rule__XConstructorCall__ConstructorAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19890:1: ( rule__XConstructorCall__ConstructorAssignment_2 )
+            // InternalFormat.g:19889:1: ( ( rule__XConstructorCall__ConstructorAssignment_2 ) )
+            // InternalFormat.g:19890:1: ( rule__XConstructorCall__ConstructorAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getConstructorAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19891:1: ( rule__XConstructorCall__ConstructorAssignment_2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19891:2: rule__XConstructorCall__ConstructorAssignment_2
+            // InternalFormat.g:19891:1: ( rule__XConstructorCall__ConstructorAssignment_2 )
+            // InternalFormat.g:19891:2: rule__XConstructorCall__ConstructorAssignment_2
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__ConstructorAssignment_2_in_rule__XConstructorCall__Group__2__Impl40304);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__ConstructorAssignment_2();
 
             state._fsp--;
@@ -57759,21 +57759,21 @@ public final void rule__XConstructorCall__Group__2__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XConstructorCall__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19901:1: rule__XConstructorCall__Group__3 : rule__XConstructorCall__Group__3__Impl rule__XConstructorCall__Group__4 ;
+    // InternalFormat.g:19901:1: rule__XConstructorCall__Group__3 : rule__XConstructorCall__Group__3__Impl rule__XConstructorCall__Group__4 ;
     public final void rule__XConstructorCall__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19905:1: ( rule__XConstructorCall__Group__3__Impl rule__XConstructorCall__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19906:2: rule__XConstructorCall__Group__3__Impl rule__XConstructorCall__Group__4
+            // InternalFormat.g:19905:1: ( rule__XConstructorCall__Group__3__Impl rule__XConstructorCall__Group__4 )
+            // InternalFormat.g:19906:2: rule__XConstructorCall__Group__3__Impl rule__XConstructorCall__Group__4
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__3__Impl_in_rule__XConstructorCall__Group__340334);
+            pushFollow(FOLLOW_109);
             rule__XConstructorCall__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__4_in_rule__XConstructorCall__Group__340337);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group__4();
 
             state._fsp--;
@@ -57797,29 +57797,29 @@ public final void rule__XConstructorCall__Group__3() throws RecognitionException
 
 
     // $ANTLR start "rule__XConstructorCall__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19913:1: rule__XConstructorCall__Group__3__Impl : ( ( rule__XConstructorCall__Group_3__0 )? ) ;
+    // InternalFormat.g:19913:1: rule__XConstructorCall__Group__3__Impl : ( ( rule__XConstructorCall__Group_3__0 )? ) ;
     public final void rule__XConstructorCall__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19917:1: ( ( ( rule__XConstructorCall__Group_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19918:1: ( ( rule__XConstructorCall__Group_3__0 )? )
+            // InternalFormat.g:19917:1: ( ( ( rule__XConstructorCall__Group_3__0 )? ) )
+            // InternalFormat.g:19918:1: ( ( rule__XConstructorCall__Group_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19918:1: ( ( rule__XConstructorCall__Group_3__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19919:1: ( rule__XConstructorCall__Group_3__0 )?
+            // InternalFormat.g:19918:1: ( ( rule__XConstructorCall__Group_3__0 )? )
+            // InternalFormat.g:19919:1: ( rule__XConstructorCall__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getGroup_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19920:1: ( rule__XConstructorCall__Group_3__0 )?
+            // InternalFormat.g:19920:1: ( rule__XConstructorCall__Group_3__0 )?
             int alt152=2;
             alt152 = dfa152.predict(input);
             switch (alt152) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19920:2: rule__XConstructorCall__Group_3__0
+                    // InternalFormat.g:19920:2: rule__XConstructorCall__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__XConstructorCall__Group_3__0_in_rule__XConstructorCall__Group__3__Impl40364);
+                    pushFollow(FOLLOW_2);
                     rule__XConstructorCall__Group_3__0();
 
                     state._fsp--;
@@ -57855,21 +57855,21 @@ public final void rule__XConstructorCall__Group__3__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XConstructorCall__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19930:1: rule__XConstructorCall__Group__4 : rule__XConstructorCall__Group__4__Impl rule__XConstructorCall__Group__5 ;
+    // InternalFormat.g:19930:1: rule__XConstructorCall__Group__4 : rule__XConstructorCall__Group__4__Impl rule__XConstructorCall__Group__5 ;
     public final void rule__XConstructorCall__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19934:1: ( rule__XConstructorCall__Group__4__Impl rule__XConstructorCall__Group__5 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19935:2: rule__XConstructorCall__Group__4__Impl rule__XConstructorCall__Group__5
+            // InternalFormat.g:19934:1: ( rule__XConstructorCall__Group__4__Impl rule__XConstructorCall__Group__5 )
+            // InternalFormat.g:19935:2: rule__XConstructorCall__Group__4__Impl rule__XConstructorCall__Group__5
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__4__Impl_in_rule__XConstructorCall__Group__440395);
+            pushFollow(FOLLOW_109);
             rule__XConstructorCall__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__5_in_rule__XConstructorCall__Group__440398);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group__5();
 
             state._fsp--;
@@ -57893,29 +57893,29 @@ public final void rule__XConstructorCall__Group__4() throws RecognitionException
 
 
     // $ANTLR start "rule__XConstructorCall__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19942:1: rule__XConstructorCall__Group__4__Impl : ( ( rule__XConstructorCall__Group_4__0 )? ) ;
+    // InternalFormat.g:19942:1: rule__XConstructorCall__Group__4__Impl : ( ( rule__XConstructorCall__Group_4__0 )? ) ;
     public final void rule__XConstructorCall__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19946:1: ( ( ( rule__XConstructorCall__Group_4__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19947:1: ( ( rule__XConstructorCall__Group_4__0 )? )
+            // InternalFormat.g:19946:1: ( ( ( rule__XConstructorCall__Group_4__0 )? ) )
+            // InternalFormat.g:19947:1: ( ( rule__XConstructorCall__Group_4__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19947:1: ( ( rule__XConstructorCall__Group_4__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19948:1: ( rule__XConstructorCall__Group_4__0 )?
+            // InternalFormat.g:19947:1: ( ( rule__XConstructorCall__Group_4__0 )? )
+            // InternalFormat.g:19948:1: ( rule__XConstructorCall__Group_4__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getGroup_4()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19949:1: ( rule__XConstructorCall__Group_4__0 )?
+            // InternalFormat.g:19949:1: ( rule__XConstructorCall__Group_4__0 )?
             int alt153=2;
             alt153 = dfa153.predict(input);
             switch (alt153) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19949:2: rule__XConstructorCall__Group_4__0
+                    // InternalFormat.g:19949:2: rule__XConstructorCall__Group_4__0
                     {
-                    pushFollow(FOLLOW_rule__XConstructorCall__Group_4__0_in_rule__XConstructorCall__Group__4__Impl40425);
+                    pushFollow(FOLLOW_2);
                     rule__XConstructorCall__Group_4__0();
 
                     state._fsp--;
@@ -57951,16 +57951,16 @@ public final void rule__XConstructorCall__Group__4__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XConstructorCall__Group__5"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19959:1: rule__XConstructorCall__Group__5 : rule__XConstructorCall__Group__5__Impl ;
+    // InternalFormat.g:19959:1: rule__XConstructorCall__Group__5 : rule__XConstructorCall__Group__5__Impl ;
     public final void rule__XConstructorCall__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19963:1: ( rule__XConstructorCall__Group__5__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19964:2: rule__XConstructorCall__Group__5__Impl
+            // InternalFormat.g:19963:1: ( rule__XConstructorCall__Group__5__Impl )
+            // InternalFormat.g:19964:2: rule__XConstructorCall__Group__5__Impl
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group__5__Impl_in_rule__XConstructorCall__Group__540456);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group__5__Impl();
 
             state._fsp--;
@@ -57984,29 +57984,29 @@ public final void rule__XConstructorCall__Group__5() throws RecognitionException
 
 
     // $ANTLR start "rule__XConstructorCall__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19970:1: rule__XConstructorCall__Group__5__Impl : ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? ) ;
+    // InternalFormat.g:19970:1: rule__XConstructorCall__Group__5__Impl : ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? ) ;
     public final void rule__XConstructorCall__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19974:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19975:1: ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? )
+            // InternalFormat.g:19974:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? ) )
+            // InternalFormat.g:19975:1: ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19975:1: ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19976:1: ( rule__XConstructorCall__ArgumentsAssignment_5 )?
+            // InternalFormat.g:19975:1: ( ( rule__XConstructorCall__ArgumentsAssignment_5 )? )
+            // InternalFormat.g:19976:1: ( rule__XConstructorCall__ArgumentsAssignment_5 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getArgumentsAssignment_5()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19977:1: ( rule__XConstructorCall__ArgumentsAssignment_5 )?
+            // InternalFormat.g:19977:1: ( rule__XConstructorCall__ArgumentsAssignment_5 )?
             int alt154=2;
             alt154 = dfa154.predict(input);
             switch (alt154) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19977:2: rule__XConstructorCall__ArgumentsAssignment_5
+                    // InternalFormat.g:19977:2: rule__XConstructorCall__ArgumentsAssignment_5
                     {
-                    pushFollow(FOLLOW_rule__XConstructorCall__ArgumentsAssignment_5_in_rule__XConstructorCall__Group__5__Impl40483);
+                    pushFollow(FOLLOW_2);
                     rule__XConstructorCall__ArgumentsAssignment_5();
 
                     state._fsp--;
@@ -58042,21 +58042,21 @@ public final void rule__XConstructorCall__Group__5__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19999:1: rule__XConstructorCall__Group_3__0 : rule__XConstructorCall__Group_3__0__Impl rule__XConstructorCall__Group_3__1 ;
+    // InternalFormat.g:19999:1: rule__XConstructorCall__Group_3__0 : rule__XConstructorCall__Group_3__0__Impl rule__XConstructorCall__Group_3__1 ;
     public final void rule__XConstructorCall__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20003:1: ( rule__XConstructorCall__Group_3__0__Impl rule__XConstructorCall__Group_3__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20004:2: rule__XConstructorCall__Group_3__0__Impl rule__XConstructorCall__Group_3__1
+            // InternalFormat.g:20003:1: ( rule__XConstructorCall__Group_3__0__Impl rule__XConstructorCall__Group_3__1 )
+            // InternalFormat.g:20004:2: rule__XConstructorCall__Group_3__0__Impl rule__XConstructorCall__Group_3__1
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_3__0__Impl_in_rule__XConstructorCall__Group_3__040526);
+            pushFollow(FOLLOW_86);
             rule__XConstructorCall__Group_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_3__1_in_rule__XConstructorCall__Group_3__040529);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_3__1();
 
             state._fsp--;
@@ -58080,25 +58080,25 @@ public final void rule__XConstructorCall__Group_3__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20011:1: rule__XConstructorCall__Group_3__0__Impl : ( ( '<' ) ) ;
+    // InternalFormat.g:20011:1: rule__XConstructorCall__Group_3__0__Impl : ( ( '<' ) ) ;
     public final void rule__XConstructorCall__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20015:1: ( ( ( '<' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20016:1: ( ( '<' ) )
+            // InternalFormat.g:20015:1: ( ( ( '<' ) ) )
+            // InternalFormat.g:20016:1: ( ( '<' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20016:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20017:1: ( '<' )
+            // InternalFormat.g:20016:1: ( ( '<' ) )
+            // InternalFormat.g:20017:1: ( '<' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getLessThanSignKeyword_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20018:1: ( '<' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20019:2: '<'
+            // InternalFormat.g:20018:1: ( '<' )
+            // InternalFormat.g:20019:2: '<'
             {
-            match(input,33,FOLLOW_33_in_rule__XConstructorCall__Group_3__0__Impl40558); if (state.failed) return ;
+            match(input,33,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -58127,21 +58127,21 @@ public final void rule__XConstructorCall__Group_3__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20030:1: rule__XConstructorCall__Group_3__1 : rule__XConstructorCall__Group_3__1__Impl rule__XConstructorCall__Group_3__2 ;
+    // InternalFormat.g:20030:1: rule__XConstructorCall__Group_3__1 : rule__XConstructorCall__Group_3__1__Impl rule__XConstructorCall__Group_3__2 ;
     public final void rule__XConstructorCall__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20034:1: ( rule__XConstructorCall__Group_3__1__Impl rule__XConstructorCall__Group_3__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20035:2: rule__XConstructorCall__Group_3__1__Impl rule__XConstructorCall__Group_3__2
+            // InternalFormat.g:20034:1: ( rule__XConstructorCall__Group_3__1__Impl rule__XConstructorCall__Group_3__2 )
+            // InternalFormat.g:20035:2: rule__XConstructorCall__Group_3__1__Impl rule__XConstructorCall__Group_3__2
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_3__1__Impl_in_rule__XConstructorCall__Group_3__140590);
+            pushFollow(FOLLOW_87);
             rule__XConstructorCall__Group_3__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_3__2_in_rule__XConstructorCall__Group_3__140593);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_3__2();
 
             state._fsp--;
@@ -58165,25 +58165,25 @@ public final void rule__XConstructorCall__Group_3__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20042:1: rule__XConstructorCall__Group_3__1__Impl : ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) ) ;
+    // InternalFormat.g:20042:1: rule__XConstructorCall__Group_3__1__Impl : ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) ) ;
     public final void rule__XConstructorCall__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20046:1: ( ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20047:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) )
+            // InternalFormat.g:20046:1: ( ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) ) )
+            // InternalFormat.g:20047:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20047:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20048:1: ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 )
+            // InternalFormat.g:20047:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 ) )
+            // InternalFormat.g:20048:1: ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getTypeArgumentsAssignment_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20049:1: ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20049:2: rule__XConstructorCall__TypeArgumentsAssignment_3_1
+            // InternalFormat.g:20049:1: ( rule__XConstructorCall__TypeArgumentsAssignment_3_1 )
+            // InternalFormat.g:20049:2: rule__XConstructorCall__TypeArgumentsAssignment_3_1
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__TypeArgumentsAssignment_3_1_in_rule__XConstructorCall__Group_3__1__Impl40620);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__TypeArgumentsAssignment_3_1();
 
             state._fsp--;
@@ -58216,21 +58216,21 @@ public final void rule__XConstructorCall__Group_3__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20059:1: rule__XConstructorCall__Group_3__2 : rule__XConstructorCall__Group_3__2__Impl rule__XConstructorCall__Group_3__3 ;
+    // InternalFormat.g:20059:1: rule__XConstructorCall__Group_3__2 : rule__XConstructorCall__Group_3__2__Impl rule__XConstructorCall__Group_3__3 ;
     public final void rule__XConstructorCall__Group_3__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20063:1: ( rule__XConstructorCall__Group_3__2__Impl rule__XConstructorCall__Group_3__3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20064:2: rule__XConstructorCall__Group_3__2__Impl rule__XConstructorCall__Group_3__3
+            // InternalFormat.g:20063:1: ( rule__XConstructorCall__Group_3__2__Impl rule__XConstructorCall__Group_3__3 )
+            // InternalFormat.g:20064:2: rule__XConstructorCall__Group_3__2__Impl rule__XConstructorCall__Group_3__3
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_3__2__Impl_in_rule__XConstructorCall__Group_3__240650);
+            pushFollow(FOLLOW_87);
             rule__XConstructorCall__Group_3__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_3__3_in_rule__XConstructorCall__Group_3__240653);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_3__3();
 
             state._fsp--;
@@ -58254,22 +58254,22 @@ public final void rule__XConstructorCall__Group_3__2() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20071:1: rule__XConstructorCall__Group_3__2__Impl : ( ( rule__XConstructorCall__Group_3_2__0 )* ) ;
+    // InternalFormat.g:20071:1: rule__XConstructorCall__Group_3__2__Impl : ( ( rule__XConstructorCall__Group_3_2__0 )* ) ;
     public final void rule__XConstructorCall__Group_3__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20075:1: ( ( ( rule__XConstructorCall__Group_3_2__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20076:1: ( ( rule__XConstructorCall__Group_3_2__0 )* )
+            // InternalFormat.g:20075:1: ( ( ( rule__XConstructorCall__Group_3_2__0 )* ) )
+            // InternalFormat.g:20076:1: ( ( rule__XConstructorCall__Group_3_2__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20076:1: ( ( rule__XConstructorCall__Group_3_2__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20077:1: ( rule__XConstructorCall__Group_3_2__0 )*
+            // InternalFormat.g:20076:1: ( ( rule__XConstructorCall__Group_3_2__0 )* )
+            // InternalFormat.g:20077:1: ( rule__XConstructorCall__Group_3_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getGroup_3_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20078:1: ( rule__XConstructorCall__Group_3_2__0 )*
+            // InternalFormat.g:20078:1: ( rule__XConstructorCall__Group_3_2__0 )*
             loop155:
             do {
                 int alt155=2;
@@ -58282,9 +58282,9 @@ public final void rule__XConstructorCall__Group_3__2__Impl() throws RecognitionE
 
                 switch (alt155) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20078:2: rule__XConstructorCall__Group_3_2__0
+            	    // InternalFormat.g:20078:2: rule__XConstructorCall__Group_3_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__XConstructorCall__Group_3_2__0_in_rule__XConstructorCall__Group_3__2__Impl40680);
+            	    pushFollow(FOLLOW_23);
             	    rule__XConstructorCall__Group_3_2__0();
 
             	    state._fsp--;
@@ -58323,16 +58323,16 @@ public final void rule__XConstructorCall__Group_3__2__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20088:1: rule__XConstructorCall__Group_3__3 : rule__XConstructorCall__Group_3__3__Impl ;
+    // InternalFormat.g:20088:1: rule__XConstructorCall__Group_3__3 : rule__XConstructorCall__Group_3__3__Impl ;
     public final void rule__XConstructorCall__Group_3__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20092:1: ( rule__XConstructorCall__Group_3__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20093:2: rule__XConstructorCall__Group_3__3__Impl
+            // InternalFormat.g:20092:1: ( rule__XConstructorCall__Group_3__3__Impl )
+            // InternalFormat.g:20093:2: rule__XConstructorCall__Group_3__3__Impl
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_3__3__Impl_in_rule__XConstructorCall__Group_3__340711);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_3__3__Impl();
 
             state._fsp--;
@@ -58356,22 +58356,22 @@ public final void rule__XConstructorCall__Group_3__3() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20099:1: rule__XConstructorCall__Group_3__3__Impl : ( '>' ) ;
+    // InternalFormat.g:20099:1: rule__XConstructorCall__Group_3__3__Impl : ( '>' ) ;
     public final void rule__XConstructorCall__Group_3__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20103:1: ( ( '>' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20104:1: ( '>' )
+            // InternalFormat.g:20103:1: ( ( '>' ) )
+            // InternalFormat.g:20104:1: ( '>' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20104:1: ( '>' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20105:1: '>'
+            // InternalFormat.g:20104:1: ( '>' )
+            // InternalFormat.g:20105:1: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getGreaterThanSignKeyword_3_3()); 
             }
-            match(input,32,FOLLOW_32_in_rule__XConstructorCall__Group_3__3__Impl40739); if (state.failed) return ;
+            match(input,32,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstructorCallAccess().getGreaterThanSignKeyword_3_3()); 
             }
@@ -58397,21 +58397,21 @@ public final void rule__XConstructorCall__Group_3__3__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3_2__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20126:1: rule__XConstructorCall__Group_3_2__0 : rule__XConstructorCall__Group_3_2__0__Impl rule__XConstructorCall__Group_3_2__1 ;
+    // InternalFormat.g:20126:1: rule__XConstructorCall__Group_3_2__0 : rule__XConstructorCall__Group_3_2__0__Impl rule__XConstructorCall__Group_3_2__1 ;
     public final void rule__XConstructorCall__Group_3_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20130:1: ( rule__XConstructorCall__Group_3_2__0__Impl rule__XConstructorCall__Group_3_2__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20131:2: rule__XConstructorCall__Group_3_2__0__Impl rule__XConstructorCall__Group_3_2__1
+            // InternalFormat.g:20130:1: ( rule__XConstructorCall__Group_3_2__0__Impl rule__XConstructorCall__Group_3_2__1 )
+            // InternalFormat.g:20131:2: rule__XConstructorCall__Group_3_2__0__Impl rule__XConstructorCall__Group_3_2__1
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_3_2__0__Impl_in_rule__XConstructorCall__Group_3_2__040778);
+            pushFollow(FOLLOW_86);
             rule__XConstructorCall__Group_3_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_3_2__1_in_rule__XConstructorCall__Group_3_2__040781);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_3_2__1();
 
             state._fsp--;
@@ -58435,22 +58435,22 @@ public final void rule__XConstructorCall__Group_3_2__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3_2__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20138:1: rule__XConstructorCall__Group_3_2__0__Impl : ( ',' ) ;
+    // InternalFormat.g:20138:1: rule__XConstructorCall__Group_3_2__0__Impl : ( ',' ) ;
     public final void rule__XConstructorCall__Group_3_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20142:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20143:1: ( ',' )
+            // InternalFormat.g:20142:1: ( ( ',' ) )
+            // InternalFormat.g:20143:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20143:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20144:1: ','
+            // InternalFormat.g:20143:1: ( ',' )
+            // InternalFormat.g:20144:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getCommaKeyword_3_2_0()); 
             }
-            match(input,71,FOLLOW_71_in_rule__XConstructorCall__Group_3_2__0__Impl40809); if (state.failed) return ;
+            match(input,71,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstructorCallAccess().getCommaKeyword_3_2_0()); 
             }
@@ -58476,16 +58476,16 @@ public final void rule__XConstructorCall__Group_3_2__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3_2__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20157:1: rule__XConstructorCall__Group_3_2__1 : rule__XConstructorCall__Group_3_2__1__Impl ;
+    // InternalFormat.g:20157:1: rule__XConstructorCall__Group_3_2__1 : rule__XConstructorCall__Group_3_2__1__Impl ;
     public final void rule__XConstructorCall__Group_3_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20161:1: ( rule__XConstructorCall__Group_3_2__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20162:2: rule__XConstructorCall__Group_3_2__1__Impl
+            // InternalFormat.g:20161:1: ( rule__XConstructorCall__Group_3_2__1__Impl )
+            // InternalFormat.g:20162:2: rule__XConstructorCall__Group_3_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_3_2__1__Impl_in_rule__XConstructorCall__Group_3_2__140840);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_3_2__1__Impl();
 
             state._fsp--;
@@ -58509,25 +58509,25 @@ public final void rule__XConstructorCall__Group_3_2__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XConstructorCall__Group_3_2__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20168:1: rule__XConstructorCall__Group_3_2__1__Impl : ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) ) ;
+    // InternalFormat.g:20168:1: rule__XConstructorCall__Group_3_2__1__Impl : ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) ) ;
     public final void rule__XConstructorCall__Group_3_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20172:1: ( ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20173:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) )
+            // InternalFormat.g:20172:1: ( ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) ) )
+            // InternalFormat.g:20173:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20173:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20174:1: ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 )
+            // InternalFormat.g:20173:1: ( ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 ) )
+            // InternalFormat.g:20174:1: ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getTypeArgumentsAssignment_3_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20175:1: ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20175:2: rule__XConstructorCall__TypeArgumentsAssignment_3_2_1
+            // InternalFormat.g:20175:1: ( rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 )
+            // InternalFormat.g:20175:2: rule__XConstructorCall__TypeArgumentsAssignment_3_2_1
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__TypeArgumentsAssignment_3_2_1_in_rule__XConstructorCall__Group_3_2__1__Impl40867);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__TypeArgumentsAssignment_3_2_1();
 
             state._fsp--;
@@ -58560,21 +58560,21 @@ public final void rule__XConstructorCall__Group_3_2__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20189:1: rule__XConstructorCall__Group_4__0 : rule__XConstructorCall__Group_4__0__Impl rule__XConstructorCall__Group_4__1 ;
+    // InternalFormat.g:20189:1: rule__XConstructorCall__Group_4__0 : rule__XConstructorCall__Group_4__0__Impl rule__XConstructorCall__Group_4__1 ;
     public final void rule__XConstructorCall__Group_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20193:1: ( rule__XConstructorCall__Group_4__0__Impl rule__XConstructorCall__Group_4__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20194:2: rule__XConstructorCall__Group_4__0__Impl rule__XConstructorCall__Group_4__1
+            // InternalFormat.g:20193:1: ( rule__XConstructorCall__Group_4__0__Impl rule__XConstructorCall__Group_4__1 )
+            // InternalFormat.g:20194:2: rule__XConstructorCall__Group_4__0__Impl rule__XConstructorCall__Group_4__1
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4__0__Impl_in_rule__XConstructorCall__Group_4__040901);
+            pushFollow(FOLLOW_88);
             rule__XConstructorCall__Group_4__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4__1_in_rule__XConstructorCall__Group_4__040904);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_4__1();
 
             state._fsp--;
@@ -58598,25 +58598,25 @@ public final void rule__XConstructorCall__Group_4__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20201:1: rule__XConstructorCall__Group_4__0__Impl : ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) ) ;
+    // InternalFormat.g:20201:1: rule__XConstructorCall__Group_4__0__Impl : ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) ) ;
     public final void rule__XConstructorCall__Group_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20205:1: ( ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20206:1: ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) )
+            // InternalFormat.g:20205:1: ( ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) ) )
+            // InternalFormat.g:20206:1: ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20206:1: ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20207:1: ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 )
+            // InternalFormat.g:20206:1: ( ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 ) )
+            // InternalFormat.g:20207:1: ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getExplicitConstructorCallAssignment_4_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20208:1: ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20208:2: rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0
+            // InternalFormat.g:20208:1: ( rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 )
+            // InternalFormat.g:20208:2: rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0_in_rule__XConstructorCall__Group_4__0__Impl40931);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0();
 
             state._fsp--;
@@ -58649,21 +58649,21 @@ public final void rule__XConstructorCall__Group_4__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20218:1: rule__XConstructorCall__Group_4__1 : rule__XConstructorCall__Group_4__1__Impl rule__XConstructorCall__Group_4__2 ;
+    // InternalFormat.g:20218:1: rule__XConstructorCall__Group_4__1 : rule__XConstructorCall__Group_4__1__Impl rule__XConstructorCall__Group_4__2 ;
     public final void rule__XConstructorCall__Group_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20222:1: ( rule__XConstructorCall__Group_4__1__Impl rule__XConstructorCall__Group_4__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20223:2: rule__XConstructorCall__Group_4__1__Impl rule__XConstructorCall__Group_4__2
+            // InternalFormat.g:20222:1: ( rule__XConstructorCall__Group_4__1__Impl rule__XConstructorCall__Group_4__2 )
+            // InternalFormat.g:20223:2: rule__XConstructorCall__Group_4__1__Impl rule__XConstructorCall__Group_4__2
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4__1__Impl_in_rule__XConstructorCall__Group_4__140961);
+            pushFollow(FOLLOW_88);
             rule__XConstructorCall__Group_4__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4__2_in_rule__XConstructorCall__Group_4__140964);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_4__2();
 
             state._fsp--;
@@ -58687,22 +58687,22 @@ public final void rule__XConstructorCall__Group_4__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20230:1: rule__XConstructorCall__Group_4__1__Impl : ( ( rule__XConstructorCall__Alternatives_4_1 )? ) ;
+    // InternalFormat.g:20230:1: rule__XConstructorCall__Group_4__1__Impl : ( ( rule__XConstructorCall__Alternatives_4_1 )? ) ;
     public final void rule__XConstructorCall__Group_4__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20234:1: ( ( ( rule__XConstructorCall__Alternatives_4_1 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20235:1: ( ( rule__XConstructorCall__Alternatives_4_1 )? )
+            // InternalFormat.g:20234:1: ( ( ( rule__XConstructorCall__Alternatives_4_1 )? ) )
+            // InternalFormat.g:20235:1: ( ( rule__XConstructorCall__Alternatives_4_1 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20235:1: ( ( rule__XConstructorCall__Alternatives_4_1 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20236:1: ( rule__XConstructorCall__Alternatives_4_1 )?
+            // InternalFormat.g:20235:1: ( ( rule__XConstructorCall__Alternatives_4_1 )? )
+            // InternalFormat.g:20236:1: ( rule__XConstructorCall__Alternatives_4_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getAlternatives_4_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20237:1: ( rule__XConstructorCall__Alternatives_4_1 )?
+            // InternalFormat.g:20237:1: ( rule__XConstructorCall__Alternatives_4_1 )?
             int alt156=2;
             int LA156_0 = input.LA(1);
 
@@ -58711,9 +58711,9 @@ public final void rule__XConstructorCall__Group_4__1__Impl() throws RecognitionE
             }
             switch (alt156) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20237:2: rule__XConstructorCall__Alternatives_4_1
+                    // InternalFormat.g:20237:2: rule__XConstructorCall__Alternatives_4_1
                     {
-                    pushFollow(FOLLOW_rule__XConstructorCall__Alternatives_4_1_in_rule__XConstructorCall__Group_4__1__Impl40991);
+                    pushFollow(FOLLOW_2);
                     rule__XConstructorCall__Alternatives_4_1();
 
                     state._fsp--;
@@ -58749,16 +58749,16 @@ public final void rule__XConstructorCall__Group_4__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20247:1: rule__XConstructorCall__Group_4__2 : rule__XConstructorCall__Group_4__2__Impl ;
+    // InternalFormat.g:20247:1: rule__XConstructorCall__Group_4__2 : rule__XConstructorCall__Group_4__2__Impl ;
     public final void rule__XConstructorCall__Group_4__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20251:1: ( rule__XConstructorCall__Group_4__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20252:2: rule__XConstructorCall__Group_4__2__Impl
+            // InternalFormat.g:20251:1: ( rule__XConstructorCall__Group_4__2__Impl )
+            // InternalFormat.g:20252:2: rule__XConstructorCall__Group_4__2__Impl
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4__2__Impl_in_rule__XConstructorCall__Group_4__241022);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_4__2__Impl();
 
             state._fsp--;
@@ -58782,22 +58782,22 @@ public final void rule__XConstructorCall__Group_4__2() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20258:1: rule__XConstructorCall__Group_4__2__Impl : ( ')' ) ;
+    // InternalFormat.g:20258:1: rule__XConstructorCall__Group_4__2__Impl : ( ')' ) ;
     public final void rule__XConstructorCall__Group_4__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20262:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20263:1: ( ')' )
+            // InternalFormat.g:20262:1: ( ( ')' ) )
+            // InternalFormat.g:20263:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20263:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20264:1: ')'
+            // InternalFormat.g:20263:1: ( ')' )
+            // InternalFormat.g:20264:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getRightParenthesisKeyword_4_2()); 
             }
-            match(input,75,FOLLOW_75_in_rule__XConstructorCall__Group_4__2__Impl41050); if (state.failed) return ;
+            match(input,75,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstructorCallAccess().getRightParenthesisKeyword_4_2()); 
             }
@@ -58823,21 +58823,21 @@ public final void rule__XConstructorCall__Group_4__2__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20283:1: rule__XConstructorCall__Group_4_1_1__0 : rule__XConstructorCall__Group_4_1_1__0__Impl rule__XConstructorCall__Group_4_1_1__1 ;
+    // InternalFormat.g:20283:1: rule__XConstructorCall__Group_4_1_1__0 : rule__XConstructorCall__Group_4_1_1__0__Impl rule__XConstructorCall__Group_4_1_1__1 ;
     public final void rule__XConstructorCall__Group_4_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20287:1: ( rule__XConstructorCall__Group_4_1_1__0__Impl rule__XConstructorCall__Group_4_1_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20288:2: rule__XConstructorCall__Group_4_1_1__0__Impl rule__XConstructorCall__Group_4_1_1__1
+            // InternalFormat.g:20287:1: ( rule__XConstructorCall__Group_4_1_1__0__Impl rule__XConstructorCall__Group_4_1_1__1 )
+            // InternalFormat.g:20288:2: rule__XConstructorCall__Group_4_1_1__0__Impl rule__XConstructorCall__Group_4_1_1__1
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4_1_1__0__Impl_in_rule__XConstructorCall__Group_4_1_1__041087);
+            pushFollow(FOLLOW_46);
             rule__XConstructorCall__Group_4_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4_1_1__1_in_rule__XConstructorCall__Group_4_1_1__041090);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_4_1_1__1();
 
             state._fsp--;
@@ -58861,25 +58861,25 @@ public final void rule__XConstructorCall__Group_4_1_1__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20295:1: rule__XConstructorCall__Group_4_1_1__0__Impl : ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) ) ;
+    // InternalFormat.g:20295:1: rule__XConstructorCall__Group_4_1_1__0__Impl : ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) ) ;
     public final void rule__XConstructorCall__Group_4_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20299:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20300:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) )
+            // InternalFormat.g:20299:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) ) )
+            // InternalFormat.g:20300:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20300:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20301:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 )
+            // InternalFormat.g:20300:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 ) )
+            // InternalFormat.g:20301:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getArgumentsAssignment_4_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20302:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20302:2: rule__XConstructorCall__ArgumentsAssignment_4_1_1_0
+            // InternalFormat.g:20302:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 )
+            // InternalFormat.g:20302:2: rule__XConstructorCall__ArgumentsAssignment_4_1_1_0
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__ArgumentsAssignment_4_1_1_0_in_rule__XConstructorCall__Group_4_1_1__0__Impl41117);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__ArgumentsAssignment_4_1_1_0();
 
             state._fsp--;
@@ -58912,16 +58912,16 @@ public final void rule__XConstructorCall__Group_4_1_1__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20312:1: rule__XConstructorCall__Group_4_1_1__1 : rule__XConstructorCall__Group_4_1_1__1__Impl ;
+    // InternalFormat.g:20312:1: rule__XConstructorCall__Group_4_1_1__1 : rule__XConstructorCall__Group_4_1_1__1__Impl ;
     public final void rule__XConstructorCall__Group_4_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20316:1: ( rule__XConstructorCall__Group_4_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20317:2: rule__XConstructorCall__Group_4_1_1__1__Impl
+            // InternalFormat.g:20316:1: ( rule__XConstructorCall__Group_4_1_1__1__Impl )
+            // InternalFormat.g:20317:2: rule__XConstructorCall__Group_4_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4_1_1__1__Impl_in_rule__XConstructorCall__Group_4_1_1__141147);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_4_1_1__1__Impl();
 
             state._fsp--;
@@ -58945,22 +58945,22 @@ public final void rule__XConstructorCall__Group_4_1_1__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20323:1: rule__XConstructorCall__Group_4_1_1__1__Impl : ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* ) ;
+    // InternalFormat.g:20323:1: rule__XConstructorCall__Group_4_1_1__1__Impl : ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* ) ;
     public final void rule__XConstructorCall__Group_4_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20327:1: ( ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20328:1: ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* )
+            // InternalFormat.g:20327:1: ( ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* ) )
+            // InternalFormat.g:20328:1: ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20328:1: ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20329:1: ( rule__XConstructorCall__Group_4_1_1_1__0 )*
+            // InternalFormat.g:20328:1: ( ( rule__XConstructorCall__Group_4_1_1_1__0 )* )
+            // InternalFormat.g:20329:1: ( rule__XConstructorCall__Group_4_1_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getGroup_4_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20330:1: ( rule__XConstructorCall__Group_4_1_1_1__0 )*
+            // InternalFormat.g:20330:1: ( rule__XConstructorCall__Group_4_1_1_1__0 )*
             loop157:
             do {
                 int alt157=2;
@@ -58973,9 +58973,9 @@ public final void rule__XConstructorCall__Group_4_1_1__1__Impl() throws Recognit
 
                 switch (alt157) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20330:2: rule__XConstructorCall__Group_4_1_1_1__0
+            	    // InternalFormat.g:20330:2: rule__XConstructorCall__Group_4_1_1_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XConstructorCall__Group_4_1_1_1__0_in_rule__XConstructorCall__Group_4_1_1__1__Impl41174);
+            	    pushFollow(FOLLOW_23);
             	    rule__XConstructorCall__Group_4_1_1_1__0();
 
             	    state._fsp--;
@@ -59014,21 +59014,21 @@ public final void rule__XConstructorCall__Group_4_1_1__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20344:1: rule__XConstructorCall__Group_4_1_1_1__0 : rule__XConstructorCall__Group_4_1_1_1__0__Impl rule__XConstructorCall__Group_4_1_1_1__1 ;
+    // InternalFormat.g:20344:1: rule__XConstructorCall__Group_4_1_1_1__0 : rule__XConstructorCall__Group_4_1_1_1__0__Impl rule__XConstructorCall__Group_4_1_1_1__1 ;
     public final void rule__XConstructorCall__Group_4_1_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20348:1: ( rule__XConstructorCall__Group_4_1_1_1__0__Impl rule__XConstructorCall__Group_4_1_1_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20349:2: rule__XConstructorCall__Group_4_1_1_1__0__Impl rule__XConstructorCall__Group_4_1_1_1__1
+            // InternalFormat.g:20348:1: ( rule__XConstructorCall__Group_4_1_1_1__0__Impl rule__XConstructorCall__Group_4_1_1_1__1 )
+            // InternalFormat.g:20349:2: rule__XConstructorCall__Group_4_1_1_1__0__Impl rule__XConstructorCall__Group_4_1_1_1__1
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4_1_1_1__0__Impl_in_rule__XConstructorCall__Group_4_1_1_1__041209);
+            pushFollow(FOLLOW_50);
             rule__XConstructorCall__Group_4_1_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4_1_1_1__1_in_rule__XConstructorCall__Group_4_1_1_1__041212);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_4_1_1_1__1();
 
             state._fsp--;
@@ -59052,22 +59052,22 @@ public final void rule__XConstructorCall__Group_4_1_1_1__0() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20356:1: rule__XConstructorCall__Group_4_1_1_1__0__Impl : ( ',' ) ;
+    // InternalFormat.g:20356:1: rule__XConstructorCall__Group_4_1_1_1__0__Impl : ( ',' ) ;
     public final void rule__XConstructorCall__Group_4_1_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20360:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20361:1: ( ',' )
+            // InternalFormat.g:20360:1: ( ( ',' ) )
+            // InternalFormat.g:20361:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20361:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20362:1: ','
+            // InternalFormat.g:20361:1: ( ',' )
+            // InternalFormat.g:20362:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getCommaKeyword_4_1_1_1_0()); 
             }
-            match(input,71,FOLLOW_71_in_rule__XConstructorCall__Group_4_1_1_1__0__Impl41240); if (state.failed) return ;
+            match(input,71,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstructorCallAccess().getCommaKeyword_4_1_1_1_0()); 
             }
@@ -59093,16 +59093,16 @@ public final void rule__XConstructorCall__Group_4_1_1_1__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20375:1: rule__XConstructorCall__Group_4_1_1_1__1 : rule__XConstructorCall__Group_4_1_1_1__1__Impl ;
+    // InternalFormat.g:20375:1: rule__XConstructorCall__Group_4_1_1_1__1 : rule__XConstructorCall__Group_4_1_1_1__1__Impl ;
     public final void rule__XConstructorCall__Group_4_1_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20379:1: ( rule__XConstructorCall__Group_4_1_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20380:2: rule__XConstructorCall__Group_4_1_1_1__1__Impl
+            // InternalFormat.g:20379:1: ( rule__XConstructorCall__Group_4_1_1_1__1__Impl )
+            // InternalFormat.g:20380:2: rule__XConstructorCall__Group_4_1_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__Group_4_1_1_1__1__Impl_in_rule__XConstructorCall__Group_4_1_1_1__141271);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__Group_4_1_1_1__1__Impl();
 
             state._fsp--;
@@ -59126,25 +59126,25 @@ public final void rule__XConstructorCall__Group_4_1_1_1__1() throws RecognitionE
 
 
     // $ANTLR start "rule__XConstructorCall__Group_4_1_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20386:1: rule__XConstructorCall__Group_4_1_1_1__1__Impl : ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) ) ;
+    // InternalFormat.g:20386:1: rule__XConstructorCall__Group_4_1_1_1__1__Impl : ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) ) ;
     public final void rule__XConstructorCall__Group_4_1_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20390:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20391:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) )
+            // InternalFormat.g:20390:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) ) )
+            // InternalFormat.g:20391:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20391:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20392:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 )
+            // InternalFormat.g:20391:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 ) )
+            // InternalFormat.g:20392:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getArgumentsAssignment_4_1_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20393:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20393:2: rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1
+            // InternalFormat.g:20393:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 )
+            // InternalFormat.g:20393:2: rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1
             {
-            pushFollow(FOLLOW_rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1_in_rule__XConstructorCall__Group_4_1_1_1__1__Impl41298);
+            pushFollow(FOLLOW_2);
             rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1();
 
             state._fsp--;
@@ -59177,21 +59177,21 @@ public final void rule__XConstructorCall__Group_4_1_1_1__1__Impl() throws Recogn
 
 
     // $ANTLR start "rule__XBooleanLiteral__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20407:1: rule__XBooleanLiteral__Group__0 : rule__XBooleanLiteral__Group__0__Impl rule__XBooleanLiteral__Group__1 ;
+    // InternalFormat.g:20407:1: rule__XBooleanLiteral__Group__0 : rule__XBooleanLiteral__Group__0__Impl rule__XBooleanLiteral__Group__1 ;
     public final void rule__XBooleanLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20411:1: ( rule__XBooleanLiteral__Group__0__Impl rule__XBooleanLiteral__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20412:2: rule__XBooleanLiteral__Group__0__Impl rule__XBooleanLiteral__Group__1
+            // InternalFormat.g:20411:1: ( rule__XBooleanLiteral__Group__0__Impl rule__XBooleanLiteral__Group__1 )
+            // InternalFormat.g:20412:2: rule__XBooleanLiteral__Group__0__Impl rule__XBooleanLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__XBooleanLiteral__Group__0__Impl_in_rule__XBooleanLiteral__Group__041332);
+            pushFollow(FOLLOW_110);
             rule__XBooleanLiteral__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XBooleanLiteral__Group__1_in_rule__XBooleanLiteral__Group__041335);
+            pushFollow(FOLLOW_2);
             rule__XBooleanLiteral__Group__1();
 
             state._fsp--;
@@ -59215,23 +59215,23 @@ public final void rule__XBooleanLiteral__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XBooleanLiteral__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20419:1: rule__XBooleanLiteral__Group__0__Impl : ( () ) ;
+    // InternalFormat.g:20419:1: rule__XBooleanLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XBooleanLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20423:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20424:1: ( () )
+            // InternalFormat.g:20423:1: ( ( () ) )
+            // InternalFormat.g:20424:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20424:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20425:1: ()
+            // InternalFormat.g:20424:1: ( () )
+            // InternalFormat.g:20425:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBooleanLiteralAccess().getXBooleanLiteralAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20426:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20428:1: 
+            // InternalFormat.g:20426:1: ()
+            // InternalFormat.g:20428:1: 
             {
             }
 
@@ -59256,16 +59256,16 @@ public final void rule__XBooleanLiteral__Group__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XBooleanLiteral__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20438:1: rule__XBooleanLiteral__Group__1 : rule__XBooleanLiteral__Group__1__Impl ;
+    // InternalFormat.g:20438:1: rule__XBooleanLiteral__Group__1 : rule__XBooleanLiteral__Group__1__Impl ;
     public final void rule__XBooleanLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20442:1: ( rule__XBooleanLiteral__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20443:2: rule__XBooleanLiteral__Group__1__Impl
+            // InternalFormat.g:20442:1: ( rule__XBooleanLiteral__Group__1__Impl )
+            // InternalFormat.g:20443:2: rule__XBooleanLiteral__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XBooleanLiteral__Group__1__Impl_in_rule__XBooleanLiteral__Group__141393);
+            pushFollow(FOLLOW_2);
             rule__XBooleanLiteral__Group__1__Impl();
 
             state._fsp--;
@@ -59289,25 +59289,25 @@ public final void rule__XBooleanLiteral__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XBooleanLiteral__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20449:1: rule__XBooleanLiteral__Group__1__Impl : ( ( rule__XBooleanLiteral__Alternatives_1 ) ) ;
+    // InternalFormat.g:20449:1: rule__XBooleanLiteral__Group__1__Impl : ( ( rule__XBooleanLiteral__Alternatives_1 ) ) ;
     public final void rule__XBooleanLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20453:1: ( ( ( rule__XBooleanLiteral__Alternatives_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20454:1: ( ( rule__XBooleanLiteral__Alternatives_1 ) )
+            // InternalFormat.g:20453:1: ( ( ( rule__XBooleanLiteral__Alternatives_1 ) ) )
+            // InternalFormat.g:20454:1: ( ( rule__XBooleanLiteral__Alternatives_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20454:1: ( ( rule__XBooleanLiteral__Alternatives_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20455:1: ( rule__XBooleanLiteral__Alternatives_1 )
+            // InternalFormat.g:20454:1: ( ( rule__XBooleanLiteral__Alternatives_1 ) )
+            // InternalFormat.g:20455:1: ( rule__XBooleanLiteral__Alternatives_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBooleanLiteralAccess().getAlternatives_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20456:1: ( rule__XBooleanLiteral__Alternatives_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20456:2: rule__XBooleanLiteral__Alternatives_1
+            // InternalFormat.g:20456:1: ( rule__XBooleanLiteral__Alternatives_1 )
+            // InternalFormat.g:20456:2: rule__XBooleanLiteral__Alternatives_1
             {
-            pushFollow(FOLLOW_rule__XBooleanLiteral__Alternatives_1_in_rule__XBooleanLiteral__Group__1__Impl41420);
+            pushFollow(FOLLOW_2);
             rule__XBooleanLiteral__Alternatives_1();
 
             state._fsp--;
@@ -59340,21 +59340,21 @@ public final void rule__XBooleanLiteral__Group__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__XNullLiteral__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20470:1: rule__XNullLiteral__Group__0 : rule__XNullLiteral__Group__0__Impl rule__XNullLiteral__Group__1 ;
+    // InternalFormat.g:20470:1: rule__XNullLiteral__Group__0 : rule__XNullLiteral__Group__0__Impl rule__XNullLiteral__Group__1 ;
     public final void rule__XNullLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20474:1: ( rule__XNullLiteral__Group__0__Impl rule__XNullLiteral__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20475:2: rule__XNullLiteral__Group__0__Impl rule__XNullLiteral__Group__1
+            // InternalFormat.g:20474:1: ( rule__XNullLiteral__Group__0__Impl rule__XNullLiteral__Group__1 )
+            // InternalFormat.g:20475:2: rule__XNullLiteral__Group__0__Impl rule__XNullLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__XNullLiteral__Group__0__Impl_in_rule__XNullLiteral__Group__041454);
+            pushFollow(FOLLOW_111);
             rule__XNullLiteral__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XNullLiteral__Group__1_in_rule__XNullLiteral__Group__041457);
+            pushFollow(FOLLOW_2);
             rule__XNullLiteral__Group__1();
 
             state._fsp--;
@@ -59378,23 +59378,23 @@ public final void rule__XNullLiteral__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XNullLiteral__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20482:1: rule__XNullLiteral__Group__0__Impl : ( () ) ;
+    // InternalFormat.g:20482:1: rule__XNullLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XNullLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20486:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20487:1: ( () )
+            // InternalFormat.g:20486:1: ( ( () ) )
+            // InternalFormat.g:20487:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20487:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20488:1: ()
+            // InternalFormat.g:20487:1: ( () )
+            // InternalFormat.g:20488:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNullLiteralAccess().getXNullLiteralAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20489:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20491:1: 
+            // InternalFormat.g:20489:1: ()
+            // InternalFormat.g:20491:1: 
             {
             }
 
@@ -59419,16 +59419,16 @@ public final void rule__XNullLiteral__Group__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XNullLiteral__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20501:1: rule__XNullLiteral__Group__1 : rule__XNullLiteral__Group__1__Impl ;
+    // InternalFormat.g:20501:1: rule__XNullLiteral__Group__1 : rule__XNullLiteral__Group__1__Impl ;
     public final void rule__XNullLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20505:1: ( rule__XNullLiteral__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20506:2: rule__XNullLiteral__Group__1__Impl
+            // InternalFormat.g:20505:1: ( rule__XNullLiteral__Group__1__Impl )
+            // InternalFormat.g:20506:2: rule__XNullLiteral__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XNullLiteral__Group__1__Impl_in_rule__XNullLiteral__Group__141515);
+            pushFollow(FOLLOW_2);
             rule__XNullLiteral__Group__1__Impl();
 
             state._fsp--;
@@ -59452,22 +59452,22 @@ public final void rule__XNullLiteral__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XNullLiteral__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20512:1: rule__XNullLiteral__Group__1__Impl : ( 'null' ) ;
+    // InternalFormat.g:20512:1: rule__XNullLiteral__Group__1__Impl : ( 'null' ) ;
     public final void rule__XNullLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20516:1: ( ( 'null' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20517:1: ( 'null' )
+            // InternalFormat.g:20516:1: ( ( 'null' ) )
+            // InternalFormat.g:20517:1: ( 'null' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20517:1: ( 'null' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20518:1: 'null'
+            // InternalFormat.g:20517:1: ( 'null' )
+            // InternalFormat.g:20518:1: 'null'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNullLiteralAccess().getNullKeyword_1()); 
             }
-            match(input,94,FOLLOW_94_in_rule__XNullLiteral__Group__1__Impl41543); if (state.failed) return ;
+            match(input,94,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXNullLiteralAccess().getNullKeyword_1()); 
             }
@@ -59493,21 +59493,21 @@ public final void rule__XNullLiteral__Group__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XNumberLiteral__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20535:1: rule__XNumberLiteral__Group__0 : rule__XNumberLiteral__Group__0__Impl rule__XNumberLiteral__Group__1 ;
+    // InternalFormat.g:20535:1: rule__XNumberLiteral__Group__0 : rule__XNumberLiteral__Group__0__Impl rule__XNumberLiteral__Group__1 ;
     public final void rule__XNumberLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20539:1: ( rule__XNumberLiteral__Group__0__Impl rule__XNumberLiteral__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20540:2: rule__XNumberLiteral__Group__0__Impl rule__XNumberLiteral__Group__1
+            // InternalFormat.g:20539:1: ( rule__XNumberLiteral__Group__0__Impl rule__XNumberLiteral__Group__1 )
+            // InternalFormat.g:20540:2: rule__XNumberLiteral__Group__0__Impl rule__XNumberLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__XNumberLiteral__Group__0__Impl_in_rule__XNumberLiteral__Group__041578);
+            pushFollow(FOLLOW_112);
             rule__XNumberLiteral__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XNumberLiteral__Group__1_in_rule__XNumberLiteral__Group__041581);
+            pushFollow(FOLLOW_2);
             rule__XNumberLiteral__Group__1();
 
             state._fsp--;
@@ -59531,23 +59531,23 @@ public final void rule__XNumberLiteral__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XNumberLiteral__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20547:1: rule__XNumberLiteral__Group__0__Impl : ( () ) ;
+    // InternalFormat.g:20547:1: rule__XNumberLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XNumberLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20551:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20552:1: ( () )
+            // InternalFormat.g:20551:1: ( ( () ) )
+            // InternalFormat.g:20552:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20552:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20553:1: ()
+            // InternalFormat.g:20552:1: ( () )
+            // InternalFormat.g:20553:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNumberLiteralAccess().getXNumberLiteralAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20554:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20556:1: 
+            // InternalFormat.g:20554:1: ()
+            // InternalFormat.g:20556:1: 
             {
             }
 
@@ -59572,16 +59572,16 @@ public final void rule__XNumberLiteral__Group__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XNumberLiteral__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20566:1: rule__XNumberLiteral__Group__1 : rule__XNumberLiteral__Group__1__Impl ;
+    // InternalFormat.g:20566:1: rule__XNumberLiteral__Group__1 : rule__XNumberLiteral__Group__1__Impl ;
     public final void rule__XNumberLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20570:1: ( rule__XNumberLiteral__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20571:2: rule__XNumberLiteral__Group__1__Impl
+            // InternalFormat.g:20570:1: ( rule__XNumberLiteral__Group__1__Impl )
+            // InternalFormat.g:20571:2: rule__XNumberLiteral__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XNumberLiteral__Group__1__Impl_in_rule__XNumberLiteral__Group__141639);
+            pushFollow(FOLLOW_2);
             rule__XNumberLiteral__Group__1__Impl();
 
             state._fsp--;
@@ -59605,25 +59605,25 @@ public final void rule__XNumberLiteral__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XNumberLiteral__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20577:1: rule__XNumberLiteral__Group__1__Impl : ( ( rule__XNumberLiteral__ValueAssignment_1 ) ) ;
+    // InternalFormat.g:20577:1: rule__XNumberLiteral__Group__1__Impl : ( ( rule__XNumberLiteral__ValueAssignment_1 ) ) ;
     public final void rule__XNumberLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20581:1: ( ( ( rule__XNumberLiteral__ValueAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20582:1: ( ( rule__XNumberLiteral__ValueAssignment_1 ) )
+            // InternalFormat.g:20581:1: ( ( ( rule__XNumberLiteral__ValueAssignment_1 ) ) )
+            // InternalFormat.g:20582:1: ( ( rule__XNumberLiteral__ValueAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20582:1: ( ( rule__XNumberLiteral__ValueAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20583:1: ( rule__XNumberLiteral__ValueAssignment_1 )
+            // InternalFormat.g:20582:1: ( ( rule__XNumberLiteral__ValueAssignment_1 ) )
+            // InternalFormat.g:20583:1: ( rule__XNumberLiteral__ValueAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNumberLiteralAccess().getValueAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20584:1: ( rule__XNumberLiteral__ValueAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20584:2: rule__XNumberLiteral__ValueAssignment_1
+            // InternalFormat.g:20584:1: ( rule__XNumberLiteral__ValueAssignment_1 )
+            // InternalFormat.g:20584:2: rule__XNumberLiteral__ValueAssignment_1
             {
-            pushFollow(FOLLOW_rule__XNumberLiteral__ValueAssignment_1_in_rule__XNumberLiteral__Group__1__Impl41666);
+            pushFollow(FOLLOW_2);
             rule__XNumberLiteral__ValueAssignment_1();
 
             state._fsp--;
@@ -59656,21 +59656,21 @@ public final void rule__XNumberLiteral__Group__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XStringLiteral__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20598:1: rule__XStringLiteral__Group__0 : rule__XStringLiteral__Group__0__Impl rule__XStringLiteral__Group__1 ;
+    // InternalFormat.g:20598:1: rule__XStringLiteral__Group__0 : rule__XStringLiteral__Group__0__Impl rule__XStringLiteral__Group__1 ;
     public final void rule__XStringLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20602:1: ( rule__XStringLiteral__Group__0__Impl rule__XStringLiteral__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20603:2: rule__XStringLiteral__Group__0__Impl rule__XStringLiteral__Group__1
+            // InternalFormat.g:20602:1: ( rule__XStringLiteral__Group__0__Impl rule__XStringLiteral__Group__1 )
+            // InternalFormat.g:20603:2: rule__XStringLiteral__Group__0__Impl rule__XStringLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__XStringLiteral__Group__0__Impl_in_rule__XStringLiteral__Group__041700);
+            pushFollow(FOLLOW_32);
             rule__XStringLiteral__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XStringLiteral__Group__1_in_rule__XStringLiteral__Group__041703);
+            pushFollow(FOLLOW_2);
             rule__XStringLiteral__Group__1();
 
             state._fsp--;
@@ -59694,23 +59694,23 @@ public final void rule__XStringLiteral__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XStringLiteral__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20610:1: rule__XStringLiteral__Group__0__Impl : ( () ) ;
+    // InternalFormat.g:20610:1: rule__XStringLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XStringLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20614:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20615:1: ( () )
+            // InternalFormat.g:20614:1: ( ( () ) )
+            // InternalFormat.g:20615:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20615:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20616:1: ()
+            // InternalFormat.g:20615:1: ( () )
+            // InternalFormat.g:20616:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXStringLiteralAccess().getXStringLiteralAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20617:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20619:1: 
+            // InternalFormat.g:20617:1: ()
+            // InternalFormat.g:20619:1: 
             {
             }
 
@@ -59735,16 +59735,16 @@ public final void rule__XStringLiteral__Group__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XStringLiteral__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20629:1: rule__XStringLiteral__Group__1 : rule__XStringLiteral__Group__1__Impl ;
+    // InternalFormat.g:20629:1: rule__XStringLiteral__Group__1 : rule__XStringLiteral__Group__1__Impl ;
     public final void rule__XStringLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20633:1: ( rule__XStringLiteral__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20634:2: rule__XStringLiteral__Group__1__Impl
+            // InternalFormat.g:20633:1: ( rule__XStringLiteral__Group__1__Impl )
+            // InternalFormat.g:20634:2: rule__XStringLiteral__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__XStringLiteral__Group__1__Impl_in_rule__XStringLiteral__Group__141761);
+            pushFollow(FOLLOW_2);
             rule__XStringLiteral__Group__1__Impl();
 
             state._fsp--;
@@ -59768,25 +59768,25 @@ public final void rule__XStringLiteral__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XStringLiteral__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20640:1: rule__XStringLiteral__Group__1__Impl : ( ( rule__XStringLiteral__ValueAssignment_1 ) ) ;
+    // InternalFormat.g:20640:1: rule__XStringLiteral__Group__1__Impl : ( ( rule__XStringLiteral__ValueAssignment_1 ) ) ;
     public final void rule__XStringLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20644:1: ( ( ( rule__XStringLiteral__ValueAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20645:1: ( ( rule__XStringLiteral__ValueAssignment_1 ) )
+            // InternalFormat.g:20644:1: ( ( ( rule__XStringLiteral__ValueAssignment_1 ) ) )
+            // InternalFormat.g:20645:1: ( ( rule__XStringLiteral__ValueAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20645:1: ( ( rule__XStringLiteral__ValueAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20646:1: ( rule__XStringLiteral__ValueAssignment_1 )
+            // InternalFormat.g:20645:1: ( ( rule__XStringLiteral__ValueAssignment_1 ) )
+            // InternalFormat.g:20646:1: ( rule__XStringLiteral__ValueAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXStringLiteralAccess().getValueAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20647:1: ( rule__XStringLiteral__ValueAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20647:2: rule__XStringLiteral__ValueAssignment_1
+            // InternalFormat.g:20647:1: ( rule__XStringLiteral__ValueAssignment_1 )
+            // InternalFormat.g:20647:2: rule__XStringLiteral__ValueAssignment_1
             {
-            pushFollow(FOLLOW_rule__XStringLiteral__ValueAssignment_1_in_rule__XStringLiteral__Group__1__Impl41788);
+            pushFollow(FOLLOW_2);
             rule__XStringLiteral__ValueAssignment_1();
 
             state._fsp--;
@@ -59819,21 +59819,21 @@ public final void rule__XStringLiteral__Group__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20661:1: rule__XTypeLiteral__Group__0 : rule__XTypeLiteral__Group__0__Impl rule__XTypeLiteral__Group__1 ;
+    // InternalFormat.g:20661:1: rule__XTypeLiteral__Group__0 : rule__XTypeLiteral__Group__0__Impl rule__XTypeLiteral__Group__1 ;
     public final void rule__XTypeLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20665:1: ( rule__XTypeLiteral__Group__0__Impl rule__XTypeLiteral__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20666:2: rule__XTypeLiteral__Group__0__Impl rule__XTypeLiteral__Group__1
+            // InternalFormat.g:20665:1: ( rule__XTypeLiteral__Group__0__Impl rule__XTypeLiteral__Group__1 )
+            // InternalFormat.g:20666:2: rule__XTypeLiteral__Group__0__Impl rule__XTypeLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__0__Impl_in_rule__XTypeLiteral__Group__041822);
+            pushFollow(FOLLOW_113);
             rule__XTypeLiteral__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__1_in_rule__XTypeLiteral__Group__041825);
+            pushFollow(FOLLOW_2);
             rule__XTypeLiteral__Group__1();
 
             state._fsp--;
@@ -59857,23 +59857,23 @@ public final void rule__XTypeLiteral__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20673:1: rule__XTypeLiteral__Group__0__Impl : ( () ) ;
+    // InternalFormat.g:20673:1: rule__XTypeLiteral__Group__0__Impl : ( () ) ;
     public final void rule__XTypeLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20677:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20678:1: ( () )
+            // InternalFormat.g:20677:1: ( ( () ) )
+            // InternalFormat.g:20678:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20678:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20679:1: ()
+            // InternalFormat.g:20678:1: ( () )
+            // InternalFormat.g:20679:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getXTypeLiteralAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20680:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20682:1: 
+            // InternalFormat.g:20680:1: ()
+            // InternalFormat.g:20682:1: 
             {
             }
 
@@ -59898,21 +59898,21 @@ public final void rule__XTypeLiteral__Group__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20692:1: rule__XTypeLiteral__Group__1 : rule__XTypeLiteral__Group__1__Impl rule__XTypeLiteral__Group__2 ;
+    // InternalFormat.g:20692:1: rule__XTypeLiteral__Group__1 : rule__XTypeLiteral__Group__1__Impl rule__XTypeLiteral__Group__2 ;
     public final void rule__XTypeLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20696:1: ( rule__XTypeLiteral__Group__1__Impl rule__XTypeLiteral__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20697:2: rule__XTypeLiteral__Group__1__Impl rule__XTypeLiteral__Group__2
+            // InternalFormat.g:20696:1: ( rule__XTypeLiteral__Group__1__Impl rule__XTypeLiteral__Group__2 )
+            // InternalFormat.g:20697:2: rule__XTypeLiteral__Group__1__Impl rule__XTypeLiteral__Group__2
             {
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__1__Impl_in_rule__XTypeLiteral__Group__141883);
+            pushFollow(FOLLOW_45);
             rule__XTypeLiteral__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__2_in_rule__XTypeLiteral__Group__141886);
+            pushFollow(FOLLOW_2);
             rule__XTypeLiteral__Group__2();
 
             state._fsp--;
@@ -59936,22 +59936,22 @@ public final void rule__XTypeLiteral__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20704:1: rule__XTypeLiteral__Group__1__Impl : ( 'typeof' ) ;
+    // InternalFormat.g:20704:1: rule__XTypeLiteral__Group__1__Impl : ( 'typeof' ) ;
     public final void rule__XTypeLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20708:1: ( ( 'typeof' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20709:1: ( 'typeof' )
+            // InternalFormat.g:20708:1: ( ( 'typeof' ) )
+            // InternalFormat.g:20709:1: ( 'typeof' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20709:1: ( 'typeof' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20710:1: 'typeof'
+            // InternalFormat.g:20709:1: ( 'typeof' )
+            // InternalFormat.g:20710:1: 'typeof'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getTypeofKeyword_1()); 
             }
-            match(input,95,FOLLOW_95_in_rule__XTypeLiteral__Group__1__Impl41914); if (state.failed) return ;
+            match(input,95,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXTypeLiteralAccess().getTypeofKeyword_1()); 
             }
@@ -59977,21 +59977,21 @@ public final void rule__XTypeLiteral__Group__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20723:1: rule__XTypeLiteral__Group__2 : rule__XTypeLiteral__Group__2__Impl rule__XTypeLiteral__Group__3 ;
+    // InternalFormat.g:20723:1: rule__XTypeLiteral__Group__2 : rule__XTypeLiteral__Group__2__Impl rule__XTypeLiteral__Group__3 ;
     public final void rule__XTypeLiteral__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20727:1: ( rule__XTypeLiteral__Group__2__Impl rule__XTypeLiteral__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20728:2: rule__XTypeLiteral__Group__2__Impl rule__XTypeLiteral__Group__3
+            // InternalFormat.g:20727:1: ( rule__XTypeLiteral__Group__2__Impl rule__XTypeLiteral__Group__3 )
+            // InternalFormat.g:20728:2: rule__XTypeLiteral__Group__2__Impl rule__XTypeLiteral__Group__3
             {
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__2__Impl_in_rule__XTypeLiteral__Group__241945);
+            pushFollow(FOLLOW_9);
             rule__XTypeLiteral__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__3_in_rule__XTypeLiteral__Group__241948);
+            pushFollow(FOLLOW_2);
             rule__XTypeLiteral__Group__3();
 
             state._fsp--;
@@ -60015,22 +60015,22 @@ public final void rule__XTypeLiteral__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20735:1: rule__XTypeLiteral__Group__2__Impl : ( '(' ) ;
+    // InternalFormat.g:20735:1: rule__XTypeLiteral__Group__2__Impl : ( '(' ) ;
     public final void rule__XTypeLiteral__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20739:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20740:1: ( '(' )
+            // InternalFormat.g:20739:1: ( ( '(' ) )
+            // InternalFormat.g:20740:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20740:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20741:1: '('
+            // InternalFormat.g:20740:1: ( '(' )
+            // InternalFormat.g:20741:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getLeftParenthesisKeyword_2()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XTypeLiteral__Group__2__Impl41976); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXTypeLiteralAccess().getLeftParenthesisKeyword_2()); 
             }
@@ -60056,21 +60056,21 @@ public final void rule__XTypeLiteral__Group__2__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20754:1: rule__XTypeLiteral__Group__3 : rule__XTypeLiteral__Group__3__Impl rule__XTypeLiteral__Group__4 ;
+    // InternalFormat.g:20754:1: rule__XTypeLiteral__Group__3 : rule__XTypeLiteral__Group__3__Impl rule__XTypeLiteral__Group__4 ;
     public final void rule__XTypeLiteral__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20758:1: ( rule__XTypeLiteral__Group__3__Impl rule__XTypeLiteral__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20759:2: rule__XTypeLiteral__Group__3__Impl rule__XTypeLiteral__Group__4
+            // InternalFormat.g:20758:1: ( rule__XTypeLiteral__Group__3__Impl rule__XTypeLiteral__Group__4 )
+            // InternalFormat.g:20759:2: rule__XTypeLiteral__Group__3__Impl rule__XTypeLiteral__Group__4
             {
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__3__Impl_in_rule__XTypeLiteral__Group__342007);
+            pushFollow(FOLLOW_114);
             rule__XTypeLiteral__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__4_in_rule__XTypeLiteral__Group__342010);
+            pushFollow(FOLLOW_2);
             rule__XTypeLiteral__Group__4();
 
             state._fsp--;
@@ -60094,25 +60094,25 @@ public final void rule__XTypeLiteral__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20766:1: rule__XTypeLiteral__Group__3__Impl : ( ( rule__XTypeLiteral__TypeAssignment_3 ) ) ;
+    // InternalFormat.g:20766:1: rule__XTypeLiteral__Group__3__Impl : ( ( rule__XTypeLiteral__TypeAssignment_3 ) ) ;
     public final void rule__XTypeLiteral__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20770:1: ( ( ( rule__XTypeLiteral__TypeAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20771:1: ( ( rule__XTypeLiteral__TypeAssignment_3 ) )
+            // InternalFormat.g:20770:1: ( ( ( rule__XTypeLiteral__TypeAssignment_3 ) ) )
+            // InternalFormat.g:20771:1: ( ( rule__XTypeLiteral__TypeAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20771:1: ( ( rule__XTypeLiteral__TypeAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20772:1: ( rule__XTypeLiteral__TypeAssignment_3 )
+            // InternalFormat.g:20771:1: ( ( rule__XTypeLiteral__TypeAssignment_3 ) )
+            // InternalFormat.g:20772:1: ( rule__XTypeLiteral__TypeAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getTypeAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20773:1: ( rule__XTypeLiteral__TypeAssignment_3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20773:2: rule__XTypeLiteral__TypeAssignment_3
+            // InternalFormat.g:20773:1: ( rule__XTypeLiteral__TypeAssignment_3 )
+            // InternalFormat.g:20773:2: rule__XTypeLiteral__TypeAssignment_3
             {
-            pushFollow(FOLLOW_rule__XTypeLiteral__TypeAssignment_3_in_rule__XTypeLiteral__Group__3__Impl42037);
+            pushFollow(FOLLOW_2);
             rule__XTypeLiteral__TypeAssignment_3();
 
             state._fsp--;
@@ -60145,21 +60145,21 @@ public final void rule__XTypeLiteral__Group__3__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20783:1: rule__XTypeLiteral__Group__4 : rule__XTypeLiteral__Group__4__Impl rule__XTypeLiteral__Group__5 ;
+    // InternalFormat.g:20783:1: rule__XTypeLiteral__Group__4 : rule__XTypeLiteral__Group__4__Impl rule__XTypeLiteral__Group__5 ;
     public final void rule__XTypeLiteral__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20787:1: ( rule__XTypeLiteral__Group__4__Impl rule__XTypeLiteral__Group__5 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20788:2: rule__XTypeLiteral__Group__4__Impl rule__XTypeLiteral__Group__5
+            // InternalFormat.g:20787:1: ( rule__XTypeLiteral__Group__4__Impl rule__XTypeLiteral__Group__5 )
+            // InternalFormat.g:20788:2: rule__XTypeLiteral__Group__4__Impl rule__XTypeLiteral__Group__5
             {
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__4__Impl_in_rule__XTypeLiteral__Group__442067);
+            pushFollow(FOLLOW_114);
             rule__XTypeLiteral__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__5_in_rule__XTypeLiteral__Group__442070);
+            pushFollow(FOLLOW_2);
             rule__XTypeLiteral__Group__5();
 
             state._fsp--;
@@ -60183,22 +60183,22 @@ public final void rule__XTypeLiteral__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20795:1: rule__XTypeLiteral__Group__4__Impl : ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* ) ;
+    // InternalFormat.g:20795:1: rule__XTypeLiteral__Group__4__Impl : ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* ) ;
     public final void rule__XTypeLiteral__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20799:1: ( ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20800:1: ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* )
+            // InternalFormat.g:20799:1: ( ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* ) )
+            // InternalFormat.g:20800:1: ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20800:1: ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20801:1: ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )*
+            // InternalFormat.g:20800:1: ( ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )* )
+            // InternalFormat.g:20801:1: ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getArrayDimensionsAssignment_4()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20802:1: ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )*
+            // InternalFormat.g:20802:1: ( rule__XTypeLiteral__ArrayDimensionsAssignment_4 )*
             loop158:
             do {
                 int alt158=2;
@@ -60211,9 +60211,9 @@ public final void rule__XTypeLiteral__Group__4__Impl() throws RecognitionExcepti
 
                 switch (alt158) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20802:2: rule__XTypeLiteral__ArrayDimensionsAssignment_4
+            	    // InternalFormat.g:20802:2: rule__XTypeLiteral__ArrayDimensionsAssignment_4
             	    {
-            	    pushFollow(FOLLOW_rule__XTypeLiteral__ArrayDimensionsAssignment_4_in_rule__XTypeLiteral__Group__4__Impl42097);
+            	    pushFollow(FOLLOW_115);
             	    rule__XTypeLiteral__ArrayDimensionsAssignment_4();
 
             	    state._fsp--;
@@ -60252,16 +60252,16 @@ public final void rule__XTypeLiteral__Group__4__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__5"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20812:1: rule__XTypeLiteral__Group__5 : rule__XTypeLiteral__Group__5__Impl ;
+    // InternalFormat.g:20812:1: rule__XTypeLiteral__Group__5 : rule__XTypeLiteral__Group__5__Impl ;
     public final void rule__XTypeLiteral__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20816:1: ( rule__XTypeLiteral__Group__5__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20817:2: rule__XTypeLiteral__Group__5__Impl
+            // InternalFormat.g:20816:1: ( rule__XTypeLiteral__Group__5__Impl )
+            // InternalFormat.g:20817:2: rule__XTypeLiteral__Group__5__Impl
             {
-            pushFollow(FOLLOW_rule__XTypeLiteral__Group__5__Impl_in_rule__XTypeLiteral__Group__542128);
+            pushFollow(FOLLOW_2);
             rule__XTypeLiteral__Group__5__Impl();
 
             state._fsp--;
@@ -60285,22 +60285,22 @@ public final void rule__XTypeLiteral__Group__5() throws RecognitionException {
 
 
     // $ANTLR start "rule__XTypeLiteral__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20823:1: rule__XTypeLiteral__Group__5__Impl : ( ')' ) ;
+    // InternalFormat.g:20823:1: rule__XTypeLiteral__Group__5__Impl : ( ')' ) ;
     public final void rule__XTypeLiteral__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20827:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20828:1: ( ')' )
+            // InternalFormat.g:20827:1: ( ( ')' ) )
+            // InternalFormat.g:20828:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20828:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20829:1: ')'
+            // InternalFormat.g:20828:1: ( ')' )
+            // InternalFormat.g:20829:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getRightParenthesisKeyword_5()); 
             }
-            match(input,75,FOLLOW_75_in_rule__XTypeLiteral__Group__5__Impl42156); if (state.failed) return ;
+            match(input,75,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXTypeLiteralAccess().getRightParenthesisKeyword_5()); 
             }
@@ -60326,21 +60326,21 @@ public final void rule__XTypeLiteral__Group__5__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XThrowExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20854:1: rule__XThrowExpression__Group__0 : rule__XThrowExpression__Group__0__Impl rule__XThrowExpression__Group__1 ;
+    // InternalFormat.g:20854:1: rule__XThrowExpression__Group__0 : rule__XThrowExpression__Group__0__Impl rule__XThrowExpression__Group__1 ;
     public final void rule__XThrowExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20858:1: ( rule__XThrowExpression__Group__0__Impl rule__XThrowExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20859:2: rule__XThrowExpression__Group__0__Impl rule__XThrowExpression__Group__1
+            // InternalFormat.g:20858:1: ( rule__XThrowExpression__Group__0__Impl rule__XThrowExpression__Group__1 )
+            // InternalFormat.g:20859:2: rule__XThrowExpression__Group__0__Impl rule__XThrowExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XThrowExpression__Group__0__Impl_in_rule__XThrowExpression__Group__042199);
+            pushFollow(FOLLOW_116);
             rule__XThrowExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XThrowExpression__Group__1_in_rule__XThrowExpression__Group__042202);
+            pushFollow(FOLLOW_2);
             rule__XThrowExpression__Group__1();
 
             state._fsp--;
@@ -60364,23 +60364,23 @@ public final void rule__XThrowExpression__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XThrowExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20866:1: rule__XThrowExpression__Group__0__Impl : ( () ) ;
+    // InternalFormat.g:20866:1: rule__XThrowExpression__Group__0__Impl : ( () ) ;
     public final void rule__XThrowExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20870:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20871:1: ( () )
+            // InternalFormat.g:20870:1: ( ( () ) )
+            // InternalFormat.g:20871:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20871:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20872:1: ()
+            // InternalFormat.g:20871:1: ( () )
+            // InternalFormat.g:20872:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXThrowExpressionAccess().getXThrowExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20873:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20875:1: 
+            // InternalFormat.g:20873:1: ()
+            // InternalFormat.g:20875:1: 
             {
             }
 
@@ -60405,21 +60405,21 @@ public final void rule__XThrowExpression__Group__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XThrowExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20885:1: rule__XThrowExpression__Group__1 : rule__XThrowExpression__Group__1__Impl rule__XThrowExpression__Group__2 ;
+    // InternalFormat.g:20885:1: rule__XThrowExpression__Group__1 : rule__XThrowExpression__Group__1__Impl rule__XThrowExpression__Group__2 ;
     public final void rule__XThrowExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20889:1: ( rule__XThrowExpression__Group__1__Impl rule__XThrowExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20890:2: rule__XThrowExpression__Group__1__Impl rule__XThrowExpression__Group__2
+            // InternalFormat.g:20889:1: ( rule__XThrowExpression__Group__1__Impl rule__XThrowExpression__Group__2 )
+            // InternalFormat.g:20890:2: rule__XThrowExpression__Group__1__Impl rule__XThrowExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XThrowExpression__Group__1__Impl_in_rule__XThrowExpression__Group__142260);
+            pushFollow(FOLLOW_50);
             rule__XThrowExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XThrowExpression__Group__2_in_rule__XThrowExpression__Group__142263);
+            pushFollow(FOLLOW_2);
             rule__XThrowExpression__Group__2();
 
             state._fsp--;
@@ -60443,22 +60443,22 @@ public final void rule__XThrowExpression__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XThrowExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20897:1: rule__XThrowExpression__Group__1__Impl : ( 'throw' ) ;
+    // InternalFormat.g:20897:1: rule__XThrowExpression__Group__1__Impl : ( 'throw' ) ;
     public final void rule__XThrowExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20901:1: ( ( 'throw' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20902:1: ( 'throw' )
+            // InternalFormat.g:20901:1: ( ( 'throw' ) )
+            // InternalFormat.g:20902:1: ( 'throw' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20902:1: ( 'throw' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20903:1: 'throw'
+            // InternalFormat.g:20902:1: ( 'throw' )
+            // InternalFormat.g:20903:1: 'throw'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXThrowExpressionAccess().getThrowKeyword_1()); 
             }
-            match(input,96,FOLLOW_96_in_rule__XThrowExpression__Group__1__Impl42291); if (state.failed) return ;
+            match(input,96,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXThrowExpressionAccess().getThrowKeyword_1()); 
             }
@@ -60484,16 +60484,16 @@ public final void rule__XThrowExpression__Group__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XThrowExpression__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20916:1: rule__XThrowExpression__Group__2 : rule__XThrowExpression__Group__2__Impl ;
+    // InternalFormat.g:20916:1: rule__XThrowExpression__Group__2 : rule__XThrowExpression__Group__2__Impl ;
     public final void rule__XThrowExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20920:1: ( rule__XThrowExpression__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20921:2: rule__XThrowExpression__Group__2__Impl
+            // InternalFormat.g:20920:1: ( rule__XThrowExpression__Group__2__Impl )
+            // InternalFormat.g:20921:2: rule__XThrowExpression__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__XThrowExpression__Group__2__Impl_in_rule__XThrowExpression__Group__242322);
+            pushFollow(FOLLOW_2);
             rule__XThrowExpression__Group__2__Impl();
 
             state._fsp--;
@@ -60517,25 +60517,25 @@ public final void rule__XThrowExpression__Group__2() throws RecognitionException
 
 
     // $ANTLR start "rule__XThrowExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20927:1: rule__XThrowExpression__Group__2__Impl : ( ( rule__XThrowExpression__ExpressionAssignment_2 ) ) ;
+    // InternalFormat.g:20927:1: rule__XThrowExpression__Group__2__Impl : ( ( rule__XThrowExpression__ExpressionAssignment_2 ) ) ;
     public final void rule__XThrowExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20931:1: ( ( ( rule__XThrowExpression__ExpressionAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20932:1: ( ( rule__XThrowExpression__ExpressionAssignment_2 ) )
+            // InternalFormat.g:20931:1: ( ( ( rule__XThrowExpression__ExpressionAssignment_2 ) ) )
+            // InternalFormat.g:20932:1: ( ( rule__XThrowExpression__ExpressionAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20932:1: ( ( rule__XThrowExpression__ExpressionAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20933:1: ( rule__XThrowExpression__ExpressionAssignment_2 )
+            // InternalFormat.g:20932:1: ( ( rule__XThrowExpression__ExpressionAssignment_2 ) )
+            // InternalFormat.g:20933:1: ( rule__XThrowExpression__ExpressionAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXThrowExpressionAccess().getExpressionAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20934:1: ( rule__XThrowExpression__ExpressionAssignment_2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20934:2: rule__XThrowExpression__ExpressionAssignment_2
+            // InternalFormat.g:20934:1: ( rule__XThrowExpression__ExpressionAssignment_2 )
+            // InternalFormat.g:20934:2: rule__XThrowExpression__ExpressionAssignment_2
             {
-            pushFollow(FOLLOW_rule__XThrowExpression__ExpressionAssignment_2_in_rule__XThrowExpression__Group__2__Impl42349);
+            pushFollow(FOLLOW_2);
             rule__XThrowExpression__ExpressionAssignment_2();
 
             state._fsp--;
@@ -60568,21 +60568,21 @@ public final void rule__XThrowExpression__Group__2__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XReturnExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20950:1: rule__XReturnExpression__Group__0 : rule__XReturnExpression__Group__0__Impl rule__XReturnExpression__Group__1 ;
+    // InternalFormat.g:20950:1: rule__XReturnExpression__Group__0 : rule__XReturnExpression__Group__0__Impl rule__XReturnExpression__Group__1 ;
     public final void rule__XReturnExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20954:1: ( rule__XReturnExpression__Group__0__Impl rule__XReturnExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20955:2: rule__XReturnExpression__Group__0__Impl rule__XReturnExpression__Group__1
+            // InternalFormat.g:20954:1: ( rule__XReturnExpression__Group__0__Impl rule__XReturnExpression__Group__1 )
+            // InternalFormat.g:20955:2: rule__XReturnExpression__Group__0__Impl rule__XReturnExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XReturnExpression__Group__0__Impl_in_rule__XReturnExpression__Group__042385);
+            pushFollow(FOLLOW_117);
             rule__XReturnExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XReturnExpression__Group__1_in_rule__XReturnExpression__Group__042388);
+            pushFollow(FOLLOW_2);
             rule__XReturnExpression__Group__1();
 
             state._fsp--;
@@ -60606,23 +60606,23 @@ public final void rule__XReturnExpression__Group__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XReturnExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20962:1: rule__XReturnExpression__Group__0__Impl : ( () ) ;
+    // InternalFormat.g:20962:1: rule__XReturnExpression__Group__0__Impl : ( () ) ;
     public final void rule__XReturnExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20966:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20967:1: ( () )
+            // InternalFormat.g:20966:1: ( ( () ) )
+            // InternalFormat.g:20967:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20967:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20968:1: ()
+            // InternalFormat.g:20967:1: ( () )
+            // InternalFormat.g:20968:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXReturnExpressionAccess().getXReturnExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20969:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20971:1: 
+            // InternalFormat.g:20969:1: ()
+            // InternalFormat.g:20971:1: 
             {
             }
 
@@ -60647,21 +60647,21 @@ public final void rule__XReturnExpression__Group__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XReturnExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20981:1: rule__XReturnExpression__Group__1 : rule__XReturnExpression__Group__1__Impl rule__XReturnExpression__Group__2 ;
+    // InternalFormat.g:20981:1: rule__XReturnExpression__Group__1 : rule__XReturnExpression__Group__1__Impl rule__XReturnExpression__Group__2 ;
     public final void rule__XReturnExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20985:1: ( rule__XReturnExpression__Group__1__Impl rule__XReturnExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20986:2: rule__XReturnExpression__Group__1__Impl rule__XReturnExpression__Group__2
+            // InternalFormat.g:20985:1: ( rule__XReturnExpression__Group__1__Impl rule__XReturnExpression__Group__2 )
+            // InternalFormat.g:20986:2: rule__XReturnExpression__Group__1__Impl rule__XReturnExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XReturnExpression__Group__1__Impl_in_rule__XReturnExpression__Group__142446);
+            pushFollow(FOLLOW_50);
             rule__XReturnExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XReturnExpression__Group__2_in_rule__XReturnExpression__Group__142449);
+            pushFollow(FOLLOW_2);
             rule__XReturnExpression__Group__2();
 
             state._fsp--;
@@ -60685,22 +60685,22 @@ public final void rule__XReturnExpression__Group__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XReturnExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20993:1: rule__XReturnExpression__Group__1__Impl : ( 'return' ) ;
+    // InternalFormat.g:20993:1: rule__XReturnExpression__Group__1__Impl : ( 'return' ) ;
     public final void rule__XReturnExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20997:1: ( ( 'return' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20998:1: ( 'return' )
+            // InternalFormat.g:20997:1: ( ( 'return' ) )
+            // InternalFormat.g:20998:1: ( 'return' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20998:1: ( 'return' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:20999:1: 'return'
+            // InternalFormat.g:20998:1: ( 'return' )
+            // InternalFormat.g:20999:1: 'return'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXReturnExpressionAccess().getReturnKeyword_1()); 
             }
-            match(input,97,FOLLOW_97_in_rule__XReturnExpression__Group__1__Impl42477); if (state.failed) return ;
+            match(input,97,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXReturnExpressionAccess().getReturnKeyword_1()); 
             }
@@ -60726,16 +60726,16 @@ public final void rule__XReturnExpression__Group__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XReturnExpression__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21012:1: rule__XReturnExpression__Group__2 : rule__XReturnExpression__Group__2__Impl ;
+    // InternalFormat.g:21012:1: rule__XReturnExpression__Group__2 : rule__XReturnExpression__Group__2__Impl ;
     public final void rule__XReturnExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21016:1: ( rule__XReturnExpression__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21017:2: rule__XReturnExpression__Group__2__Impl
+            // InternalFormat.g:21016:1: ( rule__XReturnExpression__Group__2__Impl )
+            // InternalFormat.g:21017:2: rule__XReturnExpression__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__XReturnExpression__Group__2__Impl_in_rule__XReturnExpression__Group__242508);
+            pushFollow(FOLLOW_2);
             rule__XReturnExpression__Group__2__Impl();
 
             state._fsp--;
@@ -60759,29 +60759,29 @@ public final void rule__XReturnExpression__Group__2() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__XReturnExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21023:1: rule__XReturnExpression__Group__2__Impl : ( ( rule__XReturnExpression__ExpressionAssignment_2 )? ) ;
+    // InternalFormat.g:21023:1: rule__XReturnExpression__Group__2__Impl : ( ( rule__XReturnExpression__ExpressionAssignment_2 )? ) ;
     public final void rule__XReturnExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21027:1: ( ( ( rule__XReturnExpression__ExpressionAssignment_2 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21028:1: ( ( rule__XReturnExpression__ExpressionAssignment_2 )? )
+            // InternalFormat.g:21027:1: ( ( ( rule__XReturnExpression__ExpressionAssignment_2 )? ) )
+            // InternalFormat.g:21028:1: ( ( rule__XReturnExpression__ExpressionAssignment_2 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21028:1: ( ( rule__XReturnExpression__ExpressionAssignment_2 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21029:1: ( rule__XReturnExpression__ExpressionAssignment_2 )?
+            // InternalFormat.g:21028:1: ( ( rule__XReturnExpression__ExpressionAssignment_2 )? )
+            // InternalFormat.g:21029:1: ( rule__XReturnExpression__ExpressionAssignment_2 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXReturnExpressionAccess().getExpressionAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21030:1: ( rule__XReturnExpression__ExpressionAssignment_2 )?
+            // InternalFormat.g:21030:1: ( rule__XReturnExpression__ExpressionAssignment_2 )?
             int alt159=2;
             alt159 = dfa159.predict(input);
             switch (alt159) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21030:2: rule__XReturnExpression__ExpressionAssignment_2
+                    // InternalFormat.g:21030:2: rule__XReturnExpression__ExpressionAssignment_2
                     {
-                    pushFollow(FOLLOW_rule__XReturnExpression__ExpressionAssignment_2_in_rule__XReturnExpression__Group__2__Impl42535);
+                    pushFollow(FOLLOW_2);
                     rule__XReturnExpression__ExpressionAssignment_2();
 
                     state._fsp--;
@@ -60817,21 +60817,21 @@ public final void rule__XReturnExpression__Group__2__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21046:1: rule__XTryCatchFinallyExpression__Group__0 : rule__XTryCatchFinallyExpression__Group__0__Impl rule__XTryCatchFinallyExpression__Group__1 ;
+    // InternalFormat.g:21046:1: rule__XTryCatchFinallyExpression__Group__0 : rule__XTryCatchFinallyExpression__Group__0__Impl rule__XTryCatchFinallyExpression__Group__1 ;
     public final void rule__XTryCatchFinallyExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21050:1: ( rule__XTryCatchFinallyExpression__Group__0__Impl rule__XTryCatchFinallyExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21051:2: rule__XTryCatchFinallyExpression__Group__0__Impl rule__XTryCatchFinallyExpression__Group__1
+            // InternalFormat.g:21050:1: ( rule__XTryCatchFinallyExpression__Group__0__Impl rule__XTryCatchFinallyExpression__Group__1 )
+            // InternalFormat.g:21051:2: rule__XTryCatchFinallyExpression__Group__0__Impl rule__XTryCatchFinallyExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group__0__Impl_in_rule__XTryCatchFinallyExpression__Group__042572);
+            pushFollow(FOLLOW_118);
             rule__XTryCatchFinallyExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group__1_in_rule__XTryCatchFinallyExpression__Group__042575);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Group__1();
 
             state._fsp--;
@@ -60855,23 +60855,23 @@ public final void rule__XTryCatchFinallyExpression__Group__0() throws Recognitio
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21058:1: rule__XTryCatchFinallyExpression__Group__0__Impl : ( () ) ;
+    // InternalFormat.g:21058:1: rule__XTryCatchFinallyExpression__Group__0__Impl : ( () ) ;
     public final void rule__XTryCatchFinallyExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21062:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21063:1: ( () )
+            // InternalFormat.g:21062:1: ( ( () ) )
+            // InternalFormat.g:21063:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21063:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21064:1: ()
+            // InternalFormat.g:21063:1: ( () )
+            // InternalFormat.g:21064:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getXTryCatchFinallyExpressionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21065:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21067:1: 
+            // InternalFormat.g:21065:1: ()
+            // InternalFormat.g:21067:1: 
             {
             }
 
@@ -60896,21 +60896,21 @@ public final void rule__XTryCatchFinallyExpression__Group__0__Impl() throws Reco
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21077:1: rule__XTryCatchFinallyExpression__Group__1 : rule__XTryCatchFinallyExpression__Group__1__Impl rule__XTryCatchFinallyExpression__Group__2 ;
+    // InternalFormat.g:21077:1: rule__XTryCatchFinallyExpression__Group__1 : rule__XTryCatchFinallyExpression__Group__1__Impl rule__XTryCatchFinallyExpression__Group__2 ;
     public final void rule__XTryCatchFinallyExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21081:1: ( rule__XTryCatchFinallyExpression__Group__1__Impl rule__XTryCatchFinallyExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21082:2: rule__XTryCatchFinallyExpression__Group__1__Impl rule__XTryCatchFinallyExpression__Group__2
+            // InternalFormat.g:21081:1: ( rule__XTryCatchFinallyExpression__Group__1__Impl rule__XTryCatchFinallyExpression__Group__2 )
+            // InternalFormat.g:21082:2: rule__XTryCatchFinallyExpression__Group__1__Impl rule__XTryCatchFinallyExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group__1__Impl_in_rule__XTryCatchFinallyExpression__Group__142633);
+            pushFollow(FOLLOW_50);
             rule__XTryCatchFinallyExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group__2_in_rule__XTryCatchFinallyExpression__Group__142636);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Group__2();
 
             state._fsp--;
@@ -60934,22 +60934,22 @@ public final void rule__XTryCatchFinallyExpression__Group__1() throws Recognitio
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21089:1: rule__XTryCatchFinallyExpression__Group__1__Impl : ( 'try' ) ;
+    // InternalFormat.g:21089:1: rule__XTryCatchFinallyExpression__Group__1__Impl : ( 'try' ) ;
     public final void rule__XTryCatchFinallyExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21093:1: ( ( 'try' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21094:1: ( 'try' )
+            // InternalFormat.g:21093:1: ( ( 'try' ) )
+            // InternalFormat.g:21094:1: ( 'try' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21094:1: ( 'try' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21095:1: 'try'
+            // InternalFormat.g:21094:1: ( 'try' )
+            // InternalFormat.g:21095:1: 'try'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getTryKeyword_1()); 
             }
-            match(input,98,FOLLOW_98_in_rule__XTryCatchFinallyExpression__Group__1__Impl42664); if (state.failed) return ;
+            match(input,98,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXTryCatchFinallyExpressionAccess().getTryKeyword_1()); 
             }
@@ -60975,21 +60975,21 @@ public final void rule__XTryCatchFinallyExpression__Group__1__Impl() throws Reco
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21108:1: rule__XTryCatchFinallyExpression__Group__2 : rule__XTryCatchFinallyExpression__Group__2__Impl rule__XTryCatchFinallyExpression__Group__3 ;
+    // InternalFormat.g:21108:1: rule__XTryCatchFinallyExpression__Group__2 : rule__XTryCatchFinallyExpression__Group__2__Impl rule__XTryCatchFinallyExpression__Group__3 ;
     public final void rule__XTryCatchFinallyExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21112:1: ( rule__XTryCatchFinallyExpression__Group__2__Impl rule__XTryCatchFinallyExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21113:2: rule__XTryCatchFinallyExpression__Group__2__Impl rule__XTryCatchFinallyExpression__Group__3
+            // InternalFormat.g:21112:1: ( rule__XTryCatchFinallyExpression__Group__2__Impl rule__XTryCatchFinallyExpression__Group__3 )
+            // InternalFormat.g:21113:2: rule__XTryCatchFinallyExpression__Group__2__Impl rule__XTryCatchFinallyExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group__2__Impl_in_rule__XTryCatchFinallyExpression__Group__242695);
+            pushFollow(FOLLOW_119);
             rule__XTryCatchFinallyExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group__3_in_rule__XTryCatchFinallyExpression__Group__242698);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Group__3();
 
             state._fsp--;
@@ -61013,25 +61013,25 @@ public final void rule__XTryCatchFinallyExpression__Group__2() throws Recognitio
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21120:1: rule__XTryCatchFinallyExpression__Group__2__Impl : ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) ) ;
+    // InternalFormat.g:21120:1: rule__XTryCatchFinallyExpression__Group__2__Impl : ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) ) ;
     public final void rule__XTryCatchFinallyExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21124:1: ( ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21125:1: ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) )
+            // InternalFormat.g:21124:1: ( ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) ) )
+            // InternalFormat.g:21125:1: ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21125:1: ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21126:1: ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 )
+            // InternalFormat.g:21125:1: ( ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 ) )
+            // InternalFormat.g:21126:1: ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getExpressionAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21127:1: ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21127:2: rule__XTryCatchFinallyExpression__ExpressionAssignment_2
+            // InternalFormat.g:21127:1: ( rule__XTryCatchFinallyExpression__ExpressionAssignment_2 )
+            // InternalFormat.g:21127:2: rule__XTryCatchFinallyExpression__ExpressionAssignment_2
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__ExpressionAssignment_2_in_rule__XTryCatchFinallyExpression__Group__2__Impl42725);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__ExpressionAssignment_2();
 
             state._fsp--;
@@ -61064,16 +61064,16 @@ public final void rule__XTryCatchFinallyExpression__Group__2__Impl() throws Reco
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21137:1: rule__XTryCatchFinallyExpression__Group__3 : rule__XTryCatchFinallyExpression__Group__3__Impl ;
+    // InternalFormat.g:21137:1: rule__XTryCatchFinallyExpression__Group__3 : rule__XTryCatchFinallyExpression__Group__3__Impl ;
     public final void rule__XTryCatchFinallyExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21141:1: ( rule__XTryCatchFinallyExpression__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21142:2: rule__XTryCatchFinallyExpression__Group__3__Impl
+            // InternalFormat.g:21141:1: ( rule__XTryCatchFinallyExpression__Group__3__Impl )
+            // InternalFormat.g:21142:2: rule__XTryCatchFinallyExpression__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group__3__Impl_in_rule__XTryCatchFinallyExpression__Group__342755);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Group__3__Impl();
 
             state._fsp--;
@@ -61097,25 +61097,25 @@ public final void rule__XTryCatchFinallyExpression__Group__3() throws Recognitio
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21148:1: rule__XTryCatchFinallyExpression__Group__3__Impl : ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) ) ;
+    // InternalFormat.g:21148:1: rule__XTryCatchFinallyExpression__Group__3__Impl : ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) ) ;
     public final void rule__XTryCatchFinallyExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21152:1: ( ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21153:1: ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) )
+            // InternalFormat.g:21152:1: ( ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) ) )
+            // InternalFormat.g:21153:1: ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21153:1: ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21154:1: ( rule__XTryCatchFinallyExpression__Alternatives_3 )
+            // InternalFormat.g:21153:1: ( ( rule__XTryCatchFinallyExpression__Alternatives_3 ) )
+            // InternalFormat.g:21154:1: ( rule__XTryCatchFinallyExpression__Alternatives_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getAlternatives_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21155:1: ( rule__XTryCatchFinallyExpression__Alternatives_3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21155:2: rule__XTryCatchFinallyExpression__Alternatives_3
+            // InternalFormat.g:21155:1: ( rule__XTryCatchFinallyExpression__Alternatives_3 )
+            // InternalFormat.g:21155:2: rule__XTryCatchFinallyExpression__Alternatives_3
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Alternatives_3_in_rule__XTryCatchFinallyExpression__Group__3__Impl42782);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Alternatives_3();
 
             state._fsp--;
@@ -61148,21 +61148,21 @@ public final void rule__XTryCatchFinallyExpression__Group__3__Impl() throws Reco
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21173:1: rule__XTryCatchFinallyExpression__Group_3_0__0 : rule__XTryCatchFinallyExpression__Group_3_0__0__Impl rule__XTryCatchFinallyExpression__Group_3_0__1 ;
+    // InternalFormat.g:21173:1: rule__XTryCatchFinallyExpression__Group_3_0__0 : rule__XTryCatchFinallyExpression__Group_3_0__0__Impl rule__XTryCatchFinallyExpression__Group_3_0__1 ;
     public final void rule__XTryCatchFinallyExpression__Group_3_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21177:1: ( rule__XTryCatchFinallyExpression__Group_3_0__0__Impl rule__XTryCatchFinallyExpression__Group_3_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21178:2: rule__XTryCatchFinallyExpression__Group_3_0__0__Impl rule__XTryCatchFinallyExpression__Group_3_0__1
+            // InternalFormat.g:21177:1: ( rule__XTryCatchFinallyExpression__Group_3_0__0__Impl rule__XTryCatchFinallyExpression__Group_3_0__1 )
+            // InternalFormat.g:21178:2: rule__XTryCatchFinallyExpression__Group_3_0__0__Impl rule__XTryCatchFinallyExpression__Group_3_0__1
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0__0__Impl_in_rule__XTryCatchFinallyExpression__Group_3_0__042820);
+            pushFollow(FOLLOW_120);
             rule__XTryCatchFinallyExpression__Group_3_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0__1_in_rule__XTryCatchFinallyExpression__Group_3_0__042823);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Group_3_0__1();
 
             state._fsp--;
@@ -61186,28 +61186,28 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0__0() throws Recogn
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21185:1: rule__XTryCatchFinallyExpression__Group_3_0__0__Impl : ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) ) ;
+    // InternalFormat.g:21185:1: rule__XTryCatchFinallyExpression__Group_3_0__0__Impl : ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) ) ;
     public final void rule__XTryCatchFinallyExpression__Group_3_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21189:1: ( ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21190:1: ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) )
+            // InternalFormat.g:21189:1: ( ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) ) )
+            // InternalFormat.g:21190:1: ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21190:1: ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21191:1: ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* )
+            // InternalFormat.g:21190:1: ( ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* ) )
+            // InternalFormat.g:21191:1: ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) ) ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21191:1: ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21192:1: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )
+            // InternalFormat.g:21191:1: ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 ) )
+            // InternalFormat.g:21192:1: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getCatchClausesAssignment_3_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21193:1: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21193:2: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0
+            // InternalFormat.g:21193:1: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )
+            // InternalFormat.g:21193:2: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0_in_rule__XTryCatchFinallyExpression__Group_3_0__0__Impl42852);
+            pushFollow(FOLLOW_121);
             rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0();
 
             state._fsp--;
@@ -61221,13 +61221,13 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0__0__Impl() throws
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21196:1: ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21197:1: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )*
+            // InternalFormat.g:21196:1: ( ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )* )
+            // InternalFormat.g:21197:1: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getCatchClausesAssignment_3_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21198:1: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )*
+            // InternalFormat.g:21198:1: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )*
             loop160:
             do {
                 int alt160=2;
@@ -61246,9 +61246,9 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0__0__Impl() throws
 
                 switch (alt160) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21198:2: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0
+            	    // InternalFormat.g:21198:2: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0
             	    {
-            	    pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0_in_rule__XTryCatchFinallyExpression__Group_3_0__0__Impl42864);
+            	    pushFollow(FOLLOW_121);
             	    rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0();
 
             	    state._fsp--;
@@ -61290,16 +61290,16 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0__0__Impl() throws
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21209:1: rule__XTryCatchFinallyExpression__Group_3_0__1 : rule__XTryCatchFinallyExpression__Group_3_0__1__Impl ;
+    // InternalFormat.g:21209:1: rule__XTryCatchFinallyExpression__Group_3_0__1 : rule__XTryCatchFinallyExpression__Group_3_0__1__Impl ;
     public final void rule__XTryCatchFinallyExpression__Group_3_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21213:1: ( rule__XTryCatchFinallyExpression__Group_3_0__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21214:2: rule__XTryCatchFinallyExpression__Group_3_0__1__Impl
+            // InternalFormat.g:21213:1: ( rule__XTryCatchFinallyExpression__Group_3_0__1__Impl )
+            // InternalFormat.g:21214:2: rule__XTryCatchFinallyExpression__Group_3_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0__1__Impl_in_rule__XTryCatchFinallyExpression__Group_3_0__142897);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Group_3_0__1__Impl();
 
             state._fsp--;
@@ -61323,22 +61323,22 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0__1() throws Recogn
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21220:1: rule__XTryCatchFinallyExpression__Group_3_0__1__Impl : ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? ) ;
+    // InternalFormat.g:21220:1: rule__XTryCatchFinallyExpression__Group_3_0__1__Impl : ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? ) ;
     public final void rule__XTryCatchFinallyExpression__Group_3_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21224:1: ( ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21225:1: ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? )
+            // InternalFormat.g:21224:1: ( ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? ) )
+            // InternalFormat.g:21225:1: ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21225:1: ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21226:1: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )?
+            // InternalFormat.g:21225:1: ( ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )? )
+            // InternalFormat.g:21226:1: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getGroup_3_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21227:1: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )?
+            // InternalFormat.g:21227:1: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )?
             int alt161=2;
             int LA161_0 = input.LA(1);
 
@@ -61351,9 +61351,9 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0__1__Impl() throws
             }
             switch (alt161) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21227:2: rule__XTryCatchFinallyExpression__Group_3_0_1__0
+                    // InternalFormat.g:21227:2: rule__XTryCatchFinallyExpression__Group_3_0_1__0
                     {
-                    pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__0_in_rule__XTryCatchFinallyExpression__Group_3_0__1__Impl42924);
+                    pushFollow(FOLLOW_2);
                     rule__XTryCatchFinallyExpression__Group_3_0_1__0();
 
                     state._fsp--;
@@ -61389,21 +61389,21 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0__1__Impl() throws
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21241:1: rule__XTryCatchFinallyExpression__Group_3_0_1__0 : rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_0_1__1 ;
+    // InternalFormat.g:21241:1: rule__XTryCatchFinallyExpression__Group_3_0_1__0 : rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_0_1__1 ;
     public final void rule__XTryCatchFinallyExpression__Group_3_0_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21245:1: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_0_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21246:2: rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_0_1__1
+            // InternalFormat.g:21245:1: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_0_1__1 )
+            // InternalFormat.g:21246:2: rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_0_1__1
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl_in_rule__XTryCatchFinallyExpression__Group_3_0_1__042959);
+            pushFollow(FOLLOW_50);
             rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__1_in_rule__XTryCatchFinallyExpression__Group_3_0_1__042962);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Group_3_0_1__1();
 
             state._fsp--;
@@ -61427,25 +61427,25 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0_1__0() throws Reco
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21253:1: rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl : ( ( 'finally' ) ) ;
+    // InternalFormat.g:21253:1: rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl : ( ( 'finally' ) ) ;
     public final void rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21257:1: ( ( ( 'finally' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21258:1: ( ( 'finally' ) )
+            // InternalFormat.g:21257:1: ( ( ( 'finally' ) ) )
+            // InternalFormat.g:21258:1: ( ( 'finally' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21258:1: ( ( 'finally' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21259:1: ( 'finally' )
+            // InternalFormat.g:21258:1: ( ( 'finally' ) )
+            // InternalFormat.g:21259:1: ( 'finally' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyKeyword_3_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21260:1: ( 'finally' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21261:2: 'finally'
+            // InternalFormat.g:21260:1: ( 'finally' )
+            // InternalFormat.g:21261:2: 'finally'
             {
-            match(input,99,FOLLOW_99_in_rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl42991); if (state.failed) return ;
+            match(input,99,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -61474,16 +61474,16 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl() throw
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21272:1: rule__XTryCatchFinallyExpression__Group_3_0_1__1 : rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl ;
+    // InternalFormat.g:21272:1: rule__XTryCatchFinallyExpression__Group_3_0_1__1 : rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl ;
     public final void rule__XTryCatchFinallyExpression__Group_3_0_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21276:1: ( rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21277:2: rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl
+            // InternalFormat.g:21276:1: ( rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl )
+            // InternalFormat.g:21277:2: rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl_in_rule__XTryCatchFinallyExpression__Group_3_0_1__143023);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl();
 
             state._fsp--;
@@ -61507,25 +61507,25 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0_1__1() throws Reco
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21283:1: rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl : ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) ) ;
+    // InternalFormat.g:21283:1: rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl : ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) ) ;
     public final void rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21287:1: ( ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21288:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) )
+            // InternalFormat.g:21287:1: ( ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) ) )
+            // InternalFormat.g:21288:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21288:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21289:1: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 )
+            // InternalFormat.g:21288:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 ) )
+            // InternalFormat.g:21289:1: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyExpressionAssignment_3_0_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21290:1: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21290:2: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1
+            // InternalFormat.g:21290:1: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 )
+            // InternalFormat.g:21290:2: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1_in_rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl43050);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1();
 
             state._fsp--;
@@ -61558,21 +61558,21 @@ public final void rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl() throw
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21304:1: rule__XTryCatchFinallyExpression__Group_3_1__0 : rule__XTryCatchFinallyExpression__Group_3_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_1__1 ;
+    // InternalFormat.g:21304:1: rule__XTryCatchFinallyExpression__Group_3_1__0 : rule__XTryCatchFinallyExpression__Group_3_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_1__1 ;
     public final void rule__XTryCatchFinallyExpression__Group_3_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21308:1: ( rule__XTryCatchFinallyExpression__Group_3_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21309:2: rule__XTryCatchFinallyExpression__Group_3_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_1__1
+            // InternalFormat.g:21308:1: ( rule__XTryCatchFinallyExpression__Group_3_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_1__1 )
+            // InternalFormat.g:21309:2: rule__XTryCatchFinallyExpression__Group_3_1__0__Impl rule__XTryCatchFinallyExpression__Group_3_1__1
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_1__0__Impl_in_rule__XTryCatchFinallyExpression__Group_3_1__043084);
+            pushFollow(FOLLOW_50);
             rule__XTryCatchFinallyExpression__Group_3_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_1__1_in_rule__XTryCatchFinallyExpression__Group_3_1__043087);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Group_3_1__1();
 
             state._fsp--;
@@ -61596,22 +61596,22 @@ public final void rule__XTryCatchFinallyExpression__Group_3_1__0() throws Recogn
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21316:1: rule__XTryCatchFinallyExpression__Group_3_1__0__Impl : ( 'finally' ) ;
+    // InternalFormat.g:21316:1: rule__XTryCatchFinallyExpression__Group_3_1__0__Impl : ( 'finally' ) ;
     public final void rule__XTryCatchFinallyExpression__Group_3_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21320:1: ( ( 'finally' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21321:1: ( 'finally' )
+            // InternalFormat.g:21320:1: ( ( 'finally' ) )
+            // InternalFormat.g:21321:1: ( 'finally' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21321:1: ( 'finally' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21322:1: 'finally'
+            // InternalFormat.g:21321:1: ( 'finally' )
+            // InternalFormat.g:21322:1: 'finally'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyKeyword_3_1_0()); 
             }
-            match(input,99,FOLLOW_99_in_rule__XTryCatchFinallyExpression__Group_3_1__0__Impl43115); if (state.failed) return ;
+            match(input,99,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyKeyword_3_1_0()); 
             }
@@ -61637,16 +61637,16 @@ public final void rule__XTryCatchFinallyExpression__Group_3_1__0__Impl() throws
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21335:1: rule__XTryCatchFinallyExpression__Group_3_1__1 : rule__XTryCatchFinallyExpression__Group_3_1__1__Impl ;
+    // InternalFormat.g:21335:1: rule__XTryCatchFinallyExpression__Group_3_1__1 : rule__XTryCatchFinallyExpression__Group_3_1__1__Impl ;
     public final void rule__XTryCatchFinallyExpression__Group_3_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21339:1: ( rule__XTryCatchFinallyExpression__Group_3_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21340:2: rule__XTryCatchFinallyExpression__Group_3_1__1__Impl
+            // InternalFormat.g:21339:1: ( rule__XTryCatchFinallyExpression__Group_3_1__1__Impl )
+            // InternalFormat.g:21340:2: rule__XTryCatchFinallyExpression__Group_3_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_1__1__Impl_in_rule__XTryCatchFinallyExpression__Group_3_1__143146);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__Group_3_1__1__Impl();
 
             state._fsp--;
@@ -61670,25 +61670,25 @@ public final void rule__XTryCatchFinallyExpression__Group_3_1__1() throws Recogn
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__Group_3_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21346:1: rule__XTryCatchFinallyExpression__Group_3_1__1__Impl : ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) ) ;
+    // InternalFormat.g:21346:1: rule__XTryCatchFinallyExpression__Group_3_1__1__Impl : ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) ) ;
     public final void rule__XTryCatchFinallyExpression__Group_3_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21350:1: ( ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21351:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) )
+            // InternalFormat.g:21350:1: ( ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) ) )
+            // InternalFormat.g:21351:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21351:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21352:1: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 )
+            // InternalFormat.g:21351:1: ( ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 ) )
+            // InternalFormat.g:21352:1: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyExpressionAssignment_3_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21353:1: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21353:2: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1
+            // InternalFormat.g:21353:1: ( rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 )
+            // InternalFormat.g:21353:2: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1
             {
-            pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1_in_rule__XTryCatchFinallyExpression__Group_3_1__1__Impl43173);
+            pushFollow(FOLLOW_2);
             rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1();
 
             state._fsp--;
@@ -61721,21 +61721,21 @@ public final void rule__XTryCatchFinallyExpression__Group_3_1__1__Impl() throws
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21367:1: rule__XSynchronizedExpression__Group__0 : rule__XSynchronizedExpression__Group__0__Impl rule__XSynchronizedExpression__Group__1 ;
+    // InternalFormat.g:21367:1: rule__XSynchronizedExpression__Group__0 : rule__XSynchronizedExpression__Group__0__Impl rule__XSynchronizedExpression__Group__1 ;
     public final void rule__XSynchronizedExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21371:1: ( rule__XSynchronizedExpression__Group__0__Impl rule__XSynchronizedExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21372:2: rule__XSynchronizedExpression__Group__0__Impl rule__XSynchronizedExpression__Group__1
+            // InternalFormat.g:21371:1: ( rule__XSynchronizedExpression__Group__0__Impl rule__XSynchronizedExpression__Group__1 )
+            // InternalFormat.g:21372:2: rule__XSynchronizedExpression__Group__0__Impl rule__XSynchronizedExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group__0__Impl_in_rule__XSynchronizedExpression__Group__043207);
+            pushFollow(FOLLOW_50);
             rule__XSynchronizedExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group__1_in_rule__XSynchronizedExpression__Group__043210);
+            pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group__1();
 
             state._fsp--;
@@ -61759,25 +61759,25 @@ public final void rule__XSynchronizedExpression__Group__0() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21379:1: rule__XSynchronizedExpression__Group__0__Impl : ( ( rule__XSynchronizedExpression__Group_0__0 ) ) ;
+    // InternalFormat.g:21379:1: rule__XSynchronizedExpression__Group__0__Impl : ( ( rule__XSynchronizedExpression__Group_0__0 ) ) ;
     public final void rule__XSynchronizedExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21383:1: ( ( ( rule__XSynchronizedExpression__Group_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21384:1: ( ( rule__XSynchronizedExpression__Group_0__0 ) )
+            // InternalFormat.g:21383:1: ( ( ( rule__XSynchronizedExpression__Group_0__0 ) ) )
+            // InternalFormat.g:21384:1: ( ( rule__XSynchronizedExpression__Group_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21384:1: ( ( rule__XSynchronizedExpression__Group_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21385:1: ( rule__XSynchronizedExpression__Group_0__0 )
+            // InternalFormat.g:21384:1: ( ( rule__XSynchronizedExpression__Group_0__0 ) )
+            // InternalFormat.g:21385:1: ( rule__XSynchronizedExpression__Group_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getGroup_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21386:1: ( rule__XSynchronizedExpression__Group_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21386:2: rule__XSynchronizedExpression__Group_0__0
+            // InternalFormat.g:21386:1: ( rule__XSynchronizedExpression__Group_0__0 )
+            // InternalFormat.g:21386:2: rule__XSynchronizedExpression__Group_0__0
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group_0__0_in_rule__XSynchronizedExpression__Group__0__Impl43237);
+            pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group_0__0();
 
             state._fsp--;
@@ -61810,21 +61810,21 @@ public final void rule__XSynchronizedExpression__Group__0__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21396:1: rule__XSynchronizedExpression__Group__1 : rule__XSynchronizedExpression__Group__1__Impl rule__XSynchronizedExpression__Group__2 ;
+    // InternalFormat.g:21396:1: rule__XSynchronizedExpression__Group__1 : rule__XSynchronizedExpression__Group__1__Impl rule__XSynchronizedExpression__Group__2 ;
     public final void rule__XSynchronizedExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21400:1: ( rule__XSynchronizedExpression__Group__1__Impl rule__XSynchronizedExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21401:2: rule__XSynchronizedExpression__Group__1__Impl rule__XSynchronizedExpression__Group__2
+            // InternalFormat.g:21400:1: ( rule__XSynchronizedExpression__Group__1__Impl rule__XSynchronizedExpression__Group__2 )
+            // InternalFormat.g:21401:2: rule__XSynchronizedExpression__Group__1__Impl rule__XSynchronizedExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group__1__Impl_in_rule__XSynchronizedExpression__Group__143267);
+            pushFollow(FOLLOW_33);
             rule__XSynchronizedExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group__2_in_rule__XSynchronizedExpression__Group__143270);
+            pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group__2();
 
             state._fsp--;
@@ -61848,25 +61848,25 @@ public final void rule__XSynchronizedExpression__Group__1() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21408:1: rule__XSynchronizedExpression__Group__1__Impl : ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) ) ;
+    // InternalFormat.g:21408:1: rule__XSynchronizedExpression__Group__1__Impl : ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) ) ;
     public final void rule__XSynchronizedExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21412:1: ( ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21413:1: ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) )
+            // InternalFormat.g:21412:1: ( ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) ) )
+            // InternalFormat.g:21413:1: ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21413:1: ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21414:1: ( rule__XSynchronizedExpression__ParamAssignment_1 )
+            // InternalFormat.g:21413:1: ( ( rule__XSynchronizedExpression__ParamAssignment_1 ) )
+            // InternalFormat.g:21414:1: ( rule__XSynchronizedExpression__ParamAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getParamAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21415:1: ( rule__XSynchronizedExpression__ParamAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21415:2: rule__XSynchronizedExpression__ParamAssignment_1
+            // InternalFormat.g:21415:1: ( rule__XSynchronizedExpression__ParamAssignment_1 )
+            // InternalFormat.g:21415:2: rule__XSynchronizedExpression__ParamAssignment_1
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__ParamAssignment_1_in_rule__XSynchronizedExpression__Group__1__Impl43297);
+            pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__ParamAssignment_1();
 
             state._fsp--;
@@ -61899,21 +61899,21 @@ public final void rule__XSynchronizedExpression__Group__1__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21425:1: rule__XSynchronizedExpression__Group__2 : rule__XSynchronizedExpression__Group__2__Impl rule__XSynchronizedExpression__Group__3 ;
+    // InternalFormat.g:21425:1: rule__XSynchronizedExpression__Group__2 : rule__XSynchronizedExpression__Group__2__Impl rule__XSynchronizedExpression__Group__3 ;
     public final void rule__XSynchronizedExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21429:1: ( rule__XSynchronizedExpression__Group__2__Impl rule__XSynchronizedExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21430:2: rule__XSynchronizedExpression__Group__2__Impl rule__XSynchronizedExpression__Group__3
+            // InternalFormat.g:21429:1: ( rule__XSynchronizedExpression__Group__2__Impl rule__XSynchronizedExpression__Group__3 )
+            // InternalFormat.g:21430:2: rule__XSynchronizedExpression__Group__2__Impl rule__XSynchronizedExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group__2__Impl_in_rule__XSynchronizedExpression__Group__243327);
+            pushFollow(FOLLOW_50);
             rule__XSynchronizedExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group__3_in_rule__XSynchronizedExpression__Group__243330);
+            pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group__3();
 
             state._fsp--;
@@ -61937,22 +61937,22 @@ public final void rule__XSynchronizedExpression__Group__2() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21437:1: rule__XSynchronizedExpression__Group__2__Impl : ( ')' ) ;
+    // InternalFormat.g:21437:1: rule__XSynchronizedExpression__Group__2__Impl : ( ')' ) ;
     public final void rule__XSynchronizedExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21441:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21442:1: ( ')' )
+            // InternalFormat.g:21441:1: ( ( ')' ) )
+            // InternalFormat.g:21442:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21442:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21443:1: ')'
+            // InternalFormat.g:21442:1: ( ')' )
+            // InternalFormat.g:21443:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getRightParenthesisKeyword_2()); 
             }
-            match(input,75,FOLLOW_75_in_rule__XSynchronizedExpression__Group__2__Impl43358); if (state.failed) return ;
+            match(input,75,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSynchronizedExpressionAccess().getRightParenthesisKeyword_2()); 
             }
@@ -61978,16 +61978,16 @@ public final void rule__XSynchronizedExpression__Group__2__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21456:1: rule__XSynchronizedExpression__Group__3 : rule__XSynchronizedExpression__Group__3__Impl ;
+    // InternalFormat.g:21456:1: rule__XSynchronizedExpression__Group__3 : rule__XSynchronizedExpression__Group__3__Impl ;
     public final void rule__XSynchronizedExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21460:1: ( rule__XSynchronizedExpression__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21461:2: rule__XSynchronizedExpression__Group__3__Impl
+            // InternalFormat.g:21460:1: ( rule__XSynchronizedExpression__Group__3__Impl )
+            // InternalFormat.g:21461:2: rule__XSynchronizedExpression__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group__3__Impl_in_rule__XSynchronizedExpression__Group__343389);
+            pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group__3__Impl();
 
             state._fsp--;
@@ -62011,25 +62011,25 @@ public final void rule__XSynchronizedExpression__Group__3() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21467:1: rule__XSynchronizedExpression__Group__3__Impl : ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) ) ;
+    // InternalFormat.g:21467:1: rule__XSynchronizedExpression__Group__3__Impl : ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) ) ;
     public final void rule__XSynchronizedExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21471:1: ( ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21472:1: ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) )
+            // InternalFormat.g:21471:1: ( ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) ) )
+            // InternalFormat.g:21472:1: ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21472:1: ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21473:1: ( rule__XSynchronizedExpression__ExpressionAssignment_3 )
+            // InternalFormat.g:21472:1: ( ( rule__XSynchronizedExpression__ExpressionAssignment_3 ) )
+            // InternalFormat.g:21473:1: ( rule__XSynchronizedExpression__ExpressionAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getExpressionAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21474:1: ( rule__XSynchronizedExpression__ExpressionAssignment_3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21474:2: rule__XSynchronizedExpression__ExpressionAssignment_3
+            // InternalFormat.g:21474:1: ( rule__XSynchronizedExpression__ExpressionAssignment_3 )
+            // InternalFormat.g:21474:2: rule__XSynchronizedExpression__ExpressionAssignment_3
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__ExpressionAssignment_3_in_rule__XSynchronizedExpression__Group__3__Impl43416);
+            pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__ExpressionAssignment_3();
 
             state._fsp--;
@@ -62062,16 +62062,16 @@ public final void rule__XSynchronizedExpression__Group__3__Impl() throws Recogni
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21492:1: rule__XSynchronizedExpression__Group_0__0 : rule__XSynchronizedExpression__Group_0__0__Impl ;
+    // InternalFormat.g:21492:1: rule__XSynchronizedExpression__Group_0__0 : rule__XSynchronizedExpression__Group_0__0__Impl ;
     public final void rule__XSynchronizedExpression__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21496:1: ( rule__XSynchronizedExpression__Group_0__0__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21497:2: rule__XSynchronizedExpression__Group_0__0__Impl
+            // InternalFormat.g:21496:1: ( rule__XSynchronizedExpression__Group_0__0__Impl )
+            // InternalFormat.g:21497:2: rule__XSynchronizedExpression__Group_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group_0__0__Impl_in_rule__XSynchronizedExpression__Group_0__043454);
+            pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group_0__0__Impl();
 
             state._fsp--;
@@ -62095,25 +62095,25 @@ public final void rule__XSynchronizedExpression__Group_0__0() throws Recognition
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21503:1: rule__XSynchronizedExpression__Group_0__0__Impl : ( ( rule__XSynchronizedExpression__Group_0_0__0 ) ) ;
+    // InternalFormat.g:21503:1: rule__XSynchronizedExpression__Group_0__0__Impl : ( ( rule__XSynchronizedExpression__Group_0_0__0 ) ) ;
     public final void rule__XSynchronizedExpression__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21507:1: ( ( ( rule__XSynchronizedExpression__Group_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21508:1: ( ( rule__XSynchronizedExpression__Group_0_0__0 ) )
+            // InternalFormat.g:21507:1: ( ( ( rule__XSynchronizedExpression__Group_0_0__0 ) ) )
+            // InternalFormat.g:21508:1: ( ( rule__XSynchronizedExpression__Group_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21508:1: ( ( rule__XSynchronizedExpression__Group_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21509:1: ( rule__XSynchronizedExpression__Group_0_0__0 )
+            // InternalFormat.g:21508:1: ( ( rule__XSynchronizedExpression__Group_0_0__0 ) )
+            // InternalFormat.g:21509:1: ( rule__XSynchronizedExpression__Group_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getGroup_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21510:1: ( rule__XSynchronizedExpression__Group_0_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21510:2: rule__XSynchronizedExpression__Group_0_0__0
+            // InternalFormat.g:21510:1: ( rule__XSynchronizedExpression__Group_0_0__0 )
+            // InternalFormat.g:21510:2: rule__XSynchronizedExpression__Group_0_0__0
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group_0_0__0_in_rule__XSynchronizedExpression__Group_0__0__Impl43481);
+            pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group_0_0__0();
 
             state._fsp--;
@@ -62146,21 +62146,21 @@ public final void rule__XSynchronizedExpression__Group_0__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21522:1: rule__XSynchronizedExpression__Group_0_0__0 : rule__XSynchronizedExpression__Group_0_0__0__Impl rule__XSynchronizedExpression__Group_0_0__1 ;
+    // InternalFormat.g:21522:1: rule__XSynchronizedExpression__Group_0_0__0 : rule__XSynchronizedExpression__Group_0_0__0__Impl rule__XSynchronizedExpression__Group_0_0__1 ;
     public final void rule__XSynchronizedExpression__Group_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21526:1: ( rule__XSynchronizedExpression__Group_0_0__0__Impl rule__XSynchronizedExpression__Group_0_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21527:2: rule__XSynchronizedExpression__Group_0_0__0__Impl rule__XSynchronizedExpression__Group_0_0__1
+            // InternalFormat.g:21526:1: ( rule__XSynchronizedExpression__Group_0_0__0__Impl rule__XSynchronizedExpression__Group_0_0__1 )
+            // InternalFormat.g:21527:2: rule__XSynchronizedExpression__Group_0_0__0__Impl rule__XSynchronizedExpression__Group_0_0__1
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group_0_0__0__Impl_in_rule__XSynchronizedExpression__Group_0_0__043513);
+            pushFollow(FOLLOW_122);
             rule__XSynchronizedExpression__Group_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group_0_0__1_in_rule__XSynchronizedExpression__Group_0_0__043516);
+            pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group_0_0__1();
 
             state._fsp--;
@@ -62184,23 +62184,23 @@ public final void rule__XSynchronizedExpression__Group_0_0__0() throws Recogniti
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21534:1: rule__XSynchronizedExpression__Group_0_0__0__Impl : ( () ) ;
+    // InternalFormat.g:21534:1: rule__XSynchronizedExpression__Group_0_0__0__Impl : ( () ) ;
     public final void rule__XSynchronizedExpression__Group_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21538:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21539:1: ( () )
+            // InternalFormat.g:21538:1: ( ( () ) )
+            // InternalFormat.g:21539:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21539:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21540:1: ()
+            // InternalFormat.g:21539:1: ( () )
+            // InternalFormat.g:21540:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getXSynchronizedExpressionAction_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21541:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21543:1: 
+            // InternalFormat.g:21541:1: ()
+            // InternalFormat.g:21543:1: 
             {
             }
 
@@ -62225,21 +62225,21 @@ public final void rule__XSynchronizedExpression__Group_0_0__0__Impl() throws Rec
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21553:1: rule__XSynchronizedExpression__Group_0_0__1 : rule__XSynchronizedExpression__Group_0_0__1__Impl rule__XSynchronizedExpression__Group_0_0__2 ;
+    // InternalFormat.g:21553:1: rule__XSynchronizedExpression__Group_0_0__1 : rule__XSynchronizedExpression__Group_0_0__1__Impl rule__XSynchronizedExpression__Group_0_0__2 ;
     public final void rule__XSynchronizedExpression__Group_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21557:1: ( rule__XSynchronizedExpression__Group_0_0__1__Impl rule__XSynchronizedExpression__Group_0_0__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21558:2: rule__XSynchronizedExpression__Group_0_0__1__Impl rule__XSynchronizedExpression__Group_0_0__2
+            // InternalFormat.g:21557:1: ( rule__XSynchronizedExpression__Group_0_0__1__Impl rule__XSynchronizedExpression__Group_0_0__2 )
+            // InternalFormat.g:21558:2: rule__XSynchronizedExpression__Group_0_0__1__Impl rule__XSynchronizedExpression__Group_0_0__2
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group_0_0__1__Impl_in_rule__XSynchronizedExpression__Group_0_0__143574);
+            pushFollow(FOLLOW_45);
             rule__XSynchronizedExpression__Group_0_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group_0_0__2_in_rule__XSynchronizedExpression__Group_0_0__143577);
+            pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group_0_0__2();
 
             state._fsp--;
@@ -62263,22 +62263,22 @@ public final void rule__XSynchronizedExpression__Group_0_0__1() throws Recogniti
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21565:1: rule__XSynchronizedExpression__Group_0_0__1__Impl : ( 'synchronized' ) ;
+    // InternalFormat.g:21565:1: rule__XSynchronizedExpression__Group_0_0__1__Impl : ( 'synchronized' ) ;
     public final void rule__XSynchronizedExpression__Group_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21569:1: ( ( 'synchronized' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21570:1: ( 'synchronized' )
+            // InternalFormat.g:21569:1: ( ( 'synchronized' ) )
+            // InternalFormat.g:21570:1: ( 'synchronized' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21570:1: ( 'synchronized' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21571:1: 'synchronized'
+            // InternalFormat.g:21570:1: ( 'synchronized' )
+            // InternalFormat.g:21571:1: 'synchronized'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getSynchronizedKeyword_0_0_1()); 
             }
-            match(input,100,FOLLOW_100_in_rule__XSynchronizedExpression__Group_0_0__1__Impl43605); if (state.failed) return ;
+            match(input,100,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSynchronizedExpressionAccess().getSynchronizedKeyword_0_0_1()); 
             }
@@ -62304,16 +62304,16 @@ public final void rule__XSynchronizedExpression__Group_0_0__1__Impl() throws Rec
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0_0__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21584:1: rule__XSynchronizedExpression__Group_0_0__2 : rule__XSynchronizedExpression__Group_0_0__2__Impl ;
+    // InternalFormat.g:21584:1: rule__XSynchronizedExpression__Group_0_0__2 : rule__XSynchronizedExpression__Group_0_0__2__Impl ;
     public final void rule__XSynchronizedExpression__Group_0_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21588:1: ( rule__XSynchronizedExpression__Group_0_0__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21589:2: rule__XSynchronizedExpression__Group_0_0__2__Impl
+            // InternalFormat.g:21588:1: ( rule__XSynchronizedExpression__Group_0_0__2__Impl )
+            // InternalFormat.g:21589:2: rule__XSynchronizedExpression__Group_0_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__XSynchronizedExpression__Group_0_0__2__Impl_in_rule__XSynchronizedExpression__Group_0_0__243636);
+            pushFollow(FOLLOW_2);
             rule__XSynchronizedExpression__Group_0_0__2__Impl();
 
             state._fsp--;
@@ -62337,22 +62337,22 @@ public final void rule__XSynchronizedExpression__Group_0_0__2() throws Recogniti
 
 
     // $ANTLR start "rule__XSynchronizedExpression__Group_0_0__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21595:1: rule__XSynchronizedExpression__Group_0_0__2__Impl : ( '(' ) ;
+    // InternalFormat.g:21595:1: rule__XSynchronizedExpression__Group_0_0__2__Impl : ( '(' ) ;
     public final void rule__XSynchronizedExpression__Group_0_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21599:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21600:1: ( '(' )
+            // InternalFormat.g:21599:1: ( ( '(' ) )
+            // InternalFormat.g:21600:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21600:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21601:1: '('
+            // InternalFormat.g:21600:1: ( '(' )
+            // InternalFormat.g:21601:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getLeftParenthesisKeyword_0_0_2()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XSynchronizedExpression__Group_0_0__2__Impl43664); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXSynchronizedExpressionAccess().getLeftParenthesisKeyword_0_0_2()); 
             }
@@ -62378,21 +62378,21 @@ public final void rule__XSynchronizedExpression__Group_0_0__2__Impl() throws Rec
 
 
     // $ANTLR start "rule__XCatchClause__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21620:1: rule__XCatchClause__Group__0 : rule__XCatchClause__Group__0__Impl rule__XCatchClause__Group__1 ;
+    // InternalFormat.g:21620:1: rule__XCatchClause__Group__0 : rule__XCatchClause__Group__0__Impl rule__XCatchClause__Group__1 ;
     public final void rule__XCatchClause__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21624:1: ( rule__XCatchClause__Group__0__Impl rule__XCatchClause__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21625:2: rule__XCatchClause__Group__0__Impl rule__XCatchClause__Group__1
+            // InternalFormat.g:21624:1: ( rule__XCatchClause__Group__0__Impl rule__XCatchClause__Group__1 )
+            // InternalFormat.g:21625:2: rule__XCatchClause__Group__0__Impl rule__XCatchClause__Group__1
             {
-            pushFollow(FOLLOW_rule__XCatchClause__Group__0__Impl_in_rule__XCatchClause__Group__043701);
+            pushFollow(FOLLOW_45);
             rule__XCatchClause__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCatchClause__Group__1_in_rule__XCatchClause__Group__043704);
+            pushFollow(FOLLOW_2);
             rule__XCatchClause__Group__1();
 
             state._fsp--;
@@ -62416,25 +62416,25 @@ public final void rule__XCatchClause__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCatchClause__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21632:1: rule__XCatchClause__Group__0__Impl : ( ( 'catch' ) ) ;
+    // InternalFormat.g:21632:1: rule__XCatchClause__Group__0__Impl : ( ( 'catch' ) ) ;
     public final void rule__XCatchClause__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21636:1: ( ( ( 'catch' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21637:1: ( ( 'catch' ) )
+            // InternalFormat.g:21636:1: ( ( ( 'catch' ) ) )
+            // InternalFormat.g:21637:1: ( ( 'catch' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21637:1: ( ( 'catch' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21638:1: ( 'catch' )
+            // InternalFormat.g:21637:1: ( ( 'catch' ) )
+            // InternalFormat.g:21638:1: ( 'catch' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getCatchKeyword_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21639:1: ( 'catch' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21640:2: 'catch'
+            // InternalFormat.g:21639:1: ( 'catch' )
+            // InternalFormat.g:21640:2: 'catch'
             {
-            match(input,101,FOLLOW_101_in_rule__XCatchClause__Group__0__Impl43733); if (state.failed) return ;
+            match(input,101,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -62463,21 +62463,21 @@ public final void rule__XCatchClause__Group__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XCatchClause__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21651:1: rule__XCatchClause__Group__1 : rule__XCatchClause__Group__1__Impl rule__XCatchClause__Group__2 ;
+    // InternalFormat.g:21651:1: rule__XCatchClause__Group__1 : rule__XCatchClause__Group__1__Impl rule__XCatchClause__Group__2 ;
     public final void rule__XCatchClause__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21655:1: ( rule__XCatchClause__Group__1__Impl rule__XCatchClause__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21656:2: rule__XCatchClause__Group__1__Impl rule__XCatchClause__Group__2
+            // InternalFormat.g:21655:1: ( rule__XCatchClause__Group__1__Impl rule__XCatchClause__Group__2 )
+            // InternalFormat.g:21656:2: rule__XCatchClause__Group__1__Impl rule__XCatchClause__Group__2
             {
-            pushFollow(FOLLOW_rule__XCatchClause__Group__1__Impl_in_rule__XCatchClause__Group__143765);
+            pushFollow(FOLLOW_66);
             rule__XCatchClause__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCatchClause__Group__2_in_rule__XCatchClause__Group__143768);
+            pushFollow(FOLLOW_2);
             rule__XCatchClause__Group__2();
 
             state._fsp--;
@@ -62501,22 +62501,22 @@ public final void rule__XCatchClause__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCatchClause__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21663:1: rule__XCatchClause__Group__1__Impl : ( '(' ) ;
+    // InternalFormat.g:21663:1: rule__XCatchClause__Group__1__Impl : ( '(' ) ;
     public final void rule__XCatchClause__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21667:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21668:1: ( '(' )
+            // InternalFormat.g:21667:1: ( ( '(' ) )
+            // InternalFormat.g:21668:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21668:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21669:1: '('
+            // InternalFormat.g:21668:1: ( '(' )
+            // InternalFormat.g:21669:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getLeftParenthesisKeyword_1()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XCatchClause__Group__1__Impl43796); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXCatchClauseAccess().getLeftParenthesisKeyword_1()); 
             }
@@ -62542,21 +62542,21 @@ public final void rule__XCatchClause__Group__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XCatchClause__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21682:1: rule__XCatchClause__Group__2 : rule__XCatchClause__Group__2__Impl rule__XCatchClause__Group__3 ;
+    // InternalFormat.g:21682:1: rule__XCatchClause__Group__2 : rule__XCatchClause__Group__2__Impl rule__XCatchClause__Group__3 ;
     public final void rule__XCatchClause__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21686:1: ( rule__XCatchClause__Group__2__Impl rule__XCatchClause__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21687:2: rule__XCatchClause__Group__2__Impl rule__XCatchClause__Group__3
+            // InternalFormat.g:21686:1: ( rule__XCatchClause__Group__2__Impl rule__XCatchClause__Group__3 )
+            // InternalFormat.g:21687:2: rule__XCatchClause__Group__2__Impl rule__XCatchClause__Group__3
             {
-            pushFollow(FOLLOW_rule__XCatchClause__Group__2__Impl_in_rule__XCatchClause__Group__243827);
+            pushFollow(FOLLOW_33);
             rule__XCatchClause__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCatchClause__Group__3_in_rule__XCatchClause__Group__243830);
+            pushFollow(FOLLOW_2);
             rule__XCatchClause__Group__3();
 
             state._fsp--;
@@ -62580,25 +62580,25 @@ public final void rule__XCatchClause__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCatchClause__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21694:1: rule__XCatchClause__Group__2__Impl : ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) ) ;
+    // InternalFormat.g:21694:1: rule__XCatchClause__Group__2__Impl : ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) ) ;
     public final void rule__XCatchClause__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21698:1: ( ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21699:1: ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) )
+            // InternalFormat.g:21698:1: ( ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) ) )
+            // InternalFormat.g:21699:1: ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21699:1: ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21700:1: ( rule__XCatchClause__DeclaredParamAssignment_2 )
+            // InternalFormat.g:21699:1: ( ( rule__XCatchClause__DeclaredParamAssignment_2 ) )
+            // InternalFormat.g:21700:1: ( rule__XCatchClause__DeclaredParamAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getDeclaredParamAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21701:1: ( rule__XCatchClause__DeclaredParamAssignment_2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21701:2: rule__XCatchClause__DeclaredParamAssignment_2
+            // InternalFormat.g:21701:1: ( rule__XCatchClause__DeclaredParamAssignment_2 )
+            // InternalFormat.g:21701:2: rule__XCatchClause__DeclaredParamAssignment_2
             {
-            pushFollow(FOLLOW_rule__XCatchClause__DeclaredParamAssignment_2_in_rule__XCatchClause__Group__2__Impl43857);
+            pushFollow(FOLLOW_2);
             rule__XCatchClause__DeclaredParamAssignment_2();
 
             state._fsp--;
@@ -62631,21 +62631,21 @@ public final void rule__XCatchClause__Group__2__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XCatchClause__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21711:1: rule__XCatchClause__Group__3 : rule__XCatchClause__Group__3__Impl rule__XCatchClause__Group__4 ;
+    // InternalFormat.g:21711:1: rule__XCatchClause__Group__3 : rule__XCatchClause__Group__3__Impl rule__XCatchClause__Group__4 ;
     public final void rule__XCatchClause__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21715:1: ( rule__XCatchClause__Group__3__Impl rule__XCatchClause__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21716:2: rule__XCatchClause__Group__3__Impl rule__XCatchClause__Group__4
+            // InternalFormat.g:21715:1: ( rule__XCatchClause__Group__3__Impl rule__XCatchClause__Group__4 )
+            // InternalFormat.g:21716:2: rule__XCatchClause__Group__3__Impl rule__XCatchClause__Group__4
             {
-            pushFollow(FOLLOW_rule__XCatchClause__Group__3__Impl_in_rule__XCatchClause__Group__343887);
+            pushFollow(FOLLOW_50);
             rule__XCatchClause__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XCatchClause__Group__4_in_rule__XCatchClause__Group__343890);
+            pushFollow(FOLLOW_2);
             rule__XCatchClause__Group__4();
 
             state._fsp--;
@@ -62669,22 +62669,22 @@ public final void rule__XCatchClause__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCatchClause__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21723:1: rule__XCatchClause__Group__3__Impl : ( ')' ) ;
+    // InternalFormat.g:21723:1: rule__XCatchClause__Group__3__Impl : ( ')' ) ;
     public final void rule__XCatchClause__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21727:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21728:1: ( ')' )
+            // InternalFormat.g:21727:1: ( ( ')' ) )
+            // InternalFormat.g:21728:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21728:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21729:1: ')'
+            // InternalFormat.g:21728:1: ( ')' )
+            // InternalFormat.g:21729:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getRightParenthesisKeyword_3()); 
             }
-            match(input,75,FOLLOW_75_in_rule__XCatchClause__Group__3__Impl43918); if (state.failed) return ;
+            match(input,75,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXCatchClauseAccess().getRightParenthesisKeyword_3()); 
             }
@@ -62710,16 +62710,16 @@ public final void rule__XCatchClause__Group__3__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XCatchClause__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21742:1: rule__XCatchClause__Group__4 : rule__XCatchClause__Group__4__Impl ;
+    // InternalFormat.g:21742:1: rule__XCatchClause__Group__4 : rule__XCatchClause__Group__4__Impl ;
     public final void rule__XCatchClause__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21746:1: ( rule__XCatchClause__Group__4__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21747:2: rule__XCatchClause__Group__4__Impl
+            // InternalFormat.g:21746:1: ( rule__XCatchClause__Group__4__Impl )
+            // InternalFormat.g:21747:2: rule__XCatchClause__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__XCatchClause__Group__4__Impl_in_rule__XCatchClause__Group__443949);
+            pushFollow(FOLLOW_2);
             rule__XCatchClause__Group__4__Impl();
 
             state._fsp--;
@@ -62743,25 +62743,25 @@ public final void rule__XCatchClause__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__XCatchClause__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21753:1: rule__XCatchClause__Group__4__Impl : ( ( rule__XCatchClause__ExpressionAssignment_4 ) ) ;
+    // InternalFormat.g:21753:1: rule__XCatchClause__Group__4__Impl : ( ( rule__XCatchClause__ExpressionAssignment_4 ) ) ;
     public final void rule__XCatchClause__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21757:1: ( ( ( rule__XCatchClause__ExpressionAssignment_4 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21758:1: ( ( rule__XCatchClause__ExpressionAssignment_4 ) )
+            // InternalFormat.g:21757:1: ( ( ( rule__XCatchClause__ExpressionAssignment_4 ) ) )
+            // InternalFormat.g:21758:1: ( ( rule__XCatchClause__ExpressionAssignment_4 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21758:1: ( ( rule__XCatchClause__ExpressionAssignment_4 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21759:1: ( rule__XCatchClause__ExpressionAssignment_4 )
+            // InternalFormat.g:21758:1: ( ( rule__XCatchClause__ExpressionAssignment_4 ) )
+            // InternalFormat.g:21759:1: ( rule__XCatchClause__ExpressionAssignment_4 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getExpressionAssignment_4()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21760:1: ( rule__XCatchClause__ExpressionAssignment_4 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21760:2: rule__XCatchClause__ExpressionAssignment_4
+            // InternalFormat.g:21760:1: ( rule__XCatchClause__ExpressionAssignment_4 )
+            // InternalFormat.g:21760:2: rule__XCatchClause__ExpressionAssignment_4
             {
-            pushFollow(FOLLOW_rule__XCatchClause__ExpressionAssignment_4_in_rule__XCatchClause__Group__4__Impl43976);
+            pushFollow(FOLLOW_2);
             rule__XCatchClause__ExpressionAssignment_4();
 
             state._fsp--;
@@ -62794,21 +62794,21 @@ public final void rule__XCatchClause__Group__4__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__QualifiedName__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21780:1: rule__QualifiedName__Group__0 : rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 ;
+    // InternalFormat.g:21780:1: rule__QualifiedName__Group__0 : rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 ;
     public final void rule__QualifiedName__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21784:1: ( rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21785:2: rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1
+            // InternalFormat.g:21784:1: ( rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 )
+            // InternalFormat.g:21785:2: rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1
             {
-            pushFollow(FOLLOW_rule__QualifiedName__Group__0__Impl_in_rule__QualifiedName__Group__044016);
+            pushFollow(FOLLOW_35);
             rule__QualifiedName__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__QualifiedName__Group__1_in_rule__QualifiedName__Group__044019);
+            pushFollow(FOLLOW_2);
             rule__QualifiedName__Group__1();
 
             state._fsp--;
@@ -62832,22 +62832,22 @@ public final void rule__QualifiedName__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__QualifiedName__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21792:1: rule__QualifiedName__Group__0__Impl : ( ruleValidID ) ;
+    // InternalFormat.g:21792:1: rule__QualifiedName__Group__0__Impl : ( ruleValidID ) ;
     public final void rule__QualifiedName__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21796:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21797:1: ( ruleValidID )
+            // InternalFormat.g:21796:1: ( ( ruleValidID ) )
+            // InternalFormat.g:21797:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21797:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21798:1: ruleValidID
+            // InternalFormat.g:21797:1: ( ruleValidID )
+            // InternalFormat.g:21798:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameAccess().getValidIDParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__QualifiedName__Group__0__Impl44046);
+            pushFollow(FOLLOW_2);
             ruleValidID();
 
             state._fsp--;
@@ -62877,16 +62877,16 @@ public final void rule__QualifiedName__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__QualifiedName__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21809:1: rule__QualifiedName__Group__1 : rule__QualifiedName__Group__1__Impl ;
+    // InternalFormat.g:21809:1: rule__QualifiedName__Group__1 : rule__QualifiedName__Group__1__Impl ;
     public final void rule__QualifiedName__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21813:1: ( rule__QualifiedName__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21814:2: rule__QualifiedName__Group__1__Impl
+            // InternalFormat.g:21813:1: ( rule__QualifiedName__Group__1__Impl )
+            // InternalFormat.g:21814:2: rule__QualifiedName__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__QualifiedName__Group__1__Impl_in_rule__QualifiedName__Group__144075);
+            pushFollow(FOLLOW_2);
             rule__QualifiedName__Group__1__Impl();
 
             state._fsp--;
@@ -62910,22 +62910,22 @@ public final void rule__QualifiedName__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__QualifiedName__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21820:1: rule__QualifiedName__Group__1__Impl : ( ( rule__QualifiedName__Group_1__0 )* ) ;
+    // InternalFormat.g:21820:1: rule__QualifiedName__Group__1__Impl : ( ( rule__QualifiedName__Group_1__0 )* ) ;
     public final void rule__QualifiedName__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21824:1: ( ( ( rule__QualifiedName__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21825:1: ( ( rule__QualifiedName__Group_1__0 )* )
+            // InternalFormat.g:21824:1: ( ( ( rule__QualifiedName__Group_1__0 )* ) )
+            // InternalFormat.g:21825:1: ( ( rule__QualifiedName__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21825:1: ( ( rule__QualifiedName__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21826:1: ( rule__QualifiedName__Group_1__0 )*
+            // InternalFormat.g:21825:1: ( ( rule__QualifiedName__Group_1__0 )* )
+            // InternalFormat.g:21826:1: ( rule__QualifiedName__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21827:1: ( rule__QualifiedName__Group_1__0 )*
+            // InternalFormat.g:21827:1: ( rule__QualifiedName__Group_1__0 )*
             loop162:
             do {
                 int alt162=2;
@@ -62974,9 +62974,9 @@ public final void rule__QualifiedName__Group__1__Impl() throws RecognitionExcept
 
                 switch (alt162) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21827:2: rule__QualifiedName__Group_1__0
+            	    // InternalFormat.g:21827:2: rule__QualifiedName__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__QualifiedName__Group_1__0_in_rule__QualifiedName__Group__1__Impl44102);
+            	    pushFollow(FOLLOW_47);
             	    rule__QualifiedName__Group_1__0();
 
             	    state._fsp--;
@@ -63015,21 +63015,21 @@ public final void rule__QualifiedName__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21841:1: rule__QualifiedName__Group_1__0 : rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 ;
+    // InternalFormat.g:21841:1: rule__QualifiedName__Group_1__0 : rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 ;
     public final void rule__QualifiedName__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21845:1: ( rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21846:2: rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1
+            // InternalFormat.g:21845:1: ( rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 )
+            // InternalFormat.g:21846:2: rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1
             {
-            pushFollow(FOLLOW_rule__QualifiedName__Group_1__0__Impl_in_rule__QualifiedName__Group_1__044137);
+            pushFollow(FOLLOW_9);
             rule__QualifiedName__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__QualifiedName__Group_1__1_in_rule__QualifiedName__Group_1__044140);
+            pushFollow(FOLLOW_2);
             rule__QualifiedName__Group_1__1();
 
             state._fsp--;
@@ -63053,25 +63053,25 @@ public final void rule__QualifiedName__Group_1__0() throws RecognitionException
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21853:1: rule__QualifiedName__Group_1__0__Impl : ( ( '.' ) ) ;
+    // InternalFormat.g:21853:1: rule__QualifiedName__Group_1__0__Impl : ( ( '.' ) ) ;
     public final void rule__QualifiedName__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21857:1: ( ( ( '.' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21858:1: ( ( '.' ) )
+            // InternalFormat.g:21857:1: ( ( ( '.' ) ) )
+            // InternalFormat.g:21858:1: ( ( '.' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21858:1: ( ( '.' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21859:1: ( '.' )
+            // InternalFormat.g:21858:1: ( ( '.' ) )
+            // InternalFormat.g:21859:1: ( '.' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameAccess().getFullStopKeyword_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21860:1: ( '.' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21861:2: '.'
+            // InternalFormat.g:21860:1: ( '.' )
+            // InternalFormat.g:21861:2: '.'
             {
-            match(input,49,FOLLOW_49_in_rule__QualifiedName__Group_1__0__Impl44169); if (state.failed) return ;
+            match(input,49,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -63100,16 +63100,16 @@ public final void rule__QualifiedName__Group_1__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21872:1: rule__QualifiedName__Group_1__1 : rule__QualifiedName__Group_1__1__Impl ;
+    // InternalFormat.g:21872:1: rule__QualifiedName__Group_1__1 : rule__QualifiedName__Group_1__1__Impl ;
     public final void rule__QualifiedName__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21876:1: ( rule__QualifiedName__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21877:2: rule__QualifiedName__Group_1__1__Impl
+            // InternalFormat.g:21876:1: ( rule__QualifiedName__Group_1__1__Impl )
+            // InternalFormat.g:21877:2: rule__QualifiedName__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__QualifiedName__Group_1__1__Impl_in_rule__QualifiedName__Group_1__144201);
+            pushFollow(FOLLOW_2);
             rule__QualifiedName__Group_1__1__Impl();
 
             state._fsp--;
@@ -63133,22 +63133,22 @@ public final void rule__QualifiedName__Group_1__1() throws RecognitionException
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21883:1: rule__QualifiedName__Group_1__1__Impl : ( ruleValidID ) ;
+    // InternalFormat.g:21883:1: rule__QualifiedName__Group_1__1__Impl : ( ruleValidID ) ;
     public final void rule__QualifiedName__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21887:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21888:1: ( ruleValidID )
+            // InternalFormat.g:21887:1: ( ( ruleValidID ) )
+            // InternalFormat.g:21888:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21888:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21889:1: ruleValidID
+            // InternalFormat.g:21888:1: ( ruleValidID )
+            // InternalFormat.g:21889:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameAccess().getValidIDParserRuleCall_1_1()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__QualifiedName__Group_1__1__Impl44228);
+            pushFollow(FOLLOW_2);
             ruleValidID();
 
             state._fsp--;
@@ -63178,21 +63178,21 @@ public final void rule__QualifiedName__Group_1__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__Number__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21904:1: rule__Number__Group_1__0 : rule__Number__Group_1__0__Impl rule__Number__Group_1__1 ;
+    // InternalFormat.g:21904:1: rule__Number__Group_1__0 : rule__Number__Group_1__0__Impl rule__Number__Group_1__1 ;
     public final void rule__Number__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21908:1: ( rule__Number__Group_1__0__Impl rule__Number__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21909:2: rule__Number__Group_1__0__Impl rule__Number__Group_1__1
+            // InternalFormat.g:21908:1: ( rule__Number__Group_1__0__Impl rule__Number__Group_1__1 )
+            // InternalFormat.g:21909:2: rule__Number__Group_1__0__Impl rule__Number__Group_1__1
             {
-            pushFollow(FOLLOW_rule__Number__Group_1__0__Impl_in_rule__Number__Group_1__044261);
+            pushFollow(FOLLOW_35);
             rule__Number__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Number__Group_1__1_in_rule__Number__Group_1__044264);
+            pushFollow(FOLLOW_2);
             rule__Number__Group_1__1();
 
             state._fsp--;
@@ -63216,25 +63216,25 @@ public final void rule__Number__Group_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Number__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21916:1: rule__Number__Group_1__0__Impl : ( ( rule__Number__Alternatives_1_0 ) ) ;
+    // InternalFormat.g:21916:1: rule__Number__Group_1__0__Impl : ( ( rule__Number__Alternatives_1_0 ) ) ;
     public final void rule__Number__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21920:1: ( ( ( rule__Number__Alternatives_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21921:1: ( ( rule__Number__Alternatives_1_0 ) )
+            // InternalFormat.g:21920:1: ( ( ( rule__Number__Alternatives_1_0 ) ) )
+            // InternalFormat.g:21921:1: ( ( rule__Number__Alternatives_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21921:1: ( ( rule__Number__Alternatives_1_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21922:1: ( rule__Number__Alternatives_1_0 )
+            // InternalFormat.g:21921:1: ( ( rule__Number__Alternatives_1_0 ) )
+            // InternalFormat.g:21922:1: ( rule__Number__Alternatives_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNumberAccess().getAlternatives_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21923:1: ( rule__Number__Alternatives_1_0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21923:2: rule__Number__Alternatives_1_0
+            // InternalFormat.g:21923:1: ( rule__Number__Alternatives_1_0 )
+            // InternalFormat.g:21923:2: rule__Number__Alternatives_1_0
             {
-            pushFollow(FOLLOW_rule__Number__Alternatives_1_0_in_rule__Number__Group_1__0__Impl44291);
+            pushFollow(FOLLOW_2);
             rule__Number__Alternatives_1_0();
 
             state._fsp--;
@@ -63267,16 +63267,16 @@ public final void rule__Number__Group_1__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Number__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21933:1: rule__Number__Group_1__1 : rule__Number__Group_1__1__Impl ;
+    // InternalFormat.g:21933:1: rule__Number__Group_1__1 : rule__Number__Group_1__1__Impl ;
     public final void rule__Number__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21937:1: ( rule__Number__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21938:2: rule__Number__Group_1__1__Impl
+            // InternalFormat.g:21937:1: ( rule__Number__Group_1__1__Impl )
+            // InternalFormat.g:21938:2: rule__Number__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__Number__Group_1__1__Impl_in_rule__Number__Group_1__144321);
+            pushFollow(FOLLOW_2);
             rule__Number__Group_1__1__Impl();
 
             state._fsp--;
@@ -63300,22 +63300,22 @@ public final void rule__Number__Group_1__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Number__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21944:1: rule__Number__Group_1__1__Impl : ( ( rule__Number__Group_1_1__0 )? ) ;
+    // InternalFormat.g:21944:1: rule__Number__Group_1__1__Impl : ( ( rule__Number__Group_1_1__0 )? ) ;
     public final void rule__Number__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21948:1: ( ( ( rule__Number__Group_1_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21949:1: ( ( rule__Number__Group_1_1__0 )? )
+            // InternalFormat.g:21948:1: ( ( ( rule__Number__Group_1_1__0 )? ) )
+            // InternalFormat.g:21949:1: ( ( rule__Number__Group_1_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21949:1: ( ( rule__Number__Group_1_1__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21950:1: ( rule__Number__Group_1_1__0 )?
+            // InternalFormat.g:21949:1: ( ( rule__Number__Group_1_1__0 )? )
+            // InternalFormat.g:21950:1: ( rule__Number__Group_1_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNumberAccess().getGroup_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21951:1: ( rule__Number__Group_1_1__0 )?
+            // InternalFormat.g:21951:1: ( rule__Number__Group_1_1__0 )?
             int alt163=2;
             int LA163_0 = input.LA(1);
 
@@ -63328,9 +63328,9 @@ public final void rule__Number__Group_1__1__Impl() throws RecognitionException {
             }
             switch (alt163) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21951:2: rule__Number__Group_1_1__0
+                    // InternalFormat.g:21951:2: rule__Number__Group_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__Number__Group_1_1__0_in_rule__Number__Group_1__1__Impl44348);
+                    pushFollow(FOLLOW_2);
                     rule__Number__Group_1_1__0();
 
                     state._fsp--;
@@ -63366,21 +63366,21 @@ public final void rule__Number__Group_1__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Number__Group_1_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21965:1: rule__Number__Group_1_1__0 : rule__Number__Group_1_1__0__Impl rule__Number__Group_1_1__1 ;
+    // InternalFormat.g:21965:1: rule__Number__Group_1_1__0 : rule__Number__Group_1_1__0__Impl rule__Number__Group_1_1__1 ;
     public final void rule__Number__Group_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21969:1: ( rule__Number__Group_1_1__0__Impl rule__Number__Group_1_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21970:2: rule__Number__Group_1_1__0__Impl rule__Number__Group_1_1__1
+            // InternalFormat.g:21969:1: ( rule__Number__Group_1_1__0__Impl rule__Number__Group_1_1__1 )
+            // InternalFormat.g:21970:2: rule__Number__Group_1_1__0__Impl rule__Number__Group_1_1__1
             {
-            pushFollow(FOLLOW_rule__Number__Group_1_1__0__Impl_in_rule__Number__Group_1_1__044383);
+            pushFollow(FOLLOW_123);
             rule__Number__Group_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Number__Group_1_1__1_in_rule__Number__Group_1_1__044386);
+            pushFollow(FOLLOW_2);
             rule__Number__Group_1_1__1();
 
             state._fsp--;
@@ -63404,22 +63404,22 @@ public final void rule__Number__Group_1_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Number__Group_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21977:1: rule__Number__Group_1_1__0__Impl : ( '.' ) ;
+    // InternalFormat.g:21977:1: rule__Number__Group_1_1__0__Impl : ( '.' ) ;
     public final void rule__Number__Group_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21981:1: ( ( '.' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21982:1: ( '.' )
+            // InternalFormat.g:21981:1: ( ( '.' ) )
+            // InternalFormat.g:21982:1: ( '.' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21982:1: ( '.' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21983:1: '.'
+            // InternalFormat.g:21982:1: ( '.' )
+            // InternalFormat.g:21983:1: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNumberAccess().getFullStopKeyword_1_1_0()); 
             }
-            match(input,49,FOLLOW_49_in_rule__Number__Group_1_1__0__Impl44414); if (state.failed) return ;
+            match(input,49,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getNumberAccess().getFullStopKeyword_1_1_0()); 
             }
@@ -63445,16 +63445,16 @@ public final void rule__Number__Group_1_1__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__Number__Group_1_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21996:1: rule__Number__Group_1_1__1 : rule__Number__Group_1_1__1__Impl ;
+    // InternalFormat.g:21996:1: rule__Number__Group_1_1__1 : rule__Number__Group_1_1__1__Impl ;
     public final void rule__Number__Group_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22000:1: ( rule__Number__Group_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22001:2: rule__Number__Group_1_1__1__Impl
+            // InternalFormat.g:22000:1: ( rule__Number__Group_1_1__1__Impl )
+            // InternalFormat.g:22001:2: rule__Number__Group_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__Number__Group_1_1__1__Impl_in_rule__Number__Group_1_1__144445);
+            pushFollow(FOLLOW_2);
             rule__Number__Group_1_1__1__Impl();
 
             state._fsp--;
@@ -63478,25 +63478,25 @@ public final void rule__Number__Group_1_1__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Number__Group_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22007:1: rule__Number__Group_1_1__1__Impl : ( ( rule__Number__Alternatives_1_1_1 ) ) ;
+    // InternalFormat.g:22007:1: rule__Number__Group_1_1__1__Impl : ( ( rule__Number__Alternatives_1_1_1 ) ) ;
     public final void rule__Number__Group_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22011:1: ( ( ( rule__Number__Alternatives_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22012:1: ( ( rule__Number__Alternatives_1_1_1 ) )
+            // InternalFormat.g:22011:1: ( ( ( rule__Number__Alternatives_1_1_1 ) ) )
+            // InternalFormat.g:22012:1: ( ( rule__Number__Alternatives_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22012:1: ( ( rule__Number__Alternatives_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22013:1: ( rule__Number__Alternatives_1_1_1 )
+            // InternalFormat.g:22012:1: ( ( rule__Number__Alternatives_1_1_1 ) )
+            // InternalFormat.g:22013:1: ( rule__Number__Alternatives_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNumberAccess().getAlternatives_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22014:1: ( rule__Number__Alternatives_1_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22014:2: rule__Number__Alternatives_1_1_1
+            // InternalFormat.g:22014:1: ( rule__Number__Alternatives_1_1_1 )
+            // InternalFormat.g:22014:2: rule__Number__Alternatives_1_1_1
             {
-            pushFollow(FOLLOW_rule__Number__Alternatives_1_1_1_in_rule__Number__Group_1_1__1__Impl44472);
+            pushFollow(FOLLOW_2);
             rule__Number__Alternatives_1_1_1();
 
             state._fsp--;
@@ -63529,21 +63529,21 @@ public final void rule__Number__Group_1_1__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22029:1: rule__JvmTypeReference__Group_0__0 : rule__JvmTypeReference__Group_0__0__Impl rule__JvmTypeReference__Group_0__1 ;
+    // InternalFormat.g:22029:1: rule__JvmTypeReference__Group_0__0 : rule__JvmTypeReference__Group_0__0__Impl rule__JvmTypeReference__Group_0__1 ;
     public final void rule__JvmTypeReference__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22033:1: ( rule__JvmTypeReference__Group_0__0__Impl rule__JvmTypeReference__Group_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22034:2: rule__JvmTypeReference__Group_0__0__Impl rule__JvmTypeReference__Group_0__1
+            // InternalFormat.g:22033:1: ( rule__JvmTypeReference__Group_0__0__Impl rule__JvmTypeReference__Group_0__1 )
+            // InternalFormat.g:22034:2: rule__JvmTypeReference__Group_0__0__Impl rule__JvmTypeReference__Group_0__1
             {
-            pushFollow(FOLLOW_rule__JvmTypeReference__Group_0__0__Impl_in_rule__JvmTypeReference__Group_0__044507);
+            pushFollow(FOLLOW_53);
             rule__JvmTypeReference__Group_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmTypeReference__Group_0__1_in_rule__JvmTypeReference__Group_0__044510);
+            pushFollow(FOLLOW_2);
             rule__JvmTypeReference__Group_0__1();
 
             state._fsp--;
@@ -63567,22 +63567,22 @@ public final void rule__JvmTypeReference__Group_0__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22041:1: rule__JvmTypeReference__Group_0__0__Impl : ( ruleJvmParameterizedTypeReference ) ;
+    // InternalFormat.g:22041:1: rule__JvmTypeReference__Group_0__0__Impl : ( ruleJvmParameterizedTypeReference ) ;
     public final void rule__JvmTypeReference__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22045:1: ( ( ruleJvmParameterizedTypeReference ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22046:1: ( ruleJvmParameterizedTypeReference )
+            // InternalFormat.g:22045:1: ( ( ruleJvmParameterizedTypeReference ) )
+            // InternalFormat.g:22046:1: ( ruleJvmParameterizedTypeReference )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22046:1: ( ruleJvmParameterizedTypeReference )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22047:1: ruleJvmParameterizedTypeReference
+            // InternalFormat.g:22046:1: ( ruleJvmParameterizedTypeReference )
+            // InternalFormat.g:22047:1: ruleJvmParameterizedTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmTypeReferenceAccess().getJvmParameterizedTypeReferenceParserRuleCall_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmParameterizedTypeReference_in_rule__JvmTypeReference__Group_0__0__Impl44537);
+            pushFollow(FOLLOW_2);
             ruleJvmParameterizedTypeReference();
 
             state._fsp--;
@@ -63612,16 +63612,16 @@ public final void rule__JvmTypeReference__Group_0__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22058:1: rule__JvmTypeReference__Group_0__1 : rule__JvmTypeReference__Group_0__1__Impl ;
+    // InternalFormat.g:22058:1: rule__JvmTypeReference__Group_0__1 : rule__JvmTypeReference__Group_0__1__Impl ;
     public final void rule__JvmTypeReference__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22062:1: ( rule__JvmTypeReference__Group_0__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22063:2: rule__JvmTypeReference__Group_0__1__Impl
+            // InternalFormat.g:22062:1: ( rule__JvmTypeReference__Group_0__1__Impl )
+            // InternalFormat.g:22063:2: rule__JvmTypeReference__Group_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmTypeReference__Group_0__1__Impl_in_rule__JvmTypeReference__Group_0__144566);
+            pushFollow(FOLLOW_2);
             rule__JvmTypeReference__Group_0__1__Impl();
 
             state._fsp--;
@@ -63645,22 +63645,22 @@ public final void rule__JvmTypeReference__Group_0__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22069:1: rule__JvmTypeReference__Group_0__1__Impl : ( ( rule__JvmTypeReference__Group_0_1__0 )* ) ;
+    // InternalFormat.g:22069:1: rule__JvmTypeReference__Group_0__1__Impl : ( ( rule__JvmTypeReference__Group_0_1__0 )* ) ;
     public final void rule__JvmTypeReference__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22073:1: ( ( ( rule__JvmTypeReference__Group_0_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22074:1: ( ( rule__JvmTypeReference__Group_0_1__0 )* )
+            // InternalFormat.g:22073:1: ( ( ( rule__JvmTypeReference__Group_0_1__0 )* ) )
+            // InternalFormat.g:22074:1: ( ( rule__JvmTypeReference__Group_0_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22074:1: ( ( rule__JvmTypeReference__Group_0_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22075:1: ( rule__JvmTypeReference__Group_0_1__0 )*
+            // InternalFormat.g:22074:1: ( ( rule__JvmTypeReference__Group_0_1__0 )* )
+            // InternalFormat.g:22075:1: ( rule__JvmTypeReference__Group_0_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmTypeReferenceAccess().getGroup_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22076:1: ( rule__JvmTypeReference__Group_0_1__0 )*
+            // InternalFormat.g:22076:1: ( rule__JvmTypeReference__Group_0_1__0 )*
             loop164:
             do {
                 int alt164=2;
@@ -63685,9 +63685,9 @@ public final void rule__JvmTypeReference__Group_0__1__Impl() throws RecognitionE
 
                 switch (alt164) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22076:2: rule__JvmTypeReference__Group_0_1__0
+            	    // InternalFormat.g:22076:2: rule__JvmTypeReference__Group_0_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__JvmTypeReference__Group_0_1__0_in_rule__JvmTypeReference__Group_0__1__Impl44593);
+            	    pushFollow(FOLLOW_115);
             	    rule__JvmTypeReference__Group_0_1__0();
 
             	    state._fsp--;
@@ -63726,16 +63726,16 @@ public final void rule__JvmTypeReference__Group_0__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22090:1: rule__JvmTypeReference__Group_0_1__0 : rule__JvmTypeReference__Group_0_1__0__Impl ;
+    // InternalFormat.g:22090:1: rule__JvmTypeReference__Group_0_1__0 : rule__JvmTypeReference__Group_0_1__0__Impl ;
     public final void rule__JvmTypeReference__Group_0_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22094:1: ( rule__JvmTypeReference__Group_0_1__0__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22095:2: rule__JvmTypeReference__Group_0_1__0__Impl
+            // InternalFormat.g:22094:1: ( rule__JvmTypeReference__Group_0_1__0__Impl )
+            // InternalFormat.g:22095:2: rule__JvmTypeReference__Group_0_1__0__Impl
             {
-            pushFollow(FOLLOW_rule__JvmTypeReference__Group_0_1__0__Impl_in_rule__JvmTypeReference__Group_0_1__044628);
+            pushFollow(FOLLOW_2);
             rule__JvmTypeReference__Group_0_1__0__Impl();
 
             state._fsp--;
@@ -63759,25 +63759,25 @@ public final void rule__JvmTypeReference__Group_0_1__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22101:1: rule__JvmTypeReference__Group_0_1__0__Impl : ( ( rule__JvmTypeReference__Group_0_1_0__0 ) ) ;
+    // InternalFormat.g:22101:1: rule__JvmTypeReference__Group_0_1__0__Impl : ( ( rule__JvmTypeReference__Group_0_1_0__0 ) ) ;
     public final void rule__JvmTypeReference__Group_0_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22105:1: ( ( ( rule__JvmTypeReference__Group_0_1_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22106:1: ( ( rule__JvmTypeReference__Group_0_1_0__0 ) )
+            // InternalFormat.g:22105:1: ( ( ( rule__JvmTypeReference__Group_0_1_0__0 ) ) )
+            // InternalFormat.g:22106:1: ( ( rule__JvmTypeReference__Group_0_1_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22106:1: ( ( rule__JvmTypeReference__Group_0_1_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22107:1: ( rule__JvmTypeReference__Group_0_1_0__0 )
+            // InternalFormat.g:22106:1: ( ( rule__JvmTypeReference__Group_0_1_0__0 ) )
+            // InternalFormat.g:22107:1: ( rule__JvmTypeReference__Group_0_1_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmTypeReferenceAccess().getGroup_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22108:1: ( rule__JvmTypeReference__Group_0_1_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22108:2: rule__JvmTypeReference__Group_0_1_0__0
+            // InternalFormat.g:22108:1: ( rule__JvmTypeReference__Group_0_1_0__0 )
+            // InternalFormat.g:22108:2: rule__JvmTypeReference__Group_0_1_0__0
             {
-            pushFollow(FOLLOW_rule__JvmTypeReference__Group_0_1_0__0_in_rule__JvmTypeReference__Group_0_1__0__Impl44655);
+            pushFollow(FOLLOW_2);
             rule__JvmTypeReference__Group_0_1_0__0();
 
             state._fsp--;
@@ -63810,21 +63810,21 @@ public final void rule__JvmTypeReference__Group_0_1__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0_1_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22120:1: rule__JvmTypeReference__Group_0_1_0__0 : rule__JvmTypeReference__Group_0_1_0__0__Impl rule__JvmTypeReference__Group_0_1_0__1 ;
+    // InternalFormat.g:22120:1: rule__JvmTypeReference__Group_0_1_0__0 : rule__JvmTypeReference__Group_0_1_0__0__Impl rule__JvmTypeReference__Group_0_1_0__1 ;
     public final void rule__JvmTypeReference__Group_0_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22124:1: ( rule__JvmTypeReference__Group_0_1_0__0__Impl rule__JvmTypeReference__Group_0_1_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22125:2: rule__JvmTypeReference__Group_0_1_0__0__Impl rule__JvmTypeReference__Group_0_1_0__1
+            // InternalFormat.g:22124:1: ( rule__JvmTypeReference__Group_0_1_0__0__Impl rule__JvmTypeReference__Group_0_1_0__1 )
+            // InternalFormat.g:22125:2: rule__JvmTypeReference__Group_0_1_0__0__Impl rule__JvmTypeReference__Group_0_1_0__1
             {
-            pushFollow(FOLLOW_rule__JvmTypeReference__Group_0_1_0__0__Impl_in_rule__JvmTypeReference__Group_0_1_0__044687);
+            pushFollow(FOLLOW_53);
             rule__JvmTypeReference__Group_0_1_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmTypeReference__Group_0_1_0__1_in_rule__JvmTypeReference__Group_0_1_0__044690);
+            pushFollow(FOLLOW_2);
             rule__JvmTypeReference__Group_0_1_0__1();
 
             state._fsp--;
@@ -63848,23 +63848,23 @@ public final void rule__JvmTypeReference__Group_0_1_0__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22132:1: rule__JvmTypeReference__Group_0_1_0__0__Impl : ( () ) ;
+    // InternalFormat.g:22132:1: rule__JvmTypeReference__Group_0_1_0__0__Impl : ( () ) ;
     public final void rule__JvmTypeReference__Group_0_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22136:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22137:1: ( () )
+            // InternalFormat.g:22136:1: ( ( () ) )
+            // InternalFormat.g:22137:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22137:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22138:1: ()
+            // InternalFormat.g:22137:1: ( () )
+            // InternalFormat.g:22138:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmTypeReferenceAccess().getJvmGenericArrayTypeReferenceComponentTypeAction_0_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22139:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22141:1: 
+            // InternalFormat.g:22139:1: ()
+            // InternalFormat.g:22141:1: 
             {
             }
 
@@ -63889,16 +63889,16 @@ public final void rule__JvmTypeReference__Group_0_1_0__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0_1_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22151:1: rule__JvmTypeReference__Group_0_1_0__1 : rule__JvmTypeReference__Group_0_1_0__1__Impl ;
+    // InternalFormat.g:22151:1: rule__JvmTypeReference__Group_0_1_0__1 : rule__JvmTypeReference__Group_0_1_0__1__Impl ;
     public final void rule__JvmTypeReference__Group_0_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22155:1: ( rule__JvmTypeReference__Group_0_1_0__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22156:2: rule__JvmTypeReference__Group_0_1_0__1__Impl
+            // InternalFormat.g:22155:1: ( rule__JvmTypeReference__Group_0_1_0__1__Impl )
+            // InternalFormat.g:22156:2: rule__JvmTypeReference__Group_0_1_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmTypeReference__Group_0_1_0__1__Impl_in_rule__JvmTypeReference__Group_0_1_0__144748);
+            pushFollow(FOLLOW_2);
             rule__JvmTypeReference__Group_0_1_0__1__Impl();
 
             state._fsp--;
@@ -63922,22 +63922,22 @@ public final void rule__JvmTypeReference__Group_0_1_0__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__JvmTypeReference__Group_0_1_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22162:1: rule__JvmTypeReference__Group_0_1_0__1__Impl : ( ruleArrayBrackets ) ;
+    // InternalFormat.g:22162:1: rule__JvmTypeReference__Group_0_1_0__1__Impl : ( ruleArrayBrackets ) ;
     public final void rule__JvmTypeReference__Group_0_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22166:1: ( ( ruleArrayBrackets ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22167:1: ( ruleArrayBrackets )
+            // InternalFormat.g:22166:1: ( ( ruleArrayBrackets ) )
+            // InternalFormat.g:22167:1: ( ruleArrayBrackets )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22167:1: ( ruleArrayBrackets )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22168:1: ruleArrayBrackets
+            // InternalFormat.g:22167:1: ( ruleArrayBrackets )
+            // InternalFormat.g:22168:1: ruleArrayBrackets
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmTypeReferenceAccess().getArrayBracketsParserRuleCall_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleArrayBrackets_in_rule__JvmTypeReference__Group_0_1_0__1__Impl44775);
+            pushFollow(FOLLOW_2);
             ruleArrayBrackets();
 
             state._fsp--;
@@ -63967,21 +63967,21 @@ public final void rule__JvmTypeReference__Group_0_1_0__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__ArrayBrackets__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22183:1: rule__ArrayBrackets__Group__0 : rule__ArrayBrackets__Group__0__Impl rule__ArrayBrackets__Group__1 ;
+    // InternalFormat.g:22183:1: rule__ArrayBrackets__Group__0 : rule__ArrayBrackets__Group__0__Impl rule__ArrayBrackets__Group__1 ;
     public final void rule__ArrayBrackets__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22187:1: ( rule__ArrayBrackets__Group__0__Impl rule__ArrayBrackets__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22188:2: rule__ArrayBrackets__Group__0__Impl rule__ArrayBrackets__Group__1
+            // InternalFormat.g:22187:1: ( rule__ArrayBrackets__Group__0__Impl rule__ArrayBrackets__Group__1 )
+            // InternalFormat.g:22188:2: rule__ArrayBrackets__Group__0__Impl rule__ArrayBrackets__Group__1
             {
-            pushFollow(FOLLOW_rule__ArrayBrackets__Group__0__Impl_in_rule__ArrayBrackets__Group__044808);
+            pushFollow(FOLLOW_91);
             rule__ArrayBrackets__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ArrayBrackets__Group__1_in_rule__ArrayBrackets__Group__044811);
+            pushFollow(FOLLOW_2);
             rule__ArrayBrackets__Group__1();
 
             state._fsp--;
@@ -64005,22 +64005,22 @@ public final void rule__ArrayBrackets__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__ArrayBrackets__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22195:1: rule__ArrayBrackets__Group__0__Impl : ( '[' ) ;
+    // InternalFormat.g:22195:1: rule__ArrayBrackets__Group__0__Impl : ( '[' ) ;
     public final void rule__ArrayBrackets__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22199:1: ( ( '[' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22200:1: ( '[' )
+            // InternalFormat.g:22199:1: ( ( '[' ) )
+            // InternalFormat.g:22200:1: ( '[' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22200:1: ( '[' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22201:1: '['
+            // InternalFormat.g:22200:1: ( '[' )
+            // InternalFormat.g:22201:1: '['
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getArrayBracketsAccess().getLeftSquareBracketKeyword_0()); 
             }
-            match(input,69,FOLLOW_69_in_rule__ArrayBrackets__Group__0__Impl44839); if (state.failed) return ;
+            match(input,69,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getArrayBracketsAccess().getLeftSquareBracketKeyword_0()); 
             }
@@ -64046,16 +64046,16 @@ public final void rule__ArrayBrackets__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ArrayBrackets__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22214:1: rule__ArrayBrackets__Group__1 : rule__ArrayBrackets__Group__1__Impl ;
+    // InternalFormat.g:22214:1: rule__ArrayBrackets__Group__1 : rule__ArrayBrackets__Group__1__Impl ;
     public final void rule__ArrayBrackets__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22218:1: ( rule__ArrayBrackets__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22219:2: rule__ArrayBrackets__Group__1__Impl
+            // InternalFormat.g:22218:1: ( rule__ArrayBrackets__Group__1__Impl )
+            // InternalFormat.g:22219:2: rule__ArrayBrackets__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__ArrayBrackets__Group__1__Impl_in_rule__ArrayBrackets__Group__144870);
+            pushFollow(FOLLOW_2);
             rule__ArrayBrackets__Group__1__Impl();
 
             state._fsp--;
@@ -64079,22 +64079,22 @@ public final void rule__ArrayBrackets__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__ArrayBrackets__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22225:1: rule__ArrayBrackets__Group__1__Impl : ( ']' ) ;
+    // InternalFormat.g:22225:1: rule__ArrayBrackets__Group__1__Impl : ( ']' ) ;
     public final void rule__ArrayBrackets__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22229:1: ( ( ']' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22230:1: ( ']' )
+            // InternalFormat.g:22229:1: ( ( ']' ) )
+            // InternalFormat.g:22230:1: ( ']' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22230:1: ( ']' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22231:1: ']'
+            // InternalFormat.g:22230:1: ( ']' )
+            // InternalFormat.g:22231:1: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getArrayBracketsAccess().getRightSquareBracketKeyword_1()); 
             }
-            match(input,70,FOLLOW_70_in_rule__ArrayBrackets__Group__1__Impl44898); if (state.failed) return ;
+            match(input,70,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getArrayBracketsAccess().getRightSquareBracketKeyword_1()); 
             }
@@ -64120,21 +64120,21 @@ public final void rule__ArrayBrackets__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22248:1: rule__XFunctionTypeRef__Group__0 : rule__XFunctionTypeRef__Group__0__Impl rule__XFunctionTypeRef__Group__1 ;
+    // InternalFormat.g:22248:1: rule__XFunctionTypeRef__Group__0 : rule__XFunctionTypeRef__Group__0__Impl rule__XFunctionTypeRef__Group__1 ;
     public final void rule__XFunctionTypeRef__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22252:1: ( rule__XFunctionTypeRef__Group__0__Impl rule__XFunctionTypeRef__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22253:2: rule__XFunctionTypeRef__Group__0__Impl rule__XFunctionTypeRef__Group__1
+            // InternalFormat.g:22252:1: ( rule__XFunctionTypeRef__Group__0__Impl rule__XFunctionTypeRef__Group__1 )
+            // InternalFormat.g:22253:2: rule__XFunctionTypeRef__Group__0__Impl rule__XFunctionTypeRef__Group__1
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group__0__Impl_in_rule__XFunctionTypeRef__Group__044933);
+            pushFollow(FOLLOW_66);
             rule__XFunctionTypeRef__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group__1_in_rule__XFunctionTypeRef__Group__044936);
+            pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__Group__1();
 
             state._fsp--;
@@ -64158,22 +64158,22 @@ public final void rule__XFunctionTypeRef__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22260:1: rule__XFunctionTypeRef__Group__0__Impl : ( ( rule__XFunctionTypeRef__Group_0__0 )? ) ;
+    // InternalFormat.g:22260:1: rule__XFunctionTypeRef__Group__0__Impl : ( ( rule__XFunctionTypeRef__Group_0__0 )? ) ;
     public final void rule__XFunctionTypeRef__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22264:1: ( ( ( rule__XFunctionTypeRef__Group_0__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22265:1: ( ( rule__XFunctionTypeRef__Group_0__0 )? )
+            // InternalFormat.g:22264:1: ( ( ( rule__XFunctionTypeRef__Group_0__0 )? ) )
+            // InternalFormat.g:22265:1: ( ( rule__XFunctionTypeRef__Group_0__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22265:1: ( ( rule__XFunctionTypeRef__Group_0__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22266:1: ( rule__XFunctionTypeRef__Group_0__0 )?
+            // InternalFormat.g:22265:1: ( ( rule__XFunctionTypeRef__Group_0__0 )? )
+            // InternalFormat.g:22266:1: ( rule__XFunctionTypeRef__Group_0__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getGroup_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22267:1: ( rule__XFunctionTypeRef__Group_0__0 )?
+            // InternalFormat.g:22267:1: ( rule__XFunctionTypeRef__Group_0__0 )?
             int alt165=2;
             int LA165_0 = input.LA(1);
 
@@ -64182,9 +64182,9 @@ public final void rule__XFunctionTypeRef__Group__0__Impl() throws RecognitionExc
             }
             switch (alt165) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22267:2: rule__XFunctionTypeRef__Group_0__0
+                    // InternalFormat.g:22267:2: rule__XFunctionTypeRef__Group_0__0
                     {
-                    pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0__0_in_rule__XFunctionTypeRef__Group__0__Impl44963);
+                    pushFollow(FOLLOW_2);
                     rule__XFunctionTypeRef__Group_0__0();
 
                     state._fsp--;
@@ -64220,21 +64220,21 @@ public final void rule__XFunctionTypeRef__Group__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22277:1: rule__XFunctionTypeRef__Group__1 : rule__XFunctionTypeRef__Group__1__Impl rule__XFunctionTypeRef__Group__2 ;
+    // InternalFormat.g:22277:1: rule__XFunctionTypeRef__Group__1 : rule__XFunctionTypeRef__Group__1__Impl rule__XFunctionTypeRef__Group__2 ;
     public final void rule__XFunctionTypeRef__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22281:1: ( rule__XFunctionTypeRef__Group__1__Impl rule__XFunctionTypeRef__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22282:2: rule__XFunctionTypeRef__Group__1__Impl rule__XFunctionTypeRef__Group__2
+            // InternalFormat.g:22281:1: ( rule__XFunctionTypeRef__Group__1__Impl rule__XFunctionTypeRef__Group__2 )
+            // InternalFormat.g:22282:2: rule__XFunctionTypeRef__Group__1__Impl rule__XFunctionTypeRef__Group__2
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group__1__Impl_in_rule__XFunctionTypeRef__Group__144994);
+            pushFollow(FOLLOW_66);
             rule__XFunctionTypeRef__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group__2_in_rule__XFunctionTypeRef__Group__144997);
+            pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__Group__2();
 
             state._fsp--;
@@ -64258,22 +64258,22 @@ public final void rule__XFunctionTypeRef__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22289:1: rule__XFunctionTypeRef__Group__1__Impl : ( '=>' ) ;
+    // InternalFormat.g:22289:1: rule__XFunctionTypeRef__Group__1__Impl : ( '=>' ) ;
     public final void rule__XFunctionTypeRef__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22293:1: ( ( '=>' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22294:1: ( '=>' )
+            // InternalFormat.g:22293:1: ( ( '=>' ) )
+            // InternalFormat.g:22294:1: ( '=>' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22294:1: ( '=>' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22295:1: '=>'
+            // InternalFormat.g:22294:1: ( '=>' )
+            // InternalFormat.g:22295:1: '=>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getEqualsSignGreaterThanSignKeyword_1()); 
             }
-            match(input,37,FOLLOW_37_in_rule__XFunctionTypeRef__Group__1__Impl45025); if (state.failed) return ;
+            match(input,37,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFunctionTypeRefAccess().getEqualsSignGreaterThanSignKeyword_1()); 
             }
@@ -64299,16 +64299,16 @@ public final void rule__XFunctionTypeRef__Group__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22308:1: rule__XFunctionTypeRef__Group__2 : rule__XFunctionTypeRef__Group__2__Impl ;
+    // InternalFormat.g:22308:1: rule__XFunctionTypeRef__Group__2 : rule__XFunctionTypeRef__Group__2__Impl ;
     public final void rule__XFunctionTypeRef__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22312:1: ( rule__XFunctionTypeRef__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22313:2: rule__XFunctionTypeRef__Group__2__Impl
+            // InternalFormat.g:22312:1: ( rule__XFunctionTypeRef__Group__2__Impl )
+            // InternalFormat.g:22313:2: rule__XFunctionTypeRef__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group__2__Impl_in_rule__XFunctionTypeRef__Group__245056);
+            pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__Group__2__Impl();
 
             state._fsp--;
@@ -64332,25 +64332,25 @@ public final void rule__XFunctionTypeRef__Group__2() throws RecognitionException
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22319:1: rule__XFunctionTypeRef__Group__2__Impl : ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) ) ;
+    // InternalFormat.g:22319:1: rule__XFunctionTypeRef__Group__2__Impl : ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) ) ;
     public final void rule__XFunctionTypeRef__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22323:1: ( ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22324:1: ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) )
+            // InternalFormat.g:22323:1: ( ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) ) )
+            // InternalFormat.g:22324:1: ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22324:1: ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22325:1: ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 )
+            // InternalFormat.g:22324:1: ( ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 ) )
+            // InternalFormat.g:22325:1: ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getReturnTypeAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22326:1: ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22326:2: rule__XFunctionTypeRef__ReturnTypeAssignment_2
+            // InternalFormat.g:22326:1: ( rule__XFunctionTypeRef__ReturnTypeAssignment_2 )
+            // InternalFormat.g:22326:2: rule__XFunctionTypeRef__ReturnTypeAssignment_2
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__ReturnTypeAssignment_2_in_rule__XFunctionTypeRef__Group__2__Impl45083);
+            pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__ReturnTypeAssignment_2();
 
             state._fsp--;
@@ -64383,21 +64383,21 @@ public final void rule__XFunctionTypeRef__Group__2__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22342:1: rule__XFunctionTypeRef__Group_0__0 : rule__XFunctionTypeRef__Group_0__0__Impl rule__XFunctionTypeRef__Group_0__1 ;
+    // InternalFormat.g:22342:1: rule__XFunctionTypeRef__Group_0__0 : rule__XFunctionTypeRef__Group_0__0__Impl rule__XFunctionTypeRef__Group_0__1 ;
     public final void rule__XFunctionTypeRef__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22346:1: ( rule__XFunctionTypeRef__Group_0__0__Impl rule__XFunctionTypeRef__Group_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22347:2: rule__XFunctionTypeRef__Group_0__0__Impl rule__XFunctionTypeRef__Group_0__1
+            // InternalFormat.g:22346:1: ( rule__XFunctionTypeRef__Group_0__0__Impl rule__XFunctionTypeRef__Group_0__1 )
+            // InternalFormat.g:22347:2: rule__XFunctionTypeRef__Group_0__0__Impl rule__XFunctionTypeRef__Group_0__1
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0__0__Impl_in_rule__XFunctionTypeRef__Group_0__045119);
+            pushFollow(FOLLOW_124);
             rule__XFunctionTypeRef__Group_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0__1_in_rule__XFunctionTypeRef__Group_0__045122);
+            pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__Group_0__1();
 
             state._fsp--;
@@ -64421,22 +64421,22 @@ public final void rule__XFunctionTypeRef__Group_0__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22354:1: rule__XFunctionTypeRef__Group_0__0__Impl : ( '(' ) ;
+    // InternalFormat.g:22354:1: rule__XFunctionTypeRef__Group_0__0__Impl : ( '(' ) ;
     public final void rule__XFunctionTypeRef__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22358:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22359:1: ( '(' )
+            // InternalFormat.g:22358:1: ( ( '(' ) )
+            // InternalFormat.g:22359:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22359:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22360:1: '('
+            // InternalFormat.g:22359:1: ( '(' )
+            // InternalFormat.g:22360:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getLeftParenthesisKeyword_0_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XFunctionTypeRef__Group_0__0__Impl45150); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFunctionTypeRefAccess().getLeftParenthesisKeyword_0_0()); 
             }
@@ -64462,21 +64462,21 @@ public final void rule__XFunctionTypeRef__Group_0__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22373:1: rule__XFunctionTypeRef__Group_0__1 : rule__XFunctionTypeRef__Group_0__1__Impl rule__XFunctionTypeRef__Group_0__2 ;
+    // InternalFormat.g:22373:1: rule__XFunctionTypeRef__Group_0__1 : rule__XFunctionTypeRef__Group_0__1__Impl rule__XFunctionTypeRef__Group_0__2 ;
     public final void rule__XFunctionTypeRef__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22377:1: ( rule__XFunctionTypeRef__Group_0__1__Impl rule__XFunctionTypeRef__Group_0__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22378:2: rule__XFunctionTypeRef__Group_0__1__Impl rule__XFunctionTypeRef__Group_0__2
+            // InternalFormat.g:22377:1: ( rule__XFunctionTypeRef__Group_0__1__Impl rule__XFunctionTypeRef__Group_0__2 )
+            // InternalFormat.g:22378:2: rule__XFunctionTypeRef__Group_0__1__Impl rule__XFunctionTypeRef__Group_0__2
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0__1__Impl_in_rule__XFunctionTypeRef__Group_0__145181);
+            pushFollow(FOLLOW_124);
             rule__XFunctionTypeRef__Group_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0__2_in_rule__XFunctionTypeRef__Group_0__145184);
+            pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__Group_0__2();
 
             state._fsp--;
@@ -64500,22 +64500,22 @@ public final void rule__XFunctionTypeRef__Group_0__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22385:1: rule__XFunctionTypeRef__Group_0__1__Impl : ( ( rule__XFunctionTypeRef__Group_0_1__0 )? ) ;
+    // InternalFormat.g:22385:1: rule__XFunctionTypeRef__Group_0__1__Impl : ( ( rule__XFunctionTypeRef__Group_0_1__0 )? ) ;
     public final void rule__XFunctionTypeRef__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22389:1: ( ( ( rule__XFunctionTypeRef__Group_0_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22390:1: ( ( rule__XFunctionTypeRef__Group_0_1__0 )? )
+            // InternalFormat.g:22389:1: ( ( ( rule__XFunctionTypeRef__Group_0_1__0 )? ) )
+            // InternalFormat.g:22390:1: ( ( rule__XFunctionTypeRef__Group_0_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22390:1: ( ( rule__XFunctionTypeRef__Group_0_1__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22391:1: ( rule__XFunctionTypeRef__Group_0_1__0 )?
+            // InternalFormat.g:22390:1: ( ( rule__XFunctionTypeRef__Group_0_1__0 )? )
+            // InternalFormat.g:22391:1: ( rule__XFunctionTypeRef__Group_0_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getGroup_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22392:1: ( rule__XFunctionTypeRef__Group_0_1__0 )?
+            // InternalFormat.g:22392:1: ( rule__XFunctionTypeRef__Group_0_1__0 )?
             int alt166=2;
             int LA166_0 = input.LA(1);
 
@@ -64524,9 +64524,9 @@ public final void rule__XFunctionTypeRef__Group_0__1__Impl() throws RecognitionE
             }
             switch (alt166) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22392:2: rule__XFunctionTypeRef__Group_0_1__0
+                    // InternalFormat.g:22392:2: rule__XFunctionTypeRef__Group_0_1__0
                     {
-                    pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0_1__0_in_rule__XFunctionTypeRef__Group_0__1__Impl45211);
+                    pushFollow(FOLLOW_2);
                     rule__XFunctionTypeRef__Group_0_1__0();
 
                     state._fsp--;
@@ -64562,16 +64562,16 @@ public final void rule__XFunctionTypeRef__Group_0__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22402:1: rule__XFunctionTypeRef__Group_0__2 : rule__XFunctionTypeRef__Group_0__2__Impl ;
+    // InternalFormat.g:22402:1: rule__XFunctionTypeRef__Group_0__2 : rule__XFunctionTypeRef__Group_0__2__Impl ;
     public final void rule__XFunctionTypeRef__Group_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22406:1: ( rule__XFunctionTypeRef__Group_0__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22407:2: rule__XFunctionTypeRef__Group_0__2__Impl
+            // InternalFormat.g:22406:1: ( rule__XFunctionTypeRef__Group_0__2__Impl )
+            // InternalFormat.g:22407:2: rule__XFunctionTypeRef__Group_0__2__Impl
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0__2__Impl_in_rule__XFunctionTypeRef__Group_0__245242);
+            pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__Group_0__2__Impl();
 
             state._fsp--;
@@ -64595,22 +64595,22 @@ public final void rule__XFunctionTypeRef__Group_0__2() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22413:1: rule__XFunctionTypeRef__Group_0__2__Impl : ( ')' ) ;
+    // InternalFormat.g:22413:1: rule__XFunctionTypeRef__Group_0__2__Impl : ( ')' ) ;
     public final void rule__XFunctionTypeRef__Group_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22417:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22418:1: ( ')' )
+            // InternalFormat.g:22417:1: ( ( ')' ) )
+            // InternalFormat.g:22418:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22418:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22419:1: ')'
+            // InternalFormat.g:22418:1: ( ')' )
+            // InternalFormat.g:22419:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getRightParenthesisKeyword_0_2()); 
             }
-            match(input,75,FOLLOW_75_in_rule__XFunctionTypeRef__Group_0__2__Impl45270); if (state.failed) return ;
+            match(input,75,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFunctionTypeRefAccess().getRightParenthesisKeyword_0_2()); 
             }
@@ -64636,21 +64636,21 @@ public final void rule__XFunctionTypeRef__Group_0__2__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22438:1: rule__XFunctionTypeRef__Group_0_1__0 : rule__XFunctionTypeRef__Group_0_1__0__Impl rule__XFunctionTypeRef__Group_0_1__1 ;
+    // InternalFormat.g:22438:1: rule__XFunctionTypeRef__Group_0_1__0 : rule__XFunctionTypeRef__Group_0_1__0__Impl rule__XFunctionTypeRef__Group_0_1__1 ;
     public final void rule__XFunctionTypeRef__Group_0_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22442:1: ( rule__XFunctionTypeRef__Group_0_1__0__Impl rule__XFunctionTypeRef__Group_0_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22443:2: rule__XFunctionTypeRef__Group_0_1__0__Impl rule__XFunctionTypeRef__Group_0_1__1
+            // InternalFormat.g:22442:1: ( rule__XFunctionTypeRef__Group_0_1__0__Impl rule__XFunctionTypeRef__Group_0_1__1 )
+            // InternalFormat.g:22443:2: rule__XFunctionTypeRef__Group_0_1__0__Impl rule__XFunctionTypeRef__Group_0_1__1
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0_1__0__Impl_in_rule__XFunctionTypeRef__Group_0_1__045307);
+            pushFollow(FOLLOW_46);
             rule__XFunctionTypeRef__Group_0_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0_1__1_in_rule__XFunctionTypeRef__Group_0_1__045310);
+            pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__Group_0_1__1();
 
             state._fsp--;
@@ -64674,25 +64674,25 @@ public final void rule__XFunctionTypeRef__Group_0_1__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22450:1: rule__XFunctionTypeRef__Group_0_1__0__Impl : ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) ) ;
+    // InternalFormat.g:22450:1: rule__XFunctionTypeRef__Group_0_1__0__Impl : ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) ) ;
     public final void rule__XFunctionTypeRef__Group_0_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22454:1: ( ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22455:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) )
+            // InternalFormat.g:22454:1: ( ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) ) )
+            // InternalFormat.g:22455:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22455:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22456:1: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 )
+            // InternalFormat.g:22455:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 ) )
+            // InternalFormat.g:22456:1: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getParamTypesAssignment_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22457:1: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22457:2: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0
+            // InternalFormat.g:22457:1: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 )
+            // InternalFormat.g:22457:2: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0_in_rule__XFunctionTypeRef__Group_0_1__0__Impl45337);
+            pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0();
 
             state._fsp--;
@@ -64725,16 +64725,16 @@ public final void rule__XFunctionTypeRef__Group_0_1__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22467:1: rule__XFunctionTypeRef__Group_0_1__1 : rule__XFunctionTypeRef__Group_0_1__1__Impl ;
+    // InternalFormat.g:22467:1: rule__XFunctionTypeRef__Group_0_1__1 : rule__XFunctionTypeRef__Group_0_1__1__Impl ;
     public final void rule__XFunctionTypeRef__Group_0_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22471:1: ( rule__XFunctionTypeRef__Group_0_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22472:2: rule__XFunctionTypeRef__Group_0_1__1__Impl
+            // InternalFormat.g:22471:1: ( rule__XFunctionTypeRef__Group_0_1__1__Impl )
+            // InternalFormat.g:22472:2: rule__XFunctionTypeRef__Group_0_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0_1__1__Impl_in_rule__XFunctionTypeRef__Group_0_1__145367);
+            pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__Group_0_1__1__Impl();
 
             state._fsp--;
@@ -64758,22 +64758,22 @@ public final void rule__XFunctionTypeRef__Group_0_1__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22478:1: rule__XFunctionTypeRef__Group_0_1__1__Impl : ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* ) ;
+    // InternalFormat.g:22478:1: rule__XFunctionTypeRef__Group_0_1__1__Impl : ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* ) ;
     public final void rule__XFunctionTypeRef__Group_0_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22482:1: ( ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22483:1: ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* )
+            // InternalFormat.g:22482:1: ( ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* ) )
+            // InternalFormat.g:22483:1: ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22483:1: ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22484:1: ( rule__XFunctionTypeRef__Group_0_1_1__0 )*
+            // InternalFormat.g:22483:1: ( ( rule__XFunctionTypeRef__Group_0_1_1__0 )* )
+            // InternalFormat.g:22484:1: ( rule__XFunctionTypeRef__Group_0_1_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getGroup_0_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22485:1: ( rule__XFunctionTypeRef__Group_0_1_1__0 )*
+            // InternalFormat.g:22485:1: ( rule__XFunctionTypeRef__Group_0_1_1__0 )*
             loop167:
             do {
                 int alt167=2;
@@ -64786,9 +64786,9 @@ public final void rule__XFunctionTypeRef__Group_0_1__1__Impl() throws Recognitio
 
                 switch (alt167) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22485:2: rule__XFunctionTypeRef__Group_0_1_1__0
+            	    // InternalFormat.g:22485:2: rule__XFunctionTypeRef__Group_0_1_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0_1_1__0_in_rule__XFunctionTypeRef__Group_0_1__1__Impl45394);
+            	    pushFollow(FOLLOW_23);
             	    rule__XFunctionTypeRef__Group_0_1_1__0();
 
             	    state._fsp--;
@@ -64827,21 +64827,21 @@ public final void rule__XFunctionTypeRef__Group_0_1__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22499:1: rule__XFunctionTypeRef__Group_0_1_1__0 : rule__XFunctionTypeRef__Group_0_1_1__0__Impl rule__XFunctionTypeRef__Group_0_1_1__1 ;
+    // InternalFormat.g:22499:1: rule__XFunctionTypeRef__Group_0_1_1__0 : rule__XFunctionTypeRef__Group_0_1_1__0__Impl rule__XFunctionTypeRef__Group_0_1_1__1 ;
     public final void rule__XFunctionTypeRef__Group_0_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22503:1: ( rule__XFunctionTypeRef__Group_0_1_1__0__Impl rule__XFunctionTypeRef__Group_0_1_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22504:2: rule__XFunctionTypeRef__Group_0_1_1__0__Impl rule__XFunctionTypeRef__Group_0_1_1__1
+            // InternalFormat.g:22503:1: ( rule__XFunctionTypeRef__Group_0_1_1__0__Impl rule__XFunctionTypeRef__Group_0_1_1__1 )
+            // InternalFormat.g:22504:2: rule__XFunctionTypeRef__Group_0_1_1__0__Impl rule__XFunctionTypeRef__Group_0_1_1__1
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0_1_1__0__Impl_in_rule__XFunctionTypeRef__Group_0_1_1__045429);
+            pushFollow(FOLLOW_66);
             rule__XFunctionTypeRef__Group_0_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0_1_1__1_in_rule__XFunctionTypeRef__Group_0_1_1__045432);
+            pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__Group_0_1_1__1();
 
             state._fsp--;
@@ -64865,22 +64865,22 @@ public final void rule__XFunctionTypeRef__Group_0_1_1__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22511:1: rule__XFunctionTypeRef__Group_0_1_1__0__Impl : ( ',' ) ;
+    // InternalFormat.g:22511:1: rule__XFunctionTypeRef__Group_0_1_1__0__Impl : ( ',' ) ;
     public final void rule__XFunctionTypeRef__Group_0_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22515:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22516:1: ( ',' )
+            // InternalFormat.g:22515:1: ( ( ',' ) )
+            // InternalFormat.g:22516:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22516:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22517:1: ','
+            // InternalFormat.g:22516:1: ( ',' )
+            // InternalFormat.g:22517:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getCommaKeyword_0_1_1_0()); 
             }
-            match(input,71,FOLLOW_71_in_rule__XFunctionTypeRef__Group_0_1_1__0__Impl45460); if (state.failed) return ;
+            match(input,71,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFunctionTypeRefAccess().getCommaKeyword_0_1_1_0()); 
             }
@@ -64906,16 +64906,16 @@ public final void rule__XFunctionTypeRef__Group_0_1_1__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22530:1: rule__XFunctionTypeRef__Group_0_1_1__1 : rule__XFunctionTypeRef__Group_0_1_1__1__Impl ;
+    // InternalFormat.g:22530:1: rule__XFunctionTypeRef__Group_0_1_1__1 : rule__XFunctionTypeRef__Group_0_1_1__1__Impl ;
     public final void rule__XFunctionTypeRef__Group_0_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22534:1: ( rule__XFunctionTypeRef__Group_0_1_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22535:2: rule__XFunctionTypeRef__Group_0_1_1__1__Impl
+            // InternalFormat.g:22534:1: ( rule__XFunctionTypeRef__Group_0_1_1__1__Impl )
+            // InternalFormat.g:22535:2: rule__XFunctionTypeRef__Group_0_1_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__Group_0_1_1__1__Impl_in_rule__XFunctionTypeRef__Group_0_1_1__145491);
+            pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__Group_0_1_1__1__Impl();
 
             state._fsp--;
@@ -64939,25 +64939,25 @@ public final void rule__XFunctionTypeRef__Group_0_1_1__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__XFunctionTypeRef__Group_0_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22541:1: rule__XFunctionTypeRef__Group_0_1_1__1__Impl : ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) ) ;
+    // InternalFormat.g:22541:1: rule__XFunctionTypeRef__Group_0_1_1__1__Impl : ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) ) ;
     public final void rule__XFunctionTypeRef__Group_0_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22545:1: ( ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22546:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) )
+            // InternalFormat.g:22545:1: ( ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) ) )
+            // InternalFormat.g:22546:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22546:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22547:1: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 )
+            // InternalFormat.g:22546:1: ( ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 ) )
+            // InternalFormat.g:22547:1: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getParamTypesAssignment_0_1_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22548:1: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22548:2: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1
+            // InternalFormat.g:22548:1: ( rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 )
+            // InternalFormat.g:22548:2: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1
             {
-            pushFollow(FOLLOW_rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1_in_rule__XFunctionTypeRef__Group_0_1_1__1__Impl45518);
+            pushFollow(FOLLOW_2);
             rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1();
 
             state._fsp--;
@@ -64990,21 +64990,21 @@ public final void rule__XFunctionTypeRef__Group_0_1_1__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22562:1: rule__JvmParameterizedTypeReference__Group__0 : rule__JvmParameterizedTypeReference__Group__0__Impl rule__JvmParameterizedTypeReference__Group__1 ;
+    // InternalFormat.g:22562:1: rule__JvmParameterizedTypeReference__Group__0 : rule__JvmParameterizedTypeReference__Group__0__Impl rule__JvmParameterizedTypeReference__Group__1 ;
     public final void rule__JvmParameterizedTypeReference__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22566:1: ( rule__JvmParameterizedTypeReference__Group__0__Impl rule__JvmParameterizedTypeReference__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22567:2: rule__JvmParameterizedTypeReference__Group__0__Impl rule__JvmParameterizedTypeReference__Group__1
+            // InternalFormat.g:22566:1: ( rule__JvmParameterizedTypeReference__Group__0__Impl rule__JvmParameterizedTypeReference__Group__1 )
+            // InternalFormat.g:22567:2: rule__JvmParameterizedTypeReference__Group__0__Impl rule__JvmParameterizedTypeReference__Group__1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group__0__Impl_in_rule__JvmParameterizedTypeReference__Group__045552);
+            pushFollow(FOLLOW_56);
             rule__JvmParameterizedTypeReference__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group__1_in_rule__JvmParameterizedTypeReference__Group__045555);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group__1();
 
             state._fsp--;
@@ -65028,25 +65028,25 @@ public final void rule__JvmParameterizedTypeReference__Group__0() throws Recogni
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22574:1: rule__JvmParameterizedTypeReference__Group__0__Impl : ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) ) ;
+    // InternalFormat.g:22574:1: rule__JvmParameterizedTypeReference__Group__0__Impl : ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22578:1: ( ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22579:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) )
+            // InternalFormat.g:22578:1: ( ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) ) )
+            // InternalFormat.g:22579:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22579:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22580:1: ( rule__JvmParameterizedTypeReference__TypeAssignment_0 )
+            // InternalFormat.g:22579:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_0 ) )
+            // InternalFormat.g:22580:1: ( rule__JvmParameterizedTypeReference__TypeAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22581:1: ( rule__JvmParameterizedTypeReference__TypeAssignment_0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22581:2: rule__JvmParameterizedTypeReference__TypeAssignment_0
+            // InternalFormat.g:22581:1: ( rule__JvmParameterizedTypeReference__TypeAssignment_0 )
+            // InternalFormat.g:22581:2: rule__JvmParameterizedTypeReference__TypeAssignment_0
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__TypeAssignment_0_in_rule__JvmParameterizedTypeReference__Group__0__Impl45582);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__TypeAssignment_0();
 
             state._fsp--;
@@ -65079,16 +65079,16 @@ public final void rule__JvmParameterizedTypeReference__Group__0__Impl() throws R
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22591:1: rule__JvmParameterizedTypeReference__Group__1 : rule__JvmParameterizedTypeReference__Group__1__Impl ;
+    // InternalFormat.g:22591:1: rule__JvmParameterizedTypeReference__Group__1 : rule__JvmParameterizedTypeReference__Group__1__Impl ;
     public final void rule__JvmParameterizedTypeReference__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22595:1: ( rule__JvmParameterizedTypeReference__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22596:2: rule__JvmParameterizedTypeReference__Group__1__Impl
+            // InternalFormat.g:22595:1: ( rule__JvmParameterizedTypeReference__Group__1__Impl )
+            // InternalFormat.g:22596:2: rule__JvmParameterizedTypeReference__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group__1__Impl_in_rule__JvmParameterizedTypeReference__Group__145612);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group__1__Impl();
 
             state._fsp--;
@@ -65112,29 +65112,29 @@ public final void rule__JvmParameterizedTypeReference__Group__1() throws Recogni
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22602:1: rule__JvmParameterizedTypeReference__Group__1__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? ) ;
+    // InternalFormat.g:22602:1: rule__JvmParameterizedTypeReference__Group__1__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? ) ;
     public final void rule__JvmParameterizedTypeReference__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22606:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22607:1: ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? )
+            // InternalFormat.g:22606:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? ) )
+            // InternalFormat.g:22607:1: ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22607:1: ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22608:1: ( rule__JvmParameterizedTypeReference__Group_1__0 )?
+            // InternalFormat.g:22607:1: ( ( rule__JvmParameterizedTypeReference__Group_1__0 )? )
+            // InternalFormat.g:22608:1: ( rule__JvmParameterizedTypeReference__Group_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22609:1: ( rule__JvmParameterizedTypeReference__Group_1__0 )?
+            // InternalFormat.g:22609:1: ( rule__JvmParameterizedTypeReference__Group_1__0 )?
             int alt168=2;
             alt168 = dfa168.predict(input);
             switch (alt168) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22609:2: rule__JvmParameterizedTypeReference__Group_1__0
+                    // InternalFormat.g:22609:2: rule__JvmParameterizedTypeReference__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__0_in_rule__JvmParameterizedTypeReference__Group__1__Impl45639);
+                    pushFollow(FOLLOW_2);
                     rule__JvmParameterizedTypeReference__Group_1__0();
 
                     state._fsp--;
@@ -65170,21 +65170,21 @@ public final void rule__JvmParameterizedTypeReference__Group__1__Impl() throws R
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22623:1: rule__JvmParameterizedTypeReference__Group_1__0 : rule__JvmParameterizedTypeReference__Group_1__0__Impl rule__JvmParameterizedTypeReference__Group_1__1 ;
+    // InternalFormat.g:22623:1: rule__JvmParameterizedTypeReference__Group_1__0 : rule__JvmParameterizedTypeReference__Group_1__0__Impl rule__JvmParameterizedTypeReference__Group_1__1 ;
     public final void rule__JvmParameterizedTypeReference__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22627:1: ( rule__JvmParameterizedTypeReference__Group_1__0__Impl rule__JvmParameterizedTypeReference__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22628:2: rule__JvmParameterizedTypeReference__Group_1__0__Impl rule__JvmParameterizedTypeReference__Group_1__1
+            // InternalFormat.g:22627:1: ( rule__JvmParameterizedTypeReference__Group_1__0__Impl rule__JvmParameterizedTypeReference__Group_1__1 )
+            // InternalFormat.g:22628:2: rule__JvmParameterizedTypeReference__Group_1__0__Impl rule__JvmParameterizedTypeReference__Group_1__1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1__045674);
+            pushFollow(FOLLOW_86);
             rule__JvmParameterizedTypeReference__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__1_in_rule__JvmParameterizedTypeReference__Group_1__045677);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1__1();
 
             state._fsp--;
@@ -65208,25 +65208,25 @@ public final void rule__JvmParameterizedTypeReference__Group_1__0() throws Recog
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22635:1: rule__JvmParameterizedTypeReference__Group_1__0__Impl : ( ( '<' ) ) ;
+    // InternalFormat.g:22635:1: rule__JvmParameterizedTypeReference__Group_1__0__Impl : ( ( '<' ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22639:1: ( ( ( '<' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22640:1: ( ( '<' ) )
+            // InternalFormat.g:22639:1: ( ( ( '<' ) ) )
+            // InternalFormat.g:22640:1: ( ( '<' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22640:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22641:1: ( '<' )
+            // InternalFormat.g:22640:1: ( ( '<' ) )
+            // InternalFormat.g:22641:1: ( '<' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getLessThanSignKeyword_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22642:1: ( '<' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22643:2: '<'
+            // InternalFormat.g:22642:1: ( '<' )
+            // InternalFormat.g:22643:2: '<'
             {
-            match(input,33,FOLLOW_33_in_rule__JvmParameterizedTypeReference__Group_1__0__Impl45706); if (state.failed) return ;
+            match(input,33,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -65255,21 +65255,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1__0__Impl() throws
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22654:1: rule__JvmParameterizedTypeReference__Group_1__1 : rule__JvmParameterizedTypeReference__Group_1__1__Impl rule__JvmParameterizedTypeReference__Group_1__2 ;
+    // InternalFormat.g:22654:1: rule__JvmParameterizedTypeReference__Group_1__1 : rule__JvmParameterizedTypeReference__Group_1__1__Impl rule__JvmParameterizedTypeReference__Group_1__2 ;
     public final void rule__JvmParameterizedTypeReference__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22658:1: ( rule__JvmParameterizedTypeReference__Group_1__1__Impl rule__JvmParameterizedTypeReference__Group_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22659:2: rule__JvmParameterizedTypeReference__Group_1__1__Impl rule__JvmParameterizedTypeReference__Group_1__2
+            // InternalFormat.g:22658:1: ( rule__JvmParameterizedTypeReference__Group_1__1__Impl rule__JvmParameterizedTypeReference__Group_1__2 )
+            // InternalFormat.g:22659:2: rule__JvmParameterizedTypeReference__Group_1__1__Impl rule__JvmParameterizedTypeReference__Group_1__2
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1__145738);
+            pushFollow(FOLLOW_87);
             rule__JvmParameterizedTypeReference__Group_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__2_in_rule__JvmParameterizedTypeReference__Group_1__145741);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1__2();
 
             state._fsp--;
@@ -65293,25 +65293,25 @@ public final void rule__JvmParameterizedTypeReference__Group_1__1() throws Recog
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22666:1: rule__JvmParameterizedTypeReference__Group_1__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) ) ;
+    // InternalFormat.g:22666:1: rule__JvmParameterizedTypeReference__Group_1__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22670:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22671:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) )
+            // InternalFormat.g:22670:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) ) )
+            // InternalFormat.g:22671:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22671:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22672:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 )
+            // InternalFormat.g:22671:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 ) )
+            // InternalFormat.g:22672:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22673:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22673:2: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1
+            // InternalFormat.g:22673:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 )
+            // InternalFormat.g:22673:2: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1_in_rule__JvmParameterizedTypeReference__Group_1__1__Impl45768);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1();
 
             state._fsp--;
@@ -65344,21 +65344,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1__1__Impl() throws
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22683:1: rule__JvmParameterizedTypeReference__Group_1__2 : rule__JvmParameterizedTypeReference__Group_1__2__Impl rule__JvmParameterizedTypeReference__Group_1__3 ;
+    // InternalFormat.g:22683:1: rule__JvmParameterizedTypeReference__Group_1__2 : rule__JvmParameterizedTypeReference__Group_1__2__Impl rule__JvmParameterizedTypeReference__Group_1__3 ;
     public final void rule__JvmParameterizedTypeReference__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22687:1: ( rule__JvmParameterizedTypeReference__Group_1__2__Impl rule__JvmParameterizedTypeReference__Group_1__3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22688:2: rule__JvmParameterizedTypeReference__Group_1__2__Impl rule__JvmParameterizedTypeReference__Group_1__3
+            // InternalFormat.g:22687:1: ( rule__JvmParameterizedTypeReference__Group_1__2__Impl rule__JvmParameterizedTypeReference__Group_1__3 )
+            // InternalFormat.g:22688:2: rule__JvmParameterizedTypeReference__Group_1__2__Impl rule__JvmParameterizedTypeReference__Group_1__3
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__2__Impl_in_rule__JvmParameterizedTypeReference__Group_1__245798);
+            pushFollow(FOLLOW_87);
             rule__JvmParameterizedTypeReference__Group_1__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__3_in_rule__JvmParameterizedTypeReference__Group_1__245801);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1__3();
 
             state._fsp--;
@@ -65382,22 +65382,22 @@ public final void rule__JvmParameterizedTypeReference__Group_1__2() throws Recog
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22695:1: rule__JvmParameterizedTypeReference__Group_1__2__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* ) ;
+    // InternalFormat.g:22695:1: rule__JvmParameterizedTypeReference__Group_1__2__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22699:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22700:1: ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* )
+            // InternalFormat.g:22699:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* ) )
+            // InternalFormat.g:22700:1: ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22700:1: ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22701:1: ( rule__JvmParameterizedTypeReference__Group_1_2__0 )*
+            // InternalFormat.g:22700:1: ( ( rule__JvmParameterizedTypeReference__Group_1_2__0 )* )
+            // InternalFormat.g:22701:1: ( rule__JvmParameterizedTypeReference__Group_1_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22702:1: ( rule__JvmParameterizedTypeReference__Group_1_2__0 )*
+            // InternalFormat.g:22702:1: ( rule__JvmParameterizedTypeReference__Group_1_2__0 )*
             loop169:
             do {
                 int alt169=2;
@@ -65410,9 +65410,9 @@ public final void rule__JvmParameterizedTypeReference__Group_1__2__Impl() throws
 
                 switch (alt169) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22702:2: rule__JvmParameterizedTypeReference__Group_1_2__0
+            	    // InternalFormat.g:22702:2: rule__JvmParameterizedTypeReference__Group_1_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_2__0_in_rule__JvmParameterizedTypeReference__Group_1__2__Impl45828);
+            	    pushFollow(FOLLOW_23);
             	    rule__JvmParameterizedTypeReference__Group_1_2__0();
 
             	    state._fsp--;
@@ -65451,21 +65451,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1__2__Impl() throws
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22712:1: rule__JvmParameterizedTypeReference__Group_1__3 : rule__JvmParameterizedTypeReference__Group_1__3__Impl rule__JvmParameterizedTypeReference__Group_1__4 ;
+    // InternalFormat.g:22712:1: rule__JvmParameterizedTypeReference__Group_1__3 : rule__JvmParameterizedTypeReference__Group_1__3__Impl rule__JvmParameterizedTypeReference__Group_1__4 ;
     public final void rule__JvmParameterizedTypeReference__Group_1__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22716:1: ( rule__JvmParameterizedTypeReference__Group_1__3__Impl rule__JvmParameterizedTypeReference__Group_1__4 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22717:2: rule__JvmParameterizedTypeReference__Group_1__3__Impl rule__JvmParameterizedTypeReference__Group_1__4
+            // InternalFormat.g:22716:1: ( rule__JvmParameterizedTypeReference__Group_1__3__Impl rule__JvmParameterizedTypeReference__Group_1__4 )
+            // InternalFormat.g:22717:2: rule__JvmParameterizedTypeReference__Group_1__3__Impl rule__JvmParameterizedTypeReference__Group_1__4
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__3__Impl_in_rule__JvmParameterizedTypeReference__Group_1__345859);
+            pushFollow(FOLLOW_35);
             rule__JvmParameterizedTypeReference__Group_1__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__4_in_rule__JvmParameterizedTypeReference__Group_1__345862);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1__4();
 
             state._fsp--;
@@ -65489,22 +65489,22 @@ public final void rule__JvmParameterizedTypeReference__Group_1__3() throws Recog
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22724:1: rule__JvmParameterizedTypeReference__Group_1__3__Impl : ( '>' ) ;
+    // InternalFormat.g:22724:1: rule__JvmParameterizedTypeReference__Group_1__3__Impl : ( '>' ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22728:1: ( ( '>' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22729:1: ( '>' )
+            // InternalFormat.g:22728:1: ( ( '>' ) )
+            // InternalFormat.g:22729:1: ( '>' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22729:1: ( '>' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22730:1: '>'
+            // InternalFormat.g:22729:1: ( '>' )
+            // InternalFormat.g:22730:1: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGreaterThanSignKeyword_1_3()); 
             }
-            match(input,32,FOLLOW_32_in_rule__JvmParameterizedTypeReference__Group_1__3__Impl45890); if (state.failed) return ;
+            match(input,32,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGreaterThanSignKeyword_1_3()); 
             }
@@ -65530,16 +65530,16 @@ public final void rule__JvmParameterizedTypeReference__Group_1__3__Impl() throws
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__4"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22743:1: rule__JvmParameterizedTypeReference__Group_1__4 : rule__JvmParameterizedTypeReference__Group_1__4__Impl ;
+    // InternalFormat.g:22743:1: rule__JvmParameterizedTypeReference__Group_1__4 : rule__JvmParameterizedTypeReference__Group_1__4__Impl ;
     public final void rule__JvmParameterizedTypeReference__Group_1__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22747:1: ( rule__JvmParameterizedTypeReference__Group_1__4__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22748:2: rule__JvmParameterizedTypeReference__Group_1__4__Impl
+            // InternalFormat.g:22747:1: ( rule__JvmParameterizedTypeReference__Group_1__4__Impl )
+            // InternalFormat.g:22748:2: rule__JvmParameterizedTypeReference__Group_1__4__Impl
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__4__Impl_in_rule__JvmParameterizedTypeReference__Group_1__445921);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1__4__Impl();
 
             state._fsp--;
@@ -65563,22 +65563,22 @@ public final void rule__JvmParameterizedTypeReference__Group_1__4() throws Recog
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22754:1: rule__JvmParameterizedTypeReference__Group_1__4__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* ) ;
+    // InternalFormat.g:22754:1: rule__JvmParameterizedTypeReference__Group_1__4__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22758:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22759:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* )
+            // InternalFormat.g:22758:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* ) )
+            // InternalFormat.g:22759:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22759:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22760:1: ( rule__JvmParameterizedTypeReference__Group_1_4__0 )*
+            // InternalFormat.g:22759:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4__0 )* )
+            // InternalFormat.g:22760:1: ( rule__JvmParameterizedTypeReference__Group_1_4__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup_1_4()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22761:1: ( rule__JvmParameterizedTypeReference__Group_1_4__0 )*
+            // InternalFormat.g:22761:1: ( rule__JvmParameterizedTypeReference__Group_1_4__0 )*
             loop170:
             do {
                 int alt170=2;
@@ -65627,9 +65627,9 @@ public final void rule__JvmParameterizedTypeReference__Group_1__4__Impl() throws
 
                 switch (alt170) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22761:2: rule__JvmParameterizedTypeReference__Group_1_4__0
+            	    // InternalFormat.g:22761:2: rule__JvmParameterizedTypeReference__Group_1_4__0
             	    {
-            	    pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__0_in_rule__JvmParameterizedTypeReference__Group_1__4__Impl45948);
+            	    pushFollow(FOLLOW_47);
             	    rule__JvmParameterizedTypeReference__Group_1_4__0();
 
             	    state._fsp--;
@@ -65668,21 +65668,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1__4__Impl() throws
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_2__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22781:1: rule__JvmParameterizedTypeReference__Group_1_2__0 : rule__JvmParameterizedTypeReference__Group_1_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_2__1 ;
+    // InternalFormat.g:22781:1: rule__JvmParameterizedTypeReference__Group_1_2__0 : rule__JvmParameterizedTypeReference__Group_1_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_2__1 ;
     public final void rule__JvmParameterizedTypeReference__Group_1_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22785:1: ( rule__JvmParameterizedTypeReference__Group_1_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_2__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22786:2: rule__JvmParameterizedTypeReference__Group_1_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_2__1
+            // InternalFormat.g:22785:1: ( rule__JvmParameterizedTypeReference__Group_1_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_2__1 )
+            // InternalFormat.g:22786:2: rule__JvmParameterizedTypeReference__Group_1_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_2__1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_2__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_2__045989);
+            pushFollow(FOLLOW_86);
             rule__JvmParameterizedTypeReference__Group_1_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_2__1_in_rule__JvmParameterizedTypeReference__Group_1_2__045992);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_2__1();
 
             state._fsp--;
@@ -65706,22 +65706,22 @@ public final void rule__JvmParameterizedTypeReference__Group_1_2__0() throws Rec
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_2__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22793:1: rule__JvmParameterizedTypeReference__Group_1_2__0__Impl : ( ',' ) ;
+    // InternalFormat.g:22793:1: rule__JvmParameterizedTypeReference__Group_1_2__0__Impl : ( ',' ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22797:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22798:1: ( ',' )
+            // InternalFormat.g:22797:1: ( ( ',' ) )
+            // InternalFormat.g:22798:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22798:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22799:1: ','
+            // InternalFormat.g:22798:1: ( ',' )
+            // InternalFormat.g:22799:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getCommaKeyword_1_2_0()); 
             }
-            match(input,71,FOLLOW_71_in_rule__JvmParameterizedTypeReference__Group_1_2__0__Impl46020); if (state.failed) return ;
+            match(input,71,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmParameterizedTypeReferenceAccess().getCommaKeyword_1_2_0()); 
             }
@@ -65747,16 +65747,16 @@ public final void rule__JvmParameterizedTypeReference__Group_1_2__0__Impl() thro
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_2__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22812:1: rule__JvmParameterizedTypeReference__Group_1_2__1 : rule__JvmParameterizedTypeReference__Group_1_2__1__Impl ;
+    // InternalFormat.g:22812:1: rule__JvmParameterizedTypeReference__Group_1_2__1 : rule__JvmParameterizedTypeReference__Group_1_2__1__Impl ;
     public final void rule__JvmParameterizedTypeReference__Group_1_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22816:1: ( rule__JvmParameterizedTypeReference__Group_1_2__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22817:2: rule__JvmParameterizedTypeReference__Group_1_2__1__Impl
+            // InternalFormat.g:22816:1: ( rule__JvmParameterizedTypeReference__Group_1_2__1__Impl )
+            // InternalFormat.g:22817:2: rule__JvmParameterizedTypeReference__Group_1_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_2__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_2__146051);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_2__1__Impl();
 
             state._fsp--;
@@ -65780,25 +65780,25 @@ public final void rule__JvmParameterizedTypeReference__Group_1_2__1() throws Rec
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_2__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22823:1: rule__JvmParameterizedTypeReference__Group_1_2__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) ) ;
+    // InternalFormat.g:22823:1: rule__JvmParameterizedTypeReference__Group_1_2__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22827:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22828:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) )
+            // InternalFormat.g:22827:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) ) )
+            // InternalFormat.g:22828:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22828:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22829:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 )
+            // InternalFormat.g:22828:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 ) )
+            // InternalFormat.g:22829:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsAssignment_1_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22830:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22830:2: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1
+            // InternalFormat.g:22830:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 )
+            // InternalFormat.g:22830:2: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1_in_rule__JvmParameterizedTypeReference__Group_1_2__1__Impl46078);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1();
 
             state._fsp--;
@@ -65831,21 +65831,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1_2__1__Impl() thro
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22844:1: rule__JvmParameterizedTypeReference__Group_1_4__0 : rule__JvmParameterizedTypeReference__Group_1_4__0__Impl rule__JvmParameterizedTypeReference__Group_1_4__1 ;
+    // InternalFormat.g:22844:1: rule__JvmParameterizedTypeReference__Group_1_4__0 : rule__JvmParameterizedTypeReference__Group_1_4__0__Impl rule__JvmParameterizedTypeReference__Group_1_4__1 ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22848:1: ( rule__JvmParameterizedTypeReference__Group_1_4__0__Impl rule__JvmParameterizedTypeReference__Group_1_4__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22849:2: rule__JvmParameterizedTypeReference__Group_1_4__0__Impl rule__JvmParameterizedTypeReference__Group_1_4__1
+            // InternalFormat.g:22848:1: ( rule__JvmParameterizedTypeReference__Group_1_4__0__Impl rule__JvmParameterizedTypeReference__Group_1_4__1 )
+            // InternalFormat.g:22849:2: rule__JvmParameterizedTypeReference__Group_1_4__0__Impl rule__JvmParameterizedTypeReference__Group_1_4__1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4__046112);
+            pushFollow(FOLLOW_9);
             rule__JvmParameterizedTypeReference__Group_1_4__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__1_in_rule__JvmParameterizedTypeReference__Group_1_4__046115);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4__1();
 
             state._fsp--;
@@ -65869,25 +65869,25 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4__0() throws Rec
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22856:1: rule__JvmParameterizedTypeReference__Group_1_4__0__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) ) ;
+    // InternalFormat.g:22856:1: rule__JvmParameterizedTypeReference__Group_1_4__0__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22860:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22861:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) )
+            // InternalFormat.g:22860:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) ) )
+            // InternalFormat.g:22861:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22861:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22862:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 )
+            // InternalFormat.g:22861:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 ) )
+            // InternalFormat.g:22862:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup_1_4_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22863:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22863:2: rule__JvmParameterizedTypeReference__Group_1_4_0__0
+            // InternalFormat.g:22863:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0__0 )
+            // InternalFormat.g:22863:2: rule__JvmParameterizedTypeReference__Group_1_4_0__0
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0__0_in_rule__JvmParameterizedTypeReference__Group_1_4__0__Impl46142);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_0__0();
 
             state._fsp--;
@@ -65920,21 +65920,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4__0__Impl() thro
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22873:1: rule__JvmParameterizedTypeReference__Group_1_4__1 : rule__JvmParameterizedTypeReference__Group_1_4__1__Impl rule__JvmParameterizedTypeReference__Group_1_4__2 ;
+    // InternalFormat.g:22873:1: rule__JvmParameterizedTypeReference__Group_1_4__1 : rule__JvmParameterizedTypeReference__Group_1_4__1__Impl rule__JvmParameterizedTypeReference__Group_1_4__2 ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22877:1: ( rule__JvmParameterizedTypeReference__Group_1_4__1__Impl rule__JvmParameterizedTypeReference__Group_1_4__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22878:2: rule__JvmParameterizedTypeReference__Group_1_4__1__Impl rule__JvmParameterizedTypeReference__Group_1_4__2
+            // InternalFormat.g:22877:1: ( rule__JvmParameterizedTypeReference__Group_1_4__1__Impl rule__JvmParameterizedTypeReference__Group_1_4__2 )
+            // InternalFormat.g:22878:2: rule__JvmParameterizedTypeReference__Group_1_4__1__Impl rule__JvmParameterizedTypeReference__Group_1_4__2
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4__146172);
+            pushFollow(FOLLOW_56);
             rule__JvmParameterizedTypeReference__Group_1_4__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__2_in_rule__JvmParameterizedTypeReference__Group_1_4__146175);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4__2();
 
             state._fsp--;
@@ -65958,25 +65958,25 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4__1() throws Rec
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22885:1: rule__JvmParameterizedTypeReference__Group_1_4__1__Impl : ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) ) ;
+    // InternalFormat.g:22885:1: rule__JvmParameterizedTypeReference__Group_1_4__1__Impl : ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22889:1: ( ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22890:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) )
+            // InternalFormat.g:22889:1: ( ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) ) )
+            // InternalFormat.g:22890:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22890:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22891:1: ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 )
+            // InternalFormat.g:22890:1: ( ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 ) )
+            // InternalFormat.g:22891:1: ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeAssignment_1_4_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22892:1: ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22892:2: rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1
+            // InternalFormat.g:22892:1: ( rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 )
+            // InternalFormat.g:22892:2: rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1_in_rule__JvmParameterizedTypeReference__Group_1_4__1__Impl46202);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1();
 
             state._fsp--;
@@ -66009,16 +66009,16 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4__1__Impl() thro
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22902:1: rule__JvmParameterizedTypeReference__Group_1_4__2 : rule__JvmParameterizedTypeReference__Group_1_4__2__Impl ;
+    // InternalFormat.g:22902:1: rule__JvmParameterizedTypeReference__Group_1_4__2 : rule__JvmParameterizedTypeReference__Group_1_4__2__Impl ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22906:1: ( rule__JvmParameterizedTypeReference__Group_1_4__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22907:2: rule__JvmParameterizedTypeReference__Group_1_4__2__Impl
+            // InternalFormat.g:22906:1: ( rule__JvmParameterizedTypeReference__Group_1_4__2__Impl )
+            // InternalFormat.g:22907:2: rule__JvmParameterizedTypeReference__Group_1_4__2__Impl
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__2__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4__246232);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4__2__Impl();
 
             state._fsp--;
@@ -66042,29 +66042,29 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4__2() throws Rec
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22913:1: rule__JvmParameterizedTypeReference__Group_1_4__2__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? ) ;
+    // InternalFormat.g:22913:1: rule__JvmParameterizedTypeReference__Group_1_4__2__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22917:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22918:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? )
+            // InternalFormat.g:22917:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? ) )
+            // InternalFormat.g:22918:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22918:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22919:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )?
+            // InternalFormat.g:22918:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )? )
+            // InternalFormat.g:22919:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup_1_4_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22920:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )?
+            // InternalFormat.g:22920:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )?
             int alt171=2;
             alt171 = dfa171.predict(input);
             switch (alt171) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22920:2: rule__JvmParameterizedTypeReference__Group_1_4_2__0
+                    // InternalFormat.g:22920:2: rule__JvmParameterizedTypeReference__Group_1_4_2__0
                     {
-                    pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__0_in_rule__JvmParameterizedTypeReference__Group_1_4__2__Impl46259);
+                    pushFollow(FOLLOW_2);
                     rule__JvmParameterizedTypeReference__Group_1_4_2__0();
 
                     state._fsp--;
@@ -66100,16 +66100,16 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4__2__Impl() thro
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22936:1: rule__JvmParameterizedTypeReference__Group_1_4_0__0 : rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl ;
+    // InternalFormat.g:22936:1: rule__JvmParameterizedTypeReference__Group_1_4_0__0 : rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22940:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22941:2: rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl
+            // InternalFormat.g:22940:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl )
+            // InternalFormat.g:22941:2: rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_0__046296);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl();
 
             state._fsp--;
@@ -66133,25 +66133,25 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_0__0() throws R
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22947:1: rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) ) ;
+    // InternalFormat.g:22947:1: rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22951:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22952:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) )
+            // InternalFormat.g:22951:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) ) )
+            // InternalFormat.g:22952:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22952:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22953:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 )
+            // InternalFormat.g:22952:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 ) )
+            // InternalFormat.g:22953:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup_1_4_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22954:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22954:2: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0
+            // InternalFormat.g:22954:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 )
+            // InternalFormat.g:22954:2: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0_0__0_in_rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl46323);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_0_0__0();
 
             state._fsp--;
@@ -66184,21 +66184,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl() th
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_0_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22966:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 : rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_0_0__1 ;
+    // InternalFormat.g:22966:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0 : rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_0_0__1 ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22970:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_0_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22971:2: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_0_0__1
+            // InternalFormat.g:22970:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_0_0__1 )
+            // InternalFormat.g:22971:2: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_0_0__1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_0_0__046355);
+            pushFollow(FOLLOW_35);
             rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0_0__1_in_rule__JvmParameterizedTypeReference__Group_1_4_0_0__046358);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_0_0__1();
 
             state._fsp--;
@@ -66222,23 +66222,23 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_0_0__0() throws
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22978:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl : ( () ) ;
+    // InternalFormat.g:22978:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl : ( () ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22982:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22983:1: ( () )
+            // InternalFormat.g:22982:1: ( ( () ) )
+            // InternalFormat.g:22983:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22983:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22984:1: ()
+            // InternalFormat.g:22983:1: ( () )
+            // InternalFormat.g:22984:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getJvmInnerTypeReferenceOuterAction_1_4_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22985:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22987:1: 
+            // InternalFormat.g:22985:1: ()
+            // InternalFormat.g:22987:1: 
             {
             }
 
@@ -66263,16 +66263,16 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl()
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_0_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22997:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__1 : rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl ;
+    // InternalFormat.g:22997:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__1 : rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23001:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23002:2: rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl
+            // InternalFormat.g:23001:1: ( rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl )
+            // InternalFormat.g:23002:2: rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_0_0__146416);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl();
 
             state._fsp--;
@@ -66296,22 +66296,22 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_0_0__1() throws
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23008:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl : ( '.' ) ;
+    // InternalFormat.g:23008:1: rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl : ( '.' ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23012:1: ( ( '.' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23013:1: ( '.' )
+            // InternalFormat.g:23012:1: ( ( '.' ) )
+            // InternalFormat.g:23013:1: ( '.' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23013:1: ( '.' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23014:1: '.'
+            // InternalFormat.g:23013:1: ( '.' )
+            // InternalFormat.g:23014:1: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getFullStopKeyword_1_4_0_0_1()); 
             }
-            match(input,49,FOLLOW_49_in_rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl46444); if (state.failed) return ;
+            match(input,49,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmParameterizedTypeReferenceAccess().getFullStopKeyword_1_4_0_0_1()); 
             }
@@ -66337,21 +66337,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl()
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23031:1: rule__JvmParameterizedTypeReference__Group_1_4_2__0 : rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__1 ;
+    // InternalFormat.g:23031:1: rule__JvmParameterizedTypeReference__Group_1_4_2__0 : rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__1 ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23035:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23036:2: rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__1
+            // InternalFormat.g:23035:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__1 )
+            // InternalFormat.g:23036:2: rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2__046479);
+            pushFollow(FOLLOW_86);
             rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__1_in_rule__JvmParameterizedTypeReference__Group_1_4_2__046482);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_2__1();
 
             state._fsp--;
@@ -66375,25 +66375,25 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2__0() throws R
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23043:1: rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl : ( ( '<' ) ) ;
+    // InternalFormat.g:23043:1: rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl : ( ( '<' ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23047:1: ( ( ( '<' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23048:1: ( ( '<' ) )
+            // InternalFormat.g:23047:1: ( ( ( '<' ) ) )
+            // InternalFormat.g:23048:1: ( ( '<' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23048:1: ( ( '<' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23049:1: ( '<' )
+            // InternalFormat.g:23048:1: ( ( '<' ) )
+            // InternalFormat.g:23049:1: ( '<' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getLessThanSignKeyword_1_4_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23050:1: ( '<' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23051:2: '<'
+            // InternalFormat.g:23050:1: ( '<' )
+            // InternalFormat.g:23051:2: '<'
             {
-            match(input,33,FOLLOW_33_in_rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl46511); if (state.failed) return ;
+            match(input,33,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -66422,21 +66422,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl() th
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23062:1: rule__JvmParameterizedTypeReference__Group_1_4_2__1 : rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__2 ;
+    // InternalFormat.g:23062:1: rule__JvmParameterizedTypeReference__Group_1_4_2__1 : rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__2 ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23066:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23067:2: rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__2
+            // InternalFormat.g:23066:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__2 )
+            // InternalFormat.g:23067:2: rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__2
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2__146543);
+            pushFollow(FOLLOW_87);
             rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__2_in_rule__JvmParameterizedTypeReference__Group_1_4_2__146546);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_2__2();
 
             state._fsp--;
@@ -66460,25 +66460,25 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2__1() throws R
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23074:1: rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) ) ;
+    // InternalFormat.g:23074:1: rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23078:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23079:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) )
+            // InternalFormat.g:23078:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) ) )
+            // InternalFormat.g:23079:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23079:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23080:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 )
+            // InternalFormat.g:23079:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 ) )
+            // InternalFormat.g:23080:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsAssignment_1_4_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23081:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23081:2: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1
+            // InternalFormat.g:23081:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 )
+            // InternalFormat.g:23081:2: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1_in_rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl46573);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1();
 
             state._fsp--;
@@ -66511,21 +66511,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl() th
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23091:1: rule__JvmParameterizedTypeReference__Group_1_4_2__2 : rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__3 ;
+    // InternalFormat.g:23091:1: rule__JvmParameterizedTypeReference__Group_1_4_2__2 : rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__3 ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23095:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23096:2: rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__3
+            // InternalFormat.g:23095:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__3 )
+            // InternalFormat.g:23096:2: rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl rule__JvmParameterizedTypeReference__Group_1_4_2__3
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2__246603);
+            pushFollow(FOLLOW_87);
             rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__3_in_rule__JvmParameterizedTypeReference__Group_1_4_2__246606);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_2__3();
 
             state._fsp--;
@@ -66549,22 +66549,22 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2__2() throws R
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23103:1: rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* ) ;
+    // InternalFormat.g:23103:1: rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl : ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23107:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23108:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* )
+            // InternalFormat.g:23107:1: ( ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* ) )
+            // InternalFormat.g:23108:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23108:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23109:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )*
+            // InternalFormat.g:23108:1: ( ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )* )
+            // InternalFormat.g:23109:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGroup_1_4_2_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23110:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )*
+            // InternalFormat.g:23110:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 )*
             loop172:
             do {
                 int alt172=2;
@@ -66577,9 +66577,9 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl() th
 
                 switch (alt172) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23110:2: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0
+            	    // InternalFormat.g:23110:2: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2_2__0_in_rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl46633);
+            	    pushFollow(FOLLOW_23);
             	    rule__JvmParameterizedTypeReference__Group_1_4_2_2__0();
 
             	    state._fsp--;
@@ -66618,16 +66618,16 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl() th
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23120:1: rule__JvmParameterizedTypeReference__Group_1_4_2__3 : rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl ;
+    // InternalFormat.g:23120:1: rule__JvmParameterizedTypeReference__Group_1_4_2__3 : rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23124:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23125:2: rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl
+            // InternalFormat.g:23124:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl )
+            // InternalFormat.g:23125:2: rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2__346664);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl();
 
             state._fsp--;
@@ -66651,22 +66651,22 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2__3() throws R
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23131:1: rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl : ( '>' ) ;
+    // InternalFormat.g:23131:1: rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl : ( '>' ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23135:1: ( ( '>' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23136:1: ( '>' )
+            // InternalFormat.g:23135:1: ( ( '>' ) )
+            // InternalFormat.g:23136:1: ( '>' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23136:1: ( '>' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23137:1: '>'
+            // InternalFormat.g:23136:1: ( '>' )
+            // InternalFormat.g:23137:1: '>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGreaterThanSignKeyword_1_4_2_3()); 
             }
-            match(input,32,FOLLOW_32_in_rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl46692); if (state.failed) return ;
+            match(input,32,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmParameterizedTypeReferenceAccess().getGreaterThanSignKeyword_1_4_2_3()); 
             }
@@ -66692,21 +66692,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl() th
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2_2__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23158:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 : rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2_2__1 ;
+    // InternalFormat.g:23158:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0 : rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2_2__1 ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23162:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2_2__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23163:2: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2_2__1
+            // InternalFormat.g:23162:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2_2__1 )
+            // InternalFormat.g:23163:2: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl rule__JvmParameterizedTypeReference__Group_1_4_2_2__1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__046731);
+            pushFollow(FOLLOW_86);
             rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2_2__1_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__046734);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_2_2__1();
 
             state._fsp--;
@@ -66730,22 +66730,22 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2_2__0() throws
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23170:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl : ( ',' ) ;
+    // InternalFormat.g:23170:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl : ( ',' ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23174:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23175:1: ( ',' )
+            // InternalFormat.g:23174:1: ( ( ',' ) )
+            // InternalFormat.g:23175:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23175:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23176:1: ','
+            // InternalFormat.g:23175:1: ( ',' )
+            // InternalFormat.g:23176:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getCommaKeyword_1_4_2_2_0()); 
             }
-            match(input,71,FOLLOW_71_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl46762); if (state.failed) return ;
+            match(input,71,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmParameterizedTypeReferenceAccess().getCommaKeyword_1_4_2_2_0()); 
             }
@@ -66771,16 +66771,16 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl()
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2_2__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23189:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__1 : rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl ;
+    // InternalFormat.g:23189:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__1 : rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23193:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23194:2: rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl
+            // InternalFormat.g:23193:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl )
+            // InternalFormat.g:23194:2: rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__146793);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl();
 
             state._fsp--;
@@ -66804,25 +66804,25 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2_2__1() throws
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23200:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) ) ;
+    // InternalFormat.g:23200:1: rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl : ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) ) ;
     public final void rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23204:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23205:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) )
+            // InternalFormat.g:23204:1: ( ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) ) )
+            // InternalFormat.g:23205:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23205:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23206:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 )
+            // InternalFormat.g:23205:1: ( ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 ) )
+            // InternalFormat.g:23206:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsAssignment_1_4_2_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23207:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23207:2: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1
+            // InternalFormat.g:23207:1: ( rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 )
+            // InternalFormat.g:23207:2: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1
             {
-            pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl46820);
+            pushFollow(FOLLOW_2);
             rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1();
 
             state._fsp--;
@@ -66855,21 +66855,21 @@ public final void rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl()
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23221:1: rule__JvmWildcardTypeReference__Group__0 : rule__JvmWildcardTypeReference__Group__0__Impl rule__JvmWildcardTypeReference__Group__1 ;
+    // InternalFormat.g:23221:1: rule__JvmWildcardTypeReference__Group__0 : rule__JvmWildcardTypeReference__Group__0__Impl rule__JvmWildcardTypeReference__Group__1 ;
     public final void rule__JvmWildcardTypeReference__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23225:1: ( rule__JvmWildcardTypeReference__Group__0__Impl rule__JvmWildcardTypeReference__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23226:2: rule__JvmWildcardTypeReference__Group__0__Impl rule__JvmWildcardTypeReference__Group__1
+            // InternalFormat.g:23225:1: ( rule__JvmWildcardTypeReference__Group__0__Impl rule__JvmWildcardTypeReference__Group__1 )
+            // InternalFormat.g:23226:2: rule__JvmWildcardTypeReference__Group__0__Impl rule__JvmWildcardTypeReference__Group__1
             {
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group__0__Impl_in_rule__JvmWildcardTypeReference__Group__046854);
+            pushFollow(FOLLOW_86);
             rule__JvmWildcardTypeReference__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group__1_in_rule__JvmWildcardTypeReference__Group__046857);
+            pushFollow(FOLLOW_2);
             rule__JvmWildcardTypeReference__Group__1();
 
             state._fsp--;
@@ -66893,23 +66893,23 @@ public final void rule__JvmWildcardTypeReference__Group__0() throws RecognitionE
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23233:1: rule__JvmWildcardTypeReference__Group__0__Impl : ( () ) ;
+    // InternalFormat.g:23233:1: rule__JvmWildcardTypeReference__Group__0__Impl : ( () ) ;
     public final void rule__JvmWildcardTypeReference__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23237:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23238:1: ( () )
+            // InternalFormat.g:23237:1: ( ( () ) )
+            // InternalFormat.g:23238:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23238:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23239:1: ()
+            // InternalFormat.g:23238:1: ( () )
+            // InternalFormat.g:23239:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getJvmWildcardTypeReferenceAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23240:1: ()
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23242:1: 
+            // InternalFormat.g:23240:1: ()
+            // InternalFormat.g:23242:1: 
             {
             }
 
@@ -66934,21 +66934,21 @@ public final void rule__JvmWildcardTypeReference__Group__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23252:1: rule__JvmWildcardTypeReference__Group__1 : rule__JvmWildcardTypeReference__Group__1__Impl rule__JvmWildcardTypeReference__Group__2 ;
+    // InternalFormat.g:23252:1: rule__JvmWildcardTypeReference__Group__1 : rule__JvmWildcardTypeReference__Group__1__Impl rule__JvmWildcardTypeReference__Group__2 ;
     public final void rule__JvmWildcardTypeReference__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23256:1: ( rule__JvmWildcardTypeReference__Group__1__Impl rule__JvmWildcardTypeReference__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23257:2: rule__JvmWildcardTypeReference__Group__1__Impl rule__JvmWildcardTypeReference__Group__2
+            // InternalFormat.g:23256:1: ( rule__JvmWildcardTypeReference__Group__1__Impl rule__JvmWildcardTypeReference__Group__2 )
+            // InternalFormat.g:23257:2: rule__JvmWildcardTypeReference__Group__1__Impl rule__JvmWildcardTypeReference__Group__2
             {
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group__1__Impl_in_rule__JvmWildcardTypeReference__Group__146915);
+            pushFollow(FOLLOW_125);
             rule__JvmWildcardTypeReference__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group__2_in_rule__JvmWildcardTypeReference__Group__146918);
+            pushFollow(FOLLOW_2);
             rule__JvmWildcardTypeReference__Group__2();
 
             state._fsp--;
@@ -66972,22 +66972,22 @@ public final void rule__JvmWildcardTypeReference__Group__1() throws RecognitionE
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23264:1: rule__JvmWildcardTypeReference__Group__1__Impl : ( '?' ) ;
+    // InternalFormat.g:23264:1: rule__JvmWildcardTypeReference__Group__1__Impl : ( '?' ) ;
     public final void rule__JvmWildcardTypeReference__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23268:1: ( ( '?' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23269:1: ( '?' )
+            // InternalFormat.g:23268:1: ( ( '?' ) )
+            // InternalFormat.g:23269:1: ( '?' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23269:1: ( '?' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23270:1: '?'
+            // InternalFormat.g:23269:1: ( '?' )
+            // InternalFormat.g:23270:1: '?'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getQuestionMarkKeyword_1()); 
             }
-            match(input,102,FOLLOW_102_in_rule__JvmWildcardTypeReference__Group__1__Impl46946); if (state.failed) return ;
+            match(input,102,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmWildcardTypeReferenceAccess().getQuestionMarkKeyword_1()); 
             }
@@ -67013,16 +67013,16 @@ public final void rule__JvmWildcardTypeReference__Group__1__Impl() throws Recogn
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23283:1: rule__JvmWildcardTypeReference__Group__2 : rule__JvmWildcardTypeReference__Group__2__Impl ;
+    // InternalFormat.g:23283:1: rule__JvmWildcardTypeReference__Group__2 : rule__JvmWildcardTypeReference__Group__2__Impl ;
     public final void rule__JvmWildcardTypeReference__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23287:1: ( rule__JvmWildcardTypeReference__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23288:2: rule__JvmWildcardTypeReference__Group__2__Impl
+            // InternalFormat.g:23287:1: ( rule__JvmWildcardTypeReference__Group__2__Impl )
+            // InternalFormat.g:23288:2: rule__JvmWildcardTypeReference__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group__2__Impl_in_rule__JvmWildcardTypeReference__Group__246977);
+            pushFollow(FOLLOW_2);
             rule__JvmWildcardTypeReference__Group__2__Impl();
 
             state._fsp--;
@@ -67046,22 +67046,22 @@ public final void rule__JvmWildcardTypeReference__Group__2() throws RecognitionE
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23294:1: rule__JvmWildcardTypeReference__Group__2__Impl : ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? ) ;
+    // InternalFormat.g:23294:1: rule__JvmWildcardTypeReference__Group__2__Impl : ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? ) ;
     public final void rule__JvmWildcardTypeReference__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23298:1: ( ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23299:1: ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? )
+            // InternalFormat.g:23298:1: ( ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? ) )
+            // InternalFormat.g:23299:1: ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23299:1: ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23300:1: ( rule__JvmWildcardTypeReference__Alternatives_2 )?
+            // InternalFormat.g:23299:1: ( ( rule__JvmWildcardTypeReference__Alternatives_2 )? )
+            // InternalFormat.g:23300:1: ( rule__JvmWildcardTypeReference__Alternatives_2 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getAlternatives_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23301:1: ( rule__JvmWildcardTypeReference__Alternatives_2 )?
+            // InternalFormat.g:23301:1: ( rule__JvmWildcardTypeReference__Alternatives_2 )?
             int alt173=2;
             int LA173_0 = input.LA(1);
 
@@ -67070,9 +67070,9 @@ public final void rule__JvmWildcardTypeReference__Group__2__Impl() throws Recogn
             }
             switch (alt173) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23301:2: rule__JvmWildcardTypeReference__Alternatives_2
+                    // InternalFormat.g:23301:2: rule__JvmWildcardTypeReference__Alternatives_2
                     {
-                    pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Alternatives_2_in_rule__JvmWildcardTypeReference__Group__2__Impl47004);
+                    pushFollow(FOLLOW_2);
                     rule__JvmWildcardTypeReference__Alternatives_2();
 
                     state._fsp--;
@@ -67108,21 +67108,21 @@ public final void rule__JvmWildcardTypeReference__Group__2__Impl() throws Recogn
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23317:1: rule__JvmWildcardTypeReference__Group_2_0__0 : rule__JvmWildcardTypeReference__Group_2_0__0__Impl rule__JvmWildcardTypeReference__Group_2_0__1 ;
+    // InternalFormat.g:23317:1: rule__JvmWildcardTypeReference__Group_2_0__0 : rule__JvmWildcardTypeReference__Group_2_0__0__Impl rule__JvmWildcardTypeReference__Group_2_0__1 ;
     public final void rule__JvmWildcardTypeReference__Group_2_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23321:1: ( rule__JvmWildcardTypeReference__Group_2_0__0__Impl rule__JvmWildcardTypeReference__Group_2_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23322:2: rule__JvmWildcardTypeReference__Group_2_0__0__Impl rule__JvmWildcardTypeReference__Group_2_0__1
+            // InternalFormat.g:23321:1: ( rule__JvmWildcardTypeReference__Group_2_0__0__Impl rule__JvmWildcardTypeReference__Group_2_0__1 )
+            // InternalFormat.g:23322:2: rule__JvmWildcardTypeReference__Group_2_0__0__Impl rule__JvmWildcardTypeReference__Group_2_0__1
             {
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group_2_0__0__Impl_in_rule__JvmWildcardTypeReference__Group_2_0__047041);
+            pushFollow(FOLLOW_126);
             rule__JvmWildcardTypeReference__Group_2_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group_2_0__1_in_rule__JvmWildcardTypeReference__Group_2_0__047044);
+            pushFollow(FOLLOW_2);
             rule__JvmWildcardTypeReference__Group_2_0__1();
 
             state._fsp--;
@@ -67146,25 +67146,25 @@ public final void rule__JvmWildcardTypeReference__Group_2_0__0() throws Recognit
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23329:1: rule__JvmWildcardTypeReference__Group_2_0__0__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) ) ;
+    // InternalFormat.g:23329:1: rule__JvmWildcardTypeReference__Group_2_0__0__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) ) ;
     public final void rule__JvmWildcardTypeReference__Group_2_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23333:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23334:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) )
+            // InternalFormat.g:23333:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) ) )
+            // InternalFormat.g:23334:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23334:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23335:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 )
+            // InternalFormat.g:23334:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 ) )
+            // InternalFormat.g:23335:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsAssignment_2_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23336:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23336:2: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0
+            // InternalFormat.g:23336:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 )
+            // InternalFormat.g:23336:2: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0
             {
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0_in_rule__JvmWildcardTypeReference__Group_2_0__0__Impl47071);
+            pushFollow(FOLLOW_2);
             rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0();
 
             state._fsp--;
@@ -67197,16 +67197,16 @@ public final void rule__JvmWildcardTypeReference__Group_2_0__0__Impl() throws Re
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23346:1: rule__JvmWildcardTypeReference__Group_2_0__1 : rule__JvmWildcardTypeReference__Group_2_0__1__Impl ;
+    // InternalFormat.g:23346:1: rule__JvmWildcardTypeReference__Group_2_0__1 : rule__JvmWildcardTypeReference__Group_2_0__1__Impl ;
     public final void rule__JvmWildcardTypeReference__Group_2_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23350:1: ( rule__JvmWildcardTypeReference__Group_2_0__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23351:2: rule__JvmWildcardTypeReference__Group_2_0__1__Impl
+            // InternalFormat.g:23350:1: ( rule__JvmWildcardTypeReference__Group_2_0__1__Impl )
+            // InternalFormat.g:23351:2: rule__JvmWildcardTypeReference__Group_2_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group_2_0__1__Impl_in_rule__JvmWildcardTypeReference__Group_2_0__147101);
+            pushFollow(FOLLOW_2);
             rule__JvmWildcardTypeReference__Group_2_0__1__Impl();
 
             state._fsp--;
@@ -67230,22 +67230,22 @@ public final void rule__JvmWildcardTypeReference__Group_2_0__1() throws Recognit
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23357:1: rule__JvmWildcardTypeReference__Group_2_0__1__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* ) ;
+    // InternalFormat.g:23357:1: rule__JvmWildcardTypeReference__Group_2_0__1__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* ) ;
     public final void rule__JvmWildcardTypeReference__Group_2_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23361:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23362:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* )
+            // InternalFormat.g:23361:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* ) )
+            // InternalFormat.g:23362:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23362:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23363:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )*
+            // InternalFormat.g:23362:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )* )
+            // InternalFormat.g:23363:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsAssignment_2_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23364:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )*
+            // InternalFormat.g:23364:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 )*
             loop174:
             do {
                 int alt174=2;
@@ -67258,9 +67258,9 @@ public final void rule__JvmWildcardTypeReference__Group_2_0__1__Impl() throws Re
 
                 switch (alt174) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23364:2: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1
+            	    // InternalFormat.g:23364:2: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1
             	    {
-            	    pushFollow(FOLLOW_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1_in_rule__JvmWildcardTypeReference__Group_2_0__1__Impl47128);
+            	    pushFollow(FOLLOW_127);
             	    rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1();
 
             	    state._fsp--;
@@ -67299,21 +67299,21 @@ public final void rule__JvmWildcardTypeReference__Group_2_0__1__Impl() throws Re
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_1__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23378:1: rule__JvmWildcardTypeReference__Group_2_1__0 : rule__JvmWildcardTypeReference__Group_2_1__0__Impl rule__JvmWildcardTypeReference__Group_2_1__1 ;
+    // InternalFormat.g:23378:1: rule__JvmWildcardTypeReference__Group_2_1__0 : rule__JvmWildcardTypeReference__Group_2_1__0__Impl rule__JvmWildcardTypeReference__Group_2_1__1 ;
     public final void rule__JvmWildcardTypeReference__Group_2_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23382:1: ( rule__JvmWildcardTypeReference__Group_2_1__0__Impl rule__JvmWildcardTypeReference__Group_2_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23383:2: rule__JvmWildcardTypeReference__Group_2_1__0__Impl rule__JvmWildcardTypeReference__Group_2_1__1
+            // InternalFormat.g:23382:1: ( rule__JvmWildcardTypeReference__Group_2_1__0__Impl rule__JvmWildcardTypeReference__Group_2_1__1 )
+            // InternalFormat.g:23383:2: rule__JvmWildcardTypeReference__Group_2_1__0__Impl rule__JvmWildcardTypeReference__Group_2_1__1
             {
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group_2_1__0__Impl_in_rule__JvmWildcardTypeReference__Group_2_1__047163);
+            pushFollow(FOLLOW_126);
             rule__JvmWildcardTypeReference__Group_2_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group_2_1__1_in_rule__JvmWildcardTypeReference__Group_2_1__047166);
+            pushFollow(FOLLOW_2);
             rule__JvmWildcardTypeReference__Group_2_1__1();
 
             state._fsp--;
@@ -67337,25 +67337,25 @@ public final void rule__JvmWildcardTypeReference__Group_2_1__0() throws Recognit
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23390:1: rule__JvmWildcardTypeReference__Group_2_1__0__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) ) ;
+    // InternalFormat.g:23390:1: rule__JvmWildcardTypeReference__Group_2_1__0__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) ) ;
     public final void rule__JvmWildcardTypeReference__Group_2_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23394:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23395:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) )
+            // InternalFormat.g:23394:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) ) )
+            // InternalFormat.g:23395:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23395:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23396:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 )
+            // InternalFormat.g:23395:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 ) )
+            // InternalFormat.g:23396:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsAssignment_2_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23397:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23397:2: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0
+            // InternalFormat.g:23397:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 )
+            // InternalFormat.g:23397:2: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0
             {
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0_in_rule__JvmWildcardTypeReference__Group_2_1__0__Impl47193);
+            pushFollow(FOLLOW_2);
             rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0();
 
             state._fsp--;
@@ -67388,16 +67388,16 @@ public final void rule__JvmWildcardTypeReference__Group_2_1__0__Impl() throws Re
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_1__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23407:1: rule__JvmWildcardTypeReference__Group_2_1__1 : rule__JvmWildcardTypeReference__Group_2_1__1__Impl ;
+    // InternalFormat.g:23407:1: rule__JvmWildcardTypeReference__Group_2_1__1 : rule__JvmWildcardTypeReference__Group_2_1__1__Impl ;
     public final void rule__JvmWildcardTypeReference__Group_2_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23411:1: ( rule__JvmWildcardTypeReference__Group_2_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23412:2: rule__JvmWildcardTypeReference__Group_2_1__1__Impl
+            // InternalFormat.g:23411:1: ( rule__JvmWildcardTypeReference__Group_2_1__1__Impl )
+            // InternalFormat.g:23412:2: rule__JvmWildcardTypeReference__Group_2_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmWildcardTypeReference__Group_2_1__1__Impl_in_rule__JvmWildcardTypeReference__Group_2_1__147223);
+            pushFollow(FOLLOW_2);
             rule__JvmWildcardTypeReference__Group_2_1__1__Impl();
 
             state._fsp--;
@@ -67421,22 +67421,22 @@ public final void rule__JvmWildcardTypeReference__Group_2_1__1() throws Recognit
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__Group_2_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23418:1: rule__JvmWildcardTypeReference__Group_2_1__1__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* ) ;
+    // InternalFormat.g:23418:1: rule__JvmWildcardTypeReference__Group_2_1__1__Impl : ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* ) ;
     public final void rule__JvmWildcardTypeReference__Group_2_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23422:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23423:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* )
+            // InternalFormat.g:23422:1: ( ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* ) )
+            // InternalFormat.g:23423:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23423:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23424:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )*
+            // InternalFormat.g:23423:1: ( ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )* )
+            // InternalFormat.g:23424:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsAssignment_2_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23425:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )*
+            // InternalFormat.g:23425:1: ( rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 )*
             loop175:
             do {
                 int alt175=2;
@@ -67449,9 +67449,9 @@ public final void rule__JvmWildcardTypeReference__Group_2_1__1__Impl() throws Re
 
                 switch (alt175) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23425:2: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1
+            	    // InternalFormat.g:23425:2: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1
             	    {
-            	    pushFollow(FOLLOW_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1_in_rule__JvmWildcardTypeReference__Group_2_1__1__Impl47250);
+            	    pushFollow(FOLLOW_127);
             	    rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1();
 
             	    state._fsp--;
@@ -67490,21 +67490,21 @@ public final void rule__JvmWildcardTypeReference__Group_2_1__1__Impl() throws Re
 
 
     // $ANTLR start "rule__JvmUpperBound__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23439:1: rule__JvmUpperBound__Group__0 : rule__JvmUpperBound__Group__0__Impl rule__JvmUpperBound__Group__1 ;
+    // InternalFormat.g:23439:1: rule__JvmUpperBound__Group__0 : rule__JvmUpperBound__Group__0__Impl rule__JvmUpperBound__Group__1 ;
     public final void rule__JvmUpperBound__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23443:1: ( rule__JvmUpperBound__Group__0__Impl rule__JvmUpperBound__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23444:2: rule__JvmUpperBound__Group__0__Impl rule__JvmUpperBound__Group__1
+            // InternalFormat.g:23443:1: ( rule__JvmUpperBound__Group__0__Impl rule__JvmUpperBound__Group__1 )
+            // InternalFormat.g:23444:2: rule__JvmUpperBound__Group__0__Impl rule__JvmUpperBound__Group__1
             {
-            pushFollow(FOLLOW_rule__JvmUpperBound__Group__0__Impl_in_rule__JvmUpperBound__Group__047285);
+            pushFollow(FOLLOW_66);
             rule__JvmUpperBound__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmUpperBound__Group__1_in_rule__JvmUpperBound__Group__047288);
+            pushFollow(FOLLOW_2);
             rule__JvmUpperBound__Group__1();
 
             state._fsp--;
@@ -67528,22 +67528,22 @@ public final void rule__JvmUpperBound__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__JvmUpperBound__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23451:1: rule__JvmUpperBound__Group__0__Impl : ( 'extends' ) ;
+    // InternalFormat.g:23451:1: rule__JvmUpperBound__Group__0__Impl : ( 'extends' ) ;
     public final void rule__JvmUpperBound__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23455:1: ( ( 'extends' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23456:1: ( 'extends' )
+            // InternalFormat.g:23455:1: ( ( 'extends' ) )
+            // InternalFormat.g:23456:1: ( 'extends' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23456:1: ( 'extends' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23457:1: 'extends'
+            // InternalFormat.g:23456:1: ( 'extends' )
+            // InternalFormat.g:23457:1: 'extends'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAccess().getExtendsKeyword_0()); 
             }
-            match(input,50,FOLLOW_50_in_rule__JvmUpperBound__Group__0__Impl47316); if (state.failed) return ;
+            match(input,50,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmUpperBoundAccess().getExtendsKeyword_0()); 
             }
@@ -67569,16 +67569,16 @@ public final void rule__JvmUpperBound__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__JvmUpperBound__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23470:1: rule__JvmUpperBound__Group__1 : rule__JvmUpperBound__Group__1__Impl ;
+    // InternalFormat.g:23470:1: rule__JvmUpperBound__Group__1 : rule__JvmUpperBound__Group__1__Impl ;
     public final void rule__JvmUpperBound__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23474:1: ( rule__JvmUpperBound__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23475:2: rule__JvmUpperBound__Group__1__Impl
+            // InternalFormat.g:23474:1: ( rule__JvmUpperBound__Group__1__Impl )
+            // InternalFormat.g:23475:2: rule__JvmUpperBound__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmUpperBound__Group__1__Impl_in_rule__JvmUpperBound__Group__147347);
+            pushFollow(FOLLOW_2);
             rule__JvmUpperBound__Group__1__Impl();
 
             state._fsp--;
@@ -67602,25 +67602,25 @@ public final void rule__JvmUpperBound__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__JvmUpperBound__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23481:1: rule__JvmUpperBound__Group__1__Impl : ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) ) ;
+    // InternalFormat.g:23481:1: rule__JvmUpperBound__Group__1__Impl : ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) ) ;
     public final void rule__JvmUpperBound__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23485:1: ( ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23486:1: ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) )
+            // InternalFormat.g:23485:1: ( ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) ) )
+            // InternalFormat.g:23486:1: ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23486:1: ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23487:1: ( rule__JvmUpperBound__TypeReferenceAssignment_1 )
+            // InternalFormat.g:23486:1: ( ( rule__JvmUpperBound__TypeReferenceAssignment_1 ) )
+            // InternalFormat.g:23487:1: ( rule__JvmUpperBound__TypeReferenceAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAccess().getTypeReferenceAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23488:1: ( rule__JvmUpperBound__TypeReferenceAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23488:2: rule__JvmUpperBound__TypeReferenceAssignment_1
+            // InternalFormat.g:23488:1: ( rule__JvmUpperBound__TypeReferenceAssignment_1 )
+            // InternalFormat.g:23488:2: rule__JvmUpperBound__TypeReferenceAssignment_1
             {
-            pushFollow(FOLLOW_rule__JvmUpperBound__TypeReferenceAssignment_1_in_rule__JvmUpperBound__Group__1__Impl47374);
+            pushFollow(FOLLOW_2);
             rule__JvmUpperBound__TypeReferenceAssignment_1();
 
             state._fsp--;
@@ -67653,21 +67653,21 @@ public final void rule__JvmUpperBound__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__JvmUpperBoundAnded__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23502:1: rule__JvmUpperBoundAnded__Group__0 : rule__JvmUpperBoundAnded__Group__0__Impl rule__JvmUpperBoundAnded__Group__1 ;
+    // InternalFormat.g:23502:1: rule__JvmUpperBoundAnded__Group__0 : rule__JvmUpperBoundAnded__Group__0__Impl rule__JvmUpperBoundAnded__Group__1 ;
     public final void rule__JvmUpperBoundAnded__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23506:1: ( rule__JvmUpperBoundAnded__Group__0__Impl rule__JvmUpperBoundAnded__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23507:2: rule__JvmUpperBoundAnded__Group__0__Impl rule__JvmUpperBoundAnded__Group__1
+            // InternalFormat.g:23506:1: ( rule__JvmUpperBoundAnded__Group__0__Impl rule__JvmUpperBoundAnded__Group__1 )
+            // InternalFormat.g:23507:2: rule__JvmUpperBoundAnded__Group__0__Impl rule__JvmUpperBoundAnded__Group__1
             {
-            pushFollow(FOLLOW_rule__JvmUpperBoundAnded__Group__0__Impl_in_rule__JvmUpperBoundAnded__Group__047408);
+            pushFollow(FOLLOW_66);
             rule__JvmUpperBoundAnded__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmUpperBoundAnded__Group__1_in_rule__JvmUpperBoundAnded__Group__047411);
+            pushFollow(FOLLOW_2);
             rule__JvmUpperBoundAnded__Group__1();
 
             state._fsp--;
@@ -67691,22 +67691,22 @@ public final void rule__JvmUpperBoundAnded__Group__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__JvmUpperBoundAnded__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23514:1: rule__JvmUpperBoundAnded__Group__0__Impl : ( '&' ) ;
+    // InternalFormat.g:23514:1: rule__JvmUpperBoundAnded__Group__0__Impl : ( '&' ) ;
     public final void rule__JvmUpperBoundAnded__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23518:1: ( ( '&' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23519:1: ( '&' )
+            // InternalFormat.g:23518:1: ( ( '&' ) )
+            // InternalFormat.g:23519:1: ( '&' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23519:1: ( '&' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23520:1: '&'
+            // InternalFormat.g:23519:1: ( '&' )
+            // InternalFormat.g:23520:1: '&'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAndedAccess().getAmpersandKeyword_0()); 
             }
-            match(input,103,FOLLOW_103_in_rule__JvmUpperBoundAnded__Group__0__Impl47439); if (state.failed) return ;
+            match(input,103,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmUpperBoundAndedAccess().getAmpersandKeyword_0()); 
             }
@@ -67732,16 +67732,16 @@ public final void rule__JvmUpperBoundAnded__Group__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__JvmUpperBoundAnded__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23533:1: rule__JvmUpperBoundAnded__Group__1 : rule__JvmUpperBoundAnded__Group__1__Impl ;
+    // InternalFormat.g:23533:1: rule__JvmUpperBoundAnded__Group__1 : rule__JvmUpperBoundAnded__Group__1__Impl ;
     public final void rule__JvmUpperBoundAnded__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23537:1: ( rule__JvmUpperBoundAnded__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23538:2: rule__JvmUpperBoundAnded__Group__1__Impl
+            // InternalFormat.g:23537:1: ( rule__JvmUpperBoundAnded__Group__1__Impl )
+            // InternalFormat.g:23538:2: rule__JvmUpperBoundAnded__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmUpperBoundAnded__Group__1__Impl_in_rule__JvmUpperBoundAnded__Group__147470);
+            pushFollow(FOLLOW_2);
             rule__JvmUpperBoundAnded__Group__1__Impl();
 
             state._fsp--;
@@ -67765,25 +67765,25 @@ public final void rule__JvmUpperBoundAnded__Group__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__JvmUpperBoundAnded__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23544:1: rule__JvmUpperBoundAnded__Group__1__Impl : ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) ) ;
+    // InternalFormat.g:23544:1: rule__JvmUpperBoundAnded__Group__1__Impl : ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) ) ;
     public final void rule__JvmUpperBoundAnded__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23548:1: ( ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23549:1: ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) )
+            // InternalFormat.g:23548:1: ( ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) ) )
+            // InternalFormat.g:23549:1: ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23549:1: ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23550:1: ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 )
+            // InternalFormat.g:23549:1: ( ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 ) )
+            // InternalFormat.g:23550:1: ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAndedAccess().getTypeReferenceAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23551:1: ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23551:2: rule__JvmUpperBoundAnded__TypeReferenceAssignment_1
+            // InternalFormat.g:23551:1: ( rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 )
+            // InternalFormat.g:23551:2: rule__JvmUpperBoundAnded__TypeReferenceAssignment_1
             {
-            pushFollow(FOLLOW_rule__JvmUpperBoundAnded__TypeReferenceAssignment_1_in_rule__JvmUpperBoundAnded__Group__1__Impl47497);
+            pushFollow(FOLLOW_2);
             rule__JvmUpperBoundAnded__TypeReferenceAssignment_1();
 
             state._fsp--;
@@ -67816,21 +67816,21 @@ public final void rule__JvmUpperBoundAnded__Group__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__JvmLowerBound__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23565:1: rule__JvmLowerBound__Group__0 : rule__JvmLowerBound__Group__0__Impl rule__JvmLowerBound__Group__1 ;
+    // InternalFormat.g:23565:1: rule__JvmLowerBound__Group__0 : rule__JvmLowerBound__Group__0__Impl rule__JvmLowerBound__Group__1 ;
     public final void rule__JvmLowerBound__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23569:1: ( rule__JvmLowerBound__Group__0__Impl rule__JvmLowerBound__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23570:2: rule__JvmLowerBound__Group__0__Impl rule__JvmLowerBound__Group__1
+            // InternalFormat.g:23569:1: ( rule__JvmLowerBound__Group__0__Impl rule__JvmLowerBound__Group__1 )
+            // InternalFormat.g:23570:2: rule__JvmLowerBound__Group__0__Impl rule__JvmLowerBound__Group__1
             {
-            pushFollow(FOLLOW_rule__JvmLowerBound__Group__0__Impl_in_rule__JvmLowerBound__Group__047531);
+            pushFollow(FOLLOW_66);
             rule__JvmLowerBound__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmLowerBound__Group__1_in_rule__JvmLowerBound__Group__047534);
+            pushFollow(FOLLOW_2);
             rule__JvmLowerBound__Group__1();
 
             state._fsp--;
@@ -67854,22 +67854,22 @@ public final void rule__JvmLowerBound__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__JvmLowerBound__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23577:1: rule__JvmLowerBound__Group__0__Impl : ( 'super' ) ;
+    // InternalFormat.g:23577:1: rule__JvmLowerBound__Group__0__Impl : ( 'super' ) ;
     public final void rule__JvmLowerBound__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23581:1: ( ( 'super' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23582:1: ( 'super' )
+            // InternalFormat.g:23581:1: ( ( 'super' ) )
+            // InternalFormat.g:23582:1: ( 'super' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23582:1: ( 'super' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23583:1: 'super'
+            // InternalFormat.g:23582:1: ( 'super' )
+            // InternalFormat.g:23583:1: 'super'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAccess().getSuperKeyword_0()); 
             }
-            match(input,54,FOLLOW_54_in_rule__JvmLowerBound__Group__0__Impl47562); if (state.failed) return ;
+            match(input,54,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmLowerBoundAccess().getSuperKeyword_0()); 
             }
@@ -67895,16 +67895,16 @@ public final void rule__JvmLowerBound__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__JvmLowerBound__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23596:1: rule__JvmLowerBound__Group__1 : rule__JvmLowerBound__Group__1__Impl ;
+    // InternalFormat.g:23596:1: rule__JvmLowerBound__Group__1 : rule__JvmLowerBound__Group__1__Impl ;
     public final void rule__JvmLowerBound__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23600:1: ( rule__JvmLowerBound__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23601:2: rule__JvmLowerBound__Group__1__Impl
+            // InternalFormat.g:23600:1: ( rule__JvmLowerBound__Group__1__Impl )
+            // InternalFormat.g:23601:2: rule__JvmLowerBound__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmLowerBound__Group__1__Impl_in_rule__JvmLowerBound__Group__147593);
+            pushFollow(FOLLOW_2);
             rule__JvmLowerBound__Group__1__Impl();
 
             state._fsp--;
@@ -67928,25 +67928,25 @@ public final void rule__JvmLowerBound__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__JvmLowerBound__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23607:1: rule__JvmLowerBound__Group__1__Impl : ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) ) ;
+    // InternalFormat.g:23607:1: rule__JvmLowerBound__Group__1__Impl : ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) ) ;
     public final void rule__JvmLowerBound__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23611:1: ( ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23612:1: ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) )
+            // InternalFormat.g:23611:1: ( ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) ) )
+            // InternalFormat.g:23612:1: ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23612:1: ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23613:1: ( rule__JvmLowerBound__TypeReferenceAssignment_1 )
+            // InternalFormat.g:23612:1: ( ( rule__JvmLowerBound__TypeReferenceAssignment_1 ) )
+            // InternalFormat.g:23613:1: ( rule__JvmLowerBound__TypeReferenceAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAccess().getTypeReferenceAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23614:1: ( rule__JvmLowerBound__TypeReferenceAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23614:2: rule__JvmLowerBound__TypeReferenceAssignment_1
+            // InternalFormat.g:23614:1: ( rule__JvmLowerBound__TypeReferenceAssignment_1 )
+            // InternalFormat.g:23614:2: rule__JvmLowerBound__TypeReferenceAssignment_1
             {
-            pushFollow(FOLLOW_rule__JvmLowerBound__TypeReferenceAssignment_1_in_rule__JvmLowerBound__Group__1__Impl47620);
+            pushFollow(FOLLOW_2);
             rule__JvmLowerBound__TypeReferenceAssignment_1();
 
             state._fsp--;
@@ -67979,21 +67979,21 @@ public final void rule__JvmLowerBound__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__JvmLowerBoundAnded__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23628:1: rule__JvmLowerBoundAnded__Group__0 : rule__JvmLowerBoundAnded__Group__0__Impl rule__JvmLowerBoundAnded__Group__1 ;
+    // InternalFormat.g:23628:1: rule__JvmLowerBoundAnded__Group__0 : rule__JvmLowerBoundAnded__Group__0__Impl rule__JvmLowerBoundAnded__Group__1 ;
     public final void rule__JvmLowerBoundAnded__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23632:1: ( rule__JvmLowerBoundAnded__Group__0__Impl rule__JvmLowerBoundAnded__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23633:2: rule__JvmLowerBoundAnded__Group__0__Impl rule__JvmLowerBoundAnded__Group__1
+            // InternalFormat.g:23632:1: ( rule__JvmLowerBoundAnded__Group__0__Impl rule__JvmLowerBoundAnded__Group__1 )
+            // InternalFormat.g:23633:2: rule__JvmLowerBoundAnded__Group__0__Impl rule__JvmLowerBoundAnded__Group__1
             {
-            pushFollow(FOLLOW_rule__JvmLowerBoundAnded__Group__0__Impl_in_rule__JvmLowerBoundAnded__Group__047654);
+            pushFollow(FOLLOW_66);
             rule__JvmLowerBoundAnded__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__JvmLowerBoundAnded__Group__1_in_rule__JvmLowerBoundAnded__Group__047657);
+            pushFollow(FOLLOW_2);
             rule__JvmLowerBoundAnded__Group__1();
 
             state._fsp--;
@@ -68017,22 +68017,22 @@ public final void rule__JvmLowerBoundAnded__Group__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__JvmLowerBoundAnded__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23640:1: rule__JvmLowerBoundAnded__Group__0__Impl : ( '&' ) ;
+    // InternalFormat.g:23640:1: rule__JvmLowerBoundAnded__Group__0__Impl : ( '&' ) ;
     public final void rule__JvmLowerBoundAnded__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23644:1: ( ( '&' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23645:1: ( '&' )
+            // InternalFormat.g:23644:1: ( ( '&' ) )
+            // InternalFormat.g:23645:1: ( '&' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23645:1: ( '&' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23646:1: '&'
+            // InternalFormat.g:23645:1: ( '&' )
+            // InternalFormat.g:23646:1: '&'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAndedAccess().getAmpersandKeyword_0()); 
             }
-            match(input,103,FOLLOW_103_in_rule__JvmLowerBoundAnded__Group__0__Impl47685); if (state.failed) return ;
+            match(input,103,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getJvmLowerBoundAndedAccess().getAmpersandKeyword_0()); 
             }
@@ -68058,16 +68058,16 @@ public final void rule__JvmLowerBoundAnded__Group__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__JvmLowerBoundAnded__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23659:1: rule__JvmLowerBoundAnded__Group__1 : rule__JvmLowerBoundAnded__Group__1__Impl ;
+    // InternalFormat.g:23659:1: rule__JvmLowerBoundAnded__Group__1 : rule__JvmLowerBoundAnded__Group__1__Impl ;
     public final void rule__JvmLowerBoundAnded__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23663:1: ( rule__JvmLowerBoundAnded__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23664:2: rule__JvmLowerBoundAnded__Group__1__Impl
+            // InternalFormat.g:23663:1: ( rule__JvmLowerBoundAnded__Group__1__Impl )
+            // InternalFormat.g:23664:2: rule__JvmLowerBoundAnded__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__JvmLowerBoundAnded__Group__1__Impl_in_rule__JvmLowerBoundAnded__Group__147716);
+            pushFollow(FOLLOW_2);
             rule__JvmLowerBoundAnded__Group__1__Impl();
 
             state._fsp--;
@@ -68091,25 +68091,25 @@ public final void rule__JvmLowerBoundAnded__Group__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__JvmLowerBoundAnded__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23670:1: rule__JvmLowerBoundAnded__Group__1__Impl : ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) ) ;
+    // InternalFormat.g:23670:1: rule__JvmLowerBoundAnded__Group__1__Impl : ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) ) ;
     public final void rule__JvmLowerBoundAnded__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23674:1: ( ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23675:1: ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) )
+            // InternalFormat.g:23674:1: ( ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) ) )
+            // InternalFormat.g:23675:1: ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23675:1: ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23676:1: ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 )
+            // InternalFormat.g:23675:1: ( ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 ) )
+            // InternalFormat.g:23676:1: ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAndedAccess().getTypeReferenceAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23677:1: ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23677:2: rule__JvmLowerBoundAnded__TypeReferenceAssignment_1
+            // InternalFormat.g:23677:1: ( rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 )
+            // InternalFormat.g:23677:2: rule__JvmLowerBoundAnded__TypeReferenceAssignment_1
             {
-            pushFollow(FOLLOW_rule__JvmLowerBoundAnded__TypeReferenceAssignment_1_in_rule__JvmLowerBoundAnded__Group__1__Impl47743);
+            pushFollow(FOLLOW_2);
             rule__JvmLowerBoundAnded__TypeReferenceAssignment_1();
 
             state._fsp--;
@@ -68142,21 +68142,21 @@ public final void rule__JvmLowerBoundAnded__Group__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23693:1: rule__QualifiedNameWithWildcard__Group__0 : rule__QualifiedNameWithWildcard__Group__0__Impl rule__QualifiedNameWithWildcard__Group__1 ;
+    // InternalFormat.g:23693:1: rule__QualifiedNameWithWildcard__Group__0 : rule__QualifiedNameWithWildcard__Group__0__Impl rule__QualifiedNameWithWildcard__Group__1 ;
     public final void rule__QualifiedNameWithWildcard__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23697:1: ( rule__QualifiedNameWithWildcard__Group__0__Impl rule__QualifiedNameWithWildcard__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23698:2: rule__QualifiedNameWithWildcard__Group__0__Impl rule__QualifiedNameWithWildcard__Group__1
+            // InternalFormat.g:23697:1: ( rule__QualifiedNameWithWildcard__Group__0__Impl rule__QualifiedNameWithWildcard__Group__1 )
+            // InternalFormat.g:23698:2: rule__QualifiedNameWithWildcard__Group__0__Impl rule__QualifiedNameWithWildcard__Group__1
             {
-            pushFollow(FOLLOW_rule__QualifiedNameWithWildcard__Group__0__Impl_in_rule__QualifiedNameWithWildcard__Group__047779);
+            pushFollow(FOLLOW_35);
             rule__QualifiedNameWithWildcard__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__QualifiedNameWithWildcard__Group__1_in_rule__QualifiedNameWithWildcard__Group__047782);
+            pushFollow(FOLLOW_2);
             rule__QualifiedNameWithWildcard__Group__1();
 
             state._fsp--;
@@ -68180,22 +68180,22 @@ public final void rule__QualifiedNameWithWildcard__Group__0() throws Recognition
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23705:1: rule__QualifiedNameWithWildcard__Group__0__Impl : ( ruleQualifiedName ) ;
+    // InternalFormat.g:23705:1: rule__QualifiedNameWithWildcard__Group__0__Impl : ( ruleQualifiedName ) ;
     public final void rule__QualifiedNameWithWildcard__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23709:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23710:1: ( ruleQualifiedName )
+            // InternalFormat.g:23709:1: ( ( ruleQualifiedName ) )
+            // InternalFormat.g:23710:1: ( ruleQualifiedName )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23710:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23711:1: ruleQualifiedName
+            // InternalFormat.g:23710:1: ( ruleQualifiedName )
+            // InternalFormat.g:23711:1: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameWithWildcardAccess().getQualifiedNameParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_rule__QualifiedNameWithWildcard__Group__0__Impl47809);
+            pushFollow(FOLLOW_2);
             ruleQualifiedName();
 
             state._fsp--;
@@ -68225,21 +68225,21 @@ public final void rule__QualifiedNameWithWildcard__Group__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23722:1: rule__QualifiedNameWithWildcard__Group__1 : rule__QualifiedNameWithWildcard__Group__1__Impl rule__QualifiedNameWithWildcard__Group__2 ;
+    // InternalFormat.g:23722:1: rule__QualifiedNameWithWildcard__Group__1 : rule__QualifiedNameWithWildcard__Group__1__Impl rule__QualifiedNameWithWildcard__Group__2 ;
     public final void rule__QualifiedNameWithWildcard__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23726:1: ( rule__QualifiedNameWithWildcard__Group__1__Impl rule__QualifiedNameWithWildcard__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23727:2: rule__QualifiedNameWithWildcard__Group__1__Impl rule__QualifiedNameWithWildcard__Group__2
+            // InternalFormat.g:23726:1: ( rule__QualifiedNameWithWildcard__Group__1__Impl rule__QualifiedNameWithWildcard__Group__2 )
+            // InternalFormat.g:23727:2: rule__QualifiedNameWithWildcard__Group__1__Impl rule__QualifiedNameWithWildcard__Group__2
             {
-            pushFollow(FOLLOW_rule__QualifiedNameWithWildcard__Group__1__Impl_in_rule__QualifiedNameWithWildcard__Group__147838);
+            pushFollow(FOLLOW_128);
             rule__QualifiedNameWithWildcard__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__QualifiedNameWithWildcard__Group__2_in_rule__QualifiedNameWithWildcard__Group__147841);
+            pushFollow(FOLLOW_2);
             rule__QualifiedNameWithWildcard__Group__2();
 
             state._fsp--;
@@ -68263,22 +68263,22 @@ public final void rule__QualifiedNameWithWildcard__Group__1() throws Recognition
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23734:1: rule__QualifiedNameWithWildcard__Group__1__Impl : ( '.' ) ;
+    // InternalFormat.g:23734:1: rule__QualifiedNameWithWildcard__Group__1__Impl : ( '.' ) ;
     public final void rule__QualifiedNameWithWildcard__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23738:1: ( ( '.' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23739:1: ( '.' )
+            // InternalFormat.g:23738:1: ( ( '.' ) )
+            // InternalFormat.g:23739:1: ( '.' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23739:1: ( '.' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23740:1: '.'
+            // InternalFormat.g:23739:1: ( '.' )
+            // InternalFormat.g:23740:1: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameWithWildcardAccess().getFullStopKeyword_1()); 
             }
-            match(input,49,FOLLOW_49_in_rule__QualifiedNameWithWildcard__Group__1__Impl47869); if (state.failed) return ;
+            match(input,49,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getQualifiedNameWithWildcardAccess().getFullStopKeyword_1()); 
             }
@@ -68304,16 +68304,16 @@ public final void rule__QualifiedNameWithWildcard__Group__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23753:1: rule__QualifiedNameWithWildcard__Group__2 : rule__QualifiedNameWithWildcard__Group__2__Impl ;
+    // InternalFormat.g:23753:1: rule__QualifiedNameWithWildcard__Group__2 : rule__QualifiedNameWithWildcard__Group__2__Impl ;
     public final void rule__QualifiedNameWithWildcard__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23757:1: ( rule__QualifiedNameWithWildcard__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23758:2: rule__QualifiedNameWithWildcard__Group__2__Impl
+            // InternalFormat.g:23757:1: ( rule__QualifiedNameWithWildcard__Group__2__Impl )
+            // InternalFormat.g:23758:2: rule__QualifiedNameWithWildcard__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__QualifiedNameWithWildcard__Group__2__Impl_in_rule__QualifiedNameWithWildcard__Group__247900);
+            pushFollow(FOLLOW_2);
             rule__QualifiedNameWithWildcard__Group__2__Impl();
 
             state._fsp--;
@@ -68337,22 +68337,22 @@ public final void rule__QualifiedNameWithWildcard__Group__2() throws Recognition
 
 
     // $ANTLR start "rule__QualifiedNameWithWildcard__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23764:1: rule__QualifiedNameWithWildcard__Group__2__Impl : ( '*' ) ;
+    // InternalFormat.g:23764:1: rule__QualifiedNameWithWildcard__Group__2__Impl : ( '*' ) ;
     public final void rule__QualifiedNameWithWildcard__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23768:1: ( ( '*' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23769:1: ( '*' )
+            // InternalFormat.g:23768:1: ( ( '*' ) )
+            // InternalFormat.g:23769:1: ( '*' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23769:1: ( '*' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23770:1: '*'
+            // InternalFormat.g:23769:1: ( '*' )
+            // InternalFormat.g:23770:1: '*'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameWithWildcardAccess().getAsteriskKeyword_2()); 
             }
-            match(input,42,FOLLOW_42_in_rule__QualifiedNameWithWildcard__Group__2__Impl47928); if (state.failed) return ;
+            match(input,42,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getQualifiedNameWithWildcardAccess().getAsteriskKeyword_2()); 
             }
@@ -68378,21 +68378,21 @@ public final void rule__QualifiedNameWithWildcard__Group__2__Impl() throws Recog
 
 
     // $ANTLR start "rule__XImportDeclaration__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23789:1: rule__XImportDeclaration__Group__0 : rule__XImportDeclaration__Group__0__Impl rule__XImportDeclaration__Group__1 ;
+    // InternalFormat.g:23789:1: rule__XImportDeclaration__Group__0 : rule__XImportDeclaration__Group__0__Impl rule__XImportDeclaration__Group__1 ;
     public final void rule__XImportDeclaration__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23793:1: ( rule__XImportDeclaration__Group__0__Impl rule__XImportDeclaration__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23794:2: rule__XImportDeclaration__Group__0__Impl rule__XImportDeclaration__Group__1
+            // InternalFormat.g:23793:1: ( rule__XImportDeclaration__Group__0__Impl rule__XImportDeclaration__Group__1 )
+            // InternalFormat.g:23794:2: rule__XImportDeclaration__Group__0__Impl rule__XImportDeclaration__Group__1
             {
-            pushFollow(FOLLOW_rule__XImportDeclaration__Group__0__Impl_in_rule__XImportDeclaration__Group__047965);
+            pushFollow(FOLLOW_129);
             rule__XImportDeclaration__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XImportDeclaration__Group__1_in_rule__XImportDeclaration__Group__047968);
+            pushFollow(FOLLOW_2);
             rule__XImportDeclaration__Group__1();
 
             state._fsp--;
@@ -68416,22 +68416,22 @@ public final void rule__XImportDeclaration__Group__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XImportDeclaration__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23801:1: rule__XImportDeclaration__Group__0__Impl : ( 'import' ) ;
+    // InternalFormat.g:23801:1: rule__XImportDeclaration__Group__0__Impl : ( 'import' ) ;
     public final void rule__XImportDeclaration__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23805:1: ( ( 'import' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23806:1: ( 'import' )
+            // InternalFormat.g:23805:1: ( ( 'import' ) )
+            // InternalFormat.g:23806:1: ( 'import' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23806:1: ( 'import' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23807:1: 'import'
+            // InternalFormat.g:23806:1: ( 'import' )
+            // InternalFormat.g:23807:1: 'import'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getImportKeyword_0()); 
             }
-            match(input,52,FOLLOW_52_in_rule__XImportDeclaration__Group__0__Impl47996); if (state.failed) return ;
+            match(input,52,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXImportDeclarationAccess().getImportKeyword_0()); 
             }
@@ -68457,21 +68457,21 @@ public final void rule__XImportDeclaration__Group__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XImportDeclaration__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23820:1: rule__XImportDeclaration__Group__1 : rule__XImportDeclaration__Group__1__Impl rule__XImportDeclaration__Group__2 ;
+    // InternalFormat.g:23820:1: rule__XImportDeclaration__Group__1 : rule__XImportDeclaration__Group__1__Impl rule__XImportDeclaration__Group__2 ;
     public final void rule__XImportDeclaration__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23824:1: ( rule__XImportDeclaration__Group__1__Impl rule__XImportDeclaration__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23825:2: rule__XImportDeclaration__Group__1__Impl rule__XImportDeclaration__Group__2
+            // InternalFormat.g:23824:1: ( rule__XImportDeclaration__Group__1__Impl rule__XImportDeclaration__Group__2 )
+            // InternalFormat.g:23825:2: rule__XImportDeclaration__Group__1__Impl rule__XImportDeclaration__Group__2
             {
-            pushFollow(FOLLOW_rule__XImportDeclaration__Group__1__Impl_in_rule__XImportDeclaration__Group__148027);
+            pushFollow(FOLLOW_11);
             rule__XImportDeclaration__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XImportDeclaration__Group__2_in_rule__XImportDeclaration__Group__148030);
+            pushFollow(FOLLOW_2);
             rule__XImportDeclaration__Group__2();
 
             state._fsp--;
@@ -68495,25 +68495,25 @@ public final void rule__XImportDeclaration__Group__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XImportDeclaration__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23832:1: rule__XImportDeclaration__Group__1__Impl : ( ( rule__XImportDeclaration__Alternatives_1 ) ) ;
+    // InternalFormat.g:23832:1: rule__XImportDeclaration__Group__1__Impl : ( ( rule__XImportDeclaration__Alternatives_1 ) ) ;
     public final void rule__XImportDeclaration__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23836:1: ( ( ( rule__XImportDeclaration__Alternatives_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23837:1: ( ( rule__XImportDeclaration__Alternatives_1 ) )
+            // InternalFormat.g:23836:1: ( ( ( rule__XImportDeclaration__Alternatives_1 ) ) )
+            // InternalFormat.g:23837:1: ( ( rule__XImportDeclaration__Alternatives_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23837:1: ( ( rule__XImportDeclaration__Alternatives_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23838:1: ( rule__XImportDeclaration__Alternatives_1 )
+            // InternalFormat.g:23837:1: ( ( rule__XImportDeclaration__Alternatives_1 ) )
+            // InternalFormat.g:23838:1: ( rule__XImportDeclaration__Alternatives_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getAlternatives_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23839:1: ( rule__XImportDeclaration__Alternatives_1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23839:2: rule__XImportDeclaration__Alternatives_1
+            // InternalFormat.g:23839:1: ( rule__XImportDeclaration__Alternatives_1 )
+            // InternalFormat.g:23839:2: rule__XImportDeclaration__Alternatives_1
             {
-            pushFollow(FOLLOW_rule__XImportDeclaration__Alternatives_1_in_rule__XImportDeclaration__Group__1__Impl48057);
+            pushFollow(FOLLOW_2);
             rule__XImportDeclaration__Alternatives_1();
 
             state._fsp--;
@@ -68546,16 +68546,16 @@ public final void rule__XImportDeclaration__Group__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XImportDeclaration__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23849:1: rule__XImportDeclaration__Group__2 : rule__XImportDeclaration__Group__2__Impl ;
+    // InternalFormat.g:23849:1: rule__XImportDeclaration__Group__2 : rule__XImportDeclaration__Group__2__Impl ;
     public final void rule__XImportDeclaration__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23853:1: ( rule__XImportDeclaration__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23854:2: rule__XImportDeclaration__Group__2__Impl
+            // InternalFormat.g:23853:1: ( rule__XImportDeclaration__Group__2__Impl )
+            // InternalFormat.g:23854:2: rule__XImportDeclaration__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__XImportDeclaration__Group__2__Impl_in_rule__XImportDeclaration__Group__248087);
+            pushFollow(FOLLOW_2);
             rule__XImportDeclaration__Group__2__Impl();
 
             state._fsp--;
@@ -68579,22 +68579,22 @@ public final void rule__XImportDeclaration__Group__2() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__XImportDeclaration__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23860:1: rule__XImportDeclaration__Group__2__Impl : ( ( ';' )? ) ;
+    // InternalFormat.g:23860:1: rule__XImportDeclaration__Group__2__Impl : ( ( ';' )? ) ;
     public final void rule__XImportDeclaration__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23864:1: ( ( ( ';' )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23865:1: ( ( ';' )? )
+            // InternalFormat.g:23864:1: ( ( ( ';' )? ) )
+            // InternalFormat.g:23865:1: ( ( ';' )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23865:1: ( ( ';' )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23866:1: ( ';' )?
+            // InternalFormat.g:23865:1: ( ( ';' )? )
+            // InternalFormat.g:23866:1: ( ';' )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getSemicolonKeyword_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23867:1: ( ';' )?
+            // InternalFormat.g:23867:1: ( ';' )?
             int alt176=2;
             int LA176_0 = input.LA(1);
 
@@ -68603,9 +68603,9 @@ public final void rule__XImportDeclaration__Group__2__Impl() throws RecognitionE
             }
             switch (alt176) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23868:2: ';'
+                    // InternalFormat.g:23868:2: ';'
                     {
-                    match(input,65,FOLLOW_65_in_rule__XImportDeclaration__Group__2__Impl48116); if (state.failed) return ;
+                    match(input,65,FOLLOW_2); if (state.failed) return ;
 
                     }
                     break;
@@ -68637,21 +68637,21 @@ public final void rule__XImportDeclaration__Group__2__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__XImportDeclaration__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23885:1: rule__XImportDeclaration__Group_1_0__0 : rule__XImportDeclaration__Group_1_0__0__Impl rule__XImportDeclaration__Group_1_0__1 ;
+    // InternalFormat.g:23885:1: rule__XImportDeclaration__Group_1_0__0 : rule__XImportDeclaration__Group_1_0__0__Impl rule__XImportDeclaration__Group_1_0__1 ;
     public final void rule__XImportDeclaration__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23889:1: ( rule__XImportDeclaration__Group_1_0__0__Impl rule__XImportDeclaration__Group_1_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23890:2: rule__XImportDeclaration__Group_1_0__0__Impl rule__XImportDeclaration__Group_1_0__1
+            // InternalFormat.g:23889:1: ( rule__XImportDeclaration__Group_1_0__0__Impl rule__XImportDeclaration__Group_1_0__1 )
+            // InternalFormat.g:23890:2: rule__XImportDeclaration__Group_1_0__0__Impl rule__XImportDeclaration__Group_1_0__1
             {
-            pushFollow(FOLLOW_rule__XImportDeclaration__Group_1_0__0__Impl_in_rule__XImportDeclaration__Group_1_0__048155);
+            pushFollow(FOLLOW_130);
             rule__XImportDeclaration__Group_1_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XImportDeclaration__Group_1_0__1_in_rule__XImportDeclaration__Group_1_0__048158);
+            pushFollow(FOLLOW_2);
             rule__XImportDeclaration__Group_1_0__1();
 
             state._fsp--;
@@ -68675,25 +68675,25 @@ public final void rule__XImportDeclaration__Group_1_0__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__XImportDeclaration__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23897:1: rule__XImportDeclaration__Group_1_0__0__Impl : ( ( rule__XImportDeclaration__StaticAssignment_1_0_0 ) ) ;
+    // InternalFormat.g:23897:1: rule__XImportDeclaration__Group_1_0__0__Impl : ( ( rule__XImportDeclaration__StaticAssignment_1_0_0 ) ) ;
     public final void rule__XImportDeclaration__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23901:1: ( ( ( rule__XImportDeclaration__StaticAssignment_1_0_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23902:1: ( ( rule__XImportDeclaration__StaticAssignment_1_0_0 ) )
+            // InternalFormat.g:23901:1: ( ( ( rule__XImportDeclaration__StaticAssignment_1_0_0 ) ) )
+            // InternalFormat.g:23902:1: ( ( rule__XImportDeclaration__StaticAssignment_1_0_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23902:1: ( ( rule__XImportDeclaration__StaticAssignment_1_0_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23903:1: ( rule__XImportDeclaration__StaticAssignment_1_0_0 )
+            // InternalFormat.g:23902:1: ( ( rule__XImportDeclaration__StaticAssignment_1_0_0 ) )
+            // InternalFormat.g:23903:1: ( rule__XImportDeclaration__StaticAssignment_1_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getStaticAssignment_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23904:1: ( rule__XImportDeclaration__StaticAssignment_1_0_0 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23904:2: rule__XImportDeclaration__StaticAssignment_1_0_0
+            // InternalFormat.g:23904:1: ( rule__XImportDeclaration__StaticAssignment_1_0_0 )
+            // InternalFormat.g:23904:2: rule__XImportDeclaration__StaticAssignment_1_0_0
             {
-            pushFollow(FOLLOW_rule__XImportDeclaration__StaticAssignment_1_0_0_in_rule__XImportDeclaration__Group_1_0__0__Impl48185);
+            pushFollow(FOLLOW_2);
             rule__XImportDeclaration__StaticAssignment_1_0_0();
 
             state._fsp--;
@@ -68726,21 +68726,21 @@ public final void rule__XImportDeclaration__Group_1_0__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XImportDeclaration__Group_1_0__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23914:1: rule__XImportDeclaration__Group_1_0__1 : rule__XImportDeclaration__Group_1_0__1__Impl rule__XImportDeclaration__Group_1_0__2 ;
+    // InternalFormat.g:23914:1: rule__XImportDeclaration__Group_1_0__1 : rule__XImportDeclaration__Group_1_0__1__Impl rule__XImportDeclaration__Group_1_0__2 ;
     public final void rule__XImportDeclaration__Group_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23918:1: ( rule__XImportDeclaration__Group_1_0__1__Impl rule__XImportDeclaration__Group_1_0__2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23919:2: rule__XImportDeclaration__Group_1_0__1__Impl rule__XImportDeclaration__Group_1_0__2
+            // InternalFormat.g:23918:1: ( rule__XImportDeclaration__Group_1_0__1__Impl rule__XImportDeclaration__Group_1_0__2 )
+            // InternalFormat.g:23919:2: rule__XImportDeclaration__Group_1_0__1__Impl rule__XImportDeclaration__Group_1_0__2
             {
-            pushFollow(FOLLOW_rule__XImportDeclaration__Group_1_0__1__Impl_in_rule__XImportDeclaration__Group_1_0__148215);
+            pushFollow(FOLLOW_130);
             rule__XImportDeclaration__Group_1_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XImportDeclaration__Group_1_0__2_in_rule__XImportDeclaration__Group_1_0__148218);
+            pushFollow(FOLLOW_2);
             rule__XImportDeclaration__Group_1_0__2();
 
             state._fsp--;
@@ -68764,22 +68764,22 @@ public final void rule__XImportDeclaration__Group_1_0__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__XImportDeclaration__Group_1_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23926:1: rule__XImportDeclaration__Group_1_0__1__Impl : ( ( rule__XImportDeclaration__ExtensionAssignment_1_0_1 )? ) ;
+    // InternalFormat.g:23926:1: rule__XImportDeclaration__Group_1_0__1__Impl : ( ( rule__XImportDeclaration__ExtensionAssignment_1_0_1 )? ) ;
     public final void rule__XImportDeclaration__Group_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23930:1: ( ( ( rule__XImportDeclaration__ExtensionAssignment_1_0_1 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23931:1: ( ( rule__XImportDeclaration__ExtensionAssignment_1_0_1 )? )
+            // InternalFormat.g:23930:1: ( ( ( rule__XImportDeclaration__ExtensionAssignment_1_0_1 )? ) )
+            // InternalFormat.g:23931:1: ( ( rule__XImportDeclaration__ExtensionAssignment_1_0_1 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23931:1: ( ( rule__XImportDeclaration__ExtensionAssignment_1_0_1 )? )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23932:1: ( rule__XImportDeclaration__ExtensionAssignment_1_0_1 )?
+            // InternalFormat.g:23931:1: ( ( rule__XImportDeclaration__ExtensionAssignment_1_0_1 )? )
+            // InternalFormat.g:23932:1: ( rule__XImportDeclaration__ExtensionAssignment_1_0_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getExtensionAssignment_1_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23933:1: ( rule__XImportDeclaration__ExtensionAssignment_1_0_1 )?
+            // InternalFormat.g:23933:1: ( rule__XImportDeclaration__ExtensionAssignment_1_0_1 )?
             int alt177=2;
             int LA177_0 = input.LA(1);
 
@@ -68788,9 +68788,9 @@ public final void rule__XImportDeclaration__Group_1_0__1__Impl() throws Recognit
             }
             switch (alt177) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23933:2: rule__XImportDeclaration__ExtensionAssignment_1_0_1
+                    // InternalFormat.g:23933:2: rule__XImportDeclaration__ExtensionAssignment_1_0_1
                     {
-                    pushFollow(FOLLOW_rule__XImportDeclaration__ExtensionAssignment_1_0_1_in_rule__XImportDeclaration__Group_1_0__1__Impl48245);
+                    pushFollow(FOLLOW_2);
                     rule__XImportDeclaration__ExtensionAssignment_1_0_1();
 
                     state._fsp--;
@@ -68826,21 +68826,21 @@ public final void rule__XImportDeclaration__Group_1_0__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XImportDeclaration__Group_1_0__2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23943:1: rule__XImportDeclaration__Group_1_0__2 : rule__XImportDeclaration__Group_1_0__2__Impl rule__XImportDeclaration__Group_1_0__3 ;
+    // InternalFormat.g:23943:1: rule__XImportDeclaration__Group_1_0__2 : rule__XImportDeclaration__Group_1_0__2__Impl rule__XImportDeclaration__Group_1_0__3 ;
     public final void rule__XImportDeclaration__Group_1_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23947:1: ( rule__XImportDeclaration__Group_1_0__2__Impl rule__XImportDeclaration__Group_1_0__3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23948:2: rule__XImportDeclaration__Group_1_0__2__Impl rule__XImportDeclaration__Group_1_0__3
+            // InternalFormat.g:23947:1: ( rule__XImportDeclaration__Group_1_0__2__Impl rule__XImportDeclaration__Group_1_0__3 )
+            // InternalFormat.g:23948:2: rule__XImportDeclaration__Group_1_0__2__Impl rule__XImportDeclaration__Group_1_0__3
             {
-            pushFollow(FOLLOW_rule__XImportDeclaration__Group_1_0__2__Impl_in_rule__XImportDeclaration__Group_1_0__248276);
+            pushFollow(FOLLOW_131);
             rule__XImportDeclaration__Group_1_0__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__XImportDeclaration__Group_1_0__3_in_rule__XImportDeclaration__Group_1_0__248279);
+            pushFollow(FOLLOW_2);
             rule__XImportDeclaration__Group_1_0__3();
 
             state._fsp--;
@@ -68864,25 +68864,25 @@ public final void rule__XImportDeclaration__Group_1_0__2() throws RecognitionExc
 
 
     // $ANTLR start "rule__XImportDeclaration__Group_1_0__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23955:1: rule__XImportDeclaration__Group_1_0__2__Impl : ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_0_2 ) ) ;
+    // InternalFormat.g:23955:1: rule__XImportDeclaration__Group_1_0__2__Impl : ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_0_2 ) ) ;
     public final void rule__XImportDeclaration__Group_1_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23959:1: ( ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_0_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23960:1: ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_0_2 ) )
+            // InternalFormat.g:23959:1: ( ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_0_2 ) ) )
+            // InternalFormat.g:23960:1: ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_0_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23960:1: ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_0_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23961:1: ( rule__XImportDeclaration__ImportedTypeAssignment_1_0_2 )
+            // InternalFormat.g:23960:1: ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_0_2 ) )
+            // InternalFormat.g:23961:1: ( rule__XImportDeclaration__ImportedTypeAssignment_1_0_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getImportedTypeAssignment_1_0_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23962:1: ( rule__XImportDeclaration__ImportedTypeAssignment_1_0_2 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23962:2: rule__XImportDeclaration__ImportedTypeAssignment_1_0_2
+            // InternalFormat.g:23962:1: ( rule__XImportDeclaration__ImportedTypeAssignment_1_0_2 )
+            // InternalFormat.g:23962:2: rule__XImportDeclaration__ImportedTypeAssignment_1_0_2
             {
-            pushFollow(FOLLOW_rule__XImportDeclaration__ImportedTypeAssignment_1_0_2_in_rule__XImportDeclaration__Group_1_0__2__Impl48306);
+            pushFollow(FOLLOW_2);
             rule__XImportDeclaration__ImportedTypeAssignment_1_0_2();
 
             state._fsp--;
@@ -68915,16 +68915,16 @@ public final void rule__XImportDeclaration__Group_1_0__2__Impl() throws Recognit
 
 
     // $ANTLR start "rule__XImportDeclaration__Group_1_0__3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23972:1: rule__XImportDeclaration__Group_1_0__3 : rule__XImportDeclaration__Group_1_0__3__Impl ;
+    // InternalFormat.g:23972:1: rule__XImportDeclaration__Group_1_0__3 : rule__XImportDeclaration__Group_1_0__3__Impl ;
     public final void rule__XImportDeclaration__Group_1_0__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23976:1: ( rule__XImportDeclaration__Group_1_0__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23977:2: rule__XImportDeclaration__Group_1_0__3__Impl
+            // InternalFormat.g:23976:1: ( rule__XImportDeclaration__Group_1_0__3__Impl )
+            // InternalFormat.g:23977:2: rule__XImportDeclaration__Group_1_0__3__Impl
             {
-            pushFollow(FOLLOW_rule__XImportDeclaration__Group_1_0__3__Impl_in_rule__XImportDeclaration__Group_1_0__348336);
+            pushFollow(FOLLOW_2);
             rule__XImportDeclaration__Group_1_0__3__Impl();
 
             state._fsp--;
@@ -68948,25 +68948,25 @@ public final void rule__XImportDeclaration__Group_1_0__3() throws RecognitionExc
 
 
     // $ANTLR start "rule__XImportDeclaration__Group_1_0__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23983:1: rule__XImportDeclaration__Group_1_0__3__Impl : ( ( rule__XImportDeclaration__Alternatives_1_0_3 ) ) ;
+    // InternalFormat.g:23983:1: rule__XImportDeclaration__Group_1_0__3__Impl : ( ( rule__XImportDeclaration__Alternatives_1_0_3 ) ) ;
     public final void rule__XImportDeclaration__Group_1_0__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23987:1: ( ( ( rule__XImportDeclaration__Alternatives_1_0_3 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23988:1: ( ( rule__XImportDeclaration__Alternatives_1_0_3 ) )
+            // InternalFormat.g:23987:1: ( ( ( rule__XImportDeclaration__Alternatives_1_0_3 ) ) )
+            // InternalFormat.g:23988:1: ( ( rule__XImportDeclaration__Alternatives_1_0_3 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23988:1: ( ( rule__XImportDeclaration__Alternatives_1_0_3 ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23989:1: ( rule__XImportDeclaration__Alternatives_1_0_3 )
+            // InternalFormat.g:23988:1: ( ( rule__XImportDeclaration__Alternatives_1_0_3 ) )
+            // InternalFormat.g:23989:1: ( rule__XImportDeclaration__Alternatives_1_0_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getAlternatives_1_0_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23990:1: ( rule__XImportDeclaration__Alternatives_1_0_3 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:23990:2: rule__XImportDeclaration__Alternatives_1_0_3
+            // InternalFormat.g:23990:1: ( rule__XImportDeclaration__Alternatives_1_0_3 )
+            // InternalFormat.g:23990:2: rule__XImportDeclaration__Alternatives_1_0_3
             {
-            pushFollow(FOLLOW_rule__XImportDeclaration__Alternatives_1_0_3_in_rule__XImportDeclaration__Group_1_0__3__Impl48363);
+            pushFollow(FOLLOW_2);
             rule__XImportDeclaration__Alternatives_1_0_3();
 
             state._fsp--;
@@ -68999,21 +68999,21 @@ public final void rule__XImportDeclaration__Group_1_0__3__Impl() throws Recognit
 
 
     // $ANTLR start "rule__QualifiedNameInStaticImport__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24008:1: rule__QualifiedNameInStaticImport__Group__0 : rule__QualifiedNameInStaticImport__Group__0__Impl rule__QualifiedNameInStaticImport__Group__1 ;
+    // InternalFormat.g:24008:1: rule__QualifiedNameInStaticImport__Group__0 : rule__QualifiedNameInStaticImport__Group__0__Impl rule__QualifiedNameInStaticImport__Group__1 ;
     public final void rule__QualifiedNameInStaticImport__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24012:1: ( rule__QualifiedNameInStaticImport__Group__0__Impl rule__QualifiedNameInStaticImport__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24013:2: rule__QualifiedNameInStaticImport__Group__0__Impl rule__QualifiedNameInStaticImport__Group__1
+            // InternalFormat.g:24012:1: ( rule__QualifiedNameInStaticImport__Group__0__Impl rule__QualifiedNameInStaticImport__Group__1 )
+            // InternalFormat.g:24013:2: rule__QualifiedNameInStaticImport__Group__0__Impl rule__QualifiedNameInStaticImport__Group__1
             {
-            pushFollow(FOLLOW_rule__QualifiedNameInStaticImport__Group__0__Impl_in_rule__QualifiedNameInStaticImport__Group__048401);
+            pushFollow(FOLLOW_35);
             rule__QualifiedNameInStaticImport__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__QualifiedNameInStaticImport__Group__1_in_rule__QualifiedNameInStaticImport__Group__048404);
+            pushFollow(FOLLOW_2);
             rule__QualifiedNameInStaticImport__Group__1();
 
             state._fsp--;
@@ -69037,22 +69037,22 @@ public final void rule__QualifiedNameInStaticImport__Group__0() throws Recogniti
 
 
     // $ANTLR start "rule__QualifiedNameInStaticImport__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24020:1: rule__QualifiedNameInStaticImport__Group__0__Impl : ( ruleValidID ) ;
+    // InternalFormat.g:24020:1: rule__QualifiedNameInStaticImport__Group__0__Impl : ( ruleValidID ) ;
     public final void rule__QualifiedNameInStaticImport__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24024:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24025:1: ( ruleValidID )
+            // InternalFormat.g:24024:1: ( ( ruleValidID ) )
+            // InternalFormat.g:24025:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24025:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24026:1: ruleValidID
+            // InternalFormat.g:24025:1: ( ruleValidID )
+            // InternalFormat.g:24026:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameInStaticImportAccess().getValidIDParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__QualifiedNameInStaticImport__Group__0__Impl48431);
+            pushFollow(FOLLOW_2);
             ruleValidID();
 
             state._fsp--;
@@ -69082,16 +69082,16 @@ public final void rule__QualifiedNameInStaticImport__Group__0__Impl() throws Rec
 
 
     // $ANTLR start "rule__QualifiedNameInStaticImport__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24037:1: rule__QualifiedNameInStaticImport__Group__1 : rule__QualifiedNameInStaticImport__Group__1__Impl ;
+    // InternalFormat.g:24037:1: rule__QualifiedNameInStaticImport__Group__1 : rule__QualifiedNameInStaticImport__Group__1__Impl ;
     public final void rule__QualifiedNameInStaticImport__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24041:1: ( rule__QualifiedNameInStaticImport__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24042:2: rule__QualifiedNameInStaticImport__Group__1__Impl
+            // InternalFormat.g:24041:1: ( rule__QualifiedNameInStaticImport__Group__1__Impl )
+            // InternalFormat.g:24042:2: rule__QualifiedNameInStaticImport__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__QualifiedNameInStaticImport__Group__1__Impl_in_rule__QualifiedNameInStaticImport__Group__148460);
+            pushFollow(FOLLOW_2);
             rule__QualifiedNameInStaticImport__Group__1__Impl();
 
             state._fsp--;
@@ -69115,22 +69115,22 @@ public final void rule__QualifiedNameInStaticImport__Group__1() throws Recogniti
 
 
     // $ANTLR start "rule__QualifiedNameInStaticImport__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24048:1: rule__QualifiedNameInStaticImport__Group__1__Impl : ( '.' ) ;
+    // InternalFormat.g:24048:1: rule__QualifiedNameInStaticImport__Group__1__Impl : ( '.' ) ;
     public final void rule__QualifiedNameInStaticImport__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24052:1: ( ( '.' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24053:1: ( '.' )
+            // InternalFormat.g:24052:1: ( ( '.' ) )
+            // InternalFormat.g:24053:1: ( '.' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24053:1: ( '.' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24054:1: '.'
+            // InternalFormat.g:24053:1: ( '.' )
+            // InternalFormat.g:24054:1: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameInStaticImportAccess().getFullStopKeyword_1()); 
             }
-            match(input,49,FOLLOW_49_in_rule__QualifiedNameInStaticImport__Group__1__Impl48488); if (state.failed) return ;
+            match(input,49,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getQualifiedNameInStaticImportAccess().getFullStopKeyword_1()); 
             }
@@ -69156,28 +69156,28 @@ public final void rule__QualifiedNameInStaticImport__Group__1__Impl() throws Rec
 
 
     // $ANTLR start "rule__FormatConfiguration__TargetGrammarAssignment_2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24072:1: rule__FormatConfiguration__TargetGrammarAssignment_2 : ( ( ruleDottedID ) ) ;
+    // InternalFormat.g:24072:1: rule__FormatConfiguration__TargetGrammarAssignment_2 : ( ( ruleDottedID ) ) ;
     public final void rule__FormatConfiguration__TargetGrammarAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24076:1: ( ( ( ruleDottedID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24077:1: ( ( ruleDottedID ) )
+            // InternalFormat.g:24076:1: ( ( ( ruleDottedID ) ) )
+            // InternalFormat.g:24077:1: ( ( ruleDottedID ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24077:1: ( ( ruleDottedID ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24078:1: ( ruleDottedID )
+            // InternalFormat.g:24077:1: ( ( ruleDottedID ) )
+            // InternalFormat.g:24078:1: ( ruleDottedID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormatConfigurationAccess().getTargetGrammarGrammarCrossReference_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24079:1: ( ruleDottedID )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24080:1: ruleDottedID
+            // InternalFormat.g:24079:1: ( ruleDottedID )
+            // InternalFormat.g:24080:1: ruleDottedID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormatConfigurationAccess().getTargetGrammarGrammarDottedIDParserRuleCall_2_0_1()); 
             }
-            pushFollow(FOLLOW_ruleDottedID_in_rule__FormatConfiguration__TargetGrammarAssignment_248532);
+            pushFollow(FOLLOW_2);
             ruleDottedID();
 
             state._fsp--;
@@ -69213,28 +69213,28 @@ public final void rule__FormatConfiguration__TargetGrammarAssignment_2() throws
 
 
     // $ANTLR start "rule__FormatConfiguration__ExtendedFormatConfigurationAssignment_3_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24091:1: rule__FormatConfiguration__ExtendedFormatConfigurationAssignment_3_1 : ( ( ruleDottedID ) ) ;
+    // InternalFormat.g:24091:1: rule__FormatConfiguration__ExtendedFormatConfigurationAssignment_3_1 : ( ( ruleDottedID ) ) ;
     public final void rule__FormatConfiguration__ExtendedFormatConfigurationAssignment_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24095:1: ( ( ( ruleDottedID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24096:1: ( ( ruleDottedID ) )
+            // InternalFormat.g:24095:1: ( ( ( ruleDottedID ) ) )
+            // InternalFormat.g:24096:1: ( ( ruleDottedID ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24096:1: ( ( ruleDottedID ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24097:1: ( ruleDottedID )
+            // InternalFormat.g:24096:1: ( ( ruleDottedID ) )
+            // InternalFormat.g:24097:1: ( ruleDottedID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormatConfigurationAccess().getExtendedFormatConfigurationFormatConfigurationCrossReference_3_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24098:1: ( ruleDottedID )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24099:1: ruleDottedID
+            // InternalFormat.g:24098:1: ( ruleDottedID )
+            // InternalFormat.g:24099:1: ruleDottedID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormatConfigurationAccess().getExtendedFormatConfigurationFormatConfigurationDottedIDParserRuleCall_3_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleDottedID_in_rule__FormatConfiguration__ExtendedFormatConfigurationAssignment_3_148571);
+            pushFollow(FOLLOW_2);
             ruleDottedID();
 
             state._fsp--;
@@ -69270,28 +69270,28 @@ public final void rule__FormatConfiguration__ExtendedFormatConfigurationAssignme
 
 
     // $ANTLR start "rule__FormatConfiguration__FormatterBaseClassAssignment_4_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24110:1: rule__FormatConfiguration__FormatterBaseClassAssignment_4_1 : ( ( ruleQualifiedName ) ) ;
+    // InternalFormat.g:24110:1: rule__FormatConfiguration__FormatterBaseClassAssignment_4_1 : ( ( ruleQualifiedName ) ) ;
     public final void rule__FormatConfiguration__FormatterBaseClassAssignment_4_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24114:1: ( ( ( ruleQualifiedName ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24115:1: ( ( ruleQualifiedName ) )
+            // InternalFormat.g:24114:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalFormat.g:24115:1: ( ( ruleQualifiedName ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24115:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24116:1: ( ruleQualifiedName )
+            // InternalFormat.g:24115:1: ( ( ruleQualifiedName ) )
+            // InternalFormat.g:24116:1: ( ruleQualifiedName )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormatConfigurationAccess().getFormatterBaseClassJvmDeclaredTypeCrossReference_4_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24117:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24118:1: ruleQualifiedName
+            // InternalFormat.g:24117:1: ( ruleQualifiedName )
+            // InternalFormat.g:24118:1: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormatConfigurationAccess().getFormatterBaseClassJvmDeclaredTypeQualifiedNameParserRuleCall_4_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_rule__FormatConfiguration__FormatterBaseClassAssignment_4_148610);
+            pushFollow(FOLLOW_2);
             ruleQualifiedName();
 
             state._fsp--;
@@ -69327,22 +69327,22 @@ public final void rule__FormatConfiguration__FormatterBaseClassAssignment_4_1()
 
 
     // $ANTLR start "rule__FormatConfiguration__ConstantsAssignment_5_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24129:1: rule__FormatConfiguration__ConstantsAssignment_5_1 : ( ruleConstant ) ;
+    // InternalFormat.g:24129:1: rule__FormatConfiguration__ConstantsAssignment_5_1 : ( ruleConstant ) ;
     public final void rule__FormatConfiguration__ConstantsAssignment_5_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24133:1: ( ( ruleConstant ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24134:1: ( ruleConstant )
+            // InternalFormat.g:24133:1: ( ( ruleConstant ) )
+            // InternalFormat.g:24134:1: ( ruleConstant )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24134:1: ( ruleConstant )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24135:1: ruleConstant
+            // InternalFormat.g:24134:1: ( ruleConstant )
+            // InternalFormat.g:24135:1: ruleConstant
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormatConfigurationAccess().getConstantsConstantParserRuleCall_5_1_0()); 
             }
-            pushFollow(FOLLOW_ruleConstant_in_rule__FormatConfiguration__ConstantsAssignment_5_148645);
+            pushFollow(FOLLOW_2);
             ruleConstant();
 
             state._fsp--;
@@ -69372,22 +69372,22 @@ public final void rule__FormatConfiguration__ConstantsAssignment_5_1() throws Re
 
 
     // $ANTLR start "rule__FormatConfiguration__RulesAssignment_6"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24144:1: rule__FormatConfiguration__RulesAssignment_6 : ( ruleRule ) ;
+    // InternalFormat.g:24144:1: rule__FormatConfiguration__RulesAssignment_6 : ( ruleRule ) ;
     public final void rule__FormatConfiguration__RulesAssignment_6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24148:1: ( ( ruleRule ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24149:1: ( ruleRule )
+            // InternalFormat.g:24148:1: ( ( ruleRule ) )
+            // InternalFormat.g:24149:1: ( ruleRule )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24149:1: ( ruleRule )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24150:1: ruleRule
+            // InternalFormat.g:24149:1: ( ruleRule )
+            // InternalFormat.g:24150:1: ruleRule
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFormatConfigurationAccess().getRulesRuleParserRuleCall_6_0()); 
             }
-            pushFollow(FOLLOW_ruleRule_in_rule__FormatConfiguration__RulesAssignment_648676);
+            pushFollow(FOLLOW_2);
             ruleRule();
 
             state._fsp--;
@@ -69417,28 +69417,28 @@ public final void rule__FormatConfiguration__RulesAssignment_6() throws Recognit
 
 
     // $ANTLR start "rule__Constant__IntTypeAssignment_0_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24159:1: rule__Constant__IntTypeAssignment_0_0 : ( ( 'int' ) ) ;
+    // InternalFormat.g:24159:1: rule__Constant__IntTypeAssignment_0_0 : ( ( 'int' ) ) ;
     public final void rule__Constant__IntTypeAssignment_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24163:1: ( ( ( 'int' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24164:1: ( ( 'int' ) )
+            // InternalFormat.g:24163:1: ( ( ( 'int' ) ) )
+            // InternalFormat.g:24164:1: ( ( 'int' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24164:1: ( ( 'int' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24165:1: ( 'int' )
+            // InternalFormat.g:24164:1: ( ( 'int' ) )
+            // InternalFormat.g:24165:1: ( 'int' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConstantAccess().getIntTypeIntKeyword_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24166:1: ( 'int' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24167:1: 'int'
+            // InternalFormat.g:24166:1: ( 'int' )
+            // InternalFormat.g:24167:1: 'int'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConstantAccess().getIntTypeIntKeyword_0_0_0()); 
             }
-            match(input,104,FOLLOW_104_in_rule__Constant__IntTypeAssignment_0_048712); if (state.failed) return ;
+            match(input,104,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getConstantAccess().getIntTypeIntKeyword_0_0_0()); 
             }
@@ -69470,28 +69470,28 @@ public final void rule__Constant__IntTypeAssignment_0_0() throws RecognitionExce
 
 
     // $ANTLR start "rule__Constant__StringTypeAssignment_0_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24182:1: rule__Constant__StringTypeAssignment_0_1 : ( ( 'String' ) ) ;
+    // InternalFormat.g:24182:1: rule__Constant__StringTypeAssignment_0_1 : ( ( 'String' ) ) ;
     public final void rule__Constant__StringTypeAssignment_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24186:1: ( ( ( 'String' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24187:1: ( ( 'String' ) )
+            // InternalFormat.g:24186:1: ( ( ( 'String' ) ) )
+            // InternalFormat.g:24187:1: ( ( 'String' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24187:1: ( ( 'String' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24188:1: ( 'String' )
+            // InternalFormat.g:24187:1: ( ( 'String' ) )
+            // InternalFormat.g:24188:1: ( 'String' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConstantAccess().getStringTypeStringKeyword_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24189:1: ( 'String' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24190:1: 'String'
+            // InternalFormat.g:24189:1: ( 'String' )
+            // InternalFormat.g:24190:1: 'String'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConstantAccess().getStringTypeStringKeyword_0_1_0()); 
             }
-            match(input,105,FOLLOW_105_in_rule__Constant__StringTypeAssignment_0_148756); if (state.failed) return ;
+            match(input,105,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getConstantAccess().getStringTypeStringKeyword_0_1_0()); 
             }
@@ -69523,22 +69523,22 @@ public final void rule__Constant__StringTypeAssignment_0_1() throws RecognitionE
 
 
     // $ANTLR start "rule__Constant__NameAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24205:1: rule__Constant__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalFormat.g:24205:1: rule__Constant__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__Constant__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24209:1: ( ( RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24210:1: ( RULE_ID )
+            // InternalFormat.g:24209:1: ( ( RULE_ID ) )
+            // InternalFormat.g:24210:1: ( RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24210:1: ( RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24211:1: RULE_ID
+            // InternalFormat.g:24210:1: ( RULE_ID )
+            // InternalFormat.g:24211:1: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConstantAccess().getNameIDTerminalRuleCall_1_0()); 
             }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__Constant__NameAssignment_148795); if (state.failed) return ;
+            match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getConstantAccess().getNameIDTerminalRuleCall_1_0()); 
             }
@@ -69564,22 +69564,22 @@ public final void rule__Constant__NameAssignment_1() throws RecognitionException
 
 
     // $ANTLR start "rule__Constant__IntValueAssignment_3_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24220:1: rule__Constant__IntValueAssignment_3_0 : ( ruleIntObject ) ;
+    // InternalFormat.g:24220:1: rule__Constant__IntValueAssignment_3_0 : ( ruleIntObject ) ;
     public final void rule__Constant__IntValueAssignment_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24224:1: ( ( ruleIntObject ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24225:1: ( ruleIntObject )
+            // InternalFormat.g:24224:1: ( ( ruleIntObject ) )
+            // InternalFormat.g:24225:1: ( ruleIntObject )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24225:1: ( ruleIntObject )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24226:1: ruleIntObject
+            // InternalFormat.g:24225:1: ( ruleIntObject )
+            // InternalFormat.g:24226:1: ruleIntObject
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConstantAccess().getIntValueIntObjectParserRuleCall_3_0_0()); 
             }
-            pushFollow(FOLLOW_ruleIntObject_in_rule__Constant__IntValueAssignment_3_048826);
+            pushFollow(FOLLOW_2);
             ruleIntObject();
 
             state._fsp--;
@@ -69609,22 +69609,22 @@ public final void rule__Constant__IntValueAssignment_3_0() throws RecognitionExc
 
 
     // $ANTLR start "rule__Constant__StringValueAssignment_3_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24235:1: rule__Constant__StringValueAssignment_3_1 : ( RULE_STRING ) ;
+    // InternalFormat.g:24235:1: rule__Constant__StringValueAssignment_3_1 : ( RULE_STRING ) ;
     public final void rule__Constant__StringValueAssignment_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24239:1: ( ( RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24240:1: ( RULE_STRING )
+            // InternalFormat.g:24239:1: ( ( RULE_STRING ) )
+            // InternalFormat.g:24240:1: ( RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24240:1: ( RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24241:1: RULE_STRING
+            // InternalFormat.g:24240:1: ( RULE_STRING )
+            // InternalFormat.g:24241:1: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConstantAccess().getStringValueSTRINGTerminalRuleCall_3_1_0()); 
             }
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__Constant__StringValueAssignment_3_148857); if (state.failed) return ;
+            match(input,RULE_STRING,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getConstantAccess().getStringValueSTRINGTerminalRuleCall_3_1_0()); 
             }
@@ -69650,22 +69650,22 @@ public final void rule__Constant__StringValueAssignment_3_1() throws Recognition
 
 
     // $ANTLR start "rule__IntValue__LiteralAssignment_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24250:1: rule__IntValue__LiteralAssignment_0 : ( ruleIntObject ) ;
+    // InternalFormat.g:24250:1: rule__IntValue__LiteralAssignment_0 : ( ruleIntObject ) ;
     public final void rule__IntValue__LiteralAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24254:1: ( ( ruleIntObject ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24255:1: ( ruleIntObject )
+            // InternalFormat.g:24254:1: ( ( ruleIntObject ) )
+            // InternalFormat.g:24255:1: ( ruleIntObject )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24255:1: ( ruleIntObject )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24256:1: ruleIntObject
+            // InternalFormat.g:24255:1: ( ruleIntObject )
+            // InternalFormat.g:24256:1: ruleIntObject
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIntValueAccess().getLiteralIntObjectParserRuleCall_0_0()); 
             }
-            pushFollow(FOLLOW_ruleIntObject_in_rule__IntValue__LiteralAssignment_048888);
+            pushFollow(FOLLOW_2);
             ruleIntObject();
 
             state._fsp--;
@@ -69695,28 +69695,28 @@ public final void rule__IntValue__LiteralAssignment_0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__IntValue__ReferenceAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24265:1: rule__IntValue__ReferenceAssignment_1 : ( ( ruleDottedID ) ) ;
+    // InternalFormat.g:24265:1: rule__IntValue__ReferenceAssignment_1 : ( ( ruleDottedID ) ) ;
     public final void rule__IntValue__ReferenceAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24269:1: ( ( ( ruleDottedID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24270:1: ( ( ruleDottedID ) )
+            // InternalFormat.g:24269:1: ( ( ( ruleDottedID ) ) )
+            // InternalFormat.g:24270:1: ( ( ruleDottedID ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24270:1: ( ( ruleDottedID ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24271:1: ( ruleDottedID )
+            // InternalFormat.g:24270:1: ( ( ruleDottedID ) )
+            // InternalFormat.g:24271:1: ( ruleDottedID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIntValueAccess().getReferenceConstantCrossReference_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24272:1: ( ruleDottedID )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24273:1: ruleDottedID
+            // InternalFormat.g:24272:1: ( ruleDottedID )
+            // InternalFormat.g:24273:1: ruleDottedID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIntValueAccess().getReferenceConstantDottedIDParserRuleCall_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleDottedID_in_rule__IntValue__ReferenceAssignment_148923);
+            pushFollow(FOLLOW_2);
             ruleDottedID();
 
             state._fsp--;
@@ -69752,22 +69752,22 @@ public final void rule__IntValue__ReferenceAssignment_1() throws RecognitionExce
 
 
     // $ANTLR start "rule__StringValue__LiteralAssignment_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24284:1: rule__StringValue__LiteralAssignment_0 : ( RULE_STRING ) ;
+    // InternalFormat.g:24284:1: rule__StringValue__LiteralAssignment_0 : ( RULE_STRING ) ;
     public final void rule__StringValue__LiteralAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24288:1: ( ( RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24289:1: ( RULE_STRING )
+            // InternalFormat.g:24288:1: ( ( RULE_STRING ) )
+            // InternalFormat.g:24289:1: ( RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24289:1: ( RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24290:1: RULE_STRING
+            // InternalFormat.g:24289:1: ( RULE_STRING )
+            // InternalFormat.g:24290:1: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getStringValueAccess().getLiteralSTRINGTerminalRuleCall_0_0()); 
             }
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__StringValue__LiteralAssignment_048958); if (state.failed) return ;
+            match(input,RULE_STRING,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getStringValueAccess().getLiteralSTRINGTerminalRuleCall_0_0()); 
             }
@@ -69793,28 +69793,28 @@ public final void rule__StringValue__LiteralAssignment_0() throws RecognitionExc
 
 
     // $ANTLR start "rule__StringValue__ReferenceAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24299:1: rule__StringValue__ReferenceAssignment_1 : ( ( ruleDottedID ) ) ;
+    // InternalFormat.g:24299:1: rule__StringValue__ReferenceAssignment_1 : ( ( ruleDottedID ) ) ;
     public final void rule__StringValue__ReferenceAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24303:1: ( ( ( ruleDottedID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24304:1: ( ( ruleDottedID ) )
+            // InternalFormat.g:24303:1: ( ( ( ruleDottedID ) ) )
+            // InternalFormat.g:24304:1: ( ( ruleDottedID ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24304:1: ( ( ruleDottedID ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24305:1: ( ruleDottedID )
+            // InternalFormat.g:24304:1: ( ( ruleDottedID ) )
+            // InternalFormat.g:24305:1: ( ruleDottedID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getStringValueAccess().getReferenceConstantCrossReference_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24306:1: ( ruleDottedID )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24307:1: ruleDottedID
+            // InternalFormat.g:24306:1: ( ruleDottedID )
+            // InternalFormat.g:24307:1: ruleDottedID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getStringValueAccess().getReferenceConstantDottedIDParserRuleCall_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleDottedID_in_rule__StringValue__ReferenceAssignment_148993);
+            pushFollow(FOLLOW_2);
             ruleDottedID();
 
             state._fsp--;
@@ -69850,28 +69850,28 @@ public final void rule__StringValue__ReferenceAssignment_1() throws RecognitionE
 
 
     // $ANTLR start "rule__GrammarRule__OverrideAssignment_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24318:1: rule__GrammarRule__OverrideAssignment_0 : ( ( 'override' ) ) ;
+    // InternalFormat.g:24318:1: rule__GrammarRule__OverrideAssignment_0 : ( ( 'override' ) ) ;
     public final void rule__GrammarRule__OverrideAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24322:1: ( ( ( 'override' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24323:1: ( ( 'override' ) )
+            // InternalFormat.g:24322:1: ( ( ( 'override' ) ) )
+            // InternalFormat.g:24323:1: ( ( 'override' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24323:1: ( ( 'override' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24324:1: ( 'override' )
+            // InternalFormat.g:24323:1: ( ( 'override' ) )
+            // InternalFormat.g:24324:1: ( 'override' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGrammarRuleAccess().getOverrideOverrideKeyword_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24325:1: ( 'override' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24326:1: 'override'
+            // InternalFormat.g:24325:1: ( 'override' )
+            // InternalFormat.g:24326:1: 'override'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGrammarRuleAccess().getOverrideOverrideKeyword_0_0()); 
             }
-            match(input,106,FOLLOW_106_in_rule__GrammarRule__OverrideAssignment_049033); if (state.failed) return ;
+            match(input,106,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGrammarRuleAccess().getOverrideOverrideKeyword_0_0()); 
             }
@@ -69903,28 +69903,28 @@ public final void rule__GrammarRule__OverrideAssignment_0() throws RecognitionEx
 
 
     // $ANTLR start "rule__GrammarRule__TargetRuleAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24341:1: rule__GrammarRule__TargetRuleAssignment_1 : ( ( RULE_ID ) ) ;
+    // InternalFormat.g:24341:1: rule__GrammarRule__TargetRuleAssignment_1 : ( ( RULE_ID ) ) ;
     public final void rule__GrammarRule__TargetRuleAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24345:1: ( ( ( RULE_ID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24346:1: ( ( RULE_ID ) )
+            // InternalFormat.g:24345:1: ( ( ( RULE_ID ) ) )
+            // InternalFormat.g:24346:1: ( ( RULE_ID ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24346:1: ( ( RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24347:1: ( RULE_ID )
+            // InternalFormat.g:24346:1: ( ( RULE_ID ) )
+            // InternalFormat.g:24347:1: ( RULE_ID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGrammarRuleAccess().getTargetRuleAbstractRuleCrossReference_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24348:1: ( RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24349:1: RULE_ID
+            // InternalFormat.g:24348:1: ( RULE_ID )
+            // InternalFormat.g:24349:1: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGrammarRuleAccess().getTargetRuleAbstractRuleIDTerminalRuleCall_1_0_1()); 
             }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__GrammarRule__TargetRuleAssignment_149076); if (state.failed) return ;
+            match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGrammarRuleAccess().getTargetRuleAbstractRuleIDTerminalRuleCall_1_0_1()); 
             }
@@ -69956,22 +69956,22 @@ public final void rule__GrammarRule__TargetRuleAssignment_1() throws Recognition
 
 
     // $ANTLR start "rule__GrammarRule__DirectivesAssignment_3_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24360:1: rule__GrammarRule__DirectivesAssignment_3_0 : ( ruleGrammarRuleDirective ) ;
+    // InternalFormat.g:24360:1: rule__GrammarRule__DirectivesAssignment_3_0 : ( ruleGrammarRuleDirective ) ;
     public final void rule__GrammarRule__DirectivesAssignment_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24364:1: ( ( ruleGrammarRuleDirective ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24365:1: ( ruleGrammarRuleDirective )
+            // InternalFormat.g:24364:1: ( ( ruleGrammarRuleDirective ) )
+            // InternalFormat.g:24365:1: ( ruleGrammarRuleDirective )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24365:1: ( ruleGrammarRuleDirective )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24366:1: ruleGrammarRuleDirective
+            // InternalFormat.g:24365:1: ( ruleGrammarRuleDirective )
+            // InternalFormat.g:24366:1: ruleGrammarRuleDirective
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGrammarRuleAccess().getDirectivesGrammarRuleDirectiveParserRuleCall_3_0_0()); 
             }
-            pushFollow(FOLLOW_ruleGrammarRuleDirective_in_rule__GrammarRule__DirectivesAssignment_3_049111);
+            pushFollow(FOLLOW_2);
             ruleGrammarRuleDirective();
 
             state._fsp--;
@@ -70001,22 +70001,22 @@ public final void rule__GrammarRule__DirectivesAssignment_3_0() throws Recogniti
 
 
     // $ANTLR start "rule__GrammarRule__DirectivesAssignment_3_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24375:1: rule__GrammarRule__DirectivesAssignment_3_1 : ( ruleGroupBlock ) ;
+    // InternalFormat.g:24375:1: rule__GrammarRule__DirectivesAssignment_3_1 : ( ruleGroupBlock ) ;
     public final void rule__GrammarRule__DirectivesAssignment_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24379:1: ( ( ruleGroupBlock ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24380:1: ( ruleGroupBlock )
+            // InternalFormat.g:24379:1: ( ( ruleGroupBlock ) )
+            // InternalFormat.g:24380:1: ( ruleGroupBlock )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24380:1: ( ruleGroupBlock )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24381:1: ruleGroupBlock
+            // InternalFormat.g:24380:1: ( ruleGroupBlock )
+            // InternalFormat.g:24381:1: ruleGroupBlock
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGrammarRuleAccess().getDirectivesGroupBlockParserRuleCall_3_1_0()); 
             }
-            pushFollow(FOLLOW_ruleGroupBlock_in_rule__GrammarRule__DirectivesAssignment_3_149142);
+            pushFollow(FOLLOW_2);
             ruleGroupBlock();
 
             state._fsp--;
@@ -70046,28 +70046,28 @@ public final void rule__GrammarRule__DirectivesAssignment_3_1() throws Recogniti
 
 
     // $ANTLR start "rule__WildcardRule__OverrideAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24390:1: rule__WildcardRule__OverrideAssignment_1 : ( ( 'override' ) ) ;
+    // InternalFormat.g:24390:1: rule__WildcardRule__OverrideAssignment_1 : ( ( 'override' ) ) ;
     public final void rule__WildcardRule__OverrideAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24394:1: ( ( ( 'override' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24395:1: ( ( 'override' ) )
+            // InternalFormat.g:24394:1: ( ( ( 'override' ) ) )
+            // InternalFormat.g:24395:1: ( ( 'override' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24395:1: ( ( 'override' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24396:1: ( 'override' )
+            // InternalFormat.g:24395:1: ( ( 'override' ) )
+            // InternalFormat.g:24396:1: ( 'override' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getWildcardRuleAccess().getOverrideOverrideKeyword_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24397:1: ( 'override' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24398:1: 'override'
+            // InternalFormat.g:24397:1: ( 'override' )
+            // InternalFormat.g:24398:1: 'override'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getWildcardRuleAccess().getOverrideOverrideKeyword_1_0()); 
             }
-            match(input,106,FOLLOW_106_in_rule__WildcardRule__OverrideAssignment_149178); if (state.failed) return ;
+            match(input,106,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getWildcardRuleAccess().getOverrideOverrideKeyword_1_0()); 
             }
@@ -70099,22 +70099,22 @@ public final void rule__WildcardRule__OverrideAssignment_1() throws RecognitionE
 
 
     // $ANTLR start "rule__WildcardRule__DirectivesAssignment_4"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24413:1: rule__WildcardRule__DirectivesAssignment_4 : ( ruleWildcardRuleDirective ) ;
+    // InternalFormat.g:24413:1: rule__WildcardRule__DirectivesAssignment_4 : ( ruleWildcardRuleDirective ) ;
     public final void rule__WildcardRule__DirectivesAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24417:1: ( ( ruleWildcardRuleDirective ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24418:1: ( ruleWildcardRuleDirective )
+            // InternalFormat.g:24417:1: ( ( ruleWildcardRuleDirective ) )
+            // InternalFormat.g:24418:1: ( ruleWildcardRuleDirective )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24418:1: ( ruleWildcardRuleDirective )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24419:1: ruleWildcardRuleDirective
+            // InternalFormat.g:24418:1: ( ruleWildcardRuleDirective )
+            // InternalFormat.g:24419:1: ruleWildcardRuleDirective
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getWildcardRuleAccess().getDirectivesWildcardRuleDirectiveParserRuleCall_4_0()); 
             }
-            pushFollow(FOLLOW_ruleWildcardRuleDirective_in_rule__WildcardRule__DirectivesAssignment_449217);
+            pushFollow(FOLLOW_2);
             ruleWildcardRuleDirective();
 
             state._fsp--;
@@ -70144,28 +70144,28 @@ public final void rule__WildcardRule__DirectivesAssignment_4() throws Recognitio
 
 
     // $ANTLR start "rule__GrammarElementReference__AssignmentAssignment_0_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24428:1: rule__GrammarElementReference__AssignmentAssignment_0_1 : ( ( ruleParameterizedIdentifier ) ) ;
+    // InternalFormat.g:24428:1: rule__GrammarElementReference__AssignmentAssignment_0_1 : ( ( ruleParameterizedIdentifier ) ) ;
     public final void rule__GrammarElementReference__AssignmentAssignment_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24432:1: ( ( ( ruleParameterizedIdentifier ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24433:1: ( ( ruleParameterizedIdentifier ) )
+            // InternalFormat.g:24432:1: ( ( ( ruleParameterizedIdentifier ) ) )
+            // InternalFormat.g:24433:1: ( ( ruleParameterizedIdentifier ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24433:1: ( ( ruleParameterizedIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24434:1: ( ruleParameterizedIdentifier )
+            // InternalFormat.g:24433:1: ( ( ruleParameterizedIdentifier ) )
+            // InternalFormat.g:24434:1: ( ruleParameterizedIdentifier )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGrammarElementReferenceAccess().getAssignmentAssignmentCrossReference_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24435:1: ( ruleParameterizedIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24436:1: ruleParameterizedIdentifier
+            // InternalFormat.g:24435:1: ( ruleParameterizedIdentifier )
+            // InternalFormat.g:24436:1: ruleParameterizedIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGrammarElementReferenceAccess().getAssignmentAssignmentParameterizedIdentifierParserRuleCall_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleParameterizedIdentifier_in_rule__GrammarElementReference__AssignmentAssignment_0_149252);
+            pushFollow(FOLLOW_2);
             ruleParameterizedIdentifier();
 
             state._fsp--;
@@ -70201,28 +70201,28 @@ public final void rule__GrammarElementReference__AssignmentAssignment_0_1() thro
 
 
     // $ANTLR start "rule__GrammarElementReference__RuleCallAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24447:1: rule__GrammarElementReference__RuleCallAssignment_1_1 : ( ( ruleParameterizedIdentifier ) ) ;
+    // InternalFormat.g:24447:1: rule__GrammarElementReference__RuleCallAssignment_1_1 : ( ( ruleParameterizedIdentifier ) ) ;
     public final void rule__GrammarElementReference__RuleCallAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24451:1: ( ( ( ruleParameterizedIdentifier ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24452:1: ( ( ruleParameterizedIdentifier ) )
+            // InternalFormat.g:24451:1: ( ( ( ruleParameterizedIdentifier ) ) )
+            // InternalFormat.g:24452:1: ( ( ruleParameterizedIdentifier ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24452:1: ( ( ruleParameterizedIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24453:1: ( ruleParameterizedIdentifier )
+            // InternalFormat.g:24452:1: ( ( ruleParameterizedIdentifier ) )
+            // InternalFormat.g:24453:1: ( ruleParameterizedIdentifier )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGrammarElementReferenceAccess().getRuleCallRuleCallCrossReference_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24454:1: ( ruleParameterizedIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24455:1: ruleParameterizedIdentifier
+            // InternalFormat.g:24454:1: ( ruleParameterizedIdentifier )
+            // InternalFormat.g:24455:1: ruleParameterizedIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGrammarElementReferenceAccess().getRuleCallRuleCallParameterizedIdentifierParserRuleCall_1_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleParameterizedIdentifier_in_rule__GrammarElementReference__RuleCallAssignment_1_149291);
+            pushFollow(FOLLOW_2);
             ruleParameterizedIdentifier();
 
             state._fsp--;
@@ -70258,28 +70258,28 @@ public final void rule__GrammarElementReference__RuleCallAssignment_1_1() throws
 
 
     // $ANTLR start "rule__GrammarElementReference__SelfAssignment_2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24466:1: rule__GrammarElementReference__SelfAssignment_2 : ( ( ruleRuleSelfIdentifier ) ) ;
+    // InternalFormat.g:24466:1: rule__GrammarElementReference__SelfAssignment_2 : ( ( ruleRuleSelfIdentifier ) ) ;
     public final void rule__GrammarElementReference__SelfAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24470:1: ( ( ( ruleRuleSelfIdentifier ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24471:1: ( ( ruleRuleSelfIdentifier ) )
+            // InternalFormat.g:24470:1: ( ( ( ruleRuleSelfIdentifier ) ) )
+            // InternalFormat.g:24471:1: ( ( ruleRuleSelfIdentifier ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24471:1: ( ( ruleRuleSelfIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24472:1: ( ruleRuleSelfIdentifier )
+            // InternalFormat.g:24471:1: ( ( ruleRuleSelfIdentifier ) )
+            // InternalFormat.g:24472:1: ( ruleRuleSelfIdentifier )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGrammarElementReferenceAccess().getSelfAbstractRuleCrossReference_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24473:1: ( ruleRuleSelfIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24474:1: ruleRuleSelfIdentifier
+            // InternalFormat.g:24473:1: ( ruleRuleSelfIdentifier )
+            // InternalFormat.g:24474:1: ruleRuleSelfIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGrammarElementReferenceAccess().getSelfAbstractRuleRuleSelfIdentifierParserRuleCall_2_0_1()); 
             }
-            pushFollow(FOLLOW_ruleRuleSelfIdentifier_in_rule__GrammarElementReference__SelfAssignment_249330);
+            pushFollow(FOLLOW_2);
             ruleRuleSelfIdentifier();
 
             state._fsp--;
@@ -70315,28 +70315,28 @@ public final void rule__GrammarElementReference__SelfAssignment_2() throws Recog
 
 
     // $ANTLR start "rule__GrammarElementReference__RuleAssignment_3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24485:1: rule__GrammarElementReference__RuleAssignment_3 : ( ( ruleIdentifier ) ) ;
+    // InternalFormat.g:24485:1: rule__GrammarElementReference__RuleAssignment_3 : ( ( ruleIdentifier ) ) ;
     public final void rule__GrammarElementReference__RuleAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24489:1: ( ( ( ruleIdentifier ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24490:1: ( ( ruleIdentifier ) )
+            // InternalFormat.g:24489:1: ( ( ( ruleIdentifier ) ) )
+            // InternalFormat.g:24490:1: ( ( ruleIdentifier ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24490:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24491:1: ( ruleIdentifier )
+            // InternalFormat.g:24490:1: ( ( ruleIdentifier ) )
+            // InternalFormat.g:24491:1: ( ruleIdentifier )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGrammarElementReferenceAccess().getRuleAbstractRuleCrossReference_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24492:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24493:1: ruleIdentifier
+            // InternalFormat.g:24492:1: ( ruleIdentifier )
+            // InternalFormat.g:24493:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGrammarElementReferenceAccess().getRuleAbstractRuleIdentifierParserRuleCall_3_0_1()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__GrammarElementReference__RuleAssignment_349369);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -70372,28 +70372,28 @@ public final void rule__GrammarElementReference__RuleAssignment_3() throws Recog
 
 
     // $ANTLR start "rule__GrammarElementReference__KeywordAssignment_4"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24504:1: rule__GrammarElementReference__KeywordAssignment_4 : ( ( ruleParameterizedString ) ) ;
+    // InternalFormat.g:24504:1: rule__GrammarElementReference__KeywordAssignment_4 : ( ( ruleParameterizedString ) ) ;
     public final void rule__GrammarElementReference__KeywordAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24508:1: ( ( ( ruleParameterizedString ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24509:1: ( ( ruleParameterizedString ) )
+            // InternalFormat.g:24508:1: ( ( ( ruleParameterizedString ) ) )
+            // InternalFormat.g:24509:1: ( ( ruleParameterizedString ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24509:1: ( ( ruleParameterizedString ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24510:1: ( ruleParameterizedString )
+            // InternalFormat.g:24509:1: ( ( ruleParameterizedString ) )
+            // InternalFormat.g:24510:1: ( ruleParameterizedString )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGrammarElementReferenceAccess().getKeywordKeywordCrossReference_4_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24511:1: ( ruleParameterizedString )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24512:1: ruleParameterizedString
+            // InternalFormat.g:24511:1: ( ruleParameterizedString )
+            // InternalFormat.g:24512:1: ruleParameterizedString
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGrammarElementReferenceAccess().getKeywordKeywordParameterizedStringParserRuleCall_4_0_1()); 
             }
-            pushFollow(FOLLOW_ruleParameterizedString_in_rule__GrammarElementReference__KeywordAssignment_449408);
+            pushFollow(FOLLOW_2);
             ruleParameterizedString();
 
             state._fsp--;
@@ -70429,28 +70429,28 @@ public final void rule__GrammarElementReference__KeywordAssignment_4() throws Re
 
 
     // $ANTLR start "rule__GrammarElementLookup__RuleAssignment_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24523:1: rule__GrammarElementLookup__RuleAssignment_0 : ( ( ruleIdentifier ) ) ;
+    // InternalFormat.g:24523:1: rule__GrammarElementLookup__RuleAssignment_0 : ( ( ruleIdentifier ) ) ;
     public final void rule__GrammarElementLookup__RuleAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24527:1: ( ( ( ruleIdentifier ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24528:1: ( ( ruleIdentifier ) )
+            // InternalFormat.g:24527:1: ( ( ( ruleIdentifier ) ) )
+            // InternalFormat.g:24528:1: ( ( ruleIdentifier ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24528:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24529:1: ( ruleIdentifier )
+            // InternalFormat.g:24528:1: ( ( ruleIdentifier ) )
+            // InternalFormat.g:24529:1: ( ruleIdentifier )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGrammarElementLookupAccess().getRuleAbstractRuleCrossReference_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24530:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24531:1: ruleIdentifier
+            // InternalFormat.g:24530:1: ( ruleIdentifier )
+            // InternalFormat.g:24531:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGrammarElementLookupAccess().getRuleAbstractRuleIdentifierParserRuleCall_0_0_1()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__GrammarElementLookup__RuleAssignment_049447);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -70486,22 +70486,22 @@ public final void rule__GrammarElementLookup__RuleAssignment_0() throws Recognit
 
 
     // $ANTLR start "rule__GrammarElementLookup__KeywordAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24542:1: rule__GrammarElementLookup__KeywordAssignment_1 : ( RULE_STRING ) ;
+    // InternalFormat.g:24542:1: rule__GrammarElementLookup__KeywordAssignment_1 : ( RULE_STRING ) ;
     public final void rule__GrammarElementLookup__KeywordAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24546:1: ( ( RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24547:1: ( RULE_STRING )
+            // InternalFormat.g:24546:1: ( ( RULE_STRING ) )
+            // InternalFormat.g:24547:1: ( RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24547:1: ( RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24548:1: RULE_STRING
+            // InternalFormat.g:24547:1: ( RULE_STRING )
+            // InternalFormat.g:24548:1: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGrammarElementLookupAccess().getKeywordSTRINGTerminalRuleCall_1_0()); 
             }
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__GrammarElementLookup__KeywordAssignment_149482); if (state.failed) return ;
+            match(input,RULE_STRING,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGrammarElementLookupAccess().getKeywordSTRINGTerminalRuleCall_1_0()); 
             }
@@ -70527,22 +70527,22 @@ public final void rule__GrammarElementLookup__KeywordAssignment_1() throws Recog
 
 
     // $ANTLR start "rule__ContextFreeDirective__GrammarElementsAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24557:1: rule__ContextFreeDirective__GrammarElementsAssignment_1 : ( ruleGrammarElementLookup ) ;
+    // InternalFormat.g:24557:1: rule__ContextFreeDirective__GrammarElementsAssignment_1 : ( ruleGrammarElementLookup ) ;
     public final void rule__ContextFreeDirective__GrammarElementsAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24561:1: ( ( ruleGrammarElementLookup ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24562:1: ( ruleGrammarElementLookup )
+            // InternalFormat.g:24561:1: ( ( ruleGrammarElementLookup ) )
+            // InternalFormat.g:24562:1: ( ruleGrammarElementLookup )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24562:1: ( ruleGrammarElementLookup )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24563:1: ruleGrammarElementLookup
+            // InternalFormat.g:24562:1: ( ruleGrammarElementLookup )
+            // InternalFormat.g:24563:1: ruleGrammarElementLookup
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getContextFreeDirectiveAccess().getGrammarElementsGrammarElementLookupParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleGrammarElementLookup_in_rule__ContextFreeDirective__GrammarElementsAssignment_149513);
+            pushFollow(FOLLOW_2);
             ruleGrammarElementLookup();
 
             state._fsp--;
@@ -70572,22 +70572,22 @@ public final void rule__ContextFreeDirective__GrammarElementsAssignment_1() thro
 
 
     // $ANTLR start "rule__ContextFreeDirective__GrammarElementsAssignment_2_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24572:1: rule__ContextFreeDirective__GrammarElementsAssignment_2_1 : ( ruleGrammarElementLookup ) ;
+    // InternalFormat.g:24572:1: rule__ContextFreeDirective__GrammarElementsAssignment_2_1 : ( ruleGrammarElementLookup ) ;
     public final void rule__ContextFreeDirective__GrammarElementsAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24576:1: ( ( ruleGrammarElementLookup ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24577:1: ( ruleGrammarElementLookup )
+            // InternalFormat.g:24576:1: ( ( ruleGrammarElementLookup ) )
+            // InternalFormat.g:24577:1: ( ruleGrammarElementLookup )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24577:1: ( ruleGrammarElementLookup )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24578:1: ruleGrammarElementLookup
+            // InternalFormat.g:24577:1: ( ruleGrammarElementLookup )
+            // InternalFormat.g:24578:1: ruleGrammarElementLookup
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getContextFreeDirectiveAccess().getGrammarElementsGrammarElementLookupParserRuleCall_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleGrammarElementLookup_in_rule__ContextFreeDirective__GrammarElementsAssignment_2_149544);
+            pushFollow(FOLLOW_2);
             ruleGrammarElementLookup();
 
             state._fsp--;
@@ -70617,22 +70617,22 @@ public final void rule__ContextFreeDirective__GrammarElementsAssignment_2_1() th
 
 
     // $ANTLR start "rule__ContextFreeDirective__MatcherListAssignment_4"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24587:1: rule__ContextFreeDirective__MatcherListAssignment_4 : ( ruleMatcherList ) ;
+    // InternalFormat.g:24587:1: rule__ContextFreeDirective__MatcherListAssignment_4 : ( ruleMatcherList ) ;
     public final void rule__ContextFreeDirective__MatcherListAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24591:1: ( ( ruleMatcherList ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24592:1: ( ruleMatcherList )
+            // InternalFormat.g:24591:1: ( ( ruleMatcherList ) )
+            // InternalFormat.g:24592:1: ( ruleMatcherList )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24592:1: ( ruleMatcherList )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24593:1: ruleMatcherList
+            // InternalFormat.g:24592:1: ( ruleMatcherList )
+            // InternalFormat.g:24593:1: ruleMatcherList
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getContextFreeDirectiveAccess().getMatcherListMatcherListParserRuleCall_4_0()); 
             }
-            pushFollow(FOLLOW_ruleMatcherList_in_rule__ContextFreeDirective__MatcherListAssignment_449575);
+            pushFollow(FOLLOW_2);
             ruleMatcherList();
 
             state._fsp--;
@@ -70662,22 +70662,22 @@ public final void rule__ContextFreeDirective__MatcherListAssignment_4() throws R
 
 
     // $ANTLR start "rule__SpecificDirective__GrammarElementsAssignment_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24602:1: rule__SpecificDirective__GrammarElementsAssignment_0 : ( ruleGrammarElementReference ) ;
+    // InternalFormat.g:24602:1: rule__SpecificDirective__GrammarElementsAssignment_0 : ( ruleGrammarElementReference ) ;
     public final void rule__SpecificDirective__GrammarElementsAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24606:1: ( ( ruleGrammarElementReference ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24607:1: ( ruleGrammarElementReference )
+            // InternalFormat.g:24606:1: ( ( ruleGrammarElementReference ) )
+            // InternalFormat.g:24607:1: ( ruleGrammarElementReference )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24607:1: ( ruleGrammarElementReference )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24608:1: ruleGrammarElementReference
+            // InternalFormat.g:24607:1: ( ruleGrammarElementReference )
+            // InternalFormat.g:24608:1: ruleGrammarElementReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSpecificDirectiveAccess().getGrammarElementsGrammarElementReferenceParserRuleCall_0_0()); 
             }
-            pushFollow(FOLLOW_ruleGrammarElementReference_in_rule__SpecificDirective__GrammarElementsAssignment_049606);
+            pushFollow(FOLLOW_2);
             ruleGrammarElementReference();
 
             state._fsp--;
@@ -70707,22 +70707,22 @@ public final void rule__SpecificDirective__GrammarElementsAssignment_0() throws
 
 
     // $ANTLR start "rule__SpecificDirective__GrammarElementsAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24617:1: rule__SpecificDirective__GrammarElementsAssignment_1_1 : ( ruleGrammarElementReference ) ;
+    // InternalFormat.g:24617:1: rule__SpecificDirective__GrammarElementsAssignment_1_1 : ( ruleGrammarElementReference ) ;
     public final void rule__SpecificDirective__GrammarElementsAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24621:1: ( ( ruleGrammarElementReference ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24622:1: ( ruleGrammarElementReference )
+            // InternalFormat.g:24621:1: ( ( ruleGrammarElementReference ) )
+            // InternalFormat.g:24622:1: ( ruleGrammarElementReference )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24622:1: ( ruleGrammarElementReference )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24623:1: ruleGrammarElementReference
+            // InternalFormat.g:24622:1: ( ruleGrammarElementReference )
+            // InternalFormat.g:24623:1: ruleGrammarElementReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSpecificDirectiveAccess().getGrammarElementsGrammarElementReferenceParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleGrammarElementReference_in_rule__SpecificDirective__GrammarElementsAssignment_1_149637);
+            pushFollow(FOLLOW_2);
             ruleGrammarElementReference();
 
             state._fsp--;
@@ -70752,22 +70752,22 @@ public final void rule__SpecificDirective__GrammarElementsAssignment_1_1() throw
 
 
     // $ANTLR start "rule__SpecificDirective__MatcherListAssignment_2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24632:1: rule__SpecificDirective__MatcherListAssignment_2 : ( ruleMatcherList ) ;
+    // InternalFormat.g:24632:1: rule__SpecificDirective__MatcherListAssignment_2 : ( ruleMatcherList ) ;
     public final void rule__SpecificDirective__MatcherListAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24636:1: ( ( ruleMatcherList ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24637:1: ( ruleMatcherList )
+            // InternalFormat.g:24636:1: ( ( ruleMatcherList ) )
+            // InternalFormat.g:24637:1: ( ruleMatcherList )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24637:1: ( ruleMatcherList )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24638:1: ruleMatcherList
+            // InternalFormat.g:24637:1: ( ruleMatcherList )
+            // InternalFormat.g:24638:1: ruleMatcherList
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSpecificDirectiveAccess().getMatcherListMatcherListParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleMatcherList_in_rule__SpecificDirective__MatcherListAssignment_249668);
+            pushFollow(FOLLOW_2);
             ruleMatcherList();
 
             state._fsp--;
@@ -70797,22 +70797,22 @@ public final void rule__SpecificDirective__MatcherListAssignment_2() throws Reco
 
 
     // $ANTLR start "rule__MatcherList__MatchersAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24647:1: rule__MatcherList__MatchersAssignment_1 : ( ruleMatcher ) ;
+    // InternalFormat.g:24647:1: rule__MatcherList__MatchersAssignment_1 : ( ruleMatcher ) ;
     public final void rule__MatcherList__MatchersAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24651:1: ( ( ruleMatcher ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24652:1: ( ruleMatcher )
+            // InternalFormat.g:24651:1: ( ( ruleMatcher ) )
+            // InternalFormat.g:24652:1: ( ruleMatcher )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24652:1: ( ruleMatcher )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24653:1: ruleMatcher
+            // InternalFormat.g:24652:1: ( ruleMatcher )
+            // InternalFormat.g:24653:1: ruleMatcher
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMatcherListAccess().getMatchersMatcherParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleMatcher_in_rule__MatcherList__MatchersAssignment_149699);
+            pushFollow(FOLLOW_2);
             ruleMatcher();
 
             state._fsp--;
@@ -70842,22 +70842,22 @@ public final void rule__MatcherList__MatchersAssignment_1() throws RecognitionEx
 
 
     // $ANTLR start "rule__MatcherList__MatchersAssignment_2_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24662:1: rule__MatcherList__MatchersAssignment_2_1 : ( ruleMatcher ) ;
+    // InternalFormat.g:24662:1: rule__MatcherList__MatchersAssignment_2_1 : ( ruleMatcher ) ;
     public final void rule__MatcherList__MatchersAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24666:1: ( ( ruleMatcher ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24667:1: ( ruleMatcher )
+            // InternalFormat.g:24666:1: ( ( ruleMatcher ) )
+            // InternalFormat.g:24667:1: ( ruleMatcher )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24667:1: ( ruleMatcher )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24668:1: ruleMatcher
+            // InternalFormat.g:24667:1: ( ruleMatcher )
+            // InternalFormat.g:24668:1: ruleMatcher
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMatcherListAccess().getMatchersMatcherParserRuleCall_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleMatcher_in_rule__MatcherList__MatchersAssignment_2_149730);
+            pushFollow(FOLLOW_2);
             ruleMatcher();
 
             state._fsp--;
@@ -70887,28 +70887,28 @@ public final void rule__MatcherList__MatchersAssignment_2_1() throws Recognition
 
 
     // $ANTLR start "rule__GroupBlock__GrammarElementAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24677:1: rule__GroupBlock__GrammarElementAssignment_1 : ( ( ruleIntIdentifier ) ) ;
+    // InternalFormat.g:24677:1: rule__GroupBlock__GrammarElementAssignment_1 : ( ( ruleIntIdentifier ) ) ;
     public final void rule__GroupBlock__GrammarElementAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24681:1: ( ( ( ruleIntIdentifier ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24682:1: ( ( ruleIntIdentifier ) )
+            // InternalFormat.g:24681:1: ( ( ( ruleIntIdentifier ) ) )
+            // InternalFormat.g:24682:1: ( ( ruleIntIdentifier ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24682:1: ( ( ruleIntIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24683:1: ( ruleIntIdentifier )
+            // InternalFormat.g:24682:1: ( ( ruleIntIdentifier ) )
+            // InternalFormat.g:24683:1: ( ruleIntIdentifier )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGroupBlockAccess().getGrammarElementCompoundElementCrossReference_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24684:1: ( ruleIntIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24685:1: ruleIntIdentifier
+            // InternalFormat.g:24684:1: ( ruleIntIdentifier )
+            // InternalFormat.g:24685:1: ruleIntIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGroupBlockAccess().getGrammarElementCompoundElementIntIdentifierParserRuleCall_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleIntIdentifier_in_rule__GroupBlock__GrammarElementAssignment_149765);
+            pushFollow(FOLLOW_2);
             ruleIntIdentifier();
 
             state._fsp--;
@@ -70944,22 +70944,22 @@ public final void rule__GroupBlock__GrammarElementAssignment_1() throws Recognit
 
 
     // $ANTLR start "rule__GroupBlock__MatcherListAssignment_2_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24696:1: rule__GroupBlock__MatcherListAssignment_2_0 : ( ruleMatcherList ) ;
+    // InternalFormat.g:24696:1: rule__GroupBlock__MatcherListAssignment_2_0 : ( ruleMatcherList ) ;
     public final void rule__GroupBlock__MatcherListAssignment_2_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24700:1: ( ( ruleMatcherList ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24701:1: ( ruleMatcherList )
+            // InternalFormat.g:24700:1: ( ( ruleMatcherList ) )
+            // InternalFormat.g:24701:1: ( ruleMatcherList )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24701:1: ( ruleMatcherList )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24702:1: ruleMatcherList
+            // InternalFormat.g:24701:1: ( ruleMatcherList )
+            // InternalFormat.g:24702:1: ruleMatcherList
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGroupBlockAccess().getMatcherListMatcherListParserRuleCall_2_0_0()); 
             }
-            pushFollow(FOLLOW_ruleMatcherList_in_rule__GroupBlock__MatcherListAssignment_2_049800);
+            pushFollow(FOLLOW_2);
             ruleMatcherList();
 
             state._fsp--;
@@ -70989,22 +70989,22 @@ public final void rule__GroupBlock__MatcherListAssignment_2_0() throws Recogniti
 
 
     // $ANTLR start "rule__GroupBlock__SubGroupAssignment_2_1_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24711:1: rule__GroupBlock__SubGroupAssignment_2_1_1 : ( ruleGroupBlock ) ;
+    // InternalFormat.g:24711:1: rule__GroupBlock__SubGroupAssignment_2_1_1 : ( ruleGroupBlock ) ;
     public final void rule__GroupBlock__SubGroupAssignment_2_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24715:1: ( ( ruleGroupBlock ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24716:1: ( ruleGroupBlock )
+            // InternalFormat.g:24715:1: ( ( ruleGroupBlock ) )
+            // InternalFormat.g:24716:1: ( ruleGroupBlock )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24716:1: ( ruleGroupBlock )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24717:1: ruleGroupBlock
+            // InternalFormat.g:24716:1: ( ruleGroupBlock )
+            // InternalFormat.g:24717:1: ruleGroupBlock
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGroupBlockAccess().getSubGroupGroupBlockParserRuleCall_2_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleGroupBlock_in_rule__GroupBlock__SubGroupAssignment_2_1_149831);
+            pushFollow(FOLLOW_2);
             ruleGroupBlock();
 
             state._fsp--;
@@ -71034,22 +71034,22 @@ public final void rule__GroupBlock__SubGroupAssignment_2_1_1() throws Recognitio
 
 
     // $ANTLR start "rule__GroupBlock__DirectivesAssignment_2_2_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24726:1: rule__GroupBlock__DirectivesAssignment_2_2_1 : ( ruleGrammarRuleDirective ) ;
+    // InternalFormat.g:24726:1: rule__GroupBlock__DirectivesAssignment_2_2_1 : ( ruleGrammarRuleDirective ) ;
     public final void rule__GroupBlock__DirectivesAssignment_2_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24730:1: ( ( ruleGrammarRuleDirective ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24731:1: ( ruleGrammarRuleDirective )
+            // InternalFormat.g:24730:1: ( ( ruleGrammarRuleDirective ) )
+            // InternalFormat.g:24731:1: ( ruleGrammarRuleDirective )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24731:1: ( ruleGrammarRuleDirective )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24732:1: ruleGrammarRuleDirective
+            // InternalFormat.g:24731:1: ( ruleGrammarRuleDirective )
+            // InternalFormat.g:24732:1: ruleGrammarRuleDirective
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGroupBlockAccess().getDirectivesGrammarRuleDirectiveParserRuleCall_2_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleGrammarRuleDirective_in_rule__GroupBlock__DirectivesAssignment_2_2_149862);
+            pushFollow(FOLLOW_2);
             ruleGrammarRuleDirective();
 
             state._fsp--;
@@ -71079,22 +71079,22 @@ public final void rule__GroupBlock__DirectivesAssignment_2_2_1() throws Recognit
 
 
     // $ANTLR start "rule__KeywordPair__LeftAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24741:1: rule__KeywordPair__LeftAssignment_1 : ( RULE_STRING ) ;
+    // InternalFormat.g:24741:1: rule__KeywordPair__LeftAssignment_1 : ( RULE_STRING ) ;
     public final void rule__KeywordPair__LeftAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24745:1: ( ( RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24746:1: ( RULE_STRING )
+            // InternalFormat.g:24745:1: ( ( RULE_STRING ) )
+            // InternalFormat.g:24746:1: ( RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24746:1: ( RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24747:1: RULE_STRING
+            // InternalFormat.g:24746:1: ( RULE_STRING )
+            // InternalFormat.g:24747:1: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getKeywordPairAccess().getLeftSTRINGTerminalRuleCall_1_0()); 
             }
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__KeywordPair__LeftAssignment_149893); if (state.failed) return ;
+            match(input,RULE_STRING,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getKeywordPairAccess().getLeftSTRINGTerminalRuleCall_1_0()); 
             }
@@ -71120,22 +71120,22 @@ public final void rule__KeywordPair__LeftAssignment_1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__KeywordPair__RightAssignment_2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24756:1: rule__KeywordPair__RightAssignment_2 : ( RULE_STRING ) ;
+    // InternalFormat.g:24756:1: rule__KeywordPair__RightAssignment_2 : ( RULE_STRING ) ;
     public final void rule__KeywordPair__RightAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24760:1: ( ( RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24761:1: ( RULE_STRING )
+            // InternalFormat.g:24760:1: ( ( RULE_STRING ) )
+            // InternalFormat.g:24761:1: ( RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24761:1: ( RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24762:1: RULE_STRING
+            // InternalFormat.g:24761:1: ( RULE_STRING )
+            // InternalFormat.g:24762:1: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getKeywordPairAccess().getRightSTRINGTerminalRuleCall_2_0()); 
             }
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__KeywordPair__RightAssignment_249924); if (state.failed) return ;
+            match(input,RULE_STRING,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getKeywordPairAccess().getRightSTRINGTerminalRuleCall_2_0()); 
             }
@@ -71161,22 +71161,22 @@ public final void rule__KeywordPair__RightAssignment_2() throws RecognitionExcep
 
 
     // $ANTLR start "rule__KeywordPair__LeftMatchersAssignment_5_0_2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24771:1: rule__KeywordPair__LeftMatchersAssignment_5_0_2 : ( ruleMatcher ) ;
+    // InternalFormat.g:24771:1: rule__KeywordPair__LeftMatchersAssignment_5_0_2 : ( ruleMatcher ) ;
     public final void rule__KeywordPair__LeftMatchersAssignment_5_0_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24775:1: ( ( ruleMatcher ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24776:1: ( ruleMatcher )
+            // InternalFormat.g:24775:1: ( ( ruleMatcher ) )
+            // InternalFormat.g:24776:1: ( ruleMatcher )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24776:1: ( ruleMatcher )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24777:1: ruleMatcher
+            // InternalFormat.g:24776:1: ( ruleMatcher )
+            // InternalFormat.g:24777:1: ruleMatcher
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getKeywordPairAccess().getLeftMatchersMatcherParserRuleCall_5_0_2_0()); 
             }
-            pushFollow(FOLLOW_ruleMatcher_in_rule__KeywordPair__LeftMatchersAssignment_5_0_249955);
+            pushFollow(FOLLOW_2);
             ruleMatcher();
 
             state._fsp--;
@@ -71206,22 +71206,22 @@ public final void rule__KeywordPair__LeftMatchersAssignment_5_0_2() throws Recog
 
 
     // $ANTLR start "rule__KeywordPair__RightMatchersAssignment_5_1_2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24786:1: rule__KeywordPair__RightMatchersAssignment_5_1_2 : ( ruleMatcher ) ;
+    // InternalFormat.g:24786:1: rule__KeywordPair__RightMatchersAssignment_5_1_2 : ( ruleMatcher ) ;
     public final void rule__KeywordPair__RightMatchersAssignment_5_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24790:1: ( ( ruleMatcher ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24791:1: ( ruleMatcher )
+            // InternalFormat.g:24790:1: ( ( ruleMatcher ) )
+            // InternalFormat.g:24791:1: ( ruleMatcher )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24791:1: ( ruleMatcher )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24792:1: ruleMatcher
+            // InternalFormat.g:24791:1: ( ruleMatcher )
+            // InternalFormat.g:24792:1: ruleMatcher
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getKeywordPairAccess().getRightMatchersMatcherParserRuleCall_5_1_2_0()); 
             }
-            pushFollow(FOLLOW_ruleMatcher_in_rule__KeywordPair__RightMatchersAssignment_5_1_249986);
+            pushFollow(FOLLOW_2);
             ruleMatcher();
 
             state._fsp--;
@@ -71251,22 +71251,22 @@ public final void rule__KeywordPair__RightMatchersAssignment_5_1_2() throws Reco
 
 
     // $ANTLR start "rule__KeywordPair__LeftMatchersAssignment_6_1_0_2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24801:1: rule__KeywordPair__LeftMatchersAssignment_6_1_0_2 : ( ruleMatcher ) ;
+    // InternalFormat.g:24801:1: rule__KeywordPair__LeftMatchersAssignment_6_1_0_2 : ( ruleMatcher ) ;
     public final void rule__KeywordPair__LeftMatchersAssignment_6_1_0_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24805:1: ( ( ruleMatcher ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24806:1: ( ruleMatcher )
+            // InternalFormat.g:24805:1: ( ( ruleMatcher ) )
+            // InternalFormat.g:24806:1: ( ruleMatcher )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24806:1: ( ruleMatcher )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24807:1: ruleMatcher
+            // InternalFormat.g:24806:1: ( ruleMatcher )
+            // InternalFormat.g:24807:1: ruleMatcher
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getKeywordPairAccess().getLeftMatchersMatcherParserRuleCall_6_1_0_2_0()); 
             }
-            pushFollow(FOLLOW_ruleMatcher_in_rule__KeywordPair__LeftMatchersAssignment_6_1_0_250017);
+            pushFollow(FOLLOW_2);
             ruleMatcher();
 
             state._fsp--;
@@ -71296,22 +71296,22 @@ public final void rule__KeywordPair__LeftMatchersAssignment_6_1_0_2() throws Rec
 
 
     // $ANTLR start "rule__KeywordPair__RightMatchersAssignment_6_1_1_2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24816:1: rule__KeywordPair__RightMatchersAssignment_6_1_1_2 : ( ruleMatcher ) ;
+    // InternalFormat.g:24816:1: rule__KeywordPair__RightMatchersAssignment_6_1_1_2 : ( ruleMatcher ) ;
     public final void rule__KeywordPair__RightMatchersAssignment_6_1_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24820:1: ( ( ruleMatcher ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24821:1: ( ruleMatcher )
+            // InternalFormat.g:24820:1: ( ( ruleMatcher ) )
+            // InternalFormat.g:24821:1: ( ruleMatcher )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24821:1: ( ruleMatcher )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24822:1: ruleMatcher
+            // InternalFormat.g:24821:1: ( ruleMatcher )
+            // InternalFormat.g:24822:1: ruleMatcher
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getKeywordPairAccess().getRightMatchersMatcherParserRuleCall_6_1_1_2_0()); 
             }
-            pushFollow(FOLLOW_ruleMatcher_in_rule__KeywordPair__RightMatchersAssignment_6_1_1_250048);
+            pushFollow(FOLLOW_2);
             ruleMatcher();
 
             state._fsp--;
@@ -71341,22 +71341,22 @@ public final void rule__KeywordPair__RightMatchersAssignment_6_1_1_2() throws Re
 
 
     // $ANTLR start "rule__Matcher__LocatorAssignment_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24831:1: rule__Matcher__LocatorAssignment_0 : ( ruleLocator ) ;
+    // InternalFormat.g:24831:1: rule__Matcher__LocatorAssignment_0 : ( ruleLocator ) ;
     public final void rule__Matcher__LocatorAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24835:1: ( ( ruleLocator ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24836:1: ( ruleLocator )
+            // InternalFormat.g:24835:1: ( ( ruleLocator ) )
+            // InternalFormat.g:24836:1: ( ruleLocator )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24836:1: ( ruleLocator )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24837:1: ruleLocator
+            // InternalFormat.g:24836:1: ( ruleLocator )
+            // InternalFormat.g:24837:1: ruleLocator
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMatcherAccess().getLocatorLocatorParserRuleCall_0_0()); 
             }
-            pushFollow(FOLLOW_ruleLocator_in_rule__Matcher__LocatorAssignment_050079);
+            pushFollow(FOLLOW_2);
             ruleLocator();
 
             state._fsp--;
@@ -71386,22 +71386,22 @@ public final void rule__Matcher__LocatorAssignment_0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__Matcher__TypeAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24846:1: rule__Matcher__TypeAssignment_1 : ( ruleMatcherType ) ;
+    // InternalFormat.g:24846:1: rule__Matcher__TypeAssignment_1 : ( ruleMatcherType ) ;
     public final void rule__Matcher__TypeAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24850:1: ( ( ruleMatcherType ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24851:1: ( ruleMatcherType )
+            // InternalFormat.g:24850:1: ( ( ruleMatcherType ) )
+            // InternalFormat.g:24851:1: ( ruleMatcherType )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24851:1: ( ruleMatcherType )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24852:1: ruleMatcherType
+            // InternalFormat.g:24851:1: ( ruleMatcherType )
+            // InternalFormat.g:24852:1: ruleMatcherType
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMatcherAccess().getTypeMatcherTypeEnumRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleMatcherType_in_rule__Matcher__TypeAssignment_150110);
+            pushFollow(FOLLOW_2);
             ruleMatcherType();
 
             state._fsp--;
@@ -71431,22 +71431,22 @@ public final void rule__Matcher__TypeAssignment_1() throws RecognitionException
 
 
     // $ANTLR start "rule__Matcher__ConditionAssignment_2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24861:1: rule__Matcher__ConditionAssignment_2 : ( ruleXBlockExpression ) ;
+    // InternalFormat.g:24861:1: rule__Matcher__ConditionAssignment_2 : ( ruleXBlockExpression ) ;
     public final void rule__Matcher__ConditionAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24865:1: ( ( ruleXBlockExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24866:1: ( ruleXBlockExpression )
+            // InternalFormat.g:24865:1: ( ( ruleXBlockExpression ) )
+            // InternalFormat.g:24866:1: ( ruleXBlockExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24866:1: ( ruleXBlockExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24867:1: ruleXBlockExpression
+            // InternalFormat.g:24866:1: ( ruleXBlockExpression )
+            // InternalFormat.g:24867:1: ruleXBlockExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMatcherAccess().getConditionXBlockExpressionParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleXBlockExpression_in_rule__Matcher__ConditionAssignment_250141);
+            pushFollow(FOLLOW_2);
             ruleXBlockExpression();
 
             state._fsp--;
@@ -71476,22 +71476,22 @@ public final void rule__Matcher__ConditionAssignment_2() throws RecognitionExcep
 
 
     // $ANTLR start "rule__SpaceLocator__ValueAssignment_0_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24876:1: rule__SpaceLocator__ValueAssignment_0_1 : ( ruleStringValue ) ;
+    // InternalFormat.g:24876:1: rule__SpaceLocator__ValueAssignment_0_1 : ( ruleStringValue ) ;
     public final void rule__SpaceLocator__ValueAssignment_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24880:1: ( ( ruleStringValue ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24881:1: ( ruleStringValue )
+            // InternalFormat.g:24880:1: ( ( ruleStringValue ) )
+            // InternalFormat.g:24881:1: ( ruleStringValue )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24881:1: ( ruleStringValue )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24882:1: ruleStringValue
+            // InternalFormat.g:24881:1: ( ruleStringValue )
+            // InternalFormat.g:24882:1: ruleStringValue
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSpaceLocatorAccess().getValueStringValueParserRuleCall_0_1_0()); 
             }
-            pushFollow(FOLLOW_ruleStringValue_in_rule__SpaceLocator__ValueAssignment_0_150172);
+            pushFollow(FOLLOW_2);
             ruleStringValue();
 
             state._fsp--;
@@ -71521,28 +71521,28 @@ public final void rule__SpaceLocator__ValueAssignment_0_1() throws RecognitionEx
 
 
     // $ANTLR start "rule__SpaceLocator__NoSpaceAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24891:1: rule__SpaceLocator__NoSpaceAssignment_1 : ( ( 'no_space' ) ) ;
+    // InternalFormat.g:24891:1: rule__SpaceLocator__NoSpaceAssignment_1 : ( ( 'no_space' ) ) ;
     public final void rule__SpaceLocator__NoSpaceAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24895:1: ( ( ( 'no_space' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24896:1: ( ( 'no_space' ) )
+            // InternalFormat.g:24895:1: ( ( ( 'no_space' ) ) )
+            // InternalFormat.g:24896:1: ( ( 'no_space' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24896:1: ( ( 'no_space' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24897:1: ( 'no_space' )
+            // InternalFormat.g:24896:1: ( ( 'no_space' ) )
+            // InternalFormat.g:24897:1: ( 'no_space' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSpaceLocatorAccess().getNoSpaceNo_spaceKeyword_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24898:1: ( 'no_space' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24899:1: 'no_space'
+            // InternalFormat.g:24898:1: ( 'no_space' )
+            // InternalFormat.g:24899:1: 'no_space'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSpaceLocatorAccess().getNoSpaceNo_spaceKeyword_1_0()); 
             }
-            match(input,107,FOLLOW_107_in_rule__SpaceLocator__NoSpaceAssignment_150208); if (state.failed) return ;
+            match(input,107,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSpaceLocatorAccess().getNoSpaceNo_spaceKeyword_1_0()); 
             }
@@ -71574,22 +71574,22 @@ public final void rule__SpaceLocator__NoSpaceAssignment_1() throws RecognitionEx
 
 
     // $ANTLR start "rule__RightPaddingLocator__ValueAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24914:1: rule__RightPaddingLocator__ValueAssignment_1 : ( ruleIntValue ) ;
+    // InternalFormat.g:24914:1: rule__RightPaddingLocator__ValueAssignment_1 : ( ruleIntValue ) ;
     public final void rule__RightPaddingLocator__ValueAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24918:1: ( ( ruleIntValue ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24919:1: ( ruleIntValue )
+            // InternalFormat.g:24918:1: ( ( ruleIntValue ) )
+            // InternalFormat.g:24919:1: ( ruleIntValue )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24919:1: ( ruleIntValue )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24920:1: ruleIntValue
+            // InternalFormat.g:24919:1: ( ruleIntValue )
+            // InternalFormat.g:24920:1: ruleIntValue
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRightPaddingLocatorAccess().getValueIntValueParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleIntValue_in_rule__RightPaddingLocator__ValueAssignment_150247);
+            pushFollow(FOLLOW_2);
             ruleIntValue();
 
             state._fsp--;
@@ -71619,22 +71619,22 @@ public final void rule__RightPaddingLocator__ValueAssignment_1() throws Recognit
 
 
     // $ANTLR start "rule__LinewrapLocator__ValueAssignment_0_1_1_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24929:1: rule__LinewrapLocator__ValueAssignment_0_1_1_0 : ( ruleIntValue ) ;
+    // InternalFormat.g:24929:1: rule__LinewrapLocator__ValueAssignment_0_1_1_0 : ( ruleIntValue ) ;
     public final void rule__LinewrapLocator__ValueAssignment_0_1_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24933:1: ( ( ruleIntValue ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24934:1: ( ruleIntValue )
+            // InternalFormat.g:24933:1: ( ( ruleIntValue ) )
+            // InternalFormat.g:24934:1: ( ruleIntValue )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24934:1: ( ruleIntValue )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24935:1: ruleIntValue
+            // InternalFormat.g:24934:1: ( ruleIntValue )
+            // InternalFormat.g:24935:1: ruleIntValue
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLinewrapLocatorAccess().getValueIntValueParserRuleCall_0_1_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleIntValue_in_rule__LinewrapLocator__ValueAssignment_0_1_1_050278);
+            pushFollow(FOLLOW_2);
             ruleIntValue();
 
             state._fsp--;
@@ -71664,22 +71664,22 @@ public final void rule__LinewrapLocator__ValueAssignment_0_1_1_0() throws Recogn
 
 
     // $ANTLR start "rule__LinewrapLocator__MinimumAssignment_0_1_1_1_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24944:1: rule__LinewrapLocator__MinimumAssignment_0_1_1_1_0 : ( ruleIntValue ) ;
+    // InternalFormat.g:24944:1: rule__LinewrapLocator__MinimumAssignment_0_1_1_1_0 : ( ruleIntValue ) ;
     public final void rule__LinewrapLocator__MinimumAssignment_0_1_1_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24948:1: ( ( ruleIntValue ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24949:1: ( ruleIntValue )
+            // InternalFormat.g:24948:1: ( ( ruleIntValue ) )
+            // InternalFormat.g:24949:1: ( ruleIntValue )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24949:1: ( ruleIntValue )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24950:1: ruleIntValue
+            // InternalFormat.g:24949:1: ( ruleIntValue )
+            // InternalFormat.g:24950:1: ruleIntValue
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLinewrapLocatorAccess().getMinimumIntValueParserRuleCall_0_1_1_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleIntValue_in_rule__LinewrapLocator__MinimumAssignment_0_1_1_1_050309);
+            pushFollow(FOLLOW_2);
             ruleIntValue();
 
             state._fsp--;
@@ -71709,22 +71709,22 @@ public final void rule__LinewrapLocator__MinimumAssignment_0_1_1_1_0() throws Re
 
 
     // $ANTLR start "rule__LinewrapLocator__DefaultAssignment_0_1_1_1_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24959:1: rule__LinewrapLocator__DefaultAssignment_0_1_1_1_1 : ( ruleIntValue ) ;
+    // InternalFormat.g:24959:1: rule__LinewrapLocator__DefaultAssignment_0_1_1_1_1 : ( ruleIntValue ) ;
     public final void rule__LinewrapLocator__DefaultAssignment_0_1_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24963:1: ( ( ruleIntValue ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24964:1: ( ruleIntValue )
+            // InternalFormat.g:24963:1: ( ( ruleIntValue ) )
+            // InternalFormat.g:24964:1: ( ruleIntValue )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24964:1: ( ruleIntValue )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24965:1: ruleIntValue
+            // InternalFormat.g:24964:1: ( ruleIntValue )
+            // InternalFormat.g:24965:1: ruleIntValue
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLinewrapLocatorAccess().getDefaultIntValueParserRuleCall_0_1_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleIntValue_in_rule__LinewrapLocator__DefaultAssignment_0_1_1_1_150340);
+            pushFollow(FOLLOW_2);
             ruleIntValue();
 
             state._fsp--;
@@ -71754,22 +71754,22 @@ public final void rule__LinewrapLocator__DefaultAssignment_0_1_1_1_1() throws Re
 
 
     // $ANTLR start "rule__LinewrapLocator__MaximumAssignment_0_1_1_1_2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24974:1: rule__LinewrapLocator__MaximumAssignment_0_1_1_1_2 : ( ruleIntValue ) ;
+    // InternalFormat.g:24974:1: rule__LinewrapLocator__MaximumAssignment_0_1_1_1_2 : ( ruleIntValue ) ;
     public final void rule__LinewrapLocator__MaximumAssignment_0_1_1_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24978:1: ( ( ruleIntValue ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24979:1: ( ruleIntValue )
+            // InternalFormat.g:24978:1: ( ( ruleIntValue ) )
+            // InternalFormat.g:24979:1: ( ruleIntValue )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24979:1: ( ruleIntValue )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24980:1: ruleIntValue
+            // InternalFormat.g:24979:1: ( ruleIntValue )
+            // InternalFormat.g:24980:1: ruleIntValue
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLinewrapLocatorAccess().getMaximumIntValueParserRuleCall_0_1_1_1_2_0()); 
             }
-            pushFollow(FOLLOW_ruleIntValue_in_rule__LinewrapLocator__MaximumAssignment_0_1_1_1_250371);
+            pushFollow(FOLLOW_2);
             ruleIntValue();
 
             state._fsp--;
@@ -71799,28 +71799,28 @@ public final void rule__LinewrapLocator__MaximumAssignment_0_1_1_1_2() throws Re
 
 
     // $ANTLR start "rule__LinewrapLocator__NoLinewrapAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24989:1: rule__LinewrapLocator__NoLinewrapAssignment_1 : ( ( 'no_linewrap' ) ) ;
+    // InternalFormat.g:24989:1: rule__LinewrapLocator__NoLinewrapAssignment_1 : ( ( 'no_linewrap' ) ) ;
     public final void rule__LinewrapLocator__NoLinewrapAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24993:1: ( ( ( 'no_linewrap' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24994:1: ( ( 'no_linewrap' ) )
+            // InternalFormat.g:24993:1: ( ( ( 'no_linewrap' ) ) )
+            // InternalFormat.g:24994:1: ( ( 'no_linewrap' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24994:1: ( ( 'no_linewrap' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24995:1: ( 'no_linewrap' )
+            // InternalFormat.g:24994:1: ( ( 'no_linewrap' ) )
+            // InternalFormat.g:24995:1: ( 'no_linewrap' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLinewrapLocatorAccess().getNoLinewrapNo_linewrapKeyword_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24996:1: ( 'no_linewrap' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:24997:1: 'no_linewrap'
+            // InternalFormat.g:24996:1: ( 'no_linewrap' )
+            // InternalFormat.g:24997:1: 'no_linewrap'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLinewrapLocatorAccess().getNoLinewrapNo_linewrapKeyword_1_0()); 
             }
-            match(input,108,FOLLOW_108_in_rule__LinewrapLocator__NoLinewrapAssignment_150407); if (state.failed) return ;
+            match(input,108,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getLinewrapLocatorAccess().getNoLinewrapNo_linewrapKeyword_1_0()); 
             }
@@ -71852,28 +71852,28 @@ public final void rule__LinewrapLocator__NoLinewrapAssignment_1() throws Recogni
 
 
     // $ANTLR start "rule__ColumnLocator__FixedAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25012:1: rule__ColumnLocator__FixedAssignment_1 : ( ( 'fixed' ) ) ;
+    // InternalFormat.g:25012:1: rule__ColumnLocator__FixedAssignment_1 : ( ( 'fixed' ) ) ;
     public final void rule__ColumnLocator__FixedAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25016:1: ( ( ( 'fixed' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25017:1: ( ( 'fixed' ) )
+            // InternalFormat.g:25016:1: ( ( ( 'fixed' ) ) )
+            // InternalFormat.g:25017:1: ( ( 'fixed' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25017:1: ( ( 'fixed' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25018:1: ( 'fixed' )
+            // InternalFormat.g:25017:1: ( ( 'fixed' ) )
+            // InternalFormat.g:25018:1: ( 'fixed' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getColumnLocatorAccess().getFixedFixedKeyword_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25019:1: ( 'fixed' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25020:1: 'fixed'
+            // InternalFormat.g:25019:1: ( 'fixed' )
+            // InternalFormat.g:25020:1: 'fixed'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getColumnLocatorAccess().getFixedFixedKeyword_1_0()); 
             }
-            match(input,109,FOLLOW_109_in_rule__ColumnLocator__FixedAssignment_150451); if (state.failed) return ;
+            match(input,109,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getColumnLocatorAccess().getFixedFixedKeyword_1_0()); 
             }
@@ -71905,22 +71905,22 @@ public final void rule__ColumnLocator__FixedAssignment_1() throws RecognitionExc
 
 
     // $ANTLR start "rule__ColumnLocator__ValueAssignment_2_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25035:1: rule__ColumnLocator__ValueAssignment_2_0 : ( ruleIntValue ) ;
+    // InternalFormat.g:25035:1: rule__ColumnLocator__ValueAssignment_2_0 : ( ruleIntValue ) ;
     public final void rule__ColumnLocator__ValueAssignment_2_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25039:1: ( ( ruleIntValue ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25040:1: ( ruleIntValue )
+            // InternalFormat.g:25039:1: ( ( ruleIntValue ) )
+            // InternalFormat.g:25040:1: ( ruleIntValue )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25040:1: ( ruleIntValue )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25041:1: ruleIntValue
+            // InternalFormat.g:25040:1: ( ruleIntValue )
+            // InternalFormat.g:25041:1: ruleIntValue
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getColumnLocatorAccess().getValueIntValueParserRuleCall_2_0_0()); 
             }
-            pushFollow(FOLLOW_ruleIntValue_in_rule__ColumnLocator__ValueAssignment_2_050490);
+            pushFollow(FOLLOW_2);
             ruleIntValue();
 
             state._fsp--;
@@ -71950,22 +71950,22 @@ public final void rule__ColumnLocator__ValueAssignment_2_0() throws RecognitionE
 
 
     // $ANTLR start "rule__ColumnLocator__ParameterAssignment_2_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25050:1: rule__ColumnLocator__ParameterAssignment_2_1 : ( ruleXBlockExpression ) ;
+    // InternalFormat.g:25050:1: rule__ColumnLocator__ParameterAssignment_2_1 : ( ruleXBlockExpression ) ;
     public final void rule__ColumnLocator__ParameterAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25054:1: ( ( ruleXBlockExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25055:1: ( ruleXBlockExpression )
+            // InternalFormat.g:25054:1: ( ( ruleXBlockExpression ) )
+            // InternalFormat.g:25055:1: ( ruleXBlockExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25055:1: ( ruleXBlockExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25056:1: ruleXBlockExpression
+            // InternalFormat.g:25055:1: ( ruleXBlockExpression )
+            // InternalFormat.g:25056:1: ruleXBlockExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getColumnLocatorAccess().getParameterXBlockExpressionParserRuleCall_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXBlockExpression_in_rule__ColumnLocator__ParameterAssignment_2_150521);
+            pushFollow(FOLLOW_2);
             ruleXBlockExpression();
 
             state._fsp--;
@@ -71995,28 +71995,28 @@ public final void rule__ColumnLocator__ParameterAssignment_2_1() throws Recognit
 
 
     // $ANTLR start "rule__ColumnLocator__RelativeAssignment_3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25065:1: rule__ColumnLocator__RelativeAssignment_3 : ( ( 'relative' ) ) ;
+    // InternalFormat.g:25065:1: rule__ColumnLocator__RelativeAssignment_3 : ( ( 'relative' ) ) ;
     public final void rule__ColumnLocator__RelativeAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25069:1: ( ( ( 'relative' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25070:1: ( ( 'relative' ) )
+            // InternalFormat.g:25069:1: ( ( ( 'relative' ) ) )
+            // InternalFormat.g:25070:1: ( ( 'relative' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25070:1: ( ( 'relative' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25071:1: ( 'relative' )
+            // InternalFormat.g:25070:1: ( ( 'relative' ) )
+            // InternalFormat.g:25071:1: ( 'relative' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getColumnLocatorAccess().getRelativeRelativeKeyword_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25072:1: ( 'relative' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25073:1: 'relative'
+            // InternalFormat.g:25072:1: ( 'relative' )
+            // InternalFormat.g:25073:1: 'relative'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getColumnLocatorAccess().getRelativeRelativeKeyword_3_0()); 
             }
-            match(input,110,FOLLOW_110_in_rule__ColumnLocator__RelativeAssignment_350557); if (state.failed) return ;
+            match(input,110,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getColumnLocatorAccess().getRelativeRelativeKeyword_3_0()); 
             }
@@ -72048,28 +72048,28 @@ public final void rule__ColumnLocator__RelativeAssignment_3() throws Recognition
 
 
     // $ANTLR start "rule__ColumnLocator__NobreakAssignment_4"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25088:1: rule__ColumnLocator__NobreakAssignment_4 : ( ( 'nobreak' ) ) ;
+    // InternalFormat.g:25088:1: rule__ColumnLocator__NobreakAssignment_4 : ( ( 'nobreak' ) ) ;
     public final void rule__ColumnLocator__NobreakAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25092:1: ( ( ( 'nobreak' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25093:1: ( ( 'nobreak' ) )
+            // InternalFormat.g:25092:1: ( ( ( 'nobreak' ) ) )
+            // InternalFormat.g:25093:1: ( ( 'nobreak' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25093:1: ( ( 'nobreak' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25094:1: ( 'nobreak' )
+            // InternalFormat.g:25093:1: ( ( 'nobreak' ) )
+            // InternalFormat.g:25094:1: ( 'nobreak' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getColumnLocatorAccess().getNobreakNobreakKeyword_4_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25095:1: ( 'nobreak' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25096:1: 'nobreak'
+            // InternalFormat.g:25095:1: ( 'nobreak' )
+            // InternalFormat.g:25096:1: 'nobreak'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getColumnLocatorAccess().getNobreakNobreakKeyword_4_0()); 
             }
-            match(input,111,FOLLOW_111_in_rule__ColumnLocator__NobreakAssignment_450601); if (state.failed) return ;
+            match(input,111,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getColumnLocatorAccess().getNobreakNobreakKeyword_4_0()); 
             }
@@ -72101,28 +72101,28 @@ public final void rule__ColumnLocator__NobreakAssignment_4() throws RecognitionE
 
 
     // $ANTLR start "rule__OffsetLocator__FixedAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25111:1: rule__OffsetLocator__FixedAssignment_1 : ( ( 'fixed' ) ) ;
+    // InternalFormat.g:25111:1: rule__OffsetLocator__FixedAssignment_1 : ( ( 'fixed' ) ) ;
     public final void rule__OffsetLocator__FixedAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25115:1: ( ( ( 'fixed' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25116:1: ( ( 'fixed' ) )
+            // InternalFormat.g:25115:1: ( ( ( 'fixed' ) ) )
+            // InternalFormat.g:25116:1: ( ( 'fixed' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25116:1: ( ( 'fixed' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25117:1: ( 'fixed' )
+            // InternalFormat.g:25116:1: ( ( 'fixed' ) )
+            // InternalFormat.g:25117:1: ( 'fixed' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOffsetLocatorAccess().getFixedFixedKeyword_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25118:1: ( 'fixed' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25119:1: 'fixed'
+            // InternalFormat.g:25118:1: ( 'fixed' )
+            // InternalFormat.g:25119:1: 'fixed'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOffsetLocatorAccess().getFixedFixedKeyword_1_0()); 
             }
-            match(input,109,FOLLOW_109_in_rule__OffsetLocator__FixedAssignment_150645); if (state.failed) return ;
+            match(input,109,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOffsetLocatorAccess().getFixedFixedKeyword_1_0()); 
             }
@@ -72154,22 +72154,22 @@ public final void rule__OffsetLocator__FixedAssignment_1() throws RecognitionExc
 
 
     // $ANTLR start "rule__OffsetLocator__ValueAssignment_2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25134:1: rule__OffsetLocator__ValueAssignment_2 : ( ruleIntValue ) ;
+    // InternalFormat.g:25134:1: rule__OffsetLocator__ValueAssignment_2 : ( ruleIntValue ) ;
     public final void rule__OffsetLocator__ValueAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25138:1: ( ( ruleIntValue ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25139:1: ( ruleIntValue )
+            // InternalFormat.g:25138:1: ( ( ruleIntValue ) )
+            // InternalFormat.g:25139:1: ( ruleIntValue )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25139:1: ( ruleIntValue )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25140:1: ruleIntValue
+            // InternalFormat.g:25139:1: ( ruleIntValue )
+            // InternalFormat.g:25140:1: ruleIntValue
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOffsetLocatorAccess().getValueIntValueParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleIntValue_in_rule__OffsetLocator__ValueAssignment_250684);
+            pushFollow(FOLLOW_2);
             ruleIntValue();
 
             state._fsp--;
@@ -72199,28 +72199,28 @@ public final void rule__OffsetLocator__ValueAssignment_2() throws RecognitionExc
 
 
     // $ANTLR start "rule__OffsetLocator__NobreakAssignment_3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25149:1: rule__OffsetLocator__NobreakAssignment_3 : ( ( 'nobreak' ) ) ;
+    // InternalFormat.g:25149:1: rule__OffsetLocator__NobreakAssignment_3 : ( ( 'nobreak' ) ) ;
     public final void rule__OffsetLocator__NobreakAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25153:1: ( ( ( 'nobreak' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25154:1: ( ( 'nobreak' ) )
+            // InternalFormat.g:25153:1: ( ( ( 'nobreak' ) ) )
+            // InternalFormat.g:25154:1: ( ( 'nobreak' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25154:1: ( ( 'nobreak' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25155:1: ( 'nobreak' )
+            // InternalFormat.g:25154:1: ( ( 'nobreak' ) )
+            // InternalFormat.g:25155:1: ( 'nobreak' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOffsetLocatorAccess().getNobreakNobreakKeyword_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25156:1: ( 'nobreak' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25157:1: 'nobreak'
+            // InternalFormat.g:25156:1: ( 'nobreak' )
+            // InternalFormat.g:25157:1: 'nobreak'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOffsetLocatorAccess().getNobreakNobreakKeyword_3_0()); 
             }
-            match(input,111,FOLLOW_111_in_rule__OffsetLocator__NobreakAssignment_350720); if (state.failed) return ;
+            match(input,111,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOffsetLocatorAccess().getNobreakNobreakKeyword_3_0()); 
             }
@@ -72252,28 +72252,28 @@ public final void rule__OffsetLocator__NobreakAssignment_3() throws RecognitionE
 
 
     // $ANTLR start "rule__IndentLocator__IncrementAssignment_1_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25172:1: rule__IndentLocator__IncrementAssignment_1_0 : ( ( 'increment' ) ) ;
+    // InternalFormat.g:25172:1: rule__IndentLocator__IncrementAssignment_1_0 : ( ( 'increment' ) ) ;
     public final void rule__IndentLocator__IncrementAssignment_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25176:1: ( ( ( 'increment' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25177:1: ( ( 'increment' ) )
+            // InternalFormat.g:25176:1: ( ( ( 'increment' ) ) )
+            // InternalFormat.g:25177:1: ( ( 'increment' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25177:1: ( ( 'increment' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25178:1: ( 'increment' )
+            // InternalFormat.g:25177:1: ( ( 'increment' ) )
+            // InternalFormat.g:25178:1: ( 'increment' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIndentLocatorAccess().getIncrementIncrementKeyword_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25179:1: ( 'increment' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25180:1: 'increment'
+            // InternalFormat.g:25179:1: ( 'increment' )
+            // InternalFormat.g:25180:1: 'increment'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIndentLocatorAccess().getIncrementIncrementKeyword_1_0_0()); 
             }
-            match(input,112,FOLLOW_112_in_rule__IndentLocator__IncrementAssignment_1_050764); if (state.failed) return ;
+            match(input,112,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIndentLocatorAccess().getIncrementIncrementKeyword_1_0_0()); 
             }
@@ -72305,22 +72305,22 @@ public final void rule__IndentLocator__IncrementAssignment_1_0() throws Recognit
 
 
     // $ANTLR start "rule__IndentLocator__ValueAssignment_2_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25195:1: rule__IndentLocator__ValueAssignment_2_0 : ( ruleIntValue ) ;
+    // InternalFormat.g:25195:1: rule__IndentLocator__ValueAssignment_2_0 : ( ruleIntValue ) ;
     public final void rule__IndentLocator__ValueAssignment_2_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25199:1: ( ( ruleIntValue ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25200:1: ( ruleIntValue )
+            // InternalFormat.g:25199:1: ( ( ruleIntValue ) )
+            // InternalFormat.g:25200:1: ( ruleIntValue )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25200:1: ( ruleIntValue )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25201:1: ruleIntValue
+            // InternalFormat.g:25200:1: ( ruleIntValue )
+            // InternalFormat.g:25201:1: ruleIntValue
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIndentLocatorAccess().getValueIntValueParserRuleCall_2_0_0()); 
             }
-            pushFollow(FOLLOW_ruleIntValue_in_rule__IndentLocator__ValueAssignment_2_050803);
+            pushFollow(FOLLOW_2);
             ruleIntValue();
 
             state._fsp--;
@@ -72350,22 +72350,22 @@ public final void rule__IndentLocator__ValueAssignment_2_0() throws RecognitionE
 
 
     // $ANTLR start "rule__IndentLocator__ParameterAssignment_2_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25210:1: rule__IndentLocator__ParameterAssignment_2_1 : ( ruleXBlockExpression ) ;
+    // InternalFormat.g:25210:1: rule__IndentLocator__ParameterAssignment_2_1 : ( ruleXBlockExpression ) ;
     public final void rule__IndentLocator__ParameterAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25214:1: ( ( ruleXBlockExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25215:1: ( ruleXBlockExpression )
+            // InternalFormat.g:25214:1: ( ( ruleXBlockExpression ) )
+            // InternalFormat.g:25215:1: ( ruleXBlockExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25215:1: ( ruleXBlockExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25216:1: ruleXBlockExpression
+            // InternalFormat.g:25215:1: ( ruleXBlockExpression )
+            // InternalFormat.g:25216:1: ruleXBlockExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIndentLocatorAccess().getParameterXBlockExpressionParserRuleCall_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXBlockExpression_in_rule__IndentLocator__ParameterAssignment_2_150834);
+            pushFollow(FOLLOW_2);
             ruleXBlockExpression();
 
             state._fsp--;
@@ -72395,28 +72395,28 @@ public final void rule__IndentLocator__ParameterAssignment_2_1() throws Recognit
 
 
     // $ANTLR start "rule__XAnnotation__AnnotationTypeAssignment_2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25225:1: rule__XAnnotation__AnnotationTypeAssignment_2 : ( ( ruleQualifiedName ) ) ;
+    // InternalFormat.g:25225:1: rule__XAnnotation__AnnotationTypeAssignment_2 : ( ( ruleQualifiedName ) ) ;
     public final void rule__XAnnotation__AnnotationTypeAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25229:1: ( ( ( ruleQualifiedName ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25230:1: ( ( ruleQualifiedName ) )
+            // InternalFormat.g:25229:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalFormat.g:25230:1: ( ( ruleQualifiedName ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25230:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25231:1: ( ruleQualifiedName )
+            // InternalFormat.g:25230:1: ( ( ruleQualifiedName ) )
+            // InternalFormat.g:25231:1: ( ruleQualifiedName )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getAnnotationTypeJvmAnnotationTypeCrossReference_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25232:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25233:1: ruleQualifiedName
+            // InternalFormat.g:25232:1: ( ruleQualifiedName )
+            // InternalFormat.g:25233:1: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getAnnotationTypeJvmAnnotationTypeQualifiedNameParserRuleCall_2_0_1()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_rule__XAnnotation__AnnotationTypeAssignment_250869);
+            pushFollow(FOLLOW_2);
             ruleQualifiedName();
 
             state._fsp--;
@@ -72452,22 +72452,22 @@ public final void rule__XAnnotation__AnnotationTypeAssignment_2() throws Recogni
 
 
     // $ANTLR start "rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25244:1: rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 : ( ruleXAnnotationElementValuePair ) ;
+    // InternalFormat.g:25244:1: rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0 : ( ruleXAnnotationElementValuePair ) ;
     public final void rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25248:1: ( ( ruleXAnnotationElementValuePair ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25249:1: ( ruleXAnnotationElementValuePair )
+            // InternalFormat.g:25248:1: ( ( ruleXAnnotationElementValuePair ) )
+            // InternalFormat.g:25249:1: ( ruleXAnnotationElementValuePair )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25249:1: ( ruleXAnnotationElementValuePair )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25250:1: ruleXAnnotationElementValuePair
+            // InternalFormat.g:25249:1: ( ruleXAnnotationElementValuePair )
+            // InternalFormat.g:25250:1: ruleXAnnotationElementValuePair
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getElementValuePairsXAnnotationElementValuePairParserRuleCall_3_1_0_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationElementValuePair_in_rule__XAnnotation__ElementValuePairsAssignment_3_1_0_050904);
+            pushFollow(FOLLOW_2);
             ruleXAnnotationElementValuePair();
 
             state._fsp--;
@@ -72497,22 +72497,22 @@ public final void rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0() throw
 
 
     // $ANTLR start "rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25259:1: rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 : ( ruleXAnnotationElementValuePair ) ;
+    // InternalFormat.g:25259:1: rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1 : ( ruleXAnnotationElementValuePair ) ;
     public final void rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25263:1: ( ( ruleXAnnotationElementValuePair ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25264:1: ( ruleXAnnotationElementValuePair )
+            // InternalFormat.g:25263:1: ( ( ruleXAnnotationElementValuePair ) )
+            // InternalFormat.g:25264:1: ( ruleXAnnotationElementValuePair )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25264:1: ( ruleXAnnotationElementValuePair )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25265:1: ruleXAnnotationElementValuePair
+            // InternalFormat.g:25264:1: ( ruleXAnnotationElementValuePair )
+            // InternalFormat.g:25265:1: ruleXAnnotationElementValuePair
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getElementValuePairsXAnnotationElementValuePairParserRuleCall_3_1_0_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationElementValuePair_in_rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_150935);
+            pushFollow(FOLLOW_2);
             ruleXAnnotationElementValuePair();
 
             state._fsp--;
@@ -72542,22 +72542,22 @@ public final void rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1() thr
 
 
     // $ANTLR start "rule__XAnnotation__ValueAssignment_3_1_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25274:1: rule__XAnnotation__ValueAssignment_3_1_1 : ( ruleXAnnotationElementValueOrCommaList ) ;
+    // InternalFormat.g:25274:1: rule__XAnnotation__ValueAssignment_3_1_1 : ( ruleXAnnotationElementValueOrCommaList ) ;
     public final void rule__XAnnotation__ValueAssignment_3_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25278:1: ( ( ruleXAnnotationElementValueOrCommaList ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25279:1: ( ruleXAnnotationElementValueOrCommaList )
+            // InternalFormat.g:25278:1: ( ( ruleXAnnotationElementValueOrCommaList ) )
+            // InternalFormat.g:25279:1: ( ruleXAnnotationElementValueOrCommaList )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25279:1: ( ruleXAnnotationElementValueOrCommaList )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25280:1: ruleXAnnotationElementValueOrCommaList
+            // InternalFormat.g:25279:1: ( ruleXAnnotationElementValueOrCommaList )
+            // InternalFormat.g:25280:1: ruleXAnnotationElementValueOrCommaList
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationAccess().getValueXAnnotationElementValueOrCommaListParserRuleCall_3_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationElementValueOrCommaList_in_rule__XAnnotation__ValueAssignment_3_1_150966);
+            pushFollow(FOLLOW_2);
             ruleXAnnotationElementValueOrCommaList();
 
             state._fsp--;
@@ -72587,28 +72587,28 @@ public final void rule__XAnnotation__ValueAssignment_3_1_1() throws RecognitionE
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__ElementAssignment_0_0_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25289:1: rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 : ( ( ruleValidID ) ) ;
+    // InternalFormat.g:25289:1: rule__XAnnotationElementValuePair__ElementAssignment_0_0_0 : ( ( ruleValidID ) ) ;
     public final void rule__XAnnotationElementValuePair__ElementAssignment_0_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25293:1: ( ( ( ruleValidID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25294:1: ( ( ruleValidID ) )
+            // InternalFormat.g:25293:1: ( ( ( ruleValidID ) ) )
+            // InternalFormat.g:25294:1: ( ( ruleValidID ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25294:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25295:1: ( ruleValidID )
+            // InternalFormat.g:25294:1: ( ( ruleValidID ) )
+            // InternalFormat.g:25295:1: ( ruleValidID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getElementJvmOperationCrossReference_0_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25296:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25297:1: ruleValidID
+            // InternalFormat.g:25296:1: ( ruleValidID )
+            // InternalFormat.g:25297:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getElementJvmOperationValidIDParserRuleCall_0_0_0_0_1()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__XAnnotationElementValuePair__ElementAssignment_0_0_051001);
+            pushFollow(FOLLOW_2);
             ruleValidID();
 
             state._fsp--;
@@ -72644,22 +72644,22 @@ public final void rule__XAnnotationElementValuePair__ElementAssignment_0_0_0() t
 
 
     // $ANTLR start "rule__XAnnotationElementValuePair__ValueAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25308:1: rule__XAnnotationElementValuePair__ValueAssignment_1 : ( ruleXAnnotationElementValue ) ;
+    // InternalFormat.g:25308:1: rule__XAnnotationElementValuePair__ValueAssignment_1 : ( ruleXAnnotationElementValue ) ;
     public final void rule__XAnnotationElementValuePair__ValueAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25312:1: ( ( ruleXAnnotationElementValue ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25313:1: ( ruleXAnnotationElementValue )
+            // InternalFormat.g:25312:1: ( ( ruleXAnnotationElementValue ) )
+            // InternalFormat.g:25313:1: ( ruleXAnnotationElementValue )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25313:1: ( ruleXAnnotationElementValue )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25314:1: ruleXAnnotationElementValue
+            // InternalFormat.g:25313:1: ( ruleXAnnotationElementValue )
+            // InternalFormat.g:25314:1: ruleXAnnotationElementValue
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValuePairAccess().getValueXAnnotationElementValueParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationElementValue_in_rule__XAnnotationElementValuePair__ValueAssignment_151036);
+            pushFollow(FOLLOW_2);
             ruleXAnnotationElementValue();
 
             state._fsp--;
@@ -72689,22 +72689,22 @@ public final void rule__XAnnotationElementValuePair__ValueAssignment_1() throws
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25323:1: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 : ( ruleXAnnotationOrExpression ) ;
+    // InternalFormat.g:25323:1: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0 : ( ruleXAnnotationOrExpression ) ;
     public final void rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25327:1: ( ( ruleXAnnotationOrExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25328:1: ( ruleXAnnotationOrExpression )
+            // InternalFormat.g:25327:1: ( ( ruleXAnnotationOrExpression ) )
+            // InternalFormat.g:25328:1: ( ruleXAnnotationOrExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25328:1: ( ruleXAnnotationOrExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25329:1: ruleXAnnotationOrExpression
+            // InternalFormat.g:25328:1: ( ruleXAnnotationOrExpression )
+            // InternalFormat.g:25329:1: ruleXAnnotationOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsXAnnotationOrExpressionParserRuleCall_0_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_051067);
+            pushFollow(FOLLOW_2);
             ruleXAnnotationOrExpression();
 
             state._fsp--;
@@ -72734,22 +72734,22 @@ public final void rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25338:1: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 : ( ruleXAnnotationOrExpression ) ;
+    // InternalFormat.g:25338:1: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1 : ( ruleXAnnotationOrExpression ) ;
     public final void rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25342:1: ( ( ruleXAnnotationOrExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25343:1: ( ruleXAnnotationOrExpression )
+            // InternalFormat.g:25342:1: ( ( ruleXAnnotationOrExpression ) )
+            // InternalFormat.g:25343:1: ( ruleXAnnotationOrExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25343:1: ( ruleXAnnotationOrExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25344:1: ruleXAnnotationOrExpression
+            // InternalFormat.g:25343:1: ( ruleXAnnotationOrExpression )
+            // InternalFormat.g:25344:1: ruleXAnnotationOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsXAnnotationOrExpressionParserRuleCall_0_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_151098);
+            pushFollow(FOLLOW_2);
             ruleXAnnotationOrExpression();
 
             state._fsp--;
@@ -72779,22 +72779,22 @@ public final void rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0
 
 
     // $ANTLR start "rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25353:1: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 : ( ruleXAnnotationOrExpression ) ;
+    // InternalFormat.g:25353:1: rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1 : ( ruleXAnnotationOrExpression ) ;
     public final void rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25357:1: ( ( ruleXAnnotationOrExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25358:1: ( ruleXAnnotationOrExpression )
+            // InternalFormat.g:25357:1: ( ( ruleXAnnotationOrExpression ) )
+            // InternalFormat.g:25358:1: ( ruleXAnnotationOrExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25358:1: ( ruleXAnnotationOrExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25359:1: ruleXAnnotationOrExpression
+            // InternalFormat.g:25358:1: ( ruleXAnnotationOrExpression )
+            // InternalFormat.g:25359:1: ruleXAnnotationOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsXAnnotationOrExpressionParserRuleCall_1_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_151129);
+            pushFollow(FOLLOW_2);
             ruleXAnnotationOrExpression();
 
             state._fsp--;
@@ -72824,22 +72824,22 @@ public final void rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1
 
 
     // $ANTLR start "rule__XAnnotationElementValue__ElementsAssignment_0_1_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25368:1: rule__XAnnotationElementValue__ElementsAssignment_0_1_0 : ( ruleXAnnotationOrExpression ) ;
+    // InternalFormat.g:25368:1: rule__XAnnotationElementValue__ElementsAssignment_0_1_0 : ( ruleXAnnotationOrExpression ) ;
     public final void rule__XAnnotationElementValue__ElementsAssignment_0_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25372:1: ( ( ruleXAnnotationOrExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25373:1: ( ruleXAnnotationOrExpression )
+            // InternalFormat.g:25372:1: ( ( ruleXAnnotationOrExpression ) )
+            // InternalFormat.g:25373:1: ( ruleXAnnotationOrExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25373:1: ( ruleXAnnotationOrExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25374:1: ruleXAnnotationOrExpression
+            // InternalFormat.g:25373:1: ( ruleXAnnotationOrExpression )
+            // InternalFormat.g:25374:1: ruleXAnnotationOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getElementsXAnnotationOrExpressionParserRuleCall_0_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValue__ElementsAssignment_0_1_051160);
+            pushFollow(FOLLOW_2);
             ruleXAnnotationOrExpression();
 
             state._fsp--;
@@ -72869,22 +72869,22 @@ public final void rule__XAnnotationElementValue__ElementsAssignment_0_1_0() thro
 
 
     // $ANTLR start "rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25383:1: rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 : ( ruleXAnnotationOrExpression ) ;
+    // InternalFormat.g:25383:1: rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1 : ( ruleXAnnotationOrExpression ) ;
     public final void rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25387:1: ( ( ruleXAnnotationOrExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25388:1: ( ruleXAnnotationOrExpression )
+            // InternalFormat.g:25387:1: ( ( ruleXAnnotationOrExpression ) )
+            // InternalFormat.g:25388:1: ( ruleXAnnotationOrExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25388:1: ( ruleXAnnotationOrExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25389:1: ruleXAnnotationOrExpression
+            // InternalFormat.g:25388:1: ( ruleXAnnotationOrExpression )
+            // InternalFormat.g:25389:1: ruleXAnnotationOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAnnotationElementValueAccess().getElementsXAnnotationOrExpressionParserRuleCall_0_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValue__ElementsAssignment_0_1_1_151191);
+            pushFollow(FOLLOW_2);
             ruleXAnnotationOrExpression();
 
             state._fsp--;
@@ -72914,28 +72914,28 @@ public final void rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1() th
 
 
     // $ANTLR start "rule__XAssignment__FeatureAssignment_0_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25398:1: rule__XAssignment__FeatureAssignment_0_1 : ( ( ruleFeatureCallID ) ) ;
+    // InternalFormat.g:25398:1: rule__XAssignment__FeatureAssignment_0_1 : ( ( ruleFeatureCallID ) ) ;
     public final void rule__XAssignment__FeatureAssignment_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25402:1: ( ( ( ruleFeatureCallID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25403:1: ( ( ruleFeatureCallID ) )
+            // InternalFormat.g:25402:1: ( ( ( ruleFeatureCallID ) ) )
+            // InternalFormat.g:25403:1: ( ( ruleFeatureCallID ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25403:1: ( ( ruleFeatureCallID ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25404:1: ( ruleFeatureCallID )
+            // InternalFormat.g:25403:1: ( ( ruleFeatureCallID ) )
+            // InternalFormat.g:25404:1: ( ruleFeatureCallID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getFeatureJvmIdentifiableElementCrossReference_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25405:1: ( ruleFeatureCallID )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25406:1: ruleFeatureCallID
+            // InternalFormat.g:25405:1: ( ruleFeatureCallID )
+            // InternalFormat.g:25406:1: ruleFeatureCallID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getFeatureJvmIdentifiableElementFeatureCallIDParserRuleCall_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleFeatureCallID_in_rule__XAssignment__FeatureAssignment_0_151226);
+            pushFollow(FOLLOW_2);
             ruleFeatureCallID();
 
             state._fsp--;
@@ -72971,22 +72971,22 @@ public final void rule__XAssignment__FeatureAssignment_0_1() throws RecognitionE
 
 
     // $ANTLR start "rule__XAssignment__ValueAssignment_0_3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25417:1: rule__XAssignment__ValueAssignment_0_3 : ( ruleXAssignment ) ;
+    // InternalFormat.g:25417:1: rule__XAssignment__ValueAssignment_0_3 : ( ruleXAssignment ) ;
     public final void rule__XAssignment__ValueAssignment_0_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25421:1: ( ( ruleXAssignment ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25422:1: ( ruleXAssignment )
+            // InternalFormat.g:25421:1: ( ( ruleXAssignment ) )
+            // InternalFormat.g:25422:1: ( ruleXAssignment )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25422:1: ( ruleXAssignment )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25423:1: ruleXAssignment
+            // InternalFormat.g:25422:1: ( ruleXAssignment )
+            // InternalFormat.g:25423:1: ruleXAssignment
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getValueXAssignmentParserRuleCall_0_3_0()); 
             }
-            pushFollow(FOLLOW_ruleXAssignment_in_rule__XAssignment__ValueAssignment_0_351261);
+            pushFollow(FOLLOW_2);
             ruleXAssignment();
 
             state._fsp--;
@@ -73016,28 +73016,28 @@ public final void rule__XAssignment__ValueAssignment_0_3() throws RecognitionExc
 
 
     // $ANTLR start "rule__XAssignment__FeatureAssignment_1_1_0_0_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25432:1: rule__XAssignment__FeatureAssignment_1_1_0_0_1 : ( ( ruleOpMultiAssign ) ) ;
+    // InternalFormat.g:25432:1: rule__XAssignment__FeatureAssignment_1_1_0_0_1 : ( ( ruleOpMultiAssign ) ) ;
     public final void rule__XAssignment__FeatureAssignment_1_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25436:1: ( ( ( ruleOpMultiAssign ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25437:1: ( ( ruleOpMultiAssign ) )
+            // InternalFormat.g:25436:1: ( ( ( ruleOpMultiAssign ) ) )
+            // InternalFormat.g:25437:1: ( ( ruleOpMultiAssign ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25437:1: ( ( ruleOpMultiAssign ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25438:1: ( ruleOpMultiAssign )
+            // InternalFormat.g:25437:1: ( ( ruleOpMultiAssign ) )
+            // InternalFormat.g:25438:1: ( ruleOpMultiAssign )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getFeatureJvmIdentifiableElementCrossReference_1_1_0_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25439:1: ( ruleOpMultiAssign )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25440:1: ruleOpMultiAssign
+            // InternalFormat.g:25439:1: ( ruleOpMultiAssign )
+            // InternalFormat.g:25440:1: ruleOpMultiAssign
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getFeatureJvmIdentifiableElementOpMultiAssignParserRuleCall_1_1_0_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpMultiAssign_in_rule__XAssignment__FeatureAssignment_1_1_0_0_151296);
+            pushFollow(FOLLOW_2);
             ruleOpMultiAssign();
 
             state._fsp--;
@@ -73073,22 +73073,22 @@ public final void rule__XAssignment__FeatureAssignment_1_1_0_0_1() throws Recogn
 
 
     // $ANTLR start "rule__XAssignment__RightOperandAssignment_1_1_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25451:1: rule__XAssignment__RightOperandAssignment_1_1_1 : ( ruleXAssignment ) ;
+    // InternalFormat.g:25451:1: rule__XAssignment__RightOperandAssignment_1_1_1 : ( ruleXAssignment ) ;
     public final void rule__XAssignment__RightOperandAssignment_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25455:1: ( ( ruleXAssignment ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25456:1: ( ruleXAssignment )
+            // InternalFormat.g:25455:1: ( ( ruleXAssignment ) )
+            // InternalFormat.g:25456:1: ( ruleXAssignment )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25456:1: ( ruleXAssignment )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25457:1: ruleXAssignment
+            // InternalFormat.g:25456:1: ( ruleXAssignment )
+            // InternalFormat.g:25457:1: ruleXAssignment
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAssignmentAccess().getRightOperandXAssignmentParserRuleCall_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXAssignment_in_rule__XAssignment__RightOperandAssignment_1_1_151331);
+            pushFollow(FOLLOW_2);
             ruleXAssignment();
 
             state._fsp--;
@@ -73118,28 +73118,28 @@ public final void rule__XAssignment__RightOperandAssignment_1_1_1() throws Recog
 
 
     // $ANTLR start "rule__XOrExpression__FeatureAssignment_1_0_0_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25466:1: rule__XOrExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpOr ) ) ;
+    // InternalFormat.g:25466:1: rule__XOrExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpOr ) ) ;
     public final void rule__XOrExpression__FeatureAssignment_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25470:1: ( ( ( ruleOpOr ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25471:1: ( ( ruleOpOr ) )
+            // InternalFormat.g:25470:1: ( ( ( ruleOpOr ) ) )
+            // InternalFormat.g:25471:1: ( ( ruleOpOr ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25471:1: ( ( ruleOpOr ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25472:1: ( ruleOpOr )
+            // InternalFormat.g:25471:1: ( ( ruleOpOr ) )
+            // InternalFormat.g:25472:1: ( ruleOpOr )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25473:1: ( ruleOpOr )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25474:1: ruleOpOr
+            // InternalFormat.g:25473:1: ( ruleOpOr )
+            // InternalFormat.g:25474:1: ruleOpOr
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getFeatureJvmIdentifiableElementOpOrParserRuleCall_1_0_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpOr_in_rule__XOrExpression__FeatureAssignment_1_0_0_151366);
+            pushFollow(FOLLOW_2);
             ruleOpOr();
 
             state._fsp--;
@@ -73175,22 +73175,22 @@ public final void rule__XOrExpression__FeatureAssignment_1_0_0_1() throws Recogn
 
 
     // $ANTLR start "rule__XOrExpression__RightOperandAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25485:1: rule__XOrExpression__RightOperandAssignment_1_1 : ( ruleXAndExpression ) ;
+    // InternalFormat.g:25485:1: rule__XOrExpression__RightOperandAssignment_1_1 : ( ruleXAndExpression ) ;
     public final void rule__XOrExpression__RightOperandAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25489:1: ( ( ruleXAndExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25490:1: ( ruleXAndExpression )
+            // InternalFormat.g:25489:1: ( ( ruleXAndExpression ) )
+            // InternalFormat.g:25490:1: ( ruleXAndExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25490:1: ( ruleXAndExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25491:1: ruleXAndExpression
+            // InternalFormat.g:25490:1: ( ruleXAndExpression )
+            // InternalFormat.g:25491:1: ruleXAndExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOrExpressionAccess().getRightOperandXAndExpressionParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXAndExpression_in_rule__XOrExpression__RightOperandAssignment_1_151401);
+            pushFollow(FOLLOW_2);
             ruleXAndExpression();
 
             state._fsp--;
@@ -73220,28 +73220,28 @@ public final void rule__XOrExpression__RightOperandAssignment_1_1() throws Recog
 
 
     // $ANTLR start "rule__XAndExpression__FeatureAssignment_1_0_0_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25500:1: rule__XAndExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpAnd ) ) ;
+    // InternalFormat.g:25500:1: rule__XAndExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpAnd ) ) ;
     public final void rule__XAndExpression__FeatureAssignment_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25504:1: ( ( ( ruleOpAnd ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25505:1: ( ( ruleOpAnd ) )
+            // InternalFormat.g:25504:1: ( ( ( ruleOpAnd ) ) )
+            // InternalFormat.g:25505:1: ( ( ruleOpAnd ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25505:1: ( ( ruleOpAnd ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25506:1: ( ruleOpAnd )
+            // InternalFormat.g:25505:1: ( ( ruleOpAnd ) )
+            // InternalFormat.g:25506:1: ( ruleOpAnd )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25507:1: ( ruleOpAnd )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25508:1: ruleOpAnd
+            // InternalFormat.g:25507:1: ( ruleOpAnd )
+            // InternalFormat.g:25508:1: ruleOpAnd
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getFeatureJvmIdentifiableElementOpAndParserRuleCall_1_0_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpAnd_in_rule__XAndExpression__FeatureAssignment_1_0_0_151436);
+            pushFollow(FOLLOW_2);
             ruleOpAnd();
 
             state._fsp--;
@@ -73277,22 +73277,22 @@ public final void rule__XAndExpression__FeatureAssignment_1_0_0_1() throws Recog
 
 
     // $ANTLR start "rule__XAndExpression__RightOperandAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25519:1: rule__XAndExpression__RightOperandAssignment_1_1 : ( ruleXEqualityExpression ) ;
+    // InternalFormat.g:25519:1: rule__XAndExpression__RightOperandAssignment_1_1 : ( ruleXEqualityExpression ) ;
     public final void rule__XAndExpression__RightOperandAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25523:1: ( ( ruleXEqualityExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25524:1: ( ruleXEqualityExpression )
+            // InternalFormat.g:25523:1: ( ( ruleXEqualityExpression ) )
+            // InternalFormat.g:25524:1: ( ruleXEqualityExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25524:1: ( ruleXEqualityExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25525:1: ruleXEqualityExpression
+            // InternalFormat.g:25524:1: ( ruleXEqualityExpression )
+            // InternalFormat.g:25525:1: ruleXEqualityExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAndExpressionAccess().getRightOperandXEqualityExpressionParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXEqualityExpression_in_rule__XAndExpression__RightOperandAssignment_1_151471);
+            pushFollow(FOLLOW_2);
             ruleXEqualityExpression();
 
             state._fsp--;
@@ -73322,28 +73322,28 @@ public final void rule__XAndExpression__RightOperandAssignment_1_1() throws Reco
 
 
     // $ANTLR start "rule__XEqualityExpression__FeatureAssignment_1_0_0_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25534:1: rule__XEqualityExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpEquality ) ) ;
+    // InternalFormat.g:25534:1: rule__XEqualityExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpEquality ) ) ;
     public final void rule__XEqualityExpression__FeatureAssignment_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25538:1: ( ( ( ruleOpEquality ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25539:1: ( ( ruleOpEquality ) )
+            // InternalFormat.g:25538:1: ( ( ( ruleOpEquality ) ) )
+            // InternalFormat.g:25539:1: ( ( ruleOpEquality ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25539:1: ( ( ruleOpEquality ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25540:1: ( ruleOpEquality )
+            // InternalFormat.g:25539:1: ( ( ruleOpEquality ) )
+            // InternalFormat.g:25540:1: ( ruleOpEquality )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25541:1: ( ruleOpEquality )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25542:1: ruleOpEquality
+            // InternalFormat.g:25541:1: ( ruleOpEquality )
+            // InternalFormat.g:25542:1: ruleOpEquality
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getFeatureJvmIdentifiableElementOpEqualityParserRuleCall_1_0_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpEquality_in_rule__XEqualityExpression__FeatureAssignment_1_0_0_151506);
+            pushFollow(FOLLOW_2);
             ruleOpEquality();
 
             state._fsp--;
@@ -73379,22 +73379,22 @@ public final void rule__XEqualityExpression__FeatureAssignment_1_0_0_1() throws
 
 
     // $ANTLR start "rule__XEqualityExpression__RightOperandAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25553:1: rule__XEqualityExpression__RightOperandAssignment_1_1 : ( ruleXRelationalExpression ) ;
+    // InternalFormat.g:25553:1: rule__XEqualityExpression__RightOperandAssignment_1_1 : ( ruleXRelationalExpression ) ;
     public final void rule__XEqualityExpression__RightOperandAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25557:1: ( ( ruleXRelationalExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25558:1: ( ruleXRelationalExpression )
+            // InternalFormat.g:25557:1: ( ( ruleXRelationalExpression ) )
+            // InternalFormat.g:25558:1: ( ruleXRelationalExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25558:1: ( ruleXRelationalExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25559:1: ruleXRelationalExpression
+            // InternalFormat.g:25558:1: ( ruleXRelationalExpression )
+            // InternalFormat.g:25559:1: ruleXRelationalExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXEqualityExpressionAccess().getRightOperandXRelationalExpressionParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXRelationalExpression_in_rule__XEqualityExpression__RightOperandAssignment_1_151541);
+            pushFollow(FOLLOW_2);
             ruleXRelationalExpression();
 
             state._fsp--;
@@ -73424,22 +73424,22 @@ public final void rule__XEqualityExpression__RightOperandAssignment_1_1() throws
 
 
     // $ANTLR start "rule__XRelationalExpression__TypeAssignment_1_0_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25568:1: rule__XRelationalExpression__TypeAssignment_1_0_1 : ( ruleJvmTypeReference ) ;
+    // InternalFormat.g:25568:1: rule__XRelationalExpression__TypeAssignment_1_0_1 : ( ruleJvmTypeReference ) ;
     public final void rule__XRelationalExpression__TypeAssignment_1_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25572:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25573:1: ( ruleJvmTypeReference )
+            // InternalFormat.g:25572:1: ( ( ruleJvmTypeReference ) )
+            // InternalFormat.g:25573:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25573:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25574:1: ruleJvmTypeReference
+            // InternalFormat.g:25573:1: ( ruleJvmTypeReference )
+            // InternalFormat.g:25574:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getTypeJvmTypeReferenceParserRuleCall_1_0_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__XRelationalExpression__TypeAssignment_1_0_151572);
+            pushFollow(FOLLOW_2);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -73469,28 +73469,28 @@ public final void rule__XRelationalExpression__TypeAssignment_1_0_1() throws Rec
 
 
     // $ANTLR start "rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25583:1: rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 : ( ( ruleOpCompare ) ) ;
+    // InternalFormat.g:25583:1: rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1 : ( ( ruleOpCompare ) ) ;
     public final void rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25587:1: ( ( ( ruleOpCompare ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25588:1: ( ( ruleOpCompare ) )
+            // InternalFormat.g:25587:1: ( ( ( ruleOpCompare ) ) )
+            // InternalFormat.g:25588:1: ( ( ruleOpCompare ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25588:1: ( ( ruleOpCompare ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25589:1: ( ruleOpCompare )
+            // InternalFormat.g:25588:1: ( ( ruleOpCompare ) )
+            // InternalFormat.g:25589:1: ( ruleOpCompare )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_1_0_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25590:1: ( ruleOpCompare )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25591:1: ruleOpCompare
+            // InternalFormat.g:25590:1: ( ruleOpCompare )
+            // InternalFormat.g:25591:1: ruleOpCompare
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getFeatureJvmIdentifiableElementOpCompareParserRuleCall_1_1_0_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpCompare_in_rule__XRelationalExpression__FeatureAssignment_1_1_0_0_151607);
+            pushFollow(FOLLOW_2);
             ruleOpCompare();
 
             state._fsp--;
@@ -73526,22 +73526,22 @@ public final void rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1() thr
 
 
     // $ANTLR start "rule__XRelationalExpression__RightOperandAssignment_1_1_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25602:1: rule__XRelationalExpression__RightOperandAssignment_1_1_1 : ( ruleXOtherOperatorExpression ) ;
+    // InternalFormat.g:25602:1: rule__XRelationalExpression__RightOperandAssignment_1_1_1 : ( ruleXOtherOperatorExpression ) ;
     public final void rule__XRelationalExpression__RightOperandAssignment_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25606:1: ( ( ruleXOtherOperatorExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25607:1: ( ruleXOtherOperatorExpression )
+            // InternalFormat.g:25606:1: ( ( ruleXOtherOperatorExpression ) )
+            // InternalFormat.g:25607:1: ( ruleXOtherOperatorExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25607:1: ( ruleXOtherOperatorExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25608:1: ruleXOtherOperatorExpression
+            // InternalFormat.g:25607:1: ( ruleXOtherOperatorExpression )
+            // InternalFormat.g:25608:1: ruleXOtherOperatorExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXRelationalExpressionAccess().getRightOperandXOtherOperatorExpressionParserRuleCall_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXOtherOperatorExpression_in_rule__XRelationalExpression__RightOperandAssignment_1_1_151642);
+            pushFollow(FOLLOW_2);
             ruleXOtherOperatorExpression();
 
             state._fsp--;
@@ -73571,28 +73571,28 @@ public final void rule__XRelationalExpression__RightOperandAssignment_1_1_1() th
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25617:1: rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpOther ) ) ;
+    // InternalFormat.g:25617:1: rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpOther ) ) ;
     public final void rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25621:1: ( ( ( ruleOpOther ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25622:1: ( ( ruleOpOther ) )
+            // InternalFormat.g:25621:1: ( ( ( ruleOpOther ) ) )
+            // InternalFormat.g:25622:1: ( ( ruleOpOther ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25622:1: ( ( ruleOpOther ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25623:1: ( ruleOpOther )
+            // InternalFormat.g:25622:1: ( ( ruleOpOther ) )
+            // InternalFormat.g:25623:1: ( ruleOpOther )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25624:1: ( ruleOpOther )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25625:1: ruleOpOther
+            // InternalFormat.g:25624:1: ( ruleOpOther )
+            // InternalFormat.g:25625:1: ruleOpOther
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getFeatureJvmIdentifiableElementOpOtherParserRuleCall_1_0_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpOther_in_rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_151677);
+            pushFollow(FOLLOW_2);
             ruleOpOther();
 
             state._fsp--;
@@ -73628,22 +73628,22 @@ public final void rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1() th
 
 
     // $ANTLR start "rule__XOtherOperatorExpression__RightOperandAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25636:1: rule__XOtherOperatorExpression__RightOperandAssignment_1_1 : ( ruleXAdditiveExpression ) ;
+    // InternalFormat.g:25636:1: rule__XOtherOperatorExpression__RightOperandAssignment_1_1 : ( ruleXAdditiveExpression ) ;
     public final void rule__XOtherOperatorExpression__RightOperandAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25640:1: ( ( ruleXAdditiveExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25641:1: ( ruleXAdditiveExpression )
+            // InternalFormat.g:25640:1: ( ( ruleXAdditiveExpression ) )
+            // InternalFormat.g:25641:1: ( ruleXAdditiveExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25641:1: ( ruleXAdditiveExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25642:1: ruleXAdditiveExpression
+            // InternalFormat.g:25641:1: ( ruleXAdditiveExpression )
+            // InternalFormat.g:25642:1: ruleXAdditiveExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXOtherOperatorExpressionAccess().getRightOperandXAdditiveExpressionParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXAdditiveExpression_in_rule__XOtherOperatorExpression__RightOperandAssignment_1_151712);
+            pushFollow(FOLLOW_2);
             ruleXAdditiveExpression();
 
             state._fsp--;
@@ -73673,28 +73673,28 @@ public final void rule__XOtherOperatorExpression__RightOperandAssignment_1_1() t
 
 
     // $ANTLR start "rule__XAdditiveExpression__FeatureAssignment_1_0_0_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25651:1: rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpAdd ) ) ;
+    // InternalFormat.g:25651:1: rule__XAdditiveExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpAdd ) ) ;
     public final void rule__XAdditiveExpression__FeatureAssignment_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25655:1: ( ( ( ruleOpAdd ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25656:1: ( ( ruleOpAdd ) )
+            // InternalFormat.g:25655:1: ( ( ( ruleOpAdd ) ) )
+            // InternalFormat.g:25656:1: ( ( ruleOpAdd ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25656:1: ( ( ruleOpAdd ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25657:1: ( ruleOpAdd )
+            // InternalFormat.g:25656:1: ( ( ruleOpAdd ) )
+            // InternalFormat.g:25657:1: ( ruleOpAdd )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25658:1: ( ruleOpAdd )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25659:1: ruleOpAdd
+            // InternalFormat.g:25658:1: ( ruleOpAdd )
+            // InternalFormat.g:25659:1: ruleOpAdd
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getFeatureJvmIdentifiableElementOpAddParserRuleCall_1_0_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpAdd_in_rule__XAdditiveExpression__FeatureAssignment_1_0_0_151747);
+            pushFollow(FOLLOW_2);
             ruleOpAdd();
 
             state._fsp--;
@@ -73730,22 +73730,22 @@ public final void rule__XAdditiveExpression__FeatureAssignment_1_0_0_1() throws
 
 
     // $ANTLR start "rule__XAdditiveExpression__RightOperandAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25670:1: rule__XAdditiveExpression__RightOperandAssignment_1_1 : ( ruleXMultiplicativeExpression ) ;
+    // InternalFormat.g:25670:1: rule__XAdditiveExpression__RightOperandAssignment_1_1 : ( ruleXMultiplicativeExpression ) ;
     public final void rule__XAdditiveExpression__RightOperandAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25674:1: ( ( ruleXMultiplicativeExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25675:1: ( ruleXMultiplicativeExpression )
+            // InternalFormat.g:25674:1: ( ( ruleXMultiplicativeExpression ) )
+            // InternalFormat.g:25675:1: ( ruleXMultiplicativeExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25675:1: ( ruleXMultiplicativeExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25676:1: ruleXMultiplicativeExpression
+            // InternalFormat.g:25675:1: ( ruleXMultiplicativeExpression )
+            // InternalFormat.g:25676:1: ruleXMultiplicativeExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXAdditiveExpressionAccess().getRightOperandXMultiplicativeExpressionParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXMultiplicativeExpression_in_rule__XAdditiveExpression__RightOperandAssignment_1_151782);
+            pushFollow(FOLLOW_2);
             ruleXMultiplicativeExpression();
 
             state._fsp--;
@@ -73775,28 +73775,28 @@ public final void rule__XAdditiveExpression__RightOperandAssignment_1_1() throws
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25685:1: rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpMulti ) ) ;
+    // InternalFormat.g:25685:1: rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1 : ( ( ruleOpMulti ) ) ;
     public final void rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25689:1: ( ( ( ruleOpMulti ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25690:1: ( ( ruleOpMulti ) )
+            // InternalFormat.g:25689:1: ( ( ( ruleOpMulti ) ) )
+            // InternalFormat.g:25690:1: ( ( ruleOpMulti ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25690:1: ( ( ruleOpMulti ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25691:1: ( ruleOpMulti )
+            // InternalFormat.g:25690:1: ( ( ruleOpMulti ) )
+            // InternalFormat.g:25691:1: ( ruleOpMulti )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25692:1: ( ruleOpMulti )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25693:1: ruleOpMulti
+            // InternalFormat.g:25692:1: ( ruleOpMulti )
+            // InternalFormat.g:25693:1: ruleOpMulti
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getFeatureJvmIdentifiableElementOpMultiParserRuleCall_1_0_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpMulti_in_rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_151817);
+            pushFollow(FOLLOW_2);
             ruleOpMulti();
 
             state._fsp--;
@@ -73832,22 +73832,22 @@ public final void rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1() t
 
 
     // $ANTLR start "rule__XMultiplicativeExpression__RightOperandAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25704:1: rule__XMultiplicativeExpression__RightOperandAssignment_1_1 : ( ruleXUnaryOperation ) ;
+    // InternalFormat.g:25704:1: rule__XMultiplicativeExpression__RightOperandAssignment_1_1 : ( ruleXUnaryOperation ) ;
     public final void rule__XMultiplicativeExpression__RightOperandAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25708:1: ( ( ruleXUnaryOperation ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25709:1: ( ruleXUnaryOperation )
+            // InternalFormat.g:25708:1: ( ( ruleXUnaryOperation ) )
+            // InternalFormat.g:25709:1: ( ruleXUnaryOperation )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25709:1: ( ruleXUnaryOperation )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25710:1: ruleXUnaryOperation
+            // InternalFormat.g:25709:1: ( ruleXUnaryOperation )
+            // InternalFormat.g:25710:1: ruleXUnaryOperation
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMultiplicativeExpressionAccess().getRightOperandXUnaryOperationParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXUnaryOperation_in_rule__XMultiplicativeExpression__RightOperandAssignment_1_151852);
+            pushFollow(FOLLOW_2);
             ruleXUnaryOperation();
 
             state._fsp--;
@@ -73877,28 +73877,28 @@ public final void rule__XMultiplicativeExpression__RightOperandAssignment_1_1()
 
 
     // $ANTLR start "rule__XUnaryOperation__FeatureAssignment_0_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25719:1: rule__XUnaryOperation__FeatureAssignment_0_1 : ( ( ruleOpUnary ) ) ;
+    // InternalFormat.g:25719:1: rule__XUnaryOperation__FeatureAssignment_0_1 : ( ( ruleOpUnary ) ) ;
     public final void rule__XUnaryOperation__FeatureAssignment_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25723:1: ( ( ( ruleOpUnary ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25724:1: ( ( ruleOpUnary ) )
+            // InternalFormat.g:25723:1: ( ( ( ruleOpUnary ) ) )
+            // InternalFormat.g:25724:1: ( ( ruleOpUnary ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25724:1: ( ( ruleOpUnary ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25725:1: ( ruleOpUnary )
+            // InternalFormat.g:25724:1: ( ( ruleOpUnary ) )
+            // InternalFormat.g:25725:1: ( ruleOpUnary )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationAccess().getFeatureJvmIdentifiableElementCrossReference_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25726:1: ( ruleOpUnary )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25727:1: ruleOpUnary
+            // InternalFormat.g:25726:1: ( ruleOpUnary )
+            // InternalFormat.g:25727:1: ruleOpUnary
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationAccess().getFeatureJvmIdentifiableElementOpUnaryParserRuleCall_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpUnary_in_rule__XUnaryOperation__FeatureAssignment_0_151887);
+            pushFollow(FOLLOW_2);
             ruleOpUnary();
 
             state._fsp--;
@@ -73934,22 +73934,22 @@ public final void rule__XUnaryOperation__FeatureAssignment_0_1() throws Recognit
 
 
     // $ANTLR start "rule__XUnaryOperation__OperandAssignment_0_2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25738:1: rule__XUnaryOperation__OperandAssignment_0_2 : ( ruleXUnaryOperation ) ;
+    // InternalFormat.g:25738:1: rule__XUnaryOperation__OperandAssignment_0_2 : ( ruleXUnaryOperation ) ;
     public final void rule__XUnaryOperation__OperandAssignment_0_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25742:1: ( ( ruleXUnaryOperation ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25743:1: ( ruleXUnaryOperation )
+            // InternalFormat.g:25742:1: ( ( ruleXUnaryOperation ) )
+            // InternalFormat.g:25743:1: ( ruleXUnaryOperation )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25743:1: ( ruleXUnaryOperation )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25744:1: ruleXUnaryOperation
+            // InternalFormat.g:25743:1: ( ruleXUnaryOperation )
+            // InternalFormat.g:25744:1: ruleXUnaryOperation
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXUnaryOperationAccess().getOperandXUnaryOperationParserRuleCall_0_2_0()); 
             }
-            pushFollow(FOLLOW_ruleXUnaryOperation_in_rule__XUnaryOperation__OperandAssignment_0_251922);
+            pushFollow(FOLLOW_2);
             ruleXUnaryOperation();
 
             state._fsp--;
@@ -73979,22 +73979,22 @@ public final void rule__XUnaryOperation__OperandAssignment_0_2() throws Recognit
 
 
     // $ANTLR start "rule__XCastedExpression__TypeAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25753:1: rule__XCastedExpression__TypeAssignment_1_1 : ( ruleJvmTypeReference ) ;
+    // InternalFormat.g:25753:1: rule__XCastedExpression__TypeAssignment_1_1 : ( ruleJvmTypeReference ) ;
     public final void rule__XCastedExpression__TypeAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25757:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25758:1: ( ruleJvmTypeReference )
+            // InternalFormat.g:25757:1: ( ( ruleJvmTypeReference ) )
+            // InternalFormat.g:25758:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25758:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25759:1: ruleJvmTypeReference
+            // InternalFormat.g:25758:1: ( ruleJvmTypeReference )
+            // InternalFormat.g:25759:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCastedExpressionAccess().getTypeJvmTypeReferenceParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__XCastedExpression__TypeAssignment_1_151953);
+            pushFollow(FOLLOW_2);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -74024,28 +74024,28 @@ public final void rule__XCastedExpression__TypeAssignment_1_1() throws Recogniti
 
 
     // $ANTLR start "rule__XPostfixOperation__FeatureAssignment_1_0_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25768:1: rule__XPostfixOperation__FeatureAssignment_1_0_1 : ( ( ruleOpPostfix ) ) ;
+    // InternalFormat.g:25768:1: rule__XPostfixOperation__FeatureAssignment_1_0_1 : ( ( ruleOpPostfix ) ) ;
     public final void rule__XPostfixOperation__FeatureAssignment_1_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25772:1: ( ( ( ruleOpPostfix ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25773:1: ( ( ruleOpPostfix ) )
+            // InternalFormat.g:25772:1: ( ( ( ruleOpPostfix ) ) )
+            // InternalFormat.g:25773:1: ( ( ruleOpPostfix ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25773:1: ( ( ruleOpPostfix ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25774:1: ( ruleOpPostfix )
+            // InternalFormat.g:25773:1: ( ( ruleOpPostfix ) )
+            // InternalFormat.g:25774:1: ( ruleOpPostfix )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25775:1: ( ruleOpPostfix )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25776:1: ruleOpPostfix
+            // InternalFormat.g:25775:1: ( ruleOpPostfix )
+            // InternalFormat.g:25776:1: ruleOpPostfix
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXPostfixOperationAccess().getFeatureJvmIdentifiableElementOpPostfixParserRuleCall_1_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleOpPostfix_in_rule__XPostfixOperation__FeatureAssignment_1_0_151988);
+            pushFollow(FOLLOW_2);
             ruleOpPostfix();
 
             state._fsp--;
@@ -74081,28 +74081,28 @@ public final void rule__XPostfixOperation__FeatureAssignment_1_0_1() throws Reco
 
 
     // $ANTLR start "rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25787:1: rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 : ( ( '::' ) ) ;
+    // InternalFormat.g:25787:1: rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1 : ( ( '::' ) ) ;
     public final void rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25791:1: ( ( ( '::' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25792:1: ( ( '::' ) )
+            // InternalFormat.g:25791:1: ( ( ( '::' ) ) )
+            // InternalFormat.g:25792:1: ( ( '::' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25792:1: ( ( '::' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25793:1: ( '::' )
+            // InternalFormat.g:25792:1: ( ( '::' ) )
+            // InternalFormat.g:25793:1: ( '::' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_0_0_0_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25794:1: ( '::' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25795:1: '::'
+            // InternalFormat.g:25794:1: ( '::' )
+            // InternalFormat.g:25795:1: '::'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_0_0_0_1_1_0()); 
             }
-            match(input,113,FOLLOW_113_in_rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_152028); if (state.failed) return ;
+            match(input,113,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_0_0_0_1_1_0()); 
             }
@@ -74134,28 +74134,28 @@ public final void rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1
 
 
     // $ANTLR start "rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25810:1: rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 : ( ( ruleFeatureCallID ) ) ;
+    // InternalFormat.g:25810:1: rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2 : ( ( ruleFeatureCallID ) ) ;
     public final void rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25814:1: ( ( ( ruleFeatureCallID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25815:1: ( ( ruleFeatureCallID ) )
+            // InternalFormat.g:25814:1: ( ( ( ruleFeatureCallID ) ) )
+            // InternalFormat.g:25815:1: ( ( ruleFeatureCallID ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25815:1: ( ( ruleFeatureCallID ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25816:1: ( ruleFeatureCallID )
+            // InternalFormat.g:25815:1: ( ( ruleFeatureCallID ) )
+            // InternalFormat.g:25816:1: ( ruleFeatureCallID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_0_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25817:1: ( ruleFeatureCallID )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25818:1: ruleFeatureCallID
+            // InternalFormat.g:25817:1: ( ruleFeatureCallID )
+            // InternalFormat.g:25818:1: ruleFeatureCallID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getFeatureJvmIdentifiableElementFeatureCallIDParserRuleCall_1_0_0_0_2_0_1()); 
             }
-            pushFollow(FOLLOW_ruleFeatureCallID_in_rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_252071);
+            pushFollow(FOLLOW_2);
             ruleFeatureCallID();
 
             state._fsp--;
@@ -74191,22 +74191,22 @@ public final void rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2() throws
 
 
     // $ANTLR start "rule__XMemberFeatureCall__ValueAssignment_1_0_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25829:1: rule__XMemberFeatureCall__ValueAssignment_1_0_1 : ( ruleXAssignment ) ;
+    // InternalFormat.g:25829:1: rule__XMemberFeatureCall__ValueAssignment_1_0_1 : ( ruleXAssignment ) ;
     public final void rule__XMemberFeatureCall__ValueAssignment_1_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25833:1: ( ( ruleXAssignment ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25834:1: ( ruleXAssignment )
+            // InternalFormat.g:25833:1: ( ( ruleXAssignment ) )
+            // InternalFormat.g:25834:1: ( ruleXAssignment )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25834:1: ( ruleXAssignment )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25835:1: ruleXAssignment
+            // InternalFormat.g:25834:1: ( ruleXAssignment )
+            // InternalFormat.g:25835:1: ruleXAssignment
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getValueXAssignmentParserRuleCall_1_0_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXAssignment_in_rule__XMemberFeatureCall__ValueAssignment_1_0_152106);
+            pushFollow(FOLLOW_2);
             ruleXAssignment();
 
             state._fsp--;
@@ -74236,28 +74236,28 @@ public final void rule__XMemberFeatureCall__ValueAssignment_1_0_1() throws Recog
 
 
     // $ANTLR start "rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25844:1: rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 : ( ( '?.' ) ) ;
+    // InternalFormat.g:25844:1: rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1 : ( ( '?.' ) ) ;
     public final void rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25848:1: ( ( ( '?.' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25849:1: ( ( '?.' ) )
+            // InternalFormat.g:25848:1: ( ( ( '?.' ) ) )
+            // InternalFormat.g:25849:1: ( ( '?.' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25849:1: ( ( '?.' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25850:1: ( '?.' )
+            // InternalFormat.g:25849:1: ( ( '?.' ) )
+            // InternalFormat.g:25850:1: ( '?.' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getNullSafeQuestionMarkFullStopKeyword_1_1_0_0_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25851:1: ( '?.' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25852:1: '?.'
+            // InternalFormat.g:25851:1: ( '?.' )
+            // InternalFormat.g:25852:1: '?.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getNullSafeQuestionMarkFullStopKeyword_1_1_0_0_1_1_0()); 
             }
-            match(input,114,FOLLOW_114_in_rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_152142); if (state.failed) return ;
+            match(input,114,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getNullSafeQuestionMarkFullStopKeyword_1_1_0_0_1_1_0()); 
             }
@@ -74289,28 +74289,28 @@ public final void rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1() thr
 
 
     // $ANTLR start "rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25867:1: rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 : ( ( '::' ) ) ;
+    // InternalFormat.g:25867:1: rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2 : ( ( '::' ) ) ;
     public final void rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25871:1: ( ( ( '::' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25872:1: ( ( '::' ) )
+            // InternalFormat.g:25871:1: ( ( ( '::' ) ) )
+            // InternalFormat.g:25872:1: ( ( '::' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25872:1: ( ( '::' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25873:1: ( '::' )
+            // InternalFormat.g:25872:1: ( ( '::' ) )
+            // InternalFormat.g:25873:1: ( '::' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_1_0_0_1_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25874:1: ( '::' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25875:1: '::'
+            // InternalFormat.g:25874:1: ( '::' )
+            // InternalFormat.g:25875:1: '::'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_1_0_0_1_2_0()); 
             }
-            match(input,113,FOLLOW_113_in_rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_252186); if (state.failed) return ;
+            match(input,113,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_1_0_0_1_2_0()); 
             }
@@ -74342,22 +74342,22 @@ public final void rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2
 
 
     // $ANTLR start "rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25890:1: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalFormat.g:25890:1: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25894:1: ( ( ruleJvmArgumentTypeReference ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25895:1: ( ruleJvmArgumentTypeReference )
+            // InternalFormat.g:25894:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalFormat.g:25895:1: ( ruleJvmArgumentTypeReference )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25895:1: ( ruleJvmArgumentTypeReference )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25896:1: ruleJvmArgumentTypeReference
+            // InternalFormat.g:25895:1: ( ruleJvmArgumentTypeReference )
+            // InternalFormat.g:25896:1: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_152225);
+            pushFollow(FOLLOW_2);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -74387,22 +74387,22 @@ public final void rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1() th
 
 
     // $ANTLR start "rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25905:1: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalFormat.g:25905:1: rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25909:1: ( ( ruleJvmArgumentTypeReference ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25910:1: ( ruleJvmArgumentTypeReference )
+            // InternalFormat.g:25909:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalFormat.g:25910:1: ( ruleJvmArgumentTypeReference )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25910:1: ( ruleJvmArgumentTypeReference )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25911:1: ruleJvmArgumentTypeReference
+            // InternalFormat.g:25910:1: ( ruleJvmArgumentTypeReference )
+            // InternalFormat.g:25911:1: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_1_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_152256);
+            pushFollow(FOLLOW_2);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -74432,28 +74432,28 @@ public final void rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1()
 
 
     // $ANTLR start "rule__XMemberFeatureCall__FeatureAssignment_1_1_2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25920:1: rule__XMemberFeatureCall__FeatureAssignment_1_1_2 : ( ( ruleIdOrSuper ) ) ;
+    // InternalFormat.g:25920:1: rule__XMemberFeatureCall__FeatureAssignment_1_1_2 : ( ( ruleIdOrSuper ) ) ;
     public final void rule__XMemberFeatureCall__FeatureAssignment_1_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25924:1: ( ( ( ruleIdOrSuper ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25925:1: ( ( ruleIdOrSuper ) )
+            // InternalFormat.g:25924:1: ( ( ( ruleIdOrSuper ) ) )
+            // InternalFormat.g:25925:1: ( ( ruleIdOrSuper ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25925:1: ( ( ruleIdOrSuper ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25926:1: ( ruleIdOrSuper )
+            // InternalFormat.g:25925:1: ( ( ruleIdOrSuper ) )
+            // InternalFormat.g:25926:1: ( ruleIdOrSuper )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getFeatureJvmIdentifiableElementCrossReference_1_1_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25927:1: ( ruleIdOrSuper )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25928:1: ruleIdOrSuper
+            // InternalFormat.g:25927:1: ( ruleIdOrSuper )
+            // InternalFormat.g:25928:1: ruleIdOrSuper
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getFeatureJvmIdentifiableElementIdOrSuperParserRuleCall_1_1_2_0_1()); 
             }
-            pushFollow(FOLLOW_ruleIdOrSuper_in_rule__XMemberFeatureCall__FeatureAssignment_1_1_252291);
+            pushFollow(FOLLOW_2);
             ruleIdOrSuper();
 
             state._fsp--;
@@ -74489,28 +74489,28 @@ public final void rule__XMemberFeatureCall__FeatureAssignment_1_1_2() throws Rec
 
 
     // $ANTLR start "rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25939:1: rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 : ( ( '(' ) ) ;
+    // InternalFormat.g:25939:1: rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0 : ( ( '(' ) ) ;
     public final void rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25943:1: ( ( ( '(' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25944:1: ( ( '(' ) )
+            // InternalFormat.g:25943:1: ( ( ( '(' ) ) )
+            // InternalFormat.g:25944:1: ( ( '(' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25944:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25945:1: ( '(' )
+            // InternalFormat.g:25944:1: ( ( '(' ) )
+            // InternalFormat.g:25945:1: ( '(' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_1_1_3_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25946:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25947:1: '('
+            // InternalFormat.g:25946:1: ( '(' )
+            // InternalFormat.g:25947:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_1_1_3_0_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_052331); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXMemberFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_1_1_3_0_0()); 
             }
@@ -74542,22 +74542,22 @@ public final void rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_
 
 
     // $ANTLR start "rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25962:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 : ( ruleXShortClosure ) ;
+    // InternalFormat.g:25962:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 : ( ruleXShortClosure ) ;
     public final void rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25966:1: ( ( ruleXShortClosure ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25967:1: ( ruleXShortClosure )
+            // InternalFormat.g:25966:1: ( ( ruleXShortClosure ) )
+            // InternalFormat.g:25967:1: ( ruleXShortClosure )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25967:1: ( ruleXShortClosure )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25968:1: ruleXShortClosure
+            // InternalFormat.g:25967:1: ( ruleXShortClosure )
+            // InternalFormat.g:25968:1: ruleXShortClosure
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXShortClosureParserRuleCall_1_1_3_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXShortClosure_in_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_052370);
+            pushFollow(FOLLOW_2);
             ruleXShortClosure();
 
             state._fsp--;
@@ -74587,22 +74587,22 @@ public final void rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_
 
 
     // $ANTLR start "rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25977:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 : ( ruleXExpression ) ;
+    // InternalFormat.g:25977:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0 : ( ruleXExpression ) ;
     public final void rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25981:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25982:1: ( ruleXExpression )
+            // InternalFormat.g:25981:1: ( ( ruleXExpression ) )
+            // InternalFormat.g:25982:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25982:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25983:1: ruleXExpression
+            // InternalFormat.g:25982:1: ( ruleXExpression )
+            // InternalFormat.g:25983:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXExpressionParserRuleCall_1_1_3_1_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_052401);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -74632,22 +74632,22 @@ public final void rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_
 
 
     // $ANTLR start "rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25992:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 : ( ruleXExpression ) ;
+    // InternalFormat.g:25992:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1 : ( ruleXExpression ) ;
     public final void rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25996:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25997:1: ( ruleXExpression )
+            // InternalFormat.g:25996:1: ( ( ruleXExpression ) )
+            // InternalFormat.g:25997:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25997:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:25998:1: ruleXExpression
+            // InternalFormat.g:25997:1: ( ruleXExpression )
+            // InternalFormat.g:25998:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXExpressionParserRuleCall_1_1_3_1_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_152432);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -74677,22 +74677,22 @@ public final void rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_
 
 
     // $ANTLR start "rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26007:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 : ( ruleXClosure ) ;
+    // InternalFormat.g:26007:1: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 : ( ruleXClosure ) ;
     public final void rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26011:1: ( ( ruleXClosure ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26012:1: ( ruleXClosure )
+            // InternalFormat.g:26011:1: ( ( ruleXClosure ) )
+            // InternalFormat.g:26012:1: ( ruleXClosure )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26012:1: ( ruleXClosure )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26013:1: ruleXClosure
+            // InternalFormat.g:26012:1: ( ruleXClosure )
+            // InternalFormat.g:26013:1: ruleXClosure
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXClosureParserRuleCall_1_1_4_0()); 
             }
-            pushFollow(FOLLOW_ruleXClosure_in_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_452463);
+            pushFollow(FOLLOW_2);
             ruleXClosure();
 
             state._fsp--;
@@ -74722,22 +74722,22 @@ public final void rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4(
 
 
     // $ANTLR start "rule__XSetLiteral__ElementsAssignment_3_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26022:1: rule__XSetLiteral__ElementsAssignment_3_0 : ( ruleXExpression ) ;
+    // InternalFormat.g:26022:1: rule__XSetLiteral__ElementsAssignment_3_0 : ( ruleXExpression ) ;
     public final void rule__XSetLiteral__ElementsAssignment_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26026:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26027:1: ( ruleXExpression )
+            // InternalFormat.g:26026:1: ( ( ruleXExpression ) )
+            // InternalFormat.g:26027:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26027:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26028:1: ruleXExpression
+            // InternalFormat.g:26027:1: ( ruleXExpression )
+            // InternalFormat.g:26028:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getElementsXExpressionParserRuleCall_3_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XSetLiteral__ElementsAssignment_3_052494);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -74767,22 +74767,22 @@ public final void rule__XSetLiteral__ElementsAssignment_3_0() throws Recognition
 
 
     // $ANTLR start "rule__XSetLiteral__ElementsAssignment_3_1_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26037:1: rule__XSetLiteral__ElementsAssignment_3_1_1 : ( ruleXExpression ) ;
+    // InternalFormat.g:26037:1: rule__XSetLiteral__ElementsAssignment_3_1_1 : ( ruleXExpression ) ;
     public final void rule__XSetLiteral__ElementsAssignment_3_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26041:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26042:1: ( ruleXExpression )
+            // InternalFormat.g:26041:1: ( ( ruleXExpression ) )
+            // InternalFormat.g:26042:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26042:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26043:1: ruleXExpression
+            // InternalFormat.g:26042:1: ( ruleXExpression )
+            // InternalFormat.g:26043:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSetLiteralAccess().getElementsXExpressionParserRuleCall_3_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XSetLiteral__ElementsAssignment_3_1_152525);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -74812,22 +74812,22 @@ public final void rule__XSetLiteral__ElementsAssignment_3_1_1() throws Recogniti
 
 
     // $ANTLR start "rule__XListLiteral__ElementsAssignment_3_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26052:1: rule__XListLiteral__ElementsAssignment_3_0 : ( ruleXExpression ) ;
+    // InternalFormat.g:26052:1: rule__XListLiteral__ElementsAssignment_3_0 : ( ruleXExpression ) ;
     public final void rule__XListLiteral__ElementsAssignment_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26056:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26057:1: ( ruleXExpression )
+            // InternalFormat.g:26056:1: ( ( ruleXExpression ) )
+            // InternalFormat.g:26057:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26057:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26058:1: ruleXExpression
+            // InternalFormat.g:26057:1: ( ruleXExpression )
+            // InternalFormat.g:26058:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getElementsXExpressionParserRuleCall_3_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XListLiteral__ElementsAssignment_3_052556);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -74857,22 +74857,22 @@ public final void rule__XListLiteral__ElementsAssignment_3_0() throws Recognitio
 
 
     // $ANTLR start "rule__XListLiteral__ElementsAssignment_3_1_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26067:1: rule__XListLiteral__ElementsAssignment_3_1_1 : ( ruleXExpression ) ;
+    // InternalFormat.g:26067:1: rule__XListLiteral__ElementsAssignment_3_1_1 : ( ruleXExpression ) ;
     public final void rule__XListLiteral__ElementsAssignment_3_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26071:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26072:1: ( ruleXExpression )
+            // InternalFormat.g:26071:1: ( ( ruleXExpression ) )
+            // InternalFormat.g:26072:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26072:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26073:1: ruleXExpression
+            // InternalFormat.g:26072:1: ( ruleXExpression )
+            // InternalFormat.g:26073:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXListLiteralAccess().getElementsXExpressionParserRuleCall_3_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XListLiteral__ElementsAssignment_3_1_152587);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -74902,22 +74902,22 @@ public final void rule__XListLiteral__ElementsAssignment_3_1_1() throws Recognit
 
 
     // $ANTLR start "rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26082:1: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 : ( ruleJvmFormalParameter ) ;
+    // InternalFormat.g:26082:1: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0 : ( ruleJvmFormalParameter ) ;
     public final void rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26086:1: ( ( ruleJvmFormalParameter ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26087:1: ( ruleJvmFormalParameter )
+            // InternalFormat.g:26086:1: ( ( ruleJvmFormalParameter ) )
+            // InternalFormat.g:26087:1: ( ruleJvmFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26087:1: ( ruleJvmFormalParameter )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26088:1: ruleJvmFormalParameter
+            // InternalFormat.g:26087:1: ( ruleJvmFormalParameter )
+            // InternalFormat.g:26088:1: ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_1_0_0_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmFormalParameter_in_rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_052618);
+            pushFollow(FOLLOW_2);
             ruleJvmFormalParameter();
 
             state._fsp--;
@@ -74947,22 +74947,22 @@ public final void rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0() t
 
 
     // $ANTLR start "rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26097:1: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 : ( ruleJvmFormalParameter ) ;
+    // InternalFormat.g:26097:1: rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1 : ( ruleJvmFormalParameter ) ;
     public final void rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26101:1: ( ( ruleJvmFormalParameter ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26102:1: ( ruleJvmFormalParameter )
+            // InternalFormat.g:26101:1: ( ( ruleJvmFormalParameter ) )
+            // InternalFormat.g:26102:1: ( ruleJvmFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26102:1: ( ruleJvmFormalParameter )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26103:1: ruleJvmFormalParameter
+            // InternalFormat.g:26102:1: ( ruleJvmFormalParameter )
+            // InternalFormat.g:26103:1: ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_1_0_0_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmFormalParameter_in_rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_152649);
+            pushFollow(FOLLOW_2);
             ruleJvmFormalParameter();
 
             state._fsp--;
@@ -74992,28 +74992,28 @@ public final void rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1()
 
 
     // $ANTLR start "rule__XClosure__ExplicitSyntaxAssignment_1_0_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26112:1: rule__XClosure__ExplicitSyntaxAssignment_1_0_1 : ( ( '|' ) ) ;
+    // InternalFormat.g:26112:1: rule__XClosure__ExplicitSyntaxAssignment_1_0_1 : ( ( '|' ) ) ;
     public final void rule__XClosure__ExplicitSyntaxAssignment_1_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26116:1: ( ( ( '|' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26117:1: ( ( '|' ) )
+            // InternalFormat.g:26116:1: ( ( ( '|' ) ) )
+            // InternalFormat.g:26117:1: ( ( '|' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26117:1: ( ( '|' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26118:1: ( '|' )
+            // InternalFormat.g:26117:1: ( ( '|' ) )
+            // InternalFormat.g:26118:1: ( '|' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getExplicitSyntaxVerticalLineKeyword_1_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26119:1: ( '|' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26120:1: '|'
+            // InternalFormat.g:26119:1: ( '|' )
+            // InternalFormat.g:26120:1: '|'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getExplicitSyntaxVerticalLineKeyword_1_0_1_0()); 
             }
-            match(input,115,FOLLOW_115_in_rule__XClosure__ExplicitSyntaxAssignment_1_0_152685); if (state.failed) return ;
+            match(input,115,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXClosureAccess().getExplicitSyntaxVerticalLineKeyword_1_0_1_0()); 
             }
@@ -75045,22 +75045,22 @@ public final void rule__XClosure__ExplicitSyntaxAssignment_1_0_1() throws Recogn
 
 
     // $ANTLR start "rule__XClosure__ExpressionAssignment_2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26135:1: rule__XClosure__ExpressionAssignment_2 : ( ruleXExpressionInClosure ) ;
+    // InternalFormat.g:26135:1: rule__XClosure__ExpressionAssignment_2 : ( ruleXExpressionInClosure ) ;
     public final void rule__XClosure__ExpressionAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26139:1: ( ( ruleXExpressionInClosure ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26140:1: ( ruleXExpressionInClosure )
+            // InternalFormat.g:26139:1: ( ( ruleXExpressionInClosure ) )
+            // InternalFormat.g:26140:1: ( ruleXExpressionInClosure )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26140:1: ( ruleXExpressionInClosure )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26141:1: ruleXExpressionInClosure
+            // InternalFormat.g:26140:1: ( ruleXExpressionInClosure )
+            // InternalFormat.g:26141:1: ruleXExpressionInClosure
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXClosureAccess().getExpressionXExpressionInClosureParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpressionInClosure_in_rule__XClosure__ExpressionAssignment_252724);
+            pushFollow(FOLLOW_2);
             ruleXExpressionInClosure();
 
             state._fsp--;
@@ -75090,22 +75090,22 @@ public final void rule__XClosure__ExpressionAssignment_2() throws RecognitionExc
 
 
     // $ANTLR start "rule__XExpressionInClosure__ExpressionsAssignment_1_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26150:1: rule__XExpressionInClosure__ExpressionsAssignment_1_0 : ( ruleXExpressionOrVarDeclaration ) ;
+    // InternalFormat.g:26150:1: rule__XExpressionInClosure__ExpressionsAssignment_1_0 : ( ruleXExpressionOrVarDeclaration ) ;
     public final void rule__XExpressionInClosure__ExpressionsAssignment_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26154:1: ( ( ruleXExpressionOrVarDeclaration ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26155:1: ( ruleXExpressionOrVarDeclaration )
+            // InternalFormat.g:26154:1: ( ( ruleXExpressionOrVarDeclaration ) )
+            // InternalFormat.g:26155:1: ( ruleXExpressionOrVarDeclaration )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26155:1: ( ruleXExpressionOrVarDeclaration )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26156:1: ruleXExpressionOrVarDeclaration
+            // InternalFormat.g:26155:1: ( ruleXExpressionOrVarDeclaration )
+            // InternalFormat.g:26156:1: ruleXExpressionOrVarDeclaration
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXExpressionInClosureAccess().getExpressionsXExpressionOrVarDeclarationParserRuleCall_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_rule__XExpressionInClosure__ExpressionsAssignment_1_052755);
+            pushFollow(FOLLOW_2);
             ruleXExpressionOrVarDeclaration();
 
             state._fsp--;
@@ -75135,22 +75135,22 @@ public final void rule__XExpressionInClosure__ExpressionsAssignment_1_0() throws
 
 
     // $ANTLR start "rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26165:1: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 : ( ruleJvmFormalParameter ) ;
+    // InternalFormat.g:26165:1: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0 : ( ruleJvmFormalParameter ) ;
     public final void rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26169:1: ( ( ruleJvmFormalParameter ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26170:1: ( ruleJvmFormalParameter )
+            // InternalFormat.g:26169:1: ( ( ruleJvmFormalParameter ) )
+            // InternalFormat.g:26170:1: ( ruleJvmFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26170:1: ( ruleJvmFormalParameter )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26171:1: ruleJvmFormalParameter
+            // InternalFormat.g:26170:1: ( ruleJvmFormalParameter )
+            // InternalFormat.g:26171:1: ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_0_0_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmFormalParameter_in_rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_052786);
+            pushFollow(FOLLOW_2);
             ruleJvmFormalParameter();
 
             state._fsp--;
@@ -75180,22 +75180,22 @@ public final void rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_
 
 
     // $ANTLR start "rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26180:1: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 : ( ruleJvmFormalParameter ) ;
+    // InternalFormat.g:26180:1: rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1 : ( ruleJvmFormalParameter ) ;
     public final void rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26184:1: ( ( ruleJvmFormalParameter ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26185:1: ( ruleJvmFormalParameter )
+            // InternalFormat.g:26184:1: ( ( ruleJvmFormalParameter ) )
+            // InternalFormat.g:26185:1: ( ruleJvmFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26185:1: ( ruleJvmFormalParameter )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26186:1: ruleJvmFormalParameter
+            // InternalFormat.g:26185:1: ( ruleJvmFormalParameter )
+            // InternalFormat.g:26186:1: ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_0_0_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmFormalParameter_in_rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_152817);
+            pushFollow(FOLLOW_2);
             ruleJvmFormalParameter();
 
             state._fsp--;
@@ -75225,28 +75225,28 @@ public final void rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_
 
 
     // $ANTLR start "rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26195:1: rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 : ( ( '|' ) ) ;
+    // InternalFormat.g:26195:1: rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2 : ( ( '|' ) ) ;
     public final void rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26199:1: ( ( ( '|' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26200:1: ( ( '|' ) )
+            // InternalFormat.g:26199:1: ( ( ( '|' ) ) )
+            // InternalFormat.g:26200:1: ( ( '|' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26200:1: ( ( '|' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26201:1: ( '|' )
+            // InternalFormat.g:26200:1: ( ( '|' ) )
+            // InternalFormat.g:26201:1: ( '|' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getExplicitSyntaxVerticalLineKeyword_0_0_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26202:1: ( '|' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26203:1: '|'
+            // InternalFormat.g:26202:1: ( '|' )
+            // InternalFormat.g:26203:1: '|'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getExplicitSyntaxVerticalLineKeyword_0_0_2_0()); 
             }
-            match(input,115,FOLLOW_115_in_rule__XShortClosure__ExplicitSyntaxAssignment_0_0_252853); if (state.failed) return ;
+            match(input,115,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXShortClosureAccess().getExplicitSyntaxVerticalLineKeyword_0_0_2_0()); 
             }
@@ -75278,22 +75278,22 @@ public final void rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2() throws R
 
 
     // $ANTLR start "rule__XShortClosure__ExpressionAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26218:1: rule__XShortClosure__ExpressionAssignment_1 : ( ruleXExpression ) ;
+    // InternalFormat.g:26218:1: rule__XShortClosure__ExpressionAssignment_1 : ( ruleXExpression ) ;
     public final void rule__XShortClosure__ExpressionAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26222:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26223:1: ( ruleXExpression )
+            // InternalFormat.g:26222:1: ( ( ruleXExpression ) )
+            // InternalFormat.g:26223:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26223:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26224:1: ruleXExpression
+            // InternalFormat.g:26223:1: ( ruleXExpression )
+            // InternalFormat.g:26224:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXShortClosureAccess().getExpressionXExpressionParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XShortClosure__ExpressionAssignment_152892);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -75323,22 +75323,22 @@ public final void rule__XShortClosure__ExpressionAssignment_1() throws Recogniti
 
 
     // $ANTLR start "rule__XIfExpression__IfAssignment_3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26233:1: rule__XIfExpression__IfAssignment_3 : ( ruleXExpression ) ;
+    // InternalFormat.g:26233:1: rule__XIfExpression__IfAssignment_3 : ( ruleXExpression ) ;
     public final void rule__XIfExpression__IfAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26237:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26238:1: ( ruleXExpression )
+            // InternalFormat.g:26237:1: ( ( ruleXExpression ) )
+            // InternalFormat.g:26238:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26238:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26239:1: ruleXExpression
+            // InternalFormat.g:26238:1: ( ruleXExpression )
+            // InternalFormat.g:26239:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getIfXExpressionParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XIfExpression__IfAssignment_352923);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -75368,22 +75368,22 @@ public final void rule__XIfExpression__IfAssignment_3() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XIfExpression__ThenAssignment_5"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26248:1: rule__XIfExpression__ThenAssignment_5 : ( ruleXExpression ) ;
+    // InternalFormat.g:26248:1: rule__XIfExpression__ThenAssignment_5 : ( ruleXExpression ) ;
     public final void rule__XIfExpression__ThenAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26252:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26253:1: ( ruleXExpression )
+            // InternalFormat.g:26252:1: ( ( ruleXExpression ) )
+            // InternalFormat.g:26253:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26253:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26254:1: ruleXExpression
+            // InternalFormat.g:26253:1: ( ruleXExpression )
+            // InternalFormat.g:26254:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getThenXExpressionParserRuleCall_5_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XIfExpression__ThenAssignment_552954);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -75413,22 +75413,22 @@ public final void rule__XIfExpression__ThenAssignment_5() throws RecognitionExce
 
 
     // $ANTLR start "rule__XIfExpression__ElseAssignment_6_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26263:1: rule__XIfExpression__ElseAssignment_6_1 : ( ruleXExpression ) ;
+    // InternalFormat.g:26263:1: rule__XIfExpression__ElseAssignment_6_1 : ( ruleXExpression ) ;
     public final void rule__XIfExpression__ElseAssignment_6_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26267:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26268:1: ( ruleXExpression )
+            // InternalFormat.g:26267:1: ( ( ruleXExpression ) )
+            // InternalFormat.g:26268:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26268:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26269:1: ruleXExpression
+            // InternalFormat.g:26268:1: ( ruleXExpression )
+            // InternalFormat.g:26269:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXIfExpressionAccess().getElseXExpressionParserRuleCall_6_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XIfExpression__ElseAssignment_6_152985);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -75458,22 +75458,22 @@ public final void rule__XIfExpression__ElseAssignment_6_1() throws RecognitionEx
 
 
     // $ANTLR start "rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26278:1: rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 : ( ruleJvmFormalParameter ) ;
+    // InternalFormat.g:26278:1: rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1 : ( ruleJvmFormalParameter ) ;
     public final void rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26282:1: ( ( ruleJvmFormalParameter ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26283:1: ( ruleJvmFormalParameter )
+            // InternalFormat.g:26282:1: ( ( ruleJvmFormalParameter ) )
+            // InternalFormat.g:26283:1: ( ruleJvmFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26283:1: ( ruleJvmFormalParameter )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26284:1: ruleJvmFormalParameter
+            // InternalFormat.g:26283:1: ( ruleJvmFormalParameter )
+            // InternalFormat.g:26284:1: ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getDeclaredParamJvmFormalParameterParserRuleCall_2_0_0_0_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmFormalParameter_in_rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_153016);
+            pushFollow(FOLLOW_2);
             ruleJvmFormalParameter();
 
             state._fsp--;
@@ -75503,22 +75503,22 @@ public final void rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1() t
 
 
     // $ANTLR start "rule__XSwitchExpression__SwitchAssignment_2_0_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26293:1: rule__XSwitchExpression__SwitchAssignment_2_0_1 : ( ruleXExpression ) ;
+    // InternalFormat.g:26293:1: rule__XSwitchExpression__SwitchAssignment_2_0_1 : ( ruleXExpression ) ;
     public final void rule__XSwitchExpression__SwitchAssignment_2_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26297:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26298:1: ( ruleXExpression )
+            // InternalFormat.g:26297:1: ( ( ruleXExpression ) )
+            // InternalFormat.g:26298:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26298:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26299:1: ruleXExpression
+            // InternalFormat.g:26298:1: ( ruleXExpression )
+            // InternalFormat.g:26299:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getSwitchXExpressionParserRuleCall_2_0_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XSwitchExpression__SwitchAssignment_2_0_153047);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -75548,22 +75548,22 @@ public final void rule__XSwitchExpression__SwitchAssignment_2_0_1() throws Recog
 
 
     // $ANTLR start "rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26308:1: rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 : ( ruleJvmFormalParameter ) ;
+    // InternalFormat.g:26308:1: rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0 : ( ruleJvmFormalParameter ) ;
     public final void rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26312:1: ( ( ruleJvmFormalParameter ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26313:1: ( ruleJvmFormalParameter )
+            // InternalFormat.g:26312:1: ( ( ruleJvmFormalParameter ) )
+            // InternalFormat.g:26313:1: ( ruleJvmFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26313:1: ( ruleJvmFormalParameter )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26314:1: ruleJvmFormalParameter
+            // InternalFormat.g:26313:1: ( ruleJvmFormalParameter )
+            // InternalFormat.g:26314:1: ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getDeclaredParamJvmFormalParameterParserRuleCall_2_1_0_0_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmFormalParameter_in_rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_053078);
+            pushFollow(FOLLOW_2);
             ruleJvmFormalParameter();
 
             state._fsp--;
@@ -75593,22 +75593,22 @@ public final void rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0() t
 
 
     // $ANTLR start "rule__XSwitchExpression__SwitchAssignment_2_1_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26323:1: rule__XSwitchExpression__SwitchAssignment_2_1_1 : ( ruleXExpression ) ;
+    // InternalFormat.g:26323:1: rule__XSwitchExpression__SwitchAssignment_2_1_1 : ( ruleXExpression ) ;
     public final void rule__XSwitchExpression__SwitchAssignment_2_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26327:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26328:1: ( ruleXExpression )
+            // InternalFormat.g:26327:1: ( ( ruleXExpression ) )
+            // InternalFormat.g:26328:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26328:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26329:1: ruleXExpression
+            // InternalFormat.g:26328:1: ( ruleXExpression )
+            // InternalFormat.g:26329:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getSwitchXExpressionParserRuleCall_2_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XSwitchExpression__SwitchAssignment_2_1_153109);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -75638,22 +75638,22 @@ public final void rule__XSwitchExpression__SwitchAssignment_2_1_1() throws Recog
 
 
     // $ANTLR start "rule__XSwitchExpression__CasesAssignment_4"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26338:1: rule__XSwitchExpression__CasesAssignment_4 : ( ruleXCasePart ) ;
+    // InternalFormat.g:26338:1: rule__XSwitchExpression__CasesAssignment_4 : ( ruleXCasePart ) ;
     public final void rule__XSwitchExpression__CasesAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26342:1: ( ( ruleXCasePart ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26343:1: ( ruleXCasePart )
+            // InternalFormat.g:26342:1: ( ( ruleXCasePart ) )
+            // InternalFormat.g:26343:1: ( ruleXCasePart )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26343:1: ( ruleXCasePart )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26344:1: ruleXCasePart
+            // InternalFormat.g:26343:1: ( ruleXCasePart )
+            // InternalFormat.g:26344:1: ruleXCasePart
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getCasesXCasePartParserRuleCall_4_0()); 
             }
-            pushFollow(FOLLOW_ruleXCasePart_in_rule__XSwitchExpression__CasesAssignment_453140);
+            pushFollow(FOLLOW_2);
             ruleXCasePart();
 
             state._fsp--;
@@ -75683,22 +75683,22 @@ public final void rule__XSwitchExpression__CasesAssignment_4() throws Recognitio
 
 
     // $ANTLR start "rule__XSwitchExpression__DefaultAssignment_5_2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26353:1: rule__XSwitchExpression__DefaultAssignment_5_2 : ( ruleXExpression ) ;
+    // InternalFormat.g:26353:1: rule__XSwitchExpression__DefaultAssignment_5_2 : ( ruleXExpression ) ;
     public final void rule__XSwitchExpression__DefaultAssignment_5_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26357:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26358:1: ( ruleXExpression )
+            // InternalFormat.g:26357:1: ( ( ruleXExpression ) )
+            // InternalFormat.g:26358:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26358:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26359:1: ruleXExpression
+            // InternalFormat.g:26358:1: ( ruleXExpression )
+            // InternalFormat.g:26359:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSwitchExpressionAccess().getDefaultXExpressionParserRuleCall_5_2_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XSwitchExpression__DefaultAssignment_5_253171);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -75728,22 +75728,22 @@ public final void rule__XSwitchExpression__DefaultAssignment_5_2() throws Recogn
 
 
     // $ANTLR start "rule__XCasePart__TypeGuardAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26368:1: rule__XCasePart__TypeGuardAssignment_1 : ( ruleJvmTypeReference ) ;
+    // InternalFormat.g:26368:1: rule__XCasePart__TypeGuardAssignment_1 : ( ruleJvmTypeReference ) ;
     public final void rule__XCasePart__TypeGuardAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26372:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26373:1: ( ruleJvmTypeReference )
+            // InternalFormat.g:26372:1: ( ( ruleJvmTypeReference ) )
+            // InternalFormat.g:26373:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26373:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26374:1: ruleJvmTypeReference
+            // InternalFormat.g:26373:1: ( ruleJvmTypeReference )
+            // InternalFormat.g:26374:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getTypeGuardJvmTypeReferenceParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__XCasePart__TypeGuardAssignment_153202);
+            pushFollow(FOLLOW_2);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -75773,22 +75773,22 @@ public final void rule__XCasePart__TypeGuardAssignment_1() throws RecognitionExc
 
 
     // $ANTLR start "rule__XCasePart__CaseAssignment_2_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26383:1: rule__XCasePart__CaseAssignment_2_1 : ( ruleXExpression ) ;
+    // InternalFormat.g:26383:1: rule__XCasePart__CaseAssignment_2_1 : ( ruleXExpression ) ;
     public final void rule__XCasePart__CaseAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26387:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26388:1: ( ruleXExpression )
+            // InternalFormat.g:26387:1: ( ( ruleXExpression ) )
+            // InternalFormat.g:26388:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26388:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26389:1: ruleXExpression
+            // InternalFormat.g:26388:1: ( ruleXExpression )
+            // InternalFormat.g:26389:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getCaseXExpressionParserRuleCall_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XCasePart__CaseAssignment_2_153233);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -75818,22 +75818,22 @@ public final void rule__XCasePart__CaseAssignment_2_1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__XCasePart__ThenAssignment_3_0_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26398:1: rule__XCasePart__ThenAssignment_3_0_1 : ( ruleXExpression ) ;
+    // InternalFormat.g:26398:1: rule__XCasePart__ThenAssignment_3_0_1 : ( ruleXExpression ) ;
     public final void rule__XCasePart__ThenAssignment_3_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26402:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26403:1: ( ruleXExpression )
+            // InternalFormat.g:26402:1: ( ( ruleXExpression ) )
+            // InternalFormat.g:26403:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26403:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26404:1: ruleXExpression
+            // InternalFormat.g:26403:1: ( ruleXExpression )
+            // InternalFormat.g:26404:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getThenXExpressionParserRuleCall_3_0_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XCasePart__ThenAssignment_3_0_153264);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -75863,28 +75863,28 @@ public final void rule__XCasePart__ThenAssignment_3_0_1() throws RecognitionExce
 
 
     // $ANTLR start "rule__XCasePart__FallThroughAssignment_3_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26413:1: rule__XCasePart__FallThroughAssignment_3_1 : ( ( ',' ) ) ;
+    // InternalFormat.g:26413:1: rule__XCasePart__FallThroughAssignment_3_1 : ( ( ',' ) ) ;
     public final void rule__XCasePart__FallThroughAssignment_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26417:1: ( ( ( ',' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26418:1: ( ( ',' ) )
+            // InternalFormat.g:26417:1: ( ( ( ',' ) ) )
+            // InternalFormat.g:26418:1: ( ( ',' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26418:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26419:1: ( ',' )
+            // InternalFormat.g:26418:1: ( ( ',' ) )
+            // InternalFormat.g:26419:1: ( ',' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getFallThroughCommaKeyword_3_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26420:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26421:1: ','
+            // InternalFormat.g:26420:1: ( ',' )
+            // InternalFormat.g:26421:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCasePartAccess().getFallThroughCommaKeyword_3_1_0()); 
             }
-            match(input,71,FOLLOW_71_in_rule__XCasePart__FallThroughAssignment_3_153300); if (state.failed) return ;
+            match(input,71,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXCasePartAccess().getFallThroughCommaKeyword_3_1_0()); 
             }
@@ -75916,22 +75916,22 @@ public final void rule__XCasePart__FallThroughAssignment_3_1() throws Recognitio
 
 
     // $ANTLR start "rule__XForLoopExpression__DeclaredParamAssignment_0_0_3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26436:1: rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 : ( ruleJvmFormalParameter ) ;
+    // InternalFormat.g:26436:1: rule__XForLoopExpression__DeclaredParamAssignment_0_0_3 : ( ruleJvmFormalParameter ) ;
     public final void rule__XForLoopExpression__DeclaredParamAssignment_0_0_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26440:1: ( ( ruleJvmFormalParameter ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26441:1: ( ruleJvmFormalParameter )
+            // InternalFormat.g:26440:1: ( ( ruleJvmFormalParameter ) )
+            // InternalFormat.g:26441:1: ( ruleJvmFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26441:1: ( ruleJvmFormalParameter )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26442:1: ruleJvmFormalParameter
+            // InternalFormat.g:26441:1: ( ruleJvmFormalParameter )
+            // InternalFormat.g:26442:1: ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getDeclaredParamJvmFormalParameterParserRuleCall_0_0_3_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmFormalParameter_in_rule__XForLoopExpression__DeclaredParamAssignment_0_0_353339);
+            pushFollow(FOLLOW_2);
             ruleJvmFormalParameter();
 
             state._fsp--;
@@ -75961,22 +75961,22 @@ public final void rule__XForLoopExpression__DeclaredParamAssignment_0_0_3() thro
 
 
     // $ANTLR start "rule__XForLoopExpression__ForExpressionAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26451:1: rule__XForLoopExpression__ForExpressionAssignment_1 : ( ruleXExpression ) ;
+    // InternalFormat.g:26451:1: rule__XForLoopExpression__ForExpressionAssignment_1 : ( ruleXExpression ) ;
     public final void rule__XForLoopExpression__ForExpressionAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26455:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26456:1: ( ruleXExpression )
+            // InternalFormat.g:26455:1: ( ( ruleXExpression ) )
+            // InternalFormat.g:26456:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26456:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26457:1: ruleXExpression
+            // InternalFormat.g:26456:1: ( ruleXExpression )
+            // InternalFormat.g:26457:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getForExpressionXExpressionParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XForLoopExpression__ForExpressionAssignment_153370);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -76006,22 +76006,22 @@ public final void rule__XForLoopExpression__ForExpressionAssignment_1() throws R
 
 
     // $ANTLR start "rule__XForLoopExpression__EachExpressionAssignment_3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26466:1: rule__XForLoopExpression__EachExpressionAssignment_3 : ( ruleXExpression ) ;
+    // InternalFormat.g:26466:1: rule__XForLoopExpression__EachExpressionAssignment_3 : ( ruleXExpression ) ;
     public final void rule__XForLoopExpression__EachExpressionAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26470:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26471:1: ( ruleXExpression )
+            // InternalFormat.g:26470:1: ( ( ruleXExpression ) )
+            // InternalFormat.g:26471:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26471:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26472:1: ruleXExpression
+            // InternalFormat.g:26471:1: ( ruleXExpression )
+            // InternalFormat.g:26472:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXForLoopExpressionAccess().getEachExpressionXExpressionParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XForLoopExpression__EachExpressionAssignment_353401);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -76051,22 +76051,22 @@ public final void rule__XForLoopExpression__EachExpressionAssignment_3() throws
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26481:1: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 : ( ruleXExpressionOrVarDeclaration ) ;
+    // InternalFormat.g:26481:1: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0 : ( ruleXExpressionOrVarDeclaration ) ;
     public final void rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26485:1: ( ( ruleXExpressionOrVarDeclaration ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26486:1: ( ruleXExpressionOrVarDeclaration )
+            // InternalFormat.g:26485:1: ( ( ruleXExpressionOrVarDeclaration ) )
+            // InternalFormat.g:26486:1: ( ruleXExpressionOrVarDeclaration )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26486:1: ( ruleXExpressionOrVarDeclaration )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26487:1: ruleXExpressionOrVarDeclaration
+            // InternalFormat.g:26486:1: ( ruleXExpressionOrVarDeclaration )
+            // InternalFormat.g:26487:1: ruleXExpressionOrVarDeclaration
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getInitExpressionsXExpressionOrVarDeclarationParserRuleCall_3_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_rule__XBasicForLoopExpression__InitExpressionsAssignment_3_053432);
+            pushFollow(FOLLOW_2);
             ruleXExpressionOrVarDeclaration();
 
             state._fsp--;
@@ -76096,22 +76096,22 @@ public final void rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0()
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26496:1: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 : ( ruleXExpressionOrVarDeclaration ) ;
+    // InternalFormat.g:26496:1: rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1 : ( ruleXExpressionOrVarDeclaration ) ;
     public final void rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26500:1: ( ( ruleXExpressionOrVarDeclaration ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26501:1: ( ruleXExpressionOrVarDeclaration )
+            // InternalFormat.g:26500:1: ( ( ruleXExpressionOrVarDeclaration ) )
+            // InternalFormat.g:26501:1: ( ruleXExpressionOrVarDeclaration )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26501:1: ( ruleXExpressionOrVarDeclaration )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26502:1: ruleXExpressionOrVarDeclaration
+            // InternalFormat.g:26501:1: ( ruleXExpressionOrVarDeclaration )
+            // InternalFormat.g:26502:1: ruleXExpressionOrVarDeclaration
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getInitExpressionsXExpressionOrVarDeclarationParserRuleCall_3_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_153463);
+            pushFollow(FOLLOW_2);
             ruleXExpressionOrVarDeclaration();
 
             state._fsp--;
@@ -76141,22 +76141,22 @@ public final void rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__ExpressionAssignment_5"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26511:1: rule__XBasicForLoopExpression__ExpressionAssignment_5 : ( ruleXExpression ) ;
+    // InternalFormat.g:26511:1: rule__XBasicForLoopExpression__ExpressionAssignment_5 : ( ruleXExpression ) ;
     public final void rule__XBasicForLoopExpression__ExpressionAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26515:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26516:1: ( ruleXExpression )
+            // InternalFormat.g:26515:1: ( ( ruleXExpression ) )
+            // InternalFormat.g:26516:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26516:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26517:1: ruleXExpression
+            // InternalFormat.g:26516:1: ( ruleXExpression )
+            // InternalFormat.g:26517:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getExpressionXExpressionParserRuleCall_5_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XBasicForLoopExpression__ExpressionAssignment_553494);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -76186,22 +76186,22 @@ public final void rule__XBasicForLoopExpression__ExpressionAssignment_5() throws
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26526:1: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 : ( ruleXExpression ) ;
+    // InternalFormat.g:26526:1: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0 : ( ruleXExpression ) ;
     public final void rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26530:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26531:1: ( ruleXExpression )
+            // InternalFormat.g:26530:1: ( ( ruleXExpression ) )
+            // InternalFormat.g:26531:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26531:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26532:1: ruleXExpression
+            // InternalFormat.g:26531:1: ( ruleXExpression )
+            // InternalFormat.g:26532:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getUpdateExpressionsXExpressionParserRuleCall_7_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_053525);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -76231,22 +76231,22 @@ public final void rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26541:1: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 : ( ruleXExpression ) ;
+    // InternalFormat.g:26541:1: rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1 : ( ruleXExpression ) ;
     public final void rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26545:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26546:1: ( ruleXExpression )
+            // InternalFormat.g:26545:1: ( ( ruleXExpression ) )
+            // InternalFormat.g:26546:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26546:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26547:1: ruleXExpression
+            // InternalFormat.g:26546:1: ( ruleXExpression )
+            // InternalFormat.g:26547:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getUpdateExpressionsXExpressionParserRuleCall_7_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_153556);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -76276,22 +76276,22 @@ public final void rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1
 
 
     // $ANTLR start "rule__XBasicForLoopExpression__EachExpressionAssignment_9"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26556:1: rule__XBasicForLoopExpression__EachExpressionAssignment_9 : ( ruleXExpression ) ;
+    // InternalFormat.g:26556:1: rule__XBasicForLoopExpression__EachExpressionAssignment_9 : ( ruleXExpression ) ;
     public final void rule__XBasicForLoopExpression__EachExpressionAssignment_9() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26560:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26561:1: ( ruleXExpression )
+            // InternalFormat.g:26560:1: ( ( ruleXExpression ) )
+            // InternalFormat.g:26561:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26561:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26562:1: ruleXExpression
+            // InternalFormat.g:26561:1: ( ruleXExpression )
+            // InternalFormat.g:26562:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBasicForLoopExpressionAccess().getEachExpressionXExpressionParserRuleCall_9_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XBasicForLoopExpression__EachExpressionAssignment_953587);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -76321,22 +76321,22 @@ public final void rule__XBasicForLoopExpression__EachExpressionAssignment_9() th
 
 
     // $ANTLR start "rule__XWhileExpression__PredicateAssignment_3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26571:1: rule__XWhileExpression__PredicateAssignment_3 : ( ruleXExpression ) ;
+    // InternalFormat.g:26571:1: rule__XWhileExpression__PredicateAssignment_3 : ( ruleXExpression ) ;
     public final void rule__XWhileExpression__PredicateAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26575:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26576:1: ( ruleXExpression )
+            // InternalFormat.g:26575:1: ( ( ruleXExpression ) )
+            // InternalFormat.g:26576:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26576:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26577:1: ruleXExpression
+            // InternalFormat.g:26576:1: ( ruleXExpression )
+            // InternalFormat.g:26577:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getPredicateXExpressionParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XWhileExpression__PredicateAssignment_353618);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -76366,22 +76366,22 @@ public final void rule__XWhileExpression__PredicateAssignment_3() throws Recogni
 
 
     // $ANTLR start "rule__XWhileExpression__BodyAssignment_5"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26586:1: rule__XWhileExpression__BodyAssignment_5 : ( ruleXExpression ) ;
+    // InternalFormat.g:26586:1: rule__XWhileExpression__BodyAssignment_5 : ( ruleXExpression ) ;
     public final void rule__XWhileExpression__BodyAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26590:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26591:1: ( ruleXExpression )
+            // InternalFormat.g:26590:1: ( ( ruleXExpression ) )
+            // InternalFormat.g:26591:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26591:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26592:1: ruleXExpression
+            // InternalFormat.g:26591:1: ( ruleXExpression )
+            // InternalFormat.g:26592:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXWhileExpressionAccess().getBodyXExpressionParserRuleCall_5_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XWhileExpression__BodyAssignment_553649);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -76411,22 +76411,22 @@ public final void rule__XWhileExpression__BodyAssignment_5() throws RecognitionE
 
 
     // $ANTLR start "rule__XDoWhileExpression__BodyAssignment_2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26601:1: rule__XDoWhileExpression__BodyAssignment_2 : ( ruleXExpression ) ;
+    // InternalFormat.g:26601:1: rule__XDoWhileExpression__BodyAssignment_2 : ( ruleXExpression ) ;
     public final void rule__XDoWhileExpression__BodyAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26605:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26606:1: ( ruleXExpression )
+            // InternalFormat.g:26605:1: ( ( ruleXExpression ) )
+            // InternalFormat.g:26606:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26606:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26607:1: ruleXExpression
+            // InternalFormat.g:26606:1: ( ruleXExpression )
+            // InternalFormat.g:26607:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getBodyXExpressionParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XDoWhileExpression__BodyAssignment_253680);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -76456,22 +76456,22 @@ public final void rule__XDoWhileExpression__BodyAssignment_2() throws Recognitio
 
 
     // $ANTLR start "rule__XDoWhileExpression__PredicateAssignment_5"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26616:1: rule__XDoWhileExpression__PredicateAssignment_5 : ( ruleXExpression ) ;
+    // InternalFormat.g:26616:1: rule__XDoWhileExpression__PredicateAssignment_5 : ( ruleXExpression ) ;
     public final void rule__XDoWhileExpression__PredicateAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26620:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26621:1: ( ruleXExpression )
+            // InternalFormat.g:26620:1: ( ( ruleXExpression ) )
+            // InternalFormat.g:26621:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26621:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26622:1: ruleXExpression
+            // InternalFormat.g:26621:1: ( ruleXExpression )
+            // InternalFormat.g:26622:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXDoWhileExpressionAccess().getPredicateXExpressionParserRuleCall_5_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XDoWhileExpression__PredicateAssignment_553711);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -76501,22 +76501,22 @@ public final void rule__XDoWhileExpression__PredicateAssignment_5() throws Recog
 
 
     // $ANTLR start "rule__XBlockExpression__ExpressionsAssignment_2_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26631:1: rule__XBlockExpression__ExpressionsAssignment_2_0 : ( ruleXExpressionOrVarDeclaration ) ;
+    // InternalFormat.g:26631:1: rule__XBlockExpression__ExpressionsAssignment_2_0 : ( ruleXExpressionOrVarDeclaration ) ;
     public final void rule__XBlockExpression__ExpressionsAssignment_2_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26635:1: ( ( ruleXExpressionOrVarDeclaration ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26636:1: ( ruleXExpressionOrVarDeclaration )
+            // InternalFormat.g:26635:1: ( ( ruleXExpressionOrVarDeclaration ) )
+            // InternalFormat.g:26636:1: ( ruleXExpressionOrVarDeclaration )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26636:1: ( ruleXExpressionOrVarDeclaration )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26637:1: ruleXExpressionOrVarDeclaration
+            // InternalFormat.g:26636:1: ( ruleXExpressionOrVarDeclaration )
+            // InternalFormat.g:26637:1: ruleXExpressionOrVarDeclaration
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBlockExpressionAccess().getExpressionsXExpressionOrVarDeclarationParserRuleCall_2_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_rule__XBlockExpression__ExpressionsAssignment_2_053742);
+            pushFollow(FOLLOW_2);
             ruleXExpressionOrVarDeclaration();
 
             state._fsp--;
@@ -76546,28 +76546,28 @@ public final void rule__XBlockExpression__ExpressionsAssignment_2_0() throws Rec
 
 
     // $ANTLR start "rule__XVariableDeclaration__WriteableAssignment_1_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26646:1: rule__XVariableDeclaration__WriteableAssignment_1_0 : ( ( 'var' ) ) ;
+    // InternalFormat.g:26646:1: rule__XVariableDeclaration__WriteableAssignment_1_0 : ( ( 'var' ) ) ;
     public final void rule__XVariableDeclaration__WriteableAssignment_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26650:1: ( ( ( 'var' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26651:1: ( ( 'var' ) )
+            // InternalFormat.g:26650:1: ( ( ( 'var' ) ) )
+            // InternalFormat.g:26651:1: ( ( 'var' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26651:1: ( ( 'var' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26652:1: ( 'var' )
+            // InternalFormat.g:26651:1: ( ( 'var' ) )
+            // InternalFormat.g:26652:1: ( 'var' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getWriteableVarKeyword_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26653:1: ( 'var' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26654:1: 'var'
+            // InternalFormat.g:26653:1: ( 'var' )
+            // InternalFormat.g:26654:1: 'var'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getWriteableVarKeyword_1_0_0()); 
             }
-            match(input,116,FOLLOW_116_in_rule__XVariableDeclaration__WriteableAssignment_1_053778); if (state.failed) return ;
+            match(input,116,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXVariableDeclarationAccess().getWriteableVarKeyword_1_0_0()); 
             }
@@ -76599,22 +76599,22 @@ public final void rule__XVariableDeclaration__WriteableAssignment_1_0() throws R
 
 
     // $ANTLR start "rule__XVariableDeclaration__TypeAssignment_2_0_0_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26669:1: rule__XVariableDeclaration__TypeAssignment_2_0_0_0 : ( ruleJvmTypeReference ) ;
+    // InternalFormat.g:26669:1: rule__XVariableDeclaration__TypeAssignment_2_0_0_0 : ( ruleJvmTypeReference ) ;
     public final void rule__XVariableDeclaration__TypeAssignment_2_0_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26673:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26674:1: ( ruleJvmTypeReference )
+            // InternalFormat.g:26673:1: ( ( ruleJvmTypeReference ) )
+            // InternalFormat.g:26674:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26674:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26675:1: ruleJvmTypeReference
+            // InternalFormat.g:26674:1: ( ruleJvmTypeReference )
+            // InternalFormat.g:26675:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getTypeJvmTypeReferenceParserRuleCall_2_0_0_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__XVariableDeclaration__TypeAssignment_2_0_0_053817);
+            pushFollow(FOLLOW_2);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -76644,22 +76644,22 @@ public final void rule__XVariableDeclaration__TypeAssignment_2_0_0_0() throws Re
 
 
     // $ANTLR start "rule__XVariableDeclaration__NameAssignment_2_0_0_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26684:1: rule__XVariableDeclaration__NameAssignment_2_0_0_1 : ( ruleValidID ) ;
+    // InternalFormat.g:26684:1: rule__XVariableDeclaration__NameAssignment_2_0_0_1 : ( ruleValidID ) ;
     public final void rule__XVariableDeclaration__NameAssignment_2_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26688:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26689:1: ( ruleValidID )
+            // InternalFormat.g:26688:1: ( ( ruleValidID ) )
+            // InternalFormat.g:26689:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26689:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26690:1: ruleValidID
+            // InternalFormat.g:26689:1: ( ruleValidID )
+            // InternalFormat.g:26690:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getNameValidIDParserRuleCall_2_0_0_1_0()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__XVariableDeclaration__NameAssignment_2_0_0_153848);
+            pushFollow(FOLLOW_2);
             ruleValidID();
 
             state._fsp--;
@@ -76689,22 +76689,22 @@ public final void rule__XVariableDeclaration__NameAssignment_2_0_0_1() throws Re
 
 
     // $ANTLR start "rule__XVariableDeclaration__NameAssignment_2_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26699:1: rule__XVariableDeclaration__NameAssignment_2_1 : ( ruleValidID ) ;
+    // InternalFormat.g:26699:1: rule__XVariableDeclaration__NameAssignment_2_1 : ( ruleValidID ) ;
     public final void rule__XVariableDeclaration__NameAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26703:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26704:1: ( ruleValidID )
+            // InternalFormat.g:26703:1: ( ( ruleValidID ) )
+            // InternalFormat.g:26704:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26704:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26705:1: ruleValidID
+            // InternalFormat.g:26704:1: ( ruleValidID )
+            // InternalFormat.g:26705:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getNameValidIDParserRuleCall_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__XVariableDeclaration__NameAssignment_2_153879);
+            pushFollow(FOLLOW_2);
             ruleValidID();
 
             state._fsp--;
@@ -76734,22 +76734,22 @@ public final void rule__XVariableDeclaration__NameAssignment_2_1() throws Recogn
 
 
     // $ANTLR start "rule__XVariableDeclaration__RightAssignment_3_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26714:1: rule__XVariableDeclaration__RightAssignment_3_1 : ( ruleXExpression ) ;
+    // InternalFormat.g:26714:1: rule__XVariableDeclaration__RightAssignment_3_1 : ( ruleXExpression ) ;
     public final void rule__XVariableDeclaration__RightAssignment_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26718:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26719:1: ( ruleXExpression )
+            // InternalFormat.g:26718:1: ( ( ruleXExpression ) )
+            // InternalFormat.g:26719:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26719:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26720:1: ruleXExpression
+            // InternalFormat.g:26719:1: ( ruleXExpression )
+            // InternalFormat.g:26720:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXVariableDeclarationAccess().getRightXExpressionParserRuleCall_3_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XVariableDeclaration__RightAssignment_3_153910);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -76779,22 +76779,22 @@ public final void rule__XVariableDeclaration__RightAssignment_3_1() throws Recog
 
 
     // $ANTLR start "rule__JvmFormalParameter__ParameterTypeAssignment_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26729:1: rule__JvmFormalParameter__ParameterTypeAssignment_0 : ( ruleJvmTypeReference ) ;
+    // InternalFormat.g:26729:1: rule__JvmFormalParameter__ParameterTypeAssignment_0 : ( ruleJvmTypeReference ) ;
     public final void rule__JvmFormalParameter__ParameterTypeAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26733:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26734:1: ( ruleJvmTypeReference )
+            // InternalFormat.g:26733:1: ( ( ruleJvmTypeReference ) )
+            // InternalFormat.g:26734:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26734:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26735:1: ruleJvmTypeReference
+            // InternalFormat.g:26734:1: ( ruleJvmTypeReference )
+            // InternalFormat.g:26735:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmFormalParameterAccess().getParameterTypeJvmTypeReferenceParserRuleCall_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__JvmFormalParameter__ParameterTypeAssignment_053941);
+            pushFollow(FOLLOW_2);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -76824,22 +76824,22 @@ public final void rule__JvmFormalParameter__ParameterTypeAssignment_0() throws R
 
 
     // $ANTLR start "rule__JvmFormalParameter__NameAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26744:1: rule__JvmFormalParameter__NameAssignment_1 : ( ruleValidID ) ;
+    // InternalFormat.g:26744:1: rule__JvmFormalParameter__NameAssignment_1 : ( ruleValidID ) ;
     public final void rule__JvmFormalParameter__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26748:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26749:1: ( ruleValidID )
+            // InternalFormat.g:26748:1: ( ( ruleValidID ) )
+            // InternalFormat.g:26749:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26749:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26750:1: ruleValidID
+            // InternalFormat.g:26749:1: ( ruleValidID )
+            // InternalFormat.g:26750:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmFormalParameterAccess().getNameValidIDParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__JvmFormalParameter__NameAssignment_153972);
+            pushFollow(FOLLOW_2);
             ruleValidID();
 
             state._fsp--;
@@ -76869,22 +76869,22 @@ public final void rule__JvmFormalParameter__NameAssignment_1() throws Recognitio
 
 
     // $ANTLR start "rule__FullJvmFormalParameter__ParameterTypeAssignment_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26759:1: rule__FullJvmFormalParameter__ParameterTypeAssignment_0 : ( ruleJvmTypeReference ) ;
+    // InternalFormat.g:26759:1: rule__FullJvmFormalParameter__ParameterTypeAssignment_0 : ( ruleJvmTypeReference ) ;
     public final void rule__FullJvmFormalParameter__ParameterTypeAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26763:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26764:1: ( ruleJvmTypeReference )
+            // InternalFormat.g:26763:1: ( ( ruleJvmTypeReference ) )
+            // InternalFormat.g:26764:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26764:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26765:1: ruleJvmTypeReference
+            // InternalFormat.g:26764:1: ( ruleJvmTypeReference )
+            // InternalFormat.g:26765:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFullJvmFormalParameterAccess().getParameterTypeJvmTypeReferenceParserRuleCall_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__FullJvmFormalParameter__ParameterTypeAssignment_054003);
+            pushFollow(FOLLOW_2);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -76914,22 +76914,22 @@ public final void rule__FullJvmFormalParameter__ParameterTypeAssignment_0() thro
 
 
     // $ANTLR start "rule__FullJvmFormalParameter__NameAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26774:1: rule__FullJvmFormalParameter__NameAssignment_1 : ( ruleValidID ) ;
+    // InternalFormat.g:26774:1: rule__FullJvmFormalParameter__NameAssignment_1 : ( ruleValidID ) ;
     public final void rule__FullJvmFormalParameter__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26778:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26779:1: ( ruleValidID )
+            // InternalFormat.g:26778:1: ( ( ruleValidID ) )
+            // InternalFormat.g:26779:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26779:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26780:1: ruleValidID
+            // InternalFormat.g:26779:1: ( ruleValidID )
+            // InternalFormat.g:26780:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFullJvmFormalParameterAccess().getNameValidIDParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__FullJvmFormalParameter__NameAssignment_154034);
+            pushFollow(FOLLOW_2);
             ruleValidID();
 
             state._fsp--;
@@ -76959,22 +76959,22 @@ public final void rule__FullJvmFormalParameter__NameAssignment_1() throws Recogn
 
 
     // $ANTLR start "rule__XFeatureCall__TypeArgumentsAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26789:1: rule__XFeatureCall__TypeArgumentsAssignment_1_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalFormat.g:26789:1: rule__XFeatureCall__TypeArgumentsAssignment_1_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__XFeatureCall__TypeArgumentsAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26793:1: ( ( ruleJvmArgumentTypeReference ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26794:1: ( ruleJvmArgumentTypeReference )
+            // InternalFormat.g:26793:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalFormat.g:26794:1: ( ruleJvmArgumentTypeReference )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26794:1: ( ruleJvmArgumentTypeReference )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26795:1: ruleJvmArgumentTypeReference
+            // InternalFormat.g:26794:1: ( ruleJvmArgumentTypeReference )
+            // InternalFormat.g:26795:1: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__XFeatureCall__TypeArgumentsAssignment_1_154065);
+            pushFollow(FOLLOW_2);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -77004,22 +77004,22 @@ public final void rule__XFeatureCall__TypeArgumentsAssignment_1_1() throws Recog
 
 
     // $ANTLR start "rule__XFeatureCall__TypeArgumentsAssignment_1_2_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26804:1: rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalFormat.g:26804:1: rule__XFeatureCall__TypeArgumentsAssignment_1_2_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__XFeatureCall__TypeArgumentsAssignment_1_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26808:1: ( ( ruleJvmArgumentTypeReference ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26809:1: ( ruleJvmArgumentTypeReference )
+            // InternalFormat.g:26808:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalFormat.g:26809:1: ( ruleJvmArgumentTypeReference )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26809:1: ( ruleJvmArgumentTypeReference )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26810:1: ruleJvmArgumentTypeReference
+            // InternalFormat.g:26809:1: ( ruleJvmArgumentTypeReference )
+            // InternalFormat.g:26810:1: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__XFeatureCall__TypeArgumentsAssignment_1_2_154096);
+            pushFollow(FOLLOW_2);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -77049,28 +77049,28 @@ public final void rule__XFeatureCall__TypeArgumentsAssignment_1_2_1() throws Rec
 
 
     // $ANTLR start "rule__XFeatureCall__FeatureAssignment_2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26819:1: rule__XFeatureCall__FeatureAssignment_2 : ( ( ruleIdOrSuper ) ) ;
+    // InternalFormat.g:26819:1: rule__XFeatureCall__FeatureAssignment_2 : ( ( ruleIdOrSuper ) ) ;
     public final void rule__XFeatureCall__FeatureAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26823:1: ( ( ( ruleIdOrSuper ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26824:1: ( ( ruleIdOrSuper ) )
+            // InternalFormat.g:26823:1: ( ( ( ruleIdOrSuper ) ) )
+            // InternalFormat.g:26824:1: ( ( ruleIdOrSuper ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26824:1: ( ( ruleIdOrSuper ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26825:1: ( ruleIdOrSuper )
+            // InternalFormat.g:26824:1: ( ( ruleIdOrSuper ) )
+            // InternalFormat.g:26825:1: ( ruleIdOrSuper )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureJvmIdentifiableElementCrossReference_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26826:1: ( ruleIdOrSuper )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26827:1: ruleIdOrSuper
+            // InternalFormat.g:26826:1: ( ruleIdOrSuper )
+            // InternalFormat.g:26827:1: ruleIdOrSuper
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureJvmIdentifiableElementIdOrSuperParserRuleCall_2_0_1()); 
             }
-            pushFollow(FOLLOW_ruleIdOrSuper_in_rule__XFeatureCall__FeatureAssignment_254131);
+            pushFollow(FOLLOW_2);
             ruleIdOrSuper();
 
             state._fsp--;
@@ -77106,28 +77106,28 @@ public final void rule__XFeatureCall__FeatureAssignment_2() throws RecognitionEx
 
 
     // $ANTLR start "rule__XFeatureCall__ExplicitOperationCallAssignment_3_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26838:1: rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 : ( ( '(' ) ) ;
+    // InternalFormat.g:26838:1: rule__XFeatureCall__ExplicitOperationCallAssignment_3_0 : ( ( '(' ) ) ;
     public final void rule__XFeatureCall__ExplicitOperationCallAssignment_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26842:1: ( ( ( '(' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26843:1: ( ( '(' ) )
+            // InternalFormat.g:26842:1: ( ( ( '(' ) ) )
+            // InternalFormat.g:26843:1: ( ( '(' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26843:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26844:1: ( '(' )
+            // InternalFormat.g:26843:1: ( ( '(' ) )
+            // InternalFormat.g:26844:1: ( '(' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_3_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26845:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26846:1: '('
+            // InternalFormat.g:26845:1: ( '(' )
+            // InternalFormat.g:26846:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_3_0_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XFeatureCall__ExplicitOperationCallAssignment_3_054171); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_3_0_0()); 
             }
@@ -77159,22 +77159,22 @@ public final void rule__XFeatureCall__ExplicitOperationCallAssignment_3_0() thro
 
 
     // $ANTLR start "rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26861:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 : ( ruleXShortClosure ) ;
+    // InternalFormat.g:26861:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 : ( ruleXShortClosure ) ;
     public final void rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26865:1: ( ( ruleXShortClosure ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26866:1: ( ruleXShortClosure )
+            // InternalFormat.g:26865:1: ( ( ruleXShortClosure ) )
+            // InternalFormat.g:26866:1: ( ruleXShortClosure )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26866:1: ( ruleXShortClosure )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26867:1: ruleXShortClosure
+            // InternalFormat.g:26866:1: ( ruleXShortClosure )
+            // InternalFormat.g:26867:1: ruleXShortClosure
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXShortClosureParserRuleCall_3_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXShortClosure_in_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_054210);
+            pushFollow(FOLLOW_2);
             ruleXShortClosure();
 
             state._fsp--;
@@ -77204,22 +77204,22 @@ public final void rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0() thr
 
 
     // $ANTLR start "rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26876:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 : ( ruleXExpression ) ;
+    // InternalFormat.g:26876:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0 : ( ruleXExpression ) ;
     public final void rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26880:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26881:1: ( ruleXExpression )
+            // InternalFormat.g:26880:1: ( ( ruleXExpression ) )
+            // InternalFormat.g:26881:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26881:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26882:1: ruleXExpression
+            // InternalFormat.g:26881:1: ( ruleXExpression )
+            // InternalFormat.g:26882:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXExpressionParserRuleCall_3_1_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_054241);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -77249,22 +77249,22 @@ public final void rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0() t
 
 
     // $ANTLR start "rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26891:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 : ( ruleXExpression ) ;
+    // InternalFormat.g:26891:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1 : ( ruleXExpression ) ;
     public final void rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26895:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26896:1: ( ruleXExpression )
+            // InternalFormat.g:26895:1: ( ( ruleXExpression ) )
+            // InternalFormat.g:26896:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26896:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26897:1: ruleXExpression
+            // InternalFormat.g:26896:1: ( ruleXExpression )
+            // InternalFormat.g:26897:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXExpressionParserRuleCall_3_1_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_154272);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -77294,22 +77294,22 @@ public final void rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1()
 
 
     // $ANTLR start "rule__XFeatureCall__FeatureCallArgumentsAssignment_4"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26906:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_4 : ( ruleXClosure ) ;
+    // InternalFormat.g:26906:1: rule__XFeatureCall__FeatureCallArgumentsAssignment_4 : ( ruleXClosure ) ;
     public final void rule__XFeatureCall__FeatureCallArgumentsAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26910:1: ( ( ruleXClosure ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26911:1: ( ruleXClosure )
+            // InternalFormat.g:26910:1: ( ( ruleXClosure ) )
+            // InternalFormat.g:26911:1: ( ruleXClosure )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26911:1: ( ruleXClosure )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26912:1: ruleXClosure
+            // InternalFormat.g:26911:1: ( ruleXClosure )
+            // InternalFormat.g:26912:1: ruleXClosure
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXClosureParserRuleCall_4_0()); 
             }
-            pushFollow(FOLLOW_ruleXClosure_in_rule__XFeatureCall__FeatureCallArgumentsAssignment_454303);
+            pushFollow(FOLLOW_2);
             ruleXClosure();
 
             state._fsp--;
@@ -77339,28 +77339,28 @@ public final void rule__XFeatureCall__FeatureCallArgumentsAssignment_4() throws
 
 
     // $ANTLR start "rule__XConstructorCall__ConstructorAssignment_2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26921:1: rule__XConstructorCall__ConstructorAssignment_2 : ( ( ruleQualifiedName ) ) ;
+    // InternalFormat.g:26921:1: rule__XConstructorCall__ConstructorAssignment_2 : ( ( ruleQualifiedName ) ) ;
     public final void rule__XConstructorCall__ConstructorAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26925:1: ( ( ( ruleQualifiedName ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26926:1: ( ( ruleQualifiedName ) )
+            // InternalFormat.g:26925:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalFormat.g:26926:1: ( ( ruleQualifiedName ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26926:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26927:1: ( ruleQualifiedName )
+            // InternalFormat.g:26926:1: ( ( ruleQualifiedName ) )
+            // InternalFormat.g:26927:1: ( ruleQualifiedName )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getConstructorJvmConstructorCrossReference_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26928:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26929:1: ruleQualifiedName
+            // InternalFormat.g:26928:1: ( ruleQualifiedName )
+            // InternalFormat.g:26929:1: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getConstructorJvmConstructorQualifiedNameParserRuleCall_2_0_1()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_rule__XConstructorCall__ConstructorAssignment_254338);
+            pushFollow(FOLLOW_2);
             ruleQualifiedName();
 
             state._fsp--;
@@ -77396,22 +77396,22 @@ public final void rule__XConstructorCall__ConstructorAssignment_2() throws Recog
 
 
     // $ANTLR start "rule__XConstructorCall__TypeArgumentsAssignment_3_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26940:1: rule__XConstructorCall__TypeArgumentsAssignment_3_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalFormat.g:26940:1: rule__XConstructorCall__TypeArgumentsAssignment_3_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__XConstructorCall__TypeArgumentsAssignment_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26944:1: ( ( ruleJvmArgumentTypeReference ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26945:1: ( ruleJvmArgumentTypeReference )
+            // InternalFormat.g:26944:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalFormat.g:26945:1: ( ruleJvmArgumentTypeReference )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26945:1: ( ruleJvmArgumentTypeReference )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26946:1: ruleJvmArgumentTypeReference
+            // InternalFormat.g:26945:1: ( ruleJvmArgumentTypeReference )
+            // InternalFormat.g:26946:1: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_3_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__XConstructorCall__TypeArgumentsAssignment_3_154373);
+            pushFollow(FOLLOW_2);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -77441,22 +77441,22 @@ public final void rule__XConstructorCall__TypeArgumentsAssignment_3_1() throws R
 
 
     // $ANTLR start "rule__XConstructorCall__TypeArgumentsAssignment_3_2_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26955:1: rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalFormat.g:26955:1: rule__XConstructorCall__TypeArgumentsAssignment_3_2_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__XConstructorCall__TypeArgumentsAssignment_3_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26959:1: ( ( ruleJvmArgumentTypeReference ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26960:1: ( ruleJvmArgumentTypeReference )
+            // InternalFormat.g:26959:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalFormat.g:26960:1: ( ruleJvmArgumentTypeReference )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26960:1: ( ruleJvmArgumentTypeReference )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26961:1: ruleJvmArgumentTypeReference
+            // InternalFormat.g:26960:1: ( ruleJvmArgumentTypeReference )
+            // InternalFormat.g:26961:1: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_3_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__XConstructorCall__TypeArgumentsAssignment_3_2_154404);
+            pushFollow(FOLLOW_2);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -77486,28 +77486,28 @@ public final void rule__XConstructorCall__TypeArgumentsAssignment_3_2_1() throws
 
 
     // $ANTLR start "rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26970:1: rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 : ( ( '(' ) ) ;
+    // InternalFormat.g:26970:1: rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0 : ( ( '(' ) ) ;
     public final void rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26974:1: ( ( ( '(' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26975:1: ( ( '(' ) )
+            // InternalFormat.g:26974:1: ( ( ( '(' ) ) )
+            // InternalFormat.g:26975:1: ( ( '(' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26975:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26976:1: ( '(' )
+            // InternalFormat.g:26975:1: ( ( '(' ) )
+            // InternalFormat.g:26976:1: ( '(' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getExplicitConstructorCallLeftParenthesisKeyword_4_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26977:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26978:1: '('
+            // InternalFormat.g:26977:1: ( '(' )
+            // InternalFormat.g:26978:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getExplicitConstructorCallLeftParenthesisKeyword_4_0_0()); 
             }
-            match(input,74,FOLLOW_74_in_rule__XConstructorCall__ExplicitConstructorCallAssignment_4_054440); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXConstructorCallAccess().getExplicitConstructorCallLeftParenthesisKeyword_4_0_0()); 
             }
@@ -77539,22 +77539,22 @@ public final void rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0(
 
 
     // $ANTLR start "rule__XConstructorCall__ArgumentsAssignment_4_1_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26993:1: rule__XConstructorCall__ArgumentsAssignment_4_1_0 : ( ruleXShortClosure ) ;
+    // InternalFormat.g:26993:1: rule__XConstructorCall__ArgumentsAssignment_4_1_0 : ( ruleXShortClosure ) ;
     public final void rule__XConstructorCall__ArgumentsAssignment_4_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26997:1: ( ( ruleXShortClosure ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26998:1: ( ruleXShortClosure )
+            // InternalFormat.g:26997:1: ( ( ruleXShortClosure ) )
+            // InternalFormat.g:26998:1: ( ruleXShortClosure )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26998:1: ( ruleXShortClosure )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:26999:1: ruleXShortClosure
+            // InternalFormat.g:26998:1: ( ruleXShortClosure )
+            // InternalFormat.g:26999:1: ruleXShortClosure
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getArgumentsXShortClosureParserRuleCall_4_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXShortClosure_in_rule__XConstructorCall__ArgumentsAssignment_4_1_054479);
+            pushFollow(FOLLOW_2);
             ruleXShortClosure();
 
             state._fsp--;
@@ -77584,22 +77584,22 @@ public final void rule__XConstructorCall__ArgumentsAssignment_4_1_0() throws Rec
 
 
     // $ANTLR start "rule__XConstructorCall__ArgumentsAssignment_4_1_1_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27008:1: rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 : ( ruleXExpression ) ;
+    // InternalFormat.g:27008:1: rule__XConstructorCall__ArgumentsAssignment_4_1_1_0 : ( ruleXExpression ) ;
     public final void rule__XConstructorCall__ArgumentsAssignment_4_1_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27012:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27013:1: ( ruleXExpression )
+            // InternalFormat.g:27012:1: ( ( ruleXExpression ) )
+            // InternalFormat.g:27013:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27013:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27014:1: ruleXExpression
+            // InternalFormat.g:27013:1: ( ruleXExpression )
+            // InternalFormat.g:27014:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getArgumentsXExpressionParserRuleCall_4_1_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XConstructorCall__ArgumentsAssignment_4_1_1_054510);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -77629,22 +77629,22 @@ public final void rule__XConstructorCall__ArgumentsAssignment_4_1_1_0() throws R
 
 
     // $ANTLR start "rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27023:1: rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 : ( ruleXExpression ) ;
+    // InternalFormat.g:27023:1: rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1 : ( ruleXExpression ) ;
     public final void rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27027:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27028:1: ( ruleXExpression )
+            // InternalFormat.g:27027:1: ( ( ruleXExpression ) )
+            // InternalFormat.g:27028:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27028:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27029:1: ruleXExpression
+            // InternalFormat.g:27028:1: ( ruleXExpression )
+            // InternalFormat.g:27029:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getArgumentsXExpressionParserRuleCall_4_1_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_154541);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -77674,22 +77674,22 @@ public final void rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1() throws
 
 
     // $ANTLR start "rule__XConstructorCall__ArgumentsAssignment_5"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27038:1: rule__XConstructorCall__ArgumentsAssignment_5 : ( ruleXClosure ) ;
+    // InternalFormat.g:27038:1: rule__XConstructorCall__ArgumentsAssignment_5 : ( ruleXClosure ) ;
     public final void rule__XConstructorCall__ArgumentsAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27042:1: ( ( ruleXClosure ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27043:1: ( ruleXClosure )
+            // InternalFormat.g:27042:1: ( ( ruleXClosure ) )
+            // InternalFormat.g:27043:1: ( ruleXClosure )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27043:1: ( ruleXClosure )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27044:1: ruleXClosure
+            // InternalFormat.g:27043:1: ( ruleXClosure )
+            // InternalFormat.g:27044:1: ruleXClosure
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXConstructorCallAccess().getArgumentsXClosureParserRuleCall_5_0()); 
             }
-            pushFollow(FOLLOW_ruleXClosure_in_rule__XConstructorCall__ArgumentsAssignment_554572);
+            pushFollow(FOLLOW_2);
             ruleXClosure();
 
             state._fsp--;
@@ -77719,28 +77719,28 @@ public final void rule__XConstructorCall__ArgumentsAssignment_5() throws Recogni
 
 
     // $ANTLR start "rule__XBooleanLiteral__IsTrueAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27053:1: rule__XBooleanLiteral__IsTrueAssignment_1_1 : ( ( 'true' ) ) ;
+    // InternalFormat.g:27053:1: rule__XBooleanLiteral__IsTrueAssignment_1_1 : ( ( 'true' ) ) ;
     public final void rule__XBooleanLiteral__IsTrueAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27057:1: ( ( ( 'true' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27058:1: ( ( 'true' ) )
+            // InternalFormat.g:27057:1: ( ( ( 'true' ) ) )
+            // InternalFormat.g:27058:1: ( ( 'true' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27058:1: ( ( 'true' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27059:1: ( 'true' )
+            // InternalFormat.g:27058:1: ( ( 'true' ) )
+            // InternalFormat.g:27059:1: ( 'true' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27060:1: ( 'true' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27061:1: 'true'
+            // InternalFormat.g:27060:1: ( 'true' )
+            // InternalFormat.g:27061:1: 'true'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); 
             }
-            match(input,117,FOLLOW_117_in_rule__XBooleanLiteral__IsTrueAssignment_1_154608); if (state.failed) return ;
+            match(input,117,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); 
             }
@@ -77772,22 +77772,22 @@ public final void rule__XBooleanLiteral__IsTrueAssignment_1_1() throws Recogniti
 
 
     // $ANTLR start "rule__XNumberLiteral__ValueAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27076:1: rule__XNumberLiteral__ValueAssignment_1 : ( ruleNumber ) ;
+    // InternalFormat.g:27076:1: rule__XNumberLiteral__ValueAssignment_1 : ( ruleNumber ) ;
     public final void rule__XNumberLiteral__ValueAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27080:1: ( ( ruleNumber ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27081:1: ( ruleNumber )
+            // InternalFormat.g:27080:1: ( ( ruleNumber ) )
+            // InternalFormat.g:27081:1: ( ruleNumber )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27081:1: ( ruleNumber )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27082:1: ruleNumber
+            // InternalFormat.g:27081:1: ( ruleNumber )
+            // InternalFormat.g:27082:1: ruleNumber
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXNumberLiteralAccess().getValueNumberParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleNumber_in_rule__XNumberLiteral__ValueAssignment_154647);
+            pushFollow(FOLLOW_2);
             ruleNumber();
 
             state._fsp--;
@@ -77817,22 +77817,22 @@ public final void rule__XNumberLiteral__ValueAssignment_1() throws RecognitionEx
 
 
     // $ANTLR start "rule__XStringLiteral__ValueAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27091:1: rule__XStringLiteral__ValueAssignment_1 : ( RULE_STRING ) ;
+    // InternalFormat.g:27091:1: rule__XStringLiteral__ValueAssignment_1 : ( RULE_STRING ) ;
     public final void rule__XStringLiteral__ValueAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27095:1: ( ( RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27096:1: ( RULE_STRING )
+            // InternalFormat.g:27095:1: ( ( RULE_STRING ) )
+            // InternalFormat.g:27096:1: ( RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27096:1: ( RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27097:1: RULE_STRING
+            // InternalFormat.g:27096:1: ( RULE_STRING )
+            // InternalFormat.g:27097:1: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXStringLiteralAccess().getValueSTRINGTerminalRuleCall_1_0()); 
             }
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__XStringLiteral__ValueAssignment_154678); if (state.failed) return ;
+            match(input,RULE_STRING,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXStringLiteralAccess().getValueSTRINGTerminalRuleCall_1_0()); 
             }
@@ -77858,28 +77858,28 @@ public final void rule__XStringLiteral__ValueAssignment_1() throws RecognitionEx
 
 
     // $ANTLR start "rule__XTypeLiteral__TypeAssignment_3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27106:1: rule__XTypeLiteral__TypeAssignment_3 : ( ( ruleQualifiedName ) ) ;
+    // InternalFormat.g:27106:1: rule__XTypeLiteral__TypeAssignment_3 : ( ( ruleQualifiedName ) ) ;
     public final void rule__XTypeLiteral__TypeAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27110:1: ( ( ( ruleQualifiedName ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27111:1: ( ( ruleQualifiedName ) )
+            // InternalFormat.g:27110:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalFormat.g:27111:1: ( ( ruleQualifiedName ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27111:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27112:1: ( ruleQualifiedName )
+            // InternalFormat.g:27111:1: ( ( ruleQualifiedName ) )
+            // InternalFormat.g:27112:1: ( ruleQualifiedName )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getTypeJvmTypeCrossReference_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27113:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27114:1: ruleQualifiedName
+            // InternalFormat.g:27113:1: ( ruleQualifiedName )
+            // InternalFormat.g:27114:1: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getTypeJvmTypeQualifiedNameParserRuleCall_3_0_1()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_rule__XTypeLiteral__TypeAssignment_354713);
+            pushFollow(FOLLOW_2);
             ruleQualifiedName();
 
             state._fsp--;
@@ -77915,22 +77915,22 @@ public final void rule__XTypeLiteral__TypeAssignment_3() throws RecognitionExcep
 
 
     // $ANTLR start "rule__XTypeLiteral__ArrayDimensionsAssignment_4"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27125:1: rule__XTypeLiteral__ArrayDimensionsAssignment_4 : ( ruleArrayBrackets ) ;
+    // InternalFormat.g:27125:1: rule__XTypeLiteral__ArrayDimensionsAssignment_4 : ( ruleArrayBrackets ) ;
     public final void rule__XTypeLiteral__ArrayDimensionsAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27129:1: ( ( ruleArrayBrackets ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27130:1: ( ruleArrayBrackets )
+            // InternalFormat.g:27129:1: ( ( ruleArrayBrackets ) )
+            // InternalFormat.g:27130:1: ( ruleArrayBrackets )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27130:1: ( ruleArrayBrackets )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27131:1: ruleArrayBrackets
+            // InternalFormat.g:27130:1: ( ruleArrayBrackets )
+            // InternalFormat.g:27131:1: ruleArrayBrackets
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTypeLiteralAccess().getArrayDimensionsArrayBracketsParserRuleCall_4_0()); 
             }
-            pushFollow(FOLLOW_ruleArrayBrackets_in_rule__XTypeLiteral__ArrayDimensionsAssignment_454748);
+            pushFollow(FOLLOW_2);
             ruleArrayBrackets();
 
             state._fsp--;
@@ -77960,22 +77960,22 @@ public final void rule__XTypeLiteral__ArrayDimensionsAssignment_4() throws Recog
 
 
     // $ANTLR start "rule__XThrowExpression__ExpressionAssignment_2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27140:1: rule__XThrowExpression__ExpressionAssignment_2 : ( ruleXExpression ) ;
+    // InternalFormat.g:27140:1: rule__XThrowExpression__ExpressionAssignment_2 : ( ruleXExpression ) ;
     public final void rule__XThrowExpression__ExpressionAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27144:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27145:1: ( ruleXExpression )
+            // InternalFormat.g:27144:1: ( ( ruleXExpression ) )
+            // InternalFormat.g:27145:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27145:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27146:1: ruleXExpression
+            // InternalFormat.g:27145:1: ( ruleXExpression )
+            // InternalFormat.g:27146:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXThrowExpressionAccess().getExpressionXExpressionParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XThrowExpression__ExpressionAssignment_254779);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -78005,22 +78005,22 @@ public final void rule__XThrowExpression__ExpressionAssignment_2() throws Recogn
 
 
     // $ANTLR start "rule__XReturnExpression__ExpressionAssignment_2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27155:1: rule__XReturnExpression__ExpressionAssignment_2 : ( ruleXExpression ) ;
+    // InternalFormat.g:27155:1: rule__XReturnExpression__ExpressionAssignment_2 : ( ruleXExpression ) ;
     public final void rule__XReturnExpression__ExpressionAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27159:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27160:1: ( ruleXExpression )
+            // InternalFormat.g:27159:1: ( ( ruleXExpression ) )
+            // InternalFormat.g:27160:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27160:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27161:1: ruleXExpression
+            // InternalFormat.g:27160:1: ( ruleXExpression )
+            // InternalFormat.g:27161:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXReturnExpressionAccess().getExpressionXExpressionParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XReturnExpression__ExpressionAssignment_254810);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -78050,22 +78050,22 @@ public final void rule__XReturnExpression__ExpressionAssignment_2() throws Recog
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__ExpressionAssignment_2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27170:1: rule__XTryCatchFinallyExpression__ExpressionAssignment_2 : ( ruleXExpression ) ;
+    // InternalFormat.g:27170:1: rule__XTryCatchFinallyExpression__ExpressionAssignment_2 : ( ruleXExpression ) ;
     public final void rule__XTryCatchFinallyExpression__ExpressionAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27174:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27175:1: ( ruleXExpression )
+            // InternalFormat.g:27174:1: ( ( ruleXExpression ) )
+            // InternalFormat.g:27175:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27175:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27176:1: ruleXExpression
+            // InternalFormat.g:27175:1: ( ruleXExpression )
+            // InternalFormat.g:27176:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getExpressionXExpressionParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XTryCatchFinallyExpression__ExpressionAssignment_254841);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -78095,22 +78095,22 @@ public final void rule__XTryCatchFinallyExpression__ExpressionAssignment_2() thr
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27185:1: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 : ( ruleXCatchClause ) ;
+    // InternalFormat.g:27185:1: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 : ( ruleXCatchClause ) ;
     public final void rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27189:1: ( ( ruleXCatchClause ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27190:1: ( ruleXCatchClause )
+            // InternalFormat.g:27189:1: ( ( ruleXCatchClause ) )
+            // InternalFormat.g:27190:1: ( ruleXCatchClause )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27190:1: ( ruleXCatchClause )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27191:1: ruleXCatchClause
+            // InternalFormat.g:27190:1: ( ruleXCatchClause )
+            // InternalFormat.g:27191:1: ruleXCatchClause
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getCatchClausesXCatchClauseParserRuleCall_3_0_0_0()); 
             }
-            pushFollow(FOLLOW_ruleXCatchClause_in_rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_054872);
+            pushFollow(FOLLOW_2);
             ruleXCatchClause();
 
             state._fsp--;
@@ -78140,22 +78140,22 @@ public final void rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27200:1: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 : ( ruleXExpression ) ;
+    // InternalFormat.g:27200:1: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1 : ( ruleXExpression ) ;
     public final void rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27204:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27205:1: ( ruleXExpression )
+            // InternalFormat.g:27204:1: ( ( ruleXExpression ) )
+            // InternalFormat.g:27205:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27205:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27206:1: ruleXExpression
+            // InternalFormat.g:27205:1: ( ruleXExpression )
+            // InternalFormat.g:27206:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyExpressionXExpressionParserRuleCall_3_0_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_154903);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -78185,22 +78185,22 @@ public final void rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_
 
 
     // $ANTLR start "rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27215:1: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 : ( ruleXExpression ) ;
+    // InternalFormat.g:27215:1: rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1 : ( ruleXExpression ) ;
     public final void rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27219:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27220:1: ( ruleXExpression )
+            // InternalFormat.g:27219:1: ( ( ruleXExpression ) )
+            // InternalFormat.g:27220:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27220:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27221:1: ruleXExpression
+            // InternalFormat.g:27220:1: ( ruleXExpression )
+            // InternalFormat.g:27221:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyExpressionXExpressionParserRuleCall_3_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_154934);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -78230,22 +78230,22 @@ public final void rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_
 
 
     // $ANTLR start "rule__XSynchronizedExpression__ParamAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27230:1: rule__XSynchronizedExpression__ParamAssignment_1 : ( ruleXExpression ) ;
+    // InternalFormat.g:27230:1: rule__XSynchronizedExpression__ParamAssignment_1 : ( ruleXExpression ) ;
     public final void rule__XSynchronizedExpression__ParamAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27234:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27235:1: ( ruleXExpression )
+            // InternalFormat.g:27234:1: ( ( ruleXExpression ) )
+            // InternalFormat.g:27235:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27235:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27236:1: ruleXExpression
+            // InternalFormat.g:27235:1: ( ruleXExpression )
+            // InternalFormat.g:27236:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getParamXExpressionParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XSynchronizedExpression__ParamAssignment_154965);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -78275,22 +78275,22 @@ public final void rule__XSynchronizedExpression__ParamAssignment_1() throws Reco
 
 
     // $ANTLR start "rule__XSynchronizedExpression__ExpressionAssignment_3"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27245:1: rule__XSynchronizedExpression__ExpressionAssignment_3 : ( ruleXExpression ) ;
+    // InternalFormat.g:27245:1: rule__XSynchronizedExpression__ExpressionAssignment_3 : ( ruleXExpression ) ;
     public final void rule__XSynchronizedExpression__ExpressionAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27249:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27250:1: ( ruleXExpression )
+            // InternalFormat.g:27249:1: ( ( ruleXExpression ) )
+            // InternalFormat.g:27250:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27250:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27251:1: ruleXExpression
+            // InternalFormat.g:27250:1: ( ruleXExpression )
+            // InternalFormat.g:27251:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXSynchronizedExpressionAccess().getExpressionXExpressionParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XSynchronizedExpression__ExpressionAssignment_354996);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -78320,22 +78320,22 @@ public final void rule__XSynchronizedExpression__ExpressionAssignment_3() throws
 
 
     // $ANTLR start "rule__XCatchClause__DeclaredParamAssignment_2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27260:1: rule__XCatchClause__DeclaredParamAssignment_2 : ( ruleFullJvmFormalParameter ) ;
+    // InternalFormat.g:27260:1: rule__XCatchClause__DeclaredParamAssignment_2 : ( ruleFullJvmFormalParameter ) ;
     public final void rule__XCatchClause__DeclaredParamAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27264:1: ( ( ruleFullJvmFormalParameter ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27265:1: ( ruleFullJvmFormalParameter )
+            // InternalFormat.g:27264:1: ( ( ruleFullJvmFormalParameter ) )
+            // InternalFormat.g:27265:1: ( ruleFullJvmFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27265:1: ( ruleFullJvmFormalParameter )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27266:1: ruleFullJvmFormalParameter
+            // InternalFormat.g:27265:1: ( ruleFullJvmFormalParameter )
+            // InternalFormat.g:27266:1: ruleFullJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getDeclaredParamFullJvmFormalParameterParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleFullJvmFormalParameter_in_rule__XCatchClause__DeclaredParamAssignment_255027);
+            pushFollow(FOLLOW_2);
             ruleFullJvmFormalParameter();
 
             state._fsp--;
@@ -78365,22 +78365,22 @@ public final void rule__XCatchClause__DeclaredParamAssignment_2() throws Recogni
 
 
     // $ANTLR start "rule__XCatchClause__ExpressionAssignment_4"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27275:1: rule__XCatchClause__ExpressionAssignment_4 : ( ruleXExpression ) ;
+    // InternalFormat.g:27275:1: rule__XCatchClause__ExpressionAssignment_4 : ( ruleXExpression ) ;
     public final void rule__XCatchClause__ExpressionAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27279:1: ( ( ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27280:1: ( ruleXExpression )
+            // InternalFormat.g:27279:1: ( ( ruleXExpression ) )
+            // InternalFormat.g:27280:1: ( ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27280:1: ( ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27281:1: ruleXExpression
+            // InternalFormat.g:27280:1: ( ruleXExpression )
+            // InternalFormat.g:27281:1: ruleXExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXCatchClauseAccess().getExpressionXExpressionParserRuleCall_4_0()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_rule__XCatchClause__ExpressionAssignment_455058);
+            pushFollow(FOLLOW_2);
             ruleXExpression();
 
             state._fsp--;
@@ -78410,22 +78410,22 @@ public final void rule__XCatchClause__ExpressionAssignment_4() throws Recognitio
 
 
     // $ANTLR start "rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27290:1: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 : ( ruleJvmTypeReference ) ;
+    // InternalFormat.g:27290:1: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0 : ( ruleJvmTypeReference ) ;
     public final void rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27294:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27295:1: ( ruleJvmTypeReference )
+            // InternalFormat.g:27294:1: ( ( ruleJvmTypeReference ) )
+            // InternalFormat.g:27295:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27295:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27296:1: ruleJvmTypeReference
+            // InternalFormat.g:27295:1: ( ruleJvmTypeReference )
+            // InternalFormat.g:27296:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getParamTypesJvmTypeReferenceParserRuleCall_0_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__XFunctionTypeRef__ParamTypesAssignment_0_1_055089);
+            pushFollow(FOLLOW_2);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -78455,22 +78455,22 @@ public final void rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0() throws Re
 
 
     // $ANTLR start "rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27305:1: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 : ( ruleJvmTypeReference ) ;
+    // InternalFormat.g:27305:1: rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1 : ( ruleJvmTypeReference ) ;
     public final void rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27309:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27310:1: ( ruleJvmTypeReference )
+            // InternalFormat.g:27309:1: ( ( ruleJvmTypeReference ) )
+            // InternalFormat.g:27310:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27310:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27311:1: ruleJvmTypeReference
+            // InternalFormat.g:27310:1: ( ruleJvmTypeReference )
+            // InternalFormat.g:27311:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getParamTypesJvmTypeReferenceParserRuleCall_0_1_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_155120);
+            pushFollow(FOLLOW_2);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -78500,22 +78500,22 @@ public final void rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1() throws
 
 
     // $ANTLR start "rule__XFunctionTypeRef__ReturnTypeAssignment_2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27320:1: rule__XFunctionTypeRef__ReturnTypeAssignment_2 : ( ruleJvmTypeReference ) ;
+    // InternalFormat.g:27320:1: rule__XFunctionTypeRef__ReturnTypeAssignment_2 : ( ruleJvmTypeReference ) ;
     public final void rule__XFunctionTypeRef__ReturnTypeAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27324:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27325:1: ( ruleJvmTypeReference )
+            // InternalFormat.g:27324:1: ( ( ruleJvmTypeReference ) )
+            // InternalFormat.g:27325:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27325:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27326:1: ruleJvmTypeReference
+            // InternalFormat.g:27325:1: ( ruleJvmTypeReference )
+            // InternalFormat.g:27326:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXFunctionTypeRefAccess().getReturnTypeJvmTypeReferenceParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__XFunctionTypeRef__ReturnTypeAssignment_255151);
+            pushFollow(FOLLOW_2);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -78545,28 +78545,28 @@ public final void rule__XFunctionTypeRef__ReturnTypeAssignment_2() throws Recogn
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__TypeAssignment_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27335:1: rule__JvmParameterizedTypeReference__TypeAssignment_0 : ( ( ruleQualifiedName ) ) ;
+    // InternalFormat.g:27335:1: rule__JvmParameterizedTypeReference__TypeAssignment_0 : ( ( ruleQualifiedName ) ) ;
     public final void rule__JvmParameterizedTypeReference__TypeAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27339:1: ( ( ( ruleQualifiedName ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27340:1: ( ( ruleQualifiedName ) )
+            // InternalFormat.g:27339:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalFormat.g:27340:1: ( ( ruleQualifiedName ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27340:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27341:1: ( ruleQualifiedName )
+            // InternalFormat.g:27340:1: ( ( ruleQualifiedName ) )
+            // InternalFormat.g:27341:1: ( ruleQualifiedName )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeJvmTypeCrossReference_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27342:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27343:1: ruleQualifiedName
+            // InternalFormat.g:27342:1: ( ruleQualifiedName )
+            // InternalFormat.g:27343:1: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeJvmTypeQualifiedNameParserRuleCall_0_0_1()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_rule__JvmParameterizedTypeReference__TypeAssignment_055186);
+            pushFollow(FOLLOW_2);
             ruleQualifiedName();
 
             state._fsp--;
@@ -78602,22 +78602,22 @@ public final void rule__JvmParameterizedTypeReference__TypeAssignment_0() throws
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27354:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalFormat.g:27354:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27358:1: ( ( ruleJvmArgumentTypeReference ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27359:1: ( ruleJvmArgumentTypeReference )
+            // InternalFormat.g:27358:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalFormat.g:27359:1: ( ruleJvmArgumentTypeReference )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27359:1: ( ruleJvmArgumentTypeReference )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27360:1: ruleJvmArgumentTypeReference
+            // InternalFormat.g:27359:1: ( ruleJvmArgumentTypeReference )
+            // InternalFormat.g:27360:1: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_155221);
+            pushFollow(FOLLOW_2);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -78647,22 +78647,22 @@ public final void rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1()
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27369:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalFormat.g:27369:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27373:1: ( ( ruleJvmArgumentTypeReference ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27374:1: ( ruleJvmArgumentTypeReference )
+            // InternalFormat.g:27373:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalFormat.g:27374:1: ( ruleJvmArgumentTypeReference )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27374:1: ( ruleJvmArgumentTypeReference )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27375:1: ruleJvmArgumentTypeReference
+            // InternalFormat.g:27374:1: ( ruleJvmArgumentTypeReference )
+            // InternalFormat.g:27375:1: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_155252);
+            pushFollow(FOLLOW_2);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -78692,28 +78692,28 @@ public final void rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27384:1: rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 : ( ( ruleValidID ) ) ;
+    // InternalFormat.g:27384:1: rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1 : ( ( ruleValidID ) ) ;
     public final void rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27388:1: ( ( ( ruleValidID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27389:1: ( ( ruleValidID ) )
+            // InternalFormat.g:27388:1: ( ( ( ruleValidID ) ) )
+            // InternalFormat.g:27389:1: ( ( ruleValidID ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27389:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27390:1: ( ruleValidID )
+            // InternalFormat.g:27389:1: ( ( ruleValidID ) )
+            // InternalFormat.g:27390:1: ( ruleValidID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeJvmTypeCrossReference_1_4_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27391:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27392:1: ruleValidID
+            // InternalFormat.g:27391:1: ( ruleValidID )
+            // InternalFormat.g:27392:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeJvmTypeValidIDParserRuleCall_1_4_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__JvmParameterizedTypeReference__TypeAssignment_1_4_155287);
+            pushFollow(FOLLOW_2);
             ruleValidID();
 
             state._fsp--;
@@ -78749,22 +78749,22 @@ public final void rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1() th
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27403:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalFormat.g:27403:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27407:1: ( ( ruleJvmArgumentTypeReference ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27408:1: ( ruleJvmArgumentTypeReference )
+            // InternalFormat.g:27407:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalFormat.g:27408:1: ( ruleJvmArgumentTypeReference )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27408:1: ( ruleJvmArgumentTypeReference )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27409:1: ruleJvmArgumentTypeReference
+            // InternalFormat.g:27408:1: ( ruleJvmArgumentTypeReference )
+            // InternalFormat.g:27409:1: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_4_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_155322);
+            pushFollow(FOLLOW_2);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -78794,22 +78794,22 @@ public final void rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2
 
 
     // $ANTLR start "rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27418:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 : ( ruleJvmArgumentTypeReference ) ;
+    // InternalFormat.g:27418:1: rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1 : ( ruleJvmArgumentTypeReference ) ;
     public final void rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27422:1: ( ( ruleJvmArgumentTypeReference ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27423:1: ( ruleJvmArgumentTypeReference )
+            // InternalFormat.g:27422:1: ( ( ruleJvmArgumentTypeReference ) )
+            // InternalFormat.g:27423:1: ( ruleJvmArgumentTypeReference )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27423:1: ( ruleJvmArgumentTypeReference )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27424:1: ruleJvmArgumentTypeReference
+            // InternalFormat.g:27423:1: ( ruleJvmArgumentTypeReference )
+            // InternalFormat.g:27424:1: ruleJvmArgumentTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_4_2_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_155353);
+            pushFollow(FOLLOW_2);
             ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -78839,22 +78839,22 @@ public final void rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27433:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 : ( ruleJvmUpperBound ) ;
+    // InternalFormat.g:27433:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0 : ( ruleJvmUpperBound ) ;
     public final void rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27437:1: ( ( ruleJvmUpperBound ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27438:1: ( ruleJvmUpperBound )
+            // InternalFormat.g:27437:1: ( ( ruleJvmUpperBound ) )
+            // InternalFormat.g:27438:1: ( ruleJvmUpperBound )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27438:1: ( ruleJvmUpperBound )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27439:1: ruleJvmUpperBound
+            // InternalFormat.g:27438:1: ( ruleJvmUpperBound )
+            // InternalFormat.g:27439:1: ruleJvmUpperBound
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmUpperBoundParserRuleCall_2_0_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmUpperBound_in_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_055384);
+            pushFollow(FOLLOW_2);
             ruleJvmUpperBound();
 
             state._fsp--;
@@ -78884,22 +78884,22 @@ public final void rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0()
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27448:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 : ( ruleJvmUpperBoundAnded ) ;
+    // InternalFormat.g:27448:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1 : ( ruleJvmUpperBoundAnded ) ;
     public final void rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27452:1: ( ( ruleJvmUpperBoundAnded ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27453:1: ( ruleJvmUpperBoundAnded )
+            // InternalFormat.g:27452:1: ( ( ruleJvmUpperBoundAnded ) )
+            // InternalFormat.g:27453:1: ( ruleJvmUpperBoundAnded )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27453:1: ( ruleJvmUpperBoundAnded )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27454:1: ruleJvmUpperBoundAnded
+            // InternalFormat.g:27453:1: ( ruleJvmUpperBoundAnded )
+            // InternalFormat.g:27454:1: ruleJvmUpperBoundAnded
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmUpperBoundAndedParserRuleCall_2_0_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmUpperBoundAnded_in_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_155415);
+            pushFollow(FOLLOW_2);
             ruleJvmUpperBoundAnded();
 
             state._fsp--;
@@ -78929,22 +78929,22 @@ public final void rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1()
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27463:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 : ( ruleJvmLowerBound ) ;
+    // InternalFormat.g:27463:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0 : ( ruleJvmLowerBound ) ;
     public final void rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27467:1: ( ( ruleJvmLowerBound ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27468:1: ( ruleJvmLowerBound )
+            // InternalFormat.g:27467:1: ( ( ruleJvmLowerBound ) )
+            // InternalFormat.g:27468:1: ( ruleJvmLowerBound )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27468:1: ( ruleJvmLowerBound )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27469:1: ruleJvmLowerBound
+            // InternalFormat.g:27468:1: ( ruleJvmLowerBound )
+            // InternalFormat.g:27469:1: ruleJvmLowerBound
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmLowerBoundParserRuleCall_2_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmLowerBound_in_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_055446);
+            pushFollow(FOLLOW_2);
             ruleJvmLowerBound();
 
             state._fsp--;
@@ -78974,22 +78974,22 @@ public final void rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0()
 
 
     // $ANTLR start "rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27478:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 : ( ruleJvmLowerBoundAnded ) ;
+    // InternalFormat.g:27478:1: rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1 : ( ruleJvmLowerBoundAnded ) ;
     public final void rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27482:1: ( ( ruleJvmLowerBoundAnded ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27483:1: ( ruleJvmLowerBoundAnded )
+            // InternalFormat.g:27482:1: ( ( ruleJvmLowerBoundAnded ) )
+            // InternalFormat.g:27483:1: ( ruleJvmLowerBoundAnded )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27483:1: ( ruleJvmLowerBoundAnded )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27484:1: ruleJvmLowerBoundAnded
+            // InternalFormat.g:27483:1: ( ruleJvmLowerBoundAnded )
+            // InternalFormat.g:27484:1: ruleJvmLowerBoundAnded
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmLowerBoundAndedParserRuleCall_2_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmLowerBoundAnded_in_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_155477);
+            pushFollow(FOLLOW_2);
             ruleJvmLowerBoundAnded();
 
             state._fsp--;
@@ -79019,22 +79019,22 @@ public final void rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1()
 
 
     // $ANTLR start "rule__JvmUpperBound__TypeReferenceAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27493:1: rule__JvmUpperBound__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
+    // InternalFormat.g:27493:1: rule__JvmUpperBound__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
     public final void rule__JvmUpperBound__TypeReferenceAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27497:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27498:1: ( ruleJvmTypeReference )
+            // InternalFormat.g:27497:1: ( ( ruleJvmTypeReference ) )
+            // InternalFormat.g:27498:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27498:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27499:1: ruleJvmTypeReference
+            // InternalFormat.g:27498:1: ( ruleJvmTypeReference )
+            // InternalFormat.g:27499:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAccess().getTypeReferenceJvmTypeReferenceParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__JvmUpperBound__TypeReferenceAssignment_155508);
+            pushFollow(FOLLOW_2);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -79064,22 +79064,22 @@ public final void rule__JvmUpperBound__TypeReferenceAssignment_1() throws Recogn
 
 
     // $ANTLR start "rule__JvmUpperBoundAnded__TypeReferenceAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27508:1: rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
+    // InternalFormat.g:27508:1: rule__JvmUpperBoundAnded__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
     public final void rule__JvmUpperBoundAnded__TypeReferenceAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27512:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27513:1: ( ruleJvmTypeReference )
+            // InternalFormat.g:27512:1: ( ( ruleJvmTypeReference ) )
+            // InternalFormat.g:27513:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27513:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27514:1: ruleJvmTypeReference
+            // InternalFormat.g:27513:1: ( ruleJvmTypeReference )
+            // InternalFormat.g:27514:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmUpperBoundAndedAccess().getTypeReferenceJvmTypeReferenceParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__JvmUpperBoundAnded__TypeReferenceAssignment_155539);
+            pushFollow(FOLLOW_2);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -79109,22 +79109,22 @@ public final void rule__JvmUpperBoundAnded__TypeReferenceAssignment_1() throws R
 
 
     // $ANTLR start "rule__JvmLowerBound__TypeReferenceAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27523:1: rule__JvmLowerBound__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
+    // InternalFormat.g:27523:1: rule__JvmLowerBound__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
     public final void rule__JvmLowerBound__TypeReferenceAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27527:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27528:1: ( ruleJvmTypeReference )
+            // InternalFormat.g:27527:1: ( ( ruleJvmTypeReference ) )
+            // InternalFormat.g:27528:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27528:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27529:1: ruleJvmTypeReference
+            // InternalFormat.g:27528:1: ( ruleJvmTypeReference )
+            // InternalFormat.g:27529:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAccess().getTypeReferenceJvmTypeReferenceParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__JvmLowerBound__TypeReferenceAssignment_155570);
+            pushFollow(FOLLOW_2);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -79154,22 +79154,22 @@ public final void rule__JvmLowerBound__TypeReferenceAssignment_1() throws Recogn
 
 
     // $ANTLR start "rule__JvmLowerBoundAnded__TypeReferenceAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27538:1: rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
+    // InternalFormat.g:27538:1: rule__JvmLowerBoundAnded__TypeReferenceAssignment_1 : ( ruleJvmTypeReference ) ;
     public final void rule__JvmLowerBoundAnded__TypeReferenceAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27542:1: ( ( ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27543:1: ( ruleJvmTypeReference )
+            // InternalFormat.g:27542:1: ( ( ruleJvmTypeReference ) )
+            // InternalFormat.g:27543:1: ( ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27543:1: ( ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27544:1: ruleJvmTypeReference
+            // InternalFormat.g:27543:1: ( ruleJvmTypeReference )
+            // InternalFormat.g:27544:1: ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getJvmLowerBoundAndedAccess().getTypeReferenceJvmTypeReferenceParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_rule__JvmLowerBoundAnded__TypeReferenceAssignment_155601);
+            pushFollow(FOLLOW_2);
             ruleJvmTypeReference();
 
             state._fsp--;
@@ -79199,28 +79199,28 @@ public final void rule__JvmLowerBoundAnded__TypeReferenceAssignment_1() throws R
 
 
     // $ANTLR start "rule__XImportDeclaration__StaticAssignment_1_0_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27557:1: rule__XImportDeclaration__StaticAssignment_1_0_0 : ( ( 'static' ) ) ;
+    // InternalFormat.g:27557:1: rule__XImportDeclaration__StaticAssignment_1_0_0 : ( ( 'static' ) ) ;
     public final void rule__XImportDeclaration__StaticAssignment_1_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27561:1: ( ( ( 'static' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27562:1: ( ( 'static' ) )
+            // InternalFormat.g:27561:1: ( ( ( 'static' ) ) )
+            // InternalFormat.g:27562:1: ( ( 'static' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27562:1: ( ( 'static' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27563:1: ( 'static' )
+            // InternalFormat.g:27562:1: ( ( 'static' ) )
+            // InternalFormat.g:27563:1: ( 'static' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getStaticStaticKeyword_1_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27564:1: ( 'static' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27565:1: 'static'
+            // InternalFormat.g:27564:1: ( 'static' )
+            // InternalFormat.g:27565:1: 'static'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getStaticStaticKeyword_1_0_0_0()); 
             }
-            match(input,51,FOLLOW_51_in_rule__XImportDeclaration__StaticAssignment_1_0_055641); if (state.failed) return ;
+            match(input,51,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXImportDeclarationAccess().getStaticStaticKeyword_1_0_0_0()); 
             }
@@ -79252,28 +79252,28 @@ public final void rule__XImportDeclaration__StaticAssignment_1_0_0() throws Reco
 
 
     // $ANTLR start "rule__XImportDeclaration__ExtensionAssignment_1_0_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27580:1: rule__XImportDeclaration__ExtensionAssignment_1_0_1 : ( ( 'extension' ) ) ;
+    // InternalFormat.g:27580:1: rule__XImportDeclaration__ExtensionAssignment_1_0_1 : ( ( 'extension' ) ) ;
     public final void rule__XImportDeclaration__ExtensionAssignment_1_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27584:1: ( ( ( 'extension' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27585:1: ( ( 'extension' ) )
+            // InternalFormat.g:27584:1: ( ( ( 'extension' ) ) )
+            // InternalFormat.g:27585:1: ( ( 'extension' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27585:1: ( ( 'extension' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27586:1: ( 'extension' )
+            // InternalFormat.g:27585:1: ( ( 'extension' ) )
+            // InternalFormat.g:27586:1: ( 'extension' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getExtensionExtensionKeyword_1_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27587:1: ( 'extension' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27588:1: 'extension'
+            // InternalFormat.g:27587:1: ( 'extension' )
+            // InternalFormat.g:27588:1: 'extension'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getExtensionExtensionKeyword_1_0_1_0()); 
             }
-            match(input,53,FOLLOW_53_in_rule__XImportDeclaration__ExtensionAssignment_1_0_155685); if (state.failed) return ;
+            match(input,53,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXImportDeclarationAccess().getExtensionExtensionKeyword_1_0_1_0()); 
             }
@@ -79305,28 +79305,28 @@ public final void rule__XImportDeclaration__ExtensionAssignment_1_0_1() throws R
 
 
     // $ANTLR start "rule__XImportDeclaration__ImportedTypeAssignment_1_0_2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27603:1: rule__XImportDeclaration__ImportedTypeAssignment_1_0_2 : ( ( ruleQualifiedNameInStaticImport ) ) ;
+    // InternalFormat.g:27603:1: rule__XImportDeclaration__ImportedTypeAssignment_1_0_2 : ( ( ruleQualifiedNameInStaticImport ) ) ;
     public final void rule__XImportDeclaration__ImportedTypeAssignment_1_0_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27607:1: ( ( ( ruleQualifiedNameInStaticImport ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27608:1: ( ( ruleQualifiedNameInStaticImport ) )
+            // InternalFormat.g:27607:1: ( ( ( ruleQualifiedNameInStaticImport ) ) )
+            // InternalFormat.g:27608:1: ( ( ruleQualifiedNameInStaticImport ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27608:1: ( ( ruleQualifiedNameInStaticImport ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27609:1: ( ruleQualifiedNameInStaticImport )
+            // InternalFormat.g:27608:1: ( ( ruleQualifiedNameInStaticImport ) )
+            // InternalFormat.g:27609:1: ( ruleQualifiedNameInStaticImport )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getImportedTypeJvmDeclaredTypeCrossReference_1_0_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27610:1: ( ruleQualifiedNameInStaticImport )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27611:1: ruleQualifiedNameInStaticImport
+            // InternalFormat.g:27610:1: ( ruleQualifiedNameInStaticImport )
+            // InternalFormat.g:27611:1: ruleQualifiedNameInStaticImport
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getImportedTypeJvmDeclaredTypeQualifiedNameInStaticImportParserRuleCall_1_0_2_0_1()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedNameInStaticImport_in_rule__XImportDeclaration__ImportedTypeAssignment_1_0_255728);
+            pushFollow(FOLLOW_2);
             ruleQualifiedNameInStaticImport();
 
             state._fsp--;
@@ -79362,28 +79362,28 @@ public final void rule__XImportDeclaration__ImportedTypeAssignment_1_0_2() throw
 
 
     // $ANTLR start "rule__XImportDeclaration__WildcardAssignment_1_0_3_0"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27622:1: rule__XImportDeclaration__WildcardAssignment_1_0_3_0 : ( ( '*' ) ) ;
+    // InternalFormat.g:27622:1: rule__XImportDeclaration__WildcardAssignment_1_0_3_0 : ( ( '*' ) ) ;
     public final void rule__XImportDeclaration__WildcardAssignment_1_0_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27626:1: ( ( ( '*' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27627:1: ( ( '*' ) )
+            // InternalFormat.g:27626:1: ( ( ( '*' ) ) )
+            // InternalFormat.g:27627:1: ( ( '*' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27627:1: ( ( '*' ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27628:1: ( '*' )
+            // InternalFormat.g:27627:1: ( ( '*' ) )
+            // InternalFormat.g:27628:1: ( '*' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getWildcardAsteriskKeyword_1_0_3_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27629:1: ( '*' )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27630:1: '*'
+            // InternalFormat.g:27629:1: ( '*' )
+            // InternalFormat.g:27630:1: '*'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getWildcardAsteriskKeyword_1_0_3_0_0()); 
             }
-            match(input,42,FOLLOW_42_in_rule__XImportDeclaration__WildcardAssignment_1_0_3_055768); if (state.failed) return ;
+            match(input,42,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getXImportDeclarationAccess().getWildcardAsteriskKeyword_1_0_3_0_0()); 
             }
@@ -79415,22 +79415,22 @@ public final void rule__XImportDeclaration__WildcardAssignment_1_0_3_0() throws
 
 
     // $ANTLR start "rule__XImportDeclaration__MemberNameAssignment_1_0_3_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27645:1: rule__XImportDeclaration__MemberNameAssignment_1_0_3_1 : ( ruleValidID ) ;
+    // InternalFormat.g:27645:1: rule__XImportDeclaration__MemberNameAssignment_1_0_3_1 : ( ruleValidID ) ;
     public final void rule__XImportDeclaration__MemberNameAssignment_1_0_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27649:1: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27650:1: ( ruleValidID )
+            // InternalFormat.g:27649:1: ( ( ruleValidID ) )
+            // InternalFormat.g:27650:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27650:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27651:1: ruleValidID
+            // InternalFormat.g:27650:1: ( ruleValidID )
+            // InternalFormat.g:27651:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getMemberNameValidIDParserRuleCall_1_0_3_1_0()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__XImportDeclaration__MemberNameAssignment_1_0_3_155807);
+            pushFollow(FOLLOW_2);
             ruleValidID();
 
             state._fsp--;
@@ -79460,28 +79460,28 @@ public final void rule__XImportDeclaration__MemberNameAssignment_1_0_3_1() throw
 
 
     // $ANTLR start "rule__XImportDeclaration__ImportedTypeAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27660:1: rule__XImportDeclaration__ImportedTypeAssignment_1_1 : ( ( ruleQualifiedName ) ) ;
+    // InternalFormat.g:27660:1: rule__XImportDeclaration__ImportedTypeAssignment_1_1 : ( ( ruleQualifiedName ) ) ;
     public final void rule__XImportDeclaration__ImportedTypeAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27664:1: ( ( ( ruleQualifiedName ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27665:1: ( ( ruleQualifiedName ) )
+            // InternalFormat.g:27664:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalFormat.g:27665:1: ( ( ruleQualifiedName ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27665:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27666:1: ( ruleQualifiedName )
+            // InternalFormat.g:27665:1: ( ( ruleQualifiedName ) )
+            // InternalFormat.g:27666:1: ( ruleQualifiedName )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getImportedTypeJvmDeclaredTypeCrossReference_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27667:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27668:1: ruleQualifiedName
+            // InternalFormat.g:27667:1: ( ruleQualifiedName )
+            // InternalFormat.g:27668:1: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getImportedTypeJvmDeclaredTypeQualifiedNameParserRuleCall_1_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_rule__XImportDeclaration__ImportedTypeAssignment_1_155842);
+            pushFollow(FOLLOW_2);
             ruleQualifiedName();
 
             state._fsp--;
@@ -79517,22 +79517,22 @@ public final void rule__XImportDeclaration__ImportedTypeAssignment_1_1() throws
 
 
     // $ANTLR start "rule__XImportDeclaration__ImportedNamespaceAssignment_1_2"
-    // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27679:1: rule__XImportDeclaration__ImportedNamespaceAssignment_1_2 : ( ruleQualifiedNameWithWildcard ) ;
+    // InternalFormat.g:27679:1: rule__XImportDeclaration__ImportedNamespaceAssignment_1_2 : ( ruleQualifiedNameWithWildcard ) ;
     public final void rule__XImportDeclaration__ImportedNamespaceAssignment_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27683:1: ( ( ruleQualifiedNameWithWildcard ) )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27684:1: ( ruleQualifiedNameWithWildcard )
+            // InternalFormat.g:27683:1: ( ( ruleQualifiedNameWithWildcard ) )
+            // InternalFormat.g:27684:1: ( ruleQualifiedNameWithWildcard )
             {
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27684:1: ( ruleQualifiedNameWithWildcard )
-            // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:27685:1: ruleQualifiedNameWithWildcard
+            // InternalFormat.g:27684:1: ( ruleQualifiedNameWithWildcard )
+            // InternalFormat.g:27685:1: ruleQualifiedNameWithWildcard
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getXImportDeclarationAccess().getImportedNamespaceQualifiedNameWithWildcardParserRuleCall_1_2_0()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedNameWithWildcard_in_rule__XImportDeclaration__ImportedNamespaceAssignment_1_255877);
+            pushFollow(FOLLOW_2);
             ruleQualifiedNameWithWildcard();
 
             state._fsp--;
@@ -79562,19 +79562,19 @@ public final void rule__XImportDeclaration__ImportedNamespaceAssignment_1_2() th
 
     // $ANTLR start synpred36_InternalFormat
     public final void synpred36_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3816:1: ( ( ( rule__XAnnotation__Group_3_1_0__0 ) ) )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3816:1: ( ( rule__XAnnotation__Group_3_1_0__0 ) )
+        // InternalFormat.g:3816:1: ( ( ( rule__XAnnotation__Group_3_1_0__0 ) ) )
+        // InternalFormat.g:3816:1: ( ( rule__XAnnotation__Group_3_1_0__0 ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3816:1: ( ( rule__XAnnotation__Group_3_1_0__0 ) )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3817:1: ( rule__XAnnotation__Group_3_1_0__0 )
+        // InternalFormat.g:3816:1: ( ( rule__XAnnotation__Group_3_1_0__0 ) )
+        // InternalFormat.g:3817:1: ( rule__XAnnotation__Group_3_1_0__0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getXAnnotationAccess().getGroup_3_1_0()); 
         }
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3818:1: ( rule__XAnnotation__Group_3_1_0__0 )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3818:2: rule__XAnnotation__Group_3_1_0__0
+        // InternalFormat.g:3818:1: ( rule__XAnnotation__Group_3_1_0__0 )
+        // InternalFormat.g:3818:2: rule__XAnnotation__Group_3_1_0__0
         {
-        pushFollow(FOLLOW_rule__XAnnotation__Group_3_1_0__0_in_synpred36_InternalFormat8201);
+        pushFollow(FOLLOW_2);
         rule__XAnnotation__Group_3_1_0__0();
 
         state._fsp--;
@@ -79592,19 +79592,19 @@ public final void synpred36_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred37_InternalFormat
     public final void synpred37_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3838:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) ) )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3838:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) )
+        // InternalFormat.g:3838:1: ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) ) )
+        // InternalFormat.g:3838:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3838:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3839:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__0 )
+        // InternalFormat.g:3838:1: ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) )
+        // InternalFormat.g:3839:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getGroup_0()); 
         }
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3840:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__0 )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3840:2: rule__XAnnotationElementValueOrCommaList__Group_0__0
+        // InternalFormat.g:3840:1: ( rule__XAnnotationElementValueOrCommaList__Group_0__0 )
+        // InternalFormat.g:3840:2: rule__XAnnotationElementValueOrCommaList__Group_0__0
         {
-        pushFollow(FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__0_in_synpred37_InternalFormat8252);
+        pushFollow(FOLLOW_2);
         rule__XAnnotationElementValueOrCommaList__Group_0__0();
 
         state._fsp--;
@@ -79622,19 +79622,19 @@ public final void synpred37_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred38_InternalFormat
     public final void synpred38_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3860:1: ( ( ( rule__XAnnotationElementValue__Group_0__0 ) ) )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3860:1: ( ( rule__XAnnotationElementValue__Group_0__0 ) )
+        // InternalFormat.g:3860:1: ( ( ( rule__XAnnotationElementValue__Group_0__0 ) ) )
+        // InternalFormat.g:3860:1: ( ( rule__XAnnotationElementValue__Group_0__0 ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3860:1: ( ( rule__XAnnotationElementValue__Group_0__0 ) )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3861:1: ( rule__XAnnotationElementValue__Group_0__0 )
+        // InternalFormat.g:3860:1: ( ( rule__XAnnotationElementValue__Group_0__0 ) )
+        // InternalFormat.g:3861:1: ( rule__XAnnotationElementValue__Group_0__0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getXAnnotationElementValueAccess().getGroup_0()); 
         }
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3862:1: ( rule__XAnnotationElementValue__Group_0__0 )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:3862:2: rule__XAnnotationElementValue__Group_0__0
+        // InternalFormat.g:3862:1: ( rule__XAnnotationElementValue__Group_0__0 )
+        // InternalFormat.g:3862:2: rule__XAnnotationElementValue__Group_0__0
         {
-        pushFollow(FOLLOW_rule__XAnnotationElementValue__Group_0__0_in_synpred38_InternalFormat8303);
+        pushFollow(FOLLOW_2);
         rule__XAnnotationElementValue__Group_0__0();
 
         state._fsp--;
@@ -79652,19 +79652,19 @@ public final void synpred38_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred63_InternalFormat
     public final void synpred63_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4192:1: ( ( ( rule__OpOther__Group_6_1_0__0 ) ) )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4192:1: ( ( rule__OpOther__Group_6_1_0__0 ) )
+        // InternalFormat.g:4192:1: ( ( ( rule__OpOther__Group_6_1_0__0 ) ) )
+        // InternalFormat.g:4192:1: ( ( rule__OpOther__Group_6_1_0__0 ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4192:1: ( ( rule__OpOther__Group_6_1_0__0 ) )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4193:1: ( rule__OpOther__Group_6_1_0__0 )
+        // InternalFormat.g:4192:1: ( ( rule__OpOther__Group_6_1_0__0 ) )
+        // InternalFormat.g:4193:1: ( rule__OpOther__Group_6_1_0__0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getOpOtherAccess().getGroup_6_1_0()); 
         }
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4194:1: ( rule__OpOther__Group_6_1_0__0 )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4194:2: rule__OpOther__Group_6_1_0__0
+        // InternalFormat.g:4194:1: ( rule__OpOther__Group_6_1_0__0 )
+        // InternalFormat.g:4194:2: rule__OpOther__Group_6_1_0__0
         {
-        pushFollow(FOLLOW_rule__OpOther__Group_6_1_0__0_in_synpred63_InternalFormat9085);
+        pushFollow(FOLLOW_2);
         rule__OpOther__Group_6_1_0__0();
 
         state._fsp--;
@@ -79682,16 +79682,16 @@ public final void synpred63_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred64_InternalFormat
     public final void synpred64_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4198:6: ( ( '<' ) )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4198:6: ( '<' )
+        // InternalFormat.g:4198:6: ( ( '<' ) )
+        // InternalFormat.g:4198:6: ( '<' )
         {
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4198:6: ( '<' )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4199:1: '<'
+        // InternalFormat.g:4198:6: ( '<' )
+        // InternalFormat.g:4199:1: '<'
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_1_1()); 
         }
-        match(input,33,FOLLOW_33_in_synpred64_InternalFormat9104); if (state.failed) return ;
+        match(input,33,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -79702,19 +79702,19 @@ public final void synpred64_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred77_InternalFormat
     public final void synpred77_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4450:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) ) )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4450:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) )
+        // InternalFormat.g:4450:1: ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) ) )
+        // InternalFormat.g:4450:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4450:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4451:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 )
+        // InternalFormat.g:4450:1: ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) )
+        // InternalFormat.g:4451:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsAssignment_1_1_3_1_0()); 
         }
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4452:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4452:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0
+        // InternalFormat.g:4452:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 )
+        // InternalFormat.g:4452:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0
         {
-        pushFollow(FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0_in_synpred77_InternalFormat9663);
+        pushFollow(FOLLOW_2);
         rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0();
 
         state._fsp--;
@@ -79732,19 +79732,19 @@ public final void synpred77_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred85_InternalFormat
     public final void synpred85_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4514:6: ( ( ( ruleXForLoopExpression ) ) )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4514:6: ( ( ruleXForLoopExpression ) )
+        // InternalFormat.g:4514:6: ( ( ( ruleXForLoopExpression ) ) )
+        // InternalFormat.g:4514:6: ( ( ruleXForLoopExpression ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4514:6: ( ( ruleXForLoopExpression ) )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4515:1: ( ruleXForLoopExpression )
+        // InternalFormat.g:4514:6: ( ( ruleXForLoopExpression ) )
+        // InternalFormat.g:4515:1: ( ruleXForLoopExpression )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getXPrimaryExpressionAccess().getXForLoopExpressionParserRuleCall_7()); 
         }
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4516:1: ( ruleXForLoopExpression )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4516:3: ruleXForLoopExpression
+        // InternalFormat.g:4516:1: ( ruleXForLoopExpression )
+        // InternalFormat.g:4516:3: ruleXForLoopExpression
         {
-        pushFollow(FOLLOW_ruleXForLoopExpression_in_synpred85_InternalFormat9836);
+        pushFollow(FOLLOW_2);
         ruleXForLoopExpression();
 
         state._fsp--;
@@ -79762,16 +79762,16 @@ public final void synpred85_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred86_InternalFormat
     public final void synpred86_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4520:6: ( ( ruleXBasicForLoopExpression ) )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4520:6: ( ruleXBasicForLoopExpression )
+        // InternalFormat.g:4520:6: ( ( ruleXBasicForLoopExpression ) )
+        // InternalFormat.g:4520:6: ( ruleXBasicForLoopExpression )
         {
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4520:6: ( ruleXBasicForLoopExpression )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4521:1: ruleXBasicForLoopExpression
+        // InternalFormat.g:4520:6: ( ruleXBasicForLoopExpression )
+        // InternalFormat.g:4521:1: ruleXBasicForLoopExpression
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getXPrimaryExpressionAccess().getXBasicForLoopExpressionParserRuleCall_8()); 
         }
-        pushFollow(FOLLOW_ruleXBasicForLoopExpression_in_synpred86_InternalFormat9854);
+        pushFollow(FOLLOW_2);
         ruleXBasicForLoopExpression();
 
         state._fsp--;
@@ -79786,19 +79786,19 @@ public final void synpred86_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred99_InternalFormat
     public final void synpred99_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4646:1: ( ( ( rule__XSwitchExpression__Group_2_0__0 ) ) )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4646:1: ( ( rule__XSwitchExpression__Group_2_0__0 ) )
+        // InternalFormat.g:4646:1: ( ( ( rule__XSwitchExpression__Group_2_0__0 ) ) )
+        // InternalFormat.g:4646:1: ( ( rule__XSwitchExpression__Group_2_0__0 ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4646:1: ( ( rule__XSwitchExpression__Group_2_0__0 ) )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4647:1: ( rule__XSwitchExpression__Group_2_0__0 )
+        // InternalFormat.g:4646:1: ( ( rule__XSwitchExpression__Group_2_0__0 ) )
+        // InternalFormat.g:4647:1: ( rule__XSwitchExpression__Group_2_0__0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getXSwitchExpressionAccess().getGroup_2_0()); 
         }
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4648:1: ( rule__XSwitchExpression__Group_2_0__0 )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4648:2: rule__XSwitchExpression__Group_2_0__0
+        // InternalFormat.g:4648:1: ( rule__XSwitchExpression__Group_2_0__0 )
+        // InternalFormat.g:4648:2: rule__XSwitchExpression__Group_2_0__0
         {
-        pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_0__0_in_synpred99_InternalFormat10173);
+        pushFollow(FOLLOW_2);
         rule__XSwitchExpression__Group_2_0__0();
 
         state._fsp--;
@@ -79816,19 +79816,19 @@ public final void synpred99_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred103_InternalFormat
     public final void synpred103_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4736:1: ( ( ( rule__XVariableDeclaration__Group_2_0__0 ) ) )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4736:1: ( ( rule__XVariableDeclaration__Group_2_0__0 ) )
+        // InternalFormat.g:4736:1: ( ( ( rule__XVariableDeclaration__Group_2_0__0 ) ) )
+        // InternalFormat.g:4736:1: ( ( rule__XVariableDeclaration__Group_2_0__0 ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4736:1: ( ( rule__XVariableDeclaration__Group_2_0__0 ) )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4737:1: ( rule__XVariableDeclaration__Group_2_0__0 )
+        // InternalFormat.g:4736:1: ( ( rule__XVariableDeclaration__Group_2_0__0 ) )
+        // InternalFormat.g:4737:1: ( rule__XVariableDeclaration__Group_2_0__0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getXVariableDeclarationAccess().getGroup_2_0()); 
         }
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4738:1: ( rule__XVariableDeclaration__Group_2_0__0 )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4738:2: rule__XVariableDeclaration__Group_2_0__0
+        // InternalFormat.g:4738:1: ( rule__XVariableDeclaration__Group_2_0__0 )
+        // InternalFormat.g:4738:2: rule__XVariableDeclaration__Group_2_0__0
         {
-        pushFollow(FOLLOW_rule__XVariableDeclaration__Group_2_0__0_in_synpred103_InternalFormat10377);
+        pushFollow(FOLLOW_2);
         rule__XVariableDeclaration__Group_2_0__0();
 
         state._fsp--;
@@ -79846,19 +79846,19 @@ public final void synpred103_InternalFormat_fragment() throws RecognitionExcepti
 
     // $ANTLR start synpred104_InternalFormat
     public final void synpred104_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4758:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) ) )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4758:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) )
+        // InternalFormat.g:4758:1: ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) ) )
+        // InternalFormat.g:4758:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4758:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4759:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 )
+        // InternalFormat.g:4758:1: ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) )
+        // InternalFormat.g:4759:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsAssignment_3_1_0()); 
         }
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4760:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4760:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0
+        // InternalFormat.g:4760:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 )
+        // InternalFormat.g:4760:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0
         {
-        pushFollow(FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0_in_synpred104_InternalFormat10428);
+        pushFollow(FOLLOW_2);
         rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0();
 
         state._fsp--;
@@ -79876,19 +79876,19 @@ public final void synpred104_InternalFormat_fragment() throws RecognitionExcepti
 
     // $ANTLR start synpred110_InternalFormat
     public final void synpred110_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4852:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) ) )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4852:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) )
+        // InternalFormat.g:4852:1: ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) ) )
+        // InternalFormat.g:4852:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4852:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4853:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 )
+        // InternalFormat.g:4852:1: ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) )
+        // InternalFormat.g:4853:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getXConstructorCallAccess().getArgumentsAssignment_4_1_0()); 
         }
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4854:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:4854:2: rule__XConstructorCall__ArgumentsAssignment_4_1_0
+        // InternalFormat.g:4854:1: ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 )
+        // InternalFormat.g:4854:2: rule__XConstructorCall__ArgumentsAssignment_4_1_0
         {
-        pushFollow(FOLLOW_rule__XConstructorCall__ArgumentsAssignment_4_1_0_in_synpred110_InternalFormat10643);
+        pushFollow(FOLLOW_2);
         rule__XConstructorCall__ArgumentsAssignment_4_1_0();
 
         state._fsp--;
@@ -79906,10 +79906,10 @@ public final void synpred110_InternalFormat_fragment() throws RecognitionExcepti
 
     // $ANTLR start synpred160_InternalFormat
     public final void synpred160_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10710:2: ( rule__XAssignment__Group_1_1__0 )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:10710:2: rule__XAssignment__Group_1_1__0
+        // InternalFormat.g:10710:2: ( rule__XAssignment__Group_1_1__0 )
+        // InternalFormat.g:10710:2: rule__XAssignment__Group_1_1__0
         {
-        pushFollow(FOLLOW_rule__XAssignment__Group_1_1__0_in_synpred160_InternalFormat22268);
+        pushFollow(FOLLOW_2);
         rule__XAssignment__Group_1_1__0();
 
         state._fsp--;
@@ -79921,10 +79921,10 @@ public final void synpred160_InternalFormat_fragment() throws RecognitionExcepti
 
     // $ANTLR start synpred162_InternalFormat
     public final void synpred162_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11121:2: ( rule__XOrExpression__Group_1__0 )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11121:2: rule__XOrExpression__Group_1__0
+        // InternalFormat.g:11121:2: ( rule__XOrExpression__Group_1__0 )
+        // InternalFormat.g:11121:2: rule__XOrExpression__Group_1__0
         {
-        pushFollow(FOLLOW_rule__XOrExpression__Group_1__0_in_synpred162_InternalFormat23072);
+        pushFollow(FOLLOW_2);
         rule__XOrExpression__Group_1__0();
 
         state._fsp--;
@@ -79936,10 +79936,10 @@ public final void synpred162_InternalFormat_fragment() throws RecognitionExcepti
 
     // $ANTLR start synpred163_InternalFormat
     public final void synpred163_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11336:2: ( rule__XAndExpression__Group_1__0 )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11336:2: rule__XAndExpression__Group_1__0
+        // InternalFormat.g:11336:2: ( rule__XAndExpression__Group_1__0 )
+        // InternalFormat.g:11336:2: rule__XAndExpression__Group_1__0
         {
-        pushFollow(FOLLOW_rule__XAndExpression__Group_1__0_in_synpred163_InternalFormat23495);
+        pushFollow(FOLLOW_2);
         rule__XAndExpression__Group_1__0();
 
         state._fsp--;
@@ -79951,10 +79951,10 @@ public final void synpred163_InternalFormat_fragment() throws RecognitionExcepti
 
     // $ANTLR start synpred164_InternalFormat
     public final void synpred164_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11551:2: ( rule__XEqualityExpression__Group_1__0 )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11551:2: rule__XEqualityExpression__Group_1__0
+        // InternalFormat.g:11551:2: ( rule__XEqualityExpression__Group_1__0 )
+        // InternalFormat.g:11551:2: rule__XEqualityExpression__Group_1__0
         {
-        pushFollow(FOLLOW_rule__XEqualityExpression__Group_1__0_in_synpred164_InternalFormat23918);
+        pushFollow(FOLLOW_2);
         rule__XEqualityExpression__Group_1__0();
 
         state._fsp--;
@@ -79966,10 +79966,10 @@ public final void synpred164_InternalFormat_fragment() throws RecognitionExcepti
 
     // $ANTLR start synpred165_InternalFormat
     public final void synpred165_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11766:2: ( rule__XRelationalExpression__Alternatives_1 )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:11766:2: rule__XRelationalExpression__Alternatives_1
+        // InternalFormat.g:11766:2: ( rule__XRelationalExpression__Alternatives_1 )
+        // InternalFormat.g:11766:2: rule__XRelationalExpression__Alternatives_1
         {
-        pushFollow(FOLLOW_rule__XRelationalExpression__Alternatives_1_in_synpred165_InternalFormat24341);
+        pushFollow(FOLLOW_2);
         rule__XRelationalExpression__Alternatives_1();
 
         state._fsp--;
@@ -79981,10 +79981,10 @@ public final void synpred165_InternalFormat_fragment() throws RecognitionExcepti
 
     // $ANTLR start synpred166_InternalFormat
     public final void synpred166_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12202:2: ( rule__XOtherOperatorExpression__Group_1__0 )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12202:2: rule__XOtherOperatorExpression__Group_1__0
+        // InternalFormat.g:12202:2: ( rule__XOtherOperatorExpression__Group_1__0 )
+        // InternalFormat.g:12202:2: rule__XOtherOperatorExpression__Group_1__0
         {
-        pushFollow(FOLLOW_rule__XOtherOperatorExpression__Group_1__0_in_synpred166_InternalFormat25193);
+        pushFollow(FOLLOW_2);
         rule__XOtherOperatorExpression__Group_1__0();
 
         state._fsp--;
@@ -79996,10 +79996,10 @@ public final void synpred166_InternalFormat_fragment() throws RecognitionExcepti
 
     // $ANTLR start synpred167_InternalFormat
     public final void synpred167_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12798:2: ( rule__XAdditiveExpression__Group_1__0 )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:12798:2: rule__XAdditiveExpression__Group_1__0
+        // InternalFormat.g:12798:2: ( rule__XAdditiveExpression__Group_1__0 )
+        // InternalFormat.g:12798:2: rule__XAdditiveExpression__Group_1__0
         {
-        pushFollow(FOLLOW_rule__XAdditiveExpression__Group_1__0_in_synpred167_InternalFormat26355);
+        pushFollow(FOLLOW_2);
         rule__XAdditiveExpression__Group_1__0();
 
         state._fsp--;
@@ -80011,10 +80011,10 @@ public final void synpred167_InternalFormat_fragment() throws RecognitionExcepti
 
     // $ANTLR start synpred168_InternalFormat
     public final void synpred168_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13013:2: ( rule__XMultiplicativeExpression__Group_1__0 )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13013:2: rule__XMultiplicativeExpression__Group_1__0
+        // InternalFormat.g:13013:2: ( rule__XMultiplicativeExpression__Group_1__0 )
+        // InternalFormat.g:13013:2: rule__XMultiplicativeExpression__Group_1__0
         {
-        pushFollow(FOLLOW_rule__XMultiplicativeExpression__Group_1__0_in_synpred168_InternalFormat26778);
+        pushFollow(FOLLOW_2);
         rule__XMultiplicativeExpression__Group_1__0();
 
         state._fsp--;
@@ -80026,10 +80026,10 @@ public final void synpred168_InternalFormat_fragment() throws RecognitionExcepti
 
     // $ANTLR start synpred169_InternalFormat
     public final void synpred169_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13322:2: ( rule__XCastedExpression__Group_1__0 )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13322:2: rule__XCastedExpression__Group_1__0
+        // InternalFormat.g:13322:2: ( rule__XCastedExpression__Group_1__0 )
+        // InternalFormat.g:13322:2: rule__XCastedExpression__Group_1__0
         {
-        pushFollow(FOLLOW_rule__XCastedExpression__Group_1__0_in_synpred169_InternalFormat27385);
+        pushFollow(FOLLOW_2);
         rule__XCastedExpression__Group_1__0();
 
         state._fsp--;
@@ -80041,10 +80041,10 @@ public final void synpred169_InternalFormat_fragment() throws RecognitionExcepti
 
     // $ANTLR start synpred170_InternalFormat
     public final void synpred170_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13539:2: ( rule__XPostfixOperation__Group_1__0 )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13539:2: rule__XPostfixOperation__Group_1__0
+        // InternalFormat.g:13539:2: ( rule__XPostfixOperation__Group_1__0 )
+        // InternalFormat.g:13539:2: rule__XPostfixOperation__Group_1__0
         {
-        pushFollow(FOLLOW_rule__XPostfixOperation__Group_1__0_in_synpred170_InternalFormat27810);
+        pushFollow(FOLLOW_2);
         rule__XPostfixOperation__Group_1__0();
 
         state._fsp--;
@@ -80056,10 +80056,10 @@ public final void synpred170_InternalFormat_fragment() throws RecognitionExcepti
 
     // $ANTLR start synpred171_InternalFormat
     public final void synpred171_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13693:2: ( rule__XMemberFeatureCall__Alternatives_1 )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:13693:2: rule__XMemberFeatureCall__Alternatives_1
+        // InternalFormat.g:13693:2: ( rule__XMemberFeatureCall__Alternatives_1 )
+        // InternalFormat.g:13693:2: rule__XMemberFeatureCall__Alternatives_1
         {
-        pushFollow(FOLLOW_rule__XMemberFeatureCall__Alternatives_1_in_synpred171_InternalFormat28112);
+        pushFollow(FOLLOW_2);
         rule__XMemberFeatureCall__Alternatives_1();
 
         state._fsp--;
@@ -80071,10 +80071,10 @@ public final void synpred171_InternalFormat_fragment() throws RecognitionExcepti
 
     // $ANTLR start synpred173_InternalFormat
     public final void synpred173_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14029:2: ( rule__XMemberFeatureCall__Group_1_1_3__0 )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14029:2: rule__XMemberFeatureCall__Group_1_1_3__0
+        // InternalFormat.g:14029:2: ( rule__XMemberFeatureCall__Group_1_1_3__0 )
+        // InternalFormat.g:14029:2: rule__XMemberFeatureCall__Group_1_1_3__0
         {
-        pushFollow(FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__0_in_synpred173_InternalFormat28783);
+        pushFollow(FOLLOW_2);
         rule__XMemberFeatureCall__Group_1_1_3__0();
 
         state._fsp--;
@@ -80086,10 +80086,10 @@ public final void synpred173_InternalFormat_fragment() throws RecognitionExcepti
 
     // $ANTLR start synpred174_InternalFormat
     public final void synpred174_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14057:2: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:14057:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4
+        // InternalFormat.g:14057:2: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )
+        // InternalFormat.g:14057:2: rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4
         {
-        pushFollow(FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4_in_synpred174_InternalFormat28841);
+        pushFollow(FOLLOW_2);
         rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4();
 
         state._fsp--;
@@ -80101,10 +80101,10 @@ public final void synpred174_InternalFormat_fragment() throws RecognitionExcepti
 
     // $ANTLR start synpred182_InternalFormat
     public final void synpred182_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15198:2: ( rule__XClosure__Group_1__0 )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:15198:2: rule__XClosure__Group_1__0
+        // InternalFormat.g:15198:2: ( rule__XClosure__Group_1__0 )
+        // InternalFormat.g:15198:2: rule__XClosure__Group_1__0
         {
-        pushFollow(FOLLOW_rule__XClosure__Group_1__0_in_synpred182_InternalFormat31077);
+        pushFollow(FOLLOW_2);
         rule__XClosure__Group_1__0();
 
         state._fsp--;
@@ -80116,10 +80116,10 @@ public final void synpred182_InternalFormat_fragment() throws RecognitionExcepti
 
     // $ANTLR start synpred189_InternalFormat
     public final void synpred189_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16316:2: ( rule__XIfExpression__Group_6__0 )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16316:2: rule__XIfExpression__Group_6__0
+        // InternalFormat.g:16316:2: ( rule__XIfExpression__Group_6__0 )
+        // InternalFormat.g:16316:2: rule__XIfExpression__Group_6__0
         {
-        pushFollow(FOLLOW_rule__XIfExpression__Group_6__0_in_synpred189_InternalFormat33283);
+        pushFollow(FOLLOW_2);
         rule__XIfExpression__Group_6__0();
 
         state._fsp--;
@@ -80131,10 +80131,10 @@ public final void synpred189_InternalFormat_fragment() throws RecognitionExcepti
 
     // $ANTLR start synpred192_InternalFormat
     public final void synpred192_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16866:2: ( rule__XSwitchExpression__Group_2_1_0__0 )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:16866:2: rule__XSwitchExpression__Group_2_1_0__0
+        // InternalFormat.g:16866:2: ( rule__XSwitchExpression__Group_2_1_0__0 )
+        // InternalFormat.g:16866:2: rule__XSwitchExpression__Group_2_1_0__0
         {
-        pushFollow(FOLLOW_rule__XSwitchExpression__Group_2_1_0__0_in_synpred192_InternalFormat34354);
+        pushFollow(FOLLOW_2);
         rule__XSwitchExpression__Group_2_1_0__0();
 
         state._fsp--;
@@ -80146,10 +80146,10 @@ public final void synpred192_InternalFormat_fragment() throws RecognitionExcepti
 
     // $ANTLR start synpred205_InternalFormat
     public final void synpred205_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19354:2: ( rule__XFeatureCall__Group_3__0 )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19354:2: rule__XFeatureCall__Group_3__0
+        // InternalFormat.g:19354:2: ( rule__XFeatureCall__Group_3__0 )
+        // InternalFormat.g:19354:2: rule__XFeatureCall__Group_3__0
         {
-        pushFollow(FOLLOW_rule__XFeatureCall__Group_3__0_in_synpred205_InternalFormat39248);
+        pushFollow(FOLLOW_2);
         rule__XFeatureCall__Group_3__0();
 
         state._fsp--;
@@ -80161,10 +80161,10 @@ public final void synpred205_InternalFormat_fragment() throws RecognitionExcepti
 
     // $ANTLR start synpred206_InternalFormat
     public final void synpred206_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19382:2: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19382:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_4
+        // InternalFormat.g:19382:2: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )
+        // InternalFormat.g:19382:2: rule__XFeatureCall__FeatureCallArgumentsAssignment_4
         {
-        pushFollow(FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_4_in_synpred206_InternalFormat39306);
+        pushFollow(FOLLOW_2);
         rule__XFeatureCall__FeatureCallArgumentsAssignment_4();
 
         state._fsp--;
@@ -80176,10 +80176,10 @@ public final void synpred206_InternalFormat_fragment() throws RecognitionExcepti
 
     // $ANTLR start synpred210_InternalFormat
     public final void synpred210_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19920:2: ( rule__XConstructorCall__Group_3__0 )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19920:2: rule__XConstructorCall__Group_3__0
+        // InternalFormat.g:19920:2: ( rule__XConstructorCall__Group_3__0 )
+        // InternalFormat.g:19920:2: rule__XConstructorCall__Group_3__0
         {
-        pushFollow(FOLLOW_rule__XConstructorCall__Group_3__0_in_synpred210_InternalFormat40364);
+        pushFollow(FOLLOW_2);
         rule__XConstructorCall__Group_3__0();
 
         state._fsp--;
@@ -80191,10 +80191,10 @@ public final void synpred210_InternalFormat_fragment() throws RecognitionExcepti
 
     // $ANTLR start synpred211_InternalFormat
     public final void synpred211_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19949:2: ( rule__XConstructorCall__Group_4__0 )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19949:2: rule__XConstructorCall__Group_4__0
+        // InternalFormat.g:19949:2: ( rule__XConstructorCall__Group_4__0 )
+        // InternalFormat.g:19949:2: rule__XConstructorCall__Group_4__0
         {
-        pushFollow(FOLLOW_rule__XConstructorCall__Group_4__0_in_synpred211_InternalFormat40425);
+        pushFollow(FOLLOW_2);
         rule__XConstructorCall__Group_4__0();
 
         state._fsp--;
@@ -80206,10 +80206,10 @@ public final void synpred211_InternalFormat_fragment() throws RecognitionExcepti
 
     // $ANTLR start synpred212_InternalFormat
     public final void synpred212_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19977:2: ( rule__XConstructorCall__ArgumentsAssignment_5 )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:19977:2: rule__XConstructorCall__ArgumentsAssignment_5
+        // InternalFormat.g:19977:2: ( rule__XConstructorCall__ArgumentsAssignment_5 )
+        // InternalFormat.g:19977:2: rule__XConstructorCall__ArgumentsAssignment_5
         {
-        pushFollow(FOLLOW_rule__XConstructorCall__ArgumentsAssignment_5_in_synpred212_InternalFormat40483);
+        pushFollow(FOLLOW_2);
         rule__XConstructorCall__ArgumentsAssignment_5();
 
         state._fsp--;
@@ -80221,10 +80221,10 @@ public final void synpred212_InternalFormat_fragment() throws RecognitionExcepti
 
     // $ANTLR start synpred217_InternalFormat
     public final void synpred217_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21030:2: ( rule__XReturnExpression__ExpressionAssignment_2 )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21030:2: rule__XReturnExpression__ExpressionAssignment_2
+        // InternalFormat.g:21030:2: ( rule__XReturnExpression__ExpressionAssignment_2 )
+        // InternalFormat.g:21030:2: rule__XReturnExpression__ExpressionAssignment_2
         {
-        pushFollow(FOLLOW_rule__XReturnExpression__ExpressionAssignment_2_in_synpred217_InternalFormat42535);
+        pushFollow(FOLLOW_2);
         rule__XReturnExpression__ExpressionAssignment_2();
 
         state._fsp--;
@@ -80236,10 +80236,10 @@ public final void synpred217_InternalFormat_fragment() throws RecognitionExcepti
 
     // $ANTLR start synpred218_InternalFormat
     public final void synpred218_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21198:2: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21198:2: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0
+        // InternalFormat.g:21198:2: ( rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0 )
+        // InternalFormat.g:21198:2: rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0
         {
-        pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0_in_synpred218_InternalFormat42864);
+        pushFollow(FOLLOW_2);
         rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0();
 
         state._fsp--;
@@ -80251,10 +80251,10 @@ public final void synpred218_InternalFormat_fragment() throws RecognitionExcepti
 
     // $ANTLR start synpred219_InternalFormat
     public final void synpred219_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21227:2: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21227:2: rule__XTryCatchFinallyExpression__Group_3_0_1__0
+        // InternalFormat.g:21227:2: ( rule__XTryCatchFinallyExpression__Group_3_0_1__0 )
+        // InternalFormat.g:21227:2: rule__XTryCatchFinallyExpression__Group_3_0_1__0
         {
-        pushFollow(FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__0_in_synpred219_InternalFormat42924);
+        pushFollow(FOLLOW_2);
         rule__XTryCatchFinallyExpression__Group_3_0_1__0();
 
         state._fsp--;
@@ -80266,10 +80266,10 @@ public final void synpred219_InternalFormat_fragment() throws RecognitionExcepti
 
     // $ANTLR start synpred220_InternalFormat
     public final void synpred220_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21827:2: ( rule__QualifiedName__Group_1__0 )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:21827:2: rule__QualifiedName__Group_1__0
+        // InternalFormat.g:21827:2: ( rule__QualifiedName__Group_1__0 )
+        // InternalFormat.g:21827:2: rule__QualifiedName__Group_1__0
         {
-        pushFollow(FOLLOW_rule__QualifiedName__Group_1__0_in_synpred220_InternalFormat44102);
+        pushFollow(FOLLOW_2);
         rule__QualifiedName__Group_1__0();
 
         state._fsp--;
@@ -80281,10 +80281,10 @@ public final void synpred220_InternalFormat_fragment() throws RecognitionExcepti
 
     // $ANTLR start synpred222_InternalFormat
     public final void synpred222_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22076:2: ( rule__JvmTypeReference__Group_0_1__0 )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22076:2: rule__JvmTypeReference__Group_0_1__0
+        // InternalFormat.g:22076:2: ( rule__JvmTypeReference__Group_0_1__0 )
+        // InternalFormat.g:22076:2: rule__JvmTypeReference__Group_0_1__0
         {
-        pushFollow(FOLLOW_rule__JvmTypeReference__Group_0_1__0_in_synpred222_InternalFormat44593);
+        pushFollow(FOLLOW_2);
         rule__JvmTypeReference__Group_0_1__0();
 
         state._fsp--;
@@ -80296,10 +80296,10 @@ public final void synpred222_InternalFormat_fragment() throws RecognitionExcepti
 
     // $ANTLR start synpred226_InternalFormat
     public final void synpred226_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22609:2: ( rule__JvmParameterizedTypeReference__Group_1__0 )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22609:2: rule__JvmParameterizedTypeReference__Group_1__0
+        // InternalFormat.g:22609:2: ( rule__JvmParameterizedTypeReference__Group_1__0 )
+        // InternalFormat.g:22609:2: rule__JvmParameterizedTypeReference__Group_1__0
         {
-        pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1__0_in_synpred226_InternalFormat45639);
+        pushFollow(FOLLOW_2);
         rule__JvmParameterizedTypeReference__Group_1__0();
 
         state._fsp--;
@@ -80311,10 +80311,10 @@ public final void synpred226_InternalFormat_fragment() throws RecognitionExcepti
 
     // $ANTLR start synpred228_InternalFormat
     public final void synpred228_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22761:2: ( rule__JvmParameterizedTypeReference__Group_1_4__0 )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22761:2: rule__JvmParameterizedTypeReference__Group_1_4__0
+        // InternalFormat.g:22761:2: ( rule__JvmParameterizedTypeReference__Group_1_4__0 )
+        // InternalFormat.g:22761:2: rule__JvmParameterizedTypeReference__Group_1_4__0
         {
-        pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__0_in_synpred228_InternalFormat45948);
+        pushFollow(FOLLOW_2);
         rule__JvmParameterizedTypeReference__Group_1_4__0();
 
         state._fsp--;
@@ -80326,10 +80326,10 @@ public final void synpred228_InternalFormat_fragment() throws RecognitionExcepti
 
     // $ANTLR start synpred229_InternalFormat
     public final void synpred229_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22920:2: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )
-        // ../com.avaloq.tools.ddk.xtext.format.ui/src-gen/com/avaloq/tools/ddk/xtext/format/ui/contentassist/antlr/internal/InternalFormat.g:22920:2: rule__JvmParameterizedTypeReference__Group_1_4_2__0
+        // InternalFormat.g:22920:2: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )
+        // InternalFormat.g:22920:2: rule__JvmParameterizedTypeReference__Group_1_4_2__0
         {
-        pushFollow(FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__0_in_synpred229_InternalFormat46259);
+        pushFollow(FOLLOW_2);
         rule__JvmParameterizedTypeReference__Group_1_4_2__0();
 
         state._fsp--;
@@ -80944,19 +80944,13 @@ public final boolean synpred226_InternalFormat() {
     protected DFA159 dfa159 = new DFA159(this);
     protected DFA168 dfa168 = new DFA168(this);
     protected DFA171 dfa171 = new DFA171(this);
-    static final String DFA18_eotS =
-        "\13\uffff";
-    static final String DFA18_eofS =
-        "\1\uffff\4\5\3\uffff\3\5";
-    static final String DFA18_minS =
-        "\5\4\2\uffff\1\5\3\4";
-    static final String DFA18_maxS =
-        "\1\23\4\74\2\uffff\1\23\3\74";
-    static final String DFA18_acceptS =
-        "\5\uffff\1\1\1\2\4\uffff";
-    static final String DFA18_specialS =
-        "\13\uffff}>";
-    static final String[] DFA18_transitionS = {
+    static final String dfa_1s = "\13\uffff";
+    static final String dfa_2s = "\1\uffff\4\5\3\uffff\3\5";
+    static final String dfa_3s = "\5\4\2\uffff\1\5\3\4";
+    static final String dfa_4s = "\1\23\4\74\2\uffff\1\23\3\74";
+    static final String dfa_5s = "\5\uffff\1\1\1\2\4\uffff";
+    static final String dfa_6s = "\13\uffff}>";
+    static final String[] dfa_7s = {
             "\1\1\1\2\14\uffff\1\3\1\4",
             "\2\6\14\uffff\2\6\44\uffff\5\5",
             "\2\6\14\uffff\2\6\35\uffff\1\7\6\uffff\5\5",
@@ -80970,56 +80964,38 @@ public final boolean synpred226_InternalFormat() {
             "\2\6\14\uffff\2\6\35\uffff\1\7\6\uffff\5\5"
     };
 
-    static final short[] DFA18_eot = DFA.unpackEncodedString(DFA18_eotS);
-    static final short[] DFA18_eof = DFA.unpackEncodedString(DFA18_eofS);
-    static final char[] DFA18_min = DFA.unpackEncodedStringToUnsignedChars(DFA18_minS);
-    static final char[] DFA18_max = DFA.unpackEncodedStringToUnsignedChars(DFA18_maxS);
-    static final short[] DFA18_accept = DFA.unpackEncodedString(DFA18_acceptS);
-    static final short[] DFA18_special = DFA.unpackEncodedString(DFA18_specialS);
-    static final short[][] DFA18_transition;
-
-    static {
-        int numStates = DFA18_transitionS.length;
-        DFA18_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA18_transition[i] = DFA.unpackEncodedString(DFA18_transitionS[i]);
-        }
-    }
+    static final short[] dfa_1 = DFA.unpackEncodedString(dfa_1s);
+    static final short[] dfa_2 = DFA.unpackEncodedString(dfa_2s);
+    static final char[] dfa_3 = DFA.unpackEncodedStringToUnsignedChars(dfa_3s);
+    static final char[] dfa_4 = DFA.unpackEncodedStringToUnsignedChars(dfa_4s);
+    static final short[] dfa_5 = DFA.unpackEncodedString(dfa_5s);
+    static final short[] dfa_6 = DFA.unpackEncodedString(dfa_6s);
+    static final short[][] dfa_7 = unpackEncodedStringArray(dfa_7s);
 
     class DFA18 extends DFA {
 
         public DFA18(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 18;
-            this.eot = DFA18_eot;
-            this.eof = DFA18_eof;
-            this.min = DFA18_min;
-            this.max = DFA18_max;
-            this.accept = DFA18_accept;
-            this.special = DFA18_special;
-            this.transition = DFA18_transition;
+            this.eot = dfa_1;
+            this.eof = dfa_2;
+            this.min = dfa_3;
+            this.max = dfa_4;
+            this.accept = dfa_5;
+            this.special = dfa_6;
+            this.transition = dfa_7;
         }
         public String getDescription() {
             return "3657:1: rule__LinewrapLocator__Alternatives_0_1_1 : ( ( ( rule__LinewrapLocator__ValueAssignment_0_1_1_0 ) ) | ( ( rule__LinewrapLocator__Group_0_1_1_1__0 ) ) );";
         }
     }
-    static final String DFA24_eotS =
-        "\45\uffff";
-    static final String DFA24_eofS =
-        "\45\uffff";
-    static final String DFA24_minS =
-        "\1\4\3\0\41\uffff";
-    static final String DFA24_maxS =
-        "\1\165\3\0\41\uffff";
-    static final String DFA24_acceptS =
-        "\4\uffff\1\2\37\uffff\1\1";
-    static final String DFA24_specialS =
-        "\1\uffff\1\0\1\1\1\2\41\uffff}>";
-    static final String[] DFA24_transitionS = {
-            "\1\4\1\3\3\4\13\uffff\1\1\1\2\13\uffff\1\4\6\uffff\2\4\4\uffff"+
-            "\1\4\3\uffff\6\4\6\uffff\1\4\3\uffff\1\4\1\uffff\2\4\4\uffff"+
-            "\1\4\11\uffff\1\4\2\uffff\1\4\1\uffff\1\4\1\uffff\10\4\1\uffff"+
-            "\1\4\20\uffff\1\4",
+    static final String dfa_8s = "\45\uffff";
+    static final String dfa_9s = "\1\4\3\0\41\uffff";
+    static final String dfa_10s = "\1\165\3\0\41\uffff";
+    static final String dfa_11s = "\4\uffff\1\2\37\uffff\1\1";
+    static final String dfa_12s = "\1\uffff\1\0\1\1\1\2\41\uffff}>";
+    static final String[] dfa_13s = {
+            "\1\4\1\3\3\4\13\uffff\1\1\1\2\13\uffff\1\4\6\uffff\2\4\4\uffff\1\4\3\uffff\6\4\6\uffff\1\4\3\uffff\1\4\1\uffff\2\4\4\uffff\1\4\11\uffff\1\4\2\uffff\1\4\1\uffff\1\4\1\uffff\10\4\1\uffff\1\4\20\uffff\1\4",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -81058,34 +81034,25 @@ public String getDescription() {
             ""
     };
 
-    static final short[] DFA24_eot = DFA.unpackEncodedString(DFA24_eotS);
-    static final short[] DFA24_eof = DFA.unpackEncodedString(DFA24_eofS);
-    static final char[] DFA24_min = DFA.unpackEncodedStringToUnsignedChars(DFA24_minS);
-    static final char[] DFA24_max = DFA.unpackEncodedStringToUnsignedChars(DFA24_maxS);
-    static final short[] DFA24_accept = DFA.unpackEncodedString(DFA24_acceptS);
-    static final short[] DFA24_special = DFA.unpackEncodedString(DFA24_specialS);
-    static final short[][] DFA24_transition;
-
-    static {
-        int numStates = DFA24_transitionS.length;
-        DFA24_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA24_transition[i] = DFA.unpackEncodedString(DFA24_transitionS[i]);
-        }
-    }
+    static final short[] dfa_8 = DFA.unpackEncodedString(dfa_8s);
+    static final char[] dfa_9 = DFA.unpackEncodedStringToUnsignedChars(dfa_9s);
+    static final char[] dfa_10 = DFA.unpackEncodedStringToUnsignedChars(dfa_10s);
+    static final short[] dfa_11 = DFA.unpackEncodedString(dfa_11s);
+    static final short[] dfa_12 = DFA.unpackEncodedString(dfa_12s);
+    static final short[][] dfa_13 = unpackEncodedStringArray(dfa_13s);
 
     class DFA24 extends DFA {
 
         public DFA24(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 24;
-            this.eot = DFA24_eot;
-            this.eof = DFA24_eof;
-            this.min = DFA24_min;
-            this.max = DFA24_max;
-            this.accept = DFA24_accept;
-            this.special = DFA24_special;
-            this.transition = DFA24_transition;
+            this.eot = dfa_8;
+            this.eof = dfa_8;
+            this.min = dfa_9;
+            this.max = dfa_10;
+            this.accept = dfa_11;
+            this.special = dfa_12;
+            this.transition = dfa_13;
         }
         public String getDescription() {
             return "3811:1: rule__XAnnotation__Alternatives_3_1 : ( ( ( rule__XAnnotation__Group_3_1_0__0 ) ) | ( ( rule__XAnnotation__ValueAssignment_3_1_1 ) ) );";
@@ -81147,23 +81114,12 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA25_eotS =
-        "\45\uffff";
-    static final String DFA25_eofS =
-        "\45\uffff";
-    static final String DFA25_minS =
-        "\1\4\1\0\43\uffff";
-    static final String DFA25_maxS =
-        "\1\165\1\0\43\uffff";
-    static final String DFA25_acceptS =
-        "\2\uffff\1\2\41\uffff\1\1";
-    static final String DFA25_specialS =
-        "\1\uffff\1\0\43\uffff}>";
-    static final String[] DFA25_transitionS = {
-            "\5\2\13\uffff\2\2\13\uffff\1\2\6\uffff\2\2\4\uffff\1\2\3\uffff"+
-            "\6\2\6\uffff\1\2\3\uffff\1\2\1\uffff\2\2\4\uffff\1\2\11\uffff"+
-            "\1\1\2\uffff\1\2\1\uffff\1\2\1\uffff\10\2\1\uffff\1\2\20\uffff"+
-            "\1\2",
+    static final String dfa_14s = "\1\4\1\0\43\uffff";
+    static final String dfa_15s = "\1\165\1\0\43\uffff";
+    static final String dfa_16s = "\2\uffff\1\2\41\uffff\1\1";
+    static final String dfa_17s = "\1\uffff\1\0\43\uffff}>";
+    static final String[] dfa_18s = {
+            "\5\2\13\uffff\2\2\13\uffff\1\2\6\uffff\2\2\4\uffff\1\2\3\uffff\6\2\6\uffff\1\2\3\uffff\1\2\1\uffff\2\2\4\uffff\1\2\11\uffff\1\1\2\uffff\1\2\1\uffff\1\2\1\uffff\10\2\1\uffff\1\2\20\uffff\1\2",
             "\1\uffff",
             "",
             "",
@@ -81201,35 +81157,24 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             "",
             ""
     };
-
-    static final short[] DFA25_eot = DFA.unpackEncodedString(DFA25_eotS);
-    static final short[] DFA25_eof = DFA.unpackEncodedString(DFA25_eofS);
-    static final char[] DFA25_min = DFA.unpackEncodedStringToUnsignedChars(DFA25_minS);
-    static final char[] DFA25_max = DFA.unpackEncodedStringToUnsignedChars(DFA25_maxS);
-    static final short[] DFA25_accept = DFA.unpackEncodedString(DFA25_acceptS);
-    static final short[] DFA25_special = DFA.unpackEncodedString(DFA25_specialS);
-    static final short[][] DFA25_transition;
-
-    static {
-        int numStates = DFA25_transitionS.length;
-        DFA25_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA25_transition[i] = DFA.unpackEncodedString(DFA25_transitionS[i]);
-        }
-    }
+    static final char[] dfa_14 = DFA.unpackEncodedStringToUnsignedChars(dfa_14s);
+    static final char[] dfa_15 = DFA.unpackEncodedStringToUnsignedChars(dfa_15s);
+    static final short[] dfa_16 = DFA.unpackEncodedString(dfa_16s);
+    static final short[] dfa_17 = DFA.unpackEncodedString(dfa_17s);
+    static final short[][] dfa_18 = unpackEncodedStringArray(dfa_18s);
 
     class DFA25 extends DFA {
 
         public DFA25(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 25;
-            this.eot = DFA25_eot;
-            this.eof = DFA25_eof;
-            this.min = DFA25_min;
-            this.max = DFA25_max;
-            this.accept = DFA25_accept;
-            this.special = DFA25_special;
-            this.transition = DFA25_transition;
+            this.eot = dfa_8;
+            this.eof = dfa_8;
+            this.min = dfa_14;
+            this.max = dfa_15;
+            this.accept = dfa_16;
+            this.special = dfa_17;
+            this.transition = dfa_18;
         }
         public String getDescription() {
             return "3833:1: rule__XAnnotationElementValueOrCommaList__Alternatives : ( ( ( rule__XAnnotationElementValueOrCommaList__Group_0__0 ) ) | ( ( rule__XAnnotationElementValueOrCommaList__Group_1__0 ) ) );";
@@ -81261,89 +81206,19 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA26_eotS =
-        "\45\uffff";
-    static final String DFA26_eofS =
-        "\45\uffff";
-    static final String DFA26_minS =
-        "\1\4\1\0\43\uffff";
-    static final String DFA26_maxS =
-        "\1\165\1\0\43\uffff";
-    static final String DFA26_acceptS =
-        "\2\uffff\1\2\41\uffff\1\1";
-    static final String DFA26_specialS =
-        "\1\uffff\1\0\43\uffff}>";
-    static final String[] DFA26_transitionS = {
-            "\5\2\13\uffff\2\2\13\uffff\1\2\6\uffff\2\2\4\uffff\1\2\3\uffff"+
-            "\6\2\6\uffff\1\2\3\uffff\1\2\1\uffff\2\2\4\uffff\1\2\11\uffff"+
-            "\1\1\2\uffff\1\2\1\uffff\1\2\1\uffff\10\2\1\uffff\1\2\20\uffff"+
-            "\1\2",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA26_eot = DFA.unpackEncodedString(DFA26_eotS);
-    static final short[] DFA26_eof = DFA.unpackEncodedString(DFA26_eofS);
-    static final char[] DFA26_min = DFA.unpackEncodedStringToUnsignedChars(DFA26_minS);
-    static final char[] DFA26_max = DFA.unpackEncodedStringToUnsignedChars(DFA26_maxS);
-    static final short[] DFA26_accept = DFA.unpackEncodedString(DFA26_acceptS);
-    static final short[] DFA26_special = DFA.unpackEncodedString(DFA26_specialS);
-    static final short[][] DFA26_transition;
-
-    static {
-        int numStates = DFA26_transitionS.length;
-        DFA26_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA26_transition[i] = DFA.unpackEncodedString(DFA26_transitionS[i]);
-        }
-    }
 
     class DFA26 extends DFA {
 
         public DFA26(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 26;
-            this.eot = DFA26_eot;
-            this.eof = DFA26_eof;
-            this.min = DFA26_min;
-            this.max = DFA26_max;
-            this.accept = DFA26_accept;
-            this.special = DFA26_special;
-            this.transition = DFA26_transition;
+            this.eot = dfa_8;
+            this.eof = dfa_8;
+            this.min = dfa_14;
+            this.max = dfa_15;
+            this.accept = dfa_16;
+            this.special = dfa_17;
+            this.transition = dfa_18;
         }
         public String getDescription() {
             return "3855:1: rule__XAnnotationElementValue__Alternatives : ( ( ( rule__XAnnotationElementValue__Group_0__0 ) ) | ( ruleXAnnotationOrExpression ) );";
@@ -81375,94 +81250,54 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA28_eotS =
-        "\12\uffff";
-    static final String DFA28_eofS =
-        "\1\uffff\7\10\2\uffff";
-    static final String DFA28_minS =
-        "\10\4\2\uffff";
-    static final String DFA28_maxS =
-        "\10\165\2\uffff";
-    static final String DFA28_acceptS =
-        "\10\uffff\1\2\1\1";
-    static final String DFA28_specialS =
-        "\12\uffff}>";
-    static final String[] DFA28_transitionS = {
-            "\1\10\1\3\3\10\13\uffff\1\1\1\2\13\uffff\1\10\6\uffff\2\10"+
-            "\4\uffff\1\10\3\uffff\1\4\1\5\1\6\1\7\2\10\6\uffff\1\10\3\uffff"+
-            "\1\10\2\uffff\1\10\4\uffff\1\10\11\uffff\1\10\2\uffff\1\10\1"+
-            "\uffff\1\10\1\uffff\10\10\1\uffff\1\10\20\uffff\1\10",
-            "\5\10\5\uffff\1\11\2\10\1\uffff\46\10\6\uffff\1\10\2\uffff"+
-            "\3\10\1\uffff\4\10\1\uffff\2\10\10\uffff\22\10\13\uffff\2\10"+
-            "\1\uffff\2\10",
-            "\5\10\5\uffff\1\11\2\10\1\uffff\46\10\6\uffff\1\10\2\uffff"+
-            "\3\10\1\uffff\4\10\1\uffff\2\10\10\uffff\22\10\13\uffff\2\10"+
-            "\1\uffff\2\10",
-            "\5\10\5\uffff\1\11\2\10\1\uffff\46\10\6\uffff\1\10\2\uffff"+
-            "\3\10\1\uffff\4\10\1\uffff\2\10\10\uffff\22\10\13\uffff\2\10"+
-            "\1\uffff\2\10",
-            "\5\10\5\uffff\1\11\2\10\1\uffff\46\10\6\uffff\1\10\2\uffff"+
-            "\3\10\1\uffff\4\10\1\uffff\2\10\10\uffff\22\10\13\uffff\2\10"+
-            "\1\uffff\2\10",
-            "\5\10\5\uffff\1\11\2\10\1\uffff\46\10\6\uffff\1\10\2\uffff"+
-            "\3\10\1\uffff\4\10\1\uffff\2\10\10\uffff\22\10\13\uffff\2\10"+
-            "\1\uffff\2\10",
-            "\5\10\5\uffff\1\11\2\10\1\uffff\46\10\6\uffff\1\10\2\uffff"+
-            "\3\10\1\uffff\4\10\1\uffff\2\10\10\uffff\22\10\13\uffff\2\10"+
-            "\1\uffff\2\10",
-            "\5\10\5\uffff\1\11\2\10\1\uffff\46\10\6\uffff\1\10\2\uffff"+
-            "\3\10\1\uffff\4\10\1\uffff\2\10\10\uffff\22\10\13\uffff\2\10"+
-            "\1\uffff\2\10",
+    static final String dfa_19s = "\12\uffff";
+    static final String dfa_20s = "\1\uffff\7\10\2\uffff";
+    static final String dfa_21s = "\10\4\2\uffff";
+    static final String dfa_22s = "\10\165\2\uffff";
+    static final String dfa_23s = "\10\uffff\1\2\1\1";
+    static final String dfa_24s = "\12\uffff}>";
+    static final String[] dfa_25s = {
+            "\1\10\1\3\3\10\13\uffff\1\1\1\2\13\uffff\1\10\6\uffff\2\10\4\uffff\1\10\3\uffff\1\4\1\5\1\6\1\7\2\10\6\uffff\1\10\3\uffff\1\10\2\uffff\1\10\4\uffff\1\10\11\uffff\1\10\2\uffff\1\10\1\uffff\1\10\1\uffff\10\10\1\uffff\1\10\20\uffff\1\10",
+            "\5\10\5\uffff\1\11\2\10\1\uffff\46\10\6\uffff\1\10\2\uffff\3\10\1\uffff\4\10\1\uffff\2\10\10\uffff\22\10\13\uffff\2\10\1\uffff\2\10",
+            "\5\10\5\uffff\1\11\2\10\1\uffff\46\10\6\uffff\1\10\2\uffff\3\10\1\uffff\4\10\1\uffff\2\10\10\uffff\22\10\13\uffff\2\10\1\uffff\2\10",
+            "\5\10\5\uffff\1\11\2\10\1\uffff\46\10\6\uffff\1\10\2\uffff\3\10\1\uffff\4\10\1\uffff\2\10\10\uffff\22\10\13\uffff\2\10\1\uffff\2\10",
+            "\5\10\5\uffff\1\11\2\10\1\uffff\46\10\6\uffff\1\10\2\uffff\3\10\1\uffff\4\10\1\uffff\2\10\10\uffff\22\10\13\uffff\2\10\1\uffff\2\10",
+            "\5\10\5\uffff\1\11\2\10\1\uffff\46\10\6\uffff\1\10\2\uffff\3\10\1\uffff\4\10\1\uffff\2\10\10\uffff\22\10\13\uffff\2\10\1\uffff\2\10",
+            "\5\10\5\uffff\1\11\2\10\1\uffff\46\10\6\uffff\1\10\2\uffff\3\10\1\uffff\4\10\1\uffff\2\10\10\uffff\22\10\13\uffff\2\10\1\uffff\2\10",
+            "\5\10\5\uffff\1\11\2\10\1\uffff\46\10\6\uffff\1\10\2\uffff\3\10\1\uffff\4\10\1\uffff\2\10\10\uffff\22\10\13\uffff\2\10\1\uffff\2\10",
             "",
             ""
     };
 
-    static final short[] DFA28_eot = DFA.unpackEncodedString(DFA28_eotS);
-    static final short[] DFA28_eof = DFA.unpackEncodedString(DFA28_eofS);
-    static final char[] DFA28_min = DFA.unpackEncodedStringToUnsignedChars(DFA28_minS);
-    static final char[] DFA28_max = DFA.unpackEncodedStringToUnsignedChars(DFA28_maxS);
-    static final short[] DFA28_accept = DFA.unpackEncodedString(DFA28_acceptS);
-    static final short[] DFA28_special = DFA.unpackEncodedString(DFA28_specialS);
-    static final short[][] DFA28_transition;
-
-    static {
-        int numStates = DFA28_transitionS.length;
-        DFA28_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA28_transition[i] = DFA.unpackEncodedString(DFA28_transitionS[i]);
-        }
-    }
+    static final short[] dfa_19 = DFA.unpackEncodedString(dfa_19s);
+    static final short[] dfa_20 = DFA.unpackEncodedString(dfa_20s);
+    static final char[] dfa_21 = DFA.unpackEncodedStringToUnsignedChars(dfa_21s);
+    static final char[] dfa_22 = DFA.unpackEncodedStringToUnsignedChars(dfa_22s);
+    static final short[] dfa_23 = DFA.unpackEncodedString(dfa_23s);
+    static final short[] dfa_24 = DFA.unpackEncodedString(dfa_24s);
+    static final short[][] dfa_25 = unpackEncodedStringArray(dfa_25s);
 
     class DFA28 extends DFA {
 
         public DFA28(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 28;
-            this.eot = DFA28_eot;
-            this.eof = DFA28_eof;
-            this.min = DFA28_min;
-            this.max = DFA28_max;
-            this.accept = DFA28_accept;
-            this.special = DFA28_special;
-            this.transition = DFA28_transition;
+            this.eot = dfa_19;
+            this.eof = dfa_20;
+            this.min = dfa_21;
+            this.max = dfa_22;
+            this.accept = dfa_23;
+            this.special = dfa_24;
+            this.transition = dfa_25;
         }
         public String getDescription() {
             return "3899:1: rule__XAssignment__Alternatives : ( ( ( rule__XAssignment__Group_0__0 ) ) | ( ( rule__XAssignment__Group_1__0 ) ) );";
         }
     }
-    static final String DFA33_eotS =
-        "\13\uffff";
-    static final String DFA33_eofS =
-        "\13\uffff";
-    static final String DFA33_minS =
-        "\1\40\2\uffff\1\40\7\uffff";
-    static final String DFA33_maxS =
-        "\1\47\2\uffff\1\44\7\uffff";
-    static final String DFA33_acceptS =
-        "\1\uffff\1\1\1\2\1\uffff\1\4\1\5\1\7\1\10\1\11\1\6\1\3";
-    static final String DFA33_specialS =
-        "\13\uffff}>";
-    static final String[] DFA33_transitionS = {
+    static final String dfa_26s = "\1\40\2\uffff\1\40\7\uffff";
+    static final String dfa_27s = "\1\47\2\uffff\1\44\7\uffff";
+    static final String dfa_28s = "\1\uffff\1\1\1\2\1\uffff\1\4\1\5\1\7\1\10\1\11\1\6\1\3";
+    static final String[] dfa_29s = {
             "\1\3\1\6\1\1\1\2\1\4\1\5\1\7\1\10",
             "",
             "",
@@ -81475,133 +81310,80 @@ public String getDescription() {
             "",
             ""
     };
-
-    static final short[] DFA33_eot = DFA.unpackEncodedString(DFA33_eotS);
-    static final short[] DFA33_eof = DFA.unpackEncodedString(DFA33_eofS);
-    static final char[] DFA33_min = DFA.unpackEncodedStringToUnsignedChars(DFA33_minS);
-    static final char[] DFA33_max = DFA.unpackEncodedStringToUnsignedChars(DFA33_maxS);
-    static final short[] DFA33_accept = DFA.unpackEncodedString(DFA33_acceptS);
-    static final short[] DFA33_special = DFA.unpackEncodedString(DFA33_specialS);
-    static final short[][] DFA33_transition;
-
-    static {
-        int numStates = DFA33_transitionS.length;
-        DFA33_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA33_transition[i] = DFA.unpackEncodedString(DFA33_transitionS[i]);
-        }
-    }
+    static final char[] dfa_26 = DFA.unpackEncodedStringToUnsignedChars(dfa_26s);
+    static final char[] dfa_27 = DFA.unpackEncodedStringToUnsignedChars(dfa_27s);
+    static final short[] dfa_28 = DFA.unpackEncodedString(dfa_28s);
+    static final short[][] dfa_29 = unpackEncodedStringArray(dfa_29s);
 
     class DFA33 extends DFA {
 
         public DFA33(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 33;
-            this.eot = DFA33_eot;
-            this.eof = DFA33_eof;
-            this.min = DFA33_min;
-            this.max = DFA33_max;
-            this.accept = DFA33_accept;
-            this.special = DFA33_special;
-            this.transition = DFA33_transition;
+            this.eot = dfa_1;
+            this.eof = dfa_1;
+            this.min = dfa_26;
+            this.max = dfa_27;
+            this.accept = dfa_28;
+            this.special = dfa_6;
+            this.transition = dfa_29;
         }
         public String getDescription() {
             return "4087:1: rule__OpOther__Alternatives : ( ( '->' ) | ( '..<' ) | ( ( rule__OpOther__Group_2__0 ) ) | ( '..' ) | ( '=>' ) | ( ( rule__OpOther__Group_5__0 ) ) | ( ( rule__OpOther__Group_6__0 ) ) | ( '<>' ) | ( '?:' ) );";
         }
     }
-    static final String DFA41_eotS =
-        "\14\uffff";
-    static final String DFA41_eofS =
-        "\4\uffff\7\3\1\uffff";
-    static final String DFA41_minS =
-        "\1\61\2\5\1\uffff\7\4\1\uffff";
-    static final String DFA41_maxS =
-        "\1\162\2\66\1\uffff\7\165\1\uffff";
-    static final String DFA41_acceptS =
-        "\3\uffff\1\2\7\uffff\1\1";
-    static final String DFA41_specialS =
-        "\14\uffff}>";
-    static final String[] DFA41_transitionS = {
+    static final String dfa_30s = "\14\uffff";
+    static final String dfa_31s = "\4\uffff\7\3\1\uffff";
+    static final String dfa_32s = "\1\61\2\5\1\uffff\7\4\1\uffff";
+    static final String dfa_33s = "\1\162\2\66\1\uffff\7\165\1\uffff";
+    static final String dfa_34s = "\3\uffff\1\2\7\uffff\1\1";
+    static final String dfa_35s = "\14\uffff}>";
+    static final String[] dfa_36s = {
             "\1\1\77\uffff\1\2\1\3",
-            "\1\6\16\uffff\1\4\1\5\13\uffff\1\3\20\uffff\1\7\1\10\1\11"+
-            "\1\12\1\3",
-            "\1\6\16\uffff\1\4\1\5\13\uffff\1\3\20\uffff\1\7\1\10\1\11"+
-            "\1\12\1\3",
-            "",
-            "\5\3\5\uffff\1\13\2\3\1\uffff\46\3\6\uffff\1\3\2\uffff\3\3"+
-            "\1\uffff\4\3\1\uffff\2\3\10\uffff\22\3\13\uffff\2\3\1\uffff"+
-            "\2\3",
-            "\5\3\5\uffff\1\13\2\3\1\uffff\46\3\6\uffff\1\3\2\uffff\3\3"+
-            "\1\uffff\4\3\1\uffff\2\3\10\uffff\22\3\13\uffff\2\3\1\uffff"+
-            "\2\3",
-            "\5\3\5\uffff\1\13\2\3\1\uffff\46\3\6\uffff\1\3\2\uffff\3\3"+
-            "\1\uffff\4\3\1\uffff\2\3\10\uffff\22\3\13\uffff\2\3\1\uffff"+
-            "\2\3",
-            "\5\3\5\uffff\1\13\2\3\1\uffff\46\3\6\uffff\1\3\2\uffff\3\3"+
-            "\1\uffff\4\3\1\uffff\2\3\10\uffff\22\3\13\uffff\2\3\1\uffff"+
-            "\2\3",
-            "\5\3\5\uffff\1\13\2\3\1\uffff\46\3\6\uffff\1\3\2\uffff\3\3"+
-            "\1\uffff\4\3\1\uffff\2\3\10\uffff\22\3\13\uffff\2\3\1\uffff"+
-            "\2\3",
-            "\5\3\5\uffff\1\13\2\3\1\uffff\46\3\6\uffff\1\3\2\uffff\3\3"+
-            "\1\uffff\4\3\1\uffff\2\3\10\uffff\22\3\13\uffff\2\3\1\uffff"+
-            "\2\3",
-            "\5\3\5\uffff\1\13\2\3\1\uffff\46\3\6\uffff\1\3\2\uffff\3\3"+
-            "\1\uffff\4\3\1\uffff\2\3\10\uffff\22\3\13\uffff\2\3\1\uffff"+
-            "\2\3",
+            "\1\6\16\uffff\1\4\1\5\13\uffff\1\3\20\uffff\1\7\1\10\1\11\1\12\1\3",
+            "\1\6\16\uffff\1\4\1\5\13\uffff\1\3\20\uffff\1\7\1\10\1\11\1\12\1\3",
+            "",
+            "\5\3\5\uffff\1\13\2\3\1\uffff\46\3\6\uffff\1\3\2\uffff\3\3\1\uffff\4\3\1\uffff\2\3\10\uffff\22\3\13\uffff\2\3\1\uffff\2\3",
+            "\5\3\5\uffff\1\13\2\3\1\uffff\46\3\6\uffff\1\3\2\uffff\3\3\1\uffff\4\3\1\uffff\2\3\10\uffff\22\3\13\uffff\2\3\1\uffff\2\3",
+            "\5\3\5\uffff\1\13\2\3\1\uffff\46\3\6\uffff\1\3\2\uffff\3\3\1\uffff\4\3\1\uffff\2\3\10\uffff\22\3\13\uffff\2\3\1\uffff\2\3",
+            "\5\3\5\uffff\1\13\2\3\1\uffff\46\3\6\uffff\1\3\2\uffff\3\3\1\uffff\4\3\1\uffff\2\3\10\uffff\22\3\13\uffff\2\3\1\uffff\2\3",
+            "\5\3\5\uffff\1\13\2\3\1\uffff\46\3\6\uffff\1\3\2\uffff\3\3\1\uffff\4\3\1\uffff\2\3\10\uffff\22\3\13\uffff\2\3\1\uffff\2\3",
+            "\5\3\5\uffff\1\13\2\3\1\uffff\46\3\6\uffff\1\3\2\uffff\3\3\1\uffff\4\3\1\uffff\2\3\10\uffff\22\3\13\uffff\2\3\1\uffff\2\3",
+            "\5\3\5\uffff\1\13\2\3\1\uffff\46\3\6\uffff\1\3\2\uffff\3\3\1\uffff\4\3\1\uffff\2\3\10\uffff\22\3\13\uffff\2\3\1\uffff\2\3",
             ""
     };
 
-    static final short[] DFA41_eot = DFA.unpackEncodedString(DFA41_eotS);
-    static final short[] DFA41_eof = DFA.unpackEncodedString(DFA41_eofS);
-    static final char[] DFA41_min = DFA.unpackEncodedStringToUnsignedChars(DFA41_minS);
-    static final char[] DFA41_max = DFA.unpackEncodedStringToUnsignedChars(DFA41_maxS);
-    static final short[] DFA41_accept = DFA.unpackEncodedString(DFA41_acceptS);
-    static final short[] DFA41_special = DFA.unpackEncodedString(DFA41_specialS);
-    static final short[][] DFA41_transition;
-
-    static {
-        int numStates = DFA41_transitionS.length;
-        DFA41_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA41_transition[i] = DFA.unpackEncodedString(DFA41_transitionS[i]);
-        }
-    }
+    static final short[] dfa_30 = DFA.unpackEncodedString(dfa_30s);
+    static final short[] dfa_31 = DFA.unpackEncodedString(dfa_31s);
+    static final char[] dfa_32 = DFA.unpackEncodedStringToUnsignedChars(dfa_32s);
+    static final char[] dfa_33 = DFA.unpackEncodedStringToUnsignedChars(dfa_33s);
+    static final short[] dfa_34 = DFA.unpackEncodedString(dfa_34s);
+    static final short[] dfa_35 = DFA.unpackEncodedString(dfa_35s);
+    static final short[][] dfa_36 = unpackEncodedStringArray(dfa_36s);
 
     class DFA41 extends DFA {
 
         public DFA41(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 41;
-            this.eot = DFA41_eot;
-            this.eof = DFA41_eof;
-            this.min = DFA41_min;
-            this.max = DFA41_max;
-            this.accept = DFA41_accept;
-            this.special = DFA41_special;
-            this.transition = DFA41_transition;
+            this.eot = dfa_30;
+            this.eof = dfa_31;
+            this.min = dfa_32;
+            this.max = dfa_33;
+            this.accept = dfa_34;
+            this.special = dfa_35;
+            this.transition = dfa_36;
         }
         public String getDescription() {
             return "4369:1: rule__XMemberFeatureCall__Alternatives_1 : ( ( ( rule__XMemberFeatureCall__Group_1_0__0 ) ) | ( ( rule__XMemberFeatureCall__Group_1_1__0 ) ) );";
         }
     }
-    static final String DFA44_eotS =
-        "\45\uffff";
-    static final String DFA44_eofS =
-        "\45\uffff";
-    static final String DFA44_minS =
-        "\1\4\4\0\40\uffff";
-    static final String DFA44_maxS =
-        "\1\165\4\0\40\uffff";
-    static final String DFA44_acceptS =
-        "\5\uffff\1\1\1\uffff\1\2\35\uffff";
-    static final String DFA44_specialS =
-        "\1\uffff\1\0\1\1\1\2\1\3\40\uffff}>";
-    static final String[] DFA44_transitionS = {
-            "\1\7\1\3\3\7\13\uffff\1\1\1\2\13\uffff\1\7\3\uffff\1\5\2\uffff"+
-            "\2\7\4\uffff\1\7\3\uffff\6\7\6\uffff\1\7\3\uffff\1\7\2\uffff"+
-            "\1\7\4\uffff\1\4\11\uffff\1\7\2\uffff\1\7\1\uffff\1\7\1\uffff"+
-            "\10\7\1\uffff\1\7\16\uffff\1\5\1\uffff\1\7",
+    static final String dfa_37s = "\1\4\4\0\40\uffff";
+    static final String dfa_38s = "\1\165\4\0\40\uffff";
+    static final String dfa_39s = "\5\uffff\1\1\1\uffff\1\2\35\uffff";
+    static final String dfa_40s = "\1\uffff\1\0\1\1\1\2\1\3\40\uffff}>";
+    static final String[] dfa_41s = {
+            "\1\7\1\3\3\7\13\uffff\1\1\1\2\13\uffff\1\7\3\uffff\1\5\2\uffff\2\7\4\uffff\1\7\3\uffff\6\7\6\uffff\1\7\3\uffff\1\7\2\uffff\1\7\4\uffff\1\4\11\uffff\1\7\2\uffff\1\7\1\uffff\1\7\1\uffff\10\7\1\uffff\1\7\16\uffff\1\5\1\uffff\1\7",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -81639,35 +81421,24 @@ public String getDescription() {
             "",
             ""
     };
-
-    static final short[] DFA44_eot = DFA.unpackEncodedString(DFA44_eotS);
-    static final short[] DFA44_eof = DFA.unpackEncodedString(DFA44_eofS);
-    static final char[] DFA44_min = DFA.unpackEncodedStringToUnsignedChars(DFA44_minS);
-    static final char[] DFA44_max = DFA.unpackEncodedStringToUnsignedChars(DFA44_maxS);
-    static final short[] DFA44_accept = DFA.unpackEncodedString(DFA44_acceptS);
-    static final short[] DFA44_special = DFA.unpackEncodedString(DFA44_specialS);
-    static final short[][] DFA44_transition;
-
-    static {
-        int numStates = DFA44_transitionS.length;
-        DFA44_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA44_transition[i] = DFA.unpackEncodedString(DFA44_transitionS[i]);
-        }
-    }
+    static final char[] dfa_37 = DFA.unpackEncodedStringToUnsignedChars(dfa_37s);
+    static final char[] dfa_38 = DFA.unpackEncodedStringToUnsignedChars(dfa_38s);
+    static final short[] dfa_39 = DFA.unpackEncodedString(dfa_39s);
+    static final short[] dfa_40 = DFA.unpackEncodedString(dfa_40s);
+    static final short[][] dfa_41 = unpackEncodedStringArray(dfa_41s);
 
     class DFA44 extends DFA {
 
         public DFA44(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 44;
-            this.eot = DFA44_eot;
-            this.eof = DFA44_eof;
-            this.min = DFA44_min;
-            this.max = DFA44_max;
-            this.accept = DFA44_accept;
-            this.special = DFA44_special;
-            this.transition = DFA44_transition;
+            this.eot = dfa_8;
+            this.eof = dfa_8;
+            this.min = dfa_37;
+            this.max = dfa_38;
+            this.accept = dfa_39;
+            this.special = dfa_40;
+            this.transition = dfa_41;
         }
         public String getDescription() {
             return "4445:1: rule__XMemberFeatureCall__Alternatives_1_1_3_1 : ( ( ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0 ) ) | ( ( rule__XMemberFeatureCall__Group_1_1_3_1_1__0 ) ) );";
@@ -81744,24 +81515,13 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA45_eotS =
-        "\42\uffff";
-    static final String DFA45_eofS =
-        "\42\uffff";
-    static final String DFA45_minS =
-        "\1\4\30\uffff\1\0\10\uffff";
-    static final String DFA45_maxS =
-        "\1\165\30\uffff\1\0\10\uffff";
-    static final String DFA45_acceptS =
-        "\1\uffff\1\1\1\2\1\3\1\4\1\5\10\uffff\1\6\11\uffff\1\7\1\uffff"+
-        "\1\12\1\13\1\14\1\15\1\16\1\17\1\10\1\11";
-    static final String DFA45_specialS =
-        "\31\uffff\1\0\10\uffff}>";
-    static final String[] DFA45_transitionS = {
-            "\1\16\1\5\3\16\13\uffff\2\5\13\uffff\1\5\20\uffff\5\5\1\16"+
-            "\6\uffff\1\31\3\uffff\1\2\2\uffff\1\16\4\uffff\1\37\11\uffff"+
-            "\1\16\2\uffff\1\30\1\uffff\1\3\1\uffff\1\32\1\33\1\1\2\16\1"+
-            "\34\1\35\1\36\1\uffff\1\4\20\uffff\1\16",
+    static final String dfa_42s = "\42\uffff";
+    static final String dfa_43s = "\1\4\30\uffff\1\0\10\uffff";
+    static final String dfa_44s = "\1\165\30\uffff\1\0\10\uffff";
+    static final String dfa_45s = "\1\uffff\1\1\1\2\1\3\1\4\1\5\10\uffff\1\6\11\uffff\1\7\1\uffff\1\12\1\13\1\14\1\15\1\16\1\17\1\10\1\11";
+    static final String dfa_46s = "\31\uffff\1\0\10\uffff}>";
+    static final String[] dfa_47s = {
+            "\1\16\1\5\3\16\13\uffff\2\5\13\uffff\1\5\20\uffff\5\5\1\16\6\uffff\1\31\3\uffff\1\2\2\uffff\1\16\4\uffff\1\37\11\uffff\1\16\2\uffff\1\30\1\uffff\1\3\1\uffff\1\32\1\33\1\1\2\16\1\34\1\35\1\36\1\uffff\1\4\20\uffff\1\16",
             "",
             "",
             "",
@@ -81797,34 +81557,25 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA45_eot = DFA.unpackEncodedString(DFA45_eotS);
-    static final short[] DFA45_eof = DFA.unpackEncodedString(DFA45_eofS);
-    static final char[] DFA45_min = DFA.unpackEncodedStringToUnsignedChars(DFA45_minS);
-    static final char[] DFA45_max = DFA.unpackEncodedStringToUnsignedChars(DFA45_maxS);
-    static final short[] DFA45_accept = DFA.unpackEncodedString(DFA45_acceptS);
-    static final short[] DFA45_special = DFA.unpackEncodedString(DFA45_specialS);
-    static final short[][] DFA45_transition;
-
-    static {
-        int numStates = DFA45_transitionS.length;
-        DFA45_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA45_transition[i] = DFA.unpackEncodedString(DFA45_transitionS[i]);
-        }
-    }
+    static final short[] dfa_42 = DFA.unpackEncodedString(dfa_42s);
+    static final char[] dfa_43 = DFA.unpackEncodedStringToUnsignedChars(dfa_43s);
+    static final char[] dfa_44 = DFA.unpackEncodedStringToUnsignedChars(dfa_44s);
+    static final short[] dfa_45 = DFA.unpackEncodedString(dfa_45s);
+    static final short[] dfa_46 = DFA.unpackEncodedString(dfa_46s);
+    static final short[][] dfa_47 = unpackEncodedStringArray(dfa_47s);
 
     class DFA45 extends DFA {
 
         public DFA45(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 45;
-            this.eot = DFA45_eot;
-            this.eof = DFA45_eof;
-            this.min = DFA45_min;
-            this.max = DFA45_max;
-            this.accept = DFA45_accept;
-            this.special = DFA45_special;
-            this.transition = DFA45_transition;
+            this.eot = dfa_42;
+            this.eof = dfa_42;
+            this.min = dfa_43;
+            this.max = dfa_44;
+            this.accept = dfa_45;
+            this.special = dfa_46;
+            this.transition = dfa_47;
         }
         public String getDescription() {
             return "4467:1: rule__XPrimaryExpression__Alternatives : ( ( ruleXConstructorCall ) | ( ruleXBlockExpression ) | ( ruleXSwitchExpression ) | ( ( ruleXSynchronizedExpression ) ) | ( ruleXFeatureCall ) | ( ruleXLiteral ) | ( ruleXIfExpression ) | ( ( ruleXForLoopExpression ) ) | ( ruleXBasicForLoopExpression ) | ( ruleXWhileExpression ) | ( ruleXDoWhileExpression ) | ( ruleXThrowExpression ) | ( ruleXReturnExpression ) | ( ruleXTryCatchFinallyExpression ) | ( ruleXParenthesizedExpression ) );";
@@ -81856,23 +81607,8 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA48_eotS =
-        "\45\uffff";
-    static final String DFA48_eofS =
-        "\45\uffff";
-    static final String DFA48_minS =
-        "\1\4\1\0\43\uffff";
-    static final String DFA48_maxS =
-        "\1\165\1\0\43\uffff";
-    static final String DFA48_acceptS =
-        "\2\uffff\1\2\41\uffff\1\1";
-    static final String DFA48_specialS =
-        "\1\uffff\1\0\43\uffff}>";
-    static final String[] DFA48_transitionS = {
-            "\5\2\13\uffff\2\2\13\uffff\1\2\3\uffff\1\2\2\uffff\2\2\4\uffff"+
-            "\1\2\3\uffff\6\2\6\uffff\1\2\3\uffff\1\2\2\uffff\1\2\4\uffff"+
-            "\1\1\11\uffff\1\2\2\uffff\1\2\1\uffff\1\2\1\uffff\10\2\1\uffff"+
-            "\1\2\20\uffff\1\2",
+    static final String[] dfa_48s = {
+            "\5\2\13\uffff\2\2\13\uffff\1\2\3\uffff\1\2\2\uffff\2\2\4\uffff\1\2\3\uffff\6\2\6\uffff\1\2\3\uffff\1\2\2\uffff\1\2\4\uffff\1\1\11\uffff\1\2\2\uffff\1\2\1\uffff\1\2\1\uffff\10\2\1\uffff\1\2\20\uffff\1\2",
             "\1\uffff",
             "",
             "",
@@ -81910,35 +81646,20 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             "",
             ""
     };
-
-    static final short[] DFA48_eot = DFA.unpackEncodedString(DFA48_eotS);
-    static final short[] DFA48_eof = DFA.unpackEncodedString(DFA48_eofS);
-    static final char[] DFA48_min = DFA.unpackEncodedStringToUnsignedChars(DFA48_minS);
-    static final char[] DFA48_max = DFA.unpackEncodedStringToUnsignedChars(DFA48_maxS);
-    static final short[] DFA48_accept = DFA.unpackEncodedString(DFA48_acceptS);
-    static final short[] DFA48_special = DFA.unpackEncodedString(DFA48_specialS);
-    static final short[][] DFA48_transition;
-
-    static {
-        int numStates = DFA48_transitionS.length;
-        DFA48_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA48_transition[i] = DFA.unpackEncodedString(DFA48_transitionS[i]);
-        }
-    }
+    static final short[][] dfa_48 = unpackEncodedStringArray(dfa_48s);
 
     class DFA48 extends DFA {
 
         public DFA48(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 48;
-            this.eot = DFA48_eot;
-            this.eof = DFA48_eof;
-            this.min = DFA48_min;
-            this.max = DFA48_max;
-            this.accept = DFA48_accept;
-            this.special = DFA48_special;
-            this.transition = DFA48_transition;
+            this.eot = dfa_8;
+            this.eof = dfa_8;
+            this.min = dfa_14;
+            this.max = dfa_15;
+            this.accept = dfa_16;
+            this.special = dfa_17;
+            this.transition = dfa_48;
         }
         public String getDescription() {
             return "4641:1: rule__XSwitchExpression__Alternatives_2 : ( ( ( rule__XSwitchExpression__Group_2_0__0 ) ) | ( ( rule__XSwitchExpression__Group_2_1__0 ) ) );";
@@ -81970,89 +81691,19 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA53_eotS =
-        "\45\uffff";
-    static final String DFA53_eofS =
-        "\45\uffff";
-    static final String DFA53_minS =
-        "\1\4\4\0\40\uffff";
-    static final String DFA53_maxS =
-        "\1\165\4\0\40\uffff";
-    static final String DFA53_acceptS =
-        "\5\uffff\1\1\1\uffff\1\2\35\uffff";
-    static final String DFA53_specialS =
-        "\1\uffff\1\0\1\1\1\2\1\3\40\uffff}>";
-    static final String[] DFA53_transitionS = {
-            "\1\7\1\3\3\7\13\uffff\1\1\1\2\13\uffff\1\7\3\uffff\1\5\2\uffff"+
-            "\2\7\4\uffff\1\7\3\uffff\6\7\6\uffff\1\7\3\uffff\1\7\2\uffff"+
-            "\1\7\4\uffff\1\4\11\uffff\1\7\2\uffff\1\7\1\uffff\1\7\1\uffff"+
-            "\10\7\1\uffff\1\7\16\uffff\1\5\1\uffff\1\7",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA53_eot = DFA.unpackEncodedString(DFA53_eotS);
-    static final short[] DFA53_eof = DFA.unpackEncodedString(DFA53_eofS);
-    static final char[] DFA53_min = DFA.unpackEncodedStringToUnsignedChars(DFA53_minS);
-    static final char[] DFA53_max = DFA.unpackEncodedStringToUnsignedChars(DFA53_maxS);
-    static final short[] DFA53_accept = DFA.unpackEncodedString(DFA53_acceptS);
-    static final short[] DFA53_special = DFA.unpackEncodedString(DFA53_specialS);
-    static final short[][] DFA53_transition;
-
-    static {
-        int numStates = DFA53_transitionS.length;
-        DFA53_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA53_transition[i] = DFA.unpackEncodedString(DFA53_transitionS[i]);
-        }
-    }
 
     class DFA53 extends DFA {
 
         public DFA53(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 53;
-            this.eot = DFA53_eot;
-            this.eof = DFA53_eof;
-            this.min = DFA53_min;
-            this.max = DFA53_max;
-            this.accept = DFA53_accept;
-            this.special = DFA53_special;
-            this.transition = DFA53_transition;
+            this.eot = dfa_8;
+            this.eof = dfa_8;
+            this.min = dfa_37;
+            this.max = dfa_38;
+            this.accept = dfa_39;
+            this.special = dfa_40;
+            this.transition = dfa_41;
         }
         public String getDescription() {
             return "4753:1: rule__XFeatureCall__Alternatives_3_1 : ( ( ( rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0 ) ) | ( ( rule__XFeatureCall__Group_3_1_1__0 ) ) );";
@@ -82129,89 +81780,19 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA56_eotS =
-        "\45\uffff";
-    static final String DFA56_eofS =
-        "\45\uffff";
-    static final String DFA56_minS =
-        "\1\4\4\0\40\uffff";
-    static final String DFA56_maxS =
-        "\1\165\4\0\40\uffff";
-    static final String DFA56_acceptS =
-        "\5\uffff\1\1\1\uffff\1\2\35\uffff";
-    static final String DFA56_specialS =
-        "\1\uffff\1\0\1\1\1\2\1\3\40\uffff}>";
-    static final String[] DFA56_transitionS = {
-            "\1\7\1\3\3\7\13\uffff\1\1\1\2\13\uffff\1\7\3\uffff\1\5\2\uffff"+
-            "\2\7\4\uffff\1\7\3\uffff\6\7\6\uffff\1\7\3\uffff\1\7\2\uffff"+
-            "\1\7\4\uffff\1\4\11\uffff\1\7\2\uffff\1\7\1\uffff\1\7\1\uffff"+
-            "\10\7\1\uffff\1\7\16\uffff\1\5\1\uffff\1\7",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA56_eot = DFA.unpackEncodedString(DFA56_eotS);
-    static final short[] DFA56_eof = DFA.unpackEncodedString(DFA56_eofS);
-    static final char[] DFA56_min = DFA.unpackEncodedStringToUnsignedChars(DFA56_minS);
-    static final char[] DFA56_max = DFA.unpackEncodedStringToUnsignedChars(DFA56_maxS);
-    static final short[] DFA56_accept = DFA.unpackEncodedString(DFA56_acceptS);
-    static final short[] DFA56_special = DFA.unpackEncodedString(DFA56_specialS);
-    static final short[][] DFA56_transition;
-
-    static {
-        int numStates = DFA56_transitionS.length;
-        DFA56_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA56_transition[i] = DFA.unpackEncodedString(DFA56_transitionS[i]);
-        }
-    }
 
     class DFA56 extends DFA {
 
         public DFA56(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 56;
-            this.eot = DFA56_eot;
-            this.eof = DFA56_eof;
-            this.min = DFA56_min;
-            this.max = DFA56_max;
-            this.accept = DFA56_accept;
-            this.special = DFA56_special;
-            this.transition = DFA56_transition;
+            this.eot = dfa_8;
+            this.eof = dfa_8;
+            this.min = dfa_37;
+            this.max = dfa_38;
+            this.accept = dfa_39;
+            this.special = dfa_40;
+            this.transition = dfa_41;
         }
         public String getDescription() {
             return "4847:1: rule__XConstructorCall__Alternatives_4_1 : ( ( ( rule__XConstructorCall__ArgumentsAssignment_4_1_0 ) ) | ( ( rule__XConstructorCall__Group_4_1_1__0 ) ) );";
@@ -82288,19 +81869,11 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA65_eotS =
-        "\13\uffff";
-    static final String DFA65_eofS =
-        "\2\uffff\3\6\2\uffff\3\6\1\uffff";
-    static final String DFA65_minS =
-        "\1\5\1\uffff\3\61\1\5\1\uffff\3\61\1\uffff";
-    static final String DFA65_maxS =
-        "\1\63\1\uffff\3\101\1\52\1\uffff\3\101\1\uffff";
-    static final String DFA65_acceptS =
-        "\1\uffff\1\1\4\uffff\1\2\3\uffff\1\3";
-    static final String DFA65_specialS =
-        "\13\uffff}>";
-    static final String[] DFA65_transitionS = {
+    static final String dfa_49s = "\2\uffff\3\6\2\uffff\3\6\1\uffff";
+    static final String dfa_50s = "\1\5\1\uffff\3\61\1\5\1\uffff\3\61\1\uffff";
+    static final String dfa_51s = "\1\63\1\uffff\3\101\1\52\1\uffff\3\101\1\uffff";
+    static final String dfa_52s = "\1\uffff\1\1\4\uffff\1\2\3\uffff\1\3";
+    static final String[] dfa_53s = {
             "\1\4\16\uffff\1\2\1\3\35\uffff\1\1",
             "",
             "\1\5\17\uffff\1\6",
@@ -82313,56 +81886,35 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             "\1\5\17\uffff\1\6",
             ""
     };
-
-    static final short[] DFA65_eot = DFA.unpackEncodedString(DFA65_eotS);
-    static final short[] DFA65_eof = DFA.unpackEncodedString(DFA65_eofS);
-    static final char[] DFA65_min = DFA.unpackEncodedStringToUnsignedChars(DFA65_minS);
-    static final char[] DFA65_max = DFA.unpackEncodedStringToUnsignedChars(DFA65_maxS);
-    static final short[] DFA65_accept = DFA.unpackEncodedString(DFA65_acceptS);
-    static final short[] DFA65_special = DFA.unpackEncodedString(DFA65_specialS);
-    static final short[][] DFA65_transition;
-
-    static {
-        int numStates = DFA65_transitionS.length;
-        DFA65_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA65_transition[i] = DFA.unpackEncodedString(DFA65_transitionS[i]);
-        }
-    }
+    static final short[] dfa_49 = DFA.unpackEncodedString(dfa_49s);
+    static final char[] dfa_50 = DFA.unpackEncodedStringToUnsignedChars(dfa_50s);
+    static final char[] dfa_51 = DFA.unpackEncodedStringToUnsignedChars(dfa_51s);
+    static final short[] dfa_52 = DFA.unpackEncodedString(dfa_52s);
+    static final short[][] dfa_53 = unpackEncodedStringArray(dfa_53s);
 
     class DFA65 extends DFA {
 
         public DFA65(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 65;
-            this.eot = DFA65_eot;
-            this.eof = DFA65_eof;
-            this.min = DFA65_min;
-            this.max = DFA65_max;
-            this.accept = DFA65_accept;
-            this.special = DFA65_special;
-            this.transition = DFA65_transition;
+            this.eot = dfa_1;
+            this.eof = dfa_49;
+            this.min = dfa_50;
+            this.max = dfa_51;
+            this.accept = dfa_52;
+            this.special = dfa_6;
+            this.transition = dfa_53;
         }
         public String getDescription() {
             return "5047:1: rule__XImportDeclaration__Alternatives_1 : ( ( ( rule__XImportDeclaration__Group_1_0__0 ) ) | ( ( rule__XImportDeclaration__ImportedTypeAssignment_1_1 ) ) | ( ( rule__XImportDeclaration__ImportedNamespaceAssignment_1_2 ) ) );";
         }
     }
-    static final String DFA102_eotS =
-        "\12\uffff";
-    static final String DFA102_eofS =
-        "\1\10\11\uffff";
-    static final String DFA102_minS =
-        "\1\4\7\0\2\uffff";
-    static final String DFA102_maxS =
-        "\1\165\7\0\2\uffff";
-    static final String DFA102_acceptS =
-        "\10\uffff\1\2\1\1";
-    static final String DFA102_specialS =
-        "\1\uffff\1\1\1\4\1\5\1\0\1\2\1\3\1\6\2\uffff}>";
-    static final String[] DFA102_transitionS = {
-            "\5\10\6\uffff\2\10\1\uffff\4\10\1\1\1\2\1\3\1\4\1\5\5\10\1"+
-            "\7\1\6\26\10\6\uffff\1\10\2\uffff\3\10\1\uffff\4\10\1\uffff"+
-            "\2\10\10\uffff\22\10\13\uffff\2\10\1\uffff\2\10",
+    static final String dfa_54s = "\1\10\11\uffff";
+    static final String dfa_55s = "\1\4\7\0\2\uffff";
+    static final String dfa_56s = "\1\165\7\0\2\uffff";
+    static final String dfa_57s = "\1\uffff\1\1\1\4\1\5\1\0\1\2\1\3\1\6\2\uffff}>";
+    static final String[] dfa_58s = {
+            "\5\10\6\uffff\2\10\1\uffff\4\10\1\1\1\2\1\3\1\4\1\5\5\10\1\7\1\6\26\10\6\uffff\1\10\2\uffff\3\10\1\uffff\4\10\1\uffff\2\10\10\uffff\22\10\13\uffff\2\10\1\uffff\2\10",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -82373,35 +81925,24 @@ public String getDescription() {
             "",
             ""
     };
-
-    static final short[] DFA102_eot = DFA.unpackEncodedString(DFA102_eotS);
-    static final short[] DFA102_eof = DFA.unpackEncodedString(DFA102_eofS);
-    static final char[] DFA102_min = DFA.unpackEncodedStringToUnsignedChars(DFA102_minS);
-    static final char[] DFA102_max = DFA.unpackEncodedStringToUnsignedChars(DFA102_maxS);
-    static final short[] DFA102_accept = DFA.unpackEncodedString(DFA102_acceptS);
-    static final short[] DFA102_special = DFA.unpackEncodedString(DFA102_specialS);
-    static final short[][] DFA102_transition;
-
-    static {
-        int numStates = DFA102_transitionS.length;
-        DFA102_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA102_transition[i] = DFA.unpackEncodedString(DFA102_transitionS[i]);
-        }
-    }
+    static final short[] dfa_54 = DFA.unpackEncodedString(dfa_54s);
+    static final char[] dfa_55 = DFA.unpackEncodedStringToUnsignedChars(dfa_55s);
+    static final char[] dfa_56 = DFA.unpackEncodedStringToUnsignedChars(dfa_56s);
+    static final short[] dfa_57 = DFA.unpackEncodedString(dfa_57s);
+    static final short[][] dfa_58 = unpackEncodedStringArray(dfa_58s);
 
     class DFA102 extends DFA {
 
         public DFA102(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 102;
-            this.eot = DFA102_eot;
-            this.eof = DFA102_eof;
-            this.min = DFA102_min;
-            this.max = DFA102_max;
-            this.accept = DFA102_accept;
-            this.special = DFA102_special;
-            this.transition = DFA102_transition;
+            this.eot = dfa_19;
+            this.eof = dfa_54;
+            this.min = dfa_55;
+            this.max = dfa_56;
+            this.accept = dfa_23;
+            this.special = dfa_57;
+            this.transition = dfa_58;
         }
         public String getDescription() {
             return "10710:1: ( rule__XAssignment__Group_1_1__0 )?";
@@ -82523,22 +82064,13 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA108_eotS =
-        "\13\uffff";
-    static final String DFA108_eofS =
-        "\1\1\12\uffff";
-    static final String DFA108_minS =
-        "\1\4\1\uffff\10\0\1\uffff";
-    static final String DFA108_maxS =
-        "\1\165\1\uffff\10\0\1\uffff";
-    static final String DFA108_acceptS =
-        "\1\uffff\1\2\10\uffff\1\1";
-    static final String DFA108_specialS =
-        "\2\uffff\1\6\1\2\1\0\1\3\1\5\1\1\1\7\1\4\1\uffff}>";
-    static final String[] DFA108_transitionS = {
-            "\5\1\6\uffff\2\1\1\uffff\16\1\1\3\1\2\1\4\1\5\1\6\1\7\1\10"+
-            "\1\11\20\1\6\uffff\1\1\2\uffff\3\1\1\uffff\4\1\1\uffff\2\1\10"+
-            "\uffff\22\1\13\uffff\2\1\1\uffff\2\1",
+    static final String dfa_59s = "\1\1\12\uffff";
+    static final String dfa_60s = "\1\4\1\uffff\10\0\1\uffff";
+    static final String dfa_61s = "\1\165\1\uffff\10\0\1\uffff";
+    static final String dfa_62s = "\1\uffff\1\2\10\uffff\1\1";
+    static final String dfa_63s = "\2\uffff\1\6\1\2\1\0\1\3\1\5\1\1\1\7\1\4\1\uffff}>";
+    static final String[] dfa_64s = {
+            "\5\1\6\uffff\2\1\1\uffff\16\1\1\3\1\2\1\4\1\5\1\6\1\7\1\10\1\11\20\1\6\uffff\1\1\2\uffff\3\1\1\uffff\4\1\1\uffff\2\1\10\uffff\22\1\13\uffff\2\1\1\uffff\2\1",
             "",
             "\1\uffff",
             "\1\uffff",
@@ -82550,35 +82082,25 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             "\1\uffff",
             ""
     };
-
-    static final short[] DFA108_eot = DFA.unpackEncodedString(DFA108_eotS);
-    static final short[] DFA108_eof = DFA.unpackEncodedString(DFA108_eofS);
-    static final char[] DFA108_min = DFA.unpackEncodedStringToUnsignedChars(DFA108_minS);
-    static final char[] DFA108_max = DFA.unpackEncodedStringToUnsignedChars(DFA108_maxS);
-    static final short[] DFA108_accept = DFA.unpackEncodedString(DFA108_acceptS);
-    static final short[] DFA108_special = DFA.unpackEncodedString(DFA108_specialS);
-    static final short[][] DFA108_transition;
-
-    static {
-        int numStates = DFA108_transitionS.length;
-        DFA108_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA108_transition[i] = DFA.unpackEncodedString(DFA108_transitionS[i]);
-        }
-    }
+    static final short[] dfa_59 = DFA.unpackEncodedString(dfa_59s);
+    static final char[] dfa_60 = DFA.unpackEncodedStringToUnsignedChars(dfa_60s);
+    static final char[] dfa_61 = DFA.unpackEncodedStringToUnsignedChars(dfa_61s);
+    static final short[] dfa_62 = DFA.unpackEncodedString(dfa_62s);
+    static final short[] dfa_63 = DFA.unpackEncodedString(dfa_63s);
+    static final short[][] dfa_64 = unpackEncodedStringArray(dfa_64s);
 
     class DFA108 extends DFA {
 
         public DFA108(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 108;
-            this.eot = DFA108_eot;
-            this.eof = DFA108_eof;
-            this.min = DFA108_min;
-            this.max = DFA108_max;
-            this.accept = DFA108_accept;
-            this.special = DFA108_special;
-            this.transition = DFA108_transition;
+            this.eot = dfa_1;
+            this.eof = dfa_59;
+            this.min = dfa_60;
+            this.max = dfa_61;
+            this.accept = dfa_62;
+            this.special = dfa_63;
+            this.transition = dfa_64;
         }
         public String getDescription() {
             return "()* loopback of 12202:1: ( rule__XOtherOperatorExpression__Group_1__0 )*";
@@ -82715,21 +82237,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA115_eotS =
-        "\120\uffff";
-    static final String DFA115_eofS =
-        "\1\2\117\uffff";
-    static final String DFA115_minS =
-        "\1\4\1\0\116\uffff";
-    static final String DFA115_maxS =
-        "\1\165\1\0\116\uffff";
-    static final String DFA115_acceptS =
-        "\2\uffff\1\2\114\uffff\1\1";
-    static final String DFA115_specialS =
-        "\1\uffff\1\0\116\uffff}>";
-    static final String[] DFA115_transitionS = {
-            "\5\2\6\uffff\2\2\1\uffff\46\2\6\uffff\1\2\2\uffff\3\2\1\uffff"+
-            "\4\2\1\uffff\1\1\1\2\10\uffff\22\2\13\uffff\2\2\1\uffff\2\2",
+    static final String dfa_65s = "\120\uffff";
+    static final String dfa_66s = "\1\2\117\uffff";
+    static final String dfa_67s = "\1\4\1\0\116\uffff";
+    static final String dfa_68s = "\1\165\1\0\116\uffff";
+    static final String dfa_69s = "\2\uffff\1\2\114\uffff\1\1";
+    static final String dfa_70s = "\1\uffff\1\0\116\uffff}>";
+    static final String[] dfa_71s = {
+            "\5\2\6\uffff\2\2\1\uffff\46\2\6\uffff\1\2\2\uffff\3\2\1\uffff\4\2\1\uffff\1\1\1\2\10\uffff\22\2\13\uffff\2\2\1\uffff\2\2",
             "\1\uffff",
             "",
             "",
@@ -82811,34 +82326,26 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA115_eot = DFA.unpackEncodedString(DFA115_eotS);
-    static final short[] DFA115_eof = DFA.unpackEncodedString(DFA115_eofS);
-    static final char[] DFA115_min = DFA.unpackEncodedStringToUnsignedChars(DFA115_minS);
-    static final char[] DFA115_max = DFA.unpackEncodedStringToUnsignedChars(DFA115_maxS);
-    static final short[] DFA115_accept = DFA.unpackEncodedString(DFA115_acceptS);
-    static final short[] DFA115_special = DFA.unpackEncodedString(DFA115_specialS);
-    static final short[][] DFA115_transition;
-
-    static {
-        int numStates = DFA115_transitionS.length;
-        DFA115_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA115_transition[i] = DFA.unpackEncodedString(DFA115_transitionS[i]);
-        }
-    }
+    static final short[] dfa_65 = DFA.unpackEncodedString(dfa_65s);
+    static final short[] dfa_66 = DFA.unpackEncodedString(dfa_66s);
+    static final char[] dfa_67 = DFA.unpackEncodedStringToUnsignedChars(dfa_67s);
+    static final char[] dfa_68 = DFA.unpackEncodedStringToUnsignedChars(dfa_68s);
+    static final short[] dfa_69 = DFA.unpackEncodedString(dfa_69s);
+    static final short[] dfa_70 = DFA.unpackEncodedString(dfa_70s);
+    static final short[][] dfa_71 = unpackEncodedStringArray(dfa_71s);
 
     class DFA115 extends DFA {
 
         public DFA115(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 115;
-            this.eot = DFA115_eot;
-            this.eof = DFA115_eof;
-            this.min = DFA115_min;
-            this.max = DFA115_max;
-            this.accept = DFA115_accept;
-            this.special = DFA115_special;
-            this.transition = DFA115_transition;
+            this.eot = dfa_65;
+            this.eof = dfa_66;
+            this.min = dfa_67;
+            this.max = dfa_68;
+            this.accept = dfa_69;
+            this.special = dfa_70;
+            this.transition = dfa_71;
         }
         public String getDescription() {
             return "14029:1: ( rule__XMemberFeatureCall__Group_1_1_3__0 )?";
@@ -82870,21 +82377,8 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA116_eotS =
-        "\120\uffff";
-    static final String DFA116_eofS =
-        "\1\2\117\uffff";
-    static final String DFA116_minS =
-        "\1\4\1\0\116\uffff";
-    static final String DFA116_maxS =
-        "\1\165\1\0\116\uffff";
-    static final String DFA116_acceptS =
-        "\2\uffff\1\2\114\uffff\1\1";
-    static final String DFA116_specialS =
-        "\1\uffff\1\0\116\uffff}>";
-    static final String[] DFA116_transitionS = {
-            "\5\2\6\uffff\2\2\1\uffff\46\2\6\uffff\1\2\2\uffff\3\2\1\uffff"+
-            "\1\1\3\2\1\uffff\2\2\10\uffff\22\2\13\uffff\2\2\1\uffff\2\2",
+    static final String[] dfa_72s = {
+            "\5\2\6\uffff\2\2\1\uffff\46\2\6\uffff\1\2\2\uffff\3\2\1\uffff\1\1\3\2\1\uffff\2\2\10\uffff\22\2\13\uffff\2\2\1\uffff\2\2",
             "\1\uffff",
             "",
             "",
@@ -82965,35 +82459,20 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             "",
             ""
     };
-
-    static final short[] DFA116_eot = DFA.unpackEncodedString(DFA116_eotS);
-    static final short[] DFA116_eof = DFA.unpackEncodedString(DFA116_eofS);
-    static final char[] DFA116_min = DFA.unpackEncodedStringToUnsignedChars(DFA116_minS);
-    static final char[] DFA116_max = DFA.unpackEncodedStringToUnsignedChars(DFA116_maxS);
-    static final short[] DFA116_accept = DFA.unpackEncodedString(DFA116_acceptS);
-    static final short[] DFA116_special = DFA.unpackEncodedString(DFA116_specialS);
-    static final short[][] DFA116_transition;
-
-    static {
-        int numStates = DFA116_transitionS.length;
-        DFA116_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA116_transition[i] = DFA.unpackEncodedString(DFA116_transitionS[i]);
-        }
-    }
+    static final short[][] dfa_72 = unpackEncodedStringArray(dfa_72s);
 
     class DFA116 extends DFA {
 
         public DFA116(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 116;
-            this.eot = DFA116_eot;
-            this.eof = DFA116_eof;
-            this.min = DFA116_min;
-            this.max = DFA116_max;
-            this.accept = DFA116_accept;
-            this.special = DFA116_special;
-            this.transition = DFA116_transition;
+            this.eot = dfa_65;
+            this.eof = dfa_66;
+            this.min = dfa_67;
+            this.max = dfa_68;
+            this.accept = dfa_69;
+            this.special = dfa_70;
+            this.transition = dfa_72;
         }
         public String getDescription() {
             return "14057:1: ( rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4 )?";
@@ -83025,23 +82504,13 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA124_eotS =
-        "\50\uffff";
-    static final String DFA124_eofS =
-        "\50\uffff";
-    static final String DFA124_minS =
-        "\1\4\4\0\43\uffff";
-    static final String DFA124_maxS =
-        "\1\165\4\0\43\uffff";
-    static final String DFA124_acceptS =
-        "\5\uffff\1\1\1\uffff\1\2\40\uffff";
-    static final String DFA124_specialS =
-        "\1\uffff\1\0\1\1\1\2\1\3\43\uffff}>";
-    static final String[] DFA124_transitionS = {
-            "\1\7\1\3\3\7\12\uffff\1\7\1\1\1\2\13\uffff\1\7\3\uffff\1\5"+
-            "\2\uffff\2\7\4\uffff\1\7\3\uffff\6\7\6\uffff\1\7\3\uffff\1\7"+
-            "\2\uffff\2\7\3\uffff\1\4\11\uffff\1\7\2\uffff\1\7\1\uffff\1"+
-            "\7\1\uffff\10\7\1\uffff\1\7\16\uffff\1\5\2\7",
+    static final String dfa_73s = "\50\uffff";
+    static final String dfa_74s = "\1\4\4\0\43\uffff";
+    static final String dfa_75s = "\1\165\4\0\43\uffff";
+    static final String dfa_76s = "\5\uffff\1\1\1\uffff\1\2\40\uffff";
+    static final String dfa_77s = "\1\uffff\1\0\1\1\1\2\1\3\43\uffff}>";
+    static final String[] dfa_78s = {
+            "\1\7\1\3\3\7\12\uffff\1\7\1\1\1\2\13\uffff\1\7\3\uffff\1\5\2\uffff\2\7\4\uffff\1\7\3\uffff\6\7\6\uffff\1\7\3\uffff\1\7\2\uffff\2\7\3\uffff\1\4\11\uffff\1\7\2\uffff\1\7\1\uffff\1\7\1\uffff\10\7\1\uffff\1\7\16\uffff\1\5\2\7",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -83083,34 +82552,25 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA124_eot = DFA.unpackEncodedString(DFA124_eotS);
-    static final short[] DFA124_eof = DFA.unpackEncodedString(DFA124_eofS);
-    static final char[] DFA124_min = DFA.unpackEncodedStringToUnsignedChars(DFA124_minS);
-    static final char[] DFA124_max = DFA.unpackEncodedStringToUnsignedChars(DFA124_maxS);
-    static final short[] DFA124_accept = DFA.unpackEncodedString(DFA124_acceptS);
-    static final short[] DFA124_special = DFA.unpackEncodedString(DFA124_specialS);
-    static final short[][] DFA124_transition;
-
-    static {
-        int numStates = DFA124_transitionS.length;
-        DFA124_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA124_transition[i] = DFA.unpackEncodedString(DFA124_transitionS[i]);
-        }
-    }
+    static final short[] dfa_73 = DFA.unpackEncodedString(dfa_73s);
+    static final char[] dfa_74 = DFA.unpackEncodedStringToUnsignedChars(dfa_74s);
+    static final char[] dfa_75 = DFA.unpackEncodedStringToUnsignedChars(dfa_75s);
+    static final short[] dfa_76 = DFA.unpackEncodedString(dfa_76s);
+    static final short[] dfa_77 = DFA.unpackEncodedString(dfa_77s);
+    static final short[][] dfa_78 = unpackEncodedStringArray(dfa_78s);
 
     class DFA124 extends DFA {
 
         public DFA124(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 124;
-            this.eot = DFA124_eot;
-            this.eof = DFA124_eof;
-            this.min = DFA124_min;
-            this.max = DFA124_max;
-            this.accept = DFA124_accept;
-            this.special = DFA124_special;
-            this.transition = DFA124_transition;
+            this.eot = dfa_73;
+            this.eof = dfa_73;
+            this.min = dfa_74;
+            this.max = dfa_75;
+            this.accept = dfa_76;
+            this.special = dfa_77;
+            this.transition = dfa_78;
         }
         public String getDescription() {
             return "15198:1: ( rule__XClosure__Group_1__0 )?";
@@ -83187,23 +82647,13 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA134_eotS =
-        "\44\uffff";
-    static final String DFA134_eofS =
-        "\44\uffff";
-    static final String DFA134_minS =
-        "\1\4\4\0\37\uffff";
-    static final String DFA134_maxS =
-        "\1\165\4\0\37\uffff";
-    static final String DFA134_acceptS =
-        "\5\uffff\1\1\1\2\35\uffff";
-    static final String DFA134_specialS =
-        "\1\uffff\1\0\1\1\1\2\1\3\37\uffff}>";
-    static final String[] DFA134_transitionS = {
-            "\1\6\1\3\3\6\13\uffff\1\1\1\2\13\uffff\1\6\3\uffff\1\5\2\uffff"+
-            "\2\6\4\uffff\1\6\3\uffff\6\6\6\uffff\1\6\3\uffff\1\6\2\uffff"+
-            "\1\6\4\uffff\1\4\11\uffff\1\6\2\uffff\1\6\1\uffff\1\6\1\uffff"+
-            "\10\6\1\uffff\1\6\20\uffff\1\6",
+    static final String dfa_79s = "\44\uffff";
+    static final String dfa_80s = "\1\4\4\0\37\uffff";
+    static final String dfa_81s = "\1\165\4\0\37\uffff";
+    static final String dfa_82s = "\5\uffff\1\1\1\2\35\uffff";
+    static final String dfa_83s = "\1\uffff\1\0\1\1\1\2\1\3\37\uffff}>";
+    static final String[] dfa_84s = {
+            "\1\6\1\3\3\6\13\uffff\1\1\1\2\13\uffff\1\6\3\uffff\1\5\2\uffff\2\6\4\uffff\1\6\3\uffff\6\6\6\uffff\1\6\3\uffff\1\6\2\uffff\1\6\4\uffff\1\4\11\uffff\1\6\2\uffff\1\6\1\uffff\1\6\1\uffff\10\6\1\uffff\1\6\20\uffff\1\6",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -83241,34 +82691,25 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA134_eot = DFA.unpackEncodedString(DFA134_eotS);
-    static final short[] DFA134_eof = DFA.unpackEncodedString(DFA134_eofS);
-    static final char[] DFA134_min = DFA.unpackEncodedStringToUnsignedChars(DFA134_minS);
-    static final char[] DFA134_max = DFA.unpackEncodedStringToUnsignedChars(DFA134_maxS);
-    static final short[] DFA134_accept = DFA.unpackEncodedString(DFA134_acceptS);
-    static final short[] DFA134_special = DFA.unpackEncodedString(DFA134_specialS);
-    static final short[][] DFA134_transition;
-
-    static {
-        int numStates = DFA134_transitionS.length;
-        DFA134_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA134_transition[i] = DFA.unpackEncodedString(DFA134_transitionS[i]);
-        }
-    }
+    static final short[] dfa_79 = DFA.unpackEncodedString(dfa_79s);
+    static final char[] dfa_80 = DFA.unpackEncodedStringToUnsignedChars(dfa_80s);
+    static final char[] dfa_81 = DFA.unpackEncodedStringToUnsignedChars(dfa_81s);
+    static final short[] dfa_82 = DFA.unpackEncodedString(dfa_82s);
+    static final short[] dfa_83 = DFA.unpackEncodedString(dfa_83s);
+    static final short[][] dfa_84 = unpackEncodedStringArray(dfa_84s);
 
     class DFA134 extends DFA {
 
         public DFA134(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 134;
-            this.eot = DFA134_eot;
-            this.eof = DFA134_eof;
-            this.min = DFA134_min;
-            this.max = DFA134_max;
-            this.accept = DFA134_accept;
-            this.special = DFA134_special;
-            this.transition = DFA134_transition;
+            this.eot = dfa_79;
+            this.eof = dfa_79;
+            this.min = dfa_80;
+            this.max = dfa_81;
+            this.accept = dfa_82;
+            this.special = dfa_83;
+            this.transition = dfa_84;
         }
         public String getDescription() {
             return "16866:1: ( rule__XSwitchExpression__Group_2_1_0__0 )?";
@@ -83345,130 +82786,19 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA147_eotS =
-        "\120\uffff";
-    static final String DFA147_eofS =
-        "\1\2\117\uffff";
-    static final String DFA147_minS =
-        "\1\4\1\0\116\uffff";
-    static final String DFA147_maxS =
-        "\1\165\1\0\116\uffff";
-    static final String DFA147_acceptS =
-        "\2\uffff\1\2\114\uffff\1\1";
-    static final String DFA147_specialS =
-        "\1\uffff\1\0\116\uffff}>";
-    static final String[] DFA147_transitionS = {
-            "\5\2\6\uffff\2\2\1\uffff\46\2\6\uffff\1\2\2\uffff\3\2\1\uffff"+
-            "\4\2\1\uffff\1\1\1\2\10\uffff\22\2\13\uffff\2\2\1\uffff\2\2",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA147_eot = DFA.unpackEncodedString(DFA147_eotS);
-    static final short[] DFA147_eof = DFA.unpackEncodedString(DFA147_eofS);
-    static final char[] DFA147_min = DFA.unpackEncodedStringToUnsignedChars(DFA147_minS);
-    static final char[] DFA147_max = DFA.unpackEncodedStringToUnsignedChars(DFA147_maxS);
-    static final short[] DFA147_accept = DFA.unpackEncodedString(DFA147_acceptS);
-    static final short[] DFA147_special = DFA.unpackEncodedString(DFA147_specialS);
-    static final short[][] DFA147_transition;
-
-    static {
-        int numStates = DFA147_transitionS.length;
-        DFA147_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA147_transition[i] = DFA.unpackEncodedString(DFA147_transitionS[i]);
-        }
-    }
 
     class DFA147 extends DFA {
 
         public DFA147(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 147;
-            this.eot = DFA147_eot;
-            this.eof = DFA147_eof;
-            this.min = DFA147_min;
-            this.max = DFA147_max;
-            this.accept = DFA147_accept;
-            this.special = DFA147_special;
-            this.transition = DFA147_transition;
+            this.eot = dfa_65;
+            this.eof = dfa_66;
+            this.min = dfa_67;
+            this.max = dfa_68;
+            this.accept = dfa_69;
+            this.special = dfa_70;
+            this.transition = dfa_71;
         }
         public String getDescription() {
             return "19354:1: ( rule__XFeatureCall__Group_3__0 )?";
@@ -83500,130 +82830,19 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA148_eotS =
-        "\120\uffff";
-    static final String DFA148_eofS =
-        "\1\2\117\uffff";
-    static final String DFA148_minS =
-        "\1\4\1\0\116\uffff";
-    static final String DFA148_maxS =
-        "\1\165\1\0\116\uffff";
-    static final String DFA148_acceptS =
-        "\2\uffff\1\2\114\uffff\1\1";
-    static final String DFA148_specialS =
-        "\1\uffff\1\0\116\uffff}>";
-    static final String[] DFA148_transitionS = {
-            "\5\2\6\uffff\2\2\1\uffff\46\2\6\uffff\1\2\2\uffff\3\2\1\uffff"+
-            "\1\1\3\2\1\uffff\2\2\10\uffff\22\2\13\uffff\2\2\1\uffff\2\2",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA148_eot = DFA.unpackEncodedString(DFA148_eotS);
-    static final short[] DFA148_eof = DFA.unpackEncodedString(DFA148_eofS);
-    static final char[] DFA148_min = DFA.unpackEncodedStringToUnsignedChars(DFA148_minS);
-    static final char[] DFA148_max = DFA.unpackEncodedStringToUnsignedChars(DFA148_maxS);
-    static final short[] DFA148_accept = DFA.unpackEncodedString(DFA148_acceptS);
-    static final short[] DFA148_special = DFA.unpackEncodedString(DFA148_specialS);
-    static final short[][] DFA148_transition;
-
-    static {
-        int numStates = DFA148_transitionS.length;
-        DFA148_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA148_transition[i] = DFA.unpackEncodedString(DFA148_transitionS[i]);
-        }
-    }
 
     class DFA148 extends DFA {
 
         public DFA148(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 148;
-            this.eot = DFA148_eot;
-            this.eof = DFA148_eof;
-            this.min = DFA148_min;
-            this.max = DFA148_max;
-            this.accept = DFA148_accept;
-            this.special = DFA148_special;
-            this.transition = DFA148_transition;
+            this.eot = dfa_65;
+            this.eof = dfa_66;
+            this.min = dfa_67;
+            this.max = dfa_68;
+            this.accept = dfa_69;
+            this.special = dfa_70;
+            this.transition = dfa_72;
         }
         public String getDescription() {
             return "19382:1: ( rule__XFeatureCall__FeatureCallArgumentsAssignment_4 )?";
@@ -83655,22 +82874,8 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA152_eotS =
-        "\120\uffff";
-    static final String DFA152_eofS =
-        "\1\2\117\uffff";
-    static final String DFA152_minS =
-        "\1\4\1\0\116\uffff";
-    static final String DFA152_maxS =
-        "\1\165\1\0\116\uffff";
-    static final String DFA152_acceptS =
-        "\2\uffff\1\2\114\uffff\1\1";
-    static final String DFA152_specialS =
-        "\1\uffff\1\0\116\uffff}>";
-    static final String[] DFA152_transitionS = {
-            "\5\2\6\uffff\2\2\1\uffff\17\2\1\1\26\2\6\uffff\1\2\2\uffff"+
-            "\3\2\1\uffff\4\2\1\uffff\2\2\10\uffff\22\2\13\uffff\2\2\1\uffff"+
-            "\2\2",
+    static final String[] dfa_85s = {
+            "\5\2\6\uffff\2\2\1\uffff\17\2\1\1\26\2\6\uffff\1\2\2\uffff\3\2\1\uffff\4\2\1\uffff\2\2\10\uffff\22\2\13\uffff\2\2\1\uffff\2\2",
             "\1\uffff",
             "",
             "",
@@ -83751,35 +82956,20 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             "",
             ""
     };
-
-    static final short[] DFA152_eot = DFA.unpackEncodedString(DFA152_eotS);
-    static final short[] DFA152_eof = DFA.unpackEncodedString(DFA152_eofS);
-    static final char[] DFA152_min = DFA.unpackEncodedStringToUnsignedChars(DFA152_minS);
-    static final char[] DFA152_max = DFA.unpackEncodedStringToUnsignedChars(DFA152_maxS);
-    static final short[] DFA152_accept = DFA.unpackEncodedString(DFA152_acceptS);
-    static final short[] DFA152_special = DFA.unpackEncodedString(DFA152_specialS);
-    static final short[][] DFA152_transition;
-
-    static {
-        int numStates = DFA152_transitionS.length;
-        DFA152_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA152_transition[i] = DFA.unpackEncodedString(DFA152_transitionS[i]);
-        }
-    }
+    static final short[][] dfa_85 = unpackEncodedStringArray(dfa_85s);
 
     class DFA152 extends DFA {
 
         public DFA152(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 152;
-            this.eot = DFA152_eot;
-            this.eof = DFA152_eof;
-            this.min = DFA152_min;
-            this.max = DFA152_max;
-            this.accept = DFA152_accept;
-            this.special = DFA152_special;
-            this.transition = DFA152_transition;
+            this.eot = dfa_65;
+            this.eof = dfa_66;
+            this.min = dfa_67;
+            this.max = dfa_68;
+            this.accept = dfa_69;
+            this.special = dfa_70;
+            this.transition = dfa_85;
         }
         public String getDescription() {
             return "19920:1: ( rule__XConstructorCall__Group_3__0 )?";
@@ -83811,130 +83001,19 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA153_eotS =
-        "\120\uffff";
-    static final String DFA153_eofS =
-        "\1\2\117\uffff";
-    static final String DFA153_minS =
-        "\1\4\1\0\116\uffff";
-    static final String DFA153_maxS =
-        "\1\165\1\0\116\uffff";
-    static final String DFA153_acceptS =
-        "\2\uffff\1\2\114\uffff\1\1";
-    static final String DFA153_specialS =
-        "\1\uffff\1\0\116\uffff}>";
-    static final String[] DFA153_transitionS = {
-            "\5\2\6\uffff\2\2\1\uffff\46\2\6\uffff\1\2\2\uffff\3\2\1\uffff"+
-            "\4\2\1\uffff\1\1\1\2\10\uffff\22\2\13\uffff\2\2\1\uffff\2\2",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA153_eot = DFA.unpackEncodedString(DFA153_eotS);
-    static final short[] DFA153_eof = DFA.unpackEncodedString(DFA153_eofS);
-    static final char[] DFA153_min = DFA.unpackEncodedStringToUnsignedChars(DFA153_minS);
-    static final char[] DFA153_max = DFA.unpackEncodedStringToUnsignedChars(DFA153_maxS);
-    static final short[] DFA153_accept = DFA.unpackEncodedString(DFA153_acceptS);
-    static final short[] DFA153_special = DFA.unpackEncodedString(DFA153_specialS);
-    static final short[][] DFA153_transition;
-
-    static {
-        int numStates = DFA153_transitionS.length;
-        DFA153_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA153_transition[i] = DFA.unpackEncodedString(DFA153_transitionS[i]);
-        }
-    }
 
     class DFA153 extends DFA {
 
         public DFA153(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 153;
-            this.eot = DFA153_eot;
-            this.eof = DFA153_eof;
-            this.min = DFA153_min;
-            this.max = DFA153_max;
-            this.accept = DFA153_accept;
-            this.special = DFA153_special;
-            this.transition = DFA153_transition;
+            this.eot = dfa_65;
+            this.eof = dfa_66;
+            this.min = dfa_67;
+            this.max = dfa_68;
+            this.accept = dfa_69;
+            this.special = dfa_70;
+            this.transition = dfa_71;
         }
         public String getDescription() {
             return "19949:1: ( rule__XConstructorCall__Group_4__0 )?";
@@ -83966,130 +83045,19 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA154_eotS =
-        "\120\uffff";
-    static final String DFA154_eofS =
-        "\1\2\117\uffff";
-    static final String DFA154_minS =
-        "\1\4\1\0\116\uffff";
-    static final String DFA154_maxS =
-        "\1\165\1\0\116\uffff";
-    static final String DFA154_acceptS =
-        "\2\uffff\1\2\114\uffff\1\1";
-    static final String DFA154_specialS =
-        "\1\uffff\1\0\116\uffff}>";
-    static final String[] DFA154_transitionS = {
-            "\5\2\6\uffff\2\2\1\uffff\46\2\6\uffff\1\2\2\uffff\3\2\1\uffff"+
-            "\1\1\3\2\1\uffff\2\2\10\uffff\22\2\13\uffff\2\2\1\uffff\2\2",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA154_eot = DFA.unpackEncodedString(DFA154_eotS);
-    static final short[] DFA154_eof = DFA.unpackEncodedString(DFA154_eofS);
-    static final char[] DFA154_min = DFA.unpackEncodedStringToUnsignedChars(DFA154_minS);
-    static final char[] DFA154_max = DFA.unpackEncodedStringToUnsignedChars(DFA154_maxS);
-    static final short[] DFA154_accept = DFA.unpackEncodedString(DFA154_acceptS);
-    static final short[] DFA154_special = DFA.unpackEncodedString(DFA154_specialS);
-    static final short[][] DFA154_transition;
-
-    static {
-        int numStates = DFA154_transitionS.length;
-        DFA154_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA154_transition[i] = DFA.unpackEncodedString(DFA154_transitionS[i]);
-        }
-    }
 
     class DFA154 extends DFA {
 
         public DFA154(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 154;
-            this.eot = DFA154_eot;
-            this.eof = DFA154_eof;
-            this.min = DFA154_min;
-            this.max = DFA154_max;
-            this.accept = DFA154_accept;
-            this.special = DFA154_special;
-            this.transition = DFA154_transition;
+            this.eot = dfa_65;
+            this.eof = dfa_66;
+            this.min = dfa_67;
+            this.max = dfa_68;
+            this.accept = dfa_69;
+            this.special = dfa_70;
+            this.transition = dfa_72;
         }
         public String getDescription() {
             return "19977:1: ( rule__XConstructorCall__ArgumentsAssignment_5 )?";
@@ -84121,27 +83089,13 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA159_eotS =
-        "\120\uffff";
-    static final String DFA159_eofS =
-        "\1\43\117\uffff";
-    static final String DFA159_minS =
-        "\1\4\42\0\55\uffff";
-    static final String DFA159_maxS =
-        "\1\165\42\0\55\uffff";
-    static final String DFA159_acceptS =
-        "\43\uffff\1\2\53\uffff\1\1";
-    static final String DFA159_specialS =
-        "\1\uffff\1\0\1\1\1\2\1\3\1\4\1\5\1\6\1\7\1\10\1\11\1\12\1\13\1"+
-        "\14\1\15\1\16\1\17\1\20\1\21\1\22\1\23\1\24\1\25\1\26\1\27\1\30"+
-        "\1\31\1\32\1\33\1\34\1\35\1\36\1\37\1\40\1\41\55\uffff}>";
-    static final String[] DFA159_transitionS = {
-            "\1\26\1\3\1\25\1\27\1\31\6\uffff\2\43\1\uffff\2\43\1\1\1\2"+
-            "\13\43\1\17\6\43\1\12\1\11\4\43\1\10\3\43\1\4\1\5\1\6\1\7\1"+
-            "\20\1\23\6\uffff\1\34\2\uffff\1\43\1\14\1\43\1\uffff\1\22\3"+
-            "\43\1\uffff\1\42\1\43\10\uffff\1\21\2\43\1\33\1\43\1\15\1\43"+
-            "\1\35\1\36\1\13\1\30\1\32\1\37\1\40\1\41\1\43\1\16\1\43\13\uffff"+
-            "\2\43\1\uffff\1\43\1\24",
+    static final String dfa_86s = "\1\43\117\uffff";
+    static final String dfa_87s = "\1\4\42\0\55\uffff";
+    static final String dfa_88s = "\1\165\42\0\55\uffff";
+    static final String dfa_89s = "\43\uffff\1\2\53\uffff\1\1";
+    static final String dfa_90s = "\1\uffff\1\0\1\1\1\2\1\3\1\4\1\5\1\6\1\7\1\10\1\11\1\12\1\13\1\14\1\15\1\16\1\17\1\20\1\21\1\22\1\23\1\24\1\25\1\26\1\27\1\30\1\31\1\32\1\33\1\34\1\35\1\36\1\37\1\40\1\41\55\uffff}>";
+    static final String[] dfa_91s = {
+            "\1\26\1\3\1\25\1\27\1\31\6\uffff\2\43\1\uffff\2\43\1\1\1\2\13\43\1\17\6\43\1\12\1\11\4\43\1\10\3\43\1\4\1\5\1\6\1\7\1\20\1\23\6\uffff\1\34\2\uffff\1\43\1\14\1\43\1\uffff\1\22\3\43\1\uffff\1\42\1\43\10\uffff\1\21\2\43\1\33\1\43\1\15\1\43\1\35\1\36\1\13\1\30\1\32\1\37\1\40\1\41\1\43\1\16\1\43\13\uffff\2\43\1\uffff\1\43\1\24",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -84222,35 +83176,25 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             "",
             ""
     };
-
-    static final short[] DFA159_eot = DFA.unpackEncodedString(DFA159_eotS);
-    static final short[] DFA159_eof = DFA.unpackEncodedString(DFA159_eofS);
-    static final char[] DFA159_min = DFA.unpackEncodedStringToUnsignedChars(DFA159_minS);
-    static final char[] DFA159_max = DFA.unpackEncodedStringToUnsignedChars(DFA159_maxS);
-    static final short[] DFA159_accept = DFA.unpackEncodedString(DFA159_acceptS);
-    static final short[] DFA159_special = DFA.unpackEncodedString(DFA159_specialS);
-    static final short[][] DFA159_transition;
-
-    static {
-        int numStates = DFA159_transitionS.length;
-        DFA159_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA159_transition[i] = DFA.unpackEncodedString(DFA159_transitionS[i]);
-        }
-    }
+    static final short[] dfa_86 = DFA.unpackEncodedString(dfa_86s);
+    static final char[] dfa_87 = DFA.unpackEncodedStringToUnsignedChars(dfa_87s);
+    static final char[] dfa_88 = DFA.unpackEncodedStringToUnsignedChars(dfa_88s);
+    static final short[] dfa_89 = DFA.unpackEncodedString(dfa_89s);
+    static final short[] dfa_90 = DFA.unpackEncodedString(dfa_90s);
+    static final short[][] dfa_91 = unpackEncodedStringArray(dfa_91s);
 
     class DFA159 extends DFA {
 
         public DFA159(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 159;
-            this.eot = DFA159_eot;
-            this.eof = DFA159_eof;
-            this.min = DFA159_min;
-            this.max = DFA159_max;
-            this.accept = DFA159_accept;
-            this.special = DFA159_special;
-            this.transition = DFA159_transition;
+            this.eot = dfa_65;
+            this.eof = dfa_86;
+            this.min = dfa_87;
+            this.max = dfa_88;
+            this.accept = dfa_89;
+            this.special = dfa_90;
+            this.transition = dfa_91;
         }
         public String getDescription() {
             return "21030:1: ( rule__XReturnExpression__ExpressionAssignment_2 )?";
@@ -84777,22 +83721,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA168_eotS =
-        "\121\uffff";
-    static final String DFA168_eofS =
-        "\1\2\120\uffff";
-    static final String DFA168_minS =
-        "\1\4\1\0\117\uffff";
-    static final String DFA168_maxS =
-        "\1\165\1\0\117\uffff";
-    static final String DFA168_acceptS =
-        "\2\uffff\1\2\115\uffff\1\1";
-    static final String DFA168_specialS =
-        "\1\uffff\1\0\117\uffff}>";
-    static final String[] DFA168_transitionS = {
-            "\5\2\6\uffff\2\2\1\uffff\17\2\1\1\26\2\6\uffff\1\2\2\uffff"+
-            "\3\2\1\uffff\4\2\1\uffff\2\2\10\uffff\22\2\1\uffff\1\2\11\uffff"+
-            "\2\2\1\uffff\2\2",
+    static final String dfa_92s = "\121\uffff";
+    static final String dfa_93s = "\1\2\120\uffff";
+    static final String dfa_94s = "\1\4\1\0\117\uffff";
+    static final String dfa_95s = "\1\165\1\0\117\uffff";
+    static final String dfa_96s = "\2\uffff\1\2\115\uffff\1\1";
+    static final String dfa_97s = "\1\uffff\1\0\117\uffff}>";
+    static final String[] dfa_98s = {
+            "\5\2\6\uffff\2\2\1\uffff\17\2\1\1\26\2\6\uffff\1\2\2\uffff\3\2\1\uffff\4\2\1\uffff\2\2\10\uffff\22\2\1\uffff\1\2\11\uffff\2\2\1\uffff\2\2",
             "\1\uffff",
             "",
             "",
@@ -84875,34 +83811,26 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA168_eot = DFA.unpackEncodedString(DFA168_eotS);
-    static final short[] DFA168_eof = DFA.unpackEncodedString(DFA168_eofS);
-    static final char[] DFA168_min = DFA.unpackEncodedStringToUnsignedChars(DFA168_minS);
-    static final char[] DFA168_max = DFA.unpackEncodedStringToUnsignedChars(DFA168_maxS);
-    static final short[] DFA168_accept = DFA.unpackEncodedString(DFA168_acceptS);
-    static final short[] DFA168_special = DFA.unpackEncodedString(DFA168_specialS);
-    static final short[][] DFA168_transition;
-
-    static {
-        int numStates = DFA168_transitionS.length;
-        DFA168_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA168_transition[i] = DFA.unpackEncodedString(DFA168_transitionS[i]);
-        }
-    }
+    static final short[] dfa_92 = DFA.unpackEncodedString(dfa_92s);
+    static final short[] dfa_93 = DFA.unpackEncodedString(dfa_93s);
+    static final char[] dfa_94 = DFA.unpackEncodedStringToUnsignedChars(dfa_94s);
+    static final char[] dfa_95 = DFA.unpackEncodedStringToUnsignedChars(dfa_95s);
+    static final short[] dfa_96 = DFA.unpackEncodedString(dfa_96s);
+    static final short[] dfa_97 = DFA.unpackEncodedString(dfa_97s);
+    static final short[][] dfa_98 = unpackEncodedStringArray(dfa_98s);
 
     class DFA168 extends DFA {
 
         public DFA168(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 168;
-            this.eot = DFA168_eot;
-            this.eof = DFA168_eof;
-            this.min = DFA168_min;
-            this.max = DFA168_max;
-            this.accept = DFA168_accept;
-            this.special = DFA168_special;
-            this.transition = DFA168_transition;
+            this.eot = dfa_92;
+            this.eof = dfa_93;
+            this.min = dfa_94;
+            this.max = dfa_95;
+            this.accept = dfa_96;
+            this.special = dfa_97;
+            this.transition = dfa_98;
         }
         public String getDescription() {
             return "22609:1: ( rule__JvmParameterizedTypeReference__Group_1__0 )?";
@@ -84934,132 +83862,19 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA171_eotS =
-        "\121\uffff";
-    static final String DFA171_eofS =
-        "\1\2\120\uffff";
-    static final String DFA171_minS =
-        "\1\4\1\0\117\uffff";
-    static final String DFA171_maxS =
-        "\1\165\1\0\117\uffff";
-    static final String DFA171_acceptS =
-        "\2\uffff\1\2\115\uffff\1\1";
-    static final String DFA171_specialS =
-        "\1\uffff\1\0\117\uffff}>";
-    static final String[] DFA171_transitionS = {
-            "\5\2\6\uffff\2\2\1\uffff\17\2\1\1\26\2\6\uffff\1\2\2\uffff"+
-            "\3\2\1\uffff\4\2\1\uffff\2\2\10\uffff\22\2\1\uffff\1\2\11\uffff"+
-            "\2\2\1\uffff\2\2",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA171_eot = DFA.unpackEncodedString(DFA171_eotS);
-    static final short[] DFA171_eof = DFA.unpackEncodedString(DFA171_eofS);
-    static final char[] DFA171_min = DFA.unpackEncodedStringToUnsignedChars(DFA171_minS);
-    static final char[] DFA171_max = DFA.unpackEncodedStringToUnsignedChars(DFA171_maxS);
-    static final short[] DFA171_accept = DFA.unpackEncodedString(DFA171_acceptS);
-    static final short[] DFA171_special = DFA.unpackEncodedString(DFA171_specialS);
-    static final short[][] DFA171_transition;
-
-    static {
-        int numStates = DFA171_transitionS.length;
-        DFA171_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA171_transition[i] = DFA.unpackEncodedString(DFA171_transitionS[i]);
-        }
-    }
 
     class DFA171 extends DFA {
 
         public DFA171(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 171;
-            this.eot = DFA171_eot;
-            this.eof = DFA171_eof;
-            this.min = DFA171_min;
-            this.max = DFA171_max;
-            this.accept = DFA171_accept;
-            this.special = DFA171_special;
-            this.transition = DFA171_transition;
+            this.eot = dfa_92;
+            this.eof = dfa_93;
+            this.min = dfa_94;
+            this.max = dfa_95;
+            this.accept = dfa_96;
+            this.special = dfa_97;
+            this.transition = dfa_98;
         }
         public String getDescription() {
             return "22920:1: ( rule__JvmParameterizedTypeReference__Group_1_4_2__0 )?";
@@ -85093,2313 +83908,136 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
     }
  
 
-    public static final BitSet FOLLOW_ruleFormatConfiguration_in_entryRuleFormatConfiguration67 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFormatConfiguration74 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FormatConfiguration__Group__0_in_ruleFormatConfiguration100 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConstant_in_entryRuleConstant127 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleConstant134 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Constant__Group__0_in_ruleConstant160 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntValue_in_entryRuleIntValue187 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIntValue194 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IntValue__Alternatives_in_ruleIntValue220 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStringValue_in_entryRuleStringValue247 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleStringValue254 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StringValue__Alternatives_in_ruleStringValue280 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRule_in_entryRuleRule307 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRule314 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Rule__Alternatives_in_ruleRule340 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGrammarRule_in_entryRuleGrammarRule367 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleGrammarRule374 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GrammarRule__Group__0_in_ruleGrammarRule400 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleWildcardRule_in_entryRuleWildcardRule427 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleWildcardRule434 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__WildcardRule__Group__0_in_ruleWildcardRule460 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGrammarRuleDirective_in_entryRuleGrammarRuleDirective487 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleGrammarRuleDirective494 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GrammarRuleDirective__Alternatives_in_ruleGrammarRuleDirective520 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleWildcardRuleDirective_in_entryRuleWildcardRuleDirective547 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleWildcardRuleDirective554 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__WildcardRuleDirective__Alternatives_in_ruleWildcardRuleDirective580 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGrammarElementReference_in_entryRuleGrammarElementReference607 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleGrammarElementReference614 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GrammarElementReference__Alternatives_in_ruleGrammarElementReference640 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGrammarElementLookup_in_entryRuleGrammarElementLookup667 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleGrammarElementLookup674 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GrammarElementLookup__Alternatives_in_ruleGrammarElementLookup700 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleContextFreeDirective_in_entryRuleContextFreeDirective727 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleContextFreeDirective734 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContextFreeDirective__Group__0_in_ruleContextFreeDirective760 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSpecificDirective_in_entryRuleSpecificDirective787 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSpecificDirective794 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SpecificDirective__Group__0_in_ruleSpecificDirective820 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMatcherList_in_entryRuleMatcherList847 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleMatcherList854 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MatcherList__Group__0_in_ruleMatcherList880 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGroupBlock_in_entryRuleGroupBlock907 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleGroupBlock914 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GroupBlock__Group__0_in_ruleGroupBlock940 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleKeywordPair_in_entryRuleKeywordPair967 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleKeywordPair974 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group__0_in_ruleKeywordPair1000 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMatcher_in_entryRuleMatcher1027 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleMatcher1034 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Matcher__Group__0_in_ruleMatcher1060 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLocator_in_entryRuleLocator1087 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleLocator1094 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Locator__Alternatives_in_ruleLocator1120 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNoFormatLocator_in_entryRuleNoFormatLocator1147 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNoFormatLocator1154 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NoFormatLocator__Group__0_in_ruleNoFormatLocator1180 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSpaceLocator_in_entryRuleSpaceLocator1207 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSpaceLocator1214 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SpaceLocator__Alternatives_in_ruleSpaceLocator1240 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRightPaddingLocator_in_entryRuleRightPaddingLocator1267 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRightPaddingLocator1274 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RightPaddingLocator__Group__0_in_ruleRightPaddingLocator1300 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLinewrapLocator_in_entryRuleLinewrapLocator1327 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleLinewrapLocator1334 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LinewrapLocator__Alternatives_in_ruleLinewrapLocator1360 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleColumnLocator_in_entryRuleColumnLocator1387 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleColumnLocator1394 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ColumnLocator__Group__0_in_ruleColumnLocator1420 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOffsetLocator_in_entryRuleOffsetLocator1447 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOffsetLocator1454 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OffsetLocator__Group__0_in_ruleOffsetLocator1480 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIndentLocator_in_entryRuleIndentLocator1507 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIndentLocator1514 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IndentLocator__Group__0_in_ruleIndentLocator1540 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleParameterizedIdentifier_in_entryRuleParameterizedIdentifier1567 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleParameterizedIdentifier1574 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ParameterizedIdentifier__Group__0_in_ruleParameterizedIdentifier1600 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleParameterizedString_in_entryRuleParameterizedString1627 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleParameterizedString1634 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ParameterizedString__Group__0_in_ruleParameterizedString1660 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_entryRuleIdentifier1687 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIdentifier1694 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Identifier__Alternatives_in_ruleIdentifier1720 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDottedID_in_entryRuleDottedID1747 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDottedID1754 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DottedID__Group__0_in_ruleDottedID1780 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntIdentifier_in_entryRuleIntIdentifier1807 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIntIdentifier1814 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleIntIdentifier1840 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntObject_in_entryRuleIntObject1866 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIntObject1873 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleIntObject1899 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRuleSelfIdentifier_in_entryRuleRuleSelfIdentifier1925 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRuleSelfIdentifier1932 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_13_in_ruleRuleSelfIdentifier1959 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_entryRuleValidID1987 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleValidID1994 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ValidID__Alternatives_in_ruleValidID2020 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotation_in_entryRuleXAnnotation2047 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAnnotation2054 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group__0_in_ruleXAnnotation2080 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationElementValuePair_in_entryRuleXAnnotationElementValuePair2107 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAnnotationElementValuePair2114 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__Group__0_in_ruleXAnnotationElementValuePair2140 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationElementValueOrCommaList_in_entryRuleXAnnotationElementValueOrCommaList2167 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAnnotationElementValueOrCommaList2174 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Alternatives_in_ruleXAnnotationElementValueOrCommaList2200 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationElementValue_in_entryRuleXAnnotationElementValue2227 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAnnotationElementValue2234 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Alternatives_in_ruleXAnnotationElementValue2260 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_entryRuleXAnnotationOrExpression2287 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAnnotationOrExpression2294 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationOrExpression__Alternatives_in_ruleXAnnotationOrExpression2320 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_entryRuleXExpression2347 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXExpression2354 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAssignment_in_ruleXExpression2380 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAssignment_in_entryRuleXAssignment2406 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAssignment2413 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Alternatives_in_ruleXAssignment2439 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpSingleAssign_in_entryRuleOpSingleAssign2466 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpSingleAssign2473 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_14_in_ruleOpSingleAssign2500 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpMultiAssign_in_entryRuleOpMultiAssign2528 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpMultiAssign2535 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Alternatives_in_ruleOpMultiAssign2561 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXOrExpression_in_entryRuleXOrExpression2588 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXOrExpression2595 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group__0_in_ruleXOrExpression2621 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpOr_in_entryRuleOpOr2648 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpOr2655 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_15_in_ruleOpOr2682 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAndExpression_in_entryRuleXAndExpression2710 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAndExpression2717 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group__0_in_ruleXAndExpression2743 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpAnd_in_entryRuleOpAnd2770 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpAnd2777 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_16_in_ruleOpAnd2804 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXEqualityExpression_in_entryRuleXEqualityExpression2832 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXEqualityExpression2839 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group__0_in_ruleXEqualityExpression2865 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpEquality_in_entryRuleOpEquality2892 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpEquality2899 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpEquality__Alternatives_in_ruleOpEquality2925 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXRelationalExpression_in_entryRuleXRelationalExpression2952 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXRelationalExpression2959 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group__0_in_ruleXRelationalExpression2985 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpCompare_in_entryRuleOpCompare3012 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpCompare3019 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpCompare__Alternatives_in_ruleOpCompare3045 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXOtherOperatorExpression_in_entryRuleXOtherOperatorExpression3072 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXOtherOperatorExpression3079 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group__0_in_ruleXOtherOperatorExpression3105 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpOther_in_entryRuleOpOther3132 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpOther3139 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Alternatives_in_ruleOpOther3165 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAdditiveExpression_in_entryRuleXAdditiveExpression3192 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAdditiveExpression3199 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group__0_in_ruleXAdditiveExpression3225 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpAdd_in_entryRuleOpAdd3252 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpAdd3259 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpAdd__Alternatives_in_ruleOpAdd3285 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXMultiplicativeExpression_in_entryRuleXMultiplicativeExpression3312 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXMultiplicativeExpression3319 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group__0_in_ruleXMultiplicativeExpression3345 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpMulti_in_entryRuleOpMulti3372 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpMulti3379 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpMulti__Alternatives_in_ruleOpMulti3405 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXUnaryOperation_in_entryRuleXUnaryOperation3432 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXUnaryOperation3439 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XUnaryOperation__Alternatives_in_ruleXUnaryOperation3465 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpUnary_in_entryRuleOpUnary3492 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpUnary3499 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpUnary__Alternatives_in_ruleOpUnary3525 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCastedExpression_in_entryRuleXCastedExpression3552 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXCastedExpression3559 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group__0_in_ruleXCastedExpression3585 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXPostfixOperation_in_entryRuleXPostfixOperation3612 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXPostfixOperation3619 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group__0_in_ruleXPostfixOperation3645 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpPostfix_in_entryRuleOpPostfix3672 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpPostfix3679 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpPostfix__Alternatives_in_ruleOpPostfix3705 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXMemberFeatureCall_in_entryRuleXMemberFeatureCall3732 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXMemberFeatureCall3739 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group__0_in_ruleXMemberFeatureCall3765 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXPrimaryExpression_in_entryRuleXPrimaryExpression3792 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXPrimaryExpression3799 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XPrimaryExpression__Alternatives_in_ruleXPrimaryExpression3825 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXLiteral_in_entryRuleXLiteral3852 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXLiteral3859 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XLiteral__Alternatives_in_ruleXLiteral3885 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCollectionLiteral_in_entryRuleXCollectionLiteral3912 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXCollectionLiteral3919 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCollectionLiteral__Alternatives_in_ruleXCollectionLiteral3945 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSetLiteral_in_entryRuleXSetLiteral3972 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXSetLiteral3979 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group__0_in_ruleXSetLiteral4005 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXListLiteral_in_entryRuleXListLiteral4032 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXListLiteral4039 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group__0_in_ruleXListLiteral4065 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXClosure_in_entryRuleXClosure4092 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXClosure4099 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group__0_in_ruleXClosure4125 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpressionInClosure_in_entryRuleXExpressionInClosure4152 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXExpressionInClosure4159 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XExpressionInClosure__Group__0_in_ruleXExpressionInClosure4185 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXShortClosure_in_entryRuleXShortClosure4212 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXShortClosure4219 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group__0_in_ruleXShortClosure4245 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXParenthesizedExpression_in_entryRuleXParenthesizedExpression4272 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXParenthesizedExpression4279 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XParenthesizedExpression__Group__0_in_ruleXParenthesizedExpression4305 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXIfExpression_in_entryRuleXIfExpression4332 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXIfExpression4339 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__0_in_ruleXIfExpression4365 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSwitchExpression_in_entryRuleXSwitchExpression4392 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXSwitchExpression4399 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__0_in_ruleXSwitchExpression4425 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCasePart_in_entryRuleXCasePart4452 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXCasePart4459 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group__0_in_ruleXCasePart4485 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXForLoopExpression_in_entryRuleXForLoopExpression4512 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXForLoopExpression4519 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group__0_in_ruleXForLoopExpression4545 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBasicForLoopExpression_in_entryRuleXBasicForLoopExpression4572 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXBasicForLoopExpression4579 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__0_in_ruleXBasicForLoopExpression4605 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXWhileExpression_in_entryRuleXWhileExpression4632 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXWhileExpression4639 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__0_in_ruleXWhileExpression4665 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXDoWhileExpression_in_entryRuleXDoWhileExpression4692 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXDoWhileExpression4699 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__0_in_ruleXDoWhileExpression4725 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBlockExpression_in_entryRuleXBlockExpression4752 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXBlockExpression4759 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group__0_in_ruleXBlockExpression4785 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_entryRuleXExpressionOrVarDeclaration4812 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXExpressionOrVarDeclaration4819 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XExpressionOrVarDeclaration__Alternatives_in_ruleXExpressionOrVarDeclaration4845 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXVariableDeclaration_in_entryRuleXVariableDeclaration4872 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXVariableDeclaration4879 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group__0_in_ruleXVariableDeclaration4905 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_entryRuleJvmFormalParameter4932 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmFormalParameter4939 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmFormalParameter__Group__0_in_ruleJvmFormalParameter4965 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFullJvmFormalParameter_in_entryRuleFullJvmFormalParameter4992 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFullJvmFormalParameter4999 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FullJvmFormalParameter__Group__0_in_ruleFullJvmFormalParameter5025 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXFeatureCall_in_entryRuleXFeatureCall5052 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXFeatureCall5059 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group__0_in_ruleXFeatureCall5085 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFeatureCallID_in_entryRuleFeatureCallID5112 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFeatureCallID5119 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FeatureCallID__Alternatives_in_ruleFeatureCallID5145 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdOrSuper_in_entryRuleIdOrSuper5172 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIdOrSuper5179 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IdOrSuper__Alternatives_in_ruleIdOrSuper5205 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstructorCall_in_entryRuleXConstructorCall5232 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXConstructorCall5239 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__0_in_ruleXConstructorCall5265 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBooleanLiteral_in_entryRuleXBooleanLiteral5292 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXBooleanLiteral5299 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBooleanLiteral__Group__0_in_ruleXBooleanLiteral5325 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXNullLiteral_in_entryRuleXNullLiteral5352 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXNullLiteral5359 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XNullLiteral__Group__0_in_ruleXNullLiteral5385 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXNumberLiteral_in_entryRuleXNumberLiteral5412 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXNumberLiteral5419 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XNumberLiteral__Group__0_in_ruleXNumberLiteral5445 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXStringLiteral_in_entryRuleXStringLiteral5472 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXStringLiteral5479 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XStringLiteral__Group__0_in_ruleXStringLiteral5505 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXTypeLiteral_in_entryRuleXTypeLiteral5532 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXTypeLiteral5539 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__0_in_ruleXTypeLiteral5565 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXThrowExpression_in_entryRuleXThrowExpression5592 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXThrowExpression5599 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XThrowExpression__Group__0_in_ruleXThrowExpression5625 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXReturnExpression_in_entryRuleXReturnExpression5652 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXReturnExpression5659 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XReturnExpression__Group__0_in_ruleXReturnExpression5685 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXTryCatchFinallyExpression_in_entryRuleXTryCatchFinallyExpression5712 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXTryCatchFinallyExpression5719 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group__0_in_ruleXTryCatchFinallyExpression5745 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSynchronizedExpression_in_entryRuleXSynchronizedExpression5772 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXSynchronizedExpression5779 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group__0_in_ruleXSynchronizedExpression5805 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCatchClause_in_entryRuleXCatchClause5832 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXCatchClause5839 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCatchClause__Group__0_in_ruleXCatchClause5865 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName5892 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedName5899 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group__0_in_ruleQualifiedName5925 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNumber_in_entryRuleNumber5957 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNumber5964 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Number__Alternatives_in_ruleNumber5994 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_entryRuleJvmTypeReference6023 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmTypeReference6030 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Alternatives_in_ruleJvmTypeReference6056 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleArrayBrackets_in_entryRuleArrayBrackets6083 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleArrayBrackets6090 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ArrayBrackets__Group__0_in_ruleArrayBrackets6116 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXFunctionTypeRef_in_entryRuleXFunctionTypeRef6143 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXFunctionTypeRef6150 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group__0_in_ruleXFunctionTypeRef6176 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmParameterizedTypeReference_in_entryRuleJvmParameterizedTypeReference6203 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmParameterizedTypeReference6210 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group__0_in_ruleJvmParameterizedTypeReference6236 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_entryRuleJvmArgumentTypeReference6263 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmArgumentTypeReference6270 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmArgumentTypeReference__Alternatives_in_ruleJvmArgumentTypeReference6296 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmWildcardTypeReference_in_entryRuleJvmWildcardTypeReference6323 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmWildcardTypeReference6330 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group__0_in_ruleJvmWildcardTypeReference6356 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmUpperBound_in_entryRuleJvmUpperBound6383 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmUpperBound6390 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmUpperBound__Group__0_in_ruleJvmUpperBound6416 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmUpperBoundAnded_in_entryRuleJvmUpperBoundAnded6443 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmUpperBoundAnded6450 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmUpperBoundAnded__Group__0_in_ruleJvmUpperBoundAnded6476 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmLowerBound_in_entryRuleJvmLowerBound6503 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmLowerBound6510 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmLowerBound__Group__0_in_ruleJvmLowerBound6536 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmLowerBoundAnded_in_entryRuleJvmLowerBoundAnded6563 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmLowerBoundAnded6570 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmLowerBoundAnded__Group__0_in_ruleJvmLowerBoundAnded6596 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedNameWithWildcard_in_entryRuleQualifiedNameWithWildcard6625 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedNameWithWildcard6632 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedNameWithWildcard__Group__0_in_ruleQualifiedNameWithWildcard6658 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXImportDeclaration_in_entryRuleXImportDeclaration6687 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXImportDeclaration6694 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Group__0_in_ruleXImportDeclaration6720 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedNameInStaticImport_in_entryRuleQualifiedNameInStaticImport6747 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedNameInStaticImport6754 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedNameInStaticImport__Group__0_in_ruleQualifiedNameInStaticImport6782 = new BitSet(new long[]{0x0000000000300022L});
-    public static final BitSet FOLLOW_rule__QualifiedNameInStaticImport__Group__0_in_ruleQualifiedNameInStaticImport6794 = new BitSet(new long[]{0x0000000000300022L});
-    public static final BitSet FOLLOW_rule__MatcherType__Alternatives_in_ruleMatcherType6834 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Constant__IntTypeAssignment_0_0_in_rule__Constant__Alternatives_06869 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Constant__StringTypeAssignment_0_1_in_rule__Constant__Alternatives_06887 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Constant__IntValueAssignment_3_0_in_rule__Constant__Alternatives_36920 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Constant__StringValueAssignment_3_1_in_rule__Constant__Alternatives_36938 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IntValue__LiteralAssignment_0_in_rule__IntValue__Alternatives6971 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IntValue__ReferenceAssignment_1_in_rule__IntValue__Alternatives6989 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StringValue__LiteralAssignment_0_in_rule__StringValue__Alternatives7022 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StringValue__ReferenceAssignment_1_in_rule__StringValue__Alternatives7040 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleWildcardRule_in_rule__Rule__Alternatives7073 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGrammarRule_in_rule__Rule__Alternatives7090 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GrammarRule__DirectivesAssignment_3_0_in_rule__GrammarRule__Alternatives_37122 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GrammarRule__DirectivesAssignment_3_1_in_rule__GrammarRule__Alternatives_37140 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSpecificDirective_in_rule__GrammarRuleDirective__Alternatives7173 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleContextFreeDirective_in_rule__GrammarRuleDirective__Alternatives7190 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleKeywordPair_in_rule__GrammarRuleDirective__Alternatives7207 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleContextFreeDirective_in_rule__WildcardRuleDirective__Alternatives7239 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleKeywordPair_in_rule__WildcardRuleDirective__Alternatives7256 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GrammarElementReference__Group_0__0_in_rule__GrammarElementReference__Alternatives7288 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GrammarElementReference__Group_1__0_in_rule__GrammarElementReference__Alternatives7306 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GrammarElementReference__SelfAssignment_2_in_rule__GrammarElementReference__Alternatives7324 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GrammarElementReference__RuleAssignment_3_in_rule__GrammarElementReference__Alternatives7342 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GrammarElementReference__KeywordAssignment_4_in_rule__GrammarElementReference__Alternatives7360 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GrammarElementLookup__RuleAssignment_0_in_rule__GrammarElementLookup__Alternatives7393 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GrammarElementLookup__KeywordAssignment_1_in_rule__GrammarElementLookup__Alternatives7411 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GroupBlock__MatcherListAssignment_2_0_in_rule__GroupBlock__Alternatives_27444 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GroupBlock__Group_2_1__0_in_rule__GroupBlock__Alternatives_27462 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GroupBlock__Group_2_2__0_in_rule__GroupBlock__Alternatives_27480 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group_5_0__0_in_rule__KeywordPair__Alternatives_57513 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group_5_1__0_in_rule__KeywordPair__Alternatives_57531 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group_6_1_0__0_in_rule__KeywordPair__Alternatives_6_17564 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group_6_1_1__0_in_rule__KeywordPair__Alternatives_6_17582 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSpaceLocator_in_rule__Locator__Alternatives7615 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRightPaddingLocator_in_rule__Locator__Alternatives7632 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLinewrapLocator_in_rule__Locator__Alternatives7649 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleColumnLocator_in_rule__Locator__Alternatives7666 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOffsetLocator_in_rule__Locator__Alternatives7683 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIndentLocator_in_rule__Locator__Alternatives7700 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNoFormatLocator_in_rule__Locator__Alternatives7717 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SpaceLocator__Group_0__0_in_rule__SpaceLocator__Alternatives7749 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SpaceLocator__NoSpaceAssignment_1_in_rule__SpaceLocator__Alternatives7767 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LinewrapLocator__Group_0__0_in_rule__LinewrapLocator__Alternatives7800 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LinewrapLocator__NoLinewrapAssignment_1_in_rule__LinewrapLocator__Alternatives7818 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LinewrapLocator__ValueAssignment_0_1_1_0_in_rule__LinewrapLocator__Alternatives_0_1_17851 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LinewrapLocator__Group_0_1_1_1__0_in_rule__LinewrapLocator__Alternatives_0_1_17869 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ColumnLocator__ValueAssignment_2_0_in_rule__ColumnLocator__Alternatives_27902 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ColumnLocator__ParameterAssignment_2_1_in_rule__ColumnLocator__Alternatives_27920 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IndentLocator__IncrementAssignment_1_0_in_rule__IndentLocator__Alternatives_17953 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_17_in_rule__IndentLocator__Alternatives_17972 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IndentLocator__ValueAssignment_2_0_in_rule__IndentLocator__Alternatives_28006 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IndentLocator__ParameterAssignment_2_1_in_rule__IndentLocator__Alternatives_28024 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__Identifier__Alternatives8057 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_18_in_rule__Identifier__Alternatives8075 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_rule__Identifier__Alternatives8095 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_20_in_rule__ValidID__Alternatives8130 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_21_in_rule__ValidID__Alternatives8150 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__ValidID__Alternatives8169 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3_1_0__0_in_rule__XAnnotation__Alternatives_3_18201 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__ValueAssignment_3_1_1_in_rule__XAnnotation__Alternatives_3_18219 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__0_in_rule__XAnnotationElementValueOrCommaList__Alternatives8252 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1__0_in_rule__XAnnotationElementValueOrCommaList__Alternatives8270 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0__0_in_rule__XAnnotationElementValue__Alternatives8303 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValue__Alternatives8321 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotation_in_rule__XAnnotationOrExpression__Alternatives8353 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XAnnotationOrExpression__Alternatives8370 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_0__0_in_rule__XAssignment__Alternatives8402 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1__0_in_rule__XAssignment__Alternatives8420 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_22_in_rule__OpMultiAssign__Alternatives8454 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_rule__OpMultiAssign__Alternatives8474 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_rule__OpMultiAssign__Alternatives8494 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_25_in_rule__OpMultiAssign__Alternatives8514 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_rule__OpMultiAssign__Alternatives8534 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_5__0_in_rule__OpMultiAssign__Alternatives8553 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_6__0_in_rule__OpMultiAssign__Alternatives8571 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__OpEquality__Alternatives8605 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__OpEquality__Alternatives8625 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_rule__OpEquality__Alternatives8645 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_rule__OpEquality__Alternatives8665 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0__0_in_rule__XRelationalExpression__Alternatives_18699 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1__0_in_rule__XRelationalExpression__Alternatives_18717 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_rule__OpCompare__Alternatives8751 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpCompare__Group_1__0_in_rule__OpCompare__Alternatives8770 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_rule__OpCompare__Alternatives8789 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_rule__OpCompare__Alternatives8809 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_34_in_rule__OpOther__Alternatives8844 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_35_in_rule__OpOther__Alternatives8864 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_2__0_in_rule__OpOther__Alternatives8883 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_rule__OpOther__Alternatives8902 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_37_in_rule__OpOther__Alternatives8922 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_5__0_in_rule__OpOther__Alternatives8941 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_6__0_in_rule__OpOther__Alternatives8959 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_38_in_rule__OpOther__Alternatives8978 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_39_in_rule__OpOther__Alternatives8998 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_5_1_0__0_in_rule__OpOther__Alternatives_5_19032 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_rule__OpOther__Alternatives_5_19051 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_6_1_0__0_in_rule__OpOther__Alternatives_6_19085 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_rule__OpOther__Alternatives_6_19104 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_37_in_rule__OpOther__Alternatives_6_19124 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_40_in_rule__OpAdd__Alternatives9159 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__OpAdd__Alternatives9179 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__OpMulti__Alternatives9214 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_rule__OpMulti__Alternatives9234 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_44_in_rule__OpMulti__Alternatives9254 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_45_in_rule__OpMulti__Alternatives9274 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XUnaryOperation__Group_0__0_in_rule__XUnaryOperation__Alternatives9308 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCastedExpression_in_rule__XUnaryOperation__Alternatives9326 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rule__OpUnary__Alternatives9359 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__OpUnary__Alternatives9379 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_40_in_rule__OpUnary__Alternatives9399 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__OpPostfix__Alternatives9434 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_rule__OpPostfix__Alternatives9454 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0__0_in_rule__XMemberFeatureCall__Alternatives_19488 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__0_in_rule__XMemberFeatureCall__Alternatives_19506 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_49_in_rule__XMemberFeatureCall__Alternatives_1_0_0_0_19540 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_1_in_rule__XMemberFeatureCall__Alternatives_1_0_0_0_19559 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_49_in_rule__XMemberFeatureCall__Alternatives_1_1_0_0_19593 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_1_in_rule__XMemberFeatureCall__Alternatives_1_1_0_0_19612 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_2_in_rule__XMemberFeatureCall__Alternatives_1_1_0_0_19630 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0_in_rule__XMemberFeatureCall__Alternatives_1_1_3_19663 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1__0_in_rule__XMemberFeatureCall__Alternatives_1_1_3_19681 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstructorCall_in_rule__XPrimaryExpression__Alternatives9714 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBlockExpression_in_rule__XPrimaryExpression__Alternatives9731 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSwitchExpression_in_rule__XPrimaryExpression__Alternatives9748 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSynchronizedExpression_in_rule__XPrimaryExpression__Alternatives9766 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXFeatureCall_in_rule__XPrimaryExpression__Alternatives9784 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXLiteral_in_rule__XPrimaryExpression__Alternatives9801 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXIfExpression_in_rule__XPrimaryExpression__Alternatives9818 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXForLoopExpression_in_rule__XPrimaryExpression__Alternatives9836 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBasicForLoopExpression_in_rule__XPrimaryExpression__Alternatives9854 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXWhileExpression_in_rule__XPrimaryExpression__Alternatives9871 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXDoWhileExpression_in_rule__XPrimaryExpression__Alternatives9888 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXThrowExpression_in_rule__XPrimaryExpression__Alternatives9905 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXReturnExpression_in_rule__XPrimaryExpression__Alternatives9922 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXTryCatchFinallyExpression_in_rule__XPrimaryExpression__Alternatives9939 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXParenthesizedExpression_in_rule__XPrimaryExpression__Alternatives9956 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCollectionLiteral_in_rule__XLiteral__Alternatives9988 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXClosure_in_rule__XLiteral__Alternatives10006 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBooleanLiteral_in_rule__XLiteral__Alternatives10024 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXNumberLiteral_in_rule__XLiteral__Alternatives10041 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXNullLiteral_in_rule__XLiteral__Alternatives10058 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXStringLiteral_in_rule__XLiteral__Alternatives10075 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXTypeLiteral_in_rule__XLiteral__Alternatives10092 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSetLiteral_in_rule__XCollectionLiteral__Alternatives10124 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXListLiteral_in_rule__XCollectionLiteral__Alternatives10141 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0__0_in_rule__XSwitchExpression__Alternatives_210173 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1__0_in_rule__XSwitchExpression__Alternatives_210191 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group_3_0__0_in_rule__XCasePart__Alternatives_310224 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__FallThroughAssignment_3_1_in_rule__XCasePart__Alternatives_310242 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXVariableDeclaration_in_rule__XExpressionOrVarDeclaration__Alternatives10275 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XExpressionOrVarDeclaration__Alternatives10292 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__WriteableAssignment_1_0_in_rule__XVariableDeclaration__Alternatives_110324 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_rule__XVariableDeclaration__Alternatives_110343 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_2_0__0_in_rule__XVariableDeclaration__Alternatives_210377 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__NameAssignment_2_1_in_rule__XVariableDeclaration__Alternatives_210395 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0_in_rule__XFeatureCall__Alternatives_3_110428 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3_1_1__0_in_rule__XFeatureCall__Alternatives_3_110446 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__FeatureCallID__Alternatives10479 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_50_in_rule__FeatureCallID__Alternatives10497 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__FeatureCallID__Alternatives10517 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_rule__FeatureCallID__Alternatives10537 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_53_in_rule__FeatureCallID__Alternatives10557 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFeatureCallID_in_rule__IdOrSuper__Alternatives10591 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_54_in_rule__IdOrSuper__Alternatives10609 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__ArgumentsAssignment_4_1_0_in_rule__XConstructorCall__Alternatives_4_110643 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4_1_1__0_in_rule__XConstructorCall__Alternatives_4_110661 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_55_in_rule__XBooleanLiteral__Alternatives_110695 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBooleanLiteral__IsTrueAssignment_1_1_in_rule__XBooleanLiteral__Alternatives_110714 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0__0_in_rule__XTryCatchFinallyExpression__Alternatives_310747 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_1__0_in_rule__XTryCatchFinallyExpression__Alternatives_310765 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_HEX_in_rule__Number__Alternatives10798 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Number__Group_1__0_in_rule__Number__Alternatives10815 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__Number__Alternatives_1_010848 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_DECIMAL_in_rule__Number__Alternatives_1_010865 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__Number__Alternatives_1_1_110897 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_DECIMAL_in_rule__Number__Alternatives_1_1_110914 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0__0_in_rule__JvmTypeReference__Alternatives10946 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXFunctionTypeRef_in_rule__JvmTypeReference__Alternatives10964 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__JvmArgumentTypeReference__Alternatives10996 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmWildcardTypeReference_in_rule__JvmArgumentTypeReference__Alternatives11013 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group_2_0__0_in_rule__JvmWildcardTypeReference__Alternatives_211045 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group_2_1__0_in_rule__JvmWildcardTypeReference__Alternatives_211063 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Group_1_0__0_in_rule__XImportDeclaration__Alternatives_111096 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__ImportedTypeAssignment_1_1_in_rule__XImportDeclaration__Alternatives_111114 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__ImportedNamespaceAssignment_1_2_in_rule__XImportDeclaration__Alternatives_111132 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__WildcardAssignment_1_0_3_0_in_rule__XImportDeclaration__Alternatives_1_0_311165 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__MemberNameAssignment_1_0_3_1_in_rule__XImportDeclaration__Alternatives_1_0_311183 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_rule__MatcherType__Alternatives11217 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_57_in_rule__MatcherType__Alternatives11238 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_58_in_rule__MatcherType__Alternatives11259 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_59_in_rule__MatcherType__Alternatives11280 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_60_in_rule__MatcherType__Alternatives11301 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FormatConfiguration__Group__0__Impl_in_rule__FormatConfiguration__Group__011334 = new BitSet(new long[]{0x4000000000000000L});
-    public static final BitSet FOLLOW_rule__FormatConfiguration__Group__1_in_rule__FormatConfiguration__Group__011337 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_61_in_rule__FormatConfiguration__Group__0__Impl11365 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FormatConfiguration__Group__1__Impl_in_rule__FormatConfiguration__Group__111396 = new BitSet(new long[]{0x00000000000C0020L});
-    public static final BitSet FOLLOW_rule__FormatConfiguration__Group__2_in_rule__FormatConfiguration__Group__111399 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_62_in_rule__FormatConfiguration__Group__1__Impl11427 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FormatConfiguration__Group__2__Impl_in_rule__FormatConfiguration__Group__211458 = new BitSet(new long[]{0x8004040000000020L,0x0000040000000001L});
-    public static final BitSet FOLLOW_rule__FormatConfiguration__Group__3_in_rule__FormatConfiguration__Group__211461 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FormatConfiguration__TargetGrammarAssignment_2_in_rule__FormatConfiguration__Group__2__Impl11488 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FormatConfiguration__Group__3__Impl_in_rule__FormatConfiguration__Group__311518 = new BitSet(new long[]{0x8004040000000020L,0x0000040000000001L});
-    public static final BitSet FOLLOW_rule__FormatConfiguration__Group__4_in_rule__FormatConfiguration__Group__311521 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FormatConfiguration__Group_3__0_in_rule__FormatConfiguration__Group__3__Impl11548 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FormatConfiguration__Group__4__Impl_in_rule__FormatConfiguration__Group__411579 = new BitSet(new long[]{0x8004040000000020L,0x0000040000000001L});
-    public static final BitSet FOLLOW_rule__FormatConfiguration__Group__5_in_rule__FormatConfiguration__Group__411582 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FormatConfiguration__Group_4__0_in_rule__FormatConfiguration__Group__4__Impl11609 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FormatConfiguration__Group__5__Impl_in_rule__FormatConfiguration__Group__511640 = new BitSet(new long[]{0x8004040000000020L,0x0000040000000001L});
-    public static final BitSet FOLLOW_rule__FormatConfiguration__Group__6_in_rule__FormatConfiguration__Group__511643 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FormatConfiguration__Group_5__0_in_rule__FormatConfiguration__Group__5__Impl11670 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule__FormatConfiguration__Group__6__Impl_in_rule__FormatConfiguration__Group__611701 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FormatConfiguration__RulesAssignment_6_in_rule__FormatConfiguration__Group__6__Impl11728 = new BitSet(new long[]{0x0000040000000022L,0x0000040000000000L});
-    public static final BitSet FOLLOW_rule__FormatConfiguration__Group_3__0__Impl_in_rule__FormatConfiguration__Group_3__011773 = new BitSet(new long[]{0x00000000000C0020L});
-    public static final BitSet FOLLOW_rule__FormatConfiguration__Group_3__1_in_rule__FormatConfiguration__Group_3__011776 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_rule__FormatConfiguration__Group_3__0__Impl11804 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FormatConfiguration__Group_3__1__Impl_in_rule__FormatConfiguration__Group_3__111835 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FormatConfiguration__ExtendedFormatConfigurationAssignment_3_1_in_rule__FormatConfiguration__Group_3__1__Impl11862 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FormatConfiguration__Group_4__0__Impl_in_rule__FormatConfiguration__Group_4__011896 = new BitSet(new long[]{0x0000000000300020L});
-    public static final BitSet FOLLOW_rule__FormatConfiguration__Group_4__1_in_rule__FormatConfiguration__Group_4__011899 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_50_in_rule__FormatConfiguration__Group_4__0__Impl11927 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FormatConfiguration__Group_4__1__Impl_in_rule__FormatConfiguration__Group_4__111958 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FormatConfiguration__FormatterBaseClassAssignment_4_1_in_rule__FormatConfiguration__Group_4__1__Impl11985 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FormatConfiguration__Group_5__0__Impl_in_rule__FormatConfiguration__Group_5__012019 = new BitSet(new long[]{0x0000000000000020L,0x0000030000000000L});
-    public static final BitSet FOLLOW_rule__FormatConfiguration__Group_5__1_in_rule__FormatConfiguration__Group_5__012022 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_64_in_rule__FormatConfiguration__Group_5__0__Impl12050 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FormatConfiguration__Group_5__1__Impl_in_rule__FormatConfiguration__Group_5__112081 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FormatConfiguration__Group_5__2_in_rule__FormatConfiguration__Group_5__112084 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FormatConfiguration__ConstantsAssignment_5_1_in_rule__FormatConfiguration__Group_5__1__Impl12111 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FormatConfiguration__Group_5__2__Impl_in_rule__FormatConfiguration__Group_5__212141 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_65_in_rule__FormatConfiguration__Group_5__2__Impl12169 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Constant__Group__0__Impl_in_rule__Constant__Group__012206 = new BitSet(new long[]{0x0000000000000020L,0x0000030000000000L});
-    public static final BitSet FOLLOW_rule__Constant__Group__1_in_rule__Constant__Group__012209 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Constant__Alternatives_0_in_rule__Constant__Group__0__Impl12236 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Constant__Group__1__Impl_in_rule__Constant__Group__112267 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_rule__Constant__Group__2_in_rule__Constant__Group__112270 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Constant__NameAssignment_1_in_rule__Constant__Group__1__Impl12297 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Constant__Group__2__Impl_in_rule__Constant__Group__212327 = new BitSet(new long[]{0x0000000000000110L});
-    public static final BitSet FOLLOW_rule__Constant__Group__3_in_rule__Constant__Group__212330 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_14_in_rule__Constant__Group__2__Impl12358 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Constant__Group__3__Impl_in_rule__Constant__Group__312389 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Constant__Alternatives_3_in_rule__Constant__Group__3__Impl12416 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GrammarRule__Group__0__Impl_in_rule__GrammarRule__Group__012454 = new BitSet(new long[]{0x0000040000000020L,0x0000040000000000L});
-    public static final BitSet FOLLOW_rule__GrammarRule__Group__1_in_rule__GrammarRule__Group__012457 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GrammarRule__OverrideAssignment_0_in_rule__GrammarRule__Group__0__Impl12484 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GrammarRule__Group__1__Impl_in_rule__GrammarRule__Group__112515 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_rule__GrammarRule__Group__2_in_rule__GrammarRule__Group__112518 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GrammarRule__TargetRuleAssignment_1_in_rule__GrammarRule__Group__1__Impl12545 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GrammarRule__Group__2__Impl_in_rule__GrammarRule__Group__212575 = new BitSet(new long[]{0x00000000000C6120L,0x0000000000000638L});
-    public static final BitSet FOLLOW_rule__GrammarRule__Group__3_in_rule__GrammarRule__Group__212578 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_66_in_rule__GrammarRule__Group__2__Impl12606 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GrammarRule__Group__3__Impl_in_rule__GrammarRule__Group__312637 = new BitSet(new long[]{0x00000000000C6120L,0x0000000000000638L});
-    public static final BitSet FOLLOW_rule__GrammarRule__Group__4_in_rule__GrammarRule__Group__312640 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GrammarRule__Alternatives_3_in_rule__GrammarRule__Group__3__Impl12667 = new BitSet(new long[]{0x00000000000C6122L,0x0000000000000630L});
-    public static final BitSet FOLLOW_rule__GrammarRule__Group__4__Impl_in_rule__GrammarRule__Group__412698 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_67_in_rule__GrammarRule__Group__4__Impl12726 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__WildcardRule__Group__0__Impl_in_rule__WildcardRule__Group__012767 = new BitSet(new long[]{0x0000040000000000L,0x0000040000000000L});
-    public static final BitSet FOLLOW_rule__WildcardRule__Group__1_in_rule__WildcardRule__Group__012770 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__WildcardRule__Group__1__Impl_in_rule__WildcardRule__Group__112828 = new BitSet(new long[]{0x0000040000000000L,0x0000040000000000L});
-    public static final BitSet FOLLOW_rule__WildcardRule__Group__2_in_rule__WildcardRule__Group__112831 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__WildcardRule__OverrideAssignment_1_in_rule__WildcardRule__Group__1__Impl12858 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__WildcardRule__Group__2__Impl_in_rule__WildcardRule__Group__212889 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_rule__WildcardRule__Group__3_in_rule__WildcardRule__Group__212892 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__WildcardRule__Group__2__Impl12920 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__WildcardRule__Group__3__Impl_in_rule__WildcardRule__Group__312951 = new BitSet(new long[]{0x00000000000C6120L,0x0000000000000438L});
-    public static final BitSet FOLLOW_rule__WildcardRule__Group__4_in_rule__WildcardRule__Group__312954 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_66_in_rule__WildcardRule__Group__3__Impl12982 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__WildcardRule__Group__4__Impl_in_rule__WildcardRule__Group__413013 = new BitSet(new long[]{0x00000000000C6120L,0x0000000000000438L});
-    public static final BitSet FOLLOW_rule__WildcardRule__Group__5_in_rule__WildcardRule__Group__413016 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__WildcardRule__DirectivesAssignment_4_in_rule__WildcardRule__Group__4__Impl13043 = new BitSet(new long[]{0x00000000000C6122L,0x0000000000000430L});
-    public static final BitSet FOLLOW_rule__WildcardRule__Group__5__Impl_in_rule__WildcardRule__Group__513074 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_67_in_rule__WildcardRule__Group__5__Impl13102 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GrammarElementReference__Group_0__0__Impl_in_rule__GrammarElementReference__Group_0__013145 = new BitSet(new long[]{0x00000000000C0020L});
-    public static final BitSet FOLLOW_rule__GrammarElementReference__Group_0__1_in_rule__GrammarElementReference__Group_0__013148 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_14_in_rule__GrammarElementReference__Group_0__0__Impl13176 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GrammarElementReference__Group_0__1__Impl_in_rule__GrammarElementReference__Group_0__113207 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GrammarElementReference__AssignmentAssignment_0_1_in_rule__GrammarElementReference__Group_0__1__Impl13234 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GrammarElementReference__Group_1__0__Impl_in_rule__GrammarElementReference__Group_1__013268 = new BitSet(new long[]{0x00000000000C0020L});
-    public static final BitSet FOLLOW_rule__GrammarElementReference__Group_1__1_in_rule__GrammarElementReference__Group_1__013271 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_68_in_rule__GrammarElementReference__Group_1__0__Impl13299 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GrammarElementReference__Group_1__1__Impl_in_rule__GrammarElementReference__Group_1__113330 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GrammarElementReference__RuleCallAssignment_1_1_in_rule__GrammarElementReference__Group_1__1__Impl13357 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContextFreeDirective__Group__0__Impl_in_rule__ContextFreeDirective__Group__013391 = new BitSet(new long[]{0x00000000000C0120L});
-    public static final BitSet FOLLOW_rule__ContextFreeDirective__Group__1_in_rule__ContextFreeDirective__Group__013394 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_69_in_rule__ContextFreeDirective__Group__0__Impl13422 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContextFreeDirective__Group__1__Impl_in_rule__ContextFreeDirective__Group__113453 = new BitSet(new long[]{0x0000000000000000L,0x00000000000000C0L});
-    public static final BitSet FOLLOW_rule__ContextFreeDirective__Group__2_in_rule__ContextFreeDirective__Group__113456 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContextFreeDirective__GrammarElementsAssignment_1_in_rule__ContextFreeDirective__Group__1__Impl13483 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContextFreeDirective__Group__2__Impl_in_rule__ContextFreeDirective__Group__213513 = new BitSet(new long[]{0x0000000000000000L,0x00000000000000C0L});
-    public static final BitSet FOLLOW_rule__ContextFreeDirective__Group__3_in_rule__ContextFreeDirective__Group__213516 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContextFreeDirective__Group_2__0_in_rule__ContextFreeDirective__Group__2__Impl13543 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__ContextFreeDirective__Group__3__Impl_in_rule__ContextFreeDirective__Group__313574 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__ContextFreeDirective__Group__4_in_rule__ContextFreeDirective__Group__313577 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_70_in_rule__ContextFreeDirective__Group__3__Impl13605 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContextFreeDirective__Group__4__Impl_in_rule__ContextFreeDirective__Group__413636 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContextFreeDirective__MatcherListAssignment_4_in_rule__ContextFreeDirective__Group__4__Impl13663 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContextFreeDirective__Group_2__0__Impl_in_rule__ContextFreeDirective__Group_2__013703 = new BitSet(new long[]{0x00000000000C0120L});
-    public static final BitSet FOLLOW_rule__ContextFreeDirective__Group_2__1_in_rule__ContextFreeDirective__Group_2__013706 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__ContextFreeDirective__Group_2__0__Impl13734 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContextFreeDirective__Group_2__1__Impl_in_rule__ContextFreeDirective__Group_2__113765 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ContextFreeDirective__GrammarElementsAssignment_2_1_in_rule__ContextFreeDirective__Group_2__1__Impl13792 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SpecificDirective__Group__0__Impl_in_rule__SpecificDirective__Group__013826 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000180L});
-    public static final BitSet FOLLOW_rule__SpecificDirective__Group__1_in_rule__SpecificDirective__Group__013829 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SpecificDirective__GrammarElementsAssignment_0_in_rule__SpecificDirective__Group__0__Impl13856 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SpecificDirective__Group__1__Impl_in_rule__SpecificDirective__Group__113886 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000180L});
-    public static final BitSet FOLLOW_rule__SpecificDirective__Group__2_in_rule__SpecificDirective__Group__113889 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SpecificDirective__Group_1__0_in_rule__SpecificDirective__Group__1__Impl13916 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__SpecificDirective__Group__2__Impl_in_rule__SpecificDirective__Group__213947 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SpecificDirective__MatcherListAssignment_2_in_rule__SpecificDirective__Group__2__Impl13974 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SpecificDirective__Group_1__0__Impl_in_rule__SpecificDirective__Group_1__014010 = new BitSet(new long[]{0x00000000000C6120L,0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__SpecificDirective__Group_1__1_in_rule__SpecificDirective__Group_1__014013 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__SpecificDirective__Group_1__0__Impl14041 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SpecificDirective__Group_1__1__Impl_in_rule__SpecificDirective__Group_1__114072 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SpecificDirective__GrammarElementsAssignment_1_1_in_rule__SpecificDirective__Group_1__1__Impl14099 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MatcherList__Group__0__Impl_in_rule__MatcherList__Group__014133 = new BitSet(new long[]{0x0000000000020000L,0x00011800000FC000L});
-    public static final BitSet FOLLOW_rule__MatcherList__Group__1_in_rule__MatcherList__Group__014136 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__MatcherList__Group__0__Impl14164 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MatcherList__Group__1__Impl_in_rule__MatcherList__Group__114195 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000082L});
-    public static final BitSet FOLLOW_rule__MatcherList__Group__2_in_rule__MatcherList__Group__114198 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MatcherList__MatchersAssignment_1_in_rule__MatcherList__Group__1__Impl14225 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MatcherList__Group__2__Impl_in_rule__MatcherList__Group__214255 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000082L});
-    public static final BitSet FOLLOW_rule__MatcherList__Group__3_in_rule__MatcherList__Group__214258 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MatcherList__Group_2__0_in_rule__MatcherList__Group__2__Impl14285 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__MatcherList__Group__3__Impl_in_rule__MatcherList__Group__314316 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_65_in_rule__MatcherList__Group__3__Impl14344 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MatcherList__Group_2__0__Impl_in_rule__MatcherList__Group_2__014383 = new BitSet(new long[]{0x0000000000020000L,0x00011800000FC000L});
-    public static final BitSet FOLLOW_rule__MatcherList__Group_2__1_in_rule__MatcherList__Group_2__014386 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__MatcherList__Group_2__0__Impl14414 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MatcherList__Group_2__1__Impl_in_rule__MatcherList__Group_2__114445 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MatcherList__MatchersAssignment_2_1_in_rule__MatcherList__Group_2__1__Impl14472 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GroupBlock__Group__0__Impl_in_rule__GroupBlock__Group__014506 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__GroupBlock__Group__1_in_rule__GroupBlock__Group__014509 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__GroupBlock__Group__0__Impl14537 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GroupBlock__Group__1__Impl_in_rule__GroupBlock__Group__114568 = new BitSet(new long[]{0x0000002000000000L,0x0000000000000104L});
-    public static final BitSet FOLLOW_rule__GroupBlock__Group__2_in_rule__GroupBlock__Group__114571 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GroupBlock__GrammarElementAssignment_1_in_rule__GroupBlock__Group__1__Impl14598 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GroupBlock__Group__2__Impl_in_rule__GroupBlock__Group__214628 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GroupBlock__Alternatives_2_in_rule__GroupBlock__Group__2__Impl14655 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GroupBlock__Group_2_1__0__Impl_in_rule__GroupBlock__Group_2_1__014691 = new BitSet(new long[]{0x00000000000C6120L,0x0000000000000630L});
-    public static final BitSet FOLLOW_rule__GroupBlock__Group_2_1__1_in_rule__GroupBlock__Group_2_1__014694 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_37_in_rule__GroupBlock__Group_2_1__0__Impl14722 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GroupBlock__Group_2_1__1__Impl_in_rule__GroupBlock__Group_2_1__114753 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GroupBlock__SubGroupAssignment_2_1_1_in_rule__GroupBlock__Group_2_1__1__Impl14780 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GroupBlock__Group_2_2__0__Impl_in_rule__GroupBlock__Group_2_2__014814 = new BitSet(new long[]{0x00000000000C6120L,0x0000000000000438L});
-    public static final BitSet FOLLOW_rule__GroupBlock__Group_2_2__1_in_rule__GroupBlock__Group_2_2__014817 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_66_in_rule__GroupBlock__Group_2_2__0__Impl14845 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GroupBlock__Group_2_2__1__Impl_in_rule__GroupBlock__Group_2_2__114876 = new BitSet(new long[]{0x00000000000C6120L,0x0000000000000438L});
-    public static final BitSet FOLLOW_rule__GroupBlock__Group_2_2__2_in_rule__GroupBlock__Group_2_2__114879 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GroupBlock__DirectivesAssignment_2_2_1_in_rule__GroupBlock__Group_2_2__1__Impl14906 = new BitSet(new long[]{0x00000000000C6122L,0x0000000000000430L});
-    public static final BitSet FOLLOW_rule__GroupBlock__Group_2_2__2__Impl_in_rule__GroupBlock__Group_2_2__214937 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_67_in_rule__GroupBlock__Group_2_2__2__Impl14965 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group__0__Impl_in_rule__KeywordPair__Group__015002 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group__1_in_rule__KeywordPair__Group__015005 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__KeywordPair__Group__0__Impl15033 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group__1__Impl_in_rule__KeywordPair__Group__115064 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group__2_in_rule__KeywordPair__Group__115067 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeywordPair__LeftAssignment_1_in_rule__KeywordPair__Group__1__Impl15094 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group__2__Impl_in_rule__KeywordPair__Group__215124 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000800L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group__3_in_rule__KeywordPair__Group__215127 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeywordPair__RightAssignment_2_in_rule__KeywordPair__Group__2__Impl15154 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group__3__Impl_in_rule__KeywordPair__Group__315184 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group__4_in_rule__KeywordPair__Group__315187 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_75_in_rule__KeywordPair__Group__3__Impl15215 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group__4__Impl_in_rule__KeywordPair__Group__415246 = new BitSet(new long[]{0x0000000000000000L,0x0000000000003000L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group__5_in_rule__KeywordPair__Group__415249 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__KeywordPair__Group__4__Impl15277 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group__5__Impl_in_rule__KeywordPair__Group__515308 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000082L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group__6_in_rule__KeywordPair__Group__515311 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Alternatives_5_in_rule__KeywordPair__Group__5__Impl15338 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group__6__Impl_in_rule__KeywordPair__Group__615368 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000082L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group__7_in_rule__KeywordPair__Group__615371 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group_6__0_in_rule__KeywordPair__Group__6__Impl15398 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group__7__Impl_in_rule__KeywordPair__Group__715429 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_65_in_rule__KeywordPair__Group__7__Impl15457 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group_5_0__0__Impl_in_rule__KeywordPair__Group_5_0__015504 = new BitSet(new long[]{0x0002000000000000L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group_5_0__1_in_rule__KeywordPair__Group_5_0__015507 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_76_in_rule__KeywordPair__Group_5_0__0__Impl15535 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group_5_0__1__Impl_in_rule__KeywordPair__Group_5_0__115566 = new BitSet(new long[]{0x0000000000020000L,0x00011800000FC000L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group_5_0__2_in_rule__KeywordPair__Group_5_0__115569 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_49_in_rule__KeywordPair__Group_5_0__1__Impl15597 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group_5_0__2__Impl_in_rule__KeywordPair__Group_5_0__215628 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeywordPair__LeftMatchersAssignment_5_0_2_in_rule__KeywordPair__Group_5_0__2__Impl15655 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group_5_1__0__Impl_in_rule__KeywordPair__Group_5_1__015691 = new BitSet(new long[]{0x0002000000000000L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group_5_1__1_in_rule__KeywordPair__Group_5_1__015694 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_77_in_rule__KeywordPair__Group_5_1__0__Impl15722 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group_5_1__1__Impl_in_rule__KeywordPair__Group_5_1__115753 = new BitSet(new long[]{0x0000000000020000L,0x00011800000FC000L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group_5_1__2_in_rule__KeywordPair__Group_5_1__115756 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_49_in_rule__KeywordPair__Group_5_1__1__Impl15784 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group_5_1__2__Impl_in_rule__KeywordPair__Group_5_1__215815 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeywordPair__RightMatchersAssignment_5_1_2_in_rule__KeywordPair__Group_5_1__2__Impl15842 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group_6__0__Impl_in_rule__KeywordPair__Group_6__015878 = new BitSet(new long[]{0x0000000000000000L,0x0000000000003000L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group_6__1_in_rule__KeywordPair__Group_6__015881 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__KeywordPair__Group_6__0__Impl15909 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group_6__1__Impl_in_rule__KeywordPair__Group_6__115940 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Alternatives_6_1_in_rule__KeywordPair__Group_6__1__Impl15967 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group_6_1_0__0__Impl_in_rule__KeywordPair__Group_6_1_0__016001 = new BitSet(new long[]{0x0002000000000000L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group_6_1_0__1_in_rule__KeywordPair__Group_6_1_0__016004 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_76_in_rule__KeywordPair__Group_6_1_0__0__Impl16032 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group_6_1_0__1__Impl_in_rule__KeywordPair__Group_6_1_0__116063 = new BitSet(new long[]{0x0000000000020000L,0x00011800000FC000L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group_6_1_0__2_in_rule__KeywordPair__Group_6_1_0__116066 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_49_in_rule__KeywordPair__Group_6_1_0__1__Impl16094 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group_6_1_0__2__Impl_in_rule__KeywordPair__Group_6_1_0__216125 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeywordPair__LeftMatchersAssignment_6_1_0_2_in_rule__KeywordPair__Group_6_1_0__2__Impl16152 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group_6_1_1__0__Impl_in_rule__KeywordPair__Group_6_1_1__016188 = new BitSet(new long[]{0x0002000000000000L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group_6_1_1__1_in_rule__KeywordPair__Group_6_1_1__016191 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_77_in_rule__KeywordPair__Group_6_1_1__0__Impl16219 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group_6_1_1__1__Impl_in_rule__KeywordPair__Group_6_1_1__116250 = new BitSet(new long[]{0x0000000000020000L,0x00011800000FC000L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group_6_1_1__2_in_rule__KeywordPair__Group_6_1_1__116253 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_49_in_rule__KeywordPair__Group_6_1_1__1__Impl16281 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeywordPair__Group_6_1_1__2__Impl_in_rule__KeywordPair__Group_6_1_1__216312 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__KeywordPair__RightMatchersAssignment_6_1_1_2_in_rule__KeywordPair__Group_6_1_1__2__Impl16339 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Matcher__Group__0__Impl_in_rule__Matcher__Group__016375 = new BitSet(new long[]{0x1F00000000000000L});
-    public static final BitSet FOLLOW_rule__Matcher__Group__1_in_rule__Matcher__Group__016378 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Matcher__LocatorAssignment_0_in_rule__Matcher__Group__0__Impl16405 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Matcher__Group__1__Impl_in_rule__Matcher__Group__116435 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_rule__Matcher__Group__2_in_rule__Matcher__Group__116438 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Matcher__TypeAssignment_1_in_rule__Matcher__Group__1__Impl16465 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Matcher__Group__2__Impl_in_rule__Matcher__Group__216495 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Matcher__ConditionAssignment_2_in_rule__Matcher__Group__2__Impl16522 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NoFormatLocator__Group__0__Impl_in_rule__NoFormatLocator__Group__016559 = new BitSet(new long[]{0x0000000000020000L,0x00011800000FC000L});
-    public static final BitSet FOLLOW_rule__NoFormatLocator__Group__1_in_rule__NoFormatLocator__Group__016562 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NoFormatLocator__Group__1__Impl_in_rule__NoFormatLocator__Group__116620 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_78_in_rule__NoFormatLocator__Group__1__Impl16648 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SpaceLocator__Group_0__0__Impl_in_rule__SpaceLocator__Group_0__016683 = new BitSet(new long[]{0x00000000000C0120L});
-    public static final BitSet FOLLOW_rule__SpaceLocator__Group_0__1_in_rule__SpaceLocator__Group_0__016686 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_79_in_rule__SpaceLocator__Group_0__0__Impl16714 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SpaceLocator__Group_0__1__Impl_in_rule__SpaceLocator__Group_0__116745 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SpaceLocator__ValueAssignment_0_1_in_rule__SpaceLocator__Group_0__1__Impl16772 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RightPaddingLocator__Group__0__Impl_in_rule__RightPaddingLocator__Group__016806 = new BitSet(new long[]{0x00000000000C0030L});
-    public static final BitSet FOLLOW_rule__RightPaddingLocator__Group__1_in_rule__RightPaddingLocator__Group__016809 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_80_in_rule__RightPaddingLocator__Group__0__Impl16837 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RightPaddingLocator__Group__1__Impl_in_rule__RightPaddingLocator__Group__116868 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RightPaddingLocator__ValueAssignment_1_in_rule__RightPaddingLocator__Group__1__Impl16895 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LinewrapLocator__Group_0__0__Impl_in_rule__LinewrapLocator__Group_0__016929 = new BitSet(new long[]{0x0000000000000000L,0x0000000000020000L});
-    public static final BitSet FOLLOW_rule__LinewrapLocator__Group_0__1_in_rule__LinewrapLocator__Group_0__016932 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LinewrapLocator__Group_0__1__Impl_in_rule__LinewrapLocator__Group_0__116990 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LinewrapLocator__Group_0_1__0_in_rule__LinewrapLocator__Group_0__1__Impl17017 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LinewrapLocator__Group_0_1__0__Impl_in_rule__LinewrapLocator__Group_0_1__017051 = new BitSet(new long[]{0x00000000000C0030L});
-    public static final BitSet FOLLOW_rule__LinewrapLocator__Group_0_1__1_in_rule__LinewrapLocator__Group_0_1__017054 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_81_in_rule__LinewrapLocator__Group_0_1__0__Impl17082 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LinewrapLocator__Group_0_1__1__Impl_in_rule__LinewrapLocator__Group_0_1__117113 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LinewrapLocator__Alternatives_0_1_1_in_rule__LinewrapLocator__Group_0_1__1__Impl17140 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LinewrapLocator__Group_0_1_1_1__0__Impl_in_rule__LinewrapLocator__Group_0_1_1_1__017175 = new BitSet(new long[]{0x00000000000C0030L});
-    public static final BitSet FOLLOW_rule__LinewrapLocator__Group_0_1_1_1__1_in_rule__LinewrapLocator__Group_0_1_1_1__017178 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LinewrapLocator__MinimumAssignment_0_1_1_1_0_in_rule__LinewrapLocator__Group_0_1_1_1__0__Impl17205 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LinewrapLocator__Group_0_1_1_1__1__Impl_in_rule__LinewrapLocator__Group_0_1_1_1__117235 = new BitSet(new long[]{0x00000000000C0030L});
-    public static final BitSet FOLLOW_rule__LinewrapLocator__Group_0_1_1_1__2_in_rule__LinewrapLocator__Group_0_1_1_1__117238 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LinewrapLocator__DefaultAssignment_0_1_1_1_1_in_rule__LinewrapLocator__Group_0_1_1_1__1__Impl17265 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LinewrapLocator__Group_0_1_1_1__2__Impl_in_rule__LinewrapLocator__Group_0_1_1_1__217295 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LinewrapLocator__MaximumAssignment_0_1_1_1_2_in_rule__LinewrapLocator__Group_0_1_1_1__2__Impl17322 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ColumnLocator__Group__0__Impl_in_rule__ColumnLocator__Group__017358 = new BitSet(new long[]{0x00000000000C0030L,0x0000200000000004L});
-    public static final BitSet FOLLOW_rule__ColumnLocator__Group__1_in_rule__ColumnLocator__Group__017361 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_82_in_rule__ColumnLocator__Group__0__Impl17389 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ColumnLocator__Group__1__Impl_in_rule__ColumnLocator__Group__117420 = new BitSet(new long[]{0x00000000000C0030L,0x0000200000000004L});
-    public static final BitSet FOLLOW_rule__ColumnLocator__Group__2_in_rule__ColumnLocator__Group__117423 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ColumnLocator__FixedAssignment_1_in_rule__ColumnLocator__Group__1__Impl17450 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ColumnLocator__Group__2__Impl_in_rule__ColumnLocator__Group__217481 = new BitSet(new long[]{0x0000000000000000L,0x0000C00000000000L});
-    public static final BitSet FOLLOW_rule__ColumnLocator__Group__3_in_rule__ColumnLocator__Group__217484 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ColumnLocator__Alternatives_2_in_rule__ColumnLocator__Group__2__Impl17511 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ColumnLocator__Group__3__Impl_in_rule__ColumnLocator__Group__317541 = new BitSet(new long[]{0x0000000000000000L,0x0000C00000000000L});
-    public static final BitSet FOLLOW_rule__ColumnLocator__Group__4_in_rule__ColumnLocator__Group__317544 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ColumnLocator__RelativeAssignment_3_in_rule__ColumnLocator__Group__3__Impl17571 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ColumnLocator__Group__4__Impl_in_rule__ColumnLocator__Group__417602 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ColumnLocator__NobreakAssignment_4_in_rule__ColumnLocator__Group__4__Impl17629 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OffsetLocator__Group__0__Impl_in_rule__OffsetLocator__Group__017670 = new BitSet(new long[]{0x00000000000C0030L,0x0000200000000000L});
-    public static final BitSet FOLLOW_rule__OffsetLocator__Group__1_in_rule__OffsetLocator__Group__017673 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_83_in_rule__OffsetLocator__Group__0__Impl17701 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OffsetLocator__Group__1__Impl_in_rule__OffsetLocator__Group__117732 = new BitSet(new long[]{0x00000000000C0030L,0x0000200000000000L});
-    public static final BitSet FOLLOW_rule__OffsetLocator__Group__2_in_rule__OffsetLocator__Group__117735 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OffsetLocator__FixedAssignment_1_in_rule__OffsetLocator__Group__1__Impl17762 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OffsetLocator__Group__2__Impl_in_rule__OffsetLocator__Group__217793 = new BitSet(new long[]{0x0000000000000000L,0x0000800000000000L});
-    public static final BitSet FOLLOW_rule__OffsetLocator__Group__3_in_rule__OffsetLocator__Group__217796 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OffsetLocator__ValueAssignment_2_in_rule__OffsetLocator__Group__2__Impl17823 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OffsetLocator__Group__3__Impl_in_rule__OffsetLocator__Group__317853 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OffsetLocator__NobreakAssignment_3_in_rule__OffsetLocator__Group__3__Impl17880 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IndentLocator__Group__0__Impl_in_rule__IndentLocator__Group__017919 = new BitSet(new long[]{0x0000000000020000L,0x0001000000000000L});
-    public static final BitSet FOLLOW_rule__IndentLocator__Group__1_in_rule__IndentLocator__Group__017922 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IndentLocator__Group__1__Impl_in_rule__IndentLocator__Group__117980 = new BitSet(new long[]{0x00000000000C0030L,0x0000000000000004L});
-    public static final BitSet FOLLOW_rule__IndentLocator__Group__2_in_rule__IndentLocator__Group__117983 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IndentLocator__Alternatives_1_in_rule__IndentLocator__Group__1__Impl18010 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IndentLocator__Group__2__Impl_in_rule__IndentLocator__Group__218040 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IndentLocator__Alternatives_2_in_rule__IndentLocator__Group__2__Impl18067 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ParameterizedIdentifier__Group__0__Impl_in_rule__ParameterizedIdentifier__Group__018104 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__ParameterizedIdentifier__Group__1_in_rule__ParameterizedIdentifier__Group__018107 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__ParameterizedIdentifier__Group__0__Impl18134 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ParameterizedIdentifier__Group__1__Impl_in_rule__ParameterizedIdentifier__Group__118163 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ParameterizedIdentifier__Group_1__0_in_rule__ParameterizedIdentifier__Group__1__Impl18190 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ParameterizedIdentifier__Group_1__0__Impl_in_rule__ParameterizedIdentifier__Group_1__018225 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__ParameterizedIdentifier__Group_1__1_in_rule__ParameterizedIdentifier__Group_1__018228 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__ParameterizedIdentifier__Group_1__0__Impl18256 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ParameterizedIdentifier__Group_1__1__Impl_in_rule__ParameterizedIdentifier__Group_1__118287 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__ParameterizedIdentifier__Group_1__2_in_rule__ParameterizedIdentifier__Group_1__118290 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__ParameterizedIdentifier__Group_1__1__Impl18317 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ParameterizedIdentifier__Group_1__2__Impl_in_rule__ParameterizedIdentifier__Group_1__218346 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__ParameterizedIdentifier__Group_1__3_in_rule__ParameterizedIdentifier__Group_1__218349 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__ParameterizedIdentifier__Group_1__2__Impl18377 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ParameterizedIdentifier__Group_1__3__Impl_in_rule__ParameterizedIdentifier__Group_1__318408 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000800L});
-    public static final BitSet FOLLOW_rule__ParameterizedIdentifier__Group_1__4_in_rule__ParameterizedIdentifier__Group_1__318411 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__ParameterizedIdentifier__Group_1__3__Impl18438 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ParameterizedIdentifier__Group_1__4__Impl_in_rule__ParameterizedIdentifier__Group_1__418467 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_75_in_rule__ParameterizedIdentifier__Group_1__4__Impl18495 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ParameterizedString__Group__0__Impl_in_rule__ParameterizedString__Group__018536 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__ParameterizedString__Group__1_in_rule__ParameterizedString__Group__018539 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__ParameterizedString__Group__0__Impl18566 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ParameterizedString__Group__1__Impl_in_rule__ParameterizedString__Group__118595 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ParameterizedString__Group_1__0_in_rule__ParameterizedString__Group__1__Impl18622 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ParameterizedString__Group_1__0__Impl_in_rule__ParameterizedString__Group_1__018657 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__ParameterizedString__Group_1__1_in_rule__ParameterizedString__Group_1__018660 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__ParameterizedString__Group_1__0__Impl18688 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ParameterizedString__Group_1__1__Impl_in_rule__ParameterizedString__Group_1__118719 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__ParameterizedString__Group_1__2_in_rule__ParameterizedString__Group_1__118722 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__ParameterizedString__Group_1__1__Impl18749 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ParameterizedString__Group_1__2__Impl_in_rule__ParameterizedString__Group_1__218778 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__ParameterizedString__Group_1__3_in_rule__ParameterizedString__Group_1__218781 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__ParameterizedString__Group_1__2__Impl18809 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ParameterizedString__Group_1__3__Impl_in_rule__ParameterizedString__Group_1__318840 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000800L});
-    public static final BitSet FOLLOW_rule__ParameterizedString__Group_1__4_in_rule__ParameterizedString__Group_1__318843 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__ParameterizedString__Group_1__3__Impl18870 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ParameterizedString__Group_1__4__Impl_in_rule__ParameterizedString__Group_1__418899 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_75_in_rule__ParameterizedString__Group_1__4__Impl18927 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DottedID__Group__0__Impl_in_rule__DottedID__Group__018968 = new BitSet(new long[]{0x0002000000000000L});
-    public static final BitSet FOLLOW_rule__DottedID__Group__1_in_rule__DottedID__Group__018971 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__DottedID__Group__0__Impl18998 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DottedID__Group__1__Impl_in_rule__DottedID__Group__119027 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DottedID__Group_1__0_in_rule__DottedID__Group__1__Impl19054 = new BitSet(new long[]{0x0002000000000002L});
-    public static final BitSet FOLLOW_rule__DottedID__Group_1__0__Impl_in_rule__DottedID__Group_1__019089 = new BitSet(new long[]{0x00000000000C0020L});
-    public static final BitSet FOLLOW_rule__DottedID__Group_1__1_in_rule__DottedID__Group_1__019092 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_49_in_rule__DottedID__Group_1__0__Impl19120 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DottedID__Group_1__1__Impl_in_rule__DottedID__Group_1__119151 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__DottedID__Group_1__1__Impl19178 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group__0__Impl_in_rule__XAnnotation__Group__019211 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group__1_in_rule__XAnnotation__Group__019214 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group__1__Impl_in_rule__XAnnotation__Group__119272 = new BitSet(new long[]{0x0000000000300020L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group__2_in_rule__XAnnotation__Group__119275 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_68_in_rule__XAnnotation__Group__1__Impl19303 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group__2__Impl_in_rule__XAnnotation__Group__219334 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group__3_in_rule__XAnnotation__Group__219337 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__AnnotationTypeAssignment_2_in_rule__XAnnotation__Group__2__Impl19364 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group__3__Impl_in_rule__XAnnotation__Group__319394 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3__0_in_rule__XAnnotation__Group__3__Impl19421 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3__0__Impl_in_rule__XAnnotation__Group_3__019460 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900C34L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3__1_in_rule__XAnnotation__Group_3__019463 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XAnnotation__Group_3__0__Impl19492 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3__1__Impl_in_rule__XAnnotation__Group_3__119524 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900C34L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3__2_in_rule__XAnnotation__Group_3__119527 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Alternatives_3_1_in_rule__XAnnotation__Group_3__1__Impl19554 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3__2__Impl_in_rule__XAnnotation__Group_3__219585 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_75_in_rule__XAnnotation__Group_3__2__Impl19613 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3_1_0__0__Impl_in_rule__XAnnotation__Group_3_1_0__019650 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3_1_0__1_in_rule__XAnnotation__Group_3_1_0__019653 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__ElementValuePairsAssignment_3_1_0_0_in_rule__XAnnotation__Group_3_1_0__0__Impl19680 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3_1_0__1__Impl_in_rule__XAnnotation__Group_3_1_0__119710 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3_1_0_1__0_in_rule__XAnnotation__Group_3_1_0__1__Impl19737 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3_1_0_1__0__Impl_in_rule__XAnnotation__Group_3_1_0_1__019772 = new BitSet(new long[]{0x0000000000300020L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3_1_0_1__1_in_rule__XAnnotation__Group_3_1_0_1__019775 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__XAnnotation__Group_3_1_0_1__0__Impl19803 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3_1_0_1__1__Impl_in_rule__XAnnotation__Group_3_1_0_1__119834 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_1_in_rule__XAnnotation__Group_3_1_0_1__1__Impl19861 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__Group__0__Impl_in_rule__XAnnotationElementValuePair__Group__019895 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__Group__1_in_rule__XAnnotationElementValuePair__Group__019898 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__Group_0__0_in_rule__XAnnotationElementValuePair__Group__0__Impl19925 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__Group__1__Impl_in_rule__XAnnotationElementValuePair__Group__119955 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__ValueAssignment_1_in_rule__XAnnotationElementValuePair__Group__1__Impl19982 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__Group_0__0__Impl_in_rule__XAnnotationElementValuePair__Group_0__020016 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__Group_0_0__0_in_rule__XAnnotationElementValuePair__Group_0__0__Impl20043 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__Group_0_0__0__Impl_in_rule__XAnnotationElementValuePair__Group_0_0__020075 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__Group_0_0__1_in_rule__XAnnotationElementValuePair__Group_0_0__020078 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__ElementAssignment_0_0_0_in_rule__XAnnotationElementValuePair__Group_0_0__0__Impl20105 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValuePair__Group_0_0__1__Impl_in_rule__XAnnotationElementValuePair__Group_0_0__120135 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_14_in_rule__XAnnotationElementValuePair__Group_0_0__1__Impl20163 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0__020198 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900474L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__1_in_rule__XAnnotationElementValueOrCommaList__Group_0__020201 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0__0_in_rule__XAnnotationElementValueOrCommaList__Group_0__0__Impl20228 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0__120258 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900474L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__2_in_rule__XAnnotationElementValueOrCommaList__Group_0__120261 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1__0_in_rule__XAnnotationElementValueOrCommaList__Group_0__1__Impl20288 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0__220319 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_70_in_rule__XAnnotationElementValueOrCommaList__Group_0__2__Impl20347 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_0__020384 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0_in_rule__XAnnotationElementValueOrCommaList__Group_0_0__0__Impl20411 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__020443 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__020446 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__120504 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000020L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__120507 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_84_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__1__Impl20535 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__220566 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_69_in_rule__XAnnotationElementValueOrCommaList__Group_0_0_0__2__Impl20594 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_1__020631 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1__1_in_rule__XAnnotationElementValueOrCommaList__Group_0_1__020634 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_0_in_rule__XAnnotationElementValueOrCommaList__Group_0_1__0__Impl20661 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_1__120691 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0_in_rule__XAnnotationElementValueOrCommaList__Group_0_1__1__Impl20718 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__020753 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1_in_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__020756 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__0__Impl20784 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__120815 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_1_in_rule__XAnnotationElementValueOrCommaList__Group_0_1_1__1__Impl20842 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1__020876 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1__1_in_rule__XAnnotationElementValueOrCommaList__Group_1__020879 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValueOrCommaList__Group_1__0__Impl20906 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1__120935 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1__0_in_rule__XAnnotationElementValueOrCommaList__Group_1__1__Impl20962 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1_1__020997 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1__1_in_rule__XAnnotationElementValueOrCommaList__Group_1_1__021000 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1_1__121058 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0_in_rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl21087 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0_in_rule__XAnnotationElementValueOrCommaList__Group_1_1__1__Impl21099 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__021136 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1_in_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__021139 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__0__Impl21167 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl_in_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__121198 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_1_in_rule__XAnnotationElementValueOrCommaList__Group_1_1_1__1__Impl21225 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0__0__Impl_in_rule__XAnnotationElementValue__Group_0__021259 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900474L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0__1_in_rule__XAnnotationElementValue__Group_0__021262 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_0__0_in_rule__XAnnotationElementValue__Group_0__0__Impl21289 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0__1__Impl_in_rule__XAnnotationElementValue__Group_0__121319 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900474L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0__2_in_rule__XAnnotationElementValue__Group_0__121322 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_1__0_in_rule__XAnnotationElementValue__Group_0__1__Impl21349 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0__2__Impl_in_rule__XAnnotationElementValue__Group_0__221380 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_70_in_rule__XAnnotationElementValue__Group_0__2__Impl21408 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_0__0__Impl_in_rule__XAnnotationElementValue__Group_0_0__021445 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__0_in_rule__XAnnotationElementValue__Group_0_0__0__Impl21472 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__0__Impl_in_rule__XAnnotationElementValue__Group_0_0_0__021504 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__1_in_rule__XAnnotationElementValue__Group_0_0_0__021507 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__1__Impl_in_rule__XAnnotationElementValue__Group_0_0_0__121565 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000020L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__2_in_rule__XAnnotationElementValue__Group_0_0_0__121568 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_84_in_rule__XAnnotationElementValue__Group_0_0_0__1__Impl21596 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_0_0__2__Impl_in_rule__XAnnotationElementValue__Group_0_0_0__221627 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_69_in_rule__XAnnotationElementValue__Group_0_0_0__2__Impl21655 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_1__0__Impl_in_rule__XAnnotationElementValue__Group_0_1__021692 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_1__1_in_rule__XAnnotationElementValue__Group_0_1__021695 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__ElementsAssignment_0_1_0_in_rule__XAnnotationElementValue__Group_0_1__0__Impl21722 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_1__1__Impl_in_rule__XAnnotationElementValue__Group_0_1__121752 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_1_1__0_in_rule__XAnnotationElementValue__Group_0_1__1__Impl21779 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_1_1__0__Impl_in_rule__XAnnotationElementValue__Group_0_1_1__021814 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_1_1__1_in_rule__XAnnotationElementValue__Group_0_1_1__021817 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__XAnnotationElementValue__Group_0_1_1__0__Impl21845 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0_1_1__1__Impl_in_rule__XAnnotationElementValue__Group_0_1_1__121876 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__ElementsAssignment_0_1_1_1_in_rule__XAnnotationElementValue__Group_0_1_1__1__Impl21903 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_0__0__Impl_in_rule__XAssignment__Group_0__021937 = new BitSet(new long[]{0x003C000000300020L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_0__1_in_rule__XAssignment__Group_0__021940 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_0__1__Impl_in_rule__XAssignment__Group_0__121998 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_0__2_in_rule__XAssignment__Group_0__122001 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__FeatureAssignment_0_1_in_rule__XAssignment__Group_0__1__Impl22028 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_0__2__Impl_in_rule__XAssignment__Group_0__222058 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_0__3_in_rule__XAssignment__Group_0__222061 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpSingleAssign_in_rule__XAssignment__Group_0__2__Impl22088 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_0__3__Impl_in_rule__XAssignment__Group_0__322117 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__ValueAssignment_0_3_in_rule__XAssignment__Group_0__3__Impl22144 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1__0__Impl_in_rule__XAssignment__Group_1__022182 = new BitSet(new long[]{0x0000000307C00000L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1__1_in_rule__XAssignment__Group_1__022185 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXOrExpression_in_rule__XAssignment__Group_1__0__Impl22212 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1__1__Impl_in_rule__XAssignment__Group_1__122241 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1__0_in_rule__XAssignment__Group_1__1__Impl22268 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1__0__Impl_in_rule__XAssignment__Group_1_1__022303 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1__1_in_rule__XAssignment__Group_1_1__022306 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1_0__0_in_rule__XAssignment__Group_1_1__0__Impl22333 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1__1__Impl_in_rule__XAssignment__Group_1_1__122363 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__RightOperandAssignment_1_1_1_in_rule__XAssignment__Group_1_1__1__Impl22390 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1_0__0__Impl_in_rule__XAssignment__Group_1_1_0__022424 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1_0_0__0_in_rule__XAssignment__Group_1_1_0__0__Impl22451 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1_0_0__0__Impl_in_rule__XAssignment__Group_1_1_0_0__022483 = new BitSet(new long[]{0x0000000307C00000L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1_0_0__1_in_rule__XAssignment__Group_1_1_0_0__022486 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1_0_0__1__Impl_in_rule__XAssignment__Group_1_1_0_0__122544 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__FeatureAssignment_1_1_0_0_1_in_rule__XAssignment__Group_1_1_0_0__1__Impl22571 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_5__0__Impl_in_rule__OpMultiAssign__Group_5__022605 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_5__1_in_rule__OpMultiAssign__Group_5__022608 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_rule__OpMultiAssign__Group_5__0__Impl22636 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_5__1__Impl_in_rule__OpMultiAssign__Group_5__122667 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_5__2_in_rule__OpMultiAssign__Group_5__122670 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_rule__OpMultiAssign__Group_5__1__Impl22698 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_5__2__Impl_in_rule__OpMultiAssign__Group_5__222729 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_14_in_rule__OpMultiAssign__Group_5__2__Impl22757 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_6__0__Impl_in_rule__OpMultiAssign__Group_6__022794 = new BitSet(new long[]{0x0000000180000000L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_6__1_in_rule__OpMultiAssign__Group_6__022797 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_rule__OpMultiAssign__Group_6__0__Impl22825 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_6__1__Impl_in_rule__OpMultiAssign__Group_6__122856 = new BitSet(new long[]{0x0000000180000000L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_6__2_in_rule__OpMultiAssign__Group_6__122859 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_rule__OpMultiAssign__Group_6__1__Impl22888 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpMultiAssign__Group_6__2__Impl_in_rule__OpMultiAssign__Group_6__222921 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_rule__OpMultiAssign__Group_6__2__Impl22949 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group__0__Impl_in_rule__XOrExpression__Group__022986 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group__1_in_rule__XOrExpression__Group__022989 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAndExpression_in_rule__XOrExpression__Group__0__Impl23016 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group__1__Impl_in_rule__XOrExpression__Group__123045 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1__0_in_rule__XOrExpression__Group__1__Impl23072 = new BitSet(new long[]{0x0000000000008002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1__0__Impl_in_rule__XOrExpression__Group_1__023107 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1__1_in_rule__XOrExpression__Group_1__023110 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1_0__0_in_rule__XOrExpression__Group_1__0__Impl23137 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1__1__Impl_in_rule__XOrExpression__Group_1__123167 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__RightOperandAssignment_1_1_in_rule__XOrExpression__Group_1__1__Impl23194 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1_0__0__Impl_in_rule__XOrExpression__Group_1_0__023228 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1_0_0__0_in_rule__XOrExpression__Group_1_0__0__Impl23255 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1_0_0__0__Impl_in_rule__XOrExpression__Group_1_0_0__023287 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1_0_0__1_in_rule__XOrExpression__Group_1_0_0__023290 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1_0_0__1__Impl_in_rule__XOrExpression__Group_1_0_0__123348 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__FeatureAssignment_1_0_0_1_in_rule__XOrExpression__Group_1_0_0__1__Impl23375 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group__0__Impl_in_rule__XAndExpression__Group__023409 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group__1_in_rule__XAndExpression__Group__023412 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXEqualityExpression_in_rule__XAndExpression__Group__0__Impl23439 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group__1__Impl_in_rule__XAndExpression__Group__123468 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1__0_in_rule__XAndExpression__Group__1__Impl23495 = new BitSet(new long[]{0x0000000000010002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1__0__Impl_in_rule__XAndExpression__Group_1__023530 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1__1_in_rule__XAndExpression__Group_1__023533 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1_0__0_in_rule__XAndExpression__Group_1__0__Impl23560 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1__1__Impl_in_rule__XAndExpression__Group_1__123590 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__RightOperandAssignment_1_1_in_rule__XAndExpression__Group_1__1__Impl23617 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1_0__0__Impl_in_rule__XAndExpression__Group_1_0__023651 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1_0_0__0_in_rule__XAndExpression__Group_1_0__0__Impl23678 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1_0_0__0__Impl_in_rule__XAndExpression__Group_1_0_0__023710 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1_0_0__1_in_rule__XAndExpression__Group_1_0_0__023713 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1_0_0__1__Impl_in_rule__XAndExpression__Group_1_0_0__123771 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__FeatureAssignment_1_0_0_1_in_rule__XAndExpression__Group_1_0_0__1__Impl23798 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group__0__Impl_in_rule__XEqualityExpression__Group__023832 = new BitSet(new long[]{0x0000000078000000L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group__1_in_rule__XEqualityExpression__Group__023835 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXRelationalExpression_in_rule__XEqualityExpression__Group__0__Impl23862 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group__1__Impl_in_rule__XEqualityExpression__Group__123891 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1__0_in_rule__XEqualityExpression__Group__1__Impl23918 = new BitSet(new long[]{0x0000000078000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1__0__Impl_in_rule__XEqualityExpression__Group_1__023953 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1__1_in_rule__XEqualityExpression__Group_1__023956 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1_0__0_in_rule__XEqualityExpression__Group_1__0__Impl23983 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1__1__Impl_in_rule__XEqualityExpression__Group_1__124013 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__RightOperandAssignment_1_1_in_rule__XEqualityExpression__Group_1__1__Impl24040 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1_0__0__Impl_in_rule__XEqualityExpression__Group_1_0__024074 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1_0_0__0_in_rule__XEqualityExpression__Group_1_0__0__Impl24101 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1_0_0__0__Impl_in_rule__XEqualityExpression__Group_1_0_0__024133 = new BitSet(new long[]{0x0000000078000000L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1_0_0__1_in_rule__XEqualityExpression__Group_1_0_0__024136 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1_0_0__1__Impl_in_rule__XEqualityExpression__Group_1_0_0__124194 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__FeatureAssignment_1_0_0_1_in_rule__XEqualityExpression__Group_1_0_0__1__Impl24221 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group__0__Impl_in_rule__XRelationalExpression__Group__024255 = new BitSet(new long[]{0x0000000380000000L,0x0000000000200000L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group__1_in_rule__XRelationalExpression__Group__024258 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXOtherOperatorExpression_in_rule__XRelationalExpression__Group__0__Impl24285 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group__1__Impl_in_rule__XRelationalExpression__Group__124314 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Alternatives_1_in_rule__XRelationalExpression__Group__1__Impl24341 = new BitSet(new long[]{0x0000000380000002L,0x0000000000200000L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0__0__Impl_in_rule__XRelationalExpression__Group_1_0__024376 = new BitSet(new long[]{0x0000002000300020L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0__1_in_rule__XRelationalExpression__Group_1_0__024379 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0_0__0_in_rule__XRelationalExpression__Group_1_0__0__Impl24406 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0__1__Impl_in_rule__XRelationalExpression__Group_1_0__124436 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__TypeAssignment_1_0_1_in_rule__XRelationalExpression__Group_1_0__1__Impl24463 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0_0__0__Impl_in_rule__XRelationalExpression__Group_1_0_0__024497 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0_0_0__0_in_rule__XRelationalExpression__Group_1_0_0__0__Impl24524 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0_0_0__0__Impl_in_rule__XRelationalExpression__Group_1_0_0_0__024556 = new BitSet(new long[]{0x0000000000000000L,0x0000000000200000L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0_0_0__1_in_rule__XRelationalExpression__Group_1_0_0_0__024559 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_0_0_0__1__Impl_in_rule__XRelationalExpression__Group_1_0_0_0__124617 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_85_in_rule__XRelationalExpression__Group_1_0_0_0__1__Impl24645 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1__0__Impl_in_rule__XRelationalExpression__Group_1_1__024680 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1__1_in_rule__XRelationalExpression__Group_1_1__024683 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1_0__0_in_rule__XRelationalExpression__Group_1_1__0__Impl24710 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1__1__Impl_in_rule__XRelationalExpression__Group_1_1__124740 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__RightOperandAssignment_1_1_1_in_rule__XRelationalExpression__Group_1_1__1__Impl24767 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1_0__0__Impl_in_rule__XRelationalExpression__Group_1_1_0__024801 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1_0_0__0_in_rule__XRelationalExpression__Group_1_1_0__0__Impl24828 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1_0_0__0__Impl_in_rule__XRelationalExpression__Group_1_1_0_0__024860 = new BitSet(new long[]{0x0000000380000000L,0x0000000000200000L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1_0_0__1_in_rule__XRelationalExpression__Group_1_1_0_0__024863 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Group_1_1_0_0__1__Impl_in_rule__XRelationalExpression__Group_1_1_0_0__124921 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__FeatureAssignment_1_1_0_0_1_in_rule__XRelationalExpression__Group_1_1_0_0__1__Impl24948 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpCompare__Group_1__0__Impl_in_rule__OpCompare__Group_1__024982 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_rule__OpCompare__Group_1__1_in_rule__OpCompare__Group_1__024985 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_rule__OpCompare__Group_1__0__Impl25013 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpCompare__Group_1__1__Impl_in_rule__OpCompare__Group_1__125044 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_14_in_rule__OpCompare__Group_1__1__Impl25072 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group__0__Impl_in_rule__XOtherOperatorExpression__Group__025107 = new BitSet(new long[]{0x000000FF00000000L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group__1_in_rule__XOtherOperatorExpression__Group__025110 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAdditiveExpression_in_rule__XOtherOperatorExpression__Group__0__Impl25137 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group__1__Impl_in_rule__XOtherOperatorExpression__Group__125166 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1__0_in_rule__XOtherOperatorExpression__Group__1__Impl25193 = new BitSet(new long[]{0x000000FF00000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1__0__Impl_in_rule__XOtherOperatorExpression__Group_1__025228 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1__1_in_rule__XOtherOperatorExpression__Group_1__025231 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1_0__0_in_rule__XOtherOperatorExpression__Group_1__0__Impl25258 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1__1__Impl_in_rule__XOtherOperatorExpression__Group_1__125288 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__RightOperandAssignment_1_1_in_rule__XOtherOperatorExpression__Group_1__1__Impl25315 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1_0__0__Impl_in_rule__XOtherOperatorExpression__Group_1_0__025349 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1_0_0__0_in_rule__XOtherOperatorExpression__Group_1_0__0__Impl25376 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1_0_0__0__Impl_in_rule__XOtherOperatorExpression__Group_1_0_0__025408 = new BitSet(new long[]{0x000000FF00000000L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1_0_0__1_in_rule__XOtherOperatorExpression__Group_1_0_0__025411 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1_0_0__1__Impl_in_rule__XOtherOperatorExpression__Group_1_0_0__125469 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_1_in_rule__XOtherOperatorExpression__Group_1_0_0__1__Impl25496 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_2__0__Impl_in_rule__OpOther__Group_2__025530 = new BitSet(new long[]{0x0000001000000000L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_2__1_in_rule__OpOther__Group_2__025533 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_rule__OpOther__Group_2__0__Impl25561 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_2__1__Impl_in_rule__OpOther__Group_2__125592 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_rule__OpOther__Group_2__1__Impl25620 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_5__0__Impl_in_rule__OpOther__Group_5__025655 = new BitSet(new long[]{0x0000000100000000L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_5__1_in_rule__OpOther__Group_5__025658 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_rule__OpOther__Group_5__0__Impl25686 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_5__1__Impl_in_rule__OpOther__Group_5__125717 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Alternatives_5_1_in_rule__OpOther__Group_5__1__Impl25744 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_5_1_0__0__Impl_in_rule__OpOther__Group_5_1_0__025778 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_5_1_0_0__0_in_rule__OpOther__Group_5_1_0__0__Impl25805 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_5_1_0_0__0__Impl_in_rule__OpOther__Group_5_1_0_0__025837 = new BitSet(new long[]{0x0000000100000000L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_5_1_0_0__1_in_rule__OpOther__Group_5_1_0_0__025840 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_rule__OpOther__Group_5_1_0_0__0__Impl25868 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_5_1_0_0__1__Impl_in_rule__OpOther__Group_5_1_0_0__125899 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_rule__OpOther__Group_5_1_0_0__1__Impl25927 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_6__0__Impl_in_rule__OpOther__Group_6__025962 = new BitSet(new long[]{0x0000002200000000L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_6__1_in_rule__OpOther__Group_6__025965 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_rule__OpOther__Group_6__0__Impl25993 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_6__1__Impl_in_rule__OpOther__Group_6__126024 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Alternatives_6_1_in_rule__OpOther__Group_6__1__Impl26051 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_6_1_0__0__Impl_in_rule__OpOther__Group_6_1_0__026085 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_6_1_0_0__0_in_rule__OpOther__Group_6_1_0__0__Impl26112 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_6_1_0_0__0__Impl_in_rule__OpOther__Group_6_1_0_0__026144 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_6_1_0_0__1_in_rule__OpOther__Group_6_1_0_0__026147 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_rule__OpOther__Group_6_1_0_0__0__Impl26175 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_6_1_0_0__1__Impl_in_rule__OpOther__Group_6_1_0_0__126206 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_rule__OpOther__Group_6_1_0_0__1__Impl26234 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group__0__Impl_in_rule__XAdditiveExpression__Group__026269 = new BitSet(new long[]{0x0000030000000000L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group__1_in_rule__XAdditiveExpression__Group__026272 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXMultiplicativeExpression_in_rule__XAdditiveExpression__Group__0__Impl26299 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group__1__Impl_in_rule__XAdditiveExpression__Group__126328 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1__0_in_rule__XAdditiveExpression__Group__1__Impl26355 = new BitSet(new long[]{0x0000030000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1__0__Impl_in_rule__XAdditiveExpression__Group_1__026390 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1__1_in_rule__XAdditiveExpression__Group_1__026393 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1_0__0_in_rule__XAdditiveExpression__Group_1__0__Impl26420 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1__1__Impl_in_rule__XAdditiveExpression__Group_1__126450 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__RightOperandAssignment_1_1_in_rule__XAdditiveExpression__Group_1__1__Impl26477 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1_0__0__Impl_in_rule__XAdditiveExpression__Group_1_0__026511 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1_0_0__0_in_rule__XAdditiveExpression__Group_1_0__0__Impl26538 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1_0_0__0__Impl_in_rule__XAdditiveExpression__Group_1_0_0__026570 = new BitSet(new long[]{0x0000030000000000L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1_0_0__1_in_rule__XAdditiveExpression__Group_1_0_0__026573 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1_0_0__1__Impl_in_rule__XAdditiveExpression__Group_1_0_0__126631 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__FeatureAssignment_1_0_0_1_in_rule__XAdditiveExpression__Group_1_0_0__1__Impl26658 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group__0__Impl_in_rule__XMultiplicativeExpression__Group__026692 = new BitSet(new long[]{0x00003C0000000000L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group__1_in_rule__XMultiplicativeExpression__Group__026695 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXUnaryOperation_in_rule__XMultiplicativeExpression__Group__0__Impl26722 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group__1__Impl_in_rule__XMultiplicativeExpression__Group__126751 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1__0_in_rule__XMultiplicativeExpression__Group__1__Impl26778 = new BitSet(new long[]{0x00003C0000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1__0__Impl_in_rule__XMultiplicativeExpression__Group_1__026813 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1__1_in_rule__XMultiplicativeExpression__Group_1__026816 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1_0__0_in_rule__XMultiplicativeExpression__Group_1__0__Impl26843 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1__1__Impl_in_rule__XMultiplicativeExpression__Group_1__126873 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__RightOperandAssignment_1_1_in_rule__XMultiplicativeExpression__Group_1__1__Impl26900 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1_0__0__Impl_in_rule__XMultiplicativeExpression__Group_1_0__026934 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1_0_0__0_in_rule__XMultiplicativeExpression__Group_1_0__0__Impl26961 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1_0_0__0__Impl_in_rule__XMultiplicativeExpression__Group_1_0_0__026993 = new BitSet(new long[]{0x00003C0000000000L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1_0_0__1_in_rule__XMultiplicativeExpression__Group_1_0_0__026996 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1_0_0__1__Impl_in_rule__XMultiplicativeExpression__Group_1_0_0__127054 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_1_in_rule__XMultiplicativeExpression__Group_1_0_0__1__Impl27081 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XUnaryOperation__Group_0__0__Impl_in_rule__XUnaryOperation__Group_0__027115 = new BitSet(new long[]{0x0000430000000000L});
-    public static final BitSet FOLLOW_rule__XUnaryOperation__Group_0__1_in_rule__XUnaryOperation__Group_0__027118 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XUnaryOperation__Group_0__1__Impl_in_rule__XUnaryOperation__Group_0__127176 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XUnaryOperation__Group_0__2_in_rule__XUnaryOperation__Group_0__127179 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XUnaryOperation__FeatureAssignment_0_1_in_rule__XUnaryOperation__Group_0__1__Impl27206 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XUnaryOperation__Group_0__2__Impl_in_rule__XUnaryOperation__Group_0__227236 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XUnaryOperation__OperandAssignment_0_2_in_rule__XUnaryOperation__Group_0__2__Impl27263 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group__0__Impl_in_rule__XCastedExpression__Group__027299 = new BitSet(new long[]{0x0000000000000000L,0x0000000000400000L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group__1_in_rule__XCastedExpression__Group__027302 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXPostfixOperation_in_rule__XCastedExpression__Group__0__Impl27329 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group__1__Impl_in_rule__XCastedExpression__Group__127358 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1__0_in_rule__XCastedExpression__Group__1__Impl27385 = new BitSet(new long[]{0x0000000000000002L,0x0000000000400000L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1__0__Impl_in_rule__XCastedExpression__Group_1__027420 = new BitSet(new long[]{0x0000002000300020L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1__1_in_rule__XCastedExpression__Group_1__027423 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1_0__0_in_rule__XCastedExpression__Group_1__0__Impl27450 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1__1__Impl_in_rule__XCastedExpression__Group_1__127480 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__TypeAssignment_1_1_in_rule__XCastedExpression__Group_1__1__Impl27507 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1_0__0__Impl_in_rule__XCastedExpression__Group_1_0__027541 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1_0_0__0_in_rule__XCastedExpression__Group_1_0__0__Impl27568 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1_0_0__0__Impl_in_rule__XCastedExpression__Group_1_0_0__027600 = new BitSet(new long[]{0x0000000000000000L,0x0000000000400000L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1_0_0__1_in_rule__XCastedExpression__Group_1_0_0__027603 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1_0_0__1__Impl_in_rule__XCastedExpression__Group_1_0_0__127661 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_86_in_rule__XCastedExpression__Group_1_0_0__1__Impl27689 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group__0__Impl_in_rule__XPostfixOperation__Group__027724 = new BitSet(new long[]{0x0001800000000000L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group__1_in_rule__XPostfixOperation__Group__027727 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXMemberFeatureCall_in_rule__XPostfixOperation__Group__0__Impl27754 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group__1__Impl_in_rule__XPostfixOperation__Group__127783 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group_1__0_in_rule__XPostfixOperation__Group__1__Impl27810 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group_1__0__Impl_in_rule__XPostfixOperation__Group_1__027845 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group_1_0__0_in_rule__XPostfixOperation__Group_1__0__Impl27872 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group_1_0__0__Impl_in_rule__XPostfixOperation__Group_1_0__027904 = new BitSet(new long[]{0x0001800000000000L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group_1_0__1_in_rule__XPostfixOperation__Group_1_0__027907 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group_1_0__1__Impl_in_rule__XPostfixOperation__Group_1_0__127965 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__FeatureAssignment_1_0_1_in_rule__XPostfixOperation__Group_1_0__1__Impl27992 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group__0__Impl_in_rule__XMemberFeatureCall__Group__028026 = new BitSet(new long[]{0x0002000000000000L,0x0006000000000000L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group__1_in_rule__XMemberFeatureCall__Group__028029 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXPrimaryExpression_in_rule__XMemberFeatureCall__Group__0__Impl28056 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group__1__Impl_in_rule__XMemberFeatureCall__Group__128085 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Alternatives_1_in_rule__XMemberFeatureCall__Group__1__Impl28112 = new BitSet(new long[]{0x0002000000000002L,0x0006000000000000L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_0__028147 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0__1_in_rule__XMemberFeatureCall__Group_1_0__028150 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0__0_in_rule__XMemberFeatureCall__Group_1_0__0__Impl28177 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0__1__Impl_in_rule__XMemberFeatureCall__Group_1_0__128207 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__ValueAssignment_1_0_1_in_rule__XMemberFeatureCall__Group_1_0__1__Impl28234 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_0_0__028268 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__0_in_rule__XMemberFeatureCall__Group_1_0_0__0__Impl28295 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_0_0_0__028327 = new BitSet(new long[]{0x0002000000000000L,0x0002000000000000L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__1_in_rule__XMemberFeatureCall__Group_1_0_0_0__028330 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl_in_rule__XMemberFeatureCall__Group_1_0_0_0__128388 = new BitSet(new long[]{0x003C000000300020L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__2_in_rule__XMemberFeatureCall__Group_1_0_0_0__128391 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Alternatives_1_0_0_0_1_in_rule__XMemberFeatureCall__Group_1_0_0_0__1__Impl28418 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl_in_rule__XMemberFeatureCall__Group_1_0_0_0__228448 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__3_in_rule__XMemberFeatureCall__Group_1_0_0_0__228451 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_2_in_rule__XMemberFeatureCall__Group_1_0_0_0__2__Impl28478 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl_in_rule__XMemberFeatureCall__Group_1_0_0_0__328508 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpSingleAssign_in_rule__XMemberFeatureCall__Group_1_0_0_0__3__Impl28535 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__0__Impl_in_rule__XMemberFeatureCall__Group_1_1__028572 = new BitSet(new long[]{0x007C000200300020L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__1_in_rule__XMemberFeatureCall__Group_1_1__028575 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_0__0_in_rule__XMemberFeatureCall__Group_1_1__0__Impl28602 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__1__Impl_in_rule__XMemberFeatureCall__Group_1_1__128632 = new BitSet(new long[]{0x007C000200300020L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__2_in_rule__XMemberFeatureCall__Group_1_1__128635 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__0_in_rule__XMemberFeatureCall__Group_1_1__1__Impl28662 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__2__Impl_in_rule__XMemberFeatureCall__Group_1_1__228693 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000420L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__3_in_rule__XMemberFeatureCall__Group_1_1__228696 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__FeatureAssignment_1_1_2_in_rule__XMemberFeatureCall__Group_1_1__2__Impl28723 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__3__Impl_in_rule__XMemberFeatureCall__Group_1_1__328753 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000420L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__4_in_rule__XMemberFeatureCall__Group_1_1__328756 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__0_in_rule__XMemberFeatureCall__Group_1_1__3__Impl28783 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1__4__Impl_in_rule__XMemberFeatureCall__Group_1_1__428814 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4_in_rule__XMemberFeatureCall__Group_1_1__4__Impl28841 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_0__028882 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_0_0__0_in_rule__XMemberFeatureCall__Group_1_1_0__0__Impl28909 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_0_0__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_0_0__028941 = new BitSet(new long[]{0x0002000000000000L,0x0006000000000000L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_0_0__1_in_rule__XMemberFeatureCall__Group_1_1_0_0__028944 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_0_0__129002 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Alternatives_1_1_0_0_1_in_rule__XMemberFeatureCall__Group_1_1_0_0__1__Impl29029 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_1__029063 = new BitSet(new long[]{0x0000002000300020L,0x0000004000000400L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__1_in_rule__XMemberFeatureCall__Group_1_1_1__029066 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_rule__XMemberFeatureCall__Group_1_1_1__0__Impl29094 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_1__129125 = new BitSet(new long[]{0x0000000100000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__2_in_rule__XMemberFeatureCall__Group_1_1_1__129128 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_1_in_rule__XMemberFeatureCall__Group_1_1_1__1__Impl29155 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__2__Impl_in_rule__XMemberFeatureCall__Group_1_1_1__229185 = new BitSet(new long[]{0x0000000100000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__3_in_rule__XMemberFeatureCall__Group_1_1_1__229188 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1_2__0_in_rule__XMemberFeatureCall__Group_1_1_1__2__Impl29215 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1__3__Impl_in_rule__XMemberFeatureCall__Group_1_1_1__329246 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_rule__XMemberFeatureCall__Group_1_1_1__3__Impl29274 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_1_2__029313 = new BitSet(new long[]{0x0000002000300020L,0x0000004000000400L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1_2__1_in_rule__XMemberFeatureCall__Group_1_1_1_2__029316 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__XMemberFeatureCall__Group_1_1_1_2__0__Impl29344 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_1_2__129375 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_1_in_rule__XMemberFeatureCall__Group_1_1_1_2__1__Impl29402 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_3__029436 = new BitSet(new long[]{0x40FC4322003001F0L,0x00280017FA900C34L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__1_in_rule__XMemberFeatureCall__Group_1_1_3__029439 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_0_in_rule__XMemberFeatureCall__Group_1_1_3__0__Impl29466 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_3__129496 = new BitSet(new long[]{0x40FC4322003001F0L,0x00280017FA900C34L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__2_in_rule__XMemberFeatureCall__Group_1_1_3__129499 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Alternatives_1_1_3_1_in_rule__XMemberFeatureCall__Group_1_1_3__1__Impl29526 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__2__Impl_in_rule__XMemberFeatureCall__Group_1_1_3__229557 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_75_in_rule__XMemberFeatureCall__Group_1_1_3__2__Impl29585 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__029622 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1__1_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__029625 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_0_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__0__Impl29652 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__129682 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0_in_rule__XMemberFeatureCall__Group_1_1_3_1_1__1__Impl29709 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__029744 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__029747 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__0__Impl29775 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__129806 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_1_in_rule__XMemberFeatureCall__Group_1_1_3_1_1_1__1__Impl29833 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group__0__Impl_in_rule__XSetLiteral__Group__029867 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group__1_in_rule__XSetLiteral__Group__029870 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group__1__Impl_in_rule__XSetLiteral__Group__129928 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group__2_in_rule__XSetLiteral__Group__129931 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_84_in_rule__XSetLiteral__Group__1__Impl29959 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group__2__Impl_in_rule__XSetLiteral__Group__229990 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA90043CL});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group__3_in_rule__XSetLiteral__Group__229993 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_66_in_rule__XSetLiteral__Group__2__Impl30021 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group__3__Impl_in_rule__XSetLiteral__Group__330052 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA90043CL});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group__4_in_rule__XSetLiteral__Group__330055 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group_3__0_in_rule__XSetLiteral__Group__3__Impl30082 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group__4__Impl_in_rule__XSetLiteral__Group__430113 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_67_in_rule__XSetLiteral__Group__4__Impl30141 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group_3__0__Impl_in_rule__XSetLiteral__Group_3__030182 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group_3__1_in_rule__XSetLiteral__Group_3__030185 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__ElementsAssignment_3_0_in_rule__XSetLiteral__Group_3__0__Impl30212 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group_3__1__Impl_in_rule__XSetLiteral__Group_3__130242 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group_3_1__0_in_rule__XSetLiteral__Group_3__1__Impl30269 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group_3_1__0__Impl_in_rule__XSetLiteral__Group_3_1__030304 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group_3_1__1_in_rule__XSetLiteral__Group_3_1__030307 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__XSetLiteral__Group_3_1__0__Impl30335 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__Group_3_1__1__Impl_in_rule__XSetLiteral__Group_3_1__130366 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSetLiteral__ElementsAssignment_3_1_1_in_rule__XSetLiteral__Group_3_1__1__Impl30393 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group__0__Impl_in_rule__XListLiteral__Group__030427 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group__1_in_rule__XListLiteral__Group__030430 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group__1__Impl_in_rule__XListLiteral__Group__130488 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000020L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group__2_in_rule__XListLiteral__Group__130491 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_84_in_rule__XListLiteral__Group__1__Impl30519 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group__2__Impl_in_rule__XListLiteral__Group__230550 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900474L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group__3_in_rule__XListLiteral__Group__230553 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_69_in_rule__XListLiteral__Group__2__Impl30581 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group__3__Impl_in_rule__XListLiteral__Group__330612 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900474L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group__4_in_rule__XListLiteral__Group__330615 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group_3__0_in_rule__XListLiteral__Group__3__Impl30642 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group__4__Impl_in_rule__XListLiteral__Group__430673 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_70_in_rule__XListLiteral__Group__4__Impl30701 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group_3__0__Impl_in_rule__XListLiteral__Group_3__030742 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group_3__1_in_rule__XListLiteral__Group_3__030745 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__ElementsAssignment_3_0_in_rule__XListLiteral__Group_3__0__Impl30772 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group_3__1__Impl_in_rule__XListLiteral__Group_3__130802 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group_3_1__0_in_rule__XListLiteral__Group_3__1__Impl30829 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group_3_1__0__Impl_in_rule__XListLiteral__Group_3_1__030864 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group_3_1__1_in_rule__XListLiteral__Group_3_1__030867 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__XListLiteral__Group_3_1__0__Impl30895 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__Group_3_1__1__Impl_in_rule__XListLiteral__Group_3_1__130926 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XListLiteral__ElementsAssignment_3_1_1_in_rule__XListLiteral__Group_3_1__1__Impl30953 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group__0__Impl_in_rule__XClosure__Group__030987 = new BitSet(new long[]{0x40FC4322003801F0L,0x00380017FA900434L});
-    public static final BitSet FOLLOW_rule__XClosure__Group__1_in_rule__XClosure__Group__030990 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_0__0_in_rule__XClosure__Group__0__Impl31017 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group__1__Impl_in_rule__XClosure__Group__131047 = new BitSet(new long[]{0x40FC4322003801F0L,0x00380017FA900434L});
-    public static final BitSet FOLLOW_rule__XClosure__Group__2_in_rule__XClosure__Group__131050 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1__0_in_rule__XClosure__Group__1__Impl31077 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group__2__Impl_in_rule__XClosure__Group__231108 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__XClosure__Group__3_in_rule__XClosure__Group__231111 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__ExpressionAssignment_2_in_rule__XClosure__Group__2__Impl31138 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group__3__Impl_in_rule__XClosure__Group__331168 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_70_in_rule__XClosure__Group__3__Impl31196 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_0__0__Impl_in_rule__XClosure__Group_0__031235 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_0_0__0_in_rule__XClosure__Group_0__0__Impl31262 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_0_0__0__Impl_in_rule__XClosure__Group_0_0__031294 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000020L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_0_0__1_in_rule__XClosure__Group_0_0__031297 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_0_0__1__Impl_in_rule__XClosure__Group_0_0__131355 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_69_in_rule__XClosure__Group_0_0__1__Impl31383 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1__0__Impl_in_rule__XClosure__Group_1__031418 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0__0_in_rule__XClosure__Group_1__0__Impl31445 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0__0__Impl_in_rule__XClosure__Group_1_0__031477 = new BitSet(new long[]{0x0000002000300020L,0x0008000000000400L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0__1_in_rule__XClosure__Group_1_0__031480 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0_0__0_in_rule__XClosure__Group_1_0__0__Impl31507 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0__1__Impl_in_rule__XClosure__Group_1_0__131538 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__ExplicitSyntaxAssignment_1_0_1_in_rule__XClosure__Group_1_0__1__Impl31565 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0_0__0__Impl_in_rule__XClosure__Group_1_0_0__031599 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0_0__1_in_rule__XClosure__Group_1_0_0__031602 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_0_in_rule__XClosure__Group_1_0_0__0__Impl31629 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0_0__1__Impl_in_rule__XClosure__Group_1_0_0__131659 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0_0_1__0_in_rule__XClosure__Group_1_0_0__1__Impl31686 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0_0_1__0__Impl_in_rule__XClosure__Group_1_0_0_1__031721 = new BitSet(new long[]{0x0000002000300020L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0_0_1__1_in_rule__XClosure__Group_1_0_0_1__031724 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__XClosure__Group_1_0_0_1__0__Impl31752 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1_0_0_1__1__Impl_in_rule__XClosure__Group_1_0_0_1__131783 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_1_in_rule__XClosure__Group_1_0_0_1__1__Impl31810 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XExpressionInClosure__Group__0__Impl_in_rule__XExpressionInClosure__Group__031844 = new BitSet(new long[]{0x40FC4322003801F0L,0x00380017FA900434L});
-    public static final BitSet FOLLOW_rule__XExpressionInClosure__Group__1_in_rule__XExpressionInClosure__Group__031847 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XExpressionInClosure__Group__1__Impl_in_rule__XExpressionInClosure__Group__131905 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XExpressionInClosure__Group_1__0_in_rule__XExpressionInClosure__Group__1__Impl31932 = new BitSet(new long[]{0x40FC4302003801F2L,0x00300017FA900434L});
-    public static final BitSet FOLLOW_rule__XExpressionInClosure__Group_1__0__Impl_in_rule__XExpressionInClosure__Group_1__031967 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XExpressionInClosure__Group_1__1_in_rule__XExpressionInClosure__Group_1__031970 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XExpressionInClosure__ExpressionsAssignment_1_0_in_rule__XExpressionInClosure__Group_1__0__Impl31997 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XExpressionInClosure__Group_1__1__Impl_in_rule__XExpressionInClosure__Group_1__132027 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_65_in_rule__XExpressionInClosure__Group_1__1__Impl32056 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group__0__Impl_in_rule__XShortClosure__Group__032093 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group__1_in_rule__XShortClosure__Group__032096 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0__0_in_rule__XShortClosure__Group__0__Impl32123 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group__1__Impl_in_rule__XShortClosure__Group__132153 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__ExpressionAssignment_1_in_rule__XShortClosure__Group__1__Impl32180 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0__0__Impl_in_rule__XShortClosure__Group_0__032214 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0__0_in_rule__XShortClosure__Group_0__0__Impl32241 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0__0__Impl_in_rule__XShortClosure__Group_0_0__032273 = new BitSet(new long[]{0x0000002000300020L,0x0008000000000400L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0__1_in_rule__XShortClosure__Group_0_0__032276 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0__1__Impl_in_rule__XShortClosure__Group_0_0__132334 = new BitSet(new long[]{0x0000002000300020L,0x0008000000000400L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0__2_in_rule__XShortClosure__Group_0_0__132337 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0_1__0_in_rule__XShortClosure__Group_0_0__1__Impl32364 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0__2__Impl_in_rule__XShortClosure__Group_0_0__232395 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__ExplicitSyntaxAssignment_0_0_2_in_rule__XShortClosure__Group_0_0__2__Impl32422 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0_1__0__Impl_in_rule__XShortClosure__Group_0_0_1__032458 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0_1__1_in_rule__XShortClosure__Group_0_0_1__032461 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_0_in_rule__XShortClosure__Group_0_0_1__0__Impl32488 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0_1__1__Impl_in_rule__XShortClosure__Group_0_0_1__132518 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0_1_1__0_in_rule__XShortClosure__Group_0_0_1__1__Impl32545 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0_1_1__0__Impl_in_rule__XShortClosure__Group_0_0_1_1__032580 = new BitSet(new long[]{0x0000002000300020L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0_1_1__1_in_rule__XShortClosure__Group_0_0_1_1__032583 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__XShortClosure__Group_0_0_1_1__0__Impl32611 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__Group_0_0_1_1__1__Impl_in_rule__XShortClosure__Group_0_0_1_1__132642 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_1_in_rule__XShortClosure__Group_0_0_1_1__1__Impl32669 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XParenthesizedExpression__Group__0__Impl_in_rule__XParenthesizedExpression__Group__032703 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XParenthesizedExpression__Group__1_in_rule__XParenthesizedExpression__Group__032706 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XParenthesizedExpression__Group__0__Impl32734 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XParenthesizedExpression__Group__1__Impl_in_rule__XParenthesizedExpression__Group__132765 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000800L});
-    public static final BitSet FOLLOW_rule__XParenthesizedExpression__Group__2_in_rule__XParenthesizedExpression__Group__132768 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XParenthesizedExpression__Group__1__Impl32795 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XParenthesizedExpression__Group__2__Impl_in_rule__XParenthesizedExpression__Group__232824 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_75_in_rule__XParenthesizedExpression__Group__2__Impl32852 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__0__Impl_in_rule__XIfExpression__Group__032889 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__1_in_rule__XIfExpression__Group__032892 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__1__Impl_in_rule__XIfExpression__Group__132950 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__2_in_rule__XIfExpression__Group__132953 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_87_in_rule__XIfExpression__Group__1__Impl32981 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__2__Impl_in_rule__XIfExpression__Group__233012 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__3_in_rule__XIfExpression__Group__233015 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XIfExpression__Group__2__Impl33043 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__3__Impl_in_rule__XIfExpression__Group__333074 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000800L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__4_in_rule__XIfExpression__Group__333077 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__IfAssignment_3_in_rule__XIfExpression__Group__3__Impl33104 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__4__Impl_in_rule__XIfExpression__Group__433134 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__5_in_rule__XIfExpression__Group__433137 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_75_in_rule__XIfExpression__Group__4__Impl33165 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__5__Impl_in_rule__XIfExpression__Group__533196 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__6_in_rule__XIfExpression__Group__533199 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__ThenAssignment_5_in_rule__XIfExpression__Group__5__Impl33226 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group__6__Impl_in_rule__XIfExpression__Group__633256 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group_6__0_in_rule__XIfExpression__Group__6__Impl33283 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group_6__0__Impl_in_rule__XIfExpression__Group_6__033328 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group_6__1_in_rule__XIfExpression__Group_6__033331 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_88_in_rule__XIfExpression__Group_6__0__Impl33360 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group_6__1__Impl_in_rule__XIfExpression__Group_6__133392 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__ElseAssignment_6_1_in_rule__XIfExpression__Group_6__1__Impl33419 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__0__Impl_in_rule__XSwitchExpression__Group__033453 = new BitSet(new long[]{0x0000000000000000L,0x0000000002000000L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__1_in_rule__XSwitchExpression__Group__033456 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__1__Impl_in_rule__XSwitchExpression__Group__133514 = new BitSet(new long[]{0x40FC4322003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__2_in_rule__XSwitchExpression__Group__133517 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_89_in_rule__XSwitchExpression__Group__1__Impl33545 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__2__Impl_in_rule__XSwitchExpression__Group__233576 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__3_in_rule__XSwitchExpression__Group__233579 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Alternatives_2_in_rule__XSwitchExpression__Group__2__Impl33606 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__3__Impl_in_rule__XSwitchExpression__Group__333636 = new BitSet(new long[]{0x0000002000340020L,0x0000000004000588L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__4_in_rule__XSwitchExpression__Group__333639 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_66_in_rule__XSwitchExpression__Group__3__Impl33667 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__4__Impl_in_rule__XSwitchExpression__Group__433698 = new BitSet(new long[]{0x0000002000340020L,0x0000000004000588L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__5_in_rule__XSwitchExpression__Group__433701 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__CasesAssignment_4_in_rule__XSwitchExpression__Group__4__Impl33728 = new BitSet(new long[]{0x0000002000300022L,0x0000000004000580L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__5__Impl_in_rule__XSwitchExpression__Group__533759 = new BitSet(new long[]{0x0000002000340020L,0x0000000004000588L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__6_in_rule__XSwitchExpression__Group__533762 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_5__0_in_rule__XSwitchExpression__Group__5__Impl33789 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group__6__Impl_in_rule__XSwitchExpression__Group__633820 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_67_in_rule__XSwitchExpression__Group__6__Impl33848 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0__0__Impl_in_rule__XSwitchExpression__Group_2_0__033893 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0__1_in_rule__XSwitchExpression__Group_2_0__033896 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0_0__0_in_rule__XSwitchExpression__Group_2_0__0__Impl33923 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0__1__Impl_in_rule__XSwitchExpression__Group_2_0__133953 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000800L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0__2_in_rule__XSwitchExpression__Group_2_0__133956 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__SwitchAssignment_2_0_1_in_rule__XSwitchExpression__Group_2_0__1__Impl33983 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0__2__Impl_in_rule__XSwitchExpression__Group_2_0__234013 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_75_in_rule__XSwitchExpression__Group_2_0__2__Impl34041 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0_0__0__Impl_in_rule__XSwitchExpression__Group_2_0_0__034078 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__0_in_rule__XSwitchExpression__Group_2_0_0__0__Impl34105 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__0__Impl_in_rule__XSwitchExpression__Group_2_0_0_0__034137 = new BitSet(new long[]{0x0000002000300020L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__1_in_rule__XSwitchExpression__Group_2_0_0_0__034140 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XSwitchExpression__Group_2_0_0_0__0__Impl34168 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__1__Impl_in_rule__XSwitchExpression__Group_2_0_0_0__134199 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__2_in_rule__XSwitchExpression__Group_2_0_0_0__134202 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_1_in_rule__XSwitchExpression__Group_2_0_0_0__1__Impl34229 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0_0_0__2__Impl_in_rule__XSwitchExpression__Group_2_0_0_0__234259 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__XSwitchExpression__Group_2_0_0_0__2__Impl34287 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1__0__Impl_in_rule__XSwitchExpression__Group_2_1__034324 = new BitSet(new long[]{0x40FC4322003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1__1_in_rule__XSwitchExpression__Group_2_1__034327 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1_0__0_in_rule__XSwitchExpression__Group_2_1__0__Impl34354 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1__1__Impl_in_rule__XSwitchExpression__Group_2_1__134385 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__SwitchAssignment_2_1_1_in_rule__XSwitchExpression__Group_2_1__1__Impl34412 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1_0__0__Impl_in_rule__XSwitchExpression__Group_2_1_0__034446 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1_0_0__0_in_rule__XSwitchExpression__Group_2_1_0__0__Impl34473 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1_0_0__0__Impl_in_rule__XSwitchExpression__Group_2_1_0_0__034505 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1_0_0__1_in_rule__XSwitchExpression__Group_2_1_0_0__034508 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_0_in_rule__XSwitchExpression__Group_2_1_0_0__0__Impl34535 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1_0_0__1__Impl_in_rule__XSwitchExpression__Group_2_1_0_0__134565 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__XSwitchExpression__Group_2_1_0_0__1__Impl34593 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_5__0__Impl_in_rule__XSwitchExpression__Group_5__034628 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_5__1_in_rule__XSwitchExpression__Group_5__034631 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_18_in_rule__XSwitchExpression__Group_5__0__Impl34659 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_5__1__Impl_in_rule__XSwitchExpression__Group_5__134690 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_5__2_in_rule__XSwitchExpression__Group_5__134693 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__XSwitchExpression__Group_5__1__Impl34721 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_5__2__Impl_in_rule__XSwitchExpression__Group_5__234752 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__DefaultAssignment_5_2_in_rule__XSwitchExpression__Group_5__2__Impl34779 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group__0__Impl_in_rule__XCasePart__Group__034815 = new BitSet(new long[]{0x0000002000300020L,0x0000000004000580L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group__1_in_rule__XCasePart__Group__034818 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group__1__Impl_in_rule__XCasePart__Group__134876 = new BitSet(new long[]{0x0000002000300020L,0x0000000004000580L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group__2_in_rule__XCasePart__Group__134879 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__TypeGuardAssignment_1_in_rule__XCasePart__Group__1__Impl34906 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group__2__Impl_in_rule__XCasePart__Group__234937 = new BitSet(new long[]{0x0000002000300020L,0x0000000004000580L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group__3_in_rule__XCasePart__Group__234940 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group_2__0_in_rule__XCasePart__Group__2__Impl34967 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group__3__Impl_in_rule__XCasePart__Group__334998 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Alternatives_3_in_rule__XCasePart__Group__3__Impl35025 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group_2__0__Impl_in_rule__XCasePart__Group_2__035063 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group_2__1_in_rule__XCasePart__Group_2__035066 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_90_in_rule__XCasePart__Group_2__0__Impl35094 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group_2__1__Impl_in_rule__XCasePart__Group_2__135125 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__CaseAssignment_2_1_in_rule__XCasePart__Group_2__1__Impl35152 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group_3_0__0__Impl_in_rule__XCasePart__Group_3_0__035186 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group_3_0__1_in_rule__XCasePart__Group_3_0__035189 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__XCasePart__Group_3_0__0__Impl35217 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__Group_3_0__1__Impl_in_rule__XCasePart__Group_3_0__135248 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCasePart__ThenAssignment_3_0_1_in_rule__XCasePart__Group_3_0__1__Impl35275 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group__0__Impl_in_rule__XForLoopExpression__Group__035309 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group__1_in_rule__XForLoopExpression__Group__035312 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0__0_in_rule__XForLoopExpression__Group__0__Impl35339 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group__1__Impl_in_rule__XForLoopExpression__Group__135369 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000800L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group__2_in_rule__XForLoopExpression__Group__135372 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__ForExpressionAssignment_1_in_rule__XForLoopExpression__Group__1__Impl35399 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group__2__Impl_in_rule__XForLoopExpression__Group__235429 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group__3_in_rule__XForLoopExpression__Group__235432 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_75_in_rule__XForLoopExpression__Group__2__Impl35460 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group__3__Impl_in_rule__XForLoopExpression__Group__335491 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__EachExpressionAssignment_3_in_rule__XForLoopExpression__Group__3__Impl35518 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0__0__Impl_in_rule__XForLoopExpression__Group_0__035556 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__0_in_rule__XForLoopExpression__Group_0__0__Impl35583 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__0__Impl_in_rule__XForLoopExpression__Group_0_0__035615 = new BitSet(new long[]{0x4000000000000000L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__1_in_rule__XForLoopExpression__Group_0_0__035618 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__1__Impl_in_rule__XForLoopExpression__Group_0_0__135676 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__2_in_rule__XForLoopExpression__Group_0_0__135679 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_62_in_rule__XForLoopExpression__Group_0_0__1__Impl35707 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__2__Impl_in_rule__XForLoopExpression__Group_0_0__235738 = new BitSet(new long[]{0x0000002000300020L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__3_in_rule__XForLoopExpression__Group_0_0__235741 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XForLoopExpression__Group_0_0__2__Impl35769 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__3__Impl_in_rule__XForLoopExpression__Group_0_0__335800 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__4_in_rule__XForLoopExpression__Group_0_0__335803 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__DeclaredParamAssignment_0_0_3_in_rule__XForLoopExpression__Group_0_0__3__Impl35830 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XForLoopExpression__Group_0_0__4__Impl_in_rule__XForLoopExpression__Group_0_0__435860 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__XForLoopExpression__Group_0_0__4__Impl35888 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__0__Impl_in_rule__XBasicForLoopExpression__Group__035929 = new BitSet(new long[]{0x4000000000000000L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__1_in_rule__XBasicForLoopExpression__Group__035932 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__1__Impl_in_rule__XBasicForLoopExpression__Group__135990 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__2_in_rule__XBasicForLoopExpression__Group__135993 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_62_in_rule__XBasicForLoopExpression__Group__1__Impl36021 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__2__Impl_in_rule__XBasicForLoopExpression__Group__236052 = new BitSet(new long[]{0x40FC4302003801F0L,0x00300017FA900436L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__3_in_rule__XBasicForLoopExpression__Group__236055 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XBasicForLoopExpression__Group__2__Impl36083 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__3__Impl_in_rule__XBasicForLoopExpression__Group__336114 = new BitSet(new long[]{0x40FC4302003801F0L,0x00300017FA900436L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__4_in_rule__XBasicForLoopExpression__Group__336117 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_3__0_in_rule__XBasicForLoopExpression__Group__3__Impl36144 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__4__Impl_in_rule__XBasicForLoopExpression__Group__436175 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900436L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__5_in_rule__XBasicForLoopExpression__Group__436178 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_65_in_rule__XBasicForLoopExpression__Group__4__Impl36206 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__5__Impl_in_rule__XBasicForLoopExpression__Group__536237 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900436L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__6_in_rule__XBasicForLoopExpression__Group__536240 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__ExpressionAssignment_5_in_rule__XBasicForLoopExpression__Group__5__Impl36267 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__6__Impl_in_rule__XBasicForLoopExpression__Group__636298 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900C34L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__7_in_rule__XBasicForLoopExpression__Group__636301 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_65_in_rule__XBasicForLoopExpression__Group__6__Impl36329 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__7__Impl_in_rule__XBasicForLoopExpression__Group__736360 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900C34L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__8_in_rule__XBasicForLoopExpression__Group__736363 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_7__0_in_rule__XBasicForLoopExpression__Group__7__Impl36390 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__8__Impl_in_rule__XBasicForLoopExpression__Group__836421 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__9_in_rule__XBasicForLoopExpression__Group__836424 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_75_in_rule__XBasicForLoopExpression__Group__8__Impl36452 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group__9__Impl_in_rule__XBasicForLoopExpression__Group__936483 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__EachExpressionAssignment_9_in_rule__XBasicForLoopExpression__Group__9__Impl36510 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_3__0__Impl_in_rule__XBasicForLoopExpression__Group_3__036560 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_3__1_in_rule__XBasicForLoopExpression__Group_3__036563 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__InitExpressionsAssignment_3_0_in_rule__XBasicForLoopExpression__Group_3__0__Impl36590 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_3__1__Impl_in_rule__XBasicForLoopExpression__Group_3__136620 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_3_1__0_in_rule__XBasicForLoopExpression__Group_3__1__Impl36647 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_3_1__0__Impl_in_rule__XBasicForLoopExpression__Group_3_1__036682 = new BitSet(new long[]{0x40FC4302003801F0L,0x00300017FA900434L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_3_1__1_in_rule__XBasicForLoopExpression__Group_3_1__036685 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__XBasicForLoopExpression__Group_3_1__0__Impl36713 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_3_1__1__Impl_in_rule__XBasicForLoopExpression__Group_3_1__136744 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_1_in_rule__XBasicForLoopExpression__Group_3_1__1__Impl36771 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_7__0__Impl_in_rule__XBasicForLoopExpression__Group_7__036805 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_7__1_in_rule__XBasicForLoopExpression__Group_7__036808 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_0_in_rule__XBasicForLoopExpression__Group_7__0__Impl36835 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_7__1__Impl_in_rule__XBasicForLoopExpression__Group_7__136865 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_7_1__0_in_rule__XBasicForLoopExpression__Group_7__1__Impl36892 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_7_1__0__Impl_in_rule__XBasicForLoopExpression__Group_7_1__036927 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_7_1__1_in_rule__XBasicForLoopExpression__Group_7_1__036930 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__XBasicForLoopExpression__Group_7_1__0__Impl36958 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__Group_7_1__1__Impl_in_rule__XBasicForLoopExpression__Group_7_1__136989 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_1_in_rule__XBasicForLoopExpression__Group_7_1__1__Impl37016 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__0__Impl_in_rule__XWhileExpression__Group__037050 = new BitSet(new long[]{0x0000000000000000L,0x0000000008000000L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__1_in_rule__XWhileExpression__Group__037053 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__1__Impl_in_rule__XWhileExpression__Group__137111 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__2_in_rule__XWhileExpression__Group__137114 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_91_in_rule__XWhileExpression__Group__1__Impl37142 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__2__Impl_in_rule__XWhileExpression__Group__237173 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__3_in_rule__XWhileExpression__Group__237176 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XWhileExpression__Group__2__Impl37204 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__3__Impl_in_rule__XWhileExpression__Group__337235 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000800L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__4_in_rule__XWhileExpression__Group__337238 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__PredicateAssignment_3_in_rule__XWhileExpression__Group__3__Impl37265 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__4__Impl_in_rule__XWhileExpression__Group__437295 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__5_in_rule__XWhileExpression__Group__437298 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_75_in_rule__XWhileExpression__Group__4__Impl37326 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__Group__5__Impl_in_rule__XWhileExpression__Group__537357 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XWhileExpression__BodyAssignment_5_in_rule__XWhileExpression__Group__5__Impl37384 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__0__Impl_in_rule__XDoWhileExpression__Group__037426 = new BitSet(new long[]{0x0000000000000000L,0x0000000010000000L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__1_in_rule__XDoWhileExpression__Group__037429 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__1__Impl_in_rule__XDoWhileExpression__Group__137487 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__2_in_rule__XDoWhileExpression__Group__137490 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_92_in_rule__XDoWhileExpression__Group__1__Impl37518 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__2__Impl_in_rule__XDoWhileExpression__Group__237549 = new BitSet(new long[]{0x0000000000000000L,0x0000000008000000L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__3_in_rule__XDoWhileExpression__Group__237552 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__BodyAssignment_2_in_rule__XDoWhileExpression__Group__2__Impl37579 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__3__Impl_in_rule__XDoWhileExpression__Group__337609 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__4_in_rule__XDoWhileExpression__Group__337612 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_91_in_rule__XDoWhileExpression__Group__3__Impl37640 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__4__Impl_in_rule__XDoWhileExpression__Group__437671 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__5_in_rule__XDoWhileExpression__Group__437674 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XDoWhileExpression__Group__4__Impl37702 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__5__Impl_in_rule__XDoWhileExpression__Group__537733 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000800L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__6_in_rule__XDoWhileExpression__Group__537736 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__PredicateAssignment_5_in_rule__XDoWhileExpression__Group__5__Impl37763 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XDoWhileExpression__Group__6__Impl_in_rule__XDoWhileExpression__Group__637793 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_75_in_rule__XDoWhileExpression__Group__6__Impl37821 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group__0__Impl_in_rule__XBlockExpression__Group__037866 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group__1_in_rule__XBlockExpression__Group__037869 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group__1__Impl_in_rule__XBlockExpression__Group__137927 = new BitSet(new long[]{0x40FC4302003801F0L,0x00300017FA90043CL});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group__2_in_rule__XBlockExpression__Group__137930 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_66_in_rule__XBlockExpression__Group__1__Impl37958 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group__2__Impl_in_rule__XBlockExpression__Group__237989 = new BitSet(new long[]{0x40FC4302003801F0L,0x00300017FA90043CL});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group__3_in_rule__XBlockExpression__Group__237992 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group_2__0_in_rule__XBlockExpression__Group__2__Impl38019 = new BitSet(new long[]{0x40FC4302003801F2L,0x00300017FA900434L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group__3__Impl_in_rule__XBlockExpression__Group__338050 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_67_in_rule__XBlockExpression__Group__3__Impl38078 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group_2__0__Impl_in_rule__XBlockExpression__Group_2__038117 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group_2__1_in_rule__XBlockExpression__Group_2__038120 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__ExpressionsAssignment_2_0_in_rule__XBlockExpression__Group_2__0__Impl38147 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBlockExpression__Group_2__1__Impl_in_rule__XBlockExpression__Group_2__138177 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_65_in_rule__XBlockExpression__Group_2__1__Impl38206 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group__0__Impl_in_rule__XVariableDeclaration__Group__038243 = new BitSet(new long[]{0x0000000000080000L,0x0010000000000000L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group__1_in_rule__XVariableDeclaration__Group__038246 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group__1__Impl_in_rule__XVariableDeclaration__Group__138304 = new BitSet(new long[]{0x0000002000300020L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group__2_in_rule__XVariableDeclaration__Group__138307 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Alternatives_1_in_rule__XVariableDeclaration__Group__1__Impl38334 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group__2__Impl_in_rule__XVariableDeclaration__Group__238364 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group__3_in_rule__XVariableDeclaration__Group__238367 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Alternatives_2_in_rule__XVariableDeclaration__Group__2__Impl38394 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group__3__Impl_in_rule__XVariableDeclaration__Group__338424 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_3__0_in_rule__XVariableDeclaration__Group__3__Impl38451 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_2_0__0__Impl_in_rule__XVariableDeclaration__Group_2_0__038490 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_2_0_0__0_in_rule__XVariableDeclaration__Group_2_0__0__Impl38517 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_2_0_0__0__Impl_in_rule__XVariableDeclaration__Group_2_0_0__038549 = new BitSet(new long[]{0x0000000000300020L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_2_0_0__1_in_rule__XVariableDeclaration__Group_2_0_0__038552 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__TypeAssignment_2_0_0_0_in_rule__XVariableDeclaration__Group_2_0_0__0__Impl38579 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_2_0_0__1__Impl_in_rule__XVariableDeclaration__Group_2_0_0__138609 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__NameAssignment_2_0_0_1_in_rule__XVariableDeclaration__Group_2_0_0__1__Impl38636 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_3__0__Impl_in_rule__XVariableDeclaration__Group_3__038670 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_3__1_in_rule__XVariableDeclaration__Group_3__038673 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_14_in_rule__XVariableDeclaration__Group_3__0__Impl38701 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_3__1__Impl_in_rule__XVariableDeclaration__Group_3__138732 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__RightAssignment_3_1_in_rule__XVariableDeclaration__Group_3__1__Impl38759 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmFormalParameter__Group__0__Impl_in_rule__JvmFormalParameter__Group__038793 = new BitSet(new long[]{0x0000002000300020L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__JvmFormalParameter__Group__1_in_rule__JvmFormalParameter__Group__038796 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmFormalParameter__ParameterTypeAssignment_0_in_rule__JvmFormalParameter__Group__0__Impl38823 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmFormalParameter__Group__1__Impl_in_rule__JvmFormalParameter__Group__138854 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmFormalParameter__NameAssignment_1_in_rule__JvmFormalParameter__Group__1__Impl38881 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FullJvmFormalParameter__Group__0__Impl_in_rule__FullJvmFormalParameter__Group__038915 = new BitSet(new long[]{0x0000000000300020L});
-    public static final BitSet FOLLOW_rule__FullJvmFormalParameter__Group__1_in_rule__FullJvmFormalParameter__Group__038918 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FullJvmFormalParameter__ParameterTypeAssignment_0_in_rule__FullJvmFormalParameter__Group__0__Impl38945 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FullJvmFormalParameter__Group__1__Impl_in_rule__FullJvmFormalParameter__Group__138975 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FullJvmFormalParameter__NameAssignment_1_in_rule__FullJvmFormalParameter__Group__1__Impl39002 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group__0__Impl_in_rule__XFeatureCall__Group__039036 = new BitSet(new long[]{0x007C000200300020L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group__1_in_rule__XFeatureCall__Group__039039 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group__1__Impl_in_rule__XFeatureCall__Group__139097 = new BitSet(new long[]{0x007C000200300020L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group__2_in_rule__XFeatureCall__Group__139100 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1__0_in_rule__XFeatureCall__Group__1__Impl39127 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group__2__Impl_in_rule__XFeatureCall__Group__239158 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000420L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group__3_in_rule__XFeatureCall__Group__239161 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__FeatureAssignment_2_in_rule__XFeatureCall__Group__2__Impl39188 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group__3__Impl_in_rule__XFeatureCall__Group__339218 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000420L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group__4_in_rule__XFeatureCall__Group__339221 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3__0_in_rule__XFeatureCall__Group__3__Impl39248 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group__4__Impl_in_rule__XFeatureCall__Group__439279 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_4_in_rule__XFeatureCall__Group__4__Impl39306 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1__0__Impl_in_rule__XFeatureCall__Group_1__039347 = new BitSet(new long[]{0x0000002000300020L,0x0000004000000400L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1__1_in_rule__XFeatureCall__Group_1__039350 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_rule__XFeatureCall__Group_1__0__Impl39378 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1__1__Impl_in_rule__XFeatureCall__Group_1__139409 = new BitSet(new long[]{0x0000000100000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1__2_in_rule__XFeatureCall__Group_1__139412 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__TypeArgumentsAssignment_1_1_in_rule__XFeatureCall__Group_1__1__Impl39439 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1__2__Impl_in_rule__XFeatureCall__Group_1__239469 = new BitSet(new long[]{0x0000000100000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1__3_in_rule__XFeatureCall__Group_1__239472 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1_2__0_in_rule__XFeatureCall__Group_1__2__Impl39499 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1__3__Impl_in_rule__XFeatureCall__Group_1__339530 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_rule__XFeatureCall__Group_1__3__Impl39558 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1_2__0__Impl_in_rule__XFeatureCall__Group_1_2__039597 = new BitSet(new long[]{0x0000002000300020L,0x0000004000000400L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1_2__1_in_rule__XFeatureCall__Group_1_2__039600 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__XFeatureCall__Group_1_2__0__Impl39628 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_1_2__1__Impl_in_rule__XFeatureCall__Group_1_2__139659 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__TypeArgumentsAssignment_1_2_1_in_rule__XFeatureCall__Group_1_2__1__Impl39686 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3__0__Impl_in_rule__XFeatureCall__Group_3__039720 = new BitSet(new long[]{0x40FC4322003001F0L,0x00280017FA900C34L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3__1_in_rule__XFeatureCall__Group_3__039723 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__ExplicitOperationCallAssignment_3_0_in_rule__XFeatureCall__Group_3__0__Impl39750 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3__1__Impl_in_rule__XFeatureCall__Group_3__139780 = new BitSet(new long[]{0x40FC4322003001F0L,0x00280017FA900C34L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3__2_in_rule__XFeatureCall__Group_3__139783 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Alternatives_3_1_in_rule__XFeatureCall__Group_3__1__Impl39810 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3__2__Impl_in_rule__XFeatureCall__Group_3__239841 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_75_in_rule__XFeatureCall__Group_3__2__Impl39869 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3_1_1__0__Impl_in_rule__XFeatureCall__Group_3_1_1__039906 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3_1_1__1_in_rule__XFeatureCall__Group_3_1_1__039909 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_0_in_rule__XFeatureCall__Group_3_1_1__0__Impl39936 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3_1_1__1__Impl_in_rule__XFeatureCall__Group_3_1_1__139966 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3_1_1_1__0_in_rule__XFeatureCall__Group_3_1_1__1__Impl39993 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3_1_1_1__0__Impl_in_rule__XFeatureCall__Group_3_1_1_1__040028 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3_1_1_1__1_in_rule__XFeatureCall__Group_3_1_1_1__040031 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__XFeatureCall__Group_3_1_1_1__0__Impl40059 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3_1_1_1__1__Impl_in_rule__XFeatureCall__Group_3_1_1_1__140090 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_1_in_rule__XFeatureCall__Group_3_1_1_1__1__Impl40117 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__0__Impl_in_rule__XConstructorCall__Group__040151 = new BitSet(new long[]{0x0000000000000000L,0x0000000020000000L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__1_in_rule__XConstructorCall__Group__040154 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__1__Impl_in_rule__XConstructorCall__Group__140212 = new BitSet(new long[]{0x0000000000300020L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__2_in_rule__XConstructorCall__Group__140215 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_93_in_rule__XConstructorCall__Group__1__Impl40243 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__2__Impl_in_rule__XConstructorCall__Group__240274 = new BitSet(new long[]{0x0000000200000000L,0x0000000000000420L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__3_in_rule__XConstructorCall__Group__240277 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__ConstructorAssignment_2_in_rule__XConstructorCall__Group__2__Impl40304 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__3__Impl_in_rule__XConstructorCall__Group__340334 = new BitSet(new long[]{0x0000000200000000L,0x0000000000000420L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__4_in_rule__XConstructorCall__Group__340337 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__0_in_rule__XConstructorCall__Group__3__Impl40364 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__4__Impl_in_rule__XConstructorCall__Group__440395 = new BitSet(new long[]{0x0000000200000000L,0x0000000000000420L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__5_in_rule__XConstructorCall__Group__440398 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4__0_in_rule__XConstructorCall__Group__4__Impl40425 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group__5__Impl_in_rule__XConstructorCall__Group__540456 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__ArgumentsAssignment_5_in_rule__XConstructorCall__Group__5__Impl40483 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__0__Impl_in_rule__XConstructorCall__Group_3__040526 = new BitSet(new long[]{0x0000002000300020L,0x0000004000000400L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__1_in_rule__XConstructorCall__Group_3__040529 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_rule__XConstructorCall__Group_3__0__Impl40558 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__1__Impl_in_rule__XConstructorCall__Group_3__140590 = new BitSet(new long[]{0x0000000100000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__2_in_rule__XConstructorCall__Group_3__140593 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__TypeArgumentsAssignment_3_1_in_rule__XConstructorCall__Group_3__1__Impl40620 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__2__Impl_in_rule__XConstructorCall__Group_3__240650 = new BitSet(new long[]{0x0000000100000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__3_in_rule__XConstructorCall__Group_3__240653 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3_2__0_in_rule__XConstructorCall__Group_3__2__Impl40680 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__3__Impl_in_rule__XConstructorCall__Group_3__340711 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_rule__XConstructorCall__Group_3__3__Impl40739 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3_2__0__Impl_in_rule__XConstructorCall__Group_3_2__040778 = new BitSet(new long[]{0x0000002000300020L,0x0000004000000400L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3_2__1_in_rule__XConstructorCall__Group_3_2__040781 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__XConstructorCall__Group_3_2__0__Impl40809 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3_2__1__Impl_in_rule__XConstructorCall__Group_3_2__140840 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__TypeArgumentsAssignment_3_2_1_in_rule__XConstructorCall__Group_3_2__1__Impl40867 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4__0__Impl_in_rule__XConstructorCall__Group_4__040901 = new BitSet(new long[]{0x40FC4322003001F0L,0x00280017FA900C34L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4__1_in_rule__XConstructorCall__Group_4__040904 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__ExplicitConstructorCallAssignment_4_0_in_rule__XConstructorCall__Group_4__0__Impl40931 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4__1__Impl_in_rule__XConstructorCall__Group_4__140961 = new BitSet(new long[]{0x40FC4322003001F0L,0x00280017FA900C34L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4__2_in_rule__XConstructorCall__Group_4__140964 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Alternatives_4_1_in_rule__XConstructorCall__Group_4__1__Impl40991 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4__2__Impl_in_rule__XConstructorCall__Group_4__241022 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_75_in_rule__XConstructorCall__Group_4__2__Impl41050 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4_1_1__0__Impl_in_rule__XConstructorCall__Group_4_1_1__041087 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4_1_1__1_in_rule__XConstructorCall__Group_4_1_1__041090 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__ArgumentsAssignment_4_1_1_0_in_rule__XConstructorCall__Group_4_1_1__0__Impl41117 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4_1_1__1__Impl_in_rule__XConstructorCall__Group_4_1_1__141147 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4_1_1_1__0_in_rule__XConstructorCall__Group_4_1_1__1__Impl41174 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4_1_1_1__0__Impl_in_rule__XConstructorCall__Group_4_1_1_1__041209 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4_1_1_1__1_in_rule__XConstructorCall__Group_4_1_1_1__041212 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__XConstructorCall__Group_4_1_1_1__0__Impl41240 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4_1_1_1__1__Impl_in_rule__XConstructorCall__Group_4_1_1_1__141271 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_1_in_rule__XConstructorCall__Group_4_1_1_1__1__Impl41298 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBooleanLiteral__Group__0__Impl_in_rule__XBooleanLiteral__Group__041332 = new BitSet(new long[]{0x0080000000000000L,0x0020000000000000L});
-    public static final BitSet FOLLOW_rule__XBooleanLiteral__Group__1_in_rule__XBooleanLiteral__Group__041335 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBooleanLiteral__Group__1__Impl_in_rule__XBooleanLiteral__Group__141393 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XBooleanLiteral__Alternatives_1_in_rule__XBooleanLiteral__Group__1__Impl41420 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XNullLiteral__Group__0__Impl_in_rule__XNullLiteral__Group__041454 = new BitSet(new long[]{0x0000000000000000L,0x0000000040000000L});
-    public static final BitSet FOLLOW_rule__XNullLiteral__Group__1_in_rule__XNullLiteral__Group__041457 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XNullLiteral__Group__1__Impl_in_rule__XNullLiteral__Group__141515 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_94_in_rule__XNullLiteral__Group__1__Impl41543 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XNumberLiteral__Group__0__Impl_in_rule__XNumberLiteral__Group__041578 = new BitSet(new long[]{0x00000000000000D0L});
-    public static final BitSet FOLLOW_rule__XNumberLiteral__Group__1_in_rule__XNumberLiteral__Group__041581 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XNumberLiteral__Group__1__Impl_in_rule__XNumberLiteral__Group__141639 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XNumberLiteral__ValueAssignment_1_in_rule__XNumberLiteral__Group__1__Impl41666 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XStringLiteral__Group__0__Impl_in_rule__XStringLiteral__Group__041700 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__XStringLiteral__Group__1_in_rule__XStringLiteral__Group__041703 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XStringLiteral__Group__1__Impl_in_rule__XStringLiteral__Group__141761 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XStringLiteral__ValueAssignment_1_in_rule__XStringLiteral__Group__1__Impl41788 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__0__Impl_in_rule__XTypeLiteral__Group__041822 = new BitSet(new long[]{0x00800000000001D0L,0x00200000C0100020L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__1_in_rule__XTypeLiteral__Group__041825 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__1__Impl_in_rule__XTypeLiteral__Group__141883 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__2_in_rule__XTypeLiteral__Group__141886 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_95_in_rule__XTypeLiteral__Group__1__Impl41914 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__2__Impl_in_rule__XTypeLiteral__Group__241945 = new BitSet(new long[]{0x0000000000300020L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__3_in_rule__XTypeLiteral__Group__241948 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XTypeLiteral__Group__2__Impl41976 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__3__Impl_in_rule__XTypeLiteral__Group__342007 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000820L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__4_in_rule__XTypeLiteral__Group__342010 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__TypeAssignment_3_in_rule__XTypeLiteral__Group__3__Impl42037 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__4__Impl_in_rule__XTypeLiteral__Group__442067 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000820L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__5_in_rule__XTypeLiteral__Group__442070 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__ArrayDimensionsAssignment_4_in_rule__XTypeLiteral__Group__4__Impl42097 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L});
-    public static final BitSet FOLLOW_rule__XTypeLiteral__Group__5__Impl_in_rule__XTypeLiteral__Group__542128 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_75_in_rule__XTypeLiteral__Group__5__Impl42156 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XThrowExpression__Group__0__Impl_in_rule__XThrowExpression__Group__042199 = new BitSet(new long[]{0x0000000000000000L,0x0000000100000000L});
-    public static final BitSet FOLLOW_rule__XThrowExpression__Group__1_in_rule__XThrowExpression__Group__042202 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XThrowExpression__Group__1__Impl_in_rule__XThrowExpression__Group__142260 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XThrowExpression__Group__2_in_rule__XThrowExpression__Group__142263 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_96_in_rule__XThrowExpression__Group__1__Impl42291 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XThrowExpression__Group__2__Impl_in_rule__XThrowExpression__Group__242322 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XThrowExpression__ExpressionAssignment_2_in_rule__XThrowExpression__Group__2__Impl42349 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XReturnExpression__Group__0__Impl_in_rule__XReturnExpression__Group__042385 = new BitSet(new long[]{0x0000000000000000L,0x0000000200000000L});
-    public static final BitSet FOLLOW_rule__XReturnExpression__Group__1_in_rule__XReturnExpression__Group__042388 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XReturnExpression__Group__1__Impl_in_rule__XReturnExpression__Group__142446 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XReturnExpression__Group__2_in_rule__XReturnExpression__Group__142449 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_97_in_rule__XReturnExpression__Group__1__Impl42477 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XReturnExpression__Group__2__Impl_in_rule__XReturnExpression__Group__242508 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XReturnExpression__ExpressionAssignment_2_in_rule__XReturnExpression__Group__2__Impl42535 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group__0__Impl_in_rule__XTryCatchFinallyExpression__Group__042572 = new BitSet(new long[]{0x0000000000000000L,0x0000000400000000L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group__1_in_rule__XTryCatchFinallyExpression__Group__042575 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group__1__Impl_in_rule__XTryCatchFinallyExpression__Group__142633 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group__2_in_rule__XTryCatchFinallyExpression__Group__142636 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_98_in_rule__XTryCatchFinallyExpression__Group__1__Impl42664 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group__2__Impl_in_rule__XTryCatchFinallyExpression__Group__242695 = new BitSet(new long[]{0x0000000000000000L,0x0000002800000000L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group__3_in_rule__XTryCatchFinallyExpression__Group__242698 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__ExpressionAssignment_2_in_rule__XTryCatchFinallyExpression__Group__2__Impl42725 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group__3__Impl_in_rule__XTryCatchFinallyExpression__Group__342755 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Alternatives_3_in_rule__XTryCatchFinallyExpression__Group__3__Impl42782 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0__0__Impl_in_rule__XTryCatchFinallyExpression__Group_3_0__042820 = new BitSet(new long[]{0x0000000000000000L,0x0000000800000000L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0__1_in_rule__XTryCatchFinallyExpression__Group_3_0__042823 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0_in_rule__XTryCatchFinallyExpression__Group_3_0__0__Impl42852 = new BitSet(new long[]{0x0000000000000002L,0x0000002000000000L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0_in_rule__XTryCatchFinallyExpression__Group_3_0__0__Impl42864 = new BitSet(new long[]{0x0000000000000002L,0x0000002000000000L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0__1__Impl_in_rule__XTryCatchFinallyExpression__Group_3_0__142897 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__0_in_rule__XTryCatchFinallyExpression__Group_3_0__1__Impl42924 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl_in_rule__XTryCatchFinallyExpression__Group_3_0_1__042959 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__1_in_rule__XTryCatchFinallyExpression__Group_3_0_1__042962 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_99_in_rule__XTryCatchFinallyExpression__Group_3_0_1__0__Impl42991 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl_in_rule__XTryCatchFinallyExpression__Group_3_0_1__143023 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_1_in_rule__XTryCatchFinallyExpression__Group_3_0_1__1__Impl43050 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_1__0__Impl_in_rule__XTryCatchFinallyExpression__Group_3_1__043084 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_1__1_in_rule__XTryCatchFinallyExpression__Group_3_1__043087 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_99_in_rule__XTryCatchFinallyExpression__Group_3_1__0__Impl43115 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_1__1__Impl_in_rule__XTryCatchFinallyExpression__Group_3_1__143146 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_1_in_rule__XTryCatchFinallyExpression__Group_3_1__1__Impl43173 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group__0__Impl_in_rule__XSynchronizedExpression__Group__043207 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group__1_in_rule__XSynchronizedExpression__Group__043210 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group_0__0_in_rule__XSynchronizedExpression__Group__0__Impl43237 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group__1__Impl_in_rule__XSynchronizedExpression__Group__143267 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000800L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group__2_in_rule__XSynchronizedExpression__Group__143270 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__ParamAssignment_1_in_rule__XSynchronizedExpression__Group__1__Impl43297 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group__2__Impl_in_rule__XSynchronizedExpression__Group__243327 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group__3_in_rule__XSynchronizedExpression__Group__243330 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_75_in_rule__XSynchronizedExpression__Group__2__Impl43358 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group__3__Impl_in_rule__XSynchronizedExpression__Group__343389 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__ExpressionAssignment_3_in_rule__XSynchronizedExpression__Group__3__Impl43416 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group_0__0__Impl_in_rule__XSynchronizedExpression__Group_0__043454 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group_0_0__0_in_rule__XSynchronizedExpression__Group_0__0__Impl43481 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group_0_0__0__Impl_in_rule__XSynchronizedExpression__Group_0_0__043513 = new BitSet(new long[]{0x0000000000000000L,0x0000001000000000L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group_0_0__1_in_rule__XSynchronizedExpression__Group_0_0__043516 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group_0_0__1__Impl_in_rule__XSynchronizedExpression__Group_0_0__143574 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group_0_0__2_in_rule__XSynchronizedExpression__Group_0_0__143577 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_100_in_rule__XSynchronizedExpression__Group_0_0__1__Impl43605 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSynchronizedExpression__Group_0_0__2__Impl_in_rule__XSynchronizedExpression__Group_0_0__243636 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XSynchronizedExpression__Group_0_0__2__Impl43664 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCatchClause__Group__0__Impl_in_rule__XCatchClause__Group__043701 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XCatchClause__Group__1_in_rule__XCatchClause__Group__043704 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_101_in_rule__XCatchClause__Group__0__Impl43733 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCatchClause__Group__1__Impl_in_rule__XCatchClause__Group__143765 = new BitSet(new long[]{0x0000002000300020L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XCatchClause__Group__2_in_rule__XCatchClause__Group__143768 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XCatchClause__Group__1__Impl43796 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCatchClause__Group__2__Impl_in_rule__XCatchClause__Group__243827 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000800L});
-    public static final BitSet FOLLOW_rule__XCatchClause__Group__3_in_rule__XCatchClause__Group__243830 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCatchClause__DeclaredParamAssignment_2_in_rule__XCatchClause__Group__2__Impl43857 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCatchClause__Group__3__Impl_in_rule__XCatchClause__Group__343887 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
-    public static final BitSet FOLLOW_rule__XCatchClause__Group__4_in_rule__XCatchClause__Group__343890 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_75_in_rule__XCatchClause__Group__3__Impl43918 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCatchClause__Group__4__Impl_in_rule__XCatchClause__Group__443949 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCatchClause__ExpressionAssignment_4_in_rule__XCatchClause__Group__4__Impl43976 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group__0__Impl_in_rule__QualifiedName__Group__044016 = new BitSet(new long[]{0x0002000000000000L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group__1_in_rule__QualifiedName__Group__044019 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__QualifiedName__Group__0__Impl44046 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group__1__Impl_in_rule__QualifiedName__Group__144075 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group_1__0_in_rule__QualifiedName__Group__1__Impl44102 = new BitSet(new long[]{0x0002000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group_1__0__Impl_in_rule__QualifiedName__Group_1__044137 = new BitSet(new long[]{0x0000000000300020L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group_1__1_in_rule__QualifiedName__Group_1__044140 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_49_in_rule__QualifiedName__Group_1__0__Impl44169 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group_1__1__Impl_in_rule__QualifiedName__Group_1__144201 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__QualifiedName__Group_1__1__Impl44228 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Number__Group_1__0__Impl_in_rule__Number__Group_1__044261 = new BitSet(new long[]{0x0002000000000000L});
-    public static final BitSet FOLLOW_rule__Number__Group_1__1_in_rule__Number__Group_1__044264 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Number__Alternatives_1_0_in_rule__Number__Group_1__0__Impl44291 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Number__Group_1__1__Impl_in_rule__Number__Group_1__144321 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Number__Group_1_1__0_in_rule__Number__Group_1__1__Impl44348 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Number__Group_1_1__0__Impl_in_rule__Number__Group_1_1__044383 = new BitSet(new long[]{0x0000000000000090L});
-    public static final BitSet FOLLOW_rule__Number__Group_1_1__1_in_rule__Number__Group_1_1__044386 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_49_in_rule__Number__Group_1_1__0__Impl44414 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Number__Group_1_1__1__Impl_in_rule__Number__Group_1_1__144445 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Number__Alternatives_1_1_1_in_rule__Number__Group_1_1__1__Impl44472 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0__0__Impl_in_rule__JvmTypeReference__Group_0__044507 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000020L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0__1_in_rule__JvmTypeReference__Group_0__044510 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmParameterizedTypeReference_in_rule__JvmTypeReference__Group_0__0__Impl44537 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0__1__Impl_in_rule__JvmTypeReference__Group_0__144566 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0_1__0_in_rule__JvmTypeReference__Group_0__1__Impl44593 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0_1__0__Impl_in_rule__JvmTypeReference__Group_0_1__044628 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0_1_0__0_in_rule__JvmTypeReference__Group_0_1__0__Impl44655 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0_1_0__0__Impl_in_rule__JvmTypeReference__Group_0_1_0__044687 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000020L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0_1_0__1_in_rule__JvmTypeReference__Group_0_1_0__044690 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0_1_0__1__Impl_in_rule__JvmTypeReference__Group_0_1_0__144748 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleArrayBrackets_in_rule__JvmTypeReference__Group_0_1_0__1__Impl44775 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ArrayBrackets__Group__0__Impl_in_rule__ArrayBrackets__Group__044808 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__ArrayBrackets__Group__1_in_rule__ArrayBrackets__Group__044811 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_69_in_rule__ArrayBrackets__Group__0__Impl44839 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ArrayBrackets__Group__1__Impl_in_rule__ArrayBrackets__Group__144870 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_70_in_rule__ArrayBrackets__Group__1__Impl44898 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group__0__Impl_in_rule__XFunctionTypeRef__Group__044933 = new BitSet(new long[]{0x0000002000300020L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group__1_in_rule__XFunctionTypeRef__Group__044936 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0__0_in_rule__XFunctionTypeRef__Group__0__Impl44963 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group__1__Impl_in_rule__XFunctionTypeRef__Group__144994 = new BitSet(new long[]{0x0000002000300020L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group__2_in_rule__XFunctionTypeRef__Group__144997 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_37_in_rule__XFunctionTypeRef__Group__1__Impl45025 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group__2__Impl_in_rule__XFunctionTypeRef__Group__245056 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__ReturnTypeAssignment_2_in_rule__XFunctionTypeRef__Group__2__Impl45083 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0__0__Impl_in_rule__XFunctionTypeRef__Group_0__045119 = new BitSet(new long[]{0x0000002000300020L,0x0000000000000C00L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0__1_in_rule__XFunctionTypeRef__Group_0__045122 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XFunctionTypeRef__Group_0__0__Impl45150 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0__1__Impl_in_rule__XFunctionTypeRef__Group_0__145181 = new BitSet(new long[]{0x0000002000300020L,0x0000000000000C00L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0__2_in_rule__XFunctionTypeRef__Group_0__145184 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0_1__0_in_rule__XFunctionTypeRef__Group_0__1__Impl45211 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0__2__Impl_in_rule__XFunctionTypeRef__Group_0__245242 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_75_in_rule__XFunctionTypeRef__Group_0__2__Impl45270 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0_1__0__Impl_in_rule__XFunctionTypeRef__Group_0_1__045307 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0_1__1_in_rule__XFunctionTypeRef__Group_0_1__045310 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__ParamTypesAssignment_0_1_0_in_rule__XFunctionTypeRef__Group_0_1__0__Impl45337 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0_1__1__Impl_in_rule__XFunctionTypeRef__Group_0_1__145367 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0_1_1__0_in_rule__XFunctionTypeRef__Group_0_1__1__Impl45394 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0_1_1__0__Impl_in_rule__XFunctionTypeRef__Group_0_1_1__045429 = new BitSet(new long[]{0x0000002000300020L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0_1_1__1_in_rule__XFunctionTypeRef__Group_0_1_1__045432 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__XFunctionTypeRef__Group_0_1_1__0__Impl45460 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__Group_0_1_1__1__Impl_in_rule__XFunctionTypeRef__Group_0_1_1__145491 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_1_in_rule__XFunctionTypeRef__Group_0_1_1__1__Impl45518 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group__0__Impl_in_rule__JvmParameterizedTypeReference__Group__045552 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group__1_in_rule__JvmParameterizedTypeReference__Group__045555 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__TypeAssignment_0_in_rule__JvmParameterizedTypeReference__Group__0__Impl45582 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group__1__Impl_in_rule__JvmParameterizedTypeReference__Group__145612 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__0_in_rule__JvmParameterizedTypeReference__Group__1__Impl45639 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1__045674 = new BitSet(new long[]{0x0000002000300020L,0x0000004000000400L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__1_in_rule__JvmParameterizedTypeReference__Group_1__045677 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_rule__JvmParameterizedTypeReference__Group_1__0__Impl45706 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1__145738 = new BitSet(new long[]{0x0000000100000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__2_in_rule__JvmParameterizedTypeReference__Group_1__145741 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_1_in_rule__JvmParameterizedTypeReference__Group_1__1__Impl45768 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__2__Impl_in_rule__JvmParameterizedTypeReference__Group_1__245798 = new BitSet(new long[]{0x0000000100000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__3_in_rule__JvmParameterizedTypeReference__Group_1__245801 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_2__0_in_rule__JvmParameterizedTypeReference__Group_1__2__Impl45828 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__3__Impl_in_rule__JvmParameterizedTypeReference__Group_1__345859 = new BitSet(new long[]{0x0002000000000000L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__4_in_rule__JvmParameterizedTypeReference__Group_1__345862 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_rule__JvmParameterizedTypeReference__Group_1__3__Impl45890 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__4__Impl_in_rule__JvmParameterizedTypeReference__Group_1__445921 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__0_in_rule__JvmParameterizedTypeReference__Group_1__4__Impl45948 = new BitSet(new long[]{0x0002000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_2__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_2__045989 = new BitSet(new long[]{0x0000002000300020L,0x0000004000000400L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_2__1_in_rule__JvmParameterizedTypeReference__Group_1_2__045992 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__JvmParameterizedTypeReference__Group_1_2__0__Impl46020 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_2__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_2__146051 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_1_in_rule__JvmParameterizedTypeReference__Group_1_2__1__Impl46078 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4__046112 = new BitSet(new long[]{0x0000000000300020L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__1_in_rule__JvmParameterizedTypeReference__Group_1_4__046115 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0__0_in_rule__JvmParameterizedTypeReference__Group_1_4__0__Impl46142 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4__146172 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__2_in_rule__JvmParameterizedTypeReference__Group_1_4__146175 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__TypeAssignment_1_4_1_in_rule__JvmParameterizedTypeReference__Group_1_4__1__Impl46202 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__2__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4__246232 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__0_in_rule__JvmParameterizedTypeReference__Group_1_4__2__Impl46259 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_0__046296 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0_0__0_in_rule__JvmParameterizedTypeReference__Group_1_4_0__0__Impl46323 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0_0__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_0_0__046355 = new BitSet(new long[]{0x0002000000000000L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0_0__1_in_rule__JvmParameterizedTypeReference__Group_1_4_0_0__046358 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_0_0__146416 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_49_in_rule__JvmParameterizedTypeReference__Group_1_4_0_0__1__Impl46444 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2__046479 = new BitSet(new long[]{0x0000002000300020L,0x0000004000000400L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__1_in_rule__JvmParameterizedTypeReference__Group_1_4_2__046482 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_rule__JvmParameterizedTypeReference__Group_1_4_2__0__Impl46511 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2__146543 = new BitSet(new long[]{0x0000000100000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__2_in_rule__JvmParameterizedTypeReference__Group_1_4_2__146546 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_1_in_rule__JvmParameterizedTypeReference__Group_1_4_2__1__Impl46573 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2__246603 = new BitSet(new long[]{0x0000000100000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__3_in_rule__JvmParameterizedTypeReference__Group_1_4_2__246606 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2_2__0_in_rule__JvmParameterizedTypeReference__Group_1_4_2__2__Impl46633 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2__346664 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_rule__JvmParameterizedTypeReference__Group_1_4_2__3__Impl46692 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__046731 = new BitSet(new long[]{0x0000002000300020L,0x0000004000000400L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2_2__1_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__046734 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__0__Impl46762 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__146793 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_1_in_rule__JvmParameterizedTypeReference__Group_1_4_2_2__1__Impl46820 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group__0__Impl_in_rule__JvmWildcardTypeReference__Group__046854 = new BitSet(new long[]{0x0000002000300020L,0x0000004000000400L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group__1_in_rule__JvmWildcardTypeReference__Group__046857 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group__1__Impl_in_rule__JvmWildcardTypeReference__Group__146915 = new BitSet(new long[]{0x0044000000000000L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group__2_in_rule__JvmWildcardTypeReference__Group__146918 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_102_in_rule__JvmWildcardTypeReference__Group__1__Impl46946 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group__2__Impl_in_rule__JvmWildcardTypeReference__Group__246977 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Alternatives_2_in_rule__JvmWildcardTypeReference__Group__2__Impl47004 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group_2_0__0__Impl_in_rule__JvmWildcardTypeReference__Group_2_0__047041 = new BitSet(new long[]{0x0000000000000000L,0x0000008000000000L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group_2_0__1_in_rule__JvmWildcardTypeReference__Group_2_0__047044 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_0_in_rule__JvmWildcardTypeReference__Group_2_0__0__Impl47071 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group_2_0__1__Impl_in_rule__JvmWildcardTypeReference__Group_2_0__147101 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_1_in_rule__JvmWildcardTypeReference__Group_2_0__1__Impl47128 = new BitSet(new long[]{0x0000000000000002L,0x0000008000000000L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group_2_1__0__Impl_in_rule__JvmWildcardTypeReference__Group_2_1__047163 = new BitSet(new long[]{0x0000000000000000L,0x0000008000000000L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group_2_1__1_in_rule__JvmWildcardTypeReference__Group_2_1__047166 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_0_in_rule__JvmWildcardTypeReference__Group_2_1__0__Impl47193 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__Group_2_1__1__Impl_in_rule__JvmWildcardTypeReference__Group_2_1__147223 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_1_in_rule__JvmWildcardTypeReference__Group_2_1__1__Impl47250 = new BitSet(new long[]{0x0000000000000002L,0x0000008000000000L});
-    public static final BitSet FOLLOW_rule__JvmUpperBound__Group__0__Impl_in_rule__JvmUpperBound__Group__047285 = new BitSet(new long[]{0x0000002000300020L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__JvmUpperBound__Group__1_in_rule__JvmUpperBound__Group__047288 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_50_in_rule__JvmUpperBound__Group__0__Impl47316 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmUpperBound__Group__1__Impl_in_rule__JvmUpperBound__Group__147347 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmUpperBound__TypeReferenceAssignment_1_in_rule__JvmUpperBound__Group__1__Impl47374 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmUpperBoundAnded__Group__0__Impl_in_rule__JvmUpperBoundAnded__Group__047408 = new BitSet(new long[]{0x0000002000300020L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__JvmUpperBoundAnded__Group__1_in_rule__JvmUpperBoundAnded__Group__047411 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_103_in_rule__JvmUpperBoundAnded__Group__0__Impl47439 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmUpperBoundAnded__Group__1__Impl_in_rule__JvmUpperBoundAnded__Group__147470 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmUpperBoundAnded__TypeReferenceAssignment_1_in_rule__JvmUpperBoundAnded__Group__1__Impl47497 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmLowerBound__Group__0__Impl_in_rule__JvmLowerBound__Group__047531 = new BitSet(new long[]{0x0000002000300020L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__JvmLowerBound__Group__1_in_rule__JvmLowerBound__Group__047534 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_54_in_rule__JvmLowerBound__Group__0__Impl47562 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmLowerBound__Group__1__Impl_in_rule__JvmLowerBound__Group__147593 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmLowerBound__TypeReferenceAssignment_1_in_rule__JvmLowerBound__Group__1__Impl47620 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmLowerBoundAnded__Group__0__Impl_in_rule__JvmLowerBoundAnded__Group__047654 = new BitSet(new long[]{0x0000002000300020L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__JvmLowerBoundAnded__Group__1_in_rule__JvmLowerBoundAnded__Group__047657 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_103_in_rule__JvmLowerBoundAnded__Group__0__Impl47685 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmLowerBoundAnded__Group__1__Impl_in_rule__JvmLowerBoundAnded__Group__147716 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmLowerBoundAnded__TypeReferenceAssignment_1_in_rule__JvmLowerBoundAnded__Group__1__Impl47743 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedNameWithWildcard__Group__0__Impl_in_rule__QualifiedNameWithWildcard__Group__047779 = new BitSet(new long[]{0x0002000000000000L});
-    public static final BitSet FOLLOW_rule__QualifiedNameWithWildcard__Group__1_in_rule__QualifiedNameWithWildcard__Group__047782 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__QualifiedNameWithWildcard__Group__0__Impl47809 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedNameWithWildcard__Group__1__Impl_in_rule__QualifiedNameWithWildcard__Group__147838 = new BitSet(new long[]{0x0000040000000000L});
-    public static final BitSet FOLLOW_rule__QualifiedNameWithWildcard__Group__2_in_rule__QualifiedNameWithWildcard__Group__147841 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_49_in_rule__QualifiedNameWithWildcard__Group__1__Impl47869 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedNameWithWildcard__Group__2__Impl_in_rule__QualifiedNameWithWildcard__Group__247900 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__QualifiedNameWithWildcard__Group__2__Impl47928 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Group__0__Impl_in_rule__XImportDeclaration__Group__047965 = new BitSet(new long[]{0x0008000000300020L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Group__1_in_rule__XImportDeclaration__Group__047968 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_rule__XImportDeclaration__Group__0__Impl47996 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Group__1__Impl_in_rule__XImportDeclaration__Group__148027 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Group__2_in_rule__XImportDeclaration__Group__148030 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Alternatives_1_in_rule__XImportDeclaration__Group__1__Impl48057 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Group__2__Impl_in_rule__XImportDeclaration__Group__248087 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_65_in_rule__XImportDeclaration__Group__2__Impl48116 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Group_1_0__0__Impl_in_rule__XImportDeclaration__Group_1_0__048155 = new BitSet(new long[]{0x0020000000300020L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Group_1_0__1_in_rule__XImportDeclaration__Group_1_0__048158 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__StaticAssignment_1_0_0_in_rule__XImportDeclaration__Group_1_0__0__Impl48185 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Group_1_0__1__Impl_in_rule__XImportDeclaration__Group_1_0__148215 = new BitSet(new long[]{0x0020000000300020L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Group_1_0__2_in_rule__XImportDeclaration__Group_1_0__148218 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__ExtensionAssignment_1_0_1_in_rule__XImportDeclaration__Group_1_0__1__Impl48245 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Group_1_0__2__Impl_in_rule__XImportDeclaration__Group_1_0__248276 = new BitSet(new long[]{0x0000040000300020L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Group_1_0__3_in_rule__XImportDeclaration__Group_1_0__248279 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__ImportedTypeAssignment_1_0_2_in_rule__XImportDeclaration__Group_1_0__2__Impl48306 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Group_1_0__3__Impl_in_rule__XImportDeclaration__Group_1_0__348336 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XImportDeclaration__Alternatives_1_0_3_in_rule__XImportDeclaration__Group_1_0__3__Impl48363 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedNameInStaticImport__Group__0__Impl_in_rule__QualifiedNameInStaticImport__Group__048401 = new BitSet(new long[]{0x0002000000000000L});
-    public static final BitSet FOLLOW_rule__QualifiedNameInStaticImport__Group__1_in_rule__QualifiedNameInStaticImport__Group__048404 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__QualifiedNameInStaticImport__Group__0__Impl48431 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedNameInStaticImport__Group__1__Impl_in_rule__QualifiedNameInStaticImport__Group__148460 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_49_in_rule__QualifiedNameInStaticImport__Group__1__Impl48488 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDottedID_in_rule__FormatConfiguration__TargetGrammarAssignment_248532 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDottedID_in_rule__FormatConfiguration__ExtendedFormatConfigurationAssignment_3_148571 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__FormatConfiguration__FormatterBaseClassAssignment_4_148610 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConstant_in_rule__FormatConfiguration__ConstantsAssignment_5_148645 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRule_in_rule__FormatConfiguration__RulesAssignment_648676 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_104_in_rule__Constant__IntTypeAssignment_0_048712 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_105_in_rule__Constant__StringTypeAssignment_0_148756 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__Constant__NameAssignment_148795 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntObject_in_rule__Constant__IntValueAssignment_3_048826 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__Constant__StringValueAssignment_3_148857 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntObject_in_rule__IntValue__LiteralAssignment_048888 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDottedID_in_rule__IntValue__ReferenceAssignment_148923 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__StringValue__LiteralAssignment_048958 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDottedID_in_rule__StringValue__ReferenceAssignment_148993 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_106_in_rule__GrammarRule__OverrideAssignment_049033 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__GrammarRule__TargetRuleAssignment_149076 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGrammarRuleDirective_in_rule__GrammarRule__DirectivesAssignment_3_049111 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGroupBlock_in_rule__GrammarRule__DirectivesAssignment_3_149142 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_106_in_rule__WildcardRule__OverrideAssignment_149178 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleWildcardRuleDirective_in_rule__WildcardRule__DirectivesAssignment_449217 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleParameterizedIdentifier_in_rule__GrammarElementReference__AssignmentAssignment_0_149252 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleParameterizedIdentifier_in_rule__GrammarElementReference__RuleCallAssignment_1_149291 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRuleSelfIdentifier_in_rule__GrammarElementReference__SelfAssignment_249330 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__GrammarElementReference__RuleAssignment_349369 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleParameterizedString_in_rule__GrammarElementReference__KeywordAssignment_449408 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__GrammarElementLookup__RuleAssignment_049447 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__GrammarElementLookup__KeywordAssignment_149482 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGrammarElementLookup_in_rule__ContextFreeDirective__GrammarElementsAssignment_149513 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGrammarElementLookup_in_rule__ContextFreeDirective__GrammarElementsAssignment_2_149544 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMatcherList_in_rule__ContextFreeDirective__MatcherListAssignment_449575 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGrammarElementReference_in_rule__SpecificDirective__GrammarElementsAssignment_049606 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGrammarElementReference_in_rule__SpecificDirective__GrammarElementsAssignment_1_149637 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMatcherList_in_rule__SpecificDirective__MatcherListAssignment_249668 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMatcher_in_rule__MatcherList__MatchersAssignment_149699 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMatcher_in_rule__MatcherList__MatchersAssignment_2_149730 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntIdentifier_in_rule__GroupBlock__GrammarElementAssignment_149765 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMatcherList_in_rule__GroupBlock__MatcherListAssignment_2_049800 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGroupBlock_in_rule__GroupBlock__SubGroupAssignment_2_1_149831 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGrammarRuleDirective_in_rule__GroupBlock__DirectivesAssignment_2_2_149862 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__KeywordPair__LeftAssignment_149893 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__KeywordPair__RightAssignment_249924 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMatcher_in_rule__KeywordPair__LeftMatchersAssignment_5_0_249955 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMatcher_in_rule__KeywordPair__RightMatchersAssignment_5_1_249986 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMatcher_in_rule__KeywordPair__LeftMatchersAssignment_6_1_0_250017 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMatcher_in_rule__KeywordPair__RightMatchersAssignment_6_1_1_250048 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLocator_in_rule__Matcher__LocatorAssignment_050079 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMatcherType_in_rule__Matcher__TypeAssignment_150110 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBlockExpression_in_rule__Matcher__ConditionAssignment_250141 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStringValue_in_rule__SpaceLocator__ValueAssignment_0_150172 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_107_in_rule__SpaceLocator__NoSpaceAssignment_150208 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntValue_in_rule__RightPaddingLocator__ValueAssignment_150247 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntValue_in_rule__LinewrapLocator__ValueAssignment_0_1_1_050278 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntValue_in_rule__LinewrapLocator__MinimumAssignment_0_1_1_1_050309 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntValue_in_rule__LinewrapLocator__DefaultAssignment_0_1_1_1_150340 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntValue_in_rule__LinewrapLocator__MaximumAssignment_0_1_1_1_250371 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_108_in_rule__LinewrapLocator__NoLinewrapAssignment_150407 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_109_in_rule__ColumnLocator__FixedAssignment_150451 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntValue_in_rule__ColumnLocator__ValueAssignment_2_050490 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBlockExpression_in_rule__ColumnLocator__ParameterAssignment_2_150521 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_110_in_rule__ColumnLocator__RelativeAssignment_350557 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_111_in_rule__ColumnLocator__NobreakAssignment_450601 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_109_in_rule__OffsetLocator__FixedAssignment_150645 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntValue_in_rule__OffsetLocator__ValueAssignment_250684 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_111_in_rule__OffsetLocator__NobreakAssignment_350720 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_112_in_rule__IndentLocator__IncrementAssignment_1_050764 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntValue_in_rule__IndentLocator__ValueAssignment_2_050803 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBlockExpression_in_rule__IndentLocator__ParameterAssignment_2_150834 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__XAnnotation__AnnotationTypeAssignment_250869 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationElementValuePair_in_rule__XAnnotation__ElementValuePairsAssignment_3_1_0_050904 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationElementValuePair_in_rule__XAnnotation__ElementValuePairsAssignment_3_1_0_1_150935 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationElementValueOrCommaList_in_rule__XAnnotation__ValueAssignment_3_1_150966 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__XAnnotationElementValuePair__ElementAssignment_0_0_051001 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationElementValue_in_rule__XAnnotationElementValuePair__ValueAssignment_151036 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_051067 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_0_1_1_151098 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValueOrCommaList__ElementsAssignment_1_1_1_151129 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValue__ElementsAssignment_0_1_051160 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_rule__XAnnotationElementValue__ElementsAssignment_0_1_1_151191 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFeatureCallID_in_rule__XAssignment__FeatureAssignment_0_151226 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAssignment_in_rule__XAssignment__ValueAssignment_0_351261 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpMultiAssign_in_rule__XAssignment__FeatureAssignment_1_1_0_0_151296 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAssignment_in_rule__XAssignment__RightOperandAssignment_1_1_151331 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpOr_in_rule__XOrExpression__FeatureAssignment_1_0_0_151366 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAndExpression_in_rule__XOrExpression__RightOperandAssignment_1_151401 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpAnd_in_rule__XAndExpression__FeatureAssignment_1_0_0_151436 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXEqualityExpression_in_rule__XAndExpression__RightOperandAssignment_1_151471 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpEquality_in_rule__XEqualityExpression__FeatureAssignment_1_0_0_151506 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXRelationalExpression_in_rule__XEqualityExpression__RightOperandAssignment_1_151541 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__XRelationalExpression__TypeAssignment_1_0_151572 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpCompare_in_rule__XRelationalExpression__FeatureAssignment_1_1_0_0_151607 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXOtherOperatorExpression_in_rule__XRelationalExpression__RightOperandAssignment_1_1_151642 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpOther_in_rule__XOtherOperatorExpression__FeatureAssignment_1_0_0_151677 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAdditiveExpression_in_rule__XOtherOperatorExpression__RightOperandAssignment_1_151712 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpAdd_in_rule__XAdditiveExpression__FeatureAssignment_1_0_0_151747 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXMultiplicativeExpression_in_rule__XAdditiveExpression__RightOperandAssignment_1_151782 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpMulti_in_rule__XMultiplicativeExpression__FeatureAssignment_1_0_0_151817 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXUnaryOperation_in_rule__XMultiplicativeExpression__RightOperandAssignment_1_151852 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpUnary_in_rule__XUnaryOperation__FeatureAssignment_0_151887 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXUnaryOperation_in_rule__XUnaryOperation__OperandAssignment_0_251922 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__XCastedExpression__TypeAssignment_1_151953 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpPostfix_in_rule__XPostfixOperation__FeatureAssignment_1_0_151988 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_113_in_rule__XMemberFeatureCall__ExplicitStaticAssignment_1_0_0_0_1_152028 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFeatureCallID_in_rule__XMemberFeatureCall__FeatureAssignment_1_0_0_0_252071 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAssignment_in_rule__XMemberFeatureCall__ValueAssignment_1_0_152106 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_114_in_rule__XMemberFeatureCall__NullSafeAssignment_1_1_0_0_1_152142 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_113_in_rule__XMemberFeatureCall__ExplicitStaticAssignment_1_1_0_0_1_252186 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_152225 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__XMemberFeatureCall__TypeArgumentsAssignment_1_1_1_2_152256 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdOrSuper_in_rule__XMemberFeatureCall__FeatureAssignment_1_1_252291 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XMemberFeatureCall__ExplicitOperationCallAssignment_1_1_3_052331 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXShortClosure_in_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_052370 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_052401 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_1_1_152432 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXClosure_in_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_452463 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XSetLiteral__ElementsAssignment_3_052494 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XSetLiteral__ElementsAssignment_3_1_152525 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XListLiteral__ElementsAssignment_3_052556 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XListLiteral__ElementsAssignment_3_1_152587 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_052618 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_rule__XClosure__DeclaredFormalParametersAssignment_1_0_0_1_152649 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_115_in_rule__XClosure__ExplicitSyntaxAssignment_1_0_152685 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpressionInClosure_in_rule__XClosure__ExpressionAssignment_252724 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_rule__XExpressionInClosure__ExpressionsAssignment_1_052755 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_052786 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_rule__XShortClosure__DeclaredFormalParametersAssignment_0_0_1_1_152817 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_115_in_rule__XShortClosure__ExplicitSyntaxAssignment_0_0_252853 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XShortClosure__ExpressionAssignment_152892 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XIfExpression__IfAssignment_352923 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XIfExpression__ThenAssignment_552954 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XIfExpression__ElseAssignment_6_152985 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_rule__XSwitchExpression__DeclaredParamAssignment_2_0_0_0_153016 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XSwitchExpression__SwitchAssignment_2_0_153047 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_rule__XSwitchExpression__DeclaredParamAssignment_2_1_0_0_053078 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XSwitchExpression__SwitchAssignment_2_1_153109 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCasePart_in_rule__XSwitchExpression__CasesAssignment_453140 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XSwitchExpression__DefaultAssignment_5_253171 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__XCasePart__TypeGuardAssignment_153202 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XCasePart__CaseAssignment_2_153233 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XCasePart__ThenAssignment_3_0_153264 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__XCasePart__FallThroughAssignment_3_153300 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_rule__XForLoopExpression__DeclaredParamAssignment_0_0_353339 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XForLoopExpression__ForExpressionAssignment_153370 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XForLoopExpression__EachExpressionAssignment_353401 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_rule__XBasicForLoopExpression__InitExpressionsAssignment_3_053432 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_rule__XBasicForLoopExpression__InitExpressionsAssignment_3_1_153463 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XBasicForLoopExpression__ExpressionAssignment_553494 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_053525 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XBasicForLoopExpression__UpdateExpressionsAssignment_7_1_153556 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XBasicForLoopExpression__EachExpressionAssignment_953587 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XWhileExpression__PredicateAssignment_353618 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XWhileExpression__BodyAssignment_553649 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XDoWhileExpression__BodyAssignment_253680 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XDoWhileExpression__PredicateAssignment_553711 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_rule__XBlockExpression__ExpressionsAssignment_2_053742 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_116_in_rule__XVariableDeclaration__WriteableAssignment_1_053778 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__XVariableDeclaration__TypeAssignment_2_0_0_053817 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__XVariableDeclaration__NameAssignment_2_0_0_153848 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__XVariableDeclaration__NameAssignment_2_153879 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XVariableDeclaration__RightAssignment_3_153910 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__JvmFormalParameter__ParameterTypeAssignment_053941 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__JvmFormalParameter__NameAssignment_153972 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__FullJvmFormalParameter__ParameterTypeAssignment_054003 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__FullJvmFormalParameter__NameAssignment_154034 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__XFeatureCall__TypeArgumentsAssignment_1_154065 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__XFeatureCall__TypeArgumentsAssignment_1_2_154096 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdOrSuper_in_rule__XFeatureCall__FeatureAssignment_254131 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XFeatureCall__ExplicitOperationCallAssignment_3_054171 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXShortClosure_in_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_054210 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_054241 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_1_1_154272 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXClosure_in_rule__XFeatureCall__FeatureCallArgumentsAssignment_454303 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__XConstructorCall__ConstructorAssignment_254338 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__XConstructorCall__TypeArgumentsAssignment_3_154373 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__XConstructorCall__TypeArgumentsAssignment_3_2_154404 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__XConstructorCall__ExplicitConstructorCallAssignment_4_054440 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXShortClosure_in_rule__XConstructorCall__ArgumentsAssignment_4_1_054479 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XConstructorCall__ArgumentsAssignment_4_1_1_054510 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XConstructorCall__ArgumentsAssignment_4_1_1_1_154541 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXClosure_in_rule__XConstructorCall__ArgumentsAssignment_554572 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_117_in_rule__XBooleanLiteral__IsTrueAssignment_1_154608 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNumber_in_rule__XNumberLiteral__ValueAssignment_154647 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__XStringLiteral__ValueAssignment_154678 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__XTypeLiteral__TypeAssignment_354713 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleArrayBrackets_in_rule__XTypeLiteral__ArrayDimensionsAssignment_454748 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XThrowExpression__ExpressionAssignment_254779 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XReturnExpression__ExpressionAssignment_254810 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XTryCatchFinallyExpression__ExpressionAssignment_254841 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCatchClause_in_rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_054872 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_0_1_154903 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XTryCatchFinallyExpression__FinallyExpressionAssignment_3_1_154934 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XSynchronizedExpression__ParamAssignment_154965 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XSynchronizedExpression__ExpressionAssignment_354996 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFullJvmFormalParameter_in_rule__XCatchClause__DeclaredParamAssignment_255027 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_rule__XCatchClause__ExpressionAssignment_455058 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__XFunctionTypeRef__ParamTypesAssignment_0_1_055089 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__XFunctionTypeRef__ParamTypesAssignment_0_1_1_155120 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__XFunctionTypeRef__ReturnTypeAssignment_255151 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__JvmParameterizedTypeReference__TypeAssignment_055186 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_155221 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_2_155252 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__JvmParameterizedTypeReference__TypeAssignment_1_4_155287 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_155322 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_rule__JvmParameterizedTypeReference__ArgumentsAssignment_1_4_2_2_155353 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmUpperBound_in_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_055384 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmUpperBoundAnded_in_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_0_155415 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmLowerBound_in_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_055446 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmLowerBoundAnded_in_rule__JvmWildcardTypeReference__ConstraintsAssignment_2_1_155477 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__JvmUpperBound__TypeReferenceAssignment_155508 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__JvmUpperBoundAnded__TypeReferenceAssignment_155539 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__JvmLowerBound__TypeReferenceAssignment_155570 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_rule__JvmLowerBoundAnded__TypeReferenceAssignment_155601 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__XImportDeclaration__StaticAssignment_1_0_055641 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_53_in_rule__XImportDeclaration__ExtensionAssignment_1_0_155685 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedNameInStaticImport_in_rule__XImportDeclaration__ImportedTypeAssignment_1_0_255728 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__XImportDeclaration__WildcardAssignment_1_0_3_055768 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__XImportDeclaration__MemberNameAssignment_1_0_3_155807 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__XImportDeclaration__ImportedTypeAssignment_1_155842 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedNameWithWildcard_in_rule__XImportDeclaration__ImportedNamespaceAssignment_1_255877 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotation__Group_3_1_0__0_in_synpred36_InternalFormat8201 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValueOrCommaList__Group_0__0_in_synpred37_InternalFormat8252 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAnnotationElementValue__Group_0__0_in_synpred38_InternalFormat8303 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OpOther__Group_6_1_0__0_in_synpred63_InternalFormat9085 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_synpred64_InternalFormat9104 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_3_1_0_in_synpred77_InternalFormat9663 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXForLoopExpression_in_synpred85_InternalFormat9836 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBasicForLoopExpression_in_synpred86_InternalFormat9854 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_0__0_in_synpred99_InternalFormat10173 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XVariableDeclaration__Group_2_0__0_in_synpred103_InternalFormat10377 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_3_1_0_in_synpred104_InternalFormat10428 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__ArgumentsAssignment_4_1_0_in_synpred110_InternalFormat10643 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAssignment__Group_1_1__0_in_synpred160_InternalFormat22268 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOrExpression__Group_1__0_in_synpred162_InternalFormat23072 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAndExpression__Group_1__0_in_synpred163_InternalFormat23495 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XEqualityExpression__Group_1__0_in_synpred164_InternalFormat23918 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XRelationalExpression__Alternatives_1_in_synpred165_InternalFormat24341 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XOtherOperatorExpression__Group_1__0_in_synpred166_InternalFormat25193 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XAdditiveExpression__Group_1__0_in_synpred167_InternalFormat26355 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMultiplicativeExpression__Group_1__0_in_synpred168_InternalFormat26778 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XCastedExpression__Group_1__0_in_synpred169_InternalFormat27385 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XPostfixOperation__Group_1__0_in_synpred170_InternalFormat27810 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Alternatives_1_in_synpred171_InternalFormat28112 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__Group_1_1_3__0_in_synpred173_InternalFormat28783 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XMemberFeatureCall__MemberCallArgumentsAssignment_1_1_4_in_synpred174_InternalFormat28841 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XClosure__Group_1__0_in_synpred182_InternalFormat31077 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XIfExpression__Group_6__0_in_synpred189_InternalFormat33283 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XSwitchExpression__Group_2_1_0__0_in_synpred192_InternalFormat34354 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__Group_3__0_in_synpred205_InternalFormat39248 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XFeatureCall__FeatureCallArgumentsAssignment_4_in_synpred206_InternalFormat39306 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_3__0_in_synpred210_InternalFormat40364 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__Group_4__0_in_synpred211_InternalFormat40425 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XConstructorCall__ArgumentsAssignment_5_in_synpred212_InternalFormat40483 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XReturnExpression__ExpressionAssignment_2_in_synpred217_InternalFormat42535 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__CatchClausesAssignment_3_0_0_in_synpred218_InternalFormat42864 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__XTryCatchFinallyExpression__Group_3_0_1__0_in_synpred219_InternalFormat42924 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group_1__0_in_synpred220_InternalFormat44102 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmTypeReference__Group_0_1__0_in_synpred222_InternalFormat44593 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1__0_in_synpred226_InternalFormat45639 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4__0_in_synpred228_InternalFormat45948 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__JvmParameterizedTypeReference__Group_1_4_2__0_in_synpred229_InternalFormat46259 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_1 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_2 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x0000000000300022L});
+    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x4000000000000000L});
+    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x00000000000C0020L});
+    public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x8004040000000020L,0x0000040000000001L});
+    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000001L});
+    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000040000000022L,0x0000040000000000L});
+    public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000000300020L});
+    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000000000020L,0x0000030000000000L});
+    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000002L});
+    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000000004000L});
+    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000000110L});
+    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000040000000020L,0x0000040000000000L});
+    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000004L});
+    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x00000000000C6120L,0x0000000000000638L});
+    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x00000000000C6122L,0x0000000000000630L});
+    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000040000000000L,0x0000040000000000L});
+    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x00000000000C6120L,0x0000000000000438L});
+    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x00000000000C6122L,0x0000000000000430L});
+    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x00000000000C0120L});
+    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000000000000000L,0x00000000000000C0L});
+    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000080L});
+    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
+    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000180L});
+    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x00000000000C6120L,0x0000000000000010L});
+    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0000000000020000L,0x00011800000FC000L});
+    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000082L});
+    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000002000000000L,0x0000000000000104L});
+    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x00000000000C6120L,0x0000000000000630L});
+    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0000000000000100L});
+    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000800L});
+    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0000000000000000L,0x0000000000003000L});
+    public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x0002000000000000L});
+    public static final BitSet FOLLOW_36 = new BitSet(new long[]{0x1F00000000000000L});
+    public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x00000000000C0030L});
+    public static final BitSet FOLLOW_38 = new BitSet(new long[]{0x0000000000000000L,0x0000000000020000L});
+    public static final BitSet FOLLOW_39 = new BitSet(new long[]{0x00000000000C0030L,0x0000200000000004L});
+    public static final BitSet FOLLOW_40 = new BitSet(new long[]{0x0000000000000000L,0x0000C00000000000L});
+    public static final BitSet FOLLOW_41 = new BitSet(new long[]{0x00000000000C0030L,0x0000200000000000L});
+    public static final BitSet FOLLOW_42 = new BitSet(new long[]{0x0000000000000000L,0x0000800000000000L});
+    public static final BitSet FOLLOW_43 = new BitSet(new long[]{0x0000000000020000L,0x0001000000000000L});
+    public static final BitSet FOLLOW_44 = new BitSet(new long[]{0x00000000000C0030L,0x0000000000000004L});
+    public static final BitSet FOLLOW_45 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
+    public static final BitSet FOLLOW_46 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
+    public static final BitSet FOLLOW_47 = new BitSet(new long[]{0x0002000000000002L});
+    public static final BitSet FOLLOW_48 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
+    public static final BitSet FOLLOW_49 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900C34L});
+    public static final BitSet FOLLOW_50 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900434L});
+    public static final BitSet FOLLOW_51 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900474L});
+    public static final BitSet FOLLOW_52 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_53 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000020L});
+    public static final BitSet FOLLOW_54 = new BitSet(new long[]{0x003C000000300020L});
+    public static final BitSet FOLLOW_55 = new BitSet(new long[]{0x0000000307C00000L});
+    public static final BitSet FOLLOW_56 = new BitSet(new long[]{0x0000000200000000L});
+    public static final BitSet FOLLOW_57 = new BitSet(new long[]{0x0000000180000000L});
+    public static final BitSet FOLLOW_58 = new BitSet(new long[]{0x0000000000008000L});
+    public static final BitSet FOLLOW_59 = new BitSet(new long[]{0x0000000000008002L});
+    public static final BitSet FOLLOW_60 = new BitSet(new long[]{0x0000000000010000L});
+    public static final BitSet FOLLOW_61 = new BitSet(new long[]{0x0000000000010002L});
+    public static final BitSet FOLLOW_62 = new BitSet(new long[]{0x0000000078000000L});
+    public static final BitSet FOLLOW_63 = new BitSet(new long[]{0x0000000078000002L});
+    public static final BitSet FOLLOW_64 = new BitSet(new long[]{0x0000000380000000L,0x0000000000200000L});
+    public static final BitSet FOLLOW_65 = new BitSet(new long[]{0x0000000380000002L,0x0000000000200000L});
+    public static final BitSet FOLLOW_66 = new BitSet(new long[]{0x0000002000300020L,0x0000000000000400L});
+    public static final BitSet FOLLOW_67 = new BitSet(new long[]{0x0000000000000000L,0x0000000000200000L});
+    public static final BitSet FOLLOW_68 = new BitSet(new long[]{0x000000FF00000000L});
+    public static final BitSet FOLLOW_69 = new BitSet(new long[]{0x000000FF00000002L});
+    public static final BitSet FOLLOW_70 = new BitSet(new long[]{0x0000001000000000L});
+    public static final BitSet FOLLOW_71 = new BitSet(new long[]{0x0000000100000000L});
+    public static final BitSet FOLLOW_72 = new BitSet(new long[]{0x0000002200000000L});
+    public static final BitSet FOLLOW_73 = new BitSet(new long[]{0x0000030000000000L});
+    public static final BitSet FOLLOW_74 = new BitSet(new long[]{0x0000030000000002L});
+    public static final BitSet FOLLOW_75 = new BitSet(new long[]{0x00003C0000000000L});
+    public static final BitSet FOLLOW_76 = new BitSet(new long[]{0x00003C0000000002L});
+    public static final BitSet FOLLOW_77 = new BitSet(new long[]{0x0000430000000000L});
+    public static final BitSet FOLLOW_78 = new BitSet(new long[]{0x0000000000000000L,0x0000000000400000L});
+    public static final BitSet FOLLOW_79 = new BitSet(new long[]{0x0000000000000002L,0x0000000000400000L});
+    public static final BitSet FOLLOW_80 = new BitSet(new long[]{0x0001800000000000L});
+    public static final BitSet FOLLOW_81 = new BitSet(new long[]{0x0002000000000000L,0x0006000000000000L});
+    public static final BitSet FOLLOW_82 = new BitSet(new long[]{0x0002000000000002L,0x0006000000000000L});
+    public static final BitSet FOLLOW_83 = new BitSet(new long[]{0x0002000000000000L,0x0002000000000000L});
+    public static final BitSet FOLLOW_84 = new BitSet(new long[]{0x007C000200300020L});
+    public static final BitSet FOLLOW_85 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000420L});
+    public static final BitSet FOLLOW_86 = new BitSet(new long[]{0x0000002000300020L,0x0000004000000400L});
+    public static final BitSet FOLLOW_87 = new BitSet(new long[]{0x0000000100000000L,0x0000000000000080L});
+    public static final BitSet FOLLOW_88 = new BitSet(new long[]{0x40FC4322003001F0L,0x00280017FA900C34L});
+    public static final BitSet FOLLOW_89 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA90043CL});
+    public static final BitSet FOLLOW_90 = new BitSet(new long[]{0x40FC4322003801F0L,0x00380017FA900434L});
+    public static final BitSet FOLLOW_91 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000040L});
+    public static final BitSet FOLLOW_92 = new BitSet(new long[]{0x0000002000300020L,0x0008000000000400L});
+    public static final BitSet FOLLOW_93 = new BitSet(new long[]{0x40FC4302003801F2L,0x00300017FA900434L});
+    public static final BitSet FOLLOW_94 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
+    public static final BitSet FOLLOW_95 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
+    public static final BitSet FOLLOW_96 = new BitSet(new long[]{0x0000000000000000L,0x0000000002000000L});
+    public static final BitSet FOLLOW_97 = new BitSet(new long[]{0x40FC4322003001F0L,0x00200017FA900434L});
+    public static final BitSet FOLLOW_98 = new BitSet(new long[]{0x0000002000340020L,0x0000000004000588L});
+    public static final BitSet FOLLOW_99 = new BitSet(new long[]{0x0000002000300022L,0x0000000004000580L});
+    public static final BitSet FOLLOW_100 = new BitSet(new long[]{0x0000002000300020L,0x0000000004000580L});
+    public static final BitSet FOLLOW_101 = new BitSet(new long[]{0x40FC4302003801F0L,0x00300017FA900436L});
+    public static final BitSet FOLLOW_102 = new BitSet(new long[]{0x40FC4302003001F0L,0x00200017FA900436L});
+    public static final BitSet FOLLOW_103 = new BitSet(new long[]{0x40FC4302003801F0L,0x00300017FA900434L});
+    public static final BitSet FOLLOW_104 = new BitSet(new long[]{0x0000000000000000L,0x0000000008000000L});
+    public static final BitSet FOLLOW_105 = new BitSet(new long[]{0x0000000000000000L,0x0000000010000000L});
+    public static final BitSet FOLLOW_106 = new BitSet(new long[]{0x40FC4302003801F0L,0x00300017FA90043CL});
+    public static final BitSet FOLLOW_107 = new BitSet(new long[]{0x0000000000080000L,0x0010000000000000L});
+    public static final BitSet FOLLOW_108 = new BitSet(new long[]{0x0000000000000000L,0x0000000020000000L});
+    public static final BitSet FOLLOW_109 = new BitSet(new long[]{0x0000000200000000L,0x0000000000000420L});
+    public static final BitSet FOLLOW_110 = new BitSet(new long[]{0x0080000000000000L,0x0020000000000000L});
+    public static final BitSet FOLLOW_111 = new BitSet(new long[]{0x0000000000000000L,0x0000000040000000L});
+    public static final BitSet FOLLOW_112 = new BitSet(new long[]{0x00000000000000D0L});
+    public static final BitSet FOLLOW_113 = new BitSet(new long[]{0x00800000000001D0L,0x00200000C0100020L});
+    public static final BitSet FOLLOW_114 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000820L});
+    public static final BitSet FOLLOW_115 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L});
+    public static final BitSet FOLLOW_116 = new BitSet(new long[]{0x0000000000000000L,0x0000000100000000L});
+    public static final BitSet FOLLOW_117 = new BitSet(new long[]{0x0000000000000000L,0x0000000200000000L});
+    public static final BitSet FOLLOW_118 = new BitSet(new long[]{0x0000000000000000L,0x0000000400000000L});
+    public static final BitSet FOLLOW_119 = new BitSet(new long[]{0x0000000000000000L,0x0000002800000000L});
+    public static final BitSet FOLLOW_120 = new BitSet(new long[]{0x0000000000000000L,0x0000000800000000L});
+    public static final BitSet FOLLOW_121 = new BitSet(new long[]{0x0000000000000002L,0x0000002000000000L});
+    public static final BitSet FOLLOW_122 = new BitSet(new long[]{0x0000000000000000L,0x0000001000000000L});
+    public static final BitSet FOLLOW_123 = new BitSet(new long[]{0x0000000000000090L});
+    public static final BitSet FOLLOW_124 = new BitSet(new long[]{0x0000002000300020L,0x0000000000000C00L});
+    public static final BitSet FOLLOW_125 = new BitSet(new long[]{0x0044000000000000L});
+    public static final BitSet FOLLOW_126 = new BitSet(new long[]{0x0000000000000000L,0x0000008000000000L});
+    public static final BitSet FOLLOW_127 = new BitSet(new long[]{0x0000000000000002L,0x0000008000000000L});
+    public static final BitSet FOLLOW_128 = new BitSet(new long[]{0x0000040000000000L});
+    public static final BitSet FOLLOW_129 = new BitSet(new long[]{0x0008000000300020L});
+    public static final BitSet FOLLOW_130 = new BitSet(new long[]{0x0020000000300020L});
+    public static final BitSet FOLLOW_131 = new BitSet(new long[]{0x0000040000300020L});
 
 }
\ No newline at end of file
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/Format.xtextbin b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/Format.xtextbin
index 0569f80a8d99acab61905bc7e6b408c61255d113..be233ebd74bf4a0a24a04d3b6eeffeb0911d101a 100644
GIT binary patch
literal 22986
zcma)EcYs_~_0F9)WotSRIwT>aFI7Sy<n<6pvLOj%sbR7^n+(~VS!QNQLXjpQ2q;xW
zItU^l*g%mYf^?)Pz5VDN6jZSPzVF=oX5P+jqVvzZa>{qkJ@>wI?!E7wnd|LtYTcq~
zSW2n!t1Feh*==oW*RGwJ>+H$*m2)$TrB!Xa?6lLYwvI|}UFCluNwlekd8KS`Z?=?3
z6|%j#DV@dMnb~8qJ;kGER*J=*^31NTH8a;y+|2G`sW)4h8Oop4+F#Cf8QyXtp;Tf|
zsINlNEbCTg0V`W56f4<EzE~*F?BJE<`O0dicF{^$VBcm#?80Itk{hL|tnbSu$9Cnq
z^Mzb_-+WhBuCT1QCRZq{RO{;4X)>h}t;=$y-h3h3v!uT#r|q_uFSSyXkycj2GW;*e
zbtjs7bCqmwu`Ab;QOU8mk}Ks3ow=@s(d9&AZgIAAO?FkTAu(wK?SUp^o9xmSbQVjw
z|COvwH3mlXutcKGN@siW*>XBZ8Omzz?8%nP`R;tK)R;&#1%9@YCFo&^rna_VX{D4e
ztWwF=Y)>UuD!}o_<jPI(gA+SXv~*@mU35aevOX~_)tKwa_2vqda;jOS8}`qwUt277
zrP7Fm{#;@^)uPg=M5AiuU#l9<zb2*B2$e`QFI=#~YhSo9ShUO<sjNiCYE;QlDwCd9
zD)#r)1Y4uQWwlLJV^l-)frU!GM;a*A2$0emV|jmS8^o$jD0gX1?xvC4%~U3p94CU>
z)aI(Oby03rwvy`-Q3Gw7T9dqmN~NqVHR!GQ*9sk5tIR-#xhZQKm9D=A+HEx_c+#6z
zL&8U=%a(LhC%03{#P$g_%$l-+D3I>ZCfxy@6HSGlHy%tAz?9r+qfF?Ly~RS?e(044
zEo3W~!JEmXO9<ZbxQVK%d2zN>&XsDxJZisVdQA-Lh}EIJ1DrVCnv}3Ifyek6mK@X8
zR!>?NHapUDli_r0ifV483NPE!lS)zfRMnK&2K-Qukpr!mKNbz4`;O5&O;k=#Si_Rr
ziLMRPs^ko+nW<Wu9mMvk0;4h2(4EUx`b#<8Hyew6Ik>!7O3cYr!=_EOj_^vwa=F?;
zQ$oFy=-!#S(JPFdDqZE<MKz~(g$ctC=tn0&U+P)}GpyafwmVv;!HRkt!uczNwg(ty
zfuZ3b(09%Etvx|HyPk9}cr3X$BBr6USdd|O4o-%5_LnetRJ>wOe{VtU15tAk;})dY
zHpED$u^mRY?IH*hb5n^Ul<h%S%J$Xp5#DNexf4!ak}a&trBXe)?us2SFtaM1F6CFP
zuGk?@k5$T^r-rBOeR<}nv^}2(hv4#lJea8L{rSHF7Z#{gA~7|Uwil9N5idiU-OdBb
zS<K4^@QiYn@PKlb@&Iy{@qdM~4<y+^JlP3k%XzRTI*b0<9q4CJV%Z0)wAI{K%5~*C
z*=3=7rm_zarz(|di9IC}_MvJ-bL|PC$LPlPV{)ZZzAGn!?ZYT{F2ElSxe&IuvX4+L
zsitgcRlkg6X=~b?jJ*O1>?6@^n<E4qb8ldj+F1#eNh)ctWW3v*;DLQzWX&1Y<@ug2
z4w-eV-NI_GVwi0yVKyWoM6Z^{&8v|ar<2b@9i{eBMgaV}hMt?N>>f4?MkBkIVP_X$
zRSSZtTq$Mq7@@UYMS|;N{KBpS`_M7mVt=8_vX9mROGGqM5Y_GiMp<N5psE26^<1H=
ztn7Yh7+#6@+%$TaeT=w4dwZ>F88|Xd9RkxjVp<POV+LSy3SBt>JJtXLh~osr@w9i6
zvQHRV{a0)1m3^XcoHV2>PNv#Zj4Kut*H&F|s@C|mnk#B|f#Nigc{)&}%l&Ymvd<VA
z$=7R0>@(pAg!AAAIg2R1VT`ZoF~*;5pg`?8qV`;4{5OYI`K_8t(~%G$=S5xVd@@g0
z_61<B5BLj-<47>s7m;coWnZk>lJ>V%rmhFt-w`n1RU=dOB^u)Q=&f-QIP(jITxmeS
zBR4Q3a=O@$(I^uel9hca70#sU%K%J|*$kx1Rcp$=Ld5Tk5#mZ9oJFdubQez9S6936
zHA7f*t+B}deq{f3#{TPvp#DMC{u{LY+JE*Bg_$FTeWMtC6OF!E8~r01y{#BMF9)OZ
zoldEgU0-MWa6F6qiUo}0ypc)FQT8p=b}M5~7+eg}YjTycW&aq0^{D<6(e_h<IaJv{
z<Nx6rld^wK_S?Wdsw3<#$hcs1TK4Ubu$^W90?;fxsp|<4Nxy{Tq<x3>V$%K<MNd}t
zo%(`h-v#$H_wn&ep=RK?8!9Kl`S(Q5{59DSO!p2&{TodU`uj*W1qb)zz?y@&`Yjns
zIXs^WlrLk(0}(yj_g4G1srHd}&hE3<+o#yyupgwQ=22Wt1uXj^-3Sk}5o$R}l>nAL
zB0hW+3Z+aDRgXax!pMF+GWU15J-A;!0Wu7f%6@V~J@+Y6td}OSpJr1I%n0n?SDW$=
z0^=D`Y(E=0@Hu)0&$8z=AgFo)QnnZ%g(Xk)WU%ZPs}f(5CVUy3yDIw?Bj{EBPo)Q6
zgP>}@VgFy1?R7BB#r-#Me?-T8L}jV6G$-+6*>8djf%6svXA}Zwz->75Z8~CFYD`|(
z;)$$&w7di1_PdZg#<0dnEc-nz{e4Q`q$)i|0u3LCRUg8Pj8>xTkC+$PALB;K{saw`
zDYGQ(Oj~m?KzvF{eE~-Ok@)7On&kOZ#-mab{Ru?1YoPlKVp_F)op?%Ee9pn<&j2~z
zvj4(}8ZF&g1JraFgZ@ezzkrQf4QQtMg{1;ZyUen`ta|)!Z0%`y9RD4hvy}Z0wh_lV
zHq$>PZTJ`PG_Eyyg2w!BQlTa7|KMJ8Z?1P`uEaExNS$FK3H**4$`U65OB~BsqS8(h
z^t+Ng1@h66;S^Wy%XVs+Y1;Jyi83aQ+zTi8+3(t4%yk-&bY_+=TQYyqJj-c}jB`*O
zrYxtKt>#FnH(oid%tDa2Im2<;az@aS!;~{pjcSYn8CpiE#*{N!*vA+O)^UmP)ah(u
zFyPGDRHSdln>#9JTqJ#Sk-mlD-BOJL=~fiFwFpH;CTgVy+fjsWXN1bxh)q(?_Asi+
zS#<D<_GSA9ODt!6)vgH?r_xDhBGPnc2NYYW|EWUbBn7H02Pt7<f|agt^i;cNY}eTl
zA=A<ktV14)Dy3MkoXODUOthRSh_%#kbcotbm2{?}J)CL6R4Z#NXL`g0k{M#?O!y(?
zwBecLuyUb9)-EEk#tG-_g2t~tgc(M=GE7*uIFl@AcSii?`ss~1kO~T$?8=^8psRZX
z(N_p)4*(h->e7k@9m)`A79{M>+TGa`fYQ!v5YAH0UTA=7rs%M+i8`vo!Y1n9&OSJa
z_fBc5xm0FD*@*VOrI?iH$!Sw8$Ej*Vxs$?^6qb3gOwTw-_wcpra3hcy33)z`$UE9g
zH78rnzQ$iufPKD@?nl!7ska09SDbc1jCP^WE+TC^XvcO0N3#^HtdBD+jxih{3`@wc
z6bzeoEXnoA3_!Lg&ay1Va-gsrM3&`X*}S8@vN~64H+5{Bt0TsBuyC<9at;+_PFGi+
z^Eh#a!(t4F3&Rm)SOJDDIu`c#RPud2EVb&`j*PKog>5C-I>9!w<G@0;v|gi=;O>eM
z=Oj+M!IE@VF-}*Tn|a15M%g-UG~7}3vATw_+Cx6ZD#Edsx(m?V(B3D?EvJavIuQGy
zG3gx50NGwSCH~J)PMQDH7+=s(p$3^2D0E5G^lM{qi{*>67NSRYc-b;4&baf|#SB|7
zUO1NI#|io3V!6_tUl;Sk@iFofgq+ohb0WycbS#u%J=UEp=cE|@$wGe$=}#5<#icwZ
zTn9wi*JAXi!RnFD>7+jc^rJdFsr~vpG4a99YB^tzQJ)Fv8Rsmv$2ZL7v)LZZ80#3}
zlXKv^WFfa!Ip@N0CRq~6;=FINdA>z4XrA*plpudVz7`XNHaj2C<T-SK&b(62g;D<Q
zTm-RFN=Bu&&N`io!DFK;aZrQk$I5rujMJ6#-3@SDVmOrZJyPxi-b=N<q=WKeU?DRu
zw~oP{#{>)O<f^aaDePQM0h1x%3R77-S3+rB;pALJk6#Us5ARsI8u^shQ!HcZ$#SlV
zx%*maOcWw4B%JGTmUOPC^M7E7ZlLp<>3q!&tx|cQo_B79*3G+Q;xN}G^XNU*B-i-q
zCW5$`VFI_;kyy@;Ow-)Lra|&Gm<B`Otpf4KI*A%C=|5-Zq7>cv2~<o3te*l+HJf&R
zhN~>f*r|RVwb5;+jc)(%z<;5Ell_;V9uYOj()EQ(cAajAJ1FjWQSmF#G=s)GMkV_0
zqzHMcL&#lX#oZvQZ>M_<ne*!i=Dh~yZ-$`0uO`%C<-!uiLFFPD=D@ik=K<0_2<JCO
zt!Ft8#Tx%%U`jctMWpc`6@-tm@gI*GAF_W(C5O@vPe`~5?UO?Ll#XA^c^W|fOCbE7
zSZ;<C)Ev6QJY%eU_P;YfXPCkMJgA3kj29?QH^z&gsc(#zDB@-KVv|@xGrv&n6tBem
z@~T+(8a=@hg}KY?(HP|R6g$_{MqVI#BQoessBNjmfaw8mQSsYQyj4tbd+DHTDOO`x
z&O0&v@5+<uJu<#8h(RoA&j5}OVjLezOMXPeADhdc5b<W{xI-`l^{1i(rAex3Z7E;L
zF{{#1&AKFcOtu7~&-7sr4nG(AKbu(ji+Jd-;I7V!I9~uS`{9?o%EdS71b@R->4(nW
z2VDP$x$gWk3Zj3p0p}>^-=Nboz#`y3bc5+dE=vq^;vx}d&?ihm;3mi)%|s~I0;!vX
z`$l!twVCCnYOZtBbe)@l>)Zx&`E{k-MoK$QxlN{Z-DbcV)Vgj90lf`+EG0!~Tv<;#
zf#ZTZf+$7;#psTuYx9-P)wR&E+)+j!5<Pb`U^KX62xF|i>~6vq9E%pL=Y-r%0WVV)
ziOSuKZR3uEgrtl5gFV#ULe93N6_b^_6~GUVMrs+O>05VeqDQB6r7W3Ez}te-2o{p<
zNCNk}+fx(<8+SY;TkZsDHc>TEF6=P0ib;`*9my{$CfBLJQjBR-cPfeC^=TZ?Fq7Yj
z!bSHZcRHxt8SrEi(;qBUmMWGzQ%U!9+vutmKBdepcyuSgO1V4Jqq{_8fWNC5D_I21
z>&FbZn7JFIBY552O*Fb+0g@EeD|Zjzl|!MN6`^%mS6J?Bv7TiGtaJA!EmGow(9WsS
z?t|+s-N<&9t;RCqs@2lf+_~hM&OpJ>wYBb~>)>(&)_$`{dX*~$1w^x)h^~rsDJa-8
zTv<5L0mrJsWmPe*1COdsXe)3XD;{?HDm|t#>{wr<-2F_@?2oggyMQiRsEOP~^z0T4
z!Xc$WIhR*j%dxx4T}-=>peXkMfKJOZTOdoV!Dx~-mnq6!hWm9xwR>RXHPErra9L@z
zcEl4>H&$J^tS-{-Aw+$s((!N@QI7!X7!#zStY9ZixknJ--pXA8^+Tk0?vYSyBfWD`
zQOMKET}h7V%I(|$N0;GHZjO{l@7!*X#w%NQ71B|6H6iM1!OhdUqZrfkyV^@jIcaaX
zYd|3Nf{TR{1elZ*dnmU6xn^P?o`w8k6fb>9A605oJbEN&tmgU5u63YE&4C7SOD1D<
z%K*1YcdcX|nBTe;AVcz~+<pn~V>V8`meg$4b&<Q)8+RSMamM2eBh8WJ6AmyZ=pMQe
zbW*H5sJ(C^eRvXl*x0cE&#_Xr$8t|rwFo~2PHb>bCDqqJH3n5gPmi8jtkR#R>D|*A
zHk<?;M1!t!hO`FPPTVsgsHJ0Ru2Pk7mXYucO5m(X?Iu{ymIytE5qfS!sFeFnI%$G(
zzr}xyda@pZ#M(U{UaRh4kV#DU0^=$7!pOz49D<0vcrfv|4KZ{`S)zxA?-KeYfZhsE
zm223)XCPe~b(+{+fWJ(@Urz8`^FTJ_UJAii8t_-~|4`*#t)tO$uNjQz+6a8K;^CSV
z50@(*b(V6$LqFqPS@DP->Fy7C<3Z)#NIPzV9V0tj?CHs63)N=e@`p@b0r!t2a&IB-
zTMh0X(?VAE1NmUhPo#0VsFB7f%~AhnK$gjumzDZ;UgZ89H&dv^auRpSy^Sz#2aFLN
zi~2bcT1D}T7>ZvCiaUtnR|dtMM8S#d0c-%l^^Mwuk;|10_Z}$7XhO^VH6-Yv;a<VZ
z)eQGOOcy5i4LU6M{_5@DLTl1}K!_d$ZfmD?%6&)<I-uxbjsnv#4nBgVZue1K=Tf)(
z7!R=2?LN-SlK5wF`3YX`#^on@`6-^^3FSV`gAkX0&jYN#yOP>7ekHX>U_UDWo)Z^5
zFUOLluT<`f<UtDOz9g4l=4oEJvSKiwqrt0k{WV_iQSSfoe}Q(qa$gsLZwSSkbirG6
z!F+7kao<+h!(h4ZBof0C8EhV!U#K7y-W7)T2>*RbqOl+FfX04EXJBI3{fPHJj_!XF
z-T#yaFpsGINNs<Dwgx}&<}Y*>Sng-gsN3Xoar&P%AQvezpEXJMuY&UnN<mnC$^QVN
z{uYhIf9I8H%KZobXW-61wFKq<D<b)~;QtQ=dBaGyQhAF1@SvB#<&<afG_SlQ|K}?&
z#s4nlrTOmzyO#l7#%thtkMbnHU7)-sL)Wb7Jee-<R-SB)LhH)U!<;#dvAhu^o2k5!
zf@PFO>W$WJA#HldO>0KX7|?lRWdvH(-_sLy7;h8!&~#gm^Xitj89IzNPG9ymj|Qd~
z6Aa=cd#V6Al<sXw*;`3>)H}wi(zlLD-$tZwOX=Gg>Dx!$aR3`6jvvq+y$Mi&1qV?!
zk;--uLpTpnRW&K5YDcKbc$2AWicvK+G9<<XMbltNhWTg_j-O5sPgdRxXs;Gm-b|zp
zUK_<svUXN!ZzllYoRzn;&Xh-HxxVY?u~UT8_&R6yb^#SubCtI%h2q&NKaa_-w>!`e
z@0i~m%M87*#Nh7%_zm7H!so^yG><o%@UaJD02ib)`L*)E&gpbwp9Ac;z?9G12g*2{
zdy?!<QJyV^nH1S`qT6m1VxCOCrE(mFJ)gup6j^~GrWqbHU5}aWm<~)VEhrZI;-<us
zTu+i*&m_4Xliak&B-b-Zt|v(@pZkLZK~Fo3N_H1Z$}?%L$E0>}HRVZii)zY~<d&t5
z$MkkMcx%YSjwr+RWS0?qvK(|Ha@lx!D1;p~gS~@k?;)^vT!))2=Q{^swLFvlI>_uj
z>?cY!dxz7^BTW0PVEZwbADSO{kF45?fnS<(Wz;N8d`IRB`AW?e6J<<&Sp$1H(qbg_
zy2(6Ud8;<av)b^0D^KFRl!wW6jxlxBfValD!0Rz|y%8dABpTh{*M;3zgD`PBkwjfz
zgh^6hU@C2dt8BP{iaUzXV?6F98meVvHXdQkR%ZI^twYO<>R7%ykJYK_JfP*Rk9DbI
zWkfiRO=2eCy%X3ZoZGHrgw(GBL3%CaDepw0LC4~Tp{DAdGYOHCBTG*)h))GgYGtu&
zz1;p<)g<MeMx3WhkMWCj3N7!97}Bpx=RcE3O=jy!X3IV@h!t4RhHk5?sJwFqC_gvC
z_RW|rlI_Bl^9I{;enfwPwuR2Ukf1LT=dyNQ8+Y!-G02#RPbIzY5b}3Tyk8PIw~i4~
zzehk7%2VE@08$@yml-5Pa5)iN0R*G5K*rr6aR^t&AY3I7t|kOC$L?KA2%N*I=Y-tv
z14BmdH&Nbo68*_B-T6`(TOTTmV;c+W!CfB%$86cV0pPamSXNr^WiiDRavO9{d_Bhd
zVGQMsK$-GxB1)4kd)zLR+8QV~C<1VA0o-Jzv|f3)4&ksL8%&;L(%w&@#PX0sGtX?r
zs$J)5Y|_OZdoyPIoUpl3s1;K-)ti>bO+tLsaF>u2@UgoX)R;}DJ<PkK-o@k)7?t-c
z#tP!;PM{iMRKAOv?uMq#LZk|VR~Rhs9_pNAIk!Lo=HP*wTZaa(G<at7kar($S7$iA
z`=P+BG<d%y7K|DX4B?>%jfZ5&cqkgg9u`{~u+N`uro2bMIoh1n;!L{oqg4UkV*>MW
zXsdB@yU+$Wxo1e1RE*~*appY*k8Iw7Su`xFug;b0=7_wfV*&GfC`)>OFm8TE%krMp
zrqUY7e9k1%-t&U&1wEnUy@<1v_Y!06Wg`*UOLJCsM03iSo6fvfB$<4b0+Cw220Lmq
z{Iy**9*Y2Lwmer~2Tgox#e0MK(VM0rcSnNs7Gdr|Xm9h#=FvOgs?}HCyS%}LSMNQ*
zOndJe&>x5i9}@IO8npK@!;ypEptVtz9;LUzaI$3?7GQD}vFQ`ol=MC|HgTT4k*Vs^
zY_~2ay+6^Kx!7^zeYPQkKd%}LDonl0+?Dqi%G_IdoP8f+?#kmlyp6dl@5|`X_cwCj
z(Z?D1p*T1fPY&h%la!dd^8N+V0S^8*9sHk~gMCiLW9~{R6c@VE@e}`T9?F+01@lmT
z(v&uS3W~<oJUDO~%1^V2Fb(Br*d~6%Mu{6qj7PE`&Dr}>)J#`?%SQQH4Igchse2^K
z{s^6oY#7=|a_KoJkdG1{a5~)QOuprFCf_$R`F?dKzkVei`%lecKZC~Kw9f1PX7IW%
zWe~<EgtfmpwEA11?>4pf8DW;cC7MM_P=71-B!6qh&9rIC=d`{x12tv!=WlC*!rx9u
zyT84_9Z$FubhP^uqlXq|(+BJ`Q0Yvi8sh#Al%6fqZIb}JTCDgx0wgBW&Cj14shna|
zP8F5YsM2g4@@G&b^B@-kVQkBWO1JRU0GZM(bcvH@);kGrOr(6-WMrJQGo7>xoP<pn
zvT?-ncdfc;H@GO}!<XF1=5w0gnu>!xc%e=Cv-rP575ko0)+(<f7ziAReeNZ~4iowL
zdqw8$ZOoe^=IulC<{FRA7{U(LLGdo;JG8?khq1$>9X{+xxA$SkjO7PaD?(}Lc?64g
zmUknn&Fs$~60~e0((@R~M-e2cy1&4Hmd!){B7$z;2<XN2pbsGEB{9%T33{1!zHAP%
z`~$174+88ae>q@VGxkw_2M&@mXYQ?h&f#1BA+!hA4<*4&jE(+b=Ey&s2iT?SA0d=0
z4CRsHhpaII#R{Z!ntNUPA5wDFBX0Mx{8c=M*45xn`gy~Bl-yfm?n$|^H=5Y*HCH$R
zPYAeF<l){x)5n9kd?v}yKYB>lml!WxL&wj@D}37Z714(Yb{RH~k+ZdIfOVz;*0WP!
z>w3q0Yy!#RRlW9DwT{PVu3BeE$2b;Pn)8MfQwh*@9N^UY<?(>Qe(9eey1r^O%ex5v
zNz`m6&i$d{^_2RiKb1`{JAF*NvcB+HUtn<Zu(ce?h2^uX(1X+0;q8=vCOx(f2D`Ha
z#5ZutreFoZZFBxPJb-7<)i>xe{CvJwFt{Uri;i8cNt7@1=cqsZ^NnTL(1WuJY1u`_
zr$brB8T0`?@!PcQJLE8yaq8UX)OmAzU$m>v@;Py?O}kV~y9|)6IWX;V9&C?;D{zpU
z!%J84XnPz*V6Pg|psQ)nQcdGu6LnJT(vcX!^f~Ogj`m!?5qo}6Z_f?1M`{3L52w(5
zPN8#T!CN*yD*<iFkBEKJqzL9ML&Ch3Fxw5xA4f3pW`Mwy<lp}pVg7t0FmJ1ec{^eL
zf*c0sFA4Jwz)ZFGwU;cPGw2%SokV%OZ1(^PpEKu!qk|LZ&i)3aydQumOdlz}puAU{
z`5U6VZzCx0uSfY?qI@8Rl8L?l5Ks;`j~lZo)PJ}N_YuTLga0T&PeU*~#)BC+c$^1Q
zaqv4HwBg_h9_)YvZm~)FPvMl^Lnhnt|9hUZn_#XTx1ZrDIt!9<CWkzHjsnoXqMy$l
zGlPBe0)1n49b(hQG{^QIa_0GWIQ#oIIqm)>&Qkw$XSu)3In?)^75*+xr&Dm&I>-52
zI43%%x+l3`bI)`yaUOJDcCPlG@^*Jex--0a-XY#P?{qimyzRX2-0a=$E_e2Dk8;j%
zZ}P^vw|iT8J9rm)S9mwL^Ss-3b?@<Cgx5yuE$Y#}bu{x!RlmK=(84Zt{}sTUrF_;1
zx&(0V^IwZ*{eAAz*&Va~D(Sy2t@;M0^8GjI98C55Z}9+A{r=n0(EASWzZ>0uFS`Fe
z59ASvN&a-o|3D?N&Du(@;|6Nwe~8oVamJ}y<$r{;>Sk*HW1RV)U`KX(L$AMf@a@UA
z4vK2SHs0zx<j6WQY5!Arq9u0O^8W~<{EsdFPk0KXxujU*ft{bh&XoT-qxa7dAuN>Q
zz*atsgAuh?5INs0nadXp-Y?1Uk>&pll9QO6Kv7(iO;Y&m?{GLLnEijS39ydgqc&i_
znXLS1UBZ`j37_u*j5hCE<6Y8z?9IR=hAdkKtP%nR+qR0qH@mm1v{sPNCIl93-DZHT
z^~5R}B-zG6O84V{8+fcB!)|Io(9)m*mIiz!0G0+#v=sXRU}<%AT&06%i7KUn7B)Ql
zOwbBBwHh%PPW&T)f7}M}Tfs=`_y8N`fov4|xfQSiNCsmJzOiz)30f-Pd*2}C`f0Ek
zRZdXBIQ}y?2sYQAwt_8yVc?=@z}1a_s~d3~1GbF^T;_;yY$G_f1rq`*i1zSM3DSMZ
zK7#SoJ6#161}mGWm64n|J~veb+{Xg|(J#R2hL$tg$e98;8;SzHHGn9<FTl>8xPQ5;
zC*ZE02^;WldkL9DZ<b5aR>18(k%?_$A~*RYgPo15cagJQ>FV8Lu9jpUu4b~YU5&*J
z2DKH;8f^WZ#?k;gd$fsM-=M3wxu>pOxWh-gCD<o&)m)&k0$bk+oJf^RSY8!Yx+*Ed
zXF}kU4ntiK7;WKTZS$(ybUOr+_{+LZpn@5}2tY}vW(V^z7zO)bFjD;1g1oG+g8k#;
zRj@#f9wV;?^4;Yjz5o#{1bb$;*sJ_md^`c4(ZD-{ZSpCNHhfB>O@9agD;)TgMjKWn
z@Rw*y%H&u^Usaij!6G#9SbY~8n!EF>`t_Fvtbnyfu)qoyql0EPZ8IVU5UFHv06f|d
zEP-uJS}68;sDR5XvM>|KGK;QE=jqRX$PjQKhk%2qVZIeChX#c==M4dRKNnYmg8{A4
zFIM0MyfqRW0_xdTBXk}rt#}w|4hK#1eDnGVw&(<0P|;K?5QWL$NKnmH0oP0#qJ3Kd
zcMM@4rL0Z{olz`FQ8H5nIW5?<BgzsTkE~2m*w(jN1*_5iTj_V2&F*UM2Cq3!Ow7~7
zqar85C@z=4D0a1;NN6u{MQ=w3Ts9d~bt9I7a+sMdmqlEW;`%6Vf4pr5aYsWO9|I~V
zX$z7;8Pd|7+?TF`3S>3OaW;CBJLo5ZW9U}EW!-{~yVf9F$7aTE^5~9A2J7MHRB$Yx
z%<Pb?SQ_wJxID4=GF@;y^d)fx7*4>=X6%Q@t2ed#U&Z~5Ub`jE6G2m*oDEI_n7O!m
zGKet12iy&01zaL&gh+V;iQ!x(2~Gp(ChQn!UwITZ2wB1D(#*jb+)RM|8r)2fTZOk>
z<TjwoUZA(cJ9v#c)uNHrgq{VVX2lo~q|(_72WN9?37Z?`ix>Jac@EW|3-u{}lfnwV
zY5esq`V0FQcohoI6ZBjq2`&I}YxLrpX1dTYT|_24?BaL9d@&rI3BJuyh@}mC-9<oy
z_Z8^*#-jNefovEHE`h(Qmq5k!63mwbm-7EO6<nrmXzt3FxR(lFWYLCjtt8-D$)<7b
zene#jTrZ*Os|XUc?T}<Zd$pK)4aHpxaho7wm_LQ3TrMW<`$pPzl!ndDLs3E4^)Njh
z{D9aGRlyBttC6epIAO92gPuE#f*YyMj1uNH7MIub_gTSBM%~Ru-B46e_anj1%1J&f
zA^~<Qdlp}!=2-L-@GG>Cvl1bL&tORNrh}hSJs!3yz`{wYVU7N3jj(gQBnqYAHr*Ai
z;C5Ps2h%S$Xb~$YSOk$+G~tsx;F}697^XY%-WH##BA%}*1b4ykmW8!DR&ckm_a54d
z6f|}dW^%1072Hd?vsLgL$Za%ojXUq7)cYZ|!7y6EZ;iwUC=sKvxdCYpLRvC-h=yZ}
zJ-><~$R4JQM<`=~zG?-J8X1on8RiCLJPyY<1ivH86JTjw%J)dCd`}v_r^pBI$M1sq
zX=ybsc31%yJJRwNstTR~q*zAyETun3SLrcFy1NxTZ-l>KTot<s*)NLhm&7=|Nl}b@
z8M4@_!7I4aRLYqzGReJH88ELIsp~Kl{~s00$Sxy}EP)h?VubFqZvb>-p}0ch7NR%F
z^A^C4UBXYQEY9M+yTYofN8UE#-yvu`eTN_d_;<x6ERu%HOz4U}Ek*_J4|L53)b=5?
zHDaVRe&GrV`#V=qIPyn#AeT!dR`6-PQ~pRPr@<+I8tjzM=#<Z6PT_8=np42^7hd=)
zFpOM)PiL(yW&5hueqs2&BoyodtRny-?8yS6zl**9;6VA$hy{}WC71sVH#GJb(JH{6
zEO~B)!v?q_RN56POn@sHS~L=0h06E#_p)`vWOSeF9}OmFkUL!RfD=_H6-{q;U6rT7
z++oXxjo@o86eAlX0zz))YC!~4@d+uboUjEh8LmIq6FDSo)z*c>=@9Je8E{)A!x6xq
z4o5<0rc;0DCmf}p7HParnCsF?N8`Re2dpvlU^sT5Gd77#;`&CD>;~r>Tw?BKxQEv?
zz&g%6h)OxWgnEo#CJQ&GzoSc_LTyBcHx!C1OS$YC4Pi?VMOSFD3b&%oThr$D?(Q-+
z>YBkL+{W0vt+9E)ZP<)ukyI+&o;DYSQ-$LP+dLs|^TdJH?hsjvMUlZ!cN_$DGNDc(
z)cFPGm{q7#4b*7{>VVsTI$c6*2I4eiVT4{5VnQdB!YJH{uFe-aOY#{s?ItX}#;$>M
z7hb??A({vmc8$V$w}Ce89@+Gj!7aE4?nw*M?|eHV+>_mJQBf!SRdZ$=jC+~xS4RMY
zuz-T#nL~s2iHISS8^@Xu)jDUD_N6MlkIYPLgxp6Kx@t^gQ0VXF^HhIiDSDnUUDTfq
z3t58ESAHUy4oDq;w8`v8a=@qN!T>Ry4ns9|Gg6zqez8}v@LEvqdN?nUY8A1Da99TG
z#^y0c>1``>FeI05=+O^?kTqOJUxZcj)!0<HUm`UugNd0qTeh2BCfpy?X*mY*0unDI
zah;AVUNXT8#Ni^!)+ZouC;4KMW2}$MUYV<`&EcJu@Bq*^m@_aeA;Z!kz?Asau5`GJ
zVB}c0N_e0Sd6oox!5g2t;9w^&aj=i$7cMu+OUT6^BroB?2&sXILwE?o?S4{oB?z0t
z%r9g)7P1^`F`x9~RFf659%GYogB$ad*iD4hkqE2CFiT03Rk#xBQe0CMXq^zqCve!s
zfS1RcTxWSE*JUf)6cx&n(QFlR$;b+^WQ0-uD2NnMDqKV9Gga6FF|Cwt+^aL8kneD4
zg9^gQ^&_oKg<L`+E0>P+19l)U7mtKjh2_Y1vO5jF>lZX!I!cCXYiN)zh{*Lrqd7K`
z7#=5_tgs?9Cm7bRZU7Bmx6o)*coJ!AjdL<jPheApd^<ek+u<!HMV1OB<YE!q=`_<$
zv72b8(*Y(Oo}ojiT72lC>+6tRy#xiUx0-duPtnq5XCXNV`O>(g*eV^K4HPK;R48jo
z$EomK4sTc>3b~q8U%P}{ObX8f=qUTA<XW*2o^Q}!K=dd!V(6<>FylhBNiw{M!Y+oe
z(M$Vso%n1;XO+eZzilLahmz3G2a!O`ccp1A0nj09mGFC1a48gwGdN7GQvGb86<%i4
zTuwFE_qhQ=D8q~7aQ&4~X@ys@8Rw|*YWhg;)ZzE%#KqUp#n);Vhu?=-)ru;n`h7$A
z{5rzAp0KdD2rq$R(Bj^r*z8I81Mti2NqB=Ol&b4+6=Gu=pO@+ICL%yry&1CHw^Ya_
zDUKAknDbkC9_?mUA=aM&`zO3;tB|jOH<r+H^7a#lpPvyl7ords;cWzsJd|xq3P8SH
zLuR0`kV=(vJ+gH<{3RLh(2N1(hrc4_oiJ_;*_VPYZr5E^yY2=SDgD?PRCo`i5|a4v
z*OYp1Oe(jPN!b_P2f}#S7v4`=shI$sH4|sB%;*L@TzLw)@-%jUvvuuZg<OBqj($X3
z^eD(NsD;=)rX9`YCpwxH6CKUPCp!8`b1th-RY%j5r=t-_7NS7<2S6S=K%XHv%yg^p
zS<uv%oZ)l0jgphU@Od6zt3obHVR)BoFM?@M7k!BYFT>zw`5LRd*lUHa(3u!kUS*sk
zAZzy!+ONU%WXQc^=~euKs|r~;jaW6H{+EW~9<uOF-7q1)Hl<J`a2=b^Qq#NO^tXxO
z9biDdR*AR&yH$6;2NL*G?08>>gAays!G|ED3&M}2c|Hb4?k@;G0dZrwf2G(V&_306
zgY=JL4p*lz4HIJP7zeaLe)^pB=YjmsB$P2(z{v7Y^%O<TF~NtybHTacslf%|dBGLo
zrNNECwc*9VUE#~&;lcf(8$1&389WiZ75p`93AYZXgx7};1&0R*hwlWZg?G+^l?f}U
F{vU~(k1zlL

literal 22848
zcma)EcYs_~_0F9)WotSibOI!Vw51zDLSBbJl7(!5rN+tb>}JUB%rZNhLKTn>3IYNm
zT@*!{0)i+iT|k;jReBQ@MFmlT-|zd*y>I5t>?S(@%qypS=iGDeJLlf}-r2eSo~G8#
zn?|LS+HO_3JTR}VZSC5%b8=mM`GLXQoMNfBZP%T5p4--0&aEr|4<v~;)v#|V+uxrp
zB~pcKe{QF)V*i}%nrvV3*g555v2SorclYW!>nLtcPqEaWEzb$%&uSeS%yk>y!9+r-
z#9mNefudQ~t;_;ewooXRv*moTFgT}^R}RgWS2@*-R>A`N)*E6M7Auk5C{20&KrT74
zJJ*vh<OcW4cX#Is%ZsaXg+Y~ST@^b`rc|PJd9Ku-FJ$|c4fW-;-PWNUR*Evx%4%4S
z|7E$JL{opRob4}m=lU`#IT2TKrCgya*S#dVoM_A)nC)7f?aehLrfr}-&}3|rUE6}L
zVk!5(lC`PEz=$4|NVHk$Y+pV*n9fm#vYNa4vV(*9o_wy<m`F4Qezu$?=uwHLwzi<7
zT*?=ERkAhPSI(6RaQvFwU=#e{#Lg2fUD;AMosciDPs~g;=K6B|xk7m`)vVGD2jteT
zEta}dX+*+MF0rj@QR!5oQMK}~RgLCflTvDoN+g<>EMDQYFIf^SU2ct4Rw83Hs^mD8
zN$*=K4h>WVTjRlHwariyR73N@g>t@68YtBWkkT3xd4EP5#Hvjwx1%a|QY3d%l}RNh
zi=Z~OnQClZn(NJ$bKN4U)}|R%$(yTG%GyGM-jaW<(6N=u)G{ngSzD`g{WZ{TqdCEo
zo>U15ADu2+(ovn<RwWZt5^9vS(*~kIx<i|E2Xsy}6?)!wVA>u`$(=XKgdW*nEVS*9
zUU|q8w(=l&GnsS=!8<s42i4SkV74@vD^-Je-2Q9&O$_UZ)uBBVPTbC#masB`$M_kQ
zoY2-*Pg)l?JJNI0;dE;!)!axGUbe3<m7?+)swuHG_@N#n2U;<I92!FR9iw-qsGOCs
zMkTiuT^puV$=OshN3}FNi0$42qcPRclgpNeN;%y(8;b)uxV%_OEXY*CrcJeu@k+(P
z!Ab{B3H8pRdl%|PuP}D1bcJtM)tuT5CX7C42%P|Zse38RuyzOA9%z{cE9z|s=RFDS
z3t*TFhK55x-@VAU_5$g=deXh&vE+P2OhZ?(Aj9wioQ&=oDq-*_d&Rz?{({;Eq81{?
zEl9C#h>=cXJB)7IMGz(yrV>Xh+k>!_?W@sayjAdW7o5B-Tj<TDQhm9evK=rmvnrh~
z<$G6^?U1L(DP`}gMyKrkc;=|Iy@&^g<MRGI*g@F`@P7p^ELN#RVn!-$FCoKHUWPQg
zod=Y2ATJ-pGs;=U1Ip>(0pu*_{|aRvOtM3GvNOmI<-uO)Ec$16qMt#DWgn)}R`Wn9
z*PZWTmxb;*%0672YDkYD=|bQ+5~R34U)e{gmQ+)=)H@`DQ`(xjAY&g59(x5^Vl%X=
zWA4=kp8Z8>{b?#`XBoowO7H-37g@Uv>!JC+ZjOR=tQcU?PwXB>&K43mBN9S%ue8@H
zH74V9@$seu&(0eGaMdw%#zJMUrl&E$*nNy7yB}7yAU+1mrEDI9uC}W{a7BhB>^gV=
zvF;X!3f-1HpamXFL}LX}^)6tPMCKq=HQ+g&D|8Pky9^DZ%kj>bMyIid#0}zZdyQ(T
z9qeX|fN3o;tplbBHJF@2cMibT8(;u&oPao<_D)mw2_vgNv8rC#Cke;NBf8>CRC|hX
z#p2@HiYrdl8c(abqIwr7zAQ3N2a5FI5FDuNGe$;oW)+Ej794>H9o`^k6U8~k_^KXb
z{J91S)Sf45&o{<@Wn`6Kt*SJA0|9bD)H^OD^DJe54b1fce-Uw@!z%k?QthMcOEg>3
z{<_N4bt?N(0dtueld><@5WhihO_sn}R4C+1H35&uy%}WF#UTtZnb;_+>?^2n4pn~>
z!1OT8K)O=3rtGUk{4VJ9R|DZ(QeC6FaLT^6(uJ=Z!J_MpMfSHM`)@Gze|rS#?^Nu+
zQQNQmXMb0iIa1i)6QggU(cjlb-%O*o5u^9b!RUOKQz~WG*V#TAkJo`>0YfuyWD*OM
zeG9eS%GeVI7vt{gTzSy4Z-ZbxP~R@ven2osDEo)}KT2a#_8nxu6YS$U!=ZwV3r449
z-vtTVTK10s&BDXCo&b?_HzX(Rd$bpm_Kzugy0Y)p7cBcHa8L69pSToi29BRX<qmNE
zeUUSNMm7Y~&qt#Eg{B7m{UqB72M^%DT7bBEkPM|99=Qd|moej^h@S0xt9|DTdxhO?
z7wvWSDfT(`!?e^qT`Ny_%YH;R!lP`2YMN0YfTh0_A3g?!QhA7~$Ds;gWIqv^`zzcY
z-Y=g783syaKeeHr`!p%mNt4*muqkUF^7gZpru?<Q_>CyGe;YaQIeG?<r{^^wsCofX
zHm{MwDkgd|SoVt*i7!bLz6{RYl>Iv+==c1eK@YwHL6sE3ezn5(8W<Mh{_D6urgIUZ
zvQ+NKN&Hy$8z4jAyve{Bhrp@14QIYZN6bu3$O~IMH`R}pw;|kq2a+ck))<LpzpJIc
zN9mhXq{m30;SXZf`!FM;l_>j<Om*x(;YP~-Ga4#0$SSWZZ7swA@c}9I1sL@g;#-(%
zlIPPP9+jHtuOO;k1Ko!Z)2ij`TvEc~Zyap?4v=^(|AP@VUb?jgsOc~UeMB2ShK*a+
zG}EF&hrrS<v+RFXJpKt=dnO*o{{rV+W&fLP#IcUe^dCtZJ_Vk}wI)x{m_H*GTGIX;
z_nP~2{VQ`NW{!gN|3nh_olzrM;wV_+B#b30?O34SjpRv?kB<zexWR#Jm&kNdwCe>D
zrA=nIH%{=g-?2Yl=wy&bW;&KHTeNgv%V~&=a~g@?X=1B6DCts(?Ud8PECi{T(~8TM
zBW2u?${C}^Hb#LAEn`(<${8o@EZGvEn4kqfr-Ld@veWHwyopGk#G5-RXVXafWRbp^
z;oV$~1?d(Px}^x+%G^M)MLr5eg(X7eY|JJpXImK6<SadGMf>vof@PL7rDE516sOWj
zXM1Gc&JL)bQvXxY#d!x5PR>+TT~@lx(Npb_v0Y~xLZ+oNSclXUg-5YqIXgm|v%Td^
zN35krqeE10s-%NTDCMyDY3Zz1Dwe}qN0>k|OAKW}lXB+ZndG#Yn>$AmtDG=@7c_q5
zA&jT1vn#`7H}XuioZT7mo9U-FrZvi_RkADla)B<`5kz|s(4GJ^I@Hw?Ycy0A&KDqI
z50>N3TmVWtdx3DSa^}JDl}ypu8)s2Rby&DW{o7&T67QYTR4iSbg-|x8eV_yL41GCm
zisi75(b`Zgr0^t#WiBk!lL+h{j;CFR8@|Ly!1IvEJKIZDCtJ?G#$VHceLo>xMAH4K
zw-fnSoc4ei?P8%_LfWOEo!A*1%j&MYKF-h{V>nP44kE)cFih%Pmg|$EKHC>(>4>o`
z7nXy`atK&9>ufKt%9YwpX&UD`G{%K82wm<lavd(nobK*Cr)J^|N5mM86o#Y7a5NY;
z?_4s}SI!Ugv3jawTM=XXqOfJjwi0Y(I}a{oOY1c{3GS{KF^VvN%7G>6^e|3)&COMe
zQ;f28+-SIbeXJhCSY1s%#wx<GkGlJzyP<tRlv_>#w{>U~p)u(UFhHg#=UD#FR!)ik
zGZ|mdFh~tj=@+^sYRcLe++z9Stbyq9onCejMP%H0Yh#A36ECbM`Ef#iU~#bAlV2C}
z!|^fl6NH@AiE|RjCv+~6VLjHJEa&7H{g;IP6w;q6^aqymm_x0JveRPpUxw9VozqEw
z2I$9idQ$rhbzv@poz-&Aj8UHj=^5v2w#PZ<^0{meW{h==@X2}bU9yl{tDN)UIFl@i
zWO3eC*gRjQ7&OlX97>QsAYY3KLYrL(X!0ETn$EmZ&P7rF?pzG9Qc6apw$3`8OTfdb
z#6b<BA1jx#8D}ZyvJG%tZa9?l4N~p{-Yc}eq=WLJwvd^eTgPC}W6p$ia>ZBj6n3tp
zfawr$m8q<qtD&^6aB{Ap$FGIQM|XCtLO$j76$de!WI5Nx+<m<?CJGT263z`cOFG}C
z^S@(=Zlv>@>3q!&tx|cQo_D?nt($erTwtzSrpEg!Nv`qJO$70Mh6&tWM`AfQo2I#i
zO@riXI1PrtTLt26I*A%B=|3mjq7>b^9V$=&I6nZIN;d8M5La20u~Xd<wb7lXjqdvI
zz<;EHll^W`kBJ(jV|}5VU8mdO9*R3bRQwn;&7d)lQHj2LDPkILL&#6Wil2h4zMbwf
zWX{hbm_Ii#e=!2}{Z*k3D;Jh94k{PPFl*<EoQFvJFr42QwVvfX5^MZNfhpyn7Lmq(
zOb|ZK#(yGee8~P4l^j76o|JGE+NXr}X&t|o^9+Fgmq2)ySiTP_s5x|p`HivixBs2_
zIl~P0=RrMUW4u6dx-nh^O?_j$L=i8;7n{Tqnni_5r}$mWFTWS-UZE#gqA;;}EgFN|
zzGBzv>c|U3uSW*G0ktjF7%)BHO)7p1inoj@ZZ92@EyZdK%XvGd{~dWUy-UXT1Tlyu
z?Wy7TLyY5nX~{nl@t@4)KNIn$=(r;=1N8@@1Eoo-X>BQA&M~XfQO&v}xh7iz(TDo5
z4~Ksf`oEi4`G<JuBXCz{MVya;m;Lacyvp@7=>(tPs`NwWUp3eNZLT~2iGt`;HsAu~
zd<Hr_sVf3LryHVP#1g}txT9(d0vCyKbtXc&36Q!L+&8YXuFWhrS#_P8qU+o=T<2!Y
z<=2#Q8z}8~<u;nub(;WdSnImY1oRf@u}CCYJjxSSR*Ft!w|7Sq#TcL%-`TM?U+!8}
z4IRtnijm2hT`U@<8r<=OF+pE;C$a@6q6O<YA$JqN%M6M{<xXPTxUxLtqW)kHbvJ{&
zq`Nt-n6BI{0Dg2dQp*@k-@028JvyZ;Wyw4O-Wrrfu#jv+61d;pmZC7&xKr5n?sn2_
zqH24&u*1kIrba5JkzZ8oSf^sTQ32UIkqBO&!2u1E^Ia%hbU$)ug36r*Pc||A$-#)S
z<<3^(L3a*a)xxKgxuudW7K+fYJJX}PL}XC0s~Ia<1noP78E`RkH%LeDy1ScbboT&~
z6xAztPvDh9q2x-4grLj1!gBW#>seO7I(Ki<A|);e?feSu0$gwDLAJAe6;=j&S4mfM
z_aWCT1`2-eLajUL+PK_+<=iZiUgb(b0nsccqN^fZ3JUfN*QXpEaI7j^Ruz*w@u=#8
zwgQ)?;$gS1s)ilwi<G;_1kL_9OS%WpWs5bDyM&(IoIyCEG$`lNN$X(ju5x7&1qq6B
z4+QA6JhKI|)EbN?Sx?zXxgEG)H&naJBd>vum4?eoqqQ@hkh-zz!ew=lb`K-!!<CMQ
zBZztoP{)`c4P^y8Y05o{4x6vsqoIC;^v+!YwM_3^R21^Ga<k-^rQDSp;OH_O%Izj4
z(mOW?(s*U-_8=W~dkIlj3+^gfmuE~b>TWM}aMIp#j{$+y3oaH;5MWYL?5W&-$TbuD
z@GRsPqIfAHeN?GQc=SllSjqF5UF$%Tngb2u9&0j2w*+vT^i)gc+WgiX1TyDZFq9>{
zhc-^VhSY4<wUN8l8F#JUIOB1Kk><$q2?v-HbPwGKIw@8jrW2HV5`B0weAw8z7|*d%
zw$F0Eq^c2q3Y^&Bo=U3IKs5nXL|>ntTCC82S<}0xGi*2sIE)74$r;ibTsv{kf}obp
zj$FAS;cO$}97^D<N%baJ&y@&0j}dx)M5vVe6*_5q<$jg_81-a51c|kKA-q=ElpvFs
z?$?Z`+>0U?%W?=J@{-}iUpK_iA!Ugk8ZIOB%K^O=o*JxT|Av8dMbv3xcLDyJ0{%*Z
z=b8r|Snd@Ne6<084gZf&?zK7^E%&<Nc&?AYM=Kt#S@CeW;!$TQ7d&KuRj#af93|}x
zjo;;shn4$1+Hn)?7~AP$n@%oUs5AqYKcXk<%@Vn{5cjPH_ieP0m3=KAWZy20%SDYe
zMrn@vKLoN&esFndNascF9k`i7Etb=G+&c;5F2ESmxpasVp%oNAilMk$P~1ZlKQ<`t
zB??Yt*RTNu*EgyYMlM%2-20#)qX{kdXON(WhMx;wu4cIRW4bW8U(ji}4^(bH2(3x?
zAt8DgxUHSnDfbaM=!Bw2ISS0gIQUDfUb~OsI#;jV$9aI&YxfCWmc$>!p8F&(_u%qV
zy!<rJ@Jw=_;X#PY&+>qSrKI+ZUrFr|*uND3&xs43mt)D&S1R{K@*rh%Uy{o&^E9tq
zSut3|ZvA_?{tB=6Dfd<WFOCA?H4*r_P`p7Gyh#@<!X6y=EkzHxZzmF?5*h3VT2v?_
zgx?W{cM1PJN}{oU-~o+&pU%L<u=_{e|5J4T&(Zx4cmVT=>MzvxS7>YS18>n1XR+me
zC>k-(=>AQd{&x+?MT*R4P15~HaDGfF2&;ecKY*xDqLKJtyfRa{|K|T}-1(1|pxjR*
zlFtPH=OXC;NVZaWNPoqHp2Fpnm*8n$c^3Z{DKE+YZsn!;?*qG+23^L>@VrlXlHV>?
zUZbIF(sZ6om-i@7Ha($r<>z6}oW@w*Xp+rQ-WX!>#%iSAIPDhFrbgU{X2gsKoi{;7
zpru27eNl(;Cc=lN+j^W=x4cQ{Fy5y6vNt&zm|{#Yh?DH80_0G-w>f2RA>C1L0;@>h
zGA11xpCEl}O5esv-!|%wHEfVLrKUT2+d%;q97NgnREF(G7)m)0QBgHDrfM2gWxO4!
zYPwOiQ)Ebt35sUGkPP$DA{;-H9-gkeS<qf7uDsbu9lSXdGu6VHv)2XyoU`(F)|v9y
zEZ2AaJa&q38eiwk-Y%fRYOeBjrBFOu<>xWk^>zpP(VdHWVws`0M+`o<{WN%AApE%o
z{$7NSJs34ykj~`S$^$#6(}{gPu;T(#K5qe(aX9xR+1*Kb3&k*#B71gp8~cBBh+zv5
zvYAwlqp;_Zn1>?EH^el<W2Wmd)1A<XiKWHG;y~P#Sd!~WlIxiy*JF~K_L$^)Cdu_A
z$>no@m>}p`3Zs%e#gg(&TI(^X9bQd&lH8)2@+7%sspB!d9Sz<pGO;7daJ_?dyLg9y
zZcHv4FAs(A(5k^+C+$59_D=3}vxE7rVOTBCq`wYU4m|89N;P{&(#)ew`yI{pV=g~3
zKk%-o*!o4&l-a0RnD~y(7xLw*EhfsC`mzT0x=D+X)XR~1mhyTw$kS_hz_p6Rdn*r<
z>kNRpYQQ_jxWHR&==vf=+(<NjXrLP#s)k|Wb|Q(oVuVRjU|>3SBU~lJ1ytNogdXE@
zFVRRXBeU@cYqm1eUvDj1W?bi?tMXW#s>}mg-nv+qS}!BQacmMZ0q>o_CgI$69V4Wk
z2n6Z1l&8Fthz1>t8-|)H+sGtDxLZgpJ;fkC6*Q@p#qRZT`?QKl%KI{Lo-RGcFV-ov
zyfb1*&y>!87Ll6F)|1SZePkFbu$~LuR(DZ(=hY}bKf?Bvm@Sg+!j=n$+j3z<|21t3
zoqG{MUo6gL?YuVb+)HARF%h3idY2ONWhUM)kDOb_2&vy7pfcqt?+O5^kGgLfBt&o}
z5nKfX<FP=--63%ZSH~b+BM`171T)9(T~7#{!>Q+l+;0IxM(;OK-VGA{$q7CA(jc}z
zln;#U6|4vM?HD*_%ifIuw?*gj(t0n8DW;G+oBQJHG2VA$D8C1kDeoqtH0iR(?Lw)o
zfO3N(0QVNaO_odRm3Qk14!g}@@+6b?egGwwha8%DW-C_hx>jM|Ew;^@G2;%x=0>4b
zOxaX!S{^qEArtVpOGpa%*j)^2%%;;G=H2mxz~m4ZmG@)D3gYQrpc-LR{s}ex6q+^-
zktz&dVX(aWs1p_WEl_|tc;M#Nq2VhHp4mL)-H+Rq8BXs3C@?Dx-h;$~QRATzJoK>f
zkPI1*M1$C)VoL+I?z7F5_e*e&H)qv2ldk+&MS%CXz<dJQs+`;|v;j`;8R8frKkq4=
zc~8S5n{{Fq4U6ila)WhqMBX#8fO!_mlHRY4n}4HadB4@B8kx_TB-(pkkiDQMl)M*l
zmhxU=ti5a`BKL02$|mRR%Dx;ooq4~LWb*eEh}7~G*ioI~ukNbxSOi$}<hlA9XyQ{V
z-s{YdxKYSVt$1$|=AJ<3y~U%2JbD{k)%wbNhc~z_$$J+t)82aq^dH28_X+xs8npK(
zh9d{RVQZr*Jx*_f;bhBlEWqT-V$+{tQ_}mu*u;7EMy9GA*&ba^dVi%g3$f$I`*1@B
z|E*#$s4(@;$79O-2W8Gz9%tW2n7i^g56`(P@1N15?-O$1(Z?D1kvKRPPY&h%hm@GR
z@;(J=je|d<gFlZsm{akXyHd&@rI963W&D?UC|{}+%tQI;zmo0w-1{@J>cQG+C_lv}
zx)$_lwuztFC~*Uc5#@d~XYWf<GfVl+8|7;;e6&TT?vW__qjfg2VQ6E>^)Pt&^T&!0
zXqC^Ie9PxdzHeso{mM*!{YpIcpPI#f293W-o!9+I@VYN$5XPt7Rob5nt^Q`{yG`u_
zMwsPqj%JZ*0e=hjB!5fB&CHp~=d`{x8#QI+=WlI-!rw+myT7f#okF<V>1g-2j~-f>
zO|RK!pwgLgCB*$5C_Ot!^QQuMrC9N&0pt!<l{-c%ryG?!iOLyNX*Le|d`&{~AQuB+
zY|Dm9w{W+=OlcOn#Ywa4oiv9|l1)a&NjuX?yTD1<gdrP8EPvOEi*|#HQa*gijch)r
z`K=i^*pnC9l>Y_(PmRF)bD^wN-Y_r_I1>BZON1RJ^7H3K=Iw3Fn=j@qpn3ZkkIovw
z4%R{OF6P^`!y$*U!=)V_>`1o{V8@K*`xPq!X=r)r0qwjmL06jD-)}_FvWe(u0~$q;
zr0V_w2DEG*@|O_w(v5&_uLpe~K_3(Yy^NqcwDV<ikmWD0z&;qToBTuQ^x69;|4<wx
z=ggU}e9qxp{$aEO*AFMb9E^?r5$4E0k_XtO>mMbQM;po&;)gF9BT%eB%1U#uOaDVk
zcjbuNeJsC+=g`^<?xerUaOdUTG3K6>8}s2Vzt3FZ1Uw<&Qh|r_fu_iVg?uK-&mS1k
z^~W+^4mTtv^QiO(MIR>EW!M;!vo&mhwWa~qu~T5{dgmf+0?Fd-yY^VMj>l-OQfElV
zSPv}Cc|(e+1mHXlaH{?Cc)(!4^iL37CmPN2E`onDHJgcZf24RlrM~G;Wz)+}9}};v
zFMQS)7@Rz8Ek|-;`7A5+;B+Ruo$}A3$M(Tscea2y2d8WbRuJ4a=by&|c=mjKLpx3R
ze6L`5NBk-sdq_kh^XI5P{R@p{*wBNsi)h)!#-}4$#u@aQp7?cIb}2cGWt=+qId$IL
zJ`nAyvwTjRYtya})4mDF)&iJzB@d?H;3^y>7x2>6Jeq=|2<$Z@8gwlUTBd3I>!MDI
zT{;pYm_CO+H_)DMZ^WMO)Z23-?U5S5*uyDwpHt`@S@4#P&q_d>ax<|{!(&u_{w*WI
zyp=GQ8j{;0n0PZlU`q1u|Bx{6*a*x!>tWtSm_H(ifq6G!-UFDa_JQ`2<#PsIqr8_W
zPmt{%K;d)de0X$l0v+2XwIT9;0H!c~r1*mJ=i<y?5as<FLHR&E$_I(^p%_Xg_WmP4
zIodpK%%)KP(F)vOB0d`Y#|U~Rg5hx<%*MeJJeYxlU-6&~2T$@~Dh{~CCh0$oQ+5xT
zY{&nzJZCq-Tsv;dL_0bQl5wU}>^IL*0Qy(-^SNVYxNlydZ<zeb&za#Y^dE6T{~l+5
z|0ZXtf4Q^FKixUR?{E(HJ?ChD7iXo@@2qi-^EY!&a!z$mc29H9axZrtc3yU_^`7>2
zcgMK1ywE$$TkD<fTFzU}d(QX0pSp)Qd%Ah&4EH8)f_s;@g|~xuv3HesqZ@j6?&jX-
zzX-35)mzk~ed}oEmnwdHnW2SU>i+KlcdqhTBj^&qz2AKkGx6z^|BB*XXe+&ryPTE(
zDo&^1jPt3=e+_4q9nb#jIP>4Yw(0bSUOVmNTZ?U-6xD{kwv~6cks4&u{+ob{jn9?K
zme2JD|8>iM8$)%P>weXnD(Q3GA?3fz5PL5oMBB;IgRT7c(K2JQ6=|Flmh|F}jIckE
z;Wf+WKAt3I5Ky^RWs?-y;0N#uXMz2{&`(%w@Zk{#_jKid7-iUhlQ{o7bd5LfIpZD9
zA#9+)OoOZ~`u|`6e+1jMjKMcstShvZ|FJRQpR{%B8e8j$Vf!bd_Fty6{aeod!@gud
zh^3#>($9>gpVLw-+QZVy5;lxvp~3n(kQEOGc7Q@7R>%bjPz2oSGkF8}tsqGquV7cZ
zN(L!(Mk`=Nkqj~#U(g_DjcBQ$Nt1GsGiXMDVTCqm;r|g-9j$}}C=lvaE(4YX!Pq(+
zHG8{*aWNd@1;+$B|4kK4#J{Q01FV5ab{0&c-dQTxbht8B0#HUwTnI@Vg#)gE=xe;L
zf-NFBtOzJ)E6CYE6a-rn$VbArO|5^orPwL3Yx@oOx4neNeSeng##X>8B69WiV&V?s
z+^NRZTo*|OTo(zrE&@_<wQT)?t7lYPJyQp@6>uq}c9A%kZ7dDuL?*Tw6R{vtPt0Wy
z<EmXFSM3HAR<OIi6YLSG+LN%pP=S@MsLgQT4(5^$<594e(Kc_mw!JIbq!CmwpR}_0
z;(ruO2`oTKr{)C<Fc<~<U@%hr#(}&fuY!f~@hY&@xC!$99^V-r;mZpFUZ)wA***3O
zeHI@rz~?LQVqcql!lDhIuxQgS;A0sApRj1dvH|`QZAqEI%IK>qvwh&AfhX#_*mc~K
z?;X-__*;Poe+0G__~@XSNo__%4UtL)0X*6euq0{HLa`Y`1uRWu^(0_bGFq39`|8hb
za0mz%VF(EJr-lVqZ~!zYys>TwR61BpZ!Q6}M!#5w7w~FFzyf8Sg(cUZU0U%#(i{Yu
z=0)Zm5$vN0mQ|=a5QWKLIj9z@fJ-h7(dMdvr3f}V$`WF5XcSAGxQeN$fNv~7uxZD`
zqaa~XlEU7*RVp|VMs2BIJT_aPxn;ZRJTdVons{{NL>R^GMKB7#0Hupegaq7RRCzHa
z;A+c+iW{+BlatRDh`26_>!!GccqI(tauCPIfC_rF1<9Zn($ZbrJg$OOkkur|+30oa
zAWsCx(5-;W;sPC)?=i5M``FCb@*Uk#$)F#8P6Y+?NC~jvDAj;>x8;e&H{OB)=u6@X
zFmQpT8JpJeeoXa#3HLL4ft5H1K~tGQ4axw63A$hiL`ZIeH8N_f1x+JF$`eQoUq{gE
z0lEpx`t2)^!7d&vI8K^5IG!v1*i^w4|6DI#Ns-%tegc@VL4aCMgv1t&tSXfIhs?4r
zNKPh%y>aj*&i`NsqI_vW9+LrIc?kH*LyF&mumYAo^w*c^FKjm8RVX}N(4Rr#GeO)M
zy<Mi6&N57AlL-&I_+2oc14n0qb2$o~7f}KY-fm!&G#1z7N~L_ao<a=10<e`!ppuo9
z87jDdMjWpKY$Ku#&E5GDH$34>DB2M2B?>MAwn=gAene#jES6~5B?O5AbVM?s{koWX
zDaBm|aho7wm_LQ3TrMV!FJe;~-^9*fNAgHi5OxJjPY0}_@T3i{L|cvR)#HT8E)4ps
zsP1a2GoysLjTPY4LjzWDjZt^4Q8yA5)LkdouV)~#jU~Xo#h!Ho`7suK8~h3_<g7%<
z;PVsGyy<`oE;1$rH-fiewf<U+u*(J|y+c3+SZ2}B@SA86p1t4SphY)pi_n6%koG7Q
zaD}A>!*my3uHsWw#B+%yxE+SKEUDhHf*%-re@J_gg2ryb%sZs#-buOhRKOP>8jW1z
zPQK_6+zqJ>hS3V{F%o}Fi5QK|4M@8e(vktItp@Ca=hsLC84Im|JCzz1>#J74tx9b4
zpBowG24wsKj&BI=C(8q1Y3<<4o)x|a4c|lLgZJZi!Thka+9QBr1z0-4hDdU&fXgP;
zsr`UUCBfr#l^%1XyIa8%M)<Fct711H`$>`glo+RX5{hw8Lly^!;2GR$D&@?VkmTO8
z447XVseKrVe?!GGvdf6`TM8=_#R%Dn8L&KSEEHF0+(Ps`dH9O;#AW=H$$?qC99QVA
zc!V!k(~~a|G@iaA5CJ?YCAj2wkUm<bD_0C?F)H|dt!rMPwpXF85hJDX%WFo(>r{b}
zKe_|CZ-`Ugtal0*RWKB*fNLssPI-q;c{k>i_iCI1ra$n)`@k@EF+N$fwv-*HSj!a`
zTFVue47Tdk5daZaR;=IyvG*?=DE}I<K=OxjnF}Y4eMYnj{vJKI{!#0SkF+aP@G-cO
z0bg8bz}J}a{X_lIx}QY%xp2~8at67>6%#m71ya%UXV+DDJ~elwWj_O7bD<d7pd;XO
zfNMbnRPYHYtDF$IPhzzGOitvGP-*Kzd@yHJ2AgkcZmVQy0ed=3LTIK-e_$s}>8C{+
z@BHPuMQNDEeSNM}n4t&5h8kytjRttg7af{p%Qj!LqPZd8a=^P3U~MrEqLRERx<)^U
z!dCh_x&$h-c!J1ZS;}QsYY1aN6kVaoDjZ9j$I<5Yo}NMMrZs~{INsPi!Ps1L8#Ygb
z&8ct`+FTS)6;2v%^QLi|C)ZlLS!C_znlA#Tp>8n@>XwAM6`?LFFvqMw-P%Ci#z3vP
z4X9jRNrqfr30W8+w8L#+x)eqs-<fF27rILF`7y0~Ds)$`fpi)#;N1;PgbVmCm86W}
z^je#CifqE$6ZI`9Z%?oV>GxSQW;VOu(xOiIE9P*E88Nn*?pH?ugLZ~NR=5id;-ZQW
zL*{NoiKx~&t5$@|y8}vP0y^A-iuY9G8-v17KcA=i19Z{zjOn8OTvx~vjH2fzlIeid
z@kg7?ek5x?@fPldm`;cD)Pzk*Z8qfj)$f$y-JR<7aPLH_Rm2*?Q5h`mn#UZax2?><
zkX*W<Pd^Ak)^Hhp5mqfw6H?(miPWeJCT8Mn*&cS8a3QGEatvad#14t;bY$@+2;TAy
zvEeP1(I+7HNbZvyV|`rq%3OJE4lkC30q7gd85lw`>^lOO62F#}4)-G%Io7QbF47^-
zl7Mev<9ihB<NKp+q>nQ~uqq_UOSl-!NM6DvXvf;bAzaFEyPMSQBtp`xe<91UkmXp5
z`IH`~nyirZ7@M?%p@lppb`xQ>9AVWMvN*%!RmlBtDK7j8G}#4*Cvez_%hgxILY8NI
zGKX9*LWLc&FhiOX9w`GHSBjD$SBgZG3Rm#<92I^MVp=KPxL0RFVYXt>O5x=Ck=CX{
zSwRA84y^hCTg%%M@v5*l^4%(`gYWW!<`|K=x{3zrf}rUi84Y)^Y4;X|lNDBk=2*kZ
zmpDd3GZ^v0H)YaR8%Jua6WLNBx2=WTw$@@&WT{X>?pR|xtvBryyNPx>4q(#Z@#Zm5
zQ;&ovKvk?B30ZG7>x!SEr7cfFauA+O6-=>JI^_N}6n`p|{cFdo@Kg?OSj7oXBYR!#
z5^{|x<Qh|y{Zn$a*a*4YMD%A8J&KJO`U(}yI16o(49}*pb0BPd$3U(N-<IgA&{*NQ
zM$&ndgnmAZ1Y*vYrs3Muh_y<{^{MazD41+;m|CUsxjrkr(5U$u)nIex1_+_-A{pW?
zhDs~Egsr+jg<q$S^mZD4Bu-p>DP7DxaBy+RJ#eZORZQi(g7En_2<r;M!UiC`sfj_0
z8-QZ7C*e22FLNy6m7-9pu7gx~HKQA!sSB?m0(4cbSfRcSuj4tQ{d#l$EuKePj#YSr
zNI`?+dsQmr3RPnXEhn!iarog9RmdeOg8m*sBM)WUk^+!#(vTS_ETmF{xjxxn9NtXE
zTQs8t6xXK0+hE)TvUh+kZrAM<yM6#HQu?tos1SSAs+C}P2c_N_lX@4VO4%3w2!!#n
zFT9(yQZoTMYbMTMnb8f%`5Jim6X2Ox<7{1fSm94AfUrV^mi-yXF{p)Dp3;u~1$_ob
zvtpv7<*jcx`ayI4P>rK$%EQqJ^ayW(^ie<_IY56&a2Js2G0@bPoZ;iRjgphU@ChDY
zrovy5MNf)_Pl9P!7k!EZ++Wr#UqO|(Z>{hdIujl9S;jd6vU(4pEvs1}SF_T+{Bo)a
zSvigAt*QSdxSyl5pVti&zCdTANZ?{KpQWaE!Rap&!%M(`e61XBe{Mt5am^(qJu#$0
zzHO2Wx$|t83tj~oT@bz|&GR}iauY!K28bI6hgOOm0*zbFU^htL0%<aQo8HHO_6`Tj
z;nOhTyQDuI<nNJC#$<7{EDu#qQDhtwyc#?noEokT&J0fvE($LQt`05>&k1f1pAHWS
r?hf}1?h9uJ4+Jj+?}wwpap6|s72!{UgMuaDOTqf^wz(={CDs1}nqO!_

diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/FormatStandaloneSetupGenerated.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/FormatStandaloneSetupGenerated.java
index 1261e98c4..1cacc31a2 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/FormatStandaloneSetupGenerated.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/FormatStandaloneSetupGenerated.java
@@ -4,8 +4,8 @@
 package com.avaloq.tools.ddk.xtext.format;
 
 import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.xtext.ISetup;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.xtext.ISetup;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/ColumnLocator.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/ColumnLocator.java
index 186cbbbf5..874e75175 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/ColumnLocator.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/ColumnLocator.java
@@ -11,6 +11,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.ColumnLocator#isFixed <em>Fixed</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.ColumnLocator#getValue <em>Value</em>}</li>
@@ -18,7 +19,6 @@
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.ColumnLocator#isRelative <em>Relative</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.ColumnLocator#isNobreak <em>Nobreak</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.format.format.FormatPackage#getColumnLocator()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/Constant.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/Constant.java
index d6ab556ee..429c50378 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/Constant.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/Constant.java
@@ -11,6 +11,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.Constant#isIntType <em>Int Type</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.Constant#isStringType <em>String Type</em>}</li>
@@ -18,7 +19,6 @@
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.Constant#getIntValue <em>Int Value</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.Constant#getStringValue <em>String Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.format.format.FormatPackage#getConstant()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/ContextFreeDirective.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/ContextFreeDirective.java
index a239f1533..c6583f02c 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/ContextFreeDirective.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/ContextFreeDirective.java
@@ -11,11 +11,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.ContextFreeDirective#getGrammarElements <em>Grammar Elements</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.ContextFreeDirective#getMatcherList <em>Matcher List</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.format.format.FormatPackage#getContextFreeDirective()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/FormatConfiguration.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/FormatConfiguration.java
index 48fb1cd17..631449005 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/FormatConfiguration.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/FormatConfiguration.java
@@ -17,6 +17,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.FormatConfiguration#getTargetGrammar <em>Target Grammar</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.FormatConfiguration#getExtendedFormatConfiguration <em>Extended Format Configuration</em>}</li>
@@ -24,7 +25,6 @@
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.FormatConfiguration#getConstants <em>Constants</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.FormatConfiguration#getRules <em>Rules</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.format.format.FormatPackage#getFormatConfiguration()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/GrammarElementLookup.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/GrammarElementLookup.java
index e7179d861..5dcac1957 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/GrammarElementLookup.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/GrammarElementLookup.java
@@ -13,11 +13,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.GrammarElementLookup#getRule <em>Rule</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.GrammarElementLookup#getKeyword <em>Keyword</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.format.format.FormatPackage#getGrammarElementLookup()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/GrammarElementReference.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/GrammarElementReference.java
index 5d221c7c7..f5ed0e9a0 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/GrammarElementReference.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/GrammarElementReference.java
@@ -16,6 +16,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.GrammarElementReference#getAssignment <em>Assignment</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.GrammarElementReference#getRuleCall <em>Rule Call</em>}</li>
@@ -23,7 +24,6 @@
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.GrammarElementReference#getRule <em>Rule</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.GrammarElementReference#getKeyword <em>Keyword</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.format.format.FormatPackage#getGrammarElementReference()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/GrammarRule.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/GrammarRule.java
index c70cd7fe2..c56176c0b 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/GrammarRule.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/GrammarRule.java
@@ -15,11 +15,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.GrammarRule#getTargetRule <em>Target Rule</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.GrammarRule#getDirectives <em>Directives</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.format.format.FormatPackage#getGrammarRule()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/GroupBlock.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/GroupBlock.java
index 14c77bc66..75d69cff0 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/GroupBlock.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/GroupBlock.java
@@ -15,13 +15,13 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.GroupBlock#getGrammarElement <em>Grammar Element</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.GroupBlock#getMatcherList <em>Matcher List</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.GroupBlock#getSubGroup <em>Sub Group</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.GroupBlock#getDirectives <em>Directives</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.format.format.FormatPackage#getGroupBlock()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/IndentLocator.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/IndentLocator.java
index a625e6a19..643a82c75 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/IndentLocator.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/IndentLocator.java
@@ -11,12 +11,12 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.IndentLocator#isIncrement <em>Increment</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.IndentLocator#getValue <em>Value</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.IndentLocator#getParameter <em>Parameter</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.format.format.FormatPackage#getIndentLocator()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/IntValue.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/IntValue.java
index 60eb92302..4d26b1b48 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/IntValue.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/IntValue.java
@@ -11,11 +11,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.IntValue#getLiteral <em>Literal</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.IntValue#getReference <em>Reference</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.format.format.FormatPackage#getIntValue()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/KeywordPair.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/KeywordPair.java
index a843dfcc8..bd2028592 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/KeywordPair.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/KeywordPair.java
@@ -11,13 +11,13 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.KeywordPair#getLeft <em>Left</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.KeywordPair#getRight <em>Right</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.KeywordPair#getLeftMatchers <em>Left Matchers</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.KeywordPair#getRightMatchers <em>Right Matchers</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.format.format.FormatPackage#getKeywordPair()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/LinewrapLocator.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/LinewrapLocator.java
index 420d24597..da694cde8 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/LinewrapLocator.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/LinewrapLocator.java
@@ -10,6 +10,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.LinewrapLocator#getValue <em>Value</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.LinewrapLocator#getMinimum <em>Minimum</em>}</li>
@@ -17,7 +18,6 @@
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.LinewrapLocator#getMaximum <em>Maximum</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.LinewrapLocator#isNoLinewrap <em>No Linewrap</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.format.format.FormatPackage#getLinewrapLocator()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/Matcher.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/Matcher.java
index c4cbb1eb8..17de927a3 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/Matcher.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/Matcher.java
@@ -13,12 +13,12 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.Matcher#getLocator <em>Locator</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.Matcher#getType <em>Type</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.Matcher#getCondition <em>Condition</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.format.format.FormatPackage#getMatcher()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/MatcherList.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/MatcherList.java
index 2a7524342..7dc201f02 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/MatcherList.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/MatcherList.java
@@ -13,10 +13,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.MatcherList#getMatchers <em>Matchers</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.format.format.FormatPackage#getMatcherList()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/MatcherType.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/MatcherType.java
index 8464ca5f6..5a77816b7 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/MatcherType.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/MatcherType.java
@@ -172,6 +172,8 @@ public enum MatcherType implements Enumerator
    * Returns the '<em><b>Matcher Type</b></em>' literal with the specified literal value.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @param literal the literal.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static MatcherType get(String literal)
@@ -191,6 +193,8 @@ public static MatcherType get(String literal)
    * Returns the '<em><b>Matcher Type</b></em>' literal with the specified name.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @param name the name.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static MatcherType getByName(String name)
@@ -210,6 +214,8 @@ public static MatcherType getByName(String name)
    * Returns the '<em><b>Matcher Type</b></em>' literal with the specified integer value.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @param value the integer value.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static MatcherType get(int value)
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/OffsetLocator.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/OffsetLocator.java
index 6f4a2e8fd..7b18be923 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/OffsetLocator.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/OffsetLocator.java
@@ -10,12 +10,12 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.OffsetLocator#isFixed <em>Fixed</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.OffsetLocator#getValue <em>Value</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.OffsetLocator#isNobreak <em>Nobreak</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.format.format.FormatPackage#getOffsetLocator()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/RightPaddingLocator.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/RightPaddingLocator.java
index 0a610ca7b..d23009f65 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/RightPaddingLocator.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/RightPaddingLocator.java
@@ -10,10 +10,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.RightPaddingLocator#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.format.format.FormatPackage#getRightPaddingLocator()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/Rule.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/Rule.java
index efea2ba68..a04361f1d 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/Rule.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/Rule.java
@@ -11,10 +11,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.Rule#isOverride <em>Override</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.format.format.FormatPackage#getRule()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/SpaceLocator.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/SpaceLocator.java
index 0a546f7d1..a4a6622e5 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/SpaceLocator.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/SpaceLocator.java
@@ -10,11 +10,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.SpaceLocator#getValue <em>Value</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.SpaceLocator#isNoSpace <em>No Space</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.format.format.FormatPackage#getSpaceLocator()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/SpecificDirective.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/SpecificDirective.java
index 543f6f182..a3600891b 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/SpecificDirective.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/SpecificDirective.java
@@ -11,11 +11,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.SpecificDirective#getGrammarElements <em>Grammar Elements</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.SpecificDirective#getMatcherList <em>Matcher List</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.format.format.FormatPackage#getSpecificDirective()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/StringValue.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/StringValue.java
index db2891017..cdc89e002 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/StringValue.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/StringValue.java
@@ -11,11 +11,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.StringValue#getLiteral <em>Literal</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.StringValue#getReference <em>Reference</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.format.format.FormatPackage#getStringValue()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/WildcardRule.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/WildcardRule.java
index 3239ead19..85d2a92cd 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/WildcardRule.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/WildcardRule.java
@@ -11,10 +11,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.WildcardRule#getDirectives <em>Directives</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.format.format.FormatPackage#getWildcardRule()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/ColumnLocatorImpl.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/ColumnLocatorImpl.java
index 065ce28a9..e3d3a0470 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/ColumnLocatorImpl.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/ColumnLocatorImpl.java
@@ -22,6 +22,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.ColumnLocatorImpl#isFixed <em>Fixed</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.ColumnLocatorImpl#getValue <em>Value</em>}</li>
@@ -29,7 +30,6 @@
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.ColumnLocatorImpl#isRelative <em>Relative</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.ColumnLocatorImpl#isNobreak <em>Nobreak</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/ConstantImpl.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/ConstantImpl.java
index 92a91d645..4d6355420 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/ConstantImpl.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/ConstantImpl.java
@@ -18,6 +18,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.ConstantImpl#isIntType <em>Int Type</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.ConstantImpl#isStringType <em>String Type</em>}</li>
@@ -25,7 +26,6 @@
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.ConstantImpl#getIntValue <em>Int Value</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.ConstantImpl#getStringValue <em>String Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/ContextFreeDirectiveImpl.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/ContextFreeDirectiveImpl.java
index 7676bf715..47d3f0c52 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/ContextFreeDirectiveImpl.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/ContextFreeDirectiveImpl.java
@@ -28,11 +28,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.ContextFreeDirectiveImpl#getGrammarElements <em>Grammar Elements</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.ContextFreeDirectiveImpl#getMatcherList <em>Matcher List</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/FormatConfigurationImpl.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/FormatConfigurationImpl.java
index 20dcb2441..6c0e6f222 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/FormatConfigurationImpl.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/FormatConfigurationImpl.java
@@ -33,6 +33,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.FormatConfigurationImpl#getTargetGrammar <em>Target Grammar</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.FormatConfigurationImpl#getExtendedFormatConfiguration <em>Extended Format Configuration</em>}</li>
@@ -40,7 +41,6 @@
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.FormatConfigurationImpl#getConstants <em>Constants</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.FormatConfigurationImpl#getRules <em>Rules</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/GrammarElementLookupImpl.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/GrammarElementLookupImpl.java
index a7cebba33..3bc5598ce 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/GrammarElementLookupImpl.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/GrammarElementLookupImpl.java
@@ -21,11 +21,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.GrammarElementLookupImpl#getRule <em>Rule</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.GrammarElementLookupImpl#getKeyword <em>Keyword</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/GrammarElementReferenceImpl.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/GrammarElementReferenceImpl.java
index d0419cd1d..656a3c600 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/GrammarElementReferenceImpl.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/GrammarElementReferenceImpl.java
@@ -24,6 +24,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.GrammarElementReferenceImpl#getAssignment <em>Assignment</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.GrammarElementReferenceImpl#getRuleCall <em>Rule Call</em>}</li>
@@ -31,7 +32,6 @@
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.GrammarElementReferenceImpl#getRule <em>Rule</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.GrammarElementReferenceImpl#getKeyword <em>Keyword</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/GrammarRuleDirectiveImpl.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/GrammarRuleDirectiveImpl.java
index 7b01cdcfd..bab30d735 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/GrammarRuleDirectiveImpl.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/GrammarRuleDirectiveImpl.java
@@ -13,8 +13,6 @@
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Grammar Rule Directive</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/GrammarRuleImpl.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/GrammarRuleImpl.java
index cb08c68d6..dde3e8482 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/GrammarRuleImpl.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/GrammarRuleImpl.java
@@ -29,11 +29,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.GrammarRuleImpl#getTargetRule <em>Target Rule</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.GrammarRuleImpl#getDirectives <em>Directives</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/GroupBlockImpl.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/GroupBlockImpl.java
index e23193c80..a15257ba4 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/GroupBlockImpl.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/GroupBlockImpl.java
@@ -31,13 +31,13 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.GroupBlockImpl#getGrammarElement <em>Grammar Element</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.GroupBlockImpl#getMatcherList <em>Matcher List</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.GroupBlockImpl#getSubGroup <em>Sub Group</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.GroupBlockImpl#getDirectives <em>Directives</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/IndentLocatorImpl.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/IndentLocatorImpl.java
index d31530c22..c2bd1f198 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/IndentLocatorImpl.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/IndentLocatorImpl.java
@@ -22,12 +22,12 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.IndentLocatorImpl#isIncrement <em>Increment</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.IndentLocatorImpl#getValue <em>Value</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.IndentLocatorImpl#getParameter <em>Parameter</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/IntValueImpl.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/IntValueImpl.java
index 14acaae47..901db0f44 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/IntValueImpl.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/IntValueImpl.java
@@ -20,11 +20,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.IntValueImpl#getLiteral <em>Literal</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.IntValueImpl#getReference <em>Reference</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/KeywordPairImpl.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/KeywordPairImpl.java
index 678f5f944..0d5b50236 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/KeywordPairImpl.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/KeywordPairImpl.java
@@ -27,13 +27,13 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.KeywordPairImpl#getLeft <em>Left</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.KeywordPairImpl#getRight <em>Right</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.KeywordPairImpl#getLeftMatchers <em>Left Matchers</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.KeywordPairImpl#getRightMatchers <em>Right Matchers</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/LinewrapLocatorImpl.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/LinewrapLocatorImpl.java
index 45cbaf22d..355a01bd2 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/LinewrapLocatorImpl.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/LinewrapLocatorImpl.java
@@ -20,6 +20,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.LinewrapLocatorImpl#getValue <em>Value</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.LinewrapLocatorImpl#getMinimum <em>Minimum</em>}</li>
@@ -27,7 +28,6 @@
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.LinewrapLocatorImpl#getMaximum <em>Maximum</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.LinewrapLocatorImpl#isNoLinewrap <em>No Linewrap</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/LocatorImpl.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/LocatorImpl.java
index f35a147ad..0a5a6e44e 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/LocatorImpl.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/LocatorImpl.java
@@ -13,8 +13,6 @@
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Locator</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/MatcherImpl.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/MatcherImpl.java
index 6e75bb383..19b6d8e2c 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/MatcherImpl.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/MatcherImpl.java
@@ -24,12 +24,12 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.MatcherImpl#getLocator <em>Locator</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.MatcherImpl#getType <em>Type</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.MatcherImpl#getCondition <em>Condition</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/MatcherListImpl.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/MatcherListImpl.java
index 99abba7ab..184d22714 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/MatcherListImpl.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/MatcherListImpl.java
@@ -26,10 +26,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.MatcherListImpl#getMatchers <em>Matchers</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/NoFormatLocatorImpl.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/NoFormatLocatorImpl.java
index 726f5d647..bd3f32649 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/NoFormatLocatorImpl.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/NoFormatLocatorImpl.java
@@ -11,8 +11,6 @@
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>No Format Locator</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/OffsetLocatorImpl.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/OffsetLocatorImpl.java
index ab815a790..d946c969a 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/OffsetLocatorImpl.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/OffsetLocatorImpl.java
@@ -20,12 +20,12 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.OffsetLocatorImpl#isFixed <em>Fixed</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.OffsetLocatorImpl#getValue <em>Value</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.OffsetLocatorImpl#isNobreak <em>Nobreak</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/RightPaddingLocatorImpl.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/RightPaddingLocatorImpl.java
index 6cea6d444..2946e76f0 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/RightPaddingLocatorImpl.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/RightPaddingLocatorImpl.java
@@ -20,10 +20,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.RightPaddingLocatorImpl#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/RuleImpl.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/RuleImpl.java
index b1d54a9c0..ba493f3b0 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/RuleImpl.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/RuleImpl.java
@@ -18,10 +18,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.RuleImpl#isOverride <em>Override</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/SpaceLocatorImpl.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/SpaceLocatorImpl.java
index 5fc3244ac..84ebafdbe 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/SpaceLocatorImpl.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/SpaceLocatorImpl.java
@@ -20,11 +20,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.SpaceLocatorImpl#getValue <em>Value</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.SpaceLocatorImpl#isNoSpace <em>No Space</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/SpecificDirectiveImpl.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/SpecificDirectiveImpl.java
index 4e4903f13..b0da31245 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/SpecificDirectiveImpl.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/SpecificDirectiveImpl.java
@@ -28,11 +28,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.SpecificDirectiveImpl#getGrammarElements <em>Grammar Elements</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.SpecificDirectiveImpl#getMatcherList <em>Matcher List</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/StringValueImpl.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/StringValueImpl.java
index 2e350cd43..2a16b254b 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/StringValueImpl.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/StringValueImpl.java
@@ -20,11 +20,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.StringValueImpl#getLiteral <em>Literal</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.StringValueImpl#getReference <em>Reference</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/WildcardRuleDirectiveImpl.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/WildcardRuleDirectiveImpl.java
index 9b359a01d..ecf9a421a 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/WildcardRuleDirectiveImpl.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/WildcardRuleDirectiveImpl.java
@@ -13,8 +13,6 @@
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Wildcard Rule Directive</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/WildcardRuleImpl.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/WildcardRuleImpl.java
index cb0aae752..1c320eb4a 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/WildcardRuleImpl.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/impl/WildcardRuleImpl.java
@@ -24,10 +24,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.format.format.impl.WildcardRuleImpl#getDirectives <em>Directives</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/util/FormatSwitch.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/util/FormatSwitch.java
index 8b93e6320..e189fbcc5 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/util/FormatSwitch.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/format/util/FormatSwitch.java
@@ -50,7 +50,7 @@ public FormatSwitch()
    * Checks whether this is a switch for the given package.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @parameter ePackage the package in question.
+   * @param ePackage the package in question.
    * @return whether this is a switch for the given package.
    * @generated
    */
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g
index 9eab666da..9876f8f43 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g
@@ -156,7 +156,7 @@ ruleFormatConfiguration returns [EObject current=null]
        			$current, 
        			"constants",
         		lv_constants_8_0, 
-        		"Constant");
+        		"com.avaloq.tools.ddk.xtext.format.Format.Constant");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -178,7 +178,7 @@ ruleFormatConfiguration returns [EObject current=null]
        			$current, 
        			"rules",
         		lv_rules_10_0, 
-        		"Rule");
+        		"com.avaloq.tools.ddk.xtext.format.Format.Rule");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -249,7 +249,7 @@ ruleConstant returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_2_0, 
-        		"ID");
+        		"org.eclipse.xtext.xbase.Xtype.ID");
 	    }
 
 )
@@ -270,7 +270,7 @@ ruleConstant returns [EObject current=null]
        			$current, 
        			"intValue",
         		lv_intValue_4_0, 
-        		"IntObject");
+        		"com.avaloq.tools.ddk.xtext.format.Format.IntObject");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -290,7 +290,7 @@ ruleConstant returns [EObject current=null]
        			$current, 
        			"stringValue",
         		lv_stringValue_5_0, 
-        		"STRING");
+        		"org.eclipse.xtext.xbase.Xtype.STRING");
 	    }
 
 )
@@ -328,7 +328,7 @@ ruleIntValue returns [EObject current=null]
        			$current, 
        			"literal",
         		lv_literal_0_0, 
-        		"IntObject");
+        		"com.avaloq.tools.ddk.xtext.format.Format.IntObject");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -384,7 +384,7 @@ ruleStringValue returns [EObject current=null]
        			$current, 
        			"literal",
         		lv_literal_0_0, 
-        		"STRING");
+        		"org.eclipse.xtext.xbase.Xtype.STRING");
 	    }
 
 )
@@ -510,7 +510,7 @@ ruleGrammarRule returns [EObject current=null]
        			$current, 
        			"directives",
         		lv_directives_3_0, 
-        		"GrammarRuleDirective");
+        		"com.avaloq.tools.ddk.xtext.format.Format.GrammarRuleDirective");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -529,7 +529,7 @@ ruleGrammarRule returns [EObject current=null]
        			$current, 
        			"directives",
         		lv_directives_4_0, 
-        		"GroupBlock");
+        		"com.avaloq.tools.ddk.xtext.format.Format.GroupBlock");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -601,7 +601,7 @@ ruleWildcardRule returns [EObject current=null]
        			$current, 
        			"directives",
         		lv_directives_4_0, 
-        		"WildcardRuleDirective");
+        		"com.avaloq.tools.ddk.xtext.format.Format.WildcardRuleDirective");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -859,7 +859,7 @@ ruleGrammarElementLookup returns [EObject current=null]
        			$current, 
        			"keyword",
         		lv_keyword_1_0, 
-        		"STRING");
+        		"org.eclipse.xtext.xbase.Xtype.STRING");
 	    }
 
 )
@@ -901,7 +901,7 @@ ruleContextFreeDirective returns [EObject current=null]
        			$current, 
        			"grammarElements",
         		lv_grammarElements_1_0, 
-        		"GrammarElementLookup");
+        		"com.avaloq.tools.ddk.xtext.format.Format.GrammarElementLookup");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -923,7 +923,7 @@ ruleContextFreeDirective returns [EObject current=null]
        			$current, 
        			"grammarElements",
         		lv_grammarElements_3_0, 
-        		"GrammarElementLookup");
+        		"com.avaloq.tools.ddk.xtext.format.Format.GrammarElementLookup");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -945,7 +945,7 @@ ruleContextFreeDirective returns [EObject current=null]
        			$current, 
        			"matcherList",
         		lv_matcherList_5_0, 
-        		"MatcherList");
+        		"com.avaloq.tools.ddk.xtext.format.Format.MatcherList");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -984,7 +984,7 @@ ruleSpecificDirective returns [EObject current=null]
        			$current, 
        			"grammarElements",
         		lv_grammarElements_0_0, 
-        		"GrammarElementReference");
+        		"com.avaloq.tools.ddk.xtext.format.Format.GrammarElementReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1006,7 +1006,7 @@ ruleSpecificDirective returns [EObject current=null]
        			$current, 
        			"grammarElements",
         		lv_grammarElements_2_0, 
-        		"GrammarElementReference");
+        		"com.avaloq.tools.ddk.xtext.format.Format.GrammarElementReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1024,7 +1024,7 @@ ruleSpecificDirective returns [EObject current=null]
        			$current, 
        			"matcherList",
         		lv_matcherList_3_0, 
-        		"MatcherList");
+        		"com.avaloq.tools.ddk.xtext.format.Format.MatcherList");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1067,7 +1067,7 @@ ruleMatcherList returns [EObject current=null]
        			$current, 
        			"matchers",
         		lv_matchers_1_0, 
-        		"Matcher");
+        		"com.avaloq.tools.ddk.xtext.format.Format.Matcher");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1089,7 +1089,7 @@ ruleMatcherList returns [EObject current=null]
        			$current, 
        			"matchers",
         		lv_matchers_3_0, 
-        		"Matcher");
+        		"com.avaloq.tools.ddk.xtext.format.Format.Matcher");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1151,7 +1151,7 @@ ruleGroupBlock returns [EObject current=null]
        			$current, 
        			"matcherList",
         		lv_matcherList_2_0, 
-        		"MatcherList");
+        		"com.avaloq.tools.ddk.xtext.format.Format.MatcherList");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1174,7 +1174,7 @@ ruleGroupBlock returns [EObject current=null]
        			$current, 
        			"subGroup",
         		lv_subGroup_4_0, 
-        		"GroupBlock");
+        		"com.avaloq.tools.ddk.xtext.format.Format.GroupBlock");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1197,7 +1197,7 @@ ruleGroupBlock returns [EObject current=null]
        			$current, 
        			"directives",
         		lv_directives_6_0, 
-        		"GrammarRuleDirective");
+        		"com.avaloq.tools.ddk.xtext.format.Format.GrammarRuleDirective");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1245,7 +1245,7 @@ ruleKeywordPair returns [EObject current=null]
        			$current, 
        			"left",
         		lv_left_1_0, 
-        		"STRING");
+        		"org.eclipse.xtext.xbase.Xtype.STRING");
 	    }
 
 )
@@ -1263,7 +1263,7 @@ ruleKeywordPair returns [EObject current=null]
        			$current, 
        			"right",
         		lv_right_2_0, 
-        		"STRING");
+        		"org.eclipse.xtext.xbase.Xtype.STRING");
 	    }
 
 )
@@ -1296,7 +1296,7 @@ ruleKeywordPair returns [EObject current=null]
        			$current, 
        			"leftMatchers",
         		lv_leftMatchers_7_0, 
-        		"Matcher");
+        		"com.avaloq.tools.ddk.xtext.format.Format.Matcher");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1323,7 +1323,7 @@ ruleKeywordPair returns [EObject current=null]
        			$current, 
        			"rightMatchers",
         		lv_rightMatchers_10_0, 
-        		"Matcher");
+        		"com.avaloq.tools.ddk.xtext.format.Format.Matcher");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1353,7 +1353,7 @@ ruleKeywordPair returns [EObject current=null]
        			$current, 
        			"leftMatchers",
         		lv_leftMatchers_14_0, 
-        		"Matcher");
+        		"com.avaloq.tools.ddk.xtext.format.Format.Matcher");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1380,7 +1380,7 @@ ruleKeywordPair returns [EObject current=null]
        			$current, 
        			"rightMatchers",
         		lv_rightMatchers_17_0, 
-        		"Matcher");
+        		"com.avaloq.tools.ddk.xtext.format.Format.Matcher");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1423,7 +1423,7 @@ ruleMatcher returns [EObject current=null]
        			$current, 
        			"locator",
         		lv_locator_0_0, 
-        		"Locator");
+        		"com.avaloq.tools.ddk.xtext.format.Format.Locator");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1441,7 +1441,7 @@ ruleMatcher returns [EObject current=null]
        			$current, 
        			"type",
         		lv_type_1_0, 
-        		"MatcherType");
+        		"com.avaloq.tools.ddk.xtext.format.Format.MatcherType");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1459,7 +1459,7 @@ ruleMatcher returns [EObject current=null]
        			$current, 
        			"condition",
         		lv_condition_2_0, 
-        		"XBlockExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XBlockExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1623,7 +1623,7 @@ ruleSpaceLocator returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_1_0, 
-        		"StringValue");
+        		"com.avaloq.tools.ddk.xtext.format.Format.StringValue");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1682,7 +1682,7 @@ ruleRightPaddingLocator returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_1_0, 
-        		"IntValue");
+        		"com.avaloq.tools.ddk.xtext.format.Format.IntValue");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1731,7 +1731,7 @@ ruleLinewrapLocator returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_2_0, 
-        		"IntValue");
+        		"com.avaloq.tools.ddk.xtext.format.Format.IntValue");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1750,7 +1750,7 @@ ruleLinewrapLocator returns [EObject current=null]
        			$current, 
        			"minimum",
         		lv_minimum_3_0, 
-        		"IntValue");
+        		"com.avaloq.tools.ddk.xtext.format.Format.IntValue");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1768,7 +1768,7 @@ ruleLinewrapLocator returns [EObject current=null]
        			$current, 
        			"default",
         		lv_default_4_0, 
-        		"IntValue");
+        		"com.avaloq.tools.ddk.xtext.format.Format.IntValue");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1786,7 +1786,7 @@ ruleLinewrapLocator returns [EObject current=null]
        			$current, 
        			"maximum",
         		lv_maximum_5_0, 
-        		"IntValue");
+        		"com.avaloq.tools.ddk.xtext.format.Format.IntValue");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1860,7 +1860,7 @@ ruleColumnLocator returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_2_0, 
-        		"IntValue");
+        		"com.avaloq.tools.ddk.xtext.format.Format.IntValue");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1879,7 +1879,7 @@ ruleColumnLocator returns [EObject current=null]
        			$current, 
        			"parameter",
         		lv_parameter_3_0, 
-        		"XBlockExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XBlockExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1967,7 +1967,7 @@ ruleOffsetLocator returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_2_0, 
-        		"IntValue");
+        		"com.avaloq.tools.ddk.xtext.format.Format.IntValue");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2047,7 +2047,7 @@ ruleIndentLocator returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_3_0, 
-        		"IntValue");
+        		"com.avaloq.tools.ddk.xtext.format.Format.IntValue");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2066,7 +2066,7 @@ ruleIndentLocator returns [EObject current=null]
        			$current, 
        			"parameter",
         		lv_parameter_4_0, 
-        		"XBlockExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XBlockExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2480,7 +2480,7 @@ ruleXAnnotation returns [EObject current=null]
        			$current, 
        			"elementValuePairs",
         		lv_elementValuePairs_4_0, 
-        		"XAnnotationElementValuePair");
+        		"org.eclipse.xtext.xbase.annotations.XbaseWithAnnotations.XAnnotationElementValuePair");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2507,7 +2507,7 @@ ruleXAnnotation returns [EObject current=null]
        			$current, 
        			"elementValuePairs",
         		lv_elementValuePairs_6_0, 
-        		"XAnnotationElementValuePair");
+        		"org.eclipse.xtext.xbase.annotations.XbaseWithAnnotations.XAnnotationElementValuePair");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2526,7 +2526,7 @@ ruleXAnnotation returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_7_0, 
-        		"XAnnotationElementValueOrCommaList");
+        		"org.eclipse.xtext.xbase.annotations.XbaseWithAnnotations.XAnnotationElementValueOrCommaList");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2593,7 +2593,7 @@ ruleXAnnotationElementValuePair returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_2_0, 
-        		"XAnnotationElementValue");
+        		"org.eclipse.xtext.xbase.annotations.XbaseWithAnnotations.XAnnotationElementValue");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2649,7 +2649,7 @@ ruleXAnnotationElementValueOrCommaList returns [EObject current=null]
        			$current, 
        			"elements",
         		lv_elements_3_0, 
-        		"XAnnotationOrExpression");
+        		"org.eclipse.xtext.xbase.annotations.XbaseWithAnnotations.XAnnotationOrExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2671,7 +2671,7 @@ ruleXAnnotationElementValueOrCommaList returns [EObject current=null]
        			$current, 
        			"elements",
         		lv_elements_5_0, 
-        		"XAnnotationOrExpression");
+        		"org.eclipse.xtext.xbase.annotations.XbaseWithAnnotations.XAnnotationOrExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2713,7 +2713,7 @@ ruleXAnnotationElementValueOrCommaList returns [EObject current=null]
        			$current, 
        			"elements",
         		lv_elements_10_0, 
-        		"XAnnotationOrExpression");
+        		"org.eclipse.xtext.xbase.annotations.XbaseWithAnnotations.XAnnotationOrExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2769,7 +2769,7 @@ ruleXAnnotationElementValue returns [EObject current=null]
        			$current, 
        			"elements",
         		lv_elements_3_0, 
-        		"XAnnotationOrExpression");
+        		"org.eclipse.xtext.xbase.annotations.XbaseWithAnnotations.XAnnotationOrExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2791,7 +2791,7 @@ ruleXAnnotationElementValue returns [EObject current=null]
        			$current, 
        			"elements",
         		lv_elements_5_0, 
-        		"XAnnotationOrExpression");
+        		"org.eclipse.xtext.xbase.annotations.XbaseWithAnnotations.XAnnotationOrExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2943,7 +2943,7 @@ ruleOpSingleAssign
        			$current, 
        			"value",
         		lv_value_3_0, 
-        		"XAssignment");
+        		"org.eclipse.xtext.xbase.Xbase.XAssignment");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2997,7 +2997,7 @@ ruleOpSingleAssign
        			$current, 
        			"rightOperand",
         		lv_rightOperand_7_0, 
-        		"XAssignment");
+        		"org.eclipse.xtext.xbase.Xbase.XAssignment");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3191,7 +3191,7 @@ ruleXOrExpression returns [EObject current=null]
        			$current, 
        			"rightOperand",
         		lv_rightOperand_3_0, 
-        		"XAndExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XAndExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3292,7 +3292,7 @@ ruleXAndExpression returns [EObject current=null]
        			$current, 
        			"rightOperand",
         		lv_rightOperand_3_0, 
-        		"XEqualityExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XEqualityExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3393,7 +3393,7 @@ ruleXEqualityExpression returns [EObject current=null]
        			$current, 
        			"rightOperand",
         		lv_rightOperand_3_0, 
-        		"XRelationalExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XRelationalExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3501,7 +3501,7 @@ ruleXRelationalExpression returns [EObject current=null]
        			$current, 
        			"type",
         		lv_type_3_0, 
-        		"JvmTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3546,7 +3546,7 @@ ruleXRelationalExpression returns [EObject current=null]
        			$current, 
        			"rightOperand",
         		lv_rightOperand_6_0, 
-        		"XOtherOperatorExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XOtherOperatorExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3674,7 +3674,7 @@ ruleXOtherOperatorExpression returns [EObject current=null]
        			$current, 
        			"rightOperand",
         		lv_rightOperand_3_0, 
-        		"XAdditiveExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XAdditiveExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3890,7 +3890,7 @@ ruleXAdditiveExpression returns [EObject current=null]
        			$current, 
        			"rightOperand",
         		lv_rightOperand_3_0, 
-        		"XMultiplicativeExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XMultiplicativeExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3998,7 +3998,7 @@ ruleXMultiplicativeExpression returns [EObject current=null]
        			$current, 
        			"rightOperand",
         		lv_rightOperand_3_0, 
-        		"XUnaryOperation");
+        		"org.eclipse.xtext.xbase.Xbase.XUnaryOperation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4106,7 +4106,7 @@ ruleXUnaryOperation returns [EObject current=null]
        			$current, 
        			"operand",
         		lv_operand_2_0, 
-        		"XUnaryOperation");
+        		"org.eclipse.xtext.xbase.Xbase.XUnaryOperation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4217,7 +4217,7 @@ ruleXCastedExpression returns [EObject current=null]
        			$current, 
        			"type",
         		lv_type_3_0, 
-        		"JvmTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4417,7 +4417,7 @@ ruleOpSingleAssign
        			$current, 
        			"value",
         		lv_value_6_0, 
-        		"XAssignment");
+        		"org.eclipse.xtext.xbase.Xbase.XAssignment");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4498,7 +4498,7 @@ ruleOpSingleAssign
        			$current, 
        			"typeArguments",
         		lv_typeArguments_12_0, 
-        		"JvmArgumentTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4520,7 +4520,7 @@ ruleOpSingleAssign
        			$current, 
        			"typeArguments",
         		lv_typeArguments_14_0, 
-        		"JvmArgumentTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4594,7 +4594,7 @@ ruleJvmFormalParameter
        			$current, 
        			"memberCallArguments",
         		lv_memberCallArguments_18_0, 
-        		"XShortClosure");
+        		"org.eclipse.xtext.xbase.Xbase.XShortClosure");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4613,7 +4613,7 @@ ruleJvmFormalParameter
        			$current, 
        			"memberCallArguments",
         		lv_memberCallArguments_19_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4635,7 +4635,7 @@ ruleJvmFormalParameter
        			$current, 
        			"memberCallArguments",
         		lv_memberCallArguments_21_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4659,7 +4659,7 @@ ruleJvmFormalParameter
        			$current, 
        			"memberCallArguments",
         		lv_memberCallArguments_23_0, 
-        		"XClosure");
+        		"org.eclipse.xtext.xbase.Xbase.XClosure");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5025,7 +5025,7 @@ ruleXSetLiteral returns [EObject current=null]
        			$current, 
        			"elements",
         		lv_elements_3_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5047,7 +5047,7 @@ ruleXSetLiteral returns [EObject current=null]
        			$current, 
        			"elements",
         		lv_elements_5_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5104,7 +5104,7 @@ ruleXListLiteral returns [EObject current=null]
        			$current, 
        			"elements",
         		lv_elements_3_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5126,7 +5126,7 @@ ruleXListLiteral returns [EObject current=null]
        			$current, 
        			"elements",
         		lv_elements_5_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5196,7 +5196,7 @@ ruleJvmFormalParameter
        			$current, 
        			"declaredFormalParameters",
         		lv_declaredFormalParameters_2_0, 
-        		"JvmFormalParameter");
+        		"org.eclipse.xtext.xbase.Xbase.JvmFormalParameter");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5218,7 +5218,7 @@ ruleJvmFormalParameter
        			$current, 
        			"declaredFormalParameters",
         		lv_declaredFormalParameters_4_0, 
-        		"JvmFormalParameter");
+        		"org.eclipse.xtext.xbase.Xbase.JvmFormalParameter");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5251,7 +5251,7 @@ ruleJvmFormalParameter
        			$current, 
        			"expression",
         		lv_expression_6_0, 
-        		"XExpressionInClosure");
+        		"org.eclipse.xtext.xbase.Xbase.XExpressionInClosure");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5300,7 +5300,7 @@ ruleXExpressionInClosure returns [EObject current=null]
        			$current, 
        			"expressions",
         		lv_expressions_1_0, 
-        		"XExpressionOrVarDeclaration");
+        		"org.eclipse.xtext.xbase.Xbase.XExpressionOrVarDeclaration");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5365,7 +5365,7 @@ ruleJvmFormalParameter
        			$current, 
        			"declaredFormalParameters",
         		lv_declaredFormalParameters_1_0, 
-        		"JvmFormalParameter");
+        		"org.eclipse.xtext.xbase.Xbase.JvmFormalParameter");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5387,7 +5387,7 @@ ruleJvmFormalParameter
        			$current, 
        			"declaredFormalParameters",
         		lv_declaredFormalParameters_3_0, 
-        		"JvmFormalParameter");
+        		"org.eclipse.xtext.xbase.Xbase.JvmFormalParameter");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5420,7 +5420,7 @@ ruleJvmFormalParameter
        			$current, 
        			"expression",
         		lv_expression_5_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5511,7 +5511,7 @@ ruleXIfExpression returns [EObject current=null]
        			$current, 
        			"if",
         		lv_if_3_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5533,7 +5533,7 @@ ruleXIfExpression returns [EObject current=null]
        			$current, 
        			"then",
         		lv_then_5_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5556,7 +5556,7 @@ ruleXIfExpression returns [EObject current=null]
        			$current, 
        			"else",
         		lv_else_7_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5615,7 +5615,7 @@ ruleJvmFormalParameter
        			$current, 
        			"declaredParam",
         		lv_declaredParam_3_0, 
-        		"JvmFormalParameter");
+        		"org.eclipse.xtext.xbase.Xbase.JvmFormalParameter");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5637,7 +5637,7 @@ ruleJvmFormalParameter
        			$current, 
        			"switch",
         		lv_switch_5_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5665,7 +5665,7 @@ ruleJvmFormalParameter
        			$current, 
        			"declaredParam",
         		lv_declaredParam_7_0, 
-        		"JvmFormalParameter");
+        		"org.eclipse.xtext.xbase.Xbase.JvmFormalParameter");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5687,7 +5687,7 @@ ruleJvmFormalParameter
        			$current, 
        			"switch",
         		lv_switch_9_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5709,7 +5709,7 @@ ruleJvmFormalParameter
        			$current, 
        			"cases",
         		lv_cases_11_0, 
-        		"XCasePart");
+        		"org.eclipse.xtext.xbase.Xbase.XCasePart");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5735,7 +5735,7 @@ ruleJvmFormalParameter
        			$current, 
        			"default",
         		lv_default_14_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5784,7 +5784,7 @@ ruleXCasePart returns [EObject current=null]
        			$current, 
        			"typeGuard",
         		lv_typeGuard_1_0, 
-        		"JvmTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5806,7 +5806,7 @@ ruleXCasePart returns [EObject current=null]
        			$current, 
        			"case",
         		lv_case_3_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5828,7 +5828,7 @@ ruleXCasePart returns [EObject current=null]
        			$current, 
        			"then",
         		lv_then_5_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5905,7 +5905,7 @@ ruleJvmFormalParameter
        			$current, 
        			"declaredParam",
         		lv_declaredParam_3_0, 
-        		"JvmFormalParameter");
+        		"org.eclipse.xtext.xbase.Xbase.JvmFormalParameter");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5927,7 +5927,7 @@ ruleJvmFormalParameter
        			$current, 
        			"forExpression",
         		lv_forExpression_5_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -5949,7 +5949,7 @@ ruleJvmFormalParameter
        			$current, 
        			"eachExpression",
         		lv_eachExpression_7_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6002,7 +6002,7 @@ ruleXBasicForLoopExpression returns [EObject current=null]
        			$current, 
        			"initExpressions",
         		lv_initExpressions_3_0, 
-        		"XExpressionOrVarDeclaration");
+        		"org.eclipse.xtext.xbase.Xbase.XExpressionOrVarDeclaration");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6024,7 +6024,7 @@ ruleXBasicForLoopExpression returns [EObject current=null]
        			$current, 
        			"initExpressions",
         		lv_initExpressions_5_0, 
-        		"XExpressionOrVarDeclaration");
+        		"org.eclipse.xtext.xbase.Xbase.XExpressionOrVarDeclaration");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6046,7 +6046,7 @@ ruleXBasicForLoopExpression returns [EObject current=null]
        			$current, 
        			"expression",
         		lv_expression_7_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6068,7 +6068,7 @@ ruleXBasicForLoopExpression returns [EObject current=null]
        			$current, 
        			"updateExpressions",
         		lv_updateExpressions_9_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6090,7 +6090,7 @@ ruleXBasicForLoopExpression returns [EObject current=null]
        			$current, 
        			"updateExpressions",
         		lv_updateExpressions_11_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6112,7 +6112,7 @@ ruleXBasicForLoopExpression returns [EObject current=null]
        			$current, 
        			"eachExpression",
         		lv_eachExpression_13_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6165,7 +6165,7 @@ ruleXWhileExpression returns [EObject current=null]
        			$current, 
        			"predicate",
         		lv_predicate_3_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6187,7 +6187,7 @@ ruleXWhileExpression returns [EObject current=null]
        			$current, 
        			"body",
         		lv_body_5_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6236,7 +6236,7 @@ ruleXDoWhileExpression returns [EObject current=null]
        			$current, 
        			"body",
         		lv_body_2_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6262,7 +6262,7 @@ ruleXDoWhileExpression returns [EObject current=null]
        			$current, 
        			"predicate",
         		lv_predicate_5_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6315,7 +6315,7 @@ ruleXBlockExpression returns [EObject current=null]
        			$current, 
        			"expressions",
         		lv_expressions_2_0, 
-        		"XExpressionOrVarDeclaration");
+        		"org.eclipse.xtext.xbase.Xbase.XExpressionOrVarDeclaration");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6436,7 +6436,7 @@ ruleValidID
        			$current, 
        			"type",
         		lv_type_3_0, 
-        		"JvmTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6454,7 +6454,7 @@ ruleValidID
        			$current, 
        			"name",
         		lv_name_4_0, 
-        		"ValidID");
+        		"com.avaloq.tools.ddk.xtext.format.Format.ValidID");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6473,7 +6473,7 @@ ruleValidID
        			$current, 
        			"name",
         		lv_name_5_0, 
-        		"ValidID");
+        		"com.avaloq.tools.ddk.xtext.format.Format.ValidID");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6495,7 +6495,7 @@ ruleValidID
        			$current, 
        			"right",
         		lv_right_7_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6534,7 +6534,7 @@ ruleJvmFormalParameter returns [EObject current=null]
        			$current, 
        			"parameterType",
         		lv_parameterType_0_0, 
-        		"JvmTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6552,7 +6552,7 @@ ruleJvmFormalParameter returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ValidID");
+        		"com.avaloq.tools.ddk.xtext.format.Format.ValidID");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6591,7 +6591,7 @@ ruleFullJvmFormalParameter returns [EObject current=null]
        			$current, 
        			"parameterType",
         		lv_parameterType_0_0, 
-        		"JvmTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6609,7 +6609,7 @@ ruleFullJvmFormalParameter returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ValidID");
+        		"com.avaloq.tools.ddk.xtext.format.Format.ValidID");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6658,7 +6658,7 @@ ruleXFeatureCall returns [EObject current=null]
        			$current, 
        			"typeArguments",
         		lv_typeArguments_2_0, 
-        		"JvmArgumentTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6680,7 +6680,7 @@ ruleXFeatureCall returns [EObject current=null]
        			$current, 
        			"typeArguments",
         		lv_typeArguments_4_0, 
-        		"JvmArgumentTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6754,7 +6754,7 @@ ruleJvmFormalParameter
        			$current, 
        			"featureCallArguments",
         		lv_featureCallArguments_8_0, 
-        		"XShortClosure");
+        		"org.eclipse.xtext.xbase.Xbase.XShortClosure");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6773,7 +6773,7 @@ ruleJvmFormalParameter
        			$current, 
        			"featureCallArguments",
         		lv_featureCallArguments_9_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6795,7 +6795,7 @@ ruleJvmFormalParameter
        			$current, 
        			"featureCallArguments",
         		lv_featureCallArguments_11_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6819,7 +6819,7 @@ ruleJvmFormalParameter
        			$current, 
        			"featureCallArguments",
         		lv_featureCallArguments_13_0, 
-        		"XClosure");
+        		"org.eclipse.xtext.xbase.Xbase.XClosure");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -6987,7 +6987,7 @@ ruleXConstructorCall returns [EObject current=null]
        			$current, 
        			"typeArguments",
         		lv_typeArguments_4_0, 
-        		"JvmArgumentTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7009,7 +7009,7 @@ ruleXConstructorCall returns [EObject current=null]
        			$current, 
        			"typeArguments",
         		lv_typeArguments_6_0, 
-        		"JvmArgumentTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7068,7 +7068,7 @@ ruleJvmFormalParameter
        			$current, 
        			"arguments",
         		lv_arguments_9_0, 
-        		"XShortClosure");
+        		"org.eclipse.xtext.xbase.Xbase.XShortClosure");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7087,7 +7087,7 @@ ruleJvmFormalParameter
        			$current, 
        			"arguments",
         		lv_arguments_10_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7109,7 +7109,7 @@ ruleJvmFormalParameter
        			$current, 
        			"arguments",
         		lv_arguments_12_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7133,7 +7133,7 @@ ruleJvmFormalParameter
        			$current, 
        			"arguments",
         		lv_arguments_14_0, 
-        		"XClosure");
+        		"org.eclipse.xtext.xbase.Xbase.XClosure");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7256,7 +7256,7 @@ ruleXNumberLiteral returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_1_0, 
-        		"Number");
+        		"org.eclipse.xtext.xbase.Xbase.Number");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7302,7 +7302,7 @@ ruleXStringLiteral returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_1_0, 
-        		"STRING");
+        		"org.eclipse.xtext.xbase.Xtype.STRING");
 	    }
 
 )
@@ -7369,7 +7369,7 @@ ruleXTypeLiteral returns [EObject current=null]
        			$current, 
        			"arrayDimensions",
         		lv_arrayDimensions_4_0, 
-        		"ArrayBrackets");
+        		"org.eclipse.xtext.xbase.Xtype.ArrayBrackets");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7422,7 +7422,7 @@ ruleXThrowExpression returns [EObject current=null]
        			$current, 
        			"expression",
         		lv_expression_2_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7500,7 +7500,7 @@ ruleXReturnExpression returns [EObject current=null]
        			$current, 
        			"expression",
         		lv_expression_2_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7549,7 +7549,7 @@ ruleXTryCatchFinallyExpression returns [EObject current=null]
        			$current, 
        			"expression",
         		lv_expression_2_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7568,7 +7568,7 @@ ruleXTryCatchFinallyExpression returns [EObject current=null]
        			$current, 
        			"catchClauses",
         		lv_catchClauses_3_0, 
-        		"XCatchClause");
+        		"org.eclipse.xtext.xbase.Xbase.XCatchClause");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7591,7 +7591,7 @@ ruleXTryCatchFinallyExpression returns [EObject current=null]
        			$current, 
        			"finallyExpression",
         		lv_finallyExpression_5_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7614,7 +7614,7 @@ ruleXTryCatchFinallyExpression returns [EObject current=null]
        			$current, 
        			"finallyExpression",
         		lv_finallyExpression_7_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7670,7 +7670,7 @@ ruleXSynchronizedExpression returns [EObject current=null]
        			$current, 
        			"param",
         		lv_param_3_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7692,7 +7692,7 @@ ruleXSynchronizedExpression returns [EObject current=null]
        			$current, 
        			"expression",
         		lv_expression_5_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7740,7 +7740,7 @@ ruleXCatchClause returns [EObject current=null]
        			$current, 
        			"declaredParam",
         		lv_declaredParam_2_0, 
-        		"FullJvmFormalParameter");
+        		"org.eclipse.xtext.xbase.Xbase.FullJvmFormalParameter");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -7762,7 +7762,7 @@ ruleXCatchClause returns [EObject current=null]
        			$current, 
        			"expression",
         		lv_expression_4_0, 
-        		"XExpression");
+        		"org.eclipse.xtext.xbase.Xbase.XExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -8021,7 +8021,7 @@ ruleXFunctionTypeRef returns [EObject current=null]
        			$current, 
        			"paramTypes",
         		lv_paramTypes_1_0, 
-        		"JvmTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -8043,7 +8043,7 @@ ruleXFunctionTypeRef returns [EObject current=null]
        			$current, 
        			"paramTypes",
         		lv_paramTypes_3_0, 
-        		"JvmTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -8069,7 +8069,7 @@ ruleXFunctionTypeRef returns [EObject current=null]
        			$current, 
        			"returnType",
         		lv_returnType_6_0, 
-        		"JvmTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -8128,7 +8128,7 @@ ruleJvmParameterizedTypeReference returns [EObject current=null]
        			$current, 
        			"arguments",
         		lv_arguments_2_0, 
-        		"JvmArgumentTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -8150,7 +8150,7 @@ ruleJvmParameterizedTypeReference returns [EObject current=null]
        			$current, 
        			"arguments",
         		lv_arguments_4_0, 
-        		"JvmArgumentTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -8204,7 +8204,7 @@ ruleJvmParameterizedTypeReference returns [EObject current=null]
        			$current, 
        			"arguments",
         		lv_arguments_10_0, 
-        		"JvmArgumentTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -8226,7 +8226,7 @@ ruleJvmParameterizedTypeReference returns [EObject current=null]
        			$current, 
        			"arguments",
         		lv_arguments_12_0, 
-        		"JvmArgumentTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -8319,7 +8319,7 @@ ruleJvmWildcardTypeReference returns [EObject current=null]
        			$current, 
        			"constraints",
         		lv_constraints_2_0, 
-        		"JvmUpperBound");
+        		"org.eclipse.xtext.xbase.Xtype.JvmUpperBound");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -8337,7 +8337,7 @@ ruleJvmWildcardTypeReference returns [EObject current=null]
        			$current, 
        			"constraints",
         		lv_constraints_3_0, 
-        		"JvmUpperBoundAnded");
+        		"org.eclipse.xtext.xbase.Xtype.JvmUpperBoundAnded");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -8356,7 +8356,7 @@ ruleJvmWildcardTypeReference returns [EObject current=null]
        			$current, 
        			"constraints",
         		lv_constraints_4_0, 
-        		"JvmLowerBound");
+        		"org.eclipse.xtext.xbase.Xtype.JvmLowerBound");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -8374,7 +8374,7 @@ ruleJvmWildcardTypeReference returns [EObject current=null]
        			$current, 
        			"constraints",
         		lv_constraints_5_0, 
-        		"JvmLowerBoundAnded");
+        		"org.eclipse.xtext.xbase.Xtype.JvmLowerBoundAnded");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -8417,7 +8417,7 @@ ruleJvmUpperBound returns [EObject current=null]
        			$current, 
        			"typeReference",
         		lv_typeReference_1_0, 
-        		"JvmTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -8460,7 +8460,7 @@ ruleJvmUpperBoundAnded returns [EObject current=null]
        			$current, 
        			"typeReference",
         		lv_typeReference_1_0, 
-        		"JvmTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -8503,7 +8503,7 @@ ruleJvmLowerBound returns [EObject current=null]
        			$current, 
        			"typeReference",
         		lv_typeReference_1_0, 
-        		"JvmTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -8546,7 +8546,7 @@ ruleJvmLowerBoundAnded returns [EObject current=null]
        			$current, 
        			"typeReference",
         		lv_typeReference_1_0, 
-        		"JvmTypeReference");
+        		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -8698,7 +8698,7 @@ ruleXImportDeclaration returns [EObject current=null]
        			$current, 
        			"memberName",
         		lv_memberName_5_0, 
-        		"ValidID");
+        		"com.avaloq.tools.ddk.xtext.format.Format.ValidID");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -8733,7 +8733,7 @@ ruleXImportDeclaration returns [EObject current=null]
        			$current, 
        			"importedNamespace",
         		lv_importedNamespace_7_0, 
-        		"QualifiedNameWithWildcard");
+        		"org.eclipse.xtext.xbase.Xtype.QualifiedNameWithWildcard");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -8824,10 +8824,10 @@ ruleMatcherType returns [Enumerator current=null]
 
 
 
-RULE_HEX : ('0x'|'0X') ('0'..'9'|'a'..'f'|'A'..'F'|'_')+ ('#' (('b'|'B') ('i'|'I')|('l'|'L')))?;
-
 RULE_INT : '0'..'9' ('0'..'9'|'_')*;
 
+RULE_HEX : ('0x'|'0X') ('0'..'9'|'a'..'f'|'A'..'F'|'_')+ ('#' (('b'|'B') ('i'|'I')|('l'|'L')))?;
+
 RULE_DECIMAL : RULE_INT (('e'|'E') ('+'|'-')? RULE_INT)? (('b'|'B') ('i'|'I'|'d'|'D')|('l'|'L'|'d'|'D'|'f'|'F'))?;
 
 RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'$'|'_') ('a'..'z'|'A'..'Z'|'$'|'_'|'0'..'9')*;
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormatLexer.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormatLexer.java
index bb65e0cd6..ec4a43911 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormatLexer.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormatLexer.java
@@ -139,15 +139,15 @@ public InternalFormatLexer(CharStream input, RecognizerSharedState state) {
         super(input,state);
 
     }
-    public String getGrammarFileName() { return "../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g"; }
+    public String getGrammarFileName() { return "InternalFormat.g"; }
 
     // $ANTLR start "T__13"
     public final void mT__13() throws RecognitionException {
         try {
             int _type = T__13;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:11:7: ( 'formatter' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:11:9: 'formatter'
+            // InternalFormat.g:11:7: ( 'formatter' )
+            // InternalFormat.g:11:9: 'formatter'
             {
             match("formatter"); 
 
@@ -167,8 +167,8 @@ public final void mT__14() throws RecognitionException {
         try {
             int _type = T__14;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:12:7: ( 'for' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:12:9: 'for'
+            // InternalFormat.g:12:7: ( 'for' )
+            // InternalFormat.g:12:9: 'for'
             {
             match("for"); 
 
@@ -188,8 +188,8 @@ public final void mT__15() throws RecognitionException {
         try {
             int _type = T__15;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:13:7: ( 'with' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:13:9: 'with'
+            // InternalFormat.g:13:7: ( 'with' )
+            // InternalFormat.g:13:9: 'with'
             {
             match("with"); 
 
@@ -209,8 +209,8 @@ public final void mT__16() throws RecognitionException {
         try {
             int _type = T__16;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:14:7: ( 'extends' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:14:9: 'extends'
+            // InternalFormat.g:14:7: ( 'extends' )
+            // InternalFormat.g:14:9: 'extends'
             {
             match("extends"); 
 
@@ -230,8 +230,8 @@ public final void mT__17() throws RecognitionException {
         try {
             int _type = T__17;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:15:7: ( 'const' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:15:9: 'const'
+            // InternalFormat.g:15:7: ( 'const' )
+            // InternalFormat.g:15:9: 'const'
             {
             match("const"); 
 
@@ -251,8 +251,8 @@ public final void mT__18() throws RecognitionException {
         try {
             int _type = T__18;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:16:7: ( ';' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:16:9: ';'
+            // InternalFormat.g:16:7: ( ';' )
+            // InternalFormat.g:16:9: ';'
             {
             match(';'); 
 
@@ -271,8 +271,8 @@ public final void mT__19() throws RecognitionException {
         try {
             int _type = T__19;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:17:7: ( 'int' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:17:9: 'int'
+            // InternalFormat.g:17:7: ( 'int' )
+            // InternalFormat.g:17:9: 'int'
             {
             match("int"); 
 
@@ -292,8 +292,8 @@ public final void mT__20() throws RecognitionException {
         try {
             int _type = T__20;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:18:7: ( 'String' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:18:9: 'String'
+            // InternalFormat.g:18:7: ( 'String' )
+            // InternalFormat.g:18:9: 'String'
             {
             match("String"); 
 
@@ -313,8 +313,8 @@ public final void mT__21() throws RecognitionException {
         try {
             int _type = T__21;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:19:7: ( '=' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:19:9: '='
+            // InternalFormat.g:19:7: ( '=' )
+            // InternalFormat.g:19:9: '='
             {
             match('='); 
 
@@ -333,8 +333,8 @@ public final void mT__22() throws RecognitionException {
         try {
             int _type = T__22;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:20:7: ( 'override' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:20:9: 'override'
+            // InternalFormat.g:20:7: ( 'override' )
+            // InternalFormat.g:20:9: 'override'
             {
             match("override"); 
 
@@ -354,8 +354,8 @@ public final void mT__23() throws RecognitionException {
         try {
             int _type = T__23;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:21:7: ( '{' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:21:9: '{'
+            // InternalFormat.g:21:7: ( '{' )
+            // InternalFormat.g:21:9: '{'
             {
             match('{'); 
 
@@ -374,8 +374,8 @@ public final void mT__24() throws RecognitionException {
         try {
             int _type = T__24;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:22:7: ( '}' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:22:9: '}'
+            // InternalFormat.g:22:7: ( '}' )
+            // InternalFormat.g:22:9: '}'
             {
             match('}'); 
 
@@ -394,8 +394,8 @@ public final void mT__25() throws RecognitionException {
         try {
             int _type = T__25;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:23:7: ( '*' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:23:9: '*'
+            // InternalFormat.g:23:7: ( '*' )
+            // InternalFormat.g:23:9: '*'
             {
             match('*'); 
 
@@ -414,8 +414,8 @@ public final void mT__26() throws RecognitionException {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:24:7: ( '@' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:24:9: '@'
+            // InternalFormat.g:24:7: ( '@' )
+            // InternalFormat.g:24:9: '@'
             {
             match('@'); 
 
@@ -434,8 +434,8 @@ public final void mT__27() throws RecognitionException {
         try {
             int _type = T__27;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:25:7: ( '[' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:25:9: '['
+            // InternalFormat.g:25:7: ( '[' )
+            // InternalFormat.g:25:9: '['
             {
             match('['); 
 
@@ -454,8 +454,8 @@ public final void mT__28() throws RecognitionException {
         try {
             int _type = T__28;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:26:7: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:26:9: ','
+            // InternalFormat.g:26:7: ( ',' )
+            // InternalFormat.g:26:9: ','
             {
             match(','); 
 
@@ -474,8 +474,8 @@ public final void mT__29() throws RecognitionException {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:27:7: ( ']' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:27:9: ']'
+            // InternalFormat.g:27:7: ( ']' )
+            // InternalFormat.g:27:9: ']'
             {
             match(']'); 
 
@@ -494,8 +494,8 @@ public final void mT__30() throws RecognitionException {
         try {
             int _type = T__30;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:28:7: ( ':' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:28:9: ':'
+            // InternalFormat.g:28:7: ( ':' )
+            // InternalFormat.g:28:9: ':'
             {
             match(':'); 
 
@@ -514,8 +514,8 @@ public final void mT__31() throws RecognitionException {
         try {
             int _type = T__31;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:29:7: ( 'group' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:29:9: 'group'
+            // InternalFormat.g:29:7: ( 'group' )
+            // InternalFormat.g:29:9: 'group'
             {
             match("group"); 
 
@@ -535,8 +535,8 @@ public final void mT__32() throws RecognitionException {
         try {
             int _type = T__32;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:30:7: ( '=>' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:30:9: '=>'
+            // InternalFormat.g:30:7: ( '=>' )
+            // InternalFormat.g:30:9: '=>'
             {
             match("=>"); 
 
@@ -556,8 +556,8 @@ public final void mT__33() throws RecognitionException {
         try {
             int _type = T__33;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:31:7: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:31:9: '('
+            // InternalFormat.g:31:7: ( '(' )
+            // InternalFormat.g:31:9: '('
             {
             match('('); 
 
@@ -576,8 +576,8 @@ public final void mT__34() throws RecognitionException {
         try {
             int _type = T__34;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:32:7: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:32:9: ')'
+            // InternalFormat.g:32:7: ( ')' )
+            // InternalFormat.g:32:9: ')'
             {
             match(')'); 
 
@@ -596,8 +596,8 @@ public final void mT__35() throws RecognitionException {
         try {
             int _type = T__35;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:33:7: ( 'left' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:33:9: 'left'
+            // InternalFormat.g:33:7: ( 'left' )
+            // InternalFormat.g:33:9: 'left'
             {
             match("left"); 
 
@@ -617,8 +617,8 @@ public final void mT__36() throws RecognitionException {
         try {
             int _type = T__36;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:34:7: ( '.' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:34:9: '.'
+            // InternalFormat.g:34:7: ( '.' )
+            // InternalFormat.g:34:9: '.'
             {
             match('.'); 
 
@@ -637,8 +637,8 @@ public final void mT__37() throws RecognitionException {
         try {
             int _type = T__37;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:35:7: ( 'right' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:35:9: 'right'
+            // InternalFormat.g:35:7: ( 'right' )
+            // InternalFormat.g:35:9: 'right'
             {
             match("right"); 
 
@@ -658,8 +658,8 @@ public final void mT__38() throws RecognitionException {
         try {
             int _type = T__38;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:36:7: ( 'no_format' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:36:9: 'no_format'
+            // InternalFormat.g:36:7: ( 'no_format' )
+            // InternalFormat.g:36:9: 'no_format'
             {
             match("no_format"); 
 
@@ -679,8 +679,8 @@ public final void mT__39() throws RecognitionException {
         try {
             int _type = T__39;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:37:7: ( 'space' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:37:9: 'space'
+            // InternalFormat.g:37:7: ( 'space' )
+            // InternalFormat.g:37:9: 'space'
             {
             match("space"); 
 
@@ -700,8 +700,8 @@ public final void mT__40() throws RecognitionException {
         try {
             int _type = T__40;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:38:7: ( 'no_space' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:38:9: 'no_space'
+            // InternalFormat.g:38:7: ( 'no_space' )
+            // InternalFormat.g:38:9: 'no_space'
             {
             match("no_space"); 
 
@@ -721,8 +721,8 @@ public final void mT__41() throws RecognitionException {
         try {
             int _type = T__41;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:39:7: ( 'right_padding' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:39:9: 'right_padding'
+            // InternalFormat.g:39:7: ( 'right_padding' )
+            // InternalFormat.g:39:9: 'right_padding'
             {
             match("right_padding"); 
 
@@ -742,8 +742,8 @@ public final void mT__42() throws RecognitionException {
         try {
             int _type = T__42;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:40:7: ( 'linewrap' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:40:9: 'linewrap'
+            // InternalFormat.g:40:7: ( 'linewrap' )
+            // InternalFormat.g:40:9: 'linewrap'
             {
             match("linewrap"); 
 
@@ -763,8 +763,8 @@ public final void mT__43() throws RecognitionException {
         try {
             int _type = T__43;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:41:7: ( 'no_linewrap' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:41:9: 'no_linewrap'
+            // InternalFormat.g:41:7: ( 'no_linewrap' )
+            // InternalFormat.g:41:9: 'no_linewrap'
             {
             match("no_linewrap"); 
 
@@ -784,8 +784,8 @@ public final void mT__44() throws RecognitionException {
         try {
             int _type = T__44;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:42:7: ( 'column' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:42:9: 'column'
+            // InternalFormat.g:42:7: ( 'column' )
+            // InternalFormat.g:42:9: 'column'
             {
             match("column"); 
 
@@ -805,8 +805,8 @@ public final void mT__45() throws RecognitionException {
         try {
             int _type = T__45;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:43:7: ( 'fixed' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:43:9: 'fixed'
+            // InternalFormat.g:43:7: ( 'fixed' )
+            // InternalFormat.g:43:9: 'fixed'
             {
             match("fixed"); 
 
@@ -826,8 +826,8 @@ public final void mT__46() throws RecognitionException {
         try {
             int _type = T__46;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:44:7: ( 'relative' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:44:9: 'relative'
+            // InternalFormat.g:44:7: ( 'relative' )
+            // InternalFormat.g:44:9: 'relative'
             {
             match("relative"); 
 
@@ -847,8 +847,8 @@ public final void mT__47() throws RecognitionException {
         try {
             int _type = T__47;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:45:7: ( 'nobreak' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:45:9: 'nobreak'
+            // InternalFormat.g:45:7: ( 'nobreak' )
+            // InternalFormat.g:45:9: 'nobreak'
             {
             match("nobreak"); 
 
@@ -868,8 +868,8 @@ public final void mT__48() throws RecognitionException {
         try {
             int _type = T__48;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:46:7: ( 'offset' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:46:9: 'offset'
+            // InternalFormat.g:46:7: ( 'offset' )
+            // InternalFormat.g:46:9: 'offset'
             {
             match("offset"); 
 
@@ -889,8 +889,8 @@ public final void mT__49() throws RecognitionException {
         try {
             int _type = T__49;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:47:7: ( 'increment' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:47:9: 'increment'
+            // InternalFormat.g:47:7: ( 'increment' )
+            // InternalFormat.g:47:9: 'increment'
             {
             match("increment"); 
 
@@ -910,8 +910,8 @@ public final void mT__50() throws RecognitionException {
         try {
             int _type = T__50;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:48:7: ( 'decrement' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:48:9: 'decrement'
+            // InternalFormat.g:48:7: ( 'decrement' )
+            // InternalFormat.g:48:9: 'decrement'
             {
             match("decrement"); 
 
@@ -931,8 +931,8 @@ public final void mT__51() throws RecognitionException {
         try {
             int _type = T__51;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:49:7: ( 'default' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:49:9: 'default'
+            // InternalFormat.g:49:7: ( 'default' )
+            // InternalFormat.g:49:9: 'default'
             {
             match("default"); 
 
@@ -952,8 +952,8 @@ public final void mT__52() throws RecognitionException {
         try {
             int _type = T__52;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:50:7: ( 'val' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:50:9: 'val'
+            // InternalFormat.g:50:7: ( 'val' )
+            // InternalFormat.g:50:9: 'val'
             {
             match("val"); 
 
@@ -973,8 +973,8 @@ public final void mT__53() throws RecognitionException {
         try {
             int _type = T__53;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:51:7: ( 'rule' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:51:9: 'rule'
+            // InternalFormat.g:51:7: ( 'rule' )
+            // InternalFormat.g:51:9: 'rule'
             {
             match("rule"); 
 
@@ -994,8 +994,8 @@ public final void mT__54() throws RecognitionException {
         try {
             int _type = T__54;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:52:7: ( 'context' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:52:9: 'context'
+            // InternalFormat.g:52:7: ( 'context' )
+            // InternalFormat.g:52:9: 'context'
             {
             match("context"); 
 
@@ -1015,8 +1015,8 @@ public final void mT__55() throws RecognitionException {
         try {
             int _type = T__55;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:53:7: ( 'currentColumn' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:53:9: 'currentColumn'
+            // InternalFormat.g:53:7: ( 'currentColumn' )
+            // InternalFormat.g:53:9: 'currentColumn'
             {
             match("currentColumn"); 
 
@@ -1036,8 +1036,8 @@ public final void mT__56() throws RecognitionException {
         try {
             int _type = T__56;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:54:7: ( '#' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:54:9: '#'
+            // InternalFormat.g:54:7: ( '#' )
+            // InternalFormat.g:54:9: '#'
             {
             match('#'); 
 
@@ -1056,8 +1056,8 @@ public final void mT__57() throws RecognitionException {
         try {
             int _type = T__57;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:55:7: ( '+=' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:55:9: '+='
+            // InternalFormat.g:55:7: ( '+=' )
+            // InternalFormat.g:55:9: '+='
             {
             match("+="); 
 
@@ -1077,8 +1077,8 @@ public final void mT__58() throws RecognitionException {
         try {
             int _type = T__58;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:56:7: ( '-=' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:56:9: '-='
+            // InternalFormat.g:56:7: ( '-=' )
+            // InternalFormat.g:56:9: '-='
             {
             match("-="); 
 
@@ -1098,8 +1098,8 @@ public final void mT__59() throws RecognitionException {
         try {
             int _type = T__59;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:57:7: ( '*=' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:57:9: '*='
+            // InternalFormat.g:57:7: ( '*=' )
+            // InternalFormat.g:57:9: '*='
             {
             match("*="); 
 
@@ -1119,8 +1119,8 @@ public final void mT__60() throws RecognitionException {
         try {
             int _type = T__60;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:58:7: ( '/=' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:58:9: '/='
+            // InternalFormat.g:58:7: ( '/=' )
+            // InternalFormat.g:58:9: '/='
             {
             match("/="); 
 
@@ -1140,8 +1140,8 @@ public final void mT__61() throws RecognitionException {
         try {
             int _type = T__61;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:59:7: ( '%=' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:59:9: '%='
+            // InternalFormat.g:59:7: ( '%=' )
+            // InternalFormat.g:59:9: '%='
             {
             match("%="); 
 
@@ -1161,8 +1161,8 @@ public final void mT__62() throws RecognitionException {
         try {
             int _type = T__62;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:60:7: ( '<' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:60:9: '<'
+            // InternalFormat.g:60:7: ( '<' )
+            // InternalFormat.g:60:9: '<'
             {
             match('<'); 
 
@@ -1181,8 +1181,8 @@ public final void mT__63() throws RecognitionException {
         try {
             int _type = T__63;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:61:7: ( '>' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:61:9: '>'
+            // InternalFormat.g:61:7: ( '>' )
+            // InternalFormat.g:61:9: '>'
             {
             match('>'); 
 
@@ -1201,8 +1201,8 @@ public final void mT__64() throws RecognitionException {
         try {
             int _type = T__64;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:62:7: ( '>=' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:62:9: '>='
+            // InternalFormat.g:62:7: ( '>=' )
+            // InternalFormat.g:62:9: '>='
             {
             match(">="); 
 
@@ -1222,8 +1222,8 @@ public final void mT__65() throws RecognitionException {
         try {
             int _type = T__65;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:63:7: ( '||' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:63:9: '||'
+            // InternalFormat.g:63:7: ( '||' )
+            // InternalFormat.g:63:9: '||'
             {
             match("||"); 
 
@@ -1243,8 +1243,8 @@ public final void mT__66() throws RecognitionException {
         try {
             int _type = T__66;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:64:7: ( '&&' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:64:9: '&&'
+            // InternalFormat.g:64:7: ( '&&' )
+            // InternalFormat.g:64:9: '&&'
             {
             match("&&"); 
 
@@ -1264,8 +1264,8 @@ public final void mT__67() throws RecognitionException {
         try {
             int _type = T__67;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:65:7: ( '==' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:65:9: '=='
+            // InternalFormat.g:65:7: ( '==' )
+            // InternalFormat.g:65:9: '=='
             {
             match("=="); 
 
@@ -1285,8 +1285,8 @@ public final void mT__68() throws RecognitionException {
         try {
             int _type = T__68;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:66:7: ( '!=' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:66:9: '!='
+            // InternalFormat.g:66:7: ( '!=' )
+            // InternalFormat.g:66:9: '!='
             {
             match("!="); 
 
@@ -1306,8 +1306,8 @@ public final void mT__69() throws RecognitionException {
         try {
             int _type = T__69;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:67:7: ( '===' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:67:9: '==='
+            // InternalFormat.g:67:7: ( '===' )
+            // InternalFormat.g:67:9: '==='
             {
             match("==="); 
 
@@ -1327,8 +1327,8 @@ public final void mT__70() throws RecognitionException {
         try {
             int _type = T__70;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:68:7: ( '!==' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:68:9: '!=='
+            // InternalFormat.g:68:7: ( '!==' )
+            // InternalFormat.g:68:9: '!=='
             {
             match("!=="); 
 
@@ -1348,8 +1348,8 @@ public final void mT__71() throws RecognitionException {
         try {
             int _type = T__71;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:69:7: ( 'instanceof' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:69:9: 'instanceof'
+            // InternalFormat.g:69:7: ( 'instanceof' )
+            // InternalFormat.g:69:9: 'instanceof'
             {
             match("instanceof"); 
 
@@ -1369,8 +1369,8 @@ public final void mT__72() throws RecognitionException {
         try {
             int _type = T__72;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:70:7: ( '->' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:70:9: '->'
+            // InternalFormat.g:70:7: ( '->' )
+            // InternalFormat.g:70:9: '->'
             {
             match("->"); 
 
@@ -1390,8 +1390,8 @@ public final void mT__73() throws RecognitionException {
         try {
             int _type = T__73;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:71:7: ( '..<' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:71:9: '..<'
+            // InternalFormat.g:71:7: ( '..<' )
+            // InternalFormat.g:71:9: '..<'
             {
             match("..<"); 
 
@@ -1411,8 +1411,8 @@ public final void mT__74() throws RecognitionException {
         try {
             int _type = T__74;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:72:7: ( '..' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:72:9: '..'
+            // InternalFormat.g:72:7: ( '..' )
+            // InternalFormat.g:72:9: '..'
             {
             match(".."); 
 
@@ -1432,8 +1432,8 @@ public final void mT__75() throws RecognitionException {
         try {
             int _type = T__75;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:73:7: ( '<>' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:73:9: '<>'
+            // InternalFormat.g:73:7: ( '<>' )
+            // InternalFormat.g:73:9: '<>'
             {
             match("<>"); 
 
@@ -1453,8 +1453,8 @@ public final void mT__76() throws RecognitionException {
         try {
             int _type = T__76;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:74:7: ( '?:' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:74:9: '?:'
+            // InternalFormat.g:74:7: ( '?:' )
+            // InternalFormat.g:74:9: '?:'
             {
             match("?:"); 
 
@@ -1474,8 +1474,8 @@ public final void mT__77() throws RecognitionException {
         try {
             int _type = T__77;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:75:7: ( '+' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:75:9: '+'
+            // InternalFormat.g:75:7: ( '+' )
+            // InternalFormat.g:75:9: '+'
             {
             match('+'); 
 
@@ -1494,8 +1494,8 @@ public final void mT__78() throws RecognitionException {
         try {
             int _type = T__78;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:76:7: ( '-' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:76:9: '-'
+            // InternalFormat.g:76:7: ( '-' )
+            // InternalFormat.g:76:9: '-'
             {
             match('-'); 
 
@@ -1514,8 +1514,8 @@ public final void mT__79() throws RecognitionException {
         try {
             int _type = T__79;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:77:7: ( '**' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:77:9: '**'
+            // InternalFormat.g:77:7: ( '**' )
+            // InternalFormat.g:77:9: '**'
             {
             match("**"); 
 
@@ -1535,8 +1535,8 @@ public final void mT__80() throws RecognitionException {
         try {
             int _type = T__80;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:78:7: ( '/' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:78:9: '/'
+            // InternalFormat.g:78:7: ( '/' )
+            // InternalFormat.g:78:9: '/'
             {
             match('/'); 
 
@@ -1555,8 +1555,8 @@ public final void mT__81() throws RecognitionException {
         try {
             int _type = T__81;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:79:7: ( '%' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:79:9: '%'
+            // InternalFormat.g:79:7: ( '%' )
+            // InternalFormat.g:79:9: '%'
             {
             match('%'); 
 
@@ -1575,8 +1575,8 @@ public final void mT__82() throws RecognitionException {
         try {
             int _type = T__82;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:80:7: ( '!' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:80:9: '!'
+            // InternalFormat.g:80:7: ( '!' )
+            // InternalFormat.g:80:9: '!'
             {
             match('!'); 
 
@@ -1595,8 +1595,8 @@ public final void mT__83() throws RecognitionException {
         try {
             int _type = T__83;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:81:7: ( 'as' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:81:9: 'as'
+            // InternalFormat.g:81:7: ( 'as' )
+            // InternalFormat.g:81:9: 'as'
             {
             match("as"); 
 
@@ -1616,8 +1616,8 @@ public final void mT__84() throws RecognitionException {
         try {
             int _type = T__84;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:82:7: ( '++' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:82:9: '++'
+            // InternalFormat.g:82:7: ( '++' )
+            // InternalFormat.g:82:9: '++'
             {
             match("++"); 
 
@@ -1637,8 +1637,8 @@ public final void mT__85() throws RecognitionException {
         try {
             int _type = T__85;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:83:7: ( '--' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:83:9: '--'
+            // InternalFormat.g:83:7: ( '--' )
+            // InternalFormat.g:83:9: '--'
             {
             match("--"); 
 
@@ -1658,8 +1658,8 @@ public final void mT__86() throws RecognitionException {
         try {
             int _type = T__86;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:84:7: ( '::' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:84:9: '::'
+            // InternalFormat.g:84:7: ( '::' )
+            // InternalFormat.g:84:9: '::'
             {
             match("::"); 
 
@@ -1679,8 +1679,8 @@ public final void mT__87() throws RecognitionException {
         try {
             int _type = T__87;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:85:7: ( '?.' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:85:9: '?.'
+            // InternalFormat.g:85:7: ( '?.' )
+            // InternalFormat.g:85:9: '?.'
             {
             match("?."); 
 
@@ -1700,8 +1700,8 @@ public final void mT__88() throws RecognitionException {
         try {
             int _type = T__88;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:86:7: ( '|' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:86:9: '|'
+            // InternalFormat.g:86:7: ( '|' )
+            // InternalFormat.g:86:9: '|'
             {
             match('|'); 
 
@@ -1720,8 +1720,8 @@ public final void mT__89() throws RecognitionException {
         try {
             int _type = T__89;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:87:7: ( 'if' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:87:9: 'if'
+            // InternalFormat.g:87:7: ( 'if' )
+            // InternalFormat.g:87:9: 'if'
             {
             match("if"); 
 
@@ -1741,8 +1741,8 @@ public final void mT__90() throws RecognitionException {
         try {
             int _type = T__90;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:88:7: ( 'else' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:88:9: 'else'
+            // InternalFormat.g:88:7: ( 'else' )
+            // InternalFormat.g:88:9: 'else'
             {
             match("else"); 
 
@@ -1762,8 +1762,8 @@ public final void mT__91() throws RecognitionException {
         try {
             int _type = T__91;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:89:7: ( 'switch' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:89:9: 'switch'
+            // InternalFormat.g:89:7: ( 'switch' )
+            // InternalFormat.g:89:9: 'switch'
             {
             match("switch"); 
 
@@ -1783,8 +1783,8 @@ public final void mT__92() throws RecognitionException {
         try {
             int _type = T__92;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:90:7: ( 'case' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:90:9: 'case'
+            // InternalFormat.g:90:7: ( 'case' )
+            // InternalFormat.g:90:9: 'case'
             {
             match("case"); 
 
@@ -1804,8 +1804,8 @@ public final void mT__93() throws RecognitionException {
         try {
             int _type = T__93;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:91:7: ( 'while' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:91:9: 'while'
+            // InternalFormat.g:91:7: ( 'while' )
+            // InternalFormat.g:91:9: 'while'
             {
             match("while"); 
 
@@ -1825,8 +1825,8 @@ public final void mT__94() throws RecognitionException {
         try {
             int _type = T__94;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:92:7: ( 'do' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:92:9: 'do'
+            // InternalFormat.g:92:7: ( 'do' )
+            // InternalFormat.g:92:9: 'do'
             {
             match("do"); 
 
@@ -1846,8 +1846,8 @@ public final void mT__95() throws RecognitionException {
         try {
             int _type = T__95;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:93:7: ( 'var' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:93:9: 'var'
+            // InternalFormat.g:93:7: ( 'var' )
+            // InternalFormat.g:93:9: 'var'
             {
             match("var"); 
 
@@ -1867,8 +1867,8 @@ public final void mT__96() throws RecognitionException {
         try {
             int _type = T__96;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:94:7: ( 'static' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:94:9: 'static'
+            // InternalFormat.g:94:7: ( 'static' )
+            // InternalFormat.g:94:9: 'static'
             {
             match("static"); 
 
@@ -1888,8 +1888,8 @@ public final void mT__97() throws RecognitionException {
         try {
             int _type = T__97;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:95:7: ( 'import' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:95:9: 'import'
+            // InternalFormat.g:95:7: ( 'import' )
+            // InternalFormat.g:95:9: 'import'
             {
             match("import"); 
 
@@ -1909,8 +1909,8 @@ public final void mT__98() throws RecognitionException {
         try {
             int _type = T__98;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:96:7: ( 'extension' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:96:9: 'extension'
+            // InternalFormat.g:96:7: ( 'extension' )
+            // InternalFormat.g:96:9: 'extension'
             {
             match("extension"); 
 
@@ -1930,8 +1930,8 @@ public final void mT__99() throws RecognitionException {
         try {
             int _type = T__99;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:97:7: ( 'super' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:97:9: 'super'
+            // InternalFormat.g:97:7: ( 'super' )
+            // InternalFormat.g:97:9: 'super'
             {
             match("super"); 
 
@@ -1951,8 +1951,8 @@ public final void mT__100() throws RecognitionException {
         try {
             int _type = T__100;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:98:8: ( 'new' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:98:10: 'new'
+            // InternalFormat.g:98:8: ( 'new' )
+            // InternalFormat.g:98:10: 'new'
             {
             match("new"); 
 
@@ -1972,8 +1972,8 @@ public final void mT__101() throws RecognitionException {
         try {
             int _type = T__101;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:99:8: ( 'false' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:99:10: 'false'
+            // InternalFormat.g:99:8: ( 'false' )
+            // InternalFormat.g:99:10: 'false'
             {
             match("false"); 
 
@@ -1993,8 +1993,8 @@ public final void mT__102() throws RecognitionException {
         try {
             int _type = T__102;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:100:8: ( 'true' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:100:10: 'true'
+            // InternalFormat.g:100:8: ( 'true' )
+            // InternalFormat.g:100:10: 'true'
             {
             match("true"); 
 
@@ -2014,8 +2014,8 @@ public final void mT__103() throws RecognitionException {
         try {
             int _type = T__103;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:101:8: ( 'null' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:101:10: 'null'
+            // InternalFormat.g:101:8: ( 'null' )
+            // InternalFormat.g:101:10: 'null'
             {
             match("null"); 
 
@@ -2035,8 +2035,8 @@ public final void mT__104() throws RecognitionException {
         try {
             int _type = T__104;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:102:8: ( 'typeof' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:102:10: 'typeof'
+            // InternalFormat.g:102:8: ( 'typeof' )
+            // InternalFormat.g:102:10: 'typeof'
             {
             match("typeof"); 
 
@@ -2056,8 +2056,8 @@ public final void mT__105() throws RecognitionException {
         try {
             int _type = T__105;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:103:8: ( 'throw' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:103:10: 'throw'
+            // InternalFormat.g:103:8: ( 'throw' )
+            // InternalFormat.g:103:10: 'throw'
             {
             match("throw"); 
 
@@ -2077,8 +2077,8 @@ public final void mT__106() throws RecognitionException {
         try {
             int _type = T__106;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:104:8: ( 'return' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:104:10: 'return'
+            // InternalFormat.g:104:8: ( 'return' )
+            // InternalFormat.g:104:10: 'return'
             {
             match("return"); 
 
@@ -2098,8 +2098,8 @@ public final void mT__107() throws RecognitionException {
         try {
             int _type = T__107;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:105:8: ( 'try' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:105:10: 'try'
+            // InternalFormat.g:105:8: ( 'try' )
+            // InternalFormat.g:105:10: 'try'
             {
             match("try"); 
 
@@ -2119,8 +2119,8 @@ public final void mT__108() throws RecognitionException {
         try {
             int _type = T__108;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:106:8: ( 'finally' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:106:10: 'finally'
+            // InternalFormat.g:106:8: ( 'finally' )
+            // InternalFormat.g:106:10: 'finally'
             {
             match("finally"); 
 
@@ -2140,8 +2140,8 @@ public final void mT__109() throws RecognitionException {
         try {
             int _type = T__109;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:107:8: ( 'synchronized' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:107:10: 'synchronized'
+            // InternalFormat.g:107:8: ( 'synchronized' )
+            // InternalFormat.g:107:10: 'synchronized'
             {
             match("synchronized"); 
 
@@ -2161,8 +2161,8 @@ public final void mT__110() throws RecognitionException {
         try {
             int _type = T__110;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:108:8: ( 'catch' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:108:10: 'catch'
+            // InternalFormat.g:108:8: ( 'catch' )
+            // InternalFormat.g:108:10: 'catch'
             {
             match("catch"); 
 
@@ -2182,8 +2182,8 @@ public final void mT__111() throws RecognitionException {
         try {
             int _type = T__111;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:109:8: ( '?' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:109:10: '?'
+            // InternalFormat.g:109:8: ( '?' )
+            // InternalFormat.g:109:10: '?'
             {
             match('?'); 
 
@@ -2202,8 +2202,8 @@ public final void mT__112() throws RecognitionException {
         try {
             int _type = T__112;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:110:8: ( '&' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:110:10: '&'
+            // InternalFormat.g:110:8: ( '&' )
+            // InternalFormat.g:110:10: '&'
             {
             match('&'); 
 
@@ -2222,8 +2222,8 @@ public final void mT__113() throws RecognitionException {
         try {
             int _type = T__113;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:111:8: ( 'before' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:111:10: 'before'
+            // InternalFormat.g:111:8: ( 'before' )
+            // InternalFormat.g:111:10: 'before'
             {
             match("before"); 
 
@@ -2243,8 +2243,8 @@ public final void mT__114() throws RecognitionException {
         try {
             int _type = T__114;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:112:8: ( 'after' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:112:10: 'after'
+            // InternalFormat.g:112:8: ( 'after' )
+            // InternalFormat.g:112:10: 'after'
             {
             match("after"); 
 
@@ -2264,8 +2264,8 @@ public final void mT__115() throws RecognitionException {
         try {
             int _type = T__115;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:113:8: ( 'around' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:113:10: 'around'
+            // InternalFormat.g:113:8: ( 'around' )
+            // InternalFormat.g:113:10: 'around'
             {
             match("around"); 
 
@@ -2285,8 +2285,8 @@ public final void mT__116() throws RecognitionException {
         try {
             int _type = T__116;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:114:8: ( 'between' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:114:10: 'between'
+            // InternalFormat.g:114:8: ( 'between' )
+            // InternalFormat.g:114:10: 'between'
             {
             match("between"); 
 
@@ -2306,8 +2306,8 @@ public final void mT__117() throws RecognitionException {
         try {
             int _type = T__117;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:115:8: ( 'range' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:115:10: 'range'
+            // InternalFormat.g:115:8: ( 'range' )
+            // InternalFormat.g:115:10: 'range'
             {
             match("range"); 
 
@@ -2322,43 +2322,96 @@ public final void mT__117() throws RecognitionException {
     }
     // $ANTLR end "T__117"
 
+    // $ANTLR start "RULE_INT"
+    public final void mRULE_INT() throws RecognitionException {
+        try {
+            int _type = RULE_INT;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalFormat.g:8827:10: ( '0' .. '9' ( '0' .. '9' | '_' )* )
+            // InternalFormat.g:8827:12: '0' .. '9' ( '0' .. '9' | '_' )*
+            {
+            matchRange('0','9'); 
+            // InternalFormat.g:8827:21: ( '0' .. '9' | '_' )*
+            loop1:
+            do {
+                int alt1=2;
+                int LA1_0 = input.LA(1);
+
+                if ( ((LA1_0>='0' && LA1_0<='9')||LA1_0=='_') ) {
+                    alt1=1;
+                }
+
+
+                switch (alt1) {
+            	case 1 :
+            	    // InternalFormat.g:
+            	    {
+            	    if ( (input.LA(1)>='0' && input.LA(1)<='9')||input.LA(1)=='_' ) {
+            	        input.consume();
+
+            	    }
+            	    else {
+            	        MismatchedSetException mse = new MismatchedSetException(null,input);
+            	        recover(mse);
+            	        throw mse;}
+
+
+            	    }
+            	    break;
+
+            	default :
+            	    break loop1;
+                }
+            } while (true);
+
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "RULE_INT"
+
     // $ANTLR start "RULE_HEX"
     public final void mRULE_HEX() throws RecognitionException {
         try {
             int _type = RULE_HEX;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8827:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )? )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8827:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
+            // InternalFormat.g:8829:10: ( ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )? )
+            // InternalFormat.g:8829:12: ( '0x' | '0X' ) ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8827:12: ( '0x' | '0X' )
-            int alt1=2;
-            int LA1_0 = input.LA(1);
+            // InternalFormat.g:8829:12: ( '0x' | '0X' )
+            int alt2=2;
+            int LA2_0 = input.LA(1);
 
-            if ( (LA1_0=='0') ) {
-                int LA1_1 = input.LA(2);
+            if ( (LA2_0=='0') ) {
+                int LA2_1 = input.LA(2);
 
-                if ( (LA1_1=='x') ) {
-                    alt1=1;
+                if ( (LA2_1=='x') ) {
+                    alt2=1;
                 }
-                else if ( (LA1_1=='X') ) {
-                    alt1=2;
+                else if ( (LA2_1=='X') ) {
+                    alt2=2;
                 }
                 else {
                     NoViableAltException nvae =
-                        new NoViableAltException("", 1, 1, input);
+                        new NoViableAltException("", 2, 1, input);
 
                     throw nvae;
                 }
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 1, 0, input);
+                    new NoViableAltException("", 2, 0, input);
 
                 throw nvae;
             }
-            switch (alt1) {
+            switch (alt2) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8827:13: '0x'
+                    // InternalFormat.g:8829:13: '0x'
                     {
                     match("0x"); 
 
@@ -2366,7 +2419,7 @@ else if ( (LA1_1=='X') ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8827:18: '0X'
+                    // InternalFormat.g:8829:18: '0X'
                     {
                     match("0X"); 
 
@@ -2376,21 +2429,21 @@ else if ( (LA1_1=='X') ) {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8827:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+
-            int cnt2=0;
-            loop2:
+            // InternalFormat.g:8829:24: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+
+            int cnt3=0;
+            loop3:
             do {
-                int alt2=2;
-                int LA2_0 = input.LA(1);
+                int alt3=2;
+                int LA3_0 = input.LA(1);
 
-                if ( ((LA2_0>='0' && LA2_0<='9')||(LA2_0>='A' && LA2_0<='F')||LA2_0=='_'||(LA2_0>='a' && LA2_0<='f')) ) {
-                    alt2=1;
+                if ( ((LA3_0>='0' && LA3_0<='9')||(LA3_0>='A' && LA3_0<='F')||LA3_0=='_'||(LA3_0>='a' && LA3_0<='f')) ) {
+                    alt3=1;
                 }
 
 
-                switch (alt2) {
+                switch (alt3) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:
+            	    // InternalFormat.g:
             	    {
             	    if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='F')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='f') ) {
             	        input.consume();
@@ -2406,45 +2459,45 @@ else if ( (LA1_1=='X') ) {
             	    break;
 
             	default :
-            	    if ( cnt2 >= 1 ) break loop2;
+            	    if ( cnt3 >= 1 ) break loop3;
                         EarlyExitException eee =
-                            new EarlyExitException(2, input);
+                            new EarlyExitException(3, input);
                         throw eee;
                 }
-                cnt2++;
+                cnt3++;
             } while (true);
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8827:58: ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
-            int alt4=2;
-            int LA4_0 = input.LA(1);
+            // InternalFormat.g:8829:58: ( '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) ) )?
+            int alt5=2;
+            int LA5_0 = input.LA(1);
 
-            if ( (LA4_0=='#') ) {
-                alt4=1;
+            if ( (LA5_0=='#') ) {
+                alt5=1;
             }
-            switch (alt4) {
+            switch (alt5) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8827:59: '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
+                    // InternalFormat.g:8829:59: '#' ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
                     {
                     match('#'); 
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8827:63: ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
-                    int alt3=2;
-                    int LA3_0 = input.LA(1);
+                    // InternalFormat.g:8829:63: ( ( 'b' | 'B' ) ( 'i' | 'I' ) | ( 'l' | 'L' ) )
+                    int alt4=2;
+                    int LA4_0 = input.LA(1);
 
-                    if ( (LA3_0=='B'||LA3_0=='b') ) {
-                        alt3=1;
+                    if ( (LA4_0=='B'||LA4_0=='b') ) {
+                        alt4=1;
                     }
-                    else if ( (LA3_0=='L'||LA3_0=='l') ) {
-                        alt3=2;
+                    else if ( (LA4_0=='L'||LA4_0=='l') ) {
+                        alt4=2;
                     }
                     else {
                         NoViableAltException nvae =
-                            new NoViableAltException("", 3, 0, input);
+                            new NoViableAltException("", 4, 0, input);
 
                         throw nvae;
                     }
-                    switch (alt3) {
+                    switch (alt4) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8827:64: ( 'b' | 'B' ) ( 'i' | 'I' )
+                            // InternalFormat.g:8829:64: ( 'b' | 'B' ) ( 'i' | 'I' )
                             {
                             if ( input.LA(1)=='B'||input.LA(1)=='b' ) {
                                 input.consume();
@@ -2468,7 +2521,7 @@ else if ( (LA3_0=='L'||LA3_0=='l') ) {
                             }
                             break;
                         case 2 :
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8827:84: ( 'l' | 'L' )
+                            // InternalFormat.g:8829:84: ( 'l' | 'L' )
                             {
                             if ( input.LA(1)=='L'||input.LA(1)=='l' ) {
                                 input.consume();
@@ -2502,69 +2555,16 @@ else if ( (LA3_0=='L'||LA3_0=='l') ) {
     }
     // $ANTLR end "RULE_HEX"
 
-    // $ANTLR start "RULE_INT"
-    public final void mRULE_INT() throws RecognitionException {
-        try {
-            int _type = RULE_INT;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8829:10: ( '0' .. '9' ( '0' .. '9' | '_' )* )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8829:12: '0' .. '9' ( '0' .. '9' | '_' )*
-            {
-            matchRange('0','9'); 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8829:21: ( '0' .. '9' | '_' )*
-            loop5:
-            do {
-                int alt5=2;
-                int LA5_0 = input.LA(1);
-
-                if ( ((LA5_0>='0' && LA5_0<='9')||LA5_0=='_') ) {
-                    alt5=1;
-                }
-
-
-                switch (alt5) {
-            	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:
-            	    {
-            	    if ( (input.LA(1)>='0' && input.LA(1)<='9')||input.LA(1)=='_' ) {
-            	        input.consume();
-
-            	    }
-            	    else {
-            	        MismatchedSetException mse = new MismatchedSetException(null,input);
-            	        recover(mse);
-            	        throw mse;}
-
-
-            	    }
-            	    break;
-
-            	default :
-            	    break loop5;
-                }
-            } while (true);
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "RULE_INT"
-
     // $ANTLR start "RULE_DECIMAL"
     public final void mRULE_DECIMAL() throws RecognitionException {
         try {
             int _type = RULE_DECIMAL;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8831:14: ( RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )? )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8831:16: RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
+            // InternalFormat.g:8831:14: ( RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )? )
+            // InternalFormat.g:8831:16: RULE_INT ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )? ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
             {
             mRULE_INT(); 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8831:25: ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )?
+            // InternalFormat.g:8831:25: ( ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT )?
             int alt7=2;
             int LA7_0 = input.LA(1);
 
@@ -2573,7 +2573,7 @@ public final void mRULE_DECIMAL() throws RecognitionException {
             }
             switch (alt7) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8831:26: ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT
+                    // InternalFormat.g:8831:26: ( 'e' | 'E' ) ( '+' | '-' )? RULE_INT
                     {
                     if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
                         input.consume();
@@ -2584,7 +2584,7 @@ public final void mRULE_DECIMAL() throws RecognitionException {
                         recover(mse);
                         throw mse;}
 
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8831:36: ( '+' | '-' )?
+                    // InternalFormat.g:8831:36: ( '+' | '-' )?
                     int alt6=2;
                     int LA6_0 = input.LA(1);
 
@@ -2593,7 +2593,7 @@ public final void mRULE_DECIMAL() throws RecognitionException {
                     }
                     switch (alt6) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:
+                            // InternalFormat.g:
                             {
                             if ( input.LA(1)=='+'||input.LA(1)=='-' ) {
                                 input.consume();
@@ -2617,7 +2617,7 @@ public final void mRULE_DECIMAL() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8831:58: ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
+            // InternalFormat.g:8831:58: ( ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' ) | ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' ) )?
             int alt8=3;
             int LA8_0 = input.LA(1);
 
@@ -2629,7 +2629,7 @@ else if ( (LA8_0=='D'||LA8_0=='F'||LA8_0=='L'||LA8_0=='d'||LA8_0=='f'||LA8_0=='l
             }
             switch (alt8) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8831:59: ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' )
+                    // InternalFormat.g:8831:59: ( 'b' | 'B' ) ( 'i' | 'I' | 'd' | 'D' )
                     {
                     if ( input.LA(1)=='B'||input.LA(1)=='b' ) {
                         input.consume();
@@ -2653,7 +2653,7 @@ else if ( (LA8_0=='D'||LA8_0=='F'||LA8_0=='L'||LA8_0=='d'||LA8_0=='f'||LA8_0=='l
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8831:87: ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' )
+                    // InternalFormat.g:8831:87: ( 'l' | 'L' | 'd' | 'D' | 'f' | 'F' )
                     {
                     if ( input.LA(1)=='D'||input.LA(1)=='F'||input.LA(1)=='L'||input.LA(1)=='d'||input.LA(1)=='f'||input.LA(1)=='l' ) {
                         input.consume();
@@ -2686,10 +2686,10 @@ public final void mRULE_ID() throws RecognitionException {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8833:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )* )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8833:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
+            // InternalFormat.g:8833:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )* )
+            // InternalFormat.g:8833:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8833:11: ( '^' )?
+            // InternalFormat.g:8833:11: ( '^' )?
             int alt9=2;
             int LA9_0 = input.LA(1);
 
@@ -2698,7 +2698,7 @@ public final void mRULE_ID() throws RecognitionException {
             }
             switch (alt9) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8833:11: '^'
+                    // InternalFormat.g:8833:11: '^'
                     {
                     match('^'); 
 
@@ -2716,7 +2716,7 @@ public final void mRULE_ID() throws RecognitionException {
                 recover(mse);
                 throw mse;}
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8833:44: ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
+            // InternalFormat.g:8833:44: ( 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' )*
             loop10:
             do {
                 int alt10=2;
@@ -2729,7 +2729,7 @@ public final void mRULE_ID() throws RecognitionException {
 
                 switch (alt10) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:
+            	    // InternalFormat.g:
             	    {
             	    if ( input.LA(1)=='$'||(input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
             	        input.consume();
@@ -2765,10 +2765,10 @@ public final void mRULE_STRING() throws RecognitionException {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8835:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8835:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
+            // InternalFormat.g:8835:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? ) )
+            // InternalFormat.g:8835:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8835:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
+            // InternalFormat.g:8835:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )? | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )? )
             int alt15=2;
             int LA15_0 = input.LA(1);
 
@@ -2786,10 +2786,10 @@ else if ( (LA15_0=='\'') ) {
             }
             switch (alt15) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8835:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )?
+                    // InternalFormat.g:8835:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* ( '\"' )?
                     {
                     match('\"'); 
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8835:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // InternalFormat.g:8835:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop11:
                     do {
                         int alt11=3;
@@ -2805,7 +2805,7 @@ else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA1
 
                         switch (alt11) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8835:21: '\\\\' .
+                    	    // InternalFormat.g:8835:21: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -2813,7 +2813,7 @@ else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA1
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8835:28: ~ ( ( '\\\\' | '\"' ) )
+                    	    // InternalFormat.g:8835:28: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -2833,7 +2833,7 @@ else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA1
                         }
                     } while (true);
 
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8835:44: ( '\"' )?
+                    // InternalFormat.g:8835:44: ( '\"' )?
                     int alt12=2;
                     int LA12_0 = input.LA(1);
 
@@ -2842,7 +2842,7 @@ else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA1
                     }
                     switch (alt12) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8835:44: '\"'
+                            // InternalFormat.g:8835:44: '\"'
                             {
                             match('\"'); 
 
@@ -2855,10 +2855,10 @@ else if ( ((LA11_0>='\u0000' && LA11_0<='!')||(LA11_0>='#' && LA11_0<='[')||(LA1
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8835:49: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )?
+                    // InternalFormat.g:8835:49: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* ( '\\'' )?
                     {
                     match('\''); 
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8835:54: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // InternalFormat.g:8835:54: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop13:
                     do {
                         int alt13=3;
@@ -2874,7 +2874,7 @@ else if ( ((LA13_0>='\u0000' && LA13_0<='&')||(LA13_0>='(' && LA13_0<='[')||(LA1
 
                         switch (alt13) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8835:55: '\\\\' .
+                    	    // InternalFormat.g:8835:55: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -2882,7 +2882,7 @@ else if ( ((LA13_0>='\u0000' && LA13_0<='&')||(LA13_0>='(' && LA13_0<='[')||(LA1
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8835:62: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // InternalFormat.g:8835:62: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -2902,7 +2902,7 @@ else if ( ((LA13_0>='\u0000' && LA13_0<='&')||(LA13_0>='(' && LA13_0<='[')||(LA1
                         }
                     } while (true);
 
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8835:79: ( '\\'' )?
+                    // InternalFormat.g:8835:79: ( '\\'' )?
                     int alt14=2;
                     int LA14_0 = input.LA(1);
 
@@ -2911,7 +2911,7 @@ else if ( ((LA13_0>='\u0000' && LA13_0<='&')||(LA13_0>='(' && LA13_0<='[')||(LA1
                     }
                     switch (alt14) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8835:79: '\\''
+                            // InternalFormat.g:8835:79: '\\''
                             {
                             match('\''); 
 
@@ -2942,12 +2942,12 @@ public final void mRULE_ML_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8837:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8837:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalFormat.g:8837:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalFormat.g:8837:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8837:24: ( options {greedy=false; } : . )*
+            // InternalFormat.g:8837:24: ( options {greedy=false; } : . )*
             loop16:
             do {
                 int alt16=2;
@@ -2972,7 +2972,7 @@ else if ( ((LA16_0>='\u0000' && LA16_0<=')')||(LA16_0>='+' && LA16_0<='\uFFFF'))
 
                 switch (alt16) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8837:52: .
+            	    // InternalFormat.g:8837:52: .
             	    {
             	    matchAny(); 
 
@@ -3002,12 +3002,12 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8839:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8839:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalFormat.g:8839:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalFormat.g:8839:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8839:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // InternalFormat.g:8839:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop17:
             do {
                 int alt17=2;
@@ -3020,7 +3020,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
 
                 switch (alt17) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8839:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // InternalFormat.g:8839:24: ~ ( ( '\\n' | '\\r' ) )
             	    {
             	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
             	        input.consume();
@@ -3040,7 +3040,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
                 }
             } while (true);
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8839:40: ( ( '\\r' )? '\\n' )?
+            // InternalFormat.g:8839:40: ( ( '\\r' )? '\\n' )?
             int alt19=2;
             int LA19_0 = input.LA(1);
 
@@ -3049,9 +3049,9 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
             }
             switch (alt19) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8839:41: ( '\\r' )? '\\n'
+                    // InternalFormat.g:8839:41: ( '\\r' )? '\\n'
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8839:41: ( '\\r' )?
+                    // InternalFormat.g:8839:41: ( '\\r' )?
                     int alt18=2;
                     int LA18_0 = input.LA(1);
 
@@ -3060,7 +3060,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
                     }
                     switch (alt18) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8839:41: '\\r'
+                            // InternalFormat.g:8839:41: '\\r'
                             {
                             match('\r'); 
 
@@ -3092,10 +3092,10 @@ public final void mRULE_WS() throws RecognitionException {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8841:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8841:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalFormat.g:8841:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalFormat.g:8841:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8841:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalFormat.g:8841:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt20=0;
             loop20:
             do {
@@ -3109,7 +3109,7 @@ public final void mRULE_WS() throws RecognitionException {
 
                 switch (alt20) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:
+            	    // InternalFormat.g:
             	    {
             	    if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
             	        input.consume();
@@ -3149,8 +3149,8 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8843:16: ( . )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8843:18: .
+            // InternalFormat.g:8843:16: ( . )
+            // InternalFormat.g:8843:18: .
             {
             matchAny(); 
 
@@ -3165,803 +3165,803 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:8: ( T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | T__97 | T__98 | T__99 | T__100 | T__101 | T__102 | T__103 | T__104 | T__105 | T__106 | T__107 | T__108 | T__109 | T__110 | T__111 | T__112 | T__113 | T__114 | T__115 | T__116 | T__117 | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        // InternalFormat.g:1:8: ( T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | T__97 | T__98 | T__99 | T__100 | T__101 | T__102 | T__103 | T__104 | T__105 | T__106 | T__107 | T__108 | T__109 | T__110 | T__111 | T__112 | T__113 | T__114 | T__115 | T__116 | T__117 | RULE_INT | RULE_HEX | RULE_DECIMAL | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
         int alt21=114;
         alt21 = dfa21.predict(input);
         switch (alt21) {
             case 1 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:10: T__13
+                // InternalFormat.g:1:10: T__13
                 {
                 mT__13(); 
 
                 }
                 break;
             case 2 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:16: T__14
+                // InternalFormat.g:1:16: T__14
                 {
                 mT__14(); 
 
                 }
                 break;
             case 3 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:22: T__15
+                // InternalFormat.g:1:22: T__15
                 {
                 mT__15(); 
 
                 }
                 break;
             case 4 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:28: T__16
+                // InternalFormat.g:1:28: T__16
                 {
                 mT__16(); 
 
                 }
                 break;
             case 5 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:34: T__17
+                // InternalFormat.g:1:34: T__17
                 {
                 mT__17(); 
 
                 }
                 break;
             case 6 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:40: T__18
+                // InternalFormat.g:1:40: T__18
                 {
                 mT__18(); 
 
                 }
                 break;
             case 7 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:46: T__19
+                // InternalFormat.g:1:46: T__19
                 {
                 mT__19(); 
 
                 }
                 break;
             case 8 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:52: T__20
+                // InternalFormat.g:1:52: T__20
                 {
                 mT__20(); 
 
                 }
                 break;
             case 9 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:58: T__21
+                // InternalFormat.g:1:58: T__21
                 {
                 mT__21(); 
 
                 }
                 break;
             case 10 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:64: T__22
+                // InternalFormat.g:1:64: T__22
                 {
                 mT__22(); 
 
                 }
                 break;
             case 11 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:70: T__23
+                // InternalFormat.g:1:70: T__23
                 {
                 mT__23(); 
 
                 }
                 break;
             case 12 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:76: T__24
+                // InternalFormat.g:1:76: T__24
                 {
                 mT__24(); 
 
                 }
                 break;
             case 13 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:82: T__25
+                // InternalFormat.g:1:82: T__25
                 {
                 mT__25(); 
 
                 }
                 break;
             case 14 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:88: T__26
+                // InternalFormat.g:1:88: T__26
                 {
                 mT__26(); 
 
                 }
                 break;
             case 15 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:94: T__27
+                // InternalFormat.g:1:94: T__27
                 {
                 mT__27(); 
 
                 }
                 break;
             case 16 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:100: T__28
+                // InternalFormat.g:1:100: T__28
                 {
                 mT__28(); 
 
                 }
                 break;
             case 17 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:106: T__29
+                // InternalFormat.g:1:106: T__29
                 {
                 mT__29(); 
 
                 }
                 break;
             case 18 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:112: T__30
+                // InternalFormat.g:1:112: T__30
                 {
                 mT__30(); 
 
                 }
                 break;
             case 19 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:118: T__31
+                // InternalFormat.g:1:118: T__31
                 {
                 mT__31(); 
 
                 }
                 break;
             case 20 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:124: T__32
+                // InternalFormat.g:1:124: T__32
                 {
                 mT__32(); 
 
                 }
                 break;
             case 21 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:130: T__33
+                // InternalFormat.g:1:130: T__33
                 {
                 mT__33(); 
 
                 }
                 break;
             case 22 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:136: T__34
+                // InternalFormat.g:1:136: T__34
                 {
                 mT__34(); 
 
                 }
                 break;
             case 23 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:142: T__35
+                // InternalFormat.g:1:142: T__35
                 {
                 mT__35(); 
 
                 }
                 break;
             case 24 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:148: T__36
+                // InternalFormat.g:1:148: T__36
                 {
                 mT__36(); 
 
                 }
                 break;
             case 25 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:154: T__37
+                // InternalFormat.g:1:154: T__37
                 {
                 mT__37(); 
 
                 }
                 break;
             case 26 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:160: T__38
+                // InternalFormat.g:1:160: T__38
                 {
                 mT__38(); 
 
                 }
                 break;
             case 27 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:166: T__39
+                // InternalFormat.g:1:166: T__39
                 {
                 mT__39(); 
 
                 }
                 break;
             case 28 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:172: T__40
+                // InternalFormat.g:1:172: T__40
                 {
                 mT__40(); 
 
                 }
                 break;
             case 29 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:178: T__41
+                // InternalFormat.g:1:178: T__41
                 {
                 mT__41(); 
 
                 }
                 break;
             case 30 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:184: T__42
+                // InternalFormat.g:1:184: T__42
                 {
                 mT__42(); 
 
                 }
                 break;
             case 31 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:190: T__43
+                // InternalFormat.g:1:190: T__43
                 {
                 mT__43(); 
 
                 }
                 break;
             case 32 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:196: T__44
+                // InternalFormat.g:1:196: T__44
                 {
                 mT__44(); 
 
                 }
                 break;
             case 33 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:202: T__45
+                // InternalFormat.g:1:202: T__45
                 {
                 mT__45(); 
 
                 }
                 break;
             case 34 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:208: T__46
+                // InternalFormat.g:1:208: T__46
                 {
                 mT__46(); 
 
                 }
                 break;
             case 35 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:214: T__47
+                // InternalFormat.g:1:214: T__47
                 {
                 mT__47(); 
 
                 }
                 break;
             case 36 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:220: T__48
+                // InternalFormat.g:1:220: T__48
                 {
                 mT__48(); 
 
                 }
                 break;
             case 37 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:226: T__49
+                // InternalFormat.g:1:226: T__49
                 {
                 mT__49(); 
 
                 }
                 break;
             case 38 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:232: T__50
+                // InternalFormat.g:1:232: T__50
                 {
                 mT__50(); 
 
                 }
                 break;
             case 39 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:238: T__51
+                // InternalFormat.g:1:238: T__51
                 {
                 mT__51(); 
 
                 }
                 break;
             case 40 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:244: T__52
+                // InternalFormat.g:1:244: T__52
                 {
                 mT__52(); 
 
                 }
                 break;
             case 41 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:250: T__53
+                // InternalFormat.g:1:250: T__53
                 {
                 mT__53(); 
 
                 }
                 break;
             case 42 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:256: T__54
+                // InternalFormat.g:1:256: T__54
                 {
                 mT__54(); 
 
                 }
                 break;
             case 43 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:262: T__55
+                // InternalFormat.g:1:262: T__55
                 {
                 mT__55(); 
 
                 }
                 break;
             case 44 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:268: T__56
+                // InternalFormat.g:1:268: T__56
                 {
                 mT__56(); 
 
                 }
                 break;
             case 45 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:274: T__57
+                // InternalFormat.g:1:274: T__57
                 {
                 mT__57(); 
 
                 }
                 break;
             case 46 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:280: T__58
+                // InternalFormat.g:1:280: T__58
                 {
                 mT__58(); 
 
                 }
                 break;
             case 47 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:286: T__59
+                // InternalFormat.g:1:286: T__59
                 {
                 mT__59(); 
 
                 }
                 break;
             case 48 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:292: T__60
+                // InternalFormat.g:1:292: T__60
                 {
                 mT__60(); 
 
                 }
                 break;
             case 49 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:298: T__61
+                // InternalFormat.g:1:298: T__61
                 {
                 mT__61(); 
 
                 }
                 break;
             case 50 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:304: T__62
+                // InternalFormat.g:1:304: T__62
                 {
                 mT__62(); 
 
                 }
                 break;
             case 51 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:310: T__63
+                // InternalFormat.g:1:310: T__63
                 {
                 mT__63(); 
 
                 }
                 break;
             case 52 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:316: T__64
+                // InternalFormat.g:1:316: T__64
                 {
                 mT__64(); 
 
                 }
                 break;
             case 53 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:322: T__65
+                // InternalFormat.g:1:322: T__65
                 {
                 mT__65(); 
 
                 }
                 break;
             case 54 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:328: T__66
+                // InternalFormat.g:1:328: T__66
                 {
                 mT__66(); 
 
                 }
                 break;
             case 55 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:334: T__67
+                // InternalFormat.g:1:334: T__67
                 {
                 mT__67(); 
 
                 }
                 break;
             case 56 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:340: T__68
+                // InternalFormat.g:1:340: T__68
                 {
                 mT__68(); 
 
                 }
                 break;
             case 57 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:346: T__69
+                // InternalFormat.g:1:346: T__69
                 {
                 mT__69(); 
 
                 }
                 break;
             case 58 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:352: T__70
+                // InternalFormat.g:1:352: T__70
                 {
                 mT__70(); 
 
                 }
                 break;
             case 59 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:358: T__71
+                // InternalFormat.g:1:358: T__71
                 {
                 mT__71(); 
 
                 }
                 break;
             case 60 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:364: T__72
+                // InternalFormat.g:1:364: T__72
                 {
                 mT__72(); 
 
                 }
                 break;
             case 61 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:370: T__73
+                // InternalFormat.g:1:370: T__73
                 {
                 mT__73(); 
 
                 }
                 break;
             case 62 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:376: T__74
+                // InternalFormat.g:1:376: T__74
                 {
                 mT__74(); 
 
                 }
                 break;
             case 63 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:382: T__75
+                // InternalFormat.g:1:382: T__75
                 {
                 mT__75(); 
 
                 }
                 break;
             case 64 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:388: T__76
+                // InternalFormat.g:1:388: T__76
                 {
                 mT__76(); 
 
                 }
                 break;
             case 65 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:394: T__77
+                // InternalFormat.g:1:394: T__77
                 {
                 mT__77(); 
 
                 }
                 break;
             case 66 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:400: T__78
+                // InternalFormat.g:1:400: T__78
                 {
                 mT__78(); 
 
                 }
                 break;
             case 67 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:406: T__79
+                // InternalFormat.g:1:406: T__79
                 {
                 mT__79(); 
 
                 }
                 break;
             case 68 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:412: T__80
+                // InternalFormat.g:1:412: T__80
                 {
                 mT__80(); 
 
                 }
                 break;
             case 69 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:418: T__81
+                // InternalFormat.g:1:418: T__81
                 {
                 mT__81(); 
 
                 }
                 break;
             case 70 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:424: T__82
+                // InternalFormat.g:1:424: T__82
                 {
                 mT__82(); 
 
                 }
                 break;
             case 71 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:430: T__83
+                // InternalFormat.g:1:430: T__83
                 {
                 mT__83(); 
 
                 }
                 break;
             case 72 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:436: T__84
+                // InternalFormat.g:1:436: T__84
                 {
                 mT__84(); 
 
                 }
                 break;
             case 73 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:442: T__85
+                // InternalFormat.g:1:442: T__85
                 {
                 mT__85(); 
 
                 }
                 break;
             case 74 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:448: T__86
+                // InternalFormat.g:1:448: T__86
                 {
                 mT__86(); 
 
                 }
                 break;
             case 75 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:454: T__87
+                // InternalFormat.g:1:454: T__87
                 {
                 mT__87(); 
 
                 }
                 break;
             case 76 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:460: T__88
+                // InternalFormat.g:1:460: T__88
                 {
                 mT__88(); 
 
                 }
                 break;
             case 77 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:466: T__89
+                // InternalFormat.g:1:466: T__89
                 {
                 mT__89(); 
 
                 }
                 break;
             case 78 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:472: T__90
+                // InternalFormat.g:1:472: T__90
                 {
                 mT__90(); 
 
                 }
                 break;
             case 79 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:478: T__91
+                // InternalFormat.g:1:478: T__91
                 {
                 mT__91(); 
 
                 }
                 break;
             case 80 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:484: T__92
+                // InternalFormat.g:1:484: T__92
                 {
                 mT__92(); 
 
                 }
                 break;
             case 81 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:490: T__93
+                // InternalFormat.g:1:490: T__93
                 {
                 mT__93(); 
 
                 }
                 break;
             case 82 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:496: T__94
+                // InternalFormat.g:1:496: T__94
                 {
                 mT__94(); 
 
                 }
                 break;
             case 83 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:502: T__95
+                // InternalFormat.g:1:502: T__95
                 {
                 mT__95(); 
 
                 }
                 break;
             case 84 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:508: T__96
+                // InternalFormat.g:1:508: T__96
                 {
                 mT__96(); 
 
                 }
                 break;
             case 85 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:514: T__97
+                // InternalFormat.g:1:514: T__97
                 {
                 mT__97(); 
 
                 }
                 break;
             case 86 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:520: T__98
+                // InternalFormat.g:1:520: T__98
                 {
                 mT__98(); 
 
                 }
                 break;
             case 87 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:526: T__99
+                // InternalFormat.g:1:526: T__99
                 {
                 mT__99(); 
 
                 }
                 break;
             case 88 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:532: T__100
+                // InternalFormat.g:1:532: T__100
                 {
                 mT__100(); 
 
                 }
                 break;
             case 89 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:539: T__101
+                // InternalFormat.g:1:539: T__101
                 {
                 mT__101(); 
 
                 }
                 break;
             case 90 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:546: T__102
+                // InternalFormat.g:1:546: T__102
                 {
                 mT__102(); 
 
                 }
                 break;
             case 91 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:553: T__103
+                // InternalFormat.g:1:553: T__103
                 {
                 mT__103(); 
 
                 }
                 break;
             case 92 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:560: T__104
+                // InternalFormat.g:1:560: T__104
                 {
                 mT__104(); 
 
                 }
                 break;
             case 93 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:567: T__105
+                // InternalFormat.g:1:567: T__105
                 {
                 mT__105(); 
 
                 }
                 break;
             case 94 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:574: T__106
+                // InternalFormat.g:1:574: T__106
                 {
                 mT__106(); 
 
                 }
                 break;
             case 95 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:581: T__107
+                // InternalFormat.g:1:581: T__107
                 {
                 mT__107(); 
 
                 }
                 break;
             case 96 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:588: T__108
+                // InternalFormat.g:1:588: T__108
                 {
                 mT__108(); 
 
                 }
                 break;
             case 97 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:595: T__109
+                // InternalFormat.g:1:595: T__109
                 {
                 mT__109(); 
 
                 }
                 break;
             case 98 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:602: T__110
+                // InternalFormat.g:1:602: T__110
                 {
                 mT__110(); 
 
                 }
                 break;
             case 99 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:609: T__111
+                // InternalFormat.g:1:609: T__111
                 {
                 mT__111(); 
 
                 }
                 break;
             case 100 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:616: T__112
+                // InternalFormat.g:1:616: T__112
                 {
                 mT__112(); 
 
                 }
                 break;
             case 101 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:623: T__113
+                // InternalFormat.g:1:623: T__113
                 {
                 mT__113(); 
 
                 }
                 break;
             case 102 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:630: T__114
+                // InternalFormat.g:1:630: T__114
                 {
                 mT__114(); 
 
                 }
                 break;
             case 103 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:637: T__115
+                // InternalFormat.g:1:637: T__115
                 {
                 mT__115(); 
 
                 }
                 break;
             case 104 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:644: T__116
+                // InternalFormat.g:1:644: T__116
                 {
                 mT__116(); 
 
                 }
                 break;
             case 105 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:651: T__117
+                // InternalFormat.g:1:651: T__117
                 {
                 mT__117(); 
 
                 }
                 break;
             case 106 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:658: RULE_HEX
+                // InternalFormat.g:1:658: RULE_INT
                 {
-                mRULE_HEX(); 
+                mRULE_INT(); 
 
                 }
                 break;
             case 107 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:667: RULE_INT
+                // InternalFormat.g:1:667: RULE_HEX
                 {
-                mRULE_INT(); 
+                mRULE_HEX(); 
 
                 }
                 break;
             case 108 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:676: RULE_DECIMAL
+                // InternalFormat.g:1:676: RULE_DECIMAL
                 {
                 mRULE_DECIMAL(); 
 
                 }
                 break;
             case 109 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:689: RULE_ID
+                // InternalFormat.g:1:689: RULE_ID
                 {
                 mRULE_ID(); 
 
                 }
                 break;
             case 110 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:697: RULE_STRING
+                // InternalFormat.g:1:697: RULE_STRING
                 {
                 mRULE_STRING(); 
 
                 }
                 break;
             case 111 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:709: RULE_ML_COMMENT
+                // InternalFormat.g:1:709: RULE_ML_COMMENT
                 {
                 mRULE_ML_COMMENT(); 
 
                 }
                 break;
             case 112 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:725: RULE_SL_COMMENT
+                // InternalFormat.g:1:725: RULE_SL_COMMENT
                 {
                 mRULE_SL_COMMENT(); 
 
                 }
                 break;
             case 113 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:741: RULE_WS
+                // InternalFormat.g:1:741: RULE_WS
                 {
                 mRULE_WS(); 
 
                 }
                 break;
             case 114 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1:749: RULE_ANY_OTHER
+                // InternalFormat.g:1:749: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -3975,132 +3975,19 @@ public void mTokens() throws RecognitionException {
 
     protected DFA21 dfa21 = new DFA21(this);
     static final String DFA21_eotS =
-        "\1\uffff\4\65\1\uffff\2\65\1\104\1\65\2\uffff\1\113\4\uffff\1\121"+
-        "\1\65\2\uffff\1\65\1\130\5\65\1\uffff\1\153\1\157\1\163\1\165\1"+
-        "\167\1\171\1\173\1\175\1\177\1\u0082\3\65\2\u008c\1\61\5\uffff\3"+
-        "\65\1\uffff\7\65\1\uffff\1\65\1\u00a0\2\65\1\uffff\1\u00a4\1\uffff"+
-        "\2\65\13\uffff\1\65\2\uffff\2\65\1\u00ab\1\uffff\15\65\1\u00bc\1"+
-        "\65\26\uffff\1\u00c0\4\uffff\1\u00c1\6\65\1\uffff\1\u008c\4\uffff"+
-        "\1\u00cb\14\65\1\u00d9\2\65\1\uffff\2\65\2\uffff\5\65\2\uffff\7"+
-        "\65\1\u00ec\10\65\1\uffff\1\u00f5\1\u00f6\3\uffff\3\65\1\u00fa\5"+
-        "\65\1\uffff\3\65\1\u0103\2\65\1\u0106\4\65\1\u010b\1\65\1\uffff"+
-        "\7\65\1\u0114\4\65\1\u0119\5\65\1\uffff\1\u011f\7\65\2\uffff\2\65"+
-        "\1\u0129\1\uffff\5\65\1\u012f\1\65\1\u0131\1\uffff\1\u0132\1\65"+
-        "\1\uffff\1\u0135\3\65\1\uffff\1\u0139\6\65\1\u0140\1\uffff\1\65"+
-        "\1\u0143\2\65\1\uffff\1\u0146\4\65\1\uffff\1\u014b\2\65\1\u014e"+
-        "\3\65\1\u0152\1\65\1\uffff\1\65\1\u0155\3\65\1\uffff\1\65\2\uffff"+
-        "\2\65\1\uffff\1\65\1\u015d\1\65\1\uffff\2\65\1\u0161\1\u0162\1\65"+
-        "\1\u0164\1\uffff\2\65\1\uffff\1\65\1\u0168\1\uffff\4\65\1\uffff"+
-        "\1\u016d\1\u016e\1\uffff\3\65\1\uffff\1\u0172\1\u0173\1\uffff\1"+
-        "\u0174\2\65\1\u0177\1\u0178\1\65\1\u017a\1\uffff\3\65\2\uffff\1"+
-        "\65\1\uffff\3\65\1\uffff\3\65\1\u0185\2\uffff\2\65\1\u0188\3\uffff"+
-        "\1\u0189\1\65\2\uffff\1\65\1\uffff\3\65\1\u018f\1\u0190\1\65\1\u0192"+
-        "\1\65\1\u0194\1\65\1\uffff\2\65\2\uffff\1\u0198\1\u0199\1\65\1\u019b"+
-        "\1\65\2\uffff\1\65\1\uffff\1\u019e\1\uffff\2\65\1\u01a1\2\uffff"+
-        "\1\65\1\uffff\1\u01a3\1\65\1\uffff\2\65\1\uffff\1\65\1\uffff\1\65"+
-        "\1\u01a9\3\65\1\uffff\1\u01ad\1\u01ae\1\u01af\3\uffff";
+        "\1\uffff\4\65\1\uffff\2\65\1\104\1\65\2\uffff\1\113\4\uffff\1\121\1\65\2\uffff\1\65\1\130\5\65\1\uffff\1\153\1\157\1\163\1\165\1\167\1\171\1\173\1\175\1\177\1\u0082\3\65\2\u008c\1\61\5\uffff\3\65\1\uffff\7\65\1\uffff\1\65\1\u00a0\2\65\1\uffff\1\u00a4\1\uffff\2\65\13\uffff\1\65\2\uffff\2\65\1\u00ab\1\uffff\15\65\1\u00bc\1\65\26\uffff\1\u00c0\4\uffff\1\u00c1\6\65\1\uffff\1\u008c\4\uffff\1\u00cb\14\65\1\u00d9\2\65\1\uffff\2\65\2\uffff\5\65\2\uffff\7\65\1\u00ec\10\65\1\uffff\1\u00f5\1\u00f6\3\uffff\3\65\1\u00fa\5\65\1\uffff\3\65\1\u0103\2\65\1\u0106\4\65\1\u010b\1\65\1\uffff\7\65\1\u0114\4\65\1\u0119\5\65\1\uffff\1\u011f\7\65\2\uffff\2\65\1\u0129\1\uffff\5\65\1\u012f\1\65\1\u0131\1\uffff\1\u0132\1\65\1\uffff\1\u0135\3\65\1\uffff\1\u0139\6\65\1\u0140\1\uffff\1\65\1\u0143\2\65\1\uffff\1\u0146\4\65\1\uffff\1\u014b\2\65\1\u014e\3\65\1\u0152\1\65\1\uffff\1\65\1\u0155\3\65\1\uffff\1\65\2\uffff\2\65\1\uffff\1\65\1\u015d\1\65\1\uffff\2\65\1\u0161\1\u0162\1\65\1\u0164\1\uffff\2\65\1\uffff\1\65\1\u0168\1\uffff\4\65\1\uffff\1\u016d\1\u016e\1\uffff\3\65\1\uffff\1\u0172\1\u0173\1\uffff\1\u0174\2\65\1\u0177\1\u0178\1\65\1\u017a\1\uffff\3\65\2\uffff\1\65\1\uffff\3\65\1\uffff\3\65\1\u0185\2\uffff\2\65\1\u0188\3\uffff\1\u0189\1\65\2\uffff\1\65\1\uffff\3\65\1\u018f\1\u0190\1\65\1\u0192\1\65\1\u0194\1\65\1\uffff\2\65\2\uffff\1\u0198\1\u0199\1\65\1\u019b\1\65\2\uffff\1\65\1\uffff\1\u019e\1\uffff\2\65\1\u01a1\2\uffff\1\65\1\uffff\1\u01a3\1\65\1\uffff\2\65\1\uffff\1\65\1\uffff\1\65\1\u01a9\3\65\1\uffff\1\u01ad\1\u01ae\1\u01af\3\uffff";
     static final String DFA21_eofS =
         "\u01b0\uffff";
     static final String DFA21_minS =
-        "\1\0\1\141\1\150\1\154\1\141\1\uffff\1\146\1\164\1\75\1\146\2\uffff"+
-        "\1\52\4\uffff\1\72\1\162\2\uffff\1\145\1\56\1\141\1\145\1\160\1"+
-        "\145\1\141\1\uffff\1\53\1\55\1\52\1\75\1\76\1\75\1\174\1\46\1\75"+
-        "\1\56\1\146\1\150\1\145\2\60\1\44\5\uffff\1\162\1\156\1\154\1\uffff"+
-        "\1\164\1\151\1\164\1\163\1\154\1\162\1\163\1\uffff\1\143\1\44\1"+
-        "\160\1\162\1\uffff\1\75\1\uffff\1\145\1\146\13\uffff\1\157\2\uffff"+
-        "\1\146\1\156\1\74\1\uffff\1\147\2\154\1\156\1\137\1\167\1\154\1"+
-        "\141\1\151\1\141\1\160\1\156\1\143\1\44\1\154\26\uffff\1\75\4\uffff"+
-        "\1\44\1\164\1\157\1\165\1\160\1\162\1\146\1\uffff\1\60\4\uffff\1"+
-        "\44\1\145\1\141\1\163\1\150\1\154\2\145\1\163\1\165\1\162\1\145"+
-        "\1\143\1\44\1\162\1\164\1\uffff\1\157\1\151\2\uffff\1\162\1\163"+
-        "\1\165\1\164\1\145\2\uffff\1\150\1\141\1\165\1\145\1\147\1\146\1"+
-        "\162\1\44\1\154\1\143\2\164\1\145\1\143\1\162\1\141\1\uffff\2\44"+
-        "\3\uffff\1\145\1\165\1\145\1\44\1\145\2\157\1\167\1\141\1\uffff"+
-        "\1\144\1\154\1\145\1\44\1\145\1\156\1\44\1\164\1\145\1\155\1\145"+
-        "\1\44\1\150\1\uffff\1\145\1\141\1\162\1\156\1\162\1\145\1\160\1"+
-        "\44\1\167\2\164\1\162\1\44\1\145\1\157\1\160\1\151\1\145\1\uffff"+
-        "\1\44\1\145\1\143\1\151\1\162\1\150\1\145\1\165\2\uffff\1\162\1"+
-        "\156\1\44\1\uffff\1\157\1\167\1\162\1\145\1\164\1\44\1\154\1\44"+
-        "\1\uffff\1\44\1\144\1\uffff\1\44\1\170\2\156\1\uffff\1\44\1\155"+
-        "\1\156\1\164\1\147\1\151\1\164\1\44\1\uffff\1\162\1\44\1\151\1\156"+
-        "\1\uffff\1\44\1\162\1\141\1\156\1\141\1\uffff\1\44\1\150\1\143\1"+
-        "\44\1\162\1\155\1\154\1\44\1\144\1\uffff\1\146\1\44\2\145\1\164"+
-        "\1\uffff\1\171\2\uffff\1\163\1\151\1\uffff\1\164\1\44\1\164\1\uffff"+
-        "\1\145\1\143\2\44\1\144\1\44\1\uffff\1\141\1\160\1\uffff\1\166\1"+
-        "\44\1\uffff\1\155\1\143\1\145\1\153\1\uffff\2\44\1\uffff\1\157\1"+
-        "\145\1\164\1\uffff\2\44\1\uffff\1\44\1\156\1\145\2\44\1\157\1\44"+
-        "\1\uffff\1\103\1\156\1\145\2\uffff\1\145\1\uffff\1\160\1\141\1\145"+
-        "\1\uffff\1\141\1\145\1\167\1\44\2\uffff\2\156\1\44\3\uffff\1\44"+
-        "\1\162\2\uffff\1\156\1\uffff\1\157\1\164\1\157\2\44\1\144\1\44\1"+
-        "\164\1\44\1\162\1\uffff\1\151\1\164\2\uffff\2\44\1\154\1\44\1\146"+
-        "\2\uffff\1\144\1\uffff\1\44\1\uffff\1\141\1\172\1\44\2\uffff\1\165"+
-        "\1\uffff\1\44\1\151\1\uffff\1\160\1\145\1\uffff\1\155\1\uffff\1"+
-        "\156\1\44\1\144\1\156\1\147\1\uffff\3\44\3\uffff";
+        "\1\0\1\141\1\150\1\154\1\141\1\uffff\1\146\1\164\1\75\1\146\2\uffff\1\52\4\uffff\1\72\1\162\2\uffff\1\145\1\56\1\141\1\145\1\160\1\145\1\141\1\uffff\1\53\1\55\1\52\1\75\1\76\1\75\1\174\1\46\1\75\1\56\1\146\1\150\1\145\2\60\1\44\5\uffff\1\162\1\156\1\154\1\uffff\1\164\1\151\1\164\1\163\1\154\1\162\1\163\1\uffff\1\143\1\44\1\160\1\162\1\uffff\1\75\1\uffff\1\145\1\146\13\uffff\1\157\2\uffff\1\146\1\156\1\74\1\uffff\1\147\2\154\1\156\1\137\1\167\1\154\1\141\1\151\1\141\1\160\1\156\1\143\1\44\1\154\26\uffff\1\75\4\uffff\1\44\1\164\1\157\1\165\1\160\1\162\1\146\1\uffff\1\60\4\uffff\1\44\1\145\1\141\1\163\1\150\1\154\2\145\1\163\1\165\1\162\1\145\1\143\1\44\1\162\1\164\1\uffff\1\157\1\151\2\uffff\1\162\1\163\1\165\1\164\1\145\2\uffff\1\150\1\141\1\165\1\145\1\147\1\146\1\162\1\44\1\154\1\143\2\164\1\145\1\143\1\162\1\141\1\uffff\2\44\3\uffff\1\145\1\165\1\145\1\44\1\145\2\157\1\167\1\141\1\uffff\1\144\1\154\1\145\1\44\1\145\1\156\1\44\1\164\1\145\1\155\1\145\1\44\1\150\1\uffff\1\145\1\141\1\162\1\156\1\162\1\145\1\160\1\44\1\167\2\164\1\162\1\44\1\145\1\157\1\160\1\151\1\145\1\uffff\1\44\1\145\1\143\1\151\1\162\1\150\1\145\1\165\2\uffff\1\162\1\156\1\44\1\uffff\1\157\1\167\1\162\1\145\1\164\1\44\1\154\1\44\1\uffff\1\44\1\144\1\uffff\1\44\1\170\2\156\1\uffff\1\44\1\155\1\156\1\164\1\147\1\151\1\164\1\44\1\uffff\1\162\1\44\1\151\1\156\1\uffff\1\44\1\162\1\141\1\156\1\141\1\uffff\1\44\1\150\1\143\1\44\1\162\1\155\1\154\1\44\1\144\1\uffff\1\146\1\44\2\145\1\164\1\uffff\1\171\2\uffff\1\163\1\151\1\uffff\1\164\1\44\1\164\1\uffff\1\145\1\143\2\44\1\144\1\44\1\uffff\1\141\1\160\1\uffff\1\166\1\44\1\uffff\1\155\1\143\1\145\1\153\1\uffff\2\44\1\uffff\1\157\1\145\1\164\1\uffff\2\44\1\uffff\1\44\1\156\1\145\2\44\1\157\1\44\1\uffff\1\103\1\156\1\145\2\uffff\1\145\1\uffff\1\160\1\141\1\145\1\uffff\1\141\1\145\1\167\1\44\2\uffff\2\156\1\44\3\uffff\1\44\1\162\2\uffff\1\156\1\uffff\1\157\1\164\1\157\2\44\1\144\1\44\1\164\1\44\1\162\1\uffff\1\151\1\164\2\uffff\2\44\1\154\1\44\1\146\2\uffff\1\144\1\uffff\1\44\1\uffff\1\141\1\172\1\44\2\uffff\1\165\1\uffff\1\44\1\151\1\uffff\1\160\1\145\1\uffff\1\155\1\uffff\1\156\1\44\1\144\1\156\1\147\1\uffff\3\44\3\uffff";
     static final String DFA21_maxS =
-        "\1\uffff\1\157\1\151\1\170\1\165\1\uffff\1\156\1\164\1\76\1\166"+
-        "\2\uffff\1\75\4\uffff\1\72\1\162\2\uffff\1\151\1\56\2\165\1\171"+
-        "\1\157\1\141\1\uffff\1\75\1\76\2\75\1\76\1\75\1\174\1\46\1\75\1"+
-        "\72\1\163\1\171\1\145\1\170\1\154\1\172\5\uffff\1\162\1\170\1\154"+
-        "\1\uffff\1\164\1\151\1\164\1\163\1\156\1\162\1\164\1\uffff\1\164"+
-        "\1\172\1\160\1\162\1\uffff\1\75\1\uffff\1\145\1\146\13\uffff\1\157"+
-        "\2\uffff\1\146\1\156\1\74\1\uffff\1\147\1\164\1\154\1\156\1\142"+
-        "\1\167\1\154\1\141\1\151\1\141\1\160\1\156\1\146\1\172\1\162\26"+
-        "\uffff\1\75\4\uffff\1\172\1\164\1\157\1\171\1\160\1\162\1\164\1"+
-        "\uffff\1\154\4\uffff\1\172\1\145\1\141\1\163\1\150\1\154\2\145\1"+
-        "\164\1\165\1\162\1\145\1\143\1\172\1\162\1\164\1\uffff\1\157\1\151"+
-        "\2\uffff\1\162\1\163\1\165\1\164\1\145\2\uffff\1\150\1\141\1\165"+
-        "\1\145\1\147\1\163\1\162\1\172\1\154\1\143\2\164\1\145\1\143\1\162"+
-        "\1\141\1\uffff\2\172\3\uffff\1\145\1\165\1\145\1\172\1\145\2\157"+
-        "\1\167\1\141\1\uffff\1\144\1\154\1\145\1\172\1\145\1\156\1\172\1"+
-        "\164\1\145\1\155\1\145\1\172\1\150\1\uffff\1\145\1\141\1\162\1\156"+
-        "\1\162\1\145\1\160\1\172\1\167\2\164\1\162\1\172\1\145\1\157\1\160"+
-        "\1\151\1\145\1\uffff\1\172\1\145\1\143\1\151\1\162\1\150\1\145\1"+
-        "\165\2\uffff\1\162\1\156\1\172\1\uffff\1\157\1\167\1\162\1\145\1"+
-        "\164\1\172\1\154\1\172\1\uffff\1\172\1\163\1\uffff\1\172\1\170\2"+
-        "\156\1\uffff\1\172\1\155\1\156\1\164\1\147\1\151\1\164\1\172\1\uffff"+
-        "\1\162\1\172\1\151\1\156\1\uffff\1\172\1\162\1\141\1\156\1\141\1"+
-        "\uffff\1\172\1\150\1\143\1\172\1\162\1\155\1\154\1\172\1\144\1\uffff"+
-        "\1\146\1\172\2\145\1\164\1\uffff\1\171\2\uffff\1\163\1\151\1\uffff"+
-        "\1\164\1\172\1\164\1\uffff\1\145\1\143\2\172\1\144\1\172\1\uffff"+
-        "\1\141\1\160\1\uffff\1\166\1\172\1\uffff\1\155\1\143\1\145\1\153"+
-        "\1\uffff\2\172\1\uffff\1\157\1\145\1\164\1\uffff\2\172\1\uffff\1"+
-        "\172\1\156\1\145\2\172\1\157\1\172\1\uffff\1\103\1\156\1\145\2\uffff"+
-        "\1\145\1\uffff\1\160\1\141\1\145\1\uffff\1\141\1\145\1\167\1\172"+
-        "\2\uffff\2\156\1\172\3\uffff\1\172\1\162\2\uffff\1\156\1\uffff\1"+
-        "\157\1\164\1\157\2\172\1\144\1\172\1\164\1\172\1\162\1\uffff\1\151"+
-        "\1\164\2\uffff\2\172\1\154\1\172\1\146\2\uffff\1\144\1\uffff\1\172"+
-        "\1\uffff\1\141\2\172\2\uffff\1\165\1\uffff\1\172\1\151\1\uffff\1"+
-        "\160\1\145\1\uffff\1\155\1\uffff\1\156\1\172\1\144\1\156\1\147\1"+
-        "\uffff\3\172\3\uffff";
+        "\1\uffff\1\157\1\151\1\170\1\165\1\uffff\1\156\1\164\1\76\1\166\2\uffff\1\75\4\uffff\1\72\1\162\2\uffff\1\151\1\56\2\165\1\171\1\157\1\141\1\uffff\1\75\1\76\2\75\1\76\1\75\1\174\1\46\1\75\1\72\1\163\1\171\1\145\1\170\1\154\1\172\5\uffff\1\162\1\170\1\154\1\uffff\1\164\1\151\1\164\1\163\1\156\1\162\1\164\1\uffff\1\164\1\172\1\160\1\162\1\uffff\1\75\1\uffff\1\145\1\146\13\uffff\1\157\2\uffff\1\146\1\156\1\74\1\uffff\1\147\1\164\1\154\1\156\1\142\1\167\1\154\1\141\1\151\1\141\1\160\1\156\1\146\1\172\1\162\26\uffff\1\75\4\uffff\1\172\1\164\1\157\1\171\1\160\1\162\1\164\1\uffff\1\154\4\uffff\1\172\1\145\1\141\1\163\1\150\1\154\2\145\1\164\1\165\1\162\1\145\1\143\1\172\1\162\1\164\1\uffff\1\157\1\151\2\uffff\1\162\1\163\1\165\1\164\1\145\2\uffff\1\150\1\141\1\165\1\145\1\147\1\163\1\162\1\172\1\154\1\143\2\164\1\145\1\143\1\162\1\141\1\uffff\2\172\3\uffff\1\145\1\165\1\145\1\172\1\145\2\157\1\167\1\141\1\uffff\1\144\1\154\1\145\1\172\1\145\1\156\1\172\1\164\1\145\1\155\1\145\1\172\1\150\1\uffff\1\145\1\141\1\162\1\156\1\162\1\145\1\160\1\172\1\167\2\164\1\162\1\172\1\145\1\157\1\160\1\151\1\145\1\uffff\1\172\1\145\1\143\1\151\1\162\1\150\1\145\1\165\2\uffff\1\162\1\156\1\172\1\uffff\1\157\1\167\1\162\1\145\1\164\1\172\1\154\1\172\1\uffff\1\172\1\163\1\uffff\1\172\1\170\2\156\1\uffff\1\172\1\155\1\156\1\164\1\147\1\151\1\164\1\172\1\uffff\1\162\1\172\1\151\1\156\1\uffff\1\172\1\162\1\141\1\156\1\141\1\uffff\1\172\1\150\1\143\1\172\1\162\1\155\1\154\1\172\1\144\1\uffff\1\146\1\172\2\145\1\164\1\uffff\1\171\2\uffff\1\163\1\151\1\uffff\1\164\1\172\1\164\1\uffff\1\145\1\143\2\172\1\144\1\172\1\uffff\1\141\1\160\1\uffff\1\166\1\172\1\uffff\1\155\1\143\1\145\1\153\1\uffff\2\172\1\uffff\1\157\1\145\1\164\1\uffff\2\172\1\uffff\1\172\1\156\1\145\2\172\1\157\1\172\1\uffff\1\103\1\156\1\145\2\uffff\1\145\1\uffff\1\160\1\141\1\145\1\uffff\1\141\1\145\1\167\1\172\2\uffff\2\156\1\172\3\uffff\1\172\1\162\2\uffff\1\156\1\uffff\1\157\1\164\1\157\2\172\1\144\1\172\1\164\1\172\1\162\1\uffff\1\151\1\164\2\uffff\2\172\1\154\1\172\1\146\2\uffff\1\144\1\uffff\1\172\1\uffff\1\141\2\172\2\uffff\1\165\1\uffff\1\172\1\151\1\uffff\1\160\1\145\1\uffff\1\155\1\uffff\1\156\1\172\1\144\1\156\1\147\1\uffff\3\172\3\uffff";
     static final String DFA21_acceptS =
-        "\5\uffff\1\6\4\uffff\1\13\1\14\1\uffff\1\16\1\17\1\20\1\21\2\uffff"+
-        "\1\25\1\26\7\uffff\1\54\20\uffff\1\155\2\156\1\161\1\162\3\uffff"+
-        "\1\155\7\uffff\1\6\4\uffff\1\24\1\uffff\1\11\2\uffff\1\13\1\14\1"+
-        "\57\1\103\1\15\1\16\1\17\1\20\1\21\1\112\1\22\1\uffff\1\25\1\26"+
-        "\3\uffff\1\30\17\uffff\1\54\1\55\1\110\1\101\1\56\1\74\1\111\1\102"+
-        "\1\60\1\157\1\160\1\104\1\61\1\105\1\77\1\62\1\64\1\63\1\65\1\114"+
-        "\1\66\1\144\1\uffff\1\106\1\100\1\113\1\143\7\uffff\1\152\1\uffff"+
-        "\1\153\1\154\1\156\1\161\20\uffff\1\115\2\uffff\1\71\1\67\5\uffff"+
-        "\1\75\1\76\20\uffff\1\122\2\uffff\1\72\1\70\1\107\11\uffff\1\2\15"+
-        "\uffff\1\7\22\uffff\1\130\10\uffff\1\50\1\123\3\uffff\1\137\10\uffff"+
-        "\1\3\2\uffff\1\116\4\uffff\1\120\10\uffff\1\27\4\uffff\1\51\5\uffff"+
-        "\1\133\11\uffff\1\132\5\uffff\1\41\1\uffff\1\131\1\121\2\uffff\1"+
-        "\5\3\uffff\1\142\6\uffff\1\23\2\uffff\1\31\2\uffff\1\151\4\uffff"+
-        "\1\33\2\uffff\1\127\3\uffff\1\146\2\uffff\1\135\7\uffff\1\40\3\uffff"+
-        "\1\125\1\10\1\uffff\1\44\3\uffff\1\136\4\uffff\1\117\1\124\3\uffff"+
-        "\1\147\1\134\1\145\2\uffff\1\140\1\4\1\uffff\1\52\12\uffff\1\43"+
-        "\2\uffff\1\47\1\150\5\uffff\1\12\1\36\1\uffff\1\42\1\uffff\1\34"+
-        "\3\uffff\1\1\1\126\1\uffff\1\45\2\uffff\1\32\2\uffff\1\46\1\uffff"+
-        "\1\73\5\uffff\1\37\3\uffff\1\141\1\53\1\35";
+        "\5\uffff\1\6\4\uffff\1\13\1\14\1\uffff\1\16\1\17\1\20\1\21\2\uffff\1\25\1\26\7\uffff\1\54\20\uffff\1\155\2\156\1\161\1\162\3\uffff\1\155\7\uffff\1\6\4\uffff\1\24\1\uffff\1\11\2\uffff\1\13\1\14\1\57\1\103\1\15\1\16\1\17\1\20\1\21\1\112\1\22\1\uffff\1\25\1\26\3\uffff\1\30\17\uffff\1\54\1\55\1\110\1\101\1\56\1\74\1\111\1\102\1\60\1\157\1\160\1\104\1\61\1\105\1\77\1\62\1\64\1\63\1\65\1\114\1\66\1\144\1\uffff\1\106\1\100\1\113\1\143\7\uffff\1\153\1\uffff\1\152\1\154\1\156\1\161\20\uffff\1\115\2\uffff\1\71\1\67\5\uffff\1\75\1\76\20\uffff\1\122\2\uffff\1\72\1\70\1\107\11\uffff\1\2\15\uffff\1\7\22\uffff\1\130\10\uffff\1\50\1\123\3\uffff\1\137\10\uffff\1\3\2\uffff\1\116\4\uffff\1\120\10\uffff\1\27\4\uffff\1\51\5\uffff\1\133\11\uffff\1\132\5\uffff\1\41\1\uffff\1\131\1\121\2\uffff\1\5\3\uffff\1\142\6\uffff\1\23\2\uffff\1\31\2\uffff\1\151\4\uffff\1\33\2\uffff\1\127\3\uffff\1\146\2\uffff\1\135\7\uffff\1\40\3\uffff\1\125\1\10\1\uffff\1\44\3\uffff\1\136\4\uffff\1\117\1\124\3\uffff\1\147\1\134\1\145\2\uffff\1\140\1\4\1\uffff\1\52\12\uffff\1\43\2\uffff\1\47\1\150\5\uffff\1\12\1\36\1\uffff\1\42\1\uffff\1\34\3\uffff\1\1\1\126\1\uffff\1\45\2\uffff\1\32\2\uffff\1\46\1\uffff\1\73\5\uffff\1\37\3\uffff\1\141\1\53\1\35";
     static final String DFA21_specialS =
         "\1\0\u01af\uffff}>";
     static final String[] DFA21_transitionS = {
-            "\11\61\2\60\2\61\1\60\22\61\1\60\1\45\1\56\1\34\1\55\1\40\1"+
-            "\44\1\57\1\23\1\24\1\14\1\35\1\17\1\36\1\26\1\37\1\52\11\53"+
-            "\1\21\1\5\1\41\1\10\1\42\1\46\1\15\22\55\1\7\7\55\1\16\1\61"+
-            "\1\20\1\54\1\55\1\61\1\47\1\51\1\4\1\32\1\3\1\1\1\22\1\55\1"+
-            "\6\2\55\1\25\1\55\1\30\1\11\2\55\1\27\1\31\1\50\1\55\1\33\1"+
-            "\2\3\55\1\12\1\43\1\13\uff82\61",
+            "\11\61\2\60\2\61\1\60\22\61\1\60\1\45\1\56\1\34\1\55\1\40\1\44\1\57\1\23\1\24\1\14\1\35\1\17\1\36\1\26\1\37\1\52\11\53\1\21\1\5\1\41\1\10\1\42\1\46\1\15\22\55\1\7\7\55\1\16\1\61\1\20\1\54\1\55\1\61\1\47\1\51\1\4\1\32\1\3\1\1\1\22\1\55\1\6\2\55\1\25\1\55\1\30\1\11\2\55\1\27\1\31\1\50\1\55\1\33\1\2\3\55\1\12\1\43\1\13\uff82\61",
             "\1\64\7\uffff\1\63\5\uffff\1\62",
             "\1\67\1\66",
             "\1\71\13\uffff\1\70",
@@ -4142,12 +4029,8 @@ public void mTokens() throws RecognitionException {
             "\1\u0084\13\uffff\1\u0085\1\u0083",
             "\1\u0088\11\uffff\1\u0086\6\uffff\1\u0087",
             "\1\u0089",
-            "\12\u008b\10\uffff\1\u008d\1\uffff\3\u008d\5\uffff\1\u008d"+
-            "\13\uffff\1\u008a\6\uffff\1\u008b\2\uffff\1\u008d\1\uffff\3"+
-            "\u008d\5\uffff\1\u008d\13\uffff\1\u008a",
-            "\12\u008b\10\uffff\1\u008d\1\uffff\3\u008d\5\uffff\1\u008d"+
-            "\22\uffff\1\u008b\2\uffff\1\u008d\1\uffff\3\u008d\5\uffff\1"+
-            "\u008d",
+            "\12\u008b\10\uffff\1\u008d\1\uffff\3\u008d\5\uffff\1\u008d\13\uffff\1\u008a\6\uffff\1\u008b\2\uffff\1\u008d\1\uffff\3\u008d\5\uffff\1\u008d\13\uffff\1\u008a",
+            "\12\u008b\10\uffff\1\u008d\1\uffff\3\u008d\5\uffff\1\u008d\22\uffff\1\u008b\2\uffff\1\u008d\1\uffff\3\u008d\5\uffff\1\u008d",
             "\1\65\34\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "",
             "",
@@ -4167,8 +4050,7 @@ public void mTokens() throws RecognitionException {
             "\1\u009b\1\u009c",
             "",
             "\1\u009e\17\uffff\1\u009f\1\u009d",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u00a1",
             "\1\u00a2",
             "",
@@ -4207,8 +4089,7 @@ public void mTokens() throws RecognitionException {
             "\1\u00b8",
             "\1\u00b9",
             "\1\u00ba\2\uffff\1\u00bb",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u00bd\5\uffff\1\u00be",
             "",
             "",
@@ -4237,8 +4118,7 @@ public void mTokens() throws RecognitionException {
             "",
             "",
             "",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u00c2",
             "\1\u00c3",
             "\1\u00c4\3\uffff\1\u00c5",
@@ -4246,15 +4126,12 @@ public void mTokens() throws RecognitionException {
             "\1\u00c7",
             "\1\u00c8\15\uffff\1\u00c9",
             "",
-            "\12\u008b\10\uffff\1\u008d\1\uffff\3\u008d\5\uffff\1\u008d"+
-            "\22\uffff\1\u008b\2\uffff\1\u008d\1\uffff\3\u008d\5\uffff\1"+
-            "\u008d",
+            "\12\u008b\10\uffff\1\u008d\1\uffff\3\u008d\5\uffff\1\u008d\22\uffff\1\u008b\2\uffff\1\u008d\1\uffff\3\u008d\5\uffff\1\u008d",
             "",
             "",
             "",
             "",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\14"+
-            "\65\1\u00ca\15\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\14\65\1\u00ca\15\65",
             "\1\u00cc",
             "\1\u00cd",
             "\1\u00ce",
@@ -4267,8 +4144,7 @@ public void mTokens() throws RecognitionException {
             "\1\u00d6",
             "\1\u00d7",
             "\1\u00d8",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u00da",
             "\1\u00db",
             "",
@@ -4290,8 +4166,7 @@ public void mTokens() throws RecognitionException {
             "\1\u00e7",
             "\1\u00e8\5\uffff\1\u00ea\6\uffff\1\u00e9",
             "\1\u00eb",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u00ed",
             "\1\u00ee",
             "\1\u00ef",
@@ -4301,18 +4176,15 @@ public void mTokens() throws RecognitionException {
             "\1\u00f3",
             "\1\u00f4",
             "",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "",
             "",
             "",
             "\1\u00f7",
             "\1\u00f8",
             "\1\u00f9",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u00fb",
             "\1\u00fc",
             "\1\u00fd",
@@ -4322,18 +4194,15 @@ public void mTokens() throws RecognitionException {
             "\1\u0100",
             "\1\u0101",
             "\1\u0102",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u0104",
             "\1\u0105",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u0107",
             "\1\u0108",
             "\1\u0109",
             "\1\u010a",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u010c",
             "",
             "\1\u010d",
@@ -4343,22 +4212,19 @@ public void mTokens() throws RecognitionException {
             "\1\u0111",
             "\1\u0112",
             "\1\u0113",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u0115",
             "\1\u0116",
             "\1\u0117",
             "\1\u0118",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u011a",
             "\1\u011b",
             "\1\u011c",
             "\1\u011d",
             "\1\u011e",
             "",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u0120",
             "\1\u0121",
             "\1\u0122",
@@ -4370,70 +4236,57 @@ public void mTokens() throws RecognitionException {
             "",
             "\1\u0127",
             "\1\u0128",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "",
             "\1\u012a",
             "\1\u012b",
             "\1\u012c",
             "\1\u012d",
             "\1\u012e",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u0130",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u0133\16\uffff\1\u0134",
             "",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u0136",
             "\1\u0137",
             "\1\u0138",
             "",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u013a",
             "\1\u013b",
             "\1\u013c",
             "\1\u013d",
             "\1\u013e",
             "\1\u013f",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "",
             "\1\u0141",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\u0142\1\uffff"+
-            "\32\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\u0142\1\uffff\32\65",
             "\1\u0144",
             "\1\u0145",
             "",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u0147",
             "\1\u0148",
             "\1\u0149",
             "\1\u014a",
             "",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u014c",
             "\1\u014d",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u014f",
             "\1\u0150",
             "\1\u0151",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u0153",
             "",
             "\1\u0154",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u0156",
             "\1\u0157",
             "\1\u0158",
@@ -4445,57 +4298,44 @@ public void mTokens() throws RecognitionException {
             "\1\u015b",
             "",
             "\1\u015c",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u015e",
             "",
             "\1\u015f",
             "\1\u0160",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u0163",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "",
             "\1\u0165",
             "\1\u0166",
             "",
             "\1\u0167",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "",
             "\1\u0169",
             "\1\u016a",
             "\1\u016b",
             "\1\u016c",
             "",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "",
             "\1\u016f",
             "\1\u0170",
             "\1\u0171",
             "",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u0175",
             "\1\u0176",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u0179",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "",
             "\1\u017b",
             "\1\u017c",
@@ -4511,19 +4351,16 @@ public void mTokens() throws RecognitionException {
             "\1\u0182",
             "\1\u0183",
             "\1\u0184",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "",
             "",
             "\1\u0186",
             "\1\u0187",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "",
             "",
             "",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u018a",
             "",
             "",
@@ -4532,47 +4369,37 @@ public void mTokens() throws RecognitionException {
             "\1\u018c",
             "\1\u018d",
             "\1\u018e",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u0191",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u0193",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u0195",
             "",
             "\1\u0196",
             "\1\u0197",
             "",
             "",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u019a",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u019c",
             "",
             "",
             "\1\u019d",
             "",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "",
             "\1\u019f",
             "\1\u01a0",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "",
             "",
             "\1\u01a2",
             "",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u01a4",
             "",
             "\1\u01a5",
@@ -4581,18 +4408,14 @@ public void mTokens() throws RecognitionException {
             "\1\u01a7",
             "",
             "\1\u01a8",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "\1\u01aa",
             "\1\u01ab",
             "\1\u01ac",
             "",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
-            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32"+
-            "\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
+            "\1\65\13\uffff\12\65\7\uffff\32\65\4\uffff\1\65\1\uffff\32\65",
             "",
             "",
             ""
@@ -4628,7 +4451,7 @@ public DFA21(BaseRecognizer recognizer) {
             this.transition = DFA21_transition;
         }
         public String getDescription() {
-            return "1:1: Tokens : ( T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | T__97 | T__98 | T__99 | T__100 | T__101 | T__102 | T__103 | T__104 | T__105 | T__106 | T__107 | T__108 | T__109 | T__110 | T__111 | T__112 | T__113 | T__114 | T__115 | T__116 | T__117 | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
+            return "1:1: Tokens : ( T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | T__97 | T__98 | T__99 | T__100 | T__101 | T__102 | T__103 | T__104 | T__105 | T__106 | T__107 | T__108 | T__109 | T__110 | T__111 | T__112 | T__113 | T__114 | T__115 | T__116 | T__117 | RULE_INT | RULE_HEX | RULE_DECIMAL | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             IntStream input = _input;
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormatParser.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormatParser.java
index c33672e08..b5fdbfcee 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormatParser.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormatParser.java
@@ -155,7 +155,7 @@ public InternalFormatParser(TokenStream input, RecognizerSharedState state) {
         
 
     public String[] getTokenNames() { return InternalFormatParser.tokenNames; }
-    public String getGrammarFileName() { return "../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g"; }
+    public String getGrammarFileName() { return "InternalFormat.g"; }
 
 
 
@@ -180,7 +180,7 @@ protected FormatGrammarAccess getGrammarAccess() {
 
 
     // $ANTLR start "entryRuleFormatConfiguration"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:68:1: entryRuleFormatConfiguration returns [EObject current=null] : iv_ruleFormatConfiguration= ruleFormatConfiguration EOF ;
+    // InternalFormat.g:68:1: entryRuleFormatConfiguration returns [EObject current=null] : iv_ruleFormatConfiguration= ruleFormatConfiguration EOF ;
     public final EObject entryRuleFormatConfiguration() throws RecognitionException {
         EObject current = null;
 
@@ -188,13 +188,13 @@ public final EObject entryRuleFormatConfiguration() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:69:2: (iv_ruleFormatConfiguration= ruleFormatConfiguration EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:70:2: iv_ruleFormatConfiguration= ruleFormatConfiguration EOF
+            // InternalFormat.g:69:2: (iv_ruleFormatConfiguration= ruleFormatConfiguration EOF )
+            // InternalFormat.g:70:2: iv_ruleFormatConfiguration= ruleFormatConfiguration EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getFormatConfigurationRule()); 
             }
-            pushFollow(FOLLOW_ruleFormatConfiguration_in_entryRuleFormatConfiguration75);
+            pushFollow(FOLLOW_1);
             iv_ruleFormatConfiguration=ruleFormatConfiguration();
 
             state._fsp--;
@@ -202,7 +202,7 @@ public final EObject entryRuleFormatConfiguration() throws RecognitionException
             if ( state.backtracking==0 ) {
                current =iv_ruleFormatConfiguration; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFormatConfiguration85); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -220,7 +220,7 @@ public final EObject entryRuleFormatConfiguration() throws RecognitionException
 
 
     // $ANTLR start "ruleFormatConfiguration"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:77:1: ruleFormatConfiguration returns [EObject current=null] : (otherlv_0= 'formatter' otherlv_1= 'for' ( ( ruleDottedID ) ) (otherlv_3= 'with' ( ( ruleDottedID ) ) )? (otherlv_5= 'extends' ( ( ruleQualifiedName ) ) )? (otherlv_7= 'const' ( (lv_constants_8_0= ruleConstant ) ) otherlv_9= ';' )* ( (lv_rules_10_0= ruleRule ) )* ) ;
+    // InternalFormat.g:77:1: ruleFormatConfiguration returns [EObject current=null] : (otherlv_0= 'formatter' otherlv_1= 'for' ( ( ruleDottedID ) ) (otherlv_3= 'with' ( ( ruleDottedID ) ) )? (otherlv_5= 'extends' ( ( ruleQualifiedName ) ) )? (otherlv_7= 'const' ( (lv_constants_8_0= ruleConstant ) ) otherlv_9= ';' )* ( (lv_rules_10_0= ruleRule ) )* ) ;
     public final EObject ruleFormatConfiguration() throws RecognitionException {
         EObject current = null;
 
@@ -238,29 +238,29 @@ public final EObject ruleFormatConfiguration() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:80:28: ( (otherlv_0= 'formatter' otherlv_1= 'for' ( ( ruleDottedID ) ) (otherlv_3= 'with' ( ( ruleDottedID ) ) )? (otherlv_5= 'extends' ( ( ruleQualifiedName ) ) )? (otherlv_7= 'const' ( (lv_constants_8_0= ruleConstant ) ) otherlv_9= ';' )* ( (lv_rules_10_0= ruleRule ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:81:1: (otherlv_0= 'formatter' otherlv_1= 'for' ( ( ruleDottedID ) ) (otherlv_3= 'with' ( ( ruleDottedID ) ) )? (otherlv_5= 'extends' ( ( ruleQualifiedName ) ) )? (otherlv_7= 'const' ( (lv_constants_8_0= ruleConstant ) ) otherlv_9= ';' )* ( (lv_rules_10_0= ruleRule ) )* )
+            // InternalFormat.g:80:28: ( (otherlv_0= 'formatter' otherlv_1= 'for' ( ( ruleDottedID ) ) (otherlv_3= 'with' ( ( ruleDottedID ) ) )? (otherlv_5= 'extends' ( ( ruleQualifiedName ) ) )? (otherlv_7= 'const' ( (lv_constants_8_0= ruleConstant ) ) otherlv_9= ';' )* ( (lv_rules_10_0= ruleRule ) )* ) )
+            // InternalFormat.g:81:1: (otherlv_0= 'formatter' otherlv_1= 'for' ( ( ruleDottedID ) ) (otherlv_3= 'with' ( ( ruleDottedID ) ) )? (otherlv_5= 'extends' ( ( ruleQualifiedName ) ) )? (otherlv_7= 'const' ( (lv_constants_8_0= ruleConstant ) ) otherlv_9= ';' )* ( (lv_rules_10_0= ruleRule ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:81:1: (otherlv_0= 'formatter' otherlv_1= 'for' ( ( ruleDottedID ) ) (otherlv_3= 'with' ( ( ruleDottedID ) ) )? (otherlv_5= 'extends' ( ( ruleQualifiedName ) ) )? (otherlv_7= 'const' ( (lv_constants_8_0= ruleConstant ) ) otherlv_9= ';' )* ( (lv_rules_10_0= ruleRule ) )* )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:81:3: otherlv_0= 'formatter' otherlv_1= 'for' ( ( ruleDottedID ) ) (otherlv_3= 'with' ( ( ruleDottedID ) ) )? (otherlv_5= 'extends' ( ( ruleQualifiedName ) ) )? (otherlv_7= 'const' ( (lv_constants_8_0= ruleConstant ) ) otherlv_9= ';' )* ( (lv_rules_10_0= ruleRule ) )*
+            // InternalFormat.g:81:1: (otherlv_0= 'formatter' otherlv_1= 'for' ( ( ruleDottedID ) ) (otherlv_3= 'with' ( ( ruleDottedID ) ) )? (otherlv_5= 'extends' ( ( ruleQualifiedName ) ) )? (otherlv_7= 'const' ( (lv_constants_8_0= ruleConstant ) ) otherlv_9= ';' )* ( (lv_rules_10_0= ruleRule ) )* )
+            // InternalFormat.g:81:3: otherlv_0= 'formatter' otherlv_1= 'for' ( ( ruleDottedID ) ) (otherlv_3= 'with' ( ( ruleDottedID ) ) )? (otherlv_5= 'extends' ( ( ruleQualifiedName ) ) )? (otherlv_7= 'const' ( (lv_constants_8_0= ruleConstant ) ) otherlv_9= ';' )* ( (lv_rules_10_0= ruleRule ) )*
             {
-            otherlv_0=(Token)match(input,13,FOLLOW_13_in_ruleFormatConfiguration122); if (state.failed) return current;
+            otherlv_0=(Token)match(input,13,FOLLOW_3); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getFormatConfigurationAccess().getFormatterKeyword_0());
                   
             }
-            otherlv_1=(Token)match(input,14,FOLLOW_14_in_ruleFormatConfiguration134); if (state.failed) return current;
+            otherlv_1=(Token)match(input,14,FOLLOW_4); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getFormatConfigurationAccess().getForKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:89:1: ( ( ruleDottedID ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:90:1: ( ruleDottedID )
+            // InternalFormat.g:89:1: ( ( ruleDottedID ) )
+            // InternalFormat.g:90:1: ( ruleDottedID )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:90:1: ( ruleDottedID )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:91:3: ruleDottedID
+            // InternalFormat.g:90:1: ( ruleDottedID )
+            // InternalFormat.g:91:3: ruleDottedID
             {
             if ( state.backtracking==0 ) {
 
@@ -274,7 +274,7 @@ public final EObject ruleFormatConfiguration() throws RecognitionException {
               	        newCompositeNode(grammarAccess.getFormatConfigurationAccess().getTargetGrammarGrammarCrossReference_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleDottedID_in_ruleFormatConfiguration157);
+            pushFollow(FOLLOW_5);
             ruleDottedID();
 
             state._fsp--;
@@ -290,7 +290,7 @@ public final EObject ruleFormatConfiguration() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:104:2: (otherlv_3= 'with' ( ( ruleDottedID ) ) )?
+            // InternalFormat.g:104:2: (otherlv_3= 'with' ( ( ruleDottedID ) ) )?
             int alt1=2;
             int LA1_0 = input.LA(1);
 
@@ -299,19 +299,19 @@ public final EObject ruleFormatConfiguration() throws RecognitionException {
             }
             switch (alt1) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:104:4: otherlv_3= 'with' ( ( ruleDottedID ) )
+                    // InternalFormat.g:104:4: otherlv_3= 'with' ( ( ruleDottedID ) )
                     {
-                    otherlv_3=(Token)match(input,15,FOLLOW_15_in_ruleFormatConfiguration170); if (state.failed) return current;
+                    otherlv_3=(Token)match(input,15,FOLLOW_4); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_3, grammarAccess.getFormatConfigurationAccess().getWithKeyword_3_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:108:1: ( ( ruleDottedID ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:109:1: ( ruleDottedID )
+                    // InternalFormat.g:108:1: ( ( ruleDottedID ) )
+                    // InternalFormat.g:109:1: ( ruleDottedID )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:109:1: ( ruleDottedID )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:110:3: ruleDottedID
+                    // InternalFormat.g:109:1: ( ruleDottedID )
+                    // InternalFormat.g:110:3: ruleDottedID
                     {
                     if ( state.backtracking==0 ) {
 
@@ -325,7 +325,7 @@ public final EObject ruleFormatConfiguration() throws RecognitionException {
                       	        newCompositeNode(grammarAccess.getFormatConfigurationAccess().getExtendedFormatConfigurationFormatConfigurationCrossReference_3_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleDottedID_in_ruleFormatConfiguration193);
+                    pushFollow(FOLLOW_6);
                     ruleDottedID();
 
                     state._fsp--;
@@ -347,7 +347,7 @@ public final EObject ruleFormatConfiguration() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:123:4: (otherlv_5= 'extends' ( ( ruleQualifiedName ) ) )?
+            // InternalFormat.g:123:4: (otherlv_5= 'extends' ( ( ruleQualifiedName ) ) )?
             int alt2=2;
             int LA2_0 = input.LA(1);
 
@@ -356,19 +356,19 @@ public final EObject ruleFormatConfiguration() throws RecognitionException {
             }
             switch (alt2) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:123:6: otherlv_5= 'extends' ( ( ruleQualifiedName ) )
+                    // InternalFormat.g:123:6: otherlv_5= 'extends' ( ( ruleQualifiedName ) )
                     {
-                    otherlv_5=(Token)match(input,16,FOLLOW_16_in_ruleFormatConfiguration208); if (state.failed) return current;
+                    otherlv_5=(Token)match(input,16,FOLLOW_7); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_5, grammarAccess.getFormatConfigurationAccess().getExtendsKeyword_4_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:127:1: ( ( ruleQualifiedName ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:128:1: ( ruleQualifiedName )
+                    // InternalFormat.g:127:1: ( ( ruleQualifiedName ) )
+                    // InternalFormat.g:128:1: ( ruleQualifiedName )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:128:1: ( ruleQualifiedName )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:129:3: ruleQualifiedName
+                    // InternalFormat.g:128:1: ( ruleQualifiedName )
+                    // InternalFormat.g:129:3: ruleQualifiedName
                     {
                     if ( state.backtracking==0 ) {
 
@@ -382,7 +382,7 @@ public final EObject ruleFormatConfiguration() throws RecognitionException {
                       	        newCompositeNode(grammarAccess.getFormatConfigurationAccess().getFormatterBaseClassJvmDeclaredTypeCrossReference_4_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleQualifiedName_in_ruleFormatConfiguration231);
+                    pushFollow(FOLLOW_8);
                     ruleQualifiedName();
 
                     state._fsp--;
@@ -404,7 +404,7 @@ public final EObject ruleFormatConfiguration() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:142:4: (otherlv_7= 'const' ( (lv_constants_8_0= ruleConstant ) ) otherlv_9= ';' )*
+            // InternalFormat.g:142:4: (otherlv_7= 'const' ( (lv_constants_8_0= ruleConstant ) ) otherlv_9= ';' )*
             loop3:
             do {
                 int alt3=2;
@@ -417,26 +417,26 @@ public final EObject ruleFormatConfiguration() throws RecognitionException {
 
                 switch (alt3) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:142:6: otherlv_7= 'const' ( (lv_constants_8_0= ruleConstant ) ) otherlv_9= ';'
+            	    // InternalFormat.g:142:6: otherlv_7= 'const' ( (lv_constants_8_0= ruleConstant ) ) otherlv_9= ';'
             	    {
-            	    otherlv_7=(Token)match(input,17,FOLLOW_17_in_ruleFormatConfiguration246); if (state.failed) return current;
+            	    otherlv_7=(Token)match(input,17,FOLLOW_9); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_7, grammarAccess.getFormatConfigurationAccess().getConstKeyword_5_0());
             	          
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:146:1: ( (lv_constants_8_0= ruleConstant ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:147:1: (lv_constants_8_0= ruleConstant )
+            	    // InternalFormat.g:146:1: ( (lv_constants_8_0= ruleConstant ) )
+            	    // InternalFormat.g:147:1: (lv_constants_8_0= ruleConstant )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:147:1: (lv_constants_8_0= ruleConstant )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:148:3: lv_constants_8_0= ruleConstant
+            	    // InternalFormat.g:147:1: (lv_constants_8_0= ruleConstant )
+            	    // InternalFormat.g:148:3: lv_constants_8_0= ruleConstant
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getFormatConfigurationAccess().getConstantsConstantParserRuleCall_5_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleConstant_in_ruleFormatConfiguration267);
+            	    pushFollow(FOLLOW_10);
             	    lv_constants_8_0=ruleConstant();
 
             	    state._fsp--;
@@ -450,7 +450,7 @@ public final EObject ruleFormatConfiguration() throws RecognitionException {
             	             			current, 
             	             			"constants",
             	              		lv_constants_8_0, 
-            	              		"Constant");
+            	              		"com.avaloq.tools.ddk.xtext.format.Format.Constant");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -460,7 +460,7 @@ public final EObject ruleFormatConfiguration() throws RecognitionException {
 
             	    }
 
-            	    otherlv_9=(Token)match(input,18,FOLLOW_18_in_ruleFormatConfiguration279); if (state.failed) return current;
+            	    otherlv_9=(Token)match(input,18,FOLLOW_8); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_9, grammarAccess.getFormatConfigurationAccess().getSemicolonKeyword_5_2());
@@ -475,7 +475,7 @@ public final EObject ruleFormatConfiguration() throws RecognitionException {
                 }
             } while (true);
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:168:3: ( (lv_rules_10_0= ruleRule ) )*
+            // InternalFormat.g:168:3: ( (lv_rules_10_0= ruleRule ) )*
             loop4:
             do {
                 int alt4=2;
@@ -488,17 +488,17 @@ public final EObject ruleFormatConfiguration() throws RecognitionException {
 
                 switch (alt4) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:169:1: (lv_rules_10_0= ruleRule )
+            	    // InternalFormat.g:169:1: (lv_rules_10_0= ruleRule )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:169:1: (lv_rules_10_0= ruleRule )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:170:3: lv_rules_10_0= ruleRule
+            	    // InternalFormat.g:169:1: (lv_rules_10_0= ruleRule )
+            	    // InternalFormat.g:170:3: lv_rules_10_0= ruleRule
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getFormatConfigurationAccess().getRulesRuleParserRuleCall_6_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleRule_in_ruleFormatConfiguration302);
+            	    pushFollow(FOLLOW_11);
             	    lv_rules_10_0=ruleRule();
 
             	    state._fsp--;
@@ -512,7 +512,7 @@ public final EObject ruleFormatConfiguration() throws RecognitionException {
             	             			current, 
             	             			"rules",
             	              		lv_rules_10_0, 
-            	              		"Rule");
+            	              		"com.avaloq.tools.ddk.xtext.format.Format.Rule");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -551,7 +551,7 @@ public final EObject ruleFormatConfiguration() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleConstant"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:194:1: entryRuleConstant returns [EObject current=null] : iv_ruleConstant= ruleConstant EOF ;
+    // InternalFormat.g:194:1: entryRuleConstant returns [EObject current=null] : iv_ruleConstant= ruleConstant EOF ;
     public final EObject entryRuleConstant() throws RecognitionException {
         EObject current = null;
 
@@ -559,13 +559,13 @@ public final EObject entryRuleConstant() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:195:2: (iv_ruleConstant= ruleConstant EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:196:2: iv_ruleConstant= ruleConstant EOF
+            // InternalFormat.g:195:2: (iv_ruleConstant= ruleConstant EOF )
+            // InternalFormat.g:196:2: iv_ruleConstant= ruleConstant EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getConstantRule()); 
             }
-            pushFollow(FOLLOW_ruleConstant_in_entryRuleConstant339);
+            pushFollow(FOLLOW_1);
             iv_ruleConstant=ruleConstant();
 
             state._fsp--;
@@ -573,7 +573,7 @@ public final EObject entryRuleConstant() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleConstant; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleConstant349); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -591,7 +591,7 @@ public final EObject entryRuleConstant() throws RecognitionException {
 
 
     // $ANTLR start "ruleConstant"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:203:1: ruleConstant returns [EObject current=null] : ( ( ( (lv_intType_0_0= 'int' ) ) | ( (lv_stringType_1_0= 'String' ) ) )? ( (lv_name_2_0= RULE_ID ) ) otherlv_3= '=' ( ( (lv_intValue_4_0= ruleIntObject ) ) | ( (lv_stringValue_5_0= RULE_STRING ) ) ) ) ;
+    // InternalFormat.g:203:1: ruleConstant returns [EObject current=null] : ( ( ( (lv_intType_0_0= 'int' ) ) | ( (lv_stringType_1_0= 'String' ) ) )? ( (lv_name_2_0= RULE_ID ) ) otherlv_3= '=' ( ( (lv_intValue_4_0= ruleIntObject ) ) | ( (lv_stringValue_5_0= RULE_STRING ) ) ) ) ;
     public final EObject ruleConstant() throws RecognitionException {
         EObject current = null;
 
@@ -606,13 +606,13 @@ public final EObject ruleConstant() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:206:28: ( ( ( ( (lv_intType_0_0= 'int' ) ) | ( (lv_stringType_1_0= 'String' ) ) )? ( (lv_name_2_0= RULE_ID ) ) otherlv_3= '=' ( ( (lv_intValue_4_0= ruleIntObject ) ) | ( (lv_stringValue_5_0= RULE_STRING ) ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:207:1: ( ( ( (lv_intType_0_0= 'int' ) ) | ( (lv_stringType_1_0= 'String' ) ) )? ( (lv_name_2_0= RULE_ID ) ) otherlv_3= '=' ( ( (lv_intValue_4_0= ruleIntObject ) ) | ( (lv_stringValue_5_0= RULE_STRING ) ) ) )
+            // InternalFormat.g:206:28: ( ( ( ( (lv_intType_0_0= 'int' ) ) | ( (lv_stringType_1_0= 'String' ) ) )? ( (lv_name_2_0= RULE_ID ) ) otherlv_3= '=' ( ( (lv_intValue_4_0= ruleIntObject ) ) | ( (lv_stringValue_5_0= RULE_STRING ) ) ) ) )
+            // InternalFormat.g:207:1: ( ( ( (lv_intType_0_0= 'int' ) ) | ( (lv_stringType_1_0= 'String' ) ) )? ( (lv_name_2_0= RULE_ID ) ) otherlv_3= '=' ( ( (lv_intValue_4_0= ruleIntObject ) ) | ( (lv_stringValue_5_0= RULE_STRING ) ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:207:1: ( ( ( (lv_intType_0_0= 'int' ) ) | ( (lv_stringType_1_0= 'String' ) ) )? ( (lv_name_2_0= RULE_ID ) ) otherlv_3= '=' ( ( (lv_intValue_4_0= ruleIntObject ) ) | ( (lv_stringValue_5_0= RULE_STRING ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:207:2: ( ( (lv_intType_0_0= 'int' ) ) | ( (lv_stringType_1_0= 'String' ) ) )? ( (lv_name_2_0= RULE_ID ) ) otherlv_3= '=' ( ( (lv_intValue_4_0= ruleIntObject ) ) | ( (lv_stringValue_5_0= RULE_STRING ) ) )
+            // InternalFormat.g:207:1: ( ( ( (lv_intType_0_0= 'int' ) ) | ( (lv_stringType_1_0= 'String' ) ) )? ( (lv_name_2_0= RULE_ID ) ) otherlv_3= '=' ( ( (lv_intValue_4_0= ruleIntObject ) ) | ( (lv_stringValue_5_0= RULE_STRING ) ) ) )
+            // InternalFormat.g:207:2: ( ( (lv_intType_0_0= 'int' ) ) | ( (lv_stringType_1_0= 'String' ) ) )? ( (lv_name_2_0= RULE_ID ) ) otherlv_3= '=' ( ( (lv_intValue_4_0= ruleIntObject ) ) | ( (lv_stringValue_5_0= RULE_STRING ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:207:2: ( ( (lv_intType_0_0= 'int' ) ) | ( (lv_stringType_1_0= 'String' ) ) )?
+            // InternalFormat.g:207:2: ( ( (lv_intType_0_0= 'int' ) ) | ( (lv_stringType_1_0= 'String' ) ) )?
             int alt5=3;
             int LA5_0 = input.LA(1);
 
@@ -624,15 +624,15 @@ else if ( (LA5_0==20) ) {
             }
             switch (alt5) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:207:3: ( (lv_intType_0_0= 'int' ) )
+                    // InternalFormat.g:207:3: ( (lv_intType_0_0= 'int' ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:207:3: ( (lv_intType_0_0= 'int' ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:208:1: (lv_intType_0_0= 'int' )
+                    // InternalFormat.g:207:3: ( (lv_intType_0_0= 'int' ) )
+                    // InternalFormat.g:208:1: (lv_intType_0_0= 'int' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:208:1: (lv_intType_0_0= 'int' )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:209:3: lv_intType_0_0= 'int'
+                    // InternalFormat.g:208:1: (lv_intType_0_0= 'int' )
+                    // InternalFormat.g:209:3: lv_intType_0_0= 'int'
                     {
-                    lv_intType_0_0=(Token)match(input,19,FOLLOW_19_in_ruleConstant393); if (state.failed) return current;
+                    lv_intType_0_0=(Token)match(input,19,FOLLOW_12); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_intType_0_0, grammarAccess.getConstantAccess().getIntTypeIntKeyword_0_0_0());
@@ -656,15 +656,15 @@ else if ( (LA5_0==20) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:223:6: ( (lv_stringType_1_0= 'String' ) )
+                    // InternalFormat.g:223:6: ( (lv_stringType_1_0= 'String' ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:223:6: ( (lv_stringType_1_0= 'String' ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:224:1: (lv_stringType_1_0= 'String' )
+                    // InternalFormat.g:223:6: ( (lv_stringType_1_0= 'String' ) )
+                    // InternalFormat.g:224:1: (lv_stringType_1_0= 'String' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:224:1: (lv_stringType_1_0= 'String' )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:225:3: lv_stringType_1_0= 'String'
+                    // InternalFormat.g:224:1: (lv_stringType_1_0= 'String' )
+                    // InternalFormat.g:225:3: lv_stringType_1_0= 'String'
                     {
-                    lv_stringType_1_0=(Token)match(input,20,FOLLOW_20_in_ruleConstant430); if (state.failed) return current;
+                    lv_stringType_1_0=(Token)match(input,20,FOLLOW_12); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_stringType_1_0, grammarAccess.getConstantAccess().getStringTypeStringKeyword_0_1_0());
@@ -690,13 +690,13 @@ else if ( (LA5_0==20) ) {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:238:4: ( (lv_name_2_0= RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:239:1: (lv_name_2_0= RULE_ID )
+            // InternalFormat.g:238:4: ( (lv_name_2_0= RULE_ID ) )
+            // InternalFormat.g:239:1: (lv_name_2_0= RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:239:1: (lv_name_2_0= RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:240:3: lv_name_2_0= RULE_ID
+            // InternalFormat.g:239:1: (lv_name_2_0= RULE_ID )
+            // InternalFormat.g:240:3: lv_name_2_0= RULE_ID
             {
-            lv_name_2_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleConstant462); if (state.failed) return current;
+            lv_name_2_0=(Token)match(input,RULE_ID,FOLLOW_13); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(lv_name_2_0, grammarAccess.getConstantAccess().getNameIDTerminalRuleCall_1_0()); 
@@ -711,7 +711,7 @@ else if ( (LA5_0==20) ) {
                      			current, 
                      			"name",
                       		lv_name_2_0, 
-                      		"ID");
+                      		"org.eclipse.xtext.xbase.Xtype.ID");
               	    
             }
 
@@ -720,13 +720,13 @@ else if ( (LA5_0==20) ) {
 
             }
 
-            otherlv_3=(Token)match(input,21,FOLLOW_21_in_ruleConstant479); if (state.failed) return current;
+            otherlv_3=(Token)match(input,21,FOLLOW_14); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_3, grammarAccess.getConstantAccess().getEqualsSignKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:260:1: ( ( (lv_intValue_4_0= ruleIntObject ) ) | ( (lv_stringValue_5_0= RULE_STRING ) ) )
+            // InternalFormat.g:260:1: ( ( (lv_intValue_4_0= ruleIntObject ) ) | ( (lv_stringValue_5_0= RULE_STRING ) ) )
             int alt6=2;
             int LA6_0 = input.LA(1);
 
@@ -745,20 +745,20 @@ else if ( (LA6_0==RULE_STRING) ) {
             }
             switch (alt6) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:260:2: ( (lv_intValue_4_0= ruleIntObject ) )
+                    // InternalFormat.g:260:2: ( (lv_intValue_4_0= ruleIntObject ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:260:2: ( (lv_intValue_4_0= ruleIntObject ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:261:1: (lv_intValue_4_0= ruleIntObject )
+                    // InternalFormat.g:260:2: ( (lv_intValue_4_0= ruleIntObject ) )
+                    // InternalFormat.g:261:1: (lv_intValue_4_0= ruleIntObject )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:261:1: (lv_intValue_4_0= ruleIntObject )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:262:3: lv_intValue_4_0= ruleIntObject
+                    // InternalFormat.g:261:1: (lv_intValue_4_0= ruleIntObject )
+                    // InternalFormat.g:262:3: lv_intValue_4_0= ruleIntObject
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getConstantAccess().getIntValueIntObjectParserRuleCall_3_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleIntObject_in_ruleConstant501);
+                    pushFollow(FOLLOW_2);
                     lv_intValue_4_0=ruleIntObject();
 
                     state._fsp--;
@@ -772,7 +772,7 @@ else if ( (LA6_0==RULE_STRING) ) {
                              			current, 
                              			"intValue",
                               		lv_intValue_4_0, 
-                              		"IntObject");
+                              		"com.avaloq.tools.ddk.xtext.format.Format.IntObject");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -786,15 +786,15 @@ else if ( (LA6_0==RULE_STRING) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:279:6: ( (lv_stringValue_5_0= RULE_STRING ) )
+                    // InternalFormat.g:279:6: ( (lv_stringValue_5_0= RULE_STRING ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:279:6: ( (lv_stringValue_5_0= RULE_STRING ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:280:1: (lv_stringValue_5_0= RULE_STRING )
+                    // InternalFormat.g:279:6: ( (lv_stringValue_5_0= RULE_STRING ) )
+                    // InternalFormat.g:280:1: (lv_stringValue_5_0= RULE_STRING )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:280:1: (lv_stringValue_5_0= RULE_STRING )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:281:3: lv_stringValue_5_0= RULE_STRING
+                    // InternalFormat.g:280:1: (lv_stringValue_5_0= RULE_STRING )
+                    // InternalFormat.g:281:3: lv_stringValue_5_0= RULE_STRING
                     {
-                    lv_stringValue_5_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleConstant524); if (state.failed) return current;
+                    lv_stringValue_5_0=(Token)match(input,RULE_STRING,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			newLeafNode(lv_stringValue_5_0, grammarAccess.getConstantAccess().getStringValueSTRINGTerminalRuleCall_3_1_0()); 
@@ -809,7 +809,7 @@ else if ( (LA6_0==RULE_STRING) ) {
                              			current, 
                              			"stringValue",
                               		lv_stringValue_5_0, 
-                              		"STRING");
+                              		"org.eclipse.xtext.xbase.Xtype.STRING");
                       	    
                     }
 
@@ -847,7 +847,7 @@ else if ( (LA6_0==RULE_STRING) ) {
 
 
     // $ANTLR start "entryRuleIntValue"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:305:1: entryRuleIntValue returns [EObject current=null] : iv_ruleIntValue= ruleIntValue EOF ;
+    // InternalFormat.g:305:1: entryRuleIntValue returns [EObject current=null] : iv_ruleIntValue= ruleIntValue EOF ;
     public final EObject entryRuleIntValue() throws RecognitionException {
         EObject current = null;
 
@@ -855,13 +855,13 @@ public final EObject entryRuleIntValue() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:306:2: (iv_ruleIntValue= ruleIntValue EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:307:2: iv_ruleIntValue= ruleIntValue EOF
+            // InternalFormat.g:306:2: (iv_ruleIntValue= ruleIntValue EOF )
+            // InternalFormat.g:307:2: iv_ruleIntValue= ruleIntValue EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getIntValueRule()); 
             }
-            pushFollow(FOLLOW_ruleIntValue_in_entryRuleIntValue566);
+            pushFollow(FOLLOW_1);
             iv_ruleIntValue=ruleIntValue();
 
             state._fsp--;
@@ -869,7 +869,7 @@ public final EObject entryRuleIntValue() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleIntValue; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIntValue576); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -887,7 +887,7 @@ public final EObject entryRuleIntValue() throws RecognitionException {
 
 
     // $ANTLR start "ruleIntValue"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:314:1: ruleIntValue returns [EObject current=null] : ( ( (lv_literal_0_0= ruleIntObject ) ) | ( ( ruleDottedID ) ) ) ;
+    // InternalFormat.g:314:1: ruleIntValue returns [EObject current=null] : ( ( (lv_literal_0_0= ruleIntObject ) ) | ( ( ruleDottedID ) ) ) ;
     public final EObject ruleIntValue() throws RecognitionException {
         EObject current = null;
 
@@ -897,10 +897,10 @@ public final EObject ruleIntValue() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:317:28: ( ( ( (lv_literal_0_0= ruleIntObject ) ) | ( ( ruleDottedID ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:318:1: ( ( (lv_literal_0_0= ruleIntObject ) ) | ( ( ruleDottedID ) ) )
+            // InternalFormat.g:317:28: ( ( ( (lv_literal_0_0= ruleIntObject ) ) | ( ( ruleDottedID ) ) ) )
+            // InternalFormat.g:318:1: ( ( (lv_literal_0_0= ruleIntObject ) ) | ( ( ruleDottedID ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:318:1: ( ( (lv_literal_0_0= ruleIntObject ) ) | ( ( ruleDottedID ) ) )
+            // InternalFormat.g:318:1: ( ( (lv_literal_0_0= ruleIntObject ) ) | ( ( ruleDottedID ) ) )
             int alt7=2;
             int LA7_0 = input.LA(1);
 
@@ -919,20 +919,20 @@ else if ( (LA7_0==RULE_ID||(LA7_0>=51 && LA7_0<=52)) ) {
             }
             switch (alt7) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:318:2: ( (lv_literal_0_0= ruleIntObject ) )
+                    // InternalFormat.g:318:2: ( (lv_literal_0_0= ruleIntObject ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:318:2: ( (lv_literal_0_0= ruleIntObject ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:319:1: (lv_literal_0_0= ruleIntObject )
+                    // InternalFormat.g:318:2: ( (lv_literal_0_0= ruleIntObject ) )
+                    // InternalFormat.g:319:1: (lv_literal_0_0= ruleIntObject )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:319:1: (lv_literal_0_0= ruleIntObject )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:320:3: lv_literal_0_0= ruleIntObject
+                    // InternalFormat.g:319:1: (lv_literal_0_0= ruleIntObject )
+                    // InternalFormat.g:320:3: lv_literal_0_0= ruleIntObject
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getIntValueAccess().getLiteralIntObjectParserRuleCall_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleIntObject_in_ruleIntValue622);
+                    pushFollow(FOLLOW_2);
                     lv_literal_0_0=ruleIntObject();
 
                     state._fsp--;
@@ -946,7 +946,7 @@ else if ( (LA7_0==RULE_ID||(LA7_0>=51 && LA7_0<=52)) ) {
                              			current, 
                              			"literal",
                               		lv_literal_0_0, 
-                              		"IntObject");
+                              		"com.avaloq.tools.ddk.xtext.format.Format.IntObject");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -960,13 +960,13 @@ else if ( (LA7_0==RULE_ID||(LA7_0>=51 && LA7_0<=52)) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:337:6: ( ( ruleDottedID ) )
+                    // InternalFormat.g:337:6: ( ( ruleDottedID ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:337:6: ( ( ruleDottedID ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:338:1: ( ruleDottedID )
+                    // InternalFormat.g:337:6: ( ( ruleDottedID ) )
+                    // InternalFormat.g:338:1: ( ruleDottedID )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:338:1: ( ruleDottedID )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:339:3: ruleDottedID
+                    // InternalFormat.g:338:1: ( ruleDottedID )
+                    // InternalFormat.g:339:3: ruleDottedID
                     {
                     if ( state.backtracking==0 ) {
 
@@ -980,7 +980,7 @@ else if ( (LA7_0==RULE_ID||(LA7_0>=51 && LA7_0<=52)) ) {
                       	        newCompositeNode(grammarAccess.getIntValueAccess().getReferenceConstantCrossReference_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleDottedID_in_ruleIntValue651);
+                    pushFollow(FOLLOW_2);
                     ruleDottedID();
 
                     state._fsp--;
@@ -1022,7 +1022,7 @@ else if ( (LA7_0==RULE_ID||(LA7_0>=51 && LA7_0<=52)) ) {
 
 
     // $ANTLR start "entryRuleStringValue"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:360:1: entryRuleStringValue returns [EObject current=null] : iv_ruleStringValue= ruleStringValue EOF ;
+    // InternalFormat.g:360:1: entryRuleStringValue returns [EObject current=null] : iv_ruleStringValue= ruleStringValue EOF ;
     public final EObject entryRuleStringValue() throws RecognitionException {
         EObject current = null;
 
@@ -1030,13 +1030,13 @@ public final EObject entryRuleStringValue() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:361:2: (iv_ruleStringValue= ruleStringValue EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:362:2: iv_ruleStringValue= ruleStringValue EOF
+            // InternalFormat.g:361:2: (iv_ruleStringValue= ruleStringValue EOF )
+            // InternalFormat.g:362:2: iv_ruleStringValue= ruleStringValue EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getStringValueRule()); 
             }
-            pushFollow(FOLLOW_ruleStringValue_in_entryRuleStringValue687);
+            pushFollow(FOLLOW_1);
             iv_ruleStringValue=ruleStringValue();
 
             state._fsp--;
@@ -1044,7 +1044,7 @@ public final EObject entryRuleStringValue() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleStringValue; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleStringValue697); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -1062,7 +1062,7 @@ public final EObject entryRuleStringValue() throws RecognitionException {
 
 
     // $ANTLR start "ruleStringValue"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:369:1: ruleStringValue returns [EObject current=null] : ( ( (lv_literal_0_0= RULE_STRING ) ) | ( ( ruleDottedID ) ) ) ;
+    // InternalFormat.g:369:1: ruleStringValue returns [EObject current=null] : ( ( (lv_literal_0_0= RULE_STRING ) ) | ( ( ruleDottedID ) ) ) ;
     public final EObject ruleStringValue() throws RecognitionException {
         EObject current = null;
 
@@ -1071,10 +1071,10 @@ public final EObject ruleStringValue() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:372:28: ( ( ( (lv_literal_0_0= RULE_STRING ) ) | ( ( ruleDottedID ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:373:1: ( ( (lv_literal_0_0= RULE_STRING ) ) | ( ( ruleDottedID ) ) )
+            // InternalFormat.g:372:28: ( ( ( (lv_literal_0_0= RULE_STRING ) ) | ( ( ruleDottedID ) ) ) )
+            // InternalFormat.g:373:1: ( ( (lv_literal_0_0= RULE_STRING ) ) | ( ( ruleDottedID ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:373:1: ( ( (lv_literal_0_0= RULE_STRING ) ) | ( ( ruleDottedID ) ) )
+            // InternalFormat.g:373:1: ( ( (lv_literal_0_0= RULE_STRING ) ) | ( ( ruleDottedID ) ) )
             int alt8=2;
             int LA8_0 = input.LA(1);
 
@@ -1093,15 +1093,15 @@ else if ( (LA8_0==RULE_ID||(LA8_0>=51 && LA8_0<=52)) ) {
             }
             switch (alt8) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:373:2: ( (lv_literal_0_0= RULE_STRING ) )
+                    // InternalFormat.g:373:2: ( (lv_literal_0_0= RULE_STRING ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:373:2: ( (lv_literal_0_0= RULE_STRING ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:374:1: (lv_literal_0_0= RULE_STRING )
+                    // InternalFormat.g:373:2: ( (lv_literal_0_0= RULE_STRING ) )
+                    // InternalFormat.g:374:1: (lv_literal_0_0= RULE_STRING )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:374:1: (lv_literal_0_0= RULE_STRING )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:375:3: lv_literal_0_0= RULE_STRING
+                    // InternalFormat.g:374:1: (lv_literal_0_0= RULE_STRING )
+                    // InternalFormat.g:375:3: lv_literal_0_0= RULE_STRING
                     {
-                    lv_literal_0_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleStringValue739); if (state.failed) return current;
+                    lv_literal_0_0=(Token)match(input,RULE_STRING,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			newLeafNode(lv_literal_0_0, grammarAccess.getStringValueAccess().getLiteralSTRINGTerminalRuleCall_0_0()); 
@@ -1116,7 +1116,7 @@ else if ( (LA8_0==RULE_ID||(LA8_0>=51 && LA8_0<=52)) ) {
                              			current, 
                              			"literal",
                               		lv_literal_0_0, 
-                              		"STRING");
+                              		"org.eclipse.xtext.xbase.Xtype.STRING");
                       	    
                     }
 
@@ -1129,13 +1129,13 @@ else if ( (LA8_0==RULE_ID||(LA8_0>=51 && LA8_0<=52)) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:392:6: ( ( ruleDottedID ) )
+                    // InternalFormat.g:392:6: ( ( ruleDottedID ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:392:6: ( ( ruleDottedID ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:393:1: ( ruleDottedID )
+                    // InternalFormat.g:392:6: ( ( ruleDottedID ) )
+                    // InternalFormat.g:393:1: ( ruleDottedID )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:393:1: ( ruleDottedID )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:394:3: ruleDottedID
+                    // InternalFormat.g:393:1: ( ruleDottedID )
+                    // InternalFormat.g:394:3: ruleDottedID
                     {
                     if ( state.backtracking==0 ) {
 
@@ -1149,7 +1149,7 @@ else if ( (LA8_0==RULE_ID||(LA8_0>=51 && LA8_0<=52)) ) {
                       	        newCompositeNode(grammarAccess.getStringValueAccess().getReferenceConstantCrossReference_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleDottedID_in_ruleStringValue773);
+                    pushFollow(FOLLOW_2);
                     ruleDottedID();
 
                     state._fsp--;
@@ -1191,7 +1191,7 @@ else if ( (LA8_0==RULE_ID||(LA8_0>=51 && LA8_0<=52)) ) {
 
 
     // $ANTLR start "entryRuleRule"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:415:1: entryRuleRule returns [EObject current=null] : iv_ruleRule= ruleRule EOF ;
+    // InternalFormat.g:415:1: entryRuleRule returns [EObject current=null] : iv_ruleRule= ruleRule EOF ;
     public final EObject entryRuleRule() throws RecognitionException {
         EObject current = null;
 
@@ -1199,13 +1199,13 @@ public final EObject entryRuleRule() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:416:2: (iv_ruleRule= ruleRule EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:417:2: iv_ruleRule= ruleRule EOF
+            // InternalFormat.g:416:2: (iv_ruleRule= ruleRule EOF )
+            // InternalFormat.g:417:2: iv_ruleRule= ruleRule EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getRuleRule()); 
             }
-            pushFollow(FOLLOW_ruleRule_in_entryRuleRule809);
+            pushFollow(FOLLOW_1);
             iv_ruleRule=ruleRule();
 
             state._fsp--;
@@ -1213,7 +1213,7 @@ public final EObject entryRuleRule() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleRule; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRule819); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -1231,7 +1231,7 @@ public final EObject entryRuleRule() throws RecognitionException {
 
 
     // $ANTLR start "ruleRule"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:424:1: ruleRule returns [EObject current=null] : (this_WildcardRule_0= ruleWildcardRule | this_GrammarRule_1= ruleGrammarRule ) ;
+    // InternalFormat.g:424:1: ruleRule returns [EObject current=null] : (this_WildcardRule_0= ruleWildcardRule | this_GrammarRule_1= ruleGrammarRule ) ;
     public final EObject ruleRule() throws RecognitionException {
         EObject current = null;
 
@@ -1243,10 +1243,10 @@ public final EObject ruleRule() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:427:28: ( (this_WildcardRule_0= ruleWildcardRule | this_GrammarRule_1= ruleGrammarRule ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:428:1: (this_WildcardRule_0= ruleWildcardRule | this_GrammarRule_1= ruleGrammarRule )
+            // InternalFormat.g:427:28: ( (this_WildcardRule_0= ruleWildcardRule | this_GrammarRule_1= ruleGrammarRule ) )
+            // InternalFormat.g:428:1: (this_WildcardRule_0= ruleWildcardRule | this_GrammarRule_1= ruleGrammarRule )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:428:1: (this_WildcardRule_0= ruleWildcardRule | this_GrammarRule_1= ruleGrammarRule )
+            // InternalFormat.g:428:1: (this_WildcardRule_0= ruleWildcardRule | this_GrammarRule_1= ruleGrammarRule )
             int alt9=2;
             switch ( input.LA(1) ) {
             case 22:
@@ -1288,14 +1288,14 @@ else if ( (LA9_1==RULE_ID) ) {
 
             switch (alt9) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:429:5: this_WildcardRule_0= ruleWildcardRule
+                    // InternalFormat.g:429:5: this_WildcardRule_0= ruleWildcardRule
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getRuleAccess().getWildcardRuleParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleWildcardRule_in_ruleRule866);
+                    pushFollow(FOLLOW_2);
                     this_WildcardRule_0=ruleWildcardRule();
 
                     state._fsp--;
@@ -1310,14 +1310,14 @@ else if ( (LA9_1==RULE_ID) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:439:5: this_GrammarRule_1= ruleGrammarRule
+                    // InternalFormat.g:439:5: this_GrammarRule_1= ruleGrammarRule
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getRuleAccess().getGrammarRuleParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleGrammarRule_in_ruleRule893);
+                    pushFollow(FOLLOW_2);
                     this_GrammarRule_1=ruleGrammarRule();
 
                     state._fsp--;
@@ -1354,7 +1354,7 @@ else if ( (LA9_1==RULE_ID) ) {
 
 
     // $ANTLR start "entryRuleGrammarRule"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:455:1: entryRuleGrammarRule returns [EObject current=null] : iv_ruleGrammarRule= ruleGrammarRule EOF ;
+    // InternalFormat.g:455:1: entryRuleGrammarRule returns [EObject current=null] : iv_ruleGrammarRule= ruleGrammarRule EOF ;
     public final EObject entryRuleGrammarRule() throws RecognitionException {
         EObject current = null;
 
@@ -1362,13 +1362,13 @@ public final EObject entryRuleGrammarRule() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:456:2: (iv_ruleGrammarRule= ruleGrammarRule EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:457:2: iv_ruleGrammarRule= ruleGrammarRule EOF
+            // InternalFormat.g:456:2: (iv_ruleGrammarRule= ruleGrammarRule EOF )
+            // InternalFormat.g:457:2: iv_ruleGrammarRule= ruleGrammarRule EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getGrammarRuleRule()); 
             }
-            pushFollow(FOLLOW_ruleGrammarRule_in_entryRuleGrammarRule928);
+            pushFollow(FOLLOW_1);
             iv_ruleGrammarRule=ruleGrammarRule();
 
             state._fsp--;
@@ -1376,7 +1376,7 @@ public final EObject entryRuleGrammarRule() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleGrammarRule; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleGrammarRule938); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -1394,7 +1394,7 @@ public final EObject entryRuleGrammarRule() throws RecognitionException {
 
 
     // $ANTLR start "ruleGrammarRule"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:464:1: ruleGrammarRule returns [EObject current=null] : ( ( (lv_override_0_0= 'override' ) )? ( (otherlv_1= RULE_ID ) ) otherlv_2= '{' ( ( (lv_directives_3_0= ruleGrammarRuleDirective ) ) | ( (lv_directives_4_0= ruleGroupBlock ) ) )* otherlv_5= '}' ) ;
+    // InternalFormat.g:464:1: ruleGrammarRule returns [EObject current=null] : ( ( (lv_override_0_0= 'override' ) )? ( (otherlv_1= RULE_ID ) ) otherlv_2= '{' ( ( (lv_directives_3_0= ruleGrammarRuleDirective ) ) | ( (lv_directives_4_0= ruleGroupBlock ) ) )* otherlv_5= '}' ) ;
     public final EObject ruleGrammarRule() throws RecognitionException {
         EObject current = null;
 
@@ -1410,13 +1410,13 @@ public final EObject ruleGrammarRule() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:467:28: ( ( ( (lv_override_0_0= 'override' ) )? ( (otherlv_1= RULE_ID ) ) otherlv_2= '{' ( ( (lv_directives_3_0= ruleGrammarRuleDirective ) ) | ( (lv_directives_4_0= ruleGroupBlock ) ) )* otherlv_5= '}' ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:468:1: ( ( (lv_override_0_0= 'override' ) )? ( (otherlv_1= RULE_ID ) ) otherlv_2= '{' ( ( (lv_directives_3_0= ruleGrammarRuleDirective ) ) | ( (lv_directives_4_0= ruleGroupBlock ) ) )* otherlv_5= '}' )
+            // InternalFormat.g:467:28: ( ( ( (lv_override_0_0= 'override' ) )? ( (otherlv_1= RULE_ID ) ) otherlv_2= '{' ( ( (lv_directives_3_0= ruleGrammarRuleDirective ) ) | ( (lv_directives_4_0= ruleGroupBlock ) ) )* otherlv_5= '}' ) )
+            // InternalFormat.g:468:1: ( ( (lv_override_0_0= 'override' ) )? ( (otherlv_1= RULE_ID ) ) otherlv_2= '{' ( ( (lv_directives_3_0= ruleGrammarRuleDirective ) ) | ( (lv_directives_4_0= ruleGroupBlock ) ) )* otherlv_5= '}' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:468:1: ( ( (lv_override_0_0= 'override' ) )? ( (otherlv_1= RULE_ID ) ) otherlv_2= '{' ( ( (lv_directives_3_0= ruleGrammarRuleDirective ) ) | ( (lv_directives_4_0= ruleGroupBlock ) ) )* otherlv_5= '}' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:468:2: ( (lv_override_0_0= 'override' ) )? ( (otherlv_1= RULE_ID ) ) otherlv_2= '{' ( ( (lv_directives_3_0= ruleGrammarRuleDirective ) ) | ( (lv_directives_4_0= ruleGroupBlock ) ) )* otherlv_5= '}'
+            // InternalFormat.g:468:1: ( ( (lv_override_0_0= 'override' ) )? ( (otherlv_1= RULE_ID ) ) otherlv_2= '{' ( ( (lv_directives_3_0= ruleGrammarRuleDirective ) ) | ( (lv_directives_4_0= ruleGroupBlock ) ) )* otherlv_5= '}' )
+            // InternalFormat.g:468:2: ( (lv_override_0_0= 'override' ) )? ( (otherlv_1= RULE_ID ) ) otherlv_2= '{' ( ( (lv_directives_3_0= ruleGrammarRuleDirective ) ) | ( (lv_directives_4_0= ruleGroupBlock ) ) )* otherlv_5= '}'
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:468:2: ( (lv_override_0_0= 'override' ) )?
+            // InternalFormat.g:468:2: ( (lv_override_0_0= 'override' ) )?
             int alt10=2;
             int LA10_0 = input.LA(1);
 
@@ -1425,12 +1425,12 @@ public final EObject ruleGrammarRule() throws RecognitionException {
             }
             switch (alt10) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:469:1: (lv_override_0_0= 'override' )
+                    // InternalFormat.g:469:1: (lv_override_0_0= 'override' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:469:1: (lv_override_0_0= 'override' )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:470:3: lv_override_0_0= 'override'
+                    // InternalFormat.g:469:1: (lv_override_0_0= 'override' )
+                    // InternalFormat.g:470:3: lv_override_0_0= 'override'
                     {
-                    lv_override_0_0=(Token)match(input,22,FOLLOW_22_in_ruleGrammarRule981); if (state.failed) return current;
+                    lv_override_0_0=(Token)match(input,22,FOLLOW_12); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_override_0_0, grammarAccess.getGrammarRuleAccess().getOverrideOverrideKeyword_0_0());
@@ -1453,11 +1453,11 @@ public final EObject ruleGrammarRule() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:483:3: ( (otherlv_1= RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:484:1: (otherlv_1= RULE_ID )
+            // InternalFormat.g:483:3: ( (otherlv_1= RULE_ID ) )
+            // InternalFormat.g:484:1: (otherlv_1= RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:484:1: (otherlv_1= RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:485:3: otherlv_1= RULE_ID
+            // InternalFormat.g:484:1: (otherlv_1= RULE_ID )
+            // InternalFormat.g:485:3: otherlv_1= RULE_ID
             {
             if ( state.backtracking==0 ) {
 
@@ -1466,7 +1466,7 @@ public final EObject ruleGrammarRule() throws RecognitionException {
               	        }
                       
             }
-            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleGrammarRule1015); if (state.failed) return current;
+            otherlv_1=(Token)match(input,RULE_ID,FOLLOW_15); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               		newLeafNode(otherlv_1, grammarAccess.getGrammarRuleAccess().getTargetRuleAbstractRuleCrossReference_1_0()); 
@@ -1478,13 +1478,13 @@ public final EObject ruleGrammarRule() throws RecognitionException {
 
             }
 
-            otherlv_2=(Token)match(input,23,FOLLOW_23_in_ruleGrammarRule1027); if (state.failed) return current;
+            otherlv_2=(Token)match(input,23,FOLLOW_16); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getGrammarRuleAccess().getLeftCurlyBracketKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:500:1: ( ( (lv_directives_3_0= ruleGrammarRuleDirective ) ) | ( (lv_directives_4_0= ruleGroupBlock ) ) )*
+            // InternalFormat.g:500:1: ( ( (lv_directives_3_0= ruleGrammarRuleDirective ) ) | ( (lv_directives_4_0= ruleGroupBlock ) ) )*
             loop11:
             do {
                 int alt11=3;
@@ -1500,20 +1500,20 @@ else if ( (LA11_0==31) ) {
 
                 switch (alt11) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:500:2: ( (lv_directives_3_0= ruleGrammarRuleDirective ) )
+            	    // InternalFormat.g:500:2: ( (lv_directives_3_0= ruleGrammarRuleDirective ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:500:2: ( (lv_directives_3_0= ruleGrammarRuleDirective ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:501:1: (lv_directives_3_0= ruleGrammarRuleDirective )
+            	    // InternalFormat.g:500:2: ( (lv_directives_3_0= ruleGrammarRuleDirective ) )
+            	    // InternalFormat.g:501:1: (lv_directives_3_0= ruleGrammarRuleDirective )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:501:1: (lv_directives_3_0= ruleGrammarRuleDirective )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:502:3: lv_directives_3_0= ruleGrammarRuleDirective
+            	    // InternalFormat.g:501:1: (lv_directives_3_0= ruleGrammarRuleDirective )
+            	    // InternalFormat.g:502:3: lv_directives_3_0= ruleGrammarRuleDirective
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getGrammarRuleAccess().getDirectivesGrammarRuleDirectiveParserRuleCall_3_0_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleGrammarRuleDirective_in_ruleGrammarRule1049);
+            	    pushFollow(FOLLOW_16);
             	    lv_directives_3_0=ruleGrammarRuleDirective();
 
             	    state._fsp--;
@@ -1527,7 +1527,7 @@ else if ( (LA11_0==31) ) {
             	             			current, 
             	             			"directives",
             	              		lv_directives_3_0, 
-            	              		"GrammarRuleDirective");
+            	              		"com.avaloq.tools.ddk.xtext.format.Format.GrammarRuleDirective");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -1541,20 +1541,20 @@ else if ( (LA11_0==31) ) {
             	    }
             	    break;
             	case 2 :
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:519:6: ( (lv_directives_4_0= ruleGroupBlock ) )
+            	    // InternalFormat.g:519:6: ( (lv_directives_4_0= ruleGroupBlock ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:519:6: ( (lv_directives_4_0= ruleGroupBlock ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:520:1: (lv_directives_4_0= ruleGroupBlock )
+            	    // InternalFormat.g:519:6: ( (lv_directives_4_0= ruleGroupBlock ) )
+            	    // InternalFormat.g:520:1: (lv_directives_4_0= ruleGroupBlock )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:520:1: (lv_directives_4_0= ruleGroupBlock )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:521:3: lv_directives_4_0= ruleGroupBlock
+            	    // InternalFormat.g:520:1: (lv_directives_4_0= ruleGroupBlock )
+            	    // InternalFormat.g:521:3: lv_directives_4_0= ruleGroupBlock
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getGrammarRuleAccess().getDirectivesGroupBlockParserRuleCall_3_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleGroupBlock_in_ruleGrammarRule1076);
+            	    pushFollow(FOLLOW_16);
             	    lv_directives_4_0=ruleGroupBlock();
 
             	    state._fsp--;
@@ -1568,7 +1568,7 @@ else if ( (LA11_0==31) ) {
             	             			current, 
             	             			"directives",
             	              		lv_directives_4_0, 
-            	              		"GroupBlock");
+            	              		"com.avaloq.tools.ddk.xtext.format.Format.GroupBlock");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -1587,7 +1587,7 @@ else if ( (LA11_0==31) ) {
                 }
             } while (true);
 
-            otherlv_5=(Token)match(input,24,FOLLOW_24_in_ruleGrammarRule1090); if (state.failed) return current;
+            otherlv_5=(Token)match(input,24,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_5, grammarAccess.getGrammarRuleAccess().getRightCurlyBracketKeyword_4());
@@ -1616,7 +1616,7 @@ else if ( (LA11_0==31) ) {
 
 
     // $ANTLR start "entryRuleWildcardRule"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:549:1: entryRuleWildcardRule returns [EObject current=null] : iv_ruleWildcardRule= ruleWildcardRule EOF ;
+    // InternalFormat.g:549:1: entryRuleWildcardRule returns [EObject current=null] : iv_ruleWildcardRule= ruleWildcardRule EOF ;
     public final EObject entryRuleWildcardRule() throws RecognitionException {
         EObject current = null;
 
@@ -1624,13 +1624,13 @@ public final EObject entryRuleWildcardRule() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:550:2: (iv_ruleWildcardRule= ruleWildcardRule EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:551:2: iv_ruleWildcardRule= ruleWildcardRule EOF
+            // InternalFormat.g:550:2: (iv_ruleWildcardRule= ruleWildcardRule EOF )
+            // InternalFormat.g:551:2: iv_ruleWildcardRule= ruleWildcardRule EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getWildcardRuleRule()); 
             }
-            pushFollow(FOLLOW_ruleWildcardRule_in_entryRuleWildcardRule1126);
+            pushFollow(FOLLOW_1);
             iv_ruleWildcardRule=ruleWildcardRule();
 
             state._fsp--;
@@ -1638,7 +1638,7 @@ public final EObject entryRuleWildcardRule() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleWildcardRule; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleWildcardRule1136); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -1656,7 +1656,7 @@ public final EObject entryRuleWildcardRule() throws RecognitionException {
 
 
     // $ANTLR start "ruleWildcardRule"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:558:1: ruleWildcardRule returns [EObject current=null] : ( () ( (lv_override_1_0= 'override' ) )? otherlv_2= '*' otherlv_3= '{' ( (lv_directives_4_0= ruleWildcardRuleDirective ) )* otherlv_5= '}' ) ;
+    // InternalFormat.g:558:1: ruleWildcardRule returns [EObject current=null] : ( () ( (lv_override_1_0= 'override' ) )? otherlv_2= '*' otherlv_3= '{' ( (lv_directives_4_0= ruleWildcardRuleDirective ) )* otherlv_5= '}' ) ;
     public final EObject ruleWildcardRule() throws RecognitionException {
         EObject current = null;
 
@@ -1670,14 +1670,14 @@ public final EObject ruleWildcardRule() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:561:28: ( ( () ( (lv_override_1_0= 'override' ) )? otherlv_2= '*' otherlv_3= '{' ( (lv_directives_4_0= ruleWildcardRuleDirective ) )* otherlv_5= '}' ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:562:1: ( () ( (lv_override_1_0= 'override' ) )? otherlv_2= '*' otherlv_3= '{' ( (lv_directives_4_0= ruleWildcardRuleDirective ) )* otherlv_5= '}' )
+            // InternalFormat.g:561:28: ( ( () ( (lv_override_1_0= 'override' ) )? otherlv_2= '*' otherlv_3= '{' ( (lv_directives_4_0= ruleWildcardRuleDirective ) )* otherlv_5= '}' ) )
+            // InternalFormat.g:562:1: ( () ( (lv_override_1_0= 'override' ) )? otherlv_2= '*' otherlv_3= '{' ( (lv_directives_4_0= ruleWildcardRuleDirective ) )* otherlv_5= '}' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:562:1: ( () ( (lv_override_1_0= 'override' ) )? otherlv_2= '*' otherlv_3= '{' ( (lv_directives_4_0= ruleWildcardRuleDirective ) )* otherlv_5= '}' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:562:2: () ( (lv_override_1_0= 'override' ) )? otherlv_2= '*' otherlv_3= '{' ( (lv_directives_4_0= ruleWildcardRuleDirective ) )* otherlv_5= '}'
+            // InternalFormat.g:562:1: ( () ( (lv_override_1_0= 'override' ) )? otherlv_2= '*' otherlv_3= '{' ( (lv_directives_4_0= ruleWildcardRuleDirective ) )* otherlv_5= '}' )
+            // InternalFormat.g:562:2: () ( (lv_override_1_0= 'override' ) )? otherlv_2= '*' otherlv_3= '{' ( (lv_directives_4_0= ruleWildcardRuleDirective ) )* otherlv_5= '}'
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:562:2: ()
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:563:5: 
+            // InternalFormat.g:562:2: ()
+            // InternalFormat.g:563:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -1689,7 +1689,7 @@ public final EObject ruleWildcardRule() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:568:2: ( (lv_override_1_0= 'override' ) )?
+            // InternalFormat.g:568:2: ( (lv_override_1_0= 'override' ) )?
             int alt12=2;
             int LA12_0 = input.LA(1);
 
@@ -1698,12 +1698,12 @@ public final EObject ruleWildcardRule() throws RecognitionException {
             }
             switch (alt12) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:569:1: (lv_override_1_0= 'override' )
+                    // InternalFormat.g:569:1: (lv_override_1_0= 'override' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:569:1: (lv_override_1_0= 'override' )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:570:3: lv_override_1_0= 'override'
+                    // InternalFormat.g:569:1: (lv_override_1_0= 'override' )
+                    // InternalFormat.g:570:3: lv_override_1_0= 'override'
                     {
-                    lv_override_1_0=(Token)match(input,22,FOLLOW_22_in_ruleWildcardRule1188); if (state.failed) return current;
+                    lv_override_1_0=(Token)match(input,22,FOLLOW_17); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_override_1_0, grammarAccess.getWildcardRuleAccess().getOverrideOverrideKeyword_1_0());
@@ -1726,19 +1726,19 @@ public final EObject ruleWildcardRule() throws RecognitionException {
 
             }
 
-            otherlv_2=(Token)match(input,25,FOLLOW_25_in_ruleWildcardRule1214); if (state.failed) return current;
+            otherlv_2=(Token)match(input,25,FOLLOW_15); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getWildcardRuleAccess().getAsteriskKeyword_2());
                   
             }
-            otherlv_3=(Token)match(input,23,FOLLOW_23_in_ruleWildcardRule1226); if (state.failed) return current;
+            otherlv_3=(Token)match(input,23,FOLLOW_18); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_3, grammarAccess.getWildcardRuleAccess().getLeftCurlyBracketKeyword_3());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:591:1: ( (lv_directives_4_0= ruleWildcardRuleDirective ) )*
+            // InternalFormat.g:591:1: ( (lv_directives_4_0= ruleWildcardRuleDirective ) )*
             loop13:
             do {
                 int alt13=2;
@@ -1751,17 +1751,17 @@ public final EObject ruleWildcardRule() throws RecognitionException {
 
                 switch (alt13) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:592:1: (lv_directives_4_0= ruleWildcardRuleDirective )
+            	    // InternalFormat.g:592:1: (lv_directives_4_0= ruleWildcardRuleDirective )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:592:1: (lv_directives_4_0= ruleWildcardRuleDirective )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:593:3: lv_directives_4_0= ruleWildcardRuleDirective
+            	    // InternalFormat.g:592:1: (lv_directives_4_0= ruleWildcardRuleDirective )
+            	    // InternalFormat.g:593:3: lv_directives_4_0= ruleWildcardRuleDirective
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getWildcardRuleAccess().getDirectivesWildcardRuleDirectiveParserRuleCall_4_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleWildcardRuleDirective_in_ruleWildcardRule1247);
+            	    pushFollow(FOLLOW_18);
             	    lv_directives_4_0=ruleWildcardRuleDirective();
 
             	    state._fsp--;
@@ -1775,7 +1775,7 @@ public final EObject ruleWildcardRule() throws RecognitionException {
             	             			current, 
             	             			"directives",
             	              		lv_directives_4_0, 
-            	              		"WildcardRuleDirective");
+            	              		"com.avaloq.tools.ddk.xtext.format.Format.WildcardRuleDirective");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -1791,7 +1791,7 @@ public final EObject ruleWildcardRule() throws RecognitionException {
                 }
             } while (true);
 
-            otherlv_5=(Token)match(input,24,FOLLOW_24_in_ruleWildcardRule1260); if (state.failed) return current;
+            otherlv_5=(Token)match(input,24,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_5, grammarAccess.getWildcardRuleAccess().getRightCurlyBracketKeyword_5());
@@ -1820,7 +1820,7 @@ public final EObject ruleWildcardRule() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleGrammarRuleDirective"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:621:1: entryRuleGrammarRuleDirective returns [EObject current=null] : iv_ruleGrammarRuleDirective= ruleGrammarRuleDirective EOF ;
+    // InternalFormat.g:621:1: entryRuleGrammarRuleDirective returns [EObject current=null] : iv_ruleGrammarRuleDirective= ruleGrammarRuleDirective EOF ;
     public final EObject entryRuleGrammarRuleDirective() throws RecognitionException {
         EObject current = null;
 
@@ -1828,13 +1828,13 @@ public final EObject entryRuleGrammarRuleDirective() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:622:2: (iv_ruleGrammarRuleDirective= ruleGrammarRuleDirective EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:623:2: iv_ruleGrammarRuleDirective= ruleGrammarRuleDirective EOF
+            // InternalFormat.g:622:2: (iv_ruleGrammarRuleDirective= ruleGrammarRuleDirective EOF )
+            // InternalFormat.g:623:2: iv_ruleGrammarRuleDirective= ruleGrammarRuleDirective EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getGrammarRuleDirectiveRule()); 
             }
-            pushFollow(FOLLOW_ruleGrammarRuleDirective_in_entryRuleGrammarRuleDirective1296);
+            pushFollow(FOLLOW_1);
             iv_ruleGrammarRuleDirective=ruleGrammarRuleDirective();
 
             state._fsp--;
@@ -1842,7 +1842,7 @@ public final EObject entryRuleGrammarRuleDirective() throws RecognitionException
             if ( state.backtracking==0 ) {
                current =iv_ruleGrammarRuleDirective; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleGrammarRuleDirective1306); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -1860,7 +1860,7 @@ public final EObject entryRuleGrammarRuleDirective() throws RecognitionException
 
 
     // $ANTLR start "ruleGrammarRuleDirective"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:630:1: ruleGrammarRuleDirective returns [EObject current=null] : (this_SpecificDirective_0= ruleSpecificDirective | this_ContextFreeDirective_1= ruleContextFreeDirective | this_KeywordPair_2= ruleKeywordPair ) ;
+    // InternalFormat.g:630:1: ruleGrammarRuleDirective returns [EObject current=null] : (this_SpecificDirective_0= ruleSpecificDirective | this_ContextFreeDirective_1= ruleContextFreeDirective | this_KeywordPair_2= ruleKeywordPair ) ;
     public final EObject ruleGrammarRuleDirective() throws RecognitionException {
         EObject current = null;
 
@@ -1874,10 +1874,10 @@ public final EObject ruleGrammarRuleDirective() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:633:28: ( (this_SpecificDirective_0= ruleSpecificDirective | this_ContextFreeDirective_1= ruleContextFreeDirective | this_KeywordPair_2= ruleKeywordPair ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:634:1: (this_SpecificDirective_0= ruleSpecificDirective | this_ContextFreeDirective_1= ruleContextFreeDirective | this_KeywordPair_2= ruleKeywordPair )
+            // InternalFormat.g:633:28: ( (this_SpecificDirective_0= ruleSpecificDirective | this_ContextFreeDirective_1= ruleContextFreeDirective | this_KeywordPair_2= ruleKeywordPair ) )
+            // InternalFormat.g:634:1: (this_SpecificDirective_0= ruleSpecificDirective | this_ContextFreeDirective_1= ruleContextFreeDirective | this_KeywordPair_2= ruleKeywordPair )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:634:1: (this_SpecificDirective_0= ruleSpecificDirective | this_ContextFreeDirective_1= ruleContextFreeDirective | this_KeywordPair_2= ruleKeywordPair )
+            // InternalFormat.g:634:1: (this_SpecificDirective_0= ruleSpecificDirective | this_ContextFreeDirective_1= ruleContextFreeDirective | this_KeywordPair_2= ruleKeywordPair )
             int alt14=3;
             switch ( input.LA(1) ) {
             case RULE_ID:
@@ -1911,14 +1911,14 @@ public final EObject ruleGrammarRuleDirective() throws RecognitionException {
 
             switch (alt14) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:635:5: this_SpecificDirective_0= ruleSpecificDirective
+                    // InternalFormat.g:635:5: this_SpecificDirective_0= ruleSpecificDirective
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getGrammarRuleDirectiveAccess().getSpecificDirectiveParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleSpecificDirective_in_ruleGrammarRuleDirective1353);
+                    pushFollow(FOLLOW_2);
                     this_SpecificDirective_0=ruleSpecificDirective();
 
                     state._fsp--;
@@ -1933,14 +1933,14 @@ public final EObject ruleGrammarRuleDirective() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:645:5: this_ContextFreeDirective_1= ruleContextFreeDirective
+                    // InternalFormat.g:645:5: this_ContextFreeDirective_1= ruleContextFreeDirective
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getGrammarRuleDirectiveAccess().getContextFreeDirectiveParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleContextFreeDirective_in_ruleGrammarRuleDirective1380);
+                    pushFollow(FOLLOW_2);
                     this_ContextFreeDirective_1=ruleContextFreeDirective();
 
                     state._fsp--;
@@ -1955,14 +1955,14 @@ public final EObject ruleGrammarRuleDirective() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:655:5: this_KeywordPair_2= ruleKeywordPair
+                    // InternalFormat.g:655:5: this_KeywordPair_2= ruleKeywordPair
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getGrammarRuleDirectiveAccess().getKeywordPairParserRuleCall_2()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleKeywordPair_in_ruleGrammarRuleDirective1407);
+                    pushFollow(FOLLOW_2);
                     this_KeywordPair_2=ruleKeywordPair();
 
                     state._fsp--;
@@ -1999,7 +1999,7 @@ public final EObject ruleGrammarRuleDirective() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleWildcardRuleDirective"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:671:1: entryRuleWildcardRuleDirective returns [EObject current=null] : iv_ruleWildcardRuleDirective= ruleWildcardRuleDirective EOF ;
+    // InternalFormat.g:671:1: entryRuleWildcardRuleDirective returns [EObject current=null] : iv_ruleWildcardRuleDirective= ruleWildcardRuleDirective EOF ;
     public final EObject entryRuleWildcardRuleDirective() throws RecognitionException {
         EObject current = null;
 
@@ -2007,13 +2007,13 @@ public final EObject entryRuleWildcardRuleDirective() throws RecognitionExceptio
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:672:2: (iv_ruleWildcardRuleDirective= ruleWildcardRuleDirective EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:673:2: iv_ruleWildcardRuleDirective= ruleWildcardRuleDirective EOF
+            // InternalFormat.g:672:2: (iv_ruleWildcardRuleDirective= ruleWildcardRuleDirective EOF )
+            // InternalFormat.g:673:2: iv_ruleWildcardRuleDirective= ruleWildcardRuleDirective EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getWildcardRuleDirectiveRule()); 
             }
-            pushFollow(FOLLOW_ruleWildcardRuleDirective_in_entryRuleWildcardRuleDirective1442);
+            pushFollow(FOLLOW_1);
             iv_ruleWildcardRuleDirective=ruleWildcardRuleDirective();
 
             state._fsp--;
@@ -2021,7 +2021,7 @@ public final EObject entryRuleWildcardRuleDirective() throws RecognitionExceptio
             if ( state.backtracking==0 ) {
                current =iv_ruleWildcardRuleDirective; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleWildcardRuleDirective1452); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -2039,7 +2039,7 @@ public final EObject entryRuleWildcardRuleDirective() throws RecognitionExceptio
 
 
     // $ANTLR start "ruleWildcardRuleDirective"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:680:1: ruleWildcardRuleDirective returns [EObject current=null] : (this_ContextFreeDirective_0= ruleContextFreeDirective | this_KeywordPair_1= ruleKeywordPair ) ;
+    // InternalFormat.g:680:1: ruleWildcardRuleDirective returns [EObject current=null] : (this_ContextFreeDirective_0= ruleContextFreeDirective | this_KeywordPair_1= ruleKeywordPair ) ;
     public final EObject ruleWildcardRuleDirective() throws RecognitionException {
         EObject current = null;
 
@@ -2051,10 +2051,10 @@ public final EObject ruleWildcardRuleDirective() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:683:28: ( (this_ContextFreeDirective_0= ruleContextFreeDirective | this_KeywordPair_1= ruleKeywordPair ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:684:1: (this_ContextFreeDirective_0= ruleContextFreeDirective | this_KeywordPair_1= ruleKeywordPair )
+            // InternalFormat.g:683:28: ( (this_ContextFreeDirective_0= ruleContextFreeDirective | this_KeywordPair_1= ruleKeywordPair ) )
+            // InternalFormat.g:684:1: (this_ContextFreeDirective_0= ruleContextFreeDirective | this_KeywordPair_1= ruleKeywordPair )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:684:1: (this_ContextFreeDirective_0= ruleContextFreeDirective | this_KeywordPair_1= ruleKeywordPair )
+            // InternalFormat.g:684:1: (this_ContextFreeDirective_0= ruleContextFreeDirective | this_KeywordPair_1= ruleKeywordPair )
             int alt15=2;
             int LA15_0 = input.LA(1);
 
@@ -2073,14 +2073,14 @@ else if ( (LA15_0==33) ) {
             }
             switch (alt15) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:685:5: this_ContextFreeDirective_0= ruleContextFreeDirective
+                    // InternalFormat.g:685:5: this_ContextFreeDirective_0= ruleContextFreeDirective
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getWildcardRuleDirectiveAccess().getContextFreeDirectiveParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleContextFreeDirective_in_ruleWildcardRuleDirective1499);
+                    pushFollow(FOLLOW_2);
                     this_ContextFreeDirective_0=ruleContextFreeDirective();
 
                     state._fsp--;
@@ -2095,14 +2095,14 @@ else if ( (LA15_0==33) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:695:5: this_KeywordPair_1= ruleKeywordPair
+                    // InternalFormat.g:695:5: this_KeywordPair_1= ruleKeywordPair
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getWildcardRuleDirectiveAccess().getKeywordPairParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleKeywordPair_in_ruleWildcardRuleDirective1526);
+                    pushFollow(FOLLOW_2);
                     this_KeywordPair_1=ruleKeywordPair();
 
                     state._fsp--;
@@ -2139,7 +2139,7 @@ else if ( (LA15_0==33) ) {
 
 
     // $ANTLR start "entryRuleGrammarElementReference"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:711:1: entryRuleGrammarElementReference returns [EObject current=null] : iv_ruleGrammarElementReference= ruleGrammarElementReference EOF ;
+    // InternalFormat.g:711:1: entryRuleGrammarElementReference returns [EObject current=null] : iv_ruleGrammarElementReference= ruleGrammarElementReference EOF ;
     public final EObject entryRuleGrammarElementReference() throws RecognitionException {
         EObject current = null;
 
@@ -2147,13 +2147,13 @@ public final EObject entryRuleGrammarElementReference() throws RecognitionExcept
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:712:2: (iv_ruleGrammarElementReference= ruleGrammarElementReference EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:713:2: iv_ruleGrammarElementReference= ruleGrammarElementReference EOF
+            // InternalFormat.g:712:2: (iv_ruleGrammarElementReference= ruleGrammarElementReference EOF )
+            // InternalFormat.g:713:2: iv_ruleGrammarElementReference= ruleGrammarElementReference EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getGrammarElementReferenceRule()); 
             }
-            pushFollow(FOLLOW_ruleGrammarElementReference_in_entryRuleGrammarElementReference1561);
+            pushFollow(FOLLOW_1);
             iv_ruleGrammarElementReference=ruleGrammarElementReference();
 
             state._fsp--;
@@ -2161,7 +2161,7 @@ public final EObject entryRuleGrammarElementReference() throws RecognitionExcept
             if ( state.backtracking==0 ) {
                current =iv_ruleGrammarElementReference; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleGrammarElementReference1571); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -2179,7 +2179,7 @@ public final EObject entryRuleGrammarElementReference() throws RecognitionExcept
 
 
     // $ANTLR start "ruleGrammarElementReference"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:720:1: ruleGrammarElementReference returns [EObject current=null] : ( (otherlv_0= '=' ( ( ruleParameterizedIdentifier ) ) ) | (otherlv_2= '@' ( ( ruleParameterizedIdentifier ) ) ) | ( ( ruleRuleSelfIdentifier ) ) | ( ( ruleIdentifier ) ) | ( ( ruleParameterizedString ) ) ) ;
+    // InternalFormat.g:720:1: ruleGrammarElementReference returns [EObject current=null] : ( (otherlv_0= '=' ( ( ruleParameterizedIdentifier ) ) ) | (otherlv_2= '@' ( ( ruleParameterizedIdentifier ) ) ) | ( ( ruleRuleSelfIdentifier ) ) | ( ( ruleIdentifier ) ) | ( ( ruleParameterizedString ) ) ) ;
     public final EObject ruleGrammarElementReference() throws RecognitionException {
         EObject current = null;
 
@@ -2189,10 +2189,10 @@ public final EObject ruleGrammarElementReference() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:723:28: ( ( (otherlv_0= '=' ( ( ruleParameterizedIdentifier ) ) ) | (otherlv_2= '@' ( ( ruleParameterizedIdentifier ) ) ) | ( ( ruleRuleSelfIdentifier ) ) | ( ( ruleIdentifier ) ) | ( ( ruleParameterizedString ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:724:1: ( (otherlv_0= '=' ( ( ruleParameterizedIdentifier ) ) ) | (otherlv_2= '@' ( ( ruleParameterizedIdentifier ) ) ) | ( ( ruleRuleSelfIdentifier ) ) | ( ( ruleIdentifier ) ) | ( ( ruleParameterizedString ) ) )
+            // InternalFormat.g:723:28: ( ( (otherlv_0= '=' ( ( ruleParameterizedIdentifier ) ) ) | (otherlv_2= '@' ( ( ruleParameterizedIdentifier ) ) ) | ( ( ruleRuleSelfIdentifier ) ) | ( ( ruleIdentifier ) ) | ( ( ruleParameterizedString ) ) ) )
+            // InternalFormat.g:724:1: ( (otherlv_0= '=' ( ( ruleParameterizedIdentifier ) ) ) | (otherlv_2= '@' ( ( ruleParameterizedIdentifier ) ) ) | ( ( ruleRuleSelfIdentifier ) ) | ( ( ruleIdentifier ) ) | ( ( ruleParameterizedString ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:724:1: ( (otherlv_0= '=' ( ( ruleParameterizedIdentifier ) ) ) | (otherlv_2= '@' ( ( ruleParameterizedIdentifier ) ) ) | ( ( ruleRuleSelfIdentifier ) ) | ( ( ruleIdentifier ) ) | ( ( ruleParameterizedString ) ) )
+            // InternalFormat.g:724:1: ( (otherlv_0= '=' ( ( ruleParameterizedIdentifier ) ) ) | (otherlv_2= '@' ( ( ruleParameterizedIdentifier ) ) ) | ( ( ruleRuleSelfIdentifier ) ) | ( ( ruleIdentifier ) ) | ( ( ruleParameterizedString ) ) )
             int alt16=5;
             switch ( input.LA(1) ) {
             case 21:
@@ -2232,22 +2232,22 @@ public final EObject ruleGrammarElementReference() throws RecognitionException {
 
             switch (alt16) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:724:2: (otherlv_0= '=' ( ( ruleParameterizedIdentifier ) ) )
+                    // InternalFormat.g:724:2: (otherlv_0= '=' ( ( ruleParameterizedIdentifier ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:724:2: (otherlv_0= '=' ( ( ruleParameterizedIdentifier ) ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:724:4: otherlv_0= '=' ( ( ruleParameterizedIdentifier ) )
+                    // InternalFormat.g:724:2: (otherlv_0= '=' ( ( ruleParameterizedIdentifier ) ) )
+                    // InternalFormat.g:724:4: otherlv_0= '=' ( ( ruleParameterizedIdentifier ) )
                     {
-                    otherlv_0=(Token)match(input,21,FOLLOW_21_in_ruleGrammarElementReference1609); if (state.failed) return current;
+                    otherlv_0=(Token)match(input,21,FOLLOW_4); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_0, grammarAccess.getGrammarElementReferenceAccess().getEqualsSignKeyword_0_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:728:1: ( ( ruleParameterizedIdentifier ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:729:1: ( ruleParameterizedIdentifier )
+                    // InternalFormat.g:728:1: ( ( ruleParameterizedIdentifier ) )
+                    // InternalFormat.g:729:1: ( ruleParameterizedIdentifier )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:729:1: ( ruleParameterizedIdentifier )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:730:3: ruleParameterizedIdentifier
+                    // InternalFormat.g:729:1: ( ruleParameterizedIdentifier )
+                    // InternalFormat.g:730:3: ruleParameterizedIdentifier
                     {
                     if ( state.backtracking==0 ) {
 
@@ -2261,7 +2261,7 @@ public final EObject ruleGrammarElementReference() throws RecognitionException {
                       	        newCompositeNode(grammarAccess.getGrammarElementReferenceAccess().getAssignmentAssignmentCrossReference_0_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleParameterizedIdentifier_in_ruleGrammarElementReference1632);
+                    pushFollow(FOLLOW_2);
                     ruleParameterizedIdentifier();
 
                     state._fsp--;
@@ -2284,22 +2284,22 @@ public final EObject ruleGrammarElementReference() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:744:6: (otherlv_2= '@' ( ( ruleParameterizedIdentifier ) ) )
+                    // InternalFormat.g:744:6: (otherlv_2= '@' ( ( ruleParameterizedIdentifier ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:744:6: (otherlv_2= '@' ( ( ruleParameterizedIdentifier ) ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:744:8: otherlv_2= '@' ( ( ruleParameterizedIdentifier ) )
+                    // InternalFormat.g:744:6: (otherlv_2= '@' ( ( ruleParameterizedIdentifier ) ) )
+                    // InternalFormat.g:744:8: otherlv_2= '@' ( ( ruleParameterizedIdentifier ) )
                     {
-                    otherlv_2=(Token)match(input,26,FOLLOW_26_in_ruleGrammarElementReference1652); if (state.failed) return current;
+                    otherlv_2=(Token)match(input,26,FOLLOW_4); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_2, grammarAccess.getGrammarElementReferenceAccess().getCommercialAtKeyword_1_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:748:1: ( ( ruleParameterizedIdentifier ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:749:1: ( ruleParameterizedIdentifier )
+                    // InternalFormat.g:748:1: ( ( ruleParameterizedIdentifier ) )
+                    // InternalFormat.g:749:1: ( ruleParameterizedIdentifier )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:749:1: ( ruleParameterizedIdentifier )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:750:3: ruleParameterizedIdentifier
+                    // InternalFormat.g:749:1: ( ruleParameterizedIdentifier )
+                    // InternalFormat.g:750:3: ruleParameterizedIdentifier
                     {
                     if ( state.backtracking==0 ) {
 
@@ -2313,7 +2313,7 @@ public final EObject ruleGrammarElementReference() throws RecognitionException {
                       	        newCompositeNode(grammarAccess.getGrammarElementReferenceAccess().getRuleCallRuleCallCrossReference_1_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleParameterizedIdentifier_in_ruleGrammarElementReference1675);
+                    pushFollow(FOLLOW_2);
                     ruleParameterizedIdentifier();
 
                     state._fsp--;
@@ -2336,13 +2336,13 @@ public final EObject ruleGrammarElementReference() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:764:6: ( ( ruleRuleSelfIdentifier ) )
+                    // InternalFormat.g:764:6: ( ( ruleRuleSelfIdentifier ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:764:6: ( ( ruleRuleSelfIdentifier ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:765:1: ( ruleRuleSelfIdentifier )
+                    // InternalFormat.g:764:6: ( ( ruleRuleSelfIdentifier ) )
+                    // InternalFormat.g:765:1: ( ruleRuleSelfIdentifier )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:765:1: ( ruleRuleSelfIdentifier )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:766:3: ruleRuleSelfIdentifier
+                    // InternalFormat.g:765:1: ( ruleRuleSelfIdentifier )
+                    // InternalFormat.g:766:3: ruleRuleSelfIdentifier
                     {
                     if ( state.backtracking==0 ) {
 
@@ -2356,7 +2356,7 @@ public final EObject ruleGrammarElementReference() throws RecognitionException {
                       	        newCompositeNode(grammarAccess.getGrammarElementReferenceAccess().getSelfAbstractRuleCrossReference_2_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleRuleSelfIdentifier_in_ruleGrammarElementReference1705);
+                    pushFollow(FOLLOW_2);
                     ruleRuleSelfIdentifier();
 
                     state._fsp--;
@@ -2376,13 +2376,13 @@ public final EObject ruleGrammarElementReference() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:780:6: ( ( ruleIdentifier ) )
+                    // InternalFormat.g:780:6: ( ( ruleIdentifier ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:780:6: ( ( ruleIdentifier ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:781:1: ( ruleIdentifier )
+                    // InternalFormat.g:780:6: ( ( ruleIdentifier ) )
+                    // InternalFormat.g:781:1: ( ruleIdentifier )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:781:1: ( ruleIdentifier )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:782:3: ruleIdentifier
+                    // InternalFormat.g:781:1: ( ruleIdentifier )
+                    // InternalFormat.g:782:3: ruleIdentifier
                     {
                     if ( state.backtracking==0 ) {
 
@@ -2396,7 +2396,7 @@ public final EObject ruleGrammarElementReference() throws RecognitionException {
                       	        newCompositeNode(grammarAccess.getGrammarElementReferenceAccess().getRuleAbstractRuleCrossReference_3_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleIdentifier_in_ruleGrammarElementReference1734);
+                    pushFollow(FOLLOW_2);
                     ruleIdentifier();
 
                     state._fsp--;
@@ -2416,13 +2416,13 @@ public final EObject ruleGrammarElementReference() throws RecognitionException {
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:796:6: ( ( ruleParameterizedString ) )
+                    // InternalFormat.g:796:6: ( ( ruleParameterizedString ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:796:6: ( ( ruleParameterizedString ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:797:1: ( ruleParameterizedString )
+                    // InternalFormat.g:796:6: ( ( ruleParameterizedString ) )
+                    // InternalFormat.g:797:1: ( ruleParameterizedString )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:797:1: ( ruleParameterizedString )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:798:3: ruleParameterizedString
+                    // InternalFormat.g:797:1: ( ruleParameterizedString )
+                    // InternalFormat.g:798:3: ruleParameterizedString
                     {
                     if ( state.backtracking==0 ) {
 
@@ -2436,7 +2436,7 @@ public final EObject ruleGrammarElementReference() throws RecognitionException {
                       	        newCompositeNode(grammarAccess.getGrammarElementReferenceAccess().getKeywordKeywordCrossReference_4_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleParameterizedString_in_ruleGrammarElementReference1763);
+                    pushFollow(FOLLOW_2);
                     ruleParameterizedString();
 
                     state._fsp--;
@@ -2478,7 +2478,7 @@ public final EObject ruleGrammarElementReference() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleGrammarElementLookup"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:819:1: entryRuleGrammarElementLookup returns [EObject current=null] : iv_ruleGrammarElementLookup= ruleGrammarElementLookup EOF ;
+    // InternalFormat.g:819:1: entryRuleGrammarElementLookup returns [EObject current=null] : iv_ruleGrammarElementLookup= ruleGrammarElementLookup EOF ;
     public final EObject entryRuleGrammarElementLookup() throws RecognitionException {
         EObject current = null;
 
@@ -2486,13 +2486,13 @@ public final EObject entryRuleGrammarElementLookup() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:820:2: (iv_ruleGrammarElementLookup= ruleGrammarElementLookup EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:821:2: iv_ruleGrammarElementLookup= ruleGrammarElementLookup EOF
+            // InternalFormat.g:820:2: (iv_ruleGrammarElementLookup= ruleGrammarElementLookup EOF )
+            // InternalFormat.g:821:2: iv_ruleGrammarElementLookup= ruleGrammarElementLookup EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getGrammarElementLookupRule()); 
             }
-            pushFollow(FOLLOW_ruleGrammarElementLookup_in_entryRuleGrammarElementLookup1799);
+            pushFollow(FOLLOW_1);
             iv_ruleGrammarElementLookup=ruleGrammarElementLookup();
 
             state._fsp--;
@@ -2500,7 +2500,7 @@ public final EObject entryRuleGrammarElementLookup() throws RecognitionException
             if ( state.backtracking==0 ) {
                current =iv_ruleGrammarElementLookup; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleGrammarElementLookup1809); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -2518,7 +2518,7 @@ public final EObject entryRuleGrammarElementLookup() throws RecognitionException
 
 
     // $ANTLR start "ruleGrammarElementLookup"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:828:1: ruleGrammarElementLookup returns [EObject current=null] : ( ( ( ruleIdentifier ) ) | ( (lv_keyword_1_0= RULE_STRING ) ) ) ;
+    // InternalFormat.g:828:1: ruleGrammarElementLookup returns [EObject current=null] : ( ( ( ruleIdentifier ) ) | ( (lv_keyword_1_0= RULE_STRING ) ) ) ;
     public final EObject ruleGrammarElementLookup() throws RecognitionException {
         EObject current = null;
 
@@ -2527,10 +2527,10 @@ public final EObject ruleGrammarElementLookup() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:831:28: ( ( ( ( ruleIdentifier ) ) | ( (lv_keyword_1_0= RULE_STRING ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:832:1: ( ( ( ruleIdentifier ) ) | ( (lv_keyword_1_0= RULE_STRING ) ) )
+            // InternalFormat.g:831:28: ( ( ( ( ruleIdentifier ) ) | ( (lv_keyword_1_0= RULE_STRING ) ) ) )
+            // InternalFormat.g:832:1: ( ( ( ruleIdentifier ) ) | ( (lv_keyword_1_0= RULE_STRING ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:832:1: ( ( ( ruleIdentifier ) ) | ( (lv_keyword_1_0= RULE_STRING ) ) )
+            // InternalFormat.g:832:1: ( ( ( ruleIdentifier ) ) | ( (lv_keyword_1_0= RULE_STRING ) ) )
             int alt17=2;
             int LA17_0 = input.LA(1);
 
@@ -2549,13 +2549,13 @@ else if ( (LA17_0==RULE_STRING) ) {
             }
             switch (alt17) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:832:2: ( ( ruleIdentifier ) )
+                    // InternalFormat.g:832:2: ( ( ruleIdentifier ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:832:2: ( ( ruleIdentifier ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:833:1: ( ruleIdentifier )
+                    // InternalFormat.g:832:2: ( ( ruleIdentifier ) )
+                    // InternalFormat.g:833:1: ( ruleIdentifier )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:833:1: ( ruleIdentifier )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:834:3: ruleIdentifier
+                    // InternalFormat.g:833:1: ( ruleIdentifier )
+                    // InternalFormat.g:834:3: ruleIdentifier
                     {
                     if ( state.backtracking==0 ) {
 
@@ -2569,7 +2569,7 @@ else if ( (LA17_0==RULE_STRING) ) {
                       	        newCompositeNode(grammarAccess.getGrammarElementLookupAccess().getRuleAbstractRuleCrossReference_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleIdentifier_in_ruleGrammarElementLookup1857);
+                    pushFollow(FOLLOW_2);
                     ruleIdentifier();
 
                     state._fsp--;
@@ -2589,15 +2589,15 @@ else if ( (LA17_0==RULE_STRING) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:848:6: ( (lv_keyword_1_0= RULE_STRING ) )
+                    // InternalFormat.g:848:6: ( (lv_keyword_1_0= RULE_STRING ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:848:6: ( (lv_keyword_1_0= RULE_STRING ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:849:1: (lv_keyword_1_0= RULE_STRING )
+                    // InternalFormat.g:848:6: ( (lv_keyword_1_0= RULE_STRING ) )
+                    // InternalFormat.g:849:1: (lv_keyword_1_0= RULE_STRING )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:849:1: (lv_keyword_1_0= RULE_STRING )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:850:3: lv_keyword_1_0= RULE_STRING
+                    // InternalFormat.g:849:1: (lv_keyword_1_0= RULE_STRING )
+                    // InternalFormat.g:850:3: lv_keyword_1_0= RULE_STRING
                     {
-                    lv_keyword_1_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleGrammarElementLookup1880); if (state.failed) return current;
+                    lv_keyword_1_0=(Token)match(input,RULE_STRING,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			newLeafNode(lv_keyword_1_0, grammarAccess.getGrammarElementLookupAccess().getKeywordSTRINGTerminalRuleCall_1_0()); 
@@ -2612,7 +2612,7 @@ else if ( (LA17_0==RULE_STRING) ) {
                              			current, 
                              			"keyword",
                               		lv_keyword_1_0, 
-                              		"STRING");
+                              		"org.eclipse.xtext.xbase.Xtype.STRING");
                       	    
                     }
 
@@ -2647,7 +2647,7 @@ else if ( (LA17_0==RULE_STRING) ) {
 
 
     // $ANTLR start "entryRuleContextFreeDirective"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:874:1: entryRuleContextFreeDirective returns [EObject current=null] : iv_ruleContextFreeDirective= ruleContextFreeDirective EOF ;
+    // InternalFormat.g:874:1: entryRuleContextFreeDirective returns [EObject current=null] : iv_ruleContextFreeDirective= ruleContextFreeDirective EOF ;
     public final EObject entryRuleContextFreeDirective() throws RecognitionException {
         EObject current = null;
 
@@ -2655,13 +2655,13 @@ public final EObject entryRuleContextFreeDirective() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:875:2: (iv_ruleContextFreeDirective= ruleContextFreeDirective EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:876:2: iv_ruleContextFreeDirective= ruleContextFreeDirective EOF
+            // InternalFormat.g:875:2: (iv_ruleContextFreeDirective= ruleContextFreeDirective EOF )
+            // InternalFormat.g:876:2: iv_ruleContextFreeDirective= ruleContextFreeDirective EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getContextFreeDirectiveRule()); 
             }
-            pushFollow(FOLLOW_ruleContextFreeDirective_in_entryRuleContextFreeDirective1921);
+            pushFollow(FOLLOW_1);
             iv_ruleContextFreeDirective=ruleContextFreeDirective();
 
             state._fsp--;
@@ -2669,7 +2669,7 @@ public final EObject entryRuleContextFreeDirective() throws RecognitionException
             if ( state.backtracking==0 ) {
                current =iv_ruleContextFreeDirective; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleContextFreeDirective1931); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -2687,7 +2687,7 @@ public final EObject entryRuleContextFreeDirective() throws RecognitionException
 
 
     // $ANTLR start "ruleContextFreeDirective"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:883:1: ruleContextFreeDirective returns [EObject current=null] : (otherlv_0= '[' ( (lv_grammarElements_1_0= ruleGrammarElementLookup ) ) (otherlv_2= ',' ( (lv_grammarElements_3_0= ruleGrammarElementLookup ) ) )* otherlv_4= ']' ( (lv_matcherList_5_0= ruleMatcherList ) ) ) ;
+    // InternalFormat.g:883:1: ruleContextFreeDirective returns [EObject current=null] : (otherlv_0= '[' ( (lv_grammarElements_1_0= ruleGrammarElementLookup ) ) (otherlv_2= ',' ( (lv_grammarElements_3_0= ruleGrammarElementLookup ) ) )* otherlv_4= ']' ( (lv_matcherList_5_0= ruleMatcherList ) ) ) ;
     public final EObject ruleContextFreeDirective() throws RecognitionException {
         EObject current = null;
 
@@ -2704,30 +2704,30 @@ public final EObject ruleContextFreeDirective() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:886:28: ( (otherlv_0= '[' ( (lv_grammarElements_1_0= ruleGrammarElementLookup ) ) (otherlv_2= ',' ( (lv_grammarElements_3_0= ruleGrammarElementLookup ) ) )* otherlv_4= ']' ( (lv_matcherList_5_0= ruleMatcherList ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:887:1: (otherlv_0= '[' ( (lv_grammarElements_1_0= ruleGrammarElementLookup ) ) (otherlv_2= ',' ( (lv_grammarElements_3_0= ruleGrammarElementLookup ) ) )* otherlv_4= ']' ( (lv_matcherList_5_0= ruleMatcherList ) ) )
+            // InternalFormat.g:886:28: ( (otherlv_0= '[' ( (lv_grammarElements_1_0= ruleGrammarElementLookup ) ) (otherlv_2= ',' ( (lv_grammarElements_3_0= ruleGrammarElementLookup ) ) )* otherlv_4= ']' ( (lv_matcherList_5_0= ruleMatcherList ) ) ) )
+            // InternalFormat.g:887:1: (otherlv_0= '[' ( (lv_grammarElements_1_0= ruleGrammarElementLookup ) ) (otherlv_2= ',' ( (lv_grammarElements_3_0= ruleGrammarElementLookup ) ) )* otherlv_4= ']' ( (lv_matcherList_5_0= ruleMatcherList ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:887:1: (otherlv_0= '[' ( (lv_grammarElements_1_0= ruleGrammarElementLookup ) ) (otherlv_2= ',' ( (lv_grammarElements_3_0= ruleGrammarElementLookup ) ) )* otherlv_4= ']' ( (lv_matcherList_5_0= ruleMatcherList ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:887:3: otherlv_0= '[' ( (lv_grammarElements_1_0= ruleGrammarElementLookup ) ) (otherlv_2= ',' ( (lv_grammarElements_3_0= ruleGrammarElementLookup ) ) )* otherlv_4= ']' ( (lv_matcherList_5_0= ruleMatcherList ) )
+            // InternalFormat.g:887:1: (otherlv_0= '[' ( (lv_grammarElements_1_0= ruleGrammarElementLookup ) ) (otherlv_2= ',' ( (lv_grammarElements_3_0= ruleGrammarElementLookup ) ) )* otherlv_4= ']' ( (lv_matcherList_5_0= ruleMatcherList ) ) )
+            // InternalFormat.g:887:3: otherlv_0= '[' ( (lv_grammarElements_1_0= ruleGrammarElementLookup ) ) (otherlv_2= ',' ( (lv_grammarElements_3_0= ruleGrammarElementLookup ) ) )* otherlv_4= ']' ( (lv_matcherList_5_0= ruleMatcherList ) )
             {
-            otherlv_0=(Token)match(input,27,FOLLOW_27_in_ruleContextFreeDirective1968); if (state.failed) return current;
+            otherlv_0=(Token)match(input,27,FOLLOW_19); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getContextFreeDirectiveAccess().getLeftSquareBracketKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:891:1: ( (lv_grammarElements_1_0= ruleGrammarElementLookup ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:892:1: (lv_grammarElements_1_0= ruleGrammarElementLookup )
+            // InternalFormat.g:891:1: ( (lv_grammarElements_1_0= ruleGrammarElementLookup ) )
+            // InternalFormat.g:892:1: (lv_grammarElements_1_0= ruleGrammarElementLookup )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:892:1: (lv_grammarElements_1_0= ruleGrammarElementLookup )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:893:3: lv_grammarElements_1_0= ruleGrammarElementLookup
+            // InternalFormat.g:892:1: (lv_grammarElements_1_0= ruleGrammarElementLookup )
+            // InternalFormat.g:893:3: lv_grammarElements_1_0= ruleGrammarElementLookup
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getContextFreeDirectiveAccess().getGrammarElementsGrammarElementLookupParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleGrammarElementLookup_in_ruleContextFreeDirective1989);
+            pushFollow(FOLLOW_20);
             lv_grammarElements_1_0=ruleGrammarElementLookup();
 
             state._fsp--;
@@ -2741,7 +2741,7 @@ public final EObject ruleContextFreeDirective() throws RecognitionException {
                      			current, 
                      			"grammarElements",
                       		lv_grammarElements_1_0, 
-                      		"GrammarElementLookup");
+                      		"com.avaloq.tools.ddk.xtext.format.Format.GrammarElementLookup");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -2751,7 +2751,7 @@ public final EObject ruleContextFreeDirective() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:909:2: (otherlv_2= ',' ( (lv_grammarElements_3_0= ruleGrammarElementLookup ) ) )*
+            // InternalFormat.g:909:2: (otherlv_2= ',' ( (lv_grammarElements_3_0= ruleGrammarElementLookup ) ) )*
             loop18:
             do {
                 int alt18=2;
@@ -2764,26 +2764,26 @@ public final EObject ruleContextFreeDirective() throws RecognitionException {
 
                 switch (alt18) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:909:4: otherlv_2= ',' ( (lv_grammarElements_3_0= ruleGrammarElementLookup ) )
+            	    // InternalFormat.g:909:4: otherlv_2= ',' ( (lv_grammarElements_3_0= ruleGrammarElementLookup ) )
             	    {
-            	    otherlv_2=(Token)match(input,28,FOLLOW_28_in_ruleContextFreeDirective2002); if (state.failed) return current;
+            	    otherlv_2=(Token)match(input,28,FOLLOW_19); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_2, grammarAccess.getContextFreeDirectiveAccess().getCommaKeyword_2_0());
             	          
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:913:1: ( (lv_grammarElements_3_0= ruleGrammarElementLookup ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:914:1: (lv_grammarElements_3_0= ruleGrammarElementLookup )
+            	    // InternalFormat.g:913:1: ( (lv_grammarElements_3_0= ruleGrammarElementLookup ) )
+            	    // InternalFormat.g:914:1: (lv_grammarElements_3_0= ruleGrammarElementLookup )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:914:1: (lv_grammarElements_3_0= ruleGrammarElementLookup )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:915:3: lv_grammarElements_3_0= ruleGrammarElementLookup
+            	    // InternalFormat.g:914:1: (lv_grammarElements_3_0= ruleGrammarElementLookup )
+            	    // InternalFormat.g:915:3: lv_grammarElements_3_0= ruleGrammarElementLookup
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getContextFreeDirectiveAccess().getGrammarElementsGrammarElementLookupParserRuleCall_2_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleGrammarElementLookup_in_ruleContextFreeDirective2023);
+            	    pushFollow(FOLLOW_20);
             	    lv_grammarElements_3_0=ruleGrammarElementLookup();
 
             	    state._fsp--;
@@ -2797,7 +2797,7 @@ public final EObject ruleContextFreeDirective() throws RecognitionException {
             	             			current, 
             	             			"grammarElements",
             	              		lv_grammarElements_3_0, 
-            	              		"GrammarElementLookup");
+            	              		"com.avaloq.tools.ddk.xtext.format.Format.GrammarElementLookup");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -2816,24 +2816,24 @@ public final EObject ruleContextFreeDirective() throws RecognitionException {
                 }
             } while (true);
 
-            otherlv_4=(Token)match(input,29,FOLLOW_29_in_ruleContextFreeDirective2037); if (state.failed) return current;
+            otherlv_4=(Token)match(input,29,FOLLOW_21); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_4, grammarAccess.getContextFreeDirectiveAccess().getRightSquareBracketKeyword_3());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:935:1: ( (lv_matcherList_5_0= ruleMatcherList ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:936:1: (lv_matcherList_5_0= ruleMatcherList )
+            // InternalFormat.g:935:1: ( (lv_matcherList_5_0= ruleMatcherList ) )
+            // InternalFormat.g:936:1: (lv_matcherList_5_0= ruleMatcherList )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:936:1: (lv_matcherList_5_0= ruleMatcherList )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:937:3: lv_matcherList_5_0= ruleMatcherList
+            // InternalFormat.g:936:1: (lv_matcherList_5_0= ruleMatcherList )
+            // InternalFormat.g:937:3: lv_matcherList_5_0= ruleMatcherList
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getContextFreeDirectiveAccess().getMatcherListMatcherListParserRuleCall_4_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleMatcherList_in_ruleContextFreeDirective2058);
+            pushFollow(FOLLOW_2);
             lv_matcherList_5_0=ruleMatcherList();
 
             state._fsp--;
@@ -2847,7 +2847,7 @@ public final EObject ruleContextFreeDirective() throws RecognitionException {
                      			current, 
                      			"matcherList",
                       		lv_matcherList_5_0, 
-                      		"MatcherList");
+                      		"com.avaloq.tools.ddk.xtext.format.Format.MatcherList");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -2880,7 +2880,7 @@ public final EObject ruleContextFreeDirective() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleSpecificDirective"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:961:1: entryRuleSpecificDirective returns [EObject current=null] : iv_ruleSpecificDirective= ruleSpecificDirective EOF ;
+    // InternalFormat.g:961:1: entryRuleSpecificDirective returns [EObject current=null] : iv_ruleSpecificDirective= ruleSpecificDirective EOF ;
     public final EObject entryRuleSpecificDirective() throws RecognitionException {
         EObject current = null;
 
@@ -2888,13 +2888,13 @@ public final EObject entryRuleSpecificDirective() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:962:2: (iv_ruleSpecificDirective= ruleSpecificDirective EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:963:2: iv_ruleSpecificDirective= ruleSpecificDirective EOF
+            // InternalFormat.g:962:2: (iv_ruleSpecificDirective= ruleSpecificDirective EOF )
+            // InternalFormat.g:963:2: iv_ruleSpecificDirective= ruleSpecificDirective EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getSpecificDirectiveRule()); 
             }
-            pushFollow(FOLLOW_ruleSpecificDirective_in_entryRuleSpecificDirective2094);
+            pushFollow(FOLLOW_1);
             iv_ruleSpecificDirective=ruleSpecificDirective();
 
             state._fsp--;
@@ -2902,7 +2902,7 @@ public final EObject entryRuleSpecificDirective() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleSpecificDirective; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSpecificDirective2104); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -2920,7 +2920,7 @@ public final EObject entryRuleSpecificDirective() throws RecognitionException {
 
 
     // $ANTLR start "ruleSpecificDirective"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:970:1: ruleSpecificDirective returns [EObject current=null] : ( ( (lv_grammarElements_0_0= ruleGrammarElementReference ) ) (otherlv_1= ',' ( (lv_grammarElements_2_0= ruleGrammarElementReference ) ) )* ( (lv_matcherList_3_0= ruleMatcherList ) ) ) ;
+    // InternalFormat.g:970:1: ruleSpecificDirective returns [EObject current=null] : ( ( (lv_grammarElements_0_0= ruleGrammarElementReference ) ) (otherlv_1= ',' ( (lv_grammarElements_2_0= ruleGrammarElementReference ) ) )* ( (lv_matcherList_3_0= ruleMatcherList ) ) ) ;
     public final EObject ruleSpecificDirective() throws RecognitionException {
         EObject current = null;
 
@@ -2935,24 +2935,24 @@ public final EObject ruleSpecificDirective() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:973:28: ( ( ( (lv_grammarElements_0_0= ruleGrammarElementReference ) ) (otherlv_1= ',' ( (lv_grammarElements_2_0= ruleGrammarElementReference ) ) )* ( (lv_matcherList_3_0= ruleMatcherList ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:974:1: ( ( (lv_grammarElements_0_0= ruleGrammarElementReference ) ) (otherlv_1= ',' ( (lv_grammarElements_2_0= ruleGrammarElementReference ) ) )* ( (lv_matcherList_3_0= ruleMatcherList ) ) )
+            // InternalFormat.g:973:28: ( ( ( (lv_grammarElements_0_0= ruleGrammarElementReference ) ) (otherlv_1= ',' ( (lv_grammarElements_2_0= ruleGrammarElementReference ) ) )* ( (lv_matcherList_3_0= ruleMatcherList ) ) ) )
+            // InternalFormat.g:974:1: ( ( (lv_grammarElements_0_0= ruleGrammarElementReference ) ) (otherlv_1= ',' ( (lv_grammarElements_2_0= ruleGrammarElementReference ) ) )* ( (lv_matcherList_3_0= ruleMatcherList ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:974:1: ( ( (lv_grammarElements_0_0= ruleGrammarElementReference ) ) (otherlv_1= ',' ( (lv_grammarElements_2_0= ruleGrammarElementReference ) ) )* ( (lv_matcherList_3_0= ruleMatcherList ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:974:2: ( (lv_grammarElements_0_0= ruleGrammarElementReference ) ) (otherlv_1= ',' ( (lv_grammarElements_2_0= ruleGrammarElementReference ) ) )* ( (lv_matcherList_3_0= ruleMatcherList ) )
+            // InternalFormat.g:974:1: ( ( (lv_grammarElements_0_0= ruleGrammarElementReference ) ) (otherlv_1= ',' ( (lv_grammarElements_2_0= ruleGrammarElementReference ) ) )* ( (lv_matcherList_3_0= ruleMatcherList ) ) )
+            // InternalFormat.g:974:2: ( (lv_grammarElements_0_0= ruleGrammarElementReference ) ) (otherlv_1= ',' ( (lv_grammarElements_2_0= ruleGrammarElementReference ) ) )* ( (lv_matcherList_3_0= ruleMatcherList ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:974:2: ( (lv_grammarElements_0_0= ruleGrammarElementReference ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:975:1: (lv_grammarElements_0_0= ruleGrammarElementReference )
+            // InternalFormat.g:974:2: ( (lv_grammarElements_0_0= ruleGrammarElementReference ) )
+            // InternalFormat.g:975:1: (lv_grammarElements_0_0= ruleGrammarElementReference )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:975:1: (lv_grammarElements_0_0= ruleGrammarElementReference )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:976:3: lv_grammarElements_0_0= ruleGrammarElementReference
+            // InternalFormat.g:975:1: (lv_grammarElements_0_0= ruleGrammarElementReference )
+            // InternalFormat.g:976:3: lv_grammarElements_0_0= ruleGrammarElementReference
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getSpecificDirectiveAccess().getGrammarElementsGrammarElementReferenceParserRuleCall_0_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleGrammarElementReference_in_ruleSpecificDirective2150);
+            pushFollow(FOLLOW_22);
             lv_grammarElements_0_0=ruleGrammarElementReference();
 
             state._fsp--;
@@ -2966,7 +2966,7 @@ public final EObject ruleSpecificDirective() throws RecognitionException {
                      			current, 
                      			"grammarElements",
                       		lv_grammarElements_0_0, 
-                      		"GrammarElementReference");
+                      		"com.avaloq.tools.ddk.xtext.format.Format.GrammarElementReference");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -2976,7 +2976,7 @@ public final EObject ruleSpecificDirective() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:992:2: (otherlv_1= ',' ( (lv_grammarElements_2_0= ruleGrammarElementReference ) ) )*
+            // InternalFormat.g:992:2: (otherlv_1= ',' ( (lv_grammarElements_2_0= ruleGrammarElementReference ) ) )*
             loop19:
             do {
                 int alt19=2;
@@ -2989,26 +2989,26 @@ public final EObject ruleSpecificDirective() throws RecognitionException {
 
                 switch (alt19) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:992:4: otherlv_1= ',' ( (lv_grammarElements_2_0= ruleGrammarElementReference ) )
+            	    // InternalFormat.g:992:4: otherlv_1= ',' ( (lv_grammarElements_2_0= ruleGrammarElementReference ) )
             	    {
-            	    otherlv_1=(Token)match(input,28,FOLLOW_28_in_ruleSpecificDirective2163); if (state.failed) return current;
+            	    otherlv_1=(Token)match(input,28,FOLLOW_23); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_1, grammarAccess.getSpecificDirectiveAccess().getCommaKeyword_1_0());
             	          
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:996:1: ( (lv_grammarElements_2_0= ruleGrammarElementReference ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:997:1: (lv_grammarElements_2_0= ruleGrammarElementReference )
+            	    // InternalFormat.g:996:1: ( (lv_grammarElements_2_0= ruleGrammarElementReference ) )
+            	    // InternalFormat.g:997:1: (lv_grammarElements_2_0= ruleGrammarElementReference )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:997:1: (lv_grammarElements_2_0= ruleGrammarElementReference )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:998:3: lv_grammarElements_2_0= ruleGrammarElementReference
+            	    // InternalFormat.g:997:1: (lv_grammarElements_2_0= ruleGrammarElementReference )
+            	    // InternalFormat.g:998:3: lv_grammarElements_2_0= ruleGrammarElementReference
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getSpecificDirectiveAccess().getGrammarElementsGrammarElementReferenceParserRuleCall_1_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleGrammarElementReference_in_ruleSpecificDirective2184);
+            	    pushFollow(FOLLOW_22);
             	    lv_grammarElements_2_0=ruleGrammarElementReference();
 
             	    state._fsp--;
@@ -3022,7 +3022,7 @@ public final EObject ruleSpecificDirective() throws RecognitionException {
             	             			current, 
             	             			"grammarElements",
             	              		lv_grammarElements_2_0, 
-            	              		"GrammarElementReference");
+            	              		"com.avaloq.tools.ddk.xtext.format.Format.GrammarElementReference");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -3041,18 +3041,18 @@ public final EObject ruleSpecificDirective() throws RecognitionException {
                 }
             } while (true);
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1014:4: ( (lv_matcherList_3_0= ruleMatcherList ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1015:1: (lv_matcherList_3_0= ruleMatcherList )
+            // InternalFormat.g:1014:4: ( (lv_matcherList_3_0= ruleMatcherList ) )
+            // InternalFormat.g:1015:1: (lv_matcherList_3_0= ruleMatcherList )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1015:1: (lv_matcherList_3_0= ruleMatcherList )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1016:3: lv_matcherList_3_0= ruleMatcherList
+            // InternalFormat.g:1015:1: (lv_matcherList_3_0= ruleMatcherList )
+            // InternalFormat.g:1016:3: lv_matcherList_3_0= ruleMatcherList
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getSpecificDirectiveAccess().getMatcherListMatcherListParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleMatcherList_in_ruleSpecificDirective2207);
+            pushFollow(FOLLOW_2);
             lv_matcherList_3_0=ruleMatcherList();
 
             state._fsp--;
@@ -3066,7 +3066,7 @@ public final EObject ruleSpecificDirective() throws RecognitionException {
                      			current, 
                      			"matcherList",
                       		lv_matcherList_3_0, 
-                      		"MatcherList");
+                      		"com.avaloq.tools.ddk.xtext.format.Format.MatcherList");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -3099,7 +3099,7 @@ public final EObject ruleSpecificDirective() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleMatcherList"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1040:1: entryRuleMatcherList returns [EObject current=null] : iv_ruleMatcherList= ruleMatcherList EOF ;
+    // InternalFormat.g:1040:1: entryRuleMatcherList returns [EObject current=null] : iv_ruleMatcherList= ruleMatcherList EOF ;
     public final EObject entryRuleMatcherList() throws RecognitionException {
         EObject current = null;
 
@@ -3107,13 +3107,13 @@ public final EObject entryRuleMatcherList() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1041:2: (iv_ruleMatcherList= ruleMatcherList EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1042:2: iv_ruleMatcherList= ruleMatcherList EOF
+            // InternalFormat.g:1041:2: (iv_ruleMatcherList= ruleMatcherList EOF )
+            // InternalFormat.g:1042:2: iv_ruleMatcherList= ruleMatcherList EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getMatcherListRule()); 
             }
-            pushFollow(FOLLOW_ruleMatcherList_in_entryRuleMatcherList2243);
+            pushFollow(FOLLOW_1);
             iv_ruleMatcherList=ruleMatcherList();
 
             state._fsp--;
@@ -3121,7 +3121,7 @@ public final EObject entryRuleMatcherList() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleMatcherList; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleMatcherList2253); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -3139,7 +3139,7 @@ public final EObject entryRuleMatcherList() throws RecognitionException {
 
 
     // $ANTLR start "ruleMatcherList"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1049:1: ruleMatcherList returns [EObject current=null] : (otherlv_0= ':' ( (lv_matchers_1_0= ruleMatcher ) ) (otherlv_2= ',' ( (lv_matchers_3_0= ruleMatcher ) ) )* otherlv_4= ';' ) ;
+    // InternalFormat.g:1049:1: ruleMatcherList returns [EObject current=null] : (otherlv_0= ':' ( (lv_matchers_1_0= ruleMatcher ) ) (otherlv_2= ',' ( (lv_matchers_3_0= ruleMatcher ) ) )* otherlv_4= ';' ) ;
     public final EObject ruleMatcherList() throws RecognitionException {
         EObject current = null;
 
@@ -3154,30 +3154,30 @@ public final EObject ruleMatcherList() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1052:28: ( (otherlv_0= ':' ( (lv_matchers_1_0= ruleMatcher ) ) (otherlv_2= ',' ( (lv_matchers_3_0= ruleMatcher ) ) )* otherlv_4= ';' ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1053:1: (otherlv_0= ':' ( (lv_matchers_1_0= ruleMatcher ) ) (otherlv_2= ',' ( (lv_matchers_3_0= ruleMatcher ) ) )* otherlv_4= ';' )
+            // InternalFormat.g:1052:28: ( (otherlv_0= ':' ( (lv_matchers_1_0= ruleMatcher ) ) (otherlv_2= ',' ( (lv_matchers_3_0= ruleMatcher ) ) )* otherlv_4= ';' ) )
+            // InternalFormat.g:1053:1: (otherlv_0= ':' ( (lv_matchers_1_0= ruleMatcher ) ) (otherlv_2= ',' ( (lv_matchers_3_0= ruleMatcher ) ) )* otherlv_4= ';' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1053:1: (otherlv_0= ':' ( (lv_matchers_1_0= ruleMatcher ) ) (otherlv_2= ',' ( (lv_matchers_3_0= ruleMatcher ) ) )* otherlv_4= ';' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1053:3: otherlv_0= ':' ( (lv_matchers_1_0= ruleMatcher ) ) (otherlv_2= ',' ( (lv_matchers_3_0= ruleMatcher ) ) )* otherlv_4= ';'
+            // InternalFormat.g:1053:1: (otherlv_0= ':' ( (lv_matchers_1_0= ruleMatcher ) ) (otherlv_2= ',' ( (lv_matchers_3_0= ruleMatcher ) ) )* otherlv_4= ';' )
+            // InternalFormat.g:1053:3: otherlv_0= ':' ( (lv_matchers_1_0= ruleMatcher ) ) (otherlv_2= ',' ( (lv_matchers_3_0= ruleMatcher ) ) )* otherlv_4= ';'
             {
-            otherlv_0=(Token)match(input,30,FOLLOW_30_in_ruleMatcherList2290); if (state.failed) return current;
+            otherlv_0=(Token)match(input,30,FOLLOW_24); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getMatcherListAccess().getColonKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1057:1: ( (lv_matchers_1_0= ruleMatcher ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1058:1: (lv_matchers_1_0= ruleMatcher )
+            // InternalFormat.g:1057:1: ( (lv_matchers_1_0= ruleMatcher ) )
+            // InternalFormat.g:1058:1: (lv_matchers_1_0= ruleMatcher )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1058:1: (lv_matchers_1_0= ruleMatcher )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1059:3: lv_matchers_1_0= ruleMatcher
+            // InternalFormat.g:1058:1: (lv_matchers_1_0= ruleMatcher )
+            // InternalFormat.g:1059:3: lv_matchers_1_0= ruleMatcher
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getMatcherListAccess().getMatchersMatcherParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleMatcher_in_ruleMatcherList2311);
+            pushFollow(FOLLOW_25);
             lv_matchers_1_0=ruleMatcher();
 
             state._fsp--;
@@ -3191,7 +3191,7 @@ public final EObject ruleMatcherList() throws RecognitionException {
                      			current, 
                      			"matchers",
                       		lv_matchers_1_0, 
-                      		"Matcher");
+                      		"com.avaloq.tools.ddk.xtext.format.Format.Matcher");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -3201,7 +3201,7 @@ public final EObject ruleMatcherList() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1075:2: (otherlv_2= ',' ( (lv_matchers_3_0= ruleMatcher ) ) )*
+            // InternalFormat.g:1075:2: (otherlv_2= ',' ( (lv_matchers_3_0= ruleMatcher ) ) )*
             loop20:
             do {
                 int alt20=2;
@@ -3214,26 +3214,26 @@ public final EObject ruleMatcherList() throws RecognitionException {
 
                 switch (alt20) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1075:4: otherlv_2= ',' ( (lv_matchers_3_0= ruleMatcher ) )
+            	    // InternalFormat.g:1075:4: otherlv_2= ',' ( (lv_matchers_3_0= ruleMatcher ) )
             	    {
-            	    otherlv_2=(Token)match(input,28,FOLLOW_28_in_ruleMatcherList2324); if (state.failed) return current;
+            	    otherlv_2=(Token)match(input,28,FOLLOW_24); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_2, grammarAccess.getMatcherListAccess().getCommaKeyword_2_0());
             	          
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1079:1: ( (lv_matchers_3_0= ruleMatcher ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1080:1: (lv_matchers_3_0= ruleMatcher )
+            	    // InternalFormat.g:1079:1: ( (lv_matchers_3_0= ruleMatcher ) )
+            	    // InternalFormat.g:1080:1: (lv_matchers_3_0= ruleMatcher )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1080:1: (lv_matchers_3_0= ruleMatcher )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1081:3: lv_matchers_3_0= ruleMatcher
+            	    // InternalFormat.g:1080:1: (lv_matchers_3_0= ruleMatcher )
+            	    // InternalFormat.g:1081:3: lv_matchers_3_0= ruleMatcher
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getMatcherListAccess().getMatchersMatcherParserRuleCall_2_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleMatcher_in_ruleMatcherList2345);
+            	    pushFollow(FOLLOW_25);
             	    lv_matchers_3_0=ruleMatcher();
 
             	    state._fsp--;
@@ -3247,7 +3247,7 @@ public final EObject ruleMatcherList() throws RecognitionException {
             	             			current, 
             	             			"matchers",
             	              		lv_matchers_3_0, 
-            	              		"Matcher");
+            	              		"com.avaloq.tools.ddk.xtext.format.Format.Matcher");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -3266,7 +3266,7 @@ public final EObject ruleMatcherList() throws RecognitionException {
                 }
             } while (true);
 
-            otherlv_4=(Token)match(input,18,FOLLOW_18_in_ruleMatcherList2359); if (state.failed) return current;
+            otherlv_4=(Token)match(input,18,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_4, grammarAccess.getMatcherListAccess().getSemicolonKeyword_3());
@@ -3295,7 +3295,7 @@ public final EObject ruleMatcherList() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleGroupBlock"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1109:1: entryRuleGroupBlock returns [EObject current=null] : iv_ruleGroupBlock= ruleGroupBlock EOF ;
+    // InternalFormat.g:1109:1: entryRuleGroupBlock returns [EObject current=null] : iv_ruleGroupBlock= ruleGroupBlock EOF ;
     public final EObject entryRuleGroupBlock() throws RecognitionException {
         EObject current = null;
 
@@ -3303,13 +3303,13 @@ public final EObject entryRuleGroupBlock() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1110:2: (iv_ruleGroupBlock= ruleGroupBlock EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1111:2: iv_ruleGroupBlock= ruleGroupBlock EOF
+            // InternalFormat.g:1110:2: (iv_ruleGroupBlock= ruleGroupBlock EOF )
+            // InternalFormat.g:1111:2: iv_ruleGroupBlock= ruleGroupBlock EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getGroupBlockRule()); 
             }
-            pushFollow(FOLLOW_ruleGroupBlock_in_entryRuleGroupBlock2395);
+            pushFollow(FOLLOW_1);
             iv_ruleGroupBlock=ruleGroupBlock();
 
             state._fsp--;
@@ -3317,7 +3317,7 @@ public final EObject entryRuleGroupBlock() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleGroupBlock; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleGroupBlock2405); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -3335,7 +3335,7 @@ public final EObject entryRuleGroupBlock() throws RecognitionException {
 
 
     // $ANTLR start "ruleGroupBlock"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1118:1: ruleGroupBlock returns [EObject current=null] : (otherlv_0= 'group' ( ( ruleIntIdentifier ) ) ( ( (lv_matcherList_2_0= ruleMatcherList ) ) | (otherlv_3= '=>' ( (lv_subGroup_4_0= ruleGroupBlock ) ) ) | (otherlv_5= '{' ( (lv_directives_6_0= ruleGrammarRuleDirective ) )* otherlv_7= '}' ) ) ) ;
+    // InternalFormat.g:1118:1: ruleGroupBlock returns [EObject current=null] : (otherlv_0= 'group' ( ( ruleIntIdentifier ) ) ( ( (lv_matcherList_2_0= ruleMatcherList ) ) | (otherlv_3= '=>' ( (lv_subGroup_4_0= ruleGroupBlock ) ) ) | (otherlv_5= '{' ( (lv_directives_6_0= ruleGrammarRuleDirective ) )* otherlv_7= '}' ) ) ) ;
     public final EObject ruleGroupBlock() throws RecognitionException {
         EObject current = null;
 
@@ -3353,23 +3353,23 @@ public final EObject ruleGroupBlock() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1121:28: ( (otherlv_0= 'group' ( ( ruleIntIdentifier ) ) ( ( (lv_matcherList_2_0= ruleMatcherList ) ) | (otherlv_3= '=>' ( (lv_subGroup_4_0= ruleGroupBlock ) ) ) | (otherlv_5= '{' ( (lv_directives_6_0= ruleGrammarRuleDirective ) )* otherlv_7= '}' ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1122:1: (otherlv_0= 'group' ( ( ruleIntIdentifier ) ) ( ( (lv_matcherList_2_0= ruleMatcherList ) ) | (otherlv_3= '=>' ( (lv_subGroup_4_0= ruleGroupBlock ) ) ) | (otherlv_5= '{' ( (lv_directives_6_0= ruleGrammarRuleDirective ) )* otherlv_7= '}' ) ) )
+            // InternalFormat.g:1121:28: ( (otherlv_0= 'group' ( ( ruleIntIdentifier ) ) ( ( (lv_matcherList_2_0= ruleMatcherList ) ) | (otherlv_3= '=>' ( (lv_subGroup_4_0= ruleGroupBlock ) ) ) | (otherlv_5= '{' ( (lv_directives_6_0= ruleGrammarRuleDirective ) )* otherlv_7= '}' ) ) ) )
+            // InternalFormat.g:1122:1: (otherlv_0= 'group' ( ( ruleIntIdentifier ) ) ( ( (lv_matcherList_2_0= ruleMatcherList ) ) | (otherlv_3= '=>' ( (lv_subGroup_4_0= ruleGroupBlock ) ) ) | (otherlv_5= '{' ( (lv_directives_6_0= ruleGrammarRuleDirective ) )* otherlv_7= '}' ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1122:1: (otherlv_0= 'group' ( ( ruleIntIdentifier ) ) ( ( (lv_matcherList_2_0= ruleMatcherList ) ) | (otherlv_3= '=>' ( (lv_subGroup_4_0= ruleGroupBlock ) ) ) | (otherlv_5= '{' ( (lv_directives_6_0= ruleGrammarRuleDirective ) )* otherlv_7= '}' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1122:3: otherlv_0= 'group' ( ( ruleIntIdentifier ) ) ( ( (lv_matcherList_2_0= ruleMatcherList ) ) | (otherlv_3= '=>' ( (lv_subGroup_4_0= ruleGroupBlock ) ) ) | (otherlv_5= '{' ( (lv_directives_6_0= ruleGrammarRuleDirective ) )* otherlv_7= '}' ) )
+            // InternalFormat.g:1122:1: (otherlv_0= 'group' ( ( ruleIntIdentifier ) ) ( ( (lv_matcherList_2_0= ruleMatcherList ) ) | (otherlv_3= '=>' ( (lv_subGroup_4_0= ruleGroupBlock ) ) ) | (otherlv_5= '{' ( (lv_directives_6_0= ruleGrammarRuleDirective ) )* otherlv_7= '}' ) ) )
+            // InternalFormat.g:1122:3: otherlv_0= 'group' ( ( ruleIntIdentifier ) ) ( ( (lv_matcherList_2_0= ruleMatcherList ) ) | (otherlv_3= '=>' ( (lv_subGroup_4_0= ruleGroupBlock ) ) ) | (otherlv_5= '{' ( (lv_directives_6_0= ruleGrammarRuleDirective ) )* otherlv_7= '}' ) )
             {
-            otherlv_0=(Token)match(input,31,FOLLOW_31_in_ruleGroupBlock2442); if (state.failed) return current;
+            otherlv_0=(Token)match(input,31,FOLLOW_26); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getGroupBlockAccess().getGroupKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1126:1: ( ( ruleIntIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1127:1: ( ruleIntIdentifier )
+            // InternalFormat.g:1126:1: ( ( ruleIntIdentifier ) )
+            // InternalFormat.g:1127:1: ( ruleIntIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1127:1: ( ruleIntIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1128:3: ruleIntIdentifier
+            // InternalFormat.g:1127:1: ( ruleIntIdentifier )
+            // InternalFormat.g:1128:3: ruleIntIdentifier
             {
             if ( state.backtracking==0 ) {
 
@@ -3383,7 +3383,7 @@ public final EObject ruleGroupBlock() throws RecognitionException {
               	        newCompositeNode(grammarAccess.getGroupBlockAccess().getGrammarElementCompoundElementCrossReference_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleIntIdentifier_in_ruleGroupBlock2465);
+            pushFollow(FOLLOW_27);
             ruleIntIdentifier();
 
             state._fsp--;
@@ -3399,7 +3399,7 @@ public final EObject ruleGroupBlock() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1141:2: ( ( (lv_matcherList_2_0= ruleMatcherList ) ) | (otherlv_3= '=>' ( (lv_subGroup_4_0= ruleGroupBlock ) ) ) | (otherlv_5= '{' ( (lv_directives_6_0= ruleGrammarRuleDirective ) )* otherlv_7= '}' ) )
+            // InternalFormat.g:1141:2: ( ( (lv_matcherList_2_0= ruleMatcherList ) ) | (otherlv_3= '=>' ( (lv_subGroup_4_0= ruleGroupBlock ) ) ) | (otherlv_5= '{' ( (lv_directives_6_0= ruleGrammarRuleDirective ) )* otherlv_7= '}' ) )
             int alt22=3;
             switch ( input.LA(1) ) {
             case 30:
@@ -3427,20 +3427,20 @@ public final EObject ruleGroupBlock() throws RecognitionException {
 
             switch (alt22) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1141:3: ( (lv_matcherList_2_0= ruleMatcherList ) )
+                    // InternalFormat.g:1141:3: ( (lv_matcherList_2_0= ruleMatcherList ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1141:3: ( (lv_matcherList_2_0= ruleMatcherList ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1142:1: (lv_matcherList_2_0= ruleMatcherList )
+                    // InternalFormat.g:1141:3: ( (lv_matcherList_2_0= ruleMatcherList ) )
+                    // InternalFormat.g:1142:1: (lv_matcherList_2_0= ruleMatcherList )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1142:1: (lv_matcherList_2_0= ruleMatcherList )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1143:3: lv_matcherList_2_0= ruleMatcherList
+                    // InternalFormat.g:1142:1: (lv_matcherList_2_0= ruleMatcherList )
+                    // InternalFormat.g:1143:3: lv_matcherList_2_0= ruleMatcherList
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getGroupBlockAccess().getMatcherListMatcherListParserRuleCall_2_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleMatcherList_in_ruleGroupBlock2487);
+                    pushFollow(FOLLOW_2);
                     lv_matcherList_2_0=ruleMatcherList();
 
                     state._fsp--;
@@ -3454,7 +3454,7 @@ public final EObject ruleGroupBlock() throws RecognitionException {
                              			current, 
                              			"matcherList",
                               		lv_matcherList_2_0, 
-                              		"MatcherList");
+                              		"com.avaloq.tools.ddk.xtext.format.Format.MatcherList");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -3468,29 +3468,29 @@ public final EObject ruleGroupBlock() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1160:6: (otherlv_3= '=>' ( (lv_subGroup_4_0= ruleGroupBlock ) ) )
+                    // InternalFormat.g:1160:6: (otherlv_3= '=>' ( (lv_subGroup_4_0= ruleGroupBlock ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1160:6: (otherlv_3= '=>' ( (lv_subGroup_4_0= ruleGroupBlock ) ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1160:8: otherlv_3= '=>' ( (lv_subGroup_4_0= ruleGroupBlock ) )
+                    // InternalFormat.g:1160:6: (otherlv_3= '=>' ( (lv_subGroup_4_0= ruleGroupBlock ) ) )
+                    // InternalFormat.g:1160:8: otherlv_3= '=>' ( (lv_subGroup_4_0= ruleGroupBlock ) )
                     {
-                    otherlv_3=(Token)match(input,32,FOLLOW_32_in_ruleGroupBlock2506); if (state.failed) return current;
+                    otherlv_3=(Token)match(input,32,FOLLOW_28); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_3, grammarAccess.getGroupBlockAccess().getEqualsSignGreaterThanSignKeyword_2_1_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1164:1: ( (lv_subGroup_4_0= ruleGroupBlock ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1165:1: (lv_subGroup_4_0= ruleGroupBlock )
+                    // InternalFormat.g:1164:1: ( (lv_subGroup_4_0= ruleGroupBlock ) )
+                    // InternalFormat.g:1165:1: (lv_subGroup_4_0= ruleGroupBlock )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1165:1: (lv_subGroup_4_0= ruleGroupBlock )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1166:3: lv_subGroup_4_0= ruleGroupBlock
+                    // InternalFormat.g:1165:1: (lv_subGroup_4_0= ruleGroupBlock )
+                    // InternalFormat.g:1166:3: lv_subGroup_4_0= ruleGroupBlock
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getGroupBlockAccess().getSubGroupGroupBlockParserRuleCall_2_1_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleGroupBlock_in_ruleGroupBlock2527);
+                    pushFollow(FOLLOW_2);
                     lv_subGroup_4_0=ruleGroupBlock();
 
                     state._fsp--;
@@ -3504,7 +3504,7 @@ public final EObject ruleGroupBlock() throws RecognitionException {
                              			current, 
                              			"subGroup",
                               		lv_subGroup_4_0, 
-                              		"GroupBlock");
+                              		"com.avaloq.tools.ddk.xtext.format.Format.GroupBlock");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -3521,18 +3521,18 @@ public final EObject ruleGroupBlock() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1183:6: (otherlv_5= '{' ( (lv_directives_6_0= ruleGrammarRuleDirective ) )* otherlv_7= '}' )
+                    // InternalFormat.g:1183:6: (otherlv_5= '{' ( (lv_directives_6_0= ruleGrammarRuleDirective ) )* otherlv_7= '}' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1183:6: (otherlv_5= '{' ( (lv_directives_6_0= ruleGrammarRuleDirective ) )* otherlv_7= '}' )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1183:8: otherlv_5= '{' ( (lv_directives_6_0= ruleGrammarRuleDirective ) )* otherlv_7= '}'
+                    // InternalFormat.g:1183:6: (otherlv_5= '{' ( (lv_directives_6_0= ruleGrammarRuleDirective ) )* otherlv_7= '}' )
+                    // InternalFormat.g:1183:8: otherlv_5= '{' ( (lv_directives_6_0= ruleGrammarRuleDirective ) )* otherlv_7= '}'
                     {
-                    otherlv_5=(Token)match(input,23,FOLLOW_23_in_ruleGroupBlock2547); if (state.failed) return current;
+                    otherlv_5=(Token)match(input,23,FOLLOW_18); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_5, grammarAccess.getGroupBlockAccess().getLeftCurlyBracketKeyword_2_2_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1187:1: ( (lv_directives_6_0= ruleGrammarRuleDirective ) )*
+                    // InternalFormat.g:1187:1: ( (lv_directives_6_0= ruleGrammarRuleDirective ) )*
                     loop21:
                     do {
                         int alt21=2;
@@ -3545,17 +3545,17 @@ public final EObject ruleGroupBlock() throws RecognitionException {
 
                         switch (alt21) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1188:1: (lv_directives_6_0= ruleGrammarRuleDirective )
+                    	    // InternalFormat.g:1188:1: (lv_directives_6_0= ruleGrammarRuleDirective )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1188:1: (lv_directives_6_0= ruleGrammarRuleDirective )
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1189:3: lv_directives_6_0= ruleGrammarRuleDirective
+                    	    // InternalFormat.g:1188:1: (lv_directives_6_0= ruleGrammarRuleDirective )
+                    	    // InternalFormat.g:1189:3: lv_directives_6_0= ruleGrammarRuleDirective
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getGroupBlockAccess().getDirectivesGrammarRuleDirectiveParserRuleCall_2_2_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleGrammarRuleDirective_in_ruleGroupBlock2568);
+                    	    pushFollow(FOLLOW_18);
                     	    lv_directives_6_0=ruleGrammarRuleDirective();
 
                     	    state._fsp--;
@@ -3569,7 +3569,7 @@ public final EObject ruleGroupBlock() throws RecognitionException {
                     	             			current, 
                     	             			"directives",
                     	              		lv_directives_6_0, 
-                    	              		"GrammarRuleDirective");
+                    	              		"com.avaloq.tools.ddk.xtext.format.Format.GrammarRuleDirective");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -3585,7 +3585,7 @@ public final EObject ruleGroupBlock() throws RecognitionException {
                         }
                     } while (true);
 
-                    otherlv_7=(Token)match(input,24,FOLLOW_24_in_ruleGroupBlock2581); if (state.failed) return current;
+                    otherlv_7=(Token)match(input,24,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_7, grammarAccess.getGroupBlockAccess().getRightCurlyBracketKeyword_2_2_2());
@@ -3623,7 +3623,7 @@ public final EObject ruleGroupBlock() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleKeywordPair"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1217:1: entryRuleKeywordPair returns [EObject current=null] : iv_ruleKeywordPair= ruleKeywordPair EOF ;
+    // InternalFormat.g:1217:1: entryRuleKeywordPair returns [EObject current=null] : iv_ruleKeywordPair= ruleKeywordPair EOF ;
     public final EObject entryRuleKeywordPair() throws RecognitionException {
         EObject current = null;
 
@@ -3631,13 +3631,13 @@ public final EObject entryRuleKeywordPair() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1218:2: (iv_ruleKeywordPair= ruleKeywordPair EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1219:2: iv_ruleKeywordPair= ruleKeywordPair EOF
+            // InternalFormat.g:1218:2: (iv_ruleKeywordPair= ruleKeywordPair EOF )
+            // InternalFormat.g:1219:2: iv_ruleKeywordPair= ruleKeywordPair EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getKeywordPairRule()); 
             }
-            pushFollow(FOLLOW_ruleKeywordPair_in_entryRuleKeywordPair2619);
+            pushFollow(FOLLOW_1);
             iv_ruleKeywordPair=ruleKeywordPair();
 
             state._fsp--;
@@ -3645,7 +3645,7 @@ public final EObject entryRuleKeywordPair() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleKeywordPair; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleKeywordPair2629); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -3663,7 +3663,7 @@ public final EObject entryRuleKeywordPair() throws RecognitionException {
 
 
     // $ANTLR start "ruleKeywordPair"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1226:1: ruleKeywordPair returns [EObject current=null] : (otherlv_0= '(' ( (lv_left_1_0= RULE_STRING ) ) ( (lv_right_2_0= RULE_STRING ) ) otherlv_3= ')' otherlv_4= ':' ( (otherlv_5= 'left' otherlv_6= '.' ( (lv_leftMatchers_7_0= ruleMatcher ) ) ) | (otherlv_8= 'right' otherlv_9= '.' ( (lv_rightMatchers_10_0= ruleMatcher ) ) ) ) (otherlv_11= ',' ( (otherlv_12= 'left' otherlv_13= '.' ( (lv_leftMatchers_14_0= ruleMatcher ) ) ) | (otherlv_15= 'right' otherlv_16= '.' ( (lv_rightMatchers_17_0= ruleMatcher ) ) ) ) )* otherlv_18= ';' ) ;
+    // InternalFormat.g:1226:1: ruleKeywordPair returns [EObject current=null] : (otherlv_0= '(' ( (lv_left_1_0= RULE_STRING ) ) ( (lv_right_2_0= RULE_STRING ) ) otherlv_3= ')' otherlv_4= ':' ( (otherlv_5= 'left' otherlv_6= '.' ( (lv_leftMatchers_7_0= ruleMatcher ) ) ) | (otherlv_8= 'right' otherlv_9= '.' ( (lv_rightMatchers_10_0= ruleMatcher ) ) ) ) (otherlv_11= ',' ( (otherlv_12= 'left' otherlv_13= '.' ( (lv_leftMatchers_14_0= ruleMatcher ) ) ) | (otherlv_15= 'right' otherlv_16= '.' ( (lv_rightMatchers_17_0= ruleMatcher ) ) ) ) )* otherlv_18= ';' ) ;
     public final EObject ruleKeywordPair() throws RecognitionException {
         EObject current = null;
 
@@ -3694,25 +3694,25 @@ public final EObject ruleKeywordPair() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1229:28: ( (otherlv_0= '(' ( (lv_left_1_0= RULE_STRING ) ) ( (lv_right_2_0= RULE_STRING ) ) otherlv_3= ')' otherlv_4= ':' ( (otherlv_5= 'left' otherlv_6= '.' ( (lv_leftMatchers_7_0= ruleMatcher ) ) ) | (otherlv_8= 'right' otherlv_9= '.' ( (lv_rightMatchers_10_0= ruleMatcher ) ) ) ) (otherlv_11= ',' ( (otherlv_12= 'left' otherlv_13= '.' ( (lv_leftMatchers_14_0= ruleMatcher ) ) ) | (otherlv_15= 'right' otherlv_16= '.' ( (lv_rightMatchers_17_0= ruleMatcher ) ) ) ) )* otherlv_18= ';' ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1230:1: (otherlv_0= '(' ( (lv_left_1_0= RULE_STRING ) ) ( (lv_right_2_0= RULE_STRING ) ) otherlv_3= ')' otherlv_4= ':' ( (otherlv_5= 'left' otherlv_6= '.' ( (lv_leftMatchers_7_0= ruleMatcher ) ) ) | (otherlv_8= 'right' otherlv_9= '.' ( (lv_rightMatchers_10_0= ruleMatcher ) ) ) ) (otherlv_11= ',' ( (otherlv_12= 'left' otherlv_13= '.' ( (lv_leftMatchers_14_0= ruleMatcher ) ) ) | (otherlv_15= 'right' otherlv_16= '.' ( (lv_rightMatchers_17_0= ruleMatcher ) ) ) ) )* otherlv_18= ';' )
+            // InternalFormat.g:1229:28: ( (otherlv_0= '(' ( (lv_left_1_0= RULE_STRING ) ) ( (lv_right_2_0= RULE_STRING ) ) otherlv_3= ')' otherlv_4= ':' ( (otherlv_5= 'left' otherlv_6= '.' ( (lv_leftMatchers_7_0= ruleMatcher ) ) ) | (otherlv_8= 'right' otherlv_9= '.' ( (lv_rightMatchers_10_0= ruleMatcher ) ) ) ) (otherlv_11= ',' ( (otherlv_12= 'left' otherlv_13= '.' ( (lv_leftMatchers_14_0= ruleMatcher ) ) ) | (otherlv_15= 'right' otherlv_16= '.' ( (lv_rightMatchers_17_0= ruleMatcher ) ) ) ) )* otherlv_18= ';' ) )
+            // InternalFormat.g:1230:1: (otherlv_0= '(' ( (lv_left_1_0= RULE_STRING ) ) ( (lv_right_2_0= RULE_STRING ) ) otherlv_3= ')' otherlv_4= ':' ( (otherlv_5= 'left' otherlv_6= '.' ( (lv_leftMatchers_7_0= ruleMatcher ) ) ) | (otherlv_8= 'right' otherlv_9= '.' ( (lv_rightMatchers_10_0= ruleMatcher ) ) ) ) (otherlv_11= ',' ( (otherlv_12= 'left' otherlv_13= '.' ( (lv_leftMatchers_14_0= ruleMatcher ) ) ) | (otherlv_15= 'right' otherlv_16= '.' ( (lv_rightMatchers_17_0= ruleMatcher ) ) ) ) )* otherlv_18= ';' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1230:1: (otherlv_0= '(' ( (lv_left_1_0= RULE_STRING ) ) ( (lv_right_2_0= RULE_STRING ) ) otherlv_3= ')' otherlv_4= ':' ( (otherlv_5= 'left' otherlv_6= '.' ( (lv_leftMatchers_7_0= ruleMatcher ) ) ) | (otherlv_8= 'right' otherlv_9= '.' ( (lv_rightMatchers_10_0= ruleMatcher ) ) ) ) (otherlv_11= ',' ( (otherlv_12= 'left' otherlv_13= '.' ( (lv_leftMatchers_14_0= ruleMatcher ) ) ) | (otherlv_15= 'right' otherlv_16= '.' ( (lv_rightMatchers_17_0= ruleMatcher ) ) ) ) )* otherlv_18= ';' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1230:3: otherlv_0= '(' ( (lv_left_1_0= RULE_STRING ) ) ( (lv_right_2_0= RULE_STRING ) ) otherlv_3= ')' otherlv_4= ':' ( (otherlv_5= 'left' otherlv_6= '.' ( (lv_leftMatchers_7_0= ruleMatcher ) ) ) | (otherlv_8= 'right' otherlv_9= '.' ( (lv_rightMatchers_10_0= ruleMatcher ) ) ) ) (otherlv_11= ',' ( (otherlv_12= 'left' otherlv_13= '.' ( (lv_leftMatchers_14_0= ruleMatcher ) ) ) | (otherlv_15= 'right' otherlv_16= '.' ( (lv_rightMatchers_17_0= ruleMatcher ) ) ) ) )* otherlv_18= ';'
+            // InternalFormat.g:1230:1: (otherlv_0= '(' ( (lv_left_1_0= RULE_STRING ) ) ( (lv_right_2_0= RULE_STRING ) ) otherlv_3= ')' otherlv_4= ':' ( (otherlv_5= 'left' otherlv_6= '.' ( (lv_leftMatchers_7_0= ruleMatcher ) ) ) | (otherlv_8= 'right' otherlv_9= '.' ( (lv_rightMatchers_10_0= ruleMatcher ) ) ) ) (otherlv_11= ',' ( (otherlv_12= 'left' otherlv_13= '.' ( (lv_leftMatchers_14_0= ruleMatcher ) ) ) | (otherlv_15= 'right' otherlv_16= '.' ( (lv_rightMatchers_17_0= ruleMatcher ) ) ) ) )* otherlv_18= ';' )
+            // InternalFormat.g:1230:3: otherlv_0= '(' ( (lv_left_1_0= RULE_STRING ) ) ( (lv_right_2_0= RULE_STRING ) ) otherlv_3= ')' otherlv_4= ':' ( (otherlv_5= 'left' otherlv_6= '.' ( (lv_leftMatchers_7_0= ruleMatcher ) ) ) | (otherlv_8= 'right' otherlv_9= '.' ( (lv_rightMatchers_10_0= ruleMatcher ) ) ) ) (otherlv_11= ',' ( (otherlv_12= 'left' otherlv_13= '.' ( (lv_leftMatchers_14_0= ruleMatcher ) ) ) | (otherlv_15= 'right' otherlv_16= '.' ( (lv_rightMatchers_17_0= ruleMatcher ) ) ) ) )* otherlv_18= ';'
             {
-            otherlv_0=(Token)match(input,33,FOLLOW_33_in_ruleKeywordPair2666); if (state.failed) return current;
+            otherlv_0=(Token)match(input,33,FOLLOW_29); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getKeywordPairAccess().getLeftParenthesisKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1234:1: ( (lv_left_1_0= RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1235:1: (lv_left_1_0= RULE_STRING )
+            // InternalFormat.g:1234:1: ( (lv_left_1_0= RULE_STRING ) )
+            // InternalFormat.g:1235:1: (lv_left_1_0= RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1235:1: (lv_left_1_0= RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1236:3: lv_left_1_0= RULE_STRING
+            // InternalFormat.g:1235:1: (lv_left_1_0= RULE_STRING )
+            // InternalFormat.g:1236:3: lv_left_1_0= RULE_STRING
             {
-            lv_left_1_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleKeywordPair2683); if (state.failed) return current;
+            lv_left_1_0=(Token)match(input,RULE_STRING,FOLLOW_29); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(lv_left_1_0, grammarAccess.getKeywordPairAccess().getLeftSTRINGTerminalRuleCall_1_0()); 
@@ -3727,7 +3727,7 @@ public final EObject ruleKeywordPair() throws RecognitionException {
                      			current, 
                      			"left",
                       		lv_left_1_0, 
-                      		"STRING");
+                      		"org.eclipse.xtext.xbase.Xtype.STRING");
               	    
             }
 
@@ -3736,13 +3736,13 @@ public final EObject ruleKeywordPair() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1252:2: ( (lv_right_2_0= RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1253:1: (lv_right_2_0= RULE_STRING )
+            // InternalFormat.g:1252:2: ( (lv_right_2_0= RULE_STRING ) )
+            // InternalFormat.g:1253:1: (lv_right_2_0= RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1253:1: (lv_right_2_0= RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1254:3: lv_right_2_0= RULE_STRING
+            // InternalFormat.g:1253:1: (lv_right_2_0= RULE_STRING )
+            // InternalFormat.g:1254:3: lv_right_2_0= RULE_STRING
             {
-            lv_right_2_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleKeywordPair2705); if (state.failed) return current;
+            lv_right_2_0=(Token)match(input,RULE_STRING,FOLLOW_30); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(lv_right_2_0, grammarAccess.getKeywordPairAccess().getRightSTRINGTerminalRuleCall_2_0()); 
@@ -3757,7 +3757,7 @@ public final EObject ruleKeywordPair() throws RecognitionException {
                      			current, 
                      			"right",
                       		lv_right_2_0, 
-                      		"STRING");
+                      		"org.eclipse.xtext.xbase.Xtype.STRING");
               	    
             }
 
@@ -3766,19 +3766,19 @@ public final EObject ruleKeywordPair() throws RecognitionException {
 
             }
 
-            otherlv_3=(Token)match(input,34,FOLLOW_34_in_ruleKeywordPair2722); if (state.failed) return current;
+            otherlv_3=(Token)match(input,34,FOLLOW_21); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_3, grammarAccess.getKeywordPairAccess().getRightParenthesisKeyword_3());
                   
             }
-            otherlv_4=(Token)match(input,30,FOLLOW_30_in_ruleKeywordPair2734); if (state.failed) return current;
+            otherlv_4=(Token)match(input,30,FOLLOW_31); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_4, grammarAccess.getKeywordPairAccess().getColonKeyword_4());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1278:1: ( (otherlv_5= 'left' otherlv_6= '.' ( (lv_leftMatchers_7_0= ruleMatcher ) ) ) | (otherlv_8= 'right' otherlv_9= '.' ( (lv_rightMatchers_10_0= ruleMatcher ) ) ) )
+            // InternalFormat.g:1278:1: ( (otherlv_5= 'left' otherlv_6= '.' ( (lv_leftMatchers_7_0= ruleMatcher ) ) ) | (otherlv_8= 'right' otherlv_9= '.' ( (lv_rightMatchers_10_0= ruleMatcher ) ) ) )
             int alt23=2;
             int LA23_0 = input.LA(1);
 
@@ -3797,35 +3797,35 @@ else if ( (LA23_0==37) ) {
             }
             switch (alt23) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1278:2: (otherlv_5= 'left' otherlv_6= '.' ( (lv_leftMatchers_7_0= ruleMatcher ) ) )
+                    // InternalFormat.g:1278:2: (otherlv_5= 'left' otherlv_6= '.' ( (lv_leftMatchers_7_0= ruleMatcher ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1278:2: (otherlv_5= 'left' otherlv_6= '.' ( (lv_leftMatchers_7_0= ruleMatcher ) ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1278:4: otherlv_5= 'left' otherlv_6= '.' ( (lv_leftMatchers_7_0= ruleMatcher ) )
+                    // InternalFormat.g:1278:2: (otherlv_5= 'left' otherlv_6= '.' ( (lv_leftMatchers_7_0= ruleMatcher ) ) )
+                    // InternalFormat.g:1278:4: otherlv_5= 'left' otherlv_6= '.' ( (lv_leftMatchers_7_0= ruleMatcher ) )
                     {
-                    otherlv_5=(Token)match(input,35,FOLLOW_35_in_ruleKeywordPair2748); if (state.failed) return current;
+                    otherlv_5=(Token)match(input,35,FOLLOW_32); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_5, grammarAccess.getKeywordPairAccess().getLeftKeyword_5_0_0());
                           
                     }
-                    otherlv_6=(Token)match(input,36,FOLLOW_36_in_ruleKeywordPair2760); if (state.failed) return current;
+                    otherlv_6=(Token)match(input,36,FOLLOW_24); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_6, grammarAccess.getKeywordPairAccess().getFullStopKeyword_5_0_1());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1286:1: ( (lv_leftMatchers_7_0= ruleMatcher ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1287:1: (lv_leftMatchers_7_0= ruleMatcher )
+                    // InternalFormat.g:1286:1: ( (lv_leftMatchers_7_0= ruleMatcher ) )
+                    // InternalFormat.g:1287:1: (lv_leftMatchers_7_0= ruleMatcher )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1287:1: (lv_leftMatchers_7_0= ruleMatcher )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1288:3: lv_leftMatchers_7_0= ruleMatcher
+                    // InternalFormat.g:1287:1: (lv_leftMatchers_7_0= ruleMatcher )
+                    // InternalFormat.g:1288:3: lv_leftMatchers_7_0= ruleMatcher
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getKeywordPairAccess().getLeftMatchersMatcherParserRuleCall_5_0_2_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleMatcher_in_ruleKeywordPair2781);
+                    pushFollow(FOLLOW_25);
                     lv_leftMatchers_7_0=ruleMatcher();
 
                     state._fsp--;
@@ -3839,7 +3839,7 @@ else if ( (LA23_0==37) ) {
                              			current, 
                              			"leftMatchers",
                               		lv_leftMatchers_7_0, 
-                              		"Matcher");
+                              		"com.avaloq.tools.ddk.xtext.format.Format.Matcher");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -3856,35 +3856,35 @@ else if ( (LA23_0==37) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1305:6: (otherlv_8= 'right' otherlv_9= '.' ( (lv_rightMatchers_10_0= ruleMatcher ) ) )
+                    // InternalFormat.g:1305:6: (otherlv_8= 'right' otherlv_9= '.' ( (lv_rightMatchers_10_0= ruleMatcher ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1305:6: (otherlv_8= 'right' otherlv_9= '.' ( (lv_rightMatchers_10_0= ruleMatcher ) ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1305:8: otherlv_8= 'right' otherlv_9= '.' ( (lv_rightMatchers_10_0= ruleMatcher ) )
+                    // InternalFormat.g:1305:6: (otherlv_8= 'right' otherlv_9= '.' ( (lv_rightMatchers_10_0= ruleMatcher ) ) )
+                    // InternalFormat.g:1305:8: otherlv_8= 'right' otherlv_9= '.' ( (lv_rightMatchers_10_0= ruleMatcher ) )
                     {
-                    otherlv_8=(Token)match(input,37,FOLLOW_37_in_ruleKeywordPair2801); if (state.failed) return current;
+                    otherlv_8=(Token)match(input,37,FOLLOW_32); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_8, grammarAccess.getKeywordPairAccess().getRightKeyword_5_1_0());
                           
                     }
-                    otherlv_9=(Token)match(input,36,FOLLOW_36_in_ruleKeywordPair2813); if (state.failed) return current;
+                    otherlv_9=(Token)match(input,36,FOLLOW_24); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_9, grammarAccess.getKeywordPairAccess().getFullStopKeyword_5_1_1());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1313:1: ( (lv_rightMatchers_10_0= ruleMatcher ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1314:1: (lv_rightMatchers_10_0= ruleMatcher )
+                    // InternalFormat.g:1313:1: ( (lv_rightMatchers_10_0= ruleMatcher ) )
+                    // InternalFormat.g:1314:1: (lv_rightMatchers_10_0= ruleMatcher )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1314:1: (lv_rightMatchers_10_0= ruleMatcher )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1315:3: lv_rightMatchers_10_0= ruleMatcher
+                    // InternalFormat.g:1314:1: (lv_rightMatchers_10_0= ruleMatcher )
+                    // InternalFormat.g:1315:3: lv_rightMatchers_10_0= ruleMatcher
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getKeywordPairAccess().getRightMatchersMatcherParserRuleCall_5_1_2_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleMatcher_in_ruleKeywordPair2834);
+                    pushFollow(FOLLOW_25);
                     lv_rightMatchers_10_0=ruleMatcher();
 
                     state._fsp--;
@@ -3898,7 +3898,7 @@ else if ( (LA23_0==37) ) {
                              			current, 
                              			"rightMatchers",
                               		lv_rightMatchers_10_0, 
-                              		"Matcher");
+                              		"com.avaloq.tools.ddk.xtext.format.Format.Matcher");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -3917,7 +3917,7 @@ else if ( (LA23_0==37) ) {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1331:4: (otherlv_11= ',' ( (otherlv_12= 'left' otherlv_13= '.' ( (lv_leftMatchers_14_0= ruleMatcher ) ) ) | (otherlv_15= 'right' otherlv_16= '.' ( (lv_rightMatchers_17_0= ruleMatcher ) ) ) ) )*
+            // InternalFormat.g:1331:4: (otherlv_11= ',' ( (otherlv_12= 'left' otherlv_13= '.' ( (lv_leftMatchers_14_0= ruleMatcher ) ) ) | (otherlv_15= 'right' otherlv_16= '.' ( (lv_rightMatchers_17_0= ruleMatcher ) ) ) ) )*
             loop25:
             do {
                 int alt25=2;
@@ -3930,15 +3930,15 @@ else if ( (LA23_0==37) ) {
 
                 switch (alt25) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1331:6: otherlv_11= ',' ( (otherlv_12= 'left' otherlv_13= '.' ( (lv_leftMatchers_14_0= ruleMatcher ) ) ) | (otherlv_15= 'right' otherlv_16= '.' ( (lv_rightMatchers_17_0= ruleMatcher ) ) ) )
+            	    // InternalFormat.g:1331:6: otherlv_11= ',' ( (otherlv_12= 'left' otherlv_13= '.' ( (lv_leftMatchers_14_0= ruleMatcher ) ) ) | (otherlv_15= 'right' otherlv_16= '.' ( (lv_rightMatchers_17_0= ruleMatcher ) ) ) )
             	    {
-            	    otherlv_11=(Token)match(input,28,FOLLOW_28_in_ruleKeywordPair2849); if (state.failed) return current;
+            	    otherlv_11=(Token)match(input,28,FOLLOW_31); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_11, grammarAccess.getKeywordPairAccess().getCommaKeyword_6_0());
             	          
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1335:1: ( (otherlv_12= 'left' otherlv_13= '.' ( (lv_leftMatchers_14_0= ruleMatcher ) ) ) | (otherlv_15= 'right' otherlv_16= '.' ( (lv_rightMatchers_17_0= ruleMatcher ) ) ) )
+            	    // InternalFormat.g:1335:1: ( (otherlv_12= 'left' otherlv_13= '.' ( (lv_leftMatchers_14_0= ruleMatcher ) ) ) | (otherlv_15= 'right' otherlv_16= '.' ( (lv_rightMatchers_17_0= ruleMatcher ) ) ) )
             	    int alt24=2;
             	    int LA24_0 = input.LA(1);
 
@@ -3957,35 +3957,35 @@ else if ( (LA24_0==37) ) {
             	    }
             	    switch (alt24) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1335:2: (otherlv_12= 'left' otherlv_13= '.' ( (lv_leftMatchers_14_0= ruleMatcher ) ) )
+            	            // InternalFormat.g:1335:2: (otherlv_12= 'left' otherlv_13= '.' ( (lv_leftMatchers_14_0= ruleMatcher ) ) )
             	            {
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1335:2: (otherlv_12= 'left' otherlv_13= '.' ( (lv_leftMatchers_14_0= ruleMatcher ) ) )
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1335:4: otherlv_12= 'left' otherlv_13= '.' ( (lv_leftMatchers_14_0= ruleMatcher ) )
+            	            // InternalFormat.g:1335:2: (otherlv_12= 'left' otherlv_13= '.' ( (lv_leftMatchers_14_0= ruleMatcher ) ) )
+            	            // InternalFormat.g:1335:4: otherlv_12= 'left' otherlv_13= '.' ( (lv_leftMatchers_14_0= ruleMatcher ) )
             	            {
-            	            otherlv_12=(Token)match(input,35,FOLLOW_35_in_ruleKeywordPair2863); if (state.failed) return current;
+            	            otherlv_12=(Token)match(input,35,FOLLOW_32); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                  	newLeafNode(otherlv_12, grammarAccess.getKeywordPairAccess().getLeftKeyword_6_1_0_0());
             	                  
             	            }
-            	            otherlv_13=(Token)match(input,36,FOLLOW_36_in_ruleKeywordPair2875); if (state.failed) return current;
+            	            otherlv_13=(Token)match(input,36,FOLLOW_24); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                  	newLeafNode(otherlv_13, grammarAccess.getKeywordPairAccess().getFullStopKeyword_6_1_0_1());
             	                  
             	            }
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1343:1: ( (lv_leftMatchers_14_0= ruleMatcher ) )
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1344:1: (lv_leftMatchers_14_0= ruleMatcher )
+            	            // InternalFormat.g:1343:1: ( (lv_leftMatchers_14_0= ruleMatcher ) )
+            	            // InternalFormat.g:1344:1: (lv_leftMatchers_14_0= ruleMatcher )
             	            {
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1344:1: (lv_leftMatchers_14_0= ruleMatcher )
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1345:3: lv_leftMatchers_14_0= ruleMatcher
+            	            // InternalFormat.g:1344:1: (lv_leftMatchers_14_0= ruleMatcher )
+            	            // InternalFormat.g:1345:3: lv_leftMatchers_14_0= ruleMatcher
             	            {
             	            if ( state.backtracking==0 ) {
             	               
             	              	        newCompositeNode(grammarAccess.getKeywordPairAccess().getLeftMatchersMatcherParserRuleCall_6_1_0_2_0()); 
             	              	    
             	            }
-            	            pushFollow(FOLLOW_ruleMatcher_in_ruleKeywordPair2896);
+            	            pushFollow(FOLLOW_25);
             	            lv_leftMatchers_14_0=ruleMatcher();
 
             	            state._fsp--;
@@ -3999,7 +3999,7 @@ else if ( (LA24_0==37) ) {
             	                     			current, 
             	                     			"leftMatchers",
             	                      		lv_leftMatchers_14_0, 
-            	                      		"Matcher");
+            	                      		"com.avaloq.tools.ddk.xtext.format.Format.Matcher");
             	              	        afterParserOrEnumRuleCall();
             	              	    
             	            }
@@ -4016,35 +4016,35 @@ else if ( (LA24_0==37) ) {
             	            }
             	            break;
             	        case 2 :
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1362:6: (otherlv_15= 'right' otherlv_16= '.' ( (lv_rightMatchers_17_0= ruleMatcher ) ) )
+            	            // InternalFormat.g:1362:6: (otherlv_15= 'right' otherlv_16= '.' ( (lv_rightMatchers_17_0= ruleMatcher ) ) )
             	            {
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1362:6: (otherlv_15= 'right' otherlv_16= '.' ( (lv_rightMatchers_17_0= ruleMatcher ) ) )
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1362:8: otherlv_15= 'right' otherlv_16= '.' ( (lv_rightMatchers_17_0= ruleMatcher ) )
+            	            // InternalFormat.g:1362:6: (otherlv_15= 'right' otherlv_16= '.' ( (lv_rightMatchers_17_0= ruleMatcher ) ) )
+            	            // InternalFormat.g:1362:8: otherlv_15= 'right' otherlv_16= '.' ( (lv_rightMatchers_17_0= ruleMatcher ) )
             	            {
-            	            otherlv_15=(Token)match(input,37,FOLLOW_37_in_ruleKeywordPair2916); if (state.failed) return current;
+            	            otherlv_15=(Token)match(input,37,FOLLOW_32); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                  	newLeafNode(otherlv_15, grammarAccess.getKeywordPairAccess().getRightKeyword_6_1_1_0());
             	                  
             	            }
-            	            otherlv_16=(Token)match(input,36,FOLLOW_36_in_ruleKeywordPair2928); if (state.failed) return current;
+            	            otherlv_16=(Token)match(input,36,FOLLOW_24); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                  	newLeafNode(otherlv_16, grammarAccess.getKeywordPairAccess().getFullStopKeyword_6_1_1_1());
             	                  
             	            }
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1370:1: ( (lv_rightMatchers_17_0= ruleMatcher ) )
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1371:1: (lv_rightMatchers_17_0= ruleMatcher )
+            	            // InternalFormat.g:1370:1: ( (lv_rightMatchers_17_0= ruleMatcher ) )
+            	            // InternalFormat.g:1371:1: (lv_rightMatchers_17_0= ruleMatcher )
             	            {
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1371:1: (lv_rightMatchers_17_0= ruleMatcher )
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1372:3: lv_rightMatchers_17_0= ruleMatcher
+            	            // InternalFormat.g:1371:1: (lv_rightMatchers_17_0= ruleMatcher )
+            	            // InternalFormat.g:1372:3: lv_rightMatchers_17_0= ruleMatcher
             	            {
             	            if ( state.backtracking==0 ) {
             	               
             	              	        newCompositeNode(grammarAccess.getKeywordPairAccess().getRightMatchersMatcherParserRuleCall_6_1_1_2_0()); 
             	              	    
             	            }
-            	            pushFollow(FOLLOW_ruleMatcher_in_ruleKeywordPair2949);
+            	            pushFollow(FOLLOW_25);
             	            lv_rightMatchers_17_0=ruleMatcher();
 
             	            state._fsp--;
@@ -4058,7 +4058,7 @@ else if ( (LA24_0==37) ) {
             	                     			current, 
             	                     			"rightMatchers",
             	                      		lv_rightMatchers_17_0, 
-            	                      		"Matcher");
+            	                      		"com.avaloq.tools.ddk.xtext.format.Format.Matcher");
             	              	        afterParserOrEnumRuleCall();
             	              	    
             	            }
@@ -4086,7 +4086,7 @@ else if ( (LA24_0==37) ) {
                 }
             } while (true);
 
-            otherlv_18=(Token)match(input,18,FOLLOW_18_in_ruleKeywordPair2965); if (state.failed) return current;
+            otherlv_18=(Token)match(input,18,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_18, grammarAccess.getKeywordPairAccess().getSemicolonKeyword_7());
@@ -4115,7 +4115,7 @@ else if ( (LA24_0==37) ) {
 
 
     // $ANTLR start "entryRuleMatcher"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1400:1: entryRuleMatcher returns [EObject current=null] : iv_ruleMatcher= ruleMatcher EOF ;
+    // InternalFormat.g:1400:1: entryRuleMatcher returns [EObject current=null] : iv_ruleMatcher= ruleMatcher EOF ;
     public final EObject entryRuleMatcher() throws RecognitionException {
         EObject current = null;
 
@@ -4123,13 +4123,13 @@ public final EObject entryRuleMatcher() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1401:2: (iv_ruleMatcher= ruleMatcher EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1402:2: iv_ruleMatcher= ruleMatcher EOF
+            // InternalFormat.g:1401:2: (iv_ruleMatcher= ruleMatcher EOF )
+            // InternalFormat.g:1402:2: iv_ruleMatcher= ruleMatcher EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getMatcherRule()); 
             }
-            pushFollow(FOLLOW_ruleMatcher_in_entryRuleMatcher3001);
+            pushFollow(FOLLOW_1);
             iv_ruleMatcher=ruleMatcher();
 
             state._fsp--;
@@ -4137,7 +4137,7 @@ public final EObject entryRuleMatcher() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleMatcher; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleMatcher3011); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -4155,7 +4155,7 @@ public final EObject entryRuleMatcher() throws RecognitionException {
 
 
     // $ANTLR start "ruleMatcher"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1409:1: ruleMatcher returns [EObject current=null] : ( ( (lv_locator_0_0= ruleLocator ) ) ( (lv_type_1_0= ruleMatcherType ) ) ( (lv_condition_2_0= ruleXBlockExpression ) )? ) ;
+    // InternalFormat.g:1409:1: ruleMatcher returns [EObject current=null] : ( ( (lv_locator_0_0= ruleLocator ) ) ( (lv_type_1_0= ruleMatcherType ) ) ( (lv_condition_2_0= ruleXBlockExpression ) )? ) ;
     public final EObject ruleMatcher() throws RecognitionException {
         EObject current = null;
 
@@ -4169,24 +4169,24 @@ public final EObject ruleMatcher() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1412:28: ( ( ( (lv_locator_0_0= ruleLocator ) ) ( (lv_type_1_0= ruleMatcherType ) ) ( (lv_condition_2_0= ruleXBlockExpression ) )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1413:1: ( ( (lv_locator_0_0= ruleLocator ) ) ( (lv_type_1_0= ruleMatcherType ) ) ( (lv_condition_2_0= ruleXBlockExpression ) )? )
+            // InternalFormat.g:1412:28: ( ( ( (lv_locator_0_0= ruleLocator ) ) ( (lv_type_1_0= ruleMatcherType ) ) ( (lv_condition_2_0= ruleXBlockExpression ) )? ) )
+            // InternalFormat.g:1413:1: ( ( (lv_locator_0_0= ruleLocator ) ) ( (lv_type_1_0= ruleMatcherType ) ) ( (lv_condition_2_0= ruleXBlockExpression ) )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1413:1: ( ( (lv_locator_0_0= ruleLocator ) ) ( (lv_type_1_0= ruleMatcherType ) ) ( (lv_condition_2_0= ruleXBlockExpression ) )? )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1413:2: ( (lv_locator_0_0= ruleLocator ) ) ( (lv_type_1_0= ruleMatcherType ) ) ( (lv_condition_2_0= ruleXBlockExpression ) )?
+            // InternalFormat.g:1413:1: ( ( (lv_locator_0_0= ruleLocator ) ) ( (lv_type_1_0= ruleMatcherType ) ) ( (lv_condition_2_0= ruleXBlockExpression ) )? )
+            // InternalFormat.g:1413:2: ( (lv_locator_0_0= ruleLocator ) ) ( (lv_type_1_0= ruleMatcherType ) ) ( (lv_condition_2_0= ruleXBlockExpression ) )?
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1413:2: ( (lv_locator_0_0= ruleLocator ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1414:1: (lv_locator_0_0= ruleLocator )
+            // InternalFormat.g:1413:2: ( (lv_locator_0_0= ruleLocator ) )
+            // InternalFormat.g:1414:1: (lv_locator_0_0= ruleLocator )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1414:1: (lv_locator_0_0= ruleLocator )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1415:3: lv_locator_0_0= ruleLocator
+            // InternalFormat.g:1414:1: (lv_locator_0_0= ruleLocator )
+            // InternalFormat.g:1415:3: lv_locator_0_0= ruleLocator
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getMatcherAccess().getLocatorLocatorParserRuleCall_0_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleLocator_in_ruleMatcher3057);
+            pushFollow(FOLLOW_33);
             lv_locator_0_0=ruleLocator();
 
             state._fsp--;
@@ -4200,7 +4200,7 @@ public final EObject ruleMatcher() throws RecognitionException {
                      			current, 
                      			"locator",
                       		lv_locator_0_0, 
-                      		"Locator");
+                      		"com.avaloq.tools.ddk.xtext.format.Format.Locator");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -4210,18 +4210,18 @@ public final EObject ruleMatcher() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1431:2: ( (lv_type_1_0= ruleMatcherType ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1432:1: (lv_type_1_0= ruleMatcherType )
+            // InternalFormat.g:1431:2: ( (lv_type_1_0= ruleMatcherType ) )
+            // InternalFormat.g:1432:1: (lv_type_1_0= ruleMatcherType )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1432:1: (lv_type_1_0= ruleMatcherType )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1433:3: lv_type_1_0= ruleMatcherType
+            // InternalFormat.g:1432:1: (lv_type_1_0= ruleMatcherType )
+            // InternalFormat.g:1433:3: lv_type_1_0= ruleMatcherType
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getMatcherAccess().getTypeMatcherTypeEnumRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleMatcherType_in_ruleMatcher3078);
+            pushFollow(FOLLOW_34);
             lv_type_1_0=ruleMatcherType();
 
             state._fsp--;
@@ -4235,7 +4235,7 @@ public final EObject ruleMatcher() throws RecognitionException {
                      			current, 
                      			"type",
                       		lv_type_1_0, 
-                      		"MatcherType");
+                      		"com.avaloq.tools.ddk.xtext.format.Format.MatcherType");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -4245,7 +4245,7 @@ public final EObject ruleMatcher() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1449:2: ( (lv_condition_2_0= ruleXBlockExpression ) )?
+            // InternalFormat.g:1449:2: ( (lv_condition_2_0= ruleXBlockExpression ) )?
             int alt26=2;
             int LA26_0 = input.LA(1);
 
@@ -4254,17 +4254,17 @@ public final EObject ruleMatcher() throws RecognitionException {
             }
             switch (alt26) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1450:1: (lv_condition_2_0= ruleXBlockExpression )
+                    // InternalFormat.g:1450:1: (lv_condition_2_0= ruleXBlockExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1450:1: (lv_condition_2_0= ruleXBlockExpression )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1451:3: lv_condition_2_0= ruleXBlockExpression
+                    // InternalFormat.g:1450:1: (lv_condition_2_0= ruleXBlockExpression )
+                    // InternalFormat.g:1451:3: lv_condition_2_0= ruleXBlockExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getMatcherAccess().getConditionXBlockExpressionParserRuleCall_2_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXBlockExpression_in_ruleMatcher3099);
+                    pushFollow(FOLLOW_2);
                     lv_condition_2_0=ruleXBlockExpression();
 
                     state._fsp--;
@@ -4278,7 +4278,7 @@ public final EObject ruleMatcher() throws RecognitionException {
                              			current, 
                              			"condition",
                               		lv_condition_2_0, 
-                              		"XBlockExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XBlockExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -4314,7 +4314,7 @@ public final EObject ruleMatcher() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleLocator"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1475:1: entryRuleLocator returns [EObject current=null] : iv_ruleLocator= ruleLocator EOF ;
+    // InternalFormat.g:1475:1: entryRuleLocator returns [EObject current=null] : iv_ruleLocator= ruleLocator EOF ;
     public final EObject entryRuleLocator() throws RecognitionException {
         EObject current = null;
 
@@ -4322,13 +4322,13 @@ public final EObject entryRuleLocator() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1476:2: (iv_ruleLocator= ruleLocator EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1477:2: iv_ruleLocator= ruleLocator EOF
+            // InternalFormat.g:1476:2: (iv_ruleLocator= ruleLocator EOF )
+            // InternalFormat.g:1477:2: iv_ruleLocator= ruleLocator EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getLocatorRule()); 
             }
-            pushFollow(FOLLOW_ruleLocator_in_entryRuleLocator3136);
+            pushFollow(FOLLOW_1);
             iv_ruleLocator=ruleLocator();
 
             state._fsp--;
@@ -4336,7 +4336,7 @@ public final EObject entryRuleLocator() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleLocator; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleLocator3146); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -4354,7 +4354,7 @@ public final EObject entryRuleLocator() throws RecognitionException {
 
 
     // $ANTLR start "ruleLocator"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1484:1: ruleLocator returns [EObject current=null] : (this_SpaceLocator_0= ruleSpaceLocator | this_RightPaddingLocator_1= ruleRightPaddingLocator | this_LinewrapLocator_2= ruleLinewrapLocator | this_ColumnLocator_3= ruleColumnLocator | this_OffsetLocator_4= ruleOffsetLocator | this_IndentLocator_5= ruleIndentLocator | this_NoFormatLocator_6= ruleNoFormatLocator ) ;
+    // InternalFormat.g:1484:1: ruleLocator returns [EObject current=null] : (this_SpaceLocator_0= ruleSpaceLocator | this_RightPaddingLocator_1= ruleRightPaddingLocator | this_LinewrapLocator_2= ruleLinewrapLocator | this_ColumnLocator_3= ruleColumnLocator | this_OffsetLocator_4= ruleOffsetLocator | this_IndentLocator_5= ruleIndentLocator | this_NoFormatLocator_6= ruleNoFormatLocator ) ;
     public final EObject ruleLocator() throws RecognitionException {
         EObject current = null;
 
@@ -4376,10 +4376,10 @@ public final EObject ruleLocator() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1487:28: ( (this_SpaceLocator_0= ruleSpaceLocator | this_RightPaddingLocator_1= ruleRightPaddingLocator | this_LinewrapLocator_2= ruleLinewrapLocator | this_ColumnLocator_3= ruleColumnLocator | this_OffsetLocator_4= ruleOffsetLocator | this_IndentLocator_5= ruleIndentLocator | this_NoFormatLocator_6= ruleNoFormatLocator ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1488:1: (this_SpaceLocator_0= ruleSpaceLocator | this_RightPaddingLocator_1= ruleRightPaddingLocator | this_LinewrapLocator_2= ruleLinewrapLocator | this_ColumnLocator_3= ruleColumnLocator | this_OffsetLocator_4= ruleOffsetLocator | this_IndentLocator_5= ruleIndentLocator | this_NoFormatLocator_6= ruleNoFormatLocator )
+            // InternalFormat.g:1487:28: ( (this_SpaceLocator_0= ruleSpaceLocator | this_RightPaddingLocator_1= ruleRightPaddingLocator | this_LinewrapLocator_2= ruleLinewrapLocator | this_ColumnLocator_3= ruleColumnLocator | this_OffsetLocator_4= ruleOffsetLocator | this_IndentLocator_5= ruleIndentLocator | this_NoFormatLocator_6= ruleNoFormatLocator ) )
+            // InternalFormat.g:1488:1: (this_SpaceLocator_0= ruleSpaceLocator | this_RightPaddingLocator_1= ruleRightPaddingLocator | this_LinewrapLocator_2= ruleLinewrapLocator | this_ColumnLocator_3= ruleColumnLocator | this_OffsetLocator_4= ruleOffsetLocator | this_IndentLocator_5= ruleIndentLocator | this_NoFormatLocator_6= ruleNoFormatLocator )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1488:1: (this_SpaceLocator_0= ruleSpaceLocator | this_RightPaddingLocator_1= ruleRightPaddingLocator | this_LinewrapLocator_2= ruleLinewrapLocator | this_ColumnLocator_3= ruleColumnLocator | this_OffsetLocator_4= ruleOffsetLocator | this_IndentLocator_5= ruleIndentLocator | this_NoFormatLocator_6= ruleNoFormatLocator )
+            // InternalFormat.g:1488:1: (this_SpaceLocator_0= ruleSpaceLocator | this_RightPaddingLocator_1= ruleRightPaddingLocator | this_LinewrapLocator_2= ruleLinewrapLocator | this_ColumnLocator_3= ruleColumnLocator | this_OffsetLocator_4= ruleOffsetLocator | this_IndentLocator_5= ruleIndentLocator | this_NoFormatLocator_6= ruleNoFormatLocator )
             int alt27=7;
             switch ( input.LA(1) ) {
             case 39:
@@ -4430,14 +4430,14 @@ public final EObject ruleLocator() throws RecognitionException {
 
             switch (alt27) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1489:5: this_SpaceLocator_0= ruleSpaceLocator
+                    // InternalFormat.g:1489:5: this_SpaceLocator_0= ruleSpaceLocator
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getLocatorAccess().getSpaceLocatorParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleSpaceLocator_in_ruleLocator3193);
+                    pushFollow(FOLLOW_2);
                     this_SpaceLocator_0=ruleSpaceLocator();
 
                     state._fsp--;
@@ -4452,14 +4452,14 @@ public final EObject ruleLocator() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1499:5: this_RightPaddingLocator_1= ruleRightPaddingLocator
+                    // InternalFormat.g:1499:5: this_RightPaddingLocator_1= ruleRightPaddingLocator
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getLocatorAccess().getRightPaddingLocatorParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleRightPaddingLocator_in_ruleLocator3220);
+                    pushFollow(FOLLOW_2);
                     this_RightPaddingLocator_1=ruleRightPaddingLocator();
 
                     state._fsp--;
@@ -4474,14 +4474,14 @@ public final EObject ruleLocator() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1509:5: this_LinewrapLocator_2= ruleLinewrapLocator
+                    // InternalFormat.g:1509:5: this_LinewrapLocator_2= ruleLinewrapLocator
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getLocatorAccess().getLinewrapLocatorParserRuleCall_2()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleLinewrapLocator_in_ruleLocator3247);
+                    pushFollow(FOLLOW_2);
                     this_LinewrapLocator_2=ruleLinewrapLocator();
 
                     state._fsp--;
@@ -4496,14 +4496,14 @@ public final EObject ruleLocator() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1519:5: this_ColumnLocator_3= ruleColumnLocator
+                    // InternalFormat.g:1519:5: this_ColumnLocator_3= ruleColumnLocator
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getLocatorAccess().getColumnLocatorParserRuleCall_3()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleColumnLocator_in_ruleLocator3274);
+                    pushFollow(FOLLOW_2);
                     this_ColumnLocator_3=ruleColumnLocator();
 
                     state._fsp--;
@@ -4518,14 +4518,14 @@ public final EObject ruleLocator() throws RecognitionException {
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1529:5: this_OffsetLocator_4= ruleOffsetLocator
+                    // InternalFormat.g:1529:5: this_OffsetLocator_4= ruleOffsetLocator
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getLocatorAccess().getOffsetLocatorParserRuleCall_4()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleOffsetLocator_in_ruleLocator3301);
+                    pushFollow(FOLLOW_2);
                     this_OffsetLocator_4=ruleOffsetLocator();
 
                     state._fsp--;
@@ -4540,14 +4540,14 @@ public final EObject ruleLocator() throws RecognitionException {
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1539:5: this_IndentLocator_5= ruleIndentLocator
+                    // InternalFormat.g:1539:5: this_IndentLocator_5= ruleIndentLocator
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getLocatorAccess().getIndentLocatorParserRuleCall_5()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleIndentLocator_in_ruleLocator3328);
+                    pushFollow(FOLLOW_2);
                     this_IndentLocator_5=ruleIndentLocator();
 
                     state._fsp--;
@@ -4562,14 +4562,14 @@ public final EObject ruleLocator() throws RecognitionException {
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1549:5: this_NoFormatLocator_6= ruleNoFormatLocator
+                    // InternalFormat.g:1549:5: this_NoFormatLocator_6= ruleNoFormatLocator
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getLocatorAccess().getNoFormatLocatorParserRuleCall_6()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleNoFormatLocator_in_ruleLocator3355);
+                    pushFollow(FOLLOW_2);
                     this_NoFormatLocator_6=ruleNoFormatLocator();
 
                     state._fsp--;
@@ -4606,7 +4606,7 @@ public final EObject ruleLocator() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleNoFormatLocator"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1565:1: entryRuleNoFormatLocator returns [EObject current=null] : iv_ruleNoFormatLocator= ruleNoFormatLocator EOF ;
+    // InternalFormat.g:1565:1: entryRuleNoFormatLocator returns [EObject current=null] : iv_ruleNoFormatLocator= ruleNoFormatLocator EOF ;
     public final EObject entryRuleNoFormatLocator() throws RecognitionException {
         EObject current = null;
 
@@ -4614,13 +4614,13 @@ public final EObject entryRuleNoFormatLocator() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1566:2: (iv_ruleNoFormatLocator= ruleNoFormatLocator EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1567:2: iv_ruleNoFormatLocator= ruleNoFormatLocator EOF
+            // InternalFormat.g:1566:2: (iv_ruleNoFormatLocator= ruleNoFormatLocator EOF )
+            // InternalFormat.g:1567:2: iv_ruleNoFormatLocator= ruleNoFormatLocator EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getNoFormatLocatorRule()); 
             }
-            pushFollow(FOLLOW_ruleNoFormatLocator_in_entryRuleNoFormatLocator3390);
+            pushFollow(FOLLOW_1);
             iv_ruleNoFormatLocator=ruleNoFormatLocator();
 
             state._fsp--;
@@ -4628,7 +4628,7 @@ public final EObject entryRuleNoFormatLocator() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleNoFormatLocator; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNoFormatLocator3400); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -4646,7 +4646,7 @@ public final EObject entryRuleNoFormatLocator() throws RecognitionException {
 
 
     // $ANTLR start "ruleNoFormatLocator"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1574:1: ruleNoFormatLocator returns [EObject current=null] : ( () otherlv_1= 'no_format' ) ;
+    // InternalFormat.g:1574:1: ruleNoFormatLocator returns [EObject current=null] : ( () otherlv_1= 'no_format' ) ;
     public final EObject ruleNoFormatLocator() throws RecognitionException {
         EObject current = null;
 
@@ -4655,14 +4655,14 @@ public final EObject ruleNoFormatLocator() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1577:28: ( ( () otherlv_1= 'no_format' ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1578:1: ( () otherlv_1= 'no_format' )
+            // InternalFormat.g:1577:28: ( ( () otherlv_1= 'no_format' ) )
+            // InternalFormat.g:1578:1: ( () otherlv_1= 'no_format' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1578:1: ( () otherlv_1= 'no_format' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1578:2: () otherlv_1= 'no_format'
+            // InternalFormat.g:1578:1: ( () otherlv_1= 'no_format' )
+            // InternalFormat.g:1578:2: () otherlv_1= 'no_format'
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1578:2: ()
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1579:5: 
+            // InternalFormat.g:1578:2: ()
+            // InternalFormat.g:1579:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -4674,7 +4674,7 @@ public final EObject ruleNoFormatLocator() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,38,FOLLOW_38_in_ruleNoFormatLocator3446); if (state.failed) return current;
+            otherlv_1=(Token)match(input,38,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getNoFormatLocatorAccess().getNo_formatKeyword_1());
@@ -4703,7 +4703,7 @@ public final EObject ruleNoFormatLocator() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleSpaceLocator"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1596:1: entryRuleSpaceLocator returns [EObject current=null] : iv_ruleSpaceLocator= ruleSpaceLocator EOF ;
+    // InternalFormat.g:1596:1: entryRuleSpaceLocator returns [EObject current=null] : iv_ruleSpaceLocator= ruleSpaceLocator EOF ;
     public final EObject entryRuleSpaceLocator() throws RecognitionException {
         EObject current = null;
 
@@ -4711,13 +4711,13 @@ public final EObject entryRuleSpaceLocator() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1597:2: (iv_ruleSpaceLocator= ruleSpaceLocator EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1598:2: iv_ruleSpaceLocator= ruleSpaceLocator EOF
+            // InternalFormat.g:1597:2: (iv_ruleSpaceLocator= ruleSpaceLocator EOF )
+            // InternalFormat.g:1598:2: iv_ruleSpaceLocator= ruleSpaceLocator EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getSpaceLocatorRule()); 
             }
-            pushFollow(FOLLOW_ruleSpaceLocator_in_entryRuleSpaceLocator3482);
+            pushFollow(FOLLOW_1);
             iv_ruleSpaceLocator=ruleSpaceLocator();
 
             state._fsp--;
@@ -4725,7 +4725,7 @@ public final EObject entryRuleSpaceLocator() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleSpaceLocator; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSpaceLocator3492); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -4743,7 +4743,7 @@ public final EObject entryRuleSpaceLocator() throws RecognitionException {
 
 
     // $ANTLR start "ruleSpaceLocator"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1605:1: ruleSpaceLocator returns [EObject current=null] : ( (otherlv_0= 'space' ( (lv_value_1_0= ruleStringValue ) ) ) | ( (lv_noSpace_2_0= 'no_space' ) ) ) ;
+    // InternalFormat.g:1605:1: ruleSpaceLocator returns [EObject current=null] : ( (otherlv_0= 'space' ( (lv_value_1_0= ruleStringValue ) ) ) | ( (lv_noSpace_2_0= 'no_space' ) ) ) ;
     public final EObject ruleSpaceLocator() throws RecognitionException {
         EObject current = null;
 
@@ -4755,10 +4755,10 @@ public final EObject ruleSpaceLocator() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1608:28: ( ( (otherlv_0= 'space' ( (lv_value_1_0= ruleStringValue ) ) ) | ( (lv_noSpace_2_0= 'no_space' ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1609:1: ( (otherlv_0= 'space' ( (lv_value_1_0= ruleStringValue ) ) ) | ( (lv_noSpace_2_0= 'no_space' ) ) )
+            // InternalFormat.g:1608:28: ( ( (otherlv_0= 'space' ( (lv_value_1_0= ruleStringValue ) ) ) | ( (lv_noSpace_2_0= 'no_space' ) ) ) )
+            // InternalFormat.g:1609:1: ( (otherlv_0= 'space' ( (lv_value_1_0= ruleStringValue ) ) ) | ( (lv_noSpace_2_0= 'no_space' ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1609:1: ( (otherlv_0= 'space' ( (lv_value_1_0= ruleStringValue ) ) ) | ( (lv_noSpace_2_0= 'no_space' ) ) )
+            // InternalFormat.g:1609:1: ( (otherlv_0= 'space' ( (lv_value_1_0= ruleStringValue ) ) ) | ( (lv_noSpace_2_0= 'no_space' ) ) )
             int alt28=2;
             int LA28_0 = input.LA(1);
 
@@ -4777,29 +4777,29 @@ else if ( (LA28_0==40) ) {
             }
             switch (alt28) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1609:2: (otherlv_0= 'space' ( (lv_value_1_0= ruleStringValue ) ) )
+                    // InternalFormat.g:1609:2: (otherlv_0= 'space' ( (lv_value_1_0= ruleStringValue ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1609:2: (otherlv_0= 'space' ( (lv_value_1_0= ruleStringValue ) ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1609:4: otherlv_0= 'space' ( (lv_value_1_0= ruleStringValue ) )
+                    // InternalFormat.g:1609:2: (otherlv_0= 'space' ( (lv_value_1_0= ruleStringValue ) ) )
+                    // InternalFormat.g:1609:4: otherlv_0= 'space' ( (lv_value_1_0= ruleStringValue ) )
                     {
-                    otherlv_0=(Token)match(input,39,FOLLOW_39_in_ruleSpaceLocator3530); if (state.failed) return current;
+                    otherlv_0=(Token)match(input,39,FOLLOW_19); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_0, grammarAccess.getSpaceLocatorAccess().getSpaceKeyword_0_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1613:1: ( (lv_value_1_0= ruleStringValue ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1614:1: (lv_value_1_0= ruleStringValue )
+                    // InternalFormat.g:1613:1: ( (lv_value_1_0= ruleStringValue ) )
+                    // InternalFormat.g:1614:1: (lv_value_1_0= ruleStringValue )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1614:1: (lv_value_1_0= ruleStringValue )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1615:3: lv_value_1_0= ruleStringValue
+                    // InternalFormat.g:1614:1: (lv_value_1_0= ruleStringValue )
+                    // InternalFormat.g:1615:3: lv_value_1_0= ruleStringValue
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getSpaceLocatorAccess().getValueStringValueParserRuleCall_0_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleStringValue_in_ruleSpaceLocator3551);
+                    pushFollow(FOLLOW_2);
                     lv_value_1_0=ruleStringValue();
 
                     state._fsp--;
@@ -4813,7 +4813,7 @@ else if ( (LA28_0==40) ) {
                              			current, 
                              			"value",
                               		lv_value_1_0, 
-                              		"StringValue");
+                              		"com.avaloq.tools.ddk.xtext.format.Format.StringValue");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -4830,15 +4830,15 @@ else if ( (LA28_0==40) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1632:6: ( (lv_noSpace_2_0= 'no_space' ) )
+                    // InternalFormat.g:1632:6: ( (lv_noSpace_2_0= 'no_space' ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1632:6: ( (lv_noSpace_2_0= 'no_space' ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1633:1: (lv_noSpace_2_0= 'no_space' )
+                    // InternalFormat.g:1632:6: ( (lv_noSpace_2_0= 'no_space' ) )
+                    // InternalFormat.g:1633:1: (lv_noSpace_2_0= 'no_space' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1633:1: (lv_noSpace_2_0= 'no_space' )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1634:3: lv_noSpace_2_0= 'no_space'
+                    // InternalFormat.g:1633:1: (lv_noSpace_2_0= 'no_space' )
+                    // InternalFormat.g:1634:3: lv_noSpace_2_0= 'no_space'
                     {
-                    lv_noSpace_2_0=(Token)match(input,40,FOLLOW_40_in_ruleSpaceLocator3576); if (state.failed) return current;
+                    lv_noSpace_2_0=(Token)match(input,40,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_noSpace_2_0, grammarAccess.getSpaceLocatorAccess().getNoSpaceNo_spaceKeyword_1_0());
@@ -4884,7 +4884,7 @@ else if ( (LA28_0==40) ) {
 
 
     // $ANTLR start "entryRuleRightPaddingLocator"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1655:1: entryRuleRightPaddingLocator returns [EObject current=null] : iv_ruleRightPaddingLocator= ruleRightPaddingLocator EOF ;
+    // InternalFormat.g:1655:1: entryRuleRightPaddingLocator returns [EObject current=null] : iv_ruleRightPaddingLocator= ruleRightPaddingLocator EOF ;
     public final EObject entryRuleRightPaddingLocator() throws RecognitionException {
         EObject current = null;
 
@@ -4892,13 +4892,13 @@ public final EObject entryRuleRightPaddingLocator() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1656:2: (iv_ruleRightPaddingLocator= ruleRightPaddingLocator EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1657:2: iv_ruleRightPaddingLocator= ruleRightPaddingLocator EOF
+            // InternalFormat.g:1656:2: (iv_ruleRightPaddingLocator= ruleRightPaddingLocator EOF )
+            // InternalFormat.g:1657:2: iv_ruleRightPaddingLocator= ruleRightPaddingLocator EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getRightPaddingLocatorRule()); 
             }
-            pushFollow(FOLLOW_ruleRightPaddingLocator_in_entryRuleRightPaddingLocator3625);
+            pushFollow(FOLLOW_1);
             iv_ruleRightPaddingLocator=ruleRightPaddingLocator();
 
             state._fsp--;
@@ -4906,7 +4906,7 @@ public final EObject entryRuleRightPaddingLocator() throws RecognitionException
             if ( state.backtracking==0 ) {
                current =iv_ruleRightPaddingLocator; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRightPaddingLocator3635); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -4924,7 +4924,7 @@ public final EObject entryRuleRightPaddingLocator() throws RecognitionException
 
 
     // $ANTLR start "ruleRightPaddingLocator"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1664:1: ruleRightPaddingLocator returns [EObject current=null] : (otherlv_0= 'right_padding' ( (lv_value_1_0= ruleIntValue ) ) ) ;
+    // InternalFormat.g:1664:1: ruleRightPaddingLocator returns [EObject current=null] : (otherlv_0= 'right_padding' ( (lv_value_1_0= ruleIntValue ) ) ) ;
     public final EObject ruleRightPaddingLocator() throws RecognitionException {
         EObject current = null;
 
@@ -4935,30 +4935,30 @@ public final EObject ruleRightPaddingLocator() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1667:28: ( (otherlv_0= 'right_padding' ( (lv_value_1_0= ruleIntValue ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1668:1: (otherlv_0= 'right_padding' ( (lv_value_1_0= ruleIntValue ) ) )
+            // InternalFormat.g:1667:28: ( (otherlv_0= 'right_padding' ( (lv_value_1_0= ruleIntValue ) ) ) )
+            // InternalFormat.g:1668:1: (otherlv_0= 'right_padding' ( (lv_value_1_0= ruleIntValue ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1668:1: (otherlv_0= 'right_padding' ( (lv_value_1_0= ruleIntValue ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1668:3: otherlv_0= 'right_padding' ( (lv_value_1_0= ruleIntValue ) )
+            // InternalFormat.g:1668:1: (otherlv_0= 'right_padding' ( (lv_value_1_0= ruleIntValue ) ) )
+            // InternalFormat.g:1668:3: otherlv_0= 'right_padding' ( (lv_value_1_0= ruleIntValue ) )
             {
-            otherlv_0=(Token)match(input,41,FOLLOW_41_in_ruleRightPaddingLocator3672); if (state.failed) return current;
+            otherlv_0=(Token)match(input,41,FOLLOW_35); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getRightPaddingLocatorAccess().getRight_paddingKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1672:1: ( (lv_value_1_0= ruleIntValue ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1673:1: (lv_value_1_0= ruleIntValue )
+            // InternalFormat.g:1672:1: ( (lv_value_1_0= ruleIntValue ) )
+            // InternalFormat.g:1673:1: (lv_value_1_0= ruleIntValue )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1673:1: (lv_value_1_0= ruleIntValue )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1674:3: lv_value_1_0= ruleIntValue
+            // InternalFormat.g:1673:1: (lv_value_1_0= ruleIntValue )
+            // InternalFormat.g:1674:3: lv_value_1_0= ruleIntValue
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getRightPaddingLocatorAccess().getValueIntValueParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleIntValue_in_ruleRightPaddingLocator3693);
+            pushFollow(FOLLOW_2);
             lv_value_1_0=ruleIntValue();
 
             state._fsp--;
@@ -4972,7 +4972,7 @@ public final EObject ruleRightPaddingLocator() throws RecognitionException {
                      			current, 
                      			"value",
                       		lv_value_1_0, 
-                      		"IntValue");
+                      		"com.avaloq.tools.ddk.xtext.format.Format.IntValue");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -5005,7 +5005,7 @@ public final EObject ruleRightPaddingLocator() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleLinewrapLocator"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1698:1: entryRuleLinewrapLocator returns [EObject current=null] : iv_ruleLinewrapLocator= ruleLinewrapLocator EOF ;
+    // InternalFormat.g:1698:1: entryRuleLinewrapLocator returns [EObject current=null] : iv_ruleLinewrapLocator= ruleLinewrapLocator EOF ;
     public final EObject entryRuleLinewrapLocator() throws RecognitionException {
         EObject current = null;
 
@@ -5013,13 +5013,13 @@ public final EObject entryRuleLinewrapLocator() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1699:2: (iv_ruleLinewrapLocator= ruleLinewrapLocator EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1700:2: iv_ruleLinewrapLocator= ruleLinewrapLocator EOF
+            // InternalFormat.g:1699:2: (iv_ruleLinewrapLocator= ruleLinewrapLocator EOF )
+            // InternalFormat.g:1700:2: iv_ruleLinewrapLocator= ruleLinewrapLocator EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getLinewrapLocatorRule()); 
             }
-            pushFollow(FOLLOW_ruleLinewrapLocator_in_entryRuleLinewrapLocator3729);
+            pushFollow(FOLLOW_1);
             iv_ruleLinewrapLocator=ruleLinewrapLocator();
 
             state._fsp--;
@@ -5027,7 +5027,7 @@ public final EObject entryRuleLinewrapLocator() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleLinewrapLocator; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleLinewrapLocator3739); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -5045,7 +5045,7 @@ public final EObject entryRuleLinewrapLocator() throws RecognitionException {
 
 
     // $ANTLR start "ruleLinewrapLocator"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1707:1: ruleLinewrapLocator returns [EObject current=null] : ( ( () (otherlv_1= 'linewrap' ( ( (lv_value_2_0= ruleIntValue ) ) | ( ( (lv_minimum_3_0= ruleIntValue ) ) ( (lv_default_4_0= ruleIntValue ) ) ( (lv_maximum_5_0= ruleIntValue ) ) ) )? ) ) | ( (lv_noLinewrap_6_0= 'no_linewrap' ) ) ) ;
+    // InternalFormat.g:1707:1: ruleLinewrapLocator returns [EObject current=null] : ( ( () (otherlv_1= 'linewrap' ( ( (lv_value_2_0= ruleIntValue ) ) | ( ( (lv_minimum_3_0= ruleIntValue ) ) ( (lv_default_4_0= ruleIntValue ) ) ( (lv_maximum_5_0= ruleIntValue ) ) ) )? ) ) | ( (lv_noLinewrap_6_0= 'no_linewrap' ) ) ) ;
     public final EObject ruleLinewrapLocator() throws RecognitionException {
         EObject current = null;
 
@@ -5063,10 +5063,10 @@ public final EObject ruleLinewrapLocator() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1710:28: ( ( ( () (otherlv_1= 'linewrap' ( ( (lv_value_2_0= ruleIntValue ) ) | ( ( (lv_minimum_3_0= ruleIntValue ) ) ( (lv_default_4_0= ruleIntValue ) ) ( (lv_maximum_5_0= ruleIntValue ) ) ) )? ) ) | ( (lv_noLinewrap_6_0= 'no_linewrap' ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1711:1: ( ( () (otherlv_1= 'linewrap' ( ( (lv_value_2_0= ruleIntValue ) ) | ( ( (lv_minimum_3_0= ruleIntValue ) ) ( (lv_default_4_0= ruleIntValue ) ) ( (lv_maximum_5_0= ruleIntValue ) ) ) )? ) ) | ( (lv_noLinewrap_6_0= 'no_linewrap' ) ) )
+            // InternalFormat.g:1710:28: ( ( ( () (otherlv_1= 'linewrap' ( ( (lv_value_2_0= ruleIntValue ) ) | ( ( (lv_minimum_3_0= ruleIntValue ) ) ( (lv_default_4_0= ruleIntValue ) ) ( (lv_maximum_5_0= ruleIntValue ) ) ) )? ) ) | ( (lv_noLinewrap_6_0= 'no_linewrap' ) ) ) )
+            // InternalFormat.g:1711:1: ( ( () (otherlv_1= 'linewrap' ( ( (lv_value_2_0= ruleIntValue ) ) | ( ( (lv_minimum_3_0= ruleIntValue ) ) ( (lv_default_4_0= ruleIntValue ) ) ( (lv_maximum_5_0= ruleIntValue ) ) ) )? ) ) | ( (lv_noLinewrap_6_0= 'no_linewrap' ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1711:1: ( ( () (otherlv_1= 'linewrap' ( ( (lv_value_2_0= ruleIntValue ) ) | ( ( (lv_minimum_3_0= ruleIntValue ) ) ( (lv_default_4_0= ruleIntValue ) ) ( (lv_maximum_5_0= ruleIntValue ) ) ) )? ) ) | ( (lv_noLinewrap_6_0= 'no_linewrap' ) ) )
+            // InternalFormat.g:1711:1: ( ( () (otherlv_1= 'linewrap' ( ( (lv_value_2_0= ruleIntValue ) ) | ( ( (lv_minimum_3_0= ruleIntValue ) ) ( (lv_default_4_0= ruleIntValue ) ) ( (lv_maximum_5_0= ruleIntValue ) ) ) )? ) ) | ( (lv_noLinewrap_6_0= 'no_linewrap' ) ) )
             int alt30=2;
             int LA30_0 = input.LA(1);
 
@@ -5085,13 +5085,13 @@ else if ( (LA30_0==43) ) {
             }
             switch (alt30) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1711:2: ( () (otherlv_1= 'linewrap' ( ( (lv_value_2_0= ruleIntValue ) ) | ( ( (lv_minimum_3_0= ruleIntValue ) ) ( (lv_default_4_0= ruleIntValue ) ) ( (lv_maximum_5_0= ruleIntValue ) ) ) )? ) )
+                    // InternalFormat.g:1711:2: ( () (otherlv_1= 'linewrap' ( ( (lv_value_2_0= ruleIntValue ) ) | ( ( (lv_minimum_3_0= ruleIntValue ) ) ( (lv_default_4_0= ruleIntValue ) ) ( (lv_maximum_5_0= ruleIntValue ) ) ) )? ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1711:2: ( () (otherlv_1= 'linewrap' ( ( (lv_value_2_0= ruleIntValue ) ) | ( ( (lv_minimum_3_0= ruleIntValue ) ) ( (lv_default_4_0= ruleIntValue ) ) ( (lv_maximum_5_0= ruleIntValue ) ) ) )? ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1711:3: () (otherlv_1= 'linewrap' ( ( (lv_value_2_0= ruleIntValue ) ) | ( ( (lv_minimum_3_0= ruleIntValue ) ) ( (lv_default_4_0= ruleIntValue ) ) ( (lv_maximum_5_0= ruleIntValue ) ) ) )? )
+                    // InternalFormat.g:1711:2: ( () (otherlv_1= 'linewrap' ( ( (lv_value_2_0= ruleIntValue ) ) | ( ( (lv_minimum_3_0= ruleIntValue ) ) ( (lv_default_4_0= ruleIntValue ) ) ( (lv_maximum_5_0= ruleIntValue ) ) ) )? ) )
+                    // InternalFormat.g:1711:3: () (otherlv_1= 'linewrap' ( ( (lv_value_2_0= ruleIntValue ) ) | ( ( (lv_minimum_3_0= ruleIntValue ) ) ( (lv_default_4_0= ruleIntValue ) ) ( (lv_maximum_5_0= ruleIntValue ) ) ) )? )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1711:3: ()
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1712:5: 
+                    // InternalFormat.g:1711:3: ()
+                    // InternalFormat.g:1712:5: 
                     {
                     if ( state.backtracking==0 ) {
 
@@ -5103,34 +5103,34 @@ else if ( (LA30_0==43) ) {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1717:2: (otherlv_1= 'linewrap' ( ( (lv_value_2_0= ruleIntValue ) ) | ( ( (lv_minimum_3_0= ruleIntValue ) ) ( (lv_default_4_0= ruleIntValue ) ) ( (lv_maximum_5_0= ruleIntValue ) ) ) )? )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1717:4: otherlv_1= 'linewrap' ( ( (lv_value_2_0= ruleIntValue ) ) | ( ( (lv_minimum_3_0= ruleIntValue ) ) ( (lv_default_4_0= ruleIntValue ) ) ( (lv_maximum_5_0= ruleIntValue ) ) ) )?
+                    // InternalFormat.g:1717:2: (otherlv_1= 'linewrap' ( ( (lv_value_2_0= ruleIntValue ) ) | ( ( (lv_minimum_3_0= ruleIntValue ) ) ( (lv_default_4_0= ruleIntValue ) ) ( (lv_maximum_5_0= ruleIntValue ) ) ) )? )
+                    // InternalFormat.g:1717:4: otherlv_1= 'linewrap' ( ( (lv_value_2_0= ruleIntValue ) ) | ( ( (lv_minimum_3_0= ruleIntValue ) ) ( (lv_default_4_0= ruleIntValue ) ) ( (lv_maximum_5_0= ruleIntValue ) ) ) )?
                     {
-                    otherlv_1=(Token)match(input,42,FOLLOW_42_in_ruleLinewrapLocator3787); if (state.failed) return current;
+                    otherlv_1=(Token)match(input,42,FOLLOW_36); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_1, grammarAccess.getLinewrapLocatorAccess().getLinewrapKeyword_0_1_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1721:1: ( ( (lv_value_2_0= ruleIntValue ) ) | ( ( (lv_minimum_3_0= ruleIntValue ) ) ( (lv_default_4_0= ruleIntValue ) ) ( (lv_maximum_5_0= ruleIntValue ) ) ) )?
+                    // InternalFormat.g:1721:1: ( ( (lv_value_2_0= ruleIntValue ) ) | ( ( (lv_minimum_3_0= ruleIntValue ) ) ( (lv_default_4_0= ruleIntValue ) ) ( (lv_maximum_5_0= ruleIntValue ) ) ) )?
                     int alt29=3;
                     alt29 = dfa29.predict(input);
                     switch (alt29) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1721:2: ( (lv_value_2_0= ruleIntValue ) )
+                            // InternalFormat.g:1721:2: ( (lv_value_2_0= ruleIntValue ) )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1721:2: ( (lv_value_2_0= ruleIntValue ) )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1722:1: (lv_value_2_0= ruleIntValue )
+                            // InternalFormat.g:1721:2: ( (lv_value_2_0= ruleIntValue ) )
+                            // InternalFormat.g:1722:1: (lv_value_2_0= ruleIntValue )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1722:1: (lv_value_2_0= ruleIntValue )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1723:3: lv_value_2_0= ruleIntValue
+                            // InternalFormat.g:1722:1: (lv_value_2_0= ruleIntValue )
+                            // InternalFormat.g:1723:3: lv_value_2_0= ruleIntValue
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getLinewrapLocatorAccess().getValueIntValueParserRuleCall_0_1_1_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleIntValue_in_ruleLinewrapLocator3809);
+                            pushFollow(FOLLOW_2);
                             lv_value_2_0=ruleIntValue();
 
                             state._fsp--;
@@ -5144,7 +5144,7 @@ else if ( (LA30_0==43) ) {
                                      			current, 
                                      			"value",
                                       		lv_value_2_0, 
-                                      		"IntValue");
+                                      		"com.avaloq.tools.ddk.xtext.format.Format.IntValue");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -5158,23 +5158,23 @@ else if ( (LA30_0==43) ) {
                             }
                             break;
                         case 2 :
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1740:6: ( ( (lv_minimum_3_0= ruleIntValue ) ) ( (lv_default_4_0= ruleIntValue ) ) ( (lv_maximum_5_0= ruleIntValue ) ) )
+                            // InternalFormat.g:1740:6: ( ( (lv_minimum_3_0= ruleIntValue ) ) ( (lv_default_4_0= ruleIntValue ) ) ( (lv_maximum_5_0= ruleIntValue ) ) )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1740:6: ( ( (lv_minimum_3_0= ruleIntValue ) ) ( (lv_default_4_0= ruleIntValue ) ) ( (lv_maximum_5_0= ruleIntValue ) ) )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1740:7: ( (lv_minimum_3_0= ruleIntValue ) ) ( (lv_default_4_0= ruleIntValue ) ) ( (lv_maximum_5_0= ruleIntValue ) )
+                            // InternalFormat.g:1740:6: ( ( (lv_minimum_3_0= ruleIntValue ) ) ( (lv_default_4_0= ruleIntValue ) ) ( (lv_maximum_5_0= ruleIntValue ) ) )
+                            // InternalFormat.g:1740:7: ( (lv_minimum_3_0= ruleIntValue ) ) ( (lv_default_4_0= ruleIntValue ) ) ( (lv_maximum_5_0= ruleIntValue ) )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1740:7: ( (lv_minimum_3_0= ruleIntValue ) )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1741:1: (lv_minimum_3_0= ruleIntValue )
+                            // InternalFormat.g:1740:7: ( (lv_minimum_3_0= ruleIntValue ) )
+                            // InternalFormat.g:1741:1: (lv_minimum_3_0= ruleIntValue )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1741:1: (lv_minimum_3_0= ruleIntValue )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1742:3: lv_minimum_3_0= ruleIntValue
+                            // InternalFormat.g:1741:1: (lv_minimum_3_0= ruleIntValue )
+                            // InternalFormat.g:1742:3: lv_minimum_3_0= ruleIntValue
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getLinewrapLocatorAccess().getMinimumIntValueParserRuleCall_0_1_1_1_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleIntValue_in_ruleLinewrapLocator3837);
+                            pushFollow(FOLLOW_35);
                             lv_minimum_3_0=ruleIntValue();
 
                             state._fsp--;
@@ -5188,7 +5188,7 @@ else if ( (LA30_0==43) ) {
                                      			current, 
                                      			"minimum",
                                       		lv_minimum_3_0, 
-                                      		"IntValue");
+                                      		"com.avaloq.tools.ddk.xtext.format.Format.IntValue");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -5198,18 +5198,18 @@ else if ( (LA30_0==43) ) {
 
                             }
 
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1758:2: ( (lv_default_4_0= ruleIntValue ) )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1759:1: (lv_default_4_0= ruleIntValue )
+                            // InternalFormat.g:1758:2: ( (lv_default_4_0= ruleIntValue ) )
+                            // InternalFormat.g:1759:1: (lv_default_4_0= ruleIntValue )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1759:1: (lv_default_4_0= ruleIntValue )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1760:3: lv_default_4_0= ruleIntValue
+                            // InternalFormat.g:1759:1: (lv_default_4_0= ruleIntValue )
+                            // InternalFormat.g:1760:3: lv_default_4_0= ruleIntValue
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getLinewrapLocatorAccess().getDefaultIntValueParserRuleCall_0_1_1_1_1_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleIntValue_in_ruleLinewrapLocator3858);
+                            pushFollow(FOLLOW_35);
                             lv_default_4_0=ruleIntValue();
 
                             state._fsp--;
@@ -5223,7 +5223,7 @@ else if ( (LA30_0==43) ) {
                                      			current, 
                                      			"default",
                                       		lv_default_4_0, 
-                                      		"IntValue");
+                                      		"com.avaloq.tools.ddk.xtext.format.Format.IntValue");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -5233,18 +5233,18 @@ else if ( (LA30_0==43) ) {
 
                             }
 
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1776:2: ( (lv_maximum_5_0= ruleIntValue ) )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1777:1: (lv_maximum_5_0= ruleIntValue )
+                            // InternalFormat.g:1776:2: ( (lv_maximum_5_0= ruleIntValue ) )
+                            // InternalFormat.g:1777:1: (lv_maximum_5_0= ruleIntValue )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1777:1: (lv_maximum_5_0= ruleIntValue )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1778:3: lv_maximum_5_0= ruleIntValue
+                            // InternalFormat.g:1777:1: (lv_maximum_5_0= ruleIntValue )
+                            // InternalFormat.g:1778:3: lv_maximum_5_0= ruleIntValue
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getLinewrapLocatorAccess().getMaximumIntValueParserRuleCall_0_1_1_1_2_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleIntValue_in_ruleLinewrapLocator3879);
+                            pushFollow(FOLLOW_2);
                             lv_maximum_5_0=ruleIntValue();
 
                             state._fsp--;
@@ -5258,7 +5258,7 @@ else if ( (LA30_0==43) ) {
                                      			current, 
                                      			"maximum",
                                       		lv_maximum_5_0, 
-                                      		"IntValue");
+                                      		"com.avaloq.tools.ddk.xtext.format.Format.IntValue");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -5287,15 +5287,15 @@ else if ( (LA30_0==43) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1795:6: ( (lv_noLinewrap_6_0= 'no_linewrap' ) )
+                    // InternalFormat.g:1795:6: ( (lv_noLinewrap_6_0= 'no_linewrap' ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1795:6: ( (lv_noLinewrap_6_0= 'no_linewrap' ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1796:1: (lv_noLinewrap_6_0= 'no_linewrap' )
+                    // InternalFormat.g:1795:6: ( (lv_noLinewrap_6_0= 'no_linewrap' ) )
+                    // InternalFormat.g:1796:1: (lv_noLinewrap_6_0= 'no_linewrap' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1796:1: (lv_noLinewrap_6_0= 'no_linewrap' )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1797:3: lv_noLinewrap_6_0= 'no_linewrap'
+                    // InternalFormat.g:1796:1: (lv_noLinewrap_6_0= 'no_linewrap' )
+                    // InternalFormat.g:1797:3: lv_noLinewrap_6_0= 'no_linewrap'
                     {
-                    lv_noLinewrap_6_0=(Token)match(input,43,FOLLOW_43_in_ruleLinewrapLocator3908); if (state.failed) return current;
+                    lv_noLinewrap_6_0=(Token)match(input,43,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_noLinewrap_6_0, grammarAccess.getLinewrapLocatorAccess().getNoLinewrapNo_linewrapKeyword_1_0());
@@ -5341,7 +5341,7 @@ else if ( (LA30_0==43) ) {
 
 
     // $ANTLR start "entryRuleColumnLocator"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1818:1: entryRuleColumnLocator returns [EObject current=null] : iv_ruleColumnLocator= ruleColumnLocator EOF ;
+    // InternalFormat.g:1818:1: entryRuleColumnLocator returns [EObject current=null] : iv_ruleColumnLocator= ruleColumnLocator EOF ;
     public final EObject entryRuleColumnLocator() throws RecognitionException {
         EObject current = null;
 
@@ -5349,13 +5349,13 @@ public final EObject entryRuleColumnLocator() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1819:2: (iv_ruleColumnLocator= ruleColumnLocator EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1820:2: iv_ruleColumnLocator= ruleColumnLocator EOF
+            // InternalFormat.g:1819:2: (iv_ruleColumnLocator= ruleColumnLocator EOF )
+            // InternalFormat.g:1820:2: iv_ruleColumnLocator= ruleColumnLocator EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getColumnLocatorRule()); 
             }
-            pushFollow(FOLLOW_ruleColumnLocator_in_entryRuleColumnLocator3957);
+            pushFollow(FOLLOW_1);
             iv_ruleColumnLocator=ruleColumnLocator();
 
             state._fsp--;
@@ -5363,7 +5363,7 @@ public final EObject entryRuleColumnLocator() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleColumnLocator; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleColumnLocator3967); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -5381,7 +5381,7 @@ public final EObject entryRuleColumnLocator() throws RecognitionException {
 
 
     // $ANTLR start "ruleColumnLocator"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1827:1: ruleColumnLocator returns [EObject current=null] : (otherlv_0= 'column' ( (lv_fixed_1_0= 'fixed' ) )? ( ( (lv_value_2_0= ruleIntValue ) ) | ( (lv_parameter_3_0= ruleXBlockExpression ) ) ) ( (lv_relative_4_0= 'relative' ) )? ( (lv_nobreak_5_0= 'nobreak' ) )? ) ;
+    // InternalFormat.g:1827:1: ruleColumnLocator returns [EObject current=null] : (otherlv_0= 'column' ( (lv_fixed_1_0= 'fixed' ) )? ( ( (lv_value_2_0= ruleIntValue ) ) | ( (lv_parameter_3_0= ruleXBlockExpression ) ) ) ( (lv_relative_4_0= 'relative' ) )? ( (lv_nobreak_5_0= 'nobreak' ) )? ) ;
     public final EObject ruleColumnLocator() throws RecognitionException {
         EObject current = null;
 
@@ -5397,19 +5397,19 @@ public final EObject ruleColumnLocator() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1830:28: ( (otherlv_0= 'column' ( (lv_fixed_1_0= 'fixed' ) )? ( ( (lv_value_2_0= ruleIntValue ) ) | ( (lv_parameter_3_0= ruleXBlockExpression ) ) ) ( (lv_relative_4_0= 'relative' ) )? ( (lv_nobreak_5_0= 'nobreak' ) )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1831:1: (otherlv_0= 'column' ( (lv_fixed_1_0= 'fixed' ) )? ( ( (lv_value_2_0= ruleIntValue ) ) | ( (lv_parameter_3_0= ruleXBlockExpression ) ) ) ( (lv_relative_4_0= 'relative' ) )? ( (lv_nobreak_5_0= 'nobreak' ) )? )
+            // InternalFormat.g:1830:28: ( (otherlv_0= 'column' ( (lv_fixed_1_0= 'fixed' ) )? ( ( (lv_value_2_0= ruleIntValue ) ) | ( (lv_parameter_3_0= ruleXBlockExpression ) ) ) ( (lv_relative_4_0= 'relative' ) )? ( (lv_nobreak_5_0= 'nobreak' ) )? ) )
+            // InternalFormat.g:1831:1: (otherlv_0= 'column' ( (lv_fixed_1_0= 'fixed' ) )? ( ( (lv_value_2_0= ruleIntValue ) ) | ( (lv_parameter_3_0= ruleXBlockExpression ) ) ) ( (lv_relative_4_0= 'relative' ) )? ( (lv_nobreak_5_0= 'nobreak' ) )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1831:1: (otherlv_0= 'column' ( (lv_fixed_1_0= 'fixed' ) )? ( ( (lv_value_2_0= ruleIntValue ) ) | ( (lv_parameter_3_0= ruleXBlockExpression ) ) ) ( (lv_relative_4_0= 'relative' ) )? ( (lv_nobreak_5_0= 'nobreak' ) )? )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1831:3: otherlv_0= 'column' ( (lv_fixed_1_0= 'fixed' ) )? ( ( (lv_value_2_0= ruleIntValue ) ) | ( (lv_parameter_3_0= ruleXBlockExpression ) ) ) ( (lv_relative_4_0= 'relative' ) )? ( (lv_nobreak_5_0= 'nobreak' ) )?
+            // InternalFormat.g:1831:1: (otherlv_0= 'column' ( (lv_fixed_1_0= 'fixed' ) )? ( ( (lv_value_2_0= ruleIntValue ) ) | ( (lv_parameter_3_0= ruleXBlockExpression ) ) ) ( (lv_relative_4_0= 'relative' ) )? ( (lv_nobreak_5_0= 'nobreak' ) )? )
+            // InternalFormat.g:1831:3: otherlv_0= 'column' ( (lv_fixed_1_0= 'fixed' ) )? ( ( (lv_value_2_0= ruleIntValue ) ) | ( (lv_parameter_3_0= ruleXBlockExpression ) ) ) ( (lv_relative_4_0= 'relative' ) )? ( (lv_nobreak_5_0= 'nobreak' ) )?
             {
-            otherlv_0=(Token)match(input,44,FOLLOW_44_in_ruleColumnLocator4004); if (state.failed) return current;
+            otherlv_0=(Token)match(input,44,FOLLOW_37); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getColumnLocatorAccess().getColumnKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1835:1: ( (lv_fixed_1_0= 'fixed' ) )?
+            // InternalFormat.g:1835:1: ( (lv_fixed_1_0= 'fixed' ) )?
             int alt31=2;
             int LA31_0 = input.LA(1);
 
@@ -5418,12 +5418,12 @@ public final EObject ruleColumnLocator() throws RecognitionException {
             }
             switch (alt31) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1836:1: (lv_fixed_1_0= 'fixed' )
+                    // InternalFormat.g:1836:1: (lv_fixed_1_0= 'fixed' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1836:1: (lv_fixed_1_0= 'fixed' )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1837:3: lv_fixed_1_0= 'fixed'
+                    // InternalFormat.g:1836:1: (lv_fixed_1_0= 'fixed' )
+                    // InternalFormat.g:1837:3: lv_fixed_1_0= 'fixed'
                     {
-                    lv_fixed_1_0=(Token)match(input,45,FOLLOW_45_in_ruleColumnLocator4022); if (state.failed) return current;
+                    lv_fixed_1_0=(Token)match(input,45,FOLLOW_38); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_fixed_1_0, grammarAccess.getColumnLocatorAccess().getFixedFixedKeyword_1_0());
@@ -5446,7 +5446,7 @@ public final EObject ruleColumnLocator() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1850:3: ( ( (lv_value_2_0= ruleIntValue ) ) | ( (lv_parameter_3_0= ruleXBlockExpression ) ) )
+            // InternalFormat.g:1850:3: ( ( (lv_value_2_0= ruleIntValue ) ) | ( (lv_parameter_3_0= ruleXBlockExpression ) ) )
             int alt32=2;
             int LA32_0 = input.LA(1);
 
@@ -5465,20 +5465,20 @@ else if ( (LA32_0==23) ) {
             }
             switch (alt32) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1850:4: ( (lv_value_2_0= ruleIntValue ) )
+                    // InternalFormat.g:1850:4: ( (lv_value_2_0= ruleIntValue ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1850:4: ( (lv_value_2_0= ruleIntValue ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1851:1: (lv_value_2_0= ruleIntValue )
+                    // InternalFormat.g:1850:4: ( (lv_value_2_0= ruleIntValue ) )
+                    // InternalFormat.g:1851:1: (lv_value_2_0= ruleIntValue )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1851:1: (lv_value_2_0= ruleIntValue )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1852:3: lv_value_2_0= ruleIntValue
+                    // InternalFormat.g:1851:1: (lv_value_2_0= ruleIntValue )
+                    // InternalFormat.g:1852:3: lv_value_2_0= ruleIntValue
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getColumnLocatorAccess().getValueIntValueParserRuleCall_2_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleIntValue_in_ruleColumnLocator4058);
+                    pushFollow(FOLLOW_39);
                     lv_value_2_0=ruleIntValue();
 
                     state._fsp--;
@@ -5492,7 +5492,7 @@ else if ( (LA32_0==23) ) {
                              			current, 
                              			"value",
                               		lv_value_2_0, 
-                              		"IntValue");
+                              		"com.avaloq.tools.ddk.xtext.format.Format.IntValue");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -5506,20 +5506,20 @@ else if ( (LA32_0==23) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1869:6: ( (lv_parameter_3_0= ruleXBlockExpression ) )
+                    // InternalFormat.g:1869:6: ( (lv_parameter_3_0= ruleXBlockExpression ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1869:6: ( (lv_parameter_3_0= ruleXBlockExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1870:1: (lv_parameter_3_0= ruleXBlockExpression )
+                    // InternalFormat.g:1869:6: ( (lv_parameter_3_0= ruleXBlockExpression ) )
+                    // InternalFormat.g:1870:1: (lv_parameter_3_0= ruleXBlockExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1870:1: (lv_parameter_3_0= ruleXBlockExpression )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1871:3: lv_parameter_3_0= ruleXBlockExpression
+                    // InternalFormat.g:1870:1: (lv_parameter_3_0= ruleXBlockExpression )
+                    // InternalFormat.g:1871:3: lv_parameter_3_0= ruleXBlockExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getColumnLocatorAccess().getParameterXBlockExpressionParserRuleCall_2_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXBlockExpression_in_ruleColumnLocator4085);
+                    pushFollow(FOLLOW_39);
                     lv_parameter_3_0=ruleXBlockExpression();
 
                     state._fsp--;
@@ -5533,7 +5533,7 @@ else if ( (LA32_0==23) ) {
                              			current, 
                              			"parameter",
                               		lv_parameter_3_0, 
-                              		"XBlockExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XBlockExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -5549,7 +5549,7 @@ else if ( (LA32_0==23) ) {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1887:3: ( (lv_relative_4_0= 'relative' ) )?
+            // InternalFormat.g:1887:3: ( (lv_relative_4_0= 'relative' ) )?
             int alt33=2;
             int LA33_0 = input.LA(1);
 
@@ -5558,12 +5558,12 @@ else if ( (LA32_0==23) ) {
             }
             switch (alt33) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1888:1: (lv_relative_4_0= 'relative' )
+                    // InternalFormat.g:1888:1: (lv_relative_4_0= 'relative' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1888:1: (lv_relative_4_0= 'relative' )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1889:3: lv_relative_4_0= 'relative'
+                    // InternalFormat.g:1888:1: (lv_relative_4_0= 'relative' )
+                    // InternalFormat.g:1889:3: lv_relative_4_0= 'relative'
                     {
-                    lv_relative_4_0=(Token)match(input,46,FOLLOW_46_in_ruleColumnLocator4104); if (state.failed) return current;
+                    lv_relative_4_0=(Token)match(input,46,FOLLOW_40); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_relative_4_0, grammarAccess.getColumnLocatorAccess().getRelativeRelativeKeyword_3_0());
@@ -5586,7 +5586,7 @@ else if ( (LA32_0==23) ) {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1902:3: ( (lv_nobreak_5_0= 'nobreak' ) )?
+            // InternalFormat.g:1902:3: ( (lv_nobreak_5_0= 'nobreak' ) )?
             int alt34=2;
             int LA34_0 = input.LA(1);
 
@@ -5595,12 +5595,12 @@ else if ( (LA32_0==23) ) {
             }
             switch (alt34) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1903:1: (lv_nobreak_5_0= 'nobreak' )
+                    // InternalFormat.g:1903:1: (lv_nobreak_5_0= 'nobreak' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1903:1: (lv_nobreak_5_0= 'nobreak' )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1904:3: lv_nobreak_5_0= 'nobreak'
+                    // InternalFormat.g:1903:1: (lv_nobreak_5_0= 'nobreak' )
+                    // InternalFormat.g:1904:3: lv_nobreak_5_0= 'nobreak'
                     {
-                    lv_nobreak_5_0=(Token)match(input,47,FOLLOW_47_in_ruleColumnLocator4136); if (state.failed) return current;
+                    lv_nobreak_5_0=(Token)match(input,47,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_nobreak_5_0, grammarAccess.getColumnLocatorAccess().getNobreakNobreakKeyword_4_0());
@@ -5646,7 +5646,7 @@ else if ( (LA32_0==23) ) {
 
 
     // $ANTLR start "entryRuleOffsetLocator"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1925:1: entryRuleOffsetLocator returns [EObject current=null] : iv_ruleOffsetLocator= ruleOffsetLocator EOF ;
+    // InternalFormat.g:1925:1: entryRuleOffsetLocator returns [EObject current=null] : iv_ruleOffsetLocator= ruleOffsetLocator EOF ;
     public final EObject entryRuleOffsetLocator() throws RecognitionException {
         EObject current = null;
 
@@ -5654,13 +5654,13 @@ public final EObject entryRuleOffsetLocator() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1926:2: (iv_ruleOffsetLocator= ruleOffsetLocator EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1927:2: iv_ruleOffsetLocator= ruleOffsetLocator EOF
+            // InternalFormat.g:1926:2: (iv_ruleOffsetLocator= ruleOffsetLocator EOF )
+            // InternalFormat.g:1927:2: iv_ruleOffsetLocator= ruleOffsetLocator EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOffsetLocatorRule()); 
             }
-            pushFollow(FOLLOW_ruleOffsetLocator_in_entryRuleOffsetLocator4186);
+            pushFollow(FOLLOW_1);
             iv_ruleOffsetLocator=ruleOffsetLocator();
 
             state._fsp--;
@@ -5668,7 +5668,7 @@ public final EObject entryRuleOffsetLocator() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOffsetLocator; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOffsetLocator4196); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -5686,7 +5686,7 @@ public final EObject entryRuleOffsetLocator() throws RecognitionException {
 
 
     // $ANTLR start "ruleOffsetLocator"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1934:1: ruleOffsetLocator returns [EObject current=null] : (otherlv_0= 'offset' ( (lv_fixed_1_0= 'fixed' ) )? ( (lv_value_2_0= ruleIntValue ) ) ( (lv_nobreak_3_0= 'nobreak' ) )? ) ;
+    // InternalFormat.g:1934:1: ruleOffsetLocator returns [EObject current=null] : (otherlv_0= 'offset' ( (lv_fixed_1_0= 'fixed' ) )? ( (lv_value_2_0= ruleIntValue ) ) ( (lv_nobreak_3_0= 'nobreak' ) )? ) ;
     public final EObject ruleOffsetLocator() throws RecognitionException {
         EObject current = null;
 
@@ -5699,19 +5699,19 @@ public final EObject ruleOffsetLocator() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1937:28: ( (otherlv_0= 'offset' ( (lv_fixed_1_0= 'fixed' ) )? ( (lv_value_2_0= ruleIntValue ) ) ( (lv_nobreak_3_0= 'nobreak' ) )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1938:1: (otherlv_0= 'offset' ( (lv_fixed_1_0= 'fixed' ) )? ( (lv_value_2_0= ruleIntValue ) ) ( (lv_nobreak_3_0= 'nobreak' ) )? )
+            // InternalFormat.g:1937:28: ( (otherlv_0= 'offset' ( (lv_fixed_1_0= 'fixed' ) )? ( (lv_value_2_0= ruleIntValue ) ) ( (lv_nobreak_3_0= 'nobreak' ) )? ) )
+            // InternalFormat.g:1938:1: (otherlv_0= 'offset' ( (lv_fixed_1_0= 'fixed' ) )? ( (lv_value_2_0= ruleIntValue ) ) ( (lv_nobreak_3_0= 'nobreak' ) )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1938:1: (otherlv_0= 'offset' ( (lv_fixed_1_0= 'fixed' ) )? ( (lv_value_2_0= ruleIntValue ) ) ( (lv_nobreak_3_0= 'nobreak' ) )? )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1938:3: otherlv_0= 'offset' ( (lv_fixed_1_0= 'fixed' ) )? ( (lv_value_2_0= ruleIntValue ) ) ( (lv_nobreak_3_0= 'nobreak' ) )?
+            // InternalFormat.g:1938:1: (otherlv_0= 'offset' ( (lv_fixed_1_0= 'fixed' ) )? ( (lv_value_2_0= ruleIntValue ) ) ( (lv_nobreak_3_0= 'nobreak' ) )? )
+            // InternalFormat.g:1938:3: otherlv_0= 'offset' ( (lv_fixed_1_0= 'fixed' ) )? ( (lv_value_2_0= ruleIntValue ) ) ( (lv_nobreak_3_0= 'nobreak' ) )?
             {
-            otherlv_0=(Token)match(input,48,FOLLOW_48_in_ruleOffsetLocator4233); if (state.failed) return current;
+            otherlv_0=(Token)match(input,48,FOLLOW_41); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getOffsetLocatorAccess().getOffsetKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1942:1: ( (lv_fixed_1_0= 'fixed' ) )?
+            // InternalFormat.g:1942:1: ( (lv_fixed_1_0= 'fixed' ) )?
             int alt35=2;
             int LA35_0 = input.LA(1);
 
@@ -5720,12 +5720,12 @@ public final EObject ruleOffsetLocator() throws RecognitionException {
             }
             switch (alt35) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1943:1: (lv_fixed_1_0= 'fixed' )
+                    // InternalFormat.g:1943:1: (lv_fixed_1_0= 'fixed' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1943:1: (lv_fixed_1_0= 'fixed' )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1944:3: lv_fixed_1_0= 'fixed'
+                    // InternalFormat.g:1943:1: (lv_fixed_1_0= 'fixed' )
+                    // InternalFormat.g:1944:3: lv_fixed_1_0= 'fixed'
                     {
-                    lv_fixed_1_0=(Token)match(input,45,FOLLOW_45_in_ruleOffsetLocator4251); if (state.failed) return current;
+                    lv_fixed_1_0=(Token)match(input,45,FOLLOW_35); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_fixed_1_0, grammarAccess.getOffsetLocatorAccess().getFixedFixedKeyword_1_0());
@@ -5748,18 +5748,18 @@ public final EObject ruleOffsetLocator() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1957:3: ( (lv_value_2_0= ruleIntValue ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1958:1: (lv_value_2_0= ruleIntValue )
+            // InternalFormat.g:1957:3: ( (lv_value_2_0= ruleIntValue ) )
+            // InternalFormat.g:1958:1: (lv_value_2_0= ruleIntValue )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1958:1: (lv_value_2_0= ruleIntValue )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1959:3: lv_value_2_0= ruleIntValue
+            // InternalFormat.g:1958:1: (lv_value_2_0= ruleIntValue )
+            // InternalFormat.g:1959:3: lv_value_2_0= ruleIntValue
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getOffsetLocatorAccess().getValueIntValueParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleIntValue_in_ruleOffsetLocator4286);
+            pushFollow(FOLLOW_40);
             lv_value_2_0=ruleIntValue();
 
             state._fsp--;
@@ -5773,7 +5773,7 @@ public final EObject ruleOffsetLocator() throws RecognitionException {
                      			current, 
                      			"value",
                       		lv_value_2_0, 
-                      		"IntValue");
+                      		"com.avaloq.tools.ddk.xtext.format.Format.IntValue");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -5783,7 +5783,7 @@ public final EObject ruleOffsetLocator() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1975:2: ( (lv_nobreak_3_0= 'nobreak' ) )?
+            // InternalFormat.g:1975:2: ( (lv_nobreak_3_0= 'nobreak' ) )?
             int alt36=2;
             int LA36_0 = input.LA(1);
 
@@ -5792,12 +5792,12 @@ public final EObject ruleOffsetLocator() throws RecognitionException {
             }
             switch (alt36) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1976:1: (lv_nobreak_3_0= 'nobreak' )
+                    // InternalFormat.g:1976:1: (lv_nobreak_3_0= 'nobreak' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1976:1: (lv_nobreak_3_0= 'nobreak' )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1977:3: lv_nobreak_3_0= 'nobreak'
+                    // InternalFormat.g:1976:1: (lv_nobreak_3_0= 'nobreak' )
+                    // InternalFormat.g:1977:3: lv_nobreak_3_0= 'nobreak'
                     {
-                    lv_nobreak_3_0=(Token)match(input,47,FOLLOW_47_in_ruleOffsetLocator4304); if (state.failed) return current;
+                    lv_nobreak_3_0=(Token)match(input,47,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_nobreak_3_0, grammarAccess.getOffsetLocatorAccess().getNobreakNobreakKeyword_3_0());
@@ -5843,7 +5843,7 @@ public final EObject ruleOffsetLocator() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleIndentLocator"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1998:1: entryRuleIndentLocator returns [EObject current=null] : iv_ruleIndentLocator= ruleIndentLocator EOF ;
+    // InternalFormat.g:1998:1: entryRuleIndentLocator returns [EObject current=null] : iv_ruleIndentLocator= ruleIndentLocator EOF ;
     public final EObject entryRuleIndentLocator() throws RecognitionException {
         EObject current = null;
 
@@ -5851,13 +5851,13 @@ public final EObject entryRuleIndentLocator() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:1999:2: (iv_ruleIndentLocator= ruleIndentLocator EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2000:2: iv_ruleIndentLocator= ruleIndentLocator EOF
+            // InternalFormat.g:1999:2: (iv_ruleIndentLocator= ruleIndentLocator EOF )
+            // InternalFormat.g:2000:2: iv_ruleIndentLocator= ruleIndentLocator EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getIndentLocatorRule()); 
             }
-            pushFollow(FOLLOW_ruleIndentLocator_in_entryRuleIndentLocator4354);
+            pushFollow(FOLLOW_1);
             iv_ruleIndentLocator=ruleIndentLocator();
 
             state._fsp--;
@@ -5865,7 +5865,7 @@ public final EObject entryRuleIndentLocator() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleIndentLocator; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIndentLocator4364); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -5883,7 +5883,7 @@ public final EObject entryRuleIndentLocator() throws RecognitionException {
 
 
     // $ANTLR start "ruleIndentLocator"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2007:1: ruleIndentLocator returns [EObject current=null] : ( () ( ( (lv_increment_1_0= 'increment' ) ) | otherlv_2= 'decrement' ) ( ( (lv_value_3_0= ruleIntValue ) ) | ( (lv_parameter_4_0= ruleXBlockExpression ) ) )? ) ;
+    // InternalFormat.g:2007:1: ruleIndentLocator returns [EObject current=null] : ( () ( ( (lv_increment_1_0= 'increment' ) ) | otherlv_2= 'decrement' ) ( ( (lv_value_3_0= ruleIntValue ) ) | ( (lv_parameter_4_0= ruleXBlockExpression ) ) )? ) ;
     public final EObject ruleIndentLocator() throws RecognitionException {
         EObject current = null;
 
@@ -5897,14 +5897,14 @@ public final EObject ruleIndentLocator() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2010:28: ( ( () ( ( (lv_increment_1_0= 'increment' ) ) | otherlv_2= 'decrement' ) ( ( (lv_value_3_0= ruleIntValue ) ) | ( (lv_parameter_4_0= ruleXBlockExpression ) ) )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2011:1: ( () ( ( (lv_increment_1_0= 'increment' ) ) | otherlv_2= 'decrement' ) ( ( (lv_value_3_0= ruleIntValue ) ) | ( (lv_parameter_4_0= ruleXBlockExpression ) ) )? )
+            // InternalFormat.g:2010:28: ( ( () ( ( (lv_increment_1_0= 'increment' ) ) | otherlv_2= 'decrement' ) ( ( (lv_value_3_0= ruleIntValue ) ) | ( (lv_parameter_4_0= ruleXBlockExpression ) ) )? ) )
+            // InternalFormat.g:2011:1: ( () ( ( (lv_increment_1_0= 'increment' ) ) | otherlv_2= 'decrement' ) ( ( (lv_value_3_0= ruleIntValue ) ) | ( (lv_parameter_4_0= ruleXBlockExpression ) ) )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2011:1: ( () ( ( (lv_increment_1_0= 'increment' ) ) | otherlv_2= 'decrement' ) ( ( (lv_value_3_0= ruleIntValue ) ) | ( (lv_parameter_4_0= ruleXBlockExpression ) ) )? )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2011:2: () ( ( (lv_increment_1_0= 'increment' ) ) | otherlv_2= 'decrement' ) ( ( (lv_value_3_0= ruleIntValue ) ) | ( (lv_parameter_4_0= ruleXBlockExpression ) ) )?
+            // InternalFormat.g:2011:1: ( () ( ( (lv_increment_1_0= 'increment' ) ) | otherlv_2= 'decrement' ) ( ( (lv_value_3_0= ruleIntValue ) ) | ( (lv_parameter_4_0= ruleXBlockExpression ) ) )? )
+            // InternalFormat.g:2011:2: () ( ( (lv_increment_1_0= 'increment' ) ) | otherlv_2= 'decrement' ) ( ( (lv_value_3_0= ruleIntValue ) ) | ( (lv_parameter_4_0= ruleXBlockExpression ) ) )?
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2011:2: ()
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2012:5: 
+            // InternalFormat.g:2011:2: ()
+            // InternalFormat.g:2012:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -5916,7 +5916,7 @@ public final EObject ruleIndentLocator() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2017:2: ( ( (lv_increment_1_0= 'increment' ) ) | otherlv_2= 'decrement' )
+            // InternalFormat.g:2017:2: ( ( (lv_increment_1_0= 'increment' ) ) | otherlv_2= 'decrement' )
             int alt37=2;
             int LA37_0 = input.LA(1);
 
@@ -5935,15 +5935,15 @@ else if ( (LA37_0==50) ) {
             }
             switch (alt37) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2017:3: ( (lv_increment_1_0= 'increment' ) )
+                    // InternalFormat.g:2017:3: ( (lv_increment_1_0= 'increment' ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2017:3: ( (lv_increment_1_0= 'increment' ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2018:1: (lv_increment_1_0= 'increment' )
+                    // InternalFormat.g:2017:3: ( (lv_increment_1_0= 'increment' ) )
+                    // InternalFormat.g:2018:1: (lv_increment_1_0= 'increment' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2018:1: (lv_increment_1_0= 'increment' )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2019:3: lv_increment_1_0= 'increment'
+                    // InternalFormat.g:2018:1: (lv_increment_1_0= 'increment' )
+                    // InternalFormat.g:2019:3: lv_increment_1_0= 'increment'
                     {
-                    lv_increment_1_0=(Token)match(input,49,FOLLOW_49_in_ruleIndentLocator4417); if (state.failed) return current;
+                    lv_increment_1_0=(Token)match(input,49,FOLLOW_42); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_increment_1_0, grammarAccess.getIndentLocatorAccess().getIncrementIncrementKeyword_1_0_0());
@@ -5967,9 +5967,9 @@ else if ( (LA37_0==50) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2033:7: otherlv_2= 'decrement'
+                    // InternalFormat.g:2033:7: otherlv_2= 'decrement'
                     {
-                    otherlv_2=(Token)match(input,50,FOLLOW_50_in_ruleIndentLocator4448); if (state.failed) return current;
+                    otherlv_2=(Token)match(input,50,FOLLOW_42); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_2, grammarAccess.getIndentLocatorAccess().getDecrementKeyword_1_1());
@@ -5981,7 +5981,7 @@ else if ( (LA37_0==50) ) {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2037:2: ( ( (lv_value_3_0= ruleIntValue ) ) | ( (lv_parameter_4_0= ruleXBlockExpression ) ) )?
+            // InternalFormat.g:2037:2: ( ( (lv_value_3_0= ruleIntValue ) ) | ( (lv_parameter_4_0= ruleXBlockExpression ) ) )?
             int alt38=3;
             int LA38_0 = input.LA(1);
 
@@ -5993,20 +5993,20 @@ else if ( (LA38_0==23) ) {
             }
             switch (alt38) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2037:3: ( (lv_value_3_0= ruleIntValue ) )
+                    // InternalFormat.g:2037:3: ( (lv_value_3_0= ruleIntValue ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2037:3: ( (lv_value_3_0= ruleIntValue ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2038:1: (lv_value_3_0= ruleIntValue )
+                    // InternalFormat.g:2037:3: ( (lv_value_3_0= ruleIntValue ) )
+                    // InternalFormat.g:2038:1: (lv_value_3_0= ruleIntValue )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2038:1: (lv_value_3_0= ruleIntValue )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2039:3: lv_value_3_0= ruleIntValue
+                    // InternalFormat.g:2038:1: (lv_value_3_0= ruleIntValue )
+                    // InternalFormat.g:2039:3: lv_value_3_0= ruleIntValue
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getIndentLocatorAccess().getValueIntValueParserRuleCall_2_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleIntValue_in_ruleIndentLocator4471);
+                    pushFollow(FOLLOW_2);
                     lv_value_3_0=ruleIntValue();
 
                     state._fsp--;
@@ -6020,7 +6020,7 @@ else if ( (LA38_0==23) ) {
                              			current, 
                              			"value",
                               		lv_value_3_0, 
-                              		"IntValue");
+                              		"com.avaloq.tools.ddk.xtext.format.Format.IntValue");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -6034,20 +6034,20 @@ else if ( (LA38_0==23) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2056:6: ( (lv_parameter_4_0= ruleXBlockExpression ) )
+                    // InternalFormat.g:2056:6: ( (lv_parameter_4_0= ruleXBlockExpression ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2056:6: ( (lv_parameter_4_0= ruleXBlockExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2057:1: (lv_parameter_4_0= ruleXBlockExpression )
+                    // InternalFormat.g:2056:6: ( (lv_parameter_4_0= ruleXBlockExpression ) )
+                    // InternalFormat.g:2057:1: (lv_parameter_4_0= ruleXBlockExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2057:1: (lv_parameter_4_0= ruleXBlockExpression )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2058:3: lv_parameter_4_0= ruleXBlockExpression
+                    // InternalFormat.g:2057:1: (lv_parameter_4_0= ruleXBlockExpression )
+                    // InternalFormat.g:2058:3: lv_parameter_4_0= ruleXBlockExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getIndentLocatorAccess().getParameterXBlockExpressionParserRuleCall_2_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXBlockExpression_in_ruleIndentLocator4498);
+                    pushFollow(FOLLOW_2);
                     lv_parameter_4_0=ruleXBlockExpression();
 
                     state._fsp--;
@@ -6061,7 +6061,7 @@ else if ( (LA38_0==23) ) {
                              			current, 
                              			"parameter",
                               		lv_parameter_4_0, 
-                              		"XBlockExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XBlockExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -6100,7 +6100,7 @@ else if ( (LA38_0==23) ) {
 
 
     // $ANTLR start "entryRuleParameterizedIdentifier"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2082:1: entryRuleParameterizedIdentifier returns [String current=null] : iv_ruleParameterizedIdentifier= ruleParameterizedIdentifier EOF ;
+    // InternalFormat.g:2082:1: entryRuleParameterizedIdentifier returns [String current=null] : iv_ruleParameterizedIdentifier= ruleParameterizedIdentifier EOF ;
     public final String entryRuleParameterizedIdentifier() throws RecognitionException {
         String current = null;
 
@@ -6108,13 +6108,13 @@ public final String entryRuleParameterizedIdentifier() throws RecognitionExcepti
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2083:2: (iv_ruleParameterizedIdentifier= ruleParameterizedIdentifier EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2084:2: iv_ruleParameterizedIdentifier= ruleParameterizedIdentifier EOF
+            // InternalFormat.g:2083:2: (iv_ruleParameterizedIdentifier= ruleParameterizedIdentifier EOF )
+            // InternalFormat.g:2084:2: iv_ruleParameterizedIdentifier= ruleParameterizedIdentifier EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getParameterizedIdentifierRule()); 
             }
-            pushFollow(FOLLOW_ruleParameterizedIdentifier_in_entryRuleParameterizedIdentifier4537);
+            pushFollow(FOLLOW_1);
             iv_ruleParameterizedIdentifier=ruleParameterizedIdentifier();
 
             state._fsp--;
@@ -6122,7 +6122,7 @@ public final String entryRuleParameterizedIdentifier() throws RecognitionExcepti
             if ( state.backtracking==0 ) {
                current =iv_ruleParameterizedIdentifier.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleParameterizedIdentifier4548); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -6140,7 +6140,7 @@ public final String entryRuleParameterizedIdentifier() throws RecognitionExcepti
 
 
     // $ANTLR start "ruleParameterizedIdentifier"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2091:1: ruleParameterizedIdentifier returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_Identifier_0= ruleIdentifier (kw= '(' this_INT_2= RULE_INT kw= ',' this_INT_4= RULE_INT kw= ')' )? ) ;
+    // InternalFormat.g:2091:1: ruleParameterizedIdentifier returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_Identifier_0= ruleIdentifier (kw= '(' this_INT_2= RULE_INT kw= ',' this_INT_4= RULE_INT kw= ')' )? ) ;
     public final AntlrDatatypeRuleToken ruleParameterizedIdentifier() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -6153,18 +6153,18 @@ public final AntlrDatatypeRuleToken ruleParameterizedIdentifier() throws Recogni
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2094:28: ( (this_Identifier_0= ruleIdentifier (kw= '(' this_INT_2= RULE_INT kw= ',' this_INT_4= RULE_INT kw= ')' )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2095:1: (this_Identifier_0= ruleIdentifier (kw= '(' this_INT_2= RULE_INT kw= ',' this_INT_4= RULE_INT kw= ')' )? )
+            // InternalFormat.g:2094:28: ( (this_Identifier_0= ruleIdentifier (kw= '(' this_INT_2= RULE_INT kw= ',' this_INT_4= RULE_INT kw= ')' )? ) )
+            // InternalFormat.g:2095:1: (this_Identifier_0= ruleIdentifier (kw= '(' this_INT_2= RULE_INT kw= ',' this_INT_4= RULE_INT kw= ')' )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2095:1: (this_Identifier_0= ruleIdentifier (kw= '(' this_INT_2= RULE_INT kw= ',' this_INT_4= RULE_INT kw= ')' )? )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2096:5: this_Identifier_0= ruleIdentifier (kw= '(' this_INT_2= RULE_INT kw= ',' this_INT_4= RULE_INT kw= ')' )?
+            // InternalFormat.g:2095:1: (this_Identifier_0= ruleIdentifier (kw= '(' this_INT_2= RULE_INT kw= ',' this_INT_4= RULE_INT kw= ')' )? )
+            // InternalFormat.g:2096:5: this_Identifier_0= ruleIdentifier (kw= '(' this_INT_2= RULE_INT kw= ',' this_INT_4= RULE_INT kw= ')' )?
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getParameterizedIdentifierAccess().getIdentifierParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_ruleParameterizedIdentifier4595);
+            pushFollow(FOLLOW_43);
             this_Identifier_0=ruleIdentifier();
 
             state._fsp--;
@@ -6179,7 +6179,7 @@ public final AntlrDatatypeRuleToken ruleParameterizedIdentifier() throws Recogni
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2106:1: (kw= '(' this_INT_2= RULE_INT kw= ',' this_INT_4= RULE_INT kw= ')' )?
+            // InternalFormat.g:2106:1: (kw= '(' this_INT_2= RULE_INT kw= ',' this_INT_4= RULE_INT kw= ')' )?
             int alt39=2;
             int LA39_0 = input.LA(1);
 
@@ -6188,16 +6188,16 @@ public final AntlrDatatypeRuleToken ruleParameterizedIdentifier() throws Recogni
             }
             switch (alt39) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2107:2: kw= '(' this_INT_2= RULE_INT kw= ',' this_INT_4= RULE_INT kw= ')'
+                    // InternalFormat.g:2107:2: kw= '(' this_INT_2= RULE_INT kw= ',' this_INT_4= RULE_INT kw= ')'
                     {
-                    kw=(Token)match(input,33,FOLLOW_33_in_ruleParameterizedIdentifier4614); if (state.failed) return current;
+                    kw=(Token)match(input,33,FOLLOW_26); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
                               newLeafNode(kw, grammarAccess.getParameterizedIdentifierAccess().getLeftParenthesisKeyword_1_0()); 
                           
                     }
-                    this_INT_2=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleParameterizedIdentifier4629); if (state.failed) return current;
+                    this_INT_2=(Token)match(input,RULE_INT,FOLLOW_44); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       		current.merge(this_INT_2);
@@ -6208,14 +6208,14 @@ public final AntlrDatatypeRuleToken ruleParameterizedIdentifier() throws Recogni
                           newLeafNode(this_INT_2, grammarAccess.getParameterizedIdentifierAccess().getINTTerminalRuleCall_1_1()); 
                           
                     }
-                    kw=(Token)match(input,28,FOLLOW_28_in_ruleParameterizedIdentifier4647); if (state.failed) return current;
+                    kw=(Token)match(input,28,FOLLOW_26); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
                               newLeafNode(kw, grammarAccess.getParameterizedIdentifierAccess().getCommaKeyword_1_2()); 
                           
                     }
-                    this_INT_4=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleParameterizedIdentifier4662); if (state.failed) return current;
+                    this_INT_4=(Token)match(input,RULE_INT,FOLLOW_30); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       		current.merge(this_INT_4);
@@ -6226,7 +6226,7 @@ public final AntlrDatatypeRuleToken ruleParameterizedIdentifier() throws Recogni
                           newLeafNode(this_INT_4, grammarAccess.getParameterizedIdentifierAccess().getINTTerminalRuleCall_1_3()); 
                           
                     }
-                    kw=(Token)match(input,34,FOLLOW_34_in_ruleParameterizedIdentifier4680); if (state.failed) return current;
+                    kw=(Token)match(input,34,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -6262,7 +6262,7 @@ public final AntlrDatatypeRuleToken ruleParameterizedIdentifier() throws Recogni
 
 
     // $ANTLR start "entryRuleParameterizedString"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2146:1: entryRuleParameterizedString returns [String current=null] : iv_ruleParameterizedString= ruleParameterizedString EOF ;
+    // InternalFormat.g:2146:1: entryRuleParameterizedString returns [String current=null] : iv_ruleParameterizedString= ruleParameterizedString EOF ;
     public final String entryRuleParameterizedString() throws RecognitionException {
         String current = null;
 
@@ -6270,13 +6270,13 @@ public final String entryRuleParameterizedString() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2147:2: (iv_ruleParameterizedString= ruleParameterizedString EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2148:2: iv_ruleParameterizedString= ruleParameterizedString EOF
+            // InternalFormat.g:2147:2: (iv_ruleParameterizedString= ruleParameterizedString EOF )
+            // InternalFormat.g:2148:2: iv_ruleParameterizedString= ruleParameterizedString EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getParameterizedStringRule()); 
             }
-            pushFollow(FOLLOW_ruleParameterizedString_in_entryRuleParameterizedString4723);
+            pushFollow(FOLLOW_1);
             iv_ruleParameterizedString=ruleParameterizedString();
 
             state._fsp--;
@@ -6284,7 +6284,7 @@ public final String entryRuleParameterizedString() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleParameterizedString.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleParameterizedString4734); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -6302,7 +6302,7 @@ public final String entryRuleParameterizedString() throws RecognitionException {
 
 
     // $ANTLR start "ruleParameterizedString"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2155:1: ruleParameterizedString returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_STRING_0= RULE_STRING (kw= '(' this_INT_2= RULE_INT kw= ',' this_INT_4= RULE_INT kw= ')' )? ) ;
+    // InternalFormat.g:2155:1: ruleParameterizedString returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_STRING_0= RULE_STRING (kw= '(' this_INT_2= RULE_INT kw= ',' this_INT_4= RULE_INT kw= ')' )? ) ;
     public final AntlrDatatypeRuleToken ruleParameterizedString() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -6314,13 +6314,13 @@ public final AntlrDatatypeRuleToken ruleParameterizedString() throws Recognition
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2158:28: ( (this_STRING_0= RULE_STRING (kw= '(' this_INT_2= RULE_INT kw= ',' this_INT_4= RULE_INT kw= ')' )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2159:1: (this_STRING_0= RULE_STRING (kw= '(' this_INT_2= RULE_INT kw= ',' this_INT_4= RULE_INT kw= ')' )? )
+            // InternalFormat.g:2158:28: ( (this_STRING_0= RULE_STRING (kw= '(' this_INT_2= RULE_INT kw= ',' this_INT_4= RULE_INT kw= ')' )? ) )
+            // InternalFormat.g:2159:1: (this_STRING_0= RULE_STRING (kw= '(' this_INT_2= RULE_INT kw= ',' this_INT_4= RULE_INT kw= ')' )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2159:1: (this_STRING_0= RULE_STRING (kw= '(' this_INT_2= RULE_INT kw= ',' this_INT_4= RULE_INT kw= ')' )? )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2159:6: this_STRING_0= RULE_STRING (kw= '(' this_INT_2= RULE_INT kw= ',' this_INT_4= RULE_INT kw= ')' )?
+            // InternalFormat.g:2159:1: (this_STRING_0= RULE_STRING (kw= '(' this_INT_2= RULE_INT kw= ',' this_INT_4= RULE_INT kw= ')' )? )
+            // InternalFormat.g:2159:6: this_STRING_0= RULE_STRING (kw= '(' this_INT_2= RULE_INT kw= ',' this_INT_4= RULE_INT kw= ')' )?
             {
-            this_STRING_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleParameterizedString4774); if (state.failed) return current;
+            this_STRING_0=(Token)match(input,RULE_STRING,FOLLOW_43); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               		current.merge(this_STRING_0);
@@ -6331,7 +6331,7 @@ public final AntlrDatatypeRuleToken ruleParameterizedString() throws Recognition
                   newLeafNode(this_STRING_0, grammarAccess.getParameterizedStringAccess().getSTRINGTerminalRuleCall_0()); 
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2166:1: (kw= '(' this_INT_2= RULE_INT kw= ',' this_INT_4= RULE_INT kw= ')' )?
+            // InternalFormat.g:2166:1: (kw= '(' this_INT_2= RULE_INT kw= ',' this_INT_4= RULE_INT kw= ')' )?
             int alt40=2;
             int LA40_0 = input.LA(1);
 
@@ -6340,16 +6340,16 @@ public final AntlrDatatypeRuleToken ruleParameterizedString() throws Recognition
             }
             switch (alt40) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2167:2: kw= '(' this_INT_2= RULE_INT kw= ',' this_INT_4= RULE_INT kw= ')'
+                    // InternalFormat.g:2167:2: kw= '(' this_INT_2= RULE_INT kw= ',' this_INT_4= RULE_INT kw= ')'
                     {
-                    kw=(Token)match(input,33,FOLLOW_33_in_ruleParameterizedString4793); if (state.failed) return current;
+                    kw=(Token)match(input,33,FOLLOW_26); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
                               newLeafNode(kw, grammarAccess.getParameterizedStringAccess().getLeftParenthesisKeyword_1_0()); 
                           
                     }
-                    this_INT_2=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleParameterizedString4808); if (state.failed) return current;
+                    this_INT_2=(Token)match(input,RULE_INT,FOLLOW_44); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       		current.merge(this_INT_2);
@@ -6360,14 +6360,14 @@ public final AntlrDatatypeRuleToken ruleParameterizedString() throws Recognition
                           newLeafNode(this_INT_2, grammarAccess.getParameterizedStringAccess().getINTTerminalRuleCall_1_1()); 
                           
                     }
-                    kw=(Token)match(input,28,FOLLOW_28_in_ruleParameterizedString4826); if (state.failed) return current;
+                    kw=(Token)match(input,28,FOLLOW_26); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
                               newLeafNode(kw, grammarAccess.getParameterizedStringAccess().getCommaKeyword_1_2()); 
                           
                     }
-                    this_INT_4=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleParameterizedString4841); if (state.failed) return current;
+                    this_INT_4=(Token)match(input,RULE_INT,FOLLOW_30); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       		current.merge(this_INT_4);
@@ -6378,7 +6378,7 @@ public final AntlrDatatypeRuleToken ruleParameterizedString() throws Recognition
                           newLeafNode(this_INT_4, grammarAccess.getParameterizedStringAccess().getINTTerminalRuleCall_1_3()); 
                           
                     }
-                    kw=(Token)match(input,34,FOLLOW_34_in_ruleParameterizedString4859); if (state.failed) return current;
+                    kw=(Token)match(input,34,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -6414,7 +6414,7 @@ public final AntlrDatatypeRuleToken ruleParameterizedString() throws Recognition
 
 
     // $ANTLR start "entryRuleIdentifier"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2206:1: entryRuleIdentifier returns [String current=null] : iv_ruleIdentifier= ruleIdentifier EOF ;
+    // InternalFormat.g:2206:1: entryRuleIdentifier returns [String current=null] : iv_ruleIdentifier= ruleIdentifier EOF ;
     public final String entryRuleIdentifier() throws RecognitionException {
         String current = null;
 
@@ -6422,13 +6422,13 @@ public final String entryRuleIdentifier() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2207:2: (iv_ruleIdentifier= ruleIdentifier EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2208:2: iv_ruleIdentifier= ruleIdentifier EOF
+            // InternalFormat.g:2207:2: (iv_ruleIdentifier= ruleIdentifier EOF )
+            // InternalFormat.g:2208:2: iv_ruleIdentifier= ruleIdentifier EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getIdentifierRule()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_entryRuleIdentifier4902);
+            pushFollow(FOLLOW_1);
             iv_ruleIdentifier=ruleIdentifier();
 
             state._fsp--;
@@ -6436,7 +6436,7 @@ public final String entryRuleIdentifier() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleIdentifier.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIdentifier4913); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -6454,7 +6454,7 @@ public final String entryRuleIdentifier() throws RecognitionException {
 
 
     // $ANTLR start "ruleIdentifier"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2215:1: ruleIdentifier returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID_0= RULE_ID | kw= 'default' | kw= 'val' ) ;
+    // InternalFormat.g:2215:1: ruleIdentifier returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID_0= RULE_ID | kw= 'default' | kw= 'val' ) ;
     public final AntlrDatatypeRuleToken ruleIdentifier() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -6464,10 +6464,10 @@ public final AntlrDatatypeRuleToken ruleIdentifier() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2218:28: ( (this_ID_0= RULE_ID | kw= 'default' | kw= 'val' ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2219:1: (this_ID_0= RULE_ID | kw= 'default' | kw= 'val' )
+            // InternalFormat.g:2218:28: ( (this_ID_0= RULE_ID | kw= 'default' | kw= 'val' ) )
+            // InternalFormat.g:2219:1: (this_ID_0= RULE_ID | kw= 'default' | kw= 'val' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2219:1: (this_ID_0= RULE_ID | kw= 'default' | kw= 'val' )
+            // InternalFormat.g:2219:1: (this_ID_0= RULE_ID | kw= 'default' | kw= 'val' )
             int alt41=3;
             switch ( input.LA(1) ) {
             case RULE_ID:
@@ -6495,9 +6495,9 @@ public final AntlrDatatypeRuleToken ruleIdentifier() throws RecognitionException
 
             switch (alt41) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2219:6: this_ID_0= RULE_ID
+                    // InternalFormat.g:2219:6: this_ID_0= RULE_ID
                     {
-                    this_ID_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleIdentifier4953); if (state.failed) return current;
+                    this_ID_0=(Token)match(input,RULE_ID,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       		current.merge(this_ID_0);
@@ -6512,9 +6512,9 @@ public final AntlrDatatypeRuleToken ruleIdentifier() throws RecognitionException
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2228:2: kw= 'default'
+                    // InternalFormat.g:2228:2: kw= 'default'
                     {
-                    kw=(Token)match(input,51,FOLLOW_51_in_ruleIdentifier4977); if (state.failed) return current;
+                    kw=(Token)match(input,51,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -6525,9 +6525,9 @@ public final AntlrDatatypeRuleToken ruleIdentifier() throws RecognitionException
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2235:2: kw= 'val'
+                    // InternalFormat.g:2235:2: kw= 'val'
                     {
-                    kw=(Token)match(input,52,FOLLOW_52_in_ruleIdentifier4996); if (state.failed) return current;
+                    kw=(Token)match(input,52,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -6560,7 +6560,7 @@ public final AntlrDatatypeRuleToken ruleIdentifier() throws RecognitionException
 
 
     // $ANTLR start "entryRuleDottedID"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2248:1: entryRuleDottedID returns [String current=null] : iv_ruleDottedID= ruleDottedID EOF ;
+    // InternalFormat.g:2248:1: entryRuleDottedID returns [String current=null] : iv_ruleDottedID= ruleDottedID EOF ;
     public final String entryRuleDottedID() throws RecognitionException {
         String current = null;
 
@@ -6568,13 +6568,13 @@ public final String entryRuleDottedID() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2249:2: (iv_ruleDottedID= ruleDottedID EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2250:2: iv_ruleDottedID= ruleDottedID EOF
+            // InternalFormat.g:2249:2: (iv_ruleDottedID= ruleDottedID EOF )
+            // InternalFormat.g:2250:2: iv_ruleDottedID= ruleDottedID EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getDottedIDRule()); 
             }
-            pushFollow(FOLLOW_ruleDottedID_in_entryRuleDottedID5037);
+            pushFollow(FOLLOW_1);
             iv_ruleDottedID=ruleDottedID();
 
             state._fsp--;
@@ -6582,7 +6582,7 @@ public final String entryRuleDottedID() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleDottedID.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDottedID5048); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -6600,7 +6600,7 @@ public final String entryRuleDottedID() throws RecognitionException {
 
 
     // $ANTLR start "ruleDottedID"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2257:1: ruleDottedID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_Identifier_0= ruleIdentifier (kw= '.' this_Identifier_2= ruleIdentifier )* ) ;
+    // InternalFormat.g:2257:1: ruleDottedID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_Identifier_0= ruleIdentifier (kw= '.' this_Identifier_2= ruleIdentifier )* ) ;
     public final AntlrDatatypeRuleToken ruleDottedID() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -6613,18 +6613,18 @@ public final AntlrDatatypeRuleToken ruleDottedID() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2260:28: ( (this_Identifier_0= ruleIdentifier (kw= '.' this_Identifier_2= ruleIdentifier )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2261:1: (this_Identifier_0= ruleIdentifier (kw= '.' this_Identifier_2= ruleIdentifier )* )
+            // InternalFormat.g:2260:28: ( (this_Identifier_0= ruleIdentifier (kw= '.' this_Identifier_2= ruleIdentifier )* ) )
+            // InternalFormat.g:2261:1: (this_Identifier_0= ruleIdentifier (kw= '.' this_Identifier_2= ruleIdentifier )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2261:1: (this_Identifier_0= ruleIdentifier (kw= '.' this_Identifier_2= ruleIdentifier )* )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2262:5: this_Identifier_0= ruleIdentifier (kw= '.' this_Identifier_2= ruleIdentifier )*
+            // InternalFormat.g:2261:1: (this_Identifier_0= ruleIdentifier (kw= '.' this_Identifier_2= ruleIdentifier )* )
+            // InternalFormat.g:2262:5: this_Identifier_0= ruleIdentifier (kw= '.' this_Identifier_2= ruleIdentifier )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getDottedIDAccess().getIdentifierParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_ruleDottedID5095);
+            pushFollow(FOLLOW_45);
             this_Identifier_0=ruleIdentifier();
 
             state._fsp--;
@@ -6639,7 +6639,7 @@ public final AntlrDatatypeRuleToken ruleDottedID() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2272:1: (kw= '.' this_Identifier_2= ruleIdentifier )*
+            // InternalFormat.g:2272:1: (kw= '.' this_Identifier_2= ruleIdentifier )*
             loop42:
             do {
                 int alt42=2;
@@ -6652,9 +6652,9 @@ public final AntlrDatatypeRuleToken ruleDottedID() throws RecognitionException {
 
                 switch (alt42) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2273:2: kw= '.' this_Identifier_2= ruleIdentifier
+            	    // InternalFormat.g:2273:2: kw= '.' this_Identifier_2= ruleIdentifier
             	    {
-            	    kw=(Token)match(input,36,FOLLOW_36_in_ruleDottedID5114); if (state.failed) return current;
+            	    kw=(Token)match(input,36,FOLLOW_4); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	              current.merge(kw);
@@ -6666,7 +6666,7 @@ public final AntlrDatatypeRuleToken ruleDottedID() throws RecognitionException {
             	              newCompositeNode(grammarAccess.getDottedIDAccess().getIdentifierParserRuleCall_1_1()); 
             	          
             	    }
-            	    pushFollow(FOLLOW_ruleIdentifier_in_ruleDottedID5136);
+            	    pushFollow(FOLLOW_45);
             	    this_Identifier_2=ruleIdentifier();
 
             	    state._fsp--;
@@ -6713,7 +6713,7 @@ public final AntlrDatatypeRuleToken ruleDottedID() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleIntIdentifier"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2297:1: entryRuleIntIdentifier returns [String current=null] : iv_ruleIntIdentifier= ruleIntIdentifier EOF ;
+    // InternalFormat.g:2297:1: entryRuleIntIdentifier returns [String current=null] : iv_ruleIntIdentifier= ruleIntIdentifier EOF ;
     public final String entryRuleIntIdentifier() throws RecognitionException {
         String current = null;
 
@@ -6721,13 +6721,13 @@ public final String entryRuleIntIdentifier() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2298:2: (iv_ruleIntIdentifier= ruleIntIdentifier EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2299:2: iv_ruleIntIdentifier= ruleIntIdentifier EOF
+            // InternalFormat.g:2298:2: (iv_ruleIntIdentifier= ruleIntIdentifier EOF )
+            // InternalFormat.g:2299:2: iv_ruleIntIdentifier= ruleIntIdentifier EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getIntIdentifierRule()); 
             }
-            pushFollow(FOLLOW_ruleIntIdentifier_in_entryRuleIntIdentifier5184);
+            pushFollow(FOLLOW_1);
             iv_ruleIntIdentifier=ruleIntIdentifier();
 
             state._fsp--;
@@ -6735,7 +6735,7 @@ public final String entryRuleIntIdentifier() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleIntIdentifier.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIntIdentifier5195); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -6753,7 +6753,7 @@ public final String entryRuleIntIdentifier() throws RecognitionException {
 
 
     // $ANTLR start "ruleIntIdentifier"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2306:1: ruleIntIdentifier returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_INT_0= RULE_INT ;
+    // InternalFormat.g:2306:1: ruleIntIdentifier returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_INT_0= RULE_INT ;
     public final AntlrDatatypeRuleToken ruleIntIdentifier() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -6762,10 +6762,10 @@ public final AntlrDatatypeRuleToken ruleIntIdentifier() throws RecognitionExcept
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2309:28: (this_INT_0= RULE_INT )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2310:5: this_INT_0= RULE_INT
+            // InternalFormat.g:2309:28: (this_INT_0= RULE_INT )
+            // InternalFormat.g:2310:5: this_INT_0= RULE_INT
             {
-            this_INT_0=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleIntIdentifier5234); if (state.failed) return current;
+            this_INT_0=(Token)match(input,RULE_INT,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               		current.merge(this_INT_0);
@@ -6796,7 +6796,7 @@ public final AntlrDatatypeRuleToken ruleIntIdentifier() throws RecognitionExcept
 
 
     // $ANTLR start "entryRuleIntObject"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2325:1: entryRuleIntObject returns [String current=null] : iv_ruleIntObject= ruleIntObject EOF ;
+    // InternalFormat.g:2325:1: entryRuleIntObject returns [String current=null] : iv_ruleIntObject= ruleIntObject EOF ;
     public final String entryRuleIntObject() throws RecognitionException {
         String current = null;
 
@@ -6804,13 +6804,13 @@ public final String entryRuleIntObject() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2326:2: (iv_ruleIntObject= ruleIntObject EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2327:2: iv_ruleIntObject= ruleIntObject EOF
+            // InternalFormat.g:2326:2: (iv_ruleIntObject= ruleIntObject EOF )
+            // InternalFormat.g:2327:2: iv_ruleIntObject= ruleIntObject EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getIntObjectRule()); 
             }
-            pushFollow(FOLLOW_ruleIntObject_in_entryRuleIntObject5279);
+            pushFollow(FOLLOW_1);
             iv_ruleIntObject=ruleIntObject();
 
             state._fsp--;
@@ -6818,7 +6818,7 @@ public final String entryRuleIntObject() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleIntObject.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIntObject5290); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -6836,7 +6836,7 @@ public final String entryRuleIntObject() throws RecognitionException {
 
 
     // $ANTLR start "ruleIntObject"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2334:1: ruleIntObject returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_INT_0= RULE_INT ;
+    // InternalFormat.g:2334:1: ruleIntObject returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_INT_0= RULE_INT ;
     public final AntlrDatatypeRuleToken ruleIntObject() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -6845,10 +6845,10 @@ public final AntlrDatatypeRuleToken ruleIntObject() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2337:28: (this_INT_0= RULE_INT )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2338:5: this_INT_0= RULE_INT
+            // InternalFormat.g:2337:28: (this_INT_0= RULE_INT )
+            // InternalFormat.g:2338:5: this_INT_0= RULE_INT
             {
-            this_INT_0=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleIntObject5329); if (state.failed) return current;
+            this_INT_0=(Token)match(input,RULE_INT,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               		current.merge(this_INT_0);
@@ -6879,7 +6879,7 @@ public final AntlrDatatypeRuleToken ruleIntObject() throws RecognitionException
 
 
     // $ANTLR start "entryRuleRuleSelfIdentifier"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2353:1: entryRuleRuleSelfIdentifier returns [String current=null] : iv_ruleRuleSelfIdentifier= ruleRuleSelfIdentifier EOF ;
+    // InternalFormat.g:2353:1: entryRuleRuleSelfIdentifier returns [String current=null] : iv_ruleRuleSelfIdentifier= ruleRuleSelfIdentifier EOF ;
     public final String entryRuleRuleSelfIdentifier() throws RecognitionException {
         String current = null;
 
@@ -6887,13 +6887,13 @@ public final String entryRuleRuleSelfIdentifier() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2354:2: (iv_ruleRuleSelfIdentifier= ruleRuleSelfIdentifier EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2355:2: iv_ruleRuleSelfIdentifier= ruleRuleSelfIdentifier EOF
+            // InternalFormat.g:2354:2: (iv_ruleRuleSelfIdentifier= ruleRuleSelfIdentifier EOF )
+            // InternalFormat.g:2355:2: iv_ruleRuleSelfIdentifier= ruleRuleSelfIdentifier EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getRuleSelfIdentifierRule()); 
             }
-            pushFollow(FOLLOW_ruleRuleSelfIdentifier_in_entryRuleRuleSelfIdentifier5374);
+            pushFollow(FOLLOW_1);
             iv_ruleRuleSelfIdentifier=ruleRuleSelfIdentifier();
 
             state._fsp--;
@@ -6901,7 +6901,7 @@ public final String entryRuleRuleSelfIdentifier() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleRuleSelfIdentifier.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRuleSelfIdentifier5385); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -6919,7 +6919,7 @@ public final String entryRuleRuleSelfIdentifier() throws RecognitionException {
 
 
     // $ANTLR start "ruleRuleSelfIdentifier"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2362:1: ruleRuleSelfIdentifier returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : kw= 'rule' ;
+    // InternalFormat.g:2362:1: ruleRuleSelfIdentifier returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : kw= 'rule' ;
     public final AntlrDatatypeRuleToken ruleRuleSelfIdentifier() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -6928,10 +6928,10 @@ public final AntlrDatatypeRuleToken ruleRuleSelfIdentifier() throws RecognitionE
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2365:28: (kw= 'rule' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2367:2: kw= 'rule'
+            // InternalFormat.g:2365:28: (kw= 'rule' )
+            // InternalFormat.g:2367:2: kw= 'rule'
             {
-            kw=(Token)match(input,53,FOLLOW_53_in_ruleRuleSelfIdentifier5422); if (state.failed) return current;
+            kw=(Token)match(input,53,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                       current.merge(kw);
@@ -6958,7 +6958,7 @@ public final AntlrDatatypeRuleToken ruleRuleSelfIdentifier() throws RecognitionE
 
 
     // $ANTLR start "entryRuleValidID"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2380:1: entryRuleValidID returns [String current=null] : iv_ruleValidID= ruleValidID EOF ;
+    // InternalFormat.g:2380:1: entryRuleValidID returns [String current=null] : iv_ruleValidID= ruleValidID EOF ;
     public final String entryRuleValidID() throws RecognitionException {
         String current = null;
 
@@ -6966,13 +6966,13 @@ public final String entryRuleValidID() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2381:2: (iv_ruleValidID= ruleValidID EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2382:2: iv_ruleValidID= ruleValidID EOF
+            // InternalFormat.g:2381:2: (iv_ruleValidID= ruleValidID EOF )
+            // InternalFormat.g:2382:2: iv_ruleValidID= ruleValidID EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getValidIDRule()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_entryRuleValidID5462);
+            pushFollow(FOLLOW_1);
             iv_ruleValidID=ruleValidID();
 
             state._fsp--;
@@ -6980,7 +6980,7 @@ public final String entryRuleValidID() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleValidID.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleValidID5473); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -6998,7 +6998,7 @@ public final String entryRuleValidID() throws RecognitionException {
 
 
     // $ANTLR start "ruleValidID"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2389:1: ruleValidID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= 'context' | kw= 'currentColumn' | this_ID_2= RULE_ID ) ;
+    // InternalFormat.g:2389:1: ruleValidID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= 'context' | kw= 'currentColumn' | this_ID_2= RULE_ID ) ;
     public final AntlrDatatypeRuleToken ruleValidID() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -7008,10 +7008,10 @@ public final AntlrDatatypeRuleToken ruleValidID() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2392:28: ( (kw= 'context' | kw= 'currentColumn' | this_ID_2= RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2393:1: (kw= 'context' | kw= 'currentColumn' | this_ID_2= RULE_ID )
+            // InternalFormat.g:2392:28: ( (kw= 'context' | kw= 'currentColumn' | this_ID_2= RULE_ID ) )
+            // InternalFormat.g:2393:1: (kw= 'context' | kw= 'currentColumn' | this_ID_2= RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2393:1: (kw= 'context' | kw= 'currentColumn' | this_ID_2= RULE_ID )
+            // InternalFormat.g:2393:1: (kw= 'context' | kw= 'currentColumn' | this_ID_2= RULE_ID )
             int alt43=3;
             switch ( input.LA(1) ) {
             case 54:
@@ -7039,9 +7039,9 @@ public final AntlrDatatypeRuleToken ruleValidID() throws RecognitionException {
 
             switch (alt43) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2394:2: kw= 'context'
+                    // InternalFormat.g:2394:2: kw= 'context'
                     {
-                    kw=(Token)match(input,54,FOLLOW_54_in_ruleValidID5511); if (state.failed) return current;
+                    kw=(Token)match(input,54,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -7052,9 +7052,9 @@ public final AntlrDatatypeRuleToken ruleValidID() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2401:2: kw= 'currentColumn'
+                    // InternalFormat.g:2401:2: kw= 'currentColumn'
                     {
-                    kw=(Token)match(input,55,FOLLOW_55_in_ruleValidID5530); if (state.failed) return current;
+                    kw=(Token)match(input,55,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -7065,9 +7065,9 @@ public final AntlrDatatypeRuleToken ruleValidID() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2407:10: this_ID_2= RULE_ID
+                    // InternalFormat.g:2407:10: this_ID_2= RULE_ID
                     {
-                    this_ID_2=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleValidID5551); if (state.failed) return current;
+                    this_ID_2=(Token)match(input,RULE_ID,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       		current.merge(this_ID_2);
@@ -7104,7 +7104,7 @@ public final AntlrDatatypeRuleToken ruleValidID() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXAnnotation"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2422:1: entryRuleXAnnotation returns [EObject current=null] : iv_ruleXAnnotation= ruleXAnnotation EOF ;
+    // InternalFormat.g:2422:1: entryRuleXAnnotation returns [EObject current=null] : iv_ruleXAnnotation= ruleXAnnotation EOF ;
     public final EObject entryRuleXAnnotation() throws RecognitionException {
         EObject current = null;
 
@@ -7112,13 +7112,13 @@ public final EObject entryRuleXAnnotation() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2423:2: (iv_ruleXAnnotation= ruleXAnnotation EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2424:2: iv_ruleXAnnotation= ruleXAnnotation EOF
+            // InternalFormat.g:2423:2: (iv_ruleXAnnotation= ruleXAnnotation EOF )
+            // InternalFormat.g:2424:2: iv_ruleXAnnotation= ruleXAnnotation EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAnnotationRule()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotation_in_entryRuleXAnnotation5596);
+            pushFollow(FOLLOW_1);
             iv_ruleXAnnotation=ruleXAnnotation();
 
             state._fsp--;
@@ -7126,7 +7126,7 @@ public final EObject entryRuleXAnnotation() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXAnnotation; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAnnotation5606); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -7144,7 +7144,7 @@ public final EObject entryRuleXAnnotation() throws RecognitionException {
 
 
     // $ANTLR start "ruleXAnnotation"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2431:1: ruleXAnnotation returns [EObject current=null] : ( () otherlv_1= '@' ( ( ruleQualifiedName ) ) ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )? ) ;
+    // InternalFormat.g:2431:1: ruleXAnnotation returns [EObject current=null] : ( () otherlv_1= '@' ( ( ruleQualifiedName ) ) ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )? ) ;
     public final EObject ruleXAnnotation() throws RecognitionException {
         EObject current = null;
 
@@ -7162,14 +7162,14 @@ public final EObject ruleXAnnotation() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2434:28: ( ( () otherlv_1= '@' ( ( ruleQualifiedName ) ) ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2435:1: ( () otherlv_1= '@' ( ( ruleQualifiedName ) ) ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )? )
+            // InternalFormat.g:2434:28: ( ( () otherlv_1= '@' ( ( ruleQualifiedName ) ) ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )? ) )
+            // InternalFormat.g:2435:1: ( () otherlv_1= '@' ( ( ruleQualifiedName ) ) ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2435:1: ( () otherlv_1= '@' ( ( ruleQualifiedName ) ) ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )? )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2435:2: () otherlv_1= '@' ( ( ruleQualifiedName ) ) ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )?
+            // InternalFormat.g:2435:1: ( () otherlv_1= '@' ( ( ruleQualifiedName ) ) ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )? )
+            // InternalFormat.g:2435:2: () otherlv_1= '@' ( ( ruleQualifiedName ) ) ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )?
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2435:2: ()
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2436:5: 
+            // InternalFormat.g:2435:2: ()
+            // InternalFormat.g:2436:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -7181,17 +7181,17 @@ public final EObject ruleXAnnotation() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,26,FOLLOW_26_in_ruleXAnnotation5652); if (state.failed) return current;
+            otherlv_1=(Token)match(input,26,FOLLOW_7); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXAnnotationAccess().getCommercialAtKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2445:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2446:1: ( ruleQualifiedName )
+            // InternalFormat.g:2445:1: ( ( ruleQualifiedName ) )
+            // InternalFormat.g:2446:1: ( ruleQualifiedName )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2446:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2447:3: ruleQualifiedName
+            // InternalFormat.g:2446:1: ( ruleQualifiedName )
+            // InternalFormat.g:2447:3: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
 
@@ -7205,7 +7205,7 @@ public final EObject ruleXAnnotation() throws RecognitionException {
               	        newCompositeNode(grammarAccess.getXAnnotationAccess().getAnnotationTypeJvmAnnotationTypeCrossReference_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_ruleXAnnotation5675);
+            pushFollow(FOLLOW_43);
             ruleQualifiedName();
 
             state._fsp--;
@@ -7221,7 +7221,7 @@ public final EObject ruleXAnnotation() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2460:2: ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )?
+            // InternalFormat.g:2460:2: ( ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')' )?
             int alt46=2;
             int LA46_0 = input.LA(1);
 
@@ -7230,12 +7230,12 @@ public final EObject ruleXAnnotation() throws RecognitionException {
             }
             switch (alt46) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2460:3: ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')'
+                    // InternalFormat.g:2460:3: ( ( '(' )=>otherlv_3= '(' ) ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )? otherlv_8= ')'
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2460:3: ( ( '(' )=>otherlv_3= '(' )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2460:4: ( '(' )=>otherlv_3= '('
+                    // InternalFormat.g:2460:3: ( ( '(' )=>otherlv_3= '(' )
+                    // InternalFormat.g:2460:4: ( '(' )=>otherlv_3= '('
                     {
-                    otherlv_3=(Token)match(input,33,FOLLOW_33_in_ruleXAnnotation5696); if (state.failed) return current;
+                    otherlv_3=(Token)match(input,33,FOLLOW_46); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_3, grammarAccess.getXAnnotationAccess().getLeftParenthesisKeyword_3_0());
@@ -7244,28 +7244,28 @@ public final EObject ruleXAnnotation() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2465:2: ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )?
+                    // InternalFormat.g:2465:2: ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )?
                     int alt45=3;
                     alt45 = dfa45.predict(input);
                     switch (alt45) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2465:3: ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* )
+                            // InternalFormat.g:2465:3: ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2465:3: ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2465:4: ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )*
+                            // InternalFormat.g:2465:3: ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* )
+                            // InternalFormat.g:2465:4: ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )*
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2465:4: ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2465:5: ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair )
+                            // InternalFormat.g:2465:4: ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) )
+                            // InternalFormat.g:2465:5: ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2471:1: (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2472:3: lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair
+                            // InternalFormat.g:2471:1: (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair )
+                            // InternalFormat.g:2472:3: lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXAnnotationAccess().getElementValuePairsXAnnotationElementValuePairParserRuleCall_3_1_0_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleXAnnotationElementValuePair_in_ruleXAnnotation5740);
+                            pushFollow(FOLLOW_47);
                             lv_elementValuePairs_4_0=ruleXAnnotationElementValuePair();
 
                             state._fsp--;
@@ -7279,7 +7279,7 @@ public final EObject ruleXAnnotation() throws RecognitionException {
                                      			current, 
                                      			"elementValuePairs",
                                       		lv_elementValuePairs_4_0, 
-                                      		"XAnnotationElementValuePair");
+                                      		"org.eclipse.xtext.xbase.annotations.XbaseWithAnnotations.XAnnotationElementValuePair");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -7289,7 +7289,7 @@ public final EObject ruleXAnnotation() throws RecognitionException {
 
                             }
 
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2488:2: (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )*
+                            // InternalFormat.g:2488:2: (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )*
                             loop44:
                             do {
                                 int alt44=2;
@@ -7302,26 +7302,26 @@ public final EObject ruleXAnnotation() throws RecognitionException {
 
                                 switch (alt44) {
                             	case 1 :
-                            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2488:4: otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) )
+                            	    // InternalFormat.g:2488:4: otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) )
                             	    {
-                            	    otherlv_5=(Token)match(input,28,FOLLOW_28_in_ruleXAnnotation5753); if (state.failed) return current;
+                            	    otherlv_5=(Token)match(input,28,FOLLOW_7); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	          	newLeafNode(otherlv_5, grammarAccess.getXAnnotationAccess().getCommaKeyword_3_1_0_1_0());
                             	          
                             	    }
-                            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2492:1: ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) )
-                            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2492:2: ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair )
+                            	    // InternalFormat.g:2492:1: ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) )
+                            	    // InternalFormat.g:2492:2: ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair )
                             	    {
-                            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2498:1: (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair )
-                            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2499:3: lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair
+                            	    // InternalFormat.g:2498:1: (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair )
+                            	    // InternalFormat.g:2499:3: lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair
                             	    {
                             	    if ( state.backtracking==0 ) {
                             	       
                             	      	        newCompositeNode(grammarAccess.getXAnnotationAccess().getElementValuePairsXAnnotationElementValuePairParserRuleCall_3_1_0_1_1_0()); 
                             	      	    
                             	    }
-                            	    pushFollow(FOLLOW_ruleXAnnotationElementValuePair_in_ruleXAnnotation5794);
+                            	    pushFollow(FOLLOW_47);
                             	    lv_elementValuePairs_6_0=ruleXAnnotationElementValuePair();
 
                             	    state._fsp--;
@@ -7335,7 +7335,7 @@ public final EObject ruleXAnnotation() throws RecognitionException {
                             	             			current, 
                             	             			"elementValuePairs",
                             	              		lv_elementValuePairs_6_0, 
-                            	              		"XAnnotationElementValuePair");
+                            	              		"org.eclipse.xtext.xbase.annotations.XbaseWithAnnotations.XAnnotationElementValuePair");
                             	      	        afterParserOrEnumRuleCall();
                             	      	    
                             	    }
@@ -7361,20 +7361,20 @@ public final EObject ruleXAnnotation() throws RecognitionException {
                             }
                             break;
                         case 2 :
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2516:6: ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) )
+                            // InternalFormat.g:2516:6: ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2516:6: ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2517:1: (lv_value_7_0= ruleXAnnotationElementValueOrCommaList )
+                            // InternalFormat.g:2516:6: ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) )
+                            // InternalFormat.g:2517:1: (lv_value_7_0= ruleXAnnotationElementValueOrCommaList )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2517:1: (lv_value_7_0= ruleXAnnotationElementValueOrCommaList )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2518:3: lv_value_7_0= ruleXAnnotationElementValueOrCommaList
+                            // InternalFormat.g:2517:1: (lv_value_7_0= ruleXAnnotationElementValueOrCommaList )
+                            // InternalFormat.g:2518:3: lv_value_7_0= ruleXAnnotationElementValueOrCommaList
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXAnnotationAccess().getValueXAnnotationElementValueOrCommaListParserRuleCall_3_1_1_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleXAnnotationElementValueOrCommaList_in_ruleXAnnotation5824);
+                            pushFollow(FOLLOW_30);
                             lv_value_7_0=ruleXAnnotationElementValueOrCommaList();
 
                             state._fsp--;
@@ -7388,7 +7388,7 @@ public final EObject ruleXAnnotation() throws RecognitionException {
                                      			current, 
                                      			"value",
                                       		lv_value_7_0, 
-                                      		"XAnnotationElementValueOrCommaList");
+                                      		"org.eclipse.xtext.xbase.annotations.XbaseWithAnnotations.XAnnotationElementValueOrCommaList");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -7404,7 +7404,7 @@ public final EObject ruleXAnnotation() throws RecognitionException {
 
                     }
 
-                    otherlv_8=(Token)match(input,34,FOLLOW_34_in_ruleXAnnotation5838); if (state.failed) return current;
+                    otherlv_8=(Token)match(input,34,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_8, grammarAccess.getXAnnotationAccess().getRightParenthesisKeyword_3_2());
@@ -7439,7 +7439,7 @@ public final EObject ruleXAnnotation() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXAnnotationElementValuePair"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2546:1: entryRuleXAnnotationElementValuePair returns [EObject current=null] : iv_ruleXAnnotationElementValuePair= ruleXAnnotationElementValuePair EOF ;
+    // InternalFormat.g:2546:1: entryRuleXAnnotationElementValuePair returns [EObject current=null] : iv_ruleXAnnotationElementValuePair= ruleXAnnotationElementValuePair EOF ;
     public final EObject entryRuleXAnnotationElementValuePair() throws RecognitionException {
         EObject current = null;
 
@@ -7447,13 +7447,13 @@ public final EObject entryRuleXAnnotationElementValuePair() throws RecognitionEx
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2547:2: (iv_ruleXAnnotationElementValuePair= ruleXAnnotationElementValuePair EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2548:2: iv_ruleXAnnotationElementValuePair= ruleXAnnotationElementValuePair EOF
+            // InternalFormat.g:2547:2: (iv_ruleXAnnotationElementValuePair= ruleXAnnotationElementValuePair EOF )
+            // InternalFormat.g:2548:2: iv_ruleXAnnotationElementValuePair= ruleXAnnotationElementValuePair EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAnnotationElementValuePairRule()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationElementValuePair_in_entryRuleXAnnotationElementValuePair5876);
+            pushFollow(FOLLOW_1);
             iv_ruleXAnnotationElementValuePair=ruleXAnnotationElementValuePair();
 
             state._fsp--;
@@ -7461,7 +7461,7 @@ public final EObject entryRuleXAnnotationElementValuePair() throws RecognitionEx
             if ( state.backtracking==0 ) {
                current =iv_ruleXAnnotationElementValuePair; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAnnotationElementValuePair5886); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -7479,7 +7479,7 @@ public final EObject entryRuleXAnnotationElementValuePair() throws RecognitionEx
 
 
     // $ANTLR start "ruleXAnnotationElementValuePair"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2555:1: ruleXAnnotationElementValuePair returns [EObject current=null] : ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) ) ) ;
+    // InternalFormat.g:2555:1: ruleXAnnotationElementValuePair returns [EObject current=null] : ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) ) ) ;
     public final EObject ruleXAnnotationElementValuePair() throws RecognitionException {
         EObject current = null;
 
@@ -7490,23 +7490,23 @@ public final EObject ruleXAnnotationElementValuePair() throws RecognitionExcepti
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2558:28: ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2559:1: ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) ) )
+            // InternalFormat.g:2558:28: ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) ) ) )
+            // InternalFormat.g:2559:1: ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2559:1: ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2559:2: ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) )
+            // InternalFormat.g:2559:1: ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) ) )
+            // InternalFormat.g:2559:2: ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) ) ( (lv_value_2_0= ruleXAnnotationElementValue ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2559:2: ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2559:3: ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' )
+            // InternalFormat.g:2559:2: ( ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' ) )
+            // InternalFormat.g:2559:3: ( ( ( ( ruleValidID ) ) '=' ) )=> ( ( ( ruleValidID ) ) otherlv_1= '=' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2564:5: ( ( ( ruleValidID ) ) otherlv_1= '=' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2564:6: ( ( ruleValidID ) ) otherlv_1= '='
+            // InternalFormat.g:2564:5: ( ( ( ruleValidID ) ) otherlv_1= '=' )
+            // InternalFormat.g:2564:6: ( ( ruleValidID ) ) otherlv_1= '='
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2564:6: ( ( ruleValidID ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2565:1: ( ruleValidID )
+            // InternalFormat.g:2564:6: ( ( ruleValidID ) )
+            // InternalFormat.g:2565:1: ( ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2565:1: ( ruleValidID )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2566:3: ruleValidID
+            // InternalFormat.g:2565:1: ( ruleValidID )
+            // InternalFormat.g:2566:3: ruleValidID
             {
             if ( state.backtracking==0 ) {
 
@@ -7520,7 +7520,7 @@ public final EObject ruleXAnnotationElementValuePair() throws RecognitionExcepti
               	        newCompositeNode(grammarAccess.getXAnnotationElementValuePairAccess().getElementJvmOperationCrossReference_0_0_0_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleValidID_in_ruleXAnnotationElementValuePair5956);
+            pushFollow(FOLLOW_13);
             ruleValidID();
 
             state._fsp--;
@@ -7536,7 +7536,7 @@ public final EObject ruleXAnnotationElementValuePair() throws RecognitionExcepti
 
             }
 
-            otherlv_1=(Token)match(input,21,FOLLOW_21_in_ruleXAnnotationElementValuePair5968); if (state.failed) return current;
+            otherlv_1=(Token)match(input,21,FOLLOW_48); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXAnnotationElementValuePairAccess().getEqualsSignKeyword_0_0_1());
@@ -7548,18 +7548,18 @@ public final EObject ruleXAnnotationElementValuePair() throws RecognitionExcepti
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2583:3: ( (lv_value_2_0= ruleXAnnotationElementValue ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2584:1: (lv_value_2_0= ruleXAnnotationElementValue )
+            // InternalFormat.g:2583:3: ( (lv_value_2_0= ruleXAnnotationElementValue ) )
+            // InternalFormat.g:2584:1: (lv_value_2_0= ruleXAnnotationElementValue )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2584:1: (lv_value_2_0= ruleXAnnotationElementValue )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2585:3: lv_value_2_0= ruleXAnnotationElementValue
+            // InternalFormat.g:2584:1: (lv_value_2_0= ruleXAnnotationElementValue )
+            // InternalFormat.g:2585:3: lv_value_2_0= ruleXAnnotationElementValue
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXAnnotationElementValuePairAccess().getValueXAnnotationElementValueParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXAnnotationElementValue_in_ruleXAnnotationElementValuePair5991);
+            pushFollow(FOLLOW_2);
             lv_value_2_0=ruleXAnnotationElementValue();
 
             state._fsp--;
@@ -7573,7 +7573,7 @@ public final EObject ruleXAnnotationElementValuePair() throws RecognitionExcepti
                      			current, 
                      			"value",
                       		lv_value_2_0, 
-                      		"XAnnotationElementValue");
+                      		"org.eclipse.xtext.xbase.annotations.XbaseWithAnnotations.XAnnotationElementValue");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -7606,7 +7606,7 @@ public final EObject ruleXAnnotationElementValuePair() throws RecognitionExcepti
 
 
     // $ANTLR start "entryRuleXAnnotationElementValueOrCommaList"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2609:1: entryRuleXAnnotationElementValueOrCommaList returns [EObject current=null] : iv_ruleXAnnotationElementValueOrCommaList= ruleXAnnotationElementValueOrCommaList EOF ;
+    // InternalFormat.g:2609:1: entryRuleXAnnotationElementValueOrCommaList returns [EObject current=null] : iv_ruleXAnnotationElementValueOrCommaList= ruleXAnnotationElementValueOrCommaList EOF ;
     public final EObject entryRuleXAnnotationElementValueOrCommaList() throws RecognitionException {
         EObject current = null;
 
@@ -7614,13 +7614,13 @@ public final EObject entryRuleXAnnotationElementValueOrCommaList() throws Recogn
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2610:2: (iv_ruleXAnnotationElementValueOrCommaList= ruleXAnnotationElementValueOrCommaList EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2611:2: iv_ruleXAnnotationElementValueOrCommaList= ruleXAnnotationElementValueOrCommaList EOF
+            // InternalFormat.g:2610:2: (iv_ruleXAnnotationElementValueOrCommaList= ruleXAnnotationElementValueOrCommaList EOF )
+            // InternalFormat.g:2611:2: iv_ruleXAnnotationElementValueOrCommaList= ruleXAnnotationElementValueOrCommaList EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAnnotationElementValueOrCommaListRule()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationElementValueOrCommaList_in_entryRuleXAnnotationElementValueOrCommaList6027);
+            pushFollow(FOLLOW_1);
             iv_ruleXAnnotationElementValueOrCommaList=ruleXAnnotationElementValueOrCommaList();
 
             state._fsp--;
@@ -7628,7 +7628,7 @@ public final EObject entryRuleXAnnotationElementValueOrCommaList() throws Recogn
             if ( state.backtracking==0 ) {
                current =iv_ruleXAnnotationElementValueOrCommaList; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAnnotationElementValueOrCommaList6037); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -7646,7 +7646,7 @@ public final EObject entryRuleXAnnotationElementValueOrCommaList() throws Recogn
 
 
     // $ANTLR start "ruleXAnnotationElementValueOrCommaList"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2618:1: ruleXAnnotationElementValueOrCommaList returns [EObject current=null] : ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? ) ) ;
+    // InternalFormat.g:2618:1: ruleXAnnotationElementValueOrCommaList returns [EObject current=null] : ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? ) ) ;
     public final EObject ruleXAnnotationElementValueOrCommaList() throws RecognitionException {
         EObject current = null;
 
@@ -7667,27 +7667,27 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2621:28: ( ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2622:1: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? ) )
+            // InternalFormat.g:2621:28: ( ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? ) ) )
+            // InternalFormat.g:2622:1: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2622:1: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? ) )
+            // InternalFormat.g:2622:1: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? ) )
             int alt51=2;
             alt51 = dfa51.predict(input);
             switch (alt51) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2622:2: ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' )
+                    // InternalFormat.g:2622:2: ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2622:2: ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2622:3: ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']'
+                    // InternalFormat.g:2622:2: ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' )
+                    // InternalFormat.g:2622:3: ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']'
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2622:3: ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2622:4: ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' )
+                    // InternalFormat.g:2622:3: ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) )
+                    // InternalFormat.g:2622:4: ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2625:5: ( () otherlv_1= '#' otherlv_2= '[' )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2625:6: () otherlv_1= '#' otherlv_2= '['
+                    // InternalFormat.g:2625:5: ( () otherlv_1= '#' otherlv_2= '[' )
+                    // InternalFormat.g:2625:6: () otherlv_1= '#' otherlv_2= '['
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2625:6: ()
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2626:5: 
+                    // InternalFormat.g:2625:6: ()
+                    // InternalFormat.g:2626:5: 
                     {
                     if ( state.backtracking==0 ) {
 
@@ -7699,13 +7699,13 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
 
                     }
 
-                    otherlv_1=(Token)match(input,56,FOLLOW_56_in_ruleXAnnotationElementValueOrCommaList6102); if (state.failed) return current;
+                    otherlv_1=(Token)match(input,56,FOLLOW_49); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_1, grammarAccess.getXAnnotationElementValueOrCommaListAccess().getNumberSignKeyword_0_0_0_1());
                           
                     }
-                    otherlv_2=(Token)match(input,27,FOLLOW_27_in_ruleXAnnotationElementValueOrCommaList6114); if (state.failed) return current;
+                    otherlv_2=(Token)match(input,27,FOLLOW_50); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_2, grammarAccess.getXAnnotationElementValueOrCommaListAccess().getLeftSquareBracketKeyword_0_0_0_2());
@@ -7717,7 +7717,7 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2639:3: ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )?
+                    // InternalFormat.g:2639:3: ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )?
                     int alt48=2;
                     int LA48_0 = input.LA(1);
 
@@ -7726,20 +7726,20 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
                     }
                     switch (alt48) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2639:4: ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )*
+                            // InternalFormat.g:2639:4: ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )*
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2639:4: ( (lv_elements_3_0= ruleXAnnotationOrExpression ) )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2640:1: (lv_elements_3_0= ruleXAnnotationOrExpression )
+                            // InternalFormat.g:2639:4: ( (lv_elements_3_0= ruleXAnnotationOrExpression ) )
+                            // InternalFormat.g:2640:1: (lv_elements_3_0= ruleXAnnotationOrExpression )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2640:1: (lv_elements_3_0= ruleXAnnotationOrExpression )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2641:3: lv_elements_3_0= ruleXAnnotationOrExpression
+                            // InternalFormat.g:2640:1: (lv_elements_3_0= ruleXAnnotationOrExpression )
+                            // InternalFormat.g:2641:3: lv_elements_3_0= ruleXAnnotationOrExpression
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsXAnnotationOrExpressionParserRuleCall_0_1_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValueOrCommaList6138);
+                            pushFollow(FOLLOW_20);
                             lv_elements_3_0=ruleXAnnotationOrExpression();
 
                             state._fsp--;
@@ -7753,7 +7753,7 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
                                      			current, 
                                      			"elements",
                                       		lv_elements_3_0, 
-                                      		"XAnnotationOrExpression");
+                                      		"org.eclipse.xtext.xbase.annotations.XbaseWithAnnotations.XAnnotationOrExpression");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -7763,7 +7763,7 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
 
                             }
 
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2657:2: (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )*
+                            // InternalFormat.g:2657:2: (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )*
                             loop47:
                             do {
                                 int alt47=2;
@@ -7776,26 +7776,26 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
 
                                 switch (alt47) {
                             	case 1 :
-                            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2657:4: otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) )
+                            	    // InternalFormat.g:2657:4: otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) )
                             	    {
-                            	    otherlv_4=(Token)match(input,28,FOLLOW_28_in_ruleXAnnotationElementValueOrCommaList6151); if (state.failed) return current;
+                            	    otherlv_4=(Token)match(input,28,FOLLOW_48); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	          	newLeafNode(otherlv_4, grammarAccess.getXAnnotationElementValueOrCommaListAccess().getCommaKeyword_0_1_1_0());
                             	          
                             	    }
-                            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2661:1: ( (lv_elements_5_0= ruleXAnnotationOrExpression ) )
-                            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2662:1: (lv_elements_5_0= ruleXAnnotationOrExpression )
+                            	    // InternalFormat.g:2661:1: ( (lv_elements_5_0= ruleXAnnotationOrExpression ) )
+                            	    // InternalFormat.g:2662:1: (lv_elements_5_0= ruleXAnnotationOrExpression )
                             	    {
-                            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2662:1: (lv_elements_5_0= ruleXAnnotationOrExpression )
-                            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2663:3: lv_elements_5_0= ruleXAnnotationOrExpression
+                            	    // InternalFormat.g:2662:1: (lv_elements_5_0= ruleXAnnotationOrExpression )
+                            	    // InternalFormat.g:2663:3: lv_elements_5_0= ruleXAnnotationOrExpression
                             	    {
                             	    if ( state.backtracking==0 ) {
                             	       
                             	      	        newCompositeNode(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsXAnnotationOrExpressionParserRuleCall_0_1_1_1_0()); 
                             	      	    
                             	    }
-                            	    pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValueOrCommaList6172);
+                            	    pushFollow(FOLLOW_20);
                             	    lv_elements_5_0=ruleXAnnotationOrExpression();
 
                             	    state._fsp--;
@@ -7809,7 +7809,7 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
                             	             			current, 
                             	             			"elements",
                             	              		lv_elements_5_0, 
-                            	              		"XAnnotationOrExpression");
+                            	              		"org.eclipse.xtext.xbase.annotations.XbaseWithAnnotations.XAnnotationOrExpression");
                             	      	        afterParserOrEnumRuleCall();
                             	      	    
                             	    }
@@ -7834,7 +7834,7 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
 
                     }
 
-                    otherlv_6=(Token)match(input,29,FOLLOW_29_in_ruleXAnnotationElementValueOrCommaList6188); if (state.failed) return current;
+                    otherlv_6=(Token)match(input,29,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_6, grammarAccess.getXAnnotationElementValueOrCommaListAccess().getRightSquareBracketKeyword_0_2());
@@ -7847,17 +7847,17 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2684:6: (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? )
+                    // InternalFormat.g:2684:6: (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2684:6: (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2685:5: this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )?
+                    // InternalFormat.g:2684:6: (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? )
+                    // InternalFormat.g:2685:5: this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )?
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getXAnnotationOrExpressionParserRuleCall_1_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValueOrCommaList6218);
+                    pushFollow(FOLLOW_51);
                     this_XAnnotationOrExpression_7=ruleXAnnotationOrExpression();
 
                     state._fsp--;
@@ -7868,7 +7868,7 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
                               afterParserOrEnumRuleCall();
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2693:1: ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )?
+                    // InternalFormat.g:2693:1: ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )?
                     int alt50=2;
                     int LA50_0 = input.LA(1);
 
@@ -7877,10 +7877,10 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
                     }
                     switch (alt50) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2693:2: () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+
+                            // InternalFormat.g:2693:2: () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2693:2: ()
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2694:5: 
+                            // InternalFormat.g:2693:2: ()
+                            // InternalFormat.g:2694:5: 
                             {
                             if ( state.backtracking==0 ) {
 
@@ -7892,7 +7892,7 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
 
                             }
 
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2699:2: (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+
+                            // InternalFormat.g:2699:2: (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+
                             int cnt49=0;
                             loop49:
                             do {
@@ -7906,26 +7906,26 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
 
                                 switch (alt49) {
                             	case 1 :
-                            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2699:4: otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) )
+                            	    // InternalFormat.g:2699:4: otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) )
                             	    {
-                            	    otherlv_9=(Token)match(input,28,FOLLOW_28_in_ruleXAnnotationElementValueOrCommaList6240); if (state.failed) return current;
+                            	    otherlv_9=(Token)match(input,28,FOLLOW_48); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	          	newLeafNode(otherlv_9, grammarAccess.getXAnnotationElementValueOrCommaListAccess().getCommaKeyword_1_1_1_0());
                             	          
                             	    }
-                            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2703:1: ( (lv_elements_10_0= ruleXAnnotationOrExpression ) )
-                            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2704:1: (lv_elements_10_0= ruleXAnnotationOrExpression )
+                            	    // InternalFormat.g:2703:1: ( (lv_elements_10_0= ruleXAnnotationOrExpression ) )
+                            	    // InternalFormat.g:2704:1: (lv_elements_10_0= ruleXAnnotationOrExpression )
                             	    {
-                            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2704:1: (lv_elements_10_0= ruleXAnnotationOrExpression )
-                            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2705:3: lv_elements_10_0= ruleXAnnotationOrExpression
+                            	    // InternalFormat.g:2704:1: (lv_elements_10_0= ruleXAnnotationOrExpression )
+                            	    // InternalFormat.g:2705:3: lv_elements_10_0= ruleXAnnotationOrExpression
                             	    {
                             	    if ( state.backtracking==0 ) {
                             	       
                             	      	        newCompositeNode(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getElementsXAnnotationOrExpressionParserRuleCall_1_1_1_1_0()); 
                             	      	    
                             	    }
-                            	    pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValueOrCommaList6261);
+                            	    pushFollow(FOLLOW_51);
                             	    lv_elements_10_0=ruleXAnnotationOrExpression();
 
                             	    state._fsp--;
@@ -7939,7 +7939,7 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
                             	             			current, 
                             	             			"elements",
                             	              		lv_elements_10_0, 
-                            	              		"XAnnotationOrExpression");
+                            	              		"org.eclipse.xtext.xbase.annotations.XbaseWithAnnotations.XAnnotationOrExpression");
                             	      	        afterParserOrEnumRuleCall();
                             	      	    
                             	    }
@@ -7998,7 +7998,7 @@ public final EObject ruleXAnnotationElementValueOrCommaList() throws Recognition
 
 
     // $ANTLR start "entryRuleXAnnotationElementValue"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2729:1: entryRuleXAnnotationElementValue returns [EObject current=null] : iv_ruleXAnnotationElementValue= ruleXAnnotationElementValue EOF ;
+    // InternalFormat.g:2729:1: entryRuleXAnnotationElementValue returns [EObject current=null] : iv_ruleXAnnotationElementValue= ruleXAnnotationElementValue EOF ;
     public final EObject entryRuleXAnnotationElementValue() throws RecognitionException {
         EObject current = null;
 
@@ -8006,13 +8006,13 @@ public final EObject entryRuleXAnnotationElementValue() throws RecognitionExcept
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2730:2: (iv_ruleXAnnotationElementValue= ruleXAnnotationElementValue EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2731:2: iv_ruleXAnnotationElementValue= ruleXAnnotationElementValue EOF
+            // InternalFormat.g:2730:2: (iv_ruleXAnnotationElementValue= ruleXAnnotationElementValue EOF )
+            // InternalFormat.g:2731:2: iv_ruleXAnnotationElementValue= ruleXAnnotationElementValue EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAnnotationElementValueRule()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationElementValue_in_entryRuleXAnnotationElementValue6302);
+            pushFollow(FOLLOW_1);
             iv_ruleXAnnotationElementValue=ruleXAnnotationElementValue();
 
             state._fsp--;
@@ -8020,7 +8020,7 @@ public final EObject entryRuleXAnnotationElementValue() throws RecognitionExcept
             if ( state.backtracking==0 ) {
                current =iv_ruleXAnnotationElementValue; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAnnotationElementValue6312); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -8038,7 +8038,7 @@ public final EObject entryRuleXAnnotationElementValue() throws RecognitionExcept
 
 
     // $ANTLR start "ruleXAnnotationElementValue"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2738:1: ruleXAnnotationElementValue returns [EObject current=null] : ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ) ;
+    // InternalFormat.g:2738:1: ruleXAnnotationElementValue returns [EObject current=null] : ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ) ;
     public final EObject ruleXAnnotationElementValue() throws RecognitionException {
         EObject current = null;
 
@@ -8056,27 +8056,27 @@ public final EObject ruleXAnnotationElementValue() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2741:28: ( ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2742:1: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression )
+            // InternalFormat.g:2741:28: ( ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ) )
+            // InternalFormat.g:2742:1: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2742:1: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression )
+            // InternalFormat.g:2742:1: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression )
             int alt54=2;
             alt54 = dfa54.predict(input);
             switch (alt54) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2742:2: ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' )
+                    // InternalFormat.g:2742:2: ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2742:2: ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2742:3: ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']'
+                    // InternalFormat.g:2742:2: ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' )
+                    // InternalFormat.g:2742:3: ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']'
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2742:3: ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2742:4: ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' )
+                    // InternalFormat.g:2742:3: ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) )
+                    // InternalFormat.g:2742:4: ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2745:5: ( () otherlv_1= '#' otherlv_2= '[' )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2745:6: () otherlv_1= '#' otherlv_2= '['
+                    // InternalFormat.g:2745:5: ( () otherlv_1= '#' otherlv_2= '[' )
+                    // InternalFormat.g:2745:6: () otherlv_1= '#' otherlv_2= '['
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2745:6: ()
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2746:5: 
+                    // InternalFormat.g:2745:6: ()
+                    // InternalFormat.g:2746:5: 
                     {
                     if ( state.backtracking==0 ) {
 
@@ -8088,13 +8088,13 @@ public final EObject ruleXAnnotationElementValue() throws RecognitionException {
 
                     }
 
-                    otherlv_1=(Token)match(input,56,FOLLOW_56_in_ruleXAnnotationElementValue6377); if (state.failed) return current;
+                    otherlv_1=(Token)match(input,56,FOLLOW_49); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_1, grammarAccess.getXAnnotationElementValueAccess().getNumberSignKeyword_0_0_0_1());
                           
                     }
-                    otherlv_2=(Token)match(input,27,FOLLOW_27_in_ruleXAnnotationElementValue6389); if (state.failed) return current;
+                    otherlv_2=(Token)match(input,27,FOLLOW_50); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_2, grammarAccess.getXAnnotationElementValueAccess().getLeftSquareBracketKeyword_0_0_0_2());
@@ -8106,7 +8106,7 @@ public final EObject ruleXAnnotationElementValue() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2759:3: ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )?
+                    // InternalFormat.g:2759:3: ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )?
                     int alt53=2;
                     int LA53_0 = input.LA(1);
 
@@ -8115,20 +8115,20 @@ public final EObject ruleXAnnotationElementValue() throws RecognitionException {
                     }
                     switch (alt53) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2759:4: ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )*
+                            // InternalFormat.g:2759:4: ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )*
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2759:4: ( (lv_elements_3_0= ruleXAnnotationOrExpression ) )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2760:1: (lv_elements_3_0= ruleXAnnotationOrExpression )
+                            // InternalFormat.g:2759:4: ( (lv_elements_3_0= ruleXAnnotationOrExpression ) )
+                            // InternalFormat.g:2760:1: (lv_elements_3_0= ruleXAnnotationOrExpression )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2760:1: (lv_elements_3_0= ruleXAnnotationOrExpression )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2761:3: lv_elements_3_0= ruleXAnnotationOrExpression
+                            // InternalFormat.g:2760:1: (lv_elements_3_0= ruleXAnnotationOrExpression )
+                            // InternalFormat.g:2761:3: lv_elements_3_0= ruleXAnnotationOrExpression
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXAnnotationElementValueAccess().getElementsXAnnotationOrExpressionParserRuleCall_0_1_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValue6413);
+                            pushFollow(FOLLOW_20);
                             lv_elements_3_0=ruleXAnnotationOrExpression();
 
                             state._fsp--;
@@ -8142,7 +8142,7 @@ public final EObject ruleXAnnotationElementValue() throws RecognitionException {
                                      			current, 
                                      			"elements",
                                       		lv_elements_3_0, 
-                                      		"XAnnotationOrExpression");
+                                      		"org.eclipse.xtext.xbase.annotations.XbaseWithAnnotations.XAnnotationOrExpression");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -8152,7 +8152,7 @@ public final EObject ruleXAnnotationElementValue() throws RecognitionException {
 
                             }
 
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2777:2: (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )*
+                            // InternalFormat.g:2777:2: (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )*
                             loop52:
                             do {
                                 int alt52=2;
@@ -8165,26 +8165,26 @@ public final EObject ruleXAnnotationElementValue() throws RecognitionException {
 
                                 switch (alt52) {
                             	case 1 :
-                            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2777:4: otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) )
+                            	    // InternalFormat.g:2777:4: otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) )
                             	    {
-                            	    otherlv_4=(Token)match(input,28,FOLLOW_28_in_ruleXAnnotationElementValue6426); if (state.failed) return current;
+                            	    otherlv_4=(Token)match(input,28,FOLLOW_48); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	          	newLeafNode(otherlv_4, grammarAccess.getXAnnotationElementValueAccess().getCommaKeyword_0_1_1_0());
                             	          
                             	    }
-                            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2781:1: ( (lv_elements_5_0= ruleXAnnotationOrExpression ) )
-                            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2782:1: (lv_elements_5_0= ruleXAnnotationOrExpression )
+                            	    // InternalFormat.g:2781:1: ( (lv_elements_5_0= ruleXAnnotationOrExpression ) )
+                            	    // InternalFormat.g:2782:1: (lv_elements_5_0= ruleXAnnotationOrExpression )
                             	    {
-                            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2782:1: (lv_elements_5_0= ruleXAnnotationOrExpression )
-                            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2783:3: lv_elements_5_0= ruleXAnnotationOrExpression
+                            	    // InternalFormat.g:2782:1: (lv_elements_5_0= ruleXAnnotationOrExpression )
+                            	    // InternalFormat.g:2783:3: lv_elements_5_0= ruleXAnnotationOrExpression
                             	    {
                             	    if ( state.backtracking==0 ) {
                             	       
                             	      	        newCompositeNode(grammarAccess.getXAnnotationElementValueAccess().getElementsXAnnotationOrExpressionParserRuleCall_0_1_1_1_0()); 
                             	      	    
                             	    }
-                            	    pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValue6447);
+                            	    pushFollow(FOLLOW_20);
                             	    lv_elements_5_0=ruleXAnnotationOrExpression();
 
                             	    state._fsp--;
@@ -8198,7 +8198,7 @@ public final EObject ruleXAnnotationElementValue() throws RecognitionException {
                             	             			current, 
                             	             			"elements",
                             	              		lv_elements_5_0, 
-                            	              		"XAnnotationOrExpression");
+                            	              		"org.eclipse.xtext.xbase.annotations.XbaseWithAnnotations.XAnnotationOrExpression");
                             	      	        afterParserOrEnumRuleCall();
                             	      	    
                             	    }
@@ -8223,7 +8223,7 @@ public final EObject ruleXAnnotationElementValue() throws RecognitionException {
 
                     }
 
-                    otherlv_6=(Token)match(input,29,FOLLOW_29_in_ruleXAnnotationElementValue6463); if (state.failed) return current;
+                    otherlv_6=(Token)match(input,29,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_6, grammarAccess.getXAnnotationElementValueAccess().getRightSquareBracketKeyword_0_2());
@@ -8236,14 +8236,14 @@ public final EObject ruleXAnnotationElementValue() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2805:5: this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression
+                    // InternalFormat.g:2805:5: this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXAnnotationElementValueAccess().getXAnnotationOrExpressionParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValue6492);
+                    pushFollow(FOLLOW_2);
                     this_XAnnotationOrExpression_7=ruleXAnnotationOrExpression();
 
                     state._fsp--;
@@ -8280,7 +8280,7 @@ public final EObject ruleXAnnotationElementValue() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXAnnotationOrExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2821:1: entryRuleXAnnotationOrExpression returns [EObject current=null] : iv_ruleXAnnotationOrExpression= ruleXAnnotationOrExpression EOF ;
+    // InternalFormat.g:2821:1: entryRuleXAnnotationOrExpression returns [EObject current=null] : iv_ruleXAnnotationOrExpression= ruleXAnnotationOrExpression EOF ;
     public final EObject entryRuleXAnnotationOrExpression() throws RecognitionException {
         EObject current = null;
 
@@ -8288,13 +8288,13 @@ public final EObject entryRuleXAnnotationOrExpression() throws RecognitionExcept
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2822:2: (iv_ruleXAnnotationOrExpression= ruleXAnnotationOrExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2823:2: iv_ruleXAnnotationOrExpression= ruleXAnnotationOrExpression EOF
+            // InternalFormat.g:2822:2: (iv_ruleXAnnotationOrExpression= ruleXAnnotationOrExpression EOF )
+            // InternalFormat.g:2823:2: iv_ruleXAnnotationOrExpression= ruleXAnnotationOrExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAnnotationOrExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXAnnotationOrExpression_in_entryRuleXAnnotationOrExpression6527);
+            pushFollow(FOLLOW_1);
             iv_ruleXAnnotationOrExpression=ruleXAnnotationOrExpression();
 
             state._fsp--;
@@ -8302,7 +8302,7 @@ public final EObject entryRuleXAnnotationOrExpression() throws RecognitionExcept
             if ( state.backtracking==0 ) {
                current =iv_ruleXAnnotationOrExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAnnotationOrExpression6537); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -8320,7 +8320,7 @@ public final EObject entryRuleXAnnotationOrExpression() throws RecognitionExcept
 
 
     // $ANTLR start "ruleXAnnotationOrExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2830:1: ruleXAnnotationOrExpression returns [EObject current=null] : (this_XAnnotation_0= ruleXAnnotation | this_XExpression_1= ruleXExpression ) ;
+    // InternalFormat.g:2830:1: ruleXAnnotationOrExpression returns [EObject current=null] : (this_XAnnotation_0= ruleXAnnotation | this_XExpression_1= ruleXExpression ) ;
     public final EObject ruleXAnnotationOrExpression() throws RecognitionException {
         EObject current = null;
 
@@ -8332,10 +8332,10 @@ public final EObject ruleXAnnotationOrExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2833:28: ( (this_XAnnotation_0= ruleXAnnotation | this_XExpression_1= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2834:1: (this_XAnnotation_0= ruleXAnnotation | this_XExpression_1= ruleXExpression )
+            // InternalFormat.g:2833:28: ( (this_XAnnotation_0= ruleXAnnotation | this_XExpression_1= ruleXExpression ) )
+            // InternalFormat.g:2834:1: (this_XAnnotation_0= ruleXAnnotation | this_XExpression_1= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2834:1: (this_XAnnotation_0= ruleXAnnotation | this_XExpression_1= ruleXExpression )
+            // InternalFormat.g:2834:1: (this_XAnnotation_0= ruleXAnnotation | this_XExpression_1= ruleXExpression )
             int alt55=2;
             int LA55_0 = input.LA(1);
 
@@ -8354,14 +8354,14 @@ else if ( ((LA55_0>=RULE_ID && LA55_0<=RULE_DECIMAL)||LA55_0==14||LA55_0==16||LA
             }
             switch (alt55) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2835:5: this_XAnnotation_0= ruleXAnnotation
+                    // InternalFormat.g:2835:5: this_XAnnotation_0= ruleXAnnotation
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXAnnotationOrExpressionAccess().getXAnnotationParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXAnnotation_in_ruleXAnnotationOrExpression6584);
+                    pushFollow(FOLLOW_2);
                     this_XAnnotation_0=ruleXAnnotation();
 
                     state._fsp--;
@@ -8376,14 +8376,14 @@ else if ( ((LA55_0>=RULE_ID && LA55_0<=RULE_DECIMAL)||LA55_0==14||LA55_0==16||LA
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2845:5: this_XExpression_1= ruleXExpression
+                    // InternalFormat.g:2845:5: this_XExpression_1= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXAnnotationOrExpressionAccess().getXExpressionParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXAnnotationOrExpression6611);
+                    pushFollow(FOLLOW_2);
                     this_XExpression_1=ruleXExpression();
 
                     state._fsp--;
@@ -8420,7 +8420,7 @@ else if ( ((LA55_0>=RULE_ID && LA55_0<=RULE_DECIMAL)||LA55_0==14||LA55_0==16||LA
 
 
     // $ANTLR start "entryRuleXExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2861:1: entryRuleXExpression returns [EObject current=null] : iv_ruleXExpression= ruleXExpression EOF ;
+    // InternalFormat.g:2861:1: entryRuleXExpression returns [EObject current=null] : iv_ruleXExpression= ruleXExpression EOF ;
     public final EObject entryRuleXExpression() throws RecognitionException {
         EObject current = null;
 
@@ -8428,13 +8428,13 @@ public final EObject entryRuleXExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2862:2: (iv_ruleXExpression= ruleXExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2863:2: iv_ruleXExpression= ruleXExpression EOF
+            // InternalFormat.g:2862:2: (iv_ruleXExpression= ruleXExpression EOF )
+            // InternalFormat.g:2863:2: iv_ruleXExpression= ruleXExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXExpression_in_entryRuleXExpression6646);
+            pushFollow(FOLLOW_1);
             iv_ruleXExpression=ruleXExpression();
 
             state._fsp--;
@@ -8442,7 +8442,7 @@ public final EObject entryRuleXExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXExpression6656); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -8460,7 +8460,7 @@ public final EObject entryRuleXExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2870:1: ruleXExpression returns [EObject current=null] : this_XAssignment_0= ruleXAssignment ;
+    // InternalFormat.g:2870:1: ruleXExpression returns [EObject current=null] : this_XAssignment_0= ruleXAssignment ;
     public final EObject ruleXExpression() throws RecognitionException {
         EObject current = null;
 
@@ -8470,15 +8470,15 @@ public final EObject ruleXExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2873:28: (this_XAssignment_0= ruleXAssignment )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2875:5: this_XAssignment_0= ruleXAssignment
+            // InternalFormat.g:2873:28: (this_XAssignment_0= ruleXAssignment )
+            // InternalFormat.g:2875:5: this_XAssignment_0= ruleXAssignment
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXExpressionAccess().getXAssignmentParserRuleCall()); 
                   
             }
-            pushFollow(FOLLOW_ruleXAssignment_in_ruleXExpression6702);
+            pushFollow(FOLLOW_2);
             this_XAssignment_0=ruleXAssignment();
 
             state._fsp--;
@@ -8509,7 +8509,7 @@ public final EObject ruleXExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXAssignment"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2891:1: entryRuleXAssignment returns [EObject current=null] : iv_ruleXAssignment= ruleXAssignment EOF ;
+    // InternalFormat.g:2891:1: entryRuleXAssignment returns [EObject current=null] : iv_ruleXAssignment= ruleXAssignment EOF ;
     public final EObject entryRuleXAssignment() throws RecognitionException {
         EObject current = null;
 
@@ -8517,13 +8517,13 @@ public final EObject entryRuleXAssignment() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2892:2: (iv_ruleXAssignment= ruleXAssignment EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2893:2: iv_ruleXAssignment= ruleXAssignment EOF
+            // InternalFormat.g:2892:2: (iv_ruleXAssignment= ruleXAssignment EOF )
+            // InternalFormat.g:2893:2: iv_ruleXAssignment= ruleXAssignment EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAssignmentRule()); 
             }
-            pushFollow(FOLLOW_ruleXAssignment_in_entryRuleXAssignment6736);
+            pushFollow(FOLLOW_1);
             iv_ruleXAssignment=ruleXAssignment();
 
             state._fsp--;
@@ -8531,7 +8531,7 @@ public final EObject entryRuleXAssignment() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXAssignment; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAssignment6746); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -8549,7 +8549,7 @@ public final EObject entryRuleXAssignment() throws RecognitionException {
 
 
     // $ANTLR start "ruleXAssignment"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2900:1: ruleXAssignment returns [EObject current=null] : ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) ) ;
+    // InternalFormat.g:2900:1: ruleXAssignment returns [EObject current=null] : ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) ) ;
     public final EObject ruleXAssignment() throws RecognitionException {
         EObject current = null;
 
@@ -8563,21 +8563,21 @@ public final EObject ruleXAssignment() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2903:28: ( ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2904:1: ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) )
+            // InternalFormat.g:2903:28: ( ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) ) )
+            // InternalFormat.g:2904:1: ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2904:1: ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) )
+            // InternalFormat.g:2904:1: ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) )
             int alt57=2;
             alt57 = dfa57.predict(input);
             switch (alt57) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2904:2: ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) )
+                    // InternalFormat.g:2904:2: ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2904:2: ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2904:3: () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) )
+                    // InternalFormat.g:2904:2: ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) )
+                    // InternalFormat.g:2904:3: () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2904:3: ()
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2905:5: 
+                    // InternalFormat.g:2904:3: ()
+                    // InternalFormat.g:2905:5: 
                     {
                     if ( state.backtracking==0 ) {
 
@@ -8589,11 +8589,11 @@ public final EObject ruleXAssignment() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2910:2: ( ( ruleFeatureCallID ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2911:1: ( ruleFeatureCallID )
+                    // InternalFormat.g:2910:2: ( ( ruleFeatureCallID ) )
+                    // InternalFormat.g:2911:1: ( ruleFeatureCallID )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2911:1: ( ruleFeatureCallID )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2912:3: ruleFeatureCallID
+                    // InternalFormat.g:2911:1: ( ruleFeatureCallID )
+                    // InternalFormat.g:2912:3: ruleFeatureCallID
                     {
                     if ( state.backtracking==0 ) {
 
@@ -8607,7 +8607,7 @@ public final EObject ruleXAssignment() throws RecognitionException {
                       	        newCompositeNode(grammarAccess.getXAssignmentAccess().getFeatureJvmIdentifiableElementCrossReference_0_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleFeatureCallID_in_ruleXAssignment6804);
+                    pushFollow(FOLLOW_13);
                     ruleFeatureCallID();
 
                     state._fsp--;
@@ -8628,7 +8628,7 @@ public final EObject ruleXAssignment() throws RecognitionException {
                               newCompositeNode(grammarAccess.getXAssignmentAccess().getOpSingleAssignParserRuleCall_0_2()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleOpSingleAssign_in_ruleXAssignment6820);
+                    pushFollow(FOLLOW_48);
                     ruleOpSingleAssign();
 
                     state._fsp--;
@@ -8638,18 +8638,18 @@ public final EObject ruleXAssignment() throws RecognitionException {
                               afterParserOrEnumRuleCall();
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2933:1: ( (lv_value_3_0= ruleXAssignment ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2934:1: (lv_value_3_0= ruleXAssignment )
+                    // InternalFormat.g:2933:1: ( (lv_value_3_0= ruleXAssignment ) )
+                    // InternalFormat.g:2934:1: (lv_value_3_0= ruleXAssignment )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2934:1: (lv_value_3_0= ruleXAssignment )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2935:3: lv_value_3_0= ruleXAssignment
+                    // InternalFormat.g:2934:1: (lv_value_3_0= ruleXAssignment )
+                    // InternalFormat.g:2935:3: lv_value_3_0= ruleXAssignment
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXAssignmentAccess().getValueXAssignmentParserRuleCall_0_3_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXAssignment_in_ruleXAssignment6840);
+                    pushFollow(FOLLOW_2);
                     lv_value_3_0=ruleXAssignment();
 
                     state._fsp--;
@@ -8663,7 +8663,7 @@ public final EObject ruleXAssignment() throws RecognitionException {
                              			current, 
                              			"value",
                               		lv_value_3_0, 
-                              		"XAssignment");
+                              		"org.eclipse.xtext.xbase.Xbase.XAssignment");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -8680,17 +8680,17 @@ public final EObject ruleXAssignment() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2952:6: (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? )
+                    // InternalFormat.g:2952:6: (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2952:6: (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2953:5: this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )?
+                    // InternalFormat.g:2952:6: (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? )
+                    // InternalFormat.g:2953:5: this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )?
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXAssignmentAccess().getXOrExpressionParserRuleCall_1_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXOrExpression_in_ruleXAssignment6870);
+                    pushFollow(FOLLOW_52);
                     this_XOrExpression_4=ruleXOrExpression();
 
                     state._fsp--;
@@ -8701,21 +8701,21 @@ public final EObject ruleXAssignment() throws RecognitionException {
                               afterParserOrEnumRuleCall();
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2961:1: ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )?
+                    // InternalFormat.g:2961:1: ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )?
                     int alt56=2;
                     alt56 = dfa56.predict(input);
                     switch (alt56) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2961:2: ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) )
+                            // InternalFormat.g:2961:2: ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2961:2: ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2961:3: ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) )
+                            // InternalFormat.g:2961:2: ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) )
+                            // InternalFormat.g:2961:3: ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2966:6: ( () ( ( ruleOpMultiAssign ) ) )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2966:7: () ( ( ruleOpMultiAssign ) )
+                            // InternalFormat.g:2966:6: ( () ( ( ruleOpMultiAssign ) ) )
+                            // InternalFormat.g:2966:7: () ( ( ruleOpMultiAssign ) )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2966:7: ()
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2967:5: 
+                            // InternalFormat.g:2966:7: ()
+                            // InternalFormat.g:2967:5: 
                             {
                             if ( state.backtracking==0 ) {
 
@@ -8727,11 +8727,11 @@ public final EObject ruleXAssignment() throws RecognitionException {
 
                             }
 
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2972:2: ( ( ruleOpMultiAssign ) )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2973:1: ( ruleOpMultiAssign )
+                            // InternalFormat.g:2972:2: ( ( ruleOpMultiAssign ) )
+                            // InternalFormat.g:2973:1: ( ruleOpMultiAssign )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2973:1: ( ruleOpMultiAssign )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2974:3: ruleOpMultiAssign
+                            // InternalFormat.g:2973:1: ( ruleOpMultiAssign )
+                            // InternalFormat.g:2974:3: ruleOpMultiAssign
                             {
                             if ( state.backtracking==0 ) {
 
@@ -8745,7 +8745,7 @@ public final EObject ruleXAssignment() throws RecognitionException {
                               	        newCompositeNode(grammarAccess.getXAssignmentAccess().getFeatureJvmIdentifiableElementCrossReference_1_1_0_0_1_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleOpMultiAssign_in_ruleXAssignment6923);
+                            pushFollow(FOLLOW_48);
                             ruleOpMultiAssign();
 
                             state._fsp--;
@@ -8767,18 +8767,18 @@ public final EObject ruleXAssignment() throws RecognitionException {
 
                             }
 
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2987:4: ( (lv_rightOperand_7_0= ruleXAssignment ) )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2988:1: (lv_rightOperand_7_0= ruleXAssignment )
+                            // InternalFormat.g:2987:4: ( (lv_rightOperand_7_0= ruleXAssignment ) )
+                            // InternalFormat.g:2988:1: (lv_rightOperand_7_0= ruleXAssignment )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2988:1: (lv_rightOperand_7_0= ruleXAssignment )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2989:3: lv_rightOperand_7_0= ruleXAssignment
+                            // InternalFormat.g:2988:1: (lv_rightOperand_7_0= ruleXAssignment )
+                            // InternalFormat.g:2989:3: lv_rightOperand_7_0= ruleXAssignment
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXAssignmentAccess().getRightOperandXAssignmentParserRuleCall_1_1_1_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleXAssignment_in_ruleXAssignment6946);
+                            pushFollow(FOLLOW_2);
                             lv_rightOperand_7_0=ruleXAssignment();
 
                             state._fsp--;
@@ -8792,7 +8792,7 @@ public final EObject ruleXAssignment() throws RecognitionException {
                                      			current, 
                                      			"rightOperand",
                                       		lv_rightOperand_7_0, 
-                                      		"XAssignment");
+                                      		"org.eclipse.xtext.xbase.Xbase.XAssignment");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -8837,7 +8837,7 @@ public final EObject ruleXAssignment() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpSingleAssign"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3013:1: entryRuleOpSingleAssign returns [String current=null] : iv_ruleOpSingleAssign= ruleOpSingleAssign EOF ;
+    // InternalFormat.g:3013:1: entryRuleOpSingleAssign returns [String current=null] : iv_ruleOpSingleAssign= ruleOpSingleAssign EOF ;
     public final String entryRuleOpSingleAssign() throws RecognitionException {
         String current = null;
 
@@ -8845,13 +8845,13 @@ public final String entryRuleOpSingleAssign() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3014:2: (iv_ruleOpSingleAssign= ruleOpSingleAssign EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3015:2: iv_ruleOpSingleAssign= ruleOpSingleAssign EOF
+            // InternalFormat.g:3014:2: (iv_ruleOpSingleAssign= ruleOpSingleAssign EOF )
+            // InternalFormat.g:3015:2: iv_ruleOpSingleAssign= ruleOpSingleAssign EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpSingleAssignRule()); 
             }
-            pushFollow(FOLLOW_ruleOpSingleAssign_in_entryRuleOpSingleAssign6986);
+            pushFollow(FOLLOW_1);
             iv_ruleOpSingleAssign=ruleOpSingleAssign();
 
             state._fsp--;
@@ -8859,7 +8859,7 @@ public final String entryRuleOpSingleAssign() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpSingleAssign.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpSingleAssign6997); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -8877,7 +8877,7 @@ public final String entryRuleOpSingleAssign() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpSingleAssign"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3022:1: ruleOpSingleAssign returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : kw= '=' ;
+    // InternalFormat.g:3022:1: ruleOpSingleAssign returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : kw= '=' ;
     public final AntlrDatatypeRuleToken ruleOpSingleAssign() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -8886,10 +8886,10 @@ public final AntlrDatatypeRuleToken ruleOpSingleAssign() throws RecognitionExcep
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3025:28: (kw= '=' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3027:2: kw= '='
+            // InternalFormat.g:3025:28: (kw= '=' )
+            // InternalFormat.g:3027:2: kw= '='
             {
-            kw=(Token)match(input,21,FOLLOW_21_in_ruleOpSingleAssign7034); if (state.failed) return current;
+            kw=(Token)match(input,21,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                       current.merge(kw);
@@ -8916,7 +8916,7 @@ public final AntlrDatatypeRuleToken ruleOpSingleAssign() throws RecognitionExcep
 
 
     // $ANTLR start "entryRuleOpMultiAssign"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3040:1: entryRuleOpMultiAssign returns [String current=null] : iv_ruleOpMultiAssign= ruleOpMultiAssign EOF ;
+    // InternalFormat.g:3040:1: entryRuleOpMultiAssign returns [String current=null] : iv_ruleOpMultiAssign= ruleOpMultiAssign EOF ;
     public final String entryRuleOpMultiAssign() throws RecognitionException {
         String current = null;
 
@@ -8924,13 +8924,13 @@ public final String entryRuleOpMultiAssign() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3041:2: (iv_ruleOpMultiAssign= ruleOpMultiAssign EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3042:2: iv_ruleOpMultiAssign= ruleOpMultiAssign EOF
+            // InternalFormat.g:3041:2: (iv_ruleOpMultiAssign= ruleOpMultiAssign EOF )
+            // InternalFormat.g:3042:2: iv_ruleOpMultiAssign= ruleOpMultiAssign EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpMultiAssignRule()); 
             }
-            pushFollow(FOLLOW_ruleOpMultiAssign_in_entryRuleOpMultiAssign7074);
+            pushFollow(FOLLOW_1);
             iv_ruleOpMultiAssign=ruleOpMultiAssign();
 
             state._fsp--;
@@ -8938,7 +8938,7 @@ public final String entryRuleOpMultiAssign() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpMultiAssign.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpMultiAssign7085); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -8956,7 +8956,7 @@ public final String entryRuleOpMultiAssign() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpMultiAssign"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3049:1: ruleOpMultiAssign returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) ) ;
+    // InternalFormat.g:3049:1: ruleOpMultiAssign returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) ) ;
     public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -8965,10 +8965,10 @@ public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionExcept
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3052:28: ( (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3053:1: (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) )
+            // InternalFormat.g:3052:28: ( (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) ) )
+            // InternalFormat.g:3053:1: (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3053:1: (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) )
+            // InternalFormat.g:3053:1: (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) )
             int alt59=7;
             switch ( input.LA(1) ) {
             case 57:
@@ -9016,9 +9016,9 @@ public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionExcept
 
             switch (alt59) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3054:2: kw= '+='
+                    // InternalFormat.g:3054:2: kw= '+='
                     {
-                    kw=(Token)match(input,57,FOLLOW_57_in_ruleOpMultiAssign7123); if (state.failed) return current;
+                    kw=(Token)match(input,57,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -9029,9 +9029,9 @@ public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionExcept
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3061:2: kw= '-='
+                    // InternalFormat.g:3061:2: kw= '-='
                     {
-                    kw=(Token)match(input,58,FOLLOW_58_in_ruleOpMultiAssign7142); if (state.failed) return current;
+                    kw=(Token)match(input,58,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -9042,9 +9042,9 @@ public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionExcept
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3068:2: kw= '*='
+                    // InternalFormat.g:3068:2: kw= '*='
                     {
-                    kw=(Token)match(input,59,FOLLOW_59_in_ruleOpMultiAssign7161); if (state.failed) return current;
+                    kw=(Token)match(input,59,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -9055,9 +9055,9 @@ public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionExcept
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3075:2: kw= '/='
+                    // InternalFormat.g:3075:2: kw= '/='
                     {
-                    kw=(Token)match(input,60,FOLLOW_60_in_ruleOpMultiAssign7180); if (state.failed) return current;
+                    kw=(Token)match(input,60,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -9068,9 +9068,9 @@ public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionExcept
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3082:2: kw= '%='
+                    // InternalFormat.g:3082:2: kw= '%='
                     {
-                    kw=(Token)match(input,61,FOLLOW_61_in_ruleOpMultiAssign7199); if (state.failed) return current;
+                    kw=(Token)match(input,61,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -9081,26 +9081,26 @@ public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionExcept
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3088:6: (kw= '<' kw= '<' kw= '=' )
+                    // InternalFormat.g:3088:6: (kw= '<' kw= '<' kw= '=' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3088:6: (kw= '<' kw= '<' kw= '=' )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3089:2: kw= '<' kw= '<' kw= '='
+                    // InternalFormat.g:3088:6: (kw= '<' kw= '<' kw= '=' )
+                    // InternalFormat.g:3089:2: kw= '<' kw= '<' kw= '='
                     {
-                    kw=(Token)match(input,62,FOLLOW_62_in_ruleOpMultiAssign7219); if (state.failed) return current;
+                    kw=(Token)match(input,62,FOLLOW_53); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
                               newLeafNode(kw, grammarAccess.getOpMultiAssignAccess().getLessThanSignKeyword_5_0()); 
                           
                     }
-                    kw=(Token)match(input,62,FOLLOW_62_in_ruleOpMultiAssign7232); if (state.failed) return current;
+                    kw=(Token)match(input,62,FOLLOW_13); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
                               newLeafNode(kw, grammarAccess.getOpMultiAssignAccess().getLessThanSignKeyword_5_1()); 
                           
                     }
-                    kw=(Token)match(input,21,FOLLOW_21_in_ruleOpMultiAssign7245); if (state.failed) return current;
+                    kw=(Token)match(input,21,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -9114,19 +9114,19 @@ public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionExcept
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3107:6: (kw= '>' (kw= '>' )? kw= '>=' )
+                    // InternalFormat.g:3107:6: (kw= '>' (kw= '>' )? kw= '>=' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3107:6: (kw= '>' (kw= '>' )? kw= '>=' )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3108:2: kw= '>' (kw= '>' )? kw= '>='
+                    // InternalFormat.g:3107:6: (kw= '>' (kw= '>' )? kw= '>=' )
+                    // InternalFormat.g:3108:2: kw= '>' (kw= '>' )? kw= '>='
                     {
-                    kw=(Token)match(input,63,FOLLOW_63_in_ruleOpMultiAssign7266); if (state.failed) return current;
+                    kw=(Token)match(input,63,FOLLOW_54); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
                               newLeafNode(kw, grammarAccess.getOpMultiAssignAccess().getGreaterThanSignKeyword_6_0()); 
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3113:1: (kw= '>' )?
+                    // InternalFormat.g:3113:1: (kw= '>' )?
                     int alt58=2;
                     int LA58_0 = input.LA(1);
 
@@ -9135,9 +9135,9 @@ public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionExcept
                     }
                     switch (alt58) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3114:2: kw= '>'
+                            // InternalFormat.g:3114:2: kw= '>'
                             {
-                            kw=(Token)match(input,63,FOLLOW_63_in_ruleOpMultiAssign7280); if (state.failed) return current;
+                            kw=(Token)match(input,63,FOLLOW_55); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       current.merge(kw);
@@ -9150,7 +9150,7 @@ public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionExcept
 
                     }
 
-                    kw=(Token)match(input,64,FOLLOW_64_in_ruleOpMultiAssign7295); if (state.failed) return current;
+                    kw=(Token)match(input,64,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -9186,7 +9186,7 @@ public final AntlrDatatypeRuleToken ruleOpMultiAssign() throws RecognitionExcept
 
 
     // $ANTLR start "entryRuleXOrExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3133:1: entryRuleXOrExpression returns [EObject current=null] : iv_ruleXOrExpression= ruleXOrExpression EOF ;
+    // InternalFormat.g:3133:1: entryRuleXOrExpression returns [EObject current=null] : iv_ruleXOrExpression= ruleXOrExpression EOF ;
     public final EObject entryRuleXOrExpression() throws RecognitionException {
         EObject current = null;
 
@@ -9194,13 +9194,13 @@ public final EObject entryRuleXOrExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3134:2: (iv_ruleXOrExpression= ruleXOrExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3135:2: iv_ruleXOrExpression= ruleXOrExpression EOF
+            // InternalFormat.g:3134:2: (iv_ruleXOrExpression= ruleXOrExpression EOF )
+            // InternalFormat.g:3135:2: iv_ruleXOrExpression= ruleXOrExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXOrExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXOrExpression_in_entryRuleXOrExpression7336);
+            pushFollow(FOLLOW_1);
             iv_ruleXOrExpression=ruleXOrExpression();
 
             state._fsp--;
@@ -9208,7 +9208,7 @@ public final EObject entryRuleXOrExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXOrExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXOrExpression7346); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -9226,7 +9226,7 @@ public final EObject entryRuleXOrExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXOrExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3142:1: ruleXOrExpression returns [EObject current=null] : (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* ) ;
+    // InternalFormat.g:3142:1: ruleXOrExpression returns [EObject current=null] : (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* ) ;
     public final EObject ruleXOrExpression() throws RecognitionException {
         EObject current = null;
 
@@ -9238,18 +9238,18 @@ public final EObject ruleXOrExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3145:28: ( (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3146:1: (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* )
+            // InternalFormat.g:3145:28: ( (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* ) )
+            // InternalFormat.g:3146:1: (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3146:1: (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3147:5: this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )*
+            // InternalFormat.g:3146:1: (this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )* )
+            // InternalFormat.g:3147:5: this_XAndExpression_0= ruleXAndExpression ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXOrExpressionAccess().getXAndExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleXAndExpression_in_ruleXOrExpression7393);
+            pushFollow(FOLLOW_56);
             this_XAndExpression_0=ruleXAndExpression();
 
             state._fsp--;
@@ -9260,7 +9260,7 @@ public final EObject ruleXOrExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3155:1: ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )*
+            // InternalFormat.g:3155:1: ( ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) ) )*
             loop60:
             do {
                 int alt60=2;
@@ -9279,16 +9279,16 @@ public final EObject ruleXOrExpression() throws RecognitionException {
 
                 switch (alt60) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3155:2: ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) )
+            	    // InternalFormat.g:3155:2: ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) ) ( (lv_rightOperand_3_0= ruleXAndExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3155:2: ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3155:3: ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) )
+            	    // InternalFormat.g:3155:2: ( ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) ) )
+            	    // InternalFormat.g:3155:3: ( ( () ( ( ruleOpOr ) ) ) )=> ( () ( ( ruleOpOr ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3160:6: ( () ( ( ruleOpOr ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3160:7: () ( ( ruleOpOr ) )
+            	    // InternalFormat.g:3160:6: ( () ( ( ruleOpOr ) ) )
+            	    // InternalFormat.g:3160:7: () ( ( ruleOpOr ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3160:7: ()
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3161:5: 
+            	    // InternalFormat.g:3160:7: ()
+            	    // InternalFormat.g:3161:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -9300,11 +9300,11 @@ public final EObject ruleXOrExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3166:2: ( ( ruleOpOr ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3167:1: ( ruleOpOr )
+            	    // InternalFormat.g:3166:2: ( ( ruleOpOr ) )
+            	    // InternalFormat.g:3167:1: ( ruleOpOr )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3167:1: ( ruleOpOr )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3168:3: ruleOpOr
+            	    // InternalFormat.g:3167:1: ( ruleOpOr )
+            	    // InternalFormat.g:3168:3: ruleOpOr
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -9318,7 +9318,7 @@ public final EObject ruleXOrExpression() throws RecognitionException {
             	      	        newCompositeNode(grammarAccess.getXOrExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleOpOr_in_ruleXOrExpression7446);
+            	    pushFollow(FOLLOW_48);
             	    ruleOpOr();
 
             	    state._fsp--;
@@ -9340,18 +9340,18 @@ public final EObject ruleXOrExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3181:4: ( (lv_rightOperand_3_0= ruleXAndExpression ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3182:1: (lv_rightOperand_3_0= ruleXAndExpression )
+            	    // InternalFormat.g:3181:4: ( (lv_rightOperand_3_0= ruleXAndExpression ) )
+            	    // InternalFormat.g:3182:1: (lv_rightOperand_3_0= ruleXAndExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3182:1: (lv_rightOperand_3_0= ruleXAndExpression )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3183:3: lv_rightOperand_3_0= ruleXAndExpression
+            	    // InternalFormat.g:3182:1: (lv_rightOperand_3_0= ruleXAndExpression )
+            	    // InternalFormat.g:3183:3: lv_rightOperand_3_0= ruleXAndExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXOrExpressionAccess().getRightOperandXAndExpressionParserRuleCall_1_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXAndExpression_in_ruleXOrExpression7469);
+            	    pushFollow(FOLLOW_56);
             	    lv_rightOperand_3_0=ruleXAndExpression();
 
             	    state._fsp--;
@@ -9365,7 +9365,7 @@ public final EObject ruleXOrExpression() throws RecognitionException {
             	             			current, 
             	             			"rightOperand",
             	              		lv_rightOperand_3_0, 
-            	              		"XAndExpression");
+            	              		"org.eclipse.xtext.xbase.Xbase.XAndExpression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -9407,7 +9407,7 @@ public final EObject ruleXOrExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpOr"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3207:1: entryRuleOpOr returns [String current=null] : iv_ruleOpOr= ruleOpOr EOF ;
+    // InternalFormat.g:3207:1: entryRuleOpOr returns [String current=null] : iv_ruleOpOr= ruleOpOr EOF ;
     public final String entryRuleOpOr() throws RecognitionException {
         String current = null;
 
@@ -9415,13 +9415,13 @@ public final String entryRuleOpOr() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3208:2: (iv_ruleOpOr= ruleOpOr EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3209:2: iv_ruleOpOr= ruleOpOr EOF
+            // InternalFormat.g:3208:2: (iv_ruleOpOr= ruleOpOr EOF )
+            // InternalFormat.g:3209:2: iv_ruleOpOr= ruleOpOr EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpOrRule()); 
             }
-            pushFollow(FOLLOW_ruleOpOr_in_entryRuleOpOr7508);
+            pushFollow(FOLLOW_1);
             iv_ruleOpOr=ruleOpOr();
 
             state._fsp--;
@@ -9429,7 +9429,7 @@ public final String entryRuleOpOr() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpOr.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpOr7519); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -9447,7 +9447,7 @@ public final String entryRuleOpOr() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpOr"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3216:1: ruleOpOr returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : kw= '||' ;
+    // InternalFormat.g:3216:1: ruleOpOr returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : kw= '||' ;
     public final AntlrDatatypeRuleToken ruleOpOr() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -9456,10 +9456,10 @@ public final AntlrDatatypeRuleToken ruleOpOr() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3219:28: (kw= '||' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3221:2: kw= '||'
+            // InternalFormat.g:3219:28: (kw= '||' )
+            // InternalFormat.g:3221:2: kw= '||'
             {
-            kw=(Token)match(input,65,FOLLOW_65_in_ruleOpOr7556); if (state.failed) return current;
+            kw=(Token)match(input,65,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                       current.merge(kw);
@@ -9486,7 +9486,7 @@ public final AntlrDatatypeRuleToken ruleOpOr() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXAndExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3234:1: entryRuleXAndExpression returns [EObject current=null] : iv_ruleXAndExpression= ruleXAndExpression EOF ;
+    // InternalFormat.g:3234:1: entryRuleXAndExpression returns [EObject current=null] : iv_ruleXAndExpression= ruleXAndExpression EOF ;
     public final EObject entryRuleXAndExpression() throws RecognitionException {
         EObject current = null;
 
@@ -9494,13 +9494,13 @@ public final EObject entryRuleXAndExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3235:2: (iv_ruleXAndExpression= ruleXAndExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3236:2: iv_ruleXAndExpression= ruleXAndExpression EOF
+            // InternalFormat.g:3235:2: (iv_ruleXAndExpression= ruleXAndExpression EOF )
+            // InternalFormat.g:3236:2: iv_ruleXAndExpression= ruleXAndExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAndExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXAndExpression_in_entryRuleXAndExpression7595);
+            pushFollow(FOLLOW_1);
             iv_ruleXAndExpression=ruleXAndExpression();
 
             state._fsp--;
@@ -9508,7 +9508,7 @@ public final EObject entryRuleXAndExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXAndExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAndExpression7605); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -9526,7 +9526,7 @@ public final EObject entryRuleXAndExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXAndExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3243:1: ruleXAndExpression returns [EObject current=null] : (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* ) ;
+    // InternalFormat.g:3243:1: ruleXAndExpression returns [EObject current=null] : (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* ) ;
     public final EObject ruleXAndExpression() throws RecognitionException {
         EObject current = null;
 
@@ -9538,18 +9538,18 @@ public final EObject ruleXAndExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3246:28: ( (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3247:1: (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* )
+            // InternalFormat.g:3246:28: ( (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* ) )
+            // InternalFormat.g:3247:1: (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3247:1: (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3248:5: this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )*
+            // InternalFormat.g:3247:1: (this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )* )
+            // InternalFormat.g:3248:5: this_XEqualityExpression_0= ruleXEqualityExpression ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXAndExpressionAccess().getXEqualityExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleXEqualityExpression_in_ruleXAndExpression7652);
+            pushFollow(FOLLOW_57);
             this_XEqualityExpression_0=ruleXEqualityExpression();
 
             state._fsp--;
@@ -9560,7 +9560,7 @@ public final EObject ruleXAndExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3256:1: ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )*
+            // InternalFormat.g:3256:1: ( ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) ) )*
             loop61:
             do {
                 int alt61=2;
@@ -9579,16 +9579,16 @@ public final EObject ruleXAndExpression() throws RecognitionException {
 
                 switch (alt61) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3256:2: ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) )
+            	    // InternalFormat.g:3256:2: ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) ) ( (lv_rightOperand_3_0= ruleXEqualityExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3256:2: ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3256:3: ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) )
+            	    // InternalFormat.g:3256:2: ( ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) ) )
+            	    // InternalFormat.g:3256:3: ( ( () ( ( ruleOpAnd ) ) ) )=> ( () ( ( ruleOpAnd ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3261:6: ( () ( ( ruleOpAnd ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3261:7: () ( ( ruleOpAnd ) )
+            	    // InternalFormat.g:3261:6: ( () ( ( ruleOpAnd ) ) )
+            	    // InternalFormat.g:3261:7: () ( ( ruleOpAnd ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3261:7: ()
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3262:5: 
+            	    // InternalFormat.g:3261:7: ()
+            	    // InternalFormat.g:3262:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -9600,11 +9600,11 @@ public final EObject ruleXAndExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3267:2: ( ( ruleOpAnd ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3268:1: ( ruleOpAnd )
+            	    // InternalFormat.g:3267:2: ( ( ruleOpAnd ) )
+            	    // InternalFormat.g:3268:1: ( ruleOpAnd )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3268:1: ( ruleOpAnd )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3269:3: ruleOpAnd
+            	    // InternalFormat.g:3268:1: ( ruleOpAnd )
+            	    // InternalFormat.g:3269:3: ruleOpAnd
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -9618,7 +9618,7 @@ public final EObject ruleXAndExpression() throws RecognitionException {
             	      	        newCompositeNode(grammarAccess.getXAndExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleOpAnd_in_ruleXAndExpression7705);
+            	    pushFollow(FOLLOW_48);
             	    ruleOpAnd();
 
             	    state._fsp--;
@@ -9640,18 +9640,18 @@ public final EObject ruleXAndExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3282:4: ( (lv_rightOperand_3_0= ruleXEqualityExpression ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3283:1: (lv_rightOperand_3_0= ruleXEqualityExpression )
+            	    // InternalFormat.g:3282:4: ( (lv_rightOperand_3_0= ruleXEqualityExpression ) )
+            	    // InternalFormat.g:3283:1: (lv_rightOperand_3_0= ruleXEqualityExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3283:1: (lv_rightOperand_3_0= ruleXEqualityExpression )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3284:3: lv_rightOperand_3_0= ruleXEqualityExpression
+            	    // InternalFormat.g:3283:1: (lv_rightOperand_3_0= ruleXEqualityExpression )
+            	    // InternalFormat.g:3284:3: lv_rightOperand_3_0= ruleXEqualityExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXAndExpressionAccess().getRightOperandXEqualityExpressionParserRuleCall_1_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXEqualityExpression_in_ruleXAndExpression7728);
+            	    pushFollow(FOLLOW_57);
             	    lv_rightOperand_3_0=ruleXEqualityExpression();
 
             	    state._fsp--;
@@ -9665,7 +9665,7 @@ public final EObject ruleXAndExpression() throws RecognitionException {
             	             			current, 
             	             			"rightOperand",
             	              		lv_rightOperand_3_0, 
-            	              		"XEqualityExpression");
+            	              		"org.eclipse.xtext.xbase.Xbase.XEqualityExpression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -9707,7 +9707,7 @@ public final EObject ruleXAndExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpAnd"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3308:1: entryRuleOpAnd returns [String current=null] : iv_ruleOpAnd= ruleOpAnd EOF ;
+    // InternalFormat.g:3308:1: entryRuleOpAnd returns [String current=null] : iv_ruleOpAnd= ruleOpAnd EOF ;
     public final String entryRuleOpAnd() throws RecognitionException {
         String current = null;
 
@@ -9715,13 +9715,13 @@ public final String entryRuleOpAnd() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3309:2: (iv_ruleOpAnd= ruleOpAnd EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3310:2: iv_ruleOpAnd= ruleOpAnd EOF
+            // InternalFormat.g:3309:2: (iv_ruleOpAnd= ruleOpAnd EOF )
+            // InternalFormat.g:3310:2: iv_ruleOpAnd= ruleOpAnd EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpAndRule()); 
             }
-            pushFollow(FOLLOW_ruleOpAnd_in_entryRuleOpAnd7767);
+            pushFollow(FOLLOW_1);
             iv_ruleOpAnd=ruleOpAnd();
 
             state._fsp--;
@@ -9729,7 +9729,7 @@ public final String entryRuleOpAnd() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpAnd.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpAnd7778); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -9747,7 +9747,7 @@ public final String entryRuleOpAnd() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpAnd"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3317:1: ruleOpAnd returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : kw= '&&' ;
+    // InternalFormat.g:3317:1: ruleOpAnd returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : kw= '&&' ;
     public final AntlrDatatypeRuleToken ruleOpAnd() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -9756,10 +9756,10 @@ public final AntlrDatatypeRuleToken ruleOpAnd() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3320:28: (kw= '&&' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3322:2: kw= '&&'
+            // InternalFormat.g:3320:28: (kw= '&&' )
+            // InternalFormat.g:3322:2: kw= '&&'
             {
-            kw=(Token)match(input,66,FOLLOW_66_in_ruleOpAnd7815); if (state.failed) return current;
+            kw=(Token)match(input,66,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                       current.merge(kw);
@@ -9786,7 +9786,7 @@ public final AntlrDatatypeRuleToken ruleOpAnd() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXEqualityExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3335:1: entryRuleXEqualityExpression returns [EObject current=null] : iv_ruleXEqualityExpression= ruleXEqualityExpression EOF ;
+    // InternalFormat.g:3335:1: entryRuleXEqualityExpression returns [EObject current=null] : iv_ruleXEqualityExpression= ruleXEqualityExpression EOF ;
     public final EObject entryRuleXEqualityExpression() throws RecognitionException {
         EObject current = null;
 
@@ -9794,13 +9794,13 @@ public final EObject entryRuleXEqualityExpression() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3336:2: (iv_ruleXEqualityExpression= ruleXEqualityExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3337:2: iv_ruleXEqualityExpression= ruleXEqualityExpression EOF
+            // InternalFormat.g:3336:2: (iv_ruleXEqualityExpression= ruleXEqualityExpression EOF )
+            // InternalFormat.g:3337:2: iv_ruleXEqualityExpression= ruleXEqualityExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXEqualityExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXEqualityExpression_in_entryRuleXEqualityExpression7854);
+            pushFollow(FOLLOW_1);
             iv_ruleXEqualityExpression=ruleXEqualityExpression();
 
             state._fsp--;
@@ -9808,7 +9808,7 @@ public final EObject entryRuleXEqualityExpression() throws RecognitionException
             if ( state.backtracking==0 ) {
                current =iv_ruleXEqualityExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXEqualityExpression7864); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -9826,7 +9826,7 @@ public final EObject entryRuleXEqualityExpression() throws RecognitionException
 
 
     // $ANTLR start "ruleXEqualityExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3344:1: ruleXEqualityExpression returns [EObject current=null] : (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* ) ;
+    // InternalFormat.g:3344:1: ruleXEqualityExpression returns [EObject current=null] : (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* ) ;
     public final EObject ruleXEqualityExpression() throws RecognitionException {
         EObject current = null;
 
@@ -9838,18 +9838,18 @@ public final EObject ruleXEqualityExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3347:28: ( (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3348:1: (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* )
+            // InternalFormat.g:3347:28: ( (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* ) )
+            // InternalFormat.g:3348:1: (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3348:1: (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3349:5: this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )*
+            // InternalFormat.g:3348:1: (this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )* )
+            // InternalFormat.g:3349:5: this_XRelationalExpression_0= ruleXRelationalExpression ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXEqualityExpressionAccess().getXRelationalExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleXRelationalExpression_in_ruleXEqualityExpression7911);
+            pushFollow(FOLLOW_58);
             this_XRelationalExpression_0=ruleXRelationalExpression();
 
             state._fsp--;
@@ -9860,7 +9860,7 @@ public final EObject ruleXEqualityExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3357:1: ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )*
+            // InternalFormat.g:3357:1: ( ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) ) )*
             loop62:
             do {
                 int alt62=2;
@@ -9914,16 +9914,16 @@ public final EObject ruleXEqualityExpression() throws RecognitionException {
 
                 switch (alt62) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3357:2: ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) )
+            	    // InternalFormat.g:3357:2: ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) ) ( (lv_rightOperand_3_0= ruleXRelationalExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3357:2: ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3357:3: ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) )
+            	    // InternalFormat.g:3357:2: ( ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) ) )
+            	    // InternalFormat.g:3357:3: ( ( () ( ( ruleOpEquality ) ) ) )=> ( () ( ( ruleOpEquality ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3362:6: ( () ( ( ruleOpEquality ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3362:7: () ( ( ruleOpEquality ) )
+            	    // InternalFormat.g:3362:6: ( () ( ( ruleOpEquality ) ) )
+            	    // InternalFormat.g:3362:7: () ( ( ruleOpEquality ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3362:7: ()
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3363:5: 
+            	    // InternalFormat.g:3362:7: ()
+            	    // InternalFormat.g:3363:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -9935,11 +9935,11 @@ public final EObject ruleXEqualityExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3368:2: ( ( ruleOpEquality ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3369:1: ( ruleOpEquality )
+            	    // InternalFormat.g:3368:2: ( ( ruleOpEquality ) )
+            	    // InternalFormat.g:3369:1: ( ruleOpEquality )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3369:1: ( ruleOpEquality )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3370:3: ruleOpEquality
+            	    // InternalFormat.g:3369:1: ( ruleOpEquality )
+            	    // InternalFormat.g:3370:3: ruleOpEquality
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -9953,7 +9953,7 @@ public final EObject ruleXEqualityExpression() throws RecognitionException {
             	      	        newCompositeNode(grammarAccess.getXEqualityExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleOpEquality_in_ruleXEqualityExpression7964);
+            	    pushFollow(FOLLOW_48);
             	    ruleOpEquality();
 
             	    state._fsp--;
@@ -9975,18 +9975,18 @@ public final EObject ruleXEqualityExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3383:4: ( (lv_rightOperand_3_0= ruleXRelationalExpression ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3384:1: (lv_rightOperand_3_0= ruleXRelationalExpression )
+            	    // InternalFormat.g:3383:4: ( (lv_rightOperand_3_0= ruleXRelationalExpression ) )
+            	    // InternalFormat.g:3384:1: (lv_rightOperand_3_0= ruleXRelationalExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3384:1: (lv_rightOperand_3_0= ruleXRelationalExpression )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3385:3: lv_rightOperand_3_0= ruleXRelationalExpression
+            	    // InternalFormat.g:3384:1: (lv_rightOperand_3_0= ruleXRelationalExpression )
+            	    // InternalFormat.g:3385:3: lv_rightOperand_3_0= ruleXRelationalExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXEqualityExpressionAccess().getRightOperandXRelationalExpressionParserRuleCall_1_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXRelationalExpression_in_ruleXEqualityExpression7987);
+            	    pushFollow(FOLLOW_58);
             	    lv_rightOperand_3_0=ruleXRelationalExpression();
 
             	    state._fsp--;
@@ -10000,7 +10000,7 @@ public final EObject ruleXEqualityExpression() throws RecognitionException {
             	             			current, 
             	             			"rightOperand",
             	              		lv_rightOperand_3_0, 
-            	              		"XRelationalExpression");
+            	              		"org.eclipse.xtext.xbase.Xbase.XRelationalExpression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -10042,7 +10042,7 @@ public final EObject ruleXEqualityExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpEquality"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3409:1: entryRuleOpEquality returns [String current=null] : iv_ruleOpEquality= ruleOpEquality EOF ;
+    // InternalFormat.g:3409:1: entryRuleOpEquality returns [String current=null] : iv_ruleOpEquality= ruleOpEquality EOF ;
     public final String entryRuleOpEquality() throws RecognitionException {
         String current = null;
 
@@ -10050,13 +10050,13 @@ public final String entryRuleOpEquality() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3410:2: (iv_ruleOpEquality= ruleOpEquality EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3411:2: iv_ruleOpEquality= ruleOpEquality EOF
+            // InternalFormat.g:3410:2: (iv_ruleOpEquality= ruleOpEquality EOF )
+            // InternalFormat.g:3411:2: iv_ruleOpEquality= ruleOpEquality EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpEqualityRule()); 
             }
-            pushFollow(FOLLOW_ruleOpEquality_in_entryRuleOpEquality8026);
+            pushFollow(FOLLOW_1);
             iv_ruleOpEquality=ruleOpEquality();
 
             state._fsp--;
@@ -10064,7 +10064,7 @@ public final String entryRuleOpEquality() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpEquality.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpEquality8037); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -10082,7 +10082,7 @@ public final String entryRuleOpEquality() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpEquality"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3418:1: ruleOpEquality returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' ) ;
+    // InternalFormat.g:3418:1: ruleOpEquality returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' ) ;
     public final AntlrDatatypeRuleToken ruleOpEquality() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -10091,10 +10091,10 @@ public final AntlrDatatypeRuleToken ruleOpEquality() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3421:28: ( (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3422:1: (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' )
+            // InternalFormat.g:3421:28: ( (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' ) )
+            // InternalFormat.g:3422:1: (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3422:1: (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' )
+            // InternalFormat.g:3422:1: (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' )
             int alt63=4;
             switch ( input.LA(1) ) {
             case 67:
@@ -10127,9 +10127,9 @@ public final AntlrDatatypeRuleToken ruleOpEquality() throws RecognitionException
 
             switch (alt63) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3423:2: kw= '=='
+                    // InternalFormat.g:3423:2: kw= '=='
                     {
-                    kw=(Token)match(input,67,FOLLOW_67_in_ruleOpEquality8075); if (state.failed) return current;
+                    kw=(Token)match(input,67,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -10140,9 +10140,9 @@ public final AntlrDatatypeRuleToken ruleOpEquality() throws RecognitionException
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3430:2: kw= '!='
+                    // InternalFormat.g:3430:2: kw= '!='
                     {
-                    kw=(Token)match(input,68,FOLLOW_68_in_ruleOpEquality8094); if (state.failed) return current;
+                    kw=(Token)match(input,68,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -10153,9 +10153,9 @@ public final AntlrDatatypeRuleToken ruleOpEquality() throws RecognitionException
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3437:2: kw= '==='
+                    // InternalFormat.g:3437:2: kw= '==='
                     {
-                    kw=(Token)match(input,69,FOLLOW_69_in_ruleOpEquality8113); if (state.failed) return current;
+                    kw=(Token)match(input,69,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -10166,9 +10166,9 @@ public final AntlrDatatypeRuleToken ruleOpEquality() throws RecognitionException
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3444:2: kw= '!=='
+                    // InternalFormat.g:3444:2: kw= '!=='
                     {
-                    kw=(Token)match(input,70,FOLLOW_70_in_ruleOpEquality8132); if (state.failed) return current;
+                    kw=(Token)match(input,70,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -10201,7 +10201,7 @@ public final AntlrDatatypeRuleToken ruleOpEquality() throws RecognitionException
 
 
     // $ANTLR start "entryRuleXRelationalExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3457:1: entryRuleXRelationalExpression returns [EObject current=null] : iv_ruleXRelationalExpression= ruleXRelationalExpression EOF ;
+    // InternalFormat.g:3457:1: entryRuleXRelationalExpression returns [EObject current=null] : iv_ruleXRelationalExpression= ruleXRelationalExpression EOF ;
     public final EObject entryRuleXRelationalExpression() throws RecognitionException {
         EObject current = null;
 
@@ -10209,13 +10209,13 @@ public final EObject entryRuleXRelationalExpression() throws RecognitionExceptio
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3458:2: (iv_ruleXRelationalExpression= ruleXRelationalExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3459:2: iv_ruleXRelationalExpression= ruleXRelationalExpression EOF
+            // InternalFormat.g:3458:2: (iv_ruleXRelationalExpression= ruleXRelationalExpression EOF )
+            // InternalFormat.g:3459:2: iv_ruleXRelationalExpression= ruleXRelationalExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXRelationalExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXRelationalExpression_in_entryRuleXRelationalExpression8172);
+            pushFollow(FOLLOW_1);
             iv_ruleXRelationalExpression=ruleXRelationalExpression();
 
             state._fsp--;
@@ -10223,7 +10223,7 @@ public final EObject entryRuleXRelationalExpression() throws RecognitionExceptio
             if ( state.backtracking==0 ) {
                current =iv_ruleXRelationalExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXRelationalExpression8182); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -10241,7 +10241,7 @@ public final EObject entryRuleXRelationalExpression() throws RecognitionExceptio
 
 
     // $ANTLR start "ruleXRelationalExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3466:1: ruleXRelationalExpression returns [EObject current=null] : (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* ) ;
+    // InternalFormat.g:3466:1: ruleXRelationalExpression returns [EObject current=null] : (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* ) ;
     public final EObject ruleXRelationalExpression() throws RecognitionException {
         EObject current = null;
 
@@ -10256,18 +10256,18 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3469:28: ( (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3470:1: (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* )
+            // InternalFormat.g:3469:28: ( (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* ) )
+            // InternalFormat.g:3470:1: (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3470:1: (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3471:5: this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )*
+            // InternalFormat.g:3470:1: (this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )* )
+            // InternalFormat.g:3471:5: this_XOtherOperatorExpression_0= ruleXOtherOperatorExpression ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXRelationalExpressionAccess().getXOtherOperatorExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleXOtherOperatorExpression_in_ruleXRelationalExpression8229);
+            pushFollow(FOLLOW_59);
             this_XOtherOperatorExpression_0=ruleXOtherOperatorExpression();
 
             state._fsp--;
@@ -10278,7 +10278,7 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3479:1: ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )*
+            // InternalFormat.g:3479:1: ( ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) ) | ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) ) )*
             loop64:
             do {
                 int alt64=3;
@@ -10332,19 +10332,19 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
 
                 switch (alt64) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3479:2: ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )
+            	    // InternalFormat.g:3479:2: ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3479:2: ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3479:3: ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) )
+            	    // InternalFormat.g:3479:2: ( ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )
+            	    // InternalFormat.g:3479:3: ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3479:3: ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3479:4: ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' )
+            	    // InternalFormat.g:3479:3: ( ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' ) )
+            	    // InternalFormat.g:3479:4: ( ( () 'instanceof' ) )=> ( () otherlv_2= 'instanceof' )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3481:5: ( () otherlv_2= 'instanceof' )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3481:6: () otherlv_2= 'instanceof'
+            	    // InternalFormat.g:3481:5: ( () otherlv_2= 'instanceof' )
+            	    // InternalFormat.g:3481:6: () otherlv_2= 'instanceof'
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3481:6: ()
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3482:5: 
+            	    // InternalFormat.g:3481:6: ()
+            	    // InternalFormat.g:3482:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -10356,7 +10356,7 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
 
             	    }
 
-            	    otherlv_2=(Token)match(input,71,FOLLOW_71_in_ruleXRelationalExpression8265); if (state.failed) return current;
+            	    otherlv_2=(Token)match(input,71,FOLLOW_60); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_2, grammarAccess.getXRelationalExpressionAccess().getInstanceofKeyword_1_0_0_0_1());
@@ -10368,18 +10368,18 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3491:3: ( (lv_type_3_0= ruleJvmTypeReference ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3492:1: (lv_type_3_0= ruleJvmTypeReference )
+            	    // InternalFormat.g:3491:3: ( (lv_type_3_0= ruleJvmTypeReference ) )
+            	    // InternalFormat.g:3492:1: (lv_type_3_0= ruleJvmTypeReference )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3492:1: (lv_type_3_0= ruleJvmTypeReference )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3493:3: lv_type_3_0= ruleJvmTypeReference
+            	    // InternalFormat.g:3492:1: (lv_type_3_0= ruleJvmTypeReference )
+            	    // InternalFormat.g:3493:3: lv_type_3_0= ruleJvmTypeReference
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXRelationalExpressionAccess().getTypeJvmTypeReferenceParserRuleCall_1_0_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleXRelationalExpression8288);
+            	    pushFollow(FOLLOW_59);
             	    lv_type_3_0=ruleJvmTypeReference();
 
             	    state._fsp--;
@@ -10393,7 +10393,7 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
             	             			current, 
             	             			"type",
             	              		lv_type_3_0, 
-            	              		"JvmTypeReference");
+            	              		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -10410,19 +10410,19 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
             	    }
             	    break;
             	case 2 :
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3510:6: ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) )
+            	    // InternalFormat.g:3510:6: ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3510:6: ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3510:7: ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) )
+            	    // InternalFormat.g:3510:6: ( ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) ) )
+            	    // InternalFormat.g:3510:7: ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) ) ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3510:7: ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3510:8: ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) )
+            	    // InternalFormat.g:3510:7: ( ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) ) )
+            	    // InternalFormat.g:3510:8: ( ( () ( ( ruleOpCompare ) ) ) )=> ( () ( ( ruleOpCompare ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3515:6: ( () ( ( ruleOpCompare ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3515:7: () ( ( ruleOpCompare ) )
+            	    // InternalFormat.g:3515:6: ( () ( ( ruleOpCompare ) ) )
+            	    // InternalFormat.g:3515:7: () ( ( ruleOpCompare ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3515:7: ()
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3516:5: 
+            	    // InternalFormat.g:3515:7: ()
+            	    // InternalFormat.g:3516:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -10434,11 +10434,11 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3521:2: ( ( ruleOpCompare ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3522:1: ( ruleOpCompare )
+            	    // InternalFormat.g:3521:2: ( ( ruleOpCompare ) )
+            	    // InternalFormat.g:3522:1: ( ruleOpCompare )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3522:1: ( ruleOpCompare )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3523:3: ruleOpCompare
+            	    // InternalFormat.g:3522:1: ( ruleOpCompare )
+            	    // InternalFormat.g:3523:3: ruleOpCompare
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -10452,7 +10452,7 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
             	      	        newCompositeNode(grammarAccess.getXRelationalExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_1_0_0_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleOpCompare_in_ruleXRelationalExpression8349);
+            	    pushFollow(FOLLOW_48);
             	    ruleOpCompare();
 
             	    state._fsp--;
@@ -10474,18 +10474,18 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3536:4: ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3537:1: (lv_rightOperand_6_0= ruleXOtherOperatorExpression )
+            	    // InternalFormat.g:3536:4: ( (lv_rightOperand_6_0= ruleXOtherOperatorExpression ) )
+            	    // InternalFormat.g:3537:1: (lv_rightOperand_6_0= ruleXOtherOperatorExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3537:1: (lv_rightOperand_6_0= ruleXOtherOperatorExpression )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3538:3: lv_rightOperand_6_0= ruleXOtherOperatorExpression
+            	    // InternalFormat.g:3537:1: (lv_rightOperand_6_0= ruleXOtherOperatorExpression )
+            	    // InternalFormat.g:3538:3: lv_rightOperand_6_0= ruleXOtherOperatorExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXRelationalExpressionAccess().getRightOperandXOtherOperatorExpressionParserRuleCall_1_1_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXOtherOperatorExpression_in_ruleXRelationalExpression8372);
+            	    pushFollow(FOLLOW_59);
             	    lv_rightOperand_6_0=ruleXOtherOperatorExpression();
 
             	    state._fsp--;
@@ -10499,7 +10499,7 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
             	             			current, 
             	             			"rightOperand",
             	              		lv_rightOperand_6_0, 
-            	              		"XOtherOperatorExpression");
+            	              		"org.eclipse.xtext.xbase.Xbase.XOtherOperatorExpression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -10544,7 +10544,7 @@ public final EObject ruleXRelationalExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOpCompare"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3562:1: entryRuleOpCompare returns [String current=null] : iv_ruleOpCompare= ruleOpCompare EOF ;
+    // InternalFormat.g:3562:1: entryRuleOpCompare returns [String current=null] : iv_ruleOpCompare= ruleOpCompare EOF ;
     public final String entryRuleOpCompare() throws RecognitionException {
         String current = null;
 
@@ -10552,13 +10552,13 @@ public final String entryRuleOpCompare() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3563:2: (iv_ruleOpCompare= ruleOpCompare EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3564:2: iv_ruleOpCompare= ruleOpCompare EOF
+            // InternalFormat.g:3563:2: (iv_ruleOpCompare= ruleOpCompare EOF )
+            // InternalFormat.g:3564:2: iv_ruleOpCompare= ruleOpCompare EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpCompareRule()); 
             }
-            pushFollow(FOLLOW_ruleOpCompare_in_entryRuleOpCompare8412);
+            pushFollow(FOLLOW_1);
             iv_ruleOpCompare=ruleOpCompare();
 
             state._fsp--;
@@ -10566,7 +10566,7 @@ public final String entryRuleOpCompare() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpCompare.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpCompare8423); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -10584,7 +10584,7 @@ public final String entryRuleOpCompare() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpCompare"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3571:1: ruleOpCompare returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' ) ;
+    // InternalFormat.g:3571:1: ruleOpCompare returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' ) ;
     public final AntlrDatatypeRuleToken ruleOpCompare() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -10593,10 +10593,10 @@ public final AntlrDatatypeRuleToken ruleOpCompare() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3574:28: ( (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3575:1: (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' )
+            // InternalFormat.g:3574:28: ( (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' ) )
+            // InternalFormat.g:3575:1: (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3575:1: (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' )
+            // InternalFormat.g:3575:1: (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' )
             int alt65=4;
             switch ( input.LA(1) ) {
             case 64:
@@ -10638,9 +10638,9 @@ else if ( (LA65_2==21) ) {
 
             switch (alt65) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3576:2: kw= '>='
+                    // InternalFormat.g:3576:2: kw= '>='
                     {
-                    kw=(Token)match(input,64,FOLLOW_64_in_ruleOpCompare8461); if (state.failed) return current;
+                    kw=(Token)match(input,64,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -10651,19 +10651,19 @@ else if ( (LA65_2==21) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3582:6: (kw= '<' kw= '=' )
+                    // InternalFormat.g:3582:6: (kw= '<' kw= '=' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3582:6: (kw= '<' kw= '=' )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3583:2: kw= '<' kw= '='
+                    // InternalFormat.g:3582:6: (kw= '<' kw= '=' )
+                    // InternalFormat.g:3583:2: kw= '<' kw= '='
                     {
-                    kw=(Token)match(input,62,FOLLOW_62_in_ruleOpCompare8481); if (state.failed) return current;
+                    kw=(Token)match(input,62,FOLLOW_13); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
                               newLeafNode(kw, grammarAccess.getOpCompareAccess().getLessThanSignKeyword_1_0()); 
                           
                     }
-                    kw=(Token)match(input,21,FOLLOW_21_in_ruleOpCompare8494); if (state.failed) return current;
+                    kw=(Token)match(input,21,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -10677,9 +10677,9 @@ else if ( (LA65_2==21) ) {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3596:2: kw= '>'
+                    // InternalFormat.g:3596:2: kw= '>'
                     {
-                    kw=(Token)match(input,63,FOLLOW_63_in_ruleOpCompare8514); if (state.failed) return current;
+                    kw=(Token)match(input,63,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -10690,9 +10690,9 @@ else if ( (LA65_2==21) ) {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3603:2: kw= '<'
+                    // InternalFormat.g:3603:2: kw= '<'
                     {
-                    kw=(Token)match(input,62,FOLLOW_62_in_ruleOpCompare8533); if (state.failed) return current;
+                    kw=(Token)match(input,62,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -10725,7 +10725,7 @@ else if ( (LA65_2==21) ) {
 
 
     // $ANTLR start "entryRuleXOtherOperatorExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3616:1: entryRuleXOtherOperatorExpression returns [EObject current=null] : iv_ruleXOtherOperatorExpression= ruleXOtherOperatorExpression EOF ;
+    // InternalFormat.g:3616:1: entryRuleXOtherOperatorExpression returns [EObject current=null] : iv_ruleXOtherOperatorExpression= ruleXOtherOperatorExpression EOF ;
     public final EObject entryRuleXOtherOperatorExpression() throws RecognitionException {
         EObject current = null;
 
@@ -10733,13 +10733,13 @@ public final EObject entryRuleXOtherOperatorExpression() throws RecognitionExcep
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3617:2: (iv_ruleXOtherOperatorExpression= ruleXOtherOperatorExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3618:2: iv_ruleXOtherOperatorExpression= ruleXOtherOperatorExpression EOF
+            // InternalFormat.g:3617:2: (iv_ruleXOtherOperatorExpression= ruleXOtherOperatorExpression EOF )
+            // InternalFormat.g:3618:2: iv_ruleXOtherOperatorExpression= ruleXOtherOperatorExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXOtherOperatorExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXOtherOperatorExpression_in_entryRuleXOtherOperatorExpression8573);
+            pushFollow(FOLLOW_1);
             iv_ruleXOtherOperatorExpression=ruleXOtherOperatorExpression();
 
             state._fsp--;
@@ -10747,7 +10747,7 @@ public final EObject entryRuleXOtherOperatorExpression() throws RecognitionExcep
             if ( state.backtracking==0 ) {
                current =iv_ruleXOtherOperatorExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXOtherOperatorExpression8583); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -10765,7 +10765,7 @@ public final EObject entryRuleXOtherOperatorExpression() throws RecognitionExcep
 
 
     // $ANTLR start "ruleXOtherOperatorExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3625:1: ruleXOtherOperatorExpression returns [EObject current=null] : (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* ) ;
+    // InternalFormat.g:3625:1: ruleXOtherOperatorExpression returns [EObject current=null] : (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* ) ;
     public final EObject ruleXOtherOperatorExpression() throws RecognitionException {
         EObject current = null;
 
@@ -10777,18 +10777,18 @@ public final EObject ruleXOtherOperatorExpression() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3628:28: ( (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3629:1: (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* )
+            // InternalFormat.g:3628:28: ( (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* ) )
+            // InternalFormat.g:3629:1: (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3629:1: (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3630:5: this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )*
+            // InternalFormat.g:3629:1: (this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )* )
+            // InternalFormat.g:3630:5: this_XAdditiveExpression_0= ruleXAdditiveExpression ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXOtherOperatorExpressionAccess().getXAdditiveExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleXAdditiveExpression_in_ruleXOtherOperatorExpression8630);
+            pushFollow(FOLLOW_61);
             this_XAdditiveExpression_0=ruleXAdditiveExpression();
 
             state._fsp--;
@@ -10799,23 +10799,23 @@ public final EObject ruleXOtherOperatorExpression() throws RecognitionException
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3638:1: ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )*
+            // InternalFormat.g:3638:1: ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )*
             loop66:
             do {
                 int alt66=2;
                 alt66 = dfa66.predict(input);
                 switch (alt66) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3638:2: ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) )
+            	    // InternalFormat.g:3638:2: ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3638:2: ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3638:3: ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) )
+            	    // InternalFormat.g:3638:2: ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) )
+            	    // InternalFormat.g:3638:3: ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3643:6: ( () ( ( ruleOpOther ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3643:7: () ( ( ruleOpOther ) )
+            	    // InternalFormat.g:3643:6: ( () ( ( ruleOpOther ) ) )
+            	    // InternalFormat.g:3643:7: () ( ( ruleOpOther ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3643:7: ()
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3644:5: 
+            	    // InternalFormat.g:3643:7: ()
+            	    // InternalFormat.g:3644:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -10827,11 +10827,11 @@ public final EObject ruleXOtherOperatorExpression() throws RecognitionException
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3649:2: ( ( ruleOpOther ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3650:1: ( ruleOpOther )
+            	    // InternalFormat.g:3649:2: ( ( ruleOpOther ) )
+            	    // InternalFormat.g:3650:1: ( ruleOpOther )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3650:1: ( ruleOpOther )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3651:3: ruleOpOther
+            	    // InternalFormat.g:3650:1: ( ruleOpOther )
+            	    // InternalFormat.g:3651:3: ruleOpOther
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -10845,7 +10845,7 @@ public final EObject ruleXOtherOperatorExpression() throws RecognitionException
             	      	        newCompositeNode(grammarAccess.getXOtherOperatorExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleOpOther_in_ruleXOtherOperatorExpression8683);
+            	    pushFollow(FOLLOW_48);
             	    ruleOpOther();
 
             	    state._fsp--;
@@ -10867,18 +10867,18 @@ public final EObject ruleXOtherOperatorExpression() throws RecognitionException
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3664:4: ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3665:1: (lv_rightOperand_3_0= ruleXAdditiveExpression )
+            	    // InternalFormat.g:3664:4: ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) )
+            	    // InternalFormat.g:3665:1: (lv_rightOperand_3_0= ruleXAdditiveExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3665:1: (lv_rightOperand_3_0= ruleXAdditiveExpression )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3666:3: lv_rightOperand_3_0= ruleXAdditiveExpression
+            	    // InternalFormat.g:3665:1: (lv_rightOperand_3_0= ruleXAdditiveExpression )
+            	    // InternalFormat.g:3666:3: lv_rightOperand_3_0= ruleXAdditiveExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXOtherOperatorExpressionAccess().getRightOperandXAdditiveExpressionParserRuleCall_1_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXAdditiveExpression_in_ruleXOtherOperatorExpression8706);
+            	    pushFollow(FOLLOW_61);
             	    lv_rightOperand_3_0=ruleXAdditiveExpression();
 
             	    state._fsp--;
@@ -10892,7 +10892,7 @@ public final EObject ruleXOtherOperatorExpression() throws RecognitionException
             	             			current, 
             	             			"rightOperand",
             	              		lv_rightOperand_3_0, 
-            	              		"XAdditiveExpression");
+            	              		"org.eclipse.xtext.xbase.Xbase.XAdditiveExpression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -10934,7 +10934,7 @@ public final EObject ruleXOtherOperatorExpression() throws RecognitionException
 
 
     // $ANTLR start "entryRuleOpOther"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3690:1: entryRuleOpOther returns [String current=null] : iv_ruleOpOther= ruleOpOther EOF ;
+    // InternalFormat.g:3690:1: entryRuleOpOther returns [String current=null] : iv_ruleOpOther= ruleOpOther EOF ;
     public final String entryRuleOpOther() throws RecognitionException {
         String current = null;
 
@@ -10942,13 +10942,13 @@ public final String entryRuleOpOther() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3691:2: (iv_ruleOpOther= ruleOpOther EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3692:2: iv_ruleOpOther= ruleOpOther EOF
+            // InternalFormat.g:3691:2: (iv_ruleOpOther= ruleOpOther EOF )
+            // InternalFormat.g:3692:2: iv_ruleOpOther= ruleOpOther EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpOtherRule()); 
             }
-            pushFollow(FOLLOW_ruleOpOther_in_entryRuleOpOther8745);
+            pushFollow(FOLLOW_1);
             iv_ruleOpOther=ruleOpOther();
 
             state._fsp--;
@@ -10956,7 +10956,7 @@ public final String entryRuleOpOther() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpOther.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpOther8756); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -10974,7 +10974,7 @@ public final String entryRuleOpOther() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpOther"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3699:1: ruleOpOther returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' ) ;
+    // InternalFormat.g:3699:1: ruleOpOther returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' ) ;
     public final AntlrDatatypeRuleToken ruleOpOther() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -10983,17 +10983,17 @@ public final AntlrDatatypeRuleToken ruleOpOther() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3702:28: ( (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3703:1: (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' )
+            // InternalFormat.g:3702:28: ( (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' ) )
+            // InternalFormat.g:3703:1: (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3703:1: (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' )
+            // InternalFormat.g:3703:1: (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' )
             int alt69=9;
             alt69 = dfa69.predict(input);
             switch (alt69) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3704:2: kw= '->'
+                    // InternalFormat.g:3704:2: kw= '->'
                     {
-                    kw=(Token)match(input,72,FOLLOW_72_in_ruleOpOther8794); if (state.failed) return current;
+                    kw=(Token)match(input,72,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -11004,9 +11004,9 @@ public final AntlrDatatypeRuleToken ruleOpOther() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3711:2: kw= '..<'
+                    // InternalFormat.g:3711:2: kw= '..<'
                     {
-                    kw=(Token)match(input,73,FOLLOW_73_in_ruleOpOther8813); if (state.failed) return current;
+                    kw=(Token)match(input,73,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -11017,19 +11017,19 @@ public final AntlrDatatypeRuleToken ruleOpOther() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3717:6: (kw= '>' kw= '..' )
+                    // InternalFormat.g:3717:6: (kw= '>' kw= '..' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3717:6: (kw= '>' kw= '..' )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3718:2: kw= '>' kw= '..'
+                    // InternalFormat.g:3717:6: (kw= '>' kw= '..' )
+                    // InternalFormat.g:3718:2: kw= '>' kw= '..'
                     {
-                    kw=(Token)match(input,63,FOLLOW_63_in_ruleOpOther8833); if (state.failed) return current;
+                    kw=(Token)match(input,63,FOLLOW_62); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
                               newLeafNode(kw, grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_2_0()); 
                           
                     }
-                    kw=(Token)match(input,74,FOLLOW_74_in_ruleOpOther8846); if (state.failed) return current;
+                    kw=(Token)match(input,74,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -11043,9 +11043,9 @@ public final AntlrDatatypeRuleToken ruleOpOther() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3731:2: kw= '..'
+                    // InternalFormat.g:3731:2: kw= '..'
                     {
-                    kw=(Token)match(input,74,FOLLOW_74_in_ruleOpOther8866); if (state.failed) return current;
+                    kw=(Token)match(input,74,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -11056,9 +11056,9 @@ public final AntlrDatatypeRuleToken ruleOpOther() throws RecognitionException {
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3738:2: kw= '=>'
+                    // InternalFormat.g:3738:2: kw= '=>'
                     {
-                    kw=(Token)match(input,32,FOLLOW_32_in_ruleOpOther8885); if (state.failed) return current;
+                    kw=(Token)match(input,32,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -11069,19 +11069,19 @@ public final AntlrDatatypeRuleToken ruleOpOther() throws RecognitionException {
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3744:6: (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) )
+                    // InternalFormat.g:3744:6: (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3744:6: (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3745:2: kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' )
+                    // InternalFormat.g:3744:6: (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) )
+                    // InternalFormat.g:3745:2: kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' )
                     {
-                    kw=(Token)match(input,63,FOLLOW_63_in_ruleOpOther8905); if (state.failed) return current;
+                    kw=(Token)match(input,63,FOLLOW_63); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
                               newLeafNode(kw, grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_0()); 
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3750:1: ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' )
+                    // InternalFormat.g:3750:1: ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' )
                     int alt67=2;
                     int LA67_0 = input.LA(1);
 
@@ -11111,22 +11111,22 @@ else if ( (LA67_1==EOF||(LA67_1>=RULE_ID && LA67_1<=RULE_DECIMAL)||LA67_1==14||L
                     }
                     switch (alt67) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3750:2: ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) )
+                            // InternalFormat.g:3750:2: ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3750:2: ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3750:3: ( ( '>' '>' ) )=> (kw= '>' kw= '>' )
+                            // InternalFormat.g:3750:2: ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) )
+                            // InternalFormat.g:3750:3: ( ( '>' '>' ) )=> (kw= '>' kw= '>' )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3754:5: (kw= '>' kw= '>' )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3755:2: kw= '>' kw= '>'
+                            // InternalFormat.g:3754:5: (kw= '>' kw= '>' )
+                            // InternalFormat.g:3755:2: kw= '>' kw= '>'
                             {
-                            kw=(Token)match(input,63,FOLLOW_63_in_ruleOpOther8936); if (state.failed) return current;
+                            kw=(Token)match(input,63,FOLLOW_63); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       current.merge(kw);
                                       newLeafNode(kw, grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_1_0_0_0()); 
                                   
                             }
-                            kw=(Token)match(input,63,FOLLOW_63_in_ruleOpOther8949); if (state.failed) return current;
+                            kw=(Token)match(input,63,FOLLOW_2); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       current.merge(kw);
@@ -11143,9 +11143,9 @@ else if ( (LA67_1==EOF||(LA67_1>=RULE_ID && LA67_1<=RULE_DECIMAL)||LA67_1==14||L
                             }
                             break;
                         case 2 :
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3768:2: kw= '>'
+                            // InternalFormat.g:3768:2: kw= '>'
                             {
-                            kw=(Token)match(input,63,FOLLOW_63_in_ruleOpOther8970); if (state.failed) return current;
+                            kw=(Token)match(input,63,FOLLOW_2); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       current.merge(kw);
@@ -11165,19 +11165,19 @@ else if ( (LA67_1==EOF||(LA67_1>=RULE_ID && LA67_1<=RULE_DECIMAL)||LA67_1==14||L
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3774:6: (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) )
+                    // InternalFormat.g:3774:6: (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3774:6: (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3775:2: kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' )
+                    // InternalFormat.g:3774:6: (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) )
+                    // InternalFormat.g:3775:2: kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' )
                     {
-                    kw=(Token)match(input,62,FOLLOW_62_in_ruleOpOther8992); if (state.failed) return current;
+                    kw=(Token)match(input,62,FOLLOW_64); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
                               newLeafNode(kw, grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_0()); 
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3780:1: ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' )
+                    // InternalFormat.g:3780:1: ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' )
                     int alt68=3;
                     int LA68_0 = input.LA(1);
 
@@ -11210,22 +11210,22 @@ else if ( (LA68_0==32) ) {
                     }
                     switch (alt68) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3780:2: ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) )
+                            // InternalFormat.g:3780:2: ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3780:2: ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3780:3: ( ( '<' '<' ) )=> (kw= '<' kw= '<' )
+                            // InternalFormat.g:3780:2: ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) )
+                            // InternalFormat.g:3780:3: ( ( '<' '<' ) )=> (kw= '<' kw= '<' )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3784:5: (kw= '<' kw= '<' )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3785:2: kw= '<' kw= '<'
+                            // InternalFormat.g:3784:5: (kw= '<' kw= '<' )
+                            // InternalFormat.g:3785:2: kw= '<' kw= '<'
                             {
-                            kw=(Token)match(input,62,FOLLOW_62_in_ruleOpOther9023); if (state.failed) return current;
+                            kw=(Token)match(input,62,FOLLOW_53); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       current.merge(kw);
                                       newLeafNode(kw, grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_1_0_0_0()); 
                                   
                             }
-                            kw=(Token)match(input,62,FOLLOW_62_in_ruleOpOther9036); if (state.failed) return current;
+                            kw=(Token)match(input,62,FOLLOW_2); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       current.merge(kw);
@@ -11242,9 +11242,9 @@ else if ( (LA68_0==32) ) {
                             }
                             break;
                         case 2 :
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3798:2: kw= '<'
+                            // InternalFormat.g:3798:2: kw= '<'
                             {
-                            kw=(Token)match(input,62,FOLLOW_62_in_ruleOpOther9057); if (state.failed) return current;
+                            kw=(Token)match(input,62,FOLLOW_2); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       current.merge(kw);
@@ -11255,9 +11255,9 @@ else if ( (LA68_0==32) ) {
                             }
                             break;
                         case 3 :
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3805:2: kw= '=>'
+                            // InternalFormat.g:3805:2: kw= '=>'
                             {
-                            kw=(Token)match(input,32,FOLLOW_32_in_ruleOpOther9076); if (state.failed) return current;
+                            kw=(Token)match(input,32,FOLLOW_2); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       current.merge(kw);
@@ -11277,9 +11277,9 @@ else if ( (LA68_0==32) ) {
                     }
                     break;
                 case 8 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3812:2: kw= '<>'
+                    // InternalFormat.g:3812:2: kw= '<>'
                     {
-                    kw=(Token)match(input,75,FOLLOW_75_in_ruleOpOther9097); if (state.failed) return current;
+                    kw=(Token)match(input,75,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -11290,9 +11290,9 @@ else if ( (LA68_0==32) ) {
                     }
                     break;
                 case 9 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3819:2: kw= '?:'
+                    // InternalFormat.g:3819:2: kw= '?:'
                     {
-                    kw=(Token)match(input,76,FOLLOW_76_in_ruleOpOther9116); if (state.failed) return current;
+                    kw=(Token)match(input,76,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -11325,7 +11325,7 @@ else if ( (LA68_0==32) ) {
 
 
     // $ANTLR start "entryRuleXAdditiveExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3832:1: entryRuleXAdditiveExpression returns [EObject current=null] : iv_ruleXAdditiveExpression= ruleXAdditiveExpression EOF ;
+    // InternalFormat.g:3832:1: entryRuleXAdditiveExpression returns [EObject current=null] : iv_ruleXAdditiveExpression= ruleXAdditiveExpression EOF ;
     public final EObject entryRuleXAdditiveExpression() throws RecognitionException {
         EObject current = null;
 
@@ -11333,13 +11333,13 @@ public final EObject entryRuleXAdditiveExpression() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3833:2: (iv_ruleXAdditiveExpression= ruleXAdditiveExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3834:2: iv_ruleXAdditiveExpression= ruleXAdditiveExpression EOF
+            // InternalFormat.g:3833:2: (iv_ruleXAdditiveExpression= ruleXAdditiveExpression EOF )
+            // InternalFormat.g:3834:2: iv_ruleXAdditiveExpression= ruleXAdditiveExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXAdditiveExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXAdditiveExpression_in_entryRuleXAdditiveExpression9156);
+            pushFollow(FOLLOW_1);
             iv_ruleXAdditiveExpression=ruleXAdditiveExpression();
 
             state._fsp--;
@@ -11347,7 +11347,7 @@ public final EObject entryRuleXAdditiveExpression() throws RecognitionException
             if ( state.backtracking==0 ) {
                current =iv_ruleXAdditiveExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXAdditiveExpression9166); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -11365,7 +11365,7 @@ public final EObject entryRuleXAdditiveExpression() throws RecognitionException
 
 
     // $ANTLR start "ruleXAdditiveExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3841:1: ruleXAdditiveExpression returns [EObject current=null] : (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* ) ;
+    // InternalFormat.g:3841:1: ruleXAdditiveExpression returns [EObject current=null] : (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* ) ;
     public final EObject ruleXAdditiveExpression() throws RecognitionException {
         EObject current = null;
 
@@ -11377,18 +11377,18 @@ public final EObject ruleXAdditiveExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3844:28: ( (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3845:1: (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* )
+            // InternalFormat.g:3844:28: ( (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* ) )
+            // InternalFormat.g:3845:1: (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3845:1: (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3846:5: this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )*
+            // InternalFormat.g:3845:1: (this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )* )
+            // InternalFormat.g:3846:5: this_XMultiplicativeExpression_0= ruleXMultiplicativeExpression ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXAdditiveExpressionAccess().getXMultiplicativeExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleXMultiplicativeExpression_in_ruleXAdditiveExpression9213);
+            pushFollow(FOLLOW_65);
             this_XMultiplicativeExpression_0=ruleXMultiplicativeExpression();
 
             state._fsp--;
@@ -11399,7 +11399,7 @@ public final EObject ruleXAdditiveExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3854:1: ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )*
+            // InternalFormat.g:3854:1: ( ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) ) )*
             loop70:
             do {
                 int alt70=2;
@@ -11427,16 +11427,16 @@ else if ( (LA70_0==78) ) {
 
                 switch (alt70) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3854:2: ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) )
+            	    // InternalFormat.g:3854:2: ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) ) ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3854:2: ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3854:3: ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) )
+            	    // InternalFormat.g:3854:2: ( ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) ) )
+            	    // InternalFormat.g:3854:3: ( ( () ( ( ruleOpAdd ) ) ) )=> ( () ( ( ruleOpAdd ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3859:6: ( () ( ( ruleOpAdd ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3859:7: () ( ( ruleOpAdd ) )
+            	    // InternalFormat.g:3859:6: ( () ( ( ruleOpAdd ) ) )
+            	    // InternalFormat.g:3859:7: () ( ( ruleOpAdd ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3859:7: ()
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3860:5: 
+            	    // InternalFormat.g:3859:7: ()
+            	    // InternalFormat.g:3860:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -11448,11 +11448,11 @@ else if ( (LA70_0==78) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3865:2: ( ( ruleOpAdd ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3866:1: ( ruleOpAdd )
+            	    // InternalFormat.g:3865:2: ( ( ruleOpAdd ) )
+            	    // InternalFormat.g:3866:1: ( ruleOpAdd )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3866:1: ( ruleOpAdd )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3867:3: ruleOpAdd
+            	    // InternalFormat.g:3866:1: ( ruleOpAdd )
+            	    // InternalFormat.g:3867:3: ruleOpAdd
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -11466,7 +11466,7 @@ else if ( (LA70_0==78) ) {
             	      	        newCompositeNode(grammarAccess.getXAdditiveExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleOpAdd_in_ruleXAdditiveExpression9266);
+            	    pushFollow(FOLLOW_48);
             	    ruleOpAdd();
 
             	    state._fsp--;
@@ -11488,18 +11488,18 @@ else if ( (LA70_0==78) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3880:4: ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3881:1: (lv_rightOperand_3_0= ruleXMultiplicativeExpression )
+            	    // InternalFormat.g:3880:4: ( (lv_rightOperand_3_0= ruleXMultiplicativeExpression ) )
+            	    // InternalFormat.g:3881:1: (lv_rightOperand_3_0= ruleXMultiplicativeExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3881:1: (lv_rightOperand_3_0= ruleXMultiplicativeExpression )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3882:3: lv_rightOperand_3_0= ruleXMultiplicativeExpression
+            	    // InternalFormat.g:3881:1: (lv_rightOperand_3_0= ruleXMultiplicativeExpression )
+            	    // InternalFormat.g:3882:3: lv_rightOperand_3_0= ruleXMultiplicativeExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXAdditiveExpressionAccess().getRightOperandXMultiplicativeExpressionParserRuleCall_1_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXMultiplicativeExpression_in_ruleXAdditiveExpression9289);
+            	    pushFollow(FOLLOW_65);
             	    lv_rightOperand_3_0=ruleXMultiplicativeExpression();
 
             	    state._fsp--;
@@ -11513,7 +11513,7 @@ else if ( (LA70_0==78) ) {
             	             			current, 
             	             			"rightOperand",
             	              		lv_rightOperand_3_0, 
-            	              		"XMultiplicativeExpression");
+            	              		"org.eclipse.xtext.xbase.Xbase.XMultiplicativeExpression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -11555,7 +11555,7 @@ else if ( (LA70_0==78) ) {
 
 
     // $ANTLR start "entryRuleOpAdd"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3906:1: entryRuleOpAdd returns [String current=null] : iv_ruleOpAdd= ruleOpAdd EOF ;
+    // InternalFormat.g:3906:1: entryRuleOpAdd returns [String current=null] : iv_ruleOpAdd= ruleOpAdd EOF ;
     public final String entryRuleOpAdd() throws RecognitionException {
         String current = null;
 
@@ -11563,13 +11563,13 @@ public final String entryRuleOpAdd() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3907:2: (iv_ruleOpAdd= ruleOpAdd EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3908:2: iv_ruleOpAdd= ruleOpAdd EOF
+            // InternalFormat.g:3907:2: (iv_ruleOpAdd= ruleOpAdd EOF )
+            // InternalFormat.g:3908:2: iv_ruleOpAdd= ruleOpAdd EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpAddRule()); 
             }
-            pushFollow(FOLLOW_ruleOpAdd_in_entryRuleOpAdd9328);
+            pushFollow(FOLLOW_1);
             iv_ruleOpAdd=ruleOpAdd();
 
             state._fsp--;
@@ -11577,7 +11577,7 @@ public final String entryRuleOpAdd() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpAdd.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpAdd9339); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -11595,7 +11595,7 @@ public final String entryRuleOpAdd() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpAdd"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3915:1: ruleOpAdd returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '+' | kw= '-' ) ;
+    // InternalFormat.g:3915:1: ruleOpAdd returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '+' | kw= '-' ) ;
     public final AntlrDatatypeRuleToken ruleOpAdd() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -11604,10 +11604,10 @@ public final AntlrDatatypeRuleToken ruleOpAdd() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3918:28: ( (kw= '+' | kw= '-' ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3919:1: (kw= '+' | kw= '-' )
+            // InternalFormat.g:3918:28: ( (kw= '+' | kw= '-' ) )
+            // InternalFormat.g:3919:1: (kw= '+' | kw= '-' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3919:1: (kw= '+' | kw= '-' )
+            // InternalFormat.g:3919:1: (kw= '+' | kw= '-' )
             int alt71=2;
             int LA71_0 = input.LA(1);
 
@@ -11626,9 +11626,9 @@ else if ( (LA71_0==78) ) {
             }
             switch (alt71) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3920:2: kw= '+'
+                    // InternalFormat.g:3920:2: kw= '+'
                     {
-                    kw=(Token)match(input,77,FOLLOW_77_in_ruleOpAdd9377); if (state.failed) return current;
+                    kw=(Token)match(input,77,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -11639,9 +11639,9 @@ else if ( (LA71_0==78) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3927:2: kw= '-'
+                    // InternalFormat.g:3927:2: kw= '-'
                     {
-                    kw=(Token)match(input,78,FOLLOW_78_in_ruleOpAdd9396); if (state.failed) return current;
+                    kw=(Token)match(input,78,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -11674,7 +11674,7 @@ else if ( (LA71_0==78) ) {
 
 
     // $ANTLR start "entryRuleXMultiplicativeExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3940:1: entryRuleXMultiplicativeExpression returns [EObject current=null] : iv_ruleXMultiplicativeExpression= ruleXMultiplicativeExpression EOF ;
+    // InternalFormat.g:3940:1: entryRuleXMultiplicativeExpression returns [EObject current=null] : iv_ruleXMultiplicativeExpression= ruleXMultiplicativeExpression EOF ;
     public final EObject entryRuleXMultiplicativeExpression() throws RecognitionException {
         EObject current = null;
 
@@ -11682,13 +11682,13 @@ public final EObject entryRuleXMultiplicativeExpression() throws RecognitionExce
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3941:2: (iv_ruleXMultiplicativeExpression= ruleXMultiplicativeExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3942:2: iv_ruleXMultiplicativeExpression= ruleXMultiplicativeExpression EOF
+            // InternalFormat.g:3941:2: (iv_ruleXMultiplicativeExpression= ruleXMultiplicativeExpression EOF )
+            // InternalFormat.g:3942:2: iv_ruleXMultiplicativeExpression= ruleXMultiplicativeExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXMultiplicativeExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXMultiplicativeExpression_in_entryRuleXMultiplicativeExpression9436);
+            pushFollow(FOLLOW_1);
             iv_ruleXMultiplicativeExpression=ruleXMultiplicativeExpression();
 
             state._fsp--;
@@ -11696,7 +11696,7 @@ public final EObject entryRuleXMultiplicativeExpression() throws RecognitionExce
             if ( state.backtracking==0 ) {
                current =iv_ruleXMultiplicativeExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXMultiplicativeExpression9446); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -11714,7 +11714,7 @@ public final EObject entryRuleXMultiplicativeExpression() throws RecognitionExce
 
 
     // $ANTLR start "ruleXMultiplicativeExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3949:1: ruleXMultiplicativeExpression returns [EObject current=null] : (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* ) ;
+    // InternalFormat.g:3949:1: ruleXMultiplicativeExpression returns [EObject current=null] : (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* ) ;
     public final EObject ruleXMultiplicativeExpression() throws RecognitionException {
         EObject current = null;
 
@@ -11726,18 +11726,18 @@ public final EObject ruleXMultiplicativeExpression() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3952:28: ( (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3953:1: (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* )
+            // InternalFormat.g:3952:28: ( (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* ) )
+            // InternalFormat.g:3953:1: (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3953:1: (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3954:5: this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )*
+            // InternalFormat.g:3953:1: (this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )* )
+            // InternalFormat.g:3954:5: this_XUnaryOperation_0= ruleXUnaryOperation ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXMultiplicativeExpressionAccess().getXUnaryOperationParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleXUnaryOperation_in_ruleXMultiplicativeExpression9493);
+            pushFollow(FOLLOW_66);
             this_XUnaryOperation_0=ruleXUnaryOperation();
 
             state._fsp--;
@@ -11748,7 +11748,7 @@ public final EObject ruleXMultiplicativeExpression() throws RecognitionException
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3962:1: ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )*
+            // InternalFormat.g:3962:1: ( ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) ) )*
             loop72:
             do {
                 int alt72=2;
@@ -11802,16 +11802,16 @@ public final EObject ruleXMultiplicativeExpression() throws RecognitionException
 
                 switch (alt72) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3962:2: ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) )
+            	    // InternalFormat.g:3962:2: ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) ) ( (lv_rightOperand_3_0= ruleXUnaryOperation ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3962:2: ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3962:3: ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) )
+            	    // InternalFormat.g:3962:2: ( ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) ) )
+            	    // InternalFormat.g:3962:3: ( ( () ( ( ruleOpMulti ) ) ) )=> ( () ( ( ruleOpMulti ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3967:6: ( () ( ( ruleOpMulti ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3967:7: () ( ( ruleOpMulti ) )
+            	    // InternalFormat.g:3967:6: ( () ( ( ruleOpMulti ) ) )
+            	    // InternalFormat.g:3967:7: () ( ( ruleOpMulti ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3967:7: ()
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3968:5: 
+            	    // InternalFormat.g:3967:7: ()
+            	    // InternalFormat.g:3968:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -11823,11 +11823,11 @@ public final EObject ruleXMultiplicativeExpression() throws RecognitionException
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3973:2: ( ( ruleOpMulti ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3974:1: ( ruleOpMulti )
+            	    // InternalFormat.g:3973:2: ( ( ruleOpMulti ) )
+            	    // InternalFormat.g:3974:1: ( ruleOpMulti )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3974:1: ( ruleOpMulti )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3975:3: ruleOpMulti
+            	    // InternalFormat.g:3974:1: ( ruleOpMulti )
+            	    // InternalFormat.g:3975:3: ruleOpMulti
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -11841,7 +11841,7 @@ public final EObject ruleXMultiplicativeExpression() throws RecognitionException
             	      	        newCompositeNode(grammarAccess.getXMultiplicativeExpressionAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleOpMulti_in_ruleXMultiplicativeExpression9546);
+            	    pushFollow(FOLLOW_48);
             	    ruleOpMulti();
 
             	    state._fsp--;
@@ -11863,18 +11863,18 @@ public final EObject ruleXMultiplicativeExpression() throws RecognitionException
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3988:4: ( (lv_rightOperand_3_0= ruleXUnaryOperation ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3989:1: (lv_rightOperand_3_0= ruleXUnaryOperation )
+            	    // InternalFormat.g:3988:4: ( (lv_rightOperand_3_0= ruleXUnaryOperation ) )
+            	    // InternalFormat.g:3989:1: (lv_rightOperand_3_0= ruleXUnaryOperation )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3989:1: (lv_rightOperand_3_0= ruleXUnaryOperation )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3990:3: lv_rightOperand_3_0= ruleXUnaryOperation
+            	    // InternalFormat.g:3989:1: (lv_rightOperand_3_0= ruleXUnaryOperation )
+            	    // InternalFormat.g:3990:3: lv_rightOperand_3_0= ruleXUnaryOperation
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXMultiplicativeExpressionAccess().getRightOperandXUnaryOperationParserRuleCall_1_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXUnaryOperation_in_ruleXMultiplicativeExpression9569);
+            	    pushFollow(FOLLOW_66);
             	    lv_rightOperand_3_0=ruleXUnaryOperation();
 
             	    state._fsp--;
@@ -11888,7 +11888,7 @@ public final EObject ruleXMultiplicativeExpression() throws RecognitionException
             	             			current, 
             	             			"rightOperand",
             	              		lv_rightOperand_3_0, 
-            	              		"XUnaryOperation");
+            	              		"org.eclipse.xtext.xbase.Xbase.XUnaryOperation");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -11930,7 +11930,7 @@ public final EObject ruleXMultiplicativeExpression() throws RecognitionException
 
 
     // $ANTLR start "entryRuleOpMulti"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4014:1: entryRuleOpMulti returns [String current=null] : iv_ruleOpMulti= ruleOpMulti EOF ;
+    // InternalFormat.g:4014:1: entryRuleOpMulti returns [String current=null] : iv_ruleOpMulti= ruleOpMulti EOF ;
     public final String entryRuleOpMulti() throws RecognitionException {
         String current = null;
 
@@ -11938,13 +11938,13 @@ public final String entryRuleOpMulti() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4015:2: (iv_ruleOpMulti= ruleOpMulti EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4016:2: iv_ruleOpMulti= ruleOpMulti EOF
+            // InternalFormat.g:4015:2: (iv_ruleOpMulti= ruleOpMulti EOF )
+            // InternalFormat.g:4016:2: iv_ruleOpMulti= ruleOpMulti EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpMultiRule()); 
             }
-            pushFollow(FOLLOW_ruleOpMulti_in_entryRuleOpMulti9608);
+            pushFollow(FOLLOW_1);
             iv_ruleOpMulti=ruleOpMulti();
 
             state._fsp--;
@@ -11952,7 +11952,7 @@ public final String entryRuleOpMulti() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpMulti.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpMulti9619); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -11970,7 +11970,7 @@ public final String entryRuleOpMulti() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpMulti"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4023:1: ruleOpMulti returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '*' | kw= '**' | kw= '/' | kw= '%' ) ;
+    // InternalFormat.g:4023:1: ruleOpMulti returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '*' | kw= '**' | kw= '/' | kw= '%' ) ;
     public final AntlrDatatypeRuleToken ruleOpMulti() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -11979,10 +11979,10 @@ public final AntlrDatatypeRuleToken ruleOpMulti() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4026:28: ( (kw= '*' | kw= '**' | kw= '/' | kw= '%' ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4027:1: (kw= '*' | kw= '**' | kw= '/' | kw= '%' )
+            // InternalFormat.g:4026:28: ( (kw= '*' | kw= '**' | kw= '/' | kw= '%' ) )
+            // InternalFormat.g:4027:1: (kw= '*' | kw= '**' | kw= '/' | kw= '%' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4027:1: (kw= '*' | kw= '**' | kw= '/' | kw= '%' )
+            // InternalFormat.g:4027:1: (kw= '*' | kw= '**' | kw= '/' | kw= '%' )
             int alt73=4;
             switch ( input.LA(1) ) {
             case 25:
@@ -12015,9 +12015,9 @@ public final AntlrDatatypeRuleToken ruleOpMulti() throws RecognitionException {
 
             switch (alt73) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4028:2: kw= '*'
+                    // InternalFormat.g:4028:2: kw= '*'
                     {
-                    kw=(Token)match(input,25,FOLLOW_25_in_ruleOpMulti9657); if (state.failed) return current;
+                    kw=(Token)match(input,25,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -12028,9 +12028,9 @@ public final AntlrDatatypeRuleToken ruleOpMulti() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4035:2: kw= '**'
+                    // InternalFormat.g:4035:2: kw= '**'
                     {
-                    kw=(Token)match(input,79,FOLLOW_79_in_ruleOpMulti9676); if (state.failed) return current;
+                    kw=(Token)match(input,79,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -12041,9 +12041,9 @@ public final AntlrDatatypeRuleToken ruleOpMulti() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4042:2: kw= '/'
+                    // InternalFormat.g:4042:2: kw= '/'
                     {
-                    kw=(Token)match(input,80,FOLLOW_80_in_ruleOpMulti9695); if (state.failed) return current;
+                    kw=(Token)match(input,80,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -12054,9 +12054,9 @@ public final AntlrDatatypeRuleToken ruleOpMulti() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4049:2: kw= '%'
+                    // InternalFormat.g:4049:2: kw= '%'
                     {
-                    kw=(Token)match(input,81,FOLLOW_81_in_ruleOpMulti9714); if (state.failed) return current;
+                    kw=(Token)match(input,81,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -12089,7 +12089,7 @@ public final AntlrDatatypeRuleToken ruleOpMulti() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXUnaryOperation"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4062:1: entryRuleXUnaryOperation returns [EObject current=null] : iv_ruleXUnaryOperation= ruleXUnaryOperation EOF ;
+    // InternalFormat.g:4062:1: entryRuleXUnaryOperation returns [EObject current=null] : iv_ruleXUnaryOperation= ruleXUnaryOperation EOF ;
     public final EObject entryRuleXUnaryOperation() throws RecognitionException {
         EObject current = null;
 
@@ -12097,13 +12097,13 @@ public final EObject entryRuleXUnaryOperation() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4063:2: (iv_ruleXUnaryOperation= ruleXUnaryOperation EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4064:2: iv_ruleXUnaryOperation= ruleXUnaryOperation EOF
+            // InternalFormat.g:4063:2: (iv_ruleXUnaryOperation= ruleXUnaryOperation EOF )
+            // InternalFormat.g:4064:2: iv_ruleXUnaryOperation= ruleXUnaryOperation EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXUnaryOperationRule()); 
             }
-            pushFollow(FOLLOW_ruleXUnaryOperation_in_entryRuleXUnaryOperation9754);
+            pushFollow(FOLLOW_1);
             iv_ruleXUnaryOperation=ruleXUnaryOperation();
 
             state._fsp--;
@@ -12111,7 +12111,7 @@ public final EObject entryRuleXUnaryOperation() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXUnaryOperation; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXUnaryOperation9764); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -12129,7 +12129,7 @@ public final EObject entryRuleXUnaryOperation() throws RecognitionException {
 
 
     // $ANTLR start "ruleXUnaryOperation"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4071:1: ruleXUnaryOperation returns [EObject current=null] : ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression ) ;
+    // InternalFormat.g:4071:1: ruleXUnaryOperation returns [EObject current=null] : ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression ) ;
     public final EObject ruleXUnaryOperation() throws RecognitionException {
         EObject current = null;
 
@@ -12141,10 +12141,10 @@ public final EObject ruleXUnaryOperation() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4074:28: ( ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4075:1: ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression )
+            // InternalFormat.g:4074:28: ( ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression ) )
+            // InternalFormat.g:4075:1: ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4075:1: ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression )
+            // InternalFormat.g:4075:1: ( ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) ) | this_XCastedExpression_3= ruleXCastedExpression )
             int alt74=2;
             int LA74_0 = input.LA(1);
 
@@ -12163,13 +12163,13 @@ else if ( ((LA74_0>=RULE_ID && LA74_0<=RULE_DECIMAL)||LA74_0==14||LA74_0==16||LA
             }
             switch (alt74) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4075:2: ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) )
+                    // InternalFormat.g:4075:2: ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4075:2: ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4075:3: () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) )
+                    // InternalFormat.g:4075:2: ( () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) ) )
+                    // InternalFormat.g:4075:3: () ( ( ruleOpUnary ) ) ( (lv_operand_2_0= ruleXUnaryOperation ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4075:3: ()
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4076:5: 
+                    // InternalFormat.g:4075:3: ()
+                    // InternalFormat.g:4076:5: 
                     {
                     if ( state.backtracking==0 ) {
 
@@ -12181,11 +12181,11 @@ else if ( ((LA74_0>=RULE_ID && LA74_0<=RULE_DECIMAL)||LA74_0==14||LA74_0==16||LA
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4081:2: ( ( ruleOpUnary ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4082:1: ( ruleOpUnary )
+                    // InternalFormat.g:4081:2: ( ( ruleOpUnary ) )
+                    // InternalFormat.g:4082:1: ( ruleOpUnary )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4082:1: ( ruleOpUnary )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4083:3: ruleOpUnary
+                    // InternalFormat.g:4082:1: ( ruleOpUnary )
+                    // InternalFormat.g:4083:3: ruleOpUnary
                     {
                     if ( state.backtracking==0 ) {
 
@@ -12199,7 +12199,7 @@ else if ( ((LA74_0>=RULE_ID && LA74_0<=RULE_DECIMAL)||LA74_0==14||LA74_0==16||LA
                       	        newCompositeNode(grammarAccess.getXUnaryOperationAccess().getFeatureJvmIdentifiableElementCrossReference_0_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleOpUnary_in_ruleXUnaryOperation9822);
+                    pushFollow(FOLLOW_48);
                     ruleOpUnary();
 
                     state._fsp--;
@@ -12215,18 +12215,18 @@ else if ( ((LA74_0>=RULE_ID && LA74_0<=RULE_DECIMAL)||LA74_0==14||LA74_0==16||LA
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4096:2: ( (lv_operand_2_0= ruleXUnaryOperation ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4097:1: (lv_operand_2_0= ruleXUnaryOperation )
+                    // InternalFormat.g:4096:2: ( (lv_operand_2_0= ruleXUnaryOperation ) )
+                    // InternalFormat.g:4097:1: (lv_operand_2_0= ruleXUnaryOperation )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4097:1: (lv_operand_2_0= ruleXUnaryOperation )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4098:3: lv_operand_2_0= ruleXUnaryOperation
+                    // InternalFormat.g:4097:1: (lv_operand_2_0= ruleXUnaryOperation )
+                    // InternalFormat.g:4098:3: lv_operand_2_0= ruleXUnaryOperation
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXUnaryOperationAccess().getOperandXUnaryOperationParserRuleCall_0_2_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXUnaryOperation_in_ruleXUnaryOperation9843);
+                    pushFollow(FOLLOW_2);
                     lv_operand_2_0=ruleXUnaryOperation();
 
                     state._fsp--;
@@ -12240,7 +12240,7 @@ else if ( ((LA74_0>=RULE_ID && LA74_0<=RULE_DECIMAL)||LA74_0==14||LA74_0==16||LA
                              			current, 
                              			"operand",
                               		lv_operand_2_0, 
-                              		"XUnaryOperation");
+                              		"org.eclipse.xtext.xbase.Xbase.XUnaryOperation");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -12257,14 +12257,14 @@ else if ( ((LA74_0>=RULE_ID && LA74_0<=RULE_DECIMAL)||LA74_0==14||LA74_0==16||LA
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4116:5: this_XCastedExpression_3= ruleXCastedExpression
+                    // InternalFormat.g:4116:5: this_XCastedExpression_3= ruleXCastedExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXUnaryOperationAccess().getXCastedExpressionParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXCastedExpression_in_ruleXUnaryOperation9872);
+                    pushFollow(FOLLOW_2);
                     this_XCastedExpression_3=ruleXCastedExpression();
 
                     state._fsp--;
@@ -12301,7 +12301,7 @@ else if ( ((LA74_0>=RULE_ID && LA74_0<=RULE_DECIMAL)||LA74_0==14||LA74_0==16||LA
 
 
     // $ANTLR start "entryRuleOpUnary"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4132:1: entryRuleOpUnary returns [String current=null] : iv_ruleOpUnary= ruleOpUnary EOF ;
+    // InternalFormat.g:4132:1: entryRuleOpUnary returns [String current=null] : iv_ruleOpUnary= ruleOpUnary EOF ;
     public final String entryRuleOpUnary() throws RecognitionException {
         String current = null;
 
@@ -12309,13 +12309,13 @@ public final String entryRuleOpUnary() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4133:2: (iv_ruleOpUnary= ruleOpUnary EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4134:2: iv_ruleOpUnary= ruleOpUnary EOF
+            // InternalFormat.g:4133:2: (iv_ruleOpUnary= ruleOpUnary EOF )
+            // InternalFormat.g:4134:2: iv_ruleOpUnary= ruleOpUnary EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpUnaryRule()); 
             }
-            pushFollow(FOLLOW_ruleOpUnary_in_entryRuleOpUnary9908);
+            pushFollow(FOLLOW_1);
             iv_ruleOpUnary=ruleOpUnary();
 
             state._fsp--;
@@ -12323,7 +12323,7 @@ public final String entryRuleOpUnary() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpUnary.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpUnary9919); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -12341,7 +12341,7 @@ public final String entryRuleOpUnary() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpUnary"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4141:1: ruleOpUnary returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '!' | kw= '-' | kw= '+' ) ;
+    // InternalFormat.g:4141:1: ruleOpUnary returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '!' | kw= '-' | kw= '+' ) ;
     public final AntlrDatatypeRuleToken ruleOpUnary() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -12350,10 +12350,10 @@ public final AntlrDatatypeRuleToken ruleOpUnary() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4144:28: ( (kw= '!' | kw= '-' | kw= '+' ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4145:1: (kw= '!' | kw= '-' | kw= '+' )
+            // InternalFormat.g:4144:28: ( (kw= '!' | kw= '-' | kw= '+' ) )
+            // InternalFormat.g:4145:1: (kw= '!' | kw= '-' | kw= '+' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4145:1: (kw= '!' | kw= '-' | kw= '+' )
+            // InternalFormat.g:4145:1: (kw= '!' | kw= '-' | kw= '+' )
             int alt75=3;
             switch ( input.LA(1) ) {
             case 82:
@@ -12381,9 +12381,9 @@ public final AntlrDatatypeRuleToken ruleOpUnary() throws RecognitionException {
 
             switch (alt75) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4146:2: kw= '!'
+                    // InternalFormat.g:4146:2: kw= '!'
                     {
-                    kw=(Token)match(input,82,FOLLOW_82_in_ruleOpUnary9957); if (state.failed) return current;
+                    kw=(Token)match(input,82,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -12394,9 +12394,9 @@ public final AntlrDatatypeRuleToken ruleOpUnary() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4153:2: kw= '-'
+                    // InternalFormat.g:4153:2: kw= '-'
                     {
-                    kw=(Token)match(input,78,FOLLOW_78_in_ruleOpUnary9976); if (state.failed) return current;
+                    kw=(Token)match(input,78,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -12407,9 +12407,9 @@ public final AntlrDatatypeRuleToken ruleOpUnary() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4160:2: kw= '+'
+                    // InternalFormat.g:4160:2: kw= '+'
                     {
-                    kw=(Token)match(input,77,FOLLOW_77_in_ruleOpUnary9995); if (state.failed) return current;
+                    kw=(Token)match(input,77,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -12442,7 +12442,7 @@ public final AntlrDatatypeRuleToken ruleOpUnary() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXCastedExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4173:1: entryRuleXCastedExpression returns [EObject current=null] : iv_ruleXCastedExpression= ruleXCastedExpression EOF ;
+    // InternalFormat.g:4173:1: entryRuleXCastedExpression returns [EObject current=null] : iv_ruleXCastedExpression= ruleXCastedExpression EOF ;
     public final EObject entryRuleXCastedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -12450,13 +12450,13 @@ public final EObject entryRuleXCastedExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4174:2: (iv_ruleXCastedExpression= ruleXCastedExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4175:2: iv_ruleXCastedExpression= ruleXCastedExpression EOF
+            // InternalFormat.g:4174:2: (iv_ruleXCastedExpression= ruleXCastedExpression EOF )
+            // InternalFormat.g:4175:2: iv_ruleXCastedExpression= ruleXCastedExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXCastedExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXCastedExpression_in_entryRuleXCastedExpression10035);
+            pushFollow(FOLLOW_1);
             iv_ruleXCastedExpression=ruleXCastedExpression();
 
             state._fsp--;
@@ -12464,7 +12464,7 @@ public final EObject entryRuleXCastedExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXCastedExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXCastedExpression10045); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -12482,7 +12482,7 @@ public final EObject entryRuleXCastedExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXCastedExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4182:1: ruleXCastedExpression returns [EObject current=null] : (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* ) ;
+    // InternalFormat.g:4182:1: ruleXCastedExpression returns [EObject current=null] : (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* ) ;
     public final EObject ruleXCastedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -12495,18 +12495,18 @@ public final EObject ruleXCastedExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4185:28: ( (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4186:1: (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* )
+            // InternalFormat.g:4185:28: ( (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* ) )
+            // InternalFormat.g:4186:1: (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4186:1: (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4187:5: this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )*
+            // InternalFormat.g:4186:1: (this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )* )
+            // InternalFormat.g:4187:5: this_XPostfixOperation_0= ruleXPostfixOperation ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXCastedExpressionAccess().getXPostfixOperationParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleXPostfixOperation_in_ruleXCastedExpression10092);
+            pushFollow(FOLLOW_67);
             this_XPostfixOperation_0=ruleXPostfixOperation();
 
             state._fsp--;
@@ -12517,7 +12517,7 @@ public final EObject ruleXCastedExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4195:1: ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )*
+            // InternalFormat.g:4195:1: ( ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) ) )*
             loop76:
             do {
                 int alt76=2;
@@ -12536,16 +12536,16 @@ public final EObject ruleXCastedExpression() throws RecognitionException {
 
                 switch (alt76) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4195:2: ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) )
+            	    // InternalFormat.g:4195:2: ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) ) ( (lv_type_3_0= ruleJvmTypeReference ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4195:2: ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4195:3: ( ( () 'as' ) )=> ( () otherlv_2= 'as' )
+            	    // InternalFormat.g:4195:2: ( ( ( () 'as' ) )=> ( () otherlv_2= 'as' ) )
+            	    // InternalFormat.g:4195:3: ( ( () 'as' ) )=> ( () otherlv_2= 'as' )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4197:5: ( () otherlv_2= 'as' )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4197:6: () otherlv_2= 'as'
+            	    // InternalFormat.g:4197:5: ( () otherlv_2= 'as' )
+            	    // InternalFormat.g:4197:6: () otherlv_2= 'as'
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4197:6: ()
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4198:5: 
+            	    // InternalFormat.g:4197:6: ()
+            	    // InternalFormat.g:4198:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -12557,7 +12557,7 @@ public final EObject ruleXCastedExpression() throws RecognitionException {
 
             	    }
 
-            	    otherlv_2=(Token)match(input,83,FOLLOW_83_in_ruleXCastedExpression10127); if (state.failed) return current;
+            	    otherlv_2=(Token)match(input,83,FOLLOW_60); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_2, grammarAccess.getXCastedExpressionAccess().getAsKeyword_1_0_0_1());
@@ -12569,18 +12569,18 @@ public final EObject ruleXCastedExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4207:3: ( (lv_type_3_0= ruleJvmTypeReference ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4208:1: (lv_type_3_0= ruleJvmTypeReference )
+            	    // InternalFormat.g:4207:3: ( (lv_type_3_0= ruleJvmTypeReference ) )
+            	    // InternalFormat.g:4208:1: (lv_type_3_0= ruleJvmTypeReference )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4208:1: (lv_type_3_0= ruleJvmTypeReference )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4209:3: lv_type_3_0= ruleJvmTypeReference
+            	    // InternalFormat.g:4208:1: (lv_type_3_0= ruleJvmTypeReference )
+            	    // InternalFormat.g:4209:3: lv_type_3_0= ruleJvmTypeReference
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXCastedExpressionAccess().getTypeJvmTypeReferenceParserRuleCall_1_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleXCastedExpression10150);
+            	    pushFollow(FOLLOW_67);
             	    lv_type_3_0=ruleJvmTypeReference();
 
             	    state._fsp--;
@@ -12594,7 +12594,7 @@ public final EObject ruleXCastedExpression() throws RecognitionException {
             	             			current, 
             	             			"type",
             	              		lv_type_3_0, 
-            	              		"JvmTypeReference");
+            	              		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -12636,7 +12636,7 @@ public final EObject ruleXCastedExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXPostfixOperation"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4233:1: entryRuleXPostfixOperation returns [EObject current=null] : iv_ruleXPostfixOperation= ruleXPostfixOperation EOF ;
+    // InternalFormat.g:4233:1: entryRuleXPostfixOperation returns [EObject current=null] : iv_ruleXPostfixOperation= ruleXPostfixOperation EOF ;
     public final EObject entryRuleXPostfixOperation() throws RecognitionException {
         EObject current = null;
 
@@ -12644,13 +12644,13 @@ public final EObject entryRuleXPostfixOperation() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4234:2: (iv_ruleXPostfixOperation= ruleXPostfixOperation EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4235:2: iv_ruleXPostfixOperation= ruleXPostfixOperation EOF
+            // InternalFormat.g:4234:2: (iv_ruleXPostfixOperation= ruleXPostfixOperation EOF )
+            // InternalFormat.g:4235:2: iv_ruleXPostfixOperation= ruleXPostfixOperation EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXPostfixOperationRule()); 
             }
-            pushFollow(FOLLOW_ruleXPostfixOperation_in_entryRuleXPostfixOperation10188);
+            pushFollow(FOLLOW_1);
             iv_ruleXPostfixOperation=ruleXPostfixOperation();
 
             state._fsp--;
@@ -12658,7 +12658,7 @@ public final EObject entryRuleXPostfixOperation() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXPostfixOperation; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXPostfixOperation10198); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -12676,7 +12676,7 @@ public final EObject entryRuleXPostfixOperation() throws RecognitionException {
 
 
     // $ANTLR start "ruleXPostfixOperation"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4242:1: ruleXPostfixOperation returns [EObject current=null] : (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? ) ;
+    // InternalFormat.g:4242:1: ruleXPostfixOperation returns [EObject current=null] : (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? ) ;
     public final EObject ruleXPostfixOperation() throws RecognitionException {
         EObject current = null;
 
@@ -12686,18 +12686,18 @@ public final EObject ruleXPostfixOperation() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4245:28: ( (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4246:1: (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? )
+            // InternalFormat.g:4245:28: ( (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? ) )
+            // InternalFormat.g:4246:1: (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4246:1: (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4247:5: this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )?
+            // InternalFormat.g:4246:1: (this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )? )
+            // InternalFormat.g:4247:5: this_XMemberFeatureCall_0= ruleXMemberFeatureCall ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )?
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXPostfixOperationAccess().getXMemberFeatureCallParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleXMemberFeatureCall_in_ruleXPostfixOperation10245);
+            pushFollow(FOLLOW_68);
             this_XMemberFeatureCall_0=ruleXMemberFeatureCall();
 
             state._fsp--;
@@ -12708,7 +12708,7 @@ public final EObject ruleXPostfixOperation() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4255:1: ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )?
+            // InternalFormat.g:4255:1: ( ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) ) )?
             int alt77=2;
             int LA77_0 = input.LA(1);
 
@@ -12728,13 +12728,13 @@ else if ( (LA77_0==85) ) {
             }
             switch (alt77) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4255:2: ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) )
+                    // InternalFormat.g:4255:2: ( ( () ( ( ruleOpPostfix ) ) ) )=> ( () ( ( ruleOpPostfix ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4260:6: ( () ( ( ruleOpPostfix ) ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4260:7: () ( ( ruleOpPostfix ) )
+                    // InternalFormat.g:4260:6: ( () ( ( ruleOpPostfix ) ) )
+                    // InternalFormat.g:4260:7: () ( ( ruleOpPostfix ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4260:7: ()
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4261:5: 
+                    // InternalFormat.g:4260:7: ()
+                    // InternalFormat.g:4261:5: 
                     {
                     if ( state.backtracking==0 ) {
 
@@ -12746,11 +12746,11 @@ else if ( (LA77_0==85) ) {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4266:2: ( ( ruleOpPostfix ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4267:1: ( ruleOpPostfix )
+                    // InternalFormat.g:4266:2: ( ( ruleOpPostfix ) )
+                    // InternalFormat.g:4267:1: ( ruleOpPostfix )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4267:1: ( ruleOpPostfix )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4268:3: ruleOpPostfix
+                    // InternalFormat.g:4267:1: ( ruleOpPostfix )
+                    // InternalFormat.g:4268:3: ruleOpPostfix
                     {
                     if ( state.backtracking==0 ) {
 
@@ -12764,7 +12764,7 @@ else if ( (LA77_0==85) ) {
                       	        newCompositeNode(grammarAccess.getXPostfixOperationAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleOpPostfix_in_ruleXPostfixOperation10297);
+                    pushFollow(FOLLOW_2);
                     ruleOpPostfix();
 
                     state._fsp--;
@@ -12812,7 +12812,7 @@ else if ( (LA77_0==85) ) {
 
 
     // $ANTLR start "entryRuleOpPostfix"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4289:1: entryRuleOpPostfix returns [String current=null] : iv_ruleOpPostfix= ruleOpPostfix EOF ;
+    // InternalFormat.g:4289:1: entryRuleOpPostfix returns [String current=null] : iv_ruleOpPostfix= ruleOpPostfix EOF ;
     public final String entryRuleOpPostfix() throws RecognitionException {
         String current = null;
 
@@ -12820,13 +12820,13 @@ public final String entryRuleOpPostfix() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4290:2: (iv_ruleOpPostfix= ruleOpPostfix EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4291:2: iv_ruleOpPostfix= ruleOpPostfix EOF
+            // InternalFormat.g:4290:2: (iv_ruleOpPostfix= ruleOpPostfix EOF )
+            // InternalFormat.g:4291:2: iv_ruleOpPostfix= ruleOpPostfix EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOpPostfixRule()); 
             }
-            pushFollow(FOLLOW_ruleOpPostfix_in_entryRuleOpPostfix10337);
+            pushFollow(FOLLOW_1);
             iv_ruleOpPostfix=ruleOpPostfix();
 
             state._fsp--;
@@ -12834,7 +12834,7 @@ public final String entryRuleOpPostfix() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOpPostfix.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOpPostfix10348); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -12852,7 +12852,7 @@ public final String entryRuleOpPostfix() throws RecognitionException {
 
 
     // $ANTLR start "ruleOpPostfix"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4298:1: ruleOpPostfix returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '++' | kw= '--' ) ;
+    // InternalFormat.g:4298:1: ruleOpPostfix returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '++' | kw= '--' ) ;
     public final AntlrDatatypeRuleToken ruleOpPostfix() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -12861,10 +12861,10 @@ public final AntlrDatatypeRuleToken ruleOpPostfix() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4301:28: ( (kw= '++' | kw= '--' ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4302:1: (kw= '++' | kw= '--' )
+            // InternalFormat.g:4301:28: ( (kw= '++' | kw= '--' ) )
+            // InternalFormat.g:4302:1: (kw= '++' | kw= '--' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4302:1: (kw= '++' | kw= '--' )
+            // InternalFormat.g:4302:1: (kw= '++' | kw= '--' )
             int alt78=2;
             int LA78_0 = input.LA(1);
 
@@ -12883,9 +12883,9 @@ else if ( (LA78_0==85) ) {
             }
             switch (alt78) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4303:2: kw= '++'
+                    // InternalFormat.g:4303:2: kw= '++'
                     {
-                    kw=(Token)match(input,84,FOLLOW_84_in_ruleOpPostfix10386); if (state.failed) return current;
+                    kw=(Token)match(input,84,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -12896,9 +12896,9 @@ else if ( (LA78_0==85) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4310:2: kw= '--'
+                    // InternalFormat.g:4310:2: kw= '--'
                     {
-                    kw=(Token)match(input,85,FOLLOW_85_in_ruleOpPostfix10405); if (state.failed) return current;
+                    kw=(Token)match(input,85,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -12931,7 +12931,7 @@ else if ( (LA78_0==85) ) {
 
 
     // $ANTLR start "entryRuleXMemberFeatureCall"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4323:1: entryRuleXMemberFeatureCall returns [EObject current=null] : iv_ruleXMemberFeatureCall= ruleXMemberFeatureCall EOF ;
+    // InternalFormat.g:4323:1: entryRuleXMemberFeatureCall returns [EObject current=null] : iv_ruleXMemberFeatureCall= ruleXMemberFeatureCall EOF ;
     public final EObject entryRuleXMemberFeatureCall() throws RecognitionException {
         EObject current = null;
 
@@ -12939,13 +12939,13 @@ public final EObject entryRuleXMemberFeatureCall() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4324:2: (iv_ruleXMemberFeatureCall= ruleXMemberFeatureCall EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4325:2: iv_ruleXMemberFeatureCall= ruleXMemberFeatureCall EOF
+            // InternalFormat.g:4324:2: (iv_ruleXMemberFeatureCall= ruleXMemberFeatureCall EOF )
+            // InternalFormat.g:4325:2: iv_ruleXMemberFeatureCall= ruleXMemberFeatureCall EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXMemberFeatureCallRule()); 
             }
-            pushFollow(FOLLOW_ruleXMemberFeatureCall_in_entryRuleXMemberFeatureCall10445);
+            pushFollow(FOLLOW_1);
             iv_ruleXMemberFeatureCall=ruleXMemberFeatureCall();
 
             state._fsp--;
@@ -12953,7 +12953,7 @@ public final EObject entryRuleXMemberFeatureCall() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXMemberFeatureCall; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXMemberFeatureCall10455); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -12971,7 +12971,7 @@ public final EObject entryRuleXMemberFeatureCall() throws RecognitionException {
 
 
     // $ANTLR start "ruleXMemberFeatureCall"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4332:1: ruleXMemberFeatureCall returns [EObject current=null] : (this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )* ) ;
+    // InternalFormat.g:4332:1: ruleXMemberFeatureCall returns [EObject current=null] : (this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )* ) ;
     public final EObject ruleXMemberFeatureCall() throws RecognitionException {
         EObject current = null;
 
@@ -13006,18 +13006,18 @@ public final EObject ruleXMemberFeatureCall() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4335:28: ( (this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4336:1: (this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )* )
+            // InternalFormat.g:4335:28: ( (this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )* ) )
+            // InternalFormat.g:4336:1: (this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4336:1: (this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )* )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4337:5: this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )*
+            // InternalFormat.g:4336:1: (this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )* )
+            // InternalFormat.g:4337:5: this_XPrimaryExpression_0= ruleXPrimaryExpression ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getXPrimaryExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleXPrimaryExpression_in_ruleXMemberFeatureCall10502);
+            pushFollow(FOLLOW_69);
             this_XPrimaryExpression_0=ruleXPrimaryExpression();
 
             state._fsp--;
@@ -13028,7 +13028,7 @@ public final EObject ruleXMemberFeatureCall() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4345:1: ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )*
+            // InternalFormat.g:4345:1: ( ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) ) | ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? ) )*
             loop87:
             do {
                 int alt87=3;
@@ -13077,19 +13077,19 @@ else if ( (synpred21_InternalFormat()) ) {
 
                 switch (alt87) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4345:2: ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) )
+            	    // InternalFormat.g:4345:2: ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4345:2: ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4345:3: ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) )
+            	    // InternalFormat.g:4345:2: ( ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) ) )
+            	    // InternalFormat.g:4345:3: ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) ) ( (lv_value_6_0= ruleXAssignment ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4345:3: ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4345:4: ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
+            	    // InternalFormat.g:4345:3: ( ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )
+            	    // InternalFormat.g:4345:4: ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )=> ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4358:25: ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4358:26: () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign
+            	    // InternalFormat.g:4358:25: ( () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
+            	    // InternalFormat.g:4358:26: () (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4358:26: ()
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4359:5: 
+            	    // InternalFormat.g:4358:26: ()
+            	    // InternalFormat.g:4359:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -13101,7 +13101,7 @@ else if ( (synpred21_InternalFormat()) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4364:2: (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) )
+            	    // InternalFormat.g:4364:2: (otherlv_2= '.' | ( (lv_explicitStatic_3_0= '::' ) ) )
             	    int alt79=2;
             	    int LA79_0 = input.LA(1);
 
@@ -13120,9 +13120,9 @@ else if ( (LA79_0==86) ) {
             	    }
             	    switch (alt79) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4364:4: otherlv_2= '.'
+            	            // InternalFormat.g:4364:4: otherlv_2= '.'
             	            {
-            	            otherlv_2=(Token)match(input,36,FOLLOW_36_in_ruleXMemberFeatureCall10574); if (state.failed) return current;
+            	            otherlv_2=(Token)match(input,36,FOLLOW_70); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                  	newLeafNode(otherlv_2, grammarAccess.getXMemberFeatureCallAccess().getFullStopKeyword_1_0_0_0_1_0());
@@ -13132,15 +13132,15 @@ else if ( (LA79_0==86) ) {
             	            }
             	            break;
             	        case 2 :
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4369:6: ( (lv_explicitStatic_3_0= '::' ) )
+            	            // InternalFormat.g:4369:6: ( (lv_explicitStatic_3_0= '::' ) )
             	            {
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4369:6: ( (lv_explicitStatic_3_0= '::' ) )
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4370:1: (lv_explicitStatic_3_0= '::' )
+            	            // InternalFormat.g:4369:6: ( (lv_explicitStatic_3_0= '::' ) )
+            	            // InternalFormat.g:4370:1: (lv_explicitStatic_3_0= '::' )
             	            {
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4370:1: (lv_explicitStatic_3_0= '::' )
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4371:3: lv_explicitStatic_3_0= '::'
+            	            // InternalFormat.g:4370:1: (lv_explicitStatic_3_0= '::' )
+            	            // InternalFormat.g:4371:3: lv_explicitStatic_3_0= '::'
             	            {
-            	            lv_explicitStatic_3_0=(Token)match(input,86,FOLLOW_86_in_ruleXMemberFeatureCall10598); if (state.failed) return current;
+            	            lv_explicitStatic_3_0=(Token)match(input,86,FOLLOW_70); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_explicitStatic_3_0, grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_0_0_0_1_1_0());
@@ -13166,11 +13166,11 @@ else if ( (LA79_0==86) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4384:3: ( ( ruleFeatureCallID ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4385:1: ( ruleFeatureCallID )
+            	    // InternalFormat.g:4384:3: ( ( ruleFeatureCallID ) )
+            	    // InternalFormat.g:4385:1: ( ruleFeatureCallID )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4385:1: ( ruleFeatureCallID )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4386:3: ruleFeatureCallID
+            	    // InternalFormat.g:4385:1: ( ruleFeatureCallID )
+            	    // InternalFormat.g:4386:3: ruleFeatureCallID
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -13184,7 +13184,7 @@ else if ( (LA79_0==86) ) {
             	      	        newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getFeatureJvmIdentifiableElementCrossReference_1_0_0_0_2_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleFeatureCallID_in_ruleXMemberFeatureCall10635);
+            	    pushFollow(FOLLOW_13);
             	    ruleFeatureCallID();
 
             	    state._fsp--;
@@ -13205,7 +13205,7 @@ else if ( (LA79_0==86) ) {
             	              newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getOpSingleAssignParserRuleCall_1_0_0_0_3()); 
             	          
             	    }
-            	    pushFollow(FOLLOW_ruleOpSingleAssign_in_ruleXMemberFeatureCall10651);
+            	    pushFollow(FOLLOW_48);
             	    ruleOpSingleAssign();
 
             	    state._fsp--;
@@ -13221,18 +13221,18 @@ else if ( (LA79_0==86) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4407:3: ( (lv_value_6_0= ruleXAssignment ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4408:1: (lv_value_6_0= ruleXAssignment )
+            	    // InternalFormat.g:4407:3: ( (lv_value_6_0= ruleXAssignment ) )
+            	    // InternalFormat.g:4408:1: (lv_value_6_0= ruleXAssignment )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4408:1: (lv_value_6_0= ruleXAssignment )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4409:3: lv_value_6_0= ruleXAssignment
+            	    // InternalFormat.g:4408:1: (lv_value_6_0= ruleXAssignment )
+            	    // InternalFormat.g:4409:3: lv_value_6_0= ruleXAssignment
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getValueXAssignmentParserRuleCall_1_0_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXAssignment_in_ruleXMemberFeatureCall10673);
+            	    pushFollow(FOLLOW_69);
             	    lv_value_6_0=ruleXAssignment();
 
             	    state._fsp--;
@@ -13246,7 +13246,7 @@ else if ( (LA79_0==86) ) {
             	             			current, 
             	             			"value",
             	              		lv_value_6_0, 
-            	              		"XAssignment");
+            	              		"org.eclipse.xtext.xbase.Xbase.XAssignment");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -13263,19 +13263,19 @@ else if ( (LA79_0==86) ) {
             	    }
             	    break;
             	case 2 :
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4426:6: ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? )
+            	    // InternalFormat.g:4426:6: ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4426:6: ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4426:7: ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )?
+            	    // InternalFormat.g:4426:6: ( ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )? )
+            	    // InternalFormat.g:4426:7: ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) ) (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )? ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )?
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4426:7: ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4426:8: ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) )
+            	    // InternalFormat.g:4426:7: ( ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) ) )
+            	    // InternalFormat.g:4426:8: ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )=> ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4442:7: ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4442:8: () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) )
+            	    // InternalFormat.g:4442:7: ( () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) )
+            	    // InternalFormat.g:4442:8: () (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4442:8: ()
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4443:5: 
+            	    // InternalFormat.g:4442:8: ()
+            	    // InternalFormat.g:4443:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -13287,7 +13287,7 @@ else if ( (LA79_0==86) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4448:2: (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) )
+            	    // InternalFormat.g:4448:2: (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) )
             	    int alt80=3;
             	    switch ( input.LA(1) ) {
             	    case 36:
@@ -13315,9 +13315,9 @@ else if ( (LA79_0==86) ) {
 
             	    switch (alt80) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4448:4: otherlv_8= '.'
+            	            // InternalFormat.g:4448:4: otherlv_8= '.'
             	            {
-            	            otherlv_8=(Token)match(input,36,FOLLOW_36_in_ruleXMemberFeatureCall10759); if (state.failed) return current;
+            	            otherlv_8=(Token)match(input,36,FOLLOW_71); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                  	newLeafNode(otherlv_8, grammarAccess.getXMemberFeatureCallAccess().getFullStopKeyword_1_1_0_0_1_0());
@@ -13327,15 +13327,15 @@ else if ( (LA79_0==86) ) {
             	            }
             	            break;
             	        case 2 :
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4453:6: ( (lv_nullSafe_9_0= '?.' ) )
+            	            // InternalFormat.g:4453:6: ( (lv_nullSafe_9_0= '?.' ) )
             	            {
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4453:6: ( (lv_nullSafe_9_0= '?.' ) )
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4454:1: (lv_nullSafe_9_0= '?.' )
+            	            // InternalFormat.g:4453:6: ( (lv_nullSafe_9_0= '?.' ) )
+            	            // InternalFormat.g:4454:1: (lv_nullSafe_9_0= '?.' )
             	            {
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4454:1: (lv_nullSafe_9_0= '?.' )
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4455:3: lv_nullSafe_9_0= '?.'
+            	            // InternalFormat.g:4454:1: (lv_nullSafe_9_0= '?.' )
+            	            // InternalFormat.g:4455:3: lv_nullSafe_9_0= '?.'
             	            {
-            	            lv_nullSafe_9_0=(Token)match(input,87,FOLLOW_87_in_ruleXMemberFeatureCall10783); if (state.failed) return current;
+            	            lv_nullSafe_9_0=(Token)match(input,87,FOLLOW_71); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_nullSafe_9_0, grammarAccess.getXMemberFeatureCallAccess().getNullSafeQuestionMarkFullStopKeyword_1_1_0_0_1_1_0());
@@ -13359,15 +13359,15 @@ else if ( (LA79_0==86) ) {
             	            }
             	            break;
             	        case 3 :
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4469:6: ( (lv_explicitStatic_10_0= '::' ) )
+            	            // InternalFormat.g:4469:6: ( (lv_explicitStatic_10_0= '::' ) )
             	            {
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4469:6: ( (lv_explicitStatic_10_0= '::' ) )
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4470:1: (lv_explicitStatic_10_0= '::' )
+            	            // InternalFormat.g:4469:6: ( (lv_explicitStatic_10_0= '::' ) )
+            	            // InternalFormat.g:4470:1: (lv_explicitStatic_10_0= '::' )
             	            {
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4470:1: (lv_explicitStatic_10_0= '::' )
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4471:3: lv_explicitStatic_10_0= '::'
+            	            // InternalFormat.g:4470:1: (lv_explicitStatic_10_0= '::' )
+            	            // InternalFormat.g:4471:3: lv_explicitStatic_10_0= '::'
             	            {
-            	            lv_explicitStatic_10_0=(Token)match(input,86,FOLLOW_86_in_ruleXMemberFeatureCall10820); if (state.failed) return current;
+            	            lv_explicitStatic_10_0=(Token)match(input,86,FOLLOW_71); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_explicitStatic_10_0, grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_1_0_0_1_2_0());
@@ -13399,7 +13399,7 @@ else if ( (LA79_0==86) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4484:5: (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )?
+            	    // InternalFormat.g:4484:5: (otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' )?
             	    int alt82=2;
             	    int LA82_0 = input.LA(1);
 
@@ -13408,26 +13408,26 @@ else if ( (LA79_0==86) ) {
             	    }
             	    switch (alt82) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4484:7: otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>'
+            	            // InternalFormat.g:4484:7: otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>'
             	            {
-            	            otherlv_11=(Token)match(input,62,FOLLOW_62_in_ruleXMemberFeatureCall10849); if (state.failed) return current;
+            	            otherlv_11=(Token)match(input,62,FOLLOW_72); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                  	newLeafNode(otherlv_11, grammarAccess.getXMemberFeatureCallAccess().getLessThanSignKeyword_1_1_1_0());
             	                  
             	            }
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4488:1: ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) )
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4489:1: (lv_typeArguments_12_0= ruleJvmArgumentTypeReference )
+            	            // InternalFormat.g:4488:1: ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) )
+            	            // InternalFormat.g:4489:1: (lv_typeArguments_12_0= ruleJvmArgumentTypeReference )
             	            {
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4489:1: (lv_typeArguments_12_0= ruleJvmArgumentTypeReference )
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4490:3: lv_typeArguments_12_0= ruleJvmArgumentTypeReference
+            	            // InternalFormat.g:4489:1: (lv_typeArguments_12_0= ruleJvmArgumentTypeReference )
+            	            // InternalFormat.g:4490:3: lv_typeArguments_12_0= ruleJvmArgumentTypeReference
             	            {
             	            if ( state.backtracking==0 ) {
             	               
             	              	        newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_1_1_0()); 
             	              	    
             	            }
-            	            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleXMemberFeatureCall10870);
+            	            pushFollow(FOLLOW_73);
             	            lv_typeArguments_12_0=ruleJvmArgumentTypeReference();
 
             	            state._fsp--;
@@ -13441,7 +13441,7 @@ else if ( (LA79_0==86) ) {
             	                     			current, 
             	                     			"typeArguments",
             	                      		lv_typeArguments_12_0, 
-            	                      		"JvmArgumentTypeReference");
+            	                      		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
             	              	        afterParserOrEnumRuleCall();
             	              	    
             	            }
@@ -13451,7 +13451,7 @@ else if ( (LA79_0==86) ) {
 
             	            }
 
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4506:2: (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )*
+            	            // InternalFormat.g:4506:2: (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )*
             	            loop81:
             	            do {
             	                int alt81=2;
@@ -13464,26 +13464,26 @@ else if ( (LA79_0==86) ) {
 
             	                switch (alt81) {
             	            	case 1 :
-            	            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4506:4: otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) )
+            	            	    // InternalFormat.g:4506:4: otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) )
             	            	    {
-            	            	    otherlv_13=(Token)match(input,28,FOLLOW_28_in_ruleXMemberFeatureCall10883); if (state.failed) return current;
+            	            	    otherlv_13=(Token)match(input,28,FOLLOW_72); if (state.failed) return current;
             	            	    if ( state.backtracking==0 ) {
 
             	            	          	newLeafNode(otherlv_13, grammarAccess.getXMemberFeatureCallAccess().getCommaKeyword_1_1_1_2_0());
             	            	          
             	            	    }
-            	            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4510:1: ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) )
-            	            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4511:1: (lv_typeArguments_14_0= ruleJvmArgumentTypeReference )
+            	            	    // InternalFormat.g:4510:1: ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) )
+            	            	    // InternalFormat.g:4511:1: (lv_typeArguments_14_0= ruleJvmArgumentTypeReference )
             	            	    {
-            	            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4511:1: (lv_typeArguments_14_0= ruleJvmArgumentTypeReference )
-            	            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4512:3: lv_typeArguments_14_0= ruleJvmArgumentTypeReference
+            	            	    // InternalFormat.g:4511:1: (lv_typeArguments_14_0= ruleJvmArgumentTypeReference )
+            	            	    // InternalFormat.g:4512:3: lv_typeArguments_14_0= ruleJvmArgumentTypeReference
             	            	    {
             	            	    if ( state.backtracking==0 ) {
             	            	       
             	            	      	        newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_1_2_1_0()); 
             	            	      	    
             	            	    }
-            	            	    pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleXMemberFeatureCall10904);
+            	            	    pushFollow(FOLLOW_73);
             	            	    lv_typeArguments_14_0=ruleJvmArgumentTypeReference();
 
             	            	    state._fsp--;
@@ -13497,7 +13497,7 @@ else if ( (LA79_0==86) ) {
             	            	             			current, 
             	            	             			"typeArguments",
             	            	              		lv_typeArguments_14_0, 
-            	            	              		"JvmArgumentTypeReference");
+            	            	              		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
             	            	      	        afterParserOrEnumRuleCall();
             	            	      	    
             	            	    }
@@ -13516,7 +13516,7 @@ else if ( (LA79_0==86) ) {
             	                }
             	            } while (true);
 
-            	            otherlv_15=(Token)match(input,63,FOLLOW_63_in_ruleXMemberFeatureCall10918); if (state.failed) return current;
+            	            otherlv_15=(Token)match(input,63,FOLLOW_71); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                  	newLeafNode(otherlv_15, grammarAccess.getXMemberFeatureCallAccess().getGreaterThanSignKeyword_1_1_1_3());
@@ -13528,11 +13528,11 @@ else if ( (LA79_0==86) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4532:3: ( ( ruleIdOrSuper ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4533:1: ( ruleIdOrSuper )
+            	    // InternalFormat.g:4532:3: ( ( ruleIdOrSuper ) )
+            	    // InternalFormat.g:4533:1: ( ruleIdOrSuper )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4533:1: ( ruleIdOrSuper )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4534:3: ruleIdOrSuper
+            	    // InternalFormat.g:4533:1: ( ruleIdOrSuper )
+            	    // InternalFormat.g:4534:3: ruleIdOrSuper
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -13546,7 +13546,7 @@ else if ( (LA79_0==86) ) {
             	      	        newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getFeatureJvmIdentifiableElementCrossReference_1_1_2_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleIdOrSuper_in_ruleXMemberFeatureCall10943);
+            	    pushFollow(FOLLOW_74);
             	    ruleIdOrSuper();
 
             	    state._fsp--;
@@ -13562,20 +13562,20 @@ else if ( (LA79_0==86) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4547:2: ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )?
+            	    // InternalFormat.g:4547:2: ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )?
             	    int alt85=2;
             	    alt85 = dfa85.predict(input);
             	    switch (alt85) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4547:3: ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')'
+            	            // InternalFormat.g:4547:3: ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')'
             	            {
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4547:3: ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) )
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4547:4: ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' )
+            	            // InternalFormat.g:4547:3: ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) )
+            	            // InternalFormat.g:4547:4: ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' )
             	            {
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4554:1: (lv_explicitOperationCall_17_0= '(' )
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4555:3: lv_explicitOperationCall_17_0= '('
+            	            // InternalFormat.g:4554:1: (lv_explicitOperationCall_17_0= '(' )
+            	            // InternalFormat.g:4555:3: lv_explicitOperationCall_17_0= '('
             	            {
-            	            lv_explicitOperationCall_17_0=(Token)match(input,33,FOLLOW_33_in_ruleXMemberFeatureCall10977); if (state.failed) return current;
+            	            lv_explicitOperationCall_17_0=(Token)match(input,33,FOLLOW_75); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_explicitOperationCall_17_0, grammarAccess.getXMemberFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_1_1_3_0_0());
@@ -13595,25 +13595,25 @@ else if ( (LA79_0==86) ) {
 
             	            }
 
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4568:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )?
+            	            // InternalFormat.g:4568:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )?
             	            int alt84=3;
             	            alt84 = dfa84.predict(input);
             	            switch (alt84) {
             	                case 1 :
-            	                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4568:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) )
+            	                    // InternalFormat.g:4568:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) )
             	                    {
-            	                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4568:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) )
-            	                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4568:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure )
+            	                    // InternalFormat.g:4568:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) )
+            	                    // InternalFormat.g:4568:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure )
             	                    {
-            	                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4585:1: (lv_memberCallArguments_18_0= ruleXShortClosure )
-            	                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4586:3: lv_memberCallArguments_18_0= ruleXShortClosure
+            	                    // InternalFormat.g:4585:1: (lv_memberCallArguments_18_0= ruleXShortClosure )
+            	                    // InternalFormat.g:4586:3: lv_memberCallArguments_18_0= ruleXShortClosure
             	                    {
             	                    if ( state.backtracking==0 ) {
             	                       
             	                      	        newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXShortClosureParserRuleCall_1_1_3_1_0_0()); 
             	                      	    
             	                    }
-            	                    pushFollow(FOLLOW_ruleXShortClosure_in_ruleXMemberFeatureCall11062);
+            	                    pushFollow(FOLLOW_30);
             	                    lv_memberCallArguments_18_0=ruleXShortClosure();
 
             	                    state._fsp--;
@@ -13627,7 +13627,7 @@ else if ( (LA79_0==86) ) {
             	                             			current, 
             	                             			"memberCallArguments",
             	                              		lv_memberCallArguments_18_0, 
-            	                              		"XShortClosure");
+            	                              		"org.eclipse.xtext.xbase.Xbase.XShortClosure");
             	                      	        afterParserOrEnumRuleCall();
             	                      	    
             	                    }
@@ -13641,23 +13641,23 @@ else if ( (LA79_0==86) ) {
             	                    }
             	                    break;
             	                case 2 :
-            	                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4603:6: ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* )
+            	                    // InternalFormat.g:4603:6: ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* )
             	                    {
-            	                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4603:6: ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* )
-            	                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4603:7: ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )*
+            	                    // InternalFormat.g:4603:6: ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* )
+            	                    // InternalFormat.g:4603:7: ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )*
             	                    {
-            	                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4603:7: ( (lv_memberCallArguments_19_0= ruleXExpression ) )
-            	                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4604:1: (lv_memberCallArguments_19_0= ruleXExpression )
+            	                    // InternalFormat.g:4603:7: ( (lv_memberCallArguments_19_0= ruleXExpression ) )
+            	                    // InternalFormat.g:4604:1: (lv_memberCallArguments_19_0= ruleXExpression )
             	                    {
-            	                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4604:1: (lv_memberCallArguments_19_0= ruleXExpression )
-            	                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4605:3: lv_memberCallArguments_19_0= ruleXExpression
+            	                    // InternalFormat.g:4604:1: (lv_memberCallArguments_19_0= ruleXExpression )
+            	                    // InternalFormat.g:4605:3: lv_memberCallArguments_19_0= ruleXExpression
             	                    {
             	                    if ( state.backtracking==0 ) {
             	                       
             	                      	        newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXExpressionParserRuleCall_1_1_3_1_1_0_0()); 
             	                      	    
             	                    }
-            	                    pushFollow(FOLLOW_ruleXExpression_in_ruleXMemberFeatureCall11090);
+            	                    pushFollow(FOLLOW_47);
             	                    lv_memberCallArguments_19_0=ruleXExpression();
 
             	                    state._fsp--;
@@ -13671,7 +13671,7 @@ else if ( (LA79_0==86) ) {
             	                             			current, 
             	                             			"memberCallArguments",
             	                              		lv_memberCallArguments_19_0, 
-            	                              		"XExpression");
+            	                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
             	                      	        afterParserOrEnumRuleCall();
             	                      	    
             	                    }
@@ -13681,7 +13681,7 @@ else if ( (LA79_0==86) ) {
 
             	                    }
 
-            	                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4621:2: (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )*
+            	                    // InternalFormat.g:4621:2: (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )*
             	                    loop83:
             	                    do {
             	                        int alt83=2;
@@ -13694,26 +13694,26 @@ else if ( (LA79_0==86) ) {
 
             	                        switch (alt83) {
             	                    	case 1 :
-            	                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4621:4: otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) )
+            	                    	    // InternalFormat.g:4621:4: otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) )
             	                    	    {
-            	                    	    otherlv_20=(Token)match(input,28,FOLLOW_28_in_ruleXMemberFeatureCall11103); if (state.failed) return current;
+            	                    	    otherlv_20=(Token)match(input,28,FOLLOW_48); if (state.failed) return current;
             	                    	    if ( state.backtracking==0 ) {
 
             	                    	          	newLeafNode(otherlv_20, grammarAccess.getXMemberFeatureCallAccess().getCommaKeyword_1_1_3_1_1_1_0());
             	                    	          
             	                    	    }
-            	                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4625:1: ( (lv_memberCallArguments_21_0= ruleXExpression ) )
-            	                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4626:1: (lv_memberCallArguments_21_0= ruleXExpression )
+            	                    	    // InternalFormat.g:4625:1: ( (lv_memberCallArguments_21_0= ruleXExpression ) )
+            	                    	    // InternalFormat.g:4626:1: (lv_memberCallArguments_21_0= ruleXExpression )
             	                    	    {
-            	                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4626:1: (lv_memberCallArguments_21_0= ruleXExpression )
-            	                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4627:3: lv_memberCallArguments_21_0= ruleXExpression
+            	                    	    // InternalFormat.g:4626:1: (lv_memberCallArguments_21_0= ruleXExpression )
+            	                    	    // InternalFormat.g:4627:3: lv_memberCallArguments_21_0= ruleXExpression
             	                    	    {
             	                    	    if ( state.backtracking==0 ) {
             	                    	       
             	                    	      	        newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXExpressionParserRuleCall_1_1_3_1_1_1_1_0()); 
             	                    	      	    
             	                    	    }
-            	                    	    pushFollow(FOLLOW_ruleXExpression_in_ruleXMemberFeatureCall11124);
+            	                    	    pushFollow(FOLLOW_47);
             	                    	    lv_memberCallArguments_21_0=ruleXExpression();
 
             	                    	    state._fsp--;
@@ -13727,7 +13727,7 @@ else if ( (LA79_0==86) ) {
             	                    	             			current, 
             	                    	             			"memberCallArguments",
             	                    	              		lv_memberCallArguments_21_0, 
-            	                    	              		"XExpression");
+            	                    	              		"org.eclipse.xtext.xbase.Xbase.XExpression");
             	                    	      	        afterParserOrEnumRuleCall();
             	                    	      	    
             	                    	    }
@@ -13755,7 +13755,7 @@ else if ( (LA79_0==86) ) {
 
             	            }
 
-            	            otherlv_22=(Token)match(input,34,FOLLOW_34_in_ruleXMemberFeatureCall11141); if (state.failed) return current;
+            	            otherlv_22=(Token)match(input,34,FOLLOW_76); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                  	newLeafNode(otherlv_22, grammarAccess.getXMemberFeatureCallAccess().getRightParenthesisKeyword_1_1_3_2());
@@ -13767,22 +13767,22 @@ else if ( (LA79_0==86) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4647:3: ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )?
+            	    // InternalFormat.g:4647:3: ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )?
             	    int alt86=2;
             	    alt86 = dfa86.predict(input);
             	    switch (alt86) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4647:4: ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure )
+            	            // InternalFormat.g:4647:4: ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure )
             	            {
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4650:1: (lv_memberCallArguments_23_0= ruleXClosure )
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4651:3: lv_memberCallArguments_23_0= ruleXClosure
+            	            // InternalFormat.g:4650:1: (lv_memberCallArguments_23_0= ruleXClosure )
+            	            // InternalFormat.g:4651:3: lv_memberCallArguments_23_0= ruleXClosure
             	            {
             	            if ( state.backtracking==0 ) {
             	               
             	              	        newCompositeNode(grammarAccess.getXMemberFeatureCallAccess().getMemberCallArgumentsXClosureParserRuleCall_1_1_4_0()); 
             	              	    
             	            }
-            	            pushFollow(FOLLOW_ruleXClosure_in_ruleXMemberFeatureCall11176);
+            	            pushFollow(FOLLOW_69);
             	            lv_memberCallArguments_23_0=ruleXClosure();
 
             	            state._fsp--;
@@ -13796,7 +13796,7 @@ else if ( (LA79_0==86) ) {
             	                     			current, 
             	                     			"memberCallArguments",
             	                      		lv_memberCallArguments_23_0, 
-            	                      		"XClosure");
+            	                      		"org.eclipse.xtext.xbase.Xbase.XClosure");
             	              	        afterParserOrEnumRuleCall();
             	              	    
             	            }
@@ -13844,7 +13844,7 @@ else if ( (LA79_0==86) ) {
 
 
     // $ANTLR start "entryRuleXPrimaryExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4675:1: entryRuleXPrimaryExpression returns [EObject current=null] : iv_ruleXPrimaryExpression= ruleXPrimaryExpression EOF ;
+    // InternalFormat.g:4675:1: entryRuleXPrimaryExpression returns [EObject current=null] : iv_ruleXPrimaryExpression= ruleXPrimaryExpression EOF ;
     public final EObject entryRuleXPrimaryExpression() throws RecognitionException {
         EObject current = null;
 
@@ -13852,13 +13852,13 @@ public final EObject entryRuleXPrimaryExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4676:2: (iv_ruleXPrimaryExpression= ruleXPrimaryExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4677:2: iv_ruleXPrimaryExpression= ruleXPrimaryExpression EOF
+            // InternalFormat.g:4676:2: (iv_ruleXPrimaryExpression= ruleXPrimaryExpression EOF )
+            // InternalFormat.g:4677:2: iv_ruleXPrimaryExpression= ruleXPrimaryExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXPrimaryExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXPrimaryExpression_in_entryRuleXPrimaryExpression11216);
+            pushFollow(FOLLOW_1);
             iv_ruleXPrimaryExpression=ruleXPrimaryExpression();
 
             state._fsp--;
@@ -13866,7 +13866,7 @@ public final EObject entryRuleXPrimaryExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXPrimaryExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXPrimaryExpression11226); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -13884,7 +13884,7 @@ public final EObject entryRuleXPrimaryExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXPrimaryExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4684:1: ruleXPrimaryExpression returns [EObject current=null] : (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression ) ;
+    // InternalFormat.g:4684:1: ruleXPrimaryExpression returns [EObject current=null] : (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression ) ;
     public final EObject ruleXPrimaryExpression() throws RecognitionException {
         EObject current = null;
 
@@ -13922,22 +13922,22 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4687:28: ( (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4688:1: (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression )
+            // InternalFormat.g:4687:28: ( (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression ) )
+            // InternalFormat.g:4688:1: (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4688:1: (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression )
+            // InternalFormat.g:4688:1: (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression )
             int alt88=15;
             alt88 = dfa88.predict(input);
             switch (alt88) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4689:5: this_XConstructorCall_0= ruleXConstructorCall
+                    // InternalFormat.g:4689:5: this_XConstructorCall_0= ruleXConstructorCall
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXConstructorCallParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXConstructorCall_in_ruleXPrimaryExpression11273);
+                    pushFollow(FOLLOW_2);
                     this_XConstructorCall_0=ruleXConstructorCall();
 
                     state._fsp--;
@@ -13952,14 +13952,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4699:5: this_XBlockExpression_1= ruleXBlockExpression
+                    // InternalFormat.g:4699:5: this_XBlockExpression_1= ruleXBlockExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXBlockExpressionParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXBlockExpression_in_ruleXPrimaryExpression11300);
+                    pushFollow(FOLLOW_2);
                     this_XBlockExpression_1=ruleXBlockExpression();
 
                     state._fsp--;
@@ -13974,14 +13974,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4709:5: this_XSwitchExpression_2= ruleXSwitchExpression
+                    // InternalFormat.g:4709:5: this_XSwitchExpression_2= ruleXSwitchExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXSwitchExpressionParserRuleCall_2()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXSwitchExpression_in_ruleXPrimaryExpression11327);
+                    pushFollow(FOLLOW_2);
                     this_XSwitchExpression_2=ruleXSwitchExpression();
 
                     state._fsp--;
@@ -13996,17 +13996,17 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4718:6: ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression )
+                    // InternalFormat.g:4718:6: ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4718:6: ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4718:7: ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression
+                    // InternalFormat.g:4718:6: ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression )
+                    // InternalFormat.g:4718:7: ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXSynchronizedExpressionParserRuleCall_3()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXSynchronizedExpression_in_ruleXPrimaryExpression11371);
+                    pushFollow(FOLLOW_2);
                     this_XSynchronizedExpression_3=ruleXSynchronizedExpression();
 
                     state._fsp--;
@@ -14024,14 +14024,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4732:5: this_XFeatureCall_4= ruleXFeatureCall
+                    // InternalFormat.g:4732:5: this_XFeatureCall_4= ruleXFeatureCall
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXFeatureCallParserRuleCall_4()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXFeatureCall_in_ruleXPrimaryExpression11399);
+                    pushFollow(FOLLOW_2);
                     this_XFeatureCall_4=ruleXFeatureCall();
 
                     state._fsp--;
@@ -14046,14 +14046,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4742:5: this_XLiteral_5= ruleXLiteral
+                    // InternalFormat.g:4742:5: this_XLiteral_5= ruleXLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXLiteralParserRuleCall_5()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXLiteral_in_ruleXPrimaryExpression11426);
+                    pushFollow(FOLLOW_2);
                     this_XLiteral_5=ruleXLiteral();
 
                     state._fsp--;
@@ -14068,14 +14068,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4752:5: this_XIfExpression_6= ruleXIfExpression
+                    // InternalFormat.g:4752:5: this_XIfExpression_6= ruleXIfExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXIfExpressionParserRuleCall_6()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXIfExpression_in_ruleXPrimaryExpression11453);
+                    pushFollow(FOLLOW_2);
                     this_XIfExpression_6=ruleXIfExpression();
 
                     state._fsp--;
@@ -14090,17 +14090,17 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 8 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4761:6: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression )
+                    // InternalFormat.g:4761:6: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4761:6: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4761:7: ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression
+                    // InternalFormat.g:4761:6: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression )
+                    // InternalFormat.g:4761:7: ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXForLoopExpressionParserRuleCall_7()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXForLoopExpression_in_ruleXPrimaryExpression11510);
+                    pushFollow(FOLLOW_2);
                     this_XForLoopExpression_7=ruleXForLoopExpression();
 
                     state._fsp--;
@@ -14118,14 +14118,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 9 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4780:5: this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression
+                    // InternalFormat.g:4780:5: this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXBasicForLoopExpressionParserRuleCall_8()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXBasicForLoopExpression_in_ruleXPrimaryExpression11538);
+                    pushFollow(FOLLOW_2);
                     this_XBasicForLoopExpression_8=ruleXBasicForLoopExpression();
 
                     state._fsp--;
@@ -14140,14 +14140,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 10 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4790:5: this_XWhileExpression_9= ruleXWhileExpression
+                    // InternalFormat.g:4790:5: this_XWhileExpression_9= ruleXWhileExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXWhileExpressionParserRuleCall_9()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXWhileExpression_in_ruleXPrimaryExpression11565);
+                    pushFollow(FOLLOW_2);
                     this_XWhileExpression_9=ruleXWhileExpression();
 
                     state._fsp--;
@@ -14162,14 +14162,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 11 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4800:5: this_XDoWhileExpression_10= ruleXDoWhileExpression
+                    // InternalFormat.g:4800:5: this_XDoWhileExpression_10= ruleXDoWhileExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXDoWhileExpressionParserRuleCall_10()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXDoWhileExpression_in_ruleXPrimaryExpression11592);
+                    pushFollow(FOLLOW_2);
                     this_XDoWhileExpression_10=ruleXDoWhileExpression();
 
                     state._fsp--;
@@ -14184,14 +14184,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 12 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4810:5: this_XThrowExpression_11= ruleXThrowExpression
+                    // InternalFormat.g:4810:5: this_XThrowExpression_11= ruleXThrowExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXThrowExpressionParserRuleCall_11()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXThrowExpression_in_ruleXPrimaryExpression11619);
+                    pushFollow(FOLLOW_2);
                     this_XThrowExpression_11=ruleXThrowExpression();
 
                     state._fsp--;
@@ -14206,14 +14206,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 13 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4820:5: this_XReturnExpression_12= ruleXReturnExpression
+                    // InternalFormat.g:4820:5: this_XReturnExpression_12= ruleXReturnExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXReturnExpressionParserRuleCall_12()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXReturnExpression_in_ruleXPrimaryExpression11646);
+                    pushFollow(FOLLOW_2);
                     this_XReturnExpression_12=ruleXReturnExpression();
 
                     state._fsp--;
@@ -14228,14 +14228,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 14 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4830:5: this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression
+                    // InternalFormat.g:4830:5: this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXTryCatchFinallyExpressionParserRuleCall_13()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXTryCatchFinallyExpression_in_ruleXPrimaryExpression11673);
+                    pushFollow(FOLLOW_2);
                     this_XTryCatchFinallyExpression_13=ruleXTryCatchFinallyExpression();
 
                     state._fsp--;
@@ -14250,14 +14250,14 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 15 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4840:5: this_XParenthesizedExpression_14= ruleXParenthesizedExpression
+                    // InternalFormat.g:4840:5: this_XParenthesizedExpression_14= ruleXParenthesizedExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXPrimaryExpressionAccess().getXParenthesizedExpressionParserRuleCall_14()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXParenthesizedExpression_in_ruleXPrimaryExpression11700);
+                    pushFollow(FOLLOW_2);
                     this_XParenthesizedExpression_14=ruleXParenthesizedExpression();
 
                     state._fsp--;
@@ -14294,7 +14294,7 @@ public final EObject ruleXPrimaryExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXLiteral"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4856:1: entryRuleXLiteral returns [EObject current=null] : iv_ruleXLiteral= ruleXLiteral EOF ;
+    // InternalFormat.g:4856:1: entryRuleXLiteral returns [EObject current=null] : iv_ruleXLiteral= ruleXLiteral EOF ;
     public final EObject entryRuleXLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -14302,13 +14302,13 @@ public final EObject entryRuleXLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4857:2: (iv_ruleXLiteral= ruleXLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4858:2: iv_ruleXLiteral= ruleXLiteral EOF
+            // InternalFormat.g:4857:2: (iv_ruleXLiteral= ruleXLiteral EOF )
+            // InternalFormat.g:4858:2: iv_ruleXLiteral= ruleXLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXLiteral_in_entryRuleXLiteral11735);
+            pushFollow(FOLLOW_1);
             iv_ruleXLiteral=ruleXLiteral();
 
             state._fsp--;
@@ -14316,7 +14316,7 @@ public final EObject entryRuleXLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXLiteral11745); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -14334,7 +14334,7 @@ public final EObject entryRuleXLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXLiteral"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4865:1: ruleXLiteral returns [EObject current=null] : (this_XCollectionLiteral_0= ruleXCollectionLiteral | ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure ) | this_XBooleanLiteral_2= ruleXBooleanLiteral | this_XNumberLiteral_3= ruleXNumberLiteral | this_XNullLiteral_4= ruleXNullLiteral | this_XStringLiteral_5= ruleXStringLiteral | this_XTypeLiteral_6= ruleXTypeLiteral ) ;
+    // InternalFormat.g:4865:1: ruleXLiteral returns [EObject current=null] : (this_XCollectionLiteral_0= ruleXCollectionLiteral | ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure ) | this_XBooleanLiteral_2= ruleXBooleanLiteral | this_XNumberLiteral_3= ruleXNumberLiteral | this_XNullLiteral_4= ruleXNullLiteral | this_XStringLiteral_5= ruleXStringLiteral | this_XTypeLiteral_6= ruleXTypeLiteral ) ;
     public final EObject ruleXLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -14356,10 +14356,10 @@ public final EObject ruleXLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4868:28: ( (this_XCollectionLiteral_0= ruleXCollectionLiteral | ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure ) | this_XBooleanLiteral_2= ruleXBooleanLiteral | this_XNumberLiteral_3= ruleXNumberLiteral | this_XNullLiteral_4= ruleXNullLiteral | this_XStringLiteral_5= ruleXStringLiteral | this_XTypeLiteral_6= ruleXTypeLiteral ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4869:1: (this_XCollectionLiteral_0= ruleXCollectionLiteral | ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure ) | this_XBooleanLiteral_2= ruleXBooleanLiteral | this_XNumberLiteral_3= ruleXNumberLiteral | this_XNullLiteral_4= ruleXNullLiteral | this_XStringLiteral_5= ruleXStringLiteral | this_XTypeLiteral_6= ruleXTypeLiteral )
+            // InternalFormat.g:4868:28: ( (this_XCollectionLiteral_0= ruleXCollectionLiteral | ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure ) | this_XBooleanLiteral_2= ruleXBooleanLiteral | this_XNumberLiteral_3= ruleXNumberLiteral | this_XNullLiteral_4= ruleXNullLiteral | this_XStringLiteral_5= ruleXStringLiteral | this_XTypeLiteral_6= ruleXTypeLiteral ) )
+            // InternalFormat.g:4869:1: (this_XCollectionLiteral_0= ruleXCollectionLiteral | ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure ) | this_XBooleanLiteral_2= ruleXBooleanLiteral | this_XNumberLiteral_3= ruleXNumberLiteral | this_XNullLiteral_4= ruleXNullLiteral | this_XStringLiteral_5= ruleXStringLiteral | this_XTypeLiteral_6= ruleXTypeLiteral )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4869:1: (this_XCollectionLiteral_0= ruleXCollectionLiteral | ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure ) | this_XBooleanLiteral_2= ruleXBooleanLiteral | this_XNumberLiteral_3= ruleXNumberLiteral | this_XNullLiteral_4= ruleXNullLiteral | this_XStringLiteral_5= ruleXStringLiteral | this_XTypeLiteral_6= ruleXTypeLiteral )
+            // InternalFormat.g:4869:1: (this_XCollectionLiteral_0= ruleXCollectionLiteral | ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure ) | this_XBooleanLiteral_2= ruleXBooleanLiteral | this_XNumberLiteral_3= ruleXNumberLiteral | this_XNullLiteral_4= ruleXNullLiteral | this_XStringLiteral_5= ruleXStringLiteral | this_XTypeLiteral_6= ruleXTypeLiteral )
             int alt89=7;
             int LA89_0 = input.LA(1);
 
@@ -14393,14 +14393,14 @@ else if ( (LA89_0==104) ) {
             }
             switch (alt89) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4870:5: this_XCollectionLiteral_0= ruleXCollectionLiteral
+                    // InternalFormat.g:4870:5: this_XCollectionLiteral_0= ruleXCollectionLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXLiteralAccess().getXCollectionLiteralParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXCollectionLiteral_in_ruleXLiteral11792);
+                    pushFollow(FOLLOW_2);
                     this_XCollectionLiteral_0=ruleXCollectionLiteral();
 
                     state._fsp--;
@@ -14415,17 +14415,17 @@ else if ( (LA89_0==104) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4879:6: ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure )
+                    // InternalFormat.g:4879:6: ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4879:6: ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4879:7: ( ( () '[' ) )=>this_XClosure_1= ruleXClosure
+                    // InternalFormat.g:4879:6: ( ( ( () '[' ) )=>this_XClosure_1= ruleXClosure )
+                    // InternalFormat.g:4879:7: ( ( () '[' ) )=>this_XClosure_1= ruleXClosure
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXLiteralAccess().getXClosureParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXClosure_in_ruleXLiteral11832);
+                    pushFollow(FOLLOW_2);
                     this_XClosure_1=ruleXClosure();
 
                     state._fsp--;
@@ -14443,14 +14443,14 @@ else if ( (LA89_0==104) ) {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4892:5: this_XBooleanLiteral_2= ruleXBooleanLiteral
+                    // InternalFormat.g:4892:5: this_XBooleanLiteral_2= ruleXBooleanLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXLiteralAccess().getXBooleanLiteralParserRuleCall_2()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXBooleanLiteral_in_ruleXLiteral11860);
+                    pushFollow(FOLLOW_2);
                     this_XBooleanLiteral_2=ruleXBooleanLiteral();
 
                     state._fsp--;
@@ -14465,14 +14465,14 @@ else if ( (LA89_0==104) ) {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4902:5: this_XNumberLiteral_3= ruleXNumberLiteral
+                    // InternalFormat.g:4902:5: this_XNumberLiteral_3= ruleXNumberLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXLiteralAccess().getXNumberLiteralParserRuleCall_3()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXNumberLiteral_in_ruleXLiteral11887);
+                    pushFollow(FOLLOW_2);
                     this_XNumberLiteral_3=ruleXNumberLiteral();
 
                     state._fsp--;
@@ -14487,14 +14487,14 @@ else if ( (LA89_0==104) ) {
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4912:5: this_XNullLiteral_4= ruleXNullLiteral
+                    // InternalFormat.g:4912:5: this_XNullLiteral_4= ruleXNullLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXLiteralAccess().getXNullLiteralParserRuleCall_4()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXNullLiteral_in_ruleXLiteral11914);
+                    pushFollow(FOLLOW_2);
                     this_XNullLiteral_4=ruleXNullLiteral();
 
                     state._fsp--;
@@ -14509,14 +14509,14 @@ else if ( (LA89_0==104) ) {
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4922:5: this_XStringLiteral_5= ruleXStringLiteral
+                    // InternalFormat.g:4922:5: this_XStringLiteral_5= ruleXStringLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXLiteralAccess().getXStringLiteralParserRuleCall_5()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXStringLiteral_in_ruleXLiteral11941);
+                    pushFollow(FOLLOW_2);
                     this_XStringLiteral_5=ruleXStringLiteral();
 
                     state._fsp--;
@@ -14531,14 +14531,14 @@ else if ( (LA89_0==104) ) {
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4932:5: this_XTypeLiteral_6= ruleXTypeLiteral
+                    // InternalFormat.g:4932:5: this_XTypeLiteral_6= ruleXTypeLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXLiteralAccess().getXTypeLiteralParserRuleCall_6()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXTypeLiteral_in_ruleXLiteral11968);
+                    pushFollow(FOLLOW_2);
                     this_XTypeLiteral_6=ruleXTypeLiteral();
 
                     state._fsp--;
@@ -14575,7 +14575,7 @@ else if ( (LA89_0==104) ) {
 
 
     // $ANTLR start "entryRuleXCollectionLiteral"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4948:1: entryRuleXCollectionLiteral returns [EObject current=null] : iv_ruleXCollectionLiteral= ruleXCollectionLiteral EOF ;
+    // InternalFormat.g:4948:1: entryRuleXCollectionLiteral returns [EObject current=null] : iv_ruleXCollectionLiteral= ruleXCollectionLiteral EOF ;
     public final EObject entryRuleXCollectionLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -14583,13 +14583,13 @@ public final EObject entryRuleXCollectionLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4949:2: (iv_ruleXCollectionLiteral= ruleXCollectionLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4950:2: iv_ruleXCollectionLiteral= ruleXCollectionLiteral EOF
+            // InternalFormat.g:4949:2: (iv_ruleXCollectionLiteral= ruleXCollectionLiteral EOF )
+            // InternalFormat.g:4950:2: iv_ruleXCollectionLiteral= ruleXCollectionLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXCollectionLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXCollectionLiteral_in_entryRuleXCollectionLiteral12003);
+            pushFollow(FOLLOW_1);
             iv_ruleXCollectionLiteral=ruleXCollectionLiteral();
 
             state._fsp--;
@@ -14597,7 +14597,7 @@ public final EObject entryRuleXCollectionLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXCollectionLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXCollectionLiteral12013); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -14615,7 +14615,7 @@ public final EObject entryRuleXCollectionLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXCollectionLiteral"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4957:1: ruleXCollectionLiteral returns [EObject current=null] : (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral ) ;
+    // InternalFormat.g:4957:1: ruleXCollectionLiteral returns [EObject current=null] : (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral ) ;
     public final EObject ruleXCollectionLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -14627,10 +14627,10 @@ public final EObject ruleXCollectionLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4960:28: ( (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4961:1: (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral )
+            // InternalFormat.g:4960:28: ( (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral ) )
+            // InternalFormat.g:4961:1: (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4961:1: (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral )
+            // InternalFormat.g:4961:1: (this_XSetLiteral_0= ruleXSetLiteral | this_XListLiteral_1= ruleXListLiteral )
             int alt90=2;
             int LA90_0 = input.LA(1);
 
@@ -14660,14 +14660,14 @@ else if ( (LA90_1==23) ) {
             }
             switch (alt90) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4962:5: this_XSetLiteral_0= ruleXSetLiteral
+                    // InternalFormat.g:4962:5: this_XSetLiteral_0= ruleXSetLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXCollectionLiteralAccess().getXSetLiteralParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXSetLiteral_in_ruleXCollectionLiteral12060);
+                    pushFollow(FOLLOW_2);
                     this_XSetLiteral_0=ruleXSetLiteral();
 
                     state._fsp--;
@@ -14682,14 +14682,14 @@ else if ( (LA90_1==23) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4972:5: this_XListLiteral_1= ruleXListLiteral
+                    // InternalFormat.g:4972:5: this_XListLiteral_1= ruleXListLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXCollectionLiteralAccess().getXListLiteralParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXListLiteral_in_ruleXCollectionLiteral12087);
+                    pushFollow(FOLLOW_2);
                     this_XListLiteral_1=ruleXListLiteral();
 
                     state._fsp--;
@@ -14726,7 +14726,7 @@ else if ( (LA90_1==23) ) {
 
 
     // $ANTLR start "entryRuleXSetLiteral"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4988:1: entryRuleXSetLiteral returns [EObject current=null] : iv_ruleXSetLiteral= ruleXSetLiteral EOF ;
+    // InternalFormat.g:4988:1: entryRuleXSetLiteral returns [EObject current=null] : iv_ruleXSetLiteral= ruleXSetLiteral EOF ;
     public final EObject entryRuleXSetLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -14734,13 +14734,13 @@ public final EObject entryRuleXSetLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4989:2: (iv_ruleXSetLiteral= ruleXSetLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4990:2: iv_ruleXSetLiteral= ruleXSetLiteral EOF
+            // InternalFormat.g:4989:2: (iv_ruleXSetLiteral= ruleXSetLiteral EOF )
+            // InternalFormat.g:4990:2: iv_ruleXSetLiteral= ruleXSetLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXSetLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXSetLiteral_in_entryRuleXSetLiteral12122);
+            pushFollow(FOLLOW_1);
             iv_ruleXSetLiteral=ruleXSetLiteral();
 
             state._fsp--;
@@ -14748,7 +14748,7 @@ public final EObject entryRuleXSetLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXSetLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXSetLiteral12132); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -14766,7 +14766,7 @@ public final EObject entryRuleXSetLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXSetLiteral"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4997:1: ruleXSetLiteral returns [EObject current=null] : ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' ) ;
+    // InternalFormat.g:4997:1: ruleXSetLiteral returns [EObject current=null] : ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' ) ;
     public final EObject ruleXSetLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -14782,14 +14782,14 @@ public final EObject ruleXSetLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5000:28: ( ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5001:1: ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' )
+            // InternalFormat.g:5000:28: ( ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' ) )
+            // InternalFormat.g:5001:1: ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5001:1: ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5001:2: () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}'
+            // InternalFormat.g:5001:1: ( () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}' )
+            // InternalFormat.g:5001:2: () otherlv_1= '#' otherlv_2= '{' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= '}'
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5001:2: ()
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5002:5: 
+            // InternalFormat.g:5001:2: ()
+            // InternalFormat.g:5002:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -14801,19 +14801,19 @@ public final EObject ruleXSetLiteral() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,56,FOLLOW_56_in_ruleXSetLiteral12178); if (state.failed) return current;
+            otherlv_1=(Token)match(input,56,FOLLOW_15); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXSetLiteralAccess().getNumberSignKeyword_1());
                   
             }
-            otherlv_2=(Token)match(input,23,FOLLOW_23_in_ruleXSetLiteral12190); if (state.failed) return current;
+            otherlv_2=(Token)match(input,23,FOLLOW_77); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getXSetLiteralAccess().getLeftCurlyBracketKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5015:1: ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )?
+            // InternalFormat.g:5015:1: ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )?
             int alt92=2;
             int LA92_0 = input.LA(1);
 
@@ -14822,20 +14822,20 @@ public final EObject ruleXSetLiteral() throws RecognitionException {
             }
             switch (alt92) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5015:2: ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
+                    // InternalFormat.g:5015:2: ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5015:2: ( (lv_elements_3_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5016:1: (lv_elements_3_0= ruleXExpression )
+                    // InternalFormat.g:5015:2: ( (lv_elements_3_0= ruleXExpression ) )
+                    // InternalFormat.g:5016:1: (lv_elements_3_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5016:1: (lv_elements_3_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5017:3: lv_elements_3_0= ruleXExpression
+                    // InternalFormat.g:5016:1: (lv_elements_3_0= ruleXExpression )
+                    // InternalFormat.g:5017:3: lv_elements_3_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXSetLiteralAccess().getElementsXExpressionParserRuleCall_3_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXSetLiteral12212);
+                    pushFollow(FOLLOW_78);
                     lv_elements_3_0=ruleXExpression();
 
                     state._fsp--;
@@ -14849,7 +14849,7 @@ public final EObject ruleXSetLiteral() throws RecognitionException {
                              			current, 
                              			"elements",
                               		lv_elements_3_0, 
-                              		"XExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -14859,7 +14859,7 @@ public final EObject ruleXSetLiteral() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5033:2: (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
+                    // InternalFormat.g:5033:2: (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
                     loop91:
                     do {
                         int alt91=2;
@@ -14872,26 +14872,26 @@ public final EObject ruleXSetLiteral() throws RecognitionException {
 
                         switch (alt91) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5033:4: otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) )
+                    	    // InternalFormat.g:5033:4: otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) )
                     	    {
-                    	    otherlv_4=(Token)match(input,28,FOLLOW_28_in_ruleXSetLiteral12225); if (state.failed) return current;
+                    	    otherlv_4=(Token)match(input,28,FOLLOW_48); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_4, grammarAccess.getXSetLiteralAccess().getCommaKeyword_3_1_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5037:1: ( (lv_elements_5_0= ruleXExpression ) )
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5038:1: (lv_elements_5_0= ruleXExpression )
+                    	    // InternalFormat.g:5037:1: ( (lv_elements_5_0= ruleXExpression ) )
+                    	    // InternalFormat.g:5038:1: (lv_elements_5_0= ruleXExpression )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5038:1: (lv_elements_5_0= ruleXExpression )
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5039:3: lv_elements_5_0= ruleXExpression
+                    	    // InternalFormat.g:5038:1: (lv_elements_5_0= ruleXExpression )
+                    	    // InternalFormat.g:5039:3: lv_elements_5_0= ruleXExpression
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getXSetLiteralAccess().getElementsXExpressionParserRuleCall_3_1_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleXExpression_in_ruleXSetLiteral12246);
+                    	    pushFollow(FOLLOW_78);
                     	    lv_elements_5_0=ruleXExpression();
 
                     	    state._fsp--;
@@ -14905,7 +14905,7 @@ public final EObject ruleXSetLiteral() throws RecognitionException {
                     	             			current, 
                     	             			"elements",
                     	              		lv_elements_5_0, 
-                    	              		"XExpression");
+                    	              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -14930,7 +14930,7 @@ public final EObject ruleXSetLiteral() throws RecognitionException {
 
             }
 
-            otherlv_6=(Token)match(input,24,FOLLOW_24_in_ruleXSetLiteral12262); if (state.failed) return current;
+            otherlv_6=(Token)match(input,24,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_6, grammarAccess.getXSetLiteralAccess().getRightCurlyBracketKeyword_4());
@@ -14959,7 +14959,7 @@ public final EObject ruleXSetLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXListLiteral"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5067:1: entryRuleXListLiteral returns [EObject current=null] : iv_ruleXListLiteral= ruleXListLiteral EOF ;
+    // InternalFormat.g:5067:1: entryRuleXListLiteral returns [EObject current=null] : iv_ruleXListLiteral= ruleXListLiteral EOF ;
     public final EObject entryRuleXListLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -14967,13 +14967,13 @@ public final EObject entryRuleXListLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5068:2: (iv_ruleXListLiteral= ruleXListLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5069:2: iv_ruleXListLiteral= ruleXListLiteral EOF
+            // InternalFormat.g:5068:2: (iv_ruleXListLiteral= ruleXListLiteral EOF )
+            // InternalFormat.g:5069:2: iv_ruleXListLiteral= ruleXListLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXListLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXListLiteral_in_entryRuleXListLiteral12298);
+            pushFollow(FOLLOW_1);
             iv_ruleXListLiteral=ruleXListLiteral();
 
             state._fsp--;
@@ -14981,7 +14981,7 @@ public final EObject entryRuleXListLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXListLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXListLiteral12308); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -14999,7 +14999,7 @@ public final EObject entryRuleXListLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXListLiteral"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5076:1: ruleXListLiteral returns [EObject current=null] : ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' ) ;
+    // InternalFormat.g:5076:1: ruleXListLiteral returns [EObject current=null] : ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' ) ;
     public final EObject ruleXListLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -15015,14 +15015,14 @@ public final EObject ruleXListLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5079:28: ( ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5080:1: ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' )
+            // InternalFormat.g:5079:28: ( ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' ) )
+            // InternalFormat.g:5080:1: ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5080:1: ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5080:2: () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']'
+            // InternalFormat.g:5080:1: ( () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']' )
+            // InternalFormat.g:5080:2: () otherlv_1= '#' otherlv_2= '[' ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )? otherlv_6= ']'
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5080:2: ()
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5081:5: 
+            // InternalFormat.g:5080:2: ()
+            // InternalFormat.g:5081:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -15034,19 +15034,19 @@ public final EObject ruleXListLiteral() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,56,FOLLOW_56_in_ruleXListLiteral12354); if (state.failed) return current;
+            otherlv_1=(Token)match(input,56,FOLLOW_49); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXListLiteralAccess().getNumberSignKeyword_1());
                   
             }
-            otherlv_2=(Token)match(input,27,FOLLOW_27_in_ruleXListLiteral12366); if (state.failed) return current;
+            otherlv_2=(Token)match(input,27,FOLLOW_50); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getXListLiteralAccess().getLeftSquareBracketKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5094:1: ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )?
+            // InternalFormat.g:5094:1: ( ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )* )?
             int alt94=2;
             int LA94_0 = input.LA(1);
 
@@ -15055,20 +15055,20 @@ public final EObject ruleXListLiteral() throws RecognitionException {
             }
             switch (alt94) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5094:2: ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
+                    // InternalFormat.g:5094:2: ( (lv_elements_3_0= ruleXExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5094:2: ( (lv_elements_3_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5095:1: (lv_elements_3_0= ruleXExpression )
+                    // InternalFormat.g:5094:2: ( (lv_elements_3_0= ruleXExpression ) )
+                    // InternalFormat.g:5095:1: (lv_elements_3_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5095:1: (lv_elements_3_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5096:3: lv_elements_3_0= ruleXExpression
+                    // InternalFormat.g:5095:1: (lv_elements_3_0= ruleXExpression )
+                    // InternalFormat.g:5096:3: lv_elements_3_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXListLiteralAccess().getElementsXExpressionParserRuleCall_3_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXListLiteral12388);
+                    pushFollow(FOLLOW_20);
                     lv_elements_3_0=ruleXExpression();
 
                     state._fsp--;
@@ -15082,7 +15082,7 @@ public final EObject ruleXListLiteral() throws RecognitionException {
                              			current, 
                              			"elements",
                               		lv_elements_3_0, 
-                              		"XExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -15092,7 +15092,7 @@ public final EObject ruleXListLiteral() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5112:2: (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
+                    // InternalFormat.g:5112:2: (otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) )*
                     loop93:
                     do {
                         int alt93=2;
@@ -15105,26 +15105,26 @@ public final EObject ruleXListLiteral() throws RecognitionException {
 
                         switch (alt93) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5112:4: otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) )
+                    	    // InternalFormat.g:5112:4: otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) )
                     	    {
-                    	    otherlv_4=(Token)match(input,28,FOLLOW_28_in_ruleXListLiteral12401); if (state.failed) return current;
+                    	    otherlv_4=(Token)match(input,28,FOLLOW_48); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_4, grammarAccess.getXListLiteralAccess().getCommaKeyword_3_1_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5116:1: ( (lv_elements_5_0= ruleXExpression ) )
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5117:1: (lv_elements_5_0= ruleXExpression )
+                    	    // InternalFormat.g:5116:1: ( (lv_elements_5_0= ruleXExpression ) )
+                    	    // InternalFormat.g:5117:1: (lv_elements_5_0= ruleXExpression )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5117:1: (lv_elements_5_0= ruleXExpression )
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5118:3: lv_elements_5_0= ruleXExpression
+                    	    // InternalFormat.g:5117:1: (lv_elements_5_0= ruleXExpression )
+                    	    // InternalFormat.g:5118:3: lv_elements_5_0= ruleXExpression
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getXListLiteralAccess().getElementsXExpressionParserRuleCall_3_1_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleXExpression_in_ruleXListLiteral12422);
+                    	    pushFollow(FOLLOW_20);
                     	    lv_elements_5_0=ruleXExpression();
 
                     	    state._fsp--;
@@ -15138,7 +15138,7 @@ public final EObject ruleXListLiteral() throws RecognitionException {
                     	             			current, 
                     	             			"elements",
                     	              		lv_elements_5_0, 
-                    	              		"XExpression");
+                    	              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -15163,7 +15163,7 @@ public final EObject ruleXListLiteral() throws RecognitionException {
 
             }
 
-            otherlv_6=(Token)match(input,29,FOLLOW_29_in_ruleXListLiteral12438); if (state.failed) return current;
+            otherlv_6=(Token)match(input,29,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_6, grammarAccess.getXListLiteralAccess().getRightSquareBracketKeyword_4());
@@ -15192,7 +15192,7 @@ public final EObject ruleXListLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXClosure"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5146:1: entryRuleXClosure returns [EObject current=null] : iv_ruleXClosure= ruleXClosure EOF ;
+    // InternalFormat.g:5146:1: entryRuleXClosure returns [EObject current=null] : iv_ruleXClosure= ruleXClosure EOF ;
     public final EObject entryRuleXClosure() throws RecognitionException {
         EObject current = null;
 
@@ -15200,13 +15200,13 @@ public final EObject entryRuleXClosure() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5147:2: (iv_ruleXClosure= ruleXClosure EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5148:2: iv_ruleXClosure= ruleXClosure EOF
+            // InternalFormat.g:5147:2: (iv_ruleXClosure= ruleXClosure EOF )
+            // InternalFormat.g:5148:2: iv_ruleXClosure= ruleXClosure EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXClosureRule()); 
             }
-            pushFollow(FOLLOW_ruleXClosure_in_entryRuleXClosure12474);
+            pushFollow(FOLLOW_1);
             iv_ruleXClosure=ruleXClosure();
 
             state._fsp--;
@@ -15214,7 +15214,7 @@ public final EObject entryRuleXClosure() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXClosure; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXClosure12484); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -15232,7 +15232,7 @@ public final EObject entryRuleXClosure() throws RecognitionException {
 
 
     // $ANTLR start "ruleXClosure"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5155:1: ruleXClosure returns [EObject current=null] : ( ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']' ) ;
+    // InternalFormat.g:5155:1: ruleXClosure returns [EObject current=null] : ( ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']' ) ;
     public final EObject ruleXClosure() throws RecognitionException {
         EObject current = null;
 
@@ -15250,20 +15250,20 @@ public final EObject ruleXClosure() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5158:28: ( ( ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']' ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5159:1: ( ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']' )
+            // InternalFormat.g:5158:28: ( ( ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']' ) )
+            // InternalFormat.g:5159:1: ( ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5159:1: ( ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5159:2: ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']'
+            // InternalFormat.g:5159:1: ( ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']' )
+            // InternalFormat.g:5159:2: ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) ) ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )? ( (lv_expression_6_0= ruleXExpressionInClosure ) ) otherlv_7= ']'
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5159:2: ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5159:3: ( ( () '[' ) )=> ( () otherlv_1= '[' )
+            // InternalFormat.g:5159:2: ( ( ( () '[' ) )=> ( () otherlv_1= '[' ) )
+            // InternalFormat.g:5159:3: ( ( () '[' ) )=> ( () otherlv_1= '[' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5161:5: ( () otherlv_1= '[' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5161:6: () otherlv_1= '['
+            // InternalFormat.g:5161:5: ( () otherlv_1= '[' )
+            // InternalFormat.g:5161:6: () otherlv_1= '['
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5161:6: ()
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5162:5: 
+            // InternalFormat.g:5161:6: ()
+            // InternalFormat.g:5162:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -15275,7 +15275,7 @@ public final EObject ruleXClosure() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,27,FOLLOW_27_in_ruleXClosure12544); if (state.failed) return current;
+            otherlv_1=(Token)match(input,27,FOLLOW_79); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXClosureAccess().getLeftSquareBracketKeyword_0_0_1());
@@ -15287,17 +15287,17 @@ public final EObject ruleXClosure() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5171:3: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )?
+            // InternalFormat.g:5171:3: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )?
             int alt97=2;
             alt97 = dfa97.predict(input);
             switch (alt97) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5171:4: ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) )
+                    // InternalFormat.g:5171:4: ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5186:6: ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5186:7: ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) )
+                    // InternalFormat.g:5186:6: ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) )
+                    // InternalFormat.g:5186:7: ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5186:7: ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )?
+                    // InternalFormat.g:5186:7: ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )?
                     int alt96=2;
                     int LA96_0 = input.LA(1);
 
@@ -15306,20 +15306,20 @@ public final EObject ruleXClosure() throws RecognitionException {
                     }
                     switch (alt96) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5186:8: ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )*
+                            // InternalFormat.g:5186:8: ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )*
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5186:8: ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5187:1: (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter )
+                            // InternalFormat.g:5186:8: ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) )
+                            // InternalFormat.g:5187:1: (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5187:1: (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5188:3: lv_declaredFormalParameters_2_0= ruleJvmFormalParameter
+                            // InternalFormat.g:5187:1: (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter )
+                            // InternalFormat.g:5188:3: lv_declaredFormalParameters_2_0= ruleJvmFormalParameter
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_1_0_0_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleJvmFormalParameter_in_ruleXClosure12617);
+                            pushFollow(FOLLOW_80);
                             lv_declaredFormalParameters_2_0=ruleJvmFormalParameter();
 
                             state._fsp--;
@@ -15333,7 +15333,7 @@ public final EObject ruleXClosure() throws RecognitionException {
                                      			current, 
                                      			"declaredFormalParameters",
                                       		lv_declaredFormalParameters_2_0, 
-                                      		"JvmFormalParameter");
+                                      		"org.eclipse.xtext.xbase.Xbase.JvmFormalParameter");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -15343,7 +15343,7 @@ public final EObject ruleXClosure() throws RecognitionException {
 
                             }
 
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5204:2: (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )*
+                            // InternalFormat.g:5204:2: (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )*
                             loop95:
                             do {
                                 int alt95=2;
@@ -15356,26 +15356,26 @@ public final EObject ruleXClosure() throws RecognitionException {
 
                                 switch (alt95) {
                             	case 1 :
-                            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5204:4: otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) )
+                            	    // InternalFormat.g:5204:4: otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) )
                             	    {
-                            	    otherlv_3=(Token)match(input,28,FOLLOW_28_in_ruleXClosure12630); if (state.failed) return current;
+                            	    otherlv_3=(Token)match(input,28,FOLLOW_60); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	          	newLeafNode(otherlv_3, grammarAccess.getXClosureAccess().getCommaKeyword_1_0_0_1_0());
                             	          
                             	    }
-                            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5208:1: ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) )
-                            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5209:1: (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter )
+                            	    // InternalFormat.g:5208:1: ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) )
+                            	    // InternalFormat.g:5209:1: (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter )
                             	    {
-                            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5209:1: (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter )
-                            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5210:3: lv_declaredFormalParameters_4_0= ruleJvmFormalParameter
+                            	    // InternalFormat.g:5209:1: (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter )
+                            	    // InternalFormat.g:5210:3: lv_declaredFormalParameters_4_0= ruleJvmFormalParameter
                             	    {
                             	    if ( state.backtracking==0 ) {
                             	       
                             	      	        newCompositeNode(grammarAccess.getXClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_1_0_0_1_1_0()); 
                             	      	    
                             	    }
-                            	    pushFollow(FOLLOW_ruleJvmFormalParameter_in_ruleXClosure12651);
+                            	    pushFollow(FOLLOW_80);
                             	    lv_declaredFormalParameters_4_0=ruleJvmFormalParameter();
 
                             	    state._fsp--;
@@ -15389,7 +15389,7 @@ public final EObject ruleXClosure() throws RecognitionException {
                             	             			current, 
                             	             			"declaredFormalParameters",
                             	              		lv_declaredFormalParameters_4_0, 
-                            	              		"JvmFormalParameter");
+                            	              		"org.eclipse.xtext.xbase.Xbase.JvmFormalParameter");
                             	      	        afterParserOrEnumRuleCall();
                             	      	    
                             	    }
@@ -15414,13 +15414,13 @@ public final EObject ruleXClosure() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5226:6: ( (lv_explicitSyntax_5_0= '|' ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5227:1: (lv_explicitSyntax_5_0= '|' )
+                    // InternalFormat.g:5226:6: ( (lv_explicitSyntax_5_0= '|' ) )
+                    // InternalFormat.g:5227:1: (lv_explicitSyntax_5_0= '|' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5227:1: (lv_explicitSyntax_5_0= '|' )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5228:3: lv_explicitSyntax_5_0= '|'
+                    // InternalFormat.g:5227:1: (lv_explicitSyntax_5_0= '|' )
+                    // InternalFormat.g:5228:3: lv_explicitSyntax_5_0= '|'
                     {
-                    lv_explicitSyntax_5_0=(Token)match(input,88,FOLLOW_88_in_ruleXClosure12673); if (state.failed) return current;
+                    lv_explicitSyntax_5_0=(Token)match(input,88,FOLLOW_81); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_explicitSyntax_5_0, grammarAccess.getXClosureAccess().getExplicitSyntaxVerticalLineKeyword_1_0_1_0());
@@ -15449,18 +15449,18 @@ public final EObject ruleXClosure() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5241:5: ( (lv_expression_6_0= ruleXExpressionInClosure ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5242:1: (lv_expression_6_0= ruleXExpressionInClosure )
+            // InternalFormat.g:5241:5: ( (lv_expression_6_0= ruleXExpressionInClosure ) )
+            // InternalFormat.g:5242:1: (lv_expression_6_0= ruleXExpressionInClosure )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5242:1: (lv_expression_6_0= ruleXExpressionInClosure )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5243:3: lv_expression_6_0= ruleXExpressionInClosure
+            // InternalFormat.g:5242:1: (lv_expression_6_0= ruleXExpressionInClosure )
+            // InternalFormat.g:5243:3: lv_expression_6_0= ruleXExpressionInClosure
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXClosureAccess().getExpressionXExpressionInClosureParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpressionInClosure_in_ruleXClosure12710);
+            pushFollow(FOLLOW_82);
             lv_expression_6_0=ruleXExpressionInClosure();
 
             state._fsp--;
@@ -15474,7 +15474,7 @@ public final EObject ruleXClosure() throws RecognitionException {
                      			current, 
                      			"expression",
                       		lv_expression_6_0, 
-                      		"XExpressionInClosure");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpressionInClosure");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -15484,7 +15484,7 @@ public final EObject ruleXClosure() throws RecognitionException {
 
             }
 
-            otherlv_7=(Token)match(input,29,FOLLOW_29_in_ruleXClosure12722); if (state.failed) return current;
+            otherlv_7=(Token)match(input,29,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_7, grammarAccess.getXClosureAccess().getRightSquareBracketKeyword_3());
@@ -15513,7 +15513,7 @@ public final EObject ruleXClosure() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXExpressionInClosure"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5271:1: entryRuleXExpressionInClosure returns [EObject current=null] : iv_ruleXExpressionInClosure= ruleXExpressionInClosure EOF ;
+    // InternalFormat.g:5271:1: entryRuleXExpressionInClosure returns [EObject current=null] : iv_ruleXExpressionInClosure= ruleXExpressionInClosure EOF ;
     public final EObject entryRuleXExpressionInClosure() throws RecognitionException {
         EObject current = null;
 
@@ -15521,13 +15521,13 @@ public final EObject entryRuleXExpressionInClosure() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5272:2: (iv_ruleXExpressionInClosure= ruleXExpressionInClosure EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5273:2: iv_ruleXExpressionInClosure= ruleXExpressionInClosure EOF
+            // InternalFormat.g:5272:2: (iv_ruleXExpressionInClosure= ruleXExpressionInClosure EOF )
+            // InternalFormat.g:5273:2: iv_ruleXExpressionInClosure= ruleXExpressionInClosure EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXExpressionInClosureRule()); 
             }
-            pushFollow(FOLLOW_ruleXExpressionInClosure_in_entryRuleXExpressionInClosure12758);
+            pushFollow(FOLLOW_1);
             iv_ruleXExpressionInClosure=ruleXExpressionInClosure();
 
             state._fsp--;
@@ -15535,7 +15535,7 @@ public final EObject entryRuleXExpressionInClosure() throws RecognitionException
             if ( state.backtracking==0 ) {
                current =iv_ruleXExpressionInClosure; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXExpressionInClosure12768); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -15553,7 +15553,7 @@ public final EObject entryRuleXExpressionInClosure() throws RecognitionException
 
 
     // $ANTLR start "ruleXExpressionInClosure"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5280:1: ruleXExpressionInClosure returns [EObject current=null] : ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* ) ;
+    // InternalFormat.g:5280:1: ruleXExpressionInClosure returns [EObject current=null] : ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* ) ;
     public final EObject ruleXExpressionInClosure() throws RecognitionException {
         EObject current = null;
 
@@ -15564,14 +15564,14 @@ public final EObject ruleXExpressionInClosure() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5283:28: ( ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5284:1: ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* )
+            // InternalFormat.g:5283:28: ( ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* ) )
+            // InternalFormat.g:5284:1: ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5284:1: ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5284:2: () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )*
+            // InternalFormat.g:5284:1: ( () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )* )
+            // InternalFormat.g:5284:2: () ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )*
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5284:2: ()
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5285:5: 
+            // InternalFormat.g:5284:2: ()
+            // InternalFormat.g:5285:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -15583,7 +15583,7 @@ public final EObject ruleXExpressionInClosure() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5290:2: ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )*
+            // InternalFormat.g:5290:2: ( ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )? )*
             loop99:
             do {
                 int alt99=2;
@@ -15596,20 +15596,20 @@ public final EObject ruleXExpressionInClosure() throws RecognitionException {
 
                 switch (alt99) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5290:3: ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )?
+            	    // InternalFormat.g:5290:3: ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_2= ';' )?
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5290:3: ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5291:1: (lv_expressions_1_0= ruleXExpressionOrVarDeclaration )
+            	    // InternalFormat.g:5290:3: ( (lv_expressions_1_0= ruleXExpressionOrVarDeclaration ) )
+            	    // InternalFormat.g:5291:1: (lv_expressions_1_0= ruleXExpressionOrVarDeclaration )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5291:1: (lv_expressions_1_0= ruleXExpressionOrVarDeclaration )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5292:3: lv_expressions_1_0= ruleXExpressionOrVarDeclaration
+            	    // InternalFormat.g:5291:1: (lv_expressions_1_0= ruleXExpressionOrVarDeclaration )
+            	    // InternalFormat.g:5292:3: lv_expressions_1_0= ruleXExpressionOrVarDeclaration
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXExpressionInClosureAccess().getExpressionsXExpressionOrVarDeclarationParserRuleCall_1_0_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_ruleXExpressionInClosure12824);
+            	    pushFollow(FOLLOW_83);
             	    lv_expressions_1_0=ruleXExpressionOrVarDeclaration();
 
             	    state._fsp--;
@@ -15623,7 +15623,7 @@ public final EObject ruleXExpressionInClosure() throws RecognitionException {
             	             			current, 
             	             			"expressions",
             	              		lv_expressions_1_0, 
-            	              		"XExpressionOrVarDeclaration");
+            	              		"org.eclipse.xtext.xbase.Xbase.XExpressionOrVarDeclaration");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -15633,7 +15633,7 @@ public final EObject ruleXExpressionInClosure() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5308:2: (otherlv_2= ';' )?
+            	    // InternalFormat.g:5308:2: (otherlv_2= ';' )?
             	    int alt98=2;
             	    int LA98_0 = input.LA(1);
 
@@ -15642,9 +15642,9 @@ public final EObject ruleXExpressionInClosure() throws RecognitionException {
             	    }
             	    switch (alt98) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5308:4: otherlv_2= ';'
+            	            // InternalFormat.g:5308:4: otherlv_2= ';'
             	            {
-            	            otherlv_2=(Token)match(input,18,FOLLOW_18_in_ruleXExpressionInClosure12837); if (state.failed) return current;
+            	            otherlv_2=(Token)match(input,18,FOLLOW_84); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                  	newLeafNode(otherlv_2, grammarAccess.getXExpressionInClosureAccess().getSemicolonKeyword_1_1());
@@ -15688,7 +15688,7 @@ public final EObject ruleXExpressionInClosure() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXShortClosure"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5320:1: entryRuleXShortClosure returns [EObject current=null] : iv_ruleXShortClosure= ruleXShortClosure EOF ;
+    // InternalFormat.g:5320:1: entryRuleXShortClosure returns [EObject current=null] : iv_ruleXShortClosure= ruleXShortClosure EOF ;
     public final EObject entryRuleXShortClosure() throws RecognitionException {
         EObject current = null;
 
@@ -15696,13 +15696,13 @@ public final EObject entryRuleXShortClosure() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5321:2: (iv_ruleXShortClosure= ruleXShortClosure EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5322:2: iv_ruleXShortClosure= ruleXShortClosure EOF
+            // InternalFormat.g:5321:2: (iv_ruleXShortClosure= ruleXShortClosure EOF )
+            // InternalFormat.g:5322:2: iv_ruleXShortClosure= ruleXShortClosure EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXShortClosureRule()); 
             }
-            pushFollow(FOLLOW_ruleXShortClosure_in_entryRuleXShortClosure12877);
+            pushFollow(FOLLOW_1);
             iv_ruleXShortClosure=ruleXShortClosure();
 
             state._fsp--;
@@ -15710,7 +15710,7 @@ public final EObject entryRuleXShortClosure() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXShortClosure; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXShortClosure12887); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -15728,7 +15728,7 @@ public final EObject entryRuleXShortClosure() throws RecognitionException {
 
 
     // $ANTLR start "ruleXShortClosure"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5329:1: ruleXShortClosure returns [EObject current=null] : ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) ) ;
+    // InternalFormat.g:5329:1: ruleXShortClosure returns [EObject current=null] : ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) ) ;
     public final EObject ruleXShortClosure() throws RecognitionException {
         EObject current = null;
 
@@ -15744,20 +15744,20 @@ public final EObject ruleXShortClosure() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5332:28: ( ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5333:1: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) )
+            // InternalFormat.g:5332:28: ( ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) ) )
+            // InternalFormat.g:5333:1: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5333:1: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5333:2: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) )
+            // InternalFormat.g:5333:1: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) ) )
+            // InternalFormat.g:5333:2: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) ) ( (lv_expression_5_0= ruleXExpression ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5333:2: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5333:3: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) )
+            // InternalFormat.g:5333:2: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) ) )
+            // InternalFormat.g:5333:3: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5349:6: ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5349:7: () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) )
+            // InternalFormat.g:5349:6: ( () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) ) )
+            // InternalFormat.g:5349:7: () ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_4_0= '|' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5349:7: ()
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5350:5: 
+            // InternalFormat.g:5349:7: ()
+            // InternalFormat.g:5350:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -15769,7 +15769,7 @@ public final EObject ruleXShortClosure() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5355:2: ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )?
+            // InternalFormat.g:5355:2: ( ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )* )?
             int alt101=2;
             int LA101_0 = input.LA(1);
 
@@ -15778,20 +15778,20 @@ public final EObject ruleXShortClosure() throws RecognitionException {
             }
             switch (alt101) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5355:3: ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )*
+                    // InternalFormat.g:5355:3: ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) ) (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )*
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5355:3: ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5356:1: (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter )
+                    // InternalFormat.g:5355:3: ( (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter ) )
+                    // InternalFormat.g:5356:1: (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5356:1: (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5357:3: lv_declaredFormalParameters_1_0= ruleJvmFormalParameter
+                    // InternalFormat.g:5356:1: (lv_declaredFormalParameters_1_0= ruleJvmFormalParameter )
+                    // InternalFormat.g:5357:3: lv_declaredFormalParameters_1_0= ruleJvmFormalParameter
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXShortClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_0_0_1_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleJvmFormalParameter_in_ruleXShortClosure12995);
+                    pushFollow(FOLLOW_80);
                     lv_declaredFormalParameters_1_0=ruleJvmFormalParameter();
 
                     state._fsp--;
@@ -15805,7 +15805,7 @@ public final EObject ruleXShortClosure() throws RecognitionException {
                              			current, 
                              			"declaredFormalParameters",
                               		lv_declaredFormalParameters_1_0, 
-                              		"JvmFormalParameter");
+                              		"org.eclipse.xtext.xbase.Xbase.JvmFormalParameter");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -15815,7 +15815,7 @@ public final EObject ruleXShortClosure() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5373:2: (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )*
+                    // InternalFormat.g:5373:2: (otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) )*
                     loop100:
                     do {
                         int alt100=2;
@@ -15828,26 +15828,26 @@ public final EObject ruleXShortClosure() throws RecognitionException {
 
                         switch (alt100) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5373:4: otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) )
+                    	    // InternalFormat.g:5373:4: otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) )
                     	    {
-                    	    otherlv_2=(Token)match(input,28,FOLLOW_28_in_ruleXShortClosure13008); if (state.failed) return current;
+                    	    otherlv_2=(Token)match(input,28,FOLLOW_60); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_2, grammarAccess.getXShortClosureAccess().getCommaKeyword_0_0_1_1_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5377:1: ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) )
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5378:1: (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter )
+                    	    // InternalFormat.g:5377:1: ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) )
+                    	    // InternalFormat.g:5378:1: (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5378:1: (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter )
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5379:3: lv_declaredFormalParameters_3_0= ruleJvmFormalParameter
+                    	    // InternalFormat.g:5378:1: (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter )
+                    	    // InternalFormat.g:5379:3: lv_declaredFormalParameters_3_0= ruleJvmFormalParameter
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getXShortClosureAccess().getDeclaredFormalParametersJvmFormalParameterParserRuleCall_0_0_1_1_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleJvmFormalParameter_in_ruleXShortClosure13029);
+                    	    pushFollow(FOLLOW_80);
                     	    lv_declaredFormalParameters_3_0=ruleJvmFormalParameter();
 
                     	    state._fsp--;
@@ -15861,7 +15861,7 @@ public final EObject ruleXShortClosure() throws RecognitionException {
                     	             			current, 
                     	             			"declaredFormalParameters",
                     	              		lv_declaredFormalParameters_3_0, 
-                    	              		"JvmFormalParameter");
+                    	              		"org.eclipse.xtext.xbase.Xbase.JvmFormalParameter");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -15886,13 +15886,13 @@ public final EObject ruleXShortClosure() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5395:6: ( (lv_explicitSyntax_4_0= '|' ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5396:1: (lv_explicitSyntax_4_0= '|' )
+            // InternalFormat.g:5395:6: ( (lv_explicitSyntax_4_0= '|' ) )
+            // InternalFormat.g:5396:1: (lv_explicitSyntax_4_0= '|' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5396:1: (lv_explicitSyntax_4_0= '|' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5397:3: lv_explicitSyntax_4_0= '|'
+            // InternalFormat.g:5396:1: (lv_explicitSyntax_4_0= '|' )
+            // InternalFormat.g:5397:3: lv_explicitSyntax_4_0= '|'
             {
-            lv_explicitSyntax_4_0=(Token)match(input,88,FOLLOW_88_in_ruleXShortClosure13051); if (state.failed) return current;
+            lv_explicitSyntax_4_0=(Token)match(input,88,FOLLOW_48); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                       newLeafNode(lv_explicitSyntax_4_0, grammarAccess.getXShortClosureAccess().getExplicitSyntaxVerticalLineKeyword_0_0_2_0());
@@ -15918,18 +15918,18 @@ public final EObject ruleXShortClosure() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5410:4: ( (lv_expression_5_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5411:1: (lv_expression_5_0= ruleXExpression )
+            // InternalFormat.g:5410:4: ( (lv_expression_5_0= ruleXExpression ) )
+            // InternalFormat.g:5411:1: (lv_expression_5_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5411:1: (lv_expression_5_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5412:3: lv_expression_5_0= ruleXExpression
+            // InternalFormat.g:5411:1: (lv_expression_5_0= ruleXExpression )
+            // InternalFormat.g:5412:3: lv_expression_5_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXShortClosureAccess().getExpressionXExpressionParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXShortClosure13087);
+            pushFollow(FOLLOW_2);
             lv_expression_5_0=ruleXExpression();
 
             state._fsp--;
@@ -15943,7 +15943,7 @@ public final EObject ruleXShortClosure() throws RecognitionException {
                      			current, 
                      			"expression",
                       		lv_expression_5_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -15976,7 +15976,7 @@ public final EObject ruleXShortClosure() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXParenthesizedExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5436:1: entryRuleXParenthesizedExpression returns [EObject current=null] : iv_ruleXParenthesizedExpression= ruleXParenthesizedExpression EOF ;
+    // InternalFormat.g:5436:1: entryRuleXParenthesizedExpression returns [EObject current=null] : iv_ruleXParenthesizedExpression= ruleXParenthesizedExpression EOF ;
     public final EObject entryRuleXParenthesizedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -15984,13 +15984,13 @@ public final EObject entryRuleXParenthesizedExpression() throws RecognitionExcep
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5437:2: (iv_ruleXParenthesizedExpression= ruleXParenthesizedExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5438:2: iv_ruleXParenthesizedExpression= ruleXParenthesizedExpression EOF
+            // InternalFormat.g:5437:2: (iv_ruleXParenthesizedExpression= ruleXParenthesizedExpression EOF )
+            // InternalFormat.g:5438:2: iv_ruleXParenthesizedExpression= ruleXParenthesizedExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXParenthesizedExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXParenthesizedExpression_in_entryRuleXParenthesizedExpression13123);
+            pushFollow(FOLLOW_1);
             iv_ruleXParenthesizedExpression=ruleXParenthesizedExpression();
 
             state._fsp--;
@@ -15998,7 +15998,7 @@ public final EObject entryRuleXParenthesizedExpression() throws RecognitionExcep
             if ( state.backtracking==0 ) {
                current =iv_ruleXParenthesizedExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXParenthesizedExpression13133); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -16016,7 +16016,7 @@ public final EObject entryRuleXParenthesizedExpression() throws RecognitionExcep
 
 
     // $ANTLR start "ruleXParenthesizedExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5445:1: ruleXParenthesizedExpression returns [EObject current=null] : (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' ) ;
+    // InternalFormat.g:5445:1: ruleXParenthesizedExpression returns [EObject current=null] : (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' ) ;
     public final EObject ruleXParenthesizedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -16028,13 +16028,13 @@ public final EObject ruleXParenthesizedExpression() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5448:28: ( (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5449:1: (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' )
+            // InternalFormat.g:5448:28: ( (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' ) )
+            // InternalFormat.g:5449:1: (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5449:1: (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5449:3: otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')'
+            // InternalFormat.g:5449:1: (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' )
+            // InternalFormat.g:5449:3: otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')'
             {
-            otherlv_0=(Token)match(input,33,FOLLOW_33_in_ruleXParenthesizedExpression13170); if (state.failed) return current;
+            otherlv_0=(Token)match(input,33,FOLLOW_48); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getXParenthesizedExpressionAccess().getLeftParenthesisKeyword_0());
@@ -16045,7 +16045,7 @@ public final EObject ruleXParenthesizedExpression() throws RecognitionException
                       newCompositeNode(grammarAccess.getXParenthesizedExpressionAccess().getXExpressionParserRuleCall_1()); 
                   
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXParenthesizedExpression13192);
+            pushFollow(FOLLOW_30);
             this_XExpression_1=ruleXExpression();
 
             state._fsp--;
@@ -16056,7 +16056,7 @@ public final EObject ruleXParenthesizedExpression() throws RecognitionException
                       afterParserOrEnumRuleCall();
                   
             }
-            otherlv_2=(Token)match(input,34,FOLLOW_34_in_ruleXParenthesizedExpression13203); if (state.failed) return current;
+            otherlv_2=(Token)match(input,34,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getXParenthesizedExpressionAccess().getRightParenthesisKeyword_2());
@@ -16085,7 +16085,7 @@ public final EObject ruleXParenthesizedExpression() throws RecognitionException
 
 
     // $ANTLR start "entryRuleXIfExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5474:1: entryRuleXIfExpression returns [EObject current=null] : iv_ruleXIfExpression= ruleXIfExpression EOF ;
+    // InternalFormat.g:5474:1: entryRuleXIfExpression returns [EObject current=null] : iv_ruleXIfExpression= ruleXIfExpression EOF ;
     public final EObject entryRuleXIfExpression() throws RecognitionException {
         EObject current = null;
 
@@ -16093,13 +16093,13 @@ public final EObject entryRuleXIfExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5475:2: (iv_ruleXIfExpression= ruleXIfExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5476:2: iv_ruleXIfExpression= ruleXIfExpression EOF
+            // InternalFormat.g:5475:2: (iv_ruleXIfExpression= ruleXIfExpression EOF )
+            // InternalFormat.g:5476:2: iv_ruleXIfExpression= ruleXIfExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXIfExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXIfExpression_in_entryRuleXIfExpression13239);
+            pushFollow(FOLLOW_1);
             iv_ruleXIfExpression=ruleXIfExpression();
 
             state._fsp--;
@@ -16107,7 +16107,7 @@ public final EObject entryRuleXIfExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXIfExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXIfExpression13249); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -16125,7 +16125,7 @@ public final EObject entryRuleXIfExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXIfExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5483:1: ruleXIfExpression returns [EObject current=null] : ( () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )? ) ;
+    // InternalFormat.g:5483:1: ruleXIfExpression returns [EObject current=null] : ( () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )? ) ;
     public final EObject ruleXIfExpression() throws RecognitionException {
         EObject current = null;
 
@@ -16143,14 +16143,14 @@ public final EObject ruleXIfExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5486:28: ( ( () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5487:1: ( () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )? )
+            // InternalFormat.g:5486:28: ( ( () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )? ) )
+            // InternalFormat.g:5487:1: ( () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5487:1: ( () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )? )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5487:2: () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )?
+            // InternalFormat.g:5487:1: ( () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )? )
+            // InternalFormat.g:5487:2: () otherlv_1= 'if' otherlv_2= '(' ( (lv_if_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_then_5_0= ruleXExpression ) ) ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )?
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5487:2: ()
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5488:5: 
+            // InternalFormat.g:5487:2: ()
+            // InternalFormat.g:5488:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -16162,30 +16162,30 @@ public final EObject ruleXIfExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,89,FOLLOW_89_in_ruleXIfExpression13295); if (state.failed) return current;
+            otherlv_1=(Token)match(input,89,FOLLOW_85); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXIfExpressionAccess().getIfKeyword_1());
                   
             }
-            otherlv_2=(Token)match(input,33,FOLLOW_33_in_ruleXIfExpression13307); if (state.failed) return current;
+            otherlv_2=(Token)match(input,33,FOLLOW_48); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getXIfExpressionAccess().getLeftParenthesisKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5501:1: ( (lv_if_3_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5502:1: (lv_if_3_0= ruleXExpression )
+            // InternalFormat.g:5501:1: ( (lv_if_3_0= ruleXExpression ) )
+            // InternalFormat.g:5502:1: (lv_if_3_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5502:1: (lv_if_3_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5503:3: lv_if_3_0= ruleXExpression
+            // InternalFormat.g:5502:1: (lv_if_3_0= ruleXExpression )
+            // InternalFormat.g:5503:3: lv_if_3_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXIfExpressionAccess().getIfXExpressionParserRuleCall_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXIfExpression13328);
+            pushFollow(FOLLOW_30);
             lv_if_3_0=ruleXExpression();
 
             state._fsp--;
@@ -16199,7 +16199,7 @@ public final EObject ruleXIfExpression() throws RecognitionException {
                      			current, 
                      			"if",
                       		lv_if_3_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -16209,24 +16209,24 @@ public final EObject ruleXIfExpression() throws RecognitionException {
 
             }
 
-            otherlv_4=(Token)match(input,34,FOLLOW_34_in_ruleXIfExpression13340); if (state.failed) return current;
+            otherlv_4=(Token)match(input,34,FOLLOW_48); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_4, grammarAccess.getXIfExpressionAccess().getRightParenthesisKeyword_4());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5523:1: ( (lv_then_5_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5524:1: (lv_then_5_0= ruleXExpression )
+            // InternalFormat.g:5523:1: ( (lv_then_5_0= ruleXExpression ) )
+            // InternalFormat.g:5524:1: (lv_then_5_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5524:1: (lv_then_5_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5525:3: lv_then_5_0= ruleXExpression
+            // InternalFormat.g:5524:1: (lv_then_5_0= ruleXExpression )
+            // InternalFormat.g:5525:3: lv_then_5_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXIfExpressionAccess().getThenXExpressionParserRuleCall_5_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXIfExpression13361);
+            pushFollow(FOLLOW_86);
             lv_then_5_0=ruleXExpression();
 
             state._fsp--;
@@ -16240,7 +16240,7 @@ public final EObject ruleXIfExpression() throws RecognitionException {
                      			current, 
                      			"then",
                       		lv_then_5_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -16250,7 +16250,7 @@ public final EObject ruleXIfExpression() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5541:2: ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )?
+            // InternalFormat.g:5541:2: ( ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) ) )?
             int alt102=2;
             int LA102_0 = input.LA(1);
 
@@ -16263,12 +16263,12 @@ public final EObject ruleXIfExpression() throws RecognitionException {
             }
             switch (alt102) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5541:3: ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) )
+                    // InternalFormat.g:5541:3: ( ( 'else' )=>otherlv_6= 'else' ) ( (lv_else_7_0= ruleXExpression ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5541:3: ( ( 'else' )=>otherlv_6= 'else' )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5541:4: ( 'else' )=>otherlv_6= 'else'
+                    // InternalFormat.g:5541:3: ( ( 'else' )=>otherlv_6= 'else' )
+                    // InternalFormat.g:5541:4: ( 'else' )=>otherlv_6= 'else'
                     {
-                    otherlv_6=(Token)match(input,90,FOLLOW_90_in_ruleXIfExpression13382); if (state.failed) return current;
+                    otherlv_6=(Token)match(input,90,FOLLOW_48); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_6, grammarAccess.getXIfExpressionAccess().getElseKeyword_6_0());
@@ -16277,18 +16277,18 @@ public final EObject ruleXIfExpression() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5546:2: ( (lv_else_7_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5547:1: (lv_else_7_0= ruleXExpression )
+                    // InternalFormat.g:5546:2: ( (lv_else_7_0= ruleXExpression ) )
+                    // InternalFormat.g:5547:1: (lv_else_7_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5547:1: (lv_else_7_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5548:3: lv_else_7_0= ruleXExpression
+                    // InternalFormat.g:5547:1: (lv_else_7_0= ruleXExpression )
+                    // InternalFormat.g:5548:3: lv_else_7_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXIfExpressionAccess().getElseXExpressionParserRuleCall_6_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXIfExpression13404);
+                    pushFollow(FOLLOW_2);
                     lv_else_7_0=ruleXExpression();
 
                     state._fsp--;
@@ -16302,7 +16302,7 @@ public final EObject ruleXIfExpression() throws RecognitionException {
                              			current, 
                              			"else",
                               		lv_else_7_0, 
-                              		"XExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -16341,7 +16341,7 @@ public final EObject ruleXIfExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXSwitchExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5572:1: entryRuleXSwitchExpression returns [EObject current=null] : iv_ruleXSwitchExpression= ruleXSwitchExpression EOF ;
+    // InternalFormat.g:5572:1: entryRuleXSwitchExpression returns [EObject current=null] : iv_ruleXSwitchExpression= ruleXSwitchExpression EOF ;
     public final EObject entryRuleXSwitchExpression() throws RecognitionException {
         EObject current = null;
 
@@ -16349,13 +16349,13 @@ public final EObject entryRuleXSwitchExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5573:2: (iv_ruleXSwitchExpression= ruleXSwitchExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5574:2: iv_ruleXSwitchExpression= ruleXSwitchExpression EOF
+            // InternalFormat.g:5573:2: (iv_ruleXSwitchExpression= ruleXSwitchExpression EOF )
+            // InternalFormat.g:5574:2: iv_ruleXSwitchExpression= ruleXSwitchExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXSwitchExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXSwitchExpression_in_entryRuleXSwitchExpression13442);
+            pushFollow(FOLLOW_1);
             iv_ruleXSwitchExpression=ruleXSwitchExpression();
 
             state._fsp--;
@@ -16363,7 +16363,7 @@ public final EObject entryRuleXSwitchExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXSwitchExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXSwitchExpression13452); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -16381,7 +16381,7 @@ public final EObject entryRuleXSwitchExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXSwitchExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5581:1: ruleXSwitchExpression returns [EObject current=null] : ( () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}' ) ;
+    // InternalFormat.g:5581:1: ruleXSwitchExpression returns [EObject current=null] : ( () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}' ) ;
     public final EObject ruleXSwitchExpression() throws RecognitionException {
         EObject current = null;
 
@@ -16410,14 +16410,14 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5584:28: ( ( () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}' ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5585:1: ( () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}' )
+            // InternalFormat.g:5584:28: ( ( () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}' ) )
+            // InternalFormat.g:5585:1: ( () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5585:1: ( () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5585:2: () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}'
+            // InternalFormat.g:5585:1: ( () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}' )
+            // InternalFormat.g:5585:2: () otherlv_1= 'switch' ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) ) otherlv_10= '{' ( (lv_cases_11_0= ruleXCasePart ) )* (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )? otherlv_15= '}'
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5585:2: ()
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5586:5: 
+            // InternalFormat.g:5585:2: ()
+            // InternalFormat.g:5586:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -16429,46 +16429,46 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,91,FOLLOW_91_in_ruleXSwitchExpression13498); if (state.failed) return current;
+            otherlv_1=(Token)match(input,91,FOLLOW_87); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXSwitchExpressionAccess().getSwitchKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5595:1: ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) )
+            // InternalFormat.g:5595:1: ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) )
             int alt104=2;
             alt104 = dfa104.predict(input);
             switch (alt104) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5595:2: ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' )
+                    // InternalFormat.g:5595:2: ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5595:2: ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5595:3: ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')'
+                    // InternalFormat.g:5595:2: ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' )
+                    // InternalFormat.g:5595:3: ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')'
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5595:3: ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5595:4: ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
+                    // InternalFormat.g:5595:3: ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) )
+                    // InternalFormat.g:5595:4: ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5601:5: (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5601:7: otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':'
+                    // InternalFormat.g:5601:5: (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
+                    // InternalFormat.g:5601:7: otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':'
                     {
-                    otherlv_2=(Token)match(input,33,FOLLOW_33_in_ruleXSwitchExpression13536); if (state.failed) return current;
+                    otherlv_2=(Token)match(input,33,FOLLOW_60); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_2, grammarAccess.getXSwitchExpressionAccess().getLeftParenthesisKeyword_2_0_0_0_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5605:1: ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5606:1: (lv_declaredParam_3_0= ruleJvmFormalParameter )
+                    // InternalFormat.g:5605:1: ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) )
+                    // InternalFormat.g:5606:1: (lv_declaredParam_3_0= ruleJvmFormalParameter )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5606:1: (lv_declaredParam_3_0= ruleJvmFormalParameter )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5607:3: lv_declaredParam_3_0= ruleJvmFormalParameter
+                    // InternalFormat.g:5606:1: (lv_declaredParam_3_0= ruleJvmFormalParameter )
+                    // InternalFormat.g:5607:3: lv_declaredParam_3_0= ruleJvmFormalParameter
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXSwitchExpressionAccess().getDeclaredParamJvmFormalParameterParserRuleCall_2_0_0_0_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleJvmFormalParameter_in_ruleXSwitchExpression13557);
+                    pushFollow(FOLLOW_21);
                     lv_declaredParam_3_0=ruleJvmFormalParameter();
 
                     state._fsp--;
@@ -16482,7 +16482,7 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
                              			current, 
                              			"declaredParam",
                               		lv_declaredParam_3_0, 
-                              		"JvmFormalParameter");
+                              		"org.eclipse.xtext.xbase.Xbase.JvmFormalParameter");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -16492,7 +16492,7 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
 
                     }
 
-                    otherlv_4=(Token)match(input,30,FOLLOW_30_in_ruleXSwitchExpression13569); if (state.failed) return current;
+                    otherlv_4=(Token)match(input,30,FOLLOW_48); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_4, grammarAccess.getXSwitchExpressionAccess().getColonKeyword_2_0_0_0_2());
@@ -16504,18 +16504,18 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5627:3: ( (lv_switch_5_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5628:1: (lv_switch_5_0= ruleXExpression )
+                    // InternalFormat.g:5627:3: ( (lv_switch_5_0= ruleXExpression ) )
+                    // InternalFormat.g:5628:1: (lv_switch_5_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5628:1: (lv_switch_5_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5629:3: lv_switch_5_0= ruleXExpression
+                    // InternalFormat.g:5628:1: (lv_switch_5_0= ruleXExpression )
+                    // InternalFormat.g:5629:3: lv_switch_5_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXSwitchExpressionAccess().getSwitchXExpressionParserRuleCall_2_0_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXSwitchExpression13592);
+                    pushFollow(FOLLOW_30);
                     lv_switch_5_0=ruleXExpression();
 
                     state._fsp--;
@@ -16529,7 +16529,7 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
                              			current, 
                              			"switch",
                               		lv_switch_5_0, 
-                              		"XExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -16539,7 +16539,7 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
 
                     }
 
-                    otherlv_6=(Token)match(input,34,FOLLOW_34_in_ruleXSwitchExpression13604); if (state.failed) return current;
+                    otherlv_6=(Token)match(input,34,FOLLOW_15); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_6, grammarAccess.getXSwitchExpressionAccess().getRightParenthesisKeyword_2_0_2());
@@ -16552,33 +16552,33 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5650:6: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) )
+                    // InternalFormat.g:5650:6: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5650:6: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5650:7: ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) )
+                    // InternalFormat.g:5650:6: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) )
+                    // InternalFormat.g:5650:7: ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5650:7: ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )?
+                    // InternalFormat.g:5650:7: ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )?
                     int alt103=2;
                     alt103 = dfa103.predict(input);
                     switch (alt103) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5650:8: ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' )
+                            // InternalFormat.g:5650:8: ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5655:5: ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5655:6: ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':'
+                            // InternalFormat.g:5655:5: ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' )
+                            // InternalFormat.g:5655:6: ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':'
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5655:6: ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5656:1: (lv_declaredParam_7_0= ruleJvmFormalParameter )
+                            // InternalFormat.g:5655:6: ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) )
+                            // InternalFormat.g:5656:1: (lv_declaredParam_7_0= ruleJvmFormalParameter )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5656:1: (lv_declaredParam_7_0= ruleJvmFormalParameter )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5657:3: lv_declaredParam_7_0= ruleJvmFormalParameter
+                            // InternalFormat.g:5656:1: (lv_declaredParam_7_0= ruleJvmFormalParameter )
+                            // InternalFormat.g:5657:3: lv_declaredParam_7_0= ruleJvmFormalParameter
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXSwitchExpressionAccess().getDeclaredParamJvmFormalParameterParserRuleCall_2_1_0_0_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleJvmFormalParameter_in_ruleXSwitchExpression13653);
+                            pushFollow(FOLLOW_21);
                             lv_declaredParam_7_0=ruleJvmFormalParameter();
 
                             state._fsp--;
@@ -16592,7 +16592,7 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
                                      			current, 
                                      			"declaredParam",
                                       		lv_declaredParam_7_0, 
-                                      		"JvmFormalParameter");
+                                      		"org.eclipse.xtext.xbase.Xbase.JvmFormalParameter");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -16602,7 +16602,7 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
 
                             }
 
-                            otherlv_8=(Token)match(input,30,FOLLOW_30_in_ruleXSwitchExpression13665); if (state.failed) return current;
+                            otherlv_8=(Token)match(input,30,FOLLOW_48); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                   	newLeafNode(otherlv_8, grammarAccess.getXSwitchExpressionAccess().getColonKeyword_2_1_0_0_1());
@@ -16617,18 +16617,18 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5677:4: ( (lv_switch_9_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5678:1: (lv_switch_9_0= ruleXExpression )
+                    // InternalFormat.g:5677:4: ( (lv_switch_9_0= ruleXExpression ) )
+                    // InternalFormat.g:5678:1: (lv_switch_9_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5678:1: (lv_switch_9_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5679:3: lv_switch_9_0= ruleXExpression
+                    // InternalFormat.g:5678:1: (lv_switch_9_0= ruleXExpression )
+                    // InternalFormat.g:5679:3: lv_switch_9_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXSwitchExpressionAccess().getSwitchXExpressionParserRuleCall_2_1_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXSwitchExpression13689);
+                    pushFollow(FOLLOW_15);
                     lv_switch_9_0=ruleXExpression();
 
                     state._fsp--;
@@ -16642,7 +16642,7 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
                              			current, 
                              			"switch",
                               		lv_switch_9_0, 
-                              		"XExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -16661,13 +16661,13 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
 
             }
 
-            otherlv_10=(Token)match(input,23,FOLLOW_23_in_ruleXSwitchExpression13703); if (state.failed) return current;
+            otherlv_10=(Token)match(input,23,FOLLOW_88); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_10, grammarAccess.getXSwitchExpressionAccess().getLeftCurlyBracketKeyword_3());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5699:1: ( (lv_cases_11_0= ruleXCasePart ) )*
+            // InternalFormat.g:5699:1: ( (lv_cases_11_0= ruleXCasePart ) )*
             loop105:
             do {
                 int alt105=2;
@@ -16680,17 +16680,17 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
 
                 switch (alt105) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5700:1: (lv_cases_11_0= ruleXCasePart )
+            	    // InternalFormat.g:5700:1: (lv_cases_11_0= ruleXCasePart )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5700:1: (lv_cases_11_0= ruleXCasePart )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5701:3: lv_cases_11_0= ruleXCasePart
+            	    // InternalFormat.g:5700:1: (lv_cases_11_0= ruleXCasePart )
+            	    // InternalFormat.g:5701:3: lv_cases_11_0= ruleXCasePart
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXSwitchExpressionAccess().getCasesXCasePartParserRuleCall_4_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXCasePart_in_ruleXSwitchExpression13724);
+            	    pushFollow(FOLLOW_88);
             	    lv_cases_11_0=ruleXCasePart();
 
             	    state._fsp--;
@@ -16704,7 +16704,7 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
             	             			current, 
             	             			"cases",
             	              		lv_cases_11_0, 
-            	              		"XCasePart");
+            	              		"org.eclipse.xtext.xbase.Xbase.XCasePart");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -16720,7 +16720,7 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
                 }
             } while (true);
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5717:3: (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )?
+            // InternalFormat.g:5717:3: (otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) )?
             int alt106=2;
             int LA106_0 = input.LA(1);
 
@@ -16729,32 +16729,32 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
             }
             switch (alt106) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5717:5: otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) )
+                    // InternalFormat.g:5717:5: otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) )
                     {
-                    otherlv_12=(Token)match(input,51,FOLLOW_51_in_ruleXSwitchExpression13738); if (state.failed) return current;
+                    otherlv_12=(Token)match(input,51,FOLLOW_21); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_12, grammarAccess.getXSwitchExpressionAccess().getDefaultKeyword_5_0());
                           
                     }
-                    otherlv_13=(Token)match(input,30,FOLLOW_30_in_ruleXSwitchExpression13750); if (state.failed) return current;
+                    otherlv_13=(Token)match(input,30,FOLLOW_48); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_13, grammarAccess.getXSwitchExpressionAccess().getColonKeyword_5_1());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5725:1: ( (lv_default_14_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5726:1: (lv_default_14_0= ruleXExpression )
+                    // InternalFormat.g:5725:1: ( (lv_default_14_0= ruleXExpression ) )
+                    // InternalFormat.g:5726:1: (lv_default_14_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5726:1: (lv_default_14_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5727:3: lv_default_14_0= ruleXExpression
+                    // InternalFormat.g:5726:1: (lv_default_14_0= ruleXExpression )
+                    // InternalFormat.g:5727:3: lv_default_14_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXSwitchExpressionAccess().getDefaultXExpressionParserRuleCall_5_2_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXSwitchExpression13771);
+                    pushFollow(FOLLOW_89);
                     lv_default_14_0=ruleXExpression();
 
                     state._fsp--;
@@ -16768,7 +16768,7 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
                              			current, 
                              			"default",
                               		lv_default_14_0, 
-                              		"XExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -16784,7 +16784,7 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
 
             }
 
-            otherlv_15=(Token)match(input,24,FOLLOW_24_in_ruleXSwitchExpression13785); if (state.failed) return current;
+            otherlv_15=(Token)match(input,24,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_15, grammarAccess.getXSwitchExpressionAccess().getRightCurlyBracketKeyword_6());
@@ -16813,7 +16813,7 @@ public final EObject ruleXSwitchExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXCasePart"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5755:1: entryRuleXCasePart returns [EObject current=null] : iv_ruleXCasePart= ruleXCasePart EOF ;
+    // InternalFormat.g:5755:1: entryRuleXCasePart returns [EObject current=null] : iv_ruleXCasePart= ruleXCasePart EOF ;
     public final EObject entryRuleXCasePart() throws RecognitionException {
         EObject current = null;
 
@@ -16821,13 +16821,13 @@ public final EObject entryRuleXCasePart() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5756:2: (iv_ruleXCasePart= ruleXCasePart EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5757:2: iv_ruleXCasePart= ruleXCasePart EOF
+            // InternalFormat.g:5756:2: (iv_ruleXCasePart= ruleXCasePart EOF )
+            // InternalFormat.g:5757:2: iv_ruleXCasePart= ruleXCasePart EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXCasePartRule()); 
             }
-            pushFollow(FOLLOW_ruleXCasePart_in_entryRuleXCasePart13821);
+            pushFollow(FOLLOW_1);
             iv_ruleXCasePart=ruleXCasePart();
 
             state._fsp--;
@@ -16835,7 +16835,7 @@ public final EObject entryRuleXCasePart() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXCasePart; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXCasePart13831); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -16853,7 +16853,7 @@ public final EObject entryRuleXCasePart() throws RecognitionException {
 
 
     // $ANTLR start "ruleXCasePart"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5764:1: ruleXCasePart returns [EObject current=null] : ( () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) ) ) ;
+    // InternalFormat.g:5764:1: ruleXCasePart returns [EObject current=null] : ( () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) ) ) ;
     public final EObject ruleXCasePart() throws RecognitionException {
         EObject current = null;
 
@@ -16870,14 +16870,14 @@ public final EObject ruleXCasePart() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5767:28: ( ( () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5768:1: ( () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) ) )
+            // InternalFormat.g:5767:28: ( ( () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) ) ) )
+            // InternalFormat.g:5768:1: ( () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5768:1: ( () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5768:2: () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) )
+            // InternalFormat.g:5768:1: ( () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) ) )
+            // InternalFormat.g:5768:2: () ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )? (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )? ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5768:2: ()
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5769:5: 
+            // InternalFormat.g:5768:2: ()
+            // InternalFormat.g:5769:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -16889,7 +16889,7 @@ public final EObject ruleXCasePart() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5774:2: ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )?
+            // InternalFormat.g:5774:2: ( (lv_typeGuard_1_0= ruleJvmTypeReference ) )?
             int alt107=2;
             int LA107_0 = input.LA(1);
 
@@ -16898,17 +16898,17 @@ public final EObject ruleXCasePart() throws RecognitionException {
             }
             switch (alt107) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5775:1: (lv_typeGuard_1_0= ruleJvmTypeReference )
+                    // InternalFormat.g:5775:1: (lv_typeGuard_1_0= ruleJvmTypeReference )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5775:1: (lv_typeGuard_1_0= ruleJvmTypeReference )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5776:3: lv_typeGuard_1_0= ruleJvmTypeReference
+                    // InternalFormat.g:5775:1: (lv_typeGuard_1_0= ruleJvmTypeReference )
+                    // InternalFormat.g:5776:3: lv_typeGuard_1_0= ruleJvmTypeReference
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXCasePartAccess().getTypeGuardJvmTypeReferenceParserRuleCall_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleXCasePart13886);
+                    pushFollow(FOLLOW_90);
                     lv_typeGuard_1_0=ruleJvmTypeReference();
 
                     state._fsp--;
@@ -16922,7 +16922,7 @@ public final EObject ruleXCasePart() throws RecognitionException {
                              			current, 
                              			"typeGuard",
                               		lv_typeGuard_1_0, 
-                              		"JvmTypeReference");
+                              		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -16935,7 +16935,7 @@ public final EObject ruleXCasePart() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5792:3: (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )?
+            // InternalFormat.g:5792:3: (otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) )?
             int alt108=2;
             int LA108_0 = input.LA(1);
 
@@ -16944,26 +16944,26 @@ public final EObject ruleXCasePart() throws RecognitionException {
             }
             switch (alt108) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5792:5: otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) )
+                    // InternalFormat.g:5792:5: otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) )
                     {
-                    otherlv_2=(Token)match(input,92,FOLLOW_92_in_ruleXCasePart13900); if (state.failed) return current;
+                    otherlv_2=(Token)match(input,92,FOLLOW_48); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_2, grammarAccess.getXCasePartAccess().getCaseKeyword_2_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5796:1: ( (lv_case_3_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5797:1: (lv_case_3_0= ruleXExpression )
+                    // InternalFormat.g:5796:1: ( (lv_case_3_0= ruleXExpression ) )
+                    // InternalFormat.g:5797:1: (lv_case_3_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5797:1: (lv_case_3_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5798:3: lv_case_3_0= ruleXExpression
+                    // InternalFormat.g:5797:1: (lv_case_3_0= ruleXExpression )
+                    // InternalFormat.g:5798:3: lv_case_3_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXCasePartAccess().getCaseXExpressionParserRuleCall_2_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXCasePart13921);
+                    pushFollow(FOLLOW_22);
                     lv_case_3_0=ruleXExpression();
 
                     state._fsp--;
@@ -16977,7 +16977,7 @@ public final EObject ruleXCasePart() throws RecognitionException {
                              			current, 
                              			"case",
                               		lv_case_3_0, 
-                              		"XExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -16993,7 +16993,7 @@ public final EObject ruleXCasePart() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5814:4: ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) )
+            // InternalFormat.g:5814:4: ( (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) | ( (lv_fallThrough_6_0= ',' ) ) )
             int alt109=2;
             int LA109_0 = input.LA(1);
 
@@ -17012,29 +17012,29 @@ else if ( (LA109_0==28) ) {
             }
             switch (alt109) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5814:5: (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) )
+                    // InternalFormat.g:5814:5: (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5814:5: (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5814:7: otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) )
+                    // InternalFormat.g:5814:5: (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) )
+                    // InternalFormat.g:5814:7: otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) )
                     {
-                    otherlv_4=(Token)match(input,30,FOLLOW_30_in_ruleXCasePart13937); if (state.failed) return current;
+                    otherlv_4=(Token)match(input,30,FOLLOW_48); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_4, grammarAccess.getXCasePartAccess().getColonKeyword_3_0_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5818:1: ( (lv_then_5_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5819:1: (lv_then_5_0= ruleXExpression )
+                    // InternalFormat.g:5818:1: ( (lv_then_5_0= ruleXExpression ) )
+                    // InternalFormat.g:5819:1: (lv_then_5_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5819:1: (lv_then_5_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5820:3: lv_then_5_0= ruleXExpression
+                    // InternalFormat.g:5819:1: (lv_then_5_0= ruleXExpression )
+                    // InternalFormat.g:5820:3: lv_then_5_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXCasePartAccess().getThenXExpressionParserRuleCall_3_0_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXCasePart13958);
+                    pushFollow(FOLLOW_2);
                     lv_then_5_0=ruleXExpression();
 
                     state._fsp--;
@@ -17048,7 +17048,7 @@ else if ( (LA109_0==28) ) {
                              			current, 
                              			"then",
                               		lv_then_5_0, 
-                              		"XExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -17065,15 +17065,15 @@ else if ( (LA109_0==28) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5837:6: ( (lv_fallThrough_6_0= ',' ) )
+                    // InternalFormat.g:5837:6: ( (lv_fallThrough_6_0= ',' ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5837:6: ( (lv_fallThrough_6_0= ',' ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5838:1: (lv_fallThrough_6_0= ',' )
+                    // InternalFormat.g:5837:6: ( (lv_fallThrough_6_0= ',' ) )
+                    // InternalFormat.g:5838:1: (lv_fallThrough_6_0= ',' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5838:1: (lv_fallThrough_6_0= ',' )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5839:3: lv_fallThrough_6_0= ','
+                    // InternalFormat.g:5838:1: (lv_fallThrough_6_0= ',' )
+                    // InternalFormat.g:5839:3: lv_fallThrough_6_0= ','
                     {
-                    lv_fallThrough_6_0=(Token)match(input,28,FOLLOW_28_in_ruleXCasePart13983); if (state.failed) return current;
+                    lv_fallThrough_6_0=(Token)match(input,28,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_fallThrough_6_0, grammarAccess.getXCasePartAccess().getFallThroughCommaKeyword_3_1_0());
@@ -17122,7 +17122,7 @@ else if ( (LA109_0==28) ) {
 
 
     // $ANTLR start "entryRuleXForLoopExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5860:1: entryRuleXForLoopExpression returns [EObject current=null] : iv_ruleXForLoopExpression= ruleXForLoopExpression EOF ;
+    // InternalFormat.g:5860:1: entryRuleXForLoopExpression returns [EObject current=null] : iv_ruleXForLoopExpression= ruleXForLoopExpression EOF ;
     public final EObject entryRuleXForLoopExpression() throws RecognitionException {
         EObject current = null;
 
@@ -17130,13 +17130,13 @@ public final EObject entryRuleXForLoopExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5861:2: (iv_ruleXForLoopExpression= ruleXForLoopExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5862:2: iv_ruleXForLoopExpression= ruleXForLoopExpression EOF
+            // InternalFormat.g:5861:2: (iv_ruleXForLoopExpression= ruleXForLoopExpression EOF )
+            // InternalFormat.g:5862:2: iv_ruleXForLoopExpression= ruleXForLoopExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXForLoopExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXForLoopExpression_in_entryRuleXForLoopExpression14033);
+            pushFollow(FOLLOW_1);
             iv_ruleXForLoopExpression=ruleXForLoopExpression();
 
             state._fsp--;
@@ -17144,7 +17144,7 @@ public final EObject entryRuleXForLoopExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXForLoopExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXForLoopExpression14043); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -17162,7 +17162,7 @@ public final EObject entryRuleXForLoopExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXForLoopExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5869:1: ruleXForLoopExpression returns [EObject current=null] : ( ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) ) ) ;
+    // InternalFormat.g:5869:1: ruleXForLoopExpression returns [EObject current=null] : ( ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) ) ) ;
     public final EObject ruleXForLoopExpression() throws RecognitionException {
         EObject current = null;
 
@@ -17180,20 +17180,20 @@ public final EObject ruleXForLoopExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5872:28: ( ( ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5873:1: ( ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) ) )
+            // InternalFormat.g:5872:28: ( ( ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) ) ) )
+            // InternalFormat.g:5873:1: ( ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5873:1: ( ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5873:2: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) )
+            // InternalFormat.g:5873:1: ( ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) ) )
+            // InternalFormat.g:5873:2: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_forExpression_5_0= ruleXExpression ) ) otherlv_6= ')' ( (lv_eachExpression_7_0= ruleXExpression ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5873:2: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5873:3: ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
+            // InternalFormat.g:5873:2: ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) )
+            // InternalFormat.g:5873:3: ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5881:5: ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5881:6: () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':'
+            // InternalFormat.g:5881:5: ( () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' )
+            // InternalFormat.g:5881:6: () otherlv_1= 'for' otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':'
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5881:6: ()
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5882:5: 
+            // InternalFormat.g:5881:6: ()
+            // InternalFormat.g:5882:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -17205,30 +17205,30 @@ public final EObject ruleXForLoopExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,14,FOLLOW_14_in_ruleXForLoopExpression14120); if (state.failed) return current;
+            otherlv_1=(Token)match(input,14,FOLLOW_85); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXForLoopExpressionAccess().getForKeyword_0_0_1());
                   
             }
-            otherlv_2=(Token)match(input,33,FOLLOW_33_in_ruleXForLoopExpression14132); if (state.failed) return current;
+            otherlv_2=(Token)match(input,33,FOLLOW_60); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getXForLoopExpressionAccess().getLeftParenthesisKeyword_0_0_2());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5895:1: ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5896:1: (lv_declaredParam_3_0= ruleJvmFormalParameter )
+            // InternalFormat.g:5895:1: ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) )
+            // InternalFormat.g:5896:1: (lv_declaredParam_3_0= ruleJvmFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5896:1: (lv_declaredParam_3_0= ruleJvmFormalParameter )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5897:3: lv_declaredParam_3_0= ruleJvmFormalParameter
+            // InternalFormat.g:5896:1: (lv_declaredParam_3_0= ruleJvmFormalParameter )
+            // InternalFormat.g:5897:3: lv_declaredParam_3_0= ruleJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXForLoopExpressionAccess().getDeclaredParamJvmFormalParameterParserRuleCall_0_0_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleJvmFormalParameter_in_ruleXForLoopExpression14153);
+            pushFollow(FOLLOW_21);
             lv_declaredParam_3_0=ruleJvmFormalParameter();
 
             state._fsp--;
@@ -17242,7 +17242,7 @@ public final EObject ruleXForLoopExpression() throws RecognitionException {
                      			current, 
                      			"declaredParam",
                       		lv_declaredParam_3_0, 
-                      		"JvmFormalParameter");
+                      		"org.eclipse.xtext.xbase.Xbase.JvmFormalParameter");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -17252,7 +17252,7 @@ public final EObject ruleXForLoopExpression() throws RecognitionException {
 
             }
 
-            otherlv_4=(Token)match(input,30,FOLLOW_30_in_ruleXForLoopExpression14165); if (state.failed) return current;
+            otherlv_4=(Token)match(input,30,FOLLOW_48); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_4, grammarAccess.getXForLoopExpressionAccess().getColonKeyword_0_0_4());
@@ -17264,18 +17264,18 @@ public final EObject ruleXForLoopExpression() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5917:3: ( (lv_forExpression_5_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5918:1: (lv_forExpression_5_0= ruleXExpression )
+            // InternalFormat.g:5917:3: ( (lv_forExpression_5_0= ruleXExpression ) )
+            // InternalFormat.g:5918:1: (lv_forExpression_5_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5918:1: (lv_forExpression_5_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5919:3: lv_forExpression_5_0= ruleXExpression
+            // InternalFormat.g:5918:1: (lv_forExpression_5_0= ruleXExpression )
+            // InternalFormat.g:5919:3: lv_forExpression_5_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXForLoopExpressionAccess().getForExpressionXExpressionParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXForLoopExpression14188);
+            pushFollow(FOLLOW_30);
             lv_forExpression_5_0=ruleXExpression();
 
             state._fsp--;
@@ -17289,7 +17289,7 @@ public final EObject ruleXForLoopExpression() throws RecognitionException {
                      			current, 
                      			"forExpression",
                       		lv_forExpression_5_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -17299,24 +17299,24 @@ public final EObject ruleXForLoopExpression() throws RecognitionException {
 
             }
 
-            otherlv_6=(Token)match(input,34,FOLLOW_34_in_ruleXForLoopExpression14200); if (state.failed) return current;
+            otherlv_6=(Token)match(input,34,FOLLOW_48); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_6, grammarAccess.getXForLoopExpressionAccess().getRightParenthesisKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5939:1: ( (lv_eachExpression_7_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5940:1: (lv_eachExpression_7_0= ruleXExpression )
+            // InternalFormat.g:5939:1: ( (lv_eachExpression_7_0= ruleXExpression ) )
+            // InternalFormat.g:5940:1: (lv_eachExpression_7_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5940:1: (lv_eachExpression_7_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5941:3: lv_eachExpression_7_0= ruleXExpression
+            // InternalFormat.g:5940:1: (lv_eachExpression_7_0= ruleXExpression )
+            // InternalFormat.g:5941:3: lv_eachExpression_7_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXForLoopExpressionAccess().getEachExpressionXExpressionParserRuleCall_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXForLoopExpression14221);
+            pushFollow(FOLLOW_2);
             lv_eachExpression_7_0=ruleXExpression();
 
             state._fsp--;
@@ -17330,7 +17330,7 @@ public final EObject ruleXForLoopExpression() throws RecognitionException {
                      			current, 
                      			"eachExpression",
                       		lv_eachExpression_7_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -17363,7 +17363,7 @@ public final EObject ruleXForLoopExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXBasicForLoopExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5965:1: entryRuleXBasicForLoopExpression returns [EObject current=null] : iv_ruleXBasicForLoopExpression= ruleXBasicForLoopExpression EOF ;
+    // InternalFormat.g:5965:1: entryRuleXBasicForLoopExpression returns [EObject current=null] : iv_ruleXBasicForLoopExpression= ruleXBasicForLoopExpression EOF ;
     public final EObject entryRuleXBasicForLoopExpression() throws RecognitionException {
         EObject current = null;
 
@@ -17371,13 +17371,13 @@ public final EObject entryRuleXBasicForLoopExpression() throws RecognitionExcept
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5966:2: (iv_ruleXBasicForLoopExpression= ruleXBasicForLoopExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5967:2: iv_ruleXBasicForLoopExpression= ruleXBasicForLoopExpression EOF
+            // InternalFormat.g:5966:2: (iv_ruleXBasicForLoopExpression= ruleXBasicForLoopExpression EOF )
+            // InternalFormat.g:5967:2: iv_ruleXBasicForLoopExpression= ruleXBasicForLoopExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXBasicForLoopExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXBasicForLoopExpression_in_entryRuleXBasicForLoopExpression14257);
+            pushFollow(FOLLOW_1);
             iv_ruleXBasicForLoopExpression=ruleXBasicForLoopExpression();
 
             state._fsp--;
@@ -17385,7 +17385,7 @@ public final EObject entryRuleXBasicForLoopExpression() throws RecognitionExcept
             if ( state.backtracking==0 ) {
                current =iv_ruleXBasicForLoopExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXBasicForLoopExpression14267); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -17403,7 +17403,7 @@ public final EObject entryRuleXBasicForLoopExpression() throws RecognitionExcept
 
 
     // $ANTLR start "ruleXBasicForLoopExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5974:1: ruleXBasicForLoopExpression returns [EObject current=null] : ( () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) ) ) ;
+    // InternalFormat.g:5974:1: ruleXBasicForLoopExpression returns [EObject current=null] : ( () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) ) ) ;
     public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
         EObject current = null;
 
@@ -17430,14 +17430,14 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5977:28: ( ( () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5978:1: ( () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) ) )
+            // InternalFormat.g:5977:28: ( ( () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) ) ) )
+            // InternalFormat.g:5978:1: ( () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5978:1: ( () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5978:2: () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) )
+            // InternalFormat.g:5978:1: ( () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) ) )
+            // InternalFormat.g:5978:2: () otherlv_1= 'for' otherlv_2= '(' ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )? otherlv_6= ';' ( (lv_expression_7_0= ruleXExpression ) )? otherlv_8= ';' ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )? otherlv_12= ')' ( (lv_eachExpression_13_0= ruleXExpression ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5978:2: ()
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5979:5: 
+            // InternalFormat.g:5978:2: ()
+            // InternalFormat.g:5979:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -17449,19 +17449,19 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,14,FOLLOW_14_in_ruleXBasicForLoopExpression14313); if (state.failed) return current;
+            otherlv_1=(Token)match(input,14,FOLLOW_85); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXBasicForLoopExpressionAccess().getForKeyword_1());
                   
             }
-            otherlv_2=(Token)match(input,33,FOLLOW_33_in_ruleXBasicForLoopExpression14325); if (state.failed) return current;
+            otherlv_2=(Token)match(input,33,FOLLOW_91); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getXBasicForLoopExpressionAccess().getLeftParenthesisKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5992:1: ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )?
+            // InternalFormat.g:5992:1: ( ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )* )?
             int alt111=2;
             int LA111_0 = input.LA(1);
 
@@ -17470,20 +17470,20 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
             }
             switch (alt111) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5992:2: ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )*
+                    // InternalFormat.g:5992:2: ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )*
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5992:2: ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5993:1: (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration )
+                    // InternalFormat.g:5992:2: ( (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration ) )
+                    // InternalFormat.g:5993:1: (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5993:1: (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5994:3: lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration
+                    // InternalFormat.g:5993:1: (lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration )
+                    // InternalFormat.g:5994:3: lv_initExpressions_3_0= ruleXExpressionOrVarDeclaration
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXBasicForLoopExpressionAccess().getInitExpressionsXExpressionOrVarDeclarationParserRuleCall_3_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_ruleXBasicForLoopExpression14347);
+                    pushFollow(FOLLOW_25);
                     lv_initExpressions_3_0=ruleXExpressionOrVarDeclaration();
 
                     state._fsp--;
@@ -17497,7 +17497,7 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
                              			current, 
                              			"initExpressions",
                               		lv_initExpressions_3_0, 
-                              		"XExpressionOrVarDeclaration");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpressionOrVarDeclaration");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -17507,7 +17507,7 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6010:2: (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )*
+                    // InternalFormat.g:6010:2: (otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) )*
                     loop110:
                     do {
                         int alt110=2;
@@ -17520,26 +17520,26 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
 
                         switch (alt110) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6010:4: otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) )
+                    	    // InternalFormat.g:6010:4: otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) )
                     	    {
-                    	    otherlv_4=(Token)match(input,28,FOLLOW_28_in_ruleXBasicForLoopExpression14360); if (state.failed) return current;
+                    	    otherlv_4=(Token)match(input,28,FOLLOW_92); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_4, grammarAccess.getXBasicForLoopExpressionAccess().getCommaKeyword_3_1_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6014:1: ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) )
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6015:1: (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration )
+                    	    // InternalFormat.g:6014:1: ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) )
+                    	    // InternalFormat.g:6015:1: (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6015:1: (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration )
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6016:3: lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration
+                    	    // InternalFormat.g:6015:1: (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration )
+                    	    // InternalFormat.g:6016:3: lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getXBasicForLoopExpressionAccess().getInitExpressionsXExpressionOrVarDeclarationParserRuleCall_3_1_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_ruleXBasicForLoopExpression14381);
+                    	    pushFollow(FOLLOW_25);
                     	    lv_initExpressions_5_0=ruleXExpressionOrVarDeclaration();
 
                     	    state._fsp--;
@@ -17553,7 +17553,7 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
                     	             			current, 
                     	             			"initExpressions",
                     	              		lv_initExpressions_5_0, 
-                    	              		"XExpressionOrVarDeclaration");
+                    	              		"org.eclipse.xtext.xbase.Xbase.XExpressionOrVarDeclaration");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -17578,13 +17578,13 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
 
             }
 
-            otherlv_6=(Token)match(input,18,FOLLOW_18_in_ruleXBasicForLoopExpression14397); if (state.failed) return current;
+            otherlv_6=(Token)match(input,18,FOLLOW_93); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_6, grammarAccess.getXBasicForLoopExpressionAccess().getSemicolonKeyword_4());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6036:1: ( (lv_expression_7_0= ruleXExpression ) )?
+            // InternalFormat.g:6036:1: ( (lv_expression_7_0= ruleXExpression ) )?
             int alt112=2;
             int LA112_0 = input.LA(1);
 
@@ -17593,17 +17593,17 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
             }
             switch (alt112) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6037:1: (lv_expression_7_0= ruleXExpression )
+                    // InternalFormat.g:6037:1: (lv_expression_7_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6037:1: (lv_expression_7_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6038:3: lv_expression_7_0= ruleXExpression
+                    // InternalFormat.g:6037:1: (lv_expression_7_0= ruleXExpression )
+                    // InternalFormat.g:6038:3: lv_expression_7_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXBasicForLoopExpressionAccess().getExpressionXExpressionParserRuleCall_5_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXBasicForLoopExpression14418);
+                    pushFollow(FOLLOW_10);
                     lv_expression_7_0=ruleXExpression();
 
                     state._fsp--;
@@ -17617,7 +17617,7 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
                              			current, 
                              			"expression",
                               		lv_expression_7_0, 
-                              		"XExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -17630,13 +17630,13 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
 
             }
 
-            otherlv_8=(Token)match(input,18,FOLLOW_18_in_ruleXBasicForLoopExpression14431); if (state.failed) return current;
+            otherlv_8=(Token)match(input,18,FOLLOW_46); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_8, grammarAccess.getXBasicForLoopExpressionAccess().getSemicolonKeyword_6());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6058:1: ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )?
+            // InternalFormat.g:6058:1: ( ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )* )?
             int alt114=2;
             int LA114_0 = input.LA(1);
 
@@ -17645,20 +17645,20 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
             }
             switch (alt114) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6058:2: ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )*
+                    // InternalFormat.g:6058:2: ( (lv_updateExpressions_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )*
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6058:2: ( (lv_updateExpressions_9_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6059:1: (lv_updateExpressions_9_0= ruleXExpression )
+                    // InternalFormat.g:6058:2: ( (lv_updateExpressions_9_0= ruleXExpression ) )
+                    // InternalFormat.g:6059:1: (lv_updateExpressions_9_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6059:1: (lv_updateExpressions_9_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6060:3: lv_updateExpressions_9_0= ruleXExpression
+                    // InternalFormat.g:6059:1: (lv_updateExpressions_9_0= ruleXExpression )
+                    // InternalFormat.g:6060:3: lv_updateExpressions_9_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXBasicForLoopExpressionAccess().getUpdateExpressionsXExpressionParserRuleCall_7_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXBasicForLoopExpression14453);
+                    pushFollow(FOLLOW_47);
                     lv_updateExpressions_9_0=ruleXExpression();
 
                     state._fsp--;
@@ -17672,7 +17672,7 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
                              			current, 
                              			"updateExpressions",
                               		lv_updateExpressions_9_0, 
-                              		"XExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -17682,7 +17682,7 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6076:2: (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )*
+                    // InternalFormat.g:6076:2: (otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) )*
                     loop113:
                     do {
                         int alt113=2;
@@ -17695,26 +17695,26 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
 
                         switch (alt113) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6076:4: otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) )
+                    	    // InternalFormat.g:6076:4: otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) )
                     	    {
-                    	    otherlv_10=(Token)match(input,28,FOLLOW_28_in_ruleXBasicForLoopExpression14466); if (state.failed) return current;
+                    	    otherlv_10=(Token)match(input,28,FOLLOW_48); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_10, grammarAccess.getXBasicForLoopExpressionAccess().getCommaKeyword_7_1_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6080:1: ( (lv_updateExpressions_11_0= ruleXExpression ) )
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6081:1: (lv_updateExpressions_11_0= ruleXExpression )
+                    	    // InternalFormat.g:6080:1: ( (lv_updateExpressions_11_0= ruleXExpression ) )
+                    	    // InternalFormat.g:6081:1: (lv_updateExpressions_11_0= ruleXExpression )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6081:1: (lv_updateExpressions_11_0= ruleXExpression )
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6082:3: lv_updateExpressions_11_0= ruleXExpression
+                    	    // InternalFormat.g:6081:1: (lv_updateExpressions_11_0= ruleXExpression )
+                    	    // InternalFormat.g:6082:3: lv_updateExpressions_11_0= ruleXExpression
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getXBasicForLoopExpressionAccess().getUpdateExpressionsXExpressionParserRuleCall_7_1_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleXExpression_in_ruleXBasicForLoopExpression14487);
+                    	    pushFollow(FOLLOW_47);
                     	    lv_updateExpressions_11_0=ruleXExpression();
 
                     	    state._fsp--;
@@ -17728,7 +17728,7 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
                     	             			current, 
                     	             			"updateExpressions",
                     	              		lv_updateExpressions_11_0, 
-                    	              		"XExpression");
+                    	              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -17753,24 +17753,24 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
 
             }
 
-            otherlv_12=(Token)match(input,34,FOLLOW_34_in_ruleXBasicForLoopExpression14503); if (state.failed) return current;
+            otherlv_12=(Token)match(input,34,FOLLOW_48); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_12, grammarAccess.getXBasicForLoopExpressionAccess().getRightParenthesisKeyword_8());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6102:1: ( (lv_eachExpression_13_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6103:1: (lv_eachExpression_13_0= ruleXExpression )
+            // InternalFormat.g:6102:1: ( (lv_eachExpression_13_0= ruleXExpression ) )
+            // InternalFormat.g:6103:1: (lv_eachExpression_13_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6103:1: (lv_eachExpression_13_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6104:3: lv_eachExpression_13_0= ruleXExpression
+            // InternalFormat.g:6103:1: (lv_eachExpression_13_0= ruleXExpression )
+            // InternalFormat.g:6104:3: lv_eachExpression_13_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXBasicForLoopExpressionAccess().getEachExpressionXExpressionParserRuleCall_9_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXBasicForLoopExpression14524);
+            pushFollow(FOLLOW_2);
             lv_eachExpression_13_0=ruleXExpression();
 
             state._fsp--;
@@ -17784,7 +17784,7 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
                      			current, 
                      			"eachExpression",
                       		lv_eachExpression_13_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -17817,7 +17817,7 @@ public final EObject ruleXBasicForLoopExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXWhileExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6128:1: entryRuleXWhileExpression returns [EObject current=null] : iv_ruleXWhileExpression= ruleXWhileExpression EOF ;
+    // InternalFormat.g:6128:1: entryRuleXWhileExpression returns [EObject current=null] : iv_ruleXWhileExpression= ruleXWhileExpression EOF ;
     public final EObject entryRuleXWhileExpression() throws RecognitionException {
         EObject current = null;
 
@@ -17825,13 +17825,13 @@ public final EObject entryRuleXWhileExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6129:2: (iv_ruleXWhileExpression= ruleXWhileExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6130:2: iv_ruleXWhileExpression= ruleXWhileExpression EOF
+            // InternalFormat.g:6129:2: (iv_ruleXWhileExpression= ruleXWhileExpression EOF )
+            // InternalFormat.g:6130:2: iv_ruleXWhileExpression= ruleXWhileExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXWhileExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXWhileExpression_in_entryRuleXWhileExpression14560);
+            pushFollow(FOLLOW_1);
             iv_ruleXWhileExpression=ruleXWhileExpression();
 
             state._fsp--;
@@ -17839,7 +17839,7 @@ public final EObject entryRuleXWhileExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXWhileExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXWhileExpression14570); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -17857,7 +17857,7 @@ public final EObject entryRuleXWhileExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXWhileExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6137:1: ruleXWhileExpression returns [EObject current=null] : ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) ) ;
+    // InternalFormat.g:6137:1: ruleXWhileExpression returns [EObject current=null] : ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) ) ;
     public final EObject ruleXWhileExpression() throws RecognitionException {
         EObject current = null;
 
@@ -17872,14 +17872,14 @@ public final EObject ruleXWhileExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6140:28: ( ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6141:1: ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) )
+            // InternalFormat.g:6140:28: ( ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) ) )
+            // InternalFormat.g:6141:1: ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6141:1: ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6141:2: () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) )
+            // InternalFormat.g:6141:1: ( () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) ) )
+            // InternalFormat.g:6141:2: () otherlv_1= 'while' otherlv_2= '(' ( (lv_predicate_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_body_5_0= ruleXExpression ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6141:2: ()
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6142:5: 
+            // InternalFormat.g:6141:2: ()
+            // InternalFormat.g:6142:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -17891,30 +17891,30 @@ public final EObject ruleXWhileExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,93,FOLLOW_93_in_ruleXWhileExpression14616); if (state.failed) return current;
+            otherlv_1=(Token)match(input,93,FOLLOW_85); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXWhileExpressionAccess().getWhileKeyword_1());
                   
             }
-            otherlv_2=(Token)match(input,33,FOLLOW_33_in_ruleXWhileExpression14628); if (state.failed) return current;
+            otherlv_2=(Token)match(input,33,FOLLOW_48); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getXWhileExpressionAccess().getLeftParenthesisKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6155:1: ( (lv_predicate_3_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6156:1: (lv_predicate_3_0= ruleXExpression )
+            // InternalFormat.g:6155:1: ( (lv_predicate_3_0= ruleXExpression ) )
+            // InternalFormat.g:6156:1: (lv_predicate_3_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6156:1: (lv_predicate_3_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6157:3: lv_predicate_3_0= ruleXExpression
+            // InternalFormat.g:6156:1: (lv_predicate_3_0= ruleXExpression )
+            // InternalFormat.g:6157:3: lv_predicate_3_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXWhileExpressionAccess().getPredicateXExpressionParserRuleCall_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXWhileExpression14649);
+            pushFollow(FOLLOW_30);
             lv_predicate_3_0=ruleXExpression();
 
             state._fsp--;
@@ -17928,7 +17928,7 @@ public final EObject ruleXWhileExpression() throws RecognitionException {
                      			current, 
                      			"predicate",
                       		lv_predicate_3_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -17938,24 +17938,24 @@ public final EObject ruleXWhileExpression() throws RecognitionException {
 
             }
 
-            otherlv_4=(Token)match(input,34,FOLLOW_34_in_ruleXWhileExpression14661); if (state.failed) return current;
+            otherlv_4=(Token)match(input,34,FOLLOW_48); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_4, grammarAccess.getXWhileExpressionAccess().getRightParenthesisKeyword_4());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6177:1: ( (lv_body_5_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6178:1: (lv_body_5_0= ruleXExpression )
+            // InternalFormat.g:6177:1: ( (lv_body_5_0= ruleXExpression ) )
+            // InternalFormat.g:6178:1: (lv_body_5_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6178:1: (lv_body_5_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6179:3: lv_body_5_0= ruleXExpression
+            // InternalFormat.g:6178:1: (lv_body_5_0= ruleXExpression )
+            // InternalFormat.g:6179:3: lv_body_5_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXWhileExpressionAccess().getBodyXExpressionParserRuleCall_5_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXWhileExpression14682);
+            pushFollow(FOLLOW_2);
             lv_body_5_0=ruleXExpression();
 
             state._fsp--;
@@ -17969,7 +17969,7 @@ public final EObject ruleXWhileExpression() throws RecognitionException {
                      			current, 
                      			"body",
                       		lv_body_5_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -18002,7 +18002,7 @@ public final EObject ruleXWhileExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXDoWhileExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6203:1: entryRuleXDoWhileExpression returns [EObject current=null] : iv_ruleXDoWhileExpression= ruleXDoWhileExpression EOF ;
+    // InternalFormat.g:6203:1: entryRuleXDoWhileExpression returns [EObject current=null] : iv_ruleXDoWhileExpression= ruleXDoWhileExpression EOF ;
     public final EObject entryRuleXDoWhileExpression() throws RecognitionException {
         EObject current = null;
 
@@ -18010,13 +18010,13 @@ public final EObject entryRuleXDoWhileExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6204:2: (iv_ruleXDoWhileExpression= ruleXDoWhileExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6205:2: iv_ruleXDoWhileExpression= ruleXDoWhileExpression EOF
+            // InternalFormat.g:6204:2: (iv_ruleXDoWhileExpression= ruleXDoWhileExpression EOF )
+            // InternalFormat.g:6205:2: iv_ruleXDoWhileExpression= ruleXDoWhileExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXDoWhileExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXDoWhileExpression_in_entryRuleXDoWhileExpression14718);
+            pushFollow(FOLLOW_1);
             iv_ruleXDoWhileExpression=ruleXDoWhileExpression();
 
             state._fsp--;
@@ -18024,7 +18024,7 @@ public final EObject entryRuleXDoWhileExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXDoWhileExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXDoWhileExpression14728); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -18042,7 +18042,7 @@ public final EObject entryRuleXDoWhileExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXDoWhileExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6212:1: ruleXDoWhileExpression returns [EObject current=null] : ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' ) ;
+    // InternalFormat.g:6212:1: ruleXDoWhileExpression returns [EObject current=null] : ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' ) ;
     public final EObject ruleXDoWhileExpression() throws RecognitionException {
         EObject current = null;
 
@@ -18058,14 +18058,14 @@ public final EObject ruleXDoWhileExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6215:28: ( ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6216:1: ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' )
+            // InternalFormat.g:6215:28: ( ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' ) )
+            // InternalFormat.g:6216:1: ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6216:1: ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6216:2: () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')'
+            // InternalFormat.g:6216:1: ( () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')' )
+            // InternalFormat.g:6216:2: () otherlv_1= 'do' ( (lv_body_2_0= ruleXExpression ) ) otherlv_3= 'while' otherlv_4= '(' ( (lv_predicate_5_0= ruleXExpression ) ) otherlv_6= ')'
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6216:2: ()
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6217:5: 
+            // InternalFormat.g:6216:2: ()
+            // InternalFormat.g:6217:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -18077,24 +18077,24 @@ public final EObject ruleXDoWhileExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,94,FOLLOW_94_in_ruleXDoWhileExpression14774); if (state.failed) return current;
+            otherlv_1=(Token)match(input,94,FOLLOW_48); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXDoWhileExpressionAccess().getDoKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6226:1: ( (lv_body_2_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6227:1: (lv_body_2_0= ruleXExpression )
+            // InternalFormat.g:6226:1: ( (lv_body_2_0= ruleXExpression ) )
+            // InternalFormat.g:6227:1: (lv_body_2_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6227:1: (lv_body_2_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6228:3: lv_body_2_0= ruleXExpression
+            // InternalFormat.g:6227:1: (lv_body_2_0= ruleXExpression )
+            // InternalFormat.g:6228:3: lv_body_2_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXDoWhileExpressionAccess().getBodyXExpressionParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXDoWhileExpression14795);
+            pushFollow(FOLLOW_94);
             lv_body_2_0=ruleXExpression();
 
             state._fsp--;
@@ -18108,7 +18108,7 @@ public final EObject ruleXDoWhileExpression() throws RecognitionException {
                      			current, 
                      			"body",
                       		lv_body_2_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -18118,30 +18118,30 @@ public final EObject ruleXDoWhileExpression() throws RecognitionException {
 
             }
 
-            otherlv_3=(Token)match(input,93,FOLLOW_93_in_ruleXDoWhileExpression14807); if (state.failed) return current;
+            otherlv_3=(Token)match(input,93,FOLLOW_85); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_3, grammarAccess.getXDoWhileExpressionAccess().getWhileKeyword_3());
                   
             }
-            otherlv_4=(Token)match(input,33,FOLLOW_33_in_ruleXDoWhileExpression14819); if (state.failed) return current;
+            otherlv_4=(Token)match(input,33,FOLLOW_48); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_4, grammarAccess.getXDoWhileExpressionAccess().getLeftParenthesisKeyword_4());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6252:1: ( (lv_predicate_5_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6253:1: (lv_predicate_5_0= ruleXExpression )
+            // InternalFormat.g:6252:1: ( (lv_predicate_5_0= ruleXExpression ) )
+            // InternalFormat.g:6253:1: (lv_predicate_5_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6253:1: (lv_predicate_5_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6254:3: lv_predicate_5_0= ruleXExpression
+            // InternalFormat.g:6253:1: (lv_predicate_5_0= ruleXExpression )
+            // InternalFormat.g:6254:3: lv_predicate_5_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXDoWhileExpressionAccess().getPredicateXExpressionParserRuleCall_5_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXDoWhileExpression14840);
+            pushFollow(FOLLOW_30);
             lv_predicate_5_0=ruleXExpression();
 
             state._fsp--;
@@ -18155,7 +18155,7 @@ public final EObject ruleXDoWhileExpression() throws RecognitionException {
                      			current, 
                      			"predicate",
                       		lv_predicate_5_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -18165,7 +18165,7 @@ public final EObject ruleXDoWhileExpression() throws RecognitionException {
 
             }
 
-            otherlv_6=(Token)match(input,34,FOLLOW_34_in_ruleXDoWhileExpression14852); if (state.failed) return current;
+            otherlv_6=(Token)match(input,34,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_6, grammarAccess.getXDoWhileExpressionAccess().getRightParenthesisKeyword_6());
@@ -18194,7 +18194,7 @@ public final EObject ruleXDoWhileExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXBlockExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6282:1: entryRuleXBlockExpression returns [EObject current=null] : iv_ruleXBlockExpression= ruleXBlockExpression EOF ;
+    // InternalFormat.g:6282:1: entryRuleXBlockExpression returns [EObject current=null] : iv_ruleXBlockExpression= ruleXBlockExpression EOF ;
     public final EObject entryRuleXBlockExpression() throws RecognitionException {
         EObject current = null;
 
@@ -18202,13 +18202,13 @@ public final EObject entryRuleXBlockExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6283:2: (iv_ruleXBlockExpression= ruleXBlockExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6284:2: iv_ruleXBlockExpression= ruleXBlockExpression EOF
+            // InternalFormat.g:6283:2: (iv_ruleXBlockExpression= ruleXBlockExpression EOF )
+            // InternalFormat.g:6284:2: iv_ruleXBlockExpression= ruleXBlockExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXBlockExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXBlockExpression_in_entryRuleXBlockExpression14888);
+            pushFollow(FOLLOW_1);
             iv_ruleXBlockExpression=ruleXBlockExpression();
 
             state._fsp--;
@@ -18216,7 +18216,7 @@ public final EObject entryRuleXBlockExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXBlockExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXBlockExpression14898); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -18234,7 +18234,7 @@ public final EObject entryRuleXBlockExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXBlockExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6291:1: ruleXBlockExpression returns [EObject current=null] : ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' ) ;
+    // InternalFormat.g:6291:1: ruleXBlockExpression returns [EObject current=null] : ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' ) ;
     public final EObject ruleXBlockExpression() throws RecognitionException {
         EObject current = null;
 
@@ -18247,14 +18247,14 @@ public final EObject ruleXBlockExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6294:28: ( ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6295:1: ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' )
+            // InternalFormat.g:6294:28: ( ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' ) )
+            // InternalFormat.g:6295:1: ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6295:1: ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6295:2: () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}'
+            // InternalFormat.g:6295:1: ( () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}' )
+            // InternalFormat.g:6295:2: () otherlv_1= '{' ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )* otherlv_4= '}'
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6295:2: ()
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6296:5: 
+            // InternalFormat.g:6295:2: ()
+            // InternalFormat.g:6296:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -18266,13 +18266,13 @@ public final EObject ruleXBlockExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,23,FOLLOW_23_in_ruleXBlockExpression14944); if (state.failed) return current;
+            otherlv_1=(Token)match(input,23,FOLLOW_95); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXBlockExpressionAccess().getLeftCurlyBracketKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6305:1: ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )*
+            // InternalFormat.g:6305:1: ( ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )? )*
             loop116:
             do {
                 int alt116=2;
@@ -18285,20 +18285,20 @@ public final EObject ruleXBlockExpression() throws RecognitionException {
 
                 switch (alt116) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6305:2: ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )?
+            	    // InternalFormat.g:6305:2: ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) ) (otherlv_3= ';' )?
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6305:2: ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6306:1: (lv_expressions_2_0= ruleXExpressionOrVarDeclaration )
+            	    // InternalFormat.g:6305:2: ( (lv_expressions_2_0= ruleXExpressionOrVarDeclaration ) )
+            	    // InternalFormat.g:6306:1: (lv_expressions_2_0= ruleXExpressionOrVarDeclaration )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6306:1: (lv_expressions_2_0= ruleXExpressionOrVarDeclaration )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6307:3: lv_expressions_2_0= ruleXExpressionOrVarDeclaration
+            	    // InternalFormat.g:6306:1: (lv_expressions_2_0= ruleXExpressionOrVarDeclaration )
+            	    // InternalFormat.g:6307:3: lv_expressions_2_0= ruleXExpressionOrVarDeclaration
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXBlockExpressionAccess().getExpressionsXExpressionOrVarDeclarationParserRuleCall_2_0_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_ruleXBlockExpression14966);
+            	    pushFollow(FOLLOW_96);
             	    lv_expressions_2_0=ruleXExpressionOrVarDeclaration();
 
             	    state._fsp--;
@@ -18312,7 +18312,7 @@ public final EObject ruleXBlockExpression() throws RecognitionException {
             	             			current, 
             	             			"expressions",
             	              		lv_expressions_2_0, 
-            	              		"XExpressionOrVarDeclaration");
+            	              		"org.eclipse.xtext.xbase.Xbase.XExpressionOrVarDeclaration");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -18322,7 +18322,7 @@ public final EObject ruleXBlockExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6323:2: (otherlv_3= ';' )?
+            	    // InternalFormat.g:6323:2: (otherlv_3= ';' )?
             	    int alt115=2;
             	    int LA115_0 = input.LA(1);
 
@@ -18331,9 +18331,9 @@ public final EObject ruleXBlockExpression() throws RecognitionException {
             	    }
             	    switch (alt115) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6323:4: otherlv_3= ';'
+            	            // InternalFormat.g:6323:4: otherlv_3= ';'
             	            {
-            	            otherlv_3=(Token)match(input,18,FOLLOW_18_in_ruleXBlockExpression14979); if (state.failed) return current;
+            	            otherlv_3=(Token)match(input,18,FOLLOW_95); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                  	newLeafNode(otherlv_3, grammarAccess.getXBlockExpressionAccess().getSemicolonKeyword_2_1());
@@ -18354,7 +18354,7 @@ public final EObject ruleXBlockExpression() throws RecognitionException {
                 }
             } while (true);
 
-            otherlv_4=(Token)match(input,24,FOLLOW_24_in_ruleXBlockExpression14995); if (state.failed) return current;
+            otherlv_4=(Token)match(input,24,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_4, grammarAccess.getXBlockExpressionAccess().getRightCurlyBracketKeyword_3());
@@ -18383,7 +18383,7 @@ public final EObject ruleXBlockExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXExpressionOrVarDeclaration"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6339:1: entryRuleXExpressionOrVarDeclaration returns [EObject current=null] : iv_ruleXExpressionOrVarDeclaration= ruleXExpressionOrVarDeclaration EOF ;
+    // InternalFormat.g:6339:1: entryRuleXExpressionOrVarDeclaration returns [EObject current=null] : iv_ruleXExpressionOrVarDeclaration= ruleXExpressionOrVarDeclaration EOF ;
     public final EObject entryRuleXExpressionOrVarDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -18391,13 +18391,13 @@ public final EObject entryRuleXExpressionOrVarDeclaration() throws RecognitionEx
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6340:2: (iv_ruleXExpressionOrVarDeclaration= ruleXExpressionOrVarDeclaration EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6341:2: iv_ruleXExpressionOrVarDeclaration= ruleXExpressionOrVarDeclaration EOF
+            // InternalFormat.g:6340:2: (iv_ruleXExpressionOrVarDeclaration= ruleXExpressionOrVarDeclaration EOF )
+            // InternalFormat.g:6341:2: iv_ruleXExpressionOrVarDeclaration= ruleXExpressionOrVarDeclaration EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXExpressionOrVarDeclarationRule()); 
             }
-            pushFollow(FOLLOW_ruleXExpressionOrVarDeclaration_in_entryRuleXExpressionOrVarDeclaration15031);
+            pushFollow(FOLLOW_1);
             iv_ruleXExpressionOrVarDeclaration=ruleXExpressionOrVarDeclaration();
 
             state._fsp--;
@@ -18405,7 +18405,7 @@ public final EObject entryRuleXExpressionOrVarDeclaration() throws RecognitionEx
             if ( state.backtracking==0 ) {
                current =iv_ruleXExpressionOrVarDeclaration; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXExpressionOrVarDeclaration15041); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -18423,7 +18423,7 @@ public final EObject entryRuleXExpressionOrVarDeclaration() throws RecognitionEx
 
 
     // $ANTLR start "ruleXExpressionOrVarDeclaration"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6348:1: ruleXExpressionOrVarDeclaration returns [EObject current=null] : (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression ) ;
+    // InternalFormat.g:6348:1: ruleXExpressionOrVarDeclaration returns [EObject current=null] : (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression ) ;
     public final EObject ruleXExpressionOrVarDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -18435,10 +18435,10 @@ public final EObject ruleXExpressionOrVarDeclaration() throws RecognitionExcepti
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6351:28: ( (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6352:1: (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression )
+            // InternalFormat.g:6351:28: ( (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression ) )
+            // InternalFormat.g:6352:1: (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6352:1: (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression )
+            // InternalFormat.g:6352:1: (this_XVariableDeclaration_0= ruleXVariableDeclaration | this_XExpression_1= ruleXExpression )
             int alt117=2;
             int LA117_0 = input.LA(1);
 
@@ -18457,14 +18457,14 @@ else if ( ((LA117_0>=RULE_ID && LA117_0<=RULE_DECIMAL)||LA117_0==14||LA117_0==16
             }
             switch (alt117) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6353:5: this_XVariableDeclaration_0= ruleXVariableDeclaration
+                    // InternalFormat.g:6353:5: this_XVariableDeclaration_0= ruleXVariableDeclaration
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXExpressionOrVarDeclarationAccess().getXVariableDeclarationParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXVariableDeclaration_in_ruleXExpressionOrVarDeclaration15088);
+                    pushFollow(FOLLOW_2);
                     this_XVariableDeclaration_0=ruleXVariableDeclaration();
 
                     state._fsp--;
@@ -18479,14 +18479,14 @@ else if ( ((LA117_0>=RULE_ID && LA117_0<=RULE_DECIMAL)||LA117_0==14||LA117_0==16
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6363:5: this_XExpression_1= ruleXExpression
+                    // InternalFormat.g:6363:5: this_XExpression_1= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getXExpressionOrVarDeclarationAccess().getXExpressionParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXExpressionOrVarDeclaration15115);
+                    pushFollow(FOLLOW_2);
                     this_XExpression_1=ruleXExpression();
 
                     state._fsp--;
@@ -18523,7 +18523,7 @@ else if ( ((LA117_0>=RULE_ID && LA117_0<=RULE_DECIMAL)||LA117_0==14||LA117_0==16
 
 
     // $ANTLR start "entryRuleXVariableDeclaration"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6379:1: entryRuleXVariableDeclaration returns [EObject current=null] : iv_ruleXVariableDeclaration= ruleXVariableDeclaration EOF ;
+    // InternalFormat.g:6379:1: entryRuleXVariableDeclaration returns [EObject current=null] : iv_ruleXVariableDeclaration= ruleXVariableDeclaration EOF ;
     public final EObject entryRuleXVariableDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -18531,13 +18531,13 @@ public final EObject entryRuleXVariableDeclaration() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6380:2: (iv_ruleXVariableDeclaration= ruleXVariableDeclaration EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6381:2: iv_ruleXVariableDeclaration= ruleXVariableDeclaration EOF
+            // InternalFormat.g:6380:2: (iv_ruleXVariableDeclaration= ruleXVariableDeclaration EOF )
+            // InternalFormat.g:6381:2: iv_ruleXVariableDeclaration= ruleXVariableDeclaration EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXVariableDeclarationRule()); 
             }
-            pushFollow(FOLLOW_ruleXVariableDeclaration_in_entryRuleXVariableDeclaration15150);
+            pushFollow(FOLLOW_1);
             iv_ruleXVariableDeclaration=ruleXVariableDeclaration();
 
             state._fsp--;
@@ -18545,7 +18545,7 @@ public final EObject entryRuleXVariableDeclaration() throws RecognitionException
             if ( state.backtracking==0 ) {
                current =iv_ruleXVariableDeclaration; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXVariableDeclaration15160); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -18563,7 +18563,7 @@ public final EObject entryRuleXVariableDeclaration() throws RecognitionException
 
 
     // $ANTLR start "ruleXVariableDeclaration"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6388:1: ruleXVariableDeclaration returns [EObject current=null] : ( () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )? ) ;
+    // InternalFormat.g:6388:1: ruleXVariableDeclaration returns [EObject current=null] : ( () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )? ) ;
     public final EObject ruleXVariableDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -18582,14 +18582,14 @@ public final EObject ruleXVariableDeclaration() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6391:28: ( ( () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6392:1: ( () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )? )
+            // InternalFormat.g:6391:28: ( ( () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )? ) )
+            // InternalFormat.g:6392:1: ( () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6392:1: ( () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )? )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6392:2: () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )?
+            // InternalFormat.g:6392:1: ( () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )? )
+            // InternalFormat.g:6392:2: () ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' ) ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) ) (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )?
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6392:2: ()
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6393:5: 
+            // InternalFormat.g:6392:2: ()
+            // InternalFormat.g:6393:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -18601,7 +18601,7 @@ public final EObject ruleXVariableDeclaration() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6398:2: ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' )
+            // InternalFormat.g:6398:2: ( ( (lv_writeable_1_0= 'var' ) ) | otherlv_2= 'val' )
             int alt118=2;
             int LA118_0 = input.LA(1);
 
@@ -18620,15 +18620,15 @@ else if ( (LA118_0==52) ) {
             }
             switch (alt118) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6398:3: ( (lv_writeable_1_0= 'var' ) )
+                    // InternalFormat.g:6398:3: ( (lv_writeable_1_0= 'var' ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6398:3: ( (lv_writeable_1_0= 'var' ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6399:1: (lv_writeable_1_0= 'var' )
+                    // InternalFormat.g:6398:3: ( (lv_writeable_1_0= 'var' ) )
+                    // InternalFormat.g:6399:1: (lv_writeable_1_0= 'var' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6399:1: (lv_writeable_1_0= 'var' )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6400:3: lv_writeable_1_0= 'var'
+                    // InternalFormat.g:6399:1: (lv_writeable_1_0= 'var' )
+                    // InternalFormat.g:6400:3: lv_writeable_1_0= 'var'
                     {
-                    lv_writeable_1_0=(Token)match(input,95,FOLLOW_95_in_ruleXVariableDeclaration15213); if (state.failed) return current;
+                    lv_writeable_1_0=(Token)match(input,95,FOLLOW_60); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_writeable_1_0, grammarAccess.getXVariableDeclarationAccess().getWriteableVarKeyword_1_0_0());
@@ -18652,9 +18652,9 @@ else if ( (LA118_0==52) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6414:7: otherlv_2= 'val'
+                    // InternalFormat.g:6414:7: otherlv_2= 'val'
                     {
-                    otherlv_2=(Token)match(input,52,FOLLOW_52_in_ruleXVariableDeclaration15244); if (state.failed) return current;
+                    otherlv_2=(Token)match(input,52,FOLLOW_60); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_2, grammarAccess.getXVariableDeclarationAccess().getValKeyword_1_1());
@@ -18666,7 +18666,7 @@ else if ( (LA118_0==52) ) {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6418:2: ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) )
+            // InternalFormat.g:6418:2: ( ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) ) | ( (lv_name_5_0= ruleValidID ) ) )
             int alt119=2;
             int LA119_0 = input.LA(1);
 
@@ -18736,26 +18736,26 @@ else if ( (LA119_0==32) && (synpred35_InternalFormat())) {
             }
             switch (alt119) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6418:3: ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) )
+                    // InternalFormat.g:6418:3: ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6418:3: ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6418:4: ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) )
+                    // InternalFormat.g:6418:3: ( ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) ) )
+                    // InternalFormat.g:6418:4: ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )=> ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6426:6: ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6426:7: ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) )
+                    // InternalFormat.g:6426:6: ( ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) ) )
+                    // InternalFormat.g:6426:7: ( (lv_type_3_0= ruleJvmTypeReference ) ) ( (lv_name_4_0= ruleValidID ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6426:7: ( (lv_type_3_0= ruleJvmTypeReference ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6427:1: (lv_type_3_0= ruleJvmTypeReference )
+                    // InternalFormat.g:6426:7: ( (lv_type_3_0= ruleJvmTypeReference ) )
+                    // InternalFormat.g:6427:1: (lv_type_3_0= ruleJvmTypeReference )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6427:1: (lv_type_3_0= ruleJvmTypeReference )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6428:3: lv_type_3_0= ruleJvmTypeReference
+                    // InternalFormat.g:6427:1: (lv_type_3_0= ruleJvmTypeReference )
+                    // InternalFormat.g:6428:3: lv_type_3_0= ruleJvmTypeReference
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXVariableDeclarationAccess().getTypeJvmTypeReferenceParserRuleCall_2_0_0_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleXVariableDeclaration15292);
+                    pushFollow(FOLLOW_7);
                     lv_type_3_0=ruleJvmTypeReference();
 
                     state._fsp--;
@@ -18769,7 +18769,7 @@ else if ( (LA119_0==32) && (synpred35_InternalFormat())) {
                              			current, 
                              			"type",
                               		lv_type_3_0, 
-                              		"JvmTypeReference");
+                              		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -18779,18 +18779,18 @@ else if ( (LA119_0==32) && (synpred35_InternalFormat())) {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6444:2: ( (lv_name_4_0= ruleValidID ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6445:1: (lv_name_4_0= ruleValidID )
+                    // InternalFormat.g:6444:2: ( (lv_name_4_0= ruleValidID ) )
+                    // InternalFormat.g:6445:1: (lv_name_4_0= ruleValidID )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6445:1: (lv_name_4_0= ruleValidID )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6446:3: lv_name_4_0= ruleValidID
+                    // InternalFormat.g:6445:1: (lv_name_4_0= ruleValidID )
+                    // InternalFormat.g:6446:3: lv_name_4_0= ruleValidID
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXVariableDeclarationAccess().getNameValidIDParserRuleCall_2_0_0_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleValidID_in_ruleXVariableDeclaration15313);
+                    pushFollow(FOLLOW_97);
                     lv_name_4_0=ruleValidID();
 
                     state._fsp--;
@@ -18804,7 +18804,7 @@ else if ( (LA119_0==32) && (synpred35_InternalFormat())) {
                              			current, 
                              			"name",
                               		lv_name_4_0, 
-                              		"ValidID");
+                              		"com.avaloq.tools.ddk.xtext.format.Format.ValidID");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -18824,20 +18824,20 @@ else if ( (LA119_0==32) && (synpred35_InternalFormat())) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6463:6: ( (lv_name_5_0= ruleValidID ) )
+                    // InternalFormat.g:6463:6: ( (lv_name_5_0= ruleValidID ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6463:6: ( (lv_name_5_0= ruleValidID ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6464:1: (lv_name_5_0= ruleValidID )
+                    // InternalFormat.g:6463:6: ( (lv_name_5_0= ruleValidID ) )
+                    // InternalFormat.g:6464:1: (lv_name_5_0= ruleValidID )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6464:1: (lv_name_5_0= ruleValidID )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6465:3: lv_name_5_0= ruleValidID
+                    // InternalFormat.g:6464:1: (lv_name_5_0= ruleValidID )
+                    // InternalFormat.g:6465:3: lv_name_5_0= ruleValidID
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXVariableDeclarationAccess().getNameValidIDParserRuleCall_2_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleValidID_in_ruleXVariableDeclaration15342);
+                    pushFollow(FOLLOW_97);
                     lv_name_5_0=ruleValidID();
 
                     state._fsp--;
@@ -18851,7 +18851,7 @@ else if ( (LA119_0==32) && (synpred35_InternalFormat())) {
                              			current, 
                              			"name",
                               		lv_name_5_0, 
-                              		"ValidID");
+                              		"com.avaloq.tools.ddk.xtext.format.Format.ValidID");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -18867,7 +18867,7 @@ else if ( (LA119_0==32) && (synpred35_InternalFormat())) {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6481:3: (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )?
+            // InternalFormat.g:6481:3: (otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) )?
             int alt120=2;
             int LA120_0 = input.LA(1);
 
@@ -18876,26 +18876,26 @@ else if ( (LA119_0==32) && (synpred35_InternalFormat())) {
             }
             switch (alt120) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6481:5: otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) )
+                    // InternalFormat.g:6481:5: otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) )
                     {
-                    otherlv_6=(Token)match(input,21,FOLLOW_21_in_ruleXVariableDeclaration15356); if (state.failed) return current;
+                    otherlv_6=(Token)match(input,21,FOLLOW_48); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_6, grammarAccess.getXVariableDeclarationAccess().getEqualsSignKeyword_3_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6485:1: ( (lv_right_7_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6486:1: (lv_right_7_0= ruleXExpression )
+                    // InternalFormat.g:6485:1: ( (lv_right_7_0= ruleXExpression ) )
+                    // InternalFormat.g:6486:1: (lv_right_7_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6486:1: (lv_right_7_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6487:3: lv_right_7_0= ruleXExpression
+                    // InternalFormat.g:6486:1: (lv_right_7_0= ruleXExpression )
+                    // InternalFormat.g:6487:3: lv_right_7_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXVariableDeclarationAccess().getRightXExpressionParserRuleCall_3_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXVariableDeclaration15377);
+                    pushFollow(FOLLOW_2);
                     lv_right_7_0=ruleXExpression();
 
                     state._fsp--;
@@ -18909,7 +18909,7 @@ else if ( (LA119_0==32) && (synpred35_InternalFormat())) {
                              			current, 
                              			"right",
                               		lv_right_7_0, 
-                              		"XExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -18948,7 +18948,7 @@ else if ( (LA119_0==32) && (synpred35_InternalFormat())) {
 
 
     // $ANTLR start "entryRuleJvmFormalParameter"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6511:1: entryRuleJvmFormalParameter returns [EObject current=null] : iv_ruleJvmFormalParameter= ruleJvmFormalParameter EOF ;
+    // InternalFormat.g:6511:1: entryRuleJvmFormalParameter returns [EObject current=null] : iv_ruleJvmFormalParameter= ruleJvmFormalParameter EOF ;
     public final EObject entryRuleJvmFormalParameter() throws RecognitionException {
         EObject current = null;
 
@@ -18956,13 +18956,13 @@ public final EObject entryRuleJvmFormalParameter() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6512:2: (iv_ruleJvmFormalParameter= ruleJvmFormalParameter EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6513:2: iv_ruleJvmFormalParameter= ruleJvmFormalParameter EOF
+            // InternalFormat.g:6512:2: (iv_ruleJvmFormalParameter= ruleJvmFormalParameter EOF )
+            // InternalFormat.g:6513:2: iv_ruleJvmFormalParameter= ruleJvmFormalParameter EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmFormalParameterRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmFormalParameter_in_entryRuleJvmFormalParameter15415);
+            pushFollow(FOLLOW_1);
             iv_ruleJvmFormalParameter=ruleJvmFormalParameter();
 
             state._fsp--;
@@ -18970,7 +18970,7 @@ public final EObject entryRuleJvmFormalParameter() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleJvmFormalParameter; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmFormalParameter15425); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -18988,7 +18988,7 @@ public final EObject entryRuleJvmFormalParameter() throws RecognitionException {
 
 
     // $ANTLR start "ruleJvmFormalParameter"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6520:1: ruleJvmFormalParameter returns [EObject current=null] : ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) ) ;
+    // InternalFormat.g:6520:1: ruleJvmFormalParameter returns [EObject current=null] : ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) ) ;
     public final EObject ruleJvmFormalParameter() throws RecognitionException {
         EObject current = null;
 
@@ -19000,13 +19000,13 @@ public final EObject ruleJvmFormalParameter() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6523:28: ( ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6524:1: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) )
+            // InternalFormat.g:6523:28: ( ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) ) )
+            // InternalFormat.g:6524:1: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6524:1: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6524:2: ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) )
+            // InternalFormat.g:6524:1: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) ) )
+            // InternalFormat.g:6524:2: ( (lv_parameterType_0_0= ruleJvmTypeReference ) )? ( (lv_name_1_0= ruleValidID ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6524:2: ( (lv_parameterType_0_0= ruleJvmTypeReference ) )?
+            // InternalFormat.g:6524:2: ( (lv_parameterType_0_0= ruleJvmTypeReference ) )?
             int alt121=2;
             switch ( input.LA(1) ) {
                 case 54:
@@ -19046,17 +19046,17 @@ public final EObject ruleJvmFormalParameter() throws RecognitionException {
 
             switch (alt121) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6525:1: (lv_parameterType_0_0= ruleJvmTypeReference )
+                    // InternalFormat.g:6525:1: (lv_parameterType_0_0= ruleJvmTypeReference )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6525:1: (lv_parameterType_0_0= ruleJvmTypeReference )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6526:3: lv_parameterType_0_0= ruleJvmTypeReference
+                    // InternalFormat.g:6525:1: (lv_parameterType_0_0= ruleJvmTypeReference )
+                    // InternalFormat.g:6526:3: lv_parameterType_0_0= ruleJvmTypeReference
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getJvmFormalParameterAccess().getParameterTypeJvmTypeReferenceParserRuleCall_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleJvmFormalParameter15471);
+                    pushFollow(FOLLOW_7);
                     lv_parameterType_0_0=ruleJvmTypeReference();
 
                     state._fsp--;
@@ -19070,7 +19070,7 @@ public final EObject ruleJvmFormalParameter() throws RecognitionException {
                              			current, 
                              			"parameterType",
                               		lv_parameterType_0_0, 
-                              		"JvmTypeReference");
+                              		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -19083,18 +19083,18 @@ public final EObject ruleJvmFormalParameter() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6542:3: ( (lv_name_1_0= ruleValidID ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6543:1: (lv_name_1_0= ruleValidID )
+            // InternalFormat.g:6542:3: ( (lv_name_1_0= ruleValidID ) )
+            // InternalFormat.g:6543:1: (lv_name_1_0= ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6543:1: (lv_name_1_0= ruleValidID )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6544:3: lv_name_1_0= ruleValidID
+            // InternalFormat.g:6543:1: (lv_name_1_0= ruleValidID )
+            // InternalFormat.g:6544:3: lv_name_1_0= ruleValidID
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getJvmFormalParameterAccess().getNameValidIDParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleValidID_in_ruleJvmFormalParameter15493);
+            pushFollow(FOLLOW_2);
             lv_name_1_0=ruleValidID();
 
             state._fsp--;
@@ -19108,7 +19108,7 @@ public final EObject ruleJvmFormalParameter() throws RecognitionException {
                      			current, 
                      			"name",
                       		lv_name_1_0, 
-                      		"ValidID");
+                      		"com.avaloq.tools.ddk.xtext.format.Format.ValidID");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -19141,7 +19141,7 @@ public final EObject ruleJvmFormalParameter() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleFullJvmFormalParameter"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6568:1: entryRuleFullJvmFormalParameter returns [EObject current=null] : iv_ruleFullJvmFormalParameter= ruleFullJvmFormalParameter EOF ;
+    // InternalFormat.g:6568:1: entryRuleFullJvmFormalParameter returns [EObject current=null] : iv_ruleFullJvmFormalParameter= ruleFullJvmFormalParameter EOF ;
     public final EObject entryRuleFullJvmFormalParameter() throws RecognitionException {
         EObject current = null;
 
@@ -19149,13 +19149,13 @@ public final EObject entryRuleFullJvmFormalParameter() throws RecognitionExcepti
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6569:2: (iv_ruleFullJvmFormalParameter= ruleFullJvmFormalParameter EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6570:2: iv_ruleFullJvmFormalParameter= ruleFullJvmFormalParameter EOF
+            // InternalFormat.g:6569:2: (iv_ruleFullJvmFormalParameter= ruleFullJvmFormalParameter EOF )
+            // InternalFormat.g:6570:2: iv_ruleFullJvmFormalParameter= ruleFullJvmFormalParameter EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getFullJvmFormalParameterRule()); 
             }
-            pushFollow(FOLLOW_ruleFullJvmFormalParameter_in_entryRuleFullJvmFormalParameter15529);
+            pushFollow(FOLLOW_1);
             iv_ruleFullJvmFormalParameter=ruleFullJvmFormalParameter();
 
             state._fsp--;
@@ -19163,7 +19163,7 @@ public final EObject entryRuleFullJvmFormalParameter() throws RecognitionExcepti
             if ( state.backtracking==0 ) {
                current =iv_ruleFullJvmFormalParameter; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFullJvmFormalParameter15539); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -19181,7 +19181,7 @@ public final EObject entryRuleFullJvmFormalParameter() throws RecognitionExcepti
 
 
     // $ANTLR start "ruleFullJvmFormalParameter"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6577:1: ruleFullJvmFormalParameter returns [EObject current=null] : ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) ) ;
+    // InternalFormat.g:6577:1: ruleFullJvmFormalParameter returns [EObject current=null] : ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) ) ;
     public final EObject ruleFullJvmFormalParameter() throws RecognitionException {
         EObject current = null;
 
@@ -19193,24 +19193,24 @@ public final EObject ruleFullJvmFormalParameter() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6580:28: ( ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6581:1: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) )
+            // InternalFormat.g:6580:28: ( ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) ) )
+            // InternalFormat.g:6581:1: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6581:1: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6581:2: ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) )
+            // InternalFormat.g:6581:1: ( ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) ) )
+            // InternalFormat.g:6581:2: ( (lv_parameterType_0_0= ruleJvmTypeReference ) ) ( (lv_name_1_0= ruleValidID ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6581:2: ( (lv_parameterType_0_0= ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6582:1: (lv_parameterType_0_0= ruleJvmTypeReference )
+            // InternalFormat.g:6581:2: ( (lv_parameterType_0_0= ruleJvmTypeReference ) )
+            // InternalFormat.g:6582:1: (lv_parameterType_0_0= ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6582:1: (lv_parameterType_0_0= ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6583:3: lv_parameterType_0_0= ruleJvmTypeReference
+            // InternalFormat.g:6582:1: (lv_parameterType_0_0= ruleJvmTypeReference )
+            // InternalFormat.g:6583:3: lv_parameterType_0_0= ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getFullJvmFormalParameterAccess().getParameterTypeJvmTypeReferenceParserRuleCall_0_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleFullJvmFormalParameter15585);
+            pushFollow(FOLLOW_7);
             lv_parameterType_0_0=ruleJvmTypeReference();
 
             state._fsp--;
@@ -19224,7 +19224,7 @@ public final EObject ruleFullJvmFormalParameter() throws RecognitionException {
                      			current, 
                      			"parameterType",
                       		lv_parameterType_0_0, 
-                      		"JvmTypeReference");
+                      		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -19234,18 +19234,18 @@ public final EObject ruleFullJvmFormalParameter() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6599:2: ( (lv_name_1_0= ruleValidID ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6600:1: (lv_name_1_0= ruleValidID )
+            // InternalFormat.g:6599:2: ( (lv_name_1_0= ruleValidID ) )
+            // InternalFormat.g:6600:1: (lv_name_1_0= ruleValidID )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6600:1: (lv_name_1_0= ruleValidID )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6601:3: lv_name_1_0= ruleValidID
+            // InternalFormat.g:6600:1: (lv_name_1_0= ruleValidID )
+            // InternalFormat.g:6601:3: lv_name_1_0= ruleValidID
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getFullJvmFormalParameterAccess().getNameValidIDParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleValidID_in_ruleFullJvmFormalParameter15606);
+            pushFollow(FOLLOW_2);
             lv_name_1_0=ruleValidID();
 
             state._fsp--;
@@ -19259,7 +19259,7 @@ public final EObject ruleFullJvmFormalParameter() throws RecognitionException {
                      			current, 
                      			"name",
                       		lv_name_1_0, 
-                      		"ValidID");
+                      		"com.avaloq.tools.ddk.xtext.format.Format.ValidID");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -19292,7 +19292,7 @@ public final EObject ruleFullJvmFormalParameter() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXFeatureCall"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6625:1: entryRuleXFeatureCall returns [EObject current=null] : iv_ruleXFeatureCall= ruleXFeatureCall EOF ;
+    // InternalFormat.g:6625:1: entryRuleXFeatureCall returns [EObject current=null] : iv_ruleXFeatureCall= ruleXFeatureCall EOF ;
     public final EObject entryRuleXFeatureCall() throws RecognitionException {
         EObject current = null;
 
@@ -19300,13 +19300,13 @@ public final EObject entryRuleXFeatureCall() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6626:2: (iv_ruleXFeatureCall= ruleXFeatureCall EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6627:2: iv_ruleXFeatureCall= ruleXFeatureCall EOF
+            // InternalFormat.g:6626:2: (iv_ruleXFeatureCall= ruleXFeatureCall EOF )
+            // InternalFormat.g:6627:2: iv_ruleXFeatureCall= ruleXFeatureCall EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXFeatureCallRule()); 
             }
-            pushFollow(FOLLOW_ruleXFeatureCall_in_entryRuleXFeatureCall15642);
+            pushFollow(FOLLOW_1);
             iv_ruleXFeatureCall=ruleXFeatureCall();
 
             state._fsp--;
@@ -19314,7 +19314,7 @@ public final EObject entryRuleXFeatureCall() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXFeatureCall; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXFeatureCall15652); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -19332,7 +19332,7 @@ public final EObject entryRuleXFeatureCall() throws RecognitionException {
 
 
     // $ANTLR start "ruleXFeatureCall"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6634:1: ruleXFeatureCall returns [EObject current=null] : ( () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )? ) ;
+    // InternalFormat.g:6634:1: ruleXFeatureCall returns [EObject current=null] : ( () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )? ) ;
     public final EObject ruleXFeatureCall() throws RecognitionException {
         EObject current = null;
 
@@ -19358,14 +19358,14 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6637:28: ( ( () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6638:1: ( () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )? )
+            // InternalFormat.g:6637:28: ( ( () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )? ) )
+            // InternalFormat.g:6638:1: ( () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6638:1: ( () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )? )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6638:2: () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )?
+            // InternalFormat.g:6638:1: ( () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )? )
+            // InternalFormat.g:6638:2: () (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )? ( ( ruleIdOrSuper ) ) ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )? ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )?
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6638:2: ()
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6639:5: 
+            // InternalFormat.g:6638:2: ()
+            // InternalFormat.g:6639:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -19377,7 +19377,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6644:2: (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )?
+            // InternalFormat.g:6644:2: (otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' )?
             int alt123=2;
             int LA123_0 = input.LA(1);
 
@@ -19386,26 +19386,26 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
             }
             switch (alt123) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6644:4: otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>'
+                    // InternalFormat.g:6644:4: otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>'
                     {
-                    otherlv_1=(Token)match(input,62,FOLLOW_62_in_ruleXFeatureCall15699); if (state.failed) return current;
+                    otherlv_1=(Token)match(input,62,FOLLOW_72); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_1, grammarAccess.getXFeatureCallAccess().getLessThanSignKeyword_1_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6648:1: ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6649:1: (lv_typeArguments_2_0= ruleJvmArgumentTypeReference )
+                    // InternalFormat.g:6648:1: ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) )
+                    // InternalFormat.g:6649:1: (lv_typeArguments_2_0= ruleJvmArgumentTypeReference )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6649:1: (lv_typeArguments_2_0= ruleJvmArgumentTypeReference )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6650:3: lv_typeArguments_2_0= ruleJvmArgumentTypeReference
+                    // InternalFormat.g:6649:1: (lv_typeArguments_2_0= ruleJvmArgumentTypeReference )
+                    // InternalFormat.g:6650:3: lv_typeArguments_2_0= ruleJvmArgumentTypeReference
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleXFeatureCall15720);
+                    pushFollow(FOLLOW_73);
                     lv_typeArguments_2_0=ruleJvmArgumentTypeReference();
 
                     state._fsp--;
@@ -19419,7 +19419,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
                              			current, 
                              			"typeArguments",
                               		lv_typeArguments_2_0, 
-                              		"JvmArgumentTypeReference");
+                              		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -19429,7 +19429,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6666:2: (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )*
+                    // InternalFormat.g:6666:2: (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )*
                     loop122:
                     do {
                         int alt122=2;
@@ -19442,26 +19442,26 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
 
                         switch (alt122) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6666:4: otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) )
+                    	    // InternalFormat.g:6666:4: otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) )
                     	    {
-                    	    otherlv_3=(Token)match(input,28,FOLLOW_28_in_ruleXFeatureCall15733); if (state.failed) return current;
+                    	    otherlv_3=(Token)match(input,28,FOLLOW_72); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_3, grammarAccess.getXFeatureCallAccess().getCommaKeyword_1_2_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6670:1: ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) )
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6671:1: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
+                    	    // InternalFormat.g:6670:1: ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) )
+                    	    // InternalFormat.g:6671:1: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6671:1: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6672:3: lv_typeArguments_4_0= ruleJvmArgumentTypeReference
+                    	    // InternalFormat.g:6671:1: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
+                    	    // InternalFormat.g:6672:3: lv_typeArguments_4_0= ruleJvmArgumentTypeReference
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getXFeatureCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_1_2_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleXFeatureCall15754);
+                    	    pushFollow(FOLLOW_73);
                     	    lv_typeArguments_4_0=ruleJvmArgumentTypeReference();
 
                     	    state._fsp--;
@@ -19475,7 +19475,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
                     	             			current, 
                     	             			"typeArguments",
                     	              		lv_typeArguments_4_0, 
-                    	              		"JvmArgumentTypeReference");
+                    	              		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -19494,7 +19494,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
                         }
                     } while (true);
 
-                    otherlv_5=(Token)match(input,63,FOLLOW_63_in_ruleXFeatureCall15768); if (state.failed) return current;
+                    otherlv_5=(Token)match(input,63,FOLLOW_71); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_5, grammarAccess.getXFeatureCallAccess().getGreaterThanSignKeyword_1_3());
@@ -19506,11 +19506,11 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6692:3: ( ( ruleIdOrSuper ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6693:1: ( ruleIdOrSuper )
+            // InternalFormat.g:6692:3: ( ( ruleIdOrSuper ) )
+            // InternalFormat.g:6693:1: ( ruleIdOrSuper )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6693:1: ( ruleIdOrSuper )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6694:3: ruleIdOrSuper
+            // InternalFormat.g:6693:1: ( ruleIdOrSuper )
+            // InternalFormat.g:6694:3: ruleIdOrSuper
             {
             if ( state.backtracking==0 ) {
 
@@ -19524,7 +19524,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
               	        newCompositeNode(grammarAccess.getXFeatureCallAccess().getFeatureJvmIdentifiableElementCrossReference_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleIdOrSuper_in_ruleXFeatureCall15793);
+            pushFollow(FOLLOW_98);
             ruleIdOrSuper();
 
             state._fsp--;
@@ -19540,20 +19540,20 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6707:2: ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )?
+            // InternalFormat.g:6707:2: ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )?
             int alt126=2;
             alt126 = dfa126.predict(input);
             switch (alt126) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6707:3: ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')'
+                    // InternalFormat.g:6707:3: ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')'
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6707:3: ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6707:4: ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' )
+                    // InternalFormat.g:6707:3: ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) )
+                    // InternalFormat.g:6707:4: ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6714:1: (lv_explicitOperationCall_7_0= '(' )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6715:3: lv_explicitOperationCall_7_0= '('
+                    // InternalFormat.g:6714:1: (lv_explicitOperationCall_7_0= '(' )
+                    // InternalFormat.g:6715:3: lv_explicitOperationCall_7_0= '('
                     {
-                    lv_explicitOperationCall_7_0=(Token)match(input,33,FOLLOW_33_in_ruleXFeatureCall15827); if (state.failed) return current;
+                    lv_explicitOperationCall_7_0=(Token)match(input,33,FOLLOW_75); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_explicitOperationCall_7_0, grammarAccess.getXFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_3_0_0());
@@ -19573,25 +19573,25 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6728:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )?
+                    // InternalFormat.g:6728:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )?
                     int alt125=3;
                     alt125 = dfa125.predict(input);
                     switch (alt125) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6728:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) )
+                            // InternalFormat.g:6728:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6728:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6728:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure )
+                            // InternalFormat.g:6728:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) )
+                            // InternalFormat.g:6728:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6745:1: (lv_featureCallArguments_8_0= ruleXShortClosure )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6746:3: lv_featureCallArguments_8_0= ruleXShortClosure
+                            // InternalFormat.g:6745:1: (lv_featureCallArguments_8_0= ruleXShortClosure )
+                            // InternalFormat.g:6746:3: lv_featureCallArguments_8_0= ruleXShortClosure
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXShortClosureParserRuleCall_3_1_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleXShortClosure_in_ruleXFeatureCall15912);
+                            pushFollow(FOLLOW_30);
                             lv_featureCallArguments_8_0=ruleXShortClosure();
 
                             state._fsp--;
@@ -19605,7 +19605,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
                                      			current, 
                                      			"featureCallArguments",
                                       		lv_featureCallArguments_8_0, 
-                                      		"XShortClosure");
+                                      		"org.eclipse.xtext.xbase.Xbase.XShortClosure");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -19619,23 +19619,23 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
                             }
                             break;
                         case 2 :
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6763:6: ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* )
+                            // InternalFormat.g:6763:6: ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6763:6: ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6763:7: ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )*
+                            // InternalFormat.g:6763:6: ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* )
+                            // InternalFormat.g:6763:7: ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )*
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6763:7: ( (lv_featureCallArguments_9_0= ruleXExpression ) )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6764:1: (lv_featureCallArguments_9_0= ruleXExpression )
+                            // InternalFormat.g:6763:7: ( (lv_featureCallArguments_9_0= ruleXExpression ) )
+                            // InternalFormat.g:6764:1: (lv_featureCallArguments_9_0= ruleXExpression )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6764:1: (lv_featureCallArguments_9_0= ruleXExpression )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6765:3: lv_featureCallArguments_9_0= ruleXExpression
+                            // InternalFormat.g:6764:1: (lv_featureCallArguments_9_0= ruleXExpression )
+                            // InternalFormat.g:6765:3: lv_featureCallArguments_9_0= ruleXExpression
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXExpressionParserRuleCall_3_1_1_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleXExpression_in_ruleXFeatureCall15940);
+                            pushFollow(FOLLOW_47);
                             lv_featureCallArguments_9_0=ruleXExpression();
 
                             state._fsp--;
@@ -19649,7 +19649,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
                                      			current, 
                                      			"featureCallArguments",
                                       		lv_featureCallArguments_9_0, 
-                                      		"XExpression");
+                                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -19659,7 +19659,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
 
                             }
 
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6781:2: (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )*
+                            // InternalFormat.g:6781:2: (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )*
                             loop124:
                             do {
                                 int alt124=2;
@@ -19672,26 +19672,26 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
 
                                 switch (alt124) {
                             	case 1 :
-                            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6781:4: otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) )
+                            	    // InternalFormat.g:6781:4: otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) )
                             	    {
-                            	    otherlv_10=(Token)match(input,28,FOLLOW_28_in_ruleXFeatureCall15953); if (state.failed) return current;
+                            	    otherlv_10=(Token)match(input,28,FOLLOW_48); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	          	newLeafNode(otherlv_10, grammarAccess.getXFeatureCallAccess().getCommaKeyword_3_1_1_1_0());
                             	          
                             	    }
-                            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6785:1: ( (lv_featureCallArguments_11_0= ruleXExpression ) )
-                            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6786:1: (lv_featureCallArguments_11_0= ruleXExpression )
+                            	    // InternalFormat.g:6785:1: ( (lv_featureCallArguments_11_0= ruleXExpression ) )
+                            	    // InternalFormat.g:6786:1: (lv_featureCallArguments_11_0= ruleXExpression )
                             	    {
-                            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6786:1: (lv_featureCallArguments_11_0= ruleXExpression )
-                            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6787:3: lv_featureCallArguments_11_0= ruleXExpression
+                            	    // InternalFormat.g:6786:1: (lv_featureCallArguments_11_0= ruleXExpression )
+                            	    // InternalFormat.g:6787:3: lv_featureCallArguments_11_0= ruleXExpression
                             	    {
                             	    if ( state.backtracking==0 ) {
                             	       
                             	      	        newCompositeNode(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXExpressionParserRuleCall_3_1_1_1_1_0()); 
                             	      	    
                             	    }
-                            	    pushFollow(FOLLOW_ruleXExpression_in_ruleXFeatureCall15974);
+                            	    pushFollow(FOLLOW_47);
                             	    lv_featureCallArguments_11_0=ruleXExpression();
 
                             	    state._fsp--;
@@ -19705,7 +19705,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
                             	             			current, 
                             	             			"featureCallArguments",
                             	              		lv_featureCallArguments_11_0, 
-                            	              		"XExpression");
+                            	              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                             	      	        afterParserOrEnumRuleCall();
                             	      	    
                             	    }
@@ -19733,7 +19733,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
 
                     }
 
-                    otherlv_12=(Token)match(input,34,FOLLOW_34_in_ruleXFeatureCall15991); if (state.failed) return current;
+                    otherlv_12=(Token)match(input,34,FOLLOW_99); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_12, grammarAccess.getXFeatureCallAccess().getRightParenthesisKeyword_3_2());
@@ -19745,22 +19745,22 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6807:3: ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )?
+            // InternalFormat.g:6807:3: ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )?
             int alt127=2;
             alt127 = dfa127.predict(input);
             switch (alt127) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6807:4: ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure )
+                    // InternalFormat.g:6807:4: ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6810:1: (lv_featureCallArguments_13_0= ruleXClosure )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6811:3: lv_featureCallArguments_13_0= ruleXClosure
+                    // InternalFormat.g:6810:1: (lv_featureCallArguments_13_0= ruleXClosure )
+                    // InternalFormat.g:6811:3: lv_featureCallArguments_13_0= ruleXClosure
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXFeatureCallAccess().getFeatureCallArgumentsXClosureParserRuleCall_4_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXClosure_in_ruleXFeatureCall16026);
+                    pushFollow(FOLLOW_2);
                     lv_featureCallArguments_13_0=ruleXClosure();
 
                     state._fsp--;
@@ -19774,7 +19774,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
                              			current, 
                              			"featureCallArguments",
                               		lv_featureCallArguments_13_0, 
-                              		"XClosure");
+                              		"org.eclipse.xtext.xbase.Xbase.XClosure");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -19810,7 +19810,7 @@ public final EObject ruleXFeatureCall() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleFeatureCallID"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6835:1: entryRuleFeatureCallID returns [String current=null] : iv_ruleFeatureCallID= ruleFeatureCallID EOF ;
+    // InternalFormat.g:6835:1: entryRuleFeatureCallID returns [String current=null] : iv_ruleFeatureCallID= ruleFeatureCallID EOF ;
     public final String entryRuleFeatureCallID() throws RecognitionException {
         String current = null;
 
@@ -19818,13 +19818,13 @@ public final String entryRuleFeatureCallID() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6836:2: (iv_ruleFeatureCallID= ruleFeatureCallID EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6837:2: iv_ruleFeatureCallID= ruleFeatureCallID EOF
+            // InternalFormat.g:6836:2: (iv_ruleFeatureCallID= ruleFeatureCallID EOF )
+            // InternalFormat.g:6837:2: iv_ruleFeatureCallID= ruleFeatureCallID EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getFeatureCallIDRule()); 
             }
-            pushFollow(FOLLOW_ruleFeatureCallID_in_entryRuleFeatureCallID16064);
+            pushFollow(FOLLOW_1);
             iv_ruleFeatureCallID=ruleFeatureCallID();
 
             state._fsp--;
@@ -19832,7 +19832,7 @@ public final String entryRuleFeatureCallID() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleFeatureCallID.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFeatureCallID16075); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -19850,7 +19850,7 @@ public final String entryRuleFeatureCallID() throws RecognitionException {
 
 
     // $ANTLR start "ruleFeatureCallID"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6844:1: ruleFeatureCallID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' ) ;
+    // InternalFormat.g:6844:1: ruleFeatureCallID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' ) ;
     public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -19861,10 +19861,10 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6847:28: ( (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6848:1: (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' )
+            // InternalFormat.g:6847:28: ( (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' ) )
+            // InternalFormat.g:6848:1: (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6848:1: (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' )
+            // InternalFormat.g:6848:1: (this_ValidID_0= ruleValidID | kw= 'extends' | kw= 'static' | kw= 'import' | kw= 'extension' )
             int alt128=5;
             switch ( input.LA(1) ) {
             case RULE_ID:
@@ -19904,14 +19904,14 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
 
             switch (alt128) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6849:5: this_ValidID_0= ruleValidID
+                    // InternalFormat.g:6849:5: this_ValidID_0= ruleValidID
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getFeatureCallIDAccess().getValidIDParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleValidID_in_ruleFeatureCallID16122);
+                    pushFollow(FOLLOW_2);
                     this_ValidID_0=ruleValidID();
 
                     state._fsp--;
@@ -19930,9 +19930,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6861:2: kw= 'extends'
+                    // InternalFormat.g:6861:2: kw= 'extends'
                     {
-                    kw=(Token)match(input,16,FOLLOW_16_in_ruleFeatureCallID16146); if (state.failed) return current;
+                    kw=(Token)match(input,16,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -19943,9 +19943,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6868:2: kw= 'static'
+                    // InternalFormat.g:6868:2: kw= 'static'
                     {
-                    kw=(Token)match(input,96,FOLLOW_96_in_ruleFeatureCallID16165); if (state.failed) return current;
+                    kw=(Token)match(input,96,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -19956,9 +19956,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6875:2: kw= 'import'
+                    // InternalFormat.g:6875:2: kw= 'import'
                     {
-                    kw=(Token)match(input,97,FOLLOW_97_in_ruleFeatureCallID16184); if (state.failed) return current;
+                    kw=(Token)match(input,97,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -19969,9 +19969,9 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6882:2: kw= 'extension'
+                    // InternalFormat.g:6882:2: kw= 'extension'
                     {
-                    kw=(Token)match(input,98,FOLLOW_98_in_ruleFeatureCallID16203); if (state.failed) return current;
+                    kw=(Token)match(input,98,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -20004,7 +20004,7 @@ public final AntlrDatatypeRuleToken ruleFeatureCallID() throws RecognitionExcept
 
 
     // $ANTLR start "entryRuleIdOrSuper"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6895:1: entryRuleIdOrSuper returns [String current=null] : iv_ruleIdOrSuper= ruleIdOrSuper EOF ;
+    // InternalFormat.g:6895:1: entryRuleIdOrSuper returns [String current=null] : iv_ruleIdOrSuper= ruleIdOrSuper EOF ;
     public final String entryRuleIdOrSuper() throws RecognitionException {
         String current = null;
 
@@ -20012,13 +20012,13 @@ public final String entryRuleIdOrSuper() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6896:2: (iv_ruleIdOrSuper= ruleIdOrSuper EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6897:2: iv_ruleIdOrSuper= ruleIdOrSuper EOF
+            // InternalFormat.g:6896:2: (iv_ruleIdOrSuper= ruleIdOrSuper EOF )
+            // InternalFormat.g:6897:2: iv_ruleIdOrSuper= ruleIdOrSuper EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getIdOrSuperRule()); 
             }
-            pushFollow(FOLLOW_ruleIdOrSuper_in_entryRuleIdOrSuper16244);
+            pushFollow(FOLLOW_1);
             iv_ruleIdOrSuper=ruleIdOrSuper();
 
             state._fsp--;
@@ -20026,7 +20026,7 @@ public final String entryRuleIdOrSuper() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleIdOrSuper.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIdOrSuper16255); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -20044,7 +20044,7 @@ public final String entryRuleIdOrSuper() throws RecognitionException {
 
 
     // $ANTLR start "ruleIdOrSuper"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6904:1: ruleIdOrSuper returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' ) ;
+    // InternalFormat.g:6904:1: ruleIdOrSuper returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' ) ;
     public final AntlrDatatypeRuleToken ruleIdOrSuper() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -20055,10 +20055,10 @@ public final AntlrDatatypeRuleToken ruleIdOrSuper() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6907:28: ( (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6908:1: (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' )
+            // InternalFormat.g:6907:28: ( (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' ) )
+            // InternalFormat.g:6908:1: (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6908:1: (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' )
+            // InternalFormat.g:6908:1: (this_FeatureCallID_0= ruleFeatureCallID | kw= 'super' )
             int alt129=2;
             int LA129_0 = input.LA(1);
 
@@ -20077,14 +20077,14 @@ else if ( (LA129_0==99) ) {
             }
             switch (alt129) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6909:5: this_FeatureCallID_0= ruleFeatureCallID
+                    // InternalFormat.g:6909:5: this_FeatureCallID_0= ruleFeatureCallID
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getIdOrSuperAccess().getFeatureCallIDParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleFeatureCallID_in_ruleIdOrSuper16302);
+                    pushFollow(FOLLOW_2);
                     this_FeatureCallID_0=ruleFeatureCallID();
 
                     state._fsp--;
@@ -20103,9 +20103,9 @@ else if ( (LA129_0==99) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6921:2: kw= 'super'
+                    // InternalFormat.g:6921:2: kw= 'super'
                     {
-                    kw=(Token)match(input,99,FOLLOW_99_in_ruleIdOrSuper16326); if (state.failed) return current;
+                    kw=(Token)match(input,99,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current.merge(kw);
@@ -20138,7 +20138,7 @@ else if ( (LA129_0==99) ) {
 
 
     // $ANTLR start "entryRuleXConstructorCall"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6934:1: entryRuleXConstructorCall returns [EObject current=null] : iv_ruleXConstructorCall= ruleXConstructorCall EOF ;
+    // InternalFormat.g:6934:1: entryRuleXConstructorCall returns [EObject current=null] : iv_ruleXConstructorCall= ruleXConstructorCall EOF ;
     public final EObject entryRuleXConstructorCall() throws RecognitionException {
         EObject current = null;
 
@@ -20146,13 +20146,13 @@ public final EObject entryRuleXConstructorCall() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6935:2: (iv_ruleXConstructorCall= ruleXConstructorCall EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6936:2: iv_ruleXConstructorCall= ruleXConstructorCall EOF
+            // InternalFormat.g:6935:2: (iv_ruleXConstructorCall= ruleXConstructorCall EOF )
+            // InternalFormat.g:6936:2: iv_ruleXConstructorCall= ruleXConstructorCall EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXConstructorCallRule()); 
             }
-            pushFollow(FOLLOW_ruleXConstructorCall_in_entryRuleXConstructorCall16366);
+            pushFollow(FOLLOW_1);
             iv_ruleXConstructorCall=ruleXConstructorCall();
 
             state._fsp--;
@@ -20160,7 +20160,7 @@ public final EObject entryRuleXConstructorCall() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXConstructorCall; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXConstructorCall16376); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -20178,7 +20178,7 @@ public final EObject entryRuleXConstructorCall() throws RecognitionException {
 
 
     // $ANTLR start "ruleXConstructorCall"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6943:1: ruleXConstructorCall returns [EObject current=null] : ( () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )? ) ;
+    // InternalFormat.g:6943:1: ruleXConstructorCall returns [EObject current=null] : ( () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )? ) ;
     public final EObject ruleXConstructorCall() throws RecognitionException {
         EObject current = null;
 
@@ -20205,14 +20205,14 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6946:28: ( ( () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6947:1: ( () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )? )
+            // InternalFormat.g:6946:28: ( ( () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )? ) )
+            // InternalFormat.g:6947:1: ( () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6947:1: ( () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )? )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6947:2: () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )?
+            // InternalFormat.g:6947:1: ( () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )? )
+            // InternalFormat.g:6947:2: () otherlv_1= 'new' ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )? ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )? ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )?
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6947:2: ()
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6948:5: 
+            // InternalFormat.g:6947:2: ()
+            // InternalFormat.g:6948:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -20224,17 +20224,17 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,100,FOLLOW_100_in_ruleXConstructorCall16422); if (state.failed) return current;
+            otherlv_1=(Token)match(input,100,FOLLOW_7); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXConstructorCallAccess().getNewKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6957:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6958:1: ( ruleQualifiedName )
+            // InternalFormat.g:6957:1: ( ( ruleQualifiedName ) )
+            // InternalFormat.g:6958:1: ( ruleQualifiedName )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6958:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6959:3: ruleQualifiedName
+            // InternalFormat.g:6958:1: ( ruleQualifiedName )
+            // InternalFormat.g:6959:3: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
 
@@ -20248,7 +20248,7 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
               	        newCompositeNode(grammarAccess.getXConstructorCallAccess().getConstructorJvmConstructorCrossReference_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_ruleXConstructorCall16445);
+            pushFollow(FOLLOW_100);
             ruleQualifiedName();
 
             state._fsp--;
@@ -20264,17 +20264,17 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6972:2: ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )?
+            // InternalFormat.g:6972:2: ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )?
             int alt131=2;
             alt131 = dfa131.predict(input);
             switch (alt131) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6972:3: ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>'
+                    // InternalFormat.g:6972:3: ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>'
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6972:3: ( ( '<' )=>otherlv_3= '<' )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6972:4: ( '<' )=>otherlv_3= '<'
+                    // InternalFormat.g:6972:3: ( ( '<' )=>otherlv_3= '<' )
+                    // InternalFormat.g:6972:4: ( '<' )=>otherlv_3= '<'
                     {
-                    otherlv_3=(Token)match(input,62,FOLLOW_62_in_ruleXConstructorCall16466); if (state.failed) return current;
+                    otherlv_3=(Token)match(input,62,FOLLOW_72); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_3, grammarAccess.getXConstructorCallAccess().getLessThanSignKeyword_3_0());
@@ -20283,18 +20283,18 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6977:2: ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6978:1: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
+                    // InternalFormat.g:6977:2: ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) )
+                    // InternalFormat.g:6978:1: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6978:1: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6979:3: lv_typeArguments_4_0= ruleJvmArgumentTypeReference
+                    // InternalFormat.g:6978:1: (lv_typeArguments_4_0= ruleJvmArgumentTypeReference )
+                    // InternalFormat.g:6979:3: lv_typeArguments_4_0= ruleJvmArgumentTypeReference
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXConstructorCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_3_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleXConstructorCall16488);
+                    pushFollow(FOLLOW_73);
                     lv_typeArguments_4_0=ruleJvmArgumentTypeReference();
 
                     state._fsp--;
@@ -20308,7 +20308,7 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
                              			current, 
                              			"typeArguments",
                               		lv_typeArguments_4_0, 
-                              		"JvmArgumentTypeReference");
+                              		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -20318,7 +20318,7 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6995:2: (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )*
+                    // InternalFormat.g:6995:2: (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )*
                     loop130:
                     do {
                         int alt130=2;
@@ -20331,26 +20331,26 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
                         switch (alt130) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6995:4: otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) )
+                    	    // InternalFormat.g:6995:4: otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) )
                     	    {
-                    	    otherlv_5=(Token)match(input,28,FOLLOW_28_in_ruleXConstructorCall16501); if (state.failed) return current;
+                    	    otherlv_5=(Token)match(input,28,FOLLOW_72); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_5, grammarAccess.getXConstructorCallAccess().getCommaKeyword_3_2_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6999:1: ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) )
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7000:1: (lv_typeArguments_6_0= ruleJvmArgumentTypeReference )
+                    	    // InternalFormat.g:6999:1: ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) )
+                    	    // InternalFormat.g:7000:1: (lv_typeArguments_6_0= ruleJvmArgumentTypeReference )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7000:1: (lv_typeArguments_6_0= ruleJvmArgumentTypeReference )
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7001:3: lv_typeArguments_6_0= ruleJvmArgumentTypeReference
+                    	    // InternalFormat.g:7000:1: (lv_typeArguments_6_0= ruleJvmArgumentTypeReference )
+                    	    // InternalFormat.g:7001:3: lv_typeArguments_6_0= ruleJvmArgumentTypeReference
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getXConstructorCallAccess().getTypeArgumentsJvmArgumentTypeReferenceParserRuleCall_3_2_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleXConstructorCall16522);
+                    	    pushFollow(FOLLOW_73);
                     	    lv_typeArguments_6_0=ruleJvmArgumentTypeReference();
 
                     	    state._fsp--;
@@ -20364,7 +20364,7 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
                     	             			current, 
                     	             			"typeArguments",
                     	              		lv_typeArguments_6_0, 
-                    	              		"JvmArgumentTypeReference");
+                    	              		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -20383,7 +20383,7 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
                         }
                     } while (true);
 
-                    otherlv_7=(Token)match(input,63,FOLLOW_63_in_ruleXConstructorCall16536); if (state.failed) return current;
+                    otherlv_7=(Token)match(input,63,FOLLOW_98); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_7, grammarAccess.getXConstructorCallAccess().getGreaterThanSignKeyword_3_3());
@@ -20395,20 +20395,20 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7021:3: ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )?
+            // InternalFormat.g:7021:3: ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )?
             int alt134=2;
             alt134 = dfa134.predict(input);
             switch (alt134) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7021:4: ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')'
+                    // InternalFormat.g:7021:4: ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')'
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7021:4: ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7021:5: ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' )
+                    // InternalFormat.g:7021:4: ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) )
+                    // InternalFormat.g:7021:5: ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7028:1: (lv_explicitConstructorCall_8_0= '(' )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7029:3: lv_explicitConstructorCall_8_0= '('
+                    // InternalFormat.g:7028:1: (lv_explicitConstructorCall_8_0= '(' )
+                    // InternalFormat.g:7029:3: lv_explicitConstructorCall_8_0= '('
                     {
-                    lv_explicitConstructorCall_8_0=(Token)match(input,33,FOLLOW_33_in_ruleXConstructorCall16572); if (state.failed) return current;
+                    lv_explicitConstructorCall_8_0=(Token)match(input,33,FOLLOW_75); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_explicitConstructorCall_8_0, grammarAccess.getXConstructorCallAccess().getExplicitConstructorCallLeftParenthesisKeyword_4_0_0());
@@ -20428,25 +20428,25 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7042:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )?
+                    // InternalFormat.g:7042:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )?
                     int alt133=3;
                     alt133 = dfa133.predict(input);
                     switch (alt133) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7042:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) )
+                            // InternalFormat.g:7042:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7042:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7042:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure )
+                            // InternalFormat.g:7042:3: ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) )
+                            // InternalFormat.g:7042:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7059:1: (lv_arguments_9_0= ruleXShortClosure )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7060:3: lv_arguments_9_0= ruleXShortClosure
+                            // InternalFormat.g:7059:1: (lv_arguments_9_0= ruleXShortClosure )
+                            // InternalFormat.g:7060:3: lv_arguments_9_0= ruleXShortClosure
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXConstructorCallAccess().getArgumentsXShortClosureParserRuleCall_4_1_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleXShortClosure_in_ruleXConstructorCall16657);
+                            pushFollow(FOLLOW_30);
                             lv_arguments_9_0=ruleXShortClosure();
 
                             state._fsp--;
@@ -20460,7 +20460,7 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
                                      			current, 
                                      			"arguments",
                                       		lv_arguments_9_0, 
-                                      		"XShortClosure");
+                                      		"org.eclipse.xtext.xbase.Xbase.XShortClosure");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -20474,23 +20474,23 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
                             }
                             break;
                         case 2 :
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7077:6: ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* )
+                            // InternalFormat.g:7077:6: ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7077:6: ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7077:7: ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )*
+                            // InternalFormat.g:7077:6: ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* )
+                            // InternalFormat.g:7077:7: ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )*
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7077:7: ( (lv_arguments_10_0= ruleXExpression ) )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7078:1: (lv_arguments_10_0= ruleXExpression )
+                            // InternalFormat.g:7077:7: ( (lv_arguments_10_0= ruleXExpression ) )
+                            // InternalFormat.g:7078:1: (lv_arguments_10_0= ruleXExpression )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7078:1: (lv_arguments_10_0= ruleXExpression )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7079:3: lv_arguments_10_0= ruleXExpression
+                            // InternalFormat.g:7078:1: (lv_arguments_10_0= ruleXExpression )
+                            // InternalFormat.g:7079:3: lv_arguments_10_0= ruleXExpression
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXConstructorCallAccess().getArgumentsXExpressionParserRuleCall_4_1_1_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleXExpression_in_ruleXConstructorCall16685);
+                            pushFollow(FOLLOW_47);
                             lv_arguments_10_0=ruleXExpression();
 
                             state._fsp--;
@@ -20504,7 +20504,7 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
                                      			current, 
                                      			"arguments",
                                       		lv_arguments_10_0, 
-                                      		"XExpression");
+                                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -20514,7 +20514,7 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
                             }
 
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7095:2: (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )*
+                            // InternalFormat.g:7095:2: (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )*
                             loop132:
                             do {
                                 int alt132=2;
@@ -20527,26 +20527,26 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
                                 switch (alt132) {
                             	case 1 :
-                            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7095:4: otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) )
+                            	    // InternalFormat.g:7095:4: otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) )
                             	    {
-                            	    otherlv_11=(Token)match(input,28,FOLLOW_28_in_ruleXConstructorCall16698); if (state.failed) return current;
+                            	    otherlv_11=(Token)match(input,28,FOLLOW_48); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	          	newLeafNode(otherlv_11, grammarAccess.getXConstructorCallAccess().getCommaKeyword_4_1_1_1_0());
                             	          
                             	    }
-                            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7099:1: ( (lv_arguments_12_0= ruleXExpression ) )
-                            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7100:1: (lv_arguments_12_0= ruleXExpression )
+                            	    // InternalFormat.g:7099:1: ( (lv_arguments_12_0= ruleXExpression ) )
+                            	    // InternalFormat.g:7100:1: (lv_arguments_12_0= ruleXExpression )
                             	    {
-                            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7100:1: (lv_arguments_12_0= ruleXExpression )
-                            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7101:3: lv_arguments_12_0= ruleXExpression
+                            	    // InternalFormat.g:7100:1: (lv_arguments_12_0= ruleXExpression )
+                            	    // InternalFormat.g:7101:3: lv_arguments_12_0= ruleXExpression
                             	    {
                             	    if ( state.backtracking==0 ) {
                             	       
                             	      	        newCompositeNode(grammarAccess.getXConstructorCallAccess().getArgumentsXExpressionParserRuleCall_4_1_1_1_1_0()); 
                             	      	    
                             	    }
-                            	    pushFollow(FOLLOW_ruleXExpression_in_ruleXConstructorCall16719);
+                            	    pushFollow(FOLLOW_47);
                             	    lv_arguments_12_0=ruleXExpression();
 
                             	    state._fsp--;
@@ -20560,7 +20560,7 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
                             	             			current, 
                             	             			"arguments",
                             	              		lv_arguments_12_0, 
-                            	              		"XExpression");
+                            	              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                             	      	        afterParserOrEnumRuleCall();
                             	      	    
                             	    }
@@ -20588,7 +20588,7 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
                     }
 
-                    otherlv_13=(Token)match(input,34,FOLLOW_34_in_ruleXConstructorCall16736); if (state.failed) return current;
+                    otherlv_13=(Token)match(input,34,FOLLOW_99); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_13, grammarAccess.getXConstructorCallAccess().getRightParenthesisKeyword_4_2());
@@ -20600,22 +20600,22 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7121:3: ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )?
+            // InternalFormat.g:7121:3: ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )?
             int alt135=2;
             alt135 = dfa135.predict(input);
             switch (alt135) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7121:4: ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure )
+                    // InternalFormat.g:7121:4: ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7124:1: (lv_arguments_14_0= ruleXClosure )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7125:3: lv_arguments_14_0= ruleXClosure
+                    // InternalFormat.g:7124:1: (lv_arguments_14_0= ruleXClosure )
+                    // InternalFormat.g:7125:3: lv_arguments_14_0= ruleXClosure
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXConstructorCallAccess().getArgumentsXClosureParserRuleCall_5_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXClosure_in_ruleXConstructorCall16771);
+                    pushFollow(FOLLOW_2);
                     lv_arguments_14_0=ruleXClosure();
 
                     state._fsp--;
@@ -20629,7 +20629,7 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
                              			current, 
                              			"arguments",
                               		lv_arguments_14_0, 
-                              		"XClosure");
+                              		"org.eclipse.xtext.xbase.Xbase.XClosure");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -20665,7 +20665,7 @@ public final EObject ruleXConstructorCall() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXBooleanLiteral"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7149:1: entryRuleXBooleanLiteral returns [EObject current=null] : iv_ruleXBooleanLiteral= ruleXBooleanLiteral EOF ;
+    // InternalFormat.g:7149:1: entryRuleXBooleanLiteral returns [EObject current=null] : iv_ruleXBooleanLiteral= ruleXBooleanLiteral EOF ;
     public final EObject entryRuleXBooleanLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -20673,13 +20673,13 @@ public final EObject entryRuleXBooleanLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7150:2: (iv_ruleXBooleanLiteral= ruleXBooleanLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7151:2: iv_ruleXBooleanLiteral= ruleXBooleanLiteral EOF
+            // InternalFormat.g:7150:2: (iv_ruleXBooleanLiteral= ruleXBooleanLiteral EOF )
+            // InternalFormat.g:7151:2: iv_ruleXBooleanLiteral= ruleXBooleanLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXBooleanLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXBooleanLiteral_in_entryRuleXBooleanLiteral16808);
+            pushFollow(FOLLOW_1);
             iv_ruleXBooleanLiteral=ruleXBooleanLiteral();
 
             state._fsp--;
@@ -20687,7 +20687,7 @@ public final EObject entryRuleXBooleanLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXBooleanLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXBooleanLiteral16818); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -20705,7 +20705,7 @@ public final EObject entryRuleXBooleanLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXBooleanLiteral"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7158:1: ruleXBooleanLiteral returns [EObject current=null] : ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) ;
+    // InternalFormat.g:7158:1: ruleXBooleanLiteral returns [EObject current=null] : ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) ;
     public final EObject ruleXBooleanLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -20715,14 +20715,14 @@ public final EObject ruleXBooleanLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7161:28: ( ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7162:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
+            // InternalFormat.g:7161:28: ( ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) ) )
+            // InternalFormat.g:7162:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7162:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7162:2: () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
+            // InternalFormat.g:7162:1: ( () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) ) )
+            // InternalFormat.g:7162:2: () (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7162:2: ()
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7163:5: 
+            // InternalFormat.g:7162:2: ()
+            // InternalFormat.g:7163:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -20734,7 +20734,7 @@ public final EObject ruleXBooleanLiteral() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7168:2: (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
+            // InternalFormat.g:7168:2: (otherlv_1= 'false' | ( (lv_isTrue_2_0= 'true' ) ) )
             int alt136=2;
             int LA136_0 = input.LA(1);
 
@@ -20753,9 +20753,9 @@ else if ( (LA136_0==102) ) {
             }
             switch (alt136) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7168:4: otherlv_1= 'false'
+                    // InternalFormat.g:7168:4: otherlv_1= 'false'
                     {
-                    otherlv_1=(Token)match(input,101,FOLLOW_101_in_ruleXBooleanLiteral16865); if (state.failed) return current;
+                    otherlv_1=(Token)match(input,101,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_1, grammarAccess.getXBooleanLiteralAccess().getFalseKeyword_1_0());
@@ -20765,15 +20765,15 @@ else if ( (LA136_0==102) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7173:6: ( (lv_isTrue_2_0= 'true' ) )
+                    // InternalFormat.g:7173:6: ( (lv_isTrue_2_0= 'true' ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7173:6: ( (lv_isTrue_2_0= 'true' ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7174:1: (lv_isTrue_2_0= 'true' )
+                    // InternalFormat.g:7173:6: ( (lv_isTrue_2_0= 'true' ) )
+                    // InternalFormat.g:7174:1: (lv_isTrue_2_0= 'true' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7174:1: (lv_isTrue_2_0= 'true' )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7175:3: lv_isTrue_2_0= 'true'
+                    // InternalFormat.g:7174:1: (lv_isTrue_2_0= 'true' )
+                    // InternalFormat.g:7175:3: lv_isTrue_2_0= 'true'
                     {
-                    lv_isTrue_2_0=(Token)match(input,102,FOLLOW_102_in_ruleXBooleanLiteral16889); if (state.failed) return current;
+                    lv_isTrue_2_0=(Token)match(input,102,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_isTrue_2_0, grammarAccess.getXBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0());
@@ -20822,7 +20822,7 @@ else if ( (LA136_0==102) ) {
 
 
     // $ANTLR start "entryRuleXNullLiteral"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7196:1: entryRuleXNullLiteral returns [EObject current=null] : iv_ruleXNullLiteral= ruleXNullLiteral EOF ;
+    // InternalFormat.g:7196:1: entryRuleXNullLiteral returns [EObject current=null] : iv_ruleXNullLiteral= ruleXNullLiteral EOF ;
     public final EObject entryRuleXNullLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -20830,13 +20830,13 @@ public final EObject entryRuleXNullLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7197:2: (iv_ruleXNullLiteral= ruleXNullLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7198:2: iv_ruleXNullLiteral= ruleXNullLiteral EOF
+            // InternalFormat.g:7197:2: (iv_ruleXNullLiteral= ruleXNullLiteral EOF )
+            // InternalFormat.g:7198:2: iv_ruleXNullLiteral= ruleXNullLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXNullLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXNullLiteral_in_entryRuleXNullLiteral16939);
+            pushFollow(FOLLOW_1);
             iv_ruleXNullLiteral=ruleXNullLiteral();
 
             state._fsp--;
@@ -20844,7 +20844,7 @@ public final EObject entryRuleXNullLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXNullLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXNullLiteral16949); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -20862,7 +20862,7 @@ public final EObject entryRuleXNullLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXNullLiteral"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7205:1: ruleXNullLiteral returns [EObject current=null] : ( () otherlv_1= 'null' ) ;
+    // InternalFormat.g:7205:1: ruleXNullLiteral returns [EObject current=null] : ( () otherlv_1= 'null' ) ;
     public final EObject ruleXNullLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -20871,14 +20871,14 @@ public final EObject ruleXNullLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7208:28: ( ( () otherlv_1= 'null' ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7209:1: ( () otherlv_1= 'null' )
+            // InternalFormat.g:7208:28: ( ( () otherlv_1= 'null' ) )
+            // InternalFormat.g:7209:1: ( () otherlv_1= 'null' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7209:1: ( () otherlv_1= 'null' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7209:2: () otherlv_1= 'null'
+            // InternalFormat.g:7209:1: ( () otherlv_1= 'null' )
+            // InternalFormat.g:7209:2: () otherlv_1= 'null'
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7209:2: ()
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7210:5: 
+            // InternalFormat.g:7209:2: ()
+            // InternalFormat.g:7210:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -20890,7 +20890,7 @@ public final EObject ruleXNullLiteral() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,103,FOLLOW_103_in_ruleXNullLiteral16995); if (state.failed) return current;
+            otherlv_1=(Token)match(input,103,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXNullLiteralAccess().getNullKeyword_1());
@@ -20919,7 +20919,7 @@ public final EObject ruleXNullLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXNumberLiteral"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7227:1: entryRuleXNumberLiteral returns [EObject current=null] : iv_ruleXNumberLiteral= ruleXNumberLiteral EOF ;
+    // InternalFormat.g:7227:1: entryRuleXNumberLiteral returns [EObject current=null] : iv_ruleXNumberLiteral= ruleXNumberLiteral EOF ;
     public final EObject entryRuleXNumberLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -20927,13 +20927,13 @@ public final EObject entryRuleXNumberLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7228:2: (iv_ruleXNumberLiteral= ruleXNumberLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7229:2: iv_ruleXNumberLiteral= ruleXNumberLiteral EOF
+            // InternalFormat.g:7228:2: (iv_ruleXNumberLiteral= ruleXNumberLiteral EOF )
+            // InternalFormat.g:7229:2: iv_ruleXNumberLiteral= ruleXNumberLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXNumberLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXNumberLiteral_in_entryRuleXNumberLiteral17031);
+            pushFollow(FOLLOW_1);
             iv_ruleXNumberLiteral=ruleXNumberLiteral();
 
             state._fsp--;
@@ -20941,7 +20941,7 @@ public final EObject entryRuleXNumberLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXNumberLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXNumberLiteral17041); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -20959,7 +20959,7 @@ public final EObject entryRuleXNumberLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXNumberLiteral"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7236:1: ruleXNumberLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= ruleNumber ) ) ) ;
+    // InternalFormat.g:7236:1: ruleXNumberLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= ruleNumber ) ) ) ;
     public final EObject ruleXNumberLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -20969,14 +20969,14 @@ public final EObject ruleXNumberLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7239:28: ( ( () ( (lv_value_1_0= ruleNumber ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7240:1: ( () ( (lv_value_1_0= ruleNumber ) ) )
+            // InternalFormat.g:7239:28: ( ( () ( (lv_value_1_0= ruleNumber ) ) ) )
+            // InternalFormat.g:7240:1: ( () ( (lv_value_1_0= ruleNumber ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7240:1: ( () ( (lv_value_1_0= ruleNumber ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7240:2: () ( (lv_value_1_0= ruleNumber ) )
+            // InternalFormat.g:7240:1: ( () ( (lv_value_1_0= ruleNumber ) ) )
+            // InternalFormat.g:7240:2: () ( (lv_value_1_0= ruleNumber ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7240:2: ()
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7241:5: 
+            // InternalFormat.g:7240:2: ()
+            // InternalFormat.g:7241:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -20988,18 +20988,18 @@ public final EObject ruleXNumberLiteral() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7246:2: ( (lv_value_1_0= ruleNumber ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7247:1: (lv_value_1_0= ruleNumber )
+            // InternalFormat.g:7246:2: ( (lv_value_1_0= ruleNumber ) )
+            // InternalFormat.g:7247:1: (lv_value_1_0= ruleNumber )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7247:1: (lv_value_1_0= ruleNumber )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7248:3: lv_value_1_0= ruleNumber
+            // InternalFormat.g:7247:1: (lv_value_1_0= ruleNumber )
+            // InternalFormat.g:7248:3: lv_value_1_0= ruleNumber
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXNumberLiteralAccess().getValueNumberParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleNumber_in_ruleXNumberLiteral17096);
+            pushFollow(FOLLOW_2);
             lv_value_1_0=ruleNumber();
 
             state._fsp--;
@@ -21013,7 +21013,7 @@ public final EObject ruleXNumberLiteral() throws RecognitionException {
                      			current, 
                      			"value",
                       		lv_value_1_0, 
-                      		"Number");
+                      		"org.eclipse.xtext.xbase.Xbase.Number");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -21046,7 +21046,7 @@ public final EObject ruleXNumberLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXStringLiteral"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7272:1: entryRuleXStringLiteral returns [EObject current=null] : iv_ruleXStringLiteral= ruleXStringLiteral EOF ;
+    // InternalFormat.g:7272:1: entryRuleXStringLiteral returns [EObject current=null] : iv_ruleXStringLiteral= ruleXStringLiteral EOF ;
     public final EObject entryRuleXStringLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -21054,13 +21054,13 @@ public final EObject entryRuleXStringLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7273:2: (iv_ruleXStringLiteral= ruleXStringLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7274:2: iv_ruleXStringLiteral= ruleXStringLiteral EOF
+            // InternalFormat.g:7273:2: (iv_ruleXStringLiteral= ruleXStringLiteral EOF )
+            // InternalFormat.g:7274:2: iv_ruleXStringLiteral= ruleXStringLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXStringLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXStringLiteral_in_entryRuleXStringLiteral17132);
+            pushFollow(FOLLOW_1);
             iv_ruleXStringLiteral=ruleXStringLiteral();
 
             state._fsp--;
@@ -21068,7 +21068,7 @@ public final EObject entryRuleXStringLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXStringLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXStringLiteral17142); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -21086,7 +21086,7 @@ public final EObject entryRuleXStringLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXStringLiteral"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7281:1: ruleXStringLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= RULE_STRING ) ) ) ;
+    // InternalFormat.g:7281:1: ruleXStringLiteral returns [EObject current=null] : ( () ( (lv_value_1_0= RULE_STRING ) ) ) ;
     public final EObject ruleXStringLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -21095,14 +21095,14 @@ public final EObject ruleXStringLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7284:28: ( ( () ( (lv_value_1_0= RULE_STRING ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7285:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
+            // InternalFormat.g:7284:28: ( ( () ( (lv_value_1_0= RULE_STRING ) ) ) )
+            // InternalFormat.g:7285:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7285:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7285:2: () ( (lv_value_1_0= RULE_STRING ) )
+            // InternalFormat.g:7285:1: ( () ( (lv_value_1_0= RULE_STRING ) ) )
+            // InternalFormat.g:7285:2: () ( (lv_value_1_0= RULE_STRING ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7285:2: ()
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7286:5: 
+            // InternalFormat.g:7285:2: ()
+            // InternalFormat.g:7286:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -21114,13 +21114,13 @@ public final EObject ruleXStringLiteral() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7291:2: ( (lv_value_1_0= RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7292:1: (lv_value_1_0= RULE_STRING )
+            // InternalFormat.g:7291:2: ( (lv_value_1_0= RULE_STRING ) )
+            // InternalFormat.g:7292:1: (lv_value_1_0= RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7292:1: (lv_value_1_0= RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7293:3: lv_value_1_0= RULE_STRING
+            // InternalFormat.g:7292:1: (lv_value_1_0= RULE_STRING )
+            // InternalFormat.g:7293:3: lv_value_1_0= RULE_STRING
             {
-            lv_value_1_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleXStringLiteral17193); if (state.failed) return current;
+            lv_value_1_0=(Token)match(input,RULE_STRING,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(lv_value_1_0, grammarAccess.getXStringLiteralAccess().getValueSTRINGTerminalRuleCall_1_0()); 
@@ -21135,7 +21135,7 @@ public final EObject ruleXStringLiteral() throws RecognitionException {
                      			current, 
                      			"value",
                       		lv_value_1_0, 
-                      		"STRING");
+                      		"org.eclipse.xtext.xbase.Xtype.STRING");
               	    
             }
 
@@ -21167,7 +21167,7 @@ public final EObject ruleXStringLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXTypeLiteral"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7317:1: entryRuleXTypeLiteral returns [EObject current=null] : iv_ruleXTypeLiteral= ruleXTypeLiteral EOF ;
+    // InternalFormat.g:7317:1: entryRuleXTypeLiteral returns [EObject current=null] : iv_ruleXTypeLiteral= ruleXTypeLiteral EOF ;
     public final EObject entryRuleXTypeLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -21175,13 +21175,13 @@ public final EObject entryRuleXTypeLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7318:2: (iv_ruleXTypeLiteral= ruleXTypeLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7319:2: iv_ruleXTypeLiteral= ruleXTypeLiteral EOF
+            // InternalFormat.g:7318:2: (iv_ruleXTypeLiteral= ruleXTypeLiteral EOF )
+            // InternalFormat.g:7319:2: iv_ruleXTypeLiteral= ruleXTypeLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXTypeLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleXTypeLiteral_in_entryRuleXTypeLiteral17234);
+            pushFollow(FOLLOW_1);
             iv_ruleXTypeLiteral=ruleXTypeLiteral();
 
             state._fsp--;
@@ -21189,7 +21189,7 @@ public final EObject entryRuleXTypeLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXTypeLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXTypeLiteral17244); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -21207,7 +21207,7 @@ public final EObject entryRuleXTypeLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleXTypeLiteral"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7326:1: ruleXTypeLiteral returns [EObject current=null] : ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' ) ;
+    // InternalFormat.g:7326:1: ruleXTypeLiteral returns [EObject current=null] : ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' ) ;
     public final EObject ruleXTypeLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -21220,14 +21220,14 @@ public final EObject ruleXTypeLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7329:28: ( ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7330:1: ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' )
+            // InternalFormat.g:7329:28: ( ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' ) )
+            // InternalFormat.g:7330:1: ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7330:1: ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7330:2: () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')'
+            // InternalFormat.g:7330:1: ( () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')' )
+            // InternalFormat.g:7330:2: () otherlv_1= 'typeof' otherlv_2= '(' ( ( ruleQualifiedName ) ) ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )* otherlv_5= ')'
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7330:2: ()
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7331:5: 
+            // InternalFormat.g:7330:2: ()
+            // InternalFormat.g:7331:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -21239,23 +21239,23 @@ public final EObject ruleXTypeLiteral() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,104,FOLLOW_104_in_ruleXTypeLiteral17290); if (state.failed) return current;
+            otherlv_1=(Token)match(input,104,FOLLOW_85); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXTypeLiteralAccess().getTypeofKeyword_1());
                   
             }
-            otherlv_2=(Token)match(input,33,FOLLOW_33_in_ruleXTypeLiteral17302); if (state.failed) return current;
+            otherlv_2=(Token)match(input,33,FOLLOW_7); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getXTypeLiteralAccess().getLeftParenthesisKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7344:1: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7345:1: ( ruleQualifiedName )
+            // InternalFormat.g:7344:1: ( ( ruleQualifiedName ) )
+            // InternalFormat.g:7345:1: ( ruleQualifiedName )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7345:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7346:3: ruleQualifiedName
+            // InternalFormat.g:7345:1: ( ruleQualifiedName )
+            // InternalFormat.g:7346:3: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
 
@@ -21269,7 +21269,7 @@ public final EObject ruleXTypeLiteral() throws RecognitionException {
               	        newCompositeNode(grammarAccess.getXTypeLiteralAccess().getTypeJvmTypeCrossReference_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_ruleXTypeLiteral17325);
+            pushFollow(FOLLOW_101);
             ruleQualifiedName();
 
             state._fsp--;
@@ -21285,7 +21285,7 @@ public final EObject ruleXTypeLiteral() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7359:2: ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )*
+            // InternalFormat.g:7359:2: ( (lv_arrayDimensions_4_0= ruleArrayBrackets ) )*
             loop137:
             do {
                 int alt137=2;
@@ -21298,17 +21298,17 @@ public final EObject ruleXTypeLiteral() throws RecognitionException {
 
                 switch (alt137) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7360:1: (lv_arrayDimensions_4_0= ruleArrayBrackets )
+            	    // InternalFormat.g:7360:1: (lv_arrayDimensions_4_0= ruleArrayBrackets )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7360:1: (lv_arrayDimensions_4_0= ruleArrayBrackets )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7361:3: lv_arrayDimensions_4_0= ruleArrayBrackets
+            	    // InternalFormat.g:7360:1: (lv_arrayDimensions_4_0= ruleArrayBrackets )
+            	    // InternalFormat.g:7361:3: lv_arrayDimensions_4_0= ruleArrayBrackets
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getXTypeLiteralAccess().getArrayDimensionsArrayBracketsParserRuleCall_4_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleArrayBrackets_in_ruleXTypeLiteral17346);
+            	    pushFollow(FOLLOW_101);
             	    lv_arrayDimensions_4_0=ruleArrayBrackets();
 
             	    state._fsp--;
@@ -21322,7 +21322,7 @@ public final EObject ruleXTypeLiteral() throws RecognitionException {
             	             			current, 
             	             			"arrayDimensions",
             	              		lv_arrayDimensions_4_0, 
-            	              		"ArrayBrackets");
+            	              		"org.eclipse.xtext.xbase.Xtype.ArrayBrackets");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -21338,7 +21338,7 @@ public final EObject ruleXTypeLiteral() throws RecognitionException {
                 }
             } while (true);
 
-            otherlv_5=(Token)match(input,34,FOLLOW_34_in_ruleXTypeLiteral17359); if (state.failed) return current;
+            otherlv_5=(Token)match(input,34,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_5, grammarAccess.getXTypeLiteralAccess().getRightParenthesisKeyword_5());
@@ -21367,7 +21367,7 @@ public final EObject ruleXTypeLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXThrowExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7389:1: entryRuleXThrowExpression returns [EObject current=null] : iv_ruleXThrowExpression= ruleXThrowExpression EOF ;
+    // InternalFormat.g:7389:1: entryRuleXThrowExpression returns [EObject current=null] : iv_ruleXThrowExpression= ruleXThrowExpression EOF ;
     public final EObject entryRuleXThrowExpression() throws RecognitionException {
         EObject current = null;
 
@@ -21375,13 +21375,13 @@ public final EObject entryRuleXThrowExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7390:2: (iv_ruleXThrowExpression= ruleXThrowExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7391:2: iv_ruleXThrowExpression= ruleXThrowExpression EOF
+            // InternalFormat.g:7390:2: (iv_ruleXThrowExpression= ruleXThrowExpression EOF )
+            // InternalFormat.g:7391:2: iv_ruleXThrowExpression= ruleXThrowExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXThrowExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXThrowExpression_in_entryRuleXThrowExpression17395);
+            pushFollow(FOLLOW_1);
             iv_ruleXThrowExpression=ruleXThrowExpression();
 
             state._fsp--;
@@ -21389,7 +21389,7 @@ public final EObject entryRuleXThrowExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXThrowExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXThrowExpression17405); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -21407,7 +21407,7 @@ public final EObject entryRuleXThrowExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXThrowExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7398:1: ruleXThrowExpression returns [EObject current=null] : ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) ) ;
+    // InternalFormat.g:7398:1: ruleXThrowExpression returns [EObject current=null] : ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) ) ;
     public final EObject ruleXThrowExpression() throws RecognitionException {
         EObject current = null;
 
@@ -21418,14 +21418,14 @@ public final EObject ruleXThrowExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7401:28: ( ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7402:1: ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) )
+            // InternalFormat.g:7401:28: ( ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) ) )
+            // InternalFormat.g:7402:1: ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7402:1: ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7402:2: () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) )
+            // InternalFormat.g:7402:1: ( () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) ) )
+            // InternalFormat.g:7402:2: () otherlv_1= 'throw' ( (lv_expression_2_0= ruleXExpression ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7402:2: ()
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7403:5: 
+            // InternalFormat.g:7402:2: ()
+            // InternalFormat.g:7403:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -21437,24 +21437,24 @@ public final EObject ruleXThrowExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,105,FOLLOW_105_in_ruleXThrowExpression17451); if (state.failed) return current;
+            otherlv_1=(Token)match(input,105,FOLLOW_48); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXThrowExpressionAccess().getThrowKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7412:1: ( (lv_expression_2_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7413:1: (lv_expression_2_0= ruleXExpression )
+            // InternalFormat.g:7412:1: ( (lv_expression_2_0= ruleXExpression ) )
+            // InternalFormat.g:7413:1: (lv_expression_2_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7413:1: (lv_expression_2_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7414:3: lv_expression_2_0= ruleXExpression
+            // InternalFormat.g:7413:1: (lv_expression_2_0= ruleXExpression )
+            // InternalFormat.g:7414:3: lv_expression_2_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXThrowExpressionAccess().getExpressionXExpressionParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXThrowExpression17472);
+            pushFollow(FOLLOW_2);
             lv_expression_2_0=ruleXExpression();
 
             state._fsp--;
@@ -21468,7 +21468,7 @@ public final EObject ruleXThrowExpression() throws RecognitionException {
                      			current, 
                      			"expression",
                       		lv_expression_2_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -21501,7 +21501,7 @@ public final EObject ruleXThrowExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXReturnExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7438:1: entryRuleXReturnExpression returns [EObject current=null] : iv_ruleXReturnExpression= ruleXReturnExpression EOF ;
+    // InternalFormat.g:7438:1: entryRuleXReturnExpression returns [EObject current=null] : iv_ruleXReturnExpression= ruleXReturnExpression EOF ;
     public final EObject entryRuleXReturnExpression() throws RecognitionException {
         EObject current = null;
 
@@ -21509,13 +21509,13 @@ public final EObject entryRuleXReturnExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7439:2: (iv_ruleXReturnExpression= ruleXReturnExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7440:2: iv_ruleXReturnExpression= ruleXReturnExpression EOF
+            // InternalFormat.g:7439:2: (iv_ruleXReturnExpression= ruleXReturnExpression EOF )
+            // InternalFormat.g:7440:2: iv_ruleXReturnExpression= ruleXReturnExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXReturnExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXReturnExpression_in_entryRuleXReturnExpression17508);
+            pushFollow(FOLLOW_1);
             iv_ruleXReturnExpression=ruleXReturnExpression();
 
             state._fsp--;
@@ -21523,7 +21523,7 @@ public final EObject entryRuleXReturnExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXReturnExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXReturnExpression17518); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -21541,7 +21541,7 @@ public final EObject entryRuleXReturnExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleXReturnExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7447:1: ruleXReturnExpression returns [EObject current=null] : ( () otherlv_1= 'return' ( ( 'context' | 'currentColumn' | 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )? ) ;
+    // InternalFormat.g:7447:1: ruleXReturnExpression returns [EObject current=null] : ( () otherlv_1= 'return' ( ( 'context' | 'currentColumn' | 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )? ) ;
     public final EObject ruleXReturnExpression() throws RecognitionException {
         EObject current = null;
 
@@ -21552,14 +21552,14 @@ public final EObject ruleXReturnExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7450:28: ( ( () otherlv_1= 'return' ( ( 'context' | 'currentColumn' | 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7451:1: ( () otherlv_1= 'return' ( ( 'context' | 'currentColumn' | 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )? )
+            // InternalFormat.g:7450:28: ( ( () otherlv_1= 'return' ( ( 'context' | 'currentColumn' | 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )? ) )
+            // InternalFormat.g:7451:1: ( () otherlv_1= 'return' ( ( 'context' | 'currentColumn' | 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7451:1: ( () otherlv_1= 'return' ( ( 'context' | 'currentColumn' | 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )? )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7451:2: () otherlv_1= 'return' ( ( 'context' | 'currentColumn' | 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )?
+            // InternalFormat.g:7451:1: ( () otherlv_1= 'return' ( ( 'context' | 'currentColumn' | 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )? )
+            // InternalFormat.g:7451:2: () otherlv_1= 'return' ( ( 'context' | 'currentColumn' | 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )?
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7451:2: ()
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7452:5: 
+            // InternalFormat.g:7451:2: ()
+            // InternalFormat.g:7452:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -21571,28 +21571,28 @@ public final EObject ruleXReturnExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,106,FOLLOW_106_in_ruleXReturnExpression17564); if (state.failed) return current;
+            otherlv_1=(Token)match(input,106,FOLLOW_102); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXReturnExpressionAccess().getReturnKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7461:1: ( ( 'context' | 'currentColumn' | 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )?
+            // InternalFormat.g:7461:1: ( ( 'context' | 'currentColumn' | 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )?
             int alt138=2;
             alt138 = dfa138.predict(input);
             switch (alt138) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7461:2: ( 'context' | 'currentColumn' | 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression )
+                    // InternalFormat.g:7461:2: ( 'context' | 'currentColumn' | 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7491:1: (lv_expression_2_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7492:3: lv_expression_2_0= ruleXExpression
+                    // InternalFormat.g:7491:1: (lv_expression_2_0= ruleXExpression )
+                    // InternalFormat.g:7492:3: lv_expression_2_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXReturnExpressionAccess().getExpressionXExpressionParserRuleCall_2_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXReturnExpression17813);
+                    pushFollow(FOLLOW_2);
                     lv_expression_2_0=ruleXExpression();
 
                     state._fsp--;
@@ -21606,7 +21606,7 @@ public final EObject ruleXReturnExpression() throws RecognitionException {
                              			current, 
                              			"expression",
                               		lv_expression_2_0, 
-                              		"XExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -21642,7 +21642,7 @@ public final EObject ruleXReturnExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXTryCatchFinallyExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7516:1: entryRuleXTryCatchFinallyExpression returns [EObject current=null] : iv_ruleXTryCatchFinallyExpression= ruleXTryCatchFinallyExpression EOF ;
+    // InternalFormat.g:7516:1: entryRuleXTryCatchFinallyExpression returns [EObject current=null] : iv_ruleXTryCatchFinallyExpression= ruleXTryCatchFinallyExpression EOF ;
     public final EObject entryRuleXTryCatchFinallyExpression() throws RecognitionException {
         EObject current = null;
 
@@ -21650,13 +21650,13 @@ public final EObject entryRuleXTryCatchFinallyExpression() throws RecognitionExc
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7517:2: (iv_ruleXTryCatchFinallyExpression= ruleXTryCatchFinallyExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7518:2: iv_ruleXTryCatchFinallyExpression= ruleXTryCatchFinallyExpression EOF
+            // InternalFormat.g:7517:2: (iv_ruleXTryCatchFinallyExpression= ruleXTryCatchFinallyExpression EOF )
+            // InternalFormat.g:7518:2: iv_ruleXTryCatchFinallyExpression= ruleXTryCatchFinallyExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXTryCatchFinallyExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXTryCatchFinallyExpression_in_entryRuleXTryCatchFinallyExpression17850);
+            pushFollow(FOLLOW_1);
             iv_ruleXTryCatchFinallyExpression=ruleXTryCatchFinallyExpression();
 
             state._fsp--;
@@ -21664,7 +21664,7 @@ public final EObject entryRuleXTryCatchFinallyExpression() throws RecognitionExc
             if ( state.backtracking==0 ) {
                current =iv_ruleXTryCatchFinallyExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXTryCatchFinallyExpression17860); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -21682,7 +21682,7 @@ public final EObject entryRuleXTryCatchFinallyExpression() throws RecognitionExc
 
 
     // $ANTLR start "ruleXTryCatchFinallyExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7525:1: ruleXTryCatchFinallyExpression returns [EObject current=null] : ( () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) ) ) ;
+    // InternalFormat.g:7525:1: ruleXTryCatchFinallyExpression returns [EObject current=null] : ( () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) ) ) ;
     public final EObject ruleXTryCatchFinallyExpression() throws RecognitionException {
         EObject current = null;
 
@@ -21701,14 +21701,14 @@ public final EObject ruleXTryCatchFinallyExpression() throws RecognitionExceptio
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7528:28: ( ( () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7529:1: ( () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) ) )
+            // InternalFormat.g:7528:28: ( ( () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) ) ) )
+            // InternalFormat.g:7529:1: ( () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7529:1: ( () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7529:2: () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) )
+            // InternalFormat.g:7529:1: ( () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) ) )
+            // InternalFormat.g:7529:2: () otherlv_1= 'try' ( (lv_expression_2_0= ruleXExpression ) ) ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7529:2: ()
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7530:5: 
+            // InternalFormat.g:7529:2: ()
+            // InternalFormat.g:7530:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -21720,24 +21720,24 @@ public final EObject ruleXTryCatchFinallyExpression() throws RecognitionExceptio
 
             }
 
-            otherlv_1=(Token)match(input,107,FOLLOW_107_in_ruleXTryCatchFinallyExpression17906); if (state.failed) return current;
+            otherlv_1=(Token)match(input,107,FOLLOW_48); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXTryCatchFinallyExpressionAccess().getTryKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7539:1: ( (lv_expression_2_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7540:1: (lv_expression_2_0= ruleXExpression )
+            // InternalFormat.g:7539:1: ( (lv_expression_2_0= ruleXExpression ) )
+            // InternalFormat.g:7540:1: (lv_expression_2_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7540:1: (lv_expression_2_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7541:3: lv_expression_2_0= ruleXExpression
+            // InternalFormat.g:7540:1: (lv_expression_2_0= ruleXExpression )
+            // InternalFormat.g:7541:3: lv_expression_2_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXTryCatchFinallyExpressionAccess().getExpressionXExpressionParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXTryCatchFinallyExpression17927);
+            pushFollow(FOLLOW_103);
             lv_expression_2_0=ruleXExpression();
 
             state._fsp--;
@@ -21751,7 +21751,7 @@ public final EObject ruleXTryCatchFinallyExpression() throws RecognitionExceptio
                      			current, 
                      			"expression",
                       		lv_expression_2_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -21761,7 +21761,7 @@ public final EObject ruleXTryCatchFinallyExpression() throws RecognitionExceptio
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7557:2: ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) )
+            // InternalFormat.g:7557:2: ( ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? ) | (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) )
             int alt141=2;
             int LA141_0 = input.LA(1);
 
@@ -21780,12 +21780,12 @@ else if ( (LA141_0==108) ) {
             }
             switch (alt141) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7557:3: ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? )
+                    // InternalFormat.g:7557:3: ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7557:3: ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7557:4: ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )?
+                    // InternalFormat.g:7557:3: ( ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )? )
+                    // InternalFormat.g:7557:4: ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+ ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )?
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7557:4: ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+
+                    // InternalFormat.g:7557:4: ( ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause ) )+
                     int cnt139=0;
                     loop139:
                     do {
@@ -21805,17 +21805,17 @@ else if ( (LA141_0==108) ) {
 
                         switch (alt139) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7557:5: ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause )
+                    	    // InternalFormat.g:7557:5: ( 'catch' )=> (lv_catchClauses_3_0= ruleXCatchClause )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7559:1: (lv_catchClauses_3_0= ruleXCatchClause )
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7560:3: lv_catchClauses_3_0= ruleXCatchClause
+                    	    // InternalFormat.g:7559:1: (lv_catchClauses_3_0= ruleXCatchClause )
+                    	    // InternalFormat.g:7560:3: lv_catchClauses_3_0= ruleXCatchClause
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getXTryCatchFinallyExpressionAccess().getCatchClausesXCatchClauseParserRuleCall_3_0_0_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleXCatchClause_in_ruleXTryCatchFinallyExpression17957);
+                    	    pushFollow(FOLLOW_104);
                     	    lv_catchClauses_3_0=ruleXCatchClause();
 
                     	    state._fsp--;
@@ -21829,7 +21829,7 @@ else if ( (LA141_0==108) ) {
                     	             			current, 
                     	             			"catchClauses",
                     	              		lv_catchClauses_3_0, 
-                    	              		"XCatchClause");
+                    	              		"org.eclipse.xtext.xbase.Xbase.XCatchClause");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -21850,7 +21850,7 @@ else if ( (LA141_0==108) ) {
                         cnt139++;
                     } while (true);
 
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7576:3: ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )?
+                    // InternalFormat.g:7576:3: ( ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) ) )?
                     int alt140=2;
                     int LA140_0 = input.LA(1);
 
@@ -21863,12 +21863,12 @@ else if ( (LA141_0==108) ) {
                     }
                     switch (alt140) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7576:4: ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) )
+                            // InternalFormat.g:7576:4: ( ( 'finally' )=>otherlv_4= 'finally' ) ( (lv_finallyExpression_5_0= ruleXExpression ) )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7576:4: ( ( 'finally' )=>otherlv_4= 'finally' )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7576:5: ( 'finally' )=>otherlv_4= 'finally'
+                            // InternalFormat.g:7576:4: ( ( 'finally' )=>otherlv_4= 'finally' )
+                            // InternalFormat.g:7576:5: ( 'finally' )=>otherlv_4= 'finally'
                             {
-                            otherlv_4=(Token)match(input,108,FOLLOW_108_in_ruleXTryCatchFinallyExpression17979); if (state.failed) return current;
+                            otherlv_4=(Token)match(input,108,FOLLOW_48); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                   	newLeafNode(otherlv_4, grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyKeyword_3_0_1_0());
@@ -21877,18 +21877,18 @@ else if ( (LA141_0==108) ) {
 
                             }
 
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7581:2: ( (lv_finallyExpression_5_0= ruleXExpression ) )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7582:1: (lv_finallyExpression_5_0= ruleXExpression )
+                            // InternalFormat.g:7581:2: ( (lv_finallyExpression_5_0= ruleXExpression ) )
+                            // InternalFormat.g:7582:1: (lv_finallyExpression_5_0= ruleXExpression )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7582:1: (lv_finallyExpression_5_0= ruleXExpression )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7583:3: lv_finallyExpression_5_0= ruleXExpression
+                            // InternalFormat.g:7582:1: (lv_finallyExpression_5_0= ruleXExpression )
+                            // InternalFormat.g:7583:3: lv_finallyExpression_5_0= ruleXExpression
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyExpressionXExpressionParserRuleCall_3_0_1_1_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleXExpression_in_ruleXTryCatchFinallyExpression18001);
+                            pushFollow(FOLLOW_2);
                             lv_finallyExpression_5_0=ruleXExpression();
 
                             state._fsp--;
@@ -21902,7 +21902,7 @@ else if ( (LA141_0==108) ) {
                                      			current, 
                                      			"finallyExpression",
                                       		lv_finallyExpression_5_0, 
-                                      		"XExpression");
+                                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -21925,29 +21925,29 @@ else if ( (LA141_0==108) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7600:6: (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) )
+                    // InternalFormat.g:7600:6: (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7600:6: (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7600:8: otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) )
+                    // InternalFormat.g:7600:6: (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) )
+                    // InternalFormat.g:7600:8: otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) )
                     {
-                    otherlv_6=(Token)match(input,108,FOLLOW_108_in_ruleXTryCatchFinallyExpression18023); if (state.failed) return current;
+                    otherlv_6=(Token)match(input,108,FOLLOW_48); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_6, grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyKeyword_3_1_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7604:1: ( (lv_finallyExpression_7_0= ruleXExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7605:1: (lv_finallyExpression_7_0= ruleXExpression )
+                    // InternalFormat.g:7604:1: ( (lv_finallyExpression_7_0= ruleXExpression ) )
+                    // InternalFormat.g:7605:1: (lv_finallyExpression_7_0= ruleXExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7605:1: (lv_finallyExpression_7_0= ruleXExpression )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7606:3: lv_finallyExpression_7_0= ruleXExpression
+                    // InternalFormat.g:7605:1: (lv_finallyExpression_7_0= ruleXExpression )
+                    // InternalFormat.g:7606:3: lv_finallyExpression_7_0= ruleXExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyExpressionXExpressionParserRuleCall_3_1_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleXExpression_in_ruleXTryCatchFinallyExpression18044);
+                    pushFollow(FOLLOW_2);
                     lv_finallyExpression_7_0=ruleXExpression();
 
                     state._fsp--;
@@ -21961,7 +21961,7 @@ else if ( (LA141_0==108) ) {
                              			current, 
                              			"finallyExpression",
                               		lv_finallyExpression_7_0, 
-                              		"XExpression");
+                              		"org.eclipse.xtext.xbase.Xbase.XExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -22003,7 +22003,7 @@ else if ( (LA141_0==108) ) {
 
 
     // $ANTLR start "entryRuleXSynchronizedExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7630:1: entryRuleXSynchronizedExpression returns [EObject current=null] : iv_ruleXSynchronizedExpression= ruleXSynchronizedExpression EOF ;
+    // InternalFormat.g:7630:1: entryRuleXSynchronizedExpression returns [EObject current=null] : iv_ruleXSynchronizedExpression= ruleXSynchronizedExpression EOF ;
     public final EObject entryRuleXSynchronizedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -22011,13 +22011,13 @@ public final EObject entryRuleXSynchronizedExpression() throws RecognitionExcept
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7631:2: (iv_ruleXSynchronizedExpression= ruleXSynchronizedExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7632:2: iv_ruleXSynchronizedExpression= ruleXSynchronizedExpression EOF
+            // InternalFormat.g:7631:2: (iv_ruleXSynchronizedExpression= ruleXSynchronizedExpression EOF )
+            // InternalFormat.g:7632:2: iv_ruleXSynchronizedExpression= ruleXSynchronizedExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXSynchronizedExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleXSynchronizedExpression_in_entryRuleXSynchronizedExpression18082);
+            pushFollow(FOLLOW_1);
             iv_ruleXSynchronizedExpression=ruleXSynchronizedExpression();
 
             state._fsp--;
@@ -22025,7 +22025,7 @@ public final EObject entryRuleXSynchronizedExpression() throws RecognitionExcept
             if ( state.backtracking==0 ) {
                current =iv_ruleXSynchronizedExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXSynchronizedExpression18092); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -22043,7 +22043,7 @@ public final EObject entryRuleXSynchronizedExpression() throws RecognitionExcept
 
 
     // $ANTLR start "ruleXSynchronizedExpression"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7639:1: ruleXSynchronizedExpression returns [EObject current=null] : ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) ) ;
+    // InternalFormat.g:7639:1: ruleXSynchronizedExpression returns [EObject current=null] : ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) ) ;
     public final EObject ruleXSynchronizedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -22058,20 +22058,20 @@ public final EObject ruleXSynchronizedExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7642:28: ( ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7643:1: ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) )
+            // InternalFormat.g:7642:28: ( ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) ) )
+            // InternalFormat.g:7643:1: ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7643:1: ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7643:2: ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) )
+            // InternalFormat.g:7643:1: ( ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) ) )
+            // InternalFormat.g:7643:2: ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) ) ( (lv_param_3_0= ruleXExpression ) ) otherlv_4= ')' ( (lv_expression_5_0= ruleXExpression ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7643:2: ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7643:3: ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' )
+            // InternalFormat.g:7643:2: ( ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' ) )
+            // InternalFormat.g:7643:3: ( ( () 'synchronized' '(' ) )=> ( () otherlv_1= 'synchronized' otherlv_2= '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7646:5: ( () otherlv_1= 'synchronized' otherlv_2= '(' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7646:6: () otherlv_1= 'synchronized' otherlv_2= '('
+            // InternalFormat.g:7646:5: ( () otherlv_1= 'synchronized' otherlv_2= '(' )
+            // InternalFormat.g:7646:6: () otherlv_1= 'synchronized' otherlv_2= '('
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7646:6: ()
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7647:5: 
+            // InternalFormat.g:7646:6: ()
+            // InternalFormat.g:7647:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -22083,13 +22083,13 @@ public final EObject ruleXSynchronizedExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,109,FOLLOW_109_in_ruleXSynchronizedExpression18156); if (state.failed) return current;
+            otherlv_1=(Token)match(input,109,FOLLOW_85); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXSynchronizedExpressionAccess().getSynchronizedKeyword_0_0_1());
                   
             }
-            otherlv_2=(Token)match(input,33,FOLLOW_33_in_ruleXSynchronizedExpression18168); if (state.failed) return current;
+            otherlv_2=(Token)match(input,33,FOLLOW_48); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getXSynchronizedExpressionAccess().getLeftParenthesisKeyword_0_0_2());
@@ -22101,18 +22101,18 @@ public final EObject ruleXSynchronizedExpression() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7660:3: ( (lv_param_3_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7661:1: (lv_param_3_0= ruleXExpression )
+            // InternalFormat.g:7660:3: ( (lv_param_3_0= ruleXExpression ) )
+            // InternalFormat.g:7661:1: (lv_param_3_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7661:1: (lv_param_3_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7662:3: lv_param_3_0= ruleXExpression
+            // InternalFormat.g:7661:1: (lv_param_3_0= ruleXExpression )
+            // InternalFormat.g:7662:3: lv_param_3_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXSynchronizedExpressionAccess().getParamXExpressionParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXSynchronizedExpression18191);
+            pushFollow(FOLLOW_30);
             lv_param_3_0=ruleXExpression();
 
             state._fsp--;
@@ -22126,7 +22126,7 @@ public final EObject ruleXSynchronizedExpression() throws RecognitionException {
                      			current, 
                      			"param",
                       		lv_param_3_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -22136,24 +22136,24 @@ public final EObject ruleXSynchronizedExpression() throws RecognitionException {
 
             }
 
-            otherlv_4=(Token)match(input,34,FOLLOW_34_in_ruleXSynchronizedExpression18203); if (state.failed) return current;
+            otherlv_4=(Token)match(input,34,FOLLOW_48); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_4, grammarAccess.getXSynchronizedExpressionAccess().getRightParenthesisKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7682:1: ( (lv_expression_5_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7683:1: (lv_expression_5_0= ruleXExpression )
+            // InternalFormat.g:7682:1: ( (lv_expression_5_0= ruleXExpression ) )
+            // InternalFormat.g:7683:1: (lv_expression_5_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7683:1: (lv_expression_5_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7684:3: lv_expression_5_0= ruleXExpression
+            // InternalFormat.g:7683:1: (lv_expression_5_0= ruleXExpression )
+            // InternalFormat.g:7684:3: lv_expression_5_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXSynchronizedExpressionAccess().getExpressionXExpressionParserRuleCall_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXSynchronizedExpression18224);
+            pushFollow(FOLLOW_2);
             lv_expression_5_0=ruleXExpression();
 
             state._fsp--;
@@ -22167,7 +22167,7 @@ public final EObject ruleXSynchronizedExpression() throws RecognitionException {
                      			current, 
                      			"expression",
                       		lv_expression_5_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -22200,7 +22200,7 @@ public final EObject ruleXSynchronizedExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleXCatchClause"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7708:1: entryRuleXCatchClause returns [EObject current=null] : iv_ruleXCatchClause= ruleXCatchClause EOF ;
+    // InternalFormat.g:7708:1: entryRuleXCatchClause returns [EObject current=null] : iv_ruleXCatchClause= ruleXCatchClause EOF ;
     public final EObject entryRuleXCatchClause() throws RecognitionException {
         EObject current = null;
 
@@ -22208,13 +22208,13 @@ public final EObject entryRuleXCatchClause() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7709:2: (iv_ruleXCatchClause= ruleXCatchClause EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7710:2: iv_ruleXCatchClause= ruleXCatchClause EOF
+            // InternalFormat.g:7709:2: (iv_ruleXCatchClause= ruleXCatchClause EOF )
+            // InternalFormat.g:7710:2: iv_ruleXCatchClause= ruleXCatchClause EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXCatchClauseRule()); 
             }
-            pushFollow(FOLLOW_ruleXCatchClause_in_entryRuleXCatchClause18260);
+            pushFollow(FOLLOW_1);
             iv_ruleXCatchClause=ruleXCatchClause();
 
             state._fsp--;
@@ -22222,7 +22222,7 @@ public final EObject entryRuleXCatchClause() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXCatchClause; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXCatchClause18270); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -22240,7 +22240,7 @@ public final EObject entryRuleXCatchClause() throws RecognitionException {
 
 
     // $ANTLR start "ruleXCatchClause"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7717:1: ruleXCatchClause returns [EObject current=null] : ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) ) ;
+    // InternalFormat.g:7717:1: ruleXCatchClause returns [EObject current=null] : ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) ) ;
     public final EObject ruleXCatchClause() throws RecognitionException {
         EObject current = null;
 
@@ -22255,16 +22255,16 @@ public final EObject ruleXCatchClause() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7720:28: ( ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7721:1: ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) )
+            // InternalFormat.g:7720:28: ( ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) ) )
+            // InternalFormat.g:7721:1: ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7721:1: ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7721:2: ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) )
+            // InternalFormat.g:7721:1: ( ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) ) )
+            // InternalFormat.g:7721:2: ( ( 'catch' )=>otherlv_0= 'catch' ) otherlv_1= '(' ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) ) otherlv_3= ')' ( (lv_expression_4_0= ruleXExpression ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7721:2: ( ( 'catch' )=>otherlv_0= 'catch' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7721:3: ( 'catch' )=>otherlv_0= 'catch'
+            // InternalFormat.g:7721:2: ( ( 'catch' )=>otherlv_0= 'catch' )
+            // InternalFormat.g:7721:3: ( 'catch' )=>otherlv_0= 'catch'
             {
-            otherlv_0=(Token)match(input,110,FOLLOW_110_in_ruleXCatchClause18315); if (state.failed) return current;
+            otherlv_0=(Token)match(input,110,FOLLOW_85); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getXCatchClauseAccess().getCatchKeyword_0());
@@ -22273,24 +22273,24 @@ public final EObject ruleXCatchClause() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,33,FOLLOW_33_in_ruleXCatchClause18328); if (state.failed) return current;
+            otherlv_1=(Token)match(input,33,FOLLOW_60); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getXCatchClauseAccess().getLeftParenthesisKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7730:1: ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7731:1: (lv_declaredParam_2_0= ruleFullJvmFormalParameter )
+            // InternalFormat.g:7730:1: ( (lv_declaredParam_2_0= ruleFullJvmFormalParameter ) )
+            // InternalFormat.g:7731:1: (lv_declaredParam_2_0= ruleFullJvmFormalParameter )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7731:1: (lv_declaredParam_2_0= ruleFullJvmFormalParameter )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7732:3: lv_declaredParam_2_0= ruleFullJvmFormalParameter
+            // InternalFormat.g:7731:1: (lv_declaredParam_2_0= ruleFullJvmFormalParameter )
+            // InternalFormat.g:7732:3: lv_declaredParam_2_0= ruleFullJvmFormalParameter
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXCatchClauseAccess().getDeclaredParamFullJvmFormalParameterParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleFullJvmFormalParameter_in_ruleXCatchClause18349);
+            pushFollow(FOLLOW_30);
             lv_declaredParam_2_0=ruleFullJvmFormalParameter();
 
             state._fsp--;
@@ -22304,7 +22304,7 @@ public final EObject ruleXCatchClause() throws RecognitionException {
                      			current, 
                      			"declaredParam",
                       		lv_declaredParam_2_0, 
-                      		"FullJvmFormalParameter");
+                      		"org.eclipse.xtext.xbase.Xbase.FullJvmFormalParameter");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -22314,24 +22314,24 @@ public final EObject ruleXCatchClause() throws RecognitionException {
 
             }
 
-            otherlv_3=(Token)match(input,34,FOLLOW_34_in_ruleXCatchClause18361); if (state.failed) return current;
+            otherlv_3=(Token)match(input,34,FOLLOW_48); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_3, grammarAccess.getXCatchClauseAccess().getRightParenthesisKeyword_3());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7752:1: ( (lv_expression_4_0= ruleXExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7753:1: (lv_expression_4_0= ruleXExpression )
+            // InternalFormat.g:7752:1: ( (lv_expression_4_0= ruleXExpression ) )
+            // InternalFormat.g:7753:1: (lv_expression_4_0= ruleXExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7753:1: (lv_expression_4_0= ruleXExpression )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7754:3: lv_expression_4_0= ruleXExpression
+            // InternalFormat.g:7753:1: (lv_expression_4_0= ruleXExpression )
+            // InternalFormat.g:7754:3: lv_expression_4_0= ruleXExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXCatchClauseAccess().getExpressionXExpressionParserRuleCall_4_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleXExpression_in_ruleXCatchClause18382);
+            pushFollow(FOLLOW_2);
             lv_expression_4_0=ruleXExpression();
 
             state._fsp--;
@@ -22345,7 +22345,7 @@ public final EObject ruleXCatchClause() throws RecognitionException {
                      			current, 
                      			"expression",
                       		lv_expression_4_0, 
-                      		"XExpression");
+                      		"org.eclipse.xtext.xbase.Xbase.XExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -22378,7 +22378,7 @@ public final EObject ruleXCatchClause() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleQualifiedName"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7778:1: entryRuleQualifiedName returns [String current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
+    // InternalFormat.g:7778:1: entryRuleQualifiedName returns [String current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
     public final String entryRuleQualifiedName() throws RecognitionException {
         String current = null;
 
@@ -22386,13 +22386,13 @@ public final String entryRuleQualifiedName() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7779:2: (iv_ruleQualifiedName= ruleQualifiedName EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7780:2: iv_ruleQualifiedName= ruleQualifiedName EOF
+            // InternalFormat.g:7779:2: (iv_ruleQualifiedName= ruleQualifiedName EOF )
+            // InternalFormat.g:7780:2: iv_ruleQualifiedName= ruleQualifiedName EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getQualifiedNameRule()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName18419);
+            pushFollow(FOLLOW_1);
             iv_ruleQualifiedName=ruleQualifiedName();
 
             state._fsp--;
@@ -22400,7 +22400,7 @@ public final String entryRuleQualifiedName() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleQualifiedName.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedName18430); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -22418,7 +22418,7 @@ public final String entryRuleQualifiedName() throws RecognitionException {
 
 
     // $ANTLR start "ruleQualifiedName"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7787:1: ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* ) ;
+    // InternalFormat.g:7787:1: ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* ) ;
     public final AntlrDatatypeRuleToken ruleQualifiedName() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -22431,18 +22431,18 @@ public final AntlrDatatypeRuleToken ruleQualifiedName() throws RecognitionExcept
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7790:28: ( (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7791:1: (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* )
+            // InternalFormat.g:7790:28: ( (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* ) )
+            // InternalFormat.g:7791:1: (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7791:1: (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7792:5: this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )*
+            // InternalFormat.g:7791:1: (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* )
+            // InternalFormat.g:7792:5: this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getQualifiedNameAccess().getValidIDParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleValidID_in_ruleQualifiedName18477);
+            pushFollow(FOLLOW_45);
             this_ValidID_0=ruleValidID();
 
             state._fsp--;
@@ -22457,7 +22457,7 @@ public final AntlrDatatypeRuleToken ruleQualifiedName() throws RecognitionExcept
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7802:1: ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )*
+            // InternalFormat.g:7802:1: ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )*
             loop142:
             do {
                 int alt142=2;
@@ -22506,12 +22506,12 @@ public final AntlrDatatypeRuleToken ruleQualifiedName() throws RecognitionExcept
 
                 switch (alt142) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7802:2: ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID
+            	    // InternalFormat.g:7802:2: ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7802:2: ( ( '.' )=>kw= '.' )
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7802:3: ( '.' )=>kw= '.'
+            	    // InternalFormat.g:7802:2: ( ( '.' )=>kw= '.' )
+            	    // InternalFormat.g:7802:3: ( '.' )=>kw= '.'
             	    {
-            	    kw=(Token)match(input,36,FOLLOW_36_in_ruleQualifiedName18505); if (state.failed) return current;
+            	    kw=(Token)match(input,36,FOLLOW_7); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	              current.merge(kw);
@@ -22526,7 +22526,7 @@ public final AntlrDatatypeRuleToken ruleQualifiedName() throws RecognitionExcept
             	              newCompositeNode(grammarAccess.getQualifiedNameAccess().getValidIDParserRuleCall_1_1()); 
             	          
             	    }
-            	    pushFollow(FOLLOW_ruleValidID_in_ruleQualifiedName18528);
+            	    pushFollow(FOLLOW_45);
             	    this_ValidID_2=ruleValidID();
 
             	    state._fsp--;
@@ -22573,7 +22573,7 @@ public final AntlrDatatypeRuleToken ruleQualifiedName() throws RecognitionExcept
 
 
     // $ANTLR start "entryRuleNumber"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7829:1: entryRuleNumber returns [String current=null] : iv_ruleNumber= ruleNumber EOF ;
+    // InternalFormat.g:7829:1: entryRuleNumber returns [String current=null] : iv_ruleNumber= ruleNumber EOF ;
     public final String entryRuleNumber() throws RecognitionException {
         String current = null;
 
@@ -22584,13 +22584,13 @@ public final String entryRuleNumber() throws RecognitionException {
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
         	
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7833:2: (iv_ruleNumber= ruleNumber EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7834:2: iv_ruleNumber= ruleNumber EOF
+            // InternalFormat.g:7833:2: (iv_ruleNumber= ruleNumber EOF )
+            // InternalFormat.g:7834:2: iv_ruleNumber= ruleNumber EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getNumberRule()); 
             }
-            pushFollow(FOLLOW_ruleNumber_in_entryRuleNumber18582);
+            pushFollow(FOLLOW_1);
             iv_ruleNumber=ruleNumber();
 
             state._fsp--;
@@ -22598,7 +22598,7 @@ public final String entryRuleNumber() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleNumber.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNumber18593); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -22619,7 +22619,7 @@ public final String entryRuleNumber() throws RecognitionException {
 
 
     // $ANTLR start "ruleNumber"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7844:1: ruleNumber returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_HEX_0= RULE_HEX | ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? ) ) ;
+    // InternalFormat.g:7844:1: ruleNumber returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_HEX_0= RULE_HEX | ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? ) ) ;
     public final AntlrDatatypeRuleToken ruleNumber() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -22634,10 +22634,10 @@ public final AntlrDatatypeRuleToken ruleNumber() throws RecognitionException {
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7848:28: ( (this_HEX_0= RULE_HEX | ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7849:1: (this_HEX_0= RULE_HEX | ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? ) )
+            // InternalFormat.g:7848:28: ( (this_HEX_0= RULE_HEX | ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? ) ) )
+            // InternalFormat.g:7849:1: (this_HEX_0= RULE_HEX | ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7849:1: (this_HEX_0= RULE_HEX | ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? ) )
+            // InternalFormat.g:7849:1: (this_HEX_0= RULE_HEX | ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? ) )
             int alt146=2;
             int LA146_0 = input.LA(1);
 
@@ -22656,9 +22656,9 @@ else if ( (LA146_0==RULE_INT||LA146_0==RULE_DECIMAL) ) {
             }
             switch (alt146) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7849:6: this_HEX_0= RULE_HEX
+                    // InternalFormat.g:7849:6: this_HEX_0= RULE_HEX
                     {
-                    this_HEX_0=(Token)match(input,RULE_HEX,FOLLOW_RULE_HEX_in_ruleNumber18637); if (state.failed) return current;
+                    this_HEX_0=(Token)match(input,RULE_HEX,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       		current.merge(this_HEX_0);
@@ -22673,12 +22673,12 @@ else if ( (LA146_0==RULE_INT||LA146_0==RULE_DECIMAL) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7857:6: ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? )
+                    // InternalFormat.g:7857:6: ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7857:6: ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7857:7: (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )?
+                    // InternalFormat.g:7857:6: ( (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )? )
+                    // InternalFormat.g:7857:7: (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL ) (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )?
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7857:7: (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL )
+                    // InternalFormat.g:7857:7: (this_INT_1= RULE_INT | this_DECIMAL_2= RULE_DECIMAL )
                     int alt143=2;
                     int LA143_0 = input.LA(1);
 
@@ -22697,9 +22697,9 @@ else if ( (LA143_0==RULE_DECIMAL) ) {
                     }
                     switch (alt143) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7857:12: this_INT_1= RULE_INT
+                            // InternalFormat.g:7857:12: this_INT_1= RULE_INT
                             {
-                            this_INT_1=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleNumber18665); if (state.failed) return current;
+                            this_INT_1=(Token)match(input,RULE_INT,FOLLOW_45); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                               		current.merge(this_INT_1);
@@ -22714,9 +22714,9 @@ else if ( (LA143_0==RULE_DECIMAL) ) {
                             }
                             break;
                         case 2 :
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7865:10: this_DECIMAL_2= RULE_DECIMAL
+                            // InternalFormat.g:7865:10: this_DECIMAL_2= RULE_DECIMAL
                             {
-                            this_DECIMAL_2=(Token)match(input,RULE_DECIMAL,FOLLOW_RULE_DECIMAL_in_ruleNumber18691); if (state.failed) return current;
+                            this_DECIMAL_2=(Token)match(input,RULE_DECIMAL,FOLLOW_45); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                               		current.merge(this_DECIMAL_2);
@@ -22733,7 +22733,7 @@ else if ( (LA143_0==RULE_DECIMAL) ) {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7872:2: (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )?
+                    // InternalFormat.g:7872:2: (kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) )?
                     int alt145=2;
                     int LA145_0 = input.LA(1);
 
@@ -22746,16 +22746,16 @@ else if ( (LA143_0==RULE_DECIMAL) ) {
                     }
                     switch (alt145) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7873:2: kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL )
+                            // InternalFormat.g:7873:2: kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL )
                             {
-                            kw=(Token)match(input,36,FOLLOW_36_in_ruleNumber18711); if (state.failed) return current;
+                            kw=(Token)match(input,36,FOLLOW_105); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       current.merge(kw);
                                       newLeafNode(kw, grammarAccess.getNumberAccess().getFullStopKeyword_1_1_0()); 
                                   
                             }
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7878:1: (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL )
+                            // InternalFormat.g:7878:1: (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL )
                             int alt144=2;
                             int LA144_0 = input.LA(1);
 
@@ -22774,9 +22774,9 @@ else if ( (LA144_0==RULE_DECIMAL) ) {
                             }
                             switch (alt144) {
                                 case 1 :
-                                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7878:6: this_INT_4= RULE_INT
+                                    // InternalFormat.g:7878:6: this_INT_4= RULE_INT
                                     {
-                                    this_INT_4=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleNumber18727); if (state.failed) return current;
+                                    this_INT_4=(Token)match(input,RULE_INT,FOLLOW_2); if (state.failed) return current;
                                     if ( state.backtracking==0 ) {
 
                                       		current.merge(this_INT_4);
@@ -22791,9 +22791,9 @@ else if ( (LA144_0==RULE_DECIMAL) ) {
                                     }
                                     break;
                                 case 2 :
-                                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7886:10: this_DECIMAL_5= RULE_DECIMAL
+                                    // InternalFormat.g:7886:10: this_DECIMAL_5= RULE_DECIMAL
                                     {
-                                    this_DECIMAL_5=(Token)match(input,RULE_DECIMAL,FOLLOW_RULE_DECIMAL_in_ruleNumber18753); if (state.failed) return current;
+                                    this_DECIMAL_5=(Token)match(input,RULE_DECIMAL,FOLLOW_2); if (state.failed) return current;
                                     if ( state.backtracking==0 ) {
 
                                       		current.merge(this_DECIMAL_5);
@@ -22848,7 +22848,7 @@ else if ( (LA144_0==RULE_DECIMAL) ) {
 
 
     // $ANTLR start "entryRuleJvmTypeReference"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7906:1: entryRuleJvmTypeReference returns [EObject current=null] : iv_ruleJvmTypeReference= ruleJvmTypeReference EOF ;
+    // InternalFormat.g:7906:1: entryRuleJvmTypeReference returns [EObject current=null] : iv_ruleJvmTypeReference= ruleJvmTypeReference EOF ;
     public final EObject entryRuleJvmTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -22856,13 +22856,13 @@ public final EObject entryRuleJvmTypeReference() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7907:2: (iv_ruleJvmTypeReference= ruleJvmTypeReference EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7908:2: iv_ruleJvmTypeReference= ruleJvmTypeReference EOF
+            // InternalFormat.g:7907:2: (iv_ruleJvmTypeReference= ruleJvmTypeReference EOF )
+            // InternalFormat.g:7908:2: iv_ruleJvmTypeReference= ruleJvmTypeReference EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmTypeReferenceRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_entryRuleJvmTypeReference18808);
+            pushFollow(FOLLOW_1);
             iv_ruleJvmTypeReference=ruleJvmTypeReference();
 
             state._fsp--;
@@ -22870,7 +22870,7 @@ public final EObject entryRuleJvmTypeReference() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleJvmTypeReference; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmTypeReference18818); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -22888,7 +22888,7 @@ public final EObject entryRuleJvmTypeReference() throws RecognitionException {
 
 
     // $ANTLR start "ruleJvmTypeReference"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7915:1: ruleJvmTypeReference returns [EObject current=null] : ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef ) ;
+    // InternalFormat.g:7915:1: ruleJvmTypeReference returns [EObject current=null] : ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef ) ;
     public final EObject ruleJvmTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -22900,10 +22900,10 @@ public final EObject ruleJvmTypeReference() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7918:28: ( ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7919:1: ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef )
+            // InternalFormat.g:7918:28: ( ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef ) )
+            // InternalFormat.g:7919:1: ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7919:1: ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef )
+            // InternalFormat.g:7919:1: ( (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* ) | this_XFunctionTypeRef_3= ruleXFunctionTypeRef )
             int alt148=2;
             int LA148_0 = input.LA(1);
 
@@ -22922,17 +22922,17 @@ else if ( ((LA148_0>=32 && LA148_0<=33)) ) {
             }
             switch (alt148) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7919:2: (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* )
+                    // InternalFormat.g:7919:2: (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7919:2: (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7920:5: this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )*
+                    // InternalFormat.g:7919:2: (this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )* )
+                    // InternalFormat.g:7920:5: this_JvmParameterizedTypeReference_0= ruleJvmParameterizedTypeReference ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )*
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getJvmTypeReferenceAccess().getJvmParameterizedTypeReferenceParserRuleCall_0_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleJvmParameterizedTypeReference_in_ruleJvmTypeReference18866);
+                    pushFollow(FOLLOW_99);
                     this_JvmParameterizedTypeReference_0=ruleJvmParameterizedTypeReference();
 
                     state._fsp--;
@@ -22943,7 +22943,7 @@ else if ( ((LA148_0>=32 && LA148_0<=33)) ) {
                               afterParserOrEnumRuleCall();
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7928:1: ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )*
+                    // InternalFormat.g:7928:1: ( ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets ) )*
                     loop147:
                     do {
                         int alt147=2;
@@ -22968,13 +22968,13 @@ else if ( ((LA148_0>=32 && LA148_0<=33)) ) {
 
                         switch (alt147) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7928:2: ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets )
+                    	    // InternalFormat.g:7928:2: ( ( () ruleArrayBrackets ) )=> ( () ruleArrayBrackets )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7929:24: ( () ruleArrayBrackets )
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7929:25: () ruleArrayBrackets
+                    	    // InternalFormat.g:7929:24: ( () ruleArrayBrackets )
+                    	    // InternalFormat.g:7929:25: () ruleArrayBrackets
                     	    {
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7929:25: ()
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7930:5: 
+                    	    // InternalFormat.g:7929:25: ()
+                    	    // InternalFormat.g:7930:5: 
                     	    {
                     	    if ( state.backtracking==0 ) {
 
@@ -22991,7 +22991,7 @@ else if ( ((LA148_0>=32 && LA148_0<=33)) ) {
                     	              newCompositeNode(grammarAccess.getJvmTypeReferenceAccess().getArrayBracketsParserRuleCall_0_1_0_1()); 
                     	          
                     	    }
-                    	    pushFollow(FOLLOW_ruleArrayBrackets_in_ruleJvmTypeReference18902);
+                    	    pushFollow(FOLLOW_99);
                     	    ruleArrayBrackets();
 
                     	    state._fsp--;
@@ -23020,14 +23020,14 @@ else if ( ((LA148_0>=32 && LA148_0<=33)) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7945:5: this_XFunctionTypeRef_3= ruleXFunctionTypeRef
+                    // InternalFormat.g:7945:5: this_XFunctionTypeRef_3= ruleXFunctionTypeRef
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getJvmTypeReferenceAccess().getXFunctionTypeRefParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleXFunctionTypeRef_in_ruleJvmTypeReference18933);
+                    pushFollow(FOLLOW_2);
                     this_XFunctionTypeRef_3=ruleXFunctionTypeRef();
 
                     state._fsp--;
@@ -23064,7 +23064,7 @@ else if ( ((LA148_0>=32 && LA148_0<=33)) ) {
 
 
     // $ANTLR start "entryRuleArrayBrackets"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7961:1: entryRuleArrayBrackets returns [String current=null] : iv_ruleArrayBrackets= ruleArrayBrackets EOF ;
+    // InternalFormat.g:7961:1: entryRuleArrayBrackets returns [String current=null] : iv_ruleArrayBrackets= ruleArrayBrackets EOF ;
     public final String entryRuleArrayBrackets() throws RecognitionException {
         String current = null;
 
@@ -23072,13 +23072,13 @@ public final String entryRuleArrayBrackets() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7962:2: (iv_ruleArrayBrackets= ruleArrayBrackets EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7963:2: iv_ruleArrayBrackets= ruleArrayBrackets EOF
+            // InternalFormat.g:7962:2: (iv_ruleArrayBrackets= ruleArrayBrackets EOF )
+            // InternalFormat.g:7963:2: iv_ruleArrayBrackets= ruleArrayBrackets EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getArrayBracketsRule()); 
             }
-            pushFollow(FOLLOW_ruleArrayBrackets_in_entryRuleArrayBrackets18969);
+            pushFollow(FOLLOW_1);
             iv_ruleArrayBrackets=ruleArrayBrackets();
 
             state._fsp--;
@@ -23086,7 +23086,7 @@ public final String entryRuleArrayBrackets() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleArrayBrackets.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleArrayBrackets18980); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -23104,7 +23104,7 @@ public final String entryRuleArrayBrackets() throws RecognitionException {
 
 
     // $ANTLR start "ruleArrayBrackets"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7970:1: ruleArrayBrackets returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '[' kw= ']' ) ;
+    // InternalFormat.g:7970:1: ruleArrayBrackets returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= '[' kw= ']' ) ;
     public final AntlrDatatypeRuleToken ruleArrayBrackets() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -23113,20 +23113,20 @@ public final AntlrDatatypeRuleToken ruleArrayBrackets() throws RecognitionExcept
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7973:28: ( (kw= '[' kw= ']' ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7974:1: (kw= '[' kw= ']' )
+            // InternalFormat.g:7973:28: ( (kw= '[' kw= ']' ) )
+            // InternalFormat.g:7974:1: (kw= '[' kw= ']' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7974:1: (kw= '[' kw= ']' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7975:2: kw= '[' kw= ']'
+            // InternalFormat.g:7974:1: (kw= '[' kw= ']' )
+            // InternalFormat.g:7975:2: kw= '[' kw= ']'
             {
-            kw=(Token)match(input,27,FOLLOW_27_in_ruleArrayBrackets19018); if (state.failed) return current;
+            kw=(Token)match(input,27,FOLLOW_82); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                       current.merge(kw);
                       newLeafNode(kw, grammarAccess.getArrayBracketsAccess().getLeftSquareBracketKeyword_0()); 
                   
             }
-            kw=(Token)match(input,29,FOLLOW_29_in_ruleArrayBrackets19031); if (state.failed) return current;
+            kw=(Token)match(input,29,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                       current.merge(kw);
@@ -23156,7 +23156,7 @@ public final AntlrDatatypeRuleToken ruleArrayBrackets() throws RecognitionExcept
 
 
     // $ANTLR start "entryRuleXFunctionTypeRef"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7994:1: entryRuleXFunctionTypeRef returns [EObject current=null] : iv_ruleXFunctionTypeRef= ruleXFunctionTypeRef EOF ;
+    // InternalFormat.g:7994:1: entryRuleXFunctionTypeRef returns [EObject current=null] : iv_ruleXFunctionTypeRef= ruleXFunctionTypeRef EOF ;
     public final EObject entryRuleXFunctionTypeRef() throws RecognitionException {
         EObject current = null;
 
@@ -23164,13 +23164,13 @@ public final EObject entryRuleXFunctionTypeRef() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7995:2: (iv_ruleXFunctionTypeRef= ruleXFunctionTypeRef EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7996:2: iv_ruleXFunctionTypeRef= ruleXFunctionTypeRef EOF
+            // InternalFormat.g:7995:2: (iv_ruleXFunctionTypeRef= ruleXFunctionTypeRef EOF )
+            // InternalFormat.g:7996:2: iv_ruleXFunctionTypeRef= ruleXFunctionTypeRef EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXFunctionTypeRefRule()); 
             }
-            pushFollow(FOLLOW_ruleXFunctionTypeRef_in_entryRuleXFunctionTypeRef19071);
+            pushFollow(FOLLOW_1);
             iv_ruleXFunctionTypeRef=ruleXFunctionTypeRef();
 
             state._fsp--;
@@ -23178,7 +23178,7 @@ public final EObject entryRuleXFunctionTypeRef() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXFunctionTypeRef; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXFunctionTypeRef19081); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -23196,7 +23196,7 @@ public final EObject entryRuleXFunctionTypeRef() throws RecognitionException {
 
 
     // $ANTLR start "ruleXFunctionTypeRef"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8003:1: ruleXFunctionTypeRef returns [EObject current=null] : ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) ) ;
+    // InternalFormat.g:8003:1: ruleXFunctionTypeRef returns [EObject current=null] : ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) ) ;
     public final EObject ruleXFunctionTypeRef() throws RecognitionException {
         EObject current = null;
 
@@ -23214,13 +23214,13 @@ public final EObject ruleXFunctionTypeRef() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8006:28: ( ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8007:1: ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) )
+            // InternalFormat.g:8006:28: ( ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) ) )
+            // InternalFormat.g:8007:1: ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8007:1: ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8007:2: (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) )
+            // InternalFormat.g:8007:1: ( (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) ) )
+            // InternalFormat.g:8007:2: (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )? otherlv_5= '=>' ( (lv_returnType_6_0= ruleJvmTypeReference ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8007:2: (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )?
+            // InternalFormat.g:8007:2: (otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' )?
             int alt151=2;
             int LA151_0 = input.LA(1);
 
@@ -23229,15 +23229,15 @@ public final EObject ruleXFunctionTypeRef() throws RecognitionException {
             }
             switch (alt151) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8007:4: otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')'
+                    // InternalFormat.g:8007:4: otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')'
                     {
-                    otherlv_0=(Token)match(input,33,FOLLOW_33_in_ruleXFunctionTypeRef19119); if (state.failed) return current;
+                    otherlv_0=(Token)match(input,33,FOLLOW_106); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_0, grammarAccess.getXFunctionTypeRefAccess().getLeftParenthesisKeyword_0_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8011:1: ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )?
+                    // InternalFormat.g:8011:1: ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )?
                     int alt150=2;
                     int LA150_0 = input.LA(1);
 
@@ -23246,20 +23246,20 @@ public final EObject ruleXFunctionTypeRef() throws RecognitionException {
                     }
                     switch (alt150) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8011:2: ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )*
+                            // InternalFormat.g:8011:2: ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )*
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8011:2: ( (lv_paramTypes_1_0= ruleJvmTypeReference ) )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8012:1: (lv_paramTypes_1_0= ruleJvmTypeReference )
+                            // InternalFormat.g:8011:2: ( (lv_paramTypes_1_0= ruleJvmTypeReference ) )
+                            // InternalFormat.g:8012:1: (lv_paramTypes_1_0= ruleJvmTypeReference )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8012:1: (lv_paramTypes_1_0= ruleJvmTypeReference )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8013:3: lv_paramTypes_1_0= ruleJvmTypeReference
+                            // InternalFormat.g:8012:1: (lv_paramTypes_1_0= ruleJvmTypeReference )
+                            // InternalFormat.g:8013:3: lv_paramTypes_1_0= ruleJvmTypeReference
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXFunctionTypeRefAccess().getParamTypesJvmTypeReferenceParserRuleCall_0_1_0_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleXFunctionTypeRef19141);
+                            pushFollow(FOLLOW_47);
                             lv_paramTypes_1_0=ruleJvmTypeReference();
 
                             state._fsp--;
@@ -23273,7 +23273,7 @@ public final EObject ruleXFunctionTypeRef() throws RecognitionException {
                                      			current, 
                                      			"paramTypes",
                                       		lv_paramTypes_1_0, 
-                                      		"JvmTypeReference");
+                                      		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -23283,7 +23283,7 @@ public final EObject ruleXFunctionTypeRef() throws RecognitionException {
 
                             }
 
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8029:2: (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )*
+                            // InternalFormat.g:8029:2: (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )*
                             loop149:
                             do {
                                 int alt149=2;
@@ -23296,26 +23296,26 @@ public final EObject ruleXFunctionTypeRef() throws RecognitionException {
 
                                 switch (alt149) {
                             	case 1 :
-                            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8029:4: otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) )
+                            	    // InternalFormat.g:8029:4: otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) )
                             	    {
-                            	    otherlv_2=(Token)match(input,28,FOLLOW_28_in_ruleXFunctionTypeRef19154); if (state.failed) return current;
+                            	    otherlv_2=(Token)match(input,28,FOLLOW_60); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	          	newLeafNode(otherlv_2, grammarAccess.getXFunctionTypeRefAccess().getCommaKeyword_0_1_1_0());
                             	          
                             	    }
-                            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8033:1: ( (lv_paramTypes_3_0= ruleJvmTypeReference ) )
-                            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8034:1: (lv_paramTypes_3_0= ruleJvmTypeReference )
+                            	    // InternalFormat.g:8033:1: ( (lv_paramTypes_3_0= ruleJvmTypeReference ) )
+                            	    // InternalFormat.g:8034:1: (lv_paramTypes_3_0= ruleJvmTypeReference )
                             	    {
-                            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8034:1: (lv_paramTypes_3_0= ruleJvmTypeReference )
-                            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8035:3: lv_paramTypes_3_0= ruleJvmTypeReference
+                            	    // InternalFormat.g:8034:1: (lv_paramTypes_3_0= ruleJvmTypeReference )
+                            	    // InternalFormat.g:8035:3: lv_paramTypes_3_0= ruleJvmTypeReference
                             	    {
                             	    if ( state.backtracking==0 ) {
                             	       
                             	      	        newCompositeNode(grammarAccess.getXFunctionTypeRefAccess().getParamTypesJvmTypeReferenceParserRuleCall_0_1_1_1_0()); 
                             	      	    
                             	    }
-                            	    pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleXFunctionTypeRef19175);
+                            	    pushFollow(FOLLOW_47);
                             	    lv_paramTypes_3_0=ruleJvmTypeReference();
 
                             	    state._fsp--;
@@ -23329,7 +23329,7 @@ public final EObject ruleXFunctionTypeRef() throws RecognitionException {
                             	             			current, 
                             	             			"paramTypes",
                             	              		lv_paramTypes_3_0, 
-                            	              		"JvmTypeReference");
+                            	              		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
                             	      	        afterParserOrEnumRuleCall();
                             	      	    
                             	    }
@@ -23354,7 +23354,7 @@ public final EObject ruleXFunctionTypeRef() throws RecognitionException {
 
                     }
 
-                    otherlv_4=(Token)match(input,34,FOLLOW_34_in_ruleXFunctionTypeRef19191); if (state.failed) return current;
+                    otherlv_4=(Token)match(input,34,FOLLOW_107); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_4, grammarAccess.getXFunctionTypeRefAccess().getRightParenthesisKeyword_0_2());
@@ -23366,24 +23366,24 @@ public final EObject ruleXFunctionTypeRef() throws RecognitionException {
 
             }
 
-            otherlv_5=(Token)match(input,32,FOLLOW_32_in_ruleXFunctionTypeRef19205); if (state.failed) return current;
+            otherlv_5=(Token)match(input,32,FOLLOW_60); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_5, grammarAccess.getXFunctionTypeRefAccess().getEqualsSignGreaterThanSignKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8059:1: ( (lv_returnType_6_0= ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8060:1: (lv_returnType_6_0= ruleJvmTypeReference )
+            // InternalFormat.g:8059:1: ( (lv_returnType_6_0= ruleJvmTypeReference ) )
+            // InternalFormat.g:8060:1: (lv_returnType_6_0= ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8060:1: (lv_returnType_6_0= ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8061:3: lv_returnType_6_0= ruleJvmTypeReference
+            // InternalFormat.g:8060:1: (lv_returnType_6_0= ruleJvmTypeReference )
+            // InternalFormat.g:8061:3: lv_returnType_6_0= ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getXFunctionTypeRefAccess().getReturnTypeJvmTypeReferenceParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleXFunctionTypeRef19226);
+            pushFollow(FOLLOW_2);
             lv_returnType_6_0=ruleJvmTypeReference();
 
             state._fsp--;
@@ -23397,7 +23397,7 @@ public final EObject ruleXFunctionTypeRef() throws RecognitionException {
                      			current, 
                      			"returnType",
                       		lv_returnType_6_0, 
-                      		"JvmTypeReference");
+                      		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -23430,7 +23430,7 @@ public final EObject ruleXFunctionTypeRef() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleJvmParameterizedTypeReference"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8085:1: entryRuleJvmParameterizedTypeReference returns [EObject current=null] : iv_ruleJvmParameterizedTypeReference= ruleJvmParameterizedTypeReference EOF ;
+    // InternalFormat.g:8085:1: entryRuleJvmParameterizedTypeReference returns [EObject current=null] : iv_ruleJvmParameterizedTypeReference= ruleJvmParameterizedTypeReference EOF ;
     public final EObject entryRuleJvmParameterizedTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -23438,13 +23438,13 @@ public final EObject entryRuleJvmParameterizedTypeReference() throws Recognition
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8086:2: (iv_ruleJvmParameterizedTypeReference= ruleJvmParameterizedTypeReference EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8087:2: iv_ruleJvmParameterizedTypeReference= ruleJvmParameterizedTypeReference EOF
+            // InternalFormat.g:8086:2: (iv_ruleJvmParameterizedTypeReference= ruleJvmParameterizedTypeReference EOF )
+            // InternalFormat.g:8087:2: iv_ruleJvmParameterizedTypeReference= ruleJvmParameterizedTypeReference EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmParameterizedTypeReferenceRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmParameterizedTypeReference_in_entryRuleJvmParameterizedTypeReference19262);
+            pushFollow(FOLLOW_1);
             iv_ruleJvmParameterizedTypeReference=ruleJvmParameterizedTypeReference();
 
             state._fsp--;
@@ -23452,7 +23452,7 @@ public final EObject entryRuleJvmParameterizedTypeReference() throws Recognition
             if ( state.backtracking==0 ) {
                current =iv_ruleJvmParameterizedTypeReference; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmParameterizedTypeReference19272); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -23470,7 +23470,7 @@ public final EObject entryRuleJvmParameterizedTypeReference() throws Recognition
 
 
     // $ANTLR start "ruleJvmParameterizedTypeReference"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8094:1: ruleJvmParameterizedTypeReference returns [EObject current=null] : ( ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )? ) ;
+    // InternalFormat.g:8094:1: ruleJvmParameterizedTypeReference returns [EObject current=null] : ( ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )? ) ;
     public final EObject ruleJvmParameterizedTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -23493,17 +23493,17 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8097:28: ( ( ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8098:1: ( ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )? )
+            // InternalFormat.g:8097:28: ( ( ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )? ) )
+            // InternalFormat.g:8098:1: ( ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8098:1: ( ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )? )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8098:2: ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )?
+            // InternalFormat.g:8098:1: ( ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )? )
+            // InternalFormat.g:8098:2: ( ( ruleQualifiedName ) ) ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )?
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8098:2: ( ( ruleQualifiedName ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8099:1: ( ruleQualifiedName )
+            // InternalFormat.g:8098:2: ( ( ruleQualifiedName ) )
+            // InternalFormat.g:8099:1: ( ruleQualifiedName )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8099:1: ( ruleQualifiedName )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8100:3: ruleQualifiedName
+            // InternalFormat.g:8099:1: ( ruleQualifiedName )
+            // InternalFormat.g:8100:3: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
 
@@ -23517,7 +23517,7 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
               	        newCompositeNode(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeJvmTypeCrossReference_0_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_ruleJvmParameterizedTypeReference19320);
+            pushFollow(FOLLOW_108);
             ruleQualifiedName();
 
             state._fsp--;
@@ -23533,17 +23533,17 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8113:2: ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )?
+            // InternalFormat.g:8113:2: ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )?
             int alt156=2;
             alt156 = dfa156.predict(input);
             switch (alt156) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8113:3: ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )*
+                    // InternalFormat.g:8113:3: ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )*
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8113:3: ( ( '<' )=>otherlv_1= '<' )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8113:4: ( '<' )=>otherlv_1= '<'
+                    // InternalFormat.g:8113:3: ( ( '<' )=>otherlv_1= '<' )
+                    // InternalFormat.g:8113:4: ( '<' )=>otherlv_1= '<'
                     {
-                    otherlv_1=(Token)match(input,62,FOLLOW_62_in_ruleJvmParameterizedTypeReference19341); if (state.failed) return current;
+                    otherlv_1=(Token)match(input,62,FOLLOW_72); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_1, grammarAccess.getJvmParameterizedTypeReferenceAccess().getLessThanSignKeyword_1_0());
@@ -23552,18 +23552,18 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8118:2: ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8119:1: (lv_arguments_2_0= ruleJvmArgumentTypeReference )
+                    // InternalFormat.g:8118:2: ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) )
+                    // InternalFormat.g:8119:1: (lv_arguments_2_0= ruleJvmArgumentTypeReference )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8119:1: (lv_arguments_2_0= ruleJvmArgumentTypeReference )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8120:3: lv_arguments_2_0= ruleJvmArgumentTypeReference
+                    // InternalFormat.g:8119:1: (lv_arguments_2_0= ruleJvmArgumentTypeReference )
+                    // InternalFormat.g:8120:3: lv_arguments_2_0= ruleJvmArgumentTypeReference
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleJvmParameterizedTypeReference19363);
+                    pushFollow(FOLLOW_73);
                     lv_arguments_2_0=ruleJvmArgumentTypeReference();
 
                     state._fsp--;
@@ -23577,7 +23577,7 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
                              			current, 
                              			"arguments",
                               		lv_arguments_2_0, 
-                              		"JvmArgumentTypeReference");
+                              		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -23587,7 +23587,7 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8136:2: (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )*
+                    // InternalFormat.g:8136:2: (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )*
                     loop152:
                     do {
                         int alt152=2;
@@ -23600,26 +23600,26 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
                         switch (alt152) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8136:4: otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) )
+                    	    // InternalFormat.g:8136:4: otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) )
                     	    {
-                    	    otherlv_3=(Token)match(input,28,FOLLOW_28_in_ruleJvmParameterizedTypeReference19376); if (state.failed) return current;
+                    	    otherlv_3=(Token)match(input,28,FOLLOW_72); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_3, grammarAccess.getJvmParameterizedTypeReferenceAccess().getCommaKeyword_1_2_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8140:1: ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) )
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8141:1: (lv_arguments_4_0= ruleJvmArgumentTypeReference )
+                    	    // InternalFormat.g:8140:1: ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) )
+                    	    // InternalFormat.g:8141:1: (lv_arguments_4_0= ruleJvmArgumentTypeReference )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8141:1: (lv_arguments_4_0= ruleJvmArgumentTypeReference )
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8142:3: lv_arguments_4_0= ruleJvmArgumentTypeReference
+                    	    // InternalFormat.g:8141:1: (lv_arguments_4_0= ruleJvmArgumentTypeReference )
+                    	    // InternalFormat.g:8142:3: lv_arguments_4_0= ruleJvmArgumentTypeReference
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_2_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleJvmParameterizedTypeReference19397);
+                    	    pushFollow(FOLLOW_73);
                     	    lv_arguments_4_0=ruleJvmArgumentTypeReference();
 
                     	    state._fsp--;
@@ -23633,7 +23633,7 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
                     	             			current, 
                     	             			"arguments",
                     	              		lv_arguments_4_0, 
-                    	              		"JvmArgumentTypeReference");
+                    	              		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -23652,13 +23652,13 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
                         }
                     } while (true);
 
-                    otherlv_5=(Token)match(input,63,FOLLOW_63_in_ruleJvmParameterizedTypeReference19411); if (state.failed) return current;
+                    otherlv_5=(Token)match(input,63,FOLLOW_45); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_5, grammarAccess.getJvmParameterizedTypeReferenceAccess().getGreaterThanSignKeyword_1_3());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8162:1: ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )*
+                    // InternalFormat.g:8162:1: ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )*
                     loop155:
                     do {
                         int alt155=2;
@@ -23707,16 +23707,16 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
                         switch (alt155) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8162:2: ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )?
+                    	    // InternalFormat.g:8162:2: ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )?
                     	    {
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8162:2: ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) )
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8162:3: ( ( () '.' ) )=> ( () otherlv_7= '.' )
+                    	    // InternalFormat.g:8162:2: ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) )
+                    	    // InternalFormat.g:8162:3: ( ( () '.' ) )=> ( () otherlv_7= '.' )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8164:5: ( () otherlv_7= '.' )
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8164:6: () otherlv_7= '.'
+                    	    // InternalFormat.g:8164:5: ( () otherlv_7= '.' )
+                    	    // InternalFormat.g:8164:6: () otherlv_7= '.'
                     	    {
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8164:6: ()
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8165:5: 
+                    	    // InternalFormat.g:8164:6: ()
+                    	    // InternalFormat.g:8165:5: 
                     	    {
                     	    if ( state.backtracking==0 ) {
 
@@ -23728,7 +23728,7 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
                     	    }
 
-                    	    otherlv_7=(Token)match(input,36,FOLLOW_36_in_ruleJvmParameterizedTypeReference19447); if (state.failed) return current;
+                    	    otherlv_7=(Token)match(input,36,FOLLOW_7); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_7, grammarAccess.getJvmParameterizedTypeReferenceAccess().getFullStopKeyword_1_4_0_0_1());
@@ -23740,11 +23740,11 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
                     	    }
 
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8174:3: ( ( ruleValidID ) )
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8175:1: ( ruleValidID )
+                    	    // InternalFormat.g:8174:3: ( ( ruleValidID ) )
+                    	    // InternalFormat.g:8175:1: ( ruleValidID )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8175:1: ( ruleValidID )
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8176:3: ruleValidID
+                    	    // InternalFormat.g:8175:1: ( ruleValidID )
+                    	    // InternalFormat.g:8176:3: ruleValidID
                     	    {
                     	    if ( state.backtracking==0 ) {
 
@@ -23758,7 +23758,7 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
                     	      	        newCompositeNode(grammarAccess.getJvmParameterizedTypeReferenceAccess().getTypeJvmTypeCrossReference_1_4_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleValidID_in_ruleJvmParameterizedTypeReference19472);
+                    	    pushFollow(FOLLOW_109);
                     	    ruleValidID();
 
                     	    state._fsp--;
@@ -23774,17 +23774,17 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
                     	    }
 
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8189:2: ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )?
+                    	    // InternalFormat.g:8189:2: ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )?
                     	    int alt154=2;
                     	    alt154 = dfa154.predict(input);
                     	    switch (alt154) {
                     	        case 1 :
-                    	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8189:3: ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>'
+                    	            // InternalFormat.g:8189:3: ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>'
                     	            {
-                    	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8189:3: ( ( '<' )=>otherlv_9= '<' )
-                    	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8189:4: ( '<' )=>otherlv_9= '<'
+                    	            // InternalFormat.g:8189:3: ( ( '<' )=>otherlv_9= '<' )
+                    	            // InternalFormat.g:8189:4: ( '<' )=>otherlv_9= '<'
                     	            {
-                    	            otherlv_9=(Token)match(input,62,FOLLOW_62_in_ruleJvmParameterizedTypeReference19493); if (state.failed) return current;
+                    	            otherlv_9=(Token)match(input,62,FOLLOW_72); if (state.failed) return current;
                     	            if ( state.backtracking==0 ) {
 
                     	                  	newLeafNode(otherlv_9, grammarAccess.getJvmParameterizedTypeReferenceAccess().getLessThanSignKeyword_1_4_2_0());
@@ -23793,18 +23793,18 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
                     	            }
 
-                    	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8194:2: ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) )
-                    	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8195:1: (lv_arguments_10_0= ruleJvmArgumentTypeReference )
+                    	            // InternalFormat.g:8194:2: ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) )
+                    	            // InternalFormat.g:8195:1: (lv_arguments_10_0= ruleJvmArgumentTypeReference )
                     	            {
-                    	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8195:1: (lv_arguments_10_0= ruleJvmArgumentTypeReference )
-                    	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8196:3: lv_arguments_10_0= ruleJvmArgumentTypeReference
+                    	            // InternalFormat.g:8195:1: (lv_arguments_10_0= ruleJvmArgumentTypeReference )
+                    	            // InternalFormat.g:8196:3: lv_arguments_10_0= ruleJvmArgumentTypeReference
                     	            {
                     	            if ( state.backtracking==0 ) {
                     	               
                     	              	        newCompositeNode(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_4_2_1_0()); 
                     	              	    
                     	            }
-                    	            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleJvmParameterizedTypeReference19515);
+                    	            pushFollow(FOLLOW_73);
                     	            lv_arguments_10_0=ruleJvmArgumentTypeReference();
 
                     	            state._fsp--;
@@ -23818,7 +23818,7 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
                     	                     			current, 
                     	                     			"arguments",
                     	                      		lv_arguments_10_0, 
-                    	                      		"JvmArgumentTypeReference");
+                    	                      		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
                     	              	        afterParserOrEnumRuleCall();
                     	              	    
                     	            }
@@ -23828,7 +23828,7 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
                     	            }
 
-                    	            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8212:2: (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )*
+                    	            // InternalFormat.g:8212:2: (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )*
                     	            loop153:
                     	            do {
                     	                int alt153=2;
@@ -23841,26 +23841,26 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
                     	                switch (alt153) {
                     	            	case 1 :
-                    	            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8212:4: otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) )
+                    	            	    // InternalFormat.g:8212:4: otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) )
                     	            	    {
-                    	            	    otherlv_11=(Token)match(input,28,FOLLOW_28_in_ruleJvmParameterizedTypeReference19528); if (state.failed) return current;
+                    	            	    otherlv_11=(Token)match(input,28,FOLLOW_72); if (state.failed) return current;
                     	            	    if ( state.backtracking==0 ) {
 
                     	            	          	newLeafNode(otherlv_11, grammarAccess.getJvmParameterizedTypeReferenceAccess().getCommaKeyword_1_4_2_2_0());
                     	            	          
                     	            	    }
-                    	            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8216:1: ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) )
-                    	            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8217:1: (lv_arguments_12_0= ruleJvmArgumentTypeReference )
+                    	            	    // InternalFormat.g:8216:1: ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) )
+                    	            	    // InternalFormat.g:8217:1: (lv_arguments_12_0= ruleJvmArgumentTypeReference )
                     	            	    {
-                    	            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8217:1: (lv_arguments_12_0= ruleJvmArgumentTypeReference )
-                    	            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8218:3: lv_arguments_12_0= ruleJvmArgumentTypeReference
+                    	            	    // InternalFormat.g:8217:1: (lv_arguments_12_0= ruleJvmArgumentTypeReference )
+                    	            	    // InternalFormat.g:8218:3: lv_arguments_12_0= ruleJvmArgumentTypeReference
                     	            	    {
                     	            	    if ( state.backtracking==0 ) {
                     	            	       
                     	            	      	        newCompositeNode(grammarAccess.getJvmParameterizedTypeReferenceAccess().getArgumentsJvmArgumentTypeReferenceParserRuleCall_1_4_2_2_1_0()); 
                     	            	      	    
                     	            	    }
-                    	            	    pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_ruleJvmParameterizedTypeReference19549);
+                    	            	    pushFollow(FOLLOW_73);
                     	            	    lv_arguments_12_0=ruleJvmArgumentTypeReference();
 
                     	            	    state._fsp--;
@@ -23874,7 +23874,7 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
                     	            	             			current, 
                     	            	             			"arguments",
                     	            	              		lv_arguments_12_0, 
-                    	            	              		"JvmArgumentTypeReference");
+                    	            	              		"org.eclipse.xtext.xbase.Xtype.JvmArgumentTypeReference");
                     	            	      	        afterParserOrEnumRuleCall();
                     	            	      	    
                     	            	    }
@@ -23893,7 +23893,7 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
                     	                }
                     	            } while (true);
 
-                    	            otherlv_13=(Token)match(input,63,FOLLOW_63_in_ruleJvmParameterizedTypeReference19563); if (state.failed) return current;
+                    	            otherlv_13=(Token)match(input,63,FOLLOW_45); if (state.failed) return current;
                     	            if ( state.backtracking==0 ) {
 
                     	                  	newLeafNode(otherlv_13, grammarAccess.getJvmParameterizedTypeReferenceAccess().getGreaterThanSignKeyword_1_4_2_3());
@@ -23943,7 +23943,7 @@ public final EObject ruleJvmParameterizedTypeReference() throws RecognitionExcep
 
 
     // $ANTLR start "entryRuleJvmArgumentTypeReference"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8246:1: entryRuleJvmArgumentTypeReference returns [EObject current=null] : iv_ruleJvmArgumentTypeReference= ruleJvmArgumentTypeReference EOF ;
+    // InternalFormat.g:8246:1: entryRuleJvmArgumentTypeReference returns [EObject current=null] : iv_ruleJvmArgumentTypeReference= ruleJvmArgumentTypeReference EOF ;
     public final EObject entryRuleJvmArgumentTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -23951,13 +23951,13 @@ public final EObject entryRuleJvmArgumentTypeReference() throws RecognitionExcep
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8247:2: (iv_ruleJvmArgumentTypeReference= ruleJvmArgumentTypeReference EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8248:2: iv_ruleJvmArgumentTypeReference= ruleJvmArgumentTypeReference EOF
+            // InternalFormat.g:8247:2: (iv_ruleJvmArgumentTypeReference= ruleJvmArgumentTypeReference EOF )
+            // InternalFormat.g:8248:2: iv_ruleJvmArgumentTypeReference= ruleJvmArgumentTypeReference EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmArgumentTypeReferenceRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmArgumentTypeReference_in_entryRuleJvmArgumentTypeReference19605);
+            pushFollow(FOLLOW_1);
             iv_ruleJvmArgumentTypeReference=ruleJvmArgumentTypeReference();
 
             state._fsp--;
@@ -23965,7 +23965,7 @@ public final EObject entryRuleJvmArgumentTypeReference() throws RecognitionExcep
             if ( state.backtracking==0 ) {
                current =iv_ruleJvmArgumentTypeReference; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmArgumentTypeReference19615); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -23983,7 +23983,7 @@ public final EObject entryRuleJvmArgumentTypeReference() throws RecognitionExcep
 
 
     // $ANTLR start "ruleJvmArgumentTypeReference"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8255:1: ruleJvmArgumentTypeReference returns [EObject current=null] : (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference ) ;
+    // InternalFormat.g:8255:1: ruleJvmArgumentTypeReference returns [EObject current=null] : (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference ) ;
     public final EObject ruleJvmArgumentTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -23995,10 +23995,10 @@ public final EObject ruleJvmArgumentTypeReference() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8258:28: ( (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8259:1: (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference )
+            // InternalFormat.g:8258:28: ( (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference ) )
+            // InternalFormat.g:8259:1: (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8259:1: (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference )
+            // InternalFormat.g:8259:1: (this_JvmTypeReference_0= ruleJvmTypeReference | this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference )
             int alt157=2;
             int LA157_0 = input.LA(1);
 
@@ -24017,14 +24017,14 @@ else if ( (LA157_0==111) ) {
             }
             switch (alt157) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8260:5: this_JvmTypeReference_0= ruleJvmTypeReference
+                    // InternalFormat.g:8260:5: this_JvmTypeReference_0= ruleJvmTypeReference
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getJvmArgumentTypeReferenceAccess().getJvmTypeReferenceParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleJvmArgumentTypeReference19662);
+                    pushFollow(FOLLOW_2);
                     this_JvmTypeReference_0=ruleJvmTypeReference();
 
                     state._fsp--;
@@ -24039,14 +24039,14 @@ else if ( (LA157_0==111) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8270:5: this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference
+                    // InternalFormat.g:8270:5: this_JvmWildcardTypeReference_1= ruleJvmWildcardTypeReference
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getJvmArgumentTypeReferenceAccess().getJvmWildcardTypeReferenceParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleJvmWildcardTypeReference_in_ruleJvmArgumentTypeReference19689);
+                    pushFollow(FOLLOW_2);
                     this_JvmWildcardTypeReference_1=ruleJvmWildcardTypeReference();
 
                     state._fsp--;
@@ -24083,7 +24083,7 @@ else if ( (LA157_0==111) ) {
 
 
     // $ANTLR start "entryRuleJvmWildcardTypeReference"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8286:1: entryRuleJvmWildcardTypeReference returns [EObject current=null] : iv_ruleJvmWildcardTypeReference= ruleJvmWildcardTypeReference EOF ;
+    // InternalFormat.g:8286:1: entryRuleJvmWildcardTypeReference returns [EObject current=null] : iv_ruleJvmWildcardTypeReference= ruleJvmWildcardTypeReference EOF ;
     public final EObject entryRuleJvmWildcardTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -24091,13 +24091,13 @@ public final EObject entryRuleJvmWildcardTypeReference() throws RecognitionExcep
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8287:2: (iv_ruleJvmWildcardTypeReference= ruleJvmWildcardTypeReference EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8288:2: iv_ruleJvmWildcardTypeReference= ruleJvmWildcardTypeReference EOF
+            // InternalFormat.g:8287:2: (iv_ruleJvmWildcardTypeReference= ruleJvmWildcardTypeReference EOF )
+            // InternalFormat.g:8288:2: iv_ruleJvmWildcardTypeReference= ruleJvmWildcardTypeReference EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmWildcardTypeReferenceRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmWildcardTypeReference_in_entryRuleJvmWildcardTypeReference19724);
+            pushFollow(FOLLOW_1);
             iv_ruleJvmWildcardTypeReference=ruleJvmWildcardTypeReference();
 
             state._fsp--;
@@ -24105,7 +24105,7 @@ public final EObject entryRuleJvmWildcardTypeReference() throws RecognitionExcep
             if ( state.backtracking==0 ) {
                current =iv_ruleJvmWildcardTypeReference; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmWildcardTypeReference19734); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -24123,7 +24123,7 @@ public final EObject entryRuleJvmWildcardTypeReference() throws RecognitionExcep
 
 
     // $ANTLR start "ruleJvmWildcardTypeReference"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8295:1: ruleJvmWildcardTypeReference returns [EObject current=null] : ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? ) ;
+    // InternalFormat.g:8295:1: ruleJvmWildcardTypeReference returns [EObject current=null] : ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? ) ;
     public final EObject ruleJvmWildcardTypeReference() throws RecognitionException {
         EObject current = null;
 
@@ -24140,14 +24140,14 @@ public final EObject ruleJvmWildcardTypeReference() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8298:28: ( ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8299:1: ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? )
+            // InternalFormat.g:8298:28: ( ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? ) )
+            // InternalFormat.g:8299:1: ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8299:1: ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8299:2: () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )?
+            // InternalFormat.g:8299:1: ( () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )? )
+            // InternalFormat.g:8299:2: () otherlv_1= '?' ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )?
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8299:2: ()
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8300:5: 
+            // InternalFormat.g:8299:2: ()
+            // InternalFormat.g:8300:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -24159,13 +24159,13 @@ public final EObject ruleJvmWildcardTypeReference() throws RecognitionException
 
             }
 
-            otherlv_1=(Token)match(input,111,FOLLOW_111_in_ruleJvmWildcardTypeReference19780); if (state.failed) return current;
+            otherlv_1=(Token)match(input,111,FOLLOW_110); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getJvmWildcardTypeReferenceAccess().getQuestionMarkKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8309:1: ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )?
+            // InternalFormat.g:8309:1: ( ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* ) | ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* ) )?
             int alt160=3;
             int LA160_0 = input.LA(1);
 
@@ -24177,23 +24177,23 @@ else if ( (LA160_0==99) ) {
             }
             switch (alt160) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8309:2: ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* )
+                    // InternalFormat.g:8309:2: ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8309:2: ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8309:3: ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )*
+                    // InternalFormat.g:8309:2: ( ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )* )
+                    // InternalFormat.g:8309:3: ( (lv_constraints_2_0= ruleJvmUpperBound ) ) ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )*
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8309:3: ( (lv_constraints_2_0= ruleJvmUpperBound ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8310:1: (lv_constraints_2_0= ruleJvmUpperBound )
+                    // InternalFormat.g:8309:3: ( (lv_constraints_2_0= ruleJvmUpperBound ) )
+                    // InternalFormat.g:8310:1: (lv_constraints_2_0= ruleJvmUpperBound )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8310:1: (lv_constraints_2_0= ruleJvmUpperBound )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8311:3: lv_constraints_2_0= ruleJvmUpperBound
+                    // InternalFormat.g:8310:1: (lv_constraints_2_0= ruleJvmUpperBound )
+                    // InternalFormat.g:8311:3: lv_constraints_2_0= ruleJvmUpperBound
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmUpperBoundParserRuleCall_2_0_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleJvmUpperBound_in_ruleJvmWildcardTypeReference19803);
+                    pushFollow(FOLLOW_111);
                     lv_constraints_2_0=ruleJvmUpperBound();
 
                     state._fsp--;
@@ -24207,7 +24207,7 @@ else if ( (LA160_0==99) ) {
                              			current, 
                              			"constraints",
                               		lv_constraints_2_0, 
-                              		"JvmUpperBound");
+                              		"org.eclipse.xtext.xbase.Xtype.JvmUpperBound");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -24217,7 +24217,7 @@ else if ( (LA160_0==99) ) {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8327:2: ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )*
+                    // InternalFormat.g:8327:2: ( (lv_constraints_3_0= ruleJvmUpperBoundAnded ) )*
                     loop158:
                     do {
                         int alt158=2;
@@ -24230,17 +24230,17 @@ else if ( (LA160_0==99) ) {
 
                         switch (alt158) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8328:1: (lv_constraints_3_0= ruleJvmUpperBoundAnded )
+                    	    // InternalFormat.g:8328:1: (lv_constraints_3_0= ruleJvmUpperBoundAnded )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8328:1: (lv_constraints_3_0= ruleJvmUpperBoundAnded )
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8329:3: lv_constraints_3_0= ruleJvmUpperBoundAnded
+                    	    // InternalFormat.g:8328:1: (lv_constraints_3_0= ruleJvmUpperBoundAnded )
+                    	    // InternalFormat.g:8329:3: lv_constraints_3_0= ruleJvmUpperBoundAnded
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmUpperBoundAndedParserRuleCall_2_0_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleJvmUpperBoundAnded_in_ruleJvmWildcardTypeReference19824);
+                    	    pushFollow(FOLLOW_111);
                     	    lv_constraints_3_0=ruleJvmUpperBoundAnded();
 
                     	    state._fsp--;
@@ -24254,7 +24254,7 @@ else if ( (LA160_0==99) ) {
                     	             			current, 
                     	             			"constraints",
                     	              		lv_constraints_3_0, 
-                    	              		"JvmUpperBoundAnded");
+                    	              		"org.eclipse.xtext.xbase.Xtype.JvmUpperBoundAnded");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -24277,23 +24277,23 @@ else if ( (LA160_0==99) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8346:6: ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* )
+                    // InternalFormat.g:8346:6: ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8346:6: ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8346:7: ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )*
+                    // InternalFormat.g:8346:6: ( ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )* )
+                    // InternalFormat.g:8346:7: ( (lv_constraints_4_0= ruleJvmLowerBound ) ) ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )*
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8346:7: ( (lv_constraints_4_0= ruleJvmLowerBound ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8347:1: (lv_constraints_4_0= ruleJvmLowerBound )
+                    // InternalFormat.g:8346:7: ( (lv_constraints_4_0= ruleJvmLowerBound ) )
+                    // InternalFormat.g:8347:1: (lv_constraints_4_0= ruleJvmLowerBound )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8347:1: (lv_constraints_4_0= ruleJvmLowerBound )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8348:3: lv_constraints_4_0= ruleJvmLowerBound
+                    // InternalFormat.g:8347:1: (lv_constraints_4_0= ruleJvmLowerBound )
+                    // InternalFormat.g:8348:3: lv_constraints_4_0= ruleJvmLowerBound
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmLowerBoundParserRuleCall_2_1_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleJvmLowerBound_in_ruleJvmWildcardTypeReference19854);
+                    pushFollow(FOLLOW_111);
                     lv_constraints_4_0=ruleJvmLowerBound();
 
                     state._fsp--;
@@ -24307,7 +24307,7 @@ else if ( (LA160_0==99) ) {
                              			current, 
                              			"constraints",
                               		lv_constraints_4_0, 
-                              		"JvmLowerBound");
+                              		"org.eclipse.xtext.xbase.Xtype.JvmLowerBound");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -24317,7 +24317,7 @@ else if ( (LA160_0==99) ) {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8364:2: ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )*
+                    // InternalFormat.g:8364:2: ( (lv_constraints_5_0= ruleJvmLowerBoundAnded ) )*
                     loop159:
                     do {
                         int alt159=2;
@@ -24330,17 +24330,17 @@ else if ( (LA160_0==99) ) {
 
                         switch (alt159) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8365:1: (lv_constraints_5_0= ruleJvmLowerBoundAnded )
+                    	    // InternalFormat.g:8365:1: (lv_constraints_5_0= ruleJvmLowerBoundAnded )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8365:1: (lv_constraints_5_0= ruleJvmLowerBoundAnded )
-                    	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8366:3: lv_constraints_5_0= ruleJvmLowerBoundAnded
+                    	    // InternalFormat.g:8365:1: (lv_constraints_5_0= ruleJvmLowerBoundAnded )
+                    	    // InternalFormat.g:8366:3: lv_constraints_5_0= ruleJvmLowerBoundAnded
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getJvmWildcardTypeReferenceAccess().getConstraintsJvmLowerBoundAndedParserRuleCall_2_1_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleJvmLowerBoundAnded_in_ruleJvmWildcardTypeReference19875);
+                    	    pushFollow(FOLLOW_111);
                     	    lv_constraints_5_0=ruleJvmLowerBoundAnded();
 
                     	    state._fsp--;
@@ -24354,7 +24354,7 @@ else if ( (LA160_0==99) ) {
                     	             			current, 
                     	             			"constraints",
                     	              		lv_constraints_5_0, 
-                    	              		"JvmLowerBoundAnded");
+                    	              		"org.eclipse.xtext.xbase.Xtype.JvmLowerBoundAnded");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -24402,7 +24402,7 @@ else if ( (LA160_0==99) ) {
 
 
     // $ANTLR start "entryRuleJvmUpperBound"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8390:1: entryRuleJvmUpperBound returns [EObject current=null] : iv_ruleJvmUpperBound= ruleJvmUpperBound EOF ;
+    // InternalFormat.g:8390:1: entryRuleJvmUpperBound returns [EObject current=null] : iv_ruleJvmUpperBound= ruleJvmUpperBound EOF ;
     public final EObject entryRuleJvmUpperBound() throws RecognitionException {
         EObject current = null;
 
@@ -24410,13 +24410,13 @@ public final EObject entryRuleJvmUpperBound() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8391:2: (iv_ruleJvmUpperBound= ruleJvmUpperBound EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8392:2: iv_ruleJvmUpperBound= ruleJvmUpperBound EOF
+            // InternalFormat.g:8391:2: (iv_ruleJvmUpperBound= ruleJvmUpperBound EOF )
+            // InternalFormat.g:8392:2: iv_ruleJvmUpperBound= ruleJvmUpperBound EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmUpperBoundRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmUpperBound_in_entryRuleJvmUpperBound19915);
+            pushFollow(FOLLOW_1);
             iv_ruleJvmUpperBound=ruleJvmUpperBound();
 
             state._fsp--;
@@ -24424,7 +24424,7 @@ public final EObject entryRuleJvmUpperBound() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleJvmUpperBound; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmUpperBound19925); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -24442,7 +24442,7 @@ public final EObject entryRuleJvmUpperBound() throws RecognitionException {
 
 
     // $ANTLR start "ruleJvmUpperBound"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8399:1: ruleJvmUpperBound returns [EObject current=null] : (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
+    // InternalFormat.g:8399:1: ruleJvmUpperBound returns [EObject current=null] : (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
     public final EObject ruleJvmUpperBound() throws RecognitionException {
         EObject current = null;
 
@@ -24453,30 +24453,30 @@ public final EObject ruleJvmUpperBound() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8402:28: ( (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8403:1: (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // InternalFormat.g:8402:28: ( (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
+            // InternalFormat.g:8403:1: (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8403:1: (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8403:3: otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // InternalFormat.g:8403:1: (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // InternalFormat.g:8403:3: otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
             {
-            otherlv_0=(Token)match(input,16,FOLLOW_16_in_ruleJvmUpperBound19962); if (state.failed) return current;
+            otherlv_0=(Token)match(input,16,FOLLOW_60); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getJvmUpperBoundAccess().getExtendsKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8407:1: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8408:1: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // InternalFormat.g:8407:1: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // InternalFormat.g:8408:1: (lv_typeReference_1_0= ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8408:1: (lv_typeReference_1_0= ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8409:3: lv_typeReference_1_0= ruleJvmTypeReference
+            // InternalFormat.g:8408:1: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // InternalFormat.g:8409:3: lv_typeReference_1_0= ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getJvmUpperBoundAccess().getTypeReferenceJvmTypeReferenceParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleJvmUpperBound19983);
+            pushFollow(FOLLOW_2);
             lv_typeReference_1_0=ruleJvmTypeReference();
 
             state._fsp--;
@@ -24490,7 +24490,7 @@ public final EObject ruleJvmUpperBound() throws RecognitionException {
                      			current, 
                      			"typeReference",
                       		lv_typeReference_1_0, 
-                      		"JvmTypeReference");
+                      		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -24523,7 +24523,7 @@ public final EObject ruleJvmUpperBound() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleJvmUpperBoundAnded"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8433:1: entryRuleJvmUpperBoundAnded returns [EObject current=null] : iv_ruleJvmUpperBoundAnded= ruleJvmUpperBoundAnded EOF ;
+    // InternalFormat.g:8433:1: entryRuleJvmUpperBoundAnded returns [EObject current=null] : iv_ruleJvmUpperBoundAnded= ruleJvmUpperBoundAnded EOF ;
     public final EObject entryRuleJvmUpperBoundAnded() throws RecognitionException {
         EObject current = null;
 
@@ -24531,13 +24531,13 @@ public final EObject entryRuleJvmUpperBoundAnded() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8434:2: (iv_ruleJvmUpperBoundAnded= ruleJvmUpperBoundAnded EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8435:2: iv_ruleJvmUpperBoundAnded= ruleJvmUpperBoundAnded EOF
+            // InternalFormat.g:8434:2: (iv_ruleJvmUpperBoundAnded= ruleJvmUpperBoundAnded EOF )
+            // InternalFormat.g:8435:2: iv_ruleJvmUpperBoundAnded= ruleJvmUpperBoundAnded EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmUpperBoundAndedRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmUpperBoundAnded_in_entryRuleJvmUpperBoundAnded20019);
+            pushFollow(FOLLOW_1);
             iv_ruleJvmUpperBoundAnded=ruleJvmUpperBoundAnded();
 
             state._fsp--;
@@ -24545,7 +24545,7 @@ public final EObject entryRuleJvmUpperBoundAnded() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleJvmUpperBoundAnded; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmUpperBoundAnded20029); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -24563,7 +24563,7 @@ public final EObject entryRuleJvmUpperBoundAnded() throws RecognitionException {
 
 
     // $ANTLR start "ruleJvmUpperBoundAnded"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8442:1: ruleJvmUpperBoundAnded returns [EObject current=null] : (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
+    // InternalFormat.g:8442:1: ruleJvmUpperBoundAnded returns [EObject current=null] : (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
     public final EObject ruleJvmUpperBoundAnded() throws RecognitionException {
         EObject current = null;
 
@@ -24574,30 +24574,30 @@ public final EObject ruleJvmUpperBoundAnded() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8445:28: ( (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8446:1: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // InternalFormat.g:8445:28: ( (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
+            // InternalFormat.g:8446:1: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8446:1: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8446:3: otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // InternalFormat.g:8446:1: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // InternalFormat.g:8446:3: otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
             {
-            otherlv_0=(Token)match(input,112,FOLLOW_112_in_ruleJvmUpperBoundAnded20066); if (state.failed) return current;
+            otherlv_0=(Token)match(input,112,FOLLOW_60); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getJvmUpperBoundAndedAccess().getAmpersandKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8450:1: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8451:1: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // InternalFormat.g:8450:1: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // InternalFormat.g:8451:1: (lv_typeReference_1_0= ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8451:1: (lv_typeReference_1_0= ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8452:3: lv_typeReference_1_0= ruleJvmTypeReference
+            // InternalFormat.g:8451:1: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // InternalFormat.g:8452:3: lv_typeReference_1_0= ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getJvmUpperBoundAndedAccess().getTypeReferenceJvmTypeReferenceParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleJvmUpperBoundAnded20087);
+            pushFollow(FOLLOW_2);
             lv_typeReference_1_0=ruleJvmTypeReference();
 
             state._fsp--;
@@ -24611,7 +24611,7 @@ public final EObject ruleJvmUpperBoundAnded() throws RecognitionException {
                      			current, 
                      			"typeReference",
                       		lv_typeReference_1_0, 
-                      		"JvmTypeReference");
+                      		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -24644,7 +24644,7 @@ public final EObject ruleJvmUpperBoundAnded() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleJvmLowerBound"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8476:1: entryRuleJvmLowerBound returns [EObject current=null] : iv_ruleJvmLowerBound= ruleJvmLowerBound EOF ;
+    // InternalFormat.g:8476:1: entryRuleJvmLowerBound returns [EObject current=null] : iv_ruleJvmLowerBound= ruleJvmLowerBound EOF ;
     public final EObject entryRuleJvmLowerBound() throws RecognitionException {
         EObject current = null;
 
@@ -24652,13 +24652,13 @@ public final EObject entryRuleJvmLowerBound() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8477:2: (iv_ruleJvmLowerBound= ruleJvmLowerBound EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8478:2: iv_ruleJvmLowerBound= ruleJvmLowerBound EOF
+            // InternalFormat.g:8477:2: (iv_ruleJvmLowerBound= ruleJvmLowerBound EOF )
+            // InternalFormat.g:8478:2: iv_ruleJvmLowerBound= ruleJvmLowerBound EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmLowerBoundRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmLowerBound_in_entryRuleJvmLowerBound20123);
+            pushFollow(FOLLOW_1);
             iv_ruleJvmLowerBound=ruleJvmLowerBound();
 
             state._fsp--;
@@ -24666,7 +24666,7 @@ public final EObject entryRuleJvmLowerBound() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleJvmLowerBound; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmLowerBound20133); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -24684,7 +24684,7 @@ public final EObject entryRuleJvmLowerBound() throws RecognitionException {
 
 
     // $ANTLR start "ruleJvmLowerBound"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8485:1: ruleJvmLowerBound returns [EObject current=null] : (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
+    // InternalFormat.g:8485:1: ruleJvmLowerBound returns [EObject current=null] : (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
     public final EObject ruleJvmLowerBound() throws RecognitionException {
         EObject current = null;
 
@@ -24695,30 +24695,30 @@ public final EObject ruleJvmLowerBound() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8488:28: ( (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8489:1: (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // InternalFormat.g:8488:28: ( (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
+            // InternalFormat.g:8489:1: (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8489:1: (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8489:3: otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // InternalFormat.g:8489:1: (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // InternalFormat.g:8489:3: otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
             {
-            otherlv_0=(Token)match(input,99,FOLLOW_99_in_ruleJvmLowerBound20170); if (state.failed) return current;
+            otherlv_0=(Token)match(input,99,FOLLOW_60); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getJvmLowerBoundAccess().getSuperKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8493:1: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8494:1: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // InternalFormat.g:8493:1: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // InternalFormat.g:8494:1: (lv_typeReference_1_0= ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8494:1: (lv_typeReference_1_0= ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8495:3: lv_typeReference_1_0= ruleJvmTypeReference
+            // InternalFormat.g:8494:1: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // InternalFormat.g:8495:3: lv_typeReference_1_0= ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getJvmLowerBoundAccess().getTypeReferenceJvmTypeReferenceParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleJvmLowerBound20191);
+            pushFollow(FOLLOW_2);
             lv_typeReference_1_0=ruleJvmTypeReference();
 
             state._fsp--;
@@ -24732,7 +24732,7 @@ public final EObject ruleJvmLowerBound() throws RecognitionException {
                      			current, 
                      			"typeReference",
                       		lv_typeReference_1_0, 
-                      		"JvmTypeReference");
+                      		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -24765,7 +24765,7 @@ public final EObject ruleJvmLowerBound() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleJvmLowerBoundAnded"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8519:1: entryRuleJvmLowerBoundAnded returns [EObject current=null] : iv_ruleJvmLowerBoundAnded= ruleJvmLowerBoundAnded EOF ;
+    // InternalFormat.g:8519:1: entryRuleJvmLowerBoundAnded returns [EObject current=null] : iv_ruleJvmLowerBoundAnded= ruleJvmLowerBoundAnded EOF ;
     public final EObject entryRuleJvmLowerBoundAnded() throws RecognitionException {
         EObject current = null;
 
@@ -24773,13 +24773,13 @@ public final EObject entryRuleJvmLowerBoundAnded() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8520:2: (iv_ruleJvmLowerBoundAnded= ruleJvmLowerBoundAnded EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8521:2: iv_ruleJvmLowerBoundAnded= ruleJvmLowerBoundAnded EOF
+            // InternalFormat.g:8520:2: (iv_ruleJvmLowerBoundAnded= ruleJvmLowerBoundAnded EOF )
+            // InternalFormat.g:8521:2: iv_ruleJvmLowerBoundAnded= ruleJvmLowerBoundAnded EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getJvmLowerBoundAndedRule()); 
             }
-            pushFollow(FOLLOW_ruleJvmLowerBoundAnded_in_entryRuleJvmLowerBoundAnded20227);
+            pushFollow(FOLLOW_1);
             iv_ruleJvmLowerBoundAnded=ruleJvmLowerBoundAnded();
 
             state._fsp--;
@@ -24787,7 +24787,7 @@ public final EObject entryRuleJvmLowerBoundAnded() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleJvmLowerBoundAnded; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleJvmLowerBoundAnded20237); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -24805,7 +24805,7 @@ public final EObject entryRuleJvmLowerBoundAnded() throws RecognitionException {
 
 
     // $ANTLR start "ruleJvmLowerBoundAnded"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8528:1: ruleJvmLowerBoundAnded returns [EObject current=null] : (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
+    // InternalFormat.g:8528:1: ruleJvmLowerBoundAnded returns [EObject current=null] : (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) ;
     public final EObject ruleJvmLowerBoundAnded() throws RecognitionException {
         EObject current = null;
 
@@ -24816,30 +24816,30 @@ public final EObject ruleJvmLowerBoundAnded() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8531:28: ( (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8532:1: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // InternalFormat.g:8531:28: ( (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) )
+            // InternalFormat.g:8532:1: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8532:1: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8532:3: otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // InternalFormat.g:8532:1: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) )
+            // InternalFormat.g:8532:3: otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
             {
-            otherlv_0=(Token)match(input,112,FOLLOW_112_in_ruleJvmLowerBoundAnded20274); if (state.failed) return current;
+            otherlv_0=(Token)match(input,112,FOLLOW_60); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getJvmLowerBoundAndedAccess().getAmpersandKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8536:1: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8537:1: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // InternalFormat.g:8536:1: ( (lv_typeReference_1_0= ruleJvmTypeReference ) )
+            // InternalFormat.g:8537:1: (lv_typeReference_1_0= ruleJvmTypeReference )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8537:1: (lv_typeReference_1_0= ruleJvmTypeReference )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8538:3: lv_typeReference_1_0= ruleJvmTypeReference
+            // InternalFormat.g:8537:1: (lv_typeReference_1_0= ruleJvmTypeReference )
+            // InternalFormat.g:8538:3: lv_typeReference_1_0= ruleJvmTypeReference
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getJvmLowerBoundAndedAccess().getTypeReferenceJvmTypeReferenceParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleJvmTypeReference_in_ruleJvmLowerBoundAnded20295);
+            pushFollow(FOLLOW_2);
             lv_typeReference_1_0=ruleJvmTypeReference();
 
             state._fsp--;
@@ -24853,7 +24853,7 @@ public final EObject ruleJvmLowerBoundAnded() throws RecognitionException {
                      			current, 
                      			"typeReference",
                       		lv_typeReference_1_0, 
-                      		"JvmTypeReference");
+                      		"org.eclipse.xtext.xbase.Xtype.JvmTypeReference");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -24886,7 +24886,7 @@ public final EObject ruleJvmLowerBoundAnded() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleQualifiedNameWithWildcard"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8564:1: entryRuleQualifiedNameWithWildcard returns [String current=null] : iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF ;
+    // InternalFormat.g:8564:1: entryRuleQualifiedNameWithWildcard returns [String current=null] : iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF ;
     public final String entryRuleQualifiedNameWithWildcard() throws RecognitionException {
         String current = null;
 
@@ -24894,13 +24894,13 @@ public final String entryRuleQualifiedNameWithWildcard() throws RecognitionExcep
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8565:2: (iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8566:2: iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF
+            // InternalFormat.g:8565:2: (iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF )
+            // InternalFormat.g:8566:2: iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getQualifiedNameWithWildcardRule()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedNameWithWildcard_in_entryRuleQualifiedNameWithWildcard20334);
+            pushFollow(FOLLOW_1);
             iv_ruleQualifiedNameWithWildcard=ruleQualifiedNameWithWildcard();
 
             state._fsp--;
@@ -24908,7 +24908,7 @@ public final String entryRuleQualifiedNameWithWildcard() throws RecognitionExcep
             if ( state.backtracking==0 ) {
                current =iv_ruleQualifiedNameWithWildcard.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedNameWithWildcard20345); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -24926,7 +24926,7 @@ public final String entryRuleQualifiedNameWithWildcard() throws RecognitionExcep
 
 
     // $ANTLR start "ruleQualifiedNameWithWildcard"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8573:1: ruleQualifiedNameWithWildcard returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' ) ;
+    // InternalFormat.g:8573:1: ruleQualifiedNameWithWildcard returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' ) ;
     public final AntlrDatatypeRuleToken ruleQualifiedNameWithWildcard() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -24937,18 +24937,18 @@ public final AntlrDatatypeRuleToken ruleQualifiedNameWithWildcard() throws Recog
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8576:28: ( (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8577:1: (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' )
+            // InternalFormat.g:8576:28: ( (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' ) )
+            // InternalFormat.g:8577:1: (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8577:1: (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8578:5: this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*'
+            // InternalFormat.g:8577:1: (this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*' )
+            // InternalFormat.g:8578:5: this_QualifiedName_0= ruleQualifiedName kw= '.' kw= '*'
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getQualifiedNameWithWildcardAccess().getQualifiedNameParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_ruleQualifiedNameWithWildcard20392);
+            pushFollow(FOLLOW_32);
             this_QualifiedName_0=ruleQualifiedName();
 
             state._fsp--;
@@ -24963,14 +24963,14 @@ public final AntlrDatatypeRuleToken ruleQualifiedNameWithWildcard() throws Recog
                       afterParserOrEnumRuleCall();
                   
             }
-            kw=(Token)match(input,36,FOLLOW_36_in_ruleQualifiedNameWithWildcard20410); if (state.failed) return current;
+            kw=(Token)match(input,36,FOLLOW_17); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                       current.merge(kw);
                       newLeafNode(kw, grammarAccess.getQualifiedNameWithWildcardAccess().getFullStopKeyword_1()); 
                   
             }
-            kw=(Token)match(input,25,FOLLOW_25_in_ruleQualifiedNameWithWildcard20423); if (state.failed) return current;
+            kw=(Token)match(input,25,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                       current.merge(kw);
@@ -25000,7 +25000,7 @@ public final AntlrDatatypeRuleToken ruleQualifiedNameWithWildcard() throws Recog
 
 
     // $ANTLR start "entryRuleXImportDeclaration"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8610:1: entryRuleXImportDeclaration returns [EObject current=null] : iv_ruleXImportDeclaration= ruleXImportDeclaration EOF ;
+    // InternalFormat.g:8610:1: entryRuleXImportDeclaration returns [EObject current=null] : iv_ruleXImportDeclaration= ruleXImportDeclaration EOF ;
     public final EObject entryRuleXImportDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -25008,13 +25008,13 @@ public final EObject entryRuleXImportDeclaration() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8611:2: (iv_ruleXImportDeclaration= ruleXImportDeclaration EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8612:2: iv_ruleXImportDeclaration= ruleXImportDeclaration EOF
+            // InternalFormat.g:8611:2: (iv_ruleXImportDeclaration= ruleXImportDeclaration EOF )
+            // InternalFormat.g:8612:2: iv_ruleXImportDeclaration= ruleXImportDeclaration EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getXImportDeclarationRule()); 
             }
-            pushFollow(FOLLOW_ruleXImportDeclaration_in_entryRuleXImportDeclaration20465);
+            pushFollow(FOLLOW_1);
             iv_ruleXImportDeclaration=ruleXImportDeclaration();
 
             state._fsp--;
@@ -25022,7 +25022,7 @@ public final EObject entryRuleXImportDeclaration() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleXImportDeclaration; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleXImportDeclaration20475); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -25040,7 +25040,7 @@ public final EObject entryRuleXImportDeclaration() throws RecognitionException {
 
 
     // $ANTLR start "ruleXImportDeclaration"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8619:1: ruleXImportDeclaration returns [EObject current=null] : (otherlv_0= 'import' ( ( ( (lv_static_1_0= 'static' ) ) ( (lv_extension_2_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_4_0= '*' ) ) | ( (lv_memberName_5_0= ruleValidID ) ) ) ) | ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard ) ) ) (otherlv_8= ';' )? ) ;
+    // InternalFormat.g:8619:1: ruleXImportDeclaration returns [EObject current=null] : (otherlv_0= 'import' ( ( ( (lv_static_1_0= 'static' ) ) ( (lv_extension_2_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_4_0= '*' ) ) | ( (lv_memberName_5_0= ruleValidID ) ) ) ) | ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard ) ) ) (otherlv_8= ';' )? ) ;
     public final EObject ruleXImportDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -25057,35 +25057,35 @@ public final EObject ruleXImportDeclaration() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8622:28: ( (otherlv_0= 'import' ( ( ( (lv_static_1_0= 'static' ) ) ( (lv_extension_2_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_4_0= '*' ) ) | ( (lv_memberName_5_0= ruleValidID ) ) ) ) | ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard ) ) ) (otherlv_8= ';' )? ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8623:1: (otherlv_0= 'import' ( ( ( (lv_static_1_0= 'static' ) ) ( (lv_extension_2_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_4_0= '*' ) ) | ( (lv_memberName_5_0= ruleValidID ) ) ) ) | ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard ) ) ) (otherlv_8= ';' )? )
+            // InternalFormat.g:8622:28: ( (otherlv_0= 'import' ( ( ( (lv_static_1_0= 'static' ) ) ( (lv_extension_2_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_4_0= '*' ) ) | ( (lv_memberName_5_0= ruleValidID ) ) ) ) | ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard ) ) ) (otherlv_8= ';' )? ) )
+            // InternalFormat.g:8623:1: (otherlv_0= 'import' ( ( ( (lv_static_1_0= 'static' ) ) ( (lv_extension_2_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_4_0= '*' ) ) | ( (lv_memberName_5_0= ruleValidID ) ) ) ) | ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard ) ) ) (otherlv_8= ';' )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8623:1: (otherlv_0= 'import' ( ( ( (lv_static_1_0= 'static' ) ) ( (lv_extension_2_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_4_0= '*' ) ) | ( (lv_memberName_5_0= ruleValidID ) ) ) ) | ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard ) ) ) (otherlv_8= ';' )? )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8623:3: otherlv_0= 'import' ( ( ( (lv_static_1_0= 'static' ) ) ( (lv_extension_2_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_4_0= '*' ) ) | ( (lv_memberName_5_0= ruleValidID ) ) ) ) | ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard ) ) ) (otherlv_8= ';' )?
+            // InternalFormat.g:8623:1: (otherlv_0= 'import' ( ( ( (lv_static_1_0= 'static' ) ) ( (lv_extension_2_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_4_0= '*' ) ) | ( (lv_memberName_5_0= ruleValidID ) ) ) ) | ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard ) ) ) (otherlv_8= ';' )? )
+            // InternalFormat.g:8623:3: otherlv_0= 'import' ( ( ( (lv_static_1_0= 'static' ) ) ( (lv_extension_2_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_4_0= '*' ) ) | ( (lv_memberName_5_0= ruleValidID ) ) ) ) | ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard ) ) ) (otherlv_8= ';' )?
             {
-            otherlv_0=(Token)match(input,97,FOLLOW_97_in_ruleXImportDeclaration20512); if (state.failed) return current;
+            otherlv_0=(Token)match(input,97,FOLLOW_112); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getXImportDeclarationAccess().getImportKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8627:1: ( ( ( (lv_static_1_0= 'static' ) ) ( (lv_extension_2_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_4_0= '*' ) ) | ( (lv_memberName_5_0= ruleValidID ) ) ) ) | ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard ) ) )
+            // InternalFormat.g:8627:1: ( ( ( (lv_static_1_0= 'static' ) ) ( (lv_extension_2_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_4_0= '*' ) ) | ( (lv_memberName_5_0= ruleValidID ) ) ) ) | ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard ) ) )
             int alt163=3;
             alt163 = dfa163.predict(input);
             switch (alt163) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8627:2: ( ( (lv_static_1_0= 'static' ) ) ( (lv_extension_2_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_4_0= '*' ) ) | ( (lv_memberName_5_0= ruleValidID ) ) ) )
+                    // InternalFormat.g:8627:2: ( ( (lv_static_1_0= 'static' ) ) ( (lv_extension_2_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_4_0= '*' ) ) | ( (lv_memberName_5_0= ruleValidID ) ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8627:2: ( ( (lv_static_1_0= 'static' ) ) ( (lv_extension_2_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_4_0= '*' ) ) | ( (lv_memberName_5_0= ruleValidID ) ) ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8627:3: ( (lv_static_1_0= 'static' ) ) ( (lv_extension_2_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_4_0= '*' ) ) | ( (lv_memberName_5_0= ruleValidID ) ) )
+                    // InternalFormat.g:8627:2: ( ( (lv_static_1_0= 'static' ) ) ( (lv_extension_2_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_4_0= '*' ) ) | ( (lv_memberName_5_0= ruleValidID ) ) ) )
+                    // InternalFormat.g:8627:3: ( (lv_static_1_0= 'static' ) ) ( (lv_extension_2_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_4_0= '*' ) ) | ( (lv_memberName_5_0= ruleValidID ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8627:3: ( (lv_static_1_0= 'static' ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8628:1: (lv_static_1_0= 'static' )
+                    // InternalFormat.g:8627:3: ( (lv_static_1_0= 'static' ) )
+                    // InternalFormat.g:8628:1: (lv_static_1_0= 'static' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8628:1: (lv_static_1_0= 'static' )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8629:3: lv_static_1_0= 'static'
+                    // InternalFormat.g:8628:1: (lv_static_1_0= 'static' )
+                    // InternalFormat.g:8629:3: lv_static_1_0= 'static'
                     {
-                    lv_static_1_0=(Token)match(input,96,FOLLOW_96_in_ruleXImportDeclaration20532); if (state.failed) return current;
+                    lv_static_1_0=(Token)match(input,96,FOLLOW_113); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_static_1_0, grammarAccess.getXImportDeclarationAccess().getStaticStaticKeyword_1_0_0_0());
@@ -25105,7 +25105,7 @@ public final EObject ruleXImportDeclaration() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8642:2: ( (lv_extension_2_0= 'extension' ) )?
+                    // InternalFormat.g:8642:2: ( (lv_extension_2_0= 'extension' ) )?
                     int alt161=2;
                     int LA161_0 = input.LA(1);
 
@@ -25114,12 +25114,12 @@ public final EObject ruleXImportDeclaration() throws RecognitionException {
                     }
                     switch (alt161) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8643:1: (lv_extension_2_0= 'extension' )
+                            // InternalFormat.g:8643:1: (lv_extension_2_0= 'extension' )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8643:1: (lv_extension_2_0= 'extension' )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8644:3: lv_extension_2_0= 'extension'
+                            // InternalFormat.g:8643:1: (lv_extension_2_0= 'extension' )
+                            // InternalFormat.g:8644:3: lv_extension_2_0= 'extension'
                             {
-                            lv_extension_2_0=(Token)match(input,98,FOLLOW_98_in_ruleXImportDeclaration20563); if (state.failed) return current;
+                            lv_extension_2_0=(Token)match(input,98,FOLLOW_113); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       newLeafNode(lv_extension_2_0, grammarAccess.getXImportDeclarationAccess().getExtensionExtensionKeyword_1_0_1_0());
@@ -25142,11 +25142,11 @@ public final EObject ruleXImportDeclaration() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8657:3: ( ( ruleQualifiedNameInStaticImport ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8658:1: ( ruleQualifiedNameInStaticImport )
+                    // InternalFormat.g:8657:3: ( ( ruleQualifiedNameInStaticImport ) )
+                    // InternalFormat.g:8658:1: ( ruleQualifiedNameInStaticImport )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8658:1: ( ruleQualifiedNameInStaticImport )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8659:3: ruleQualifiedNameInStaticImport
+                    // InternalFormat.g:8658:1: ( ruleQualifiedNameInStaticImport )
+                    // InternalFormat.g:8659:3: ruleQualifiedNameInStaticImport
                     {
                     if ( state.backtracking==0 ) {
 
@@ -25160,7 +25160,7 @@ public final EObject ruleXImportDeclaration() throws RecognitionException {
                       	        newCompositeNode(grammarAccess.getXImportDeclarationAccess().getImportedTypeJvmDeclaredTypeCrossReference_1_0_2_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleQualifiedNameInStaticImport_in_ruleXImportDeclaration20600);
+                    pushFollow(FOLLOW_114);
                     ruleQualifiedNameInStaticImport();
 
                     state._fsp--;
@@ -25176,7 +25176,7 @@ public final EObject ruleXImportDeclaration() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8672:2: ( ( (lv_wildcard_4_0= '*' ) ) | ( (lv_memberName_5_0= ruleValidID ) ) )
+                    // InternalFormat.g:8672:2: ( ( (lv_wildcard_4_0= '*' ) ) | ( (lv_memberName_5_0= ruleValidID ) ) )
                     int alt162=2;
                     int LA162_0 = input.LA(1);
 
@@ -25195,15 +25195,15 @@ else if ( (LA162_0==RULE_ID||(LA162_0>=54 && LA162_0<=55)) ) {
                     }
                     switch (alt162) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8672:3: ( (lv_wildcard_4_0= '*' ) )
+                            // InternalFormat.g:8672:3: ( (lv_wildcard_4_0= '*' ) )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8672:3: ( (lv_wildcard_4_0= '*' ) )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8673:1: (lv_wildcard_4_0= '*' )
+                            // InternalFormat.g:8672:3: ( (lv_wildcard_4_0= '*' ) )
+                            // InternalFormat.g:8673:1: (lv_wildcard_4_0= '*' )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8673:1: (lv_wildcard_4_0= '*' )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8674:3: lv_wildcard_4_0= '*'
+                            // InternalFormat.g:8673:1: (lv_wildcard_4_0= '*' )
+                            // InternalFormat.g:8674:3: lv_wildcard_4_0= '*'
                             {
-                            lv_wildcard_4_0=(Token)match(input,25,FOLLOW_25_in_ruleXImportDeclaration20619); if (state.failed) return current;
+                            lv_wildcard_4_0=(Token)match(input,25,FOLLOW_115); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       newLeafNode(lv_wildcard_4_0, grammarAccess.getXImportDeclarationAccess().getWildcardAsteriskKeyword_1_0_3_0_0());
@@ -25227,20 +25227,20 @@ else if ( (LA162_0==RULE_ID||(LA162_0>=54 && LA162_0<=55)) ) {
                             }
                             break;
                         case 2 :
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8688:6: ( (lv_memberName_5_0= ruleValidID ) )
+                            // InternalFormat.g:8688:6: ( (lv_memberName_5_0= ruleValidID ) )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8688:6: ( (lv_memberName_5_0= ruleValidID ) )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8689:1: (lv_memberName_5_0= ruleValidID )
+                            // InternalFormat.g:8688:6: ( (lv_memberName_5_0= ruleValidID ) )
+                            // InternalFormat.g:8689:1: (lv_memberName_5_0= ruleValidID )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8689:1: (lv_memberName_5_0= ruleValidID )
-                            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8690:3: lv_memberName_5_0= ruleValidID
+                            // InternalFormat.g:8689:1: (lv_memberName_5_0= ruleValidID )
+                            // InternalFormat.g:8690:3: lv_memberName_5_0= ruleValidID
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getXImportDeclarationAccess().getMemberNameValidIDParserRuleCall_1_0_3_1_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleValidID_in_ruleXImportDeclaration20659);
+                            pushFollow(FOLLOW_115);
                             lv_memberName_5_0=ruleValidID();
 
                             state._fsp--;
@@ -25254,7 +25254,7 @@ else if ( (LA162_0==RULE_ID||(LA162_0>=54 && LA162_0<=55)) ) {
                                      			current, 
                                      			"memberName",
                                       		lv_memberName_5_0, 
-                                      		"ValidID");
+                                      		"com.avaloq.tools.ddk.xtext.format.Format.ValidID");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -25277,13 +25277,13 @@ else if ( (LA162_0==RULE_ID||(LA162_0>=54 && LA162_0<=55)) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8707:6: ( ( ruleQualifiedName ) )
+                    // InternalFormat.g:8707:6: ( ( ruleQualifiedName ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8707:6: ( ( ruleQualifiedName ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8708:1: ( ruleQualifiedName )
+                    // InternalFormat.g:8707:6: ( ( ruleQualifiedName ) )
+                    // InternalFormat.g:8708:1: ( ruleQualifiedName )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8708:1: ( ruleQualifiedName )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8709:3: ruleQualifiedName
+                    // InternalFormat.g:8708:1: ( ruleQualifiedName )
+                    // InternalFormat.g:8709:3: ruleQualifiedName
                     {
                     if ( state.backtracking==0 ) {
 
@@ -25297,7 +25297,7 @@ else if ( (LA162_0==RULE_ID||(LA162_0>=54 && LA162_0<=55)) ) {
                       	        newCompositeNode(grammarAccess.getXImportDeclarationAccess().getImportedTypeJvmDeclaredTypeCrossReference_1_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleQualifiedName_in_ruleXImportDeclaration20690);
+                    pushFollow(FOLLOW_115);
                     ruleQualifiedName();
 
                     state._fsp--;
@@ -25317,20 +25317,20 @@ else if ( (LA162_0==RULE_ID||(LA162_0>=54 && LA162_0<=55)) ) {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8723:6: ( (lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard ) )
+                    // InternalFormat.g:8723:6: ( (lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8723:6: ( (lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard ) )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8724:1: (lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard )
+                    // InternalFormat.g:8723:6: ( (lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard ) )
+                    // InternalFormat.g:8724:1: (lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8724:1: (lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8725:3: lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard
+                    // InternalFormat.g:8724:1: (lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard )
+                    // InternalFormat.g:8725:3: lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getXImportDeclarationAccess().getImportedNamespaceQualifiedNameWithWildcardParserRuleCall_1_2_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleQualifiedNameWithWildcard_in_ruleXImportDeclaration20717);
+                    pushFollow(FOLLOW_115);
                     lv_importedNamespace_7_0=ruleQualifiedNameWithWildcard();
 
                     state._fsp--;
@@ -25344,7 +25344,7 @@ else if ( (LA162_0==RULE_ID||(LA162_0>=54 && LA162_0<=55)) ) {
                              			current, 
                              			"importedNamespace",
                               		lv_importedNamespace_7_0, 
-                              		"QualifiedNameWithWildcard");
+                              		"org.eclipse.xtext.xbase.Xtype.QualifiedNameWithWildcard");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -25360,7 +25360,7 @@ else if ( (LA162_0==RULE_ID||(LA162_0>=54 && LA162_0<=55)) ) {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8741:3: (otherlv_8= ';' )?
+            // InternalFormat.g:8741:3: (otherlv_8= ';' )?
             int alt164=2;
             int LA164_0 = input.LA(1);
 
@@ -25369,9 +25369,9 @@ else if ( (LA162_0==RULE_ID||(LA162_0>=54 && LA162_0<=55)) ) {
             }
             switch (alt164) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8741:5: otherlv_8= ';'
+                    // InternalFormat.g:8741:5: otherlv_8= ';'
                     {
-                    otherlv_8=(Token)match(input,18,FOLLOW_18_in_ruleXImportDeclaration20731); if (state.failed) return current;
+                    otherlv_8=(Token)match(input,18,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_8, grammarAccess.getXImportDeclarationAccess().getSemicolonKeyword_2());
@@ -25406,7 +25406,7 @@ else if ( (LA162_0==RULE_ID||(LA162_0>=54 && LA162_0<=55)) ) {
 
 
     // $ANTLR start "entryRuleQualifiedNameInStaticImport"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8753:1: entryRuleQualifiedNameInStaticImport returns [String current=null] : iv_ruleQualifiedNameInStaticImport= ruleQualifiedNameInStaticImport EOF ;
+    // InternalFormat.g:8753:1: entryRuleQualifiedNameInStaticImport returns [String current=null] : iv_ruleQualifiedNameInStaticImport= ruleQualifiedNameInStaticImport EOF ;
     public final String entryRuleQualifiedNameInStaticImport() throws RecognitionException {
         String current = null;
 
@@ -25414,13 +25414,13 @@ public final String entryRuleQualifiedNameInStaticImport() throws RecognitionExc
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8754:2: (iv_ruleQualifiedNameInStaticImport= ruleQualifiedNameInStaticImport EOF )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8755:2: iv_ruleQualifiedNameInStaticImport= ruleQualifiedNameInStaticImport EOF
+            // InternalFormat.g:8754:2: (iv_ruleQualifiedNameInStaticImport= ruleQualifiedNameInStaticImport EOF )
+            // InternalFormat.g:8755:2: iv_ruleQualifiedNameInStaticImport= ruleQualifiedNameInStaticImport EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getQualifiedNameInStaticImportRule()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedNameInStaticImport_in_entryRuleQualifiedNameInStaticImport20770);
+            pushFollow(FOLLOW_1);
             iv_ruleQualifiedNameInStaticImport=ruleQualifiedNameInStaticImport();
 
             state._fsp--;
@@ -25428,7 +25428,7 @@ public final String entryRuleQualifiedNameInStaticImport() throws RecognitionExc
             if ( state.backtracking==0 ) {
                current =iv_ruleQualifiedNameInStaticImport.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedNameInStaticImport20781); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -25446,7 +25446,7 @@ public final String entryRuleQualifiedNameInStaticImport() throws RecognitionExc
 
 
     // $ANTLR start "ruleQualifiedNameInStaticImport"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8762:1: ruleQualifiedNameInStaticImport returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ValidID_0= ruleValidID kw= '.' )+ ;
+    // InternalFormat.g:8762:1: ruleQualifiedNameInStaticImport returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ValidID_0= ruleValidID kw= '.' )+ ;
     public final AntlrDatatypeRuleToken ruleQualifiedNameInStaticImport() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -25457,10 +25457,10 @@ public final AntlrDatatypeRuleToken ruleQualifiedNameInStaticImport() throws Rec
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8765:28: ( (this_ValidID_0= ruleValidID kw= '.' )+ )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8766:1: (this_ValidID_0= ruleValidID kw= '.' )+
+            // InternalFormat.g:8765:28: ( (this_ValidID_0= ruleValidID kw= '.' )+ )
+            // InternalFormat.g:8766:1: (this_ValidID_0= ruleValidID kw= '.' )+
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8766:1: (this_ValidID_0= ruleValidID kw= '.' )+
+            // InternalFormat.g:8766:1: (this_ValidID_0= ruleValidID kw= '.' )+
             int cnt165=0;
             loop165:
             do {
@@ -25504,14 +25504,14 @@ public final AntlrDatatypeRuleToken ruleQualifiedNameInStaticImport() throws Rec
 
                 switch (alt165) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8767:5: this_ValidID_0= ruleValidID kw= '.'
+            	    // InternalFormat.g:8767:5: this_ValidID_0= ruleValidID kw= '.'
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	              newCompositeNode(grammarAccess.getQualifiedNameInStaticImportAccess().getValidIDParserRuleCall_0()); 
             	          
             	    }
-            	    pushFollow(FOLLOW_ruleValidID_in_ruleQualifiedNameInStaticImport20828);
+            	    pushFollow(FOLLOW_32);
             	    this_ValidID_0=ruleValidID();
 
             	    state._fsp--;
@@ -25526,7 +25526,7 @@ public final AntlrDatatypeRuleToken ruleQualifiedNameInStaticImport() throws Rec
             	              afterParserOrEnumRuleCall();
             	          
             	    }
-            	    kw=(Token)match(input,36,FOLLOW_36_in_ruleQualifiedNameInStaticImport20846); if (state.failed) return current;
+            	    kw=(Token)match(input,36,FOLLOW_116); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	              current.merge(kw);
@@ -25567,7 +25567,7 @@ public final AntlrDatatypeRuleToken ruleQualifiedNameInStaticImport() throws Rec
 
 
     // $ANTLR start "ruleMatcherType"
-    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8791:1: ruleMatcherType returns [Enumerator current=null] : ( (enumLiteral_0= 'before' ) | (enumLiteral_1= 'after' ) | (enumLiteral_2= 'around' ) | (enumLiteral_3= 'between' ) | (enumLiteral_4= 'range' ) ) ;
+    // InternalFormat.g:8791:1: ruleMatcherType returns [Enumerator current=null] : ( (enumLiteral_0= 'before' ) | (enumLiteral_1= 'after' ) | (enumLiteral_2= 'around' ) | (enumLiteral_3= 'between' ) | (enumLiteral_4= 'range' ) ) ;
     public final Enumerator ruleMatcherType() throws RecognitionException {
         Enumerator current = null;
 
@@ -25579,10 +25579,10 @@ public final Enumerator ruleMatcherType() throws RecognitionException {
 
          enterRule(); 
         try {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8793:28: ( ( (enumLiteral_0= 'before' ) | (enumLiteral_1= 'after' ) | (enumLiteral_2= 'around' ) | (enumLiteral_3= 'between' ) | (enumLiteral_4= 'range' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8794:1: ( (enumLiteral_0= 'before' ) | (enumLiteral_1= 'after' ) | (enumLiteral_2= 'around' ) | (enumLiteral_3= 'between' ) | (enumLiteral_4= 'range' ) )
+            // InternalFormat.g:8793:28: ( ( (enumLiteral_0= 'before' ) | (enumLiteral_1= 'after' ) | (enumLiteral_2= 'around' ) | (enumLiteral_3= 'between' ) | (enumLiteral_4= 'range' ) ) )
+            // InternalFormat.g:8794:1: ( (enumLiteral_0= 'before' ) | (enumLiteral_1= 'after' ) | (enumLiteral_2= 'around' ) | (enumLiteral_3= 'between' ) | (enumLiteral_4= 'range' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8794:1: ( (enumLiteral_0= 'before' ) | (enumLiteral_1= 'after' ) | (enumLiteral_2= 'around' ) | (enumLiteral_3= 'between' ) | (enumLiteral_4= 'range' ) )
+            // InternalFormat.g:8794:1: ( (enumLiteral_0= 'before' ) | (enumLiteral_1= 'after' ) | (enumLiteral_2= 'around' ) | (enumLiteral_3= 'between' ) | (enumLiteral_4= 'range' ) )
             int alt166=5;
             switch ( input.LA(1) ) {
             case 113:
@@ -25620,12 +25620,12 @@ public final Enumerator ruleMatcherType() throws RecognitionException {
 
             switch (alt166) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8794:2: (enumLiteral_0= 'before' )
+                    // InternalFormat.g:8794:2: (enumLiteral_0= 'before' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8794:2: (enumLiteral_0= 'before' )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8794:4: enumLiteral_0= 'before'
+                    // InternalFormat.g:8794:2: (enumLiteral_0= 'before' )
+                    // InternalFormat.g:8794:4: enumLiteral_0= 'before'
                     {
-                    enumLiteral_0=(Token)match(input,113,FOLLOW_113_in_ruleMatcherType20901); if (state.failed) return current;
+                    enumLiteral_0=(Token)match(input,113,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current = grammarAccess.getMatcherTypeAccess().getBeforeEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
@@ -25639,12 +25639,12 @@ public final Enumerator ruleMatcherType() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8800:6: (enumLiteral_1= 'after' )
+                    // InternalFormat.g:8800:6: (enumLiteral_1= 'after' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8800:6: (enumLiteral_1= 'after' )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8800:8: enumLiteral_1= 'after'
+                    // InternalFormat.g:8800:6: (enumLiteral_1= 'after' )
+                    // InternalFormat.g:8800:8: enumLiteral_1= 'after'
                     {
-                    enumLiteral_1=(Token)match(input,114,FOLLOW_114_in_ruleMatcherType20918); if (state.failed) return current;
+                    enumLiteral_1=(Token)match(input,114,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current = grammarAccess.getMatcherTypeAccess().getAfterEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
@@ -25658,12 +25658,12 @@ public final Enumerator ruleMatcherType() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8806:6: (enumLiteral_2= 'around' )
+                    // InternalFormat.g:8806:6: (enumLiteral_2= 'around' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8806:6: (enumLiteral_2= 'around' )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8806:8: enumLiteral_2= 'around'
+                    // InternalFormat.g:8806:6: (enumLiteral_2= 'around' )
+                    // InternalFormat.g:8806:8: enumLiteral_2= 'around'
                     {
-                    enumLiteral_2=(Token)match(input,115,FOLLOW_115_in_ruleMatcherType20935); if (state.failed) return current;
+                    enumLiteral_2=(Token)match(input,115,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current = grammarAccess.getMatcherTypeAccess().getAroundEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
@@ -25677,12 +25677,12 @@ public final Enumerator ruleMatcherType() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8812:6: (enumLiteral_3= 'between' )
+                    // InternalFormat.g:8812:6: (enumLiteral_3= 'between' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8812:6: (enumLiteral_3= 'between' )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8812:8: enumLiteral_3= 'between'
+                    // InternalFormat.g:8812:6: (enumLiteral_3= 'between' )
+                    // InternalFormat.g:8812:8: enumLiteral_3= 'between'
                     {
-                    enumLiteral_3=(Token)match(input,116,FOLLOW_116_in_ruleMatcherType20952); if (state.failed) return current;
+                    enumLiteral_3=(Token)match(input,116,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current = grammarAccess.getMatcherTypeAccess().getBetweenEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
@@ -25696,12 +25696,12 @@ public final Enumerator ruleMatcherType() throws RecognitionException {
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8818:6: (enumLiteral_4= 'range' )
+                    // InternalFormat.g:8818:6: (enumLiteral_4= 'range' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8818:6: (enumLiteral_4= 'range' )
-                    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8818:8: enumLiteral_4= 'range'
+                    // InternalFormat.g:8818:6: (enumLiteral_4= 'range' )
+                    // InternalFormat.g:8818:8: enumLiteral_4= 'range'
                     {
-                    enumLiteral_4=(Token)match(input,117,FOLLOW_117_in_ruleMatcherType20969); if (state.failed) return current;
+                    enumLiteral_4=(Token)match(input,117,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current = grammarAccess.getMatcherTypeAccess().getRangeEnumLiteralDeclaration_4().getEnumLiteral().getInstance();
@@ -25737,10 +25737,10 @@ public final Enumerator ruleMatcherType() throws RecognitionException {
 
     // $ANTLR start synpred1_InternalFormat
     public final void synpred1_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2460:4: ( '(' )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2460:6: '('
+        // InternalFormat.g:2460:4: ( '(' )
+        // InternalFormat.g:2460:6: '('
         {
-        match(input,33,FOLLOW_33_in_synpred1_InternalFormat5688); if (state.failed) return ;
+        match(input,33,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -25748,19 +25748,19 @@ public final void synpred1_InternalFormat_fragment() throws RecognitionException
 
     // $ANTLR start synpred2_InternalFormat
     public final void synpred2_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2465:5: ( ( ( ( ruleValidID ) ) '=' ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2465:6: ( ( ( ruleValidID ) ) '=' )
+        // InternalFormat.g:2465:5: ( ( ( ( ruleValidID ) ) '=' ) )
+        // InternalFormat.g:2465:6: ( ( ( ruleValidID ) ) '=' )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2465:6: ( ( ( ruleValidID ) ) '=' )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2465:7: ( ( ruleValidID ) ) '='
+        // InternalFormat.g:2465:6: ( ( ( ruleValidID ) ) '=' )
+        // InternalFormat.g:2465:7: ( ( ruleValidID ) ) '='
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2465:7: ( ( ruleValidID ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2466:1: ( ruleValidID )
+        // InternalFormat.g:2465:7: ( ( ruleValidID ) )
+        // InternalFormat.g:2466:1: ( ruleValidID )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2466:1: ( ruleValidID )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2467:3: ruleValidID
+        // InternalFormat.g:2466:1: ( ruleValidID )
+        // InternalFormat.g:2467:3: ruleValidID
         {
-        pushFollow(FOLLOW_ruleValidID_in_synpred2_InternalFormat5717);
+        pushFollow(FOLLOW_13);
         ruleValidID();
 
         state._fsp--;
@@ -25771,7 +25771,7 @@ public final void synpred2_InternalFormat_fragment() throws RecognitionException
 
         }
 
-        match(input,21,FOLLOW_21_in_synpred2_InternalFormat5723); if (state.failed) return ;
+        match(input,21,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -25782,19 +25782,19 @@ public final void synpred2_InternalFormat_fragment() throws RecognitionException
 
     // $ANTLR start synpred5_InternalFormat
     public final void synpred5_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2622:4: ( ( () '#' '[' ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2622:5: ( () '#' '[' )
+        // InternalFormat.g:2622:4: ( ( () '#' '[' ) )
+        // InternalFormat.g:2622:5: ( () '#' '[' )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2622:5: ( () '#' '[' )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2622:6: () '#' '['
+        // InternalFormat.g:2622:5: ( () '#' '[' )
+        // InternalFormat.g:2622:6: () '#' '['
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2622:6: ()
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2623:1: 
+        // InternalFormat.g:2622:6: ()
+        // InternalFormat.g:2623:1: 
         {
         }
 
-        match(input,56,FOLLOW_56_in_synpred5_InternalFormat6079); if (state.failed) return ;
-        match(input,27,FOLLOW_27_in_synpred5_InternalFormat6083); if (state.failed) return ;
+        match(input,56,FOLLOW_49); if (state.failed) return ;
+        match(input,27,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -25805,19 +25805,19 @@ public final void synpred5_InternalFormat_fragment() throws RecognitionException
 
     // $ANTLR start synpred6_InternalFormat
     public final void synpred6_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2742:4: ( ( () '#' '[' ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2742:5: ( () '#' '[' )
+        // InternalFormat.g:2742:4: ( ( () '#' '[' ) )
+        // InternalFormat.g:2742:5: ( () '#' '[' )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2742:5: ( () '#' '[' )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2742:6: () '#' '['
+        // InternalFormat.g:2742:5: ( () '#' '[' )
+        // InternalFormat.g:2742:6: () '#' '['
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2742:6: ()
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2743:1: 
+        // InternalFormat.g:2742:6: ()
+        // InternalFormat.g:2743:1: 
         {
         }
 
-        match(input,56,FOLLOW_56_in_synpred6_InternalFormat6354); if (state.failed) return ;
-        match(input,27,FOLLOW_27_in_synpred6_InternalFormat6358); if (state.failed) return ;
+        match(input,56,FOLLOW_49); if (state.failed) return ;
+        match(input,27,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -25828,24 +25828,24 @@ public final void synpred6_InternalFormat_fragment() throws RecognitionException
 
     // $ANTLR start synpred7_InternalFormat
     public final void synpred7_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2961:3: ( ( () ( ( ruleOpMultiAssign ) ) ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2961:4: ( () ( ( ruleOpMultiAssign ) ) )
+        // InternalFormat.g:2961:3: ( ( () ( ( ruleOpMultiAssign ) ) ) )
+        // InternalFormat.g:2961:4: ( () ( ( ruleOpMultiAssign ) ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2961:4: ( () ( ( ruleOpMultiAssign ) ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2961:5: () ( ( ruleOpMultiAssign ) )
+        // InternalFormat.g:2961:4: ( () ( ( ruleOpMultiAssign ) ) )
+        // InternalFormat.g:2961:5: () ( ( ruleOpMultiAssign ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2961:5: ()
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2962:1: 
+        // InternalFormat.g:2961:5: ()
+        // InternalFormat.g:2962:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2962:2: ( ( ruleOpMultiAssign ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2963:1: ( ruleOpMultiAssign )
+        // InternalFormat.g:2962:2: ( ( ruleOpMultiAssign ) )
+        // InternalFormat.g:2963:1: ( ruleOpMultiAssign )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2963:1: ( ruleOpMultiAssign )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:2964:3: ruleOpMultiAssign
+        // InternalFormat.g:2963:1: ( ruleOpMultiAssign )
+        // InternalFormat.g:2964:3: ruleOpMultiAssign
         {
-        pushFollow(FOLLOW_ruleOpMultiAssign_in_synpred7_InternalFormat6891);
+        pushFollow(FOLLOW_2);
         ruleOpMultiAssign();
 
         state._fsp--;
@@ -25866,24 +25866,24 @@ public final void synpred7_InternalFormat_fragment() throws RecognitionException
 
     // $ANTLR start synpred8_InternalFormat
     public final void synpred8_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3155:3: ( ( () ( ( ruleOpOr ) ) ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3155:4: ( () ( ( ruleOpOr ) ) )
+        // InternalFormat.g:3155:3: ( ( () ( ( ruleOpOr ) ) ) )
+        // InternalFormat.g:3155:4: ( () ( ( ruleOpOr ) ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3155:4: ( () ( ( ruleOpOr ) ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3155:5: () ( ( ruleOpOr ) )
+        // InternalFormat.g:3155:4: ( () ( ( ruleOpOr ) ) )
+        // InternalFormat.g:3155:5: () ( ( ruleOpOr ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3155:5: ()
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3156:1: 
+        // InternalFormat.g:3155:5: ()
+        // InternalFormat.g:3156:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3156:2: ( ( ruleOpOr ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3157:1: ( ruleOpOr )
+        // InternalFormat.g:3156:2: ( ( ruleOpOr ) )
+        // InternalFormat.g:3157:1: ( ruleOpOr )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3157:1: ( ruleOpOr )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3158:3: ruleOpOr
+        // InternalFormat.g:3157:1: ( ruleOpOr )
+        // InternalFormat.g:3158:3: ruleOpOr
         {
-        pushFollow(FOLLOW_ruleOpOr_in_synpred8_InternalFormat7414);
+        pushFollow(FOLLOW_2);
         ruleOpOr();
 
         state._fsp--;
@@ -25904,24 +25904,24 @@ public final void synpred8_InternalFormat_fragment() throws RecognitionException
 
     // $ANTLR start synpred9_InternalFormat
     public final void synpred9_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3256:3: ( ( () ( ( ruleOpAnd ) ) ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3256:4: ( () ( ( ruleOpAnd ) ) )
+        // InternalFormat.g:3256:3: ( ( () ( ( ruleOpAnd ) ) ) )
+        // InternalFormat.g:3256:4: ( () ( ( ruleOpAnd ) ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3256:4: ( () ( ( ruleOpAnd ) ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3256:5: () ( ( ruleOpAnd ) )
+        // InternalFormat.g:3256:4: ( () ( ( ruleOpAnd ) ) )
+        // InternalFormat.g:3256:5: () ( ( ruleOpAnd ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3256:5: ()
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3257:1: 
+        // InternalFormat.g:3256:5: ()
+        // InternalFormat.g:3257:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3257:2: ( ( ruleOpAnd ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3258:1: ( ruleOpAnd )
+        // InternalFormat.g:3257:2: ( ( ruleOpAnd ) )
+        // InternalFormat.g:3258:1: ( ruleOpAnd )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3258:1: ( ruleOpAnd )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3259:3: ruleOpAnd
+        // InternalFormat.g:3258:1: ( ruleOpAnd )
+        // InternalFormat.g:3259:3: ruleOpAnd
         {
-        pushFollow(FOLLOW_ruleOpAnd_in_synpred9_InternalFormat7673);
+        pushFollow(FOLLOW_2);
         ruleOpAnd();
 
         state._fsp--;
@@ -25942,24 +25942,24 @@ public final void synpred9_InternalFormat_fragment() throws RecognitionException
 
     // $ANTLR start synpred10_InternalFormat
     public final void synpred10_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3357:3: ( ( () ( ( ruleOpEquality ) ) ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3357:4: ( () ( ( ruleOpEquality ) ) )
+        // InternalFormat.g:3357:3: ( ( () ( ( ruleOpEquality ) ) ) )
+        // InternalFormat.g:3357:4: ( () ( ( ruleOpEquality ) ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3357:4: ( () ( ( ruleOpEquality ) ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3357:5: () ( ( ruleOpEquality ) )
+        // InternalFormat.g:3357:4: ( () ( ( ruleOpEquality ) ) )
+        // InternalFormat.g:3357:5: () ( ( ruleOpEquality ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3357:5: ()
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3358:1: 
+        // InternalFormat.g:3357:5: ()
+        // InternalFormat.g:3358:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3358:2: ( ( ruleOpEquality ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3359:1: ( ruleOpEquality )
+        // InternalFormat.g:3358:2: ( ( ruleOpEquality ) )
+        // InternalFormat.g:3359:1: ( ruleOpEquality )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3359:1: ( ruleOpEquality )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3360:3: ruleOpEquality
+        // InternalFormat.g:3359:1: ( ruleOpEquality )
+        // InternalFormat.g:3360:3: ruleOpEquality
         {
-        pushFollow(FOLLOW_ruleOpEquality_in_synpred10_InternalFormat7932);
+        pushFollow(FOLLOW_2);
         ruleOpEquality();
 
         state._fsp--;
@@ -25980,18 +25980,18 @@ public final void synpred10_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred11_InternalFormat
     public final void synpred11_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3479:4: ( ( () 'instanceof' ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3479:5: ( () 'instanceof' )
+        // InternalFormat.g:3479:4: ( ( () 'instanceof' ) )
+        // InternalFormat.g:3479:5: ( () 'instanceof' )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3479:5: ( () 'instanceof' )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3479:6: () 'instanceof'
+        // InternalFormat.g:3479:5: ( () 'instanceof' )
+        // InternalFormat.g:3479:6: () 'instanceof'
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3479:6: ()
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3480:1: 
+        // InternalFormat.g:3479:6: ()
+        // InternalFormat.g:3480:1: 
         {
         }
 
-        match(input,71,FOLLOW_71_in_synpred11_InternalFormat8246); if (state.failed) return ;
+        match(input,71,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -26002,24 +26002,24 @@ public final void synpred11_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred12_InternalFormat
     public final void synpred12_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3510:8: ( ( () ( ( ruleOpCompare ) ) ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3510:9: ( () ( ( ruleOpCompare ) ) )
+        // InternalFormat.g:3510:8: ( ( () ( ( ruleOpCompare ) ) ) )
+        // InternalFormat.g:3510:9: ( () ( ( ruleOpCompare ) ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3510:9: ( () ( ( ruleOpCompare ) ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3510:10: () ( ( ruleOpCompare ) )
+        // InternalFormat.g:3510:9: ( () ( ( ruleOpCompare ) ) )
+        // InternalFormat.g:3510:10: () ( ( ruleOpCompare ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3510:10: ()
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3511:1: 
+        // InternalFormat.g:3510:10: ()
+        // InternalFormat.g:3511:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3511:2: ( ( ruleOpCompare ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3512:1: ( ruleOpCompare )
+        // InternalFormat.g:3511:2: ( ( ruleOpCompare ) )
+        // InternalFormat.g:3512:1: ( ruleOpCompare )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3512:1: ( ruleOpCompare )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3513:3: ruleOpCompare
+        // InternalFormat.g:3512:1: ( ruleOpCompare )
+        // InternalFormat.g:3513:3: ruleOpCompare
         {
-        pushFollow(FOLLOW_ruleOpCompare_in_synpred12_InternalFormat8317);
+        pushFollow(FOLLOW_2);
         ruleOpCompare();
 
         state._fsp--;
@@ -26040,24 +26040,24 @@ public final void synpred12_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred13_InternalFormat
     public final void synpred13_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3638:3: ( ( () ( ( ruleOpOther ) ) ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3638:4: ( () ( ( ruleOpOther ) ) )
+        // InternalFormat.g:3638:3: ( ( () ( ( ruleOpOther ) ) ) )
+        // InternalFormat.g:3638:4: ( () ( ( ruleOpOther ) ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3638:4: ( () ( ( ruleOpOther ) ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3638:5: () ( ( ruleOpOther ) )
+        // InternalFormat.g:3638:4: ( () ( ( ruleOpOther ) ) )
+        // InternalFormat.g:3638:5: () ( ( ruleOpOther ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3638:5: ()
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3639:1: 
+        // InternalFormat.g:3638:5: ()
+        // InternalFormat.g:3639:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3639:2: ( ( ruleOpOther ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3640:1: ( ruleOpOther )
+        // InternalFormat.g:3639:2: ( ( ruleOpOther ) )
+        // InternalFormat.g:3640:1: ( ruleOpOther )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3640:1: ( ruleOpOther )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3641:3: ruleOpOther
+        // InternalFormat.g:3640:1: ( ruleOpOther )
+        // InternalFormat.g:3641:3: ruleOpOther
         {
-        pushFollow(FOLLOW_ruleOpOther_in_synpred13_InternalFormat8651);
+        pushFollow(FOLLOW_2);
         ruleOpOther();
 
         state._fsp--;
@@ -26078,14 +26078,14 @@ public final void synpred13_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred14_InternalFormat
     public final void synpred14_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3750:3: ( ( '>' '>' ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3750:4: ( '>' '>' )
+        // InternalFormat.g:3750:3: ( ( '>' '>' ) )
+        // InternalFormat.g:3750:4: ( '>' '>' )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3750:4: ( '>' '>' )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3751:2: '>' '>'
+        // InternalFormat.g:3750:4: ( '>' '>' )
+        // InternalFormat.g:3751:2: '>' '>'
         {
-        match(input,63,FOLLOW_63_in_synpred14_InternalFormat8920); if (state.failed) return ;
-        match(input,63,FOLLOW_63_in_synpred14_InternalFormat8925); if (state.failed) return ;
+        match(input,63,FOLLOW_63); if (state.failed) return ;
+        match(input,63,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -26096,14 +26096,14 @@ public final void synpred14_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred15_InternalFormat
     public final void synpred15_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3780:3: ( ( '<' '<' ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3780:4: ( '<' '<' )
+        // InternalFormat.g:3780:3: ( ( '<' '<' ) )
+        // InternalFormat.g:3780:4: ( '<' '<' )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3780:4: ( '<' '<' )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3781:2: '<' '<'
+        // InternalFormat.g:3780:4: ( '<' '<' )
+        // InternalFormat.g:3781:2: '<' '<'
         {
-        match(input,62,FOLLOW_62_in_synpred15_InternalFormat9007); if (state.failed) return ;
-        match(input,62,FOLLOW_62_in_synpred15_InternalFormat9012); if (state.failed) return ;
+        match(input,62,FOLLOW_53); if (state.failed) return ;
+        match(input,62,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -26114,24 +26114,24 @@ public final void synpred15_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred16_InternalFormat
     public final void synpred16_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3854:3: ( ( () ( ( ruleOpAdd ) ) ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3854:4: ( () ( ( ruleOpAdd ) ) )
+        // InternalFormat.g:3854:3: ( ( () ( ( ruleOpAdd ) ) ) )
+        // InternalFormat.g:3854:4: ( () ( ( ruleOpAdd ) ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3854:4: ( () ( ( ruleOpAdd ) ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3854:5: () ( ( ruleOpAdd ) )
+        // InternalFormat.g:3854:4: ( () ( ( ruleOpAdd ) ) )
+        // InternalFormat.g:3854:5: () ( ( ruleOpAdd ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3854:5: ()
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3855:1: 
+        // InternalFormat.g:3854:5: ()
+        // InternalFormat.g:3855:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3855:2: ( ( ruleOpAdd ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3856:1: ( ruleOpAdd )
+        // InternalFormat.g:3855:2: ( ( ruleOpAdd ) )
+        // InternalFormat.g:3856:1: ( ruleOpAdd )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3856:1: ( ruleOpAdd )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3857:3: ruleOpAdd
+        // InternalFormat.g:3856:1: ( ruleOpAdd )
+        // InternalFormat.g:3857:3: ruleOpAdd
         {
-        pushFollow(FOLLOW_ruleOpAdd_in_synpred16_InternalFormat9234);
+        pushFollow(FOLLOW_2);
         ruleOpAdd();
 
         state._fsp--;
@@ -26152,24 +26152,24 @@ public final void synpred16_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred17_InternalFormat
     public final void synpred17_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3962:3: ( ( () ( ( ruleOpMulti ) ) ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3962:4: ( () ( ( ruleOpMulti ) ) )
+        // InternalFormat.g:3962:3: ( ( () ( ( ruleOpMulti ) ) ) )
+        // InternalFormat.g:3962:4: ( () ( ( ruleOpMulti ) ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3962:4: ( () ( ( ruleOpMulti ) ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3962:5: () ( ( ruleOpMulti ) )
+        // InternalFormat.g:3962:4: ( () ( ( ruleOpMulti ) ) )
+        // InternalFormat.g:3962:5: () ( ( ruleOpMulti ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3962:5: ()
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3963:1: 
+        // InternalFormat.g:3962:5: ()
+        // InternalFormat.g:3963:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3963:2: ( ( ruleOpMulti ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3964:1: ( ruleOpMulti )
+        // InternalFormat.g:3963:2: ( ( ruleOpMulti ) )
+        // InternalFormat.g:3964:1: ( ruleOpMulti )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3964:1: ( ruleOpMulti )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:3965:3: ruleOpMulti
+        // InternalFormat.g:3964:1: ( ruleOpMulti )
+        // InternalFormat.g:3965:3: ruleOpMulti
         {
-        pushFollow(FOLLOW_ruleOpMulti_in_synpred17_InternalFormat9514);
+        pushFollow(FOLLOW_2);
         ruleOpMulti();
 
         state._fsp--;
@@ -26190,18 +26190,18 @@ public final void synpred17_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred18_InternalFormat
     public final void synpred18_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4195:3: ( ( () 'as' ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4195:4: ( () 'as' )
+        // InternalFormat.g:4195:3: ( ( () 'as' ) )
+        // InternalFormat.g:4195:4: ( () 'as' )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4195:4: ( () 'as' )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4195:5: () 'as'
+        // InternalFormat.g:4195:4: ( () 'as' )
+        // InternalFormat.g:4195:5: () 'as'
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4195:5: ()
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4196:1: 
+        // InternalFormat.g:4195:5: ()
+        // InternalFormat.g:4196:1: 
         {
         }
 
-        match(input,83,FOLLOW_83_in_synpred18_InternalFormat10108); if (state.failed) return ;
+        match(input,83,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -26212,24 +26212,24 @@ public final void synpred18_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred19_InternalFormat
     public final void synpred19_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4255:2: ( ( () ( ( ruleOpPostfix ) ) ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4255:3: ( () ( ( ruleOpPostfix ) ) )
+        // InternalFormat.g:4255:2: ( ( () ( ( ruleOpPostfix ) ) ) )
+        // InternalFormat.g:4255:3: ( () ( ( ruleOpPostfix ) ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4255:3: ( () ( ( ruleOpPostfix ) ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4255:4: () ( ( ruleOpPostfix ) )
+        // InternalFormat.g:4255:3: ( () ( ( ruleOpPostfix ) ) )
+        // InternalFormat.g:4255:4: () ( ( ruleOpPostfix ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4255:4: ()
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4256:1: 
+        // InternalFormat.g:4255:4: ()
+        // InternalFormat.g:4256:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4256:2: ( ( ruleOpPostfix ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4257:1: ( ruleOpPostfix )
+        // InternalFormat.g:4256:2: ( ( ruleOpPostfix ) )
+        // InternalFormat.g:4257:1: ( ruleOpPostfix )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4257:1: ( ruleOpPostfix )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4258:3: ruleOpPostfix
+        // InternalFormat.g:4257:1: ( ruleOpPostfix )
+        // InternalFormat.g:4258:3: ruleOpPostfix
         {
-        pushFollow(FOLLOW_ruleOpPostfix_in_synpred19_InternalFormat10265);
+        pushFollow(FOLLOW_2);
         ruleOpPostfix();
 
         state._fsp--;
@@ -26250,18 +26250,18 @@ public final void synpred19_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred20_InternalFormat
     public final void synpred20_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4345:4: ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4345:5: ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
+        // InternalFormat.g:4345:4: ( ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ) )
+        // InternalFormat.g:4345:5: ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4345:5: ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4345:6: () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign
+        // InternalFormat.g:4345:5: ( () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign )
+        // InternalFormat.g:4345:6: () ( '.' | ( ( '::' ) ) ) ( ( ruleFeatureCallID ) ) ruleOpSingleAssign
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4345:6: ()
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4346:1: 
+        // InternalFormat.g:4345:6: ()
+        // InternalFormat.g:4346:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4346:2: ( '.' | ( ( '::' ) ) )
+        // InternalFormat.g:4346:2: ( '.' | ( ( '::' ) ) )
         int alt167=2;
         int LA167_0 = input.LA(1);
 
@@ -26280,22 +26280,22 @@ else if ( (LA167_0==86) ) {
         }
         switch (alt167) {
             case 1 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4346:4: '.'
+                // InternalFormat.g:4346:4: '.'
                 {
-                match(input,36,FOLLOW_36_in_synpred20_InternalFormat10520); if (state.failed) return ;
+                match(input,36,FOLLOW_70); if (state.failed) return ;
 
                 }
                 break;
             case 2 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4348:6: ( ( '::' ) )
+                // InternalFormat.g:4348:6: ( ( '::' ) )
                 {
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4348:6: ( ( '::' ) )
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4349:1: ( '::' )
+                // InternalFormat.g:4348:6: ( ( '::' ) )
+                // InternalFormat.g:4349:1: ( '::' )
                 {
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4349:1: ( '::' )
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4350:2: '::'
+                // InternalFormat.g:4349:1: ( '::' )
+                // InternalFormat.g:4350:2: '::'
                 {
-                match(input,86,FOLLOW_86_in_synpred20_InternalFormat10534); if (state.failed) return ;
+                match(input,86,FOLLOW_70); if (state.failed) return ;
 
                 }
 
@@ -26308,13 +26308,13 @@ else if ( (LA167_0==86) ) {
 
         }
 
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4354:3: ( ( ruleFeatureCallID ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4355:1: ( ruleFeatureCallID )
+        // InternalFormat.g:4354:3: ( ( ruleFeatureCallID ) )
+        // InternalFormat.g:4355:1: ( ruleFeatureCallID )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4355:1: ( ruleFeatureCallID )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4356:3: ruleFeatureCallID
+        // InternalFormat.g:4355:1: ( ruleFeatureCallID )
+        // InternalFormat.g:4356:3: ruleFeatureCallID
         {
-        pushFollow(FOLLOW_ruleFeatureCallID_in_synpred20_InternalFormat10550);
+        pushFollow(FOLLOW_13);
         ruleFeatureCallID();
 
         state._fsp--;
@@ -26325,7 +26325,7 @@ else if ( (LA167_0==86) ) {
 
         }
 
-        pushFollow(FOLLOW_ruleOpSingleAssign_in_synpred20_InternalFormat10556);
+        pushFollow(FOLLOW_2);
         ruleOpSingleAssign();
 
         state._fsp--;
@@ -26340,18 +26340,18 @@ else if ( (LA167_0==86) ) {
 
     // $ANTLR start synpred21_InternalFormat
     public final void synpred21_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4426:8: ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4426:9: ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) )
+        // InternalFormat.g:4426:8: ( ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) ) )
+        // InternalFormat.g:4426:9: ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4426:9: ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4426:10: () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) )
+        // InternalFormat.g:4426:9: ( () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) )
+        // InternalFormat.g:4426:10: () ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4426:10: ()
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4427:1: 
+        // InternalFormat.g:4426:10: ()
+        // InternalFormat.g:4427:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4427:2: ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) )
+        // InternalFormat.g:4427:2: ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) )
         int alt168=3;
         switch ( input.LA(1) ) {
         case 36:
@@ -26379,22 +26379,22 @@ public final void synpred21_InternalFormat_fragment() throws RecognitionExceptio
 
         switch (alt168) {
             case 1 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4427:4: '.'
+                // InternalFormat.g:4427:4: '.'
                 {
-                match(input,36,FOLLOW_36_in_synpred21_InternalFormat10698); if (state.failed) return ;
+                match(input,36,FOLLOW_2); if (state.failed) return ;
 
                 }
                 break;
             case 2 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4429:6: ( ( '?.' ) )
+                // InternalFormat.g:4429:6: ( ( '?.' ) )
                 {
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4429:6: ( ( '?.' ) )
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4430:1: ( '?.' )
+                // InternalFormat.g:4429:6: ( ( '?.' ) )
+                // InternalFormat.g:4430:1: ( '?.' )
                 {
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4430:1: ( '?.' )
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4431:2: '?.'
+                // InternalFormat.g:4430:1: ( '?.' )
+                // InternalFormat.g:4431:2: '?.'
                 {
-                match(input,87,FOLLOW_87_in_synpred21_InternalFormat10712); if (state.failed) return ;
+                match(input,87,FOLLOW_2); if (state.failed) return ;
 
                 }
 
@@ -26405,15 +26405,15 @@ public final void synpred21_InternalFormat_fragment() throws RecognitionExceptio
                 }
                 break;
             case 3 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4436:6: ( ( '::' ) )
+                // InternalFormat.g:4436:6: ( ( '::' ) )
                 {
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4436:6: ( ( '::' ) )
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4437:1: ( '::' )
+                // InternalFormat.g:4436:6: ( ( '::' ) )
+                // InternalFormat.g:4437:1: ( '::' )
                 {
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4437:1: ( '::' )
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4438:2: '::'
+                // InternalFormat.g:4437:1: ( '::' )
+                // InternalFormat.g:4438:2: '::'
                 {
-                match(input,86,FOLLOW_86_in_synpred21_InternalFormat10732); if (state.failed) return ;
+                match(input,86,FOLLOW_2); if (state.failed) return ;
 
                 }
 
@@ -26436,13 +26436,13 @@ public final void synpred21_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred22_InternalFormat
     public final void synpred22_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4547:4: ( ( '(' ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4548:1: ( '(' )
+        // InternalFormat.g:4547:4: ( ( '(' ) )
+        // InternalFormat.g:4548:1: ( '(' )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4548:1: ( '(' )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4549:2: '('
+        // InternalFormat.g:4548:1: ( '(' )
+        // InternalFormat.g:4549:2: '('
         {
-        match(input,33,FOLLOW_33_in_synpred22_InternalFormat10959); if (state.failed) return ;
+        match(input,33,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -26453,18 +26453,18 @@ public final void synpred22_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred23_InternalFormat
     public final void synpred23_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4568:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4568:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // InternalFormat.g:4568:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
+        // InternalFormat.g:4568:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4568:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4568:6: () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
+        // InternalFormat.g:4568:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // InternalFormat.g:4568:6: () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4568:6: ()
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4569:1: 
+        // InternalFormat.g:4568:6: ()
+        // InternalFormat.g:4569:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4569:2: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
+        // InternalFormat.g:4569:2: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
         int alt170=2;
         int LA170_0 = input.LA(1);
 
@@ -26473,15 +26473,15 @@ public final void synpred23_InternalFormat_fragment() throws RecognitionExceptio
         }
         switch (alt170) {
             case 1 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4569:3: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                // InternalFormat.g:4569:3: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
                 {
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4569:3: ( ( ruleJvmFormalParameter ) )
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4570:1: ( ruleJvmFormalParameter )
+                // InternalFormat.g:4569:3: ( ( ruleJvmFormalParameter ) )
+                // InternalFormat.g:4570:1: ( ruleJvmFormalParameter )
                 {
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4570:1: ( ruleJvmFormalParameter )
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4571:1: ruleJvmFormalParameter
+                // InternalFormat.g:4570:1: ( ruleJvmFormalParameter )
+                // InternalFormat.g:4571:1: ruleJvmFormalParameter
                 {
-                pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred23_InternalFormat11011);
+                pushFollow(FOLLOW_80);
                 ruleJvmFormalParameter();
 
                 state._fsp--;
@@ -26492,7 +26492,7 @@ public final void synpred23_InternalFormat_fragment() throws RecognitionExceptio
 
                 }
 
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4573:2: ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                // InternalFormat.g:4573:2: ( ',' ( ( ruleJvmFormalParameter ) ) )*
                 loop169:
                 do {
                     int alt169=2;
@@ -26505,16 +26505,16 @@ public final void synpred23_InternalFormat_fragment() throws RecognitionExceptio
 
                     switch (alt169) {
                 	case 1 :
-                	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4573:4: ',' ( ( ruleJvmFormalParameter ) )
+                	    // InternalFormat.g:4573:4: ',' ( ( ruleJvmFormalParameter ) )
                 	    {
-                	    match(input,28,FOLLOW_28_in_synpred23_InternalFormat11018); if (state.failed) return ;
-                	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4574:1: ( ( ruleJvmFormalParameter ) )
-                	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4575:1: ( ruleJvmFormalParameter )
+                	    match(input,28,FOLLOW_60); if (state.failed) return ;
+                	    // InternalFormat.g:4574:1: ( ( ruleJvmFormalParameter ) )
+                	    // InternalFormat.g:4575:1: ( ruleJvmFormalParameter )
                 	    {
-                	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4575:1: ( ruleJvmFormalParameter )
-                	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4576:1: ruleJvmFormalParameter
+                	    // InternalFormat.g:4575:1: ( ruleJvmFormalParameter )
+                	    // InternalFormat.g:4576:1: ruleJvmFormalParameter
                 	    {
-                	    pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred23_InternalFormat11025);
+                	    pushFollow(FOLLOW_80);
                 	    ruleJvmFormalParameter();
 
                 	    state._fsp--;
@@ -26540,13 +26540,13 @@ public final void synpred23_InternalFormat_fragment() throws RecognitionExceptio
 
         }
 
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4578:6: ( ( '|' ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4579:1: ( '|' )
+        // InternalFormat.g:4578:6: ( ( '|' ) )
+        // InternalFormat.g:4579:1: ( '|' )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4579:1: ( '|' )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4580:2: '|'
+        // InternalFormat.g:4579:1: ( '|' )
+        // InternalFormat.g:4580:2: '|'
         {
-        match(input,88,FOLLOW_88_in_synpred23_InternalFormat11039); if (state.failed) return ;
+        match(input,88,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -26563,18 +26563,18 @@ public final void synpred23_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred24_InternalFormat
     public final void synpred24_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4647:4: ( ( () '[' ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4647:5: ( () '[' )
+        // InternalFormat.g:4647:4: ( ( () '[' ) )
+        // InternalFormat.g:4647:5: ( () '[' )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4647:5: ( () '[' )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4647:6: () '['
+        // InternalFormat.g:4647:5: ( () '[' )
+        // InternalFormat.g:4647:6: () '['
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4647:6: ()
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4648:1: 
+        // InternalFormat.g:4647:6: ()
+        // InternalFormat.g:4648:1: 
         {
         }
 
-        match(input,27,FOLLOW_27_in_synpred24_InternalFormat11159); if (state.failed) return ;
+        match(input,27,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -26585,19 +26585,19 @@ public final void synpred24_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred25_InternalFormat
     public final void synpred25_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4718:7: ( ( () 'synchronized' '(' ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4718:8: ( () 'synchronized' '(' )
+        // InternalFormat.g:4718:7: ( ( () 'synchronized' '(' ) )
+        // InternalFormat.g:4718:8: ( () 'synchronized' '(' )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4718:8: ( () 'synchronized' '(' )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4718:9: () 'synchronized' '('
+        // InternalFormat.g:4718:8: ( () 'synchronized' '(' )
+        // InternalFormat.g:4718:9: () 'synchronized' '('
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4718:9: ()
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4719:1: 
+        // InternalFormat.g:4718:9: ()
+        // InternalFormat.g:4719:1: 
         {
         }
 
-        match(input,109,FOLLOW_109_in_synpred25_InternalFormat11348); if (state.failed) return ;
-        match(input,33,FOLLOW_33_in_synpred25_InternalFormat11352); if (state.failed) return ;
+        match(input,109,FOLLOW_85); if (state.failed) return ;
+        match(input,33,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -26608,26 +26608,26 @@ public final void synpred25_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred26_InternalFormat
     public final void synpred26_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4761:7: ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4761:8: ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' )
+        // InternalFormat.g:4761:7: ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )
+        // InternalFormat.g:4761:8: ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4761:8: ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4761:9: () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':'
+        // InternalFormat.g:4761:8: ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' )
+        // InternalFormat.g:4761:9: () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':'
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4761:9: ()
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4762:1: 
+        // InternalFormat.g:4761:9: ()
+        // InternalFormat.g:4762:1: 
         {
         }
 
-        match(input,14,FOLLOW_14_in_synpred26_InternalFormat11474); if (state.failed) return ;
-        match(input,33,FOLLOW_33_in_synpred26_InternalFormat11478); if (state.failed) return ;
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4764:1: ( ( ruleJvmFormalParameter ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4765:1: ( ruleJvmFormalParameter )
+        match(input,14,FOLLOW_85); if (state.failed) return ;
+        match(input,33,FOLLOW_60); if (state.failed) return ;
+        // InternalFormat.g:4764:1: ( ( ruleJvmFormalParameter ) )
+        // InternalFormat.g:4765:1: ( ruleJvmFormalParameter )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4765:1: ( ruleJvmFormalParameter )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4766:1: ruleJvmFormalParameter
+        // InternalFormat.g:4765:1: ( ruleJvmFormalParameter )
+        // InternalFormat.g:4766:1: ruleJvmFormalParameter
         {
-        pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred26_InternalFormat11485);
+        pushFollow(FOLLOW_21);
         ruleJvmFormalParameter();
 
         state._fsp--;
@@ -26638,7 +26638,7 @@ public final void synpred26_InternalFormat_fragment() throws RecognitionExceptio
 
         }
 
-        match(input,30,FOLLOW_30_in_synpred26_InternalFormat11491); if (state.failed) return ;
+        match(input,30,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -26649,18 +26649,18 @@ public final void synpred26_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred27_InternalFormat
     public final void synpred27_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4879:7: ( ( () '[' ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4879:8: ( () '[' )
+        // InternalFormat.g:4879:7: ( ( () '[' ) )
+        // InternalFormat.g:4879:8: ( () '[' )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4879:8: ( () '[' )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4879:9: () '['
+        // InternalFormat.g:4879:8: ( () '[' )
+        // InternalFormat.g:4879:9: () '['
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4879:9: ()
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:4880:1: 
+        // InternalFormat.g:4879:9: ()
+        // InternalFormat.g:4880:1: 
         {
         }
 
-        match(input,27,FOLLOW_27_in_synpred27_InternalFormat11813); if (state.failed) return ;
+        match(input,27,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -26671,13 +26671,13 @@ public final void synpred27_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred29_InternalFormat
     public final void synpred29_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5171:4: ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5171:5: ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // InternalFormat.g:5171:4: ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
+        // InternalFormat.g:5171:5: ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5171:5: ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5171:6: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
+        // InternalFormat.g:5171:5: ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // InternalFormat.g:5171:6: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5171:6: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
+        // InternalFormat.g:5171:6: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
         int alt172=2;
         int LA172_0 = input.LA(1);
 
@@ -26686,15 +26686,15 @@ public final void synpred29_InternalFormat_fragment() throws RecognitionExceptio
         }
         switch (alt172) {
             case 1 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5171:7: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                // InternalFormat.g:5171:7: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
                 {
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5171:7: ( ( ruleJvmFormalParameter ) )
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5172:1: ( ruleJvmFormalParameter )
+                // InternalFormat.g:5171:7: ( ( ruleJvmFormalParameter ) )
+                // InternalFormat.g:5172:1: ( ruleJvmFormalParameter )
                 {
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5172:1: ( ruleJvmFormalParameter )
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5173:1: ruleJvmFormalParameter
+                // InternalFormat.g:5172:1: ( ruleJvmFormalParameter )
+                // InternalFormat.g:5173:1: ruleJvmFormalParameter
                 {
-                pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred29_InternalFormat12563);
+                pushFollow(FOLLOW_80);
                 ruleJvmFormalParameter();
 
                 state._fsp--;
@@ -26705,7 +26705,7 @@ public final void synpred29_InternalFormat_fragment() throws RecognitionExceptio
 
                 }
 
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5175:2: ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                // InternalFormat.g:5175:2: ( ',' ( ( ruleJvmFormalParameter ) ) )*
                 loop171:
                 do {
                     int alt171=2;
@@ -26718,16 +26718,16 @@ public final void synpred29_InternalFormat_fragment() throws RecognitionExceptio
 
                     switch (alt171) {
                 	case 1 :
-                	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5175:4: ',' ( ( ruleJvmFormalParameter ) )
+                	    // InternalFormat.g:5175:4: ',' ( ( ruleJvmFormalParameter ) )
                 	    {
-                	    match(input,28,FOLLOW_28_in_synpred29_InternalFormat12570); if (state.failed) return ;
-                	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5176:1: ( ( ruleJvmFormalParameter ) )
-                	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5177:1: ( ruleJvmFormalParameter )
+                	    match(input,28,FOLLOW_60); if (state.failed) return ;
+                	    // InternalFormat.g:5176:1: ( ( ruleJvmFormalParameter ) )
+                	    // InternalFormat.g:5177:1: ( ruleJvmFormalParameter )
                 	    {
-                	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5177:1: ( ruleJvmFormalParameter )
-                	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5178:1: ruleJvmFormalParameter
+                	    // InternalFormat.g:5177:1: ( ruleJvmFormalParameter )
+                	    // InternalFormat.g:5178:1: ruleJvmFormalParameter
                 	    {
-                	    pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred29_InternalFormat12577);
+                	    pushFollow(FOLLOW_80);
                 	    ruleJvmFormalParameter();
 
                 	    state._fsp--;
@@ -26753,13 +26753,13 @@ public final void synpred29_InternalFormat_fragment() throws RecognitionExceptio
 
         }
 
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5180:6: ( ( '|' ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5181:1: ( '|' )
+        // InternalFormat.g:5180:6: ( ( '|' ) )
+        // InternalFormat.g:5181:1: ( '|' )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5181:1: ( '|' )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5182:2: '|'
+        // InternalFormat.g:5181:1: ( '|' )
+        // InternalFormat.g:5182:2: '|'
         {
-        match(input,88,FOLLOW_88_in_synpred29_InternalFormat12591); if (state.failed) return ;
+        match(input,88,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -26776,10 +26776,10 @@ public final void synpred29_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred31_InternalFormat
     public final void synpred31_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5541:4: ( 'else' )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5541:6: 'else'
+        // InternalFormat.g:5541:4: ( 'else' )
+        // InternalFormat.g:5541:6: 'else'
         {
-        match(input,90,FOLLOW_90_in_synpred31_InternalFormat13374); if (state.failed) return ;
+        match(input,90,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -26787,20 +26787,20 @@ public final void synpred31_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred32_InternalFormat
     public final void synpred32_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5595:4: ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5595:5: ( '(' ( ( ruleJvmFormalParameter ) ) ':' )
+        // InternalFormat.g:5595:4: ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )
+        // InternalFormat.g:5595:5: ( '(' ( ( ruleJvmFormalParameter ) ) ':' )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5595:5: ( '(' ( ( ruleJvmFormalParameter ) ) ':' )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5595:7: '(' ( ( ruleJvmFormalParameter ) ) ':'
+        // InternalFormat.g:5595:5: ( '(' ( ( ruleJvmFormalParameter ) ) ':' )
+        // InternalFormat.g:5595:7: '(' ( ( ruleJvmFormalParameter ) ) ':'
         {
-        match(input,33,FOLLOW_33_in_synpred32_InternalFormat13513); if (state.failed) return ;
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5596:1: ( ( ruleJvmFormalParameter ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5597:1: ( ruleJvmFormalParameter )
+        match(input,33,FOLLOW_60); if (state.failed) return ;
+        // InternalFormat.g:5596:1: ( ( ruleJvmFormalParameter ) )
+        // InternalFormat.g:5597:1: ( ruleJvmFormalParameter )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5597:1: ( ruleJvmFormalParameter )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5598:1: ruleJvmFormalParameter
+        // InternalFormat.g:5597:1: ( ruleJvmFormalParameter )
+        // InternalFormat.g:5598:1: ruleJvmFormalParameter
         {
-        pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred32_InternalFormat13520);
+        pushFollow(FOLLOW_21);
         ruleJvmFormalParameter();
 
         state._fsp--;
@@ -26811,7 +26811,7 @@ public final void synpred32_InternalFormat_fragment() throws RecognitionExceptio
 
         }
 
-        match(input,30,FOLLOW_30_in_synpred32_InternalFormat13526); if (state.failed) return ;
+        match(input,30,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -26822,19 +26822,19 @@ public final void synpred32_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred33_InternalFormat
     public final void synpred33_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5650:8: ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5650:9: ( ( ( ruleJvmFormalParameter ) ) ':' )
+        // InternalFormat.g:5650:8: ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )
+        // InternalFormat.g:5650:9: ( ( ( ruleJvmFormalParameter ) ) ':' )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5650:9: ( ( ( ruleJvmFormalParameter ) ) ':' )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5650:10: ( ( ruleJvmFormalParameter ) ) ':'
+        // InternalFormat.g:5650:9: ( ( ( ruleJvmFormalParameter ) ) ':' )
+        // InternalFormat.g:5650:10: ( ( ruleJvmFormalParameter ) ) ':'
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5650:10: ( ( ruleJvmFormalParameter ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5651:1: ( ruleJvmFormalParameter )
+        // InternalFormat.g:5650:10: ( ( ruleJvmFormalParameter ) )
+        // InternalFormat.g:5651:1: ( ruleJvmFormalParameter )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5651:1: ( ruleJvmFormalParameter )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:5652:1: ruleJvmFormalParameter
+        // InternalFormat.g:5651:1: ( ruleJvmFormalParameter )
+        // InternalFormat.g:5652:1: ruleJvmFormalParameter
         {
-        pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred33_InternalFormat13628);
+        pushFollow(FOLLOW_21);
         ruleJvmFormalParameter();
 
         state._fsp--;
@@ -26845,7 +26845,7 @@ public final void synpred33_InternalFormat_fragment() throws RecognitionExceptio
 
         }
 
-        match(input,30,FOLLOW_30_in_synpred33_InternalFormat13634); if (state.failed) return ;
+        match(input,30,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -26856,19 +26856,19 @@ public final void synpred33_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred35_InternalFormat
     public final void synpred35_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6418:4: ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6418:5: ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) )
+        // InternalFormat.g:6418:4: ( ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) ) )
+        // InternalFormat.g:6418:5: ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6418:5: ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6418:6: ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) )
+        // InternalFormat.g:6418:5: ( ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) ) )
+        // InternalFormat.g:6418:6: ( ( ruleJvmTypeReference ) ) ( ( ruleValidID ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6418:6: ( ( ruleJvmTypeReference ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6419:1: ( ruleJvmTypeReference )
+        // InternalFormat.g:6418:6: ( ( ruleJvmTypeReference ) )
+        // InternalFormat.g:6419:1: ( ruleJvmTypeReference )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6419:1: ( ruleJvmTypeReference )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6420:1: ruleJvmTypeReference
+        // InternalFormat.g:6419:1: ( ruleJvmTypeReference )
+        // InternalFormat.g:6420:1: ruleJvmTypeReference
         {
-        pushFollow(FOLLOW_ruleJvmTypeReference_in_synpred35_InternalFormat15262);
+        pushFollow(FOLLOW_7);
         ruleJvmTypeReference();
 
         state._fsp--;
@@ -26879,13 +26879,13 @@ public final void synpred35_InternalFormat_fragment() throws RecognitionExceptio
 
         }
 
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6422:2: ( ( ruleValidID ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6423:1: ( ruleValidID )
+        // InternalFormat.g:6422:2: ( ( ruleValidID ) )
+        // InternalFormat.g:6423:1: ( ruleValidID )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6423:1: ( ruleValidID )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6424:1: ruleValidID
+        // InternalFormat.g:6423:1: ( ruleValidID )
+        // InternalFormat.g:6424:1: ruleValidID
         {
-        pushFollow(FOLLOW_ruleValidID_in_synpred35_InternalFormat15271);
+        pushFollow(FOLLOW_2);
         ruleValidID();
 
         state._fsp--;
@@ -26906,13 +26906,13 @@ public final void synpred35_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred36_InternalFormat
     public final void synpred36_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6707:4: ( ( '(' ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6708:1: ( '(' )
+        // InternalFormat.g:6707:4: ( ( '(' ) )
+        // InternalFormat.g:6708:1: ( '(' )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6708:1: ( '(' )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6709:2: '('
+        // InternalFormat.g:6708:1: ( '(' )
+        // InternalFormat.g:6709:2: '('
         {
-        match(input,33,FOLLOW_33_in_synpred36_InternalFormat15809); if (state.failed) return ;
+        match(input,33,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -26923,18 +26923,18 @@ public final void synpred36_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred37_InternalFormat
     public final void synpred37_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6728:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6728:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // InternalFormat.g:6728:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
+        // InternalFormat.g:6728:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6728:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6728:6: () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
+        // InternalFormat.g:6728:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // InternalFormat.g:6728:6: () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6728:6: ()
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6729:1: 
+        // InternalFormat.g:6728:6: ()
+        // InternalFormat.g:6729:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6729:2: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
+        // InternalFormat.g:6729:2: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
         int alt176=2;
         int LA176_0 = input.LA(1);
 
@@ -26943,15 +26943,15 @@ public final void synpred37_InternalFormat_fragment() throws RecognitionExceptio
         }
         switch (alt176) {
             case 1 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6729:3: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                // InternalFormat.g:6729:3: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
                 {
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6729:3: ( ( ruleJvmFormalParameter ) )
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6730:1: ( ruleJvmFormalParameter )
+                // InternalFormat.g:6729:3: ( ( ruleJvmFormalParameter ) )
+                // InternalFormat.g:6730:1: ( ruleJvmFormalParameter )
                 {
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6730:1: ( ruleJvmFormalParameter )
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6731:1: ruleJvmFormalParameter
+                // InternalFormat.g:6730:1: ( ruleJvmFormalParameter )
+                // InternalFormat.g:6731:1: ruleJvmFormalParameter
                 {
-                pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred37_InternalFormat15861);
+                pushFollow(FOLLOW_80);
                 ruleJvmFormalParameter();
 
                 state._fsp--;
@@ -26962,7 +26962,7 @@ public final void synpred37_InternalFormat_fragment() throws RecognitionExceptio
 
                 }
 
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6733:2: ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                // InternalFormat.g:6733:2: ( ',' ( ( ruleJvmFormalParameter ) ) )*
                 loop175:
                 do {
                     int alt175=2;
@@ -26975,16 +26975,16 @@ public final void synpred37_InternalFormat_fragment() throws RecognitionExceptio
 
                     switch (alt175) {
                 	case 1 :
-                	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6733:4: ',' ( ( ruleJvmFormalParameter ) )
+                	    // InternalFormat.g:6733:4: ',' ( ( ruleJvmFormalParameter ) )
                 	    {
-                	    match(input,28,FOLLOW_28_in_synpred37_InternalFormat15868); if (state.failed) return ;
-                	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6734:1: ( ( ruleJvmFormalParameter ) )
-                	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6735:1: ( ruleJvmFormalParameter )
+                	    match(input,28,FOLLOW_60); if (state.failed) return ;
+                	    // InternalFormat.g:6734:1: ( ( ruleJvmFormalParameter ) )
+                	    // InternalFormat.g:6735:1: ( ruleJvmFormalParameter )
                 	    {
-                	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6735:1: ( ruleJvmFormalParameter )
-                	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6736:1: ruleJvmFormalParameter
+                	    // InternalFormat.g:6735:1: ( ruleJvmFormalParameter )
+                	    // InternalFormat.g:6736:1: ruleJvmFormalParameter
                 	    {
-                	    pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred37_InternalFormat15875);
+                	    pushFollow(FOLLOW_80);
                 	    ruleJvmFormalParameter();
 
                 	    state._fsp--;
@@ -27010,13 +27010,13 @@ public final void synpred37_InternalFormat_fragment() throws RecognitionExceptio
 
         }
 
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6738:6: ( ( '|' ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6739:1: ( '|' )
+        // InternalFormat.g:6738:6: ( ( '|' ) )
+        // InternalFormat.g:6739:1: ( '|' )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6739:1: ( '|' )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6740:2: '|'
+        // InternalFormat.g:6739:1: ( '|' )
+        // InternalFormat.g:6740:2: '|'
         {
-        match(input,88,FOLLOW_88_in_synpred37_InternalFormat15889); if (state.failed) return ;
+        match(input,88,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -27033,18 +27033,18 @@ public final void synpred37_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred38_InternalFormat
     public final void synpred38_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6807:4: ( ( () '[' ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6807:5: ( () '[' )
+        // InternalFormat.g:6807:4: ( ( () '[' ) )
+        // InternalFormat.g:6807:5: ( () '[' )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6807:5: ( () '[' )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6807:6: () '['
+        // InternalFormat.g:6807:5: ( () '[' )
+        // InternalFormat.g:6807:6: () '['
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6807:6: ()
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6808:1: 
+        // InternalFormat.g:6807:6: ()
+        // InternalFormat.g:6808:1: 
         {
         }
 
-        match(input,27,FOLLOW_27_in_synpred38_InternalFormat16009); if (state.failed) return ;
+        match(input,27,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -27055,10 +27055,10 @@ public final void synpred38_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred39_InternalFormat
     public final void synpred39_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6972:4: ( '<' )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:6972:6: '<'
+        // InternalFormat.g:6972:4: ( '<' )
+        // InternalFormat.g:6972:6: '<'
         {
-        match(input,62,FOLLOW_62_in_synpred39_InternalFormat16458); if (state.failed) return ;
+        match(input,62,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -27066,13 +27066,13 @@ public final void synpred39_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred40_InternalFormat
     public final void synpred40_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7021:5: ( ( '(' ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7022:1: ( '(' )
+        // InternalFormat.g:7021:5: ( ( '(' ) )
+        // InternalFormat.g:7022:1: ( '(' )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7022:1: ( '(' )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7023:2: '('
+        // InternalFormat.g:7022:1: ( '(' )
+        // InternalFormat.g:7023:2: '('
         {
-        match(input,33,FOLLOW_33_in_synpred40_InternalFormat16554); if (state.failed) return ;
+        match(input,33,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -27083,18 +27083,18 @@ public final void synpred40_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred41_InternalFormat
     public final void synpred41_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7042:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7042:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // InternalFormat.g:7042:4: ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )
+        // InternalFormat.g:7042:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7042:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7042:6: () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
+        // InternalFormat.g:7042:5: ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) )
+        // InternalFormat.g:7042:6: () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7042:6: ()
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7043:1: 
+        // InternalFormat.g:7042:6: ()
+        // InternalFormat.g:7043:1: 
         {
         }
 
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7043:2: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
+        // InternalFormat.g:7043:2: ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )?
         int alt178=2;
         int LA178_0 = input.LA(1);
 
@@ -27103,15 +27103,15 @@ public final void synpred41_InternalFormat_fragment() throws RecognitionExceptio
         }
         switch (alt178) {
             case 1 :
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7043:3: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                // InternalFormat.g:7043:3: ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )*
                 {
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7043:3: ( ( ruleJvmFormalParameter ) )
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7044:1: ( ruleJvmFormalParameter )
+                // InternalFormat.g:7043:3: ( ( ruleJvmFormalParameter ) )
+                // InternalFormat.g:7044:1: ( ruleJvmFormalParameter )
                 {
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7044:1: ( ruleJvmFormalParameter )
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7045:1: ruleJvmFormalParameter
+                // InternalFormat.g:7044:1: ( ruleJvmFormalParameter )
+                // InternalFormat.g:7045:1: ruleJvmFormalParameter
                 {
-                pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred41_InternalFormat16606);
+                pushFollow(FOLLOW_80);
                 ruleJvmFormalParameter();
 
                 state._fsp--;
@@ -27122,7 +27122,7 @@ public final void synpred41_InternalFormat_fragment() throws RecognitionExceptio
 
                 }
 
-                // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7047:2: ( ',' ( ( ruleJvmFormalParameter ) ) )*
+                // InternalFormat.g:7047:2: ( ',' ( ( ruleJvmFormalParameter ) ) )*
                 loop177:
                 do {
                     int alt177=2;
@@ -27135,16 +27135,16 @@ public final void synpred41_InternalFormat_fragment() throws RecognitionExceptio
 
                     switch (alt177) {
                 	case 1 :
-                	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7047:4: ',' ( ( ruleJvmFormalParameter ) )
+                	    // InternalFormat.g:7047:4: ',' ( ( ruleJvmFormalParameter ) )
                 	    {
-                	    match(input,28,FOLLOW_28_in_synpred41_InternalFormat16613); if (state.failed) return ;
-                	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7048:1: ( ( ruleJvmFormalParameter ) )
-                	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7049:1: ( ruleJvmFormalParameter )
+                	    match(input,28,FOLLOW_60); if (state.failed) return ;
+                	    // InternalFormat.g:7048:1: ( ( ruleJvmFormalParameter ) )
+                	    // InternalFormat.g:7049:1: ( ruleJvmFormalParameter )
                 	    {
-                	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7049:1: ( ruleJvmFormalParameter )
-                	    // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7050:1: ruleJvmFormalParameter
+                	    // InternalFormat.g:7049:1: ( ruleJvmFormalParameter )
+                	    // InternalFormat.g:7050:1: ruleJvmFormalParameter
                 	    {
-                	    pushFollow(FOLLOW_ruleJvmFormalParameter_in_synpred41_InternalFormat16620);
+                	    pushFollow(FOLLOW_80);
                 	    ruleJvmFormalParameter();
 
                 	    state._fsp--;
@@ -27170,13 +27170,13 @@ public final void synpred41_InternalFormat_fragment() throws RecognitionExceptio
 
         }
 
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7052:6: ( ( '|' ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7053:1: ( '|' )
+        // InternalFormat.g:7052:6: ( ( '|' ) )
+        // InternalFormat.g:7053:1: ( '|' )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7053:1: ( '|' )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7054:2: '|'
+        // InternalFormat.g:7053:1: ( '|' )
+        // InternalFormat.g:7054:2: '|'
         {
-        match(input,88,FOLLOW_88_in_synpred41_InternalFormat16634); if (state.failed) return ;
+        match(input,88,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -27193,18 +27193,18 @@ public final void synpred41_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred42_InternalFormat
     public final void synpred42_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7121:4: ( ( () '[' ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7121:5: ( () '[' )
+        // InternalFormat.g:7121:4: ( ( () '[' ) )
+        // InternalFormat.g:7121:5: ( () '[' )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7121:5: ( () '[' )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7121:6: () '['
+        // InternalFormat.g:7121:5: ( () '[' )
+        // InternalFormat.g:7121:6: () '['
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7121:6: ()
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7122:1: 
+        // InternalFormat.g:7121:6: ()
+        // InternalFormat.g:7122:1: 
         {
         }
 
-        match(input,27,FOLLOW_27_in_synpred42_InternalFormat16754); if (state.failed) return ;
+        match(input,27,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -27215,8 +27215,8 @@ public final void synpred42_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred43_InternalFormat
     public final void synpred43_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7461:2: ( 'context' | 'currentColumn' | 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:
+        // InternalFormat.g:7461:2: ( 'context' | 'currentColumn' | 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )
+        // InternalFormat.g:
         {
         if ( (input.LA(1)>=RULE_ID && input.LA(1)<=RULE_DECIMAL)||input.LA(1)==14||input.LA(1)==16||input.LA(1)==23||input.LA(1)==27||input.LA(1)==33||(input.LA(1)>=54 && input.LA(1)<=56)||input.LA(1)==62||(input.LA(1)>=77 && input.LA(1)<=78)||input.LA(1)==82||input.LA(1)==89||input.LA(1)==91||(input.LA(1)>=93 && input.LA(1)<=94)||(input.LA(1)>=96 && input.LA(1)<=107)||input.LA(1)==109 ) {
             input.consume();
@@ -27235,10 +27235,10 @@ public final void synpred43_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred44_InternalFormat
     public final void synpred44_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7557:5: ( 'catch' )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7557:7: 'catch'
+        // InternalFormat.g:7557:5: ( 'catch' )
+        // InternalFormat.g:7557:7: 'catch'
         {
-        match(input,110,FOLLOW_110_in_synpred44_InternalFormat17941); if (state.failed) return ;
+        match(input,110,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -27246,10 +27246,10 @@ public final void synpred44_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred45_InternalFormat
     public final void synpred45_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7576:5: ( 'finally' )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7576:7: 'finally'
+        // InternalFormat.g:7576:5: ( 'finally' )
+        // InternalFormat.g:7576:7: 'finally'
         {
-        match(input,108,FOLLOW_108_in_synpred45_InternalFormat17971); if (state.failed) return ;
+        match(input,108,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -27257,10 +27257,10 @@ public final void synpred45_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred48_InternalFormat
     public final void synpred48_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7802:3: ( '.' )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7803:2: '.'
+        // InternalFormat.g:7802:3: ( '.' )
+        // InternalFormat.g:7803:2: '.'
         {
-        match(input,36,FOLLOW_36_in_synpred48_InternalFormat18496); if (state.failed) return ;
+        match(input,36,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -27268,18 +27268,18 @@ public final void synpred48_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred49_InternalFormat
     public final void synpred49_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7928:2: ( ( () ruleArrayBrackets ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7928:3: ( () ruleArrayBrackets )
+        // InternalFormat.g:7928:2: ( ( () ruleArrayBrackets ) )
+        // InternalFormat.g:7928:3: ( () ruleArrayBrackets )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7928:3: ( () ruleArrayBrackets )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7928:4: () ruleArrayBrackets
+        // InternalFormat.g:7928:3: ( () ruleArrayBrackets )
+        // InternalFormat.g:7928:4: () ruleArrayBrackets
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7928:4: ()
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:7929:1: 
+        // InternalFormat.g:7928:4: ()
+        // InternalFormat.g:7929:1: 
         {
         }
 
-        pushFollow(FOLLOW_ruleArrayBrackets_in_synpred49_InternalFormat18881);
+        pushFollow(FOLLOW_2);
         ruleArrayBrackets();
 
         state._fsp--;
@@ -27294,10 +27294,10 @@ public final void synpred49_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred50_InternalFormat
     public final void synpred50_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8113:4: ( '<' )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8113:6: '<'
+        // InternalFormat.g:8113:4: ( '<' )
+        // InternalFormat.g:8113:6: '<'
         {
-        match(input,62,FOLLOW_62_in_synpred50_InternalFormat19333); if (state.failed) return ;
+        match(input,62,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -27305,18 +27305,18 @@ public final void synpred50_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred51_InternalFormat
     public final void synpred51_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8162:3: ( ( () '.' ) )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8162:4: ( () '.' )
+        // InternalFormat.g:8162:3: ( ( () '.' ) )
+        // InternalFormat.g:8162:4: ( () '.' )
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8162:4: ( () '.' )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8162:5: () '.'
+        // InternalFormat.g:8162:4: ( () '.' )
+        // InternalFormat.g:8162:5: () '.'
         {
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8162:5: ()
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8163:1: 
+        // InternalFormat.g:8162:5: ()
+        // InternalFormat.g:8163:1: 
         {
         }
 
-        match(input,36,FOLLOW_36_in_synpred51_InternalFormat19428); if (state.failed) return ;
+        match(input,36,FOLLOW_2); if (state.failed) return ;
 
         }
 
@@ -27327,10 +27327,10 @@ public final void synpred51_InternalFormat_fragment() throws RecognitionExceptio
 
     // $ANTLR start synpred52_InternalFormat
     public final void synpred52_InternalFormat_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8189:4: ( '<' )
-        // ../com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/parser/antlr/internal/InternalFormat.g:8189:6: '<'
+        // InternalFormat.g:8189:4: ( '<' )
+        // InternalFormat.g:8189:6: '<'
         {
-        match(input,62,FOLLOW_62_in_synpred52_InternalFormat19485); if (state.failed) return ;
+        match(input,62,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -27996,19 +27996,13 @@ public final boolean synpred18_InternalFormat() {
     protected DFA156 dfa156 = new DFA156(this);
     protected DFA154 dfa154 = new DFA154(this);
     protected DFA163 dfa163 = new DFA163(this);
-    static final String DFA29_eotS =
-        "\14\uffff";
-    static final String DFA29_eofS =
-        "\1\5\4\6\4\uffff\3\6";
-    static final String DFA29_minS =
-        "\5\4\3\uffff\4\4";
-    static final String DFA29_maxS =
-        "\5\165\3\uffff\1\64\3\165";
-    static final String DFA29_acceptS =
-        "\5\uffff\1\3\1\1\1\2\4\uffff";
-    static final String DFA29_specialS =
-        "\14\uffff}>";
-    static final String[] DFA29_transitionS = {
+    static final String dfa_1s = "\14\uffff";
+    static final String dfa_2s = "\1\5\4\6\4\uffff\3\6";
+    static final String dfa_3s = "\5\4\3\uffff\4\4";
+    static final String dfa_4s = "\5\165\3\uffff\1\64\3\165";
+    static final String dfa_5s = "\5\uffff\1\3\1\1\1\2\4\uffff";
+    static final String dfa_6s = "\14\uffff}>";
+    static final String[] dfa_7s = {
             "\1\2\1\uffff\1\1\54\uffff\1\3\1\4\74\uffff\5\5",
             "\1\7\1\uffff\1\7\54\uffff\2\7\74\uffff\5\6",
             "\1\7\1\uffff\1\7\35\uffff\1\10\16\uffff\2\7\74\uffff\5\6",
@@ -28023,56 +28017,38 @@ public final boolean synpred18_InternalFormat() {
             "\1\7\1\uffff\1\7\35\uffff\1\10\16\uffff\2\7\74\uffff\5\6"
     };
 
-    static final short[] DFA29_eot = DFA.unpackEncodedString(DFA29_eotS);
-    static final short[] DFA29_eof = DFA.unpackEncodedString(DFA29_eofS);
-    static final char[] DFA29_min = DFA.unpackEncodedStringToUnsignedChars(DFA29_minS);
-    static final char[] DFA29_max = DFA.unpackEncodedStringToUnsignedChars(DFA29_maxS);
-    static final short[] DFA29_accept = DFA.unpackEncodedString(DFA29_acceptS);
-    static final short[] DFA29_special = DFA.unpackEncodedString(DFA29_specialS);
-    static final short[][] DFA29_transition;
-
-    static {
-        int numStates = DFA29_transitionS.length;
-        DFA29_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA29_transition[i] = DFA.unpackEncodedString(DFA29_transitionS[i]);
-        }
-    }
+    static final short[] dfa_1 = DFA.unpackEncodedString(dfa_1s);
+    static final short[] dfa_2 = DFA.unpackEncodedString(dfa_2s);
+    static final char[] dfa_3 = DFA.unpackEncodedStringToUnsignedChars(dfa_3s);
+    static final char[] dfa_4 = DFA.unpackEncodedStringToUnsignedChars(dfa_4s);
+    static final short[] dfa_5 = DFA.unpackEncodedString(dfa_5s);
+    static final short[] dfa_6 = DFA.unpackEncodedString(dfa_6s);
+    static final short[][] dfa_7 = unpackEncodedStringArray(dfa_7s);
 
     class DFA29 extends DFA {
 
         public DFA29(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 29;
-            this.eot = DFA29_eot;
-            this.eof = DFA29_eof;
-            this.min = DFA29_min;
-            this.max = DFA29_max;
-            this.accept = DFA29_accept;
-            this.special = DFA29_special;
-            this.transition = DFA29_transition;
+            this.eot = dfa_1;
+            this.eof = dfa_2;
+            this.min = dfa_3;
+            this.max = dfa_4;
+            this.accept = dfa_5;
+            this.special = dfa_6;
+            this.transition = dfa_7;
         }
         public String getDescription() {
             return "1721:1: ( ( (lv_value_2_0= ruleIntValue ) ) | ( ( (lv_minimum_3_0= ruleIntValue ) ) ( (lv_default_4_0= ruleIntValue ) ) ( (lv_maximum_5_0= ruleIntValue ) ) ) )?";
         }
     }
-    static final String DFA45_eotS =
-        "\46\uffff";
-    static final String DFA45_eofS =
-        "\46\uffff";
-    static final String DFA45_minS =
-        "\1\4\3\0\42\uffff";
-    static final String DFA45_maxS =
-        "\1\155\3\0\42\uffff";
-    static final String DFA45_acceptS =
-        "\4\uffff\1\2\37\uffff\1\3\1\1";
-    static final String DFA45_specialS =
-        "\1\uffff\1\0\1\1\1\2\42\uffff}>";
-    static final String[] DFA45_transitionS = {
-            "\1\3\4\4\5\uffff\1\4\1\uffff\1\4\6\uffff\1\4\2\uffff\2\4\5"+
-            "\uffff\1\4\1\44\23\uffff\1\1\1\2\1\4\5\uffff\1\4\16\uffff\2"+
-            "\4\3\uffff\1\4\6\uffff\1\4\1\uffff\1\4\1\uffff\2\4\1\uffff\14"+
-            "\4\1\uffff\1\4",
+    static final String dfa_8s = "\46\uffff";
+    static final String dfa_9s = "\1\4\3\0\42\uffff";
+    static final String dfa_10s = "\1\155\3\0\42\uffff";
+    static final String dfa_11s = "\4\uffff\1\2\37\uffff\1\3\1\1";
+    static final String dfa_12s = "\1\uffff\1\0\1\1\1\2\42\uffff}>";
+    static final String[] dfa_13s = {
+            "\1\3\4\4\5\uffff\1\4\1\uffff\1\4\6\uffff\1\4\2\uffff\2\4\5\uffff\1\4\1\44\23\uffff\1\1\1\2\1\4\5\uffff\1\4\16\uffff\2\4\3\uffff\1\4\6\uffff\1\4\1\uffff\1\4\1\uffff\2\4\1\uffff\14\4\1\uffff\1\4",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -28112,34 +28088,25 @@ public String getDescription() {
             ""
     };
 
-    static final short[] DFA45_eot = DFA.unpackEncodedString(DFA45_eotS);
-    static final short[] DFA45_eof = DFA.unpackEncodedString(DFA45_eofS);
-    static final char[] DFA45_min = DFA.unpackEncodedStringToUnsignedChars(DFA45_minS);
-    static final char[] DFA45_max = DFA.unpackEncodedStringToUnsignedChars(DFA45_maxS);
-    static final short[] DFA45_accept = DFA.unpackEncodedString(DFA45_acceptS);
-    static final short[] DFA45_special = DFA.unpackEncodedString(DFA45_specialS);
-    static final short[][] DFA45_transition;
-
-    static {
-        int numStates = DFA45_transitionS.length;
-        DFA45_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA45_transition[i] = DFA.unpackEncodedString(DFA45_transitionS[i]);
-        }
-    }
+    static final short[] dfa_8 = DFA.unpackEncodedString(dfa_8s);
+    static final char[] dfa_9 = DFA.unpackEncodedStringToUnsignedChars(dfa_9s);
+    static final char[] dfa_10 = DFA.unpackEncodedStringToUnsignedChars(dfa_10s);
+    static final short[] dfa_11 = DFA.unpackEncodedString(dfa_11s);
+    static final short[] dfa_12 = DFA.unpackEncodedString(dfa_12s);
+    static final short[][] dfa_13 = unpackEncodedStringArray(dfa_13s);
 
     class DFA45 extends DFA {
 
         public DFA45(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 45;
-            this.eot = DFA45_eot;
-            this.eof = DFA45_eof;
-            this.min = DFA45_min;
-            this.max = DFA45_max;
-            this.accept = DFA45_accept;
-            this.special = DFA45_special;
-            this.transition = DFA45_transition;
+            this.eot = dfa_8;
+            this.eof = dfa_8;
+            this.min = dfa_9;
+            this.max = dfa_10;
+            this.accept = dfa_11;
+            this.special = dfa_12;
+            this.transition = dfa_13;
         }
         public String getDescription() {
             return "2465:2: ( ( ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_4_0= ruleXAnnotationElementValuePair ) ) (otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) )* ) | ( (lv_value_7_0= ruleXAnnotationElementValueOrCommaList ) ) )?";
@@ -28201,22 +28168,13 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA51_eotS =
-        "\45\uffff";
-    static final String DFA51_eofS =
-        "\45\uffff";
-    static final String DFA51_minS =
-        "\1\4\1\0\43\uffff";
-    static final String DFA51_maxS =
-        "\1\155\1\0\43\uffff";
-    static final String DFA51_acceptS =
-        "\2\uffff\1\2\41\uffff\1\1";
-    static final String DFA51_specialS =
-        "\1\uffff\1\0\43\uffff}>";
-    static final String[] DFA51_transitionS = {
-            "\5\2\5\uffff\1\2\1\uffff\1\2\6\uffff\1\2\2\uffff\2\2\5\uffff"+
-            "\1\2\24\uffff\2\2\1\1\5\uffff\1\2\16\uffff\2\2\3\uffff\1\2\6"+
-            "\uffff\1\2\1\uffff\1\2\1\uffff\2\2\1\uffff\14\2\1\uffff\1\2",
+    static final String dfa_14s = "\45\uffff";
+    static final String dfa_15s = "\1\4\1\0\43\uffff";
+    static final String dfa_16s = "\1\155\1\0\43\uffff";
+    static final String dfa_17s = "\2\uffff\1\2\41\uffff\1\1";
+    static final String dfa_18s = "\1\uffff\1\0\43\uffff}>";
+    static final String[] dfa_19s = {
+            "\5\2\5\uffff\1\2\1\uffff\1\2\6\uffff\1\2\2\uffff\2\2\5\uffff\1\2\24\uffff\2\2\1\1\5\uffff\1\2\16\uffff\2\2\3\uffff\1\2\6\uffff\1\2\1\uffff\1\2\1\uffff\2\2\1\uffff\14\2\1\uffff\1\2",
             "\1\uffff",
             "",
             "",
@@ -28255,34 +28213,25 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA51_eot = DFA.unpackEncodedString(DFA51_eotS);
-    static final short[] DFA51_eof = DFA.unpackEncodedString(DFA51_eofS);
-    static final char[] DFA51_min = DFA.unpackEncodedStringToUnsignedChars(DFA51_minS);
-    static final char[] DFA51_max = DFA.unpackEncodedStringToUnsignedChars(DFA51_maxS);
-    static final short[] DFA51_accept = DFA.unpackEncodedString(DFA51_acceptS);
-    static final short[] DFA51_special = DFA.unpackEncodedString(DFA51_specialS);
-    static final short[][] DFA51_transition;
-
-    static {
-        int numStates = DFA51_transitionS.length;
-        DFA51_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA51_transition[i] = DFA.unpackEncodedString(DFA51_transitionS[i]);
-        }
-    }
+    static final short[] dfa_14 = DFA.unpackEncodedString(dfa_14s);
+    static final char[] dfa_15 = DFA.unpackEncodedStringToUnsignedChars(dfa_15s);
+    static final char[] dfa_16 = DFA.unpackEncodedStringToUnsignedChars(dfa_16s);
+    static final short[] dfa_17 = DFA.unpackEncodedString(dfa_17s);
+    static final short[] dfa_18 = DFA.unpackEncodedString(dfa_18s);
+    static final short[][] dfa_19 = unpackEncodedStringArray(dfa_19s);
 
     class DFA51 extends DFA {
 
         public DFA51(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 51;
-            this.eot = DFA51_eot;
-            this.eof = DFA51_eof;
-            this.min = DFA51_min;
-            this.max = DFA51_max;
-            this.accept = DFA51_accept;
-            this.special = DFA51_special;
-            this.transition = DFA51_transition;
+            this.eot = dfa_14;
+            this.eof = dfa_14;
+            this.min = dfa_15;
+            this.max = dfa_16;
+            this.accept = dfa_17;
+            this.special = dfa_18;
+            this.transition = dfa_19;
         }
         public String getDescription() {
             return "2622:1: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | (this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression ( () (otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) )+ )? ) )";
@@ -28314,88 +28263,19 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA54_eotS =
-        "\45\uffff";
-    static final String DFA54_eofS =
-        "\45\uffff";
-    static final String DFA54_minS =
-        "\1\4\1\0\43\uffff";
-    static final String DFA54_maxS =
-        "\1\155\1\0\43\uffff";
-    static final String DFA54_acceptS =
-        "\2\uffff\1\2\41\uffff\1\1";
-    static final String DFA54_specialS =
-        "\1\uffff\1\0\43\uffff}>";
-    static final String[] DFA54_transitionS = {
-            "\5\2\5\uffff\1\2\1\uffff\1\2\6\uffff\1\2\2\uffff\2\2\5\uffff"+
-            "\1\2\24\uffff\2\2\1\1\5\uffff\1\2\16\uffff\2\2\3\uffff\1\2\6"+
-            "\uffff\1\2\1\uffff\1\2\1\uffff\2\2\1\uffff\14\2\1\uffff\1\2",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA54_eot = DFA.unpackEncodedString(DFA54_eotS);
-    static final short[] DFA54_eof = DFA.unpackEncodedString(DFA54_eofS);
-    static final char[] DFA54_min = DFA.unpackEncodedStringToUnsignedChars(DFA54_minS);
-    static final char[] DFA54_max = DFA.unpackEncodedStringToUnsignedChars(DFA54_maxS);
-    static final short[] DFA54_accept = DFA.unpackEncodedString(DFA54_acceptS);
-    static final short[] DFA54_special = DFA.unpackEncodedString(DFA54_specialS);
-    static final short[][] DFA54_transition;
-
-    static {
-        int numStates = DFA54_transitionS.length;
-        DFA54_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA54_transition[i] = DFA.unpackEncodedString(DFA54_transitionS[i]);
-        }
-    }
 
     class DFA54 extends DFA {
 
         public DFA54(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 54;
-            this.eot = DFA54_eot;
-            this.eof = DFA54_eof;
-            this.min = DFA54_min;
-            this.max = DFA54_max;
-            this.accept = DFA54_accept;
-            this.special = DFA54_special;
-            this.transition = DFA54_transition;
+            this.eot = dfa_14;
+            this.eof = dfa_14;
+            this.min = dfa_15;
+            this.max = dfa_16;
+            this.accept = dfa_17;
+            this.special = dfa_18;
+            this.transition = dfa_19;
         }
         public String getDescription() {
             return "2742:1: ( ( ( ( ( () '#' '[' ) )=> ( () otherlv_1= '#' otherlv_2= '[' ) ) ( ( (lv_elements_3_0= ruleXAnnotationOrExpression ) ) (otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) )* )? otherlv_6= ']' ) | this_XAnnotationOrExpression_7= ruleXAnnotationOrExpression )";
@@ -28427,97 +28307,56 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA57_eotS =
-        "\12\uffff";
-    static final String DFA57_eofS =
-        "\1\uffff\7\10\2\uffff";
-    static final String DFA57_minS =
-        "\10\4\2\uffff";
-    static final String DFA57_maxS =
-        "\1\155\7\156\2\uffff";
-    static final String DFA57_acceptS =
-        "\10\uffff\1\2\1\1";
-    static final String DFA57_specialS =
-        "\12\uffff}>";
-    static final String[] DFA57_transitionS = {
-            "\1\3\4\10\5\uffff\1\10\1\uffff\1\4\6\uffff\1\10\3\uffff\1\10"+
-            "\5\uffff\1\10\24\uffff\1\1\1\2\1\10\5\uffff\1\10\16\uffff\2"+
-            "\10\3\uffff\1\10\6\uffff\1\10\1\uffff\1\10\1\uffff\2\10\1\uffff"+
-            "\1\5\1\6\1\7\11\10\1\uffff\1\10",
-            "\5\10\5\uffff\1\10\1\uffff\1\10\1\uffff\1\10\2\uffff\1\11"+
-            "\1\uffff\3\10\1\uffff\4\10\1\uffff\3\10\1\uffff\1\10\16\uffff"+
-            "\2\10\1\uffff\42\10\1\uffff\26\10",
-            "\5\10\5\uffff\1\10\1\uffff\1\10\1\uffff\1\10\2\uffff\1\11"+
-            "\1\uffff\3\10\1\uffff\4\10\1\uffff\3\10\1\uffff\1\10\16\uffff"+
-            "\2\10\1\uffff\42\10\1\uffff\26\10",
-            "\5\10\5\uffff\1\10\1\uffff\1\10\1\uffff\1\10\2\uffff\1\11"+
-            "\1\uffff\3\10\1\uffff\4\10\1\uffff\3\10\1\uffff\1\10\16\uffff"+
-            "\2\10\1\uffff\42\10\1\uffff\26\10",
-            "\5\10\5\uffff\1\10\1\uffff\1\10\1\uffff\1\10\2\uffff\1\11"+
-            "\1\uffff\3\10\1\uffff\4\10\1\uffff\3\10\1\uffff\1\10\16\uffff"+
-            "\2\10\1\uffff\42\10\1\uffff\26\10",
-            "\5\10\5\uffff\1\10\1\uffff\1\10\1\uffff\1\10\2\uffff\1\11"+
-            "\1\uffff\3\10\1\uffff\4\10\1\uffff\3\10\1\uffff\1\10\16\uffff"+
-            "\2\10\1\uffff\42\10\1\uffff\26\10",
-            "\5\10\5\uffff\1\10\1\uffff\1\10\1\uffff\1\10\2\uffff\1\11"+
-            "\1\uffff\3\10\1\uffff\4\10\1\uffff\3\10\1\uffff\1\10\16\uffff"+
-            "\2\10\1\uffff\42\10\1\uffff\26\10",
-            "\5\10\5\uffff\1\10\1\uffff\1\10\1\uffff\1\10\2\uffff\1\11"+
-            "\1\uffff\3\10\1\uffff\4\10\1\uffff\3\10\1\uffff\1\10\16\uffff"+
-            "\2\10\1\uffff\42\10\1\uffff\26\10",
+    static final String dfa_20s = "\12\uffff";
+    static final String dfa_21s = "\1\uffff\7\10\2\uffff";
+    static final String dfa_22s = "\10\4\2\uffff";
+    static final String dfa_23s = "\1\155\7\156\2\uffff";
+    static final String dfa_24s = "\10\uffff\1\2\1\1";
+    static final String dfa_25s = "\12\uffff}>";
+    static final String[] dfa_26s = {
+            "\1\3\4\10\5\uffff\1\10\1\uffff\1\4\6\uffff\1\10\3\uffff\1\10\5\uffff\1\10\24\uffff\1\1\1\2\1\10\5\uffff\1\10\16\uffff\2\10\3\uffff\1\10\6\uffff\1\10\1\uffff\1\10\1\uffff\2\10\1\uffff\1\5\1\6\1\7\11\10\1\uffff\1\10",
+            "\5\10\5\uffff\1\10\1\uffff\1\10\1\uffff\1\10\2\uffff\1\11\1\uffff\3\10\1\uffff\4\10\1\uffff\3\10\1\uffff\1\10\16\uffff\2\10\1\uffff\42\10\1\uffff\26\10",
+            "\5\10\5\uffff\1\10\1\uffff\1\10\1\uffff\1\10\2\uffff\1\11\1\uffff\3\10\1\uffff\4\10\1\uffff\3\10\1\uffff\1\10\16\uffff\2\10\1\uffff\42\10\1\uffff\26\10",
+            "\5\10\5\uffff\1\10\1\uffff\1\10\1\uffff\1\10\2\uffff\1\11\1\uffff\3\10\1\uffff\4\10\1\uffff\3\10\1\uffff\1\10\16\uffff\2\10\1\uffff\42\10\1\uffff\26\10",
+            "\5\10\5\uffff\1\10\1\uffff\1\10\1\uffff\1\10\2\uffff\1\11\1\uffff\3\10\1\uffff\4\10\1\uffff\3\10\1\uffff\1\10\16\uffff\2\10\1\uffff\42\10\1\uffff\26\10",
+            "\5\10\5\uffff\1\10\1\uffff\1\10\1\uffff\1\10\2\uffff\1\11\1\uffff\3\10\1\uffff\4\10\1\uffff\3\10\1\uffff\1\10\16\uffff\2\10\1\uffff\42\10\1\uffff\26\10",
+            "\5\10\5\uffff\1\10\1\uffff\1\10\1\uffff\1\10\2\uffff\1\11\1\uffff\3\10\1\uffff\4\10\1\uffff\3\10\1\uffff\1\10\16\uffff\2\10\1\uffff\42\10\1\uffff\26\10",
+            "\5\10\5\uffff\1\10\1\uffff\1\10\1\uffff\1\10\2\uffff\1\11\1\uffff\3\10\1\uffff\4\10\1\uffff\3\10\1\uffff\1\10\16\uffff\2\10\1\uffff\42\10\1\uffff\26\10",
             "",
             ""
     };
 
-    static final short[] DFA57_eot = DFA.unpackEncodedString(DFA57_eotS);
-    static final short[] DFA57_eof = DFA.unpackEncodedString(DFA57_eofS);
-    static final char[] DFA57_min = DFA.unpackEncodedStringToUnsignedChars(DFA57_minS);
-    static final char[] DFA57_max = DFA.unpackEncodedStringToUnsignedChars(DFA57_maxS);
-    static final short[] DFA57_accept = DFA.unpackEncodedString(DFA57_acceptS);
-    static final short[] DFA57_special = DFA.unpackEncodedString(DFA57_specialS);
-    static final short[][] DFA57_transition;
-
-    static {
-        int numStates = DFA57_transitionS.length;
-        DFA57_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA57_transition[i] = DFA.unpackEncodedString(DFA57_transitionS[i]);
-        }
-    }
+    static final short[] dfa_20 = DFA.unpackEncodedString(dfa_20s);
+    static final short[] dfa_21 = DFA.unpackEncodedString(dfa_21s);
+    static final char[] dfa_22 = DFA.unpackEncodedStringToUnsignedChars(dfa_22s);
+    static final char[] dfa_23 = DFA.unpackEncodedStringToUnsignedChars(dfa_23s);
+    static final short[] dfa_24 = DFA.unpackEncodedString(dfa_24s);
+    static final short[] dfa_25 = DFA.unpackEncodedString(dfa_25s);
+    static final short[][] dfa_26 = unpackEncodedStringArray(dfa_26s);
 
     class DFA57 extends DFA {
 
         public DFA57(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 57;
-            this.eot = DFA57_eot;
-            this.eof = DFA57_eof;
-            this.min = DFA57_min;
-            this.max = DFA57_max;
-            this.accept = DFA57_accept;
-            this.special = DFA57_special;
-            this.transition = DFA57_transition;
+            this.eot = dfa_20;
+            this.eof = dfa_21;
+            this.min = dfa_22;
+            this.max = dfa_23;
+            this.accept = dfa_24;
+            this.special = dfa_25;
+            this.transition = dfa_26;
         }
         public String getDescription() {
             return "2904:1: ( ( () ( ( ruleFeatureCallID ) ) ruleOpSingleAssign ( (lv_value_3_0= ruleXAssignment ) ) ) | (this_XOrExpression_4= ruleXOrExpression ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )? ) )";
         }
     }
-    static final String DFA56_eotS =
-        "\12\uffff";
-    static final String DFA56_eofS =
-        "\1\10\11\uffff";
-    static final String DFA56_minS =
-        "\1\4\7\0\2\uffff";
-    static final String DFA56_maxS =
-        "\1\156\7\0\2\uffff";
-    static final String DFA56_acceptS =
-        "\10\uffff\1\2\1\1";
-    static final String DFA56_specialS =
-        "\1\uffff\1\2\1\3\1\4\1\5\1\6\1\1\1\0\2\uffff}>";
-    static final String[] DFA56_transitionS = {
-            "\5\10\5\uffff\1\10\1\uffff\1\10\1\uffff\1\10\4\uffff\3\10\1"+
-            "\uffff\4\10\1\uffff\3\10\1\uffff\1\10\16\uffff\2\10\1\uffff"+
-            "\3\10\1\1\1\2\1\3\1\4\1\5\1\6\1\7\30\10\1\uffff\26\10",
+    static final String dfa_27s = "\1\10\11\uffff";
+    static final String dfa_28s = "\1\4\7\0\2\uffff";
+    static final String dfa_29s = "\1\156\7\0\2\uffff";
+    static final String dfa_30s = "\1\uffff\1\2\1\3\1\4\1\5\1\6\1\1\1\0\2\uffff}>";
+    static final String[] dfa_31s = {
+            "\5\10\5\uffff\1\10\1\uffff\1\10\1\uffff\1\10\4\uffff\3\10\1\uffff\4\10\1\uffff\3\10\1\uffff\1\10\16\uffff\2\10\1\uffff\3\10\1\1\1\2\1\3\1\4\1\5\1\6\1\7\30\10\1\uffff\26\10",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -28528,35 +28367,24 @@ public String getDescription() {
             "",
             ""
     };
-
-    static final short[] DFA56_eot = DFA.unpackEncodedString(DFA56_eotS);
-    static final short[] DFA56_eof = DFA.unpackEncodedString(DFA56_eofS);
-    static final char[] DFA56_min = DFA.unpackEncodedStringToUnsignedChars(DFA56_minS);
-    static final char[] DFA56_max = DFA.unpackEncodedStringToUnsignedChars(DFA56_maxS);
-    static final short[] DFA56_accept = DFA.unpackEncodedString(DFA56_acceptS);
-    static final short[] DFA56_special = DFA.unpackEncodedString(DFA56_specialS);
-    static final short[][] DFA56_transition;
-
-    static {
-        int numStates = DFA56_transitionS.length;
-        DFA56_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA56_transition[i] = DFA.unpackEncodedString(DFA56_transitionS[i]);
-        }
-    }
+    static final short[] dfa_27 = DFA.unpackEncodedString(dfa_27s);
+    static final char[] dfa_28 = DFA.unpackEncodedStringToUnsignedChars(dfa_28s);
+    static final char[] dfa_29 = DFA.unpackEncodedStringToUnsignedChars(dfa_29s);
+    static final short[] dfa_30 = DFA.unpackEncodedString(dfa_30s);
+    static final short[][] dfa_31 = unpackEncodedStringArray(dfa_31s);
 
     class DFA56 extends DFA {
 
         public DFA56(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 56;
-            this.eot = DFA56_eot;
-            this.eof = DFA56_eof;
-            this.min = DFA56_min;
-            this.max = DFA56_max;
-            this.accept = DFA56_accept;
-            this.special = DFA56_special;
-            this.transition = DFA56_transition;
+            this.eot = dfa_20;
+            this.eof = dfa_27;
+            this.min = dfa_28;
+            this.max = dfa_29;
+            this.accept = dfa_24;
+            this.special = dfa_30;
+            this.transition = dfa_31;
         }
         public String getDescription() {
             return "2961:1: ( ( ( ( () ( ( ruleOpMultiAssign ) ) ) )=> ( () ( ( ruleOpMultiAssign ) ) ) ) ( (lv_rightOperand_7_0= ruleXAssignment ) ) )?";
@@ -28678,22 +28506,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA66_eotS =
-        "\13\uffff";
-    static final String DFA66_eofS =
-        "\1\1\12\uffff";
-    static final String DFA66_minS =
-        "\1\4\1\uffff\10\0\1\uffff";
-    static final String DFA66_maxS =
-        "\1\156\1\uffff\10\0\1\uffff";
-    static final String DFA66_acceptS =
-        "\1\uffff\1\2\10\uffff\1\1";
-    static final String DFA66_specialS =
-        "\2\uffff\1\0\1\4\1\6\1\7\1\3\1\5\1\1\1\2\1\uffff}>";
-    static final String[] DFA66_transitionS = {
-            "\5\1\5\uffff\1\1\1\uffff\1\1\1\uffff\1\1\4\uffff\3\1\1\uffff"+
-            "\4\1\1\uffff\1\7\2\1\1\uffff\1\1\16\uffff\2\1\1\uffff\10\1\1"+
-            "\2\1\3\10\1\1\4\1\5\1\6\1\10\1\11\13\1\1\uffff\26\1",
+    static final String dfa_32s = "\13\uffff";
+    static final String dfa_33s = "\1\1\12\uffff";
+    static final String dfa_34s = "\1\4\1\uffff\10\0\1\uffff";
+    static final String dfa_35s = "\1\156\1\uffff\10\0\1\uffff";
+    static final String dfa_36s = "\1\uffff\1\2\10\uffff\1\1";
+    static final String dfa_37s = "\2\uffff\1\0\1\4\1\6\1\7\1\3\1\5\1\1\1\2\1\uffff}>";
+    static final String[] dfa_38s = {
+            "\5\1\5\uffff\1\1\1\uffff\1\1\1\uffff\1\1\4\uffff\3\1\1\uffff\4\1\1\uffff\1\7\2\1\1\uffff\1\1\16\uffff\2\1\1\uffff\10\1\1\2\1\3\10\1\1\4\1\5\1\6\1\10\1\11\13\1\1\uffff\26\1",
             "",
             "\1\uffff",
             "\1\uffff",
@@ -28706,34 +28526,26 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA66_eot = DFA.unpackEncodedString(DFA66_eotS);
-    static final short[] DFA66_eof = DFA.unpackEncodedString(DFA66_eofS);
-    static final char[] DFA66_min = DFA.unpackEncodedStringToUnsignedChars(DFA66_minS);
-    static final char[] DFA66_max = DFA.unpackEncodedStringToUnsignedChars(DFA66_maxS);
-    static final short[] DFA66_accept = DFA.unpackEncodedString(DFA66_acceptS);
-    static final short[] DFA66_special = DFA.unpackEncodedString(DFA66_specialS);
-    static final short[][] DFA66_transition;
-
-    static {
-        int numStates = DFA66_transitionS.length;
-        DFA66_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA66_transition[i] = DFA.unpackEncodedString(DFA66_transitionS[i]);
-        }
-    }
+    static final short[] dfa_32 = DFA.unpackEncodedString(dfa_32s);
+    static final short[] dfa_33 = DFA.unpackEncodedString(dfa_33s);
+    static final char[] dfa_34 = DFA.unpackEncodedStringToUnsignedChars(dfa_34s);
+    static final char[] dfa_35 = DFA.unpackEncodedStringToUnsignedChars(dfa_35s);
+    static final short[] dfa_36 = DFA.unpackEncodedString(dfa_36s);
+    static final short[] dfa_37 = DFA.unpackEncodedString(dfa_37s);
+    static final short[][] dfa_38 = unpackEncodedStringArray(dfa_38s);
 
     class DFA66 extends DFA {
 
         public DFA66(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 66;
-            this.eot = DFA66_eot;
-            this.eof = DFA66_eof;
-            this.min = DFA66_min;
-            this.max = DFA66_max;
-            this.accept = DFA66_accept;
-            this.special = DFA66_special;
-            this.transition = DFA66_transition;
+            this.eot = dfa_32;
+            this.eof = dfa_33;
+            this.min = dfa_34;
+            this.max = dfa_35;
+            this.accept = dfa_36;
+            this.special = dfa_37;
+            this.transition = dfa_38;
         }
         public String getDescription() {
             return "()* loopback of 3638:1: ( ( ( ( () ( ( ruleOpOther ) ) ) )=> ( () ( ( ruleOpOther ) ) ) ) ( (lv_rightOperand_3_0= ruleXAdditiveExpression ) ) )*";
@@ -28870,19 +28682,11 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA69_eotS =
-        "\13\uffff";
-    static final String DFA69_eofS =
-        "\13\uffff";
-    static final String DFA69_minS =
-        "\1\40\2\uffff\1\77\7\uffff";
-    static final String DFA69_maxS =
-        "\1\114\2\uffff\1\112\7\uffff";
-    static final String DFA69_acceptS =
-        "\1\uffff\1\1\1\2\1\uffff\1\4\1\5\1\7\1\10\1\11\1\6\1\3";
-    static final String DFA69_specialS =
-        "\13\uffff}>";
-    static final String[] DFA69_transitionS = {
+    static final String dfa_39s = "\1\40\2\uffff\1\77\7\uffff";
+    static final String dfa_40s = "\1\114\2\uffff\1\112\7\uffff";
+    static final String dfa_41s = "\1\uffff\1\1\1\2\1\uffff\1\4\1\5\1\7\1\10\1\11\1\6\1\3";
+    static final String dfa_42s = "\13\uffff}>";
+    static final String[] dfa_43s = {
             "\1\5\35\uffff\1\6\1\3\10\uffff\1\1\1\2\1\4\1\7\1\10",
             "",
             "",
@@ -28895,56 +28699,37 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             "",
             ""
     };
-
-    static final short[] DFA69_eot = DFA.unpackEncodedString(DFA69_eotS);
-    static final short[] DFA69_eof = DFA.unpackEncodedString(DFA69_eofS);
-    static final char[] DFA69_min = DFA.unpackEncodedStringToUnsignedChars(DFA69_minS);
-    static final char[] DFA69_max = DFA.unpackEncodedStringToUnsignedChars(DFA69_maxS);
-    static final short[] DFA69_accept = DFA.unpackEncodedString(DFA69_acceptS);
-    static final short[] DFA69_special = DFA.unpackEncodedString(DFA69_specialS);
-    static final short[][] DFA69_transition;
-
-    static {
-        int numStates = DFA69_transitionS.length;
-        DFA69_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA69_transition[i] = DFA.unpackEncodedString(DFA69_transitionS[i]);
-        }
-    }
+    static final char[] dfa_39 = DFA.unpackEncodedStringToUnsignedChars(dfa_39s);
+    static final char[] dfa_40 = DFA.unpackEncodedStringToUnsignedChars(dfa_40s);
+    static final short[] dfa_41 = DFA.unpackEncodedString(dfa_41s);
+    static final short[] dfa_42 = DFA.unpackEncodedString(dfa_42s);
+    static final short[][] dfa_43 = unpackEncodedStringArray(dfa_43s);
 
     class DFA69 extends DFA {
 
         public DFA69(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 69;
-            this.eot = DFA69_eot;
-            this.eof = DFA69_eof;
-            this.min = DFA69_min;
-            this.max = DFA69_max;
-            this.accept = DFA69_accept;
-            this.special = DFA69_special;
-            this.transition = DFA69_transition;
+            this.eot = dfa_32;
+            this.eof = dfa_32;
+            this.min = dfa_39;
+            this.max = dfa_40;
+            this.accept = dfa_41;
+            this.special = dfa_42;
+            this.transition = dfa_43;
         }
         public String getDescription() {
             return "3703:1: (kw= '->' | kw= '..<' | (kw= '>' kw= '..' ) | kw= '..' | kw= '=>' | (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) | (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) | kw= '<>' | kw= '?:' )";
         }
     }
-    static final String DFA85_eotS =
-        "\120\uffff";
-    static final String DFA85_eofS =
-        "\1\2\117\uffff";
-    static final String DFA85_minS =
-        "\1\4\1\0\116\uffff";
-    static final String DFA85_maxS =
-        "\1\156\1\0\116\uffff";
-    static final String DFA85_acceptS =
-        "\2\uffff\1\2\114\uffff\1\1";
-    static final String DFA85_specialS =
-        "\1\uffff\1\0\116\uffff}>";
-    static final String[] DFA85_transitionS = {
-            "\5\2\5\uffff\1\2\1\uffff\1\2\1\uffff\1\2\4\uffff\3\2\1\uffff"+
-            "\4\2\1\uffff\1\2\1\1\1\2\1\uffff\1\2\16\uffff\2\2\1\uffff\42"+
-            "\2\1\uffff\26\2",
+    static final String dfa_44s = "\120\uffff";
+    static final String dfa_45s = "\1\2\117\uffff";
+    static final String dfa_46s = "\1\4\1\0\116\uffff";
+    static final String dfa_47s = "\1\156\1\0\116\uffff";
+    static final String dfa_48s = "\2\uffff\1\2\114\uffff\1\1";
+    static final String dfa_49s = "\1\uffff\1\0\116\uffff}>";
+    static final String[] dfa_50s = {
+            "\5\2\5\uffff\1\2\1\uffff\1\2\1\uffff\1\2\4\uffff\3\2\1\uffff\4\2\1\uffff\1\2\1\1\1\2\1\uffff\1\2\16\uffff\2\2\1\uffff\42\2\1\uffff\26\2",
             "\1\uffff",
             "",
             "",
@@ -29026,34 +28811,26 @@ public String getDescription() {
             ""
     };
 
-    static final short[] DFA85_eot = DFA.unpackEncodedString(DFA85_eotS);
-    static final short[] DFA85_eof = DFA.unpackEncodedString(DFA85_eofS);
-    static final char[] DFA85_min = DFA.unpackEncodedStringToUnsignedChars(DFA85_minS);
-    static final char[] DFA85_max = DFA.unpackEncodedStringToUnsignedChars(DFA85_maxS);
-    static final short[] DFA85_accept = DFA.unpackEncodedString(DFA85_acceptS);
-    static final short[] DFA85_special = DFA.unpackEncodedString(DFA85_specialS);
-    static final short[][] DFA85_transition;
-
-    static {
-        int numStates = DFA85_transitionS.length;
-        DFA85_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA85_transition[i] = DFA.unpackEncodedString(DFA85_transitionS[i]);
-        }
-    }
+    static final short[] dfa_44 = DFA.unpackEncodedString(dfa_44s);
+    static final short[] dfa_45 = DFA.unpackEncodedString(dfa_45s);
+    static final char[] dfa_46 = DFA.unpackEncodedStringToUnsignedChars(dfa_46s);
+    static final char[] dfa_47 = DFA.unpackEncodedStringToUnsignedChars(dfa_47s);
+    static final short[] dfa_48 = DFA.unpackEncodedString(dfa_48s);
+    static final short[] dfa_49 = DFA.unpackEncodedString(dfa_49s);
+    static final short[][] dfa_50 = unpackEncodedStringArray(dfa_50s);
 
     class DFA85 extends DFA {
 
         public DFA85(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 85;
-            this.eot = DFA85_eot;
-            this.eof = DFA85_eof;
-            this.min = DFA85_min;
-            this.max = DFA85_max;
-            this.accept = DFA85_accept;
-            this.special = DFA85_special;
-            this.transition = DFA85_transition;
+            this.eot = dfa_44;
+            this.eof = dfa_45;
+            this.min = dfa_46;
+            this.max = dfa_47;
+            this.accept = dfa_48;
+            this.special = dfa_49;
+            this.transition = dfa_50;
         }
         public String getDescription() {
             return "4547:2: ( ( ( ( '(' ) )=> (lv_explicitOperationCall_17_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )? otherlv_22= ')' )?";
@@ -29085,23 +28862,12 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA84_eotS =
-        "\46\uffff";
-    static final String DFA84_eofS =
-        "\46\uffff";
-    static final String DFA84_minS =
-        "\1\4\4\0\41\uffff";
-    static final String DFA84_maxS =
-        "\1\155\4\0\41\uffff";
-    static final String DFA84_acceptS =
-        "\5\uffff\2\1\1\2\35\uffff\1\3";
-    static final String DFA84_specialS =
-        "\1\0\1\1\1\2\1\3\1\4\41\uffff}>";
-    static final String[] DFA84_transitionS = {
-            "\1\3\4\7\5\uffff\1\7\1\uffff\1\7\6\uffff\1\7\3\uffff\1\7\4"+
-            "\uffff\1\5\1\4\1\45\23\uffff\1\1\1\2\1\7\5\uffff\1\7\16\uffff"+
-            "\2\7\3\uffff\1\7\5\uffff\1\6\1\7\1\uffff\1\7\1\uffff\2\7\1\uffff"+
-            "\14\7\1\uffff\1\7",
+    static final String dfa_51s = "\1\4\4\0\41\uffff";
+    static final String dfa_52s = "\1\155\4\0\41\uffff";
+    static final String dfa_53s = "\5\uffff\2\1\1\2\35\uffff\1\3";
+    static final String dfa_54s = "\1\0\1\1\1\2\1\3\1\4\41\uffff}>";
+    static final String[] dfa_55s = {
+            "\1\3\4\7\5\uffff\1\7\1\uffff\1\7\6\uffff\1\7\3\uffff\1\7\4\uffff\1\5\1\4\1\45\23\uffff\1\1\1\2\1\7\5\uffff\1\7\16\uffff\2\7\3\uffff\1\7\5\uffff\1\6\1\7\1\uffff\1\7\1\uffff\2\7\1\uffff\14\7\1\uffff\1\7",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -29140,35 +28906,24 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             "",
             ""
     };
-
-    static final short[] DFA84_eot = DFA.unpackEncodedString(DFA84_eotS);
-    static final short[] DFA84_eof = DFA.unpackEncodedString(DFA84_eofS);
-    static final char[] DFA84_min = DFA.unpackEncodedStringToUnsignedChars(DFA84_minS);
-    static final char[] DFA84_max = DFA.unpackEncodedStringToUnsignedChars(DFA84_maxS);
-    static final short[] DFA84_accept = DFA.unpackEncodedString(DFA84_acceptS);
-    static final short[] DFA84_special = DFA.unpackEncodedString(DFA84_specialS);
-    static final short[][] DFA84_transition;
-
-    static {
-        int numStates = DFA84_transitionS.length;
-        DFA84_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA84_transition[i] = DFA.unpackEncodedString(DFA84_transitionS[i]);
-        }
-    }
+    static final char[] dfa_51 = DFA.unpackEncodedStringToUnsignedChars(dfa_51s);
+    static final char[] dfa_52 = DFA.unpackEncodedStringToUnsignedChars(dfa_52s);
+    static final short[] dfa_53 = DFA.unpackEncodedString(dfa_53s);
+    static final short[] dfa_54 = DFA.unpackEncodedString(dfa_54s);
+    static final short[][] dfa_55 = unpackEncodedStringArray(dfa_55s);
 
     class DFA84 extends DFA {
 
         public DFA84(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 84;
-            this.eot = DFA84_eot;
-            this.eof = DFA84_eof;
-            this.min = DFA84_min;
-            this.max = DFA84_max;
-            this.accept = DFA84_accept;
-            this.special = DFA84_special;
-            this.transition = DFA84_transition;
+            this.eot = dfa_8;
+            this.eof = dfa_8;
+            this.min = dfa_51;
+            this.max = dfa_52;
+            this.accept = dfa_53;
+            this.special = dfa_54;
+            this.transition = dfa_55;
         }
         public String getDescription() {
             return "4568:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_memberCallArguments_18_0= ruleXShortClosure ) ) | ( ( (lv_memberCallArguments_19_0= ruleXExpression ) ) (otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) )* ) )?";
@@ -29272,22 +29027,8 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA86_eotS =
-        "\120\uffff";
-    static final String DFA86_eofS =
-        "\1\2\117\uffff";
-    static final String DFA86_minS =
-        "\1\4\1\0\116\uffff";
-    static final String DFA86_maxS =
-        "\1\156\1\0\116\uffff";
-    static final String DFA86_acceptS =
-        "\2\uffff\1\2\114\uffff\1\1";
-    static final String DFA86_specialS =
-        "\1\uffff\1\0\116\uffff}>";
-    static final String[] DFA86_transitionS = {
-            "\5\2\5\uffff\1\2\1\uffff\1\2\1\uffff\1\2\4\uffff\3\2\1\uffff"+
-            "\1\1\3\2\1\uffff\3\2\1\uffff\1\2\16\uffff\2\2\1\uffff\42\2\1"+
-            "\uffff\26\2",
+    static final String[] dfa_56s = {
+            "\5\2\5\uffff\1\2\1\uffff\1\2\1\uffff\1\2\4\uffff\3\2\1\uffff\1\1\3\2\1\uffff\3\2\1\uffff\1\2\16\uffff\2\2\1\uffff\42\2\1\uffff\26\2",
             "\1\uffff",
             "",
             "",
@@ -29368,35 +29109,20 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             "",
             ""
     };
-
-    static final short[] DFA86_eot = DFA.unpackEncodedString(DFA86_eotS);
-    static final short[] DFA86_eof = DFA.unpackEncodedString(DFA86_eofS);
-    static final char[] DFA86_min = DFA.unpackEncodedStringToUnsignedChars(DFA86_minS);
-    static final char[] DFA86_max = DFA.unpackEncodedStringToUnsignedChars(DFA86_maxS);
-    static final short[] DFA86_accept = DFA.unpackEncodedString(DFA86_acceptS);
-    static final short[] DFA86_special = DFA.unpackEncodedString(DFA86_specialS);
-    static final short[][] DFA86_transition;
-
-    static {
-        int numStates = DFA86_transitionS.length;
-        DFA86_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA86_transition[i] = DFA.unpackEncodedString(DFA86_transitionS[i]);
-        }
-    }
+    static final short[][] dfa_56 = unpackEncodedStringArray(dfa_56s);
 
     class DFA86 extends DFA {
 
         public DFA86(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 86;
-            this.eot = DFA86_eot;
-            this.eof = DFA86_eof;
-            this.min = DFA86_min;
-            this.max = DFA86_max;
-            this.accept = DFA86_accept;
-            this.special = DFA86_special;
-            this.transition = DFA86_transition;
+            this.eot = dfa_44;
+            this.eof = dfa_45;
+            this.min = dfa_46;
+            this.max = dfa_47;
+            this.accept = dfa_48;
+            this.special = dfa_49;
+            this.transition = dfa_56;
         }
         public String getDescription() {
             return "4647:3: ( ( ( () '[' ) )=> (lv_memberCallArguments_23_0= ruleXClosure ) )?";
@@ -29428,24 +29154,13 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA88_eotS =
-        "\42\uffff";
-    static final String DFA88_eofS =
-        "\42\uffff";
-    static final String DFA88_minS =
-        "\1\4\30\uffff\1\0\10\uffff";
-    static final String DFA88_maxS =
-        "\1\155\30\uffff\1\0\10\uffff";
-    static final String DFA88_acceptS =
-        "\1\uffff\1\1\1\2\1\3\1\4\1\5\10\uffff\1\6\11\uffff\1\7\1\uffff"+
-        "\1\12\1\13\1\14\1\15\1\16\1\17\1\10\1\11";
-    static final String DFA88_specialS =
-        "\1\0\30\uffff\1\1\10\uffff}>";
-    static final String[] DFA88_transitionS = {
-            "\1\5\4\16\5\uffff\1\31\1\uffff\1\5\6\uffff\1\2\3\uffff\1\16"+
-            "\5\uffff\1\37\24\uffff\2\5\1\16\5\uffff\1\5\32\uffff\1\30\1"+
-            "\uffff\1\3\1\uffff\1\32\1\33\1\uffff\4\5\1\1\4\16\1\34\1\35"+
-            "\1\36\1\uffff\1\4",
+    static final String dfa_57s = "\42\uffff";
+    static final String dfa_58s = "\1\4\30\uffff\1\0\10\uffff";
+    static final String dfa_59s = "\1\155\30\uffff\1\0\10\uffff";
+    static final String dfa_60s = "\1\uffff\1\1\1\2\1\3\1\4\1\5\10\uffff\1\6\11\uffff\1\7\1\uffff\1\12\1\13\1\14\1\15\1\16\1\17\1\10\1\11";
+    static final String dfa_61s = "\1\0\30\uffff\1\1\10\uffff}>";
+    static final String[] dfa_62s = {
+            "\1\5\4\16\5\uffff\1\31\1\uffff\1\5\6\uffff\1\2\3\uffff\1\16\5\uffff\1\37\24\uffff\2\5\1\16\5\uffff\1\5\32\uffff\1\30\1\uffff\1\3\1\uffff\1\32\1\33\1\uffff\4\5\1\1\4\16\1\34\1\35\1\36\1\uffff\1\4",
             "",
             "",
             "",
@@ -29481,34 +29196,25 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA88_eot = DFA.unpackEncodedString(DFA88_eotS);
-    static final short[] DFA88_eof = DFA.unpackEncodedString(DFA88_eofS);
-    static final char[] DFA88_min = DFA.unpackEncodedStringToUnsignedChars(DFA88_minS);
-    static final char[] DFA88_max = DFA.unpackEncodedStringToUnsignedChars(DFA88_maxS);
-    static final short[] DFA88_accept = DFA.unpackEncodedString(DFA88_acceptS);
-    static final short[] DFA88_special = DFA.unpackEncodedString(DFA88_specialS);
-    static final short[][] DFA88_transition;
-
-    static {
-        int numStates = DFA88_transitionS.length;
-        DFA88_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA88_transition[i] = DFA.unpackEncodedString(DFA88_transitionS[i]);
-        }
-    }
+    static final short[] dfa_57 = DFA.unpackEncodedString(dfa_57s);
+    static final char[] dfa_58 = DFA.unpackEncodedStringToUnsignedChars(dfa_58s);
+    static final char[] dfa_59 = DFA.unpackEncodedStringToUnsignedChars(dfa_59s);
+    static final short[] dfa_60 = DFA.unpackEncodedString(dfa_60s);
+    static final short[] dfa_61 = DFA.unpackEncodedString(dfa_61s);
+    static final short[][] dfa_62 = unpackEncodedStringArray(dfa_62s);
 
     class DFA88 extends DFA {
 
         public DFA88(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 88;
-            this.eot = DFA88_eot;
-            this.eof = DFA88_eof;
-            this.min = DFA88_min;
-            this.max = DFA88_max;
-            this.accept = DFA88_accept;
-            this.special = DFA88_special;
-            this.transition = DFA88_transition;
+            this.eot = dfa_57;
+            this.eof = dfa_57;
+            this.min = dfa_58;
+            this.max = dfa_59;
+            this.accept = dfa_60;
+            this.special = dfa_61;
+            this.transition = dfa_62;
         }
         public String getDescription() {
             return "4688:1: (this_XConstructorCall_0= ruleXConstructorCall | this_XBlockExpression_1= ruleXBlockExpression | this_XSwitchExpression_2= ruleXSwitchExpression | ( ( ( () 'synchronized' '(' ) )=>this_XSynchronizedExpression_3= ruleXSynchronizedExpression ) | this_XFeatureCall_4= ruleXFeatureCall | this_XLiteral_5= ruleXLiteral | this_XIfExpression_6= ruleXIfExpression | ( ( ( () 'for' '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=>this_XForLoopExpression_7= ruleXForLoopExpression ) | this_XBasicForLoopExpression_8= ruleXBasicForLoopExpression | this_XWhileExpression_9= ruleXWhileExpression | this_XDoWhileExpression_10= ruleXDoWhileExpression | this_XThrowExpression_11= ruleXThrowExpression | this_XReturnExpression_12= ruleXReturnExpression | this_XTryCatchFinallyExpression_13= ruleXTryCatchFinallyExpression | this_XParenthesizedExpression_14= ruleXParenthesizedExpression )";
@@ -29579,23 +29285,13 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA97_eotS =
-        "\50\uffff";
-    static final String DFA97_eofS =
-        "\50\uffff";
-    static final String DFA97_minS =
-        "\1\4\4\0\43\uffff";
-    static final String DFA97_maxS =
-        "\1\155\4\0\43\uffff";
-    static final String DFA97_acceptS =
-        "\5\uffff\2\1\1\2\40\uffff";
-    static final String DFA97_specialS =
-        "\1\0\1\1\1\2\1\3\1\4\43\uffff}>";
-    static final String[] DFA97_transitionS = {
-            "\1\3\4\7\5\uffff\1\7\1\uffff\1\7\6\uffff\1\7\3\uffff\1\7\1"+
-            "\uffff\1\7\2\uffff\1\5\1\4\22\uffff\1\7\1\uffff\1\1\1\2\1\7"+
-            "\5\uffff\1\7\16\uffff\2\7\3\uffff\1\7\5\uffff\1\6\1\7\1\uffff"+
-            "\1\7\1\uffff\17\7\1\uffff\1\7",
+    static final String dfa_63s = "\50\uffff";
+    static final String dfa_64s = "\1\4\4\0\43\uffff";
+    static final String dfa_65s = "\1\155\4\0\43\uffff";
+    static final String dfa_66s = "\5\uffff\2\1\1\2\40\uffff";
+    static final String dfa_67s = "\1\0\1\1\1\2\1\3\1\4\43\uffff}>";
+    static final String[] dfa_68s = {
+            "\1\3\4\7\5\uffff\1\7\1\uffff\1\7\6\uffff\1\7\3\uffff\1\7\1\uffff\1\7\2\uffff\1\5\1\4\22\uffff\1\7\1\uffff\1\1\1\2\1\7\5\uffff\1\7\16\uffff\2\7\3\uffff\1\7\5\uffff\1\6\1\7\1\uffff\1\7\1\uffff\17\7\1\uffff\1\7",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -29637,34 +29333,25 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA97_eot = DFA.unpackEncodedString(DFA97_eotS);
-    static final short[] DFA97_eof = DFA.unpackEncodedString(DFA97_eofS);
-    static final char[] DFA97_min = DFA.unpackEncodedStringToUnsignedChars(DFA97_minS);
-    static final char[] DFA97_max = DFA.unpackEncodedStringToUnsignedChars(DFA97_maxS);
-    static final short[] DFA97_accept = DFA.unpackEncodedString(DFA97_acceptS);
-    static final short[] DFA97_special = DFA.unpackEncodedString(DFA97_specialS);
-    static final short[][] DFA97_transition;
-
-    static {
-        int numStates = DFA97_transitionS.length;
-        DFA97_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA97_transition[i] = DFA.unpackEncodedString(DFA97_transitionS[i]);
-        }
-    }
+    static final short[] dfa_63 = DFA.unpackEncodedString(dfa_63s);
+    static final char[] dfa_64 = DFA.unpackEncodedStringToUnsignedChars(dfa_64s);
+    static final char[] dfa_65 = DFA.unpackEncodedStringToUnsignedChars(dfa_65s);
+    static final short[] dfa_66 = DFA.unpackEncodedString(dfa_66s);
+    static final short[] dfa_67 = DFA.unpackEncodedString(dfa_67s);
+    static final short[][] dfa_68 = unpackEncodedStringArray(dfa_68s);
 
     class DFA97 extends DFA {
 
         public DFA97(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 97;
-            this.eot = DFA97_eot;
-            this.eof = DFA97_eof;
-            this.min = DFA97_min;
-            this.max = DFA97_max;
-            this.accept = DFA97_accept;
-            this.special = DFA97_special;
-            this.transition = DFA97_transition;
+            this.eot = dfa_63;
+            this.eof = dfa_63;
+            this.min = dfa_64;
+            this.max = dfa_65;
+            this.accept = dfa_66;
+            this.special = dfa_67;
+            this.transition = dfa_68;
         }
         public String getDescription() {
             return "5171:3: ( ( ( ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> ( ( ( (lv_declaredFormalParameters_2_0= ruleJvmFormalParameter ) ) (otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) )* )? ( (lv_explicitSyntax_5_0= '|' ) ) ) )?";
@@ -29766,22 +29453,8 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA104_eotS =
-        "\45\uffff";
-    static final String DFA104_eofS =
-        "\45\uffff";
-    static final String DFA104_minS =
-        "\1\4\1\0\43\uffff";
-    static final String DFA104_maxS =
-        "\1\155\1\0\43\uffff";
-    static final String DFA104_acceptS =
-        "\2\uffff\1\2\41\uffff\1\1";
-    static final String DFA104_specialS =
-        "\1\uffff\1\0\43\uffff}>";
-    static final String[] DFA104_transitionS = {
-            "\5\2\5\uffff\1\2\1\uffff\1\2\6\uffff\1\2\3\uffff\1\2\4\uffff"+
-            "\1\2\1\1\24\uffff\3\2\5\uffff\1\2\16\uffff\2\2\3\uffff\1\2\6"+
-            "\uffff\1\2\1\uffff\1\2\1\uffff\2\2\1\uffff\14\2\1\uffff\1\2",
+    static final String[] dfa_69s = {
+            "\5\2\5\uffff\1\2\1\uffff\1\2\6\uffff\1\2\3\uffff\1\2\4\uffff\1\2\1\1\24\uffff\3\2\5\uffff\1\2\16\uffff\2\2\3\uffff\1\2\6\uffff\1\2\1\uffff\1\2\1\uffff\2\2\1\uffff\14\2\1\uffff\1\2",
             "\1\uffff",
             "",
             "",
@@ -29819,35 +29492,20 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             "",
             ""
     };
-
-    static final short[] DFA104_eot = DFA.unpackEncodedString(DFA104_eotS);
-    static final short[] DFA104_eof = DFA.unpackEncodedString(DFA104_eofS);
-    static final char[] DFA104_min = DFA.unpackEncodedStringToUnsignedChars(DFA104_minS);
-    static final char[] DFA104_max = DFA.unpackEncodedStringToUnsignedChars(DFA104_maxS);
-    static final short[] DFA104_accept = DFA.unpackEncodedString(DFA104_acceptS);
-    static final short[] DFA104_special = DFA.unpackEncodedString(DFA104_specialS);
-    static final short[][] DFA104_transition;
-
-    static {
-        int numStates = DFA104_transitionS.length;
-        DFA104_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA104_transition[i] = DFA.unpackEncodedString(DFA104_transitionS[i]);
-        }
-    }
+    static final short[][] dfa_69 = unpackEncodedStringArray(dfa_69s);
 
     class DFA104 extends DFA {
 
         public DFA104(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 104;
-            this.eot = DFA104_eot;
-            this.eof = DFA104_eof;
-            this.min = DFA104_min;
-            this.max = DFA104_max;
-            this.accept = DFA104_accept;
-            this.special = DFA104_special;
-            this.transition = DFA104_transition;
+            this.eot = dfa_14;
+            this.eof = dfa_14;
+            this.min = dfa_15;
+            this.max = dfa_16;
+            this.accept = dfa_17;
+            this.special = dfa_18;
+            this.transition = dfa_69;
         }
         public String getDescription() {
             return "5595:1: ( ( ( ( ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) )=> (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) ) ( (lv_switch_5_0= ruleXExpression ) ) otherlv_6= ')' ) | ( ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )? ( (lv_switch_9_0= ruleXExpression ) ) ) )";
@@ -29879,23 +29537,13 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA103_eotS =
-        "\44\uffff";
-    static final String DFA103_eofS =
-        "\44\uffff";
-    static final String DFA103_minS =
-        "\1\4\4\0\37\uffff";
-    static final String DFA103_maxS =
-        "\1\155\4\0\37\uffff";
-    static final String DFA103_acceptS =
-        "\5\uffff\1\1\1\2\35\uffff";
-    static final String DFA103_specialS =
-        "\1\0\1\1\1\2\1\3\1\4\37\uffff}>";
-    static final String[] DFA103_transitionS = {
-            "\1\3\4\6\5\uffff\1\6\1\uffff\1\6\6\uffff\1\6\3\uffff\1\6\4"+
-            "\uffff\1\5\1\4\24\uffff\1\1\1\2\1\6\5\uffff\1\6\16\uffff\2\6"+
-            "\3\uffff\1\6\6\uffff\1\6\1\uffff\1\6\1\uffff\2\6\1\uffff\14"+
-            "\6\1\uffff\1\6",
+    static final String dfa_70s = "\44\uffff";
+    static final String dfa_71s = "\1\4\4\0\37\uffff";
+    static final String dfa_72s = "\1\155\4\0\37\uffff";
+    static final String dfa_73s = "\5\uffff\1\1\1\2\35\uffff";
+    static final String dfa_74s = "\1\0\1\1\1\2\1\3\1\4\37\uffff}>";
+    static final String[] dfa_75s = {
+            "\1\3\4\6\5\uffff\1\6\1\uffff\1\6\6\uffff\1\6\3\uffff\1\6\4\uffff\1\5\1\4\24\uffff\1\1\1\2\1\6\5\uffff\1\6\16\uffff\2\6\3\uffff\1\6\6\uffff\1\6\1\uffff\1\6\1\uffff\2\6\1\uffff\14\6\1\uffff\1\6",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -29933,34 +29581,25 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA103_eot = DFA.unpackEncodedString(DFA103_eotS);
-    static final short[] DFA103_eof = DFA.unpackEncodedString(DFA103_eofS);
-    static final char[] DFA103_min = DFA.unpackEncodedStringToUnsignedChars(DFA103_minS);
-    static final char[] DFA103_max = DFA.unpackEncodedStringToUnsignedChars(DFA103_maxS);
-    static final short[] DFA103_accept = DFA.unpackEncodedString(DFA103_acceptS);
-    static final short[] DFA103_special = DFA.unpackEncodedString(DFA103_specialS);
-    static final short[][] DFA103_transition;
-
-    static {
-        int numStates = DFA103_transitionS.length;
-        DFA103_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA103_transition[i] = DFA.unpackEncodedString(DFA103_transitionS[i]);
-        }
-    }
+    static final short[] dfa_70 = DFA.unpackEncodedString(dfa_70s);
+    static final char[] dfa_71 = DFA.unpackEncodedStringToUnsignedChars(dfa_71s);
+    static final char[] dfa_72 = DFA.unpackEncodedStringToUnsignedChars(dfa_72s);
+    static final short[] dfa_73 = DFA.unpackEncodedString(dfa_73s);
+    static final short[] dfa_74 = DFA.unpackEncodedString(dfa_74s);
+    static final short[][] dfa_75 = unpackEncodedStringArray(dfa_75s);
 
     class DFA103 extends DFA {
 
         public DFA103(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 103;
-            this.eot = DFA103_eot;
-            this.eof = DFA103_eof;
-            this.min = DFA103_min;
-            this.max = DFA103_max;
-            this.accept = DFA103_accept;
-            this.special = DFA103_special;
-            this.transition = DFA103_transition;
+            this.eot = dfa_70;
+            this.eof = dfa_70;
+            this.min = dfa_71;
+            this.max = dfa_72;
+            this.accept = dfa_73;
+            this.special = dfa_74;
+            this.transition = dfa_75;
         }
         public String getDescription() {
             return "5650:7: ( ( ( ( ( ruleJvmFormalParameter ) ) ':' ) )=> ( ( (lv_declaredParam_7_0= ruleJvmFormalParameter ) ) otherlv_8= ':' ) )?";
@@ -30060,131 +29699,19 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA126_eotS =
-        "\120\uffff";
-    static final String DFA126_eofS =
-        "\1\2\117\uffff";
-    static final String DFA126_minS =
-        "\1\4\1\0\116\uffff";
-    static final String DFA126_maxS =
-        "\1\156\1\0\116\uffff";
-    static final String DFA126_acceptS =
-        "\2\uffff\1\2\114\uffff\1\1";
-    static final String DFA126_specialS =
-        "\1\uffff\1\0\116\uffff}>";
-    static final String[] DFA126_transitionS = {
-            "\5\2\5\uffff\1\2\1\uffff\1\2\1\uffff\1\2\4\uffff\3\2\1\uffff"+
-            "\4\2\1\uffff\1\2\1\1\1\2\1\uffff\1\2\16\uffff\2\2\1\uffff\42"+
-            "\2\1\uffff\26\2",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA126_eot = DFA.unpackEncodedString(DFA126_eotS);
-    static final short[] DFA126_eof = DFA.unpackEncodedString(DFA126_eofS);
-    static final char[] DFA126_min = DFA.unpackEncodedStringToUnsignedChars(DFA126_minS);
-    static final char[] DFA126_max = DFA.unpackEncodedStringToUnsignedChars(DFA126_maxS);
-    static final short[] DFA126_accept = DFA.unpackEncodedString(DFA126_acceptS);
-    static final short[] DFA126_special = DFA.unpackEncodedString(DFA126_specialS);
-    static final short[][] DFA126_transition;
-
-    static {
-        int numStates = DFA126_transitionS.length;
-        DFA126_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA126_transition[i] = DFA.unpackEncodedString(DFA126_transitionS[i]);
-        }
-    }
 
     class DFA126 extends DFA {
 
         public DFA126(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 126;
-            this.eot = DFA126_eot;
-            this.eof = DFA126_eof;
-            this.min = DFA126_min;
-            this.max = DFA126_max;
-            this.accept = DFA126_accept;
-            this.special = DFA126_special;
-            this.transition = DFA126_transition;
+            this.eot = dfa_44;
+            this.eof = dfa_45;
+            this.min = dfa_46;
+            this.max = dfa_47;
+            this.accept = dfa_48;
+            this.special = dfa_49;
+            this.transition = dfa_50;
         }
         public String getDescription() {
             return "6707:2: ( ( ( ( '(' ) )=> (lv_explicitOperationCall_7_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )? otherlv_12= ')' )?";
@@ -30216,90 +29743,19 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA125_eotS =
-        "\46\uffff";
-    static final String DFA125_eofS =
-        "\46\uffff";
-    static final String DFA125_minS =
-        "\1\4\4\0\41\uffff";
-    static final String DFA125_maxS =
-        "\1\155\4\0\41\uffff";
-    static final String DFA125_acceptS =
-        "\5\uffff\2\1\1\2\35\uffff\1\3";
-    static final String DFA125_specialS =
-        "\1\0\1\1\1\2\1\3\1\4\41\uffff}>";
-    static final String[] DFA125_transitionS = {
-            "\1\3\4\7\5\uffff\1\7\1\uffff\1\7\6\uffff\1\7\3\uffff\1\7\4"+
-            "\uffff\1\5\1\4\1\45\23\uffff\1\1\1\2\1\7\5\uffff\1\7\16\uffff"+
-            "\2\7\3\uffff\1\7\5\uffff\1\6\1\7\1\uffff\1\7\1\uffff\2\7\1\uffff"+
-            "\14\7\1\uffff\1\7",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA125_eot = DFA.unpackEncodedString(DFA125_eotS);
-    static final short[] DFA125_eof = DFA.unpackEncodedString(DFA125_eofS);
-    static final char[] DFA125_min = DFA.unpackEncodedStringToUnsignedChars(DFA125_minS);
-    static final char[] DFA125_max = DFA.unpackEncodedStringToUnsignedChars(DFA125_maxS);
-    static final short[] DFA125_accept = DFA.unpackEncodedString(DFA125_acceptS);
-    static final short[] DFA125_special = DFA.unpackEncodedString(DFA125_specialS);
-    static final short[][] DFA125_transition;
-
-    static {
-        int numStates = DFA125_transitionS.length;
-        DFA125_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA125_transition[i] = DFA.unpackEncodedString(DFA125_transitionS[i]);
-        }
-    }
 
     class DFA125 extends DFA {
 
         public DFA125(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 125;
-            this.eot = DFA125_eot;
-            this.eof = DFA125_eof;
-            this.min = DFA125_min;
-            this.max = DFA125_max;
-            this.accept = DFA125_accept;
-            this.special = DFA125_special;
-            this.transition = DFA125_transition;
+            this.eot = dfa_8;
+            this.eof = dfa_8;
+            this.min = dfa_51;
+            this.max = dfa_52;
+            this.accept = dfa_53;
+            this.special = dfa_54;
+            this.transition = dfa_55;
         }
         public String getDescription() {
             return "6728:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_featureCallArguments_8_0= ruleXShortClosure ) ) | ( ( (lv_featureCallArguments_9_0= ruleXExpression ) ) (otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) )* ) )?";
@@ -30403,22 +29859,52 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA127_eotS =
-        "\120\uffff";
-    static final String DFA127_eofS =
-        "\1\2\117\uffff";
-    static final String DFA127_minS =
-        "\1\4\1\0\116\uffff";
-    static final String DFA127_maxS =
-        "\1\156\1\0\116\uffff";
-    static final String DFA127_acceptS =
-        "\2\uffff\1\2\114\uffff\1\1";
-    static final String DFA127_specialS =
-        "\1\uffff\1\0\116\uffff}>";
-    static final String[] DFA127_transitionS = {
-            "\5\2\5\uffff\1\2\1\uffff\1\2\1\uffff\1\2\4\uffff\3\2\1\uffff"+
-            "\1\1\3\2\1\uffff\3\2\1\uffff\1\2\16\uffff\2\2\1\uffff\42\2\1"+
-            "\uffff\26\2",
+
+    class DFA127 extends DFA {
+
+        public DFA127(BaseRecognizer recognizer) {
+            this.recognizer = recognizer;
+            this.decisionNumber = 127;
+            this.eot = dfa_44;
+            this.eof = dfa_45;
+            this.min = dfa_46;
+            this.max = dfa_47;
+            this.accept = dfa_48;
+            this.special = dfa_49;
+            this.transition = dfa_56;
+        }
+        public String getDescription() {
+            return "6807:3: ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )?";
+        }
+        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
+            TokenStream input = (TokenStream)_input;
+        	int _s = s;
+            switch ( s ) {
+                    case 0 : 
+                        int LA127_1 = input.LA(1);
+
+                         
+                        int index127_1 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (synpred38_InternalFormat()) ) {s = 79;}
+
+                        else if ( (true) ) {s = 2;}
+
+                         
+                        input.seek(index127_1);
+                        if ( s>=0 ) return s;
+                        break;
+            }
+            if (state.backtracking>0) {state.failed=true; return -1;}
+            NoViableAltException nvae =
+                new NoViableAltException(getDescription(), 127, _s, input);
+            error(nvae);
+            throw nvae;
+        }
+    }
+    static final String[] dfa_76s = {
+            "\5\2\5\uffff\1\2\1\uffff\1\2\1\uffff\1\2\4\uffff\3\2\1\uffff\4\2\1\uffff\3\2\1\uffff\1\2\16\uffff\2\2\1\uffff\10\2\1\1\31\2\1\uffff\26\2",
             "\1\uffff",
             "",
             "",
@@ -30499,191 +29985,20 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             "",
             ""
     };
+    static final short[][] dfa_76 = unpackEncodedStringArray(dfa_76s);
 
-    static final short[] DFA127_eot = DFA.unpackEncodedString(DFA127_eotS);
-    static final short[] DFA127_eof = DFA.unpackEncodedString(DFA127_eofS);
-    static final char[] DFA127_min = DFA.unpackEncodedStringToUnsignedChars(DFA127_minS);
-    static final char[] DFA127_max = DFA.unpackEncodedStringToUnsignedChars(DFA127_maxS);
-    static final short[] DFA127_accept = DFA.unpackEncodedString(DFA127_acceptS);
-    static final short[] DFA127_special = DFA.unpackEncodedString(DFA127_specialS);
-    static final short[][] DFA127_transition;
+    class DFA131 extends DFA {
 
-    static {
-        int numStates = DFA127_transitionS.length;
-        DFA127_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA127_transition[i] = DFA.unpackEncodedString(DFA127_transitionS[i]);
-        }
-    }
-
-    class DFA127 extends DFA {
-
-        public DFA127(BaseRecognizer recognizer) {
-            this.recognizer = recognizer;
-            this.decisionNumber = 127;
-            this.eot = DFA127_eot;
-            this.eof = DFA127_eof;
-            this.min = DFA127_min;
-            this.max = DFA127_max;
-            this.accept = DFA127_accept;
-            this.special = DFA127_special;
-            this.transition = DFA127_transition;
-        }
-        public String getDescription() {
-            return "6807:3: ( ( ( () '[' ) )=> (lv_featureCallArguments_13_0= ruleXClosure ) )?";
-        }
-        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
-            TokenStream input = (TokenStream)_input;
-        	int _s = s;
-            switch ( s ) {
-                    case 0 : 
-                        int LA127_1 = input.LA(1);
-
-                         
-                        int index127_1 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (synpred38_InternalFormat()) ) {s = 79;}
-
-                        else if ( (true) ) {s = 2;}
-
-                         
-                        input.seek(index127_1);
-                        if ( s>=0 ) return s;
-                        break;
-            }
-            if (state.backtracking>0) {state.failed=true; return -1;}
-            NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 127, _s, input);
-            error(nvae);
-            throw nvae;
-        }
-    }
-    static final String DFA131_eotS =
-        "\120\uffff";
-    static final String DFA131_eofS =
-        "\1\2\117\uffff";
-    static final String DFA131_minS =
-        "\1\4\1\0\116\uffff";
-    static final String DFA131_maxS =
-        "\1\156\1\0\116\uffff";
-    static final String DFA131_acceptS =
-        "\2\uffff\1\2\114\uffff\1\1";
-    static final String DFA131_specialS =
-        "\1\uffff\1\0\116\uffff}>";
-    static final String[] DFA131_transitionS = {
-            "\5\2\5\uffff\1\2\1\uffff\1\2\1\uffff\1\2\4\uffff\3\2\1\uffff"+
-            "\4\2\1\uffff\3\2\1\uffff\1\2\16\uffff\2\2\1\uffff\10\2\1\1\31"+
-            "\2\1\uffff\26\2",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA131_eot = DFA.unpackEncodedString(DFA131_eotS);
-    static final short[] DFA131_eof = DFA.unpackEncodedString(DFA131_eofS);
-    static final char[] DFA131_min = DFA.unpackEncodedStringToUnsignedChars(DFA131_minS);
-    static final char[] DFA131_max = DFA.unpackEncodedStringToUnsignedChars(DFA131_maxS);
-    static final short[] DFA131_accept = DFA.unpackEncodedString(DFA131_acceptS);
-    static final short[] DFA131_special = DFA.unpackEncodedString(DFA131_specialS);
-    static final short[][] DFA131_transition;
-
-    static {
-        int numStates = DFA131_transitionS.length;
-        DFA131_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA131_transition[i] = DFA.unpackEncodedString(DFA131_transitionS[i]);
-        }
-    }
-
-    class DFA131 extends DFA {
-
-        public DFA131(BaseRecognizer recognizer) {
-            this.recognizer = recognizer;
-            this.decisionNumber = 131;
-            this.eot = DFA131_eot;
-            this.eof = DFA131_eof;
-            this.min = DFA131_min;
-            this.max = DFA131_max;
-            this.accept = DFA131_accept;
-            this.special = DFA131_special;
-            this.transition = DFA131_transition;
+        public DFA131(BaseRecognizer recognizer) {
+            this.recognizer = recognizer;
+            this.decisionNumber = 131;
+            this.eot = dfa_44;
+            this.eof = dfa_45;
+            this.min = dfa_46;
+            this.max = dfa_47;
+            this.accept = dfa_48;
+            this.special = dfa_49;
+            this.transition = dfa_76;
         }
         public String getDescription() {
             return "6972:2: ( ( ( '<' )=>otherlv_3= '<' ) ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) (otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) )* otherlv_7= '>' )?";
@@ -30715,131 +30030,19 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA134_eotS =
-        "\120\uffff";
-    static final String DFA134_eofS =
-        "\1\2\117\uffff";
-    static final String DFA134_minS =
-        "\1\4\1\0\116\uffff";
-    static final String DFA134_maxS =
-        "\1\156\1\0\116\uffff";
-    static final String DFA134_acceptS =
-        "\2\uffff\1\2\114\uffff\1\1";
-    static final String DFA134_specialS =
-        "\1\uffff\1\0\116\uffff}>";
-    static final String[] DFA134_transitionS = {
-            "\5\2\5\uffff\1\2\1\uffff\1\2\1\uffff\1\2\4\uffff\3\2\1\uffff"+
-            "\4\2\1\uffff\1\2\1\1\1\2\1\uffff\1\2\16\uffff\2\2\1\uffff\42"+
-            "\2\1\uffff\26\2",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA134_eot = DFA.unpackEncodedString(DFA134_eotS);
-    static final short[] DFA134_eof = DFA.unpackEncodedString(DFA134_eofS);
-    static final char[] DFA134_min = DFA.unpackEncodedStringToUnsignedChars(DFA134_minS);
-    static final char[] DFA134_max = DFA.unpackEncodedStringToUnsignedChars(DFA134_maxS);
-    static final short[] DFA134_accept = DFA.unpackEncodedString(DFA134_acceptS);
-    static final short[] DFA134_special = DFA.unpackEncodedString(DFA134_specialS);
-    static final short[][] DFA134_transition;
-
-    static {
-        int numStates = DFA134_transitionS.length;
-        DFA134_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA134_transition[i] = DFA.unpackEncodedString(DFA134_transitionS[i]);
-        }
-    }
 
     class DFA134 extends DFA {
 
         public DFA134(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 134;
-            this.eot = DFA134_eot;
-            this.eof = DFA134_eof;
-            this.min = DFA134_min;
-            this.max = DFA134_max;
-            this.accept = DFA134_accept;
-            this.special = DFA134_special;
-            this.transition = DFA134_transition;
+            this.eot = dfa_44;
+            this.eof = dfa_45;
+            this.min = dfa_46;
+            this.max = dfa_47;
+            this.accept = dfa_48;
+            this.special = dfa_49;
+            this.transition = dfa_50;
         }
         public String getDescription() {
             return "7021:3: ( ( ( ( '(' ) )=> (lv_explicitConstructorCall_8_0= '(' ) ) ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )? otherlv_13= ')' )?";
@@ -30871,90 +30074,19 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA133_eotS =
-        "\46\uffff";
-    static final String DFA133_eofS =
-        "\46\uffff";
-    static final String DFA133_minS =
-        "\1\4\4\0\41\uffff";
-    static final String DFA133_maxS =
-        "\1\155\4\0\41\uffff";
-    static final String DFA133_acceptS =
-        "\5\uffff\2\1\1\2\35\uffff\1\3";
-    static final String DFA133_specialS =
-        "\1\0\1\1\1\2\1\3\1\4\41\uffff}>";
-    static final String[] DFA133_transitionS = {
-            "\1\3\4\7\5\uffff\1\7\1\uffff\1\7\6\uffff\1\7\3\uffff\1\7\4"+
-            "\uffff\1\5\1\4\1\45\23\uffff\1\1\1\2\1\7\5\uffff\1\7\16\uffff"+
-            "\2\7\3\uffff\1\7\5\uffff\1\6\1\7\1\uffff\1\7\1\uffff\2\7\1\uffff"+
-            "\14\7\1\uffff\1\7",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA133_eot = DFA.unpackEncodedString(DFA133_eotS);
-    static final short[] DFA133_eof = DFA.unpackEncodedString(DFA133_eofS);
-    static final char[] DFA133_min = DFA.unpackEncodedStringToUnsignedChars(DFA133_minS);
-    static final char[] DFA133_max = DFA.unpackEncodedStringToUnsignedChars(DFA133_maxS);
-    static final short[] DFA133_accept = DFA.unpackEncodedString(DFA133_acceptS);
-    static final short[] DFA133_special = DFA.unpackEncodedString(DFA133_specialS);
-    static final short[][] DFA133_transition;
-
-    static {
-        int numStates = DFA133_transitionS.length;
-        DFA133_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA133_transition[i] = DFA.unpackEncodedString(DFA133_transitionS[i]);
-        }
-    }
 
     class DFA133 extends DFA {
 
         public DFA133(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 133;
-            this.eot = DFA133_eot;
-            this.eof = DFA133_eof;
-            this.min = DFA133_min;
-            this.max = DFA133_max;
-            this.accept = DFA133_accept;
-            this.special = DFA133_special;
-            this.transition = DFA133_transition;
+            this.eot = dfa_8;
+            this.eof = dfa_8;
+            this.min = dfa_51;
+            this.max = dfa_52;
+            this.accept = dfa_53;
+            this.special = dfa_54;
+            this.transition = dfa_55;
         }
         public String getDescription() {
             return "7042:2: ( ( ( ( () ( ( ( ruleJvmFormalParameter ) ) ( ',' ( ( ruleJvmFormalParameter ) ) )* )? ( ( '|' ) ) ) )=> (lv_arguments_9_0= ruleXShortClosure ) ) | ( ( (lv_arguments_10_0= ruleXExpression ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) )* ) )?";
@@ -31058,131 +30190,19 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA135_eotS =
-        "\120\uffff";
-    static final String DFA135_eofS =
-        "\1\2\117\uffff";
-    static final String DFA135_minS =
-        "\1\4\1\0\116\uffff";
-    static final String DFA135_maxS =
-        "\1\156\1\0\116\uffff";
-    static final String DFA135_acceptS =
-        "\2\uffff\1\2\114\uffff\1\1";
-    static final String DFA135_specialS =
-        "\1\uffff\1\0\116\uffff}>";
-    static final String[] DFA135_transitionS = {
-            "\5\2\5\uffff\1\2\1\uffff\1\2\1\uffff\1\2\4\uffff\3\2\1\uffff"+
-            "\1\1\3\2\1\uffff\3\2\1\uffff\1\2\16\uffff\2\2\1\uffff\42\2\1"+
-            "\uffff\26\2",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA135_eot = DFA.unpackEncodedString(DFA135_eotS);
-    static final short[] DFA135_eof = DFA.unpackEncodedString(DFA135_eofS);
-    static final char[] DFA135_min = DFA.unpackEncodedStringToUnsignedChars(DFA135_minS);
-    static final char[] DFA135_max = DFA.unpackEncodedStringToUnsignedChars(DFA135_maxS);
-    static final short[] DFA135_accept = DFA.unpackEncodedString(DFA135_acceptS);
-    static final short[] DFA135_special = DFA.unpackEncodedString(DFA135_specialS);
-    static final short[][] DFA135_transition;
-
-    static {
-        int numStates = DFA135_transitionS.length;
-        DFA135_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA135_transition[i] = DFA.unpackEncodedString(DFA135_transitionS[i]);
-        }
-    }
 
     class DFA135 extends DFA {
 
         public DFA135(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 135;
-            this.eot = DFA135_eot;
-            this.eof = DFA135_eof;
-            this.min = DFA135_min;
-            this.max = DFA135_max;
-            this.accept = DFA135_accept;
-            this.special = DFA135_special;
-            this.transition = DFA135_transition;
+            this.eot = dfa_44;
+            this.eof = dfa_45;
+            this.min = dfa_46;
+            this.max = dfa_47;
+            this.accept = dfa_48;
+            this.special = dfa_49;
+            this.transition = dfa_56;
         }
         public String getDescription() {
             return "7121:3: ( ( ( () '[' ) )=> (lv_arguments_14_0= ruleXClosure ) )?";
@@ -31214,27 +30234,13 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA138_eotS =
-        "\120\uffff";
-    static final String DFA138_eofS =
-        "\1\43\117\uffff";
-    static final String DFA138_minS =
-        "\1\4\42\0\55\uffff";
-    static final String DFA138_maxS =
-        "\1\156\42\0\55\uffff";
-    static final String DFA138_acceptS =
-        "\43\uffff\1\2\53\uffff\1\1";
-    static final String DFA138_specialS =
-        "\1\uffff\1\0\1\1\1\2\1\3\1\4\1\5\1\6\1\7\1\10\1\11\1\12\1\13\1"+
-        "\14\1\15\1\16\1\17\1\20\1\21\1\22\1\23\1\24\1\25\1\26\1\27\1\30"+
-        "\1\31\1\32\1\33\1\34\1\35\1\36\1\37\1\40\1\41\55\uffff}>";
-    static final String[] DFA138_transitionS = {
-            "\1\3\1\31\1\26\1\25\1\27\5\uffff\1\34\1\uffff\1\4\1\uffff\1"+
-            "\43\4\uffff\1\14\2\43\1\uffff\1\22\3\43\1\uffff\1\43\1\42\1"+
-            "\43\1\uffff\1\43\16\uffff\2\43\1\uffff\1\1\1\2\1\21\5\43\1\17"+
-            "\16\43\1\12\1\11\3\43\1\10\5\43\1\uffff\1\33\1\43\1\15\1\43"+
-            "\1\35\1\36\1\43\1\5\1\6\1\7\1\20\1\13\1\23\1\24\1\30\1\32\1"+
-            "\37\1\40\1\41\1\43\1\16\1\43",
+    static final String dfa_77s = "\1\43\117\uffff";
+    static final String dfa_78s = "\1\4\42\0\55\uffff";
+    static final String dfa_79s = "\1\156\42\0\55\uffff";
+    static final String dfa_80s = "\43\uffff\1\2\53\uffff\1\1";
+    static final String dfa_81s = "\1\uffff\1\0\1\1\1\2\1\3\1\4\1\5\1\6\1\7\1\10\1\11\1\12\1\13\1\14\1\15\1\16\1\17\1\20\1\21\1\22\1\23\1\24\1\25\1\26\1\27\1\30\1\31\1\32\1\33\1\34\1\35\1\36\1\37\1\40\1\41\55\uffff}>";
+    static final String[] dfa_82s = {
+            "\1\3\1\31\1\26\1\25\1\27\5\uffff\1\34\1\uffff\1\4\1\uffff\1\43\4\uffff\1\14\2\43\1\uffff\1\22\3\43\1\uffff\1\43\1\42\1\43\1\uffff\1\43\16\uffff\2\43\1\uffff\1\1\1\2\1\21\5\43\1\17\16\43\1\12\1\11\3\43\1\10\5\43\1\uffff\1\33\1\43\1\15\1\43\1\35\1\36\1\43\1\5\1\6\1\7\1\20\1\13\1\23\1\24\1\30\1\32\1\37\1\40\1\41\1\43\1\16\1\43",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -31315,35 +30321,25 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             "",
             ""
     };
-
-    static final short[] DFA138_eot = DFA.unpackEncodedString(DFA138_eotS);
-    static final short[] DFA138_eof = DFA.unpackEncodedString(DFA138_eofS);
-    static final char[] DFA138_min = DFA.unpackEncodedStringToUnsignedChars(DFA138_minS);
-    static final char[] DFA138_max = DFA.unpackEncodedStringToUnsignedChars(DFA138_maxS);
-    static final short[] DFA138_accept = DFA.unpackEncodedString(DFA138_acceptS);
-    static final short[] DFA138_special = DFA.unpackEncodedString(DFA138_specialS);
-    static final short[][] DFA138_transition;
-
-    static {
-        int numStates = DFA138_transitionS.length;
-        DFA138_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA138_transition[i] = DFA.unpackEncodedString(DFA138_transitionS[i]);
-        }
-    }
+    static final short[] dfa_77 = DFA.unpackEncodedString(dfa_77s);
+    static final char[] dfa_78 = DFA.unpackEncodedStringToUnsignedChars(dfa_78s);
+    static final char[] dfa_79 = DFA.unpackEncodedStringToUnsignedChars(dfa_79s);
+    static final short[] dfa_80 = DFA.unpackEncodedString(dfa_80s);
+    static final short[] dfa_81 = DFA.unpackEncodedString(dfa_81s);
+    static final short[][] dfa_82 = unpackEncodedStringArray(dfa_82s);
 
     class DFA138 extends DFA {
 
         public DFA138(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 138;
-            this.eot = DFA138_eot;
-            this.eof = DFA138_eof;
-            this.min = DFA138_min;
-            this.max = DFA138_max;
-            this.accept = DFA138_accept;
-            this.special = DFA138_special;
-            this.transition = DFA138_transition;
+            this.eot = dfa_44;
+            this.eof = dfa_77;
+            this.min = dfa_78;
+            this.max = dfa_79;
+            this.accept = dfa_80;
+            this.special = dfa_81;
+            this.transition = dfa_82;
         }
         public String getDescription() {
             return "7461:1: ( ( 'context' | 'currentColumn' | 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING )=> (lv_expression_2_0= ruleXExpression ) )?";
@@ -31870,22 +30866,14 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA156_eotS =
-        "\121\uffff";
-    static final String DFA156_eofS =
-        "\1\2\120\uffff";
-    static final String DFA156_minS =
-        "\1\4\1\0\117\uffff";
-    static final String DFA156_maxS =
-        "\1\160\1\0\117\uffff";
-    static final String DFA156_acceptS =
-        "\2\uffff\1\2\115\uffff\1\1";
-    static final String DFA156_specialS =
-        "\1\uffff\1\0\117\uffff}>";
-    static final String[] DFA156_transitionS = {
-            "\5\2\5\uffff\1\2\1\uffff\1\2\1\uffff\1\2\4\uffff\3\2\1\uffff"+
-            "\4\2\1\uffff\3\2\1\uffff\1\2\16\uffff\2\2\1\uffff\10\2\1\1\31"+
-            "\2\1\uffff\26\2\1\uffff\1\2",
+    static final String dfa_83s = "\121\uffff";
+    static final String dfa_84s = "\1\2\120\uffff";
+    static final String dfa_85s = "\1\4\1\0\117\uffff";
+    static final String dfa_86s = "\1\160\1\0\117\uffff";
+    static final String dfa_87s = "\2\uffff\1\2\115\uffff\1\1";
+    static final String dfa_88s = "\1\uffff\1\0\117\uffff}>";
+    static final String[] dfa_89s = {
+            "\5\2\5\uffff\1\2\1\uffff\1\2\1\uffff\1\2\4\uffff\3\2\1\uffff\4\2\1\uffff\3\2\1\uffff\1\2\16\uffff\2\2\1\uffff\10\2\1\1\31\2\1\uffff\26\2\1\uffff\1\2",
             "\1\uffff",
             "",
             "",
@@ -31968,34 +30956,26 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA156_eot = DFA.unpackEncodedString(DFA156_eotS);
-    static final short[] DFA156_eof = DFA.unpackEncodedString(DFA156_eofS);
-    static final char[] DFA156_min = DFA.unpackEncodedStringToUnsignedChars(DFA156_minS);
-    static final char[] DFA156_max = DFA.unpackEncodedStringToUnsignedChars(DFA156_maxS);
-    static final short[] DFA156_accept = DFA.unpackEncodedString(DFA156_acceptS);
-    static final short[] DFA156_special = DFA.unpackEncodedString(DFA156_specialS);
-    static final short[][] DFA156_transition;
-
-    static {
-        int numStates = DFA156_transitionS.length;
-        DFA156_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA156_transition[i] = DFA.unpackEncodedString(DFA156_transitionS[i]);
-        }
-    }
+    static final short[] dfa_83 = DFA.unpackEncodedString(dfa_83s);
+    static final short[] dfa_84 = DFA.unpackEncodedString(dfa_84s);
+    static final char[] dfa_85 = DFA.unpackEncodedStringToUnsignedChars(dfa_85s);
+    static final char[] dfa_86 = DFA.unpackEncodedStringToUnsignedChars(dfa_86s);
+    static final short[] dfa_87 = DFA.unpackEncodedString(dfa_87s);
+    static final short[] dfa_88 = DFA.unpackEncodedString(dfa_88s);
+    static final short[][] dfa_89 = unpackEncodedStringArray(dfa_89s);
 
     class DFA156 extends DFA {
 
         public DFA156(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 156;
-            this.eot = DFA156_eot;
-            this.eof = DFA156_eof;
-            this.min = DFA156_min;
-            this.max = DFA156_max;
-            this.accept = DFA156_accept;
-            this.special = DFA156_special;
-            this.transition = DFA156_transition;
+            this.eot = dfa_83;
+            this.eof = dfa_84;
+            this.min = dfa_85;
+            this.max = dfa_86;
+            this.accept = dfa_87;
+            this.special = dfa_88;
+            this.transition = dfa_89;
         }
         public String getDescription() {
             return "8113:2: ( ( ( '<' )=>otherlv_1= '<' ) ( (lv_arguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' ( ( ( ( () '.' ) )=> ( () otherlv_7= '.' ) ) ( ( ruleValidID ) ) ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )? )* )?";
@@ -32027,132 +31007,19 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA154_eotS =
-        "\121\uffff";
-    static final String DFA154_eofS =
-        "\1\2\120\uffff";
-    static final String DFA154_minS =
-        "\1\4\1\0\117\uffff";
-    static final String DFA154_maxS =
-        "\1\160\1\0\117\uffff";
-    static final String DFA154_acceptS =
-        "\2\uffff\1\2\115\uffff\1\1";
-    static final String DFA154_specialS =
-        "\1\uffff\1\0\117\uffff}>";
-    static final String[] DFA154_transitionS = {
-            "\5\2\5\uffff\1\2\1\uffff\1\2\1\uffff\1\2\4\uffff\3\2\1\uffff"+
-            "\4\2\1\uffff\3\2\1\uffff\1\2\16\uffff\2\2\1\uffff\10\2\1\1\31"+
-            "\2\1\uffff\26\2\1\uffff\1\2",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA154_eot = DFA.unpackEncodedString(DFA154_eotS);
-    static final short[] DFA154_eof = DFA.unpackEncodedString(DFA154_eofS);
-    static final char[] DFA154_min = DFA.unpackEncodedStringToUnsignedChars(DFA154_minS);
-    static final char[] DFA154_max = DFA.unpackEncodedStringToUnsignedChars(DFA154_maxS);
-    static final short[] DFA154_accept = DFA.unpackEncodedString(DFA154_acceptS);
-    static final short[] DFA154_special = DFA.unpackEncodedString(DFA154_specialS);
-    static final short[][] DFA154_transition;
-
-    static {
-        int numStates = DFA154_transitionS.length;
-        DFA154_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA154_transition[i] = DFA.unpackEncodedString(DFA154_transitionS[i]);
-        }
-    }
 
     class DFA154 extends DFA {
 
         public DFA154(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 154;
-            this.eot = DFA154_eot;
-            this.eof = DFA154_eof;
-            this.min = DFA154_min;
-            this.max = DFA154_max;
-            this.accept = DFA154_accept;
-            this.special = DFA154_special;
-            this.transition = DFA154_transition;
+            this.eot = dfa_83;
+            this.eof = dfa_84;
+            this.min = dfa_85;
+            this.max = dfa_86;
+            this.accept = dfa_87;
+            this.special = dfa_88;
+            this.transition = dfa_89;
         }
         public String getDescription() {
             return "8189:2: ( ( ( '<' )=>otherlv_9= '<' ) ( (lv_arguments_10_0= ruleJvmArgumentTypeReference ) ) (otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) )* otherlv_13= '>' )?";
@@ -32184,19 +31051,11 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA163_eotS =
-        "\13\uffff";
-    static final String DFA163_eofS =
-        "\2\uffff\3\6\3\uffff\3\6";
-    static final String DFA163_minS =
-        "\1\4\1\uffff\3\22\1\4\2\uffff\3\22";
-    static final String DFA163_maxS =
-        "\1\140\1\uffff\3\44\1\67\2\uffff\3\44";
-    static final String DFA163_acceptS =
-        "\1\uffff\1\1\4\uffff\1\2\1\3\3\uffff";
-    static final String DFA163_specialS =
-        "\13\uffff}>";
-    static final String[] DFA163_transitionS = {
+    static final String dfa_90s = "\2\uffff\3\6\3\uffff\3\6";
+    static final String dfa_91s = "\1\4\1\uffff\3\22\1\4\2\uffff\3\22";
+    static final String dfa_92s = "\1\140\1\uffff\3\44\1\67\2\uffff\3\44";
+    static final String dfa_93s = "\1\uffff\1\1\4\uffff\1\2\1\3\3\uffff";
+    static final String[] dfa_94s = {
             "\1\4\61\uffff\1\2\1\3\50\uffff\1\1",
             "",
             "\1\6\21\uffff\1\5",
@@ -32209,35 +31068,24 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             "\1\6\21\uffff\1\5",
             "\1\6\21\uffff\1\5"
     };
-
-    static final short[] DFA163_eot = DFA.unpackEncodedString(DFA163_eotS);
-    static final short[] DFA163_eof = DFA.unpackEncodedString(DFA163_eofS);
-    static final char[] DFA163_min = DFA.unpackEncodedStringToUnsignedChars(DFA163_minS);
-    static final char[] DFA163_max = DFA.unpackEncodedStringToUnsignedChars(DFA163_maxS);
-    static final short[] DFA163_accept = DFA.unpackEncodedString(DFA163_acceptS);
-    static final short[] DFA163_special = DFA.unpackEncodedString(DFA163_specialS);
-    static final short[][] DFA163_transition;
-
-    static {
-        int numStates = DFA163_transitionS.length;
-        DFA163_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA163_transition[i] = DFA.unpackEncodedString(DFA163_transitionS[i]);
-        }
-    }
+    static final short[] dfa_90 = DFA.unpackEncodedString(dfa_90s);
+    static final char[] dfa_91 = DFA.unpackEncodedStringToUnsignedChars(dfa_91s);
+    static final char[] dfa_92 = DFA.unpackEncodedStringToUnsignedChars(dfa_92s);
+    static final short[] dfa_93 = DFA.unpackEncodedString(dfa_93s);
+    static final short[][] dfa_94 = unpackEncodedStringArray(dfa_94s);
 
     class DFA163 extends DFA {
 
         public DFA163(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 163;
-            this.eot = DFA163_eot;
-            this.eof = DFA163_eof;
-            this.min = DFA163_min;
-            this.max = DFA163_max;
-            this.accept = DFA163_accept;
-            this.special = DFA163_special;
-            this.transition = DFA163_transition;
+            this.eot = dfa_32;
+            this.eof = dfa_90;
+            this.min = dfa_91;
+            this.max = dfa_92;
+            this.accept = dfa_93;
+            this.special = dfa_42;
+            this.transition = dfa_94;
         }
         public String getDescription() {
             return "8627:1: ( ( ( (lv_static_1_0= 'static' ) ) ( (lv_extension_2_0= 'extension' ) )? ( ( ruleQualifiedNameInStaticImport ) ) ( ( (lv_wildcard_4_0= '*' ) ) | ( (lv_memberName_5_0= ruleValidID ) ) ) ) | ( ( ruleQualifiedName ) ) | ( (lv_importedNamespace_7_0= ruleQualifiedNameWithWildcard ) ) )";
@@ -32245,856 +31093,121 @@ public String getDescription() {
     }
  
 
-    public static final BitSet FOLLOW_ruleFormatConfiguration_in_entryRuleFormatConfiguration75 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFormatConfiguration85 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_13_in_ruleFormatConfiguration122 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_14_in_ruleFormatConfiguration134 = new BitSet(new long[]{0x0018000000000010L});
-    public static final BitSet FOLLOW_ruleDottedID_in_ruleFormatConfiguration157 = new BitSet(new long[]{0x0000000002438012L});
-    public static final BitSet FOLLOW_15_in_ruleFormatConfiguration170 = new BitSet(new long[]{0x0018000000000010L});
-    public static final BitSet FOLLOW_ruleDottedID_in_ruleFormatConfiguration193 = new BitSet(new long[]{0x0000000002430012L});
-    public static final BitSet FOLLOW_16_in_ruleFormatConfiguration208 = new BitSet(new long[]{0x00C0000000000010L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleFormatConfiguration231 = new BitSet(new long[]{0x0000000002420012L});
-    public static final BitSet FOLLOW_17_in_ruleFormatConfiguration246 = new BitSet(new long[]{0x0000000000180010L});
-    public static final BitSet FOLLOW_ruleConstant_in_ruleFormatConfiguration267 = new BitSet(new long[]{0x0000000000040000L});
-    public static final BitSet FOLLOW_18_in_ruleFormatConfiguration279 = new BitSet(new long[]{0x0000000002420012L});
-    public static final BitSet FOLLOW_ruleRule_in_ruleFormatConfiguration302 = new BitSet(new long[]{0x0000000002400012L});
-    public static final BitSet FOLLOW_ruleConstant_in_entryRuleConstant339 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleConstant349 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_ruleConstant393 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_20_in_ruleConstant430 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleConstant462 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_21_in_ruleConstant479 = new BitSet(new long[]{0x0000000000000060L});
-    public static final BitSet FOLLOW_ruleIntObject_in_ruleConstant501 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleConstant524 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntValue_in_entryRuleIntValue566 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIntValue576 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntObject_in_ruleIntValue622 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDottedID_in_ruleIntValue651 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStringValue_in_entryRuleStringValue687 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleStringValue697 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleStringValue739 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDottedID_in_ruleStringValue773 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRule_in_entryRuleRule809 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRule819 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleWildcardRule_in_ruleRule866 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGrammarRule_in_ruleRule893 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGrammarRule_in_entryRuleGrammarRule928 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleGrammarRule938 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_22_in_ruleGrammarRule981 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleGrammarRule1015 = new BitSet(new long[]{0x0000000000800000L});
-    public static final BitSet FOLLOW_23_in_ruleGrammarRule1027 = new BitSet(new long[]{0x003800028D200030L});
-    public static final BitSet FOLLOW_ruleGrammarRuleDirective_in_ruleGrammarRule1049 = new BitSet(new long[]{0x003800028D200030L});
-    public static final BitSet FOLLOW_ruleGroupBlock_in_ruleGrammarRule1076 = new BitSet(new long[]{0x003800028D200030L});
-    public static final BitSet FOLLOW_24_in_ruleGrammarRule1090 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleWildcardRule_in_entryRuleWildcardRule1126 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleWildcardRule1136 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_22_in_ruleWildcardRule1188 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_ruleWildcardRule1214 = new BitSet(new long[]{0x0000000000800000L});
-    public static final BitSet FOLLOW_23_in_ruleWildcardRule1226 = new BitSet(new long[]{0x003800020D200030L});
-    public static final BitSet FOLLOW_ruleWildcardRuleDirective_in_ruleWildcardRule1247 = new BitSet(new long[]{0x003800020D200030L});
-    public static final BitSet FOLLOW_24_in_ruleWildcardRule1260 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGrammarRuleDirective_in_entryRuleGrammarRuleDirective1296 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleGrammarRuleDirective1306 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSpecificDirective_in_ruleGrammarRuleDirective1353 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleContextFreeDirective_in_ruleGrammarRuleDirective1380 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleKeywordPair_in_ruleGrammarRuleDirective1407 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleWildcardRuleDirective_in_entryRuleWildcardRuleDirective1442 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleWildcardRuleDirective1452 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleContextFreeDirective_in_ruleWildcardRuleDirective1499 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleKeywordPair_in_ruleWildcardRuleDirective1526 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGrammarElementReference_in_entryRuleGrammarElementReference1561 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleGrammarElementReference1571 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_21_in_ruleGrammarElementReference1609 = new BitSet(new long[]{0x0018000000000010L});
-    public static final BitSet FOLLOW_ruleParameterizedIdentifier_in_ruleGrammarElementReference1632 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_ruleGrammarElementReference1652 = new BitSet(new long[]{0x0018000000000010L});
-    public static final BitSet FOLLOW_ruleParameterizedIdentifier_in_ruleGrammarElementReference1675 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRuleSelfIdentifier_in_ruleGrammarElementReference1705 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleGrammarElementReference1734 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleParameterizedString_in_ruleGrammarElementReference1763 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGrammarElementLookup_in_entryRuleGrammarElementLookup1799 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleGrammarElementLookup1809 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleGrammarElementLookup1857 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleGrammarElementLookup1880 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleContextFreeDirective_in_entryRuleContextFreeDirective1921 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleContextFreeDirective1931 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_ruleContextFreeDirective1968 = new BitSet(new long[]{0x0018000000000030L});
-    public static final BitSet FOLLOW_ruleGrammarElementLookup_in_ruleContextFreeDirective1989 = new BitSet(new long[]{0x0000000030000000L});
-    public static final BitSet FOLLOW_28_in_ruleContextFreeDirective2002 = new BitSet(new long[]{0x0018000000000030L});
-    public static final BitSet FOLLOW_ruleGrammarElementLookup_in_ruleContextFreeDirective2023 = new BitSet(new long[]{0x0000000030000000L});
-    public static final BitSet FOLLOW_29_in_ruleContextFreeDirective2037 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_ruleMatcherList_in_ruleContextFreeDirective2058 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSpecificDirective_in_entryRuleSpecificDirective2094 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSpecificDirective2104 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGrammarElementReference_in_ruleSpecificDirective2150 = new BitSet(new long[]{0x0000000050000000L});
-    public static final BitSet FOLLOW_28_in_ruleSpecificDirective2163 = new BitSet(new long[]{0x0038000004200030L});
-    public static final BitSet FOLLOW_ruleGrammarElementReference_in_ruleSpecificDirective2184 = new BitSet(new long[]{0x0000000050000000L});
-    public static final BitSet FOLLOW_ruleMatcherList_in_ruleSpecificDirective2207 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMatcherList_in_entryRuleMatcherList2243 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleMatcherList2253 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_ruleMatcherList2290 = new BitSet(new long[]{0x00071FC000000000L});
-    public static final BitSet FOLLOW_ruleMatcher_in_ruleMatcherList2311 = new BitSet(new long[]{0x0000000010040000L});
-    public static final BitSet FOLLOW_28_in_ruleMatcherList2324 = new BitSet(new long[]{0x00071FC000000000L});
-    public static final BitSet FOLLOW_ruleMatcher_in_ruleMatcherList2345 = new BitSet(new long[]{0x0000000010040000L});
-    public static final BitSet FOLLOW_18_in_ruleMatcherList2359 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGroupBlock_in_entryRuleGroupBlock2395 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleGroupBlock2405 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_ruleGroupBlock2442 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_ruleIntIdentifier_in_ruleGroupBlock2465 = new BitSet(new long[]{0x0000000140800000L});
-    public static final BitSet FOLLOW_ruleMatcherList_in_ruleGroupBlock2487 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_ruleGroupBlock2506 = new BitSet(new long[]{0x003800028C200030L});
-    public static final BitSet FOLLOW_ruleGroupBlock_in_ruleGroupBlock2527 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_ruleGroupBlock2547 = new BitSet(new long[]{0x003800020D200030L});
-    public static final BitSet FOLLOW_ruleGrammarRuleDirective_in_ruleGroupBlock2568 = new BitSet(new long[]{0x003800020D200030L});
-    public static final BitSet FOLLOW_24_in_ruleGroupBlock2581 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleKeywordPair_in_entryRuleKeywordPair2619 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleKeywordPair2629 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_ruleKeywordPair2666 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleKeywordPair2683 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleKeywordPair2705 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_34_in_ruleKeywordPair2722 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_30_in_ruleKeywordPair2734 = new BitSet(new long[]{0x0000002800000000L});
-    public static final BitSet FOLLOW_35_in_ruleKeywordPair2748 = new BitSet(new long[]{0x0000001000000000L});
-    public static final BitSet FOLLOW_36_in_ruleKeywordPair2760 = new BitSet(new long[]{0x00071FC000000000L});
-    public static final BitSet FOLLOW_ruleMatcher_in_ruleKeywordPair2781 = new BitSet(new long[]{0x0000000010040000L});
-    public static final BitSet FOLLOW_37_in_ruleKeywordPair2801 = new BitSet(new long[]{0x0000001000000000L});
-    public static final BitSet FOLLOW_36_in_ruleKeywordPair2813 = new BitSet(new long[]{0x00071FC000000000L});
-    public static final BitSet FOLLOW_ruleMatcher_in_ruleKeywordPair2834 = new BitSet(new long[]{0x0000000010040000L});
-    public static final BitSet FOLLOW_28_in_ruleKeywordPair2849 = new BitSet(new long[]{0x0000002800000000L});
-    public static final BitSet FOLLOW_35_in_ruleKeywordPair2863 = new BitSet(new long[]{0x0000001000000000L});
-    public static final BitSet FOLLOW_36_in_ruleKeywordPair2875 = new BitSet(new long[]{0x00071FC000000000L});
-    public static final BitSet FOLLOW_ruleMatcher_in_ruleKeywordPair2896 = new BitSet(new long[]{0x0000000010040000L});
-    public static final BitSet FOLLOW_37_in_ruleKeywordPair2916 = new BitSet(new long[]{0x0000001000000000L});
-    public static final BitSet FOLLOW_36_in_ruleKeywordPair2928 = new BitSet(new long[]{0x00071FC000000000L});
-    public static final BitSet FOLLOW_ruleMatcher_in_ruleKeywordPair2949 = new BitSet(new long[]{0x0000000010040000L});
-    public static final BitSet FOLLOW_18_in_ruleKeywordPair2965 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMatcher_in_entryRuleMatcher3001 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleMatcher3011 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLocator_in_ruleMatcher3057 = new BitSet(new long[]{0x0000000000000000L,0x003E000000000000L});
-    public static final BitSet FOLLOW_ruleMatcherType_in_ruleMatcher3078 = new BitSet(new long[]{0x0000000000800002L});
-    public static final BitSet FOLLOW_ruleXBlockExpression_in_ruleMatcher3099 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLocator_in_entryRuleLocator3136 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleLocator3146 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSpaceLocator_in_ruleLocator3193 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRightPaddingLocator_in_ruleLocator3220 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLinewrapLocator_in_ruleLocator3247 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleColumnLocator_in_ruleLocator3274 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOffsetLocator_in_ruleLocator3301 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIndentLocator_in_ruleLocator3328 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNoFormatLocator_in_ruleLocator3355 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNoFormatLocator_in_entryRuleNoFormatLocator3390 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNoFormatLocator3400 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_38_in_ruleNoFormatLocator3446 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSpaceLocator_in_entryRuleSpaceLocator3482 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSpaceLocator3492 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_39_in_ruleSpaceLocator3530 = new BitSet(new long[]{0x0018000000000030L});
-    public static final BitSet FOLLOW_ruleStringValue_in_ruleSpaceLocator3551 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_40_in_ruleSpaceLocator3576 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRightPaddingLocator_in_entryRuleRightPaddingLocator3625 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRightPaddingLocator3635 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_ruleRightPaddingLocator3672 = new BitSet(new long[]{0x0018000000000050L});
-    public static final BitSet FOLLOW_ruleIntValue_in_ruleRightPaddingLocator3693 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLinewrapLocator_in_entryRuleLinewrapLocator3729 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleLinewrapLocator3739 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_ruleLinewrapLocator3787 = new BitSet(new long[]{0x0018000000000052L});
-    public static final BitSet FOLLOW_ruleIntValue_in_ruleLinewrapLocator3809 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntValue_in_ruleLinewrapLocator3837 = new BitSet(new long[]{0x0018000000000050L});
-    public static final BitSet FOLLOW_ruleIntValue_in_ruleLinewrapLocator3858 = new BitSet(new long[]{0x0018000000000050L});
-    public static final BitSet FOLLOW_ruleIntValue_in_ruleLinewrapLocator3879 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_ruleLinewrapLocator3908 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleColumnLocator_in_entryRuleColumnLocator3957 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleColumnLocator3967 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_44_in_ruleColumnLocator4004 = new BitSet(new long[]{0x0018200000800050L});
-    public static final BitSet FOLLOW_45_in_ruleColumnLocator4022 = new BitSet(new long[]{0x0018000000800050L});
-    public static final BitSet FOLLOW_ruleIntValue_in_ruleColumnLocator4058 = new BitSet(new long[]{0x0000C00000000002L});
-    public static final BitSet FOLLOW_ruleXBlockExpression_in_ruleColumnLocator4085 = new BitSet(new long[]{0x0000C00000000002L});
-    public static final BitSet FOLLOW_46_in_ruleColumnLocator4104 = new BitSet(new long[]{0x0000800000000002L});
-    public static final BitSet FOLLOW_47_in_ruleColumnLocator4136 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOffsetLocator_in_entryRuleOffsetLocator4186 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOffsetLocator4196 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_ruleOffsetLocator4233 = new BitSet(new long[]{0x0018200000000050L});
-    public static final BitSet FOLLOW_45_in_ruleOffsetLocator4251 = new BitSet(new long[]{0x0018000000000050L});
-    public static final BitSet FOLLOW_ruleIntValue_in_ruleOffsetLocator4286 = new BitSet(new long[]{0x0000800000000002L});
-    public static final BitSet FOLLOW_47_in_ruleOffsetLocator4304 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIndentLocator_in_entryRuleIndentLocator4354 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIndentLocator4364 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_49_in_ruleIndentLocator4417 = new BitSet(new long[]{0x0018000000800052L});
-    public static final BitSet FOLLOW_50_in_ruleIndentLocator4448 = new BitSet(new long[]{0x0018000000800052L});
-    public static final BitSet FOLLOW_ruleIntValue_in_ruleIndentLocator4471 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBlockExpression_in_ruleIndentLocator4498 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleParameterizedIdentifier_in_entryRuleParameterizedIdentifier4537 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleParameterizedIdentifier4548 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleParameterizedIdentifier4595 = new BitSet(new long[]{0x0000000200000002L});
-    public static final BitSet FOLLOW_33_in_ruleParameterizedIdentifier4614 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleParameterizedIdentifier4629 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_28_in_ruleParameterizedIdentifier4647 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleParameterizedIdentifier4662 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_34_in_ruleParameterizedIdentifier4680 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleParameterizedString_in_entryRuleParameterizedString4723 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleParameterizedString4734 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleParameterizedString4774 = new BitSet(new long[]{0x0000000200000002L});
-    public static final BitSet FOLLOW_33_in_ruleParameterizedString4793 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleParameterizedString4808 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_28_in_ruleParameterizedString4826 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleParameterizedString4841 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_34_in_ruleParameterizedString4859 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_entryRuleIdentifier4902 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIdentifier4913 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleIdentifier4953 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_ruleIdentifier4977 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_ruleIdentifier4996 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDottedID_in_entryRuleDottedID5037 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDottedID5048 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleDottedID5095 = new BitSet(new long[]{0x0000001000000002L});
-    public static final BitSet FOLLOW_36_in_ruleDottedID5114 = new BitSet(new long[]{0x0018000000000010L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleDottedID5136 = new BitSet(new long[]{0x0000001000000002L});
-    public static final BitSet FOLLOW_ruleIntIdentifier_in_entryRuleIntIdentifier5184 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIntIdentifier5195 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleIntIdentifier5234 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntObject_in_entryRuleIntObject5279 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIntObject5290 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleIntObject5329 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRuleSelfIdentifier_in_entryRuleRuleSelfIdentifier5374 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRuleSelfIdentifier5385 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_53_in_ruleRuleSelfIdentifier5422 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_entryRuleValidID5462 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleValidID5473 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_54_in_ruleValidID5511 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_55_in_ruleValidID5530 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleValidID5551 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotation_in_entryRuleXAnnotation5596 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAnnotation5606 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_ruleXAnnotation5652 = new BitSet(new long[]{0x00C0000000000010L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleXAnnotation5675 = new BitSet(new long[]{0x0000000200000002L});
-    public static final BitSet FOLLOW_33_in_ruleXAnnotation5696 = new BitSet(new long[]{0x41C000060C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXAnnotationElementValuePair_in_ruleXAnnotation5740 = new BitSet(new long[]{0x0000000410000000L});
-    public static final BitSet FOLLOW_28_in_ruleXAnnotation5753 = new BitSet(new long[]{0x00C0000000000010L});
-    public static final BitSet FOLLOW_ruleXAnnotationElementValuePair_in_ruleXAnnotation5794 = new BitSet(new long[]{0x0000000410000000L});
-    public static final BitSet FOLLOW_ruleXAnnotationElementValueOrCommaList_in_ruleXAnnotation5824 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_34_in_ruleXAnnotation5838 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationElementValuePair_in_entryRuleXAnnotationElementValuePair5876 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAnnotationElementValuePair5886 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleXAnnotationElementValuePair5956 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_21_in_ruleXAnnotationElementValuePair5968 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXAnnotationElementValue_in_ruleXAnnotationElementValuePair5991 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationElementValueOrCommaList_in_entryRuleXAnnotationElementValueOrCommaList6027 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAnnotationElementValueOrCommaList6037 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_ruleXAnnotationElementValueOrCommaList6102 = new BitSet(new long[]{0x0000000008000000L});
-    public static final BitSet FOLLOW_27_in_ruleXAnnotationElementValueOrCommaList6114 = new BitSet(new long[]{0x41C000022C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValueOrCommaList6138 = new BitSet(new long[]{0x0000000030000000L});
-    public static final BitSet FOLLOW_28_in_ruleXAnnotationElementValueOrCommaList6151 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValueOrCommaList6172 = new BitSet(new long[]{0x0000000030000000L});
-    public static final BitSet FOLLOW_29_in_ruleXAnnotationElementValueOrCommaList6188 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValueOrCommaList6218 = new BitSet(new long[]{0x0000000010000002L});
-    public static final BitSet FOLLOW_28_in_ruleXAnnotationElementValueOrCommaList6240 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValueOrCommaList6261 = new BitSet(new long[]{0x0000000010000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationElementValue_in_entryRuleXAnnotationElementValue6302 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAnnotationElementValue6312 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_ruleXAnnotationElementValue6377 = new BitSet(new long[]{0x0000000008000000L});
-    public static final BitSet FOLLOW_27_in_ruleXAnnotationElementValue6389 = new BitSet(new long[]{0x41C000022C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValue6413 = new BitSet(new long[]{0x0000000030000000L});
-    public static final BitSet FOLLOW_28_in_ruleXAnnotationElementValue6426 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValue6447 = new BitSet(new long[]{0x0000000030000000L});
-    public static final BitSet FOLLOW_29_in_ruleXAnnotationElementValue6463 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_ruleXAnnotationElementValue6492 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotationOrExpression_in_entryRuleXAnnotationOrExpression6527 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAnnotationOrExpression6537 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAnnotation_in_ruleXAnnotationOrExpression6584 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXAnnotationOrExpression6611 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_entryRuleXExpression6646 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXExpression6656 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAssignment_in_ruleXExpression6702 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAssignment_in_entryRuleXAssignment6736 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAssignment6746 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFeatureCallID_in_ruleXAssignment6804 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_ruleOpSingleAssign_in_ruleXAssignment6820 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXAssignment_in_ruleXAssignment6840 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXOrExpression_in_ruleXAssignment6870 = new BitSet(new long[]{0xFE00000000000002L});
-    public static final BitSet FOLLOW_ruleOpMultiAssign_in_ruleXAssignment6923 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXAssignment_in_ruleXAssignment6946 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpSingleAssign_in_entryRuleOpSingleAssign6986 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpSingleAssign6997 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_21_in_ruleOpSingleAssign7034 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpMultiAssign_in_entryRuleOpMultiAssign7074 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpMultiAssign7085 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_57_in_ruleOpMultiAssign7123 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_58_in_ruleOpMultiAssign7142 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_59_in_ruleOpMultiAssign7161 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_60_in_ruleOpMultiAssign7180 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_61_in_ruleOpMultiAssign7199 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_62_in_ruleOpMultiAssign7219 = new BitSet(new long[]{0x4000000000000000L});
-    public static final BitSet FOLLOW_62_in_ruleOpMultiAssign7232 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_21_in_ruleOpMultiAssign7245 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_ruleOpMultiAssign7266 = new BitSet(new long[]{0x8000000000000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_63_in_ruleOpMultiAssign7280 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_64_in_ruleOpMultiAssign7295 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXOrExpression_in_entryRuleXOrExpression7336 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXOrExpression7346 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAndExpression_in_ruleXOrExpression7393 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpOr_in_ruleXOrExpression7446 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXAndExpression_in_ruleXOrExpression7469 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpOr_in_entryRuleOpOr7508 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpOr7519 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_65_in_ruleOpOr7556 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAndExpression_in_entryRuleXAndExpression7595 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAndExpression7605 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXEqualityExpression_in_ruleXAndExpression7652 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000004L});
-    public static final BitSet FOLLOW_ruleOpAnd_in_ruleXAndExpression7705 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXEqualityExpression_in_ruleXAndExpression7728 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000004L});
-    public static final BitSet FOLLOW_ruleOpAnd_in_entryRuleOpAnd7767 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpAnd7778 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_66_in_ruleOpAnd7815 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXEqualityExpression_in_entryRuleXEqualityExpression7854 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXEqualityExpression7864 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXRelationalExpression_in_ruleXEqualityExpression7911 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000078L});
-    public static final BitSet FOLLOW_ruleOpEquality_in_ruleXEqualityExpression7964 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXRelationalExpression_in_ruleXEqualityExpression7987 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000078L});
-    public static final BitSet FOLLOW_ruleOpEquality_in_entryRuleOpEquality8026 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpEquality8037 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_67_in_ruleOpEquality8075 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_68_in_ruleOpEquality8094 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_69_in_ruleOpEquality8113 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_70_in_ruleOpEquality8132 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXRelationalExpression_in_entryRuleXRelationalExpression8172 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXRelationalExpression8182 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXOtherOperatorExpression_in_ruleXRelationalExpression8229 = new BitSet(new long[]{0xC000000000000002L,0x0000000000000081L});
-    public static final BitSet FOLLOW_71_in_ruleXRelationalExpression8265 = new BitSet(new long[]{0x00C0000300000010L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleXRelationalExpression8288 = new BitSet(new long[]{0xC000000000000002L,0x0000000000000081L});
-    public static final BitSet FOLLOW_ruleOpCompare_in_ruleXRelationalExpression8349 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXOtherOperatorExpression_in_ruleXRelationalExpression8372 = new BitSet(new long[]{0xC000000000000002L,0x0000000000000081L});
-    public static final BitSet FOLLOW_ruleOpCompare_in_entryRuleOpCompare8412 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpCompare8423 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_64_in_ruleOpCompare8461 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_62_in_ruleOpCompare8481 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_21_in_ruleOpCompare8494 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_ruleOpCompare8514 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_62_in_ruleOpCompare8533 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXOtherOperatorExpression_in_entryRuleXOtherOperatorExpression8573 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXOtherOperatorExpression8583 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAdditiveExpression_in_ruleXOtherOperatorExpression8630 = new BitSet(new long[]{0xC000000100000002L,0x0000000000001F00L});
-    public static final BitSet FOLLOW_ruleOpOther_in_ruleXOtherOperatorExpression8683 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXAdditiveExpression_in_ruleXOtherOperatorExpression8706 = new BitSet(new long[]{0xC000000100000002L,0x0000000000001F00L});
-    public static final BitSet FOLLOW_ruleOpOther_in_entryRuleOpOther8745 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpOther8756 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_ruleOpOther8794 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_ruleOpOther8813 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_ruleOpOther8833 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_74_in_ruleOpOther8846 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_ruleOpOther8866 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_ruleOpOther8885 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_ruleOpOther8905 = new BitSet(new long[]{0x8000000000000000L});
-    public static final BitSet FOLLOW_63_in_ruleOpOther8936 = new BitSet(new long[]{0x8000000000000000L});
-    public static final BitSet FOLLOW_63_in_ruleOpOther8949 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_ruleOpOther8970 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_62_in_ruleOpOther8992 = new BitSet(new long[]{0x4000000100000000L});
-    public static final BitSet FOLLOW_62_in_ruleOpOther9023 = new BitSet(new long[]{0x4000000000000000L});
-    public static final BitSet FOLLOW_62_in_ruleOpOther9036 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_62_in_ruleOpOther9057 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_ruleOpOther9076 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_75_in_ruleOpOther9097 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_76_in_ruleOpOther9116 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXAdditiveExpression_in_entryRuleXAdditiveExpression9156 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXAdditiveExpression9166 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXMultiplicativeExpression_in_ruleXAdditiveExpression9213 = new BitSet(new long[]{0x0000000000000002L,0x0000000000006000L});
-    public static final BitSet FOLLOW_ruleOpAdd_in_ruleXAdditiveExpression9266 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXMultiplicativeExpression_in_ruleXAdditiveExpression9289 = new BitSet(new long[]{0x0000000000000002L,0x0000000000006000L});
-    public static final BitSet FOLLOW_ruleOpAdd_in_entryRuleOpAdd9328 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpAdd9339 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_77_in_ruleOpAdd9377 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_78_in_ruleOpAdd9396 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXMultiplicativeExpression_in_entryRuleXMultiplicativeExpression9436 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXMultiplicativeExpression9446 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXUnaryOperation_in_ruleXMultiplicativeExpression9493 = new BitSet(new long[]{0x0000000002000002L,0x0000000000038000L});
-    public static final BitSet FOLLOW_ruleOpMulti_in_ruleXMultiplicativeExpression9546 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXUnaryOperation_in_ruleXMultiplicativeExpression9569 = new BitSet(new long[]{0x0000000002000002L,0x0000000000038000L});
-    public static final BitSet FOLLOW_ruleOpMulti_in_entryRuleOpMulti9608 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpMulti9619 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_25_in_ruleOpMulti9657 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_79_in_ruleOpMulti9676 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_80_in_ruleOpMulti9695 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_81_in_ruleOpMulti9714 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXUnaryOperation_in_entryRuleXUnaryOperation9754 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXUnaryOperation9764 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpUnary_in_ruleXUnaryOperation9822 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXUnaryOperation_in_ruleXUnaryOperation9843 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCastedExpression_in_ruleXUnaryOperation9872 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpUnary_in_entryRuleOpUnary9908 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpUnary9919 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_82_in_ruleOpUnary9957 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_78_in_ruleOpUnary9976 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_77_in_ruleOpUnary9995 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCastedExpression_in_entryRuleXCastedExpression10035 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXCastedExpression10045 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXPostfixOperation_in_ruleXCastedExpression10092 = new BitSet(new long[]{0x0000000000000002L,0x0000000000080000L});
-    public static final BitSet FOLLOW_83_in_ruleXCastedExpression10127 = new BitSet(new long[]{0x00C0000300000010L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleXCastedExpression10150 = new BitSet(new long[]{0x0000000000000002L,0x0000000000080000L});
-    public static final BitSet FOLLOW_ruleXPostfixOperation_in_entryRuleXPostfixOperation10188 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXPostfixOperation10198 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXMemberFeatureCall_in_ruleXPostfixOperation10245 = new BitSet(new long[]{0x0000000000000002L,0x0000000000300000L});
-    public static final BitSet FOLLOW_ruleOpPostfix_in_ruleXPostfixOperation10297 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpPostfix_in_entryRuleOpPostfix10337 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOpPostfix10348 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_84_in_ruleOpPostfix10386 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_85_in_ruleOpPostfix10405 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXMemberFeatureCall_in_entryRuleXMemberFeatureCall10445 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXMemberFeatureCall10455 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXPrimaryExpression_in_ruleXMemberFeatureCall10502 = new BitSet(new long[]{0x0000001000000002L,0x0000000000C00000L});
-    public static final BitSet FOLLOW_36_in_ruleXMemberFeatureCall10574 = new BitSet(new long[]{0x00C0000000010010L,0x0000000700000000L});
-    public static final BitSet FOLLOW_86_in_ruleXMemberFeatureCall10598 = new BitSet(new long[]{0x00C0000000010010L,0x0000000700000000L});
-    public static final BitSet FOLLOW_ruleFeatureCallID_in_ruleXMemberFeatureCall10635 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_ruleOpSingleAssign_in_ruleXMemberFeatureCall10651 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXAssignment_in_ruleXMemberFeatureCall10673 = new BitSet(new long[]{0x0000001000000002L,0x0000000000C00000L});
-    public static final BitSet FOLLOW_36_in_ruleXMemberFeatureCall10759 = new BitSet(new long[]{0x40C0000000010010L,0x0000000F00000000L});
-    public static final BitSet FOLLOW_87_in_ruleXMemberFeatureCall10783 = new BitSet(new long[]{0x40C0000000010010L,0x0000000F00000000L});
-    public static final BitSet FOLLOW_86_in_ruleXMemberFeatureCall10820 = new BitSet(new long[]{0x40C0000000010010L,0x0000000F00000000L});
-    public static final BitSet FOLLOW_62_in_ruleXMemberFeatureCall10849 = new BitSet(new long[]{0x00C0000300000010L,0x0000800000000000L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleXMemberFeatureCall10870 = new BitSet(new long[]{0x8000000010000000L});
-    public static final BitSet FOLLOW_28_in_ruleXMemberFeatureCall10883 = new BitSet(new long[]{0x00C0000300000010L,0x0000800000000000L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleXMemberFeatureCall10904 = new BitSet(new long[]{0x8000000010000000L});
-    public static final BitSet FOLLOW_63_in_ruleXMemberFeatureCall10918 = new BitSet(new long[]{0x40C0000000010010L,0x0000000F00000000L});
-    public static final BitSet FOLLOW_ruleIdOrSuper_in_ruleXMemberFeatureCall10943 = new BitSet(new long[]{0x0000001208000002L,0x0000000000C00000L});
-    public static final BitSet FOLLOW_33_in_ruleXMemberFeatureCall10977 = new BitSet(new long[]{0x41C000070C8141F0L,0x00002FFF6B046000L});
-    public static final BitSet FOLLOW_ruleXShortClosure_in_ruleXMemberFeatureCall11062 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXMemberFeatureCall11090 = new BitSet(new long[]{0x0000000410000000L});
-    public static final BitSet FOLLOW_28_in_ruleXMemberFeatureCall11103 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXMemberFeatureCall11124 = new BitSet(new long[]{0x0000000410000000L});
-    public static final BitSet FOLLOW_34_in_ruleXMemberFeatureCall11141 = new BitSet(new long[]{0x0000001008000002L,0x0000000000C00000L});
-    public static final BitSet FOLLOW_ruleXClosure_in_ruleXMemberFeatureCall11176 = new BitSet(new long[]{0x0000001000000002L,0x0000000000C00000L});
-    public static final BitSet FOLLOW_ruleXPrimaryExpression_in_entryRuleXPrimaryExpression11216 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXPrimaryExpression11226 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstructorCall_in_ruleXPrimaryExpression11273 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBlockExpression_in_ruleXPrimaryExpression11300 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSwitchExpression_in_ruleXPrimaryExpression11327 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSynchronizedExpression_in_ruleXPrimaryExpression11371 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXFeatureCall_in_ruleXPrimaryExpression11399 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXLiteral_in_ruleXPrimaryExpression11426 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXIfExpression_in_ruleXPrimaryExpression11453 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXForLoopExpression_in_ruleXPrimaryExpression11510 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBasicForLoopExpression_in_ruleXPrimaryExpression11538 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXWhileExpression_in_ruleXPrimaryExpression11565 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXDoWhileExpression_in_ruleXPrimaryExpression11592 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXThrowExpression_in_ruleXPrimaryExpression11619 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXReturnExpression_in_ruleXPrimaryExpression11646 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXTryCatchFinallyExpression_in_ruleXPrimaryExpression11673 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXParenthesizedExpression_in_ruleXPrimaryExpression11700 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXLiteral_in_entryRuleXLiteral11735 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXLiteral11745 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCollectionLiteral_in_ruleXLiteral11792 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXClosure_in_ruleXLiteral11832 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBooleanLiteral_in_ruleXLiteral11860 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXNumberLiteral_in_ruleXLiteral11887 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXNullLiteral_in_ruleXLiteral11914 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXStringLiteral_in_ruleXLiteral11941 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXTypeLiteral_in_ruleXLiteral11968 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCollectionLiteral_in_entryRuleXCollectionLiteral12003 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXCollectionLiteral12013 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSetLiteral_in_ruleXCollectionLiteral12060 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXListLiteral_in_ruleXCollectionLiteral12087 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSetLiteral_in_entryRuleXSetLiteral12122 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXSetLiteral12132 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_ruleXSetLiteral12178 = new BitSet(new long[]{0x0000000000800000L});
-    public static final BitSet FOLLOW_23_in_ruleXSetLiteral12190 = new BitSet(new long[]{0x41C000020D8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXSetLiteral12212 = new BitSet(new long[]{0x0000000011000000L});
-    public static final BitSet FOLLOW_28_in_ruleXSetLiteral12225 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXSetLiteral12246 = new BitSet(new long[]{0x0000000011000000L});
-    public static final BitSet FOLLOW_24_in_ruleXSetLiteral12262 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXListLiteral_in_entryRuleXListLiteral12298 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXListLiteral12308 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_ruleXListLiteral12354 = new BitSet(new long[]{0x0000000008000000L});
-    public static final BitSet FOLLOW_27_in_ruleXListLiteral12366 = new BitSet(new long[]{0x41C000022C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXListLiteral12388 = new BitSet(new long[]{0x0000000030000000L});
-    public static final BitSet FOLLOW_28_in_ruleXListLiteral12401 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXListLiteral12422 = new BitSet(new long[]{0x0000000030000000L});
-    public static final BitSet FOLLOW_29_in_ruleXListLiteral12438 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXClosure_in_entryRuleXClosure12474 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXClosure12484 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_ruleXClosure12544 = new BitSet(new long[]{0x41D000032C8141F0L,0x00002FFFEB046000L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_ruleXClosure12617 = new BitSet(new long[]{0x0000000010000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_28_in_ruleXClosure12630 = new BitSet(new long[]{0x00C0000300000010L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_ruleXClosure12651 = new BitSet(new long[]{0x0000000010000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_88_in_ruleXClosure12673 = new BitSet(new long[]{0x41D000022C8141F0L,0x00002FFFEA046000L});
-    public static final BitSet FOLLOW_ruleXExpressionInClosure_in_ruleXClosure12710 = new BitSet(new long[]{0x0000000020000000L});
-    public static final BitSet FOLLOW_29_in_ruleXClosure12722 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpressionInClosure_in_entryRuleXExpressionInClosure12758 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXExpressionInClosure12768 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_ruleXExpressionInClosure12824 = new BitSet(new long[]{0x41D000020C8541F2L,0x00002FFFEA046000L});
-    public static final BitSet FOLLOW_18_in_ruleXExpressionInClosure12837 = new BitSet(new long[]{0x41D000020C8141F2L,0x00002FFFEA046000L});
-    public static final BitSet FOLLOW_ruleXShortClosure_in_entryRuleXShortClosure12877 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXShortClosure12887 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_ruleXShortClosure12995 = new BitSet(new long[]{0x0000000010000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_28_in_ruleXShortClosure13008 = new BitSet(new long[]{0x00C0000300000010L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_ruleXShortClosure13029 = new BitSet(new long[]{0x0000000010000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_88_in_ruleXShortClosure13051 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXShortClosure13087 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXParenthesizedExpression_in_entryRuleXParenthesizedExpression13123 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXParenthesizedExpression13133 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_ruleXParenthesizedExpression13170 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXParenthesizedExpression13192 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_34_in_ruleXParenthesizedExpression13203 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXIfExpression_in_entryRuleXIfExpression13239 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXIfExpression13249 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_89_in_ruleXIfExpression13295 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_33_in_ruleXIfExpression13307 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXIfExpression13328 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_34_in_ruleXIfExpression13340 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXIfExpression13361 = new BitSet(new long[]{0x0000000000000002L,0x0000000004000000L});
-    public static final BitSet FOLLOW_90_in_ruleXIfExpression13382 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXIfExpression13404 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSwitchExpression_in_entryRuleXSwitchExpression13442 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXSwitchExpression13452 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_91_in_ruleXSwitchExpression13498 = new BitSet(new long[]{0x41C000030C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_33_in_ruleXSwitchExpression13536 = new BitSet(new long[]{0x00C0000300000010L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_ruleXSwitchExpression13557 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_30_in_ruleXSwitchExpression13569 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXSwitchExpression13592 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_34_in_ruleXSwitchExpression13604 = new BitSet(new long[]{0x0000000000800000L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_ruleXSwitchExpression13653 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_30_in_ruleXSwitchExpression13665 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXSwitchExpression13689 = new BitSet(new long[]{0x0000000000800000L});
-    public static final BitSet FOLLOW_23_in_ruleXSwitchExpression13703 = new BitSet(new long[]{0x00C8000351000010L,0x0000000010000000L});
-    public static final BitSet FOLLOW_ruleXCasePart_in_ruleXSwitchExpression13724 = new BitSet(new long[]{0x00C8000351000010L,0x0000000010000000L});
-    public static final BitSet FOLLOW_51_in_ruleXSwitchExpression13738 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_30_in_ruleXSwitchExpression13750 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXSwitchExpression13771 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_24_in_ruleXSwitchExpression13785 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCasePart_in_entryRuleXCasePart13821 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXCasePart13831 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleXCasePart13886 = new BitSet(new long[]{0x0000000050000000L,0x0000000010000000L});
-    public static final BitSet FOLLOW_92_in_ruleXCasePart13900 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXCasePart13921 = new BitSet(new long[]{0x0000000050000000L});
-    public static final BitSet FOLLOW_30_in_ruleXCasePart13937 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXCasePart13958 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_ruleXCasePart13983 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXForLoopExpression_in_entryRuleXForLoopExpression14033 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXForLoopExpression14043 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_14_in_ruleXForLoopExpression14120 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_33_in_ruleXForLoopExpression14132 = new BitSet(new long[]{0x00C0000300000010L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_ruleXForLoopExpression14153 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_30_in_ruleXForLoopExpression14165 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXForLoopExpression14188 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_34_in_ruleXForLoopExpression14200 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXForLoopExpression14221 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBasicForLoopExpression_in_entryRuleXBasicForLoopExpression14257 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXBasicForLoopExpression14267 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_14_in_ruleXBasicForLoopExpression14313 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_33_in_ruleXBasicForLoopExpression14325 = new BitSet(new long[]{0x41D000020C8541F0L,0x00002FFFEA046000L});
-    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_ruleXBasicForLoopExpression14347 = new BitSet(new long[]{0x0000000010040000L});
-    public static final BitSet FOLLOW_28_in_ruleXBasicForLoopExpression14360 = new BitSet(new long[]{0x41D000020C8141F0L,0x00002FFFEA046000L});
-    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_ruleXBasicForLoopExpression14381 = new BitSet(new long[]{0x0000000010040000L});
-    public static final BitSet FOLLOW_18_in_ruleXBasicForLoopExpression14397 = new BitSet(new long[]{0x41C000020C8541F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXBasicForLoopExpression14418 = new BitSet(new long[]{0x0000000000040000L});
-    public static final BitSet FOLLOW_18_in_ruleXBasicForLoopExpression14431 = new BitSet(new long[]{0x41C000060C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXBasicForLoopExpression14453 = new BitSet(new long[]{0x0000000410000000L});
-    public static final BitSet FOLLOW_28_in_ruleXBasicForLoopExpression14466 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXBasicForLoopExpression14487 = new BitSet(new long[]{0x0000000410000000L});
-    public static final BitSet FOLLOW_34_in_ruleXBasicForLoopExpression14503 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXBasicForLoopExpression14524 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXWhileExpression_in_entryRuleXWhileExpression14560 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXWhileExpression14570 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_93_in_ruleXWhileExpression14616 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_33_in_ruleXWhileExpression14628 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXWhileExpression14649 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_34_in_ruleXWhileExpression14661 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXWhileExpression14682 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXDoWhileExpression_in_entryRuleXDoWhileExpression14718 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXDoWhileExpression14728 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_94_in_ruleXDoWhileExpression14774 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXDoWhileExpression14795 = new BitSet(new long[]{0x0000000000000000L,0x0000000020000000L});
-    public static final BitSet FOLLOW_93_in_ruleXDoWhileExpression14807 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_33_in_ruleXDoWhileExpression14819 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXDoWhileExpression14840 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_34_in_ruleXDoWhileExpression14852 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBlockExpression_in_entryRuleXBlockExpression14888 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXBlockExpression14898 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_ruleXBlockExpression14944 = new BitSet(new long[]{0x41D000020D8141F0L,0x00002FFFEA046000L});
-    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_ruleXBlockExpression14966 = new BitSet(new long[]{0x41D000020D8541F0L,0x00002FFFEA046000L});
-    public static final BitSet FOLLOW_18_in_ruleXBlockExpression14979 = new BitSet(new long[]{0x41D000020D8141F0L,0x00002FFFEA046000L});
-    public static final BitSet FOLLOW_24_in_ruleXBlockExpression14995 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpressionOrVarDeclaration_in_entryRuleXExpressionOrVarDeclaration15031 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXExpressionOrVarDeclaration15041 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXVariableDeclaration_in_ruleXExpressionOrVarDeclaration15088 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXExpressionOrVarDeclaration15115 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXVariableDeclaration_in_entryRuleXVariableDeclaration15150 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXVariableDeclaration15160 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_95_in_ruleXVariableDeclaration15213 = new BitSet(new long[]{0x00C0000300000010L});
-    public static final BitSet FOLLOW_52_in_ruleXVariableDeclaration15244 = new BitSet(new long[]{0x00C0000300000010L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleXVariableDeclaration15292 = new BitSet(new long[]{0x00C0000000000010L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleXVariableDeclaration15313 = new BitSet(new long[]{0x0000000000200002L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleXVariableDeclaration15342 = new BitSet(new long[]{0x0000000000200002L});
-    public static final BitSet FOLLOW_21_in_ruleXVariableDeclaration15356 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXVariableDeclaration15377 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_entryRuleJvmFormalParameter15415 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmFormalParameter15425 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleJvmFormalParameter15471 = new BitSet(new long[]{0x00C0000000000010L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleJvmFormalParameter15493 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFullJvmFormalParameter_in_entryRuleFullJvmFormalParameter15529 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFullJvmFormalParameter15539 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleFullJvmFormalParameter15585 = new BitSet(new long[]{0x00C0000000000010L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleFullJvmFormalParameter15606 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXFeatureCall_in_entryRuleXFeatureCall15642 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXFeatureCall15652 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_62_in_ruleXFeatureCall15699 = new BitSet(new long[]{0x00C0000300000010L,0x0000800000000000L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleXFeatureCall15720 = new BitSet(new long[]{0x8000000010000000L});
-    public static final BitSet FOLLOW_28_in_ruleXFeatureCall15733 = new BitSet(new long[]{0x00C0000300000010L,0x0000800000000000L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleXFeatureCall15754 = new BitSet(new long[]{0x8000000010000000L});
-    public static final BitSet FOLLOW_63_in_ruleXFeatureCall15768 = new BitSet(new long[]{0x40C0000000010010L,0x0000000F00000000L});
-    public static final BitSet FOLLOW_ruleIdOrSuper_in_ruleXFeatureCall15793 = new BitSet(new long[]{0x0000000208000002L});
-    public static final BitSet FOLLOW_33_in_ruleXFeatureCall15827 = new BitSet(new long[]{0x41C000070C8141F0L,0x00002FFF6B046000L});
-    public static final BitSet FOLLOW_ruleXShortClosure_in_ruleXFeatureCall15912 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXFeatureCall15940 = new BitSet(new long[]{0x0000000410000000L});
-    public static final BitSet FOLLOW_28_in_ruleXFeatureCall15953 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXFeatureCall15974 = new BitSet(new long[]{0x0000000410000000L});
-    public static final BitSet FOLLOW_34_in_ruleXFeatureCall15991 = new BitSet(new long[]{0x0000000008000002L});
-    public static final BitSet FOLLOW_ruleXClosure_in_ruleXFeatureCall16026 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFeatureCallID_in_entryRuleFeatureCallID16064 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFeatureCallID16075 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleFeatureCallID16122 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_16_in_ruleFeatureCallID16146 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_96_in_ruleFeatureCallID16165 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_97_in_ruleFeatureCallID16184 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_98_in_ruleFeatureCallID16203 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdOrSuper_in_entryRuleIdOrSuper16244 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIdOrSuper16255 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFeatureCallID_in_ruleIdOrSuper16302 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_99_in_ruleIdOrSuper16326 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXConstructorCall_in_entryRuleXConstructorCall16366 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXConstructorCall16376 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_100_in_ruleXConstructorCall16422 = new BitSet(new long[]{0x00C0000000000010L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleXConstructorCall16445 = new BitSet(new long[]{0x4000000208000002L});
-    public static final BitSet FOLLOW_62_in_ruleXConstructorCall16466 = new BitSet(new long[]{0x00C0000300000010L,0x0000800000000000L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleXConstructorCall16488 = new BitSet(new long[]{0x8000000010000000L});
-    public static final BitSet FOLLOW_28_in_ruleXConstructorCall16501 = new BitSet(new long[]{0x00C0000300000010L,0x0000800000000000L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleXConstructorCall16522 = new BitSet(new long[]{0x8000000010000000L});
-    public static final BitSet FOLLOW_63_in_ruleXConstructorCall16536 = new BitSet(new long[]{0x0000000208000002L});
-    public static final BitSet FOLLOW_33_in_ruleXConstructorCall16572 = new BitSet(new long[]{0x41C000070C8141F0L,0x00002FFF6B046000L});
-    public static final BitSet FOLLOW_ruleXShortClosure_in_ruleXConstructorCall16657 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXConstructorCall16685 = new BitSet(new long[]{0x0000000410000000L});
-    public static final BitSet FOLLOW_28_in_ruleXConstructorCall16698 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXConstructorCall16719 = new BitSet(new long[]{0x0000000410000000L});
-    public static final BitSet FOLLOW_34_in_ruleXConstructorCall16736 = new BitSet(new long[]{0x0000000008000002L});
-    public static final BitSet FOLLOW_ruleXClosure_in_ruleXConstructorCall16771 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXBooleanLiteral_in_entryRuleXBooleanLiteral16808 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXBooleanLiteral16818 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_101_in_ruleXBooleanLiteral16865 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_102_in_ruleXBooleanLiteral16889 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXNullLiteral_in_entryRuleXNullLiteral16939 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXNullLiteral16949 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_103_in_ruleXNullLiteral16995 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXNumberLiteral_in_entryRuleXNumberLiteral17031 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXNumberLiteral17041 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNumber_in_ruleXNumberLiteral17096 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXStringLiteral_in_entryRuleXStringLiteral17132 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXStringLiteral17142 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleXStringLiteral17193 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXTypeLiteral_in_entryRuleXTypeLiteral17234 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXTypeLiteral17244 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_104_in_ruleXTypeLiteral17290 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_33_in_ruleXTypeLiteral17302 = new BitSet(new long[]{0x00C0000000000010L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleXTypeLiteral17325 = new BitSet(new long[]{0x0000000408000000L});
-    public static final BitSet FOLLOW_ruleArrayBrackets_in_ruleXTypeLiteral17346 = new BitSet(new long[]{0x0000000408000000L});
-    public static final BitSet FOLLOW_34_in_ruleXTypeLiteral17359 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXThrowExpression_in_entryRuleXThrowExpression17395 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXThrowExpression17405 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_105_in_ruleXThrowExpression17451 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXThrowExpression17472 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXReturnExpression_in_entryRuleXReturnExpression17508 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXReturnExpression17518 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_106_in_ruleXReturnExpression17564 = new BitSet(new long[]{0x41C000020C8141F2L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXReturnExpression17813 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXTryCatchFinallyExpression_in_entryRuleXTryCatchFinallyExpression17850 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXTryCatchFinallyExpression17860 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_107_in_ruleXTryCatchFinallyExpression17906 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXTryCatchFinallyExpression17927 = new BitSet(new long[]{0x0000000000000000L,0x0000500000000000L});
-    public static final BitSet FOLLOW_ruleXCatchClause_in_ruleXTryCatchFinallyExpression17957 = new BitSet(new long[]{0x0000000000000002L,0x0000500000000000L});
-    public static final BitSet FOLLOW_108_in_ruleXTryCatchFinallyExpression17979 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXTryCatchFinallyExpression18001 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_108_in_ruleXTryCatchFinallyExpression18023 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXTryCatchFinallyExpression18044 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXSynchronizedExpression_in_entryRuleXSynchronizedExpression18082 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXSynchronizedExpression18092 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_109_in_ruleXSynchronizedExpression18156 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_33_in_ruleXSynchronizedExpression18168 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXSynchronizedExpression18191 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_34_in_ruleXSynchronizedExpression18203 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXSynchronizedExpression18224 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXCatchClause_in_entryRuleXCatchClause18260 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXCatchClause18270 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_110_in_ruleXCatchClause18315 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_33_in_ruleXCatchClause18328 = new BitSet(new long[]{0x00C0000300000010L});
-    public static final BitSet FOLLOW_ruleFullJvmFormalParameter_in_ruleXCatchClause18349 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_34_in_ruleXCatchClause18361 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
-    public static final BitSet FOLLOW_ruleXExpression_in_ruleXCatchClause18382 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName18419 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedName18430 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleQualifiedName18477 = new BitSet(new long[]{0x0000001000000002L});
-    public static final BitSet FOLLOW_36_in_ruleQualifiedName18505 = new BitSet(new long[]{0x00C0000000000010L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleQualifiedName18528 = new BitSet(new long[]{0x0000001000000002L});
-    public static final BitSet FOLLOW_ruleNumber_in_entryRuleNumber18582 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNumber18593 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_HEX_in_ruleNumber18637 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleNumber18665 = new BitSet(new long[]{0x0000001000000002L});
-    public static final BitSet FOLLOW_RULE_DECIMAL_in_ruleNumber18691 = new BitSet(new long[]{0x0000001000000002L});
-    public static final BitSet FOLLOW_36_in_ruleNumber18711 = new BitSet(new long[]{0x0000000000000140L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleNumber18727 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_DECIMAL_in_ruleNumber18753 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_entryRuleJvmTypeReference18808 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmTypeReference18818 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmParameterizedTypeReference_in_ruleJvmTypeReference18866 = new BitSet(new long[]{0x0000000008000002L});
-    public static final BitSet FOLLOW_ruleArrayBrackets_in_ruleJvmTypeReference18902 = new BitSet(new long[]{0x0000000008000002L});
-    public static final BitSet FOLLOW_ruleXFunctionTypeRef_in_ruleJvmTypeReference18933 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleArrayBrackets_in_entryRuleArrayBrackets18969 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleArrayBrackets18980 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_ruleArrayBrackets19018 = new BitSet(new long[]{0x0000000020000000L});
-    public static final BitSet FOLLOW_29_in_ruleArrayBrackets19031 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXFunctionTypeRef_in_entryRuleXFunctionTypeRef19071 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXFunctionTypeRef19081 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_ruleXFunctionTypeRef19119 = new BitSet(new long[]{0x00C0000700000010L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleXFunctionTypeRef19141 = new BitSet(new long[]{0x0000000410000000L});
-    public static final BitSet FOLLOW_28_in_ruleXFunctionTypeRef19154 = new BitSet(new long[]{0x00C0000300000010L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleXFunctionTypeRef19175 = new BitSet(new long[]{0x0000000410000000L});
-    public static final BitSet FOLLOW_34_in_ruleXFunctionTypeRef19191 = new BitSet(new long[]{0x0000000100000000L});
-    public static final BitSet FOLLOW_32_in_ruleXFunctionTypeRef19205 = new BitSet(new long[]{0x00C0000300000010L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleXFunctionTypeRef19226 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmParameterizedTypeReference_in_entryRuleJvmParameterizedTypeReference19262 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmParameterizedTypeReference19272 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleJvmParameterizedTypeReference19320 = new BitSet(new long[]{0x4000000000000002L});
-    public static final BitSet FOLLOW_62_in_ruleJvmParameterizedTypeReference19341 = new BitSet(new long[]{0x00C0000300000010L,0x0000800000000000L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleJvmParameterizedTypeReference19363 = new BitSet(new long[]{0x8000000010000000L});
-    public static final BitSet FOLLOW_28_in_ruleJvmParameterizedTypeReference19376 = new BitSet(new long[]{0x00C0000300000010L,0x0000800000000000L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleJvmParameterizedTypeReference19397 = new BitSet(new long[]{0x8000000010000000L});
-    public static final BitSet FOLLOW_63_in_ruleJvmParameterizedTypeReference19411 = new BitSet(new long[]{0x0000001000000002L});
-    public static final BitSet FOLLOW_36_in_ruleJvmParameterizedTypeReference19447 = new BitSet(new long[]{0x00C0000000000010L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleJvmParameterizedTypeReference19472 = new BitSet(new long[]{0x4000001000000002L});
-    public static final BitSet FOLLOW_62_in_ruleJvmParameterizedTypeReference19493 = new BitSet(new long[]{0x00C0000300000010L,0x0000800000000000L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleJvmParameterizedTypeReference19515 = new BitSet(new long[]{0x8000000010000000L});
-    public static final BitSet FOLLOW_28_in_ruleJvmParameterizedTypeReference19528 = new BitSet(new long[]{0x00C0000300000010L,0x0000800000000000L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_ruleJvmParameterizedTypeReference19549 = new BitSet(new long[]{0x8000000010000000L});
-    public static final BitSet FOLLOW_63_in_ruleJvmParameterizedTypeReference19563 = new BitSet(new long[]{0x0000001000000002L});
-    public static final BitSet FOLLOW_ruleJvmArgumentTypeReference_in_entryRuleJvmArgumentTypeReference19605 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmArgumentTypeReference19615 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleJvmArgumentTypeReference19662 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmWildcardTypeReference_in_ruleJvmArgumentTypeReference19689 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmWildcardTypeReference_in_entryRuleJvmWildcardTypeReference19724 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmWildcardTypeReference19734 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_111_in_ruleJvmWildcardTypeReference19780 = new BitSet(new long[]{0x0000000000010002L,0x0000000800000000L});
-    public static final BitSet FOLLOW_ruleJvmUpperBound_in_ruleJvmWildcardTypeReference19803 = new BitSet(new long[]{0x0000000000000002L,0x0001000000000000L});
-    public static final BitSet FOLLOW_ruleJvmUpperBoundAnded_in_ruleJvmWildcardTypeReference19824 = new BitSet(new long[]{0x0000000000000002L,0x0001000000000000L});
-    public static final BitSet FOLLOW_ruleJvmLowerBound_in_ruleJvmWildcardTypeReference19854 = new BitSet(new long[]{0x0000000000000002L,0x0001000000000000L});
-    public static final BitSet FOLLOW_ruleJvmLowerBoundAnded_in_ruleJvmWildcardTypeReference19875 = new BitSet(new long[]{0x0000000000000002L,0x0001000000000000L});
-    public static final BitSet FOLLOW_ruleJvmUpperBound_in_entryRuleJvmUpperBound19915 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmUpperBound19925 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_16_in_ruleJvmUpperBound19962 = new BitSet(new long[]{0x00C0000300000010L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleJvmUpperBound19983 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmUpperBoundAnded_in_entryRuleJvmUpperBoundAnded20019 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmUpperBoundAnded20029 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_112_in_ruleJvmUpperBoundAnded20066 = new BitSet(new long[]{0x00C0000300000010L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleJvmUpperBoundAnded20087 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmLowerBound_in_entryRuleJvmLowerBound20123 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmLowerBound20133 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_99_in_ruleJvmLowerBound20170 = new BitSet(new long[]{0x00C0000300000010L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleJvmLowerBound20191 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmLowerBoundAnded_in_entryRuleJvmLowerBoundAnded20227 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleJvmLowerBoundAnded20237 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_112_in_ruleJvmLowerBoundAnded20274 = new BitSet(new long[]{0x00C0000300000010L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_ruleJvmLowerBoundAnded20295 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedNameWithWildcard_in_entryRuleQualifiedNameWithWildcard20334 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedNameWithWildcard20345 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleQualifiedNameWithWildcard20392 = new BitSet(new long[]{0x0000001000000000L});
-    public static final BitSet FOLLOW_36_in_ruleQualifiedNameWithWildcard20410 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_ruleQualifiedNameWithWildcard20423 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleXImportDeclaration_in_entryRuleXImportDeclaration20465 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleXImportDeclaration20475 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_97_in_ruleXImportDeclaration20512 = new BitSet(new long[]{0x00C0000000000010L,0x0000000100000000L});
-    public static final BitSet FOLLOW_96_in_ruleXImportDeclaration20532 = new BitSet(new long[]{0x00C0000000000010L,0x0000000400000000L});
-    public static final BitSet FOLLOW_98_in_ruleXImportDeclaration20563 = new BitSet(new long[]{0x00C0000000000010L,0x0000000400000000L});
-    public static final BitSet FOLLOW_ruleQualifiedNameInStaticImport_in_ruleXImportDeclaration20600 = new BitSet(new long[]{0x00C0000002000010L});
-    public static final BitSet FOLLOW_25_in_ruleXImportDeclaration20619 = new BitSet(new long[]{0x0000000000040002L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleXImportDeclaration20659 = new BitSet(new long[]{0x0000000000040002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleXImportDeclaration20690 = new BitSet(new long[]{0x0000000000040002L});
-    public static final BitSet FOLLOW_ruleQualifiedNameWithWildcard_in_ruleXImportDeclaration20717 = new BitSet(new long[]{0x0000000000040002L});
-    public static final BitSet FOLLOW_18_in_ruleXImportDeclaration20731 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedNameInStaticImport_in_entryRuleQualifiedNameInStaticImport20770 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedNameInStaticImport20781 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleQualifiedNameInStaticImport20828 = new BitSet(new long[]{0x0000001000000000L});
-    public static final BitSet FOLLOW_36_in_ruleQualifiedNameInStaticImport20846 = new BitSet(new long[]{0x00C0000000000012L});
-    public static final BitSet FOLLOW_113_in_ruleMatcherType20901 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_114_in_ruleMatcherType20918 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_115_in_ruleMatcherType20935 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_116_in_ruleMatcherType20952 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_117_in_ruleMatcherType20969 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_synpred1_InternalFormat5688 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_synpred2_InternalFormat5717 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_21_in_synpred2_InternalFormat5723 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_synpred5_InternalFormat6079 = new BitSet(new long[]{0x0000000008000000L});
-    public static final BitSet FOLLOW_27_in_synpred5_InternalFormat6083 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_synpred6_InternalFormat6354 = new BitSet(new long[]{0x0000000008000000L});
-    public static final BitSet FOLLOW_27_in_synpred6_InternalFormat6358 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpMultiAssign_in_synpred7_InternalFormat6891 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpOr_in_synpred8_InternalFormat7414 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpAnd_in_synpred9_InternalFormat7673 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpEquality_in_synpred10_InternalFormat7932 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_synpred11_InternalFormat8246 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpCompare_in_synpred12_InternalFormat8317 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpOther_in_synpred13_InternalFormat8651 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_synpred14_InternalFormat8920 = new BitSet(new long[]{0x8000000000000000L});
-    public static final BitSet FOLLOW_63_in_synpred14_InternalFormat8925 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_62_in_synpred15_InternalFormat9007 = new BitSet(new long[]{0x4000000000000000L});
-    public static final BitSet FOLLOW_62_in_synpred15_InternalFormat9012 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpAdd_in_synpred16_InternalFormat9234 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpMulti_in_synpred17_InternalFormat9514 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_83_in_synpred18_InternalFormat10108 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOpPostfix_in_synpred19_InternalFormat10265 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_synpred20_InternalFormat10520 = new BitSet(new long[]{0x00C0000000010010L,0x0000000700000000L});
-    public static final BitSet FOLLOW_86_in_synpred20_InternalFormat10534 = new BitSet(new long[]{0x00C0000000010010L,0x0000000700000000L});
-    public static final BitSet FOLLOW_ruleFeatureCallID_in_synpred20_InternalFormat10550 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_ruleOpSingleAssign_in_synpred20_InternalFormat10556 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_synpred21_InternalFormat10698 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_87_in_synpred21_InternalFormat10712 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_86_in_synpred21_InternalFormat10732 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_synpred22_InternalFormat10959 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred23_InternalFormat11011 = new BitSet(new long[]{0x0000000010000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_28_in_synpred23_InternalFormat11018 = new BitSet(new long[]{0x00C0000300000010L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred23_InternalFormat11025 = new BitSet(new long[]{0x0000000010000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_88_in_synpred23_InternalFormat11039 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_synpred24_InternalFormat11159 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_109_in_synpred25_InternalFormat11348 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_33_in_synpred25_InternalFormat11352 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_14_in_synpred26_InternalFormat11474 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_33_in_synpred26_InternalFormat11478 = new BitSet(new long[]{0x00C0000300000010L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred26_InternalFormat11485 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_30_in_synpred26_InternalFormat11491 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_synpred27_InternalFormat11813 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred29_InternalFormat12563 = new BitSet(new long[]{0x0000000010000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_28_in_synpred29_InternalFormat12570 = new BitSet(new long[]{0x00C0000300000010L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred29_InternalFormat12577 = new BitSet(new long[]{0x0000000010000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_88_in_synpred29_InternalFormat12591 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_90_in_synpred31_InternalFormat13374 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_synpred32_InternalFormat13513 = new BitSet(new long[]{0x00C0000300000010L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred32_InternalFormat13520 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_30_in_synpred32_InternalFormat13526 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred33_InternalFormat13628 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_30_in_synpred33_InternalFormat13634 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmTypeReference_in_synpred35_InternalFormat15262 = new BitSet(new long[]{0x00C0000000000010L});
-    public static final BitSet FOLLOW_ruleValidID_in_synpred35_InternalFormat15271 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_synpred36_InternalFormat15809 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred37_InternalFormat15861 = new BitSet(new long[]{0x0000000010000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_28_in_synpred37_InternalFormat15868 = new BitSet(new long[]{0x00C0000300000010L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred37_InternalFormat15875 = new BitSet(new long[]{0x0000000010000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_88_in_synpred37_InternalFormat15889 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_synpred38_InternalFormat16009 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_62_in_synpred39_InternalFormat16458 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_synpred40_InternalFormat16554 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred41_InternalFormat16606 = new BitSet(new long[]{0x0000000010000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_28_in_synpred41_InternalFormat16613 = new BitSet(new long[]{0x00C0000300000010L});
-    public static final BitSet FOLLOW_ruleJvmFormalParameter_in_synpred41_InternalFormat16620 = new BitSet(new long[]{0x0000000010000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_88_in_synpred41_InternalFormat16634 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_synpred42_InternalFormat16754 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_set_in_synpred43_InternalFormat17574 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_110_in_synpred44_InternalFormat17941 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_108_in_synpred45_InternalFormat17971 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_synpred48_InternalFormat18496 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleArrayBrackets_in_synpred49_InternalFormat18881 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_62_in_synpred50_InternalFormat19333 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_synpred51_InternalFormat19428 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_62_in_synpred52_InternalFormat19485 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_1 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_2 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x0000000000004000L});
+    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0018000000000010L});
+    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0000000002438012L});
+    public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000002430012L});
+    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x00C0000000000010L});
+    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000000002420012L});
+    public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000000180010L});
+    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000000040000L});
+    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000000002400012L});
+    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000200000L});
+    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000000000060L});
+    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000000800000L});
+    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x003800028D200030L});
+    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x003800020D200030L});
+    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0018000000000030L});
+    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000000030000000L});
+    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000000040000000L});
+    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000000050000000L});
+    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0038000004200030L});
+    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x00071FC000000000L});
+    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000000010040000L});
+    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0000000000000040L});
+    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0000000140800000L});
+    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x003800028C200030L});
+    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000000400000000L});
+    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000002800000000L});
+    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0000001000000000L});
+    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0000000000000000L,0x003E000000000000L});
+    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0000000000800002L});
+    public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x0018000000000050L});
+    public static final BitSet FOLLOW_36 = new BitSet(new long[]{0x0018000000000052L});
+    public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x0018200000800050L});
+    public static final BitSet FOLLOW_38 = new BitSet(new long[]{0x0018000000800050L});
+    public static final BitSet FOLLOW_39 = new BitSet(new long[]{0x0000C00000000002L});
+    public static final BitSet FOLLOW_40 = new BitSet(new long[]{0x0000800000000002L});
+    public static final BitSet FOLLOW_41 = new BitSet(new long[]{0x0018200000000050L});
+    public static final BitSet FOLLOW_42 = new BitSet(new long[]{0x0018000000800052L});
+    public static final BitSet FOLLOW_43 = new BitSet(new long[]{0x0000000200000002L});
+    public static final BitSet FOLLOW_44 = new BitSet(new long[]{0x0000000010000000L});
+    public static final BitSet FOLLOW_45 = new BitSet(new long[]{0x0000001000000002L});
+    public static final BitSet FOLLOW_46 = new BitSet(new long[]{0x41C000060C8141F0L,0x00002FFF6A046000L});
+    public static final BitSet FOLLOW_47 = new BitSet(new long[]{0x0000000410000000L});
+    public static final BitSet FOLLOW_48 = new BitSet(new long[]{0x41C000020C8141F0L,0x00002FFF6A046000L});
+    public static final BitSet FOLLOW_49 = new BitSet(new long[]{0x0000000008000000L});
+    public static final BitSet FOLLOW_50 = new BitSet(new long[]{0x41C000022C8141F0L,0x00002FFF6A046000L});
+    public static final BitSet FOLLOW_51 = new BitSet(new long[]{0x0000000010000002L});
+    public static final BitSet FOLLOW_52 = new BitSet(new long[]{0xFE00000000000002L});
+    public static final BitSet FOLLOW_53 = new BitSet(new long[]{0x4000000000000000L});
+    public static final BitSet FOLLOW_54 = new BitSet(new long[]{0x8000000000000000L,0x0000000000000001L});
+    public static final BitSet FOLLOW_55 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000001L});
+    public static final BitSet FOLLOW_56 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000002L});
+    public static final BitSet FOLLOW_57 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000004L});
+    public static final BitSet FOLLOW_58 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000078L});
+    public static final BitSet FOLLOW_59 = new BitSet(new long[]{0xC000000000000002L,0x0000000000000081L});
+    public static final BitSet FOLLOW_60 = new BitSet(new long[]{0x00C0000300000010L});
+    public static final BitSet FOLLOW_61 = new BitSet(new long[]{0xC000000100000002L,0x0000000000001F00L});
+    public static final BitSet FOLLOW_62 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
+    public static final BitSet FOLLOW_63 = new BitSet(new long[]{0x8000000000000000L});
+    public static final BitSet FOLLOW_64 = new BitSet(new long[]{0x4000000100000000L});
+    public static final BitSet FOLLOW_65 = new BitSet(new long[]{0x0000000000000002L,0x0000000000006000L});
+    public static final BitSet FOLLOW_66 = new BitSet(new long[]{0x0000000002000002L,0x0000000000038000L});
+    public static final BitSet FOLLOW_67 = new BitSet(new long[]{0x0000000000000002L,0x0000000000080000L});
+    public static final BitSet FOLLOW_68 = new BitSet(new long[]{0x0000000000000002L,0x0000000000300000L});
+    public static final BitSet FOLLOW_69 = new BitSet(new long[]{0x0000001000000002L,0x0000000000C00000L});
+    public static final BitSet FOLLOW_70 = new BitSet(new long[]{0x00C0000000010010L,0x0000000700000000L});
+    public static final BitSet FOLLOW_71 = new BitSet(new long[]{0x40C0000000010010L,0x0000000F00000000L});
+    public static final BitSet FOLLOW_72 = new BitSet(new long[]{0x00C0000300000010L,0x0000800000000000L});
+    public static final BitSet FOLLOW_73 = new BitSet(new long[]{0x8000000010000000L});
+    public static final BitSet FOLLOW_74 = new BitSet(new long[]{0x0000001208000002L,0x0000000000C00000L});
+    public static final BitSet FOLLOW_75 = new BitSet(new long[]{0x41C000070C8141F0L,0x00002FFF6B046000L});
+    public static final BitSet FOLLOW_76 = new BitSet(new long[]{0x0000001008000002L,0x0000000000C00000L});
+    public static final BitSet FOLLOW_77 = new BitSet(new long[]{0x41C000020D8141F0L,0x00002FFF6A046000L});
+    public static final BitSet FOLLOW_78 = new BitSet(new long[]{0x0000000011000000L});
+    public static final BitSet FOLLOW_79 = new BitSet(new long[]{0x41D000032C8141F0L,0x00002FFFEB046000L});
+    public static final BitSet FOLLOW_80 = new BitSet(new long[]{0x0000000010000000L,0x0000000001000000L});
+    public static final BitSet FOLLOW_81 = new BitSet(new long[]{0x41D000022C8141F0L,0x00002FFFEA046000L});
+    public static final BitSet FOLLOW_82 = new BitSet(new long[]{0x0000000020000000L});
+    public static final BitSet FOLLOW_83 = new BitSet(new long[]{0x41D000020C8541F2L,0x00002FFFEA046000L});
+    public static final BitSet FOLLOW_84 = new BitSet(new long[]{0x41D000020C8141F2L,0x00002FFFEA046000L});
+    public static final BitSet FOLLOW_85 = new BitSet(new long[]{0x0000000200000000L});
+    public static final BitSet FOLLOW_86 = new BitSet(new long[]{0x0000000000000002L,0x0000000004000000L});
+    public static final BitSet FOLLOW_87 = new BitSet(new long[]{0x41C000030C8141F0L,0x00002FFF6A046000L});
+    public static final BitSet FOLLOW_88 = new BitSet(new long[]{0x00C8000351000010L,0x0000000010000000L});
+    public static final BitSet FOLLOW_89 = new BitSet(new long[]{0x0000000001000000L});
+    public static final BitSet FOLLOW_90 = new BitSet(new long[]{0x0000000050000000L,0x0000000010000000L});
+    public static final BitSet FOLLOW_91 = new BitSet(new long[]{0x41D000020C8541F0L,0x00002FFFEA046000L});
+    public static final BitSet FOLLOW_92 = new BitSet(new long[]{0x41D000020C8141F0L,0x00002FFFEA046000L});
+    public static final BitSet FOLLOW_93 = new BitSet(new long[]{0x41C000020C8541F0L,0x00002FFF6A046000L});
+    public static final BitSet FOLLOW_94 = new BitSet(new long[]{0x0000000000000000L,0x0000000020000000L});
+    public static final BitSet FOLLOW_95 = new BitSet(new long[]{0x41D000020D8141F0L,0x00002FFFEA046000L});
+    public static final BitSet FOLLOW_96 = new BitSet(new long[]{0x41D000020D8541F0L,0x00002FFFEA046000L});
+    public static final BitSet FOLLOW_97 = new BitSet(new long[]{0x0000000000200002L});
+    public static final BitSet FOLLOW_98 = new BitSet(new long[]{0x0000000208000002L});
+    public static final BitSet FOLLOW_99 = new BitSet(new long[]{0x0000000008000002L});
+    public static final BitSet FOLLOW_100 = new BitSet(new long[]{0x4000000208000002L});
+    public static final BitSet FOLLOW_101 = new BitSet(new long[]{0x0000000408000000L});
+    public static final BitSet FOLLOW_102 = new BitSet(new long[]{0x41C000020C8141F2L,0x00002FFF6A046000L});
+    public static final BitSet FOLLOW_103 = new BitSet(new long[]{0x0000000000000000L,0x0000500000000000L});
+    public static final BitSet FOLLOW_104 = new BitSet(new long[]{0x0000000000000002L,0x0000500000000000L});
+    public static final BitSet FOLLOW_105 = new BitSet(new long[]{0x0000000000000140L});
+    public static final BitSet FOLLOW_106 = new BitSet(new long[]{0x00C0000700000010L});
+    public static final BitSet FOLLOW_107 = new BitSet(new long[]{0x0000000100000000L});
+    public static final BitSet FOLLOW_108 = new BitSet(new long[]{0x4000000000000002L});
+    public static final BitSet FOLLOW_109 = new BitSet(new long[]{0x4000001000000002L});
+    public static final BitSet FOLLOW_110 = new BitSet(new long[]{0x0000000000010002L,0x0000000800000000L});
+    public static final BitSet FOLLOW_111 = new BitSet(new long[]{0x0000000000000002L,0x0001000000000000L});
+    public static final BitSet FOLLOW_112 = new BitSet(new long[]{0x00C0000000000010L,0x0000000100000000L});
+    public static final BitSet FOLLOW_113 = new BitSet(new long[]{0x00C0000000000010L,0x0000000400000000L});
+    public static final BitSet FOLLOW_114 = new BitSet(new long[]{0x00C0000002000010L});
+    public static final BitSet FOLLOW_115 = new BitSet(new long[]{0x0000000000040002L});
+    public static final BitSet FOLLOW_116 = new BitSet(new long[]{0x00C0000000000012L});
 
 }
\ No newline at end of file
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/serializer/AbstractFormatSemanticSequencer.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/serializer/AbstractFormatSemanticSequencer.java
index a251cc58b..e2c2f5c11 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/serializer/AbstractFormatSemanticSequencer.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/serializer/AbstractFormatSemanticSequencer.java
@@ -27,8 +27,12 @@
 import com.avaloq.tools.ddk.xtext.format.format.WildcardRule;
 import com.avaloq.tools.ddk.xtext.format.services.FormatGrammarAccess;
 import com.google.inject.Inject;
-import com.google.inject.Provider;
+import java.util.Set;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.xtext.Action;
+import org.eclipse.xtext.Parameter;
+import org.eclipse.xtext.ParserRule;
 import org.eclipse.xtext.common.types.JvmFormalParameter;
 import org.eclipse.xtext.common.types.JvmGenericArrayTypeReference;
 import org.eclipse.xtext.common.types.JvmInnerTypeReference;
@@ -38,14 +42,8 @@
 import org.eclipse.xtext.common.types.JvmUpperBound;
 import org.eclipse.xtext.common.types.JvmWildcardTypeReference;
 import org.eclipse.xtext.common.types.TypesPackage;
-import org.eclipse.xtext.serializer.acceptor.ISemanticSequenceAcceptor;
+import org.eclipse.xtext.serializer.ISerializationContext;
 import org.eclipse.xtext.serializer.acceptor.SequenceFeeder;
-import org.eclipse.xtext.serializer.diagnostic.ISemanticSequencerDiagnosticProvider;
-import org.eclipse.xtext.serializer.diagnostic.ISerializationDiagnostic.Acceptor;
-import org.eclipse.xtext.serializer.sequencer.GenericSequencer;
-import org.eclipse.xtext.serializer.sequencer.ISemanticNodeProvider.INodesForEObjectProvider;
-import org.eclipse.xtext.serializer.sequencer.ISemanticSequencer;
-import org.eclipse.xtext.serializer.sequencer.ITransientValueService;
 import org.eclipse.xtext.serializer.sequencer.ITransientValueService.ValueTransient;
 import org.eclipse.xtext.xbase.XAssignment;
 import org.eclipse.xtext.xbase.XBasicForLoopExpression;
@@ -95,8 +93,13 @@ public abstract class AbstractFormatSemanticSequencer extends XbaseWithAnnotatio
 	private FormatGrammarAccess grammarAccess;
 	
 	@Override
-	public void createSequence(EObject context, EObject semanticObject) {
-		if(semanticObject.eClass().getEPackage() == FormatPackage.eINSTANCE) switch(semanticObject.eClass().getClassifierID()) {
+	public void sequence(ISerializationContext context, EObject semanticObject) {
+		EPackage epackage = semanticObject.eClass().getEPackage();
+		ParserRule rule = context.getParserRule();
+		Action action = context.getAssignedAction();
+		Set<Parameter> parameters = context.getEnabledBooleanParameters();
+		if (epackage == FormatPackage.eINSTANCE)
+			switch (semanticObject.eClass().getClassifierID()) {
 			case FormatPackage.COLUMN_LOCATOR:
 				sequence_ColumnLocator(context, (ColumnLocator) semanticObject); 
 				return; 
@@ -161,13 +164,14 @@ public void createSequence(EObject context, EObject semanticObject) {
 				sequence_WildcardRule(context, (WildcardRule) semanticObject); 
 				return; 
 			}
-		else if(semanticObject.eClass().getEPackage() == TypesPackage.eINSTANCE) switch(semanticObject.eClass().getClassifierID()) {
+		else if (epackage == TypesPackage.eINSTANCE)
+			switch (semanticObject.eClass().getClassifierID()) {
 			case TypesPackage.JVM_FORMAL_PARAMETER:
-				if(context == grammarAccess.getFullJvmFormalParameterRule()) {
+				if (rule == grammarAccess.getFullJvmFormalParameterRule()) {
 					sequence_FullJvmFormalParameter(context, (JvmFormalParameter) semanticObject); 
 					return; 
 				}
-				else if(context == grammarAccess.getJvmFormalParameterRule()) {
+				else if (rule == grammarAccess.getJvmFormalParameterRule()) {
 					sequence_JvmFormalParameter(context, (JvmFormalParameter) semanticObject); 
 					return; 
 				}
@@ -179,27 +183,37 @@ else if(context == grammarAccess.getJvmFormalParameterRule()) {
 				sequence_JvmParameterizedTypeReference(context, (JvmInnerTypeReference) semanticObject); 
 				return; 
 			case TypesPackage.JVM_LOWER_BOUND:
-				if(context == grammarAccess.getJvmLowerBoundAndedRule()) {
+				if (rule == grammarAccess.getJvmLowerBoundAndedRule()) {
 					sequence_JvmLowerBoundAnded(context, (JvmLowerBound) semanticObject); 
 					return; 
 				}
-				else if(context == grammarAccess.getJvmLowerBoundRule()) {
+				else if (rule == grammarAccess.getJvmLowerBoundRule()) {
 					sequence_JvmLowerBound(context, (JvmLowerBound) semanticObject); 
 					return; 
 				}
 				else break;
 			case TypesPackage.JVM_PARAMETERIZED_TYPE_REFERENCE:
-				sequence_JvmParameterizedTypeReference(context, (JvmParameterizedTypeReference) semanticObject); 
-				return; 
+				if (action == grammarAccess.getJvmParameterizedTypeReferenceAccess().getJvmInnerTypeReferenceOuterAction_1_4_0_0_0()) {
+					sequence_JvmParameterizedTypeReference_JvmInnerTypeReference_1_4_0_0_0(context, (JvmParameterizedTypeReference) semanticObject); 
+					return; 
+				}
+				else if (rule == grammarAccess.getJvmTypeReferenceRule()
+						|| action == grammarAccess.getJvmTypeReferenceAccess().getJvmGenericArrayTypeReferenceComponentTypeAction_0_1_0_0()
+						|| rule == grammarAccess.getJvmParameterizedTypeReferenceRule()
+						|| rule == grammarAccess.getJvmArgumentTypeReferenceRule()) {
+					sequence_JvmParameterizedTypeReference(context, (JvmParameterizedTypeReference) semanticObject); 
+					return; 
+				}
+				else break;
 			case TypesPackage.JVM_TYPE_PARAMETER:
 				sequence_JvmTypeParameter(context, (JvmTypeParameter) semanticObject); 
 				return; 
 			case TypesPackage.JVM_UPPER_BOUND:
-				if(context == grammarAccess.getJvmUpperBoundAndedRule()) {
+				if (rule == grammarAccess.getJvmUpperBoundAndedRule()) {
 					sequence_JvmUpperBoundAnded(context, (JvmUpperBound) semanticObject); 
 					return; 
 				}
-				else if(context == grammarAccess.getJvmUpperBoundRule()) {
+				else if (rule == grammarAccess.getJvmUpperBoundRule()) {
 					sequence_JvmUpperBound(context, (JvmUpperBound) semanticObject); 
 					return; 
 				}
@@ -208,7 +222,8 @@ else if(context == grammarAccess.getJvmUpperBoundRule()) {
 				sequence_JvmWildcardTypeReference(context, (JvmWildcardTypeReference) semanticObject); 
 				return; 
 			}
-		else if(semanticObject.eClass().getEPackage() == XAnnotationsPackage.eINSTANCE) switch(semanticObject.eClass().getClassifierID()) {
+		else if (epackage == XAnnotationsPackage.eINSTANCE)
+			switch (semanticObject.eClass().getClassifierID()) {
 			case XAnnotationsPackage.XANNOTATION:
 				sequence_XAnnotation(context, (XAnnotation) semanticObject); 
 				return; 
@@ -216,7 +231,8 @@ else if(semanticObject.eClass().getEPackage() == XAnnotationsPackage.eINSTANCE)
 				sequence_XAnnotationElementValuePair(context, (XAnnotationElementValuePair) semanticObject); 
 				return; 
 			}
-		else if(semanticObject.eClass().getEPackage() == XbasePackage.eINSTANCE) switch(semanticObject.eClass().getClassifierID()) {
+		else if (epackage == XbasePackage.eINSTANCE)
+			switch (semanticObject.eClass().getClassifierID()) {
 			case XbasePackage.XASSIGNMENT:
 				sequence_XAssignment_XMemberFeatureCall(context, (XAssignment) semanticObject); 
 				return; 
@@ -227,44 +243,44 @@ else if(semanticObject.eClass().getEPackage() == XbasePackage.eINSTANCE) switch(
 				sequence_XAdditiveExpression_XAndExpression_XAssignment_XEqualityExpression_XMultiplicativeExpression_XOrExpression_XOtherOperatorExpression_XRelationalExpression(context, (XBinaryOperation) semanticObject); 
 				return; 
 			case XbasePackage.XBLOCK_EXPRESSION:
-				if(context == grammarAccess.getXAdditiveExpressionRule() ||
-				   context == grammarAccess.getXAdditiveExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-				   context == grammarAccess.getXAndExpressionRule() ||
-				   context == grammarAccess.getXAndExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-				   context == grammarAccess.getXAnnotationElementValueRule() ||
-				   context == grammarAccess.getXAnnotationElementValueOrCommaListRule() ||
-				   context == grammarAccess.getXAnnotationElementValueOrCommaListAccess().getXListLiteralElementsAction_1_1_0() ||
-				   context == grammarAccess.getXAnnotationOrExpressionRule() ||
-				   context == grammarAccess.getXAssignmentRule() ||
-				   context == grammarAccess.getXAssignmentAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0() ||
-				   context == grammarAccess.getXBlockExpressionRule() ||
-				   context == grammarAccess.getXCastedExpressionRule() ||
-				   context == grammarAccess.getXCastedExpressionAccess().getXCastedExpressionTargetAction_1_0_0_0() ||
-				   context == grammarAccess.getXEqualityExpressionRule() ||
-				   context == grammarAccess.getXEqualityExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-				   context == grammarAccess.getXExpressionRule() ||
-				   context == grammarAccess.getXExpressionOrVarDeclarationRule() ||
-				   context == grammarAccess.getXMemberFeatureCallRule() ||
-				   context == grammarAccess.getXMemberFeatureCallAccess().getXAssignmentAssignableAction_1_0_0_0_0() ||
-				   context == grammarAccess.getXMemberFeatureCallAccess().getXMemberFeatureCallMemberCallTargetAction_1_1_0_0_0() ||
-				   context == grammarAccess.getXMultiplicativeExpressionRule() ||
-				   context == grammarAccess.getXMultiplicativeExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-				   context == grammarAccess.getXOrExpressionRule() ||
-				   context == grammarAccess.getXOrExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-				   context == grammarAccess.getXOtherOperatorExpressionRule() ||
-				   context == grammarAccess.getXOtherOperatorExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-				   context == grammarAccess.getXParenthesizedExpressionRule() ||
-				   context == grammarAccess.getXPostfixOperationRule() ||
-				   context == grammarAccess.getXPostfixOperationAccess().getXPostfixOperationOperandAction_1_0_0() ||
-				   context == grammarAccess.getXPrimaryExpressionRule() ||
-				   context == grammarAccess.getXRelationalExpressionRule() ||
-				   context == grammarAccess.getXRelationalExpressionAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0() ||
-				   context == grammarAccess.getXRelationalExpressionAccess().getXInstanceOfExpressionExpressionAction_1_0_0_0_0() ||
-				   context == grammarAccess.getXUnaryOperationRule()) {
+				if (rule == grammarAccess.getXAnnotationElementValueOrCommaListRule()
+						|| action == grammarAccess.getXAnnotationElementValueOrCommaListAccess().getXListLiteralElementsAction_1_1_0()
+						|| rule == grammarAccess.getXAnnotationElementValueRule()
+						|| rule == grammarAccess.getXAnnotationOrExpressionRule()
+						|| rule == grammarAccess.getXExpressionRule()
+						|| rule == grammarAccess.getXAssignmentRule()
+						|| action == grammarAccess.getXAssignmentAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0()
+						|| rule == grammarAccess.getXOrExpressionRule()
+						|| action == grammarAccess.getXOrExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXAndExpressionRule()
+						|| action == grammarAccess.getXAndExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXEqualityExpressionRule()
+						|| action == grammarAccess.getXEqualityExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXRelationalExpressionRule()
+						|| action == grammarAccess.getXRelationalExpressionAccess().getXInstanceOfExpressionExpressionAction_1_0_0_0_0()
+						|| action == grammarAccess.getXRelationalExpressionAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0()
+						|| rule == grammarAccess.getXOtherOperatorExpressionRule()
+						|| action == grammarAccess.getXOtherOperatorExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXAdditiveExpressionRule()
+						|| action == grammarAccess.getXAdditiveExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXMultiplicativeExpressionRule()
+						|| action == grammarAccess.getXMultiplicativeExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXUnaryOperationRule()
+						|| rule == grammarAccess.getXCastedExpressionRule()
+						|| action == grammarAccess.getXCastedExpressionAccess().getXCastedExpressionTargetAction_1_0_0_0()
+						|| rule == grammarAccess.getXPostfixOperationRule()
+						|| action == grammarAccess.getXPostfixOperationAccess().getXPostfixOperationOperandAction_1_0_0()
+						|| rule == grammarAccess.getXMemberFeatureCallRule()
+						|| action == grammarAccess.getXMemberFeatureCallAccess().getXAssignmentAssignableAction_1_0_0_0_0()
+						|| action == grammarAccess.getXMemberFeatureCallAccess().getXMemberFeatureCallMemberCallTargetAction_1_1_0_0_0()
+						|| rule == grammarAccess.getXPrimaryExpressionRule()
+						|| rule == grammarAccess.getXParenthesizedExpressionRule()
+						|| rule == grammarAccess.getXBlockExpressionRule()
+						|| rule == grammarAccess.getXExpressionOrVarDeclarationRule()) {
 					sequence_XBlockExpression(context, (XBlockExpression) semanticObject); 
 					return; 
 				}
-				else if(context == grammarAccess.getXExpressionInClosureRule()) {
+				else if (rule == grammarAccess.getXExpressionInClosureRule()) {
 					sequence_XExpressionInClosure(context, (XBlockExpression) semanticObject); 
 					return; 
 				}
@@ -282,45 +298,45 @@ else if(context == grammarAccess.getXExpressionInClosureRule()) {
 				sequence_XCatchClause(context, (XCatchClause) semanticObject); 
 				return; 
 			case XbasePackage.XCLOSURE:
-				if(context == grammarAccess.getXAdditiveExpressionRule() ||
-				   context == grammarAccess.getXAdditiveExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-				   context == grammarAccess.getXAndExpressionRule() ||
-				   context == grammarAccess.getXAndExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-				   context == grammarAccess.getXAnnotationElementValueRule() ||
-				   context == grammarAccess.getXAnnotationElementValueOrCommaListRule() ||
-				   context == grammarAccess.getXAnnotationElementValueOrCommaListAccess().getXListLiteralElementsAction_1_1_0() ||
-				   context == grammarAccess.getXAnnotationOrExpressionRule() ||
-				   context == grammarAccess.getXAssignmentRule() ||
-				   context == grammarAccess.getXAssignmentAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0() ||
-				   context == grammarAccess.getXCastedExpressionRule() ||
-				   context == grammarAccess.getXCastedExpressionAccess().getXCastedExpressionTargetAction_1_0_0_0() ||
-				   context == grammarAccess.getXClosureRule() ||
-				   context == grammarAccess.getXEqualityExpressionRule() ||
-				   context == grammarAccess.getXEqualityExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-				   context == grammarAccess.getXExpressionRule() ||
-				   context == grammarAccess.getXExpressionOrVarDeclarationRule() ||
-				   context == grammarAccess.getXLiteralRule() ||
-				   context == grammarAccess.getXMemberFeatureCallRule() ||
-				   context == grammarAccess.getXMemberFeatureCallAccess().getXAssignmentAssignableAction_1_0_0_0_0() ||
-				   context == grammarAccess.getXMemberFeatureCallAccess().getXMemberFeatureCallMemberCallTargetAction_1_1_0_0_0() ||
-				   context == grammarAccess.getXMultiplicativeExpressionRule() ||
-				   context == grammarAccess.getXMultiplicativeExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-				   context == grammarAccess.getXOrExpressionRule() ||
-				   context == grammarAccess.getXOrExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-				   context == grammarAccess.getXOtherOperatorExpressionRule() ||
-				   context == grammarAccess.getXOtherOperatorExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-				   context == grammarAccess.getXParenthesizedExpressionRule() ||
-				   context == grammarAccess.getXPostfixOperationRule() ||
-				   context == grammarAccess.getXPostfixOperationAccess().getXPostfixOperationOperandAction_1_0_0() ||
-				   context == grammarAccess.getXPrimaryExpressionRule() ||
-				   context == grammarAccess.getXRelationalExpressionRule() ||
-				   context == grammarAccess.getXRelationalExpressionAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0() ||
-				   context == grammarAccess.getXRelationalExpressionAccess().getXInstanceOfExpressionExpressionAction_1_0_0_0_0() ||
-				   context == grammarAccess.getXUnaryOperationRule()) {
+				if (rule == grammarAccess.getXAnnotationElementValueOrCommaListRule()
+						|| action == grammarAccess.getXAnnotationElementValueOrCommaListAccess().getXListLiteralElementsAction_1_1_0()
+						|| rule == grammarAccess.getXAnnotationElementValueRule()
+						|| rule == grammarAccess.getXAnnotationOrExpressionRule()
+						|| rule == grammarAccess.getXExpressionRule()
+						|| rule == grammarAccess.getXAssignmentRule()
+						|| action == grammarAccess.getXAssignmentAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0()
+						|| rule == grammarAccess.getXOrExpressionRule()
+						|| action == grammarAccess.getXOrExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXAndExpressionRule()
+						|| action == grammarAccess.getXAndExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXEqualityExpressionRule()
+						|| action == grammarAccess.getXEqualityExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXRelationalExpressionRule()
+						|| action == grammarAccess.getXRelationalExpressionAccess().getXInstanceOfExpressionExpressionAction_1_0_0_0_0()
+						|| action == grammarAccess.getXRelationalExpressionAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0()
+						|| rule == grammarAccess.getXOtherOperatorExpressionRule()
+						|| action == grammarAccess.getXOtherOperatorExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXAdditiveExpressionRule()
+						|| action == grammarAccess.getXAdditiveExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXMultiplicativeExpressionRule()
+						|| action == grammarAccess.getXMultiplicativeExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXUnaryOperationRule()
+						|| rule == grammarAccess.getXCastedExpressionRule()
+						|| action == grammarAccess.getXCastedExpressionAccess().getXCastedExpressionTargetAction_1_0_0_0()
+						|| rule == grammarAccess.getXPostfixOperationRule()
+						|| action == grammarAccess.getXPostfixOperationAccess().getXPostfixOperationOperandAction_1_0_0()
+						|| rule == grammarAccess.getXMemberFeatureCallRule()
+						|| action == grammarAccess.getXMemberFeatureCallAccess().getXAssignmentAssignableAction_1_0_0_0_0()
+						|| action == grammarAccess.getXMemberFeatureCallAccess().getXMemberFeatureCallMemberCallTargetAction_1_1_0_0_0()
+						|| rule == grammarAccess.getXPrimaryExpressionRule()
+						|| rule == grammarAccess.getXLiteralRule()
+						|| rule == grammarAccess.getXClosureRule()
+						|| rule == grammarAccess.getXParenthesizedExpressionRule()
+						|| rule == grammarAccess.getXExpressionOrVarDeclarationRule()) {
 					sequence_XClosure(context, (XClosure) semanticObject); 
 					return; 
 				}
-				else if(context == grammarAccess.getXShortClosureRule()) {
+				else if (rule == grammarAccess.getXShortClosureRule()) {
 					sequence_XShortClosure(context, (XClosure) semanticObject); 
 					return; 
 				}
@@ -344,48 +360,48 @@ else if(context == grammarAccess.getXShortClosureRule()) {
 				sequence_XRelationalExpression(context, (XInstanceOfExpression) semanticObject); 
 				return; 
 			case XbasePackage.XLIST_LITERAL:
-				if(context == grammarAccess.getXAnnotationElementValueOrCommaListRule()) {
+				if (rule == grammarAccess.getXAnnotationElementValueOrCommaListRule()) {
 					sequence_XAnnotationElementValueOrCommaList_XListLiteral(context, (XListLiteral) semanticObject); 
 					return; 
 				}
-				else if(context == grammarAccess.getXAnnotationElementValueRule()) {
+				else if (rule == grammarAccess.getXAnnotationElementValueRule()) {
 					sequence_XAnnotationElementValue_XListLiteral(context, (XListLiteral) semanticObject); 
 					return; 
 				}
-				else if(context == grammarAccess.getXAdditiveExpressionRule() ||
-				   context == grammarAccess.getXAdditiveExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-				   context == grammarAccess.getXAndExpressionRule() ||
-				   context == grammarAccess.getXAndExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-				   context == grammarAccess.getXAnnotationElementValueOrCommaListAccess().getXListLiteralElementsAction_1_1_0() ||
-				   context == grammarAccess.getXAnnotationOrExpressionRule() ||
-				   context == grammarAccess.getXAssignmentRule() ||
-				   context == grammarAccess.getXAssignmentAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0() ||
-				   context == grammarAccess.getXCastedExpressionRule() ||
-				   context == grammarAccess.getXCastedExpressionAccess().getXCastedExpressionTargetAction_1_0_0_0() ||
-				   context == grammarAccess.getXCollectionLiteralRule() ||
-				   context == grammarAccess.getXEqualityExpressionRule() ||
-				   context == grammarAccess.getXEqualityExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-				   context == grammarAccess.getXExpressionRule() ||
-				   context == grammarAccess.getXExpressionOrVarDeclarationRule() ||
-				   context == grammarAccess.getXListLiteralRule() ||
-				   context == grammarAccess.getXLiteralRule() ||
-				   context == grammarAccess.getXMemberFeatureCallRule() ||
-				   context == grammarAccess.getXMemberFeatureCallAccess().getXAssignmentAssignableAction_1_0_0_0_0() ||
-				   context == grammarAccess.getXMemberFeatureCallAccess().getXMemberFeatureCallMemberCallTargetAction_1_1_0_0_0() ||
-				   context == grammarAccess.getXMultiplicativeExpressionRule() ||
-				   context == grammarAccess.getXMultiplicativeExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-				   context == grammarAccess.getXOrExpressionRule() ||
-				   context == grammarAccess.getXOrExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-				   context == grammarAccess.getXOtherOperatorExpressionRule() ||
-				   context == grammarAccess.getXOtherOperatorExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0() ||
-				   context == grammarAccess.getXParenthesizedExpressionRule() ||
-				   context == grammarAccess.getXPostfixOperationRule() ||
-				   context == grammarAccess.getXPostfixOperationAccess().getXPostfixOperationOperandAction_1_0_0() ||
-				   context == grammarAccess.getXPrimaryExpressionRule() ||
-				   context == grammarAccess.getXRelationalExpressionRule() ||
-				   context == grammarAccess.getXRelationalExpressionAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0() ||
-				   context == grammarAccess.getXRelationalExpressionAccess().getXInstanceOfExpressionExpressionAction_1_0_0_0_0() ||
-				   context == grammarAccess.getXUnaryOperationRule()) {
+				else if (action == grammarAccess.getXAnnotationElementValueOrCommaListAccess().getXListLiteralElementsAction_1_1_0()
+						|| rule == grammarAccess.getXAnnotationOrExpressionRule()
+						|| rule == grammarAccess.getXExpressionRule()
+						|| rule == grammarAccess.getXAssignmentRule()
+						|| action == grammarAccess.getXAssignmentAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0()
+						|| rule == grammarAccess.getXOrExpressionRule()
+						|| action == grammarAccess.getXOrExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXAndExpressionRule()
+						|| action == grammarAccess.getXAndExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXEqualityExpressionRule()
+						|| action == grammarAccess.getXEqualityExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXRelationalExpressionRule()
+						|| action == grammarAccess.getXRelationalExpressionAccess().getXInstanceOfExpressionExpressionAction_1_0_0_0_0()
+						|| action == grammarAccess.getXRelationalExpressionAccess().getXBinaryOperationLeftOperandAction_1_1_0_0_0()
+						|| rule == grammarAccess.getXOtherOperatorExpressionRule()
+						|| action == grammarAccess.getXOtherOperatorExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXAdditiveExpressionRule()
+						|| action == grammarAccess.getXAdditiveExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXMultiplicativeExpressionRule()
+						|| action == grammarAccess.getXMultiplicativeExpressionAccess().getXBinaryOperationLeftOperandAction_1_0_0_0()
+						|| rule == grammarAccess.getXUnaryOperationRule()
+						|| rule == grammarAccess.getXCastedExpressionRule()
+						|| action == grammarAccess.getXCastedExpressionAccess().getXCastedExpressionTargetAction_1_0_0_0()
+						|| rule == grammarAccess.getXPostfixOperationRule()
+						|| action == grammarAccess.getXPostfixOperationAccess().getXPostfixOperationOperandAction_1_0_0()
+						|| rule == grammarAccess.getXMemberFeatureCallRule()
+						|| action == grammarAccess.getXMemberFeatureCallAccess().getXAssignmentAssignableAction_1_0_0_0_0()
+						|| action == grammarAccess.getXMemberFeatureCallAccess().getXMemberFeatureCallMemberCallTargetAction_1_1_0_0_0()
+						|| rule == grammarAccess.getXPrimaryExpressionRule()
+						|| rule == grammarAccess.getXLiteralRule()
+						|| rule == grammarAccess.getXCollectionLiteralRule()
+						|| rule == grammarAccess.getXListLiteralRule()
+						|| rule == grammarAccess.getXParenthesizedExpressionRule()
+						|| rule == grammarAccess.getXExpressionOrVarDeclarationRule()) {
 					sequence_XListLiteral(context, (XListLiteral) semanticObject); 
 					return; 
 				}
@@ -436,7 +452,8 @@ else if(context == grammarAccess.getXAdditiveExpressionRule() ||
 				sequence_XWhileExpression(context, (XWhileExpression) semanticObject); 
 				return; 
 			}
-		else if(semanticObject.eClass().getEPackage() == XtypePackage.eINSTANCE) switch(semanticObject.eClass().getClassifierID()) {
+		else if (epackage == XtypePackage.eINSTANCE)
+			switch (semanticObject.eClass().getClassifierID()) {
 			case XtypePackage.XFUNCTION_TYPE_REF:
 				sequence_XFunctionTypeRef(context, (XFunctionTypeRef) semanticObject); 
 				return; 
@@ -447,37 +464,53 @@ else if(semanticObject.eClass().getEPackage() == XtypePackage.eINSTANCE) switch(
 				sequence_XImportSection(context, (XImportSection) semanticObject); 
 				return; 
 			}
-		if (errorAcceptor != null) errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
+		if (errorAcceptor != null)
+			errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
 	}
 	
 	/**
+	 * Contexts:
+	 *     Locator returns ColumnLocator
+	 *     ColumnLocator returns ColumnLocator
+	 *
 	 * Constraint:
 	 *     (fixed?='fixed'? (value=IntValue | parameter=XBlockExpression) relative?='relative'? nobreak?='nobreak'?)
 	 */
-	protected void sequence_ColumnLocator(EObject context, ColumnLocator semanticObject) {
+	protected void sequence_ColumnLocator(ISerializationContext context, ColumnLocator semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Constant returns Constant
+	 *
 	 * Constraint:
 	 *     ((intType?='int' | stringType?='String')? name=ID (intValue=IntObject | stringValue=STRING))
 	 */
-	protected void sequence_Constant(EObject context, Constant semanticObject) {
+	protected void sequence_Constant(ISerializationContext context, Constant semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     GrammarRuleDirective returns ContextFreeDirective
+	 *     WildcardRuleDirective returns ContextFreeDirective
+	 *     ContextFreeDirective returns ContextFreeDirective
+	 *
 	 * Constraint:
 	 *     (grammarElements+=GrammarElementLookup grammarElements+=GrammarElementLookup* matcherList=MatcherList)
 	 */
-	protected void sequence_ContextFreeDirective(EObject context, ContextFreeDirective semanticObject) {
+	protected void sequence_ContextFreeDirective(ISerializationContext context, ContextFreeDirective semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     FormatConfiguration returns FormatConfiguration
+	 *
 	 * Constraint:
 	 *     (
 	 *         targetGrammar=[Grammar|DottedID] 
@@ -487,21 +520,27 @@ protected void sequence_ContextFreeDirective(EObject context, ContextFreeDirecti
 	 *         rules+=Rule*
 	 *     )
 	 */
-	protected void sequence_FormatConfiguration(EObject context, FormatConfiguration semanticObject) {
+	protected void sequence_FormatConfiguration(ISerializationContext context, FormatConfiguration semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     GrammarElementLookup returns GrammarElementLookup
+	 *
 	 * Constraint:
 	 *     (rule=[AbstractRule|Identifier] | keyword=STRING)
 	 */
-	protected void sequence_GrammarElementLookup(EObject context, GrammarElementLookup semanticObject) {
+	protected void sequence_GrammarElementLookup(ISerializationContext context, GrammarElementLookup semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     GrammarElementReference returns GrammarElementReference
+	 *
 	 * Constraint:
 	 *     (
 	 *         assignment=[Assignment|ParameterizedIdentifier] | 
@@ -511,149 +550,212 @@ protected void sequence_GrammarElementLookup(EObject context, GrammarElementLook
 	 *         keyword=[Keyword|ParameterizedString]
 	 *     )
 	 */
-	protected void sequence_GrammarElementReference(EObject context, GrammarElementReference semanticObject) {
+	protected void sequence_GrammarElementReference(ISerializationContext context, GrammarElementReference semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Rule returns GrammarRule
+	 *     GrammarRule returns GrammarRule
+	 *
 	 * Constraint:
 	 *     (override?='override'? targetRule=[AbstractRule|ID] (directives+=GrammarRuleDirective | directives+=GroupBlock)*)
 	 */
-	protected void sequence_GrammarRule(EObject context, GrammarRule semanticObject) {
+	protected void sequence_GrammarRule(ISerializationContext context, GrammarRule semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     GroupBlock returns GroupBlock
+	 *
 	 * Constraint:
-	 *     (grammarElement=[CompoundElement|IntIdentifier] (matcherList=MatcherList | subGroup=GroupBlock | directives+=GrammarRuleDirective*))
+	 *     (grammarElement=[CompoundElement|IntIdentifier] (matcherList=MatcherList | subGroup=GroupBlock | directives+=GrammarRuleDirective+)?)
 	 */
-	protected void sequence_GroupBlock(EObject context, GroupBlock semanticObject) {
+	protected void sequence_GroupBlock(ISerializationContext context, GroupBlock semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Locator returns IndentLocator
+	 *     IndentLocator returns IndentLocator
+	 *
 	 * Constraint:
 	 *     (increment?='increment'? (value=IntValue | parameter=XBlockExpression)?)
 	 */
-	protected void sequence_IndentLocator(EObject context, IndentLocator semanticObject) {
+	protected void sequence_IndentLocator(ISerializationContext context, IndentLocator semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     IntValue returns IntValue
+	 *
 	 * Constraint:
 	 *     (literal=IntObject | reference=[Constant|DottedID])
 	 */
-	protected void sequence_IntValue(EObject context, IntValue semanticObject) {
+	protected void sequence_IntValue(ISerializationContext context, IntValue semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     GrammarRuleDirective returns KeywordPair
+	 *     WildcardRuleDirective returns KeywordPair
+	 *     KeywordPair returns KeywordPair
+	 *
 	 * Constraint:
-	 *     (left=STRING right=STRING (leftMatchers+=Matcher | rightMatchers+=Matcher) (leftMatchers+=Matcher | rightMatchers+=Matcher)*)
+	 *     (
+	 *         left=STRING 
+	 *         right=STRING 
+	 *         (leftMatchers+=Matcher | rightMatchers+=Matcher) 
+	 *         rightMatchers+=Matcher? 
+	 *         (leftMatchers+=Matcher? rightMatchers+=Matcher?)*
+	 *     )
 	 */
-	protected void sequence_KeywordPair(EObject context, KeywordPair semanticObject) {
+	protected void sequence_KeywordPair(ISerializationContext context, KeywordPair semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Locator returns LinewrapLocator
+	 *     LinewrapLocator returns LinewrapLocator
+	 *
 	 * Constraint:
-	 *     ((value=IntValue | (minimum=IntValue default=IntValue maximum=IntValue))?)
+	 *     (value=IntValue | (minimum=IntValue default=IntValue maximum=IntValue) | noLinewrap?='no_linewrap')?
 	 */
-	protected void sequence_LinewrapLocator(EObject context, LinewrapLocator semanticObject) {
+	protected void sequence_LinewrapLocator(ISerializationContext context, LinewrapLocator semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     MatcherList returns MatcherList
+	 *
 	 * Constraint:
 	 *     (matchers+=Matcher matchers+=Matcher*)
 	 */
-	protected void sequence_MatcherList(EObject context, MatcherList semanticObject) {
+	protected void sequence_MatcherList(ISerializationContext context, MatcherList semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Matcher returns Matcher
+	 *
 	 * Constraint:
 	 *     (locator=Locator type=MatcherType condition=XBlockExpression?)
 	 */
-	protected void sequence_Matcher(EObject context, Matcher semanticObject) {
+	protected void sequence_Matcher(ISerializationContext context, Matcher semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Locator returns NoFormatLocator
+	 *     NoFormatLocator returns NoFormatLocator
+	 *
 	 * Constraint:
 	 *     {NoFormatLocator}
 	 */
-	protected void sequence_NoFormatLocator(EObject context, NoFormatLocator semanticObject) {
+	protected void sequence_NoFormatLocator(ISerializationContext context, NoFormatLocator semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Locator returns OffsetLocator
+	 *     OffsetLocator returns OffsetLocator
+	 *
 	 * Constraint:
 	 *     (fixed?='fixed'? value=IntValue nobreak?='nobreak'?)
 	 */
-	protected void sequence_OffsetLocator(EObject context, OffsetLocator semanticObject) {
+	protected void sequence_OffsetLocator(ISerializationContext context, OffsetLocator semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Locator returns RightPaddingLocator
+	 *     RightPaddingLocator returns RightPaddingLocator
+	 *
 	 * Constraint:
 	 *     value=IntValue
 	 */
-	protected void sequence_RightPaddingLocator(EObject context, RightPaddingLocator semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, FormatPackage.Literals.RIGHT_PADDING_LOCATOR__VALUE) == ValueTransient.YES)
+	protected void sequence_RightPaddingLocator(ISerializationContext context, RightPaddingLocator semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, FormatPackage.Literals.RIGHT_PADDING_LOCATOR__VALUE) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, FormatPackage.Literals.RIGHT_PADDING_LOCATOR__VALUE));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getRightPaddingLocatorAccess().getValueIntValueParserRuleCall_1_0(), semanticObject.getValue());
 		feeder.finish();
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Locator returns SpaceLocator
+	 *     SpaceLocator returns SpaceLocator
+	 *
 	 * Constraint:
 	 *     (value=StringValue | noSpace?='no_space')
 	 */
-	protected void sequence_SpaceLocator(EObject context, SpaceLocator semanticObject) {
+	protected void sequence_SpaceLocator(ISerializationContext context, SpaceLocator semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     GrammarRuleDirective returns SpecificDirective
+	 *     SpecificDirective returns SpecificDirective
+	 *
 	 * Constraint:
 	 *     (grammarElements+=GrammarElementReference grammarElements+=GrammarElementReference* matcherList=MatcherList)
 	 */
-	protected void sequence_SpecificDirective(EObject context, SpecificDirective semanticObject) {
+	protected void sequence_SpecificDirective(ISerializationContext context, SpecificDirective semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     StringValue returns StringValue
+	 *
 	 * Constraint:
 	 *     (literal=STRING | reference=[Constant|DottedID])
 	 */
-	protected void sequence_StringValue(EObject context, StringValue semanticObject) {
+	protected void sequence_StringValue(ISerializationContext context, StringValue semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Rule returns WildcardRule
+	 *     WildcardRule returns WildcardRule
+	 *
 	 * Constraint:
 	 *     (override?='override'? directives+=WildcardRuleDirective*)
 	 */
-	protected void sequence_WildcardRule(EObject context, WildcardRule semanticObject) {
+	protected void sequence_WildcardRule(ISerializationContext context, WildcardRule semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
+	
+	
 }
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/serializer/AbstractFormatSyntacticSequencer.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/serializer/AbstractFormatSyntacticSequencer.java
index 13b31b385..048bde22f 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/serializer/AbstractFormatSyntacticSequencer.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/serializer/AbstractFormatSyntacticSequencer.java
@@ -43,9 +43,9 @@ protected void init(IGrammarAccess access) {
 	
 	@Override
 	protected String getUnassignedRuleCallToken(EObject semanticObject, RuleCall ruleCall, INode node) {
-		if(ruleCall.getRule() == grammarAccess.getArrayBracketsRule())
+		if (ruleCall.getRule() == grammarAccess.getArrayBracketsRule())
 			return getArrayBracketsToken(semanticObject, ruleCall, node);
-		else if(ruleCall.getRule() == grammarAccess.getOpSingleAssignRule())
+		else if (ruleCall.getRule() == grammarAccess.getOpSingleAssignRule())
 			return getOpSingleAssignToken(semanticObject, ruleCall, node);
 		return "";
 	}
@@ -78,19 +78,19 @@ protected void emitUnassignedTokens(EObject semanticObject, ISynTransition trans
 		List<INode> transitionNodes = collectNodes(fromNode, toNode);
 		for (AbstractElementAlias syntax : transition.getAmbiguousSyntaxes()) {
 			List<INode> syntaxNodes = getNodesFor(transitionNodes, syntax);
-			if(match_XAnnotation___LeftParenthesisKeyword_3_0_RightParenthesisKeyword_3_2__q.equals(syntax))
+			if (match_XAnnotation___LeftParenthesisKeyword_3_0_RightParenthesisKeyword_3_2__q.equals(syntax))
 				emit_XAnnotation___LeftParenthesisKeyword_3_0_RightParenthesisKeyword_3_2__q(semanticObject, getLastNavigableState(), syntaxNodes);
-			else if(match_XBlockExpression_SemicolonKeyword_2_1_q.equals(syntax))
+			else if (match_XBlockExpression_SemicolonKeyword_2_1_q.equals(syntax))
 				emit_XBlockExpression_SemicolonKeyword_2_1_q(semanticObject, getLastNavigableState(), syntaxNodes);
-			else if(match_XExpressionInClosure_SemicolonKeyword_1_1_q.equals(syntax))
+			else if (match_XExpressionInClosure_SemicolonKeyword_1_1_q.equals(syntax))
 				emit_XExpressionInClosure_SemicolonKeyword_1_1_q(semanticObject, getLastNavigableState(), syntaxNodes);
-			else if(match_XFunctionTypeRef___LeftParenthesisKeyword_0_0_RightParenthesisKeyword_0_2__q.equals(syntax))
+			else if (match_XFunctionTypeRef___LeftParenthesisKeyword_0_0_RightParenthesisKeyword_0_2__q.equals(syntax))
 				emit_XFunctionTypeRef___LeftParenthesisKeyword_0_0_RightParenthesisKeyword_0_2__q(semanticObject, getLastNavigableState(), syntaxNodes);
-			else if(match_XImportDeclaration_SemicolonKeyword_2_q.equals(syntax))
+			else if (match_XImportDeclaration_SemicolonKeyword_2_q.equals(syntax))
 				emit_XImportDeclaration_SemicolonKeyword_2_q(semanticObject, getLastNavigableState(), syntaxNodes);
-			else if(match_XParenthesizedExpression_LeftParenthesisKeyword_0_a.equals(syntax))
+			else if (match_XParenthesizedExpression_LeftParenthesisKeyword_0_a.equals(syntax))
 				emit_XParenthesizedExpression_LeftParenthesisKeyword_0_a(semanticObject, getLastNavigableState(), syntaxNodes);
-			else if(match_XParenthesizedExpression_LeftParenthesisKeyword_0_p.equals(syntax))
+			else if (match_XParenthesizedExpression_LeftParenthesisKeyword_0_p.equals(syntax))
 				emit_XParenthesizedExpression_LeftParenthesisKeyword_0_p(semanticObject, getLastNavigableState(), syntaxNodes);
 			else acceptNodes(getLastNavigableState(), syntaxNodes);
 		}
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/services/FormatGrammarAccess.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/services/FormatGrammarAccess.java
index cb2e3ed7c..b4bba6b1f 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/services/FormatGrammarAccess.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/services/FormatGrammarAccess.java
@@ -21,7 +21,7 @@ public class FormatGrammarAccess extends AbstractGrammarElementFinder {
 	
 	
 	public class FormatConfigurationElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "FormatConfiguration");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.format.Format.FormatConfiguration");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cFormatterKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Keyword cForKeyword_1 = (Keyword)cGroup.eContents().get(1);
@@ -47,20 +47,20 @@ public class FormatConfigurationElements extends AbstractParserRuleElementFinder
 		private final RuleCall cRulesRuleParserRuleCall_6_0 = (RuleCall)cRulesAssignment_6.eContents().get(0);
 		
 		//FormatConfiguration:
-		//	"formatter" "for" targetGrammar=[xtext::Grammar|DottedID] ("with"
-		//	extendedFormatConfiguration=[FormatConfiguration|DottedID])? ("extends"
-		//	formatterBaseClass=[types::JvmDeclaredType|QualifiedName])? ("const" constants+=Constant ";")* rules+=Rule*;
+		//	'formatter' 'for' targetGrammar=[xtext::Grammar|DottedID] ('with'
+		//	extendedFormatConfiguration=[FormatConfiguration|DottedID])? ('extends'
+		//	formatterBaseClass=[types::JvmDeclaredType|QualifiedName])? ('const' constants+=Constant ';')* rules+=Rule*;
 		@Override public ParserRule getRule() { return rule; }
 
-		//"formatter" "for" targetGrammar=[xtext::Grammar|DottedID] ("with"
-		//extendedFormatConfiguration=[FormatConfiguration|DottedID])? ("extends"
-		//formatterBaseClass=[types::JvmDeclaredType|QualifiedName])? ("const" constants+=Constant ";")* rules+=Rule*
+		//'formatter' 'for' targetGrammar=[xtext::Grammar|DottedID] ('with'
+		//extendedFormatConfiguration=[FormatConfiguration|DottedID])? ('extends'
+		//formatterBaseClass=[types::JvmDeclaredType|QualifiedName])? ('const' constants+=Constant ';')* rules+=Rule*
 		public Group getGroup() { return cGroup; }
 
-		//"formatter"
+		//'formatter'
 		public Keyword getFormatterKeyword_0() { return cFormatterKeyword_0; }
 
-		//"for"
+		//'for'
 		public Keyword getForKeyword_1() { return cForKeyword_1; }
 
 		//targetGrammar=[xtext::Grammar|DottedID]
@@ -72,10 +72,10 @@ public class FormatConfigurationElements extends AbstractParserRuleElementFinder
 		//DottedID
 		public RuleCall getTargetGrammarGrammarDottedIDParserRuleCall_2_0_1() { return cTargetGrammarGrammarDottedIDParserRuleCall_2_0_1; }
 
-		//("with" extendedFormatConfiguration=[FormatConfiguration|DottedID])?
+		//('with' extendedFormatConfiguration=[FormatConfiguration|DottedID])?
 		public Group getGroup_3() { return cGroup_3; }
 
-		//"with"
+		//'with'
 		public Keyword getWithKeyword_3_0() { return cWithKeyword_3_0; }
 
 		//extendedFormatConfiguration=[FormatConfiguration|DottedID]
@@ -87,10 +87,10 @@ public class FormatConfigurationElements extends AbstractParserRuleElementFinder
 		//DottedID
 		public RuleCall getExtendedFormatConfigurationFormatConfigurationDottedIDParserRuleCall_3_1_0_1() { return cExtendedFormatConfigurationFormatConfigurationDottedIDParserRuleCall_3_1_0_1; }
 
-		//("extends" formatterBaseClass=[types::JvmDeclaredType|QualifiedName])?
+		//('extends' formatterBaseClass=[types::JvmDeclaredType|QualifiedName])?
 		public Group getGroup_4() { return cGroup_4; }
 
-		//"extends"
+		//'extends'
 		public Keyword getExtendsKeyword_4_0() { return cExtendsKeyword_4_0; }
 
 		//formatterBaseClass=[types::JvmDeclaredType|QualifiedName]
@@ -102,10 +102,10 @@ public class FormatConfigurationElements extends AbstractParserRuleElementFinder
 		//QualifiedName
 		public RuleCall getFormatterBaseClassJvmDeclaredTypeQualifiedNameParserRuleCall_4_1_0_1() { return cFormatterBaseClassJvmDeclaredTypeQualifiedNameParserRuleCall_4_1_0_1; }
 
-		//("const" constants+=Constant ";")*
+		//('const' constants+=Constant ';')*
 		public Group getGroup_5() { return cGroup_5; }
 
-		//"const"
+		//'const'
 		public Keyword getConstKeyword_5_0() { return cConstKeyword_5_0; }
 
 		//constants+=Constant
@@ -114,7 +114,7 @@ public class FormatConfigurationElements extends AbstractParserRuleElementFinder
 		//Constant
 		public RuleCall getConstantsConstantParserRuleCall_5_1_0() { return cConstantsConstantParserRuleCall_5_1_0; }
 
-		//";"
+		//';'
 		public Keyword getSemicolonKeyword_5_2() { return cSemicolonKeyword_5_2; }
 
 		//rules+=Rule*
@@ -125,7 +125,7 @@ public class FormatConfigurationElements extends AbstractParserRuleElementFinder
 	}
 
 	public class ConstantElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Constant");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.format.Format.Constant");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Alternatives cAlternatives_0 = (Alternatives)cGroup.eContents().get(0);
 		private final Assignment cIntTypeAssignment_0_0 = (Assignment)cAlternatives_0.eContents().get(0);
@@ -142,38 +142,39 @@ public class ConstantElements extends AbstractParserRuleElementFinder {
 		private final RuleCall cStringValueSTRINGTerminalRuleCall_3_1_0 = (RuleCall)cStringValueAssignment_3_1.eContents().get(0);
 		
 		//Constant:
-		//	(intType?="int" | stringType?="String")? //specifying the type is optional
-		// name=ID "=" (intValue=IntObject |
+		//	(intType?='int' | stringType?='String')? //specifying the type is optional
+		// name=ID '=' (intValue=IntObject |
 		//	stringValue=STRING);
 		@Override public ParserRule getRule() { return rule; }
 
-		//(intType?="int" | stringType?="String")? //specifying the type is optional
-		// name=ID "=" (intValue=IntObject |
+		//(intType?='int' | stringType?='String')? //specifying the type is optional
+		// name=ID '=' (intValue=IntObject |
 		//stringValue=STRING)
 		public Group getGroup() { return cGroup; }
 
-		//(intType?="int" | stringType?="String")?
+		//(intType?='int' | stringType?='String')?
 		public Alternatives getAlternatives_0() { return cAlternatives_0; }
 
-		//intType?="int"
+		//intType?='int'
 		public Assignment getIntTypeAssignment_0_0() { return cIntTypeAssignment_0_0; }
 
-		//"int"
+		//'int'
 		public Keyword getIntTypeIntKeyword_0_0_0() { return cIntTypeIntKeyword_0_0_0; }
 
-		//stringType?="String"
+		//stringType?='String'
 		public Assignment getStringTypeAssignment_0_1() { return cStringTypeAssignment_0_1; }
 
-		//"String"
+		//'String'
 		public Keyword getStringTypeStringKeyword_0_1_0() { return cStringTypeStringKeyword_0_1_0; }
 
-		//name=ID
+		////specifying the type is optional
+		// name=ID
 		public Assignment getNameAssignment_1() { return cNameAssignment_1; }
 
 		//ID
 		public RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }
 
-		//"="
+		//'='
 		public Keyword getEqualsSignKeyword_2() { return cEqualsSignKeyword_2; }
 
 		//intValue=IntObject | stringValue=STRING
@@ -193,7 +194,7 @@ public class ConstantElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class IntValueElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "IntValue");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.format.Format.IntValue");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final Assignment cLiteralAssignment_0 = (Assignment)cAlternatives.eContents().get(0);
 		private final RuleCall cLiteralIntObjectParserRuleCall_0_0 = (RuleCall)cLiteralAssignment_0.eContents().get(0);
@@ -225,7 +226,7 @@ public class IntValueElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class StringValueElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "StringValue");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.format.Format.StringValue");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final Assignment cLiteralAssignment_0 = (Assignment)cAlternatives.eContents().get(0);
 		private final RuleCall cLiteralSTRINGTerminalRuleCall_0_0 = (RuleCall)cLiteralAssignment_0.eContents().get(0);
@@ -257,7 +258,7 @@ public class StringValueElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class RuleElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Rule");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.format.Format.Rule");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cWildcardRuleParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cGrammarRuleParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
@@ -277,7 +278,7 @@ public class RuleElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class GrammarRuleElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "GrammarRule");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.format.Format.GrammarRule");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cOverrideAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final Keyword cOverrideOverrideKeyword_0_0 = (Keyword)cOverrideAssignment_0.eContents().get(0);
@@ -293,18 +294,18 @@ public class GrammarRuleElements extends AbstractParserRuleElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);
 		
 		//GrammarRule:
-		//	override?="override"? targetRule=[xtext::AbstractRule] "{" (directives+=GrammarRuleDirective |
-		//	directives+=GroupBlock)* "}";
+		//	override?='override'? targetRule=[xtext::AbstractRule] '{' (directives+=GrammarRuleDirective |
+		//	directives+=GroupBlock)* '}';
 		@Override public ParserRule getRule() { return rule; }
 
-		//override?="override"? targetRule=[xtext::AbstractRule] "{" (directives+=GrammarRuleDirective | directives+=GroupBlock)*
-		//"}"
+		//override?='override'? targetRule=[xtext::AbstractRule] '{' (directives+=GrammarRuleDirective | directives+=GroupBlock)*
+		//'}'
 		public Group getGroup() { return cGroup; }
 
-		//override?="override"?
+		//override?='override'?
 		public Assignment getOverrideAssignment_0() { return cOverrideAssignment_0; }
 
-		//"override"
+		//'override'
 		public Keyword getOverrideOverrideKeyword_0_0() { return cOverrideOverrideKeyword_0_0; }
 
 		//targetRule=[xtext::AbstractRule]
@@ -316,7 +317,7 @@ public class GrammarRuleElements extends AbstractParserRuleElementFinder {
 		//ID
 		public RuleCall getTargetRuleAbstractRuleIDTerminalRuleCall_1_0_1() { return cTargetRuleAbstractRuleIDTerminalRuleCall_1_0_1; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_2() { return cLeftCurlyBracketKeyword_2; }
 
 		//(directives+=GrammarRuleDirective | directives+=GroupBlock)*
@@ -334,12 +335,12 @@ public class GrammarRuleElements extends AbstractParserRuleElementFinder {
 		//GroupBlock
 		public RuleCall getDirectivesGroupBlockParserRuleCall_3_1_0() { return cDirectivesGroupBlockParserRuleCall_3_1_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_4() { return cRightCurlyBracketKeyword_4; }
 	}
 
 	public class WildcardRuleElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "WildcardRule");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.format.Format.WildcardRule");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Action cWildcardRuleAction_0 = (Action)cGroup.eContents().get(0);
 		private final Assignment cOverrideAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -351,25 +352,25 @@ public class WildcardRuleElements extends AbstractParserRuleElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_5 = (Keyword)cGroup.eContents().get(5);
 		
 		//WildcardRule:
-		//	{WildcardRule} override?="override"? "*" "{" directives+=WildcardRuleDirective* "}";
+		//	{WildcardRule} override?='override'? '*' '{' directives+=WildcardRuleDirective* '}';
 		@Override public ParserRule getRule() { return rule; }
 
-		//{WildcardRule} override?="override"? "*" "{" directives+=WildcardRuleDirective* "}"
+		//{WildcardRule} override?='override'? '*' '{' directives+=WildcardRuleDirective* '}'
 		public Group getGroup() { return cGroup; }
 
 		//{WildcardRule}
 		public Action getWildcardRuleAction_0() { return cWildcardRuleAction_0; }
 
-		//override?="override"?
+		//override?='override'?
 		public Assignment getOverrideAssignment_1() { return cOverrideAssignment_1; }
 
-		//"override"
+		//'override'
 		public Keyword getOverrideOverrideKeyword_1_0() { return cOverrideOverrideKeyword_1_0; }
 
-		//"*"
+		//'*'
 		public Keyword getAsteriskKeyword_2() { return cAsteriskKeyword_2; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_3() { return cLeftCurlyBracketKeyword_3; }
 
 		//directives+=WildcardRuleDirective*
@@ -378,12 +379,12 @@ public class WildcardRuleElements extends AbstractParserRuleElementFinder {
 		//WildcardRuleDirective
 		public RuleCall getDirectivesWildcardRuleDirectiveParserRuleCall_4_0() { return cDirectivesWildcardRuleDirectiveParserRuleCall_4_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_5() { return cRightCurlyBracketKeyword_5; }
 	}
 
 	public class GrammarRuleDirectiveElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "GrammarRuleDirective");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.format.Format.GrammarRuleDirective");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cSpecificDirectiveParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cContextFreeDirectiveParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
@@ -407,7 +408,7 @@ public class GrammarRuleDirectiveElements extends AbstractParserRuleElementFinde
 	}
 
 	public class WildcardRuleDirectiveElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "WildcardRuleDirective");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.format.Format.WildcardRuleDirective");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cContextFreeDirectiveParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cKeywordPairParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
@@ -427,7 +428,7 @@ public class WildcardRuleDirectiveElements extends AbstractParserRuleElementFind
 	}
 
 	public class GrammarElementReferenceElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "GrammarElementReference");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.format.Format.GrammarElementReference");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final Group cGroup_0 = (Group)cAlternatives.eContents().get(0);
 		private final Keyword cEqualsSignKeyword_0_0 = (Keyword)cGroup_0.eContents().get(0);
@@ -450,20 +451,20 @@ public class GrammarElementReferenceElements extends AbstractParserRuleElementFi
 		private final RuleCall cKeywordKeywordParameterizedStringParserRuleCall_4_0_1 = (RuleCall)cKeywordKeywordCrossReference_4_0.eContents().get(1);
 		
 		//GrammarElementReference:
-		//	"=" assignment=[xtext::Assignment|ParameterizedIdentifier] | "@" ruleCall=[xtext::RuleCall|ParameterizedIdentifier] |
+		//	'=' assignment=[xtext::Assignment|ParameterizedIdentifier] | '@' ruleCall=[xtext::RuleCall|ParameterizedIdentifier] |
 		//	self=[xtext::AbstractRule|RuleSelfIdentifier] | rule=[xtext::AbstractRule|Identifier] |
 		//	keyword=[xtext::Keyword|ParameterizedString];
 		@Override public ParserRule getRule() { return rule; }
 
-		//"=" assignment=[xtext::Assignment|ParameterizedIdentifier] | "@" ruleCall=[xtext::RuleCall|ParameterizedIdentifier] |
+		//'=' assignment=[xtext::Assignment|ParameterizedIdentifier] | '@' ruleCall=[xtext::RuleCall|ParameterizedIdentifier] |
 		//self=[xtext::AbstractRule|RuleSelfIdentifier] | rule=[xtext::AbstractRule|Identifier] |
 		//keyword=[xtext::Keyword|ParameterizedString]
 		public Alternatives getAlternatives() { return cAlternatives; }
 
-		//"=" assignment=[xtext::Assignment|ParameterizedIdentifier]
+		//'=' assignment=[xtext::Assignment|ParameterizedIdentifier]
 		public Group getGroup_0() { return cGroup_0; }
 
-		//"="
+		//'='
 		public Keyword getEqualsSignKeyword_0_0() { return cEqualsSignKeyword_0_0; }
 
 		//assignment=[xtext::Assignment|ParameterizedIdentifier]
@@ -475,10 +476,10 @@ public class GrammarElementReferenceElements extends AbstractParserRuleElementFi
 		//ParameterizedIdentifier
 		public RuleCall getAssignmentAssignmentParameterizedIdentifierParserRuleCall_0_1_0_1() { return cAssignmentAssignmentParameterizedIdentifierParserRuleCall_0_1_0_1; }
 
-		//"@" ruleCall=[xtext::RuleCall|ParameterizedIdentifier]
+		//'@' ruleCall=[xtext::RuleCall|ParameterizedIdentifier]
 		public Group getGroup_1() { return cGroup_1; }
 
-		//"@"
+		//'@'
 		public Keyword getCommercialAtKeyword_1_0() { return cCommercialAtKeyword_1_0; }
 
 		//ruleCall=[xtext::RuleCall|ParameterizedIdentifier]
@@ -519,7 +520,7 @@ public class GrammarElementReferenceElements extends AbstractParserRuleElementFi
 	}
 
 	public class GrammarElementLookupElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "GrammarElementLookup");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.format.Format.GrammarElementLookup");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final Assignment cRuleAssignment_0 = (Assignment)cAlternatives.eContents().get(0);
 		private final CrossReference cRuleAbstractRuleCrossReference_0_0 = (CrossReference)cRuleAssignment_0.eContents().get(0);
@@ -551,7 +552,7 @@ public class GrammarElementLookupElements extends AbstractParserRuleElementFinde
 	}
 
 	public class ContextFreeDirectiveElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ContextFreeDirective");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.format.Format.ContextFreeDirective");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cLeftSquareBracketKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cGrammarElementsAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -565,13 +566,13 @@ public class ContextFreeDirectiveElements extends AbstractParserRuleElementFinde
 		private final RuleCall cMatcherListMatcherListParserRuleCall_4_0 = (RuleCall)cMatcherListAssignment_4.eContents().get(0);
 		
 		//ContextFreeDirective:
-		//	"[" grammarElements+=GrammarElementLookup ("," grammarElements+=GrammarElementLookup)* "]" matcherList=MatcherList;
+		//	'[' grammarElements+=GrammarElementLookup (',' grammarElements+=GrammarElementLookup)* ']' matcherList=MatcherList;
 		@Override public ParserRule getRule() { return rule; }
 
-		//"[" grammarElements+=GrammarElementLookup ("," grammarElements+=GrammarElementLookup)* "]" matcherList=MatcherList
+		//'[' grammarElements+=GrammarElementLookup (',' grammarElements+=GrammarElementLookup)* ']' matcherList=MatcherList
 		public Group getGroup() { return cGroup; }
 
-		//"["
+		//'['
 		public Keyword getLeftSquareBracketKeyword_0() { return cLeftSquareBracketKeyword_0; }
 
 		//grammarElements+=GrammarElementLookup
@@ -580,10 +581,10 @@ public class ContextFreeDirectiveElements extends AbstractParserRuleElementFinde
 		//GrammarElementLookup
 		public RuleCall getGrammarElementsGrammarElementLookupParserRuleCall_1_0() { return cGrammarElementsGrammarElementLookupParserRuleCall_1_0; }
 
-		//("," grammarElements+=GrammarElementLookup)*
+		//(',' grammarElements+=GrammarElementLookup)*
 		public Group getGroup_2() { return cGroup_2; }
 
-		//","
+		//','
 		public Keyword getCommaKeyword_2_0() { return cCommaKeyword_2_0; }
 
 		//grammarElements+=GrammarElementLookup
@@ -592,7 +593,7 @@ public class ContextFreeDirectiveElements extends AbstractParserRuleElementFinde
 		//GrammarElementLookup
 		public RuleCall getGrammarElementsGrammarElementLookupParserRuleCall_2_1_0() { return cGrammarElementsGrammarElementLookupParserRuleCall_2_1_0; }
 
-		//"]"
+		//']'
 		public Keyword getRightSquareBracketKeyword_3() { return cRightSquareBracketKeyword_3; }
 
 		//matcherList=MatcherList
@@ -603,7 +604,7 @@ public class ContextFreeDirectiveElements extends AbstractParserRuleElementFinde
 	}
 
 	public class SpecificDirectiveElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "SpecificDirective");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.format.Format.SpecificDirective");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cGrammarElementsAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final RuleCall cGrammarElementsGrammarElementReferenceParserRuleCall_0_0 = (RuleCall)cGrammarElementsAssignment_0.eContents().get(0);
@@ -615,10 +616,10 @@ public class SpecificDirectiveElements extends AbstractParserRuleElementFinder {
 		private final RuleCall cMatcherListMatcherListParserRuleCall_2_0 = (RuleCall)cMatcherListAssignment_2.eContents().get(0);
 		
 		//SpecificDirective:
-		//	grammarElements+=GrammarElementReference ("," grammarElements+=GrammarElementReference)* matcherList=MatcherList;
+		//	grammarElements+=GrammarElementReference (',' grammarElements+=GrammarElementReference)* matcherList=MatcherList;
 		@Override public ParserRule getRule() { return rule; }
 
-		//grammarElements+=GrammarElementReference ("," grammarElements+=GrammarElementReference)* matcherList=MatcherList
+		//grammarElements+=GrammarElementReference (',' grammarElements+=GrammarElementReference)* matcherList=MatcherList
 		public Group getGroup() { return cGroup; }
 
 		//grammarElements+=GrammarElementReference
@@ -627,10 +628,10 @@ public class SpecificDirectiveElements extends AbstractParserRuleElementFinder {
 		//GrammarElementReference
 		public RuleCall getGrammarElementsGrammarElementReferenceParserRuleCall_0_0() { return cGrammarElementsGrammarElementReferenceParserRuleCall_0_0; }
 
-		//("," grammarElements+=GrammarElementReference)*
+		//(',' grammarElements+=GrammarElementReference)*
 		public Group getGroup_1() { return cGroup_1; }
 
-		//","
+		//','
 		public Keyword getCommaKeyword_1_0() { return cCommaKeyword_1_0; }
 
 		//grammarElements+=GrammarElementReference
@@ -647,7 +648,7 @@ public class SpecificDirectiveElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class MatcherListElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "MatcherList");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.format.Format.MatcherList");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cColonKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cMatchersAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -659,13 +660,13 @@ public class MatcherListElements extends AbstractParserRuleElementFinder {
 		private final Keyword cSemicolonKeyword_3 = (Keyword)cGroup.eContents().get(3);
 		
 		//MatcherList:
-		//	":" matchers+=Matcher ("," matchers+=Matcher)* ";";
+		//	':' matchers+=Matcher (',' matchers+=Matcher)* ';';
 		@Override public ParserRule getRule() { return rule; }
 
-		//":" matchers+=Matcher ("," matchers+=Matcher)* ";"
+		//':' matchers+=Matcher (',' matchers+=Matcher)* ';'
 		public Group getGroup() { return cGroup; }
 
-		//":"
+		//':'
 		public Keyword getColonKeyword_0() { return cColonKeyword_0; }
 
 		//matchers+=Matcher
@@ -674,10 +675,10 @@ public class MatcherListElements extends AbstractParserRuleElementFinder {
 		//Matcher
 		public RuleCall getMatchersMatcherParserRuleCall_1_0() { return cMatchersMatcherParserRuleCall_1_0; }
 
-		//("," matchers+=Matcher)*
+		//(',' matchers+=Matcher)*
 		public Group getGroup_2() { return cGroup_2; }
 
-		//","
+		//','
 		public Keyword getCommaKeyword_2_0() { return cCommaKeyword_2_0; }
 
 		//matchers+=Matcher
@@ -686,12 +687,12 @@ public class MatcherListElements extends AbstractParserRuleElementFinder {
 		//Matcher
 		public RuleCall getMatchersMatcherParserRuleCall_2_1_0() { return cMatchersMatcherParserRuleCall_2_1_0; }
 
-		//";"
+		//';'
 		public Keyword getSemicolonKeyword_3() { return cSemicolonKeyword_3; }
 	}
 
 	public class GroupBlockElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "GroupBlock");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.format.Format.GroupBlock");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cGroupKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cGrammarElementAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -711,15 +712,15 @@ public class GroupBlockElements extends AbstractParserRuleElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_2_2_2 = (Keyword)cGroup_2_2.eContents().get(2);
 		
 		//GroupBlock:
-		//	"group" grammarElement=[xtext::CompoundElement|IntIdentifier] (matcherList=MatcherList | "=>" subGroup=GroupBlock |
-		//	"{" directives+=GrammarRuleDirective* "}");
+		//	'group' grammarElement=[xtext::CompoundElement|IntIdentifier] (matcherList=MatcherList | '=>' subGroup=GroupBlock |
+		//	'{' directives+=GrammarRuleDirective* '}');
 		@Override public ParserRule getRule() { return rule; }
 
-		//"group" grammarElement=[xtext::CompoundElement|IntIdentifier] (matcherList=MatcherList | "=>" subGroup=GroupBlock | "{"
-		//directives+=GrammarRuleDirective* "}")
+		//'group' grammarElement=[xtext::CompoundElement|IntIdentifier] (matcherList=MatcherList | '=>' subGroup=GroupBlock | '{'
+		//directives+=GrammarRuleDirective* '}')
 		public Group getGroup() { return cGroup; }
 
-		//"group"
+		//'group'
 		public Keyword getGroupKeyword_0() { return cGroupKeyword_0; }
 
 		//grammarElement=[xtext::CompoundElement|IntIdentifier]
@@ -731,7 +732,7 @@ public class GroupBlockElements extends AbstractParserRuleElementFinder {
 		//IntIdentifier
 		public RuleCall getGrammarElementCompoundElementIntIdentifierParserRuleCall_1_0_1() { return cGrammarElementCompoundElementIntIdentifierParserRuleCall_1_0_1; }
 
-		//matcherList=MatcherList | "=>" subGroup=GroupBlock | "{" directives+=GrammarRuleDirective* "}"
+		//matcherList=MatcherList | '=>' subGroup=GroupBlock | '{' directives+=GrammarRuleDirective* '}'
 		public Alternatives getAlternatives_2() { return cAlternatives_2; }
 
 		//matcherList=MatcherList
@@ -740,10 +741,10 @@ public class GroupBlockElements extends AbstractParserRuleElementFinder {
 		//MatcherList
 		public RuleCall getMatcherListMatcherListParserRuleCall_2_0_0() { return cMatcherListMatcherListParserRuleCall_2_0_0; }
 
-		//"=>" subGroup=GroupBlock
+		//'=>' subGroup=GroupBlock
 		public Group getGroup_2_1() { return cGroup_2_1; }
 
-		//"=>"
+		//'=>'
 		public Keyword getEqualsSignGreaterThanSignKeyword_2_1_0() { return cEqualsSignGreaterThanSignKeyword_2_1_0; }
 
 		//subGroup=GroupBlock
@@ -752,10 +753,10 @@ public class GroupBlockElements extends AbstractParserRuleElementFinder {
 		//GroupBlock
 		public RuleCall getSubGroupGroupBlockParserRuleCall_2_1_1_0() { return cSubGroupGroupBlockParserRuleCall_2_1_1_0; }
 
-		//"{" directives+=GrammarRuleDirective* "}"
+		//'{' directives+=GrammarRuleDirective* '}'
 		public Group getGroup_2_2() { return cGroup_2_2; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_2_2_0() { return cLeftCurlyBracketKeyword_2_2_0; }
 
 		//directives+=GrammarRuleDirective*
@@ -764,12 +765,12 @@ public class GroupBlockElements extends AbstractParserRuleElementFinder {
 		//GrammarRuleDirective
 		public RuleCall getDirectivesGrammarRuleDirectiveParserRuleCall_2_2_1_0() { return cDirectivesGrammarRuleDirectiveParserRuleCall_2_2_1_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_2_2_2() { return cRightCurlyBracketKeyword_2_2_2; }
 	}
 
 	public class KeywordPairElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "KeywordPair");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.format.Format.KeywordPair");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cLeftParenthesisKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cLeftAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -805,15 +806,15 @@ public class KeywordPairElements extends AbstractParserRuleElementFinder {
 		private final Keyword cSemicolonKeyword_7 = (Keyword)cGroup.eContents().get(7);
 		
 		//KeywordPair:
-		//	"(" left=STRING right=STRING ")" ":" ("left" "." leftMatchers+=Matcher | "right" "." rightMatchers+=Matcher) (","
-		//	("left" "." leftMatchers+=Matcher | "right" "." rightMatchers+=Matcher))* ";";
+		//	'(' left=STRING right=STRING ')' ':' ('left' '.' leftMatchers+=Matcher | 'right' '.' rightMatchers+=Matcher) (','
+		//	('left' '.' leftMatchers+=Matcher | 'right' '.' rightMatchers+=Matcher))* ';';
 		@Override public ParserRule getRule() { return rule; }
 
-		//"(" left=STRING right=STRING ")" ":" ("left" "." leftMatchers+=Matcher | "right" "." rightMatchers+=Matcher) (","
-		//("left" "." leftMatchers+=Matcher | "right" "." rightMatchers+=Matcher))* ";"
+		//'(' left=STRING right=STRING ')' ':' ('left' '.' leftMatchers+=Matcher | 'right' '.' rightMatchers+=Matcher) (','
+		//('left' '.' leftMatchers+=Matcher | 'right' '.' rightMatchers+=Matcher))* ';'
 		public Group getGroup() { return cGroup; }
 
-		//"("
+		//'('
 		public Keyword getLeftParenthesisKeyword_0() { return cLeftParenthesisKeyword_0; }
 
 		//left=STRING
@@ -828,22 +829,22 @@ public class KeywordPairElements extends AbstractParserRuleElementFinder {
 		//STRING
 		public RuleCall getRightSTRINGTerminalRuleCall_2_0() { return cRightSTRINGTerminalRuleCall_2_0; }
 
-		//")"
+		//')'
 		public Keyword getRightParenthesisKeyword_3() { return cRightParenthesisKeyword_3; }
 
-		//":"
+		//':'
 		public Keyword getColonKeyword_4() { return cColonKeyword_4; }
 
-		//"left" "." leftMatchers+=Matcher | "right" "." rightMatchers+=Matcher
+		//'left' '.' leftMatchers+=Matcher | 'right' '.' rightMatchers+=Matcher
 		public Alternatives getAlternatives_5() { return cAlternatives_5; }
 
-		//"left" "." leftMatchers+=Matcher
+		//'left' '.' leftMatchers+=Matcher
 		public Group getGroup_5_0() { return cGroup_5_0; }
 
-		//"left"
+		//'left'
 		public Keyword getLeftKeyword_5_0_0() { return cLeftKeyword_5_0_0; }
 
-		//"."
+		//'.'
 		public Keyword getFullStopKeyword_5_0_1() { return cFullStopKeyword_5_0_1; }
 
 		//leftMatchers+=Matcher
@@ -852,13 +853,13 @@ public class KeywordPairElements extends AbstractParserRuleElementFinder {
 		//Matcher
 		public RuleCall getLeftMatchersMatcherParserRuleCall_5_0_2_0() { return cLeftMatchersMatcherParserRuleCall_5_0_2_0; }
 
-		//"right" "." rightMatchers+=Matcher
+		//'right' '.' rightMatchers+=Matcher
 		public Group getGroup_5_1() { return cGroup_5_1; }
 
-		//"right"
+		//'right'
 		public Keyword getRightKeyword_5_1_0() { return cRightKeyword_5_1_0; }
 
-		//"."
+		//'.'
 		public Keyword getFullStopKeyword_5_1_1() { return cFullStopKeyword_5_1_1; }
 
 		//rightMatchers+=Matcher
@@ -867,22 +868,22 @@ public class KeywordPairElements extends AbstractParserRuleElementFinder {
 		//Matcher
 		public RuleCall getRightMatchersMatcherParserRuleCall_5_1_2_0() { return cRightMatchersMatcherParserRuleCall_5_1_2_0; }
 
-		//("," ("left" "." leftMatchers+=Matcher | "right" "." rightMatchers+=Matcher))*
+		//(',' ('left' '.' leftMatchers+=Matcher | 'right' '.' rightMatchers+=Matcher))*
 		public Group getGroup_6() { return cGroup_6; }
 
-		//","
+		//','
 		public Keyword getCommaKeyword_6_0() { return cCommaKeyword_6_0; }
 
-		//"left" "." leftMatchers+=Matcher | "right" "." rightMatchers+=Matcher
+		//'left' '.' leftMatchers+=Matcher | 'right' '.' rightMatchers+=Matcher
 		public Alternatives getAlternatives_6_1() { return cAlternatives_6_1; }
 
-		//"left" "." leftMatchers+=Matcher
+		//'left' '.' leftMatchers+=Matcher
 		public Group getGroup_6_1_0() { return cGroup_6_1_0; }
 
-		//"left"
+		//'left'
 		public Keyword getLeftKeyword_6_1_0_0() { return cLeftKeyword_6_1_0_0; }
 
-		//"."
+		//'.'
 		public Keyword getFullStopKeyword_6_1_0_1() { return cFullStopKeyword_6_1_0_1; }
 
 		//leftMatchers+=Matcher
@@ -891,13 +892,13 @@ public class KeywordPairElements extends AbstractParserRuleElementFinder {
 		//Matcher
 		public RuleCall getLeftMatchersMatcherParserRuleCall_6_1_0_2_0() { return cLeftMatchersMatcherParserRuleCall_6_1_0_2_0; }
 
-		//"right" "." rightMatchers+=Matcher
+		//'right' '.' rightMatchers+=Matcher
 		public Group getGroup_6_1_1() { return cGroup_6_1_1; }
 
-		//"right"
+		//'right'
 		public Keyword getRightKeyword_6_1_1_0() { return cRightKeyword_6_1_1_0; }
 
-		//"."
+		//'.'
 		public Keyword getFullStopKeyword_6_1_1_1() { return cFullStopKeyword_6_1_1_1; }
 
 		//rightMatchers+=Matcher
@@ -906,12 +907,12 @@ public class KeywordPairElements extends AbstractParserRuleElementFinder {
 		//Matcher
 		public RuleCall getRightMatchersMatcherParserRuleCall_6_1_1_2_0() { return cRightMatchersMatcherParserRuleCall_6_1_1_2_0; }
 
-		//";"
+		//';'
 		public Keyword getSemicolonKeyword_7() { return cSemicolonKeyword_7; }
 	}
 
 	public class MatcherElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Matcher");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.format.Format.Matcher");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cLocatorAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final RuleCall cLocatorLocatorParserRuleCall_0_0 = (RuleCall)cLocatorAssignment_0.eContents().get(0);
@@ -947,7 +948,7 @@ public class MatcherElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class LocatorElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Locator");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.format.Format.Locator");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cSpaceLocatorParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cRightPaddingLocatorParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
@@ -988,27 +989,27 @@ public class LocatorElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class NoFormatLocatorElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "NoFormatLocator");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.format.Format.NoFormatLocator");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Action cNoFormatLocatorAction_0 = (Action)cGroup.eContents().get(0);
 		private final Keyword cNo_formatKeyword_1 = (Keyword)cGroup.eContents().get(1);
 		
 		//NoFormatLocator:
-		//	{NoFormatLocator} "no_format";
+		//	{NoFormatLocator} 'no_format';
 		@Override public ParserRule getRule() { return rule; }
 
-		//{NoFormatLocator} "no_format"
+		//{NoFormatLocator} 'no_format'
 		public Group getGroup() { return cGroup; }
 
 		//{NoFormatLocator}
 		public Action getNoFormatLocatorAction_0() { return cNoFormatLocatorAction_0; }
 
-		//"no_format"
+		//'no_format'
 		public Keyword getNo_formatKeyword_1() { return cNo_formatKeyword_1; }
 	}
 
 	public class SpaceLocatorElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "SpaceLocator");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.format.Format.SpaceLocator");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final Group cGroup_0 = (Group)cAlternatives.eContents().get(0);
 		private final Keyword cSpaceKeyword_0_0 = (Keyword)cGroup_0.eContents().get(0);
@@ -1018,16 +1019,16 @@ public class SpaceLocatorElements extends AbstractParserRuleElementFinder {
 		private final Keyword cNoSpaceNo_spaceKeyword_1_0 = (Keyword)cNoSpaceAssignment_1.eContents().get(0);
 		
 		//SpaceLocator:
-		//	"space" value=StringValue | noSpace?="no_space";
+		//	'space' value=StringValue | noSpace?='no_space';
 		@Override public ParserRule getRule() { return rule; }
 
-		//"space" value=StringValue | noSpace?="no_space"
+		//'space' value=StringValue | noSpace?='no_space'
 		public Alternatives getAlternatives() { return cAlternatives; }
 
-		//"space" value=StringValue
+		//'space' value=StringValue
 		public Group getGroup_0() { return cGroup_0; }
 
-		//"space"
+		//'space'
 		public Keyword getSpaceKeyword_0_0() { return cSpaceKeyword_0_0; }
 
 		//value=StringValue
@@ -1036,28 +1037,28 @@ public class SpaceLocatorElements extends AbstractParserRuleElementFinder {
 		//StringValue
 		public RuleCall getValueStringValueParserRuleCall_0_1_0() { return cValueStringValueParserRuleCall_0_1_0; }
 
-		//noSpace?="no_space"
+		//noSpace?='no_space'
 		public Assignment getNoSpaceAssignment_1() { return cNoSpaceAssignment_1; }
 
-		//"no_space"
+		//'no_space'
 		public Keyword getNoSpaceNo_spaceKeyword_1_0() { return cNoSpaceNo_spaceKeyword_1_0; }
 	}
 
 	public class RightPaddingLocatorElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "RightPaddingLocator");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.format.Format.RightPaddingLocator");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cRight_paddingKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cValueAssignment_1 = (Assignment)cGroup.eContents().get(1);
 		private final RuleCall cValueIntValueParserRuleCall_1_0 = (RuleCall)cValueAssignment_1.eContents().get(0);
 		
 		//RightPaddingLocator:
-		//	"right_padding" value=IntValue;
+		//	'right_padding' value=IntValue;
 		@Override public ParserRule getRule() { return rule; }
 
-		//"right_padding" value=IntValue
+		//'right_padding' value=IntValue
 		public Group getGroup() { return cGroup; }
 
-		//"right_padding"
+		//'right_padding'
 		public Keyword getRight_paddingKeyword_0() { return cRight_paddingKeyword_0; }
 
 		//value=IntValue
@@ -1068,7 +1069,7 @@ public class RightPaddingLocatorElements extends AbstractParserRuleElementFinder
 	}
 
 	public class LinewrapLocatorElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "LinewrapLocator");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.format.Format.LinewrapLocator");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final Group cGroup_0 = (Group)cAlternatives.eContents().get(0);
 		private final Action cLinewrapLocatorAction_0_0 = (Action)cGroup_0.eContents().get(0);
@@ -1088,24 +1089,24 @@ public class LinewrapLocatorElements extends AbstractParserRuleElementFinder {
 		private final Keyword cNoLinewrapNo_linewrapKeyword_1_0 = (Keyword)cNoLinewrapAssignment_1.eContents().get(0);
 		
 		//LinewrapLocator:
-		//	{LinewrapLocator} ("linewrap" (value=IntValue | minimum=IntValue default=IntValue maximum=IntValue)?) |
-		//	noLinewrap?="no_linewrap";
+		//	{LinewrapLocator} ('linewrap' (value=IntValue | minimum=IntValue default=IntValue maximum=IntValue)?) |
+		//	noLinewrap?='no_linewrap';
 		@Override public ParserRule getRule() { return rule; }
 
-		//{LinewrapLocator} ("linewrap" (value=IntValue | minimum=IntValue default=IntValue maximum=IntValue)?) |
-		//noLinewrap?="no_linewrap"
+		//{LinewrapLocator} ('linewrap' (value=IntValue | minimum=IntValue default=IntValue maximum=IntValue)?) |
+		//noLinewrap?='no_linewrap'
 		public Alternatives getAlternatives() { return cAlternatives; }
 
-		//{LinewrapLocator} ("linewrap" (value=IntValue | minimum=IntValue default=IntValue maximum=IntValue)?)
+		//{LinewrapLocator} ('linewrap' (value=IntValue | minimum=IntValue default=IntValue maximum=IntValue)?)
 		public Group getGroup_0() { return cGroup_0; }
 
 		//{LinewrapLocator}
 		public Action getLinewrapLocatorAction_0_0() { return cLinewrapLocatorAction_0_0; }
 
-		//"linewrap" (value=IntValue | minimum=IntValue default=IntValue maximum=IntValue)?
+		//'linewrap' (value=IntValue | minimum=IntValue default=IntValue maximum=IntValue)?
 		public Group getGroup_0_1() { return cGroup_0_1; }
 
-		//"linewrap"
+		//'linewrap'
 		public Keyword getLinewrapKeyword_0_1_0() { return cLinewrapKeyword_0_1_0; }
 
 		//(value=IntValue | minimum=IntValue default=IntValue maximum=IntValue)?
@@ -1138,15 +1139,15 @@ public class LinewrapLocatorElements extends AbstractParserRuleElementFinder {
 		//IntValue
 		public RuleCall getMaximumIntValueParserRuleCall_0_1_1_1_2_0() { return cMaximumIntValueParserRuleCall_0_1_1_1_2_0; }
 
-		//noLinewrap?="no_linewrap"
+		//noLinewrap?='no_linewrap'
 		public Assignment getNoLinewrapAssignment_1() { return cNoLinewrapAssignment_1; }
 
-		//"no_linewrap"
+		//'no_linewrap'
 		public Keyword getNoLinewrapNo_linewrapKeyword_1_0() { return cNoLinewrapNo_linewrapKeyword_1_0; }
 	}
 
 	public class ColumnLocatorElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ColumnLocator");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.format.Format.ColumnLocator");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cColumnKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cFixedAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -1162,19 +1163,19 @@ public class ColumnLocatorElements extends AbstractParserRuleElementFinder {
 		private final Keyword cNobreakNobreakKeyword_4_0 = (Keyword)cNobreakAssignment_4.eContents().get(0);
 		
 		//ColumnLocator:
-		//	"column" fixed?="fixed"? (value=IntValue | parameter=XBlockExpression) relative?="relative"? nobreak?="nobreak"?;
+		//	'column' fixed?='fixed'? (value=IntValue | parameter=XBlockExpression) relative?='relative'? nobreak?='nobreak'?;
 		@Override public ParserRule getRule() { return rule; }
 
-		//"column" fixed?="fixed"? (value=IntValue | parameter=XBlockExpression) relative?="relative"? nobreak?="nobreak"?
+		//'column' fixed?='fixed'? (value=IntValue | parameter=XBlockExpression) relative?='relative'? nobreak?='nobreak'?
 		public Group getGroup() { return cGroup; }
 
-		//"column"
+		//'column'
 		public Keyword getColumnKeyword_0() { return cColumnKeyword_0; }
 
-		//fixed?="fixed"?
+		//fixed?='fixed'?
 		public Assignment getFixedAssignment_1() { return cFixedAssignment_1; }
 
-		//"fixed"
+		//'fixed'
 		public Keyword getFixedFixedKeyword_1_0() { return cFixedFixedKeyword_1_0; }
 
 		//value=IntValue | parameter=XBlockExpression
@@ -1192,21 +1193,21 @@ public class ColumnLocatorElements extends AbstractParserRuleElementFinder {
 		//XBlockExpression
 		public RuleCall getParameterXBlockExpressionParserRuleCall_2_1_0() { return cParameterXBlockExpressionParserRuleCall_2_1_0; }
 
-		//relative?="relative"?
+		//relative?='relative'?
 		public Assignment getRelativeAssignment_3() { return cRelativeAssignment_3; }
 
-		//"relative"
+		//'relative'
 		public Keyword getRelativeRelativeKeyword_3_0() { return cRelativeRelativeKeyword_3_0; }
 
-		//nobreak?="nobreak"?
+		//nobreak?='nobreak'?
 		public Assignment getNobreakAssignment_4() { return cNobreakAssignment_4; }
 
-		//"nobreak"
+		//'nobreak'
 		public Keyword getNobreakNobreakKeyword_4_0() { return cNobreakNobreakKeyword_4_0; }
 	}
 
 	public class OffsetLocatorElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "OffsetLocator");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.format.Format.OffsetLocator");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cOffsetKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cFixedAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -1217,19 +1218,19 @@ public class OffsetLocatorElements extends AbstractParserRuleElementFinder {
 		private final Keyword cNobreakNobreakKeyword_3_0 = (Keyword)cNobreakAssignment_3.eContents().get(0);
 		
 		//OffsetLocator:
-		//	"offset" fixed?="fixed"? value=IntValue nobreak?="nobreak"?;
+		//	'offset' fixed?='fixed'? value=IntValue nobreak?='nobreak'?;
 		@Override public ParserRule getRule() { return rule; }
 
-		//"offset" fixed?="fixed"? value=IntValue nobreak?="nobreak"?
+		//'offset' fixed?='fixed'? value=IntValue nobreak?='nobreak'?
 		public Group getGroup() { return cGroup; }
 
-		//"offset"
+		//'offset'
 		public Keyword getOffsetKeyword_0() { return cOffsetKeyword_0; }
 
-		//fixed?="fixed"?
+		//fixed?='fixed'?
 		public Assignment getFixedAssignment_1() { return cFixedAssignment_1; }
 
-		//"fixed"
+		//'fixed'
 		public Keyword getFixedFixedKeyword_1_0() { return cFixedFixedKeyword_1_0; }
 
 		//value=IntValue
@@ -1238,15 +1239,15 @@ public class OffsetLocatorElements extends AbstractParserRuleElementFinder {
 		//IntValue
 		public RuleCall getValueIntValueParserRuleCall_2_0() { return cValueIntValueParserRuleCall_2_0; }
 
-		//nobreak?="nobreak"?
+		//nobreak?='nobreak'?
 		public Assignment getNobreakAssignment_3() { return cNobreakAssignment_3; }
 
-		//"nobreak"
+		//'nobreak'
 		public Keyword getNobreakNobreakKeyword_3_0() { return cNobreakNobreakKeyword_3_0; }
 	}
 
 	public class IndentLocatorElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "IndentLocator");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.format.Format.IndentLocator");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Action cIndentLocatorAction_0 = (Action)cGroup.eContents().get(0);
 		private final Alternatives cAlternatives_1 = (Alternatives)cGroup.eContents().get(1);
@@ -1260,25 +1261,25 @@ public class IndentLocatorElements extends AbstractParserRuleElementFinder {
 		private final RuleCall cParameterXBlockExpressionParserRuleCall_2_1_0 = (RuleCall)cParameterAssignment_2_1.eContents().get(0);
 		
 		//IndentLocator:
-		//	{IndentLocator} (increment?="increment" | "decrement") (value=IntValue | parameter=XBlockExpression)?;
+		//	{IndentLocator} (increment?='increment' | 'decrement') (value=IntValue | parameter=XBlockExpression)?;
 		@Override public ParserRule getRule() { return rule; }
 
-		//{IndentLocator} (increment?="increment" | "decrement") (value=IntValue | parameter=XBlockExpression)?
+		//{IndentLocator} (increment?='increment' | 'decrement') (value=IntValue | parameter=XBlockExpression)?
 		public Group getGroup() { return cGroup; }
 
 		//{IndentLocator}
 		public Action getIndentLocatorAction_0() { return cIndentLocatorAction_0; }
 
-		//increment?="increment" | "decrement"
+		//increment?='increment' | 'decrement'
 		public Alternatives getAlternatives_1() { return cAlternatives_1; }
 
-		//increment?="increment"
+		//increment?='increment'
 		public Assignment getIncrementAssignment_1_0() { return cIncrementAssignment_1_0; }
 
-		//"increment"
+		//'increment'
 		public Keyword getIncrementIncrementKeyword_1_0_0() { return cIncrementIncrementKeyword_1_0_0; }
 
-		//"decrement"
+		//'decrement'
 		public Keyword getDecrementKeyword_1_1() { return cDecrementKeyword_1_1; }
 
 		//(value=IntValue | parameter=XBlockExpression)?
@@ -1298,7 +1299,7 @@ public class IndentLocatorElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class ParameterizedIdentifierElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ParameterizedIdentifier");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.format.Format.ParameterizedIdentifier");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final RuleCall cIdentifierParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0);
 		private final Group cGroup_1 = (Group)cGroup.eContents().get(1);
@@ -1308,37 +1309,37 @@ public class ParameterizedIdentifierElements extends AbstractParserRuleElementFi
 		private final RuleCall cINTTerminalRuleCall_1_3 = (RuleCall)cGroup_1.eContents().get(3);
 		private final Keyword cRightParenthesisKeyword_1_4 = (Keyword)cGroup_1.eContents().get(4);
 		
-		//ParameterizedIdentifier returns ecore::EString:
-		//	Identifier ("(" INT "," INT ")")?;
+		//ParameterizedIdentifier:
+		//	Identifier ('(' INT ',' INT ')')?;
 		@Override public ParserRule getRule() { return rule; }
 
-		//Identifier ("(" INT "," INT ")")?
+		//Identifier ('(' INT ',' INT ')')?
 		public Group getGroup() { return cGroup; }
 
 		//Identifier
 		public RuleCall getIdentifierParserRuleCall_0() { return cIdentifierParserRuleCall_0; }
 
-		//("(" INT "," INT ")")?
+		//('(' INT ',' INT ')')?
 		public Group getGroup_1() { return cGroup_1; }
 
-		//"("
+		//'('
 		public Keyword getLeftParenthesisKeyword_1_0() { return cLeftParenthesisKeyword_1_0; }
 
 		//INT
 		public RuleCall getINTTerminalRuleCall_1_1() { return cINTTerminalRuleCall_1_1; }
 
-		//","
+		//','
 		public Keyword getCommaKeyword_1_2() { return cCommaKeyword_1_2; }
 
 		//INT
 		public RuleCall getINTTerminalRuleCall_1_3() { return cINTTerminalRuleCall_1_3; }
 
-		//")"
+		//')'
 		public Keyword getRightParenthesisKeyword_1_4() { return cRightParenthesisKeyword_1_4; }
 	}
 
 	public class ParameterizedStringElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ParameterizedString");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.format.Format.ParameterizedString");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final RuleCall cSTRINGTerminalRuleCall_0 = (RuleCall)cGroup.eContents().get(0);
 		private final Group cGroup_1 = (Group)cGroup.eContents().get(1);
@@ -1348,81 +1349,81 @@ public class ParameterizedStringElements extends AbstractParserRuleElementFinder
 		private final RuleCall cINTTerminalRuleCall_1_3 = (RuleCall)cGroup_1.eContents().get(3);
 		private final Keyword cRightParenthesisKeyword_1_4 = (Keyword)cGroup_1.eContents().get(4);
 		
-		//ParameterizedString returns ecore::EString:
-		//	STRING ("(" INT "," INT ")")?;
+		//ParameterizedString:
+		//	STRING ('(' INT ',' INT ')')?;
 		@Override public ParserRule getRule() { return rule; }
 
-		//STRING ("(" INT "," INT ")")?
+		//STRING ('(' INT ',' INT ')')?
 		public Group getGroup() { return cGroup; }
 
 		//STRING
 		public RuleCall getSTRINGTerminalRuleCall_0() { return cSTRINGTerminalRuleCall_0; }
 
-		//("(" INT "," INT ")")?
+		//('(' INT ',' INT ')')?
 		public Group getGroup_1() { return cGroup_1; }
 
-		//"("
+		//'('
 		public Keyword getLeftParenthesisKeyword_1_0() { return cLeftParenthesisKeyword_1_0; }
 
 		//INT
 		public RuleCall getINTTerminalRuleCall_1_1() { return cINTTerminalRuleCall_1_1; }
 
-		//","
+		//','
 		public Keyword getCommaKeyword_1_2() { return cCommaKeyword_1_2; }
 
 		//INT
 		public RuleCall getINTTerminalRuleCall_1_3() { return cINTTerminalRuleCall_1_3; }
 
-		//")"
+		//')'
 		public Keyword getRightParenthesisKeyword_1_4() { return cRightParenthesisKeyword_1_4; }
 	}
 
 	public class IdentifierElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Identifier");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.format.Format.Identifier");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cIDTerminalRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final Keyword cDefaultKeyword_1 = (Keyword)cAlternatives.eContents().get(1);
 		private final Keyword cValKeyword_2 = (Keyword)cAlternatives.eContents().get(2);
 		
-		//Identifier returns ecore::EString:
-		//	ID | "default" | "val";
+		//Identifier:
+		//	ID | 'default' | 'val';
 		@Override public ParserRule getRule() { return rule; }
 
-		//ID | "default" | "val"
+		//ID | 'default' | 'val'
 		public Alternatives getAlternatives() { return cAlternatives; }
 
 		//ID
 		public RuleCall getIDTerminalRuleCall_0() { return cIDTerminalRuleCall_0; }
 
-		//"default"
+		//'default'
 		public Keyword getDefaultKeyword_1() { return cDefaultKeyword_1; }
 
-		//"val"
+		//'val'
 		public Keyword getValKeyword_2() { return cValKeyword_2; }
 	}
 
 	public class DottedIDElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "DottedID");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.format.Format.DottedID");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final RuleCall cIdentifierParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0);
 		private final Group cGroup_1 = (Group)cGroup.eContents().get(1);
 		private final Keyword cFullStopKeyword_1_0 = (Keyword)cGroup_1.eContents().get(0);
 		private final RuleCall cIdentifierParserRuleCall_1_1 = (RuleCall)cGroup_1.eContents().get(1);
 		
-		//DottedID returns ecore::EString:
-		//	Identifier ("." Identifier)*;
+		//DottedID:
+		//	Identifier ('.' Identifier)*;
 		@Override public ParserRule getRule() { return rule; }
 
-		//Identifier ("." Identifier)*
+		//Identifier ('.' Identifier)*
 		public Group getGroup() { return cGroup; }
 
 		//Identifier
 		public RuleCall getIdentifierParserRuleCall_0() { return cIdentifierParserRuleCall_0; }
 
-		//("." Identifier)*
+		//('.' Identifier)*
 		public Group getGroup_1() { return cGroup_1; }
 
-		//"."
+		//'.'
 		public Keyword getFullStopKeyword_1_0() { return cFullStopKeyword_1_0; }
 
 		//Identifier
@@ -1430,10 +1431,10 @@ public class DottedIDElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class IntIdentifierElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "IntIdentifier");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.format.Format.IntIdentifier");
 		private final RuleCall cINTTerminalRuleCall = (RuleCall)rule.eContents().get(1);
 		
-		//IntIdentifier returns ecore::EString:
+		//IntIdentifier:
 		//	INT;
 		@Override public ParserRule getRule() { return rule; }
 
@@ -1442,10 +1443,10 @@ public class IntIdentifierElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class IntObjectElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "IntObject");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.format.Format.IntObject");
 		private final RuleCall cINTTerminalRuleCall = (RuleCall)rule.eContents().get(1);
 		
-		//IntObject returns ecore::EIntegerObject:
+		//IntObject ecore::EIntegerObject:
 		//	INT;
 		@Override public ParserRule getRule() { return rule; }
 
@@ -1454,35 +1455,35 @@ public class IntObjectElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class RuleSelfIdentifierElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "RuleSelfIdentifier");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.format.Format.RuleSelfIdentifier");
 		private final Keyword cRuleKeyword = (Keyword)rule.eContents().get(1);
 		
 		//RuleSelfIdentifier:
-		//	"rule";
+		//	'rule';
 		@Override public ParserRule getRule() { return rule; }
 
-		//"rule"
+		//'rule'
 		public Keyword getRuleKeyword() { return cRuleKeyword; }
 	}
 
 	public class ValidIDElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ValidID");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.format.Format.ValidID");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final Keyword cContextKeyword_0 = (Keyword)cAlternatives.eContents().get(0);
 		private final Keyword cCurrentColumnKeyword_1 = (Keyword)cAlternatives.eContents().get(1);
 		private final RuleCall cIDTerminalRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2);
 		
 		//ValidID:
-		//	"context" | "currentColumn" | ID;
+		//	'context' | 'currentColumn' | ID;
 		@Override public ParserRule getRule() { return rule; }
 
-		//"context" | "currentColumn" | ID
+		//'context' | 'currentColumn' | ID
 		public Alternatives getAlternatives() { return cAlternatives; }
 
-		//"context"
+		//'context'
 		public Keyword getContextKeyword_0() { return cContextKeyword_0; }
 
-		//"currentColumn"
+		//'currentColumn'
 		public Keyword getCurrentColumnKeyword_1() { return cCurrentColumnKeyword_1; }
 
 		//ID
@@ -1491,7 +1492,7 @@ public class ValidIDElements extends AbstractParserRuleElementFinder {
 	
 	
 	public class MatcherTypeElements extends AbstractEnumRuleElementFinder {
-		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "MatcherType");
+		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.format.Format.MatcherType");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final EnumLiteralDeclaration cBeforeEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0);
 		private final Keyword cBeforeBeforeKeyword_0_0 = (Keyword)cBeforeEnumLiteralDeclaration_0.eContents().get(0);
@@ -1559,7 +1560,7 @@ public class MatcherTypeElements extends AbstractEnumRuleElementFinder {
 	private final GroupBlockElements pGroupBlock;
 	private final KeywordPairElements pKeywordPair;
 	private final MatcherElements pMatcher;
-	private final MatcherTypeElements unknownRuleMatcherType;
+	private final MatcherTypeElements eMatcherType;
 	private final LocatorElements pLocator;
 	private final NoFormatLocatorElements pNoFormatLocator;
 	private final SpaceLocatorElements pSpaceLocator;
@@ -1576,16 +1577,25 @@ public class MatcherTypeElements extends AbstractEnumRuleElementFinder {
 	private final IntObjectElements pIntObject;
 	private final RuleSelfIdentifierElements pRuleSelfIdentifier;
 	private final ValidIDElements pValidID;
+	private final TerminalRule tINT;
 	
 	private final Grammar grammar;
 
 	private final XbaseWithAnnotationsGrammarAccess gaXbaseWithAnnotations;
 
+	private final XbaseGrammarAccess gaXbase;
+
+	private final XtypeGrammarAccess gaXtype;
+
 	@Inject
 	public FormatGrammarAccess(GrammarProvider grammarProvider,
-		XbaseWithAnnotationsGrammarAccess gaXbaseWithAnnotations) {
+		XbaseWithAnnotationsGrammarAccess gaXbaseWithAnnotations,
+		XbaseGrammarAccess gaXbase,
+		XtypeGrammarAccess gaXtype) {
 		this.grammar = internalFindGrammar(grammarProvider);
 		this.gaXbaseWithAnnotations = gaXbaseWithAnnotations;
+		this.gaXbase = gaXbase;
+		this.gaXtype = gaXtype;
 		this.pFormatConfiguration = new FormatConfigurationElements();
 		this.pConstant = new ConstantElements();
 		this.pIntValue = new IntValueElements();
@@ -1603,7 +1613,7 @@ public FormatGrammarAccess(GrammarProvider grammarProvider,
 		this.pGroupBlock = new GroupBlockElements();
 		this.pKeywordPair = new KeywordPairElements();
 		this.pMatcher = new MatcherElements();
-		this.unknownRuleMatcherType = new MatcherTypeElements();
+		this.eMatcherType = new MatcherTypeElements();
 		this.pLocator = new LocatorElements();
 		this.pNoFormatLocator = new NoFormatLocatorElements();
 		this.pSpaceLocator = new SpaceLocatorElements();
@@ -1620,6 +1630,7 @@ public FormatGrammarAccess(GrammarProvider grammarProvider,
 		this.pIntObject = new IntObjectElements();
 		this.pRuleSelfIdentifier = new RuleSelfIdentifierElements();
 		this.pValidID = new ValidIDElements();
+		this.tINT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.format.Format.INT");
 	}
 	
 	protected Grammar internalFindGrammar(GrammarProvider grammarProvider) {
@@ -1648,11 +1659,19 @@ public XbaseWithAnnotationsGrammarAccess getXbaseWithAnnotationsGrammarAccess()
 		return gaXbaseWithAnnotations;
 	}
 
+	public XbaseGrammarAccess getXbaseGrammarAccess() {
+		return gaXbase;
+	}
+
+	public XtypeGrammarAccess getXtypeGrammarAccess() {
+		return gaXtype;
+	}
+
 	
 	//FormatConfiguration:
-	//	"formatter" "for" targetGrammar=[xtext::Grammar|DottedID] ("with"
-	//	extendedFormatConfiguration=[FormatConfiguration|DottedID])? ("extends"
-	//	formatterBaseClass=[types::JvmDeclaredType|QualifiedName])? ("const" constants+=Constant ";")* rules+=Rule*;
+	//	'formatter' 'for' targetGrammar=[xtext::Grammar|DottedID] ('with'
+	//	extendedFormatConfiguration=[FormatConfiguration|DottedID])? ('extends'
+	//	formatterBaseClass=[types::JvmDeclaredType|QualifiedName])? ('const' constants+=Constant ';')* rules+=Rule*;
 	public FormatConfigurationElements getFormatConfigurationAccess() {
 		return pFormatConfiguration;
 	}
@@ -1662,8 +1681,8 @@ public ParserRule getFormatConfigurationRule() {
 	}
 
 	//Constant:
-	//	(intType?="int" | stringType?="String")? //specifying the type is optional
-	// name=ID "=" (intValue=IntObject |
+	//	(intType?='int' | stringType?='String')? //specifying the type is optional
+	// name=ID '=' (intValue=IntObject |
 	//	stringValue=STRING);
 	public ConstantElements getConstantAccess() {
 		return pConstant;
@@ -1704,8 +1723,8 @@ public ParserRule getRuleRule() {
 	}
 
 	//GrammarRule:
-	//	override?="override"? targetRule=[xtext::AbstractRule] "{" (directives+=GrammarRuleDirective |
-	//	directives+=GroupBlock)* "}";
+	//	override?='override'? targetRule=[xtext::AbstractRule] '{' (directives+=GrammarRuleDirective |
+	//	directives+=GroupBlock)* '}';
 	public GrammarRuleElements getGrammarRuleAccess() {
 		return pGrammarRule;
 	}
@@ -1715,7 +1734,7 @@ public ParserRule getGrammarRuleRule() {
 	}
 
 	//WildcardRule:
-	//	{WildcardRule} override?="override"? "*" "{" directives+=WildcardRuleDirective* "}";
+	//	{WildcardRule} override?='override'? '*' '{' directives+=WildcardRuleDirective* '}';
 	public WildcardRuleElements getWildcardRuleAccess() {
 		return pWildcardRule;
 	}
@@ -1745,7 +1764,7 @@ public ParserRule getWildcardRuleDirectiveRule() {
 	}
 
 	//GrammarElementReference:
-	//	"=" assignment=[xtext::Assignment|ParameterizedIdentifier] | "@" ruleCall=[xtext::RuleCall|ParameterizedIdentifier] |
+	//	'=' assignment=[xtext::Assignment|ParameterizedIdentifier] | '@' ruleCall=[xtext::RuleCall|ParameterizedIdentifier] |
 	//	self=[xtext::AbstractRule|RuleSelfIdentifier] | rule=[xtext::AbstractRule|Identifier] |
 	//	keyword=[xtext::Keyword|ParameterizedString];
 	public GrammarElementReferenceElements getGrammarElementReferenceAccess() {
@@ -1767,7 +1786,7 @@ public ParserRule getGrammarElementLookupRule() {
 	}
 
 	//ContextFreeDirective:
-	//	"[" grammarElements+=GrammarElementLookup ("," grammarElements+=GrammarElementLookup)* "]" matcherList=MatcherList;
+	//	'[' grammarElements+=GrammarElementLookup (',' grammarElements+=GrammarElementLookup)* ']' matcherList=MatcherList;
 	public ContextFreeDirectiveElements getContextFreeDirectiveAccess() {
 		return pContextFreeDirective;
 	}
@@ -1777,7 +1796,7 @@ public ParserRule getContextFreeDirectiveRule() {
 	}
 
 	//SpecificDirective:
-	//	grammarElements+=GrammarElementReference ("," grammarElements+=GrammarElementReference)* matcherList=MatcherList;
+	//	grammarElements+=GrammarElementReference (',' grammarElements+=GrammarElementReference)* matcherList=MatcherList;
 	public SpecificDirectiveElements getSpecificDirectiveAccess() {
 		return pSpecificDirective;
 	}
@@ -1787,7 +1806,7 @@ public ParserRule getSpecificDirectiveRule() {
 	}
 
 	//MatcherList:
-	//	":" matchers+=Matcher ("," matchers+=Matcher)* ";";
+	//	':' matchers+=Matcher (',' matchers+=Matcher)* ';';
 	public MatcherListElements getMatcherListAccess() {
 		return pMatcherList;
 	}
@@ -1797,8 +1816,8 @@ public ParserRule getMatcherListRule() {
 	}
 
 	//GroupBlock:
-	//	"group" grammarElement=[xtext::CompoundElement|IntIdentifier] (matcherList=MatcherList | "=>" subGroup=GroupBlock |
-	//	"{" directives+=GrammarRuleDirective* "}");
+	//	'group' grammarElement=[xtext::CompoundElement|IntIdentifier] (matcherList=MatcherList | '=>' subGroup=GroupBlock |
+	//	'{' directives+=GrammarRuleDirective* '}');
 	public GroupBlockElements getGroupBlockAccess() {
 		return pGroupBlock;
 	}
@@ -1808,8 +1827,8 @@ public ParserRule getGroupBlockRule() {
 	}
 
 	//KeywordPair:
-	//	"(" left=STRING right=STRING ")" ":" ("left" "." leftMatchers+=Matcher | "right" "." rightMatchers+=Matcher) (","
-	//	("left" "." leftMatchers+=Matcher | "right" "." rightMatchers+=Matcher))* ";";
+	//	'(' left=STRING right=STRING ')' ':' ('left' '.' leftMatchers+=Matcher | 'right' '.' rightMatchers+=Matcher) (','
+	//	('left' '.' leftMatchers+=Matcher | 'right' '.' rightMatchers+=Matcher))* ';';
 	public KeywordPairElements getKeywordPairAccess() {
 		return pKeywordPair;
 	}
@@ -1831,7 +1850,7 @@ public ParserRule getMatcherRule() {
 	//enum MatcherType:
 	//	before | after | around | between | range;
 	public MatcherTypeElements getMatcherTypeAccess() {
-		return unknownRuleMatcherType;
+		return eMatcherType;
 	}
 	
 	public EnumRule getMatcherTypeRule() {
@@ -1850,7 +1869,7 @@ public ParserRule getLocatorRule() {
 	}
 
 	//NoFormatLocator:
-	//	{NoFormatLocator} "no_format";
+	//	{NoFormatLocator} 'no_format';
 	public NoFormatLocatorElements getNoFormatLocatorAccess() {
 		return pNoFormatLocator;
 	}
@@ -1860,7 +1879,7 @@ public ParserRule getNoFormatLocatorRule() {
 	}
 
 	//SpaceLocator:
-	//	"space" value=StringValue | noSpace?="no_space";
+	//	'space' value=StringValue | noSpace?='no_space';
 	public SpaceLocatorElements getSpaceLocatorAccess() {
 		return pSpaceLocator;
 	}
@@ -1870,7 +1889,7 @@ public ParserRule getSpaceLocatorRule() {
 	}
 
 	//RightPaddingLocator:
-	//	"right_padding" value=IntValue;
+	//	'right_padding' value=IntValue;
 	public RightPaddingLocatorElements getRightPaddingLocatorAccess() {
 		return pRightPaddingLocator;
 	}
@@ -1880,8 +1899,8 @@ public ParserRule getRightPaddingLocatorRule() {
 	}
 
 	//LinewrapLocator:
-	//	{LinewrapLocator} ("linewrap" (value=IntValue | minimum=IntValue default=IntValue maximum=IntValue)?) |
-	//	noLinewrap?="no_linewrap";
+	//	{LinewrapLocator} ('linewrap' (value=IntValue | minimum=IntValue default=IntValue maximum=IntValue)?) |
+	//	noLinewrap?='no_linewrap';
 	public LinewrapLocatorElements getLinewrapLocatorAccess() {
 		return pLinewrapLocator;
 	}
@@ -1891,7 +1910,7 @@ public ParserRule getLinewrapLocatorRule() {
 	}
 
 	//ColumnLocator:
-	//	"column" fixed?="fixed"? (value=IntValue | parameter=XBlockExpression) relative?="relative"? nobreak?="nobreak"?;
+	//	'column' fixed?='fixed'? (value=IntValue | parameter=XBlockExpression) relative?='relative'? nobreak?='nobreak'?;
 	public ColumnLocatorElements getColumnLocatorAccess() {
 		return pColumnLocator;
 	}
@@ -1901,7 +1920,7 @@ public ParserRule getColumnLocatorRule() {
 	}
 
 	//OffsetLocator:
-	//	"offset" fixed?="fixed"? value=IntValue nobreak?="nobreak"?;
+	//	'offset' fixed?='fixed'? value=IntValue nobreak?='nobreak'?;
 	public OffsetLocatorElements getOffsetLocatorAccess() {
 		return pOffsetLocator;
 	}
@@ -1911,7 +1930,7 @@ public ParserRule getOffsetLocatorRule() {
 	}
 
 	//IndentLocator:
-	//	{IndentLocator} (increment?="increment" | "decrement") (value=IntValue | parameter=XBlockExpression)?;
+	//	{IndentLocator} (increment?='increment' | 'decrement') (value=IntValue | parameter=XBlockExpression)?;
 	public IndentLocatorElements getIndentLocatorAccess() {
 		return pIndentLocator;
 	}
@@ -1920,8 +1939,8 @@ public ParserRule getIndentLocatorRule() {
 		return getIndentLocatorAccess().getRule();
 	}
 
-	//ParameterizedIdentifier returns ecore::EString:
-	//	Identifier ("(" INT "," INT ")")?;
+	//ParameterizedIdentifier:
+	//	Identifier ('(' INT ',' INT ')')?;
 	public ParameterizedIdentifierElements getParameterizedIdentifierAccess() {
 		return pParameterizedIdentifier;
 	}
@@ -1930,8 +1949,8 @@ public ParserRule getParameterizedIdentifierRule() {
 		return getParameterizedIdentifierAccess().getRule();
 	}
 
-	//ParameterizedString returns ecore::EString:
-	//	STRING ("(" INT "," INT ")")?;
+	//ParameterizedString:
+	//	STRING ('(' INT ',' INT ')')?;
 	public ParameterizedStringElements getParameterizedStringAccess() {
 		return pParameterizedString;
 	}
@@ -1940,8 +1959,8 @@ public ParserRule getParameterizedStringRule() {
 		return getParameterizedStringAccess().getRule();
 	}
 
-	//Identifier returns ecore::EString:
-	//	ID | "default" | "val";
+	//Identifier:
+	//	ID | 'default' | 'val';
 	public IdentifierElements getIdentifierAccess() {
 		return pIdentifier;
 	}
@@ -1950,8 +1969,8 @@ public ParserRule getIdentifierRule() {
 		return getIdentifierAccess().getRule();
 	}
 
-	//DottedID returns ecore::EString:
-	//	Identifier ("." Identifier)*;
+	//DottedID:
+	//	Identifier ('.' Identifier)*;
 	public DottedIDElements getDottedIDAccess() {
 		return pDottedID;
 	}
@@ -1960,7 +1979,7 @@ public ParserRule getDottedIDRule() {
 		return getDottedIDAccess().getRule();
 	}
 
-	//IntIdentifier returns ecore::EString:
+	//IntIdentifier:
 	//	INT;
 	public IntIdentifierElements getIntIdentifierAccess() {
 		return pIntIdentifier;
@@ -1970,7 +1989,7 @@ public ParserRule getIntIdentifierRule() {
 		return getIntIdentifierAccess().getRule();
 	}
 
-	//IntObject returns ecore::EIntegerObject:
+	//IntObject ecore::EIntegerObject:
 	//	INT;
 	public IntObjectElements getIntObjectAccess() {
 		return pIntObject;
@@ -1981,7 +2000,7 @@ public ParserRule getIntObjectRule() {
 	}
 
 	//RuleSelfIdentifier:
-	//	"rule";
+	//	'rule';
 	public RuleSelfIdentifierElements getRuleSelfIdentifierAccess() {
 		return pRuleSelfIdentifier;
 	}
@@ -1991,7 +2010,7 @@ public ParserRule getRuleSelfIdentifierRule() {
 	}
 
 	//ValidID:
-	//	"context" | "currentColumn" | ID;
+	//	'context' | 'currentColumn' | ID;
 	public ValidIDElements getValidIDAccess() {
 		return pValidID;
 	}
@@ -2000,10 +2019,16 @@ public ParserRule getValidIDRule() {
 		return getValidIDAccess().getRule();
 	}
 
+	//terminal INT returns ecore::EInt:
+	//	'0'..'9' ('0'..'9' | '_')*;
+	public TerminalRule getINTRule() {
+		return tINT;
+	} 
+
 	//XAnnotation:
-	//	{XAnnotation} "@" annotationType=[types::JvmAnnotationType|QualifiedName] ("("
-	//	(elementValuePairs+=XAnnotationElementValuePair ("," elementValuePairs+=XAnnotationElementValuePair)* |
-	//	value=XAnnotationElementValueOrCommaList)? ")")?;
+	//	{XAnnotation} '@' annotationType=[types::JvmAnnotationType|QualifiedName] (=> '('
+	//	(elementValuePairs+=XAnnotationElementValuePair (',' elementValuePairs+=XAnnotationElementValuePair)* |
+	//	value=XAnnotationElementValueOrCommaList)? ')')?;
 	public XbaseWithAnnotationsGrammarAccess.XAnnotationElements getXAnnotationAccess() {
 		return gaXbaseWithAnnotations.getXAnnotationAccess();
 	}
@@ -2013,7 +2038,7 @@ public ParserRule getXAnnotationRule() {
 	}
 
 	//XAnnotationElementValuePair:
-	//	=> (element=[types::JvmOperation|ValidID] "=") value=XAnnotationElementValue;
+	//	=> (element=[types::JvmOperation|super::ValidID] '=') value=XAnnotationElementValue;
 	public XbaseWithAnnotationsGrammarAccess.XAnnotationElementValuePairElements getXAnnotationElementValuePairAccess() {
 		return gaXbaseWithAnnotations.getXAnnotationElementValuePairAccess();
 	}
@@ -2022,9 +2047,9 @@ public ParserRule getXAnnotationElementValuePairRule() {
 		return getXAnnotationElementValuePairAccess().getRule();
 	}
 
-	//XAnnotationElementValueOrCommaList returns xbase::XExpression:
-	//	=> ({xbase::XListLiteral} "#" "[") (elements+=XAnnotationOrExpression ("," elements+=XAnnotationOrExpression)*)? "]"
-	//	| XAnnotationOrExpression ({xbase::XListLiteral.elements+=current} ("," elements+=XAnnotationOrExpression)+)?;
+	//XAnnotationElementValueOrCommaList xbase::XExpression:
+	//	=> ({xbase::XListLiteral} '#' '[') (elements+=XAnnotationOrExpression (',' elements+=XAnnotationOrExpression)*)? ']'
+	//	| XAnnotationOrExpression ({xbase::XListLiteral.elements+=current} (',' elements+=XAnnotationOrExpression)+)?;
 	public XbaseWithAnnotationsGrammarAccess.XAnnotationElementValueOrCommaListElements getXAnnotationElementValueOrCommaListAccess() {
 		return gaXbaseWithAnnotations.getXAnnotationElementValueOrCommaListAccess();
 	}
@@ -2033,8 +2058,8 @@ public ParserRule getXAnnotationElementValueOrCommaListRule() {
 		return getXAnnotationElementValueOrCommaListAccess().getRule();
 	}
 
-	//XAnnotationElementValue returns xbase::XExpression:
-	//	=> ({xbase::XListLiteral} "#" "[") (elements+=XAnnotationOrExpression ("," elements+=XAnnotationOrExpression)*)? "]"
+	//XAnnotationElementValue xbase::XExpression:
+	//	=> ({xbase::XListLiteral} '#' '[') (elements+=XAnnotationOrExpression (',' elements+=XAnnotationOrExpression)*)? ']'
 	//	| XAnnotationOrExpression;
 	public XbaseWithAnnotationsGrammarAccess.XAnnotationElementValueElements getXAnnotationElementValueAccess() {
 		return gaXbaseWithAnnotations.getXAnnotationElementValueAccess();
@@ -2044,7 +2069,7 @@ public ParserRule getXAnnotationElementValueRule() {
 		return getXAnnotationElementValueAccess().getRule();
 	}
 
-	//XAnnotationOrExpression returns xbase::XExpression:
+	//XAnnotationOrExpression xbase::XExpression:
 	//	XAnnotation | XExpression;
 	public XbaseWithAnnotationsGrammarAccess.XAnnotationOrExpressionElements getXAnnotationOrExpressionAccess() {
 		return gaXbaseWithAnnotations.getXAnnotationOrExpressionAccess();
@@ -2057,19 +2082,19 @@ public ParserRule getXAnnotationOrExpressionRule() {
 	//XExpression:
 	//	XAssignment;
 	public XbaseGrammarAccess.XExpressionElements getXExpressionAccess() {
-		return gaXbaseWithAnnotations.getXExpressionAccess();
+		return gaXbase.getXExpressionAccess();
 	}
 	
 	public ParserRule getXExpressionRule() {
 		return getXExpressionAccess().getRule();
 	}
 
-	//XAssignment returns XExpression:
+	//XAssignment XExpression:
 	//	{XAssignment} feature=[types::JvmIdentifiableElement|FeatureCallID] OpSingleAssign value=XAssignment | XOrExpression
 	//	(=> ({XBinaryOperation.leftOperand=current} feature=[types::JvmIdentifiableElement|OpMultiAssign])
 	//	rightOperand=XAssignment)?;
 	public XbaseGrammarAccess.XAssignmentElements getXAssignmentAccess() {
-		return gaXbaseWithAnnotations.getXAssignmentAccess();
+		return gaXbase.getXAssignmentAccess();
 	}
 	
 	public ParserRule getXAssignmentRule() {
@@ -2077,9 +2102,9 @@ public ParserRule getXAssignmentRule() {
 	}
 
 	//OpSingleAssign:
-	//	"=";
+	//	'=';
 	public XbaseGrammarAccess.OpSingleAssignElements getOpSingleAssignAccess() {
-		return gaXbaseWithAnnotations.getOpSingleAssignAccess();
+		return gaXbase.getOpSingleAssignAccess();
 	}
 	
 	public ParserRule getOpSingleAssignRule() {
@@ -2087,20 +2112,20 @@ public ParserRule getOpSingleAssignRule() {
 	}
 
 	//OpMultiAssign:
-	//	"+=" | "-=" | "*=" | "/=" | "%=" | "<" "<" "=" | ">" ">"? ">=";
+	//	'+=' | '-=' | '*=' | '/=' | '%=' | '<' '<' '=' | '>' '>'? '>=';
 	public XbaseGrammarAccess.OpMultiAssignElements getOpMultiAssignAccess() {
-		return gaXbaseWithAnnotations.getOpMultiAssignAccess();
+		return gaXbase.getOpMultiAssignAccess();
 	}
 	
 	public ParserRule getOpMultiAssignRule() {
 		return getOpMultiAssignAccess().getRule();
 	}
 
-	//XOrExpression returns XExpression:
+	//XOrExpression XExpression:
 	//	XAndExpression (=> ({XBinaryOperation.leftOperand=current} feature=[types::JvmIdentifiableElement|OpOr])
 	//	rightOperand=XAndExpression)*;
 	public XbaseGrammarAccess.XOrExpressionElements getXOrExpressionAccess() {
-		return gaXbaseWithAnnotations.getXOrExpressionAccess();
+		return gaXbase.getXOrExpressionAccess();
 	}
 	
 	public ParserRule getXOrExpressionRule() {
@@ -2108,20 +2133,20 @@ public ParserRule getXOrExpressionRule() {
 	}
 
 	//OpOr:
-	//	"||";
+	//	'||';
 	public XbaseGrammarAccess.OpOrElements getOpOrAccess() {
-		return gaXbaseWithAnnotations.getOpOrAccess();
+		return gaXbase.getOpOrAccess();
 	}
 	
 	public ParserRule getOpOrRule() {
 		return getOpOrAccess().getRule();
 	}
 
-	//XAndExpression returns XExpression:
+	//XAndExpression XExpression:
 	//	XEqualityExpression (=> ({XBinaryOperation.leftOperand=current} feature=[types::JvmIdentifiableElement|OpAnd])
 	//	rightOperand=XEqualityExpression)*;
 	public XbaseGrammarAccess.XAndExpressionElements getXAndExpressionAccess() {
-		return gaXbaseWithAnnotations.getXAndExpressionAccess();
+		return gaXbase.getXAndExpressionAccess();
 	}
 	
 	public ParserRule getXAndExpressionRule() {
@@ -2129,20 +2154,20 @@ public ParserRule getXAndExpressionRule() {
 	}
 
 	//OpAnd:
-	//	"&&";
+	//	'&&';
 	public XbaseGrammarAccess.OpAndElements getOpAndAccess() {
-		return gaXbaseWithAnnotations.getOpAndAccess();
+		return gaXbase.getOpAndAccess();
 	}
 	
 	public ParserRule getOpAndRule() {
 		return getOpAndAccess().getRule();
 	}
 
-	//XEqualityExpression returns XExpression:
+	//XEqualityExpression XExpression:
 	//	XRelationalExpression (=> ({XBinaryOperation.leftOperand=current} feature=[types::JvmIdentifiableElement|OpEquality])
 	//	rightOperand=XRelationalExpression)*;
 	public XbaseGrammarAccess.XEqualityExpressionElements getXEqualityExpressionAccess() {
-		return gaXbaseWithAnnotations.getXEqualityExpressionAccess();
+		return gaXbase.getXEqualityExpressionAccess();
 	}
 	
 	public ParserRule getXEqualityExpressionRule() {
@@ -2150,21 +2175,21 @@ public ParserRule getXEqualityExpressionRule() {
 	}
 
 	//OpEquality:
-	//	"==" | "!=" | "===" | "!==";
+	//	'==' | '!=' | '===' | '!==';
 	public XbaseGrammarAccess.OpEqualityElements getOpEqualityAccess() {
-		return gaXbaseWithAnnotations.getOpEqualityAccess();
+		return gaXbase.getOpEqualityAccess();
 	}
 	
 	public ParserRule getOpEqualityRule() {
 		return getOpEqualityAccess().getRule();
 	}
 
-	//XRelationalExpression returns XExpression:
-	//	XOtherOperatorExpression (=> ({XInstanceOfExpression.expression=current} "instanceof") type=JvmTypeReference | =>
+	//XRelationalExpression XExpression:
+	//	XOtherOperatorExpression (=> ({XInstanceOfExpression.expression=current} 'instanceof') type=JvmTypeReference | =>
 	//	({XBinaryOperation.leftOperand=current} feature=[types::JvmIdentifiableElement|OpCompare])
 	//	rightOperand=XOtherOperatorExpression)*;
 	public XbaseGrammarAccess.XRelationalExpressionElements getXRelationalExpressionAccess() {
-		return gaXbaseWithAnnotations.getXRelationalExpressionAccess();
+		return gaXbase.getXRelationalExpressionAccess();
 	}
 	
 	public ParserRule getXRelationalExpressionRule() {
@@ -2172,20 +2197,20 @@ public ParserRule getXRelationalExpressionRule() {
 	}
 
 	//OpCompare:
-	//	">=" | "<" "=" | ">" | "<";
+	//	'>=' | '<' '=' | '>' | '<';
 	public XbaseGrammarAccess.OpCompareElements getOpCompareAccess() {
-		return gaXbaseWithAnnotations.getOpCompareAccess();
+		return gaXbase.getOpCompareAccess();
 	}
 	
 	public ParserRule getOpCompareRule() {
 		return getOpCompareAccess().getRule();
 	}
 
-	//XOtherOperatorExpression returns XExpression:
+	//XOtherOperatorExpression XExpression:
 	//	XAdditiveExpression (=> ({XBinaryOperation.leftOperand=current} feature=[types::JvmIdentifiableElement|OpOther])
 	//	rightOperand=XAdditiveExpression)*;
 	public XbaseGrammarAccess.XOtherOperatorExpressionElements getXOtherOperatorExpressionAccess() {
-		return gaXbaseWithAnnotations.getXOtherOperatorExpressionAccess();
+		return gaXbase.getXOtherOperatorExpressionAccess();
 	}
 	
 	public ParserRule getXOtherOperatorExpressionRule() {
@@ -2193,20 +2218,20 @@ public ParserRule getXOtherOperatorExpressionRule() {
 	}
 
 	//OpOther:
-	//	"->" | "..<" | ">" ".." | ".." | "=>" | ">" (=> (">" ">") | ">") | "<" (=> ("<" "<") | "<" | "=>") | "<>" | "?:";
+	//	'->' | '..<' | '>' '..' | '..' | '=>' | '>' (=> ('>' '>') | '>') | '<' (=> ('<' '<') | '<' | '=>') | '<>' | '?:';
 	public XbaseGrammarAccess.OpOtherElements getOpOtherAccess() {
-		return gaXbaseWithAnnotations.getOpOtherAccess();
+		return gaXbase.getOpOtherAccess();
 	}
 	
 	public ParserRule getOpOtherRule() {
 		return getOpOtherAccess().getRule();
 	}
 
-	//XAdditiveExpression returns XExpression:
+	//XAdditiveExpression XExpression:
 	//	XMultiplicativeExpression (=> ({XBinaryOperation.leftOperand=current} feature=[types::JvmIdentifiableElement|OpAdd])
 	//	rightOperand=XMultiplicativeExpression)*;
 	public XbaseGrammarAccess.XAdditiveExpressionElements getXAdditiveExpressionAccess() {
-		return gaXbaseWithAnnotations.getXAdditiveExpressionAccess();
+		return gaXbase.getXAdditiveExpressionAccess();
 	}
 	
 	public ParserRule getXAdditiveExpressionRule() {
@@ -2214,20 +2239,20 @@ public ParserRule getXAdditiveExpressionRule() {
 	}
 
 	//OpAdd:
-	//	"+" | "-";
+	//	'+' | '-';
 	public XbaseGrammarAccess.OpAddElements getOpAddAccess() {
-		return gaXbaseWithAnnotations.getOpAddAccess();
+		return gaXbase.getOpAddAccess();
 	}
 	
 	public ParserRule getOpAddRule() {
 		return getOpAddAccess().getRule();
 	}
 
-	//XMultiplicativeExpression returns XExpression:
+	//XMultiplicativeExpression XExpression:
 	//	XUnaryOperation (=> ({XBinaryOperation.leftOperand=current} feature=[types::JvmIdentifiableElement|OpMulti])
 	//	rightOperand=XUnaryOperation)*;
 	public XbaseGrammarAccess.XMultiplicativeExpressionElements getXMultiplicativeExpressionAccess() {
-		return gaXbaseWithAnnotations.getXMultiplicativeExpressionAccess();
+		return gaXbase.getXMultiplicativeExpressionAccess();
 	}
 	
 	public ParserRule getXMultiplicativeExpressionRule() {
@@ -2235,19 +2260,19 @@ public ParserRule getXMultiplicativeExpressionRule() {
 	}
 
 	//OpMulti:
-	//	"*" | "**" | "/" | "%";
+	//	'*' | '**' | '/' | '%';
 	public XbaseGrammarAccess.OpMultiElements getOpMultiAccess() {
-		return gaXbaseWithAnnotations.getOpMultiAccess();
+		return gaXbase.getOpMultiAccess();
 	}
 	
 	public ParserRule getOpMultiRule() {
 		return getOpMultiAccess().getRule();
 	}
 
-	//XUnaryOperation returns XExpression:
+	//XUnaryOperation XExpression:
 	//	{XUnaryOperation} feature=[types::JvmIdentifiableElement|OpUnary] operand=XUnaryOperation | XCastedExpression;
 	public XbaseGrammarAccess.XUnaryOperationElements getXUnaryOperationAccess() {
-		return gaXbaseWithAnnotations.getXUnaryOperationAccess();
+		return gaXbase.getXUnaryOperationAccess();
 	}
 	
 	public ParserRule getXUnaryOperationRule() {
@@ -2257,27 +2282,27 @@ public ParserRule getXUnaryOperationRule() {
 	//OpUnary:
 	//	"!" | "-" | "+";
 	public XbaseGrammarAccess.OpUnaryElements getOpUnaryAccess() {
-		return gaXbaseWithAnnotations.getOpUnaryAccess();
+		return gaXbase.getOpUnaryAccess();
 	}
 	
 	public ParserRule getOpUnaryRule() {
 		return getOpUnaryAccess().getRule();
 	}
 
-	//XCastedExpression returns XExpression:
-	//	XPostfixOperation (=> ({XCastedExpression.target=current} "as") type=JvmTypeReference)*;
+	//XCastedExpression XExpression:
+	//	XPostfixOperation (=> ({XCastedExpression.target=current} 'as') type=JvmTypeReference)*;
 	public XbaseGrammarAccess.XCastedExpressionElements getXCastedExpressionAccess() {
-		return gaXbaseWithAnnotations.getXCastedExpressionAccess();
+		return gaXbase.getXCastedExpressionAccess();
 	}
 	
 	public ParserRule getXCastedExpressionRule() {
 		return getXCastedExpressionAccess().getRule();
 	}
 
-	//XPostfixOperation returns XExpression:
+	//XPostfixOperation XExpression:
 	//	XMemberFeatureCall => ({XPostfixOperation.operand=current} feature=[types::JvmIdentifiableElement|OpPostfix])?;
 	public XbaseGrammarAccess.XPostfixOperationElements getXPostfixOperationAccess() {
-		return gaXbaseWithAnnotations.getXPostfixOperationAccess();
+		return gaXbase.getXPostfixOperationAccess();
 	}
 	
 	public ParserRule getXPostfixOperationRule() {
@@ -2287,44 +2312,44 @@ public ParserRule getXPostfixOperationRule() {
 	//OpPostfix:
 	//	"++" | "--";
 	public XbaseGrammarAccess.OpPostfixElements getOpPostfixAccess() {
-		return gaXbaseWithAnnotations.getOpPostfixAccess();
+		return gaXbase.getOpPostfixAccess();
 	}
 	
 	public ParserRule getOpPostfixRule() {
 		return getOpPostfixAccess().getRule();
 	}
 
-	//XMemberFeatureCall returns XExpression:
-	//	XPrimaryExpression (=> ({XAssignment.assignable=current} ("." | explicitStatic?="::")
+	//XMemberFeatureCall XExpression:
+	//	XPrimaryExpression (=> ({XAssignment.assignable=current} ('.' | explicitStatic?="::")
 	//	feature=[types::JvmIdentifiableElement|FeatureCallID] OpSingleAssign) value=XAssignment | =>
-	//	({XMemberFeatureCall.memberCallTarget=current} ("." | nullSafe?="?." | explicitStatic?="::")) ("<"
-	//	typeArguments+=JvmArgumentTypeReference ("," typeArguments+=JvmArgumentTypeReference)* ">")?
-	//	feature=[types::JvmIdentifiableElement|IdOrSuper] (=> explicitOperationCall?="(" (memberCallArguments+=XShortClosure
-	//	| memberCallArguments+=XExpression ("," memberCallArguments+=XExpression)*)? ")")? memberCallArguments+=XClosure?)*;
+	//	({XMemberFeatureCall.memberCallTarget=current} ("." | nullSafe?="?." | explicitStatic?="::")) ('<'
+	//	typeArguments+=JvmArgumentTypeReference (',' typeArguments+=JvmArgumentTypeReference)* '>')?
+	//	feature=[types::JvmIdentifiableElement|IdOrSuper] (=> explicitOperationCall?='(' (memberCallArguments+=XShortClosure
+	//	| memberCallArguments+=XExpression (',' memberCallArguments+=XExpression)*)? ')')? memberCallArguments+=XClosure?)*;
 	public XbaseGrammarAccess.XMemberFeatureCallElements getXMemberFeatureCallAccess() {
-		return gaXbaseWithAnnotations.getXMemberFeatureCallAccess();
+		return gaXbase.getXMemberFeatureCallAccess();
 	}
 	
 	public ParserRule getXMemberFeatureCallRule() {
 		return getXMemberFeatureCallAccess().getRule();
 	}
 
-	//XPrimaryExpression returns XExpression:
+	//XPrimaryExpression XExpression:
 	//	XConstructorCall | XBlockExpression | XSwitchExpression | XSynchronizedExpression | XFeatureCall | XLiteral |
 	//	XIfExpression | XForLoopExpression | XBasicForLoopExpression | XWhileExpression | XDoWhileExpression |
 	//	XThrowExpression | XReturnExpression | XTryCatchFinallyExpression | XParenthesizedExpression;
 	public XbaseGrammarAccess.XPrimaryExpressionElements getXPrimaryExpressionAccess() {
-		return gaXbaseWithAnnotations.getXPrimaryExpressionAccess();
+		return gaXbase.getXPrimaryExpressionAccess();
 	}
 	
 	public ParserRule getXPrimaryExpressionRule() {
 		return getXPrimaryExpressionAccess().getRule();
 	}
 
-	//XLiteral returns XExpression:
+	//XLiteral XExpression:
 	//	XCollectionLiteral | XClosure | XBooleanLiteral | XNumberLiteral | XNullLiteral | XStringLiteral | XTypeLiteral;
 	public XbaseGrammarAccess.XLiteralElements getXLiteralAccess() {
-		return gaXbaseWithAnnotations.getXLiteralAccess();
+		return gaXbase.getXLiteralAccess();
 	}
 	
 	public ParserRule getXLiteralRule() {
@@ -2334,7 +2359,7 @@ public ParserRule getXLiteralRule() {
 	//XCollectionLiteral:
 	//	XSetLiteral | XListLiteral;
 	public XbaseGrammarAccess.XCollectionLiteralElements getXCollectionLiteralAccess() {
-		return gaXbaseWithAnnotations.getXCollectionLiteralAccess();
+		return gaXbase.getXCollectionLiteralAccess();
 	}
 	
 	public ParserRule getXCollectionLiteralRule() {
@@ -2342,9 +2367,9 @@ public ParserRule getXCollectionLiteralRule() {
 	}
 
 	//XSetLiteral:
-	//	{XSetLiteral} "#" "{" (elements+=XExpression ("," elements+=XExpression)*)? "}";
+	//	{XSetLiteral} '#' '{' (elements+=XExpression (',' elements+=XExpression)*)? '}';
 	public XbaseGrammarAccess.XSetLiteralElements getXSetLiteralAccess() {
-		return gaXbaseWithAnnotations.getXSetLiteralAccess();
+		return gaXbase.getXSetLiteralAccess();
 	}
 	
 	public ParserRule getXSetLiteralRule() {
@@ -2352,73 +2377,73 @@ public ParserRule getXSetLiteralRule() {
 	}
 
 	//XListLiteral:
-	//	{XListLiteral} "#" "[" (elements+=XExpression ("," elements+=XExpression)*)? "]";
+	//	{XListLiteral} '#' '[' (elements+=XExpression (',' elements+=XExpression)*)? ']';
 	public XbaseGrammarAccess.XListLiteralElements getXListLiteralAccess() {
-		return gaXbaseWithAnnotations.getXListLiteralAccess();
+		return gaXbase.getXListLiteralAccess();
 	}
 	
 	public ParserRule getXListLiteralRule() {
 		return getXListLiteralAccess().getRule();
 	}
 
-	//XClosure returns XExpression:
-	//	=> ({XClosure} "[") => ((declaredFormalParameters+=JvmFormalParameter (","
-	//	declaredFormalParameters+=JvmFormalParameter)*)? explicitSyntax?="|")? expression=XExpressionInClosure "]";
+	//XClosure XExpression:
+	//	=> ({XClosure} '[') => ((declaredFormalParameters+=JvmFormalParameter (','
+	//	declaredFormalParameters+=JvmFormalParameter)*)? explicitSyntax?='|')? expression=XExpressionInClosure ']';
 	public XbaseGrammarAccess.XClosureElements getXClosureAccess() {
-		return gaXbaseWithAnnotations.getXClosureAccess();
+		return gaXbase.getXClosureAccess();
 	}
 	
 	public ParserRule getXClosureRule() {
 		return getXClosureAccess().getRule();
 	}
 
-	//XExpressionInClosure returns XExpression:
-	//	{XBlockExpression} (expressions+=XExpressionOrVarDeclaration ";"?)*;
+	//XExpressionInClosure XExpression:
+	//	{XBlockExpression} (expressions+=XExpressionOrVarDeclaration ';'?)*;
 	public XbaseGrammarAccess.XExpressionInClosureElements getXExpressionInClosureAccess() {
-		return gaXbaseWithAnnotations.getXExpressionInClosureAccess();
+		return gaXbase.getXExpressionInClosureAccess();
 	}
 	
 	public ParserRule getXExpressionInClosureRule() {
 		return getXExpressionInClosureAccess().getRule();
 	}
 
-	//XShortClosure returns XExpression:
-	//	=> ({XClosure} (declaredFormalParameters+=JvmFormalParameter ("," declaredFormalParameters+=JvmFormalParameter)*)?
-	//	explicitSyntax?="|") expression=XExpression;
+	//XShortClosure XExpression:
+	//	=> ({XClosure} (declaredFormalParameters+=JvmFormalParameter (',' declaredFormalParameters+=JvmFormalParameter)*)?
+	//	explicitSyntax?='|') expression=XExpression;
 	public XbaseGrammarAccess.XShortClosureElements getXShortClosureAccess() {
-		return gaXbaseWithAnnotations.getXShortClosureAccess();
+		return gaXbase.getXShortClosureAccess();
 	}
 	
 	public ParserRule getXShortClosureRule() {
 		return getXShortClosureAccess().getRule();
 	}
 
-	//XParenthesizedExpression returns XExpression:
-	//	"(" XExpression ")";
+	//XParenthesizedExpression XExpression:
+	//	'(' XExpression ')';
 	public XbaseGrammarAccess.XParenthesizedExpressionElements getXParenthesizedExpressionAccess() {
-		return gaXbaseWithAnnotations.getXParenthesizedExpressionAccess();
+		return gaXbase.getXParenthesizedExpressionAccess();
 	}
 	
 	public ParserRule getXParenthesizedExpressionRule() {
 		return getXParenthesizedExpressionAccess().getRule();
 	}
 
-	//XIfExpression returns XExpression:
-	//	{XIfExpression} "if" "(" if=XExpression ")" then=XExpression ("else" else=XExpression)?;
+	//XIfExpression XExpression:
+	//	{XIfExpression} 'if' '(' if=XExpression ')' then=XExpression (=> 'else' else=XExpression)?;
 	public XbaseGrammarAccess.XIfExpressionElements getXIfExpressionAccess() {
-		return gaXbaseWithAnnotations.getXIfExpressionAccess();
+		return gaXbase.getXIfExpressionAccess();
 	}
 	
 	public ParserRule getXIfExpressionRule() {
 		return getXIfExpressionAccess().getRule();
 	}
 
-	//XSwitchExpression returns XExpression:
-	//	{XSwitchExpression} "switch" (=> ("(" declaredParam=JvmFormalParameter ":") switch=XExpression ")" | =>
-	//	(declaredParam=JvmFormalParameter ":")? switch=XExpression) "{" cases+=XCasePart* ("default" ":"
-	//	default=XExpression)? "}";
+	//XSwitchExpression XExpression:
+	//	{XSwitchExpression} 'switch' (=> ('(' declaredParam=JvmFormalParameter ':') switch=XExpression ')' | =>
+	//	(declaredParam=JvmFormalParameter ':')? switch=XExpression) '{' cases+=XCasePart* ('default' ':'
+	//	default=XExpression)? '}';
 	public XbaseGrammarAccess.XSwitchExpressionElements getXSwitchExpressionAccess() {
-		return gaXbaseWithAnnotations.getXSwitchExpressionAccess();
+		return gaXbase.getXSwitchExpressionAccess();
 	}
 	
 	public ParserRule getXSwitchExpressionRule() {
@@ -2426,115 +2451,115 @@ public ParserRule getXSwitchExpressionRule() {
 	}
 
 	//XCasePart:
-	//	{XCasePart} typeGuard=JvmTypeReference? ("case" case=XExpression)? (":" then=XExpression | fallThrough?=",");
+	//	{XCasePart} typeGuard=JvmTypeReference? ('case' case=XExpression)? (':' then=XExpression | fallThrough?=',');
 	public XbaseGrammarAccess.XCasePartElements getXCasePartAccess() {
-		return gaXbaseWithAnnotations.getXCasePartAccess();
+		return gaXbase.getXCasePartAccess();
 	}
 	
 	public ParserRule getXCasePartRule() {
 		return getXCasePartAccess().getRule();
 	}
 
-	//XForLoopExpression returns XExpression:
-	//	=> ({XForLoopExpression} "for" "(" declaredParam=JvmFormalParameter ":") forExpression=XExpression ")"
+	//XForLoopExpression XExpression:
+	//	=> ({XForLoopExpression} 'for' '(' declaredParam=JvmFormalParameter ':') forExpression=XExpression ')'
 	//	eachExpression=XExpression;
 	public XbaseGrammarAccess.XForLoopExpressionElements getXForLoopExpressionAccess() {
-		return gaXbaseWithAnnotations.getXForLoopExpressionAccess();
+		return gaXbase.getXForLoopExpressionAccess();
 	}
 	
 	public ParserRule getXForLoopExpressionRule() {
 		return getXForLoopExpressionAccess().getRule();
 	}
 
-	//XBasicForLoopExpression returns XExpression:
-	//	{XBasicForLoopExpression} "for" "(" (initExpressions+=XExpressionOrVarDeclaration (","
-	//	initExpressions+=XExpressionOrVarDeclaration)*)? ";" expression=XExpression? ";" (updateExpressions+=XExpression (","
-	//	updateExpressions+=XExpression)*)? ")" eachExpression=XExpression;
+	//XBasicForLoopExpression XExpression:
+	//	{XBasicForLoopExpression} 'for' '(' (initExpressions+=XExpressionOrVarDeclaration (','
+	//	initExpressions+=XExpressionOrVarDeclaration)*)? ';' expression=XExpression? ';' (updateExpressions+=XExpression (','
+	//	updateExpressions+=XExpression)*)? ')' eachExpression=XExpression;
 	public XbaseGrammarAccess.XBasicForLoopExpressionElements getXBasicForLoopExpressionAccess() {
-		return gaXbaseWithAnnotations.getXBasicForLoopExpressionAccess();
+		return gaXbase.getXBasicForLoopExpressionAccess();
 	}
 	
 	public ParserRule getXBasicForLoopExpressionRule() {
 		return getXBasicForLoopExpressionAccess().getRule();
 	}
 
-	//XWhileExpression returns XExpression:
-	//	{XWhileExpression} "while" "(" predicate=XExpression ")" body=XExpression;
+	//XWhileExpression XExpression:
+	//	{XWhileExpression} 'while' '(' predicate=XExpression ')' body=XExpression;
 	public XbaseGrammarAccess.XWhileExpressionElements getXWhileExpressionAccess() {
-		return gaXbaseWithAnnotations.getXWhileExpressionAccess();
+		return gaXbase.getXWhileExpressionAccess();
 	}
 	
 	public ParserRule getXWhileExpressionRule() {
 		return getXWhileExpressionAccess().getRule();
 	}
 
-	//XDoWhileExpression returns XExpression:
-	//	{XDoWhileExpression} "do" body=XExpression "while" "(" predicate=XExpression ")";
+	//XDoWhileExpression XExpression:
+	//	{XDoWhileExpression} 'do' body=XExpression 'while' '(' predicate=XExpression ')';
 	public XbaseGrammarAccess.XDoWhileExpressionElements getXDoWhileExpressionAccess() {
-		return gaXbaseWithAnnotations.getXDoWhileExpressionAccess();
+		return gaXbase.getXDoWhileExpressionAccess();
 	}
 	
 	public ParserRule getXDoWhileExpressionRule() {
 		return getXDoWhileExpressionAccess().getRule();
 	}
 
-	//XBlockExpression returns XExpression:
-	//	{XBlockExpression} "{" (expressions+=XExpressionOrVarDeclaration ";"?)* "}";
+	//XBlockExpression XExpression:
+	//	{XBlockExpression} '{' (expressions+=XExpressionOrVarDeclaration ';'?)* '}';
 	public XbaseGrammarAccess.XBlockExpressionElements getXBlockExpressionAccess() {
-		return gaXbaseWithAnnotations.getXBlockExpressionAccess();
+		return gaXbase.getXBlockExpressionAccess();
 	}
 	
 	public ParserRule getXBlockExpressionRule() {
 		return getXBlockExpressionAccess().getRule();
 	}
 
-	//XExpressionOrVarDeclaration returns XExpression:
+	//XExpressionOrVarDeclaration XExpression:
 	//	XVariableDeclaration | XExpression;
 	public XbaseGrammarAccess.XExpressionOrVarDeclarationElements getXExpressionOrVarDeclarationAccess() {
-		return gaXbaseWithAnnotations.getXExpressionOrVarDeclarationAccess();
+		return gaXbase.getXExpressionOrVarDeclarationAccess();
 	}
 	
 	public ParserRule getXExpressionOrVarDeclarationRule() {
 		return getXExpressionOrVarDeclarationAccess().getRule();
 	}
 
-	//XVariableDeclaration returns XExpression:
-	//	{XVariableDeclaration} (writeable?="var" | "val") (=> (type=JvmTypeReference name=ValidID) | name=ValidID) ("="
-	//	right=XExpression)?;
+	//XVariableDeclaration XExpression:
+	//	{XVariableDeclaration} (writeable?='var' | 'val') (=> (type=JvmTypeReference name=super::ValidID) |
+	//	name=super::ValidID) ('=' right=XExpression)?;
 	public XbaseGrammarAccess.XVariableDeclarationElements getXVariableDeclarationAccess() {
-		return gaXbaseWithAnnotations.getXVariableDeclarationAccess();
+		return gaXbase.getXVariableDeclarationAccess();
 	}
 	
 	public ParserRule getXVariableDeclarationRule() {
 		return getXVariableDeclarationAccess().getRule();
 	}
 
-	//JvmFormalParameter returns types::JvmFormalParameter:
-	//	parameterType=JvmTypeReference? name=ValidID;
+	//JvmFormalParameter types::JvmFormalParameter:
+	//	parameterType=JvmTypeReference? name=super::ValidID;
 	public XbaseGrammarAccess.JvmFormalParameterElements getJvmFormalParameterAccess() {
-		return gaXbaseWithAnnotations.getJvmFormalParameterAccess();
+		return gaXbase.getJvmFormalParameterAccess();
 	}
 	
 	public ParserRule getJvmFormalParameterRule() {
 		return getJvmFormalParameterAccess().getRule();
 	}
 
-	//FullJvmFormalParameter returns types::JvmFormalParameter:
-	//	parameterType=JvmTypeReference name=ValidID;
+	//FullJvmFormalParameter types::JvmFormalParameter:
+	//	parameterType=JvmTypeReference name=super::ValidID;
 	public XbaseGrammarAccess.FullJvmFormalParameterElements getFullJvmFormalParameterAccess() {
-		return gaXbaseWithAnnotations.getFullJvmFormalParameterAccess();
+		return gaXbase.getFullJvmFormalParameterAccess();
 	}
 	
 	public ParserRule getFullJvmFormalParameterRule() {
 		return getFullJvmFormalParameterAccess().getRule();
 	}
 
-	//XFeatureCall returns XExpression:
-	//	{XFeatureCall} ("<" typeArguments+=JvmArgumentTypeReference ("," typeArguments+=JvmArgumentTypeReference)* ">")?
-	//	feature=[types::JvmIdentifiableElement|IdOrSuper] (=> explicitOperationCall?="(" (featureCallArguments+=XShortClosure
-	//	| featureCallArguments+=XExpression ("," featureCallArguments+=XExpression)*)? ")")? featureCallArguments+=XClosure?;
+	//XFeatureCall XExpression:
+	//	{XFeatureCall} ('<' typeArguments+=JvmArgumentTypeReference (',' typeArguments+=JvmArgumentTypeReference)* '>')?
+	//	feature=[types::JvmIdentifiableElement|IdOrSuper] (=> explicitOperationCall?='(' (featureCallArguments+=XShortClosure
+	//	| featureCallArguments+=XExpression (',' featureCallArguments+=XExpression)*)? ')')? featureCallArguments+=XClosure?;
 	public XbaseGrammarAccess.XFeatureCallElements getXFeatureCallAccess() {
-		return gaXbaseWithAnnotations.getXFeatureCallAccess();
+		return gaXbase.getXFeatureCallAccess();
 	}
 	
 	public ParserRule getXFeatureCallRule() {
@@ -2542,9 +2567,9 @@ public ParserRule getXFeatureCallRule() {
 	}
 
 	//FeatureCallID:
-	//	ValidID | "extends" | "static" | "import" | "extension";
+	//	super::ValidID | 'extends' | 'static' | 'import' | 'extension';
 	public XbaseGrammarAccess.FeatureCallIDElements getFeatureCallIDAccess() {
-		return gaXbaseWithAnnotations.getFeatureCallIDAccess();
+		return gaXbase.getFeatureCallIDAccess();
 	}
 	
 	public ParserRule getFeatureCallIDRule() {
@@ -2552,113 +2577,113 @@ public ParserRule getFeatureCallIDRule() {
 	}
 
 	//IdOrSuper:
-	//	FeatureCallID | "super";
+	//	FeatureCallID | 'super';
 	public XbaseGrammarAccess.IdOrSuperElements getIdOrSuperAccess() {
-		return gaXbaseWithAnnotations.getIdOrSuperAccess();
+		return gaXbase.getIdOrSuperAccess();
 	}
 	
 	public ParserRule getIdOrSuperRule() {
 		return getIdOrSuperAccess().getRule();
 	}
 
-	//XConstructorCall returns XExpression:
-	//	{XConstructorCall} "new" constructor=[types::JvmConstructor|QualifiedName] ("<"
-	//	typeArguments+=JvmArgumentTypeReference ("," typeArguments+=JvmArgumentTypeReference)* ">")? (=>
-	//	explicitConstructorCall?="(" (arguments+=XShortClosure | arguments+=XExpression ("," arguments+=XExpression)*)? ")")?
+	//XConstructorCall XExpression:
+	//	{XConstructorCall} 'new' constructor=[types::JvmConstructor|QualifiedName] (=> '<'
+	//	typeArguments+=JvmArgumentTypeReference (',' typeArguments+=JvmArgumentTypeReference)* '>')? (=>
+	//	explicitConstructorCall?='(' (arguments+=XShortClosure | arguments+=XExpression (',' arguments+=XExpression)*)? ')')?
 	//	arguments+=XClosure?;
 	public XbaseGrammarAccess.XConstructorCallElements getXConstructorCallAccess() {
-		return gaXbaseWithAnnotations.getXConstructorCallAccess();
+		return gaXbase.getXConstructorCallAccess();
 	}
 	
 	public ParserRule getXConstructorCallRule() {
 		return getXConstructorCallAccess().getRule();
 	}
 
-	//XBooleanLiteral returns XExpression:
-	//	{XBooleanLiteral} ("false" | isTrue?="true");
+	//XBooleanLiteral XExpression:
+	//	{XBooleanLiteral} ('false' | isTrue?='true');
 	public XbaseGrammarAccess.XBooleanLiteralElements getXBooleanLiteralAccess() {
-		return gaXbaseWithAnnotations.getXBooleanLiteralAccess();
+		return gaXbase.getXBooleanLiteralAccess();
 	}
 	
 	public ParserRule getXBooleanLiteralRule() {
 		return getXBooleanLiteralAccess().getRule();
 	}
 
-	//XNullLiteral returns XExpression:
-	//	{XNullLiteral} "null";
+	//XNullLiteral XExpression:
+	//	{XNullLiteral} 'null';
 	public XbaseGrammarAccess.XNullLiteralElements getXNullLiteralAccess() {
-		return gaXbaseWithAnnotations.getXNullLiteralAccess();
+		return gaXbase.getXNullLiteralAccess();
 	}
 	
 	public ParserRule getXNullLiteralRule() {
 		return getXNullLiteralAccess().getRule();
 	}
 
-	//XNumberLiteral returns XExpression:
+	//XNumberLiteral XExpression:
 	//	{XNumberLiteral} value=Number;
 	public XbaseGrammarAccess.XNumberLiteralElements getXNumberLiteralAccess() {
-		return gaXbaseWithAnnotations.getXNumberLiteralAccess();
+		return gaXbase.getXNumberLiteralAccess();
 	}
 	
 	public ParserRule getXNumberLiteralRule() {
 		return getXNumberLiteralAccess().getRule();
 	}
 
-	//XStringLiteral returns XExpression:
+	//XStringLiteral XExpression:
 	//	{XStringLiteral} value=STRING;
 	public XbaseGrammarAccess.XStringLiteralElements getXStringLiteralAccess() {
-		return gaXbaseWithAnnotations.getXStringLiteralAccess();
+		return gaXbase.getXStringLiteralAccess();
 	}
 	
 	public ParserRule getXStringLiteralRule() {
 		return getXStringLiteralAccess().getRule();
 	}
 
-	//XTypeLiteral returns XExpression:
-	//	{XTypeLiteral} "typeof" "(" type=[types::JvmType|QualifiedName] arrayDimensions+=ArrayBrackets* ")";
+	//XTypeLiteral XExpression:
+	//	{XTypeLiteral} 'typeof' '(' type=[types::JvmType|QualifiedName] arrayDimensions+=ArrayBrackets* ')';
 	public XbaseGrammarAccess.XTypeLiteralElements getXTypeLiteralAccess() {
-		return gaXbaseWithAnnotations.getXTypeLiteralAccess();
+		return gaXbase.getXTypeLiteralAccess();
 	}
 	
 	public ParserRule getXTypeLiteralRule() {
 		return getXTypeLiteralAccess().getRule();
 	}
 
-	//XThrowExpression returns XExpression:
-	//	{XThrowExpression} "throw" expression=XExpression;
+	//XThrowExpression XExpression:
+	//	{XThrowExpression} 'throw' expression=XExpression;
 	public XbaseGrammarAccess.XThrowExpressionElements getXThrowExpressionAccess() {
-		return gaXbaseWithAnnotations.getXThrowExpressionAccess();
+		return gaXbase.getXThrowExpressionAccess();
 	}
 	
 	public ParserRule getXThrowExpressionRule() {
 		return getXThrowExpressionAccess().getRule();
 	}
 
-	//XReturnExpression returns XExpression:
-	//	{XReturnExpression} "return" -> expression=XExpression?;
+	//XReturnExpression XExpression:
+	//	{XReturnExpression} 'return' -> expression=XExpression?;
 	public XbaseGrammarAccess.XReturnExpressionElements getXReturnExpressionAccess() {
-		return gaXbaseWithAnnotations.getXReturnExpressionAccess();
+		return gaXbase.getXReturnExpressionAccess();
 	}
 	
 	public ParserRule getXReturnExpressionRule() {
 		return getXReturnExpressionAccess().getRule();
 	}
 
-	//XTryCatchFinallyExpression returns XExpression:
-	//	{XTryCatchFinallyExpression} "try" expression=XExpression (catchClauses+=XCatchClause+ ("finally"
-	//	finallyExpression=XExpression)? | "finally" finallyExpression=XExpression);
+	//XTryCatchFinallyExpression XExpression:
+	//	{XTryCatchFinallyExpression} 'try' expression=XExpression (catchClauses+=XCatchClause+ (=> 'finally'
+	//	finallyExpression=XExpression)? | 'finally' finallyExpression=XExpression);
 	public XbaseGrammarAccess.XTryCatchFinallyExpressionElements getXTryCatchFinallyExpressionAccess() {
-		return gaXbaseWithAnnotations.getXTryCatchFinallyExpressionAccess();
+		return gaXbase.getXTryCatchFinallyExpressionAccess();
 	}
 	
 	public ParserRule getXTryCatchFinallyExpressionRule() {
 		return getXTryCatchFinallyExpressionAccess().getRule();
 	}
 
-	//XSynchronizedExpression returns XExpression:
-	//	=> ({XSynchronizedExpression} "synchronized" "(") param=XExpression ")" expression=XExpression;
+	//XSynchronizedExpression XExpression:
+	//	=> ({XSynchronizedExpression} 'synchronized' '(') param=XExpression ')' expression=XExpression;
 	public XbaseGrammarAccess.XSynchronizedExpressionElements getXSynchronizedExpressionAccess() {
-		return gaXbaseWithAnnotations.getXSynchronizedExpressionAccess();
+		return gaXbase.getXSynchronizedExpressionAccess();
 	}
 	
 	public ParserRule getXSynchronizedExpressionRule() {
@@ -2666,19 +2691,20 @@ public ParserRule getXSynchronizedExpressionRule() {
 	}
 
 	//XCatchClause:
-	//	"catch" "(" declaredParam=FullJvmFormalParameter ")" expression=XExpression;
+	//	=> 'catch' '(' declaredParam=FullJvmFormalParameter ')' expression=XExpression;
 	public XbaseGrammarAccess.XCatchClauseElements getXCatchClauseAccess() {
-		return gaXbaseWithAnnotations.getXCatchClauseAccess();
+		return gaXbase.getXCatchClauseAccess();
 	}
 	
 	public ParserRule getXCatchClauseRule() {
 		return getXCatchClauseAccess().getRule();
 	}
 
+	//@Override
 	//QualifiedName:
-	//	ValidID ("." ValidID)*;
+	//	super::ValidID (=> '.' super::ValidID)*;
 	public XbaseGrammarAccess.QualifiedNameElements getQualifiedNameAccess() {
-		return gaXbaseWithAnnotations.getQualifiedNameAccess();
+		return gaXbase.getQualifiedNameAccess();
 	}
 	
 	public ParserRule getQualifiedNameRule() {
@@ -2686,23 +2712,23 @@ public ParserRule getQualifiedNameRule() {
 	}
 
 	//Number hidden():
-	//	HEX | (INT | DECIMAL) ("." (INT | DECIMAL))?;
+	//	HEX | (super::INT | DECIMAL) ('.' (super::INT | DECIMAL))?;
 	public XbaseGrammarAccess.NumberElements getNumberAccess() {
-		return gaXbaseWithAnnotations.getNumberAccess();
+		return gaXbase.getNumberAccess();
 	}
 	
 	public ParserRule getNumberRule() {
 		return getNumberAccess().getRule();
 	}
 
-	/// **
-	// * Dummy rule, for "better" downwards compatibility, since GrammarAccess generates non-static inner classes, 
+	///**
+	// * Dummy rule, for "better" downwards compatibility, since GrammarAccess generates non-static inner classes,
 	// * which makes downstream grammars break on classloading, when a rule is removed.
-	// * /
+	// */
 	//StaticQualifier:
-	//	(ValidID "::")+;
+	//	(super::ValidID '::')+;
 	public XbaseGrammarAccess.StaticQualifierElements getStaticQualifierAccess() {
-		return gaXbaseWithAnnotations.getStaticQualifierAccess();
+		return gaXbase.getStaticQualifierAccess();
 	}
 	
 	public ParserRule getStaticQualifierRule() {
@@ -2710,28 +2736,23 @@ public ParserRule getStaticQualifierRule() {
 	}
 
 	//terminal HEX:
-	//	("0x" | "0X") ("0".."9" | "a".."f" | "A".."F" | "_")+ ("#" (("b" | "B") ("i" | "I") | ("l" | "L")))?;
+	//	('0x' | '0X') ('0'..'9' | 'a'..'f' | 'A'..'F' | '_')+ ('#' (('b' | 'B') ('i' | 'I') | ('l' | 'L')))?;
 	public TerminalRule getHEXRule() {
-		return gaXbaseWithAnnotations.getHEXRule();
-	} 
-
-	//terminal INT returns ecore::EInt:
-	//	"0".."9" ("0".."9" | "_")*;
-	public TerminalRule getINTRule() {
-		return gaXbaseWithAnnotations.getINTRule();
+		return gaXbase.getHEXRule();
 	} 
 
 	//terminal DECIMAL:
-	//	INT (("e" | "E") ("+" | "-")? INT)? (("b" | "B") ("i" | "I" | "d" | "D") | ("l" | "L" | "d" | "D" | "f" | "F"))?;
+	//	super::INT (('e' | 'E') ('+' | '-')? super::INT)? (('b' | 'B') ('i' | 'I' | 'd' | 'D') | ('l' | 'L' | 'd' | 'D' | 'f'
+	//	| 'F'))?;
 	public TerminalRule getDECIMALRule() {
-		return gaXbaseWithAnnotations.getDECIMALRule();
+		return gaXbase.getDECIMALRule();
 	} 
 
 	//JvmTypeReference:
 	//	JvmParameterizedTypeReference => ({JvmGenericArrayTypeReference.componentType=current} ArrayBrackets)* |
 	//	XFunctionTypeRef;
 	public XtypeGrammarAccess.JvmTypeReferenceElements getJvmTypeReferenceAccess() {
-		return gaXbaseWithAnnotations.getJvmTypeReferenceAccess();
+		return gaXtype.getJvmTypeReferenceAccess();
 	}
 	
 	public ParserRule getJvmTypeReferenceRule() {
@@ -2739,9 +2760,9 @@ public ParserRule getJvmTypeReferenceRule() {
 	}
 
 	//ArrayBrackets:
-	//	"[" "]";
+	//	'[' ']';
 	public XtypeGrammarAccess.ArrayBracketsElements getArrayBracketsAccess() {
-		return gaXbaseWithAnnotations.getArrayBracketsAccess();
+		return gaXtype.getArrayBracketsAccess();
 	}
 	
 	public ParserRule getArrayBracketsRule() {
@@ -2749,9 +2770,9 @@ public ParserRule getArrayBracketsRule() {
 	}
 
 	//XFunctionTypeRef:
-	//	("(" (paramTypes+=JvmTypeReference ("," paramTypes+=JvmTypeReference)*)? ")")? "=>" returnType=JvmTypeReference;
+	//	('(' (paramTypes+=JvmTypeReference (',' paramTypes+=JvmTypeReference)*)? ')')? '=>' returnType=JvmTypeReference;
 	public XtypeGrammarAccess.XFunctionTypeRefElements getXFunctionTypeRefAccess() {
-		return gaXbaseWithAnnotations.getXFunctionTypeRefAccess();
+		return gaXtype.getXFunctionTypeRefAccess();
 	}
 	
 	public ParserRule getXFunctionTypeRefRule() {
@@ -2759,21 +2780,22 @@ public ParserRule getXFunctionTypeRefRule() {
 	}
 
 	//JvmParameterizedTypeReference:
-	//	type=[JvmType|QualifiedName] ("<" arguments+=JvmArgumentTypeReference ("," arguments+=JvmArgumentTypeReference)* ">"
-	//	(=> ({JvmInnerTypeReference.outer=current} ".") type=[JvmType|ValidID] ("<" arguments+=JvmArgumentTypeReference (","
-	//	arguments+=JvmArgumentTypeReference)* ">")?)*)?;
+	//	type=[JvmType|super::QualifiedName] (=> '<' arguments+=JvmArgumentTypeReference (','
+	//	arguments+=JvmArgumentTypeReference)* '>' (=> ({JvmInnerTypeReference.outer=current} '.')
+	//	type=[JvmType|super::ValidID] (=> '<' arguments+=JvmArgumentTypeReference (',' arguments+=JvmArgumentTypeReference)*
+	//	'>')?)*)?;
 	public XtypeGrammarAccess.JvmParameterizedTypeReferenceElements getJvmParameterizedTypeReferenceAccess() {
-		return gaXbaseWithAnnotations.getJvmParameterizedTypeReferenceAccess();
+		return gaXtype.getJvmParameterizedTypeReferenceAccess();
 	}
 	
 	public ParserRule getJvmParameterizedTypeReferenceRule() {
 		return getJvmParameterizedTypeReferenceAccess().getRule();
 	}
 
-	//JvmArgumentTypeReference returns JvmTypeReference:
+	//JvmArgumentTypeReference JvmTypeReference:
 	//	JvmTypeReference | JvmWildcardTypeReference;
 	public XtypeGrammarAccess.JvmArgumentTypeReferenceElements getJvmArgumentTypeReferenceAccess() {
-		return gaXbaseWithAnnotations.getJvmArgumentTypeReferenceAccess();
+		return gaXtype.getJvmArgumentTypeReferenceAccess();
 	}
 	
 	public ParserRule getJvmArgumentTypeReferenceRule() {
@@ -2781,10 +2803,10 @@ public ParserRule getJvmArgumentTypeReferenceRule() {
 	}
 
 	//JvmWildcardTypeReference:
-	//	{JvmWildcardTypeReference} "?" (constraints+=JvmUpperBound constraints+=JvmUpperBoundAnded* |
+	//	{JvmWildcardTypeReference} '?' (constraints+=JvmUpperBound constraints+=JvmUpperBoundAnded* |
 	//	constraints+=JvmLowerBound constraints+=JvmLowerBoundAnded*)?;
 	public XtypeGrammarAccess.JvmWildcardTypeReferenceElements getJvmWildcardTypeReferenceAccess() {
-		return gaXbaseWithAnnotations.getJvmWildcardTypeReferenceAccess();
+		return gaXtype.getJvmWildcardTypeReferenceAccess();
 	}
 	
 	public ParserRule getJvmWildcardTypeReferenceRule() {
@@ -2792,19 +2814,19 @@ public ParserRule getJvmWildcardTypeReferenceRule() {
 	}
 
 	//JvmUpperBound:
-	//	"extends" typeReference=JvmTypeReference;
+	//	'extends' typeReference=JvmTypeReference;
 	public XtypeGrammarAccess.JvmUpperBoundElements getJvmUpperBoundAccess() {
-		return gaXbaseWithAnnotations.getJvmUpperBoundAccess();
+		return gaXtype.getJvmUpperBoundAccess();
 	}
 	
 	public ParserRule getJvmUpperBoundRule() {
 		return getJvmUpperBoundAccess().getRule();
 	}
 
-	//JvmUpperBoundAnded returns JvmUpperBound:
-	//	"&" typeReference=JvmTypeReference;
+	//JvmUpperBoundAnded JvmUpperBound:
+	//	'&' typeReference=JvmTypeReference;
 	public XtypeGrammarAccess.JvmUpperBoundAndedElements getJvmUpperBoundAndedAccess() {
-		return gaXbaseWithAnnotations.getJvmUpperBoundAndedAccess();
+		return gaXtype.getJvmUpperBoundAndedAccess();
 	}
 	
 	public ParserRule getJvmUpperBoundAndedRule() {
@@ -2812,19 +2834,19 @@ public ParserRule getJvmUpperBoundAndedRule() {
 	}
 
 	//JvmLowerBound:
-	//	"super" typeReference=JvmTypeReference;
+	//	'super' typeReference=JvmTypeReference;
 	public XtypeGrammarAccess.JvmLowerBoundElements getJvmLowerBoundAccess() {
-		return gaXbaseWithAnnotations.getJvmLowerBoundAccess();
+		return gaXtype.getJvmLowerBoundAccess();
 	}
 	
 	public ParserRule getJvmLowerBoundRule() {
 		return getJvmLowerBoundAccess().getRule();
 	}
 
-	//JvmLowerBoundAnded returns JvmLowerBound:
-	//	"&" typeReference=JvmTypeReference;
+	//JvmLowerBoundAnded JvmLowerBound:
+	//	'&' typeReference=JvmTypeReference;
 	public XtypeGrammarAccess.JvmLowerBoundAndedElements getJvmLowerBoundAndedAccess() {
-		return gaXbaseWithAnnotations.getJvmLowerBoundAndedAccess();
+		return gaXtype.getJvmLowerBoundAndedAccess();
 	}
 	
 	public ParserRule getJvmLowerBoundAndedRule() {
@@ -2832,9 +2854,9 @@ public ParserRule getJvmLowerBoundAndedRule() {
 	}
 
 	//JvmTypeParameter:
-	//	name=ValidID (constraints+=JvmUpperBound constraints+=JvmUpperBoundAnded*)?;
+	//	name=super::ValidID (constraints+=JvmUpperBound constraints+=JvmUpperBoundAnded*)?;
 	public XtypeGrammarAccess.JvmTypeParameterElements getJvmTypeParameterAccess() {
-		return gaXbaseWithAnnotations.getJvmTypeParameterAccess();
+		return gaXtype.getJvmTypeParameterAccess();
 	}
 	
 	public ParserRule getJvmTypeParameterRule() {
@@ -2842,9 +2864,9 @@ public ParserRule getJvmTypeParameterRule() {
 	}
 
 	//QualifiedNameWithWildcard:
-	//	QualifiedName "." "*";
+	//	super::QualifiedName '.' '*';
 	public XtypeGrammarAccess.QualifiedNameWithWildcardElements getQualifiedNameWithWildcardAccess() {
-		return gaXbaseWithAnnotations.getQualifiedNameWithWildcardAccess();
+		return gaXtype.getQualifiedNameWithWildcardAccess();
 	}
 	
 	public ParserRule getQualifiedNameWithWildcardRule() {
@@ -2854,7 +2876,7 @@ public ParserRule getQualifiedNameWithWildcardRule() {
 	//XImportSection:
 	//	importDeclarations+=XImportDeclaration+;
 	public XtypeGrammarAccess.XImportSectionElements getXImportSectionAccess() {
-		return gaXbaseWithAnnotations.getXImportSectionAccess();
+		return gaXtype.getXImportSectionAccess();
 	}
 	
 	public ParserRule getXImportSectionRule() {
@@ -2862,11 +2884,11 @@ public ParserRule getXImportSectionRule() {
 	}
 
 	//XImportDeclaration:
-	//	"import" (static?="static" extension?="extension"? importedType=[JvmDeclaredType|QualifiedNameInStaticImport]
-	//	(wildcard?="*" | memberName=ValidID) | importedType=[JvmDeclaredType|QualifiedName] |
-	//	importedNamespace=QualifiedNameWithWildcard) ";"?;
+	//	'import' (static?='static' extension?='extension'? importedType=[JvmDeclaredType|QualifiedNameInStaticImport]
+	//	(wildcard?='*' | memberName=super::ValidID) | importedType=[JvmDeclaredType|super::QualifiedName] |
+	//	importedNamespace=QualifiedNameWithWildcard) ';'?;
 	public XtypeGrammarAccess.XImportDeclarationElements getXImportDeclarationAccess() {
-		return gaXbaseWithAnnotations.getXImportDeclarationAccess();
+		return gaXtype.getXImportDeclarationAccess();
 	}
 	
 	public ParserRule getXImportDeclarationRule() {
@@ -2874,9 +2896,9 @@ public ParserRule getXImportDeclarationRule() {
 	}
 
 	//QualifiedNameInStaticImport:
-	//	(ValidID ".")+;
+	//	(super::ValidID '.')+;
 	public XtypeGrammarAccess.QualifiedNameInStaticImportElements getQualifiedNameInStaticImportAccess() {
-		return gaXbaseWithAnnotations.getQualifiedNameInStaticImportAccess();
+		return gaXtype.getQualifiedNameInStaticImportAccess();
 	}
 	
 	public ParserRule getQualifiedNameInStaticImportRule() {
@@ -2884,39 +2906,38 @@ public ParserRule getQualifiedNameInStaticImportRule() {
 	}
 
 	//terminal ID:
-	//	"^"? ("a".."z" | "A".."Z" | "$" | "_") ("a".."z" | "A".."Z" | "$" | "_" | "0".."9")*;
+	//	'^'? ('a'..'z' | 'A'..'Z' | '$' | '_') ('a'..'z' | 'A'..'Z' | '$' | '_' | '0'..'9')*;
 	public TerminalRule getIDRule() {
-		return gaXbaseWithAnnotations.getIDRule();
+		return gaXtype.getIDRule();
 	} 
 
 	//terminal STRING:
-	//	"\"" ("\\" . / * ('b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\') * / | !("\\" | "\""))* "\""? | "\'" ("\\" .
-	//	/ * ('b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\') * / | !("\\" | "\'"))* "\'"?;
+	//	'"' ('\\' . | !('\\' | '"'))* '"'? | "'" ('\\' . | !('\\' | "'"))* "'"?;
 	public TerminalRule getSTRINGRule() {
-		return gaXbaseWithAnnotations.getSTRINGRule();
+		return gaXtype.getSTRINGRule();
 	} 
 
 	//terminal ML_COMMENT:
-	//	"/ *"->"* /";
+	//	'/*'->'*/';
 	public TerminalRule getML_COMMENTRule() {
-		return gaXbaseWithAnnotations.getML_COMMENTRule();
+		return gaXtype.getML_COMMENTRule();
 	} 
 
 	//terminal SL_COMMENT:
-	//	"//" !("\n" | "\r")* ("\r"? "\n")?;
+	//	'//' !('\n' | '\r')* ('\r'? '\n')?;
 	public TerminalRule getSL_COMMENTRule() {
-		return gaXbaseWithAnnotations.getSL_COMMENTRule();
+		return gaXtype.getSL_COMMENTRule();
 	} 
 
 	//terminal WS:
-	//	(" " | "\t" | "\r" | "\n")+;
+	//	' ' | '\t' | '\r' | '\n'+;
 	public TerminalRule getWSRule() {
-		return gaXbaseWithAnnotations.getWSRule();
+		return gaXtype.getWSRule();
 	} 
 
 	//terminal ANY_OTHER:
 	//	.;
 	public TerminalRule getANY_OTHERRule() {
-		return gaXbaseWithAnnotations.getANY_OTHERRule();
+		return gaXtype.getANY_OTHERRule();
 	} 
 }
diff --git a/com.avaloq.tools.ddk.xtext.format/src/com/avaloq/tools/ddk/xtext/format/Format.xtext b/com.avaloq.tools.ddk.xtext.format/src/com/avaloq/tools/ddk/xtext/format/Format.xtext
index 8c4f5c56e..1a855fddc 100644
--- a/com.avaloq.tools.ddk.xtext.format/src/com/avaloq/tools/ddk/xtext/format/Format.xtext
+++ b/com.avaloq.tools.ddk.xtext.format/src/com/avaloq/tools/ddk/xtext/format/Format.xtext
@@ -160,3 +160,9 @@ RuleSelfIdentifier:
 ValidID:
   'context' | 'currentColumn' | ID;
 
+/**
+ * Overwrite INT rule one more time (exactly as in Xbase.xtext) to avoid false-positive error.
+ */
+terminal INT returns ecore::EInt:
+  '0'..'9' ('0'..'9'|'_')*;
+
diff --git a/com.avaloq.tools.ddk.xtext.scope.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.scope.ui/META-INF/MANIFEST.MF
index d2606f00f..80c4484ba 100644
--- a/com.avaloq.tools.ddk.xtext.scope.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.scope.ui/META-INF/MANIFEST.MF
@@ -22,5 +22,6 @@ Require-Bundle: org.eclipse.xtext.ui,
 Export-Package: com.avaloq.tools.ddk.xtext.scope.ui,
  com.avaloq.tools.ddk.xtext.scope.ui.contentassist.antlr,
  com.avaloq.tools.ddk.xtext.scope.ui.contentassist,
- com.avaloq.tools.ddk.xtext.scope.ui.quickfix
+ com.avaloq.tools.ddk.xtext.scope.ui.quickfix,
+ com.avaloq.tools.ddk.xtext.scope.ui.contentassist.antlr.internal
 Import-Package: org.apache.log4j
diff --git a/com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/AbstractScopeUiModule.java b/com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/AbstractScopeUiModule.java
index 861b6ed18..c94d7a807 100644
--- a/com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/AbstractScopeUiModule.java
+++ b/com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/AbstractScopeUiModule.java
@@ -142,5 +142,10 @@ public Class<? extends org.eclipse.compare.IViewerCreator> bindIViewerCreator()
 		return org.eclipse.xtext.ui.compare.DefaultViewerCreator.class;
 	}
 
+	// contributed by org.eclipse.xtext.ui.generator.compare.CompareFragment
+	public void configureCompareViewerTitle(com.google.inject.Binder binder) {
+		binder.bind(String.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.UIBindings.COMPARE_VIEWER_TITLE)).toInstance("Scope Compare");
+	}
+
 
 }
diff --git a/com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScopeLexer.java b/com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScopeLexer.java
index a8592f529..ba434441f 100644
--- a/com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScopeLexer.java
+++ b/com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScopeLexer.java
@@ -108,15 +108,15 @@ public InternalScopeLexer(CharStream input, RecognizerSharedState state) {
         super(input,state);
 
     }
-    public String getGrammarFileName() { return "../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g"; }
+    public String getGrammarFileName() { return "InternalScope.g"; }
 
     // $ANTLR start "T__12"
     public final void mT__12() throws RecognitionException {
         try {
             int _type = T__12;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11:7: ( '==' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11:9: '=='
+            // InternalScope.g:11:7: ( '==' )
+            // InternalScope.g:11:9: '=='
             {
             match("=="); 
 
@@ -136,8 +136,8 @@ public final void mT__13() throws RecognitionException {
         try {
             int _type = T__13;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12:7: ( '!=' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12:9: '!='
+            // InternalScope.g:12:7: ( '!=' )
+            // InternalScope.g:12:9: '!='
             {
             match("!="); 
 
@@ -157,8 +157,8 @@ public final void mT__14() throws RecognitionException {
         try {
             int _type = T__14;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13:7: ( '>=' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13:9: '>='
+            // InternalScope.g:13:7: ( '>=' )
+            // InternalScope.g:13:9: '>='
             {
             match(">="); 
 
@@ -178,8 +178,8 @@ public final void mT__15() throws RecognitionException {
         try {
             int _type = T__15;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:14:7: ( '<=' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:14:9: '<='
+            // InternalScope.g:14:7: ( '<=' )
+            // InternalScope.g:14:9: '<='
             {
             match("<="); 
 
@@ -199,8 +199,8 @@ public final void mT__16() throws RecognitionException {
         try {
             int _type = T__16;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:15:7: ( '>' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:15:9: '>'
+            // InternalScope.g:15:7: ( '>' )
+            // InternalScope.g:15:9: '>'
             {
             match('>'); 
 
@@ -219,8 +219,8 @@ public final void mT__17() throws RecognitionException {
         try {
             int _type = T__17;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:16:7: ( '<' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:16:9: '<'
+            // InternalScope.g:16:7: ( '<' )
+            // InternalScope.g:16:9: '<'
             {
             match('<'); 
 
@@ -239,8 +239,8 @@ public final void mT__18() throws RecognitionException {
         try {
             int _type = T__18;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:17:7: ( '+' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:17:9: '+'
+            // InternalScope.g:17:7: ( '+' )
+            // InternalScope.g:17:9: '+'
             {
             match('+'); 
 
@@ -259,8 +259,8 @@ public final void mT__19() throws RecognitionException {
         try {
             int _type = T__19;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:18:7: ( '-' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:18:9: '-'
+            // InternalScope.g:18:7: ( '-' )
+            // InternalScope.g:18:9: '-'
             {
             match('-'); 
 
@@ -279,8 +279,8 @@ public final void mT__20() throws RecognitionException {
         try {
             int _type = T__20;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:19:7: ( '*' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:19:9: '*'
+            // InternalScope.g:19:7: ( '*' )
+            // InternalScope.g:19:9: '*'
             {
             match('*'); 
 
@@ -299,8 +299,8 @@ public final void mT__21() throws RecognitionException {
         try {
             int _type = T__21;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:20:7: ( '/' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:20:9: '/'
+            // InternalScope.g:20:7: ( '/' )
+            // InternalScope.g:20:9: '/'
             {
             match('/'); 
 
@@ -319,8 +319,8 @@ public final void mT__22() throws RecognitionException {
         try {
             int _type = T__22;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:21:7: ( '!' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:21:9: '!'
+            // InternalScope.g:21:7: ( '!' )
+            // InternalScope.g:21:9: '!'
             {
             match('!'); 
 
@@ -339,8 +339,8 @@ public final void mT__23() throws RecognitionException {
         try {
             int _type = T__23;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:22:7: ( 'collect' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:22:9: 'collect'
+            // InternalScope.g:22:7: ( 'collect' )
+            // InternalScope.g:22:9: 'collect'
             {
             match("collect"); 
 
@@ -360,8 +360,8 @@ public final void mT__24() throws RecognitionException {
         try {
             int _type = T__24;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:23:7: ( 'select' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:23:9: 'select'
+            // InternalScope.g:23:7: ( 'select' )
+            // InternalScope.g:23:9: 'select'
             {
             match("select"); 
 
@@ -381,8 +381,8 @@ public final void mT__25() throws RecognitionException {
         try {
             int _type = T__25;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:24:7: ( 'selectFirst' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:24:9: 'selectFirst'
+            // InternalScope.g:24:7: ( 'selectFirst' )
+            // InternalScope.g:24:9: 'selectFirst'
             {
             match("selectFirst"); 
 
@@ -402,8 +402,8 @@ public final void mT__26() throws RecognitionException {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:25:7: ( 'reject' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:25:9: 'reject'
+            // InternalScope.g:25:7: ( 'reject' )
+            // InternalScope.g:25:9: 'reject'
             {
             match("reject"); 
 
@@ -423,8 +423,8 @@ public final void mT__27() throws RecognitionException {
         try {
             int _type = T__27;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:26:7: ( 'exists' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:26:9: 'exists'
+            // InternalScope.g:26:7: ( 'exists' )
+            // InternalScope.g:26:9: 'exists'
             {
             match("exists"); 
 
@@ -444,8 +444,8 @@ public final void mT__28() throws RecognitionException {
         try {
             int _type = T__28;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:27:7: ( 'notExists' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:27:9: 'notExists'
+            // InternalScope.g:27:7: ( 'notExists' )
+            // InternalScope.g:27:9: 'notExists'
             {
             match("notExists"); 
 
@@ -465,8 +465,8 @@ public final void mT__29() throws RecognitionException {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:28:7: ( 'sortBy' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:28:9: 'sortBy'
+            // InternalScope.g:28:7: ( 'sortBy' )
+            // InternalScope.g:28:9: 'sortBy'
             {
             match("sortBy"); 
 
@@ -486,8 +486,8 @@ public final void mT__30() throws RecognitionException {
         try {
             int _type = T__30;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:29:7: ( 'forAll' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:29:9: 'forAll'
+            // InternalScope.g:29:7: ( 'forAll' )
+            // InternalScope.g:29:9: 'forAll'
             {
             match("forAll"); 
 
@@ -507,8 +507,8 @@ public final void mT__31() throws RecognitionException {
         try {
             int _type = T__31;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:30:7: ( 'true' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:30:9: 'true'
+            // InternalScope.g:30:7: ( 'true' )
+            // InternalScope.g:30:9: 'true'
             {
             match("true"); 
 
@@ -528,8 +528,8 @@ public final void mT__32() throws RecognitionException {
         try {
             int _type = T__32;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:31:7: ( 'false' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:31:9: 'false'
+            // InternalScope.g:31:7: ( 'false' )
+            // InternalScope.g:31:9: 'false'
             {
             match("false"); 
 
@@ -549,8 +549,8 @@ public final void mT__33() throws RecognitionException {
         try {
             int _type = T__33;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:32:7: ( 'Collection' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:32:9: 'Collection'
+            // InternalScope.g:32:7: ( 'Collection' )
+            // InternalScope.g:32:9: 'Collection'
             {
             match("Collection"); 
 
@@ -570,8 +570,8 @@ public final void mT__34() throws RecognitionException {
         try {
             int _type = T__34;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:33:7: ( 'List' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:33:9: 'List'
+            // InternalScope.g:33:7: ( 'List' )
+            // InternalScope.g:33:9: 'List'
             {
             match("List"); 
 
@@ -591,8 +591,8 @@ public final void mT__35() throws RecognitionException {
         try {
             int _type = T__35;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:34:7: ( 'Set' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:34:9: 'Set'
+            // InternalScope.g:34:7: ( 'Set' )
+            // InternalScope.g:34:9: 'Set'
             {
             match("Set"); 
 
@@ -612,8 +612,8 @@ public final void mT__36() throws RecognitionException {
         try {
             int _type = T__36;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:35:7: ( 'sensitive' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:35:9: 'sensitive'
+            // InternalScope.g:35:7: ( 'sensitive' )
+            // InternalScope.g:35:9: 'sensitive'
             {
             match("sensitive"); 
 
@@ -633,8 +633,8 @@ public final void mT__37() throws RecognitionException {
         try {
             int _type = T__37;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:36:7: ( 'insensitive' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:36:9: 'insensitive'
+            // InternalScope.g:36:7: ( 'insensitive' )
+            // InternalScope.g:36:9: 'insensitive'
             {
             match("insensitive"); 
 
@@ -654,8 +654,8 @@ public final void mT__38() throws RecognitionException {
         try {
             int _type = T__38;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:37:7: ( 'scoping' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:37:9: 'scoping'
+            // InternalScope.g:37:7: ( 'scoping' )
+            // InternalScope.g:37:9: 'scoping'
             {
             match("scoping"); 
 
@@ -675,8 +675,8 @@ public final void mT__39() throws RecognitionException {
         try {
             int _type = T__39;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:38:7: ( 'with' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:38:9: 'with'
+            // InternalScope.g:38:7: ( 'with' )
+            // InternalScope.g:38:9: 'with'
             {
             match("with"); 
 
@@ -696,8 +696,8 @@ public final void mT__40() throws RecognitionException {
         try {
             int _type = T__40;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:39:7: ( 'import' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:39:9: 'import'
+            // InternalScope.g:39:7: ( 'import' )
+            // InternalScope.g:39:9: 'import'
             {
             match("import"); 
 
@@ -717,8 +717,8 @@ public final void mT__41() throws RecognitionException {
         try {
             int _type = T__41;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:40:7: ( 'as' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:40:9: 'as'
+            // InternalScope.g:40:7: ( 'as' )
+            // InternalScope.g:40:9: 'as'
             {
             match("as"); 
 
@@ -738,8 +738,8 @@ public final void mT__42() throws RecognitionException {
         try {
             int _type = T__42;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:41:7: ( 'extension' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:41:9: 'extension'
+            // InternalScope.g:41:7: ( 'extension' )
+            // InternalScope.g:41:9: 'extension'
             {
             match("extension"); 
 
@@ -759,8 +759,8 @@ public final void mT__43() throws RecognitionException {
         try {
             int _type = T__43;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:42:7: ( 'inject' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:42:9: 'inject'
+            // InternalScope.g:42:7: ( 'inject' )
+            // InternalScope.g:42:9: 'inject'
             {
             match("inject"); 
 
@@ -780,8 +780,8 @@ public final void mT__44() throws RecognitionException {
         try {
             int _type = T__44;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:43:7: ( 'naming' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:43:9: 'naming'
+            // InternalScope.g:43:7: ( 'naming' )
+            // InternalScope.g:43:9: 'naming'
             {
             match("naming"); 
 
@@ -801,8 +801,8 @@ public final void mT__45() throws RecognitionException {
         try {
             int _type = T__45;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:44:7: ( '{' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:44:9: '{'
+            // InternalScope.g:44:7: ( '{' )
+            // InternalScope.g:44:9: '{'
             {
             match('{'); 
 
@@ -821,8 +821,8 @@ public final void mT__46() throws RecognitionException {
         try {
             int _type = T__46;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:45:7: ( '}' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:45:9: '}'
+            // InternalScope.g:45:7: ( '}' )
+            // InternalScope.g:45:9: '}'
             {
             match('}'); 
 
@@ -841,8 +841,8 @@ public final void mT__47() throws RecognitionException {
         try {
             int _type = T__47;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:46:7: ( 'case' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:46:9: 'case'
+            // InternalScope.g:46:7: ( 'case' )
+            // InternalScope.g:46:9: 'case'
             {
             match("case"); 
 
@@ -862,8 +862,8 @@ public final void mT__48() throws RecognitionException {
         try {
             int _type = T__48;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:47:7: ( '=' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:47:9: '='
+            // InternalScope.g:47:7: ( '=' )
+            // InternalScope.g:47:9: '='
             {
             match('='); 
 
@@ -882,8 +882,8 @@ public final void mT__49() throws RecognitionException {
         try {
             int _type = T__49;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:48:7: ( ';' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:48:9: ';'
+            // InternalScope.g:48:7: ( ';' )
+            // InternalScope.g:48:9: ';'
             {
             match(';'); 
 
@@ -902,8 +902,8 @@ public final void mT__50() throws RecognitionException {
         try {
             int _type = T__50;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:49:7: ( 'scope' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:49:9: 'scope'
+            // InternalScope.g:49:7: ( 'scope' )
+            // InternalScope.g:49:9: 'scope'
             {
             match("scope"); 
 
@@ -923,8 +923,8 @@ public final void mT__51() throws RecognitionException {
         try {
             int _type = T__51;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:50:7: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:50:9: '('
+            // InternalScope.g:50:7: ( '(' )
+            // InternalScope.g:50:9: '('
             {
             match('('); 
 
@@ -943,8 +943,8 @@ public final void mT__52() throws RecognitionException {
         try {
             int _type = T__52;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:51:7: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:51:9: ')'
+            // InternalScope.g:51:7: ( ')' )
+            // InternalScope.g:51:9: ')'
             {
             match(')'); 
 
@@ -963,8 +963,8 @@ public final void mT__53() throws RecognitionException {
         try {
             int _type = T__53;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:52:7: ( '#' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:52:9: '#'
+            // InternalScope.g:52:7: ( '#' )
+            // InternalScope.g:52:9: '#'
             {
             match('#'); 
 
@@ -983,8 +983,8 @@ public final void mT__54() throws RecognitionException {
         try {
             int _type = T__54;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:53:7: ( 'context' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:53:9: 'context'
+            // InternalScope.g:53:7: ( 'context' )
+            // InternalScope.g:53:9: 'context'
             {
             match("context"); 
 
@@ -1004,8 +1004,8 @@ public final void mT__55() throws RecognitionException {
         try {
             int _type = T__55;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:54:7: ( '>>' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:54:9: '>>'
+            // InternalScope.g:54:7: ( '>>' )
+            // InternalScope.g:54:9: '>>'
             {
             match(">>"); 
 
@@ -1025,8 +1025,8 @@ public final void mT__56() throws RecognitionException {
         try {
             int _type = T__56;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:55:7: ( '[' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:55:9: '['
+            // InternalScope.g:55:7: ( '[' )
+            // InternalScope.g:55:9: '['
             {
             match('['); 
 
@@ -1045,8 +1045,8 @@ public final void mT__57() throws RecognitionException {
         try {
             int _type = T__57;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:56:7: ( ']' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:56:9: ']'
+            // InternalScope.g:56:7: ( ']' )
+            // InternalScope.g:56:9: ']'
             {
             match(']'); 
 
@@ -1065,8 +1065,8 @@ public final void mT__58() throws RecognitionException {
         try {
             int _type = T__58;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:57:7: ( '|' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:57:9: '|'
+            // InternalScope.g:57:7: ( '|' )
+            // InternalScope.g:57:9: '|'
             {
             match('|'); 
 
@@ -1085,8 +1085,8 @@ public final void mT__59() throws RecognitionException {
         try {
             int _type = T__59;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:58:7: ( 'factory' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:58:9: 'factory'
+            // InternalScope.g:58:7: ( 'factory' )
+            // InternalScope.g:58:9: 'factory'
             {
             match("factory"); 
 
@@ -1106,8 +1106,8 @@ public final void mT__60() throws RecognitionException {
         try {
             int _type = T__60;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:59:7: ( 'scopeof' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:59:9: 'scopeof'
+            // InternalScope.g:59:7: ( 'scopeof' )
+            // InternalScope.g:59:9: 'scopeof'
             {
             match("scopeof"); 
 
@@ -1127,8 +1127,8 @@ public final void mT__61() throws RecognitionException {
         try {
             int _type = T__61;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:60:7: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:60:9: ','
+            // InternalScope.g:60:7: ( ',' )
+            // InternalScope.g:60:9: ','
             {
             match(','); 
 
@@ -1147,8 +1147,8 @@ public final void mT__62() throws RecognitionException {
         try {
             int _type = T__62;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:61:7: ( 'find' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:61:9: 'find'
+            // InternalScope.g:61:7: ( 'find' )
+            // InternalScope.g:61:9: 'find'
             {
             match("find"); 
 
@@ -1168,8 +1168,8 @@ public final void mT__63() throws RecognitionException {
         try {
             int _type = T__63;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:62:7: ( 'key' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:62:9: 'key'
+            // InternalScope.g:62:7: ( 'key' )
+            // InternalScope.g:62:9: 'key'
             {
             match("key"); 
 
@@ -1189,8 +1189,8 @@ public final void mT__64() throws RecognitionException {
         try {
             int _type = T__64;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:63:7: ( 'prefix' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:63:9: 'prefix'
+            // InternalScope.g:63:7: ( 'prefix' )
+            // InternalScope.g:63:9: 'prefix'
             {
             match("prefix"); 
 
@@ -1210,8 +1210,8 @@ public final void mT__65() throws RecognitionException {
         try {
             int _type = T__65;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:64:7: ( 'data' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:64:9: 'data'
+            // InternalScope.g:64:7: ( 'data' )
+            // InternalScope.g:64:9: 'data'
             {
             match("data"); 
 
@@ -1231,8 +1231,8 @@ public final void mT__66() throws RecognitionException {
         try {
             int _type = T__66;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:65:7: ( 'domains' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:65:9: 'domains'
+            // InternalScope.g:65:7: ( 'domains' )
+            // InternalScope.g:65:9: 'domains'
             {
             match("domains"); 
 
@@ -1252,8 +1252,8 @@ public final void mT__67() throws RecognitionException {
         try {
             int _type = T__67;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:66:7: ( '::' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:66:9: '::'
+            // InternalScope.g:66:7: ( '::' )
+            // InternalScope.g:66:9: '::'
             {
             match("::"); 
 
@@ -1273,8 +1273,8 @@ public final void mT__68() throws RecognitionException {
         try {
             int _type = T__68;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:67:7: ( '.' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:67:9: '.'
+            // InternalScope.g:67:7: ( '.' )
+            // InternalScope.g:67:9: '.'
             {
             match('.'); 
 
@@ -1293,8 +1293,8 @@ public final void mT__69() throws RecognitionException {
         try {
             int _type = T__69;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:68:7: ( 'let' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:68:9: 'let'
+            // InternalScope.g:68:7: ( 'let' )
+            // InternalScope.g:68:9: 'let'
             {
             match("let"); 
 
@@ -1314,8 +1314,8 @@ public final void mT__70() throws RecognitionException {
         try {
             int _type = T__70;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:69:7: ( ':' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:69:9: ':'
+            // InternalScope.g:69:7: ( ':' )
+            // InternalScope.g:69:9: ':'
             {
             match(':'); 
 
@@ -1334,8 +1334,8 @@ public final void mT__71() throws RecognitionException {
         try {
             int _type = T__71;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:70:7: ( '->' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:70:9: '->'
+            // InternalScope.g:70:7: ( '->' )
+            // InternalScope.g:70:9: '->'
             {
             match("->"); 
 
@@ -1355,8 +1355,8 @@ public final void mT__72() throws RecognitionException {
         try {
             int _type = T__72;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:71:7: ( '?' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:71:9: '?'
+            // InternalScope.g:71:7: ( '?' )
+            // InternalScope.g:71:9: '?'
             {
             match('?'); 
 
@@ -1375,8 +1375,8 @@ public final void mT__73() throws RecognitionException {
         try {
             int _type = T__73;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:72:7: ( 'if' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:72:9: 'if'
+            // InternalScope.g:72:7: ( 'if' )
+            // InternalScope.g:72:9: 'if'
             {
             match("if"); 
 
@@ -1396,8 +1396,8 @@ public final void mT__74() throws RecognitionException {
         try {
             int _type = T__74;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:73:7: ( 'then' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:73:9: 'then'
+            // InternalScope.g:73:7: ( 'then' )
+            // InternalScope.g:73:9: 'then'
             {
             match("then"); 
 
@@ -1417,8 +1417,8 @@ public final void mT__75() throws RecognitionException {
         try {
             int _type = T__75;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:74:7: ( 'else' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:74:9: 'else'
+            // InternalScope.g:74:7: ( 'else' )
+            // InternalScope.g:74:9: 'else'
             {
             match("else"); 
 
@@ -1438,8 +1438,8 @@ public final void mT__76() throws RecognitionException {
         try {
             int _type = T__76;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:75:7: ( 'switch' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:75:9: 'switch'
+            // InternalScope.g:75:7: ( 'switch' )
+            // InternalScope.g:75:9: 'switch'
             {
             match("switch"); 
 
@@ -1459,8 +1459,8 @@ public final void mT__77() throws RecognitionException {
         try {
             int _type = T__77;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:76:7: ( 'default' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:76:9: 'default'
+            // InternalScope.g:76:7: ( 'default' )
+            // InternalScope.g:76:9: 'default'
             {
             match("default"); 
 
@@ -1480,8 +1480,8 @@ public final void mT__78() throws RecognitionException {
         try {
             int _type = T__78;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:77:7: ( 'GLOBALVAR' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:77:9: 'GLOBALVAR'
+            // InternalScope.g:77:7: ( 'GLOBALVAR' )
+            // InternalScope.g:77:9: 'GLOBALVAR'
             {
             match("GLOBALVAR"); 
 
@@ -1501,8 +1501,8 @@ public final void mT__79() throws RecognitionException {
         try {
             int _type = T__79;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:78:7: ( 'new' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:78:9: 'new'
+            // InternalScope.g:78:7: ( 'new' )
+            // InternalScope.g:78:9: 'new'
             {
             match("new"); 
 
@@ -1522,8 +1522,8 @@ public final void mT__80() throws RecognitionException {
         try {
             int _type = T__80;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:79:7: ( 'recursive' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:79:9: 'recursive'
+            // InternalScope.g:79:7: ( 'recursive' )
+            // InternalScope.g:79:9: 'recursive'
             {
             match("recursive"); 
 
@@ -1543,8 +1543,8 @@ public final void mT__81() throws RecognitionException {
         try {
             int _type = T__81;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:80:7: ( 'export' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:80:9: 'export'
+            // InternalScope.g:80:7: ( 'export' )
+            // InternalScope.g:80:9: 'export'
             {
             match("export"); 
 
@@ -1564,8 +1564,8 @@ public final void mT__82() throws RecognitionException {
         try {
             int _type = T__82;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:81:7: ( '||' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:81:9: '||'
+            // InternalScope.g:81:7: ( '||' )
+            // InternalScope.g:81:9: '||'
             {
             match("||"); 
 
@@ -1585,8 +1585,8 @@ public final void mT__83() throws RecognitionException {
         try {
             int _type = T__83;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:82:7: ( '&&' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:82:9: '&&'
+            // InternalScope.g:82:7: ( '&&' )
+            // InternalScope.g:82:9: '&&'
             {
             match("&&"); 
 
@@ -1606,8 +1606,8 @@ public final void mT__84() throws RecognitionException {
         try {
             int _type = T__84;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:83:7: ( 'implies' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:83:9: 'implies'
+            // InternalScope.g:83:7: ( 'implies' )
+            // InternalScope.g:83:9: 'implies'
             {
             match("implies"); 
 
@@ -1627,8 +1627,8 @@ public final void mT__85() throws RecognitionException {
         try {
             int _type = T__85;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:84:7: ( 'typeSelect' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:84:9: 'typeSelect'
+            // InternalScope.g:84:7: ( 'typeSelect' )
+            // InternalScope.g:84:9: 'typeSelect'
             {
             match("typeSelect"); 
 
@@ -1648,8 +1648,8 @@ public final void mT__86() throws RecognitionException {
         try {
             int _type = T__86;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:85:7: ( 'null' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:85:9: 'null'
+            // InternalScope.g:85:7: ( 'null' )
+            // InternalScope.g:85:9: 'null'
             {
             match("null"); 
 
@@ -1669,10 +1669,10 @@ public final void mRULE_REAL() throws RecognitionException {
         try {
             int _type = RULE_REAL;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13554:11: ( ( '0' .. '9' )* '.' ( '0' .. '9' )* )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13554:13: ( '0' .. '9' )* '.' ( '0' .. '9' )*
+            // InternalScope.g:13554:11: ( ( '0' .. '9' )* '.' ( '0' .. '9' )* )
+            // InternalScope.g:13554:13: ( '0' .. '9' )* '.' ( '0' .. '9' )*
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13554:13: ( '0' .. '9' )*
+            // InternalScope.g:13554:13: ( '0' .. '9' )*
             loop1:
             do {
                 int alt1=2;
@@ -1685,7 +1685,7 @@ public final void mRULE_REAL() throws RecognitionException {
 
                 switch (alt1) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13554:14: '0' .. '9'
+            	    // InternalScope.g:13554:14: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -1698,7 +1698,7 @@ public final void mRULE_REAL() throws RecognitionException {
             } while (true);
 
             match('.'); 
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13554:29: ( '0' .. '9' )*
+            // InternalScope.g:13554:29: ( '0' .. '9' )*
             loop2:
             do {
                 int alt2=2;
@@ -1711,7 +1711,7 @@ public final void mRULE_REAL() throws RecognitionException {
 
                 switch (alt2) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13554:30: '0' .. '9'
+            	    // InternalScope.g:13554:30: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -1739,10 +1739,10 @@ public final void mRULE_ID() throws RecognitionException {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13556:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13556:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalScope.g:13556:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+            // InternalScope.g:13556:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13556:11: ( '^' )?
+            // InternalScope.g:13556:11: ( '^' )?
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -1751,7 +1751,7 @@ public final void mRULE_ID() throws RecognitionException {
             }
             switch (alt3) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13556:11: '^'
+                    // InternalScope.g:13556:11: '^'
                     {
                     match('^'); 
 
@@ -1769,7 +1769,7 @@ public final void mRULE_ID() throws RecognitionException {
                 recover(mse);
                 throw mse;}
 
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13556:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalScope.g:13556:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             loop4:
             do {
                 int alt4=2;
@@ -1782,7 +1782,7 @@ public final void mRULE_ID() throws RecognitionException {
 
                 switch (alt4) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:
+            	    // InternalScope.g:
             	    {
             	    if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
             	        input.consume();
@@ -1818,10 +1818,10 @@ public final void mRULE_INT() throws RecognitionException {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13558:10: ( ( '0' .. '9' )+ )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13558:12: ( '0' .. '9' )+
+            // InternalScope.g:13558:10: ( ( '0' .. '9' )+ )
+            // InternalScope.g:13558:12: ( '0' .. '9' )+
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13558:12: ( '0' .. '9' )+
+            // InternalScope.g:13558:12: ( '0' .. '9' )+
             int cnt5=0;
             loop5:
             do {
@@ -1835,7 +1835,7 @@ public final void mRULE_INT() throws RecognitionException {
 
                 switch (alt5) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13558:13: '0' .. '9'
+            	    // InternalScope.g:13558:13: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -1867,10 +1867,10 @@ public final void mRULE_STRING() throws RecognitionException {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13560:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13560:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalScope.g:13560:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+            // InternalScope.g:13560:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13560:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalScope.g:13560:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             int alt8=2;
             int LA8_0 = input.LA(1);
 
@@ -1888,10 +1888,10 @@ else if ( (LA8_0=='\'') ) {
             }
             switch (alt8) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13560:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+                    // InternalScope.g:13560:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
                     {
                     match('\"'); 
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13560:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // InternalScope.g:13560:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop6:
                     do {
                         int alt6=3;
@@ -1907,7 +1907,7 @@ else if ( ((LA6_0>='\u0000' && LA6_0<='!')||(LA6_0>='#' && LA6_0<='[')||(LA6_0>=
 
                         switch (alt6) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13560:21: '\\\\' .
+                    	    // InternalScope.g:13560:21: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -1915,7 +1915,7 @@ else if ( ((LA6_0>='\u0000' && LA6_0<='!')||(LA6_0>='#' && LA6_0<='[')||(LA6_0>=
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13560:28: ~ ( ( '\\\\' | '\"' ) )
+                    	    // InternalScope.g:13560:28: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -1940,10 +1940,10 @@ else if ( ((LA6_0>='\u0000' && LA6_0<='!')||(LA6_0>='#' && LA6_0<='[')||(LA6_0>=
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13560:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+                    // InternalScope.g:13560:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
                     {
                     match('\''); 
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13560:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // InternalScope.g:13560:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop7:
                     do {
                         int alt7=3;
@@ -1959,7 +1959,7 @@ else if ( ((LA7_0>='\u0000' && LA7_0<='&')||(LA7_0>='(' && LA7_0<='[')||(LA7_0>=
 
                         switch (alt7) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13560:54: '\\\\' .
+                    	    // InternalScope.g:13560:54: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -1967,7 +1967,7 @@ else if ( ((LA7_0>='\u0000' && LA7_0<='&')||(LA7_0>='(' && LA7_0<='[')||(LA7_0>=
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13560:61: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // InternalScope.g:13560:61: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -2010,12 +2010,12 @@ public final void mRULE_ML_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13562:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13562:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalScope.g:13562:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalScope.g:13562:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13562:24: ( options {greedy=false; } : . )*
+            // InternalScope.g:13562:24: ( options {greedy=false; } : . )*
             loop9:
             do {
                 int alt9=2;
@@ -2040,7 +2040,7 @@ else if ( ((LA9_0>='\u0000' && LA9_0<=')')||(LA9_0>='+' && LA9_0<='\uFFFF')) ) {
 
                 switch (alt9) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13562:52: .
+            	    // InternalScope.g:13562:52: .
             	    {
             	    matchAny(); 
 
@@ -2070,12 +2070,12 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13564:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13564:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalScope.g:13564:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalScope.g:13564:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13564:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // InternalScope.g:13564:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop10:
             do {
                 int alt10=2;
@@ -2088,7 +2088,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
 
                 switch (alt10) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13564:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // InternalScope.g:13564:24: ~ ( ( '\\n' | '\\r' ) )
             	    {
             	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
             	        input.consume();
@@ -2108,7 +2108,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
                 }
             } while (true);
 
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13564:40: ( ( '\\r' )? '\\n' )?
+            // InternalScope.g:13564:40: ( ( '\\r' )? '\\n' )?
             int alt12=2;
             int LA12_0 = input.LA(1);
 
@@ -2117,9 +2117,9 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
             }
             switch (alt12) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13564:41: ( '\\r' )? '\\n'
+                    // InternalScope.g:13564:41: ( '\\r' )? '\\n'
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13564:41: ( '\\r' )?
+                    // InternalScope.g:13564:41: ( '\\r' )?
                     int alt11=2;
                     int LA11_0 = input.LA(1);
 
@@ -2128,7 +2128,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
                     }
                     switch (alt11) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13564:41: '\\r'
+                            // InternalScope.g:13564:41: '\\r'
                             {
                             match('\r'); 
 
@@ -2160,10 +2160,10 @@ public final void mRULE_WS() throws RecognitionException {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13566:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13566:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalScope.g:13566:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalScope.g:13566:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13566:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalScope.g:13566:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt13=0;
             loop13:
             do {
@@ -2177,7 +2177,7 @@ public final void mRULE_WS() throws RecognitionException {
 
                 switch (alt13) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:
+            	    // InternalScope.g:
             	    {
             	    if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
             	        input.consume();
@@ -2217,8 +2217,8 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13568:16: ( . )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13568:18: .
+            // InternalScope.g:13568:16: ( . )
+            // InternalScope.g:13568:18: .
             {
             matchAny(); 
 
@@ -2233,586 +2233,586 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:8: ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | RULE_REAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        // InternalScope.g:1:8: ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | RULE_REAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
         int alt14=83;
         alt14 = dfa14.predict(input);
         switch (alt14) {
             case 1 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:10: T__12
+                // InternalScope.g:1:10: T__12
                 {
                 mT__12(); 
 
                 }
                 break;
             case 2 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:16: T__13
+                // InternalScope.g:1:16: T__13
                 {
                 mT__13(); 
 
                 }
                 break;
             case 3 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:22: T__14
+                // InternalScope.g:1:22: T__14
                 {
                 mT__14(); 
 
                 }
                 break;
             case 4 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:28: T__15
+                // InternalScope.g:1:28: T__15
                 {
                 mT__15(); 
 
                 }
                 break;
             case 5 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:34: T__16
+                // InternalScope.g:1:34: T__16
                 {
                 mT__16(); 
 
                 }
                 break;
             case 6 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:40: T__17
+                // InternalScope.g:1:40: T__17
                 {
                 mT__17(); 
 
                 }
                 break;
             case 7 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:46: T__18
+                // InternalScope.g:1:46: T__18
                 {
                 mT__18(); 
 
                 }
                 break;
             case 8 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:52: T__19
+                // InternalScope.g:1:52: T__19
                 {
                 mT__19(); 
 
                 }
                 break;
             case 9 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:58: T__20
+                // InternalScope.g:1:58: T__20
                 {
                 mT__20(); 
 
                 }
                 break;
             case 10 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:64: T__21
+                // InternalScope.g:1:64: T__21
                 {
                 mT__21(); 
 
                 }
                 break;
             case 11 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:70: T__22
+                // InternalScope.g:1:70: T__22
                 {
                 mT__22(); 
 
                 }
                 break;
             case 12 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:76: T__23
+                // InternalScope.g:1:76: T__23
                 {
                 mT__23(); 
 
                 }
                 break;
             case 13 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:82: T__24
+                // InternalScope.g:1:82: T__24
                 {
                 mT__24(); 
 
                 }
                 break;
             case 14 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:88: T__25
+                // InternalScope.g:1:88: T__25
                 {
                 mT__25(); 
 
                 }
                 break;
             case 15 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:94: T__26
+                // InternalScope.g:1:94: T__26
                 {
                 mT__26(); 
 
                 }
                 break;
             case 16 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:100: T__27
+                // InternalScope.g:1:100: T__27
                 {
                 mT__27(); 
 
                 }
                 break;
             case 17 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:106: T__28
+                // InternalScope.g:1:106: T__28
                 {
                 mT__28(); 
 
                 }
                 break;
             case 18 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:112: T__29
+                // InternalScope.g:1:112: T__29
                 {
                 mT__29(); 
 
                 }
                 break;
             case 19 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:118: T__30
+                // InternalScope.g:1:118: T__30
                 {
                 mT__30(); 
 
                 }
                 break;
             case 20 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:124: T__31
+                // InternalScope.g:1:124: T__31
                 {
                 mT__31(); 
 
                 }
                 break;
             case 21 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:130: T__32
+                // InternalScope.g:1:130: T__32
                 {
                 mT__32(); 
 
                 }
                 break;
             case 22 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:136: T__33
+                // InternalScope.g:1:136: T__33
                 {
                 mT__33(); 
 
                 }
                 break;
             case 23 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:142: T__34
+                // InternalScope.g:1:142: T__34
                 {
                 mT__34(); 
 
                 }
                 break;
             case 24 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:148: T__35
+                // InternalScope.g:1:148: T__35
                 {
                 mT__35(); 
 
                 }
                 break;
             case 25 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:154: T__36
+                // InternalScope.g:1:154: T__36
                 {
                 mT__36(); 
 
                 }
                 break;
             case 26 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:160: T__37
+                // InternalScope.g:1:160: T__37
                 {
                 mT__37(); 
 
                 }
                 break;
             case 27 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:166: T__38
+                // InternalScope.g:1:166: T__38
                 {
                 mT__38(); 
 
                 }
                 break;
             case 28 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:172: T__39
+                // InternalScope.g:1:172: T__39
                 {
                 mT__39(); 
 
                 }
                 break;
             case 29 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:178: T__40
+                // InternalScope.g:1:178: T__40
                 {
                 mT__40(); 
 
                 }
                 break;
             case 30 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:184: T__41
+                // InternalScope.g:1:184: T__41
                 {
                 mT__41(); 
 
                 }
                 break;
             case 31 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:190: T__42
+                // InternalScope.g:1:190: T__42
                 {
                 mT__42(); 
 
                 }
                 break;
             case 32 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:196: T__43
+                // InternalScope.g:1:196: T__43
                 {
                 mT__43(); 
 
                 }
                 break;
             case 33 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:202: T__44
+                // InternalScope.g:1:202: T__44
                 {
                 mT__44(); 
 
                 }
                 break;
             case 34 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:208: T__45
+                // InternalScope.g:1:208: T__45
                 {
                 mT__45(); 
 
                 }
                 break;
             case 35 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:214: T__46
+                // InternalScope.g:1:214: T__46
                 {
                 mT__46(); 
 
                 }
                 break;
             case 36 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:220: T__47
+                // InternalScope.g:1:220: T__47
                 {
                 mT__47(); 
 
                 }
                 break;
             case 37 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:226: T__48
+                // InternalScope.g:1:226: T__48
                 {
                 mT__48(); 
 
                 }
                 break;
             case 38 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:232: T__49
+                // InternalScope.g:1:232: T__49
                 {
                 mT__49(); 
 
                 }
                 break;
             case 39 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:238: T__50
+                // InternalScope.g:1:238: T__50
                 {
                 mT__50(); 
 
                 }
                 break;
             case 40 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:244: T__51
+                // InternalScope.g:1:244: T__51
                 {
                 mT__51(); 
 
                 }
                 break;
             case 41 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:250: T__52
+                // InternalScope.g:1:250: T__52
                 {
                 mT__52(); 
 
                 }
                 break;
             case 42 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:256: T__53
+                // InternalScope.g:1:256: T__53
                 {
                 mT__53(); 
 
                 }
                 break;
             case 43 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:262: T__54
+                // InternalScope.g:1:262: T__54
                 {
                 mT__54(); 
 
                 }
                 break;
             case 44 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:268: T__55
+                // InternalScope.g:1:268: T__55
                 {
                 mT__55(); 
 
                 }
                 break;
             case 45 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:274: T__56
+                // InternalScope.g:1:274: T__56
                 {
                 mT__56(); 
 
                 }
                 break;
             case 46 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:280: T__57
+                // InternalScope.g:1:280: T__57
                 {
                 mT__57(); 
 
                 }
                 break;
             case 47 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:286: T__58
+                // InternalScope.g:1:286: T__58
                 {
                 mT__58(); 
 
                 }
                 break;
             case 48 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:292: T__59
+                // InternalScope.g:1:292: T__59
                 {
                 mT__59(); 
 
                 }
                 break;
             case 49 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:298: T__60
+                // InternalScope.g:1:298: T__60
                 {
                 mT__60(); 
 
                 }
                 break;
             case 50 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:304: T__61
+                // InternalScope.g:1:304: T__61
                 {
                 mT__61(); 
 
                 }
                 break;
             case 51 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:310: T__62
+                // InternalScope.g:1:310: T__62
                 {
                 mT__62(); 
 
                 }
                 break;
             case 52 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:316: T__63
+                // InternalScope.g:1:316: T__63
                 {
                 mT__63(); 
 
                 }
                 break;
             case 53 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:322: T__64
+                // InternalScope.g:1:322: T__64
                 {
                 mT__64(); 
 
                 }
                 break;
             case 54 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:328: T__65
+                // InternalScope.g:1:328: T__65
                 {
                 mT__65(); 
 
                 }
                 break;
             case 55 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:334: T__66
+                // InternalScope.g:1:334: T__66
                 {
                 mT__66(); 
 
                 }
                 break;
             case 56 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:340: T__67
+                // InternalScope.g:1:340: T__67
                 {
                 mT__67(); 
 
                 }
                 break;
             case 57 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:346: T__68
+                // InternalScope.g:1:346: T__68
                 {
                 mT__68(); 
 
                 }
                 break;
             case 58 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:352: T__69
+                // InternalScope.g:1:352: T__69
                 {
                 mT__69(); 
 
                 }
                 break;
             case 59 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:358: T__70
+                // InternalScope.g:1:358: T__70
                 {
                 mT__70(); 
 
                 }
                 break;
             case 60 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:364: T__71
+                // InternalScope.g:1:364: T__71
                 {
                 mT__71(); 
 
                 }
                 break;
             case 61 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:370: T__72
+                // InternalScope.g:1:370: T__72
                 {
                 mT__72(); 
 
                 }
                 break;
             case 62 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:376: T__73
+                // InternalScope.g:1:376: T__73
                 {
                 mT__73(); 
 
                 }
                 break;
             case 63 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:382: T__74
+                // InternalScope.g:1:382: T__74
                 {
                 mT__74(); 
 
                 }
                 break;
             case 64 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:388: T__75
+                // InternalScope.g:1:388: T__75
                 {
                 mT__75(); 
 
                 }
                 break;
             case 65 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:394: T__76
+                // InternalScope.g:1:394: T__76
                 {
                 mT__76(); 
 
                 }
                 break;
             case 66 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:400: T__77
+                // InternalScope.g:1:400: T__77
                 {
                 mT__77(); 
 
                 }
                 break;
             case 67 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:406: T__78
+                // InternalScope.g:1:406: T__78
                 {
                 mT__78(); 
 
                 }
                 break;
             case 68 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:412: T__79
+                // InternalScope.g:1:412: T__79
                 {
                 mT__79(); 
 
                 }
                 break;
             case 69 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:418: T__80
+                // InternalScope.g:1:418: T__80
                 {
                 mT__80(); 
 
                 }
                 break;
             case 70 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:424: T__81
+                // InternalScope.g:1:424: T__81
                 {
                 mT__81(); 
 
                 }
                 break;
             case 71 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:430: T__82
+                // InternalScope.g:1:430: T__82
                 {
                 mT__82(); 
 
                 }
                 break;
             case 72 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:436: T__83
+                // InternalScope.g:1:436: T__83
                 {
                 mT__83(); 
 
                 }
                 break;
             case 73 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:442: T__84
+                // InternalScope.g:1:442: T__84
                 {
                 mT__84(); 
 
                 }
                 break;
             case 74 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:448: T__85
+                // InternalScope.g:1:448: T__85
                 {
                 mT__85(); 
 
                 }
                 break;
             case 75 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:454: T__86
+                // InternalScope.g:1:454: T__86
                 {
                 mT__86(); 
 
                 }
                 break;
             case 76 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:460: RULE_REAL
+                // InternalScope.g:1:460: RULE_REAL
                 {
                 mRULE_REAL(); 
 
                 }
                 break;
             case 77 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:470: RULE_ID
+                // InternalScope.g:1:470: RULE_ID
                 {
                 mRULE_ID(); 
 
                 }
                 break;
             case 78 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:478: RULE_INT
+                // InternalScope.g:1:478: RULE_INT
                 {
                 mRULE_INT(); 
 
                 }
                 break;
             case 79 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:487: RULE_STRING
+                // InternalScope.g:1:487: RULE_STRING
                 {
                 mRULE_STRING(); 
 
                 }
                 break;
             case 80 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:499: RULE_ML_COMMENT
+                // InternalScope.g:1:499: RULE_ML_COMMENT
                 {
                 mRULE_ML_COMMENT(); 
 
                 }
                 break;
             case 81 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:515: RULE_SL_COMMENT
+                // InternalScope.g:1:515: RULE_SL_COMMENT
                 {
                 mRULE_SL_COMMENT(); 
 
                 }
                 break;
             case 82 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:531: RULE_WS
+                // InternalScope.g:1:531: RULE_WS
                 {
                 mRULE_WS(); 
 
                 }
                 break;
             case 83 :
-                // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1:539: RULE_ANY_OTHER
+                // InternalScope.g:1:539: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -2826,103 +2826,19 @@ public void mTokens() throws RecognitionException {
 
     protected DFA14 dfa14 = new DFA14(this);
     static final String DFA14_eotS =
-        "\1\uffff\1\61\1\63\1\66\1\70\1\uffff\1\73\1\uffff\1\77\15\102\10"+
-        "\uffff\1\145\1\uffff\3\102\1\155\1\156\1\102\1\uffff\1\102\1\57"+
-        "\1\164\1\57\1\uffff\2\57\22\uffff\2\102\1\uffff\26\102\1\u0097\1"+
-        "\102\1\u0099\13\uffff\5\102\4\uffff\1\102\1\uffff\1\102\2\uffff"+
-        "\1\164\2\uffff\20\102\1\u00b1\12\102\1\u00bc\3\102\1\uffff\1\102"+
-        "\1\uffff\1\u00c2\4\102\1\u00c7\3\102\1\u00cb\12\102\1\u00d7\2\102"+
-        "\1\uffff\1\u00da\3\102\1\u00de\1\u00df\1\u00e0\2\102\1\u00e3\1\uffff"+
-        "\4\102\1\u00e8\1\uffff\1\102\1\u00ea\2\102\1\uffff\3\102\1\uffff"+
-        "\4\102\1\u00f5\6\102\1\uffff\2\102\1\uffff\1\102\1\u00ff\1\102\3"+
-        "\uffff\2\102\1\uffff\4\102\1\uffff\1\102\1\uffff\5\102\1\u010e\1"+
-        "\102\1\u0110\2\102\1\uffff\1\u0113\1\u0114\1\102\1\u0116\1\102\1"+
-        "\u0118\1\102\1\u011a\1\u011b\1\uffff\4\102\1\u0120\1\u0121\1\102"+
-        "\1\u0123\3\102\1\u0127\1\u0128\1\102\1\uffff\1\102\1\uffff\1\u012b"+
-        "\1\u012c\2\uffff\1\102\1\uffff\1\102\1\uffff\1\102\2\uffff\1\u0130"+
-        "\3\102\2\uffff\1\u0134\1\uffff\1\u0135\1\u0136\1\102\2\uffff\2\102"+
-        "\2\uffff\3\102\1\uffff\3\102\3\uffff\2\102\1\u0142\1\u0143\1\u0144"+
-        "\1\u0145\3\102\1\u0149\1\102\4\uffff\1\u014b\1\u014c\1\102\1\uffff"+
-        "\1\u014e\2\uffff\1\u014f\2\uffff";
+        "\1\uffff\1\61\1\63\1\66\1\70\1\uffff\1\73\1\uffff\1\77\15\102\10\uffff\1\145\1\uffff\3\102\1\155\1\156\1\102\1\uffff\1\102\1\57\1\164\1\57\1\uffff\2\57\22\uffff\2\102\1\uffff\26\102\1\u0097\1\102\1\u0099\13\uffff\5\102\4\uffff\1\102\1\uffff\1\102\2\uffff\1\164\2\uffff\20\102\1\u00b1\12\102\1\u00bc\3\102\1\uffff\1\102\1\uffff\1\u00c2\4\102\1\u00c7\3\102\1\u00cb\12\102\1\u00d7\2\102\1\uffff\1\u00da\3\102\1\u00de\1\u00df\1\u00e0\2\102\1\u00e3\1\uffff\4\102\1\u00e8\1\uffff\1\102\1\u00ea\2\102\1\uffff\3\102\1\uffff\4\102\1\u00f5\6\102\1\uffff\2\102\1\uffff\1\102\1\u00ff\1\102\3\uffff\2\102\1\uffff\4\102\1\uffff\1\102\1\uffff\5\102\1\u010e\1\102\1\u0110\2\102\1\uffff\1\u0113\1\u0114\1\102\1\u0116\1\102\1\u0118\1\102\1\u011a\1\u011b\1\uffff\4\102\1\u0120\1\u0121\1\102\1\u0123\3\102\1\u0127\1\u0128\1\102\1\uffff\1\102\1\uffff\1\u012b\1\u012c\2\uffff\1\102\1\uffff\1\102\1\uffff\1\102\2\uffff\1\u0130\3\102\2\uffff\1\u0134\1\uffff\1\u0135\1\u0136\1\102\2\uffff\2\102\2\uffff\3\102\1\uffff\3\102\3\uffff\2\102\1\u0142\1\u0143\1\u0144\1\u0145\3\102\1\u0149\1\102\4\uffff\1\u014b\1\u014c\1\102\1\uffff\1\u014e\2\uffff\1\u014f\2\uffff";
     static final String DFA14_eofS =
         "\u0150\uffff";
     static final String DFA14_minS =
-        "\1\0\4\75\1\uffff\1\76\1\uffff\1\52\1\141\1\143\1\145\1\154\2\141"+
-        "\1\150\1\157\1\151\1\145\1\146\1\151\1\163\10\uffff\1\174\1\uffff"+
-        "\1\145\1\162\1\141\1\72\1\60\1\145\1\uffff\1\114\1\46\1\56\1\101"+
-        "\1\uffff\2\0\22\uffff\1\154\1\163\1\uffff\1\154\1\162\1\157\1\151"+
-        "\1\143\1\151\1\163\1\164\1\155\1\167\1\154\1\162\1\143\1\156\1\165"+
-        "\1\145\1\160\1\154\1\163\1\164\1\152\1\160\1\60\1\164\1\60\13\uffff"+
-        "\1\171\1\145\1\164\1\155\1\146\4\uffff\1\164\1\uffff\1\117\2\uffff"+
-        "\1\56\2\uffff\1\154\1\164\2\145\1\163\1\164\1\160\1\164\1\145\1"+
-        "\165\1\163\1\145\1\157\1\145\1\105\1\151\1\60\1\154\1\101\1\163"+
-        "\1\164\1\144\1\145\1\156\1\145\1\154\1\164\1\60\2\145\1\154\1\uffff"+
-        "\1\150\1\uffff\1\60\1\146\3\141\1\60\1\102\2\145\1\60\1\143\1\151"+
-        "\1\102\1\145\2\143\1\162\1\164\1\156\1\162\1\60\1\170\1\156\1\uffff"+
-        "\1\60\1\154\1\145\1\157\3\60\1\123\1\145\1\60\1\uffff\1\156\1\143"+
-        "\1\162\1\151\1\60\1\uffff\1\151\1\60\1\151\1\165\1\uffff\1\101\1"+
-        "\143\1\170\1\uffff\2\164\1\171\1\156\1\60\1\150\1\164\3\163\1\164"+
-        "\1\uffff\1\151\1\147\1\uffff\1\154\1\60\1\162\3\uffff\1\145\1\143"+
-        "\1\uffff\1\163\2\164\1\145\1\uffff\1\170\1\uffff\1\156\1\154\1\114"+
-        "\2\164\1\60\1\151\1\60\1\147\1\146\1\uffff\2\60\1\151\1\60\1\151"+
-        "\1\60\1\163\2\60\1\uffff\1\171\1\154\1\164\1\151\2\60\1\163\1\60"+
-        "\1\163\1\164\1\126\2\60\1\151\1\uffff\1\166\1\uffff\2\60\2\uffff"+
-        "\1\166\1\uffff\1\157\1\uffff\1\164\2\uffff\1\60\1\145\1\151\1\164"+
-        "\2\uffff\1\60\1\uffff\2\60\1\101\2\uffff\1\162\1\145\2\uffff\1\145"+
-        "\1\156\1\163\1\uffff\1\143\1\157\1\151\3\uffff\1\122\1\163\4\60"+
-        "\1\164\1\156\1\166\1\60\1\164\4\uffff\2\60\1\145\1\uffff\1\60\2"+
-        "\uffff\1\60\2\uffff";
+        "\1\0\4\75\1\uffff\1\76\1\uffff\1\52\1\141\1\143\1\145\1\154\2\141\1\150\1\157\1\151\1\145\1\146\1\151\1\163\10\uffff\1\174\1\uffff\1\145\1\162\1\141\1\72\1\60\1\145\1\uffff\1\114\1\46\1\56\1\101\1\uffff\2\0\22\uffff\1\154\1\163\1\uffff\1\154\1\162\1\157\1\151\1\143\1\151\1\163\1\164\1\155\1\167\1\154\1\162\1\143\1\156\1\165\1\145\1\160\1\154\1\163\1\164\1\152\1\160\1\60\1\164\1\60\13\uffff\1\171\1\145\1\164\1\155\1\146\4\uffff\1\164\1\uffff\1\117\2\uffff\1\56\2\uffff\1\154\1\164\2\145\1\163\1\164\1\160\1\164\1\145\1\165\1\163\1\145\1\157\1\145\1\105\1\151\1\60\1\154\1\101\1\163\1\164\1\144\1\145\1\156\1\145\1\154\1\164\1\60\2\145\1\154\1\uffff\1\150\1\uffff\1\60\1\146\3\141\1\60\1\102\2\145\1\60\1\143\1\151\1\102\1\145\2\143\1\162\1\164\1\156\1\162\1\60\1\170\1\156\1\uffff\1\60\1\154\1\145\1\157\3\60\1\123\1\145\1\60\1\uffff\1\156\1\143\1\162\1\151\1\60\1\uffff\1\151\1\60\1\151\1\165\1\uffff\1\101\1\143\1\170\1\uffff\2\164\1\171\1\156\1\60\1\150\1\164\3\163\1\164\1\uffff\1\151\1\147\1\uffff\1\154\1\60\1\162\3\uffff\1\145\1\143\1\uffff\1\163\2\164\1\145\1\uffff\1\170\1\uffff\1\156\1\154\1\114\2\164\1\60\1\151\1\60\1\147\1\146\1\uffff\2\60\1\151\1\60\1\151\1\60\1\163\2\60\1\uffff\1\171\1\154\1\164\1\151\2\60\1\163\1\60\1\163\1\164\1\126\2\60\1\151\1\uffff\1\166\1\uffff\2\60\2\uffff\1\166\1\uffff\1\157\1\uffff\1\164\2\uffff\1\60\1\145\1\151\1\164\2\uffff\1\60\1\uffff\2\60\1\101\2\uffff\1\162\1\145\2\uffff\1\145\1\156\1\163\1\uffff\1\143\1\157\1\151\3\uffff\1\122\1\163\4\60\1\164\1\156\1\166\1\60\1\164\4\uffff\2\60\1\145\1\uffff\1\60\2\uffff\1\60\2\uffff";
     static final String DFA14_maxS =
-        "\1\uffff\2\75\1\76\1\75\1\uffff\1\76\1\uffff\1\57\1\157\1\167\1"+
-        "\145\1\170\1\165\1\157\1\171\1\157\1\151\1\145\1\156\1\151\1\163"+
-        "\10\uffff\1\174\1\uffff\1\145\1\162\1\157\1\72\1\71\1\145\1\uffff"+
-        "\1\114\1\46\1\71\1\172\1\uffff\2\uffff\22\uffff\1\156\1\163\1\uffff"+
-        "\1\156\1\162\1\157\1\151\1\152\1\164\1\163\1\164\1\155\1\167\1\154"+
-        "\1\162\1\154\1\156\1\165\1\145\1\160\1\154\1\163\1\164\1\163\1\160"+
-        "\1\172\1\164\1\172\13\uffff\1\171\1\145\1\164\1\155\1\146\4\uffff"+
-        "\1\164\1\uffff\1\117\2\uffff\1\71\2\uffff\1\154\1\164\2\145\1\163"+
-        "\1\164\1\160\1\164\1\145\1\165\1\163\1\145\1\157\1\145\1\105\1\151"+
-        "\1\172\1\154\1\101\1\163\1\164\1\144\1\145\1\156\1\145\1\154\1\164"+
-        "\1\172\2\145\1\157\1\uffff\1\150\1\uffff\1\172\1\146\3\141\1\172"+
-        "\1\102\2\145\1\172\1\143\1\151\1\102\1\151\2\143\1\162\1\164\1\156"+
-        "\1\162\1\172\1\170\1\156\1\uffff\1\172\1\154\1\145\1\157\3\172\1"+
-        "\123\1\145\1\172\1\uffff\1\156\1\143\1\162\1\151\1\172\1\uffff\1"+
-        "\151\1\172\1\151\1\165\1\uffff\1\101\1\143\1\170\1\uffff\2\164\1"+
-        "\171\1\156\1\172\1\150\1\164\3\163\1\164\1\uffff\1\151\1\147\1\uffff"+
-        "\1\154\1\172\1\162\3\uffff\1\145\1\143\1\uffff\1\163\2\164\1\145"+
-        "\1\uffff\1\170\1\uffff\1\156\1\154\1\114\2\164\1\172\1\151\1\172"+
-        "\1\147\1\146\1\uffff\2\172\1\151\1\172\1\151\1\172\1\163\2\172\1"+
-        "\uffff\1\171\1\154\1\164\1\151\2\172\1\163\1\172\1\163\1\164\1\126"+
-        "\2\172\1\151\1\uffff\1\166\1\uffff\2\172\2\uffff\1\166\1\uffff\1"+
-        "\157\1\uffff\1\164\2\uffff\1\172\1\145\1\151\1\164\2\uffff\1\172"+
-        "\1\uffff\2\172\1\101\2\uffff\1\162\1\145\2\uffff\1\145\1\156\1\163"+
-        "\1\uffff\1\143\1\157\1\151\3\uffff\1\122\1\163\4\172\1\164\1\156"+
-        "\1\166\1\172\1\164\4\uffff\2\172\1\145\1\uffff\1\172\2\uffff\1\172"+
-        "\2\uffff";
+        "\1\uffff\2\75\1\76\1\75\1\uffff\1\76\1\uffff\1\57\1\157\1\167\1\145\1\170\1\165\1\157\1\171\1\157\1\151\1\145\1\156\1\151\1\163\10\uffff\1\174\1\uffff\1\145\1\162\1\157\1\72\1\71\1\145\1\uffff\1\114\1\46\1\71\1\172\1\uffff\2\uffff\22\uffff\1\156\1\163\1\uffff\1\156\1\162\1\157\1\151\1\152\1\164\1\163\1\164\1\155\1\167\1\154\1\162\1\154\1\156\1\165\1\145\1\160\1\154\1\163\1\164\1\163\1\160\1\172\1\164\1\172\13\uffff\1\171\1\145\1\164\1\155\1\146\4\uffff\1\164\1\uffff\1\117\2\uffff\1\71\2\uffff\1\154\1\164\2\145\1\163\1\164\1\160\1\164\1\145\1\165\1\163\1\145\1\157\1\145\1\105\1\151\1\172\1\154\1\101\1\163\1\164\1\144\1\145\1\156\1\145\1\154\1\164\1\172\2\145\1\157\1\uffff\1\150\1\uffff\1\172\1\146\3\141\1\172\1\102\2\145\1\172\1\143\1\151\1\102\1\151\2\143\1\162\1\164\1\156\1\162\1\172\1\170\1\156\1\uffff\1\172\1\154\1\145\1\157\3\172\1\123\1\145\1\172\1\uffff\1\156\1\143\1\162\1\151\1\172\1\uffff\1\151\1\172\1\151\1\165\1\uffff\1\101\1\143\1\170\1\uffff\2\164\1\171\1\156\1\172\1\150\1\164\3\163\1\164\1\uffff\1\151\1\147\1\uffff\1\154\1\172\1\162\3\uffff\1\145\1\143\1\uffff\1\163\2\164\1\145\1\uffff\1\170\1\uffff\1\156\1\154\1\114\2\164\1\172\1\151\1\172\1\147\1\146\1\uffff\2\172\1\151\1\172\1\151\1\172\1\163\2\172\1\uffff\1\171\1\154\1\164\1\151\2\172\1\163\1\172\1\163\1\164\1\126\2\172\1\151\1\uffff\1\166\1\uffff\2\172\2\uffff\1\166\1\uffff\1\157\1\uffff\1\164\2\uffff\1\172\1\145\1\151\1\164\2\uffff\1\172\1\uffff\2\172\1\101\2\uffff\1\162\1\145\2\uffff\1\145\1\156\1\163\1\uffff\1\143\1\157\1\151\3\uffff\1\122\1\163\4\172\1\164\1\156\1\166\1\172\1\164\4\uffff\2\172\1\145\1\uffff\1\172\2\uffff\1\172\2\uffff";
     static final String DFA14_acceptS =
-        "\5\uffff\1\7\1\uffff\1\11\16\uffff\1\42\1\43\1\46\1\50\1\51\1\52"+
-        "\1\55\1\56\1\uffff\1\62\6\uffff\1\75\4\uffff\1\115\2\uffff\1\122"+
-        "\1\123\1\1\1\45\1\2\1\13\1\3\1\54\1\5\1\4\1\6\1\7\1\74\1\10\1\11"+
-        "\1\120\1\121\1\12\2\uffff\1\115\31\uffff\1\42\1\43\1\46\1\50\1\51"+
-        "\1\52\1\55\1\56\1\107\1\57\1\62\5\uffff\1\70\1\73\1\71\1\114\1\uffff"+
-        "\1\75\1\uffff\1\110\1\116\1\uffff\1\117\1\122\37\uffff\1\76\1\uffff"+
-        "\1\36\27\uffff\1\104\12\uffff\1\30\5\uffff\1\64\4\uffff\1\72\3\uffff"+
-        "\1\44\13\uffff\1\100\2\uffff\1\113\3\uffff\1\63\1\24\1\77\2\uffff"+
-        "\1\27\4\uffff\1\34\1\uffff\1\66\12\uffff\1\47\11\uffff\1\25\16\uffff"+
-        "\1\15\1\uffff\1\22\2\uffff\1\101\1\17\1\uffff\1\20\1\uffff\1\106"+
-        "\1\uffff\1\41\1\23\4\uffff\1\40\1\35\1\uffff\1\65\3\uffff\1\14\1"+
-        "\53\2\uffff\1\33\1\61\3\uffff\1\60\3\uffff\1\111\1\67\1\102\13\uffff"+
-        "\1\31\1\105\1\37\1\21\3\uffff\1\103\1\uffff\1\112\1\26\1\uffff\1"+
-        "\16\1\32";
+        "\5\uffff\1\7\1\uffff\1\11\16\uffff\1\42\1\43\1\46\1\50\1\51\1\52\1\55\1\56\1\uffff\1\62\6\uffff\1\75\4\uffff\1\115\2\uffff\1\122\1\123\1\1\1\45\1\2\1\13\1\3\1\54\1\5\1\4\1\6\1\7\1\74\1\10\1\11\1\120\1\121\1\12\2\uffff\1\115\31\uffff\1\42\1\43\1\46\1\50\1\51\1\52\1\55\1\56\1\107\1\57\1\62\5\uffff\1\70\1\73\1\71\1\114\1\uffff\1\75\1\uffff\1\110\1\116\1\uffff\1\117\1\122\37\uffff\1\76\1\uffff\1\36\27\uffff\1\104\12\uffff\1\30\5\uffff\1\64\4\uffff\1\72\3\uffff\1\44\13\uffff\1\100\2\uffff\1\113\3\uffff\1\63\1\24\1\77\2\uffff\1\27\4\uffff\1\34\1\uffff\1\66\12\uffff\1\47\11\uffff\1\25\16\uffff\1\15\1\uffff\1\22\2\uffff\1\101\1\17\1\uffff\1\20\1\uffff\1\106\1\uffff\1\41\1\23\4\uffff\1\40\1\35\1\uffff\1\65\3\uffff\1\14\1\53\2\uffff\1\33\1\61\3\uffff\1\60\3\uffff\1\111\1\67\1\102\13\uffff\1\31\1\105\1\37\1\21\3\uffff\1\103\1\uffff\1\112\1\26\1\uffff\1\16\1\32";
     static final String DFA14_specialS =
         "\1\0\53\uffff\1\1\1\2\u0122\uffff}>";
     static final String[] DFA14_transitionS = {
-            "\11\57\2\56\2\57\1\56\22\57\1\56\1\2\1\54\1\33\2\57\1\50\1"+
-            "\55\1\31\1\32\1\7\1\5\1\37\1\6\1\44\1\10\12\51\1\43\1\30\1\4"+
-            "\1\1\1\3\1\46\1\57\2\53\1\20\3\53\1\47\4\53\1\21\6\53\1\22\7"+
-            "\53\1\34\1\57\1\35\1\52\1\53\1\57\1\25\1\53\1\11\1\42\1\14\1"+
-            "\16\2\53\1\23\1\53\1\40\1\45\1\53\1\15\1\53\1\41\1\53\1\13\1"+
-            "\12\1\17\2\53\1\24\3\53\1\26\1\36\1\27\uff82\57",
+            "\11\57\2\56\2\57\1\56\22\57\1\56\1\2\1\54\1\33\2\57\1\50\1\55\1\31\1\32\1\7\1\5\1\37\1\6\1\44\1\10\12\51\1\43\1\30\1\4\1\1\1\3\1\46\1\57\2\53\1\20\3\53\1\47\4\53\1\21\6\53\1\22\7\53\1\34\1\57\1\35\1\52\1\53\1\57\1\25\1\53\1\11\1\42\1\14\1\16\2\53\1\23\1\53\1\40\1\45\1\53\1\15\1\53\1\41\1\53\1\13\1\12\1\17\2\53\1\24\3\53\1\26\1\36\1\27\uff82\57",
             "\1\60",
             "\1\62",
             "\1\64\1\65",
@@ -3130,8 +3046,7 @@ public void mTokens() throws RecognitionException {
             "\1\u00f1",
             "\1\u00f2",
             "\1\u00f3",
-            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\16\102\1\u00f4"+
-            "\13\102",
+            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\16\102\1\u00f4\13\102",
             "\1\u00f6",
             "\1\u00f7",
             "\1\u00f8",
@@ -3163,8 +3078,7 @@ public void mTokens() throws RecognitionException {
             "\1\u010a",
             "\1\u010b",
             "\1\u010c",
-            "\12\102\7\uffff\5\102\1\u010d\24\102\4\uffff\1\102\1\uffff"+
-            "\32\102",
+            "\12\102\7\uffff\5\102\1\u010d\24\102\4\uffff\1\102\1\uffff\32\102",
             "\1\u010f",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
             "\1\u0111",
diff --git a/com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScopeParser.java b/com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScopeParser.java
index 096cefdfc..3bfebce74 100644
--- a/com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScopeParser.java
+++ b/com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScopeParser.java
@@ -124,7 +124,7 @@ public InternalScopeParser(TokenStream input, RecognizerSharedState state) {
         
 
     public String[] getTokenNames() { return InternalScopeParser.tokenNames; }
-    public String getGrammarFileName() { return "../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g"; }
+    public String getGrammarFileName() { return "InternalScope.g"; }
 
 
      
@@ -148,16 +148,16 @@ protected String getValueForTokenName(String tokenName) {
 
 
     // $ANTLR start "entryRuleScopeModel"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:61:1: entryRuleScopeModel : ruleScopeModel EOF ;
+    // InternalScope.g:61:1: entryRuleScopeModel : ruleScopeModel EOF ;
     public final void entryRuleScopeModel() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:62:1: ( ruleScopeModel EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:63:1: ruleScopeModel EOF
+            // InternalScope.g:62:1: ( ruleScopeModel EOF )
+            // InternalScope.g:63:1: ruleScopeModel EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeModelRule()); 
             }
-            pushFollow(FOLLOW_ruleScopeModel_in_entryRuleScopeModel67);
+            pushFollow(FOLLOW_1);
             ruleScopeModel();
 
             state._fsp--;
@@ -165,7 +165,7 @@ public final void entryRuleScopeModel() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getScopeModelRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleScopeModel74); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -182,25 +182,25 @@ public final void entryRuleScopeModel() throws RecognitionException {
 
 
     // $ANTLR start "ruleScopeModel"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:70:1: ruleScopeModel : ( ( rule__ScopeModel__Group__0 ) ) ;
+    // InternalScope.g:70:1: ruleScopeModel : ( ( rule__ScopeModel__Group__0 ) ) ;
     public final void ruleScopeModel() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:74:2: ( ( ( rule__ScopeModel__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:75:1: ( ( rule__ScopeModel__Group__0 ) )
+            // InternalScope.g:74:2: ( ( ( rule__ScopeModel__Group__0 ) ) )
+            // InternalScope.g:75:1: ( ( rule__ScopeModel__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:75:1: ( ( rule__ScopeModel__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:76:1: ( rule__ScopeModel__Group__0 )
+            // InternalScope.g:75:1: ( ( rule__ScopeModel__Group__0 ) )
+            // InternalScope.g:76:1: ( rule__ScopeModel__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeModelAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:77:1: ( rule__ScopeModel__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:77:2: rule__ScopeModel__Group__0
+            // InternalScope.g:77:1: ( rule__ScopeModel__Group__0 )
+            // InternalScope.g:77:2: rule__ScopeModel__Group__0
             {
-            pushFollow(FOLLOW_rule__ScopeModel__Group__0_in_ruleScopeModel100);
+            pushFollow(FOLLOW_2);
             rule__ScopeModel__Group__0();
 
             state._fsp--;
@@ -233,16 +233,16 @@ public final void ruleScopeModel() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleImport"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:89:1: entryRuleImport : ruleImport EOF ;
+    // InternalScope.g:89:1: entryRuleImport : ruleImport EOF ;
     public final void entryRuleImport() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:90:1: ( ruleImport EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:91:1: ruleImport EOF
+            // InternalScope.g:90:1: ( ruleImport EOF )
+            // InternalScope.g:91:1: ruleImport EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImportRule()); 
             }
-            pushFollow(FOLLOW_ruleImport_in_entryRuleImport127);
+            pushFollow(FOLLOW_1);
             ruleImport();
 
             state._fsp--;
@@ -250,7 +250,7 @@ public final void entryRuleImport() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getImportRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleImport134); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -267,25 +267,25 @@ public final void entryRuleImport() throws RecognitionException {
 
 
     // $ANTLR start "ruleImport"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:98:1: ruleImport : ( ( rule__Import__Group__0 ) ) ;
+    // InternalScope.g:98:1: ruleImport : ( ( rule__Import__Group__0 ) ) ;
     public final void ruleImport() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:102:2: ( ( ( rule__Import__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:103:1: ( ( rule__Import__Group__0 ) )
+            // InternalScope.g:102:2: ( ( ( rule__Import__Group__0 ) ) )
+            // InternalScope.g:103:1: ( ( rule__Import__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:103:1: ( ( rule__Import__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:104:1: ( rule__Import__Group__0 )
+            // InternalScope.g:103:1: ( ( rule__Import__Group__0 ) )
+            // InternalScope.g:104:1: ( rule__Import__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImportAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:105:1: ( rule__Import__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:105:2: rule__Import__Group__0
+            // InternalScope.g:105:1: ( rule__Import__Group__0 )
+            // InternalScope.g:105:2: rule__Import__Group__0
             {
-            pushFollow(FOLLOW_rule__Import__Group__0_in_ruleImport160);
+            pushFollow(FOLLOW_2);
             rule__Import__Group__0();
 
             state._fsp--;
@@ -318,16 +318,16 @@ public final void ruleImport() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleExtension"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:117:1: entryRuleExtension : ruleExtension EOF ;
+    // InternalScope.g:117:1: entryRuleExtension : ruleExtension EOF ;
     public final void entryRuleExtension() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:118:1: ( ruleExtension EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:119:1: ruleExtension EOF
+            // InternalScope.g:118:1: ( ruleExtension EOF )
+            // InternalScope.g:119:1: ruleExtension EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExtensionRule()); 
             }
-            pushFollow(FOLLOW_ruleExtension_in_entryRuleExtension187);
+            pushFollow(FOLLOW_1);
             ruleExtension();
 
             state._fsp--;
@@ -335,7 +335,7 @@ public final void entryRuleExtension() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExtensionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleExtension194); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -352,25 +352,25 @@ public final void entryRuleExtension() throws RecognitionException {
 
 
     // $ANTLR start "ruleExtension"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:126:1: ruleExtension : ( ( rule__Extension__Group__0 ) ) ;
+    // InternalScope.g:126:1: ruleExtension : ( ( rule__Extension__Group__0 ) ) ;
     public final void ruleExtension() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:130:2: ( ( ( rule__Extension__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:131:1: ( ( rule__Extension__Group__0 ) )
+            // InternalScope.g:130:2: ( ( ( rule__Extension__Group__0 ) ) )
+            // InternalScope.g:131:1: ( ( rule__Extension__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:131:1: ( ( rule__Extension__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:132:1: ( rule__Extension__Group__0 )
+            // InternalScope.g:131:1: ( ( rule__Extension__Group__0 ) )
+            // InternalScope.g:132:1: ( rule__Extension__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExtensionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:133:1: ( rule__Extension__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:133:2: rule__Extension__Group__0
+            // InternalScope.g:133:1: ( rule__Extension__Group__0 )
+            // InternalScope.g:133:2: rule__Extension__Group__0
             {
-            pushFollow(FOLLOW_rule__Extension__Group__0_in_ruleExtension220);
+            pushFollow(FOLLOW_2);
             rule__Extension__Group__0();
 
             state._fsp--;
@@ -403,16 +403,16 @@ public final void ruleExtension() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleInjection"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:145:1: entryRuleInjection : ruleInjection EOF ;
+    // InternalScope.g:145:1: entryRuleInjection : ruleInjection EOF ;
     public final void entryRuleInjection() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:146:1: ( ruleInjection EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:147:1: ruleInjection EOF
+            // InternalScope.g:146:1: ( ruleInjection EOF )
+            // InternalScope.g:147:1: ruleInjection EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInjectionRule()); 
             }
-            pushFollow(FOLLOW_ruleInjection_in_entryRuleInjection247);
+            pushFollow(FOLLOW_1);
             ruleInjection();
 
             state._fsp--;
@@ -420,7 +420,7 @@ public final void entryRuleInjection() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInjectionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInjection254); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -437,25 +437,25 @@ public final void entryRuleInjection() throws RecognitionException {
 
 
     // $ANTLR start "ruleInjection"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:154:1: ruleInjection : ( ( rule__Injection__Group__0 ) ) ;
+    // InternalScope.g:154:1: ruleInjection : ( ( rule__Injection__Group__0 ) ) ;
     public final void ruleInjection() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:158:2: ( ( ( rule__Injection__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:159:1: ( ( rule__Injection__Group__0 ) )
+            // InternalScope.g:158:2: ( ( ( rule__Injection__Group__0 ) ) )
+            // InternalScope.g:159:1: ( ( rule__Injection__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:159:1: ( ( rule__Injection__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:160:1: ( rule__Injection__Group__0 )
+            // InternalScope.g:159:1: ( ( rule__Injection__Group__0 ) )
+            // InternalScope.g:160:1: ( rule__Injection__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInjectionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:161:1: ( rule__Injection__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:161:2: rule__Injection__Group__0
+            // InternalScope.g:161:1: ( rule__Injection__Group__0 )
+            // InternalScope.g:161:2: rule__Injection__Group__0
             {
-            pushFollow(FOLLOW_rule__Injection__Group__0_in_ruleInjection280);
+            pushFollow(FOLLOW_2);
             rule__Injection__Group__0();
 
             state._fsp--;
@@ -488,16 +488,16 @@ public final void ruleInjection() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleNamingSection"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:173:1: entryRuleNamingSection : ruleNamingSection EOF ;
+    // InternalScope.g:173:1: entryRuleNamingSection : ruleNamingSection EOF ;
     public final void entryRuleNamingSection() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:174:1: ( ruleNamingSection EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:175:1: ruleNamingSection EOF
+            // InternalScope.g:174:1: ( ruleNamingSection EOF )
+            // InternalScope.g:175:1: ruleNamingSection EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamingSectionRule()); 
             }
-            pushFollow(FOLLOW_ruleNamingSection_in_entryRuleNamingSection307);
+            pushFollow(FOLLOW_1);
             ruleNamingSection();
 
             state._fsp--;
@@ -505,7 +505,7 @@ public final void entryRuleNamingSection() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getNamingSectionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNamingSection314); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -522,25 +522,25 @@ public final void entryRuleNamingSection() throws RecognitionException {
 
 
     // $ANTLR start "ruleNamingSection"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:182:1: ruleNamingSection : ( ( rule__NamingSection__Group__0 ) ) ;
+    // InternalScope.g:182:1: ruleNamingSection : ( ( rule__NamingSection__Group__0 ) ) ;
     public final void ruleNamingSection() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:186:2: ( ( ( rule__NamingSection__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:187:1: ( ( rule__NamingSection__Group__0 ) )
+            // InternalScope.g:186:2: ( ( ( rule__NamingSection__Group__0 ) ) )
+            // InternalScope.g:187:1: ( ( rule__NamingSection__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:187:1: ( ( rule__NamingSection__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:188:1: ( rule__NamingSection__Group__0 )
+            // InternalScope.g:187:1: ( ( rule__NamingSection__Group__0 ) )
+            // InternalScope.g:188:1: ( rule__NamingSection__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamingSectionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:189:1: ( rule__NamingSection__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:189:2: rule__NamingSection__Group__0
+            // InternalScope.g:189:1: ( rule__NamingSection__Group__0 )
+            // InternalScope.g:189:2: rule__NamingSection__Group__0
             {
-            pushFollow(FOLLOW_rule__NamingSection__Group__0_in_ruleNamingSection340);
+            pushFollow(FOLLOW_2);
             rule__NamingSection__Group__0();
 
             state._fsp--;
@@ -573,16 +573,16 @@ public final void ruleNamingSection() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleNamingDefinition"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:201:1: entryRuleNamingDefinition : ruleNamingDefinition EOF ;
+    // InternalScope.g:201:1: entryRuleNamingDefinition : ruleNamingDefinition EOF ;
     public final void entryRuleNamingDefinition() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:202:1: ( ruleNamingDefinition EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:203:1: ruleNamingDefinition EOF
+            // InternalScope.g:202:1: ( ruleNamingDefinition EOF )
+            // InternalScope.g:203:1: ruleNamingDefinition EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamingDefinitionRule()); 
             }
-            pushFollow(FOLLOW_ruleNamingDefinition_in_entryRuleNamingDefinition367);
+            pushFollow(FOLLOW_1);
             ruleNamingDefinition();
 
             state._fsp--;
@@ -590,7 +590,7 @@ public final void entryRuleNamingDefinition() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getNamingDefinitionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNamingDefinition374); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -607,25 +607,25 @@ public final void entryRuleNamingDefinition() throws RecognitionException {
 
 
     // $ANTLR start "ruleNamingDefinition"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:210:1: ruleNamingDefinition : ( ( rule__NamingDefinition__Group__0 ) ) ;
+    // InternalScope.g:210:1: ruleNamingDefinition : ( ( rule__NamingDefinition__Group__0 ) ) ;
     public final void ruleNamingDefinition() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:214:2: ( ( ( rule__NamingDefinition__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:215:1: ( ( rule__NamingDefinition__Group__0 ) )
+            // InternalScope.g:214:2: ( ( ( rule__NamingDefinition__Group__0 ) ) )
+            // InternalScope.g:215:1: ( ( rule__NamingDefinition__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:215:1: ( ( rule__NamingDefinition__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:216:1: ( rule__NamingDefinition__Group__0 )
+            // InternalScope.g:215:1: ( ( rule__NamingDefinition__Group__0 ) )
+            // InternalScope.g:216:1: ( rule__NamingDefinition__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamingDefinitionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:217:1: ( rule__NamingDefinition__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:217:2: rule__NamingDefinition__Group__0
+            // InternalScope.g:217:1: ( rule__NamingDefinition__Group__0 )
+            // InternalScope.g:217:2: rule__NamingDefinition__Group__0
             {
-            pushFollow(FOLLOW_rule__NamingDefinition__Group__0_in_ruleNamingDefinition400);
+            pushFollow(FOLLOW_2);
             rule__NamingDefinition__Group__0();
 
             state._fsp--;
@@ -658,16 +658,16 @@ public final void ruleNamingDefinition() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleScopeDefinition"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:229:1: entryRuleScopeDefinition : ruleScopeDefinition EOF ;
+    // InternalScope.g:229:1: entryRuleScopeDefinition : ruleScopeDefinition EOF ;
     public final void entryRuleScopeDefinition() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:230:1: ( ruleScopeDefinition EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:231:1: ruleScopeDefinition EOF
+            // InternalScope.g:230:1: ( ruleScopeDefinition EOF )
+            // InternalScope.g:231:1: ruleScopeDefinition EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeDefinitionRule()); 
             }
-            pushFollow(FOLLOW_ruleScopeDefinition_in_entryRuleScopeDefinition427);
+            pushFollow(FOLLOW_1);
             ruleScopeDefinition();
 
             state._fsp--;
@@ -675,7 +675,7 @@ public final void entryRuleScopeDefinition() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getScopeDefinitionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleScopeDefinition434); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -692,25 +692,25 @@ public final void entryRuleScopeDefinition() throws RecognitionException {
 
 
     // $ANTLR start "ruleScopeDefinition"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:238:1: ruleScopeDefinition : ( ( rule__ScopeDefinition__Group__0 ) ) ;
+    // InternalScope.g:238:1: ruleScopeDefinition : ( ( rule__ScopeDefinition__Group__0 ) ) ;
     public final void ruleScopeDefinition() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:242:2: ( ( ( rule__ScopeDefinition__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:243:1: ( ( rule__ScopeDefinition__Group__0 ) )
+            // InternalScope.g:242:2: ( ( ( rule__ScopeDefinition__Group__0 ) ) )
+            // InternalScope.g:243:1: ( ( rule__ScopeDefinition__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:243:1: ( ( rule__ScopeDefinition__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:244:1: ( rule__ScopeDefinition__Group__0 )
+            // InternalScope.g:243:1: ( ( rule__ScopeDefinition__Group__0 ) )
+            // InternalScope.g:244:1: ( rule__ScopeDefinition__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeDefinitionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:245:1: ( rule__ScopeDefinition__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:245:2: rule__ScopeDefinition__Group__0
+            // InternalScope.g:245:1: ( rule__ScopeDefinition__Group__0 )
+            // InternalScope.g:245:2: rule__ScopeDefinition__Group__0
             {
-            pushFollow(FOLLOW_rule__ScopeDefinition__Group__0_in_ruleScopeDefinition460);
+            pushFollow(FOLLOW_2);
             rule__ScopeDefinition__Group__0();
 
             state._fsp--;
@@ -743,16 +743,16 @@ public final void ruleScopeDefinition() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleScopeRule"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:257:1: entryRuleScopeRule : ruleScopeRule EOF ;
+    // InternalScope.g:257:1: entryRuleScopeRule : ruleScopeRule EOF ;
     public final void entryRuleScopeRule() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:258:1: ( ruleScopeRule EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:259:1: ruleScopeRule EOF
+            // InternalScope.g:258:1: ( ruleScopeRule EOF )
+            // InternalScope.g:259:1: ruleScopeRule EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeRuleRule()); 
             }
-            pushFollow(FOLLOW_ruleScopeRule_in_entryRuleScopeRule487);
+            pushFollow(FOLLOW_1);
             ruleScopeRule();
 
             state._fsp--;
@@ -760,7 +760,7 @@ public final void entryRuleScopeRule() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getScopeRuleRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleScopeRule494); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -777,25 +777,25 @@ public final void entryRuleScopeRule() throws RecognitionException {
 
 
     // $ANTLR start "ruleScopeRule"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:266:1: ruleScopeRule : ( ( rule__ScopeRule__Group__0 ) ) ;
+    // InternalScope.g:266:1: ruleScopeRule : ( ( rule__ScopeRule__Group__0 ) ) ;
     public final void ruleScopeRule() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:270:2: ( ( ( rule__ScopeRule__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:271:1: ( ( rule__ScopeRule__Group__0 ) )
+            // InternalScope.g:270:2: ( ( ( rule__ScopeRule__Group__0 ) ) )
+            // InternalScope.g:271:1: ( ( rule__ScopeRule__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:271:1: ( ( rule__ScopeRule__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:272:1: ( rule__ScopeRule__Group__0 )
+            // InternalScope.g:271:1: ( ( rule__ScopeRule__Group__0 ) )
+            // InternalScope.g:272:1: ( rule__ScopeRule__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeRuleAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:273:1: ( rule__ScopeRule__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:273:2: rule__ScopeRule__Group__0
+            // InternalScope.g:273:1: ( rule__ScopeRule__Group__0 )
+            // InternalScope.g:273:2: rule__ScopeRule__Group__0
             {
-            pushFollow(FOLLOW_rule__ScopeRule__Group__0_in_ruleScopeRule520);
+            pushFollow(FOLLOW_2);
             rule__ScopeRule__Group__0();
 
             state._fsp--;
@@ -828,16 +828,16 @@ public final void ruleScopeRule() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleScopeContext"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:285:1: entryRuleScopeContext : ruleScopeContext EOF ;
+    // InternalScope.g:285:1: entryRuleScopeContext : ruleScopeContext EOF ;
     public final void entryRuleScopeContext() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:286:1: ( ruleScopeContext EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:287:1: ruleScopeContext EOF
+            // InternalScope.g:286:1: ( ruleScopeContext EOF )
+            // InternalScope.g:287:1: ruleScopeContext EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeContextRule()); 
             }
-            pushFollow(FOLLOW_ruleScopeContext_in_entryRuleScopeContext547);
+            pushFollow(FOLLOW_1);
             ruleScopeContext();
 
             state._fsp--;
@@ -845,7 +845,7 @@ public final void entryRuleScopeContext() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getScopeContextRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleScopeContext554); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -862,25 +862,25 @@ public final void entryRuleScopeContext() throws RecognitionException {
 
 
     // $ANTLR start "ruleScopeContext"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:294:1: ruleScopeContext : ( ( rule__ScopeContext__Group__0 ) ) ;
+    // InternalScope.g:294:1: ruleScopeContext : ( ( rule__ScopeContext__Group__0 ) ) ;
     public final void ruleScopeContext() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:298:2: ( ( ( rule__ScopeContext__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:299:1: ( ( rule__ScopeContext__Group__0 ) )
+            // InternalScope.g:298:2: ( ( ( rule__ScopeContext__Group__0 ) ) )
+            // InternalScope.g:299:1: ( ( rule__ScopeContext__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:299:1: ( ( rule__ScopeContext__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:300:1: ( rule__ScopeContext__Group__0 )
+            // InternalScope.g:299:1: ( ( rule__ScopeContext__Group__0 ) )
+            // InternalScope.g:300:1: ( rule__ScopeContext__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeContextAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:301:1: ( rule__ScopeContext__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:301:2: rule__ScopeContext__Group__0
+            // InternalScope.g:301:1: ( rule__ScopeContext__Group__0 )
+            // InternalScope.g:301:2: rule__ScopeContext__Group__0
             {
-            pushFollow(FOLLOW_rule__ScopeContext__Group__0_in_ruleScopeContext580);
+            pushFollow(FOLLOW_2);
             rule__ScopeContext__Group__0();
 
             state._fsp--;
@@ -913,16 +913,16 @@ public final void ruleScopeContext() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleScopeExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:313:1: entryRuleScopeExpression : ruleScopeExpression EOF ;
+    // InternalScope.g:313:1: entryRuleScopeExpression : ruleScopeExpression EOF ;
     public final void entryRuleScopeExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:314:1: ( ruleScopeExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:315:1: ruleScopeExpression EOF
+            // InternalScope.g:314:1: ( ruleScopeExpression EOF )
+            // InternalScope.g:315:1: ruleScopeExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleScopeExpression_in_entryRuleScopeExpression607);
+            pushFollow(FOLLOW_1);
             ruleScopeExpression();
 
             state._fsp--;
@@ -930,7 +930,7 @@ public final void entryRuleScopeExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getScopeExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleScopeExpression614); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -947,25 +947,25 @@ public final void entryRuleScopeExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleScopeExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:322:1: ruleScopeExpression : ( ( rule__ScopeExpression__Group__0 ) ) ;
+    // InternalScope.g:322:1: ruleScopeExpression : ( ( rule__ScopeExpression__Group__0 ) ) ;
     public final void ruleScopeExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:326:2: ( ( ( rule__ScopeExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:327:1: ( ( rule__ScopeExpression__Group__0 ) )
+            // InternalScope.g:326:2: ( ( ( rule__ScopeExpression__Group__0 ) ) )
+            // InternalScope.g:327:1: ( ( rule__ScopeExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:327:1: ( ( rule__ScopeExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:328:1: ( rule__ScopeExpression__Group__0 )
+            // InternalScope.g:327:1: ( ( rule__ScopeExpression__Group__0 ) )
+            // InternalScope.g:328:1: ( rule__ScopeExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:329:1: ( rule__ScopeExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:329:2: rule__ScopeExpression__Group__0
+            // InternalScope.g:329:1: ( rule__ScopeExpression__Group__0 )
+            // InternalScope.g:329:2: rule__ScopeExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__ScopeExpression__Group__0_in_ruleScopeExpression640);
+            pushFollow(FOLLOW_2);
             rule__ScopeExpression__Group__0();
 
             state._fsp--;
@@ -998,16 +998,16 @@ public final void ruleScopeExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleFactoryExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:341:1: entryRuleFactoryExpression : ruleFactoryExpression EOF ;
+    // InternalScope.g:341:1: entryRuleFactoryExpression : ruleFactoryExpression EOF ;
     public final void entryRuleFactoryExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:342:1: ( ruleFactoryExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:343:1: ruleFactoryExpression EOF
+            // InternalScope.g:342:1: ( ruleFactoryExpression EOF )
+            // InternalScope.g:343:1: ruleFactoryExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFactoryExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleFactoryExpression_in_entryRuleFactoryExpression667);
+            pushFollow(FOLLOW_1);
             ruleFactoryExpression();
 
             state._fsp--;
@@ -1015,7 +1015,7 @@ public final void entryRuleFactoryExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getFactoryExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFactoryExpression674); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1032,25 +1032,25 @@ public final void entryRuleFactoryExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleFactoryExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:350:1: ruleFactoryExpression : ( ( rule__FactoryExpression__Group__0 ) ) ;
+    // InternalScope.g:350:1: ruleFactoryExpression : ( ( rule__FactoryExpression__Group__0 ) ) ;
     public final void ruleFactoryExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:354:2: ( ( ( rule__FactoryExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:355:1: ( ( rule__FactoryExpression__Group__0 ) )
+            // InternalScope.g:354:2: ( ( ( rule__FactoryExpression__Group__0 ) ) )
+            // InternalScope.g:355:1: ( ( rule__FactoryExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:355:1: ( ( rule__FactoryExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:356:1: ( rule__FactoryExpression__Group__0 )
+            // InternalScope.g:355:1: ( ( rule__FactoryExpression__Group__0 ) )
+            // InternalScope.g:356:1: ( rule__FactoryExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFactoryExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:357:1: ( rule__FactoryExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:357:2: rule__FactoryExpression__Group__0
+            // InternalScope.g:357:1: ( rule__FactoryExpression__Group__0 )
+            // InternalScope.g:357:2: rule__FactoryExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__FactoryExpression__Group__0_in_ruleFactoryExpression700);
+            pushFollow(FOLLOW_2);
             rule__FactoryExpression__Group__0();
 
             state._fsp--;
@@ -1083,16 +1083,16 @@ public final void ruleFactoryExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleScopeDelegation"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:369:1: entryRuleScopeDelegation : ruleScopeDelegation EOF ;
+    // InternalScope.g:369:1: entryRuleScopeDelegation : ruleScopeDelegation EOF ;
     public final void entryRuleScopeDelegation() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:370:1: ( ruleScopeDelegation EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:371:1: ruleScopeDelegation EOF
+            // InternalScope.g:370:1: ( ruleScopeDelegation EOF )
+            // InternalScope.g:371:1: ruleScopeDelegation EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeDelegationRule()); 
             }
-            pushFollow(FOLLOW_ruleScopeDelegation_in_entryRuleScopeDelegation727);
+            pushFollow(FOLLOW_1);
             ruleScopeDelegation();
 
             state._fsp--;
@@ -1100,7 +1100,7 @@ public final void entryRuleScopeDelegation() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getScopeDelegationRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleScopeDelegation734); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1117,25 +1117,25 @@ public final void entryRuleScopeDelegation() throws RecognitionException {
 
 
     // $ANTLR start "ruleScopeDelegation"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:378:1: ruleScopeDelegation : ( ( rule__ScopeDelegation__Group__0 ) ) ;
+    // InternalScope.g:378:1: ruleScopeDelegation : ( ( rule__ScopeDelegation__Group__0 ) ) ;
     public final void ruleScopeDelegation() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:382:2: ( ( ( rule__ScopeDelegation__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:383:1: ( ( rule__ScopeDelegation__Group__0 ) )
+            // InternalScope.g:382:2: ( ( ( rule__ScopeDelegation__Group__0 ) ) )
+            // InternalScope.g:383:1: ( ( rule__ScopeDelegation__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:383:1: ( ( rule__ScopeDelegation__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:384:1: ( rule__ScopeDelegation__Group__0 )
+            // InternalScope.g:383:1: ( ( rule__ScopeDelegation__Group__0 ) )
+            // InternalScope.g:384:1: ( rule__ScopeDelegation__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeDelegationAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:385:1: ( rule__ScopeDelegation__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:385:2: rule__ScopeDelegation__Group__0
+            // InternalScope.g:385:1: ( rule__ScopeDelegation__Group__0 )
+            // InternalScope.g:385:2: rule__ScopeDelegation__Group__0
             {
-            pushFollow(FOLLOW_rule__ScopeDelegation__Group__0_in_ruleScopeDelegation760);
+            pushFollow(FOLLOW_2);
             rule__ScopeDelegation__Group__0();
 
             state._fsp--;
@@ -1168,16 +1168,16 @@ public final void ruleScopeDelegation() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleNamedScopeExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:397:1: entryRuleNamedScopeExpression : ruleNamedScopeExpression EOF ;
+    // InternalScope.g:397:1: entryRuleNamedScopeExpression : ruleNamedScopeExpression EOF ;
     public final void entryRuleNamedScopeExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:398:1: ( ruleNamedScopeExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:399:1: ruleNamedScopeExpression EOF
+            // InternalScope.g:398:1: ( ruleNamedScopeExpression EOF )
+            // InternalScope.g:399:1: ruleNamedScopeExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamedScopeExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleNamedScopeExpression_in_entryRuleNamedScopeExpression787);
+            pushFollow(FOLLOW_1);
             ruleNamedScopeExpression();
 
             state._fsp--;
@@ -1185,7 +1185,7 @@ public final void entryRuleNamedScopeExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getNamedScopeExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNamedScopeExpression794); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1202,25 +1202,25 @@ public final void entryRuleNamedScopeExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleNamedScopeExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:406:1: ruleNamedScopeExpression : ( ( rule__NamedScopeExpression__Group__0 ) ) ;
+    // InternalScope.g:406:1: ruleNamedScopeExpression : ( ( rule__NamedScopeExpression__Group__0 ) ) ;
     public final void ruleNamedScopeExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:410:2: ( ( ( rule__NamedScopeExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:411:1: ( ( rule__NamedScopeExpression__Group__0 ) )
+            // InternalScope.g:410:2: ( ( ( rule__NamedScopeExpression__Group__0 ) ) )
+            // InternalScope.g:411:1: ( ( rule__NamedScopeExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:411:1: ( ( rule__NamedScopeExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:412:1: ( rule__NamedScopeExpression__Group__0 )
+            // InternalScope.g:411:1: ( ( rule__NamedScopeExpression__Group__0 ) )
+            // InternalScope.g:412:1: ( rule__NamedScopeExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamedScopeExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:413:1: ( rule__NamedScopeExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:413:2: rule__NamedScopeExpression__Group__0
+            // InternalScope.g:413:1: ( rule__NamedScopeExpression__Group__0 )
+            // InternalScope.g:413:2: rule__NamedScopeExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__NamedScopeExpression__Group__0_in_ruleNamedScopeExpression820);
+            pushFollow(FOLLOW_2);
             rule__NamedScopeExpression__Group__0();
 
             state._fsp--;
@@ -1253,16 +1253,16 @@ public final void ruleNamedScopeExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleGlobalScopeExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:425:1: entryRuleGlobalScopeExpression : ruleGlobalScopeExpression EOF ;
+    // InternalScope.g:425:1: entryRuleGlobalScopeExpression : ruleGlobalScopeExpression EOF ;
     public final void entryRuleGlobalScopeExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:426:1: ( ruleGlobalScopeExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:427:1: ruleGlobalScopeExpression EOF
+            // InternalScope.g:426:1: ( ruleGlobalScopeExpression EOF )
+            // InternalScope.g:427:1: ruleGlobalScopeExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleGlobalScopeExpression_in_entryRuleGlobalScopeExpression847);
+            pushFollow(FOLLOW_1);
             ruleGlobalScopeExpression();
 
             state._fsp--;
@@ -1270,7 +1270,7 @@ public final void entryRuleGlobalScopeExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGlobalScopeExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleGlobalScopeExpression854); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1287,25 +1287,25 @@ public final void entryRuleGlobalScopeExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleGlobalScopeExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:434:1: ruleGlobalScopeExpression : ( ( rule__GlobalScopeExpression__Group__0 ) ) ;
+    // InternalScope.g:434:1: ruleGlobalScopeExpression : ( ( rule__GlobalScopeExpression__Group__0 ) ) ;
     public final void ruleGlobalScopeExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:438:2: ( ( ( rule__GlobalScopeExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:439:1: ( ( rule__GlobalScopeExpression__Group__0 ) )
+            // InternalScope.g:438:2: ( ( ( rule__GlobalScopeExpression__Group__0 ) ) )
+            // InternalScope.g:439:1: ( ( rule__GlobalScopeExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:439:1: ( ( rule__GlobalScopeExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:440:1: ( rule__GlobalScopeExpression__Group__0 )
+            // InternalScope.g:439:1: ( ( rule__GlobalScopeExpression__Group__0 ) )
+            // InternalScope.g:440:1: ( rule__GlobalScopeExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:441:1: ( rule__GlobalScopeExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:441:2: rule__GlobalScopeExpression__Group__0
+            // InternalScope.g:441:1: ( rule__GlobalScopeExpression__Group__0 )
+            // InternalScope.g:441:2: rule__GlobalScopeExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group__0_in_ruleGlobalScopeExpression880);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__Group__0();
 
             state._fsp--;
@@ -1338,16 +1338,16 @@ public final void ruleGlobalScopeExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleDataExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:453:1: entryRuleDataExpression : ruleDataExpression EOF ;
+    // InternalScope.g:453:1: entryRuleDataExpression : ruleDataExpression EOF ;
     public final void entryRuleDataExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:454:1: ( ruleDataExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:455:1: ruleDataExpression EOF
+            // InternalScope.g:454:1: ( ruleDataExpression EOF )
+            // InternalScope.g:455:1: ruleDataExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDataExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleDataExpression_in_entryRuleDataExpression907);
+            pushFollow(FOLLOW_1);
             ruleDataExpression();
 
             state._fsp--;
@@ -1355,7 +1355,7 @@ public final void entryRuleDataExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getDataExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDataExpression914); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1372,25 +1372,25 @@ public final void entryRuleDataExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleDataExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:462:1: ruleDataExpression : ( ( rule__DataExpression__Alternatives ) ) ;
+    // InternalScope.g:462:1: ruleDataExpression : ( ( rule__DataExpression__Alternatives ) ) ;
     public final void ruleDataExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:466:2: ( ( ( rule__DataExpression__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:467:1: ( ( rule__DataExpression__Alternatives ) )
+            // InternalScope.g:466:2: ( ( ( rule__DataExpression__Alternatives ) ) )
+            // InternalScope.g:467:1: ( ( rule__DataExpression__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:467:1: ( ( rule__DataExpression__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:468:1: ( rule__DataExpression__Alternatives )
+            // InternalScope.g:467:1: ( ( rule__DataExpression__Alternatives ) )
+            // InternalScope.g:468:1: ( rule__DataExpression__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDataExpressionAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:469:1: ( rule__DataExpression__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:469:2: rule__DataExpression__Alternatives
+            // InternalScope.g:469:1: ( rule__DataExpression__Alternatives )
+            // InternalScope.g:469:2: rule__DataExpression__Alternatives
             {
-            pushFollow(FOLLOW_rule__DataExpression__Alternatives_in_ruleDataExpression940);
+            pushFollow(FOLLOW_2);
             rule__DataExpression__Alternatives();
 
             state._fsp--;
@@ -1423,16 +1423,16 @@ public final void ruleDataExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleMatchDataExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:481:1: entryRuleMatchDataExpression : ruleMatchDataExpression EOF ;
+    // InternalScope.g:481:1: entryRuleMatchDataExpression : ruleMatchDataExpression EOF ;
     public final void entryRuleMatchDataExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:482:1: ( ruleMatchDataExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:483:1: ruleMatchDataExpression EOF
+            // InternalScope.g:482:1: ( ruleMatchDataExpression EOF )
+            // InternalScope.g:483:1: ruleMatchDataExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMatchDataExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleMatchDataExpression_in_entryRuleMatchDataExpression967);
+            pushFollow(FOLLOW_1);
             ruleMatchDataExpression();
 
             state._fsp--;
@@ -1440,7 +1440,7 @@ public final void entryRuleMatchDataExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getMatchDataExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleMatchDataExpression974); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1457,25 +1457,25 @@ public final void entryRuleMatchDataExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleMatchDataExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:490:1: ruleMatchDataExpression : ( ( rule__MatchDataExpression__Group__0 ) ) ;
+    // InternalScope.g:490:1: ruleMatchDataExpression : ( ( rule__MatchDataExpression__Group__0 ) ) ;
     public final void ruleMatchDataExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:494:2: ( ( ( rule__MatchDataExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:495:1: ( ( rule__MatchDataExpression__Group__0 ) )
+            // InternalScope.g:494:2: ( ( ( rule__MatchDataExpression__Group__0 ) ) )
+            // InternalScope.g:495:1: ( ( rule__MatchDataExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:495:1: ( ( rule__MatchDataExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:496:1: ( rule__MatchDataExpression__Group__0 )
+            // InternalScope.g:495:1: ( ( rule__MatchDataExpression__Group__0 ) )
+            // InternalScope.g:496:1: ( rule__MatchDataExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMatchDataExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:497:1: ( rule__MatchDataExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:497:2: rule__MatchDataExpression__Group__0
+            // InternalScope.g:497:1: ( rule__MatchDataExpression__Group__0 )
+            // InternalScope.g:497:2: rule__MatchDataExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__MatchDataExpression__Group__0_in_ruleMatchDataExpression1000);
+            pushFollow(FOLLOW_2);
             rule__MatchDataExpression__Group__0();
 
             state._fsp--;
@@ -1508,16 +1508,16 @@ public final void ruleMatchDataExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleLambdaDataExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:509:1: entryRuleLambdaDataExpression : ruleLambdaDataExpression EOF ;
+    // InternalScope.g:509:1: entryRuleLambdaDataExpression : ruleLambdaDataExpression EOF ;
     public final void entryRuleLambdaDataExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:510:1: ( ruleLambdaDataExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:511:1: ruleLambdaDataExpression EOF
+            // InternalScope.g:510:1: ( ruleLambdaDataExpression EOF )
+            // InternalScope.g:511:1: ruleLambdaDataExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLambdaDataExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleLambdaDataExpression_in_entryRuleLambdaDataExpression1027);
+            pushFollow(FOLLOW_1);
             ruleLambdaDataExpression();
 
             state._fsp--;
@@ -1525,7 +1525,7 @@ public final void entryRuleLambdaDataExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getLambdaDataExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleLambdaDataExpression1034); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1542,25 +1542,25 @@ public final void entryRuleLambdaDataExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleLambdaDataExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:518:1: ruleLambdaDataExpression : ( ( rule__LambdaDataExpression__Group__0 ) ) ;
+    // InternalScope.g:518:1: ruleLambdaDataExpression : ( ( rule__LambdaDataExpression__Group__0 ) ) ;
     public final void ruleLambdaDataExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:522:2: ( ( ( rule__LambdaDataExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:523:1: ( ( rule__LambdaDataExpression__Group__0 ) )
+            // InternalScope.g:522:2: ( ( ( rule__LambdaDataExpression__Group__0 ) ) )
+            // InternalScope.g:523:1: ( ( rule__LambdaDataExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:523:1: ( ( rule__LambdaDataExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:524:1: ( rule__LambdaDataExpression__Group__0 )
+            // InternalScope.g:523:1: ( ( rule__LambdaDataExpression__Group__0 ) )
+            // InternalScope.g:524:1: ( rule__LambdaDataExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLambdaDataExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:525:1: ( rule__LambdaDataExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:525:2: rule__LambdaDataExpression__Group__0
+            // InternalScope.g:525:1: ( rule__LambdaDataExpression__Group__0 )
+            // InternalScope.g:525:2: rule__LambdaDataExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__LambdaDataExpression__Group__0_in_ruleLambdaDataExpression1060);
+            pushFollow(FOLLOW_2);
             rule__LambdaDataExpression__Group__0();
 
             state._fsp--;
@@ -1593,16 +1593,16 @@ public final void ruleLambdaDataExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleSimpleScopeExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:537:1: entryRuleSimpleScopeExpression : ruleSimpleScopeExpression EOF ;
+    // InternalScope.g:537:1: entryRuleSimpleScopeExpression : ruleSimpleScopeExpression EOF ;
     public final void entryRuleSimpleScopeExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:538:1: ( ruleSimpleScopeExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:539:1: ruleSimpleScopeExpression EOF
+            // InternalScope.g:538:1: ( ruleSimpleScopeExpression EOF )
+            // InternalScope.g:539:1: ruleSimpleScopeExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSimpleScopeExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleSimpleScopeExpression_in_entryRuleSimpleScopeExpression1087);
+            pushFollow(FOLLOW_1);
             ruleSimpleScopeExpression();
 
             state._fsp--;
@@ -1610,7 +1610,7 @@ public final void entryRuleSimpleScopeExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSimpleScopeExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSimpleScopeExpression1094); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1627,25 +1627,25 @@ public final void entryRuleSimpleScopeExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleSimpleScopeExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:546:1: ruleSimpleScopeExpression : ( ( rule__SimpleScopeExpression__ExprAssignment ) ) ;
+    // InternalScope.g:546:1: ruleSimpleScopeExpression : ( ( rule__SimpleScopeExpression__ExprAssignment ) ) ;
     public final void ruleSimpleScopeExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:550:2: ( ( ( rule__SimpleScopeExpression__ExprAssignment ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:551:1: ( ( rule__SimpleScopeExpression__ExprAssignment ) )
+            // InternalScope.g:550:2: ( ( ( rule__SimpleScopeExpression__ExprAssignment ) ) )
+            // InternalScope.g:551:1: ( ( rule__SimpleScopeExpression__ExprAssignment ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:551:1: ( ( rule__SimpleScopeExpression__ExprAssignment ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:552:1: ( rule__SimpleScopeExpression__ExprAssignment )
+            // InternalScope.g:551:1: ( ( rule__SimpleScopeExpression__ExprAssignment ) )
+            // InternalScope.g:552:1: ( rule__SimpleScopeExpression__ExprAssignment )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSimpleScopeExpressionAccess().getExprAssignment()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:553:1: ( rule__SimpleScopeExpression__ExprAssignment )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:553:2: rule__SimpleScopeExpression__ExprAssignment
+            // InternalScope.g:553:1: ( rule__SimpleScopeExpression__ExprAssignment )
+            // InternalScope.g:553:2: rule__SimpleScopeExpression__ExprAssignment
             {
-            pushFollow(FOLLOW_rule__SimpleScopeExpression__ExprAssignment_in_ruleSimpleScopeExpression1120);
+            pushFollow(FOLLOW_2);
             rule__SimpleScopeExpression__ExprAssignment();
 
             state._fsp--;
@@ -1678,16 +1678,16 @@ public final void ruleSimpleScopeExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleNaming"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:565:1: entryRuleNaming : ruleNaming EOF ;
+    // InternalScope.g:565:1: entryRuleNaming : ruleNaming EOF ;
     public final void entryRuleNaming() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:566:1: ( ruleNaming EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:567:1: ruleNaming EOF
+            // InternalScope.g:566:1: ( ruleNaming EOF )
+            // InternalScope.g:567:1: ruleNaming EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamingRule()); 
             }
-            pushFollow(FOLLOW_ruleNaming_in_entryRuleNaming1147);
+            pushFollow(FOLLOW_1);
             ruleNaming();
 
             state._fsp--;
@@ -1695,7 +1695,7 @@ public final void entryRuleNaming() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getNamingRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNaming1154); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1712,25 +1712,25 @@ public final void entryRuleNaming() throws RecognitionException {
 
 
     // $ANTLR start "ruleNaming"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:574:1: ruleNaming : ( ( rule__Naming__Alternatives ) ) ;
+    // InternalScope.g:574:1: ruleNaming : ( ( rule__Naming__Alternatives ) ) ;
     public final void ruleNaming() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:578:2: ( ( ( rule__Naming__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:579:1: ( ( rule__Naming__Alternatives ) )
+            // InternalScope.g:578:2: ( ( ( rule__Naming__Alternatives ) ) )
+            // InternalScope.g:579:1: ( ( rule__Naming__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:579:1: ( ( rule__Naming__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:580:1: ( rule__Naming__Alternatives )
+            // InternalScope.g:579:1: ( ( rule__Naming__Alternatives ) )
+            // InternalScope.g:580:1: ( rule__Naming__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamingAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:581:1: ( rule__Naming__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:581:2: rule__Naming__Alternatives
+            // InternalScope.g:581:1: ( rule__Naming__Alternatives )
+            // InternalScope.g:581:2: rule__Naming__Alternatives
             {
-            pushFollow(FOLLOW_rule__Naming__Alternatives_in_ruleNaming1180);
+            pushFollow(FOLLOW_2);
             rule__Naming__Alternatives();
 
             state._fsp--;
@@ -1763,16 +1763,16 @@ public final void ruleNaming() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleNamingExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:593:1: entryRuleNamingExpression : ruleNamingExpression EOF ;
+    // InternalScope.g:593:1: entryRuleNamingExpression : ruleNamingExpression EOF ;
     public final void entryRuleNamingExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:594:1: ( ruleNamingExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:595:1: ruleNamingExpression EOF
+            // InternalScope.g:594:1: ( ruleNamingExpression EOF )
+            // InternalScope.g:595:1: ruleNamingExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamingExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleNamingExpression_in_entryRuleNamingExpression1207);
+            pushFollow(FOLLOW_1);
             ruleNamingExpression();
 
             state._fsp--;
@@ -1780,7 +1780,7 @@ public final void entryRuleNamingExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getNamingExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNamingExpression1214); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1797,25 +1797,25 @@ public final void entryRuleNamingExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleNamingExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:602:1: ruleNamingExpression : ( ( rule__NamingExpression__Alternatives ) ) ;
+    // InternalScope.g:602:1: ruleNamingExpression : ( ( rule__NamingExpression__Alternatives ) ) ;
     public final void ruleNamingExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:606:2: ( ( ( rule__NamingExpression__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:607:1: ( ( rule__NamingExpression__Alternatives ) )
+            // InternalScope.g:606:2: ( ( ( rule__NamingExpression__Alternatives ) ) )
+            // InternalScope.g:607:1: ( ( rule__NamingExpression__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:607:1: ( ( rule__NamingExpression__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:608:1: ( rule__NamingExpression__Alternatives )
+            // InternalScope.g:607:1: ( ( rule__NamingExpression__Alternatives ) )
+            // InternalScope.g:608:1: ( rule__NamingExpression__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamingExpressionAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:609:1: ( rule__NamingExpression__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:609:2: rule__NamingExpression__Alternatives
+            // InternalScope.g:609:1: ( rule__NamingExpression__Alternatives )
+            // InternalScope.g:609:2: rule__NamingExpression__Alternatives
             {
-            pushFollow(FOLLOW_rule__NamingExpression__Alternatives_in_ruleNamingExpression1240);
+            pushFollow(FOLLOW_2);
             rule__NamingExpression__Alternatives();
 
             state._fsp--;
@@ -1848,16 +1848,16 @@ public final void ruleNamingExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleQualifiedID"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:621:1: entryRuleQualifiedID : ruleQualifiedID EOF ;
+    // InternalScope.g:621:1: entryRuleQualifiedID : ruleQualifiedID EOF ;
     public final void entryRuleQualifiedID() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:622:1: ( ruleQualifiedID EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:623:1: ruleQualifiedID EOF
+            // InternalScope.g:622:1: ( ruleQualifiedID EOF )
+            // InternalScope.g:623:1: ruleQualifiedID EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedIDRule()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedID_in_entryRuleQualifiedID1267);
+            pushFollow(FOLLOW_1);
             ruleQualifiedID();
 
             state._fsp--;
@@ -1865,7 +1865,7 @@ public final void entryRuleQualifiedID() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getQualifiedIDRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedID1274); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1882,25 +1882,25 @@ public final void entryRuleQualifiedID() throws RecognitionException {
 
 
     // $ANTLR start "ruleQualifiedID"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:630:1: ruleQualifiedID : ( ( rule__QualifiedID__Group__0 ) ) ;
+    // InternalScope.g:630:1: ruleQualifiedID : ( ( rule__QualifiedID__Group__0 ) ) ;
     public final void ruleQualifiedID() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:634:2: ( ( ( rule__QualifiedID__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:635:1: ( ( rule__QualifiedID__Group__0 ) )
+            // InternalScope.g:634:2: ( ( ( rule__QualifiedID__Group__0 ) ) )
+            // InternalScope.g:635:1: ( ( rule__QualifiedID__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:635:1: ( ( rule__QualifiedID__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:636:1: ( rule__QualifiedID__Group__0 )
+            // InternalScope.g:635:1: ( ( rule__QualifiedID__Group__0 ) )
+            // InternalScope.g:636:1: ( rule__QualifiedID__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedIDAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:637:1: ( rule__QualifiedID__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:637:2: rule__QualifiedID__Group__0
+            // InternalScope.g:637:1: ( rule__QualifiedID__Group__0 )
+            // InternalScope.g:637:2: rule__QualifiedID__Group__0
             {
-            pushFollow(FOLLOW_rule__QualifiedID__Group__0_in_ruleQualifiedID1300);
+            pushFollow(FOLLOW_2);
             rule__QualifiedID__Group__0();
 
             state._fsp--;
@@ -1933,16 +1933,16 @@ public final void ruleQualifiedID() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleDottedID"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:649:1: entryRuleDottedID : ruleDottedID EOF ;
+    // InternalScope.g:649:1: entryRuleDottedID : ruleDottedID EOF ;
     public final void entryRuleDottedID() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:650:1: ( ruleDottedID EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:651:1: ruleDottedID EOF
+            // InternalScope.g:650:1: ( ruleDottedID EOF )
+            // InternalScope.g:651:1: ruleDottedID EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDottedIDRule()); 
             }
-            pushFollow(FOLLOW_ruleDottedID_in_entryRuleDottedID1327);
+            pushFollow(FOLLOW_1);
             ruleDottedID();
 
             state._fsp--;
@@ -1950,7 +1950,7 @@ public final void entryRuleDottedID() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getDottedIDRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDottedID1334); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -1967,25 +1967,25 @@ public final void entryRuleDottedID() throws RecognitionException {
 
 
     // $ANTLR start "ruleDottedID"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:658:1: ruleDottedID : ( ( rule__DottedID__Group__0 ) ) ;
+    // InternalScope.g:658:1: ruleDottedID : ( ( rule__DottedID__Group__0 ) ) ;
     public final void ruleDottedID() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:662:2: ( ( ( rule__DottedID__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:663:1: ( ( rule__DottedID__Group__0 ) )
+            // InternalScope.g:662:2: ( ( ( rule__DottedID__Group__0 ) ) )
+            // InternalScope.g:663:1: ( ( rule__DottedID__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:663:1: ( ( rule__DottedID__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:664:1: ( rule__DottedID__Group__0 )
+            // InternalScope.g:663:1: ( ( rule__DottedID__Group__0 ) )
+            // InternalScope.g:664:1: ( rule__DottedID__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDottedIDAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:665:1: ( rule__DottedID__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:665:2: rule__DottedID__Group__0
+            // InternalScope.g:665:1: ( rule__DottedID__Group__0 )
+            // InternalScope.g:665:2: rule__DottedID__Group__0
             {
-            pushFollow(FOLLOW_rule__DottedID__Group__0_in_ruleDottedID1360);
+            pushFollow(FOLLOW_2);
             rule__DottedID__Group__0();
 
             state._fsp--;
@@ -2018,16 +2018,16 @@ public final void ruleDottedID() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:677:1: entryRuleExpression : ruleExpression EOF ;
+    // InternalScope.g:677:1: entryRuleExpression : ruleExpression EOF ;
     public final void entryRuleExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:678:1: ( ruleExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:679:1: ruleExpression EOF
+            // InternalScope.g:678:1: ( ruleExpression EOF )
+            // InternalScope.g:679:1: ruleExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_entryRuleExpression1387);
+            pushFollow(FOLLOW_1);
             ruleExpression();
 
             state._fsp--;
@@ -2035,7 +2035,7 @@ public final void entryRuleExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleExpression1394); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2052,25 +2052,25 @@ public final void entryRuleExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:686:1: ruleExpression : ( ( rule__Expression__Alternatives ) ) ;
+    // InternalScope.g:686:1: ruleExpression : ( ( rule__Expression__Alternatives ) ) ;
     public final void ruleExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:690:2: ( ( ( rule__Expression__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:691:1: ( ( rule__Expression__Alternatives ) )
+            // InternalScope.g:690:2: ( ( ( rule__Expression__Alternatives ) ) )
+            // InternalScope.g:691:1: ( ( rule__Expression__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:691:1: ( ( rule__Expression__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:692:1: ( rule__Expression__Alternatives )
+            // InternalScope.g:691:1: ( ( rule__Expression__Alternatives ) )
+            // InternalScope.g:692:1: ( rule__Expression__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExpressionAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:693:1: ( rule__Expression__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:693:2: rule__Expression__Alternatives
+            // InternalScope.g:693:1: ( rule__Expression__Alternatives )
+            // InternalScope.g:693:2: rule__Expression__Alternatives
             {
-            pushFollow(FOLLOW_rule__Expression__Alternatives_in_ruleExpression1420);
+            pushFollow(FOLLOW_2);
             rule__Expression__Alternatives();
 
             state._fsp--;
@@ -2103,16 +2103,16 @@ public final void ruleExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleLetExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:707:1: entryRuleLetExpression : ruleLetExpression EOF ;
+    // InternalScope.g:707:1: entryRuleLetExpression : ruleLetExpression EOF ;
     public final void entryRuleLetExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:708:1: ( ruleLetExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:709:1: ruleLetExpression EOF
+            // InternalScope.g:708:1: ( ruleLetExpression EOF )
+            // InternalScope.g:709:1: ruleLetExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLetExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleLetExpression_in_entryRuleLetExpression1449);
+            pushFollow(FOLLOW_1);
             ruleLetExpression();
 
             state._fsp--;
@@ -2120,7 +2120,7 @@ public final void entryRuleLetExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getLetExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleLetExpression1456); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2137,25 +2137,25 @@ public final void entryRuleLetExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleLetExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:716:1: ruleLetExpression : ( ( rule__LetExpression__Group__0 ) ) ;
+    // InternalScope.g:716:1: ruleLetExpression : ( ( rule__LetExpression__Group__0 ) ) ;
     public final void ruleLetExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:720:2: ( ( ( rule__LetExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:721:1: ( ( rule__LetExpression__Group__0 ) )
+            // InternalScope.g:720:2: ( ( ( rule__LetExpression__Group__0 ) ) )
+            // InternalScope.g:721:1: ( ( rule__LetExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:721:1: ( ( rule__LetExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:722:1: ( rule__LetExpression__Group__0 )
+            // InternalScope.g:721:1: ( ( rule__LetExpression__Group__0 ) )
+            // InternalScope.g:722:1: ( rule__LetExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLetExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:723:1: ( rule__LetExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:723:2: rule__LetExpression__Group__0
+            // InternalScope.g:723:1: ( rule__LetExpression__Group__0 )
+            // InternalScope.g:723:2: rule__LetExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__LetExpression__Group__0_in_ruleLetExpression1482);
+            pushFollow(FOLLOW_2);
             rule__LetExpression__Group__0();
 
             state._fsp--;
@@ -2188,16 +2188,16 @@ public final void ruleLetExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleCastedExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:735:1: entryRuleCastedExpression : ruleCastedExpression EOF ;
+    // InternalScope.g:735:1: entryRuleCastedExpression : ruleCastedExpression EOF ;
     public final void entryRuleCastedExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:736:1: ( ruleCastedExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:737:1: ruleCastedExpression EOF
+            // InternalScope.g:736:1: ( ruleCastedExpression EOF )
+            // InternalScope.g:737:1: ruleCastedExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCastedExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleCastedExpression_in_entryRuleCastedExpression1509);
+            pushFollow(FOLLOW_1);
             ruleCastedExpression();
 
             state._fsp--;
@@ -2205,7 +2205,7 @@ public final void entryRuleCastedExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCastedExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleCastedExpression1516); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2222,25 +2222,25 @@ public final void entryRuleCastedExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleCastedExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:744:1: ruleCastedExpression : ( ( rule__CastedExpression__Group__0 ) ) ;
+    // InternalScope.g:744:1: ruleCastedExpression : ( ( rule__CastedExpression__Group__0 ) ) ;
     public final void ruleCastedExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:748:2: ( ( ( rule__CastedExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:749:1: ( ( rule__CastedExpression__Group__0 ) )
+            // InternalScope.g:748:2: ( ( ( rule__CastedExpression__Group__0 ) ) )
+            // InternalScope.g:749:1: ( ( rule__CastedExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:749:1: ( ( rule__CastedExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:750:1: ( rule__CastedExpression__Group__0 )
+            // InternalScope.g:749:1: ( ( rule__CastedExpression__Group__0 ) )
+            // InternalScope.g:750:1: ( rule__CastedExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCastedExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:751:1: ( rule__CastedExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:751:2: rule__CastedExpression__Group__0
+            // InternalScope.g:751:1: ( rule__CastedExpression__Group__0 )
+            // InternalScope.g:751:2: rule__CastedExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__CastedExpression__Group__0_in_ruleCastedExpression1542);
+            pushFollow(FOLLOW_2);
             rule__CastedExpression__Group__0();
 
             state._fsp--;
@@ -2273,16 +2273,16 @@ public final void ruleCastedExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleChainExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:763:1: entryRuleChainExpression : ruleChainExpression EOF ;
+    // InternalScope.g:763:1: entryRuleChainExpression : ruleChainExpression EOF ;
     public final void entryRuleChainExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:764:1: ( ruleChainExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:765:1: ruleChainExpression EOF
+            // InternalScope.g:764:1: ( ruleChainExpression EOF )
+            // InternalScope.g:765:1: ruleChainExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getChainExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleChainExpression_in_entryRuleChainExpression1569);
+            pushFollow(FOLLOW_1);
             ruleChainExpression();
 
             state._fsp--;
@@ -2290,7 +2290,7 @@ public final void entryRuleChainExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getChainExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleChainExpression1576); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2307,25 +2307,25 @@ public final void entryRuleChainExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleChainExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:772:1: ruleChainExpression : ( ( rule__ChainExpression__Group__0 ) ) ;
+    // InternalScope.g:772:1: ruleChainExpression : ( ( rule__ChainExpression__Group__0 ) ) ;
     public final void ruleChainExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:776:2: ( ( ( rule__ChainExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:777:1: ( ( rule__ChainExpression__Group__0 ) )
+            // InternalScope.g:776:2: ( ( ( rule__ChainExpression__Group__0 ) ) )
+            // InternalScope.g:777:1: ( ( rule__ChainExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:777:1: ( ( rule__ChainExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:778:1: ( rule__ChainExpression__Group__0 )
+            // InternalScope.g:777:1: ( ( rule__ChainExpression__Group__0 ) )
+            // InternalScope.g:778:1: ( rule__ChainExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getChainExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:779:1: ( rule__ChainExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:779:2: rule__ChainExpression__Group__0
+            // InternalScope.g:779:1: ( rule__ChainExpression__Group__0 )
+            // InternalScope.g:779:2: rule__ChainExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__ChainExpression__Group__0_in_ruleChainExpression1602);
+            pushFollow(FOLLOW_2);
             rule__ChainExpression__Group__0();
 
             state._fsp--;
@@ -2358,16 +2358,16 @@ public final void ruleChainExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleChainedExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:791:1: entryRuleChainedExpression : ruleChainedExpression EOF ;
+    // InternalScope.g:791:1: entryRuleChainedExpression : ruleChainedExpression EOF ;
     public final void entryRuleChainedExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:792:1: ( ruleChainedExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:793:1: ruleChainedExpression EOF
+            // InternalScope.g:792:1: ( ruleChainedExpression EOF )
+            // InternalScope.g:793:1: ruleChainedExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getChainedExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleChainedExpression_in_entryRuleChainedExpression1629);
+            pushFollow(FOLLOW_1);
             ruleChainedExpression();
 
             state._fsp--;
@@ -2375,7 +2375,7 @@ public final void entryRuleChainedExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getChainedExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleChainedExpression1636); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2392,25 +2392,25 @@ public final void entryRuleChainedExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleChainedExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:800:1: ruleChainedExpression : ( ( rule__ChainedExpression__Alternatives ) ) ;
+    // InternalScope.g:800:1: ruleChainedExpression : ( ( rule__ChainedExpression__Alternatives ) ) ;
     public final void ruleChainedExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:804:2: ( ( ( rule__ChainedExpression__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:805:1: ( ( rule__ChainedExpression__Alternatives ) )
+            // InternalScope.g:804:2: ( ( ( rule__ChainedExpression__Alternatives ) ) )
+            // InternalScope.g:805:1: ( ( rule__ChainedExpression__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:805:1: ( ( rule__ChainedExpression__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:806:1: ( rule__ChainedExpression__Alternatives )
+            // InternalScope.g:805:1: ( ( rule__ChainedExpression__Alternatives ) )
+            // InternalScope.g:806:1: ( rule__ChainedExpression__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getChainedExpressionAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:807:1: ( rule__ChainedExpression__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:807:2: rule__ChainedExpression__Alternatives
+            // InternalScope.g:807:1: ( rule__ChainedExpression__Alternatives )
+            // InternalScope.g:807:2: rule__ChainedExpression__Alternatives
             {
-            pushFollow(FOLLOW_rule__ChainedExpression__Alternatives_in_ruleChainedExpression1662);
+            pushFollow(FOLLOW_2);
             rule__ChainedExpression__Alternatives();
 
             state._fsp--;
@@ -2443,16 +2443,16 @@ public final void ruleChainedExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleIfExpressionTri"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:819:1: entryRuleIfExpressionTri : ruleIfExpressionTri EOF ;
+    // InternalScope.g:819:1: entryRuleIfExpressionTri : ruleIfExpressionTri EOF ;
     public final void entryRuleIfExpressionTri() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:820:1: ( ruleIfExpressionTri EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:821:1: ruleIfExpressionTri EOF
+            // InternalScope.g:820:1: ( ruleIfExpressionTri EOF )
+            // InternalScope.g:821:1: ruleIfExpressionTri EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionTriRule()); 
             }
-            pushFollow(FOLLOW_ruleIfExpressionTri_in_entryRuleIfExpressionTri1689);
+            pushFollow(FOLLOW_1);
             ruleIfExpressionTri();
 
             state._fsp--;
@@ -2460,7 +2460,7 @@ public final void entryRuleIfExpressionTri() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIfExpressionTriRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIfExpressionTri1696); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2477,25 +2477,25 @@ public final void entryRuleIfExpressionTri() throws RecognitionException {
 
 
     // $ANTLR start "ruleIfExpressionTri"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:828:1: ruleIfExpressionTri : ( ( rule__IfExpressionTri__Group__0 ) ) ;
+    // InternalScope.g:828:1: ruleIfExpressionTri : ( ( rule__IfExpressionTri__Group__0 ) ) ;
     public final void ruleIfExpressionTri() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:832:2: ( ( ( rule__IfExpressionTri__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:833:1: ( ( rule__IfExpressionTri__Group__0 ) )
+            // InternalScope.g:832:2: ( ( ( rule__IfExpressionTri__Group__0 ) ) )
+            // InternalScope.g:833:1: ( ( rule__IfExpressionTri__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:833:1: ( ( rule__IfExpressionTri__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:834:1: ( rule__IfExpressionTri__Group__0 )
+            // InternalScope.g:833:1: ( ( rule__IfExpressionTri__Group__0 ) )
+            // InternalScope.g:834:1: ( rule__IfExpressionTri__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionTriAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:835:1: ( rule__IfExpressionTri__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:835:2: rule__IfExpressionTri__Group__0
+            // InternalScope.g:835:1: ( rule__IfExpressionTri__Group__0 )
+            // InternalScope.g:835:2: rule__IfExpressionTri__Group__0
             {
-            pushFollow(FOLLOW_rule__IfExpressionTri__Group__0_in_ruleIfExpressionTri1722);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionTri__Group__0();
 
             state._fsp--;
@@ -2528,16 +2528,16 @@ public final void ruleIfExpressionTri() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleIfExpressionKw"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:847:1: entryRuleIfExpressionKw : ruleIfExpressionKw EOF ;
+    // InternalScope.g:847:1: entryRuleIfExpressionKw : ruleIfExpressionKw EOF ;
     public final void entryRuleIfExpressionKw() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:848:1: ( ruleIfExpressionKw EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:849:1: ruleIfExpressionKw EOF
+            // InternalScope.g:848:1: ( ruleIfExpressionKw EOF )
+            // InternalScope.g:849:1: ruleIfExpressionKw EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionKwRule()); 
             }
-            pushFollow(FOLLOW_ruleIfExpressionKw_in_entryRuleIfExpressionKw1749);
+            pushFollow(FOLLOW_1);
             ruleIfExpressionKw();
 
             state._fsp--;
@@ -2545,7 +2545,7 @@ public final void entryRuleIfExpressionKw() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIfExpressionKwRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIfExpressionKw1756); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2562,25 +2562,25 @@ public final void entryRuleIfExpressionKw() throws RecognitionException {
 
 
     // $ANTLR start "ruleIfExpressionKw"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:856:1: ruleIfExpressionKw : ( ( rule__IfExpressionKw__Group__0 ) ) ;
+    // InternalScope.g:856:1: ruleIfExpressionKw : ( ( rule__IfExpressionKw__Group__0 ) ) ;
     public final void ruleIfExpressionKw() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:860:2: ( ( ( rule__IfExpressionKw__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:861:1: ( ( rule__IfExpressionKw__Group__0 ) )
+            // InternalScope.g:860:2: ( ( ( rule__IfExpressionKw__Group__0 ) ) )
+            // InternalScope.g:861:1: ( ( rule__IfExpressionKw__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:861:1: ( ( rule__IfExpressionKw__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:862:1: ( rule__IfExpressionKw__Group__0 )
+            // InternalScope.g:861:1: ( ( rule__IfExpressionKw__Group__0 ) )
+            // InternalScope.g:862:1: ( rule__IfExpressionKw__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionKwAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:863:1: ( rule__IfExpressionKw__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:863:2: rule__IfExpressionKw__Group__0
+            // InternalScope.g:863:1: ( rule__IfExpressionKw__Group__0 )
+            // InternalScope.g:863:2: rule__IfExpressionKw__Group__0
             {
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group__0_in_ruleIfExpressionKw1782);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionKw__Group__0();
 
             state._fsp--;
@@ -2613,16 +2613,16 @@ public final void ruleIfExpressionKw() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleSwitchExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:875:1: entryRuleSwitchExpression : ruleSwitchExpression EOF ;
+    // InternalScope.g:875:1: entryRuleSwitchExpression : ruleSwitchExpression EOF ;
     public final void entryRuleSwitchExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:876:1: ( ruleSwitchExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:877:1: ruleSwitchExpression EOF
+            // InternalScope.g:876:1: ( ruleSwitchExpression EOF )
+            // InternalScope.g:877:1: ruleSwitchExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleSwitchExpression_in_entryRuleSwitchExpression1809);
+            pushFollow(FOLLOW_1);
             ruleSwitchExpression();
 
             state._fsp--;
@@ -2630,7 +2630,7 @@ public final void entryRuleSwitchExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSwitchExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSwitchExpression1816); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2647,25 +2647,25 @@ public final void entryRuleSwitchExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleSwitchExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:884:1: ruleSwitchExpression : ( ( rule__SwitchExpression__Group__0 ) ) ;
+    // InternalScope.g:884:1: ruleSwitchExpression : ( ( rule__SwitchExpression__Group__0 ) ) ;
     public final void ruleSwitchExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:888:2: ( ( ( rule__SwitchExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:889:1: ( ( rule__SwitchExpression__Group__0 ) )
+            // InternalScope.g:888:2: ( ( ( rule__SwitchExpression__Group__0 ) ) )
+            // InternalScope.g:889:1: ( ( rule__SwitchExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:889:1: ( ( rule__SwitchExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:890:1: ( rule__SwitchExpression__Group__0 )
+            // InternalScope.g:889:1: ( ( rule__SwitchExpression__Group__0 ) )
+            // InternalScope.g:890:1: ( rule__SwitchExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:891:1: ( rule__SwitchExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:891:2: rule__SwitchExpression__Group__0
+            // InternalScope.g:891:1: ( rule__SwitchExpression__Group__0 )
+            // InternalScope.g:891:2: rule__SwitchExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__0_in_ruleSwitchExpression1842);
+            pushFollow(FOLLOW_2);
             rule__SwitchExpression__Group__0();
 
             state._fsp--;
@@ -2698,16 +2698,16 @@ public final void ruleSwitchExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleCase"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:903:1: entryRuleCase : ruleCase EOF ;
+    // InternalScope.g:903:1: entryRuleCase : ruleCase EOF ;
     public final void entryRuleCase() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:904:1: ( ruleCase EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:905:1: ruleCase EOF
+            // InternalScope.g:904:1: ( ruleCase EOF )
+            // InternalScope.g:905:1: ruleCase EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCaseRule()); 
             }
-            pushFollow(FOLLOW_ruleCase_in_entryRuleCase1869);
+            pushFollow(FOLLOW_1);
             ruleCase();
 
             state._fsp--;
@@ -2715,7 +2715,7 @@ public final void entryRuleCase() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCaseRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleCase1876); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2732,25 +2732,25 @@ public final void entryRuleCase() throws RecognitionException {
 
 
     // $ANTLR start "ruleCase"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:912:1: ruleCase : ( ( rule__Case__Group__0 ) ) ;
+    // InternalScope.g:912:1: ruleCase : ( ( rule__Case__Group__0 ) ) ;
     public final void ruleCase() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:916:2: ( ( ( rule__Case__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:917:1: ( ( rule__Case__Group__0 ) )
+            // InternalScope.g:916:2: ( ( ( rule__Case__Group__0 ) ) )
+            // InternalScope.g:917:1: ( ( rule__Case__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:917:1: ( ( rule__Case__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:918:1: ( rule__Case__Group__0 )
+            // InternalScope.g:917:1: ( ( rule__Case__Group__0 ) )
+            // InternalScope.g:918:1: ( rule__Case__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCaseAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:919:1: ( rule__Case__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:919:2: rule__Case__Group__0
+            // InternalScope.g:919:1: ( rule__Case__Group__0 )
+            // InternalScope.g:919:2: rule__Case__Group__0
             {
-            pushFollow(FOLLOW_rule__Case__Group__0_in_ruleCase1902);
+            pushFollow(FOLLOW_2);
             rule__Case__Group__0();
 
             state._fsp--;
@@ -2783,16 +2783,16 @@ public final void ruleCase() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOrExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:931:1: entryRuleOrExpression : ruleOrExpression EOF ;
+    // InternalScope.g:931:1: entryRuleOrExpression : ruleOrExpression EOF ;
     public final void entryRuleOrExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:932:1: ( ruleOrExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:933:1: ruleOrExpression EOF
+            // InternalScope.g:932:1: ( ruleOrExpression EOF )
+            // InternalScope.g:933:1: ruleOrExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOrExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleOrExpression_in_entryRuleOrExpression1929);
+            pushFollow(FOLLOW_1);
             ruleOrExpression();
 
             state._fsp--;
@@ -2800,7 +2800,7 @@ public final void entryRuleOrExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOrExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOrExpression1936); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2817,25 +2817,25 @@ public final void entryRuleOrExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleOrExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:940:1: ruleOrExpression : ( ( rule__OrExpression__Group__0 ) ) ;
+    // InternalScope.g:940:1: ruleOrExpression : ( ( rule__OrExpression__Group__0 ) ) ;
     public final void ruleOrExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:944:2: ( ( ( rule__OrExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:945:1: ( ( rule__OrExpression__Group__0 ) )
+            // InternalScope.g:944:2: ( ( ( rule__OrExpression__Group__0 ) ) )
+            // InternalScope.g:945:1: ( ( rule__OrExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:945:1: ( ( rule__OrExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:946:1: ( rule__OrExpression__Group__0 )
+            // InternalScope.g:945:1: ( ( rule__OrExpression__Group__0 ) )
+            // InternalScope.g:946:1: ( rule__OrExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOrExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:947:1: ( rule__OrExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:947:2: rule__OrExpression__Group__0
+            // InternalScope.g:947:1: ( rule__OrExpression__Group__0 )
+            // InternalScope.g:947:2: rule__OrExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__OrExpression__Group__0_in_ruleOrExpression1962);
+            pushFollow(FOLLOW_2);
             rule__OrExpression__Group__0();
 
             state._fsp--;
@@ -2868,16 +2868,16 @@ public final void ruleOrExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleAndExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:959:1: entryRuleAndExpression : ruleAndExpression EOF ;
+    // InternalScope.g:959:1: entryRuleAndExpression : ruleAndExpression EOF ;
     public final void entryRuleAndExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:960:1: ( ruleAndExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:961:1: ruleAndExpression EOF
+            // InternalScope.g:960:1: ( ruleAndExpression EOF )
+            // InternalScope.g:961:1: ruleAndExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAndExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleAndExpression_in_entryRuleAndExpression1989);
+            pushFollow(FOLLOW_1);
             ruleAndExpression();
 
             state._fsp--;
@@ -2885,7 +2885,7 @@ public final void entryRuleAndExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getAndExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAndExpression1996); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2902,25 +2902,25 @@ public final void entryRuleAndExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleAndExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:968:1: ruleAndExpression : ( ( rule__AndExpression__Group__0 ) ) ;
+    // InternalScope.g:968:1: ruleAndExpression : ( ( rule__AndExpression__Group__0 ) ) ;
     public final void ruleAndExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:972:2: ( ( ( rule__AndExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:973:1: ( ( rule__AndExpression__Group__0 ) )
+            // InternalScope.g:972:2: ( ( ( rule__AndExpression__Group__0 ) ) )
+            // InternalScope.g:973:1: ( ( rule__AndExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:973:1: ( ( rule__AndExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:974:1: ( rule__AndExpression__Group__0 )
+            // InternalScope.g:973:1: ( ( rule__AndExpression__Group__0 ) )
+            // InternalScope.g:974:1: ( rule__AndExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAndExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:975:1: ( rule__AndExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:975:2: rule__AndExpression__Group__0
+            // InternalScope.g:975:1: ( rule__AndExpression__Group__0 )
+            // InternalScope.g:975:2: rule__AndExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__AndExpression__Group__0_in_ruleAndExpression2022);
+            pushFollow(FOLLOW_2);
             rule__AndExpression__Group__0();
 
             state._fsp--;
@@ -2953,16 +2953,16 @@ public final void ruleAndExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleImpliesExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:987:1: entryRuleImpliesExpression : ruleImpliesExpression EOF ;
+    // InternalScope.g:987:1: entryRuleImpliesExpression : ruleImpliesExpression EOF ;
     public final void entryRuleImpliesExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:988:1: ( ruleImpliesExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:989:1: ruleImpliesExpression EOF
+            // InternalScope.g:988:1: ( ruleImpliesExpression EOF )
+            // InternalScope.g:989:1: ruleImpliesExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImpliesExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleImpliesExpression_in_entryRuleImpliesExpression2049);
+            pushFollow(FOLLOW_1);
             ruleImpliesExpression();
 
             state._fsp--;
@@ -2970,7 +2970,7 @@ public final void entryRuleImpliesExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getImpliesExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleImpliesExpression2056); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -2987,25 +2987,25 @@ public final void entryRuleImpliesExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleImpliesExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:996:1: ruleImpliesExpression : ( ( rule__ImpliesExpression__Group__0 ) ) ;
+    // InternalScope.g:996:1: ruleImpliesExpression : ( ( rule__ImpliesExpression__Group__0 ) ) ;
     public final void ruleImpliesExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1000:2: ( ( ( rule__ImpliesExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1001:1: ( ( rule__ImpliesExpression__Group__0 ) )
+            // InternalScope.g:1000:2: ( ( ( rule__ImpliesExpression__Group__0 ) ) )
+            // InternalScope.g:1001:1: ( ( rule__ImpliesExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1001:1: ( ( rule__ImpliesExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1002:1: ( rule__ImpliesExpression__Group__0 )
+            // InternalScope.g:1001:1: ( ( rule__ImpliesExpression__Group__0 ) )
+            // InternalScope.g:1002:1: ( rule__ImpliesExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImpliesExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1003:1: ( rule__ImpliesExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1003:2: rule__ImpliesExpression__Group__0
+            // InternalScope.g:1003:1: ( rule__ImpliesExpression__Group__0 )
+            // InternalScope.g:1003:2: rule__ImpliesExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__ImpliesExpression__Group__0_in_ruleImpliesExpression2082);
+            pushFollow(FOLLOW_2);
             rule__ImpliesExpression__Group__0();
 
             state._fsp--;
@@ -3038,16 +3038,16 @@ public final void ruleImpliesExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleRelationalExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1015:1: entryRuleRelationalExpression : ruleRelationalExpression EOF ;
+    // InternalScope.g:1015:1: entryRuleRelationalExpression : ruleRelationalExpression EOF ;
     public final void entryRuleRelationalExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1016:1: ( ruleRelationalExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1017:1: ruleRelationalExpression EOF
+            // InternalScope.g:1016:1: ( ruleRelationalExpression EOF )
+            // InternalScope.g:1017:1: ruleRelationalExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRelationalExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleRelationalExpression_in_entryRuleRelationalExpression2109);
+            pushFollow(FOLLOW_1);
             ruleRelationalExpression();
 
             state._fsp--;
@@ -3055,7 +3055,7 @@ public final void entryRuleRelationalExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getRelationalExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRelationalExpression2116); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3072,25 +3072,25 @@ public final void entryRuleRelationalExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleRelationalExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1024:1: ruleRelationalExpression : ( ( rule__RelationalExpression__Group__0 ) ) ;
+    // InternalScope.g:1024:1: ruleRelationalExpression : ( ( rule__RelationalExpression__Group__0 ) ) ;
     public final void ruleRelationalExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1028:2: ( ( ( rule__RelationalExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1029:1: ( ( rule__RelationalExpression__Group__0 ) )
+            // InternalScope.g:1028:2: ( ( ( rule__RelationalExpression__Group__0 ) ) )
+            // InternalScope.g:1029:1: ( ( rule__RelationalExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1029:1: ( ( rule__RelationalExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1030:1: ( rule__RelationalExpression__Group__0 )
+            // InternalScope.g:1029:1: ( ( rule__RelationalExpression__Group__0 ) )
+            // InternalScope.g:1030:1: ( rule__RelationalExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRelationalExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1031:1: ( rule__RelationalExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1031:2: rule__RelationalExpression__Group__0
+            // InternalScope.g:1031:1: ( rule__RelationalExpression__Group__0 )
+            // InternalScope.g:1031:2: rule__RelationalExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__RelationalExpression__Group__0_in_ruleRelationalExpression2142);
+            pushFollow(FOLLOW_2);
             rule__RelationalExpression__Group__0();
 
             state._fsp--;
@@ -3123,16 +3123,16 @@ public final void ruleRelationalExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleAdditiveExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1043:1: entryRuleAdditiveExpression : ruleAdditiveExpression EOF ;
+    // InternalScope.g:1043:1: entryRuleAdditiveExpression : ruleAdditiveExpression EOF ;
     public final void entryRuleAdditiveExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1044:1: ( ruleAdditiveExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1045:1: ruleAdditiveExpression EOF
+            // InternalScope.g:1044:1: ( ruleAdditiveExpression EOF )
+            // InternalScope.g:1045:1: ruleAdditiveExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAdditiveExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleAdditiveExpression_in_entryRuleAdditiveExpression2169);
+            pushFollow(FOLLOW_1);
             ruleAdditiveExpression();
 
             state._fsp--;
@@ -3140,7 +3140,7 @@ public final void entryRuleAdditiveExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getAdditiveExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAdditiveExpression2176); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3157,25 +3157,25 @@ public final void entryRuleAdditiveExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleAdditiveExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1052:1: ruleAdditiveExpression : ( ( rule__AdditiveExpression__Group__0 ) ) ;
+    // InternalScope.g:1052:1: ruleAdditiveExpression : ( ( rule__AdditiveExpression__Group__0 ) ) ;
     public final void ruleAdditiveExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1056:2: ( ( ( rule__AdditiveExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1057:1: ( ( rule__AdditiveExpression__Group__0 ) )
+            // InternalScope.g:1056:2: ( ( ( rule__AdditiveExpression__Group__0 ) ) )
+            // InternalScope.g:1057:1: ( ( rule__AdditiveExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1057:1: ( ( rule__AdditiveExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1058:1: ( rule__AdditiveExpression__Group__0 )
+            // InternalScope.g:1057:1: ( ( rule__AdditiveExpression__Group__0 ) )
+            // InternalScope.g:1058:1: ( rule__AdditiveExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAdditiveExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1059:1: ( rule__AdditiveExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1059:2: rule__AdditiveExpression__Group__0
+            // InternalScope.g:1059:1: ( rule__AdditiveExpression__Group__0 )
+            // InternalScope.g:1059:2: rule__AdditiveExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__AdditiveExpression__Group__0_in_ruleAdditiveExpression2202);
+            pushFollow(FOLLOW_2);
             rule__AdditiveExpression__Group__0();
 
             state._fsp--;
@@ -3208,16 +3208,16 @@ public final void ruleAdditiveExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleMultiplicativeExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1071:1: entryRuleMultiplicativeExpression : ruleMultiplicativeExpression EOF ;
+    // InternalScope.g:1071:1: entryRuleMultiplicativeExpression : ruleMultiplicativeExpression EOF ;
     public final void entryRuleMultiplicativeExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1072:1: ( ruleMultiplicativeExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1073:1: ruleMultiplicativeExpression EOF
+            // InternalScope.g:1072:1: ( ruleMultiplicativeExpression EOF )
+            // InternalScope.g:1073:1: ruleMultiplicativeExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMultiplicativeExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleMultiplicativeExpression_in_entryRuleMultiplicativeExpression2229);
+            pushFollow(FOLLOW_1);
             ruleMultiplicativeExpression();
 
             state._fsp--;
@@ -3225,7 +3225,7 @@ public final void entryRuleMultiplicativeExpression() throws RecognitionExceptio
             if ( state.backtracking==0 ) {
                after(grammarAccess.getMultiplicativeExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleMultiplicativeExpression2236); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3242,25 +3242,25 @@ public final void entryRuleMultiplicativeExpression() throws RecognitionExceptio
 
 
     // $ANTLR start "ruleMultiplicativeExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1080:1: ruleMultiplicativeExpression : ( ( rule__MultiplicativeExpression__Group__0 ) ) ;
+    // InternalScope.g:1080:1: ruleMultiplicativeExpression : ( ( rule__MultiplicativeExpression__Group__0 ) ) ;
     public final void ruleMultiplicativeExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1084:2: ( ( ( rule__MultiplicativeExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1085:1: ( ( rule__MultiplicativeExpression__Group__0 ) )
+            // InternalScope.g:1084:2: ( ( ( rule__MultiplicativeExpression__Group__0 ) ) )
+            // InternalScope.g:1085:1: ( ( rule__MultiplicativeExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1085:1: ( ( rule__MultiplicativeExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1086:1: ( rule__MultiplicativeExpression__Group__0 )
+            // InternalScope.g:1085:1: ( ( rule__MultiplicativeExpression__Group__0 ) )
+            // InternalScope.g:1086:1: ( rule__MultiplicativeExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMultiplicativeExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1087:1: ( rule__MultiplicativeExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1087:2: rule__MultiplicativeExpression__Group__0
+            // InternalScope.g:1087:1: ( rule__MultiplicativeExpression__Group__0 )
+            // InternalScope.g:1087:2: rule__MultiplicativeExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__MultiplicativeExpression__Group__0_in_ruleMultiplicativeExpression2262);
+            pushFollow(FOLLOW_2);
             rule__MultiplicativeExpression__Group__0();
 
             state._fsp--;
@@ -3293,16 +3293,16 @@ public final void ruleMultiplicativeExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleUnaryOrInfixExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1099:1: entryRuleUnaryOrInfixExpression : ruleUnaryOrInfixExpression EOF ;
+    // InternalScope.g:1099:1: entryRuleUnaryOrInfixExpression : ruleUnaryOrInfixExpression EOF ;
     public final void entryRuleUnaryOrInfixExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1100:1: ( ruleUnaryOrInfixExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1101:1: ruleUnaryOrInfixExpression EOF
+            // InternalScope.g:1100:1: ( ruleUnaryOrInfixExpression EOF )
+            // InternalScope.g:1101:1: ruleUnaryOrInfixExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getUnaryOrInfixExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleUnaryOrInfixExpression_in_entryRuleUnaryOrInfixExpression2289);
+            pushFollow(FOLLOW_1);
             ruleUnaryOrInfixExpression();
 
             state._fsp--;
@@ -3310,7 +3310,7 @@ public final void entryRuleUnaryOrInfixExpression() throws RecognitionException
             if ( state.backtracking==0 ) {
                after(grammarAccess.getUnaryOrInfixExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleUnaryOrInfixExpression2296); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3327,25 +3327,25 @@ public final void entryRuleUnaryOrInfixExpression() throws RecognitionException
 
 
     // $ANTLR start "ruleUnaryOrInfixExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1108:1: ruleUnaryOrInfixExpression : ( ( rule__UnaryOrInfixExpression__Alternatives ) ) ;
+    // InternalScope.g:1108:1: ruleUnaryOrInfixExpression : ( ( rule__UnaryOrInfixExpression__Alternatives ) ) ;
     public final void ruleUnaryOrInfixExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1112:2: ( ( ( rule__UnaryOrInfixExpression__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1113:1: ( ( rule__UnaryOrInfixExpression__Alternatives ) )
+            // InternalScope.g:1112:2: ( ( ( rule__UnaryOrInfixExpression__Alternatives ) ) )
+            // InternalScope.g:1113:1: ( ( rule__UnaryOrInfixExpression__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1113:1: ( ( rule__UnaryOrInfixExpression__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1114:1: ( rule__UnaryOrInfixExpression__Alternatives )
+            // InternalScope.g:1113:1: ( ( rule__UnaryOrInfixExpression__Alternatives ) )
+            // InternalScope.g:1114:1: ( rule__UnaryOrInfixExpression__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getUnaryOrInfixExpressionAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1115:1: ( rule__UnaryOrInfixExpression__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1115:2: rule__UnaryOrInfixExpression__Alternatives
+            // InternalScope.g:1115:1: ( rule__UnaryOrInfixExpression__Alternatives )
+            // InternalScope.g:1115:2: rule__UnaryOrInfixExpression__Alternatives
             {
-            pushFollow(FOLLOW_rule__UnaryOrInfixExpression__Alternatives_in_ruleUnaryOrInfixExpression2322);
+            pushFollow(FOLLOW_2);
             rule__UnaryOrInfixExpression__Alternatives();
 
             state._fsp--;
@@ -3378,16 +3378,16 @@ public final void ruleUnaryOrInfixExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleUnaryExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1127:1: entryRuleUnaryExpression : ruleUnaryExpression EOF ;
+    // InternalScope.g:1127:1: entryRuleUnaryExpression : ruleUnaryExpression EOF ;
     public final void entryRuleUnaryExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1128:1: ( ruleUnaryExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1129:1: ruleUnaryExpression EOF
+            // InternalScope.g:1128:1: ( ruleUnaryExpression EOF )
+            // InternalScope.g:1129:1: ruleUnaryExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getUnaryExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleUnaryExpression_in_entryRuleUnaryExpression2349);
+            pushFollow(FOLLOW_1);
             ruleUnaryExpression();
 
             state._fsp--;
@@ -3395,7 +3395,7 @@ public final void entryRuleUnaryExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getUnaryExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleUnaryExpression2356); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3412,25 +3412,25 @@ public final void entryRuleUnaryExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleUnaryExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1136:1: ruleUnaryExpression : ( ( rule__UnaryExpression__Group__0 ) ) ;
+    // InternalScope.g:1136:1: ruleUnaryExpression : ( ( rule__UnaryExpression__Group__0 ) ) ;
     public final void ruleUnaryExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1140:2: ( ( ( rule__UnaryExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1141:1: ( ( rule__UnaryExpression__Group__0 ) )
+            // InternalScope.g:1140:2: ( ( ( rule__UnaryExpression__Group__0 ) ) )
+            // InternalScope.g:1141:1: ( ( rule__UnaryExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1141:1: ( ( rule__UnaryExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1142:1: ( rule__UnaryExpression__Group__0 )
+            // InternalScope.g:1141:1: ( ( rule__UnaryExpression__Group__0 ) )
+            // InternalScope.g:1142:1: ( rule__UnaryExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getUnaryExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1143:1: ( rule__UnaryExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1143:2: rule__UnaryExpression__Group__0
+            // InternalScope.g:1143:1: ( rule__UnaryExpression__Group__0 )
+            // InternalScope.g:1143:2: rule__UnaryExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__UnaryExpression__Group__0_in_ruleUnaryExpression2382);
+            pushFollow(FOLLOW_2);
             rule__UnaryExpression__Group__0();
 
             state._fsp--;
@@ -3463,16 +3463,16 @@ public final void ruleUnaryExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleInfixExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1155:1: entryRuleInfixExpression : ruleInfixExpression EOF ;
+    // InternalScope.g:1155:1: entryRuleInfixExpression : ruleInfixExpression EOF ;
     public final void entryRuleInfixExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1156:1: ( ruleInfixExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1157:1: ruleInfixExpression EOF
+            // InternalScope.g:1156:1: ( ruleInfixExpression EOF )
+            // InternalScope.g:1157:1: ruleInfixExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleInfixExpression_in_entryRuleInfixExpression2409);
+            pushFollow(FOLLOW_1);
             ruleInfixExpression();
 
             state._fsp--;
@@ -3480,7 +3480,7 @@ public final void entryRuleInfixExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInfixExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInfixExpression2416); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3497,25 +3497,25 @@ public final void entryRuleInfixExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleInfixExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1164:1: ruleInfixExpression : ( ( rule__InfixExpression__Group__0 ) ) ;
+    // InternalScope.g:1164:1: ruleInfixExpression : ( ( rule__InfixExpression__Group__0 ) ) ;
     public final void ruleInfixExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1168:2: ( ( ( rule__InfixExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1169:1: ( ( rule__InfixExpression__Group__0 ) )
+            // InternalScope.g:1168:2: ( ( ( rule__InfixExpression__Group__0 ) ) )
+            // InternalScope.g:1169:1: ( ( rule__InfixExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1169:1: ( ( rule__InfixExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1170:1: ( rule__InfixExpression__Group__0 )
+            // InternalScope.g:1169:1: ( ( rule__InfixExpression__Group__0 ) )
+            // InternalScope.g:1170:1: ( rule__InfixExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1171:1: ( rule__InfixExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1171:2: rule__InfixExpression__Group__0
+            // InternalScope.g:1171:1: ( rule__InfixExpression__Group__0 )
+            // InternalScope.g:1171:2: rule__InfixExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group__0_in_ruleInfixExpression2442);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group__0();
 
             state._fsp--;
@@ -3548,16 +3548,16 @@ public final void ruleInfixExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRulePrimaryExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1183:1: entryRulePrimaryExpression : rulePrimaryExpression EOF ;
+    // InternalScope.g:1183:1: entryRulePrimaryExpression : rulePrimaryExpression EOF ;
     public final void entryRulePrimaryExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1184:1: ( rulePrimaryExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1185:1: rulePrimaryExpression EOF
+            // InternalScope.g:1184:1: ( rulePrimaryExpression EOF )
+            // InternalScope.g:1185:1: rulePrimaryExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPrimaryExpressionRule()); 
             }
-            pushFollow(FOLLOW_rulePrimaryExpression_in_entryRulePrimaryExpression2469);
+            pushFollow(FOLLOW_1);
             rulePrimaryExpression();
 
             state._fsp--;
@@ -3565,7 +3565,7 @@ public final void entryRulePrimaryExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getPrimaryExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRulePrimaryExpression2476); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3582,25 +3582,25 @@ public final void entryRulePrimaryExpression() throws RecognitionException {
 
 
     // $ANTLR start "rulePrimaryExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1192:1: rulePrimaryExpression : ( ( rule__PrimaryExpression__Alternatives ) ) ;
+    // InternalScope.g:1192:1: rulePrimaryExpression : ( ( rule__PrimaryExpression__Alternatives ) ) ;
     public final void rulePrimaryExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1196:2: ( ( ( rule__PrimaryExpression__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1197:1: ( ( rule__PrimaryExpression__Alternatives ) )
+            // InternalScope.g:1196:2: ( ( ( rule__PrimaryExpression__Alternatives ) ) )
+            // InternalScope.g:1197:1: ( ( rule__PrimaryExpression__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1197:1: ( ( rule__PrimaryExpression__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1198:1: ( rule__PrimaryExpression__Alternatives )
+            // InternalScope.g:1197:1: ( ( rule__PrimaryExpression__Alternatives ) )
+            // InternalScope.g:1198:1: ( rule__PrimaryExpression__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPrimaryExpressionAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1199:1: ( rule__PrimaryExpression__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1199:2: rule__PrimaryExpression__Alternatives
+            // InternalScope.g:1199:1: ( rule__PrimaryExpression__Alternatives )
+            // InternalScope.g:1199:2: rule__PrimaryExpression__Alternatives
             {
-            pushFollow(FOLLOW_rule__PrimaryExpression__Alternatives_in_rulePrimaryExpression2502);
+            pushFollow(FOLLOW_2);
             rule__PrimaryExpression__Alternatives();
 
             state._fsp--;
@@ -3633,16 +3633,16 @@ public final void rulePrimaryExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleLiteral"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1211:1: entryRuleLiteral : ruleLiteral EOF ;
+    // InternalScope.g:1211:1: entryRuleLiteral : ruleLiteral EOF ;
     public final void entryRuleLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1212:1: ( ruleLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1213:1: ruleLiteral EOF
+            // InternalScope.g:1212:1: ( ruleLiteral EOF )
+            // InternalScope.g:1213:1: ruleLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleLiteral_in_entryRuleLiteral2529);
+            pushFollow(FOLLOW_1);
             ruleLiteral();
 
             state._fsp--;
@@ -3650,7 +3650,7 @@ public final void entryRuleLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleLiteral2536); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3667,25 +3667,25 @@ public final void entryRuleLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleLiteral"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1220:1: ruleLiteral : ( ( rule__Literal__Alternatives ) ) ;
+    // InternalScope.g:1220:1: ruleLiteral : ( ( rule__Literal__Alternatives ) ) ;
     public final void ruleLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1224:2: ( ( ( rule__Literal__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1225:1: ( ( rule__Literal__Alternatives ) )
+            // InternalScope.g:1224:2: ( ( ( rule__Literal__Alternatives ) ) )
+            // InternalScope.g:1225:1: ( ( rule__Literal__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1225:1: ( ( rule__Literal__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1226:1: ( rule__Literal__Alternatives )
+            // InternalScope.g:1225:1: ( ( rule__Literal__Alternatives ) )
+            // InternalScope.g:1226:1: ( rule__Literal__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLiteralAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1227:1: ( rule__Literal__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1227:2: rule__Literal__Alternatives
+            // InternalScope.g:1227:1: ( rule__Literal__Alternatives )
+            // InternalScope.g:1227:2: rule__Literal__Alternatives
             {
-            pushFollow(FOLLOW_rule__Literal__Alternatives_in_ruleLiteral2562);
+            pushFollow(FOLLOW_2);
             rule__Literal__Alternatives();
 
             state._fsp--;
@@ -3718,16 +3718,16 @@ public final void ruleLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleBooleanLiteral"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1239:1: entryRuleBooleanLiteral : ruleBooleanLiteral EOF ;
+    // InternalScope.g:1239:1: entryRuleBooleanLiteral : ruleBooleanLiteral EOF ;
     public final void entryRuleBooleanLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1240:1: ( ruleBooleanLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1241:1: ruleBooleanLiteral EOF
+            // InternalScope.g:1240:1: ( ruleBooleanLiteral EOF )
+            // InternalScope.g:1241:1: ruleBooleanLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getBooleanLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleBooleanLiteral_in_entryRuleBooleanLiteral2589);
+            pushFollow(FOLLOW_1);
             ruleBooleanLiteral();
 
             state._fsp--;
@@ -3735,7 +3735,7 @@ public final void entryRuleBooleanLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getBooleanLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleBooleanLiteral2596); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3752,25 +3752,25 @@ public final void entryRuleBooleanLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleBooleanLiteral"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1248:1: ruleBooleanLiteral : ( ( rule__BooleanLiteral__ValAssignment ) ) ;
+    // InternalScope.g:1248:1: ruleBooleanLiteral : ( ( rule__BooleanLiteral__ValAssignment ) ) ;
     public final void ruleBooleanLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1252:2: ( ( ( rule__BooleanLiteral__ValAssignment ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1253:1: ( ( rule__BooleanLiteral__ValAssignment ) )
+            // InternalScope.g:1252:2: ( ( ( rule__BooleanLiteral__ValAssignment ) ) )
+            // InternalScope.g:1253:1: ( ( rule__BooleanLiteral__ValAssignment ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1253:1: ( ( rule__BooleanLiteral__ValAssignment ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1254:1: ( rule__BooleanLiteral__ValAssignment )
+            // InternalScope.g:1253:1: ( ( rule__BooleanLiteral__ValAssignment ) )
+            // InternalScope.g:1254:1: ( rule__BooleanLiteral__ValAssignment )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getBooleanLiteralAccess().getValAssignment()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1255:1: ( rule__BooleanLiteral__ValAssignment )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1255:2: rule__BooleanLiteral__ValAssignment
+            // InternalScope.g:1255:1: ( rule__BooleanLiteral__ValAssignment )
+            // InternalScope.g:1255:2: rule__BooleanLiteral__ValAssignment
             {
-            pushFollow(FOLLOW_rule__BooleanLiteral__ValAssignment_in_ruleBooleanLiteral2622);
+            pushFollow(FOLLOW_2);
             rule__BooleanLiteral__ValAssignment();
 
             state._fsp--;
@@ -3803,16 +3803,16 @@ public final void ruleBooleanLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleIntegerLiteral"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1267:1: entryRuleIntegerLiteral : ruleIntegerLiteral EOF ;
+    // InternalScope.g:1267:1: entryRuleIntegerLiteral : ruleIntegerLiteral EOF ;
     public final void entryRuleIntegerLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1268:1: ( ruleIntegerLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1269:1: ruleIntegerLiteral EOF
+            // InternalScope.g:1268:1: ( ruleIntegerLiteral EOF )
+            // InternalScope.g:1269:1: ruleIntegerLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIntegerLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleIntegerLiteral_in_entryRuleIntegerLiteral2649);
+            pushFollow(FOLLOW_1);
             ruleIntegerLiteral();
 
             state._fsp--;
@@ -3820,7 +3820,7 @@ public final void entryRuleIntegerLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIntegerLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIntegerLiteral2656); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3837,25 +3837,25 @@ public final void entryRuleIntegerLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleIntegerLiteral"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1276:1: ruleIntegerLiteral : ( ( rule__IntegerLiteral__ValAssignment ) ) ;
+    // InternalScope.g:1276:1: ruleIntegerLiteral : ( ( rule__IntegerLiteral__ValAssignment ) ) ;
     public final void ruleIntegerLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1280:2: ( ( ( rule__IntegerLiteral__ValAssignment ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1281:1: ( ( rule__IntegerLiteral__ValAssignment ) )
+            // InternalScope.g:1280:2: ( ( ( rule__IntegerLiteral__ValAssignment ) ) )
+            // InternalScope.g:1281:1: ( ( rule__IntegerLiteral__ValAssignment ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1281:1: ( ( rule__IntegerLiteral__ValAssignment ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1282:1: ( rule__IntegerLiteral__ValAssignment )
+            // InternalScope.g:1281:1: ( ( rule__IntegerLiteral__ValAssignment ) )
+            // InternalScope.g:1282:1: ( rule__IntegerLiteral__ValAssignment )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIntegerLiteralAccess().getValAssignment()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1283:1: ( rule__IntegerLiteral__ValAssignment )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1283:2: rule__IntegerLiteral__ValAssignment
+            // InternalScope.g:1283:1: ( rule__IntegerLiteral__ValAssignment )
+            // InternalScope.g:1283:2: rule__IntegerLiteral__ValAssignment
             {
-            pushFollow(FOLLOW_rule__IntegerLiteral__ValAssignment_in_ruleIntegerLiteral2682);
+            pushFollow(FOLLOW_2);
             rule__IntegerLiteral__ValAssignment();
 
             state._fsp--;
@@ -3888,16 +3888,16 @@ public final void ruleIntegerLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleNullLiteral"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1295:1: entryRuleNullLiteral : ruleNullLiteral EOF ;
+    // InternalScope.g:1295:1: entryRuleNullLiteral : ruleNullLiteral EOF ;
     public final void entryRuleNullLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1296:1: ( ruleNullLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1297:1: ruleNullLiteral EOF
+            // InternalScope.g:1296:1: ( ruleNullLiteral EOF )
+            // InternalScope.g:1297:1: ruleNullLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNullLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleNullLiteral_in_entryRuleNullLiteral2709);
+            pushFollow(FOLLOW_1);
             ruleNullLiteral();
 
             state._fsp--;
@@ -3905,7 +3905,7 @@ public final void entryRuleNullLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getNullLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNullLiteral2716); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -3922,25 +3922,25 @@ public final void entryRuleNullLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleNullLiteral"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1304:1: ruleNullLiteral : ( ( rule__NullLiteral__ValAssignment ) ) ;
+    // InternalScope.g:1304:1: ruleNullLiteral : ( ( rule__NullLiteral__ValAssignment ) ) ;
     public final void ruleNullLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1308:2: ( ( ( rule__NullLiteral__ValAssignment ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1309:1: ( ( rule__NullLiteral__ValAssignment ) )
+            // InternalScope.g:1308:2: ( ( ( rule__NullLiteral__ValAssignment ) ) )
+            // InternalScope.g:1309:1: ( ( rule__NullLiteral__ValAssignment ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1309:1: ( ( rule__NullLiteral__ValAssignment ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1310:1: ( rule__NullLiteral__ValAssignment )
+            // InternalScope.g:1309:1: ( ( rule__NullLiteral__ValAssignment ) )
+            // InternalScope.g:1310:1: ( rule__NullLiteral__ValAssignment )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNullLiteralAccess().getValAssignment()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1311:1: ( rule__NullLiteral__ValAssignment )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1311:2: rule__NullLiteral__ValAssignment
+            // InternalScope.g:1311:1: ( rule__NullLiteral__ValAssignment )
+            // InternalScope.g:1311:2: rule__NullLiteral__ValAssignment
             {
-            pushFollow(FOLLOW_rule__NullLiteral__ValAssignment_in_ruleNullLiteral2742);
+            pushFollow(FOLLOW_2);
             rule__NullLiteral__ValAssignment();
 
             state._fsp--;
@@ -3973,16 +3973,16 @@ public final void ruleNullLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleRealLiteral"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1323:1: entryRuleRealLiteral : ruleRealLiteral EOF ;
+    // InternalScope.g:1323:1: entryRuleRealLiteral : ruleRealLiteral EOF ;
     public final void entryRuleRealLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1324:1: ( ruleRealLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1325:1: ruleRealLiteral EOF
+            // InternalScope.g:1324:1: ( ruleRealLiteral EOF )
+            // InternalScope.g:1325:1: ruleRealLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRealLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleRealLiteral_in_entryRuleRealLiteral2769);
+            pushFollow(FOLLOW_1);
             ruleRealLiteral();
 
             state._fsp--;
@@ -3990,7 +3990,7 @@ public final void entryRuleRealLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getRealLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRealLiteral2776); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4007,25 +4007,25 @@ public final void entryRuleRealLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleRealLiteral"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1332:1: ruleRealLiteral : ( ( rule__RealLiteral__ValAssignment ) ) ;
+    // InternalScope.g:1332:1: ruleRealLiteral : ( ( rule__RealLiteral__ValAssignment ) ) ;
     public final void ruleRealLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1336:2: ( ( ( rule__RealLiteral__ValAssignment ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1337:1: ( ( rule__RealLiteral__ValAssignment ) )
+            // InternalScope.g:1336:2: ( ( ( rule__RealLiteral__ValAssignment ) ) )
+            // InternalScope.g:1337:1: ( ( rule__RealLiteral__ValAssignment ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1337:1: ( ( rule__RealLiteral__ValAssignment ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1338:1: ( rule__RealLiteral__ValAssignment )
+            // InternalScope.g:1337:1: ( ( rule__RealLiteral__ValAssignment ) )
+            // InternalScope.g:1338:1: ( rule__RealLiteral__ValAssignment )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRealLiteralAccess().getValAssignment()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1339:1: ( rule__RealLiteral__ValAssignment )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1339:2: rule__RealLiteral__ValAssignment
+            // InternalScope.g:1339:1: ( rule__RealLiteral__ValAssignment )
+            // InternalScope.g:1339:2: rule__RealLiteral__ValAssignment
             {
-            pushFollow(FOLLOW_rule__RealLiteral__ValAssignment_in_ruleRealLiteral2802);
+            pushFollow(FOLLOW_2);
             rule__RealLiteral__ValAssignment();
 
             state._fsp--;
@@ -4058,16 +4058,16 @@ public final void ruleRealLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleStringLiteral"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1351:1: entryRuleStringLiteral : ruleStringLiteral EOF ;
+    // InternalScope.g:1351:1: entryRuleStringLiteral : ruleStringLiteral EOF ;
     public final void entryRuleStringLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1352:1: ( ruleStringLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1353:1: ruleStringLiteral EOF
+            // InternalScope.g:1352:1: ( ruleStringLiteral EOF )
+            // InternalScope.g:1353:1: ruleStringLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getStringLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral2829);
+            pushFollow(FOLLOW_1);
             ruleStringLiteral();
 
             state._fsp--;
@@ -4075,7 +4075,7 @@ public final void entryRuleStringLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getStringLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleStringLiteral2836); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4092,25 +4092,25 @@ public final void entryRuleStringLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleStringLiteral"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1360:1: ruleStringLiteral : ( ( rule__StringLiteral__ValAssignment ) ) ;
+    // InternalScope.g:1360:1: ruleStringLiteral : ( ( rule__StringLiteral__ValAssignment ) ) ;
     public final void ruleStringLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1364:2: ( ( ( rule__StringLiteral__ValAssignment ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1365:1: ( ( rule__StringLiteral__ValAssignment ) )
+            // InternalScope.g:1364:2: ( ( ( rule__StringLiteral__ValAssignment ) ) )
+            // InternalScope.g:1365:1: ( ( rule__StringLiteral__ValAssignment ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1365:1: ( ( rule__StringLiteral__ValAssignment ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1366:1: ( rule__StringLiteral__ValAssignment )
+            // InternalScope.g:1365:1: ( ( rule__StringLiteral__ValAssignment ) )
+            // InternalScope.g:1366:1: ( rule__StringLiteral__ValAssignment )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getStringLiteralAccess().getValAssignment()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1367:1: ( rule__StringLiteral__ValAssignment )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1367:2: rule__StringLiteral__ValAssignment
+            // InternalScope.g:1367:1: ( rule__StringLiteral__ValAssignment )
+            // InternalScope.g:1367:2: rule__StringLiteral__ValAssignment
             {
-            pushFollow(FOLLOW_rule__StringLiteral__ValAssignment_in_ruleStringLiteral2862);
+            pushFollow(FOLLOW_2);
             rule__StringLiteral__ValAssignment();
 
             state._fsp--;
@@ -4143,16 +4143,16 @@ public final void ruleStringLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleParanthesizedExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1379:1: entryRuleParanthesizedExpression : ruleParanthesizedExpression EOF ;
+    // InternalScope.g:1379:1: entryRuleParanthesizedExpression : ruleParanthesizedExpression EOF ;
     public final void entryRuleParanthesizedExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1380:1: ( ruleParanthesizedExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1381:1: ruleParanthesizedExpression EOF
+            // InternalScope.g:1380:1: ( ruleParanthesizedExpression EOF )
+            // InternalScope.g:1381:1: ruleParanthesizedExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getParanthesizedExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleParanthesizedExpression_in_entryRuleParanthesizedExpression2889);
+            pushFollow(FOLLOW_1);
             ruleParanthesizedExpression();
 
             state._fsp--;
@@ -4160,7 +4160,7 @@ public final void entryRuleParanthesizedExpression() throws RecognitionException
             if ( state.backtracking==0 ) {
                after(grammarAccess.getParanthesizedExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleParanthesizedExpression2896); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4177,25 +4177,25 @@ public final void entryRuleParanthesizedExpression() throws RecognitionException
 
 
     // $ANTLR start "ruleParanthesizedExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1388:1: ruleParanthesizedExpression : ( ( rule__ParanthesizedExpression__Group__0 ) ) ;
+    // InternalScope.g:1388:1: ruleParanthesizedExpression : ( ( rule__ParanthesizedExpression__Group__0 ) ) ;
     public final void ruleParanthesizedExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1392:2: ( ( ( rule__ParanthesizedExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1393:1: ( ( rule__ParanthesizedExpression__Group__0 ) )
+            // InternalScope.g:1392:2: ( ( ( rule__ParanthesizedExpression__Group__0 ) ) )
+            // InternalScope.g:1393:1: ( ( rule__ParanthesizedExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1393:1: ( ( rule__ParanthesizedExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1394:1: ( rule__ParanthesizedExpression__Group__0 )
+            // InternalScope.g:1393:1: ( ( rule__ParanthesizedExpression__Group__0 ) )
+            // InternalScope.g:1394:1: ( rule__ParanthesizedExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getParanthesizedExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1395:1: ( rule__ParanthesizedExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1395:2: rule__ParanthesizedExpression__Group__0
+            // InternalScope.g:1395:1: ( rule__ParanthesizedExpression__Group__0 )
+            // InternalScope.g:1395:2: rule__ParanthesizedExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__ParanthesizedExpression__Group__0_in_ruleParanthesizedExpression2922);
+            pushFollow(FOLLOW_2);
             rule__ParanthesizedExpression__Group__0();
 
             state._fsp--;
@@ -4228,16 +4228,16 @@ public final void ruleParanthesizedExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleGlobalVarExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1407:1: entryRuleGlobalVarExpression : ruleGlobalVarExpression EOF ;
+    // InternalScope.g:1407:1: entryRuleGlobalVarExpression : ruleGlobalVarExpression EOF ;
     public final void entryRuleGlobalVarExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1408:1: ( ruleGlobalVarExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1409:1: ruleGlobalVarExpression EOF
+            // InternalScope.g:1408:1: ( ruleGlobalVarExpression EOF )
+            // InternalScope.g:1409:1: ruleGlobalVarExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalVarExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleGlobalVarExpression_in_entryRuleGlobalVarExpression2949);
+            pushFollow(FOLLOW_1);
             ruleGlobalVarExpression();
 
             state._fsp--;
@@ -4245,7 +4245,7 @@ public final void entryRuleGlobalVarExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGlobalVarExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleGlobalVarExpression2956); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4262,25 +4262,25 @@ public final void entryRuleGlobalVarExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleGlobalVarExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1416:1: ruleGlobalVarExpression : ( ( rule__GlobalVarExpression__Group__0 ) ) ;
+    // InternalScope.g:1416:1: ruleGlobalVarExpression : ( ( rule__GlobalVarExpression__Group__0 ) ) ;
     public final void ruleGlobalVarExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1420:2: ( ( ( rule__GlobalVarExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1421:1: ( ( rule__GlobalVarExpression__Group__0 ) )
+            // InternalScope.g:1420:2: ( ( ( rule__GlobalVarExpression__Group__0 ) ) )
+            // InternalScope.g:1421:1: ( ( rule__GlobalVarExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1421:1: ( ( rule__GlobalVarExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1422:1: ( rule__GlobalVarExpression__Group__0 )
+            // InternalScope.g:1421:1: ( ( rule__GlobalVarExpression__Group__0 ) )
+            // InternalScope.g:1422:1: ( rule__GlobalVarExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalVarExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1423:1: ( rule__GlobalVarExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1423:2: rule__GlobalVarExpression__Group__0
+            // InternalScope.g:1423:1: ( rule__GlobalVarExpression__Group__0 )
+            // InternalScope.g:1423:2: rule__GlobalVarExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__GlobalVarExpression__Group__0_in_ruleGlobalVarExpression2982);
+            pushFollow(FOLLOW_2);
             rule__GlobalVarExpression__Group__0();
 
             state._fsp--;
@@ -4313,16 +4313,16 @@ public final void ruleGlobalVarExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleFeatureCall"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1435:1: entryRuleFeatureCall : ruleFeatureCall EOF ;
+    // InternalScope.g:1435:1: entryRuleFeatureCall : ruleFeatureCall EOF ;
     public final void entryRuleFeatureCall() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1436:1: ( ruleFeatureCall EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1437:1: ruleFeatureCall EOF
+            // InternalScope.g:1436:1: ( ruleFeatureCall EOF )
+            // InternalScope.g:1437:1: ruleFeatureCall EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFeatureCallRule()); 
             }
-            pushFollow(FOLLOW_ruleFeatureCall_in_entryRuleFeatureCall3009);
+            pushFollow(FOLLOW_1);
             ruleFeatureCall();
 
             state._fsp--;
@@ -4330,7 +4330,7 @@ public final void entryRuleFeatureCall() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getFeatureCallRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFeatureCall3016); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4347,25 +4347,25 @@ public final void entryRuleFeatureCall() throws RecognitionException {
 
 
     // $ANTLR start "ruleFeatureCall"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1444:1: ruleFeatureCall : ( ( rule__FeatureCall__Alternatives ) ) ;
+    // InternalScope.g:1444:1: ruleFeatureCall : ( ( rule__FeatureCall__Alternatives ) ) ;
     public final void ruleFeatureCall() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1448:2: ( ( ( rule__FeatureCall__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1449:1: ( ( rule__FeatureCall__Alternatives ) )
+            // InternalScope.g:1448:2: ( ( ( rule__FeatureCall__Alternatives ) ) )
+            // InternalScope.g:1449:1: ( ( rule__FeatureCall__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1449:1: ( ( rule__FeatureCall__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1450:1: ( rule__FeatureCall__Alternatives )
+            // InternalScope.g:1449:1: ( ( rule__FeatureCall__Alternatives ) )
+            // InternalScope.g:1450:1: ( rule__FeatureCall__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFeatureCallAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1451:1: ( rule__FeatureCall__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1451:2: rule__FeatureCall__Alternatives
+            // InternalScope.g:1451:1: ( rule__FeatureCall__Alternatives )
+            // InternalScope.g:1451:2: rule__FeatureCall__Alternatives
             {
-            pushFollow(FOLLOW_rule__FeatureCall__Alternatives_in_ruleFeatureCall3042);
+            pushFollow(FOLLOW_2);
             rule__FeatureCall__Alternatives();
 
             state._fsp--;
@@ -4398,16 +4398,16 @@ public final void ruleFeatureCall() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOperationCall"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1463:1: entryRuleOperationCall : ruleOperationCall EOF ;
+    // InternalScope.g:1463:1: entryRuleOperationCall : ruleOperationCall EOF ;
     public final void entryRuleOperationCall() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1464:1: ( ruleOperationCall EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1465:1: ruleOperationCall EOF
+            // InternalScope.g:1464:1: ( ruleOperationCall EOF )
+            // InternalScope.g:1465:1: ruleOperationCall EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOperationCallRule()); 
             }
-            pushFollow(FOLLOW_ruleOperationCall_in_entryRuleOperationCall3069);
+            pushFollow(FOLLOW_1);
             ruleOperationCall();
 
             state._fsp--;
@@ -4415,7 +4415,7 @@ public final void entryRuleOperationCall() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOperationCallRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOperationCall3076); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4432,25 +4432,25 @@ public final void entryRuleOperationCall() throws RecognitionException {
 
 
     // $ANTLR start "ruleOperationCall"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1472:1: ruleOperationCall : ( ( rule__OperationCall__Group__0 ) ) ;
+    // InternalScope.g:1472:1: ruleOperationCall : ( ( rule__OperationCall__Group__0 ) ) ;
     public final void ruleOperationCall() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1476:2: ( ( ( rule__OperationCall__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1477:1: ( ( rule__OperationCall__Group__0 ) )
+            // InternalScope.g:1476:2: ( ( ( rule__OperationCall__Group__0 ) ) )
+            // InternalScope.g:1477:1: ( ( rule__OperationCall__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1477:1: ( ( rule__OperationCall__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1478:1: ( rule__OperationCall__Group__0 )
+            // InternalScope.g:1477:1: ( ( rule__OperationCall__Group__0 ) )
+            // InternalScope.g:1478:1: ( rule__OperationCall__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOperationCallAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1479:1: ( rule__OperationCall__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1479:2: rule__OperationCall__Group__0
+            // InternalScope.g:1479:1: ( rule__OperationCall__Group__0 )
+            // InternalScope.g:1479:2: rule__OperationCall__Group__0
             {
-            pushFollow(FOLLOW_rule__OperationCall__Group__0_in_ruleOperationCall3102);
+            pushFollow(FOLLOW_2);
             rule__OperationCall__Group__0();
 
             state._fsp--;
@@ -4483,16 +4483,16 @@ public final void ruleOperationCall() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleListLiteral"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1491:1: entryRuleListLiteral : ruleListLiteral EOF ;
+    // InternalScope.g:1491:1: entryRuleListLiteral : ruleListLiteral EOF ;
     public final void entryRuleListLiteral() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1492:1: ( ruleListLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1493:1: ruleListLiteral EOF
+            // InternalScope.g:1492:1: ( ruleListLiteral EOF )
+            // InternalScope.g:1493:1: ruleListLiteral EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getListLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleListLiteral_in_entryRuleListLiteral3129);
+            pushFollow(FOLLOW_1);
             ruleListLiteral();
 
             state._fsp--;
@@ -4500,7 +4500,7 @@ public final void entryRuleListLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getListLiteralRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleListLiteral3136); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4517,25 +4517,25 @@ public final void entryRuleListLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleListLiteral"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1500:1: ruleListLiteral : ( ( rule__ListLiteral__Group__0 ) ) ;
+    // InternalScope.g:1500:1: ruleListLiteral : ( ( rule__ListLiteral__Group__0 ) ) ;
     public final void ruleListLiteral() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1504:2: ( ( ( rule__ListLiteral__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1505:1: ( ( rule__ListLiteral__Group__0 ) )
+            // InternalScope.g:1504:2: ( ( ( rule__ListLiteral__Group__0 ) ) )
+            // InternalScope.g:1505:1: ( ( rule__ListLiteral__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1505:1: ( ( rule__ListLiteral__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1506:1: ( rule__ListLiteral__Group__0 )
+            // InternalScope.g:1505:1: ( ( rule__ListLiteral__Group__0 ) )
+            // InternalScope.g:1506:1: ( rule__ListLiteral__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getListLiteralAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1507:1: ( rule__ListLiteral__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1507:2: rule__ListLiteral__Group__0
+            // InternalScope.g:1507:1: ( rule__ListLiteral__Group__0 )
+            // InternalScope.g:1507:2: rule__ListLiteral__Group__0
             {
-            pushFollow(FOLLOW_rule__ListLiteral__Group__0_in_ruleListLiteral3162);
+            pushFollow(FOLLOW_2);
             rule__ListLiteral__Group__0();
 
             state._fsp--;
@@ -4568,16 +4568,16 @@ public final void ruleListLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleConstructorCallExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1519:1: entryRuleConstructorCallExpression : ruleConstructorCallExpression EOF ;
+    // InternalScope.g:1519:1: entryRuleConstructorCallExpression : ruleConstructorCallExpression EOF ;
     public final void entryRuleConstructorCallExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1520:1: ( ruleConstructorCallExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1521:1: ruleConstructorCallExpression EOF
+            // InternalScope.g:1520:1: ( ruleConstructorCallExpression EOF )
+            // InternalScope.g:1521:1: ruleConstructorCallExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConstructorCallExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleConstructorCallExpression_in_entryRuleConstructorCallExpression3189);
+            pushFollow(FOLLOW_1);
             ruleConstructorCallExpression();
 
             state._fsp--;
@@ -4585,7 +4585,7 @@ public final void entryRuleConstructorCallExpression() throws RecognitionExcepti
             if ( state.backtracking==0 ) {
                after(grammarAccess.getConstructorCallExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleConstructorCallExpression3196); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4602,25 +4602,25 @@ public final void entryRuleConstructorCallExpression() throws RecognitionExcepti
 
 
     // $ANTLR start "ruleConstructorCallExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1528:1: ruleConstructorCallExpression : ( ( rule__ConstructorCallExpression__Group__0 ) ) ;
+    // InternalScope.g:1528:1: ruleConstructorCallExpression : ( ( rule__ConstructorCallExpression__Group__0 ) ) ;
     public final void ruleConstructorCallExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1532:2: ( ( ( rule__ConstructorCallExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1533:1: ( ( rule__ConstructorCallExpression__Group__0 ) )
+            // InternalScope.g:1532:2: ( ( ( rule__ConstructorCallExpression__Group__0 ) ) )
+            // InternalScope.g:1533:1: ( ( rule__ConstructorCallExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1533:1: ( ( rule__ConstructorCallExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1534:1: ( rule__ConstructorCallExpression__Group__0 )
+            // InternalScope.g:1533:1: ( ( rule__ConstructorCallExpression__Group__0 ) )
+            // InternalScope.g:1534:1: ( rule__ConstructorCallExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConstructorCallExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1535:1: ( rule__ConstructorCallExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1535:2: rule__ConstructorCallExpression__Group__0
+            // InternalScope.g:1535:1: ( rule__ConstructorCallExpression__Group__0 )
+            // InternalScope.g:1535:2: rule__ConstructorCallExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__ConstructorCallExpression__Group__0_in_ruleConstructorCallExpression3222);
+            pushFollow(FOLLOW_2);
             rule__ConstructorCallExpression__Group__0();
 
             state._fsp--;
@@ -4653,16 +4653,16 @@ public final void ruleConstructorCallExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleTypeSelectExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1547:1: entryRuleTypeSelectExpression : ruleTypeSelectExpression EOF ;
+    // InternalScope.g:1547:1: entryRuleTypeSelectExpression : ruleTypeSelectExpression EOF ;
     public final void entryRuleTypeSelectExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1548:1: ( ruleTypeSelectExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1549:1: ruleTypeSelectExpression EOF
+            // InternalScope.g:1548:1: ( ruleTypeSelectExpression EOF )
+            // InternalScope.g:1549:1: ruleTypeSelectExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTypeSelectExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleTypeSelectExpression_in_entryRuleTypeSelectExpression3249);
+            pushFollow(FOLLOW_1);
             ruleTypeSelectExpression();
 
             state._fsp--;
@@ -4670,7 +4670,7 @@ public final void entryRuleTypeSelectExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getTypeSelectExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTypeSelectExpression3256); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4687,25 +4687,25 @@ public final void entryRuleTypeSelectExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleTypeSelectExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1556:1: ruleTypeSelectExpression : ( ( rule__TypeSelectExpression__Group__0 ) ) ;
+    // InternalScope.g:1556:1: ruleTypeSelectExpression : ( ( rule__TypeSelectExpression__Group__0 ) ) ;
     public final void ruleTypeSelectExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1560:2: ( ( ( rule__TypeSelectExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1561:1: ( ( rule__TypeSelectExpression__Group__0 ) )
+            // InternalScope.g:1560:2: ( ( ( rule__TypeSelectExpression__Group__0 ) ) )
+            // InternalScope.g:1561:1: ( ( rule__TypeSelectExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1561:1: ( ( rule__TypeSelectExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1562:1: ( rule__TypeSelectExpression__Group__0 )
+            // InternalScope.g:1561:1: ( ( rule__TypeSelectExpression__Group__0 ) )
+            // InternalScope.g:1562:1: ( rule__TypeSelectExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTypeSelectExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1563:1: ( rule__TypeSelectExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1563:2: rule__TypeSelectExpression__Group__0
+            // InternalScope.g:1563:1: ( rule__TypeSelectExpression__Group__0 )
+            // InternalScope.g:1563:2: rule__TypeSelectExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__TypeSelectExpression__Group__0_in_ruleTypeSelectExpression3282);
+            pushFollow(FOLLOW_2);
             rule__TypeSelectExpression__Group__0();
 
             state._fsp--;
@@ -4738,16 +4738,16 @@ public final void ruleTypeSelectExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleCollectionExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1575:1: entryRuleCollectionExpression : ruleCollectionExpression EOF ;
+    // InternalScope.g:1575:1: entryRuleCollectionExpression : ruleCollectionExpression EOF ;
     public final void entryRuleCollectionExpression() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1576:1: ( ruleCollectionExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1577:1: ruleCollectionExpression EOF
+            // InternalScope.g:1576:1: ( ruleCollectionExpression EOF )
+            // InternalScope.g:1577:1: ruleCollectionExpression EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleCollectionExpression_in_entryRuleCollectionExpression3309);
+            pushFollow(FOLLOW_1);
             ruleCollectionExpression();
 
             state._fsp--;
@@ -4755,7 +4755,7 @@ public final void entryRuleCollectionExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCollectionExpressionRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleCollectionExpression3316); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4772,25 +4772,25 @@ public final void entryRuleCollectionExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleCollectionExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1584:1: ruleCollectionExpression : ( ( rule__CollectionExpression__Group__0 ) ) ;
+    // InternalScope.g:1584:1: ruleCollectionExpression : ( ( rule__CollectionExpression__Group__0 ) ) ;
     public final void ruleCollectionExpression() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1588:2: ( ( ( rule__CollectionExpression__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1589:1: ( ( rule__CollectionExpression__Group__0 ) )
+            // InternalScope.g:1588:2: ( ( ( rule__CollectionExpression__Group__0 ) ) )
+            // InternalScope.g:1589:1: ( ( rule__CollectionExpression__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1589:1: ( ( rule__CollectionExpression__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1590:1: ( rule__CollectionExpression__Group__0 )
+            // InternalScope.g:1589:1: ( ( rule__CollectionExpression__Group__0 ) )
+            // InternalScope.g:1590:1: ( rule__CollectionExpression__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionExpressionAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1591:1: ( rule__CollectionExpression__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1591:2: rule__CollectionExpression__Group__0
+            // InternalScope.g:1591:1: ( rule__CollectionExpression__Group__0 )
+            // InternalScope.g:1591:2: rule__CollectionExpression__Group__0
             {
-            pushFollow(FOLLOW_rule__CollectionExpression__Group__0_in_ruleCollectionExpression3342);
+            pushFollow(FOLLOW_2);
             rule__CollectionExpression__Group__0();
 
             state._fsp--;
@@ -4823,16 +4823,16 @@ public final void ruleCollectionExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleType"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1603:1: entryRuleType : ruleType EOF ;
+    // InternalScope.g:1603:1: entryRuleType : ruleType EOF ;
     public final void entryRuleType() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1604:1: ( ruleType EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1605:1: ruleType EOF
+            // InternalScope.g:1604:1: ( ruleType EOF )
+            // InternalScope.g:1605:1: ruleType EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTypeRule()); 
             }
-            pushFollow(FOLLOW_ruleType_in_entryRuleType3369);
+            pushFollow(FOLLOW_1);
             ruleType();
 
             state._fsp--;
@@ -4840,7 +4840,7 @@ public final void entryRuleType() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getTypeRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleType3376); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4857,25 +4857,25 @@ public final void entryRuleType() throws RecognitionException {
 
 
     // $ANTLR start "ruleType"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1612:1: ruleType : ( ( rule__Type__Alternatives ) ) ;
+    // InternalScope.g:1612:1: ruleType : ( ( rule__Type__Alternatives ) ) ;
     public final void ruleType() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1616:2: ( ( ( rule__Type__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1617:1: ( ( rule__Type__Alternatives ) )
+            // InternalScope.g:1616:2: ( ( ( rule__Type__Alternatives ) ) )
+            // InternalScope.g:1617:1: ( ( rule__Type__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1617:1: ( ( rule__Type__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1618:1: ( rule__Type__Alternatives )
+            // InternalScope.g:1617:1: ( ( rule__Type__Alternatives ) )
+            // InternalScope.g:1618:1: ( rule__Type__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTypeAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1619:1: ( rule__Type__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1619:2: rule__Type__Alternatives
+            // InternalScope.g:1619:1: ( rule__Type__Alternatives )
+            // InternalScope.g:1619:2: rule__Type__Alternatives
             {
-            pushFollow(FOLLOW_rule__Type__Alternatives_in_ruleType3402);
+            pushFollow(FOLLOW_2);
             rule__Type__Alternatives();
 
             state._fsp--;
@@ -4908,16 +4908,16 @@ public final void ruleType() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleCollectionType"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1631:1: entryRuleCollectionType : ruleCollectionType EOF ;
+    // InternalScope.g:1631:1: entryRuleCollectionType : ruleCollectionType EOF ;
     public final void entryRuleCollectionType() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1632:1: ( ruleCollectionType EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1633:1: ruleCollectionType EOF
+            // InternalScope.g:1632:1: ( ruleCollectionType EOF )
+            // InternalScope.g:1633:1: ruleCollectionType EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionTypeRule()); 
             }
-            pushFollow(FOLLOW_ruleCollectionType_in_entryRuleCollectionType3429);
+            pushFollow(FOLLOW_1);
             ruleCollectionType();
 
             state._fsp--;
@@ -4925,7 +4925,7 @@ public final void entryRuleCollectionType() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCollectionTypeRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleCollectionType3436); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -4942,25 +4942,25 @@ public final void entryRuleCollectionType() throws RecognitionException {
 
 
     // $ANTLR start "ruleCollectionType"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1640:1: ruleCollectionType : ( ( rule__CollectionType__Group__0 ) ) ;
+    // InternalScope.g:1640:1: ruleCollectionType : ( ( rule__CollectionType__Group__0 ) ) ;
     public final void ruleCollectionType() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1644:2: ( ( ( rule__CollectionType__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1645:1: ( ( rule__CollectionType__Group__0 ) )
+            // InternalScope.g:1644:2: ( ( ( rule__CollectionType__Group__0 ) ) )
+            // InternalScope.g:1645:1: ( ( rule__CollectionType__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1645:1: ( ( rule__CollectionType__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1646:1: ( rule__CollectionType__Group__0 )
+            // InternalScope.g:1645:1: ( ( rule__CollectionType__Group__0 ) )
+            // InternalScope.g:1646:1: ( rule__CollectionType__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionTypeAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1647:1: ( rule__CollectionType__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1647:2: rule__CollectionType__Group__0
+            // InternalScope.g:1647:1: ( rule__CollectionType__Group__0 )
+            // InternalScope.g:1647:2: rule__CollectionType__Group__0
             {
-            pushFollow(FOLLOW_rule__CollectionType__Group__0_in_ruleCollectionType3462);
+            pushFollow(FOLLOW_2);
             rule__CollectionType__Group__0();
 
             state._fsp--;
@@ -4993,16 +4993,16 @@ public final void ruleCollectionType() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleSimpleType"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1659:1: entryRuleSimpleType : ruleSimpleType EOF ;
+    // InternalScope.g:1659:1: entryRuleSimpleType : ruleSimpleType EOF ;
     public final void entryRuleSimpleType() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1660:1: ( ruleSimpleType EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1661:1: ruleSimpleType EOF
+            // InternalScope.g:1660:1: ( ruleSimpleType EOF )
+            // InternalScope.g:1661:1: ruleSimpleType EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSimpleTypeRule()); 
             }
-            pushFollow(FOLLOW_ruleSimpleType_in_entryRuleSimpleType3489);
+            pushFollow(FOLLOW_1);
             ruleSimpleType();
 
             state._fsp--;
@@ -5010,7 +5010,7 @@ public final void entryRuleSimpleType() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSimpleTypeRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSimpleType3496); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -5027,25 +5027,25 @@ public final void entryRuleSimpleType() throws RecognitionException {
 
 
     // $ANTLR start "ruleSimpleType"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1668:1: ruleSimpleType : ( ( rule__SimpleType__Group__0 ) ) ;
+    // InternalScope.g:1668:1: ruleSimpleType : ( ( rule__SimpleType__Group__0 ) ) ;
     public final void ruleSimpleType() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1672:2: ( ( ( rule__SimpleType__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1673:1: ( ( rule__SimpleType__Group__0 ) )
+            // InternalScope.g:1672:2: ( ( ( rule__SimpleType__Group__0 ) ) )
+            // InternalScope.g:1673:1: ( ( rule__SimpleType__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1673:1: ( ( rule__SimpleType__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1674:1: ( rule__SimpleType__Group__0 )
+            // InternalScope.g:1673:1: ( ( rule__SimpleType__Group__0 ) )
+            // InternalScope.g:1674:1: ( rule__SimpleType__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSimpleTypeAccess().getGroup()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1675:1: ( rule__SimpleType__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1675:2: rule__SimpleType__Group__0
+            // InternalScope.g:1675:1: ( rule__SimpleType__Group__0 )
+            // InternalScope.g:1675:2: rule__SimpleType__Group__0
             {
-            pushFollow(FOLLOW_rule__SimpleType__Group__0_in_ruleSimpleType3522);
+            pushFollow(FOLLOW_2);
             rule__SimpleType__Group__0();
 
             state._fsp--;
@@ -5078,16 +5078,16 @@ public final void ruleSimpleType() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleIdentifier"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1687:1: entryRuleIdentifier : ruleIdentifier EOF ;
+    // InternalScope.g:1687:1: entryRuleIdentifier : ruleIdentifier EOF ;
     public final void entryRuleIdentifier() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1688:1: ( ruleIdentifier EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1689:1: ruleIdentifier EOF
+            // InternalScope.g:1688:1: ( ruleIdentifier EOF )
+            // InternalScope.g:1689:1: ruleIdentifier EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIdentifierRule()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_entryRuleIdentifier3549);
+            pushFollow(FOLLOW_1);
             ruleIdentifier();
 
             state._fsp--;
@@ -5095,7 +5095,7 @@ public final void entryRuleIdentifier() throws RecognitionException {
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIdentifierRule()); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIdentifier3556); if (state.failed) return ;
+            match(input,EOF,FOLLOW_2); if (state.failed) return ;
 
             }
 
@@ -5112,22 +5112,22 @@ public final void entryRuleIdentifier() throws RecognitionException {
 
 
     // $ANTLR start "ruleIdentifier"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1696:1: ruleIdentifier : ( RULE_ID ) ;
+    // InternalScope.g:1696:1: ruleIdentifier : ( RULE_ID ) ;
     public final void ruleIdentifier() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1700:2: ( ( RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1701:1: ( RULE_ID )
+            // InternalScope.g:1700:2: ( ( RULE_ID ) )
+            // InternalScope.g:1701:1: ( RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1701:1: ( RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1702:1: RULE_ID
+            // InternalScope.g:1701:1: ( RULE_ID )
+            // InternalScope.g:1702:1: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIdentifierAccess().getIDTerminalRuleCall()); 
             }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleIdentifier3582); if (state.failed) return ;
+            match(input,RULE_ID,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIdentifierAccess().getIDTerminalRuleCall()); 
             }
@@ -5153,25 +5153,25 @@ public final void ruleIdentifier() throws RecognitionException {
 
 
     // $ANTLR start "ruleCasing"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1716:1: ruleCasing : ( ( rule__Casing__Alternatives ) ) ;
+    // InternalScope.g:1716:1: ruleCasing : ( ( rule__Casing__Alternatives ) ) ;
     public final void ruleCasing() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1720:1: ( ( ( rule__Casing__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1721:1: ( ( rule__Casing__Alternatives ) )
+            // InternalScope.g:1720:1: ( ( ( rule__Casing__Alternatives ) ) )
+            // InternalScope.g:1721:1: ( ( rule__Casing__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1721:1: ( ( rule__Casing__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1722:1: ( rule__Casing__Alternatives )
+            // InternalScope.g:1721:1: ( ( rule__Casing__Alternatives ) )
+            // InternalScope.g:1722:1: ( rule__Casing__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCasingAccess().getAlternatives()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1723:1: ( rule__Casing__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1723:2: rule__Casing__Alternatives
+            // InternalScope.g:1723:1: ( rule__Casing__Alternatives )
+            // InternalScope.g:1723:2: rule__Casing__Alternatives
             {
-            pushFollow(FOLLOW_rule__Casing__Alternatives_in_ruleCasing3618);
+            pushFollow(FOLLOW_2);
             rule__Casing__Alternatives();
 
             state._fsp--;
@@ -5204,29 +5204,29 @@ public final void ruleCasing() throws RecognitionException {
 
 
     // $ANTLR start "rule__ScopeDefinition__Alternatives_2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1734:1: rule__ScopeDefinition__Alternatives_2 : ( ( ( rule__ScopeDefinition__TargetTypeAssignment_2_0 ) ) | ( ( rule__ScopeDefinition__Group_2_1__0 ) ) );
+    // InternalScope.g:1734:1: rule__ScopeDefinition__Alternatives_2 : ( ( ( rule__ScopeDefinition__TargetTypeAssignment_2_0 ) ) | ( ( rule__ScopeDefinition__Group_2_1__0 ) ) );
     public final void rule__ScopeDefinition__Alternatives_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1738:1: ( ( ( rule__ScopeDefinition__TargetTypeAssignment_2_0 ) ) | ( ( rule__ScopeDefinition__Group_2_1__0 ) ) )
+            // InternalScope.g:1738:1: ( ( ( rule__ScopeDefinition__TargetTypeAssignment_2_0 ) ) | ( ( rule__ScopeDefinition__Group_2_1__0 ) ) )
             int alt1=2;
             alt1 = dfa1.predict(input);
             switch (alt1) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1739:1: ( ( rule__ScopeDefinition__TargetTypeAssignment_2_0 ) )
+                    // InternalScope.g:1739:1: ( ( rule__ScopeDefinition__TargetTypeAssignment_2_0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1739:1: ( ( rule__ScopeDefinition__TargetTypeAssignment_2_0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1740:1: ( rule__ScopeDefinition__TargetTypeAssignment_2_0 )
+                    // InternalScope.g:1739:1: ( ( rule__ScopeDefinition__TargetTypeAssignment_2_0 ) )
+                    // InternalScope.g:1740:1: ( rule__ScopeDefinition__TargetTypeAssignment_2_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getScopeDefinitionAccess().getTargetTypeAssignment_2_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1741:1: ( rule__ScopeDefinition__TargetTypeAssignment_2_0 )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1741:2: rule__ScopeDefinition__TargetTypeAssignment_2_0
+                    // InternalScope.g:1741:1: ( rule__ScopeDefinition__TargetTypeAssignment_2_0 )
+                    // InternalScope.g:1741:2: rule__ScopeDefinition__TargetTypeAssignment_2_0
                     {
-                    pushFollow(FOLLOW_rule__ScopeDefinition__TargetTypeAssignment_2_0_in_rule__ScopeDefinition__Alternatives_23653);
+                    pushFollow(FOLLOW_2);
                     rule__ScopeDefinition__TargetTypeAssignment_2_0();
 
                     state._fsp--;
@@ -5244,18 +5244,18 @@ public final void rule__ScopeDefinition__Alternatives_2() throws RecognitionExce
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1745:6: ( ( rule__ScopeDefinition__Group_2_1__0 ) )
+                    // InternalScope.g:1745:6: ( ( rule__ScopeDefinition__Group_2_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1745:6: ( ( rule__ScopeDefinition__Group_2_1__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1746:1: ( rule__ScopeDefinition__Group_2_1__0 )
+                    // InternalScope.g:1745:6: ( ( rule__ScopeDefinition__Group_2_1__0 ) )
+                    // InternalScope.g:1746:1: ( rule__ScopeDefinition__Group_2_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getScopeDefinitionAccess().getGroup_2_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1747:1: ( rule__ScopeDefinition__Group_2_1__0 )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1747:2: rule__ScopeDefinition__Group_2_1__0
+                    // InternalScope.g:1747:1: ( rule__ScopeDefinition__Group_2_1__0 )
+                    // InternalScope.g:1747:2: rule__ScopeDefinition__Group_2_1__0
                     {
-                    pushFollow(FOLLOW_rule__ScopeDefinition__Group_2_1__0_in_rule__ScopeDefinition__Alternatives_23671);
+                    pushFollow(FOLLOW_2);
                     rule__ScopeDefinition__Group_2_1__0();
 
                     state._fsp--;
@@ -5290,13 +5290,13 @@ public final void rule__ScopeDefinition__Alternatives_2() throws RecognitionExce
 
 
     // $ANTLR start "rule__ScopeContext__Alternatives_0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1756:1: rule__ScopeContext__Alternatives_0 : ( ( ( rule__ScopeContext__GlobalAssignment_0_0 ) ) | ( ( rule__ScopeContext__ContextTypeAssignment_0_1 ) ) );
+    // InternalScope.g:1756:1: rule__ScopeContext__Alternatives_0 : ( ( ( rule__ScopeContext__GlobalAssignment_0_0 ) ) | ( ( rule__ScopeContext__ContextTypeAssignment_0_1 ) ) );
     public final void rule__ScopeContext__Alternatives_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1760:1: ( ( ( rule__ScopeContext__GlobalAssignment_0_0 ) ) | ( ( rule__ScopeContext__ContextTypeAssignment_0_1 ) ) )
+            // InternalScope.g:1760:1: ( ( ( rule__ScopeContext__GlobalAssignment_0_0 ) ) | ( ( rule__ScopeContext__ContextTypeAssignment_0_1 ) ) )
             int alt2=2;
             int LA2_0 = input.LA(1);
 
@@ -5315,18 +5315,18 @@ else if ( (LA2_0==RULE_ID) ) {
             }
             switch (alt2) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1761:1: ( ( rule__ScopeContext__GlobalAssignment_0_0 ) )
+                    // InternalScope.g:1761:1: ( ( rule__ScopeContext__GlobalAssignment_0_0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1761:1: ( ( rule__ScopeContext__GlobalAssignment_0_0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1762:1: ( rule__ScopeContext__GlobalAssignment_0_0 )
+                    // InternalScope.g:1761:1: ( ( rule__ScopeContext__GlobalAssignment_0_0 ) )
+                    // InternalScope.g:1762:1: ( rule__ScopeContext__GlobalAssignment_0_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getScopeContextAccess().getGlobalAssignment_0_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1763:1: ( rule__ScopeContext__GlobalAssignment_0_0 )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1763:2: rule__ScopeContext__GlobalAssignment_0_0
+                    // InternalScope.g:1763:1: ( rule__ScopeContext__GlobalAssignment_0_0 )
+                    // InternalScope.g:1763:2: rule__ScopeContext__GlobalAssignment_0_0
                     {
-                    pushFollow(FOLLOW_rule__ScopeContext__GlobalAssignment_0_0_in_rule__ScopeContext__Alternatives_03704);
+                    pushFollow(FOLLOW_2);
                     rule__ScopeContext__GlobalAssignment_0_0();
 
                     state._fsp--;
@@ -5344,18 +5344,18 @@ else if ( (LA2_0==RULE_ID) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1767:6: ( ( rule__ScopeContext__ContextTypeAssignment_0_1 ) )
+                    // InternalScope.g:1767:6: ( ( rule__ScopeContext__ContextTypeAssignment_0_1 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1767:6: ( ( rule__ScopeContext__ContextTypeAssignment_0_1 ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1768:1: ( rule__ScopeContext__ContextTypeAssignment_0_1 )
+                    // InternalScope.g:1767:6: ( ( rule__ScopeContext__ContextTypeAssignment_0_1 ) )
+                    // InternalScope.g:1768:1: ( rule__ScopeContext__ContextTypeAssignment_0_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getScopeContextAccess().getContextTypeAssignment_0_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1769:1: ( rule__ScopeContext__ContextTypeAssignment_0_1 )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1769:2: rule__ScopeContext__ContextTypeAssignment_0_1
+                    // InternalScope.g:1769:1: ( rule__ScopeContext__ContextTypeAssignment_0_1 )
+                    // InternalScope.g:1769:2: rule__ScopeContext__ContextTypeAssignment_0_1
                     {
-                    pushFollow(FOLLOW_rule__ScopeContext__ContextTypeAssignment_0_1_in_rule__ScopeContext__Alternatives_03722);
+                    pushFollow(FOLLOW_2);
                     rule__ScopeContext__ContextTypeAssignment_0_1();
 
                     state._fsp--;
@@ -5390,13 +5390,13 @@ else if ( (LA2_0==RULE_ID) ) {
 
 
     // $ANTLR start "rule__ScopeExpression__Alternatives_0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1778:1: rule__ScopeExpression__Alternatives_0 : ( ( ruleScopeDelegation ) | ( ruleFactoryExpression ) | ( ruleNamedScopeExpression ) );
+    // InternalScope.g:1778:1: rule__ScopeExpression__Alternatives_0 : ( ( ruleScopeDelegation ) | ( ruleFactoryExpression ) | ( ruleNamedScopeExpression ) );
     public final void rule__ScopeExpression__Alternatives_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1782:1: ( ( ruleScopeDelegation ) | ( ruleFactoryExpression ) | ( ruleNamedScopeExpression ) )
+            // InternalScope.g:1782:1: ( ( ruleScopeDelegation ) | ( ruleFactoryExpression ) | ( ruleNamedScopeExpression ) )
             int alt3=3;
             switch ( input.LA(1) ) {
             case 60:
@@ -5452,15 +5452,15 @@ public final void rule__ScopeExpression__Alternatives_0() throws RecognitionExce
 
             switch (alt3) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1783:1: ( ruleScopeDelegation )
+                    // InternalScope.g:1783:1: ( ruleScopeDelegation )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1783:1: ( ruleScopeDelegation )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1784:1: ruleScopeDelegation
+                    // InternalScope.g:1783:1: ( ruleScopeDelegation )
+                    // InternalScope.g:1784:1: ruleScopeDelegation
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getScopeExpressionAccess().getScopeDelegationParserRuleCall_0_0()); 
                     }
-                    pushFollow(FOLLOW_ruleScopeDelegation_in_rule__ScopeExpression__Alternatives_03755);
+                    pushFollow(FOLLOW_2);
                     ruleScopeDelegation();
 
                     state._fsp--;
@@ -5475,15 +5475,15 @@ public final void rule__ScopeExpression__Alternatives_0() throws RecognitionExce
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1789:6: ( ruleFactoryExpression )
+                    // InternalScope.g:1789:6: ( ruleFactoryExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1789:6: ( ruleFactoryExpression )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1790:1: ruleFactoryExpression
+                    // InternalScope.g:1789:6: ( ruleFactoryExpression )
+                    // InternalScope.g:1790:1: ruleFactoryExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getScopeExpressionAccess().getFactoryExpressionParserRuleCall_0_1()); 
                     }
-                    pushFollow(FOLLOW_ruleFactoryExpression_in_rule__ScopeExpression__Alternatives_03772);
+                    pushFollow(FOLLOW_2);
                     ruleFactoryExpression();
 
                     state._fsp--;
@@ -5498,15 +5498,15 @@ public final void rule__ScopeExpression__Alternatives_0() throws RecognitionExce
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1795:6: ( ruleNamedScopeExpression )
+                    // InternalScope.g:1795:6: ( ruleNamedScopeExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1795:6: ( ruleNamedScopeExpression )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1796:1: ruleNamedScopeExpression
+                    // InternalScope.g:1795:6: ( ruleNamedScopeExpression )
+                    // InternalScope.g:1796:1: ruleNamedScopeExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getScopeExpressionAccess().getNamedScopeExpressionParserRuleCall_0_2()); 
                     }
-                    pushFollow(FOLLOW_ruleNamedScopeExpression_in_rule__ScopeExpression__Alternatives_03789);
+                    pushFollow(FOLLOW_2);
                     ruleNamedScopeExpression();
 
                     state._fsp--;
@@ -5538,13 +5538,13 @@ public final void rule__ScopeExpression__Alternatives_0() throws RecognitionExce
 
 
     // $ANTLR start "rule__ScopeDelegation__Alternatives_2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1806:1: rule__ScopeDelegation__Alternatives_2 : ( ( ( rule__ScopeDelegation__DelegateAssignment_2_0 ) ) | ( ( rule__ScopeDelegation__ExternalAssignment_2_1 ) ) );
+    // InternalScope.g:1806:1: rule__ScopeDelegation__Alternatives_2 : ( ( ( rule__ScopeDelegation__DelegateAssignment_2_0 ) ) | ( ( rule__ScopeDelegation__ExternalAssignment_2_1 ) ) );
     public final void rule__ScopeDelegation__Alternatives_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1810:1: ( ( ( rule__ScopeDelegation__DelegateAssignment_2_0 ) ) | ( ( rule__ScopeDelegation__ExternalAssignment_2_1 ) ) )
+            // InternalScope.g:1810:1: ( ( ( rule__ScopeDelegation__DelegateAssignment_2_0 ) ) | ( ( rule__ScopeDelegation__ExternalAssignment_2_1 ) ) )
             int alt4=2;
             int LA4_0 = input.LA(1);
 
@@ -5563,18 +5563,18 @@ else if ( (LA4_0==62) ) {
             }
             switch (alt4) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1811:1: ( ( rule__ScopeDelegation__DelegateAssignment_2_0 ) )
+                    // InternalScope.g:1811:1: ( ( rule__ScopeDelegation__DelegateAssignment_2_0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1811:1: ( ( rule__ScopeDelegation__DelegateAssignment_2_0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1812:1: ( rule__ScopeDelegation__DelegateAssignment_2_0 )
+                    // InternalScope.g:1811:1: ( ( rule__ScopeDelegation__DelegateAssignment_2_0 ) )
+                    // InternalScope.g:1812:1: ( rule__ScopeDelegation__DelegateAssignment_2_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getScopeDelegationAccess().getDelegateAssignment_2_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1813:1: ( rule__ScopeDelegation__DelegateAssignment_2_0 )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1813:2: rule__ScopeDelegation__DelegateAssignment_2_0
+                    // InternalScope.g:1813:1: ( rule__ScopeDelegation__DelegateAssignment_2_0 )
+                    // InternalScope.g:1813:2: rule__ScopeDelegation__DelegateAssignment_2_0
                     {
-                    pushFollow(FOLLOW_rule__ScopeDelegation__DelegateAssignment_2_0_in_rule__ScopeDelegation__Alternatives_23821);
+                    pushFollow(FOLLOW_2);
                     rule__ScopeDelegation__DelegateAssignment_2_0();
 
                     state._fsp--;
@@ -5592,18 +5592,18 @@ else if ( (LA4_0==62) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1817:6: ( ( rule__ScopeDelegation__ExternalAssignment_2_1 ) )
+                    // InternalScope.g:1817:6: ( ( rule__ScopeDelegation__ExternalAssignment_2_1 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1817:6: ( ( rule__ScopeDelegation__ExternalAssignment_2_1 ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1818:1: ( rule__ScopeDelegation__ExternalAssignment_2_1 )
+                    // InternalScope.g:1817:6: ( ( rule__ScopeDelegation__ExternalAssignment_2_1 ) )
+                    // InternalScope.g:1818:1: ( rule__ScopeDelegation__ExternalAssignment_2_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getScopeDelegationAccess().getExternalAssignment_2_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1819:1: ( rule__ScopeDelegation__ExternalAssignment_2_1 )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1819:2: rule__ScopeDelegation__ExternalAssignment_2_1
+                    // InternalScope.g:1819:1: ( rule__ScopeDelegation__ExternalAssignment_2_1 )
+                    // InternalScope.g:1819:2: rule__ScopeDelegation__ExternalAssignment_2_1
                     {
-                    pushFollow(FOLLOW_rule__ScopeDelegation__ExternalAssignment_2_1_in_rule__ScopeDelegation__Alternatives_23839);
+                    pushFollow(FOLLOW_2);
                     rule__ScopeDelegation__ExternalAssignment_2_1();
 
                     state._fsp--;
@@ -5638,13 +5638,13 @@ else if ( (LA4_0==62) ) {
 
 
     // $ANTLR start "rule__NamedScopeExpression__Alternatives_0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1828:1: rule__NamedScopeExpression__Alternatives_0 : ( ( ruleGlobalScopeExpression ) | ( ruleSimpleScopeExpression ) );
+    // InternalScope.g:1828:1: rule__NamedScopeExpression__Alternatives_0 : ( ( ruleGlobalScopeExpression ) | ( ruleSimpleScopeExpression ) );
     public final void rule__NamedScopeExpression__Alternatives_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1832:1: ( ( ruleGlobalScopeExpression ) | ( ruleSimpleScopeExpression ) )
+            // InternalScope.g:1832:1: ( ( ruleGlobalScopeExpression ) | ( ruleSimpleScopeExpression ) )
             int alt5=2;
             int LA5_0 = input.LA(1);
 
@@ -5663,15 +5663,15 @@ else if ( ((LA5_0>=RULE_ID && LA5_0<=RULE_REAL)||LA5_0==19||(LA5_0>=22 && LA5_0<
             }
             switch (alt5) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1833:1: ( ruleGlobalScopeExpression )
+                    // InternalScope.g:1833:1: ( ruleGlobalScopeExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1833:1: ( ruleGlobalScopeExpression )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1834:1: ruleGlobalScopeExpression
+                    // InternalScope.g:1833:1: ( ruleGlobalScopeExpression )
+                    // InternalScope.g:1834:1: ruleGlobalScopeExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getNamedScopeExpressionAccess().getGlobalScopeExpressionParserRuleCall_0_0()); 
                     }
-                    pushFollow(FOLLOW_ruleGlobalScopeExpression_in_rule__NamedScopeExpression__Alternatives_03872);
+                    pushFollow(FOLLOW_2);
                     ruleGlobalScopeExpression();
 
                     state._fsp--;
@@ -5686,15 +5686,15 @@ else if ( ((LA5_0>=RULE_ID && LA5_0<=RULE_REAL)||LA5_0==19||(LA5_0>=22 && LA5_0<
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1839:6: ( ruleSimpleScopeExpression )
+                    // InternalScope.g:1839:6: ( ruleSimpleScopeExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1839:6: ( ruleSimpleScopeExpression )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1840:1: ruleSimpleScopeExpression
+                    // InternalScope.g:1839:6: ( ruleSimpleScopeExpression )
+                    // InternalScope.g:1840:1: ruleSimpleScopeExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getNamedScopeExpressionAccess().getSimpleScopeExpressionParserRuleCall_0_1()); 
                     }
-                    pushFollow(FOLLOW_ruleSimpleScopeExpression_in_rule__NamedScopeExpression__Alternatives_03889);
+                    pushFollow(FOLLOW_2);
                     ruleSimpleScopeExpression();
 
                     state._fsp--;
@@ -5726,13 +5726,13 @@ else if ( ((LA5_0>=RULE_ID && LA5_0<=RULE_REAL)||LA5_0==19||(LA5_0>=22 && LA5_0<
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Alternatives_3"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1850:1: rule__GlobalScopeExpression__Alternatives_3 : ( ( ( rule__GlobalScopeExpression__Group_3_0__0 ) ) | ( ( rule__GlobalScopeExpression__Group_3_1__0 ) ) );
+    // InternalScope.g:1850:1: rule__GlobalScopeExpression__Alternatives_3 : ( ( ( rule__GlobalScopeExpression__Group_3_0__0 ) ) | ( ( rule__GlobalScopeExpression__Group_3_1__0 ) ) );
     public final void rule__GlobalScopeExpression__Alternatives_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1854:1: ( ( ( rule__GlobalScopeExpression__Group_3_0__0 ) ) | ( ( rule__GlobalScopeExpression__Group_3_1__0 ) ) )
+            // InternalScope.g:1854:1: ( ( ( rule__GlobalScopeExpression__Group_3_0__0 ) ) | ( ( rule__GlobalScopeExpression__Group_3_1__0 ) ) )
             int alt6=2;
             int LA6_0 = input.LA(1);
 
@@ -5762,18 +5762,18 @@ else if ( (LA6_1==63) ) {
             }
             switch (alt6) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1855:1: ( ( rule__GlobalScopeExpression__Group_3_0__0 ) )
+                    // InternalScope.g:1855:1: ( ( rule__GlobalScopeExpression__Group_3_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1855:1: ( ( rule__GlobalScopeExpression__Group_3_0__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1856:1: ( rule__GlobalScopeExpression__Group_3_0__0 )
+                    // InternalScope.g:1855:1: ( ( rule__GlobalScopeExpression__Group_3_0__0 ) )
+                    // InternalScope.g:1856:1: ( rule__GlobalScopeExpression__Group_3_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getGlobalScopeExpressionAccess().getGroup_3_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1857:1: ( rule__GlobalScopeExpression__Group_3_0__0 )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1857:2: rule__GlobalScopeExpression__Group_3_0__0
+                    // InternalScope.g:1857:1: ( rule__GlobalScopeExpression__Group_3_0__0 )
+                    // InternalScope.g:1857:2: rule__GlobalScopeExpression__Group_3_0__0
                     {
-                    pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_3_0__0_in_rule__GlobalScopeExpression__Alternatives_33921);
+                    pushFollow(FOLLOW_2);
                     rule__GlobalScopeExpression__Group_3_0__0();
 
                     state._fsp--;
@@ -5791,18 +5791,18 @@ else if ( (LA6_1==63) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1861:6: ( ( rule__GlobalScopeExpression__Group_3_1__0 ) )
+                    // InternalScope.g:1861:6: ( ( rule__GlobalScopeExpression__Group_3_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1861:6: ( ( rule__GlobalScopeExpression__Group_3_1__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1862:1: ( rule__GlobalScopeExpression__Group_3_1__0 )
+                    // InternalScope.g:1861:6: ( ( rule__GlobalScopeExpression__Group_3_1__0 ) )
+                    // InternalScope.g:1862:1: ( rule__GlobalScopeExpression__Group_3_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getGlobalScopeExpressionAccess().getGroup_3_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1863:1: ( rule__GlobalScopeExpression__Group_3_1__0 )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1863:2: rule__GlobalScopeExpression__Group_3_1__0
+                    // InternalScope.g:1863:1: ( rule__GlobalScopeExpression__Group_3_1__0 )
+                    // InternalScope.g:1863:2: rule__GlobalScopeExpression__Group_3_1__0
                     {
-                    pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_3_1__0_in_rule__GlobalScopeExpression__Alternatives_33939);
+                    pushFollow(FOLLOW_2);
                     rule__GlobalScopeExpression__Group_3_1__0();
 
                     state._fsp--;
@@ -5837,13 +5837,13 @@ else if ( (LA6_1==63) ) {
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Alternatives_5_3"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1872:1: rule__GlobalScopeExpression__Alternatives_5_3 : ( ( ( rule__GlobalScopeExpression__DomainsAssignment_5_3_0 ) ) | ( ( rule__GlobalScopeExpression__DomainsAssignment_5_3_1 ) ) | ( ( rule__GlobalScopeExpression__Group_5_3_2__0 ) ) );
+    // InternalScope.g:1872:1: rule__GlobalScopeExpression__Alternatives_5_3 : ( ( ( rule__GlobalScopeExpression__DomainsAssignment_5_3_0 ) ) | ( ( rule__GlobalScopeExpression__DomainsAssignment_5_3_1 ) ) | ( ( rule__GlobalScopeExpression__Group_5_3_2__0 ) ) );
     public final void rule__GlobalScopeExpression__Alternatives_5_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1876:1: ( ( ( rule__GlobalScopeExpression__DomainsAssignment_5_3_0 ) ) | ( ( rule__GlobalScopeExpression__DomainsAssignment_5_3_1 ) ) | ( ( rule__GlobalScopeExpression__Group_5_3_2__0 ) ) )
+            // InternalScope.g:1876:1: ( ( ( rule__GlobalScopeExpression__DomainsAssignment_5_3_0 ) ) | ( ( rule__GlobalScopeExpression__DomainsAssignment_5_3_1 ) ) | ( ( rule__GlobalScopeExpression__Group_5_3_2__0 ) ) )
             int alt7=3;
             switch ( input.LA(1) ) {
             case 20:
@@ -5871,18 +5871,18 @@ public final void rule__GlobalScopeExpression__Alternatives_5_3() throws Recogni
 
             switch (alt7) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1877:1: ( ( rule__GlobalScopeExpression__DomainsAssignment_5_3_0 ) )
+                    // InternalScope.g:1877:1: ( ( rule__GlobalScopeExpression__DomainsAssignment_5_3_0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1877:1: ( ( rule__GlobalScopeExpression__DomainsAssignment_5_3_0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1878:1: ( rule__GlobalScopeExpression__DomainsAssignment_5_3_0 )
+                    // InternalScope.g:1877:1: ( ( rule__GlobalScopeExpression__DomainsAssignment_5_3_0 ) )
+                    // InternalScope.g:1878:1: ( rule__GlobalScopeExpression__DomainsAssignment_5_3_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getGlobalScopeExpressionAccess().getDomainsAssignment_5_3_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1879:1: ( rule__GlobalScopeExpression__DomainsAssignment_5_3_0 )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1879:2: rule__GlobalScopeExpression__DomainsAssignment_5_3_0
+                    // InternalScope.g:1879:1: ( rule__GlobalScopeExpression__DomainsAssignment_5_3_0 )
+                    // InternalScope.g:1879:2: rule__GlobalScopeExpression__DomainsAssignment_5_3_0
                     {
-                    pushFollow(FOLLOW_rule__GlobalScopeExpression__DomainsAssignment_5_3_0_in_rule__GlobalScopeExpression__Alternatives_5_33972);
+                    pushFollow(FOLLOW_2);
                     rule__GlobalScopeExpression__DomainsAssignment_5_3_0();
 
                     state._fsp--;
@@ -5900,18 +5900,18 @@ public final void rule__GlobalScopeExpression__Alternatives_5_3() throws Recogni
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1883:6: ( ( rule__GlobalScopeExpression__DomainsAssignment_5_3_1 ) )
+                    // InternalScope.g:1883:6: ( ( rule__GlobalScopeExpression__DomainsAssignment_5_3_1 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1883:6: ( ( rule__GlobalScopeExpression__DomainsAssignment_5_3_1 ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1884:1: ( rule__GlobalScopeExpression__DomainsAssignment_5_3_1 )
+                    // InternalScope.g:1883:6: ( ( rule__GlobalScopeExpression__DomainsAssignment_5_3_1 ) )
+                    // InternalScope.g:1884:1: ( rule__GlobalScopeExpression__DomainsAssignment_5_3_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getGlobalScopeExpressionAccess().getDomainsAssignment_5_3_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1885:1: ( rule__GlobalScopeExpression__DomainsAssignment_5_3_1 )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1885:2: rule__GlobalScopeExpression__DomainsAssignment_5_3_1
+                    // InternalScope.g:1885:1: ( rule__GlobalScopeExpression__DomainsAssignment_5_3_1 )
+                    // InternalScope.g:1885:2: rule__GlobalScopeExpression__DomainsAssignment_5_3_1
                     {
-                    pushFollow(FOLLOW_rule__GlobalScopeExpression__DomainsAssignment_5_3_1_in_rule__GlobalScopeExpression__Alternatives_5_33990);
+                    pushFollow(FOLLOW_2);
                     rule__GlobalScopeExpression__DomainsAssignment_5_3_1();
 
                     state._fsp--;
@@ -5929,18 +5929,18 @@ public final void rule__GlobalScopeExpression__Alternatives_5_3() throws Recogni
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1889:6: ( ( rule__GlobalScopeExpression__Group_5_3_2__0 ) )
+                    // InternalScope.g:1889:6: ( ( rule__GlobalScopeExpression__Group_5_3_2__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1889:6: ( ( rule__GlobalScopeExpression__Group_5_3_2__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1890:1: ( rule__GlobalScopeExpression__Group_5_3_2__0 )
+                    // InternalScope.g:1889:6: ( ( rule__GlobalScopeExpression__Group_5_3_2__0 ) )
+                    // InternalScope.g:1890:1: ( rule__GlobalScopeExpression__Group_5_3_2__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getGlobalScopeExpressionAccess().getGroup_5_3_2()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1891:1: ( rule__GlobalScopeExpression__Group_5_3_2__0 )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1891:2: rule__GlobalScopeExpression__Group_5_3_2__0
+                    // InternalScope.g:1891:1: ( rule__GlobalScopeExpression__Group_5_3_2__0 )
+                    // InternalScope.g:1891:2: rule__GlobalScopeExpression__Group_5_3_2__0
                     {
-                    pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_5_3_2__0_in_rule__GlobalScopeExpression__Alternatives_5_34008);
+                    pushFollow(FOLLOW_2);
                     rule__GlobalScopeExpression__Group_5_3_2__0();
 
                     state._fsp--;
@@ -5975,13 +5975,13 @@ public final void rule__GlobalScopeExpression__Alternatives_5_3() throws Recogni
 
 
     // $ANTLR start "rule__DataExpression__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1900:1: rule__DataExpression__Alternatives : ( ( ruleMatchDataExpression ) | ( ruleLambdaDataExpression ) );
+    // InternalScope.g:1900:1: rule__DataExpression__Alternatives : ( ( ruleMatchDataExpression ) | ( ruleLambdaDataExpression ) );
     public final void rule__DataExpression__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1904:1: ( ( ruleMatchDataExpression ) | ( ruleLambdaDataExpression ) )
+            // InternalScope.g:1904:1: ( ( ruleMatchDataExpression ) | ( ruleLambdaDataExpression ) )
             int alt8=2;
             int LA8_0 = input.LA(1);
 
@@ -6000,15 +6000,15 @@ else if ( (LA8_0==56) ) {
             }
             switch (alt8) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1905:1: ( ruleMatchDataExpression )
+                    // InternalScope.g:1905:1: ( ruleMatchDataExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1905:1: ( ruleMatchDataExpression )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1906:1: ruleMatchDataExpression
+                    // InternalScope.g:1905:1: ( ruleMatchDataExpression )
+                    // InternalScope.g:1906:1: ruleMatchDataExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getDataExpressionAccess().getMatchDataExpressionParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleMatchDataExpression_in_rule__DataExpression__Alternatives4041);
+                    pushFollow(FOLLOW_2);
                     ruleMatchDataExpression();
 
                     state._fsp--;
@@ -6023,15 +6023,15 @@ else if ( (LA8_0==56) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1911:6: ( ruleLambdaDataExpression )
+                    // InternalScope.g:1911:6: ( ruleLambdaDataExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1911:6: ( ruleLambdaDataExpression )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1912:1: ruleLambdaDataExpression
+                    // InternalScope.g:1911:6: ( ruleLambdaDataExpression )
+                    // InternalScope.g:1912:1: ruleLambdaDataExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getDataExpressionAccess().getLambdaDataExpressionParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleLambdaDataExpression_in_rule__DataExpression__Alternatives4058);
+                    pushFollow(FOLLOW_2);
                     ruleLambdaDataExpression();
 
                     state._fsp--;
@@ -6063,29 +6063,29 @@ else if ( (LA8_0==56) ) {
 
 
     // $ANTLR start "rule__Naming__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1922:1: rule__Naming__Alternatives : ( ( ( rule__Naming__Group_0__0 ) ) | ( ( rule__Naming__NamesAssignment_1 ) ) );
+    // InternalScope.g:1922:1: rule__Naming__Alternatives : ( ( ( rule__Naming__Group_0__0 ) ) | ( ( rule__Naming__NamesAssignment_1 ) ) );
     public final void rule__Naming__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1926:1: ( ( ( rule__Naming__Group_0__0 ) ) | ( ( rule__Naming__NamesAssignment_1 ) ) )
+            // InternalScope.g:1926:1: ( ( ( rule__Naming__Group_0__0 ) ) | ( ( rule__Naming__NamesAssignment_1 ) ) )
             int alt9=2;
             alt9 = dfa9.predict(input);
             switch (alt9) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1927:1: ( ( rule__Naming__Group_0__0 ) )
+                    // InternalScope.g:1927:1: ( ( rule__Naming__Group_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1927:1: ( ( rule__Naming__Group_0__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1928:1: ( rule__Naming__Group_0__0 )
+                    // InternalScope.g:1927:1: ( ( rule__Naming__Group_0__0 ) )
+                    // InternalScope.g:1928:1: ( rule__Naming__Group_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getNamingAccess().getGroup_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1929:1: ( rule__Naming__Group_0__0 )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1929:2: rule__Naming__Group_0__0
+                    // InternalScope.g:1929:1: ( rule__Naming__Group_0__0 )
+                    // InternalScope.g:1929:2: rule__Naming__Group_0__0
                     {
-                    pushFollow(FOLLOW_rule__Naming__Group_0__0_in_rule__Naming__Alternatives4090);
+                    pushFollow(FOLLOW_2);
                     rule__Naming__Group_0__0();
 
                     state._fsp--;
@@ -6103,18 +6103,18 @@ public final void rule__Naming__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1933:6: ( ( rule__Naming__NamesAssignment_1 ) )
+                    // InternalScope.g:1933:6: ( ( rule__Naming__NamesAssignment_1 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1933:6: ( ( rule__Naming__NamesAssignment_1 ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1934:1: ( rule__Naming__NamesAssignment_1 )
+                    // InternalScope.g:1933:6: ( ( rule__Naming__NamesAssignment_1 ) )
+                    // InternalScope.g:1934:1: ( rule__Naming__NamesAssignment_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getNamingAccess().getNamesAssignment_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1935:1: ( rule__Naming__NamesAssignment_1 )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1935:2: rule__Naming__NamesAssignment_1
+                    // InternalScope.g:1935:1: ( rule__Naming__NamesAssignment_1 )
+                    // InternalScope.g:1935:2: rule__Naming__NamesAssignment_1
                     {
-                    pushFollow(FOLLOW_rule__Naming__NamesAssignment_1_in_rule__Naming__Alternatives4108);
+                    pushFollow(FOLLOW_2);
                     rule__Naming__NamesAssignment_1();
 
                     state._fsp--;
@@ -6149,13 +6149,13 @@ public final void rule__Naming__Alternatives() throws RecognitionException {
 
 
     // $ANTLR start "rule__NamingExpression__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1944:1: rule__NamingExpression__Alternatives : ( ( ( rule__NamingExpression__ExportAssignment_0 ) ) | ( ( rule__NamingExpression__Group_1__0 ) ) );
+    // InternalScope.g:1944:1: rule__NamingExpression__Alternatives : ( ( ( rule__NamingExpression__ExportAssignment_0 ) ) | ( ( rule__NamingExpression__Group_1__0 ) ) );
     public final void rule__NamingExpression__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1948:1: ( ( ( rule__NamingExpression__ExportAssignment_0 ) ) | ( ( rule__NamingExpression__Group_1__0 ) ) )
+            // InternalScope.g:1948:1: ( ( ( rule__NamingExpression__ExportAssignment_0 ) ) | ( ( rule__NamingExpression__Group_1__0 ) ) )
             int alt10=2;
             int LA10_0 = input.LA(1);
 
@@ -6174,18 +6174,18 @@ else if ( ((LA10_0>=RULE_ID && LA10_0<=RULE_REAL)||LA10_0==19||(LA10_0>=22 && LA
             }
             switch (alt10) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1949:1: ( ( rule__NamingExpression__ExportAssignment_0 ) )
+                    // InternalScope.g:1949:1: ( ( rule__NamingExpression__ExportAssignment_0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1949:1: ( ( rule__NamingExpression__ExportAssignment_0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1950:1: ( rule__NamingExpression__ExportAssignment_0 )
+                    // InternalScope.g:1949:1: ( ( rule__NamingExpression__ExportAssignment_0 ) )
+                    // InternalScope.g:1950:1: ( rule__NamingExpression__ExportAssignment_0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getNamingExpressionAccess().getExportAssignment_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1951:1: ( rule__NamingExpression__ExportAssignment_0 )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1951:2: rule__NamingExpression__ExportAssignment_0
+                    // InternalScope.g:1951:1: ( rule__NamingExpression__ExportAssignment_0 )
+                    // InternalScope.g:1951:2: rule__NamingExpression__ExportAssignment_0
                     {
-                    pushFollow(FOLLOW_rule__NamingExpression__ExportAssignment_0_in_rule__NamingExpression__Alternatives4141);
+                    pushFollow(FOLLOW_2);
                     rule__NamingExpression__ExportAssignment_0();
 
                     state._fsp--;
@@ -6203,18 +6203,18 @@ else if ( ((LA10_0>=RULE_ID && LA10_0<=RULE_REAL)||LA10_0==19||(LA10_0>=22 && LA
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1955:6: ( ( rule__NamingExpression__Group_1__0 ) )
+                    // InternalScope.g:1955:6: ( ( rule__NamingExpression__Group_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1955:6: ( ( rule__NamingExpression__Group_1__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1956:1: ( rule__NamingExpression__Group_1__0 )
+                    // InternalScope.g:1955:6: ( ( rule__NamingExpression__Group_1__0 ) )
+                    // InternalScope.g:1956:1: ( rule__NamingExpression__Group_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getNamingExpressionAccess().getGroup_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1957:1: ( rule__NamingExpression__Group_1__0 )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1957:2: rule__NamingExpression__Group_1__0
+                    // InternalScope.g:1957:1: ( rule__NamingExpression__Group_1__0 )
+                    // InternalScope.g:1957:2: rule__NamingExpression__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__NamingExpression__Group_1__0_in_rule__NamingExpression__Alternatives4159);
+                    pushFollow(FOLLOW_2);
                     rule__NamingExpression__Group_1__0();
 
                     state._fsp--;
@@ -6249,26 +6249,26 @@ else if ( ((LA10_0>=RULE_ID && LA10_0<=RULE_REAL)||LA10_0==19||(LA10_0>=22 && LA
 
 
     // $ANTLR start "rule__Expression__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1966:1: rule__Expression__Alternatives : ( ( ruleLetExpression ) | ( ( ruleCastedExpression ) ) | ( ruleChainExpression ) );
+    // InternalScope.g:1966:1: rule__Expression__Alternatives : ( ( ruleLetExpression ) | ( ( ruleCastedExpression ) ) | ( ruleChainExpression ) );
     public final void rule__Expression__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1970:1: ( ( ruleLetExpression ) | ( ( ruleCastedExpression ) ) | ( ruleChainExpression ) )
+            // InternalScope.g:1970:1: ( ( ruleLetExpression ) | ( ( ruleCastedExpression ) ) | ( ruleChainExpression ) )
             int alt11=3;
             alt11 = dfa11.predict(input);
             switch (alt11) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1971:1: ( ruleLetExpression )
+                    // InternalScope.g:1971:1: ( ruleLetExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1971:1: ( ruleLetExpression )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1972:1: ruleLetExpression
+                    // InternalScope.g:1971:1: ( ruleLetExpression )
+                    // InternalScope.g:1972:1: ruleLetExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getExpressionAccess().getLetExpressionParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleLetExpression_in_rule__Expression__Alternatives4192);
+                    pushFollow(FOLLOW_2);
                     ruleLetExpression();
 
                     state._fsp--;
@@ -6283,18 +6283,18 @@ public final void rule__Expression__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1977:6: ( ( ruleCastedExpression ) )
+                    // InternalScope.g:1977:6: ( ( ruleCastedExpression ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1977:6: ( ( ruleCastedExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1978:1: ( ruleCastedExpression )
+                    // InternalScope.g:1977:6: ( ( ruleCastedExpression ) )
+                    // InternalScope.g:1978:1: ( ruleCastedExpression )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getExpressionAccess().getCastedExpressionParserRuleCall_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1979:1: ( ruleCastedExpression )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1979:3: ruleCastedExpression
+                    // InternalScope.g:1979:1: ( ruleCastedExpression )
+                    // InternalScope.g:1979:3: ruleCastedExpression
                     {
-                    pushFollow(FOLLOW_ruleCastedExpression_in_rule__Expression__Alternatives4210);
+                    pushFollow(FOLLOW_2);
                     ruleCastedExpression();
 
                     state._fsp--;
@@ -6312,15 +6312,15 @@ public final void rule__Expression__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1983:6: ( ruleChainExpression )
+                    // InternalScope.g:1983:6: ( ruleChainExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1983:6: ( ruleChainExpression )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1984:1: ruleChainExpression
+                    // InternalScope.g:1983:6: ( ruleChainExpression )
+                    // InternalScope.g:1984:1: ruleChainExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getExpressionAccess().getChainExpressionParserRuleCall_2()); 
                     }
-                    pushFollow(FOLLOW_ruleChainExpression_in_rule__Expression__Alternatives4228);
+                    pushFollow(FOLLOW_2);
                     ruleChainExpression();
 
                     state._fsp--;
@@ -6352,13 +6352,13 @@ public final void rule__Expression__Alternatives() throws RecognitionException {
 
 
     // $ANTLR start "rule__ChainedExpression__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1995:1: rule__ChainedExpression__Alternatives : ( ( ruleIfExpressionKw ) | ( ruleIfExpressionTri ) | ( ruleSwitchExpression ) );
+    // InternalScope.g:1995:1: rule__ChainedExpression__Alternatives : ( ( ruleIfExpressionKw ) | ( ruleIfExpressionTri ) | ( ruleSwitchExpression ) );
     public final void rule__ChainedExpression__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1999:1: ( ( ruleIfExpressionKw ) | ( ruleIfExpressionTri ) | ( ruleSwitchExpression ) )
+            // InternalScope.g:1999:1: ( ( ruleIfExpressionKw ) | ( ruleIfExpressionTri ) | ( ruleSwitchExpression ) )
             int alt12=3;
             switch ( input.LA(1) ) {
             case 73:
@@ -6410,15 +6410,15 @@ public final void rule__ChainedExpression__Alternatives() throws RecognitionExce
 
             switch (alt12) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2000:1: ( ruleIfExpressionKw )
+                    // InternalScope.g:2000:1: ( ruleIfExpressionKw )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2000:1: ( ruleIfExpressionKw )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2001:1: ruleIfExpressionKw
+                    // InternalScope.g:2000:1: ( ruleIfExpressionKw )
+                    // InternalScope.g:2001:1: ruleIfExpressionKw
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getChainedExpressionAccess().getIfExpressionKwParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleIfExpressionKw_in_rule__ChainedExpression__Alternatives4261);
+                    pushFollow(FOLLOW_2);
                     ruleIfExpressionKw();
 
                     state._fsp--;
@@ -6433,15 +6433,15 @@ public final void rule__ChainedExpression__Alternatives() throws RecognitionExce
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2006:6: ( ruleIfExpressionTri )
+                    // InternalScope.g:2006:6: ( ruleIfExpressionTri )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2006:6: ( ruleIfExpressionTri )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2007:1: ruleIfExpressionTri
+                    // InternalScope.g:2006:6: ( ruleIfExpressionTri )
+                    // InternalScope.g:2007:1: ruleIfExpressionTri
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getChainedExpressionAccess().getIfExpressionTriParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleIfExpressionTri_in_rule__ChainedExpression__Alternatives4278);
+                    pushFollow(FOLLOW_2);
                     ruleIfExpressionTri();
 
                     state._fsp--;
@@ -6456,15 +6456,15 @@ public final void rule__ChainedExpression__Alternatives() throws RecognitionExce
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2012:6: ( ruleSwitchExpression )
+                    // InternalScope.g:2012:6: ( ruleSwitchExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2012:6: ( ruleSwitchExpression )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2013:1: ruleSwitchExpression
+                    // InternalScope.g:2012:6: ( ruleSwitchExpression )
+                    // InternalScope.g:2013:1: ruleSwitchExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getChainedExpressionAccess().getSwitchExpressionParserRuleCall_2()); 
                     }
-                    pushFollow(FOLLOW_ruleSwitchExpression_in_rule__ChainedExpression__Alternatives4295);
+                    pushFollow(FOLLOW_2);
                     ruleSwitchExpression();
 
                     state._fsp--;
@@ -6496,13 +6496,13 @@ public final void rule__ChainedExpression__Alternatives() throws RecognitionExce
 
 
     // $ANTLR start "rule__RelationalExpression__OperatorAlternatives_1_1_0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2023:1: rule__RelationalExpression__OperatorAlternatives_1_1_0 : ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) );
+    // InternalScope.g:2023:1: rule__RelationalExpression__OperatorAlternatives_1_1_0 : ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) );
     public final void rule__RelationalExpression__OperatorAlternatives_1_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2027:1: ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) )
+            // InternalScope.g:2027:1: ( ( '==' ) | ( '!=' ) | ( '>=' ) | ( '<=' ) | ( '>' ) | ( '<' ) )
             int alt13=6;
             switch ( input.LA(1) ) {
             case 12:
@@ -6545,15 +6545,15 @@ public final void rule__RelationalExpression__OperatorAlternatives_1_1_0() throw
 
             switch (alt13) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2028:1: ( '==' )
+                    // InternalScope.g:2028:1: ( '==' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2028:1: ( '==' )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2029:1: '=='
+                    // InternalScope.g:2028:1: ( '==' )
+                    // InternalScope.g:2029:1: '=='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getRelationalExpressionAccess().getOperatorEqualsSignEqualsSignKeyword_1_1_0_0()); 
                     }
-                    match(input,12,FOLLOW_12_in_rule__RelationalExpression__OperatorAlternatives_1_1_04328); if (state.failed) return ;
+                    match(input,12,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getRelationalExpressionAccess().getOperatorEqualsSignEqualsSignKeyword_1_1_0_0()); 
                     }
@@ -6564,15 +6564,15 @@ public final void rule__RelationalExpression__OperatorAlternatives_1_1_0() throw
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2036:6: ( '!=' )
+                    // InternalScope.g:2036:6: ( '!=' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2036:6: ( '!=' )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2037:1: '!='
+                    // InternalScope.g:2036:6: ( '!=' )
+                    // InternalScope.g:2037:1: '!='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getRelationalExpressionAccess().getOperatorExclamationMarkEqualsSignKeyword_1_1_0_1()); 
                     }
-                    match(input,13,FOLLOW_13_in_rule__RelationalExpression__OperatorAlternatives_1_1_04348); if (state.failed) return ;
+                    match(input,13,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getRelationalExpressionAccess().getOperatorExclamationMarkEqualsSignKeyword_1_1_0_1()); 
                     }
@@ -6583,15 +6583,15 @@ public final void rule__RelationalExpression__OperatorAlternatives_1_1_0() throw
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2044:6: ( '>=' )
+                    // InternalScope.g:2044:6: ( '>=' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2044:6: ( '>=' )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2045:1: '>='
+                    // InternalScope.g:2044:6: ( '>=' )
+                    // InternalScope.g:2045:1: '>='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getRelationalExpressionAccess().getOperatorGreaterThanSignEqualsSignKeyword_1_1_0_2()); 
                     }
-                    match(input,14,FOLLOW_14_in_rule__RelationalExpression__OperatorAlternatives_1_1_04368); if (state.failed) return ;
+                    match(input,14,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getRelationalExpressionAccess().getOperatorGreaterThanSignEqualsSignKeyword_1_1_0_2()); 
                     }
@@ -6602,15 +6602,15 @@ public final void rule__RelationalExpression__OperatorAlternatives_1_1_0() throw
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2052:6: ( '<=' )
+                    // InternalScope.g:2052:6: ( '<=' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2052:6: ( '<=' )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2053:1: '<='
+                    // InternalScope.g:2052:6: ( '<=' )
+                    // InternalScope.g:2053:1: '<='
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getRelationalExpressionAccess().getOperatorLessThanSignEqualsSignKeyword_1_1_0_3()); 
                     }
-                    match(input,15,FOLLOW_15_in_rule__RelationalExpression__OperatorAlternatives_1_1_04388); if (state.failed) return ;
+                    match(input,15,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getRelationalExpressionAccess().getOperatorLessThanSignEqualsSignKeyword_1_1_0_3()); 
                     }
@@ -6621,15 +6621,15 @@ public final void rule__RelationalExpression__OperatorAlternatives_1_1_0() throw
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2060:6: ( '>' )
+                    // InternalScope.g:2060:6: ( '>' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2060:6: ( '>' )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2061:1: '>'
+                    // InternalScope.g:2060:6: ( '>' )
+                    // InternalScope.g:2061:1: '>'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getRelationalExpressionAccess().getOperatorGreaterThanSignKeyword_1_1_0_4()); 
                     }
-                    match(input,16,FOLLOW_16_in_rule__RelationalExpression__OperatorAlternatives_1_1_04408); if (state.failed) return ;
+                    match(input,16,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getRelationalExpressionAccess().getOperatorGreaterThanSignKeyword_1_1_0_4()); 
                     }
@@ -6640,15 +6640,15 @@ public final void rule__RelationalExpression__OperatorAlternatives_1_1_0() throw
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2068:6: ( '<' )
+                    // InternalScope.g:2068:6: ( '<' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2068:6: ( '<' )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2069:1: '<'
+                    // InternalScope.g:2068:6: ( '<' )
+                    // InternalScope.g:2069:1: '<'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getRelationalExpressionAccess().getOperatorLessThanSignKeyword_1_1_0_5()); 
                     }
-                    match(input,17,FOLLOW_17_in_rule__RelationalExpression__OperatorAlternatives_1_1_04428); if (state.failed) return ;
+                    match(input,17,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getRelationalExpressionAccess().getOperatorLessThanSignKeyword_1_1_0_5()); 
                     }
@@ -6676,13 +6676,13 @@ public final void rule__RelationalExpression__OperatorAlternatives_1_1_0() throw
 
 
     // $ANTLR start "rule__AdditiveExpression__NameAlternatives_1_1_0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2081:1: rule__AdditiveExpression__NameAlternatives_1_1_0 : ( ( '+' ) | ( '-' ) );
+    // InternalScope.g:2081:1: rule__AdditiveExpression__NameAlternatives_1_1_0 : ( ( '+' ) | ( '-' ) );
     public final void rule__AdditiveExpression__NameAlternatives_1_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2085:1: ( ( '+' ) | ( '-' ) )
+            // InternalScope.g:2085:1: ( ( '+' ) | ( '-' ) )
             int alt14=2;
             int LA14_0 = input.LA(1);
 
@@ -6701,15 +6701,15 @@ else if ( (LA14_0==19) ) {
             }
             switch (alt14) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2086:1: ( '+' )
+                    // InternalScope.g:2086:1: ( '+' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2086:1: ( '+' )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2087:1: '+'
+                    // InternalScope.g:2086:1: ( '+' )
+                    // InternalScope.g:2087:1: '+'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getAdditiveExpressionAccess().getNamePlusSignKeyword_1_1_0_0()); 
                     }
-                    match(input,18,FOLLOW_18_in_rule__AdditiveExpression__NameAlternatives_1_1_04463); if (state.failed) return ;
+                    match(input,18,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getAdditiveExpressionAccess().getNamePlusSignKeyword_1_1_0_0()); 
                     }
@@ -6720,15 +6720,15 @@ else if ( (LA14_0==19) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2094:6: ( '-' )
+                    // InternalScope.g:2094:6: ( '-' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2094:6: ( '-' )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2095:1: '-'
+                    // InternalScope.g:2094:6: ( '-' )
+                    // InternalScope.g:2095:1: '-'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getAdditiveExpressionAccess().getNameHyphenMinusKeyword_1_1_0_1()); 
                     }
-                    match(input,19,FOLLOW_19_in_rule__AdditiveExpression__NameAlternatives_1_1_04483); if (state.failed) return ;
+                    match(input,19,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getAdditiveExpressionAccess().getNameHyphenMinusKeyword_1_1_0_1()); 
                     }
@@ -6756,13 +6756,13 @@ else if ( (LA14_0==19) ) {
 
 
     // $ANTLR start "rule__MultiplicativeExpression__NameAlternatives_1_1_0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2107:1: rule__MultiplicativeExpression__NameAlternatives_1_1_0 : ( ( '*' ) | ( '/' ) );
+    // InternalScope.g:2107:1: rule__MultiplicativeExpression__NameAlternatives_1_1_0 : ( ( '*' ) | ( '/' ) );
     public final void rule__MultiplicativeExpression__NameAlternatives_1_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2111:1: ( ( '*' ) | ( '/' ) )
+            // InternalScope.g:2111:1: ( ( '*' ) | ( '/' ) )
             int alt15=2;
             int LA15_0 = input.LA(1);
 
@@ -6781,15 +6781,15 @@ else if ( (LA15_0==21) ) {
             }
             switch (alt15) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2112:1: ( '*' )
+                    // InternalScope.g:2112:1: ( '*' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2112:1: ( '*' )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2113:1: '*'
+                    // InternalScope.g:2112:1: ( '*' )
+                    // InternalScope.g:2113:1: '*'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getMultiplicativeExpressionAccess().getNameAsteriskKeyword_1_1_0_0()); 
                     }
-                    match(input,20,FOLLOW_20_in_rule__MultiplicativeExpression__NameAlternatives_1_1_04518); if (state.failed) return ;
+                    match(input,20,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getMultiplicativeExpressionAccess().getNameAsteriskKeyword_1_1_0_0()); 
                     }
@@ -6800,15 +6800,15 @@ else if ( (LA15_0==21) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2120:6: ( '/' )
+                    // InternalScope.g:2120:6: ( '/' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2120:6: ( '/' )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2121:1: '/'
+                    // InternalScope.g:2120:6: ( '/' )
+                    // InternalScope.g:2121:1: '/'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getMultiplicativeExpressionAccess().getNameSolidusKeyword_1_1_0_1()); 
                     }
-                    match(input,21,FOLLOW_21_in_rule__MultiplicativeExpression__NameAlternatives_1_1_04538); if (state.failed) return ;
+                    match(input,21,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getMultiplicativeExpressionAccess().getNameSolidusKeyword_1_1_0_1()); 
                     }
@@ -6836,13 +6836,13 @@ else if ( (LA15_0==21) ) {
 
 
     // $ANTLR start "rule__UnaryOrInfixExpression__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2133:1: rule__UnaryOrInfixExpression__Alternatives : ( ( ruleUnaryExpression ) | ( ruleInfixExpression ) );
+    // InternalScope.g:2133:1: rule__UnaryOrInfixExpression__Alternatives : ( ( ruleUnaryExpression ) | ( ruleInfixExpression ) );
     public final void rule__UnaryOrInfixExpression__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2137:1: ( ( ruleUnaryExpression ) | ( ruleInfixExpression ) )
+            // InternalScope.g:2137:1: ( ( ruleUnaryExpression ) | ( ruleInfixExpression ) )
             int alt16=2;
             int LA16_0 = input.LA(1);
 
@@ -6861,15 +6861,15 @@ else if ( ((LA16_0>=RULE_ID && LA16_0<=RULE_REAL)||(LA16_0>=23 && LA16_0<=35)||L
             }
             switch (alt16) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2138:1: ( ruleUnaryExpression )
+                    // InternalScope.g:2138:1: ( ruleUnaryExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2138:1: ( ruleUnaryExpression )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2139:1: ruleUnaryExpression
+                    // InternalScope.g:2138:1: ( ruleUnaryExpression )
+                    // InternalScope.g:2139:1: ruleUnaryExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getUnaryOrInfixExpressionAccess().getUnaryExpressionParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleUnaryExpression_in_rule__UnaryOrInfixExpression__Alternatives4572);
+                    pushFollow(FOLLOW_2);
                     ruleUnaryExpression();
 
                     state._fsp--;
@@ -6884,15 +6884,15 @@ else if ( ((LA16_0>=RULE_ID && LA16_0<=RULE_REAL)||(LA16_0>=23 && LA16_0<=35)||L
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2144:6: ( ruleInfixExpression )
+                    // InternalScope.g:2144:6: ( ruleInfixExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2144:6: ( ruleInfixExpression )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2145:1: ruleInfixExpression
+                    // InternalScope.g:2144:6: ( ruleInfixExpression )
+                    // InternalScope.g:2145:1: ruleInfixExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getUnaryOrInfixExpressionAccess().getInfixExpressionParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleInfixExpression_in_rule__UnaryOrInfixExpression__Alternatives4589);
+                    pushFollow(FOLLOW_2);
                     ruleInfixExpression();
 
                     state._fsp--;
@@ -6924,13 +6924,13 @@ else if ( ((LA16_0>=RULE_ID && LA16_0<=RULE_REAL)||(LA16_0>=23 && LA16_0<=35)||L
 
 
     // $ANTLR start "rule__UnaryExpression__NameAlternatives_0_0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2155:1: rule__UnaryExpression__NameAlternatives_0_0 : ( ( '!' ) | ( '-' ) );
+    // InternalScope.g:2155:1: rule__UnaryExpression__NameAlternatives_0_0 : ( ( '!' ) | ( '-' ) );
     public final void rule__UnaryExpression__NameAlternatives_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2159:1: ( ( '!' ) | ( '-' ) )
+            // InternalScope.g:2159:1: ( ( '!' ) | ( '-' ) )
             int alt17=2;
             int LA17_0 = input.LA(1);
 
@@ -6949,15 +6949,15 @@ else if ( (LA17_0==19) ) {
             }
             switch (alt17) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2160:1: ( '!' )
+                    // InternalScope.g:2160:1: ( '!' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2160:1: ( '!' )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2161:1: '!'
+                    // InternalScope.g:2160:1: ( '!' )
+                    // InternalScope.g:2161:1: '!'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getUnaryExpressionAccess().getNameExclamationMarkKeyword_0_0_0()); 
                     }
-                    match(input,22,FOLLOW_22_in_rule__UnaryExpression__NameAlternatives_0_04622); if (state.failed) return ;
+                    match(input,22,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getUnaryExpressionAccess().getNameExclamationMarkKeyword_0_0_0()); 
                     }
@@ -6968,15 +6968,15 @@ else if ( (LA17_0==19) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2168:6: ( '-' )
+                    // InternalScope.g:2168:6: ( '-' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2168:6: ( '-' )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2169:1: '-'
+                    // InternalScope.g:2168:6: ( '-' )
+                    // InternalScope.g:2169:1: '-'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getUnaryExpressionAccess().getNameHyphenMinusKeyword_0_0_1()); 
                     }
-                    match(input,19,FOLLOW_19_in_rule__UnaryExpression__NameAlternatives_0_04642); if (state.failed) return ;
+                    match(input,19,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getUnaryExpressionAccess().getNameHyphenMinusKeyword_0_0_1()); 
                     }
@@ -7004,13 +7004,13 @@ else if ( (LA17_0==19) ) {
 
 
     // $ANTLR start "rule__InfixExpression__Alternatives_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2181:1: rule__InfixExpression__Alternatives_1 : ( ( ( rule__InfixExpression__Group_1_0__0 ) ) | ( ( rule__InfixExpression__Group_1_1__0 ) ) | ( ( rule__InfixExpression__Group_1_2__0 ) ) | ( ( rule__InfixExpression__Group_1_3__0 ) ) );
+    // InternalScope.g:2181:1: rule__InfixExpression__Alternatives_1 : ( ( ( rule__InfixExpression__Group_1_0__0 ) ) | ( ( rule__InfixExpression__Group_1_1__0 ) ) | ( ( rule__InfixExpression__Group_1_2__0 ) ) | ( ( rule__InfixExpression__Group_1_3__0 ) ) );
     public final void rule__InfixExpression__Alternatives_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2185:1: ( ( ( rule__InfixExpression__Group_1_0__0 ) ) | ( ( rule__InfixExpression__Group_1_1__0 ) ) | ( ( rule__InfixExpression__Group_1_2__0 ) ) | ( ( rule__InfixExpression__Group_1_3__0 ) ) )
+            // InternalScope.g:2185:1: ( ( ( rule__InfixExpression__Group_1_0__0 ) ) | ( ( rule__InfixExpression__Group_1_1__0 ) ) | ( ( rule__InfixExpression__Group_1_2__0 ) ) | ( ( rule__InfixExpression__Group_1_3__0 ) ) )
             int alt18=4;
             int LA18_0 = input.LA(1);
 
@@ -7077,18 +7077,18 @@ else if ( (LA18_3==51) ) {
             }
             switch (alt18) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2186:1: ( ( rule__InfixExpression__Group_1_0__0 ) )
+                    // InternalScope.g:2186:1: ( ( rule__InfixExpression__Group_1_0__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2186:1: ( ( rule__InfixExpression__Group_1_0__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2187:1: ( rule__InfixExpression__Group_1_0__0 )
+                    // InternalScope.g:2186:1: ( ( rule__InfixExpression__Group_1_0__0 ) )
+                    // InternalScope.g:2187:1: ( rule__InfixExpression__Group_1_0__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getInfixExpressionAccess().getGroup_1_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2188:1: ( rule__InfixExpression__Group_1_0__0 )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2188:2: rule__InfixExpression__Group_1_0__0
+                    // InternalScope.g:2188:1: ( rule__InfixExpression__Group_1_0__0 )
+                    // InternalScope.g:2188:2: rule__InfixExpression__Group_1_0__0
                     {
-                    pushFollow(FOLLOW_rule__InfixExpression__Group_1_0__0_in_rule__InfixExpression__Alternatives_14676);
+                    pushFollow(FOLLOW_2);
                     rule__InfixExpression__Group_1_0__0();
 
                     state._fsp--;
@@ -7106,18 +7106,18 @@ else if ( (LA18_3==51) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2192:6: ( ( rule__InfixExpression__Group_1_1__0 ) )
+                    // InternalScope.g:2192:6: ( ( rule__InfixExpression__Group_1_1__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2192:6: ( ( rule__InfixExpression__Group_1_1__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2193:1: ( rule__InfixExpression__Group_1_1__0 )
+                    // InternalScope.g:2192:6: ( ( rule__InfixExpression__Group_1_1__0 ) )
+                    // InternalScope.g:2193:1: ( rule__InfixExpression__Group_1_1__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getInfixExpressionAccess().getGroup_1_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2194:1: ( rule__InfixExpression__Group_1_1__0 )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2194:2: rule__InfixExpression__Group_1_1__0
+                    // InternalScope.g:2194:1: ( rule__InfixExpression__Group_1_1__0 )
+                    // InternalScope.g:2194:2: rule__InfixExpression__Group_1_1__0
                     {
-                    pushFollow(FOLLOW_rule__InfixExpression__Group_1_1__0_in_rule__InfixExpression__Alternatives_14694);
+                    pushFollow(FOLLOW_2);
                     rule__InfixExpression__Group_1_1__0();
 
                     state._fsp--;
@@ -7135,18 +7135,18 @@ else if ( (LA18_3==51) ) {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2198:6: ( ( rule__InfixExpression__Group_1_2__0 ) )
+                    // InternalScope.g:2198:6: ( ( rule__InfixExpression__Group_1_2__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2198:6: ( ( rule__InfixExpression__Group_1_2__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2199:1: ( rule__InfixExpression__Group_1_2__0 )
+                    // InternalScope.g:2198:6: ( ( rule__InfixExpression__Group_1_2__0 ) )
+                    // InternalScope.g:2199:1: ( rule__InfixExpression__Group_1_2__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getInfixExpressionAccess().getGroup_1_2()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2200:1: ( rule__InfixExpression__Group_1_2__0 )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2200:2: rule__InfixExpression__Group_1_2__0
+                    // InternalScope.g:2200:1: ( rule__InfixExpression__Group_1_2__0 )
+                    // InternalScope.g:2200:2: rule__InfixExpression__Group_1_2__0
                     {
-                    pushFollow(FOLLOW_rule__InfixExpression__Group_1_2__0_in_rule__InfixExpression__Alternatives_14712);
+                    pushFollow(FOLLOW_2);
                     rule__InfixExpression__Group_1_2__0();
 
                     state._fsp--;
@@ -7164,18 +7164,18 @@ else if ( (LA18_3==51) ) {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2204:6: ( ( rule__InfixExpression__Group_1_3__0 ) )
+                    // InternalScope.g:2204:6: ( ( rule__InfixExpression__Group_1_3__0 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2204:6: ( ( rule__InfixExpression__Group_1_3__0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2205:1: ( rule__InfixExpression__Group_1_3__0 )
+                    // InternalScope.g:2204:6: ( ( rule__InfixExpression__Group_1_3__0 ) )
+                    // InternalScope.g:2205:1: ( rule__InfixExpression__Group_1_3__0 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getInfixExpressionAccess().getGroup_1_3()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2206:1: ( rule__InfixExpression__Group_1_3__0 )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2206:2: rule__InfixExpression__Group_1_3__0
+                    // InternalScope.g:2206:1: ( rule__InfixExpression__Group_1_3__0 )
+                    // InternalScope.g:2206:2: rule__InfixExpression__Group_1_3__0
                     {
-                    pushFollow(FOLLOW_rule__InfixExpression__Group_1_3__0_in_rule__InfixExpression__Alternatives_14730);
+                    pushFollow(FOLLOW_2);
                     rule__InfixExpression__Group_1_3__0();
 
                     state._fsp--;
@@ -7210,13 +7210,13 @@ else if ( (LA18_3==51) ) {
 
 
     // $ANTLR start "rule__InfixExpression__NameAlternatives_1_3_2_0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2215:1: rule__InfixExpression__NameAlternatives_1_3_2_0 : ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) );
+    // InternalScope.g:2215:1: rule__InfixExpression__NameAlternatives_1_3_2_0 : ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) );
     public final void rule__InfixExpression__NameAlternatives_1_3_2_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2219:1: ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) )
+            // InternalScope.g:2219:1: ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) )
             int alt19=8;
             switch ( input.LA(1) ) {
             case 23:
@@ -7269,15 +7269,15 @@ public final void rule__InfixExpression__NameAlternatives_1_3_2_0() throws Recog
 
             switch (alt19) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2220:1: ( 'collect' )
+                    // InternalScope.g:2220:1: ( 'collect' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2220:1: ( 'collect' )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2221:1: 'collect'
+                    // InternalScope.g:2220:1: ( 'collect' )
+                    // InternalScope.g:2221:1: 'collect'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getInfixExpressionAccess().getNameCollectKeyword_1_3_2_0_0()); 
                     }
-                    match(input,23,FOLLOW_23_in_rule__InfixExpression__NameAlternatives_1_3_2_04764); if (state.failed) return ;
+                    match(input,23,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getInfixExpressionAccess().getNameCollectKeyword_1_3_2_0_0()); 
                     }
@@ -7288,15 +7288,15 @@ public final void rule__InfixExpression__NameAlternatives_1_3_2_0() throws Recog
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2228:6: ( 'select' )
+                    // InternalScope.g:2228:6: ( 'select' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2228:6: ( 'select' )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2229:1: 'select'
+                    // InternalScope.g:2228:6: ( 'select' )
+                    // InternalScope.g:2229:1: 'select'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getInfixExpressionAccess().getNameSelectKeyword_1_3_2_0_1()); 
                     }
-                    match(input,24,FOLLOW_24_in_rule__InfixExpression__NameAlternatives_1_3_2_04784); if (state.failed) return ;
+                    match(input,24,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getInfixExpressionAccess().getNameSelectKeyword_1_3_2_0_1()); 
                     }
@@ -7307,15 +7307,15 @@ public final void rule__InfixExpression__NameAlternatives_1_3_2_0() throws Recog
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2236:6: ( 'selectFirst' )
+                    // InternalScope.g:2236:6: ( 'selectFirst' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2236:6: ( 'selectFirst' )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2237:1: 'selectFirst'
+                    // InternalScope.g:2236:6: ( 'selectFirst' )
+                    // InternalScope.g:2237:1: 'selectFirst'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getInfixExpressionAccess().getNameSelectFirstKeyword_1_3_2_0_2()); 
                     }
-                    match(input,25,FOLLOW_25_in_rule__InfixExpression__NameAlternatives_1_3_2_04804); if (state.failed) return ;
+                    match(input,25,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getInfixExpressionAccess().getNameSelectFirstKeyword_1_3_2_0_2()); 
                     }
@@ -7326,15 +7326,15 @@ public final void rule__InfixExpression__NameAlternatives_1_3_2_0() throws Recog
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2244:6: ( 'reject' )
+                    // InternalScope.g:2244:6: ( 'reject' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2244:6: ( 'reject' )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2245:1: 'reject'
+                    // InternalScope.g:2244:6: ( 'reject' )
+                    // InternalScope.g:2245:1: 'reject'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getInfixExpressionAccess().getNameRejectKeyword_1_3_2_0_3()); 
                     }
-                    match(input,26,FOLLOW_26_in_rule__InfixExpression__NameAlternatives_1_3_2_04824); if (state.failed) return ;
+                    match(input,26,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getInfixExpressionAccess().getNameRejectKeyword_1_3_2_0_3()); 
                     }
@@ -7345,15 +7345,15 @@ public final void rule__InfixExpression__NameAlternatives_1_3_2_0() throws Recog
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2252:6: ( 'exists' )
+                    // InternalScope.g:2252:6: ( 'exists' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2252:6: ( 'exists' )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2253:1: 'exists'
+                    // InternalScope.g:2252:6: ( 'exists' )
+                    // InternalScope.g:2253:1: 'exists'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getInfixExpressionAccess().getNameExistsKeyword_1_3_2_0_4()); 
                     }
-                    match(input,27,FOLLOW_27_in_rule__InfixExpression__NameAlternatives_1_3_2_04844); if (state.failed) return ;
+                    match(input,27,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getInfixExpressionAccess().getNameExistsKeyword_1_3_2_0_4()); 
                     }
@@ -7364,15 +7364,15 @@ public final void rule__InfixExpression__NameAlternatives_1_3_2_0() throws Recog
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2260:6: ( 'notExists' )
+                    // InternalScope.g:2260:6: ( 'notExists' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2260:6: ( 'notExists' )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2261:1: 'notExists'
+                    // InternalScope.g:2260:6: ( 'notExists' )
+                    // InternalScope.g:2261:1: 'notExists'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getInfixExpressionAccess().getNameNotExistsKeyword_1_3_2_0_5()); 
                     }
-                    match(input,28,FOLLOW_28_in_rule__InfixExpression__NameAlternatives_1_3_2_04864); if (state.failed) return ;
+                    match(input,28,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getInfixExpressionAccess().getNameNotExistsKeyword_1_3_2_0_5()); 
                     }
@@ -7383,15 +7383,15 @@ public final void rule__InfixExpression__NameAlternatives_1_3_2_0() throws Recog
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2268:6: ( 'sortBy' )
+                    // InternalScope.g:2268:6: ( 'sortBy' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2268:6: ( 'sortBy' )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2269:1: 'sortBy'
+                    // InternalScope.g:2268:6: ( 'sortBy' )
+                    // InternalScope.g:2269:1: 'sortBy'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getInfixExpressionAccess().getNameSortByKeyword_1_3_2_0_6()); 
                     }
-                    match(input,29,FOLLOW_29_in_rule__InfixExpression__NameAlternatives_1_3_2_04884); if (state.failed) return ;
+                    match(input,29,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getInfixExpressionAccess().getNameSortByKeyword_1_3_2_0_6()); 
                     }
@@ -7402,15 +7402,15 @@ public final void rule__InfixExpression__NameAlternatives_1_3_2_0() throws Recog
                     }
                     break;
                 case 8 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2276:6: ( 'forAll' )
+                    // InternalScope.g:2276:6: ( 'forAll' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2276:6: ( 'forAll' )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2277:1: 'forAll'
+                    // InternalScope.g:2276:6: ( 'forAll' )
+                    // InternalScope.g:2277:1: 'forAll'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getInfixExpressionAccess().getNameForAllKeyword_1_3_2_0_7()); 
                     }
-                    match(input,30,FOLLOW_30_in_rule__InfixExpression__NameAlternatives_1_3_2_04904); if (state.failed) return ;
+                    match(input,30,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getInfixExpressionAccess().getNameForAllKeyword_1_3_2_0_7()); 
                     }
@@ -7438,13 +7438,13 @@ public final void rule__InfixExpression__NameAlternatives_1_3_2_0() throws Recog
 
 
     // $ANTLR start "rule__PrimaryExpression__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2289:1: rule__PrimaryExpression__Alternatives : ( ( ruleLiteral ) | ( ruleFeatureCall ) | ( ruleListLiteral ) | ( ruleConstructorCallExpression ) | ( ruleGlobalVarExpression ) | ( ruleParanthesizedExpression ) );
+    // InternalScope.g:2289:1: rule__PrimaryExpression__Alternatives : ( ( ruleLiteral ) | ( ruleFeatureCall ) | ( ruleListLiteral ) | ( ruleConstructorCallExpression ) | ( ruleGlobalVarExpression ) | ( ruleParanthesizedExpression ) );
     public final void rule__PrimaryExpression__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2293:1: ( ( ruleLiteral ) | ( ruleFeatureCall ) | ( ruleListLiteral ) | ( ruleConstructorCallExpression ) | ( ruleGlobalVarExpression ) | ( ruleParanthesizedExpression ) )
+            // InternalScope.g:2293:1: ( ( ruleLiteral ) | ( ruleFeatureCall ) | ( ruleListLiteral ) | ( ruleConstructorCallExpression ) | ( ruleGlobalVarExpression ) | ( ruleParanthesizedExpression ) )
             int alt20=6;
             switch ( input.LA(1) ) {
             case RULE_STRING:
@@ -7504,15 +7504,15 @@ public final void rule__PrimaryExpression__Alternatives() throws RecognitionExce
 
             switch (alt20) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2294:1: ( ruleLiteral )
+                    // InternalScope.g:2294:1: ( ruleLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2294:1: ( ruleLiteral )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2295:1: ruleLiteral
+                    // InternalScope.g:2294:1: ( ruleLiteral )
+                    // InternalScope.g:2295:1: ruleLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getPrimaryExpressionAccess().getLiteralParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleLiteral_in_rule__PrimaryExpression__Alternatives4938);
+                    pushFollow(FOLLOW_2);
                     ruleLiteral();
 
                     state._fsp--;
@@ -7527,15 +7527,15 @@ public final void rule__PrimaryExpression__Alternatives() throws RecognitionExce
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2300:6: ( ruleFeatureCall )
+                    // InternalScope.g:2300:6: ( ruleFeatureCall )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2300:6: ( ruleFeatureCall )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2301:1: ruleFeatureCall
+                    // InternalScope.g:2300:6: ( ruleFeatureCall )
+                    // InternalScope.g:2301:1: ruleFeatureCall
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getPrimaryExpressionAccess().getFeatureCallParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleFeatureCall_in_rule__PrimaryExpression__Alternatives4955);
+                    pushFollow(FOLLOW_2);
                     ruleFeatureCall();
 
                     state._fsp--;
@@ -7550,15 +7550,15 @@ public final void rule__PrimaryExpression__Alternatives() throws RecognitionExce
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2306:6: ( ruleListLiteral )
+                    // InternalScope.g:2306:6: ( ruleListLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2306:6: ( ruleListLiteral )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2307:1: ruleListLiteral
+                    // InternalScope.g:2306:6: ( ruleListLiteral )
+                    // InternalScope.g:2307:1: ruleListLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getPrimaryExpressionAccess().getListLiteralParserRuleCall_2()); 
                     }
-                    pushFollow(FOLLOW_ruleListLiteral_in_rule__PrimaryExpression__Alternatives4972);
+                    pushFollow(FOLLOW_2);
                     ruleListLiteral();
 
                     state._fsp--;
@@ -7573,15 +7573,15 @@ public final void rule__PrimaryExpression__Alternatives() throws RecognitionExce
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2312:6: ( ruleConstructorCallExpression )
+                    // InternalScope.g:2312:6: ( ruleConstructorCallExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2312:6: ( ruleConstructorCallExpression )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2313:1: ruleConstructorCallExpression
+                    // InternalScope.g:2312:6: ( ruleConstructorCallExpression )
+                    // InternalScope.g:2313:1: ruleConstructorCallExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getPrimaryExpressionAccess().getConstructorCallExpressionParserRuleCall_3()); 
                     }
-                    pushFollow(FOLLOW_ruleConstructorCallExpression_in_rule__PrimaryExpression__Alternatives4989);
+                    pushFollow(FOLLOW_2);
                     ruleConstructorCallExpression();
 
                     state._fsp--;
@@ -7596,15 +7596,15 @@ public final void rule__PrimaryExpression__Alternatives() throws RecognitionExce
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2318:6: ( ruleGlobalVarExpression )
+                    // InternalScope.g:2318:6: ( ruleGlobalVarExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2318:6: ( ruleGlobalVarExpression )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2319:1: ruleGlobalVarExpression
+                    // InternalScope.g:2318:6: ( ruleGlobalVarExpression )
+                    // InternalScope.g:2319:1: ruleGlobalVarExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getPrimaryExpressionAccess().getGlobalVarExpressionParserRuleCall_4()); 
                     }
-                    pushFollow(FOLLOW_ruleGlobalVarExpression_in_rule__PrimaryExpression__Alternatives5006);
+                    pushFollow(FOLLOW_2);
                     ruleGlobalVarExpression();
 
                     state._fsp--;
@@ -7619,15 +7619,15 @@ public final void rule__PrimaryExpression__Alternatives() throws RecognitionExce
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2324:6: ( ruleParanthesizedExpression )
+                    // InternalScope.g:2324:6: ( ruleParanthesizedExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2324:6: ( ruleParanthesizedExpression )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2325:1: ruleParanthesizedExpression
+                    // InternalScope.g:2324:6: ( ruleParanthesizedExpression )
+                    // InternalScope.g:2325:1: ruleParanthesizedExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getPrimaryExpressionAccess().getParanthesizedExpressionParserRuleCall_5()); 
                     }
-                    pushFollow(FOLLOW_ruleParanthesizedExpression_in_rule__PrimaryExpression__Alternatives5023);
+                    pushFollow(FOLLOW_2);
                     ruleParanthesizedExpression();
 
                     state._fsp--;
@@ -7659,13 +7659,13 @@ public final void rule__PrimaryExpression__Alternatives() throws RecognitionExce
 
 
     // $ANTLR start "rule__Literal__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2335:1: rule__Literal__Alternatives : ( ( ruleBooleanLiteral ) | ( ruleIntegerLiteral ) | ( ruleNullLiteral ) | ( ruleRealLiteral ) | ( ruleStringLiteral ) );
+    // InternalScope.g:2335:1: rule__Literal__Alternatives : ( ( ruleBooleanLiteral ) | ( ruleIntegerLiteral ) | ( ruleNullLiteral ) | ( ruleRealLiteral ) | ( ruleStringLiteral ) );
     public final void rule__Literal__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2339:1: ( ( ruleBooleanLiteral ) | ( ruleIntegerLiteral ) | ( ruleNullLiteral ) | ( ruleRealLiteral ) | ( ruleStringLiteral ) )
+            // InternalScope.g:2339:1: ( ( ruleBooleanLiteral ) | ( ruleIntegerLiteral ) | ( ruleNullLiteral ) | ( ruleRealLiteral ) | ( ruleStringLiteral ) )
             int alt21=5;
             switch ( input.LA(1) ) {
             case 31:
@@ -7704,15 +7704,15 @@ public final void rule__Literal__Alternatives() throws RecognitionException {
 
             switch (alt21) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2340:1: ( ruleBooleanLiteral )
+                    // InternalScope.g:2340:1: ( ruleBooleanLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2340:1: ( ruleBooleanLiteral )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2341:1: ruleBooleanLiteral
+                    // InternalScope.g:2340:1: ( ruleBooleanLiteral )
+                    // InternalScope.g:2341:1: ruleBooleanLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getLiteralAccess().getBooleanLiteralParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleBooleanLiteral_in_rule__Literal__Alternatives5055);
+                    pushFollow(FOLLOW_2);
                     ruleBooleanLiteral();
 
                     state._fsp--;
@@ -7727,15 +7727,15 @@ public final void rule__Literal__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2346:6: ( ruleIntegerLiteral )
+                    // InternalScope.g:2346:6: ( ruleIntegerLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2346:6: ( ruleIntegerLiteral )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2347:1: ruleIntegerLiteral
+                    // InternalScope.g:2346:6: ( ruleIntegerLiteral )
+                    // InternalScope.g:2347:1: ruleIntegerLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getLiteralAccess().getIntegerLiteralParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleIntegerLiteral_in_rule__Literal__Alternatives5072);
+                    pushFollow(FOLLOW_2);
                     ruleIntegerLiteral();
 
                     state._fsp--;
@@ -7750,15 +7750,15 @@ public final void rule__Literal__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2352:6: ( ruleNullLiteral )
+                    // InternalScope.g:2352:6: ( ruleNullLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2352:6: ( ruleNullLiteral )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2353:1: ruleNullLiteral
+                    // InternalScope.g:2352:6: ( ruleNullLiteral )
+                    // InternalScope.g:2353:1: ruleNullLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getLiteralAccess().getNullLiteralParserRuleCall_2()); 
                     }
-                    pushFollow(FOLLOW_ruleNullLiteral_in_rule__Literal__Alternatives5089);
+                    pushFollow(FOLLOW_2);
                     ruleNullLiteral();
 
                     state._fsp--;
@@ -7773,15 +7773,15 @@ public final void rule__Literal__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2358:6: ( ruleRealLiteral )
+                    // InternalScope.g:2358:6: ( ruleRealLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2358:6: ( ruleRealLiteral )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2359:1: ruleRealLiteral
+                    // InternalScope.g:2358:6: ( ruleRealLiteral )
+                    // InternalScope.g:2359:1: ruleRealLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getLiteralAccess().getRealLiteralParserRuleCall_3()); 
                     }
-                    pushFollow(FOLLOW_ruleRealLiteral_in_rule__Literal__Alternatives5106);
+                    pushFollow(FOLLOW_2);
                     ruleRealLiteral();
 
                     state._fsp--;
@@ -7796,15 +7796,15 @@ public final void rule__Literal__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2364:6: ( ruleStringLiteral )
+                    // InternalScope.g:2364:6: ( ruleStringLiteral )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2364:6: ( ruleStringLiteral )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2365:1: ruleStringLiteral
+                    // InternalScope.g:2364:6: ( ruleStringLiteral )
+                    // InternalScope.g:2365:1: ruleStringLiteral
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getLiteralAccess().getStringLiteralParserRuleCall_4()); 
                     }
-                    pushFollow(FOLLOW_ruleStringLiteral_in_rule__Literal__Alternatives5123);
+                    pushFollow(FOLLOW_2);
                     ruleStringLiteral();
 
                     state._fsp--;
@@ -7836,13 +7836,13 @@ public final void rule__Literal__Alternatives() throws RecognitionException {
 
 
     // $ANTLR start "rule__BooleanLiteral__ValAlternatives_0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2375:1: rule__BooleanLiteral__ValAlternatives_0 : ( ( 'true' ) | ( 'false' ) );
+    // InternalScope.g:2375:1: rule__BooleanLiteral__ValAlternatives_0 : ( ( 'true' ) | ( 'false' ) );
     public final void rule__BooleanLiteral__ValAlternatives_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2379:1: ( ( 'true' ) | ( 'false' ) )
+            // InternalScope.g:2379:1: ( ( 'true' ) | ( 'false' ) )
             int alt22=2;
             int LA22_0 = input.LA(1);
 
@@ -7861,15 +7861,15 @@ else if ( (LA22_0==32) ) {
             }
             switch (alt22) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2380:1: ( 'true' )
+                    // InternalScope.g:2380:1: ( 'true' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2380:1: ( 'true' )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2381:1: 'true'
+                    // InternalScope.g:2380:1: ( 'true' )
+                    // InternalScope.g:2381:1: 'true'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getBooleanLiteralAccess().getValTrueKeyword_0_0()); 
                     }
-                    match(input,31,FOLLOW_31_in_rule__BooleanLiteral__ValAlternatives_05156); if (state.failed) return ;
+                    match(input,31,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getBooleanLiteralAccess().getValTrueKeyword_0_0()); 
                     }
@@ -7880,15 +7880,15 @@ else if ( (LA22_0==32) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2388:6: ( 'false' )
+                    // InternalScope.g:2388:6: ( 'false' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2388:6: ( 'false' )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2389:1: 'false'
+                    // InternalScope.g:2388:6: ( 'false' )
+                    // InternalScope.g:2389:1: 'false'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getBooleanLiteralAccess().getValFalseKeyword_0_1()); 
                     }
-                    match(input,32,FOLLOW_32_in_rule__BooleanLiteral__ValAlternatives_05176); if (state.failed) return ;
+                    match(input,32,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getBooleanLiteralAccess().getValFalseKeyword_0_1()); 
                     }
@@ -7916,13 +7916,13 @@ else if ( (LA22_0==32) ) {
 
 
     // $ANTLR start "rule__FeatureCall__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2401:1: rule__FeatureCall__Alternatives : ( ( ruleOperationCall ) | ( ( rule__FeatureCall__TypeAssignment_1 ) ) | ( ruleCollectionExpression ) | ( ruleTypeSelectExpression ) );
+    // InternalScope.g:2401:1: rule__FeatureCall__Alternatives : ( ( ruleOperationCall ) | ( ( rule__FeatureCall__TypeAssignment_1 ) ) | ( ruleCollectionExpression ) | ( ruleTypeSelectExpression ) );
     public final void rule__FeatureCall__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2405:1: ( ( ruleOperationCall ) | ( ( rule__FeatureCall__TypeAssignment_1 ) ) | ( ruleCollectionExpression ) | ( ruleTypeSelectExpression ) )
+            // InternalScope.g:2405:1: ( ( ruleOperationCall ) | ( ( rule__FeatureCall__TypeAssignment_1 ) ) | ( ruleCollectionExpression ) | ( ruleTypeSelectExpression ) )
             int alt23=4;
             switch ( input.LA(1) ) {
             case RULE_ID:
@@ -7978,15 +7978,15 @@ else if ( (LA23_1==51) ) {
 
             switch (alt23) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2406:1: ( ruleOperationCall )
+                    // InternalScope.g:2406:1: ( ruleOperationCall )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2406:1: ( ruleOperationCall )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2407:1: ruleOperationCall
+                    // InternalScope.g:2406:1: ( ruleOperationCall )
+                    // InternalScope.g:2407:1: ruleOperationCall
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallAccess().getOperationCallParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleOperationCall_in_rule__FeatureCall__Alternatives5210);
+                    pushFollow(FOLLOW_2);
                     ruleOperationCall();
 
                     state._fsp--;
@@ -8001,18 +8001,18 @@ else if ( (LA23_1==51) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2412:6: ( ( rule__FeatureCall__TypeAssignment_1 ) )
+                    // InternalScope.g:2412:6: ( ( rule__FeatureCall__TypeAssignment_1 ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2412:6: ( ( rule__FeatureCall__TypeAssignment_1 ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2413:1: ( rule__FeatureCall__TypeAssignment_1 )
+                    // InternalScope.g:2412:6: ( ( rule__FeatureCall__TypeAssignment_1 ) )
+                    // InternalScope.g:2413:1: ( rule__FeatureCall__TypeAssignment_1 )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallAccess().getTypeAssignment_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2414:1: ( rule__FeatureCall__TypeAssignment_1 )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2414:2: rule__FeatureCall__TypeAssignment_1
+                    // InternalScope.g:2414:1: ( rule__FeatureCall__TypeAssignment_1 )
+                    // InternalScope.g:2414:2: rule__FeatureCall__TypeAssignment_1
                     {
-                    pushFollow(FOLLOW_rule__FeatureCall__TypeAssignment_1_in_rule__FeatureCall__Alternatives5227);
+                    pushFollow(FOLLOW_2);
                     rule__FeatureCall__TypeAssignment_1();
 
                     state._fsp--;
@@ -8030,15 +8030,15 @@ else if ( (LA23_1==51) ) {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2418:6: ( ruleCollectionExpression )
+                    // InternalScope.g:2418:6: ( ruleCollectionExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2418:6: ( ruleCollectionExpression )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2419:1: ruleCollectionExpression
+                    // InternalScope.g:2418:6: ( ruleCollectionExpression )
+                    // InternalScope.g:2419:1: ruleCollectionExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallAccess().getCollectionExpressionParserRuleCall_2()); 
                     }
-                    pushFollow(FOLLOW_ruleCollectionExpression_in_rule__FeatureCall__Alternatives5245);
+                    pushFollow(FOLLOW_2);
                     ruleCollectionExpression();
 
                     state._fsp--;
@@ -8053,15 +8053,15 @@ else if ( (LA23_1==51) ) {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2424:6: ( ruleTypeSelectExpression )
+                    // InternalScope.g:2424:6: ( ruleTypeSelectExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2424:6: ( ruleTypeSelectExpression )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2425:1: ruleTypeSelectExpression
+                    // InternalScope.g:2424:6: ( ruleTypeSelectExpression )
+                    // InternalScope.g:2425:1: ruleTypeSelectExpression
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getFeatureCallAccess().getTypeSelectExpressionParserRuleCall_3()); 
                     }
-                    pushFollow(FOLLOW_ruleTypeSelectExpression_in_rule__FeatureCall__Alternatives5262);
+                    pushFollow(FOLLOW_2);
                     ruleTypeSelectExpression();
 
                     state._fsp--;
@@ -8093,13 +8093,13 @@ else if ( (LA23_1==51) ) {
 
 
     // $ANTLR start "rule__CollectionExpression__NameAlternatives_0_0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2435:1: rule__CollectionExpression__NameAlternatives_0_0 : ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) );
+    // InternalScope.g:2435:1: rule__CollectionExpression__NameAlternatives_0_0 : ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) );
     public final void rule__CollectionExpression__NameAlternatives_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2439:1: ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) )
+            // InternalScope.g:2439:1: ( ( 'collect' ) | ( 'select' ) | ( 'selectFirst' ) | ( 'reject' ) | ( 'exists' ) | ( 'notExists' ) | ( 'sortBy' ) | ( 'forAll' ) )
             int alt24=8;
             switch ( input.LA(1) ) {
             case 23:
@@ -8152,15 +8152,15 @@ public final void rule__CollectionExpression__NameAlternatives_0_0() throws Reco
 
             switch (alt24) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2440:1: ( 'collect' )
+                    // InternalScope.g:2440:1: ( 'collect' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2440:1: ( 'collect' )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2441:1: 'collect'
+                    // InternalScope.g:2440:1: ( 'collect' )
+                    // InternalScope.g:2441:1: 'collect'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getCollectionExpressionAccess().getNameCollectKeyword_0_0_0()); 
                     }
-                    match(input,23,FOLLOW_23_in_rule__CollectionExpression__NameAlternatives_0_05295); if (state.failed) return ;
+                    match(input,23,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getCollectionExpressionAccess().getNameCollectKeyword_0_0_0()); 
                     }
@@ -8171,15 +8171,15 @@ public final void rule__CollectionExpression__NameAlternatives_0_0() throws Reco
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2448:6: ( 'select' )
+                    // InternalScope.g:2448:6: ( 'select' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2448:6: ( 'select' )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2449:1: 'select'
+                    // InternalScope.g:2448:6: ( 'select' )
+                    // InternalScope.g:2449:1: 'select'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getCollectionExpressionAccess().getNameSelectKeyword_0_0_1()); 
                     }
-                    match(input,24,FOLLOW_24_in_rule__CollectionExpression__NameAlternatives_0_05315); if (state.failed) return ;
+                    match(input,24,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getCollectionExpressionAccess().getNameSelectKeyword_0_0_1()); 
                     }
@@ -8190,15 +8190,15 @@ public final void rule__CollectionExpression__NameAlternatives_0_0() throws Reco
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2456:6: ( 'selectFirst' )
+                    // InternalScope.g:2456:6: ( 'selectFirst' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2456:6: ( 'selectFirst' )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2457:1: 'selectFirst'
+                    // InternalScope.g:2456:6: ( 'selectFirst' )
+                    // InternalScope.g:2457:1: 'selectFirst'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getCollectionExpressionAccess().getNameSelectFirstKeyword_0_0_2()); 
                     }
-                    match(input,25,FOLLOW_25_in_rule__CollectionExpression__NameAlternatives_0_05335); if (state.failed) return ;
+                    match(input,25,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getCollectionExpressionAccess().getNameSelectFirstKeyword_0_0_2()); 
                     }
@@ -8209,15 +8209,15 @@ public final void rule__CollectionExpression__NameAlternatives_0_0() throws Reco
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2464:6: ( 'reject' )
+                    // InternalScope.g:2464:6: ( 'reject' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2464:6: ( 'reject' )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2465:1: 'reject'
+                    // InternalScope.g:2464:6: ( 'reject' )
+                    // InternalScope.g:2465:1: 'reject'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getCollectionExpressionAccess().getNameRejectKeyword_0_0_3()); 
                     }
-                    match(input,26,FOLLOW_26_in_rule__CollectionExpression__NameAlternatives_0_05355); if (state.failed) return ;
+                    match(input,26,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getCollectionExpressionAccess().getNameRejectKeyword_0_0_3()); 
                     }
@@ -8228,15 +8228,15 @@ public final void rule__CollectionExpression__NameAlternatives_0_0() throws Reco
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2472:6: ( 'exists' )
+                    // InternalScope.g:2472:6: ( 'exists' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2472:6: ( 'exists' )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2473:1: 'exists'
+                    // InternalScope.g:2472:6: ( 'exists' )
+                    // InternalScope.g:2473:1: 'exists'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getCollectionExpressionAccess().getNameExistsKeyword_0_0_4()); 
                     }
-                    match(input,27,FOLLOW_27_in_rule__CollectionExpression__NameAlternatives_0_05375); if (state.failed) return ;
+                    match(input,27,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getCollectionExpressionAccess().getNameExistsKeyword_0_0_4()); 
                     }
@@ -8247,15 +8247,15 @@ public final void rule__CollectionExpression__NameAlternatives_0_0() throws Reco
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2480:6: ( 'notExists' )
+                    // InternalScope.g:2480:6: ( 'notExists' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2480:6: ( 'notExists' )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2481:1: 'notExists'
+                    // InternalScope.g:2480:6: ( 'notExists' )
+                    // InternalScope.g:2481:1: 'notExists'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getCollectionExpressionAccess().getNameNotExistsKeyword_0_0_5()); 
                     }
-                    match(input,28,FOLLOW_28_in_rule__CollectionExpression__NameAlternatives_0_05395); if (state.failed) return ;
+                    match(input,28,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getCollectionExpressionAccess().getNameNotExistsKeyword_0_0_5()); 
                     }
@@ -8266,15 +8266,15 @@ public final void rule__CollectionExpression__NameAlternatives_0_0() throws Reco
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2488:6: ( 'sortBy' )
+                    // InternalScope.g:2488:6: ( 'sortBy' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2488:6: ( 'sortBy' )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2489:1: 'sortBy'
+                    // InternalScope.g:2488:6: ( 'sortBy' )
+                    // InternalScope.g:2489:1: 'sortBy'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getCollectionExpressionAccess().getNameSortByKeyword_0_0_6()); 
                     }
-                    match(input,29,FOLLOW_29_in_rule__CollectionExpression__NameAlternatives_0_05415); if (state.failed) return ;
+                    match(input,29,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getCollectionExpressionAccess().getNameSortByKeyword_0_0_6()); 
                     }
@@ -8285,15 +8285,15 @@ public final void rule__CollectionExpression__NameAlternatives_0_0() throws Reco
                     }
                     break;
                 case 8 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2496:6: ( 'forAll' )
+                    // InternalScope.g:2496:6: ( 'forAll' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2496:6: ( 'forAll' )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2497:1: 'forAll'
+                    // InternalScope.g:2496:6: ( 'forAll' )
+                    // InternalScope.g:2497:1: 'forAll'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getCollectionExpressionAccess().getNameForAllKeyword_0_0_7()); 
                     }
-                    match(input,30,FOLLOW_30_in_rule__CollectionExpression__NameAlternatives_0_05435); if (state.failed) return ;
+                    match(input,30,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getCollectionExpressionAccess().getNameForAllKeyword_0_0_7()); 
                     }
@@ -8321,13 +8321,13 @@ public final void rule__CollectionExpression__NameAlternatives_0_0() throws Reco
 
 
     // $ANTLR start "rule__Type__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2509:1: rule__Type__Alternatives : ( ( ruleCollectionType ) | ( ruleSimpleType ) );
+    // InternalScope.g:2509:1: rule__Type__Alternatives : ( ( ruleCollectionType ) | ( ruleSimpleType ) );
     public final void rule__Type__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2513:1: ( ( ruleCollectionType ) | ( ruleSimpleType ) )
+            // InternalScope.g:2513:1: ( ( ruleCollectionType ) | ( ruleSimpleType ) )
             int alt25=2;
             int LA25_0 = input.LA(1);
 
@@ -8346,15 +8346,15 @@ else if ( (LA25_0==RULE_ID) ) {
             }
             switch (alt25) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2514:1: ( ruleCollectionType )
+                    // InternalScope.g:2514:1: ( ruleCollectionType )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2514:1: ( ruleCollectionType )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2515:1: ruleCollectionType
+                    // InternalScope.g:2514:1: ( ruleCollectionType )
+                    // InternalScope.g:2515:1: ruleCollectionType
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTypeAccess().getCollectionTypeParserRuleCall_0()); 
                     }
-                    pushFollow(FOLLOW_ruleCollectionType_in_rule__Type__Alternatives5469);
+                    pushFollow(FOLLOW_2);
                     ruleCollectionType();
 
                     state._fsp--;
@@ -8369,15 +8369,15 @@ else if ( (LA25_0==RULE_ID) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2520:6: ( ruleSimpleType )
+                    // InternalScope.g:2520:6: ( ruleSimpleType )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2520:6: ( ruleSimpleType )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2521:1: ruleSimpleType
+                    // InternalScope.g:2520:6: ( ruleSimpleType )
+                    // InternalScope.g:2521:1: ruleSimpleType
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getTypeAccess().getSimpleTypeParserRuleCall_1()); 
                     }
-                    pushFollow(FOLLOW_ruleSimpleType_in_rule__Type__Alternatives5486);
+                    pushFollow(FOLLOW_2);
                     ruleSimpleType();
 
                     state._fsp--;
@@ -8409,13 +8409,13 @@ else if ( (LA25_0==RULE_ID) ) {
 
 
     // $ANTLR start "rule__CollectionType__ClAlternatives_0_0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2531:1: rule__CollectionType__ClAlternatives_0_0 : ( ( 'Collection' ) | ( 'List' ) | ( 'Set' ) );
+    // InternalScope.g:2531:1: rule__CollectionType__ClAlternatives_0_0 : ( ( 'Collection' ) | ( 'List' ) | ( 'Set' ) );
     public final void rule__CollectionType__ClAlternatives_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2535:1: ( ( 'Collection' ) | ( 'List' ) | ( 'Set' ) )
+            // InternalScope.g:2535:1: ( ( 'Collection' ) | ( 'List' ) | ( 'Set' ) )
             int alt26=3;
             switch ( input.LA(1) ) {
             case 33:
@@ -8443,15 +8443,15 @@ public final void rule__CollectionType__ClAlternatives_0_0() throws RecognitionE
 
             switch (alt26) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2536:1: ( 'Collection' )
+                    // InternalScope.g:2536:1: ( 'Collection' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2536:1: ( 'Collection' )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2537:1: 'Collection'
+                    // InternalScope.g:2536:1: ( 'Collection' )
+                    // InternalScope.g:2537:1: 'Collection'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getCollectionTypeAccess().getClCollectionKeyword_0_0_0()); 
                     }
-                    match(input,33,FOLLOW_33_in_rule__CollectionType__ClAlternatives_0_05519); if (state.failed) return ;
+                    match(input,33,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getCollectionTypeAccess().getClCollectionKeyword_0_0_0()); 
                     }
@@ -8462,15 +8462,15 @@ public final void rule__CollectionType__ClAlternatives_0_0() throws RecognitionE
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2544:6: ( 'List' )
+                    // InternalScope.g:2544:6: ( 'List' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2544:6: ( 'List' )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2545:1: 'List'
+                    // InternalScope.g:2544:6: ( 'List' )
+                    // InternalScope.g:2545:1: 'List'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getCollectionTypeAccess().getClListKeyword_0_0_1()); 
                     }
-                    match(input,34,FOLLOW_34_in_rule__CollectionType__ClAlternatives_0_05539); if (state.failed) return ;
+                    match(input,34,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getCollectionTypeAccess().getClListKeyword_0_0_1()); 
                     }
@@ -8481,15 +8481,15 @@ public final void rule__CollectionType__ClAlternatives_0_0() throws RecognitionE
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2552:6: ( 'Set' )
+                    // InternalScope.g:2552:6: ( 'Set' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2552:6: ( 'Set' )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2553:1: 'Set'
+                    // InternalScope.g:2552:6: ( 'Set' )
+                    // InternalScope.g:2553:1: 'Set'
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getCollectionTypeAccess().getClSetKeyword_0_0_2()); 
                     }
-                    match(input,35,FOLLOW_35_in_rule__CollectionType__ClAlternatives_0_05559); if (state.failed) return ;
+                    match(input,35,FOLLOW_2); if (state.failed) return ;
                     if ( state.backtracking==0 ) {
                        after(grammarAccess.getCollectionTypeAccess().getClSetKeyword_0_0_2()); 
                     }
@@ -8517,13 +8517,13 @@ public final void rule__CollectionType__ClAlternatives_0_0() throws RecognitionE
 
 
     // $ANTLR start "rule__Casing__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2565:1: rule__Casing__Alternatives : ( ( ( 'sensitive' ) ) | ( ( 'insensitive' ) ) );
+    // InternalScope.g:2565:1: rule__Casing__Alternatives : ( ( ( 'sensitive' ) ) | ( ( 'insensitive' ) ) );
     public final void rule__Casing__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2569:1: ( ( ( 'sensitive' ) ) | ( ( 'insensitive' ) ) )
+            // InternalScope.g:2569:1: ( ( ( 'sensitive' ) ) | ( ( 'insensitive' ) ) )
             int alt27=2;
             int LA27_0 = input.LA(1);
 
@@ -8542,18 +8542,18 @@ else if ( (LA27_0==37) ) {
             }
             switch (alt27) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2570:1: ( ( 'sensitive' ) )
+                    // InternalScope.g:2570:1: ( ( 'sensitive' ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2570:1: ( ( 'sensitive' ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2571:1: ( 'sensitive' )
+                    // InternalScope.g:2570:1: ( ( 'sensitive' ) )
+                    // InternalScope.g:2571:1: ( 'sensitive' )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getCasingAccess().getSENSITIVEEnumLiteralDeclaration_0()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2572:1: ( 'sensitive' )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2572:3: 'sensitive'
+                    // InternalScope.g:2572:1: ( 'sensitive' )
+                    // InternalScope.g:2572:3: 'sensitive'
                     {
-                    match(input,36,FOLLOW_36_in_rule__Casing__Alternatives5594); if (state.failed) return ;
+                    match(input,36,FOLLOW_2); if (state.failed) return ;
 
                     }
 
@@ -8567,18 +8567,18 @@ else if ( (LA27_0==37) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2577:6: ( ( 'insensitive' ) )
+                    // InternalScope.g:2577:6: ( ( 'insensitive' ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2577:6: ( ( 'insensitive' ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2578:1: ( 'insensitive' )
+                    // InternalScope.g:2577:6: ( ( 'insensitive' ) )
+                    // InternalScope.g:2578:1: ( 'insensitive' )
                     {
                     if ( state.backtracking==0 ) {
                        before(grammarAccess.getCasingAccess().getINSENSITIVEEnumLiteralDeclaration_1()); 
                     }
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2579:1: ( 'insensitive' )
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2579:3: 'insensitive'
+                    // InternalScope.g:2579:1: ( 'insensitive' )
+                    // InternalScope.g:2579:3: 'insensitive'
                     {
-                    match(input,37,FOLLOW_37_in_rule__Casing__Alternatives5615); if (state.failed) return ;
+                    match(input,37,FOLLOW_2); if (state.failed) return ;
 
                     }
 
@@ -8609,21 +8609,21 @@ else if ( (LA27_0==37) ) {
 
 
     // $ANTLR start "rule__ScopeModel__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2591:1: rule__ScopeModel__Group__0 : rule__ScopeModel__Group__0__Impl rule__ScopeModel__Group__1 ;
+    // InternalScope.g:2591:1: rule__ScopeModel__Group__0 : rule__ScopeModel__Group__0__Impl rule__ScopeModel__Group__1 ;
     public final void rule__ScopeModel__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2595:1: ( rule__ScopeModel__Group__0__Impl rule__ScopeModel__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2596:2: rule__ScopeModel__Group__0__Impl rule__ScopeModel__Group__1
+            // InternalScope.g:2595:1: ( rule__ScopeModel__Group__0__Impl rule__ScopeModel__Group__1 )
+            // InternalScope.g:2596:2: rule__ScopeModel__Group__0__Impl rule__ScopeModel__Group__1
             {
-            pushFollow(FOLLOW_rule__ScopeModel__Group__0__Impl_in_rule__ScopeModel__Group__05648);
+            pushFollow(FOLLOW_3);
             rule__ScopeModel__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ScopeModel__Group__1_in_rule__ScopeModel__Group__05651);
+            pushFollow(FOLLOW_2);
             rule__ScopeModel__Group__1();
 
             state._fsp--;
@@ -8647,22 +8647,22 @@ public final void rule__ScopeModel__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__ScopeModel__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2603:1: rule__ScopeModel__Group__0__Impl : ( 'scoping' ) ;
+    // InternalScope.g:2603:1: rule__ScopeModel__Group__0__Impl : ( 'scoping' ) ;
     public final void rule__ScopeModel__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2607:1: ( ( 'scoping' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2608:1: ( 'scoping' )
+            // InternalScope.g:2607:1: ( ( 'scoping' ) )
+            // InternalScope.g:2608:1: ( 'scoping' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2608:1: ( 'scoping' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2609:1: 'scoping'
+            // InternalScope.g:2608:1: ( 'scoping' )
+            // InternalScope.g:2609:1: 'scoping'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeModelAccess().getScopingKeyword_0()); 
             }
-            match(input,38,FOLLOW_38_in_rule__ScopeModel__Group__0__Impl5679); if (state.failed) return ;
+            match(input,38,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getScopeModelAccess().getScopingKeyword_0()); 
             }
@@ -8688,21 +8688,21 @@ public final void rule__ScopeModel__Group__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__ScopeModel__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2622:1: rule__ScopeModel__Group__1 : rule__ScopeModel__Group__1__Impl rule__ScopeModel__Group__2 ;
+    // InternalScope.g:2622:1: rule__ScopeModel__Group__1 : rule__ScopeModel__Group__1__Impl rule__ScopeModel__Group__2 ;
     public final void rule__ScopeModel__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2626:1: ( rule__ScopeModel__Group__1__Impl rule__ScopeModel__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2627:2: rule__ScopeModel__Group__1__Impl rule__ScopeModel__Group__2
+            // InternalScope.g:2626:1: ( rule__ScopeModel__Group__1__Impl rule__ScopeModel__Group__2 )
+            // InternalScope.g:2627:2: rule__ScopeModel__Group__1__Impl rule__ScopeModel__Group__2
             {
-            pushFollow(FOLLOW_rule__ScopeModel__Group__1__Impl_in_rule__ScopeModel__Group__15710);
+            pushFollow(FOLLOW_4);
             rule__ScopeModel__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ScopeModel__Group__2_in_rule__ScopeModel__Group__15713);
+            pushFollow(FOLLOW_2);
             rule__ScopeModel__Group__2();
 
             state._fsp--;
@@ -8726,25 +8726,25 @@ public final void rule__ScopeModel__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__ScopeModel__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2634:1: rule__ScopeModel__Group__1__Impl : ( ( rule__ScopeModel__NameAssignment_1 ) ) ;
+    // InternalScope.g:2634:1: rule__ScopeModel__Group__1__Impl : ( ( rule__ScopeModel__NameAssignment_1 ) ) ;
     public final void rule__ScopeModel__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2638:1: ( ( ( rule__ScopeModel__NameAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2639:1: ( ( rule__ScopeModel__NameAssignment_1 ) )
+            // InternalScope.g:2638:1: ( ( ( rule__ScopeModel__NameAssignment_1 ) ) )
+            // InternalScope.g:2639:1: ( ( rule__ScopeModel__NameAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2639:1: ( ( rule__ScopeModel__NameAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2640:1: ( rule__ScopeModel__NameAssignment_1 )
+            // InternalScope.g:2639:1: ( ( rule__ScopeModel__NameAssignment_1 ) )
+            // InternalScope.g:2640:1: ( rule__ScopeModel__NameAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeModelAccess().getNameAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2641:1: ( rule__ScopeModel__NameAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2641:2: rule__ScopeModel__NameAssignment_1
+            // InternalScope.g:2641:1: ( rule__ScopeModel__NameAssignment_1 )
+            // InternalScope.g:2641:2: rule__ScopeModel__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__ScopeModel__NameAssignment_1_in_rule__ScopeModel__Group__1__Impl5740);
+            pushFollow(FOLLOW_2);
             rule__ScopeModel__NameAssignment_1();
 
             state._fsp--;
@@ -8777,21 +8777,21 @@ public final void rule__ScopeModel__Group__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__ScopeModel__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2651:1: rule__ScopeModel__Group__2 : rule__ScopeModel__Group__2__Impl rule__ScopeModel__Group__3 ;
+    // InternalScope.g:2651:1: rule__ScopeModel__Group__2 : rule__ScopeModel__Group__2__Impl rule__ScopeModel__Group__3 ;
     public final void rule__ScopeModel__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2655:1: ( rule__ScopeModel__Group__2__Impl rule__ScopeModel__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2656:2: rule__ScopeModel__Group__2__Impl rule__ScopeModel__Group__3
+            // InternalScope.g:2655:1: ( rule__ScopeModel__Group__2__Impl rule__ScopeModel__Group__3 )
+            // InternalScope.g:2656:2: rule__ScopeModel__Group__2__Impl rule__ScopeModel__Group__3
             {
-            pushFollow(FOLLOW_rule__ScopeModel__Group__2__Impl_in_rule__ScopeModel__Group__25770);
+            pushFollow(FOLLOW_4);
             rule__ScopeModel__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ScopeModel__Group__3_in_rule__ScopeModel__Group__25773);
+            pushFollow(FOLLOW_2);
             rule__ScopeModel__Group__3();
 
             state._fsp--;
@@ -8815,22 +8815,22 @@ public final void rule__ScopeModel__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__ScopeModel__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2663:1: rule__ScopeModel__Group__2__Impl : ( ( rule__ScopeModel__Group_2__0 )? ) ;
+    // InternalScope.g:2663:1: rule__ScopeModel__Group__2__Impl : ( ( rule__ScopeModel__Group_2__0 )? ) ;
     public final void rule__ScopeModel__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2667:1: ( ( ( rule__ScopeModel__Group_2__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2668:1: ( ( rule__ScopeModel__Group_2__0 )? )
+            // InternalScope.g:2667:1: ( ( ( rule__ScopeModel__Group_2__0 )? ) )
+            // InternalScope.g:2668:1: ( ( rule__ScopeModel__Group_2__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2668:1: ( ( rule__ScopeModel__Group_2__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2669:1: ( rule__ScopeModel__Group_2__0 )?
+            // InternalScope.g:2668:1: ( ( rule__ScopeModel__Group_2__0 )? )
+            // InternalScope.g:2669:1: ( rule__ScopeModel__Group_2__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeModelAccess().getGroup_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2670:1: ( rule__ScopeModel__Group_2__0 )?
+            // InternalScope.g:2670:1: ( rule__ScopeModel__Group_2__0 )?
             int alt28=2;
             int LA28_0 = input.LA(1);
 
@@ -8839,9 +8839,9 @@ public final void rule__ScopeModel__Group__2__Impl() throws RecognitionException
             }
             switch (alt28) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2670:2: rule__ScopeModel__Group_2__0
+                    // InternalScope.g:2670:2: rule__ScopeModel__Group_2__0
                     {
-                    pushFollow(FOLLOW_rule__ScopeModel__Group_2__0_in_rule__ScopeModel__Group__2__Impl5800);
+                    pushFollow(FOLLOW_2);
                     rule__ScopeModel__Group_2__0();
 
                     state._fsp--;
@@ -8877,21 +8877,21 @@ public final void rule__ScopeModel__Group__2__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__ScopeModel__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2680:1: rule__ScopeModel__Group__3 : rule__ScopeModel__Group__3__Impl rule__ScopeModel__Group__4 ;
+    // InternalScope.g:2680:1: rule__ScopeModel__Group__3 : rule__ScopeModel__Group__3__Impl rule__ScopeModel__Group__4 ;
     public final void rule__ScopeModel__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2684:1: ( rule__ScopeModel__Group__3__Impl rule__ScopeModel__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2685:2: rule__ScopeModel__Group__3__Impl rule__ScopeModel__Group__4
+            // InternalScope.g:2684:1: ( rule__ScopeModel__Group__3__Impl rule__ScopeModel__Group__4 )
+            // InternalScope.g:2685:2: rule__ScopeModel__Group__3__Impl rule__ScopeModel__Group__4
             {
-            pushFollow(FOLLOW_rule__ScopeModel__Group__3__Impl_in_rule__ScopeModel__Group__35831);
+            pushFollow(FOLLOW_4);
             rule__ScopeModel__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ScopeModel__Group__4_in_rule__ScopeModel__Group__35834);
+            pushFollow(FOLLOW_2);
             rule__ScopeModel__Group__4();
 
             state._fsp--;
@@ -8915,22 +8915,22 @@ public final void rule__ScopeModel__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__ScopeModel__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2692:1: rule__ScopeModel__Group__3__Impl : ( ( rule__ScopeModel__ImportsAssignment_3 )* ) ;
+    // InternalScope.g:2692:1: rule__ScopeModel__Group__3__Impl : ( ( rule__ScopeModel__ImportsAssignment_3 )* ) ;
     public final void rule__ScopeModel__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2696:1: ( ( ( rule__ScopeModel__ImportsAssignment_3 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2697:1: ( ( rule__ScopeModel__ImportsAssignment_3 )* )
+            // InternalScope.g:2696:1: ( ( ( rule__ScopeModel__ImportsAssignment_3 )* ) )
+            // InternalScope.g:2697:1: ( ( rule__ScopeModel__ImportsAssignment_3 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2697:1: ( ( rule__ScopeModel__ImportsAssignment_3 )* )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2698:1: ( rule__ScopeModel__ImportsAssignment_3 )*
+            // InternalScope.g:2697:1: ( ( rule__ScopeModel__ImportsAssignment_3 )* )
+            // InternalScope.g:2698:1: ( rule__ScopeModel__ImportsAssignment_3 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeModelAccess().getImportsAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2699:1: ( rule__ScopeModel__ImportsAssignment_3 )*
+            // InternalScope.g:2699:1: ( rule__ScopeModel__ImportsAssignment_3 )*
             loop29:
             do {
                 int alt29=2;
@@ -8943,9 +8943,9 @@ public final void rule__ScopeModel__Group__3__Impl() throws RecognitionException
 
                 switch (alt29) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2699:2: rule__ScopeModel__ImportsAssignment_3
+            	    // InternalScope.g:2699:2: rule__ScopeModel__ImportsAssignment_3
             	    {
-            	    pushFollow(FOLLOW_rule__ScopeModel__ImportsAssignment_3_in_rule__ScopeModel__Group__3__Impl5861);
+            	    pushFollow(FOLLOW_5);
             	    rule__ScopeModel__ImportsAssignment_3();
 
             	    state._fsp--;
@@ -8984,21 +8984,21 @@ public final void rule__ScopeModel__Group__3__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__ScopeModel__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2709:1: rule__ScopeModel__Group__4 : rule__ScopeModel__Group__4__Impl rule__ScopeModel__Group__5 ;
+    // InternalScope.g:2709:1: rule__ScopeModel__Group__4 : rule__ScopeModel__Group__4__Impl rule__ScopeModel__Group__5 ;
     public final void rule__ScopeModel__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2713:1: ( rule__ScopeModel__Group__4__Impl rule__ScopeModel__Group__5 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2714:2: rule__ScopeModel__Group__4__Impl rule__ScopeModel__Group__5
+            // InternalScope.g:2713:1: ( rule__ScopeModel__Group__4__Impl rule__ScopeModel__Group__5 )
+            // InternalScope.g:2714:2: rule__ScopeModel__Group__4__Impl rule__ScopeModel__Group__5
             {
-            pushFollow(FOLLOW_rule__ScopeModel__Group__4__Impl_in_rule__ScopeModel__Group__45892);
+            pushFollow(FOLLOW_4);
             rule__ScopeModel__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ScopeModel__Group__5_in_rule__ScopeModel__Group__45895);
+            pushFollow(FOLLOW_2);
             rule__ScopeModel__Group__5();
 
             state._fsp--;
@@ -9022,22 +9022,22 @@ public final void rule__ScopeModel__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__ScopeModel__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2721:1: rule__ScopeModel__Group__4__Impl : ( ( rule__ScopeModel__ExtensionsAssignment_4 )* ) ;
+    // InternalScope.g:2721:1: rule__ScopeModel__Group__4__Impl : ( ( rule__ScopeModel__ExtensionsAssignment_4 )* ) ;
     public final void rule__ScopeModel__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2725:1: ( ( ( rule__ScopeModel__ExtensionsAssignment_4 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2726:1: ( ( rule__ScopeModel__ExtensionsAssignment_4 )* )
+            // InternalScope.g:2725:1: ( ( ( rule__ScopeModel__ExtensionsAssignment_4 )* ) )
+            // InternalScope.g:2726:1: ( ( rule__ScopeModel__ExtensionsAssignment_4 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2726:1: ( ( rule__ScopeModel__ExtensionsAssignment_4 )* )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2727:1: ( rule__ScopeModel__ExtensionsAssignment_4 )*
+            // InternalScope.g:2726:1: ( ( rule__ScopeModel__ExtensionsAssignment_4 )* )
+            // InternalScope.g:2727:1: ( rule__ScopeModel__ExtensionsAssignment_4 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeModelAccess().getExtensionsAssignment_4()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2728:1: ( rule__ScopeModel__ExtensionsAssignment_4 )*
+            // InternalScope.g:2728:1: ( rule__ScopeModel__ExtensionsAssignment_4 )*
             loop30:
             do {
                 int alt30=2;
@@ -9050,9 +9050,9 @@ public final void rule__ScopeModel__Group__4__Impl() throws RecognitionException
 
                 switch (alt30) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2728:2: rule__ScopeModel__ExtensionsAssignment_4
+            	    // InternalScope.g:2728:2: rule__ScopeModel__ExtensionsAssignment_4
             	    {
-            	    pushFollow(FOLLOW_rule__ScopeModel__ExtensionsAssignment_4_in_rule__ScopeModel__Group__4__Impl5922);
+            	    pushFollow(FOLLOW_6);
             	    rule__ScopeModel__ExtensionsAssignment_4();
 
             	    state._fsp--;
@@ -9091,21 +9091,21 @@ public final void rule__ScopeModel__Group__4__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__ScopeModel__Group__5"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2738:1: rule__ScopeModel__Group__5 : rule__ScopeModel__Group__5__Impl rule__ScopeModel__Group__6 ;
+    // InternalScope.g:2738:1: rule__ScopeModel__Group__5 : rule__ScopeModel__Group__5__Impl rule__ScopeModel__Group__6 ;
     public final void rule__ScopeModel__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2742:1: ( rule__ScopeModel__Group__5__Impl rule__ScopeModel__Group__6 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2743:2: rule__ScopeModel__Group__5__Impl rule__ScopeModel__Group__6
+            // InternalScope.g:2742:1: ( rule__ScopeModel__Group__5__Impl rule__ScopeModel__Group__6 )
+            // InternalScope.g:2743:2: rule__ScopeModel__Group__5__Impl rule__ScopeModel__Group__6
             {
-            pushFollow(FOLLOW_rule__ScopeModel__Group__5__Impl_in_rule__ScopeModel__Group__55953);
+            pushFollow(FOLLOW_4);
             rule__ScopeModel__Group__5__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ScopeModel__Group__6_in_rule__ScopeModel__Group__55956);
+            pushFollow(FOLLOW_2);
             rule__ScopeModel__Group__6();
 
             state._fsp--;
@@ -9129,22 +9129,22 @@ public final void rule__ScopeModel__Group__5() throws RecognitionException {
 
 
     // $ANTLR start "rule__ScopeModel__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2750:1: rule__ScopeModel__Group__5__Impl : ( ( rule__ScopeModel__InjectionsAssignment_5 )* ) ;
+    // InternalScope.g:2750:1: rule__ScopeModel__Group__5__Impl : ( ( rule__ScopeModel__InjectionsAssignment_5 )* ) ;
     public final void rule__ScopeModel__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2754:1: ( ( ( rule__ScopeModel__InjectionsAssignment_5 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2755:1: ( ( rule__ScopeModel__InjectionsAssignment_5 )* )
+            // InternalScope.g:2754:1: ( ( ( rule__ScopeModel__InjectionsAssignment_5 )* ) )
+            // InternalScope.g:2755:1: ( ( rule__ScopeModel__InjectionsAssignment_5 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2755:1: ( ( rule__ScopeModel__InjectionsAssignment_5 )* )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2756:1: ( rule__ScopeModel__InjectionsAssignment_5 )*
+            // InternalScope.g:2755:1: ( ( rule__ScopeModel__InjectionsAssignment_5 )* )
+            // InternalScope.g:2756:1: ( rule__ScopeModel__InjectionsAssignment_5 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeModelAccess().getInjectionsAssignment_5()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2757:1: ( rule__ScopeModel__InjectionsAssignment_5 )*
+            // InternalScope.g:2757:1: ( rule__ScopeModel__InjectionsAssignment_5 )*
             loop31:
             do {
                 int alt31=2;
@@ -9157,9 +9157,9 @@ public final void rule__ScopeModel__Group__5__Impl() throws RecognitionException
 
                 switch (alt31) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2757:2: rule__ScopeModel__InjectionsAssignment_5
+            	    // InternalScope.g:2757:2: rule__ScopeModel__InjectionsAssignment_5
             	    {
-            	    pushFollow(FOLLOW_rule__ScopeModel__InjectionsAssignment_5_in_rule__ScopeModel__Group__5__Impl5983);
+            	    pushFollow(FOLLOW_7);
             	    rule__ScopeModel__InjectionsAssignment_5();
 
             	    state._fsp--;
@@ -9198,21 +9198,21 @@ public final void rule__ScopeModel__Group__5__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__ScopeModel__Group__6"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2767:1: rule__ScopeModel__Group__6 : rule__ScopeModel__Group__6__Impl rule__ScopeModel__Group__7 ;
+    // InternalScope.g:2767:1: rule__ScopeModel__Group__6 : rule__ScopeModel__Group__6__Impl rule__ScopeModel__Group__7 ;
     public final void rule__ScopeModel__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2771:1: ( rule__ScopeModel__Group__6__Impl rule__ScopeModel__Group__7 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2772:2: rule__ScopeModel__Group__6__Impl rule__ScopeModel__Group__7
+            // InternalScope.g:2771:1: ( rule__ScopeModel__Group__6__Impl rule__ScopeModel__Group__7 )
+            // InternalScope.g:2772:2: rule__ScopeModel__Group__6__Impl rule__ScopeModel__Group__7
             {
-            pushFollow(FOLLOW_rule__ScopeModel__Group__6__Impl_in_rule__ScopeModel__Group__66014);
+            pushFollow(FOLLOW_4);
             rule__ScopeModel__Group__6__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ScopeModel__Group__7_in_rule__ScopeModel__Group__66017);
+            pushFollow(FOLLOW_2);
             rule__ScopeModel__Group__7();
 
             state._fsp--;
@@ -9236,22 +9236,22 @@ public final void rule__ScopeModel__Group__6() throws RecognitionException {
 
 
     // $ANTLR start "rule__ScopeModel__Group__6__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2779:1: rule__ScopeModel__Group__6__Impl : ( ( rule__ScopeModel__NamingAssignment_6 )? ) ;
+    // InternalScope.g:2779:1: rule__ScopeModel__Group__6__Impl : ( ( rule__ScopeModel__NamingAssignment_6 )? ) ;
     public final void rule__ScopeModel__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2783:1: ( ( ( rule__ScopeModel__NamingAssignment_6 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2784:1: ( ( rule__ScopeModel__NamingAssignment_6 )? )
+            // InternalScope.g:2783:1: ( ( ( rule__ScopeModel__NamingAssignment_6 )? ) )
+            // InternalScope.g:2784:1: ( ( rule__ScopeModel__NamingAssignment_6 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2784:1: ( ( rule__ScopeModel__NamingAssignment_6 )? )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2785:1: ( rule__ScopeModel__NamingAssignment_6 )?
+            // InternalScope.g:2784:1: ( ( rule__ScopeModel__NamingAssignment_6 )? )
+            // InternalScope.g:2785:1: ( rule__ScopeModel__NamingAssignment_6 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeModelAccess().getNamingAssignment_6()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2786:1: ( rule__ScopeModel__NamingAssignment_6 )?
+            // InternalScope.g:2786:1: ( rule__ScopeModel__NamingAssignment_6 )?
             int alt32=2;
             int LA32_0 = input.LA(1);
 
@@ -9260,9 +9260,9 @@ public final void rule__ScopeModel__Group__6__Impl() throws RecognitionException
             }
             switch (alt32) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2786:2: rule__ScopeModel__NamingAssignment_6
+                    // InternalScope.g:2786:2: rule__ScopeModel__NamingAssignment_6
                     {
-                    pushFollow(FOLLOW_rule__ScopeModel__NamingAssignment_6_in_rule__ScopeModel__Group__6__Impl6044);
+                    pushFollow(FOLLOW_2);
                     rule__ScopeModel__NamingAssignment_6();
 
                     state._fsp--;
@@ -9298,16 +9298,16 @@ public final void rule__ScopeModel__Group__6__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__ScopeModel__Group__7"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2796:1: rule__ScopeModel__Group__7 : rule__ScopeModel__Group__7__Impl ;
+    // InternalScope.g:2796:1: rule__ScopeModel__Group__7 : rule__ScopeModel__Group__7__Impl ;
     public final void rule__ScopeModel__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2800:1: ( rule__ScopeModel__Group__7__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2801:2: rule__ScopeModel__Group__7__Impl
+            // InternalScope.g:2800:1: ( rule__ScopeModel__Group__7__Impl )
+            // InternalScope.g:2801:2: rule__ScopeModel__Group__7__Impl
             {
-            pushFollow(FOLLOW_rule__ScopeModel__Group__7__Impl_in_rule__ScopeModel__Group__76075);
+            pushFollow(FOLLOW_2);
             rule__ScopeModel__Group__7__Impl();
 
             state._fsp--;
@@ -9331,22 +9331,22 @@ public final void rule__ScopeModel__Group__7() throws RecognitionException {
 
 
     // $ANTLR start "rule__ScopeModel__Group__7__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2807:1: rule__ScopeModel__Group__7__Impl : ( ( rule__ScopeModel__ScopesAssignment_7 )* ) ;
+    // InternalScope.g:2807:1: rule__ScopeModel__Group__7__Impl : ( ( rule__ScopeModel__ScopesAssignment_7 )* ) ;
     public final void rule__ScopeModel__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2811:1: ( ( ( rule__ScopeModel__ScopesAssignment_7 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2812:1: ( ( rule__ScopeModel__ScopesAssignment_7 )* )
+            // InternalScope.g:2811:1: ( ( ( rule__ScopeModel__ScopesAssignment_7 )* ) )
+            // InternalScope.g:2812:1: ( ( rule__ScopeModel__ScopesAssignment_7 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2812:1: ( ( rule__ScopeModel__ScopesAssignment_7 )* )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2813:1: ( rule__ScopeModel__ScopesAssignment_7 )*
+            // InternalScope.g:2812:1: ( ( rule__ScopeModel__ScopesAssignment_7 )* )
+            // InternalScope.g:2813:1: ( rule__ScopeModel__ScopesAssignment_7 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeModelAccess().getScopesAssignment_7()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2814:1: ( rule__ScopeModel__ScopesAssignment_7 )*
+            // InternalScope.g:2814:1: ( rule__ScopeModel__ScopesAssignment_7 )*
             loop33:
             do {
                 int alt33=2;
@@ -9359,9 +9359,9 @@ public final void rule__ScopeModel__Group__7__Impl() throws RecognitionException
 
                 switch (alt33) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2814:2: rule__ScopeModel__ScopesAssignment_7
+            	    // InternalScope.g:2814:2: rule__ScopeModel__ScopesAssignment_7
             	    {
-            	    pushFollow(FOLLOW_rule__ScopeModel__ScopesAssignment_7_in_rule__ScopeModel__Group__7__Impl6102);
+            	    pushFollow(FOLLOW_8);
             	    rule__ScopeModel__ScopesAssignment_7();
 
             	    state._fsp--;
@@ -9400,21 +9400,21 @@ public final void rule__ScopeModel__Group__7__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__ScopeModel__Group_2__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2840:1: rule__ScopeModel__Group_2__0 : rule__ScopeModel__Group_2__0__Impl rule__ScopeModel__Group_2__1 ;
+    // InternalScope.g:2840:1: rule__ScopeModel__Group_2__0 : rule__ScopeModel__Group_2__0__Impl rule__ScopeModel__Group_2__1 ;
     public final void rule__ScopeModel__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2844:1: ( rule__ScopeModel__Group_2__0__Impl rule__ScopeModel__Group_2__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2845:2: rule__ScopeModel__Group_2__0__Impl rule__ScopeModel__Group_2__1
+            // InternalScope.g:2844:1: ( rule__ScopeModel__Group_2__0__Impl rule__ScopeModel__Group_2__1 )
+            // InternalScope.g:2845:2: rule__ScopeModel__Group_2__0__Impl rule__ScopeModel__Group_2__1
             {
-            pushFollow(FOLLOW_rule__ScopeModel__Group_2__0__Impl_in_rule__ScopeModel__Group_2__06149);
+            pushFollow(FOLLOW_3);
             rule__ScopeModel__Group_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ScopeModel__Group_2__1_in_rule__ScopeModel__Group_2__06152);
+            pushFollow(FOLLOW_2);
             rule__ScopeModel__Group_2__1();
 
             state._fsp--;
@@ -9438,22 +9438,22 @@ public final void rule__ScopeModel__Group_2__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__ScopeModel__Group_2__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2852:1: rule__ScopeModel__Group_2__0__Impl : ( 'with' ) ;
+    // InternalScope.g:2852:1: rule__ScopeModel__Group_2__0__Impl : ( 'with' ) ;
     public final void rule__ScopeModel__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2856:1: ( ( 'with' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2857:1: ( 'with' )
+            // InternalScope.g:2856:1: ( ( 'with' ) )
+            // InternalScope.g:2857:1: ( 'with' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2857:1: ( 'with' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2858:1: 'with'
+            // InternalScope.g:2857:1: ( 'with' )
+            // InternalScope.g:2858:1: 'with'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeModelAccess().getWithKeyword_2_0()); 
             }
-            match(input,39,FOLLOW_39_in_rule__ScopeModel__Group_2__0__Impl6180); if (state.failed) return ;
+            match(input,39,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getScopeModelAccess().getWithKeyword_2_0()); 
             }
@@ -9479,16 +9479,16 @@ public final void rule__ScopeModel__Group_2__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__ScopeModel__Group_2__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2871:1: rule__ScopeModel__Group_2__1 : rule__ScopeModel__Group_2__1__Impl ;
+    // InternalScope.g:2871:1: rule__ScopeModel__Group_2__1 : rule__ScopeModel__Group_2__1__Impl ;
     public final void rule__ScopeModel__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2875:1: ( rule__ScopeModel__Group_2__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2876:2: rule__ScopeModel__Group_2__1__Impl
+            // InternalScope.g:2875:1: ( rule__ScopeModel__Group_2__1__Impl )
+            // InternalScope.g:2876:2: rule__ScopeModel__Group_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__ScopeModel__Group_2__1__Impl_in_rule__ScopeModel__Group_2__16211);
+            pushFollow(FOLLOW_2);
             rule__ScopeModel__Group_2__1__Impl();
 
             state._fsp--;
@@ -9512,25 +9512,25 @@ public final void rule__ScopeModel__Group_2__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__ScopeModel__Group_2__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2882:1: rule__ScopeModel__Group_2__1__Impl : ( ( rule__ScopeModel__IncludedScopesAssignment_2_1 ) ) ;
+    // InternalScope.g:2882:1: rule__ScopeModel__Group_2__1__Impl : ( ( rule__ScopeModel__IncludedScopesAssignment_2_1 ) ) ;
     public final void rule__ScopeModel__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2886:1: ( ( ( rule__ScopeModel__IncludedScopesAssignment_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2887:1: ( ( rule__ScopeModel__IncludedScopesAssignment_2_1 ) )
+            // InternalScope.g:2886:1: ( ( ( rule__ScopeModel__IncludedScopesAssignment_2_1 ) ) )
+            // InternalScope.g:2887:1: ( ( rule__ScopeModel__IncludedScopesAssignment_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2887:1: ( ( rule__ScopeModel__IncludedScopesAssignment_2_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2888:1: ( rule__ScopeModel__IncludedScopesAssignment_2_1 )
+            // InternalScope.g:2887:1: ( ( rule__ScopeModel__IncludedScopesAssignment_2_1 ) )
+            // InternalScope.g:2888:1: ( rule__ScopeModel__IncludedScopesAssignment_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeModelAccess().getIncludedScopesAssignment_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2889:1: ( rule__ScopeModel__IncludedScopesAssignment_2_1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2889:2: rule__ScopeModel__IncludedScopesAssignment_2_1
+            // InternalScope.g:2889:1: ( rule__ScopeModel__IncludedScopesAssignment_2_1 )
+            // InternalScope.g:2889:2: rule__ScopeModel__IncludedScopesAssignment_2_1
             {
-            pushFollow(FOLLOW_rule__ScopeModel__IncludedScopesAssignment_2_1_in_rule__ScopeModel__Group_2__1__Impl6238);
+            pushFollow(FOLLOW_2);
             rule__ScopeModel__IncludedScopesAssignment_2_1();
 
             state._fsp--;
@@ -9563,21 +9563,21 @@ public final void rule__ScopeModel__Group_2__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__Import__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2903:1: rule__Import__Group__0 : rule__Import__Group__0__Impl rule__Import__Group__1 ;
+    // InternalScope.g:2903:1: rule__Import__Group__0 : rule__Import__Group__0__Impl rule__Import__Group__1 ;
     public final void rule__Import__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2907:1: ( rule__Import__Group__0__Impl rule__Import__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2908:2: rule__Import__Group__0__Impl rule__Import__Group__1
+            // InternalScope.g:2907:1: ( rule__Import__Group__0__Impl rule__Import__Group__1 )
+            // InternalScope.g:2908:2: rule__Import__Group__0__Impl rule__Import__Group__1
             {
-            pushFollow(FOLLOW_rule__Import__Group__0__Impl_in_rule__Import__Group__06272);
+            pushFollow(FOLLOW_9);
             rule__Import__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Import__Group__1_in_rule__Import__Group__06275);
+            pushFollow(FOLLOW_2);
             rule__Import__Group__1();
 
             state._fsp--;
@@ -9601,22 +9601,22 @@ public final void rule__Import__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Import__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2915:1: rule__Import__Group__0__Impl : ( 'import' ) ;
+    // InternalScope.g:2915:1: rule__Import__Group__0__Impl : ( 'import' ) ;
     public final void rule__Import__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2919:1: ( ( 'import' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2920:1: ( 'import' )
+            // InternalScope.g:2919:1: ( ( 'import' ) )
+            // InternalScope.g:2920:1: ( 'import' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2920:1: ( 'import' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2921:1: 'import'
+            // InternalScope.g:2920:1: ( 'import' )
+            // InternalScope.g:2921:1: 'import'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImportAccess().getImportKeyword_0()); 
             }
-            match(input,40,FOLLOW_40_in_rule__Import__Group__0__Impl6303); if (state.failed) return ;
+            match(input,40,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getImportAccess().getImportKeyword_0()); 
             }
@@ -9642,21 +9642,21 @@ public final void rule__Import__Group__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Import__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2934:1: rule__Import__Group__1 : rule__Import__Group__1__Impl rule__Import__Group__2 ;
+    // InternalScope.g:2934:1: rule__Import__Group__1 : rule__Import__Group__1__Impl rule__Import__Group__2 ;
     public final void rule__Import__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2938:1: ( rule__Import__Group__1__Impl rule__Import__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2939:2: rule__Import__Group__1__Impl rule__Import__Group__2
+            // InternalScope.g:2938:1: ( rule__Import__Group__1__Impl rule__Import__Group__2 )
+            // InternalScope.g:2939:2: rule__Import__Group__1__Impl rule__Import__Group__2
             {
-            pushFollow(FOLLOW_rule__Import__Group__1__Impl_in_rule__Import__Group__16334);
+            pushFollow(FOLLOW_10);
             rule__Import__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Import__Group__2_in_rule__Import__Group__16337);
+            pushFollow(FOLLOW_2);
             rule__Import__Group__2();
 
             state._fsp--;
@@ -9680,25 +9680,25 @@ public final void rule__Import__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Import__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2946:1: rule__Import__Group__1__Impl : ( ( rule__Import__PackageAssignment_1 ) ) ;
+    // InternalScope.g:2946:1: rule__Import__Group__1__Impl : ( ( rule__Import__PackageAssignment_1 ) ) ;
     public final void rule__Import__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2950:1: ( ( ( rule__Import__PackageAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2951:1: ( ( rule__Import__PackageAssignment_1 ) )
+            // InternalScope.g:2950:1: ( ( ( rule__Import__PackageAssignment_1 ) ) )
+            // InternalScope.g:2951:1: ( ( rule__Import__PackageAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2951:1: ( ( rule__Import__PackageAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2952:1: ( rule__Import__PackageAssignment_1 )
+            // InternalScope.g:2951:1: ( ( rule__Import__PackageAssignment_1 ) )
+            // InternalScope.g:2952:1: ( rule__Import__PackageAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImportAccess().getPackageAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2953:1: ( rule__Import__PackageAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2953:2: rule__Import__PackageAssignment_1
+            // InternalScope.g:2953:1: ( rule__Import__PackageAssignment_1 )
+            // InternalScope.g:2953:2: rule__Import__PackageAssignment_1
             {
-            pushFollow(FOLLOW_rule__Import__PackageAssignment_1_in_rule__Import__Group__1__Impl6364);
+            pushFollow(FOLLOW_2);
             rule__Import__PackageAssignment_1();
 
             state._fsp--;
@@ -9731,16 +9731,16 @@ public final void rule__Import__Group__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Import__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2963:1: rule__Import__Group__2 : rule__Import__Group__2__Impl ;
+    // InternalScope.g:2963:1: rule__Import__Group__2 : rule__Import__Group__2__Impl ;
     public final void rule__Import__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2967:1: ( rule__Import__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2968:2: rule__Import__Group__2__Impl
+            // InternalScope.g:2967:1: ( rule__Import__Group__2__Impl )
+            // InternalScope.g:2968:2: rule__Import__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__Import__Group__2__Impl_in_rule__Import__Group__26394);
+            pushFollow(FOLLOW_2);
             rule__Import__Group__2__Impl();
 
             state._fsp--;
@@ -9764,22 +9764,22 @@ public final void rule__Import__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__Import__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2974:1: rule__Import__Group__2__Impl : ( ( rule__Import__Group_2__0 )? ) ;
+    // InternalScope.g:2974:1: rule__Import__Group__2__Impl : ( ( rule__Import__Group_2__0 )? ) ;
     public final void rule__Import__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2978:1: ( ( ( rule__Import__Group_2__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2979:1: ( ( rule__Import__Group_2__0 )? )
+            // InternalScope.g:2978:1: ( ( ( rule__Import__Group_2__0 )? ) )
+            // InternalScope.g:2979:1: ( ( rule__Import__Group_2__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2979:1: ( ( rule__Import__Group_2__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2980:1: ( rule__Import__Group_2__0 )?
+            // InternalScope.g:2979:1: ( ( rule__Import__Group_2__0 )? )
+            // InternalScope.g:2980:1: ( rule__Import__Group_2__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImportAccess().getGroup_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2981:1: ( rule__Import__Group_2__0 )?
+            // InternalScope.g:2981:1: ( rule__Import__Group_2__0 )?
             int alt34=2;
             int LA34_0 = input.LA(1);
 
@@ -9788,9 +9788,9 @@ public final void rule__Import__Group__2__Impl() throws RecognitionException {
             }
             switch (alt34) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2981:2: rule__Import__Group_2__0
+                    // InternalScope.g:2981:2: rule__Import__Group_2__0
                     {
-                    pushFollow(FOLLOW_rule__Import__Group_2__0_in_rule__Import__Group__2__Impl6421);
+                    pushFollow(FOLLOW_2);
                     rule__Import__Group_2__0();
 
                     state._fsp--;
@@ -9826,21 +9826,21 @@ public final void rule__Import__Group__2__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Import__Group_2__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:2997:1: rule__Import__Group_2__0 : rule__Import__Group_2__0__Impl rule__Import__Group_2__1 ;
+    // InternalScope.g:2997:1: rule__Import__Group_2__0 : rule__Import__Group_2__0__Impl rule__Import__Group_2__1 ;
     public final void rule__Import__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3001:1: ( rule__Import__Group_2__0__Impl rule__Import__Group_2__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3002:2: rule__Import__Group_2__0__Impl rule__Import__Group_2__1
+            // InternalScope.g:3001:1: ( rule__Import__Group_2__0__Impl rule__Import__Group_2__1 )
+            // InternalScope.g:3002:2: rule__Import__Group_2__0__Impl rule__Import__Group_2__1
             {
-            pushFollow(FOLLOW_rule__Import__Group_2__0__Impl_in_rule__Import__Group_2__06458);
+            pushFollow(FOLLOW_3);
             rule__Import__Group_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Import__Group_2__1_in_rule__Import__Group_2__06461);
+            pushFollow(FOLLOW_2);
             rule__Import__Group_2__1();
 
             state._fsp--;
@@ -9864,22 +9864,22 @@ public final void rule__Import__Group_2__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Import__Group_2__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3009:1: rule__Import__Group_2__0__Impl : ( 'as' ) ;
+    // InternalScope.g:3009:1: rule__Import__Group_2__0__Impl : ( 'as' ) ;
     public final void rule__Import__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3013:1: ( ( 'as' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3014:1: ( 'as' )
+            // InternalScope.g:3013:1: ( ( 'as' ) )
+            // InternalScope.g:3014:1: ( 'as' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3014:1: ( 'as' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3015:1: 'as'
+            // InternalScope.g:3014:1: ( 'as' )
+            // InternalScope.g:3015:1: 'as'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImportAccess().getAsKeyword_2_0()); 
             }
-            match(input,41,FOLLOW_41_in_rule__Import__Group_2__0__Impl6489); if (state.failed) return ;
+            match(input,41,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getImportAccess().getAsKeyword_2_0()); 
             }
@@ -9905,16 +9905,16 @@ public final void rule__Import__Group_2__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Import__Group_2__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3028:1: rule__Import__Group_2__1 : rule__Import__Group_2__1__Impl ;
+    // InternalScope.g:3028:1: rule__Import__Group_2__1 : rule__Import__Group_2__1__Impl ;
     public final void rule__Import__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3032:1: ( rule__Import__Group_2__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3033:2: rule__Import__Group_2__1__Impl
+            // InternalScope.g:3032:1: ( rule__Import__Group_2__1__Impl )
+            // InternalScope.g:3033:2: rule__Import__Group_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__Import__Group_2__1__Impl_in_rule__Import__Group_2__16520);
+            pushFollow(FOLLOW_2);
             rule__Import__Group_2__1__Impl();
 
             state._fsp--;
@@ -9938,25 +9938,25 @@ public final void rule__Import__Group_2__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Import__Group_2__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3039:1: rule__Import__Group_2__1__Impl : ( ( rule__Import__NameAssignment_2_1 ) ) ;
+    // InternalScope.g:3039:1: rule__Import__Group_2__1__Impl : ( ( rule__Import__NameAssignment_2_1 ) ) ;
     public final void rule__Import__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3043:1: ( ( ( rule__Import__NameAssignment_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3044:1: ( ( rule__Import__NameAssignment_2_1 ) )
+            // InternalScope.g:3043:1: ( ( ( rule__Import__NameAssignment_2_1 ) ) )
+            // InternalScope.g:3044:1: ( ( rule__Import__NameAssignment_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3044:1: ( ( rule__Import__NameAssignment_2_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3045:1: ( rule__Import__NameAssignment_2_1 )
+            // InternalScope.g:3044:1: ( ( rule__Import__NameAssignment_2_1 ) )
+            // InternalScope.g:3045:1: ( rule__Import__NameAssignment_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImportAccess().getNameAssignment_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3046:1: ( rule__Import__NameAssignment_2_1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3046:2: rule__Import__NameAssignment_2_1
+            // InternalScope.g:3046:1: ( rule__Import__NameAssignment_2_1 )
+            // InternalScope.g:3046:2: rule__Import__NameAssignment_2_1
             {
-            pushFollow(FOLLOW_rule__Import__NameAssignment_2_1_in_rule__Import__Group_2__1__Impl6547);
+            pushFollow(FOLLOW_2);
             rule__Import__NameAssignment_2_1();
 
             state._fsp--;
@@ -9989,21 +9989,21 @@ public final void rule__Import__Group_2__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Extension__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3060:1: rule__Extension__Group__0 : rule__Extension__Group__0__Impl rule__Extension__Group__1 ;
+    // InternalScope.g:3060:1: rule__Extension__Group__0 : rule__Extension__Group__0__Impl rule__Extension__Group__1 ;
     public final void rule__Extension__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3064:1: ( rule__Extension__Group__0__Impl rule__Extension__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3065:2: rule__Extension__Group__0__Impl rule__Extension__Group__1
+            // InternalScope.g:3064:1: ( rule__Extension__Group__0__Impl rule__Extension__Group__1 )
+            // InternalScope.g:3065:2: rule__Extension__Group__0__Impl rule__Extension__Group__1
             {
-            pushFollow(FOLLOW_rule__Extension__Group__0__Impl_in_rule__Extension__Group__06581);
+            pushFollow(FOLLOW_3);
             rule__Extension__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Extension__Group__1_in_rule__Extension__Group__06584);
+            pushFollow(FOLLOW_2);
             rule__Extension__Group__1();
 
             state._fsp--;
@@ -10027,22 +10027,22 @@ public final void rule__Extension__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Extension__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3072:1: rule__Extension__Group__0__Impl : ( 'extension' ) ;
+    // InternalScope.g:3072:1: rule__Extension__Group__0__Impl : ( 'extension' ) ;
     public final void rule__Extension__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3076:1: ( ( 'extension' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3077:1: ( 'extension' )
+            // InternalScope.g:3076:1: ( ( 'extension' ) )
+            // InternalScope.g:3077:1: ( 'extension' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3077:1: ( 'extension' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3078:1: 'extension'
+            // InternalScope.g:3077:1: ( 'extension' )
+            // InternalScope.g:3078:1: 'extension'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExtensionAccess().getExtensionKeyword_0()); 
             }
-            match(input,42,FOLLOW_42_in_rule__Extension__Group__0__Impl6612); if (state.failed) return ;
+            match(input,42,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getExtensionAccess().getExtensionKeyword_0()); 
             }
@@ -10068,16 +10068,16 @@ public final void rule__Extension__Group__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__Extension__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3091:1: rule__Extension__Group__1 : rule__Extension__Group__1__Impl ;
+    // InternalScope.g:3091:1: rule__Extension__Group__1 : rule__Extension__Group__1__Impl ;
     public final void rule__Extension__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3095:1: ( rule__Extension__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3096:2: rule__Extension__Group__1__Impl
+            // InternalScope.g:3095:1: ( rule__Extension__Group__1__Impl )
+            // InternalScope.g:3096:2: rule__Extension__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__Extension__Group__1__Impl_in_rule__Extension__Group__16643);
+            pushFollow(FOLLOW_2);
             rule__Extension__Group__1__Impl();
 
             state._fsp--;
@@ -10101,25 +10101,25 @@ public final void rule__Extension__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Extension__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3102:1: rule__Extension__Group__1__Impl : ( ( rule__Extension__ExtensionAssignment_1 ) ) ;
+    // InternalScope.g:3102:1: rule__Extension__Group__1__Impl : ( ( rule__Extension__ExtensionAssignment_1 ) ) ;
     public final void rule__Extension__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3106:1: ( ( ( rule__Extension__ExtensionAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3107:1: ( ( rule__Extension__ExtensionAssignment_1 ) )
+            // InternalScope.g:3106:1: ( ( ( rule__Extension__ExtensionAssignment_1 ) ) )
+            // InternalScope.g:3107:1: ( ( rule__Extension__ExtensionAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3107:1: ( ( rule__Extension__ExtensionAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3108:1: ( rule__Extension__ExtensionAssignment_1 )
+            // InternalScope.g:3107:1: ( ( rule__Extension__ExtensionAssignment_1 ) )
+            // InternalScope.g:3108:1: ( rule__Extension__ExtensionAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExtensionAccess().getExtensionAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3109:1: ( rule__Extension__ExtensionAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3109:2: rule__Extension__ExtensionAssignment_1
+            // InternalScope.g:3109:1: ( rule__Extension__ExtensionAssignment_1 )
+            // InternalScope.g:3109:2: rule__Extension__ExtensionAssignment_1
             {
-            pushFollow(FOLLOW_rule__Extension__ExtensionAssignment_1_in_rule__Extension__Group__1__Impl6670);
+            pushFollow(FOLLOW_2);
             rule__Extension__ExtensionAssignment_1();
 
             state._fsp--;
@@ -10152,21 +10152,21 @@ public final void rule__Extension__Group__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__Injection__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3123:1: rule__Injection__Group__0 : rule__Injection__Group__0__Impl rule__Injection__Group__1 ;
+    // InternalScope.g:3123:1: rule__Injection__Group__0 : rule__Injection__Group__0__Impl rule__Injection__Group__1 ;
     public final void rule__Injection__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3127:1: ( rule__Injection__Group__0__Impl rule__Injection__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3128:2: rule__Injection__Group__0__Impl rule__Injection__Group__1
+            // InternalScope.g:3127:1: ( rule__Injection__Group__0__Impl rule__Injection__Group__1 )
+            // InternalScope.g:3128:2: rule__Injection__Group__0__Impl rule__Injection__Group__1
             {
-            pushFollow(FOLLOW_rule__Injection__Group__0__Impl_in_rule__Injection__Group__06704);
+            pushFollow(FOLLOW_3);
             rule__Injection__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Injection__Group__1_in_rule__Injection__Group__06707);
+            pushFollow(FOLLOW_2);
             rule__Injection__Group__1();
 
             state._fsp--;
@@ -10190,22 +10190,22 @@ public final void rule__Injection__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Injection__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3135:1: rule__Injection__Group__0__Impl : ( 'inject' ) ;
+    // InternalScope.g:3135:1: rule__Injection__Group__0__Impl : ( 'inject' ) ;
     public final void rule__Injection__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3139:1: ( ( 'inject' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3140:1: ( 'inject' )
+            // InternalScope.g:3139:1: ( ( 'inject' ) )
+            // InternalScope.g:3140:1: ( 'inject' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3140:1: ( 'inject' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3141:1: 'inject'
+            // InternalScope.g:3140:1: ( 'inject' )
+            // InternalScope.g:3141:1: 'inject'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInjectionAccess().getInjectKeyword_0()); 
             }
-            match(input,43,FOLLOW_43_in_rule__Injection__Group__0__Impl6735); if (state.failed) return ;
+            match(input,43,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInjectionAccess().getInjectKeyword_0()); 
             }
@@ -10231,21 +10231,21 @@ public final void rule__Injection__Group__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__Injection__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3154:1: rule__Injection__Group__1 : rule__Injection__Group__1__Impl rule__Injection__Group__2 ;
+    // InternalScope.g:3154:1: rule__Injection__Group__1 : rule__Injection__Group__1__Impl rule__Injection__Group__2 ;
     public final void rule__Injection__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3158:1: ( rule__Injection__Group__1__Impl rule__Injection__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3159:2: rule__Injection__Group__1__Impl rule__Injection__Group__2
+            // InternalScope.g:3158:1: ( rule__Injection__Group__1__Impl rule__Injection__Group__2 )
+            // InternalScope.g:3159:2: rule__Injection__Group__1__Impl rule__Injection__Group__2
             {
-            pushFollow(FOLLOW_rule__Injection__Group__1__Impl_in_rule__Injection__Group__16766);
+            pushFollow(FOLLOW_10);
             rule__Injection__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Injection__Group__2_in_rule__Injection__Group__16769);
+            pushFollow(FOLLOW_2);
             rule__Injection__Group__2();
 
             state._fsp--;
@@ -10269,25 +10269,25 @@ public final void rule__Injection__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Injection__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3166:1: rule__Injection__Group__1__Impl : ( ( rule__Injection__TypeAssignment_1 ) ) ;
+    // InternalScope.g:3166:1: rule__Injection__Group__1__Impl : ( ( rule__Injection__TypeAssignment_1 ) ) ;
     public final void rule__Injection__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3170:1: ( ( ( rule__Injection__TypeAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3171:1: ( ( rule__Injection__TypeAssignment_1 ) )
+            // InternalScope.g:3170:1: ( ( ( rule__Injection__TypeAssignment_1 ) ) )
+            // InternalScope.g:3171:1: ( ( rule__Injection__TypeAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3171:1: ( ( rule__Injection__TypeAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3172:1: ( rule__Injection__TypeAssignment_1 )
+            // InternalScope.g:3171:1: ( ( rule__Injection__TypeAssignment_1 ) )
+            // InternalScope.g:3172:1: ( rule__Injection__TypeAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInjectionAccess().getTypeAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3173:1: ( rule__Injection__TypeAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3173:2: rule__Injection__TypeAssignment_1
+            // InternalScope.g:3173:1: ( rule__Injection__TypeAssignment_1 )
+            // InternalScope.g:3173:2: rule__Injection__TypeAssignment_1
             {
-            pushFollow(FOLLOW_rule__Injection__TypeAssignment_1_in_rule__Injection__Group__1__Impl6796);
+            pushFollow(FOLLOW_2);
             rule__Injection__TypeAssignment_1();
 
             state._fsp--;
@@ -10320,21 +10320,21 @@ public final void rule__Injection__Group__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__Injection__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3183:1: rule__Injection__Group__2 : rule__Injection__Group__2__Impl rule__Injection__Group__3 ;
+    // InternalScope.g:3183:1: rule__Injection__Group__2 : rule__Injection__Group__2__Impl rule__Injection__Group__3 ;
     public final void rule__Injection__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3187:1: ( rule__Injection__Group__2__Impl rule__Injection__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3188:2: rule__Injection__Group__2__Impl rule__Injection__Group__3
+            // InternalScope.g:3187:1: ( rule__Injection__Group__2__Impl rule__Injection__Group__3 )
+            // InternalScope.g:3188:2: rule__Injection__Group__2__Impl rule__Injection__Group__3
             {
-            pushFollow(FOLLOW_rule__Injection__Group__2__Impl_in_rule__Injection__Group__26826);
+            pushFollow(FOLLOW_3);
             rule__Injection__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Injection__Group__3_in_rule__Injection__Group__26829);
+            pushFollow(FOLLOW_2);
             rule__Injection__Group__3();
 
             state._fsp--;
@@ -10358,22 +10358,22 @@ public final void rule__Injection__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__Injection__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3195:1: rule__Injection__Group__2__Impl : ( 'as' ) ;
+    // InternalScope.g:3195:1: rule__Injection__Group__2__Impl : ( 'as' ) ;
     public final void rule__Injection__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3199:1: ( ( 'as' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3200:1: ( 'as' )
+            // InternalScope.g:3199:1: ( ( 'as' ) )
+            // InternalScope.g:3200:1: ( 'as' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3200:1: ( 'as' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3201:1: 'as'
+            // InternalScope.g:3200:1: ( 'as' )
+            // InternalScope.g:3201:1: 'as'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInjectionAccess().getAsKeyword_2()); 
             }
-            match(input,41,FOLLOW_41_in_rule__Injection__Group__2__Impl6857); if (state.failed) return ;
+            match(input,41,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInjectionAccess().getAsKeyword_2()); 
             }
@@ -10399,16 +10399,16 @@ public final void rule__Injection__Group__2__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__Injection__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3214:1: rule__Injection__Group__3 : rule__Injection__Group__3__Impl ;
+    // InternalScope.g:3214:1: rule__Injection__Group__3 : rule__Injection__Group__3__Impl ;
     public final void rule__Injection__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3218:1: ( rule__Injection__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3219:2: rule__Injection__Group__3__Impl
+            // InternalScope.g:3218:1: ( rule__Injection__Group__3__Impl )
+            // InternalScope.g:3219:2: rule__Injection__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__Injection__Group__3__Impl_in_rule__Injection__Group__36888);
+            pushFollow(FOLLOW_2);
             rule__Injection__Group__3__Impl();
 
             state._fsp--;
@@ -10432,25 +10432,25 @@ public final void rule__Injection__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__Injection__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3225:1: rule__Injection__Group__3__Impl : ( ( rule__Injection__NameAssignment_3 ) ) ;
+    // InternalScope.g:3225:1: rule__Injection__Group__3__Impl : ( ( rule__Injection__NameAssignment_3 ) ) ;
     public final void rule__Injection__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3229:1: ( ( ( rule__Injection__NameAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3230:1: ( ( rule__Injection__NameAssignment_3 ) )
+            // InternalScope.g:3229:1: ( ( ( rule__Injection__NameAssignment_3 ) ) )
+            // InternalScope.g:3230:1: ( ( rule__Injection__NameAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3230:1: ( ( rule__Injection__NameAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3231:1: ( rule__Injection__NameAssignment_3 )
+            // InternalScope.g:3230:1: ( ( rule__Injection__NameAssignment_3 ) )
+            // InternalScope.g:3231:1: ( rule__Injection__NameAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInjectionAccess().getNameAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3232:1: ( rule__Injection__NameAssignment_3 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3232:2: rule__Injection__NameAssignment_3
+            // InternalScope.g:3232:1: ( rule__Injection__NameAssignment_3 )
+            // InternalScope.g:3232:2: rule__Injection__NameAssignment_3
             {
-            pushFollow(FOLLOW_rule__Injection__NameAssignment_3_in_rule__Injection__Group__3__Impl6915);
+            pushFollow(FOLLOW_2);
             rule__Injection__NameAssignment_3();
 
             state._fsp--;
@@ -10483,21 +10483,21 @@ public final void rule__Injection__Group__3__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__NamingSection__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3250:1: rule__NamingSection__Group__0 : rule__NamingSection__Group__0__Impl rule__NamingSection__Group__1 ;
+    // InternalScope.g:3250:1: rule__NamingSection__Group__0 : rule__NamingSection__Group__0__Impl rule__NamingSection__Group__1 ;
     public final void rule__NamingSection__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3254:1: ( rule__NamingSection__Group__0__Impl rule__NamingSection__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3255:2: rule__NamingSection__Group__0__Impl rule__NamingSection__Group__1
+            // InternalScope.g:3254:1: ( rule__NamingSection__Group__0__Impl rule__NamingSection__Group__1 )
+            // InternalScope.g:3255:2: rule__NamingSection__Group__0__Impl rule__NamingSection__Group__1
             {
-            pushFollow(FOLLOW_rule__NamingSection__Group__0__Impl_in_rule__NamingSection__Group__06953);
+            pushFollow(FOLLOW_11);
             rule__NamingSection__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__NamingSection__Group__1_in_rule__NamingSection__Group__06956);
+            pushFollow(FOLLOW_2);
             rule__NamingSection__Group__1();
 
             state._fsp--;
@@ -10521,23 +10521,23 @@ public final void rule__NamingSection__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__NamingSection__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3262:1: rule__NamingSection__Group__0__Impl : ( () ) ;
+    // InternalScope.g:3262:1: rule__NamingSection__Group__0__Impl : ( () ) ;
     public final void rule__NamingSection__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3266:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3267:1: ( () )
+            // InternalScope.g:3266:1: ( ( () ) )
+            // InternalScope.g:3267:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3267:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3268:1: ()
+            // InternalScope.g:3267:1: ( () )
+            // InternalScope.g:3268:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamingSectionAccess().getNamingSectionAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3269:1: ()
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3271:1: 
+            // InternalScope.g:3269:1: ()
+            // InternalScope.g:3271:1: 
             {
             }
 
@@ -10562,21 +10562,21 @@ public final void rule__NamingSection__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__NamingSection__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3281:1: rule__NamingSection__Group__1 : rule__NamingSection__Group__1__Impl rule__NamingSection__Group__2 ;
+    // InternalScope.g:3281:1: rule__NamingSection__Group__1 : rule__NamingSection__Group__1__Impl rule__NamingSection__Group__2 ;
     public final void rule__NamingSection__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3285:1: ( rule__NamingSection__Group__1__Impl rule__NamingSection__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3286:2: rule__NamingSection__Group__1__Impl rule__NamingSection__Group__2
+            // InternalScope.g:3285:1: ( rule__NamingSection__Group__1__Impl rule__NamingSection__Group__2 )
+            // InternalScope.g:3286:2: rule__NamingSection__Group__1__Impl rule__NamingSection__Group__2
             {
-            pushFollow(FOLLOW_rule__NamingSection__Group__1__Impl_in_rule__NamingSection__Group__17014);
+            pushFollow(FOLLOW_11);
             rule__NamingSection__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__NamingSection__Group__2_in_rule__NamingSection__Group__17017);
+            pushFollow(FOLLOW_2);
             rule__NamingSection__Group__2();
 
             state._fsp--;
@@ -10600,22 +10600,22 @@ public final void rule__NamingSection__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__NamingSection__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3293:1: rule__NamingSection__Group__1__Impl : ( ( rule__NamingSection__Group_1__0 )? ) ;
+    // InternalScope.g:3293:1: rule__NamingSection__Group__1__Impl : ( ( rule__NamingSection__Group_1__0 )? ) ;
     public final void rule__NamingSection__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3297:1: ( ( ( rule__NamingSection__Group_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3298:1: ( ( rule__NamingSection__Group_1__0 )? )
+            // InternalScope.g:3297:1: ( ( ( rule__NamingSection__Group_1__0 )? ) )
+            // InternalScope.g:3298:1: ( ( rule__NamingSection__Group_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3298:1: ( ( rule__NamingSection__Group_1__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3299:1: ( rule__NamingSection__Group_1__0 )?
+            // InternalScope.g:3298:1: ( ( rule__NamingSection__Group_1__0 )? )
+            // InternalScope.g:3299:1: ( rule__NamingSection__Group_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamingSectionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3300:1: ( rule__NamingSection__Group_1__0 )?
+            // InternalScope.g:3300:1: ( rule__NamingSection__Group_1__0 )?
             int alt35=2;
             int LA35_0 = input.LA(1);
 
@@ -10624,9 +10624,9 @@ public final void rule__NamingSection__Group__1__Impl() throws RecognitionExcept
             }
             switch (alt35) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3300:2: rule__NamingSection__Group_1__0
+                    // InternalScope.g:3300:2: rule__NamingSection__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__NamingSection__Group_1__0_in_rule__NamingSection__Group__1__Impl7044);
+                    pushFollow(FOLLOW_2);
                     rule__NamingSection__Group_1__0();
 
                     state._fsp--;
@@ -10662,21 +10662,21 @@ public final void rule__NamingSection__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__NamingSection__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3310:1: rule__NamingSection__Group__2 : rule__NamingSection__Group__2__Impl rule__NamingSection__Group__3 ;
+    // InternalScope.g:3310:1: rule__NamingSection__Group__2 : rule__NamingSection__Group__2__Impl rule__NamingSection__Group__3 ;
     public final void rule__NamingSection__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3314:1: ( rule__NamingSection__Group__2__Impl rule__NamingSection__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3315:2: rule__NamingSection__Group__2__Impl rule__NamingSection__Group__3
+            // InternalScope.g:3314:1: ( rule__NamingSection__Group__2__Impl rule__NamingSection__Group__3 )
+            // InternalScope.g:3315:2: rule__NamingSection__Group__2__Impl rule__NamingSection__Group__3
             {
-            pushFollow(FOLLOW_rule__NamingSection__Group__2__Impl_in_rule__NamingSection__Group__27075);
+            pushFollow(FOLLOW_12);
             rule__NamingSection__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__NamingSection__Group__3_in_rule__NamingSection__Group__27078);
+            pushFollow(FOLLOW_2);
             rule__NamingSection__Group__3();
 
             state._fsp--;
@@ -10700,22 +10700,22 @@ public final void rule__NamingSection__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__NamingSection__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3322:1: rule__NamingSection__Group__2__Impl : ( 'naming' ) ;
+    // InternalScope.g:3322:1: rule__NamingSection__Group__2__Impl : ( 'naming' ) ;
     public final void rule__NamingSection__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3326:1: ( ( 'naming' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3327:1: ( 'naming' )
+            // InternalScope.g:3326:1: ( ( 'naming' ) )
+            // InternalScope.g:3327:1: ( 'naming' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3327:1: ( 'naming' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3328:1: 'naming'
+            // InternalScope.g:3327:1: ( 'naming' )
+            // InternalScope.g:3328:1: 'naming'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamingSectionAccess().getNamingKeyword_2()); 
             }
-            match(input,44,FOLLOW_44_in_rule__NamingSection__Group__2__Impl7106); if (state.failed) return ;
+            match(input,44,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getNamingSectionAccess().getNamingKeyword_2()); 
             }
@@ -10741,21 +10741,21 @@ public final void rule__NamingSection__Group__2__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__NamingSection__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3341:1: rule__NamingSection__Group__3 : rule__NamingSection__Group__3__Impl rule__NamingSection__Group__4 ;
+    // InternalScope.g:3341:1: rule__NamingSection__Group__3 : rule__NamingSection__Group__3__Impl rule__NamingSection__Group__4 ;
     public final void rule__NamingSection__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3345:1: ( rule__NamingSection__Group__3__Impl rule__NamingSection__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3346:2: rule__NamingSection__Group__3__Impl rule__NamingSection__Group__4
+            // InternalScope.g:3345:1: ( rule__NamingSection__Group__3__Impl rule__NamingSection__Group__4 )
+            // InternalScope.g:3346:2: rule__NamingSection__Group__3__Impl rule__NamingSection__Group__4
             {
-            pushFollow(FOLLOW_rule__NamingSection__Group__3__Impl_in_rule__NamingSection__Group__37137);
+            pushFollow(FOLLOW_13);
             rule__NamingSection__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__NamingSection__Group__4_in_rule__NamingSection__Group__37140);
+            pushFollow(FOLLOW_2);
             rule__NamingSection__Group__4();
 
             state._fsp--;
@@ -10779,22 +10779,22 @@ public final void rule__NamingSection__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__NamingSection__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3353:1: rule__NamingSection__Group__3__Impl : ( '{' ) ;
+    // InternalScope.g:3353:1: rule__NamingSection__Group__3__Impl : ( '{' ) ;
     public final void rule__NamingSection__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3357:1: ( ( '{' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3358:1: ( '{' )
+            // InternalScope.g:3357:1: ( ( '{' ) )
+            // InternalScope.g:3358:1: ( '{' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3358:1: ( '{' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3359:1: '{'
+            // InternalScope.g:3358:1: ( '{' )
+            // InternalScope.g:3359:1: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamingSectionAccess().getLeftCurlyBracketKeyword_3()); 
             }
-            match(input,45,FOLLOW_45_in_rule__NamingSection__Group__3__Impl7168); if (state.failed) return ;
+            match(input,45,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getNamingSectionAccess().getLeftCurlyBracketKeyword_3()); 
             }
@@ -10820,21 +10820,21 @@ public final void rule__NamingSection__Group__3__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__NamingSection__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3372:1: rule__NamingSection__Group__4 : rule__NamingSection__Group__4__Impl rule__NamingSection__Group__5 ;
+    // InternalScope.g:3372:1: rule__NamingSection__Group__4 : rule__NamingSection__Group__4__Impl rule__NamingSection__Group__5 ;
     public final void rule__NamingSection__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3376:1: ( rule__NamingSection__Group__4__Impl rule__NamingSection__Group__5 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3377:2: rule__NamingSection__Group__4__Impl rule__NamingSection__Group__5
+            // InternalScope.g:3376:1: ( rule__NamingSection__Group__4__Impl rule__NamingSection__Group__5 )
+            // InternalScope.g:3377:2: rule__NamingSection__Group__4__Impl rule__NamingSection__Group__5
             {
-            pushFollow(FOLLOW_rule__NamingSection__Group__4__Impl_in_rule__NamingSection__Group__47199);
+            pushFollow(FOLLOW_13);
             rule__NamingSection__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__NamingSection__Group__5_in_rule__NamingSection__Group__47202);
+            pushFollow(FOLLOW_2);
             rule__NamingSection__Group__5();
 
             state._fsp--;
@@ -10858,22 +10858,22 @@ public final void rule__NamingSection__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__NamingSection__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3384:1: rule__NamingSection__Group__4__Impl : ( ( rule__NamingSection__NamingsAssignment_4 )* ) ;
+    // InternalScope.g:3384:1: rule__NamingSection__Group__4__Impl : ( ( rule__NamingSection__NamingsAssignment_4 )* ) ;
     public final void rule__NamingSection__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3388:1: ( ( ( rule__NamingSection__NamingsAssignment_4 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3389:1: ( ( rule__NamingSection__NamingsAssignment_4 )* )
+            // InternalScope.g:3388:1: ( ( ( rule__NamingSection__NamingsAssignment_4 )* ) )
+            // InternalScope.g:3389:1: ( ( rule__NamingSection__NamingsAssignment_4 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3389:1: ( ( rule__NamingSection__NamingsAssignment_4 )* )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3390:1: ( rule__NamingSection__NamingsAssignment_4 )*
+            // InternalScope.g:3389:1: ( ( rule__NamingSection__NamingsAssignment_4 )* )
+            // InternalScope.g:3390:1: ( rule__NamingSection__NamingsAssignment_4 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamingSectionAccess().getNamingsAssignment_4()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3391:1: ( rule__NamingSection__NamingsAssignment_4 )*
+            // InternalScope.g:3391:1: ( rule__NamingSection__NamingsAssignment_4 )*
             loop36:
             do {
                 int alt36=2;
@@ -10886,9 +10886,9 @@ public final void rule__NamingSection__Group__4__Impl() throws RecognitionExcept
 
                 switch (alt36) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3391:2: rule__NamingSection__NamingsAssignment_4
+            	    // InternalScope.g:3391:2: rule__NamingSection__NamingsAssignment_4
             	    {
-            	    pushFollow(FOLLOW_rule__NamingSection__NamingsAssignment_4_in_rule__NamingSection__Group__4__Impl7229);
+            	    pushFollow(FOLLOW_14);
             	    rule__NamingSection__NamingsAssignment_4();
 
             	    state._fsp--;
@@ -10927,16 +10927,16 @@ public final void rule__NamingSection__Group__4__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__NamingSection__Group__5"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3401:1: rule__NamingSection__Group__5 : rule__NamingSection__Group__5__Impl ;
+    // InternalScope.g:3401:1: rule__NamingSection__Group__5 : rule__NamingSection__Group__5__Impl ;
     public final void rule__NamingSection__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3405:1: ( rule__NamingSection__Group__5__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3406:2: rule__NamingSection__Group__5__Impl
+            // InternalScope.g:3405:1: ( rule__NamingSection__Group__5__Impl )
+            // InternalScope.g:3406:2: rule__NamingSection__Group__5__Impl
             {
-            pushFollow(FOLLOW_rule__NamingSection__Group__5__Impl_in_rule__NamingSection__Group__57260);
+            pushFollow(FOLLOW_2);
             rule__NamingSection__Group__5__Impl();
 
             state._fsp--;
@@ -10960,22 +10960,22 @@ public final void rule__NamingSection__Group__5() throws RecognitionException {
 
 
     // $ANTLR start "rule__NamingSection__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3412:1: rule__NamingSection__Group__5__Impl : ( '}' ) ;
+    // InternalScope.g:3412:1: rule__NamingSection__Group__5__Impl : ( '}' ) ;
     public final void rule__NamingSection__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3416:1: ( ( '}' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3417:1: ( '}' )
+            // InternalScope.g:3416:1: ( ( '}' ) )
+            // InternalScope.g:3417:1: ( '}' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3417:1: ( '}' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3418:1: '}'
+            // InternalScope.g:3417:1: ( '}' )
+            // InternalScope.g:3418:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamingSectionAccess().getRightCurlyBracketKeyword_5()); 
             }
-            match(input,46,FOLLOW_46_in_rule__NamingSection__Group__5__Impl7288); if (state.failed) return ;
+            match(input,46,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getNamingSectionAccess().getRightCurlyBracketKeyword_5()); 
             }
@@ -11001,21 +11001,21 @@ public final void rule__NamingSection__Group__5__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__NamingSection__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3443:1: rule__NamingSection__Group_1__0 : rule__NamingSection__Group_1__0__Impl rule__NamingSection__Group_1__1 ;
+    // InternalScope.g:3443:1: rule__NamingSection__Group_1__0 : rule__NamingSection__Group_1__0__Impl rule__NamingSection__Group_1__1 ;
     public final void rule__NamingSection__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3447:1: ( rule__NamingSection__Group_1__0__Impl rule__NamingSection__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3448:2: rule__NamingSection__Group_1__0__Impl rule__NamingSection__Group_1__1
+            // InternalScope.g:3447:1: ( rule__NamingSection__Group_1__0__Impl rule__NamingSection__Group_1__1 )
+            // InternalScope.g:3448:2: rule__NamingSection__Group_1__0__Impl rule__NamingSection__Group_1__1
             {
-            pushFollow(FOLLOW_rule__NamingSection__Group_1__0__Impl_in_rule__NamingSection__Group_1__07331);
+            pushFollow(FOLLOW_15);
             rule__NamingSection__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__NamingSection__Group_1__1_in_rule__NamingSection__Group_1__07334);
+            pushFollow(FOLLOW_2);
             rule__NamingSection__Group_1__1();
 
             state._fsp--;
@@ -11039,22 +11039,22 @@ public final void rule__NamingSection__Group_1__0() throws RecognitionException
 
 
     // $ANTLR start "rule__NamingSection__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3455:1: rule__NamingSection__Group_1__0__Impl : ( 'case' ) ;
+    // InternalScope.g:3455:1: rule__NamingSection__Group_1__0__Impl : ( 'case' ) ;
     public final void rule__NamingSection__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3459:1: ( ( 'case' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3460:1: ( 'case' )
+            // InternalScope.g:3459:1: ( ( 'case' ) )
+            // InternalScope.g:3460:1: ( 'case' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3460:1: ( 'case' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3461:1: 'case'
+            // InternalScope.g:3460:1: ( 'case' )
+            // InternalScope.g:3461:1: 'case'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamingSectionAccess().getCaseKeyword_1_0()); 
             }
-            match(input,47,FOLLOW_47_in_rule__NamingSection__Group_1__0__Impl7362); if (state.failed) return ;
+            match(input,47,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getNamingSectionAccess().getCaseKeyword_1_0()); 
             }
@@ -11080,16 +11080,16 @@ public final void rule__NamingSection__Group_1__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__NamingSection__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3474:1: rule__NamingSection__Group_1__1 : rule__NamingSection__Group_1__1__Impl ;
+    // InternalScope.g:3474:1: rule__NamingSection__Group_1__1 : rule__NamingSection__Group_1__1__Impl ;
     public final void rule__NamingSection__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3478:1: ( rule__NamingSection__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3479:2: rule__NamingSection__Group_1__1__Impl
+            // InternalScope.g:3478:1: ( rule__NamingSection__Group_1__1__Impl )
+            // InternalScope.g:3479:2: rule__NamingSection__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__NamingSection__Group_1__1__Impl_in_rule__NamingSection__Group_1__17393);
+            pushFollow(FOLLOW_2);
             rule__NamingSection__Group_1__1__Impl();
 
             state._fsp--;
@@ -11113,25 +11113,25 @@ public final void rule__NamingSection__Group_1__1() throws RecognitionException
 
 
     // $ANTLR start "rule__NamingSection__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3485:1: rule__NamingSection__Group_1__1__Impl : ( ( rule__NamingSection__CasingAssignment_1_1 ) ) ;
+    // InternalScope.g:3485:1: rule__NamingSection__Group_1__1__Impl : ( ( rule__NamingSection__CasingAssignment_1_1 ) ) ;
     public final void rule__NamingSection__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3489:1: ( ( ( rule__NamingSection__CasingAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3490:1: ( ( rule__NamingSection__CasingAssignment_1_1 ) )
+            // InternalScope.g:3489:1: ( ( ( rule__NamingSection__CasingAssignment_1_1 ) ) )
+            // InternalScope.g:3490:1: ( ( rule__NamingSection__CasingAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3490:1: ( ( rule__NamingSection__CasingAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3491:1: ( rule__NamingSection__CasingAssignment_1_1 )
+            // InternalScope.g:3490:1: ( ( rule__NamingSection__CasingAssignment_1_1 ) )
+            // InternalScope.g:3491:1: ( rule__NamingSection__CasingAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamingSectionAccess().getCasingAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3492:1: ( rule__NamingSection__CasingAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3492:2: rule__NamingSection__CasingAssignment_1_1
+            // InternalScope.g:3492:1: ( rule__NamingSection__CasingAssignment_1_1 )
+            // InternalScope.g:3492:2: rule__NamingSection__CasingAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__NamingSection__CasingAssignment_1_1_in_rule__NamingSection__Group_1__1__Impl7420);
+            pushFollow(FOLLOW_2);
             rule__NamingSection__CasingAssignment_1_1();
 
             state._fsp--;
@@ -11164,21 +11164,21 @@ public final void rule__NamingSection__Group_1__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__NamingDefinition__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3506:1: rule__NamingDefinition__Group__0 : rule__NamingDefinition__Group__0__Impl rule__NamingDefinition__Group__1 ;
+    // InternalScope.g:3506:1: rule__NamingDefinition__Group__0 : rule__NamingDefinition__Group__0__Impl rule__NamingDefinition__Group__1 ;
     public final void rule__NamingDefinition__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3510:1: ( rule__NamingDefinition__Group__0__Impl rule__NamingDefinition__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3511:2: rule__NamingDefinition__Group__0__Impl rule__NamingDefinition__Group__1
+            // InternalScope.g:3510:1: ( rule__NamingDefinition__Group__0__Impl rule__NamingDefinition__Group__1 )
+            // InternalScope.g:3511:2: rule__NamingDefinition__Group__0__Impl rule__NamingDefinition__Group__1
             {
-            pushFollow(FOLLOW_rule__NamingDefinition__Group__0__Impl_in_rule__NamingDefinition__Group__07454);
+            pushFollow(FOLLOW_16);
             rule__NamingDefinition__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__NamingDefinition__Group__1_in_rule__NamingDefinition__Group__07457);
+            pushFollow(FOLLOW_2);
             rule__NamingDefinition__Group__1();
 
             state._fsp--;
@@ -11202,25 +11202,25 @@ public final void rule__NamingDefinition__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__NamingDefinition__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3518:1: rule__NamingDefinition__Group__0__Impl : ( ( rule__NamingDefinition__TypeAssignment_0 ) ) ;
+    // InternalScope.g:3518:1: rule__NamingDefinition__Group__0__Impl : ( ( rule__NamingDefinition__TypeAssignment_0 ) ) ;
     public final void rule__NamingDefinition__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3522:1: ( ( ( rule__NamingDefinition__TypeAssignment_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3523:1: ( ( rule__NamingDefinition__TypeAssignment_0 ) )
+            // InternalScope.g:3522:1: ( ( ( rule__NamingDefinition__TypeAssignment_0 ) ) )
+            // InternalScope.g:3523:1: ( ( rule__NamingDefinition__TypeAssignment_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3523:1: ( ( rule__NamingDefinition__TypeAssignment_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3524:1: ( rule__NamingDefinition__TypeAssignment_0 )
+            // InternalScope.g:3523:1: ( ( rule__NamingDefinition__TypeAssignment_0 ) )
+            // InternalScope.g:3524:1: ( rule__NamingDefinition__TypeAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamingDefinitionAccess().getTypeAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3525:1: ( rule__NamingDefinition__TypeAssignment_0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3525:2: rule__NamingDefinition__TypeAssignment_0
+            // InternalScope.g:3525:1: ( rule__NamingDefinition__TypeAssignment_0 )
+            // InternalScope.g:3525:2: rule__NamingDefinition__TypeAssignment_0
             {
-            pushFollow(FOLLOW_rule__NamingDefinition__TypeAssignment_0_in_rule__NamingDefinition__Group__0__Impl7484);
+            pushFollow(FOLLOW_2);
             rule__NamingDefinition__TypeAssignment_0();
 
             state._fsp--;
@@ -11253,21 +11253,21 @@ public final void rule__NamingDefinition__Group__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__NamingDefinition__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3535:1: rule__NamingDefinition__Group__1 : rule__NamingDefinition__Group__1__Impl rule__NamingDefinition__Group__2 ;
+    // InternalScope.g:3535:1: rule__NamingDefinition__Group__1 : rule__NamingDefinition__Group__1__Impl rule__NamingDefinition__Group__2 ;
     public final void rule__NamingDefinition__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3539:1: ( rule__NamingDefinition__Group__1__Impl rule__NamingDefinition__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3540:2: rule__NamingDefinition__Group__1__Impl rule__NamingDefinition__Group__2
+            // InternalScope.g:3539:1: ( rule__NamingDefinition__Group__1__Impl rule__NamingDefinition__Group__2 )
+            // InternalScope.g:3540:2: rule__NamingDefinition__Group__1__Impl rule__NamingDefinition__Group__2
             {
-            pushFollow(FOLLOW_rule__NamingDefinition__Group__1__Impl_in_rule__NamingDefinition__Group__17514);
+            pushFollow(FOLLOW_17);
             rule__NamingDefinition__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__NamingDefinition__Group__2_in_rule__NamingDefinition__Group__17517);
+            pushFollow(FOLLOW_2);
             rule__NamingDefinition__Group__2();
 
             state._fsp--;
@@ -11291,22 +11291,22 @@ public final void rule__NamingDefinition__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__NamingDefinition__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3547:1: rule__NamingDefinition__Group__1__Impl : ( '=' ) ;
+    // InternalScope.g:3547:1: rule__NamingDefinition__Group__1__Impl : ( '=' ) ;
     public final void rule__NamingDefinition__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3551:1: ( ( '=' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3552:1: ( '=' )
+            // InternalScope.g:3551:1: ( ( '=' ) )
+            // InternalScope.g:3552:1: ( '=' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3552:1: ( '=' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3553:1: '='
+            // InternalScope.g:3552:1: ( '=' )
+            // InternalScope.g:3553:1: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamingDefinitionAccess().getEqualsSignKeyword_1()); 
             }
-            match(input,48,FOLLOW_48_in_rule__NamingDefinition__Group__1__Impl7545); if (state.failed) return ;
+            match(input,48,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getNamingDefinitionAccess().getEqualsSignKeyword_1()); 
             }
@@ -11332,21 +11332,21 @@ public final void rule__NamingDefinition__Group__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__NamingDefinition__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3566:1: rule__NamingDefinition__Group__2 : rule__NamingDefinition__Group__2__Impl rule__NamingDefinition__Group__3 ;
+    // InternalScope.g:3566:1: rule__NamingDefinition__Group__2 : rule__NamingDefinition__Group__2__Impl rule__NamingDefinition__Group__3 ;
     public final void rule__NamingDefinition__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3570:1: ( rule__NamingDefinition__Group__2__Impl rule__NamingDefinition__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3571:2: rule__NamingDefinition__Group__2__Impl rule__NamingDefinition__Group__3
+            // InternalScope.g:3570:1: ( rule__NamingDefinition__Group__2__Impl rule__NamingDefinition__Group__3 )
+            // InternalScope.g:3571:2: rule__NamingDefinition__Group__2__Impl rule__NamingDefinition__Group__3
             {
-            pushFollow(FOLLOW_rule__NamingDefinition__Group__2__Impl_in_rule__NamingDefinition__Group__27576);
+            pushFollow(FOLLOW_18);
             rule__NamingDefinition__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__NamingDefinition__Group__3_in_rule__NamingDefinition__Group__27579);
+            pushFollow(FOLLOW_2);
             rule__NamingDefinition__Group__3();
 
             state._fsp--;
@@ -11370,25 +11370,25 @@ public final void rule__NamingDefinition__Group__2() throws RecognitionException
 
 
     // $ANTLR start "rule__NamingDefinition__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3578:1: rule__NamingDefinition__Group__2__Impl : ( ( rule__NamingDefinition__NamingAssignment_2 ) ) ;
+    // InternalScope.g:3578:1: rule__NamingDefinition__Group__2__Impl : ( ( rule__NamingDefinition__NamingAssignment_2 ) ) ;
     public final void rule__NamingDefinition__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3582:1: ( ( ( rule__NamingDefinition__NamingAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3583:1: ( ( rule__NamingDefinition__NamingAssignment_2 ) )
+            // InternalScope.g:3582:1: ( ( ( rule__NamingDefinition__NamingAssignment_2 ) ) )
+            // InternalScope.g:3583:1: ( ( rule__NamingDefinition__NamingAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3583:1: ( ( rule__NamingDefinition__NamingAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3584:1: ( rule__NamingDefinition__NamingAssignment_2 )
+            // InternalScope.g:3583:1: ( ( rule__NamingDefinition__NamingAssignment_2 ) )
+            // InternalScope.g:3584:1: ( rule__NamingDefinition__NamingAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamingDefinitionAccess().getNamingAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3585:1: ( rule__NamingDefinition__NamingAssignment_2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3585:2: rule__NamingDefinition__NamingAssignment_2
+            // InternalScope.g:3585:1: ( rule__NamingDefinition__NamingAssignment_2 )
+            // InternalScope.g:3585:2: rule__NamingDefinition__NamingAssignment_2
             {
-            pushFollow(FOLLOW_rule__NamingDefinition__NamingAssignment_2_in_rule__NamingDefinition__Group__2__Impl7606);
+            pushFollow(FOLLOW_2);
             rule__NamingDefinition__NamingAssignment_2();
 
             state._fsp--;
@@ -11421,16 +11421,16 @@ public final void rule__NamingDefinition__Group__2__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__NamingDefinition__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3595:1: rule__NamingDefinition__Group__3 : rule__NamingDefinition__Group__3__Impl ;
+    // InternalScope.g:3595:1: rule__NamingDefinition__Group__3 : rule__NamingDefinition__Group__3__Impl ;
     public final void rule__NamingDefinition__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3599:1: ( rule__NamingDefinition__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3600:2: rule__NamingDefinition__Group__3__Impl
+            // InternalScope.g:3599:1: ( rule__NamingDefinition__Group__3__Impl )
+            // InternalScope.g:3600:2: rule__NamingDefinition__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__NamingDefinition__Group__3__Impl_in_rule__NamingDefinition__Group__37636);
+            pushFollow(FOLLOW_2);
             rule__NamingDefinition__Group__3__Impl();
 
             state._fsp--;
@@ -11454,22 +11454,22 @@ public final void rule__NamingDefinition__Group__3() throws RecognitionException
 
 
     // $ANTLR start "rule__NamingDefinition__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3606:1: rule__NamingDefinition__Group__3__Impl : ( ';' ) ;
+    // InternalScope.g:3606:1: rule__NamingDefinition__Group__3__Impl : ( ';' ) ;
     public final void rule__NamingDefinition__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3610:1: ( ( ';' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3611:1: ( ';' )
+            // InternalScope.g:3610:1: ( ( ';' ) )
+            // InternalScope.g:3611:1: ( ';' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3611:1: ( ';' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3612:1: ';'
+            // InternalScope.g:3611:1: ( ';' )
+            // InternalScope.g:3612:1: ';'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamingDefinitionAccess().getSemicolonKeyword_3()); 
             }
-            match(input,49,FOLLOW_49_in_rule__NamingDefinition__Group__3__Impl7664); if (state.failed) return ;
+            match(input,49,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getNamingDefinitionAccess().getSemicolonKeyword_3()); 
             }
@@ -11495,21 +11495,21 @@ public final void rule__NamingDefinition__Group__3__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__ScopeDefinition__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3633:1: rule__ScopeDefinition__Group__0 : rule__ScopeDefinition__Group__0__Impl rule__ScopeDefinition__Group__1 ;
+    // InternalScope.g:3633:1: rule__ScopeDefinition__Group__0 : rule__ScopeDefinition__Group__0__Impl rule__ScopeDefinition__Group__1 ;
     public final void rule__ScopeDefinition__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3637:1: ( rule__ScopeDefinition__Group__0__Impl rule__ScopeDefinition__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3638:2: rule__ScopeDefinition__Group__0__Impl rule__ScopeDefinition__Group__1
+            // InternalScope.g:3637:1: ( rule__ScopeDefinition__Group__0__Impl rule__ScopeDefinition__Group__1 )
+            // InternalScope.g:3638:2: rule__ScopeDefinition__Group__0__Impl rule__ScopeDefinition__Group__1
             {
-            pushFollow(FOLLOW_rule__ScopeDefinition__Group__0__Impl_in_rule__ScopeDefinition__Group__07703);
+            pushFollow(FOLLOW_19);
             rule__ScopeDefinition__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ScopeDefinition__Group__1_in_rule__ScopeDefinition__Group__07706);
+            pushFollow(FOLLOW_2);
             rule__ScopeDefinition__Group__1();
 
             state._fsp--;
@@ -11533,22 +11533,22 @@ public final void rule__ScopeDefinition__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__ScopeDefinition__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3645:1: rule__ScopeDefinition__Group__0__Impl : ( 'scope' ) ;
+    // InternalScope.g:3645:1: rule__ScopeDefinition__Group__0__Impl : ( 'scope' ) ;
     public final void rule__ScopeDefinition__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3649:1: ( ( 'scope' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3650:1: ( 'scope' )
+            // InternalScope.g:3649:1: ( ( 'scope' ) )
+            // InternalScope.g:3650:1: ( 'scope' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3650:1: ( 'scope' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3651:1: 'scope'
+            // InternalScope.g:3650:1: ( 'scope' )
+            // InternalScope.g:3651:1: 'scope'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeDefinitionAccess().getScopeKeyword_0()); 
             }
-            match(input,50,FOLLOW_50_in_rule__ScopeDefinition__Group__0__Impl7734); if (state.failed) return ;
+            match(input,50,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getScopeDefinitionAccess().getScopeKeyword_0()); 
             }
@@ -11574,21 +11574,21 @@ public final void rule__ScopeDefinition__Group__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__ScopeDefinition__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3664:1: rule__ScopeDefinition__Group__1 : rule__ScopeDefinition__Group__1__Impl rule__ScopeDefinition__Group__2 ;
+    // InternalScope.g:3664:1: rule__ScopeDefinition__Group__1 : rule__ScopeDefinition__Group__1__Impl rule__ScopeDefinition__Group__2 ;
     public final void rule__ScopeDefinition__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3668:1: ( rule__ScopeDefinition__Group__1__Impl rule__ScopeDefinition__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3669:2: rule__ScopeDefinition__Group__1__Impl rule__ScopeDefinition__Group__2
+            // InternalScope.g:3668:1: ( rule__ScopeDefinition__Group__1__Impl rule__ScopeDefinition__Group__2 )
+            // InternalScope.g:3669:2: rule__ScopeDefinition__Group__1__Impl rule__ScopeDefinition__Group__2
             {
-            pushFollow(FOLLOW_rule__ScopeDefinition__Group__1__Impl_in_rule__ScopeDefinition__Group__17765);
+            pushFollow(FOLLOW_19);
             rule__ScopeDefinition__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ScopeDefinition__Group__2_in_rule__ScopeDefinition__Group__17768);
+            pushFollow(FOLLOW_2);
             rule__ScopeDefinition__Group__2();
 
             state._fsp--;
@@ -11612,22 +11612,22 @@ public final void rule__ScopeDefinition__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__ScopeDefinition__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3676:1: rule__ScopeDefinition__Group__1__Impl : ( ( rule__ScopeDefinition__Group_1__0 )? ) ;
+    // InternalScope.g:3676:1: rule__ScopeDefinition__Group__1__Impl : ( ( rule__ScopeDefinition__Group_1__0 )? ) ;
     public final void rule__ScopeDefinition__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3680:1: ( ( ( rule__ScopeDefinition__Group_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3681:1: ( ( rule__ScopeDefinition__Group_1__0 )? )
+            // InternalScope.g:3680:1: ( ( ( rule__ScopeDefinition__Group_1__0 )? ) )
+            // InternalScope.g:3681:1: ( ( rule__ScopeDefinition__Group_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3681:1: ( ( rule__ScopeDefinition__Group_1__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3682:1: ( rule__ScopeDefinition__Group_1__0 )?
+            // InternalScope.g:3681:1: ( ( rule__ScopeDefinition__Group_1__0 )? )
+            // InternalScope.g:3682:1: ( rule__ScopeDefinition__Group_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeDefinitionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3683:1: ( rule__ScopeDefinition__Group_1__0 )?
+            // InternalScope.g:3683:1: ( rule__ScopeDefinition__Group_1__0 )?
             int alt37=2;
             int LA37_0 = input.LA(1);
 
@@ -11636,9 +11636,9 @@ public final void rule__ScopeDefinition__Group__1__Impl() throws RecognitionExce
             }
             switch (alt37) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3683:2: rule__ScopeDefinition__Group_1__0
+                    // InternalScope.g:3683:2: rule__ScopeDefinition__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__ScopeDefinition__Group_1__0_in_rule__ScopeDefinition__Group__1__Impl7795);
+                    pushFollow(FOLLOW_2);
                     rule__ScopeDefinition__Group_1__0();
 
                     state._fsp--;
@@ -11674,21 +11674,21 @@ public final void rule__ScopeDefinition__Group__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__ScopeDefinition__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3693:1: rule__ScopeDefinition__Group__2 : rule__ScopeDefinition__Group__2__Impl rule__ScopeDefinition__Group__3 ;
+    // InternalScope.g:3693:1: rule__ScopeDefinition__Group__2 : rule__ScopeDefinition__Group__2__Impl rule__ScopeDefinition__Group__3 ;
     public final void rule__ScopeDefinition__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3697:1: ( rule__ScopeDefinition__Group__2__Impl rule__ScopeDefinition__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3698:2: rule__ScopeDefinition__Group__2__Impl rule__ScopeDefinition__Group__3
+            // InternalScope.g:3697:1: ( rule__ScopeDefinition__Group__2__Impl rule__ScopeDefinition__Group__3 )
+            // InternalScope.g:3698:2: rule__ScopeDefinition__Group__2__Impl rule__ScopeDefinition__Group__3
             {
-            pushFollow(FOLLOW_rule__ScopeDefinition__Group__2__Impl_in_rule__ScopeDefinition__Group__27826);
+            pushFollow(FOLLOW_12);
             rule__ScopeDefinition__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ScopeDefinition__Group__3_in_rule__ScopeDefinition__Group__27829);
+            pushFollow(FOLLOW_2);
             rule__ScopeDefinition__Group__3();
 
             state._fsp--;
@@ -11712,25 +11712,25 @@ public final void rule__ScopeDefinition__Group__2() throws RecognitionException
 
 
     // $ANTLR start "rule__ScopeDefinition__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3705:1: rule__ScopeDefinition__Group__2__Impl : ( ( rule__ScopeDefinition__Alternatives_2 ) ) ;
+    // InternalScope.g:3705:1: rule__ScopeDefinition__Group__2__Impl : ( ( rule__ScopeDefinition__Alternatives_2 ) ) ;
     public final void rule__ScopeDefinition__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3709:1: ( ( ( rule__ScopeDefinition__Alternatives_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3710:1: ( ( rule__ScopeDefinition__Alternatives_2 ) )
+            // InternalScope.g:3709:1: ( ( ( rule__ScopeDefinition__Alternatives_2 ) ) )
+            // InternalScope.g:3710:1: ( ( rule__ScopeDefinition__Alternatives_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3710:1: ( ( rule__ScopeDefinition__Alternatives_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3711:1: ( rule__ScopeDefinition__Alternatives_2 )
+            // InternalScope.g:3710:1: ( ( rule__ScopeDefinition__Alternatives_2 ) )
+            // InternalScope.g:3711:1: ( rule__ScopeDefinition__Alternatives_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeDefinitionAccess().getAlternatives_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3712:1: ( rule__ScopeDefinition__Alternatives_2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3712:2: rule__ScopeDefinition__Alternatives_2
+            // InternalScope.g:3712:1: ( rule__ScopeDefinition__Alternatives_2 )
+            // InternalScope.g:3712:2: rule__ScopeDefinition__Alternatives_2
             {
-            pushFollow(FOLLOW_rule__ScopeDefinition__Alternatives_2_in_rule__ScopeDefinition__Group__2__Impl7856);
+            pushFollow(FOLLOW_2);
             rule__ScopeDefinition__Alternatives_2();
 
             state._fsp--;
@@ -11763,21 +11763,21 @@ public final void rule__ScopeDefinition__Group__2__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__ScopeDefinition__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3722:1: rule__ScopeDefinition__Group__3 : rule__ScopeDefinition__Group__3__Impl rule__ScopeDefinition__Group__4 ;
+    // InternalScope.g:3722:1: rule__ScopeDefinition__Group__3 : rule__ScopeDefinition__Group__3__Impl rule__ScopeDefinition__Group__4 ;
     public final void rule__ScopeDefinition__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3726:1: ( rule__ScopeDefinition__Group__3__Impl rule__ScopeDefinition__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3727:2: rule__ScopeDefinition__Group__3__Impl rule__ScopeDefinition__Group__4
+            // InternalScope.g:3726:1: ( rule__ScopeDefinition__Group__3__Impl rule__ScopeDefinition__Group__4 )
+            // InternalScope.g:3727:2: rule__ScopeDefinition__Group__3__Impl rule__ScopeDefinition__Group__4
             {
-            pushFollow(FOLLOW_rule__ScopeDefinition__Group__3__Impl_in_rule__ScopeDefinition__Group__37886);
+            pushFollow(FOLLOW_20);
             rule__ScopeDefinition__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ScopeDefinition__Group__4_in_rule__ScopeDefinition__Group__37889);
+            pushFollow(FOLLOW_2);
             rule__ScopeDefinition__Group__4();
 
             state._fsp--;
@@ -11801,22 +11801,22 @@ public final void rule__ScopeDefinition__Group__3() throws RecognitionException
 
 
     // $ANTLR start "rule__ScopeDefinition__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3734:1: rule__ScopeDefinition__Group__3__Impl : ( '{' ) ;
+    // InternalScope.g:3734:1: rule__ScopeDefinition__Group__3__Impl : ( '{' ) ;
     public final void rule__ScopeDefinition__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3738:1: ( ( '{' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3739:1: ( '{' )
+            // InternalScope.g:3738:1: ( ( '{' ) )
+            // InternalScope.g:3739:1: ( '{' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3739:1: ( '{' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3740:1: '{'
+            // InternalScope.g:3739:1: ( '{' )
+            // InternalScope.g:3740:1: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeDefinitionAccess().getLeftCurlyBracketKeyword_3()); 
             }
-            match(input,45,FOLLOW_45_in_rule__ScopeDefinition__Group__3__Impl7917); if (state.failed) return ;
+            match(input,45,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getScopeDefinitionAccess().getLeftCurlyBracketKeyword_3()); 
             }
@@ -11842,21 +11842,21 @@ public final void rule__ScopeDefinition__Group__3__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__ScopeDefinition__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3753:1: rule__ScopeDefinition__Group__4 : rule__ScopeDefinition__Group__4__Impl rule__ScopeDefinition__Group__5 ;
+    // InternalScope.g:3753:1: rule__ScopeDefinition__Group__4 : rule__ScopeDefinition__Group__4__Impl rule__ScopeDefinition__Group__5 ;
     public final void rule__ScopeDefinition__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3757:1: ( rule__ScopeDefinition__Group__4__Impl rule__ScopeDefinition__Group__5 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3758:2: rule__ScopeDefinition__Group__4__Impl rule__ScopeDefinition__Group__5
+            // InternalScope.g:3757:1: ( rule__ScopeDefinition__Group__4__Impl rule__ScopeDefinition__Group__5 )
+            // InternalScope.g:3758:2: rule__ScopeDefinition__Group__4__Impl rule__ScopeDefinition__Group__5
             {
-            pushFollow(FOLLOW_rule__ScopeDefinition__Group__4__Impl_in_rule__ScopeDefinition__Group__47948);
+            pushFollow(FOLLOW_21);
             rule__ScopeDefinition__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ScopeDefinition__Group__5_in_rule__ScopeDefinition__Group__47951);
+            pushFollow(FOLLOW_2);
             rule__ScopeDefinition__Group__5();
 
             state._fsp--;
@@ -11880,28 +11880,28 @@ public final void rule__ScopeDefinition__Group__4() throws RecognitionException
 
 
     // $ANTLR start "rule__ScopeDefinition__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3765:1: rule__ScopeDefinition__Group__4__Impl : ( ( ( rule__ScopeDefinition__RulesAssignment_4 ) ) ( ( rule__ScopeDefinition__RulesAssignment_4 )* ) ) ;
+    // InternalScope.g:3765:1: rule__ScopeDefinition__Group__4__Impl : ( ( ( rule__ScopeDefinition__RulesAssignment_4 ) ) ( ( rule__ScopeDefinition__RulesAssignment_4 )* ) ) ;
     public final void rule__ScopeDefinition__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3769:1: ( ( ( ( rule__ScopeDefinition__RulesAssignment_4 ) ) ( ( rule__ScopeDefinition__RulesAssignment_4 )* ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3770:1: ( ( ( rule__ScopeDefinition__RulesAssignment_4 ) ) ( ( rule__ScopeDefinition__RulesAssignment_4 )* ) )
+            // InternalScope.g:3769:1: ( ( ( ( rule__ScopeDefinition__RulesAssignment_4 ) ) ( ( rule__ScopeDefinition__RulesAssignment_4 )* ) ) )
+            // InternalScope.g:3770:1: ( ( ( rule__ScopeDefinition__RulesAssignment_4 ) ) ( ( rule__ScopeDefinition__RulesAssignment_4 )* ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3770:1: ( ( ( rule__ScopeDefinition__RulesAssignment_4 ) ) ( ( rule__ScopeDefinition__RulesAssignment_4 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3771:1: ( ( rule__ScopeDefinition__RulesAssignment_4 ) ) ( ( rule__ScopeDefinition__RulesAssignment_4 )* )
+            // InternalScope.g:3770:1: ( ( ( rule__ScopeDefinition__RulesAssignment_4 ) ) ( ( rule__ScopeDefinition__RulesAssignment_4 )* ) )
+            // InternalScope.g:3771:1: ( ( rule__ScopeDefinition__RulesAssignment_4 ) ) ( ( rule__ScopeDefinition__RulesAssignment_4 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3771:1: ( ( rule__ScopeDefinition__RulesAssignment_4 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3772:1: ( rule__ScopeDefinition__RulesAssignment_4 )
+            // InternalScope.g:3771:1: ( ( rule__ScopeDefinition__RulesAssignment_4 ) )
+            // InternalScope.g:3772:1: ( rule__ScopeDefinition__RulesAssignment_4 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeDefinitionAccess().getRulesAssignment_4()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3773:1: ( rule__ScopeDefinition__RulesAssignment_4 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3773:2: rule__ScopeDefinition__RulesAssignment_4
+            // InternalScope.g:3773:1: ( rule__ScopeDefinition__RulesAssignment_4 )
+            // InternalScope.g:3773:2: rule__ScopeDefinition__RulesAssignment_4
             {
-            pushFollow(FOLLOW_rule__ScopeDefinition__RulesAssignment_4_in_rule__ScopeDefinition__Group__4__Impl7980);
+            pushFollow(FOLLOW_22);
             rule__ScopeDefinition__RulesAssignment_4();
 
             state._fsp--;
@@ -11915,13 +11915,13 @@ public final void rule__ScopeDefinition__Group__4__Impl() throws RecognitionExce
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3776:1: ( ( rule__ScopeDefinition__RulesAssignment_4 )* )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3777:1: ( rule__ScopeDefinition__RulesAssignment_4 )*
+            // InternalScope.g:3776:1: ( ( rule__ScopeDefinition__RulesAssignment_4 )* )
+            // InternalScope.g:3777:1: ( rule__ScopeDefinition__RulesAssignment_4 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeDefinitionAccess().getRulesAssignment_4()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3778:1: ( rule__ScopeDefinition__RulesAssignment_4 )*
+            // InternalScope.g:3778:1: ( rule__ScopeDefinition__RulesAssignment_4 )*
             loop38:
             do {
                 int alt38=2;
@@ -11934,9 +11934,9 @@ public final void rule__ScopeDefinition__Group__4__Impl() throws RecognitionExce
 
                 switch (alt38) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3778:2: rule__ScopeDefinition__RulesAssignment_4
+            	    // InternalScope.g:3778:2: rule__ScopeDefinition__RulesAssignment_4
             	    {
-            	    pushFollow(FOLLOW_rule__ScopeDefinition__RulesAssignment_4_in_rule__ScopeDefinition__Group__4__Impl7992);
+            	    pushFollow(FOLLOW_22);
             	    rule__ScopeDefinition__RulesAssignment_4();
 
             	    state._fsp--;
@@ -11978,16 +11978,16 @@ public final void rule__ScopeDefinition__Group__4__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__ScopeDefinition__Group__5"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3789:1: rule__ScopeDefinition__Group__5 : rule__ScopeDefinition__Group__5__Impl ;
+    // InternalScope.g:3789:1: rule__ScopeDefinition__Group__5 : rule__ScopeDefinition__Group__5__Impl ;
     public final void rule__ScopeDefinition__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3793:1: ( rule__ScopeDefinition__Group__5__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3794:2: rule__ScopeDefinition__Group__5__Impl
+            // InternalScope.g:3793:1: ( rule__ScopeDefinition__Group__5__Impl )
+            // InternalScope.g:3794:2: rule__ScopeDefinition__Group__5__Impl
             {
-            pushFollow(FOLLOW_rule__ScopeDefinition__Group__5__Impl_in_rule__ScopeDefinition__Group__58025);
+            pushFollow(FOLLOW_2);
             rule__ScopeDefinition__Group__5__Impl();
 
             state._fsp--;
@@ -12011,22 +12011,22 @@ public final void rule__ScopeDefinition__Group__5() throws RecognitionException
 
 
     // $ANTLR start "rule__ScopeDefinition__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3800:1: rule__ScopeDefinition__Group__5__Impl : ( '}' ) ;
+    // InternalScope.g:3800:1: rule__ScopeDefinition__Group__5__Impl : ( '}' ) ;
     public final void rule__ScopeDefinition__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3804:1: ( ( '}' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3805:1: ( '}' )
+            // InternalScope.g:3804:1: ( ( '}' ) )
+            // InternalScope.g:3805:1: ( '}' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3805:1: ( '}' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3806:1: '}'
+            // InternalScope.g:3805:1: ( '}' )
+            // InternalScope.g:3806:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeDefinitionAccess().getRightCurlyBracketKeyword_5()); 
             }
-            match(input,46,FOLLOW_46_in_rule__ScopeDefinition__Group__5__Impl8053); if (state.failed) return ;
+            match(input,46,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getScopeDefinitionAccess().getRightCurlyBracketKeyword_5()); 
             }
@@ -12052,21 +12052,21 @@ public final void rule__ScopeDefinition__Group__5__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__ScopeDefinition__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3831:1: rule__ScopeDefinition__Group_1__0 : rule__ScopeDefinition__Group_1__0__Impl rule__ScopeDefinition__Group_1__1 ;
+    // InternalScope.g:3831:1: rule__ScopeDefinition__Group_1__0 : rule__ScopeDefinition__Group_1__0__Impl rule__ScopeDefinition__Group_1__1 ;
     public final void rule__ScopeDefinition__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3835:1: ( rule__ScopeDefinition__Group_1__0__Impl rule__ScopeDefinition__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3836:2: rule__ScopeDefinition__Group_1__0__Impl rule__ScopeDefinition__Group_1__1
+            // InternalScope.g:3835:1: ( rule__ScopeDefinition__Group_1__0__Impl rule__ScopeDefinition__Group_1__1 )
+            // InternalScope.g:3836:2: rule__ScopeDefinition__Group_1__0__Impl rule__ScopeDefinition__Group_1__1
             {
-            pushFollow(FOLLOW_rule__ScopeDefinition__Group_1__0__Impl_in_rule__ScopeDefinition__Group_1__08096);
+            pushFollow(FOLLOW_3);
             rule__ScopeDefinition__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ScopeDefinition__Group_1__1_in_rule__ScopeDefinition__Group_1__08099);
+            pushFollow(FOLLOW_2);
             rule__ScopeDefinition__Group_1__1();
 
             state._fsp--;
@@ -12090,22 +12090,22 @@ public final void rule__ScopeDefinition__Group_1__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ScopeDefinition__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3843:1: rule__ScopeDefinition__Group_1__0__Impl : ( '(' ) ;
+    // InternalScope.g:3843:1: rule__ScopeDefinition__Group_1__0__Impl : ( '(' ) ;
     public final void rule__ScopeDefinition__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3847:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3848:1: ( '(' )
+            // InternalScope.g:3847:1: ( ( '(' ) )
+            // InternalScope.g:3848:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3848:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3849:1: '('
+            // InternalScope.g:3848:1: ( '(' )
+            // InternalScope.g:3849:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeDefinitionAccess().getLeftParenthesisKeyword_1_0()); 
             }
-            match(input,51,FOLLOW_51_in_rule__ScopeDefinition__Group_1__0__Impl8127); if (state.failed) return ;
+            match(input,51,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getScopeDefinitionAccess().getLeftParenthesisKeyword_1_0()); 
             }
@@ -12131,21 +12131,21 @@ public final void rule__ScopeDefinition__Group_1__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__ScopeDefinition__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3862:1: rule__ScopeDefinition__Group_1__1 : rule__ScopeDefinition__Group_1__1__Impl rule__ScopeDefinition__Group_1__2 ;
+    // InternalScope.g:3862:1: rule__ScopeDefinition__Group_1__1 : rule__ScopeDefinition__Group_1__1__Impl rule__ScopeDefinition__Group_1__2 ;
     public final void rule__ScopeDefinition__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3866:1: ( rule__ScopeDefinition__Group_1__1__Impl rule__ScopeDefinition__Group_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3867:2: rule__ScopeDefinition__Group_1__1__Impl rule__ScopeDefinition__Group_1__2
+            // InternalScope.g:3866:1: ( rule__ScopeDefinition__Group_1__1__Impl rule__ScopeDefinition__Group_1__2 )
+            // InternalScope.g:3867:2: rule__ScopeDefinition__Group_1__1__Impl rule__ScopeDefinition__Group_1__2
             {
-            pushFollow(FOLLOW_rule__ScopeDefinition__Group_1__1__Impl_in_rule__ScopeDefinition__Group_1__18158);
+            pushFollow(FOLLOW_23);
             rule__ScopeDefinition__Group_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ScopeDefinition__Group_1__2_in_rule__ScopeDefinition__Group_1__18161);
+            pushFollow(FOLLOW_2);
             rule__ScopeDefinition__Group_1__2();
 
             state._fsp--;
@@ -12169,25 +12169,25 @@ public final void rule__ScopeDefinition__Group_1__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ScopeDefinition__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3874:1: rule__ScopeDefinition__Group_1__1__Impl : ( ( rule__ScopeDefinition__NameAssignment_1_1 ) ) ;
+    // InternalScope.g:3874:1: rule__ScopeDefinition__Group_1__1__Impl : ( ( rule__ScopeDefinition__NameAssignment_1_1 ) ) ;
     public final void rule__ScopeDefinition__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3878:1: ( ( ( rule__ScopeDefinition__NameAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3879:1: ( ( rule__ScopeDefinition__NameAssignment_1_1 ) )
+            // InternalScope.g:3878:1: ( ( ( rule__ScopeDefinition__NameAssignment_1_1 ) ) )
+            // InternalScope.g:3879:1: ( ( rule__ScopeDefinition__NameAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3879:1: ( ( rule__ScopeDefinition__NameAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3880:1: ( rule__ScopeDefinition__NameAssignment_1_1 )
+            // InternalScope.g:3879:1: ( ( rule__ScopeDefinition__NameAssignment_1_1 ) )
+            // InternalScope.g:3880:1: ( rule__ScopeDefinition__NameAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeDefinitionAccess().getNameAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3881:1: ( rule__ScopeDefinition__NameAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3881:2: rule__ScopeDefinition__NameAssignment_1_1
+            // InternalScope.g:3881:1: ( rule__ScopeDefinition__NameAssignment_1_1 )
+            // InternalScope.g:3881:2: rule__ScopeDefinition__NameAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__ScopeDefinition__NameAssignment_1_1_in_rule__ScopeDefinition__Group_1__1__Impl8188);
+            pushFollow(FOLLOW_2);
             rule__ScopeDefinition__NameAssignment_1_1();
 
             state._fsp--;
@@ -12220,16 +12220,16 @@ public final void rule__ScopeDefinition__Group_1__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__ScopeDefinition__Group_1__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3891:1: rule__ScopeDefinition__Group_1__2 : rule__ScopeDefinition__Group_1__2__Impl ;
+    // InternalScope.g:3891:1: rule__ScopeDefinition__Group_1__2 : rule__ScopeDefinition__Group_1__2__Impl ;
     public final void rule__ScopeDefinition__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3895:1: ( rule__ScopeDefinition__Group_1__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3896:2: rule__ScopeDefinition__Group_1__2__Impl
+            // InternalScope.g:3895:1: ( rule__ScopeDefinition__Group_1__2__Impl )
+            // InternalScope.g:3896:2: rule__ScopeDefinition__Group_1__2__Impl
             {
-            pushFollow(FOLLOW_rule__ScopeDefinition__Group_1__2__Impl_in_rule__ScopeDefinition__Group_1__28218);
+            pushFollow(FOLLOW_2);
             rule__ScopeDefinition__Group_1__2__Impl();
 
             state._fsp--;
@@ -12253,22 +12253,22 @@ public final void rule__ScopeDefinition__Group_1__2() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ScopeDefinition__Group_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3902:1: rule__ScopeDefinition__Group_1__2__Impl : ( ')' ) ;
+    // InternalScope.g:3902:1: rule__ScopeDefinition__Group_1__2__Impl : ( ')' ) ;
     public final void rule__ScopeDefinition__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3906:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3907:1: ( ')' )
+            // InternalScope.g:3906:1: ( ( ')' ) )
+            // InternalScope.g:3907:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3907:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3908:1: ')'
+            // InternalScope.g:3907:1: ( ')' )
+            // InternalScope.g:3908:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeDefinitionAccess().getRightParenthesisKeyword_1_2()); 
             }
-            match(input,52,FOLLOW_52_in_rule__ScopeDefinition__Group_1__2__Impl8246); if (state.failed) return ;
+            match(input,52,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getScopeDefinitionAccess().getRightParenthesisKeyword_1_2()); 
             }
@@ -12294,21 +12294,21 @@ public final void rule__ScopeDefinition__Group_1__2__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__ScopeDefinition__Group_2_1__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3927:1: rule__ScopeDefinition__Group_2_1__0 : rule__ScopeDefinition__Group_2_1__0__Impl rule__ScopeDefinition__Group_2_1__1 ;
+    // InternalScope.g:3927:1: rule__ScopeDefinition__Group_2_1__0 : rule__ScopeDefinition__Group_2_1__0__Impl rule__ScopeDefinition__Group_2_1__1 ;
     public final void rule__ScopeDefinition__Group_2_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3931:1: ( rule__ScopeDefinition__Group_2_1__0__Impl rule__ScopeDefinition__Group_2_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3932:2: rule__ScopeDefinition__Group_2_1__0__Impl rule__ScopeDefinition__Group_2_1__1
+            // InternalScope.g:3931:1: ( rule__ScopeDefinition__Group_2_1__0__Impl rule__ScopeDefinition__Group_2_1__1 )
+            // InternalScope.g:3932:2: rule__ScopeDefinition__Group_2_1__0__Impl rule__ScopeDefinition__Group_2_1__1
             {
-            pushFollow(FOLLOW_rule__ScopeDefinition__Group_2_1__0__Impl_in_rule__ScopeDefinition__Group_2_1__08283);
+            pushFollow(FOLLOW_24);
             rule__ScopeDefinition__Group_2_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ScopeDefinition__Group_2_1__1_in_rule__ScopeDefinition__Group_2_1__08286);
+            pushFollow(FOLLOW_2);
             rule__ScopeDefinition__Group_2_1__1();
 
             state._fsp--;
@@ -12332,25 +12332,25 @@ public final void rule__ScopeDefinition__Group_2_1__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ScopeDefinition__Group_2_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3939:1: rule__ScopeDefinition__Group_2_1__0__Impl : ( ( rule__ScopeDefinition__ContextTypeAssignment_2_1_0 ) ) ;
+    // InternalScope.g:3939:1: rule__ScopeDefinition__Group_2_1__0__Impl : ( ( rule__ScopeDefinition__ContextTypeAssignment_2_1_0 ) ) ;
     public final void rule__ScopeDefinition__Group_2_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3943:1: ( ( ( rule__ScopeDefinition__ContextTypeAssignment_2_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3944:1: ( ( rule__ScopeDefinition__ContextTypeAssignment_2_1_0 ) )
+            // InternalScope.g:3943:1: ( ( ( rule__ScopeDefinition__ContextTypeAssignment_2_1_0 ) ) )
+            // InternalScope.g:3944:1: ( ( rule__ScopeDefinition__ContextTypeAssignment_2_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3944:1: ( ( rule__ScopeDefinition__ContextTypeAssignment_2_1_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3945:1: ( rule__ScopeDefinition__ContextTypeAssignment_2_1_0 )
+            // InternalScope.g:3944:1: ( ( rule__ScopeDefinition__ContextTypeAssignment_2_1_0 ) )
+            // InternalScope.g:3945:1: ( rule__ScopeDefinition__ContextTypeAssignment_2_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeDefinitionAccess().getContextTypeAssignment_2_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3946:1: ( rule__ScopeDefinition__ContextTypeAssignment_2_1_0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3946:2: rule__ScopeDefinition__ContextTypeAssignment_2_1_0
+            // InternalScope.g:3946:1: ( rule__ScopeDefinition__ContextTypeAssignment_2_1_0 )
+            // InternalScope.g:3946:2: rule__ScopeDefinition__ContextTypeAssignment_2_1_0
             {
-            pushFollow(FOLLOW_rule__ScopeDefinition__ContextTypeAssignment_2_1_0_in_rule__ScopeDefinition__Group_2_1__0__Impl8313);
+            pushFollow(FOLLOW_2);
             rule__ScopeDefinition__ContextTypeAssignment_2_1_0();
 
             state._fsp--;
@@ -12383,21 +12383,21 @@ public final void rule__ScopeDefinition__Group_2_1__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__ScopeDefinition__Group_2_1__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3956:1: rule__ScopeDefinition__Group_2_1__1 : rule__ScopeDefinition__Group_2_1__1__Impl rule__ScopeDefinition__Group_2_1__2 ;
+    // InternalScope.g:3956:1: rule__ScopeDefinition__Group_2_1__1 : rule__ScopeDefinition__Group_2_1__1__Impl rule__ScopeDefinition__Group_2_1__2 ;
     public final void rule__ScopeDefinition__Group_2_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3960:1: ( rule__ScopeDefinition__Group_2_1__1__Impl rule__ScopeDefinition__Group_2_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3961:2: rule__ScopeDefinition__Group_2_1__1__Impl rule__ScopeDefinition__Group_2_1__2
+            // InternalScope.g:3960:1: ( rule__ScopeDefinition__Group_2_1__1__Impl rule__ScopeDefinition__Group_2_1__2 )
+            // InternalScope.g:3961:2: rule__ScopeDefinition__Group_2_1__1__Impl rule__ScopeDefinition__Group_2_1__2
             {
-            pushFollow(FOLLOW_rule__ScopeDefinition__Group_2_1__1__Impl_in_rule__ScopeDefinition__Group_2_1__18343);
+            pushFollow(FOLLOW_3);
             rule__ScopeDefinition__Group_2_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ScopeDefinition__Group_2_1__2_in_rule__ScopeDefinition__Group_2_1__18346);
+            pushFollow(FOLLOW_2);
             rule__ScopeDefinition__Group_2_1__2();
 
             state._fsp--;
@@ -12421,22 +12421,22 @@ public final void rule__ScopeDefinition__Group_2_1__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ScopeDefinition__Group_2_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3968:1: rule__ScopeDefinition__Group_2_1__1__Impl : ( '#' ) ;
+    // InternalScope.g:3968:1: rule__ScopeDefinition__Group_2_1__1__Impl : ( '#' ) ;
     public final void rule__ScopeDefinition__Group_2_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3972:1: ( ( '#' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3973:1: ( '#' )
+            // InternalScope.g:3972:1: ( ( '#' ) )
+            // InternalScope.g:3973:1: ( '#' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3973:1: ( '#' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3974:1: '#'
+            // InternalScope.g:3973:1: ( '#' )
+            // InternalScope.g:3974:1: '#'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeDefinitionAccess().getNumberSignKeyword_2_1_1()); 
             }
-            match(input,53,FOLLOW_53_in_rule__ScopeDefinition__Group_2_1__1__Impl8374); if (state.failed) return ;
+            match(input,53,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getScopeDefinitionAccess().getNumberSignKeyword_2_1_1()); 
             }
@@ -12462,16 +12462,16 @@ public final void rule__ScopeDefinition__Group_2_1__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__ScopeDefinition__Group_2_1__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3987:1: rule__ScopeDefinition__Group_2_1__2 : rule__ScopeDefinition__Group_2_1__2__Impl ;
+    // InternalScope.g:3987:1: rule__ScopeDefinition__Group_2_1__2 : rule__ScopeDefinition__Group_2_1__2__Impl ;
     public final void rule__ScopeDefinition__Group_2_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3991:1: ( rule__ScopeDefinition__Group_2_1__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3992:2: rule__ScopeDefinition__Group_2_1__2__Impl
+            // InternalScope.g:3991:1: ( rule__ScopeDefinition__Group_2_1__2__Impl )
+            // InternalScope.g:3992:2: rule__ScopeDefinition__Group_2_1__2__Impl
             {
-            pushFollow(FOLLOW_rule__ScopeDefinition__Group_2_1__2__Impl_in_rule__ScopeDefinition__Group_2_1__28405);
+            pushFollow(FOLLOW_2);
             rule__ScopeDefinition__Group_2_1__2__Impl();
 
             state._fsp--;
@@ -12495,25 +12495,25 @@ public final void rule__ScopeDefinition__Group_2_1__2() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ScopeDefinition__Group_2_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:3998:1: rule__ScopeDefinition__Group_2_1__2__Impl : ( ( rule__ScopeDefinition__ReferenceAssignment_2_1_2 ) ) ;
+    // InternalScope.g:3998:1: rule__ScopeDefinition__Group_2_1__2__Impl : ( ( rule__ScopeDefinition__ReferenceAssignment_2_1_2 ) ) ;
     public final void rule__ScopeDefinition__Group_2_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4002:1: ( ( ( rule__ScopeDefinition__ReferenceAssignment_2_1_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4003:1: ( ( rule__ScopeDefinition__ReferenceAssignment_2_1_2 ) )
+            // InternalScope.g:4002:1: ( ( ( rule__ScopeDefinition__ReferenceAssignment_2_1_2 ) ) )
+            // InternalScope.g:4003:1: ( ( rule__ScopeDefinition__ReferenceAssignment_2_1_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4003:1: ( ( rule__ScopeDefinition__ReferenceAssignment_2_1_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4004:1: ( rule__ScopeDefinition__ReferenceAssignment_2_1_2 )
+            // InternalScope.g:4003:1: ( ( rule__ScopeDefinition__ReferenceAssignment_2_1_2 ) )
+            // InternalScope.g:4004:1: ( rule__ScopeDefinition__ReferenceAssignment_2_1_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeDefinitionAccess().getReferenceAssignment_2_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4005:1: ( rule__ScopeDefinition__ReferenceAssignment_2_1_2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4005:2: rule__ScopeDefinition__ReferenceAssignment_2_1_2
+            // InternalScope.g:4005:1: ( rule__ScopeDefinition__ReferenceAssignment_2_1_2 )
+            // InternalScope.g:4005:2: rule__ScopeDefinition__ReferenceAssignment_2_1_2
             {
-            pushFollow(FOLLOW_rule__ScopeDefinition__ReferenceAssignment_2_1_2_in_rule__ScopeDefinition__Group_2_1__2__Impl8432);
+            pushFollow(FOLLOW_2);
             rule__ScopeDefinition__ReferenceAssignment_2_1_2();
 
             state._fsp--;
@@ -12546,21 +12546,21 @@ public final void rule__ScopeDefinition__Group_2_1__2__Impl() throws Recognition
 
 
     // $ANTLR start "rule__ScopeRule__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4021:1: rule__ScopeRule__Group__0 : rule__ScopeRule__Group__0__Impl rule__ScopeRule__Group__1 ;
+    // InternalScope.g:4021:1: rule__ScopeRule__Group__0 : rule__ScopeRule__Group__0__Impl rule__ScopeRule__Group__1 ;
     public final void rule__ScopeRule__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4025:1: ( rule__ScopeRule__Group__0__Impl rule__ScopeRule__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4026:2: rule__ScopeRule__Group__0__Impl rule__ScopeRule__Group__1
+            // InternalScope.g:4025:1: ( rule__ScopeRule__Group__0__Impl rule__ScopeRule__Group__1 )
+            // InternalScope.g:4026:2: rule__ScopeRule__Group__0__Impl rule__ScopeRule__Group__1
             {
-            pushFollow(FOLLOW_rule__ScopeRule__Group__0__Impl_in_rule__ScopeRule__Group__08468);
+            pushFollow(FOLLOW_25);
             rule__ScopeRule__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ScopeRule__Group__1_in_rule__ScopeRule__Group__08471);
+            pushFollow(FOLLOW_2);
             rule__ScopeRule__Group__1();
 
             state._fsp--;
@@ -12584,22 +12584,22 @@ public final void rule__ScopeRule__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__ScopeRule__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4033:1: rule__ScopeRule__Group__0__Impl : ( 'context' ) ;
+    // InternalScope.g:4033:1: rule__ScopeRule__Group__0__Impl : ( 'context' ) ;
     public final void rule__ScopeRule__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4037:1: ( ( 'context' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4038:1: ( 'context' )
+            // InternalScope.g:4037:1: ( ( 'context' ) )
+            // InternalScope.g:4038:1: ( 'context' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4038:1: ( 'context' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4039:1: 'context'
+            // InternalScope.g:4038:1: ( 'context' )
+            // InternalScope.g:4039:1: 'context'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeRuleAccess().getContextKeyword_0()); 
             }
-            match(input,54,FOLLOW_54_in_rule__ScopeRule__Group__0__Impl8499); if (state.failed) return ;
+            match(input,54,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getScopeRuleAccess().getContextKeyword_0()); 
             }
@@ -12625,21 +12625,21 @@ public final void rule__ScopeRule__Group__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__ScopeRule__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4052:1: rule__ScopeRule__Group__1 : rule__ScopeRule__Group__1__Impl rule__ScopeRule__Group__2 ;
+    // InternalScope.g:4052:1: rule__ScopeRule__Group__1 : rule__ScopeRule__Group__1__Impl rule__ScopeRule__Group__2 ;
     public final void rule__ScopeRule__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4056:1: ( rule__ScopeRule__Group__1__Impl rule__ScopeRule__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4057:2: rule__ScopeRule__Group__1__Impl rule__ScopeRule__Group__2
+            // InternalScope.g:4056:1: ( rule__ScopeRule__Group__1__Impl rule__ScopeRule__Group__2 )
+            // InternalScope.g:4057:2: rule__ScopeRule__Group__1__Impl rule__ScopeRule__Group__2
             {
-            pushFollow(FOLLOW_rule__ScopeRule__Group__1__Impl_in_rule__ScopeRule__Group__18530);
+            pushFollow(FOLLOW_16);
             rule__ScopeRule__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ScopeRule__Group__2_in_rule__ScopeRule__Group__18533);
+            pushFollow(FOLLOW_2);
             rule__ScopeRule__Group__2();
 
             state._fsp--;
@@ -12663,25 +12663,25 @@ public final void rule__ScopeRule__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__ScopeRule__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4064:1: rule__ScopeRule__Group__1__Impl : ( ( rule__ScopeRule__ContextAssignment_1 ) ) ;
+    // InternalScope.g:4064:1: rule__ScopeRule__Group__1__Impl : ( ( rule__ScopeRule__ContextAssignment_1 ) ) ;
     public final void rule__ScopeRule__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4068:1: ( ( ( rule__ScopeRule__ContextAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4069:1: ( ( rule__ScopeRule__ContextAssignment_1 ) )
+            // InternalScope.g:4068:1: ( ( ( rule__ScopeRule__ContextAssignment_1 ) ) )
+            // InternalScope.g:4069:1: ( ( rule__ScopeRule__ContextAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4069:1: ( ( rule__ScopeRule__ContextAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4070:1: ( rule__ScopeRule__ContextAssignment_1 )
+            // InternalScope.g:4069:1: ( ( rule__ScopeRule__ContextAssignment_1 ) )
+            // InternalScope.g:4070:1: ( rule__ScopeRule__ContextAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeRuleAccess().getContextAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4071:1: ( rule__ScopeRule__ContextAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4071:2: rule__ScopeRule__ContextAssignment_1
+            // InternalScope.g:4071:1: ( rule__ScopeRule__ContextAssignment_1 )
+            // InternalScope.g:4071:2: rule__ScopeRule__ContextAssignment_1
             {
-            pushFollow(FOLLOW_rule__ScopeRule__ContextAssignment_1_in_rule__ScopeRule__Group__1__Impl8560);
+            pushFollow(FOLLOW_2);
             rule__ScopeRule__ContextAssignment_1();
 
             state._fsp--;
@@ -12714,21 +12714,21 @@ public final void rule__ScopeRule__Group__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__ScopeRule__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4081:1: rule__ScopeRule__Group__2 : rule__ScopeRule__Group__2__Impl rule__ScopeRule__Group__3 ;
+    // InternalScope.g:4081:1: rule__ScopeRule__Group__2 : rule__ScopeRule__Group__2__Impl rule__ScopeRule__Group__3 ;
     public final void rule__ScopeRule__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4085:1: ( rule__ScopeRule__Group__2__Impl rule__ScopeRule__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4086:2: rule__ScopeRule__Group__2__Impl rule__ScopeRule__Group__3
+            // InternalScope.g:4085:1: ( rule__ScopeRule__Group__2__Impl rule__ScopeRule__Group__3 )
+            // InternalScope.g:4086:2: rule__ScopeRule__Group__2__Impl rule__ScopeRule__Group__3
             {
-            pushFollow(FOLLOW_rule__ScopeRule__Group__2__Impl_in_rule__ScopeRule__Group__28590);
+            pushFollow(FOLLOW_26);
             rule__ScopeRule__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ScopeRule__Group__3_in_rule__ScopeRule__Group__28593);
+            pushFollow(FOLLOW_2);
             rule__ScopeRule__Group__3();
 
             state._fsp--;
@@ -12752,22 +12752,22 @@ public final void rule__ScopeRule__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__ScopeRule__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4093:1: rule__ScopeRule__Group__2__Impl : ( '=' ) ;
+    // InternalScope.g:4093:1: rule__ScopeRule__Group__2__Impl : ( '=' ) ;
     public final void rule__ScopeRule__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4097:1: ( ( '=' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4098:1: ( '=' )
+            // InternalScope.g:4097:1: ( ( '=' ) )
+            // InternalScope.g:4098:1: ( '=' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4098:1: ( '=' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4099:1: '='
+            // InternalScope.g:4098:1: ( '=' )
+            // InternalScope.g:4099:1: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeRuleAccess().getEqualsSignKeyword_2()); 
             }
-            match(input,48,FOLLOW_48_in_rule__ScopeRule__Group__2__Impl8621); if (state.failed) return ;
+            match(input,48,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getScopeRuleAccess().getEqualsSignKeyword_2()); 
             }
@@ -12793,21 +12793,21 @@ public final void rule__ScopeRule__Group__2__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__ScopeRule__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4112:1: rule__ScopeRule__Group__3 : rule__ScopeRule__Group__3__Impl rule__ScopeRule__Group__4 ;
+    // InternalScope.g:4112:1: rule__ScopeRule__Group__3 : rule__ScopeRule__Group__3__Impl rule__ScopeRule__Group__4 ;
     public final void rule__ScopeRule__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4116:1: ( rule__ScopeRule__Group__3__Impl rule__ScopeRule__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4117:2: rule__ScopeRule__Group__3__Impl rule__ScopeRule__Group__4
+            // InternalScope.g:4116:1: ( rule__ScopeRule__Group__3__Impl rule__ScopeRule__Group__4 )
+            // InternalScope.g:4117:2: rule__ScopeRule__Group__3__Impl rule__ScopeRule__Group__4
             {
-            pushFollow(FOLLOW_rule__ScopeRule__Group__3__Impl_in_rule__ScopeRule__Group__38652);
+            pushFollow(FOLLOW_27);
             rule__ScopeRule__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ScopeRule__Group__4_in_rule__ScopeRule__Group__38655);
+            pushFollow(FOLLOW_2);
             rule__ScopeRule__Group__4();
 
             state._fsp--;
@@ -12831,25 +12831,25 @@ public final void rule__ScopeRule__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__ScopeRule__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4124:1: rule__ScopeRule__Group__3__Impl : ( ( rule__ScopeRule__ExprsAssignment_3 ) ) ;
+    // InternalScope.g:4124:1: rule__ScopeRule__Group__3__Impl : ( ( rule__ScopeRule__ExprsAssignment_3 ) ) ;
     public final void rule__ScopeRule__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4128:1: ( ( ( rule__ScopeRule__ExprsAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4129:1: ( ( rule__ScopeRule__ExprsAssignment_3 ) )
+            // InternalScope.g:4128:1: ( ( ( rule__ScopeRule__ExprsAssignment_3 ) ) )
+            // InternalScope.g:4129:1: ( ( rule__ScopeRule__ExprsAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4129:1: ( ( rule__ScopeRule__ExprsAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4130:1: ( rule__ScopeRule__ExprsAssignment_3 )
+            // InternalScope.g:4129:1: ( ( rule__ScopeRule__ExprsAssignment_3 ) )
+            // InternalScope.g:4130:1: ( rule__ScopeRule__ExprsAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeRuleAccess().getExprsAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4131:1: ( rule__ScopeRule__ExprsAssignment_3 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4131:2: rule__ScopeRule__ExprsAssignment_3
+            // InternalScope.g:4131:1: ( rule__ScopeRule__ExprsAssignment_3 )
+            // InternalScope.g:4131:2: rule__ScopeRule__ExprsAssignment_3
             {
-            pushFollow(FOLLOW_rule__ScopeRule__ExprsAssignment_3_in_rule__ScopeRule__Group__3__Impl8682);
+            pushFollow(FOLLOW_2);
             rule__ScopeRule__ExprsAssignment_3();
 
             state._fsp--;
@@ -12882,21 +12882,21 @@ public final void rule__ScopeRule__Group__3__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__ScopeRule__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4141:1: rule__ScopeRule__Group__4 : rule__ScopeRule__Group__4__Impl rule__ScopeRule__Group__5 ;
+    // InternalScope.g:4141:1: rule__ScopeRule__Group__4 : rule__ScopeRule__Group__4__Impl rule__ScopeRule__Group__5 ;
     public final void rule__ScopeRule__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4145:1: ( rule__ScopeRule__Group__4__Impl rule__ScopeRule__Group__5 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4146:2: rule__ScopeRule__Group__4__Impl rule__ScopeRule__Group__5
+            // InternalScope.g:4145:1: ( rule__ScopeRule__Group__4__Impl rule__ScopeRule__Group__5 )
+            // InternalScope.g:4146:2: rule__ScopeRule__Group__4__Impl rule__ScopeRule__Group__5
             {
-            pushFollow(FOLLOW_rule__ScopeRule__Group__4__Impl_in_rule__ScopeRule__Group__48712);
+            pushFollow(FOLLOW_27);
             rule__ScopeRule__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ScopeRule__Group__5_in_rule__ScopeRule__Group__48715);
+            pushFollow(FOLLOW_2);
             rule__ScopeRule__Group__5();
 
             state._fsp--;
@@ -12920,22 +12920,22 @@ public final void rule__ScopeRule__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__ScopeRule__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4153:1: rule__ScopeRule__Group__4__Impl : ( ( rule__ScopeRule__Group_4__0 )* ) ;
+    // InternalScope.g:4153:1: rule__ScopeRule__Group__4__Impl : ( ( rule__ScopeRule__Group_4__0 )* ) ;
     public final void rule__ScopeRule__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4157:1: ( ( ( rule__ScopeRule__Group_4__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4158:1: ( ( rule__ScopeRule__Group_4__0 )* )
+            // InternalScope.g:4157:1: ( ( ( rule__ScopeRule__Group_4__0 )* ) )
+            // InternalScope.g:4158:1: ( ( rule__ScopeRule__Group_4__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4158:1: ( ( rule__ScopeRule__Group_4__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4159:1: ( rule__ScopeRule__Group_4__0 )*
+            // InternalScope.g:4158:1: ( ( rule__ScopeRule__Group_4__0 )* )
+            // InternalScope.g:4159:1: ( rule__ScopeRule__Group_4__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeRuleAccess().getGroup_4()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4160:1: ( rule__ScopeRule__Group_4__0 )*
+            // InternalScope.g:4160:1: ( rule__ScopeRule__Group_4__0 )*
             loop39:
             do {
                 int alt39=2;
@@ -12948,9 +12948,9 @@ public final void rule__ScopeRule__Group__4__Impl() throws RecognitionException
 
                 switch (alt39) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4160:2: rule__ScopeRule__Group_4__0
+            	    // InternalScope.g:4160:2: rule__ScopeRule__Group_4__0
             	    {
-            	    pushFollow(FOLLOW_rule__ScopeRule__Group_4__0_in_rule__ScopeRule__Group__4__Impl8742);
+            	    pushFollow(FOLLOW_28);
             	    rule__ScopeRule__Group_4__0();
 
             	    state._fsp--;
@@ -12989,16 +12989,16 @@ public final void rule__ScopeRule__Group__4__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__ScopeRule__Group__5"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4170:1: rule__ScopeRule__Group__5 : rule__ScopeRule__Group__5__Impl ;
+    // InternalScope.g:4170:1: rule__ScopeRule__Group__5 : rule__ScopeRule__Group__5__Impl ;
     public final void rule__ScopeRule__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4174:1: ( rule__ScopeRule__Group__5__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4175:2: rule__ScopeRule__Group__5__Impl
+            // InternalScope.g:4174:1: ( rule__ScopeRule__Group__5__Impl )
+            // InternalScope.g:4175:2: rule__ScopeRule__Group__5__Impl
             {
-            pushFollow(FOLLOW_rule__ScopeRule__Group__5__Impl_in_rule__ScopeRule__Group__58773);
+            pushFollow(FOLLOW_2);
             rule__ScopeRule__Group__5__Impl();
 
             state._fsp--;
@@ -13022,22 +13022,22 @@ public final void rule__ScopeRule__Group__5() throws RecognitionException {
 
 
     // $ANTLR start "rule__ScopeRule__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4181:1: rule__ScopeRule__Group__5__Impl : ( ';' ) ;
+    // InternalScope.g:4181:1: rule__ScopeRule__Group__5__Impl : ( ';' ) ;
     public final void rule__ScopeRule__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4185:1: ( ( ';' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4186:1: ( ';' )
+            // InternalScope.g:4185:1: ( ( ';' ) )
+            // InternalScope.g:4186:1: ( ';' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4186:1: ( ';' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4187:1: ';'
+            // InternalScope.g:4186:1: ( ';' )
+            // InternalScope.g:4187:1: ';'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeRuleAccess().getSemicolonKeyword_5()); 
             }
-            match(input,49,FOLLOW_49_in_rule__ScopeRule__Group__5__Impl8801); if (state.failed) return ;
+            match(input,49,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getScopeRuleAccess().getSemicolonKeyword_5()); 
             }
@@ -13063,21 +13063,21 @@ public final void rule__ScopeRule__Group__5__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__ScopeRule__Group_4__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4212:1: rule__ScopeRule__Group_4__0 : rule__ScopeRule__Group_4__0__Impl rule__ScopeRule__Group_4__1 ;
+    // InternalScope.g:4212:1: rule__ScopeRule__Group_4__0 : rule__ScopeRule__Group_4__0__Impl rule__ScopeRule__Group_4__1 ;
     public final void rule__ScopeRule__Group_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4216:1: ( rule__ScopeRule__Group_4__0__Impl rule__ScopeRule__Group_4__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4217:2: rule__ScopeRule__Group_4__0__Impl rule__ScopeRule__Group_4__1
+            // InternalScope.g:4216:1: ( rule__ScopeRule__Group_4__0__Impl rule__ScopeRule__Group_4__1 )
+            // InternalScope.g:4217:2: rule__ScopeRule__Group_4__0__Impl rule__ScopeRule__Group_4__1
             {
-            pushFollow(FOLLOW_rule__ScopeRule__Group_4__0__Impl_in_rule__ScopeRule__Group_4__08844);
+            pushFollow(FOLLOW_26);
             rule__ScopeRule__Group_4__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ScopeRule__Group_4__1_in_rule__ScopeRule__Group_4__08847);
+            pushFollow(FOLLOW_2);
             rule__ScopeRule__Group_4__1();
 
             state._fsp--;
@@ -13101,22 +13101,22 @@ public final void rule__ScopeRule__Group_4__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__ScopeRule__Group_4__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4224:1: rule__ScopeRule__Group_4__0__Impl : ( '>>' ) ;
+    // InternalScope.g:4224:1: rule__ScopeRule__Group_4__0__Impl : ( '>>' ) ;
     public final void rule__ScopeRule__Group_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4228:1: ( ( '>>' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4229:1: ( '>>' )
+            // InternalScope.g:4228:1: ( ( '>>' ) )
+            // InternalScope.g:4229:1: ( '>>' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4229:1: ( '>>' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4230:1: '>>'
+            // InternalScope.g:4229:1: ( '>>' )
+            // InternalScope.g:4230:1: '>>'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeRuleAccess().getGreaterThanSignGreaterThanSignKeyword_4_0()); 
             }
-            match(input,55,FOLLOW_55_in_rule__ScopeRule__Group_4__0__Impl8875); if (state.failed) return ;
+            match(input,55,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getScopeRuleAccess().getGreaterThanSignGreaterThanSignKeyword_4_0()); 
             }
@@ -13142,16 +13142,16 @@ public final void rule__ScopeRule__Group_4__0__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ScopeRule__Group_4__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4243:1: rule__ScopeRule__Group_4__1 : rule__ScopeRule__Group_4__1__Impl ;
+    // InternalScope.g:4243:1: rule__ScopeRule__Group_4__1 : rule__ScopeRule__Group_4__1__Impl ;
     public final void rule__ScopeRule__Group_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4247:1: ( rule__ScopeRule__Group_4__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4248:2: rule__ScopeRule__Group_4__1__Impl
+            // InternalScope.g:4247:1: ( rule__ScopeRule__Group_4__1__Impl )
+            // InternalScope.g:4248:2: rule__ScopeRule__Group_4__1__Impl
             {
-            pushFollow(FOLLOW_rule__ScopeRule__Group_4__1__Impl_in_rule__ScopeRule__Group_4__18906);
+            pushFollow(FOLLOW_2);
             rule__ScopeRule__Group_4__1__Impl();
 
             state._fsp--;
@@ -13175,25 +13175,25 @@ public final void rule__ScopeRule__Group_4__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__ScopeRule__Group_4__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4254:1: rule__ScopeRule__Group_4__1__Impl : ( ( rule__ScopeRule__ExprsAssignment_4_1 ) ) ;
+    // InternalScope.g:4254:1: rule__ScopeRule__Group_4__1__Impl : ( ( rule__ScopeRule__ExprsAssignment_4_1 ) ) ;
     public final void rule__ScopeRule__Group_4__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4258:1: ( ( ( rule__ScopeRule__ExprsAssignment_4_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4259:1: ( ( rule__ScopeRule__ExprsAssignment_4_1 ) )
+            // InternalScope.g:4258:1: ( ( ( rule__ScopeRule__ExprsAssignment_4_1 ) ) )
+            // InternalScope.g:4259:1: ( ( rule__ScopeRule__ExprsAssignment_4_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4259:1: ( ( rule__ScopeRule__ExprsAssignment_4_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4260:1: ( rule__ScopeRule__ExprsAssignment_4_1 )
+            // InternalScope.g:4259:1: ( ( rule__ScopeRule__ExprsAssignment_4_1 ) )
+            // InternalScope.g:4260:1: ( rule__ScopeRule__ExprsAssignment_4_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeRuleAccess().getExprsAssignment_4_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4261:1: ( rule__ScopeRule__ExprsAssignment_4_1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4261:2: rule__ScopeRule__ExprsAssignment_4_1
+            // InternalScope.g:4261:1: ( rule__ScopeRule__ExprsAssignment_4_1 )
+            // InternalScope.g:4261:2: rule__ScopeRule__ExprsAssignment_4_1
             {
-            pushFollow(FOLLOW_rule__ScopeRule__ExprsAssignment_4_1_in_rule__ScopeRule__Group_4__1__Impl8933);
+            pushFollow(FOLLOW_2);
             rule__ScopeRule__ExprsAssignment_4_1();
 
             state._fsp--;
@@ -13226,21 +13226,21 @@ public final void rule__ScopeRule__Group_4__1__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ScopeContext__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4275:1: rule__ScopeContext__Group__0 : rule__ScopeContext__Group__0__Impl rule__ScopeContext__Group__1 ;
+    // InternalScope.g:4275:1: rule__ScopeContext__Group__0 : rule__ScopeContext__Group__0__Impl rule__ScopeContext__Group__1 ;
     public final void rule__ScopeContext__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4279:1: ( rule__ScopeContext__Group__0__Impl rule__ScopeContext__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4280:2: rule__ScopeContext__Group__0__Impl rule__ScopeContext__Group__1
+            // InternalScope.g:4279:1: ( rule__ScopeContext__Group__0__Impl rule__ScopeContext__Group__1 )
+            // InternalScope.g:4280:2: rule__ScopeContext__Group__0__Impl rule__ScopeContext__Group__1
             {
-            pushFollow(FOLLOW_rule__ScopeContext__Group__0__Impl_in_rule__ScopeContext__Group__08967);
+            pushFollow(FOLLOW_29);
             rule__ScopeContext__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ScopeContext__Group__1_in_rule__ScopeContext__Group__08970);
+            pushFollow(FOLLOW_2);
             rule__ScopeContext__Group__1();
 
             state._fsp--;
@@ -13264,25 +13264,25 @@ public final void rule__ScopeContext__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__ScopeContext__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4287:1: rule__ScopeContext__Group__0__Impl : ( ( rule__ScopeContext__Alternatives_0 ) ) ;
+    // InternalScope.g:4287:1: rule__ScopeContext__Group__0__Impl : ( ( rule__ScopeContext__Alternatives_0 ) ) ;
     public final void rule__ScopeContext__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4291:1: ( ( ( rule__ScopeContext__Alternatives_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4292:1: ( ( rule__ScopeContext__Alternatives_0 ) )
+            // InternalScope.g:4291:1: ( ( ( rule__ScopeContext__Alternatives_0 ) ) )
+            // InternalScope.g:4292:1: ( ( rule__ScopeContext__Alternatives_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4292:1: ( ( rule__ScopeContext__Alternatives_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4293:1: ( rule__ScopeContext__Alternatives_0 )
+            // InternalScope.g:4292:1: ( ( rule__ScopeContext__Alternatives_0 ) )
+            // InternalScope.g:4293:1: ( rule__ScopeContext__Alternatives_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeContextAccess().getAlternatives_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4294:1: ( rule__ScopeContext__Alternatives_0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4294:2: rule__ScopeContext__Alternatives_0
+            // InternalScope.g:4294:1: ( rule__ScopeContext__Alternatives_0 )
+            // InternalScope.g:4294:2: rule__ScopeContext__Alternatives_0
             {
-            pushFollow(FOLLOW_rule__ScopeContext__Alternatives_0_in_rule__ScopeContext__Group__0__Impl8997);
+            pushFollow(FOLLOW_2);
             rule__ScopeContext__Alternatives_0();
 
             state._fsp--;
@@ -13315,16 +13315,16 @@ public final void rule__ScopeContext__Group__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__ScopeContext__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4304:1: rule__ScopeContext__Group__1 : rule__ScopeContext__Group__1__Impl ;
+    // InternalScope.g:4304:1: rule__ScopeContext__Group__1 : rule__ScopeContext__Group__1__Impl ;
     public final void rule__ScopeContext__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4308:1: ( rule__ScopeContext__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4309:2: rule__ScopeContext__Group__1__Impl
+            // InternalScope.g:4308:1: ( rule__ScopeContext__Group__1__Impl )
+            // InternalScope.g:4309:2: rule__ScopeContext__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__ScopeContext__Group__1__Impl_in_rule__ScopeContext__Group__19027);
+            pushFollow(FOLLOW_2);
             rule__ScopeContext__Group__1__Impl();
 
             state._fsp--;
@@ -13348,22 +13348,22 @@ public final void rule__ScopeContext__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__ScopeContext__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4315:1: rule__ScopeContext__Group__1__Impl : ( ( rule__ScopeContext__Group_1__0 )? ) ;
+    // InternalScope.g:4315:1: rule__ScopeContext__Group__1__Impl : ( ( rule__ScopeContext__Group_1__0 )? ) ;
     public final void rule__ScopeContext__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4319:1: ( ( ( rule__ScopeContext__Group_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4320:1: ( ( rule__ScopeContext__Group_1__0 )? )
+            // InternalScope.g:4319:1: ( ( ( rule__ScopeContext__Group_1__0 )? ) )
+            // InternalScope.g:4320:1: ( ( rule__ScopeContext__Group_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4320:1: ( ( rule__ScopeContext__Group_1__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4321:1: ( rule__ScopeContext__Group_1__0 )?
+            // InternalScope.g:4320:1: ( ( rule__ScopeContext__Group_1__0 )? )
+            // InternalScope.g:4321:1: ( rule__ScopeContext__Group_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeContextAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4322:1: ( rule__ScopeContext__Group_1__0 )?
+            // InternalScope.g:4322:1: ( rule__ScopeContext__Group_1__0 )?
             int alt40=2;
             int LA40_0 = input.LA(1);
 
@@ -13372,9 +13372,9 @@ public final void rule__ScopeContext__Group__1__Impl() throws RecognitionExcepti
             }
             switch (alt40) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4322:2: rule__ScopeContext__Group_1__0
+                    // InternalScope.g:4322:2: rule__ScopeContext__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__ScopeContext__Group_1__0_in_rule__ScopeContext__Group__1__Impl9054);
+                    pushFollow(FOLLOW_2);
                     rule__ScopeContext__Group_1__0();
 
                     state._fsp--;
@@ -13410,21 +13410,21 @@ public final void rule__ScopeContext__Group__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__ScopeContext__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4336:1: rule__ScopeContext__Group_1__0 : rule__ScopeContext__Group_1__0__Impl rule__ScopeContext__Group_1__1 ;
+    // InternalScope.g:4336:1: rule__ScopeContext__Group_1__0 : rule__ScopeContext__Group_1__0__Impl rule__ScopeContext__Group_1__1 ;
     public final void rule__ScopeContext__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4340:1: ( rule__ScopeContext__Group_1__0__Impl rule__ScopeContext__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4341:2: rule__ScopeContext__Group_1__0__Impl rule__ScopeContext__Group_1__1
+            // InternalScope.g:4340:1: ( rule__ScopeContext__Group_1__0__Impl rule__ScopeContext__Group_1__1 )
+            // InternalScope.g:4341:2: rule__ScopeContext__Group_1__0__Impl rule__ScopeContext__Group_1__1
             {
-            pushFollow(FOLLOW_rule__ScopeContext__Group_1__0__Impl_in_rule__ScopeContext__Group_1__09089);
+            pushFollow(FOLLOW_17);
             rule__ScopeContext__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ScopeContext__Group_1__1_in_rule__ScopeContext__Group_1__09092);
+            pushFollow(FOLLOW_2);
             rule__ScopeContext__Group_1__1();
 
             state._fsp--;
@@ -13448,22 +13448,22 @@ public final void rule__ScopeContext__Group_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__ScopeContext__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4348:1: rule__ScopeContext__Group_1__0__Impl : ( '[' ) ;
+    // InternalScope.g:4348:1: rule__ScopeContext__Group_1__0__Impl : ( '[' ) ;
     public final void rule__ScopeContext__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4352:1: ( ( '[' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4353:1: ( '[' )
+            // InternalScope.g:4352:1: ( ( '[' ) )
+            // InternalScope.g:4353:1: ( '[' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4353:1: ( '[' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4354:1: '['
+            // InternalScope.g:4353:1: ( '[' )
+            // InternalScope.g:4354:1: '['
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeContextAccess().getLeftSquareBracketKeyword_1_0()); 
             }
-            match(input,56,FOLLOW_56_in_rule__ScopeContext__Group_1__0__Impl9120); if (state.failed) return ;
+            match(input,56,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getScopeContextAccess().getLeftSquareBracketKeyword_1_0()); 
             }
@@ -13489,21 +13489,21 @@ public final void rule__ScopeContext__Group_1__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__ScopeContext__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4367:1: rule__ScopeContext__Group_1__1 : rule__ScopeContext__Group_1__1__Impl rule__ScopeContext__Group_1__2 ;
+    // InternalScope.g:4367:1: rule__ScopeContext__Group_1__1 : rule__ScopeContext__Group_1__1__Impl rule__ScopeContext__Group_1__2 ;
     public final void rule__ScopeContext__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4371:1: ( rule__ScopeContext__Group_1__1__Impl rule__ScopeContext__Group_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4372:2: rule__ScopeContext__Group_1__1__Impl rule__ScopeContext__Group_1__2
+            // InternalScope.g:4371:1: ( rule__ScopeContext__Group_1__1__Impl rule__ScopeContext__Group_1__2 )
+            // InternalScope.g:4372:2: rule__ScopeContext__Group_1__1__Impl rule__ScopeContext__Group_1__2
             {
-            pushFollow(FOLLOW_rule__ScopeContext__Group_1__1__Impl_in_rule__ScopeContext__Group_1__19151);
+            pushFollow(FOLLOW_30);
             rule__ScopeContext__Group_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ScopeContext__Group_1__2_in_rule__ScopeContext__Group_1__19154);
+            pushFollow(FOLLOW_2);
             rule__ScopeContext__Group_1__2();
 
             state._fsp--;
@@ -13527,25 +13527,25 @@ public final void rule__ScopeContext__Group_1__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__ScopeContext__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4379:1: rule__ScopeContext__Group_1__1__Impl : ( ( rule__ScopeContext__GuardAssignment_1_1 ) ) ;
+    // InternalScope.g:4379:1: rule__ScopeContext__Group_1__1__Impl : ( ( rule__ScopeContext__GuardAssignment_1_1 ) ) ;
     public final void rule__ScopeContext__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4383:1: ( ( ( rule__ScopeContext__GuardAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4384:1: ( ( rule__ScopeContext__GuardAssignment_1_1 ) )
+            // InternalScope.g:4383:1: ( ( ( rule__ScopeContext__GuardAssignment_1_1 ) ) )
+            // InternalScope.g:4384:1: ( ( rule__ScopeContext__GuardAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4384:1: ( ( rule__ScopeContext__GuardAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4385:1: ( rule__ScopeContext__GuardAssignment_1_1 )
+            // InternalScope.g:4384:1: ( ( rule__ScopeContext__GuardAssignment_1_1 ) )
+            // InternalScope.g:4385:1: ( rule__ScopeContext__GuardAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeContextAccess().getGuardAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4386:1: ( rule__ScopeContext__GuardAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4386:2: rule__ScopeContext__GuardAssignment_1_1
+            // InternalScope.g:4386:1: ( rule__ScopeContext__GuardAssignment_1_1 )
+            // InternalScope.g:4386:2: rule__ScopeContext__GuardAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__ScopeContext__GuardAssignment_1_1_in_rule__ScopeContext__Group_1__1__Impl9181);
+            pushFollow(FOLLOW_2);
             rule__ScopeContext__GuardAssignment_1_1();
 
             state._fsp--;
@@ -13578,16 +13578,16 @@ public final void rule__ScopeContext__Group_1__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__ScopeContext__Group_1__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4396:1: rule__ScopeContext__Group_1__2 : rule__ScopeContext__Group_1__2__Impl ;
+    // InternalScope.g:4396:1: rule__ScopeContext__Group_1__2 : rule__ScopeContext__Group_1__2__Impl ;
     public final void rule__ScopeContext__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4400:1: ( rule__ScopeContext__Group_1__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4401:2: rule__ScopeContext__Group_1__2__Impl
+            // InternalScope.g:4400:1: ( rule__ScopeContext__Group_1__2__Impl )
+            // InternalScope.g:4401:2: rule__ScopeContext__Group_1__2__Impl
             {
-            pushFollow(FOLLOW_rule__ScopeContext__Group_1__2__Impl_in_rule__ScopeContext__Group_1__29211);
+            pushFollow(FOLLOW_2);
             rule__ScopeContext__Group_1__2__Impl();
 
             state._fsp--;
@@ -13611,22 +13611,22 @@ public final void rule__ScopeContext__Group_1__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__ScopeContext__Group_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4407:1: rule__ScopeContext__Group_1__2__Impl : ( ']' ) ;
+    // InternalScope.g:4407:1: rule__ScopeContext__Group_1__2__Impl : ( ']' ) ;
     public final void rule__ScopeContext__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4411:1: ( ( ']' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4412:1: ( ']' )
+            // InternalScope.g:4411:1: ( ( ']' ) )
+            // InternalScope.g:4412:1: ( ']' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4412:1: ( ']' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4413:1: ']'
+            // InternalScope.g:4412:1: ( ']' )
+            // InternalScope.g:4413:1: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeContextAccess().getRightSquareBracketKeyword_1_2()); 
             }
-            match(input,57,FOLLOW_57_in_rule__ScopeContext__Group_1__2__Impl9239); if (state.failed) return ;
+            match(input,57,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getScopeContextAccess().getRightSquareBracketKeyword_1_2()); 
             }
@@ -13652,21 +13652,21 @@ public final void rule__ScopeContext__Group_1__2__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__ScopeExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4432:1: rule__ScopeExpression__Group__0 : rule__ScopeExpression__Group__0__Impl rule__ScopeExpression__Group__1 ;
+    // InternalScope.g:4432:1: rule__ScopeExpression__Group__0 : rule__ScopeExpression__Group__0__Impl rule__ScopeExpression__Group__1 ;
     public final void rule__ScopeExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4436:1: ( rule__ScopeExpression__Group__0__Impl rule__ScopeExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4437:2: rule__ScopeExpression__Group__0__Impl rule__ScopeExpression__Group__1
+            // InternalScope.g:4436:1: ( rule__ScopeExpression__Group__0__Impl rule__ScopeExpression__Group__1 )
+            // InternalScope.g:4437:2: rule__ScopeExpression__Group__0__Impl rule__ScopeExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__ScopeExpression__Group__0__Impl_in_rule__ScopeExpression__Group__09276);
+            pushFollow(FOLLOW_31);
             rule__ScopeExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ScopeExpression__Group__1_in_rule__ScopeExpression__Group__09279);
+            pushFollow(FOLLOW_2);
             rule__ScopeExpression__Group__1();
 
             state._fsp--;
@@ -13690,25 +13690,25 @@ public final void rule__ScopeExpression__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__ScopeExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4444:1: rule__ScopeExpression__Group__0__Impl : ( ( rule__ScopeExpression__Alternatives_0 ) ) ;
+    // InternalScope.g:4444:1: rule__ScopeExpression__Group__0__Impl : ( ( rule__ScopeExpression__Alternatives_0 ) ) ;
     public final void rule__ScopeExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4448:1: ( ( ( rule__ScopeExpression__Alternatives_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4449:1: ( ( rule__ScopeExpression__Alternatives_0 ) )
+            // InternalScope.g:4448:1: ( ( ( rule__ScopeExpression__Alternatives_0 ) ) )
+            // InternalScope.g:4449:1: ( ( rule__ScopeExpression__Alternatives_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4449:1: ( ( rule__ScopeExpression__Alternatives_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4450:1: ( rule__ScopeExpression__Alternatives_0 )
+            // InternalScope.g:4449:1: ( ( rule__ScopeExpression__Alternatives_0 ) )
+            // InternalScope.g:4450:1: ( rule__ScopeExpression__Alternatives_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeExpressionAccess().getAlternatives_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4451:1: ( rule__ScopeExpression__Alternatives_0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4451:2: rule__ScopeExpression__Alternatives_0
+            // InternalScope.g:4451:1: ( rule__ScopeExpression__Alternatives_0 )
+            // InternalScope.g:4451:2: rule__ScopeExpression__Alternatives_0
             {
-            pushFollow(FOLLOW_rule__ScopeExpression__Alternatives_0_in_rule__ScopeExpression__Group__0__Impl9306);
+            pushFollow(FOLLOW_2);
             rule__ScopeExpression__Alternatives_0();
 
             state._fsp--;
@@ -13741,16 +13741,16 @@ public final void rule__ScopeExpression__Group__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__ScopeExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4461:1: rule__ScopeExpression__Group__1 : rule__ScopeExpression__Group__1__Impl ;
+    // InternalScope.g:4461:1: rule__ScopeExpression__Group__1 : rule__ScopeExpression__Group__1__Impl ;
     public final void rule__ScopeExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4465:1: ( rule__ScopeExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4466:2: rule__ScopeExpression__Group__1__Impl
+            // InternalScope.g:4465:1: ( rule__ScopeExpression__Group__1__Impl )
+            // InternalScope.g:4466:2: rule__ScopeExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__ScopeExpression__Group__1__Impl_in_rule__ScopeExpression__Group__19336);
+            pushFollow(FOLLOW_2);
             rule__ScopeExpression__Group__1__Impl();
 
             state._fsp--;
@@ -13774,22 +13774,22 @@ public final void rule__ScopeExpression__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__ScopeExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4472:1: rule__ScopeExpression__Group__1__Impl : ( ( rule__ScopeExpression__Group_1__0 )? ) ;
+    // InternalScope.g:4472:1: rule__ScopeExpression__Group__1__Impl : ( ( rule__ScopeExpression__Group_1__0 )? ) ;
     public final void rule__ScopeExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4476:1: ( ( ( rule__ScopeExpression__Group_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4477:1: ( ( rule__ScopeExpression__Group_1__0 )? )
+            // InternalScope.g:4476:1: ( ( ( rule__ScopeExpression__Group_1__0 )? ) )
+            // InternalScope.g:4477:1: ( ( rule__ScopeExpression__Group_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4477:1: ( ( rule__ScopeExpression__Group_1__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4478:1: ( rule__ScopeExpression__Group_1__0 )?
+            // InternalScope.g:4477:1: ( ( rule__ScopeExpression__Group_1__0 )? )
+            // InternalScope.g:4478:1: ( rule__ScopeExpression__Group_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4479:1: ( rule__ScopeExpression__Group_1__0 )?
+            // InternalScope.g:4479:1: ( rule__ScopeExpression__Group_1__0 )?
             int alt41=2;
             int LA41_0 = input.LA(1);
 
@@ -13798,9 +13798,9 @@ public final void rule__ScopeExpression__Group__1__Impl() throws RecognitionExce
             }
             switch (alt41) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4479:2: rule__ScopeExpression__Group_1__0
+                    // InternalScope.g:4479:2: rule__ScopeExpression__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__ScopeExpression__Group_1__0_in_rule__ScopeExpression__Group__1__Impl9363);
+                    pushFollow(FOLLOW_2);
                     rule__ScopeExpression__Group_1__0();
 
                     state._fsp--;
@@ -13836,21 +13836,21 @@ public final void rule__ScopeExpression__Group__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__ScopeExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4493:1: rule__ScopeExpression__Group_1__0 : rule__ScopeExpression__Group_1__0__Impl rule__ScopeExpression__Group_1__1 ;
+    // InternalScope.g:4493:1: rule__ScopeExpression__Group_1__0 : rule__ScopeExpression__Group_1__0__Impl rule__ScopeExpression__Group_1__1 ;
     public final void rule__ScopeExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4497:1: ( rule__ScopeExpression__Group_1__0__Impl rule__ScopeExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4498:2: rule__ScopeExpression__Group_1__0__Impl rule__ScopeExpression__Group_1__1
+            // InternalScope.g:4497:1: ( rule__ScopeExpression__Group_1__0__Impl rule__ScopeExpression__Group_1__1 )
+            // InternalScope.g:4498:2: rule__ScopeExpression__Group_1__0__Impl rule__ScopeExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__ScopeExpression__Group_1__0__Impl_in_rule__ScopeExpression__Group_1__09398);
+            pushFollow(FOLLOW_17);
             rule__ScopeExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ScopeExpression__Group_1__1_in_rule__ScopeExpression__Group_1__09401);
+            pushFollow(FOLLOW_2);
             rule__ScopeExpression__Group_1__1();
 
             state._fsp--;
@@ -13874,22 +13874,22 @@ public final void rule__ScopeExpression__Group_1__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ScopeExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4505:1: rule__ScopeExpression__Group_1__0__Impl : ( '|' ) ;
+    // InternalScope.g:4505:1: rule__ScopeExpression__Group_1__0__Impl : ( '|' ) ;
     public final void rule__ScopeExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4509:1: ( ( '|' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4510:1: ( '|' )
+            // InternalScope.g:4509:1: ( ( '|' ) )
+            // InternalScope.g:4510:1: ( '|' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4510:1: ( '|' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4511:1: '|'
+            // InternalScope.g:4510:1: ( '|' )
+            // InternalScope.g:4511:1: '|'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeExpressionAccess().getVerticalLineKeyword_1_0()); 
             }
-            match(input,58,FOLLOW_58_in_rule__ScopeExpression__Group_1__0__Impl9429); if (state.failed) return ;
+            match(input,58,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getScopeExpressionAccess().getVerticalLineKeyword_1_0()); 
             }
@@ -13915,16 +13915,16 @@ public final void rule__ScopeExpression__Group_1__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__ScopeExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4524:1: rule__ScopeExpression__Group_1__1 : rule__ScopeExpression__Group_1__1__Impl ;
+    // InternalScope.g:4524:1: rule__ScopeExpression__Group_1__1 : rule__ScopeExpression__Group_1__1__Impl ;
     public final void rule__ScopeExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4528:1: ( rule__ScopeExpression__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4529:2: rule__ScopeExpression__Group_1__1__Impl
+            // InternalScope.g:4528:1: ( rule__ScopeExpression__Group_1__1__Impl )
+            // InternalScope.g:4529:2: rule__ScopeExpression__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__ScopeExpression__Group_1__1__Impl_in_rule__ScopeExpression__Group_1__19460);
+            pushFollow(FOLLOW_2);
             rule__ScopeExpression__Group_1__1__Impl();
 
             state._fsp--;
@@ -13948,25 +13948,25 @@ public final void rule__ScopeExpression__Group_1__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ScopeExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4535:1: rule__ScopeExpression__Group_1__1__Impl : ( ( rule__ScopeExpression__PruneAssignment_1_1 ) ) ;
+    // InternalScope.g:4535:1: rule__ScopeExpression__Group_1__1__Impl : ( ( rule__ScopeExpression__PruneAssignment_1_1 ) ) ;
     public final void rule__ScopeExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4539:1: ( ( ( rule__ScopeExpression__PruneAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4540:1: ( ( rule__ScopeExpression__PruneAssignment_1_1 ) )
+            // InternalScope.g:4539:1: ( ( ( rule__ScopeExpression__PruneAssignment_1_1 ) ) )
+            // InternalScope.g:4540:1: ( ( rule__ScopeExpression__PruneAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4540:1: ( ( rule__ScopeExpression__PruneAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4541:1: ( rule__ScopeExpression__PruneAssignment_1_1 )
+            // InternalScope.g:4540:1: ( ( rule__ScopeExpression__PruneAssignment_1_1 ) )
+            // InternalScope.g:4541:1: ( rule__ScopeExpression__PruneAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeExpressionAccess().getPruneAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4542:1: ( rule__ScopeExpression__PruneAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4542:2: rule__ScopeExpression__PruneAssignment_1_1
+            // InternalScope.g:4542:1: ( rule__ScopeExpression__PruneAssignment_1_1 )
+            // InternalScope.g:4542:2: rule__ScopeExpression__PruneAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__ScopeExpression__PruneAssignment_1_1_in_rule__ScopeExpression__Group_1__1__Impl9487);
+            pushFollow(FOLLOW_2);
             rule__ScopeExpression__PruneAssignment_1_1();
 
             state._fsp--;
@@ -13999,21 +13999,21 @@ public final void rule__ScopeExpression__Group_1__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__FactoryExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4556:1: rule__FactoryExpression__Group__0 : rule__FactoryExpression__Group__0__Impl rule__FactoryExpression__Group__1 ;
+    // InternalScope.g:4556:1: rule__FactoryExpression__Group__0 : rule__FactoryExpression__Group__0__Impl rule__FactoryExpression__Group__1 ;
     public final void rule__FactoryExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4560:1: ( rule__FactoryExpression__Group__0__Impl rule__FactoryExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4561:2: rule__FactoryExpression__Group__0__Impl rule__FactoryExpression__Group__1
+            // InternalScope.g:4560:1: ( rule__FactoryExpression__Group__0__Impl rule__FactoryExpression__Group__1 )
+            // InternalScope.g:4561:2: rule__FactoryExpression__Group__0__Impl rule__FactoryExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__FactoryExpression__Group__0__Impl_in_rule__FactoryExpression__Group__09521);
+            pushFollow(FOLLOW_17);
             rule__FactoryExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__FactoryExpression__Group__1_in_rule__FactoryExpression__Group__09524);
+            pushFollow(FOLLOW_2);
             rule__FactoryExpression__Group__1();
 
             state._fsp--;
@@ -14037,22 +14037,22 @@ public final void rule__FactoryExpression__Group__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__FactoryExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4568:1: rule__FactoryExpression__Group__0__Impl : ( 'factory' ) ;
+    // InternalScope.g:4568:1: rule__FactoryExpression__Group__0__Impl : ( 'factory' ) ;
     public final void rule__FactoryExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4572:1: ( ( 'factory' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4573:1: ( 'factory' )
+            // InternalScope.g:4572:1: ( ( 'factory' ) )
+            // InternalScope.g:4573:1: ( 'factory' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4573:1: ( 'factory' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4574:1: 'factory'
+            // InternalScope.g:4573:1: ( 'factory' )
+            // InternalScope.g:4574:1: 'factory'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFactoryExpressionAccess().getFactoryKeyword_0()); 
             }
-            match(input,59,FOLLOW_59_in_rule__FactoryExpression__Group__0__Impl9552); if (state.failed) return ;
+            match(input,59,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getFactoryExpressionAccess().getFactoryKeyword_0()); 
             }
@@ -14078,16 +14078,16 @@ public final void rule__FactoryExpression__Group__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__FactoryExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4587:1: rule__FactoryExpression__Group__1 : rule__FactoryExpression__Group__1__Impl ;
+    // InternalScope.g:4587:1: rule__FactoryExpression__Group__1 : rule__FactoryExpression__Group__1__Impl ;
     public final void rule__FactoryExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4591:1: ( rule__FactoryExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4592:2: rule__FactoryExpression__Group__1__Impl
+            // InternalScope.g:4591:1: ( rule__FactoryExpression__Group__1__Impl )
+            // InternalScope.g:4592:2: rule__FactoryExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__FactoryExpression__Group__1__Impl_in_rule__FactoryExpression__Group__19583);
+            pushFollow(FOLLOW_2);
             rule__FactoryExpression__Group__1__Impl();
 
             state._fsp--;
@@ -14111,25 +14111,25 @@ public final void rule__FactoryExpression__Group__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__FactoryExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4598:1: rule__FactoryExpression__Group__1__Impl : ( ( rule__FactoryExpression__ExprAssignment_1 ) ) ;
+    // InternalScope.g:4598:1: rule__FactoryExpression__Group__1__Impl : ( ( rule__FactoryExpression__ExprAssignment_1 ) ) ;
     public final void rule__FactoryExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4602:1: ( ( ( rule__FactoryExpression__ExprAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4603:1: ( ( rule__FactoryExpression__ExprAssignment_1 ) )
+            // InternalScope.g:4602:1: ( ( ( rule__FactoryExpression__ExprAssignment_1 ) ) )
+            // InternalScope.g:4603:1: ( ( rule__FactoryExpression__ExprAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4603:1: ( ( rule__FactoryExpression__ExprAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4604:1: ( rule__FactoryExpression__ExprAssignment_1 )
+            // InternalScope.g:4603:1: ( ( rule__FactoryExpression__ExprAssignment_1 ) )
+            // InternalScope.g:4604:1: ( rule__FactoryExpression__ExprAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFactoryExpressionAccess().getExprAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4605:1: ( rule__FactoryExpression__ExprAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4605:2: rule__FactoryExpression__ExprAssignment_1
+            // InternalScope.g:4605:1: ( rule__FactoryExpression__ExprAssignment_1 )
+            // InternalScope.g:4605:2: rule__FactoryExpression__ExprAssignment_1
             {
-            pushFollow(FOLLOW_rule__FactoryExpression__ExprAssignment_1_in_rule__FactoryExpression__Group__1__Impl9610);
+            pushFollow(FOLLOW_2);
             rule__FactoryExpression__ExprAssignment_1();
 
             state._fsp--;
@@ -14162,21 +14162,21 @@ public final void rule__FactoryExpression__Group__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__ScopeDelegation__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4619:1: rule__ScopeDelegation__Group__0 : rule__ScopeDelegation__Group__0__Impl rule__ScopeDelegation__Group__1 ;
+    // InternalScope.g:4619:1: rule__ScopeDelegation__Group__0 : rule__ScopeDelegation__Group__0__Impl rule__ScopeDelegation__Group__1 ;
     public final void rule__ScopeDelegation__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4623:1: ( rule__ScopeDelegation__Group__0__Impl rule__ScopeDelegation__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4624:2: rule__ScopeDelegation__Group__0__Impl rule__ScopeDelegation__Group__1
+            // InternalScope.g:4623:1: ( rule__ScopeDelegation__Group__0__Impl rule__ScopeDelegation__Group__1 )
+            // InternalScope.g:4624:2: rule__ScopeDelegation__Group__0__Impl rule__ScopeDelegation__Group__1
             {
-            pushFollow(FOLLOW_rule__ScopeDelegation__Group__0__Impl_in_rule__ScopeDelegation__Group__09644);
+            pushFollow(FOLLOW_32);
             rule__ScopeDelegation__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ScopeDelegation__Group__1_in_rule__ScopeDelegation__Group__09647);
+            pushFollow(FOLLOW_2);
             rule__ScopeDelegation__Group__1();
 
             state._fsp--;
@@ -14200,22 +14200,22 @@ public final void rule__ScopeDelegation__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__ScopeDelegation__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4631:1: rule__ScopeDelegation__Group__0__Impl : ( 'scopeof' ) ;
+    // InternalScope.g:4631:1: rule__ScopeDelegation__Group__0__Impl : ( 'scopeof' ) ;
     public final void rule__ScopeDelegation__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4635:1: ( ( 'scopeof' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4636:1: ( 'scopeof' )
+            // InternalScope.g:4635:1: ( ( 'scopeof' ) )
+            // InternalScope.g:4636:1: ( 'scopeof' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4636:1: ( 'scopeof' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4637:1: 'scopeof'
+            // InternalScope.g:4636:1: ( 'scopeof' )
+            // InternalScope.g:4637:1: 'scopeof'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeDelegationAccess().getScopeofKeyword_0()); 
             }
-            match(input,60,FOLLOW_60_in_rule__ScopeDelegation__Group__0__Impl9675); if (state.failed) return ;
+            match(input,60,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getScopeDelegationAccess().getScopeofKeyword_0()); 
             }
@@ -14241,21 +14241,21 @@ public final void rule__ScopeDelegation__Group__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__ScopeDelegation__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4650:1: rule__ScopeDelegation__Group__1 : rule__ScopeDelegation__Group__1__Impl rule__ScopeDelegation__Group__2 ;
+    // InternalScope.g:4650:1: rule__ScopeDelegation__Group__1 : rule__ScopeDelegation__Group__1__Impl rule__ScopeDelegation__Group__2 ;
     public final void rule__ScopeDelegation__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4654:1: ( rule__ScopeDelegation__Group__1__Impl rule__ScopeDelegation__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4655:2: rule__ScopeDelegation__Group__1__Impl rule__ScopeDelegation__Group__2
+            // InternalScope.g:4654:1: ( rule__ScopeDelegation__Group__1__Impl rule__ScopeDelegation__Group__2 )
+            // InternalScope.g:4655:2: rule__ScopeDelegation__Group__1__Impl rule__ScopeDelegation__Group__2
             {
-            pushFollow(FOLLOW_rule__ScopeDelegation__Group__1__Impl_in_rule__ScopeDelegation__Group__19706);
+            pushFollow(FOLLOW_33);
             rule__ScopeDelegation__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ScopeDelegation__Group__2_in_rule__ScopeDelegation__Group__19709);
+            pushFollow(FOLLOW_2);
             rule__ScopeDelegation__Group__2();
 
             state._fsp--;
@@ -14279,22 +14279,22 @@ public final void rule__ScopeDelegation__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__ScopeDelegation__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4662:1: rule__ScopeDelegation__Group__1__Impl : ( '(' ) ;
+    // InternalScope.g:4662:1: rule__ScopeDelegation__Group__1__Impl : ( '(' ) ;
     public final void rule__ScopeDelegation__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4666:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4667:1: ( '(' )
+            // InternalScope.g:4666:1: ( ( '(' ) )
+            // InternalScope.g:4667:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4667:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4668:1: '('
+            // InternalScope.g:4667:1: ( '(' )
+            // InternalScope.g:4668:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeDelegationAccess().getLeftParenthesisKeyword_1()); 
             }
-            match(input,51,FOLLOW_51_in_rule__ScopeDelegation__Group__1__Impl9737); if (state.failed) return ;
+            match(input,51,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getScopeDelegationAccess().getLeftParenthesisKeyword_1()); 
             }
@@ -14320,21 +14320,21 @@ public final void rule__ScopeDelegation__Group__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__ScopeDelegation__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4681:1: rule__ScopeDelegation__Group__2 : rule__ScopeDelegation__Group__2__Impl rule__ScopeDelegation__Group__3 ;
+    // InternalScope.g:4681:1: rule__ScopeDelegation__Group__2 : rule__ScopeDelegation__Group__2__Impl rule__ScopeDelegation__Group__3 ;
     public final void rule__ScopeDelegation__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4685:1: ( rule__ScopeDelegation__Group__2__Impl rule__ScopeDelegation__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4686:2: rule__ScopeDelegation__Group__2__Impl rule__ScopeDelegation__Group__3
+            // InternalScope.g:4685:1: ( rule__ScopeDelegation__Group__2__Impl rule__ScopeDelegation__Group__3 )
+            // InternalScope.g:4686:2: rule__ScopeDelegation__Group__2__Impl rule__ScopeDelegation__Group__3
             {
-            pushFollow(FOLLOW_rule__ScopeDelegation__Group__2__Impl_in_rule__ScopeDelegation__Group__29768);
+            pushFollow(FOLLOW_34);
             rule__ScopeDelegation__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ScopeDelegation__Group__3_in_rule__ScopeDelegation__Group__29771);
+            pushFollow(FOLLOW_2);
             rule__ScopeDelegation__Group__3();
 
             state._fsp--;
@@ -14358,25 +14358,25 @@ public final void rule__ScopeDelegation__Group__2() throws RecognitionException
 
 
     // $ANTLR start "rule__ScopeDelegation__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4693:1: rule__ScopeDelegation__Group__2__Impl : ( ( rule__ScopeDelegation__Alternatives_2 ) ) ;
+    // InternalScope.g:4693:1: rule__ScopeDelegation__Group__2__Impl : ( ( rule__ScopeDelegation__Alternatives_2 ) ) ;
     public final void rule__ScopeDelegation__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4697:1: ( ( ( rule__ScopeDelegation__Alternatives_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4698:1: ( ( rule__ScopeDelegation__Alternatives_2 ) )
+            // InternalScope.g:4697:1: ( ( ( rule__ScopeDelegation__Alternatives_2 ) ) )
+            // InternalScope.g:4698:1: ( ( rule__ScopeDelegation__Alternatives_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4698:1: ( ( rule__ScopeDelegation__Alternatives_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4699:1: ( rule__ScopeDelegation__Alternatives_2 )
+            // InternalScope.g:4698:1: ( ( rule__ScopeDelegation__Alternatives_2 ) )
+            // InternalScope.g:4699:1: ( rule__ScopeDelegation__Alternatives_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeDelegationAccess().getAlternatives_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4700:1: ( rule__ScopeDelegation__Alternatives_2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4700:2: rule__ScopeDelegation__Alternatives_2
+            // InternalScope.g:4700:1: ( rule__ScopeDelegation__Alternatives_2 )
+            // InternalScope.g:4700:2: rule__ScopeDelegation__Alternatives_2
             {
-            pushFollow(FOLLOW_rule__ScopeDelegation__Alternatives_2_in_rule__ScopeDelegation__Group__2__Impl9798);
+            pushFollow(FOLLOW_2);
             rule__ScopeDelegation__Alternatives_2();
 
             state._fsp--;
@@ -14409,21 +14409,21 @@ public final void rule__ScopeDelegation__Group__2__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__ScopeDelegation__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4710:1: rule__ScopeDelegation__Group__3 : rule__ScopeDelegation__Group__3__Impl rule__ScopeDelegation__Group__4 ;
+    // InternalScope.g:4710:1: rule__ScopeDelegation__Group__3 : rule__ScopeDelegation__Group__3__Impl rule__ScopeDelegation__Group__4 ;
     public final void rule__ScopeDelegation__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4714:1: ( rule__ScopeDelegation__Group__3__Impl rule__ScopeDelegation__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4715:2: rule__ScopeDelegation__Group__3__Impl rule__ScopeDelegation__Group__4
+            // InternalScope.g:4714:1: ( rule__ScopeDelegation__Group__3__Impl rule__ScopeDelegation__Group__4 )
+            // InternalScope.g:4715:2: rule__ScopeDelegation__Group__3__Impl rule__ScopeDelegation__Group__4
             {
-            pushFollow(FOLLOW_rule__ScopeDelegation__Group__3__Impl_in_rule__ScopeDelegation__Group__39828);
+            pushFollow(FOLLOW_34);
             rule__ScopeDelegation__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ScopeDelegation__Group__4_in_rule__ScopeDelegation__Group__39831);
+            pushFollow(FOLLOW_2);
             rule__ScopeDelegation__Group__4();
 
             state._fsp--;
@@ -14447,22 +14447,22 @@ public final void rule__ScopeDelegation__Group__3() throws RecognitionException
 
 
     // $ANTLR start "rule__ScopeDelegation__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4722:1: rule__ScopeDelegation__Group__3__Impl : ( ( rule__ScopeDelegation__Group_3__0 )? ) ;
+    // InternalScope.g:4722:1: rule__ScopeDelegation__Group__3__Impl : ( ( rule__ScopeDelegation__Group_3__0 )? ) ;
     public final void rule__ScopeDelegation__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4726:1: ( ( ( rule__ScopeDelegation__Group_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4727:1: ( ( rule__ScopeDelegation__Group_3__0 )? )
+            // InternalScope.g:4726:1: ( ( ( rule__ScopeDelegation__Group_3__0 )? ) )
+            // InternalScope.g:4727:1: ( ( rule__ScopeDelegation__Group_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4727:1: ( ( rule__ScopeDelegation__Group_3__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4728:1: ( rule__ScopeDelegation__Group_3__0 )?
+            // InternalScope.g:4727:1: ( ( rule__ScopeDelegation__Group_3__0 )? )
+            // InternalScope.g:4728:1: ( rule__ScopeDelegation__Group_3__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeDelegationAccess().getGroup_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4729:1: ( rule__ScopeDelegation__Group_3__0 )?
+            // InternalScope.g:4729:1: ( rule__ScopeDelegation__Group_3__0 )?
             int alt42=2;
             int LA42_0 = input.LA(1);
 
@@ -14471,9 +14471,9 @@ public final void rule__ScopeDelegation__Group__3__Impl() throws RecognitionExce
             }
             switch (alt42) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4729:2: rule__ScopeDelegation__Group_3__0
+                    // InternalScope.g:4729:2: rule__ScopeDelegation__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__ScopeDelegation__Group_3__0_in_rule__ScopeDelegation__Group__3__Impl9858);
+                    pushFollow(FOLLOW_2);
                     rule__ScopeDelegation__Group_3__0();
 
                     state._fsp--;
@@ -14509,16 +14509,16 @@ public final void rule__ScopeDelegation__Group__3__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__ScopeDelegation__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4739:1: rule__ScopeDelegation__Group__4 : rule__ScopeDelegation__Group__4__Impl ;
+    // InternalScope.g:4739:1: rule__ScopeDelegation__Group__4 : rule__ScopeDelegation__Group__4__Impl ;
     public final void rule__ScopeDelegation__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4743:1: ( rule__ScopeDelegation__Group__4__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4744:2: rule__ScopeDelegation__Group__4__Impl
+            // InternalScope.g:4743:1: ( rule__ScopeDelegation__Group__4__Impl )
+            // InternalScope.g:4744:2: rule__ScopeDelegation__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__ScopeDelegation__Group__4__Impl_in_rule__ScopeDelegation__Group__49889);
+            pushFollow(FOLLOW_2);
             rule__ScopeDelegation__Group__4__Impl();
 
             state._fsp--;
@@ -14542,22 +14542,22 @@ public final void rule__ScopeDelegation__Group__4() throws RecognitionException
 
 
     // $ANTLR start "rule__ScopeDelegation__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4750:1: rule__ScopeDelegation__Group__4__Impl : ( ')' ) ;
+    // InternalScope.g:4750:1: rule__ScopeDelegation__Group__4__Impl : ( ')' ) ;
     public final void rule__ScopeDelegation__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4754:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4755:1: ( ')' )
+            // InternalScope.g:4754:1: ( ( ')' ) )
+            // InternalScope.g:4755:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4755:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4756:1: ')'
+            // InternalScope.g:4755:1: ( ')' )
+            // InternalScope.g:4756:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeDelegationAccess().getRightParenthesisKeyword_4()); 
             }
-            match(input,52,FOLLOW_52_in_rule__ScopeDelegation__Group__4__Impl9917); if (state.failed) return ;
+            match(input,52,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getScopeDelegationAccess().getRightParenthesisKeyword_4()); 
             }
@@ -14583,21 +14583,21 @@ public final void rule__ScopeDelegation__Group__4__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__ScopeDelegation__Group_3__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4779:1: rule__ScopeDelegation__Group_3__0 : rule__ScopeDelegation__Group_3__0__Impl rule__ScopeDelegation__Group_3__1 ;
+    // InternalScope.g:4779:1: rule__ScopeDelegation__Group_3__0 : rule__ScopeDelegation__Group_3__0__Impl rule__ScopeDelegation__Group_3__1 ;
     public final void rule__ScopeDelegation__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4783:1: ( rule__ScopeDelegation__Group_3__0__Impl rule__ScopeDelegation__Group_3__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4784:2: rule__ScopeDelegation__Group_3__0__Impl rule__ScopeDelegation__Group_3__1
+            // InternalScope.g:4783:1: ( rule__ScopeDelegation__Group_3__0__Impl rule__ScopeDelegation__Group_3__1 )
+            // InternalScope.g:4784:2: rule__ScopeDelegation__Group_3__0__Impl rule__ScopeDelegation__Group_3__1
             {
-            pushFollow(FOLLOW_rule__ScopeDelegation__Group_3__0__Impl_in_rule__ScopeDelegation__Group_3__09958);
+            pushFollow(FOLLOW_3);
             rule__ScopeDelegation__Group_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ScopeDelegation__Group_3__1_in_rule__ScopeDelegation__Group_3__09961);
+            pushFollow(FOLLOW_2);
             rule__ScopeDelegation__Group_3__1();
 
             state._fsp--;
@@ -14621,22 +14621,22 @@ public final void rule__ScopeDelegation__Group_3__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ScopeDelegation__Group_3__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4791:1: rule__ScopeDelegation__Group_3__0__Impl : ( ',' ) ;
+    // InternalScope.g:4791:1: rule__ScopeDelegation__Group_3__0__Impl : ( ',' ) ;
     public final void rule__ScopeDelegation__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4795:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4796:1: ( ',' )
+            // InternalScope.g:4795:1: ( ( ',' ) )
+            // InternalScope.g:4796:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4796:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4797:1: ','
+            // InternalScope.g:4796:1: ( ',' )
+            // InternalScope.g:4797:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeDelegationAccess().getCommaKeyword_3_0()); 
             }
-            match(input,61,FOLLOW_61_in_rule__ScopeDelegation__Group_3__0__Impl9989); if (state.failed) return ;
+            match(input,61,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getScopeDelegationAccess().getCommaKeyword_3_0()); 
             }
@@ -14662,16 +14662,16 @@ public final void rule__ScopeDelegation__Group_3__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__ScopeDelegation__Group_3__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4810:1: rule__ScopeDelegation__Group_3__1 : rule__ScopeDelegation__Group_3__1__Impl ;
+    // InternalScope.g:4810:1: rule__ScopeDelegation__Group_3__1 : rule__ScopeDelegation__Group_3__1__Impl ;
     public final void rule__ScopeDelegation__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4814:1: ( rule__ScopeDelegation__Group_3__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4815:2: rule__ScopeDelegation__Group_3__1__Impl
+            // InternalScope.g:4814:1: ( rule__ScopeDelegation__Group_3__1__Impl )
+            // InternalScope.g:4815:2: rule__ScopeDelegation__Group_3__1__Impl
             {
-            pushFollow(FOLLOW_rule__ScopeDelegation__Group_3__1__Impl_in_rule__ScopeDelegation__Group_3__110020);
+            pushFollow(FOLLOW_2);
             rule__ScopeDelegation__Group_3__1__Impl();
 
             state._fsp--;
@@ -14695,25 +14695,25 @@ public final void rule__ScopeDelegation__Group_3__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ScopeDelegation__Group_3__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4821:1: rule__ScopeDelegation__Group_3__1__Impl : ( ( rule__ScopeDelegation__ScopeAssignment_3_1 ) ) ;
+    // InternalScope.g:4821:1: rule__ScopeDelegation__Group_3__1__Impl : ( ( rule__ScopeDelegation__ScopeAssignment_3_1 ) ) ;
     public final void rule__ScopeDelegation__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4825:1: ( ( ( rule__ScopeDelegation__ScopeAssignment_3_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4826:1: ( ( rule__ScopeDelegation__ScopeAssignment_3_1 ) )
+            // InternalScope.g:4825:1: ( ( ( rule__ScopeDelegation__ScopeAssignment_3_1 ) ) )
+            // InternalScope.g:4826:1: ( ( rule__ScopeDelegation__ScopeAssignment_3_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4826:1: ( ( rule__ScopeDelegation__ScopeAssignment_3_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4827:1: ( rule__ScopeDelegation__ScopeAssignment_3_1 )
+            // InternalScope.g:4826:1: ( ( rule__ScopeDelegation__ScopeAssignment_3_1 ) )
+            // InternalScope.g:4827:1: ( rule__ScopeDelegation__ScopeAssignment_3_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeDelegationAccess().getScopeAssignment_3_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4828:1: ( rule__ScopeDelegation__ScopeAssignment_3_1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4828:2: rule__ScopeDelegation__ScopeAssignment_3_1
+            // InternalScope.g:4828:1: ( rule__ScopeDelegation__ScopeAssignment_3_1 )
+            // InternalScope.g:4828:2: rule__ScopeDelegation__ScopeAssignment_3_1
             {
-            pushFollow(FOLLOW_rule__ScopeDelegation__ScopeAssignment_3_1_in_rule__ScopeDelegation__Group_3__1__Impl10047);
+            pushFollow(FOLLOW_2);
             rule__ScopeDelegation__ScopeAssignment_3_1();
 
             state._fsp--;
@@ -14746,21 +14746,21 @@ public final void rule__ScopeDelegation__Group_3__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__NamedScopeExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4842:1: rule__NamedScopeExpression__Group__0 : rule__NamedScopeExpression__Group__0__Impl rule__NamedScopeExpression__Group__1 ;
+    // InternalScope.g:4842:1: rule__NamedScopeExpression__Group__0 : rule__NamedScopeExpression__Group__0__Impl rule__NamedScopeExpression__Group__1 ;
     public final void rule__NamedScopeExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4846:1: ( rule__NamedScopeExpression__Group__0__Impl rule__NamedScopeExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4847:2: rule__NamedScopeExpression__Group__0__Impl rule__NamedScopeExpression__Group__1
+            // InternalScope.g:4846:1: ( rule__NamedScopeExpression__Group__0__Impl rule__NamedScopeExpression__Group__1 )
+            // InternalScope.g:4847:2: rule__NamedScopeExpression__Group__0__Impl rule__NamedScopeExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__NamedScopeExpression__Group__0__Impl_in_rule__NamedScopeExpression__Group__010081);
+            pushFollow(FOLLOW_35);
             rule__NamedScopeExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__NamedScopeExpression__Group__1_in_rule__NamedScopeExpression__Group__010084);
+            pushFollow(FOLLOW_2);
             rule__NamedScopeExpression__Group__1();
 
             state._fsp--;
@@ -14784,25 +14784,25 @@ public final void rule__NamedScopeExpression__Group__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__NamedScopeExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4854:1: rule__NamedScopeExpression__Group__0__Impl : ( ( rule__NamedScopeExpression__Alternatives_0 ) ) ;
+    // InternalScope.g:4854:1: rule__NamedScopeExpression__Group__0__Impl : ( ( rule__NamedScopeExpression__Alternatives_0 ) ) ;
     public final void rule__NamedScopeExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4858:1: ( ( ( rule__NamedScopeExpression__Alternatives_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4859:1: ( ( rule__NamedScopeExpression__Alternatives_0 ) )
+            // InternalScope.g:4858:1: ( ( ( rule__NamedScopeExpression__Alternatives_0 ) ) )
+            // InternalScope.g:4859:1: ( ( rule__NamedScopeExpression__Alternatives_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4859:1: ( ( rule__NamedScopeExpression__Alternatives_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4860:1: ( rule__NamedScopeExpression__Alternatives_0 )
+            // InternalScope.g:4859:1: ( ( rule__NamedScopeExpression__Alternatives_0 ) )
+            // InternalScope.g:4860:1: ( rule__NamedScopeExpression__Alternatives_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamedScopeExpressionAccess().getAlternatives_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4861:1: ( rule__NamedScopeExpression__Alternatives_0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4861:2: rule__NamedScopeExpression__Alternatives_0
+            // InternalScope.g:4861:1: ( rule__NamedScopeExpression__Alternatives_0 )
+            // InternalScope.g:4861:2: rule__NamedScopeExpression__Alternatives_0
             {
-            pushFollow(FOLLOW_rule__NamedScopeExpression__Alternatives_0_in_rule__NamedScopeExpression__Group__0__Impl10111);
+            pushFollow(FOLLOW_2);
             rule__NamedScopeExpression__Alternatives_0();
 
             state._fsp--;
@@ -14835,21 +14835,21 @@ public final void rule__NamedScopeExpression__Group__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__NamedScopeExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4871:1: rule__NamedScopeExpression__Group__1 : rule__NamedScopeExpression__Group__1__Impl rule__NamedScopeExpression__Group__2 ;
+    // InternalScope.g:4871:1: rule__NamedScopeExpression__Group__1 : rule__NamedScopeExpression__Group__1__Impl rule__NamedScopeExpression__Group__2 ;
     public final void rule__NamedScopeExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4875:1: ( rule__NamedScopeExpression__Group__1__Impl rule__NamedScopeExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4876:2: rule__NamedScopeExpression__Group__1__Impl rule__NamedScopeExpression__Group__2
+            // InternalScope.g:4875:1: ( rule__NamedScopeExpression__Group__1__Impl rule__NamedScopeExpression__Group__2 )
+            // InternalScope.g:4876:2: rule__NamedScopeExpression__Group__1__Impl rule__NamedScopeExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__NamedScopeExpression__Group__1__Impl_in_rule__NamedScopeExpression__Group__110141);
+            pushFollow(FOLLOW_35);
             rule__NamedScopeExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__NamedScopeExpression__Group__2_in_rule__NamedScopeExpression__Group__110144);
+            pushFollow(FOLLOW_2);
             rule__NamedScopeExpression__Group__2();
 
             state._fsp--;
@@ -14873,22 +14873,22 @@ public final void rule__NamedScopeExpression__Group__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__NamedScopeExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4883:1: rule__NamedScopeExpression__Group__1__Impl : ( ( rule__NamedScopeExpression__Group_1__0 )? ) ;
+    // InternalScope.g:4883:1: rule__NamedScopeExpression__Group__1__Impl : ( ( rule__NamedScopeExpression__Group_1__0 )? ) ;
     public final void rule__NamedScopeExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4887:1: ( ( ( rule__NamedScopeExpression__Group_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4888:1: ( ( rule__NamedScopeExpression__Group_1__0 )? )
+            // InternalScope.g:4887:1: ( ( ( rule__NamedScopeExpression__Group_1__0 )? ) )
+            // InternalScope.g:4888:1: ( ( rule__NamedScopeExpression__Group_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4888:1: ( ( rule__NamedScopeExpression__Group_1__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4889:1: ( rule__NamedScopeExpression__Group_1__0 )?
+            // InternalScope.g:4888:1: ( ( rule__NamedScopeExpression__Group_1__0 )? )
+            // InternalScope.g:4889:1: ( rule__NamedScopeExpression__Group_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamedScopeExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4890:1: ( rule__NamedScopeExpression__Group_1__0 )?
+            // InternalScope.g:4890:1: ( rule__NamedScopeExpression__Group_1__0 )?
             int alt43=2;
             int LA43_0 = input.LA(1);
 
@@ -14897,9 +14897,9 @@ public final void rule__NamedScopeExpression__Group__1__Impl() throws Recognitio
             }
             switch (alt43) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4890:2: rule__NamedScopeExpression__Group_1__0
+                    // InternalScope.g:4890:2: rule__NamedScopeExpression__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__NamedScopeExpression__Group_1__0_in_rule__NamedScopeExpression__Group__1__Impl10171);
+                    pushFollow(FOLLOW_2);
                     rule__NamedScopeExpression__Group_1__0();
 
                     state._fsp--;
@@ -14935,16 +14935,16 @@ public final void rule__NamedScopeExpression__Group__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__NamedScopeExpression__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4900:1: rule__NamedScopeExpression__Group__2 : rule__NamedScopeExpression__Group__2__Impl ;
+    // InternalScope.g:4900:1: rule__NamedScopeExpression__Group__2 : rule__NamedScopeExpression__Group__2__Impl ;
     public final void rule__NamedScopeExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4904:1: ( rule__NamedScopeExpression__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4905:2: rule__NamedScopeExpression__Group__2__Impl
+            // InternalScope.g:4904:1: ( rule__NamedScopeExpression__Group__2__Impl )
+            // InternalScope.g:4905:2: rule__NamedScopeExpression__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__NamedScopeExpression__Group__2__Impl_in_rule__NamedScopeExpression__Group__210202);
+            pushFollow(FOLLOW_2);
             rule__NamedScopeExpression__Group__2__Impl();
 
             state._fsp--;
@@ -14968,22 +14968,22 @@ public final void rule__NamedScopeExpression__Group__2() throws RecognitionExcep
 
 
     // $ANTLR start "rule__NamedScopeExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4911:1: rule__NamedScopeExpression__Group__2__Impl : ( ( rule__NamedScopeExpression__Group_2__0 )? ) ;
+    // InternalScope.g:4911:1: rule__NamedScopeExpression__Group__2__Impl : ( ( rule__NamedScopeExpression__Group_2__0 )? ) ;
     public final void rule__NamedScopeExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4915:1: ( ( ( rule__NamedScopeExpression__Group_2__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4916:1: ( ( rule__NamedScopeExpression__Group_2__0 )? )
+            // InternalScope.g:4915:1: ( ( ( rule__NamedScopeExpression__Group_2__0 )? ) )
+            // InternalScope.g:4916:1: ( ( rule__NamedScopeExpression__Group_2__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4916:1: ( ( rule__NamedScopeExpression__Group_2__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4917:1: ( rule__NamedScopeExpression__Group_2__0 )?
+            // InternalScope.g:4916:1: ( ( rule__NamedScopeExpression__Group_2__0 )? )
+            // InternalScope.g:4917:1: ( rule__NamedScopeExpression__Group_2__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamedScopeExpressionAccess().getGroup_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4918:1: ( rule__NamedScopeExpression__Group_2__0 )?
+            // InternalScope.g:4918:1: ( rule__NamedScopeExpression__Group_2__0 )?
             int alt44=2;
             int LA44_0 = input.LA(1);
 
@@ -14992,9 +14992,9 @@ public final void rule__NamedScopeExpression__Group__2__Impl() throws Recognitio
             }
             switch (alt44) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4918:2: rule__NamedScopeExpression__Group_2__0
+                    // InternalScope.g:4918:2: rule__NamedScopeExpression__Group_2__0
                     {
-                    pushFollow(FOLLOW_rule__NamedScopeExpression__Group_2__0_in_rule__NamedScopeExpression__Group__2__Impl10229);
+                    pushFollow(FOLLOW_2);
                     rule__NamedScopeExpression__Group_2__0();
 
                     state._fsp--;
@@ -15030,21 +15030,21 @@ public final void rule__NamedScopeExpression__Group__2__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__NamedScopeExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4934:1: rule__NamedScopeExpression__Group_1__0 : rule__NamedScopeExpression__Group_1__0__Impl rule__NamedScopeExpression__Group_1__1 ;
+    // InternalScope.g:4934:1: rule__NamedScopeExpression__Group_1__0 : rule__NamedScopeExpression__Group_1__0__Impl rule__NamedScopeExpression__Group_1__1 ;
     public final void rule__NamedScopeExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4938:1: ( rule__NamedScopeExpression__Group_1__0__Impl rule__NamedScopeExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4939:2: rule__NamedScopeExpression__Group_1__0__Impl rule__NamedScopeExpression__Group_1__1
+            // InternalScope.g:4938:1: ( rule__NamedScopeExpression__Group_1__0__Impl rule__NamedScopeExpression__Group_1__1 )
+            // InternalScope.g:4939:2: rule__NamedScopeExpression__Group_1__0__Impl rule__NamedScopeExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__NamedScopeExpression__Group_1__0__Impl_in_rule__NamedScopeExpression__Group_1__010266);
+            pushFollow(FOLLOW_15);
             rule__NamedScopeExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__NamedScopeExpression__Group_1__1_in_rule__NamedScopeExpression__Group_1__010269);
+            pushFollow(FOLLOW_2);
             rule__NamedScopeExpression__Group_1__1();
 
             state._fsp--;
@@ -15068,25 +15068,25 @@ public final void rule__NamedScopeExpression__Group_1__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__NamedScopeExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4946:1: rule__NamedScopeExpression__Group_1__0__Impl : ( ( rule__NamedScopeExpression__CaseDefAssignment_1_0 ) ) ;
+    // InternalScope.g:4946:1: rule__NamedScopeExpression__Group_1__0__Impl : ( ( rule__NamedScopeExpression__CaseDefAssignment_1_0 ) ) ;
     public final void rule__NamedScopeExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4950:1: ( ( ( rule__NamedScopeExpression__CaseDefAssignment_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4951:1: ( ( rule__NamedScopeExpression__CaseDefAssignment_1_0 ) )
+            // InternalScope.g:4950:1: ( ( ( rule__NamedScopeExpression__CaseDefAssignment_1_0 ) ) )
+            // InternalScope.g:4951:1: ( ( rule__NamedScopeExpression__CaseDefAssignment_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4951:1: ( ( rule__NamedScopeExpression__CaseDefAssignment_1_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4952:1: ( rule__NamedScopeExpression__CaseDefAssignment_1_0 )
+            // InternalScope.g:4951:1: ( ( rule__NamedScopeExpression__CaseDefAssignment_1_0 ) )
+            // InternalScope.g:4952:1: ( rule__NamedScopeExpression__CaseDefAssignment_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamedScopeExpressionAccess().getCaseDefAssignment_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4953:1: ( rule__NamedScopeExpression__CaseDefAssignment_1_0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4953:2: rule__NamedScopeExpression__CaseDefAssignment_1_0
+            // InternalScope.g:4953:1: ( rule__NamedScopeExpression__CaseDefAssignment_1_0 )
+            // InternalScope.g:4953:2: rule__NamedScopeExpression__CaseDefAssignment_1_0
             {
-            pushFollow(FOLLOW_rule__NamedScopeExpression__CaseDefAssignment_1_0_in_rule__NamedScopeExpression__Group_1__0__Impl10296);
+            pushFollow(FOLLOW_2);
             rule__NamedScopeExpression__CaseDefAssignment_1_0();
 
             state._fsp--;
@@ -15119,16 +15119,16 @@ public final void rule__NamedScopeExpression__Group_1__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__NamedScopeExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4963:1: rule__NamedScopeExpression__Group_1__1 : rule__NamedScopeExpression__Group_1__1__Impl ;
+    // InternalScope.g:4963:1: rule__NamedScopeExpression__Group_1__1 : rule__NamedScopeExpression__Group_1__1__Impl ;
     public final void rule__NamedScopeExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4967:1: ( rule__NamedScopeExpression__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4968:2: rule__NamedScopeExpression__Group_1__1__Impl
+            // InternalScope.g:4967:1: ( rule__NamedScopeExpression__Group_1__1__Impl )
+            // InternalScope.g:4968:2: rule__NamedScopeExpression__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__NamedScopeExpression__Group_1__1__Impl_in_rule__NamedScopeExpression__Group_1__110326);
+            pushFollow(FOLLOW_2);
             rule__NamedScopeExpression__Group_1__1__Impl();
 
             state._fsp--;
@@ -15152,25 +15152,25 @@ public final void rule__NamedScopeExpression__Group_1__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__NamedScopeExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4974:1: rule__NamedScopeExpression__Group_1__1__Impl : ( ( rule__NamedScopeExpression__CasingAssignment_1_1 ) ) ;
+    // InternalScope.g:4974:1: rule__NamedScopeExpression__Group_1__1__Impl : ( ( rule__NamedScopeExpression__CasingAssignment_1_1 ) ) ;
     public final void rule__NamedScopeExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4978:1: ( ( ( rule__NamedScopeExpression__CasingAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4979:1: ( ( rule__NamedScopeExpression__CasingAssignment_1_1 ) )
+            // InternalScope.g:4978:1: ( ( ( rule__NamedScopeExpression__CasingAssignment_1_1 ) ) )
+            // InternalScope.g:4979:1: ( ( rule__NamedScopeExpression__CasingAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4979:1: ( ( rule__NamedScopeExpression__CasingAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4980:1: ( rule__NamedScopeExpression__CasingAssignment_1_1 )
+            // InternalScope.g:4979:1: ( ( rule__NamedScopeExpression__CasingAssignment_1_1 ) )
+            // InternalScope.g:4980:1: ( rule__NamedScopeExpression__CasingAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamedScopeExpressionAccess().getCasingAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4981:1: ( rule__NamedScopeExpression__CasingAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4981:2: rule__NamedScopeExpression__CasingAssignment_1_1
+            // InternalScope.g:4981:1: ( rule__NamedScopeExpression__CasingAssignment_1_1 )
+            // InternalScope.g:4981:2: rule__NamedScopeExpression__CasingAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__NamedScopeExpression__CasingAssignment_1_1_in_rule__NamedScopeExpression__Group_1__1__Impl10353);
+            pushFollow(FOLLOW_2);
             rule__NamedScopeExpression__CasingAssignment_1_1();
 
             state._fsp--;
@@ -15203,21 +15203,21 @@ public final void rule__NamedScopeExpression__Group_1__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__NamedScopeExpression__Group_2__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4995:1: rule__NamedScopeExpression__Group_2__0 : rule__NamedScopeExpression__Group_2__0__Impl rule__NamedScopeExpression__Group_2__1 ;
+    // InternalScope.g:4995:1: rule__NamedScopeExpression__Group_2__0 : rule__NamedScopeExpression__Group_2__0__Impl rule__NamedScopeExpression__Group_2__1 ;
     public final void rule__NamedScopeExpression__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:4999:1: ( rule__NamedScopeExpression__Group_2__0__Impl rule__NamedScopeExpression__Group_2__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5000:2: rule__NamedScopeExpression__Group_2__0__Impl rule__NamedScopeExpression__Group_2__1
+            // InternalScope.g:4999:1: ( rule__NamedScopeExpression__Group_2__0__Impl rule__NamedScopeExpression__Group_2__1 )
+            // InternalScope.g:5000:2: rule__NamedScopeExpression__Group_2__0__Impl rule__NamedScopeExpression__Group_2__1
             {
-            pushFollow(FOLLOW_rule__NamedScopeExpression__Group_2__0__Impl_in_rule__NamedScopeExpression__Group_2__010387);
+            pushFollow(FOLLOW_17);
             rule__NamedScopeExpression__Group_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__NamedScopeExpression__Group_2__1_in_rule__NamedScopeExpression__Group_2__010390);
+            pushFollow(FOLLOW_2);
             rule__NamedScopeExpression__Group_2__1();
 
             state._fsp--;
@@ -15241,22 +15241,22 @@ public final void rule__NamedScopeExpression__Group_2__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__NamedScopeExpression__Group_2__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5007:1: rule__NamedScopeExpression__Group_2__0__Impl : ( 'as' ) ;
+    // InternalScope.g:5007:1: rule__NamedScopeExpression__Group_2__0__Impl : ( 'as' ) ;
     public final void rule__NamedScopeExpression__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5011:1: ( ( 'as' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5012:1: ( 'as' )
+            // InternalScope.g:5011:1: ( ( 'as' ) )
+            // InternalScope.g:5012:1: ( 'as' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5012:1: ( 'as' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5013:1: 'as'
+            // InternalScope.g:5012:1: ( 'as' )
+            // InternalScope.g:5013:1: 'as'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamedScopeExpressionAccess().getAsKeyword_2_0()); 
             }
-            match(input,41,FOLLOW_41_in_rule__NamedScopeExpression__Group_2__0__Impl10418); if (state.failed) return ;
+            match(input,41,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getNamedScopeExpressionAccess().getAsKeyword_2_0()); 
             }
@@ -15282,16 +15282,16 @@ public final void rule__NamedScopeExpression__Group_2__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__NamedScopeExpression__Group_2__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5026:1: rule__NamedScopeExpression__Group_2__1 : rule__NamedScopeExpression__Group_2__1__Impl ;
+    // InternalScope.g:5026:1: rule__NamedScopeExpression__Group_2__1 : rule__NamedScopeExpression__Group_2__1__Impl ;
     public final void rule__NamedScopeExpression__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5030:1: ( rule__NamedScopeExpression__Group_2__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5031:2: rule__NamedScopeExpression__Group_2__1__Impl
+            // InternalScope.g:5030:1: ( rule__NamedScopeExpression__Group_2__1__Impl )
+            // InternalScope.g:5031:2: rule__NamedScopeExpression__Group_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__NamedScopeExpression__Group_2__1__Impl_in_rule__NamedScopeExpression__Group_2__110449);
+            pushFollow(FOLLOW_2);
             rule__NamedScopeExpression__Group_2__1__Impl();
 
             state._fsp--;
@@ -15315,25 +15315,25 @@ public final void rule__NamedScopeExpression__Group_2__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__NamedScopeExpression__Group_2__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5037:1: rule__NamedScopeExpression__Group_2__1__Impl : ( ( rule__NamedScopeExpression__NamingAssignment_2_1 ) ) ;
+    // InternalScope.g:5037:1: rule__NamedScopeExpression__Group_2__1__Impl : ( ( rule__NamedScopeExpression__NamingAssignment_2_1 ) ) ;
     public final void rule__NamedScopeExpression__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5041:1: ( ( ( rule__NamedScopeExpression__NamingAssignment_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5042:1: ( ( rule__NamedScopeExpression__NamingAssignment_2_1 ) )
+            // InternalScope.g:5041:1: ( ( ( rule__NamedScopeExpression__NamingAssignment_2_1 ) ) )
+            // InternalScope.g:5042:1: ( ( rule__NamedScopeExpression__NamingAssignment_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5042:1: ( ( rule__NamedScopeExpression__NamingAssignment_2_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5043:1: ( rule__NamedScopeExpression__NamingAssignment_2_1 )
+            // InternalScope.g:5042:1: ( ( rule__NamedScopeExpression__NamingAssignment_2_1 ) )
+            // InternalScope.g:5043:1: ( rule__NamedScopeExpression__NamingAssignment_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamedScopeExpressionAccess().getNamingAssignment_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5044:1: ( rule__NamedScopeExpression__NamingAssignment_2_1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5044:2: rule__NamedScopeExpression__NamingAssignment_2_1
+            // InternalScope.g:5044:1: ( rule__NamedScopeExpression__NamingAssignment_2_1 )
+            // InternalScope.g:5044:2: rule__NamedScopeExpression__NamingAssignment_2_1
             {
-            pushFollow(FOLLOW_rule__NamedScopeExpression__NamingAssignment_2_1_in_rule__NamedScopeExpression__Group_2__1__Impl10476);
+            pushFollow(FOLLOW_2);
             rule__NamedScopeExpression__NamingAssignment_2_1();
 
             state._fsp--;
@@ -15366,21 +15366,21 @@ public final void rule__NamedScopeExpression__Group_2__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5058:1: rule__GlobalScopeExpression__Group__0 : rule__GlobalScopeExpression__Group__0__Impl rule__GlobalScopeExpression__Group__1 ;
+    // InternalScope.g:5058:1: rule__GlobalScopeExpression__Group__0 : rule__GlobalScopeExpression__Group__0__Impl rule__GlobalScopeExpression__Group__1 ;
     public final void rule__GlobalScopeExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5062:1: ( rule__GlobalScopeExpression__Group__0__Impl rule__GlobalScopeExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5063:2: rule__GlobalScopeExpression__Group__0__Impl rule__GlobalScopeExpression__Group__1
+            // InternalScope.g:5062:1: ( rule__GlobalScopeExpression__Group__0__Impl rule__GlobalScopeExpression__Group__1 )
+            // InternalScope.g:5063:2: rule__GlobalScopeExpression__Group__0__Impl rule__GlobalScopeExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group__0__Impl_in_rule__GlobalScopeExpression__Group__010510);
+            pushFollow(FOLLOW_32);
             rule__GlobalScopeExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group__1_in_rule__GlobalScopeExpression__Group__010513);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__Group__1();
 
             state._fsp--;
@@ -15404,22 +15404,22 @@ public final void rule__GlobalScopeExpression__Group__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5070:1: rule__GlobalScopeExpression__Group__0__Impl : ( 'find' ) ;
+    // InternalScope.g:5070:1: rule__GlobalScopeExpression__Group__0__Impl : ( 'find' ) ;
     public final void rule__GlobalScopeExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5074:1: ( ( 'find' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5075:1: ( 'find' )
+            // InternalScope.g:5074:1: ( ( 'find' ) )
+            // InternalScope.g:5075:1: ( 'find' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5075:1: ( 'find' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5076:1: 'find'
+            // InternalScope.g:5075:1: ( 'find' )
+            // InternalScope.g:5076:1: 'find'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getFindKeyword_0()); 
             }
-            match(input,62,FOLLOW_62_in_rule__GlobalScopeExpression__Group__0__Impl10541); if (state.failed) return ;
+            match(input,62,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGlobalScopeExpressionAccess().getFindKeyword_0()); 
             }
@@ -15445,21 +15445,21 @@ public final void rule__GlobalScopeExpression__Group__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5089:1: rule__GlobalScopeExpression__Group__1 : rule__GlobalScopeExpression__Group__1__Impl rule__GlobalScopeExpression__Group__2 ;
+    // InternalScope.g:5089:1: rule__GlobalScopeExpression__Group__1 : rule__GlobalScopeExpression__Group__1__Impl rule__GlobalScopeExpression__Group__2 ;
     public final void rule__GlobalScopeExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5093:1: ( rule__GlobalScopeExpression__Group__1__Impl rule__GlobalScopeExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5094:2: rule__GlobalScopeExpression__Group__1__Impl rule__GlobalScopeExpression__Group__2
+            // InternalScope.g:5093:1: ( rule__GlobalScopeExpression__Group__1__Impl rule__GlobalScopeExpression__Group__2 )
+            // InternalScope.g:5094:2: rule__GlobalScopeExpression__Group__1__Impl rule__GlobalScopeExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group__1__Impl_in_rule__GlobalScopeExpression__Group__110572);
+            pushFollow(FOLLOW_3);
             rule__GlobalScopeExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group__2_in_rule__GlobalScopeExpression__Group__110575);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__Group__2();
 
             state._fsp--;
@@ -15483,22 +15483,22 @@ public final void rule__GlobalScopeExpression__Group__1() throws RecognitionExce
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5101:1: rule__GlobalScopeExpression__Group__1__Impl : ( '(' ) ;
+    // InternalScope.g:5101:1: rule__GlobalScopeExpression__Group__1__Impl : ( '(' ) ;
     public final void rule__GlobalScopeExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5105:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5106:1: ( '(' )
+            // InternalScope.g:5105:1: ( ( '(' ) )
+            // InternalScope.g:5106:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5106:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5107:1: '('
+            // InternalScope.g:5106:1: ( '(' )
+            // InternalScope.g:5107:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getLeftParenthesisKeyword_1()); 
             }
-            match(input,51,FOLLOW_51_in_rule__GlobalScopeExpression__Group__1__Impl10603); if (state.failed) return ;
+            match(input,51,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGlobalScopeExpressionAccess().getLeftParenthesisKeyword_1()); 
             }
@@ -15524,21 +15524,21 @@ public final void rule__GlobalScopeExpression__Group__1__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5120:1: rule__GlobalScopeExpression__Group__2 : rule__GlobalScopeExpression__Group__2__Impl rule__GlobalScopeExpression__Group__3 ;
+    // InternalScope.g:5120:1: rule__GlobalScopeExpression__Group__2 : rule__GlobalScopeExpression__Group__2__Impl rule__GlobalScopeExpression__Group__3 ;
     public final void rule__GlobalScopeExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5124:1: ( rule__GlobalScopeExpression__Group__2__Impl rule__GlobalScopeExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5125:2: rule__GlobalScopeExpression__Group__2__Impl rule__GlobalScopeExpression__Group__3
+            // InternalScope.g:5124:1: ( rule__GlobalScopeExpression__Group__2__Impl rule__GlobalScopeExpression__Group__3 )
+            // InternalScope.g:5125:2: rule__GlobalScopeExpression__Group__2__Impl rule__GlobalScopeExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group__2__Impl_in_rule__GlobalScopeExpression__Group__210634);
+            pushFollow(FOLLOW_34);
             rule__GlobalScopeExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group__3_in_rule__GlobalScopeExpression__Group__210637);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__Group__3();
 
             state._fsp--;
@@ -15562,25 +15562,25 @@ public final void rule__GlobalScopeExpression__Group__2() throws RecognitionExce
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5132:1: rule__GlobalScopeExpression__Group__2__Impl : ( ( rule__GlobalScopeExpression__TypeAssignment_2 ) ) ;
+    // InternalScope.g:5132:1: rule__GlobalScopeExpression__Group__2__Impl : ( ( rule__GlobalScopeExpression__TypeAssignment_2 ) ) ;
     public final void rule__GlobalScopeExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5136:1: ( ( ( rule__GlobalScopeExpression__TypeAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5137:1: ( ( rule__GlobalScopeExpression__TypeAssignment_2 ) )
+            // InternalScope.g:5136:1: ( ( ( rule__GlobalScopeExpression__TypeAssignment_2 ) ) )
+            // InternalScope.g:5137:1: ( ( rule__GlobalScopeExpression__TypeAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5137:1: ( ( rule__GlobalScopeExpression__TypeAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5138:1: ( rule__GlobalScopeExpression__TypeAssignment_2 )
+            // InternalScope.g:5137:1: ( ( rule__GlobalScopeExpression__TypeAssignment_2 ) )
+            // InternalScope.g:5138:1: ( rule__GlobalScopeExpression__TypeAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getTypeAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5139:1: ( rule__GlobalScopeExpression__TypeAssignment_2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5139:2: rule__GlobalScopeExpression__TypeAssignment_2
+            // InternalScope.g:5139:1: ( rule__GlobalScopeExpression__TypeAssignment_2 )
+            // InternalScope.g:5139:2: rule__GlobalScopeExpression__TypeAssignment_2
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__TypeAssignment_2_in_rule__GlobalScopeExpression__Group__2__Impl10664);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__TypeAssignment_2();
 
             state._fsp--;
@@ -15613,21 +15613,21 @@ public final void rule__GlobalScopeExpression__Group__2__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5149:1: rule__GlobalScopeExpression__Group__3 : rule__GlobalScopeExpression__Group__3__Impl rule__GlobalScopeExpression__Group__4 ;
+    // InternalScope.g:5149:1: rule__GlobalScopeExpression__Group__3 : rule__GlobalScopeExpression__Group__3__Impl rule__GlobalScopeExpression__Group__4 ;
     public final void rule__GlobalScopeExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5153:1: ( rule__GlobalScopeExpression__Group__3__Impl rule__GlobalScopeExpression__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5154:2: rule__GlobalScopeExpression__Group__3__Impl rule__GlobalScopeExpression__Group__4
+            // InternalScope.g:5153:1: ( rule__GlobalScopeExpression__Group__3__Impl rule__GlobalScopeExpression__Group__4 )
+            // InternalScope.g:5154:2: rule__GlobalScopeExpression__Group__3__Impl rule__GlobalScopeExpression__Group__4
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group__3__Impl_in_rule__GlobalScopeExpression__Group__310694);
+            pushFollow(FOLLOW_34);
             rule__GlobalScopeExpression__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group__4_in_rule__GlobalScopeExpression__Group__310697);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__Group__4();
 
             state._fsp--;
@@ -15651,22 +15651,22 @@ public final void rule__GlobalScopeExpression__Group__3() throws RecognitionExce
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5161:1: rule__GlobalScopeExpression__Group__3__Impl : ( ( rule__GlobalScopeExpression__Alternatives_3 )? ) ;
+    // InternalScope.g:5161:1: rule__GlobalScopeExpression__Group__3__Impl : ( ( rule__GlobalScopeExpression__Alternatives_3 )? ) ;
     public final void rule__GlobalScopeExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5165:1: ( ( ( rule__GlobalScopeExpression__Alternatives_3 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5166:1: ( ( rule__GlobalScopeExpression__Alternatives_3 )? )
+            // InternalScope.g:5165:1: ( ( ( rule__GlobalScopeExpression__Alternatives_3 )? ) )
+            // InternalScope.g:5166:1: ( ( rule__GlobalScopeExpression__Alternatives_3 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5166:1: ( ( rule__GlobalScopeExpression__Alternatives_3 )? )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5167:1: ( rule__GlobalScopeExpression__Alternatives_3 )?
+            // InternalScope.g:5166:1: ( ( rule__GlobalScopeExpression__Alternatives_3 )? )
+            // InternalScope.g:5167:1: ( rule__GlobalScopeExpression__Alternatives_3 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getAlternatives_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5168:1: ( rule__GlobalScopeExpression__Alternatives_3 )?
+            // InternalScope.g:5168:1: ( rule__GlobalScopeExpression__Alternatives_3 )?
             int alt45=2;
             int LA45_0 = input.LA(1);
 
@@ -15679,9 +15679,9 @@ public final void rule__GlobalScopeExpression__Group__3__Impl() throws Recogniti
             }
             switch (alt45) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5168:2: rule__GlobalScopeExpression__Alternatives_3
+                    // InternalScope.g:5168:2: rule__GlobalScopeExpression__Alternatives_3
                     {
-                    pushFollow(FOLLOW_rule__GlobalScopeExpression__Alternatives_3_in_rule__GlobalScopeExpression__Group__3__Impl10724);
+                    pushFollow(FOLLOW_2);
                     rule__GlobalScopeExpression__Alternatives_3();
 
                     state._fsp--;
@@ -15717,21 +15717,21 @@ public final void rule__GlobalScopeExpression__Group__3__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5178:1: rule__GlobalScopeExpression__Group__4 : rule__GlobalScopeExpression__Group__4__Impl rule__GlobalScopeExpression__Group__5 ;
+    // InternalScope.g:5178:1: rule__GlobalScopeExpression__Group__4 : rule__GlobalScopeExpression__Group__4__Impl rule__GlobalScopeExpression__Group__5 ;
     public final void rule__GlobalScopeExpression__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5182:1: ( rule__GlobalScopeExpression__Group__4__Impl rule__GlobalScopeExpression__Group__5 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5183:2: rule__GlobalScopeExpression__Group__4__Impl rule__GlobalScopeExpression__Group__5
+            // InternalScope.g:5182:1: ( rule__GlobalScopeExpression__Group__4__Impl rule__GlobalScopeExpression__Group__5 )
+            // InternalScope.g:5183:2: rule__GlobalScopeExpression__Group__4__Impl rule__GlobalScopeExpression__Group__5
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group__4__Impl_in_rule__GlobalScopeExpression__Group__410755);
+            pushFollow(FOLLOW_34);
             rule__GlobalScopeExpression__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group__5_in_rule__GlobalScopeExpression__Group__410758);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__Group__5();
 
             state._fsp--;
@@ -15755,22 +15755,22 @@ public final void rule__GlobalScopeExpression__Group__4() throws RecognitionExce
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5190:1: rule__GlobalScopeExpression__Group__4__Impl : ( ( rule__GlobalScopeExpression__Group_4__0 )? ) ;
+    // InternalScope.g:5190:1: rule__GlobalScopeExpression__Group__4__Impl : ( ( rule__GlobalScopeExpression__Group_4__0 )? ) ;
     public final void rule__GlobalScopeExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5194:1: ( ( ( rule__GlobalScopeExpression__Group_4__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5195:1: ( ( rule__GlobalScopeExpression__Group_4__0 )? )
+            // InternalScope.g:5194:1: ( ( ( rule__GlobalScopeExpression__Group_4__0 )? ) )
+            // InternalScope.g:5195:1: ( ( rule__GlobalScopeExpression__Group_4__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5195:1: ( ( rule__GlobalScopeExpression__Group_4__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5196:1: ( rule__GlobalScopeExpression__Group_4__0 )?
+            // InternalScope.g:5195:1: ( ( rule__GlobalScopeExpression__Group_4__0 )? )
+            // InternalScope.g:5196:1: ( rule__GlobalScopeExpression__Group_4__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getGroup_4()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5197:1: ( rule__GlobalScopeExpression__Group_4__0 )?
+            // InternalScope.g:5197:1: ( rule__GlobalScopeExpression__Group_4__0 )?
             int alt46=2;
             int LA46_0 = input.LA(1);
 
@@ -15783,9 +15783,9 @@ public final void rule__GlobalScopeExpression__Group__4__Impl() throws Recogniti
             }
             switch (alt46) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5197:2: rule__GlobalScopeExpression__Group_4__0
+                    // InternalScope.g:5197:2: rule__GlobalScopeExpression__Group_4__0
                     {
-                    pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_4__0_in_rule__GlobalScopeExpression__Group__4__Impl10785);
+                    pushFollow(FOLLOW_2);
                     rule__GlobalScopeExpression__Group_4__0();
 
                     state._fsp--;
@@ -15821,21 +15821,21 @@ public final void rule__GlobalScopeExpression__Group__4__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group__5"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5207:1: rule__GlobalScopeExpression__Group__5 : rule__GlobalScopeExpression__Group__5__Impl rule__GlobalScopeExpression__Group__6 ;
+    // InternalScope.g:5207:1: rule__GlobalScopeExpression__Group__5 : rule__GlobalScopeExpression__Group__5__Impl rule__GlobalScopeExpression__Group__6 ;
     public final void rule__GlobalScopeExpression__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5211:1: ( rule__GlobalScopeExpression__Group__5__Impl rule__GlobalScopeExpression__Group__6 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5212:2: rule__GlobalScopeExpression__Group__5__Impl rule__GlobalScopeExpression__Group__6
+            // InternalScope.g:5211:1: ( rule__GlobalScopeExpression__Group__5__Impl rule__GlobalScopeExpression__Group__6 )
+            // InternalScope.g:5212:2: rule__GlobalScopeExpression__Group__5__Impl rule__GlobalScopeExpression__Group__6
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group__5__Impl_in_rule__GlobalScopeExpression__Group__510816);
+            pushFollow(FOLLOW_34);
             rule__GlobalScopeExpression__Group__5__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group__6_in_rule__GlobalScopeExpression__Group__510819);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__Group__6();
 
             state._fsp--;
@@ -15859,22 +15859,22 @@ public final void rule__GlobalScopeExpression__Group__5() throws RecognitionExce
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5219:1: rule__GlobalScopeExpression__Group__5__Impl : ( ( rule__GlobalScopeExpression__Group_5__0 )? ) ;
+    // InternalScope.g:5219:1: rule__GlobalScopeExpression__Group__5__Impl : ( ( rule__GlobalScopeExpression__Group_5__0 )? ) ;
     public final void rule__GlobalScopeExpression__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5223:1: ( ( ( rule__GlobalScopeExpression__Group_5__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5224:1: ( ( rule__GlobalScopeExpression__Group_5__0 )? )
+            // InternalScope.g:5223:1: ( ( ( rule__GlobalScopeExpression__Group_5__0 )? ) )
+            // InternalScope.g:5224:1: ( ( rule__GlobalScopeExpression__Group_5__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5224:1: ( ( rule__GlobalScopeExpression__Group_5__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5225:1: ( rule__GlobalScopeExpression__Group_5__0 )?
+            // InternalScope.g:5224:1: ( ( rule__GlobalScopeExpression__Group_5__0 )? )
+            // InternalScope.g:5225:1: ( rule__GlobalScopeExpression__Group_5__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getGroup_5()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5226:1: ( rule__GlobalScopeExpression__Group_5__0 )?
+            // InternalScope.g:5226:1: ( rule__GlobalScopeExpression__Group_5__0 )?
             int alt47=2;
             int LA47_0 = input.LA(1);
 
@@ -15883,9 +15883,9 @@ public final void rule__GlobalScopeExpression__Group__5__Impl() throws Recogniti
             }
             switch (alt47) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5226:2: rule__GlobalScopeExpression__Group_5__0
+                    // InternalScope.g:5226:2: rule__GlobalScopeExpression__Group_5__0
                     {
-                    pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_5__0_in_rule__GlobalScopeExpression__Group__5__Impl10846);
+                    pushFollow(FOLLOW_2);
                     rule__GlobalScopeExpression__Group_5__0();
 
                     state._fsp--;
@@ -15921,16 +15921,16 @@ public final void rule__GlobalScopeExpression__Group__5__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group__6"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5236:1: rule__GlobalScopeExpression__Group__6 : rule__GlobalScopeExpression__Group__6__Impl ;
+    // InternalScope.g:5236:1: rule__GlobalScopeExpression__Group__6 : rule__GlobalScopeExpression__Group__6__Impl ;
     public final void rule__GlobalScopeExpression__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5240:1: ( rule__GlobalScopeExpression__Group__6__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5241:2: rule__GlobalScopeExpression__Group__6__Impl
+            // InternalScope.g:5240:1: ( rule__GlobalScopeExpression__Group__6__Impl )
+            // InternalScope.g:5241:2: rule__GlobalScopeExpression__Group__6__Impl
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group__6__Impl_in_rule__GlobalScopeExpression__Group__610877);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__Group__6__Impl();
 
             state._fsp--;
@@ -15954,22 +15954,22 @@ public final void rule__GlobalScopeExpression__Group__6() throws RecognitionExce
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group__6__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5247:1: rule__GlobalScopeExpression__Group__6__Impl : ( ')' ) ;
+    // InternalScope.g:5247:1: rule__GlobalScopeExpression__Group__6__Impl : ( ')' ) ;
     public final void rule__GlobalScopeExpression__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5251:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5252:1: ( ')' )
+            // InternalScope.g:5251:1: ( ( ')' ) )
+            // InternalScope.g:5252:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5252:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5253:1: ')'
+            // InternalScope.g:5252:1: ( ')' )
+            // InternalScope.g:5253:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getRightParenthesisKeyword_6()); 
             }
-            match(input,52,FOLLOW_52_in_rule__GlobalScopeExpression__Group__6__Impl10905); if (state.failed) return ;
+            match(input,52,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGlobalScopeExpressionAccess().getRightParenthesisKeyword_6()); 
             }
@@ -15995,21 +15995,21 @@ public final void rule__GlobalScopeExpression__Group__6__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_3_0__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5280:1: rule__GlobalScopeExpression__Group_3_0__0 : rule__GlobalScopeExpression__Group_3_0__0__Impl rule__GlobalScopeExpression__Group_3_0__1 ;
+    // InternalScope.g:5280:1: rule__GlobalScopeExpression__Group_3_0__0 : rule__GlobalScopeExpression__Group_3_0__0__Impl rule__GlobalScopeExpression__Group_3_0__1 ;
     public final void rule__GlobalScopeExpression__Group_3_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5284:1: ( rule__GlobalScopeExpression__Group_3_0__0__Impl rule__GlobalScopeExpression__Group_3_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5285:2: rule__GlobalScopeExpression__Group_3_0__0__Impl rule__GlobalScopeExpression__Group_3_0__1
+            // InternalScope.g:5284:1: ( rule__GlobalScopeExpression__Group_3_0__0__Impl rule__GlobalScopeExpression__Group_3_0__1 )
+            // InternalScope.g:5285:2: rule__GlobalScopeExpression__Group_3_0__0__Impl rule__GlobalScopeExpression__Group_3_0__1
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_3_0__0__Impl_in_rule__GlobalScopeExpression__Group_3_0__010950);
+            pushFollow(FOLLOW_36);
             rule__GlobalScopeExpression__Group_3_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_3_0__1_in_rule__GlobalScopeExpression__Group_3_0__010953);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__Group_3_0__1();
 
             state._fsp--;
@@ -16033,22 +16033,22 @@ public final void rule__GlobalScopeExpression__Group_3_0__0() throws Recognition
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_3_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5292:1: rule__GlobalScopeExpression__Group_3_0__0__Impl : ( ',' ) ;
+    // InternalScope.g:5292:1: rule__GlobalScopeExpression__Group_3_0__0__Impl : ( ',' ) ;
     public final void rule__GlobalScopeExpression__Group_3_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5296:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5297:1: ( ',' )
+            // InternalScope.g:5296:1: ( ( ',' ) )
+            // InternalScope.g:5297:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5297:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5298:1: ','
+            // InternalScope.g:5297:1: ( ',' )
+            // InternalScope.g:5298:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getCommaKeyword_3_0_0()); 
             }
-            match(input,61,FOLLOW_61_in_rule__GlobalScopeExpression__Group_3_0__0__Impl10981); if (state.failed) return ;
+            match(input,61,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGlobalScopeExpressionAccess().getCommaKeyword_3_0_0()); 
             }
@@ -16074,21 +16074,21 @@ public final void rule__GlobalScopeExpression__Group_3_0__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_3_0__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5311:1: rule__GlobalScopeExpression__Group_3_0__1 : rule__GlobalScopeExpression__Group_3_0__1__Impl rule__GlobalScopeExpression__Group_3_0__2 ;
+    // InternalScope.g:5311:1: rule__GlobalScopeExpression__Group_3_0__1 : rule__GlobalScopeExpression__Group_3_0__1__Impl rule__GlobalScopeExpression__Group_3_0__2 ;
     public final void rule__GlobalScopeExpression__Group_3_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5315:1: ( rule__GlobalScopeExpression__Group_3_0__1__Impl rule__GlobalScopeExpression__Group_3_0__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5316:2: rule__GlobalScopeExpression__Group_3_0__1__Impl rule__GlobalScopeExpression__Group_3_0__2
+            // InternalScope.g:5315:1: ( rule__GlobalScopeExpression__Group_3_0__1__Impl rule__GlobalScopeExpression__Group_3_0__2 )
+            // InternalScope.g:5316:2: rule__GlobalScopeExpression__Group_3_0__1__Impl rule__GlobalScopeExpression__Group_3_0__2
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_3_0__1__Impl_in_rule__GlobalScopeExpression__Group_3_0__111012);
+            pushFollow(FOLLOW_16);
             rule__GlobalScopeExpression__Group_3_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_3_0__2_in_rule__GlobalScopeExpression__Group_3_0__111015);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__Group_3_0__2();
 
             state._fsp--;
@@ -16112,22 +16112,22 @@ public final void rule__GlobalScopeExpression__Group_3_0__1() throws Recognition
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_3_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5323:1: rule__GlobalScopeExpression__Group_3_0__1__Impl : ( 'key' ) ;
+    // InternalScope.g:5323:1: rule__GlobalScopeExpression__Group_3_0__1__Impl : ( 'key' ) ;
     public final void rule__GlobalScopeExpression__Group_3_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5327:1: ( ( 'key' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5328:1: ( 'key' )
+            // InternalScope.g:5327:1: ( ( 'key' ) )
+            // InternalScope.g:5328:1: ( 'key' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5328:1: ( 'key' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5329:1: 'key'
+            // InternalScope.g:5328:1: ( 'key' )
+            // InternalScope.g:5329:1: 'key'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getKeyKeyword_3_0_1()); 
             }
-            match(input,63,FOLLOW_63_in_rule__GlobalScopeExpression__Group_3_0__1__Impl11043); if (state.failed) return ;
+            match(input,63,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGlobalScopeExpressionAccess().getKeyKeyword_3_0_1()); 
             }
@@ -16153,21 +16153,21 @@ public final void rule__GlobalScopeExpression__Group_3_0__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_3_0__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5342:1: rule__GlobalScopeExpression__Group_3_0__2 : rule__GlobalScopeExpression__Group_3_0__2__Impl rule__GlobalScopeExpression__Group_3_0__3 ;
+    // InternalScope.g:5342:1: rule__GlobalScopeExpression__Group_3_0__2 : rule__GlobalScopeExpression__Group_3_0__2__Impl rule__GlobalScopeExpression__Group_3_0__3 ;
     public final void rule__GlobalScopeExpression__Group_3_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5346:1: ( rule__GlobalScopeExpression__Group_3_0__2__Impl rule__GlobalScopeExpression__Group_3_0__3 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5347:2: rule__GlobalScopeExpression__Group_3_0__2__Impl rule__GlobalScopeExpression__Group_3_0__3
+            // InternalScope.g:5346:1: ( rule__GlobalScopeExpression__Group_3_0__2__Impl rule__GlobalScopeExpression__Group_3_0__3 )
+            // InternalScope.g:5347:2: rule__GlobalScopeExpression__Group_3_0__2__Impl rule__GlobalScopeExpression__Group_3_0__3
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_3_0__2__Impl_in_rule__GlobalScopeExpression__Group_3_0__211074);
+            pushFollow(FOLLOW_17);
             rule__GlobalScopeExpression__Group_3_0__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_3_0__3_in_rule__GlobalScopeExpression__Group_3_0__211077);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__Group_3_0__3();
 
             state._fsp--;
@@ -16191,22 +16191,22 @@ public final void rule__GlobalScopeExpression__Group_3_0__2() throws Recognition
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_3_0__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5354:1: rule__GlobalScopeExpression__Group_3_0__2__Impl : ( '=' ) ;
+    // InternalScope.g:5354:1: rule__GlobalScopeExpression__Group_3_0__2__Impl : ( '=' ) ;
     public final void rule__GlobalScopeExpression__Group_3_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5358:1: ( ( '=' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5359:1: ( '=' )
+            // InternalScope.g:5358:1: ( ( '=' ) )
+            // InternalScope.g:5359:1: ( '=' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5359:1: ( '=' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5360:1: '='
+            // InternalScope.g:5359:1: ( '=' )
+            // InternalScope.g:5360:1: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getEqualsSignKeyword_3_0_2()); 
             }
-            match(input,48,FOLLOW_48_in_rule__GlobalScopeExpression__Group_3_0__2__Impl11105); if (state.failed) return ;
+            match(input,48,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGlobalScopeExpressionAccess().getEqualsSignKeyword_3_0_2()); 
             }
@@ -16232,16 +16232,16 @@ public final void rule__GlobalScopeExpression__Group_3_0__2__Impl() throws Recog
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_3_0__3"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5373:1: rule__GlobalScopeExpression__Group_3_0__3 : rule__GlobalScopeExpression__Group_3_0__3__Impl ;
+    // InternalScope.g:5373:1: rule__GlobalScopeExpression__Group_3_0__3 : rule__GlobalScopeExpression__Group_3_0__3__Impl ;
     public final void rule__GlobalScopeExpression__Group_3_0__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5377:1: ( rule__GlobalScopeExpression__Group_3_0__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5378:2: rule__GlobalScopeExpression__Group_3_0__3__Impl
+            // InternalScope.g:5377:1: ( rule__GlobalScopeExpression__Group_3_0__3__Impl )
+            // InternalScope.g:5378:2: rule__GlobalScopeExpression__Group_3_0__3__Impl
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_3_0__3__Impl_in_rule__GlobalScopeExpression__Group_3_0__311136);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__Group_3_0__3__Impl();
 
             state._fsp--;
@@ -16265,25 +16265,25 @@ public final void rule__GlobalScopeExpression__Group_3_0__3() throws Recognition
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_3_0__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5384:1: rule__GlobalScopeExpression__Group_3_0__3__Impl : ( ( rule__GlobalScopeExpression__NameAssignment_3_0_3 ) ) ;
+    // InternalScope.g:5384:1: rule__GlobalScopeExpression__Group_3_0__3__Impl : ( ( rule__GlobalScopeExpression__NameAssignment_3_0_3 ) ) ;
     public final void rule__GlobalScopeExpression__Group_3_0__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5388:1: ( ( ( rule__GlobalScopeExpression__NameAssignment_3_0_3 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5389:1: ( ( rule__GlobalScopeExpression__NameAssignment_3_0_3 ) )
+            // InternalScope.g:5388:1: ( ( ( rule__GlobalScopeExpression__NameAssignment_3_0_3 ) ) )
+            // InternalScope.g:5389:1: ( ( rule__GlobalScopeExpression__NameAssignment_3_0_3 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5389:1: ( ( rule__GlobalScopeExpression__NameAssignment_3_0_3 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5390:1: ( rule__GlobalScopeExpression__NameAssignment_3_0_3 )
+            // InternalScope.g:5389:1: ( ( rule__GlobalScopeExpression__NameAssignment_3_0_3 ) )
+            // InternalScope.g:5390:1: ( rule__GlobalScopeExpression__NameAssignment_3_0_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getNameAssignment_3_0_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5391:1: ( rule__GlobalScopeExpression__NameAssignment_3_0_3 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5391:2: rule__GlobalScopeExpression__NameAssignment_3_0_3
+            // InternalScope.g:5391:1: ( rule__GlobalScopeExpression__NameAssignment_3_0_3 )
+            // InternalScope.g:5391:2: rule__GlobalScopeExpression__NameAssignment_3_0_3
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__NameAssignment_3_0_3_in_rule__GlobalScopeExpression__Group_3_0__3__Impl11163);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__NameAssignment_3_0_3();
 
             state._fsp--;
@@ -16316,21 +16316,21 @@ public final void rule__GlobalScopeExpression__Group_3_0__3__Impl() throws Recog
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_3_1__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5409:1: rule__GlobalScopeExpression__Group_3_1__0 : rule__GlobalScopeExpression__Group_3_1__0__Impl rule__GlobalScopeExpression__Group_3_1__1 ;
+    // InternalScope.g:5409:1: rule__GlobalScopeExpression__Group_3_1__0 : rule__GlobalScopeExpression__Group_3_1__0__Impl rule__GlobalScopeExpression__Group_3_1__1 ;
     public final void rule__GlobalScopeExpression__Group_3_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5413:1: ( rule__GlobalScopeExpression__Group_3_1__0__Impl rule__GlobalScopeExpression__Group_3_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5414:2: rule__GlobalScopeExpression__Group_3_1__0__Impl rule__GlobalScopeExpression__Group_3_1__1
+            // InternalScope.g:5413:1: ( rule__GlobalScopeExpression__Group_3_1__0__Impl rule__GlobalScopeExpression__Group_3_1__1 )
+            // InternalScope.g:5414:2: rule__GlobalScopeExpression__Group_3_1__0__Impl rule__GlobalScopeExpression__Group_3_1__1
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_3_1__0__Impl_in_rule__GlobalScopeExpression__Group_3_1__011201);
+            pushFollow(FOLLOW_37);
             rule__GlobalScopeExpression__Group_3_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_3_1__1_in_rule__GlobalScopeExpression__Group_3_1__011204);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__Group_3_1__1();
 
             state._fsp--;
@@ -16354,22 +16354,22 @@ public final void rule__GlobalScopeExpression__Group_3_1__0() throws Recognition
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_3_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5421:1: rule__GlobalScopeExpression__Group_3_1__0__Impl : ( ',' ) ;
+    // InternalScope.g:5421:1: rule__GlobalScopeExpression__Group_3_1__0__Impl : ( ',' ) ;
     public final void rule__GlobalScopeExpression__Group_3_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5425:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5426:1: ( ',' )
+            // InternalScope.g:5425:1: ( ( ',' ) )
+            // InternalScope.g:5426:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5426:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5427:1: ','
+            // InternalScope.g:5426:1: ( ',' )
+            // InternalScope.g:5427:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getCommaKeyword_3_1_0()); 
             }
-            match(input,61,FOLLOW_61_in_rule__GlobalScopeExpression__Group_3_1__0__Impl11232); if (state.failed) return ;
+            match(input,61,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGlobalScopeExpressionAccess().getCommaKeyword_3_1_0()); 
             }
@@ -16395,21 +16395,21 @@ public final void rule__GlobalScopeExpression__Group_3_1__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_3_1__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5440:1: rule__GlobalScopeExpression__Group_3_1__1 : rule__GlobalScopeExpression__Group_3_1__1__Impl rule__GlobalScopeExpression__Group_3_1__2 ;
+    // InternalScope.g:5440:1: rule__GlobalScopeExpression__Group_3_1__1 : rule__GlobalScopeExpression__Group_3_1__1__Impl rule__GlobalScopeExpression__Group_3_1__2 ;
     public final void rule__GlobalScopeExpression__Group_3_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5444:1: ( rule__GlobalScopeExpression__Group_3_1__1__Impl rule__GlobalScopeExpression__Group_3_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5445:2: rule__GlobalScopeExpression__Group_3_1__1__Impl rule__GlobalScopeExpression__Group_3_1__2
+            // InternalScope.g:5444:1: ( rule__GlobalScopeExpression__Group_3_1__1__Impl rule__GlobalScopeExpression__Group_3_1__2 )
+            // InternalScope.g:5445:2: rule__GlobalScopeExpression__Group_3_1__1__Impl rule__GlobalScopeExpression__Group_3_1__2
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_3_1__1__Impl_in_rule__GlobalScopeExpression__Group_3_1__111263);
+            pushFollow(FOLLOW_37);
             rule__GlobalScopeExpression__Group_3_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_3_1__2_in_rule__GlobalScopeExpression__Group_3_1__111266);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__Group_3_1__2();
 
             state._fsp--;
@@ -16433,22 +16433,22 @@ public final void rule__GlobalScopeExpression__Group_3_1__1() throws Recognition
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_3_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5452:1: rule__GlobalScopeExpression__Group_3_1__1__Impl : ( ( rule__GlobalScopeExpression__RecursivePrefixAssignment_3_1_1 )? ) ;
+    // InternalScope.g:5452:1: rule__GlobalScopeExpression__Group_3_1__1__Impl : ( ( rule__GlobalScopeExpression__RecursivePrefixAssignment_3_1_1 )? ) ;
     public final void rule__GlobalScopeExpression__Group_3_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5456:1: ( ( ( rule__GlobalScopeExpression__RecursivePrefixAssignment_3_1_1 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5457:1: ( ( rule__GlobalScopeExpression__RecursivePrefixAssignment_3_1_1 )? )
+            // InternalScope.g:5456:1: ( ( ( rule__GlobalScopeExpression__RecursivePrefixAssignment_3_1_1 )? ) )
+            // InternalScope.g:5457:1: ( ( rule__GlobalScopeExpression__RecursivePrefixAssignment_3_1_1 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5457:1: ( ( rule__GlobalScopeExpression__RecursivePrefixAssignment_3_1_1 )? )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5458:1: ( rule__GlobalScopeExpression__RecursivePrefixAssignment_3_1_1 )?
+            // InternalScope.g:5457:1: ( ( rule__GlobalScopeExpression__RecursivePrefixAssignment_3_1_1 )? )
+            // InternalScope.g:5458:1: ( rule__GlobalScopeExpression__RecursivePrefixAssignment_3_1_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getRecursivePrefixAssignment_3_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5459:1: ( rule__GlobalScopeExpression__RecursivePrefixAssignment_3_1_1 )?
+            // InternalScope.g:5459:1: ( rule__GlobalScopeExpression__RecursivePrefixAssignment_3_1_1 )?
             int alt48=2;
             int LA48_0 = input.LA(1);
 
@@ -16457,9 +16457,9 @@ public final void rule__GlobalScopeExpression__Group_3_1__1__Impl() throws Recog
             }
             switch (alt48) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5459:2: rule__GlobalScopeExpression__RecursivePrefixAssignment_3_1_1
+                    // InternalScope.g:5459:2: rule__GlobalScopeExpression__RecursivePrefixAssignment_3_1_1
                     {
-                    pushFollow(FOLLOW_rule__GlobalScopeExpression__RecursivePrefixAssignment_3_1_1_in_rule__GlobalScopeExpression__Group_3_1__1__Impl11293);
+                    pushFollow(FOLLOW_2);
                     rule__GlobalScopeExpression__RecursivePrefixAssignment_3_1_1();
 
                     state._fsp--;
@@ -16495,21 +16495,21 @@ public final void rule__GlobalScopeExpression__Group_3_1__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_3_1__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5469:1: rule__GlobalScopeExpression__Group_3_1__2 : rule__GlobalScopeExpression__Group_3_1__2__Impl rule__GlobalScopeExpression__Group_3_1__3 ;
+    // InternalScope.g:5469:1: rule__GlobalScopeExpression__Group_3_1__2 : rule__GlobalScopeExpression__Group_3_1__2__Impl rule__GlobalScopeExpression__Group_3_1__3 ;
     public final void rule__GlobalScopeExpression__Group_3_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5473:1: ( rule__GlobalScopeExpression__Group_3_1__2__Impl rule__GlobalScopeExpression__Group_3_1__3 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5474:2: rule__GlobalScopeExpression__Group_3_1__2__Impl rule__GlobalScopeExpression__Group_3_1__3
+            // InternalScope.g:5473:1: ( rule__GlobalScopeExpression__Group_3_1__2__Impl rule__GlobalScopeExpression__Group_3_1__3 )
+            // InternalScope.g:5474:2: rule__GlobalScopeExpression__Group_3_1__2__Impl rule__GlobalScopeExpression__Group_3_1__3
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_3_1__2__Impl_in_rule__GlobalScopeExpression__Group_3_1__211324);
+            pushFollow(FOLLOW_16);
             rule__GlobalScopeExpression__Group_3_1__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_3_1__3_in_rule__GlobalScopeExpression__Group_3_1__211327);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__Group_3_1__3();
 
             state._fsp--;
@@ -16533,22 +16533,22 @@ public final void rule__GlobalScopeExpression__Group_3_1__2() throws Recognition
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_3_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5481:1: rule__GlobalScopeExpression__Group_3_1__2__Impl : ( 'prefix' ) ;
+    // InternalScope.g:5481:1: rule__GlobalScopeExpression__Group_3_1__2__Impl : ( 'prefix' ) ;
     public final void rule__GlobalScopeExpression__Group_3_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5485:1: ( ( 'prefix' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5486:1: ( 'prefix' )
+            // InternalScope.g:5485:1: ( ( 'prefix' ) )
+            // InternalScope.g:5486:1: ( 'prefix' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5486:1: ( 'prefix' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5487:1: 'prefix'
+            // InternalScope.g:5486:1: ( 'prefix' )
+            // InternalScope.g:5487:1: 'prefix'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getPrefixKeyword_3_1_2()); 
             }
-            match(input,64,FOLLOW_64_in_rule__GlobalScopeExpression__Group_3_1__2__Impl11355); if (state.failed) return ;
+            match(input,64,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGlobalScopeExpressionAccess().getPrefixKeyword_3_1_2()); 
             }
@@ -16574,21 +16574,21 @@ public final void rule__GlobalScopeExpression__Group_3_1__2__Impl() throws Recog
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_3_1__3"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5500:1: rule__GlobalScopeExpression__Group_3_1__3 : rule__GlobalScopeExpression__Group_3_1__3__Impl rule__GlobalScopeExpression__Group_3_1__4 ;
+    // InternalScope.g:5500:1: rule__GlobalScopeExpression__Group_3_1__3 : rule__GlobalScopeExpression__Group_3_1__3__Impl rule__GlobalScopeExpression__Group_3_1__4 ;
     public final void rule__GlobalScopeExpression__Group_3_1__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5504:1: ( rule__GlobalScopeExpression__Group_3_1__3__Impl rule__GlobalScopeExpression__Group_3_1__4 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5505:2: rule__GlobalScopeExpression__Group_3_1__3__Impl rule__GlobalScopeExpression__Group_3_1__4
+            // InternalScope.g:5504:1: ( rule__GlobalScopeExpression__Group_3_1__3__Impl rule__GlobalScopeExpression__Group_3_1__4 )
+            // InternalScope.g:5505:2: rule__GlobalScopeExpression__Group_3_1__3__Impl rule__GlobalScopeExpression__Group_3_1__4
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_3_1__3__Impl_in_rule__GlobalScopeExpression__Group_3_1__311386);
+            pushFollow(FOLLOW_17);
             rule__GlobalScopeExpression__Group_3_1__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_3_1__4_in_rule__GlobalScopeExpression__Group_3_1__311389);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__Group_3_1__4();
 
             state._fsp--;
@@ -16612,22 +16612,22 @@ public final void rule__GlobalScopeExpression__Group_3_1__3() throws Recognition
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_3_1__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5512:1: rule__GlobalScopeExpression__Group_3_1__3__Impl : ( '=' ) ;
+    // InternalScope.g:5512:1: rule__GlobalScopeExpression__Group_3_1__3__Impl : ( '=' ) ;
     public final void rule__GlobalScopeExpression__Group_3_1__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5516:1: ( ( '=' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5517:1: ( '=' )
+            // InternalScope.g:5516:1: ( ( '=' ) )
+            // InternalScope.g:5517:1: ( '=' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5517:1: ( '=' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5518:1: '='
+            // InternalScope.g:5517:1: ( '=' )
+            // InternalScope.g:5518:1: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getEqualsSignKeyword_3_1_3()); 
             }
-            match(input,48,FOLLOW_48_in_rule__GlobalScopeExpression__Group_3_1__3__Impl11417); if (state.failed) return ;
+            match(input,48,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGlobalScopeExpressionAccess().getEqualsSignKeyword_3_1_3()); 
             }
@@ -16653,16 +16653,16 @@ public final void rule__GlobalScopeExpression__Group_3_1__3__Impl() throws Recog
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_3_1__4"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5531:1: rule__GlobalScopeExpression__Group_3_1__4 : rule__GlobalScopeExpression__Group_3_1__4__Impl ;
+    // InternalScope.g:5531:1: rule__GlobalScopeExpression__Group_3_1__4 : rule__GlobalScopeExpression__Group_3_1__4__Impl ;
     public final void rule__GlobalScopeExpression__Group_3_1__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5535:1: ( rule__GlobalScopeExpression__Group_3_1__4__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5536:2: rule__GlobalScopeExpression__Group_3_1__4__Impl
+            // InternalScope.g:5535:1: ( rule__GlobalScopeExpression__Group_3_1__4__Impl )
+            // InternalScope.g:5536:2: rule__GlobalScopeExpression__Group_3_1__4__Impl
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_3_1__4__Impl_in_rule__GlobalScopeExpression__Group_3_1__411448);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__Group_3_1__4__Impl();
 
             state._fsp--;
@@ -16686,25 +16686,25 @@ public final void rule__GlobalScopeExpression__Group_3_1__4() throws Recognition
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_3_1__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5542:1: rule__GlobalScopeExpression__Group_3_1__4__Impl : ( ( rule__GlobalScopeExpression__PrefixAssignment_3_1_4 ) ) ;
+    // InternalScope.g:5542:1: rule__GlobalScopeExpression__Group_3_1__4__Impl : ( ( rule__GlobalScopeExpression__PrefixAssignment_3_1_4 ) ) ;
     public final void rule__GlobalScopeExpression__Group_3_1__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5546:1: ( ( ( rule__GlobalScopeExpression__PrefixAssignment_3_1_4 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5547:1: ( ( rule__GlobalScopeExpression__PrefixAssignment_3_1_4 ) )
+            // InternalScope.g:5546:1: ( ( ( rule__GlobalScopeExpression__PrefixAssignment_3_1_4 ) ) )
+            // InternalScope.g:5547:1: ( ( rule__GlobalScopeExpression__PrefixAssignment_3_1_4 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5547:1: ( ( rule__GlobalScopeExpression__PrefixAssignment_3_1_4 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5548:1: ( rule__GlobalScopeExpression__PrefixAssignment_3_1_4 )
+            // InternalScope.g:5547:1: ( ( rule__GlobalScopeExpression__PrefixAssignment_3_1_4 ) )
+            // InternalScope.g:5548:1: ( rule__GlobalScopeExpression__PrefixAssignment_3_1_4 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getPrefixAssignment_3_1_4()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5549:1: ( rule__GlobalScopeExpression__PrefixAssignment_3_1_4 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5549:2: rule__GlobalScopeExpression__PrefixAssignment_3_1_4
+            // InternalScope.g:5549:1: ( rule__GlobalScopeExpression__PrefixAssignment_3_1_4 )
+            // InternalScope.g:5549:2: rule__GlobalScopeExpression__PrefixAssignment_3_1_4
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__PrefixAssignment_3_1_4_in_rule__GlobalScopeExpression__Group_3_1__4__Impl11475);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__PrefixAssignment_3_1_4();
 
             state._fsp--;
@@ -16737,21 +16737,21 @@ public final void rule__GlobalScopeExpression__Group_3_1__4__Impl() throws Recog
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_4__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5569:1: rule__GlobalScopeExpression__Group_4__0 : rule__GlobalScopeExpression__Group_4__0__Impl rule__GlobalScopeExpression__Group_4__1 ;
+    // InternalScope.g:5569:1: rule__GlobalScopeExpression__Group_4__0 : rule__GlobalScopeExpression__Group_4__0__Impl rule__GlobalScopeExpression__Group_4__1 ;
     public final void rule__GlobalScopeExpression__Group_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5573:1: ( rule__GlobalScopeExpression__Group_4__0__Impl rule__GlobalScopeExpression__Group_4__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5574:2: rule__GlobalScopeExpression__Group_4__0__Impl rule__GlobalScopeExpression__Group_4__1
+            // InternalScope.g:5573:1: ( rule__GlobalScopeExpression__Group_4__0__Impl rule__GlobalScopeExpression__Group_4__1 )
+            // InternalScope.g:5574:2: rule__GlobalScopeExpression__Group_4__0__Impl rule__GlobalScopeExpression__Group_4__1
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_4__0__Impl_in_rule__GlobalScopeExpression__Group_4__011515);
+            pushFollow(FOLLOW_38);
             rule__GlobalScopeExpression__Group_4__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_4__1_in_rule__GlobalScopeExpression__Group_4__011518);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__Group_4__1();
 
             state._fsp--;
@@ -16775,22 +16775,22 @@ public final void rule__GlobalScopeExpression__Group_4__0() throws RecognitionEx
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_4__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5581:1: rule__GlobalScopeExpression__Group_4__0__Impl : ( ',' ) ;
+    // InternalScope.g:5581:1: rule__GlobalScopeExpression__Group_4__0__Impl : ( ',' ) ;
     public final void rule__GlobalScopeExpression__Group_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5585:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5586:1: ( ',' )
+            // InternalScope.g:5585:1: ( ( ',' ) )
+            // InternalScope.g:5586:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5586:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5587:1: ','
+            // InternalScope.g:5586:1: ( ',' )
+            // InternalScope.g:5587:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getCommaKeyword_4_0()); 
             }
-            match(input,61,FOLLOW_61_in_rule__GlobalScopeExpression__Group_4__0__Impl11546); if (state.failed) return ;
+            match(input,61,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGlobalScopeExpressionAccess().getCommaKeyword_4_0()); 
             }
@@ -16816,21 +16816,21 @@ public final void rule__GlobalScopeExpression__Group_4__0__Impl() throws Recogni
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_4__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5600:1: rule__GlobalScopeExpression__Group_4__1 : rule__GlobalScopeExpression__Group_4__1__Impl rule__GlobalScopeExpression__Group_4__2 ;
+    // InternalScope.g:5600:1: rule__GlobalScopeExpression__Group_4__1 : rule__GlobalScopeExpression__Group_4__1__Impl rule__GlobalScopeExpression__Group_4__2 ;
     public final void rule__GlobalScopeExpression__Group_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5604:1: ( rule__GlobalScopeExpression__Group_4__1__Impl rule__GlobalScopeExpression__Group_4__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5605:2: rule__GlobalScopeExpression__Group_4__1__Impl rule__GlobalScopeExpression__Group_4__2
+            // InternalScope.g:5604:1: ( rule__GlobalScopeExpression__Group_4__1__Impl rule__GlobalScopeExpression__Group_4__2 )
+            // InternalScope.g:5605:2: rule__GlobalScopeExpression__Group_4__1__Impl rule__GlobalScopeExpression__Group_4__2
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_4__1__Impl_in_rule__GlobalScopeExpression__Group_4__111577);
+            pushFollow(FOLLOW_16);
             rule__GlobalScopeExpression__Group_4__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_4__2_in_rule__GlobalScopeExpression__Group_4__111580);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__Group_4__2();
 
             state._fsp--;
@@ -16854,22 +16854,22 @@ public final void rule__GlobalScopeExpression__Group_4__1() throws RecognitionEx
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_4__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5612:1: rule__GlobalScopeExpression__Group_4__1__Impl : ( 'data' ) ;
+    // InternalScope.g:5612:1: rule__GlobalScopeExpression__Group_4__1__Impl : ( 'data' ) ;
     public final void rule__GlobalScopeExpression__Group_4__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5616:1: ( ( 'data' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5617:1: ( 'data' )
+            // InternalScope.g:5616:1: ( ( 'data' ) )
+            // InternalScope.g:5617:1: ( 'data' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5617:1: ( 'data' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5618:1: 'data'
+            // InternalScope.g:5617:1: ( 'data' )
+            // InternalScope.g:5618:1: 'data'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getDataKeyword_4_1()); 
             }
-            match(input,65,FOLLOW_65_in_rule__GlobalScopeExpression__Group_4__1__Impl11608); if (state.failed) return ;
+            match(input,65,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGlobalScopeExpressionAccess().getDataKeyword_4_1()); 
             }
@@ -16895,21 +16895,21 @@ public final void rule__GlobalScopeExpression__Group_4__1__Impl() throws Recogni
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_4__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5631:1: rule__GlobalScopeExpression__Group_4__2 : rule__GlobalScopeExpression__Group_4__2__Impl rule__GlobalScopeExpression__Group_4__3 ;
+    // InternalScope.g:5631:1: rule__GlobalScopeExpression__Group_4__2 : rule__GlobalScopeExpression__Group_4__2__Impl rule__GlobalScopeExpression__Group_4__3 ;
     public final void rule__GlobalScopeExpression__Group_4__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5635:1: ( rule__GlobalScopeExpression__Group_4__2__Impl rule__GlobalScopeExpression__Group_4__3 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5636:2: rule__GlobalScopeExpression__Group_4__2__Impl rule__GlobalScopeExpression__Group_4__3
+            // InternalScope.g:5635:1: ( rule__GlobalScopeExpression__Group_4__2__Impl rule__GlobalScopeExpression__Group_4__3 )
+            // InternalScope.g:5636:2: rule__GlobalScopeExpression__Group_4__2__Impl rule__GlobalScopeExpression__Group_4__3
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_4__2__Impl_in_rule__GlobalScopeExpression__Group_4__211639);
+            pushFollow(FOLLOW_32);
             rule__GlobalScopeExpression__Group_4__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_4__3_in_rule__GlobalScopeExpression__Group_4__211642);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__Group_4__3();
 
             state._fsp--;
@@ -16933,22 +16933,22 @@ public final void rule__GlobalScopeExpression__Group_4__2() throws RecognitionEx
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_4__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5643:1: rule__GlobalScopeExpression__Group_4__2__Impl : ( '=' ) ;
+    // InternalScope.g:5643:1: rule__GlobalScopeExpression__Group_4__2__Impl : ( '=' ) ;
     public final void rule__GlobalScopeExpression__Group_4__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5647:1: ( ( '=' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5648:1: ( '=' )
+            // InternalScope.g:5647:1: ( ( '=' ) )
+            // InternalScope.g:5648:1: ( '=' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5648:1: ( '=' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5649:1: '='
+            // InternalScope.g:5648:1: ( '=' )
+            // InternalScope.g:5649:1: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getEqualsSignKeyword_4_2()); 
             }
-            match(input,48,FOLLOW_48_in_rule__GlobalScopeExpression__Group_4__2__Impl11670); if (state.failed) return ;
+            match(input,48,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGlobalScopeExpressionAccess().getEqualsSignKeyword_4_2()); 
             }
@@ -16974,21 +16974,21 @@ public final void rule__GlobalScopeExpression__Group_4__2__Impl() throws Recogni
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_4__3"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5662:1: rule__GlobalScopeExpression__Group_4__3 : rule__GlobalScopeExpression__Group_4__3__Impl rule__GlobalScopeExpression__Group_4__4 ;
+    // InternalScope.g:5662:1: rule__GlobalScopeExpression__Group_4__3 : rule__GlobalScopeExpression__Group_4__3__Impl rule__GlobalScopeExpression__Group_4__4 ;
     public final void rule__GlobalScopeExpression__Group_4__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5666:1: ( rule__GlobalScopeExpression__Group_4__3__Impl rule__GlobalScopeExpression__Group_4__4 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5667:2: rule__GlobalScopeExpression__Group_4__3__Impl rule__GlobalScopeExpression__Group_4__4
+            // InternalScope.g:5666:1: ( rule__GlobalScopeExpression__Group_4__3__Impl rule__GlobalScopeExpression__Group_4__4 )
+            // InternalScope.g:5667:2: rule__GlobalScopeExpression__Group_4__3__Impl rule__GlobalScopeExpression__Group_4__4
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_4__3__Impl_in_rule__GlobalScopeExpression__Group_4__311701);
+            pushFollow(FOLLOW_39);
             rule__GlobalScopeExpression__Group_4__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_4__4_in_rule__GlobalScopeExpression__Group_4__311704);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__Group_4__4();
 
             state._fsp--;
@@ -17012,22 +17012,22 @@ public final void rule__GlobalScopeExpression__Group_4__3() throws RecognitionEx
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_4__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5674:1: rule__GlobalScopeExpression__Group_4__3__Impl : ( '(' ) ;
+    // InternalScope.g:5674:1: rule__GlobalScopeExpression__Group_4__3__Impl : ( '(' ) ;
     public final void rule__GlobalScopeExpression__Group_4__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5678:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5679:1: ( '(' )
+            // InternalScope.g:5678:1: ( ( '(' ) )
+            // InternalScope.g:5679:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5679:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5680:1: '('
+            // InternalScope.g:5679:1: ( '(' )
+            // InternalScope.g:5680:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getLeftParenthesisKeyword_4_3()); 
             }
-            match(input,51,FOLLOW_51_in_rule__GlobalScopeExpression__Group_4__3__Impl11732); if (state.failed) return ;
+            match(input,51,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGlobalScopeExpressionAccess().getLeftParenthesisKeyword_4_3()); 
             }
@@ -17053,21 +17053,21 @@ public final void rule__GlobalScopeExpression__Group_4__3__Impl() throws Recogni
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_4__4"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5693:1: rule__GlobalScopeExpression__Group_4__4 : rule__GlobalScopeExpression__Group_4__4__Impl rule__GlobalScopeExpression__Group_4__5 ;
+    // InternalScope.g:5693:1: rule__GlobalScopeExpression__Group_4__4 : rule__GlobalScopeExpression__Group_4__4__Impl rule__GlobalScopeExpression__Group_4__5 ;
     public final void rule__GlobalScopeExpression__Group_4__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5697:1: ( rule__GlobalScopeExpression__Group_4__4__Impl rule__GlobalScopeExpression__Group_4__5 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5698:2: rule__GlobalScopeExpression__Group_4__4__Impl rule__GlobalScopeExpression__Group_4__5
+            // InternalScope.g:5697:1: ( rule__GlobalScopeExpression__Group_4__4__Impl rule__GlobalScopeExpression__Group_4__5 )
+            // InternalScope.g:5698:2: rule__GlobalScopeExpression__Group_4__4__Impl rule__GlobalScopeExpression__Group_4__5
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_4__4__Impl_in_rule__GlobalScopeExpression__Group_4__411763);
+            pushFollow(FOLLOW_34);
             rule__GlobalScopeExpression__Group_4__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_4__5_in_rule__GlobalScopeExpression__Group_4__411766);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__Group_4__5();
 
             state._fsp--;
@@ -17091,25 +17091,25 @@ public final void rule__GlobalScopeExpression__Group_4__4() throws RecognitionEx
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_4__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5705:1: rule__GlobalScopeExpression__Group_4__4__Impl : ( ( rule__GlobalScopeExpression__DataAssignment_4_4 ) ) ;
+    // InternalScope.g:5705:1: rule__GlobalScopeExpression__Group_4__4__Impl : ( ( rule__GlobalScopeExpression__DataAssignment_4_4 ) ) ;
     public final void rule__GlobalScopeExpression__Group_4__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5709:1: ( ( ( rule__GlobalScopeExpression__DataAssignment_4_4 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5710:1: ( ( rule__GlobalScopeExpression__DataAssignment_4_4 ) )
+            // InternalScope.g:5709:1: ( ( ( rule__GlobalScopeExpression__DataAssignment_4_4 ) ) )
+            // InternalScope.g:5710:1: ( ( rule__GlobalScopeExpression__DataAssignment_4_4 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5710:1: ( ( rule__GlobalScopeExpression__DataAssignment_4_4 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5711:1: ( rule__GlobalScopeExpression__DataAssignment_4_4 )
+            // InternalScope.g:5710:1: ( ( rule__GlobalScopeExpression__DataAssignment_4_4 ) )
+            // InternalScope.g:5711:1: ( rule__GlobalScopeExpression__DataAssignment_4_4 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getDataAssignment_4_4()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5712:1: ( rule__GlobalScopeExpression__DataAssignment_4_4 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5712:2: rule__GlobalScopeExpression__DataAssignment_4_4
+            // InternalScope.g:5712:1: ( rule__GlobalScopeExpression__DataAssignment_4_4 )
+            // InternalScope.g:5712:2: rule__GlobalScopeExpression__DataAssignment_4_4
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__DataAssignment_4_4_in_rule__GlobalScopeExpression__Group_4__4__Impl11793);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__DataAssignment_4_4();
 
             state._fsp--;
@@ -17142,21 +17142,21 @@ public final void rule__GlobalScopeExpression__Group_4__4__Impl() throws Recogni
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_4__5"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5722:1: rule__GlobalScopeExpression__Group_4__5 : rule__GlobalScopeExpression__Group_4__5__Impl rule__GlobalScopeExpression__Group_4__6 ;
+    // InternalScope.g:5722:1: rule__GlobalScopeExpression__Group_4__5 : rule__GlobalScopeExpression__Group_4__5__Impl rule__GlobalScopeExpression__Group_4__6 ;
     public final void rule__GlobalScopeExpression__Group_4__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5726:1: ( rule__GlobalScopeExpression__Group_4__5__Impl rule__GlobalScopeExpression__Group_4__6 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5727:2: rule__GlobalScopeExpression__Group_4__5__Impl rule__GlobalScopeExpression__Group_4__6
+            // InternalScope.g:5726:1: ( rule__GlobalScopeExpression__Group_4__5__Impl rule__GlobalScopeExpression__Group_4__6 )
+            // InternalScope.g:5727:2: rule__GlobalScopeExpression__Group_4__5__Impl rule__GlobalScopeExpression__Group_4__6
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_4__5__Impl_in_rule__GlobalScopeExpression__Group_4__511823);
+            pushFollow(FOLLOW_34);
             rule__GlobalScopeExpression__Group_4__5__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_4__6_in_rule__GlobalScopeExpression__Group_4__511826);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__Group_4__6();
 
             state._fsp--;
@@ -17180,22 +17180,22 @@ public final void rule__GlobalScopeExpression__Group_4__5() throws RecognitionEx
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_4__5__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5734:1: rule__GlobalScopeExpression__Group_4__5__Impl : ( ( rule__GlobalScopeExpression__Group_4_5__0 )* ) ;
+    // InternalScope.g:5734:1: rule__GlobalScopeExpression__Group_4__5__Impl : ( ( rule__GlobalScopeExpression__Group_4_5__0 )* ) ;
     public final void rule__GlobalScopeExpression__Group_4__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5738:1: ( ( ( rule__GlobalScopeExpression__Group_4_5__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5739:1: ( ( rule__GlobalScopeExpression__Group_4_5__0 )* )
+            // InternalScope.g:5738:1: ( ( ( rule__GlobalScopeExpression__Group_4_5__0 )* ) )
+            // InternalScope.g:5739:1: ( ( rule__GlobalScopeExpression__Group_4_5__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5739:1: ( ( rule__GlobalScopeExpression__Group_4_5__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5740:1: ( rule__GlobalScopeExpression__Group_4_5__0 )*
+            // InternalScope.g:5739:1: ( ( rule__GlobalScopeExpression__Group_4_5__0 )* )
+            // InternalScope.g:5740:1: ( rule__GlobalScopeExpression__Group_4_5__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getGroup_4_5()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5741:1: ( rule__GlobalScopeExpression__Group_4_5__0 )*
+            // InternalScope.g:5741:1: ( rule__GlobalScopeExpression__Group_4_5__0 )*
             loop49:
             do {
                 int alt49=2;
@@ -17208,9 +17208,9 @@ public final void rule__GlobalScopeExpression__Group_4__5__Impl() throws Recogni
 
                 switch (alt49) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5741:2: rule__GlobalScopeExpression__Group_4_5__0
+            	    // InternalScope.g:5741:2: rule__GlobalScopeExpression__Group_4_5__0
             	    {
-            	    pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_4_5__0_in_rule__GlobalScopeExpression__Group_4__5__Impl11853);
+            	    pushFollow(FOLLOW_40);
             	    rule__GlobalScopeExpression__Group_4_5__0();
 
             	    state._fsp--;
@@ -17249,16 +17249,16 @@ public final void rule__GlobalScopeExpression__Group_4__5__Impl() throws Recogni
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_4__6"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5751:1: rule__GlobalScopeExpression__Group_4__6 : rule__GlobalScopeExpression__Group_4__6__Impl ;
+    // InternalScope.g:5751:1: rule__GlobalScopeExpression__Group_4__6 : rule__GlobalScopeExpression__Group_4__6__Impl ;
     public final void rule__GlobalScopeExpression__Group_4__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5755:1: ( rule__GlobalScopeExpression__Group_4__6__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5756:2: rule__GlobalScopeExpression__Group_4__6__Impl
+            // InternalScope.g:5755:1: ( rule__GlobalScopeExpression__Group_4__6__Impl )
+            // InternalScope.g:5756:2: rule__GlobalScopeExpression__Group_4__6__Impl
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_4__6__Impl_in_rule__GlobalScopeExpression__Group_4__611884);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__Group_4__6__Impl();
 
             state._fsp--;
@@ -17282,22 +17282,22 @@ public final void rule__GlobalScopeExpression__Group_4__6() throws RecognitionEx
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_4__6__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5762:1: rule__GlobalScopeExpression__Group_4__6__Impl : ( ')' ) ;
+    // InternalScope.g:5762:1: rule__GlobalScopeExpression__Group_4__6__Impl : ( ')' ) ;
     public final void rule__GlobalScopeExpression__Group_4__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5766:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5767:1: ( ')' )
+            // InternalScope.g:5766:1: ( ( ')' ) )
+            // InternalScope.g:5767:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5767:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5768:1: ')'
+            // InternalScope.g:5767:1: ( ')' )
+            // InternalScope.g:5768:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getRightParenthesisKeyword_4_6()); 
             }
-            match(input,52,FOLLOW_52_in_rule__GlobalScopeExpression__Group_4__6__Impl11912); if (state.failed) return ;
+            match(input,52,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGlobalScopeExpressionAccess().getRightParenthesisKeyword_4_6()); 
             }
@@ -17323,21 +17323,21 @@ public final void rule__GlobalScopeExpression__Group_4__6__Impl() throws Recogni
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_4_5__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5795:1: rule__GlobalScopeExpression__Group_4_5__0 : rule__GlobalScopeExpression__Group_4_5__0__Impl rule__GlobalScopeExpression__Group_4_5__1 ;
+    // InternalScope.g:5795:1: rule__GlobalScopeExpression__Group_4_5__0 : rule__GlobalScopeExpression__Group_4_5__0__Impl rule__GlobalScopeExpression__Group_4_5__1 ;
     public final void rule__GlobalScopeExpression__Group_4_5__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5799:1: ( rule__GlobalScopeExpression__Group_4_5__0__Impl rule__GlobalScopeExpression__Group_4_5__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5800:2: rule__GlobalScopeExpression__Group_4_5__0__Impl rule__GlobalScopeExpression__Group_4_5__1
+            // InternalScope.g:5799:1: ( rule__GlobalScopeExpression__Group_4_5__0__Impl rule__GlobalScopeExpression__Group_4_5__1 )
+            // InternalScope.g:5800:2: rule__GlobalScopeExpression__Group_4_5__0__Impl rule__GlobalScopeExpression__Group_4_5__1
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_4_5__0__Impl_in_rule__GlobalScopeExpression__Group_4_5__011957);
+            pushFollow(FOLLOW_39);
             rule__GlobalScopeExpression__Group_4_5__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_4_5__1_in_rule__GlobalScopeExpression__Group_4_5__011960);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__Group_4_5__1();
 
             state._fsp--;
@@ -17361,22 +17361,22 @@ public final void rule__GlobalScopeExpression__Group_4_5__0() throws Recognition
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_4_5__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5807:1: rule__GlobalScopeExpression__Group_4_5__0__Impl : ( ',' ) ;
+    // InternalScope.g:5807:1: rule__GlobalScopeExpression__Group_4_5__0__Impl : ( ',' ) ;
     public final void rule__GlobalScopeExpression__Group_4_5__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5811:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5812:1: ( ',' )
+            // InternalScope.g:5811:1: ( ( ',' ) )
+            // InternalScope.g:5812:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5812:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5813:1: ','
+            // InternalScope.g:5812:1: ( ',' )
+            // InternalScope.g:5813:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getCommaKeyword_4_5_0()); 
             }
-            match(input,61,FOLLOW_61_in_rule__GlobalScopeExpression__Group_4_5__0__Impl11988); if (state.failed) return ;
+            match(input,61,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGlobalScopeExpressionAccess().getCommaKeyword_4_5_0()); 
             }
@@ -17402,16 +17402,16 @@ public final void rule__GlobalScopeExpression__Group_4_5__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_4_5__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5826:1: rule__GlobalScopeExpression__Group_4_5__1 : rule__GlobalScopeExpression__Group_4_5__1__Impl ;
+    // InternalScope.g:5826:1: rule__GlobalScopeExpression__Group_4_5__1 : rule__GlobalScopeExpression__Group_4_5__1__Impl ;
     public final void rule__GlobalScopeExpression__Group_4_5__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5830:1: ( rule__GlobalScopeExpression__Group_4_5__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5831:2: rule__GlobalScopeExpression__Group_4_5__1__Impl
+            // InternalScope.g:5830:1: ( rule__GlobalScopeExpression__Group_4_5__1__Impl )
+            // InternalScope.g:5831:2: rule__GlobalScopeExpression__Group_4_5__1__Impl
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_4_5__1__Impl_in_rule__GlobalScopeExpression__Group_4_5__112019);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__Group_4_5__1__Impl();
 
             state._fsp--;
@@ -17435,25 +17435,25 @@ public final void rule__GlobalScopeExpression__Group_4_5__1() throws Recognition
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_4_5__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5837:1: rule__GlobalScopeExpression__Group_4_5__1__Impl : ( ( rule__GlobalScopeExpression__DataAssignment_4_5_1 ) ) ;
+    // InternalScope.g:5837:1: rule__GlobalScopeExpression__Group_4_5__1__Impl : ( ( rule__GlobalScopeExpression__DataAssignment_4_5_1 ) ) ;
     public final void rule__GlobalScopeExpression__Group_4_5__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5841:1: ( ( ( rule__GlobalScopeExpression__DataAssignment_4_5_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5842:1: ( ( rule__GlobalScopeExpression__DataAssignment_4_5_1 ) )
+            // InternalScope.g:5841:1: ( ( ( rule__GlobalScopeExpression__DataAssignment_4_5_1 ) ) )
+            // InternalScope.g:5842:1: ( ( rule__GlobalScopeExpression__DataAssignment_4_5_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5842:1: ( ( rule__GlobalScopeExpression__DataAssignment_4_5_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5843:1: ( rule__GlobalScopeExpression__DataAssignment_4_5_1 )
+            // InternalScope.g:5842:1: ( ( rule__GlobalScopeExpression__DataAssignment_4_5_1 ) )
+            // InternalScope.g:5843:1: ( rule__GlobalScopeExpression__DataAssignment_4_5_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getDataAssignment_4_5_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5844:1: ( rule__GlobalScopeExpression__DataAssignment_4_5_1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5844:2: rule__GlobalScopeExpression__DataAssignment_4_5_1
+            // InternalScope.g:5844:1: ( rule__GlobalScopeExpression__DataAssignment_4_5_1 )
+            // InternalScope.g:5844:2: rule__GlobalScopeExpression__DataAssignment_4_5_1
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__DataAssignment_4_5_1_in_rule__GlobalScopeExpression__Group_4_5__1__Impl12046);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__DataAssignment_4_5_1();
 
             state._fsp--;
@@ -17486,21 +17486,21 @@ public final void rule__GlobalScopeExpression__Group_4_5__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_5__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5858:1: rule__GlobalScopeExpression__Group_5__0 : rule__GlobalScopeExpression__Group_5__0__Impl rule__GlobalScopeExpression__Group_5__1 ;
+    // InternalScope.g:5858:1: rule__GlobalScopeExpression__Group_5__0 : rule__GlobalScopeExpression__Group_5__0__Impl rule__GlobalScopeExpression__Group_5__1 ;
     public final void rule__GlobalScopeExpression__Group_5__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5862:1: ( rule__GlobalScopeExpression__Group_5__0__Impl rule__GlobalScopeExpression__Group_5__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5863:2: rule__GlobalScopeExpression__Group_5__0__Impl rule__GlobalScopeExpression__Group_5__1
+            // InternalScope.g:5862:1: ( rule__GlobalScopeExpression__Group_5__0__Impl rule__GlobalScopeExpression__Group_5__1 )
+            // InternalScope.g:5863:2: rule__GlobalScopeExpression__Group_5__0__Impl rule__GlobalScopeExpression__Group_5__1
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_5__0__Impl_in_rule__GlobalScopeExpression__Group_5__012080);
+            pushFollow(FOLLOW_41);
             rule__GlobalScopeExpression__Group_5__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_5__1_in_rule__GlobalScopeExpression__Group_5__012083);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__Group_5__1();
 
             state._fsp--;
@@ -17524,22 +17524,22 @@ public final void rule__GlobalScopeExpression__Group_5__0() throws RecognitionEx
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_5__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5870:1: rule__GlobalScopeExpression__Group_5__0__Impl : ( ',' ) ;
+    // InternalScope.g:5870:1: rule__GlobalScopeExpression__Group_5__0__Impl : ( ',' ) ;
     public final void rule__GlobalScopeExpression__Group_5__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5874:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5875:1: ( ',' )
+            // InternalScope.g:5874:1: ( ( ',' ) )
+            // InternalScope.g:5875:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5875:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5876:1: ','
+            // InternalScope.g:5875:1: ( ',' )
+            // InternalScope.g:5876:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getCommaKeyword_5_0()); 
             }
-            match(input,61,FOLLOW_61_in_rule__GlobalScopeExpression__Group_5__0__Impl12111); if (state.failed) return ;
+            match(input,61,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGlobalScopeExpressionAccess().getCommaKeyword_5_0()); 
             }
@@ -17565,21 +17565,21 @@ public final void rule__GlobalScopeExpression__Group_5__0__Impl() throws Recogni
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_5__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5889:1: rule__GlobalScopeExpression__Group_5__1 : rule__GlobalScopeExpression__Group_5__1__Impl rule__GlobalScopeExpression__Group_5__2 ;
+    // InternalScope.g:5889:1: rule__GlobalScopeExpression__Group_5__1 : rule__GlobalScopeExpression__Group_5__1__Impl rule__GlobalScopeExpression__Group_5__2 ;
     public final void rule__GlobalScopeExpression__Group_5__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5893:1: ( rule__GlobalScopeExpression__Group_5__1__Impl rule__GlobalScopeExpression__Group_5__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5894:2: rule__GlobalScopeExpression__Group_5__1__Impl rule__GlobalScopeExpression__Group_5__2
+            // InternalScope.g:5893:1: ( rule__GlobalScopeExpression__Group_5__1__Impl rule__GlobalScopeExpression__Group_5__2 )
+            // InternalScope.g:5894:2: rule__GlobalScopeExpression__Group_5__1__Impl rule__GlobalScopeExpression__Group_5__2
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_5__1__Impl_in_rule__GlobalScopeExpression__Group_5__112142);
+            pushFollow(FOLLOW_16);
             rule__GlobalScopeExpression__Group_5__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_5__2_in_rule__GlobalScopeExpression__Group_5__112145);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__Group_5__2();
 
             state._fsp--;
@@ -17603,22 +17603,22 @@ public final void rule__GlobalScopeExpression__Group_5__1() throws RecognitionEx
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_5__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5901:1: rule__GlobalScopeExpression__Group_5__1__Impl : ( 'domains' ) ;
+    // InternalScope.g:5901:1: rule__GlobalScopeExpression__Group_5__1__Impl : ( 'domains' ) ;
     public final void rule__GlobalScopeExpression__Group_5__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5905:1: ( ( 'domains' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5906:1: ( 'domains' )
+            // InternalScope.g:5905:1: ( ( 'domains' ) )
+            // InternalScope.g:5906:1: ( 'domains' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5906:1: ( 'domains' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5907:1: 'domains'
+            // InternalScope.g:5906:1: ( 'domains' )
+            // InternalScope.g:5907:1: 'domains'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getDomainsKeyword_5_1()); 
             }
-            match(input,66,FOLLOW_66_in_rule__GlobalScopeExpression__Group_5__1__Impl12173); if (state.failed) return ;
+            match(input,66,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGlobalScopeExpressionAccess().getDomainsKeyword_5_1()); 
             }
@@ -17644,21 +17644,21 @@ public final void rule__GlobalScopeExpression__Group_5__1__Impl() throws Recogni
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_5__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5920:1: rule__GlobalScopeExpression__Group_5__2 : rule__GlobalScopeExpression__Group_5__2__Impl rule__GlobalScopeExpression__Group_5__3 ;
+    // InternalScope.g:5920:1: rule__GlobalScopeExpression__Group_5__2 : rule__GlobalScopeExpression__Group_5__2__Impl rule__GlobalScopeExpression__Group_5__3 ;
     public final void rule__GlobalScopeExpression__Group_5__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5924:1: ( rule__GlobalScopeExpression__Group_5__2__Impl rule__GlobalScopeExpression__Group_5__3 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5925:2: rule__GlobalScopeExpression__Group_5__2__Impl rule__GlobalScopeExpression__Group_5__3
+            // InternalScope.g:5924:1: ( rule__GlobalScopeExpression__Group_5__2__Impl rule__GlobalScopeExpression__Group_5__3 )
+            // InternalScope.g:5925:2: rule__GlobalScopeExpression__Group_5__2__Impl rule__GlobalScopeExpression__Group_5__3
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_5__2__Impl_in_rule__GlobalScopeExpression__Group_5__212204);
+            pushFollow(FOLLOW_42);
             rule__GlobalScopeExpression__Group_5__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_5__3_in_rule__GlobalScopeExpression__Group_5__212207);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__Group_5__3();
 
             state._fsp--;
@@ -17682,22 +17682,22 @@ public final void rule__GlobalScopeExpression__Group_5__2() throws RecognitionEx
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_5__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5932:1: rule__GlobalScopeExpression__Group_5__2__Impl : ( '=' ) ;
+    // InternalScope.g:5932:1: rule__GlobalScopeExpression__Group_5__2__Impl : ( '=' ) ;
     public final void rule__GlobalScopeExpression__Group_5__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5936:1: ( ( '=' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5937:1: ( '=' )
+            // InternalScope.g:5936:1: ( ( '=' ) )
+            // InternalScope.g:5937:1: ( '=' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5937:1: ( '=' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5938:1: '='
+            // InternalScope.g:5937:1: ( '=' )
+            // InternalScope.g:5938:1: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getEqualsSignKeyword_5_2()); 
             }
-            match(input,48,FOLLOW_48_in_rule__GlobalScopeExpression__Group_5__2__Impl12235); if (state.failed) return ;
+            match(input,48,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGlobalScopeExpressionAccess().getEqualsSignKeyword_5_2()); 
             }
@@ -17723,16 +17723,16 @@ public final void rule__GlobalScopeExpression__Group_5__2__Impl() throws Recogni
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_5__3"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5951:1: rule__GlobalScopeExpression__Group_5__3 : rule__GlobalScopeExpression__Group_5__3__Impl ;
+    // InternalScope.g:5951:1: rule__GlobalScopeExpression__Group_5__3 : rule__GlobalScopeExpression__Group_5__3__Impl ;
     public final void rule__GlobalScopeExpression__Group_5__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5955:1: ( rule__GlobalScopeExpression__Group_5__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5956:2: rule__GlobalScopeExpression__Group_5__3__Impl
+            // InternalScope.g:5955:1: ( rule__GlobalScopeExpression__Group_5__3__Impl )
+            // InternalScope.g:5956:2: rule__GlobalScopeExpression__Group_5__3__Impl
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_5__3__Impl_in_rule__GlobalScopeExpression__Group_5__312266);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__Group_5__3__Impl();
 
             state._fsp--;
@@ -17756,25 +17756,25 @@ public final void rule__GlobalScopeExpression__Group_5__3() throws RecognitionEx
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_5__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5962:1: rule__GlobalScopeExpression__Group_5__3__Impl : ( ( rule__GlobalScopeExpression__Alternatives_5_3 ) ) ;
+    // InternalScope.g:5962:1: rule__GlobalScopeExpression__Group_5__3__Impl : ( ( rule__GlobalScopeExpression__Alternatives_5_3 ) ) ;
     public final void rule__GlobalScopeExpression__Group_5__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5966:1: ( ( ( rule__GlobalScopeExpression__Alternatives_5_3 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5967:1: ( ( rule__GlobalScopeExpression__Alternatives_5_3 ) )
+            // InternalScope.g:5966:1: ( ( ( rule__GlobalScopeExpression__Alternatives_5_3 ) ) )
+            // InternalScope.g:5967:1: ( ( rule__GlobalScopeExpression__Alternatives_5_3 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5967:1: ( ( rule__GlobalScopeExpression__Alternatives_5_3 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5968:1: ( rule__GlobalScopeExpression__Alternatives_5_3 )
+            // InternalScope.g:5967:1: ( ( rule__GlobalScopeExpression__Alternatives_5_3 ) )
+            // InternalScope.g:5968:1: ( rule__GlobalScopeExpression__Alternatives_5_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getAlternatives_5_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5969:1: ( rule__GlobalScopeExpression__Alternatives_5_3 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5969:2: rule__GlobalScopeExpression__Alternatives_5_3
+            // InternalScope.g:5969:1: ( rule__GlobalScopeExpression__Alternatives_5_3 )
+            // InternalScope.g:5969:2: rule__GlobalScopeExpression__Alternatives_5_3
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Alternatives_5_3_in_rule__GlobalScopeExpression__Group_5__3__Impl12293);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__Alternatives_5_3();
 
             state._fsp--;
@@ -17807,21 +17807,21 @@ public final void rule__GlobalScopeExpression__Group_5__3__Impl() throws Recogni
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_5_3_2__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5987:1: rule__GlobalScopeExpression__Group_5_3_2__0 : rule__GlobalScopeExpression__Group_5_3_2__0__Impl rule__GlobalScopeExpression__Group_5_3_2__1 ;
+    // InternalScope.g:5987:1: rule__GlobalScopeExpression__Group_5_3_2__0 : rule__GlobalScopeExpression__Group_5_3_2__0__Impl rule__GlobalScopeExpression__Group_5_3_2__1 ;
     public final void rule__GlobalScopeExpression__Group_5_3_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5991:1: ( rule__GlobalScopeExpression__Group_5_3_2__0__Impl rule__GlobalScopeExpression__Group_5_3_2__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5992:2: rule__GlobalScopeExpression__Group_5_3_2__0__Impl rule__GlobalScopeExpression__Group_5_3_2__1
+            // InternalScope.g:5991:1: ( rule__GlobalScopeExpression__Group_5_3_2__0__Impl rule__GlobalScopeExpression__Group_5_3_2__1 )
+            // InternalScope.g:5992:2: rule__GlobalScopeExpression__Group_5_3_2__0__Impl rule__GlobalScopeExpression__Group_5_3_2__1
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_5_3_2__0__Impl_in_rule__GlobalScopeExpression__Group_5_3_2__012331);
+            pushFollow(FOLLOW_3);
             rule__GlobalScopeExpression__Group_5_3_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_5_3_2__1_in_rule__GlobalScopeExpression__Group_5_3_2__012334);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__Group_5_3_2__1();
 
             state._fsp--;
@@ -17845,22 +17845,22 @@ public final void rule__GlobalScopeExpression__Group_5_3_2__0() throws Recogniti
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_5_3_2__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:5999:1: rule__GlobalScopeExpression__Group_5_3_2__0__Impl : ( '(' ) ;
+    // InternalScope.g:5999:1: rule__GlobalScopeExpression__Group_5_3_2__0__Impl : ( '(' ) ;
     public final void rule__GlobalScopeExpression__Group_5_3_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6003:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6004:1: ( '(' )
+            // InternalScope.g:6003:1: ( ( '(' ) )
+            // InternalScope.g:6004:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6004:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6005:1: '('
+            // InternalScope.g:6004:1: ( '(' )
+            // InternalScope.g:6005:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getLeftParenthesisKeyword_5_3_2_0()); 
             }
-            match(input,51,FOLLOW_51_in_rule__GlobalScopeExpression__Group_5_3_2__0__Impl12362); if (state.failed) return ;
+            match(input,51,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGlobalScopeExpressionAccess().getLeftParenthesisKeyword_5_3_2_0()); 
             }
@@ -17886,21 +17886,21 @@ public final void rule__GlobalScopeExpression__Group_5_3_2__0__Impl() throws Rec
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_5_3_2__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6018:1: rule__GlobalScopeExpression__Group_5_3_2__1 : rule__GlobalScopeExpression__Group_5_3_2__1__Impl rule__GlobalScopeExpression__Group_5_3_2__2 ;
+    // InternalScope.g:6018:1: rule__GlobalScopeExpression__Group_5_3_2__1 : rule__GlobalScopeExpression__Group_5_3_2__1__Impl rule__GlobalScopeExpression__Group_5_3_2__2 ;
     public final void rule__GlobalScopeExpression__Group_5_3_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6022:1: ( rule__GlobalScopeExpression__Group_5_3_2__1__Impl rule__GlobalScopeExpression__Group_5_3_2__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6023:2: rule__GlobalScopeExpression__Group_5_3_2__1__Impl rule__GlobalScopeExpression__Group_5_3_2__2
+            // InternalScope.g:6022:1: ( rule__GlobalScopeExpression__Group_5_3_2__1__Impl rule__GlobalScopeExpression__Group_5_3_2__2 )
+            // InternalScope.g:6023:2: rule__GlobalScopeExpression__Group_5_3_2__1__Impl rule__GlobalScopeExpression__Group_5_3_2__2
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_5_3_2__1__Impl_in_rule__GlobalScopeExpression__Group_5_3_2__112393);
+            pushFollow(FOLLOW_34);
             rule__GlobalScopeExpression__Group_5_3_2__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_5_3_2__2_in_rule__GlobalScopeExpression__Group_5_3_2__112396);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__Group_5_3_2__2();
 
             state._fsp--;
@@ -17924,25 +17924,25 @@ public final void rule__GlobalScopeExpression__Group_5_3_2__1() throws Recogniti
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_5_3_2__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6030:1: rule__GlobalScopeExpression__Group_5_3_2__1__Impl : ( ( rule__GlobalScopeExpression__DomainsAssignment_5_3_2_1 ) ) ;
+    // InternalScope.g:6030:1: rule__GlobalScopeExpression__Group_5_3_2__1__Impl : ( ( rule__GlobalScopeExpression__DomainsAssignment_5_3_2_1 ) ) ;
     public final void rule__GlobalScopeExpression__Group_5_3_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6034:1: ( ( ( rule__GlobalScopeExpression__DomainsAssignment_5_3_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6035:1: ( ( rule__GlobalScopeExpression__DomainsAssignment_5_3_2_1 ) )
+            // InternalScope.g:6034:1: ( ( ( rule__GlobalScopeExpression__DomainsAssignment_5_3_2_1 ) ) )
+            // InternalScope.g:6035:1: ( ( rule__GlobalScopeExpression__DomainsAssignment_5_3_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6035:1: ( ( rule__GlobalScopeExpression__DomainsAssignment_5_3_2_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6036:1: ( rule__GlobalScopeExpression__DomainsAssignment_5_3_2_1 )
+            // InternalScope.g:6035:1: ( ( rule__GlobalScopeExpression__DomainsAssignment_5_3_2_1 ) )
+            // InternalScope.g:6036:1: ( rule__GlobalScopeExpression__DomainsAssignment_5_3_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getDomainsAssignment_5_3_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6037:1: ( rule__GlobalScopeExpression__DomainsAssignment_5_3_2_1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6037:2: rule__GlobalScopeExpression__DomainsAssignment_5_3_2_1
+            // InternalScope.g:6037:1: ( rule__GlobalScopeExpression__DomainsAssignment_5_3_2_1 )
+            // InternalScope.g:6037:2: rule__GlobalScopeExpression__DomainsAssignment_5_3_2_1
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__DomainsAssignment_5_3_2_1_in_rule__GlobalScopeExpression__Group_5_3_2__1__Impl12423);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__DomainsAssignment_5_3_2_1();
 
             state._fsp--;
@@ -17975,21 +17975,21 @@ public final void rule__GlobalScopeExpression__Group_5_3_2__1__Impl() throws Rec
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_5_3_2__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6047:1: rule__GlobalScopeExpression__Group_5_3_2__2 : rule__GlobalScopeExpression__Group_5_3_2__2__Impl rule__GlobalScopeExpression__Group_5_3_2__3 ;
+    // InternalScope.g:6047:1: rule__GlobalScopeExpression__Group_5_3_2__2 : rule__GlobalScopeExpression__Group_5_3_2__2__Impl rule__GlobalScopeExpression__Group_5_3_2__3 ;
     public final void rule__GlobalScopeExpression__Group_5_3_2__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6051:1: ( rule__GlobalScopeExpression__Group_5_3_2__2__Impl rule__GlobalScopeExpression__Group_5_3_2__3 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6052:2: rule__GlobalScopeExpression__Group_5_3_2__2__Impl rule__GlobalScopeExpression__Group_5_3_2__3
+            // InternalScope.g:6051:1: ( rule__GlobalScopeExpression__Group_5_3_2__2__Impl rule__GlobalScopeExpression__Group_5_3_2__3 )
+            // InternalScope.g:6052:2: rule__GlobalScopeExpression__Group_5_3_2__2__Impl rule__GlobalScopeExpression__Group_5_3_2__3
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_5_3_2__2__Impl_in_rule__GlobalScopeExpression__Group_5_3_2__212453);
+            pushFollow(FOLLOW_34);
             rule__GlobalScopeExpression__Group_5_3_2__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_5_3_2__3_in_rule__GlobalScopeExpression__Group_5_3_2__212456);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__Group_5_3_2__3();
 
             state._fsp--;
@@ -18013,22 +18013,22 @@ public final void rule__GlobalScopeExpression__Group_5_3_2__2() throws Recogniti
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_5_3_2__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6059:1: rule__GlobalScopeExpression__Group_5_3_2__2__Impl : ( ( rule__GlobalScopeExpression__Group_5_3_2_2__0 )* ) ;
+    // InternalScope.g:6059:1: rule__GlobalScopeExpression__Group_5_3_2__2__Impl : ( ( rule__GlobalScopeExpression__Group_5_3_2_2__0 )* ) ;
     public final void rule__GlobalScopeExpression__Group_5_3_2__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6063:1: ( ( ( rule__GlobalScopeExpression__Group_5_3_2_2__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6064:1: ( ( rule__GlobalScopeExpression__Group_5_3_2_2__0 )* )
+            // InternalScope.g:6063:1: ( ( ( rule__GlobalScopeExpression__Group_5_3_2_2__0 )* ) )
+            // InternalScope.g:6064:1: ( ( rule__GlobalScopeExpression__Group_5_3_2_2__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6064:1: ( ( rule__GlobalScopeExpression__Group_5_3_2_2__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6065:1: ( rule__GlobalScopeExpression__Group_5_3_2_2__0 )*
+            // InternalScope.g:6064:1: ( ( rule__GlobalScopeExpression__Group_5_3_2_2__0 )* )
+            // InternalScope.g:6065:1: ( rule__GlobalScopeExpression__Group_5_3_2_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getGroup_5_3_2_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6066:1: ( rule__GlobalScopeExpression__Group_5_3_2_2__0 )*
+            // InternalScope.g:6066:1: ( rule__GlobalScopeExpression__Group_5_3_2_2__0 )*
             loop50:
             do {
                 int alt50=2;
@@ -18041,9 +18041,9 @@ public final void rule__GlobalScopeExpression__Group_5_3_2__2__Impl() throws Rec
 
                 switch (alt50) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6066:2: rule__GlobalScopeExpression__Group_5_3_2_2__0
+            	    // InternalScope.g:6066:2: rule__GlobalScopeExpression__Group_5_3_2_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_5_3_2_2__0_in_rule__GlobalScopeExpression__Group_5_3_2__2__Impl12483);
+            	    pushFollow(FOLLOW_40);
             	    rule__GlobalScopeExpression__Group_5_3_2_2__0();
 
             	    state._fsp--;
@@ -18082,16 +18082,16 @@ public final void rule__GlobalScopeExpression__Group_5_3_2__2__Impl() throws Rec
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_5_3_2__3"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6076:1: rule__GlobalScopeExpression__Group_5_3_2__3 : rule__GlobalScopeExpression__Group_5_3_2__3__Impl ;
+    // InternalScope.g:6076:1: rule__GlobalScopeExpression__Group_5_3_2__3 : rule__GlobalScopeExpression__Group_5_3_2__3__Impl ;
     public final void rule__GlobalScopeExpression__Group_5_3_2__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6080:1: ( rule__GlobalScopeExpression__Group_5_3_2__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6081:2: rule__GlobalScopeExpression__Group_5_3_2__3__Impl
+            // InternalScope.g:6080:1: ( rule__GlobalScopeExpression__Group_5_3_2__3__Impl )
+            // InternalScope.g:6081:2: rule__GlobalScopeExpression__Group_5_3_2__3__Impl
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_5_3_2__3__Impl_in_rule__GlobalScopeExpression__Group_5_3_2__312514);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__Group_5_3_2__3__Impl();
 
             state._fsp--;
@@ -18115,22 +18115,22 @@ public final void rule__GlobalScopeExpression__Group_5_3_2__3() throws Recogniti
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_5_3_2__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6087:1: rule__GlobalScopeExpression__Group_5_3_2__3__Impl : ( ')' ) ;
+    // InternalScope.g:6087:1: rule__GlobalScopeExpression__Group_5_3_2__3__Impl : ( ')' ) ;
     public final void rule__GlobalScopeExpression__Group_5_3_2__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6091:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6092:1: ( ')' )
+            // InternalScope.g:6091:1: ( ( ')' ) )
+            // InternalScope.g:6092:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6092:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6093:1: ')'
+            // InternalScope.g:6092:1: ( ')' )
+            // InternalScope.g:6093:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getRightParenthesisKeyword_5_3_2_3()); 
             }
-            match(input,52,FOLLOW_52_in_rule__GlobalScopeExpression__Group_5_3_2__3__Impl12542); if (state.failed) return ;
+            match(input,52,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGlobalScopeExpressionAccess().getRightParenthesisKeyword_5_3_2_3()); 
             }
@@ -18156,21 +18156,21 @@ public final void rule__GlobalScopeExpression__Group_5_3_2__3__Impl() throws Rec
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_5_3_2_2__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6114:1: rule__GlobalScopeExpression__Group_5_3_2_2__0 : rule__GlobalScopeExpression__Group_5_3_2_2__0__Impl rule__GlobalScopeExpression__Group_5_3_2_2__1 ;
+    // InternalScope.g:6114:1: rule__GlobalScopeExpression__Group_5_3_2_2__0 : rule__GlobalScopeExpression__Group_5_3_2_2__0__Impl rule__GlobalScopeExpression__Group_5_3_2_2__1 ;
     public final void rule__GlobalScopeExpression__Group_5_3_2_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6118:1: ( rule__GlobalScopeExpression__Group_5_3_2_2__0__Impl rule__GlobalScopeExpression__Group_5_3_2_2__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6119:2: rule__GlobalScopeExpression__Group_5_3_2_2__0__Impl rule__GlobalScopeExpression__Group_5_3_2_2__1
+            // InternalScope.g:6118:1: ( rule__GlobalScopeExpression__Group_5_3_2_2__0__Impl rule__GlobalScopeExpression__Group_5_3_2_2__1 )
+            // InternalScope.g:6119:2: rule__GlobalScopeExpression__Group_5_3_2_2__0__Impl rule__GlobalScopeExpression__Group_5_3_2_2__1
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_5_3_2_2__0__Impl_in_rule__GlobalScopeExpression__Group_5_3_2_2__012581);
+            pushFollow(FOLLOW_3);
             rule__GlobalScopeExpression__Group_5_3_2_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_5_3_2_2__1_in_rule__GlobalScopeExpression__Group_5_3_2_2__012584);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__Group_5_3_2_2__1();
 
             state._fsp--;
@@ -18194,22 +18194,22 @@ public final void rule__GlobalScopeExpression__Group_5_3_2_2__0() throws Recogni
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_5_3_2_2__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6126:1: rule__GlobalScopeExpression__Group_5_3_2_2__0__Impl : ( ',' ) ;
+    // InternalScope.g:6126:1: rule__GlobalScopeExpression__Group_5_3_2_2__0__Impl : ( ',' ) ;
     public final void rule__GlobalScopeExpression__Group_5_3_2_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6130:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6131:1: ( ',' )
+            // InternalScope.g:6130:1: ( ( ',' ) )
+            // InternalScope.g:6131:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6131:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6132:1: ','
+            // InternalScope.g:6131:1: ( ',' )
+            // InternalScope.g:6132:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getCommaKeyword_5_3_2_2_0()); 
             }
-            match(input,61,FOLLOW_61_in_rule__GlobalScopeExpression__Group_5_3_2_2__0__Impl12612); if (state.failed) return ;
+            match(input,61,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGlobalScopeExpressionAccess().getCommaKeyword_5_3_2_2_0()); 
             }
@@ -18235,16 +18235,16 @@ public final void rule__GlobalScopeExpression__Group_5_3_2_2__0__Impl() throws R
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_5_3_2_2__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6145:1: rule__GlobalScopeExpression__Group_5_3_2_2__1 : rule__GlobalScopeExpression__Group_5_3_2_2__1__Impl ;
+    // InternalScope.g:6145:1: rule__GlobalScopeExpression__Group_5_3_2_2__1 : rule__GlobalScopeExpression__Group_5_3_2_2__1__Impl ;
     public final void rule__GlobalScopeExpression__Group_5_3_2_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6149:1: ( rule__GlobalScopeExpression__Group_5_3_2_2__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6150:2: rule__GlobalScopeExpression__Group_5_3_2_2__1__Impl
+            // InternalScope.g:6149:1: ( rule__GlobalScopeExpression__Group_5_3_2_2__1__Impl )
+            // InternalScope.g:6150:2: rule__GlobalScopeExpression__Group_5_3_2_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__Group_5_3_2_2__1__Impl_in_rule__GlobalScopeExpression__Group_5_3_2_2__112643);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__Group_5_3_2_2__1__Impl();
 
             state._fsp--;
@@ -18268,25 +18268,25 @@ public final void rule__GlobalScopeExpression__Group_5_3_2_2__1() throws Recogni
 
 
     // $ANTLR start "rule__GlobalScopeExpression__Group_5_3_2_2__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6156:1: rule__GlobalScopeExpression__Group_5_3_2_2__1__Impl : ( ( rule__GlobalScopeExpression__DomainsAssignment_5_3_2_2_1 ) ) ;
+    // InternalScope.g:6156:1: rule__GlobalScopeExpression__Group_5_3_2_2__1__Impl : ( ( rule__GlobalScopeExpression__DomainsAssignment_5_3_2_2_1 ) ) ;
     public final void rule__GlobalScopeExpression__Group_5_3_2_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6160:1: ( ( ( rule__GlobalScopeExpression__DomainsAssignment_5_3_2_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6161:1: ( ( rule__GlobalScopeExpression__DomainsAssignment_5_3_2_2_1 ) )
+            // InternalScope.g:6160:1: ( ( ( rule__GlobalScopeExpression__DomainsAssignment_5_3_2_2_1 ) ) )
+            // InternalScope.g:6161:1: ( ( rule__GlobalScopeExpression__DomainsAssignment_5_3_2_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6161:1: ( ( rule__GlobalScopeExpression__DomainsAssignment_5_3_2_2_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6162:1: ( rule__GlobalScopeExpression__DomainsAssignment_5_3_2_2_1 )
+            // InternalScope.g:6161:1: ( ( rule__GlobalScopeExpression__DomainsAssignment_5_3_2_2_1 ) )
+            // InternalScope.g:6162:1: ( rule__GlobalScopeExpression__DomainsAssignment_5_3_2_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getDomainsAssignment_5_3_2_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6163:1: ( rule__GlobalScopeExpression__DomainsAssignment_5_3_2_2_1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6163:2: rule__GlobalScopeExpression__DomainsAssignment_5_3_2_2_1
+            // InternalScope.g:6163:1: ( rule__GlobalScopeExpression__DomainsAssignment_5_3_2_2_1 )
+            // InternalScope.g:6163:2: rule__GlobalScopeExpression__DomainsAssignment_5_3_2_2_1
             {
-            pushFollow(FOLLOW_rule__GlobalScopeExpression__DomainsAssignment_5_3_2_2_1_in_rule__GlobalScopeExpression__Group_5_3_2_2__1__Impl12670);
+            pushFollow(FOLLOW_2);
             rule__GlobalScopeExpression__DomainsAssignment_5_3_2_2_1();
 
             state._fsp--;
@@ -18319,21 +18319,21 @@ public final void rule__GlobalScopeExpression__Group_5_3_2_2__1__Impl() throws R
 
 
     // $ANTLR start "rule__MatchDataExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6177:1: rule__MatchDataExpression__Group__0 : rule__MatchDataExpression__Group__0__Impl rule__MatchDataExpression__Group__1 ;
+    // InternalScope.g:6177:1: rule__MatchDataExpression__Group__0 : rule__MatchDataExpression__Group__0__Impl rule__MatchDataExpression__Group__1 ;
     public final void rule__MatchDataExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6181:1: ( rule__MatchDataExpression__Group__0__Impl rule__MatchDataExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6182:2: rule__MatchDataExpression__Group__0__Impl rule__MatchDataExpression__Group__1
+            // InternalScope.g:6181:1: ( rule__MatchDataExpression__Group__0__Impl rule__MatchDataExpression__Group__1 )
+            // InternalScope.g:6182:2: rule__MatchDataExpression__Group__0__Impl rule__MatchDataExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__MatchDataExpression__Group__0__Impl_in_rule__MatchDataExpression__Group__012704);
+            pushFollow(FOLLOW_16);
             rule__MatchDataExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__MatchDataExpression__Group__1_in_rule__MatchDataExpression__Group__012707);
+            pushFollow(FOLLOW_2);
             rule__MatchDataExpression__Group__1();
 
             state._fsp--;
@@ -18357,25 +18357,25 @@ public final void rule__MatchDataExpression__Group__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__MatchDataExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6189:1: rule__MatchDataExpression__Group__0__Impl : ( ( rule__MatchDataExpression__KeyAssignment_0 ) ) ;
+    // InternalScope.g:6189:1: rule__MatchDataExpression__Group__0__Impl : ( ( rule__MatchDataExpression__KeyAssignment_0 ) ) ;
     public final void rule__MatchDataExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6193:1: ( ( ( rule__MatchDataExpression__KeyAssignment_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6194:1: ( ( rule__MatchDataExpression__KeyAssignment_0 ) )
+            // InternalScope.g:6193:1: ( ( ( rule__MatchDataExpression__KeyAssignment_0 ) ) )
+            // InternalScope.g:6194:1: ( ( rule__MatchDataExpression__KeyAssignment_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6194:1: ( ( rule__MatchDataExpression__KeyAssignment_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6195:1: ( rule__MatchDataExpression__KeyAssignment_0 )
+            // InternalScope.g:6194:1: ( ( rule__MatchDataExpression__KeyAssignment_0 ) )
+            // InternalScope.g:6195:1: ( rule__MatchDataExpression__KeyAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMatchDataExpressionAccess().getKeyAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6196:1: ( rule__MatchDataExpression__KeyAssignment_0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6196:2: rule__MatchDataExpression__KeyAssignment_0
+            // InternalScope.g:6196:1: ( rule__MatchDataExpression__KeyAssignment_0 )
+            // InternalScope.g:6196:2: rule__MatchDataExpression__KeyAssignment_0
             {
-            pushFollow(FOLLOW_rule__MatchDataExpression__KeyAssignment_0_in_rule__MatchDataExpression__Group__0__Impl12734);
+            pushFollow(FOLLOW_2);
             rule__MatchDataExpression__KeyAssignment_0();
 
             state._fsp--;
@@ -18408,21 +18408,21 @@ public final void rule__MatchDataExpression__Group__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__MatchDataExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6206:1: rule__MatchDataExpression__Group__1 : rule__MatchDataExpression__Group__1__Impl rule__MatchDataExpression__Group__2 ;
+    // InternalScope.g:6206:1: rule__MatchDataExpression__Group__1 : rule__MatchDataExpression__Group__1__Impl rule__MatchDataExpression__Group__2 ;
     public final void rule__MatchDataExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6210:1: ( rule__MatchDataExpression__Group__1__Impl rule__MatchDataExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6211:2: rule__MatchDataExpression__Group__1__Impl rule__MatchDataExpression__Group__2
+            // InternalScope.g:6210:1: ( rule__MatchDataExpression__Group__1__Impl rule__MatchDataExpression__Group__2 )
+            // InternalScope.g:6211:2: rule__MatchDataExpression__Group__1__Impl rule__MatchDataExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__MatchDataExpression__Group__1__Impl_in_rule__MatchDataExpression__Group__112764);
+            pushFollow(FOLLOW_17);
             rule__MatchDataExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__MatchDataExpression__Group__2_in_rule__MatchDataExpression__Group__112767);
+            pushFollow(FOLLOW_2);
             rule__MatchDataExpression__Group__2();
 
             state._fsp--;
@@ -18446,22 +18446,22 @@ public final void rule__MatchDataExpression__Group__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__MatchDataExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6218:1: rule__MatchDataExpression__Group__1__Impl : ( '=' ) ;
+    // InternalScope.g:6218:1: rule__MatchDataExpression__Group__1__Impl : ( '=' ) ;
     public final void rule__MatchDataExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6222:1: ( ( '=' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6223:1: ( '=' )
+            // InternalScope.g:6222:1: ( ( '=' ) )
+            // InternalScope.g:6223:1: ( '=' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6223:1: ( '=' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6224:1: '='
+            // InternalScope.g:6223:1: ( '=' )
+            // InternalScope.g:6224:1: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMatchDataExpressionAccess().getEqualsSignKeyword_1()); 
             }
-            match(input,48,FOLLOW_48_in_rule__MatchDataExpression__Group__1__Impl12795); if (state.failed) return ;
+            match(input,48,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getMatchDataExpressionAccess().getEqualsSignKeyword_1()); 
             }
@@ -18487,16 +18487,16 @@ public final void rule__MatchDataExpression__Group__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__MatchDataExpression__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6237:1: rule__MatchDataExpression__Group__2 : rule__MatchDataExpression__Group__2__Impl ;
+    // InternalScope.g:6237:1: rule__MatchDataExpression__Group__2 : rule__MatchDataExpression__Group__2__Impl ;
     public final void rule__MatchDataExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6241:1: ( rule__MatchDataExpression__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6242:2: rule__MatchDataExpression__Group__2__Impl
+            // InternalScope.g:6241:1: ( rule__MatchDataExpression__Group__2__Impl )
+            // InternalScope.g:6242:2: rule__MatchDataExpression__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__MatchDataExpression__Group__2__Impl_in_rule__MatchDataExpression__Group__212826);
+            pushFollow(FOLLOW_2);
             rule__MatchDataExpression__Group__2__Impl();
 
             state._fsp--;
@@ -18520,25 +18520,25 @@ public final void rule__MatchDataExpression__Group__2() throws RecognitionExcept
 
 
     // $ANTLR start "rule__MatchDataExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6248:1: rule__MatchDataExpression__Group__2__Impl : ( ( rule__MatchDataExpression__ValueAssignment_2 ) ) ;
+    // InternalScope.g:6248:1: rule__MatchDataExpression__Group__2__Impl : ( ( rule__MatchDataExpression__ValueAssignment_2 ) ) ;
     public final void rule__MatchDataExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6252:1: ( ( ( rule__MatchDataExpression__ValueAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6253:1: ( ( rule__MatchDataExpression__ValueAssignment_2 ) )
+            // InternalScope.g:6252:1: ( ( ( rule__MatchDataExpression__ValueAssignment_2 ) ) )
+            // InternalScope.g:6253:1: ( ( rule__MatchDataExpression__ValueAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6253:1: ( ( rule__MatchDataExpression__ValueAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6254:1: ( rule__MatchDataExpression__ValueAssignment_2 )
+            // InternalScope.g:6253:1: ( ( rule__MatchDataExpression__ValueAssignment_2 ) )
+            // InternalScope.g:6254:1: ( rule__MatchDataExpression__ValueAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMatchDataExpressionAccess().getValueAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6255:1: ( rule__MatchDataExpression__ValueAssignment_2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6255:2: rule__MatchDataExpression__ValueAssignment_2
+            // InternalScope.g:6255:1: ( rule__MatchDataExpression__ValueAssignment_2 )
+            // InternalScope.g:6255:2: rule__MatchDataExpression__ValueAssignment_2
             {
-            pushFollow(FOLLOW_rule__MatchDataExpression__ValueAssignment_2_in_rule__MatchDataExpression__Group__2__Impl12853);
+            pushFollow(FOLLOW_2);
             rule__MatchDataExpression__ValueAssignment_2();
 
             state._fsp--;
@@ -18571,21 +18571,21 @@ public final void rule__MatchDataExpression__Group__2__Impl() throws Recognition
 
 
     // $ANTLR start "rule__LambdaDataExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6271:1: rule__LambdaDataExpression__Group__0 : rule__LambdaDataExpression__Group__0__Impl rule__LambdaDataExpression__Group__1 ;
+    // InternalScope.g:6271:1: rule__LambdaDataExpression__Group__0 : rule__LambdaDataExpression__Group__0__Impl rule__LambdaDataExpression__Group__1 ;
     public final void rule__LambdaDataExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6275:1: ( rule__LambdaDataExpression__Group__0__Impl rule__LambdaDataExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6276:2: rule__LambdaDataExpression__Group__0__Impl rule__LambdaDataExpression__Group__1
+            // InternalScope.g:6275:1: ( rule__LambdaDataExpression__Group__0__Impl rule__LambdaDataExpression__Group__1 )
+            // InternalScope.g:6276:2: rule__LambdaDataExpression__Group__0__Impl rule__LambdaDataExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__LambdaDataExpression__Group__0__Impl_in_rule__LambdaDataExpression__Group__012889);
+            pushFollow(FOLLOW_3);
             rule__LambdaDataExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__LambdaDataExpression__Group__1_in_rule__LambdaDataExpression__Group__012892);
+            pushFollow(FOLLOW_2);
             rule__LambdaDataExpression__Group__1();
 
             state._fsp--;
@@ -18609,22 +18609,22 @@ public final void rule__LambdaDataExpression__Group__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__LambdaDataExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6283:1: rule__LambdaDataExpression__Group__0__Impl : ( '[' ) ;
+    // InternalScope.g:6283:1: rule__LambdaDataExpression__Group__0__Impl : ( '[' ) ;
     public final void rule__LambdaDataExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6287:1: ( ( '[' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6288:1: ( '[' )
+            // InternalScope.g:6287:1: ( ( '[' ) )
+            // InternalScope.g:6288:1: ( '[' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6288:1: ( '[' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6289:1: '['
+            // InternalScope.g:6288:1: ( '[' )
+            // InternalScope.g:6289:1: '['
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLambdaDataExpressionAccess().getLeftSquareBracketKeyword_0()); 
             }
-            match(input,56,FOLLOW_56_in_rule__LambdaDataExpression__Group__0__Impl12920); if (state.failed) return ;
+            match(input,56,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getLambdaDataExpressionAccess().getLeftSquareBracketKeyword_0()); 
             }
@@ -18650,21 +18650,21 @@ public final void rule__LambdaDataExpression__Group__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__LambdaDataExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6302:1: rule__LambdaDataExpression__Group__1 : rule__LambdaDataExpression__Group__1__Impl rule__LambdaDataExpression__Group__2 ;
+    // InternalScope.g:6302:1: rule__LambdaDataExpression__Group__1 : rule__LambdaDataExpression__Group__1__Impl rule__LambdaDataExpression__Group__2 ;
     public final void rule__LambdaDataExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6306:1: ( rule__LambdaDataExpression__Group__1__Impl rule__LambdaDataExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6307:2: rule__LambdaDataExpression__Group__1__Impl rule__LambdaDataExpression__Group__2
+            // InternalScope.g:6306:1: ( rule__LambdaDataExpression__Group__1__Impl rule__LambdaDataExpression__Group__2 )
+            // InternalScope.g:6307:2: rule__LambdaDataExpression__Group__1__Impl rule__LambdaDataExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__LambdaDataExpression__Group__1__Impl_in_rule__LambdaDataExpression__Group__112951);
+            pushFollow(FOLLOW_31);
             rule__LambdaDataExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__LambdaDataExpression__Group__2_in_rule__LambdaDataExpression__Group__112954);
+            pushFollow(FOLLOW_2);
             rule__LambdaDataExpression__Group__2();
 
             state._fsp--;
@@ -18688,25 +18688,25 @@ public final void rule__LambdaDataExpression__Group__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__LambdaDataExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6314:1: rule__LambdaDataExpression__Group__1__Impl : ( ( rule__LambdaDataExpression__DescAssignment_1 ) ) ;
+    // InternalScope.g:6314:1: rule__LambdaDataExpression__Group__1__Impl : ( ( rule__LambdaDataExpression__DescAssignment_1 ) ) ;
     public final void rule__LambdaDataExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6318:1: ( ( ( rule__LambdaDataExpression__DescAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6319:1: ( ( rule__LambdaDataExpression__DescAssignment_1 ) )
+            // InternalScope.g:6318:1: ( ( ( rule__LambdaDataExpression__DescAssignment_1 ) ) )
+            // InternalScope.g:6319:1: ( ( rule__LambdaDataExpression__DescAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6319:1: ( ( rule__LambdaDataExpression__DescAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6320:1: ( rule__LambdaDataExpression__DescAssignment_1 )
+            // InternalScope.g:6319:1: ( ( rule__LambdaDataExpression__DescAssignment_1 ) )
+            // InternalScope.g:6320:1: ( rule__LambdaDataExpression__DescAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLambdaDataExpressionAccess().getDescAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6321:1: ( rule__LambdaDataExpression__DescAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6321:2: rule__LambdaDataExpression__DescAssignment_1
+            // InternalScope.g:6321:1: ( rule__LambdaDataExpression__DescAssignment_1 )
+            // InternalScope.g:6321:2: rule__LambdaDataExpression__DescAssignment_1
             {
-            pushFollow(FOLLOW_rule__LambdaDataExpression__DescAssignment_1_in_rule__LambdaDataExpression__Group__1__Impl12981);
+            pushFollow(FOLLOW_2);
             rule__LambdaDataExpression__DescAssignment_1();
 
             state._fsp--;
@@ -18739,21 +18739,21 @@ public final void rule__LambdaDataExpression__Group__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__LambdaDataExpression__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6331:1: rule__LambdaDataExpression__Group__2 : rule__LambdaDataExpression__Group__2__Impl rule__LambdaDataExpression__Group__3 ;
+    // InternalScope.g:6331:1: rule__LambdaDataExpression__Group__2 : rule__LambdaDataExpression__Group__2__Impl rule__LambdaDataExpression__Group__3 ;
     public final void rule__LambdaDataExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6335:1: ( rule__LambdaDataExpression__Group__2__Impl rule__LambdaDataExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6336:2: rule__LambdaDataExpression__Group__2__Impl rule__LambdaDataExpression__Group__3
+            // InternalScope.g:6335:1: ( rule__LambdaDataExpression__Group__2__Impl rule__LambdaDataExpression__Group__3 )
+            // InternalScope.g:6336:2: rule__LambdaDataExpression__Group__2__Impl rule__LambdaDataExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__LambdaDataExpression__Group__2__Impl_in_rule__LambdaDataExpression__Group__213011);
+            pushFollow(FOLLOW_17);
             rule__LambdaDataExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__LambdaDataExpression__Group__3_in_rule__LambdaDataExpression__Group__213014);
+            pushFollow(FOLLOW_2);
             rule__LambdaDataExpression__Group__3();
 
             state._fsp--;
@@ -18777,22 +18777,22 @@ public final void rule__LambdaDataExpression__Group__2() throws RecognitionExcep
 
 
     // $ANTLR start "rule__LambdaDataExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6343:1: rule__LambdaDataExpression__Group__2__Impl : ( '|' ) ;
+    // InternalScope.g:6343:1: rule__LambdaDataExpression__Group__2__Impl : ( '|' ) ;
     public final void rule__LambdaDataExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6347:1: ( ( '|' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6348:1: ( '|' )
+            // InternalScope.g:6347:1: ( ( '|' ) )
+            // InternalScope.g:6348:1: ( '|' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6348:1: ( '|' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6349:1: '|'
+            // InternalScope.g:6348:1: ( '|' )
+            // InternalScope.g:6349:1: '|'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLambdaDataExpressionAccess().getVerticalLineKeyword_2()); 
             }
-            match(input,58,FOLLOW_58_in_rule__LambdaDataExpression__Group__2__Impl13042); if (state.failed) return ;
+            match(input,58,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getLambdaDataExpressionAccess().getVerticalLineKeyword_2()); 
             }
@@ -18818,21 +18818,21 @@ public final void rule__LambdaDataExpression__Group__2__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__LambdaDataExpression__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6362:1: rule__LambdaDataExpression__Group__3 : rule__LambdaDataExpression__Group__3__Impl rule__LambdaDataExpression__Group__4 ;
+    // InternalScope.g:6362:1: rule__LambdaDataExpression__Group__3 : rule__LambdaDataExpression__Group__3__Impl rule__LambdaDataExpression__Group__4 ;
     public final void rule__LambdaDataExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6366:1: ( rule__LambdaDataExpression__Group__3__Impl rule__LambdaDataExpression__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6367:2: rule__LambdaDataExpression__Group__3__Impl rule__LambdaDataExpression__Group__4
+            // InternalScope.g:6366:1: ( rule__LambdaDataExpression__Group__3__Impl rule__LambdaDataExpression__Group__4 )
+            // InternalScope.g:6367:2: rule__LambdaDataExpression__Group__3__Impl rule__LambdaDataExpression__Group__4
             {
-            pushFollow(FOLLOW_rule__LambdaDataExpression__Group__3__Impl_in_rule__LambdaDataExpression__Group__313073);
+            pushFollow(FOLLOW_30);
             rule__LambdaDataExpression__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__LambdaDataExpression__Group__4_in_rule__LambdaDataExpression__Group__313076);
+            pushFollow(FOLLOW_2);
             rule__LambdaDataExpression__Group__4();
 
             state._fsp--;
@@ -18856,25 +18856,25 @@ public final void rule__LambdaDataExpression__Group__3() throws RecognitionExcep
 
 
     // $ANTLR start "rule__LambdaDataExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6374:1: rule__LambdaDataExpression__Group__3__Impl : ( ( rule__LambdaDataExpression__ValueAssignment_3 ) ) ;
+    // InternalScope.g:6374:1: rule__LambdaDataExpression__Group__3__Impl : ( ( rule__LambdaDataExpression__ValueAssignment_3 ) ) ;
     public final void rule__LambdaDataExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6378:1: ( ( ( rule__LambdaDataExpression__ValueAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6379:1: ( ( rule__LambdaDataExpression__ValueAssignment_3 ) )
+            // InternalScope.g:6378:1: ( ( ( rule__LambdaDataExpression__ValueAssignment_3 ) ) )
+            // InternalScope.g:6379:1: ( ( rule__LambdaDataExpression__ValueAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6379:1: ( ( rule__LambdaDataExpression__ValueAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6380:1: ( rule__LambdaDataExpression__ValueAssignment_3 )
+            // InternalScope.g:6379:1: ( ( rule__LambdaDataExpression__ValueAssignment_3 ) )
+            // InternalScope.g:6380:1: ( rule__LambdaDataExpression__ValueAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLambdaDataExpressionAccess().getValueAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6381:1: ( rule__LambdaDataExpression__ValueAssignment_3 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6381:2: rule__LambdaDataExpression__ValueAssignment_3
+            // InternalScope.g:6381:1: ( rule__LambdaDataExpression__ValueAssignment_3 )
+            // InternalScope.g:6381:2: rule__LambdaDataExpression__ValueAssignment_3
             {
-            pushFollow(FOLLOW_rule__LambdaDataExpression__ValueAssignment_3_in_rule__LambdaDataExpression__Group__3__Impl13103);
+            pushFollow(FOLLOW_2);
             rule__LambdaDataExpression__ValueAssignment_3();
 
             state._fsp--;
@@ -18907,16 +18907,16 @@ public final void rule__LambdaDataExpression__Group__3__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__LambdaDataExpression__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6391:1: rule__LambdaDataExpression__Group__4 : rule__LambdaDataExpression__Group__4__Impl ;
+    // InternalScope.g:6391:1: rule__LambdaDataExpression__Group__4 : rule__LambdaDataExpression__Group__4__Impl ;
     public final void rule__LambdaDataExpression__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6395:1: ( rule__LambdaDataExpression__Group__4__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6396:2: rule__LambdaDataExpression__Group__4__Impl
+            // InternalScope.g:6395:1: ( rule__LambdaDataExpression__Group__4__Impl )
+            // InternalScope.g:6396:2: rule__LambdaDataExpression__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__LambdaDataExpression__Group__4__Impl_in_rule__LambdaDataExpression__Group__413133);
+            pushFollow(FOLLOW_2);
             rule__LambdaDataExpression__Group__4__Impl();
 
             state._fsp--;
@@ -18940,22 +18940,22 @@ public final void rule__LambdaDataExpression__Group__4() throws RecognitionExcep
 
 
     // $ANTLR start "rule__LambdaDataExpression__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6402:1: rule__LambdaDataExpression__Group__4__Impl : ( ']' ) ;
+    // InternalScope.g:6402:1: rule__LambdaDataExpression__Group__4__Impl : ( ']' ) ;
     public final void rule__LambdaDataExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6406:1: ( ( ']' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6407:1: ( ']' )
+            // InternalScope.g:6406:1: ( ( ']' ) )
+            // InternalScope.g:6407:1: ( ']' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6407:1: ( ']' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6408:1: ']'
+            // InternalScope.g:6407:1: ( ']' )
+            // InternalScope.g:6408:1: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLambdaDataExpressionAccess().getRightSquareBracketKeyword_4()); 
             }
-            match(input,57,FOLLOW_57_in_rule__LambdaDataExpression__Group__4__Impl13161); if (state.failed) return ;
+            match(input,57,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getLambdaDataExpressionAccess().getRightSquareBracketKeyword_4()); 
             }
@@ -18981,16 +18981,16 @@ public final void rule__LambdaDataExpression__Group__4__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__Naming__Group_0__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6431:1: rule__Naming__Group_0__0 : rule__Naming__Group_0__0__Impl ;
+    // InternalScope.g:6431:1: rule__Naming__Group_0__0 : rule__Naming__Group_0__0__Impl ;
     public final void rule__Naming__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6435:1: ( rule__Naming__Group_0__0__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6436:2: rule__Naming__Group_0__0__Impl
+            // InternalScope.g:6435:1: ( rule__Naming__Group_0__0__Impl )
+            // InternalScope.g:6436:2: rule__Naming__Group_0__0__Impl
             {
-            pushFollow(FOLLOW_rule__Naming__Group_0__0__Impl_in_rule__Naming__Group_0__013202);
+            pushFollow(FOLLOW_2);
             rule__Naming__Group_0__0__Impl();
 
             state._fsp--;
@@ -19014,25 +19014,25 @@ public final void rule__Naming__Group_0__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Naming__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6442:1: rule__Naming__Group_0__0__Impl : ( ( rule__Naming__Group_0_0__0 ) ) ;
+    // InternalScope.g:6442:1: rule__Naming__Group_0__0__Impl : ( ( rule__Naming__Group_0_0__0 ) ) ;
     public final void rule__Naming__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6446:1: ( ( ( rule__Naming__Group_0_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6447:1: ( ( rule__Naming__Group_0_0__0 ) )
+            // InternalScope.g:6446:1: ( ( ( rule__Naming__Group_0_0__0 ) ) )
+            // InternalScope.g:6447:1: ( ( rule__Naming__Group_0_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6447:1: ( ( rule__Naming__Group_0_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6448:1: ( rule__Naming__Group_0_0__0 )
+            // InternalScope.g:6447:1: ( ( rule__Naming__Group_0_0__0 ) )
+            // InternalScope.g:6448:1: ( rule__Naming__Group_0_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamingAccess().getGroup_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6449:1: ( rule__Naming__Group_0_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6449:2: rule__Naming__Group_0_0__0
+            // InternalScope.g:6449:1: ( rule__Naming__Group_0_0__0 )
+            // InternalScope.g:6449:2: rule__Naming__Group_0_0__0
             {
-            pushFollow(FOLLOW_rule__Naming__Group_0_0__0_in_rule__Naming__Group_0__0__Impl13229);
+            pushFollow(FOLLOW_2);
             rule__Naming__Group_0_0__0();
 
             state._fsp--;
@@ -19065,21 +19065,21 @@ public final void rule__Naming__Group_0__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Naming__Group_0_0__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6461:1: rule__Naming__Group_0_0__0 : rule__Naming__Group_0_0__0__Impl rule__Naming__Group_0_0__1 ;
+    // InternalScope.g:6461:1: rule__Naming__Group_0_0__0 : rule__Naming__Group_0_0__0__Impl rule__Naming__Group_0_0__1 ;
     public final void rule__Naming__Group_0_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6465:1: ( rule__Naming__Group_0_0__0__Impl rule__Naming__Group_0_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6466:2: rule__Naming__Group_0_0__0__Impl rule__Naming__Group_0_0__1
+            // InternalScope.g:6465:1: ( rule__Naming__Group_0_0__0__Impl rule__Naming__Group_0_0__1 )
+            // InternalScope.g:6466:2: rule__Naming__Group_0_0__0__Impl rule__Naming__Group_0_0__1
             {
-            pushFollow(FOLLOW_rule__Naming__Group_0_0__0__Impl_in_rule__Naming__Group_0_0__013261);
+            pushFollow(FOLLOW_17);
             rule__Naming__Group_0_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Naming__Group_0_0__1_in_rule__Naming__Group_0_0__013264);
+            pushFollow(FOLLOW_2);
             rule__Naming__Group_0_0__1();
 
             state._fsp--;
@@ -19103,22 +19103,22 @@ public final void rule__Naming__Group_0_0__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Naming__Group_0_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6473:1: rule__Naming__Group_0_0__0__Impl : ( '(' ) ;
+    // InternalScope.g:6473:1: rule__Naming__Group_0_0__0__Impl : ( '(' ) ;
     public final void rule__Naming__Group_0_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6477:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6478:1: ( '(' )
+            // InternalScope.g:6477:1: ( ( '(' ) )
+            // InternalScope.g:6478:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6478:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6479:1: '('
+            // InternalScope.g:6478:1: ( '(' )
+            // InternalScope.g:6479:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamingAccess().getLeftParenthesisKeyword_0_0_0()); 
             }
-            match(input,51,FOLLOW_51_in_rule__Naming__Group_0_0__0__Impl13292); if (state.failed) return ;
+            match(input,51,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getNamingAccess().getLeftParenthesisKeyword_0_0_0()); 
             }
@@ -19144,21 +19144,21 @@ public final void rule__Naming__Group_0_0__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__Naming__Group_0_0__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6492:1: rule__Naming__Group_0_0__1 : rule__Naming__Group_0_0__1__Impl rule__Naming__Group_0_0__2 ;
+    // InternalScope.g:6492:1: rule__Naming__Group_0_0__1 : rule__Naming__Group_0_0__1__Impl rule__Naming__Group_0_0__2 ;
     public final void rule__Naming__Group_0_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6496:1: ( rule__Naming__Group_0_0__1__Impl rule__Naming__Group_0_0__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6497:2: rule__Naming__Group_0_0__1__Impl rule__Naming__Group_0_0__2
+            // InternalScope.g:6496:1: ( rule__Naming__Group_0_0__1__Impl rule__Naming__Group_0_0__2 )
+            // InternalScope.g:6497:2: rule__Naming__Group_0_0__1__Impl rule__Naming__Group_0_0__2
             {
-            pushFollow(FOLLOW_rule__Naming__Group_0_0__1__Impl_in_rule__Naming__Group_0_0__113323);
+            pushFollow(FOLLOW_34);
             rule__Naming__Group_0_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Naming__Group_0_0__2_in_rule__Naming__Group_0_0__113326);
+            pushFollow(FOLLOW_2);
             rule__Naming__Group_0_0__2();
 
             state._fsp--;
@@ -19182,25 +19182,25 @@ public final void rule__Naming__Group_0_0__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Naming__Group_0_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6504:1: rule__Naming__Group_0_0__1__Impl : ( ( rule__Naming__NamesAssignment_0_0_1 ) ) ;
+    // InternalScope.g:6504:1: rule__Naming__Group_0_0__1__Impl : ( ( rule__Naming__NamesAssignment_0_0_1 ) ) ;
     public final void rule__Naming__Group_0_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6508:1: ( ( ( rule__Naming__NamesAssignment_0_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6509:1: ( ( rule__Naming__NamesAssignment_0_0_1 ) )
+            // InternalScope.g:6508:1: ( ( ( rule__Naming__NamesAssignment_0_0_1 ) ) )
+            // InternalScope.g:6509:1: ( ( rule__Naming__NamesAssignment_0_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6509:1: ( ( rule__Naming__NamesAssignment_0_0_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6510:1: ( rule__Naming__NamesAssignment_0_0_1 )
+            // InternalScope.g:6509:1: ( ( rule__Naming__NamesAssignment_0_0_1 ) )
+            // InternalScope.g:6510:1: ( rule__Naming__NamesAssignment_0_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamingAccess().getNamesAssignment_0_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6511:1: ( rule__Naming__NamesAssignment_0_0_1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6511:2: rule__Naming__NamesAssignment_0_0_1
+            // InternalScope.g:6511:1: ( rule__Naming__NamesAssignment_0_0_1 )
+            // InternalScope.g:6511:2: rule__Naming__NamesAssignment_0_0_1
             {
-            pushFollow(FOLLOW_rule__Naming__NamesAssignment_0_0_1_in_rule__Naming__Group_0_0__1__Impl13353);
+            pushFollow(FOLLOW_2);
             rule__Naming__NamesAssignment_0_0_1();
 
             state._fsp--;
@@ -19233,21 +19233,21 @@ public final void rule__Naming__Group_0_0__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__Naming__Group_0_0__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6521:1: rule__Naming__Group_0_0__2 : rule__Naming__Group_0_0__2__Impl rule__Naming__Group_0_0__3 ;
+    // InternalScope.g:6521:1: rule__Naming__Group_0_0__2 : rule__Naming__Group_0_0__2__Impl rule__Naming__Group_0_0__3 ;
     public final void rule__Naming__Group_0_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6525:1: ( rule__Naming__Group_0_0__2__Impl rule__Naming__Group_0_0__3 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6526:2: rule__Naming__Group_0_0__2__Impl rule__Naming__Group_0_0__3
+            // InternalScope.g:6525:1: ( rule__Naming__Group_0_0__2__Impl rule__Naming__Group_0_0__3 )
+            // InternalScope.g:6526:2: rule__Naming__Group_0_0__2__Impl rule__Naming__Group_0_0__3
             {
-            pushFollow(FOLLOW_rule__Naming__Group_0_0__2__Impl_in_rule__Naming__Group_0_0__213383);
+            pushFollow(FOLLOW_34);
             rule__Naming__Group_0_0__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Naming__Group_0_0__3_in_rule__Naming__Group_0_0__213386);
+            pushFollow(FOLLOW_2);
             rule__Naming__Group_0_0__3();
 
             state._fsp--;
@@ -19271,22 +19271,22 @@ public final void rule__Naming__Group_0_0__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__Naming__Group_0_0__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6533:1: rule__Naming__Group_0_0__2__Impl : ( ( rule__Naming__Group_0_0_2__0 )* ) ;
+    // InternalScope.g:6533:1: rule__Naming__Group_0_0__2__Impl : ( ( rule__Naming__Group_0_0_2__0 )* ) ;
     public final void rule__Naming__Group_0_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6537:1: ( ( ( rule__Naming__Group_0_0_2__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6538:1: ( ( rule__Naming__Group_0_0_2__0 )* )
+            // InternalScope.g:6537:1: ( ( ( rule__Naming__Group_0_0_2__0 )* ) )
+            // InternalScope.g:6538:1: ( ( rule__Naming__Group_0_0_2__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6538:1: ( ( rule__Naming__Group_0_0_2__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6539:1: ( rule__Naming__Group_0_0_2__0 )*
+            // InternalScope.g:6538:1: ( ( rule__Naming__Group_0_0_2__0 )* )
+            // InternalScope.g:6539:1: ( rule__Naming__Group_0_0_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamingAccess().getGroup_0_0_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6540:1: ( rule__Naming__Group_0_0_2__0 )*
+            // InternalScope.g:6540:1: ( rule__Naming__Group_0_0_2__0 )*
             loop51:
             do {
                 int alt51=2;
@@ -19299,9 +19299,9 @@ public final void rule__Naming__Group_0_0__2__Impl() throws RecognitionException
 
                 switch (alt51) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6540:2: rule__Naming__Group_0_0_2__0
+            	    // InternalScope.g:6540:2: rule__Naming__Group_0_0_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__Naming__Group_0_0_2__0_in_rule__Naming__Group_0_0__2__Impl13413);
+            	    pushFollow(FOLLOW_40);
             	    rule__Naming__Group_0_0_2__0();
 
             	    state._fsp--;
@@ -19340,16 +19340,16 @@ public final void rule__Naming__Group_0_0__2__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__Naming__Group_0_0__3"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6550:1: rule__Naming__Group_0_0__3 : rule__Naming__Group_0_0__3__Impl ;
+    // InternalScope.g:6550:1: rule__Naming__Group_0_0__3 : rule__Naming__Group_0_0__3__Impl ;
     public final void rule__Naming__Group_0_0__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6554:1: ( rule__Naming__Group_0_0__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6555:2: rule__Naming__Group_0_0__3__Impl
+            // InternalScope.g:6554:1: ( rule__Naming__Group_0_0__3__Impl )
+            // InternalScope.g:6555:2: rule__Naming__Group_0_0__3__Impl
             {
-            pushFollow(FOLLOW_rule__Naming__Group_0_0__3__Impl_in_rule__Naming__Group_0_0__313444);
+            pushFollow(FOLLOW_2);
             rule__Naming__Group_0_0__3__Impl();
 
             state._fsp--;
@@ -19373,22 +19373,22 @@ public final void rule__Naming__Group_0_0__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__Naming__Group_0_0__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6561:1: rule__Naming__Group_0_0__3__Impl : ( ')' ) ;
+    // InternalScope.g:6561:1: rule__Naming__Group_0_0__3__Impl : ( ')' ) ;
     public final void rule__Naming__Group_0_0__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6565:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6566:1: ( ')' )
+            // InternalScope.g:6565:1: ( ( ')' ) )
+            // InternalScope.g:6566:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6566:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6567:1: ')'
+            // InternalScope.g:6566:1: ( ')' )
+            // InternalScope.g:6567:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamingAccess().getRightParenthesisKeyword_0_0_3()); 
             }
-            match(input,52,FOLLOW_52_in_rule__Naming__Group_0_0__3__Impl13472); if (state.failed) return ;
+            match(input,52,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getNamingAccess().getRightParenthesisKeyword_0_0_3()); 
             }
@@ -19414,21 +19414,21 @@ public final void rule__Naming__Group_0_0__3__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__Naming__Group_0_0_2__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6588:1: rule__Naming__Group_0_0_2__0 : rule__Naming__Group_0_0_2__0__Impl rule__Naming__Group_0_0_2__1 ;
+    // InternalScope.g:6588:1: rule__Naming__Group_0_0_2__0 : rule__Naming__Group_0_0_2__0__Impl rule__Naming__Group_0_0_2__1 ;
     public final void rule__Naming__Group_0_0_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6592:1: ( rule__Naming__Group_0_0_2__0__Impl rule__Naming__Group_0_0_2__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6593:2: rule__Naming__Group_0_0_2__0__Impl rule__Naming__Group_0_0_2__1
+            // InternalScope.g:6592:1: ( rule__Naming__Group_0_0_2__0__Impl rule__Naming__Group_0_0_2__1 )
+            // InternalScope.g:6593:2: rule__Naming__Group_0_0_2__0__Impl rule__Naming__Group_0_0_2__1
             {
-            pushFollow(FOLLOW_rule__Naming__Group_0_0_2__0__Impl_in_rule__Naming__Group_0_0_2__013511);
+            pushFollow(FOLLOW_17);
             rule__Naming__Group_0_0_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Naming__Group_0_0_2__1_in_rule__Naming__Group_0_0_2__013514);
+            pushFollow(FOLLOW_2);
             rule__Naming__Group_0_0_2__1();
 
             state._fsp--;
@@ -19452,22 +19452,22 @@ public final void rule__Naming__Group_0_0_2__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Naming__Group_0_0_2__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6600:1: rule__Naming__Group_0_0_2__0__Impl : ( ',' ) ;
+    // InternalScope.g:6600:1: rule__Naming__Group_0_0_2__0__Impl : ( ',' ) ;
     public final void rule__Naming__Group_0_0_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6604:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6605:1: ( ',' )
+            // InternalScope.g:6604:1: ( ( ',' ) )
+            // InternalScope.g:6605:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6605:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6606:1: ','
+            // InternalScope.g:6605:1: ( ',' )
+            // InternalScope.g:6606:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamingAccess().getCommaKeyword_0_0_2_0()); 
             }
-            match(input,61,FOLLOW_61_in_rule__Naming__Group_0_0_2__0__Impl13542); if (state.failed) return ;
+            match(input,61,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getNamingAccess().getCommaKeyword_0_0_2_0()); 
             }
@@ -19493,16 +19493,16 @@ public final void rule__Naming__Group_0_0_2__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__Naming__Group_0_0_2__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6619:1: rule__Naming__Group_0_0_2__1 : rule__Naming__Group_0_0_2__1__Impl ;
+    // InternalScope.g:6619:1: rule__Naming__Group_0_0_2__1 : rule__Naming__Group_0_0_2__1__Impl ;
     public final void rule__Naming__Group_0_0_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6623:1: ( rule__Naming__Group_0_0_2__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6624:2: rule__Naming__Group_0_0_2__1__Impl
+            // InternalScope.g:6623:1: ( rule__Naming__Group_0_0_2__1__Impl )
+            // InternalScope.g:6624:2: rule__Naming__Group_0_0_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__Naming__Group_0_0_2__1__Impl_in_rule__Naming__Group_0_0_2__113573);
+            pushFollow(FOLLOW_2);
             rule__Naming__Group_0_0_2__1__Impl();
 
             state._fsp--;
@@ -19526,25 +19526,25 @@ public final void rule__Naming__Group_0_0_2__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Naming__Group_0_0_2__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6630:1: rule__Naming__Group_0_0_2__1__Impl : ( ( rule__Naming__NamesAssignment_0_0_2_1 ) ) ;
+    // InternalScope.g:6630:1: rule__Naming__Group_0_0_2__1__Impl : ( ( rule__Naming__NamesAssignment_0_0_2_1 ) ) ;
     public final void rule__Naming__Group_0_0_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6634:1: ( ( ( rule__Naming__NamesAssignment_0_0_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6635:1: ( ( rule__Naming__NamesAssignment_0_0_2_1 ) )
+            // InternalScope.g:6634:1: ( ( ( rule__Naming__NamesAssignment_0_0_2_1 ) ) )
+            // InternalScope.g:6635:1: ( ( rule__Naming__NamesAssignment_0_0_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6635:1: ( ( rule__Naming__NamesAssignment_0_0_2_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6636:1: ( rule__Naming__NamesAssignment_0_0_2_1 )
+            // InternalScope.g:6635:1: ( ( rule__Naming__NamesAssignment_0_0_2_1 ) )
+            // InternalScope.g:6636:1: ( rule__Naming__NamesAssignment_0_0_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamingAccess().getNamesAssignment_0_0_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6637:1: ( rule__Naming__NamesAssignment_0_0_2_1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6637:2: rule__Naming__NamesAssignment_0_0_2_1
+            // InternalScope.g:6637:1: ( rule__Naming__NamesAssignment_0_0_2_1 )
+            // InternalScope.g:6637:2: rule__Naming__NamesAssignment_0_0_2_1
             {
-            pushFollow(FOLLOW_rule__Naming__NamesAssignment_0_0_2_1_in_rule__Naming__Group_0_0_2__1__Impl13600);
+            pushFollow(FOLLOW_2);
             rule__Naming__NamesAssignment_0_0_2_1();
 
             state._fsp--;
@@ -19577,21 +19577,21 @@ public final void rule__Naming__Group_0_0_2__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__NamingExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6651:1: rule__NamingExpression__Group_1__0 : rule__NamingExpression__Group_1__0__Impl rule__NamingExpression__Group_1__1 ;
+    // InternalScope.g:6651:1: rule__NamingExpression__Group_1__0 : rule__NamingExpression__Group_1__0__Impl rule__NamingExpression__Group_1__1 ;
     public final void rule__NamingExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6655:1: ( rule__NamingExpression__Group_1__0__Impl rule__NamingExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6656:2: rule__NamingExpression__Group_1__0__Impl rule__NamingExpression__Group_1__1
+            // InternalScope.g:6655:1: ( rule__NamingExpression__Group_1__0__Impl rule__NamingExpression__Group_1__1 )
+            // InternalScope.g:6656:2: rule__NamingExpression__Group_1__0__Impl rule__NamingExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__NamingExpression__Group_1__0__Impl_in_rule__NamingExpression__Group_1__013634);
+            pushFollow(FOLLOW_17);
             rule__NamingExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__NamingExpression__Group_1__1_in_rule__NamingExpression__Group_1__013637);
+            pushFollow(FOLLOW_2);
             rule__NamingExpression__Group_1__1();
 
             state._fsp--;
@@ -19615,22 +19615,22 @@ public final void rule__NamingExpression__Group_1__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__NamingExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6663:1: rule__NamingExpression__Group_1__0__Impl : ( ( rule__NamingExpression__FactoryAssignment_1_0 )? ) ;
+    // InternalScope.g:6663:1: rule__NamingExpression__Group_1__0__Impl : ( ( rule__NamingExpression__FactoryAssignment_1_0 )? ) ;
     public final void rule__NamingExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6667:1: ( ( ( rule__NamingExpression__FactoryAssignment_1_0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6668:1: ( ( rule__NamingExpression__FactoryAssignment_1_0 )? )
+            // InternalScope.g:6667:1: ( ( ( rule__NamingExpression__FactoryAssignment_1_0 )? ) )
+            // InternalScope.g:6668:1: ( ( rule__NamingExpression__FactoryAssignment_1_0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6668:1: ( ( rule__NamingExpression__FactoryAssignment_1_0 )? )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6669:1: ( rule__NamingExpression__FactoryAssignment_1_0 )?
+            // InternalScope.g:6668:1: ( ( rule__NamingExpression__FactoryAssignment_1_0 )? )
+            // InternalScope.g:6669:1: ( rule__NamingExpression__FactoryAssignment_1_0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamingExpressionAccess().getFactoryAssignment_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6670:1: ( rule__NamingExpression__FactoryAssignment_1_0 )?
+            // InternalScope.g:6670:1: ( rule__NamingExpression__FactoryAssignment_1_0 )?
             int alt52=2;
             int LA52_0 = input.LA(1);
 
@@ -19639,9 +19639,9 @@ public final void rule__NamingExpression__Group_1__0__Impl() throws RecognitionE
             }
             switch (alt52) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6670:2: rule__NamingExpression__FactoryAssignment_1_0
+                    // InternalScope.g:6670:2: rule__NamingExpression__FactoryAssignment_1_0
                     {
-                    pushFollow(FOLLOW_rule__NamingExpression__FactoryAssignment_1_0_in_rule__NamingExpression__Group_1__0__Impl13664);
+                    pushFollow(FOLLOW_2);
                     rule__NamingExpression__FactoryAssignment_1_0();
 
                     state._fsp--;
@@ -19677,16 +19677,16 @@ public final void rule__NamingExpression__Group_1__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__NamingExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6680:1: rule__NamingExpression__Group_1__1 : rule__NamingExpression__Group_1__1__Impl ;
+    // InternalScope.g:6680:1: rule__NamingExpression__Group_1__1 : rule__NamingExpression__Group_1__1__Impl ;
     public final void rule__NamingExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6684:1: ( rule__NamingExpression__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6685:2: rule__NamingExpression__Group_1__1__Impl
+            // InternalScope.g:6684:1: ( rule__NamingExpression__Group_1__1__Impl )
+            // InternalScope.g:6685:2: rule__NamingExpression__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__NamingExpression__Group_1__1__Impl_in_rule__NamingExpression__Group_1__113695);
+            pushFollow(FOLLOW_2);
             rule__NamingExpression__Group_1__1__Impl();
 
             state._fsp--;
@@ -19710,25 +19710,25 @@ public final void rule__NamingExpression__Group_1__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__NamingExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6691:1: rule__NamingExpression__Group_1__1__Impl : ( ( rule__NamingExpression__ExpressionAssignment_1_1 ) ) ;
+    // InternalScope.g:6691:1: rule__NamingExpression__Group_1__1__Impl : ( ( rule__NamingExpression__ExpressionAssignment_1_1 ) ) ;
     public final void rule__NamingExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6695:1: ( ( ( rule__NamingExpression__ExpressionAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6696:1: ( ( rule__NamingExpression__ExpressionAssignment_1_1 ) )
+            // InternalScope.g:6695:1: ( ( ( rule__NamingExpression__ExpressionAssignment_1_1 ) ) )
+            // InternalScope.g:6696:1: ( ( rule__NamingExpression__ExpressionAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6696:1: ( ( rule__NamingExpression__ExpressionAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6697:1: ( rule__NamingExpression__ExpressionAssignment_1_1 )
+            // InternalScope.g:6696:1: ( ( rule__NamingExpression__ExpressionAssignment_1_1 ) )
+            // InternalScope.g:6697:1: ( rule__NamingExpression__ExpressionAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamingExpressionAccess().getExpressionAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6698:1: ( rule__NamingExpression__ExpressionAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6698:2: rule__NamingExpression__ExpressionAssignment_1_1
+            // InternalScope.g:6698:1: ( rule__NamingExpression__ExpressionAssignment_1_1 )
+            // InternalScope.g:6698:2: rule__NamingExpression__ExpressionAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__NamingExpression__ExpressionAssignment_1_1_in_rule__NamingExpression__Group_1__1__Impl13722);
+            pushFollow(FOLLOW_2);
             rule__NamingExpression__ExpressionAssignment_1_1();
 
             state._fsp--;
@@ -19761,21 +19761,21 @@ public final void rule__NamingExpression__Group_1__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__QualifiedID__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6712:1: rule__QualifiedID__Group__0 : rule__QualifiedID__Group__0__Impl rule__QualifiedID__Group__1 ;
+    // InternalScope.g:6712:1: rule__QualifiedID__Group__0 : rule__QualifiedID__Group__0__Impl rule__QualifiedID__Group__1 ;
     public final void rule__QualifiedID__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6716:1: ( rule__QualifiedID__Group__0__Impl rule__QualifiedID__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6717:2: rule__QualifiedID__Group__0__Impl rule__QualifiedID__Group__1
+            // InternalScope.g:6716:1: ( rule__QualifiedID__Group__0__Impl rule__QualifiedID__Group__1 )
+            // InternalScope.g:6717:2: rule__QualifiedID__Group__0__Impl rule__QualifiedID__Group__1
             {
-            pushFollow(FOLLOW_rule__QualifiedID__Group__0__Impl_in_rule__QualifiedID__Group__013756);
+            pushFollow(FOLLOW_43);
             rule__QualifiedID__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__QualifiedID__Group__1_in_rule__QualifiedID__Group__013759);
+            pushFollow(FOLLOW_2);
             rule__QualifiedID__Group__1();
 
             state._fsp--;
@@ -19799,22 +19799,22 @@ public final void rule__QualifiedID__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__QualifiedID__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6724:1: rule__QualifiedID__Group__0__Impl : ( ruleIdentifier ) ;
+    // InternalScope.g:6724:1: rule__QualifiedID__Group__0__Impl : ( ruleIdentifier ) ;
     public final void rule__QualifiedID__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6728:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6729:1: ( ruleIdentifier )
+            // InternalScope.g:6728:1: ( ( ruleIdentifier ) )
+            // InternalScope.g:6729:1: ( ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6729:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6730:1: ruleIdentifier
+            // InternalScope.g:6729:1: ( ruleIdentifier )
+            // InternalScope.g:6730:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedIDAccess().getIdentifierParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__QualifiedID__Group__0__Impl13786);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -19844,16 +19844,16 @@ public final void rule__QualifiedID__Group__0__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__QualifiedID__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6741:1: rule__QualifiedID__Group__1 : rule__QualifiedID__Group__1__Impl ;
+    // InternalScope.g:6741:1: rule__QualifiedID__Group__1 : rule__QualifiedID__Group__1__Impl ;
     public final void rule__QualifiedID__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6745:1: ( rule__QualifiedID__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6746:2: rule__QualifiedID__Group__1__Impl
+            // InternalScope.g:6745:1: ( rule__QualifiedID__Group__1__Impl )
+            // InternalScope.g:6746:2: rule__QualifiedID__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__QualifiedID__Group__1__Impl_in_rule__QualifiedID__Group__113815);
+            pushFollow(FOLLOW_2);
             rule__QualifiedID__Group__1__Impl();
 
             state._fsp--;
@@ -19877,22 +19877,22 @@ public final void rule__QualifiedID__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__QualifiedID__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6752:1: rule__QualifiedID__Group__1__Impl : ( ( rule__QualifiedID__Group_1__0 )* ) ;
+    // InternalScope.g:6752:1: rule__QualifiedID__Group__1__Impl : ( ( rule__QualifiedID__Group_1__0 )* ) ;
     public final void rule__QualifiedID__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6756:1: ( ( ( rule__QualifiedID__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6757:1: ( ( rule__QualifiedID__Group_1__0 )* )
+            // InternalScope.g:6756:1: ( ( ( rule__QualifiedID__Group_1__0 )* ) )
+            // InternalScope.g:6757:1: ( ( rule__QualifiedID__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6757:1: ( ( rule__QualifiedID__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6758:1: ( rule__QualifiedID__Group_1__0 )*
+            // InternalScope.g:6757:1: ( ( rule__QualifiedID__Group_1__0 )* )
+            // InternalScope.g:6758:1: ( rule__QualifiedID__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedIDAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6759:1: ( rule__QualifiedID__Group_1__0 )*
+            // InternalScope.g:6759:1: ( rule__QualifiedID__Group_1__0 )*
             loop53:
             do {
                 int alt53=2;
@@ -19905,9 +19905,9 @@ public final void rule__QualifiedID__Group__1__Impl() throws RecognitionExceptio
 
                 switch (alt53) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6759:2: rule__QualifiedID__Group_1__0
+            	    // InternalScope.g:6759:2: rule__QualifiedID__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__QualifiedID__Group_1__0_in_rule__QualifiedID__Group__1__Impl13842);
+            	    pushFollow(FOLLOW_44);
             	    rule__QualifiedID__Group_1__0();
 
             	    state._fsp--;
@@ -19946,21 +19946,21 @@ public final void rule__QualifiedID__Group__1__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__QualifiedID__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6773:1: rule__QualifiedID__Group_1__0 : rule__QualifiedID__Group_1__0__Impl rule__QualifiedID__Group_1__1 ;
+    // InternalScope.g:6773:1: rule__QualifiedID__Group_1__0 : rule__QualifiedID__Group_1__0__Impl rule__QualifiedID__Group_1__1 ;
     public final void rule__QualifiedID__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6777:1: ( rule__QualifiedID__Group_1__0__Impl rule__QualifiedID__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6778:2: rule__QualifiedID__Group_1__0__Impl rule__QualifiedID__Group_1__1
+            // InternalScope.g:6777:1: ( rule__QualifiedID__Group_1__0__Impl rule__QualifiedID__Group_1__1 )
+            // InternalScope.g:6778:2: rule__QualifiedID__Group_1__0__Impl rule__QualifiedID__Group_1__1
             {
-            pushFollow(FOLLOW_rule__QualifiedID__Group_1__0__Impl_in_rule__QualifiedID__Group_1__013877);
+            pushFollow(FOLLOW_3);
             rule__QualifiedID__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__QualifiedID__Group_1__1_in_rule__QualifiedID__Group_1__013880);
+            pushFollow(FOLLOW_2);
             rule__QualifiedID__Group_1__1();
 
             state._fsp--;
@@ -19984,22 +19984,22 @@ public final void rule__QualifiedID__Group_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__QualifiedID__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6785:1: rule__QualifiedID__Group_1__0__Impl : ( '::' ) ;
+    // InternalScope.g:6785:1: rule__QualifiedID__Group_1__0__Impl : ( '::' ) ;
     public final void rule__QualifiedID__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6789:1: ( ( '::' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6790:1: ( '::' )
+            // InternalScope.g:6789:1: ( ( '::' ) )
+            // InternalScope.g:6790:1: ( '::' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6790:1: ( '::' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6791:1: '::'
+            // InternalScope.g:6790:1: ( '::' )
+            // InternalScope.g:6791:1: '::'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedIDAccess().getColonColonKeyword_1_0()); 
             }
-            match(input,67,FOLLOW_67_in_rule__QualifiedID__Group_1__0__Impl13908); if (state.failed) return ;
+            match(input,67,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getQualifiedIDAccess().getColonColonKeyword_1_0()); 
             }
@@ -20025,16 +20025,16 @@ public final void rule__QualifiedID__Group_1__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__QualifiedID__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6804:1: rule__QualifiedID__Group_1__1 : rule__QualifiedID__Group_1__1__Impl ;
+    // InternalScope.g:6804:1: rule__QualifiedID__Group_1__1 : rule__QualifiedID__Group_1__1__Impl ;
     public final void rule__QualifiedID__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6808:1: ( rule__QualifiedID__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6809:2: rule__QualifiedID__Group_1__1__Impl
+            // InternalScope.g:6808:1: ( rule__QualifiedID__Group_1__1__Impl )
+            // InternalScope.g:6809:2: rule__QualifiedID__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__QualifiedID__Group_1__1__Impl_in_rule__QualifiedID__Group_1__113939);
+            pushFollow(FOLLOW_2);
             rule__QualifiedID__Group_1__1__Impl();
 
             state._fsp--;
@@ -20058,22 +20058,22 @@ public final void rule__QualifiedID__Group_1__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__QualifiedID__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6815:1: rule__QualifiedID__Group_1__1__Impl : ( ruleIdentifier ) ;
+    // InternalScope.g:6815:1: rule__QualifiedID__Group_1__1__Impl : ( ruleIdentifier ) ;
     public final void rule__QualifiedID__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6819:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6820:1: ( ruleIdentifier )
+            // InternalScope.g:6819:1: ( ( ruleIdentifier ) )
+            // InternalScope.g:6820:1: ( ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6820:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6821:1: ruleIdentifier
+            // InternalScope.g:6820:1: ( ruleIdentifier )
+            // InternalScope.g:6821:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedIDAccess().getIdentifierParserRuleCall_1_1()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__QualifiedID__Group_1__1__Impl13966);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -20103,21 +20103,21 @@ public final void rule__QualifiedID__Group_1__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__DottedID__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6836:1: rule__DottedID__Group__0 : rule__DottedID__Group__0__Impl rule__DottedID__Group__1 ;
+    // InternalScope.g:6836:1: rule__DottedID__Group__0 : rule__DottedID__Group__0__Impl rule__DottedID__Group__1 ;
     public final void rule__DottedID__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6840:1: ( rule__DottedID__Group__0__Impl rule__DottedID__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6841:2: rule__DottedID__Group__0__Impl rule__DottedID__Group__1
+            // InternalScope.g:6840:1: ( rule__DottedID__Group__0__Impl rule__DottedID__Group__1 )
+            // InternalScope.g:6841:2: rule__DottedID__Group__0__Impl rule__DottedID__Group__1
             {
-            pushFollow(FOLLOW_rule__DottedID__Group__0__Impl_in_rule__DottedID__Group__013999);
+            pushFollow(FOLLOW_45);
             rule__DottedID__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__DottedID__Group__1_in_rule__DottedID__Group__014002);
+            pushFollow(FOLLOW_2);
             rule__DottedID__Group__1();
 
             state._fsp--;
@@ -20141,22 +20141,22 @@ public final void rule__DottedID__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__DottedID__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6848:1: rule__DottedID__Group__0__Impl : ( ruleIdentifier ) ;
+    // InternalScope.g:6848:1: rule__DottedID__Group__0__Impl : ( ruleIdentifier ) ;
     public final void rule__DottedID__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6852:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6853:1: ( ruleIdentifier )
+            // InternalScope.g:6852:1: ( ( ruleIdentifier ) )
+            // InternalScope.g:6853:1: ( ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6853:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6854:1: ruleIdentifier
+            // InternalScope.g:6853:1: ( ruleIdentifier )
+            // InternalScope.g:6854:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDottedIDAccess().getIdentifierParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__DottedID__Group__0__Impl14029);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -20186,16 +20186,16 @@ public final void rule__DottedID__Group__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__DottedID__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6865:1: rule__DottedID__Group__1 : rule__DottedID__Group__1__Impl ;
+    // InternalScope.g:6865:1: rule__DottedID__Group__1 : rule__DottedID__Group__1__Impl ;
     public final void rule__DottedID__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6869:1: ( rule__DottedID__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6870:2: rule__DottedID__Group__1__Impl
+            // InternalScope.g:6869:1: ( rule__DottedID__Group__1__Impl )
+            // InternalScope.g:6870:2: rule__DottedID__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__DottedID__Group__1__Impl_in_rule__DottedID__Group__114058);
+            pushFollow(FOLLOW_2);
             rule__DottedID__Group__1__Impl();
 
             state._fsp--;
@@ -20219,22 +20219,22 @@ public final void rule__DottedID__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__DottedID__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6876:1: rule__DottedID__Group__1__Impl : ( ( rule__DottedID__Group_1__0 )* ) ;
+    // InternalScope.g:6876:1: rule__DottedID__Group__1__Impl : ( ( rule__DottedID__Group_1__0 )* ) ;
     public final void rule__DottedID__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6880:1: ( ( ( rule__DottedID__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6881:1: ( ( rule__DottedID__Group_1__0 )* )
+            // InternalScope.g:6880:1: ( ( ( rule__DottedID__Group_1__0 )* ) )
+            // InternalScope.g:6881:1: ( ( rule__DottedID__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6881:1: ( ( rule__DottedID__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6882:1: ( rule__DottedID__Group_1__0 )*
+            // InternalScope.g:6881:1: ( ( rule__DottedID__Group_1__0 )* )
+            // InternalScope.g:6882:1: ( rule__DottedID__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDottedIDAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6883:1: ( rule__DottedID__Group_1__0 )*
+            // InternalScope.g:6883:1: ( rule__DottedID__Group_1__0 )*
             loop54:
             do {
                 int alt54=2;
@@ -20247,9 +20247,9 @@ public final void rule__DottedID__Group__1__Impl() throws RecognitionException {
 
                 switch (alt54) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6883:2: rule__DottedID__Group_1__0
+            	    // InternalScope.g:6883:2: rule__DottedID__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__DottedID__Group_1__0_in_rule__DottedID__Group__1__Impl14085);
+            	    pushFollow(FOLLOW_46);
             	    rule__DottedID__Group_1__0();
 
             	    state._fsp--;
@@ -20288,21 +20288,21 @@ public final void rule__DottedID__Group__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__DottedID__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6897:1: rule__DottedID__Group_1__0 : rule__DottedID__Group_1__0__Impl rule__DottedID__Group_1__1 ;
+    // InternalScope.g:6897:1: rule__DottedID__Group_1__0 : rule__DottedID__Group_1__0__Impl rule__DottedID__Group_1__1 ;
     public final void rule__DottedID__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6901:1: ( rule__DottedID__Group_1__0__Impl rule__DottedID__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6902:2: rule__DottedID__Group_1__0__Impl rule__DottedID__Group_1__1
+            // InternalScope.g:6901:1: ( rule__DottedID__Group_1__0__Impl rule__DottedID__Group_1__1 )
+            // InternalScope.g:6902:2: rule__DottedID__Group_1__0__Impl rule__DottedID__Group_1__1
             {
-            pushFollow(FOLLOW_rule__DottedID__Group_1__0__Impl_in_rule__DottedID__Group_1__014120);
+            pushFollow(FOLLOW_3);
             rule__DottedID__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__DottedID__Group_1__1_in_rule__DottedID__Group_1__014123);
+            pushFollow(FOLLOW_2);
             rule__DottedID__Group_1__1();
 
             state._fsp--;
@@ -20326,22 +20326,22 @@ public final void rule__DottedID__Group_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__DottedID__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6909:1: rule__DottedID__Group_1__0__Impl : ( '.' ) ;
+    // InternalScope.g:6909:1: rule__DottedID__Group_1__0__Impl : ( '.' ) ;
     public final void rule__DottedID__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6913:1: ( ( '.' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6914:1: ( '.' )
+            // InternalScope.g:6913:1: ( ( '.' ) )
+            // InternalScope.g:6914:1: ( '.' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6914:1: ( '.' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6915:1: '.'
+            // InternalScope.g:6914:1: ( '.' )
+            // InternalScope.g:6915:1: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDottedIDAccess().getFullStopKeyword_1_0()); 
             }
-            match(input,68,FOLLOW_68_in_rule__DottedID__Group_1__0__Impl14151); if (state.failed) return ;
+            match(input,68,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getDottedIDAccess().getFullStopKeyword_1_0()); 
             }
@@ -20367,16 +20367,16 @@ public final void rule__DottedID__Group_1__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__DottedID__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6928:1: rule__DottedID__Group_1__1 : rule__DottedID__Group_1__1__Impl ;
+    // InternalScope.g:6928:1: rule__DottedID__Group_1__1 : rule__DottedID__Group_1__1__Impl ;
     public final void rule__DottedID__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6932:1: ( rule__DottedID__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6933:2: rule__DottedID__Group_1__1__Impl
+            // InternalScope.g:6932:1: ( rule__DottedID__Group_1__1__Impl )
+            // InternalScope.g:6933:2: rule__DottedID__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__DottedID__Group_1__1__Impl_in_rule__DottedID__Group_1__114182);
+            pushFollow(FOLLOW_2);
             rule__DottedID__Group_1__1__Impl();
 
             state._fsp--;
@@ -20400,22 +20400,22 @@ public final void rule__DottedID__Group_1__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__DottedID__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6939:1: rule__DottedID__Group_1__1__Impl : ( ruleIdentifier ) ;
+    // InternalScope.g:6939:1: rule__DottedID__Group_1__1__Impl : ( ruleIdentifier ) ;
     public final void rule__DottedID__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6943:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6944:1: ( ruleIdentifier )
+            // InternalScope.g:6943:1: ( ( ruleIdentifier ) )
+            // InternalScope.g:6944:1: ( ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6944:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6945:1: ruleIdentifier
+            // InternalScope.g:6944:1: ( ruleIdentifier )
+            // InternalScope.g:6945:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDottedIDAccess().getIdentifierParserRuleCall_1_1()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__DottedID__Group_1__1__Impl14209);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -20445,21 +20445,21 @@ public final void rule__DottedID__Group_1__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__LetExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6960:1: rule__LetExpression__Group__0 : rule__LetExpression__Group__0__Impl rule__LetExpression__Group__1 ;
+    // InternalScope.g:6960:1: rule__LetExpression__Group__0 : rule__LetExpression__Group__0__Impl rule__LetExpression__Group__1 ;
     public final void rule__LetExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6964:1: ( rule__LetExpression__Group__0__Impl rule__LetExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6965:2: rule__LetExpression__Group__0__Impl rule__LetExpression__Group__1
+            // InternalScope.g:6964:1: ( rule__LetExpression__Group__0__Impl rule__LetExpression__Group__1 )
+            // InternalScope.g:6965:2: rule__LetExpression__Group__0__Impl rule__LetExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__LetExpression__Group__0__Impl_in_rule__LetExpression__Group__014242);
+            pushFollow(FOLLOW_3);
             rule__LetExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__LetExpression__Group__1_in_rule__LetExpression__Group__014245);
+            pushFollow(FOLLOW_2);
             rule__LetExpression__Group__1();
 
             state._fsp--;
@@ -20483,22 +20483,22 @@ public final void rule__LetExpression__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__LetExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6972:1: rule__LetExpression__Group__0__Impl : ( 'let' ) ;
+    // InternalScope.g:6972:1: rule__LetExpression__Group__0__Impl : ( 'let' ) ;
     public final void rule__LetExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6976:1: ( ( 'let' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6977:1: ( 'let' )
+            // InternalScope.g:6976:1: ( ( 'let' ) )
+            // InternalScope.g:6977:1: ( 'let' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6977:1: ( 'let' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6978:1: 'let'
+            // InternalScope.g:6977:1: ( 'let' )
+            // InternalScope.g:6978:1: 'let'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLetExpressionAccess().getLetKeyword_0()); 
             }
-            match(input,69,FOLLOW_69_in_rule__LetExpression__Group__0__Impl14273); if (state.failed) return ;
+            match(input,69,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getLetExpressionAccess().getLetKeyword_0()); 
             }
@@ -20524,21 +20524,21 @@ public final void rule__LetExpression__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__LetExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6991:1: rule__LetExpression__Group__1 : rule__LetExpression__Group__1__Impl rule__LetExpression__Group__2 ;
+    // InternalScope.g:6991:1: rule__LetExpression__Group__1 : rule__LetExpression__Group__1__Impl rule__LetExpression__Group__2 ;
     public final void rule__LetExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6995:1: ( rule__LetExpression__Group__1__Impl rule__LetExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:6996:2: rule__LetExpression__Group__1__Impl rule__LetExpression__Group__2
+            // InternalScope.g:6995:1: ( rule__LetExpression__Group__1__Impl rule__LetExpression__Group__2 )
+            // InternalScope.g:6996:2: rule__LetExpression__Group__1__Impl rule__LetExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__LetExpression__Group__1__Impl_in_rule__LetExpression__Group__114304);
+            pushFollow(FOLLOW_16);
             rule__LetExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__LetExpression__Group__2_in_rule__LetExpression__Group__114307);
+            pushFollow(FOLLOW_2);
             rule__LetExpression__Group__2();
 
             state._fsp--;
@@ -20562,25 +20562,25 @@ public final void rule__LetExpression__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__LetExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7003:1: rule__LetExpression__Group__1__Impl : ( ( rule__LetExpression__IdentifierAssignment_1 ) ) ;
+    // InternalScope.g:7003:1: rule__LetExpression__Group__1__Impl : ( ( rule__LetExpression__IdentifierAssignment_1 ) ) ;
     public final void rule__LetExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7007:1: ( ( ( rule__LetExpression__IdentifierAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7008:1: ( ( rule__LetExpression__IdentifierAssignment_1 ) )
+            // InternalScope.g:7007:1: ( ( ( rule__LetExpression__IdentifierAssignment_1 ) ) )
+            // InternalScope.g:7008:1: ( ( rule__LetExpression__IdentifierAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7008:1: ( ( rule__LetExpression__IdentifierAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7009:1: ( rule__LetExpression__IdentifierAssignment_1 )
+            // InternalScope.g:7008:1: ( ( rule__LetExpression__IdentifierAssignment_1 ) )
+            // InternalScope.g:7009:1: ( rule__LetExpression__IdentifierAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLetExpressionAccess().getIdentifierAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7010:1: ( rule__LetExpression__IdentifierAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7010:2: rule__LetExpression__IdentifierAssignment_1
+            // InternalScope.g:7010:1: ( rule__LetExpression__IdentifierAssignment_1 )
+            // InternalScope.g:7010:2: rule__LetExpression__IdentifierAssignment_1
             {
-            pushFollow(FOLLOW_rule__LetExpression__IdentifierAssignment_1_in_rule__LetExpression__Group__1__Impl14334);
+            pushFollow(FOLLOW_2);
             rule__LetExpression__IdentifierAssignment_1();
 
             state._fsp--;
@@ -20613,21 +20613,21 @@ public final void rule__LetExpression__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__LetExpression__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7020:1: rule__LetExpression__Group__2 : rule__LetExpression__Group__2__Impl rule__LetExpression__Group__3 ;
+    // InternalScope.g:7020:1: rule__LetExpression__Group__2 : rule__LetExpression__Group__2__Impl rule__LetExpression__Group__3 ;
     public final void rule__LetExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7024:1: ( rule__LetExpression__Group__2__Impl rule__LetExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7025:2: rule__LetExpression__Group__2__Impl rule__LetExpression__Group__3
+            // InternalScope.g:7024:1: ( rule__LetExpression__Group__2__Impl rule__LetExpression__Group__3 )
+            // InternalScope.g:7025:2: rule__LetExpression__Group__2__Impl rule__LetExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__LetExpression__Group__2__Impl_in_rule__LetExpression__Group__214364);
+            pushFollow(FOLLOW_17);
             rule__LetExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__LetExpression__Group__3_in_rule__LetExpression__Group__214367);
+            pushFollow(FOLLOW_2);
             rule__LetExpression__Group__3();
 
             state._fsp--;
@@ -20651,22 +20651,22 @@ public final void rule__LetExpression__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__LetExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7032:1: rule__LetExpression__Group__2__Impl : ( '=' ) ;
+    // InternalScope.g:7032:1: rule__LetExpression__Group__2__Impl : ( '=' ) ;
     public final void rule__LetExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7036:1: ( ( '=' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7037:1: ( '=' )
+            // InternalScope.g:7036:1: ( ( '=' ) )
+            // InternalScope.g:7037:1: ( '=' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7037:1: ( '=' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7038:1: '='
+            // InternalScope.g:7037:1: ( '=' )
+            // InternalScope.g:7038:1: '='
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLetExpressionAccess().getEqualsSignKeyword_2()); 
             }
-            match(input,48,FOLLOW_48_in_rule__LetExpression__Group__2__Impl14395); if (state.failed) return ;
+            match(input,48,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getLetExpressionAccess().getEqualsSignKeyword_2()); 
             }
@@ -20692,21 +20692,21 @@ public final void rule__LetExpression__Group__2__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__LetExpression__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7051:1: rule__LetExpression__Group__3 : rule__LetExpression__Group__3__Impl rule__LetExpression__Group__4 ;
+    // InternalScope.g:7051:1: rule__LetExpression__Group__3 : rule__LetExpression__Group__3__Impl rule__LetExpression__Group__4 ;
     public final void rule__LetExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7055:1: ( rule__LetExpression__Group__3__Impl rule__LetExpression__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7056:2: rule__LetExpression__Group__3__Impl rule__LetExpression__Group__4
+            // InternalScope.g:7055:1: ( rule__LetExpression__Group__3__Impl rule__LetExpression__Group__4 )
+            // InternalScope.g:7056:2: rule__LetExpression__Group__3__Impl rule__LetExpression__Group__4
             {
-            pushFollow(FOLLOW_rule__LetExpression__Group__3__Impl_in_rule__LetExpression__Group__314426);
+            pushFollow(FOLLOW_47);
             rule__LetExpression__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__LetExpression__Group__4_in_rule__LetExpression__Group__314429);
+            pushFollow(FOLLOW_2);
             rule__LetExpression__Group__4();
 
             state._fsp--;
@@ -20730,25 +20730,25 @@ public final void rule__LetExpression__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__LetExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7063:1: rule__LetExpression__Group__3__Impl : ( ( rule__LetExpression__VarExprAssignment_3 ) ) ;
+    // InternalScope.g:7063:1: rule__LetExpression__Group__3__Impl : ( ( rule__LetExpression__VarExprAssignment_3 ) ) ;
     public final void rule__LetExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7067:1: ( ( ( rule__LetExpression__VarExprAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7068:1: ( ( rule__LetExpression__VarExprAssignment_3 ) )
+            // InternalScope.g:7067:1: ( ( ( rule__LetExpression__VarExprAssignment_3 ) ) )
+            // InternalScope.g:7068:1: ( ( rule__LetExpression__VarExprAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7068:1: ( ( rule__LetExpression__VarExprAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7069:1: ( rule__LetExpression__VarExprAssignment_3 )
+            // InternalScope.g:7068:1: ( ( rule__LetExpression__VarExprAssignment_3 ) )
+            // InternalScope.g:7069:1: ( rule__LetExpression__VarExprAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLetExpressionAccess().getVarExprAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7070:1: ( rule__LetExpression__VarExprAssignment_3 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7070:2: rule__LetExpression__VarExprAssignment_3
+            // InternalScope.g:7070:1: ( rule__LetExpression__VarExprAssignment_3 )
+            // InternalScope.g:7070:2: rule__LetExpression__VarExprAssignment_3
             {
-            pushFollow(FOLLOW_rule__LetExpression__VarExprAssignment_3_in_rule__LetExpression__Group__3__Impl14456);
+            pushFollow(FOLLOW_2);
             rule__LetExpression__VarExprAssignment_3();
 
             state._fsp--;
@@ -20781,21 +20781,21 @@ public final void rule__LetExpression__Group__3__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__LetExpression__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7080:1: rule__LetExpression__Group__4 : rule__LetExpression__Group__4__Impl rule__LetExpression__Group__5 ;
+    // InternalScope.g:7080:1: rule__LetExpression__Group__4 : rule__LetExpression__Group__4__Impl rule__LetExpression__Group__5 ;
     public final void rule__LetExpression__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7084:1: ( rule__LetExpression__Group__4__Impl rule__LetExpression__Group__5 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7085:2: rule__LetExpression__Group__4__Impl rule__LetExpression__Group__5
+            // InternalScope.g:7084:1: ( rule__LetExpression__Group__4__Impl rule__LetExpression__Group__5 )
+            // InternalScope.g:7085:2: rule__LetExpression__Group__4__Impl rule__LetExpression__Group__5
             {
-            pushFollow(FOLLOW_rule__LetExpression__Group__4__Impl_in_rule__LetExpression__Group__414486);
+            pushFollow(FOLLOW_17);
             rule__LetExpression__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__LetExpression__Group__5_in_rule__LetExpression__Group__414489);
+            pushFollow(FOLLOW_2);
             rule__LetExpression__Group__5();
 
             state._fsp--;
@@ -20819,22 +20819,22 @@ public final void rule__LetExpression__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__LetExpression__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7092:1: rule__LetExpression__Group__4__Impl : ( ':' ) ;
+    // InternalScope.g:7092:1: rule__LetExpression__Group__4__Impl : ( ':' ) ;
     public final void rule__LetExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7096:1: ( ( ':' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7097:1: ( ':' )
+            // InternalScope.g:7096:1: ( ( ':' ) )
+            // InternalScope.g:7097:1: ( ':' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7097:1: ( ':' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7098:1: ':'
+            // InternalScope.g:7097:1: ( ':' )
+            // InternalScope.g:7098:1: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLetExpressionAccess().getColonKeyword_4()); 
             }
-            match(input,70,FOLLOW_70_in_rule__LetExpression__Group__4__Impl14517); if (state.failed) return ;
+            match(input,70,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getLetExpressionAccess().getColonKeyword_4()); 
             }
@@ -20860,16 +20860,16 @@ public final void rule__LetExpression__Group__4__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__LetExpression__Group__5"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7111:1: rule__LetExpression__Group__5 : rule__LetExpression__Group__5__Impl ;
+    // InternalScope.g:7111:1: rule__LetExpression__Group__5 : rule__LetExpression__Group__5__Impl ;
     public final void rule__LetExpression__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7115:1: ( rule__LetExpression__Group__5__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7116:2: rule__LetExpression__Group__5__Impl
+            // InternalScope.g:7115:1: ( rule__LetExpression__Group__5__Impl )
+            // InternalScope.g:7116:2: rule__LetExpression__Group__5__Impl
             {
-            pushFollow(FOLLOW_rule__LetExpression__Group__5__Impl_in_rule__LetExpression__Group__514548);
+            pushFollow(FOLLOW_2);
             rule__LetExpression__Group__5__Impl();
 
             state._fsp--;
@@ -20893,25 +20893,25 @@ public final void rule__LetExpression__Group__5() throws RecognitionException {
 
 
     // $ANTLR start "rule__LetExpression__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7122:1: rule__LetExpression__Group__5__Impl : ( ( rule__LetExpression__TargetAssignment_5 ) ) ;
+    // InternalScope.g:7122:1: rule__LetExpression__Group__5__Impl : ( ( rule__LetExpression__TargetAssignment_5 ) ) ;
     public final void rule__LetExpression__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7126:1: ( ( ( rule__LetExpression__TargetAssignment_5 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7127:1: ( ( rule__LetExpression__TargetAssignment_5 ) )
+            // InternalScope.g:7126:1: ( ( ( rule__LetExpression__TargetAssignment_5 ) ) )
+            // InternalScope.g:7127:1: ( ( rule__LetExpression__TargetAssignment_5 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7127:1: ( ( rule__LetExpression__TargetAssignment_5 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7128:1: ( rule__LetExpression__TargetAssignment_5 )
+            // InternalScope.g:7127:1: ( ( rule__LetExpression__TargetAssignment_5 ) )
+            // InternalScope.g:7128:1: ( rule__LetExpression__TargetAssignment_5 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLetExpressionAccess().getTargetAssignment_5()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7129:1: ( rule__LetExpression__TargetAssignment_5 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7129:2: rule__LetExpression__TargetAssignment_5
+            // InternalScope.g:7129:1: ( rule__LetExpression__TargetAssignment_5 )
+            // InternalScope.g:7129:2: rule__LetExpression__TargetAssignment_5
             {
-            pushFollow(FOLLOW_rule__LetExpression__TargetAssignment_5_in_rule__LetExpression__Group__5__Impl14575);
+            pushFollow(FOLLOW_2);
             rule__LetExpression__TargetAssignment_5();
 
             state._fsp--;
@@ -20944,21 +20944,21 @@ public final void rule__LetExpression__Group__5__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__CastedExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7151:1: rule__CastedExpression__Group__0 : rule__CastedExpression__Group__0__Impl rule__CastedExpression__Group__1 ;
+    // InternalScope.g:7151:1: rule__CastedExpression__Group__0 : rule__CastedExpression__Group__0__Impl rule__CastedExpression__Group__1 ;
     public final void rule__CastedExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7155:1: ( rule__CastedExpression__Group__0__Impl rule__CastedExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7156:2: rule__CastedExpression__Group__0__Impl rule__CastedExpression__Group__1
+            // InternalScope.g:7155:1: ( rule__CastedExpression__Group__0__Impl rule__CastedExpression__Group__1 )
+            // InternalScope.g:7156:2: rule__CastedExpression__Group__0__Impl rule__CastedExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__CastedExpression__Group__0__Impl_in_rule__CastedExpression__Group__014617);
+            pushFollow(FOLLOW_48);
             rule__CastedExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CastedExpression__Group__1_in_rule__CastedExpression__Group__014620);
+            pushFollow(FOLLOW_2);
             rule__CastedExpression__Group__1();
 
             state._fsp--;
@@ -20982,22 +20982,22 @@ public final void rule__CastedExpression__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__CastedExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7163:1: rule__CastedExpression__Group__0__Impl : ( '(' ) ;
+    // InternalScope.g:7163:1: rule__CastedExpression__Group__0__Impl : ( '(' ) ;
     public final void rule__CastedExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7167:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7168:1: ( '(' )
+            // InternalScope.g:7167:1: ( ( '(' ) )
+            // InternalScope.g:7168:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7168:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7169:1: '('
+            // InternalScope.g:7168:1: ( '(' )
+            // InternalScope.g:7169:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCastedExpressionAccess().getLeftParenthesisKeyword_0()); 
             }
-            match(input,51,FOLLOW_51_in_rule__CastedExpression__Group__0__Impl14648); if (state.failed) return ;
+            match(input,51,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCastedExpressionAccess().getLeftParenthesisKeyword_0()); 
             }
@@ -21023,21 +21023,21 @@ public final void rule__CastedExpression__Group__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__CastedExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7182:1: rule__CastedExpression__Group__1 : rule__CastedExpression__Group__1__Impl rule__CastedExpression__Group__2 ;
+    // InternalScope.g:7182:1: rule__CastedExpression__Group__1 : rule__CastedExpression__Group__1__Impl rule__CastedExpression__Group__2 ;
     public final void rule__CastedExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7186:1: ( rule__CastedExpression__Group__1__Impl rule__CastedExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7187:2: rule__CastedExpression__Group__1__Impl rule__CastedExpression__Group__2
+            // InternalScope.g:7186:1: ( rule__CastedExpression__Group__1__Impl rule__CastedExpression__Group__2 )
+            // InternalScope.g:7187:2: rule__CastedExpression__Group__1__Impl rule__CastedExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__CastedExpression__Group__1__Impl_in_rule__CastedExpression__Group__114679);
+            pushFollow(FOLLOW_23);
             rule__CastedExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CastedExpression__Group__2_in_rule__CastedExpression__Group__114682);
+            pushFollow(FOLLOW_2);
             rule__CastedExpression__Group__2();
 
             state._fsp--;
@@ -21061,25 +21061,25 @@ public final void rule__CastedExpression__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__CastedExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7194:1: rule__CastedExpression__Group__1__Impl : ( ( rule__CastedExpression__TypeAssignment_1 ) ) ;
+    // InternalScope.g:7194:1: rule__CastedExpression__Group__1__Impl : ( ( rule__CastedExpression__TypeAssignment_1 ) ) ;
     public final void rule__CastedExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7198:1: ( ( ( rule__CastedExpression__TypeAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7199:1: ( ( rule__CastedExpression__TypeAssignment_1 ) )
+            // InternalScope.g:7198:1: ( ( ( rule__CastedExpression__TypeAssignment_1 ) ) )
+            // InternalScope.g:7199:1: ( ( rule__CastedExpression__TypeAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7199:1: ( ( rule__CastedExpression__TypeAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7200:1: ( rule__CastedExpression__TypeAssignment_1 )
+            // InternalScope.g:7199:1: ( ( rule__CastedExpression__TypeAssignment_1 ) )
+            // InternalScope.g:7200:1: ( rule__CastedExpression__TypeAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCastedExpressionAccess().getTypeAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7201:1: ( rule__CastedExpression__TypeAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7201:2: rule__CastedExpression__TypeAssignment_1
+            // InternalScope.g:7201:1: ( rule__CastedExpression__TypeAssignment_1 )
+            // InternalScope.g:7201:2: rule__CastedExpression__TypeAssignment_1
             {
-            pushFollow(FOLLOW_rule__CastedExpression__TypeAssignment_1_in_rule__CastedExpression__Group__1__Impl14709);
+            pushFollow(FOLLOW_2);
             rule__CastedExpression__TypeAssignment_1();
 
             state._fsp--;
@@ -21112,21 +21112,21 @@ public final void rule__CastedExpression__Group__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__CastedExpression__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7211:1: rule__CastedExpression__Group__2 : rule__CastedExpression__Group__2__Impl rule__CastedExpression__Group__3 ;
+    // InternalScope.g:7211:1: rule__CastedExpression__Group__2 : rule__CastedExpression__Group__2__Impl rule__CastedExpression__Group__3 ;
     public final void rule__CastedExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7215:1: ( rule__CastedExpression__Group__2__Impl rule__CastedExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7216:2: rule__CastedExpression__Group__2__Impl rule__CastedExpression__Group__3
+            // InternalScope.g:7215:1: ( rule__CastedExpression__Group__2__Impl rule__CastedExpression__Group__3 )
+            // InternalScope.g:7216:2: rule__CastedExpression__Group__2__Impl rule__CastedExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__CastedExpression__Group__2__Impl_in_rule__CastedExpression__Group__214739);
+            pushFollow(FOLLOW_17);
             rule__CastedExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CastedExpression__Group__3_in_rule__CastedExpression__Group__214742);
+            pushFollow(FOLLOW_2);
             rule__CastedExpression__Group__3();
 
             state._fsp--;
@@ -21150,22 +21150,22 @@ public final void rule__CastedExpression__Group__2() throws RecognitionException
 
 
     // $ANTLR start "rule__CastedExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7223:1: rule__CastedExpression__Group__2__Impl : ( ')' ) ;
+    // InternalScope.g:7223:1: rule__CastedExpression__Group__2__Impl : ( ')' ) ;
     public final void rule__CastedExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7227:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7228:1: ( ')' )
+            // InternalScope.g:7227:1: ( ( ')' ) )
+            // InternalScope.g:7228:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7228:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7229:1: ')'
+            // InternalScope.g:7228:1: ( ')' )
+            // InternalScope.g:7229:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCastedExpressionAccess().getRightParenthesisKeyword_2()); 
             }
-            match(input,52,FOLLOW_52_in_rule__CastedExpression__Group__2__Impl14770); if (state.failed) return ;
+            match(input,52,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCastedExpressionAccess().getRightParenthesisKeyword_2()); 
             }
@@ -21191,16 +21191,16 @@ public final void rule__CastedExpression__Group__2__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__CastedExpression__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7242:1: rule__CastedExpression__Group__3 : rule__CastedExpression__Group__3__Impl ;
+    // InternalScope.g:7242:1: rule__CastedExpression__Group__3 : rule__CastedExpression__Group__3__Impl ;
     public final void rule__CastedExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7246:1: ( rule__CastedExpression__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7247:2: rule__CastedExpression__Group__3__Impl
+            // InternalScope.g:7246:1: ( rule__CastedExpression__Group__3__Impl )
+            // InternalScope.g:7247:2: rule__CastedExpression__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__CastedExpression__Group__3__Impl_in_rule__CastedExpression__Group__314801);
+            pushFollow(FOLLOW_2);
             rule__CastedExpression__Group__3__Impl();
 
             state._fsp--;
@@ -21224,25 +21224,25 @@ public final void rule__CastedExpression__Group__3() throws RecognitionException
 
 
     // $ANTLR start "rule__CastedExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7253:1: rule__CastedExpression__Group__3__Impl : ( ( rule__CastedExpression__TargetAssignment_3 ) ) ;
+    // InternalScope.g:7253:1: rule__CastedExpression__Group__3__Impl : ( ( rule__CastedExpression__TargetAssignment_3 ) ) ;
     public final void rule__CastedExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7257:1: ( ( ( rule__CastedExpression__TargetAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7258:1: ( ( rule__CastedExpression__TargetAssignment_3 ) )
+            // InternalScope.g:7257:1: ( ( ( rule__CastedExpression__TargetAssignment_3 ) ) )
+            // InternalScope.g:7258:1: ( ( rule__CastedExpression__TargetAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7258:1: ( ( rule__CastedExpression__TargetAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7259:1: ( rule__CastedExpression__TargetAssignment_3 )
+            // InternalScope.g:7258:1: ( ( rule__CastedExpression__TargetAssignment_3 ) )
+            // InternalScope.g:7259:1: ( rule__CastedExpression__TargetAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCastedExpressionAccess().getTargetAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7260:1: ( rule__CastedExpression__TargetAssignment_3 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7260:2: rule__CastedExpression__TargetAssignment_3
+            // InternalScope.g:7260:1: ( rule__CastedExpression__TargetAssignment_3 )
+            // InternalScope.g:7260:2: rule__CastedExpression__TargetAssignment_3
             {
-            pushFollow(FOLLOW_rule__CastedExpression__TargetAssignment_3_in_rule__CastedExpression__Group__3__Impl14828);
+            pushFollow(FOLLOW_2);
             rule__CastedExpression__TargetAssignment_3();
 
             state._fsp--;
@@ -21275,21 +21275,21 @@ public final void rule__CastedExpression__Group__3__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__ChainExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7278:1: rule__ChainExpression__Group__0 : rule__ChainExpression__Group__0__Impl rule__ChainExpression__Group__1 ;
+    // InternalScope.g:7278:1: rule__ChainExpression__Group__0 : rule__ChainExpression__Group__0__Impl rule__ChainExpression__Group__1 ;
     public final void rule__ChainExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7282:1: ( rule__ChainExpression__Group__0__Impl rule__ChainExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7283:2: rule__ChainExpression__Group__0__Impl rule__ChainExpression__Group__1
+            // InternalScope.g:7282:1: ( rule__ChainExpression__Group__0__Impl rule__ChainExpression__Group__1 )
+            // InternalScope.g:7283:2: rule__ChainExpression__Group__0__Impl rule__ChainExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__ChainExpression__Group__0__Impl_in_rule__ChainExpression__Group__014866);
+            pushFollow(FOLLOW_49);
             rule__ChainExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ChainExpression__Group__1_in_rule__ChainExpression__Group__014869);
+            pushFollow(FOLLOW_2);
             rule__ChainExpression__Group__1();
 
             state._fsp--;
@@ -21313,22 +21313,22 @@ public final void rule__ChainExpression__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__ChainExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7290:1: rule__ChainExpression__Group__0__Impl : ( ruleChainedExpression ) ;
+    // InternalScope.g:7290:1: rule__ChainExpression__Group__0__Impl : ( ruleChainedExpression ) ;
     public final void rule__ChainExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7294:1: ( ( ruleChainedExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7295:1: ( ruleChainedExpression )
+            // InternalScope.g:7294:1: ( ( ruleChainedExpression ) )
+            // InternalScope.g:7295:1: ( ruleChainedExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7295:1: ( ruleChainedExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7296:1: ruleChainedExpression
+            // InternalScope.g:7295:1: ( ruleChainedExpression )
+            // InternalScope.g:7296:1: ruleChainedExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getChainExpressionAccess().getChainedExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleChainedExpression_in_rule__ChainExpression__Group__0__Impl14896);
+            pushFollow(FOLLOW_2);
             ruleChainedExpression();
 
             state._fsp--;
@@ -21358,16 +21358,16 @@ public final void rule__ChainExpression__Group__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__ChainExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7307:1: rule__ChainExpression__Group__1 : rule__ChainExpression__Group__1__Impl ;
+    // InternalScope.g:7307:1: rule__ChainExpression__Group__1 : rule__ChainExpression__Group__1__Impl ;
     public final void rule__ChainExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7311:1: ( rule__ChainExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7312:2: rule__ChainExpression__Group__1__Impl
+            // InternalScope.g:7311:1: ( rule__ChainExpression__Group__1__Impl )
+            // InternalScope.g:7312:2: rule__ChainExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__ChainExpression__Group__1__Impl_in_rule__ChainExpression__Group__114925);
+            pushFollow(FOLLOW_2);
             rule__ChainExpression__Group__1__Impl();
 
             state._fsp--;
@@ -21391,22 +21391,22 @@ public final void rule__ChainExpression__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__ChainExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7318:1: rule__ChainExpression__Group__1__Impl : ( ( rule__ChainExpression__Group_1__0 )* ) ;
+    // InternalScope.g:7318:1: rule__ChainExpression__Group__1__Impl : ( ( rule__ChainExpression__Group_1__0 )* ) ;
     public final void rule__ChainExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7322:1: ( ( ( rule__ChainExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7323:1: ( ( rule__ChainExpression__Group_1__0 )* )
+            // InternalScope.g:7322:1: ( ( ( rule__ChainExpression__Group_1__0 )* ) )
+            // InternalScope.g:7323:1: ( ( rule__ChainExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7323:1: ( ( rule__ChainExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7324:1: ( rule__ChainExpression__Group_1__0 )*
+            // InternalScope.g:7323:1: ( ( rule__ChainExpression__Group_1__0 )* )
+            // InternalScope.g:7324:1: ( rule__ChainExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getChainExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7325:1: ( rule__ChainExpression__Group_1__0 )*
+            // InternalScope.g:7325:1: ( rule__ChainExpression__Group_1__0 )*
             loop55:
             do {
                 int alt55=2;
@@ -21419,9 +21419,9 @@ public final void rule__ChainExpression__Group__1__Impl() throws RecognitionExce
 
                 switch (alt55) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7325:2: rule__ChainExpression__Group_1__0
+            	    // InternalScope.g:7325:2: rule__ChainExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__ChainExpression__Group_1__0_in_rule__ChainExpression__Group__1__Impl14952);
+            	    pushFollow(FOLLOW_50);
             	    rule__ChainExpression__Group_1__0();
 
             	    state._fsp--;
@@ -21460,21 +21460,21 @@ public final void rule__ChainExpression__Group__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__ChainExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7339:1: rule__ChainExpression__Group_1__0 : rule__ChainExpression__Group_1__0__Impl rule__ChainExpression__Group_1__1 ;
+    // InternalScope.g:7339:1: rule__ChainExpression__Group_1__0 : rule__ChainExpression__Group_1__0__Impl rule__ChainExpression__Group_1__1 ;
     public final void rule__ChainExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7343:1: ( rule__ChainExpression__Group_1__0__Impl rule__ChainExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7344:2: rule__ChainExpression__Group_1__0__Impl rule__ChainExpression__Group_1__1
+            // InternalScope.g:7343:1: ( rule__ChainExpression__Group_1__0__Impl rule__ChainExpression__Group_1__1 )
+            // InternalScope.g:7344:2: rule__ChainExpression__Group_1__0__Impl rule__ChainExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__ChainExpression__Group_1__0__Impl_in_rule__ChainExpression__Group_1__014987);
+            pushFollow(FOLLOW_49);
             rule__ChainExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ChainExpression__Group_1__1_in_rule__ChainExpression__Group_1__014990);
+            pushFollow(FOLLOW_2);
             rule__ChainExpression__Group_1__1();
 
             state._fsp--;
@@ -21498,23 +21498,23 @@ public final void rule__ChainExpression__Group_1__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ChainExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7351:1: rule__ChainExpression__Group_1__0__Impl : ( () ) ;
+    // InternalScope.g:7351:1: rule__ChainExpression__Group_1__0__Impl : ( () ) ;
     public final void rule__ChainExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7355:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7356:1: ( () )
+            // InternalScope.g:7355:1: ( ( () ) )
+            // InternalScope.g:7356:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7356:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7357:1: ()
+            // InternalScope.g:7356:1: ( () )
+            // InternalScope.g:7357:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getChainExpressionAccess().getChainExpressionFirstAction_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7358:1: ()
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7360:1: 
+            // InternalScope.g:7358:1: ()
+            // InternalScope.g:7360:1: 
             {
             }
 
@@ -21539,21 +21539,21 @@ public final void rule__ChainExpression__Group_1__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__ChainExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7370:1: rule__ChainExpression__Group_1__1 : rule__ChainExpression__Group_1__1__Impl rule__ChainExpression__Group_1__2 ;
+    // InternalScope.g:7370:1: rule__ChainExpression__Group_1__1 : rule__ChainExpression__Group_1__1__Impl rule__ChainExpression__Group_1__2 ;
     public final void rule__ChainExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7374:1: ( rule__ChainExpression__Group_1__1__Impl rule__ChainExpression__Group_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7375:2: rule__ChainExpression__Group_1__1__Impl rule__ChainExpression__Group_1__2
+            // InternalScope.g:7374:1: ( rule__ChainExpression__Group_1__1__Impl rule__ChainExpression__Group_1__2 )
+            // InternalScope.g:7375:2: rule__ChainExpression__Group_1__1__Impl rule__ChainExpression__Group_1__2
             {
-            pushFollow(FOLLOW_rule__ChainExpression__Group_1__1__Impl_in_rule__ChainExpression__Group_1__115048);
+            pushFollow(FOLLOW_17);
             rule__ChainExpression__Group_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ChainExpression__Group_1__2_in_rule__ChainExpression__Group_1__115051);
+            pushFollow(FOLLOW_2);
             rule__ChainExpression__Group_1__2();
 
             state._fsp--;
@@ -21577,22 +21577,22 @@ public final void rule__ChainExpression__Group_1__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ChainExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7382:1: rule__ChainExpression__Group_1__1__Impl : ( '->' ) ;
+    // InternalScope.g:7382:1: rule__ChainExpression__Group_1__1__Impl : ( '->' ) ;
     public final void rule__ChainExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7386:1: ( ( '->' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7387:1: ( '->' )
+            // InternalScope.g:7386:1: ( ( '->' ) )
+            // InternalScope.g:7387:1: ( '->' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7387:1: ( '->' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7388:1: '->'
+            // InternalScope.g:7387:1: ( '->' )
+            // InternalScope.g:7388:1: '->'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getChainExpressionAccess().getHyphenMinusGreaterThanSignKeyword_1_1()); 
             }
-            match(input,71,FOLLOW_71_in_rule__ChainExpression__Group_1__1__Impl15079); if (state.failed) return ;
+            match(input,71,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getChainExpressionAccess().getHyphenMinusGreaterThanSignKeyword_1_1()); 
             }
@@ -21618,16 +21618,16 @@ public final void rule__ChainExpression__Group_1__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__ChainExpression__Group_1__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7401:1: rule__ChainExpression__Group_1__2 : rule__ChainExpression__Group_1__2__Impl ;
+    // InternalScope.g:7401:1: rule__ChainExpression__Group_1__2 : rule__ChainExpression__Group_1__2__Impl ;
     public final void rule__ChainExpression__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7405:1: ( rule__ChainExpression__Group_1__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7406:2: rule__ChainExpression__Group_1__2__Impl
+            // InternalScope.g:7405:1: ( rule__ChainExpression__Group_1__2__Impl )
+            // InternalScope.g:7406:2: rule__ChainExpression__Group_1__2__Impl
             {
-            pushFollow(FOLLOW_rule__ChainExpression__Group_1__2__Impl_in_rule__ChainExpression__Group_1__215110);
+            pushFollow(FOLLOW_2);
             rule__ChainExpression__Group_1__2__Impl();
 
             state._fsp--;
@@ -21651,25 +21651,25 @@ public final void rule__ChainExpression__Group_1__2() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ChainExpression__Group_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7412:1: rule__ChainExpression__Group_1__2__Impl : ( ( rule__ChainExpression__NextAssignment_1_2 ) ) ;
+    // InternalScope.g:7412:1: rule__ChainExpression__Group_1__2__Impl : ( ( rule__ChainExpression__NextAssignment_1_2 ) ) ;
     public final void rule__ChainExpression__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7416:1: ( ( ( rule__ChainExpression__NextAssignment_1_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7417:1: ( ( rule__ChainExpression__NextAssignment_1_2 ) )
+            // InternalScope.g:7416:1: ( ( ( rule__ChainExpression__NextAssignment_1_2 ) ) )
+            // InternalScope.g:7417:1: ( ( rule__ChainExpression__NextAssignment_1_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7417:1: ( ( rule__ChainExpression__NextAssignment_1_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7418:1: ( rule__ChainExpression__NextAssignment_1_2 )
+            // InternalScope.g:7417:1: ( ( rule__ChainExpression__NextAssignment_1_2 ) )
+            // InternalScope.g:7418:1: ( rule__ChainExpression__NextAssignment_1_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getChainExpressionAccess().getNextAssignment_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7419:1: ( rule__ChainExpression__NextAssignment_1_2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7419:2: rule__ChainExpression__NextAssignment_1_2
+            // InternalScope.g:7419:1: ( rule__ChainExpression__NextAssignment_1_2 )
+            // InternalScope.g:7419:2: rule__ChainExpression__NextAssignment_1_2
             {
-            pushFollow(FOLLOW_rule__ChainExpression__NextAssignment_1_2_in_rule__ChainExpression__Group_1__2__Impl15137);
+            pushFollow(FOLLOW_2);
             rule__ChainExpression__NextAssignment_1_2();
 
             state._fsp--;
@@ -21702,21 +21702,21 @@ public final void rule__ChainExpression__Group_1__2__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__IfExpressionTri__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7435:1: rule__IfExpressionTri__Group__0 : rule__IfExpressionTri__Group__0__Impl rule__IfExpressionTri__Group__1 ;
+    // InternalScope.g:7435:1: rule__IfExpressionTri__Group__0 : rule__IfExpressionTri__Group__0__Impl rule__IfExpressionTri__Group__1 ;
     public final void rule__IfExpressionTri__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7439:1: ( rule__IfExpressionTri__Group__0__Impl rule__IfExpressionTri__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7440:2: rule__IfExpressionTri__Group__0__Impl rule__IfExpressionTri__Group__1
+            // InternalScope.g:7439:1: ( rule__IfExpressionTri__Group__0__Impl rule__IfExpressionTri__Group__1 )
+            // InternalScope.g:7440:2: rule__IfExpressionTri__Group__0__Impl rule__IfExpressionTri__Group__1
             {
-            pushFollow(FOLLOW_rule__IfExpressionTri__Group__0__Impl_in_rule__IfExpressionTri__Group__015173);
+            pushFollow(FOLLOW_51);
             rule__IfExpressionTri__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__IfExpressionTri__Group__1_in_rule__IfExpressionTri__Group__015176);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionTri__Group__1();
 
             state._fsp--;
@@ -21740,22 +21740,22 @@ public final void rule__IfExpressionTri__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__IfExpressionTri__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7447:1: rule__IfExpressionTri__Group__0__Impl : ( ruleOrExpression ) ;
+    // InternalScope.g:7447:1: rule__IfExpressionTri__Group__0__Impl : ( ruleOrExpression ) ;
     public final void rule__IfExpressionTri__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7451:1: ( ( ruleOrExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7452:1: ( ruleOrExpression )
+            // InternalScope.g:7451:1: ( ( ruleOrExpression ) )
+            // InternalScope.g:7452:1: ( ruleOrExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7452:1: ( ruleOrExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7453:1: ruleOrExpression
+            // InternalScope.g:7452:1: ( ruleOrExpression )
+            // InternalScope.g:7453:1: ruleOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionTriAccess().getOrExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleOrExpression_in_rule__IfExpressionTri__Group__0__Impl15203);
+            pushFollow(FOLLOW_2);
             ruleOrExpression();
 
             state._fsp--;
@@ -21785,16 +21785,16 @@ public final void rule__IfExpressionTri__Group__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__IfExpressionTri__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7464:1: rule__IfExpressionTri__Group__1 : rule__IfExpressionTri__Group__1__Impl ;
+    // InternalScope.g:7464:1: rule__IfExpressionTri__Group__1 : rule__IfExpressionTri__Group__1__Impl ;
     public final void rule__IfExpressionTri__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7468:1: ( rule__IfExpressionTri__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7469:2: rule__IfExpressionTri__Group__1__Impl
+            // InternalScope.g:7468:1: ( rule__IfExpressionTri__Group__1__Impl )
+            // InternalScope.g:7469:2: rule__IfExpressionTri__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__IfExpressionTri__Group__1__Impl_in_rule__IfExpressionTri__Group__115232);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionTri__Group__1__Impl();
 
             state._fsp--;
@@ -21818,22 +21818,22 @@ public final void rule__IfExpressionTri__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__IfExpressionTri__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7475:1: rule__IfExpressionTri__Group__1__Impl : ( ( rule__IfExpressionTri__Group_1__0 )? ) ;
+    // InternalScope.g:7475:1: rule__IfExpressionTri__Group__1__Impl : ( ( rule__IfExpressionTri__Group_1__0 )? ) ;
     public final void rule__IfExpressionTri__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7479:1: ( ( ( rule__IfExpressionTri__Group_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7480:1: ( ( rule__IfExpressionTri__Group_1__0 )? )
+            // InternalScope.g:7479:1: ( ( ( rule__IfExpressionTri__Group_1__0 )? ) )
+            // InternalScope.g:7480:1: ( ( rule__IfExpressionTri__Group_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7480:1: ( ( rule__IfExpressionTri__Group_1__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7481:1: ( rule__IfExpressionTri__Group_1__0 )?
+            // InternalScope.g:7480:1: ( ( rule__IfExpressionTri__Group_1__0 )? )
+            // InternalScope.g:7481:1: ( rule__IfExpressionTri__Group_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionTriAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7482:1: ( rule__IfExpressionTri__Group_1__0 )?
+            // InternalScope.g:7482:1: ( rule__IfExpressionTri__Group_1__0 )?
             int alt56=2;
             int LA56_0 = input.LA(1);
 
@@ -21842,9 +21842,9 @@ public final void rule__IfExpressionTri__Group__1__Impl() throws RecognitionExce
             }
             switch (alt56) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7482:2: rule__IfExpressionTri__Group_1__0
+                    // InternalScope.g:7482:2: rule__IfExpressionTri__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__IfExpressionTri__Group_1__0_in_rule__IfExpressionTri__Group__1__Impl15259);
+                    pushFollow(FOLLOW_2);
                     rule__IfExpressionTri__Group_1__0();
 
                     state._fsp--;
@@ -21880,21 +21880,21 @@ public final void rule__IfExpressionTri__Group__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__IfExpressionTri__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7496:1: rule__IfExpressionTri__Group_1__0 : rule__IfExpressionTri__Group_1__0__Impl rule__IfExpressionTri__Group_1__1 ;
+    // InternalScope.g:7496:1: rule__IfExpressionTri__Group_1__0 : rule__IfExpressionTri__Group_1__0__Impl rule__IfExpressionTri__Group_1__1 ;
     public final void rule__IfExpressionTri__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7500:1: ( rule__IfExpressionTri__Group_1__0__Impl rule__IfExpressionTri__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7501:2: rule__IfExpressionTri__Group_1__0__Impl rule__IfExpressionTri__Group_1__1
+            // InternalScope.g:7500:1: ( rule__IfExpressionTri__Group_1__0__Impl rule__IfExpressionTri__Group_1__1 )
+            // InternalScope.g:7501:2: rule__IfExpressionTri__Group_1__0__Impl rule__IfExpressionTri__Group_1__1
             {
-            pushFollow(FOLLOW_rule__IfExpressionTri__Group_1__0__Impl_in_rule__IfExpressionTri__Group_1__015294);
+            pushFollow(FOLLOW_51);
             rule__IfExpressionTri__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__IfExpressionTri__Group_1__1_in_rule__IfExpressionTri__Group_1__015297);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionTri__Group_1__1();
 
             state._fsp--;
@@ -21918,23 +21918,23 @@ public final void rule__IfExpressionTri__Group_1__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__IfExpressionTri__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7508:1: rule__IfExpressionTri__Group_1__0__Impl : ( () ) ;
+    // InternalScope.g:7508:1: rule__IfExpressionTri__Group_1__0__Impl : ( () ) ;
     public final void rule__IfExpressionTri__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7512:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7513:1: ( () )
+            // InternalScope.g:7512:1: ( ( () ) )
+            // InternalScope.g:7513:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7513:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7514:1: ()
+            // InternalScope.g:7513:1: ( () )
+            // InternalScope.g:7514:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionTriAccess().getIfExpressionConditionAction_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7515:1: ()
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7517:1: 
+            // InternalScope.g:7515:1: ()
+            // InternalScope.g:7517:1: 
             {
             }
 
@@ -21959,21 +21959,21 @@ public final void rule__IfExpressionTri__Group_1__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__IfExpressionTri__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7527:1: rule__IfExpressionTri__Group_1__1 : rule__IfExpressionTri__Group_1__1__Impl rule__IfExpressionTri__Group_1__2 ;
+    // InternalScope.g:7527:1: rule__IfExpressionTri__Group_1__1 : rule__IfExpressionTri__Group_1__1__Impl rule__IfExpressionTri__Group_1__2 ;
     public final void rule__IfExpressionTri__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7531:1: ( rule__IfExpressionTri__Group_1__1__Impl rule__IfExpressionTri__Group_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7532:2: rule__IfExpressionTri__Group_1__1__Impl rule__IfExpressionTri__Group_1__2
+            // InternalScope.g:7531:1: ( rule__IfExpressionTri__Group_1__1__Impl rule__IfExpressionTri__Group_1__2 )
+            // InternalScope.g:7532:2: rule__IfExpressionTri__Group_1__1__Impl rule__IfExpressionTri__Group_1__2
             {
-            pushFollow(FOLLOW_rule__IfExpressionTri__Group_1__1__Impl_in_rule__IfExpressionTri__Group_1__115355);
+            pushFollow(FOLLOW_17);
             rule__IfExpressionTri__Group_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__IfExpressionTri__Group_1__2_in_rule__IfExpressionTri__Group_1__115358);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionTri__Group_1__2();
 
             state._fsp--;
@@ -21997,22 +21997,22 @@ public final void rule__IfExpressionTri__Group_1__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__IfExpressionTri__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7539:1: rule__IfExpressionTri__Group_1__1__Impl : ( '?' ) ;
+    // InternalScope.g:7539:1: rule__IfExpressionTri__Group_1__1__Impl : ( '?' ) ;
     public final void rule__IfExpressionTri__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7543:1: ( ( '?' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7544:1: ( '?' )
+            // InternalScope.g:7543:1: ( ( '?' ) )
+            // InternalScope.g:7544:1: ( '?' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7544:1: ( '?' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7545:1: '?'
+            // InternalScope.g:7544:1: ( '?' )
+            // InternalScope.g:7545:1: '?'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionTriAccess().getQuestionMarkKeyword_1_1()); 
             }
-            match(input,72,FOLLOW_72_in_rule__IfExpressionTri__Group_1__1__Impl15386); if (state.failed) return ;
+            match(input,72,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIfExpressionTriAccess().getQuestionMarkKeyword_1_1()); 
             }
@@ -22038,21 +22038,21 @@ public final void rule__IfExpressionTri__Group_1__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__IfExpressionTri__Group_1__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7558:1: rule__IfExpressionTri__Group_1__2 : rule__IfExpressionTri__Group_1__2__Impl rule__IfExpressionTri__Group_1__3 ;
+    // InternalScope.g:7558:1: rule__IfExpressionTri__Group_1__2 : rule__IfExpressionTri__Group_1__2__Impl rule__IfExpressionTri__Group_1__3 ;
     public final void rule__IfExpressionTri__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7562:1: ( rule__IfExpressionTri__Group_1__2__Impl rule__IfExpressionTri__Group_1__3 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7563:2: rule__IfExpressionTri__Group_1__2__Impl rule__IfExpressionTri__Group_1__3
+            // InternalScope.g:7562:1: ( rule__IfExpressionTri__Group_1__2__Impl rule__IfExpressionTri__Group_1__3 )
+            // InternalScope.g:7563:2: rule__IfExpressionTri__Group_1__2__Impl rule__IfExpressionTri__Group_1__3
             {
-            pushFollow(FOLLOW_rule__IfExpressionTri__Group_1__2__Impl_in_rule__IfExpressionTri__Group_1__215417);
+            pushFollow(FOLLOW_47);
             rule__IfExpressionTri__Group_1__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__IfExpressionTri__Group_1__3_in_rule__IfExpressionTri__Group_1__215420);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionTri__Group_1__3();
 
             state._fsp--;
@@ -22076,25 +22076,25 @@ public final void rule__IfExpressionTri__Group_1__2() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__IfExpressionTri__Group_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7570:1: rule__IfExpressionTri__Group_1__2__Impl : ( ( rule__IfExpressionTri__ThenPartAssignment_1_2 ) ) ;
+    // InternalScope.g:7570:1: rule__IfExpressionTri__Group_1__2__Impl : ( ( rule__IfExpressionTri__ThenPartAssignment_1_2 ) ) ;
     public final void rule__IfExpressionTri__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7574:1: ( ( ( rule__IfExpressionTri__ThenPartAssignment_1_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7575:1: ( ( rule__IfExpressionTri__ThenPartAssignment_1_2 ) )
+            // InternalScope.g:7574:1: ( ( ( rule__IfExpressionTri__ThenPartAssignment_1_2 ) ) )
+            // InternalScope.g:7575:1: ( ( rule__IfExpressionTri__ThenPartAssignment_1_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7575:1: ( ( rule__IfExpressionTri__ThenPartAssignment_1_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7576:1: ( rule__IfExpressionTri__ThenPartAssignment_1_2 )
+            // InternalScope.g:7575:1: ( ( rule__IfExpressionTri__ThenPartAssignment_1_2 ) )
+            // InternalScope.g:7576:1: ( rule__IfExpressionTri__ThenPartAssignment_1_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionTriAccess().getThenPartAssignment_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7577:1: ( rule__IfExpressionTri__ThenPartAssignment_1_2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7577:2: rule__IfExpressionTri__ThenPartAssignment_1_2
+            // InternalScope.g:7577:1: ( rule__IfExpressionTri__ThenPartAssignment_1_2 )
+            // InternalScope.g:7577:2: rule__IfExpressionTri__ThenPartAssignment_1_2
             {
-            pushFollow(FOLLOW_rule__IfExpressionTri__ThenPartAssignment_1_2_in_rule__IfExpressionTri__Group_1__2__Impl15447);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionTri__ThenPartAssignment_1_2();
 
             state._fsp--;
@@ -22127,21 +22127,21 @@ public final void rule__IfExpressionTri__Group_1__2__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__IfExpressionTri__Group_1__3"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7587:1: rule__IfExpressionTri__Group_1__3 : rule__IfExpressionTri__Group_1__3__Impl rule__IfExpressionTri__Group_1__4 ;
+    // InternalScope.g:7587:1: rule__IfExpressionTri__Group_1__3 : rule__IfExpressionTri__Group_1__3__Impl rule__IfExpressionTri__Group_1__4 ;
     public final void rule__IfExpressionTri__Group_1__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7591:1: ( rule__IfExpressionTri__Group_1__3__Impl rule__IfExpressionTri__Group_1__4 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7592:2: rule__IfExpressionTri__Group_1__3__Impl rule__IfExpressionTri__Group_1__4
+            // InternalScope.g:7591:1: ( rule__IfExpressionTri__Group_1__3__Impl rule__IfExpressionTri__Group_1__4 )
+            // InternalScope.g:7592:2: rule__IfExpressionTri__Group_1__3__Impl rule__IfExpressionTri__Group_1__4
             {
-            pushFollow(FOLLOW_rule__IfExpressionTri__Group_1__3__Impl_in_rule__IfExpressionTri__Group_1__315477);
+            pushFollow(FOLLOW_17);
             rule__IfExpressionTri__Group_1__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__IfExpressionTri__Group_1__4_in_rule__IfExpressionTri__Group_1__315480);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionTri__Group_1__4();
 
             state._fsp--;
@@ -22165,22 +22165,22 @@ public final void rule__IfExpressionTri__Group_1__3() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__IfExpressionTri__Group_1__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7599:1: rule__IfExpressionTri__Group_1__3__Impl : ( ':' ) ;
+    // InternalScope.g:7599:1: rule__IfExpressionTri__Group_1__3__Impl : ( ':' ) ;
     public final void rule__IfExpressionTri__Group_1__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7603:1: ( ( ':' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7604:1: ( ':' )
+            // InternalScope.g:7603:1: ( ( ':' ) )
+            // InternalScope.g:7604:1: ( ':' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7604:1: ( ':' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7605:1: ':'
+            // InternalScope.g:7604:1: ( ':' )
+            // InternalScope.g:7605:1: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionTriAccess().getColonKeyword_1_3()); 
             }
-            match(input,70,FOLLOW_70_in_rule__IfExpressionTri__Group_1__3__Impl15508); if (state.failed) return ;
+            match(input,70,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIfExpressionTriAccess().getColonKeyword_1_3()); 
             }
@@ -22206,16 +22206,16 @@ public final void rule__IfExpressionTri__Group_1__3__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__IfExpressionTri__Group_1__4"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7618:1: rule__IfExpressionTri__Group_1__4 : rule__IfExpressionTri__Group_1__4__Impl ;
+    // InternalScope.g:7618:1: rule__IfExpressionTri__Group_1__4 : rule__IfExpressionTri__Group_1__4__Impl ;
     public final void rule__IfExpressionTri__Group_1__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7622:1: ( rule__IfExpressionTri__Group_1__4__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7623:2: rule__IfExpressionTri__Group_1__4__Impl
+            // InternalScope.g:7622:1: ( rule__IfExpressionTri__Group_1__4__Impl )
+            // InternalScope.g:7623:2: rule__IfExpressionTri__Group_1__4__Impl
             {
-            pushFollow(FOLLOW_rule__IfExpressionTri__Group_1__4__Impl_in_rule__IfExpressionTri__Group_1__415539);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionTri__Group_1__4__Impl();
 
             state._fsp--;
@@ -22239,25 +22239,25 @@ public final void rule__IfExpressionTri__Group_1__4() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__IfExpressionTri__Group_1__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7629:1: rule__IfExpressionTri__Group_1__4__Impl : ( ( rule__IfExpressionTri__ElsePartAssignment_1_4 ) ) ;
+    // InternalScope.g:7629:1: rule__IfExpressionTri__Group_1__4__Impl : ( ( rule__IfExpressionTri__ElsePartAssignment_1_4 ) ) ;
     public final void rule__IfExpressionTri__Group_1__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7633:1: ( ( ( rule__IfExpressionTri__ElsePartAssignment_1_4 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7634:1: ( ( rule__IfExpressionTri__ElsePartAssignment_1_4 ) )
+            // InternalScope.g:7633:1: ( ( ( rule__IfExpressionTri__ElsePartAssignment_1_4 ) ) )
+            // InternalScope.g:7634:1: ( ( rule__IfExpressionTri__ElsePartAssignment_1_4 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7634:1: ( ( rule__IfExpressionTri__ElsePartAssignment_1_4 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7635:1: ( rule__IfExpressionTri__ElsePartAssignment_1_4 )
+            // InternalScope.g:7634:1: ( ( rule__IfExpressionTri__ElsePartAssignment_1_4 ) )
+            // InternalScope.g:7635:1: ( rule__IfExpressionTri__ElsePartAssignment_1_4 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionTriAccess().getElsePartAssignment_1_4()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7636:1: ( rule__IfExpressionTri__ElsePartAssignment_1_4 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7636:2: rule__IfExpressionTri__ElsePartAssignment_1_4
+            // InternalScope.g:7636:1: ( rule__IfExpressionTri__ElsePartAssignment_1_4 )
+            // InternalScope.g:7636:2: rule__IfExpressionTri__ElsePartAssignment_1_4
             {
-            pushFollow(FOLLOW_rule__IfExpressionTri__ElsePartAssignment_1_4_in_rule__IfExpressionTri__Group_1__4__Impl15566);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionTri__ElsePartAssignment_1_4();
 
             state._fsp--;
@@ -22290,21 +22290,21 @@ public final void rule__IfExpressionTri__Group_1__4__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__IfExpressionKw__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7656:1: rule__IfExpressionKw__Group__0 : rule__IfExpressionKw__Group__0__Impl rule__IfExpressionKw__Group__1 ;
+    // InternalScope.g:7656:1: rule__IfExpressionKw__Group__0 : rule__IfExpressionKw__Group__0__Impl rule__IfExpressionKw__Group__1 ;
     public final void rule__IfExpressionKw__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7660:1: ( rule__IfExpressionKw__Group__0__Impl rule__IfExpressionKw__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7661:2: rule__IfExpressionKw__Group__0__Impl rule__IfExpressionKw__Group__1
+            // InternalScope.g:7660:1: ( rule__IfExpressionKw__Group__0__Impl rule__IfExpressionKw__Group__1 )
+            // InternalScope.g:7661:2: rule__IfExpressionKw__Group__0__Impl rule__IfExpressionKw__Group__1
             {
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group__0__Impl_in_rule__IfExpressionKw__Group__015606);
+            pushFollow(FOLLOW_17);
             rule__IfExpressionKw__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group__1_in_rule__IfExpressionKw__Group__015609);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionKw__Group__1();
 
             state._fsp--;
@@ -22328,22 +22328,22 @@ public final void rule__IfExpressionKw__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__IfExpressionKw__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7668:1: rule__IfExpressionKw__Group__0__Impl : ( 'if' ) ;
+    // InternalScope.g:7668:1: rule__IfExpressionKw__Group__0__Impl : ( 'if' ) ;
     public final void rule__IfExpressionKw__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7672:1: ( ( 'if' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7673:1: ( 'if' )
+            // InternalScope.g:7672:1: ( ( 'if' ) )
+            // InternalScope.g:7673:1: ( 'if' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7673:1: ( 'if' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7674:1: 'if'
+            // InternalScope.g:7673:1: ( 'if' )
+            // InternalScope.g:7674:1: 'if'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionKwAccess().getIfKeyword_0()); 
             }
-            match(input,73,FOLLOW_73_in_rule__IfExpressionKw__Group__0__Impl15637); if (state.failed) return ;
+            match(input,73,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIfExpressionKwAccess().getIfKeyword_0()); 
             }
@@ -22369,21 +22369,21 @@ public final void rule__IfExpressionKw__Group__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__IfExpressionKw__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7687:1: rule__IfExpressionKw__Group__1 : rule__IfExpressionKw__Group__1__Impl rule__IfExpressionKw__Group__2 ;
+    // InternalScope.g:7687:1: rule__IfExpressionKw__Group__1 : rule__IfExpressionKw__Group__1__Impl rule__IfExpressionKw__Group__2 ;
     public final void rule__IfExpressionKw__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7691:1: ( rule__IfExpressionKw__Group__1__Impl rule__IfExpressionKw__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7692:2: rule__IfExpressionKw__Group__1__Impl rule__IfExpressionKw__Group__2
+            // InternalScope.g:7691:1: ( rule__IfExpressionKw__Group__1__Impl rule__IfExpressionKw__Group__2 )
+            // InternalScope.g:7692:2: rule__IfExpressionKw__Group__1__Impl rule__IfExpressionKw__Group__2
             {
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group__1__Impl_in_rule__IfExpressionKw__Group__115668);
+            pushFollow(FOLLOW_52);
             rule__IfExpressionKw__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group__2_in_rule__IfExpressionKw__Group__115671);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionKw__Group__2();
 
             state._fsp--;
@@ -22407,25 +22407,25 @@ public final void rule__IfExpressionKw__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__IfExpressionKw__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7699:1: rule__IfExpressionKw__Group__1__Impl : ( ( rule__IfExpressionKw__ConditionAssignment_1 ) ) ;
+    // InternalScope.g:7699:1: rule__IfExpressionKw__Group__1__Impl : ( ( rule__IfExpressionKw__ConditionAssignment_1 ) ) ;
     public final void rule__IfExpressionKw__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7703:1: ( ( ( rule__IfExpressionKw__ConditionAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7704:1: ( ( rule__IfExpressionKw__ConditionAssignment_1 ) )
+            // InternalScope.g:7703:1: ( ( ( rule__IfExpressionKw__ConditionAssignment_1 ) ) )
+            // InternalScope.g:7704:1: ( ( rule__IfExpressionKw__ConditionAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7704:1: ( ( rule__IfExpressionKw__ConditionAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7705:1: ( rule__IfExpressionKw__ConditionAssignment_1 )
+            // InternalScope.g:7704:1: ( ( rule__IfExpressionKw__ConditionAssignment_1 ) )
+            // InternalScope.g:7705:1: ( rule__IfExpressionKw__ConditionAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionKwAccess().getConditionAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7706:1: ( rule__IfExpressionKw__ConditionAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7706:2: rule__IfExpressionKw__ConditionAssignment_1
+            // InternalScope.g:7706:1: ( rule__IfExpressionKw__ConditionAssignment_1 )
+            // InternalScope.g:7706:2: rule__IfExpressionKw__ConditionAssignment_1
             {
-            pushFollow(FOLLOW_rule__IfExpressionKw__ConditionAssignment_1_in_rule__IfExpressionKw__Group__1__Impl15698);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionKw__ConditionAssignment_1();
 
             state._fsp--;
@@ -22458,21 +22458,21 @@ public final void rule__IfExpressionKw__Group__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__IfExpressionKw__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7716:1: rule__IfExpressionKw__Group__2 : rule__IfExpressionKw__Group__2__Impl rule__IfExpressionKw__Group__3 ;
+    // InternalScope.g:7716:1: rule__IfExpressionKw__Group__2 : rule__IfExpressionKw__Group__2__Impl rule__IfExpressionKw__Group__3 ;
     public final void rule__IfExpressionKw__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7720:1: ( rule__IfExpressionKw__Group__2__Impl rule__IfExpressionKw__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7721:2: rule__IfExpressionKw__Group__2__Impl rule__IfExpressionKw__Group__3
+            // InternalScope.g:7720:1: ( rule__IfExpressionKw__Group__2__Impl rule__IfExpressionKw__Group__3 )
+            // InternalScope.g:7721:2: rule__IfExpressionKw__Group__2__Impl rule__IfExpressionKw__Group__3
             {
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group__2__Impl_in_rule__IfExpressionKw__Group__215728);
+            pushFollow(FOLLOW_17);
             rule__IfExpressionKw__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group__3_in_rule__IfExpressionKw__Group__215731);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionKw__Group__3();
 
             state._fsp--;
@@ -22496,22 +22496,22 @@ public final void rule__IfExpressionKw__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__IfExpressionKw__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7728:1: rule__IfExpressionKw__Group__2__Impl : ( 'then' ) ;
+    // InternalScope.g:7728:1: rule__IfExpressionKw__Group__2__Impl : ( 'then' ) ;
     public final void rule__IfExpressionKw__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7732:1: ( ( 'then' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7733:1: ( 'then' )
+            // InternalScope.g:7732:1: ( ( 'then' ) )
+            // InternalScope.g:7733:1: ( 'then' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7733:1: ( 'then' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7734:1: 'then'
+            // InternalScope.g:7733:1: ( 'then' )
+            // InternalScope.g:7734:1: 'then'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionKwAccess().getThenKeyword_2()); 
             }
-            match(input,74,FOLLOW_74_in_rule__IfExpressionKw__Group__2__Impl15759); if (state.failed) return ;
+            match(input,74,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIfExpressionKwAccess().getThenKeyword_2()); 
             }
@@ -22537,21 +22537,21 @@ public final void rule__IfExpressionKw__Group__2__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__IfExpressionKw__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7747:1: rule__IfExpressionKw__Group__3 : rule__IfExpressionKw__Group__3__Impl rule__IfExpressionKw__Group__4 ;
+    // InternalScope.g:7747:1: rule__IfExpressionKw__Group__3 : rule__IfExpressionKw__Group__3__Impl rule__IfExpressionKw__Group__4 ;
     public final void rule__IfExpressionKw__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7751:1: ( rule__IfExpressionKw__Group__3__Impl rule__IfExpressionKw__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7752:2: rule__IfExpressionKw__Group__3__Impl rule__IfExpressionKw__Group__4
+            // InternalScope.g:7751:1: ( rule__IfExpressionKw__Group__3__Impl rule__IfExpressionKw__Group__4 )
+            // InternalScope.g:7752:2: rule__IfExpressionKw__Group__3__Impl rule__IfExpressionKw__Group__4
             {
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group__3__Impl_in_rule__IfExpressionKw__Group__315790);
+            pushFollow(FOLLOW_53);
             rule__IfExpressionKw__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group__4_in_rule__IfExpressionKw__Group__315793);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionKw__Group__4();
 
             state._fsp--;
@@ -22575,25 +22575,25 @@ public final void rule__IfExpressionKw__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__IfExpressionKw__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7759:1: rule__IfExpressionKw__Group__3__Impl : ( ( rule__IfExpressionKw__ThenPartAssignment_3 ) ) ;
+    // InternalScope.g:7759:1: rule__IfExpressionKw__Group__3__Impl : ( ( rule__IfExpressionKw__ThenPartAssignment_3 ) ) ;
     public final void rule__IfExpressionKw__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7763:1: ( ( ( rule__IfExpressionKw__ThenPartAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7764:1: ( ( rule__IfExpressionKw__ThenPartAssignment_3 ) )
+            // InternalScope.g:7763:1: ( ( ( rule__IfExpressionKw__ThenPartAssignment_3 ) ) )
+            // InternalScope.g:7764:1: ( ( rule__IfExpressionKw__ThenPartAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7764:1: ( ( rule__IfExpressionKw__ThenPartAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7765:1: ( rule__IfExpressionKw__ThenPartAssignment_3 )
+            // InternalScope.g:7764:1: ( ( rule__IfExpressionKw__ThenPartAssignment_3 ) )
+            // InternalScope.g:7765:1: ( rule__IfExpressionKw__ThenPartAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionKwAccess().getThenPartAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7766:1: ( rule__IfExpressionKw__ThenPartAssignment_3 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7766:2: rule__IfExpressionKw__ThenPartAssignment_3
+            // InternalScope.g:7766:1: ( rule__IfExpressionKw__ThenPartAssignment_3 )
+            // InternalScope.g:7766:2: rule__IfExpressionKw__ThenPartAssignment_3
             {
-            pushFollow(FOLLOW_rule__IfExpressionKw__ThenPartAssignment_3_in_rule__IfExpressionKw__Group__3__Impl15820);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionKw__ThenPartAssignment_3();
 
             state._fsp--;
@@ -22626,16 +22626,16 @@ public final void rule__IfExpressionKw__Group__3__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__IfExpressionKw__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7776:1: rule__IfExpressionKw__Group__4 : rule__IfExpressionKw__Group__4__Impl ;
+    // InternalScope.g:7776:1: rule__IfExpressionKw__Group__4 : rule__IfExpressionKw__Group__4__Impl ;
     public final void rule__IfExpressionKw__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7780:1: ( rule__IfExpressionKw__Group__4__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7781:2: rule__IfExpressionKw__Group__4__Impl
+            // InternalScope.g:7780:1: ( rule__IfExpressionKw__Group__4__Impl )
+            // InternalScope.g:7781:2: rule__IfExpressionKw__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group__4__Impl_in_rule__IfExpressionKw__Group__415850);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionKw__Group__4__Impl();
 
             state._fsp--;
@@ -22659,22 +22659,22 @@ public final void rule__IfExpressionKw__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__IfExpressionKw__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7787:1: rule__IfExpressionKw__Group__4__Impl : ( ( rule__IfExpressionKw__Group_4__0 )? ) ;
+    // InternalScope.g:7787:1: rule__IfExpressionKw__Group__4__Impl : ( ( rule__IfExpressionKw__Group_4__0 )? ) ;
     public final void rule__IfExpressionKw__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7791:1: ( ( ( rule__IfExpressionKw__Group_4__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7792:1: ( ( rule__IfExpressionKw__Group_4__0 )? )
+            // InternalScope.g:7791:1: ( ( ( rule__IfExpressionKw__Group_4__0 )? ) )
+            // InternalScope.g:7792:1: ( ( rule__IfExpressionKw__Group_4__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7792:1: ( ( rule__IfExpressionKw__Group_4__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7793:1: ( rule__IfExpressionKw__Group_4__0 )?
+            // InternalScope.g:7792:1: ( ( rule__IfExpressionKw__Group_4__0 )? )
+            // InternalScope.g:7793:1: ( rule__IfExpressionKw__Group_4__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionKwAccess().getGroup_4()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7794:1: ( rule__IfExpressionKw__Group_4__0 )?
+            // InternalScope.g:7794:1: ( rule__IfExpressionKw__Group_4__0 )?
             int alt57=2;
             int LA57_0 = input.LA(1);
 
@@ -22687,9 +22687,9 @@ public final void rule__IfExpressionKw__Group__4__Impl() throws RecognitionExcep
             }
             switch (alt57) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7794:2: rule__IfExpressionKw__Group_4__0
+                    // InternalScope.g:7794:2: rule__IfExpressionKw__Group_4__0
                     {
-                    pushFollow(FOLLOW_rule__IfExpressionKw__Group_4__0_in_rule__IfExpressionKw__Group__4__Impl15877);
+                    pushFollow(FOLLOW_2);
                     rule__IfExpressionKw__Group_4__0();
 
                     state._fsp--;
@@ -22725,16 +22725,16 @@ public final void rule__IfExpressionKw__Group__4__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__IfExpressionKw__Group_4__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7814:1: rule__IfExpressionKw__Group_4__0 : rule__IfExpressionKw__Group_4__0__Impl ;
+    // InternalScope.g:7814:1: rule__IfExpressionKw__Group_4__0 : rule__IfExpressionKw__Group_4__0__Impl ;
     public final void rule__IfExpressionKw__Group_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7818:1: ( rule__IfExpressionKw__Group_4__0__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7819:2: rule__IfExpressionKw__Group_4__0__Impl
+            // InternalScope.g:7818:1: ( rule__IfExpressionKw__Group_4__0__Impl )
+            // InternalScope.g:7819:2: rule__IfExpressionKw__Group_4__0__Impl
             {
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group_4__0__Impl_in_rule__IfExpressionKw__Group_4__015918);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionKw__Group_4__0__Impl();
 
             state._fsp--;
@@ -22758,25 +22758,25 @@ public final void rule__IfExpressionKw__Group_4__0() throws RecognitionException
 
 
     // $ANTLR start "rule__IfExpressionKw__Group_4__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7825:1: rule__IfExpressionKw__Group_4__0__Impl : ( ( rule__IfExpressionKw__Group_4_0__0 ) ) ;
+    // InternalScope.g:7825:1: rule__IfExpressionKw__Group_4__0__Impl : ( ( rule__IfExpressionKw__Group_4_0__0 ) ) ;
     public final void rule__IfExpressionKw__Group_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7829:1: ( ( ( rule__IfExpressionKw__Group_4_0__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7830:1: ( ( rule__IfExpressionKw__Group_4_0__0 ) )
+            // InternalScope.g:7829:1: ( ( ( rule__IfExpressionKw__Group_4_0__0 ) ) )
+            // InternalScope.g:7830:1: ( ( rule__IfExpressionKw__Group_4_0__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7830:1: ( ( rule__IfExpressionKw__Group_4_0__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7831:1: ( rule__IfExpressionKw__Group_4_0__0 )
+            // InternalScope.g:7830:1: ( ( rule__IfExpressionKw__Group_4_0__0 ) )
+            // InternalScope.g:7831:1: ( rule__IfExpressionKw__Group_4_0__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionKwAccess().getGroup_4_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7832:1: ( rule__IfExpressionKw__Group_4_0__0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7832:2: rule__IfExpressionKw__Group_4_0__0
+            // InternalScope.g:7832:1: ( rule__IfExpressionKw__Group_4_0__0 )
+            // InternalScope.g:7832:2: rule__IfExpressionKw__Group_4_0__0
             {
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group_4_0__0_in_rule__IfExpressionKw__Group_4__0__Impl15945);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionKw__Group_4_0__0();
 
             state._fsp--;
@@ -22809,21 +22809,21 @@ public final void rule__IfExpressionKw__Group_4__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__IfExpressionKw__Group_4_0__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7844:1: rule__IfExpressionKw__Group_4_0__0 : rule__IfExpressionKw__Group_4_0__0__Impl rule__IfExpressionKw__Group_4_0__1 ;
+    // InternalScope.g:7844:1: rule__IfExpressionKw__Group_4_0__0 : rule__IfExpressionKw__Group_4_0__0__Impl rule__IfExpressionKw__Group_4_0__1 ;
     public final void rule__IfExpressionKw__Group_4_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7848:1: ( rule__IfExpressionKw__Group_4_0__0__Impl rule__IfExpressionKw__Group_4_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7849:2: rule__IfExpressionKw__Group_4_0__0__Impl rule__IfExpressionKw__Group_4_0__1
+            // InternalScope.g:7848:1: ( rule__IfExpressionKw__Group_4_0__0__Impl rule__IfExpressionKw__Group_4_0__1 )
+            // InternalScope.g:7849:2: rule__IfExpressionKw__Group_4_0__0__Impl rule__IfExpressionKw__Group_4_0__1
             {
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group_4_0__0__Impl_in_rule__IfExpressionKw__Group_4_0__015977);
+            pushFollow(FOLLOW_17);
             rule__IfExpressionKw__Group_4_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group_4_0__1_in_rule__IfExpressionKw__Group_4_0__015980);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionKw__Group_4_0__1();
 
             state._fsp--;
@@ -22847,22 +22847,22 @@ public final void rule__IfExpressionKw__Group_4_0__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__IfExpressionKw__Group_4_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7856:1: rule__IfExpressionKw__Group_4_0__0__Impl : ( 'else' ) ;
+    // InternalScope.g:7856:1: rule__IfExpressionKw__Group_4_0__0__Impl : ( 'else' ) ;
     public final void rule__IfExpressionKw__Group_4_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7860:1: ( ( 'else' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7861:1: ( 'else' )
+            // InternalScope.g:7860:1: ( ( 'else' ) )
+            // InternalScope.g:7861:1: ( 'else' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7861:1: ( 'else' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7862:1: 'else'
+            // InternalScope.g:7861:1: ( 'else' )
+            // InternalScope.g:7862:1: 'else'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionKwAccess().getElseKeyword_4_0_0()); 
             }
-            match(input,75,FOLLOW_75_in_rule__IfExpressionKw__Group_4_0__0__Impl16008); if (state.failed) return ;
+            match(input,75,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIfExpressionKwAccess().getElseKeyword_4_0_0()); 
             }
@@ -22888,16 +22888,16 @@ public final void rule__IfExpressionKw__Group_4_0__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__IfExpressionKw__Group_4_0__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7875:1: rule__IfExpressionKw__Group_4_0__1 : rule__IfExpressionKw__Group_4_0__1__Impl ;
+    // InternalScope.g:7875:1: rule__IfExpressionKw__Group_4_0__1 : rule__IfExpressionKw__Group_4_0__1__Impl ;
     public final void rule__IfExpressionKw__Group_4_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7879:1: ( rule__IfExpressionKw__Group_4_0__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7880:2: rule__IfExpressionKw__Group_4_0__1__Impl
+            // InternalScope.g:7879:1: ( rule__IfExpressionKw__Group_4_0__1__Impl )
+            // InternalScope.g:7880:2: rule__IfExpressionKw__Group_4_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__IfExpressionKw__Group_4_0__1__Impl_in_rule__IfExpressionKw__Group_4_0__116039);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionKw__Group_4_0__1__Impl();
 
             state._fsp--;
@@ -22921,25 +22921,25 @@ public final void rule__IfExpressionKw__Group_4_0__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__IfExpressionKw__Group_4_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7886:1: rule__IfExpressionKw__Group_4_0__1__Impl : ( ( rule__IfExpressionKw__ElsePartAssignment_4_0_1 ) ) ;
+    // InternalScope.g:7886:1: rule__IfExpressionKw__Group_4_0__1__Impl : ( ( rule__IfExpressionKw__ElsePartAssignment_4_0_1 ) ) ;
     public final void rule__IfExpressionKw__Group_4_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7890:1: ( ( ( rule__IfExpressionKw__ElsePartAssignment_4_0_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7891:1: ( ( rule__IfExpressionKw__ElsePartAssignment_4_0_1 ) )
+            // InternalScope.g:7890:1: ( ( ( rule__IfExpressionKw__ElsePartAssignment_4_0_1 ) ) )
+            // InternalScope.g:7891:1: ( ( rule__IfExpressionKw__ElsePartAssignment_4_0_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7891:1: ( ( rule__IfExpressionKw__ElsePartAssignment_4_0_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7892:1: ( rule__IfExpressionKw__ElsePartAssignment_4_0_1 )
+            // InternalScope.g:7891:1: ( ( rule__IfExpressionKw__ElsePartAssignment_4_0_1 ) )
+            // InternalScope.g:7892:1: ( rule__IfExpressionKw__ElsePartAssignment_4_0_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionKwAccess().getElsePartAssignment_4_0_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7893:1: ( rule__IfExpressionKw__ElsePartAssignment_4_0_1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7893:2: rule__IfExpressionKw__ElsePartAssignment_4_0_1
+            // InternalScope.g:7893:1: ( rule__IfExpressionKw__ElsePartAssignment_4_0_1 )
+            // InternalScope.g:7893:2: rule__IfExpressionKw__ElsePartAssignment_4_0_1
             {
-            pushFollow(FOLLOW_rule__IfExpressionKw__ElsePartAssignment_4_0_1_in_rule__IfExpressionKw__Group_4_0__1__Impl16066);
+            pushFollow(FOLLOW_2);
             rule__IfExpressionKw__ElsePartAssignment_4_0_1();
 
             state._fsp--;
@@ -22972,21 +22972,21 @@ public final void rule__IfExpressionKw__Group_4_0__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__SwitchExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7907:1: rule__SwitchExpression__Group__0 : rule__SwitchExpression__Group__0__Impl rule__SwitchExpression__Group__1 ;
+    // InternalScope.g:7907:1: rule__SwitchExpression__Group__0 : rule__SwitchExpression__Group__0__Impl rule__SwitchExpression__Group__1 ;
     public final void rule__SwitchExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7911:1: ( rule__SwitchExpression__Group__0__Impl rule__SwitchExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7912:2: rule__SwitchExpression__Group__0__Impl rule__SwitchExpression__Group__1
+            // InternalScope.g:7911:1: ( rule__SwitchExpression__Group__0__Impl rule__SwitchExpression__Group__1 )
+            // InternalScope.g:7912:2: rule__SwitchExpression__Group__0__Impl rule__SwitchExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__0__Impl_in_rule__SwitchExpression__Group__016100);
+            pushFollow(FOLLOW_54);
             rule__SwitchExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__1_in_rule__SwitchExpression__Group__016103);
+            pushFollow(FOLLOW_2);
             rule__SwitchExpression__Group__1();
 
             state._fsp--;
@@ -23010,22 +23010,22 @@ public final void rule__SwitchExpression__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__SwitchExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7919:1: rule__SwitchExpression__Group__0__Impl : ( 'switch' ) ;
+    // InternalScope.g:7919:1: rule__SwitchExpression__Group__0__Impl : ( 'switch' ) ;
     public final void rule__SwitchExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7923:1: ( ( 'switch' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7924:1: ( 'switch' )
+            // InternalScope.g:7923:1: ( ( 'switch' ) )
+            // InternalScope.g:7924:1: ( 'switch' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7924:1: ( 'switch' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7925:1: 'switch'
+            // InternalScope.g:7924:1: ( 'switch' )
+            // InternalScope.g:7925:1: 'switch'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getSwitchKeyword_0()); 
             }
-            match(input,76,FOLLOW_76_in_rule__SwitchExpression__Group__0__Impl16131); if (state.failed) return ;
+            match(input,76,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSwitchExpressionAccess().getSwitchKeyword_0()); 
             }
@@ -23051,21 +23051,21 @@ public final void rule__SwitchExpression__Group__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__SwitchExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7938:1: rule__SwitchExpression__Group__1 : rule__SwitchExpression__Group__1__Impl rule__SwitchExpression__Group__2 ;
+    // InternalScope.g:7938:1: rule__SwitchExpression__Group__1 : rule__SwitchExpression__Group__1__Impl rule__SwitchExpression__Group__2 ;
     public final void rule__SwitchExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7942:1: ( rule__SwitchExpression__Group__1__Impl rule__SwitchExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7943:2: rule__SwitchExpression__Group__1__Impl rule__SwitchExpression__Group__2
+            // InternalScope.g:7942:1: ( rule__SwitchExpression__Group__1__Impl rule__SwitchExpression__Group__2 )
+            // InternalScope.g:7943:2: rule__SwitchExpression__Group__1__Impl rule__SwitchExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__1__Impl_in_rule__SwitchExpression__Group__116162);
+            pushFollow(FOLLOW_54);
             rule__SwitchExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__2_in_rule__SwitchExpression__Group__116165);
+            pushFollow(FOLLOW_2);
             rule__SwitchExpression__Group__2();
 
             state._fsp--;
@@ -23089,22 +23089,22 @@ public final void rule__SwitchExpression__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__SwitchExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7950:1: rule__SwitchExpression__Group__1__Impl : ( ( rule__SwitchExpression__Group_1__0 )? ) ;
+    // InternalScope.g:7950:1: rule__SwitchExpression__Group__1__Impl : ( ( rule__SwitchExpression__Group_1__0 )? ) ;
     public final void rule__SwitchExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7954:1: ( ( ( rule__SwitchExpression__Group_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7955:1: ( ( rule__SwitchExpression__Group_1__0 )? )
+            // InternalScope.g:7954:1: ( ( ( rule__SwitchExpression__Group_1__0 )? ) )
+            // InternalScope.g:7955:1: ( ( rule__SwitchExpression__Group_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7955:1: ( ( rule__SwitchExpression__Group_1__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7956:1: ( rule__SwitchExpression__Group_1__0 )?
+            // InternalScope.g:7955:1: ( ( rule__SwitchExpression__Group_1__0 )? )
+            // InternalScope.g:7956:1: ( rule__SwitchExpression__Group_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7957:1: ( rule__SwitchExpression__Group_1__0 )?
+            // InternalScope.g:7957:1: ( rule__SwitchExpression__Group_1__0 )?
             int alt58=2;
             int LA58_0 = input.LA(1);
 
@@ -23113,9 +23113,9 @@ public final void rule__SwitchExpression__Group__1__Impl() throws RecognitionExc
             }
             switch (alt58) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7957:2: rule__SwitchExpression__Group_1__0
+                    // InternalScope.g:7957:2: rule__SwitchExpression__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__SwitchExpression__Group_1__0_in_rule__SwitchExpression__Group__1__Impl16192);
+                    pushFollow(FOLLOW_2);
                     rule__SwitchExpression__Group_1__0();
 
                     state._fsp--;
@@ -23151,21 +23151,21 @@ public final void rule__SwitchExpression__Group__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__SwitchExpression__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7967:1: rule__SwitchExpression__Group__2 : rule__SwitchExpression__Group__2__Impl rule__SwitchExpression__Group__3 ;
+    // InternalScope.g:7967:1: rule__SwitchExpression__Group__2 : rule__SwitchExpression__Group__2__Impl rule__SwitchExpression__Group__3 ;
     public final void rule__SwitchExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7971:1: ( rule__SwitchExpression__Group__2__Impl rule__SwitchExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7972:2: rule__SwitchExpression__Group__2__Impl rule__SwitchExpression__Group__3
+            // InternalScope.g:7971:1: ( rule__SwitchExpression__Group__2__Impl rule__SwitchExpression__Group__3 )
+            // InternalScope.g:7972:2: rule__SwitchExpression__Group__2__Impl rule__SwitchExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__2__Impl_in_rule__SwitchExpression__Group__216223);
+            pushFollow(FOLLOW_55);
             rule__SwitchExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__3_in_rule__SwitchExpression__Group__216226);
+            pushFollow(FOLLOW_2);
             rule__SwitchExpression__Group__3();
 
             state._fsp--;
@@ -23189,22 +23189,22 @@ public final void rule__SwitchExpression__Group__2() throws RecognitionException
 
 
     // $ANTLR start "rule__SwitchExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7979:1: rule__SwitchExpression__Group__2__Impl : ( '{' ) ;
+    // InternalScope.g:7979:1: rule__SwitchExpression__Group__2__Impl : ( '{' ) ;
     public final void rule__SwitchExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7983:1: ( ( '{' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7984:1: ( '{' )
+            // InternalScope.g:7983:1: ( ( '{' ) )
+            // InternalScope.g:7984:1: ( '{' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7984:1: ( '{' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7985:1: '{'
+            // InternalScope.g:7984:1: ( '{' )
+            // InternalScope.g:7985:1: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getLeftCurlyBracketKeyword_2()); 
             }
-            match(input,45,FOLLOW_45_in_rule__SwitchExpression__Group__2__Impl16254); if (state.failed) return ;
+            match(input,45,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSwitchExpressionAccess().getLeftCurlyBracketKeyword_2()); 
             }
@@ -23230,21 +23230,21 @@ public final void rule__SwitchExpression__Group__2__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__SwitchExpression__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7998:1: rule__SwitchExpression__Group__3 : rule__SwitchExpression__Group__3__Impl rule__SwitchExpression__Group__4 ;
+    // InternalScope.g:7998:1: rule__SwitchExpression__Group__3 : rule__SwitchExpression__Group__3__Impl rule__SwitchExpression__Group__4 ;
     public final void rule__SwitchExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8002:1: ( rule__SwitchExpression__Group__3__Impl rule__SwitchExpression__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8003:2: rule__SwitchExpression__Group__3__Impl rule__SwitchExpression__Group__4
+            // InternalScope.g:8002:1: ( rule__SwitchExpression__Group__3__Impl rule__SwitchExpression__Group__4 )
+            // InternalScope.g:8003:2: rule__SwitchExpression__Group__3__Impl rule__SwitchExpression__Group__4
             {
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__3__Impl_in_rule__SwitchExpression__Group__316285);
+            pushFollow(FOLLOW_55);
             rule__SwitchExpression__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__4_in_rule__SwitchExpression__Group__316288);
+            pushFollow(FOLLOW_2);
             rule__SwitchExpression__Group__4();
 
             state._fsp--;
@@ -23268,22 +23268,22 @@ public final void rule__SwitchExpression__Group__3() throws RecognitionException
 
 
     // $ANTLR start "rule__SwitchExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8010:1: rule__SwitchExpression__Group__3__Impl : ( ( rule__SwitchExpression__CaseAssignment_3 )* ) ;
+    // InternalScope.g:8010:1: rule__SwitchExpression__Group__3__Impl : ( ( rule__SwitchExpression__CaseAssignment_3 )* ) ;
     public final void rule__SwitchExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8014:1: ( ( ( rule__SwitchExpression__CaseAssignment_3 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8015:1: ( ( rule__SwitchExpression__CaseAssignment_3 )* )
+            // InternalScope.g:8014:1: ( ( ( rule__SwitchExpression__CaseAssignment_3 )* ) )
+            // InternalScope.g:8015:1: ( ( rule__SwitchExpression__CaseAssignment_3 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8015:1: ( ( rule__SwitchExpression__CaseAssignment_3 )* )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8016:1: ( rule__SwitchExpression__CaseAssignment_3 )*
+            // InternalScope.g:8015:1: ( ( rule__SwitchExpression__CaseAssignment_3 )* )
+            // InternalScope.g:8016:1: ( rule__SwitchExpression__CaseAssignment_3 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getCaseAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8017:1: ( rule__SwitchExpression__CaseAssignment_3 )*
+            // InternalScope.g:8017:1: ( rule__SwitchExpression__CaseAssignment_3 )*
             loop59:
             do {
                 int alt59=2;
@@ -23296,9 +23296,9 @@ public final void rule__SwitchExpression__Group__3__Impl() throws RecognitionExc
 
                 switch (alt59) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8017:2: rule__SwitchExpression__CaseAssignment_3
+            	    // InternalScope.g:8017:2: rule__SwitchExpression__CaseAssignment_3
             	    {
-            	    pushFollow(FOLLOW_rule__SwitchExpression__CaseAssignment_3_in_rule__SwitchExpression__Group__3__Impl16315);
+            	    pushFollow(FOLLOW_56);
             	    rule__SwitchExpression__CaseAssignment_3();
 
             	    state._fsp--;
@@ -23337,21 +23337,21 @@ public final void rule__SwitchExpression__Group__3__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__SwitchExpression__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8027:1: rule__SwitchExpression__Group__4 : rule__SwitchExpression__Group__4__Impl rule__SwitchExpression__Group__5 ;
+    // InternalScope.g:8027:1: rule__SwitchExpression__Group__4 : rule__SwitchExpression__Group__4__Impl rule__SwitchExpression__Group__5 ;
     public final void rule__SwitchExpression__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8031:1: ( rule__SwitchExpression__Group__4__Impl rule__SwitchExpression__Group__5 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8032:2: rule__SwitchExpression__Group__4__Impl rule__SwitchExpression__Group__5
+            // InternalScope.g:8031:1: ( rule__SwitchExpression__Group__4__Impl rule__SwitchExpression__Group__5 )
+            // InternalScope.g:8032:2: rule__SwitchExpression__Group__4__Impl rule__SwitchExpression__Group__5
             {
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__4__Impl_in_rule__SwitchExpression__Group__416346);
+            pushFollow(FOLLOW_47);
             rule__SwitchExpression__Group__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__5_in_rule__SwitchExpression__Group__416349);
+            pushFollow(FOLLOW_2);
             rule__SwitchExpression__Group__5();
 
             state._fsp--;
@@ -23375,22 +23375,22 @@ public final void rule__SwitchExpression__Group__4() throws RecognitionException
 
 
     // $ANTLR start "rule__SwitchExpression__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8039:1: rule__SwitchExpression__Group__4__Impl : ( 'default' ) ;
+    // InternalScope.g:8039:1: rule__SwitchExpression__Group__4__Impl : ( 'default' ) ;
     public final void rule__SwitchExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8043:1: ( ( 'default' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8044:1: ( 'default' )
+            // InternalScope.g:8043:1: ( ( 'default' ) )
+            // InternalScope.g:8044:1: ( 'default' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8044:1: ( 'default' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8045:1: 'default'
+            // InternalScope.g:8044:1: ( 'default' )
+            // InternalScope.g:8045:1: 'default'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getDefaultKeyword_4()); 
             }
-            match(input,77,FOLLOW_77_in_rule__SwitchExpression__Group__4__Impl16377); if (state.failed) return ;
+            match(input,77,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSwitchExpressionAccess().getDefaultKeyword_4()); 
             }
@@ -23416,21 +23416,21 @@ public final void rule__SwitchExpression__Group__4__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__SwitchExpression__Group__5"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8058:1: rule__SwitchExpression__Group__5 : rule__SwitchExpression__Group__5__Impl rule__SwitchExpression__Group__6 ;
+    // InternalScope.g:8058:1: rule__SwitchExpression__Group__5 : rule__SwitchExpression__Group__5__Impl rule__SwitchExpression__Group__6 ;
     public final void rule__SwitchExpression__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8062:1: ( rule__SwitchExpression__Group__5__Impl rule__SwitchExpression__Group__6 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8063:2: rule__SwitchExpression__Group__5__Impl rule__SwitchExpression__Group__6
+            // InternalScope.g:8062:1: ( rule__SwitchExpression__Group__5__Impl rule__SwitchExpression__Group__6 )
+            // InternalScope.g:8063:2: rule__SwitchExpression__Group__5__Impl rule__SwitchExpression__Group__6
             {
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__5__Impl_in_rule__SwitchExpression__Group__516408);
+            pushFollow(FOLLOW_57);
             rule__SwitchExpression__Group__5__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__6_in_rule__SwitchExpression__Group__516411);
+            pushFollow(FOLLOW_2);
             rule__SwitchExpression__Group__6();
 
             state._fsp--;
@@ -23454,22 +23454,22 @@ public final void rule__SwitchExpression__Group__5() throws RecognitionException
 
 
     // $ANTLR start "rule__SwitchExpression__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8070:1: rule__SwitchExpression__Group__5__Impl : ( ':' ) ;
+    // InternalScope.g:8070:1: rule__SwitchExpression__Group__5__Impl : ( ':' ) ;
     public final void rule__SwitchExpression__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8074:1: ( ( ':' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8075:1: ( ':' )
+            // InternalScope.g:8074:1: ( ( ':' ) )
+            // InternalScope.g:8075:1: ( ':' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8075:1: ( ':' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8076:1: ':'
+            // InternalScope.g:8075:1: ( ':' )
+            // InternalScope.g:8076:1: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getColonKeyword_5()); 
             }
-            match(input,70,FOLLOW_70_in_rule__SwitchExpression__Group__5__Impl16439); if (state.failed) return ;
+            match(input,70,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSwitchExpressionAccess().getColonKeyword_5()); 
             }
@@ -23495,21 +23495,21 @@ public final void rule__SwitchExpression__Group__5__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__SwitchExpression__Group__6"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8089:1: rule__SwitchExpression__Group__6 : rule__SwitchExpression__Group__6__Impl rule__SwitchExpression__Group__7 ;
+    // InternalScope.g:8089:1: rule__SwitchExpression__Group__6 : rule__SwitchExpression__Group__6__Impl rule__SwitchExpression__Group__7 ;
     public final void rule__SwitchExpression__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8093:1: ( rule__SwitchExpression__Group__6__Impl rule__SwitchExpression__Group__7 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8094:2: rule__SwitchExpression__Group__6__Impl rule__SwitchExpression__Group__7
+            // InternalScope.g:8093:1: ( rule__SwitchExpression__Group__6__Impl rule__SwitchExpression__Group__7 )
+            // InternalScope.g:8094:2: rule__SwitchExpression__Group__6__Impl rule__SwitchExpression__Group__7
             {
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__6__Impl_in_rule__SwitchExpression__Group__616470);
+            pushFollow(FOLLOW_21);
             rule__SwitchExpression__Group__6__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__7_in_rule__SwitchExpression__Group__616473);
+            pushFollow(FOLLOW_2);
             rule__SwitchExpression__Group__7();
 
             state._fsp--;
@@ -23533,25 +23533,25 @@ public final void rule__SwitchExpression__Group__6() throws RecognitionException
 
 
     // $ANTLR start "rule__SwitchExpression__Group__6__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8101:1: rule__SwitchExpression__Group__6__Impl : ( ( rule__SwitchExpression__DefaultExprAssignment_6 ) ) ;
+    // InternalScope.g:8101:1: rule__SwitchExpression__Group__6__Impl : ( ( rule__SwitchExpression__DefaultExprAssignment_6 ) ) ;
     public final void rule__SwitchExpression__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8105:1: ( ( ( rule__SwitchExpression__DefaultExprAssignment_6 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8106:1: ( ( rule__SwitchExpression__DefaultExprAssignment_6 ) )
+            // InternalScope.g:8105:1: ( ( ( rule__SwitchExpression__DefaultExprAssignment_6 ) ) )
+            // InternalScope.g:8106:1: ( ( rule__SwitchExpression__DefaultExprAssignment_6 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8106:1: ( ( rule__SwitchExpression__DefaultExprAssignment_6 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8107:1: ( rule__SwitchExpression__DefaultExprAssignment_6 )
+            // InternalScope.g:8106:1: ( ( rule__SwitchExpression__DefaultExprAssignment_6 ) )
+            // InternalScope.g:8107:1: ( rule__SwitchExpression__DefaultExprAssignment_6 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getDefaultExprAssignment_6()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8108:1: ( rule__SwitchExpression__DefaultExprAssignment_6 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8108:2: rule__SwitchExpression__DefaultExprAssignment_6
+            // InternalScope.g:8108:1: ( rule__SwitchExpression__DefaultExprAssignment_6 )
+            // InternalScope.g:8108:2: rule__SwitchExpression__DefaultExprAssignment_6
             {
-            pushFollow(FOLLOW_rule__SwitchExpression__DefaultExprAssignment_6_in_rule__SwitchExpression__Group__6__Impl16500);
+            pushFollow(FOLLOW_2);
             rule__SwitchExpression__DefaultExprAssignment_6();
 
             state._fsp--;
@@ -23584,16 +23584,16 @@ public final void rule__SwitchExpression__Group__6__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__SwitchExpression__Group__7"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8118:1: rule__SwitchExpression__Group__7 : rule__SwitchExpression__Group__7__Impl ;
+    // InternalScope.g:8118:1: rule__SwitchExpression__Group__7 : rule__SwitchExpression__Group__7__Impl ;
     public final void rule__SwitchExpression__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8122:1: ( rule__SwitchExpression__Group__7__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8123:2: rule__SwitchExpression__Group__7__Impl
+            // InternalScope.g:8122:1: ( rule__SwitchExpression__Group__7__Impl )
+            // InternalScope.g:8123:2: rule__SwitchExpression__Group__7__Impl
             {
-            pushFollow(FOLLOW_rule__SwitchExpression__Group__7__Impl_in_rule__SwitchExpression__Group__716530);
+            pushFollow(FOLLOW_2);
             rule__SwitchExpression__Group__7__Impl();
 
             state._fsp--;
@@ -23617,22 +23617,22 @@ public final void rule__SwitchExpression__Group__7() throws RecognitionException
 
 
     // $ANTLR start "rule__SwitchExpression__Group__7__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8129:1: rule__SwitchExpression__Group__7__Impl : ( '}' ) ;
+    // InternalScope.g:8129:1: rule__SwitchExpression__Group__7__Impl : ( '}' ) ;
     public final void rule__SwitchExpression__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8133:1: ( ( '}' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8134:1: ( '}' )
+            // InternalScope.g:8133:1: ( ( '}' ) )
+            // InternalScope.g:8134:1: ( '}' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8134:1: ( '}' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8135:1: '}'
+            // InternalScope.g:8134:1: ( '}' )
+            // InternalScope.g:8135:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getRightCurlyBracketKeyword_7()); 
             }
-            match(input,46,FOLLOW_46_in_rule__SwitchExpression__Group__7__Impl16558); if (state.failed) return ;
+            match(input,46,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSwitchExpressionAccess().getRightCurlyBracketKeyword_7()); 
             }
@@ -23658,21 +23658,21 @@ public final void rule__SwitchExpression__Group__7__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__SwitchExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8164:1: rule__SwitchExpression__Group_1__0 : rule__SwitchExpression__Group_1__0__Impl rule__SwitchExpression__Group_1__1 ;
+    // InternalScope.g:8164:1: rule__SwitchExpression__Group_1__0 : rule__SwitchExpression__Group_1__0__Impl rule__SwitchExpression__Group_1__1 ;
     public final void rule__SwitchExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8168:1: ( rule__SwitchExpression__Group_1__0__Impl rule__SwitchExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8169:2: rule__SwitchExpression__Group_1__0__Impl rule__SwitchExpression__Group_1__1
+            // InternalScope.g:8168:1: ( rule__SwitchExpression__Group_1__0__Impl rule__SwitchExpression__Group_1__1 )
+            // InternalScope.g:8169:2: rule__SwitchExpression__Group_1__0__Impl rule__SwitchExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__SwitchExpression__Group_1__0__Impl_in_rule__SwitchExpression__Group_1__016605);
+            pushFollow(FOLLOW_57);
             rule__SwitchExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SwitchExpression__Group_1__1_in_rule__SwitchExpression__Group_1__016608);
+            pushFollow(FOLLOW_2);
             rule__SwitchExpression__Group_1__1();
 
             state._fsp--;
@@ -23696,22 +23696,22 @@ public final void rule__SwitchExpression__Group_1__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__SwitchExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8176:1: rule__SwitchExpression__Group_1__0__Impl : ( '(' ) ;
+    // InternalScope.g:8176:1: rule__SwitchExpression__Group_1__0__Impl : ( '(' ) ;
     public final void rule__SwitchExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8180:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8181:1: ( '(' )
+            // InternalScope.g:8180:1: ( ( '(' ) )
+            // InternalScope.g:8181:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8181:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8182:1: '('
+            // InternalScope.g:8181:1: ( '(' )
+            // InternalScope.g:8182:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getLeftParenthesisKeyword_1_0()); 
             }
-            match(input,51,FOLLOW_51_in_rule__SwitchExpression__Group_1__0__Impl16636); if (state.failed) return ;
+            match(input,51,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSwitchExpressionAccess().getLeftParenthesisKeyword_1_0()); 
             }
@@ -23737,21 +23737,21 @@ public final void rule__SwitchExpression__Group_1__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__SwitchExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8195:1: rule__SwitchExpression__Group_1__1 : rule__SwitchExpression__Group_1__1__Impl rule__SwitchExpression__Group_1__2 ;
+    // InternalScope.g:8195:1: rule__SwitchExpression__Group_1__1 : rule__SwitchExpression__Group_1__1__Impl rule__SwitchExpression__Group_1__2 ;
     public final void rule__SwitchExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8199:1: ( rule__SwitchExpression__Group_1__1__Impl rule__SwitchExpression__Group_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8200:2: rule__SwitchExpression__Group_1__1__Impl rule__SwitchExpression__Group_1__2
+            // InternalScope.g:8199:1: ( rule__SwitchExpression__Group_1__1__Impl rule__SwitchExpression__Group_1__2 )
+            // InternalScope.g:8200:2: rule__SwitchExpression__Group_1__1__Impl rule__SwitchExpression__Group_1__2
             {
-            pushFollow(FOLLOW_rule__SwitchExpression__Group_1__1__Impl_in_rule__SwitchExpression__Group_1__116667);
+            pushFollow(FOLLOW_23);
             rule__SwitchExpression__Group_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SwitchExpression__Group_1__2_in_rule__SwitchExpression__Group_1__116670);
+            pushFollow(FOLLOW_2);
             rule__SwitchExpression__Group_1__2();
 
             state._fsp--;
@@ -23775,25 +23775,25 @@ public final void rule__SwitchExpression__Group_1__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__SwitchExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8207:1: rule__SwitchExpression__Group_1__1__Impl : ( ( rule__SwitchExpression__SwitchExprAssignment_1_1 ) ) ;
+    // InternalScope.g:8207:1: rule__SwitchExpression__Group_1__1__Impl : ( ( rule__SwitchExpression__SwitchExprAssignment_1_1 ) ) ;
     public final void rule__SwitchExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8211:1: ( ( ( rule__SwitchExpression__SwitchExprAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8212:1: ( ( rule__SwitchExpression__SwitchExprAssignment_1_1 ) )
+            // InternalScope.g:8211:1: ( ( ( rule__SwitchExpression__SwitchExprAssignment_1_1 ) ) )
+            // InternalScope.g:8212:1: ( ( rule__SwitchExpression__SwitchExprAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8212:1: ( ( rule__SwitchExpression__SwitchExprAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8213:1: ( rule__SwitchExpression__SwitchExprAssignment_1_1 )
+            // InternalScope.g:8212:1: ( ( rule__SwitchExpression__SwitchExprAssignment_1_1 ) )
+            // InternalScope.g:8213:1: ( rule__SwitchExpression__SwitchExprAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getSwitchExprAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8214:1: ( rule__SwitchExpression__SwitchExprAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8214:2: rule__SwitchExpression__SwitchExprAssignment_1_1
+            // InternalScope.g:8214:1: ( rule__SwitchExpression__SwitchExprAssignment_1_1 )
+            // InternalScope.g:8214:2: rule__SwitchExpression__SwitchExprAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__SwitchExpression__SwitchExprAssignment_1_1_in_rule__SwitchExpression__Group_1__1__Impl16697);
+            pushFollow(FOLLOW_2);
             rule__SwitchExpression__SwitchExprAssignment_1_1();
 
             state._fsp--;
@@ -23826,16 +23826,16 @@ public final void rule__SwitchExpression__Group_1__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__SwitchExpression__Group_1__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8224:1: rule__SwitchExpression__Group_1__2 : rule__SwitchExpression__Group_1__2__Impl ;
+    // InternalScope.g:8224:1: rule__SwitchExpression__Group_1__2 : rule__SwitchExpression__Group_1__2__Impl ;
     public final void rule__SwitchExpression__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8228:1: ( rule__SwitchExpression__Group_1__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8229:2: rule__SwitchExpression__Group_1__2__Impl
+            // InternalScope.g:8228:1: ( rule__SwitchExpression__Group_1__2__Impl )
+            // InternalScope.g:8229:2: rule__SwitchExpression__Group_1__2__Impl
             {
-            pushFollow(FOLLOW_rule__SwitchExpression__Group_1__2__Impl_in_rule__SwitchExpression__Group_1__216727);
+            pushFollow(FOLLOW_2);
             rule__SwitchExpression__Group_1__2__Impl();
 
             state._fsp--;
@@ -23859,22 +23859,22 @@ public final void rule__SwitchExpression__Group_1__2() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__SwitchExpression__Group_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8235:1: rule__SwitchExpression__Group_1__2__Impl : ( ')' ) ;
+    // InternalScope.g:8235:1: rule__SwitchExpression__Group_1__2__Impl : ( ')' ) ;
     public final void rule__SwitchExpression__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8239:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8240:1: ( ')' )
+            // InternalScope.g:8239:1: ( ( ')' ) )
+            // InternalScope.g:8240:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8240:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8241:1: ')'
+            // InternalScope.g:8240:1: ( ')' )
+            // InternalScope.g:8241:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getRightParenthesisKeyword_1_2()); 
             }
-            match(input,52,FOLLOW_52_in_rule__SwitchExpression__Group_1__2__Impl16755); if (state.failed) return ;
+            match(input,52,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSwitchExpressionAccess().getRightParenthesisKeyword_1_2()); 
             }
@@ -23900,21 +23900,21 @@ public final void rule__SwitchExpression__Group_1__2__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__Case__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8260:1: rule__Case__Group__0 : rule__Case__Group__0__Impl rule__Case__Group__1 ;
+    // InternalScope.g:8260:1: rule__Case__Group__0 : rule__Case__Group__0__Impl rule__Case__Group__1 ;
     public final void rule__Case__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8264:1: ( rule__Case__Group__0__Impl rule__Case__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8265:2: rule__Case__Group__0__Impl rule__Case__Group__1
+            // InternalScope.g:8264:1: ( rule__Case__Group__0__Impl rule__Case__Group__1 )
+            // InternalScope.g:8265:2: rule__Case__Group__0__Impl rule__Case__Group__1
             {
-            pushFollow(FOLLOW_rule__Case__Group__0__Impl_in_rule__Case__Group__016792);
+            pushFollow(FOLLOW_57);
             rule__Case__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Case__Group__1_in_rule__Case__Group__016795);
+            pushFollow(FOLLOW_2);
             rule__Case__Group__1();
 
             state._fsp--;
@@ -23938,22 +23938,22 @@ public final void rule__Case__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Case__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8272:1: rule__Case__Group__0__Impl : ( 'case' ) ;
+    // InternalScope.g:8272:1: rule__Case__Group__0__Impl : ( 'case' ) ;
     public final void rule__Case__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8276:1: ( ( 'case' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8277:1: ( 'case' )
+            // InternalScope.g:8276:1: ( ( 'case' ) )
+            // InternalScope.g:8277:1: ( 'case' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8277:1: ( 'case' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8278:1: 'case'
+            // InternalScope.g:8277:1: ( 'case' )
+            // InternalScope.g:8278:1: 'case'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCaseAccess().getCaseKeyword_0()); 
             }
-            match(input,47,FOLLOW_47_in_rule__Case__Group__0__Impl16823); if (state.failed) return ;
+            match(input,47,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCaseAccess().getCaseKeyword_0()); 
             }
@@ -23979,21 +23979,21 @@ public final void rule__Case__Group__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Case__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8291:1: rule__Case__Group__1 : rule__Case__Group__1__Impl rule__Case__Group__2 ;
+    // InternalScope.g:8291:1: rule__Case__Group__1 : rule__Case__Group__1__Impl rule__Case__Group__2 ;
     public final void rule__Case__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8295:1: ( rule__Case__Group__1__Impl rule__Case__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8296:2: rule__Case__Group__1__Impl rule__Case__Group__2
+            // InternalScope.g:8295:1: ( rule__Case__Group__1__Impl rule__Case__Group__2 )
+            // InternalScope.g:8296:2: rule__Case__Group__1__Impl rule__Case__Group__2
             {
-            pushFollow(FOLLOW_rule__Case__Group__1__Impl_in_rule__Case__Group__116854);
+            pushFollow(FOLLOW_47);
             rule__Case__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Case__Group__2_in_rule__Case__Group__116857);
+            pushFollow(FOLLOW_2);
             rule__Case__Group__2();
 
             state._fsp--;
@@ -24017,25 +24017,25 @@ public final void rule__Case__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Case__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8303:1: rule__Case__Group__1__Impl : ( ( rule__Case__ConditionAssignment_1 ) ) ;
+    // InternalScope.g:8303:1: rule__Case__Group__1__Impl : ( ( rule__Case__ConditionAssignment_1 ) ) ;
     public final void rule__Case__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8307:1: ( ( ( rule__Case__ConditionAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8308:1: ( ( rule__Case__ConditionAssignment_1 ) )
+            // InternalScope.g:8307:1: ( ( ( rule__Case__ConditionAssignment_1 ) ) )
+            // InternalScope.g:8308:1: ( ( rule__Case__ConditionAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8308:1: ( ( rule__Case__ConditionAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8309:1: ( rule__Case__ConditionAssignment_1 )
+            // InternalScope.g:8308:1: ( ( rule__Case__ConditionAssignment_1 ) )
+            // InternalScope.g:8309:1: ( rule__Case__ConditionAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCaseAccess().getConditionAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8310:1: ( rule__Case__ConditionAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8310:2: rule__Case__ConditionAssignment_1
+            // InternalScope.g:8310:1: ( rule__Case__ConditionAssignment_1 )
+            // InternalScope.g:8310:2: rule__Case__ConditionAssignment_1
             {
-            pushFollow(FOLLOW_rule__Case__ConditionAssignment_1_in_rule__Case__Group__1__Impl16884);
+            pushFollow(FOLLOW_2);
             rule__Case__ConditionAssignment_1();
 
             state._fsp--;
@@ -24068,21 +24068,21 @@ public final void rule__Case__Group__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Case__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8320:1: rule__Case__Group__2 : rule__Case__Group__2__Impl rule__Case__Group__3 ;
+    // InternalScope.g:8320:1: rule__Case__Group__2 : rule__Case__Group__2__Impl rule__Case__Group__3 ;
     public final void rule__Case__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8324:1: ( rule__Case__Group__2__Impl rule__Case__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8325:2: rule__Case__Group__2__Impl rule__Case__Group__3
+            // InternalScope.g:8324:1: ( rule__Case__Group__2__Impl rule__Case__Group__3 )
+            // InternalScope.g:8325:2: rule__Case__Group__2__Impl rule__Case__Group__3
             {
-            pushFollow(FOLLOW_rule__Case__Group__2__Impl_in_rule__Case__Group__216914);
+            pushFollow(FOLLOW_57);
             rule__Case__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Case__Group__3_in_rule__Case__Group__216917);
+            pushFollow(FOLLOW_2);
             rule__Case__Group__3();
 
             state._fsp--;
@@ -24106,22 +24106,22 @@ public final void rule__Case__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__Case__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8332:1: rule__Case__Group__2__Impl : ( ':' ) ;
+    // InternalScope.g:8332:1: rule__Case__Group__2__Impl : ( ':' ) ;
     public final void rule__Case__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8336:1: ( ( ':' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8337:1: ( ':' )
+            // InternalScope.g:8336:1: ( ( ':' ) )
+            // InternalScope.g:8337:1: ( ':' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8337:1: ( ':' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8338:1: ':'
+            // InternalScope.g:8337:1: ( ':' )
+            // InternalScope.g:8338:1: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCaseAccess().getColonKeyword_2()); 
             }
-            match(input,70,FOLLOW_70_in_rule__Case__Group__2__Impl16945); if (state.failed) return ;
+            match(input,70,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCaseAccess().getColonKeyword_2()); 
             }
@@ -24147,16 +24147,16 @@ public final void rule__Case__Group__2__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Case__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8351:1: rule__Case__Group__3 : rule__Case__Group__3__Impl ;
+    // InternalScope.g:8351:1: rule__Case__Group__3 : rule__Case__Group__3__Impl ;
     public final void rule__Case__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8355:1: ( rule__Case__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8356:2: rule__Case__Group__3__Impl
+            // InternalScope.g:8355:1: ( rule__Case__Group__3__Impl )
+            // InternalScope.g:8356:2: rule__Case__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__Case__Group__3__Impl_in_rule__Case__Group__316976);
+            pushFollow(FOLLOW_2);
             rule__Case__Group__3__Impl();
 
             state._fsp--;
@@ -24180,25 +24180,25 @@ public final void rule__Case__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__Case__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8362:1: rule__Case__Group__3__Impl : ( ( rule__Case__ThenParAssignment_3 ) ) ;
+    // InternalScope.g:8362:1: rule__Case__Group__3__Impl : ( ( rule__Case__ThenParAssignment_3 ) ) ;
     public final void rule__Case__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8366:1: ( ( ( rule__Case__ThenParAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8367:1: ( ( rule__Case__ThenParAssignment_3 ) )
+            // InternalScope.g:8366:1: ( ( ( rule__Case__ThenParAssignment_3 ) ) )
+            // InternalScope.g:8367:1: ( ( rule__Case__ThenParAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8367:1: ( ( rule__Case__ThenParAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8368:1: ( rule__Case__ThenParAssignment_3 )
+            // InternalScope.g:8367:1: ( ( rule__Case__ThenParAssignment_3 ) )
+            // InternalScope.g:8368:1: ( rule__Case__ThenParAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCaseAccess().getThenParAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8369:1: ( rule__Case__ThenParAssignment_3 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8369:2: rule__Case__ThenParAssignment_3
+            // InternalScope.g:8369:1: ( rule__Case__ThenParAssignment_3 )
+            // InternalScope.g:8369:2: rule__Case__ThenParAssignment_3
             {
-            pushFollow(FOLLOW_rule__Case__ThenParAssignment_3_in_rule__Case__Group__3__Impl17003);
+            pushFollow(FOLLOW_2);
             rule__Case__ThenParAssignment_3();
 
             state._fsp--;
@@ -24231,21 +24231,21 @@ public final void rule__Case__Group__3__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__OrExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8387:1: rule__OrExpression__Group__0 : rule__OrExpression__Group__0__Impl rule__OrExpression__Group__1 ;
+    // InternalScope.g:8387:1: rule__OrExpression__Group__0 : rule__OrExpression__Group__0__Impl rule__OrExpression__Group__1 ;
     public final void rule__OrExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8391:1: ( rule__OrExpression__Group__0__Impl rule__OrExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8392:2: rule__OrExpression__Group__0__Impl rule__OrExpression__Group__1
+            // InternalScope.g:8391:1: ( rule__OrExpression__Group__0__Impl rule__OrExpression__Group__1 )
+            // InternalScope.g:8392:2: rule__OrExpression__Group__0__Impl rule__OrExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__OrExpression__Group__0__Impl_in_rule__OrExpression__Group__017041);
+            pushFollow(FOLLOW_58);
             rule__OrExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OrExpression__Group__1_in_rule__OrExpression__Group__017044);
+            pushFollow(FOLLOW_2);
             rule__OrExpression__Group__1();
 
             state._fsp--;
@@ -24269,22 +24269,22 @@ public final void rule__OrExpression__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__OrExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8399:1: rule__OrExpression__Group__0__Impl : ( ruleAndExpression ) ;
+    // InternalScope.g:8399:1: rule__OrExpression__Group__0__Impl : ( ruleAndExpression ) ;
     public final void rule__OrExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8403:1: ( ( ruleAndExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8404:1: ( ruleAndExpression )
+            // InternalScope.g:8403:1: ( ( ruleAndExpression ) )
+            // InternalScope.g:8404:1: ( ruleAndExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8404:1: ( ruleAndExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8405:1: ruleAndExpression
+            // InternalScope.g:8404:1: ( ruleAndExpression )
+            // InternalScope.g:8405:1: ruleAndExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOrExpressionAccess().getAndExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleAndExpression_in_rule__OrExpression__Group__0__Impl17071);
+            pushFollow(FOLLOW_2);
             ruleAndExpression();
 
             state._fsp--;
@@ -24314,16 +24314,16 @@ public final void rule__OrExpression__Group__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__OrExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8416:1: rule__OrExpression__Group__1 : rule__OrExpression__Group__1__Impl ;
+    // InternalScope.g:8416:1: rule__OrExpression__Group__1 : rule__OrExpression__Group__1__Impl ;
     public final void rule__OrExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8420:1: ( rule__OrExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8421:2: rule__OrExpression__Group__1__Impl
+            // InternalScope.g:8420:1: ( rule__OrExpression__Group__1__Impl )
+            // InternalScope.g:8421:2: rule__OrExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__OrExpression__Group__1__Impl_in_rule__OrExpression__Group__117100);
+            pushFollow(FOLLOW_2);
             rule__OrExpression__Group__1__Impl();
 
             state._fsp--;
@@ -24347,22 +24347,22 @@ public final void rule__OrExpression__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__OrExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8427:1: rule__OrExpression__Group__1__Impl : ( ( rule__OrExpression__Group_1__0 )* ) ;
+    // InternalScope.g:8427:1: rule__OrExpression__Group__1__Impl : ( ( rule__OrExpression__Group_1__0 )* ) ;
     public final void rule__OrExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8431:1: ( ( ( rule__OrExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8432:1: ( ( rule__OrExpression__Group_1__0 )* )
+            // InternalScope.g:8431:1: ( ( ( rule__OrExpression__Group_1__0 )* ) )
+            // InternalScope.g:8432:1: ( ( rule__OrExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8432:1: ( ( rule__OrExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8433:1: ( rule__OrExpression__Group_1__0 )*
+            // InternalScope.g:8432:1: ( ( rule__OrExpression__Group_1__0 )* )
+            // InternalScope.g:8433:1: ( rule__OrExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOrExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8434:1: ( rule__OrExpression__Group_1__0 )*
+            // InternalScope.g:8434:1: ( rule__OrExpression__Group_1__0 )*
             loop60:
             do {
                 int alt60=2;
@@ -24375,9 +24375,9 @@ public final void rule__OrExpression__Group__1__Impl() throws RecognitionExcepti
 
                 switch (alt60) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8434:2: rule__OrExpression__Group_1__0
+            	    // InternalScope.g:8434:2: rule__OrExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__OrExpression__Group_1__0_in_rule__OrExpression__Group__1__Impl17127);
+            	    pushFollow(FOLLOW_59);
             	    rule__OrExpression__Group_1__0();
 
             	    state._fsp--;
@@ -24416,21 +24416,21 @@ public final void rule__OrExpression__Group__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__OrExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8448:1: rule__OrExpression__Group_1__0 : rule__OrExpression__Group_1__0__Impl rule__OrExpression__Group_1__1 ;
+    // InternalScope.g:8448:1: rule__OrExpression__Group_1__0 : rule__OrExpression__Group_1__0__Impl rule__OrExpression__Group_1__1 ;
     public final void rule__OrExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8452:1: ( rule__OrExpression__Group_1__0__Impl rule__OrExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8453:2: rule__OrExpression__Group_1__0__Impl rule__OrExpression__Group_1__1
+            // InternalScope.g:8452:1: ( rule__OrExpression__Group_1__0__Impl rule__OrExpression__Group_1__1 )
+            // InternalScope.g:8453:2: rule__OrExpression__Group_1__0__Impl rule__OrExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__OrExpression__Group_1__0__Impl_in_rule__OrExpression__Group_1__017162);
+            pushFollow(FOLLOW_58);
             rule__OrExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OrExpression__Group_1__1_in_rule__OrExpression__Group_1__017165);
+            pushFollow(FOLLOW_2);
             rule__OrExpression__Group_1__1();
 
             state._fsp--;
@@ -24454,23 +24454,23 @@ public final void rule__OrExpression__Group_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__OrExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8460:1: rule__OrExpression__Group_1__0__Impl : ( () ) ;
+    // InternalScope.g:8460:1: rule__OrExpression__Group_1__0__Impl : ( () ) ;
     public final void rule__OrExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8464:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8465:1: ( () )
+            // InternalScope.g:8464:1: ( ( () ) )
+            // InternalScope.g:8465:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8465:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8466:1: ()
+            // InternalScope.g:8465:1: ( () )
+            // InternalScope.g:8466:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOrExpressionAccess().getBooleanOperationLeftAction_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8467:1: ()
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8469:1: 
+            // InternalScope.g:8467:1: ()
+            // InternalScope.g:8469:1: 
             {
             }
 
@@ -24495,21 +24495,21 @@ public final void rule__OrExpression__Group_1__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__OrExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8479:1: rule__OrExpression__Group_1__1 : rule__OrExpression__Group_1__1__Impl rule__OrExpression__Group_1__2 ;
+    // InternalScope.g:8479:1: rule__OrExpression__Group_1__1 : rule__OrExpression__Group_1__1__Impl rule__OrExpression__Group_1__2 ;
     public final void rule__OrExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8483:1: ( rule__OrExpression__Group_1__1__Impl rule__OrExpression__Group_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8484:2: rule__OrExpression__Group_1__1__Impl rule__OrExpression__Group_1__2
+            // InternalScope.g:8483:1: ( rule__OrExpression__Group_1__1__Impl rule__OrExpression__Group_1__2 )
+            // InternalScope.g:8484:2: rule__OrExpression__Group_1__1__Impl rule__OrExpression__Group_1__2
             {
-            pushFollow(FOLLOW_rule__OrExpression__Group_1__1__Impl_in_rule__OrExpression__Group_1__117223);
+            pushFollow(FOLLOW_57);
             rule__OrExpression__Group_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OrExpression__Group_1__2_in_rule__OrExpression__Group_1__117226);
+            pushFollow(FOLLOW_2);
             rule__OrExpression__Group_1__2();
 
             state._fsp--;
@@ -24533,25 +24533,25 @@ public final void rule__OrExpression__Group_1__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__OrExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8491:1: rule__OrExpression__Group_1__1__Impl : ( ( rule__OrExpression__OperatorAssignment_1_1 ) ) ;
+    // InternalScope.g:8491:1: rule__OrExpression__Group_1__1__Impl : ( ( rule__OrExpression__OperatorAssignment_1_1 ) ) ;
     public final void rule__OrExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8495:1: ( ( ( rule__OrExpression__OperatorAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8496:1: ( ( rule__OrExpression__OperatorAssignment_1_1 ) )
+            // InternalScope.g:8495:1: ( ( ( rule__OrExpression__OperatorAssignment_1_1 ) ) )
+            // InternalScope.g:8496:1: ( ( rule__OrExpression__OperatorAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8496:1: ( ( rule__OrExpression__OperatorAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8497:1: ( rule__OrExpression__OperatorAssignment_1_1 )
+            // InternalScope.g:8496:1: ( ( rule__OrExpression__OperatorAssignment_1_1 ) )
+            // InternalScope.g:8497:1: ( rule__OrExpression__OperatorAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOrExpressionAccess().getOperatorAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8498:1: ( rule__OrExpression__OperatorAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8498:2: rule__OrExpression__OperatorAssignment_1_1
+            // InternalScope.g:8498:1: ( rule__OrExpression__OperatorAssignment_1_1 )
+            // InternalScope.g:8498:2: rule__OrExpression__OperatorAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__OrExpression__OperatorAssignment_1_1_in_rule__OrExpression__Group_1__1__Impl17253);
+            pushFollow(FOLLOW_2);
             rule__OrExpression__OperatorAssignment_1_1();
 
             state._fsp--;
@@ -24584,16 +24584,16 @@ public final void rule__OrExpression__Group_1__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__OrExpression__Group_1__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8508:1: rule__OrExpression__Group_1__2 : rule__OrExpression__Group_1__2__Impl ;
+    // InternalScope.g:8508:1: rule__OrExpression__Group_1__2 : rule__OrExpression__Group_1__2__Impl ;
     public final void rule__OrExpression__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8512:1: ( rule__OrExpression__Group_1__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8513:2: rule__OrExpression__Group_1__2__Impl
+            // InternalScope.g:8512:1: ( rule__OrExpression__Group_1__2__Impl )
+            // InternalScope.g:8513:2: rule__OrExpression__Group_1__2__Impl
             {
-            pushFollow(FOLLOW_rule__OrExpression__Group_1__2__Impl_in_rule__OrExpression__Group_1__217283);
+            pushFollow(FOLLOW_2);
             rule__OrExpression__Group_1__2__Impl();
 
             state._fsp--;
@@ -24617,25 +24617,25 @@ public final void rule__OrExpression__Group_1__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__OrExpression__Group_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8519:1: rule__OrExpression__Group_1__2__Impl : ( ( rule__OrExpression__RightAssignment_1_2 ) ) ;
+    // InternalScope.g:8519:1: rule__OrExpression__Group_1__2__Impl : ( ( rule__OrExpression__RightAssignment_1_2 ) ) ;
     public final void rule__OrExpression__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8523:1: ( ( ( rule__OrExpression__RightAssignment_1_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8524:1: ( ( rule__OrExpression__RightAssignment_1_2 ) )
+            // InternalScope.g:8523:1: ( ( ( rule__OrExpression__RightAssignment_1_2 ) ) )
+            // InternalScope.g:8524:1: ( ( rule__OrExpression__RightAssignment_1_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8524:1: ( ( rule__OrExpression__RightAssignment_1_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8525:1: ( rule__OrExpression__RightAssignment_1_2 )
+            // InternalScope.g:8524:1: ( ( rule__OrExpression__RightAssignment_1_2 ) )
+            // InternalScope.g:8525:1: ( rule__OrExpression__RightAssignment_1_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOrExpressionAccess().getRightAssignment_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8526:1: ( rule__OrExpression__RightAssignment_1_2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8526:2: rule__OrExpression__RightAssignment_1_2
+            // InternalScope.g:8526:1: ( rule__OrExpression__RightAssignment_1_2 )
+            // InternalScope.g:8526:2: rule__OrExpression__RightAssignment_1_2
             {
-            pushFollow(FOLLOW_rule__OrExpression__RightAssignment_1_2_in_rule__OrExpression__Group_1__2__Impl17310);
+            pushFollow(FOLLOW_2);
             rule__OrExpression__RightAssignment_1_2();
 
             state._fsp--;
@@ -24668,21 +24668,21 @@ public final void rule__OrExpression__Group_1__2__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__AndExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8542:1: rule__AndExpression__Group__0 : rule__AndExpression__Group__0__Impl rule__AndExpression__Group__1 ;
+    // InternalScope.g:8542:1: rule__AndExpression__Group__0 : rule__AndExpression__Group__0__Impl rule__AndExpression__Group__1 ;
     public final void rule__AndExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8546:1: ( rule__AndExpression__Group__0__Impl rule__AndExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8547:2: rule__AndExpression__Group__0__Impl rule__AndExpression__Group__1
+            // InternalScope.g:8546:1: ( rule__AndExpression__Group__0__Impl rule__AndExpression__Group__1 )
+            // InternalScope.g:8547:2: rule__AndExpression__Group__0__Impl rule__AndExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__AndExpression__Group__0__Impl_in_rule__AndExpression__Group__017346);
+            pushFollow(FOLLOW_60);
             rule__AndExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__AndExpression__Group__1_in_rule__AndExpression__Group__017349);
+            pushFollow(FOLLOW_2);
             rule__AndExpression__Group__1();
 
             state._fsp--;
@@ -24706,22 +24706,22 @@ public final void rule__AndExpression__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__AndExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8554:1: rule__AndExpression__Group__0__Impl : ( ruleImpliesExpression ) ;
+    // InternalScope.g:8554:1: rule__AndExpression__Group__0__Impl : ( ruleImpliesExpression ) ;
     public final void rule__AndExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8558:1: ( ( ruleImpliesExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8559:1: ( ruleImpliesExpression )
+            // InternalScope.g:8558:1: ( ( ruleImpliesExpression ) )
+            // InternalScope.g:8559:1: ( ruleImpliesExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8559:1: ( ruleImpliesExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8560:1: ruleImpliesExpression
+            // InternalScope.g:8559:1: ( ruleImpliesExpression )
+            // InternalScope.g:8560:1: ruleImpliesExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAndExpressionAccess().getImpliesExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleImpliesExpression_in_rule__AndExpression__Group__0__Impl17376);
+            pushFollow(FOLLOW_2);
             ruleImpliesExpression();
 
             state._fsp--;
@@ -24751,16 +24751,16 @@ public final void rule__AndExpression__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__AndExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8571:1: rule__AndExpression__Group__1 : rule__AndExpression__Group__1__Impl ;
+    // InternalScope.g:8571:1: rule__AndExpression__Group__1 : rule__AndExpression__Group__1__Impl ;
     public final void rule__AndExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8575:1: ( rule__AndExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8576:2: rule__AndExpression__Group__1__Impl
+            // InternalScope.g:8575:1: ( rule__AndExpression__Group__1__Impl )
+            // InternalScope.g:8576:2: rule__AndExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__AndExpression__Group__1__Impl_in_rule__AndExpression__Group__117405);
+            pushFollow(FOLLOW_2);
             rule__AndExpression__Group__1__Impl();
 
             state._fsp--;
@@ -24784,22 +24784,22 @@ public final void rule__AndExpression__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__AndExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8582:1: rule__AndExpression__Group__1__Impl : ( ( rule__AndExpression__Group_1__0 )* ) ;
+    // InternalScope.g:8582:1: rule__AndExpression__Group__1__Impl : ( ( rule__AndExpression__Group_1__0 )* ) ;
     public final void rule__AndExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8586:1: ( ( ( rule__AndExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8587:1: ( ( rule__AndExpression__Group_1__0 )* )
+            // InternalScope.g:8586:1: ( ( ( rule__AndExpression__Group_1__0 )* ) )
+            // InternalScope.g:8587:1: ( ( rule__AndExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8587:1: ( ( rule__AndExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8588:1: ( rule__AndExpression__Group_1__0 )*
+            // InternalScope.g:8587:1: ( ( rule__AndExpression__Group_1__0 )* )
+            // InternalScope.g:8588:1: ( rule__AndExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAndExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8589:1: ( rule__AndExpression__Group_1__0 )*
+            // InternalScope.g:8589:1: ( rule__AndExpression__Group_1__0 )*
             loop61:
             do {
                 int alt61=2;
@@ -24812,9 +24812,9 @@ public final void rule__AndExpression__Group__1__Impl() throws RecognitionExcept
 
                 switch (alt61) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8589:2: rule__AndExpression__Group_1__0
+            	    // InternalScope.g:8589:2: rule__AndExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__AndExpression__Group_1__0_in_rule__AndExpression__Group__1__Impl17432);
+            	    pushFollow(FOLLOW_61);
             	    rule__AndExpression__Group_1__0();
 
             	    state._fsp--;
@@ -24853,21 +24853,21 @@ public final void rule__AndExpression__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__AndExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8603:1: rule__AndExpression__Group_1__0 : rule__AndExpression__Group_1__0__Impl rule__AndExpression__Group_1__1 ;
+    // InternalScope.g:8603:1: rule__AndExpression__Group_1__0 : rule__AndExpression__Group_1__0__Impl rule__AndExpression__Group_1__1 ;
     public final void rule__AndExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8607:1: ( rule__AndExpression__Group_1__0__Impl rule__AndExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8608:2: rule__AndExpression__Group_1__0__Impl rule__AndExpression__Group_1__1
+            // InternalScope.g:8607:1: ( rule__AndExpression__Group_1__0__Impl rule__AndExpression__Group_1__1 )
+            // InternalScope.g:8608:2: rule__AndExpression__Group_1__0__Impl rule__AndExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__AndExpression__Group_1__0__Impl_in_rule__AndExpression__Group_1__017467);
+            pushFollow(FOLLOW_60);
             rule__AndExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__AndExpression__Group_1__1_in_rule__AndExpression__Group_1__017470);
+            pushFollow(FOLLOW_2);
             rule__AndExpression__Group_1__1();
 
             state._fsp--;
@@ -24891,23 +24891,23 @@ public final void rule__AndExpression__Group_1__0() throws RecognitionException
 
 
     // $ANTLR start "rule__AndExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8615:1: rule__AndExpression__Group_1__0__Impl : ( () ) ;
+    // InternalScope.g:8615:1: rule__AndExpression__Group_1__0__Impl : ( () ) ;
     public final void rule__AndExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8619:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8620:1: ( () )
+            // InternalScope.g:8619:1: ( ( () ) )
+            // InternalScope.g:8620:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8620:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8621:1: ()
+            // InternalScope.g:8620:1: ( () )
+            // InternalScope.g:8621:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAndExpressionAccess().getBooleanOperationLeftAction_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8622:1: ()
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8624:1: 
+            // InternalScope.g:8622:1: ()
+            // InternalScope.g:8624:1: 
             {
             }
 
@@ -24932,21 +24932,21 @@ public final void rule__AndExpression__Group_1__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__AndExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8634:1: rule__AndExpression__Group_1__1 : rule__AndExpression__Group_1__1__Impl rule__AndExpression__Group_1__2 ;
+    // InternalScope.g:8634:1: rule__AndExpression__Group_1__1 : rule__AndExpression__Group_1__1__Impl rule__AndExpression__Group_1__2 ;
     public final void rule__AndExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8638:1: ( rule__AndExpression__Group_1__1__Impl rule__AndExpression__Group_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8639:2: rule__AndExpression__Group_1__1__Impl rule__AndExpression__Group_1__2
+            // InternalScope.g:8638:1: ( rule__AndExpression__Group_1__1__Impl rule__AndExpression__Group_1__2 )
+            // InternalScope.g:8639:2: rule__AndExpression__Group_1__1__Impl rule__AndExpression__Group_1__2
             {
-            pushFollow(FOLLOW_rule__AndExpression__Group_1__1__Impl_in_rule__AndExpression__Group_1__117528);
+            pushFollow(FOLLOW_57);
             rule__AndExpression__Group_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__AndExpression__Group_1__2_in_rule__AndExpression__Group_1__117531);
+            pushFollow(FOLLOW_2);
             rule__AndExpression__Group_1__2();
 
             state._fsp--;
@@ -24970,25 +24970,25 @@ public final void rule__AndExpression__Group_1__1() throws RecognitionException
 
 
     // $ANTLR start "rule__AndExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8646:1: rule__AndExpression__Group_1__1__Impl : ( ( rule__AndExpression__OperatorAssignment_1_1 ) ) ;
+    // InternalScope.g:8646:1: rule__AndExpression__Group_1__1__Impl : ( ( rule__AndExpression__OperatorAssignment_1_1 ) ) ;
     public final void rule__AndExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8650:1: ( ( ( rule__AndExpression__OperatorAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8651:1: ( ( rule__AndExpression__OperatorAssignment_1_1 ) )
+            // InternalScope.g:8650:1: ( ( ( rule__AndExpression__OperatorAssignment_1_1 ) ) )
+            // InternalScope.g:8651:1: ( ( rule__AndExpression__OperatorAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8651:1: ( ( rule__AndExpression__OperatorAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8652:1: ( rule__AndExpression__OperatorAssignment_1_1 )
+            // InternalScope.g:8651:1: ( ( rule__AndExpression__OperatorAssignment_1_1 ) )
+            // InternalScope.g:8652:1: ( rule__AndExpression__OperatorAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAndExpressionAccess().getOperatorAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8653:1: ( rule__AndExpression__OperatorAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8653:2: rule__AndExpression__OperatorAssignment_1_1
+            // InternalScope.g:8653:1: ( rule__AndExpression__OperatorAssignment_1_1 )
+            // InternalScope.g:8653:2: rule__AndExpression__OperatorAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__AndExpression__OperatorAssignment_1_1_in_rule__AndExpression__Group_1__1__Impl17558);
+            pushFollow(FOLLOW_2);
             rule__AndExpression__OperatorAssignment_1_1();
 
             state._fsp--;
@@ -25021,16 +25021,16 @@ public final void rule__AndExpression__Group_1__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__AndExpression__Group_1__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8663:1: rule__AndExpression__Group_1__2 : rule__AndExpression__Group_1__2__Impl ;
+    // InternalScope.g:8663:1: rule__AndExpression__Group_1__2 : rule__AndExpression__Group_1__2__Impl ;
     public final void rule__AndExpression__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8667:1: ( rule__AndExpression__Group_1__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8668:2: rule__AndExpression__Group_1__2__Impl
+            // InternalScope.g:8667:1: ( rule__AndExpression__Group_1__2__Impl )
+            // InternalScope.g:8668:2: rule__AndExpression__Group_1__2__Impl
             {
-            pushFollow(FOLLOW_rule__AndExpression__Group_1__2__Impl_in_rule__AndExpression__Group_1__217588);
+            pushFollow(FOLLOW_2);
             rule__AndExpression__Group_1__2__Impl();
 
             state._fsp--;
@@ -25054,25 +25054,25 @@ public final void rule__AndExpression__Group_1__2() throws RecognitionException
 
 
     // $ANTLR start "rule__AndExpression__Group_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8674:1: rule__AndExpression__Group_1__2__Impl : ( ( rule__AndExpression__RightAssignment_1_2 ) ) ;
+    // InternalScope.g:8674:1: rule__AndExpression__Group_1__2__Impl : ( ( rule__AndExpression__RightAssignment_1_2 ) ) ;
     public final void rule__AndExpression__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8678:1: ( ( ( rule__AndExpression__RightAssignment_1_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8679:1: ( ( rule__AndExpression__RightAssignment_1_2 ) )
+            // InternalScope.g:8678:1: ( ( ( rule__AndExpression__RightAssignment_1_2 ) ) )
+            // InternalScope.g:8679:1: ( ( rule__AndExpression__RightAssignment_1_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8679:1: ( ( rule__AndExpression__RightAssignment_1_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8680:1: ( rule__AndExpression__RightAssignment_1_2 )
+            // InternalScope.g:8679:1: ( ( rule__AndExpression__RightAssignment_1_2 ) )
+            // InternalScope.g:8680:1: ( rule__AndExpression__RightAssignment_1_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAndExpressionAccess().getRightAssignment_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8681:1: ( rule__AndExpression__RightAssignment_1_2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8681:2: rule__AndExpression__RightAssignment_1_2
+            // InternalScope.g:8681:1: ( rule__AndExpression__RightAssignment_1_2 )
+            // InternalScope.g:8681:2: rule__AndExpression__RightAssignment_1_2
             {
-            pushFollow(FOLLOW_rule__AndExpression__RightAssignment_1_2_in_rule__AndExpression__Group_1__2__Impl17615);
+            pushFollow(FOLLOW_2);
             rule__AndExpression__RightAssignment_1_2();
 
             state._fsp--;
@@ -25105,21 +25105,21 @@ public final void rule__AndExpression__Group_1__2__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__ImpliesExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8697:1: rule__ImpliesExpression__Group__0 : rule__ImpliesExpression__Group__0__Impl rule__ImpliesExpression__Group__1 ;
+    // InternalScope.g:8697:1: rule__ImpliesExpression__Group__0 : rule__ImpliesExpression__Group__0__Impl rule__ImpliesExpression__Group__1 ;
     public final void rule__ImpliesExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8701:1: ( rule__ImpliesExpression__Group__0__Impl rule__ImpliesExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8702:2: rule__ImpliesExpression__Group__0__Impl rule__ImpliesExpression__Group__1
+            // InternalScope.g:8701:1: ( rule__ImpliesExpression__Group__0__Impl rule__ImpliesExpression__Group__1 )
+            // InternalScope.g:8702:2: rule__ImpliesExpression__Group__0__Impl rule__ImpliesExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__ImpliesExpression__Group__0__Impl_in_rule__ImpliesExpression__Group__017651);
+            pushFollow(FOLLOW_62);
             rule__ImpliesExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ImpliesExpression__Group__1_in_rule__ImpliesExpression__Group__017654);
+            pushFollow(FOLLOW_2);
             rule__ImpliesExpression__Group__1();
 
             state._fsp--;
@@ -25143,22 +25143,22 @@ public final void rule__ImpliesExpression__Group__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ImpliesExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8709:1: rule__ImpliesExpression__Group__0__Impl : ( ruleRelationalExpression ) ;
+    // InternalScope.g:8709:1: rule__ImpliesExpression__Group__0__Impl : ( ruleRelationalExpression ) ;
     public final void rule__ImpliesExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8713:1: ( ( ruleRelationalExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8714:1: ( ruleRelationalExpression )
+            // InternalScope.g:8713:1: ( ( ruleRelationalExpression ) )
+            // InternalScope.g:8714:1: ( ruleRelationalExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8714:1: ( ruleRelationalExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8715:1: ruleRelationalExpression
+            // InternalScope.g:8714:1: ( ruleRelationalExpression )
+            // InternalScope.g:8715:1: ruleRelationalExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImpliesExpressionAccess().getRelationalExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleRelationalExpression_in_rule__ImpliesExpression__Group__0__Impl17681);
+            pushFollow(FOLLOW_2);
             ruleRelationalExpression();
 
             state._fsp--;
@@ -25188,16 +25188,16 @@ public final void rule__ImpliesExpression__Group__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__ImpliesExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8726:1: rule__ImpliesExpression__Group__1 : rule__ImpliesExpression__Group__1__Impl ;
+    // InternalScope.g:8726:1: rule__ImpliesExpression__Group__1 : rule__ImpliesExpression__Group__1__Impl ;
     public final void rule__ImpliesExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8730:1: ( rule__ImpliesExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8731:2: rule__ImpliesExpression__Group__1__Impl
+            // InternalScope.g:8730:1: ( rule__ImpliesExpression__Group__1__Impl )
+            // InternalScope.g:8731:2: rule__ImpliesExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__ImpliesExpression__Group__1__Impl_in_rule__ImpliesExpression__Group__117710);
+            pushFollow(FOLLOW_2);
             rule__ImpliesExpression__Group__1__Impl();
 
             state._fsp--;
@@ -25221,22 +25221,22 @@ public final void rule__ImpliesExpression__Group__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ImpliesExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8737:1: rule__ImpliesExpression__Group__1__Impl : ( ( rule__ImpliesExpression__Group_1__0 )* ) ;
+    // InternalScope.g:8737:1: rule__ImpliesExpression__Group__1__Impl : ( ( rule__ImpliesExpression__Group_1__0 )* ) ;
     public final void rule__ImpliesExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8741:1: ( ( ( rule__ImpliesExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8742:1: ( ( rule__ImpliesExpression__Group_1__0 )* )
+            // InternalScope.g:8741:1: ( ( ( rule__ImpliesExpression__Group_1__0 )* ) )
+            // InternalScope.g:8742:1: ( ( rule__ImpliesExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8742:1: ( ( rule__ImpliesExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8743:1: ( rule__ImpliesExpression__Group_1__0 )*
+            // InternalScope.g:8742:1: ( ( rule__ImpliesExpression__Group_1__0 )* )
+            // InternalScope.g:8743:1: ( rule__ImpliesExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImpliesExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8744:1: ( rule__ImpliesExpression__Group_1__0 )*
+            // InternalScope.g:8744:1: ( rule__ImpliesExpression__Group_1__0 )*
             loop62:
             do {
                 int alt62=2;
@@ -25249,9 +25249,9 @@ public final void rule__ImpliesExpression__Group__1__Impl() throws RecognitionEx
 
                 switch (alt62) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8744:2: rule__ImpliesExpression__Group_1__0
+            	    // InternalScope.g:8744:2: rule__ImpliesExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__ImpliesExpression__Group_1__0_in_rule__ImpliesExpression__Group__1__Impl17737);
+            	    pushFollow(FOLLOW_63);
             	    rule__ImpliesExpression__Group_1__0();
 
             	    state._fsp--;
@@ -25290,21 +25290,21 @@ public final void rule__ImpliesExpression__Group__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__ImpliesExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8758:1: rule__ImpliesExpression__Group_1__0 : rule__ImpliesExpression__Group_1__0__Impl rule__ImpliesExpression__Group_1__1 ;
+    // InternalScope.g:8758:1: rule__ImpliesExpression__Group_1__0 : rule__ImpliesExpression__Group_1__0__Impl rule__ImpliesExpression__Group_1__1 ;
     public final void rule__ImpliesExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8762:1: ( rule__ImpliesExpression__Group_1__0__Impl rule__ImpliesExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8763:2: rule__ImpliesExpression__Group_1__0__Impl rule__ImpliesExpression__Group_1__1
+            // InternalScope.g:8762:1: ( rule__ImpliesExpression__Group_1__0__Impl rule__ImpliesExpression__Group_1__1 )
+            // InternalScope.g:8763:2: rule__ImpliesExpression__Group_1__0__Impl rule__ImpliesExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__ImpliesExpression__Group_1__0__Impl_in_rule__ImpliesExpression__Group_1__017772);
+            pushFollow(FOLLOW_62);
             rule__ImpliesExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ImpliesExpression__Group_1__1_in_rule__ImpliesExpression__Group_1__017775);
+            pushFollow(FOLLOW_2);
             rule__ImpliesExpression__Group_1__1();
 
             state._fsp--;
@@ -25328,23 +25328,23 @@ public final void rule__ImpliesExpression__Group_1__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ImpliesExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8770:1: rule__ImpliesExpression__Group_1__0__Impl : ( () ) ;
+    // InternalScope.g:8770:1: rule__ImpliesExpression__Group_1__0__Impl : ( () ) ;
     public final void rule__ImpliesExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8774:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8775:1: ( () )
+            // InternalScope.g:8774:1: ( ( () ) )
+            // InternalScope.g:8775:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8775:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8776:1: ()
+            // InternalScope.g:8775:1: ( () )
+            // InternalScope.g:8776:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImpliesExpressionAccess().getBooleanOperationLeftAction_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8777:1: ()
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8779:1: 
+            // InternalScope.g:8777:1: ()
+            // InternalScope.g:8779:1: 
             {
             }
 
@@ -25369,21 +25369,21 @@ public final void rule__ImpliesExpression__Group_1__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__ImpliesExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8789:1: rule__ImpliesExpression__Group_1__1 : rule__ImpliesExpression__Group_1__1__Impl rule__ImpliesExpression__Group_1__2 ;
+    // InternalScope.g:8789:1: rule__ImpliesExpression__Group_1__1 : rule__ImpliesExpression__Group_1__1__Impl rule__ImpliesExpression__Group_1__2 ;
     public final void rule__ImpliesExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8793:1: ( rule__ImpliesExpression__Group_1__1__Impl rule__ImpliesExpression__Group_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8794:2: rule__ImpliesExpression__Group_1__1__Impl rule__ImpliesExpression__Group_1__2
+            // InternalScope.g:8793:1: ( rule__ImpliesExpression__Group_1__1__Impl rule__ImpliesExpression__Group_1__2 )
+            // InternalScope.g:8794:2: rule__ImpliesExpression__Group_1__1__Impl rule__ImpliesExpression__Group_1__2
             {
-            pushFollow(FOLLOW_rule__ImpliesExpression__Group_1__1__Impl_in_rule__ImpliesExpression__Group_1__117833);
+            pushFollow(FOLLOW_57);
             rule__ImpliesExpression__Group_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ImpliesExpression__Group_1__2_in_rule__ImpliesExpression__Group_1__117836);
+            pushFollow(FOLLOW_2);
             rule__ImpliesExpression__Group_1__2();
 
             state._fsp--;
@@ -25407,25 +25407,25 @@ public final void rule__ImpliesExpression__Group_1__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ImpliesExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8801:1: rule__ImpliesExpression__Group_1__1__Impl : ( ( rule__ImpliesExpression__OperatorAssignment_1_1 ) ) ;
+    // InternalScope.g:8801:1: rule__ImpliesExpression__Group_1__1__Impl : ( ( rule__ImpliesExpression__OperatorAssignment_1_1 ) ) ;
     public final void rule__ImpliesExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8805:1: ( ( ( rule__ImpliesExpression__OperatorAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8806:1: ( ( rule__ImpliesExpression__OperatorAssignment_1_1 ) )
+            // InternalScope.g:8805:1: ( ( ( rule__ImpliesExpression__OperatorAssignment_1_1 ) ) )
+            // InternalScope.g:8806:1: ( ( rule__ImpliesExpression__OperatorAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8806:1: ( ( rule__ImpliesExpression__OperatorAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8807:1: ( rule__ImpliesExpression__OperatorAssignment_1_1 )
+            // InternalScope.g:8806:1: ( ( rule__ImpliesExpression__OperatorAssignment_1_1 ) )
+            // InternalScope.g:8807:1: ( rule__ImpliesExpression__OperatorAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImpliesExpressionAccess().getOperatorAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8808:1: ( rule__ImpliesExpression__OperatorAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8808:2: rule__ImpliesExpression__OperatorAssignment_1_1
+            // InternalScope.g:8808:1: ( rule__ImpliesExpression__OperatorAssignment_1_1 )
+            // InternalScope.g:8808:2: rule__ImpliesExpression__OperatorAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__ImpliesExpression__OperatorAssignment_1_1_in_rule__ImpliesExpression__Group_1__1__Impl17863);
+            pushFollow(FOLLOW_2);
             rule__ImpliesExpression__OperatorAssignment_1_1();
 
             state._fsp--;
@@ -25458,16 +25458,16 @@ public final void rule__ImpliesExpression__Group_1__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__ImpliesExpression__Group_1__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8818:1: rule__ImpliesExpression__Group_1__2 : rule__ImpliesExpression__Group_1__2__Impl ;
+    // InternalScope.g:8818:1: rule__ImpliesExpression__Group_1__2 : rule__ImpliesExpression__Group_1__2__Impl ;
     public final void rule__ImpliesExpression__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8822:1: ( rule__ImpliesExpression__Group_1__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8823:2: rule__ImpliesExpression__Group_1__2__Impl
+            // InternalScope.g:8822:1: ( rule__ImpliesExpression__Group_1__2__Impl )
+            // InternalScope.g:8823:2: rule__ImpliesExpression__Group_1__2__Impl
             {
-            pushFollow(FOLLOW_rule__ImpliesExpression__Group_1__2__Impl_in_rule__ImpliesExpression__Group_1__217893);
+            pushFollow(FOLLOW_2);
             rule__ImpliesExpression__Group_1__2__Impl();
 
             state._fsp--;
@@ -25491,25 +25491,25 @@ public final void rule__ImpliesExpression__Group_1__2() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ImpliesExpression__Group_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8829:1: rule__ImpliesExpression__Group_1__2__Impl : ( ( rule__ImpliesExpression__RightAssignment_1_2 ) ) ;
+    // InternalScope.g:8829:1: rule__ImpliesExpression__Group_1__2__Impl : ( ( rule__ImpliesExpression__RightAssignment_1_2 ) ) ;
     public final void rule__ImpliesExpression__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8833:1: ( ( ( rule__ImpliesExpression__RightAssignment_1_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8834:1: ( ( rule__ImpliesExpression__RightAssignment_1_2 ) )
+            // InternalScope.g:8833:1: ( ( ( rule__ImpliesExpression__RightAssignment_1_2 ) ) )
+            // InternalScope.g:8834:1: ( ( rule__ImpliesExpression__RightAssignment_1_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8834:1: ( ( rule__ImpliesExpression__RightAssignment_1_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8835:1: ( rule__ImpliesExpression__RightAssignment_1_2 )
+            // InternalScope.g:8834:1: ( ( rule__ImpliesExpression__RightAssignment_1_2 ) )
+            // InternalScope.g:8835:1: ( rule__ImpliesExpression__RightAssignment_1_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImpliesExpressionAccess().getRightAssignment_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8836:1: ( rule__ImpliesExpression__RightAssignment_1_2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8836:2: rule__ImpliesExpression__RightAssignment_1_2
+            // InternalScope.g:8836:1: ( rule__ImpliesExpression__RightAssignment_1_2 )
+            // InternalScope.g:8836:2: rule__ImpliesExpression__RightAssignment_1_2
             {
-            pushFollow(FOLLOW_rule__ImpliesExpression__RightAssignment_1_2_in_rule__ImpliesExpression__Group_1__2__Impl17920);
+            pushFollow(FOLLOW_2);
             rule__ImpliesExpression__RightAssignment_1_2();
 
             state._fsp--;
@@ -25542,21 +25542,21 @@ public final void rule__ImpliesExpression__Group_1__2__Impl() throws Recognition
 
 
     // $ANTLR start "rule__RelationalExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8852:1: rule__RelationalExpression__Group__0 : rule__RelationalExpression__Group__0__Impl rule__RelationalExpression__Group__1 ;
+    // InternalScope.g:8852:1: rule__RelationalExpression__Group__0 : rule__RelationalExpression__Group__0__Impl rule__RelationalExpression__Group__1 ;
     public final void rule__RelationalExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8856:1: ( rule__RelationalExpression__Group__0__Impl rule__RelationalExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8857:2: rule__RelationalExpression__Group__0__Impl rule__RelationalExpression__Group__1
+            // InternalScope.g:8856:1: ( rule__RelationalExpression__Group__0__Impl rule__RelationalExpression__Group__1 )
+            // InternalScope.g:8857:2: rule__RelationalExpression__Group__0__Impl rule__RelationalExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__RelationalExpression__Group__0__Impl_in_rule__RelationalExpression__Group__017956);
+            pushFollow(FOLLOW_64);
             rule__RelationalExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__RelationalExpression__Group__1_in_rule__RelationalExpression__Group__017959);
+            pushFollow(FOLLOW_2);
             rule__RelationalExpression__Group__1();
 
             state._fsp--;
@@ -25580,22 +25580,22 @@ public final void rule__RelationalExpression__Group__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__RelationalExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8864:1: rule__RelationalExpression__Group__0__Impl : ( ruleAdditiveExpression ) ;
+    // InternalScope.g:8864:1: rule__RelationalExpression__Group__0__Impl : ( ruleAdditiveExpression ) ;
     public final void rule__RelationalExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8868:1: ( ( ruleAdditiveExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8869:1: ( ruleAdditiveExpression )
+            // InternalScope.g:8868:1: ( ( ruleAdditiveExpression ) )
+            // InternalScope.g:8869:1: ( ruleAdditiveExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8869:1: ( ruleAdditiveExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8870:1: ruleAdditiveExpression
+            // InternalScope.g:8869:1: ( ruleAdditiveExpression )
+            // InternalScope.g:8870:1: ruleAdditiveExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRelationalExpressionAccess().getAdditiveExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleAdditiveExpression_in_rule__RelationalExpression__Group__0__Impl17986);
+            pushFollow(FOLLOW_2);
             ruleAdditiveExpression();
 
             state._fsp--;
@@ -25625,16 +25625,16 @@ public final void rule__RelationalExpression__Group__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__RelationalExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8881:1: rule__RelationalExpression__Group__1 : rule__RelationalExpression__Group__1__Impl ;
+    // InternalScope.g:8881:1: rule__RelationalExpression__Group__1 : rule__RelationalExpression__Group__1__Impl ;
     public final void rule__RelationalExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8885:1: ( rule__RelationalExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8886:2: rule__RelationalExpression__Group__1__Impl
+            // InternalScope.g:8885:1: ( rule__RelationalExpression__Group__1__Impl )
+            // InternalScope.g:8886:2: rule__RelationalExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__RelationalExpression__Group__1__Impl_in_rule__RelationalExpression__Group__118015);
+            pushFollow(FOLLOW_2);
             rule__RelationalExpression__Group__1__Impl();
 
             state._fsp--;
@@ -25658,22 +25658,22 @@ public final void rule__RelationalExpression__Group__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__RelationalExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8892:1: rule__RelationalExpression__Group__1__Impl : ( ( rule__RelationalExpression__Group_1__0 )* ) ;
+    // InternalScope.g:8892:1: rule__RelationalExpression__Group__1__Impl : ( ( rule__RelationalExpression__Group_1__0 )* ) ;
     public final void rule__RelationalExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8896:1: ( ( ( rule__RelationalExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8897:1: ( ( rule__RelationalExpression__Group_1__0 )* )
+            // InternalScope.g:8896:1: ( ( ( rule__RelationalExpression__Group_1__0 )* ) )
+            // InternalScope.g:8897:1: ( ( rule__RelationalExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8897:1: ( ( rule__RelationalExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8898:1: ( rule__RelationalExpression__Group_1__0 )*
+            // InternalScope.g:8897:1: ( ( rule__RelationalExpression__Group_1__0 )* )
+            // InternalScope.g:8898:1: ( rule__RelationalExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRelationalExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8899:1: ( rule__RelationalExpression__Group_1__0 )*
+            // InternalScope.g:8899:1: ( rule__RelationalExpression__Group_1__0 )*
             loop63:
             do {
                 int alt63=2;
@@ -25686,9 +25686,9 @@ public final void rule__RelationalExpression__Group__1__Impl() throws Recognitio
 
                 switch (alt63) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8899:2: rule__RelationalExpression__Group_1__0
+            	    // InternalScope.g:8899:2: rule__RelationalExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__RelationalExpression__Group_1__0_in_rule__RelationalExpression__Group__1__Impl18042);
+            	    pushFollow(FOLLOW_65);
             	    rule__RelationalExpression__Group_1__0();
 
             	    state._fsp--;
@@ -25727,21 +25727,21 @@ public final void rule__RelationalExpression__Group__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__RelationalExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8913:1: rule__RelationalExpression__Group_1__0 : rule__RelationalExpression__Group_1__0__Impl rule__RelationalExpression__Group_1__1 ;
+    // InternalScope.g:8913:1: rule__RelationalExpression__Group_1__0 : rule__RelationalExpression__Group_1__0__Impl rule__RelationalExpression__Group_1__1 ;
     public final void rule__RelationalExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8917:1: ( rule__RelationalExpression__Group_1__0__Impl rule__RelationalExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8918:2: rule__RelationalExpression__Group_1__0__Impl rule__RelationalExpression__Group_1__1
+            // InternalScope.g:8917:1: ( rule__RelationalExpression__Group_1__0__Impl rule__RelationalExpression__Group_1__1 )
+            // InternalScope.g:8918:2: rule__RelationalExpression__Group_1__0__Impl rule__RelationalExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__RelationalExpression__Group_1__0__Impl_in_rule__RelationalExpression__Group_1__018077);
+            pushFollow(FOLLOW_64);
             rule__RelationalExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__RelationalExpression__Group_1__1_in_rule__RelationalExpression__Group_1__018080);
+            pushFollow(FOLLOW_2);
             rule__RelationalExpression__Group_1__1();
 
             state._fsp--;
@@ -25765,23 +25765,23 @@ public final void rule__RelationalExpression__Group_1__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__RelationalExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8925:1: rule__RelationalExpression__Group_1__0__Impl : ( () ) ;
+    // InternalScope.g:8925:1: rule__RelationalExpression__Group_1__0__Impl : ( () ) ;
     public final void rule__RelationalExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8929:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8930:1: ( () )
+            // InternalScope.g:8929:1: ( ( () ) )
+            // InternalScope.g:8930:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8930:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8931:1: ()
+            // InternalScope.g:8930:1: ( () )
+            // InternalScope.g:8931:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRelationalExpressionAccess().getBooleanOperationLeftAction_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8932:1: ()
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8934:1: 
+            // InternalScope.g:8932:1: ()
+            // InternalScope.g:8934:1: 
             {
             }
 
@@ -25806,21 +25806,21 @@ public final void rule__RelationalExpression__Group_1__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__RelationalExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8944:1: rule__RelationalExpression__Group_1__1 : rule__RelationalExpression__Group_1__1__Impl rule__RelationalExpression__Group_1__2 ;
+    // InternalScope.g:8944:1: rule__RelationalExpression__Group_1__1 : rule__RelationalExpression__Group_1__1__Impl rule__RelationalExpression__Group_1__2 ;
     public final void rule__RelationalExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8948:1: ( rule__RelationalExpression__Group_1__1__Impl rule__RelationalExpression__Group_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8949:2: rule__RelationalExpression__Group_1__1__Impl rule__RelationalExpression__Group_1__2
+            // InternalScope.g:8948:1: ( rule__RelationalExpression__Group_1__1__Impl rule__RelationalExpression__Group_1__2 )
+            // InternalScope.g:8949:2: rule__RelationalExpression__Group_1__1__Impl rule__RelationalExpression__Group_1__2
             {
-            pushFollow(FOLLOW_rule__RelationalExpression__Group_1__1__Impl_in_rule__RelationalExpression__Group_1__118138);
+            pushFollow(FOLLOW_57);
             rule__RelationalExpression__Group_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__RelationalExpression__Group_1__2_in_rule__RelationalExpression__Group_1__118141);
+            pushFollow(FOLLOW_2);
             rule__RelationalExpression__Group_1__2();
 
             state._fsp--;
@@ -25844,25 +25844,25 @@ public final void rule__RelationalExpression__Group_1__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__RelationalExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8956:1: rule__RelationalExpression__Group_1__1__Impl : ( ( rule__RelationalExpression__OperatorAssignment_1_1 ) ) ;
+    // InternalScope.g:8956:1: rule__RelationalExpression__Group_1__1__Impl : ( ( rule__RelationalExpression__OperatorAssignment_1_1 ) ) ;
     public final void rule__RelationalExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8960:1: ( ( ( rule__RelationalExpression__OperatorAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8961:1: ( ( rule__RelationalExpression__OperatorAssignment_1_1 ) )
+            // InternalScope.g:8960:1: ( ( ( rule__RelationalExpression__OperatorAssignment_1_1 ) ) )
+            // InternalScope.g:8961:1: ( ( rule__RelationalExpression__OperatorAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8961:1: ( ( rule__RelationalExpression__OperatorAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8962:1: ( rule__RelationalExpression__OperatorAssignment_1_1 )
+            // InternalScope.g:8961:1: ( ( rule__RelationalExpression__OperatorAssignment_1_1 ) )
+            // InternalScope.g:8962:1: ( rule__RelationalExpression__OperatorAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRelationalExpressionAccess().getOperatorAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8963:1: ( rule__RelationalExpression__OperatorAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8963:2: rule__RelationalExpression__OperatorAssignment_1_1
+            // InternalScope.g:8963:1: ( rule__RelationalExpression__OperatorAssignment_1_1 )
+            // InternalScope.g:8963:2: rule__RelationalExpression__OperatorAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__RelationalExpression__OperatorAssignment_1_1_in_rule__RelationalExpression__Group_1__1__Impl18168);
+            pushFollow(FOLLOW_2);
             rule__RelationalExpression__OperatorAssignment_1_1();
 
             state._fsp--;
@@ -25895,16 +25895,16 @@ public final void rule__RelationalExpression__Group_1__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__RelationalExpression__Group_1__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8973:1: rule__RelationalExpression__Group_1__2 : rule__RelationalExpression__Group_1__2__Impl ;
+    // InternalScope.g:8973:1: rule__RelationalExpression__Group_1__2 : rule__RelationalExpression__Group_1__2__Impl ;
     public final void rule__RelationalExpression__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8977:1: ( rule__RelationalExpression__Group_1__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8978:2: rule__RelationalExpression__Group_1__2__Impl
+            // InternalScope.g:8977:1: ( rule__RelationalExpression__Group_1__2__Impl )
+            // InternalScope.g:8978:2: rule__RelationalExpression__Group_1__2__Impl
             {
-            pushFollow(FOLLOW_rule__RelationalExpression__Group_1__2__Impl_in_rule__RelationalExpression__Group_1__218198);
+            pushFollow(FOLLOW_2);
             rule__RelationalExpression__Group_1__2__Impl();
 
             state._fsp--;
@@ -25928,25 +25928,25 @@ public final void rule__RelationalExpression__Group_1__2() throws RecognitionExc
 
 
     // $ANTLR start "rule__RelationalExpression__Group_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8984:1: rule__RelationalExpression__Group_1__2__Impl : ( ( rule__RelationalExpression__RightAssignment_1_2 ) ) ;
+    // InternalScope.g:8984:1: rule__RelationalExpression__Group_1__2__Impl : ( ( rule__RelationalExpression__RightAssignment_1_2 ) ) ;
     public final void rule__RelationalExpression__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8988:1: ( ( ( rule__RelationalExpression__RightAssignment_1_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8989:1: ( ( rule__RelationalExpression__RightAssignment_1_2 ) )
+            // InternalScope.g:8988:1: ( ( ( rule__RelationalExpression__RightAssignment_1_2 ) ) )
+            // InternalScope.g:8989:1: ( ( rule__RelationalExpression__RightAssignment_1_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8989:1: ( ( rule__RelationalExpression__RightAssignment_1_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8990:1: ( rule__RelationalExpression__RightAssignment_1_2 )
+            // InternalScope.g:8989:1: ( ( rule__RelationalExpression__RightAssignment_1_2 ) )
+            // InternalScope.g:8990:1: ( rule__RelationalExpression__RightAssignment_1_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRelationalExpressionAccess().getRightAssignment_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8991:1: ( rule__RelationalExpression__RightAssignment_1_2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:8991:2: rule__RelationalExpression__RightAssignment_1_2
+            // InternalScope.g:8991:1: ( rule__RelationalExpression__RightAssignment_1_2 )
+            // InternalScope.g:8991:2: rule__RelationalExpression__RightAssignment_1_2
             {
-            pushFollow(FOLLOW_rule__RelationalExpression__RightAssignment_1_2_in_rule__RelationalExpression__Group_1__2__Impl18225);
+            pushFollow(FOLLOW_2);
             rule__RelationalExpression__RightAssignment_1_2();
 
             state._fsp--;
@@ -25979,21 +25979,21 @@ public final void rule__RelationalExpression__Group_1__2__Impl() throws Recognit
 
 
     // $ANTLR start "rule__AdditiveExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9007:1: rule__AdditiveExpression__Group__0 : rule__AdditiveExpression__Group__0__Impl rule__AdditiveExpression__Group__1 ;
+    // InternalScope.g:9007:1: rule__AdditiveExpression__Group__0 : rule__AdditiveExpression__Group__0__Impl rule__AdditiveExpression__Group__1 ;
     public final void rule__AdditiveExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9011:1: ( rule__AdditiveExpression__Group__0__Impl rule__AdditiveExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9012:2: rule__AdditiveExpression__Group__0__Impl rule__AdditiveExpression__Group__1
+            // InternalScope.g:9011:1: ( rule__AdditiveExpression__Group__0__Impl rule__AdditiveExpression__Group__1 )
+            // InternalScope.g:9012:2: rule__AdditiveExpression__Group__0__Impl rule__AdditiveExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__AdditiveExpression__Group__0__Impl_in_rule__AdditiveExpression__Group__018261);
+            pushFollow(FOLLOW_66);
             rule__AdditiveExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__AdditiveExpression__Group__1_in_rule__AdditiveExpression__Group__018264);
+            pushFollow(FOLLOW_2);
             rule__AdditiveExpression__Group__1();
 
             state._fsp--;
@@ -26017,22 +26017,22 @@ public final void rule__AdditiveExpression__Group__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__AdditiveExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9019:1: rule__AdditiveExpression__Group__0__Impl : ( ruleMultiplicativeExpression ) ;
+    // InternalScope.g:9019:1: rule__AdditiveExpression__Group__0__Impl : ( ruleMultiplicativeExpression ) ;
     public final void rule__AdditiveExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9023:1: ( ( ruleMultiplicativeExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9024:1: ( ruleMultiplicativeExpression )
+            // InternalScope.g:9023:1: ( ( ruleMultiplicativeExpression ) )
+            // InternalScope.g:9024:1: ( ruleMultiplicativeExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9024:1: ( ruleMultiplicativeExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9025:1: ruleMultiplicativeExpression
+            // InternalScope.g:9024:1: ( ruleMultiplicativeExpression )
+            // InternalScope.g:9025:1: ruleMultiplicativeExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAdditiveExpressionAccess().getMultiplicativeExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleMultiplicativeExpression_in_rule__AdditiveExpression__Group__0__Impl18291);
+            pushFollow(FOLLOW_2);
             ruleMultiplicativeExpression();
 
             state._fsp--;
@@ -26062,16 +26062,16 @@ public final void rule__AdditiveExpression__Group__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__AdditiveExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9036:1: rule__AdditiveExpression__Group__1 : rule__AdditiveExpression__Group__1__Impl ;
+    // InternalScope.g:9036:1: rule__AdditiveExpression__Group__1 : rule__AdditiveExpression__Group__1__Impl ;
     public final void rule__AdditiveExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9040:1: ( rule__AdditiveExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9041:2: rule__AdditiveExpression__Group__1__Impl
+            // InternalScope.g:9040:1: ( rule__AdditiveExpression__Group__1__Impl )
+            // InternalScope.g:9041:2: rule__AdditiveExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__AdditiveExpression__Group__1__Impl_in_rule__AdditiveExpression__Group__118320);
+            pushFollow(FOLLOW_2);
             rule__AdditiveExpression__Group__1__Impl();
 
             state._fsp--;
@@ -26095,22 +26095,22 @@ public final void rule__AdditiveExpression__Group__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__AdditiveExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9047:1: rule__AdditiveExpression__Group__1__Impl : ( ( rule__AdditiveExpression__Group_1__0 )* ) ;
+    // InternalScope.g:9047:1: rule__AdditiveExpression__Group__1__Impl : ( ( rule__AdditiveExpression__Group_1__0 )* ) ;
     public final void rule__AdditiveExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9051:1: ( ( ( rule__AdditiveExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9052:1: ( ( rule__AdditiveExpression__Group_1__0 )* )
+            // InternalScope.g:9051:1: ( ( ( rule__AdditiveExpression__Group_1__0 )* ) )
+            // InternalScope.g:9052:1: ( ( rule__AdditiveExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9052:1: ( ( rule__AdditiveExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9053:1: ( rule__AdditiveExpression__Group_1__0 )*
+            // InternalScope.g:9052:1: ( ( rule__AdditiveExpression__Group_1__0 )* )
+            // InternalScope.g:9053:1: ( rule__AdditiveExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAdditiveExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9054:1: ( rule__AdditiveExpression__Group_1__0 )*
+            // InternalScope.g:9054:1: ( rule__AdditiveExpression__Group_1__0 )*
             loop64:
             do {
                 int alt64=2;
@@ -26123,9 +26123,9 @@ public final void rule__AdditiveExpression__Group__1__Impl() throws RecognitionE
 
                 switch (alt64) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9054:2: rule__AdditiveExpression__Group_1__0
+            	    // InternalScope.g:9054:2: rule__AdditiveExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__AdditiveExpression__Group_1__0_in_rule__AdditiveExpression__Group__1__Impl18347);
+            	    pushFollow(FOLLOW_67);
             	    rule__AdditiveExpression__Group_1__0();
 
             	    state._fsp--;
@@ -26164,21 +26164,21 @@ public final void rule__AdditiveExpression__Group__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__AdditiveExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9068:1: rule__AdditiveExpression__Group_1__0 : rule__AdditiveExpression__Group_1__0__Impl rule__AdditiveExpression__Group_1__1 ;
+    // InternalScope.g:9068:1: rule__AdditiveExpression__Group_1__0 : rule__AdditiveExpression__Group_1__0__Impl rule__AdditiveExpression__Group_1__1 ;
     public final void rule__AdditiveExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9072:1: ( rule__AdditiveExpression__Group_1__0__Impl rule__AdditiveExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9073:2: rule__AdditiveExpression__Group_1__0__Impl rule__AdditiveExpression__Group_1__1
+            // InternalScope.g:9072:1: ( rule__AdditiveExpression__Group_1__0__Impl rule__AdditiveExpression__Group_1__1 )
+            // InternalScope.g:9073:2: rule__AdditiveExpression__Group_1__0__Impl rule__AdditiveExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__AdditiveExpression__Group_1__0__Impl_in_rule__AdditiveExpression__Group_1__018382);
+            pushFollow(FOLLOW_66);
             rule__AdditiveExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__AdditiveExpression__Group_1__1_in_rule__AdditiveExpression__Group_1__018385);
+            pushFollow(FOLLOW_2);
             rule__AdditiveExpression__Group_1__1();
 
             state._fsp--;
@@ -26202,23 +26202,23 @@ public final void rule__AdditiveExpression__Group_1__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__AdditiveExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9080:1: rule__AdditiveExpression__Group_1__0__Impl : ( () ) ;
+    // InternalScope.g:9080:1: rule__AdditiveExpression__Group_1__0__Impl : ( () ) ;
     public final void rule__AdditiveExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9084:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9085:1: ( () )
+            // InternalScope.g:9084:1: ( ( () ) )
+            // InternalScope.g:9085:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9085:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9086:1: ()
+            // InternalScope.g:9085:1: ( () )
+            // InternalScope.g:9086:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAdditiveExpressionAccess().getOperationCallParamsAction_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9087:1: ()
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9089:1: 
+            // InternalScope.g:9087:1: ()
+            // InternalScope.g:9089:1: 
             {
             }
 
@@ -26243,21 +26243,21 @@ public final void rule__AdditiveExpression__Group_1__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__AdditiveExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9099:1: rule__AdditiveExpression__Group_1__1 : rule__AdditiveExpression__Group_1__1__Impl rule__AdditiveExpression__Group_1__2 ;
+    // InternalScope.g:9099:1: rule__AdditiveExpression__Group_1__1 : rule__AdditiveExpression__Group_1__1__Impl rule__AdditiveExpression__Group_1__2 ;
     public final void rule__AdditiveExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9103:1: ( rule__AdditiveExpression__Group_1__1__Impl rule__AdditiveExpression__Group_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9104:2: rule__AdditiveExpression__Group_1__1__Impl rule__AdditiveExpression__Group_1__2
+            // InternalScope.g:9103:1: ( rule__AdditiveExpression__Group_1__1__Impl rule__AdditiveExpression__Group_1__2 )
+            // InternalScope.g:9104:2: rule__AdditiveExpression__Group_1__1__Impl rule__AdditiveExpression__Group_1__2
             {
-            pushFollow(FOLLOW_rule__AdditiveExpression__Group_1__1__Impl_in_rule__AdditiveExpression__Group_1__118443);
+            pushFollow(FOLLOW_57);
             rule__AdditiveExpression__Group_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__AdditiveExpression__Group_1__2_in_rule__AdditiveExpression__Group_1__118446);
+            pushFollow(FOLLOW_2);
             rule__AdditiveExpression__Group_1__2();
 
             state._fsp--;
@@ -26281,25 +26281,25 @@ public final void rule__AdditiveExpression__Group_1__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__AdditiveExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9111:1: rule__AdditiveExpression__Group_1__1__Impl : ( ( rule__AdditiveExpression__NameAssignment_1_1 ) ) ;
+    // InternalScope.g:9111:1: rule__AdditiveExpression__Group_1__1__Impl : ( ( rule__AdditiveExpression__NameAssignment_1_1 ) ) ;
     public final void rule__AdditiveExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9115:1: ( ( ( rule__AdditiveExpression__NameAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9116:1: ( ( rule__AdditiveExpression__NameAssignment_1_1 ) )
+            // InternalScope.g:9115:1: ( ( ( rule__AdditiveExpression__NameAssignment_1_1 ) ) )
+            // InternalScope.g:9116:1: ( ( rule__AdditiveExpression__NameAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9116:1: ( ( rule__AdditiveExpression__NameAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9117:1: ( rule__AdditiveExpression__NameAssignment_1_1 )
+            // InternalScope.g:9116:1: ( ( rule__AdditiveExpression__NameAssignment_1_1 ) )
+            // InternalScope.g:9117:1: ( rule__AdditiveExpression__NameAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAdditiveExpressionAccess().getNameAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9118:1: ( rule__AdditiveExpression__NameAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9118:2: rule__AdditiveExpression__NameAssignment_1_1
+            // InternalScope.g:9118:1: ( rule__AdditiveExpression__NameAssignment_1_1 )
+            // InternalScope.g:9118:2: rule__AdditiveExpression__NameAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__AdditiveExpression__NameAssignment_1_1_in_rule__AdditiveExpression__Group_1__1__Impl18473);
+            pushFollow(FOLLOW_2);
             rule__AdditiveExpression__NameAssignment_1_1();
 
             state._fsp--;
@@ -26332,16 +26332,16 @@ public final void rule__AdditiveExpression__Group_1__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__AdditiveExpression__Group_1__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9128:1: rule__AdditiveExpression__Group_1__2 : rule__AdditiveExpression__Group_1__2__Impl ;
+    // InternalScope.g:9128:1: rule__AdditiveExpression__Group_1__2 : rule__AdditiveExpression__Group_1__2__Impl ;
     public final void rule__AdditiveExpression__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9132:1: ( rule__AdditiveExpression__Group_1__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9133:2: rule__AdditiveExpression__Group_1__2__Impl
+            // InternalScope.g:9132:1: ( rule__AdditiveExpression__Group_1__2__Impl )
+            // InternalScope.g:9133:2: rule__AdditiveExpression__Group_1__2__Impl
             {
-            pushFollow(FOLLOW_rule__AdditiveExpression__Group_1__2__Impl_in_rule__AdditiveExpression__Group_1__218503);
+            pushFollow(FOLLOW_2);
             rule__AdditiveExpression__Group_1__2__Impl();
 
             state._fsp--;
@@ -26365,25 +26365,25 @@ public final void rule__AdditiveExpression__Group_1__2() throws RecognitionExcep
 
 
     // $ANTLR start "rule__AdditiveExpression__Group_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9139:1: rule__AdditiveExpression__Group_1__2__Impl : ( ( rule__AdditiveExpression__ParamsAssignment_1_2 ) ) ;
+    // InternalScope.g:9139:1: rule__AdditiveExpression__Group_1__2__Impl : ( ( rule__AdditiveExpression__ParamsAssignment_1_2 ) ) ;
     public final void rule__AdditiveExpression__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9143:1: ( ( ( rule__AdditiveExpression__ParamsAssignment_1_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9144:1: ( ( rule__AdditiveExpression__ParamsAssignment_1_2 ) )
+            // InternalScope.g:9143:1: ( ( ( rule__AdditiveExpression__ParamsAssignment_1_2 ) ) )
+            // InternalScope.g:9144:1: ( ( rule__AdditiveExpression__ParamsAssignment_1_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9144:1: ( ( rule__AdditiveExpression__ParamsAssignment_1_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9145:1: ( rule__AdditiveExpression__ParamsAssignment_1_2 )
+            // InternalScope.g:9144:1: ( ( rule__AdditiveExpression__ParamsAssignment_1_2 ) )
+            // InternalScope.g:9145:1: ( rule__AdditiveExpression__ParamsAssignment_1_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAdditiveExpressionAccess().getParamsAssignment_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9146:1: ( rule__AdditiveExpression__ParamsAssignment_1_2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9146:2: rule__AdditiveExpression__ParamsAssignment_1_2
+            // InternalScope.g:9146:1: ( rule__AdditiveExpression__ParamsAssignment_1_2 )
+            // InternalScope.g:9146:2: rule__AdditiveExpression__ParamsAssignment_1_2
             {
-            pushFollow(FOLLOW_rule__AdditiveExpression__ParamsAssignment_1_2_in_rule__AdditiveExpression__Group_1__2__Impl18530);
+            pushFollow(FOLLOW_2);
             rule__AdditiveExpression__ParamsAssignment_1_2();
 
             state._fsp--;
@@ -26416,21 +26416,21 @@ public final void rule__AdditiveExpression__Group_1__2__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__MultiplicativeExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9162:1: rule__MultiplicativeExpression__Group__0 : rule__MultiplicativeExpression__Group__0__Impl rule__MultiplicativeExpression__Group__1 ;
+    // InternalScope.g:9162:1: rule__MultiplicativeExpression__Group__0 : rule__MultiplicativeExpression__Group__0__Impl rule__MultiplicativeExpression__Group__1 ;
     public final void rule__MultiplicativeExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9166:1: ( rule__MultiplicativeExpression__Group__0__Impl rule__MultiplicativeExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9167:2: rule__MultiplicativeExpression__Group__0__Impl rule__MultiplicativeExpression__Group__1
+            // InternalScope.g:9166:1: ( rule__MultiplicativeExpression__Group__0__Impl rule__MultiplicativeExpression__Group__1 )
+            // InternalScope.g:9167:2: rule__MultiplicativeExpression__Group__0__Impl rule__MultiplicativeExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__MultiplicativeExpression__Group__0__Impl_in_rule__MultiplicativeExpression__Group__018566);
+            pushFollow(FOLLOW_68);
             rule__MultiplicativeExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__MultiplicativeExpression__Group__1_in_rule__MultiplicativeExpression__Group__018569);
+            pushFollow(FOLLOW_2);
             rule__MultiplicativeExpression__Group__1();
 
             state._fsp--;
@@ -26454,22 +26454,22 @@ public final void rule__MultiplicativeExpression__Group__0() throws RecognitionE
 
 
     // $ANTLR start "rule__MultiplicativeExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9174:1: rule__MultiplicativeExpression__Group__0__Impl : ( ruleUnaryOrInfixExpression ) ;
+    // InternalScope.g:9174:1: rule__MultiplicativeExpression__Group__0__Impl : ( ruleUnaryOrInfixExpression ) ;
     public final void rule__MultiplicativeExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9178:1: ( ( ruleUnaryOrInfixExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9179:1: ( ruleUnaryOrInfixExpression )
+            // InternalScope.g:9178:1: ( ( ruleUnaryOrInfixExpression ) )
+            // InternalScope.g:9179:1: ( ruleUnaryOrInfixExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9179:1: ( ruleUnaryOrInfixExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9180:1: ruleUnaryOrInfixExpression
+            // InternalScope.g:9179:1: ( ruleUnaryOrInfixExpression )
+            // InternalScope.g:9180:1: ruleUnaryOrInfixExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMultiplicativeExpressionAccess().getUnaryOrInfixExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleUnaryOrInfixExpression_in_rule__MultiplicativeExpression__Group__0__Impl18596);
+            pushFollow(FOLLOW_2);
             ruleUnaryOrInfixExpression();
 
             state._fsp--;
@@ -26499,16 +26499,16 @@ public final void rule__MultiplicativeExpression__Group__0__Impl() throws Recogn
 
 
     // $ANTLR start "rule__MultiplicativeExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9191:1: rule__MultiplicativeExpression__Group__1 : rule__MultiplicativeExpression__Group__1__Impl ;
+    // InternalScope.g:9191:1: rule__MultiplicativeExpression__Group__1 : rule__MultiplicativeExpression__Group__1__Impl ;
     public final void rule__MultiplicativeExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9195:1: ( rule__MultiplicativeExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9196:2: rule__MultiplicativeExpression__Group__1__Impl
+            // InternalScope.g:9195:1: ( rule__MultiplicativeExpression__Group__1__Impl )
+            // InternalScope.g:9196:2: rule__MultiplicativeExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__MultiplicativeExpression__Group__1__Impl_in_rule__MultiplicativeExpression__Group__118625);
+            pushFollow(FOLLOW_2);
             rule__MultiplicativeExpression__Group__1__Impl();
 
             state._fsp--;
@@ -26532,22 +26532,22 @@ public final void rule__MultiplicativeExpression__Group__1() throws RecognitionE
 
 
     // $ANTLR start "rule__MultiplicativeExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9202:1: rule__MultiplicativeExpression__Group__1__Impl : ( ( rule__MultiplicativeExpression__Group_1__0 )* ) ;
+    // InternalScope.g:9202:1: rule__MultiplicativeExpression__Group__1__Impl : ( ( rule__MultiplicativeExpression__Group_1__0 )* ) ;
     public final void rule__MultiplicativeExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9206:1: ( ( ( rule__MultiplicativeExpression__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9207:1: ( ( rule__MultiplicativeExpression__Group_1__0 )* )
+            // InternalScope.g:9206:1: ( ( ( rule__MultiplicativeExpression__Group_1__0 )* ) )
+            // InternalScope.g:9207:1: ( ( rule__MultiplicativeExpression__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9207:1: ( ( rule__MultiplicativeExpression__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9208:1: ( rule__MultiplicativeExpression__Group_1__0 )*
+            // InternalScope.g:9207:1: ( ( rule__MultiplicativeExpression__Group_1__0 )* )
+            // InternalScope.g:9208:1: ( rule__MultiplicativeExpression__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMultiplicativeExpressionAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9209:1: ( rule__MultiplicativeExpression__Group_1__0 )*
+            // InternalScope.g:9209:1: ( rule__MultiplicativeExpression__Group_1__0 )*
             loop65:
             do {
                 int alt65=2;
@@ -26560,9 +26560,9 @@ public final void rule__MultiplicativeExpression__Group__1__Impl() throws Recogn
 
                 switch (alt65) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9209:2: rule__MultiplicativeExpression__Group_1__0
+            	    // InternalScope.g:9209:2: rule__MultiplicativeExpression__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__MultiplicativeExpression__Group_1__0_in_rule__MultiplicativeExpression__Group__1__Impl18652);
+            	    pushFollow(FOLLOW_69);
             	    rule__MultiplicativeExpression__Group_1__0();
 
             	    state._fsp--;
@@ -26601,21 +26601,21 @@ public final void rule__MultiplicativeExpression__Group__1__Impl() throws Recogn
 
 
     // $ANTLR start "rule__MultiplicativeExpression__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9223:1: rule__MultiplicativeExpression__Group_1__0 : rule__MultiplicativeExpression__Group_1__0__Impl rule__MultiplicativeExpression__Group_1__1 ;
+    // InternalScope.g:9223:1: rule__MultiplicativeExpression__Group_1__0 : rule__MultiplicativeExpression__Group_1__0__Impl rule__MultiplicativeExpression__Group_1__1 ;
     public final void rule__MultiplicativeExpression__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9227:1: ( rule__MultiplicativeExpression__Group_1__0__Impl rule__MultiplicativeExpression__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9228:2: rule__MultiplicativeExpression__Group_1__0__Impl rule__MultiplicativeExpression__Group_1__1
+            // InternalScope.g:9227:1: ( rule__MultiplicativeExpression__Group_1__0__Impl rule__MultiplicativeExpression__Group_1__1 )
+            // InternalScope.g:9228:2: rule__MultiplicativeExpression__Group_1__0__Impl rule__MultiplicativeExpression__Group_1__1
             {
-            pushFollow(FOLLOW_rule__MultiplicativeExpression__Group_1__0__Impl_in_rule__MultiplicativeExpression__Group_1__018687);
+            pushFollow(FOLLOW_68);
             rule__MultiplicativeExpression__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__MultiplicativeExpression__Group_1__1_in_rule__MultiplicativeExpression__Group_1__018690);
+            pushFollow(FOLLOW_2);
             rule__MultiplicativeExpression__Group_1__1();
 
             state._fsp--;
@@ -26639,23 +26639,23 @@ public final void rule__MultiplicativeExpression__Group_1__0() throws Recognitio
 
 
     // $ANTLR start "rule__MultiplicativeExpression__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9235:1: rule__MultiplicativeExpression__Group_1__0__Impl : ( () ) ;
+    // InternalScope.g:9235:1: rule__MultiplicativeExpression__Group_1__0__Impl : ( () ) ;
     public final void rule__MultiplicativeExpression__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9239:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9240:1: ( () )
+            // InternalScope.g:9239:1: ( ( () ) )
+            // InternalScope.g:9240:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9240:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9241:1: ()
+            // InternalScope.g:9240:1: ( () )
+            // InternalScope.g:9241:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMultiplicativeExpressionAccess().getOperationCallParamsAction_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9242:1: ()
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9244:1: 
+            // InternalScope.g:9242:1: ()
+            // InternalScope.g:9244:1: 
             {
             }
 
@@ -26680,21 +26680,21 @@ public final void rule__MultiplicativeExpression__Group_1__0__Impl() throws Reco
 
 
     // $ANTLR start "rule__MultiplicativeExpression__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9254:1: rule__MultiplicativeExpression__Group_1__1 : rule__MultiplicativeExpression__Group_1__1__Impl rule__MultiplicativeExpression__Group_1__2 ;
+    // InternalScope.g:9254:1: rule__MultiplicativeExpression__Group_1__1 : rule__MultiplicativeExpression__Group_1__1__Impl rule__MultiplicativeExpression__Group_1__2 ;
     public final void rule__MultiplicativeExpression__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9258:1: ( rule__MultiplicativeExpression__Group_1__1__Impl rule__MultiplicativeExpression__Group_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9259:2: rule__MultiplicativeExpression__Group_1__1__Impl rule__MultiplicativeExpression__Group_1__2
+            // InternalScope.g:9258:1: ( rule__MultiplicativeExpression__Group_1__1__Impl rule__MultiplicativeExpression__Group_1__2 )
+            // InternalScope.g:9259:2: rule__MultiplicativeExpression__Group_1__1__Impl rule__MultiplicativeExpression__Group_1__2
             {
-            pushFollow(FOLLOW_rule__MultiplicativeExpression__Group_1__1__Impl_in_rule__MultiplicativeExpression__Group_1__118748);
+            pushFollow(FOLLOW_57);
             rule__MultiplicativeExpression__Group_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__MultiplicativeExpression__Group_1__2_in_rule__MultiplicativeExpression__Group_1__118751);
+            pushFollow(FOLLOW_2);
             rule__MultiplicativeExpression__Group_1__2();
 
             state._fsp--;
@@ -26718,25 +26718,25 @@ public final void rule__MultiplicativeExpression__Group_1__1() throws Recognitio
 
 
     // $ANTLR start "rule__MultiplicativeExpression__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9266:1: rule__MultiplicativeExpression__Group_1__1__Impl : ( ( rule__MultiplicativeExpression__NameAssignment_1_1 ) ) ;
+    // InternalScope.g:9266:1: rule__MultiplicativeExpression__Group_1__1__Impl : ( ( rule__MultiplicativeExpression__NameAssignment_1_1 ) ) ;
     public final void rule__MultiplicativeExpression__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9270:1: ( ( ( rule__MultiplicativeExpression__NameAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9271:1: ( ( rule__MultiplicativeExpression__NameAssignment_1_1 ) )
+            // InternalScope.g:9270:1: ( ( ( rule__MultiplicativeExpression__NameAssignment_1_1 ) ) )
+            // InternalScope.g:9271:1: ( ( rule__MultiplicativeExpression__NameAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9271:1: ( ( rule__MultiplicativeExpression__NameAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9272:1: ( rule__MultiplicativeExpression__NameAssignment_1_1 )
+            // InternalScope.g:9271:1: ( ( rule__MultiplicativeExpression__NameAssignment_1_1 ) )
+            // InternalScope.g:9272:1: ( rule__MultiplicativeExpression__NameAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMultiplicativeExpressionAccess().getNameAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9273:1: ( rule__MultiplicativeExpression__NameAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9273:2: rule__MultiplicativeExpression__NameAssignment_1_1
+            // InternalScope.g:9273:1: ( rule__MultiplicativeExpression__NameAssignment_1_1 )
+            // InternalScope.g:9273:2: rule__MultiplicativeExpression__NameAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__MultiplicativeExpression__NameAssignment_1_1_in_rule__MultiplicativeExpression__Group_1__1__Impl18778);
+            pushFollow(FOLLOW_2);
             rule__MultiplicativeExpression__NameAssignment_1_1();
 
             state._fsp--;
@@ -26769,16 +26769,16 @@ public final void rule__MultiplicativeExpression__Group_1__1__Impl() throws Reco
 
 
     // $ANTLR start "rule__MultiplicativeExpression__Group_1__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9283:1: rule__MultiplicativeExpression__Group_1__2 : rule__MultiplicativeExpression__Group_1__2__Impl ;
+    // InternalScope.g:9283:1: rule__MultiplicativeExpression__Group_1__2 : rule__MultiplicativeExpression__Group_1__2__Impl ;
     public final void rule__MultiplicativeExpression__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9287:1: ( rule__MultiplicativeExpression__Group_1__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9288:2: rule__MultiplicativeExpression__Group_1__2__Impl
+            // InternalScope.g:9287:1: ( rule__MultiplicativeExpression__Group_1__2__Impl )
+            // InternalScope.g:9288:2: rule__MultiplicativeExpression__Group_1__2__Impl
             {
-            pushFollow(FOLLOW_rule__MultiplicativeExpression__Group_1__2__Impl_in_rule__MultiplicativeExpression__Group_1__218808);
+            pushFollow(FOLLOW_2);
             rule__MultiplicativeExpression__Group_1__2__Impl();
 
             state._fsp--;
@@ -26802,25 +26802,25 @@ public final void rule__MultiplicativeExpression__Group_1__2() throws Recognitio
 
 
     // $ANTLR start "rule__MultiplicativeExpression__Group_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9294:1: rule__MultiplicativeExpression__Group_1__2__Impl : ( ( rule__MultiplicativeExpression__ParamsAssignment_1_2 ) ) ;
+    // InternalScope.g:9294:1: rule__MultiplicativeExpression__Group_1__2__Impl : ( ( rule__MultiplicativeExpression__ParamsAssignment_1_2 ) ) ;
     public final void rule__MultiplicativeExpression__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9298:1: ( ( ( rule__MultiplicativeExpression__ParamsAssignment_1_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9299:1: ( ( rule__MultiplicativeExpression__ParamsAssignment_1_2 ) )
+            // InternalScope.g:9298:1: ( ( ( rule__MultiplicativeExpression__ParamsAssignment_1_2 ) ) )
+            // InternalScope.g:9299:1: ( ( rule__MultiplicativeExpression__ParamsAssignment_1_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9299:1: ( ( rule__MultiplicativeExpression__ParamsAssignment_1_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9300:1: ( rule__MultiplicativeExpression__ParamsAssignment_1_2 )
+            // InternalScope.g:9299:1: ( ( rule__MultiplicativeExpression__ParamsAssignment_1_2 ) )
+            // InternalScope.g:9300:1: ( rule__MultiplicativeExpression__ParamsAssignment_1_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMultiplicativeExpressionAccess().getParamsAssignment_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9301:1: ( rule__MultiplicativeExpression__ParamsAssignment_1_2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9301:2: rule__MultiplicativeExpression__ParamsAssignment_1_2
+            // InternalScope.g:9301:1: ( rule__MultiplicativeExpression__ParamsAssignment_1_2 )
+            // InternalScope.g:9301:2: rule__MultiplicativeExpression__ParamsAssignment_1_2
             {
-            pushFollow(FOLLOW_rule__MultiplicativeExpression__ParamsAssignment_1_2_in_rule__MultiplicativeExpression__Group_1__2__Impl18835);
+            pushFollow(FOLLOW_2);
             rule__MultiplicativeExpression__ParamsAssignment_1_2();
 
             state._fsp--;
@@ -26853,21 +26853,21 @@ public final void rule__MultiplicativeExpression__Group_1__2__Impl() throws Reco
 
 
     // $ANTLR start "rule__UnaryExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9317:1: rule__UnaryExpression__Group__0 : rule__UnaryExpression__Group__0__Impl rule__UnaryExpression__Group__1 ;
+    // InternalScope.g:9317:1: rule__UnaryExpression__Group__0 : rule__UnaryExpression__Group__0__Impl rule__UnaryExpression__Group__1 ;
     public final void rule__UnaryExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9321:1: ( rule__UnaryExpression__Group__0__Impl rule__UnaryExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9322:2: rule__UnaryExpression__Group__0__Impl rule__UnaryExpression__Group__1
+            // InternalScope.g:9321:1: ( rule__UnaryExpression__Group__0__Impl rule__UnaryExpression__Group__1 )
+            // InternalScope.g:9322:2: rule__UnaryExpression__Group__0__Impl rule__UnaryExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__UnaryExpression__Group__0__Impl_in_rule__UnaryExpression__Group__018871);
+            pushFollow(FOLLOW_57);
             rule__UnaryExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__UnaryExpression__Group__1_in_rule__UnaryExpression__Group__018874);
+            pushFollow(FOLLOW_2);
             rule__UnaryExpression__Group__1();
 
             state._fsp--;
@@ -26891,25 +26891,25 @@ public final void rule__UnaryExpression__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__UnaryExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9329:1: rule__UnaryExpression__Group__0__Impl : ( ( rule__UnaryExpression__NameAssignment_0 ) ) ;
+    // InternalScope.g:9329:1: rule__UnaryExpression__Group__0__Impl : ( ( rule__UnaryExpression__NameAssignment_0 ) ) ;
     public final void rule__UnaryExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9333:1: ( ( ( rule__UnaryExpression__NameAssignment_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9334:1: ( ( rule__UnaryExpression__NameAssignment_0 ) )
+            // InternalScope.g:9333:1: ( ( ( rule__UnaryExpression__NameAssignment_0 ) ) )
+            // InternalScope.g:9334:1: ( ( rule__UnaryExpression__NameAssignment_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9334:1: ( ( rule__UnaryExpression__NameAssignment_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9335:1: ( rule__UnaryExpression__NameAssignment_0 )
+            // InternalScope.g:9334:1: ( ( rule__UnaryExpression__NameAssignment_0 ) )
+            // InternalScope.g:9335:1: ( rule__UnaryExpression__NameAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getUnaryExpressionAccess().getNameAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9336:1: ( rule__UnaryExpression__NameAssignment_0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9336:2: rule__UnaryExpression__NameAssignment_0
+            // InternalScope.g:9336:1: ( rule__UnaryExpression__NameAssignment_0 )
+            // InternalScope.g:9336:2: rule__UnaryExpression__NameAssignment_0
             {
-            pushFollow(FOLLOW_rule__UnaryExpression__NameAssignment_0_in_rule__UnaryExpression__Group__0__Impl18901);
+            pushFollow(FOLLOW_2);
             rule__UnaryExpression__NameAssignment_0();
 
             state._fsp--;
@@ -26942,16 +26942,16 @@ public final void rule__UnaryExpression__Group__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__UnaryExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9346:1: rule__UnaryExpression__Group__1 : rule__UnaryExpression__Group__1__Impl ;
+    // InternalScope.g:9346:1: rule__UnaryExpression__Group__1 : rule__UnaryExpression__Group__1__Impl ;
     public final void rule__UnaryExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9350:1: ( rule__UnaryExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9351:2: rule__UnaryExpression__Group__1__Impl
+            // InternalScope.g:9350:1: ( rule__UnaryExpression__Group__1__Impl )
+            // InternalScope.g:9351:2: rule__UnaryExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__UnaryExpression__Group__1__Impl_in_rule__UnaryExpression__Group__118931);
+            pushFollow(FOLLOW_2);
             rule__UnaryExpression__Group__1__Impl();
 
             state._fsp--;
@@ -26975,25 +26975,25 @@ public final void rule__UnaryExpression__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__UnaryExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9357:1: rule__UnaryExpression__Group__1__Impl : ( ( rule__UnaryExpression__ParamsAssignment_1 ) ) ;
+    // InternalScope.g:9357:1: rule__UnaryExpression__Group__1__Impl : ( ( rule__UnaryExpression__ParamsAssignment_1 ) ) ;
     public final void rule__UnaryExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9361:1: ( ( ( rule__UnaryExpression__ParamsAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9362:1: ( ( rule__UnaryExpression__ParamsAssignment_1 ) )
+            // InternalScope.g:9361:1: ( ( ( rule__UnaryExpression__ParamsAssignment_1 ) ) )
+            // InternalScope.g:9362:1: ( ( rule__UnaryExpression__ParamsAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9362:1: ( ( rule__UnaryExpression__ParamsAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9363:1: ( rule__UnaryExpression__ParamsAssignment_1 )
+            // InternalScope.g:9362:1: ( ( rule__UnaryExpression__ParamsAssignment_1 ) )
+            // InternalScope.g:9363:1: ( rule__UnaryExpression__ParamsAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getUnaryExpressionAccess().getParamsAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9364:1: ( rule__UnaryExpression__ParamsAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9364:2: rule__UnaryExpression__ParamsAssignment_1
+            // InternalScope.g:9364:1: ( rule__UnaryExpression__ParamsAssignment_1 )
+            // InternalScope.g:9364:2: rule__UnaryExpression__ParamsAssignment_1
             {
-            pushFollow(FOLLOW_rule__UnaryExpression__ParamsAssignment_1_in_rule__UnaryExpression__Group__1__Impl18958);
+            pushFollow(FOLLOW_2);
             rule__UnaryExpression__ParamsAssignment_1();
 
             state._fsp--;
@@ -27026,21 +27026,21 @@ public final void rule__UnaryExpression__Group__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__InfixExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9378:1: rule__InfixExpression__Group__0 : rule__InfixExpression__Group__0__Impl rule__InfixExpression__Group__1 ;
+    // InternalScope.g:9378:1: rule__InfixExpression__Group__0 : rule__InfixExpression__Group__0__Impl rule__InfixExpression__Group__1 ;
     public final void rule__InfixExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9382:1: ( rule__InfixExpression__Group__0__Impl rule__InfixExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9383:2: rule__InfixExpression__Group__0__Impl rule__InfixExpression__Group__1
+            // InternalScope.g:9382:1: ( rule__InfixExpression__Group__0__Impl rule__InfixExpression__Group__1 )
+            // InternalScope.g:9383:2: rule__InfixExpression__Group__0__Impl rule__InfixExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group__0__Impl_in_rule__InfixExpression__Group__018992);
+            pushFollow(FOLLOW_45);
             rule__InfixExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group__1_in_rule__InfixExpression__Group__018995);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group__1();
 
             state._fsp--;
@@ -27064,22 +27064,22 @@ public final void rule__InfixExpression__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__InfixExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9390:1: rule__InfixExpression__Group__0__Impl : ( rulePrimaryExpression ) ;
+    // InternalScope.g:9390:1: rule__InfixExpression__Group__0__Impl : ( rulePrimaryExpression ) ;
     public final void rule__InfixExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9394:1: ( ( rulePrimaryExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9395:1: ( rulePrimaryExpression )
+            // InternalScope.g:9394:1: ( ( rulePrimaryExpression ) )
+            // InternalScope.g:9395:1: ( rulePrimaryExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9395:1: ( rulePrimaryExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9396:1: rulePrimaryExpression
+            // InternalScope.g:9395:1: ( rulePrimaryExpression )
+            // InternalScope.g:9396:1: rulePrimaryExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getPrimaryExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_rulePrimaryExpression_in_rule__InfixExpression__Group__0__Impl19022);
+            pushFollow(FOLLOW_2);
             rulePrimaryExpression();
 
             state._fsp--;
@@ -27109,16 +27109,16 @@ public final void rule__InfixExpression__Group__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__InfixExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9407:1: rule__InfixExpression__Group__1 : rule__InfixExpression__Group__1__Impl ;
+    // InternalScope.g:9407:1: rule__InfixExpression__Group__1 : rule__InfixExpression__Group__1__Impl ;
     public final void rule__InfixExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9411:1: ( rule__InfixExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9412:2: rule__InfixExpression__Group__1__Impl
+            // InternalScope.g:9411:1: ( rule__InfixExpression__Group__1__Impl )
+            // InternalScope.g:9412:2: rule__InfixExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group__1__Impl_in_rule__InfixExpression__Group__119051);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group__1__Impl();
 
             state._fsp--;
@@ -27142,22 +27142,22 @@ public final void rule__InfixExpression__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__InfixExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9418:1: rule__InfixExpression__Group__1__Impl : ( ( rule__InfixExpression__Alternatives_1 )* ) ;
+    // InternalScope.g:9418:1: rule__InfixExpression__Group__1__Impl : ( ( rule__InfixExpression__Alternatives_1 )* ) ;
     public final void rule__InfixExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9422:1: ( ( ( rule__InfixExpression__Alternatives_1 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9423:1: ( ( rule__InfixExpression__Alternatives_1 )* )
+            // InternalScope.g:9422:1: ( ( ( rule__InfixExpression__Alternatives_1 )* ) )
+            // InternalScope.g:9423:1: ( ( rule__InfixExpression__Alternatives_1 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9423:1: ( ( rule__InfixExpression__Alternatives_1 )* )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9424:1: ( rule__InfixExpression__Alternatives_1 )*
+            // InternalScope.g:9423:1: ( ( rule__InfixExpression__Alternatives_1 )* )
+            // InternalScope.g:9424:1: ( rule__InfixExpression__Alternatives_1 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getAlternatives_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9425:1: ( rule__InfixExpression__Alternatives_1 )*
+            // InternalScope.g:9425:1: ( rule__InfixExpression__Alternatives_1 )*
             loop66:
             do {
                 int alt66=2;
@@ -27170,9 +27170,9 @@ public final void rule__InfixExpression__Group__1__Impl() throws RecognitionExce
 
                 switch (alt66) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9425:2: rule__InfixExpression__Alternatives_1
+            	    // InternalScope.g:9425:2: rule__InfixExpression__Alternatives_1
             	    {
-            	    pushFollow(FOLLOW_rule__InfixExpression__Alternatives_1_in_rule__InfixExpression__Group__1__Impl19078);
+            	    pushFollow(FOLLOW_46);
             	    rule__InfixExpression__Alternatives_1();
 
             	    state._fsp--;
@@ -27211,21 +27211,21 @@ public final void rule__InfixExpression__Group__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9439:1: rule__InfixExpression__Group_1_0__0 : rule__InfixExpression__Group_1_0__0__Impl rule__InfixExpression__Group_1_0__1 ;
+    // InternalScope.g:9439:1: rule__InfixExpression__Group_1_0__0 : rule__InfixExpression__Group_1_0__0__Impl rule__InfixExpression__Group_1_0__1 ;
     public final void rule__InfixExpression__Group_1_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9443:1: ( rule__InfixExpression__Group_1_0__0__Impl rule__InfixExpression__Group_1_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9444:2: rule__InfixExpression__Group_1_0__0__Impl rule__InfixExpression__Group_1_0__1
+            // InternalScope.g:9443:1: ( rule__InfixExpression__Group_1_0__0__Impl rule__InfixExpression__Group_1_0__1 )
+            // InternalScope.g:9444:2: rule__InfixExpression__Group_1_0__0__Impl rule__InfixExpression__Group_1_0__1
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0__0__Impl_in_rule__InfixExpression__Group_1_0__019113);
+            pushFollow(FOLLOW_45);
             rule__InfixExpression__Group_1_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0__1_in_rule__InfixExpression__Group_1_0__019116);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_0__1();
 
             state._fsp--;
@@ -27249,23 +27249,23 @@ public final void rule__InfixExpression__Group_1_0__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9451:1: rule__InfixExpression__Group_1_0__0__Impl : ( () ) ;
+    // InternalScope.g:9451:1: rule__InfixExpression__Group_1_0__0__Impl : ( () ) ;
     public final void rule__InfixExpression__Group_1_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9455:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9456:1: ( () )
+            // InternalScope.g:9455:1: ( ( () ) )
+            // InternalScope.g:9456:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9456:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9457:1: ()
+            // InternalScope.g:9456:1: ( () )
+            // InternalScope.g:9457:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getOperationCallTargetAction_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9458:1: ()
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9460:1: 
+            // InternalScope.g:9458:1: ()
+            // InternalScope.g:9460:1: 
             {
             }
 
@@ -27290,21 +27290,21 @@ public final void rule__InfixExpression__Group_1_0__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9470:1: rule__InfixExpression__Group_1_0__1 : rule__InfixExpression__Group_1_0__1__Impl rule__InfixExpression__Group_1_0__2 ;
+    // InternalScope.g:9470:1: rule__InfixExpression__Group_1_0__1 : rule__InfixExpression__Group_1_0__1__Impl rule__InfixExpression__Group_1_0__2 ;
     public final void rule__InfixExpression__Group_1_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9474:1: ( rule__InfixExpression__Group_1_0__1__Impl rule__InfixExpression__Group_1_0__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9475:2: rule__InfixExpression__Group_1_0__1__Impl rule__InfixExpression__Group_1_0__2
+            // InternalScope.g:9474:1: ( rule__InfixExpression__Group_1_0__1__Impl rule__InfixExpression__Group_1_0__2 )
+            // InternalScope.g:9475:2: rule__InfixExpression__Group_1_0__1__Impl rule__InfixExpression__Group_1_0__2
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0__1__Impl_in_rule__InfixExpression__Group_1_0__119174);
+            pushFollow(FOLLOW_3);
             rule__InfixExpression__Group_1_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0__2_in_rule__InfixExpression__Group_1_0__119177);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_0__2();
 
             state._fsp--;
@@ -27328,22 +27328,22 @@ public final void rule__InfixExpression__Group_1_0__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9482:1: rule__InfixExpression__Group_1_0__1__Impl : ( '.' ) ;
+    // InternalScope.g:9482:1: rule__InfixExpression__Group_1_0__1__Impl : ( '.' ) ;
     public final void rule__InfixExpression__Group_1_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9486:1: ( ( '.' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9487:1: ( '.' )
+            // InternalScope.g:9486:1: ( ( '.' ) )
+            // InternalScope.g:9487:1: ( '.' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9487:1: ( '.' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9488:1: '.'
+            // InternalScope.g:9487:1: ( '.' )
+            // InternalScope.g:9488:1: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getFullStopKeyword_1_0_1()); 
             }
-            match(input,68,FOLLOW_68_in_rule__InfixExpression__Group_1_0__1__Impl19205); if (state.failed) return ;
+            match(input,68,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInfixExpressionAccess().getFullStopKeyword_1_0_1()); 
             }
@@ -27369,21 +27369,21 @@ public final void rule__InfixExpression__Group_1_0__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9501:1: rule__InfixExpression__Group_1_0__2 : rule__InfixExpression__Group_1_0__2__Impl rule__InfixExpression__Group_1_0__3 ;
+    // InternalScope.g:9501:1: rule__InfixExpression__Group_1_0__2 : rule__InfixExpression__Group_1_0__2__Impl rule__InfixExpression__Group_1_0__3 ;
     public final void rule__InfixExpression__Group_1_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9505:1: ( rule__InfixExpression__Group_1_0__2__Impl rule__InfixExpression__Group_1_0__3 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9506:2: rule__InfixExpression__Group_1_0__2__Impl rule__InfixExpression__Group_1_0__3
+            // InternalScope.g:9505:1: ( rule__InfixExpression__Group_1_0__2__Impl rule__InfixExpression__Group_1_0__3 )
+            // InternalScope.g:9506:2: rule__InfixExpression__Group_1_0__2__Impl rule__InfixExpression__Group_1_0__3
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0__2__Impl_in_rule__InfixExpression__Group_1_0__219236);
+            pushFollow(FOLLOW_32);
             rule__InfixExpression__Group_1_0__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0__3_in_rule__InfixExpression__Group_1_0__219239);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_0__3();
 
             state._fsp--;
@@ -27407,25 +27407,25 @@ public final void rule__InfixExpression__Group_1_0__2() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9513:1: rule__InfixExpression__Group_1_0__2__Impl : ( ( rule__InfixExpression__NameAssignment_1_0_2 ) ) ;
+    // InternalScope.g:9513:1: rule__InfixExpression__Group_1_0__2__Impl : ( ( rule__InfixExpression__NameAssignment_1_0_2 ) ) ;
     public final void rule__InfixExpression__Group_1_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9517:1: ( ( ( rule__InfixExpression__NameAssignment_1_0_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9518:1: ( ( rule__InfixExpression__NameAssignment_1_0_2 ) )
+            // InternalScope.g:9517:1: ( ( ( rule__InfixExpression__NameAssignment_1_0_2 ) ) )
+            // InternalScope.g:9518:1: ( ( rule__InfixExpression__NameAssignment_1_0_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9518:1: ( ( rule__InfixExpression__NameAssignment_1_0_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9519:1: ( rule__InfixExpression__NameAssignment_1_0_2 )
+            // InternalScope.g:9518:1: ( ( rule__InfixExpression__NameAssignment_1_0_2 ) )
+            // InternalScope.g:9519:1: ( rule__InfixExpression__NameAssignment_1_0_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getNameAssignment_1_0_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9520:1: ( rule__InfixExpression__NameAssignment_1_0_2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9520:2: rule__InfixExpression__NameAssignment_1_0_2
+            // InternalScope.g:9520:1: ( rule__InfixExpression__NameAssignment_1_0_2 )
+            // InternalScope.g:9520:2: rule__InfixExpression__NameAssignment_1_0_2
             {
-            pushFollow(FOLLOW_rule__InfixExpression__NameAssignment_1_0_2_in_rule__InfixExpression__Group_1_0__2__Impl19266);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__NameAssignment_1_0_2();
 
             state._fsp--;
@@ -27458,21 +27458,21 @@ public final void rule__InfixExpression__Group_1_0__2__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0__3"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9530:1: rule__InfixExpression__Group_1_0__3 : rule__InfixExpression__Group_1_0__3__Impl rule__InfixExpression__Group_1_0__4 ;
+    // InternalScope.g:9530:1: rule__InfixExpression__Group_1_0__3 : rule__InfixExpression__Group_1_0__3__Impl rule__InfixExpression__Group_1_0__4 ;
     public final void rule__InfixExpression__Group_1_0__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9534:1: ( rule__InfixExpression__Group_1_0__3__Impl rule__InfixExpression__Group_1_0__4 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9535:2: rule__InfixExpression__Group_1_0__3__Impl rule__InfixExpression__Group_1_0__4
+            // InternalScope.g:9534:1: ( rule__InfixExpression__Group_1_0__3__Impl rule__InfixExpression__Group_1_0__4 )
+            // InternalScope.g:9535:2: rule__InfixExpression__Group_1_0__3__Impl rule__InfixExpression__Group_1_0__4
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0__3__Impl_in_rule__InfixExpression__Group_1_0__319296);
+            pushFollow(FOLLOW_70);
             rule__InfixExpression__Group_1_0__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0__4_in_rule__InfixExpression__Group_1_0__319299);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_0__4();
 
             state._fsp--;
@@ -27496,22 +27496,22 @@ public final void rule__InfixExpression__Group_1_0__3() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9542:1: rule__InfixExpression__Group_1_0__3__Impl : ( '(' ) ;
+    // InternalScope.g:9542:1: rule__InfixExpression__Group_1_0__3__Impl : ( '(' ) ;
     public final void rule__InfixExpression__Group_1_0__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9546:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9547:1: ( '(' )
+            // InternalScope.g:9546:1: ( ( '(' ) )
+            // InternalScope.g:9547:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9547:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9548:1: '('
+            // InternalScope.g:9547:1: ( '(' )
+            // InternalScope.g:9548:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getLeftParenthesisKeyword_1_0_3()); 
             }
-            match(input,51,FOLLOW_51_in_rule__InfixExpression__Group_1_0__3__Impl19327); if (state.failed) return ;
+            match(input,51,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInfixExpressionAccess().getLeftParenthesisKeyword_1_0_3()); 
             }
@@ -27537,21 +27537,21 @@ public final void rule__InfixExpression__Group_1_0__3__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0__4"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9561:1: rule__InfixExpression__Group_1_0__4 : rule__InfixExpression__Group_1_0__4__Impl rule__InfixExpression__Group_1_0__5 ;
+    // InternalScope.g:9561:1: rule__InfixExpression__Group_1_0__4 : rule__InfixExpression__Group_1_0__4__Impl rule__InfixExpression__Group_1_0__5 ;
     public final void rule__InfixExpression__Group_1_0__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9565:1: ( rule__InfixExpression__Group_1_0__4__Impl rule__InfixExpression__Group_1_0__5 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9566:2: rule__InfixExpression__Group_1_0__4__Impl rule__InfixExpression__Group_1_0__5
+            // InternalScope.g:9565:1: ( rule__InfixExpression__Group_1_0__4__Impl rule__InfixExpression__Group_1_0__5 )
+            // InternalScope.g:9566:2: rule__InfixExpression__Group_1_0__4__Impl rule__InfixExpression__Group_1_0__5
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0__4__Impl_in_rule__InfixExpression__Group_1_0__419358);
+            pushFollow(FOLLOW_70);
             rule__InfixExpression__Group_1_0__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0__5_in_rule__InfixExpression__Group_1_0__419361);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_0__5();
 
             state._fsp--;
@@ -27575,22 +27575,22 @@ public final void rule__InfixExpression__Group_1_0__4() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9573:1: rule__InfixExpression__Group_1_0__4__Impl : ( ( rule__InfixExpression__Group_1_0_4__0 )? ) ;
+    // InternalScope.g:9573:1: rule__InfixExpression__Group_1_0__4__Impl : ( ( rule__InfixExpression__Group_1_0_4__0 )? ) ;
     public final void rule__InfixExpression__Group_1_0__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9577:1: ( ( ( rule__InfixExpression__Group_1_0_4__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9578:1: ( ( rule__InfixExpression__Group_1_0_4__0 )? )
+            // InternalScope.g:9577:1: ( ( ( rule__InfixExpression__Group_1_0_4__0 )? ) )
+            // InternalScope.g:9578:1: ( ( rule__InfixExpression__Group_1_0_4__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9578:1: ( ( rule__InfixExpression__Group_1_0_4__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9579:1: ( rule__InfixExpression__Group_1_0_4__0 )?
+            // InternalScope.g:9578:1: ( ( rule__InfixExpression__Group_1_0_4__0 )? )
+            // InternalScope.g:9579:1: ( rule__InfixExpression__Group_1_0_4__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getGroup_1_0_4()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9580:1: ( rule__InfixExpression__Group_1_0_4__0 )?
+            // InternalScope.g:9580:1: ( rule__InfixExpression__Group_1_0_4__0 )?
             int alt67=2;
             int LA67_0 = input.LA(1);
 
@@ -27599,9 +27599,9 @@ public final void rule__InfixExpression__Group_1_0__4__Impl() throws Recognition
             }
             switch (alt67) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9580:2: rule__InfixExpression__Group_1_0_4__0
+                    // InternalScope.g:9580:2: rule__InfixExpression__Group_1_0_4__0
                     {
-                    pushFollow(FOLLOW_rule__InfixExpression__Group_1_0_4__0_in_rule__InfixExpression__Group_1_0__4__Impl19388);
+                    pushFollow(FOLLOW_2);
                     rule__InfixExpression__Group_1_0_4__0();
 
                     state._fsp--;
@@ -27637,16 +27637,16 @@ public final void rule__InfixExpression__Group_1_0__4__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0__5"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9590:1: rule__InfixExpression__Group_1_0__5 : rule__InfixExpression__Group_1_0__5__Impl ;
+    // InternalScope.g:9590:1: rule__InfixExpression__Group_1_0__5 : rule__InfixExpression__Group_1_0__5__Impl ;
     public final void rule__InfixExpression__Group_1_0__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9594:1: ( rule__InfixExpression__Group_1_0__5__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9595:2: rule__InfixExpression__Group_1_0__5__Impl
+            // InternalScope.g:9594:1: ( rule__InfixExpression__Group_1_0__5__Impl )
+            // InternalScope.g:9595:2: rule__InfixExpression__Group_1_0__5__Impl
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0__5__Impl_in_rule__InfixExpression__Group_1_0__519419);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_0__5__Impl();
 
             state._fsp--;
@@ -27670,22 +27670,22 @@ public final void rule__InfixExpression__Group_1_0__5() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0__5__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9601:1: rule__InfixExpression__Group_1_0__5__Impl : ( ')' ) ;
+    // InternalScope.g:9601:1: rule__InfixExpression__Group_1_0__5__Impl : ( ')' ) ;
     public final void rule__InfixExpression__Group_1_0__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9605:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9606:1: ( ')' )
+            // InternalScope.g:9605:1: ( ( ')' ) )
+            // InternalScope.g:9606:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9606:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9607:1: ')'
+            // InternalScope.g:9606:1: ( ')' )
+            // InternalScope.g:9607:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getRightParenthesisKeyword_1_0_5()); 
             }
-            match(input,52,FOLLOW_52_in_rule__InfixExpression__Group_1_0__5__Impl19447); if (state.failed) return ;
+            match(input,52,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInfixExpressionAccess().getRightParenthesisKeyword_1_0_5()); 
             }
@@ -27711,21 +27711,21 @@ public final void rule__InfixExpression__Group_1_0__5__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0_4__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9632:1: rule__InfixExpression__Group_1_0_4__0 : rule__InfixExpression__Group_1_0_4__0__Impl rule__InfixExpression__Group_1_0_4__1 ;
+    // InternalScope.g:9632:1: rule__InfixExpression__Group_1_0_4__0 : rule__InfixExpression__Group_1_0_4__0__Impl rule__InfixExpression__Group_1_0_4__1 ;
     public final void rule__InfixExpression__Group_1_0_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9636:1: ( rule__InfixExpression__Group_1_0_4__0__Impl rule__InfixExpression__Group_1_0_4__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9637:2: rule__InfixExpression__Group_1_0_4__0__Impl rule__InfixExpression__Group_1_0_4__1
+            // InternalScope.g:9636:1: ( rule__InfixExpression__Group_1_0_4__0__Impl rule__InfixExpression__Group_1_0_4__1 )
+            // InternalScope.g:9637:2: rule__InfixExpression__Group_1_0_4__0__Impl rule__InfixExpression__Group_1_0_4__1
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0_4__0__Impl_in_rule__InfixExpression__Group_1_0_4__019490);
+            pushFollow(FOLLOW_71);
             rule__InfixExpression__Group_1_0_4__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0_4__1_in_rule__InfixExpression__Group_1_0_4__019493);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_0_4__1();
 
             state._fsp--;
@@ -27749,25 +27749,25 @@ public final void rule__InfixExpression__Group_1_0_4__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0_4__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9644:1: rule__InfixExpression__Group_1_0_4__0__Impl : ( ( rule__InfixExpression__ParamsAssignment_1_0_4_0 ) ) ;
+    // InternalScope.g:9644:1: rule__InfixExpression__Group_1_0_4__0__Impl : ( ( rule__InfixExpression__ParamsAssignment_1_0_4_0 ) ) ;
     public final void rule__InfixExpression__Group_1_0_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9648:1: ( ( ( rule__InfixExpression__ParamsAssignment_1_0_4_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9649:1: ( ( rule__InfixExpression__ParamsAssignment_1_0_4_0 ) )
+            // InternalScope.g:9648:1: ( ( ( rule__InfixExpression__ParamsAssignment_1_0_4_0 ) ) )
+            // InternalScope.g:9649:1: ( ( rule__InfixExpression__ParamsAssignment_1_0_4_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9649:1: ( ( rule__InfixExpression__ParamsAssignment_1_0_4_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9650:1: ( rule__InfixExpression__ParamsAssignment_1_0_4_0 )
+            // InternalScope.g:9649:1: ( ( rule__InfixExpression__ParamsAssignment_1_0_4_0 ) )
+            // InternalScope.g:9650:1: ( rule__InfixExpression__ParamsAssignment_1_0_4_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getParamsAssignment_1_0_4_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9651:1: ( rule__InfixExpression__ParamsAssignment_1_0_4_0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9651:2: rule__InfixExpression__ParamsAssignment_1_0_4_0
+            // InternalScope.g:9651:1: ( rule__InfixExpression__ParamsAssignment_1_0_4_0 )
+            // InternalScope.g:9651:2: rule__InfixExpression__ParamsAssignment_1_0_4_0
             {
-            pushFollow(FOLLOW_rule__InfixExpression__ParamsAssignment_1_0_4_0_in_rule__InfixExpression__Group_1_0_4__0__Impl19520);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__ParamsAssignment_1_0_4_0();
 
             state._fsp--;
@@ -27800,16 +27800,16 @@ public final void rule__InfixExpression__Group_1_0_4__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0_4__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9661:1: rule__InfixExpression__Group_1_0_4__1 : rule__InfixExpression__Group_1_0_4__1__Impl ;
+    // InternalScope.g:9661:1: rule__InfixExpression__Group_1_0_4__1 : rule__InfixExpression__Group_1_0_4__1__Impl ;
     public final void rule__InfixExpression__Group_1_0_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9665:1: ( rule__InfixExpression__Group_1_0_4__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9666:2: rule__InfixExpression__Group_1_0_4__1__Impl
+            // InternalScope.g:9665:1: ( rule__InfixExpression__Group_1_0_4__1__Impl )
+            // InternalScope.g:9666:2: rule__InfixExpression__Group_1_0_4__1__Impl
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0_4__1__Impl_in_rule__InfixExpression__Group_1_0_4__119550);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_0_4__1__Impl();
 
             state._fsp--;
@@ -27833,22 +27833,22 @@ public final void rule__InfixExpression__Group_1_0_4__1() throws RecognitionExce
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0_4__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9672:1: rule__InfixExpression__Group_1_0_4__1__Impl : ( ( rule__InfixExpression__Group_1_0_4_1__0 )* ) ;
+    // InternalScope.g:9672:1: rule__InfixExpression__Group_1_0_4__1__Impl : ( ( rule__InfixExpression__Group_1_0_4_1__0 )* ) ;
     public final void rule__InfixExpression__Group_1_0_4__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9676:1: ( ( ( rule__InfixExpression__Group_1_0_4_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9677:1: ( ( rule__InfixExpression__Group_1_0_4_1__0 )* )
+            // InternalScope.g:9676:1: ( ( ( rule__InfixExpression__Group_1_0_4_1__0 )* ) )
+            // InternalScope.g:9677:1: ( ( rule__InfixExpression__Group_1_0_4_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9677:1: ( ( rule__InfixExpression__Group_1_0_4_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9678:1: ( rule__InfixExpression__Group_1_0_4_1__0 )*
+            // InternalScope.g:9677:1: ( ( rule__InfixExpression__Group_1_0_4_1__0 )* )
+            // InternalScope.g:9678:1: ( rule__InfixExpression__Group_1_0_4_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getGroup_1_0_4_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9679:1: ( rule__InfixExpression__Group_1_0_4_1__0 )*
+            // InternalScope.g:9679:1: ( rule__InfixExpression__Group_1_0_4_1__0 )*
             loop68:
             do {
                 int alt68=2;
@@ -27861,9 +27861,9 @@ public final void rule__InfixExpression__Group_1_0_4__1__Impl() throws Recogniti
 
                 switch (alt68) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9679:2: rule__InfixExpression__Group_1_0_4_1__0
+            	    // InternalScope.g:9679:2: rule__InfixExpression__Group_1_0_4_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__InfixExpression__Group_1_0_4_1__0_in_rule__InfixExpression__Group_1_0_4__1__Impl19577);
+            	    pushFollow(FOLLOW_40);
             	    rule__InfixExpression__Group_1_0_4_1__0();
 
             	    state._fsp--;
@@ -27902,21 +27902,21 @@ public final void rule__InfixExpression__Group_1_0_4__1__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0_4_1__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9693:1: rule__InfixExpression__Group_1_0_4_1__0 : rule__InfixExpression__Group_1_0_4_1__0__Impl rule__InfixExpression__Group_1_0_4_1__1 ;
+    // InternalScope.g:9693:1: rule__InfixExpression__Group_1_0_4_1__0 : rule__InfixExpression__Group_1_0_4_1__0__Impl rule__InfixExpression__Group_1_0_4_1__1 ;
     public final void rule__InfixExpression__Group_1_0_4_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9697:1: ( rule__InfixExpression__Group_1_0_4_1__0__Impl rule__InfixExpression__Group_1_0_4_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9698:2: rule__InfixExpression__Group_1_0_4_1__0__Impl rule__InfixExpression__Group_1_0_4_1__1
+            // InternalScope.g:9697:1: ( rule__InfixExpression__Group_1_0_4_1__0__Impl rule__InfixExpression__Group_1_0_4_1__1 )
+            // InternalScope.g:9698:2: rule__InfixExpression__Group_1_0_4_1__0__Impl rule__InfixExpression__Group_1_0_4_1__1
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0_4_1__0__Impl_in_rule__InfixExpression__Group_1_0_4_1__019612);
+            pushFollow(FOLLOW_17);
             rule__InfixExpression__Group_1_0_4_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0_4_1__1_in_rule__InfixExpression__Group_1_0_4_1__019615);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_0_4_1__1();
 
             state._fsp--;
@@ -27940,22 +27940,22 @@ public final void rule__InfixExpression__Group_1_0_4_1__0() throws RecognitionEx
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0_4_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9705:1: rule__InfixExpression__Group_1_0_4_1__0__Impl : ( ',' ) ;
+    // InternalScope.g:9705:1: rule__InfixExpression__Group_1_0_4_1__0__Impl : ( ',' ) ;
     public final void rule__InfixExpression__Group_1_0_4_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9709:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9710:1: ( ',' )
+            // InternalScope.g:9709:1: ( ( ',' ) )
+            // InternalScope.g:9710:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9710:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9711:1: ','
+            // InternalScope.g:9710:1: ( ',' )
+            // InternalScope.g:9711:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getCommaKeyword_1_0_4_1_0()); 
             }
-            match(input,61,FOLLOW_61_in_rule__InfixExpression__Group_1_0_4_1__0__Impl19643); if (state.failed) return ;
+            match(input,61,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInfixExpressionAccess().getCommaKeyword_1_0_4_1_0()); 
             }
@@ -27981,16 +27981,16 @@ public final void rule__InfixExpression__Group_1_0_4_1__0__Impl() throws Recogni
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0_4_1__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9724:1: rule__InfixExpression__Group_1_0_4_1__1 : rule__InfixExpression__Group_1_0_4_1__1__Impl ;
+    // InternalScope.g:9724:1: rule__InfixExpression__Group_1_0_4_1__1 : rule__InfixExpression__Group_1_0_4_1__1__Impl ;
     public final void rule__InfixExpression__Group_1_0_4_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9728:1: ( rule__InfixExpression__Group_1_0_4_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9729:2: rule__InfixExpression__Group_1_0_4_1__1__Impl
+            // InternalScope.g:9728:1: ( rule__InfixExpression__Group_1_0_4_1__1__Impl )
+            // InternalScope.g:9729:2: rule__InfixExpression__Group_1_0_4_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_0_4_1__1__Impl_in_rule__InfixExpression__Group_1_0_4_1__119674);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_0_4_1__1__Impl();
 
             state._fsp--;
@@ -28014,25 +28014,25 @@ public final void rule__InfixExpression__Group_1_0_4_1__1() throws RecognitionEx
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_0_4_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9735:1: rule__InfixExpression__Group_1_0_4_1__1__Impl : ( ( rule__InfixExpression__ParamsAssignment_1_0_4_1_1 ) ) ;
+    // InternalScope.g:9735:1: rule__InfixExpression__Group_1_0_4_1__1__Impl : ( ( rule__InfixExpression__ParamsAssignment_1_0_4_1_1 ) ) ;
     public final void rule__InfixExpression__Group_1_0_4_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9739:1: ( ( ( rule__InfixExpression__ParamsAssignment_1_0_4_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9740:1: ( ( rule__InfixExpression__ParamsAssignment_1_0_4_1_1 ) )
+            // InternalScope.g:9739:1: ( ( ( rule__InfixExpression__ParamsAssignment_1_0_4_1_1 ) ) )
+            // InternalScope.g:9740:1: ( ( rule__InfixExpression__ParamsAssignment_1_0_4_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9740:1: ( ( rule__InfixExpression__ParamsAssignment_1_0_4_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9741:1: ( rule__InfixExpression__ParamsAssignment_1_0_4_1_1 )
+            // InternalScope.g:9740:1: ( ( rule__InfixExpression__ParamsAssignment_1_0_4_1_1 ) )
+            // InternalScope.g:9741:1: ( rule__InfixExpression__ParamsAssignment_1_0_4_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getParamsAssignment_1_0_4_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9742:1: ( rule__InfixExpression__ParamsAssignment_1_0_4_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9742:2: rule__InfixExpression__ParamsAssignment_1_0_4_1_1
+            // InternalScope.g:9742:1: ( rule__InfixExpression__ParamsAssignment_1_0_4_1_1 )
+            // InternalScope.g:9742:2: rule__InfixExpression__ParamsAssignment_1_0_4_1_1
             {
-            pushFollow(FOLLOW_rule__InfixExpression__ParamsAssignment_1_0_4_1_1_in_rule__InfixExpression__Group_1_0_4_1__1__Impl19701);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__ParamsAssignment_1_0_4_1_1();
 
             state._fsp--;
@@ -28065,21 +28065,21 @@ public final void rule__InfixExpression__Group_1_0_4_1__1__Impl() throws Recogni
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_1__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9756:1: rule__InfixExpression__Group_1_1__0 : rule__InfixExpression__Group_1_1__0__Impl rule__InfixExpression__Group_1_1__1 ;
+    // InternalScope.g:9756:1: rule__InfixExpression__Group_1_1__0 : rule__InfixExpression__Group_1_1__0__Impl rule__InfixExpression__Group_1_1__1 ;
     public final void rule__InfixExpression__Group_1_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9760:1: ( rule__InfixExpression__Group_1_1__0__Impl rule__InfixExpression__Group_1_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9761:2: rule__InfixExpression__Group_1_1__0__Impl rule__InfixExpression__Group_1_1__1
+            // InternalScope.g:9760:1: ( rule__InfixExpression__Group_1_1__0__Impl rule__InfixExpression__Group_1_1__1 )
+            // InternalScope.g:9761:2: rule__InfixExpression__Group_1_1__0__Impl rule__InfixExpression__Group_1_1__1
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_1__0__Impl_in_rule__InfixExpression__Group_1_1__019735);
+            pushFollow(FOLLOW_45);
             rule__InfixExpression__Group_1_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_1__1_in_rule__InfixExpression__Group_1_1__019738);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_1__1();
 
             state._fsp--;
@@ -28103,23 +28103,23 @@ public final void rule__InfixExpression__Group_1_1__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9768:1: rule__InfixExpression__Group_1_1__0__Impl : ( () ) ;
+    // InternalScope.g:9768:1: rule__InfixExpression__Group_1_1__0__Impl : ( () ) ;
     public final void rule__InfixExpression__Group_1_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9772:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9773:1: ( () )
+            // InternalScope.g:9772:1: ( ( () ) )
+            // InternalScope.g:9773:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9773:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9774:1: ()
+            // InternalScope.g:9773:1: ( () )
+            // InternalScope.g:9774:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getFeatureCallTargetAction_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9775:1: ()
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9777:1: 
+            // InternalScope.g:9775:1: ()
+            // InternalScope.g:9777:1: 
             {
             }
 
@@ -28144,21 +28144,21 @@ public final void rule__InfixExpression__Group_1_1__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_1__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9787:1: rule__InfixExpression__Group_1_1__1 : rule__InfixExpression__Group_1_1__1__Impl rule__InfixExpression__Group_1_1__2 ;
+    // InternalScope.g:9787:1: rule__InfixExpression__Group_1_1__1 : rule__InfixExpression__Group_1_1__1__Impl rule__InfixExpression__Group_1_1__2 ;
     public final void rule__InfixExpression__Group_1_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9791:1: ( rule__InfixExpression__Group_1_1__1__Impl rule__InfixExpression__Group_1_1__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9792:2: rule__InfixExpression__Group_1_1__1__Impl rule__InfixExpression__Group_1_1__2
+            // InternalScope.g:9791:1: ( rule__InfixExpression__Group_1_1__1__Impl rule__InfixExpression__Group_1_1__2 )
+            // InternalScope.g:9792:2: rule__InfixExpression__Group_1_1__1__Impl rule__InfixExpression__Group_1_1__2
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_1__1__Impl_in_rule__InfixExpression__Group_1_1__119796);
+            pushFollow(FOLLOW_48);
             rule__InfixExpression__Group_1_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_1__2_in_rule__InfixExpression__Group_1_1__119799);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_1__2();
 
             state._fsp--;
@@ -28182,22 +28182,22 @@ public final void rule__InfixExpression__Group_1_1__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9799:1: rule__InfixExpression__Group_1_1__1__Impl : ( '.' ) ;
+    // InternalScope.g:9799:1: rule__InfixExpression__Group_1_1__1__Impl : ( '.' ) ;
     public final void rule__InfixExpression__Group_1_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9803:1: ( ( '.' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9804:1: ( '.' )
+            // InternalScope.g:9803:1: ( ( '.' ) )
+            // InternalScope.g:9804:1: ( '.' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9804:1: ( '.' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9805:1: '.'
+            // InternalScope.g:9804:1: ( '.' )
+            // InternalScope.g:9805:1: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getFullStopKeyword_1_1_1()); 
             }
-            match(input,68,FOLLOW_68_in_rule__InfixExpression__Group_1_1__1__Impl19827); if (state.failed) return ;
+            match(input,68,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInfixExpressionAccess().getFullStopKeyword_1_1_1()); 
             }
@@ -28223,16 +28223,16 @@ public final void rule__InfixExpression__Group_1_1__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_1__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9818:1: rule__InfixExpression__Group_1_1__2 : rule__InfixExpression__Group_1_1__2__Impl ;
+    // InternalScope.g:9818:1: rule__InfixExpression__Group_1_1__2 : rule__InfixExpression__Group_1_1__2__Impl ;
     public final void rule__InfixExpression__Group_1_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9822:1: ( rule__InfixExpression__Group_1_1__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9823:2: rule__InfixExpression__Group_1_1__2__Impl
+            // InternalScope.g:9822:1: ( rule__InfixExpression__Group_1_1__2__Impl )
+            // InternalScope.g:9823:2: rule__InfixExpression__Group_1_1__2__Impl
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_1__2__Impl_in_rule__InfixExpression__Group_1_1__219858);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_1__2__Impl();
 
             state._fsp--;
@@ -28256,25 +28256,25 @@ public final void rule__InfixExpression__Group_1_1__2() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_1__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9829:1: rule__InfixExpression__Group_1_1__2__Impl : ( ( rule__InfixExpression__TypeAssignment_1_1_2 ) ) ;
+    // InternalScope.g:9829:1: rule__InfixExpression__Group_1_1__2__Impl : ( ( rule__InfixExpression__TypeAssignment_1_1_2 ) ) ;
     public final void rule__InfixExpression__Group_1_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9833:1: ( ( ( rule__InfixExpression__TypeAssignment_1_1_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9834:1: ( ( rule__InfixExpression__TypeAssignment_1_1_2 ) )
+            // InternalScope.g:9833:1: ( ( ( rule__InfixExpression__TypeAssignment_1_1_2 ) ) )
+            // InternalScope.g:9834:1: ( ( rule__InfixExpression__TypeAssignment_1_1_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9834:1: ( ( rule__InfixExpression__TypeAssignment_1_1_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9835:1: ( rule__InfixExpression__TypeAssignment_1_1_2 )
+            // InternalScope.g:9834:1: ( ( rule__InfixExpression__TypeAssignment_1_1_2 ) )
+            // InternalScope.g:9835:1: ( rule__InfixExpression__TypeAssignment_1_1_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getTypeAssignment_1_1_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9836:1: ( rule__InfixExpression__TypeAssignment_1_1_2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9836:2: rule__InfixExpression__TypeAssignment_1_1_2
+            // InternalScope.g:9836:1: ( rule__InfixExpression__TypeAssignment_1_1_2 )
+            // InternalScope.g:9836:2: rule__InfixExpression__TypeAssignment_1_1_2
             {
-            pushFollow(FOLLOW_rule__InfixExpression__TypeAssignment_1_1_2_in_rule__InfixExpression__Group_1_1__2__Impl19885);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__TypeAssignment_1_1_2();
 
             state._fsp--;
@@ -28307,21 +28307,21 @@ public final void rule__InfixExpression__Group_1_1__2__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_2__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9852:1: rule__InfixExpression__Group_1_2__0 : rule__InfixExpression__Group_1_2__0__Impl rule__InfixExpression__Group_1_2__1 ;
+    // InternalScope.g:9852:1: rule__InfixExpression__Group_1_2__0 : rule__InfixExpression__Group_1_2__0__Impl rule__InfixExpression__Group_1_2__1 ;
     public final void rule__InfixExpression__Group_1_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9856:1: ( rule__InfixExpression__Group_1_2__0__Impl rule__InfixExpression__Group_1_2__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9857:2: rule__InfixExpression__Group_1_2__0__Impl rule__InfixExpression__Group_1_2__1
+            // InternalScope.g:9856:1: ( rule__InfixExpression__Group_1_2__0__Impl rule__InfixExpression__Group_1_2__1 )
+            // InternalScope.g:9857:2: rule__InfixExpression__Group_1_2__0__Impl rule__InfixExpression__Group_1_2__1
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_2__0__Impl_in_rule__InfixExpression__Group_1_2__019921);
+            pushFollow(FOLLOW_45);
             rule__InfixExpression__Group_1_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_2__1_in_rule__InfixExpression__Group_1_2__019924);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_2__1();
 
             state._fsp--;
@@ -28345,23 +28345,23 @@ public final void rule__InfixExpression__Group_1_2__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_2__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9864:1: rule__InfixExpression__Group_1_2__0__Impl : ( () ) ;
+    // InternalScope.g:9864:1: rule__InfixExpression__Group_1_2__0__Impl : ( () ) ;
     public final void rule__InfixExpression__Group_1_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9868:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9869:1: ( () )
+            // InternalScope.g:9868:1: ( ( () ) )
+            // InternalScope.g:9869:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9869:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9870:1: ()
+            // InternalScope.g:9869:1: ( () )
+            // InternalScope.g:9870:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getTypeSelectExpressionTargetAction_1_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9871:1: ()
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9873:1: 
+            // InternalScope.g:9871:1: ()
+            // InternalScope.g:9873:1: 
             {
             }
 
@@ -28386,21 +28386,21 @@ public final void rule__InfixExpression__Group_1_2__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_2__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9883:1: rule__InfixExpression__Group_1_2__1 : rule__InfixExpression__Group_1_2__1__Impl rule__InfixExpression__Group_1_2__2 ;
+    // InternalScope.g:9883:1: rule__InfixExpression__Group_1_2__1 : rule__InfixExpression__Group_1_2__1__Impl rule__InfixExpression__Group_1_2__2 ;
     public final void rule__InfixExpression__Group_1_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9887:1: ( rule__InfixExpression__Group_1_2__1__Impl rule__InfixExpression__Group_1_2__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9888:2: rule__InfixExpression__Group_1_2__1__Impl rule__InfixExpression__Group_1_2__2
+            // InternalScope.g:9887:1: ( rule__InfixExpression__Group_1_2__1__Impl rule__InfixExpression__Group_1_2__2 )
+            // InternalScope.g:9888:2: rule__InfixExpression__Group_1_2__1__Impl rule__InfixExpression__Group_1_2__2
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_2__1__Impl_in_rule__InfixExpression__Group_1_2__119982);
+            pushFollow(FOLLOW_72);
             rule__InfixExpression__Group_1_2__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_2__2_in_rule__InfixExpression__Group_1_2__119985);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_2__2();
 
             state._fsp--;
@@ -28424,22 +28424,22 @@ public final void rule__InfixExpression__Group_1_2__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_2__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9895:1: rule__InfixExpression__Group_1_2__1__Impl : ( '.' ) ;
+    // InternalScope.g:9895:1: rule__InfixExpression__Group_1_2__1__Impl : ( '.' ) ;
     public final void rule__InfixExpression__Group_1_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9899:1: ( ( '.' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9900:1: ( '.' )
+            // InternalScope.g:9899:1: ( ( '.' ) )
+            // InternalScope.g:9900:1: ( '.' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9900:1: ( '.' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9901:1: '.'
+            // InternalScope.g:9900:1: ( '.' )
+            // InternalScope.g:9901:1: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getFullStopKeyword_1_2_1()); 
             }
-            match(input,68,FOLLOW_68_in_rule__InfixExpression__Group_1_2__1__Impl20013); if (state.failed) return ;
+            match(input,68,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInfixExpressionAccess().getFullStopKeyword_1_2_1()); 
             }
@@ -28465,21 +28465,21 @@ public final void rule__InfixExpression__Group_1_2__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_2__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9914:1: rule__InfixExpression__Group_1_2__2 : rule__InfixExpression__Group_1_2__2__Impl rule__InfixExpression__Group_1_2__3 ;
+    // InternalScope.g:9914:1: rule__InfixExpression__Group_1_2__2 : rule__InfixExpression__Group_1_2__2__Impl rule__InfixExpression__Group_1_2__3 ;
     public final void rule__InfixExpression__Group_1_2__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9918:1: ( rule__InfixExpression__Group_1_2__2__Impl rule__InfixExpression__Group_1_2__3 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9919:2: rule__InfixExpression__Group_1_2__2__Impl rule__InfixExpression__Group_1_2__3
+            // InternalScope.g:9918:1: ( rule__InfixExpression__Group_1_2__2__Impl rule__InfixExpression__Group_1_2__3 )
+            // InternalScope.g:9919:2: rule__InfixExpression__Group_1_2__2__Impl rule__InfixExpression__Group_1_2__3
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_2__2__Impl_in_rule__InfixExpression__Group_1_2__220044);
+            pushFollow(FOLLOW_32);
             rule__InfixExpression__Group_1_2__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_2__3_in_rule__InfixExpression__Group_1_2__220047);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_2__3();
 
             state._fsp--;
@@ -28503,25 +28503,25 @@ public final void rule__InfixExpression__Group_1_2__2() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_2__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9926:1: rule__InfixExpression__Group_1_2__2__Impl : ( ( rule__InfixExpression__NameAssignment_1_2_2 ) ) ;
+    // InternalScope.g:9926:1: rule__InfixExpression__Group_1_2__2__Impl : ( ( rule__InfixExpression__NameAssignment_1_2_2 ) ) ;
     public final void rule__InfixExpression__Group_1_2__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9930:1: ( ( ( rule__InfixExpression__NameAssignment_1_2_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9931:1: ( ( rule__InfixExpression__NameAssignment_1_2_2 ) )
+            // InternalScope.g:9930:1: ( ( ( rule__InfixExpression__NameAssignment_1_2_2 ) ) )
+            // InternalScope.g:9931:1: ( ( rule__InfixExpression__NameAssignment_1_2_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9931:1: ( ( rule__InfixExpression__NameAssignment_1_2_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9932:1: ( rule__InfixExpression__NameAssignment_1_2_2 )
+            // InternalScope.g:9931:1: ( ( rule__InfixExpression__NameAssignment_1_2_2 ) )
+            // InternalScope.g:9932:1: ( rule__InfixExpression__NameAssignment_1_2_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getNameAssignment_1_2_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9933:1: ( rule__InfixExpression__NameAssignment_1_2_2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9933:2: rule__InfixExpression__NameAssignment_1_2_2
+            // InternalScope.g:9933:1: ( rule__InfixExpression__NameAssignment_1_2_2 )
+            // InternalScope.g:9933:2: rule__InfixExpression__NameAssignment_1_2_2
             {
-            pushFollow(FOLLOW_rule__InfixExpression__NameAssignment_1_2_2_in_rule__InfixExpression__Group_1_2__2__Impl20074);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__NameAssignment_1_2_2();
 
             state._fsp--;
@@ -28554,21 +28554,21 @@ public final void rule__InfixExpression__Group_1_2__2__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_2__3"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9943:1: rule__InfixExpression__Group_1_2__3 : rule__InfixExpression__Group_1_2__3__Impl rule__InfixExpression__Group_1_2__4 ;
+    // InternalScope.g:9943:1: rule__InfixExpression__Group_1_2__3 : rule__InfixExpression__Group_1_2__3__Impl rule__InfixExpression__Group_1_2__4 ;
     public final void rule__InfixExpression__Group_1_2__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9947:1: ( rule__InfixExpression__Group_1_2__3__Impl rule__InfixExpression__Group_1_2__4 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9948:2: rule__InfixExpression__Group_1_2__3__Impl rule__InfixExpression__Group_1_2__4
+            // InternalScope.g:9947:1: ( rule__InfixExpression__Group_1_2__3__Impl rule__InfixExpression__Group_1_2__4 )
+            // InternalScope.g:9948:2: rule__InfixExpression__Group_1_2__3__Impl rule__InfixExpression__Group_1_2__4
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_2__3__Impl_in_rule__InfixExpression__Group_1_2__320104);
+            pushFollow(FOLLOW_48);
             rule__InfixExpression__Group_1_2__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_2__4_in_rule__InfixExpression__Group_1_2__320107);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_2__4();
 
             state._fsp--;
@@ -28592,22 +28592,22 @@ public final void rule__InfixExpression__Group_1_2__3() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_2__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9955:1: rule__InfixExpression__Group_1_2__3__Impl : ( '(' ) ;
+    // InternalScope.g:9955:1: rule__InfixExpression__Group_1_2__3__Impl : ( '(' ) ;
     public final void rule__InfixExpression__Group_1_2__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9959:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9960:1: ( '(' )
+            // InternalScope.g:9959:1: ( ( '(' ) )
+            // InternalScope.g:9960:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9960:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9961:1: '('
+            // InternalScope.g:9960:1: ( '(' )
+            // InternalScope.g:9961:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getLeftParenthesisKeyword_1_2_3()); 
             }
-            match(input,51,FOLLOW_51_in_rule__InfixExpression__Group_1_2__3__Impl20135); if (state.failed) return ;
+            match(input,51,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInfixExpressionAccess().getLeftParenthesisKeyword_1_2_3()); 
             }
@@ -28633,21 +28633,21 @@ public final void rule__InfixExpression__Group_1_2__3__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_2__4"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9974:1: rule__InfixExpression__Group_1_2__4 : rule__InfixExpression__Group_1_2__4__Impl rule__InfixExpression__Group_1_2__5 ;
+    // InternalScope.g:9974:1: rule__InfixExpression__Group_1_2__4 : rule__InfixExpression__Group_1_2__4__Impl rule__InfixExpression__Group_1_2__5 ;
     public final void rule__InfixExpression__Group_1_2__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9978:1: ( rule__InfixExpression__Group_1_2__4__Impl rule__InfixExpression__Group_1_2__5 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9979:2: rule__InfixExpression__Group_1_2__4__Impl rule__InfixExpression__Group_1_2__5
+            // InternalScope.g:9978:1: ( rule__InfixExpression__Group_1_2__4__Impl rule__InfixExpression__Group_1_2__5 )
+            // InternalScope.g:9979:2: rule__InfixExpression__Group_1_2__4__Impl rule__InfixExpression__Group_1_2__5
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_2__4__Impl_in_rule__InfixExpression__Group_1_2__420166);
+            pushFollow(FOLLOW_23);
             rule__InfixExpression__Group_1_2__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_2__5_in_rule__InfixExpression__Group_1_2__420169);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_2__5();
 
             state._fsp--;
@@ -28671,25 +28671,25 @@ public final void rule__InfixExpression__Group_1_2__4() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_2__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9986:1: rule__InfixExpression__Group_1_2__4__Impl : ( ( rule__InfixExpression__TypeAssignment_1_2_4 ) ) ;
+    // InternalScope.g:9986:1: rule__InfixExpression__Group_1_2__4__Impl : ( ( rule__InfixExpression__TypeAssignment_1_2_4 ) ) ;
     public final void rule__InfixExpression__Group_1_2__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9990:1: ( ( ( rule__InfixExpression__TypeAssignment_1_2_4 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9991:1: ( ( rule__InfixExpression__TypeAssignment_1_2_4 ) )
+            // InternalScope.g:9990:1: ( ( ( rule__InfixExpression__TypeAssignment_1_2_4 ) ) )
+            // InternalScope.g:9991:1: ( ( rule__InfixExpression__TypeAssignment_1_2_4 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9991:1: ( ( rule__InfixExpression__TypeAssignment_1_2_4 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9992:1: ( rule__InfixExpression__TypeAssignment_1_2_4 )
+            // InternalScope.g:9991:1: ( ( rule__InfixExpression__TypeAssignment_1_2_4 ) )
+            // InternalScope.g:9992:1: ( rule__InfixExpression__TypeAssignment_1_2_4 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getTypeAssignment_1_2_4()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9993:1: ( rule__InfixExpression__TypeAssignment_1_2_4 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:9993:2: rule__InfixExpression__TypeAssignment_1_2_4
+            // InternalScope.g:9993:1: ( rule__InfixExpression__TypeAssignment_1_2_4 )
+            // InternalScope.g:9993:2: rule__InfixExpression__TypeAssignment_1_2_4
             {
-            pushFollow(FOLLOW_rule__InfixExpression__TypeAssignment_1_2_4_in_rule__InfixExpression__Group_1_2__4__Impl20196);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__TypeAssignment_1_2_4();
 
             state._fsp--;
@@ -28722,16 +28722,16 @@ public final void rule__InfixExpression__Group_1_2__4__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_2__5"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10003:1: rule__InfixExpression__Group_1_2__5 : rule__InfixExpression__Group_1_2__5__Impl ;
+    // InternalScope.g:10003:1: rule__InfixExpression__Group_1_2__5 : rule__InfixExpression__Group_1_2__5__Impl ;
     public final void rule__InfixExpression__Group_1_2__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10007:1: ( rule__InfixExpression__Group_1_2__5__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10008:2: rule__InfixExpression__Group_1_2__5__Impl
+            // InternalScope.g:10007:1: ( rule__InfixExpression__Group_1_2__5__Impl )
+            // InternalScope.g:10008:2: rule__InfixExpression__Group_1_2__5__Impl
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_2__5__Impl_in_rule__InfixExpression__Group_1_2__520226);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_2__5__Impl();
 
             state._fsp--;
@@ -28755,22 +28755,22 @@ public final void rule__InfixExpression__Group_1_2__5() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_2__5__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10014:1: rule__InfixExpression__Group_1_2__5__Impl : ( ')' ) ;
+    // InternalScope.g:10014:1: rule__InfixExpression__Group_1_2__5__Impl : ( ')' ) ;
     public final void rule__InfixExpression__Group_1_2__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10018:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10019:1: ( ')' )
+            // InternalScope.g:10018:1: ( ( ')' ) )
+            // InternalScope.g:10019:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10019:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10020:1: ')'
+            // InternalScope.g:10019:1: ( ')' )
+            // InternalScope.g:10020:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getRightParenthesisKeyword_1_2_5()); 
             }
-            match(input,52,FOLLOW_52_in_rule__InfixExpression__Group_1_2__5__Impl20254); if (state.failed) return ;
+            match(input,52,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInfixExpressionAccess().getRightParenthesisKeyword_1_2_5()); 
             }
@@ -28796,21 +28796,21 @@ public final void rule__InfixExpression__Group_1_2__5__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10045:1: rule__InfixExpression__Group_1_3__0 : rule__InfixExpression__Group_1_3__0__Impl rule__InfixExpression__Group_1_3__1 ;
+    // InternalScope.g:10045:1: rule__InfixExpression__Group_1_3__0 : rule__InfixExpression__Group_1_3__0__Impl rule__InfixExpression__Group_1_3__1 ;
     public final void rule__InfixExpression__Group_1_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10049:1: ( rule__InfixExpression__Group_1_3__0__Impl rule__InfixExpression__Group_1_3__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10050:2: rule__InfixExpression__Group_1_3__0__Impl rule__InfixExpression__Group_1_3__1
+            // InternalScope.g:10049:1: ( rule__InfixExpression__Group_1_3__0__Impl rule__InfixExpression__Group_1_3__1 )
+            // InternalScope.g:10050:2: rule__InfixExpression__Group_1_3__0__Impl rule__InfixExpression__Group_1_3__1
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3__0__Impl_in_rule__InfixExpression__Group_1_3__020297);
+            pushFollow(FOLLOW_45);
             rule__InfixExpression__Group_1_3__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3__1_in_rule__InfixExpression__Group_1_3__020300);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_3__1();
 
             state._fsp--;
@@ -28834,23 +28834,23 @@ public final void rule__InfixExpression__Group_1_3__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10057:1: rule__InfixExpression__Group_1_3__0__Impl : ( () ) ;
+    // InternalScope.g:10057:1: rule__InfixExpression__Group_1_3__0__Impl : ( () ) ;
     public final void rule__InfixExpression__Group_1_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10061:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10062:1: ( () )
+            // InternalScope.g:10061:1: ( ( () ) )
+            // InternalScope.g:10062:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10062:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10063:1: ()
+            // InternalScope.g:10062:1: ( () )
+            // InternalScope.g:10063:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getCollectionExpressionTargetAction_1_3_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10064:1: ()
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10066:1: 
+            // InternalScope.g:10064:1: ()
+            // InternalScope.g:10066:1: 
             {
             }
 
@@ -28875,21 +28875,21 @@ public final void rule__InfixExpression__Group_1_3__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10076:1: rule__InfixExpression__Group_1_3__1 : rule__InfixExpression__Group_1_3__1__Impl rule__InfixExpression__Group_1_3__2 ;
+    // InternalScope.g:10076:1: rule__InfixExpression__Group_1_3__1 : rule__InfixExpression__Group_1_3__1__Impl rule__InfixExpression__Group_1_3__2 ;
     public final void rule__InfixExpression__Group_1_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10080:1: ( rule__InfixExpression__Group_1_3__1__Impl rule__InfixExpression__Group_1_3__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10081:2: rule__InfixExpression__Group_1_3__1__Impl rule__InfixExpression__Group_1_3__2
+            // InternalScope.g:10080:1: ( rule__InfixExpression__Group_1_3__1__Impl rule__InfixExpression__Group_1_3__2 )
+            // InternalScope.g:10081:2: rule__InfixExpression__Group_1_3__1__Impl rule__InfixExpression__Group_1_3__2
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3__1__Impl_in_rule__InfixExpression__Group_1_3__120358);
+            pushFollow(FOLLOW_73);
             rule__InfixExpression__Group_1_3__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3__2_in_rule__InfixExpression__Group_1_3__120361);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_3__2();
 
             state._fsp--;
@@ -28913,22 +28913,22 @@ public final void rule__InfixExpression__Group_1_3__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10088:1: rule__InfixExpression__Group_1_3__1__Impl : ( '.' ) ;
+    // InternalScope.g:10088:1: rule__InfixExpression__Group_1_3__1__Impl : ( '.' ) ;
     public final void rule__InfixExpression__Group_1_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10092:1: ( ( '.' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10093:1: ( '.' )
+            // InternalScope.g:10092:1: ( ( '.' ) )
+            // InternalScope.g:10093:1: ( '.' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10093:1: ( '.' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10094:1: '.'
+            // InternalScope.g:10093:1: ( '.' )
+            // InternalScope.g:10094:1: '.'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getFullStopKeyword_1_3_1()); 
             }
-            match(input,68,FOLLOW_68_in_rule__InfixExpression__Group_1_3__1__Impl20389); if (state.failed) return ;
+            match(input,68,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInfixExpressionAccess().getFullStopKeyword_1_3_1()); 
             }
@@ -28954,21 +28954,21 @@ public final void rule__InfixExpression__Group_1_3__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10107:1: rule__InfixExpression__Group_1_3__2 : rule__InfixExpression__Group_1_3__2__Impl rule__InfixExpression__Group_1_3__3 ;
+    // InternalScope.g:10107:1: rule__InfixExpression__Group_1_3__2 : rule__InfixExpression__Group_1_3__2__Impl rule__InfixExpression__Group_1_3__3 ;
     public final void rule__InfixExpression__Group_1_3__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10111:1: ( rule__InfixExpression__Group_1_3__2__Impl rule__InfixExpression__Group_1_3__3 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10112:2: rule__InfixExpression__Group_1_3__2__Impl rule__InfixExpression__Group_1_3__3
+            // InternalScope.g:10111:1: ( rule__InfixExpression__Group_1_3__2__Impl rule__InfixExpression__Group_1_3__3 )
+            // InternalScope.g:10112:2: rule__InfixExpression__Group_1_3__2__Impl rule__InfixExpression__Group_1_3__3
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3__2__Impl_in_rule__InfixExpression__Group_1_3__220420);
+            pushFollow(FOLLOW_32);
             rule__InfixExpression__Group_1_3__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3__3_in_rule__InfixExpression__Group_1_3__220423);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_3__3();
 
             state._fsp--;
@@ -28992,25 +28992,25 @@ public final void rule__InfixExpression__Group_1_3__2() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10119:1: rule__InfixExpression__Group_1_3__2__Impl : ( ( rule__InfixExpression__NameAssignment_1_3_2 ) ) ;
+    // InternalScope.g:10119:1: rule__InfixExpression__Group_1_3__2__Impl : ( ( rule__InfixExpression__NameAssignment_1_3_2 ) ) ;
     public final void rule__InfixExpression__Group_1_3__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10123:1: ( ( ( rule__InfixExpression__NameAssignment_1_3_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10124:1: ( ( rule__InfixExpression__NameAssignment_1_3_2 ) )
+            // InternalScope.g:10123:1: ( ( ( rule__InfixExpression__NameAssignment_1_3_2 ) ) )
+            // InternalScope.g:10124:1: ( ( rule__InfixExpression__NameAssignment_1_3_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10124:1: ( ( rule__InfixExpression__NameAssignment_1_3_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10125:1: ( rule__InfixExpression__NameAssignment_1_3_2 )
+            // InternalScope.g:10124:1: ( ( rule__InfixExpression__NameAssignment_1_3_2 ) )
+            // InternalScope.g:10125:1: ( rule__InfixExpression__NameAssignment_1_3_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getNameAssignment_1_3_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10126:1: ( rule__InfixExpression__NameAssignment_1_3_2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10126:2: rule__InfixExpression__NameAssignment_1_3_2
+            // InternalScope.g:10126:1: ( rule__InfixExpression__NameAssignment_1_3_2 )
+            // InternalScope.g:10126:2: rule__InfixExpression__NameAssignment_1_3_2
             {
-            pushFollow(FOLLOW_rule__InfixExpression__NameAssignment_1_3_2_in_rule__InfixExpression__Group_1_3__2__Impl20450);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__NameAssignment_1_3_2();
 
             state._fsp--;
@@ -29043,21 +29043,21 @@ public final void rule__InfixExpression__Group_1_3__2__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3__3"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10136:1: rule__InfixExpression__Group_1_3__3 : rule__InfixExpression__Group_1_3__3__Impl rule__InfixExpression__Group_1_3__4 ;
+    // InternalScope.g:10136:1: rule__InfixExpression__Group_1_3__3 : rule__InfixExpression__Group_1_3__3__Impl rule__InfixExpression__Group_1_3__4 ;
     public final void rule__InfixExpression__Group_1_3__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10140:1: ( rule__InfixExpression__Group_1_3__3__Impl rule__InfixExpression__Group_1_3__4 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10141:2: rule__InfixExpression__Group_1_3__3__Impl rule__InfixExpression__Group_1_3__4
+            // InternalScope.g:10140:1: ( rule__InfixExpression__Group_1_3__3__Impl rule__InfixExpression__Group_1_3__4 )
+            // InternalScope.g:10141:2: rule__InfixExpression__Group_1_3__3__Impl rule__InfixExpression__Group_1_3__4
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3__3__Impl_in_rule__InfixExpression__Group_1_3__320480);
+            pushFollow(FOLLOW_17);
             rule__InfixExpression__Group_1_3__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3__4_in_rule__InfixExpression__Group_1_3__320483);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_3__4();
 
             state._fsp--;
@@ -29081,22 +29081,22 @@ public final void rule__InfixExpression__Group_1_3__3() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10148:1: rule__InfixExpression__Group_1_3__3__Impl : ( '(' ) ;
+    // InternalScope.g:10148:1: rule__InfixExpression__Group_1_3__3__Impl : ( '(' ) ;
     public final void rule__InfixExpression__Group_1_3__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10152:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10153:1: ( '(' )
+            // InternalScope.g:10152:1: ( ( '(' ) )
+            // InternalScope.g:10153:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10153:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10154:1: '('
+            // InternalScope.g:10153:1: ( '(' )
+            // InternalScope.g:10154:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getLeftParenthesisKeyword_1_3_3()); 
             }
-            match(input,51,FOLLOW_51_in_rule__InfixExpression__Group_1_3__3__Impl20511); if (state.failed) return ;
+            match(input,51,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInfixExpressionAccess().getLeftParenthesisKeyword_1_3_3()); 
             }
@@ -29122,21 +29122,21 @@ public final void rule__InfixExpression__Group_1_3__3__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3__4"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10167:1: rule__InfixExpression__Group_1_3__4 : rule__InfixExpression__Group_1_3__4__Impl rule__InfixExpression__Group_1_3__5 ;
+    // InternalScope.g:10167:1: rule__InfixExpression__Group_1_3__4 : rule__InfixExpression__Group_1_3__4__Impl rule__InfixExpression__Group_1_3__5 ;
     public final void rule__InfixExpression__Group_1_3__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10171:1: ( rule__InfixExpression__Group_1_3__4__Impl rule__InfixExpression__Group_1_3__5 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10172:2: rule__InfixExpression__Group_1_3__4__Impl rule__InfixExpression__Group_1_3__5
+            // InternalScope.g:10171:1: ( rule__InfixExpression__Group_1_3__4__Impl rule__InfixExpression__Group_1_3__5 )
+            // InternalScope.g:10172:2: rule__InfixExpression__Group_1_3__4__Impl rule__InfixExpression__Group_1_3__5
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3__4__Impl_in_rule__InfixExpression__Group_1_3__420542);
+            pushFollow(FOLLOW_17);
             rule__InfixExpression__Group_1_3__4__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3__5_in_rule__InfixExpression__Group_1_3__420545);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_3__5();
 
             state._fsp--;
@@ -29160,22 +29160,22 @@ public final void rule__InfixExpression__Group_1_3__4() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10179:1: rule__InfixExpression__Group_1_3__4__Impl : ( ( rule__InfixExpression__Group_1_3_4__0 )? ) ;
+    // InternalScope.g:10179:1: rule__InfixExpression__Group_1_3__4__Impl : ( ( rule__InfixExpression__Group_1_3_4__0 )? ) ;
     public final void rule__InfixExpression__Group_1_3__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10183:1: ( ( ( rule__InfixExpression__Group_1_3_4__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10184:1: ( ( rule__InfixExpression__Group_1_3_4__0 )? )
+            // InternalScope.g:10183:1: ( ( ( rule__InfixExpression__Group_1_3_4__0 )? ) )
+            // InternalScope.g:10184:1: ( ( rule__InfixExpression__Group_1_3_4__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10184:1: ( ( rule__InfixExpression__Group_1_3_4__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10185:1: ( rule__InfixExpression__Group_1_3_4__0 )?
+            // InternalScope.g:10184:1: ( ( rule__InfixExpression__Group_1_3_4__0 )? )
+            // InternalScope.g:10185:1: ( rule__InfixExpression__Group_1_3_4__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getGroup_1_3_4()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10186:1: ( rule__InfixExpression__Group_1_3_4__0 )?
+            // InternalScope.g:10186:1: ( rule__InfixExpression__Group_1_3_4__0 )?
             int alt69=2;
             int LA69_0 = input.LA(1);
 
@@ -29188,9 +29188,9 @@ public final void rule__InfixExpression__Group_1_3__4__Impl() throws Recognition
             }
             switch (alt69) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10186:2: rule__InfixExpression__Group_1_3_4__0
+                    // InternalScope.g:10186:2: rule__InfixExpression__Group_1_3_4__0
                     {
-                    pushFollow(FOLLOW_rule__InfixExpression__Group_1_3_4__0_in_rule__InfixExpression__Group_1_3__4__Impl20572);
+                    pushFollow(FOLLOW_2);
                     rule__InfixExpression__Group_1_3_4__0();
 
                     state._fsp--;
@@ -29226,21 +29226,21 @@ public final void rule__InfixExpression__Group_1_3__4__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3__5"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10196:1: rule__InfixExpression__Group_1_3__5 : rule__InfixExpression__Group_1_3__5__Impl rule__InfixExpression__Group_1_3__6 ;
+    // InternalScope.g:10196:1: rule__InfixExpression__Group_1_3__5 : rule__InfixExpression__Group_1_3__5__Impl rule__InfixExpression__Group_1_3__6 ;
     public final void rule__InfixExpression__Group_1_3__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10200:1: ( rule__InfixExpression__Group_1_3__5__Impl rule__InfixExpression__Group_1_3__6 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10201:2: rule__InfixExpression__Group_1_3__5__Impl rule__InfixExpression__Group_1_3__6
+            // InternalScope.g:10200:1: ( rule__InfixExpression__Group_1_3__5__Impl rule__InfixExpression__Group_1_3__6 )
+            // InternalScope.g:10201:2: rule__InfixExpression__Group_1_3__5__Impl rule__InfixExpression__Group_1_3__6
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3__5__Impl_in_rule__InfixExpression__Group_1_3__520603);
+            pushFollow(FOLLOW_23);
             rule__InfixExpression__Group_1_3__5__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3__6_in_rule__InfixExpression__Group_1_3__520606);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_3__6();
 
             state._fsp--;
@@ -29264,25 +29264,25 @@ public final void rule__InfixExpression__Group_1_3__5() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3__5__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10208:1: rule__InfixExpression__Group_1_3__5__Impl : ( ( rule__InfixExpression__ExpAssignment_1_3_5 ) ) ;
+    // InternalScope.g:10208:1: rule__InfixExpression__Group_1_3__5__Impl : ( ( rule__InfixExpression__ExpAssignment_1_3_5 ) ) ;
     public final void rule__InfixExpression__Group_1_3__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10212:1: ( ( ( rule__InfixExpression__ExpAssignment_1_3_5 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10213:1: ( ( rule__InfixExpression__ExpAssignment_1_3_5 ) )
+            // InternalScope.g:10212:1: ( ( ( rule__InfixExpression__ExpAssignment_1_3_5 ) ) )
+            // InternalScope.g:10213:1: ( ( rule__InfixExpression__ExpAssignment_1_3_5 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10213:1: ( ( rule__InfixExpression__ExpAssignment_1_3_5 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10214:1: ( rule__InfixExpression__ExpAssignment_1_3_5 )
+            // InternalScope.g:10213:1: ( ( rule__InfixExpression__ExpAssignment_1_3_5 ) )
+            // InternalScope.g:10214:1: ( rule__InfixExpression__ExpAssignment_1_3_5 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getExpAssignment_1_3_5()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10215:1: ( rule__InfixExpression__ExpAssignment_1_3_5 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10215:2: rule__InfixExpression__ExpAssignment_1_3_5
+            // InternalScope.g:10215:1: ( rule__InfixExpression__ExpAssignment_1_3_5 )
+            // InternalScope.g:10215:2: rule__InfixExpression__ExpAssignment_1_3_5
             {
-            pushFollow(FOLLOW_rule__InfixExpression__ExpAssignment_1_3_5_in_rule__InfixExpression__Group_1_3__5__Impl20633);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__ExpAssignment_1_3_5();
 
             state._fsp--;
@@ -29315,16 +29315,16 @@ public final void rule__InfixExpression__Group_1_3__5__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3__6"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10225:1: rule__InfixExpression__Group_1_3__6 : rule__InfixExpression__Group_1_3__6__Impl ;
+    // InternalScope.g:10225:1: rule__InfixExpression__Group_1_3__6 : rule__InfixExpression__Group_1_3__6__Impl ;
     public final void rule__InfixExpression__Group_1_3__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10229:1: ( rule__InfixExpression__Group_1_3__6__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10230:2: rule__InfixExpression__Group_1_3__6__Impl
+            // InternalScope.g:10229:1: ( rule__InfixExpression__Group_1_3__6__Impl )
+            // InternalScope.g:10230:2: rule__InfixExpression__Group_1_3__6__Impl
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3__6__Impl_in_rule__InfixExpression__Group_1_3__620663);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_3__6__Impl();
 
             state._fsp--;
@@ -29348,22 +29348,22 @@ public final void rule__InfixExpression__Group_1_3__6() throws RecognitionExcept
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3__6__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10236:1: rule__InfixExpression__Group_1_3__6__Impl : ( ')' ) ;
+    // InternalScope.g:10236:1: rule__InfixExpression__Group_1_3__6__Impl : ( ')' ) ;
     public final void rule__InfixExpression__Group_1_3__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10240:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10241:1: ( ')' )
+            // InternalScope.g:10240:1: ( ( ')' ) )
+            // InternalScope.g:10241:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10241:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10242:1: ')'
+            // InternalScope.g:10241:1: ( ')' )
+            // InternalScope.g:10242:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getRightParenthesisKeyword_1_3_6()); 
             }
-            match(input,52,FOLLOW_52_in_rule__InfixExpression__Group_1_3__6__Impl20691); if (state.failed) return ;
+            match(input,52,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInfixExpressionAccess().getRightParenthesisKeyword_1_3_6()); 
             }
@@ -29389,21 +29389,21 @@ public final void rule__InfixExpression__Group_1_3__6__Impl() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3_4__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10269:1: rule__InfixExpression__Group_1_3_4__0 : rule__InfixExpression__Group_1_3_4__0__Impl rule__InfixExpression__Group_1_3_4__1 ;
+    // InternalScope.g:10269:1: rule__InfixExpression__Group_1_3_4__0 : rule__InfixExpression__Group_1_3_4__0__Impl rule__InfixExpression__Group_1_3_4__1 ;
     public final void rule__InfixExpression__Group_1_3_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10273:1: ( rule__InfixExpression__Group_1_3_4__0__Impl rule__InfixExpression__Group_1_3_4__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10274:2: rule__InfixExpression__Group_1_3_4__0__Impl rule__InfixExpression__Group_1_3_4__1
+            // InternalScope.g:10273:1: ( rule__InfixExpression__Group_1_3_4__0__Impl rule__InfixExpression__Group_1_3_4__1 )
+            // InternalScope.g:10274:2: rule__InfixExpression__Group_1_3_4__0__Impl rule__InfixExpression__Group_1_3_4__1
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3_4__0__Impl_in_rule__InfixExpression__Group_1_3_4__020736);
+            pushFollow(FOLLOW_31);
             rule__InfixExpression__Group_1_3_4__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3_4__1_in_rule__InfixExpression__Group_1_3_4__020739);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_3_4__1();
 
             state._fsp--;
@@ -29427,25 +29427,25 @@ public final void rule__InfixExpression__Group_1_3_4__0() throws RecognitionExce
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3_4__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10281:1: rule__InfixExpression__Group_1_3_4__0__Impl : ( ( rule__InfixExpression__VarAssignment_1_3_4_0 ) ) ;
+    // InternalScope.g:10281:1: rule__InfixExpression__Group_1_3_4__0__Impl : ( ( rule__InfixExpression__VarAssignment_1_3_4_0 ) ) ;
     public final void rule__InfixExpression__Group_1_3_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10285:1: ( ( ( rule__InfixExpression__VarAssignment_1_3_4_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10286:1: ( ( rule__InfixExpression__VarAssignment_1_3_4_0 ) )
+            // InternalScope.g:10285:1: ( ( ( rule__InfixExpression__VarAssignment_1_3_4_0 ) ) )
+            // InternalScope.g:10286:1: ( ( rule__InfixExpression__VarAssignment_1_3_4_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10286:1: ( ( rule__InfixExpression__VarAssignment_1_3_4_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10287:1: ( rule__InfixExpression__VarAssignment_1_3_4_0 )
+            // InternalScope.g:10286:1: ( ( rule__InfixExpression__VarAssignment_1_3_4_0 ) )
+            // InternalScope.g:10287:1: ( rule__InfixExpression__VarAssignment_1_3_4_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getVarAssignment_1_3_4_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10288:1: ( rule__InfixExpression__VarAssignment_1_3_4_0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10288:2: rule__InfixExpression__VarAssignment_1_3_4_0
+            // InternalScope.g:10288:1: ( rule__InfixExpression__VarAssignment_1_3_4_0 )
+            // InternalScope.g:10288:2: rule__InfixExpression__VarAssignment_1_3_4_0
             {
-            pushFollow(FOLLOW_rule__InfixExpression__VarAssignment_1_3_4_0_in_rule__InfixExpression__Group_1_3_4__0__Impl20766);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__VarAssignment_1_3_4_0();
 
             state._fsp--;
@@ -29478,16 +29478,16 @@ public final void rule__InfixExpression__Group_1_3_4__0__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3_4__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10298:1: rule__InfixExpression__Group_1_3_4__1 : rule__InfixExpression__Group_1_3_4__1__Impl ;
+    // InternalScope.g:10298:1: rule__InfixExpression__Group_1_3_4__1 : rule__InfixExpression__Group_1_3_4__1__Impl ;
     public final void rule__InfixExpression__Group_1_3_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10302:1: ( rule__InfixExpression__Group_1_3_4__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10303:2: rule__InfixExpression__Group_1_3_4__1__Impl
+            // InternalScope.g:10302:1: ( rule__InfixExpression__Group_1_3_4__1__Impl )
+            // InternalScope.g:10303:2: rule__InfixExpression__Group_1_3_4__1__Impl
             {
-            pushFollow(FOLLOW_rule__InfixExpression__Group_1_3_4__1__Impl_in_rule__InfixExpression__Group_1_3_4__120796);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__Group_1_3_4__1__Impl();
 
             state._fsp--;
@@ -29511,22 +29511,22 @@ public final void rule__InfixExpression__Group_1_3_4__1() throws RecognitionExce
 
 
     // $ANTLR start "rule__InfixExpression__Group_1_3_4__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10309:1: rule__InfixExpression__Group_1_3_4__1__Impl : ( '|' ) ;
+    // InternalScope.g:10309:1: rule__InfixExpression__Group_1_3_4__1__Impl : ( '|' ) ;
     public final void rule__InfixExpression__Group_1_3_4__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10313:1: ( ( '|' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10314:1: ( '|' )
+            // InternalScope.g:10313:1: ( ( '|' ) )
+            // InternalScope.g:10314:1: ( '|' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10314:1: ( '|' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10315:1: '|'
+            // InternalScope.g:10314:1: ( '|' )
+            // InternalScope.g:10315:1: '|'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getVerticalLineKeyword_1_3_4_1()); 
             }
-            match(input,58,FOLLOW_58_in_rule__InfixExpression__Group_1_3_4__1__Impl20824); if (state.failed) return ;
+            match(input,58,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInfixExpressionAccess().getVerticalLineKeyword_1_3_4_1()); 
             }
@@ -29552,21 +29552,21 @@ public final void rule__InfixExpression__Group_1_3_4__1__Impl() throws Recogniti
 
 
     // $ANTLR start "rule__ParanthesizedExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10332:1: rule__ParanthesizedExpression__Group__0 : rule__ParanthesizedExpression__Group__0__Impl rule__ParanthesizedExpression__Group__1 ;
+    // InternalScope.g:10332:1: rule__ParanthesizedExpression__Group__0 : rule__ParanthesizedExpression__Group__0__Impl rule__ParanthesizedExpression__Group__1 ;
     public final void rule__ParanthesizedExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10336:1: ( rule__ParanthesizedExpression__Group__0__Impl rule__ParanthesizedExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10337:2: rule__ParanthesizedExpression__Group__0__Impl rule__ParanthesizedExpression__Group__1
+            // InternalScope.g:10336:1: ( rule__ParanthesizedExpression__Group__0__Impl rule__ParanthesizedExpression__Group__1 )
+            // InternalScope.g:10337:2: rule__ParanthesizedExpression__Group__0__Impl rule__ParanthesizedExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__ParanthesizedExpression__Group__0__Impl_in_rule__ParanthesizedExpression__Group__020859);
+            pushFollow(FOLLOW_17);
             rule__ParanthesizedExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ParanthesizedExpression__Group__1_in_rule__ParanthesizedExpression__Group__020862);
+            pushFollow(FOLLOW_2);
             rule__ParanthesizedExpression__Group__1();
 
             state._fsp--;
@@ -29590,22 +29590,22 @@ public final void rule__ParanthesizedExpression__Group__0() throws RecognitionEx
 
 
     // $ANTLR start "rule__ParanthesizedExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10344:1: rule__ParanthesizedExpression__Group__0__Impl : ( '(' ) ;
+    // InternalScope.g:10344:1: rule__ParanthesizedExpression__Group__0__Impl : ( '(' ) ;
     public final void rule__ParanthesizedExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10348:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10349:1: ( '(' )
+            // InternalScope.g:10348:1: ( ( '(' ) )
+            // InternalScope.g:10349:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10349:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10350:1: '('
+            // InternalScope.g:10349:1: ( '(' )
+            // InternalScope.g:10350:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getParanthesizedExpressionAccess().getLeftParenthesisKeyword_0()); 
             }
-            match(input,51,FOLLOW_51_in_rule__ParanthesizedExpression__Group__0__Impl20890); if (state.failed) return ;
+            match(input,51,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getParanthesizedExpressionAccess().getLeftParenthesisKeyword_0()); 
             }
@@ -29631,21 +29631,21 @@ public final void rule__ParanthesizedExpression__Group__0__Impl() throws Recogni
 
 
     // $ANTLR start "rule__ParanthesizedExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10363:1: rule__ParanthesizedExpression__Group__1 : rule__ParanthesizedExpression__Group__1__Impl rule__ParanthesizedExpression__Group__2 ;
+    // InternalScope.g:10363:1: rule__ParanthesizedExpression__Group__1 : rule__ParanthesizedExpression__Group__1__Impl rule__ParanthesizedExpression__Group__2 ;
     public final void rule__ParanthesizedExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10367:1: ( rule__ParanthesizedExpression__Group__1__Impl rule__ParanthesizedExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10368:2: rule__ParanthesizedExpression__Group__1__Impl rule__ParanthesizedExpression__Group__2
+            // InternalScope.g:10367:1: ( rule__ParanthesizedExpression__Group__1__Impl rule__ParanthesizedExpression__Group__2 )
+            // InternalScope.g:10368:2: rule__ParanthesizedExpression__Group__1__Impl rule__ParanthesizedExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__ParanthesizedExpression__Group__1__Impl_in_rule__ParanthesizedExpression__Group__120921);
+            pushFollow(FOLLOW_23);
             rule__ParanthesizedExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ParanthesizedExpression__Group__2_in_rule__ParanthesizedExpression__Group__120924);
+            pushFollow(FOLLOW_2);
             rule__ParanthesizedExpression__Group__2();
 
             state._fsp--;
@@ -29669,22 +29669,22 @@ public final void rule__ParanthesizedExpression__Group__1() throws RecognitionEx
 
 
     // $ANTLR start "rule__ParanthesizedExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10375:1: rule__ParanthesizedExpression__Group__1__Impl : ( ruleExpression ) ;
+    // InternalScope.g:10375:1: rule__ParanthesizedExpression__Group__1__Impl : ( ruleExpression ) ;
     public final void rule__ParanthesizedExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10379:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10380:1: ( ruleExpression )
+            // InternalScope.g:10379:1: ( ( ruleExpression ) )
+            // InternalScope.g:10380:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10380:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10381:1: ruleExpression
+            // InternalScope.g:10380:1: ( ruleExpression )
+            // InternalScope.g:10381:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getParanthesizedExpressionAccess().getExpressionParserRuleCall_1()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__ParanthesizedExpression__Group__1__Impl20951);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -29714,16 +29714,16 @@ public final void rule__ParanthesizedExpression__Group__1__Impl() throws Recogni
 
 
     // $ANTLR start "rule__ParanthesizedExpression__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10392:1: rule__ParanthesizedExpression__Group__2 : rule__ParanthesizedExpression__Group__2__Impl ;
+    // InternalScope.g:10392:1: rule__ParanthesizedExpression__Group__2 : rule__ParanthesizedExpression__Group__2__Impl ;
     public final void rule__ParanthesizedExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10396:1: ( rule__ParanthesizedExpression__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10397:2: rule__ParanthesizedExpression__Group__2__Impl
+            // InternalScope.g:10396:1: ( rule__ParanthesizedExpression__Group__2__Impl )
+            // InternalScope.g:10397:2: rule__ParanthesizedExpression__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__ParanthesizedExpression__Group__2__Impl_in_rule__ParanthesizedExpression__Group__220980);
+            pushFollow(FOLLOW_2);
             rule__ParanthesizedExpression__Group__2__Impl();
 
             state._fsp--;
@@ -29747,22 +29747,22 @@ public final void rule__ParanthesizedExpression__Group__2() throws RecognitionEx
 
 
     // $ANTLR start "rule__ParanthesizedExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10403:1: rule__ParanthesizedExpression__Group__2__Impl : ( ')' ) ;
+    // InternalScope.g:10403:1: rule__ParanthesizedExpression__Group__2__Impl : ( ')' ) ;
     public final void rule__ParanthesizedExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10407:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10408:1: ( ')' )
+            // InternalScope.g:10407:1: ( ( ')' ) )
+            // InternalScope.g:10408:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10408:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10409:1: ')'
+            // InternalScope.g:10408:1: ( ')' )
+            // InternalScope.g:10409:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getParanthesizedExpressionAccess().getRightParenthesisKeyword_2()); 
             }
-            match(input,52,FOLLOW_52_in_rule__ParanthesizedExpression__Group__2__Impl21008); if (state.failed) return ;
+            match(input,52,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getParanthesizedExpressionAccess().getRightParenthesisKeyword_2()); 
             }
@@ -29788,21 +29788,21 @@ public final void rule__ParanthesizedExpression__Group__2__Impl() throws Recogni
 
 
     // $ANTLR start "rule__GlobalVarExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10428:1: rule__GlobalVarExpression__Group__0 : rule__GlobalVarExpression__Group__0__Impl rule__GlobalVarExpression__Group__1 ;
+    // InternalScope.g:10428:1: rule__GlobalVarExpression__Group__0 : rule__GlobalVarExpression__Group__0__Impl rule__GlobalVarExpression__Group__1 ;
     public final void rule__GlobalVarExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10432:1: ( rule__GlobalVarExpression__Group__0__Impl rule__GlobalVarExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10433:2: rule__GlobalVarExpression__Group__0__Impl rule__GlobalVarExpression__Group__1
+            // InternalScope.g:10432:1: ( rule__GlobalVarExpression__Group__0__Impl rule__GlobalVarExpression__Group__1 )
+            // InternalScope.g:10433:2: rule__GlobalVarExpression__Group__0__Impl rule__GlobalVarExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__GlobalVarExpression__Group__0__Impl_in_rule__GlobalVarExpression__Group__021045);
+            pushFollow(FOLLOW_3);
             rule__GlobalVarExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__GlobalVarExpression__Group__1_in_rule__GlobalVarExpression__Group__021048);
+            pushFollow(FOLLOW_2);
             rule__GlobalVarExpression__Group__1();
 
             state._fsp--;
@@ -29826,22 +29826,22 @@ public final void rule__GlobalVarExpression__Group__0() throws RecognitionExcept
 
 
     // $ANTLR start "rule__GlobalVarExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10440:1: rule__GlobalVarExpression__Group__0__Impl : ( 'GLOBALVAR' ) ;
+    // InternalScope.g:10440:1: rule__GlobalVarExpression__Group__0__Impl : ( 'GLOBALVAR' ) ;
     public final void rule__GlobalVarExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10444:1: ( ( 'GLOBALVAR' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10445:1: ( 'GLOBALVAR' )
+            // InternalScope.g:10444:1: ( ( 'GLOBALVAR' ) )
+            // InternalScope.g:10445:1: ( 'GLOBALVAR' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10445:1: ( 'GLOBALVAR' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10446:1: 'GLOBALVAR'
+            // InternalScope.g:10445:1: ( 'GLOBALVAR' )
+            // InternalScope.g:10446:1: 'GLOBALVAR'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalVarExpressionAccess().getGLOBALVARKeyword_0()); 
             }
-            match(input,78,FOLLOW_78_in_rule__GlobalVarExpression__Group__0__Impl21076); if (state.failed) return ;
+            match(input,78,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGlobalVarExpressionAccess().getGLOBALVARKeyword_0()); 
             }
@@ -29867,16 +29867,16 @@ public final void rule__GlobalVarExpression__Group__0__Impl() throws Recognition
 
 
     // $ANTLR start "rule__GlobalVarExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10459:1: rule__GlobalVarExpression__Group__1 : rule__GlobalVarExpression__Group__1__Impl ;
+    // InternalScope.g:10459:1: rule__GlobalVarExpression__Group__1 : rule__GlobalVarExpression__Group__1__Impl ;
     public final void rule__GlobalVarExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10463:1: ( rule__GlobalVarExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10464:2: rule__GlobalVarExpression__Group__1__Impl
+            // InternalScope.g:10463:1: ( rule__GlobalVarExpression__Group__1__Impl )
+            // InternalScope.g:10464:2: rule__GlobalVarExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__GlobalVarExpression__Group__1__Impl_in_rule__GlobalVarExpression__Group__121107);
+            pushFollow(FOLLOW_2);
             rule__GlobalVarExpression__Group__1__Impl();
 
             state._fsp--;
@@ -29900,25 +29900,25 @@ public final void rule__GlobalVarExpression__Group__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__GlobalVarExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10470:1: rule__GlobalVarExpression__Group__1__Impl : ( ( rule__GlobalVarExpression__NameAssignment_1 ) ) ;
+    // InternalScope.g:10470:1: rule__GlobalVarExpression__Group__1__Impl : ( ( rule__GlobalVarExpression__NameAssignment_1 ) ) ;
     public final void rule__GlobalVarExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10474:1: ( ( ( rule__GlobalVarExpression__NameAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10475:1: ( ( rule__GlobalVarExpression__NameAssignment_1 ) )
+            // InternalScope.g:10474:1: ( ( ( rule__GlobalVarExpression__NameAssignment_1 ) ) )
+            // InternalScope.g:10475:1: ( ( rule__GlobalVarExpression__NameAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10475:1: ( ( rule__GlobalVarExpression__NameAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10476:1: ( rule__GlobalVarExpression__NameAssignment_1 )
+            // InternalScope.g:10475:1: ( ( rule__GlobalVarExpression__NameAssignment_1 ) )
+            // InternalScope.g:10476:1: ( rule__GlobalVarExpression__NameAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalVarExpressionAccess().getNameAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10477:1: ( rule__GlobalVarExpression__NameAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10477:2: rule__GlobalVarExpression__NameAssignment_1
+            // InternalScope.g:10477:1: ( rule__GlobalVarExpression__NameAssignment_1 )
+            // InternalScope.g:10477:2: rule__GlobalVarExpression__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__GlobalVarExpression__NameAssignment_1_in_rule__GlobalVarExpression__Group__1__Impl21134);
+            pushFollow(FOLLOW_2);
             rule__GlobalVarExpression__NameAssignment_1();
 
             state._fsp--;
@@ -29951,21 +29951,21 @@ public final void rule__GlobalVarExpression__Group__1__Impl() throws Recognition
 
 
     // $ANTLR start "rule__OperationCall__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10491:1: rule__OperationCall__Group__0 : rule__OperationCall__Group__0__Impl rule__OperationCall__Group__1 ;
+    // InternalScope.g:10491:1: rule__OperationCall__Group__0 : rule__OperationCall__Group__0__Impl rule__OperationCall__Group__1 ;
     public final void rule__OperationCall__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10495:1: ( rule__OperationCall__Group__0__Impl rule__OperationCall__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10496:2: rule__OperationCall__Group__0__Impl rule__OperationCall__Group__1
+            // InternalScope.g:10495:1: ( rule__OperationCall__Group__0__Impl rule__OperationCall__Group__1 )
+            // InternalScope.g:10496:2: rule__OperationCall__Group__0__Impl rule__OperationCall__Group__1
             {
-            pushFollow(FOLLOW_rule__OperationCall__Group__0__Impl_in_rule__OperationCall__Group__021168);
+            pushFollow(FOLLOW_32);
             rule__OperationCall__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OperationCall__Group__1_in_rule__OperationCall__Group__021171);
+            pushFollow(FOLLOW_2);
             rule__OperationCall__Group__1();
 
             state._fsp--;
@@ -29989,25 +29989,25 @@ public final void rule__OperationCall__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__OperationCall__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10503:1: rule__OperationCall__Group__0__Impl : ( ( rule__OperationCall__NameAssignment_0 ) ) ;
+    // InternalScope.g:10503:1: rule__OperationCall__Group__0__Impl : ( ( rule__OperationCall__NameAssignment_0 ) ) ;
     public final void rule__OperationCall__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10507:1: ( ( ( rule__OperationCall__NameAssignment_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10508:1: ( ( rule__OperationCall__NameAssignment_0 ) )
+            // InternalScope.g:10507:1: ( ( ( rule__OperationCall__NameAssignment_0 ) ) )
+            // InternalScope.g:10508:1: ( ( rule__OperationCall__NameAssignment_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10508:1: ( ( rule__OperationCall__NameAssignment_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10509:1: ( rule__OperationCall__NameAssignment_0 )
+            // InternalScope.g:10508:1: ( ( rule__OperationCall__NameAssignment_0 ) )
+            // InternalScope.g:10509:1: ( rule__OperationCall__NameAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOperationCallAccess().getNameAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10510:1: ( rule__OperationCall__NameAssignment_0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10510:2: rule__OperationCall__NameAssignment_0
+            // InternalScope.g:10510:1: ( rule__OperationCall__NameAssignment_0 )
+            // InternalScope.g:10510:2: rule__OperationCall__NameAssignment_0
             {
-            pushFollow(FOLLOW_rule__OperationCall__NameAssignment_0_in_rule__OperationCall__Group__0__Impl21198);
+            pushFollow(FOLLOW_2);
             rule__OperationCall__NameAssignment_0();
 
             state._fsp--;
@@ -30040,21 +30040,21 @@ public final void rule__OperationCall__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__OperationCall__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10520:1: rule__OperationCall__Group__1 : rule__OperationCall__Group__1__Impl rule__OperationCall__Group__2 ;
+    // InternalScope.g:10520:1: rule__OperationCall__Group__1 : rule__OperationCall__Group__1__Impl rule__OperationCall__Group__2 ;
     public final void rule__OperationCall__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10524:1: ( rule__OperationCall__Group__1__Impl rule__OperationCall__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10525:2: rule__OperationCall__Group__1__Impl rule__OperationCall__Group__2
+            // InternalScope.g:10524:1: ( rule__OperationCall__Group__1__Impl rule__OperationCall__Group__2 )
+            // InternalScope.g:10525:2: rule__OperationCall__Group__1__Impl rule__OperationCall__Group__2
             {
-            pushFollow(FOLLOW_rule__OperationCall__Group__1__Impl_in_rule__OperationCall__Group__121228);
+            pushFollow(FOLLOW_70);
             rule__OperationCall__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OperationCall__Group__2_in_rule__OperationCall__Group__121231);
+            pushFollow(FOLLOW_2);
             rule__OperationCall__Group__2();
 
             state._fsp--;
@@ -30078,22 +30078,22 @@ public final void rule__OperationCall__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__OperationCall__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10532:1: rule__OperationCall__Group__1__Impl : ( '(' ) ;
+    // InternalScope.g:10532:1: rule__OperationCall__Group__1__Impl : ( '(' ) ;
     public final void rule__OperationCall__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10536:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10537:1: ( '(' )
+            // InternalScope.g:10536:1: ( ( '(' ) )
+            // InternalScope.g:10537:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10537:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10538:1: '('
+            // InternalScope.g:10537:1: ( '(' )
+            // InternalScope.g:10538:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOperationCallAccess().getLeftParenthesisKeyword_1()); 
             }
-            match(input,51,FOLLOW_51_in_rule__OperationCall__Group__1__Impl21259); if (state.failed) return ;
+            match(input,51,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOperationCallAccess().getLeftParenthesisKeyword_1()); 
             }
@@ -30119,21 +30119,21 @@ public final void rule__OperationCall__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__OperationCall__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10551:1: rule__OperationCall__Group__2 : rule__OperationCall__Group__2__Impl rule__OperationCall__Group__3 ;
+    // InternalScope.g:10551:1: rule__OperationCall__Group__2 : rule__OperationCall__Group__2__Impl rule__OperationCall__Group__3 ;
     public final void rule__OperationCall__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10555:1: ( rule__OperationCall__Group__2__Impl rule__OperationCall__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10556:2: rule__OperationCall__Group__2__Impl rule__OperationCall__Group__3
+            // InternalScope.g:10555:1: ( rule__OperationCall__Group__2__Impl rule__OperationCall__Group__3 )
+            // InternalScope.g:10556:2: rule__OperationCall__Group__2__Impl rule__OperationCall__Group__3
             {
-            pushFollow(FOLLOW_rule__OperationCall__Group__2__Impl_in_rule__OperationCall__Group__221290);
+            pushFollow(FOLLOW_70);
             rule__OperationCall__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OperationCall__Group__3_in_rule__OperationCall__Group__221293);
+            pushFollow(FOLLOW_2);
             rule__OperationCall__Group__3();
 
             state._fsp--;
@@ -30157,22 +30157,22 @@ public final void rule__OperationCall__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__OperationCall__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10563:1: rule__OperationCall__Group__2__Impl : ( ( rule__OperationCall__Group_2__0 )? ) ;
+    // InternalScope.g:10563:1: rule__OperationCall__Group__2__Impl : ( ( rule__OperationCall__Group_2__0 )? ) ;
     public final void rule__OperationCall__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10567:1: ( ( ( rule__OperationCall__Group_2__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10568:1: ( ( rule__OperationCall__Group_2__0 )? )
+            // InternalScope.g:10567:1: ( ( ( rule__OperationCall__Group_2__0 )? ) )
+            // InternalScope.g:10568:1: ( ( rule__OperationCall__Group_2__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10568:1: ( ( rule__OperationCall__Group_2__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10569:1: ( rule__OperationCall__Group_2__0 )?
+            // InternalScope.g:10568:1: ( ( rule__OperationCall__Group_2__0 )? )
+            // InternalScope.g:10569:1: ( rule__OperationCall__Group_2__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOperationCallAccess().getGroup_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10570:1: ( rule__OperationCall__Group_2__0 )?
+            // InternalScope.g:10570:1: ( rule__OperationCall__Group_2__0 )?
             int alt70=2;
             int LA70_0 = input.LA(1);
 
@@ -30181,9 +30181,9 @@ public final void rule__OperationCall__Group__2__Impl() throws RecognitionExcept
             }
             switch (alt70) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10570:2: rule__OperationCall__Group_2__0
+                    // InternalScope.g:10570:2: rule__OperationCall__Group_2__0
                     {
-                    pushFollow(FOLLOW_rule__OperationCall__Group_2__0_in_rule__OperationCall__Group__2__Impl21320);
+                    pushFollow(FOLLOW_2);
                     rule__OperationCall__Group_2__0();
 
                     state._fsp--;
@@ -30219,16 +30219,16 @@ public final void rule__OperationCall__Group__2__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__OperationCall__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10580:1: rule__OperationCall__Group__3 : rule__OperationCall__Group__3__Impl ;
+    // InternalScope.g:10580:1: rule__OperationCall__Group__3 : rule__OperationCall__Group__3__Impl ;
     public final void rule__OperationCall__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10584:1: ( rule__OperationCall__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10585:2: rule__OperationCall__Group__3__Impl
+            // InternalScope.g:10584:1: ( rule__OperationCall__Group__3__Impl )
+            // InternalScope.g:10585:2: rule__OperationCall__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__OperationCall__Group__3__Impl_in_rule__OperationCall__Group__321351);
+            pushFollow(FOLLOW_2);
             rule__OperationCall__Group__3__Impl();
 
             state._fsp--;
@@ -30252,22 +30252,22 @@ public final void rule__OperationCall__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__OperationCall__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10591:1: rule__OperationCall__Group__3__Impl : ( ')' ) ;
+    // InternalScope.g:10591:1: rule__OperationCall__Group__3__Impl : ( ')' ) ;
     public final void rule__OperationCall__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10595:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10596:1: ( ')' )
+            // InternalScope.g:10595:1: ( ( ')' ) )
+            // InternalScope.g:10596:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10596:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10597:1: ')'
+            // InternalScope.g:10596:1: ( ')' )
+            // InternalScope.g:10597:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOperationCallAccess().getRightParenthesisKeyword_3()); 
             }
-            match(input,52,FOLLOW_52_in_rule__OperationCall__Group__3__Impl21379); if (state.failed) return ;
+            match(input,52,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOperationCallAccess().getRightParenthesisKeyword_3()); 
             }
@@ -30293,21 +30293,21 @@ public final void rule__OperationCall__Group__3__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__OperationCall__Group_2__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10618:1: rule__OperationCall__Group_2__0 : rule__OperationCall__Group_2__0__Impl rule__OperationCall__Group_2__1 ;
+    // InternalScope.g:10618:1: rule__OperationCall__Group_2__0 : rule__OperationCall__Group_2__0__Impl rule__OperationCall__Group_2__1 ;
     public final void rule__OperationCall__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10622:1: ( rule__OperationCall__Group_2__0__Impl rule__OperationCall__Group_2__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10623:2: rule__OperationCall__Group_2__0__Impl rule__OperationCall__Group_2__1
+            // InternalScope.g:10622:1: ( rule__OperationCall__Group_2__0__Impl rule__OperationCall__Group_2__1 )
+            // InternalScope.g:10623:2: rule__OperationCall__Group_2__0__Impl rule__OperationCall__Group_2__1
             {
-            pushFollow(FOLLOW_rule__OperationCall__Group_2__0__Impl_in_rule__OperationCall__Group_2__021418);
+            pushFollow(FOLLOW_71);
             rule__OperationCall__Group_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OperationCall__Group_2__1_in_rule__OperationCall__Group_2__021421);
+            pushFollow(FOLLOW_2);
             rule__OperationCall__Group_2__1();
 
             state._fsp--;
@@ -30331,25 +30331,25 @@ public final void rule__OperationCall__Group_2__0() throws RecognitionException
 
 
     // $ANTLR start "rule__OperationCall__Group_2__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10630:1: rule__OperationCall__Group_2__0__Impl : ( ( rule__OperationCall__ParamsAssignment_2_0 ) ) ;
+    // InternalScope.g:10630:1: rule__OperationCall__Group_2__0__Impl : ( ( rule__OperationCall__ParamsAssignment_2_0 ) ) ;
     public final void rule__OperationCall__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10634:1: ( ( ( rule__OperationCall__ParamsAssignment_2_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10635:1: ( ( rule__OperationCall__ParamsAssignment_2_0 ) )
+            // InternalScope.g:10634:1: ( ( ( rule__OperationCall__ParamsAssignment_2_0 ) ) )
+            // InternalScope.g:10635:1: ( ( rule__OperationCall__ParamsAssignment_2_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10635:1: ( ( rule__OperationCall__ParamsAssignment_2_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10636:1: ( rule__OperationCall__ParamsAssignment_2_0 )
+            // InternalScope.g:10635:1: ( ( rule__OperationCall__ParamsAssignment_2_0 ) )
+            // InternalScope.g:10636:1: ( rule__OperationCall__ParamsAssignment_2_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOperationCallAccess().getParamsAssignment_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10637:1: ( rule__OperationCall__ParamsAssignment_2_0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10637:2: rule__OperationCall__ParamsAssignment_2_0
+            // InternalScope.g:10637:1: ( rule__OperationCall__ParamsAssignment_2_0 )
+            // InternalScope.g:10637:2: rule__OperationCall__ParamsAssignment_2_0
             {
-            pushFollow(FOLLOW_rule__OperationCall__ParamsAssignment_2_0_in_rule__OperationCall__Group_2__0__Impl21448);
+            pushFollow(FOLLOW_2);
             rule__OperationCall__ParamsAssignment_2_0();
 
             state._fsp--;
@@ -30382,16 +30382,16 @@ public final void rule__OperationCall__Group_2__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__OperationCall__Group_2__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10647:1: rule__OperationCall__Group_2__1 : rule__OperationCall__Group_2__1__Impl ;
+    // InternalScope.g:10647:1: rule__OperationCall__Group_2__1 : rule__OperationCall__Group_2__1__Impl ;
     public final void rule__OperationCall__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10651:1: ( rule__OperationCall__Group_2__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10652:2: rule__OperationCall__Group_2__1__Impl
+            // InternalScope.g:10651:1: ( rule__OperationCall__Group_2__1__Impl )
+            // InternalScope.g:10652:2: rule__OperationCall__Group_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__OperationCall__Group_2__1__Impl_in_rule__OperationCall__Group_2__121478);
+            pushFollow(FOLLOW_2);
             rule__OperationCall__Group_2__1__Impl();
 
             state._fsp--;
@@ -30415,22 +30415,22 @@ public final void rule__OperationCall__Group_2__1() throws RecognitionException
 
 
     // $ANTLR start "rule__OperationCall__Group_2__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10658:1: rule__OperationCall__Group_2__1__Impl : ( ( rule__OperationCall__Group_2_1__0 )* ) ;
+    // InternalScope.g:10658:1: rule__OperationCall__Group_2__1__Impl : ( ( rule__OperationCall__Group_2_1__0 )* ) ;
     public final void rule__OperationCall__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10662:1: ( ( ( rule__OperationCall__Group_2_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10663:1: ( ( rule__OperationCall__Group_2_1__0 )* )
+            // InternalScope.g:10662:1: ( ( ( rule__OperationCall__Group_2_1__0 )* ) )
+            // InternalScope.g:10663:1: ( ( rule__OperationCall__Group_2_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10663:1: ( ( rule__OperationCall__Group_2_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10664:1: ( rule__OperationCall__Group_2_1__0 )*
+            // InternalScope.g:10663:1: ( ( rule__OperationCall__Group_2_1__0 )* )
+            // InternalScope.g:10664:1: ( rule__OperationCall__Group_2_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOperationCallAccess().getGroup_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10665:1: ( rule__OperationCall__Group_2_1__0 )*
+            // InternalScope.g:10665:1: ( rule__OperationCall__Group_2_1__0 )*
             loop71:
             do {
                 int alt71=2;
@@ -30443,9 +30443,9 @@ public final void rule__OperationCall__Group_2__1__Impl() throws RecognitionExce
 
                 switch (alt71) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10665:2: rule__OperationCall__Group_2_1__0
+            	    // InternalScope.g:10665:2: rule__OperationCall__Group_2_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__OperationCall__Group_2_1__0_in_rule__OperationCall__Group_2__1__Impl21505);
+            	    pushFollow(FOLLOW_40);
             	    rule__OperationCall__Group_2_1__0();
 
             	    state._fsp--;
@@ -30484,21 +30484,21 @@ public final void rule__OperationCall__Group_2__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__OperationCall__Group_2_1__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10679:1: rule__OperationCall__Group_2_1__0 : rule__OperationCall__Group_2_1__0__Impl rule__OperationCall__Group_2_1__1 ;
+    // InternalScope.g:10679:1: rule__OperationCall__Group_2_1__0 : rule__OperationCall__Group_2_1__0__Impl rule__OperationCall__Group_2_1__1 ;
     public final void rule__OperationCall__Group_2_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10683:1: ( rule__OperationCall__Group_2_1__0__Impl rule__OperationCall__Group_2_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10684:2: rule__OperationCall__Group_2_1__0__Impl rule__OperationCall__Group_2_1__1
+            // InternalScope.g:10683:1: ( rule__OperationCall__Group_2_1__0__Impl rule__OperationCall__Group_2_1__1 )
+            // InternalScope.g:10684:2: rule__OperationCall__Group_2_1__0__Impl rule__OperationCall__Group_2_1__1
             {
-            pushFollow(FOLLOW_rule__OperationCall__Group_2_1__0__Impl_in_rule__OperationCall__Group_2_1__021540);
+            pushFollow(FOLLOW_17);
             rule__OperationCall__Group_2_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__OperationCall__Group_2_1__1_in_rule__OperationCall__Group_2_1__021543);
+            pushFollow(FOLLOW_2);
             rule__OperationCall__Group_2_1__1();
 
             state._fsp--;
@@ -30522,22 +30522,22 @@ public final void rule__OperationCall__Group_2_1__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__OperationCall__Group_2_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10691:1: rule__OperationCall__Group_2_1__0__Impl : ( ',' ) ;
+    // InternalScope.g:10691:1: rule__OperationCall__Group_2_1__0__Impl : ( ',' ) ;
     public final void rule__OperationCall__Group_2_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10695:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10696:1: ( ',' )
+            // InternalScope.g:10695:1: ( ( ',' ) )
+            // InternalScope.g:10696:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10696:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10697:1: ','
+            // InternalScope.g:10696:1: ( ',' )
+            // InternalScope.g:10697:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOperationCallAccess().getCommaKeyword_2_1_0()); 
             }
-            match(input,61,FOLLOW_61_in_rule__OperationCall__Group_2_1__0__Impl21571); if (state.failed) return ;
+            match(input,61,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOperationCallAccess().getCommaKeyword_2_1_0()); 
             }
@@ -30563,16 +30563,16 @@ public final void rule__OperationCall__Group_2_1__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__OperationCall__Group_2_1__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10710:1: rule__OperationCall__Group_2_1__1 : rule__OperationCall__Group_2_1__1__Impl ;
+    // InternalScope.g:10710:1: rule__OperationCall__Group_2_1__1 : rule__OperationCall__Group_2_1__1__Impl ;
     public final void rule__OperationCall__Group_2_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10714:1: ( rule__OperationCall__Group_2_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10715:2: rule__OperationCall__Group_2_1__1__Impl
+            // InternalScope.g:10714:1: ( rule__OperationCall__Group_2_1__1__Impl )
+            // InternalScope.g:10715:2: rule__OperationCall__Group_2_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__OperationCall__Group_2_1__1__Impl_in_rule__OperationCall__Group_2_1__121602);
+            pushFollow(FOLLOW_2);
             rule__OperationCall__Group_2_1__1__Impl();
 
             state._fsp--;
@@ -30596,25 +30596,25 @@ public final void rule__OperationCall__Group_2_1__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__OperationCall__Group_2_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10721:1: rule__OperationCall__Group_2_1__1__Impl : ( ( rule__OperationCall__ParamsAssignment_2_1_1 ) ) ;
+    // InternalScope.g:10721:1: rule__OperationCall__Group_2_1__1__Impl : ( ( rule__OperationCall__ParamsAssignment_2_1_1 ) ) ;
     public final void rule__OperationCall__Group_2_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10725:1: ( ( ( rule__OperationCall__ParamsAssignment_2_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10726:1: ( ( rule__OperationCall__ParamsAssignment_2_1_1 ) )
+            // InternalScope.g:10725:1: ( ( ( rule__OperationCall__ParamsAssignment_2_1_1 ) ) )
+            // InternalScope.g:10726:1: ( ( rule__OperationCall__ParamsAssignment_2_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10726:1: ( ( rule__OperationCall__ParamsAssignment_2_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10727:1: ( rule__OperationCall__ParamsAssignment_2_1_1 )
+            // InternalScope.g:10726:1: ( ( rule__OperationCall__ParamsAssignment_2_1_1 ) )
+            // InternalScope.g:10727:1: ( rule__OperationCall__ParamsAssignment_2_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOperationCallAccess().getParamsAssignment_2_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10728:1: ( rule__OperationCall__ParamsAssignment_2_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10728:2: rule__OperationCall__ParamsAssignment_2_1_1
+            // InternalScope.g:10728:1: ( rule__OperationCall__ParamsAssignment_2_1_1 )
+            // InternalScope.g:10728:2: rule__OperationCall__ParamsAssignment_2_1_1
             {
-            pushFollow(FOLLOW_rule__OperationCall__ParamsAssignment_2_1_1_in_rule__OperationCall__Group_2_1__1__Impl21629);
+            pushFollow(FOLLOW_2);
             rule__OperationCall__ParamsAssignment_2_1_1();
 
             state._fsp--;
@@ -30647,21 +30647,21 @@ public final void rule__OperationCall__Group_2_1__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__ListLiteral__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10742:1: rule__ListLiteral__Group__0 : rule__ListLiteral__Group__0__Impl rule__ListLiteral__Group__1 ;
+    // InternalScope.g:10742:1: rule__ListLiteral__Group__0 : rule__ListLiteral__Group__0__Impl rule__ListLiteral__Group__1 ;
     public final void rule__ListLiteral__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10746:1: ( rule__ListLiteral__Group__0__Impl rule__ListLiteral__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10747:2: rule__ListLiteral__Group__0__Impl rule__ListLiteral__Group__1
+            // InternalScope.g:10746:1: ( rule__ListLiteral__Group__0__Impl rule__ListLiteral__Group__1 )
+            // InternalScope.g:10747:2: rule__ListLiteral__Group__0__Impl rule__ListLiteral__Group__1
             {
-            pushFollow(FOLLOW_rule__ListLiteral__Group__0__Impl_in_rule__ListLiteral__Group__021663);
+            pushFollow(FOLLOW_12);
             rule__ListLiteral__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ListLiteral__Group__1_in_rule__ListLiteral__Group__021666);
+            pushFollow(FOLLOW_2);
             rule__ListLiteral__Group__1();
 
             state._fsp--;
@@ -30685,23 +30685,23 @@ public final void rule__ListLiteral__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__ListLiteral__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10754:1: rule__ListLiteral__Group__0__Impl : ( () ) ;
+    // InternalScope.g:10754:1: rule__ListLiteral__Group__0__Impl : ( () ) ;
     public final void rule__ListLiteral__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10758:1: ( ( () ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10759:1: ( () )
+            // InternalScope.g:10758:1: ( ( () ) )
+            // InternalScope.g:10759:1: ( () )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10759:1: ( () )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10760:1: ()
+            // InternalScope.g:10759:1: ( () )
+            // InternalScope.g:10760:1: ()
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getListLiteralAccess().getListLiteralAction_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10761:1: ()
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10763:1: 
+            // InternalScope.g:10761:1: ()
+            // InternalScope.g:10763:1: 
             {
             }
 
@@ -30726,21 +30726,21 @@ public final void rule__ListLiteral__Group__0__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ListLiteral__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10773:1: rule__ListLiteral__Group__1 : rule__ListLiteral__Group__1__Impl rule__ListLiteral__Group__2 ;
+    // InternalScope.g:10773:1: rule__ListLiteral__Group__1 : rule__ListLiteral__Group__1__Impl rule__ListLiteral__Group__2 ;
     public final void rule__ListLiteral__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10777:1: ( rule__ListLiteral__Group__1__Impl rule__ListLiteral__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10778:2: rule__ListLiteral__Group__1__Impl rule__ListLiteral__Group__2
+            // InternalScope.g:10777:1: ( rule__ListLiteral__Group__1__Impl rule__ListLiteral__Group__2 )
+            // InternalScope.g:10778:2: rule__ListLiteral__Group__1__Impl rule__ListLiteral__Group__2
             {
-            pushFollow(FOLLOW_rule__ListLiteral__Group__1__Impl_in_rule__ListLiteral__Group__121724);
+            pushFollow(FOLLOW_74);
             rule__ListLiteral__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ListLiteral__Group__2_in_rule__ListLiteral__Group__121727);
+            pushFollow(FOLLOW_2);
             rule__ListLiteral__Group__2();
 
             state._fsp--;
@@ -30764,22 +30764,22 @@ public final void rule__ListLiteral__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__ListLiteral__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10785:1: rule__ListLiteral__Group__1__Impl : ( '{' ) ;
+    // InternalScope.g:10785:1: rule__ListLiteral__Group__1__Impl : ( '{' ) ;
     public final void rule__ListLiteral__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10789:1: ( ( '{' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10790:1: ( '{' )
+            // InternalScope.g:10789:1: ( ( '{' ) )
+            // InternalScope.g:10790:1: ( '{' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10790:1: ( '{' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10791:1: '{'
+            // InternalScope.g:10790:1: ( '{' )
+            // InternalScope.g:10791:1: '{'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getListLiteralAccess().getLeftCurlyBracketKeyword_1()); 
             }
-            match(input,45,FOLLOW_45_in_rule__ListLiteral__Group__1__Impl21755); if (state.failed) return ;
+            match(input,45,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getListLiteralAccess().getLeftCurlyBracketKeyword_1()); 
             }
@@ -30805,21 +30805,21 @@ public final void rule__ListLiteral__Group__1__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ListLiteral__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10804:1: rule__ListLiteral__Group__2 : rule__ListLiteral__Group__2__Impl rule__ListLiteral__Group__3 ;
+    // InternalScope.g:10804:1: rule__ListLiteral__Group__2 : rule__ListLiteral__Group__2__Impl rule__ListLiteral__Group__3 ;
     public final void rule__ListLiteral__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10808:1: ( rule__ListLiteral__Group__2__Impl rule__ListLiteral__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10809:2: rule__ListLiteral__Group__2__Impl rule__ListLiteral__Group__3
+            // InternalScope.g:10808:1: ( rule__ListLiteral__Group__2__Impl rule__ListLiteral__Group__3 )
+            // InternalScope.g:10809:2: rule__ListLiteral__Group__2__Impl rule__ListLiteral__Group__3
             {
-            pushFollow(FOLLOW_rule__ListLiteral__Group__2__Impl_in_rule__ListLiteral__Group__221786);
+            pushFollow(FOLLOW_74);
             rule__ListLiteral__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ListLiteral__Group__3_in_rule__ListLiteral__Group__221789);
+            pushFollow(FOLLOW_2);
             rule__ListLiteral__Group__3();
 
             state._fsp--;
@@ -30843,22 +30843,22 @@ public final void rule__ListLiteral__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__ListLiteral__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10816:1: rule__ListLiteral__Group__2__Impl : ( ( rule__ListLiteral__Group_2__0 )? ) ;
+    // InternalScope.g:10816:1: rule__ListLiteral__Group__2__Impl : ( ( rule__ListLiteral__Group_2__0 )? ) ;
     public final void rule__ListLiteral__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10820:1: ( ( ( rule__ListLiteral__Group_2__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10821:1: ( ( rule__ListLiteral__Group_2__0 )? )
+            // InternalScope.g:10820:1: ( ( ( rule__ListLiteral__Group_2__0 )? ) )
+            // InternalScope.g:10821:1: ( ( rule__ListLiteral__Group_2__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10821:1: ( ( rule__ListLiteral__Group_2__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10822:1: ( rule__ListLiteral__Group_2__0 )?
+            // InternalScope.g:10821:1: ( ( rule__ListLiteral__Group_2__0 )? )
+            // InternalScope.g:10822:1: ( rule__ListLiteral__Group_2__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getListLiteralAccess().getGroup_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10823:1: ( rule__ListLiteral__Group_2__0 )?
+            // InternalScope.g:10823:1: ( rule__ListLiteral__Group_2__0 )?
             int alt72=2;
             int LA72_0 = input.LA(1);
 
@@ -30867,9 +30867,9 @@ public final void rule__ListLiteral__Group__2__Impl() throws RecognitionExceptio
             }
             switch (alt72) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10823:2: rule__ListLiteral__Group_2__0
+                    // InternalScope.g:10823:2: rule__ListLiteral__Group_2__0
                     {
-                    pushFollow(FOLLOW_rule__ListLiteral__Group_2__0_in_rule__ListLiteral__Group__2__Impl21816);
+                    pushFollow(FOLLOW_2);
                     rule__ListLiteral__Group_2__0();
 
                     state._fsp--;
@@ -30905,16 +30905,16 @@ public final void rule__ListLiteral__Group__2__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ListLiteral__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10833:1: rule__ListLiteral__Group__3 : rule__ListLiteral__Group__3__Impl ;
+    // InternalScope.g:10833:1: rule__ListLiteral__Group__3 : rule__ListLiteral__Group__3__Impl ;
     public final void rule__ListLiteral__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10837:1: ( rule__ListLiteral__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10838:2: rule__ListLiteral__Group__3__Impl
+            // InternalScope.g:10837:1: ( rule__ListLiteral__Group__3__Impl )
+            // InternalScope.g:10838:2: rule__ListLiteral__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__ListLiteral__Group__3__Impl_in_rule__ListLiteral__Group__321847);
+            pushFollow(FOLLOW_2);
             rule__ListLiteral__Group__3__Impl();
 
             state._fsp--;
@@ -30938,22 +30938,22 @@ public final void rule__ListLiteral__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__ListLiteral__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10844:1: rule__ListLiteral__Group__3__Impl : ( '}' ) ;
+    // InternalScope.g:10844:1: rule__ListLiteral__Group__3__Impl : ( '}' ) ;
     public final void rule__ListLiteral__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10848:1: ( ( '}' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10849:1: ( '}' )
+            // InternalScope.g:10848:1: ( ( '}' ) )
+            // InternalScope.g:10849:1: ( '}' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10849:1: ( '}' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10850:1: '}'
+            // InternalScope.g:10849:1: ( '}' )
+            // InternalScope.g:10850:1: '}'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getListLiteralAccess().getRightCurlyBracketKeyword_3()); 
             }
-            match(input,46,FOLLOW_46_in_rule__ListLiteral__Group__3__Impl21875); if (state.failed) return ;
+            match(input,46,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getListLiteralAccess().getRightCurlyBracketKeyword_3()); 
             }
@@ -30979,21 +30979,21 @@ public final void rule__ListLiteral__Group__3__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__ListLiteral__Group_2__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10871:1: rule__ListLiteral__Group_2__0 : rule__ListLiteral__Group_2__0__Impl rule__ListLiteral__Group_2__1 ;
+    // InternalScope.g:10871:1: rule__ListLiteral__Group_2__0 : rule__ListLiteral__Group_2__0__Impl rule__ListLiteral__Group_2__1 ;
     public final void rule__ListLiteral__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10875:1: ( rule__ListLiteral__Group_2__0__Impl rule__ListLiteral__Group_2__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10876:2: rule__ListLiteral__Group_2__0__Impl rule__ListLiteral__Group_2__1
+            // InternalScope.g:10875:1: ( rule__ListLiteral__Group_2__0__Impl rule__ListLiteral__Group_2__1 )
+            // InternalScope.g:10876:2: rule__ListLiteral__Group_2__0__Impl rule__ListLiteral__Group_2__1
             {
-            pushFollow(FOLLOW_rule__ListLiteral__Group_2__0__Impl_in_rule__ListLiteral__Group_2__021914);
+            pushFollow(FOLLOW_71);
             rule__ListLiteral__Group_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ListLiteral__Group_2__1_in_rule__ListLiteral__Group_2__021917);
+            pushFollow(FOLLOW_2);
             rule__ListLiteral__Group_2__1();
 
             state._fsp--;
@@ -31017,25 +31017,25 @@ public final void rule__ListLiteral__Group_2__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__ListLiteral__Group_2__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10883:1: rule__ListLiteral__Group_2__0__Impl : ( ( rule__ListLiteral__ElementsAssignment_2_0 ) ) ;
+    // InternalScope.g:10883:1: rule__ListLiteral__Group_2__0__Impl : ( ( rule__ListLiteral__ElementsAssignment_2_0 ) ) ;
     public final void rule__ListLiteral__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10887:1: ( ( ( rule__ListLiteral__ElementsAssignment_2_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10888:1: ( ( rule__ListLiteral__ElementsAssignment_2_0 ) )
+            // InternalScope.g:10887:1: ( ( ( rule__ListLiteral__ElementsAssignment_2_0 ) ) )
+            // InternalScope.g:10888:1: ( ( rule__ListLiteral__ElementsAssignment_2_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10888:1: ( ( rule__ListLiteral__ElementsAssignment_2_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10889:1: ( rule__ListLiteral__ElementsAssignment_2_0 )
+            // InternalScope.g:10888:1: ( ( rule__ListLiteral__ElementsAssignment_2_0 ) )
+            // InternalScope.g:10889:1: ( rule__ListLiteral__ElementsAssignment_2_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getListLiteralAccess().getElementsAssignment_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10890:1: ( rule__ListLiteral__ElementsAssignment_2_0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10890:2: rule__ListLiteral__ElementsAssignment_2_0
+            // InternalScope.g:10890:1: ( rule__ListLiteral__ElementsAssignment_2_0 )
+            // InternalScope.g:10890:2: rule__ListLiteral__ElementsAssignment_2_0
             {
-            pushFollow(FOLLOW_rule__ListLiteral__ElementsAssignment_2_0_in_rule__ListLiteral__Group_2__0__Impl21944);
+            pushFollow(FOLLOW_2);
             rule__ListLiteral__ElementsAssignment_2_0();
 
             state._fsp--;
@@ -31068,16 +31068,16 @@ public final void rule__ListLiteral__Group_2__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ListLiteral__Group_2__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10900:1: rule__ListLiteral__Group_2__1 : rule__ListLiteral__Group_2__1__Impl ;
+    // InternalScope.g:10900:1: rule__ListLiteral__Group_2__1 : rule__ListLiteral__Group_2__1__Impl ;
     public final void rule__ListLiteral__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10904:1: ( rule__ListLiteral__Group_2__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10905:2: rule__ListLiteral__Group_2__1__Impl
+            // InternalScope.g:10904:1: ( rule__ListLiteral__Group_2__1__Impl )
+            // InternalScope.g:10905:2: rule__ListLiteral__Group_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__ListLiteral__Group_2__1__Impl_in_rule__ListLiteral__Group_2__121974);
+            pushFollow(FOLLOW_2);
             rule__ListLiteral__Group_2__1__Impl();
 
             state._fsp--;
@@ -31101,22 +31101,22 @@ public final void rule__ListLiteral__Group_2__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__ListLiteral__Group_2__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10911:1: rule__ListLiteral__Group_2__1__Impl : ( ( rule__ListLiteral__Group_2_1__0 )* ) ;
+    // InternalScope.g:10911:1: rule__ListLiteral__Group_2__1__Impl : ( ( rule__ListLiteral__Group_2_1__0 )* ) ;
     public final void rule__ListLiteral__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10915:1: ( ( ( rule__ListLiteral__Group_2_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10916:1: ( ( rule__ListLiteral__Group_2_1__0 )* )
+            // InternalScope.g:10915:1: ( ( ( rule__ListLiteral__Group_2_1__0 )* ) )
+            // InternalScope.g:10916:1: ( ( rule__ListLiteral__Group_2_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10916:1: ( ( rule__ListLiteral__Group_2_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10917:1: ( rule__ListLiteral__Group_2_1__0 )*
+            // InternalScope.g:10916:1: ( ( rule__ListLiteral__Group_2_1__0 )* )
+            // InternalScope.g:10917:1: ( rule__ListLiteral__Group_2_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getListLiteralAccess().getGroup_2_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10918:1: ( rule__ListLiteral__Group_2_1__0 )*
+            // InternalScope.g:10918:1: ( rule__ListLiteral__Group_2_1__0 )*
             loop73:
             do {
                 int alt73=2;
@@ -31129,9 +31129,9 @@ public final void rule__ListLiteral__Group_2__1__Impl() throws RecognitionExcept
 
                 switch (alt73) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10918:2: rule__ListLiteral__Group_2_1__0
+            	    // InternalScope.g:10918:2: rule__ListLiteral__Group_2_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__ListLiteral__Group_2_1__0_in_rule__ListLiteral__Group_2__1__Impl22001);
+            	    pushFollow(FOLLOW_40);
             	    rule__ListLiteral__Group_2_1__0();
 
             	    state._fsp--;
@@ -31170,21 +31170,21 @@ public final void rule__ListLiteral__Group_2__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ListLiteral__Group_2_1__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10932:1: rule__ListLiteral__Group_2_1__0 : rule__ListLiteral__Group_2_1__0__Impl rule__ListLiteral__Group_2_1__1 ;
+    // InternalScope.g:10932:1: rule__ListLiteral__Group_2_1__0 : rule__ListLiteral__Group_2_1__0__Impl rule__ListLiteral__Group_2_1__1 ;
     public final void rule__ListLiteral__Group_2_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10936:1: ( rule__ListLiteral__Group_2_1__0__Impl rule__ListLiteral__Group_2_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10937:2: rule__ListLiteral__Group_2_1__0__Impl rule__ListLiteral__Group_2_1__1
+            // InternalScope.g:10936:1: ( rule__ListLiteral__Group_2_1__0__Impl rule__ListLiteral__Group_2_1__1 )
+            // InternalScope.g:10937:2: rule__ListLiteral__Group_2_1__0__Impl rule__ListLiteral__Group_2_1__1
             {
-            pushFollow(FOLLOW_rule__ListLiteral__Group_2_1__0__Impl_in_rule__ListLiteral__Group_2_1__022036);
+            pushFollow(FOLLOW_17);
             rule__ListLiteral__Group_2_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ListLiteral__Group_2_1__1_in_rule__ListLiteral__Group_2_1__022039);
+            pushFollow(FOLLOW_2);
             rule__ListLiteral__Group_2_1__1();
 
             state._fsp--;
@@ -31208,22 +31208,22 @@ public final void rule__ListLiteral__Group_2_1__0() throws RecognitionException
 
 
     // $ANTLR start "rule__ListLiteral__Group_2_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10944:1: rule__ListLiteral__Group_2_1__0__Impl : ( ',' ) ;
+    // InternalScope.g:10944:1: rule__ListLiteral__Group_2_1__0__Impl : ( ',' ) ;
     public final void rule__ListLiteral__Group_2_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10948:1: ( ( ',' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10949:1: ( ',' )
+            // InternalScope.g:10948:1: ( ( ',' ) )
+            // InternalScope.g:10949:1: ( ',' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10949:1: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10950:1: ','
+            // InternalScope.g:10949:1: ( ',' )
+            // InternalScope.g:10950:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getListLiteralAccess().getCommaKeyword_2_1_0()); 
             }
-            match(input,61,FOLLOW_61_in_rule__ListLiteral__Group_2_1__0__Impl22067); if (state.failed) return ;
+            match(input,61,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getListLiteralAccess().getCommaKeyword_2_1_0()); 
             }
@@ -31249,16 +31249,16 @@ public final void rule__ListLiteral__Group_2_1__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__ListLiteral__Group_2_1__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10963:1: rule__ListLiteral__Group_2_1__1 : rule__ListLiteral__Group_2_1__1__Impl ;
+    // InternalScope.g:10963:1: rule__ListLiteral__Group_2_1__1 : rule__ListLiteral__Group_2_1__1__Impl ;
     public final void rule__ListLiteral__Group_2_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10967:1: ( rule__ListLiteral__Group_2_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10968:2: rule__ListLiteral__Group_2_1__1__Impl
+            // InternalScope.g:10967:1: ( rule__ListLiteral__Group_2_1__1__Impl )
+            // InternalScope.g:10968:2: rule__ListLiteral__Group_2_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__ListLiteral__Group_2_1__1__Impl_in_rule__ListLiteral__Group_2_1__122098);
+            pushFollow(FOLLOW_2);
             rule__ListLiteral__Group_2_1__1__Impl();
 
             state._fsp--;
@@ -31282,25 +31282,25 @@ public final void rule__ListLiteral__Group_2_1__1() throws RecognitionException
 
 
     // $ANTLR start "rule__ListLiteral__Group_2_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10974:1: rule__ListLiteral__Group_2_1__1__Impl : ( ( rule__ListLiteral__ElementsAssignment_2_1_1 ) ) ;
+    // InternalScope.g:10974:1: rule__ListLiteral__Group_2_1__1__Impl : ( ( rule__ListLiteral__ElementsAssignment_2_1_1 ) ) ;
     public final void rule__ListLiteral__Group_2_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10978:1: ( ( ( rule__ListLiteral__ElementsAssignment_2_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10979:1: ( ( rule__ListLiteral__ElementsAssignment_2_1_1 ) )
+            // InternalScope.g:10978:1: ( ( ( rule__ListLiteral__ElementsAssignment_2_1_1 ) ) )
+            // InternalScope.g:10979:1: ( ( rule__ListLiteral__ElementsAssignment_2_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10979:1: ( ( rule__ListLiteral__ElementsAssignment_2_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10980:1: ( rule__ListLiteral__ElementsAssignment_2_1_1 )
+            // InternalScope.g:10979:1: ( ( rule__ListLiteral__ElementsAssignment_2_1_1 ) )
+            // InternalScope.g:10980:1: ( rule__ListLiteral__ElementsAssignment_2_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getListLiteralAccess().getElementsAssignment_2_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10981:1: ( rule__ListLiteral__ElementsAssignment_2_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10981:2: rule__ListLiteral__ElementsAssignment_2_1_1
+            // InternalScope.g:10981:1: ( rule__ListLiteral__ElementsAssignment_2_1_1 )
+            // InternalScope.g:10981:2: rule__ListLiteral__ElementsAssignment_2_1_1
             {
-            pushFollow(FOLLOW_rule__ListLiteral__ElementsAssignment_2_1_1_in_rule__ListLiteral__Group_2_1__1__Impl22125);
+            pushFollow(FOLLOW_2);
             rule__ListLiteral__ElementsAssignment_2_1_1();
 
             state._fsp--;
@@ -31333,21 +31333,21 @@ public final void rule__ListLiteral__Group_2_1__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__ConstructorCallExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10995:1: rule__ConstructorCallExpression__Group__0 : rule__ConstructorCallExpression__Group__0__Impl rule__ConstructorCallExpression__Group__1 ;
+    // InternalScope.g:10995:1: rule__ConstructorCallExpression__Group__0 : rule__ConstructorCallExpression__Group__0__Impl rule__ConstructorCallExpression__Group__1 ;
     public final void rule__ConstructorCallExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:10999:1: ( rule__ConstructorCallExpression__Group__0__Impl rule__ConstructorCallExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11000:2: rule__ConstructorCallExpression__Group__0__Impl rule__ConstructorCallExpression__Group__1
+            // InternalScope.g:10999:1: ( rule__ConstructorCallExpression__Group__0__Impl rule__ConstructorCallExpression__Group__1 )
+            // InternalScope.g:11000:2: rule__ConstructorCallExpression__Group__0__Impl rule__ConstructorCallExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__ConstructorCallExpression__Group__0__Impl_in_rule__ConstructorCallExpression__Group__022159);
+            pushFollow(FOLLOW_48);
             rule__ConstructorCallExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__ConstructorCallExpression__Group__1_in_rule__ConstructorCallExpression__Group__022162);
+            pushFollow(FOLLOW_2);
             rule__ConstructorCallExpression__Group__1();
 
             state._fsp--;
@@ -31371,22 +31371,22 @@ public final void rule__ConstructorCallExpression__Group__0() throws Recognition
 
 
     // $ANTLR start "rule__ConstructorCallExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11007:1: rule__ConstructorCallExpression__Group__0__Impl : ( 'new' ) ;
+    // InternalScope.g:11007:1: rule__ConstructorCallExpression__Group__0__Impl : ( 'new' ) ;
     public final void rule__ConstructorCallExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11011:1: ( ( 'new' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11012:1: ( 'new' )
+            // InternalScope.g:11011:1: ( ( 'new' ) )
+            // InternalScope.g:11012:1: ( 'new' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11012:1: ( 'new' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11013:1: 'new'
+            // InternalScope.g:11012:1: ( 'new' )
+            // InternalScope.g:11013:1: 'new'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConstructorCallExpressionAccess().getNewKeyword_0()); 
             }
-            match(input,79,FOLLOW_79_in_rule__ConstructorCallExpression__Group__0__Impl22190); if (state.failed) return ;
+            match(input,79,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getConstructorCallExpressionAccess().getNewKeyword_0()); 
             }
@@ -31412,16 +31412,16 @@ public final void rule__ConstructorCallExpression__Group__0__Impl() throws Recog
 
 
     // $ANTLR start "rule__ConstructorCallExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11026:1: rule__ConstructorCallExpression__Group__1 : rule__ConstructorCallExpression__Group__1__Impl ;
+    // InternalScope.g:11026:1: rule__ConstructorCallExpression__Group__1 : rule__ConstructorCallExpression__Group__1__Impl ;
     public final void rule__ConstructorCallExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11030:1: ( rule__ConstructorCallExpression__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11031:2: rule__ConstructorCallExpression__Group__1__Impl
+            // InternalScope.g:11030:1: ( rule__ConstructorCallExpression__Group__1__Impl )
+            // InternalScope.g:11031:2: rule__ConstructorCallExpression__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__ConstructorCallExpression__Group__1__Impl_in_rule__ConstructorCallExpression__Group__122221);
+            pushFollow(FOLLOW_2);
             rule__ConstructorCallExpression__Group__1__Impl();
 
             state._fsp--;
@@ -31445,25 +31445,25 @@ public final void rule__ConstructorCallExpression__Group__1() throws Recognition
 
 
     // $ANTLR start "rule__ConstructorCallExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11037:1: rule__ConstructorCallExpression__Group__1__Impl : ( ( rule__ConstructorCallExpression__TypeAssignment_1 ) ) ;
+    // InternalScope.g:11037:1: rule__ConstructorCallExpression__Group__1__Impl : ( ( rule__ConstructorCallExpression__TypeAssignment_1 ) ) ;
     public final void rule__ConstructorCallExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11041:1: ( ( ( rule__ConstructorCallExpression__TypeAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11042:1: ( ( rule__ConstructorCallExpression__TypeAssignment_1 ) )
+            // InternalScope.g:11041:1: ( ( ( rule__ConstructorCallExpression__TypeAssignment_1 ) ) )
+            // InternalScope.g:11042:1: ( ( rule__ConstructorCallExpression__TypeAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11042:1: ( ( rule__ConstructorCallExpression__TypeAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11043:1: ( rule__ConstructorCallExpression__TypeAssignment_1 )
+            // InternalScope.g:11042:1: ( ( rule__ConstructorCallExpression__TypeAssignment_1 ) )
+            // InternalScope.g:11043:1: ( rule__ConstructorCallExpression__TypeAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConstructorCallExpressionAccess().getTypeAssignment_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11044:1: ( rule__ConstructorCallExpression__TypeAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11044:2: rule__ConstructorCallExpression__TypeAssignment_1
+            // InternalScope.g:11044:1: ( rule__ConstructorCallExpression__TypeAssignment_1 )
+            // InternalScope.g:11044:2: rule__ConstructorCallExpression__TypeAssignment_1
             {
-            pushFollow(FOLLOW_rule__ConstructorCallExpression__TypeAssignment_1_in_rule__ConstructorCallExpression__Group__1__Impl22248);
+            pushFollow(FOLLOW_2);
             rule__ConstructorCallExpression__TypeAssignment_1();
 
             state._fsp--;
@@ -31496,21 +31496,21 @@ public final void rule__ConstructorCallExpression__Group__1__Impl() throws Recog
 
 
     // $ANTLR start "rule__TypeSelectExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11058:1: rule__TypeSelectExpression__Group__0 : rule__TypeSelectExpression__Group__0__Impl rule__TypeSelectExpression__Group__1 ;
+    // InternalScope.g:11058:1: rule__TypeSelectExpression__Group__0 : rule__TypeSelectExpression__Group__0__Impl rule__TypeSelectExpression__Group__1 ;
     public final void rule__TypeSelectExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11062:1: ( rule__TypeSelectExpression__Group__0__Impl rule__TypeSelectExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11063:2: rule__TypeSelectExpression__Group__0__Impl rule__TypeSelectExpression__Group__1
+            // InternalScope.g:11062:1: ( rule__TypeSelectExpression__Group__0__Impl rule__TypeSelectExpression__Group__1 )
+            // InternalScope.g:11063:2: rule__TypeSelectExpression__Group__0__Impl rule__TypeSelectExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__TypeSelectExpression__Group__0__Impl_in_rule__TypeSelectExpression__Group__022282);
+            pushFollow(FOLLOW_32);
             rule__TypeSelectExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__TypeSelectExpression__Group__1_in_rule__TypeSelectExpression__Group__022285);
+            pushFollow(FOLLOW_2);
             rule__TypeSelectExpression__Group__1();
 
             state._fsp--;
@@ -31534,25 +31534,25 @@ public final void rule__TypeSelectExpression__Group__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__TypeSelectExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11070:1: rule__TypeSelectExpression__Group__0__Impl : ( ( rule__TypeSelectExpression__NameAssignment_0 ) ) ;
+    // InternalScope.g:11070:1: rule__TypeSelectExpression__Group__0__Impl : ( ( rule__TypeSelectExpression__NameAssignment_0 ) ) ;
     public final void rule__TypeSelectExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11074:1: ( ( ( rule__TypeSelectExpression__NameAssignment_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11075:1: ( ( rule__TypeSelectExpression__NameAssignment_0 ) )
+            // InternalScope.g:11074:1: ( ( ( rule__TypeSelectExpression__NameAssignment_0 ) ) )
+            // InternalScope.g:11075:1: ( ( rule__TypeSelectExpression__NameAssignment_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11075:1: ( ( rule__TypeSelectExpression__NameAssignment_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11076:1: ( rule__TypeSelectExpression__NameAssignment_0 )
+            // InternalScope.g:11075:1: ( ( rule__TypeSelectExpression__NameAssignment_0 ) )
+            // InternalScope.g:11076:1: ( rule__TypeSelectExpression__NameAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTypeSelectExpressionAccess().getNameAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11077:1: ( rule__TypeSelectExpression__NameAssignment_0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11077:2: rule__TypeSelectExpression__NameAssignment_0
+            // InternalScope.g:11077:1: ( rule__TypeSelectExpression__NameAssignment_0 )
+            // InternalScope.g:11077:2: rule__TypeSelectExpression__NameAssignment_0
             {
-            pushFollow(FOLLOW_rule__TypeSelectExpression__NameAssignment_0_in_rule__TypeSelectExpression__Group__0__Impl22312);
+            pushFollow(FOLLOW_2);
             rule__TypeSelectExpression__NameAssignment_0();
 
             state._fsp--;
@@ -31585,21 +31585,21 @@ public final void rule__TypeSelectExpression__Group__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__TypeSelectExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11087:1: rule__TypeSelectExpression__Group__1 : rule__TypeSelectExpression__Group__1__Impl rule__TypeSelectExpression__Group__2 ;
+    // InternalScope.g:11087:1: rule__TypeSelectExpression__Group__1 : rule__TypeSelectExpression__Group__1__Impl rule__TypeSelectExpression__Group__2 ;
     public final void rule__TypeSelectExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11091:1: ( rule__TypeSelectExpression__Group__1__Impl rule__TypeSelectExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11092:2: rule__TypeSelectExpression__Group__1__Impl rule__TypeSelectExpression__Group__2
+            // InternalScope.g:11091:1: ( rule__TypeSelectExpression__Group__1__Impl rule__TypeSelectExpression__Group__2 )
+            // InternalScope.g:11092:2: rule__TypeSelectExpression__Group__1__Impl rule__TypeSelectExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__TypeSelectExpression__Group__1__Impl_in_rule__TypeSelectExpression__Group__122342);
+            pushFollow(FOLLOW_48);
             rule__TypeSelectExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__TypeSelectExpression__Group__2_in_rule__TypeSelectExpression__Group__122345);
+            pushFollow(FOLLOW_2);
             rule__TypeSelectExpression__Group__2();
 
             state._fsp--;
@@ -31623,22 +31623,22 @@ public final void rule__TypeSelectExpression__Group__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__TypeSelectExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11099:1: rule__TypeSelectExpression__Group__1__Impl : ( '(' ) ;
+    // InternalScope.g:11099:1: rule__TypeSelectExpression__Group__1__Impl : ( '(' ) ;
     public final void rule__TypeSelectExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11103:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11104:1: ( '(' )
+            // InternalScope.g:11103:1: ( ( '(' ) )
+            // InternalScope.g:11104:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11104:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11105:1: '('
+            // InternalScope.g:11104:1: ( '(' )
+            // InternalScope.g:11105:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTypeSelectExpressionAccess().getLeftParenthesisKeyword_1()); 
             }
-            match(input,51,FOLLOW_51_in_rule__TypeSelectExpression__Group__1__Impl22373); if (state.failed) return ;
+            match(input,51,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getTypeSelectExpressionAccess().getLeftParenthesisKeyword_1()); 
             }
@@ -31664,21 +31664,21 @@ public final void rule__TypeSelectExpression__Group__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__TypeSelectExpression__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11118:1: rule__TypeSelectExpression__Group__2 : rule__TypeSelectExpression__Group__2__Impl rule__TypeSelectExpression__Group__3 ;
+    // InternalScope.g:11118:1: rule__TypeSelectExpression__Group__2 : rule__TypeSelectExpression__Group__2__Impl rule__TypeSelectExpression__Group__3 ;
     public final void rule__TypeSelectExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11122:1: ( rule__TypeSelectExpression__Group__2__Impl rule__TypeSelectExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11123:2: rule__TypeSelectExpression__Group__2__Impl rule__TypeSelectExpression__Group__3
+            // InternalScope.g:11122:1: ( rule__TypeSelectExpression__Group__2__Impl rule__TypeSelectExpression__Group__3 )
+            // InternalScope.g:11123:2: rule__TypeSelectExpression__Group__2__Impl rule__TypeSelectExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__TypeSelectExpression__Group__2__Impl_in_rule__TypeSelectExpression__Group__222404);
+            pushFollow(FOLLOW_23);
             rule__TypeSelectExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__TypeSelectExpression__Group__3_in_rule__TypeSelectExpression__Group__222407);
+            pushFollow(FOLLOW_2);
             rule__TypeSelectExpression__Group__3();
 
             state._fsp--;
@@ -31702,25 +31702,25 @@ public final void rule__TypeSelectExpression__Group__2() throws RecognitionExcep
 
 
     // $ANTLR start "rule__TypeSelectExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11130:1: rule__TypeSelectExpression__Group__2__Impl : ( ( rule__TypeSelectExpression__TypeAssignment_2 ) ) ;
+    // InternalScope.g:11130:1: rule__TypeSelectExpression__Group__2__Impl : ( ( rule__TypeSelectExpression__TypeAssignment_2 ) ) ;
     public final void rule__TypeSelectExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11134:1: ( ( ( rule__TypeSelectExpression__TypeAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11135:1: ( ( rule__TypeSelectExpression__TypeAssignment_2 ) )
+            // InternalScope.g:11134:1: ( ( ( rule__TypeSelectExpression__TypeAssignment_2 ) ) )
+            // InternalScope.g:11135:1: ( ( rule__TypeSelectExpression__TypeAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11135:1: ( ( rule__TypeSelectExpression__TypeAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11136:1: ( rule__TypeSelectExpression__TypeAssignment_2 )
+            // InternalScope.g:11135:1: ( ( rule__TypeSelectExpression__TypeAssignment_2 ) )
+            // InternalScope.g:11136:1: ( rule__TypeSelectExpression__TypeAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTypeSelectExpressionAccess().getTypeAssignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11137:1: ( rule__TypeSelectExpression__TypeAssignment_2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11137:2: rule__TypeSelectExpression__TypeAssignment_2
+            // InternalScope.g:11137:1: ( rule__TypeSelectExpression__TypeAssignment_2 )
+            // InternalScope.g:11137:2: rule__TypeSelectExpression__TypeAssignment_2
             {
-            pushFollow(FOLLOW_rule__TypeSelectExpression__TypeAssignment_2_in_rule__TypeSelectExpression__Group__2__Impl22434);
+            pushFollow(FOLLOW_2);
             rule__TypeSelectExpression__TypeAssignment_2();
 
             state._fsp--;
@@ -31753,16 +31753,16 @@ public final void rule__TypeSelectExpression__Group__2__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__TypeSelectExpression__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11147:1: rule__TypeSelectExpression__Group__3 : rule__TypeSelectExpression__Group__3__Impl ;
+    // InternalScope.g:11147:1: rule__TypeSelectExpression__Group__3 : rule__TypeSelectExpression__Group__3__Impl ;
     public final void rule__TypeSelectExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11151:1: ( rule__TypeSelectExpression__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11152:2: rule__TypeSelectExpression__Group__3__Impl
+            // InternalScope.g:11151:1: ( rule__TypeSelectExpression__Group__3__Impl )
+            // InternalScope.g:11152:2: rule__TypeSelectExpression__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__TypeSelectExpression__Group__3__Impl_in_rule__TypeSelectExpression__Group__322464);
+            pushFollow(FOLLOW_2);
             rule__TypeSelectExpression__Group__3__Impl();
 
             state._fsp--;
@@ -31786,22 +31786,22 @@ public final void rule__TypeSelectExpression__Group__3() throws RecognitionExcep
 
 
     // $ANTLR start "rule__TypeSelectExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11158:1: rule__TypeSelectExpression__Group__3__Impl : ( ')' ) ;
+    // InternalScope.g:11158:1: rule__TypeSelectExpression__Group__3__Impl : ( ')' ) ;
     public final void rule__TypeSelectExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11162:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11163:1: ( ')' )
+            // InternalScope.g:11162:1: ( ( ')' ) )
+            // InternalScope.g:11163:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11163:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11164:1: ')'
+            // InternalScope.g:11163:1: ( ')' )
+            // InternalScope.g:11164:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTypeSelectExpressionAccess().getRightParenthesisKeyword_3()); 
             }
-            match(input,52,FOLLOW_52_in_rule__TypeSelectExpression__Group__3__Impl22492); if (state.failed) return ;
+            match(input,52,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getTypeSelectExpressionAccess().getRightParenthesisKeyword_3()); 
             }
@@ -31827,21 +31827,21 @@ public final void rule__TypeSelectExpression__Group__3__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__CollectionExpression__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11185:1: rule__CollectionExpression__Group__0 : rule__CollectionExpression__Group__0__Impl rule__CollectionExpression__Group__1 ;
+    // InternalScope.g:11185:1: rule__CollectionExpression__Group__0 : rule__CollectionExpression__Group__0__Impl rule__CollectionExpression__Group__1 ;
     public final void rule__CollectionExpression__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11189:1: ( rule__CollectionExpression__Group__0__Impl rule__CollectionExpression__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11190:2: rule__CollectionExpression__Group__0__Impl rule__CollectionExpression__Group__1
+            // InternalScope.g:11189:1: ( rule__CollectionExpression__Group__0__Impl rule__CollectionExpression__Group__1 )
+            // InternalScope.g:11190:2: rule__CollectionExpression__Group__0__Impl rule__CollectionExpression__Group__1
             {
-            pushFollow(FOLLOW_rule__CollectionExpression__Group__0__Impl_in_rule__CollectionExpression__Group__022531);
+            pushFollow(FOLLOW_32);
             rule__CollectionExpression__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CollectionExpression__Group__1_in_rule__CollectionExpression__Group__022534);
+            pushFollow(FOLLOW_2);
             rule__CollectionExpression__Group__1();
 
             state._fsp--;
@@ -31865,25 +31865,25 @@ public final void rule__CollectionExpression__Group__0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__CollectionExpression__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11197:1: rule__CollectionExpression__Group__0__Impl : ( ( rule__CollectionExpression__NameAssignment_0 ) ) ;
+    // InternalScope.g:11197:1: rule__CollectionExpression__Group__0__Impl : ( ( rule__CollectionExpression__NameAssignment_0 ) ) ;
     public final void rule__CollectionExpression__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11201:1: ( ( ( rule__CollectionExpression__NameAssignment_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11202:1: ( ( rule__CollectionExpression__NameAssignment_0 ) )
+            // InternalScope.g:11201:1: ( ( ( rule__CollectionExpression__NameAssignment_0 ) ) )
+            // InternalScope.g:11202:1: ( ( rule__CollectionExpression__NameAssignment_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11202:1: ( ( rule__CollectionExpression__NameAssignment_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11203:1: ( rule__CollectionExpression__NameAssignment_0 )
+            // InternalScope.g:11202:1: ( ( rule__CollectionExpression__NameAssignment_0 ) )
+            // InternalScope.g:11203:1: ( rule__CollectionExpression__NameAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionExpressionAccess().getNameAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11204:1: ( rule__CollectionExpression__NameAssignment_0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11204:2: rule__CollectionExpression__NameAssignment_0
+            // InternalScope.g:11204:1: ( rule__CollectionExpression__NameAssignment_0 )
+            // InternalScope.g:11204:2: rule__CollectionExpression__NameAssignment_0
             {
-            pushFollow(FOLLOW_rule__CollectionExpression__NameAssignment_0_in_rule__CollectionExpression__Group__0__Impl22561);
+            pushFollow(FOLLOW_2);
             rule__CollectionExpression__NameAssignment_0();
 
             state._fsp--;
@@ -31916,21 +31916,21 @@ public final void rule__CollectionExpression__Group__0__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__CollectionExpression__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11214:1: rule__CollectionExpression__Group__1 : rule__CollectionExpression__Group__1__Impl rule__CollectionExpression__Group__2 ;
+    // InternalScope.g:11214:1: rule__CollectionExpression__Group__1 : rule__CollectionExpression__Group__1__Impl rule__CollectionExpression__Group__2 ;
     public final void rule__CollectionExpression__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11218:1: ( rule__CollectionExpression__Group__1__Impl rule__CollectionExpression__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11219:2: rule__CollectionExpression__Group__1__Impl rule__CollectionExpression__Group__2
+            // InternalScope.g:11218:1: ( rule__CollectionExpression__Group__1__Impl rule__CollectionExpression__Group__2 )
+            // InternalScope.g:11219:2: rule__CollectionExpression__Group__1__Impl rule__CollectionExpression__Group__2
             {
-            pushFollow(FOLLOW_rule__CollectionExpression__Group__1__Impl_in_rule__CollectionExpression__Group__122591);
+            pushFollow(FOLLOW_17);
             rule__CollectionExpression__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CollectionExpression__Group__2_in_rule__CollectionExpression__Group__122594);
+            pushFollow(FOLLOW_2);
             rule__CollectionExpression__Group__2();
 
             state._fsp--;
@@ -31954,22 +31954,22 @@ public final void rule__CollectionExpression__Group__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__CollectionExpression__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11226:1: rule__CollectionExpression__Group__1__Impl : ( '(' ) ;
+    // InternalScope.g:11226:1: rule__CollectionExpression__Group__1__Impl : ( '(' ) ;
     public final void rule__CollectionExpression__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11230:1: ( ( '(' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11231:1: ( '(' )
+            // InternalScope.g:11230:1: ( ( '(' ) )
+            // InternalScope.g:11231:1: ( '(' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11231:1: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11232:1: '('
+            // InternalScope.g:11231:1: ( '(' )
+            // InternalScope.g:11232:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionExpressionAccess().getLeftParenthesisKeyword_1()); 
             }
-            match(input,51,FOLLOW_51_in_rule__CollectionExpression__Group__1__Impl22622); if (state.failed) return ;
+            match(input,51,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCollectionExpressionAccess().getLeftParenthesisKeyword_1()); 
             }
@@ -31995,21 +31995,21 @@ public final void rule__CollectionExpression__Group__1__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__CollectionExpression__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11245:1: rule__CollectionExpression__Group__2 : rule__CollectionExpression__Group__2__Impl rule__CollectionExpression__Group__3 ;
+    // InternalScope.g:11245:1: rule__CollectionExpression__Group__2 : rule__CollectionExpression__Group__2__Impl rule__CollectionExpression__Group__3 ;
     public final void rule__CollectionExpression__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11249:1: ( rule__CollectionExpression__Group__2__Impl rule__CollectionExpression__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11250:2: rule__CollectionExpression__Group__2__Impl rule__CollectionExpression__Group__3
+            // InternalScope.g:11249:1: ( rule__CollectionExpression__Group__2__Impl rule__CollectionExpression__Group__3 )
+            // InternalScope.g:11250:2: rule__CollectionExpression__Group__2__Impl rule__CollectionExpression__Group__3
             {
-            pushFollow(FOLLOW_rule__CollectionExpression__Group__2__Impl_in_rule__CollectionExpression__Group__222653);
+            pushFollow(FOLLOW_17);
             rule__CollectionExpression__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CollectionExpression__Group__3_in_rule__CollectionExpression__Group__222656);
+            pushFollow(FOLLOW_2);
             rule__CollectionExpression__Group__3();
 
             state._fsp--;
@@ -32033,22 +32033,22 @@ public final void rule__CollectionExpression__Group__2() throws RecognitionExcep
 
 
     // $ANTLR start "rule__CollectionExpression__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11257:1: rule__CollectionExpression__Group__2__Impl : ( ( rule__CollectionExpression__Group_2__0 )? ) ;
+    // InternalScope.g:11257:1: rule__CollectionExpression__Group__2__Impl : ( ( rule__CollectionExpression__Group_2__0 )? ) ;
     public final void rule__CollectionExpression__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11261:1: ( ( ( rule__CollectionExpression__Group_2__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11262:1: ( ( rule__CollectionExpression__Group_2__0 )? )
+            // InternalScope.g:11261:1: ( ( ( rule__CollectionExpression__Group_2__0 )? ) )
+            // InternalScope.g:11262:1: ( ( rule__CollectionExpression__Group_2__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11262:1: ( ( rule__CollectionExpression__Group_2__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11263:1: ( rule__CollectionExpression__Group_2__0 )?
+            // InternalScope.g:11262:1: ( ( rule__CollectionExpression__Group_2__0 )? )
+            // InternalScope.g:11263:1: ( rule__CollectionExpression__Group_2__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionExpressionAccess().getGroup_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11264:1: ( rule__CollectionExpression__Group_2__0 )?
+            // InternalScope.g:11264:1: ( rule__CollectionExpression__Group_2__0 )?
             int alt74=2;
             int LA74_0 = input.LA(1);
 
@@ -32061,9 +32061,9 @@ public final void rule__CollectionExpression__Group__2__Impl() throws Recognitio
             }
             switch (alt74) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11264:2: rule__CollectionExpression__Group_2__0
+                    // InternalScope.g:11264:2: rule__CollectionExpression__Group_2__0
                     {
-                    pushFollow(FOLLOW_rule__CollectionExpression__Group_2__0_in_rule__CollectionExpression__Group__2__Impl22683);
+                    pushFollow(FOLLOW_2);
                     rule__CollectionExpression__Group_2__0();
 
                     state._fsp--;
@@ -32099,21 +32099,21 @@ public final void rule__CollectionExpression__Group__2__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__CollectionExpression__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11274:1: rule__CollectionExpression__Group__3 : rule__CollectionExpression__Group__3__Impl rule__CollectionExpression__Group__4 ;
+    // InternalScope.g:11274:1: rule__CollectionExpression__Group__3 : rule__CollectionExpression__Group__3__Impl rule__CollectionExpression__Group__4 ;
     public final void rule__CollectionExpression__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11278:1: ( rule__CollectionExpression__Group__3__Impl rule__CollectionExpression__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11279:2: rule__CollectionExpression__Group__3__Impl rule__CollectionExpression__Group__4
+            // InternalScope.g:11278:1: ( rule__CollectionExpression__Group__3__Impl rule__CollectionExpression__Group__4 )
+            // InternalScope.g:11279:2: rule__CollectionExpression__Group__3__Impl rule__CollectionExpression__Group__4
             {
-            pushFollow(FOLLOW_rule__CollectionExpression__Group__3__Impl_in_rule__CollectionExpression__Group__322714);
+            pushFollow(FOLLOW_23);
             rule__CollectionExpression__Group__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CollectionExpression__Group__4_in_rule__CollectionExpression__Group__322717);
+            pushFollow(FOLLOW_2);
             rule__CollectionExpression__Group__4();
 
             state._fsp--;
@@ -32137,25 +32137,25 @@ public final void rule__CollectionExpression__Group__3() throws RecognitionExcep
 
 
     // $ANTLR start "rule__CollectionExpression__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11286:1: rule__CollectionExpression__Group__3__Impl : ( ( rule__CollectionExpression__ExpAssignment_3 ) ) ;
+    // InternalScope.g:11286:1: rule__CollectionExpression__Group__3__Impl : ( ( rule__CollectionExpression__ExpAssignment_3 ) ) ;
     public final void rule__CollectionExpression__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11290:1: ( ( ( rule__CollectionExpression__ExpAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11291:1: ( ( rule__CollectionExpression__ExpAssignment_3 ) )
+            // InternalScope.g:11290:1: ( ( ( rule__CollectionExpression__ExpAssignment_3 ) ) )
+            // InternalScope.g:11291:1: ( ( rule__CollectionExpression__ExpAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11291:1: ( ( rule__CollectionExpression__ExpAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11292:1: ( rule__CollectionExpression__ExpAssignment_3 )
+            // InternalScope.g:11291:1: ( ( rule__CollectionExpression__ExpAssignment_3 ) )
+            // InternalScope.g:11292:1: ( rule__CollectionExpression__ExpAssignment_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionExpressionAccess().getExpAssignment_3()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11293:1: ( rule__CollectionExpression__ExpAssignment_3 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11293:2: rule__CollectionExpression__ExpAssignment_3
+            // InternalScope.g:11293:1: ( rule__CollectionExpression__ExpAssignment_3 )
+            // InternalScope.g:11293:2: rule__CollectionExpression__ExpAssignment_3
             {
-            pushFollow(FOLLOW_rule__CollectionExpression__ExpAssignment_3_in_rule__CollectionExpression__Group__3__Impl22744);
+            pushFollow(FOLLOW_2);
             rule__CollectionExpression__ExpAssignment_3();
 
             state._fsp--;
@@ -32188,16 +32188,16 @@ public final void rule__CollectionExpression__Group__3__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__CollectionExpression__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11303:1: rule__CollectionExpression__Group__4 : rule__CollectionExpression__Group__4__Impl ;
+    // InternalScope.g:11303:1: rule__CollectionExpression__Group__4 : rule__CollectionExpression__Group__4__Impl ;
     public final void rule__CollectionExpression__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11307:1: ( rule__CollectionExpression__Group__4__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11308:2: rule__CollectionExpression__Group__4__Impl
+            // InternalScope.g:11307:1: ( rule__CollectionExpression__Group__4__Impl )
+            // InternalScope.g:11308:2: rule__CollectionExpression__Group__4__Impl
             {
-            pushFollow(FOLLOW_rule__CollectionExpression__Group__4__Impl_in_rule__CollectionExpression__Group__422774);
+            pushFollow(FOLLOW_2);
             rule__CollectionExpression__Group__4__Impl();
 
             state._fsp--;
@@ -32221,22 +32221,22 @@ public final void rule__CollectionExpression__Group__4() throws RecognitionExcep
 
 
     // $ANTLR start "rule__CollectionExpression__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11314:1: rule__CollectionExpression__Group__4__Impl : ( ')' ) ;
+    // InternalScope.g:11314:1: rule__CollectionExpression__Group__4__Impl : ( ')' ) ;
     public final void rule__CollectionExpression__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11318:1: ( ( ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11319:1: ( ')' )
+            // InternalScope.g:11318:1: ( ( ')' ) )
+            // InternalScope.g:11319:1: ( ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11319:1: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11320:1: ')'
+            // InternalScope.g:11319:1: ( ')' )
+            // InternalScope.g:11320:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionExpressionAccess().getRightParenthesisKeyword_4()); 
             }
-            match(input,52,FOLLOW_52_in_rule__CollectionExpression__Group__4__Impl22802); if (state.failed) return ;
+            match(input,52,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCollectionExpressionAccess().getRightParenthesisKeyword_4()); 
             }
@@ -32262,21 +32262,21 @@ public final void rule__CollectionExpression__Group__4__Impl() throws Recognitio
 
 
     // $ANTLR start "rule__CollectionExpression__Group_2__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11343:1: rule__CollectionExpression__Group_2__0 : rule__CollectionExpression__Group_2__0__Impl rule__CollectionExpression__Group_2__1 ;
+    // InternalScope.g:11343:1: rule__CollectionExpression__Group_2__0 : rule__CollectionExpression__Group_2__0__Impl rule__CollectionExpression__Group_2__1 ;
     public final void rule__CollectionExpression__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11347:1: ( rule__CollectionExpression__Group_2__0__Impl rule__CollectionExpression__Group_2__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11348:2: rule__CollectionExpression__Group_2__0__Impl rule__CollectionExpression__Group_2__1
+            // InternalScope.g:11347:1: ( rule__CollectionExpression__Group_2__0__Impl rule__CollectionExpression__Group_2__1 )
+            // InternalScope.g:11348:2: rule__CollectionExpression__Group_2__0__Impl rule__CollectionExpression__Group_2__1
             {
-            pushFollow(FOLLOW_rule__CollectionExpression__Group_2__0__Impl_in_rule__CollectionExpression__Group_2__022843);
+            pushFollow(FOLLOW_31);
             rule__CollectionExpression__Group_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CollectionExpression__Group_2__1_in_rule__CollectionExpression__Group_2__022846);
+            pushFollow(FOLLOW_2);
             rule__CollectionExpression__Group_2__1();
 
             state._fsp--;
@@ -32300,25 +32300,25 @@ public final void rule__CollectionExpression__Group_2__0() throws RecognitionExc
 
 
     // $ANTLR start "rule__CollectionExpression__Group_2__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11355:1: rule__CollectionExpression__Group_2__0__Impl : ( ( rule__CollectionExpression__VarAssignment_2_0 ) ) ;
+    // InternalScope.g:11355:1: rule__CollectionExpression__Group_2__0__Impl : ( ( rule__CollectionExpression__VarAssignment_2_0 ) ) ;
     public final void rule__CollectionExpression__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11359:1: ( ( ( rule__CollectionExpression__VarAssignment_2_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11360:1: ( ( rule__CollectionExpression__VarAssignment_2_0 ) )
+            // InternalScope.g:11359:1: ( ( ( rule__CollectionExpression__VarAssignment_2_0 ) ) )
+            // InternalScope.g:11360:1: ( ( rule__CollectionExpression__VarAssignment_2_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11360:1: ( ( rule__CollectionExpression__VarAssignment_2_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11361:1: ( rule__CollectionExpression__VarAssignment_2_0 )
+            // InternalScope.g:11360:1: ( ( rule__CollectionExpression__VarAssignment_2_0 ) )
+            // InternalScope.g:11361:1: ( rule__CollectionExpression__VarAssignment_2_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionExpressionAccess().getVarAssignment_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11362:1: ( rule__CollectionExpression__VarAssignment_2_0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11362:2: rule__CollectionExpression__VarAssignment_2_0
+            // InternalScope.g:11362:1: ( rule__CollectionExpression__VarAssignment_2_0 )
+            // InternalScope.g:11362:2: rule__CollectionExpression__VarAssignment_2_0
             {
-            pushFollow(FOLLOW_rule__CollectionExpression__VarAssignment_2_0_in_rule__CollectionExpression__Group_2__0__Impl22873);
+            pushFollow(FOLLOW_2);
             rule__CollectionExpression__VarAssignment_2_0();
 
             state._fsp--;
@@ -32351,16 +32351,16 @@ public final void rule__CollectionExpression__Group_2__0__Impl() throws Recognit
 
 
     // $ANTLR start "rule__CollectionExpression__Group_2__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11372:1: rule__CollectionExpression__Group_2__1 : rule__CollectionExpression__Group_2__1__Impl ;
+    // InternalScope.g:11372:1: rule__CollectionExpression__Group_2__1 : rule__CollectionExpression__Group_2__1__Impl ;
     public final void rule__CollectionExpression__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11376:1: ( rule__CollectionExpression__Group_2__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11377:2: rule__CollectionExpression__Group_2__1__Impl
+            // InternalScope.g:11376:1: ( rule__CollectionExpression__Group_2__1__Impl )
+            // InternalScope.g:11377:2: rule__CollectionExpression__Group_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__CollectionExpression__Group_2__1__Impl_in_rule__CollectionExpression__Group_2__122903);
+            pushFollow(FOLLOW_2);
             rule__CollectionExpression__Group_2__1__Impl();
 
             state._fsp--;
@@ -32384,22 +32384,22 @@ public final void rule__CollectionExpression__Group_2__1() throws RecognitionExc
 
 
     // $ANTLR start "rule__CollectionExpression__Group_2__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11383:1: rule__CollectionExpression__Group_2__1__Impl : ( '|' ) ;
+    // InternalScope.g:11383:1: rule__CollectionExpression__Group_2__1__Impl : ( '|' ) ;
     public final void rule__CollectionExpression__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11387:1: ( ( '|' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11388:1: ( '|' )
+            // InternalScope.g:11387:1: ( ( '|' ) )
+            // InternalScope.g:11388:1: ( '|' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11388:1: ( '|' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11389:1: '|'
+            // InternalScope.g:11388:1: ( '|' )
+            // InternalScope.g:11389:1: '|'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionExpressionAccess().getVerticalLineKeyword_2_1()); 
             }
-            match(input,58,FOLLOW_58_in_rule__CollectionExpression__Group_2__1__Impl22931); if (state.failed) return ;
+            match(input,58,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCollectionExpressionAccess().getVerticalLineKeyword_2_1()); 
             }
@@ -32425,21 +32425,21 @@ public final void rule__CollectionExpression__Group_2__1__Impl() throws Recognit
 
 
     // $ANTLR start "rule__CollectionType__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11406:1: rule__CollectionType__Group__0 : rule__CollectionType__Group__0__Impl rule__CollectionType__Group__1 ;
+    // InternalScope.g:11406:1: rule__CollectionType__Group__0 : rule__CollectionType__Group__0__Impl rule__CollectionType__Group__1 ;
     public final void rule__CollectionType__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11410:1: ( rule__CollectionType__Group__0__Impl rule__CollectionType__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11411:2: rule__CollectionType__Group__0__Impl rule__CollectionType__Group__1
+            // InternalScope.g:11410:1: ( rule__CollectionType__Group__0__Impl rule__CollectionType__Group__1 )
+            // InternalScope.g:11411:2: rule__CollectionType__Group__0__Impl rule__CollectionType__Group__1
             {
-            pushFollow(FOLLOW_rule__CollectionType__Group__0__Impl_in_rule__CollectionType__Group__022966);
+            pushFollow(FOLLOW_29);
             rule__CollectionType__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CollectionType__Group__1_in_rule__CollectionType__Group__022969);
+            pushFollow(FOLLOW_2);
             rule__CollectionType__Group__1();
 
             state._fsp--;
@@ -32463,25 +32463,25 @@ public final void rule__CollectionType__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__CollectionType__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11418:1: rule__CollectionType__Group__0__Impl : ( ( rule__CollectionType__ClAssignment_0 ) ) ;
+    // InternalScope.g:11418:1: rule__CollectionType__Group__0__Impl : ( ( rule__CollectionType__ClAssignment_0 ) ) ;
     public final void rule__CollectionType__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11422:1: ( ( ( rule__CollectionType__ClAssignment_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11423:1: ( ( rule__CollectionType__ClAssignment_0 ) )
+            // InternalScope.g:11422:1: ( ( ( rule__CollectionType__ClAssignment_0 ) ) )
+            // InternalScope.g:11423:1: ( ( rule__CollectionType__ClAssignment_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11423:1: ( ( rule__CollectionType__ClAssignment_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11424:1: ( rule__CollectionType__ClAssignment_0 )
+            // InternalScope.g:11423:1: ( ( rule__CollectionType__ClAssignment_0 ) )
+            // InternalScope.g:11424:1: ( rule__CollectionType__ClAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionTypeAccess().getClAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11425:1: ( rule__CollectionType__ClAssignment_0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11425:2: rule__CollectionType__ClAssignment_0
+            // InternalScope.g:11425:1: ( rule__CollectionType__ClAssignment_0 )
+            // InternalScope.g:11425:2: rule__CollectionType__ClAssignment_0
             {
-            pushFollow(FOLLOW_rule__CollectionType__ClAssignment_0_in_rule__CollectionType__Group__0__Impl22996);
+            pushFollow(FOLLOW_2);
             rule__CollectionType__ClAssignment_0();
 
             state._fsp--;
@@ -32514,21 +32514,21 @@ public final void rule__CollectionType__Group__0__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__CollectionType__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11435:1: rule__CollectionType__Group__1 : rule__CollectionType__Group__1__Impl rule__CollectionType__Group__2 ;
+    // InternalScope.g:11435:1: rule__CollectionType__Group__1 : rule__CollectionType__Group__1__Impl rule__CollectionType__Group__2 ;
     public final void rule__CollectionType__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11439:1: ( rule__CollectionType__Group__1__Impl rule__CollectionType__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11440:2: rule__CollectionType__Group__1__Impl rule__CollectionType__Group__2
+            // InternalScope.g:11439:1: ( rule__CollectionType__Group__1__Impl rule__CollectionType__Group__2 )
+            // InternalScope.g:11440:2: rule__CollectionType__Group__1__Impl rule__CollectionType__Group__2
             {
-            pushFollow(FOLLOW_rule__CollectionType__Group__1__Impl_in_rule__CollectionType__Group__123026);
+            pushFollow(FOLLOW_48);
             rule__CollectionType__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CollectionType__Group__2_in_rule__CollectionType__Group__123029);
+            pushFollow(FOLLOW_2);
             rule__CollectionType__Group__2();
 
             state._fsp--;
@@ -32552,22 +32552,22 @@ public final void rule__CollectionType__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__CollectionType__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11447:1: rule__CollectionType__Group__1__Impl : ( '[' ) ;
+    // InternalScope.g:11447:1: rule__CollectionType__Group__1__Impl : ( '[' ) ;
     public final void rule__CollectionType__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11451:1: ( ( '[' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11452:1: ( '[' )
+            // InternalScope.g:11451:1: ( ( '[' ) )
+            // InternalScope.g:11452:1: ( '[' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11452:1: ( '[' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11453:1: '['
+            // InternalScope.g:11452:1: ( '[' )
+            // InternalScope.g:11453:1: '['
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionTypeAccess().getLeftSquareBracketKeyword_1()); 
             }
-            match(input,56,FOLLOW_56_in_rule__CollectionType__Group__1__Impl23057); if (state.failed) return ;
+            match(input,56,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCollectionTypeAccess().getLeftSquareBracketKeyword_1()); 
             }
@@ -32593,21 +32593,21 @@ public final void rule__CollectionType__Group__1__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__CollectionType__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11466:1: rule__CollectionType__Group__2 : rule__CollectionType__Group__2__Impl rule__CollectionType__Group__3 ;
+    // InternalScope.g:11466:1: rule__CollectionType__Group__2 : rule__CollectionType__Group__2__Impl rule__CollectionType__Group__3 ;
     public final void rule__CollectionType__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11470:1: ( rule__CollectionType__Group__2__Impl rule__CollectionType__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11471:2: rule__CollectionType__Group__2__Impl rule__CollectionType__Group__3
+            // InternalScope.g:11470:1: ( rule__CollectionType__Group__2__Impl rule__CollectionType__Group__3 )
+            // InternalScope.g:11471:2: rule__CollectionType__Group__2__Impl rule__CollectionType__Group__3
             {
-            pushFollow(FOLLOW_rule__CollectionType__Group__2__Impl_in_rule__CollectionType__Group__223088);
+            pushFollow(FOLLOW_30);
             rule__CollectionType__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__CollectionType__Group__3_in_rule__CollectionType__Group__223091);
+            pushFollow(FOLLOW_2);
             rule__CollectionType__Group__3();
 
             state._fsp--;
@@ -32631,25 +32631,25 @@ public final void rule__CollectionType__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__CollectionType__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11478:1: rule__CollectionType__Group__2__Impl : ( ( rule__CollectionType__Id1Assignment_2 ) ) ;
+    // InternalScope.g:11478:1: rule__CollectionType__Group__2__Impl : ( ( rule__CollectionType__Id1Assignment_2 ) ) ;
     public final void rule__CollectionType__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11482:1: ( ( ( rule__CollectionType__Id1Assignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11483:1: ( ( rule__CollectionType__Id1Assignment_2 ) )
+            // InternalScope.g:11482:1: ( ( ( rule__CollectionType__Id1Assignment_2 ) ) )
+            // InternalScope.g:11483:1: ( ( rule__CollectionType__Id1Assignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11483:1: ( ( rule__CollectionType__Id1Assignment_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11484:1: ( rule__CollectionType__Id1Assignment_2 )
+            // InternalScope.g:11483:1: ( ( rule__CollectionType__Id1Assignment_2 ) )
+            // InternalScope.g:11484:1: ( rule__CollectionType__Id1Assignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionTypeAccess().getId1Assignment_2()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11485:1: ( rule__CollectionType__Id1Assignment_2 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11485:2: rule__CollectionType__Id1Assignment_2
+            // InternalScope.g:11485:1: ( rule__CollectionType__Id1Assignment_2 )
+            // InternalScope.g:11485:2: rule__CollectionType__Id1Assignment_2
             {
-            pushFollow(FOLLOW_rule__CollectionType__Id1Assignment_2_in_rule__CollectionType__Group__2__Impl23118);
+            pushFollow(FOLLOW_2);
             rule__CollectionType__Id1Assignment_2();
 
             state._fsp--;
@@ -32682,16 +32682,16 @@ public final void rule__CollectionType__Group__2__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__CollectionType__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11495:1: rule__CollectionType__Group__3 : rule__CollectionType__Group__3__Impl ;
+    // InternalScope.g:11495:1: rule__CollectionType__Group__3 : rule__CollectionType__Group__3__Impl ;
     public final void rule__CollectionType__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11499:1: ( rule__CollectionType__Group__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11500:2: rule__CollectionType__Group__3__Impl
+            // InternalScope.g:11499:1: ( rule__CollectionType__Group__3__Impl )
+            // InternalScope.g:11500:2: rule__CollectionType__Group__3__Impl
             {
-            pushFollow(FOLLOW_rule__CollectionType__Group__3__Impl_in_rule__CollectionType__Group__323148);
+            pushFollow(FOLLOW_2);
             rule__CollectionType__Group__3__Impl();
 
             state._fsp--;
@@ -32715,22 +32715,22 @@ public final void rule__CollectionType__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__CollectionType__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11506:1: rule__CollectionType__Group__3__Impl : ( ']' ) ;
+    // InternalScope.g:11506:1: rule__CollectionType__Group__3__Impl : ( ']' ) ;
     public final void rule__CollectionType__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11510:1: ( ( ']' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11511:1: ( ']' )
+            // InternalScope.g:11510:1: ( ( ']' ) )
+            // InternalScope.g:11511:1: ( ']' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11511:1: ( ']' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11512:1: ']'
+            // InternalScope.g:11511:1: ( ']' )
+            // InternalScope.g:11512:1: ']'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionTypeAccess().getRightSquareBracketKeyword_3()); 
             }
-            match(input,57,FOLLOW_57_in_rule__CollectionType__Group__3__Impl23176); if (state.failed) return ;
+            match(input,57,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getCollectionTypeAccess().getRightSquareBracketKeyword_3()); 
             }
@@ -32756,21 +32756,21 @@ public final void rule__CollectionType__Group__3__Impl() throws RecognitionExcep
 
 
     // $ANTLR start "rule__SimpleType__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11533:1: rule__SimpleType__Group__0 : rule__SimpleType__Group__0__Impl rule__SimpleType__Group__1 ;
+    // InternalScope.g:11533:1: rule__SimpleType__Group__0 : rule__SimpleType__Group__0__Impl rule__SimpleType__Group__1 ;
     public final void rule__SimpleType__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11537:1: ( rule__SimpleType__Group__0__Impl rule__SimpleType__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11538:2: rule__SimpleType__Group__0__Impl rule__SimpleType__Group__1
+            // InternalScope.g:11537:1: ( rule__SimpleType__Group__0__Impl rule__SimpleType__Group__1 )
+            // InternalScope.g:11538:2: rule__SimpleType__Group__0__Impl rule__SimpleType__Group__1
             {
-            pushFollow(FOLLOW_rule__SimpleType__Group__0__Impl_in_rule__SimpleType__Group__023215);
+            pushFollow(FOLLOW_43);
             rule__SimpleType__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SimpleType__Group__1_in_rule__SimpleType__Group__023218);
+            pushFollow(FOLLOW_2);
             rule__SimpleType__Group__1();
 
             state._fsp--;
@@ -32794,25 +32794,25 @@ public final void rule__SimpleType__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__SimpleType__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11545:1: rule__SimpleType__Group__0__Impl : ( ( rule__SimpleType__IdAssignment_0 ) ) ;
+    // InternalScope.g:11545:1: rule__SimpleType__Group__0__Impl : ( ( rule__SimpleType__IdAssignment_0 ) ) ;
     public final void rule__SimpleType__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11549:1: ( ( ( rule__SimpleType__IdAssignment_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11550:1: ( ( rule__SimpleType__IdAssignment_0 ) )
+            // InternalScope.g:11549:1: ( ( ( rule__SimpleType__IdAssignment_0 ) ) )
+            // InternalScope.g:11550:1: ( ( rule__SimpleType__IdAssignment_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11550:1: ( ( rule__SimpleType__IdAssignment_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11551:1: ( rule__SimpleType__IdAssignment_0 )
+            // InternalScope.g:11550:1: ( ( rule__SimpleType__IdAssignment_0 ) )
+            // InternalScope.g:11551:1: ( rule__SimpleType__IdAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSimpleTypeAccess().getIdAssignment_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11552:1: ( rule__SimpleType__IdAssignment_0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11552:2: rule__SimpleType__IdAssignment_0
+            // InternalScope.g:11552:1: ( rule__SimpleType__IdAssignment_0 )
+            // InternalScope.g:11552:2: rule__SimpleType__IdAssignment_0
             {
-            pushFollow(FOLLOW_rule__SimpleType__IdAssignment_0_in_rule__SimpleType__Group__0__Impl23245);
+            pushFollow(FOLLOW_2);
             rule__SimpleType__IdAssignment_0();
 
             state._fsp--;
@@ -32845,16 +32845,16 @@ public final void rule__SimpleType__Group__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__SimpleType__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11562:1: rule__SimpleType__Group__1 : rule__SimpleType__Group__1__Impl ;
+    // InternalScope.g:11562:1: rule__SimpleType__Group__1 : rule__SimpleType__Group__1__Impl ;
     public final void rule__SimpleType__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11566:1: ( rule__SimpleType__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11567:2: rule__SimpleType__Group__1__Impl
+            // InternalScope.g:11566:1: ( rule__SimpleType__Group__1__Impl )
+            // InternalScope.g:11567:2: rule__SimpleType__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__SimpleType__Group__1__Impl_in_rule__SimpleType__Group__123275);
+            pushFollow(FOLLOW_2);
             rule__SimpleType__Group__1__Impl();
 
             state._fsp--;
@@ -32878,22 +32878,22 @@ public final void rule__SimpleType__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__SimpleType__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11573:1: rule__SimpleType__Group__1__Impl : ( ( rule__SimpleType__Group_1__0 )* ) ;
+    // InternalScope.g:11573:1: rule__SimpleType__Group__1__Impl : ( ( rule__SimpleType__Group_1__0 )* ) ;
     public final void rule__SimpleType__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11577:1: ( ( ( rule__SimpleType__Group_1__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11578:1: ( ( rule__SimpleType__Group_1__0 )* )
+            // InternalScope.g:11577:1: ( ( ( rule__SimpleType__Group_1__0 )* ) )
+            // InternalScope.g:11578:1: ( ( rule__SimpleType__Group_1__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11578:1: ( ( rule__SimpleType__Group_1__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11579:1: ( rule__SimpleType__Group_1__0 )*
+            // InternalScope.g:11578:1: ( ( rule__SimpleType__Group_1__0 )* )
+            // InternalScope.g:11579:1: ( rule__SimpleType__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSimpleTypeAccess().getGroup_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11580:1: ( rule__SimpleType__Group_1__0 )*
+            // InternalScope.g:11580:1: ( rule__SimpleType__Group_1__0 )*
             loop75:
             do {
                 int alt75=2;
@@ -32906,9 +32906,9 @@ public final void rule__SimpleType__Group__1__Impl() throws RecognitionException
 
                 switch (alt75) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11580:2: rule__SimpleType__Group_1__0
+            	    // InternalScope.g:11580:2: rule__SimpleType__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__SimpleType__Group_1__0_in_rule__SimpleType__Group__1__Impl23302);
+            	    pushFollow(FOLLOW_44);
             	    rule__SimpleType__Group_1__0();
 
             	    state._fsp--;
@@ -32947,21 +32947,21 @@ public final void rule__SimpleType__Group__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__SimpleType__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11594:1: rule__SimpleType__Group_1__0 : rule__SimpleType__Group_1__0__Impl rule__SimpleType__Group_1__1 ;
+    // InternalScope.g:11594:1: rule__SimpleType__Group_1__0 : rule__SimpleType__Group_1__0__Impl rule__SimpleType__Group_1__1 ;
     public final void rule__SimpleType__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11598:1: ( rule__SimpleType__Group_1__0__Impl rule__SimpleType__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11599:2: rule__SimpleType__Group_1__0__Impl rule__SimpleType__Group_1__1
+            // InternalScope.g:11598:1: ( rule__SimpleType__Group_1__0__Impl rule__SimpleType__Group_1__1 )
+            // InternalScope.g:11599:2: rule__SimpleType__Group_1__0__Impl rule__SimpleType__Group_1__1
             {
-            pushFollow(FOLLOW_rule__SimpleType__Group_1__0__Impl_in_rule__SimpleType__Group_1__023337);
+            pushFollow(FOLLOW_3);
             rule__SimpleType__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__SimpleType__Group_1__1_in_rule__SimpleType__Group_1__023340);
+            pushFollow(FOLLOW_2);
             rule__SimpleType__Group_1__1();
 
             state._fsp--;
@@ -32985,22 +32985,22 @@ public final void rule__SimpleType__Group_1__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__SimpleType__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11606:1: rule__SimpleType__Group_1__0__Impl : ( '::' ) ;
+    // InternalScope.g:11606:1: rule__SimpleType__Group_1__0__Impl : ( '::' ) ;
     public final void rule__SimpleType__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11610:1: ( ( '::' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11611:1: ( '::' )
+            // InternalScope.g:11610:1: ( ( '::' ) )
+            // InternalScope.g:11611:1: ( '::' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11611:1: ( '::' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11612:1: '::'
+            // InternalScope.g:11611:1: ( '::' )
+            // InternalScope.g:11612:1: '::'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSimpleTypeAccess().getColonColonKeyword_1_0()); 
             }
-            match(input,67,FOLLOW_67_in_rule__SimpleType__Group_1__0__Impl23368); if (state.failed) return ;
+            match(input,67,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getSimpleTypeAccess().getColonColonKeyword_1_0()); 
             }
@@ -33026,16 +33026,16 @@ public final void rule__SimpleType__Group_1__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__SimpleType__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11625:1: rule__SimpleType__Group_1__1 : rule__SimpleType__Group_1__1__Impl ;
+    // InternalScope.g:11625:1: rule__SimpleType__Group_1__1 : rule__SimpleType__Group_1__1__Impl ;
     public final void rule__SimpleType__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11629:1: ( rule__SimpleType__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11630:2: rule__SimpleType__Group_1__1__Impl
+            // InternalScope.g:11629:1: ( rule__SimpleType__Group_1__1__Impl )
+            // InternalScope.g:11630:2: rule__SimpleType__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__SimpleType__Group_1__1__Impl_in_rule__SimpleType__Group_1__123399);
+            pushFollow(FOLLOW_2);
             rule__SimpleType__Group_1__1__Impl();
 
             state._fsp--;
@@ -33059,25 +33059,25 @@ public final void rule__SimpleType__Group_1__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__SimpleType__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11636:1: rule__SimpleType__Group_1__1__Impl : ( ( rule__SimpleType__IdAssignment_1_1 ) ) ;
+    // InternalScope.g:11636:1: rule__SimpleType__Group_1__1__Impl : ( ( rule__SimpleType__IdAssignment_1_1 ) ) ;
     public final void rule__SimpleType__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11640:1: ( ( ( rule__SimpleType__IdAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11641:1: ( ( rule__SimpleType__IdAssignment_1_1 ) )
+            // InternalScope.g:11640:1: ( ( ( rule__SimpleType__IdAssignment_1_1 ) ) )
+            // InternalScope.g:11641:1: ( ( rule__SimpleType__IdAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11641:1: ( ( rule__SimpleType__IdAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11642:1: ( rule__SimpleType__IdAssignment_1_1 )
+            // InternalScope.g:11641:1: ( ( rule__SimpleType__IdAssignment_1_1 ) )
+            // InternalScope.g:11642:1: ( rule__SimpleType__IdAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSimpleTypeAccess().getIdAssignment_1_1()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11643:1: ( rule__SimpleType__IdAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11643:2: rule__SimpleType__IdAssignment_1_1
+            // InternalScope.g:11643:1: ( rule__SimpleType__IdAssignment_1_1 )
+            // InternalScope.g:11643:2: rule__SimpleType__IdAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__SimpleType__IdAssignment_1_1_in_rule__SimpleType__Group_1__1__Impl23426);
+            pushFollow(FOLLOW_2);
             rule__SimpleType__IdAssignment_1_1();
 
             state._fsp--;
@@ -33110,22 +33110,22 @@ public final void rule__SimpleType__Group_1__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__ScopeModel__NameAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11658:1: rule__ScopeModel__NameAssignment_1 : ( ruleDottedID ) ;
+    // InternalScope.g:11658:1: rule__ScopeModel__NameAssignment_1 : ( ruleDottedID ) ;
     public final void rule__ScopeModel__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11662:1: ( ( ruleDottedID ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11663:1: ( ruleDottedID )
+            // InternalScope.g:11662:1: ( ( ruleDottedID ) )
+            // InternalScope.g:11663:1: ( ruleDottedID )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11663:1: ( ruleDottedID )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11664:1: ruleDottedID
+            // InternalScope.g:11663:1: ( ruleDottedID )
+            // InternalScope.g:11664:1: ruleDottedID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeModelAccess().getNameDottedIDParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleDottedID_in_rule__ScopeModel__NameAssignment_123465);
+            pushFollow(FOLLOW_2);
             ruleDottedID();
 
             state._fsp--;
@@ -33155,28 +33155,28 @@ public final void rule__ScopeModel__NameAssignment_1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__ScopeModel__IncludedScopesAssignment_2_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11673:1: rule__ScopeModel__IncludedScopesAssignment_2_1 : ( ( ruleDottedID ) ) ;
+    // InternalScope.g:11673:1: rule__ScopeModel__IncludedScopesAssignment_2_1 : ( ( ruleDottedID ) ) ;
     public final void rule__ScopeModel__IncludedScopesAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11677:1: ( ( ( ruleDottedID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11678:1: ( ( ruleDottedID ) )
+            // InternalScope.g:11677:1: ( ( ( ruleDottedID ) ) )
+            // InternalScope.g:11678:1: ( ( ruleDottedID ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11678:1: ( ( ruleDottedID ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11679:1: ( ruleDottedID )
+            // InternalScope.g:11678:1: ( ( ruleDottedID ) )
+            // InternalScope.g:11679:1: ( ruleDottedID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeModelAccess().getIncludedScopesScopeModelCrossReference_2_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11680:1: ( ruleDottedID )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11681:1: ruleDottedID
+            // InternalScope.g:11680:1: ( ruleDottedID )
+            // InternalScope.g:11681:1: ruleDottedID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeModelAccess().getIncludedScopesScopeModelDottedIDParserRuleCall_2_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleDottedID_in_rule__ScopeModel__IncludedScopesAssignment_2_123500);
+            pushFollow(FOLLOW_2);
             ruleDottedID();
 
             state._fsp--;
@@ -33212,22 +33212,22 @@ public final void rule__ScopeModel__IncludedScopesAssignment_2_1() throws Recogn
 
 
     // $ANTLR start "rule__ScopeModel__ImportsAssignment_3"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11692:1: rule__ScopeModel__ImportsAssignment_3 : ( ruleImport ) ;
+    // InternalScope.g:11692:1: rule__ScopeModel__ImportsAssignment_3 : ( ruleImport ) ;
     public final void rule__ScopeModel__ImportsAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11696:1: ( ( ruleImport ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11697:1: ( ruleImport )
+            // InternalScope.g:11696:1: ( ( ruleImport ) )
+            // InternalScope.g:11697:1: ( ruleImport )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11697:1: ( ruleImport )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11698:1: ruleImport
+            // InternalScope.g:11697:1: ( ruleImport )
+            // InternalScope.g:11698:1: ruleImport
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeModelAccess().getImportsImportParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleImport_in_rule__ScopeModel__ImportsAssignment_323535);
+            pushFollow(FOLLOW_2);
             ruleImport();
 
             state._fsp--;
@@ -33257,22 +33257,22 @@ public final void rule__ScopeModel__ImportsAssignment_3() throws RecognitionExce
 
 
     // $ANTLR start "rule__ScopeModel__ExtensionsAssignment_4"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11707:1: rule__ScopeModel__ExtensionsAssignment_4 : ( ruleExtension ) ;
+    // InternalScope.g:11707:1: rule__ScopeModel__ExtensionsAssignment_4 : ( ruleExtension ) ;
     public final void rule__ScopeModel__ExtensionsAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11711:1: ( ( ruleExtension ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11712:1: ( ruleExtension )
+            // InternalScope.g:11711:1: ( ( ruleExtension ) )
+            // InternalScope.g:11712:1: ( ruleExtension )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11712:1: ( ruleExtension )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11713:1: ruleExtension
+            // InternalScope.g:11712:1: ( ruleExtension )
+            // InternalScope.g:11713:1: ruleExtension
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeModelAccess().getExtensionsExtensionParserRuleCall_4_0()); 
             }
-            pushFollow(FOLLOW_ruleExtension_in_rule__ScopeModel__ExtensionsAssignment_423566);
+            pushFollow(FOLLOW_2);
             ruleExtension();
 
             state._fsp--;
@@ -33302,22 +33302,22 @@ public final void rule__ScopeModel__ExtensionsAssignment_4() throws RecognitionE
 
 
     // $ANTLR start "rule__ScopeModel__InjectionsAssignment_5"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11722:1: rule__ScopeModel__InjectionsAssignment_5 : ( ruleInjection ) ;
+    // InternalScope.g:11722:1: rule__ScopeModel__InjectionsAssignment_5 : ( ruleInjection ) ;
     public final void rule__ScopeModel__InjectionsAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11726:1: ( ( ruleInjection ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11727:1: ( ruleInjection )
+            // InternalScope.g:11726:1: ( ( ruleInjection ) )
+            // InternalScope.g:11727:1: ( ruleInjection )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11727:1: ( ruleInjection )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11728:1: ruleInjection
+            // InternalScope.g:11727:1: ( ruleInjection )
+            // InternalScope.g:11728:1: ruleInjection
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeModelAccess().getInjectionsInjectionParserRuleCall_5_0()); 
             }
-            pushFollow(FOLLOW_ruleInjection_in_rule__ScopeModel__InjectionsAssignment_523597);
+            pushFollow(FOLLOW_2);
             ruleInjection();
 
             state._fsp--;
@@ -33347,22 +33347,22 @@ public final void rule__ScopeModel__InjectionsAssignment_5() throws RecognitionE
 
 
     // $ANTLR start "rule__ScopeModel__NamingAssignment_6"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11737:1: rule__ScopeModel__NamingAssignment_6 : ( ruleNamingSection ) ;
+    // InternalScope.g:11737:1: rule__ScopeModel__NamingAssignment_6 : ( ruleNamingSection ) ;
     public final void rule__ScopeModel__NamingAssignment_6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11741:1: ( ( ruleNamingSection ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11742:1: ( ruleNamingSection )
+            // InternalScope.g:11741:1: ( ( ruleNamingSection ) )
+            // InternalScope.g:11742:1: ( ruleNamingSection )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11742:1: ( ruleNamingSection )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11743:1: ruleNamingSection
+            // InternalScope.g:11742:1: ( ruleNamingSection )
+            // InternalScope.g:11743:1: ruleNamingSection
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeModelAccess().getNamingNamingSectionParserRuleCall_6_0()); 
             }
-            pushFollow(FOLLOW_ruleNamingSection_in_rule__ScopeModel__NamingAssignment_623628);
+            pushFollow(FOLLOW_2);
             ruleNamingSection();
 
             state._fsp--;
@@ -33392,22 +33392,22 @@ public final void rule__ScopeModel__NamingAssignment_6() throws RecognitionExcep
 
 
     // $ANTLR start "rule__ScopeModel__ScopesAssignment_7"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11752:1: rule__ScopeModel__ScopesAssignment_7 : ( ruleScopeDefinition ) ;
+    // InternalScope.g:11752:1: rule__ScopeModel__ScopesAssignment_7 : ( ruleScopeDefinition ) ;
     public final void rule__ScopeModel__ScopesAssignment_7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11756:1: ( ( ruleScopeDefinition ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11757:1: ( ruleScopeDefinition )
+            // InternalScope.g:11756:1: ( ( ruleScopeDefinition ) )
+            // InternalScope.g:11757:1: ( ruleScopeDefinition )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11757:1: ( ruleScopeDefinition )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11758:1: ruleScopeDefinition
+            // InternalScope.g:11757:1: ( ruleScopeDefinition )
+            // InternalScope.g:11758:1: ruleScopeDefinition
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeModelAccess().getScopesScopeDefinitionParserRuleCall_7_0()); 
             }
-            pushFollow(FOLLOW_ruleScopeDefinition_in_rule__ScopeModel__ScopesAssignment_723659);
+            pushFollow(FOLLOW_2);
             ruleScopeDefinition();
 
             state._fsp--;
@@ -33437,28 +33437,28 @@ public final void rule__ScopeModel__ScopesAssignment_7() throws RecognitionExcep
 
 
     // $ANTLR start "rule__Import__PackageAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11767:1: rule__Import__PackageAssignment_1 : ( ( RULE_STRING ) ) ;
+    // InternalScope.g:11767:1: rule__Import__PackageAssignment_1 : ( ( RULE_STRING ) ) ;
     public final void rule__Import__PackageAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11771:1: ( ( ( RULE_STRING ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11772:1: ( ( RULE_STRING ) )
+            // InternalScope.g:11771:1: ( ( ( RULE_STRING ) ) )
+            // InternalScope.g:11772:1: ( ( RULE_STRING ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11772:1: ( ( RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11773:1: ( RULE_STRING )
+            // InternalScope.g:11772:1: ( ( RULE_STRING ) )
+            // InternalScope.g:11773:1: ( RULE_STRING )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImportAccess().getPackageEPackageCrossReference_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11774:1: ( RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11775:1: RULE_STRING
+            // InternalScope.g:11774:1: ( RULE_STRING )
+            // InternalScope.g:11775:1: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImportAccess().getPackageEPackageSTRINGTerminalRuleCall_1_0_1()); 
             }
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__Import__PackageAssignment_123694); if (state.failed) return ;
+            match(input,RULE_STRING,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getImportAccess().getPackageEPackageSTRINGTerminalRuleCall_1_0_1()); 
             }
@@ -33490,22 +33490,22 @@ public final void rule__Import__PackageAssignment_1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__Import__NameAssignment_2_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11786:1: rule__Import__NameAssignment_2_1 : ( ruleIdentifier ) ;
+    // InternalScope.g:11786:1: rule__Import__NameAssignment_2_1 : ( ruleIdentifier ) ;
     public final void rule__Import__NameAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11790:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11791:1: ( ruleIdentifier )
+            // InternalScope.g:11790:1: ( ( ruleIdentifier ) )
+            // InternalScope.g:11791:1: ( ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11791:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11792:1: ruleIdentifier
+            // InternalScope.g:11791:1: ( ruleIdentifier )
+            // InternalScope.g:11792:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImportAccess().getNameIdentifierParserRuleCall_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__Import__NameAssignment_2_123729);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -33535,22 +33535,22 @@ public final void rule__Import__NameAssignment_2_1() throws RecognitionException
 
 
     // $ANTLR start "rule__Extension__ExtensionAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11801:1: rule__Extension__ExtensionAssignment_1 : ( ruleQualifiedID ) ;
+    // InternalScope.g:11801:1: rule__Extension__ExtensionAssignment_1 : ( ruleQualifiedID ) ;
     public final void rule__Extension__ExtensionAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11805:1: ( ( ruleQualifiedID ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11806:1: ( ruleQualifiedID )
+            // InternalScope.g:11805:1: ( ( ruleQualifiedID ) )
+            // InternalScope.g:11806:1: ( ruleQualifiedID )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11806:1: ( ruleQualifiedID )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11807:1: ruleQualifiedID
+            // InternalScope.g:11806:1: ( ruleQualifiedID )
+            // InternalScope.g:11807:1: ruleQualifiedID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getExtensionAccess().getExtensionQualifiedIDParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedID_in_rule__Extension__ExtensionAssignment_123760);
+            pushFollow(FOLLOW_2);
             ruleQualifiedID();
 
             state._fsp--;
@@ -33580,22 +33580,22 @@ public final void rule__Extension__ExtensionAssignment_1() throws RecognitionExc
 
 
     // $ANTLR start "rule__Injection__TypeAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11816:1: rule__Injection__TypeAssignment_1 : ( ruleDottedID ) ;
+    // InternalScope.g:11816:1: rule__Injection__TypeAssignment_1 : ( ruleDottedID ) ;
     public final void rule__Injection__TypeAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11820:1: ( ( ruleDottedID ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11821:1: ( ruleDottedID )
+            // InternalScope.g:11820:1: ( ( ruleDottedID ) )
+            // InternalScope.g:11821:1: ( ruleDottedID )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11821:1: ( ruleDottedID )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11822:1: ruleDottedID
+            // InternalScope.g:11821:1: ( ruleDottedID )
+            // InternalScope.g:11822:1: ruleDottedID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInjectionAccess().getTypeDottedIDParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleDottedID_in_rule__Injection__TypeAssignment_123791);
+            pushFollow(FOLLOW_2);
             ruleDottedID();
 
             state._fsp--;
@@ -33625,22 +33625,22 @@ public final void rule__Injection__TypeAssignment_1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__Injection__NameAssignment_3"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11831:1: rule__Injection__NameAssignment_3 : ( ruleIdentifier ) ;
+    // InternalScope.g:11831:1: rule__Injection__NameAssignment_3 : ( ruleIdentifier ) ;
     public final void rule__Injection__NameAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11835:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11836:1: ( ruleIdentifier )
+            // InternalScope.g:11835:1: ( ( ruleIdentifier ) )
+            // InternalScope.g:11836:1: ( ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11836:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11837:1: ruleIdentifier
+            // InternalScope.g:11836:1: ( ruleIdentifier )
+            // InternalScope.g:11837:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInjectionAccess().getNameIdentifierParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__Injection__NameAssignment_323822);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -33670,22 +33670,22 @@ public final void rule__Injection__NameAssignment_3() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__NamingSection__CasingAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11846:1: rule__NamingSection__CasingAssignment_1_1 : ( ruleCasing ) ;
+    // InternalScope.g:11846:1: rule__NamingSection__CasingAssignment_1_1 : ( ruleCasing ) ;
     public final void rule__NamingSection__CasingAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11850:1: ( ( ruleCasing ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11851:1: ( ruleCasing )
+            // InternalScope.g:11850:1: ( ( ruleCasing ) )
+            // InternalScope.g:11851:1: ( ruleCasing )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11851:1: ( ruleCasing )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11852:1: ruleCasing
+            // InternalScope.g:11851:1: ( ruleCasing )
+            // InternalScope.g:11852:1: ruleCasing
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamingSectionAccess().getCasingCasingEnumRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleCasing_in_rule__NamingSection__CasingAssignment_1_123853);
+            pushFollow(FOLLOW_2);
             ruleCasing();
 
             state._fsp--;
@@ -33715,22 +33715,22 @@ public final void rule__NamingSection__CasingAssignment_1_1() throws Recognition
 
 
     // $ANTLR start "rule__NamingSection__NamingsAssignment_4"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11861:1: rule__NamingSection__NamingsAssignment_4 : ( ruleNamingDefinition ) ;
+    // InternalScope.g:11861:1: rule__NamingSection__NamingsAssignment_4 : ( ruleNamingDefinition ) ;
     public final void rule__NamingSection__NamingsAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11865:1: ( ( ruleNamingDefinition ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11866:1: ( ruleNamingDefinition )
+            // InternalScope.g:11865:1: ( ( ruleNamingDefinition ) )
+            // InternalScope.g:11866:1: ( ruleNamingDefinition )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11866:1: ( ruleNamingDefinition )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11867:1: ruleNamingDefinition
+            // InternalScope.g:11866:1: ( ruleNamingDefinition )
+            // InternalScope.g:11867:1: ruleNamingDefinition
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamingSectionAccess().getNamingsNamingDefinitionParserRuleCall_4_0()); 
             }
-            pushFollow(FOLLOW_ruleNamingDefinition_in_rule__NamingSection__NamingsAssignment_423884);
+            pushFollow(FOLLOW_2);
             ruleNamingDefinition();
 
             state._fsp--;
@@ -33760,28 +33760,28 @@ public final void rule__NamingSection__NamingsAssignment_4() throws RecognitionE
 
 
     // $ANTLR start "rule__NamingDefinition__TypeAssignment_0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11876:1: rule__NamingDefinition__TypeAssignment_0 : ( ( ruleQualifiedID ) ) ;
+    // InternalScope.g:11876:1: rule__NamingDefinition__TypeAssignment_0 : ( ( ruleQualifiedID ) ) ;
     public final void rule__NamingDefinition__TypeAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11880:1: ( ( ( ruleQualifiedID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11881:1: ( ( ruleQualifiedID ) )
+            // InternalScope.g:11880:1: ( ( ( ruleQualifiedID ) ) )
+            // InternalScope.g:11881:1: ( ( ruleQualifiedID ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11881:1: ( ( ruleQualifiedID ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11882:1: ( ruleQualifiedID )
+            // InternalScope.g:11881:1: ( ( ruleQualifiedID ) )
+            // InternalScope.g:11882:1: ( ruleQualifiedID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamingDefinitionAccess().getTypeEClassCrossReference_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11883:1: ( ruleQualifiedID )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11884:1: ruleQualifiedID
+            // InternalScope.g:11883:1: ( ruleQualifiedID )
+            // InternalScope.g:11884:1: ruleQualifiedID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamingDefinitionAccess().getTypeEClassQualifiedIDParserRuleCall_0_0_1()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedID_in_rule__NamingDefinition__TypeAssignment_023919);
+            pushFollow(FOLLOW_2);
             ruleQualifiedID();
 
             state._fsp--;
@@ -33817,22 +33817,22 @@ public final void rule__NamingDefinition__TypeAssignment_0() throws RecognitionE
 
 
     // $ANTLR start "rule__NamingDefinition__NamingAssignment_2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11895:1: rule__NamingDefinition__NamingAssignment_2 : ( ruleNaming ) ;
+    // InternalScope.g:11895:1: rule__NamingDefinition__NamingAssignment_2 : ( ruleNaming ) ;
     public final void rule__NamingDefinition__NamingAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11899:1: ( ( ruleNaming ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11900:1: ( ruleNaming )
+            // InternalScope.g:11899:1: ( ( ruleNaming ) )
+            // InternalScope.g:11900:1: ( ruleNaming )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11900:1: ( ruleNaming )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11901:1: ruleNaming
+            // InternalScope.g:11900:1: ( ruleNaming )
+            // InternalScope.g:11901:1: ruleNaming
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamingDefinitionAccess().getNamingNamingParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleNaming_in_rule__NamingDefinition__NamingAssignment_223954);
+            pushFollow(FOLLOW_2);
             ruleNaming();
 
             state._fsp--;
@@ -33862,22 +33862,22 @@ public final void rule__NamingDefinition__NamingAssignment_2() throws Recognitio
 
 
     // $ANTLR start "rule__ScopeDefinition__NameAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11910:1: rule__ScopeDefinition__NameAssignment_1_1 : ( ruleIdentifier ) ;
+    // InternalScope.g:11910:1: rule__ScopeDefinition__NameAssignment_1_1 : ( ruleIdentifier ) ;
     public final void rule__ScopeDefinition__NameAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11914:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11915:1: ( ruleIdentifier )
+            // InternalScope.g:11914:1: ( ( ruleIdentifier ) )
+            // InternalScope.g:11915:1: ( ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11915:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11916:1: ruleIdentifier
+            // InternalScope.g:11915:1: ( ruleIdentifier )
+            // InternalScope.g:11916:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeDefinitionAccess().getNameIdentifierParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__ScopeDefinition__NameAssignment_1_123985);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -33907,28 +33907,28 @@ public final void rule__ScopeDefinition__NameAssignment_1_1() throws Recognition
 
 
     // $ANTLR start "rule__ScopeDefinition__TargetTypeAssignment_2_0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11925:1: rule__ScopeDefinition__TargetTypeAssignment_2_0 : ( ( ruleQualifiedID ) ) ;
+    // InternalScope.g:11925:1: rule__ScopeDefinition__TargetTypeAssignment_2_0 : ( ( ruleQualifiedID ) ) ;
     public final void rule__ScopeDefinition__TargetTypeAssignment_2_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11929:1: ( ( ( ruleQualifiedID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11930:1: ( ( ruleQualifiedID ) )
+            // InternalScope.g:11929:1: ( ( ( ruleQualifiedID ) ) )
+            // InternalScope.g:11930:1: ( ( ruleQualifiedID ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11930:1: ( ( ruleQualifiedID ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11931:1: ( ruleQualifiedID )
+            // InternalScope.g:11930:1: ( ( ruleQualifiedID ) )
+            // InternalScope.g:11931:1: ( ruleQualifiedID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeDefinitionAccess().getTargetTypeEClassCrossReference_2_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11932:1: ( ruleQualifiedID )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11933:1: ruleQualifiedID
+            // InternalScope.g:11932:1: ( ruleQualifiedID )
+            // InternalScope.g:11933:1: ruleQualifiedID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeDefinitionAccess().getTargetTypeEClassQualifiedIDParserRuleCall_2_0_0_1()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedID_in_rule__ScopeDefinition__TargetTypeAssignment_2_024020);
+            pushFollow(FOLLOW_2);
             ruleQualifiedID();
 
             state._fsp--;
@@ -33964,28 +33964,28 @@ public final void rule__ScopeDefinition__TargetTypeAssignment_2_0() throws Recog
 
 
     // $ANTLR start "rule__ScopeDefinition__ContextTypeAssignment_2_1_0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11944:1: rule__ScopeDefinition__ContextTypeAssignment_2_1_0 : ( ( ruleQualifiedID ) ) ;
+    // InternalScope.g:11944:1: rule__ScopeDefinition__ContextTypeAssignment_2_1_0 : ( ( ruleQualifiedID ) ) ;
     public final void rule__ScopeDefinition__ContextTypeAssignment_2_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11948:1: ( ( ( ruleQualifiedID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11949:1: ( ( ruleQualifiedID ) )
+            // InternalScope.g:11948:1: ( ( ( ruleQualifiedID ) ) )
+            // InternalScope.g:11949:1: ( ( ruleQualifiedID ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11949:1: ( ( ruleQualifiedID ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11950:1: ( ruleQualifiedID )
+            // InternalScope.g:11949:1: ( ( ruleQualifiedID ) )
+            // InternalScope.g:11950:1: ( ruleQualifiedID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeDefinitionAccess().getContextTypeEClassCrossReference_2_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11951:1: ( ruleQualifiedID )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11952:1: ruleQualifiedID
+            // InternalScope.g:11951:1: ( ruleQualifiedID )
+            // InternalScope.g:11952:1: ruleQualifiedID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeDefinitionAccess().getContextTypeEClassQualifiedIDParserRuleCall_2_1_0_0_1()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedID_in_rule__ScopeDefinition__ContextTypeAssignment_2_1_024059);
+            pushFollow(FOLLOW_2);
             ruleQualifiedID();
 
             state._fsp--;
@@ -34021,28 +34021,28 @@ public final void rule__ScopeDefinition__ContextTypeAssignment_2_1_0() throws Re
 
 
     // $ANTLR start "rule__ScopeDefinition__ReferenceAssignment_2_1_2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11963:1: rule__ScopeDefinition__ReferenceAssignment_2_1_2 : ( ( ruleIdentifier ) ) ;
+    // InternalScope.g:11963:1: rule__ScopeDefinition__ReferenceAssignment_2_1_2 : ( ( ruleIdentifier ) ) ;
     public final void rule__ScopeDefinition__ReferenceAssignment_2_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11967:1: ( ( ( ruleIdentifier ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11968:1: ( ( ruleIdentifier ) )
+            // InternalScope.g:11967:1: ( ( ( ruleIdentifier ) ) )
+            // InternalScope.g:11968:1: ( ( ruleIdentifier ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11968:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11969:1: ( ruleIdentifier )
+            // InternalScope.g:11968:1: ( ( ruleIdentifier ) )
+            // InternalScope.g:11969:1: ( ruleIdentifier )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeDefinitionAccess().getReferenceEReferenceCrossReference_2_1_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11970:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11971:1: ruleIdentifier
+            // InternalScope.g:11970:1: ( ruleIdentifier )
+            // InternalScope.g:11971:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeDefinitionAccess().getReferenceEReferenceIdentifierParserRuleCall_2_1_2_0_1()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__ScopeDefinition__ReferenceAssignment_2_1_224098);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -34078,22 +34078,22 @@ public final void rule__ScopeDefinition__ReferenceAssignment_2_1_2() throws Reco
 
 
     // $ANTLR start "rule__ScopeDefinition__RulesAssignment_4"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11982:1: rule__ScopeDefinition__RulesAssignment_4 : ( ruleScopeRule ) ;
+    // InternalScope.g:11982:1: rule__ScopeDefinition__RulesAssignment_4 : ( ruleScopeRule ) ;
     public final void rule__ScopeDefinition__RulesAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11986:1: ( ( ruleScopeRule ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11987:1: ( ruleScopeRule )
+            // InternalScope.g:11986:1: ( ( ruleScopeRule ) )
+            // InternalScope.g:11987:1: ( ruleScopeRule )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11987:1: ( ruleScopeRule )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11988:1: ruleScopeRule
+            // InternalScope.g:11987:1: ( ruleScopeRule )
+            // InternalScope.g:11988:1: ruleScopeRule
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeDefinitionAccess().getRulesScopeRuleParserRuleCall_4_0()); 
             }
-            pushFollow(FOLLOW_ruleScopeRule_in_rule__ScopeDefinition__RulesAssignment_424133);
+            pushFollow(FOLLOW_2);
             ruleScopeRule();
 
             state._fsp--;
@@ -34123,22 +34123,22 @@ public final void rule__ScopeDefinition__RulesAssignment_4() throws RecognitionE
 
 
     // $ANTLR start "rule__ScopeRule__ContextAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:11997:1: rule__ScopeRule__ContextAssignment_1 : ( ruleScopeContext ) ;
+    // InternalScope.g:11997:1: rule__ScopeRule__ContextAssignment_1 : ( ruleScopeContext ) ;
     public final void rule__ScopeRule__ContextAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12001:1: ( ( ruleScopeContext ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12002:1: ( ruleScopeContext )
+            // InternalScope.g:12001:1: ( ( ruleScopeContext ) )
+            // InternalScope.g:12002:1: ( ruleScopeContext )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12002:1: ( ruleScopeContext )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12003:1: ruleScopeContext
+            // InternalScope.g:12002:1: ( ruleScopeContext )
+            // InternalScope.g:12003:1: ruleScopeContext
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeRuleAccess().getContextScopeContextParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleScopeContext_in_rule__ScopeRule__ContextAssignment_124164);
+            pushFollow(FOLLOW_2);
             ruleScopeContext();
 
             state._fsp--;
@@ -34168,22 +34168,22 @@ public final void rule__ScopeRule__ContextAssignment_1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__ScopeRule__ExprsAssignment_3"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12012:1: rule__ScopeRule__ExprsAssignment_3 : ( ruleScopeExpression ) ;
+    // InternalScope.g:12012:1: rule__ScopeRule__ExprsAssignment_3 : ( ruleScopeExpression ) ;
     public final void rule__ScopeRule__ExprsAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12016:1: ( ( ruleScopeExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12017:1: ( ruleScopeExpression )
+            // InternalScope.g:12016:1: ( ( ruleScopeExpression ) )
+            // InternalScope.g:12017:1: ( ruleScopeExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12017:1: ( ruleScopeExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12018:1: ruleScopeExpression
+            // InternalScope.g:12017:1: ( ruleScopeExpression )
+            // InternalScope.g:12018:1: ruleScopeExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeRuleAccess().getExprsScopeExpressionParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleScopeExpression_in_rule__ScopeRule__ExprsAssignment_324195);
+            pushFollow(FOLLOW_2);
             ruleScopeExpression();
 
             state._fsp--;
@@ -34213,22 +34213,22 @@ public final void rule__ScopeRule__ExprsAssignment_3() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__ScopeRule__ExprsAssignment_4_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12027:1: rule__ScopeRule__ExprsAssignment_4_1 : ( ruleScopeExpression ) ;
+    // InternalScope.g:12027:1: rule__ScopeRule__ExprsAssignment_4_1 : ( ruleScopeExpression ) ;
     public final void rule__ScopeRule__ExprsAssignment_4_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12031:1: ( ( ruleScopeExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12032:1: ( ruleScopeExpression )
+            // InternalScope.g:12031:1: ( ( ruleScopeExpression ) )
+            // InternalScope.g:12032:1: ( ruleScopeExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12032:1: ( ruleScopeExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12033:1: ruleScopeExpression
+            // InternalScope.g:12032:1: ( ruleScopeExpression )
+            // InternalScope.g:12033:1: ruleScopeExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeRuleAccess().getExprsScopeExpressionParserRuleCall_4_1_0()); 
             }
-            pushFollow(FOLLOW_ruleScopeExpression_in_rule__ScopeRule__ExprsAssignment_4_124226);
+            pushFollow(FOLLOW_2);
             ruleScopeExpression();
 
             state._fsp--;
@@ -34258,28 +34258,28 @@ public final void rule__ScopeRule__ExprsAssignment_4_1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__ScopeContext__GlobalAssignment_0_0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12042:1: rule__ScopeContext__GlobalAssignment_0_0 : ( ( '*' ) ) ;
+    // InternalScope.g:12042:1: rule__ScopeContext__GlobalAssignment_0_0 : ( ( '*' ) ) ;
     public final void rule__ScopeContext__GlobalAssignment_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12046:1: ( ( ( '*' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12047:1: ( ( '*' ) )
+            // InternalScope.g:12046:1: ( ( ( '*' ) ) )
+            // InternalScope.g:12047:1: ( ( '*' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12047:1: ( ( '*' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12048:1: ( '*' )
+            // InternalScope.g:12047:1: ( ( '*' ) )
+            // InternalScope.g:12048:1: ( '*' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeContextAccess().getGlobalAsteriskKeyword_0_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12049:1: ( '*' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12050:1: '*'
+            // InternalScope.g:12049:1: ( '*' )
+            // InternalScope.g:12050:1: '*'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeContextAccess().getGlobalAsteriskKeyword_0_0_0()); 
             }
-            match(input,20,FOLLOW_20_in_rule__ScopeContext__GlobalAssignment_0_024262); if (state.failed) return ;
+            match(input,20,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getScopeContextAccess().getGlobalAsteriskKeyword_0_0_0()); 
             }
@@ -34311,28 +34311,28 @@ public final void rule__ScopeContext__GlobalAssignment_0_0() throws RecognitionE
 
 
     // $ANTLR start "rule__ScopeContext__ContextTypeAssignment_0_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12065:1: rule__ScopeContext__ContextTypeAssignment_0_1 : ( ( ruleQualifiedID ) ) ;
+    // InternalScope.g:12065:1: rule__ScopeContext__ContextTypeAssignment_0_1 : ( ( ruleQualifiedID ) ) ;
     public final void rule__ScopeContext__ContextTypeAssignment_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12069:1: ( ( ( ruleQualifiedID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12070:1: ( ( ruleQualifiedID ) )
+            // InternalScope.g:12069:1: ( ( ( ruleQualifiedID ) ) )
+            // InternalScope.g:12070:1: ( ( ruleQualifiedID ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12070:1: ( ( ruleQualifiedID ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12071:1: ( ruleQualifiedID )
+            // InternalScope.g:12070:1: ( ( ruleQualifiedID ) )
+            // InternalScope.g:12071:1: ( ruleQualifiedID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeContextAccess().getContextTypeEClassCrossReference_0_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12072:1: ( ruleQualifiedID )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12073:1: ruleQualifiedID
+            // InternalScope.g:12072:1: ( ruleQualifiedID )
+            // InternalScope.g:12073:1: ruleQualifiedID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeContextAccess().getContextTypeEClassQualifiedIDParserRuleCall_0_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedID_in_rule__ScopeContext__ContextTypeAssignment_0_124305);
+            pushFollow(FOLLOW_2);
             ruleQualifiedID();
 
             state._fsp--;
@@ -34368,22 +34368,22 @@ public final void rule__ScopeContext__ContextTypeAssignment_0_1() throws Recogni
 
 
     // $ANTLR start "rule__ScopeContext__GuardAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12084:1: rule__ScopeContext__GuardAssignment_1_1 : ( ruleExpression ) ;
+    // InternalScope.g:12084:1: rule__ScopeContext__GuardAssignment_1_1 : ( ruleExpression ) ;
     public final void rule__ScopeContext__GuardAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12088:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12089:1: ( ruleExpression )
+            // InternalScope.g:12088:1: ( ( ruleExpression ) )
+            // InternalScope.g:12089:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12089:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12090:1: ruleExpression
+            // InternalScope.g:12089:1: ( ruleExpression )
+            // InternalScope.g:12090:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeContextAccess().getGuardExpressionParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__ScopeContext__GuardAssignment_1_124340);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -34413,22 +34413,22 @@ public final void rule__ScopeContext__GuardAssignment_1_1() throws RecognitionEx
 
 
     // $ANTLR start "rule__ScopeExpression__PruneAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12099:1: rule__ScopeExpression__PruneAssignment_1_1 : ( ruleExpression ) ;
+    // InternalScope.g:12099:1: rule__ScopeExpression__PruneAssignment_1_1 : ( ruleExpression ) ;
     public final void rule__ScopeExpression__PruneAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12103:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12104:1: ( ruleExpression )
+            // InternalScope.g:12103:1: ( ( ruleExpression ) )
+            // InternalScope.g:12104:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12104:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12105:1: ruleExpression
+            // InternalScope.g:12104:1: ( ruleExpression )
+            // InternalScope.g:12105:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeExpressionAccess().getPruneExpressionParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__ScopeExpression__PruneAssignment_1_124371);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -34458,22 +34458,22 @@ public final void rule__ScopeExpression__PruneAssignment_1_1() throws Recognitio
 
 
     // $ANTLR start "rule__FactoryExpression__ExprAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12114:1: rule__FactoryExpression__ExprAssignment_1 : ( ruleExpression ) ;
+    // InternalScope.g:12114:1: rule__FactoryExpression__ExprAssignment_1 : ( ruleExpression ) ;
     public final void rule__FactoryExpression__ExprAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12118:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12119:1: ( ruleExpression )
+            // InternalScope.g:12118:1: ( ( ruleExpression ) )
+            // InternalScope.g:12119:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12119:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12120:1: ruleExpression
+            // InternalScope.g:12119:1: ( ruleExpression )
+            // InternalScope.g:12120:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFactoryExpressionAccess().getExprExpressionParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__FactoryExpression__ExprAssignment_124402);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -34503,22 +34503,22 @@ public final void rule__FactoryExpression__ExprAssignment_1() throws Recognition
 
 
     // $ANTLR start "rule__ScopeDelegation__DelegateAssignment_2_0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12129:1: rule__ScopeDelegation__DelegateAssignment_2_0 : ( ruleExpression ) ;
+    // InternalScope.g:12129:1: rule__ScopeDelegation__DelegateAssignment_2_0 : ( ruleExpression ) ;
     public final void rule__ScopeDelegation__DelegateAssignment_2_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12133:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12134:1: ( ruleExpression )
+            // InternalScope.g:12133:1: ( ( ruleExpression ) )
+            // InternalScope.g:12134:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12134:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12135:1: ruleExpression
+            // InternalScope.g:12134:1: ( ruleExpression )
+            // InternalScope.g:12135:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeDelegationAccess().getDelegateExpressionParserRuleCall_2_0_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__ScopeDelegation__DelegateAssignment_2_024433);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -34548,22 +34548,22 @@ public final void rule__ScopeDelegation__DelegateAssignment_2_0() throws Recogni
 
 
     // $ANTLR start "rule__ScopeDelegation__ExternalAssignment_2_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12144:1: rule__ScopeDelegation__ExternalAssignment_2_1 : ( ruleGlobalScopeExpression ) ;
+    // InternalScope.g:12144:1: rule__ScopeDelegation__ExternalAssignment_2_1 : ( ruleGlobalScopeExpression ) ;
     public final void rule__ScopeDelegation__ExternalAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12148:1: ( ( ruleGlobalScopeExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12149:1: ( ruleGlobalScopeExpression )
+            // InternalScope.g:12148:1: ( ( ruleGlobalScopeExpression ) )
+            // InternalScope.g:12149:1: ( ruleGlobalScopeExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12149:1: ( ruleGlobalScopeExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12150:1: ruleGlobalScopeExpression
+            // InternalScope.g:12149:1: ( ruleGlobalScopeExpression )
+            // InternalScope.g:12150:1: ruleGlobalScopeExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeDelegationAccess().getExternalGlobalScopeExpressionParserRuleCall_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleGlobalScopeExpression_in_rule__ScopeDelegation__ExternalAssignment_2_124464);
+            pushFollow(FOLLOW_2);
             ruleGlobalScopeExpression();
 
             state._fsp--;
@@ -34593,28 +34593,28 @@ public final void rule__ScopeDelegation__ExternalAssignment_2_1() throws Recogni
 
 
     // $ANTLR start "rule__ScopeDelegation__ScopeAssignment_3_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12159:1: rule__ScopeDelegation__ScopeAssignment_3_1 : ( ( ruleIdentifier ) ) ;
+    // InternalScope.g:12159:1: rule__ScopeDelegation__ScopeAssignment_3_1 : ( ( ruleIdentifier ) ) ;
     public final void rule__ScopeDelegation__ScopeAssignment_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12163:1: ( ( ( ruleIdentifier ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12164:1: ( ( ruleIdentifier ) )
+            // InternalScope.g:12163:1: ( ( ( ruleIdentifier ) ) )
+            // InternalScope.g:12164:1: ( ( ruleIdentifier ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12164:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12165:1: ( ruleIdentifier )
+            // InternalScope.g:12164:1: ( ( ruleIdentifier ) )
+            // InternalScope.g:12165:1: ( ruleIdentifier )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeDelegationAccess().getScopeScopeDefinitionCrossReference_3_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12166:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12167:1: ruleIdentifier
+            // InternalScope.g:12166:1: ( ruleIdentifier )
+            // InternalScope.g:12167:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getScopeDelegationAccess().getScopeScopeDefinitionIdentifierParserRuleCall_3_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__ScopeDelegation__ScopeAssignment_3_124499);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -34650,28 +34650,28 @@ public final void rule__ScopeDelegation__ScopeAssignment_3_1() throws Recognitio
 
 
     // $ANTLR start "rule__NamedScopeExpression__CaseDefAssignment_1_0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12178:1: rule__NamedScopeExpression__CaseDefAssignment_1_0 : ( ( 'case' ) ) ;
+    // InternalScope.g:12178:1: rule__NamedScopeExpression__CaseDefAssignment_1_0 : ( ( 'case' ) ) ;
     public final void rule__NamedScopeExpression__CaseDefAssignment_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12182:1: ( ( ( 'case' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12183:1: ( ( 'case' ) )
+            // InternalScope.g:12182:1: ( ( ( 'case' ) ) )
+            // InternalScope.g:12183:1: ( ( 'case' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12183:1: ( ( 'case' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12184:1: ( 'case' )
+            // InternalScope.g:12183:1: ( ( 'case' ) )
+            // InternalScope.g:12184:1: ( 'case' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamedScopeExpressionAccess().getCaseDefCaseKeyword_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12185:1: ( 'case' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12186:1: 'case'
+            // InternalScope.g:12185:1: ( 'case' )
+            // InternalScope.g:12186:1: 'case'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamedScopeExpressionAccess().getCaseDefCaseKeyword_1_0_0()); 
             }
-            match(input,47,FOLLOW_47_in_rule__NamedScopeExpression__CaseDefAssignment_1_024539); if (state.failed) return ;
+            match(input,47,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getNamedScopeExpressionAccess().getCaseDefCaseKeyword_1_0_0()); 
             }
@@ -34703,22 +34703,22 @@ public final void rule__NamedScopeExpression__CaseDefAssignment_1_0() throws Rec
 
 
     // $ANTLR start "rule__NamedScopeExpression__CasingAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12201:1: rule__NamedScopeExpression__CasingAssignment_1_1 : ( ruleCasing ) ;
+    // InternalScope.g:12201:1: rule__NamedScopeExpression__CasingAssignment_1_1 : ( ruleCasing ) ;
     public final void rule__NamedScopeExpression__CasingAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12205:1: ( ( ruleCasing ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12206:1: ( ruleCasing )
+            // InternalScope.g:12205:1: ( ( ruleCasing ) )
+            // InternalScope.g:12206:1: ( ruleCasing )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12206:1: ( ruleCasing )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12207:1: ruleCasing
+            // InternalScope.g:12206:1: ( ruleCasing )
+            // InternalScope.g:12207:1: ruleCasing
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamedScopeExpressionAccess().getCasingCasingEnumRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleCasing_in_rule__NamedScopeExpression__CasingAssignment_1_124578);
+            pushFollow(FOLLOW_2);
             ruleCasing();
 
             state._fsp--;
@@ -34748,22 +34748,22 @@ public final void rule__NamedScopeExpression__CasingAssignment_1_1() throws Reco
 
 
     // $ANTLR start "rule__NamedScopeExpression__NamingAssignment_2_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12216:1: rule__NamedScopeExpression__NamingAssignment_2_1 : ( ruleNaming ) ;
+    // InternalScope.g:12216:1: rule__NamedScopeExpression__NamingAssignment_2_1 : ( ruleNaming ) ;
     public final void rule__NamedScopeExpression__NamingAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12220:1: ( ( ruleNaming ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12221:1: ( ruleNaming )
+            // InternalScope.g:12220:1: ( ( ruleNaming ) )
+            // InternalScope.g:12221:1: ( ruleNaming )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12221:1: ( ruleNaming )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12222:1: ruleNaming
+            // InternalScope.g:12221:1: ( ruleNaming )
+            // InternalScope.g:12222:1: ruleNaming
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamedScopeExpressionAccess().getNamingNamingParserRuleCall_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleNaming_in_rule__NamedScopeExpression__NamingAssignment_2_124609);
+            pushFollow(FOLLOW_2);
             ruleNaming();
 
             state._fsp--;
@@ -34793,28 +34793,28 @@ public final void rule__NamedScopeExpression__NamingAssignment_2_1() throws Reco
 
 
     // $ANTLR start "rule__GlobalScopeExpression__TypeAssignment_2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12231:1: rule__GlobalScopeExpression__TypeAssignment_2 : ( ( ruleQualifiedID ) ) ;
+    // InternalScope.g:12231:1: rule__GlobalScopeExpression__TypeAssignment_2 : ( ( ruleQualifiedID ) ) ;
     public final void rule__GlobalScopeExpression__TypeAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12235:1: ( ( ( ruleQualifiedID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12236:1: ( ( ruleQualifiedID ) )
+            // InternalScope.g:12235:1: ( ( ( ruleQualifiedID ) ) )
+            // InternalScope.g:12236:1: ( ( ruleQualifiedID ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12236:1: ( ( ruleQualifiedID ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12237:1: ( ruleQualifiedID )
+            // InternalScope.g:12236:1: ( ( ruleQualifiedID ) )
+            // InternalScope.g:12237:1: ( ruleQualifiedID )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getTypeEClassCrossReference_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12238:1: ( ruleQualifiedID )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12239:1: ruleQualifiedID
+            // InternalScope.g:12238:1: ( ruleQualifiedID )
+            // InternalScope.g:12239:1: ruleQualifiedID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getTypeEClassQualifiedIDParserRuleCall_2_0_1()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedID_in_rule__GlobalScopeExpression__TypeAssignment_224644);
+            pushFollow(FOLLOW_2);
             ruleQualifiedID();
 
             state._fsp--;
@@ -34850,22 +34850,22 @@ public final void rule__GlobalScopeExpression__TypeAssignment_2() throws Recogni
 
 
     // $ANTLR start "rule__GlobalScopeExpression__NameAssignment_3_0_3"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12250:1: rule__GlobalScopeExpression__NameAssignment_3_0_3 : ( ruleExpression ) ;
+    // InternalScope.g:12250:1: rule__GlobalScopeExpression__NameAssignment_3_0_3 : ( ruleExpression ) ;
     public final void rule__GlobalScopeExpression__NameAssignment_3_0_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12254:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12255:1: ( ruleExpression )
+            // InternalScope.g:12254:1: ( ( ruleExpression ) )
+            // InternalScope.g:12255:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12255:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12256:1: ruleExpression
+            // InternalScope.g:12255:1: ( ruleExpression )
+            // InternalScope.g:12256:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getNameExpressionParserRuleCall_3_0_3_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__GlobalScopeExpression__NameAssignment_3_0_324679);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -34895,28 +34895,28 @@ public final void rule__GlobalScopeExpression__NameAssignment_3_0_3() throws Rec
 
 
     // $ANTLR start "rule__GlobalScopeExpression__RecursivePrefixAssignment_3_1_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12265:1: rule__GlobalScopeExpression__RecursivePrefixAssignment_3_1_1 : ( ( 'recursive' ) ) ;
+    // InternalScope.g:12265:1: rule__GlobalScopeExpression__RecursivePrefixAssignment_3_1_1 : ( ( 'recursive' ) ) ;
     public final void rule__GlobalScopeExpression__RecursivePrefixAssignment_3_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12269:1: ( ( ( 'recursive' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12270:1: ( ( 'recursive' ) )
+            // InternalScope.g:12269:1: ( ( ( 'recursive' ) ) )
+            // InternalScope.g:12270:1: ( ( 'recursive' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12270:1: ( ( 'recursive' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12271:1: ( 'recursive' )
+            // InternalScope.g:12270:1: ( ( 'recursive' ) )
+            // InternalScope.g:12271:1: ( 'recursive' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getRecursivePrefixRecursiveKeyword_3_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12272:1: ( 'recursive' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12273:1: 'recursive'
+            // InternalScope.g:12272:1: ( 'recursive' )
+            // InternalScope.g:12273:1: 'recursive'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getRecursivePrefixRecursiveKeyword_3_1_1_0()); 
             }
-            match(input,80,FOLLOW_80_in_rule__GlobalScopeExpression__RecursivePrefixAssignment_3_1_124715); if (state.failed) return ;
+            match(input,80,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGlobalScopeExpressionAccess().getRecursivePrefixRecursiveKeyword_3_1_1_0()); 
             }
@@ -34948,22 +34948,22 @@ public final void rule__GlobalScopeExpression__RecursivePrefixAssignment_3_1_1()
 
 
     // $ANTLR start "rule__GlobalScopeExpression__PrefixAssignment_3_1_4"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12288:1: rule__GlobalScopeExpression__PrefixAssignment_3_1_4 : ( ruleExpression ) ;
+    // InternalScope.g:12288:1: rule__GlobalScopeExpression__PrefixAssignment_3_1_4 : ( ruleExpression ) ;
     public final void rule__GlobalScopeExpression__PrefixAssignment_3_1_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12292:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12293:1: ( ruleExpression )
+            // InternalScope.g:12292:1: ( ( ruleExpression ) )
+            // InternalScope.g:12293:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12293:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12294:1: ruleExpression
+            // InternalScope.g:12293:1: ( ruleExpression )
+            // InternalScope.g:12294:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getPrefixExpressionParserRuleCall_3_1_4_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__GlobalScopeExpression__PrefixAssignment_3_1_424754);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -34993,22 +34993,22 @@ public final void rule__GlobalScopeExpression__PrefixAssignment_3_1_4() throws R
 
 
     // $ANTLR start "rule__GlobalScopeExpression__DataAssignment_4_4"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12303:1: rule__GlobalScopeExpression__DataAssignment_4_4 : ( ruleDataExpression ) ;
+    // InternalScope.g:12303:1: rule__GlobalScopeExpression__DataAssignment_4_4 : ( ruleDataExpression ) ;
     public final void rule__GlobalScopeExpression__DataAssignment_4_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12307:1: ( ( ruleDataExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12308:1: ( ruleDataExpression )
+            // InternalScope.g:12307:1: ( ( ruleDataExpression ) )
+            // InternalScope.g:12308:1: ( ruleDataExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12308:1: ( ruleDataExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12309:1: ruleDataExpression
+            // InternalScope.g:12308:1: ( ruleDataExpression )
+            // InternalScope.g:12309:1: ruleDataExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getDataDataExpressionParserRuleCall_4_4_0()); 
             }
-            pushFollow(FOLLOW_ruleDataExpression_in_rule__GlobalScopeExpression__DataAssignment_4_424785);
+            pushFollow(FOLLOW_2);
             ruleDataExpression();
 
             state._fsp--;
@@ -35038,22 +35038,22 @@ public final void rule__GlobalScopeExpression__DataAssignment_4_4() throws Recog
 
 
     // $ANTLR start "rule__GlobalScopeExpression__DataAssignment_4_5_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12318:1: rule__GlobalScopeExpression__DataAssignment_4_5_1 : ( ruleDataExpression ) ;
+    // InternalScope.g:12318:1: rule__GlobalScopeExpression__DataAssignment_4_5_1 : ( ruleDataExpression ) ;
     public final void rule__GlobalScopeExpression__DataAssignment_4_5_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12322:1: ( ( ruleDataExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12323:1: ( ruleDataExpression )
+            // InternalScope.g:12322:1: ( ( ruleDataExpression ) )
+            // InternalScope.g:12323:1: ( ruleDataExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12323:1: ( ruleDataExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12324:1: ruleDataExpression
+            // InternalScope.g:12323:1: ( ruleDataExpression )
+            // InternalScope.g:12324:1: ruleDataExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getDataDataExpressionParserRuleCall_4_5_1_0()); 
             }
-            pushFollow(FOLLOW_ruleDataExpression_in_rule__GlobalScopeExpression__DataAssignment_4_5_124816);
+            pushFollow(FOLLOW_2);
             ruleDataExpression();
 
             state._fsp--;
@@ -35083,28 +35083,28 @@ public final void rule__GlobalScopeExpression__DataAssignment_4_5_1() throws Rec
 
 
     // $ANTLR start "rule__GlobalScopeExpression__DomainsAssignment_5_3_0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12333:1: rule__GlobalScopeExpression__DomainsAssignment_5_3_0 : ( ( '*' ) ) ;
+    // InternalScope.g:12333:1: rule__GlobalScopeExpression__DomainsAssignment_5_3_0 : ( ( '*' ) ) ;
     public final void rule__GlobalScopeExpression__DomainsAssignment_5_3_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12337:1: ( ( ( '*' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12338:1: ( ( '*' ) )
+            // InternalScope.g:12337:1: ( ( ( '*' ) ) )
+            // InternalScope.g:12338:1: ( ( '*' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12338:1: ( ( '*' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12339:1: ( '*' )
+            // InternalScope.g:12338:1: ( ( '*' ) )
+            // InternalScope.g:12339:1: ( '*' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getDomainsAsteriskKeyword_5_3_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12340:1: ( '*' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12341:1: '*'
+            // InternalScope.g:12340:1: ( '*' )
+            // InternalScope.g:12341:1: '*'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getDomainsAsteriskKeyword_5_3_0_0()); 
             }
-            match(input,20,FOLLOW_20_in_rule__GlobalScopeExpression__DomainsAssignment_5_3_024852); if (state.failed) return ;
+            match(input,20,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getGlobalScopeExpressionAccess().getDomainsAsteriskKeyword_5_3_0_0()); 
             }
@@ -35136,22 +35136,22 @@ public final void rule__GlobalScopeExpression__DomainsAssignment_5_3_0() throws
 
 
     // $ANTLR start "rule__GlobalScopeExpression__DomainsAssignment_5_3_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12356:1: rule__GlobalScopeExpression__DomainsAssignment_5_3_1 : ( ruleIdentifier ) ;
+    // InternalScope.g:12356:1: rule__GlobalScopeExpression__DomainsAssignment_5_3_1 : ( ruleIdentifier ) ;
     public final void rule__GlobalScopeExpression__DomainsAssignment_5_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12360:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12361:1: ( ruleIdentifier )
+            // InternalScope.g:12360:1: ( ( ruleIdentifier ) )
+            // InternalScope.g:12361:1: ( ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12361:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12362:1: ruleIdentifier
+            // InternalScope.g:12361:1: ( ruleIdentifier )
+            // InternalScope.g:12362:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getDomainsIdentifierParserRuleCall_5_3_1_0()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__GlobalScopeExpression__DomainsAssignment_5_3_124891);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -35181,22 +35181,22 @@ public final void rule__GlobalScopeExpression__DomainsAssignment_5_3_1() throws
 
 
     // $ANTLR start "rule__GlobalScopeExpression__DomainsAssignment_5_3_2_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12371:1: rule__GlobalScopeExpression__DomainsAssignment_5_3_2_1 : ( ruleIdentifier ) ;
+    // InternalScope.g:12371:1: rule__GlobalScopeExpression__DomainsAssignment_5_3_2_1 : ( ruleIdentifier ) ;
     public final void rule__GlobalScopeExpression__DomainsAssignment_5_3_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12375:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12376:1: ( ruleIdentifier )
+            // InternalScope.g:12375:1: ( ( ruleIdentifier ) )
+            // InternalScope.g:12376:1: ( ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12376:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12377:1: ruleIdentifier
+            // InternalScope.g:12376:1: ( ruleIdentifier )
+            // InternalScope.g:12377:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getDomainsIdentifierParserRuleCall_5_3_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__GlobalScopeExpression__DomainsAssignment_5_3_2_124922);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -35226,22 +35226,22 @@ public final void rule__GlobalScopeExpression__DomainsAssignment_5_3_2_1() throw
 
 
     // $ANTLR start "rule__GlobalScopeExpression__DomainsAssignment_5_3_2_2_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12386:1: rule__GlobalScopeExpression__DomainsAssignment_5_3_2_2_1 : ( ruleIdentifier ) ;
+    // InternalScope.g:12386:1: rule__GlobalScopeExpression__DomainsAssignment_5_3_2_2_1 : ( ruleIdentifier ) ;
     public final void rule__GlobalScopeExpression__DomainsAssignment_5_3_2_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12390:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12391:1: ( ruleIdentifier )
+            // InternalScope.g:12390:1: ( ( ruleIdentifier ) )
+            // InternalScope.g:12391:1: ( ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12391:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12392:1: ruleIdentifier
+            // InternalScope.g:12391:1: ( ruleIdentifier )
+            // InternalScope.g:12392:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalScopeExpressionAccess().getDomainsIdentifierParserRuleCall_5_3_2_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__GlobalScopeExpression__DomainsAssignment_5_3_2_2_124953);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -35271,22 +35271,22 @@ public final void rule__GlobalScopeExpression__DomainsAssignment_5_3_2_2_1() thr
 
 
     // $ANTLR start "rule__MatchDataExpression__KeyAssignment_0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12401:1: rule__MatchDataExpression__KeyAssignment_0 : ( ruleIdentifier ) ;
+    // InternalScope.g:12401:1: rule__MatchDataExpression__KeyAssignment_0 : ( ruleIdentifier ) ;
     public final void rule__MatchDataExpression__KeyAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12405:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12406:1: ( ruleIdentifier )
+            // InternalScope.g:12405:1: ( ( ruleIdentifier ) )
+            // InternalScope.g:12406:1: ( ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12406:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12407:1: ruleIdentifier
+            // InternalScope.g:12406:1: ( ruleIdentifier )
+            // InternalScope.g:12407:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMatchDataExpressionAccess().getKeyIdentifierParserRuleCall_0_0()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__MatchDataExpression__KeyAssignment_024984);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -35316,22 +35316,22 @@ public final void rule__MatchDataExpression__KeyAssignment_0() throws Recognitio
 
 
     // $ANTLR start "rule__MatchDataExpression__ValueAssignment_2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12416:1: rule__MatchDataExpression__ValueAssignment_2 : ( ruleExpression ) ;
+    // InternalScope.g:12416:1: rule__MatchDataExpression__ValueAssignment_2 : ( ruleExpression ) ;
     public final void rule__MatchDataExpression__ValueAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12420:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12421:1: ( ruleExpression )
+            // InternalScope.g:12420:1: ( ( ruleExpression ) )
+            // InternalScope.g:12421:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12421:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12422:1: ruleExpression
+            // InternalScope.g:12421:1: ( ruleExpression )
+            // InternalScope.g:12422:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMatchDataExpressionAccess().getValueExpressionParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__MatchDataExpression__ValueAssignment_225015);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -35361,22 +35361,22 @@ public final void rule__MatchDataExpression__ValueAssignment_2() throws Recognit
 
 
     // $ANTLR start "rule__LambdaDataExpression__DescAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12431:1: rule__LambdaDataExpression__DescAssignment_1 : ( ruleIdentifier ) ;
+    // InternalScope.g:12431:1: rule__LambdaDataExpression__DescAssignment_1 : ( ruleIdentifier ) ;
     public final void rule__LambdaDataExpression__DescAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12435:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12436:1: ( ruleIdentifier )
+            // InternalScope.g:12435:1: ( ( ruleIdentifier ) )
+            // InternalScope.g:12436:1: ( ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12436:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12437:1: ruleIdentifier
+            // InternalScope.g:12436:1: ( ruleIdentifier )
+            // InternalScope.g:12437:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLambdaDataExpressionAccess().getDescIdentifierParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__LambdaDataExpression__DescAssignment_125046);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -35406,22 +35406,22 @@ public final void rule__LambdaDataExpression__DescAssignment_1() throws Recognit
 
 
     // $ANTLR start "rule__LambdaDataExpression__ValueAssignment_3"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12446:1: rule__LambdaDataExpression__ValueAssignment_3 : ( ruleExpression ) ;
+    // InternalScope.g:12446:1: rule__LambdaDataExpression__ValueAssignment_3 : ( ruleExpression ) ;
     public final void rule__LambdaDataExpression__ValueAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12450:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12451:1: ( ruleExpression )
+            // InternalScope.g:12450:1: ( ( ruleExpression ) )
+            // InternalScope.g:12451:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12451:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12452:1: ruleExpression
+            // InternalScope.g:12451:1: ( ruleExpression )
+            // InternalScope.g:12452:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLambdaDataExpressionAccess().getValueExpressionParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__LambdaDataExpression__ValueAssignment_325077);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -35451,22 +35451,22 @@ public final void rule__LambdaDataExpression__ValueAssignment_3() throws Recogni
 
 
     // $ANTLR start "rule__SimpleScopeExpression__ExprAssignment"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12461:1: rule__SimpleScopeExpression__ExprAssignment : ( ruleExpression ) ;
+    // InternalScope.g:12461:1: rule__SimpleScopeExpression__ExprAssignment : ( ruleExpression ) ;
     public final void rule__SimpleScopeExpression__ExprAssignment() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12465:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12466:1: ( ruleExpression )
+            // InternalScope.g:12465:1: ( ( ruleExpression ) )
+            // InternalScope.g:12466:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12466:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12467:1: ruleExpression
+            // InternalScope.g:12466:1: ( ruleExpression )
+            // InternalScope.g:12467:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSimpleScopeExpressionAccess().getExprExpressionParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__SimpleScopeExpression__ExprAssignment25108);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -35496,22 +35496,22 @@ public final void rule__SimpleScopeExpression__ExprAssignment() throws Recogniti
 
 
     // $ANTLR start "rule__Naming__NamesAssignment_0_0_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12476:1: rule__Naming__NamesAssignment_0_0_1 : ( ruleNamingExpression ) ;
+    // InternalScope.g:12476:1: rule__Naming__NamesAssignment_0_0_1 : ( ruleNamingExpression ) ;
     public final void rule__Naming__NamesAssignment_0_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12480:1: ( ( ruleNamingExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12481:1: ( ruleNamingExpression )
+            // InternalScope.g:12480:1: ( ( ruleNamingExpression ) )
+            // InternalScope.g:12481:1: ( ruleNamingExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12481:1: ( ruleNamingExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12482:1: ruleNamingExpression
+            // InternalScope.g:12481:1: ( ruleNamingExpression )
+            // InternalScope.g:12482:1: ruleNamingExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamingAccess().getNamesNamingExpressionParserRuleCall_0_0_1_0()); 
             }
-            pushFollow(FOLLOW_ruleNamingExpression_in_rule__Naming__NamesAssignment_0_0_125139);
+            pushFollow(FOLLOW_2);
             ruleNamingExpression();
 
             state._fsp--;
@@ -35541,22 +35541,22 @@ public final void rule__Naming__NamesAssignment_0_0_1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__Naming__NamesAssignment_0_0_2_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12491:1: rule__Naming__NamesAssignment_0_0_2_1 : ( ruleNamingExpression ) ;
+    // InternalScope.g:12491:1: rule__Naming__NamesAssignment_0_0_2_1 : ( ruleNamingExpression ) ;
     public final void rule__Naming__NamesAssignment_0_0_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12495:1: ( ( ruleNamingExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12496:1: ( ruleNamingExpression )
+            // InternalScope.g:12495:1: ( ( ruleNamingExpression ) )
+            // InternalScope.g:12496:1: ( ruleNamingExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12496:1: ( ruleNamingExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12497:1: ruleNamingExpression
+            // InternalScope.g:12496:1: ( ruleNamingExpression )
+            // InternalScope.g:12497:1: ruleNamingExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamingAccess().getNamesNamingExpressionParserRuleCall_0_0_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleNamingExpression_in_rule__Naming__NamesAssignment_0_0_2_125170);
+            pushFollow(FOLLOW_2);
             ruleNamingExpression();
 
             state._fsp--;
@@ -35586,22 +35586,22 @@ public final void rule__Naming__NamesAssignment_0_0_2_1() throws RecognitionExce
 
 
     // $ANTLR start "rule__Naming__NamesAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12506:1: rule__Naming__NamesAssignment_1 : ( ruleNamingExpression ) ;
+    // InternalScope.g:12506:1: rule__Naming__NamesAssignment_1 : ( ruleNamingExpression ) ;
     public final void rule__Naming__NamesAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12510:1: ( ( ruleNamingExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12511:1: ( ruleNamingExpression )
+            // InternalScope.g:12510:1: ( ( ruleNamingExpression ) )
+            // InternalScope.g:12511:1: ( ruleNamingExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12511:1: ( ruleNamingExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12512:1: ruleNamingExpression
+            // InternalScope.g:12511:1: ( ruleNamingExpression )
+            // InternalScope.g:12512:1: ruleNamingExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamingAccess().getNamesNamingExpressionParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleNamingExpression_in_rule__Naming__NamesAssignment_125201);
+            pushFollow(FOLLOW_2);
             ruleNamingExpression();
 
             state._fsp--;
@@ -35631,28 +35631,28 @@ public final void rule__Naming__NamesAssignment_1() throws RecognitionException
 
 
     // $ANTLR start "rule__NamingExpression__ExportAssignment_0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12521:1: rule__NamingExpression__ExportAssignment_0 : ( ( 'export' ) ) ;
+    // InternalScope.g:12521:1: rule__NamingExpression__ExportAssignment_0 : ( ( 'export' ) ) ;
     public final void rule__NamingExpression__ExportAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12525:1: ( ( ( 'export' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12526:1: ( ( 'export' ) )
+            // InternalScope.g:12525:1: ( ( ( 'export' ) ) )
+            // InternalScope.g:12526:1: ( ( 'export' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12526:1: ( ( 'export' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12527:1: ( 'export' )
+            // InternalScope.g:12526:1: ( ( 'export' ) )
+            // InternalScope.g:12527:1: ( 'export' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamingExpressionAccess().getExportExportKeyword_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12528:1: ( 'export' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12529:1: 'export'
+            // InternalScope.g:12528:1: ( 'export' )
+            // InternalScope.g:12529:1: 'export'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamingExpressionAccess().getExportExportKeyword_0_0()); 
             }
-            match(input,81,FOLLOW_81_in_rule__NamingExpression__ExportAssignment_025237); if (state.failed) return ;
+            match(input,81,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getNamingExpressionAccess().getExportExportKeyword_0_0()); 
             }
@@ -35684,28 +35684,28 @@ public final void rule__NamingExpression__ExportAssignment_0() throws Recognitio
 
 
     // $ANTLR start "rule__NamingExpression__FactoryAssignment_1_0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12544:1: rule__NamingExpression__FactoryAssignment_1_0 : ( ( 'factory' ) ) ;
+    // InternalScope.g:12544:1: rule__NamingExpression__FactoryAssignment_1_0 : ( ( 'factory' ) ) ;
     public final void rule__NamingExpression__FactoryAssignment_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12548:1: ( ( ( 'factory' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12549:1: ( ( 'factory' ) )
+            // InternalScope.g:12548:1: ( ( ( 'factory' ) ) )
+            // InternalScope.g:12549:1: ( ( 'factory' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12549:1: ( ( 'factory' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12550:1: ( 'factory' )
+            // InternalScope.g:12549:1: ( ( 'factory' ) )
+            // InternalScope.g:12550:1: ( 'factory' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamingExpressionAccess().getFactoryFactoryKeyword_1_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12551:1: ( 'factory' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12552:1: 'factory'
+            // InternalScope.g:12551:1: ( 'factory' )
+            // InternalScope.g:12552:1: 'factory'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamingExpressionAccess().getFactoryFactoryKeyword_1_0_0()); 
             }
-            match(input,59,FOLLOW_59_in_rule__NamingExpression__FactoryAssignment_1_025281); if (state.failed) return ;
+            match(input,59,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getNamingExpressionAccess().getFactoryFactoryKeyword_1_0_0()); 
             }
@@ -35737,22 +35737,22 @@ public final void rule__NamingExpression__FactoryAssignment_1_0() throws Recogni
 
 
     // $ANTLR start "rule__NamingExpression__ExpressionAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12567:1: rule__NamingExpression__ExpressionAssignment_1_1 : ( ruleExpression ) ;
+    // InternalScope.g:12567:1: rule__NamingExpression__ExpressionAssignment_1_1 : ( ruleExpression ) ;
     public final void rule__NamingExpression__ExpressionAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12571:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12572:1: ( ruleExpression )
+            // InternalScope.g:12571:1: ( ( ruleExpression ) )
+            // InternalScope.g:12572:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12572:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12573:1: ruleExpression
+            // InternalScope.g:12572:1: ( ruleExpression )
+            // InternalScope.g:12573:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNamingExpressionAccess().getExpressionExpressionParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__NamingExpression__ExpressionAssignment_1_125320);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -35782,22 +35782,22 @@ public final void rule__NamingExpression__ExpressionAssignment_1_1() throws Reco
 
 
     // $ANTLR start "rule__LetExpression__IdentifierAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12582:1: rule__LetExpression__IdentifierAssignment_1 : ( ruleIdentifier ) ;
+    // InternalScope.g:12582:1: rule__LetExpression__IdentifierAssignment_1 : ( ruleIdentifier ) ;
     public final void rule__LetExpression__IdentifierAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12586:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12587:1: ( ruleIdentifier )
+            // InternalScope.g:12586:1: ( ( ruleIdentifier ) )
+            // InternalScope.g:12587:1: ( ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12587:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12588:1: ruleIdentifier
+            // InternalScope.g:12587:1: ( ruleIdentifier )
+            // InternalScope.g:12588:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLetExpressionAccess().getIdentifierIdentifierParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__LetExpression__IdentifierAssignment_125351);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -35827,22 +35827,22 @@ public final void rule__LetExpression__IdentifierAssignment_1() throws Recogniti
 
 
     // $ANTLR start "rule__LetExpression__VarExprAssignment_3"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12597:1: rule__LetExpression__VarExprAssignment_3 : ( ruleExpression ) ;
+    // InternalScope.g:12597:1: rule__LetExpression__VarExprAssignment_3 : ( ruleExpression ) ;
     public final void rule__LetExpression__VarExprAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12601:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12602:1: ( ruleExpression )
+            // InternalScope.g:12601:1: ( ( ruleExpression ) )
+            // InternalScope.g:12602:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12602:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12603:1: ruleExpression
+            // InternalScope.g:12602:1: ( ruleExpression )
+            // InternalScope.g:12603:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLetExpressionAccess().getVarExprExpressionParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__LetExpression__VarExprAssignment_325382);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -35872,22 +35872,22 @@ public final void rule__LetExpression__VarExprAssignment_3() throws RecognitionE
 
 
     // $ANTLR start "rule__LetExpression__TargetAssignment_5"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12612:1: rule__LetExpression__TargetAssignment_5 : ( ruleExpression ) ;
+    // InternalScope.g:12612:1: rule__LetExpression__TargetAssignment_5 : ( ruleExpression ) ;
     public final void rule__LetExpression__TargetAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12616:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12617:1: ( ruleExpression )
+            // InternalScope.g:12616:1: ( ( ruleExpression ) )
+            // InternalScope.g:12617:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12617:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12618:1: ruleExpression
+            // InternalScope.g:12617:1: ( ruleExpression )
+            // InternalScope.g:12618:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getLetExpressionAccess().getTargetExpressionParserRuleCall_5_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__LetExpression__TargetAssignment_525413);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -35917,22 +35917,22 @@ public final void rule__LetExpression__TargetAssignment_5() throws RecognitionEx
 
 
     // $ANTLR start "rule__CastedExpression__TypeAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12627:1: rule__CastedExpression__TypeAssignment_1 : ( ruleType ) ;
+    // InternalScope.g:12627:1: rule__CastedExpression__TypeAssignment_1 : ( ruleType ) ;
     public final void rule__CastedExpression__TypeAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12631:1: ( ( ruleType ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12632:1: ( ruleType )
+            // InternalScope.g:12631:1: ( ( ruleType ) )
+            // InternalScope.g:12632:1: ( ruleType )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12632:1: ( ruleType )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12633:1: ruleType
+            // InternalScope.g:12632:1: ( ruleType )
+            // InternalScope.g:12633:1: ruleType
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCastedExpressionAccess().getTypeTypeParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleType_in_rule__CastedExpression__TypeAssignment_125444);
+            pushFollow(FOLLOW_2);
             ruleType();
 
             state._fsp--;
@@ -35962,22 +35962,22 @@ public final void rule__CastedExpression__TypeAssignment_1() throws RecognitionE
 
 
     // $ANTLR start "rule__CastedExpression__TargetAssignment_3"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12642:1: rule__CastedExpression__TargetAssignment_3 : ( ruleExpression ) ;
+    // InternalScope.g:12642:1: rule__CastedExpression__TargetAssignment_3 : ( ruleExpression ) ;
     public final void rule__CastedExpression__TargetAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12646:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12647:1: ( ruleExpression )
+            // InternalScope.g:12646:1: ( ( ruleExpression ) )
+            // InternalScope.g:12647:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12647:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12648:1: ruleExpression
+            // InternalScope.g:12647:1: ( ruleExpression )
+            // InternalScope.g:12648:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCastedExpressionAccess().getTargetExpressionParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__CastedExpression__TargetAssignment_325475);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -36007,22 +36007,22 @@ public final void rule__CastedExpression__TargetAssignment_3() throws Recognitio
 
 
     // $ANTLR start "rule__ChainExpression__NextAssignment_1_2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12657:1: rule__ChainExpression__NextAssignment_1_2 : ( ruleChainedExpression ) ;
+    // InternalScope.g:12657:1: rule__ChainExpression__NextAssignment_1_2 : ( ruleChainedExpression ) ;
     public final void rule__ChainExpression__NextAssignment_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12661:1: ( ( ruleChainedExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12662:1: ( ruleChainedExpression )
+            // InternalScope.g:12661:1: ( ( ruleChainedExpression ) )
+            // InternalScope.g:12662:1: ( ruleChainedExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12662:1: ( ruleChainedExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12663:1: ruleChainedExpression
+            // InternalScope.g:12662:1: ( ruleChainedExpression )
+            // InternalScope.g:12663:1: ruleChainedExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getChainExpressionAccess().getNextChainedExpressionParserRuleCall_1_2_0()); 
             }
-            pushFollow(FOLLOW_ruleChainedExpression_in_rule__ChainExpression__NextAssignment_1_225506);
+            pushFollow(FOLLOW_2);
             ruleChainedExpression();
 
             state._fsp--;
@@ -36052,22 +36052,22 @@ public final void rule__ChainExpression__NextAssignment_1_2() throws Recognition
 
 
     // $ANTLR start "rule__IfExpressionTri__ThenPartAssignment_1_2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12672:1: rule__IfExpressionTri__ThenPartAssignment_1_2 : ( ruleChainedExpression ) ;
+    // InternalScope.g:12672:1: rule__IfExpressionTri__ThenPartAssignment_1_2 : ( ruleChainedExpression ) ;
     public final void rule__IfExpressionTri__ThenPartAssignment_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12676:1: ( ( ruleChainedExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12677:1: ( ruleChainedExpression )
+            // InternalScope.g:12676:1: ( ( ruleChainedExpression ) )
+            // InternalScope.g:12677:1: ( ruleChainedExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12677:1: ( ruleChainedExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12678:1: ruleChainedExpression
+            // InternalScope.g:12677:1: ( ruleChainedExpression )
+            // InternalScope.g:12678:1: ruleChainedExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionTriAccess().getThenPartChainedExpressionParserRuleCall_1_2_0()); 
             }
-            pushFollow(FOLLOW_ruleChainedExpression_in_rule__IfExpressionTri__ThenPartAssignment_1_225537);
+            pushFollow(FOLLOW_2);
             ruleChainedExpression();
 
             state._fsp--;
@@ -36097,22 +36097,22 @@ public final void rule__IfExpressionTri__ThenPartAssignment_1_2() throws Recogni
 
 
     // $ANTLR start "rule__IfExpressionTri__ElsePartAssignment_1_4"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12687:1: rule__IfExpressionTri__ElsePartAssignment_1_4 : ( ruleChainedExpression ) ;
+    // InternalScope.g:12687:1: rule__IfExpressionTri__ElsePartAssignment_1_4 : ( ruleChainedExpression ) ;
     public final void rule__IfExpressionTri__ElsePartAssignment_1_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12691:1: ( ( ruleChainedExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12692:1: ( ruleChainedExpression )
+            // InternalScope.g:12691:1: ( ( ruleChainedExpression ) )
+            // InternalScope.g:12692:1: ( ruleChainedExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12692:1: ( ruleChainedExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12693:1: ruleChainedExpression
+            // InternalScope.g:12692:1: ( ruleChainedExpression )
+            // InternalScope.g:12693:1: ruleChainedExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionTriAccess().getElsePartChainedExpressionParserRuleCall_1_4_0()); 
             }
-            pushFollow(FOLLOW_ruleChainedExpression_in_rule__IfExpressionTri__ElsePartAssignment_1_425568);
+            pushFollow(FOLLOW_2);
             ruleChainedExpression();
 
             state._fsp--;
@@ -36142,22 +36142,22 @@ public final void rule__IfExpressionTri__ElsePartAssignment_1_4() throws Recogni
 
 
     // $ANTLR start "rule__IfExpressionKw__ConditionAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12702:1: rule__IfExpressionKw__ConditionAssignment_1 : ( ruleChainedExpression ) ;
+    // InternalScope.g:12702:1: rule__IfExpressionKw__ConditionAssignment_1 : ( ruleChainedExpression ) ;
     public final void rule__IfExpressionKw__ConditionAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12706:1: ( ( ruleChainedExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12707:1: ( ruleChainedExpression )
+            // InternalScope.g:12706:1: ( ( ruleChainedExpression ) )
+            // InternalScope.g:12707:1: ( ruleChainedExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12707:1: ( ruleChainedExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12708:1: ruleChainedExpression
+            // InternalScope.g:12707:1: ( ruleChainedExpression )
+            // InternalScope.g:12708:1: ruleChainedExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionKwAccess().getConditionChainedExpressionParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleChainedExpression_in_rule__IfExpressionKw__ConditionAssignment_125599);
+            pushFollow(FOLLOW_2);
             ruleChainedExpression();
 
             state._fsp--;
@@ -36187,22 +36187,22 @@ public final void rule__IfExpressionKw__ConditionAssignment_1() throws Recogniti
 
 
     // $ANTLR start "rule__IfExpressionKw__ThenPartAssignment_3"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12717:1: rule__IfExpressionKw__ThenPartAssignment_3 : ( ruleChainedExpression ) ;
+    // InternalScope.g:12717:1: rule__IfExpressionKw__ThenPartAssignment_3 : ( ruleChainedExpression ) ;
     public final void rule__IfExpressionKw__ThenPartAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12721:1: ( ( ruleChainedExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12722:1: ( ruleChainedExpression )
+            // InternalScope.g:12721:1: ( ( ruleChainedExpression ) )
+            // InternalScope.g:12722:1: ( ruleChainedExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12722:1: ( ruleChainedExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12723:1: ruleChainedExpression
+            // InternalScope.g:12722:1: ( ruleChainedExpression )
+            // InternalScope.g:12723:1: ruleChainedExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionKwAccess().getThenPartChainedExpressionParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleChainedExpression_in_rule__IfExpressionKw__ThenPartAssignment_325630);
+            pushFollow(FOLLOW_2);
             ruleChainedExpression();
 
             state._fsp--;
@@ -36232,22 +36232,22 @@ public final void rule__IfExpressionKw__ThenPartAssignment_3() throws Recognitio
 
 
     // $ANTLR start "rule__IfExpressionKw__ElsePartAssignment_4_0_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12732:1: rule__IfExpressionKw__ElsePartAssignment_4_0_1 : ( ruleChainedExpression ) ;
+    // InternalScope.g:12732:1: rule__IfExpressionKw__ElsePartAssignment_4_0_1 : ( ruleChainedExpression ) ;
     public final void rule__IfExpressionKw__ElsePartAssignment_4_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12736:1: ( ( ruleChainedExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12737:1: ( ruleChainedExpression )
+            // InternalScope.g:12736:1: ( ( ruleChainedExpression ) )
+            // InternalScope.g:12737:1: ( ruleChainedExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12737:1: ( ruleChainedExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12738:1: ruleChainedExpression
+            // InternalScope.g:12737:1: ( ruleChainedExpression )
+            // InternalScope.g:12738:1: ruleChainedExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIfExpressionKwAccess().getElsePartChainedExpressionParserRuleCall_4_0_1_0()); 
             }
-            pushFollow(FOLLOW_ruleChainedExpression_in_rule__IfExpressionKw__ElsePartAssignment_4_0_125661);
+            pushFollow(FOLLOW_2);
             ruleChainedExpression();
 
             state._fsp--;
@@ -36277,22 +36277,22 @@ public final void rule__IfExpressionKw__ElsePartAssignment_4_0_1() throws Recogn
 
 
     // $ANTLR start "rule__SwitchExpression__SwitchExprAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12747:1: rule__SwitchExpression__SwitchExprAssignment_1_1 : ( ruleOrExpression ) ;
+    // InternalScope.g:12747:1: rule__SwitchExpression__SwitchExprAssignment_1_1 : ( ruleOrExpression ) ;
     public final void rule__SwitchExpression__SwitchExprAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12751:1: ( ( ruleOrExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12752:1: ( ruleOrExpression )
+            // InternalScope.g:12751:1: ( ( ruleOrExpression ) )
+            // InternalScope.g:12752:1: ( ruleOrExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12752:1: ( ruleOrExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12753:1: ruleOrExpression
+            // InternalScope.g:12752:1: ( ruleOrExpression )
+            // InternalScope.g:12753:1: ruleOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getSwitchExprOrExpressionParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleOrExpression_in_rule__SwitchExpression__SwitchExprAssignment_1_125692);
+            pushFollow(FOLLOW_2);
             ruleOrExpression();
 
             state._fsp--;
@@ -36322,22 +36322,22 @@ public final void rule__SwitchExpression__SwitchExprAssignment_1_1() throws Reco
 
 
     // $ANTLR start "rule__SwitchExpression__CaseAssignment_3"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12762:1: rule__SwitchExpression__CaseAssignment_3 : ( ruleCase ) ;
+    // InternalScope.g:12762:1: rule__SwitchExpression__CaseAssignment_3 : ( ruleCase ) ;
     public final void rule__SwitchExpression__CaseAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12766:1: ( ( ruleCase ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12767:1: ( ruleCase )
+            // InternalScope.g:12766:1: ( ( ruleCase ) )
+            // InternalScope.g:12767:1: ( ruleCase )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12767:1: ( ruleCase )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12768:1: ruleCase
+            // InternalScope.g:12767:1: ( ruleCase )
+            // InternalScope.g:12768:1: ruleCase
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getCaseCaseParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleCase_in_rule__SwitchExpression__CaseAssignment_325723);
+            pushFollow(FOLLOW_2);
             ruleCase();
 
             state._fsp--;
@@ -36367,22 +36367,22 @@ public final void rule__SwitchExpression__CaseAssignment_3() throws RecognitionE
 
 
     // $ANTLR start "rule__SwitchExpression__DefaultExprAssignment_6"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12777:1: rule__SwitchExpression__DefaultExprAssignment_6 : ( ruleOrExpression ) ;
+    // InternalScope.g:12777:1: rule__SwitchExpression__DefaultExprAssignment_6 : ( ruleOrExpression ) ;
     public final void rule__SwitchExpression__DefaultExprAssignment_6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12781:1: ( ( ruleOrExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12782:1: ( ruleOrExpression )
+            // InternalScope.g:12781:1: ( ( ruleOrExpression ) )
+            // InternalScope.g:12782:1: ( ruleOrExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12782:1: ( ruleOrExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12783:1: ruleOrExpression
+            // InternalScope.g:12782:1: ( ruleOrExpression )
+            // InternalScope.g:12783:1: ruleOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSwitchExpressionAccess().getDefaultExprOrExpressionParserRuleCall_6_0()); 
             }
-            pushFollow(FOLLOW_ruleOrExpression_in_rule__SwitchExpression__DefaultExprAssignment_625754);
+            pushFollow(FOLLOW_2);
             ruleOrExpression();
 
             state._fsp--;
@@ -36412,22 +36412,22 @@ public final void rule__SwitchExpression__DefaultExprAssignment_6() throws Recog
 
 
     // $ANTLR start "rule__Case__ConditionAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12792:1: rule__Case__ConditionAssignment_1 : ( ruleOrExpression ) ;
+    // InternalScope.g:12792:1: rule__Case__ConditionAssignment_1 : ( ruleOrExpression ) ;
     public final void rule__Case__ConditionAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12796:1: ( ( ruleOrExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12797:1: ( ruleOrExpression )
+            // InternalScope.g:12796:1: ( ( ruleOrExpression ) )
+            // InternalScope.g:12797:1: ( ruleOrExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12797:1: ( ruleOrExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12798:1: ruleOrExpression
+            // InternalScope.g:12797:1: ( ruleOrExpression )
+            // InternalScope.g:12798:1: ruleOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCaseAccess().getConditionOrExpressionParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleOrExpression_in_rule__Case__ConditionAssignment_125785);
+            pushFollow(FOLLOW_2);
             ruleOrExpression();
 
             state._fsp--;
@@ -36457,22 +36457,22 @@ public final void rule__Case__ConditionAssignment_1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__Case__ThenParAssignment_3"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12807:1: rule__Case__ThenParAssignment_3 : ( ruleOrExpression ) ;
+    // InternalScope.g:12807:1: rule__Case__ThenParAssignment_3 : ( ruleOrExpression ) ;
     public final void rule__Case__ThenParAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12811:1: ( ( ruleOrExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12812:1: ( ruleOrExpression )
+            // InternalScope.g:12811:1: ( ( ruleOrExpression ) )
+            // InternalScope.g:12812:1: ( ruleOrExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12812:1: ( ruleOrExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12813:1: ruleOrExpression
+            // InternalScope.g:12812:1: ( ruleOrExpression )
+            // InternalScope.g:12813:1: ruleOrExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCaseAccess().getThenParOrExpressionParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleOrExpression_in_rule__Case__ThenParAssignment_325816);
+            pushFollow(FOLLOW_2);
             ruleOrExpression();
 
             state._fsp--;
@@ -36502,28 +36502,28 @@ public final void rule__Case__ThenParAssignment_3() throws RecognitionException
 
 
     // $ANTLR start "rule__OrExpression__OperatorAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12822:1: rule__OrExpression__OperatorAssignment_1_1 : ( ( '||' ) ) ;
+    // InternalScope.g:12822:1: rule__OrExpression__OperatorAssignment_1_1 : ( ( '||' ) ) ;
     public final void rule__OrExpression__OperatorAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12826:1: ( ( ( '||' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12827:1: ( ( '||' ) )
+            // InternalScope.g:12826:1: ( ( ( '||' ) ) )
+            // InternalScope.g:12827:1: ( ( '||' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12827:1: ( ( '||' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12828:1: ( '||' )
+            // InternalScope.g:12827:1: ( ( '||' ) )
+            // InternalScope.g:12828:1: ( '||' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOrExpressionAccess().getOperatorVerticalLineVerticalLineKeyword_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12829:1: ( '||' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12830:1: '||'
+            // InternalScope.g:12829:1: ( '||' )
+            // InternalScope.g:12830:1: '||'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOrExpressionAccess().getOperatorVerticalLineVerticalLineKeyword_1_1_0()); 
             }
-            match(input,82,FOLLOW_82_in_rule__OrExpression__OperatorAssignment_1_125852); if (state.failed) return ;
+            match(input,82,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getOrExpressionAccess().getOperatorVerticalLineVerticalLineKeyword_1_1_0()); 
             }
@@ -36555,22 +36555,22 @@ public final void rule__OrExpression__OperatorAssignment_1_1() throws Recognitio
 
 
     // $ANTLR start "rule__OrExpression__RightAssignment_1_2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12845:1: rule__OrExpression__RightAssignment_1_2 : ( ruleAndExpression ) ;
+    // InternalScope.g:12845:1: rule__OrExpression__RightAssignment_1_2 : ( ruleAndExpression ) ;
     public final void rule__OrExpression__RightAssignment_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12849:1: ( ( ruleAndExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12850:1: ( ruleAndExpression )
+            // InternalScope.g:12849:1: ( ( ruleAndExpression ) )
+            // InternalScope.g:12850:1: ( ruleAndExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12850:1: ( ruleAndExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12851:1: ruleAndExpression
+            // InternalScope.g:12850:1: ( ruleAndExpression )
+            // InternalScope.g:12851:1: ruleAndExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOrExpressionAccess().getRightAndExpressionParserRuleCall_1_2_0()); 
             }
-            pushFollow(FOLLOW_ruleAndExpression_in_rule__OrExpression__RightAssignment_1_225891);
+            pushFollow(FOLLOW_2);
             ruleAndExpression();
 
             state._fsp--;
@@ -36600,28 +36600,28 @@ public final void rule__OrExpression__RightAssignment_1_2() throws RecognitionEx
 
 
     // $ANTLR start "rule__AndExpression__OperatorAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12860:1: rule__AndExpression__OperatorAssignment_1_1 : ( ( '&&' ) ) ;
+    // InternalScope.g:12860:1: rule__AndExpression__OperatorAssignment_1_1 : ( ( '&&' ) ) ;
     public final void rule__AndExpression__OperatorAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12864:1: ( ( ( '&&' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12865:1: ( ( '&&' ) )
+            // InternalScope.g:12864:1: ( ( ( '&&' ) ) )
+            // InternalScope.g:12865:1: ( ( '&&' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12865:1: ( ( '&&' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12866:1: ( '&&' )
+            // InternalScope.g:12865:1: ( ( '&&' ) )
+            // InternalScope.g:12866:1: ( '&&' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAndExpressionAccess().getOperatorAmpersandAmpersandKeyword_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12867:1: ( '&&' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12868:1: '&&'
+            // InternalScope.g:12867:1: ( '&&' )
+            // InternalScope.g:12868:1: '&&'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAndExpressionAccess().getOperatorAmpersandAmpersandKeyword_1_1_0()); 
             }
-            match(input,83,FOLLOW_83_in_rule__AndExpression__OperatorAssignment_1_125927); if (state.failed) return ;
+            match(input,83,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getAndExpressionAccess().getOperatorAmpersandAmpersandKeyword_1_1_0()); 
             }
@@ -36653,22 +36653,22 @@ public final void rule__AndExpression__OperatorAssignment_1_1() throws Recogniti
 
 
     // $ANTLR start "rule__AndExpression__RightAssignment_1_2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12883:1: rule__AndExpression__RightAssignment_1_2 : ( ruleImpliesExpression ) ;
+    // InternalScope.g:12883:1: rule__AndExpression__RightAssignment_1_2 : ( ruleImpliesExpression ) ;
     public final void rule__AndExpression__RightAssignment_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12887:1: ( ( ruleImpliesExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12888:1: ( ruleImpliesExpression )
+            // InternalScope.g:12887:1: ( ( ruleImpliesExpression ) )
+            // InternalScope.g:12888:1: ( ruleImpliesExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12888:1: ( ruleImpliesExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12889:1: ruleImpliesExpression
+            // InternalScope.g:12888:1: ( ruleImpliesExpression )
+            // InternalScope.g:12889:1: ruleImpliesExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAndExpressionAccess().getRightImpliesExpressionParserRuleCall_1_2_0()); 
             }
-            pushFollow(FOLLOW_ruleImpliesExpression_in_rule__AndExpression__RightAssignment_1_225966);
+            pushFollow(FOLLOW_2);
             ruleImpliesExpression();
 
             state._fsp--;
@@ -36698,28 +36698,28 @@ public final void rule__AndExpression__RightAssignment_1_2() throws RecognitionE
 
 
     // $ANTLR start "rule__ImpliesExpression__OperatorAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12898:1: rule__ImpliesExpression__OperatorAssignment_1_1 : ( ( 'implies' ) ) ;
+    // InternalScope.g:12898:1: rule__ImpliesExpression__OperatorAssignment_1_1 : ( ( 'implies' ) ) ;
     public final void rule__ImpliesExpression__OperatorAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12902:1: ( ( ( 'implies' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12903:1: ( ( 'implies' ) )
+            // InternalScope.g:12902:1: ( ( ( 'implies' ) ) )
+            // InternalScope.g:12903:1: ( ( 'implies' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12903:1: ( ( 'implies' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12904:1: ( 'implies' )
+            // InternalScope.g:12903:1: ( ( 'implies' ) )
+            // InternalScope.g:12904:1: ( 'implies' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImpliesExpressionAccess().getOperatorImpliesKeyword_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12905:1: ( 'implies' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12906:1: 'implies'
+            // InternalScope.g:12905:1: ( 'implies' )
+            // InternalScope.g:12906:1: 'implies'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImpliesExpressionAccess().getOperatorImpliesKeyword_1_1_0()); 
             }
-            match(input,84,FOLLOW_84_in_rule__ImpliesExpression__OperatorAssignment_1_126002); if (state.failed) return ;
+            match(input,84,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getImpliesExpressionAccess().getOperatorImpliesKeyword_1_1_0()); 
             }
@@ -36751,22 +36751,22 @@ public final void rule__ImpliesExpression__OperatorAssignment_1_1() throws Recog
 
 
     // $ANTLR start "rule__ImpliesExpression__RightAssignment_1_2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12921:1: rule__ImpliesExpression__RightAssignment_1_2 : ( ruleRelationalExpression ) ;
+    // InternalScope.g:12921:1: rule__ImpliesExpression__RightAssignment_1_2 : ( ruleRelationalExpression ) ;
     public final void rule__ImpliesExpression__RightAssignment_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12925:1: ( ( ruleRelationalExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12926:1: ( ruleRelationalExpression )
+            // InternalScope.g:12925:1: ( ( ruleRelationalExpression ) )
+            // InternalScope.g:12926:1: ( ruleRelationalExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12926:1: ( ruleRelationalExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12927:1: ruleRelationalExpression
+            // InternalScope.g:12926:1: ( ruleRelationalExpression )
+            // InternalScope.g:12927:1: ruleRelationalExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getImpliesExpressionAccess().getRightRelationalExpressionParserRuleCall_1_2_0()); 
             }
-            pushFollow(FOLLOW_ruleRelationalExpression_in_rule__ImpliesExpression__RightAssignment_1_226041);
+            pushFollow(FOLLOW_2);
             ruleRelationalExpression();
 
             state._fsp--;
@@ -36796,25 +36796,25 @@ public final void rule__ImpliesExpression__RightAssignment_1_2() throws Recognit
 
 
     // $ANTLR start "rule__RelationalExpression__OperatorAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12936:1: rule__RelationalExpression__OperatorAssignment_1_1 : ( ( rule__RelationalExpression__OperatorAlternatives_1_1_0 ) ) ;
+    // InternalScope.g:12936:1: rule__RelationalExpression__OperatorAssignment_1_1 : ( ( rule__RelationalExpression__OperatorAlternatives_1_1_0 ) ) ;
     public final void rule__RelationalExpression__OperatorAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12940:1: ( ( ( rule__RelationalExpression__OperatorAlternatives_1_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12941:1: ( ( rule__RelationalExpression__OperatorAlternatives_1_1_0 ) )
+            // InternalScope.g:12940:1: ( ( ( rule__RelationalExpression__OperatorAlternatives_1_1_0 ) ) )
+            // InternalScope.g:12941:1: ( ( rule__RelationalExpression__OperatorAlternatives_1_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12941:1: ( ( rule__RelationalExpression__OperatorAlternatives_1_1_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12942:1: ( rule__RelationalExpression__OperatorAlternatives_1_1_0 )
+            // InternalScope.g:12941:1: ( ( rule__RelationalExpression__OperatorAlternatives_1_1_0 ) )
+            // InternalScope.g:12942:1: ( rule__RelationalExpression__OperatorAlternatives_1_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRelationalExpressionAccess().getOperatorAlternatives_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12943:1: ( rule__RelationalExpression__OperatorAlternatives_1_1_0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12943:2: rule__RelationalExpression__OperatorAlternatives_1_1_0
+            // InternalScope.g:12943:1: ( rule__RelationalExpression__OperatorAlternatives_1_1_0 )
+            // InternalScope.g:12943:2: rule__RelationalExpression__OperatorAlternatives_1_1_0
             {
-            pushFollow(FOLLOW_rule__RelationalExpression__OperatorAlternatives_1_1_0_in_rule__RelationalExpression__OperatorAssignment_1_126072);
+            pushFollow(FOLLOW_2);
             rule__RelationalExpression__OperatorAlternatives_1_1_0();
 
             state._fsp--;
@@ -36847,22 +36847,22 @@ public final void rule__RelationalExpression__OperatorAssignment_1_1() throws Re
 
 
     // $ANTLR start "rule__RelationalExpression__RightAssignment_1_2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12952:1: rule__RelationalExpression__RightAssignment_1_2 : ( ruleAdditiveExpression ) ;
+    // InternalScope.g:12952:1: rule__RelationalExpression__RightAssignment_1_2 : ( ruleAdditiveExpression ) ;
     public final void rule__RelationalExpression__RightAssignment_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12956:1: ( ( ruleAdditiveExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12957:1: ( ruleAdditiveExpression )
+            // InternalScope.g:12956:1: ( ( ruleAdditiveExpression ) )
+            // InternalScope.g:12957:1: ( ruleAdditiveExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12957:1: ( ruleAdditiveExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12958:1: ruleAdditiveExpression
+            // InternalScope.g:12957:1: ( ruleAdditiveExpression )
+            // InternalScope.g:12958:1: ruleAdditiveExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRelationalExpressionAccess().getRightAdditiveExpressionParserRuleCall_1_2_0()); 
             }
-            pushFollow(FOLLOW_ruleAdditiveExpression_in_rule__RelationalExpression__RightAssignment_1_226105);
+            pushFollow(FOLLOW_2);
             ruleAdditiveExpression();
 
             state._fsp--;
@@ -36892,25 +36892,25 @@ public final void rule__RelationalExpression__RightAssignment_1_2() throws Recog
 
 
     // $ANTLR start "rule__AdditiveExpression__NameAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12967:1: rule__AdditiveExpression__NameAssignment_1_1 : ( ( rule__AdditiveExpression__NameAlternatives_1_1_0 ) ) ;
+    // InternalScope.g:12967:1: rule__AdditiveExpression__NameAssignment_1_1 : ( ( rule__AdditiveExpression__NameAlternatives_1_1_0 ) ) ;
     public final void rule__AdditiveExpression__NameAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12971:1: ( ( ( rule__AdditiveExpression__NameAlternatives_1_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12972:1: ( ( rule__AdditiveExpression__NameAlternatives_1_1_0 ) )
+            // InternalScope.g:12971:1: ( ( ( rule__AdditiveExpression__NameAlternatives_1_1_0 ) ) )
+            // InternalScope.g:12972:1: ( ( rule__AdditiveExpression__NameAlternatives_1_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12972:1: ( ( rule__AdditiveExpression__NameAlternatives_1_1_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12973:1: ( rule__AdditiveExpression__NameAlternatives_1_1_0 )
+            // InternalScope.g:12972:1: ( ( rule__AdditiveExpression__NameAlternatives_1_1_0 ) )
+            // InternalScope.g:12973:1: ( rule__AdditiveExpression__NameAlternatives_1_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAdditiveExpressionAccess().getNameAlternatives_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12974:1: ( rule__AdditiveExpression__NameAlternatives_1_1_0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12974:2: rule__AdditiveExpression__NameAlternatives_1_1_0
+            // InternalScope.g:12974:1: ( rule__AdditiveExpression__NameAlternatives_1_1_0 )
+            // InternalScope.g:12974:2: rule__AdditiveExpression__NameAlternatives_1_1_0
             {
-            pushFollow(FOLLOW_rule__AdditiveExpression__NameAlternatives_1_1_0_in_rule__AdditiveExpression__NameAssignment_1_126136);
+            pushFollow(FOLLOW_2);
             rule__AdditiveExpression__NameAlternatives_1_1_0();
 
             state._fsp--;
@@ -36943,22 +36943,22 @@ public final void rule__AdditiveExpression__NameAssignment_1_1() throws Recognit
 
 
     // $ANTLR start "rule__AdditiveExpression__ParamsAssignment_1_2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12983:1: rule__AdditiveExpression__ParamsAssignment_1_2 : ( ruleMultiplicativeExpression ) ;
+    // InternalScope.g:12983:1: rule__AdditiveExpression__ParamsAssignment_1_2 : ( ruleMultiplicativeExpression ) ;
     public final void rule__AdditiveExpression__ParamsAssignment_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12987:1: ( ( ruleMultiplicativeExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12988:1: ( ruleMultiplicativeExpression )
+            // InternalScope.g:12987:1: ( ( ruleMultiplicativeExpression ) )
+            // InternalScope.g:12988:1: ( ruleMultiplicativeExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12988:1: ( ruleMultiplicativeExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12989:1: ruleMultiplicativeExpression
+            // InternalScope.g:12988:1: ( ruleMultiplicativeExpression )
+            // InternalScope.g:12989:1: ruleMultiplicativeExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAdditiveExpressionAccess().getParamsMultiplicativeExpressionParserRuleCall_1_2_0()); 
             }
-            pushFollow(FOLLOW_ruleMultiplicativeExpression_in_rule__AdditiveExpression__ParamsAssignment_1_226169);
+            pushFollow(FOLLOW_2);
             ruleMultiplicativeExpression();
 
             state._fsp--;
@@ -36988,25 +36988,25 @@ public final void rule__AdditiveExpression__ParamsAssignment_1_2() throws Recogn
 
 
     // $ANTLR start "rule__MultiplicativeExpression__NameAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:12998:1: rule__MultiplicativeExpression__NameAssignment_1_1 : ( ( rule__MultiplicativeExpression__NameAlternatives_1_1_0 ) ) ;
+    // InternalScope.g:12998:1: rule__MultiplicativeExpression__NameAssignment_1_1 : ( ( rule__MultiplicativeExpression__NameAlternatives_1_1_0 ) ) ;
     public final void rule__MultiplicativeExpression__NameAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13002:1: ( ( ( rule__MultiplicativeExpression__NameAlternatives_1_1_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13003:1: ( ( rule__MultiplicativeExpression__NameAlternatives_1_1_0 ) )
+            // InternalScope.g:13002:1: ( ( ( rule__MultiplicativeExpression__NameAlternatives_1_1_0 ) ) )
+            // InternalScope.g:13003:1: ( ( rule__MultiplicativeExpression__NameAlternatives_1_1_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13003:1: ( ( rule__MultiplicativeExpression__NameAlternatives_1_1_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13004:1: ( rule__MultiplicativeExpression__NameAlternatives_1_1_0 )
+            // InternalScope.g:13003:1: ( ( rule__MultiplicativeExpression__NameAlternatives_1_1_0 ) )
+            // InternalScope.g:13004:1: ( rule__MultiplicativeExpression__NameAlternatives_1_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMultiplicativeExpressionAccess().getNameAlternatives_1_1_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13005:1: ( rule__MultiplicativeExpression__NameAlternatives_1_1_0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13005:2: rule__MultiplicativeExpression__NameAlternatives_1_1_0
+            // InternalScope.g:13005:1: ( rule__MultiplicativeExpression__NameAlternatives_1_1_0 )
+            // InternalScope.g:13005:2: rule__MultiplicativeExpression__NameAlternatives_1_1_0
             {
-            pushFollow(FOLLOW_rule__MultiplicativeExpression__NameAlternatives_1_1_0_in_rule__MultiplicativeExpression__NameAssignment_1_126200);
+            pushFollow(FOLLOW_2);
             rule__MultiplicativeExpression__NameAlternatives_1_1_0();
 
             state._fsp--;
@@ -37039,22 +37039,22 @@ public final void rule__MultiplicativeExpression__NameAssignment_1_1() throws Re
 
 
     // $ANTLR start "rule__MultiplicativeExpression__ParamsAssignment_1_2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13014:1: rule__MultiplicativeExpression__ParamsAssignment_1_2 : ( ruleUnaryOrInfixExpression ) ;
+    // InternalScope.g:13014:1: rule__MultiplicativeExpression__ParamsAssignment_1_2 : ( ruleUnaryOrInfixExpression ) ;
     public final void rule__MultiplicativeExpression__ParamsAssignment_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13018:1: ( ( ruleUnaryOrInfixExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13019:1: ( ruleUnaryOrInfixExpression )
+            // InternalScope.g:13018:1: ( ( ruleUnaryOrInfixExpression ) )
+            // InternalScope.g:13019:1: ( ruleUnaryOrInfixExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13019:1: ( ruleUnaryOrInfixExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13020:1: ruleUnaryOrInfixExpression
+            // InternalScope.g:13019:1: ( ruleUnaryOrInfixExpression )
+            // InternalScope.g:13020:1: ruleUnaryOrInfixExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMultiplicativeExpressionAccess().getParamsUnaryOrInfixExpressionParserRuleCall_1_2_0()); 
             }
-            pushFollow(FOLLOW_ruleUnaryOrInfixExpression_in_rule__MultiplicativeExpression__ParamsAssignment_1_226233);
+            pushFollow(FOLLOW_2);
             ruleUnaryOrInfixExpression();
 
             state._fsp--;
@@ -37084,25 +37084,25 @@ public final void rule__MultiplicativeExpression__ParamsAssignment_1_2() throws
 
 
     // $ANTLR start "rule__UnaryExpression__NameAssignment_0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13029:1: rule__UnaryExpression__NameAssignment_0 : ( ( rule__UnaryExpression__NameAlternatives_0_0 ) ) ;
+    // InternalScope.g:13029:1: rule__UnaryExpression__NameAssignment_0 : ( ( rule__UnaryExpression__NameAlternatives_0_0 ) ) ;
     public final void rule__UnaryExpression__NameAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13033:1: ( ( ( rule__UnaryExpression__NameAlternatives_0_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13034:1: ( ( rule__UnaryExpression__NameAlternatives_0_0 ) )
+            // InternalScope.g:13033:1: ( ( ( rule__UnaryExpression__NameAlternatives_0_0 ) ) )
+            // InternalScope.g:13034:1: ( ( rule__UnaryExpression__NameAlternatives_0_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13034:1: ( ( rule__UnaryExpression__NameAlternatives_0_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13035:1: ( rule__UnaryExpression__NameAlternatives_0_0 )
+            // InternalScope.g:13034:1: ( ( rule__UnaryExpression__NameAlternatives_0_0 ) )
+            // InternalScope.g:13035:1: ( rule__UnaryExpression__NameAlternatives_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getUnaryExpressionAccess().getNameAlternatives_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13036:1: ( rule__UnaryExpression__NameAlternatives_0_0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13036:2: rule__UnaryExpression__NameAlternatives_0_0
+            // InternalScope.g:13036:1: ( rule__UnaryExpression__NameAlternatives_0_0 )
+            // InternalScope.g:13036:2: rule__UnaryExpression__NameAlternatives_0_0
             {
-            pushFollow(FOLLOW_rule__UnaryExpression__NameAlternatives_0_0_in_rule__UnaryExpression__NameAssignment_026264);
+            pushFollow(FOLLOW_2);
             rule__UnaryExpression__NameAlternatives_0_0();
 
             state._fsp--;
@@ -37135,22 +37135,22 @@ public final void rule__UnaryExpression__NameAssignment_0() throws RecognitionEx
 
 
     // $ANTLR start "rule__UnaryExpression__ParamsAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13045:1: rule__UnaryExpression__ParamsAssignment_1 : ( ruleInfixExpression ) ;
+    // InternalScope.g:13045:1: rule__UnaryExpression__ParamsAssignment_1 : ( ruleInfixExpression ) ;
     public final void rule__UnaryExpression__ParamsAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13049:1: ( ( ruleInfixExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13050:1: ( ruleInfixExpression )
+            // InternalScope.g:13049:1: ( ( ruleInfixExpression ) )
+            // InternalScope.g:13050:1: ( ruleInfixExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13050:1: ( ruleInfixExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13051:1: ruleInfixExpression
+            // InternalScope.g:13050:1: ( ruleInfixExpression )
+            // InternalScope.g:13051:1: ruleInfixExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getUnaryExpressionAccess().getParamsInfixExpressionParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleInfixExpression_in_rule__UnaryExpression__ParamsAssignment_126297);
+            pushFollow(FOLLOW_2);
             ruleInfixExpression();
 
             state._fsp--;
@@ -37180,22 +37180,22 @@ public final void rule__UnaryExpression__ParamsAssignment_1() throws Recognition
 
 
     // $ANTLR start "rule__InfixExpression__NameAssignment_1_0_2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13060:1: rule__InfixExpression__NameAssignment_1_0_2 : ( ruleIdentifier ) ;
+    // InternalScope.g:13060:1: rule__InfixExpression__NameAssignment_1_0_2 : ( ruleIdentifier ) ;
     public final void rule__InfixExpression__NameAssignment_1_0_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13064:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13065:1: ( ruleIdentifier )
+            // InternalScope.g:13064:1: ( ( ruleIdentifier ) )
+            // InternalScope.g:13065:1: ( ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13065:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13066:1: ruleIdentifier
+            // InternalScope.g:13065:1: ( ruleIdentifier )
+            // InternalScope.g:13066:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getNameIdentifierParserRuleCall_1_0_2_0()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__InfixExpression__NameAssignment_1_0_226328);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -37225,22 +37225,22 @@ public final void rule__InfixExpression__NameAssignment_1_0_2() throws Recogniti
 
 
     // $ANTLR start "rule__InfixExpression__ParamsAssignment_1_0_4_0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13075:1: rule__InfixExpression__ParamsAssignment_1_0_4_0 : ( ruleExpression ) ;
+    // InternalScope.g:13075:1: rule__InfixExpression__ParamsAssignment_1_0_4_0 : ( ruleExpression ) ;
     public final void rule__InfixExpression__ParamsAssignment_1_0_4_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13079:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13080:1: ( ruleExpression )
+            // InternalScope.g:13079:1: ( ( ruleExpression ) )
+            // InternalScope.g:13080:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13080:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13081:1: ruleExpression
+            // InternalScope.g:13080:1: ( ruleExpression )
+            // InternalScope.g:13081:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getParamsExpressionParserRuleCall_1_0_4_0_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__InfixExpression__ParamsAssignment_1_0_4_026359);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -37270,22 +37270,22 @@ public final void rule__InfixExpression__ParamsAssignment_1_0_4_0() throws Recog
 
 
     // $ANTLR start "rule__InfixExpression__ParamsAssignment_1_0_4_1_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13090:1: rule__InfixExpression__ParamsAssignment_1_0_4_1_1 : ( ruleExpression ) ;
+    // InternalScope.g:13090:1: rule__InfixExpression__ParamsAssignment_1_0_4_1_1 : ( ruleExpression ) ;
     public final void rule__InfixExpression__ParamsAssignment_1_0_4_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13094:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13095:1: ( ruleExpression )
+            // InternalScope.g:13094:1: ( ( ruleExpression ) )
+            // InternalScope.g:13095:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13095:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13096:1: ruleExpression
+            // InternalScope.g:13095:1: ( ruleExpression )
+            // InternalScope.g:13096:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getParamsExpressionParserRuleCall_1_0_4_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__InfixExpression__ParamsAssignment_1_0_4_1_126390);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -37315,22 +37315,22 @@ public final void rule__InfixExpression__ParamsAssignment_1_0_4_1_1() throws Rec
 
 
     // $ANTLR start "rule__InfixExpression__TypeAssignment_1_1_2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13105:1: rule__InfixExpression__TypeAssignment_1_1_2 : ( ruleType ) ;
+    // InternalScope.g:13105:1: rule__InfixExpression__TypeAssignment_1_1_2 : ( ruleType ) ;
     public final void rule__InfixExpression__TypeAssignment_1_1_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13109:1: ( ( ruleType ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13110:1: ( ruleType )
+            // InternalScope.g:13109:1: ( ( ruleType ) )
+            // InternalScope.g:13110:1: ( ruleType )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13110:1: ( ruleType )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13111:1: ruleType
+            // InternalScope.g:13110:1: ( ruleType )
+            // InternalScope.g:13111:1: ruleType
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getTypeTypeParserRuleCall_1_1_2_0()); 
             }
-            pushFollow(FOLLOW_ruleType_in_rule__InfixExpression__TypeAssignment_1_1_226421);
+            pushFollow(FOLLOW_2);
             ruleType();
 
             state._fsp--;
@@ -37360,28 +37360,28 @@ public final void rule__InfixExpression__TypeAssignment_1_1_2() throws Recogniti
 
 
     // $ANTLR start "rule__InfixExpression__NameAssignment_1_2_2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13120:1: rule__InfixExpression__NameAssignment_1_2_2 : ( ( 'typeSelect' ) ) ;
+    // InternalScope.g:13120:1: rule__InfixExpression__NameAssignment_1_2_2 : ( ( 'typeSelect' ) ) ;
     public final void rule__InfixExpression__NameAssignment_1_2_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13124:1: ( ( ( 'typeSelect' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13125:1: ( ( 'typeSelect' ) )
+            // InternalScope.g:13124:1: ( ( ( 'typeSelect' ) ) )
+            // InternalScope.g:13125:1: ( ( 'typeSelect' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13125:1: ( ( 'typeSelect' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13126:1: ( 'typeSelect' )
+            // InternalScope.g:13125:1: ( ( 'typeSelect' ) )
+            // InternalScope.g:13126:1: ( 'typeSelect' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getNameTypeSelectKeyword_1_2_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13127:1: ( 'typeSelect' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13128:1: 'typeSelect'
+            // InternalScope.g:13127:1: ( 'typeSelect' )
+            // InternalScope.g:13128:1: 'typeSelect'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getNameTypeSelectKeyword_1_2_2_0()); 
             }
-            match(input,85,FOLLOW_85_in_rule__InfixExpression__NameAssignment_1_2_226457); if (state.failed) return ;
+            match(input,85,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getInfixExpressionAccess().getNameTypeSelectKeyword_1_2_2_0()); 
             }
@@ -37413,22 +37413,22 @@ public final void rule__InfixExpression__NameAssignment_1_2_2() throws Recogniti
 
 
     // $ANTLR start "rule__InfixExpression__TypeAssignment_1_2_4"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13143:1: rule__InfixExpression__TypeAssignment_1_2_4 : ( ruleType ) ;
+    // InternalScope.g:13143:1: rule__InfixExpression__TypeAssignment_1_2_4 : ( ruleType ) ;
     public final void rule__InfixExpression__TypeAssignment_1_2_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13147:1: ( ( ruleType ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13148:1: ( ruleType )
+            // InternalScope.g:13147:1: ( ( ruleType ) )
+            // InternalScope.g:13148:1: ( ruleType )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13148:1: ( ruleType )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13149:1: ruleType
+            // InternalScope.g:13148:1: ( ruleType )
+            // InternalScope.g:13149:1: ruleType
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getTypeTypeParserRuleCall_1_2_4_0()); 
             }
-            pushFollow(FOLLOW_ruleType_in_rule__InfixExpression__TypeAssignment_1_2_426496);
+            pushFollow(FOLLOW_2);
             ruleType();
 
             state._fsp--;
@@ -37458,25 +37458,25 @@ public final void rule__InfixExpression__TypeAssignment_1_2_4() throws Recogniti
 
 
     // $ANTLR start "rule__InfixExpression__NameAssignment_1_3_2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13158:1: rule__InfixExpression__NameAssignment_1_3_2 : ( ( rule__InfixExpression__NameAlternatives_1_3_2_0 ) ) ;
+    // InternalScope.g:13158:1: rule__InfixExpression__NameAssignment_1_3_2 : ( ( rule__InfixExpression__NameAlternatives_1_3_2_0 ) ) ;
     public final void rule__InfixExpression__NameAssignment_1_3_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13162:1: ( ( ( rule__InfixExpression__NameAlternatives_1_3_2_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13163:1: ( ( rule__InfixExpression__NameAlternatives_1_3_2_0 ) )
+            // InternalScope.g:13162:1: ( ( ( rule__InfixExpression__NameAlternatives_1_3_2_0 ) ) )
+            // InternalScope.g:13163:1: ( ( rule__InfixExpression__NameAlternatives_1_3_2_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13163:1: ( ( rule__InfixExpression__NameAlternatives_1_3_2_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13164:1: ( rule__InfixExpression__NameAlternatives_1_3_2_0 )
+            // InternalScope.g:13163:1: ( ( rule__InfixExpression__NameAlternatives_1_3_2_0 ) )
+            // InternalScope.g:13164:1: ( rule__InfixExpression__NameAlternatives_1_3_2_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getNameAlternatives_1_3_2_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13165:1: ( rule__InfixExpression__NameAlternatives_1_3_2_0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13165:2: rule__InfixExpression__NameAlternatives_1_3_2_0
+            // InternalScope.g:13165:1: ( rule__InfixExpression__NameAlternatives_1_3_2_0 )
+            // InternalScope.g:13165:2: rule__InfixExpression__NameAlternatives_1_3_2_0
             {
-            pushFollow(FOLLOW_rule__InfixExpression__NameAlternatives_1_3_2_0_in_rule__InfixExpression__NameAssignment_1_3_226527);
+            pushFollow(FOLLOW_2);
             rule__InfixExpression__NameAlternatives_1_3_2_0();
 
             state._fsp--;
@@ -37509,22 +37509,22 @@ public final void rule__InfixExpression__NameAssignment_1_3_2() throws Recogniti
 
 
     // $ANTLR start "rule__InfixExpression__VarAssignment_1_3_4_0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13174:1: rule__InfixExpression__VarAssignment_1_3_4_0 : ( ruleIdentifier ) ;
+    // InternalScope.g:13174:1: rule__InfixExpression__VarAssignment_1_3_4_0 : ( ruleIdentifier ) ;
     public final void rule__InfixExpression__VarAssignment_1_3_4_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13178:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13179:1: ( ruleIdentifier )
+            // InternalScope.g:13178:1: ( ( ruleIdentifier ) )
+            // InternalScope.g:13179:1: ( ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13179:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13180:1: ruleIdentifier
+            // InternalScope.g:13179:1: ( ruleIdentifier )
+            // InternalScope.g:13180:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getVarIdentifierParserRuleCall_1_3_4_0_0()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__InfixExpression__VarAssignment_1_3_4_026560);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -37554,22 +37554,22 @@ public final void rule__InfixExpression__VarAssignment_1_3_4_0() throws Recognit
 
 
     // $ANTLR start "rule__InfixExpression__ExpAssignment_1_3_5"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13189:1: rule__InfixExpression__ExpAssignment_1_3_5 : ( ruleExpression ) ;
+    // InternalScope.g:13189:1: rule__InfixExpression__ExpAssignment_1_3_5 : ( ruleExpression ) ;
     public final void rule__InfixExpression__ExpAssignment_1_3_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13193:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13194:1: ( ruleExpression )
+            // InternalScope.g:13193:1: ( ( ruleExpression ) )
+            // InternalScope.g:13194:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13194:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13195:1: ruleExpression
+            // InternalScope.g:13194:1: ( ruleExpression )
+            // InternalScope.g:13195:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getInfixExpressionAccess().getExpExpressionParserRuleCall_1_3_5_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__InfixExpression__ExpAssignment_1_3_526591);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -37599,25 +37599,25 @@ public final void rule__InfixExpression__ExpAssignment_1_3_5() throws Recognitio
 
 
     // $ANTLR start "rule__BooleanLiteral__ValAssignment"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13204:1: rule__BooleanLiteral__ValAssignment : ( ( rule__BooleanLiteral__ValAlternatives_0 ) ) ;
+    // InternalScope.g:13204:1: rule__BooleanLiteral__ValAssignment : ( ( rule__BooleanLiteral__ValAlternatives_0 ) ) ;
     public final void rule__BooleanLiteral__ValAssignment() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13208:1: ( ( ( rule__BooleanLiteral__ValAlternatives_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13209:1: ( ( rule__BooleanLiteral__ValAlternatives_0 ) )
+            // InternalScope.g:13208:1: ( ( ( rule__BooleanLiteral__ValAlternatives_0 ) ) )
+            // InternalScope.g:13209:1: ( ( rule__BooleanLiteral__ValAlternatives_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13209:1: ( ( rule__BooleanLiteral__ValAlternatives_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13210:1: ( rule__BooleanLiteral__ValAlternatives_0 )
+            // InternalScope.g:13209:1: ( ( rule__BooleanLiteral__ValAlternatives_0 ) )
+            // InternalScope.g:13210:1: ( rule__BooleanLiteral__ValAlternatives_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getBooleanLiteralAccess().getValAlternatives_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13211:1: ( rule__BooleanLiteral__ValAlternatives_0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13211:2: rule__BooleanLiteral__ValAlternatives_0
+            // InternalScope.g:13211:1: ( rule__BooleanLiteral__ValAlternatives_0 )
+            // InternalScope.g:13211:2: rule__BooleanLiteral__ValAlternatives_0
             {
-            pushFollow(FOLLOW_rule__BooleanLiteral__ValAlternatives_0_in_rule__BooleanLiteral__ValAssignment26622);
+            pushFollow(FOLLOW_2);
             rule__BooleanLiteral__ValAlternatives_0();
 
             state._fsp--;
@@ -37650,22 +37650,22 @@ public final void rule__BooleanLiteral__ValAssignment() throws RecognitionExcept
 
 
     // $ANTLR start "rule__IntegerLiteral__ValAssignment"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13220:1: rule__IntegerLiteral__ValAssignment : ( RULE_INT ) ;
+    // InternalScope.g:13220:1: rule__IntegerLiteral__ValAssignment : ( RULE_INT ) ;
     public final void rule__IntegerLiteral__ValAssignment() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13224:1: ( ( RULE_INT ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13225:1: ( RULE_INT )
+            // InternalScope.g:13224:1: ( ( RULE_INT ) )
+            // InternalScope.g:13225:1: ( RULE_INT )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13225:1: ( RULE_INT )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13226:1: RULE_INT
+            // InternalScope.g:13225:1: ( RULE_INT )
+            // InternalScope.g:13226:1: RULE_INT
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getIntegerLiteralAccess().getValINTTerminalRuleCall_0()); 
             }
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__IntegerLiteral__ValAssignment26655); if (state.failed) return ;
+            match(input,RULE_INT,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getIntegerLiteralAccess().getValINTTerminalRuleCall_0()); 
             }
@@ -37691,28 +37691,28 @@ public final void rule__IntegerLiteral__ValAssignment() throws RecognitionExcept
 
 
     // $ANTLR start "rule__NullLiteral__ValAssignment"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13235:1: rule__NullLiteral__ValAssignment : ( ( 'null' ) ) ;
+    // InternalScope.g:13235:1: rule__NullLiteral__ValAssignment : ( ( 'null' ) ) ;
     public final void rule__NullLiteral__ValAssignment() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13239:1: ( ( ( 'null' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13240:1: ( ( 'null' ) )
+            // InternalScope.g:13239:1: ( ( ( 'null' ) ) )
+            // InternalScope.g:13240:1: ( ( 'null' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13240:1: ( ( 'null' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13241:1: ( 'null' )
+            // InternalScope.g:13240:1: ( ( 'null' ) )
+            // InternalScope.g:13241:1: ( 'null' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNullLiteralAccess().getValNullKeyword_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13242:1: ( 'null' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13243:1: 'null'
+            // InternalScope.g:13242:1: ( 'null' )
+            // InternalScope.g:13243:1: 'null'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNullLiteralAccess().getValNullKeyword_0()); 
             }
-            match(input,86,FOLLOW_86_in_rule__NullLiteral__ValAssignment26691); if (state.failed) return ;
+            match(input,86,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getNullLiteralAccess().getValNullKeyword_0()); 
             }
@@ -37744,22 +37744,22 @@ public final void rule__NullLiteral__ValAssignment() throws RecognitionException
 
 
     // $ANTLR start "rule__RealLiteral__ValAssignment"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13258:1: rule__RealLiteral__ValAssignment : ( RULE_REAL ) ;
+    // InternalScope.g:13258:1: rule__RealLiteral__ValAssignment : ( RULE_REAL ) ;
     public final void rule__RealLiteral__ValAssignment() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13262:1: ( ( RULE_REAL ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13263:1: ( RULE_REAL )
+            // InternalScope.g:13262:1: ( ( RULE_REAL ) )
+            // InternalScope.g:13263:1: ( RULE_REAL )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13263:1: ( RULE_REAL )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13264:1: RULE_REAL
+            // InternalScope.g:13263:1: ( RULE_REAL )
+            // InternalScope.g:13264:1: RULE_REAL
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRealLiteralAccess().getValREALTerminalRuleCall_0()); 
             }
-            match(input,RULE_REAL,FOLLOW_RULE_REAL_in_rule__RealLiteral__ValAssignment26730); if (state.failed) return ;
+            match(input,RULE_REAL,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getRealLiteralAccess().getValREALTerminalRuleCall_0()); 
             }
@@ -37785,22 +37785,22 @@ public final void rule__RealLiteral__ValAssignment() throws RecognitionException
 
 
     // $ANTLR start "rule__StringLiteral__ValAssignment"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13273:1: rule__StringLiteral__ValAssignment : ( RULE_STRING ) ;
+    // InternalScope.g:13273:1: rule__StringLiteral__ValAssignment : ( RULE_STRING ) ;
     public final void rule__StringLiteral__ValAssignment() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13277:1: ( ( RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13278:1: ( RULE_STRING )
+            // InternalScope.g:13277:1: ( ( RULE_STRING ) )
+            // InternalScope.g:13278:1: ( RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13278:1: ( RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13279:1: RULE_STRING
+            // InternalScope.g:13278:1: ( RULE_STRING )
+            // InternalScope.g:13279:1: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getStringLiteralAccess().getValSTRINGTerminalRuleCall_0()); 
             }
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__StringLiteral__ValAssignment26761); if (state.failed) return ;
+            match(input,RULE_STRING,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getStringLiteralAccess().getValSTRINGTerminalRuleCall_0()); 
             }
@@ -37826,22 +37826,22 @@ public final void rule__StringLiteral__ValAssignment() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__GlobalVarExpression__NameAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13288:1: rule__GlobalVarExpression__NameAssignment_1 : ( ruleIdentifier ) ;
+    // InternalScope.g:13288:1: rule__GlobalVarExpression__NameAssignment_1 : ( ruleIdentifier ) ;
     public final void rule__GlobalVarExpression__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13292:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13293:1: ( ruleIdentifier )
+            // InternalScope.g:13292:1: ( ( ruleIdentifier ) )
+            // InternalScope.g:13293:1: ( ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13293:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13294:1: ruleIdentifier
+            // InternalScope.g:13293:1: ( ruleIdentifier )
+            // InternalScope.g:13294:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getGlobalVarExpressionAccess().getNameIdentifierParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__GlobalVarExpression__NameAssignment_126792);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -37871,22 +37871,22 @@ public final void rule__GlobalVarExpression__NameAssignment_1() throws Recogniti
 
 
     // $ANTLR start "rule__FeatureCall__TypeAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13303:1: rule__FeatureCall__TypeAssignment_1 : ( ruleType ) ;
+    // InternalScope.g:13303:1: rule__FeatureCall__TypeAssignment_1 : ( ruleType ) ;
     public final void rule__FeatureCall__TypeAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13307:1: ( ( ruleType ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13308:1: ( ruleType )
+            // InternalScope.g:13307:1: ( ( ruleType ) )
+            // InternalScope.g:13308:1: ( ruleType )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13308:1: ( ruleType )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13309:1: ruleType
+            // InternalScope.g:13308:1: ( ruleType )
+            // InternalScope.g:13309:1: ruleType
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getFeatureCallAccess().getTypeTypeParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleType_in_rule__FeatureCall__TypeAssignment_126823);
+            pushFollow(FOLLOW_2);
             ruleType();
 
             state._fsp--;
@@ -37916,22 +37916,22 @@ public final void rule__FeatureCall__TypeAssignment_1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__OperationCall__NameAssignment_0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13318:1: rule__OperationCall__NameAssignment_0 : ( ruleIdentifier ) ;
+    // InternalScope.g:13318:1: rule__OperationCall__NameAssignment_0 : ( ruleIdentifier ) ;
     public final void rule__OperationCall__NameAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13322:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13323:1: ( ruleIdentifier )
+            // InternalScope.g:13322:1: ( ( ruleIdentifier ) )
+            // InternalScope.g:13323:1: ( ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13323:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13324:1: ruleIdentifier
+            // InternalScope.g:13323:1: ( ruleIdentifier )
+            // InternalScope.g:13324:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOperationCallAccess().getNameIdentifierParserRuleCall_0_0()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__OperationCall__NameAssignment_026854);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -37961,22 +37961,22 @@ public final void rule__OperationCall__NameAssignment_0() throws RecognitionExce
 
 
     // $ANTLR start "rule__OperationCall__ParamsAssignment_2_0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13333:1: rule__OperationCall__ParamsAssignment_2_0 : ( ruleExpression ) ;
+    // InternalScope.g:13333:1: rule__OperationCall__ParamsAssignment_2_0 : ( ruleExpression ) ;
     public final void rule__OperationCall__ParamsAssignment_2_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13337:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13338:1: ( ruleExpression )
+            // InternalScope.g:13337:1: ( ( ruleExpression ) )
+            // InternalScope.g:13338:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13338:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13339:1: ruleExpression
+            // InternalScope.g:13338:1: ( ruleExpression )
+            // InternalScope.g:13339:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOperationCallAccess().getParamsExpressionParserRuleCall_2_0_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__OperationCall__ParamsAssignment_2_026885);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -38006,22 +38006,22 @@ public final void rule__OperationCall__ParamsAssignment_2_0() throws Recognition
 
 
     // $ANTLR start "rule__OperationCall__ParamsAssignment_2_1_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13348:1: rule__OperationCall__ParamsAssignment_2_1_1 : ( ruleExpression ) ;
+    // InternalScope.g:13348:1: rule__OperationCall__ParamsAssignment_2_1_1 : ( ruleExpression ) ;
     public final void rule__OperationCall__ParamsAssignment_2_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13352:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13353:1: ( ruleExpression )
+            // InternalScope.g:13352:1: ( ( ruleExpression ) )
+            // InternalScope.g:13353:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13353:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13354:1: ruleExpression
+            // InternalScope.g:13353:1: ( ruleExpression )
+            // InternalScope.g:13354:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getOperationCallAccess().getParamsExpressionParserRuleCall_2_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__OperationCall__ParamsAssignment_2_1_126916);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -38051,22 +38051,22 @@ public final void rule__OperationCall__ParamsAssignment_2_1_1() throws Recogniti
 
 
     // $ANTLR start "rule__ListLiteral__ElementsAssignment_2_0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13363:1: rule__ListLiteral__ElementsAssignment_2_0 : ( ruleExpression ) ;
+    // InternalScope.g:13363:1: rule__ListLiteral__ElementsAssignment_2_0 : ( ruleExpression ) ;
     public final void rule__ListLiteral__ElementsAssignment_2_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13367:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13368:1: ( ruleExpression )
+            // InternalScope.g:13367:1: ( ( ruleExpression ) )
+            // InternalScope.g:13368:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13368:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13369:1: ruleExpression
+            // InternalScope.g:13368:1: ( ruleExpression )
+            // InternalScope.g:13369:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getListLiteralAccess().getElementsExpressionParserRuleCall_2_0_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__ListLiteral__ElementsAssignment_2_026947);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -38096,22 +38096,22 @@ public final void rule__ListLiteral__ElementsAssignment_2_0() throws Recognition
 
 
     // $ANTLR start "rule__ListLiteral__ElementsAssignment_2_1_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13378:1: rule__ListLiteral__ElementsAssignment_2_1_1 : ( ruleExpression ) ;
+    // InternalScope.g:13378:1: rule__ListLiteral__ElementsAssignment_2_1_1 : ( ruleExpression ) ;
     public final void rule__ListLiteral__ElementsAssignment_2_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13382:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13383:1: ( ruleExpression )
+            // InternalScope.g:13382:1: ( ( ruleExpression ) )
+            // InternalScope.g:13383:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13383:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13384:1: ruleExpression
+            // InternalScope.g:13383:1: ( ruleExpression )
+            // InternalScope.g:13384:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getListLiteralAccess().getElementsExpressionParserRuleCall_2_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__ListLiteral__ElementsAssignment_2_1_126978);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -38141,22 +38141,22 @@ public final void rule__ListLiteral__ElementsAssignment_2_1_1() throws Recogniti
 
 
     // $ANTLR start "rule__ConstructorCallExpression__TypeAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13393:1: rule__ConstructorCallExpression__TypeAssignment_1 : ( ruleSimpleType ) ;
+    // InternalScope.g:13393:1: rule__ConstructorCallExpression__TypeAssignment_1 : ( ruleSimpleType ) ;
     public final void rule__ConstructorCallExpression__TypeAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13397:1: ( ( ruleSimpleType ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13398:1: ( ruleSimpleType )
+            // InternalScope.g:13397:1: ( ( ruleSimpleType ) )
+            // InternalScope.g:13398:1: ( ruleSimpleType )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13398:1: ( ruleSimpleType )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13399:1: ruleSimpleType
+            // InternalScope.g:13398:1: ( ruleSimpleType )
+            // InternalScope.g:13399:1: ruleSimpleType
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getConstructorCallExpressionAccess().getTypeSimpleTypeParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleSimpleType_in_rule__ConstructorCallExpression__TypeAssignment_127009);
+            pushFollow(FOLLOW_2);
             ruleSimpleType();
 
             state._fsp--;
@@ -38186,28 +38186,28 @@ public final void rule__ConstructorCallExpression__TypeAssignment_1() throws Rec
 
 
     // $ANTLR start "rule__TypeSelectExpression__NameAssignment_0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13408:1: rule__TypeSelectExpression__NameAssignment_0 : ( ( 'typeSelect' ) ) ;
+    // InternalScope.g:13408:1: rule__TypeSelectExpression__NameAssignment_0 : ( ( 'typeSelect' ) ) ;
     public final void rule__TypeSelectExpression__NameAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13412:1: ( ( ( 'typeSelect' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13413:1: ( ( 'typeSelect' ) )
+            // InternalScope.g:13412:1: ( ( ( 'typeSelect' ) ) )
+            // InternalScope.g:13413:1: ( ( 'typeSelect' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13413:1: ( ( 'typeSelect' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13414:1: ( 'typeSelect' )
+            // InternalScope.g:13413:1: ( ( 'typeSelect' ) )
+            // InternalScope.g:13414:1: ( 'typeSelect' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTypeSelectExpressionAccess().getNameTypeSelectKeyword_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13415:1: ( 'typeSelect' )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13416:1: 'typeSelect'
+            // InternalScope.g:13415:1: ( 'typeSelect' )
+            // InternalScope.g:13416:1: 'typeSelect'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTypeSelectExpressionAccess().getNameTypeSelectKeyword_0_0()); 
             }
-            match(input,85,FOLLOW_85_in_rule__TypeSelectExpression__NameAssignment_027045); if (state.failed) return ;
+            match(input,85,FOLLOW_2); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getTypeSelectExpressionAccess().getNameTypeSelectKeyword_0_0()); 
             }
@@ -38239,22 +38239,22 @@ public final void rule__TypeSelectExpression__NameAssignment_0() throws Recognit
 
 
     // $ANTLR start "rule__TypeSelectExpression__TypeAssignment_2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13431:1: rule__TypeSelectExpression__TypeAssignment_2 : ( ruleType ) ;
+    // InternalScope.g:13431:1: rule__TypeSelectExpression__TypeAssignment_2 : ( ruleType ) ;
     public final void rule__TypeSelectExpression__TypeAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13435:1: ( ( ruleType ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13436:1: ( ruleType )
+            // InternalScope.g:13435:1: ( ( ruleType ) )
+            // InternalScope.g:13436:1: ( ruleType )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13436:1: ( ruleType )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13437:1: ruleType
+            // InternalScope.g:13436:1: ( ruleType )
+            // InternalScope.g:13437:1: ruleType
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getTypeSelectExpressionAccess().getTypeTypeParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleType_in_rule__TypeSelectExpression__TypeAssignment_227084);
+            pushFollow(FOLLOW_2);
             ruleType();
 
             state._fsp--;
@@ -38284,25 +38284,25 @@ public final void rule__TypeSelectExpression__TypeAssignment_2() throws Recognit
 
 
     // $ANTLR start "rule__CollectionExpression__NameAssignment_0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13446:1: rule__CollectionExpression__NameAssignment_0 : ( ( rule__CollectionExpression__NameAlternatives_0_0 ) ) ;
+    // InternalScope.g:13446:1: rule__CollectionExpression__NameAssignment_0 : ( ( rule__CollectionExpression__NameAlternatives_0_0 ) ) ;
     public final void rule__CollectionExpression__NameAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13450:1: ( ( ( rule__CollectionExpression__NameAlternatives_0_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13451:1: ( ( rule__CollectionExpression__NameAlternatives_0_0 ) )
+            // InternalScope.g:13450:1: ( ( ( rule__CollectionExpression__NameAlternatives_0_0 ) ) )
+            // InternalScope.g:13451:1: ( ( rule__CollectionExpression__NameAlternatives_0_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13451:1: ( ( rule__CollectionExpression__NameAlternatives_0_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13452:1: ( rule__CollectionExpression__NameAlternatives_0_0 )
+            // InternalScope.g:13451:1: ( ( rule__CollectionExpression__NameAlternatives_0_0 ) )
+            // InternalScope.g:13452:1: ( rule__CollectionExpression__NameAlternatives_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionExpressionAccess().getNameAlternatives_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13453:1: ( rule__CollectionExpression__NameAlternatives_0_0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13453:2: rule__CollectionExpression__NameAlternatives_0_0
+            // InternalScope.g:13453:1: ( rule__CollectionExpression__NameAlternatives_0_0 )
+            // InternalScope.g:13453:2: rule__CollectionExpression__NameAlternatives_0_0
             {
-            pushFollow(FOLLOW_rule__CollectionExpression__NameAlternatives_0_0_in_rule__CollectionExpression__NameAssignment_027115);
+            pushFollow(FOLLOW_2);
             rule__CollectionExpression__NameAlternatives_0_0();
 
             state._fsp--;
@@ -38335,22 +38335,22 @@ public final void rule__CollectionExpression__NameAssignment_0() throws Recognit
 
 
     // $ANTLR start "rule__CollectionExpression__VarAssignment_2_0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13462:1: rule__CollectionExpression__VarAssignment_2_0 : ( ruleIdentifier ) ;
+    // InternalScope.g:13462:1: rule__CollectionExpression__VarAssignment_2_0 : ( ruleIdentifier ) ;
     public final void rule__CollectionExpression__VarAssignment_2_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13466:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13467:1: ( ruleIdentifier )
+            // InternalScope.g:13466:1: ( ( ruleIdentifier ) )
+            // InternalScope.g:13467:1: ( ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13467:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13468:1: ruleIdentifier
+            // InternalScope.g:13467:1: ( ruleIdentifier )
+            // InternalScope.g:13468:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionExpressionAccess().getVarIdentifierParserRuleCall_2_0_0()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__CollectionExpression__VarAssignment_2_027148);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -38380,22 +38380,22 @@ public final void rule__CollectionExpression__VarAssignment_2_0() throws Recogni
 
 
     // $ANTLR start "rule__CollectionExpression__ExpAssignment_3"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13477:1: rule__CollectionExpression__ExpAssignment_3 : ( ruleExpression ) ;
+    // InternalScope.g:13477:1: rule__CollectionExpression__ExpAssignment_3 : ( ruleExpression ) ;
     public final void rule__CollectionExpression__ExpAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13481:1: ( ( ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13482:1: ( ruleExpression )
+            // InternalScope.g:13481:1: ( ( ruleExpression ) )
+            // InternalScope.g:13482:1: ( ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13482:1: ( ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13483:1: ruleExpression
+            // InternalScope.g:13482:1: ( ruleExpression )
+            // InternalScope.g:13483:1: ruleExpression
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionExpressionAccess().getExpExpressionParserRuleCall_3_0()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_rule__CollectionExpression__ExpAssignment_327179);
+            pushFollow(FOLLOW_2);
             ruleExpression();
 
             state._fsp--;
@@ -38425,25 +38425,25 @@ public final void rule__CollectionExpression__ExpAssignment_3() throws Recogniti
 
 
     // $ANTLR start "rule__CollectionType__ClAssignment_0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13492:1: rule__CollectionType__ClAssignment_0 : ( ( rule__CollectionType__ClAlternatives_0_0 ) ) ;
+    // InternalScope.g:13492:1: rule__CollectionType__ClAssignment_0 : ( ( rule__CollectionType__ClAlternatives_0_0 ) ) ;
     public final void rule__CollectionType__ClAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13496:1: ( ( ( rule__CollectionType__ClAlternatives_0_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13497:1: ( ( rule__CollectionType__ClAlternatives_0_0 ) )
+            // InternalScope.g:13496:1: ( ( ( rule__CollectionType__ClAlternatives_0_0 ) ) )
+            // InternalScope.g:13497:1: ( ( rule__CollectionType__ClAlternatives_0_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13497:1: ( ( rule__CollectionType__ClAlternatives_0_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13498:1: ( rule__CollectionType__ClAlternatives_0_0 )
+            // InternalScope.g:13497:1: ( ( rule__CollectionType__ClAlternatives_0_0 ) )
+            // InternalScope.g:13498:1: ( rule__CollectionType__ClAlternatives_0_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionTypeAccess().getClAlternatives_0_0()); 
             }
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13499:1: ( rule__CollectionType__ClAlternatives_0_0 )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13499:2: rule__CollectionType__ClAlternatives_0_0
+            // InternalScope.g:13499:1: ( rule__CollectionType__ClAlternatives_0_0 )
+            // InternalScope.g:13499:2: rule__CollectionType__ClAlternatives_0_0
             {
-            pushFollow(FOLLOW_rule__CollectionType__ClAlternatives_0_0_in_rule__CollectionType__ClAssignment_027210);
+            pushFollow(FOLLOW_2);
             rule__CollectionType__ClAlternatives_0_0();
 
             state._fsp--;
@@ -38476,22 +38476,22 @@ public final void rule__CollectionType__ClAssignment_0() throws RecognitionExcep
 
 
     // $ANTLR start "rule__CollectionType__Id1Assignment_2"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13508:1: rule__CollectionType__Id1Assignment_2 : ( ruleSimpleType ) ;
+    // InternalScope.g:13508:1: rule__CollectionType__Id1Assignment_2 : ( ruleSimpleType ) ;
     public final void rule__CollectionType__Id1Assignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13512:1: ( ( ruleSimpleType ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13513:1: ( ruleSimpleType )
+            // InternalScope.g:13512:1: ( ( ruleSimpleType ) )
+            // InternalScope.g:13513:1: ( ruleSimpleType )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13513:1: ( ruleSimpleType )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13514:1: ruleSimpleType
+            // InternalScope.g:13513:1: ( ruleSimpleType )
+            // InternalScope.g:13514:1: ruleSimpleType
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCollectionTypeAccess().getId1SimpleTypeParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleSimpleType_in_rule__CollectionType__Id1Assignment_227243);
+            pushFollow(FOLLOW_2);
             ruleSimpleType();
 
             state._fsp--;
@@ -38521,22 +38521,22 @@ public final void rule__CollectionType__Id1Assignment_2() throws RecognitionExce
 
 
     // $ANTLR start "rule__SimpleType__IdAssignment_0"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13523:1: rule__SimpleType__IdAssignment_0 : ( ruleIdentifier ) ;
+    // InternalScope.g:13523:1: rule__SimpleType__IdAssignment_0 : ( ruleIdentifier ) ;
     public final void rule__SimpleType__IdAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13527:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13528:1: ( ruleIdentifier )
+            // InternalScope.g:13527:1: ( ( ruleIdentifier ) )
+            // InternalScope.g:13528:1: ( ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13528:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13529:1: ruleIdentifier
+            // InternalScope.g:13528:1: ( ruleIdentifier )
+            // InternalScope.g:13529:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSimpleTypeAccess().getIdIdentifierParserRuleCall_0_0()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__SimpleType__IdAssignment_027274);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -38566,22 +38566,22 @@ public final void rule__SimpleType__IdAssignment_0() throws RecognitionException
 
 
     // $ANTLR start "rule__SimpleType__IdAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13538:1: rule__SimpleType__IdAssignment_1_1 : ( ruleIdentifier ) ;
+    // InternalScope.g:13538:1: rule__SimpleType__IdAssignment_1_1 : ( ruleIdentifier ) ;
     public final void rule__SimpleType__IdAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13542:1: ( ( ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13543:1: ( ruleIdentifier )
+            // InternalScope.g:13542:1: ( ( ruleIdentifier ) )
+            // InternalScope.g:13543:1: ( ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13543:1: ( ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:13544:1: ruleIdentifier
+            // InternalScope.g:13543:1: ( ruleIdentifier )
+            // InternalScope.g:13544:1: ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getSimpleTypeAccess().getIdIdentifierParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_rule__SimpleType__IdAssignment_1_127305);
+            pushFollow(FOLLOW_2);
             ruleIdentifier();
 
             state._fsp--;
@@ -38611,19 +38611,19 @@ public final void rule__SimpleType__IdAssignment_1_1() throws RecognitionExcepti
 
     // $ANTLR start synpred11_InternalScope
     public final void synpred11_InternalScope_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1927:1: ( ( ( rule__Naming__Group_0__0 ) ) )
-        // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1927:1: ( ( rule__Naming__Group_0__0 ) )
+        // InternalScope.g:1927:1: ( ( ( rule__Naming__Group_0__0 ) ) )
+        // InternalScope.g:1927:1: ( ( rule__Naming__Group_0__0 ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1927:1: ( ( rule__Naming__Group_0__0 ) )
-        // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1928:1: ( rule__Naming__Group_0__0 )
+        // InternalScope.g:1927:1: ( ( rule__Naming__Group_0__0 ) )
+        // InternalScope.g:1928:1: ( rule__Naming__Group_0__0 )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getNamingAccess().getGroup_0()); 
         }
-        // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1929:1: ( rule__Naming__Group_0__0 )
-        // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1929:2: rule__Naming__Group_0__0
+        // InternalScope.g:1929:1: ( rule__Naming__Group_0__0 )
+        // InternalScope.g:1929:2: rule__Naming__Group_0__0
         {
-        pushFollow(FOLLOW_rule__Naming__Group_0__0_in_synpred11_InternalScope4090);
+        pushFollow(FOLLOW_2);
         rule__Naming__Group_0__0();
 
         state._fsp--;
@@ -38641,19 +38641,19 @@ public final void synpred11_InternalScope_fragment() throws RecognitionException
 
     // $ANTLR start synpred14_InternalScope
     public final void synpred14_InternalScope_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1977:6: ( ( ( ruleCastedExpression ) ) )
-        // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1977:6: ( ( ruleCastedExpression ) )
+        // InternalScope.g:1977:6: ( ( ( ruleCastedExpression ) ) )
+        // InternalScope.g:1977:6: ( ( ruleCastedExpression ) )
         {
-        // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1977:6: ( ( ruleCastedExpression ) )
-        // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1978:1: ( ruleCastedExpression )
+        // InternalScope.g:1977:6: ( ( ruleCastedExpression ) )
+        // InternalScope.g:1978:1: ( ruleCastedExpression )
         {
         if ( state.backtracking==0 ) {
            before(grammarAccess.getExpressionAccess().getCastedExpressionParserRuleCall_1()); 
         }
-        // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1979:1: ( ruleCastedExpression )
-        // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:1979:3: ruleCastedExpression
+        // InternalScope.g:1979:1: ( ruleCastedExpression )
+        // InternalScope.g:1979:3: ruleCastedExpression
         {
-        pushFollow(FOLLOW_ruleCastedExpression_in_synpred14_InternalScope4210);
+        pushFollow(FOLLOW_2);
         ruleCastedExpression();
 
         state._fsp--;
@@ -38671,10 +38671,10 @@ public final void synpred14_InternalScope_fragment() throws RecognitionException
 
     // $ANTLR start synpred89_InternalScope
     public final void synpred89_InternalScope_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7794:2: ( rule__IfExpressionKw__Group_4__0 )
-        // ../com.avaloq.tools.ddk.xtext.scope.ui/src-gen/com/avaloq/tools/ddk/xtext/scope/ui/contentassist/antlr/internal/InternalScope.g:7794:2: rule__IfExpressionKw__Group_4__0
+        // InternalScope.g:7794:2: ( rule__IfExpressionKw__Group_4__0 )
+        // InternalScope.g:7794:2: rule__IfExpressionKw__Group_4__0
         {
-        pushFollow(FOLLOW_rule__IfExpressionKw__Group_4__0_in_synpred89_InternalScope15877);
+        pushFollow(FOLLOW_2);
         rule__IfExpressionKw__Group_4__0();
 
         state._fsp--;
@@ -38733,19 +38733,12 @@ public final boolean synpred89_InternalScope() {
     protected DFA1 dfa1 = new DFA1(this);
     protected DFA9 dfa9 = new DFA9(this);
     protected DFA11 dfa11 = new DFA11(this);
-    static final String DFA1_eotS =
-        "\6\uffff";
-    static final String DFA1_eofS =
-        "\6\uffff";
-    static final String DFA1_minS =
-        "\1\4\1\55\1\4\2\uffff\1\55";
-    static final String DFA1_maxS =
-        "\1\4\1\103\1\4\2\uffff\1\103";
-    static final String DFA1_acceptS =
-        "\3\uffff\1\2\1\1\1\uffff";
-    static final String DFA1_specialS =
-        "\6\uffff}>";
-    static final String[] DFA1_transitionS = {
+    static final String dfa_1s = "\6\uffff";
+    static final String dfa_2s = "\1\4\1\55\1\4\2\uffff\1\55";
+    static final String dfa_3s = "\1\4\1\103\1\4\2\uffff\1\103";
+    static final String dfa_4s = "\3\uffff\1\2\1\1\1\uffff";
+    static final String dfa_5s = "\6\uffff}>";
+    static final String[] dfa_6s = {
             "\1\1",
             "\1\4\7\uffff\1\3\15\uffff\1\2",
             "\1\5",
@@ -38754,55 +38747,37 @@ public final boolean synpred89_InternalScope() {
             "\1\4\7\uffff\1\3\15\uffff\1\2"
     };
 
-    static final short[] DFA1_eot = DFA.unpackEncodedString(DFA1_eotS);
-    static final short[] DFA1_eof = DFA.unpackEncodedString(DFA1_eofS);
-    static final char[] DFA1_min = DFA.unpackEncodedStringToUnsignedChars(DFA1_minS);
-    static final char[] DFA1_max = DFA.unpackEncodedStringToUnsignedChars(DFA1_maxS);
-    static final short[] DFA1_accept = DFA.unpackEncodedString(DFA1_acceptS);
-    static final short[] DFA1_special = DFA.unpackEncodedString(DFA1_specialS);
-    static final short[][] DFA1_transition;
-
-    static {
-        int numStates = DFA1_transitionS.length;
-        DFA1_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA1_transition[i] = DFA.unpackEncodedString(DFA1_transitionS[i]);
-        }
-    }
+    static final short[] dfa_1 = DFA.unpackEncodedString(dfa_1s);
+    static final char[] dfa_2 = DFA.unpackEncodedStringToUnsignedChars(dfa_2s);
+    static final char[] dfa_3 = DFA.unpackEncodedStringToUnsignedChars(dfa_3s);
+    static final short[] dfa_4 = DFA.unpackEncodedString(dfa_4s);
+    static final short[] dfa_5 = DFA.unpackEncodedString(dfa_5s);
+    static final short[][] dfa_6 = unpackEncodedStringArray(dfa_6s);
 
     class DFA1 extends DFA {
 
         public DFA1(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 1;
-            this.eot = DFA1_eot;
-            this.eof = DFA1_eof;
-            this.min = DFA1_min;
-            this.max = DFA1_max;
-            this.accept = DFA1_accept;
-            this.special = DFA1_special;
-            this.transition = DFA1_transition;
+            this.eot = dfa_1;
+            this.eof = dfa_1;
+            this.min = dfa_2;
+            this.max = dfa_3;
+            this.accept = dfa_4;
+            this.special = dfa_5;
+            this.transition = dfa_6;
         }
         public String getDescription() {
             return "1734:1: rule__ScopeDefinition__Alternatives_2 : ( ( ( rule__ScopeDefinition__TargetTypeAssignment_2_0 ) ) | ( ( rule__ScopeDefinition__Group_2_1__0 ) ) );";
         }
     }
-    static final String DFA9_eotS =
-        "\40\uffff";
-    static final String DFA9_eofS =
-        "\40\uffff";
-    static final String DFA9_minS =
-        "\1\4\1\0\36\uffff";
-    static final String DFA9_maxS =
-        "\1\126\1\0\36\uffff";
-    static final String DFA9_acceptS =
-        "\2\uffff\1\2\34\uffff\1\1";
-    static final String DFA9_specialS =
-        "\1\uffff\1\0\36\uffff}>";
-    static final String[] DFA9_transitionS = {
-            "\4\2\13\uffff\1\2\2\uffff\16\2\11\uffff\1\2\5\uffff\1\1\7\uffff"+
-            "\1\2\11\uffff\1\2\3\uffff\1\2\2\uffff\1\2\1\uffff\2\2\1\uffff"+
-            "\1\2\3\uffff\2\2",
+    static final String dfa_7s = "\40\uffff";
+    static final String dfa_8s = "\1\4\1\0\36\uffff";
+    static final String dfa_9s = "\1\126\1\0\36\uffff";
+    static final String dfa_10s = "\2\uffff\1\2\34\uffff\1\1";
+    static final String dfa_11s = "\1\uffff\1\0\36\uffff}>";
+    static final String[] dfa_12s = {
+            "\4\2\13\uffff\1\2\2\uffff\16\2\11\uffff\1\2\5\uffff\1\1\7\uffff\1\2\11\uffff\1\2\3\uffff\1\2\2\uffff\1\2\1\uffff\2\2\1\uffff\1\2\3\uffff\2\2",
             "\1\uffff",
             "",
             "",
@@ -38836,34 +38811,25 @@ public String getDescription() {
             ""
     };
 
-    static final short[] DFA9_eot = DFA.unpackEncodedString(DFA9_eotS);
-    static final short[] DFA9_eof = DFA.unpackEncodedString(DFA9_eofS);
-    static final char[] DFA9_min = DFA.unpackEncodedStringToUnsignedChars(DFA9_minS);
-    static final char[] DFA9_max = DFA.unpackEncodedStringToUnsignedChars(DFA9_maxS);
-    static final short[] DFA9_accept = DFA.unpackEncodedString(DFA9_acceptS);
-    static final short[] DFA9_special = DFA.unpackEncodedString(DFA9_specialS);
-    static final short[][] DFA9_transition;
-
-    static {
-        int numStates = DFA9_transitionS.length;
-        DFA9_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA9_transition[i] = DFA.unpackEncodedString(DFA9_transitionS[i]);
-        }
-    }
+    static final short[] dfa_7 = DFA.unpackEncodedString(dfa_7s);
+    static final char[] dfa_8 = DFA.unpackEncodedStringToUnsignedChars(dfa_8s);
+    static final char[] dfa_9 = DFA.unpackEncodedStringToUnsignedChars(dfa_9s);
+    static final short[] dfa_10 = DFA.unpackEncodedString(dfa_10s);
+    static final short[] dfa_11 = DFA.unpackEncodedString(dfa_11s);
+    static final short[][] dfa_12 = unpackEncodedStringArray(dfa_12s);
 
     class DFA9 extends DFA {
 
         public DFA9(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 9;
-            this.eot = DFA9_eot;
-            this.eof = DFA9_eof;
-            this.min = DFA9_min;
-            this.max = DFA9_max;
-            this.accept = DFA9_accept;
-            this.special = DFA9_special;
-            this.transition = DFA9_transition;
+            this.eot = dfa_7;
+            this.eof = dfa_7;
+            this.min = dfa_8;
+            this.max = dfa_9;
+            this.accept = dfa_10;
+            this.special = dfa_11;
+            this.transition = dfa_12;
         }
         public String getDescription() {
             return "1922:1: rule__Naming__Alternatives : ( ( ( rule__Naming__Group_0__0 ) ) | ( ( rule__Naming__NamesAssignment_1 ) ) );";
@@ -38895,21 +38861,13 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA11_eotS =
-        "\36\uffff";
-    static final String DFA11_eofS =
-        "\36\uffff";
-    static final String DFA11_minS =
-        "\1\4\1\uffff\1\0\33\uffff";
-    static final String DFA11_maxS =
-        "\1\126\1\uffff\1\0\33\uffff";
-    static final String DFA11_acceptS =
-        "\1\uffff\1\1\1\uffff\1\3\31\uffff\1\2";
-    static final String DFA11_specialS =
-        "\2\uffff\1\0\33\uffff}>";
-    static final String[] DFA11_transitionS = {
-            "\4\3\13\uffff\1\3\2\uffff\16\3\11\uffff\1\3\5\uffff\1\2\21"+
-            "\uffff\1\1\3\uffff\1\3\2\uffff\1\3\1\uffff\2\3\5\uffff\2\3",
+    static final String dfa_13s = "\36\uffff";
+    static final String dfa_14s = "\1\4\1\uffff\1\0\33\uffff";
+    static final String dfa_15s = "\1\126\1\uffff\1\0\33\uffff";
+    static final String dfa_16s = "\1\uffff\1\1\1\uffff\1\3\31\uffff\1\2";
+    static final String dfa_17s = "\2\uffff\1\0\33\uffff}>";
+    static final String[] dfa_18s = {
+            "\4\3\13\uffff\1\3\2\uffff\16\3\11\uffff\1\3\5\uffff\1\2\21\uffff\1\1\3\uffff\1\3\2\uffff\1\3\1\uffff\2\3\5\uffff\2\3",
             "",
             "\1\uffff",
             "",
@@ -38941,34 +38899,25 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA11_eot = DFA.unpackEncodedString(DFA11_eotS);
-    static final short[] DFA11_eof = DFA.unpackEncodedString(DFA11_eofS);
-    static final char[] DFA11_min = DFA.unpackEncodedStringToUnsignedChars(DFA11_minS);
-    static final char[] DFA11_max = DFA.unpackEncodedStringToUnsignedChars(DFA11_maxS);
-    static final short[] DFA11_accept = DFA.unpackEncodedString(DFA11_acceptS);
-    static final short[] DFA11_special = DFA.unpackEncodedString(DFA11_specialS);
-    static final short[][] DFA11_transition;
-
-    static {
-        int numStates = DFA11_transitionS.length;
-        DFA11_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA11_transition[i] = DFA.unpackEncodedString(DFA11_transitionS[i]);
-        }
-    }
+    static final short[] dfa_13 = DFA.unpackEncodedString(dfa_13s);
+    static final char[] dfa_14 = DFA.unpackEncodedStringToUnsignedChars(dfa_14s);
+    static final char[] dfa_15 = DFA.unpackEncodedStringToUnsignedChars(dfa_15s);
+    static final short[] dfa_16 = DFA.unpackEncodedString(dfa_16s);
+    static final short[] dfa_17 = DFA.unpackEncodedString(dfa_17s);
+    static final short[][] dfa_18 = unpackEncodedStringArray(dfa_18s);
 
     class DFA11 extends DFA {
 
         public DFA11(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 11;
-            this.eot = DFA11_eot;
-            this.eof = DFA11_eof;
-            this.min = DFA11_min;
-            this.max = DFA11_max;
-            this.accept = DFA11_accept;
-            this.special = DFA11_special;
-            this.transition = DFA11_transition;
+            this.eot = dfa_13;
+            this.eof = dfa_13;
+            this.min = dfa_14;
+            this.max = dfa_15;
+            this.accept = dfa_16;
+            this.special = dfa_17;
+            this.transition = dfa_18;
         }
         public String getDescription() {
             return "1966:1: rule__Expression__Alternatives : ( ( ruleLetExpression ) | ( ( ruleCastedExpression ) ) | ( ruleChainExpression ) );";
@@ -39002,1147 +38951,79 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
     }
  
 
-    public static final BitSet FOLLOW_ruleScopeModel_in_entryRuleScopeModel67 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleScopeModel74 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeModel__Group__0_in_ruleScopeModel100 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImport_in_entryRuleImport127 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleImport134 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group__0_in_ruleImport160 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExtension_in_entryRuleExtension187 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleExtension194 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Extension__Group__0_in_ruleExtension220 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInjection_in_entryRuleInjection247 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInjection254 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Injection__Group__0_in_ruleInjection280 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNamingSection_in_entryRuleNamingSection307 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNamingSection314 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NamingSection__Group__0_in_ruleNamingSection340 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNamingDefinition_in_entryRuleNamingDefinition367 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNamingDefinition374 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NamingDefinition__Group__0_in_ruleNamingDefinition400 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleScopeDefinition_in_entryRuleScopeDefinition427 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleScopeDefinition434 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeDefinition__Group__0_in_ruleScopeDefinition460 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleScopeRule_in_entryRuleScopeRule487 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleScopeRule494 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeRule__Group__0_in_ruleScopeRule520 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleScopeContext_in_entryRuleScopeContext547 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleScopeContext554 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeContext__Group__0_in_ruleScopeContext580 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleScopeExpression_in_entryRuleScopeExpression607 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleScopeExpression614 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeExpression__Group__0_in_ruleScopeExpression640 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFactoryExpression_in_entryRuleFactoryExpression667 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFactoryExpression674 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FactoryExpression__Group__0_in_ruleFactoryExpression700 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleScopeDelegation_in_entryRuleScopeDelegation727 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleScopeDelegation734 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeDelegation__Group__0_in_ruleScopeDelegation760 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNamedScopeExpression_in_entryRuleNamedScopeExpression787 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNamedScopeExpression794 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NamedScopeExpression__Group__0_in_ruleNamedScopeExpression820 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGlobalScopeExpression_in_entryRuleGlobalScopeExpression847 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleGlobalScopeExpression854 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group__0_in_ruleGlobalScopeExpression880 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDataExpression_in_entryRuleDataExpression907 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDataExpression914 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DataExpression__Alternatives_in_ruleDataExpression940 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMatchDataExpression_in_entryRuleMatchDataExpression967 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleMatchDataExpression974 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MatchDataExpression__Group__0_in_ruleMatchDataExpression1000 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLambdaDataExpression_in_entryRuleLambdaDataExpression1027 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleLambdaDataExpression1034 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LambdaDataExpression__Group__0_in_ruleLambdaDataExpression1060 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleScopeExpression_in_entryRuleSimpleScopeExpression1087 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSimpleScopeExpression1094 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleScopeExpression__ExprAssignment_in_ruleSimpleScopeExpression1120 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNaming_in_entryRuleNaming1147 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNaming1154 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Naming__Alternatives_in_ruleNaming1180 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNamingExpression_in_entryRuleNamingExpression1207 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNamingExpression1214 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NamingExpression__Alternatives_in_ruleNamingExpression1240 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedID_in_entryRuleQualifiedID1267 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedID1274 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedID__Group__0_in_ruleQualifiedID1300 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDottedID_in_entryRuleDottedID1327 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDottedID1334 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DottedID__Group__0_in_ruleDottedID1360 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_entryRuleExpression1387 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleExpression1394 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Expression__Alternatives_in_ruleExpression1420 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLetExpression_in_entryRuleLetExpression1449 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleLetExpression1456 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LetExpression__Group__0_in_ruleLetExpression1482 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCastedExpression_in_entryRuleCastedExpression1509 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleCastedExpression1516 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CastedExpression__Group__0_in_ruleCastedExpression1542 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChainExpression_in_entryRuleChainExpression1569 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleChainExpression1576 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChainExpression__Group__0_in_ruleChainExpression1602 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_entryRuleChainedExpression1629 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleChainedExpression1636 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChainedExpression__Alternatives_in_ruleChainedExpression1662 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIfExpressionTri_in_entryRuleIfExpressionTri1689 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIfExpressionTri1696 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__Group__0_in_ruleIfExpressionTri1722 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIfExpressionKw_in_entryRuleIfExpressionKw1749 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIfExpressionKw1756 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group__0_in_ruleIfExpressionKw1782 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSwitchExpression_in_entryRuleSwitchExpression1809 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSwitchExpression1816 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__0_in_ruleSwitchExpression1842 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCase_in_entryRuleCase1869 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleCase1876 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Case__Group__0_in_ruleCase1902 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOrExpression_in_entryRuleOrExpression1929 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOrExpression1936 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OrExpression__Group__0_in_ruleOrExpression1962 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAndExpression_in_entryRuleAndExpression1989 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAndExpression1996 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AndExpression__Group__0_in_ruleAndExpression2022 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImpliesExpression_in_entryRuleImpliesExpression2049 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleImpliesExpression2056 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ImpliesExpression__Group__0_in_ruleImpliesExpression2082 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRelationalExpression_in_entryRuleRelationalExpression2109 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRelationalExpression2116 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RelationalExpression__Group__0_in_ruleRelationalExpression2142 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAdditiveExpression_in_entryRuleAdditiveExpression2169 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAdditiveExpression2176 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AdditiveExpression__Group__0_in_ruleAdditiveExpression2202 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMultiplicativeExpression_in_entryRuleMultiplicativeExpression2229 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleMultiplicativeExpression2236 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MultiplicativeExpression__Group__0_in_ruleMultiplicativeExpression2262 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleUnaryOrInfixExpression_in_entryRuleUnaryOrInfixExpression2289 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleUnaryOrInfixExpression2296 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UnaryOrInfixExpression__Alternatives_in_ruleUnaryOrInfixExpression2322 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleUnaryExpression_in_entryRuleUnaryExpression2349 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleUnaryExpression2356 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UnaryExpression__Group__0_in_ruleUnaryExpression2382 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInfixExpression_in_entryRuleInfixExpression2409 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInfixExpression2416 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group__0_in_ruleInfixExpression2442 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePrimaryExpression_in_entryRulePrimaryExpression2469 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRulePrimaryExpression2476 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PrimaryExpression__Alternatives_in_rulePrimaryExpression2502 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteral_in_entryRuleLiteral2529 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleLiteral2536 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Literal__Alternatives_in_ruleLiteral2562 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBooleanLiteral_in_entryRuleBooleanLiteral2589 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleBooleanLiteral2596 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BooleanLiteral__ValAssignment_in_ruleBooleanLiteral2622 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntegerLiteral_in_entryRuleIntegerLiteral2649 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIntegerLiteral2656 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IntegerLiteral__ValAssignment_in_ruleIntegerLiteral2682 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNullLiteral_in_entryRuleNullLiteral2709 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNullLiteral2716 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NullLiteral__ValAssignment_in_ruleNullLiteral2742 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRealLiteral_in_entryRuleRealLiteral2769 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRealLiteral2776 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RealLiteral__ValAssignment_in_ruleRealLiteral2802 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral2829 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleStringLiteral2836 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__StringLiteral__ValAssignment_in_ruleStringLiteral2862 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleParanthesizedExpression_in_entryRuleParanthesizedExpression2889 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleParanthesizedExpression2896 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ParanthesizedExpression__Group__0_in_ruleParanthesizedExpression2922 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGlobalVarExpression_in_entryRuleGlobalVarExpression2949 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleGlobalVarExpression2956 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalVarExpression__Group__0_in_ruleGlobalVarExpression2982 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFeatureCall_in_entryRuleFeatureCall3009 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFeatureCall3016 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FeatureCall__Alternatives_in_ruleFeatureCall3042 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOperationCall_in_entryRuleOperationCall3069 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOperationCall3076 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group__0_in_ruleOperationCall3102 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleListLiteral_in_entryRuleListLiteral3129 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleListLiteral3136 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group__0_in_ruleListLiteral3162 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConstructorCallExpression_in_entryRuleConstructorCallExpression3189 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleConstructorCallExpression3196 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConstructorCallExpression__Group__0_in_ruleConstructorCallExpression3222 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTypeSelectExpression_in_entryRuleTypeSelectExpression3249 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTypeSelectExpression3256 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TypeSelectExpression__Group__0_in_ruleTypeSelectExpression3282 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCollectionExpression_in_entryRuleCollectionExpression3309 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleCollectionExpression3316 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__Group__0_in_ruleCollectionExpression3342 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleType_in_entryRuleType3369 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleType3376 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Type__Alternatives_in_ruleType3402 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCollectionType_in_entryRuleCollectionType3429 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleCollectionType3436 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionType__Group__0_in_ruleCollectionType3462 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleType_in_entryRuleSimpleType3489 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSimpleType3496 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleType__Group__0_in_ruleSimpleType3522 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_entryRuleIdentifier3549 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIdentifier3556 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleIdentifier3582 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Casing__Alternatives_in_ruleCasing3618 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeDefinition__TargetTypeAssignment_2_0_in_rule__ScopeDefinition__Alternatives_23653 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeDefinition__Group_2_1__0_in_rule__ScopeDefinition__Alternatives_23671 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeContext__GlobalAssignment_0_0_in_rule__ScopeContext__Alternatives_03704 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeContext__ContextTypeAssignment_0_1_in_rule__ScopeContext__Alternatives_03722 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleScopeDelegation_in_rule__ScopeExpression__Alternatives_03755 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFactoryExpression_in_rule__ScopeExpression__Alternatives_03772 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNamedScopeExpression_in_rule__ScopeExpression__Alternatives_03789 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeDelegation__DelegateAssignment_2_0_in_rule__ScopeDelegation__Alternatives_23821 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeDelegation__ExternalAssignment_2_1_in_rule__ScopeDelegation__Alternatives_23839 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGlobalScopeExpression_in_rule__NamedScopeExpression__Alternatives_03872 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleScopeExpression_in_rule__NamedScopeExpression__Alternatives_03889 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_3_0__0_in_rule__GlobalScopeExpression__Alternatives_33921 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_3_1__0_in_rule__GlobalScopeExpression__Alternatives_33939 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__DomainsAssignment_5_3_0_in_rule__GlobalScopeExpression__Alternatives_5_33972 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__DomainsAssignment_5_3_1_in_rule__GlobalScopeExpression__Alternatives_5_33990 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_5_3_2__0_in_rule__GlobalScopeExpression__Alternatives_5_34008 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMatchDataExpression_in_rule__DataExpression__Alternatives4041 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLambdaDataExpression_in_rule__DataExpression__Alternatives4058 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Naming__Group_0__0_in_rule__Naming__Alternatives4090 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Naming__NamesAssignment_1_in_rule__Naming__Alternatives4108 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NamingExpression__ExportAssignment_0_in_rule__NamingExpression__Alternatives4141 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NamingExpression__Group_1__0_in_rule__NamingExpression__Alternatives4159 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLetExpression_in_rule__Expression__Alternatives4192 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCastedExpression_in_rule__Expression__Alternatives4210 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChainExpression_in_rule__Expression__Alternatives4228 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIfExpressionKw_in_rule__ChainedExpression__Alternatives4261 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIfExpressionTri_in_rule__ChainedExpression__Alternatives4278 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSwitchExpression_in_rule__ChainedExpression__Alternatives4295 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_12_in_rule__RelationalExpression__OperatorAlternatives_1_1_04328 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_13_in_rule__RelationalExpression__OperatorAlternatives_1_1_04348 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_14_in_rule__RelationalExpression__OperatorAlternatives_1_1_04368 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_15_in_rule__RelationalExpression__OperatorAlternatives_1_1_04388 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_16_in_rule__RelationalExpression__OperatorAlternatives_1_1_04408 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_17_in_rule__RelationalExpression__OperatorAlternatives_1_1_04428 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_18_in_rule__AdditiveExpression__NameAlternatives_1_1_04463 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_rule__AdditiveExpression__NameAlternatives_1_1_04483 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_20_in_rule__MultiplicativeExpression__NameAlternatives_1_1_04518 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_21_in_rule__MultiplicativeExpression__NameAlternatives_1_1_04538 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleUnaryExpression_in_rule__UnaryOrInfixExpression__Alternatives4572 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInfixExpression_in_rule__UnaryOrInfixExpression__Alternatives4589 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_22_in_rule__UnaryExpression__NameAlternatives_0_04622 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_rule__UnaryExpression__NameAlternatives_0_04642 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0__0_in_rule__InfixExpression__Alternatives_14676 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_1__0_in_rule__InfixExpression__Alternatives_14694 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_2__0_in_rule__InfixExpression__Alternatives_14712 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3__0_in_rule__InfixExpression__Alternatives_14730 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_rule__InfixExpression__NameAlternatives_1_3_2_04764 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_rule__InfixExpression__NameAlternatives_1_3_2_04784 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_25_in_rule__InfixExpression__NameAlternatives_1_3_2_04804 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_rule__InfixExpression__NameAlternatives_1_3_2_04824 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__InfixExpression__NameAlternatives_1_3_2_04844 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__InfixExpression__NameAlternatives_1_3_2_04864 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_rule__InfixExpression__NameAlternatives_1_3_2_04884 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_rule__InfixExpression__NameAlternatives_1_3_2_04904 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteral_in_rule__PrimaryExpression__Alternatives4938 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFeatureCall_in_rule__PrimaryExpression__Alternatives4955 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleListLiteral_in_rule__PrimaryExpression__Alternatives4972 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConstructorCallExpression_in_rule__PrimaryExpression__Alternatives4989 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGlobalVarExpression_in_rule__PrimaryExpression__Alternatives5006 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleParanthesizedExpression_in_rule__PrimaryExpression__Alternatives5023 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBooleanLiteral_in_rule__Literal__Alternatives5055 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntegerLiteral_in_rule__Literal__Alternatives5072 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNullLiteral_in_rule__Literal__Alternatives5089 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRealLiteral_in_rule__Literal__Alternatives5106 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStringLiteral_in_rule__Literal__Alternatives5123 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_rule__BooleanLiteral__ValAlternatives_05156 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_rule__BooleanLiteral__ValAlternatives_05176 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOperationCall_in_rule__FeatureCall__Alternatives5210 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FeatureCall__TypeAssignment_1_in_rule__FeatureCall__Alternatives5227 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCollectionExpression_in_rule__FeatureCall__Alternatives5245 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTypeSelectExpression_in_rule__FeatureCall__Alternatives5262 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_rule__CollectionExpression__NameAlternatives_0_05295 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_rule__CollectionExpression__NameAlternatives_0_05315 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_25_in_rule__CollectionExpression__NameAlternatives_0_05335 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_rule__CollectionExpression__NameAlternatives_0_05355 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__CollectionExpression__NameAlternatives_0_05375 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__CollectionExpression__NameAlternatives_0_05395 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_rule__CollectionExpression__NameAlternatives_0_05415 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_rule__CollectionExpression__NameAlternatives_0_05435 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCollectionType_in_rule__Type__Alternatives5469 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleType_in_rule__Type__Alternatives5486 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_rule__CollectionType__ClAlternatives_0_05519 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_34_in_rule__CollectionType__ClAlternatives_0_05539 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_35_in_rule__CollectionType__ClAlternatives_0_05559 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_rule__Casing__Alternatives5594 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_37_in_rule__Casing__Alternatives5615 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeModel__Group__0__Impl_in_rule__ScopeModel__Group__05648 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__ScopeModel__Group__1_in_rule__ScopeModel__Group__05651 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_38_in_rule__ScopeModel__Group__0__Impl5679 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeModel__Group__1__Impl_in_rule__ScopeModel__Group__15710 = new BitSet(new long[]{0x00049D8000000000L});
-    public static final BitSet FOLLOW_rule__ScopeModel__Group__2_in_rule__ScopeModel__Group__15713 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeModel__NameAssignment_1_in_rule__ScopeModel__Group__1__Impl5740 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeModel__Group__2__Impl_in_rule__ScopeModel__Group__25770 = new BitSet(new long[]{0x00049D8000000000L});
-    public static final BitSet FOLLOW_rule__ScopeModel__Group__3_in_rule__ScopeModel__Group__25773 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeModel__Group_2__0_in_rule__ScopeModel__Group__2__Impl5800 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeModel__Group__3__Impl_in_rule__ScopeModel__Group__35831 = new BitSet(new long[]{0x00049D8000000000L});
-    public static final BitSet FOLLOW_rule__ScopeModel__Group__4_in_rule__ScopeModel__Group__35834 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeModel__ImportsAssignment_3_in_rule__ScopeModel__Group__3__Impl5861 = new BitSet(new long[]{0x0000010000000002L});
-    public static final BitSet FOLLOW_rule__ScopeModel__Group__4__Impl_in_rule__ScopeModel__Group__45892 = new BitSet(new long[]{0x00049D8000000000L});
-    public static final BitSet FOLLOW_rule__ScopeModel__Group__5_in_rule__ScopeModel__Group__45895 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeModel__ExtensionsAssignment_4_in_rule__ScopeModel__Group__4__Impl5922 = new BitSet(new long[]{0x0000040000000002L});
-    public static final BitSet FOLLOW_rule__ScopeModel__Group__5__Impl_in_rule__ScopeModel__Group__55953 = new BitSet(new long[]{0x00049D8000000000L});
-    public static final BitSet FOLLOW_rule__ScopeModel__Group__6_in_rule__ScopeModel__Group__55956 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeModel__InjectionsAssignment_5_in_rule__ScopeModel__Group__5__Impl5983 = new BitSet(new long[]{0x0000080000000002L});
-    public static final BitSet FOLLOW_rule__ScopeModel__Group__6__Impl_in_rule__ScopeModel__Group__66014 = new BitSet(new long[]{0x00049D8000000000L});
-    public static final BitSet FOLLOW_rule__ScopeModel__Group__7_in_rule__ScopeModel__Group__66017 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeModel__NamingAssignment_6_in_rule__ScopeModel__Group__6__Impl6044 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeModel__Group__7__Impl_in_rule__ScopeModel__Group__76075 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeModel__ScopesAssignment_7_in_rule__ScopeModel__Group__7__Impl6102 = new BitSet(new long[]{0x0004000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeModel__Group_2__0__Impl_in_rule__ScopeModel__Group_2__06149 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__ScopeModel__Group_2__1_in_rule__ScopeModel__Group_2__06152 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_39_in_rule__ScopeModel__Group_2__0__Impl6180 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeModel__Group_2__1__Impl_in_rule__ScopeModel__Group_2__16211 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeModel__IncludedScopesAssignment_2_1_in_rule__ScopeModel__Group_2__1__Impl6238 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group__0__Impl_in_rule__Import__Group__06272 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_rule__Import__Group__1_in_rule__Import__Group__06275 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_40_in_rule__Import__Group__0__Impl6303 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group__1__Impl_in_rule__Import__Group__16334 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__Import__Group__2_in_rule__Import__Group__16337 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__PackageAssignment_1_in_rule__Import__Group__1__Impl6364 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group__2__Impl_in_rule__Import__Group__26394 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group_2__0_in_rule__Import__Group__2__Impl6421 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group_2__0__Impl_in_rule__Import__Group_2__06458 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__Import__Group_2__1_in_rule__Import__Group_2__06461 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__Import__Group_2__0__Impl6489 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group_2__1__Impl_in_rule__Import__Group_2__16520 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__NameAssignment_2_1_in_rule__Import__Group_2__1__Impl6547 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Extension__Group__0__Impl_in_rule__Extension__Group__06581 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__Extension__Group__1_in_rule__Extension__Group__06584 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_rule__Extension__Group__0__Impl6612 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Extension__Group__1__Impl_in_rule__Extension__Group__16643 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Extension__ExtensionAssignment_1_in_rule__Extension__Group__1__Impl6670 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Injection__Group__0__Impl_in_rule__Injection__Group__06704 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__Injection__Group__1_in_rule__Injection__Group__06707 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_rule__Injection__Group__0__Impl6735 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Injection__Group__1__Impl_in_rule__Injection__Group__16766 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_rule__Injection__Group__2_in_rule__Injection__Group__16769 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Injection__TypeAssignment_1_in_rule__Injection__Group__1__Impl6796 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Injection__Group__2__Impl_in_rule__Injection__Group__26826 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__Injection__Group__3_in_rule__Injection__Group__26829 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__Injection__Group__2__Impl6857 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Injection__Group__3__Impl_in_rule__Injection__Group__36888 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Injection__NameAssignment_3_in_rule__Injection__Group__3__Impl6915 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NamingSection__Group__0__Impl_in_rule__NamingSection__Group__06953 = new BitSet(new long[]{0x0000900000000000L});
-    public static final BitSet FOLLOW_rule__NamingSection__Group__1_in_rule__NamingSection__Group__06956 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NamingSection__Group__1__Impl_in_rule__NamingSection__Group__17014 = new BitSet(new long[]{0x0000900000000000L});
-    public static final BitSet FOLLOW_rule__NamingSection__Group__2_in_rule__NamingSection__Group__17017 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NamingSection__Group_1__0_in_rule__NamingSection__Group__1__Impl7044 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NamingSection__Group__2__Impl_in_rule__NamingSection__Group__27075 = new BitSet(new long[]{0x0000200000000000L});
-    public static final BitSet FOLLOW_rule__NamingSection__Group__3_in_rule__NamingSection__Group__27078 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_44_in_rule__NamingSection__Group__2__Impl7106 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NamingSection__Group__3__Impl_in_rule__NamingSection__Group__37137 = new BitSet(new long[]{0x0000400000000010L});
-    public static final BitSet FOLLOW_rule__NamingSection__Group__4_in_rule__NamingSection__Group__37140 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_45_in_rule__NamingSection__Group__3__Impl7168 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NamingSection__Group__4__Impl_in_rule__NamingSection__Group__47199 = new BitSet(new long[]{0x0000400000000010L});
-    public static final BitSet FOLLOW_rule__NamingSection__Group__5_in_rule__NamingSection__Group__47202 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NamingSection__NamingsAssignment_4_in_rule__NamingSection__Group__4__Impl7229 = new BitSet(new long[]{0x0000000000000012L});
-    public static final BitSet FOLLOW_rule__NamingSection__Group__5__Impl_in_rule__NamingSection__Group__57260 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rule__NamingSection__Group__5__Impl7288 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NamingSection__Group_1__0__Impl_in_rule__NamingSection__Group_1__07331 = new BitSet(new long[]{0x0000003000000000L});
-    public static final BitSet FOLLOW_rule__NamingSection__Group_1__1_in_rule__NamingSection__Group_1__07334 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__NamingSection__Group_1__0__Impl7362 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NamingSection__Group_1__1__Impl_in_rule__NamingSection__Group_1__17393 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NamingSection__CasingAssignment_1_1_in_rule__NamingSection__Group_1__1__Impl7420 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NamingDefinition__Group__0__Impl_in_rule__NamingDefinition__Group__07454 = new BitSet(new long[]{0x0001000000000000L});
-    public static final BitSet FOLLOW_rule__NamingDefinition__Group__1_in_rule__NamingDefinition__Group__07457 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NamingDefinition__TypeAssignment_0_in_rule__NamingDefinition__Group__0__Impl7484 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NamingDefinition__Group__1__Impl_in_rule__NamingDefinition__Group__17514 = new BitSet(new long[]{0x0808200FFFC800F0L,0x000000000062D220L});
-    public static final BitSet FOLLOW_rule__NamingDefinition__Group__2_in_rule__NamingDefinition__Group__17517 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_rule__NamingDefinition__Group__1__Impl7545 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NamingDefinition__Group__2__Impl_in_rule__NamingDefinition__Group__27576 = new BitSet(new long[]{0x0002000000000000L});
-    public static final BitSet FOLLOW_rule__NamingDefinition__Group__3_in_rule__NamingDefinition__Group__27579 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NamingDefinition__NamingAssignment_2_in_rule__NamingDefinition__Group__2__Impl7606 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NamingDefinition__Group__3__Impl_in_rule__NamingDefinition__Group__37636 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_49_in_rule__NamingDefinition__Group__3__Impl7664 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeDefinition__Group__0__Impl_in_rule__ScopeDefinition__Group__07703 = new BitSet(new long[]{0x0008000000000010L});
-    public static final BitSet FOLLOW_rule__ScopeDefinition__Group__1_in_rule__ScopeDefinition__Group__07706 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_50_in_rule__ScopeDefinition__Group__0__Impl7734 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeDefinition__Group__1__Impl_in_rule__ScopeDefinition__Group__17765 = new BitSet(new long[]{0x0008000000000010L});
-    public static final BitSet FOLLOW_rule__ScopeDefinition__Group__2_in_rule__ScopeDefinition__Group__17768 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeDefinition__Group_1__0_in_rule__ScopeDefinition__Group__1__Impl7795 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeDefinition__Group__2__Impl_in_rule__ScopeDefinition__Group__27826 = new BitSet(new long[]{0x0000200000000000L});
-    public static final BitSet FOLLOW_rule__ScopeDefinition__Group__3_in_rule__ScopeDefinition__Group__27829 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeDefinition__Alternatives_2_in_rule__ScopeDefinition__Group__2__Impl7856 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeDefinition__Group__3__Impl_in_rule__ScopeDefinition__Group__37886 = new BitSet(new long[]{0x0040000000000000L});
-    public static final BitSet FOLLOW_rule__ScopeDefinition__Group__4_in_rule__ScopeDefinition__Group__37889 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_45_in_rule__ScopeDefinition__Group__3__Impl7917 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeDefinition__Group__4__Impl_in_rule__ScopeDefinition__Group__47948 = new BitSet(new long[]{0x0000400000000000L});
-    public static final BitSet FOLLOW_rule__ScopeDefinition__Group__5_in_rule__ScopeDefinition__Group__47951 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeDefinition__RulesAssignment_4_in_rule__ScopeDefinition__Group__4__Impl7980 = new BitSet(new long[]{0x0040000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeDefinition__RulesAssignment_4_in_rule__ScopeDefinition__Group__4__Impl7992 = new BitSet(new long[]{0x0040000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeDefinition__Group__5__Impl_in_rule__ScopeDefinition__Group__58025 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rule__ScopeDefinition__Group__5__Impl8053 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeDefinition__Group_1__0__Impl_in_rule__ScopeDefinition__Group_1__08096 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__ScopeDefinition__Group_1__1_in_rule__ScopeDefinition__Group_1__08099 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__ScopeDefinition__Group_1__0__Impl8127 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeDefinition__Group_1__1__Impl_in_rule__ScopeDefinition__Group_1__18158 = new BitSet(new long[]{0x0010000000000000L});
-    public static final BitSet FOLLOW_rule__ScopeDefinition__Group_1__2_in_rule__ScopeDefinition__Group_1__18161 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeDefinition__NameAssignment_1_1_in_rule__ScopeDefinition__Group_1__1__Impl8188 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeDefinition__Group_1__2__Impl_in_rule__ScopeDefinition__Group_1__28218 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_rule__ScopeDefinition__Group_1__2__Impl8246 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeDefinition__Group_2_1__0__Impl_in_rule__ScopeDefinition__Group_2_1__08283 = new BitSet(new long[]{0x0020000000000000L});
-    public static final BitSet FOLLOW_rule__ScopeDefinition__Group_2_1__1_in_rule__ScopeDefinition__Group_2_1__08286 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeDefinition__ContextTypeAssignment_2_1_0_in_rule__ScopeDefinition__Group_2_1__0__Impl8313 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeDefinition__Group_2_1__1__Impl_in_rule__ScopeDefinition__Group_2_1__18343 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__ScopeDefinition__Group_2_1__2_in_rule__ScopeDefinition__Group_2_1__18346 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_53_in_rule__ScopeDefinition__Group_2_1__1__Impl8374 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeDefinition__Group_2_1__2__Impl_in_rule__ScopeDefinition__Group_2_1__28405 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeDefinition__ReferenceAssignment_2_1_2_in_rule__ScopeDefinition__Group_2_1__2__Impl8432 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeRule__Group__0__Impl_in_rule__ScopeRule__Group__08468 = new BitSet(new long[]{0x0000000000100010L});
-    public static final BitSet FOLLOW_rule__ScopeRule__Group__1_in_rule__ScopeRule__Group__08471 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_54_in_rule__ScopeRule__Group__0__Impl8499 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeRule__Group__1__Impl_in_rule__ScopeRule__Group__18530 = new BitSet(new long[]{0x0001000000000000L});
-    public static final BitSet FOLLOW_rule__ScopeRule__Group__2_in_rule__ScopeRule__Group__18533 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeRule__ContextAssignment_1_in_rule__ScopeRule__Group__1__Impl8560 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeRule__Group__2__Impl_in_rule__ScopeRule__Group__28590 = new BitSet(new long[]{0x5808200FFFC800F0L,0x000000000062D220L});
-    public static final BitSet FOLLOW_rule__ScopeRule__Group__3_in_rule__ScopeRule__Group__28593 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_rule__ScopeRule__Group__2__Impl8621 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeRule__Group__3__Impl_in_rule__ScopeRule__Group__38652 = new BitSet(new long[]{0x0082000000000000L});
-    public static final BitSet FOLLOW_rule__ScopeRule__Group__4_in_rule__ScopeRule__Group__38655 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeRule__ExprsAssignment_3_in_rule__ScopeRule__Group__3__Impl8682 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeRule__Group__4__Impl_in_rule__ScopeRule__Group__48712 = new BitSet(new long[]{0x0082000000000000L});
-    public static final BitSet FOLLOW_rule__ScopeRule__Group__5_in_rule__ScopeRule__Group__48715 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeRule__Group_4__0_in_rule__ScopeRule__Group__4__Impl8742 = new BitSet(new long[]{0x0080000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeRule__Group__5__Impl_in_rule__ScopeRule__Group__58773 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_49_in_rule__ScopeRule__Group__5__Impl8801 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeRule__Group_4__0__Impl_in_rule__ScopeRule__Group_4__08844 = new BitSet(new long[]{0x5808200FFFC800F0L,0x000000000062D220L});
-    public static final BitSet FOLLOW_rule__ScopeRule__Group_4__1_in_rule__ScopeRule__Group_4__08847 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_55_in_rule__ScopeRule__Group_4__0__Impl8875 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeRule__Group_4__1__Impl_in_rule__ScopeRule__Group_4__18906 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeRule__ExprsAssignment_4_1_in_rule__ScopeRule__Group_4__1__Impl8933 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeContext__Group__0__Impl_in_rule__ScopeContext__Group__08967 = new BitSet(new long[]{0x0100000000000000L});
-    public static final BitSet FOLLOW_rule__ScopeContext__Group__1_in_rule__ScopeContext__Group__08970 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeContext__Alternatives_0_in_rule__ScopeContext__Group__0__Impl8997 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeContext__Group__1__Impl_in_rule__ScopeContext__Group__19027 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeContext__Group_1__0_in_rule__ScopeContext__Group__1__Impl9054 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeContext__Group_1__0__Impl_in_rule__ScopeContext__Group_1__09089 = new BitSet(new long[]{0x0808200FFFC800F0L,0x000000000062D220L});
-    public static final BitSet FOLLOW_rule__ScopeContext__Group_1__1_in_rule__ScopeContext__Group_1__09092 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_rule__ScopeContext__Group_1__0__Impl9120 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeContext__Group_1__1__Impl_in_rule__ScopeContext__Group_1__19151 = new BitSet(new long[]{0x0200000000000000L});
-    public static final BitSet FOLLOW_rule__ScopeContext__Group_1__2_in_rule__ScopeContext__Group_1__19154 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeContext__GuardAssignment_1_1_in_rule__ScopeContext__Group_1__1__Impl9181 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeContext__Group_1__2__Impl_in_rule__ScopeContext__Group_1__29211 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_57_in_rule__ScopeContext__Group_1__2__Impl9239 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeExpression__Group__0__Impl_in_rule__ScopeExpression__Group__09276 = new BitSet(new long[]{0x0400000000000000L});
-    public static final BitSet FOLLOW_rule__ScopeExpression__Group__1_in_rule__ScopeExpression__Group__09279 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeExpression__Alternatives_0_in_rule__ScopeExpression__Group__0__Impl9306 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeExpression__Group__1__Impl_in_rule__ScopeExpression__Group__19336 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeExpression__Group_1__0_in_rule__ScopeExpression__Group__1__Impl9363 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeExpression__Group_1__0__Impl_in_rule__ScopeExpression__Group_1__09398 = new BitSet(new long[]{0x0808200FFFC800F0L,0x000000000062D220L});
-    public static final BitSet FOLLOW_rule__ScopeExpression__Group_1__1_in_rule__ScopeExpression__Group_1__09401 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_58_in_rule__ScopeExpression__Group_1__0__Impl9429 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeExpression__Group_1__1__Impl_in_rule__ScopeExpression__Group_1__19460 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeExpression__PruneAssignment_1_1_in_rule__ScopeExpression__Group_1__1__Impl9487 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FactoryExpression__Group__0__Impl_in_rule__FactoryExpression__Group__09521 = new BitSet(new long[]{0x0808200FFFC800F0L,0x000000000062D220L});
-    public static final BitSet FOLLOW_rule__FactoryExpression__Group__1_in_rule__FactoryExpression__Group__09524 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_59_in_rule__FactoryExpression__Group__0__Impl9552 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FactoryExpression__Group__1__Impl_in_rule__FactoryExpression__Group__19583 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FactoryExpression__ExprAssignment_1_in_rule__FactoryExpression__Group__1__Impl9610 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeDelegation__Group__0__Impl_in_rule__ScopeDelegation__Group__09644 = new BitSet(new long[]{0x0008000000000000L});
-    public static final BitSet FOLLOW_rule__ScopeDelegation__Group__1_in_rule__ScopeDelegation__Group__09647 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_60_in_rule__ScopeDelegation__Group__0__Impl9675 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeDelegation__Group__1__Impl_in_rule__ScopeDelegation__Group__19706 = new BitSet(new long[]{0x4808200FFFC800F0L,0x000000000062D220L});
-    public static final BitSet FOLLOW_rule__ScopeDelegation__Group__2_in_rule__ScopeDelegation__Group__19709 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__ScopeDelegation__Group__1__Impl9737 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeDelegation__Group__2__Impl_in_rule__ScopeDelegation__Group__29768 = new BitSet(new long[]{0x2010000000000000L});
-    public static final BitSet FOLLOW_rule__ScopeDelegation__Group__3_in_rule__ScopeDelegation__Group__29771 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeDelegation__Alternatives_2_in_rule__ScopeDelegation__Group__2__Impl9798 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeDelegation__Group__3__Impl_in_rule__ScopeDelegation__Group__39828 = new BitSet(new long[]{0x2010000000000000L});
-    public static final BitSet FOLLOW_rule__ScopeDelegation__Group__4_in_rule__ScopeDelegation__Group__39831 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeDelegation__Group_3__0_in_rule__ScopeDelegation__Group__3__Impl9858 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeDelegation__Group__4__Impl_in_rule__ScopeDelegation__Group__49889 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_rule__ScopeDelegation__Group__4__Impl9917 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeDelegation__Group_3__0__Impl_in_rule__ScopeDelegation__Group_3__09958 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__ScopeDelegation__Group_3__1_in_rule__ScopeDelegation__Group_3__09961 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_61_in_rule__ScopeDelegation__Group_3__0__Impl9989 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeDelegation__Group_3__1__Impl_in_rule__ScopeDelegation__Group_3__110020 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ScopeDelegation__ScopeAssignment_3_1_in_rule__ScopeDelegation__Group_3__1__Impl10047 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NamedScopeExpression__Group__0__Impl_in_rule__NamedScopeExpression__Group__010081 = new BitSet(new long[]{0x0000820000000000L});
-    public static final BitSet FOLLOW_rule__NamedScopeExpression__Group__1_in_rule__NamedScopeExpression__Group__010084 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NamedScopeExpression__Alternatives_0_in_rule__NamedScopeExpression__Group__0__Impl10111 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NamedScopeExpression__Group__1__Impl_in_rule__NamedScopeExpression__Group__110141 = new BitSet(new long[]{0x0000820000000000L});
-    public static final BitSet FOLLOW_rule__NamedScopeExpression__Group__2_in_rule__NamedScopeExpression__Group__110144 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NamedScopeExpression__Group_1__0_in_rule__NamedScopeExpression__Group__1__Impl10171 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NamedScopeExpression__Group__2__Impl_in_rule__NamedScopeExpression__Group__210202 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NamedScopeExpression__Group_2__0_in_rule__NamedScopeExpression__Group__2__Impl10229 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NamedScopeExpression__Group_1__0__Impl_in_rule__NamedScopeExpression__Group_1__010266 = new BitSet(new long[]{0x0000003000000000L});
-    public static final BitSet FOLLOW_rule__NamedScopeExpression__Group_1__1_in_rule__NamedScopeExpression__Group_1__010269 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NamedScopeExpression__CaseDefAssignment_1_0_in_rule__NamedScopeExpression__Group_1__0__Impl10296 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NamedScopeExpression__Group_1__1__Impl_in_rule__NamedScopeExpression__Group_1__110326 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NamedScopeExpression__CasingAssignment_1_1_in_rule__NamedScopeExpression__Group_1__1__Impl10353 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NamedScopeExpression__Group_2__0__Impl_in_rule__NamedScopeExpression__Group_2__010387 = new BitSet(new long[]{0x0808200FFFC800F0L,0x000000000062D220L});
-    public static final BitSet FOLLOW_rule__NamedScopeExpression__Group_2__1_in_rule__NamedScopeExpression__Group_2__010390 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_rule__NamedScopeExpression__Group_2__0__Impl10418 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NamedScopeExpression__Group_2__1__Impl_in_rule__NamedScopeExpression__Group_2__110449 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NamedScopeExpression__NamingAssignment_2_1_in_rule__NamedScopeExpression__Group_2__1__Impl10476 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group__0__Impl_in_rule__GlobalScopeExpression__Group__010510 = new BitSet(new long[]{0x0008000000000000L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group__1_in_rule__GlobalScopeExpression__Group__010513 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_62_in_rule__GlobalScopeExpression__Group__0__Impl10541 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group__1__Impl_in_rule__GlobalScopeExpression__Group__110572 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group__2_in_rule__GlobalScopeExpression__Group__110575 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__GlobalScopeExpression__Group__1__Impl10603 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group__2__Impl_in_rule__GlobalScopeExpression__Group__210634 = new BitSet(new long[]{0x2010000000000000L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group__3_in_rule__GlobalScopeExpression__Group__210637 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__TypeAssignment_2_in_rule__GlobalScopeExpression__Group__2__Impl10664 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group__3__Impl_in_rule__GlobalScopeExpression__Group__310694 = new BitSet(new long[]{0x2010000000000000L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group__4_in_rule__GlobalScopeExpression__Group__310697 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Alternatives_3_in_rule__GlobalScopeExpression__Group__3__Impl10724 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group__4__Impl_in_rule__GlobalScopeExpression__Group__410755 = new BitSet(new long[]{0x2010000000000000L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group__5_in_rule__GlobalScopeExpression__Group__410758 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_4__0_in_rule__GlobalScopeExpression__Group__4__Impl10785 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group__5__Impl_in_rule__GlobalScopeExpression__Group__510816 = new BitSet(new long[]{0x2010000000000000L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group__6_in_rule__GlobalScopeExpression__Group__510819 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_5__0_in_rule__GlobalScopeExpression__Group__5__Impl10846 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group__6__Impl_in_rule__GlobalScopeExpression__Group__610877 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_rule__GlobalScopeExpression__Group__6__Impl10905 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_3_0__0__Impl_in_rule__GlobalScopeExpression__Group_3_0__010950 = new BitSet(new long[]{0x8000000000000000L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_3_0__1_in_rule__GlobalScopeExpression__Group_3_0__010953 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_61_in_rule__GlobalScopeExpression__Group_3_0__0__Impl10981 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_3_0__1__Impl_in_rule__GlobalScopeExpression__Group_3_0__111012 = new BitSet(new long[]{0x0001000000000000L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_3_0__2_in_rule__GlobalScopeExpression__Group_3_0__111015 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_rule__GlobalScopeExpression__Group_3_0__1__Impl11043 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_3_0__2__Impl_in_rule__GlobalScopeExpression__Group_3_0__211074 = new BitSet(new long[]{0x0808200FFFC800F0L,0x000000000062D220L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_3_0__3_in_rule__GlobalScopeExpression__Group_3_0__211077 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_rule__GlobalScopeExpression__Group_3_0__2__Impl11105 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_3_0__3__Impl_in_rule__GlobalScopeExpression__Group_3_0__311136 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__NameAssignment_3_0_3_in_rule__GlobalScopeExpression__Group_3_0__3__Impl11163 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_3_1__0__Impl_in_rule__GlobalScopeExpression__Group_3_1__011201 = new BitSet(new long[]{0x0000000000000000L,0x0000000000010001L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_3_1__1_in_rule__GlobalScopeExpression__Group_3_1__011204 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_61_in_rule__GlobalScopeExpression__Group_3_1__0__Impl11232 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_3_1__1__Impl_in_rule__GlobalScopeExpression__Group_3_1__111263 = new BitSet(new long[]{0x0000000000000000L,0x0000000000010001L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_3_1__2_in_rule__GlobalScopeExpression__Group_3_1__111266 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__RecursivePrefixAssignment_3_1_1_in_rule__GlobalScopeExpression__Group_3_1__1__Impl11293 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_3_1__2__Impl_in_rule__GlobalScopeExpression__Group_3_1__211324 = new BitSet(new long[]{0x0001000000000000L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_3_1__3_in_rule__GlobalScopeExpression__Group_3_1__211327 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_64_in_rule__GlobalScopeExpression__Group_3_1__2__Impl11355 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_3_1__3__Impl_in_rule__GlobalScopeExpression__Group_3_1__311386 = new BitSet(new long[]{0x0808200FFFC800F0L,0x000000000062D220L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_3_1__4_in_rule__GlobalScopeExpression__Group_3_1__311389 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_rule__GlobalScopeExpression__Group_3_1__3__Impl11417 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_3_1__4__Impl_in_rule__GlobalScopeExpression__Group_3_1__411448 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__PrefixAssignment_3_1_4_in_rule__GlobalScopeExpression__Group_3_1__4__Impl11475 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_4__0__Impl_in_rule__GlobalScopeExpression__Group_4__011515 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_4__1_in_rule__GlobalScopeExpression__Group_4__011518 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_61_in_rule__GlobalScopeExpression__Group_4__0__Impl11546 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_4__1__Impl_in_rule__GlobalScopeExpression__Group_4__111577 = new BitSet(new long[]{0x0001000000000000L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_4__2_in_rule__GlobalScopeExpression__Group_4__111580 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_65_in_rule__GlobalScopeExpression__Group_4__1__Impl11608 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_4__2__Impl_in_rule__GlobalScopeExpression__Group_4__211639 = new BitSet(new long[]{0x0008000000000000L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_4__3_in_rule__GlobalScopeExpression__Group_4__211642 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_rule__GlobalScopeExpression__Group_4__2__Impl11670 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_4__3__Impl_in_rule__GlobalScopeExpression__Group_4__311701 = new BitSet(new long[]{0x0100000000000010L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_4__4_in_rule__GlobalScopeExpression__Group_4__311704 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__GlobalScopeExpression__Group_4__3__Impl11732 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_4__4__Impl_in_rule__GlobalScopeExpression__Group_4__411763 = new BitSet(new long[]{0x2010000000000000L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_4__5_in_rule__GlobalScopeExpression__Group_4__411766 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__DataAssignment_4_4_in_rule__GlobalScopeExpression__Group_4__4__Impl11793 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_4__5__Impl_in_rule__GlobalScopeExpression__Group_4__511823 = new BitSet(new long[]{0x2010000000000000L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_4__6_in_rule__GlobalScopeExpression__Group_4__511826 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_4_5__0_in_rule__GlobalScopeExpression__Group_4__5__Impl11853 = new BitSet(new long[]{0x2000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_4__6__Impl_in_rule__GlobalScopeExpression__Group_4__611884 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_rule__GlobalScopeExpression__Group_4__6__Impl11912 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_4_5__0__Impl_in_rule__GlobalScopeExpression__Group_4_5__011957 = new BitSet(new long[]{0x0100000000000010L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_4_5__1_in_rule__GlobalScopeExpression__Group_4_5__011960 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_61_in_rule__GlobalScopeExpression__Group_4_5__0__Impl11988 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_4_5__1__Impl_in_rule__GlobalScopeExpression__Group_4_5__112019 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__DataAssignment_4_5_1_in_rule__GlobalScopeExpression__Group_4_5__1__Impl12046 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_5__0__Impl_in_rule__GlobalScopeExpression__Group_5__012080 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_5__1_in_rule__GlobalScopeExpression__Group_5__012083 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_61_in_rule__GlobalScopeExpression__Group_5__0__Impl12111 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_5__1__Impl_in_rule__GlobalScopeExpression__Group_5__112142 = new BitSet(new long[]{0x0001000000000000L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_5__2_in_rule__GlobalScopeExpression__Group_5__112145 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_66_in_rule__GlobalScopeExpression__Group_5__1__Impl12173 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_5__2__Impl_in_rule__GlobalScopeExpression__Group_5__212204 = new BitSet(new long[]{0x0008000000100010L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_5__3_in_rule__GlobalScopeExpression__Group_5__212207 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_rule__GlobalScopeExpression__Group_5__2__Impl12235 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_5__3__Impl_in_rule__GlobalScopeExpression__Group_5__312266 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Alternatives_5_3_in_rule__GlobalScopeExpression__Group_5__3__Impl12293 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_5_3_2__0__Impl_in_rule__GlobalScopeExpression__Group_5_3_2__012331 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_5_3_2__1_in_rule__GlobalScopeExpression__Group_5_3_2__012334 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__GlobalScopeExpression__Group_5_3_2__0__Impl12362 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_5_3_2__1__Impl_in_rule__GlobalScopeExpression__Group_5_3_2__112393 = new BitSet(new long[]{0x2010000000000000L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_5_3_2__2_in_rule__GlobalScopeExpression__Group_5_3_2__112396 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__DomainsAssignment_5_3_2_1_in_rule__GlobalScopeExpression__Group_5_3_2__1__Impl12423 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_5_3_2__2__Impl_in_rule__GlobalScopeExpression__Group_5_3_2__212453 = new BitSet(new long[]{0x2010000000000000L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_5_3_2__3_in_rule__GlobalScopeExpression__Group_5_3_2__212456 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_5_3_2_2__0_in_rule__GlobalScopeExpression__Group_5_3_2__2__Impl12483 = new BitSet(new long[]{0x2000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_5_3_2__3__Impl_in_rule__GlobalScopeExpression__Group_5_3_2__312514 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_rule__GlobalScopeExpression__Group_5_3_2__3__Impl12542 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_5_3_2_2__0__Impl_in_rule__GlobalScopeExpression__Group_5_3_2_2__012581 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_5_3_2_2__1_in_rule__GlobalScopeExpression__Group_5_3_2_2__012584 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_61_in_rule__GlobalScopeExpression__Group_5_3_2_2__0__Impl12612 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__Group_5_3_2_2__1__Impl_in_rule__GlobalScopeExpression__Group_5_3_2_2__112643 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalScopeExpression__DomainsAssignment_5_3_2_2_1_in_rule__GlobalScopeExpression__Group_5_3_2_2__1__Impl12670 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MatchDataExpression__Group__0__Impl_in_rule__MatchDataExpression__Group__012704 = new BitSet(new long[]{0x0001000000000000L});
-    public static final BitSet FOLLOW_rule__MatchDataExpression__Group__1_in_rule__MatchDataExpression__Group__012707 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MatchDataExpression__KeyAssignment_0_in_rule__MatchDataExpression__Group__0__Impl12734 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MatchDataExpression__Group__1__Impl_in_rule__MatchDataExpression__Group__112764 = new BitSet(new long[]{0x0808200FFFC800F0L,0x000000000062D220L});
-    public static final BitSet FOLLOW_rule__MatchDataExpression__Group__2_in_rule__MatchDataExpression__Group__112767 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_rule__MatchDataExpression__Group__1__Impl12795 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MatchDataExpression__Group__2__Impl_in_rule__MatchDataExpression__Group__212826 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MatchDataExpression__ValueAssignment_2_in_rule__MatchDataExpression__Group__2__Impl12853 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LambdaDataExpression__Group__0__Impl_in_rule__LambdaDataExpression__Group__012889 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__LambdaDataExpression__Group__1_in_rule__LambdaDataExpression__Group__012892 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_rule__LambdaDataExpression__Group__0__Impl12920 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LambdaDataExpression__Group__1__Impl_in_rule__LambdaDataExpression__Group__112951 = new BitSet(new long[]{0x0400000000000000L});
-    public static final BitSet FOLLOW_rule__LambdaDataExpression__Group__2_in_rule__LambdaDataExpression__Group__112954 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LambdaDataExpression__DescAssignment_1_in_rule__LambdaDataExpression__Group__1__Impl12981 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LambdaDataExpression__Group__2__Impl_in_rule__LambdaDataExpression__Group__213011 = new BitSet(new long[]{0x0808200FFFC800F0L,0x000000000062D220L});
-    public static final BitSet FOLLOW_rule__LambdaDataExpression__Group__3_in_rule__LambdaDataExpression__Group__213014 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_58_in_rule__LambdaDataExpression__Group__2__Impl13042 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LambdaDataExpression__Group__3__Impl_in_rule__LambdaDataExpression__Group__313073 = new BitSet(new long[]{0x0200000000000000L});
-    public static final BitSet FOLLOW_rule__LambdaDataExpression__Group__4_in_rule__LambdaDataExpression__Group__313076 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LambdaDataExpression__ValueAssignment_3_in_rule__LambdaDataExpression__Group__3__Impl13103 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LambdaDataExpression__Group__4__Impl_in_rule__LambdaDataExpression__Group__413133 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_57_in_rule__LambdaDataExpression__Group__4__Impl13161 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Naming__Group_0__0__Impl_in_rule__Naming__Group_0__013202 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Naming__Group_0_0__0_in_rule__Naming__Group_0__0__Impl13229 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Naming__Group_0_0__0__Impl_in_rule__Naming__Group_0_0__013261 = new BitSet(new long[]{0x0808200FFFC800F0L,0x000000000062D220L});
-    public static final BitSet FOLLOW_rule__Naming__Group_0_0__1_in_rule__Naming__Group_0_0__013264 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__Naming__Group_0_0__0__Impl13292 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Naming__Group_0_0__1__Impl_in_rule__Naming__Group_0_0__113323 = new BitSet(new long[]{0x2010000000000000L});
-    public static final BitSet FOLLOW_rule__Naming__Group_0_0__2_in_rule__Naming__Group_0_0__113326 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Naming__NamesAssignment_0_0_1_in_rule__Naming__Group_0_0__1__Impl13353 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Naming__Group_0_0__2__Impl_in_rule__Naming__Group_0_0__213383 = new BitSet(new long[]{0x2010000000000000L});
-    public static final BitSet FOLLOW_rule__Naming__Group_0_0__3_in_rule__Naming__Group_0_0__213386 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Naming__Group_0_0_2__0_in_rule__Naming__Group_0_0__2__Impl13413 = new BitSet(new long[]{0x2000000000000002L});
-    public static final BitSet FOLLOW_rule__Naming__Group_0_0__3__Impl_in_rule__Naming__Group_0_0__313444 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_rule__Naming__Group_0_0__3__Impl13472 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Naming__Group_0_0_2__0__Impl_in_rule__Naming__Group_0_0_2__013511 = new BitSet(new long[]{0x0808200FFFC800F0L,0x000000000062D220L});
-    public static final BitSet FOLLOW_rule__Naming__Group_0_0_2__1_in_rule__Naming__Group_0_0_2__013514 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_61_in_rule__Naming__Group_0_0_2__0__Impl13542 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Naming__Group_0_0_2__1__Impl_in_rule__Naming__Group_0_0_2__113573 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Naming__NamesAssignment_0_0_2_1_in_rule__Naming__Group_0_0_2__1__Impl13600 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NamingExpression__Group_1__0__Impl_in_rule__NamingExpression__Group_1__013634 = new BitSet(new long[]{0x0808200FFFC800F0L,0x000000000062D220L});
-    public static final BitSet FOLLOW_rule__NamingExpression__Group_1__1_in_rule__NamingExpression__Group_1__013637 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NamingExpression__FactoryAssignment_1_0_in_rule__NamingExpression__Group_1__0__Impl13664 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NamingExpression__Group_1__1__Impl_in_rule__NamingExpression__Group_1__113695 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NamingExpression__ExpressionAssignment_1_1_in_rule__NamingExpression__Group_1__1__Impl13722 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedID__Group__0__Impl_in_rule__QualifiedID__Group__013756 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000008L});
-    public static final BitSet FOLLOW_rule__QualifiedID__Group__1_in_rule__QualifiedID__Group__013759 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__QualifiedID__Group__0__Impl13786 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedID__Group__1__Impl_in_rule__QualifiedID__Group__113815 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedID__Group_1__0_in_rule__QualifiedID__Group__1__Impl13842 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000008L});
-    public static final BitSet FOLLOW_rule__QualifiedID__Group_1__0__Impl_in_rule__QualifiedID__Group_1__013877 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__QualifiedID__Group_1__1_in_rule__QualifiedID__Group_1__013880 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_67_in_rule__QualifiedID__Group_1__0__Impl13908 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedID__Group_1__1__Impl_in_rule__QualifiedID__Group_1__113939 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__QualifiedID__Group_1__1__Impl13966 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DottedID__Group__0__Impl_in_rule__DottedID__Group__013999 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__DottedID__Group__1_in_rule__DottedID__Group__014002 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__DottedID__Group__0__Impl14029 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DottedID__Group__1__Impl_in_rule__DottedID__Group__114058 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DottedID__Group_1__0_in_rule__DottedID__Group__1__Impl14085 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__DottedID__Group_1__0__Impl_in_rule__DottedID__Group_1__014120 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__DottedID__Group_1__1_in_rule__DottedID__Group_1__014123 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_68_in_rule__DottedID__Group_1__0__Impl14151 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DottedID__Group_1__1__Impl_in_rule__DottedID__Group_1__114182 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__DottedID__Group_1__1__Impl14209 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LetExpression__Group__0__Impl_in_rule__LetExpression__Group__014242 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__LetExpression__Group__1_in_rule__LetExpression__Group__014245 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_69_in_rule__LetExpression__Group__0__Impl14273 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LetExpression__Group__1__Impl_in_rule__LetExpression__Group__114304 = new BitSet(new long[]{0x0001000000000000L});
-    public static final BitSet FOLLOW_rule__LetExpression__Group__2_in_rule__LetExpression__Group__114307 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LetExpression__IdentifierAssignment_1_in_rule__LetExpression__Group__1__Impl14334 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LetExpression__Group__2__Impl_in_rule__LetExpression__Group__214364 = new BitSet(new long[]{0x0808200FFFC800F0L,0x000000000062D220L});
-    public static final BitSet FOLLOW_rule__LetExpression__Group__3_in_rule__LetExpression__Group__214367 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_rule__LetExpression__Group__2__Impl14395 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LetExpression__Group__3__Impl_in_rule__LetExpression__Group__314426 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__LetExpression__Group__4_in_rule__LetExpression__Group__314429 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LetExpression__VarExprAssignment_3_in_rule__LetExpression__Group__3__Impl14456 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LetExpression__Group__4__Impl_in_rule__LetExpression__Group__414486 = new BitSet(new long[]{0x0808200FFFC800F0L,0x000000000062D220L});
-    public static final BitSet FOLLOW_rule__LetExpression__Group__5_in_rule__LetExpression__Group__414489 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_70_in_rule__LetExpression__Group__4__Impl14517 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LetExpression__Group__5__Impl_in_rule__LetExpression__Group__514548 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__LetExpression__TargetAssignment_5_in_rule__LetExpression__Group__5__Impl14575 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CastedExpression__Group__0__Impl_in_rule__CastedExpression__Group__014617 = new BitSet(new long[]{0x0000000E00000010L});
-    public static final BitSet FOLLOW_rule__CastedExpression__Group__1_in_rule__CastedExpression__Group__014620 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__CastedExpression__Group__0__Impl14648 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CastedExpression__Group__1__Impl_in_rule__CastedExpression__Group__114679 = new BitSet(new long[]{0x0010000000000000L});
-    public static final BitSet FOLLOW_rule__CastedExpression__Group__2_in_rule__CastedExpression__Group__114682 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CastedExpression__TypeAssignment_1_in_rule__CastedExpression__Group__1__Impl14709 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CastedExpression__Group__2__Impl_in_rule__CastedExpression__Group__214739 = new BitSet(new long[]{0x0808200FFFC800F0L,0x000000000062D220L});
-    public static final BitSet FOLLOW_rule__CastedExpression__Group__3_in_rule__CastedExpression__Group__214742 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_rule__CastedExpression__Group__2__Impl14770 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CastedExpression__Group__3__Impl_in_rule__CastedExpression__Group__314801 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CastedExpression__TargetAssignment_3_in_rule__CastedExpression__Group__3__Impl14828 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChainExpression__Group__0__Impl_in_rule__ChainExpression__Group__014866 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__ChainExpression__Group__1_in_rule__ChainExpression__Group__014869 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_rule__ChainExpression__Group__0__Impl14896 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChainExpression__Group__1__Impl_in_rule__ChainExpression__Group__114925 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChainExpression__Group_1__0_in_rule__ChainExpression__Group__1__Impl14952 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__ChainExpression__Group_1__0__Impl_in_rule__ChainExpression__Group_1__014987 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_rule__ChainExpression__Group_1__1_in_rule__ChainExpression__Group_1__014990 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChainExpression__Group_1__1__Impl_in_rule__ChainExpression__Group_1__115048 = new BitSet(new long[]{0x0808200FFFC800F0L,0x000000000062D220L});
-    public static final BitSet FOLLOW_rule__ChainExpression__Group_1__2_in_rule__ChainExpression__Group_1__115051 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_rule__ChainExpression__Group_1__1__Impl15079 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChainExpression__Group_1__2__Impl_in_rule__ChainExpression__Group_1__215110 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ChainExpression__NextAssignment_1_2_in_rule__ChainExpression__Group_1__2__Impl15137 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__Group__0__Impl_in_rule__IfExpressionTri__Group__015173 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__Group__1_in_rule__IfExpressionTri__Group__015176 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOrExpression_in_rule__IfExpressionTri__Group__0__Impl15203 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__Group__1__Impl_in_rule__IfExpressionTri__Group__115232 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__Group_1__0_in_rule__IfExpressionTri__Group__1__Impl15259 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__Group_1__0__Impl_in_rule__IfExpressionTri__Group_1__015294 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__Group_1__1_in_rule__IfExpressionTri__Group_1__015297 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__Group_1__1__Impl_in_rule__IfExpressionTri__Group_1__115355 = new BitSet(new long[]{0x0808200FFFC800F0L,0x000000000062D220L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__Group_1__2_in_rule__IfExpressionTri__Group_1__115358 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_72_in_rule__IfExpressionTri__Group_1__1__Impl15386 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__Group_1__2__Impl_in_rule__IfExpressionTri__Group_1__215417 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__Group_1__3_in_rule__IfExpressionTri__Group_1__215420 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__ThenPartAssignment_1_2_in_rule__IfExpressionTri__Group_1__2__Impl15447 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__Group_1__3__Impl_in_rule__IfExpressionTri__Group_1__315477 = new BitSet(new long[]{0x0808200FFFC800F0L,0x000000000062D220L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__Group_1__4_in_rule__IfExpressionTri__Group_1__315480 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_70_in_rule__IfExpressionTri__Group_1__3__Impl15508 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__Group_1__4__Impl_in_rule__IfExpressionTri__Group_1__415539 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionTri__ElsePartAssignment_1_4_in_rule__IfExpressionTri__Group_1__4__Impl15566 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group__0__Impl_in_rule__IfExpressionKw__Group__015606 = new BitSet(new long[]{0x0808200FFFC800F0L,0x000000000062D220L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group__1_in_rule__IfExpressionKw__Group__015609 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_rule__IfExpressionKw__Group__0__Impl15637 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group__1__Impl_in_rule__IfExpressionKw__Group__115668 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group__2_in_rule__IfExpressionKw__Group__115671 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__ConditionAssignment_1_in_rule__IfExpressionKw__Group__1__Impl15698 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group__2__Impl_in_rule__IfExpressionKw__Group__215728 = new BitSet(new long[]{0x0808200FFFC800F0L,0x000000000062D220L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group__3_in_rule__IfExpressionKw__Group__215731 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_rule__IfExpressionKw__Group__2__Impl15759 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group__3__Impl_in_rule__IfExpressionKw__Group__315790 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000800L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group__4_in_rule__IfExpressionKw__Group__315793 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__ThenPartAssignment_3_in_rule__IfExpressionKw__Group__3__Impl15820 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group__4__Impl_in_rule__IfExpressionKw__Group__415850 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group_4__0_in_rule__IfExpressionKw__Group__4__Impl15877 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group_4__0__Impl_in_rule__IfExpressionKw__Group_4__015918 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group_4_0__0_in_rule__IfExpressionKw__Group_4__0__Impl15945 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group_4_0__0__Impl_in_rule__IfExpressionKw__Group_4_0__015977 = new BitSet(new long[]{0x0808200FFFC800F0L,0x000000000062D220L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group_4_0__1_in_rule__IfExpressionKw__Group_4_0__015980 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_75_in_rule__IfExpressionKw__Group_4_0__0__Impl16008 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group_4_0__1__Impl_in_rule__IfExpressionKw__Group_4_0__116039 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__ElsePartAssignment_4_0_1_in_rule__IfExpressionKw__Group_4_0__1__Impl16066 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__0__Impl_in_rule__SwitchExpression__Group__016100 = new BitSet(new long[]{0x0008200000000000L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__1_in_rule__SwitchExpression__Group__016103 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_76_in_rule__SwitchExpression__Group__0__Impl16131 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__1__Impl_in_rule__SwitchExpression__Group__116162 = new BitSet(new long[]{0x0008200000000000L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__2_in_rule__SwitchExpression__Group__116165 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group_1__0_in_rule__SwitchExpression__Group__1__Impl16192 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__2__Impl_in_rule__SwitchExpression__Group__216223 = new BitSet(new long[]{0x0000800000000000L,0x0000000000002000L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__3_in_rule__SwitchExpression__Group__216226 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_45_in_rule__SwitchExpression__Group__2__Impl16254 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__3__Impl_in_rule__SwitchExpression__Group__316285 = new BitSet(new long[]{0x0000800000000000L,0x0000000000002000L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__4_in_rule__SwitchExpression__Group__316288 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__CaseAssignment_3_in_rule__SwitchExpression__Group__3__Impl16315 = new BitSet(new long[]{0x0000800000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__4__Impl_in_rule__SwitchExpression__Group__416346 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__5_in_rule__SwitchExpression__Group__416349 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_77_in_rule__SwitchExpression__Group__4__Impl16377 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__5__Impl_in_rule__SwitchExpression__Group__516408 = new BitSet(new long[]{0x0008200FFFC800F0L,0x000000000060C000L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__6_in_rule__SwitchExpression__Group__516411 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_70_in_rule__SwitchExpression__Group__5__Impl16439 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__6__Impl_in_rule__SwitchExpression__Group__616470 = new BitSet(new long[]{0x0000400000000000L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__7_in_rule__SwitchExpression__Group__616473 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__DefaultExprAssignment_6_in_rule__SwitchExpression__Group__6__Impl16500 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group__7__Impl_in_rule__SwitchExpression__Group__716530 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rule__SwitchExpression__Group__7__Impl16558 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group_1__0__Impl_in_rule__SwitchExpression__Group_1__016605 = new BitSet(new long[]{0x0008200FFFC800F0L,0x000000000060C000L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group_1__1_in_rule__SwitchExpression__Group_1__016608 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__SwitchExpression__Group_1__0__Impl16636 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group_1__1__Impl_in_rule__SwitchExpression__Group_1__116667 = new BitSet(new long[]{0x0010000000000000L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group_1__2_in_rule__SwitchExpression__Group_1__116670 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__SwitchExprAssignment_1_1_in_rule__SwitchExpression__Group_1__1__Impl16697 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SwitchExpression__Group_1__2__Impl_in_rule__SwitchExpression__Group_1__216727 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_rule__SwitchExpression__Group_1__2__Impl16755 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Case__Group__0__Impl_in_rule__Case__Group__016792 = new BitSet(new long[]{0x0008200FFFC800F0L,0x000000000060C000L});
-    public static final BitSet FOLLOW_rule__Case__Group__1_in_rule__Case__Group__016795 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__Case__Group__0__Impl16823 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Case__Group__1__Impl_in_rule__Case__Group__116854 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__Case__Group__2_in_rule__Case__Group__116857 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Case__ConditionAssignment_1_in_rule__Case__Group__1__Impl16884 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Case__Group__2__Impl_in_rule__Case__Group__216914 = new BitSet(new long[]{0x0008200FFFC800F0L,0x000000000060C000L});
-    public static final BitSet FOLLOW_rule__Case__Group__3_in_rule__Case__Group__216917 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_70_in_rule__Case__Group__2__Impl16945 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Case__Group__3__Impl_in_rule__Case__Group__316976 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Case__ThenParAssignment_3_in_rule__Case__Group__3__Impl17003 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OrExpression__Group__0__Impl_in_rule__OrExpression__Group__017041 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
-    public static final BitSet FOLLOW_rule__OrExpression__Group__1_in_rule__OrExpression__Group__017044 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAndExpression_in_rule__OrExpression__Group__0__Impl17071 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OrExpression__Group__1__Impl_in_rule__OrExpression__Group__117100 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OrExpression__Group_1__0_in_rule__OrExpression__Group__1__Impl17127 = new BitSet(new long[]{0x0000000000000002L,0x0000000000040000L});
-    public static final BitSet FOLLOW_rule__OrExpression__Group_1__0__Impl_in_rule__OrExpression__Group_1__017162 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
-    public static final BitSet FOLLOW_rule__OrExpression__Group_1__1_in_rule__OrExpression__Group_1__017165 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OrExpression__Group_1__1__Impl_in_rule__OrExpression__Group_1__117223 = new BitSet(new long[]{0x0008200FFFC800F0L,0x000000000060C000L});
-    public static final BitSet FOLLOW_rule__OrExpression__Group_1__2_in_rule__OrExpression__Group_1__117226 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OrExpression__OperatorAssignment_1_1_in_rule__OrExpression__Group_1__1__Impl17253 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OrExpression__Group_1__2__Impl_in_rule__OrExpression__Group_1__217283 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OrExpression__RightAssignment_1_2_in_rule__OrExpression__Group_1__2__Impl17310 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AndExpression__Group__0__Impl_in_rule__AndExpression__Group__017346 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_rule__AndExpression__Group__1_in_rule__AndExpression__Group__017349 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImpliesExpression_in_rule__AndExpression__Group__0__Impl17376 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AndExpression__Group__1__Impl_in_rule__AndExpression__Group__117405 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AndExpression__Group_1__0_in_rule__AndExpression__Group__1__Impl17432 = new BitSet(new long[]{0x0000000000000002L,0x0000000000080000L});
-    public static final BitSet FOLLOW_rule__AndExpression__Group_1__0__Impl_in_rule__AndExpression__Group_1__017467 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_rule__AndExpression__Group_1__1_in_rule__AndExpression__Group_1__017470 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AndExpression__Group_1__1__Impl_in_rule__AndExpression__Group_1__117528 = new BitSet(new long[]{0x0008200FFFC800F0L,0x000000000060C000L});
-    public static final BitSet FOLLOW_rule__AndExpression__Group_1__2_in_rule__AndExpression__Group_1__117531 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AndExpression__OperatorAssignment_1_1_in_rule__AndExpression__Group_1__1__Impl17558 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AndExpression__Group_1__2__Impl_in_rule__AndExpression__Group_1__217588 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AndExpression__RightAssignment_1_2_in_rule__AndExpression__Group_1__2__Impl17615 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ImpliesExpression__Group__0__Impl_in_rule__ImpliesExpression__Group__017651 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
-    public static final BitSet FOLLOW_rule__ImpliesExpression__Group__1_in_rule__ImpliesExpression__Group__017654 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRelationalExpression_in_rule__ImpliesExpression__Group__0__Impl17681 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ImpliesExpression__Group__1__Impl_in_rule__ImpliesExpression__Group__117710 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ImpliesExpression__Group_1__0_in_rule__ImpliesExpression__Group__1__Impl17737 = new BitSet(new long[]{0x0000000000000002L,0x0000000000100000L});
-    public static final BitSet FOLLOW_rule__ImpliesExpression__Group_1__0__Impl_in_rule__ImpliesExpression__Group_1__017772 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
-    public static final BitSet FOLLOW_rule__ImpliesExpression__Group_1__1_in_rule__ImpliesExpression__Group_1__017775 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ImpliesExpression__Group_1__1__Impl_in_rule__ImpliesExpression__Group_1__117833 = new BitSet(new long[]{0x0008200FFFC800F0L,0x000000000060C000L});
-    public static final BitSet FOLLOW_rule__ImpliesExpression__Group_1__2_in_rule__ImpliesExpression__Group_1__117836 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ImpliesExpression__OperatorAssignment_1_1_in_rule__ImpliesExpression__Group_1__1__Impl17863 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ImpliesExpression__Group_1__2__Impl_in_rule__ImpliesExpression__Group_1__217893 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ImpliesExpression__RightAssignment_1_2_in_rule__ImpliesExpression__Group_1__2__Impl17920 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RelationalExpression__Group__0__Impl_in_rule__RelationalExpression__Group__017956 = new BitSet(new long[]{0x000000000003F000L});
-    public static final BitSet FOLLOW_rule__RelationalExpression__Group__1_in_rule__RelationalExpression__Group__017959 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAdditiveExpression_in_rule__RelationalExpression__Group__0__Impl17986 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RelationalExpression__Group__1__Impl_in_rule__RelationalExpression__Group__118015 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RelationalExpression__Group_1__0_in_rule__RelationalExpression__Group__1__Impl18042 = new BitSet(new long[]{0x000000000003F002L});
-    public static final BitSet FOLLOW_rule__RelationalExpression__Group_1__0__Impl_in_rule__RelationalExpression__Group_1__018077 = new BitSet(new long[]{0x000000000003F000L});
-    public static final BitSet FOLLOW_rule__RelationalExpression__Group_1__1_in_rule__RelationalExpression__Group_1__018080 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RelationalExpression__Group_1__1__Impl_in_rule__RelationalExpression__Group_1__118138 = new BitSet(new long[]{0x0008200FFFC800F0L,0x000000000060C000L});
-    public static final BitSet FOLLOW_rule__RelationalExpression__Group_1__2_in_rule__RelationalExpression__Group_1__118141 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RelationalExpression__OperatorAssignment_1_1_in_rule__RelationalExpression__Group_1__1__Impl18168 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RelationalExpression__Group_1__2__Impl_in_rule__RelationalExpression__Group_1__218198 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RelationalExpression__RightAssignment_1_2_in_rule__RelationalExpression__Group_1__2__Impl18225 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AdditiveExpression__Group__0__Impl_in_rule__AdditiveExpression__Group__018261 = new BitSet(new long[]{0x00000000000C0000L});
-    public static final BitSet FOLLOW_rule__AdditiveExpression__Group__1_in_rule__AdditiveExpression__Group__018264 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMultiplicativeExpression_in_rule__AdditiveExpression__Group__0__Impl18291 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AdditiveExpression__Group__1__Impl_in_rule__AdditiveExpression__Group__118320 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AdditiveExpression__Group_1__0_in_rule__AdditiveExpression__Group__1__Impl18347 = new BitSet(new long[]{0x00000000000C0002L});
-    public static final BitSet FOLLOW_rule__AdditiveExpression__Group_1__0__Impl_in_rule__AdditiveExpression__Group_1__018382 = new BitSet(new long[]{0x00000000000C0000L});
-    public static final BitSet FOLLOW_rule__AdditiveExpression__Group_1__1_in_rule__AdditiveExpression__Group_1__018385 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AdditiveExpression__Group_1__1__Impl_in_rule__AdditiveExpression__Group_1__118443 = new BitSet(new long[]{0x0008200FFFC800F0L,0x000000000060C000L});
-    public static final BitSet FOLLOW_rule__AdditiveExpression__Group_1__2_in_rule__AdditiveExpression__Group_1__118446 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AdditiveExpression__NameAssignment_1_1_in_rule__AdditiveExpression__Group_1__1__Impl18473 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AdditiveExpression__Group_1__2__Impl_in_rule__AdditiveExpression__Group_1__218503 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AdditiveExpression__ParamsAssignment_1_2_in_rule__AdditiveExpression__Group_1__2__Impl18530 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MultiplicativeExpression__Group__0__Impl_in_rule__MultiplicativeExpression__Group__018566 = new BitSet(new long[]{0x0000000000300000L});
-    public static final BitSet FOLLOW_rule__MultiplicativeExpression__Group__1_in_rule__MultiplicativeExpression__Group__018569 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleUnaryOrInfixExpression_in_rule__MultiplicativeExpression__Group__0__Impl18596 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MultiplicativeExpression__Group__1__Impl_in_rule__MultiplicativeExpression__Group__118625 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MultiplicativeExpression__Group_1__0_in_rule__MultiplicativeExpression__Group__1__Impl18652 = new BitSet(new long[]{0x0000000000300002L});
-    public static final BitSet FOLLOW_rule__MultiplicativeExpression__Group_1__0__Impl_in_rule__MultiplicativeExpression__Group_1__018687 = new BitSet(new long[]{0x0000000000300000L});
-    public static final BitSet FOLLOW_rule__MultiplicativeExpression__Group_1__1_in_rule__MultiplicativeExpression__Group_1__018690 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MultiplicativeExpression__Group_1__1__Impl_in_rule__MultiplicativeExpression__Group_1__118748 = new BitSet(new long[]{0x0008200FFFC800F0L,0x000000000060C000L});
-    public static final BitSet FOLLOW_rule__MultiplicativeExpression__Group_1__2_in_rule__MultiplicativeExpression__Group_1__118751 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MultiplicativeExpression__NameAssignment_1_1_in_rule__MultiplicativeExpression__Group_1__1__Impl18778 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MultiplicativeExpression__Group_1__2__Impl_in_rule__MultiplicativeExpression__Group_1__218808 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MultiplicativeExpression__ParamsAssignment_1_2_in_rule__MultiplicativeExpression__Group_1__2__Impl18835 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UnaryExpression__Group__0__Impl_in_rule__UnaryExpression__Group__018871 = new BitSet(new long[]{0x0008200FFFC800F0L,0x000000000060C000L});
-    public static final BitSet FOLLOW_rule__UnaryExpression__Group__1_in_rule__UnaryExpression__Group__018874 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UnaryExpression__NameAssignment_0_in_rule__UnaryExpression__Group__0__Impl18901 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UnaryExpression__Group__1__Impl_in_rule__UnaryExpression__Group__118931 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UnaryExpression__ParamsAssignment_1_in_rule__UnaryExpression__Group__1__Impl18958 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group__0__Impl_in_rule__InfixExpression__Group__018992 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group__1_in_rule__InfixExpression__Group__018995 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePrimaryExpression_in_rule__InfixExpression__Group__0__Impl19022 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group__1__Impl_in_rule__InfixExpression__Group__119051 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Alternatives_1_in_rule__InfixExpression__Group__1__Impl19078 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0__0__Impl_in_rule__InfixExpression__Group_1_0__019113 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0__1_in_rule__InfixExpression__Group_1_0__019116 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0__1__Impl_in_rule__InfixExpression__Group_1_0__119174 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0__2_in_rule__InfixExpression__Group_1_0__119177 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_68_in_rule__InfixExpression__Group_1_0__1__Impl19205 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0__2__Impl_in_rule__InfixExpression__Group_1_0__219236 = new BitSet(new long[]{0x0008000000000000L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0__3_in_rule__InfixExpression__Group_1_0__219239 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__NameAssignment_1_0_2_in_rule__InfixExpression__Group_1_0__2__Impl19266 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0__3__Impl_in_rule__InfixExpression__Group_1_0__319296 = new BitSet(new long[]{0x0818200FFFC800F0L,0x000000000062D220L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0__4_in_rule__InfixExpression__Group_1_0__319299 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__InfixExpression__Group_1_0__3__Impl19327 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0__4__Impl_in_rule__InfixExpression__Group_1_0__419358 = new BitSet(new long[]{0x0818200FFFC800F0L,0x000000000062D220L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0__5_in_rule__InfixExpression__Group_1_0__419361 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0_4__0_in_rule__InfixExpression__Group_1_0__4__Impl19388 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0__5__Impl_in_rule__InfixExpression__Group_1_0__519419 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_rule__InfixExpression__Group_1_0__5__Impl19447 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0_4__0__Impl_in_rule__InfixExpression__Group_1_0_4__019490 = new BitSet(new long[]{0x2000000000000000L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0_4__1_in_rule__InfixExpression__Group_1_0_4__019493 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__ParamsAssignment_1_0_4_0_in_rule__InfixExpression__Group_1_0_4__0__Impl19520 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0_4__1__Impl_in_rule__InfixExpression__Group_1_0_4__119550 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0_4_1__0_in_rule__InfixExpression__Group_1_0_4__1__Impl19577 = new BitSet(new long[]{0x2000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0_4_1__0__Impl_in_rule__InfixExpression__Group_1_0_4_1__019612 = new BitSet(new long[]{0x0808200FFFC800F0L,0x000000000062D220L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0_4_1__1_in_rule__InfixExpression__Group_1_0_4_1__019615 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_61_in_rule__InfixExpression__Group_1_0_4_1__0__Impl19643 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_0_4_1__1__Impl_in_rule__InfixExpression__Group_1_0_4_1__119674 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__ParamsAssignment_1_0_4_1_1_in_rule__InfixExpression__Group_1_0_4_1__1__Impl19701 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_1__0__Impl_in_rule__InfixExpression__Group_1_1__019735 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_1__1_in_rule__InfixExpression__Group_1_1__019738 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_1__1__Impl_in_rule__InfixExpression__Group_1_1__119796 = new BitSet(new long[]{0x0000000E00000010L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_1__2_in_rule__InfixExpression__Group_1_1__119799 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_68_in_rule__InfixExpression__Group_1_1__1__Impl19827 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_1__2__Impl_in_rule__InfixExpression__Group_1_1__219858 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__TypeAssignment_1_1_2_in_rule__InfixExpression__Group_1_1__2__Impl19885 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_2__0__Impl_in_rule__InfixExpression__Group_1_2__019921 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_2__1_in_rule__InfixExpression__Group_1_2__019924 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_2__1__Impl_in_rule__InfixExpression__Group_1_2__119982 = new BitSet(new long[]{0x0000000000000000L,0x0000000000200000L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_2__2_in_rule__InfixExpression__Group_1_2__119985 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_68_in_rule__InfixExpression__Group_1_2__1__Impl20013 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_2__2__Impl_in_rule__InfixExpression__Group_1_2__220044 = new BitSet(new long[]{0x0008000000000000L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_2__3_in_rule__InfixExpression__Group_1_2__220047 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__NameAssignment_1_2_2_in_rule__InfixExpression__Group_1_2__2__Impl20074 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_2__3__Impl_in_rule__InfixExpression__Group_1_2__320104 = new BitSet(new long[]{0x0000000E00000010L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_2__4_in_rule__InfixExpression__Group_1_2__320107 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__InfixExpression__Group_1_2__3__Impl20135 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_2__4__Impl_in_rule__InfixExpression__Group_1_2__420166 = new BitSet(new long[]{0x0010000000000000L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_2__5_in_rule__InfixExpression__Group_1_2__420169 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__TypeAssignment_1_2_4_in_rule__InfixExpression__Group_1_2__4__Impl20196 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_2__5__Impl_in_rule__InfixExpression__Group_1_2__520226 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_rule__InfixExpression__Group_1_2__5__Impl20254 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3__0__Impl_in_rule__InfixExpression__Group_1_3__020297 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3__1_in_rule__InfixExpression__Group_1_3__020300 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3__1__Impl_in_rule__InfixExpression__Group_1_3__120358 = new BitSet(new long[]{0x000000007F800000L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3__2_in_rule__InfixExpression__Group_1_3__120361 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_68_in_rule__InfixExpression__Group_1_3__1__Impl20389 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3__2__Impl_in_rule__InfixExpression__Group_1_3__220420 = new BitSet(new long[]{0x0008000000000000L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3__3_in_rule__InfixExpression__Group_1_3__220423 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__NameAssignment_1_3_2_in_rule__InfixExpression__Group_1_3__2__Impl20450 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3__3__Impl_in_rule__InfixExpression__Group_1_3__320480 = new BitSet(new long[]{0x0808200FFFC800F0L,0x000000000062D220L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3__4_in_rule__InfixExpression__Group_1_3__320483 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__InfixExpression__Group_1_3__3__Impl20511 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3__4__Impl_in_rule__InfixExpression__Group_1_3__420542 = new BitSet(new long[]{0x0808200FFFC800F0L,0x000000000062D220L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3__5_in_rule__InfixExpression__Group_1_3__420545 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3_4__0_in_rule__InfixExpression__Group_1_3__4__Impl20572 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3__5__Impl_in_rule__InfixExpression__Group_1_3__520603 = new BitSet(new long[]{0x0010000000000000L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3__6_in_rule__InfixExpression__Group_1_3__520606 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__ExpAssignment_1_3_5_in_rule__InfixExpression__Group_1_3__5__Impl20633 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3__6__Impl_in_rule__InfixExpression__Group_1_3__620663 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_rule__InfixExpression__Group_1_3__6__Impl20691 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3_4__0__Impl_in_rule__InfixExpression__Group_1_3_4__020736 = new BitSet(new long[]{0x0400000000000000L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3_4__1_in_rule__InfixExpression__Group_1_3_4__020739 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__VarAssignment_1_3_4_0_in_rule__InfixExpression__Group_1_3_4__0__Impl20766 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__Group_1_3_4__1__Impl_in_rule__InfixExpression__Group_1_3_4__120796 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_58_in_rule__InfixExpression__Group_1_3_4__1__Impl20824 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ParanthesizedExpression__Group__0__Impl_in_rule__ParanthesizedExpression__Group__020859 = new BitSet(new long[]{0x0808200FFFC800F0L,0x000000000062D220L});
-    public static final BitSet FOLLOW_rule__ParanthesizedExpression__Group__1_in_rule__ParanthesizedExpression__Group__020862 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__ParanthesizedExpression__Group__0__Impl20890 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ParanthesizedExpression__Group__1__Impl_in_rule__ParanthesizedExpression__Group__120921 = new BitSet(new long[]{0x0010000000000000L});
-    public static final BitSet FOLLOW_rule__ParanthesizedExpression__Group__2_in_rule__ParanthesizedExpression__Group__120924 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__ParanthesizedExpression__Group__1__Impl20951 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ParanthesizedExpression__Group__2__Impl_in_rule__ParanthesizedExpression__Group__220980 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_rule__ParanthesizedExpression__Group__2__Impl21008 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalVarExpression__Group__0__Impl_in_rule__GlobalVarExpression__Group__021045 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__GlobalVarExpression__Group__1_in_rule__GlobalVarExpression__Group__021048 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_78_in_rule__GlobalVarExpression__Group__0__Impl21076 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalVarExpression__Group__1__Impl_in_rule__GlobalVarExpression__Group__121107 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__GlobalVarExpression__NameAssignment_1_in_rule__GlobalVarExpression__Group__1__Impl21134 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group__0__Impl_in_rule__OperationCall__Group__021168 = new BitSet(new long[]{0x0008000000000000L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group__1_in_rule__OperationCall__Group__021171 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OperationCall__NameAssignment_0_in_rule__OperationCall__Group__0__Impl21198 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group__1__Impl_in_rule__OperationCall__Group__121228 = new BitSet(new long[]{0x0818200FFFC800F0L,0x000000000062D220L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group__2_in_rule__OperationCall__Group__121231 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__OperationCall__Group__1__Impl21259 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group__2__Impl_in_rule__OperationCall__Group__221290 = new BitSet(new long[]{0x0818200FFFC800F0L,0x000000000062D220L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group__3_in_rule__OperationCall__Group__221293 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group_2__0_in_rule__OperationCall__Group__2__Impl21320 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group__3__Impl_in_rule__OperationCall__Group__321351 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_rule__OperationCall__Group__3__Impl21379 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group_2__0__Impl_in_rule__OperationCall__Group_2__021418 = new BitSet(new long[]{0x2000000000000000L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group_2__1_in_rule__OperationCall__Group_2__021421 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OperationCall__ParamsAssignment_2_0_in_rule__OperationCall__Group_2__0__Impl21448 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group_2__1__Impl_in_rule__OperationCall__Group_2__121478 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group_2_1__0_in_rule__OperationCall__Group_2__1__Impl21505 = new BitSet(new long[]{0x2000000000000002L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group_2_1__0__Impl_in_rule__OperationCall__Group_2_1__021540 = new BitSet(new long[]{0x0808200FFFC800F0L,0x000000000062D220L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group_2_1__1_in_rule__OperationCall__Group_2_1__021543 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_61_in_rule__OperationCall__Group_2_1__0__Impl21571 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OperationCall__Group_2_1__1__Impl_in_rule__OperationCall__Group_2_1__121602 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OperationCall__ParamsAssignment_2_1_1_in_rule__OperationCall__Group_2_1__1__Impl21629 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group__0__Impl_in_rule__ListLiteral__Group__021663 = new BitSet(new long[]{0x0000200000000000L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group__1_in_rule__ListLiteral__Group__021666 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group__1__Impl_in_rule__ListLiteral__Group__121724 = new BitSet(new long[]{0x0808600FFFC800F0L,0x000000000062D220L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group__2_in_rule__ListLiteral__Group__121727 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_45_in_rule__ListLiteral__Group__1__Impl21755 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group__2__Impl_in_rule__ListLiteral__Group__221786 = new BitSet(new long[]{0x0808600FFFC800F0L,0x000000000062D220L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group__3_in_rule__ListLiteral__Group__221789 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group_2__0_in_rule__ListLiteral__Group__2__Impl21816 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group__3__Impl_in_rule__ListLiteral__Group__321847 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_rule__ListLiteral__Group__3__Impl21875 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group_2__0__Impl_in_rule__ListLiteral__Group_2__021914 = new BitSet(new long[]{0x2000000000000000L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group_2__1_in_rule__ListLiteral__Group_2__021917 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ListLiteral__ElementsAssignment_2_0_in_rule__ListLiteral__Group_2__0__Impl21944 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group_2__1__Impl_in_rule__ListLiteral__Group_2__121974 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group_2_1__0_in_rule__ListLiteral__Group_2__1__Impl22001 = new BitSet(new long[]{0x2000000000000002L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group_2_1__0__Impl_in_rule__ListLiteral__Group_2_1__022036 = new BitSet(new long[]{0x0808200FFFC800F0L,0x000000000062D220L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group_2_1__1_in_rule__ListLiteral__Group_2_1__022039 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_61_in_rule__ListLiteral__Group_2_1__0__Impl22067 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ListLiteral__Group_2_1__1__Impl_in_rule__ListLiteral__Group_2_1__122098 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ListLiteral__ElementsAssignment_2_1_1_in_rule__ListLiteral__Group_2_1__1__Impl22125 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConstructorCallExpression__Group__0__Impl_in_rule__ConstructorCallExpression__Group__022159 = new BitSet(new long[]{0x0000000E00000010L});
-    public static final BitSet FOLLOW_rule__ConstructorCallExpression__Group__1_in_rule__ConstructorCallExpression__Group__022162 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_79_in_rule__ConstructorCallExpression__Group__0__Impl22190 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConstructorCallExpression__Group__1__Impl_in_rule__ConstructorCallExpression__Group__122221 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ConstructorCallExpression__TypeAssignment_1_in_rule__ConstructorCallExpression__Group__1__Impl22248 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TypeSelectExpression__Group__0__Impl_in_rule__TypeSelectExpression__Group__022282 = new BitSet(new long[]{0x0008000000000000L});
-    public static final BitSet FOLLOW_rule__TypeSelectExpression__Group__1_in_rule__TypeSelectExpression__Group__022285 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TypeSelectExpression__NameAssignment_0_in_rule__TypeSelectExpression__Group__0__Impl22312 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TypeSelectExpression__Group__1__Impl_in_rule__TypeSelectExpression__Group__122342 = new BitSet(new long[]{0x0000000E00000010L});
-    public static final BitSet FOLLOW_rule__TypeSelectExpression__Group__2_in_rule__TypeSelectExpression__Group__122345 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__TypeSelectExpression__Group__1__Impl22373 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TypeSelectExpression__Group__2__Impl_in_rule__TypeSelectExpression__Group__222404 = new BitSet(new long[]{0x0010000000000000L});
-    public static final BitSet FOLLOW_rule__TypeSelectExpression__Group__3_in_rule__TypeSelectExpression__Group__222407 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TypeSelectExpression__TypeAssignment_2_in_rule__TypeSelectExpression__Group__2__Impl22434 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__TypeSelectExpression__Group__3__Impl_in_rule__TypeSelectExpression__Group__322464 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_rule__TypeSelectExpression__Group__3__Impl22492 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__Group__0__Impl_in_rule__CollectionExpression__Group__022531 = new BitSet(new long[]{0x0008000000000000L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__Group__1_in_rule__CollectionExpression__Group__022534 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__NameAssignment_0_in_rule__CollectionExpression__Group__0__Impl22561 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__Group__1__Impl_in_rule__CollectionExpression__Group__122591 = new BitSet(new long[]{0x0808200FFFC800F0L,0x000000000062D220L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__Group__2_in_rule__CollectionExpression__Group__122594 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_51_in_rule__CollectionExpression__Group__1__Impl22622 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__Group__2__Impl_in_rule__CollectionExpression__Group__222653 = new BitSet(new long[]{0x0808200FFFC800F0L,0x000000000062D220L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__Group__3_in_rule__CollectionExpression__Group__222656 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__Group_2__0_in_rule__CollectionExpression__Group__2__Impl22683 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__Group__3__Impl_in_rule__CollectionExpression__Group__322714 = new BitSet(new long[]{0x0010000000000000L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__Group__4_in_rule__CollectionExpression__Group__322717 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__ExpAssignment_3_in_rule__CollectionExpression__Group__3__Impl22744 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__Group__4__Impl_in_rule__CollectionExpression__Group__422774 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_rule__CollectionExpression__Group__4__Impl22802 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__Group_2__0__Impl_in_rule__CollectionExpression__Group_2__022843 = new BitSet(new long[]{0x0400000000000000L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__Group_2__1_in_rule__CollectionExpression__Group_2__022846 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__VarAssignment_2_0_in_rule__CollectionExpression__Group_2__0__Impl22873 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__Group_2__1__Impl_in_rule__CollectionExpression__Group_2__122903 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_58_in_rule__CollectionExpression__Group_2__1__Impl22931 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionType__Group__0__Impl_in_rule__CollectionType__Group__022966 = new BitSet(new long[]{0x0100000000000000L});
-    public static final BitSet FOLLOW_rule__CollectionType__Group__1_in_rule__CollectionType__Group__022969 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionType__ClAssignment_0_in_rule__CollectionType__Group__0__Impl22996 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionType__Group__1__Impl_in_rule__CollectionType__Group__123026 = new BitSet(new long[]{0x0000000E00000010L});
-    public static final BitSet FOLLOW_rule__CollectionType__Group__2_in_rule__CollectionType__Group__123029 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_56_in_rule__CollectionType__Group__1__Impl23057 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionType__Group__2__Impl_in_rule__CollectionType__Group__223088 = new BitSet(new long[]{0x0200000000000000L});
-    public static final BitSet FOLLOW_rule__CollectionType__Group__3_in_rule__CollectionType__Group__223091 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionType__Id1Assignment_2_in_rule__CollectionType__Group__2__Impl23118 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionType__Group__3__Impl_in_rule__CollectionType__Group__323148 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_57_in_rule__CollectionType__Group__3__Impl23176 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleType__Group__0__Impl_in_rule__SimpleType__Group__023215 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000008L});
-    public static final BitSet FOLLOW_rule__SimpleType__Group__1_in_rule__SimpleType__Group__023218 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleType__IdAssignment_0_in_rule__SimpleType__Group__0__Impl23245 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleType__Group__1__Impl_in_rule__SimpleType__Group__123275 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleType__Group_1__0_in_rule__SimpleType__Group__1__Impl23302 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000008L});
-    public static final BitSet FOLLOW_rule__SimpleType__Group_1__0__Impl_in_rule__SimpleType__Group_1__023337 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__SimpleType__Group_1__1_in_rule__SimpleType__Group_1__023340 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_67_in_rule__SimpleType__Group_1__0__Impl23368 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleType__Group_1__1__Impl_in_rule__SimpleType__Group_1__123399 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleType__IdAssignment_1_1_in_rule__SimpleType__Group_1__1__Impl23426 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDottedID_in_rule__ScopeModel__NameAssignment_123465 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDottedID_in_rule__ScopeModel__IncludedScopesAssignment_2_123500 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImport_in_rule__ScopeModel__ImportsAssignment_323535 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExtension_in_rule__ScopeModel__ExtensionsAssignment_423566 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInjection_in_rule__ScopeModel__InjectionsAssignment_523597 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNamingSection_in_rule__ScopeModel__NamingAssignment_623628 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleScopeDefinition_in_rule__ScopeModel__ScopesAssignment_723659 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__Import__PackageAssignment_123694 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__Import__NameAssignment_2_123729 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedID_in_rule__Extension__ExtensionAssignment_123760 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDottedID_in_rule__Injection__TypeAssignment_123791 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__Injection__NameAssignment_323822 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCasing_in_rule__NamingSection__CasingAssignment_1_123853 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNamingDefinition_in_rule__NamingSection__NamingsAssignment_423884 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedID_in_rule__NamingDefinition__TypeAssignment_023919 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNaming_in_rule__NamingDefinition__NamingAssignment_223954 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__ScopeDefinition__NameAssignment_1_123985 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedID_in_rule__ScopeDefinition__TargetTypeAssignment_2_024020 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedID_in_rule__ScopeDefinition__ContextTypeAssignment_2_1_024059 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__ScopeDefinition__ReferenceAssignment_2_1_224098 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleScopeRule_in_rule__ScopeDefinition__RulesAssignment_424133 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleScopeContext_in_rule__ScopeRule__ContextAssignment_124164 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleScopeExpression_in_rule__ScopeRule__ExprsAssignment_324195 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleScopeExpression_in_rule__ScopeRule__ExprsAssignment_4_124226 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_20_in_rule__ScopeContext__GlobalAssignment_0_024262 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedID_in_rule__ScopeContext__ContextTypeAssignment_0_124305 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__ScopeContext__GuardAssignment_1_124340 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__ScopeExpression__PruneAssignment_1_124371 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__FactoryExpression__ExprAssignment_124402 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__ScopeDelegation__DelegateAssignment_2_024433 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGlobalScopeExpression_in_rule__ScopeDelegation__ExternalAssignment_2_124464 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__ScopeDelegation__ScopeAssignment_3_124499 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_rule__NamedScopeExpression__CaseDefAssignment_1_024539 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCasing_in_rule__NamedScopeExpression__CasingAssignment_1_124578 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNaming_in_rule__NamedScopeExpression__NamingAssignment_2_124609 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedID_in_rule__GlobalScopeExpression__TypeAssignment_224644 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__GlobalScopeExpression__NameAssignment_3_0_324679 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_80_in_rule__GlobalScopeExpression__RecursivePrefixAssignment_3_1_124715 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__GlobalScopeExpression__PrefixAssignment_3_1_424754 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDataExpression_in_rule__GlobalScopeExpression__DataAssignment_4_424785 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDataExpression_in_rule__GlobalScopeExpression__DataAssignment_4_5_124816 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_20_in_rule__GlobalScopeExpression__DomainsAssignment_5_3_024852 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__GlobalScopeExpression__DomainsAssignment_5_3_124891 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__GlobalScopeExpression__DomainsAssignment_5_3_2_124922 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__GlobalScopeExpression__DomainsAssignment_5_3_2_2_124953 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__MatchDataExpression__KeyAssignment_024984 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__MatchDataExpression__ValueAssignment_225015 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__LambdaDataExpression__DescAssignment_125046 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__LambdaDataExpression__ValueAssignment_325077 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__SimpleScopeExpression__ExprAssignment25108 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNamingExpression_in_rule__Naming__NamesAssignment_0_0_125139 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNamingExpression_in_rule__Naming__NamesAssignment_0_0_2_125170 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNamingExpression_in_rule__Naming__NamesAssignment_125201 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_81_in_rule__NamingExpression__ExportAssignment_025237 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_59_in_rule__NamingExpression__FactoryAssignment_1_025281 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__NamingExpression__ExpressionAssignment_1_125320 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__LetExpression__IdentifierAssignment_125351 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__LetExpression__VarExprAssignment_325382 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__LetExpression__TargetAssignment_525413 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleType_in_rule__CastedExpression__TypeAssignment_125444 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__CastedExpression__TargetAssignment_325475 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_rule__ChainExpression__NextAssignment_1_225506 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_rule__IfExpressionTri__ThenPartAssignment_1_225537 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_rule__IfExpressionTri__ElsePartAssignment_1_425568 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_rule__IfExpressionKw__ConditionAssignment_125599 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_rule__IfExpressionKw__ThenPartAssignment_325630 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_rule__IfExpressionKw__ElsePartAssignment_4_0_125661 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOrExpression_in_rule__SwitchExpression__SwitchExprAssignment_1_125692 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCase_in_rule__SwitchExpression__CaseAssignment_325723 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOrExpression_in_rule__SwitchExpression__DefaultExprAssignment_625754 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOrExpression_in_rule__Case__ConditionAssignment_125785 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOrExpression_in_rule__Case__ThenParAssignment_325816 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_82_in_rule__OrExpression__OperatorAssignment_1_125852 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAndExpression_in_rule__OrExpression__RightAssignment_1_225891 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_83_in_rule__AndExpression__OperatorAssignment_1_125927 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImpliesExpression_in_rule__AndExpression__RightAssignment_1_225966 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_84_in_rule__ImpliesExpression__OperatorAssignment_1_126002 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRelationalExpression_in_rule__ImpliesExpression__RightAssignment_1_226041 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RelationalExpression__OperatorAlternatives_1_1_0_in_rule__RelationalExpression__OperatorAssignment_1_126072 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAdditiveExpression_in_rule__RelationalExpression__RightAssignment_1_226105 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__AdditiveExpression__NameAlternatives_1_1_0_in_rule__AdditiveExpression__NameAssignment_1_126136 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMultiplicativeExpression_in_rule__AdditiveExpression__ParamsAssignment_1_226169 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MultiplicativeExpression__NameAlternatives_1_1_0_in_rule__MultiplicativeExpression__NameAssignment_1_126200 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleUnaryOrInfixExpression_in_rule__MultiplicativeExpression__ParamsAssignment_1_226233 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UnaryExpression__NameAlternatives_0_0_in_rule__UnaryExpression__NameAssignment_026264 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInfixExpression_in_rule__UnaryExpression__ParamsAssignment_126297 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__InfixExpression__NameAssignment_1_0_226328 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__InfixExpression__ParamsAssignment_1_0_4_026359 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__InfixExpression__ParamsAssignment_1_0_4_1_126390 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleType_in_rule__InfixExpression__TypeAssignment_1_1_226421 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_85_in_rule__InfixExpression__NameAssignment_1_2_226457 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleType_in_rule__InfixExpression__TypeAssignment_1_2_426496 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InfixExpression__NameAlternatives_1_3_2_0_in_rule__InfixExpression__NameAssignment_1_3_226527 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__InfixExpression__VarAssignment_1_3_4_026560 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__InfixExpression__ExpAssignment_1_3_526591 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__BooleanLiteral__ValAlternatives_0_in_rule__BooleanLiteral__ValAssignment26622 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__IntegerLiteral__ValAssignment26655 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_86_in_rule__NullLiteral__ValAssignment26691 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_REAL_in_rule__RealLiteral__ValAssignment26730 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__StringLiteral__ValAssignment26761 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__GlobalVarExpression__NameAssignment_126792 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleType_in_rule__FeatureCall__TypeAssignment_126823 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__OperationCall__NameAssignment_026854 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__OperationCall__ParamsAssignment_2_026885 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__OperationCall__ParamsAssignment_2_1_126916 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__ListLiteral__ElementsAssignment_2_026947 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__ListLiteral__ElementsAssignment_2_1_126978 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleType_in_rule__ConstructorCallExpression__TypeAssignment_127009 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_85_in_rule__TypeSelectExpression__NameAssignment_027045 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleType_in_rule__TypeSelectExpression__TypeAssignment_227084 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionExpression__NameAlternatives_0_0_in_rule__CollectionExpression__NameAssignment_027115 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__CollectionExpression__VarAssignment_2_027148 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__CollectionExpression__ExpAssignment_327179 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CollectionType__ClAlternatives_0_0_in_rule__CollectionType__ClAssignment_027210 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleType_in_rule__CollectionType__Id1Assignment_227243 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__SimpleType__IdAssignment_027274 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_rule__SimpleType__IdAssignment_1_127305 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Naming__Group_0__0_in_synpred11_InternalScope4090 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCastedExpression_in_synpred14_InternalScope4210 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__IfExpressionKw__Group_4__0_in_synpred89_InternalScope15877 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_1 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_2 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x00049D8000000000L});
+    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0000010000000002L});
+    public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000040000000002L});
+    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000080000000002L});
+    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0004000000000002L});
+    public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000020000000000L});
+    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000900000000000L});
+    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000200000000000L});
+    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000400000000010L});
+    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000000000012L});
+    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000003000000000L});
+    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0001000000000000L});
+    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0808200FFFC800F0L,0x000000000062D220L});
+    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0002000000000000L});
+    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0008000000000010L});
+    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0040000000000000L});
+    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000400000000000L});
+    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0040000000000002L});
+    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0010000000000000L});
+    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0020000000000000L});
+    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000000000100010L});
+    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x5808200FFFC800F0L,0x000000000062D220L});
+    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0082000000000000L});
+    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0080000000000002L});
+    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0100000000000000L});
+    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0200000000000000L});
+    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0400000000000000L});
+    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0008000000000000L});
+    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x4808200FFFC800F0L,0x000000000062D220L});
+    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x2010000000000000L});
+    public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x0000820000000000L});
+    public static final BitSet FOLLOW_36 = new BitSet(new long[]{0x8000000000000000L});
+    public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x0000000000000000L,0x0000000000010001L});
+    public static final BitSet FOLLOW_38 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000002L});
+    public static final BitSet FOLLOW_39 = new BitSet(new long[]{0x0100000000000010L});
+    public static final BitSet FOLLOW_40 = new BitSet(new long[]{0x2000000000000002L});
+    public static final BitSet FOLLOW_41 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000004L});
+    public static final BitSet FOLLOW_42 = new BitSet(new long[]{0x0008000000100010L});
+    public static final BitSet FOLLOW_43 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000008L});
+    public static final BitSet FOLLOW_44 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000008L});
+    public static final BitSet FOLLOW_45 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
+    public static final BitSet FOLLOW_46 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000010L});
+    public static final BitSet FOLLOW_47 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000040L});
+    public static final BitSet FOLLOW_48 = new BitSet(new long[]{0x0000000E00000010L});
+    public static final BitSet FOLLOW_49 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
+    public static final BitSet FOLLOW_50 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000080L});
+    public static final BitSet FOLLOW_51 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L});
+    public static final BitSet FOLLOW_52 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L});
+    public static final BitSet FOLLOW_53 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000800L});
+    public static final BitSet FOLLOW_54 = new BitSet(new long[]{0x0008200000000000L});
+    public static final BitSet FOLLOW_55 = new BitSet(new long[]{0x0000800000000000L,0x0000000000002000L});
+    public static final BitSet FOLLOW_56 = new BitSet(new long[]{0x0000800000000002L});
+    public static final BitSet FOLLOW_57 = new BitSet(new long[]{0x0008200FFFC800F0L,0x000000000060C000L});
+    public static final BitSet FOLLOW_58 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_59 = new BitSet(new long[]{0x0000000000000002L,0x0000000000040000L});
+    public static final BitSet FOLLOW_60 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_61 = new BitSet(new long[]{0x0000000000000002L,0x0000000000080000L});
+    public static final BitSet FOLLOW_62 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_63 = new BitSet(new long[]{0x0000000000000002L,0x0000000000100000L});
+    public static final BitSet FOLLOW_64 = new BitSet(new long[]{0x000000000003F000L});
+    public static final BitSet FOLLOW_65 = new BitSet(new long[]{0x000000000003F002L});
+    public static final BitSet FOLLOW_66 = new BitSet(new long[]{0x00000000000C0000L});
+    public static final BitSet FOLLOW_67 = new BitSet(new long[]{0x00000000000C0002L});
+    public static final BitSet FOLLOW_68 = new BitSet(new long[]{0x0000000000300000L});
+    public static final BitSet FOLLOW_69 = new BitSet(new long[]{0x0000000000300002L});
+    public static final BitSet FOLLOW_70 = new BitSet(new long[]{0x0818200FFFC800F0L,0x000000000062D220L});
+    public static final BitSet FOLLOW_71 = new BitSet(new long[]{0x2000000000000000L});
+    public static final BitSet FOLLOW_72 = new BitSet(new long[]{0x0000000000000000L,0x0000000000200000L});
+    public static final BitSet FOLLOW_73 = new BitSet(new long[]{0x000000007F800000L});
+    public static final BitSet FOLLOW_74 = new BitSet(new long[]{0x0808600FFFC800F0L,0x000000000062D220L});
 
 }
\ No newline at end of file
diff --git a/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/Scope.ecore b/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/Scope.ecore
index 8b5b6d3d3..2c5de77ff 100644
--- a/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/Scope.ecore
+++ b/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/Scope.ecore
@@ -2,7 +2,7 @@
 <ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="scope" nsURI="http://www.avaloq.com/tools/ddk/xtext/Scope" nsPrefix="scope">
   <eClassifiers xsi:type="ecore:EClass" name="ScopeModel">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="includedScopes" unique="false"
         upperBound="-1" eType="#//ScopeModel"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="imports" upperBound="-1"
@@ -17,15 +17,15 @@
         eType="#//ScopeDefinition" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Import">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="package" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EPackage"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="package" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EPackage"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Extension">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="extension" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="extension" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Injection">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EEnum" name="Casing">
     <eLiterals name="SENSITIVE" literal="sensitive"/>
@@ -37,15 +37,15 @@
         eType="#//NamingDefinition" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="NamingDefinition">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="naming" eType="#//Naming"
         containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ScopeDefinition">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="targetType" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="contextType" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="reference" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EReference"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="targetType" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="contextType" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="reference" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EReference"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="rules" upperBound="-1"
         eType="#//ScopeRule" containment="true"/>
   </eClassifiers>
@@ -56,8 +56,8 @@
         eType="#//ScopeExpression" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ScopeContext">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="global" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="contextType" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="global" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="contextType" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="guard" eType="ecore:EClass platform:/resource/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/Expression.ecore#//Expression"
         containment="true"/>
   </eClassifiers>
@@ -77,32 +77,32 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="scope" eType="#//ScopeDefinition"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="NamedScopeExpression" eSuperTypes="#//ScopeExpression">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="caseDef" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="caseDef" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="casing" eType="#//Casing"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="naming" eType="#//Naming"
         containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="GlobalScopeExpression" eSuperTypes="#//NamedScopeExpression">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="name" eType="ecore:EClass platform:/resource/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/Expression.ecore#//Expression"
         containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="recursivePrefix" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="recursivePrefix" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="prefix" eType="ecore:EClass platform:/resource/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/Expression.ecore#//Expression"
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="data" upperBound="-1" eType="#//DataExpression"
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="domains" unique="false"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+        upperBound="-1" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="DataExpression">
     <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="ecore:EClass platform:/resource/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/Expression.ecore#//Expression"
         containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="MatchDataExpression" eSuperTypes="#//DataExpression">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="LambdaDataExpression" eSuperTypes="#//DataExpression">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="desc" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="desc" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="SimpleScopeExpression" eSuperTypes="#//NamedScopeExpression">
     <eStructuralFeatures xsi:type="ecore:EReference" name="expr" eType="ecore:EClass platform:/resource/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/Expression.ecore#//Expression"
@@ -113,8 +113,8 @@
         eType="#//NamingExpression" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="NamingExpression">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="export" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="factory" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="export" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="factory" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="expression" eType="ecore:EClass platform:/resource/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/Expression.ecore#//Expression"
         containment="true"/>
   </eClassifiers>
diff --git a/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/Scope.genmodel b/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/Scope.genmodel
index a410a453d..985868551 100644
--- a/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/Scope.genmodel
+++ b/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/Scope.genmodel
@@ -5,7 +5,7 @@
     forceOverwrite="true" modelName="Scope" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     complianceLevel="6.0" copyrightFields="false" editPluginID="com.avaloq.tools.ddk.xtext.scope.edit"
     editorPluginID="com.avaloq.tools.ddk.xtext.scope.editor" runtimeVersion="2.12"
-    usedGenPackages="platform:/resource/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/Expression.genmodel#//expression">
+    usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/resource/com.avaloq.tools.ddk.xtext.expression/src-gen/com/avaloq/tools/ddk/xtext/expression/Expression.genmodel#//expression">
   <genPackages prefix="Scope" basePackage="com.avaloq.tools.ddk.xtext.scope" disposableProviderFactory="true"
       ecorePackage="Scope.ecore#/">
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="Scope.ecore#//Casing">
diff --git a/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/ScopeStandaloneSetupGenerated.java b/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/ScopeStandaloneSetupGenerated.java
index 104b9b2e6..b67c92452 100644
--- a/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/ScopeStandaloneSetupGenerated.java
+++ b/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/ScopeStandaloneSetupGenerated.java
@@ -4,8 +4,8 @@
 package com.avaloq.tools.ddk.xtext.scope;
 
 import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.xtext.ISetup;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.xtext.ISetup;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
diff --git a/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g b/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g
index 4c85cb94a..ff4da6b6b 100644
--- a/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g
+++ b/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g
@@ -95,7 +95,7 @@ ruleScopeModel returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"DottedID");
+        		"com.avaloq.tools.ddk.xtext.scope.Scope.DottedID");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -132,7 +132,7 @@ ruleScopeModel returns [EObject current=null]
        			$current, 
        			"imports",
         		lv_imports_4_0, 
-        		"Import");
+        		"com.avaloq.tools.ddk.xtext.scope.Scope.Import");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -150,7 +150,7 @@ ruleScopeModel returns [EObject current=null]
        			$current, 
        			"extensions",
         		lv_extensions_5_0, 
-        		"Extension");
+        		"com.avaloq.tools.ddk.xtext.scope.Scope.Extension");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -168,7 +168,7 @@ ruleScopeModel returns [EObject current=null]
        			$current, 
        			"injections",
         		lv_injections_6_0, 
-        		"Injection");
+        		"com.avaloq.tools.ddk.xtext.scope.Scope.Injection");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -186,7 +186,7 @@ ruleScopeModel returns [EObject current=null]
        			$current, 
        			"naming",
         		lv_naming_7_0, 
-        		"NamingSection");
+        		"com.avaloq.tools.ddk.xtext.scope.Scope.NamingSection");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -204,7 +204,7 @@ ruleScopeModel returns [EObject current=null]
        			$current, 
        			"scopes",
         		lv_scopes_8_0, 
-        		"ScopeDefinition");
+        		"com.avaloq.tools.ddk.xtext.scope.Scope.ScopeDefinition");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -264,7 +264,7 @@ ruleImport returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_3_0, 
-        		"Identifier");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -307,7 +307,7 @@ ruleExtension returns [EObject current=null]
        			$current, 
        			"extension",
         		lv_extension_1_0, 
-        		"QualifiedID");
+        		"com.avaloq.tools.ddk.xtext.scope.Scope.QualifiedID");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -350,7 +350,7 @@ ruleInjection returns [EObject current=null]
        			$current, 
        			"type",
         		lv_type_1_0, 
-        		"DottedID");
+        		"com.avaloq.tools.ddk.xtext.scope.Scope.DottedID");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -372,7 +372,7 @@ ruleInjection returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_3_0, 
-        		"Identifier");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -421,7 +421,7 @@ ruleNamingSection returns [EObject current=null]
        			$current, 
        			"casing",
         		lv_casing_2_0, 
-        		"Casing");
+        		"com.avaloq.tools.ddk.xtext.scope.Scope.Casing");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -447,7 +447,7 @@ ruleNamingSection returns [EObject current=null]
        			$current, 
        			"namings",
         		lv_namings_5_0, 
-        		"NamingDefinition");
+        		"com.avaloq.tools.ddk.xtext.scope.Scope.NamingDefinition");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -509,7 +509,7 @@ ruleNamingDefinition returns [EObject current=null]
        			$current, 
        			"naming",
         		lv_naming_2_0, 
-        		"Naming");
+        		"com.avaloq.tools.ddk.xtext.scope.Scope.Naming");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -560,7 +560,7 @@ ruleScopeDefinition returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_2_0, 
-        		"Identifier");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -636,7 +636,7 @@ ruleScopeDefinition returns [EObject current=null]
        			$current, 
        			"rules",
         		lv_rules_9_0, 
-        		"ScopeRule");
+        		"com.avaloq.tools.ddk.xtext.scope.Scope.ScopeRule");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -683,7 +683,7 @@ ruleScopeRule returns [EObject current=null]
        			$current, 
        			"context",
         		lv_context_1_0, 
-        		"ScopeContext");
+        		"com.avaloq.tools.ddk.xtext.scope.Scope.ScopeContext");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -705,7 +705,7 @@ ruleScopeRule returns [EObject current=null]
        			$current, 
        			"exprs",
         		lv_exprs_3_0, 
-        		"ScopeExpression");
+        		"com.avaloq.tools.ddk.xtext.scope.Scope.ScopeExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -727,7 +727,7 @@ ruleScopeRule returns [EObject current=null]
        			$current, 
        			"exprs",
         		lv_exprs_5_0, 
-        		"ScopeExpression");
+        		"com.avaloq.tools.ddk.xtext.scope.Scope.ScopeExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -805,7 +805,7 @@ ruleScopeContext returns [EObject current=null]
        			$current, 
        			"guard",
         		lv_guard_3_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -881,7 +881,7 @@ ruleScopeExpression returns [EObject current=null]
        			$current, 
        			"prune",
         		lv_prune_4_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -924,7 +924,7 @@ ruleFactoryExpression returns [EObject current=null]
        			$current, 
        			"expr",
         		lv_expr_1_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -971,7 +971,7 @@ ruleScopeDelegation returns [EObject current=null]
        			$current, 
        			"delegate",
         		lv_delegate_2_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -990,7 +990,7 @@ ruleScopeDelegation returns [EObject current=null]
        			$current, 
        			"external",
         		lv_external_3_0, 
-        		"GlobalScopeExpression");
+        		"com.avaloq.tools.ddk.xtext.scope.Scope.GlobalScopeExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1086,7 +1086,7 @@ ruleNamedScopeExpression returns [EObject current=null]
        			$current, 
        			"casing",
         		lv_casing_3_0, 
-        		"Casing");
+        		"com.avaloq.tools.ddk.xtext.scope.Scope.Casing");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1108,7 +1108,7 @@ ruleNamedScopeExpression returns [EObject current=null]
        			$current, 
        			"naming",
         		lv_naming_5_0, 
-        		"Naming");
+        		"com.avaloq.tools.ddk.xtext.scope.Scope.Naming");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1182,7 +1182,7 @@ ruleGlobalScopeExpression returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_6_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1228,7 +1228,7 @@ ruleGlobalScopeExpression returns [EObject current=null]
        			$current, 
        			"prefix",
         		lv_prefix_11_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1262,7 +1262,7 @@ ruleGlobalScopeExpression returns [EObject current=null]
        			$current, 
        			"data",
         		lv_data_16_0, 
-        		"DataExpression");
+        		"com.avaloq.tools.ddk.xtext.scope.Scope.DataExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1284,7 +1284,7 @@ ruleGlobalScopeExpression returns [EObject current=null]
        			$current, 
        			"data",
         		lv_data_18_0, 
-        		"DataExpression");
+        		"com.avaloq.tools.ddk.xtext.scope.Scope.DataExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1334,7 +1334,7 @@ ruleGlobalScopeExpression returns [EObject current=null]
        			$current, 
        			"domains",
         		lv_domains_24_0, 
-        		"Identifier");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1357,7 +1357,7 @@ ruleGlobalScopeExpression returns [EObject current=null]
        			$current, 
        			"domains",
         		lv_domains_26_0, 
-        		"Identifier");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1379,7 +1379,7 @@ ruleGlobalScopeExpression returns [EObject current=null]
        			$current, 
        			"domains",
         		lv_domains_28_0, 
-        		"Identifier");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1466,7 +1466,7 @@ ruleMatchDataExpression returns [EObject current=null]
        			$current, 
        			"key",
         		lv_key_0_0, 
-        		"Identifier");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1488,7 +1488,7 @@ ruleMatchDataExpression returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_2_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1531,7 +1531,7 @@ ruleLambdaDataExpression returns [EObject current=null]
        			$current, 
        			"desc",
         		lv_desc_1_0, 
-        		"Identifier");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1553,7 +1553,7 @@ ruleLambdaDataExpression returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_3_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1596,7 +1596,7 @@ ruleSimpleScopeExpression returns [EObject current=null]
        			$current, 
        			"expr",
         		lv_expr_0_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1640,7 +1640,7 @@ ruleNaming returns [EObject current=null]
        			$current, 
        			"names",
         		lv_names_1_0, 
-        		"NamingExpression");
+        		"com.avaloq.tools.ddk.xtext.scope.Scope.NamingExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1662,7 +1662,7 @@ ruleNaming returns [EObject current=null]
        			$current, 
        			"names",
         		lv_names_3_0, 
-        		"NamingExpression");
+        		"com.avaloq.tools.ddk.xtext.scope.Scope.NamingExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1685,7 +1685,7 @@ ruleNaming returns [EObject current=null]
        			$current, 
        			"names",
         		lv_names_5_0, 
-        		"NamingExpression");
+        		"com.avaloq.tools.ddk.xtext.scope.Scope.NamingExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1755,7 +1755,7 @@ ruleNamingExpression returns [EObject current=null]
        			$current, 
        			"expression",
         		lv_expression_2_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1948,7 +1948,7 @@ ruleLetExpression returns [EObject current=null]
        			$current, 
        			"identifier",
         		lv_identifier_1_0, 
-        		"Identifier");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1970,7 +1970,7 @@ ruleLetExpression returns [EObject current=null]
        			$current, 
        			"varExpr",
         		lv_varExpr_3_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1992,7 +1992,7 @@ ruleLetExpression returns [EObject current=null]
        			$current, 
        			"target",
         		lv_target_5_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2035,7 +2035,7 @@ ruleCastedExpression returns [EObject current=null]
        			$current, 
        			"type",
         		lv_type_1_0, 
-        		"Type");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Type");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2057,7 +2057,7 @@ ruleCastedExpression returns [EObject current=null]
        			$current, 
        			"target",
         		lv_target_3_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2115,7 +2115,7 @@ ruleChainExpression returns [EObject current=null]
        			$current, 
        			"next",
         		lv_next_3_0, 
-        		"ChainedExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.ChainedExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2223,7 +2223,7 @@ ruleIfExpressionTri returns [EObject current=null]
        			$current, 
        			"thenPart",
         		lv_thenPart_3_0, 
-        		"ChainedExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.ChainedExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2245,7 +2245,7 @@ ruleIfExpressionTri returns [EObject current=null]
        			$current, 
        			"elsePart",
         		lv_elsePart_5_0, 
-        		"ChainedExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.ChainedExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2288,7 +2288,7 @@ ruleIfExpressionKw returns [EObject current=null]
        			$current, 
        			"condition",
         		lv_condition_1_0, 
-        		"ChainedExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.ChainedExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2310,7 +2310,7 @@ ruleIfExpressionKw returns [EObject current=null]
        			$current, 
        			"thenPart",
         		lv_thenPart_3_0, 
-        		"ChainedExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.ChainedExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2333,7 +2333,7 @@ ruleIfExpressionKw returns [EObject current=null]
        			$current, 
        			"elsePart",
         		lv_elsePart_5_0, 
-        		"ChainedExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.ChainedExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2380,7 +2380,7 @@ ruleSwitchExpression returns [EObject current=null]
        			$current, 
        			"switchExpr",
         		lv_switchExpr_2_0, 
-        		"OrExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.OrExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2406,7 +2406,7 @@ ruleSwitchExpression returns [EObject current=null]
        			$current, 
        			"case",
         		lv_case_5_0, 
-        		"Case");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Case");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2432,7 +2432,7 @@ ruleSwitchExpression returns [EObject current=null]
        			$current, 
        			"defaultExpr",
         		lv_defaultExpr_8_0, 
-        		"OrExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.OrExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2479,7 +2479,7 @@ ruleCase returns [EObject current=null]
        			$current, 
        			"condition",
         		lv_condition_1_0, 
-        		"OrExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.OrExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2501,7 +2501,7 @@ ruleCase returns [EObject current=null]
        			$current, 
        			"thenPar",
         		lv_thenPar_3_0, 
-        		"OrExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.OrExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2570,7 +2570,7 @@ ruleOrExpression returns [EObject current=null]
        			$current, 
        			"right",
         		lv_right_3_0, 
-        		"AndExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.AndExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2639,7 +2639,7 @@ ruleAndExpression returns [EObject current=null]
        			$current, 
        			"right",
         		lv_right_3_0, 
-        		"ImpliesExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.ImpliesExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2708,7 +2708,7 @@ ruleImpliesExpression returns [EObject current=null]
        			$current, 
        			"right",
         		lv_right_3_0, 
-        		"RelationalExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.RelationalExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2840,7 +2840,7 @@ ruleRelationalExpression returns [EObject current=null]
        			$current, 
        			"right",
         		lv_right_3_0, 
-        		"AdditiveExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.AdditiveExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -2924,7 +2924,7 @@ ruleAdditiveExpression returns [EObject current=null]
        			$current, 
        			"params",
         		lv_params_3_0, 
-        		"MultiplicativeExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.MultiplicativeExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3008,7 +3008,7 @@ ruleMultiplicativeExpression returns [EObject current=null]
        			$current, 
        			"params",
         		lv_params_3_0, 
-        		"UnaryOrInfixExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.UnaryOrInfixExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3117,7 +3117,7 @@ ruleUnaryExpression returns [EObject current=null]
        			$current, 
        			"params",
         		lv_params_1_0, 
-        		"InfixExpression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.InfixExpression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3175,7 +3175,7 @@ ruleInfixExpression returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_3_0, 
-        		"Identifier");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3197,7 +3197,7 @@ ruleInfixExpression returns [EObject current=null]
        			$current, 
        			"params",
         		lv_params_5_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3219,7 +3219,7 @@ ruleInfixExpression returns [EObject current=null]
        			$current, 
        			"params",
         		lv_params_7_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3252,7 +3252,7 @@ ruleInfixExpression returns [EObject current=null]
        			$current, 
        			"type",
         		lv_type_11_0, 
-        		"Type");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Type");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3300,7 +3300,7 @@ ruleInfixExpression returns [EObject current=null]
        			$current, 
        			"type",
         		lv_type_16_0, 
-        		"Type");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Type");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3439,7 +3439,7 @@ ruleInfixExpression returns [EObject current=null]
        			$current, 
        			"var",
         		lv_var_22_0, 
-        		"Identifier");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3461,7 +3461,7 @@ ruleInfixExpression returns [EObject current=null]
        			$current, 
        			"exp",
         		lv_exp_24_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3706,7 +3706,7 @@ ruleIntegerLiteral returns [EObject current=null]
        			$current, 
        			"val",
         		lv_val_0_0, 
-        		"INT");
+        		"org.eclipse.xtext.common.Terminals.INT");
 	    }
 
 )
@@ -3781,7 +3781,7 @@ ruleRealLiteral returns [EObject current=null]
        			$current, 
        			"val",
         		lv_val_0_0, 
-        		"REAL");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.REAL");
 	    }
 
 )
@@ -3820,7 +3820,7 @@ ruleStringLiteral returns [EObject current=null]
        			$current, 
        			"val",
         		lv_val_0_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -3900,7 +3900,7 @@ ruleGlobalVarExpression returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"Identifier");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -3949,7 +3949,7 @@ ruleFeatureCall returns [EObject current=null]
        			$current, 
        			"type",
         		lv_type_1_0, 
-        		"Type");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Type");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4008,7 +4008,7 @@ ruleOperationCall returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_0_0, 
-        		"Identifier");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4030,7 +4030,7 @@ ruleOperationCall returns [EObject current=null]
        			$current, 
        			"params",
         		lv_params_2_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4052,7 +4052,7 @@ ruleOperationCall returns [EObject current=null]
        			$current, 
        			"params",
         		lv_params_4_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4105,7 +4105,7 @@ ruleListLiteral returns [EObject current=null]
        			$current, 
        			"elements",
         		lv_elements_2_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4127,7 +4127,7 @@ ruleListLiteral returns [EObject current=null]
        			$current, 
        			"elements",
         		lv_elements_4_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4174,7 +4174,7 @@ ruleConstructorCallExpression returns [EObject current=null]
        			$current, 
        			"type",
         		lv_type_1_0, 
-        		"SimpleType");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.SimpleType");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4232,7 +4232,7 @@ ruleTypeSelectExpression returns [EObject current=null]
        			$current, 
        			"type",
         		lv_type_2_0, 
-        		"Type");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Type");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4381,7 +4381,7 @@ ruleCollectionExpression returns [EObject current=null]
        			$current, 
        			"var",
         		lv_var_2_0, 
-        		"Identifier");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4403,7 +4403,7 @@ ruleCollectionExpression returns [EObject current=null]
        			$current, 
        			"exp",
         		lv_exp_4_0, 
-        		"Expression");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4532,7 +4532,7 @@ ruleCollectionType returns [EObject current=null]
        			$current, 
        			"id1",
         		lv_id1_2_0, 
-        		"SimpleType");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.SimpleType");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4575,7 +4575,7 @@ ruleSimpleType returns [EObject current=null]
        			$current, 
        			"id",
         		lv_id_0_0, 
-        		"Identifier");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -4597,7 +4597,7 @@ ruleSimpleType returns [EObject current=null]
        			$current, 
        			"id",
         		lv_id_2_0, 
-        		"Identifier");
+        		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
 	        afterParserOrEnumRuleCall();
 	    }
 
diff --git a/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScopeLexer.java b/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScopeLexer.java
index bc7605159..7fc7e8c5c 100644
--- a/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScopeLexer.java
+++ b/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScopeLexer.java
@@ -108,15 +108,15 @@ public InternalScopeLexer(CharStream input, RecognizerSharedState state) {
         super(input,state);
 
     }
-    public String getGrammarFileName() { return "../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g"; }
+    public String getGrammarFileName() { return "InternalScope.g"; }
 
     // $ANTLR start "T__12"
     public final void mT__12() throws RecognitionException {
         try {
             int _type = T__12;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:11:7: ( 'scoping' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:11:9: 'scoping'
+            // InternalScope.g:11:7: ( 'scoping' )
+            // InternalScope.g:11:9: 'scoping'
             {
             match("scoping"); 
 
@@ -136,8 +136,8 @@ public final void mT__13() throws RecognitionException {
         try {
             int _type = T__13;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:12:7: ( 'with' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:12:9: 'with'
+            // InternalScope.g:12:7: ( 'with' )
+            // InternalScope.g:12:9: 'with'
             {
             match("with"); 
 
@@ -157,8 +157,8 @@ public final void mT__14() throws RecognitionException {
         try {
             int _type = T__14;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:13:7: ( 'import' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:13:9: 'import'
+            // InternalScope.g:13:7: ( 'import' )
+            // InternalScope.g:13:9: 'import'
             {
             match("import"); 
 
@@ -178,8 +178,8 @@ public final void mT__15() throws RecognitionException {
         try {
             int _type = T__15;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:14:7: ( 'as' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:14:9: 'as'
+            // InternalScope.g:14:7: ( 'as' )
+            // InternalScope.g:14:9: 'as'
             {
             match("as"); 
 
@@ -199,8 +199,8 @@ public final void mT__16() throws RecognitionException {
         try {
             int _type = T__16;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:15:7: ( 'extension' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:15:9: 'extension'
+            // InternalScope.g:15:7: ( 'extension' )
+            // InternalScope.g:15:9: 'extension'
             {
             match("extension"); 
 
@@ -220,8 +220,8 @@ public final void mT__17() throws RecognitionException {
         try {
             int _type = T__17;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:16:7: ( 'inject' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:16:9: 'inject'
+            // InternalScope.g:16:7: ( 'inject' )
+            // InternalScope.g:16:9: 'inject'
             {
             match("inject"); 
 
@@ -241,8 +241,8 @@ public final void mT__18() throws RecognitionException {
         try {
             int _type = T__18;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:17:7: ( 'case' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:17:9: 'case'
+            // InternalScope.g:17:7: ( 'case' )
+            // InternalScope.g:17:9: 'case'
             {
             match("case"); 
 
@@ -262,8 +262,8 @@ public final void mT__19() throws RecognitionException {
         try {
             int _type = T__19;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:18:7: ( 'naming' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:18:9: 'naming'
+            // InternalScope.g:18:7: ( 'naming' )
+            // InternalScope.g:18:9: 'naming'
             {
             match("naming"); 
 
@@ -283,8 +283,8 @@ public final void mT__20() throws RecognitionException {
         try {
             int _type = T__20;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:19:7: ( '{' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:19:9: '{'
+            // InternalScope.g:19:7: ( '{' )
+            // InternalScope.g:19:9: '{'
             {
             match('{'); 
 
@@ -303,8 +303,8 @@ public final void mT__21() throws RecognitionException {
         try {
             int _type = T__21;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:20:7: ( '}' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:20:9: '}'
+            // InternalScope.g:20:7: ( '}' )
+            // InternalScope.g:20:9: '}'
             {
             match('}'); 
 
@@ -323,8 +323,8 @@ public final void mT__22() throws RecognitionException {
         try {
             int _type = T__22;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:21:7: ( '=' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:21:9: '='
+            // InternalScope.g:21:7: ( '=' )
+            // InternalScope.g:21:9: '='
             {
             match('='); 
 
@@ -343,8 +343,8 @@ public final void mT__23() throws RecognitionException {
         try {
             int _type = T__23;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:22:7: ( ';' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:22:9: ';'
+            // InternalScope.g:22:7: ( ';' )
+            // InternalScope.g:22:9: ';'
             {
             match(';'); 
 
@@ -363,8 +363,8 @@ public final void mT__24() throws RecognitionException {
         try {
             int _type = T__24;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:23:7: ( 'scope' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:23:9: 'scope'
+            // InternalScope.g:23:7: ( 'scope' )
+            // InternalScope.g:23:9: 'scope'
             {
             match("scope"); 
 
@@ -384,8 +384,8 @@ public final void mT__25() throws RecognitionException {
         try {
             int _type = T__25;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:24:7: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:24:9: '('
+            // InternalScope.g:24:7: ( '(' )
+            // InternalScope.g:24:9: '('
             {
             match('('); 
 
@@ -404,8 +404,8 @@ public final void mT__26() throws RecognitionException {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:25:7: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:25:9: ')'
+            // InternalScope.g:25:7: ( ')' )
+            // InternalScope.g:25:9: ')'
             {
             match(')'); 
 
@@ -424,8 +424,8 @@ public final void mT__27() throws RecognitionException {
         try {
             int _type = T__27;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:26:7: ( '#' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:26:9: '#'
+            // InternalScope.g:26:7: ( '#' )
+            // InternalScope.g:26:9: '#'
             {
             match('#'); 
 
@@ -444,8 +444,8 @@ public final void mT__28() throws RecognitionException {
         try {
             int _type = T__28;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:27:7: ( 'context' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:27:9: 'context'
+            // InternalScope.g:27:7: ( 'context' )
+            // InternalScope.g:27:9: 'context'
             {
             match("context"); 
 
@@ -465,8 +465,8 @@ public final void mT__29() throws RecognitionException {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:28:7: ( '>>' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:28:9: '>>'
+            // InternalScope.g:28:7: ( '>>' )
+            // InternalScope.g:28:9: '>>'
             {
             match(">>"); 
 
@@ -486,8 +486,8 @@ public final void mT__30() throws RecognitionException {
         try {
             int _type = T__30;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:29:7: ( '*' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:29:9: '*'
+            // InternalScope.g:29:7: ( '*' )
+            // InternalScope.g:29:9: '*'
             {
             match('*'); 
 
@@ -506,8 +506,8 @@ public final void mT__31() throws RecognitionException {
         try {
             int _type = T__31;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:30:7: ( '[' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:30:9: '['
+            // InternalScope.g:30:7: ( '[' )
+            // InternalScope.g:30:9: '['
             {
             match('['); 
 
@@ -526,8 +526,8 @@ public final void mT__32() throws RecognitionException {
         try {
             int _type = T__32;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:31:7: ( ']' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:31:9: ']'
+            // InternalScope.g:31:7: ( ']' )
+            // InternalScope.g:31:9: ']'
             {
             match(']'); 
 
@@ -546,8 +546,8 @@ public final void mT__33() throws RecognitionException {
         try {
             int _type = T__33;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:32:7: ( '|' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:32:9: '|'
+            // InternalScope.g:32:7: ( '|' )
+            // InternalScope.g:32:9: '|'
             {
             match('|'); 
 
@@ -566,8 +566,8 @@ public final void mT__34() throws RecognitionException {
         try {
             int _type = T__34;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:33:7: ( 'factory' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:33:9: 'factory'
+            // InternalScope.g:33:7: ( 'factory' )
+            // InternalScope.g:33:9: 'factory'
             {
             match("factory"); 
 
@@ -587,8 +587,8 @@ public final void mT__35() throws RecognitionException {
         try {
             int _type = T__35;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:34:7: ( 'scopeof' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:34:9: 'scopeof'
+            // InternalScope.g:34:7: ( 'scopeof' )
+            // InternalScope.g:34:9: 'scopeof'
             {
             match("scopeof"); 
 
@@ -608,8 +608,8 @@ public final void mT__36() throws RecognitionException {
         try {
             int _type = T__36;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:35:7: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:35:9: ','
+            // InternalScope.g:35:7: ( ',' )
+            // InternalScope.g:35:9: ','
             {
             match(','); 
 
@@ -628,8 +628,8 @@ public final void mT__37() throws RecognitionException {
         try {
             int _type = T__37;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:36:7: ( 'find' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:36:9: 'find'
+            // InternalScope.g:36:7: ( 'find' )
+            // InternalScope.g:36:9: 'find'
             {
             match("find"); 
 
@@ -649,8 +649,8 @@ public final void mT__38() throws RecognitionException {
         try {
             int _type = T__38;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:37:7: ( 'key' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:37:9: 'key'
+            // InternalScope.g:37:7: ( 'key' )
+            // InternalScope.g:37:9: 'key'
             {
             match("key"); 
 
@@ -670,8 +670,8 @@ public final void mT__39() throws RecognitionException {
         try {
             int _type = T__39;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:38:7: ( 'recursive' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:38:9: 'recursive'
+            // InternalScope.g:38:7: ( 'recursive' )
+            // InternalScope.g:38:9: 'recursive'
             {
             match("recursive"); 
 
@@ -691,8 +691,8 @@ public final void mT__40() throws RecognitionException {
         try {
             int _type = T__40;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:39:7: ( 'prefix' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:39:9: 'prefix'
+            // InternalScope.g:39:7: ( 'prefix' )
+            // InternalScope.g:39:9: 'prefix'
             {
             match("prefix"); 
 
@@ -712,8 +712,8 @@ public final void mT__41() throws RecognitionException {
         try {
             int _type = T__41;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:40:7: ( 'data' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:40:9: 'data'
+            // InternalScope.g:40:7: ( 'data' )
+            // InternalScope.g:40:9: 'data'
             {
             match("data"); 
 
@@ -733,8 +733,8 @@ public final void mT__42() throws RecognitionException {
         try {
             int _type = T__42;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:41:7: ( 'domains' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:41:9: 'domains'
+            // InternalScope.g:41:7: ( 'domains' )
+            // InternalScope.g:41:9: 'domains'
             {
             match("domains"); 
 
@@ -754,8 +754,8 @@ public final void mT__43() throws RecognitionException {
         try {
             int _type = T__43;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:42:7: ( 'export' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:42:9: 'export'
+            // InternalScope.g:42:7: ( 'export' )
+            // InternalScope.g:42:9: 'export'
             {
             match("export"); 
 
@@ -775,8 +775,8 @@ public final void mT__44() throws RecognitionException {
         try {
             int _type = T__44;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:43:7: ( '::' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:43:9: '::'
+            // InternalScope.g:43:7: ( '::' )
+            // InternalScope.g:43:9: '::'
             {
             match("::"); 
 
@@ -796,8 +796,8 @@ public final void mT__45() throws RecognitionException {
         try {
             int _type = T__45;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:44:7: ( '.' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:44:9: '.'
+            // InternalScope.g:44:7: ( '.' )
+            // InternalScope.g:44:9: '.'
             {
             match('.'); 
 
@@ -816,8 +816,8 @@ public final void mT__46() throws RecognitionException {
         try {
             int _type = T__46;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:45:7: ( 'let' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:45:9: 'let'
+            // InternalScope.g:45:7: ( 'let' )
+            // InternalScope.g:45:9: 'let'
             {
             match("let"); 
 
@@ -837,8 +837,8 @@ public final void mT__47() throws RecognitionException {
         try {
             int _type = T__47;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:46:7: ( ':' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:46:9: ':'
+            // InternalScope.g:46:7: ( ':' )
+            // InternalScope.g:46:9: ':'
             {
             match(':'); 
 
@@ -857,8 +857,8 @@ public final void mT__48() throws RecognitionException {
         try {
             int _type = T__48;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:47:7: ( '->' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:47:9: '->'
+            // InternalScope.g:47:7: ( '->' )
+            // InternalScope.g:47:9: '->'
             {
             match("->"); 
 
@@ -878,8 +878,8 @@ public final void mT__49() throws RecognitionException {
         try {
             int _type = T__49;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:48:7: ( '?' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:48:9: '?'
+            // InternalScope.g:48:7: ( '?' )
+            // InternalScope.g:48:9: '?'
             {
             match('?'); 
 
@@ -898,8 +898,8 @@ public final void mT__50() throws RecognitionException {
         try {
             int _type = T__50;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:49:7: ( 'if' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:49:9: 'if'
+            // InternalScope.g:49:7: ( 'if' )
+            // InternalScope.g:49:9: 'if'
             {
             match("if"); 
 
@@ -919,8 +919,8 @@ public final void mT__51() throws RecognitionException {
         try {
             int _type = T__51;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:50:7: ( 'then' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:50:9: 'then'
+            // InternalScope.g:50:7: ( 'then' )
+            // InternalScope.g:50:9: 'then'
             {
             match("then"); 
 
@@ -940,8 +940,8 @@ public final void mT__52() throws RecognitionException {
         try {
             int _type = T__52;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:51:7: ( 'else' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:51:9: 'else'
+            // InternalScope.g:51:7: ( 'else' )
+            // InternalScope.g:51:9: 'else'
             {
             match("else"); 
 
@@ -961,8 +961,8 @@ public final void mT__53() throws RecognitionException {
         try {
             int _type = T__53;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:52:7: ( 'switch' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:52:9: 'switch'
+            // InternalScope.g:52:7: ( 'switch' )
+            // InternalScope.g:52:9: 'switch'
             {
             match("switch"); 
 
@@ -982,8 +982,8 @@ public final void mT__54() throws RecognitionException {
         try {
             int _type = T__54;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:53:7: ( 'default' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:53:9: 'default'
+            // InternalScope.g:53:7: ( 'default' )
+            // InternalScope.g:53:9: 'default'
             {
             match("default"); 
 
@@ -1003,8 +1003,8 @@ public final void mT__55() throws RecognitionException {
         try {
             int _type = T__55;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:54:7: ( '||' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:54:9: '||'
+            // InternalScope.g:54:7: ( '||' )
+            // InternalScope.g:54:9: '||'
             {
             match("||"); 
 
@@ -1024,8 +1024,8 @@ public final void mT__56() throws RecognitionException {
         try {
             int _type = T__56;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:55:7: ( '&&' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:55:9: '&&'
+            // InternalScope.g:55:7: ( '&&' )
+            // InternalScope.g:55:9: '&&'
             {
             match("&&"); 
 
@@ -1045,8 +1045,8 @@ public final void mT__57() throws RecognitionException {
         try {
             int _type = T__57;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:56:7: ( 'implies' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:56:9: 'implies'
+            // InternalScope.g:56:7: ( 'implies' )
+            // InternalScope.g:56:9: 'implies'
             {
             match("implies"); 
 
@@ -1066,8 +1066,8 @@ public final void mT__58() throws RecognitionException {
         try {
             int _type = T__58;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:57:7: ( '==' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:57:9: '=='
+            // InternalScope.g:57:7: ( '==' )
+            // InternalScope.g:57:9: '=='
             {
             match("=="); 
 
@@ -1087,8 +1087,8 @@ public final void mT__59() throws RecognitionException {
         try {
             int _type = T__59;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:58:7: ( '!=' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:58:9: '!='
+            // InternalScope.g:58:7: ( '!=' )
+            // InternalScope.g:58:9: '!='
             {
             match("!="); 
 
@@ -1108,8 +1108,8 @@ public final void mT__60() throws RecognitionException {
         try {
             int _type = T__60;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:59:7: ( '>=' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:59:9: '>='
+            // InternalScope.g:59:7: ( '>=' )
+            // InternalScope.g:59:9: '>='
             {
             match(">="); 
 
@@ -1129,8 +1129,8 @@ public final void mT__61() throws RecognitionException {
         try {
             int _type = T__61;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:60:7: ( '<=' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:60:9: '<='
+            // InternalScope.g:60:7: ( '<=' )
+            // InternalScope.g:60:9: '<='
             {
             match("<="); 
 
@@ -1150,8 +1150,8 @@ public final void mT__62() throws RecognitionException {
         try {
             int _type = T__62;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:61:7: ( '>' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:61:9: '>'
+            // InternalScope.g:61:7: ( '>' )
+            // InternalScope.g:61:9: '>'
             {
             match('>'); 
 
@@ -1170,8 +1170,8 @@ public final void mT__63() throws RecognitionException {
         try {
             int _type = T__63;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:62:7: ( '<' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:62:9: '<'
+            // InternalScope.g:62:7: ( '<' )
+            // InternalScope.g:62:9: '<'
             {
             match('<'); 
 
@@ -1190,8 +1190,8 @@ public final void mT__64() throws RecognitionException {
         try {
             int _type = T__64;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:63:7: ( '+' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:63:9: '+'
+            // InternalScope.g:63:7: ( '+' )
+            // InternalScope.g:63:9: '+'
             {
             match('+'); 
 
@@ -1210,8 +1210,8 @@ public final void mT__65() throws RecognitionException {
         try {
             int _type = T__65;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:64:7: ( '-' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:64:9: '-'
+            // InternalScope.g:64:7: ( '-' )
+            // InternalScope.g:64:9: '-'
             {
             match('-'); 
 
@@ -1230,8 +1230,8 @@ public final void mT__66() throws RecognitionException {
         try {
             int _type = T__66;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:65:7: ( '/' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:65:9: '/'
+            // InternalScope.g:65:7: ( '/' )
+            // InternalScope.g:65:9: '/'
             {
             match('/'); 
 
@@ -1250,8 +1250,8 @@ public final void mT__67() throws RecognitionException {
         try {
             int _type = T__67;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:66:7: ( '!' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:66:9: '!'
+            // InternalScope.g:66:7: ( '!' )
+            // InternalScope.g:66:9: '!'
             {
             match('!'); 
 
@@ -1270,8 +1270,8 @@ public final void mT__68() throws RecognitionException {
         try {
             int _type = T__68;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:67:7: ( 'typeSelect' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:67:9: 'typeSelect'
+            // InternalScope.g:67:7: ( 'typeSelect' )
+            // InternalScope.g:67:9: 'typeSelect'
             {
             match("typeSelect"); 
 
@@ -1291,8 +1291,8 @@ public final void mT__69() throws RecognitionException {
         try {
             int _type = T__69;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:68:7: ( 'collect' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:68:9: 'collect'
+            // InternalScope.g:68:7: ( 'collect' )
+            // InternalScope.g:68:9: 'collect'
             {
             match("collect"); 
 
@@ -1312,8 +1312,8 @@ public final void mT__70() throws RecognitionException {
         try {
             int _type = T__70;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:69:7: ( 'select' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:69:9: 'select'
+            // InternalScope.g:69:7: ( 'select' )
+            // InternalScope.g:69:9: 'select'
             {
             match("select"); 
 
@@ -1333,8 +1333,8 @@ public final void mT__71() throws RecognitionException {
         try {
             int _type = T__71;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:70:7: ( 'selectFirst' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:70:9: 'selectFirst'
+            // InternalScope.g:70:7: ( 'selectFirst' )
+            // InternalScope.g:70:9: 'selectFirst'
             {
             match("selectFirst"); 
 
@@ -1354,8 +1354,8 @@ public final void mT__72() throws RecognitionException {
         try {
             int _type = T__72;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:71:7: ( 'reject' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:71:9: 'reject'
+            // InternalScope.g:71:7: ( 'reject' )
+            // InternalScope.g:71:9: 'reject'
             {
             match("reject"); 
 
@@ -1375,8 +1375,8 @@ public final void mT__73() throws RecognitionException {
         try {
             int _type = T__73;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:72:7: ( 'exists' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:72:9: 'exists'
+            // InternalScope.g:72:7: ( 'exists' )
+            // InternalScope.g:72:9: 'exists'
             {
             match("exists"); 
 
@@ -1396,8 +1396,8 @@ public final void mT__74() throws RecognitionException {
         try {
             int _type = T__74;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:73:7: ( 'notExists' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:73:9: 'notExists'
+            // InternalScope.g:73:7: ( 'notExists' )
+            // InternalScope.g:73:9: 'notExists'
             {
             match("notExists"); 
 
@@ -1417,8 +1417,8 @@ public final void mT__75() throws RecognitionException {
         try {
             int _type = T__75;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:74:7: ( 'sortBy' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:74:9: 'sortBy'
+            // InternalScope.g:74:7: ( 'sortBy' )
+            // InternalScope.g:74:9: 'sortBy'
             {
             match("sortBy"); 
 
@@ -1438,8 +1438,8 @@ public final void mT__76() throws RecognitionException {
         try {
             int _type = T__76;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:75:7: ( 'forAll' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:75:9: 'forAll'
+            // InternalScope.g:75:7: ( 'forAll' )
+            // InternalScope.g:75:9: 'forAll'
             {
             match("forAll"); 
 
@@ -1459,8 +1459,8 @@ public final void mT__77() throws RecognitionException {
         try {
             int _type = T__77;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:76:7: ( 'true' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:76:9: 'true'
+            // InternalScope.g:76:7: ( 'true' )
+            // InternalScope.g:76:9: 'true'
             {
             match("true"); 
 
@@ -1480,8 +1480,8 @@ public final void mT__78() throws RecognitionException {
         try {
             int _type = T__78;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:77:7: ( 'false' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:77:9: 'false'
+            // InternalScope.g:77:7: ( 'false' )
+            // InternalScope.g:77:9: 'false'
             {
             match("false"); 
 
@@ -1501,8 +1501,8 @@ public final void mT__79() throws RecognitionException {
         try {
             int _type = T__79;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:78:7: ( 'null' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:78:9: 'null'
+            // InternalScope.g:78:7: ( 'null' )
+            // InternalScope.g:78:9: 'null'
             {
             match("null"); 
 
@@ -1522,8 +1522,8 @@ public final void mT__80() throws RecognitionException {
         try {
             int _type = T__80;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:79:7: ( 'GLOBALVAR' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:79:9: 'GLOBALVAR'
+            // InternalScope.g:79:7: ( 'GLOBALVAR' )
+            // InternalScope.g:79:9: 'GLOBALVAR'
             {
             match("GLOBALVAR"); 
 
@@ -1543,8 +1543,8 @@ public final void mT__81() throws RecognitionException {
         try {
             int _type = T__81;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:80:7: ( 'new' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:80:9: 'new'
+            // InternalScope.g:80:7: ( 'new' )
+            // InternalScope.g:80:9: 'new'
             {
             match("new"); 
 
@@ -1564,8 +1564,8 @@ public final void mT__82() throws RecognitionException {
         try {
             int _type = T__82;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:81:7: ( 'Collection' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:81:9: 'Collection'
+            // InternalScope.g:81:7: ( 'Collection' )
+            // InternalScope.g:81:9: 'Collection'
             {
             match("Collection"); 
 
@@ -1585,8 +1585,8 @@ public final void mT__83() throws RecognitionException {
         try {
             int _type = T__83;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:82:7: ( 'List' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:82:9: 'List'
+            // InternalScope.g:82:7: ( 'List' )
+            // InternalScope.g:82:9: 'List'
             {
             match("List"); 
 
@@ -1606,8 +1606,8 @@ public final void mT__84() throws RecognitionException {
         try {
             int _type = T__84;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:83:7: ( 'Set' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:83:9: 'Set'
+            // InternalScope.g:83:7: ( 'Set' )
+            // InternalScope.g:83:9: 'Set'
             {
             match("Set"); 
 
@@ -1627,8 +1627,8 @@ public final void mT__85() throws RecognitionException {
         try {
             int _type = T__85;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:84:7: ( 'sensitive' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:84:9: 'sensitive'
+            // InternalScope.g:84:7: ( 'sensitive' )
+            // InternalScope.g:84:9: 'sensitive'
             {
             match("sensitive"); 
 
@@ -1648,8 +1648,8 @@ public final void mT__86() throws RecognitionException {
         try {
             int _type = T__86;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:85:7: ( 'insensitive' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:85:9: 'insensitive'
+            // InternalScope.g:85:7: ( 'insensitive' )
+            // InternalScope.g:85:9: 'insensitive'
             {
             match("insensitive"); 
 
@@ -1669,10 +1669,10 @@ public final void mRULE_REAL() throws RecognitionException {
         try {
             int _type = RULE_REAL;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4659:11: ( ( '0' .. '9' )* '.' ( '0' .. '9' )* )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4659:13: ( '0' .. '9' )* '.' ( '0' .. '9' )*
+            // InternalScope.g:4659:11: ( ( '0' .. '9' )* '.' ( '0' .. '9' )* )
+            // InternalScope.g:4659:13: ( '0' .. '9' )* '.' ( '0' .. '9' )*
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4659:13: ( '0' .. '9' )*
+            // InternalScope.g:4659:13: ( '0' .. '9' )*
             loop1:
             do {
                 int alt1=2;
@@ -1685,7 +1685,7 @@ public final void mRULE_REAL() throws RecognitionException {
 
                 switch (alt1) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4659:14: '0' .. '9'
+            	    // InternalScope.g:4659:14: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -1698,7 +1698,7 @@ public final void mRULE_REAL() throws RecognitionException {
             } while (true);
 
             match('.'); 
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4659:29: ( '0' .. '9' )*
+            // InternalScope.g:4659:29: ( '0' .. '9' )*
             loop2:
             do {
                 int alt2=2;
@@ -1711,7 +1711,7 @@ public final void mRULE_REAL() throws RecognitionException {
 
                 switch (alt2) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4659:30: '0' .. '9'
+            	    // InternalScope.g:4659:30: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -1739,10 +1739,10 @@ public final void mRULE_ID() throws RecognitionException {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4661:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4661:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalScope.g:4661:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+            // InternalScope.g:4661:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4661:11: ( '^' )?
+            // InternalScope.g:4661:11: ( '^' )?
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -1751,7 +1751,7 @@ public final void mRULE_ID() throws RecognitionException {
             }
             switch (alt3) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4661:11: '^'
+                    // InternalScope.g:4661:11: '^'
                     {
                     match('^'); 
 
@@ -1769,7 +1769,7 @@ public final void mRULE_ID() throws RecognitionException {
                 recover(mse);
                 throw mse;}
 
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4661:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalScope.g:4661:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             loop4:
             do {
                 int alt4=2;
@@ -1782,7 +1782,7 @@ public final void mRULE_ID() throws RecognitionException {
 
                 switch (alt4) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:
+            	    // InternalScope.g:
             	    {
             	    if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
             	        input.consume();
@@ -1818,10 +1818,10 @@ public final void mRULE_INT() throws RecognitionException {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4663:10: ( ( '0' .. '9' )+ )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4663:12: ( '0' .. '9' )+
+            // InternalScope.g:4663:10: ( ( '0' .. '9' )+ )
+            // InternalScope.g:4663:12: ( '0' .. '9' )+
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4663:12: ( '0' .. '9' )+
+            // InternalScope.g:4663:12: ( '0' .. '9' )+
             int cnt5=0;
             loop5:
             do {
@@ -1835,7 +1835,7 @@ public final void mRULE_INT() throws RecognitionException {
 
                 switch (alt5) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4663:13: '0' .. '9'
+            	    // InternalScope.g:4663:13: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -1867,10 +1867,10 @@ public final void mRULE_STRING() throws RecognitionException {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4665:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4665:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalScope.g:4665:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+            // InternalScope.g:4665:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4665:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalScope.g:4665:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             int alt8=2;
             int LA8_0 = input.LA(1);
 
@@ -1888,10 +1888,10 @@ else if ( (LA8_0=='\'') ) {
             }
             switch (alt8) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4665:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+                    // InternalScope.g:4665:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
                     {
                     match('\"'); 
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4665:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // InternalScope.g:4665:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop6:
                     do {
                         int alt6=3;
@@ -1907,7 +1907,7 @@ else if ( ((LA6_0>='\u0000' && LA6_0<='!')||(LA6_0>='#' && LA6_0<='[')||(LA6_0>=
 
                         switch (alt6) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4665:21: '\\\\' .
+                    	    // InternalScope.g:4665:21: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -1915,7 +1915,7 @@ else if ( ((LA6_0>='\u0000' && LA6_0<='!')||(LA6_0>='#' && LA6_0<='[')||(LA6_0>=
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4665:28: ~ ( ( '\\\\' | '\"' ) )
+                    	    // InternalScope.g:4665:28: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -1940,10 +1940,10 @@ else if ( ((LA6_0>='\u0000' && LA6_0<='!')||(LA6_0>='#' && LA6_0<='[')||(LA6_0>=
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4665:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+                    // InternalScope.g:4665:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
                     {
                     match('\''); 
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4665:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // InternalScope.g:4665:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop7:
                     do {
                         int alt7=3;
@@ -1959,7 +1959,7 @@ else if ( ((LA7_0>='\u0000' && LA7_0<='&')||(LA7_0>='(' && LA7_0<='[')||(LA7_0>=
 
                         switch (alt7) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4665:54: '\\\\' .
+                    	    // InternalScope.g:4665:54: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -1967,7 +1967,7 @@ else if ( ((LA7_0>='\u0000' && LA7_0<='&')||(LA7_0>='(' && LA7_0<='[')||(LA7_0>=
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4665:61: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // InternalScope.g:4665:61: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -2010,12 +2010,12 @@ public final void mRULE_ML_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4667:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4667:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalScope.g:4667:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalScope.g:4667:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4667:24: ( options {greedy=false; } : . )*
+            // InternalScope.g:4667:24: ( options {greedy=false; } : . )*
             loop9:
             do {
                 int alt9=2;
@@ -2040,7 +2040,7 @@ else if ( ((LA9_0>='\u0000' && LA9_0<=')')||(LA9_0>='+' && LA9_0<='\uFFFF')) ) {
 
                 switch (alt9) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4667:52: .
+            	    // InternalScope.g:4667:52: .
             	    {
             	    matchAny(); 
 
@@ -2070,12 +2070,12 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4669:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4669:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalScope.g:4669:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalScope.g:4669:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4669:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // InternalScope.g:4669:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop10:
             do {
                 int alt10=2;
@@ -2088,7 +2088,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
 
                 switch (alt10) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4669:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // InternalScope.g:4669:24: ~ ( ( '\\n' | '\\r' ) )
             	    {
             	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
             	        input.consume();
@@ -2108,7 +2108,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
                 }
             } while (true);
 
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4669:40: ( ( '\\r' )? '\\n' )?
+            // InternalScope.g:4669:40: ( ( '\\r' )? '\\n' )?
             int alt12=2;
             int LA12_0 = input.LA(1);
 
@@ -2117,9 +2117,9 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
             }
             switch (alt12) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4669:41: ( '\\r' )? '\\n'
+                    // InternalScope.g:4669:41: ( '\\r' )? '\\n'
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4669:41: ( '\\r' )?
+                    // InternalScope.g:4669:41: ( '\\r' )?
                     int alt11=2;
                     int LA11_0 = input.LA(1);
 
@@ -2128,7 +2128,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
                     }
                     switch (alt11) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4669:41: '\\r'
+                            // InternalScope.g:4669:41: '\\r'
                             {
                             match('\r'); 
 
@@ -2160,10 +2160,10 @@ public final void mRULE_WS() throws RecognitionException {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4671:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4671:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalScope.g:4671:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalScope.g:4671:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4671:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalScope.g:4671:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt13=0;
             loop13:
             do {
@@ -2177,7 +2177,7 @@ public final void mRULE_WS() throws RecognitionException {
 
                 switch (alt13) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:
+            	    // InternalScope.g:
             	    {
             	    if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
             	        input.consume();
@@ -2217,8 +2217,8 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4673:16: ( . )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4673:18: .
+            // InternalScope.g:4673:16: ( . )
+            // InternalScope.g:4673:18: .
             {
             matchAny(); 
 
@@ -2233,586 +2233,586 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:8: ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | RULE_REAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        // InternalScope.g:1:8: ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | RULE_REAL | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
         int alt14=83;
         alt14 = dfa14.predict(input);
         switch (alt14) {
             case 1 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:10: T__12
+                // InternalScope.g:1:10: T__12
                 {
                 mT__12(); 
 
                 }
                 break;
             case 2 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:16: T__13
+                // InternalScope.g:1:16: T__13
                 {
                 mT__13(); 
 
                 }
                 break;
             case 3 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:22: T__14
+                // InternalScope.g:1:22: T__14
                 {
                 mT__14(); 
 
                 }
                 break;
             case 4 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:28: T__15
+                // InternalScope.g:1:28: T__15
                 {
                 mT__15(); 
 
                 }
                 break;
             case 5 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:34: T__16
+                // InternalScope.g:1:34: T__16
                 {
                 mT__16(); 
 
                 }
                 break;
             case 6 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:40: T__17
+                // InternalScope.g:1:40: T__17
                 {
                 mT__17(); 
 
                 }
                 break;
             case 7 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:46: T__18
+                // InternalScope.g:1:46: T__18
                 {
                 mT__18(); 
 
                 }
                 break;
             case 8 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:52: T__19
+                // InternalScope.g:1:52: T__19
                 {
                 mT__19(); 
 
                 }
                 break;
             case 9 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:58: T__20
+                // InternalScope.g:1:58: T__20
                 {
                 mT__20(); 
 
                 }
                 break;
             case 10 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:64: T__21
+                // InternalScope.g:1:64: T__21
                 {
                 mT__21(); 
 
                 }
                 break;
             case 11 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:70: T__22
+                // InternalScope.g:1:70: T__22
                 {
                 mT__22(); 
 
                 }
                 break;
             case 12 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:76: T__23
+                // InternalScope.g:1:76: T__23
                 {
                 mT__23(); 
 
                 }
                 break;
             case 13 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:82: T__24
+                // InternalScope.g:1:82: T__24
                 {
                 mT__24(); 
 
                 }
                 break;
             case 14 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:88: T__25
+                // InternalScope.g:1:88: T__25
                 {
                 mT__25(); 
 
                 }
                 break;
             case 15 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:94: T__26
+                // InternalScope.g:1:94: T__26
                 {
                 mT__26(); 
 
                 }
                 break;
             case 16 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:100: T__27
+                // InternalScope.g:1:100: T__27
                 {
                 mT__27(); 
 
                 }
                 break;
             case 17 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:106: T__28
+                // InternalScope.g:1:106: T__28
                 {
                 mT__28(); 
 
                 }
                 break;
             case 18 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:112: T__29
+                // InternalScope.g:1:112: T__29
                 {
                 mT__29(); 
 
                 }
                 break;
             case 19 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:118: T__30
+                // InternalScope.g:1:118: T__30
                 {
                 mT__30(); 
 
                 }
                 break;
             case 20 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:124: T__31
+                // InternalScope.g:1:124: T__31
                 {
                 mT__31(); 
 
                 }
                 break;
             case 21 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:130: T__32
+                // InternalScope.g:1:130: T__32
                 {
                 mT__32(); 
 
                 }
                 break;
             case 22 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:136: T__33
+                // InternalScope.g:1:136: T__33
                 {
                 mT__33(); 
 
                 }
                 break;
             case 23 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:142: T__34
+                // InternalScope.g:1:142: T__34
                 {
                 mT__34(); 
 
                 }
                 break;
             case 24 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:148: T__35
+                // InternalScope.g:1:148: T__35
                 {
                 mT__35(); 
 
                 }
                 break;
             case 25 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:154: T__36
+                // InternalScope.g:1:154: T__36
                 {
                 mT__36(); 
 
                 }
                 break;
             case 26 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:160: T__37
+                // InternalScope.g:1:160: T__37
                 {
                 mT__37(); 
 
                 }
                 break;
             case 27 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:166: T__38
+                // InternalScope.g:1:166: T__38
                 {
                 mT__38(); 
 
                 }
                 break;
             case 28 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:172: T__39
+                // InternalScope.g:1:172: T__39
                 {
                 mT__39(); 
 
                 }
                 break;
             case 29 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:178: T__40
+                // InternalScope.g:1:178: T__40
                 {
                 mT__40(); 
 
                 }
                 break;
             case 30 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:184: T__41
+                // InternalScope.g:1:184: T__41
                 {
                 mT__41(); 
 
                 }
                 break;
             case 31 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:190: T__42
+                // InternalScope.g:1:190: T__42
                 {
                 mT__42(); 
 
                 }
                 break;
             case 32 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:196: T__43
+                // InternalScope.g:1:196: T__43
                 {
                 mT__43(); 
 
                 }
                 break;
             case 33 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:202: T__44
+                // InternalScope.g:1:202: T__44
                 {
                 mT__44(); 
 
                 }
                 break;
             case 34 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:208: T__45
+                // InternalScope.g:1:208: T__45
                 {
                 mT__45(); 
 
                 }
                 break;
             case 35 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:214: T__46
+                // InternalScope.g:1:214: T__46
                 {
                 mT__46(); 
 
                 }
                 break;
             case 36 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:220: T__47
+                // InternalScope.g:1:220: T__47
                 {
                 mT__47(); 
 
                 }
                 break;
             case 37 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:226: T__48
+                // InternalScope.g:1:226: T__48
                 {
                 mT__48(); 
 
                 }
                 break;
             case 38 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:232: T__49
+                // InternalScope.g:1:232: T__49
                 {
                 mT__49(); 
 
                 }
                 break;
             case 39 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:238: T__50
+                // InternalScope.g:1:238: T__50
                 {
                 mT__50(); 
 
                 }
                 break;
             case 40 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:244: T__51
+                // InternalScope.g:1:244: T__51
                 {
                 mT__51(); 
 
                 }
                 break;
             case 41 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:250: T__52
+                // InternalScope.g:1:250: T__52
                 {
                 mT__52(); 
 
                 }
                 break;
             case 42 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:256: T__53
+                // InternalScope.g:1:256: T__53
                 {
                 mT__53(); 
 
                 }
                 break;
             case 43 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:262: T__54
+                // InternalScope.g:1:262: T__54
                 {
                 mT__54(); 
 
                 }
                 break;
             case 44 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:268: T__55
+                // InternalScope.g:1:268: T__55
                 {
                 mT__55(); 
 
                 }
                 break;
             case 45 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:274: T__56
+                // InternalScope.g:1:274: T__56
                 {
                 mT__56(); 
 
                 }
                 break;
             case 46 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:280: T__57
+                // InternalScope.g:1:280: T__57
                 {
                 mT__57(); 
 
                 }
                 break;
             case 47 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:286: T__58
+                // InternalScope.g:1:286: T__58
                 {
                 mT__58(); 
 
                 }
                 break;
             case 48 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:292: T__59
+                // InternalScope.g:1:292: T__59
                 {
                 mT__59(); 
 
                 }
                 break;
             case 49 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:298: T__60
+                // InternalScope.g:1:298: T__60
                 {
                 mT__60(); 
 
                 }
                 break;
             case 50 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:304: T__61
+                // InternalScope.g:1:304: T__61
                 {
                 mT__61(); 
 
                 }
                 break;
             case 51 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:310: T__62
+                // InternalScope.g:1:310: T__62
                 {
                 mT__62(); 
 
                 }
                 break;
             case 52 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:316: T__63
+                // InternalScope.g:1:316: T__63
                 {
                 mT__63(); 
 
                 }
                 break;
             case 53 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:322: T__64
+                // InternalScope.g:1:322: T__64
                 {
                 mT__64(); 
 
                 }
                 break;
             case 54 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:328: T__65
+                // InternalScope.g:1:328: T__65
                 {
                 mT__65(); 
 
                 }
                 break;
             case 55 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:334: T__66
+                // InternalScope.g:1:334: T__66
                 {
                 mT__66(); 
 
                 }
                 break;
             case 56 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:340: T__67
+                // InternalScope.g:1:340: T__67
                 {
                 mT__67(); 
 
                 }
                 break;
             case 57 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:346: T__68
+                // InternalScope.g:1:346: T__68
                 {
                 mT__68(); 
 
                 }
                 break;
             case 58 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:352: T__69
+                // InternalScope.g:1:352: T__69
                 {
                 mT__69(); 
 
                 }
                 break;
             case 59 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:358: T__70
+                // InternalScope.g:1:358: T__70
                 {
                 mT__70(); 
 
                 }
                 break;
             case 60 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:364: T__71
+                // InternalScope.g:1:364: T__71
                 {
                 mT__71(); 
 
                 }
                 break;
             case 61 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:370: T__72
+                // InternalScope.g:1:370: T__72
                 {
                 mT__72(); 
 
                 }
                 break;
             case 62 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:376: T__73
+                // InternalScope.g:1:376: T__73
                 {
                 mT__73(); 
 
                 }
                 break;
             case 63 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:382: T__74
+                // InternalScope.g:1:382: T__74
                 {
                 mT__74(); 
 
                 }
                 break;
             case 64 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:388: T__75
+                // InternalScope.g:1:388: T__75
                 {
                 mT__75(); 
 
                 }
                 break;
             case 65 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:394: T__76
+                // InternalScope.g:1:394: T__76
                 {
                 mT__76(); 
 
                 }
                 break;
             case 66 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:400: T__77
+                // InternalScope.g:1:400: T__77
                 {
                 mT__77(); 
 
                 }
                 break;
             case 67 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:406: T__78
+                // InternalScope.g:1:406: T__78
                 {
                 mT__78(); 
 
                 }
                 break;
             case 68 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:412: T__79
+                // InternalScope.g:1:412: T__79
                 {
                 mT__79(); 
 
                 }
                 break;
             case 69 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:418: T__80
+                // InternalScope.g:1:418: T__80
                 {
                 mT__80(); 
 
                 }
                 break;
             case 70 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:424: T__81
+                // InternalScope.g:1:424: T__81
                 {
                 mT__81(); 
 
                 }
                 break;
             case 71 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:430: T__82
+                // InternalScope.g:1:430: T__82
                 {
                 mT__82(); 
 
                 }
                 break;
             case 72 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:436: T__83
+                // InternalScope.g:1:436: T__83
                 {
                 mT__83(); 
 
                 }
                 break;
             case 73 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:442: T__84
+                // InternalScope.g:1:442: T__84
                 {
                 mT__84(); 
 
                 }
                 break;
             case 74 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:448: T__85
+                // InternalScope.g:1:448: T__85
                 {
                 mT__85(); 
 
                 }
                 break;
             case 75 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:454: T__86
+                // InternalScope.g:1:454: T__86
                 {
                 mT__86(); 
 
                 }
                 break;
             case 76 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:460: RULE_REAL
+                // InternalScope.g:1:460: RULE_REAL
                 {
                 mRULE_REAL(); 
 
                 }
                 break;
             case 77 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:470: RULE_ID
+                // InternalScope.g:1:470: RULE_ID
                 {
                 mRULE_ID(); 
 
                 }
                 break;
             case 78 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:478: RULE_INT
+                // InternalScope.g:1:478: RULE_INT
                 {
                 mRULE_INT(); 
 
                 }
                 break;
             case 79 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:487: RULE_STRING
+                // InternalScope.g:1:487: RULE_STRING
                 {
                 mRULE_STRING(); 
 
                 }
                 break;
             case 80 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:499: RULE_ML_COMMENT
+                // InternalScope.g:1:499: RULE_ML_COMMENT
                 {
                 mRULE_ML_COMMENT(); 
 
                 }
                 break;
             case 81 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:515: RULE_SL_COMMENT
+                // InternalScope.g:1:515: RULE_SL_COMMENT
                 {
                 mRULE_SL_COMMENT(); 
 
                 }
                 break;
             case 82 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:531: RULE_WS
+                // InternalScope.g:1:531: RULE_WS
                 {
                 mRULE_WS(); 
 
                 }
                 break;
             case 83 :
-                // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1:539: RULE_ANY_OTHER
+                // InternalScope.g:1:539: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -2826,103 +2826,19 @@ public void mTokens() throws RecognitionException {
 
     protected DFA14 dfa14 = new DFA14(this);
     static final String DFA14_eotS =
-        "\1\uffff\7\64\2\uffff\1\105\4\uffff\1\114\3\uffff\1\121\1\64\1"+
-        "\uffff\4\64\1\135\1\136\1\64\1\142\1\uffff\1\64\1\57\1\151\1\153"+
-        "\1\uffff\1\157\4\64\1\164\1\57\1\uffff\2\57\2\uffff\4\64\1\uffff"+
-        "\3\64\1\u0081\1\u0082\10\64\20\uffff\3\64\1\uffff\6\64\4\uffff\1"+
-        "\64\3\uffff\3\64\11\uffff\4\64\1\uffff\1\164\2\uffff\11\64\2\uffff"+
-        "\12\64\1\u00b5\4\64\1\u00ba\6\64\1\u00c1\6\64\1\u00c8\5\64\1\u00cf"+
-        "\7\64\1\u00d7\1\u00d8\4\64\1\u00dd\1\uffff\2\64\1\u00e0\1\64\1\uffff"+
-        "\3\64\1\u00e5\2\64\1\uffff\1\u00e8\1\64\1\u00ea\2\64\1\u00ed\1\uffff"+
-        "\1\64\1\u00f0\4\64\1\uffff\7\64\2\uffff\4\64\1\uffff\1\64\1\u0101"+
-        "\1\uffff\4\64\1\uffff\2\64\1\uffff\1\64\1\uffff\2\64\1\uffff\2\64"+
-        "\1\uffff\1\u010d\1\u010f\1\64\1\u0111\1\u0112\1\64\1\u0114\2\64"+
-        "\1\u0117\1\u0118\2\64\1\u011b\2\64\1\uffff\1\u011e\1\64\1\u0120"+
-        "\1\u0121\5\64\1\u0127\1\u0128\1\uffff\1\64\1\uffff\1\64\2\uffff"+
-        "\1\u012b\1\uffff\2\64\2\uffff\1\u012e\1\u012f\1\uffff\1\64\1\u0131"+
-        "\1\uffff\1\64\2\uffff\1\u0133\1\u0134\3\64\2\uffff\2\64\1\uffff"+
-        "\2\64\2\uffff\1\64\1\uffff\1\64\2\uffff\4\64\1\u0142\1\64\1\u0144"+
-        "\1\u0145\1\u0146\1\64\1\u0148\2\64\1\uffff\1\64\3\uffff\1\u014c"+
-        "\1\uffff\1\u014d\1\u014e\1\u014f\4\uffff";
+        "\1\uffff\7\64\2\uffff\1\105\4\uffff\1\114\3\uffff\1\121\1\64\1\uffff\4\64\1\135\1\136\1\64\1\142\1\uffff\1\64\1\57\1\151\1\153\1\uffff\1\157\4\64\1\164\1\57\1\uffff\2\57\2\uffff\4\64\1\uffff\3\64\1\u0081\1\u0082\10\64\20\uffff\3\64\1\uffff\6\64\4\uffff\1\64\3\uffff\3\64\11\uffff\4\64\1\uffff\1\164\2\uffff\11\64\2\uffff\12\64\1\u00b5\4\64\1\u00ba\6\64\1\u00c1\6\64\1\u00c8\5\64\1\u00cf\7\64\1\u00d7\1\u00d8\4\64\1\u00dd\1\uffff\2\64\1\u00e0\1\64\1\uffff\3\64\1\u00e5\2\64\1\uffff\1\u00e8\1\64\1\u00ea\2\64\1\u00ed\1\uffff\1\64\1\u00f0\4\64\1\uffff\7\64\2\uffff\4\64\1\uffff\1\64\1\u0101\1\uffff\4\64\1\uffff\2\64\1\uffff\1\64\1\uffff\2\64\1\uffff\2\64\1\uffff\1\u010d\1\u010f\1\64\1\u0111\1\u0112\1\64\1\u0114\2\64\1\u0117\1\u0118\2\64\1\u011b\2\64\1\uffff\1\u011e\1\64\1\u0120\1\u0121\5\64\1\u0127\1\u0128\1\uffff\1\64\1\uffff\1\64\2\uffff\1\u012b\1\uffff\2\64\2\uffff\1\u012e\1\u012f\1\uffff\1\64\1\u0131\1\uffff\1\64\2\uffff\1\u0133\1\u0134\3\64\2\uffff\2\64\1\uffff\2\64\2\uffff\1\64\1\uffff\1\64\2\uffff\4\64\1\u0142\1\64\1\u0144\1\u0145\1\u0146\1\64\1\u0148\2\64\1\uffff\1\64\3\uffff\1\u014c\1\uffff\1\u014d\1\u014e\1\u014f\4\uffff";
     static final String DFA14_eofS =
         "\u0150\uffff";
     static final String DFA14_minS =
-        "\1\0\1\143\1\151\1\146\1\163\1\154\2\141\2\uffff\1\75\4\uffff\1"+
-        "\75\3\uffff\1\174\1\141\1\uffff\2\145\1\162\1\141\1\72\1\60\1\145"+
-        "\1\76\1\uffff\1\150\1\46\2\75\1\uffff\1\52\1\114\1\157\1\151\1\145"+
-        "\1\56\1\101\1\uffff\2\0\2\uffff\1\157\1\151\1\154\1\162\1\uffff"+
-        "\1\164\1\160\1\152\2\60\1\151\2\163\1\154\1\155\1\164\1\154\1\167"+
-        "\20\uffff\1\143\1\156\1\162\1\uffff\1\171\1\143\1\145\1\164\1\155"+
-        "\1\146\4\uffff\1\164\3\uffff\1\145\1\160\1\165\11\uffff\1\117\1"+
-        "\154\1\163\1\164\1\uffff\1\56\2\uffff\1\160\1\164\1\145\1\163\1"+
-        "\164\1\150\1\154\2\145\2\uffff\1\145\1\157\1\163\2\145\1\164\1\154"+
-        "\1\151\1\105\1\154\1\60\1\164\1\163\1\144\1\101\1\60\1\165\1\145"+
-        "\1\146\3\141\1\60\1\156\2\145\1\102\1\154\1\164\1\60\1\145\2\143"+
-        "\1\151\1\102\1\60\1\162\1\151\1\143\2\156\1\162\1\164\2\60\2\145"+
-        "\1\156\1\170\1\60\1\uffff\1\157\1\145\1\60\1\154\1\uffff\1\162\1"+
-        "\143\1\151\1\60\1\151\1\165\1\uffff\1\60\1\123\1\60\1\101\1\145"+
-        "\1\60\1\uffff\1\156\1\60\1\150\2\164\1\171\1\uffff\1\164\1\145\1"+
-        "\164\2\163\1\164\1\163\2\uffff\1\170\1\143\1\147\1\151\1\uffff\1"+
-        "\162\1\60\1\uffff\1\154\1\163\1\164\1\170\1\uffff\1\156\1\154\1"+
-        "\uffff\1\145\1\uffff\1\114\1\143\1\uffff\1\147\1\146\1\uffff\2\60"+
-        "\1\151\2\60\1\163\1\60\2\151\2\60\2\164\1\60\1\163\1\171\1\uffff"+
-        "\1\60\1\151\2\60\1\163\1\164\1\154\1\126\1\164\2\60\1\uffff\1\151"+
-        "\1\uffff\1\166\2\uffff\1\60\1\uffff\1\164\1\157\2\uffff\2\60\1\uffff"+
-        "\1\164\1\60\1\uffff\1\166\2\uffff\2\60\1\145\1\101\1\151\2\uffff"+
-        "\1\162\1\145\1\uffff\1\151\1\156\2\uffff\1\163\1\uffff\1\145\2\uffff"+
-        "\1\143\1\122\1\157\1\163\1\60\1\166\3\60\1\164\1\60\1\156\1\164"+
-        "\1\uffff\1\145\3\uffff\1\60\1\uffff\3\60\4\uffff";
+        "\1\0\1\143\1\151\1\146\1\163\1\154\2\141\2\uffff\1\75\4\uffff\1\75\3\uffff\1\174\1\141\1\uffff\2\145\1\162\1\141\1\72\1\60\1\145\1\76\1\uffff\1\150\1\46\2\75\1\uffff\1\52\1\114\1\157\1\151\1\145\1\56\1\101\1\uffff\2\0\2\uffff\1\157\1\151\1\154\1\162\1\uffff\1\164\1\160\1\152\2\60\1\151\2\163\1\154\1\155\1\164\1\154\1\167\20\uffff\1\143\1\156\1\162\1\uffff\1\171\1\143\1\145\1\164\1\155\1\146\4\uffff\1\164\3\uffff\1\145\1\160\1\165\11\uffff\1\117\1\154\1\163\1\164\1\uffff\1\56\2\uffff\1\160\1\164\1\145\1\163\1\164\1\150\1\154\2\145\2\uffff\1\145\1\157\1\163\2\145\1\164\1\154\1\151\1\105\1\154\1\60\1\164\1\163\1\144\1\101\1\60\1\165\1\145\1\146\3\141\1\60\1\156\2\145\1\102\1\154\1\164\1\60\1\145\2\143\1\151\1\102\1\60\1\162\1\151\1\143\2\156\1\162\1\164\2\60\2\145\1\156\1\170\1\60\1\uffff\1\157\1\145\1\60\1\154\1\uffff\1\162\1\143\1\151\1\60\1\151\1\165\1\uffff\1\60\1\123\1\60\1\101\1\145\1\60\1\uffff\1\156\1\60\1\150\2\164\1\171\1\uffff\1\164\1\145\1\164\2\163\1\164\1\163\2\uffff\1\170\1\143\1\147\1\151\1\uffff\1\162\1\60\1\uffff\1\154\1\163\1\164\1\170\1\uffff\1\156\1\154\1\uffff\1\145\1\uffff\1\114\1\143\1\uffff\1\147\1\146\1\uffff\2\60\1\151\2\60\1\163\1\60\2\151\2\60\2\164\1\60\1\163\1\171\1\uffff\1\60\1\151\2\60\1\163\1\164\1\154\1\126\1\164\2\60\1\uffff\1\151\1\uffff\1\166\2\uffff\1\60\1\uffff\1\164\1\157\2\uffff\2\60\1\uffff\1\164\1\60\1\uffff\1\166\2\uffff\2\60\1\145\1\101\1\151\2\uffff\1\162\1\145\1\uffff\1\151\1\156\2\uffff\1\163\1\uffff\1\145\2\uffff\1\143\1\122\1\157\1\163\1\60\1\166\3\60\1\164\1\60\1\156\1\164\1\uffff\1\145\3\uffff\1\60\1\uffff\3\60\4\uffff";
     static final String DFA14_maxS =
-        "\1\uffff\1\167\1\151\1\156\1\163\1\170\1\157\1\165\2\uffff\1\75"+
-        "\4\uffff\1\76\3\uffff\1\174\1\157\1\uffff\2\145\1\162\1\157\1\72"+
-        "\1\71\1\145\1\76\1\uffff\1\171\1\46\2\75\1\uffff\1\57\1\114\1\157"+
-        "\1\151\1\145\1\71\1\172\1\uffff\2\uffff\2\uffff\1\157\1\151\1\156"+
-        "\1\162\1\uffff\1\164\1\160\1\163\2\172\1\164\2\163\1\156\1\155\1"+
-        "\164\1\154\1\167\20\uffff\1\154\1\156\1\162\1\uffff\1\171\1\152"+
-        "\1\145\1\164\1\155\1\146\4\uffff\1\164\3\uffff\1\145\1\160\1\165"+
-        "\11\uffff\1\117\1\154\1\163\1\164\1\uffff\1\71\2\uffff\1\160\1\164"+
-        "\1\145\1\163\1\164\1\150\1\157\2\145\2\uffff\1\145\1\157\1\163\2"+
-        "\145\1\164\1\154\1\151\1\105\1\154\1\172\1\164\1\163\1\144\1\101"+
-        "\1\172\1\165\1\145\1\146\3\141\1\172\1\156\2\145\1\102\1\154\1\164"+
-        "\1\172\1\151\2\143\1\151\1\102\1\172\1\162\1\151\1\143\2\156\1\162"+
-        "\1\164\2\172\2\145\1\156\1\170\1\172\1\uffff\1\157\1\145\1\172\1"+
-        "\154\1\uffff\1\162\1\143\1\151\1\172\1\151\1\165\1\uffff\1\172\1"+
-        "\123\1\172\1\101\1\145\1\172\1\uffff\1\156\1\172\1\150\2\164\1\171"+
-        "\1\uffff\1\164\1\145\1\164\2\163\1\164\1\163\2\uffff\1\170\1\143"+
-        "\1\147\1\151\1\uffff\1\162\1\172\1\uffff\1\154\1\163\1\164\1\170"+
-        "\1\uffff\1\156\1\154\1\uffff\1\145\1\uffff\1\114\1\143\1\uffff\1"+
-        "\147\1\146\1\uffff\2\172\1\151\2\172\1\163\1\172\2\151\2\172\2\164"+
-        "\1\172\1\163\1\171\1\uffff\1\172\1\151\2\172\1\163\1\164\1\154\1"+
-        "\126\1\164\2\172\1\uffff\1\151\1\uffff\1\166\2\uffff\1\172\1\uffff"+
-        "\1\164\1\157\2\uffff\2\172\1\uffff\1\164\1\172\1\uffff\1\166\2\uffff"+
-        "\2\172\1\145\1\101\1\151\2\uffff\1\162\1\145\1\uffff\1\151\1\156"+
-        "\2\uffff\1\163\1\uffff\1\145\2\uffff\1\143\1\122\1\157\1\163\1\172"+
-        "\1\166\3\172\1\164\1\172\1\156\1\164\1\uffff\1\145\3\uffff\1\172"+
-        "\1\uffff\3\172\4\uffff";
+        "\1\uffff\1\167\1\151\1\156\1\163\1\170\1\157\1\165\2\uffff\1\75\4\uffff\1\76\3\uffff\1\174\1\157\1\uffff\2\145\1\162\1\157\1\72\1\71\1\145\1\76\1\uffff\1\171\1\46\2\75\1\uffff\1\57\1\114\1\157\1\151\1\145\1\71\1\172\1\uffff\2\uffff\2\uffff\1\157\1\151\1\156\1\162\1\uffff\1\164\1\160\1\163\2\172\1\164\2\163\1\156\1\155\1\164\1\154\1\167\20\uffff\1\154\1\156\1\162\1\uffff\1\171\1\152\1\145\1\164\1\155\1\146\4\uffff\1\164\3\uffff\1\145\1\160\1\165\11\uffff\1\117\1\154\1\163\1\164\1\uffff\1\71\2\uffff\1\160\1\164\1\145\1\163\1\164\1\150\1\157\2\145\2\uffff\1\145\1\157\1\163\2\145\1\164\1\154\1\151\1\105\1\154\1\172\1\164\1\163\1\144\1\101\1\172\1\165\1\145\1\146\3\141\1\172\1\156\2\145\1\102\1\154\1\164\1\172\1\151\2\143\1\151\1\102\1\172\1\162\1\151\1\143\2\156\1\162\1\164\2\172\2\145\1\156\1\170\1\172\1\uffff\1\157\1\145\1\172\1\154\1\uffff\1\162\1\143\1\151\1\172\1\151\1\165\1\uffff\1\172\1\123\1\172\1\101\1\145\1\172\1\uffff\1\156\1\172\1\150\2\164\1\171\1\uffff\1\164\1\145\1\164\2\163\1\164\1\163\2\uffff\1\170\1\143\1\147\1\151\1\uffff\1\162\1\172\1\uffff\1\154\1\163\1\164\1\170\1\uffff\1\156\1\154\1\uffff\1\145\1\uffff\1\114\1\143\1\uffff\1\147\1\146\1\uffff\2\172\1\151\2\172\1\163\1\172\2\151\2\172\2\164\1\172\1\163\1\171\1\uffff\1\172\1\151\2\172\1\163\1\164\1\154\1\126\1\164\2\172\1\uffff\1\151\1\uffff\1\166\2\uffff\1\172\1\uffff\1\164\1\157\2\uffff\2\172\1\uffff\1\164\1\172\1\uffff\1\166\2\uffff\2\172\1\145\1\101\1\151\2\uffff\1\162\1\145\1\uffff\1\151\1\156\2\uffff\1\163\1\uffff\1\145\2\uffff\1\143\1\122\1\157\1\163\1\172\1\166\3\172\1\164\1\172\1\156\1\164\1\uffff\1\145\3\uffff\1\172\1\uffff\3\172\4\uffff";
     static final String DFA14_acceptS =
-        "\10\uffff\1\11\1\12\1\uffff\1\14\1\16\1\17\1\20\1\uffff\1\23\1"+
-        "\24\1\25\2\uffff\1\31\10\uffff\1\46\4\uffff\1\65\7\uffff\1\115\2"+
-        "\uffff\1\122\1\123\4\uffff\1\115\15\uffff\1\11\1\12\1\57\1\13\1"+
-        "\14\1\16\1\17\1\20\1\22\1\61\1\63\1\23\1\24\1\25\1\54\1\26\3\uffff"+
-        "\1\31\6\uffff\1\41\1\44\1\42\1\114\1\uffff\1\45\1\66\1\46\3\uffff"+
-        "\1\55\1\60\1\70\1\62\1\64\1\65\1\120\1\121\1\67\4\uffff\1\116\1"+
-        "\uffff\1\117\1\122\11\uffff\1\47\1\4\62\uffff\1\106\4\uffff\1\33"+
-        "\6\uffff\1\43\6\uffff\1\111\6\uffff\1\2\7\uffff\1\51\1\7\4\uffff"+
-        "\1\104\2\uffff\1\32\4\uffff\1\36\2\uffff\1\50\1\uffff\1\102\2\uffff"+
-        "\1\110\2\uffff\1\15\20\uffff\1\103\13\uffff\1\52\1\uffff\1\73\1"+
-        "\uffff\1\100\1\3\1\uffff\1\6\2\uffff\1\40\1\76\2\uffff\1\10\2\uffff"+
-        "\1\101\1\uffff\1\75\1\35\5\uffff\1\1\1\30\2\uffff\1\56\2\uffff\1"+
-        "\21\1\72\1\uffff\1\27\1\uffff\1\37\1\53\15\uffff\1\112\1\uffff\1"+
-        "\5\1\77\1\34\1\uffff\1\105\3\uffff\1\71\1\107\1\74\1\113";
+        "\10\uffff\1\11\1\12\1\uffff\1\14\1\16\1\17\1\20\1\uffff\1\23\1\24\1\25\2\uffff\1\31\10\uffff\1\46\4\uffff\1\65\7\uffff\1\115\2\uffff\1\122\1\123\4\uffff\1\115\15\uffff\1\11\1\12\1\57\1\13\1\14\1\16\1\17\1\20\1\22\1\61\1\63\1\23\1\24\1\25\1\54\1\26\3\uffff\1\31\6\uffff\1\41\1\44\1\42\1\114\1\uffff\1\45\1\66\1\46\3\uffff\1\55\1\60\1\70\1\62\1\64\1\65\1\120\1\121\1\67\4\uffff\1\116\1\uffff\1\117\1\122\11\uffff\1\47\1\4\62\uffff\1\106\4\uffff\1\33\6\uffff\1\43\6\uffff\1\111\6\uffff\1\2\7\uffff\1\51\1\7\4\uffff\1\104\2\uffff\1\32\4\uffff\1\36\2\uffff\1\50\1\uffff\1\102\2\uffff\1\110\2\uffff\1\15\20\uffff\1\103\13\uffff\1\52\1\uffff\1\73\1\uffff\1\100\1\3\1\uffff\1\6\2\uffff\1\40\1\76\2\uffff\1\10\2\uffff\1\101\1\uffff\1\75\1\35\5\uffff\1\1\1\30\2\uffff\1\56\2\uffff\1\21\1\72\1\uffff\1\27\1\uffff\1\37\1\53\15\uffff\1\112\1\uffff\1\5\1\77\1\34\1\uffff\1\105\3\uffff\1\71\1\107\1\74\1\113";
     static final String DFA14_specialS =
         "\1\1\53\uffff\1\0\1\2\u0122\uffff}>";
     static final String[] DFA14_transitionS = {
-            "\11\57\2\56\2\57\1\56\22\57\1\56\1\41\1\54\1\16\2\57\1\40\1"+
-            "\55\1\14\1\15\1\20\1\43\1\25\1\35\1\33\1\44\12\51\1\32\1\13"+
-            "\1\42\1\12\1\17\1\36\1\57\2\53\1\46\3\53\1\45\4\53\1\47\6\53"+
-            "\1\50\7\53\1\21\1\57\1\22\1\52\1\53\1\57\1\4\1\53\1\6\1\31\1"+
-            "\5\1\24\2\53\1\3\1\53\1\26\1\34\1\53\1\7\1\53\1\30\1\53\1\27"+
-            "\1\1\1\37\2\53\1\2\3\53\1\10\1\23\1\11\uff82\57",
+            "\11\57\2\56\2\57\1\56\22\57\1\56\1\41\1\54\1\16\2\57\1\40\1\55\1\14\1\15\1\20\1\43\1\25\1\35\1\33\1\44\12\51\1\32\1\13\1\42\1\12\1\17\1\36\1\57\2\53\1\46\3\53\1\45\4\53\1\47\6\53\1\50\7\53\1\21\1\57\1\22\1\52\1\53\1\57\1\4\1\53\1\6\1\31\1\5\1\24\2\53\1\3\1\53\1\26\1\34\1\53\1\7\1\53\1\30\1\53\1\27\1\1\1\37\2\53\1\2\3\53\1\10\1\23\1\11\uff82\57",
             "\1\60\1\uffff\1\62\11\uffff\1\63\7\uffff\1\61",
             "\1\65",
             "\1\70\6\uffff\1\66\1\67",
@@ -3124,8 +3040,7 @@ public void mTokens() throws RecognitionException {
             "\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
             "",
             "\1\u00ee",
-            "\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\16\64\1\u00ef\13"+
-            "\64",
+            "\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\16\64\1\u00ef\13\64",
             "\1\u00f1",
             "\1\u00f2",
             "\1\u00f3",
@@ -3165,8 +3080,7 @@ public void mTokens() throws RecognitionException {
             "\1\u010c",
             "",
             "\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
-            "\12\64\7\uffff\5\64\1\u010e\24\64\4\uffff\1\64\1\uffff\32"+
-            "\64",
+            "\12\64\7\uffff\5\64\1\u010e\24\64\4\uffff\1\64\1\uffff\32\64",
             "\1\u0110",
             "\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
             "\12\64\7\uffff\32\64\4\uffff\1\64\1\uffff\32\64",
diff --git a/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScopeParser.java b/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScopeParser.java
index 8caf24a9b..66021e323 100644
--- a/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScopeParser.java
+++ b/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScopeParser.java
@@ -124,7 +124,7 @@ public InternalScopeParser(TokenStream input, RecognizerSharedState state) {
         
 
     public String[] getTokenNames() { return InternalScopeParser.tokenNames; }
-    public String getGrammarFileName() { return "../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g"; }
+    public String getGrammarFileName() { return "InternalScope.g"; }
 
 
 
@@ -149,7 +149,7 @@ protected ScopeGrammarAccess getGrammarAccess() {
 
 
     // $ANTLR start "entryRuleScopeModel"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:68:1: entryRuleScopeModel returns [EObject current=null] : iv_ruleScopeModel= ruleScopeModel EOF ;
+    // InternalScope.g:68:1: entryRuleScopeModel returns [EObject current=null] : iv_ruleScopeModel= ruleScopeModel EOF ;
     public final EObject entryRuleScopeModel() throws RecognitionException {
         EObject current = null;
 
@@ -157,13 +157,13 @@ public final EObject entryRuleScopeModel() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:69:2: (iv_ruleScopeModel= ruleScopeModel EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:70:2: iv_ruleScopeModel= ruleScopeModel EOF
+            // InternalScope.g:69:2: (iv_ruleScopeModel= ruleScopeModel EOF )
+            // InternalScope.g:70:2: iv_ruleScopeModel= ruleScopeModel EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getScopeModelRule()); 
             }
-            pushFollow(FOLLOW_ruleScopeModel_in_entryRuleScopeModel75);
+            pushFollow(FOLLOW_1);
             iv_ruleScopeModel=ruleScopeModel();
 
             state._fsp--;
@@ -171,7 +171,7 @@ public final EObject entryRuleScopeModel() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleScopeModel; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleScopeModel85); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -189,7 +189,7 @@ public final EObject entryRuleScopeModel() throws RecognitionException {
 
 
     // $ANTLR start "ruleScopeModel"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:77:1: ruleScopeModel returns [EObject current=null] : (otherlv_0= 'scoping' ( (lv_name_1_0= ruleDottedID ) ) (otherlv_2= 'with' ( ( ruleDottedID ) ) )? ( (lv_imports_4_0= ruleImport ) )* ( (lv_extensions_5_0= ruleExtension ) )* ( (lv_injections_6_0= ruleInjection ) )* ( (lv_naming_7_0= ruleNamingSection ) )? ( (lv_scopes_8_0= ruleScopeDefinition ) )* ) ;
+    // InternalScope.g:77:1: ruleScopeModel returns [EObject current=null] : (otherlv_0= 'scoping' ( (lv_name_1_0= ruleDottedID ) ) (otherlv_2= 'with' ( ( ruleDottedID ) ) )? ( (lv_imports_4_0= ruleImport ) )* ( (lv_extensions_5_0= ruleExtension ) )* ( (lv_injections_6_0= ruleInjection ) )* ( (lv_naming_7_0= ruleNamingSection ) )? ( (lv_scopes_8_0= ruleScopeDefinition ) )* ) ;
     public final EObject ruleScopeModel() throws RecognitionException {
         EObject current = null;
 
@@ -211,30 +211,30 @@ public final EObject ruleScopeModel() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:80:28: ( (otherlv_0= 'scoping' ( (lv_name_1_0= ruleDottedID ) ) (otherlv_2= 'with' ( ( ruleDottedID ) ) )? ( (lv_imports_4_0= ruleImport ) )* ( (lv_extensions_5_0= ruleExtension ) )* ( (lv_injections_6_0= ruleInjection ) )* ( (lv_naming_7_0= ruleNamingSection ) )? ( (lv_scopes_8_0= ruleScopeDefinition ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:81:1: (otherlv_0= 'scoping' ( (lv_name_1_0= ruleDottedID ) ) (otherlv_2= 'with' ( ( ruleDottedID ) ) )? ( (lv_imports_4_0= ruleImport ) )* ( (lv_extensions_5_0= ruleExtension ) )* ( (lv_injections_6_0= ruleInjection ) )* ( (lv_naming_7_0= ruleNamingSection ) )? ( (lv_scopes_8_0= ruleScopeDefinition ) )* )
+            // InternalScope.g:80:28: ( (otherlv_0= 'scoping' ( (lv_name_1_0= ruleDottedID ) ) (otherlv_2= 'with' ( ( ruleDottedID ) ) )? ( (lv_imports_4_0= ruleImport ) )* ( (lv_extensions_5_0= ruleExtension ) )* ( (lv_injections_6_0= ruleInjection ) )* ( (lv_naming_7_0= ruleNamingSection ) )? ( (lv_scopes_8_0= ruleScopeDefinition ) )* ) )
+            // InternalScope.g:81:1: (otherlv_0= 'scoping' ( (lv_name_1_0= ruleDottedID ) ) (otherlv_2= 'with' ( ( ruleDottedID ) ) )? ( (lv_imports_4_0= ruleImport ) )* ( (lv_extensions_5_0= ruleExtension ) )* ( (lv_injections_6_0= ruleInjection ) )* ( (lv_naming_7_0= ruleNamingSection ) )? ( (lv_scopes_8_0= ruleScopeDefinition ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:81:1: (otherlv_0= 'scoping' ( (lv_name_1_0= ruleDottedID ) ) (otherlv_2= 'with' ( ( ruleDottedID ) ) )? ( (lv_imports_4_0= ruleImport ) )* ( (lv_extensions_5_0= ruleExtension ) )* ( (lv_injections_6_0= ruleInjection ) )* ( (lv_naming_7_0= ruleNamingSection ) )? ( (lv_scopes_8_0= ruleScopeDefinition ) )* )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:81:3: otherlv_0= 'scoping' ( (lv_name_1_0= ruleDottedID ) ) (otherlv_2= 'with' ( ( ruleDottedID ) ) )? ( (lv_imports_4_0= ruleImport ) )* ( (lv_extensions_5_0= ruleExtension ) )* ( (lv_injections_6_0= ruleInjection ) )* ( (lv_naming_7_0= ruleNamingSection ) )? ( (lv_scopes_8_0= ruleScopeDefinition ) )*
+            // InternalScope.g:81:1: (otherlv_0= 'scoping' ( (lv_name_1_0= ruleDottedID ) ) (otherlv_2= 'with' ( ( ruleDottedID ) ) )? ( (lv_imports_4_0= ruleImport ) )* ( (lv_extensions_5_0= ruleExtension ) )* ( (lv_injections_6_0= ruleInjection ) )* ( (lv_naming_7_0= ruleNamingSection ) )? ( (lv_scopes_8_0= ruleScopeDefinition ) )* )
+            // InternalScope.g:81:3: otherlv_0= 'scoping' ( (lv_name_1_0= ruleDottedID ) ) (otherlv_2= 'with' ( ( ruleDottedID ) ) )? ( (lv_imports_4_0= ruleImport ) )* ( (lv_extensions_5_0= ruleExtension ) )* ( (lv_injections_6_0= ruleInjection ) )* ( (lv_naming_7_0= ruleNamingSection ) )? ( (lv_scopes_8_0= ruleScopeDefinition ) )*
             {
-            otherlv_0=(Token)match(input,12,FOLLOW_12_in_ruleScopeModel122); if (state.failed) return current;
+            otherlv_0=(Token)match(input,12,FOLLOW_3); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getScopeModelAccess().getScopingKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:85:1: ( (lv_name_1_0= ruleDottedID ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:86:1: (lv_name_1_0= ruleDottedID )
+            // InternalScope.g:85:1: ( (lv_name_1_0= ruleDottedID ) )
+            // InternalScope.g:86:1: (lv_name_1_0= ruleDottedID )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:86:1: (lv_name_1_0= ruleDottedID )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:87:3: lv_name_1_0= ruleDottedID
+            // InternalScope.g:86:1: (lv_name_1_0= ruleDottedID )
+            // InternalScope.g:87:3: lv_name_1_0= ruleDottedID
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getScopeModelAccess().getNameDottedIDParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleDottedID_in_ruleScopeModel143);
+            pushFollow(FOLLOW_4);
             lv_name_1_0=ruleDottedID();
 
             state._fsp--;
@@ -248,7 +248,7 @@ public final EObject ruleScopeModel() throws RecognitionException {
                      			current, 
                      			"name",
                       		lv_name_1_0, 
-                      		"DottedID");
+                      		"com.avaloq.tools.ddk.xtext.scope.Scope.DottedID");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -258,7 +258,7 @@ public final EObject ruleScopeModel() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:103:2: (otherlv_2= 'with' ( ( ruleDottedID ) ) )?
+            // InternalScope.g:103:2: (otherlv_2= 'with' ( ( ruleDottedID ) ) )?
             int alt1=2;
             int LA1_0 = input.LA(1);
 
@@ -267,19 +267,19 @@ public final EObject ruleScopeModel() throws RecognitionException {
             }
             switch (alt1) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:103:4: otherlv_2= 'with' ( ( ruleDottedID ) )
+                    // InternalScope.g:103:4: otherlv_2= 'with' ( ( ruleDottedID ) )
                     {
-                    otherlv_2=(Token)match(input,13,FOLLOW_13_in_ruleScopeModel156); if (state.failed) return current;
+                    otherlv_2=(Token)match(input,13,FOLLOW_3); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_2, grammarAccess.getScopeModelAccess().getWithKeyword_2_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:107:1: ( ( ruleDottedID ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:108:1: ( ruleDottedID )
+                    // InternalScope.g:107:1: ( ( ruleDottedID ) )
+                    // InternalScope.g:108:1: ( ruleDottedID )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:108:1: ( ruleDottedID )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:109:3: ruleDottedID
+                    // InternalScope.g:108:1: ( ruleDottedID )
+                    // InternalScope.g:109:3: ruleDottedID
                     {
                     if ( state.backtracking==0 ) {
 
@@ -293,7 +293,7 @@ public final EObject ruleScopeModel() throws RecognitionException {
                       	        newCompositeNode(grammarAccess.getScopeModelAccess().getIncludedScopesScopeModelCrossReference_2_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleDottedID_in_ruleScopeModel179);
+                    pushFollow(FOLLOW_5);
                     ruleDottedID();
 
                     state._fsp--;
@@ -315,7 +315,7 @@ public final EObject ruleScopeModel() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:122:4: ( (lv_imports_4_0= ruleImport ) )*
+            // InternalScope.g:122:4: ( (lv_imports_4_0= ruleImport ) )*
             loop2:
             do {
                 int alt2=2;
@@ -328,17 +328,17 @@ public final EObject ruleScopeModel() throws RecognitionException {
 
                 switch (alt2) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:123:1: (lv_imports_4_0= ruleImport )
+            	    // InternalScope.g:123:1: (lv_imports_4_0= ruleImport )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:123:1: (lv_imports_4_0= ruleImport )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:124:3: lv_imports_4_0= ruleImport
+            	    // InternalScope.g:123:1: (lv_imports_4_0= ruleImport )
+            	    // InternalScope.g:124:3: lv_imports_4_0= ruleImport
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getScopeModelAccess().getImportsImportParserRuleCall_3_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleImport_in_ruleScopeModel202);
+            	    pushFollow(FOLLOW_5);
             	    lv_imports_4_0=ruleImport();
 
             	    state._fsp--;
@@ -352,7 +352,7 @@ public final EObject ruleScopeModel() throws RecognitionException {
             	             			current, 
             	             			"imports",
             	              		lv_imports_4_0, 
-            	              		"Import");
+            	              		"com.avaloq.tools.ddk.xtext.scope.Scope.Import");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -368,7 +368,7 @@ public final EObject ruleScopeModel() throws RecognitionException {
                 }
             } while (true);
 
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:140:3: ( (lv_extensions_5_0= ruleExtension ) )*
+            // InternalScope.g:140:3: ( (lv_extensions_5_0= ruleExtension ) )*
             loop3:
             do {
                 int alt3=2;
@@ -381,17 +381,17 @@ public final EObject ruleScopeModel() throws RecognitionException {
 
                 switch (alt3) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:141:1: (lv_extensions_5_0= ruleExtension )
+            	    // InternalScope.g:141:1: (lv_extensions_5_0= ruleExtension )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:141:1: (lv_extensions_5_0= ruleExtension )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:142:3: lv_extensions_5_0= ruleExtension
+            	    // InternalScope.g:141:1: (lv_extensions_5_0= ruleExtension )
+            	    // InternalScope.g:142:3: lv_extensions_5_0= ruleExtension
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getScopeModelAccess().getExtensionsExtensionParserRuleCall_4_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleExtension_in_ruleScopeModel224);
+            	    pushFollow(FOLLOW_6);
             	    lv_extensions_5_0=ruleExtension();
 
             	    state._fsp--;
@@ -405,7 +405,7 @@ public final EObject ruleScopeModel() throws RecognitionException {
             	             			current, 
             	             			"extensions",
             	              		lv_extensions_5_0, 
-            	              		"Extension");
+            	              		"com.avaloq.tools.ddk.xtext.scope.Scope.Extension");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -421,7 +421,7 @@ public final EObject ruleScopeModel() throws RecognitionException {
                 }
             } while (true);
 
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:158:3: ( (lv_injections_6_0= ruleInjection ) )*
+            // InternalScope.g:158:3: ( (lv_injections_6_0= ruleInjection ) )*
             loop4:
             do {
                 int alt4=2;
@@ -434,17 +434,17 @@ public final EObject ruleScopeModel() throws RecognitionException {
 
                 switch (alt4) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:159:1: (lv_injections_6_0= ruleInjection )
+            	    // InternalScope.g:159:1: (lv_injections_6_0= ruleInjection )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:159:1: (lv_injections_6_0= ruleInjection )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:160:3: lv_injections_6_0= ruleInjection
+            	    // InternalScope.g:159:1: (lv_injections_6_0= ruleInjection )
+            	    // InternalScope.g:160:3: lv_injections_6_0= ruleInjection
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getScopeModelAccess().getInjectionsInjectionParserRuleCall_5_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleInjection_in_ruleScopeModel246);
+            	    pushFollow(FOLLOW_7);
             	    lv_injections_6_0=ruleInjection();
 
             	    state._fsp--;
@@ -458,7 +458,7 @@ public final EObject ruleScopeModel() throws RecognitionException {
             	             			current, 
             	             			"injections",
             	              		lv_injections_6_0, 
-            	              		"Injection");
+            	              		"com.avaloq.tools.ddk.xtext.scope.Scope.Injection");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -474,7 +474,7 @@ public final EObject ruleScopeModel() throws RecognitionException {
                 }
             } while (true);
 
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:176:3: ( (lv_naming_7_0= ruleNamingSection ) )?
+            // InternalScope.g:176:3: ( (lv_naming_7_0= ruleNamingSection ) )?
             int alt5=2;
             int LA5_0 = input.LA(1);
 
@@ -483,17 +483,17 @@ public final EObject ruleScopeModel() throws RecognitionException {
             }
             switch (alt5) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:177:1: (lv_naming_7_0= ruleNamingSection )
+                    // InternalScope.g:177:1: (lv_naming_7_0= ruleNamingSection )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:177:1: (lv_naming_7_0= ruleNamingSection )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:178:3: lv_naming_7_0= ruleNamingSection
+                    // InternalScope.g:177:1: (lv_naming_7_0= ruleNamingSection )
+                    // InternalScope.g:178:3: lv_naming_7_0= ruleNamingSection
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getScopeModelAccess().getNamingNamingSectionParserRuleCall_6_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleNamingSection_in_ruleScopeModel268);
+                    pushFollow(FOLLOW_8);
                     lv_naming_7_0=ruleNamingSection();
 
                     state._fsp--;
@@ -507,7 +507,7 @@ public final EObject ruleScopeModel() throws RecognitionException {
                              			current, 
                              			"naming",
                               		lv_naming_7_0, 
-                              		"NamingSection");
+                              		"com.avaloq.tools.ddk.xtext.scope.Scope.NamingSection");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -520,7 +520,7 @@ public final EObject ruleScopeModel() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:194:3: ( (lv_scopes_8_0= ruleScopeDefinition ) )*
+            // InternalScope.g:194:3: ( (lv_scopes_8_0= ruleScopeDefinition ) )*
             loop6:
             do {
                 int alt6=2;
@@ -533,17 +533,17 @@ public final EObject ruleScopeModel() throws RecognitionException {
 
                 switch (alt6) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:195:1: (lv_scopes_8_0= ruleScopeDefinition )
+            	    // InternalScope.g:195:1: (lv_scopes_8_0= ruleScopeDefinition )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:195:1: (lv_scopes_8_0= ruleScopeDefinition )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:196:3: lv_scopes_8_0= ruleScopeDefinition
+            	    // InternalScope.g:195:1: (lv_scopes_8_0= ruleScopeDefinition )
+            	    // InternalScope.g:196:3: lv_scopes_8_0= ruleScopeDefinition
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getScopeModelAccess().getScopesScopeDefinitionParserRuleCall_7_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleScopeDefinition_in_ruleScopeModel290);
+            	    pushFollow(FOLLOW_8);
             	    lv_scopes_8_0=ruleScopeDefinition();
 
             	    state._fsp--;
@@ -557,7 +557,7 @@ public final EObject ruleScopeModel() throws RecognitionException {
             	             			current, 
             	             			"scopes",
             	              		lv_scopes_8_0, 
-            	              		"ScopeDefinition");
+            	              		"com.avaloq.tools.ddk.xtext.scope.Scope.ScopeDefinition");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -596,7 +596,7 @@ public final EObject ruleScopeModel() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleImport"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:220:1: entryRuleImport returns [EObject current=null] : iv_ruleImport= ruleImport EOF ;
+    // InternalScope.g:220:1: entryRuleImport returns [EObject current=null] : iv_ruleImport= ruleImport EOF ;
     public final EObject entryRuleImport() throws RecognitionException {
         EObject current = null;
 
@@ -604,13 +604,13 @@ public final EObject entryRuleImport() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:221:2: (iv_ruleImport= ruleImport EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:222:2: iv_ruleImport= ruleImport EOF
+            // InternalScope.g:221:2: (iv_ruleImport= ruleImport EOF )
+            // InternalScope.g:222:2: iv_ruleImport= ruleImport EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getImportRule()); 
             }
-            pushFollow(FOLLOW_ruleImport_in_entryRuleImport327);
+            pushFollow(FOLLOW_1);
             iv_ruleImport=ruleImport();
 
             state._fsp--;
@@ -618,7 +618,7 @@ public final EObject entryRuleImport() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleImport; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleImport337); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -636,7 +636,7 @@ public final EObject entryRuleImport() throws RecognitionException {
 
 
     // $ANTLR start "ruleImport"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:229:1: ruleImport returns [EObject current=null] : (otherlv_0= 'import' ( (otherlv_1= RULE_STRING ) ) (otherlv_2= 'as' ( (lv_name_3_0= ruleIdentifier ) ) )? ) ;
+    // InternalScope.g:229:1: ruleImport returns [EObject current=null] : (otherlv_0= 'import' ( (otherlv_1= RULE_STRING ) ) (otherlv_2= 'as' ( (lv_name_3_0= ruleIdentifier ) ) )? ) ;
     public final EObject ruleImport() throws RecognitionException {
         EObject current = null;
 
@@ -649,23 +649,23 @@ public final EObject ruleImport() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:232:28: ( (otherlv_0= 'import' ( (otherlv_1= RULE_STRING ) ) (otherlv_2= 'as' ( (lv_name_3_0= ruleIdentifier ) ) )? ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:233:1: (otherlv_0= 'import' ( (otherlv_1= RULE_STRING ) ) (otherlv_2= 'as' ( (lv_name_3_0= ruleIdentifier ) ) )? )
+            // InternalScope.g:232:28: ( (otherlv_0= 'import' ( (otherlv_1= RULE_STRING ) ) (otherlv_2= 'as' ( (lv_name_3_0= ruleIdentifier ) ) )? ) )
+            // InternalScope.g:233:1: (otherlv_0= 'import' ( (otherlv_1= RULE_STRING ) ) (otherlv_2= 'as' ( (lv_name_3_0= ruleIdentifier ) ) )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:233:1: (otherlv_0= 'import' ( (otherlv_1= RULE_STRING ) ) (otherlv_2= 'as' ( (lv_name_3_0= ruleIdentifier ) ) )? )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:233:3: otherlv_0= 'import' ( (otherlv_1= RULE_STRING ) ) (otherlv_2= 'as' ( (lv_name_3_0= ruleIdentifier ) ) )?
+            // InternalScope.g:233:1: (otherlv_0= 'import' ( (otherlv_1= RULE_STRING ) ) (otherlv_2= 'as' ( (lv_name_3_0= ruleIdentifier ) ) )? )
+            // InternalScope.g:233:3: otherlv_0= 'import' ( (otherlv_1= RULE_STRING ) ) (otherlv_2= 'as' ( (lv_name_3_0= ruleIdentifier ) ) )?
             {
-            otherlv_0=(Token)match(input,14,FOLLOW_14_in_ruleImport374); if (state.failed) return current;
+            otherlv_0=(Token)match(input,14,FOLLOW_9); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getImportAccess().getImportKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:237:1: ( (otherlv_1= RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:238:1: (otherlv_1= RULE_STRING )
+            // InternalScope.g:237:1: ( (otherlv_1= RULE_STRING ) )
+            // InternalScope.g:238:1: (otherlv_1= RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:238:1: (otherlv_1= RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:239:3: otherlv_1= RULE_STRING
+            // InternalScope.g:238:1: (otherlv_1= RULE_STRING )
+            // InternalScope.g:239:3: otherlv_1= RULE_STRING
             {
             if ( state.backtracking==0 ) {
 
@@ -674,7 +674,7 @@ public final EObject ruleImport() throws RecognitionException {
               	        }
                       
             }
-            otherlv_1=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleImport394); if (state.failed) return current;
+            otherlv_1=(Token)match(input,RULE_STRING,FOLLOW_10); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               		newLeafNode(otherlv_1, grammarAccess.getImportAccess().getPackageEPackageCrossReference_1_0()); 
@@ -686,7 +686,7 @@ public final EObject ruleImport() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:250:2: (otherlv_2= 'as' ( (lv_name_3_0= ruleIdentifier ) ) )?
+            // InternalScope.g:250:2: (otherlv_2= 'as' ( (lv_name_3_0= ruleIdentifier ) ) )?
             int alt7=2;
             int LA7_0 = input.LA(1);
 
@@ -695,26 +695,26 @@ public final EObject ruleImport() throws RecognitionException {
             }
             switch (alt7) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:250:4: otherlv_2= 'as' ( (lv_name_3_0= ruleIdentifier ) )
+                    // InternalScope.g:250:4: otherlv_2= 'as' ( (lv_name_3_0= ruleIdentifier ) )
                     {
-                    otherlv_2=(Token)match(input,15,FOLLOW_15_in_ruleImport407); if (state.failed) return current;
+                    otherlv_2=(Token)match(input,15,FOLLOW_3); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_2, grammarAccess.getImportAccess().getAsKeyword_2_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:254:1: ( (lv_name_3_0= ruleIdentifier ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:255:1: (lv_name_3_0= ruleIdentifier )
+                    // InternalScope.g:254:1: ( (lv_name_3_0= ruleIdentifier ) )
+                    // InternalScope.g:255:1: (lv_name_3_0= ruleIdentifier )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:255:1: (lv_name_3_0= ruleIdentifier )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:256:3: lv_name_3_0= ruleIdentifier
+                    // InternalScope.g:255:1: (lv_name_3_0= ruleIdentifier )
+                    // InternalScope.g:256:3: lv_name_3_0= ruleIdentifier
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getImportAccess().getNameIdentifierParserRuleCall_2_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleIdentifier_in_ruleImport428);
+                    pushFollow(FOLLOW_2);
                     lv_name_3_0=ruleIdentifier();
 
                     state._fsp--;
@@ -728,7 +728,7 @@ public final EObject ruleImport() throws RecognitionException {
                              			current, 
                              			"name",
                               		lv_name_3_0, 
-                              		"Identifier");
+                              		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -767,7 +767,7 @@ public final EObject ruleImport() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleExtension"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:280:1: entryRuleExtension returns [EObject current=null] : iv_ruleExtension= ruleExtension EOF ;
+    // InternalScope.g:280:1: entryRuleExtension returns [EObject current=null] : iv_ruleExtension= ruleExtension EOF ;
     public final EObject entryRuleExtension() throws RecognitionException {
         EObject current = null;
 
@@ -775,13 +775,13 @@ public final EObject entryRuleExtension() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:281:2: (iv_ruleExtension= ruleExtension EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:282:2: iv_ruleExtension= ruleExtension EOF
+            // InternalScope.g:281:2: (iv_ruleExtension= ruleExtension EOF )
+            // InternalScope.g:282:2: iv_ruleExtension= ruleExtension EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getExtensionRule()); 
             }
-            pushFollow(FOLLOW_ruleExtension_in_entryRuleExtension466);
+            pushFollow(FOLLOW_1);
             iv_ruleExtension=ruleExtension();
 
             state._fsp--;
@@ -789,7 +789,7 @@ public final EObject entryRuleExtension() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleExtension; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleExtension476); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -807,7 +807,7 @@ public final EObject entryRuleExtension() throws RecognitionException {
 
 
     // $ANTLR start "ruleExtension"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:289:1: ruleExtension returns [EObject current=null] : (otherlv_0= 'extension' ( (lv_extension_1_0= ruleQualifiedID ) ) ) ;
+    // InternalScope.g:289:1: ruleExtension returns [EObject current=null] : (otherlv_0= 'extension' ( (lv_extension_1_0= ruleQualifiedID ) ) ) ;
     public final EObject ruleExtension() throws RecognitionException {
         EObject current = null;
 
@@ -818,30 +818,30 @@ public final EObject ruleExtension() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:292:28: ( (otherlv_0= 'extension' ( (lv_extension_1_0= ruleQualifiedID ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:293:1: (otherlv_0= 'extension' ( (lv_extension_1_0= ruleQualifiedID ) ) )
+            // InternalScope.g:292:28: ( (otherlv_0= 'extension' ( (lv_extension_1_0= ruleQualifiedID ) ) ) )
+            // InternalScope.g:293:1: (otherlv_0= 'extension' ( (lv_extension_1_0= ruleQualifiedID ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:293:1: (otherlv_0= 'extension' ( (lv_extension_1_0= ruleQualifiedID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:293:3: otherlv_0= 'extension' ( (lv_extension_1_0= ruleQualifiedID ) )
+            // InternalScope.g:293:1: (otherlv_0= 'extension' ( (lv_extension_1_0= ruleQualifiedID ) ) )
+            // InternalScope.g:293:3: otherlv_0= 'extension' ( (lv_extension_1_0= ruleQualifiedID ) )
             {
-            otherlv_0=(Token)match(input,16,FOLLOW_16_in_ruleExtension513); if (state.failed) return current;
+            otherlv_0=(Token)match(input,16,FOLLOW_3); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getExtensionAccess().getExtensionKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:297:1: ( (lv_extension_1_0= ruleQualifiedID ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:298:1: (lv_extension_1_0= ruleQualifiedID )
+            // InternalScope.g:297:1: ( (lv_extension_1_0= ruleQualifiedID ) )
+            // InternalScope.g:298:1: (lv_extension_1_0= ruleQualifiedID )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:298:1: (lv_extension_1_0= ruleQualifiedID )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:299:3: lv_extension_1_0= ruleQualifiedID
+            // InternalScope.g:298:1: (lv_extension_1_0= ruleQualifiedID )
+            // InternalScope.g:299:3: lv_extension_1_0= ruleQualifiedID
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getExtensionAccess().getExtensionQualifiedIDParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleQualifiedID_in_ruleExtension534);
+            pushFollow(FOLLOW_2);
             lv_extension_1_0=ruleQualifiedID();
 
             state._fsp--;
@@ -855,7 +855,7 @@ public final EObject ruleExtension() throws RecognitionException {
                      			current, 
                      			"extension",
                       		lv_extension_1_0, 
-                      		"QualifiedID");
+                      		"com.avaloq.tools.ddk.xtext.scope.Scope.QualifiedID");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -888,7 +888,7 @@ public final EObject ruleExtension() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleInjection"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:323:1: entryRuleInjection returns [EObject current=null] : iv_ruleInjection= ruleInjection EOF ;
+    // InternalScope.g:323:1: entryRuleInjection returns [EObject current=null] : iv_ruleInjection= ruleInjection EOF ;
     public final EObject entryRuleInjection() throws RecognitionException {
         EObject current = null;
 
@@ -896,13 +896,13 @@ public final EObject entryRuleInjection() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:324:2: (iv_ruleInjection= ruleInjection EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:325:2: iv_ruleInjection= ruleInjection EOF
+            // InternalScope.g:324:2: (iv_ruleInjection= ruleInjection EOF )
+            // InternalScope.g:325:2: iv_ruleInjection= ruleInjection EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getInjectionRule()); 
             }
-            pushFollow(FOLLOW_ruleInjection_in_entryRuleInjection570);
+            pushFollow(FOLLOW_1);
             iv_ruleInjection=ruleInjection();
 
             state._fsp--;
@@ -910,7 +910,7 @@ public final EObject entryRuleInjection() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleInjection; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInjection580); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -928,7 +928,7 @@ public final EObject entryRuleInjection() throws RecognitionException {
 
 
     // $ANTLR start "ruleInjection"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:332:1: ruleInjection returns [EObject current=null] : (otherlv_0= 'inject' ( (lv_type_1_0= ruleDottedID ) ) otherlv_2= 'as' ( (lv_name_3_0= ruleIdentifier ) ) ) ;
+    // InternalScope.g:332:1: ruleInjection returns [EObject current=null] : (otherlv_0= 'inject' ( (lv_type_1_0= ruleDottedID ) ) otherlv_2= 'as' ( (lv_name_3_0= ruleIdentifier ) ) ) ;
     public final EObject ruleInjection() throws RecognitionException {
         EObject current = null;
 
@@ -942,30 +942,30 @@ public final EObject ruleInjection() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:335:28: ( (otherlv_0= 'inject' ( (lv_type_1_0= ruleDottedID ) ) otherlv_2= 'as' ( (lv_name_3_0= ruleIdentifier ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:336:1: (otherlv_0= 'inject' ( (lv_type_1_0= ruleDottedID ) ) otherlv_2= 'as' ( (lv_name_3_0= ruleIdentifier ) ) )
+            // InternalScope.g:335:28: ( (otherlv_0= 'inject' ( (lv_type_1_0= ruleDottedID ) ) otherlv_2= 'as' ( (lv_name_3_0= ruleIdentifier ) ) ) )
+            // InternalScope.g:336:1: (otherlv_0= 'inject' ( (lv_type_1_0= ruleDottedID ) ) otherlv_2= 'as' ( (lv_name_3_0= ruleIdentifier ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:336:1: (otherlv_0= 'inject' ( (lv_type_1_0= ruleDottedID ) ) otherlv_2= 'as' ( (lv_name_3_0= ruleIdentifier ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:336:3: otherlv_0= 'inject' ( (lv_type_1_0= ruleDottedID ) ) otherlv_2= 'as' ( (lv_name_3_0= ruleIdentifier ) )
+            // InternalScope.g:336:1: (otherlv_0= 'inject' ( (lv_type_1_0= ruleDottedID ) ) otherlv_2= 'as' ( (lv_name_3_0= ruleIdentifier ) ) )
+            // InternalScope.g:336:3: otherlv_0= 'inject' ( (lv_type_1_0= ruleDottedID ) ) otherlv_2= 'as' ( (lv_name_3_0= ruleIdentifier ) )
             {
-            otherlv_0=(Token)match(input,17,FOLLOW_17_in_ruleInjection617); if (state.failed) return current;
+            otherlv_0=(Token)match(input,17,FOLLOW_3); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getInjectionAccess().getInjectKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:340:1: ( (lv_type_1_0= ruleDottedID ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:341:1: (lv_type_1_0= ruleDottedID )
+            // InternalScope.g:340:1: ( (lv_type_1_0= ruleDottedID ) )
+            // InternalScope.g:341:1: (lv_type_1_0= ruleDottedID )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:341:1: (lv_type_1_0= ruleDottedID )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:342:3: lv_type_1_0= ruleDottedID
+            // InternalScope.g:341:1: (lv_type_1_0= ruleDottedID )
+            // InternalScope.g:342:3: lv_type_1_0= ruleDottedID
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getInjectionAccess().getTypeDottedIDParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleDottedID_in_ruleInjection638);
+            pushFollow(FOLLOW_11);
             lv_type_1_0=ruleDottedID();
 
             state._fsp--;
@@ -979,7 +979,7 @@ public final EObject ruleInjection() throws RecognitionException {
                      			current, 
                      			"type",
                       		lv_type_1_0, 
-                      		"DottedID");
+                      		"com.avaloq.tools.ddk.xtext.scope.Scope.DottedID");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -989,24 +989,24 @@ public final EObject ruleInjection() throws RecognitionException {
 
             }
 
-            otherlv_2=(Token)match(input,15,FOLLOW_15_in_ruleInjection650); if (state.failed) return current;
+            otherlv_2=(Token)match(input,15,FOLLOW_3); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getInjectionAccess().getAsKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:362:1: ( (lv_name_3_0= ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:363:1: (lv_name_3_0= ruleIdentifier )
+            // InternalScope.g:362:1: ( (lv_name_3_0= ruleIdentifier ) )
+            // InternalScope.g:363:1: (lv_name_3_0= ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:363:1: (lv_name_3_0= ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:364:3: lv_name_3_0= ruleIdentifier
+            // InternalScope.g:363:1: (lv_name_3_0= ruleIdentifier )
+            // InternalScope.g:364:3: lv_name_3_0= ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getInjectionAccess().getNameIdentifierParserRuleCall_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_ruleInjection671);
+            pushFollow(FOLLOW_2);
             lv_name_3_0=ruleIdentifier();
 
             state._fsp--;
@@ -1020,7 +1020,7 @@ public final EObject ruleInjection() throws RecognitionException {
                      			current, 
                      			"name",
                       		lv_name_3_0, 
-                      		"Identifier");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -1053,7 +1053,7 @@ public final EObject ruleInjection() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleNamingSection"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:388:1: entryRuleNamingSection returns [EObject current=null] : iv_ruleNamingSection= ruleNamingSection EOF ;
+    // InternalScope.g:388:1: entryRuleNamingSection returns [EObject current=null] : iv_ruleNamingSection= ruleNamingSection EOF ;
     public final EObject entryRuleNamingSection() throws RecognitionException {
         EObject current = null;
 
@@ -1061,13 +1061,13 @@ public final EObject entryRuleNamingSection() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:389:2: (iv_ruleNamingSection= ruleNamingSection EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:390:2: iv_ruleNamingSection= ruleNamingSection EOF
+            // InternalScope.g:389:2: (iv_ruleNamingSection= ruleNamingSection EOF )
+            // InternalScope.g:390:2: iv_ruleNamingSection= ruleNamingSection EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getNamingSectionRule()); 
             }
-            pushFollow(FOLLOW_ruleNamingSection_in_entryRuleNamingSection707);
+            pushFollow(FOLLOW_1);
             iv_ruleNamingSection=ruleNamingSection();
 
             state._fsp--;
@@ -1075,7 +1075,7 @@ public final EObject entryRuleNamingSection() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleNamingSection; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNamingSection717); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -1093,7 +1093,7 @@ public final EObject entryRuleNamingSection() throws RecognitionException {
 
 
     // $ANTLR start "ruleNamingSection"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:397:1: ruleNamingSection returns [EObject current=null] : ( () (otherlv_1= 'case' ( (lv_casing_2_0= ruleCasing ) ) )? otherlv_3= 'naming' otherlv_4= '{' ( (lv_namings_5_0= ruleNamingDefinition ) )* otherlv_6= '}' ) ;
+    // InternalScope.g:397:1: ruleNamingSection returns [EObject current=null] : ( () (otherlv_1= 'case' ( (lv_casing_2_0= ruleCasing ) ) )? otherlv_3= 'naming' otherlv_4= '{' ( (lv_namings_5_0= ruleNamingDefinition ) )* otherlv_6= '}' ) ;
     public final EObject ruleNamingSection() throws RecognitionException {
         EObject current = null;
 
@@ -1109,14 +1109,14 @@ public final EObject ruleNamingSection() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:400:28: ( ( () (otherlv_1= 'case' ( (lv_casing_2_0= ruleCasing ) ) )? otherlv_3= 'naming' otherlv_4= '{' ( (lv_namings_5_0= ruleNamingDefinition ) )* otherlv_6= '}' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:401:1: ( () (otherlv_1= 'case' ( (lv_casing_2_0= ruleCasing ) ) )? otherlv_3= 'naming' otherlv_4= '{' ( (lv_namings_5_0= ruleNamingDefinition ) )* otherlv_6= '}' )
+            // InternalScope.g:400:28: ( ( () (otherlv_1= 'case' ( (lv_casing_2_0= ruleCasing ) ) )? otherlv_3= 'naming' otherlv_4= '{' ( (lv_namings_5_0= ruleNamingDefinition ) )* otherlv_6= '}' ) )
+            // InternalScope.g:401:1: ( () (otherlv_1= 'case' ( (lv_casing_2_0= ruleCasing ) ) )? otherlv_3= 'naming' otherlv_4= '{' ( (lv_namings_5_0= ruleNamingDefinition ) )* otherlv_6= '}' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:401:1: ( () (otherlv_1= 'case' ( (lv_casing_2_0= ruleCasing ) ) )? otherlv_3= 'naming' otherlv_4= '{' ( (lv_namings_5_0= ruleNamingDefinition ) )* otherlv_6= '}' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:401:2: () (otherlv_1= 'case' ( (lv_casing_2_0= ruleCasing ) ) )? otherlv_3= 'naming' otherlv_4= '{' ( (lv_namings_5_0= ruleNamingDefinition ) )* otherlv_6= '}'
+            // InternalScope.g:401:1: ( () (otherlv_1= 'case' ( (lv_casing_2_0= ruleCasing ) ) )? otherlv_3= 'naming' otherlv_4= '{' ( (lv_namings_5_0= ruleNamingDefinition ) )* otherlv_6= '}' )
+            // InternalScope.g:401:2: () (otherlv_1= 'case' ( (lv_casing_2_0= ruleCasing ) ) )? otherlv_3= 'naming' otherlv_4= '{' ( (lv_namings_5_0= ruleNamingDefinition ) )* otherlv_6= '}'
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:401:2: ()
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:402:5: 
+            // InternalScope.g:401:2: ()
+            // InternalScope.g:402:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -1128,7 +1128,7 @@ public final EObject ruleNamingSection() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:407:2: (otherlv_1= 'case' ( (lv_casing_2_0= ruleCasing ) ) )?
+            // InternalScope.g:407:2: (otherlv_1= 'case' ( (lv_casing_2_0= ruleCasing ) ) )?
             int alt8=2;
             int LA8_0 = input.LA(1);
 
@@ -1137,26 +1137,26 @@ public final EObject ruleNamingSection() throws RecognitionException {
             }
             switch (alt8) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:407:4: otherlv_1= 'case' ( (lv_casing_2_0= ruleCasing ) )
+                    // InternalScope.g:407:4: otherlv_1= 'case' ( (lv_casing_2_0= ruleCasing ) )
                     {
-                    otherlv_1=(Token)match(input,18,FOLLOW_18_in_ruleNamingSection764); if (state.failed) return current;
+                    otherlv_1=(Token)match(input,18,FOLLOW_12); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_1, grammarAccess.getNamingSectionAccess().getCaseKeyword_1_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:411:1: ( (lv_casing_2_0= ruleCasing ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:412:1: (lv_casing_2_0= ruleCasing )
+                    // InternalScope.g:411:1: ( (lv_casing_2_0= ruleCasing ) )
+                    // InternalScope.g:412:1: (lv_casing_2_0= ruleCasing )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:412:1: (lv_casing_2_0= ruleCasing )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:413:3: lv_casing_2_0= ruleCasing
+                    // InternalScope.g:412:1: (lv_casing_2_0= ruleCasing )
+                    // InternalScope.g:413:3: lv_casing_2_0= ruleCasing
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getNamingSectionAccess().getCasingCasingEnumRuleCall_1_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleCasing_in_ruleNamingSection785);
+                    pushFollow(FOLLOW_13);
                     lv_casing_2_0=ruleCasing();
 
                     state._fsp--;
@@ -1170,7 +1170,7 @@ public final EObject ruleNamingSection() throws RecognitionException {
                              			current, 
                              			"casing",
                               		lv_casing_2_0, 
-                              		"Casing");
+                              		"com.avaloq.tools.ddk.xtext.scope.Scope.Casing");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -1186,19 +1186,19 @@ public final EObject ruleNamingSection() throws RecognitionException {
 
             }
 
-            otherlv_3=(Token)match(input,19,FOLLOW_19_in_ruleNamingSection799); if (state.failed) return current;
+            otherlv_3=(Token)match(input,19,FOLLOW_14); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_3, grammarAccess.getNamingSectionAccess().getNamingKeyword_2());
                   
             }
-            otherlv_4=(Token)match(input,20,FOLLOW_20_in_ruleNamingSection811); if (state.failed) return current;
+            otherlv_4=(Token)match(input,20,FOLLOW_15); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_4, grammarAccess.getNamingSectionAccess().getLeftCurlyBracketKeyword_3());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:437:1: ( (lv_namings_5_0= ruleNamingDefinition ) )*
+            // InternalScope.g:437:1: ( (lv_namings_5_0= ruleNamingDefinition ) )*
             loop9:
             do {
                 int alt9=2;
@@ -1211,17 +1211,17 @@ public final EObject ruleNamingSection() throws RecognitionException {
 
                 switch (alt9) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:438:1: (lv_namings_5_0= ruleNamingDefinition )
+            	    // InternalScope.g:438:1: (lv_namings_5_0= ruleNamingDefinition )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:438:1: (lv_namings_5_0= ruleNamingDefinition )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:439:3: lv_namings_5_0= ruleNamingDefinition
+            	    // InternalScope.g:438:1: (lv_namings_5_0= ruleNamingDefinition )
+            	    // InternalScope.g:439:3: lv_namings_5_0= ruleNamingDefinition
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getNamingSectionAccess().getNamingsNamingDefinitionParserRuleCall_4_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleNamingDefinition_in_ruleNamingSection832);
+            	    pushFollow(FOLLOW_15);
             	    lv_namings_5_0=ruleNamingDefinition();
 
             	    state._fsp--;
@@ -1235,7 +1235,7 @@ public final EObject ruleNamingSection() throws RecognitionException {
             	             			current, 
             	             			"namings",
             	              		lv_namings_5_0, 
-            	              		"NamingDefinition");
+            	              		"com.avaloq.tools.ddk.xtext.scope.Scope.NamingDefinition");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -1251,7 +1251,7 @@ public final EObject ruleNamingSection() throws RecognitionException {
                 }
             } while (true);
 
-            otherlv_6=(Token)match(input,21,FOLLOW_21_in_ruleNamingSection845); if (state.failed) return current;
+            otherlv_6=(Token)match(input,21,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_6, grammarAccess.getNamingSectionAccess().getRightCurlyBracketKeyword_5());
@@ -1280,7 +1280,7 @@ public final EObject ruleNamingSection() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleNamingDefinition"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:467:1: entryRuleNamingDefinition returns [EObject current=null] : iv_ruleNamingDefinition= ruleNamingDefinition EOF ;
+    // InternalScope.g:467:1: entryRuleNamingDefinition returns [EObject current=null] : iv_ruleNamingDefinition= ruleNamingDefinition EOF ;
     public final EObject entryRuleNamingDefinition() throws RecognitionException {
         EObject current = null;
 
@@ -1288,13 +1288,13 @@ public final EObject entryRuleNamingDefinition() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:468:2: (iv_ruleNamingDefinition= ruleNamingDefinition EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:469:2: iv_ruleNamingDefinition= ruleNamingDefinition EOF
+            // InternalScope.g:468:2: (iv_ruleNamingDefinition= ruleNamingDefinition EOF )
+            // InternalScope.g:469:2: iv_ruleNamingDefinition= ruleNamingDefinition EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getNamingDefinitionRule()); 
             }
-            pushFollow(FOLLOW_ruleNamingDefinition_in_entryRuleNamingDefinition881);
+            pushFollow(FOLLOW_1);
             iv_ruleNamingDefinition=ruleNamingDefinition();
 
             state._fsp--;
@@ -1302,7 +1302,7 @@ public final EObject entryRuleNamingDefinition() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleNamingDefinition; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNamingDefinition891); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -1320,7 +1320,7 @@ public final EObject entryRuleNamingDefinition() throws RecognitionException {
 
 
     // $ANTLR start "ruleNamingDefinition"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:476:1: ruleNamingDefinition returns [EObject current=null] : ( ( ( ruleQualifiedID ) ) otherlv_1= '=' ( (lv_naming_2_0= ruleNaming ) ) otherlv_3= ';' ) ;
+    // InternalScope.g:476:1: ruleNamingDefinition returns [EObject current=null] : ( ( ( ruleQualifiedID ) ) otherlv_1= '=' ( (lv_naming_2_0= ruleNaming ) ) otherlv_3= ';' ) ;
     public final EObject ruleNamingDefinition() throws RecognitionException {
         EObject current = null;
 
@@ -1332,17 +1332,17 @@ public final EObject ruleNamingDefinition() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:479:28: ( ( ( ( ruleQualifiedID ) ) otherlv_1= '=' ( (lv_naming_2_0= ruleNaming ) ) otherlv_3= ';' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:480:1: ( ( ( ruleQualifiedID ) ) otherlv_1= '=' ( (lv_naming_2_0= ruleNaming ) ) otherlv_3= ';' )
+            // InternalScope.g:479:28: ( ( ( ( ruleQualifiedID ) ) otherlv_1= '=' ( (lv_naming_2_0= ruleNaming ) ) otherlv_3= ';' ) )
+            // InternalScope.g:480:1: ( ( ( ruleQualifiedID ) ) otherlv_1= '=' ( (lv_naming_2_0= ruleNaming ) ) otherlv_3= ';' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:480:1: ( ( ( ruleQualifiedID ) ) otherlv_1= '=' ( (lv_naming_2_0= ruleNaming ) ) otherlv_3= ';' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:480:2: ( ( ruleQualifiedID ) ) otherlv_1= '=' ( (lv_naming_2_0= ruleNaming ) ) otherlv_3= ';'
+            // InternalScope.g:480:1: ( ( ( ruleQualifiedID ) ) otherlv_1= '=' ( (lv_naming_2_0= ruleNaming ) ) otherlv_3= ';' )
+            // InternalScope.g:480:2: ( ( ruleQualifiedID ) ) otherlv_1= '=' ( (lv_naming_2_0= ruleNaming ) ) otherlv_3= ';'
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:480:2: ( ( ruleQualifiedID ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:481:1: ( ruleQualifiedID )
+            // InternalScope.g:480:2: ( ( ruleQualifiedID ) )
+            // InternalScope.g:481:1: ( ruleQualifiedID )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:481:1: ( ruleQualifiedID )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:482:3: ruleQualifiedID
+            // InternalScope.g:481:1: ( ruleQualifiedID )
+            // InternalScope.g:482:3: ruleQualifiedID
             {
             if ( state.backtracking==0 ) {
 
@@ -1356,7 +1356,7 @@ public final EObject ruleNamingDefinition() throws RecognitionException {
               	        newCompositeNode(grammarAccess.getNamingDefinitionAccess().getTypeEClassCrossReference_0_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleQualifiedID_in_ruleNamingDefinition939);
+            pushFollow(FOLLOW_16);
             ruleQualifiedID();
 
             state._fsp--;
@@ -1372,24 +1372,24 @@ public final EObject ruleNamingDefinition() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,22,FOLLOW_22_in_ruleNamingDefinition951); if (state.failed) return current;
+            otherlv_1=(Token)match(input,22,FOLLOW_17); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getNamingDefinitionAccess().getEqualsSignKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:499:1: ( (lv_naming_2_0= ruleNaming ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:500:1: (lv_naming_2_0= ruleNaming )
+            // InternalScope.g:499:1: ( (lv_naming_2_0= ruleNaming ) )
+            // InternalScope.g:500:1: (lv_naming_2_0= ruleNaming )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:500:1: (lv_naming_2_0= ruleNaming )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:501:3: lv_naming_2_0= ruleNaming
+            // InternalScope.g:500:1: (lv_naming_2_0= ruleNaming )
+            // InternalScope.g:501:3: lv_naming_2_0= ruleNaming
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getNamingDefinitionAccess().getNamingNamingParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleNaming_in_ruleNamingDefinition972);
+            pushFollow(FOLLOW_18);
             lv_naming_2_0=ruleNaming();
 
             state._fsp--;
@@ -1403,7 +1403,7 @@ public final EObject ruleNamingDefinition() throws RecognitionException {
                      			current, 
                      			"naming",
                       		lv_naming_2_0, 
-                      		"Naming");
+                      		"com.avaloq.tools.ddk.xtext.scope.Scope.Naming");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -1413,7 +1413,7 @@ public final EObject ruleNamingDefinition() throws RecognitionException {
 
             }
 
-            otherlv_3=(Token)match(input,23,FOLLOW_23_in_ruleNamingDefinition984); if (state.failed) return current;
+            otherlv_3=(Token)match(input,23,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_3, grammarAccess.getNamingDefinitionAccess().getSemicolonKeyword_3());
@@ -1442,7 +1442,7 @@ public final EObject ruleNamingDefinition() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleScopeDefinition"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:529:1: entryRuleScopeDefinition returns [EObject current=null] : iv_ruleScopeDefinition= ruleScopeDefinition EOF ;
+    // InternalScope.g:529:1: entryRuleScopeDefinition returns [EObject current=null] : iv_ruleScopeDefinition= ruleScopeDefinition EOF ;
     public final EObject entryRuleScopeDefinition() throws RecognitionException {
         EObject current = null;
 
@@ -1450,13 +1450,13 @@ public final EObject entryRuleScopeDefinition() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:530:2: (iv_ruleScopeDefinition= ruleScopeDefinition EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:531:2: iv_ruleScopeDefinition= ruleScopeDefinition EOF
+            // InternalScope.g:530:2: (iv_ruleScopeDefinition= ruleScopeDefinition EOF )
+            // InternalScope.g:531:2: iv_ruleScopeDefinition= ruleScopeDefinition EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getScopeDefinitionRule()); 
             }
-            pushFollow(FOLLOW_ruleScopeDefinition_in_entryRuleScopeDefinition1020);
+            pushFollow(FOLLOW_1);
             iv_ruleScopeDefinition=ruleScopeDefinition();
 
             state._fsp--;
@@ -1464,7 +1464,7 @@ public final EObject entryRuleScopeDefinition() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleScopeDefinition; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleScopeDefinition1030); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -1482,7 +1482,7 @@ public final EObject entryRuleScopeDefinition() throws RecognitionException {
 
 
     // $ANTLR start "ruleScopeDefinition"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:538:1: ruleScopeDefinition returns [EObject current=null] : (otherlv_0= 'scope' (otherlv_1= '(' ( (lv_name_2_0= ruleIdentifier ) ) otherlv_3= ')' )? ( ( ( ruleQualifiedID ) ) | ( ( ( ruleQualifiedID ) ) otherlv_6= '#' ( ( ruleIdentifier ) ) ) ) otherlv_8= '{' ( (lv_rules_9_0= ruleScopeRule ) )+ otherlv_10= '}' ) ;
+    // InternalScope.g:538:1: ruleScopeDefinition returns [EObject current=null] : (otherlv_0= 'scope' (otherlv_1= '(' ( (lv_name_2_0= ruleIdentifier ) ) otherlv_3= ')' )? ( ( ( ruleQualifiedID ) ) | ( ( ( ruleQualifiedID ) ) otherlv_6= '#' ( ( ruleIdentifier ) ) ) ) otherlv_8= '{' ( (lv_rules_9_0= ruleScopeRule ) )+ otherlv_10= '}' ) ;
     public final EObject ruleScopeDefinition() throws RecognitionException {
         EObject current = null;
 
@@ -1500,19 +1500,19 @@ public final EObject ruleScopeDefinition() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:541:28: ( (otherlv_0= 'scope' (otherlv_1= '(' ( (lv_name_2_0= ruleIdentifier ) ) otherlv_3= ')' )? ( ( ( ruleQualifiedID ) ) | ( ( ( ruleQualifiedID ) ) otherlv_6= '#' ( ( ruleIdentifier ) ) ) ) otherlv_8= '{' ( (lv_rules_9_0= ruleScopeRule ) )+ otherlv_10= '}' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:542:1: (otherlv_0= 'scope' (otherlv_1= '(' ( (lv_name_2_0= ruleIdentifier ) ) otherlv_3= ')' )? ( ( ( ruleQualifiedID ) ) | ( ( ( ruleQualifiedID ) ) otherlv_6= '#' ( ( ruleIdentifier ) ) ) ) otherlv_8= '{' ( (lv_rules_9_0= ruleScopeRule ) )+ otherlv_10= '}' )
+            // InternalScope.g:541:28: ( (otherlv_0= 'scope' (otherlv_1= '(' ( (lv_name_2_0= ruleIdentifier ) ) otherlv_3= ')' )? ( ( ( ruleQualifiedID ) ) | ( ( ( ruleQualifiedID ) ) otherlv_6= '#' ( ( ruleIdentifier ) ) ) ) otherlv_8= '{' ( (lv_rules_9_0= ruleScopeRule ) )+ otherlv_10= '}' ) )
+            // InternalScope.g:542:1: (otherlv_0= 'scope' (otherlv_1= '(' ( (lv_name_2_0= ruleIdentifier ) ) otherlv_3= ')' )? ( ( ( ruleQualifiedID ) ) | ( ( ( ruleQualifiedID ) ) otherlv_6= '#' ( ( ruleIdentifier ) ) ) ) otherlv_8= '{' ( (lv_rules_9_0= ruleScopeRule ) )+ otherlv_10= '}' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:542:1: (otherlv_0= 'scope' (otherlv_1= '(' ( (lv_name_2_0= ruleIdentifier ) ) otherlv_3= ')' )? ( ( ( ruleQualifiedID ) ) | ( ( ( ruleQualifiedID ) ) otherlv_6= '#' ( ( ruleIdentifier ) ) ) ) otherlv_8= '{' ( (lv_rules_9_0= ruleScopeRule ) )+ otherlv_10= '}' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:542:3: otherlv_0= 'scope' (otherlv_1= '(' ( (lv_name_2_0= ruleIdentifier ) ) otherlv_3= ')' )? ( ( ( ruleQualifiedID ) ) | ( ( ( ruleQualifiedID ) ) otherlv_6= '#' ( ( ruleIdentifier ) ) ) ) otherlv_8= '{' ( (lv_rules_9_0= ruleScopeRule ) )+ otherlv_10= '}'
+            // InternalScope.g:542:1: (otherlv_0= 'scope' (otherlv_1= '(' ( (lv_name_2_0= ruleIdentifier ) ) otherlv_3= ')' )? ( ( ( ruleQualifiedID ) ) | ( ( ( ruleQualifiedID ) ) otherlv_6= '#' ( ( ruleIdentifier ) ) ) ) otherlv_8= '{' ( (lv_rules_9_0= ruleScopeRule ) )+ otherlv_10= '}' )
+            // InternalScope.g:542:3: otherlv_0= 'scope' (otherlv_1= '(' ( (lv_name_2_0= ruleIdentifier ) ) otherlv_3= ')' )? ( ( ( ruleQualifiedID ) ) | ( ( ( ruleQualifiedID ) ) otherlv_6= '#' ( ( ruleIdentifier ) ) ) ) otherlv_8= '{' ( (lv_rules_9_0= ruleScopeRule ) )+ otherlv_10= '}'
             {
-            otherlv_0=(Token)match(input,24,FOLLOW_24_in_ruleScopeDefinition1067); if (state.failed) return current;
+            otherlv_0=(Token)match(input,24,FOLLOW_19); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getScopeDefinitionAccess().getScopeKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:546:1: (otherlv_1= '(' ( (lv_name_2_0= ruleIdentifier ) ) otherlv_3= ')' )?
+            // InternalScope.g:546:1: (otherlv_1= '(' ( (lv_name_2_0= ruleIdentifier ) ) otherlv_3= ')' )?
             int alt10=2;
             int LA10_0 = input.LA(1);
 
@@ -1521,26 +1521,26 @@ public final EObject ruleScopeDefinition() throws RecognitionException {
             }
             switch (alt10) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:546:3: otherlv_1= '(' ( (lv_name_2_0= ruleIdentifier ) ) otherlv_3= ')'
+                    // InternalScope.g:546:3: otherlv_1= '(' ( (lv_name_2_0= ruleIdentifier ) ) otherlv_3= ')'
                     {
-                    otherlv_1=(Token)match(input,25,FOLLOW_25_in_ruleScopeDefinition1080); if (state.failed) return current;
+                    otherlv_1=(Token)match(input,25,FOLLOW_3); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_1, grammarAccess.getScopeDefinitionAccess().getLeftParenthesisKeyword_1_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:550:1: ( (lv_name_2_0= ruleIdentifier ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:551:1: (lv_name_2_0= ruleIdentifier )
+                    // InternalScope.g:550:1: ( (lv_name_2_0= ruleIdentifier ) )
+                    // InternalScope.g:551:1: (lv_name_2_0= ruleIdentifier )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:551:1: (lv_name_2_0= ruleIdentifier )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:552:3: lv_name_2_0= ruleIdentifier
+                    // InternalScope.g:551:1: (lv_name_2_0= ruleIdentifier )
+                    // InternalScope.g:552:3: lv_name_2_0= ruleIdentifier
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getScopeDefinitionAccess().getNameIdentifierParserRuleCall_1_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleIdentifier_in_ruleScopeDefinition1101);
+                    pushFollow(FOLLOW_20);
                     lv_name_2_0=ruleIdentifier();
 
                     state._fsp--;
@@ -1554,7 +1554,7 @@ public final EObject ruleScopeDefinition() throws RecognitionException {
                              			current, 
                              			"name",
                               		lv_name_2_0, 
-                              		"Identifier");
+                              		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -1564,7 +1564,7 @@ public final EObject ruleScopeDefinition() throws RecognitionException {
 
                     }
 
-                    otherlv_3=(Token)match(input,26,FOLLOW_26_in_ruleScopeDefinition1113); if (state.failed) return current;
+                    otherlv_3=(Token)match(input,26,FOLLOW_3); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_3, grammarAccess.getScopeDefinitionAccess().getRightParenthesisKeyword_1_2());
@@ -1576,18 +1576,18 @@ public final EObject ruleScopeDefinition() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:572:3: ( ( ( ruleQualifiedID ) ) | ( ( ( ruleQualifiedID ) ) otherlv_6= '#' ( ( ruleIdentifier ) ) ) )
+            // InternalScope.g:572:3: ( ( ( ruleQualifiedID ) ) | ( ( ( ruleQualifiedID ) ) otherlv_6= '#' ( ( ruleIdentifier ) ) ) )
             int alt11=2;
             alt11 = dfa11.predict(input);
             switch (alt11) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:572:4: ( ( ruleQualifiedID ) )
+                    // InternalScope.g:572:4: ( ( ruleQualifiedID ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:572:4: ( ( ruleQualifiedID ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:573:1: ( ruleQualifiedID )
+                    // InternalScope.g:572:4: ( ( ruleQualifiedID ) )
+                    // InternalScope.g:573:1: ( ruleQualifiedID )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:573:1: ( ruleQualifiedID )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:574:3: ruleQualifiedID
+                    // InternalScope.g:573:1: ( ruleQualifiedID )
+                    // InternalScope.g:574:3: ruleQualifiedID
                     {
                     if ( state.backtracking==0 ) {
 
@@ -1601,7 +1601,7 @@ public final EObject ruleScopeDefinition() throws RecognitionException {
                       	        newCompositeNode(grammarAccess.getScopeDefinitionAccess().getTargetTypeEClassCrossReference_2_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleQualifiedID_in_ruleScopeDefinition1139);
+                    pushFollow(FOLLOW_14);
                     ruleQualifiedID();
 
                     state._fsp--;
@@ -1621,16 +1621,16 @@ public final EObject ruleScopeDefinition() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:588:6: ( ( ( ruleQualifiedID ) ) otherlv_6= '#' ( ( ruleIdentifier ) ) )
+                    // InternalScope.g:588:6: ( ( ( ruleQualifiedID ) ) otherlv_6= '#' ( ( ruleIdentifier ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:588:6: ( ( ( ruleQualifiedID ) ) otherlv_6= '#' ( ( ruleIdentifier ) ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:588:7: ( ( ruleQualifiedID ) ) otherlv_6= '#' ( ( ruleIdentifier ) )
+                    // InternalScope.g:588:6: ( ( ( ruleQualifiedID ) ) otherlv_6= '#' ( ( ruleIdentifier ) ) )
+                    // InternalScope.g:588:7: ( ( ruleQualifiedID ) ) otherlv_6= '#' ( ( ruleIdentifier ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:588:7: ( ( ruleQualifiedID ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:589:1: ( ruleQualifiedID )
+                    // InternalScope.g:588:7: ( ( ruleQualifiedID ) )
+                    // InternalScope.g:589:1: ( ruleQualifiedID )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:589:1: ( ruleQualifiedID )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:590:3: ruleQualifiedID
+                    // InternalScope.g:589:1: ( ruleQualifiedID )
+                    // InternalScope.g:590:3: ruleQualifiedID
                     {
                     if ( state.backtracking==0 ) {
 
@@ -1644,7 +1644,7 @@ public final EObject ruleScopeDefinition() throws RecognitionException {
                       	        newCompositeNode(grammarAccess.getScopeDefinitionAccess().getContextTypeEClassCrossReference_2_1_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleQualifiedID_in_ruleScopeDefinition1169);
+                    pushFollow(FOLLOW_21);
                     ruleQualifiedID();
 
                     state._fsp--;
@@ -1660,17 +1660,17 @@ public final EObject ruleScopeDefinition() throws RecognitionException {
 
                     }
 
-                    otherlv_6=(Token)match(input,27,FOLLOW_27_in_ruleScopeDefinition1181); if (state.failed) return current;
+                    otherlv_6=(Token)match(input,27,FOLLOW_3); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_6, grammarAccess.getScopeDefinitionAccess().getNumberSignKeyword_2_1_1());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:607:1: ( ( ruleIdentifier ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:608:1: ( ruleIdentifier )
+                    // InternalScope.g:607:1: ( ( ruleIdentifier ) )
+                    // InternalScope.g:608:1: ( ruleIdentifier )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:608:1: ( ruleIdentifier )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:609:3: ruleIdentifier
+                    // InternalScope.g:608:1: ( ruleIdentifier )
+                    // InternalScope.g:609:3: ruleIdentifier
                     {
                     if ( state.backtracking==0 ) {
 
@@ -1684,7 +1684,7 @@ public final EObject ruleScopeDefinition() throws RecognitionException {
                       	        newCompositeNode(grammarAccess.getScopeDefinitionAccess().getReferenceEReferenceCrossReference_2_1_2_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleIdentifier_in_ruleScopeDefinition1204);
+                    pushFollow(FOLLOW_14);
                     ruleIdentifier();
 
                     state._fsp--;
@@ -1709,13 +1709,13 @@ public final EObject ruleScopeDefinition() throws RecognitionException {
 
             }
 
-            otherlv_8=(Token)match(input,20,FOLLOW_20_in_ruleScopeDefinition1218); if (state.failed) return current;
+            otherlv_8=(Token)match(input,20,FOLLOW_22); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_8, grammarAccess.getScopeDefinitionAccess().getLeftCurlyBracketKeyword_3());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:626:1: ( (lv_rules_9_0= ruleScopeRule ) )+
+            // InternalScope.g:626:1: ( (lv_rules_9_0= ruleScopeRule ) )+
             int cnt12=0;
             loop12:
             do {
@@ -1729,17 +1729,17 @@ public final EObject ruleScopeDefinition() throws RecognitionException {
 
                 switch (alt12) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:627:1: (lv_rules_9_0= ruleScopeRule )
+            	    // InternalScope.g:627:1: (lv_rules_9_0= ruleScopeRule )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:627:1: (lv_rules_9_0= ruleScopeRule )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:628:3: lv_rules_9_0= ruleScopeRule
+            	    // InternalScope.g:627:1: (lv_rules_9_0= ruleScopeRule )
+            	    // InternalScope.g:628:3: lv_rules_9_0= ruleScopeRule
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getScopeDefinitionAccess().getRulesScopeRuleParserRuleCall_4_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleScopeRule_in_ruleScopeDefinition1239);
+            	    pushFollow(FOLLOW_23);
             	    lv_rules_9_0=ruleScopeRule();
 
             	    state._fsp--;
@@ -1753,7 +1753,7 @@ public final EObject ruleScopeDefinition() throws RecognitionException {
             	             			current, 
             	             			"rules",
             	              		lv_rules_9_0, 
-            	              		"ScopeRule");
+            	              		"com.avaloq.tools.ddk.xtext.scope.Scope.ScopeRule");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -1774,7 +1774,7 @@ public final EObject ruleScopeDefinition() throws RecognitionException {
                 cnt12++;
             } while (true);
 
-            otherlv_10=(Token)match(input,21,FOLLOW_21_in_ruleScopeDefinition1252); if (state.failed) return current;
+            otherlv_10=(Token)match(input,21,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_10, grammarAccess.getScopeDefinitionAccess().getRightCurlyBracketKeyword_5());
@@ -1803,7 +1803,7 @@ public final EObject ruleScopeDefinition() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleScopeRule"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:656:1: entryRuleScopeRule returns [EObject current=null] : iv_ruleScopeRule= ruleScopeRule EOF ;
+    // InternalScope.g:656:1: entryRuleScopeRule returns [EObject current=null] : iv_ruleScopeRule= ruleScopeRule EOF ;
     public final EObject entryRuleScopeRule() throws RecognitionException {
         EObject current = null;
 
@@ -1811,13 +1811,13 @@ public final EObject entryRuleScopeRule() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:657:2: (iv_ruleScopeRule= ruleScopeRule EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:658:2: iv_ruleScopeRule= ruleScopeRule EOF
+            // InternalScope.g:657:2: (iv_ruleScopeRule= ruleScopeRule EOF )
+            // InternalScope.g:658:2: iv_ruleScopeRule= ruleScopeRule EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getScopeRuleRule()); 
             }
-            pushFollow(FOLLOW_ruleScopeRule_in_entryRuleScopeRule1288);
+            pushFollow(FOLLOW_1);
             iv_ruleScopeRule=ruleScopeRule();
 
             state._fsp--;
@@ -1825,7 +1825,7 @@ public final EObject entryRuleScopeRule() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleScopeRule; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleScopeRule1298); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -1843,7 +1843,7 @@ public final EObject entryRuleScopeRule() throws RecognitionException {
 
 
     // $ANTLR start "ruleScopeRule"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:665:1: ruleScopeRule returns [EObject current=null] : (otherlv_0= 'context' ( (lv_context_1_0= ruleScopeContext ) ) otherlv_2= '=' ( (lv_exprs_3_0= ruleScopeExpression ) ) (otherlv_4= '>>' ( (lv_exprs_5_0= ruleScopeExpression ) ) )* otherlv_6= ';' ) ;
+    // InternalScope.g:665:1: ruleScopeRule returns [EObject current=null] : (otherlv_0= 'context' ( (lv_context_1_0= ruleScopeContext ) ) otherlv_2= '=' ( (lv_exprs_3_0= ruleScopeExpression ) ) (otherlv_4= '>>' ( (lv_exprs_5_0= ruleScopeExpression ) ) )* otherlv_6= ';' ) ;
     public final EObject ruleScopeRule() throws RecognitionException {
         EObject current = null;
 
@@ -1861,30 +1861,30 @@ public final EObject ruleScopeRule() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:668:28: ( (otherlv_0= 'context' ( (lv_context_1_0= ruleScopeContext ) ) otherlv_2= '=' ( (lv_exprs_3_0= ruleScopeExpression ) ) (otherlv_4= '>>' ( (lv_exprs_5_0= ruleScopeExpression ) ) )* otherlv_6= ';' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:669:1: (otherlv_0= 'context' ( (lv_context_1_0= ruleScopeContext ) ) otherlv_2= '=' ( (lv_exprs_3_0= ruleScopeExpression ) ) (otherlv_4= '>>' ( (lv_exprs_5_0= ruleScopeExpression ) ) )* otherlv_6= ';' )
+            // InternalScope.g:668:28: ( (otherlv_0= 'context' ( (lv_context_1_0= ruleScopeContext ) ) otherlv_2= '=' ( (lv_exprs_3_0= ruleScopeExpression ) ) (otherlv_4= '>>' ( (lv_exprs_5_0= ruleScopeExpression ) ) )* otherlv_6= ';' ) )
+            // InternalScope.g:669:1: (otherlv_0= 'context' ( (lv_context_1_0= ruleScopeContext ) ) otherlv_2= '=' ( (lv_exprs_3_0= ruleScopeExpression ) ) (otherlv_4= '>>' ( (lv_exprs_5_0= ruleScopeExpression ) ) )* otherlv_6= ';' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:669:1: (otherlv_0= 'context' ( (lv_context_1_0= ruleScopeContext ) ) otherlv_2= '=' ( (lv_exprs_3_0= ruleScopeExpression ) ) (otherlv_4= '>>' ( (lv_exprs_5_0= ruleScopeExpression ) ) )* otherlv_6= ';' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:669:3: otherlv_0= 'context' ( (lv_context_1_0= ruleScopeContext ) ) otherlv_2= '=' ( (lv_exprs_3_0= ruleScopeExpression ) ) (otherlv_4= '>>' ( (lv_exprs_5_0= ruleScopeExpression ) ) )* otherlv_6= ';'
+            // InternalScope.g:669:1: (otherlv_0= 'context' ( (lv_context_1_0= ruleScopeContext ) ) otherlv_2= '=' ( (lv_exprs_3_0= ruleScopeExpression ) ) (otherlv_4= '>>' ( (lv_exprs_5_0= ruleScopeExpression ) ) )* otherlv_6= ';' )
+            // InternalScope.g:669:3: otherlv_0= 'context' ( (lv_context_1_0= ruleScopeContext ) ) otherlv_2= '=' ( (lv_exprs_3_0= ruleScopeExpression ) ) (otherlv_4= '>>' ( (lv_exprs_5_0= ruleScopeExpression ) ) )* otherlv_6= ';'
             {
-            otherlv_0=(Token)match(input,28,FOLLOW_28_in_ruleScopeRule1335); if (state.failed) return current;
+            otherlv_0=(Token)match(input,28,FOLLOW_24); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getScopeRuleAccess().getContextKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:673:1: ( (lv_context_1_0= ruleScopeContext ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:674:1: (lv_context_1_0= ruleScopeContext )
+            // InternalScope.g:673:1: ( (lv_context_1_0= ruleScopeContext ) )
+            // InternalScope.g:674:1: (lv_context_1_0= ruleScopeContext )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:674:1: (lv_context_1_0= ruleScopeContext )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:675:3: lv_context_1_0= ruleScopeContext
+            // InternalScope.g:674:1: (lv_context_1_0= ruleScopeContext )
+            // InternalScope.g:675:3: lv_context_1_0= ruleScopeContext
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getScopeRuleAccess().getContextScopeContextParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleScopeContext_in_ruleScopeRule1356);
+            pushFollow(FOLLOW_16);
             lv_context_1_0=ruleScopeContext();
 
             state._fsp--;
@@ -1898,7 +1898,7 @@ public final EObject ruleScopeRule() throws RecognitionException {
                      			current, 
                      			"context",
                       		lv_context_1_0, 
-                      		"ScopeContext");
+                      		"com.avaloq.tools.ddk.xtext.scope.Scope.ScopeContext");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -1908,24 +1908,24 @@ public final EObject ruleScopeRule() throws RecognitionException {
 
             }
 
-            otherlv_2=(Token)match(input,22,FOLLOW_22_in_ruleScopeRule1368); if (state.failed) return current;
+            otherlv_2=(Token)match(input,22,FOLLOW_25); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getScopeRuleAccess().getEqualsSignKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:695:1: ( (lv_exprs_3_0= ruleScopeExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:696:1: (lv_exprs_3_0= ruleScopeExpression )
+            // InternalScope.g:695:1: ( (lv_exprs_3_0= ruleScopeExpression ) )
+            // InternalScope.g:696:1: (lv_exprs_3_0= ruleScopeExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:696:1: (lv_exprs_3_0= ruleScopeExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:697:3: lv_exprs_3_0= ruleScopeExpression
+            // InternalScope.g:696:1: (lv_exprs_3_0= ruleScopeExpression )
+            // InternalScope.g:697:3: lv_exprs_3_0= ruleScopeExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getScopeRuleAccess().getExprsScopeExpressionParserRuleCall_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleScopeExpression_in_ruleScopeRule1389);
+            pushFollow(FOLLOW_26);
             lv_exprs_3_0=ruleScopeExpression();
 
             state._fsp--;
@@ -1939,7 +1939,7 @@ public final EObject ruleScopeRule() throws RecognitionException {
                      			current, 
                      			"exprs",
                       		lv_exprs_3_0, 
-                      		"ScopeExpression");
+                      		"com.avaloq.tools.ddk.xtext.scope.Scope.ScopeExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -1949,7 +1949,7 @@ public final EObject ruleScopeRule() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:713:2: (otherlv_4= '>>' ( (lv_exprs_5_0= ruleScopeExpression ) ) )*
+            // InternalScope.g:713:2: (otherlv_4= '>>' ( (lv_exprs_5_0= ruleScopeExpression ) ) )*
             loop13:
             do {
                 int alt13=2;
@@ -1962,26 +1962,26 @@ public final EObject ruleScopeRule() throws RecognitionException {
 
                 switch (alt13) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:713:4: otherlv_4= '>>' ( (lv_exprs_5_0= ruleScopeExpression ) )
+            	    // InternalScope.g:713:4: otherlv_4= '>>' ( (lv_exprs_5_0= ruleScopeExpression ) )
             	    {
-            	    otherlv_4=(Token)match(input,29,FOLLOW_29_in_ruleScopeRule1402); if (state.failed) return current;
+            	    otherlv_4=(Token)match(input,29,FOLLOW_25); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_4, grammarAccess.getScopeRuleAccess().getGreaterThanSignGreaterThanSignKeyword_4_0());
             	          
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:717:1: ( (lv_exprs_5_0= ruleScopeExpression ) )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:718:1: (lv_exprs_5_0= ruleScopeExpression )
+            	    // InternalScope.g:717:1: ( (lv_exprs_5_0= ruleScopeExpression ) )
+            	    // InternalScope.g:718:1: (lv_exprs_5_0= ruleScopeExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:718:1: (lv_exprs_5_0= ruleScopeExpression )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:719:3: lv_exprs_5_0= ruleScopeExpression
+            	    // InternalScope.g:718:1: (lv_exprs_5_0= ruleScopeExpression )
+            	    // InternalScope.g:719:3: lv_exprs_5_0= ruleScopeExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getScopeRuleAccess().getExprsScopeExpressionParserRuleCall_4_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleScopeExpression_in_ruleScopeRule1423);
+            	    pushFollow(FOLLOW_26);
             	    lv_exprs_5_0=ruleScopeExpression();
 
             	    state._fsp--;
@@ -1995,7 +1995,7 @@ public final EObject ruleScopeRule() throws RecognitionException {
             	             			current, 
             	             			"exprs",
             	              		lv_exprs_5_0, 
-            	              		"ScopeExpression");
+            	              		"com.avaloq.tools.ddk.xtext.scope.Scope.ScopeExpression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -2014,7 +2014,7 @@ public final EObject ruleScopeRule() throws RecognitionException {
                 }
             } while (true);
 
-            otherlv_6=(Token)match(input,23,FOLLOW_23_in_ruleScopeRule1437); if (state.failed) return current;
+            otherlv_6=(Token)match(input,23,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_6, grammarAccess.getScopeRuleAccess().getSemicolonKeyword_5());
@@ -2043,7 +2043,7 @@ public final EObject ruleScopeRule() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleScopeContext"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:747:1: entryRuleScopeContext returns [EObject current=null] : iv_ruleScopeContext= ruleScopeContext EOF ;
+    // InternalScope.g:747:1: entryRuleScopeContext returns [EObject current=null] : iv_ruleScopeContext= ruleScopeContext EOF ;
     public final EObject entryRuleScopeContext() throws RecognitionException {
         EObject current = null;
 
@@ -2051,13 +2051,13 @@ public final EObject entryRuleScopeContext() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:748:2: (iv_ruleScopeContext= ruleScopeContext EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:749:2: iv_ruleScopeContext= ruleScopeContext EOF
+            // InternalScope.g:748:2: (iv_ruleScopeContext= ruleScopeContext EOF )
+            // InternalScope.g:749:2: iv_ruleScopeContext= ruleScopeContext EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getScopeContextRule()); 
             }
-            pushFollow(FOLLOW_ruleScopeContext_in_entryRuleScopeContext1473);
+            pushFollow(FOLLOW_1);
             iv_ruleScopeContext=ruleScopeContext();
 
             state._fsp--;
@@ -2065,7 +2065,7 @@ public final EObject entryRuleScopeContext() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleScopeContext; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleScopeContext1483); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -2083,7 +2083,7 @@ public final EObject entryRuleScopeContext() throws RecognitionException {
 
 
     // $ANTLR start "ruleScopeContext"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:756:1: ruleScopeContext returns [EObject current=null] : ( ( ( (lv_global_0_0= '*' ) ) | ( ( ruleQualifiedID ) ) ) (otherlv_2= '[' ( (lv_guard_3_0= ruleExpression ) ) otherlv_4= ']' )? ) ;
+    // InternalScope.g:756:1: ruleScopeContext returns [EObject current=null] : ( ( ( (lv_global_0_0= '*' ) ) | ( ( ruleQualifiedID ) ) ) (otherlv_2= '[' ( (lv_guard_3_0= ruleExpression ) ) otherlv_4= ']' )? ) ;
     public final EObject ruleScopeContext() throws RecognitionException {
         EObject current = null;
 
@@ -2096,13 +2096,13 @@ public final EObject ruleScopeContext() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:759:28: ( ( ( ( (lv_global_0_0= '*' ) ) | ( ( ruleQualifiedID ) ) ) (otherlv_2= '[' ( (lv_guard_3_0= ruleExpression ) ) otherlv_4= ']' )? ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:760:1: ( ( ( (lv_global_0_0= '*' ) ) | ( ( ruleQualifiedID ) ) ) (otherlv_2= '[' ( (lv_guard_3_0= ruleExpression ) ) otherlv_4= ']' )? )
+            // InternalScope.g:759:28: ( ( ( ( (lv_global_0_0= '*' ) ) | ( ( ruleQualifiedID ) ) ) (otherlv_2= '[' ( (lv_guard_3_0= ruleExpression ) ) otherlv_4= ']' )? ) )
+            // InternalScope.g:760:1: ( ( ( (lv_global_0_0= '*' ) ) | ( ( ruleQualifiedID ) ) ) (otherlv_2= '[' ( (lv_guard_3_0= ruleExpression ) ) otherlv_4= ']' )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:760:1: ( ( ( (lv_global_0_0= '*' ) ) | ( ( ruleQualifiedID ) ) ) (otherlv_2= '[' ( (lv_guard_3_0= ruleExpression ) ) otherlv_4= ']' )? )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:760:2: ( ( (lv_global_0_0= '*' ) ) | ( ( ruleQualifiedID ) ) ) (otherlv_2= '[' ( (lv_guard_3_0= ruleExpression ) ) otherlv_4= ']' )?
+            // InternalScope.g:760:1: ( ( ( (lv_global_0_0= '*' ) ) | ( ( ruleQualifiedID ) ) ) (otherlv_2= '[' ( (lv_guard_3_0= ruleExpression ) ) otherlv_4= ']' )? )
+            // InternalScope.g:760:2: ( ( (lv_global_0_0= '*' ) ) | ( ( ruleQualifiedID ) ) ) (otherlv_2= '[' ( (lv_guard_3_0= ruleExpression ) ) otherlv_4= ']' )?
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:760:2: ( ( (lv_global_0_0= '*' ) ) | ( ( ruleQualifiedID ) ) )
+            // InternalScope.g:760:2: ( ( (lv_global_0_0= '*' ) ) | ( ( ruleQualifiedID ) ) )
             int alt14=2;
             int LA14_0 = input.LA(1);
 
@@ -2121,15 +2121,15 @@ else if ( (LA14_0==RULE_ID) ) {
             }
             switch (alt14) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:760:3: ( (lv_global_0_0= '*' ) )
+                    // InternalScope.g:760:3: ( (lv_global_0_0= '*' ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:760:3: ( (lv_global_0_0= '*' ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:761:1: (lv_global_0_0= '*' )
+                    // InternalScope.g:760:3: ( (lv_global_0_0= '*' ) )
+                    // InternalScope.g:761:1: (lv_global_0_0= '*' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:761:1: (lv_global_0_0= '*' )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:762:3: lv_global_0_0= '*'
+                    // InternalScope.g:761:1: (lv_global_0_0= '*' )
+                    // InternalScope.g:762:3: lv_global_0_0= '*'
                     {
-                    lv_global_0_0=(Token)match(input,30,FOLLOW_30_in_ruleScopeContext1527); if (state.failed) return current;
+                    lv_global_0_0=(Token)match(input,30,FOLLOW_27); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_global_0_0, grammarAccess.getScopeContextAccess().getGlobalAsteriskKeyword_0_0_0());
@@ -2153,13 +2153,13 @@ else if ( (LA14_0==RULE_ID) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:776:6: ( ( ruleQualifiedID ) )
+                    // InternalScope.g:776:6: ( ( ruleQualifiedID ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:776:6: ( ( ruleQualifiedID ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:777:1: ( ruleQualifiedID )
+                    // InternalScope.g:776:6: ( ( ruleQualifiedID ) )
+                    // InternalScope.g:777:1: ( ruleQualifiedID )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:777:1: ( ruleQualifiedID )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:778:3: ruleQualifiedID
+                    // InternalScope.g:777:1: ( ruleQualifiedID )
+                    // InternalScope.g:778:3: ruleQualifiedID
                     {
                     if ( state.backtracking==0 ) {
 
@@ -2173,7 +2173,7 @@ else if ( (LA14_0==RULE_ID) ) {
                       	        newCompositeNode(grammarAccess.getScopeContextAccess().getContextTypeEClassCrossReference_0_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleQualifiedID_in_ruleScopeContext1569);
+                    pushFollow(FOLLOW_27);
                     ruleQualifiedID();
 
                     state._fsp--;
@@ -2195,7 +2195,7 @@ else if ( (LA14_0==RULE_ID) ) {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:791:3: (otherlv_2= '[' ( (lv_guard_3_0= ruleExpression ) ) otherlv_4= ']' )?
+            // InternalScope.g:791:3: (otherlv_2= '[' ( (lv_guard_3_0= ruleExpression ) ) otherlv_4= ']' )?
             int alt15=2;
             int LA15_0 = input.LA(1);
 
@@ -2204,26 +2204,26 @@ else if ( (LA14_0==RULE_ID) ) {
             }
             switch (alt15) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:791:5: otherlv_2= '[' ( (lv_guard_3_0= ruleExpression ) ) otherlv_4= ']'
+                    // InternalScope.g:791:5: otherlv_2= '[' ( (lv_guard_3_0= ruleExpression ) ) otherlv_4= ']'
                     {
-                    otherlv_2=(Token)match(input,31,FOLLOW_31_in_ruleScopeContext1583); if (state.failed) return current;
+                    otherlv_2=(Token)match(input,31,FOLLOW_17); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_2, grammarAccess.getScopeContextAccess().getLeftSquareBracketKeyword_1_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:795:1: ( (lv_guard_3_0= ruleExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:796:1: (lv_guard_3_0= ruleExpression )
+                    // InternalScope.g:795:1: ( (lv_guard_3_0= ruleExpression ) )
+                    // InternalScope.g:796:1: (lv_guard_3_0= ruleExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:796:1: (lv_guard_3_0= ruleExpression )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:797:3: lv_guard_3_0= ruleExpression
+                    // InternalScope.g:796:1: (lv_guard_3_0= ruleExpression )
+                    // InternalScope.g:797:3: lv_guard_3_0= ruleExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getScopeContextAccess().getGuardExpressionParserRuleCall_1_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleExpression_in_ruleScopeContext1604);
+                    pushFollow(FOLLOW_28);
                     lv_guard_3_0=ruleExpression();
 
                     state._fsp--;
@@ -2237,7 +2237,7 @@ else if ( (LA14_0==RULE_ID) ) {
                              			current, 
                              			"guard",
                               		lv_guard_3_0, 
-                              		"Expression");
+                              		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -2247,7 +2247,7 @@ else if ( (LA14_0==RULE_ID) ) {
 
                     }
 
-                    otherlv_4=(Token)match(input,32,FOLLOW_32_in_ruleScopeContext1616); if (state.failed) return current;
+                    otherlv_4=(Token)match(input,32,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_4, grammarAccess.getScopeContextAccess().getRightSquareBracketKeyword_1_2());
@@ -2282,7 +2282,7 @@ else if ( (LA14_0==RULE_ID) ) {
 
 
     // $ANTLR start "entryRuleScopeExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:825:1: entryRuleScopeExpression returns [EObject current=null] : iv_ruleScopeExpression= ruleScopeExpression EOF ;
+    // InternalScope.g:825:1: entryRuleScopeExpression returns [EObject current=null] : iv_ruleScopeExpression= ruleScopeExpression EOF ;
     public final EObject entryRuleScopeExpression() throws RecognitionException {
         EObject current = null;
 
@@ -2290,13 +2290,13 @@ public final EObject entryRuleScopeExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:826:2: (iv_ruleScopeExpression= ruleScopeExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:827:2: iv_ruleScopeExpression= ruleScopeExpression EOF
+            // InternalScope.g:826:2: (iv_ruleScopeExpression= ruleScopeExpression EOF )
+            // InternalScope.g:827:2: iv_ruleScopeExpression= ruleScopeExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getScopeExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleScopeExpression_in_entryRuleScopeExpression1654);
+            pushFollow(FOLLOW_1);
             iv_ruleScopeExpression=ruleScopeExpression();
 
             state._fsp--;
@@ -2304,7 +2304,7 @@ public final EObject entryRuleScopeExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleScopeExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleScopeExpression1664); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -2322,7 +2322,7 @@ public final EObject entryRuleScopeExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleScopeExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:834:1: ruleScopeExpression returns [EObject current=null] : ( (this_ScopeDelegation_0= ruleScopeDelegation | this_FactoryExpression_1= ruleFactoryExpression | this_NamedScopeExpression_2= ruleNamedScopeExpression ) (otherlv_3= '|' ( (lv_prune_4_0= ruleExpression ) ) )? ) ;
+    // InternalScope.g:834:1: ruleScopeExpression returns [EObject current=null] : ( (this_ScopeDelegation_0= ruleScopeDelegation | this_FactoryExpression_1= ruleFactoryExpression | this_NamedScopeExpression_2= ruleNamedScopeExpression ) (otherlv_3= '|' ( (lv_prune_4_0= ruleExpression ) ) )? ) ;
     public final EObject ruleScopeExpression() throws RecognitionException {
         EObject current = null;
 
@@ -2339,13 +2339,13 @@ public final EObject ruleScopeExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:837:28: ( ( (this_ScopeDelegation_0= ruleScopeDelegation | this_FactoryExpression_1= ruleFactoryExpression | this_NamedScopeExpression_2= ruleNamedScopeExpression ) (otherlv_3= '|' ( (lv_prune_4_0= ruleExpression ) ) )? ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:838:1: ( (this_ScopeDelegation_0= ruleScopeDelegation | this_FactoryExpression_1= ruleFactoryExpression | this_NamedScopeExpression_2= ruleNamedScopeExpression ) (otherlv_3= '|' ( (lv_prune_4_0= ruleExpression ) ) )? )
+            // InternalScope.g:837:28: ( ( (this_ScopeDelegation_0= ruleScopeDelegation | this_FactoryExpression_1= ruleFactoryExpression | this_NamedScopeExpression_2= ruleNamedScopeExpression ) (otherlv_3= '|' ( (lv_prune_4_0= ruleExpression ) ) )? ) )
+            // InternalScope.g:838:1: ( (this_ScopeDelegation_0= ruleScopeDelegation | this_FactoryExpression_1= ruleFactoryExpression | this_NamedScopeExpression_2= ruleNamedScopeExpression ) (otherlv_3= '|' ( (lv_prune_4_0= ruleExpression ) ) )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:838:1: ( (this_ScopeDelegation_0= ruleScopeDelegation | this_FactoryExpression_1= ruleFactoryExpression | this_NamedScopeExpression_2= ruleNamedScopeExpression ) (otherlv_3= '|' ( (lv_prune_4_0= ruleExpression ) ) )? )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:838:2: (this_ScopeDelegation_0= ruleScopeDelegation | this_FactoryExpression_1= ruleFactoryExpression | this_NamedScopeExpression_2= ruleNamedScopeExpression ) (otherlv_3= '|' ( (lv_prune_4_0= ruleExpression ) ) )?
+            // InternalScope.g:838:1: ( (this_ScopeDelegation_0= ruleScopeDelegation | this_FactoryExpression_1= ruleFactoryExpression | this_NamedScopeExpression_2= ruleNamedScopeExpression ) (otherlv_3= '|' ( (lv_prune_4_0= ruleExpression ) ) )? )
+            // InternalScope.g:838:2: (this_ScopeDelegation_0= ruleScopeDelegation | this_FactoryExpression_1= ruleFactoryExpression | this_NamedScopeExpression_2= ruleNamedScopeExpression ) (otherlv_3= '|' ( (lv_prune_4_0= ruleExpression ) ) )?
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:838:2: (this_ScopeDelegation_0= ruleScopeDelegation | this_FactoryExpression_1= ruleFactoryExpression | this_NamedScopeExpression_2= ruleNamedScopeExpression )
+            // InternalScope.g:838:2: (this_ScopeDelegation_0= ruleScopeDelegation | this_FactoryExpression_1= ruleFactoryExpression | this_NamedScopeExpression_2= ruleNamedScopeExpression )
             int alt16=3;
             switch ( input.LA(1) ) {
             case 35:
@@ -2401,14 +2401,14 @@ public final EObject ruleScopeExpression() throws RecognitionException {
 
             switch (alt16) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:839:5: this_ScopeDelegation_0= ruleScopeDelegation
+                    // InternalScope.g:839:5: this_ScopeDelegation_0= ruleScopeDelegation
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getScopeExpressionAccess().getScopeDelegationParserRuleCall_0_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleScopeDelegation_in_ruleScopeExpression1712);
+                    pushFollow(FOLLOW_29);
                     this_ScopeDelegation_0=ruleScopeDelegation();
 
                     state._fsp--;
@@ -2423,14 +2423,14 @@ public final EObject ruleScopeExpression() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:849:5: this_FactoryExpression_1= ruleFactoryExpression
+                    // InternalScope.g:849:5: this_FactoryExpression_1= ruleFactoryExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getScopeExpressionAccess().getFactoryExpressionParserRuleCall_0_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleFactoryExpression_in_ruleScopeExpression1739);
+                    pushFollow(FOLLOW_29);
                     this_FactoryExpression_1=ruleFactoryExpression();
 
                     state._fsp--;
@@ -2445,14 +2445,14 @@ public final EObject ruleScopeExpression() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:859:5: this_NamedScopeExpression_2= ruleNamedScopeExpression
+                    // InternalScope.g:859:5: this_NamedScopeExpression_2= ruleNamedScopeExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getScopeExpressionAccess().getNamedScopeExpressionParserRuleCall_0_2()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleNamedScopeExpression_in_ruleScopeExpression1766);
+                    pushFollow(FOLLOW_29);
                     this_NamedScopeExpression_2=ruleNamedScopeExpression();
 
                     state._fsp--;
@@ -2469,7 +2469,7 @@ public final EObject ruleScopeExpression() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:867:2: (otherlv_3= '|' ( (lv_prune_4_0= ruleExpression ) ) )?
+            // InternalScope.g:867:2: (otherlv_3= '|' ( (lv_prune_4_0= ruleExpression ) ) )?
             int alt17=2;
             int LA17_0 = input.LA(1);
 
@@ -2478,26 +2478,26 @@ public final EObject ruleScopeExpression() throws RecognitionException {
             }
             switch (alt17) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:867:4: otherlv_3= '|' ( (lv_prune_4_0= ruleExpression ) )
+                    // InternalScope.g:867:4: otherlv_3= '|' ( (lv_prune_4_0= ruleExpression ) )
                     {
-                    otherlv_3=(Token)match(input,33,FOLLOW_33_in_ruleScopeExpression1779); if (state.failed) return current;
+                    otherlv_3=(Token)match(input,33,FOLLOW_17); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_3, grammarAccess.getScopeExpressionAccess().getVerticalLineKeyword_1_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:871:1: ( (lv_prune_4_0= ruleExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:872:1: (lv_prune_4_0= ruleExpression )
+                    // InternalScope.g:871:1: ( (lv_prune_4_0= ruleExpression ) )
+                    // InternalScope.g:872:1: (lv_prune_4_0= ruleExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:872:1: (lv_prune_4_0= ruleExpression )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:873:3: lv_prune_4_0= ruleExpression
+                    // InternalScope.g:872:1: (lv_prune_4_0= ruleExpression )
+                    // InternalScope.g:873:3: lv_prune_4_0= ruleExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getScopeExpressionAccess().getPruneExpressionParserRuleCall_1_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleExpression_in_ruleScopeExpression1800);
+                    pushFollow(FOLLOW_2);
                     lv_prune_4_0=ruleExpression();
 
                     state._fsp--;
@@ -2511,7 +2511,7 @@ public final EObject ruleScopeExpression() throws RecognitionException {
                              			current, 
                              			"prune",
                               		lv_prune_4_0, 
-                              		"Expression");
+                              		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -2550,7 +2550,7 @@ public final EObject ruleScopeExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleFactoryExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:897:1: entryRuleFactoryExpression returns [EObject current=null] : iv_ruleFactoryExpression= ruleFactoryExpression EOF ;
+    // InternalScope.g:897:1: entryRuleFactoryExpression returns [EObject current=null] : iv_ruleFactoryExpression= ruleFactoryExpression EOF ;
     public final EObject entryRuleFactoryExpression() throws RecognitionException {
         EObject current = null;
 
@@ -2558,13 +2558,13 @@ public final EObject entryRuleFactoryExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:898:2: (iv_ruleFactoryExpression= ruleFactoryExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:899:2: iv_ruleFactoryExpression= ruleFactoryExpression EOF
+            // InternalScope.g:898:2: (iv_ruleFactoryExpression= ruleFactoryExpression EOF )
+            // InternalScope.g:899:2: iv_ruleFactoryExpression= ruleFactoryExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getFactoryExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleFactoryExpression_in_entryRuleFactoryExpression1838);
+            pushFollow(FOLLOW_1);
             iv_ruleFactoryExpression=ruleFactoryExpression();
 
             state._fsp--;
@@ -2572,7 +2572,7 @@ public final EObject entryRuleFactoryExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleFactoryExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFactoryExpression1848); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -2590,7 +2590,7 @@ public final EObject entryRuleFactoryExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleFactoryExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:906:1: ruleFactoryExpression returns [EObject current=null] : (otherlv_0= 'factory' ( (lv_expr_1_0= ruleExpression ) ) ) ;
+    // InternalScope.g:906:1: ruleFactoryExpression returns [EObject current=null] : (otherlv_0= 'factory' ( (lv_expr_1_0= ruleExpression ) ) ) ;
     public final EObject ruleFactoryExpression() throws RecognitionException {
         EObject current = null;
 
@@ -2601,30 +2601,30 @@ public final EObject ruleFactoryExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:909:28: ( (otherlv_0= 'factory' ( (lv_expr_1_0= ruleExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:910:1: (otherlv_0= 'factory' ( (lv_expr_1_0= ruleExpression ) ) )
+            // InternalScope.g:909:28: ( (otherlv_0= 'factory' ( (lv_expr_1_0= ruleExpression ) ) ) )
+            // InternalScope.g:910:1: (otherlv_0= 'factory' ( (lv_expr_1_0= ruleExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:910:1: (otherlv_0= 'factory' ( (lv_expr_1_0= ruleExpression ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:910:3: otherlv_0= 'factory' ( (lv_expr_1_0= ruleExpression ) )
+            // InternalScope.g:910:1: (otherlv_0= 'factory' ( (lv_expr_1_0= ruleExpression ) ) )
+            // InternalScope.g:910:3: otherlv_0= 'factory' ( (lv_expr_1_0= ruleExpression ) )
             {
-            otherlv_0=(Token)match(input,34,FOLLOW_34_in_ruleFactoryExpression1885); if (state.failed) return current;
+            otherlv_0=(Token)match(input,34,FOLLOW_17); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getFactoryExpressionAccess().getFactoryKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:914:1: ( (lv_expr_1_0= ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:915:1: (lv_expr_1_0= ruleExpression )
+            // InternalScope.g:914:1: ( (lv_expr_1_0= ruleExpression ) )
+            // InternalScope.g:915:1: (lv_expr_1_0= ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:915:1: (lv_expr_1_0= ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:916:3: lv_expr_1_0= ruleExpression
+            // InternalScope.g:915:1: (lv_expr_1_0= ruleExpression )
+            // InternalScope.g:916:3: lv_expr_1_0= ruleExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getFactoryExpressionAccess().getExprExpressionParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleExpression_in_ruleFactoryExpression1906);
+            pushFollow(FOLLOW_2);
             lv_expr_1_0=ruleExpression();
 
             state._fsp--;
@@ -2638,7 +2638,7 @@ public final EObject ruleFactoryExpression() throws RecognitionException {
                      			current, 
                      			"expr",
                       		lv_expr_1_0, 
-                      		"Expression");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -2671,7 +2671,7 @@ public final EObject ruleFactoryExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleScopeDelegation"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:940:1: entryRuleScopeDelegation returns [EObject current=null] : iv_ruleScopeDelegation= ruleScopeDelegation EOF ;
+    // InternalScope.g:940:1: entryRuleScopeDelegation returns [EObject current=null] : iv_ruleScopeDelegation= ruleScopeDelegation EOF ;
     public final EObject entryRuleScopeDelegation() throws RecognitionException {
         EObject current = null;
 
@@ -2679,13 +2679,13 @@ public final EObject entryRuleScopeDelegation() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:941:2: (iv_ruleScopeDelegation= ruleScopeDelegation EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:942:2: iv_ruleScopeDelegation= ruleScopeDelegation EOF
+            // InternalScope.g:941:2: (iv_ruleScopeDelegation= ruleScopeDelegation EOF )
+            // InternalScope.g:942:2: iv_ruleScopeDelegation= ruleScopeDelegation EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getScopeDelegationRule()); 
             }
-            pushFollow(FOLLOW_ruleScopeDelegation_in_entryRuleScopeDelegation1942);
+            pushFollow(FOLLOW_1);
             iv_ruleScopeDelegation=ruleScopeDelegation();
 
             state._fsp--;
@@ -2693,7 +2693,7 @@ public final EObject entryRuleScopeDelegation() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleScopeDelegation; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleScopeDelegation1952); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -2711,7 +2711,7 @@ public final EObject entryRuleScopeDelegation() throws RecognitionException {
 
 
     // $ANTLR start "ruleScopeDelegation"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:949:1: ruleScopeDelegation returns [EObject current=null] : (otherlv_0= 'scopeof' otherlv_1= '(' ( ( (lv_delegate_2_0= ruleExpression ) ) | ( (lv_external_3_0= ruleGlobalScopeExpression ) ) ) (otherlv_4= ',' ( ( ruleIdentifier ) ) )? otherlv_6= ')' ) ;
+    // InternalScope.g:949:1: ruleScopeDelegation returns [EObject current=null] : (otherlv_0= 'scopeof' otherlv_1= '(' ( ( (lv_delegate_2_0= ruleExpression ) ) | ( (lv_external_3_0= ruleGlobalScopeExpression ) ) ) (otherlv_4= ',' ( ( ruleIdentifier ) ) )? otherlv_6= ')' ) ;
     public final EObject ruleScopeDelegation() throws RecognitionException {
         EObject current = null;
 
@@ -2727,25 +2727,25 @@ public final EObject ruleScopeDelegation() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:952:28: ( (otherlv_0= 'scopeof' otherlv_1= '(' ( ( (lv_delegate_2_0= ruleExpression ) ) | ( (lv_external_3_0= ruleGlobalScopeExpression ) ) ) (otherlv_4= ',' ( ( ruleIdentifier ) ) )? otherlv_6= ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:953:1: (otherlv_0= 'scopeof' otherlv_1= '(' ( ( (lv_delegate_2_0= ruleExpression ) ) | ( (lv_external_3_0= ruleGlobalScopeExpression ) ) ) (otherlv_4= ',' ( ( ruleIdentifier ) ) )? otherlv_6= ')' )
+            // InternalScope.g:952:28: ( (otherlv_0= 'scopeof' otherlv_1= '(' ( ( (lv_delegate_2_0= ruleExpression ) ) | ( (lv_external_3_0= ruleGlobalScopeExpression ) ) ) (otherlv_4= ',' ( ( ruleIdentifier ) ) )? otherlv_6= ')' ) )
+            // InternalScope.g:953:1: (otherlv_0= 'scopeof' otherlv_1= '(' ( ( (lv_delegate_2_0= ruleExpression ) ) | ( (lv_external_3_0= ruleGlobalScopeExpression ) ) ) (otherlv_4= ',' ( ( ruleIdentifier ) ) )? otherlv_6= ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:953:1: (otherlv_0= 'scopeof' otherlv_1= '(' ( ( (lv_delegate_2_0= ruleExpression ) ) | ( (lv_external_3_0= ruleGlobalScopeExpression ) ) ) (otherlv_4= ',' ( ( ruleIdentifier ) ) )? otherlv_6= ')' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:953:3: otherlv_0= 'scopeof' otherlv_1= '(' ( ( (lv_delegate_2_0= ruleExpression ) ) | ( (lv_external_3_0= ruleGlobalScopeExpression ) ) ) (otherlv_4= ',' ( ( ruleIdentifier ) ) )? otherlv_6= ')'
+            // InternalScope.g:953:1: (otherlv_0= 'scopeof' otherlv_1= '(' ( ( (lv_delegate_2_0= ruleExpression ) ) | ( (lv_external_3_0= ruleGlobalScopeExpression ) ) ) (otherlv_4= ',' ( ( ruleIdentifier ) ) )? otherlv_6= ')' )
+            // InternalScope.g:953:3: otherlv_0= 'scopeof' otherlv_1= '(' ( ( (lv_delegate_2_0= ruleExpression ) ) | ( (lv_external_3_0= ruleGlobalScopeExpression ) ) ) (otherlv_4= ',' ( ( ruleIdentifier ) ) )? otherlv_6= ')'
             {
-            otherlv_0=(Token)match(input,35,FOLLOW_35_in_ruleScopeDelegation1989); if (state.failed) return current;
+            otherlv_0=(Token)match(input,35,FOLLOW_30); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getScopeDelegationAccess().getScopeofKeyword_0());
                   
             }
-            otherlv_1=(Token)match(input,25,FOLLOW_25_in_ruleScopeDelegation2001); if (state.failed) return current;
+            otherlv_1=(Token)match(input,25,FOLLOW_31); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getScopeDelegationAccess().getLeftParenthesisKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:961:1: ( ( (lv_delegate_2_0= ruleExpression ) ) | ( (lv_external_3_0= ruleGlobalScopeExpression ) ) )
+            // InternalScope.g:961:1: ( ( (lv_delegate_2_0= ruleExpression ) ) | ( (lv_external_3_0= ruleGlobalScopeExpression ) ) )
             int alt18=2;
             int LA18_0 = input.LA(1);
 
@@ -2764,20 +2764,20 @@ else if ( (LA18_0==37) ) {
             }
             switch (alt18) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:961:2: ( (lv_delegate_2_0= ruleExpression ) )
+                    // InternalScope.g:961:2: ( (lv_delegate_2_0= ruleExpression ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:961:2: ( (lv_delegate_2_0= ruleExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:962:1: (lv_delegate_2_0= ruleExpression )
+                    // InternalScope.g:961:2: ( (lv_delegate_2_0= ruleExpression ) )
+                    // InternalScope.g:962:1: (lv_delegate_2_0= ruleExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:962:1: (lv_delegate_2_0= ruleExpression )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:963:3: lv_delegate_2_0= ruleExpression
+                    // InternalScope.g:962:1: (lv_delegate_2_0= ruleExpression )
+                    // InternalScope.g:963:3: lv_delegate_2_0= ruleExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getScopeDelegationAccess().getDelegateExpressionParserRuleCall_2_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleExpression_in_ruleScopeDelegation2023);
+                    pushFollow(FOLLOW_32);
                     lv_delegate_2_0=ruleExpression();
 
                     state._fsp--;
@@ -2791,7 +2791,7 @@ else if ( (LA18_0==37) ) {
                              			current, 
                              			"delegate",
                               		lv_delegate_2_0, 
-                              		"Expression");
+                              		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -2805,20 +2805,20 @@ else if ( (LA18_0==37) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:980:6: ( (lv_external_3_0= ruleGlobalScopeExpression ) )
+                    // InternalScope.g:980:6: ( (lv_external_3_0= ruleGlobalScopeExpression ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:980:6: ( (lv_external_3_0= ruleGlobalScopeExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:981:1: (lv_external_3_0= ruleGlobalScopeExpression )
+                    // InternalScope.g:980:6: ( (lv_external_3_0= ruleGlobalScopeExpression ) )
+                    // InternalScope.g:981:1: (lv_external_3_0= ruleGlobalScopeExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:981:1: (lv_external_3_0= ruleGlobalScopeExpression )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:982:3: lv_external_3_0= ruleGlobalScopeExpression
+                    // InternalScope.g:981:1: (lv_external_3_0= ruleGlobalScopeExpression )
+                    // InternalScope.g:982:3: lv_external_3_0= ruleGlobalScopeExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getScopeDelegationAccess().getExternalGlobalScopeExpressionParserRuleCall_2_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleGlobalScopeExpression_in_ruleScopeDelegation2050);
+                    pushFollow(FOLLOW_32);
                     lv_external_3_0=ruleGlobalScopeExpression();
 
                     state._fsp--;
@@ -2832,7 +2832,7 @@ else if ( (LA18_0==37) ) {
                              			current, 
                              			"external",
                               		lv_external_3_0, 
-                              		"GlobalScopeExpression");
+                              		"com.avaloq.tools.ddk.xtext.scope.Scope.GlobalScopeExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -2848,7 +2848,7 @@ else if ( (LA18_0==37) ) {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:998:3: (otherlv_4= ',' ( ( ruleIdentifier ) ) )?
+            // InternalScope.g:998:3: (otherlv_4= ',' ( ( ruleIdentifier ) ) )?
             int alt19=2;
             int LA19_0 = input.LA(1);
 
@@ -2857,19 +2857,19 @@ else if ( (LA18_0==37) ) {
             }
             switch (alt19) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:998:5: otherlv_4= ',' ( ( ruleIdentifier ) )
+                    // InternalScope.g:998:5: otherlv_4= ',' ( ( ruleIdentifier ) )
                     {
-                    otherlv_4=(Token)match(input,36,FOLLOW_36_in_ruleScopeDelegation2064); if (state.failed) return current;
+                    otherlv_4=(Token)match(input,36,FOLLOW_3); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_4, grammarAccess.getScopeDelegationAccess().getCommaKeyword_3_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1002:1: ( ( ruleIdentifier ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1003:1: ( ruleIdentifier )
+                    // InternalScope.g:1002:1: ( ( ruleIdentifier ) )
+                    // InternalScope.g:1003:1: ( ruleIdentifier )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1003:1: ( ruleIdentifier )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1004:3: ruleIdentifier
+                    // InternalScope.g:1003:1: ( ruleIdentifier )
+                    // InternalScope.g:1004:3: ruleIdentifier
                     {
                     if ( state.backtracking==0 ) {
 
@@ -2883,7 +2883,7 @@ else if ( (LA18_0==37) ) {
                       	        newCompositeNode(grammarAccess.getScopeDelegationAccess().getScopeScopeDefinitionCrossReference_3_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleIdentifier_in_ruleScopeDelegation2087);
+                    pushFollow(FOLLOW_20);
                     ruleIdentifier();
 
                     state._fsp--;
@@ -2905,7 +2905,7 @@ else if ( (LA18_0==37) ) {
 
             }
 
-            otherlv_6=(Token)match(input,26,FOLLOW_26_in_ruleScopeDelegation2101); if (state.failed) return current;
+            otherlv_6=(Token)match(input,26,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_6, grammarAccess.getScopeDelegationAccess().getRightParenthesisKeyword_4());
@@ -2934,7 +2934,7 @@ else if ( (LA18_0==37) ) {
 
 
     // $ANTLR start "entryRuleNamedScopeExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1029:1: entryRuleNamedScopeExpression returns [EObject current=null] : iv_ruleNamedScopeExpression= ruleNamedScopeExpression EOF ;
+    // InternalScope.g:1029:1: entryRuleNamedScopeExpression returns [EObject current=null] : iv_ruleNamedScopeExpression= ruleNamedScopeExpression EOF ;
     public final EObject entryRuleNamedScopeExpression() throws RecognitionException {
         EObject current = null;
 
@@ -2942,13 +2942,13 @@ public final EObject entryRuleNamedScopeExpression() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1030:2: (iv_ruleNamedScopeExpression= ruleNamedScopeExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1031:2: iv_ruleNamedScopeExpression= ruleNamedScopeExpression EOF
+            // InternalScope.g:1030:2: (iv_ruleNamedScopeExpression= ruleNamedScopeExpression EOF )
+            // InternalScope.g:1031:2: iv_ruleNamedScopeExpression= ruleNamedScopeExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getNamedScopeExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleNamedScopeExpression_in_entryRuleNamedScopeExpression2137);
+            pushFollow(FOLLOW_1);
             iv_ruleNamedScopeExpression=ruleNamedScopeExpression();
 
             state._fsp--;
@@ -2956,7 +2956,7 @@ public final EObject entryRuleNamedScopeExpression() throws RecognitionException
             if ( state.backtracking==0 ) {
                current =iv_ruleNamedScopeExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNamedScopeExpression2147); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -2974,7 +2974,7 @@ public final EObject entryRuleNamedScopeExpression() throws RecognitionException
 
 
     // $ANTLR start "ruleNamedScopeExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1038:1: ruleNamedScopeExpression returns [EObject current=null] : ( (this_GlobalScopeExpression_0= ruleGlobalScopeExpression | this_SimpleScopeExpression_1= ruleSimpleScopeExpression ) ( ( (lv_caseDef_2_0= 'case' ) ) ( (lv_casing_3_0= ruleCasing ) ) )? (otherlv_4= 'as' ( (lv_naming_5_0= ruleNaming ) ) )? ) ;
+    // InternalScope.g:1038:1: ruleNamedScopeExpression returns [EObject current=null] : ( (this_GlobalScopeExpression_0= ruleGlobalScopeExpression | this_SimpleScopeExpression_1= ruleSimpleScopeExpression ) ( ( (lv_caseDef_2_0= 'case' ) ) ( (lv_casing_3_0= ruleCasing ) ) )? (otherlv_4= 'as' ( (lv_naming_5_0= ruleNaming ) ) )? ) ;
     public final EObject ruleNamedScopeExpression() throws RecognitionException {
         EObject current = null;
 
@@ -2992,13 +2992,13 @@ public final EObject ruleNamedScopeExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1041:28: ( ( (this_GlobalScopeExpression_0= ruleGlobalScopeExpression | this_SimpleScopeExpression_1= ruleSimpleScopeExpression ) ( ( (lv_caseDef_2_0= 'case' ) ) ( (lv_casing_3_0= ruleCasing ) ) )? (otherlv_4= 'as' ( (lv_naming_5_0= ruleNaming ) ) )? ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1042:1: ( (this_GlobalScopeExpression_0= ruleGlobalScopeExpression | this_SimpleScopeExpression_1= ruleSimpleScopeExpression ) ( ( (lv_caseDef_2_0= 'case' ) ) ( (lv_casing_3_0= ruleCasing ) ) )? (otherlv_4= 'as' ( (lv_naming_5_0= ruleNaming ) ) )? )
+            // InternalScope.g:1041:28: ( ( (this_GlobalScopeExpression_0= ruleGlobalScopeExpression | this_SimpleScopeExpression_1= ruleSimpleScopeExpression ) ( ( (lv_caseDef_2_0= 'case' ) ) ( (lv_casing_3_0= ruleCasing ) ) )? (otherlv_4= 'as' ( (lv_naming_5_0= ruleNaming ) ) )? ) )
+            // InternalScope.g:1042:1: ( (this_GlobalScopeExpression_0= ruleGlobalScopeExpression | this_SimpleScopeExpression_1= ruleSimpleScopeExpression ) ( ( (lv_caseDef_2_0= 'case' ) ) ( (lv_casing_3_0= ruleCasing ) ) )? (otherlv_4= 'as' ( (lv_naming_5_0= ruleNaming ) ) )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1042:1: ( (this_GlobalScopeExpression_0= ruleGlobalScopeExpression | this_SimpleScopeExpression_1= ruleSimpleScopeExpression ) ( ( (lv_caseDef_2_0= 'case' ) ) ( (lv_casing_3_0= ruleCasing ) ) )? (otherlv_4= 'as' ( (lv_naming_5_0= ruleNaming ) ) )? )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1042:2: (this_GlobalScopeExpression_0= ruleGlobalScopeExpression | this_SimpleScopeExpression_1= ruleSimpleScopeExpression ) ( ( (lv_caseDef_2_0= 'case' ) ) ( (lv_casing_3_0= ruleCasing ) ) )? (otherlv_4= 'as' ( (lv_naming_5_0= ruleNaming ) ) )?
+            // InternalScope.g:1042:1: ( (this_GlobalScopeExpression_0= ruleGlobalScopeExpression | this_SimpleScopeExpression_1= ruleSimpleScopeExpression ) ( ( (lv_caseDef_2_0= 'case' ) ) ( (lv_casing_3_0= ruleCasing ) ) )? (otherlv_4= 'as' ( (lv_naming_5_0= ruleNaming ) ) )? )
+            // InternalScope.g:1042:2: (this_GlobalScopeExpression_0= ruleGlobalScopeExpression | this_SimpleScopeExpression_1= ruleSimpleScopeExpression ) ( ( (lv_caseDef_2_0= 'case' ) ) ( (lv_casing_3_0= ruleCasing ) ) )? (otherlv_4= 'as' ( (lv_naming_5_0= ruleNaming ) ) )?
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1042:2: (this_GlobalScopeExpression_0= ruleGlobalScopeExpression | this_SimpleScopeExpression_1= ruleSimpleScopeExpression )
+            // InternalScope.g:1042:2: (this_GlobalScopeExpression_0= ruleGlobalScopeExpression | this_SimpleScopeExpression_1= ruleSimpleScopeExpression )
             int alt20=2;
             int LA20_0 = input.LA(1);
 
@@ -3017,14 +3017,14 @@ else if ( ((LA20_0>=RULE_STRING && LA20_0<=RULE_ID)||LA20_0==20||LA20_0==25||LA2
             }
             switch (alt20) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1043:5: this_GlobalScopeExpression_0= ruleGlobalScopeExpression
+                    // InternalScope.g:1043:5: this_GlobalScopeExpression_0= ruleGlobalScopeExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getNamedScopeExpressionAccess().getGlobalScopeExpressionParserRuleCall_0_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleGlobalScopeExpression_in_ruleNamedScopeExpression2195);
+                    pushFollow(FOLLOW_33);
                     this_GlobalScopeExpression_0=ruleGlobalScopeExpression();
 
                     state._fsp--;
@@ -3039,14 +3039,14 @@ else if ( ((LA20_0>=RULE_STRING && LA20_0<=RULE_ID)||LA20_0==20||LA20_0==25||LA2
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1053:5: this_SimpleScopeExpression_1= ruleSimpleScopeExpression
+                    // InternalScope.g:1053:5: this_SimpleScopeExpression_1= ruleSimpleScopeExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getNamedScopeExpressionAccess().getSimpleScopeExpressionParserRuleCall_0_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleSimpleScopeExpression_in_ruleNamedScopeExpression2222);
+                    pushFollow(FOLLOW_33);
                     this_SimpleScopeExpression_1=ruleSimpleScopeExpression();
 
                     state._fsp--;
@@ -3063,7 +3063,7 @@ else if ( ((LA20_0>=RULE_STRING && LA20_0<=RULE_ID)||LA20_0==20||LA20_0==25||LA2
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1061:2: ( ( (lv_caseDef_2_0= 'case' ) ) ( (lv_casing_3_0= ruleCasing ) ) )?
+            // InternalScope.g:1061:2: ( ( (lv_caseDef_2_0= 'case' ) ) ( (lv_casing_3_0= ruleCasing ) ) )?
             int alt21=2;
             int LA21_0 = input.LA(1);
 
@@ -3072,15 +3072,15 @@ else if ( ((LA20_0>=RULE_STRING && LA20_0<=RULE_ID)||LA20_0==20||LA20_0==25||LA2
             }
             switch (alt21) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1061:3: ( (lv_caseDef_2_0= 'case' ) ) ( (lv_casing_3_0= ruleCasing ) )
+                    // InternalScope.g:1061:3: ( (lv_caseDef_2_0= 'case' ) ) ( (lv_casing_3_0= ruleCasing ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1061:3: ( (lv_caseDef_2_0= 'case' ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1062:1: (lv_caseDef_2_0= 'case' )
+                    // InternalScope.g:1061:3: ( (lv_caseDef_2_0= 'case' ) )
+                    // InternalScope.g:1062:1: (lv_caseDef_2_0= 'case' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1062:1: (lv_caseDef_2_0= 'case' )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1063:3: lv_caseDef_2_0= 'case'
+                    // InternalScope.g:1062:1: (lv_caseDef_2_0= 'case' )
+                    // InternalScope.g:1063:3: lv_caseDef_2_0= 'case'
                     {
-                    lv_caseDef_2_0=(Token)match(input,18,FOLLOW_18_in_ruleNamedScopeExpression2241); if (state.failed) return current;
+                    lv_caseDef_2_0=(Token)match(input,18,FOLLOW_12); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_caseDef_2_0, grammarAccess.getNamedScopeExpressionAccess().getCaseDefCaseKeyword_1_0_0());
@@ -3100,18 +3100,18 @@ else if ( ((LA20_0>=RULE_STRING && LA20_0<=RULE_ID)||LA20_0==20||LA20_0==25||LA2
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1076:2: ( (lv_casing_3_0= ruleCasing ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1077:1: (lv_casing_3_0= ruleCasing )
+                    // InternalScope.g:1076:2: ( (lv_casing_3_0= ruleCasing ) )
+                    // InternalScope.g:1077:1: (lv_casing_3_0= ruleCasing )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1077:1: (lv_casing_3_0= ruleCasing )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1078:3: lv_casing_3_0= ruleCasing
+                    // InternalScope.g:1077:1: (lv_casing_3_0= ruleCasing )
+                    // InternalScope.g:1078:3: lv_casing_3_0= ruleCasing
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getNamedScopeExpressionAccess().getCasingCasingEnumRuleCall_1_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleCasing_in_ruleNamedScopeExpression2275);
+                    pushFollow(FOLLOW_10);
                     lv_casing_3_0=ruleCasing();
 
                     state._fsp--;
@@ -3125,7 +3125,7 @@ else if ( ((LA20_0>=RULE_STRING && LA20_0<=RULE_ID)||LA20_0==20||LA20_0==25||LA2
                              			current, 
                              			"casing",
                               		lv_casing_3_0, 
-                              		"Casing");
+                              		"com.avaloq.tools.ddk.xtext.scope.Scope.Casing");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -3141,7 +3141,7 @@ else if ( ((LA20_0>=RULE_STRING && LA20_0<=RULE_ID)||LA20_0==20||LA20_0==25||LA2
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1094:4: (otherlv_4= 'as' ( (lv_naming_5_0= ruleNaming ) ) )?
+            // InternalScope.g:1094:4: (otherlv_4= 'as' ( (lv_naming_5_0= ruleNaming ) ) )?
             int alt22=2;
             int LA22_0 = input.LA(1);
 
@@ -3150,26 +3150,26 @@ else if ( ((LA20_0>=RULE_STRING && LA20_0<=RULE_ID)||LA20_0==20||LA20_0==25||LA2
             }
             switch (alt22) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1094:6: otherlv_4= 'as' ( (lv_naming_5_0= ruleNaming ) )
+                    // InternalScope.g:1094:6: otherlv_4= 'as' ( (lv_naming_5_0= ruleNaming ) )
                     {
-                    otherlv_4=(Token)match(input,15,FOLLOW_15_in_ruleNamedScopeExpression2290); if (state.failed) return current;
+                    otherlv_4=(Token)match(input,15,FOLLOW_17); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_4, grammarAccess.getNamedScopeExpressionAccess().getAsKeyword_2_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1098:1: ( (lv_naming_5_0= ruleNaming ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1099:1: (lv_naming_5_0= ruleNaming )
+                    // InternalScope.g:1098:1: ( (lv_naming_5_0= ruleNaming ) )
+                    // InternalScope.g:1099:1: (lv_naming_5_0= ruleNaming )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1099:1: (lv_naming_5_0= ruleNaming )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1100:3: lv_naming_5_0= ruleNaming
+                    // InternalScope.g:1099:1: (lv_naming_5_0= ruleNaming )
+                    // InternalScope.g:1100:3: lv_naming_5_0= ruleNaming
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getNamedScopeExpressionAccess().getNamingNamingParserRuleCall_2_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleNaming_in_ruleNamedScopeExpression2311);
+                    pushFollow(FOLLOW_2);
                     lv_naming_5_0=ruleNaming();
 
                     state._fsp--;
@@ -3183,7 +3183,7 @@ else if ( ((LA20_0>=RULE_STRING && LA20_0<=RULE_ID)||LA20_0==20||LA20_0==25||LA2
                              			current, 
                              			"naming",
                               		lv_naming_5_0, 
-                              		"Naming");
+                              		"com.avaloq.tools.ddk.xtext.scope.Scope.Naming");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -3222,7 +3222,7 @@ else if ( ((LA20_0>=RULE_STRING && LA20_0<=RULE_ID)||LA20_0==20||LA20_0==25||LA2
 
 
     // $ANTLR start "entryRuleGlobalScopeExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1124:1: entryRuleGlobalScopeExpression returns [EObject current=null] : iv_ruleGlobalScopeExpression= ruleGlobalScopeExpression EOF ;
+    // InternalScope.g:1124:1: entryRuleGlobalScopeExpression returns [EObject current=null] : iv_ruleGlobalScopeExpression= ruleGlobalScopeExpression EOF ;
     public final EObject entryRuleGlobalScopeExpression() throws RecognitionException {
         EObject current = null;
 
@@ -3230,13 +3230,13 @@ public final EObject entryRuleGlobalScopeExpression() throws RecognitionExceptio
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1125:2: (iv_ruleGlobalScopeExpression= ruleGlobalScopeExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1126:2: iv_ruleGlobalScopeExpression= ruleGlobalScopeExpression EOF
+            // InternalScope.g:1125:2: (iv_ruleGlobalScopeExpression= ruleGlobalScopeExpression EOF )
+            // InternalScope.g:1126:2: iv_ruleGlobalScopeExpression= ruleGlobalScopeExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getGlobalScopeExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleGlobalScopeExpression_in_entryRuleGlobalScopeExpression2349);
+            pushFollow(FOLLOW_1);
             iv_ruleGlobalScopeExpression=ruleGlobalScopeExpression();
 
             state._fsp--;
@@ -3244,7 +3244,7 @@ public final EObject entryRuleGlobalScopeExpression() throws RecognitionExceptio
             if ( state.backtracking==0 ) {
                current =iv_ruleGlobalScopeExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleGlobalScopeExpression2359); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -3262,7 +3262,7 @@ public final EObject entryRuleGlobalScopeExpression() throws RecognitionExceptio
 
 
     // $ANTLR start "ruleGlobalScopeExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1133:1: ruleGlobalScopeExpression returns [EObject current=null] : (otherlv_0= 'find' otherlv_1= '(' ( ( ruleQualifiedID ) ) ( (otherlv_3= ',' otherlv_4= 'key' otherlv_5= '=' ( (lv_name_6_0= ruleExpression ) ) ) | (otherlv_7= ',' ( (lv_recursivePrefix_8_0= 'recursive' ) )? otherlv_9= 'prefix' otherlv_10= '=' ( (lv_prefix_11_0= ruleExpression ) ) ) )? (otherlv_12= ',' otherlv_13= 'data' otherlv_14= '=' otherlv_15= '(' ( (lv_data_16_0= ruleDataExpression ) ) (otherlv_17= ',' ( (lv_data_18_0= ruleDataExpression ) ) )* otherlv_19= ')' )? (otherlv_20= ',' otherlv_21= 'domains' otherlv_22= '=' ( ( (lv_domains_23_0= '*' ) ) | ( (lv_domains_24_0= ruleIdentifier ) ) | (otherlv_25= '(' ( (lv_domains_26_0= ruleIdentifier ) ) (otherlv_27= ',' ( (lv_domains_28_0= ruleIdentifier ) ) )* otherlv_29= ')' ) ) )? otherlv_30= ')' ) ;
+    // InternalScope.g:1133:1: ruleGlobalScopeExpression returns [EObject current=null] : (otherlv_0= 'find' otherlv_1= '(' ( ( ruleQualifiedID ) ) ( (otherlv_3= ',' otherlv_4= 'key' otherlv_5= '=' ( (lv_name_6_0= ruleExpression ) ) ) | (otherlv_7= ',' ( (lv_recursivePrefix_8_0= 'recursive' ) )? otherlv_9= 'prefix' otherlv_10= '=' ( (lv_prefix_11_0= ruleExpression ) ) ) )? (otherlv_12= ',' otherlv_13= 'data' otherlv_14= '=' otherlv_15= '(' ( (lv_data_16_0= ruleDataExpression ) ) (otherlv_17= ',' ( (lv_data_18_0= ruleDataExpression ) ) )* otherlv_19= ')' )? (otherlv_20= ',' otherlv_21= 'domains' otherlv_22= '=' ( ( (lv_domains_23_0= '*' ) ) | ( (lv_domains_24_0= ruleIdentifier ) ) | (otherlv_25= '(' ( (lv_domains_26_0= ruleIdentifier ) ) (otherlv_27= ',' ( (lv_domains_28_0= ruleIdentifier ) ) )* otherlv_29= ')' ) ) )? otherlv_30= ')' ) ;
     public final EObject ruleGlobalScopeExpression() throws RecognitionException {
         EObject current = null;
 
@@ -3307,29 +3307,29 @@ public final EObject ruleGlobalScopeExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1136:28: ( (otherlv_0= 'find' otherlv_1= '(' ( ( ruleQualifiedID ) ) ( (otherlv_3= ',' otherlv_4= 'key' otherlv_5= '=' ( (lv_name_6_0= ruleExpression ) ) ) | (otherlv_7= ',' ( (lv_recursivePrefix_8_0= 'recursive' ) )? otherlv_9= 'prefix' otherlv_10= '=' ( (lv_prefix_11_0= ruleExpression ) ) ) )? (otherlv_12= ',' otherlv_13= 'data' otherlv_14= '=' otherlv_15= '(' ( (lv_data_16_0= ruleDataExpression ) ) (otherlv_17= ',' ( (lv_data_18_0= ruleDataExpression ) ) )* otherlv_19= ')' )? (otherlv_20= ',' otherlv_21= 'domains' otherlv_22= '=' ( ( (lv_domains_23_0= '*' ) ) | ( (lv_domains_24_0= ruleIdentifier ) ) | (otherlv_25= '(' ( (lv_domains_26_0= ruleIdentifier ) ) (otherlv_27= ',' ( (lv_domains_28_0= ruleIdentifier ) ) )* otherlv_29= ')' ) ) )? otherlv_30= ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1137:1: (otherlv_0= 'find' otherlv_1= '(' ( ( ruleQualifiedID ) ) ( (otherlv_3= ',' otherlv_4= 'key' otherlv_5= '=' ( (lv_name_6_0= ruleExpression ) ) ) | (otherlv_7= ',' ( (lv_recursivePrefix_8_0= 'recursive' ) )? otherlv_9= 'prefix' otherlv_10= '=' ( (lv_prefix_11_0= ruleExpression ) ) ) )? (otherlv_12= ',' otherlv_13= 'data' otherlv_14= '=' otherlv_15= '(' ( (lv_data_16_0= ruleDataExpression ) ) (otherlv_17= ',' ( (lv_data_18_0= ruleDataExpression ) ) )* otherlv_19= ')' )? (otherlv_20= ',' otherlv_21= 'domains' otherlv_22= '=' ( ( (lv_domains_23_0= '*' ) ) | ( (lv_domains_24_0= ruleIdentifier ) ) | (otherlv_25= '(' ( (lv_domains_26_0= ruleIdentifier ) ) (otherlv_27= ',' ( (lv_domains_28_0= ruleIdentifier ) ) )* otherlv_29= ')' ) ) )? otherlv_30= ')' )
+            // InternalScope.g:1136:28: ( (otherlv_0= 'find' otherlv_1= '(' ( ( ruleQualifiedID ) ) ( (otherlv_3= ',' otherlv_4= 'key' otherlv_5= '=' ( (lv_name_6_0= ruleExpression ) ) ) | (otherlv_7= ',' ( (lv_recursivePrefix_8_0= 'recursive' ) )? otherlv_9= 'prefix' otherlv_10= '=' ( (lv_prefix_11_0= ruleExpression ) ) ) )? (otherlv_12= ',' otherlv_13= 'data' otherlv_14= '=' otherlv_15= '(' ( (lv_data_16_0= ruleDataExpression ) ) (otherlv_17= ',' ( (lv_data_18_0= ruleDataExpression ) ) )* otherlv_19= ')' )? (otherlv_20= ',' otherlv_21= 'domains' otherlv_22= '=' ( ( (lv_domains_23_0= '*' ) ) | ( (lv_domains_24_0= ruleIdentifier ) ) | (otherlv_25= '(' ( (lv_domains_26_0= ruleIdentifier ) ) (otherlv_27= ',' ( (lv_domains_28_0= ruleIdentifier ) ) )* otherlv_29= ')' ) ) )? otherlv_30= ')' ) )
+            // InternalScope.g:1137:1: (otherlv_0= 'find' otherlv_1= '(' ( ( ruleQualifiedID ) ) ( (otherlv_3= ',' otherlv_4= 'key' otherlv_5= '=' ( (lv_name_6_0= ruleExpression ) ) ) | (otherlv_7= ',' ( (lv_recursivePrefix_8_0= 'recursive' ) )? otherlv_9= 'prefix' otherlv_10= '=' ( (lv_prefix_11_0= ruleExpression ) ) ) )? (otherlv_12= ',' otherlv_13= 'data' otherlv_14= '=' otherlv_15= '(' ( (lv_data_16_0= ruleDataExpression ) ) (otherlv_17= ',' ( (lv_data_18_0= ruleDataExpression ) ) )* otherlv_19= ')' )? (otherlv_20= ',' otherlv_21= 'domains' otherlv_22= '=' ( ( (lv_domains_23_0= '*' ) ) | ( (lv_domains_24_0= ruleIdentifier ) ) | (otherlv_25= '(' ( (lv_domains_26_0= ruleIdentifier ) ) (otherlv_27= ',' ( (lv_domains_28_0= ruleIdentifier ) ) )* otherlv_29= ')' ) ) )? otherlv_30= ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1137:1: (otherlv_0= 'find' otherlv_1= '(' ( ( ruleQualifiedID ) ) ( (otherlv_3= ',' otherlv_4= 'key' otherlv_5= '=' ( (lv_name_6_0= ruleExpression ) ) ) | (otherlv_7= ',' ( (lv_recursivePrefix_8_0= 'recursive' ) )? otherlv_9= 'prefix' otherlv_10= '=' ( (lv_prefix_11_0= ruleExpression ) ) ) )? (otherlv_12= ',' otherlv_13= 'data' otherlv_14= '=' otherlv_15= '(' ( (lv_data_16_0= ruleDataExpression ) ) (otherlv_17= ',' ( (lv_data_18_0= ruleDataExpression ) ) )* otherlv_19= ')' )? (otherlv_20= ',' otherlv_21= 'domains' otherlv_22= '=' ( ( (lv_domains_23_0= '*' ) ) | ( (lv_domains_24_0= ruleIdentifier ) ) | (otherlv_25= '(' ( (lv_domains_26_0= ruleIdentifier ) ) (otherlv_27= ',' ( (lv_domains_28_0= ruleIdentifier ) ) )* otherlv_29= ')' ) ) )? otherlv_30= ')' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1137:3: otherlv_0= 'find' otherlv_1= '(' ( ( ruleQualifiedID ) ) ( (otherlv_3= ',' otherlv_4= 'key' otherlv_5= '=' ( (lv_name_6_0= ruleExpression ) ) ) | (otherlv_7= ',' ( (lv_recursivePrefix_8_0= 'recursive' ) )? otherlv_9= 'prefix' otherlv_10= '=' ( (lv_prefix_11_0= ruleExpression ) ) ) )? (otherlv_12= ',' otherlv_13= 'data' otherlv_14= '=' otherlv_15= '(' ( (lv_data_16_0= ruleDataExpression ) ) (otherlv_17= ',' ( (lv_data_18_0= ruleDataExpression ) ) )* otherlv_19= ')' )? (otherlv_20= ',' otherlv_21= 'domains' otherlv_22= '=' ( ( (lv_domains_23_0= '*' ) ) | ( (lv_domains_24_0= ruleIdentifier ) ) | (otherlv_25= '(' ( (lv_domains_26_0= ruleIdentifier ) ) (otherlv_27= ',' ( (lv_domains_28_0= ruleIdentifier ) ) )* otherlv_29= ')' ) ) )? otherlv_30= ')'
+            // InternalScope.g:1137:1: (otherlv_0= 'find' otherlv_1= '(' ( ( ruleQualifiedID ) ) ( (otherlv_3= ',' otherlv_4= 'key' otherlv_5= '=' ( (lv_name_6_0= ruleExpression ) ) ) | (otherlv_7= ',' ( (lv_recursivePrefix_8_0= 'recursive' ) )? otherlv_9= 'prefix' otherlv_10= '=' ( (lv_prefix_11_0= ruleExpression ) ) ) )? (otherlv_12= ',' otherlv_13= 'data' otherlv_14= '=' otherlv_15= '(' ( (lv_data_16_0= ruleDataExpression ) ) (otherlv_17= ',' ( (lv_data_18_0= ruleDataExpression ) ) )* otherlv_19= ')' )? (otherlv_20= ',' otherlv_21= 'domains' otherlv_22= '=' ( ( (lv_domains_23_0= '*' ) ) | ( (lv_domains_24_0= ruleIdentifier ) ) | (otherlv_25= '(' ( (lv_domains_26_0= ruleIdentifier ) ) (otherlv_27= ',' ( (lv_domains_28_0= ruleIdentifier ) ) )* otherlv_29= ')' ) ) )? otherlv_30= ')' )
+            // InternalScope.g:1137:3: otherlv_0= 'find' otherlv_1= '(' ( ( ruleQualifiedID ) ) ( (otherlv_3= ',' otherlv_4= 'key' otherlv_5= '=' ( (lv_name_6_0= ruleExpression ) ) ) | (otherlv_7= ',' ( (lv_recursivePrefix_8_0= 'recursive' ) )? otherlv_9= 'prefix' otherlv_10= '=' ( (lv_prefix_11_0= ruleExpression ) ) ) )? (otherlv_12= ',' otherlv_13= 'data' otherlv_14= '=' otherlv_15= '(' ( (lv_data_16_0= ruleDataExpression ) ) (otherlv_17= ',' ( (lv_data_18_0= ruleDataExpression ) ) )* otherlv_19= ')' )? (otherlv_20= ',' otherlv_21= 'domains' otherlv_22= '=' ( ( (lv_domains_23_0= '*' ) ) | ( (lv_domains_24_0= ruleIdentifier ) ) | (otherlv_25= '(' ( (lv_domains_26_0= ruleIdentifier ) ) (otherlv_27= ',' ( (lv_domains_28_0= ruleIdentifier ) ) )* otherlv_29= ')' ) ) )? otherlv_30= ')'
             {
-            otherlv_0=(Token)match(input,37,FOLLOW_37_in_ruleGlobalScopeExpression2396); if (state.failed) return current;
+            otherlv_0=(Token)match(input,37,FOLLOW_30); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getGlobalScopeExpressionAccess().getFindKeyword_0());
                   
             }
-            otherlv_1=(Token)match(input,25,FOLLOW_25_in_ruleGlobalScopeExpression2408); if (state.failed) return current;
+            otherlv_1=(Token)match(input,25,FOLLOW_3); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getGlobalScopeExpressionAccess().getLeftParenthesisKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1145:1: ( ( ruleQualifiedID ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1146:1: ( ruleQualifiedID )
+            // InternalScope.g:1145:1: ( ( ruleQualifiedID ) )
+            // InternalScope.g:1146:1: ( ruleQualifiedID )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1146:1: ( ruleQualifiedID )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1147:3: ruleQualifiedID
+            // InternalScope.g:1146:1: ( ruleQualifiedID )
+            // InternalScope.g:1147:3: ruleQualifiedID
             {
             if ( state.backtracking==0 ) {
 
@@ -3343,7 +3343,7 @@ public final EObject ruleGlobalScopeExpression() throws RecognitionException {
               	        newCompositeNode(grammarAccess.getGlobalScopeExpressionAccess().getTypeEClassCrossReference_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleQualifiedID_in_ruleGlobalScopeExpression2431);
+            pushFollow(FOLLOW_32);
             ruleQualifiedID();
 
             state._fsp--;
@@ -3359,7 +3359,7 @@ public final EObject ruleGlobalScopeExpression() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1160:2: ( (otherlv_3= ',' otherlv_4= 'key' otherlv_5= '=' ( (lv_name_6_0= ruleExpression ) ) ) | (otherlv_7= ',' ( (lv_recursivePrefix_8_0= 'recursive' ) )? otherlv_9= 'prefix' otherlv_10= '=' ( (lv_prefix_11_0= ruleExpression ) ) ) )?
+            // InternalScope.g:1160:2: ( (otherlv_3= ',' otherlv_4= 'key' otherlv_5= '=' ( (lv_name_6_0= ruleExpression ) ) ) | (otherlv_7= ',' ( (lv_recursivePrefix_8_0= 'recursive' ) )? otherlv_9= 'prefix' otherlv_10= '=' ( (lv_prefix_11_0= ruleExpression ) ) ) )?
             int alt24=3;
             int LA24_0 = input.LA(1);
 
@@ -3375,41 +3375,41 @@ else if ( (LA24_1==38) ) {
             }
             switch (alt24) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1160:3: (otherlv_3= ',' otherlv_4= 'key' otherlv_5= '=' ( (lv_name_6_0= ruleExpression ) ) )
+                    // InternalScope.g:1160:3: (otherlv_3= ',' otherlv_4= 'key' otherlv_5= '=' ( (lv_name_6_0= ruleExpression ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1160:3: (otherlv_3= ',' otherlv_4= 'key' otherlv_5= '=' ( (lv_name_6_0= ruleExpression ) ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1160:5: otherlv_3= ',' otherlv_4= 'key' otherlv_5= '=' ( (lv_name_6_0= ruleExpression ) )
+                    // InternalScope.g:1160:3: (otherlv_3= ',' otherlv_4= 'key' otherlv_5= '=' ( (lv_name_6_0= ruleExpression ) ) )
+                    // InternalScope.g:1160:5: otherlv_3= ',' otherlv_4= 'key' otherlv_5= '=' ( (lv_name_6_0= ruleExpression ) )
                     {
-                    otherlv_3=(Token)match(input,36,FOLLOW_36_in_ruleGlobalScopeExpression2445); if (state.failed) return current;
+                    otherlv_3=(Token)match(input,36,FOLLOW_34); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_3, grammarAccess.getGlobalScopeExpressionAccess().getCommaKeyword_3_0_0());
                           
                     }
-                    otherlv_4=(Token)match(input,38,FOLLOW_38_in_ruleGlobalScopeExpression2457); if (state.failed) return current;
+                    otherlv_4=(Token)match(input,38,FOLLOW_16); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_4, grammarAccess.getGlobalScopeExpressionAccess().getKeyKeyword_3_0_1());
                           
                     }
-                    otherlv_5=(Token)match(input,22,FOLLOW_22_in_ruleGlobalScopeExpression2469); if (state.failed) return current;
+                    otherlv_5=(Token)match(input,22,FOLLOW_17); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_5, grammarAccess.getGlobalScopeExpressionAccess().getEqualsSignKeyword_3_0_2());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1172:1: ( (lv_name_6_0= ruleExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1173:1: (lv_name_6_0= ruleExpression )
+                    // InternalScope.g:1172:1: ( (lv_name_6_0= ruleExpression ) )
+                    // InternalScope.g:1173:1: (lv_name_6_0= ruleExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1173:1: (lv_name_6_0= ruleExpression )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1174:3: lv_name_6_0= ruleExpression
+                    // InternalScope.g:1173:1: (lv_name_6_0= ruleExpression )
+                    // InternalScope.g:1174:3: lv_name_6_0= ruleExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getGlobalScopeExpressionAccess().getNameExpressionParserRuleCall_3_0_3_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleExpression_in_ruleGlobalScopeExpression2490);
+                    pushFollow(FOLLOW_32);
                     lv_name_6_0=ruleExpression();
 
                     state._fsp--;
@@ -3423,7 +3423,7 @@ else if ( (LA24_1==38) ) {
                              			current, 
                              			"name",
                               		lv_name_6_0, 
-                              		"Expression");
+                              		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -3440,18 +3440,18 @@ else if ( (LA24_1==38) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1191:6: (otherlv_7= ',' ( (lv_recursivePrefix_8_0= 'recursive' ) )? otherlv_9= 'prefix' otherlv_10= '=' ( (lv_prefix_11_0= ruleExpression ) ) )
+                    // InternalScope.g:1191:6: (otherlv_7= ',' ( (lv_recursivePrefix_8_0= 'recursive' ) )? otherlv_9= 'prefix' otherlv_10= '=' ( (lv_prefix_11_0= ruleExpression ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1191:6: (otherlv_7= ',' ( (lv_recursivePrefix_8_0= 'recursive' ) )? otherlv_9= 'prefix' otherlv_10= '=' ( (lv_prefix_11_0= ruleExpression ) ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1191:8: otherlv_7= ',' ( (lv_recursivePrefix_8_0= 'recursive' ) )? otherlv_9= 'prefix' otherlv_10= '=' ( (lv_prefix_11_0= ruleExpression ) )
+                    // InternalScope.g:1191:6: (otherlv_7= ',' ( (lv_recursivePrefix_8_0= 'recursive' ) )? otherlv_9= 'prefix' otherlv_10= '=' ( (lv_prefix_11_0= ruleExpression ) ) )
+                    // InternalScope.g:1191:8: otherlv_7= ',' ( (lv_recursivePrefix_8_0= 'recursive' ) )? otherlv_9= 'prefix' otherlv_10= '=' ( (lv_prefix_11_0= ruleExpression ) )
                     {
-                    otherlv_7=(Token)match(input,36,FOLLOW_36_in_ruleGlobalScopeExpression2510); if (state.failed) return current;
+                    otherlv_7=(Token)match(input,36,FOLLOW_35); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_7, grammarAccess.getGlobalScopeExpressionAccess().getCommaKeyword_3_1_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1195:1: ( (lv_recursivePrefix_8_0= 'recursive' ) )?
+                    // InternalScope.g:1195:1: ( (lv_recursivePrefix_8_0= 'recursive' ) )?
                     int alt23=2;
                     int LA23_0 = input.LA(1);
 
@@ -3460,12 +3460,12 @@ else if ( (LA24_1==38) ) {
                     }
                     switch (alt23) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1196:1: (lv_recursivePrefix_8_0= 'recursive' )
+                            // InternalScope.g:1196:1: (lv_recursivePrefix_8_0= 'recursive' )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1196:1: (lv_recursivePrefix_8_0= 'recursive' )
-                            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1197:3: lv_recursivePrefix_8_0= 'recursive'
+                            // InternalScope.g:1196:1: (lv_recursivePrefix_8_0= 'recursive' )
+                            // InternalScope.g:1197:3: lv_recursivePrefix_8_0= 'recursive'
                             {
-                            lv_recursivePrefix_8_0=(Token)match(input,39,FOLLOW_39_in_ruleGlobalScopeExpression2528); if (state.failed) return current;
+                            lv_recursivePrefix_8_0=(Token)match(input,39,FOLLOW_36); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       newLeafNode(lv_recursivePrefix_8_0, grammarAccess.getGlobalScopeExpressionAccess().getRecursivePrefixRecursiveKeyword_3_1_1_0());
@@ -3488,30 +3488,30 @@ else if ( (LA24_1==38) ) {
 
                     }
 
-                    otherlv_9=(Token)match(input,40,FOLLOW_40_in_ruleGlobalScopeExpression2554); if (state.failed) return current;
+                    otherlv_9=(Token)match(input,40,FOLLOW_16); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_9, grammarAccess.getGlobalScopeExpressionAccess().getPrefixKeyword_3_1_2());
                           
                     }
-                    otherlv_10=(Token)match(input,22,FOLLOW_22_in_ruleGlobalScopeExpression2566); if (state.failed) return current;
+                    otherlv_10=(Token)match(input,22,FOLLOW_17); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_10, grammarAccess.getGlobalScopeExpressionAccess().getEqualsSignKeyword_3_1_3());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1218:1: ( (lv_prefix_11_0= ruleExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1219:1: (lv_prefix_11_0= ruleExpression )
+                    // InternalScope.g:1218:1: ( (lv_prefix_11_0= ruleExpression ) )
+                    // InternalScope.g:1219:1: (lv_prefix_11_0= ruleExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1219:1: (lv_prefix_11_0= ruleExpression )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1220:3: lv_prefix_11_0= ruleExpression
+                    // InternalScope.g:1219:1: (lv_prefix_11_0= ruleExpression )
+                    // InternalScope.g:1220:3: lv_prefix_11_0= ruleExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getGlobalScopeExpressionAccess().getPrefixExpressionParserRuleCall_3_1_4_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleExpression_in_ruleGlobalScopeExpression2587);
+                    pushFollow(FOLLOW_32);
                     lv_prefix_11_0=ruleExpression();
 
                     state._fsp--;
@@ -3525,7 +3525,7 @@ else if ( (LA24_1==38) ) {
                              			current, 
                              			"prefix",
                               		lv_prefix_11_0, 
-                              		"Expression");
+                              		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -3544,7 +3544,7 @@ else if ( (LA24_1==38) ) {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1236:5: (otherlv_12= ',' otherlv_13= 'data' otherlv_14= '=' otherlv_15= '(' ( (lv_data_16_0= ruleDataExpression ) ) (otherlv_17= ',' ( (lv_data_18_0= ruleDataExpression ) ) )* otherlv_19= ')' )?
+            // InternalScope.g:1236:5: (otherlv_12= ',' otherlv_13= 'data' otherlv_14= '=' otherlv_15= '(' ( (lv_data_16_0= ruleDataExpression ) ) (otherlv_17= ',' ( (lv_data_18_0= ruleDataExpression ) ) )* otherlv_19= ')' )?
             int alt26=2;
             int LA26_0 = input.LA(1);
 
@@ -3557,44 +3557,44 @@ else if ( (LA24_1==38) ) {
             }
             switch (alt26) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1236:7: otherlv_12= ',' otherlv_13= 'data' otherlv_14= '=' otherlv_15= '(' ( (lv_data_16_0= ruleDataExpression ) ) (otherlv_17= ',' ( (lv_data_18_0= ruleDataExpression ) ) )* otherlv_19= ')'
+                    // InternalScope.g:1236:7: otherlv_12= ',' otherlv_13= 'data' otherlv_14= '=' otherlv_15= '(' ( (lv_data_16_0= ruleDataExpression ) ) (otherlv_17= ',' ( (lv_data_18_0= ruleDataExpression ) ) )* otherlv_19= ')'
                     {
-                    otherlv_12=(Token)match(input,36,FOLLOW_36_in_ruleGlobalScopeExpression2603); if (state.failed) return current;
+                    otherlv_12=(Token)match(input,36,FOLLOW_37); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_12, grammarAccess.getGlobalScopeExpressionAccess().getCommaKeyword_4_0());
                           
                     }
-                    otherlv_13=(Token)match(input,41,FOLLOW_41_in_ruleGlobalScopeExpression2615); if (state.failed) return current;
+                    otherlv_13=(Token)match(input,41,FOLLOW_16); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_13, grammarAccess.getGlobalScopeExpressionAccess().getDataKeyword_4_1());
                           
                     }
-                    otherlv_14=(Token)match(input,22,FOLLOW_22_in_ruleGlobalScopeExpression2627); if (state.failed) return current;
+                    otherlv_14=(Token)match(input,22,FOLLOW_30); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_14, grammarAccess.getGlobalScopeExpressionAccess().getEqualsSignKeyword_4_2());
                           
                     }
-                    otherlv_15=(Token)match(input,25,FOLLOW_25_in_ruleGlobalScopeExpression2639); if (state.failed) return current;
+                    otherlv_15=(Token)match(input,25,FOLLOW_38); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_15, grammarAccess.getGlobalScopeExpressionAccess().getLeftParenthesisKeyword_4_3());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1252:1: ( (lv_data_16_0= ruleDataExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1253:1: (lv_data_16_0= ruleDataExpression )
+                    // InternalScope.g:1252:1: ( (lv_data_16_0= ruleDataExpression ) )
+                    // InternalScope.g:1253:1: (lv_data_16_0= ruleDataExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1253:1: (lv_data_16_0= ruleDataExpression )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1254:3: lv_data_16_0= ruleDataExpression
+                    // InternalScope.g:1253:1: (lv_data_16_0= ruleDataExpression )
+                    // InternalScope.g:1254:3: lv_data_16_0= ruleDataExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getGlobalScopeExpressionAccess().getDataDataExpressionParserRuleCall_4_4_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleDataExpression_in_ruleGlobalScopeExpression2660);
+                    pushFollow(FOLLOW_32);
                     lv_data_16_0=ruleDataExpression();
 
                     state._fsp--;
@@ -3608,7 +3608,7 @@ else if ( (LA24_1==38) ) {
                              			current, 
                              			"data",
                               		lv_data_16_0, 
-                              		"DataExpression");
+                              		"com.avaloq.tools.ddk.xtext.scope.Scope.DataExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -3618,7 +3618,7 @@ else if ( (LA24_1==38) ) {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1270:2: (otherlv_17= ',' ( (lv_data_18_0= ruleDataExpression ) ) )*
+                    // InternalScope.g:1270:2: (otherlv_17= ',' ( (lv_data_18_0= ruleDataExpression ) ) )*
                     loop25:
                     do {
                         int alt25=2;
@@ -3631,26 +3631,26 @@ else if ( (LA24_1==38) ) {
 
                         switch (alt25) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1270:4: otherlv_17= ',' ( (lv_data_18_0= ruleDataExpression ) )
+                    	    // InternalScope.g:1270:4: otherlv_17= ',' ( (lv_data_18_0= ruleDataExpression ) )
                     	    {
-                    	    otherlv_17=(Token)match(input,36,FOLLOW_36_in_ruleGlobalScopeExpression2673); if (state.failed) return current;
+                    	    otherlv_17=(Token)match(input,36,FOLLOW_38); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_17, grammarAccess.getGlobalScopeExpressionAccess().getCommaKeyword_4_5_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1274:1: ( (lv_data_18_0= ruleDataExpression ) )
-                    	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1275:1: (lv_data_18_0= ruleDataExpression )
+                    	    // InternalScope.g:1274:1: ( (lv_data_18_0= ruleDataExpression ) )
+                    	    // InternalScope.g:1275:1: (lv_data_18_0= ruleDataExpression )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1275:1: (lv_data_18_0= ruleDataExpression )
-                    	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1276:3: lv_data_18_0= ruleDataExpression
+                    	    // InternalScope.g:1275:1: (lv_data_18_0= ruleDataExpression )
+                    	    // InternalScope.g:1276:3: lv_data_18_0= ruleDataExpression
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getGlobalScopeExpressionAccess().getDataDataExpressionParserRuleCall_4_5_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleDataExpression_in_ruleGlobalScopeExpression2694);
+                    	    pushFollow(FOLLOW_32);
                     	    lv_data_18_0=ruleDataExpression();
 
                     	    state._fsp--;
@@ -3664,7 +3664,7 @@ else if ( (LA24_1==38) ) {
                     	             			current, 
                     	             			"data",
                     	              		lv_data_18_0, 
-                    	              		"DataExpression");
+                    	              		"com.avaloq.tools.ddk.xtext.scope.Scope.DataExpression");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -3683,7 +3683,7 @@ else if ( (LA24_1==38) ) {
                         }
                     } while (true);
 
-                    otherlv_19=(Token)match(input,26,FOLLOW_26_in_ruleGlobalScopeExpression2708); if (state.failed) return current;
+                    otherlv_19=(Token)match(input,26,FOLLOW_32); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_19, grammarAccess.getGlobalScopeExpressionAccess().getRightParenthesisKeyword_4_6());
@@ -3695,7 +3695,7 @@ else if ( (LA24_1==38) ) {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1296:3: (otherlv_20= ',' otherlv_21= 'domains' otherlv_22= '=' ( ( (lv_domains_23_0= '*' ) ) | ( (lv_domains_24_0= ruleIdentifier ) ) | (otherlv_25= '(' ( (lv_domains_26_0= ruleIdentifier ) ) (otherlv_27= ',' ( (lv_domains_28_0= ruleIdentifier ) ) )* otherlv_29= ')' ) ) )?
+            // InternalScope.g:1296:3: (otherlv_20= ',' otherlv_21= 'domains' otherlv_22= '=' ( ( (lv_domains_23_0= '*' ) ) | ( (lv_domains_24_0= ruleIdentifier ) ) | (otherlv_25= '(' ( (lv_domains_26_0= ruleIdentifier ) ) (otherlv_27= ',' ( (lv_domains_28_0= ruleIdentifier ) ) )* otherlv_29= ')' ) ) )?
             int alt29=2;
             int LA29_0 = input.LA(1);
 
@@ -3704,27 +3704,27 @@ else if ( (LA24_1==38) ) {
             }
             switch (alt29) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1296:5: otherlv_20= ',' otherlv_21= 'domains' otherlv_22= '=' ( ( (lv_domains_23_0= '*' ) ) | ( (lv_domains_24_0= ruleIdentifier ) ) | (otherlv_25= '(' ( (lv_domains_26_0= ruleIdentifier ) ) (otherlv_27= ',' ( (lv_domains_28_0= ruleIdentifier ) ) )* otherlv_29= ')' ) )
+                    // InternalScope.g:1296:5: otherlv_20= ',' otherlv_21= 'domains' otherlv_22= '=' ( ( (lv_domains_23_0= '*' ) ) | ( (lv_domains_24_0= ruleIdentifier ) ) | (otherlv_25= '(' ( (lv_domains_26_0= ruleIdentifier ) ) (otherlv_27= ',' ( (lv_domains_28_0= ruleIdentifier ) ) )* otherlv_29= ')' ) )
                     {
-                    otherlv_20=(Token)match(input,36,FOLLOW_36_in_ruleGlobalScopeExpression2723); if (state.failed) return current;
+                    otherlv_20=(Token)match(input,36,FOLLOW_39); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_20, grammarAccess.getGlobalScopeExpressionAccess().getCommaKeyword_5_0());
                           
                     }
-                    otherlv_21=(Token)match(input,42,FOLLOW_42_in_ruleGlobalScopeExpression2735); if (state.failed) return current;
+                    otherlv_21=(Token)match(input,42,FOLLOW_16); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_21, grammarAccess.getGlobalScopeExpressionAccess().getDomainsKeyword_5_1());
                           
                     }
-                    otherlv_22=(Token)match(input,22,FOLLOW_22_in_ruleGlobalScopeExpression2747); if (state.failed) return current;
+                    otherlv_22=(Token)match(input,22,FOLLOW_40); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_22, grammarAccess.getGlobalScopeExpressionAccess().getEqualsSignKeyword_5_2());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1308:1: ( ( (lv_domains_23_0= '*' ) ) | ( (lv_domains_24_0= ruleIdentifier ) ) | (otherlv_25= '(' ( (lv_domains_26_0= ruleIdentifier ) ) (otherlv_27= ',' ( (lv_domains_28_0= ruleIdentifier ) ) )* otherlv_29= ')' ) )
+                    // InternalScope.g:1308:1: ( ( (lv_domains_23_0= '*' ) ) | ( (lv_domains_24_0= ruleIdentifier ) ) | (otherlv_25= '(' ( (lv_domains_26_0= ruleIdentifier ) ) (otherlv_27= ',' ( (lv_domains_28_0= ruleIdentifier ) ) )* otherlv_29= ')' ) )
                     int alt28=3;
                     switch ( input.LA(1) ) {
                     case 30:
@@ -3752,15 +3752,15 @@ else if ( (LA24_1==38) ) {
 
                     switch (alt28) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1308:2: ( (lv_domains_23_0= '*' ) )
+                            // InternalScope.g:1308:2: ( (lv_domains_23_0= '*' ) )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1308:2: ( (lv_domains_23_0= '*' ) )
-                            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1309:1: (lv_domains_23_0= '*' )
+                            // InternalScope.g:1308:2: ( (lv_domains_23_0= '*' ) )
+                            // InternalScope.g:1309:1: (lv_domains_23_0= '*' )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1309:1: (lv_domains_23_0= '*' )
-                            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1310:3: lv_domains_23_0= '*'
+                            // InternalScope.g:1309:1: (lv_domains_23_0= '*' )
+                            // InternalScope.g:1310:3: lv_domains_23_0= '*'
                             {
-                            lv_domains_23_0=(Token)match(input,30,FOLLOW_30_in_ruleGlobalScopeExpression2766); if (state.failed) return current;
+                            lv_domains_23_0=(Token)match(input,30,FOLLOW_20); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       newLeafNode(lv_domains_23_0, grammarAccess.getGlobalScopeExpressionAccess().getDomainsAsteriskKeyword_5_3_0_0());
@@ -3784,20 +3784,20 @@ else if ( (LA24_1==38) ) {
                             }
                             break;
                         case 2 :
-                            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1324:6: ( (lv_domains_24_0= ruleIdentifier ) )
+                            // InternalScope.g:1324:6: ( (lv_domains_24_0= ruleIdentifier ) )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1324:6: ( (lv_domains_24_0= ruleIdentifier ) )
-                            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1325:1: (lv_domains_24_0= ruleIdentifier )
+                            // InternalScope.g:1324:6: ( (lv_domains_24_0= ruleIdentifier ) )
+                            // InternalScope.g:1325:1: (lv_domains_24_0= ruleIdentifier )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1325:1: (lv_domains_24_0= ruleIdentifier )
-                            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1326:3: lv_domains_24_0= ruleIdentifier
+                            // InternalScope.g:1325:1: (lv_domains_24_0= ruleIdentifier )
+                            // InternalScope.g:1326:3: lv_domains_24_0= ruleIdentifier
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getGlobalScopeExpressionAccess().getDomainsIdentifierParserRuleCall_5_3_1_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleIdentifier_in_ruleGlobalScopeExpression2806);
+                            pushFollow(FOLLOW_20);
                             lv_domains_24_0=ruleIdentifier();
 
                             state._fsp--;
@@ -3811,7 +3811,7 @@ else if ( (LA24_1==38) ) {
                                      			current, 
                                      			"domains",
                                       		lv_domains_24_0, 
-                                      		"Identifier");
+                                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -3825,29 +3825,29 @@ else if ( (LA24_1==38) ) {
                             }
                             break;
                         case 3 :
-                            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1343:6: (otherlv_25= '(' ( (lv_domains_26_0= ruleIdentifier ) ) (otherlv_27= ',' ( (lv_domains_28_0= ruleIdentifier ) ) )* otherlv_29= ')' )
+                            // InternalScope.g:1343:6: (otherlv_25= '(' ( (lv_domains_26_0= ruleIdentifier ) ) (otherlv_27= ',' ( (lv_domains_28_0= ruleIdentifier ) ) )* otherlv_29= ')' )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1343:6: (otherlv_25= '(' ( (lv_domains_26_0= ruleIdentifier ) ) (otherlv_27= ',' ( (lv_domains_28_0= ruleIdentifier ) ) )* otherlv_29= ')' )
-                            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1343:8: otherlv_25= '(' ( (lv_domains_26_0= ruleIdentifier ) ) (otherlv_27= ',' ( (lv_domains_28_0= ruleIdentifier ) ) )* otherlv_29= ')'
+                            // InternalScope.g:1343:6: (otherlv_25= '(' ( (lv_domains_26_0= ruleIdentifier ) ) (otherlv_27= ',' ( (lv_domains_28_0= ruleIdentifier ) ) )* otherlv_29= ')' )
+                            // InternalScope.g:1343:8: otherlv_25= '(' ( (lv_domains_26_0= ruleIdentifier ) ) (otherlv_27= ',' ( (lv_domains_28_0= ruleIdentifier ) ) )* otherlv_29= ')'
                             {
-                            otherlv_25=(Token)match(input,25,FOLLOW_25_in_ruleGlobalScopeExpression2825); if (state.failed) return current;
+                            otherlv_25=(Token)match(input,25,FOLLOW_3); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                   	newLeafNode(otherlv_25, grammarAccess.getGlobalScopeExpressionAccess().getLeftParenthesisKeyword_5_3_2_0());
                                   
                             }
-                            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1347:1: ( (lv_domains_26_0= ruleIdentifier ) )
-                            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1348:1: (lv_domains_26_0= ruleIdentifier )
+                            // InternalScope.g:1347:1: ( (lv_domains_26_0= ruleIdentifier ) )
+                            // InternalScope.g:1348:1: (lv_domains_26_0= ruleIdentifier )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1348:1: (lv_domains_26_0= ruleIdentifier )
-                            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1349:3: lv_domains_26_0= ruleIdentifier
+                            // InternalScope.g:1348:1: (lv_domains_26_0= ruleIdentifier )
+                            // InternalScope.g:1349:3: lv_domains_26_0= ruleIdentifier
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getGlobalScopeExpressionAccess().getDomainsIdentifierParserRuleCall_5_3_2_1_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleIdentifier_in_ruleGlobalScopeExpression2846);
+                            pushFollow(FOLLOW_32);
                             lv_domains_26_0=ruleIdentifier();
 
                             state._fsp--;
@@ -3861,7 +3861,7 @@ else if ( (LA24_1==38) ) {
                                      			current, 
                                      			"domains",
                                       		lv_domains_26_0, 
-                                      		"Identifier");
+                                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
                               	        afterParserOrEnumRuleCall();
                               	    
                             }
@@ -3871,7 +3871,7 @@ else if ( (LA24_1==38) ) {
 
                             }
 
-                            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1365:2: (otherlv_27= ',' ( (lv_domains_28_0= ruleIdentifier ) ) )*
+                            // InternalScope.g:1365:2: (otherlv_27= ',' ( (lv_domains_28_0= ruleIdentifier ) ) )*
                             loop27:
                             do {
                                 int alt27=2;
@@ -3884,26 +3884,26 @@ else if ( (LA24_1==38) ) {
 
                                 switch (alt27) {
                             	case 1 :
-                            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1365:4: otherlv_27= ',' ( (lv_domains_28_0= ruleIdentifier ) )
+                            	    // InternalScope.g:1365:4: otherlv_27= ',' ( (lv_domains_28_0= ruleIdentifier ) )
                             	    {
-                            	    otherlv_27=(Token)match(input,36,FOLLOW_36_in_ruleGlobalScopeExpression2859); if (state.failed) return current;
+                            	    otherlv_27=(Token)match(input,36,FOLLOW_3); if (state.failed) return current;
                             	    if ( state.backtracking==0 ) {
 
                             	          	newLeafNode(otherlv_27, grammarAccess.getGlobalScopeExpressionAccess().getCommaKeyword_5_3_2_2_0());
                             	          
                             	    }
-                            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1369:1: ( (lv_domains_28_0= ruleIdentifier ) )
-                            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1370:1: (lv_domains_28_0= ruleIdentifier )
+                            	    // InternalScope.g:1369:1: ( (lv_domains_28_0= ruleIdentifier ) )
+                            	    // InternalScope.g:1370:1: (lv_domains_28_0= ruleIdentifier )
                             	    {
-                            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1370:1: (lv_domains_28_0= ruleIdentifier )
-                            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1371:3: lv_domains_28_0= ruleIdentifier
+                            	    // InternalScope.g:1370:1: (lv_domains_28_0= ruleIdentifier )
+                            	    // InternalScope.g:1371:3: lv_domains_28_0= ruleIdentifier
                             	    {
                             	    if ( state.backtracking==0 ) {
                             	       
                             	      	        newCompositeNode(grammarAccess.getGlobalScopeExpressionAccess().getDomainsIdentifierParserRuleCall_5_3_2_2_1_0()); 
                             	      	    
                             	    }
-                            	    pushFollow(FOLLOW_ruleIdentifier_in_ruleGlobalScopeExpression2880);
+                            	    pushFollow(FOLLOW_32);
                             	    lv_domains_28_0=ruleIdentifier();
 
                             	    state._fsp--;
@@ -3917,7 +3917,7 @@ else if ( (LA24_1==38) ) {
                             	             			current, 
                             	             			"domains",
                             	              		lv_domains_28_0, 
-                            	              		"Identifier");
+                            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
                             	      	        afterParserOrEnumRuleCall();
                             	      	    
                             	    }
@@ -3936,7 +3936,7 @@ else if ( (LA24_1==38) ) {
                                 }
                             } while (true);
 
-                            otherlv_29=(Token)match(input,26,FOLLOW_26_in_ruleGlobalScopeExpression2894); if (state.failed) return current;
+                            otherlv_29=(Token)match(input,26,FOLLOW_20); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                   	newLeafNode(otherlv_29, grammarAccess.getGlobalScopeExpressionAccess().getRightParenthesisKeyword_5_3_2_3());
@@ -3957,7 +3957,7 @@ else if ( (LA24_1==38) ) {
 
             }
 
-            otherlv_30=(Token)match(input,26,FOLLOW_26_in_ruleGlobalScopeExpression2910); if (state.failed) return current;
+            otherlv_30=(Token)match(input,26,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_30, grammarAccess.getGlobalScopeExpressionAccess().getRightParenthesisKeyword_6());
@@ -3986,7 +3986,7 @@ else if ( (LA24_1==38) ) {
 
 
     // $ANTLR start "entryRuleDataExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1403:1: entryRuleDataExpression returns [EObject current=null] : iv_ruleDataExpression= ruleDataExpression EOF ;
+    // InternalScope.g:1403:1: entryRuleDataExpression returns [EObject current=null] : iv_ruleDataExpression= ruleDataExpression EOF ;
     public final EObject entryRuleDataExpression() throws RecognitionException {
         EObject current = null;
 
@@ -3994,13 +3994,13 @@ public final EObject entryRuleDataExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1404:2: (iv_ruleDataExpression= ruleDataExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1405:2: iv_ruleDataExpression= ruleDataExpression EOF
+            // InternalScope.g:1404:2: (iv_ruleDataExpression= ruleDataExpression EOF )
+            // InternalScope.g:1405:2: iv_ruleDataExpression= ruleDataExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getDataExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleDataExpression_in_entryRuleDataExpression2946);
+            pushFollow(FOLLOW_1);
             iv_ruleDataExpression=ruleDataExpression();
 
             state._fsp--;
@@ -4008,7 +4008,7 @@ public final EObject entryRuleDataExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleDataExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDataExpression2956); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -4026,7 +4026,7 @@ public final EObject entryRuleDataExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleDataExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1412:1: ruleDataExpression returns [EObject current=null] : (this_MatchDataExpression_0= ruleMatchDataExpression | this_LambdaDataExpression_1= ruleLambdaDataExpression ) ;
+    // InternalScope.g:1412:1: ruleDataExpression returns [EObject current=null] : (this_MatchDataExpression_0= ruleMatchDataExpression | this_LambdaDataExpression_1= ruleLambdaDataExpression ) ;
     public final EObject ruleDataExpression() throws RecognitionException {
         EObject current = null;
 
@@ -4038,10 +4038,10 @@ public final EObject ruleDataExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1415:28: ( (this_MatchDataExpression_0= ruleMatchDataExpression | this_LambdaDataExpression_1= ruleLambdaDataExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1416:1: (this_MatchDataExpression_0= ruleMatchDataExpression | this_LambdaDataExpression_1= ruleLambdaDataExpression )
+            // InternalScope.g:1415:28: ( (this_MatchDataExpression_0= ruleMatchDataExpression | this_LambdaDataExpression_1= ruleLambdaDataExpression ) )
+            // InternalScope.g:1416:1: (this_MatchDataExpression_0= ruleMatchDataExpression | this_LambdaDataExpression_1= ruleLambdaDataExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1416:1: (this_MatchDataExpression_0= ruleMatchDataExpression | this_LambdaDataExpression_1= ruleLambdaDataExpression )
+            // InternalScope.g:1416:1: (this_MatchDataExpression_0= ruleMatchDataExpression | this_LambdaDataExpression_1= ruleLambdaDataExpression )
             int alt30=2;
             int LA30_0 = input.LA(1);
 
@@ -4060,14 +4060,14 @@ else if ( (LA30_0==31) ) {
             }
             switch (alt30) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1417:5: this_MatchDataExpression_0= ruleMatchDataExpression
+                    // InternalScope.g:1417:5: this_MatchDataExpression_0= ruleMatchDataExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getDataExpressionAccess().getMatchDataExpressionParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleMatchDataExpression_in_ruleDataExpression3003);
+                    pushFollow(FOLLOW_2);
                     this_MatchDataExpression_0=ruleMatchDataExpression();
 
                     state._fsp--;
@@ -4082,14 +4082,14 @@ else if ( (LA30_0==31) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1427:5: this_LambdaDataExpression_1= ruleLambdaDataExpression
+                    // InternalScope.g:1427:5: this_LambdaDataExpression_1= ruleLambdaDataExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getDataExpressionAccess().getLambdaDataExpressionParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleLambdaDataExpression_in_ruleDataExpression3030);
+                    pushFollow(FOLLOW_2);
                     this_LambdaDataExpression_1=ruleLambdaDataExpression();
 
                     state._fsp--;
@@ -4126,7 +4126,7 @@ else if ( (LA30_0==31) ) {
 
 
     // $ANTLR start "entryRuleMatchDataExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1443:1: entryRuleMatchDataExpression returns [EObject current=null] : iv_ruleMatchDataExpression= ruleMatchDataExpression EOF ;
+    // InternalScope.g:1443:1: entryRuleMatchDataExpression returns [EObject current=null] : iv_ruleMatchDataExpression= ruleMatchDataExpression EOF ;
     public final EObject entryRuleMatchDataExpression() throws RecognitionException {
         EObject current = null;
 
@@ -4134,13 +4134,13 @@ public final EObject entryRuleMatchDataExpression() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1444:2: (iv_ruleMatchDataExpression= ruleMatchDataExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1445:2: iv_ruleMatchDataExpression= ruleMatchDataExpression EOF
+            // InternalScope.g:1444:2: (iv_ruleMatchDataExpression= ruleMatchDataExpression EOF )
+            // InternalScope.g:1445:2: iv_ruleMatchDataExpression= ruleMatchDataExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getMatchDataExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleMatchDataExpression_in_entryRuleMatchDataExpression3065);
+            pushFollow(FOLLOW_1);
             iv_ruleMatchDataExpression=ruleMatchDataExpression();
 
             state._fsp--;
@@ -4148,7 +4148,7 @@ public final EObject entryRuleMatchDataExpression() throws RecognitionException
             if ( state.backtracking==0 ) {
                current =iv_ruleMatchDataExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleMatchDataExpression3075); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -4166,7 +4166,7 @@ public final EObject entryRuleMatchDataExpression() throws RecognitionException
 
 
     // $ANTLR start "ruleMatchDataExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1452:1: ruleMatchDataExpression returns [EObject current=null] : ( ( (lv_key_0_0= ruleIdentifier ) ) otherlv_1= '=' ( (lv_value_2_0= ruleExpression ) ) ) ;
+    // InternalScope.g:1452:1: ruleMatchDataExpression returns [EObject current=null] : ( ( (lv_key_0_0= ruleIdentifier ) ) otherlv_1= '=' ( (lv_value_2_0= ruleExpression ) ) ) ;
     public final EObject ruleMatchDataExpression() throws RecognitionException {
         EObject current = null;
 
@@ -4179,24 +4179,24 @@ public final EObject ruleMatchDataExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1455:28: ( ( ( (lv_key_0_0= ruleIdentifier ) ) otherlv_1= '=' ( (lv_value_2_0= ruleExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1456:1: ( ( (lv_key_0_0= ruleIdentifier ) ) otherlv_1= '=' ( (lv_value_2_0= ruleExpression ) ) )
+            // InternalScope.g:1455:28: ( ( ( (lv_key_0_0= ruleIdentifier ) ) otherlv_1= '=' ( (lv_value_2_0= ruleExpression ) ) ) )
+            // InternalScope.g:1456:1: ( ( (lv_key_0_0= ruleIdentifier ) ) otherlv_1= '=' ( (lv_value_2_0= ruleExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1456:1: ( ( (lv_key_0_0= ruleIdentifier ) ) otherlv_1= '=' ( (lv_value_2_0= ruleExpression ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1456:2: ( (lv_key_0_0= ruleIdentifier ) ) otherlv_1= '=' ( (lv_value_2_0= ruleExpression ) )
+            // InternalScope.g:1456:1: ( ( (lv_key_0_0= ruleIdentifier ) ) otherlv_1= '=' ( (lv_value_2_0= ruleExpression ) ) )
+            // InternalScope.g:1456:2: ( (lv_key_0_0= ruleIdentifier ) ) otherlv_1= '=' ( (lv_value_2_0= ruleExpression ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1456:2: ( (lv_key_0_0= ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1457:1: (lv_key_0_0= ruleIdentifier )
+            // InternalScope.g:1456:2: ( (lv_key_0_0= ruleIdentifier ) )
+            // InternalScope.g:1457:1: (lv_key_0_0= ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1457:1: (lv_key_0_0= ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1458:3: lv_key_0_0= ruleIdentifier
+            // InternalScope.g:1457:1: (lv_key_0_0= ruleIdentifier )
+            // InternalScope.g:1458:3: lv_key_0_0= ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getMatchDataExpressionAccess().getKeyIdentifierParserRuleCall_0_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_ruleMatchDataExpression3121);
+            pushFollow(FOLLOW_16);
             lv_key_0_0=ruleIdentifier();
 
             state._fsp--;
@@ -4210,7 +4210,7 @@ public final EObject ruleMatchDataExpression() throws RecognitionException {
                      			current, 
                      			"key",
                       		lv_key_0_0, 
-                      		"Identifier");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -4220,24 +4220,24 @@ public final EObject ruleMatchDataExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,22,FOLLOW_22_in_ruleMatchDataExpression3133); if (state.failed) return current;
+            otherlv_1=(Token)match(input,22,FOLLOW_17); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getMatchDataExpressionAccess().getEqualsSignKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1478:1: ( (lv_value_2_0= ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1479:1: (lv_value_2_0= ruleExpression )
+            // InternalScope.g:1478:1: ( (lv_value_2_0= ruleExpression ) )
+            // InternalScope.g:1479:1: (lv_value_2_0= ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1479:1: (lv_value_2_0= ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1480:3: lv_value_2_0= ruleExpression
+            // InternalScope.g:1479:1: (lv_value_2_0= ruleExpression )
+            // InternalScope.g:1480:3: lv_value_2_0= ruleExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getMatchDataExpressionAccess().getValueExpressionParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleExpression_in_ruleMatchDataExpression3154);
+            pushFollow(FOLLOW_2);
             lv_value_2_0=ruleExpression();
 
             state._fsp--;
@@ -4251,7 +4251,7 @@ public final EObject ruleMatchDataExpression() throws RecognitionException {
                      			current, 
                      			"value",
                       		lv_value_2_0, 
-                      		"Expression");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -4284,7 +4284,7 @@ public final EObject ruleMatchDataExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleLambdaDataExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1504:1: entryRuleLambdaDataExpression returns [EObject current=null] : iv_ruleLambdaDataExpression= ruleLambdaDataExpression EOF ;
+    // InternalScope.g:1504:1: entryRuleLambdaDataExpression returns [EObject current=null] : iv_ruleLambdaDataExpression= ruleLambdaDataExpression EOF ;
     public final EObject entryRuleLambdaDataExpression() throws RecognitionException {
         EObject current = null;
 
@@ -4292,13 +4292,13 @@ public final EObject entryRuleLambdaDataExpression() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1505:2: (iv_ruleLambdaDataExpression= ruleLambdaDataExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1506:2: iv_ruleLambdaDataExpression= ruleLambdaDataExpression EOF
+            // InternalScope.g:1505:2: (iv_ruleLambdaDataExpression= ruleLambdaDataExpression EOF )
+            // InternalScope.g:1506:2: iv_ruleLambdaDataExpression= ruleLambdaDataExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getLambdaDataExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleLambdaDataExpression_in_entryRuleLambdaDataExpression3190);
+            pushFollow(FOLLOW_1);
             iv_ruleLambdaDataExpression=ruleLambdaDataExpression();
 
             state._fsp--;
@@ -4306,7 +4306,7 @@ public final EObject entryRuleLambdaDataExpression() throws RecognitionException
             if ( state.backtracking==0 ) {
                current =iv_ruleLambdaDataExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleLambdaDataExpression3200); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -4324,7 +4324,7 @@ public final EObject entryRuleLambdaDataExpression() throws RecognitionException
 
 
     // $ANTLR start "ruleLambdaDataExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1513:1: ruleLambdaDataExpression returns [EObject current=null] : (otherlv_0= '[' ( (lv_desc_1_0= ruleIdentifier ) ) otherlv_2= '|' ( (lv_value_3_0= ruleExpression ) ) otherlv_4= ']' ) ;
+    // InternalScope.g:1513:1: ruleLambdaDataExpression returns [EObject current=null] : (otherlv_0= '[' ( (lv_desc_1_0= ruleIdentifier ) ) otherlv_2= '|' ( (lv_value_3_0= ruleExpression ) ) otherlv_4= ']' ) ;
     public final EObject ruleLambdaDataExpression() throws RecognitionException {
         EObject current = null;
 
@@ -4339,30 +4339,30 @@ public final EObject ruleLambdaDataExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1516:28: ( (otherlv_0= '[' ( (lv_desc_1_0= ruleIdentifier ) ) otherlv_2= '|' ( (lv_value_3_0= ruleExpression ) ) otherlv_4= ']' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1517:1: (otherlv_0= '[' ( (lv_desc_1_0= ruleIdentifier ) ) otherlv_2= '|' ( (lv_value_3_0= ruleExpression ) ) otherlv_4= ']' )
+            // InternalScope.g:1516:28: ( (otherlv_0= '[' ( (lv_desc_1_0= ruleIdentifier ) ) otherlv_2= '|' ( (lv_value_3_0= ruleExpression ) ) otherlv_4= ']' ) )
+            // InternalScope.g:1517:1: (otherlv_0= '[' ( (lv_desc_1_0= ruleIdentifier ) ) otherlv_2= '|' ( (lv_value_3_0= ruleExpression ) ) otherlv_4= ']' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1517:1: (otherlv_0= '[' ( (lv_desc_1_0= ruleIdentifier ) ) otherlv_2= '|' ( (lv_value_3_0= ruleExpression ) ) otherlv_4= ']' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1517:3: otherlv_0= '[' ( (lv_desc_1_0= ruleIdentifier ) ) otherlv_2= '|' ( (lv_value_3_0= ruleExpression ) ) otherlv_4= ']'
+            // InternalScope.g:1517:1: (otherlv_0= '[' ( (lv_desc_1_0= ruleIdentifier ) ) otherlv_2= '|' ( (lv_value_3_0= ruleExpression ) ) otherlv_4= ']' )
+            // InternalScope.g:1517:3: otherlv_0= '[' ( (lv_desc_1_0= ruleIdentifier ) ) otherlv_2= '|' ( (lv_value_3_0= ruleExpression ) ) otherlv_4= ']'
             {
-            otherlv_0=(Token)match(input,31,FOLLOW_31_in_ruleLambdaDataExpression3237); if (state.failed) return current;
+            otherlv_0=(Token)match(input,31,FOLLOW_3); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getLambdaDataExpressionAccess().getLeftSquareBracketKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1521:1: ( (lv_desc_1_0= ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1522:1: (lv_desc_1_0= ruleIdentifier )
+            // InternalScope.g:1521:1: ( (lv_desc_1_0= ruleIdentifier ) )
+            // InternalScope.g:1522:1: (lv_desc_1_0= ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1522:1: (lv_desc_1_0= ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1523:3: lv_desc_1_0= ruleIdentifier
+            // InternalScope.g:1522:1: (lv_desc_1_0= ruleIdentifier )
+            // InternalScope.g:1523:3: lv_desc_1_0= ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getLambdaDataExpressionAccess().getDescIdentifierParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_ruleLambdaDataExpression3258);
+            pushFollow(FOLLOW_41);
             lv_desc_1_0=ruleIdentifier();
 
             state._fsp--;
@@ -4376,7 +4376,7 @@ public final EObject ruleLambdaDataExpression() throws RecognitionException {
                      			current, 
                      			"desc",
                       		lv_desc_1_0, 
-                      		"Identifier");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -4386,24 +4386,24 @@ public final EObject ruleLambdaDataExpression() throws RecognitionException {
 
             }
 
-            otherlv_2=(Token)match(input,33,FOLLOW_33_in_ruleLambdaDataExpression3270); if (state.failed) return current;
+            otherlv_2=(Token)match(input,33,FOLLOW_17); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getLambdaDataExpressionAccess().getVerticalLineKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1543:1: ( (lv_value_3_0= ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1544:1: (lv_value_3_0= ruleExpression )
+            // InternalScope.g:1543:1: ( (lv_value_3_0= ruleExpression ) )
+            // InternalScope.g:1544:1: (lv_value_3_0= ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1544:1: (lv_value_3_0= ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1545:3: lv_value_3_0= ruleExpression
+            // InternalScope.g:1544:1: (lv_value_3_0= ruleExpression )
+            // InternalScope.g:1545:3: lv_value_3_0= ruleExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getLambdaDataExpressionAccess().getValueExpressionParserRuleCall_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleExpression_in_ruleLambdaDataExpression3291);
+            pushFollow(FOLLOW_28);
             lv_value_3_0=ruleExpression();
 
             state._fsp--;
@@ -4417,7 +4417,7 @@ public final EObject ruleLambdaDataExpression() throws RecognitionException {
                      			current, 
                      			"value",
                       		lv_value_3_0, 
-                      		"Expression");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -4427,7 +4427,7 @@ public final EObject ruleLambdaDataExpression() throws RecognitionException {
 
             }
 
-            otherlv_4=(Token)match(input,32,FOLLOW_32_in_ruleLambdaDataExpression3303); if (state.failed) return current;
+            otherlv_4=(Token)match(input,32,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_4, grammarAccess.getLambdaDataExpressionAccess().getRightSquareBracketKeyword_4());
@@ -4456,7 +4456,7 @@ public final EObject ruleLambdaDataExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleSimpleScopeExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1573:1: entryRuleSimpleScopeExpression returns [EObject current=null] : iv_ruleSimpleScopeExpression= ruleSimpleScopeExpression EOF ;
+    // InternalScope.g:1573:1: entryRuleSimpleScopeExpression returns [EObject current=null] : iv_ruleSimpleScopeExpression= ruleSimpleScopeExpression EOF ;
     public final EObject entryRuleSimpleScopeExpression() throws RecognitionException {
         EObject current = null;
 
@@ -4464,13 +4464,13 @@ public final EObject entryRuleSimpleScopeExpression() throws RecognitionExceptio
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1574:2: (iv_ruleSimpleScopeExpression= ruleSimpleScopeExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1575:2: iv_ruleSimpleScopeExpression= ruleSimpleScopeExpression EOF
+            // InternalScope.g:1574:2: (iv_ruleSimpleScopeExpression= ruleSimpleScopeExpression EOF )
+            // InternalScope.g:1575:2: iv_ruleSimpleScopeExpression= ruleSimpleScopeExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getSimpleScopeExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleSimpleScopeExpression_in_entryRuleSimpleScopeExpression3339);
+            pushFollow(FOLLOW_1);
             iv_ruleSimpleScopeExpression=ruleSimpleScopeExpression();
 
             state._fsp--;
@@ -4478,7 +4478,7 @@ public final EObject entryRuleSimpleScopeExpression() throws RecognitionExceptio
             if ( state.backtracking==0 ) {
                current =iv_ruleSimpleScopeExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSimpleScopeExpression3349); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -4496,7 +4496,7 @@ public final EObject entryRuleSimpleScopeExpression() throws RecognitionExceptio
 
 
     // $ANTLR start "ruleSimpleScopeExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1582:1: ruleSimpleScopeExpression returns [EObject current=null] : ( (lv_expr_0_0= ruleExpression ) ) ;
+    // InternalScope.g:1582:1: ruleSimpleScopeExpression returns [EObject current=null] : ( (lv_expr_0_0= ruleExpression ) ) ;
     public final EObject ruleSimpleScopeExpression() throws RecognitionException {
         EObject current = null;
 
@@ -4506,21 +4506,21 @@ public final EObject ruleSimpleScopeExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1585:28: ( ( (lv_expr_0_0= ruleExpression ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1586:1: ( (lv_expr_0_0= ruleExpression ) )
+            // InternalScope.g:1585:28: ( ( (lv_expr_0_0= ruleExpression ) ) )
+            // InternalScope.g:1586:1: ( (lv_expr_0_0= ruleExpression ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1586:1: ( (lv_expr_0_0= ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1587:1: (lv_expr_0_0= ruleExpression )
+            // InternalScope.g:1586:1: ( (lv_expr_0_0= ruleExpression ) )
+            // InternalScope.g:1587:1: (lv_expr_0_0= ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1587:1: (lv_expr_0_0= ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1588:3: lv_expr_0_0= ruleExpression
+            // InternalScope.g:1587:1: (lv_expr_0_0= ruleExpression )
+            // InternalScope.g:1588:3: lv_expr_0_0= ruleExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getSimpleScopeExpressionAccess().getExprExpressionParserRuleCall_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleExpression_in_ruleSimpleScopeExpression3394);
+            pushFollow(FOLLOW_2);
             lv_expr_0_0=ruleExpression();
 
             state._fsp--;
@@ -4534,7 +4534,7 @@ public final EObject ruleSimpleScopeExpression() throws RecognitionException {
                      			current, 
                      			"expr",
                       		lv_expr_0_0, 
-                      		"Expression");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -4564,7 +4564,7 @@ public final EObject ruleSimpleScopeExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleNaming"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1612:1: entryRuleNaming returns [EObject current=null] : iv_ruleNaming= ruleNaming EOF ;
+    // InternalScope.g:1612:1: entryRuleNaming returns [EObject current=null] : iv_ruleNaming= ruleNaming EOF ;
     public final EObject entryRuleNaming() throws RecognitionException {
         EObject current = null;
 
@@ -4572,13 +4572,13 @@ public final EObject entryRuleNaming() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1613:2: (iv_ruleNaming= ruleNaming EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1614:2: iv_ruleNaming= ruleNaming EOF
+            // InternalScope.g:1613:2: (iv_ruleNaming= ruleNaming EOF )
+            // InternalScope.g:1614:2: iv_ruleNaming= ruleNaming EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getNamingRule()); 
             }
-            pushFollow(FOLLOW_ruleNaming_in_entryRuleNaming3429);
+            pushFollow(FOLLOW_1);
             iv_ruleNaming=ruleNaming();
 
             state._fsp--;
@@ -4586,7 +4586,7 @@ public final EObject entryRuleNaming() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleNaming; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNaming3439); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -4604,7 +4604,7 @@ public final EObject entryRuleNaming() throws RecognitionException {
 
 
     // $ANTLR start "ruleNaming"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1621:1: ruleNaming returns [EObject current=null] : ( ( ( '(' )=> (otherlv_0= '(' ( (lv_names_1_0= ruleNamingExpression ) ) (otherlv_2= ',' ( (lv_names_3_0= ruleNamingExpression ) ) )* otherlv_4= ')' ) ) | ( (lv_names_5_0= ruleNamingExpression ) ) ) ;
+    // InternalScope.g:1621:1: ruleNaming returns [EObject current=null] : ( ( ( '(' )=> (otherlv_0= '(' ( (lv_names_1_0= ruleNamingExpression ) ) (otherlv_2= ',' ( (lv_names_3_0= ruleNamingExpression ) ) )* otherlv_4= ')' ) ) | ( (lv_names_5_0= ruleNamingExpression ) ) ) ;
     public final EObject ruleNaming() throws RecognitionException {
         EObject current = null;
 
@@ -4621,40 +4621,40 @@ public final EObject ruleNaming() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1624:28: ( ( ( ( '(' )=> (otherlv_0= '(' ( (lv_names_1_0= ruleNamingExpression ) ) (otherlv_2= ',' ( (lv_names_3_0= ruleNamingExpression ) ) )* otherlv_4= ')' ) ) | ( (lv_names_5_0= ruleNamingExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1625:1: ( ( ( '(' )=> (otherlv_0= '(' ( (lv_names_1_0= ruleNamingExpression ) ) (otherlv_2= ',' ( (lv_names_3_0= ruleNamingExpression ) ) )* otherlv_4= ')' ) ) | ( (lv_names_5_0= ruleNamingExpression ) ) )
+            // InternalScope.g:1624:28: ( ( ( ( '(' )=> (otherlv_0= '(' ( (lv_names_1_0= ruleNamingExpression ) ) (otherlv_2= ',' ( (lv_names_3_0= ruleNamingExpression ) ) )* otherlv_4= ')' ) ) | ( (lv_names_5_0= ruleNamingExpression ) ) ) )
+            // InternalScope.g:1625:1: ( ( ( '(' )=> (otherlv_0= '(' ( (lv_names_1_0= ruleNamingExpression ) ) (otherlv_2= ',' ( (lv_names_3_0= ruleNamingExpression ) ) )* otherlv_4= ')' ) ) | ( (lv_names_5_0= ruleNamingExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1625:1: ( ( ( '(' )=> (otherlv_0= '(' ( (lv_names_1_0= ruleNamingExpression ) ) (otherlv_2= ',' ( (lv_names_3_0= ruleNamingExpression ) ) )* otherlv_4= ')' ) ) | ( (lv_names_5_0= ruleNamingExpression ) ) )
+            // InternalScope.g:1625:1: ( ( ( '(' )=> (otherlv_0= '(' ( (lv_names_1_0= ruleNamingExpression ) ) (otherlv_2= ',' ( (lv_names_3_0= ruleNamingExpression ) ) )* otherlv_4= ')' ) ) | ( (lv_names_5_0= ruleNamingExpression ) ) )
             int alt32=2;
             alt32 = dfa32.predict(input);
             switch (alt32) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1625:2: ( ( '(' )=> (otherlv_0= '(' ( (lv_names_1_0= ruleNamingExpression ) ) (otherlv_2= ',' ( (lv_names_3_0= ruleNamingExpression ) ) )* otherlv_4= ')' ) )
+                    // InternalScope.g:1625:2: ( ( '(' )=> (otherlv_0= '(' ( (lv_names_1_0= ruleNamingExpression ) ) (otherlv_2= ',' ( (lv_names_3_0= ruleNamingExpression ) ) )* otherlv_4= ')' ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1625:2: ( ( '(' )=> (otherlv_0= '(' ( (lv_names_1_0= ruleNamingExpression ) ) (otherlv_2= ',' ( (lv_names_3_0= ruleNamingExpression ) ) )* otherlv_4= ')' ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1625:3: ( '(' )=> (otherlv_0= '(' ( (lv_names_1_0= ruleNamingExpression ) ) (otherlv_2= ',' ( (lv_names_3_0= ruleNamingExpression ) ) )* otherlv_4= ')' )
+                    // InternalScope.g:1625:2: ( ( '(' )=> (otherlv_0= '(' ( (lv_names_1_0= ruleNamingExpression ) ) (otherlv_2= ',' ( (lv_names_3_0= ruleNamingExpression ) ) )* otherlv_4= ')' ) )
+                    // InternalScope.g:1625:3: ( '(' )=> (otherlv_0= '(' ( (lv_names_1_0= ruleNamingExpression ) ) (otherlv_2= ',' ( (lv_names_3_0= ruleNamingExpression ) ) )* otherlv_4= ')' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1626:4: (otherlv_0= '(' ( (lv_names_1_0= ruleNamingExpression ) ) (otherlv_2= ',' ( (lv_names_3_0= ruleNamingExpression ) ) )* otherlv_4= ')' )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1626:6: otherlv_0= '(' ( (lv_names_1_0= ruleNamingExpression ) ) (otherlv_2= ',' ( (lv_names_3_0= ruleNamingExpression ) ) )* otherlv_4= ')'
+                    // InternalScope.g:1626:4: (otherlv_0= '(' ( (lv_names_1_0= ruleNamingExpression ) ) (otherlv_2= ',' ( (lv_names_3_0= ruleNamingExpression ) ) )* otherlv_4= ')' )
+                    // InternalScope.g:1626:6: otherlv_0= '(' ( (lv_names_1_0= ruleNamingExpression ) ) (otherlv_2= ',' ( (lv_names_3_0= ruleNamingExpression ) ) )* otherlv_4= ')'
                     {
-                    otherlv_0=(Token)match(input,25,FOLLOW_25_in_ruleNaming3485); if (state.failed) return current;
+                    otherlv_0=(Token)match(input,25,FOLLOW_17); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_0, grammarAccess.getNamingAccess().getLeftParenthesisKeyword_0_0_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1630:1: ( (lv_names_1_0= ruleNamingExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1631:1: (lv_names_1_0= ruleNamingExpression )
+                    // InternalScope.g:1630:1: ( (lv_names_1_0= ruleNamingExpression ) )
+                    // InternalScope.g:1631:1: (lv_names_1_0= ruleNamingExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1631:1: (lv_names_1_0= ruleNamingExpression )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1632:3: lv_names_1_0= ruleNamingExpression
+                    // InternalScope.g:1631:1: (lv_names_1_0= ruleNamingExpression )
+                    // InternalScope.g:1632:3: lv_names_1_0= ruleNamingExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getNamingAccess().getNamesNamingExpressionParserRuleCall_0_0_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleNamingExpression_in_ruleNaming3506);
+                    pushFollow(FOLLOW_32);
                     lv_names_1_0=ruleNamingExpression();
 
                     state._fsp--;
@@ -4668,7 +4668,7 @@ public final EObject ruleNaming() throws RecognitionException {
                              			current, 
                              			"names",
                               		lv_names_1_0, 
-                              		"NamingExpression");
+                              		"com.avaloq.tools.ddk.xtext.scope.Scope.NamingExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -4678,7 +4678,7 @@ public final EObject ruleNaming() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1648:2: (otherlv_2= ',' ( (lv_names_3_0= ruleNamingExpression ) ) )*
+                    // InternalScope.g:1648:2: (otherlv_2= ',' ( (lv_names_3_0= ruleNamingExpression ) ) )*
                     loop31:
                     do {
                         int alt31=2;
@@ -4691,26 +4691,26 @@ public final EObject ruleNaming() throws RecognitionException {
 
                         switch (alt31) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1648:4: otherlv_2= ',' ( (lv_names_3_0= ruleNamingExpression ) )
+                    	    // InternalScope.g:1648:4: otherlv_2= ',' ( (lv_names_3_0= ruleNamingExpression ) )
                     	    {
-                    	    otherlv_2=(Token)match(input,36,FOLLOW_36_in_ruleNaming3519); if (state.failed) return current;
+                    	    otherlv_2=(Token)match(input,36,FOLLOW_17); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_2, grammarAccess.getNamingAccess().getCommaKeyword_0_0_2_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1652:1: ( (lv_names_3_0= ruleNamingExpression ) )
-                    	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1653:1: (lv_names_3_0= ruleNamingExpression )
+                    	    // InternalScope.g:1652:1: ( (lv_names_3_0= ruleNamingExpression ) )
+                    	    // InternalScope.g:1653:1: (lv_names_3_0= ruleNamingExpression )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1653:1: (lv_names_3_0= ruleNamingExpression )
-                    	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1654:3: lv_names_3_0= ruleNamingExpression
+                    	    // InternalScope.g:1653:1: (lv_names_3_0= ruleNamingExpression )
+                    	    // InternalScope.g:1654:3: lv_names_3_0= ruleNamingExpression
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getNamingAccess().getNamesNamingExpressionParserRuleCall_0_0_2_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleNamingExpression_in_ruleNaming3540);
+                    	    pushFollow(FOLLOW_32);
                     	    lv_names_3_0=ruleNamingExpression();
 
                     	    state._fsp--;
@@ -4724,7 +4724,7 @@ public final EObject ruleNaming() throws RecognitionException {
                     	             			current, 
                     	             			"names",
                     	              		lv_names_3_0, 
-                    	              		"NamingExpression");
+                    	              		"com.avaloq.tools.ddk.xtext.scope.Scope.NamingExpression");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -4743,7 +4743,7 @@ public final EObject ruleNaming() throws RecognitionException {
                         }
                     } while (true);
 
-                    otherlv_4=(Token)match(input,26,FOLLOW_26_in_ruleNaming3554); if (state.failed) return current;
+                    otherlv_4=(Token)match(input,26,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_4, grammarAccess.getNamingAccess().getRightParenthesisKeyword_0_0_3());
@@ -4759,20 +4759,20 @@ public final EObject ruleNaming() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1675:6: ( (lv_names_5_0= ruleNamingExpression ) )
+                    // InternalScope.g:1675:6: ( (lv_names_5_0= ruleNamingExpression ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1675:6: ( (lv_names_5_0= ruleNamingExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1676:1: (lv_names_5_0= ruleNamingExpression )
+                    // InternalScope.g:1675:6: ( (lv_names_5_0= ruleNamingExpression ) )
+                    // InternalScope.g:1676:1: (lv_names_5_0= ruleNamingExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1676:1: (lv_names_5_0= ruleNamingExpression )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1677:3: lv_names_5_0= ruleNamingExpression
+                    // InternalScope.g:1676:1: (lv_names_5_0= ruleNamingExpression )
+                    // InternalScope.g:1677:3: lv_names_5_0= ruleNamingExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getNamingAccess().getNamesNamingExpressionParserRuleCall_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleNamingExpression_in_ruleNaming3583);
+                    pushFollow(FOLLOW_2);
                     lv_names_5_0=ruleNamingExpression();
 
                     state._fsp--;
@@ -4786,7 +4786,7 @@ public final EObject ruleNaming() throws RecognitionException {
                              			current, 
                              			"names",
                               		lv_names_5_0, 
-                              		"NamingExpression");
+                              		"com.avaloq.tools.ddk.xtext.scope.Scope.NamingExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -4822,7 +4822,7 @@ public final EObject ruleNaming() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleNamingExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1701:1: entryRuleNamingExpression returns [EObject current=null] : iv_ruleNamingExpression= ruleNamingExpression EOF ;
+    // InternalScope.g:1701:1: entryRuleNamingExpression returns [EObject current=null] : iv_ruleNamingExpression= ruleNamingExpression EOF ;
     public final EObject entryRuleNamingExpression() throws RecognitionException {
         EObject current = null;
 
@@ -4830,13 +4830,13 @@ public final EObject entryRuleNamingExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1702:2: (iv_ruleNamingExpression= ruleNamingExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1703:2: iv_ruleNamingExpression= ruleNamingExpression EOF
+            // InternalScope.g:1702:2: (iv_ruleNamingExpression= ruleNamingExpression EOF )
+            // InternalScope.g:1703:2: iv_ruleNamingExpression= ruleNamingExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getNamingExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleNamingExpression_in_entryRuleNamingExpression3619);
+            pushFollow(FOLLOW_1);
             iv_ruleNamingExpression=ruleNamingExpression();
 
             state._fsp--;
@@ -4844,7 +4844,7 @@ public final EObject entryRuleNamingExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleNamingExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNamingExpression3629); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -4862,7 +4862,7 @@ public final EObject entryRuleNamingExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleNamingExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1710:1: ruleNamingExpression returns [EObject current=null] : ( ( (lv_export_0_0= 'export' ) ) | ( ( (lv_factory_1_0= 'factory' ) )? ( (lv_expression_2_0= ruleExpression ) ) ) ) ;
+    // InternalScope.g:1710:1: ruleNamingExpression returns [EObject current=null] : ( ( (lv_export_0_0= 'export' ) ) | ( ( (lv_factory_1_0= 'factory' ) )? ( (lv_expression_2_0= ruleExpression ) ) ) ) ;
     public final EObject ruleNamingExpression() throws RecognitionException {
         EObject current = null;
 
@@ -4874,10 +4874,10 @@ public final EObject ruleNamingExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1713:28: ( ( ( (lv_export_0_0= 'export' ) ) | ( ( (lv_factory_1_0= 'factory' ) )? ( (lv_expression_2_0= ruleExpression ) ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1714:1: ( ( (lv_export_0_0= 'export' ) ) | ( ( (lv_factory_1_0= 'factory' ) )? ( (lv_expression_2_0= ruleExpression ) ) ) )
+            // InternalScope.g:1713:28: ( ( ( (lv_export_0_0= 'export' ) ) | ( ( (lv_factory_1_0= 'factory' ) )? ( (lv_expression_2_0= ruleExpression ) ) ) ) )
+            // InternalScope.g:1714:1: ( ( (lv_export_0_0= 'export' ) ) | ( ( (lv_factory_1_0= 'factory' ) )? ( (lv_expression_2_0= ruleExpression ) ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1714:1: ( ( (lv_export_0_0= 'export' ) ) | ( ( (lv_factory_1_0= 'factory' ) )? ( (lv_expression_2_0= ruleExpression ) ) ) )
+            // InternalScope.g:1714:1: ( ( (lv_export_0_0= 'export' ) ) | ( ( (lv_factory_1_0= 'factory' ) )? ( (lv_expression_2_0= ruleExpression ) ) ) )
             int alt34=2;
             int LA34_0 = input.LA(1);
 
@@ -4896,15 +4896,15 @@ else if ( ((LA34_0>=RULE_STRING && LA34_0<=RULE_ID)||LA34_0==20||LA34_0==25||LA3
             }
             switch (alt34) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1714:2: ( (lv_export_0_0= 'export' ) )
+                    // InternalScope.g:1714:2: ( (lv_export_0_0= 'export' ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1714:2: ( (lv_export_0_0= 'export' ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1715:1: (lv_export_0_0= 'export' )
+                    // InternalScope.g:1714:2: ( (lv_export_0_0= 'export' ) )
+                    // InternalScope.g:1715:1: (lv_export_0_0= 'export' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1715:1: (lv_export_0_0= 'export' )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1716:3: lv_export_0_0= 'export'
+                    // InternalScope.g:1715:1: (lv_export_0_0= 'export' )
+                    // InternalScope.g:1716:3: lv_export_0_0= 'export'
                     {
-                    lv_export_0_0=(Token)match(input,43,FOLLOW_43_in_ruleNamingExpression3672); if (state.failed) return current;
+                    lv_export_0_0=(Token)match(input,43,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_export_0_0, grammarAccess.getNamingExpressionAccess().getExportExportKeyword_0_0());
@@ -4928,12 +4928,12 @@ else if ( ((LA34_0>=RULE_STRING && LA34_0<=RULE_ID)||LA34_0==20||LA34_0==25||LA3
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1730:6: ( ( (lv_factory_1_0= 'factory' ) )? ( (lv_expression_2_0= ruleExpression ) ) )
+                    // InternalScope.g:1730:6: ( ( (lv_factory_1_0= 'factory' ) )? ( (lv_expression_2_0= ruleExpression ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1730:6: ( ( (lv_factory_1_0= 'factory' ) )? ( (lv_expression_2_0= ruleExpression ) ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1730:7: ( (lv_factory_1_0= 'factory' ) )? ( (lv_expression_2_0= ruleExpression ) )
+                    // InternalScope.g:1730:6: ( ( (lv_factory_1_0= 'factory' ) )? ( (lv_expression_2_0= ruleExpression ) ) )
+                    // InternalScope.g:1730:7: ( (lv_factory_1_0= 'factory' ) )? ( (lv_expression_2_0= ruleExpression ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1730:7: ( (lv_factory_1_0= 'factory' ) )?
+                    // InternalScope.g:1730:7: ( (lv_factory_1_0= 'factory' ) )?
                     int alt33=2;
                     int LA33_0 = input.LA(1);
 
@@ -4942,12 +4942,12 @@ else if ( ((LA34_0>=RULE_STRING && LA34_0<=RULE_ID)||LA34_0==20||LA34_0==25||LA3
                     }
                     switch (alt33) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1731:1: (lv_factory_1_0= 'factory' )
+                            // InternalScope.g:1731:1: (lv_factory_1_0= 'factory' )
                             {
-                            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1731:1: (lv_factory_1_0= 'factory' )
-                            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1732:3: lv_factory_1_0= 'factory'
+                            // InternalScope.g:1731:1: (lv_factory_1_0= 'factory' )
+                            // InternalScope.g:1732:3: lv_factory_1_0= 'factory'
                             {
-                            lv_factory_1_0=(Token)match(input,34,FOLLOW_34_in_ruleNamingExpression3710); if (state.failed) return current;
+                            lv_factory_1_0=(Token)match(input,34,FOLLOW_17); if (state.failed) return current;
                             if ( state.backtracking==0 ) {
 
                                       newLeafNode(lv_factory_1_0, grammarAccess.getNamingExpressionAccess().getFactoryFactoryKeyword_1_0_0());
@@ -4970,18 +4970,18 @@ else if ( ((LA34_0>=RULE_STRING && LA34_0<=RULE_ID)||LA34_0==20||LA34_0==25||LA3
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1745:3: ( (lv_expression_2_0= ruleExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1746:1: (lv_expression_2_0= ruleExpression )
+                    // InternalScope.g:1745:3: ( (lv_expression_2_0= ruleExpression ) )
+                    // InternalScope.g:1746:1: (lv_expression_2_0= ruleExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1746:1: (lv_expression_2_0= ruleExpression )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1747:3: lv_expression_2_0= ruleExpression
+                    // InternalScope.g:1746:1: (lv_expression_2_0= ruleExpression )
+                    // InternalScope.g:1747:3: lv_expression_2_0= ruleExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getNamingExpressionAccess().getExpressionExpressionParserRuleCall_1_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleExpression_in_ruleNamingExpression3745);
+                    pushFollow(FOLLOW_2);
                     lv_expression_2_0=ruleExpression();
 
                     state._fsp--;
@@ -4995,7 +4995,7 @@ else if ( ((LA34_0>=RULE_STRING && LA34_0<=RULE_ID)||LA34_0==20||LA34_0==25||LA3
                              			current, 
                              			"expression",
                               		lv_expression_2_0, 
-                              		"Expression");
+                              		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -5034,7 +5034,7 @@ else if ( ((LA34_0>=RULE_STRING && LA34_0<=RULE_ID)||LA34_0==20||LA34_0==25||LA3
 
 
     // $ANTLR start "entryRuleQualifiedID"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1771:1: entryRuleQualifiedID returns [String current=null] : iv_ruleQualifiedID= ruleQualifiedID EOF ;
+    // InternalScope.g:1771:1: entryRuleQualifiedID returns [String current=null] : iv_ruleQualifiedID= ruleQualifiedID EOF ;
     public final String entryRuleQualifiedID() throws RecognitionException {
         String current = null;
 
@@ -5042,13 +5042,13 @@ public final String entryRuleQualifiedID() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1772:2: (iv_ruleQualifiedID= ruleQualifiedID EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1773:2: iv_ruleQualifiedID= ruleQualifiedID EOF
+            // InternalScope.g:1772:2: (iv_ruleQualifiedID= ruleQualifiedID EOF )
+            // InternalScope.g:1773:2: iv_ruleQualifiedID= ruleQualifiedID EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getQualifiedIDRule()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedID_in_entryRuleQualifiedID3783);
+            pushFollow(FOLLOW_1);
             iv_ruleQualifiedID=ruleQualifiedID();
 
             state._fsp--;
@@ -5056,7 +5056,7 @@ public final String entryRuleQualifiedID() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleQualifiedID.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedID3794); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -5074,7 +5074,7 @@ public final String entryRuleQualifiedID() throws RecognitionException {
 
 
     // $ANTLR start "ruleQualifiedID"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1780:1: ruleQualifiedID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_Identifier_0= ruleIdentifier (kw= '::' this_Identifier_2= ruleIdentifier )* ) ;
+    // InternalScope.g:1780:1: ruleQualifiedID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_Identifier_0= ruleIdentifier (kw= '::' this_Identifier_2= ruleIdentifier )* ) ;
     public final AntlrDatatypeRuleToken ruleQualifiedID() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -5087,18 +5087,18 @@ public final AntlrDatatypeRuleToken ruleQualifiedID() throws RecognitionExceptio
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1783:28: ( (this_Identifier_0= ruleIdentifier (kw= '::' this_Identifier_2= ruleIdentifier )* ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1784:1: (this_Identifier_0= ruleIdentifier (kw= '::' this_Identifier_2= ruleIdentifier )* )
+            // InternalScope.g:1783:28: ( (this_Identifier_0= ruleIdentifier (kw= '::' this_Identifier_2= ruleIdentifier )* ) )
+            // InternalScope.g:1784:1: (this_Identifier_0= ruleIdentifier (kw= '::' this_Identifier_2= ruleIdentifier )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1784:1: (this_Identifier_0= ruleIdentifier (kw= '::' this_Identifier_2= ruleIdentifier )* )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1785:5: this_Identifier_0= ruleIdentifier (kw= '::' this_Identifier_2= ruleIdentifier )*
+            // InternalScope.g:1784:1: (this_Identifier_0= ruleIdentifier (kw= '::' this_Identifier_2= ruleIdentifier )* )
+            // InternalScope.g:1785:5: this_Identifier_0= ruleIdentifier (kw= '::' this_Identifier_2= ruleIdentifier )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getQualifiedIDAccess().getIdentifierParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_ruleQualifiedID3841);
+            pushFollow(FOLLOW_42);
             this_Identifier_0=ruleIdentifier();
 
             state._fsp--;
@@ -5113,7 +5113,7 @@ public final AntlrDatatypeRuleToken ruleQualifiedID() throws RecognitionExceptio
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1795:1: (kw= '::' this_Identifier_2= ruleIdentifier )*
+            // InternalScope.g:1795:1: (kw= '::' this_Identifier_2= ruleIdentifier )*
             loop35:
             do {
                 int alt35=2;
@@ -5126,9 +5126,9 @@ public final AntlrDatatypeRuleToken ruleQualifiedID() throws RecognitionExceptio
 
                 switch (alt35) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1796:2: kw= '::' this_Identifier_2= ruleIdentifier
+            	    // InternalScope.g:1796:2: kw= '::' this_Identifier_2= ruleIdentifier
             	    {
-            	    kw=(Token)match(input,44,FOLLOW_44_in_ruleQualifiedID3860); if (state.failed) return current;
+            	    kw=(Token)match(input,44,FOLLOW_3); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	              current.merge(kw);
@@ -5140,7 +5140,7 @@ public final AntlrDatatypeRuleToken ruleQualifiedID() throws RecognitionExceptio
             	              newCompositeNode(grammarAccess.getQualifiedIDAccess().getIdentifierParserRuleCall_1_1()); 
             	          
             	    }
-            	    pushFollow(FOLLOW_ruleIdentifier_in_ruleQualifiedID3882);
+            	    pushFollow(FOLLOW_42);
             	    this_Identifier_2=ruleIdentifier();
 
             	    state._fsp--;
@@ -5187,7 +5187,7 @@ public final AntlrDatatypeRuleToken ruleQualifiedID() throws RecognitionExceptio
 
 
     // $ANTLR start "entryRuleDottedID"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1820:1: entryRuleDottedID returns [String current=null] : iv_ruleDottedID= ruleDottedID EOF ;
+    // InternalScope.g:1820:1: entryRuleDottedID returns [String current=null] : iv_ruleDottedID= ruleDottedID EOF ;
     public final String entryRuleDottedID() throws RecognitionException {
         String current = null;
 
@@ -5195,13 +5195,13 @@ public final String entryRuleDottedID() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1821:2: (iv_ruleDottedID= ruleDottedID EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1822:2: iv_ruleDottedID= ruleDottedID EOF
+            // InternalScope.g:1821:2: (iv_ruleDottedID= ruleDottedID EOF )
+            // InternalScope.g:1822:2: iv_ruleDottedID= ruleDottedID EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getDottedIDRule()); 
             }
-            pushFollow(FOLLOW_ruleDottedID_in_entryRuleDottedID3930);
+            pushFollow(FOLLOW_1);
             iv_ruleDottedID=ruleDottedID();
 
             state._fsp--;
@@ -5209,7 +5209,7 @@ public final String entryRuleDottedID() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleDottedID.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDottedID3941); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -5227,7 +5227,7 @@ public final String entryRuleDottedID() throws RecognitionException {
 
 
     // $ANTLR start "ruleDottedID"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1829:1: ruleDottedID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_Identifier_0= ruleIdentifier (kw= '.' this_Identifier_2= ruleIdentifier )* ) ;
+    // InternalScope.g:1829:1: ruleDottedID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_Identifier_0= ruleIdentifier (kw= '.' this_Identifier_2= ruleIdentifier )* ) ;
     public final AntlrDatatypeRuleToken ruleDottedID() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -5240,18 +5240,18 @@ public final AntlrDatatypeRuleToken ruleDottedID() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1832:28: ( (this_Identifier_0= ruleIdentifier (kw= '.' this_Identifier_2= ruleIdentifier )* ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1833:1: (this_Identifier_0= ruleIdentifier (kw= '.' this_Identifier_2= ruleIdentifier )* )
+            // InternalScope.g:1832:28: ( (this_Identifier_0= ruleIdentifier (kw= '.' this_Identifier_2= ruleIdentifier )* ) )
+            // InternalScope.g:1833:1: (this_Identifier_0= ruleIdentifier (kw= '.' this_Identifier_2= ruleIdentifier )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1833:1: (this_Identifier_0= ruleIdentifier (kw= '.' this_Identifier_2= ruleIdentifier )* )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1834:5: this_Identifier_0= ruleIdentifier (kw= '.' this_Identifier_2= ruleIdentifier )*
+            // InternalScope.g:1833:1: (this_Identifier_0= ruleIdentifier (kw= '.' this_Identifier_2= ruleIdentifier )* )
+            // InternalScope.g:1834:5: this_Identifier_0= ruleIdentifier (kw= '.' this_Identifier_2= ruleIdentifier )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getDottedIDAccess().getIdentifierParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_ruleDottedID3988);
+            pushFollow(FOLLOW_43);
             this_Identifier_0=ruleIdentifier();
 
             state._fsp--;
@@ -5266,7 +5266,7 @@ public final AntlrDatatypeRuleToken ruleDottedID() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1844:1: (kw= '.' this_Identifier_2= ruleIdentifier )*
+            // InternalScope.g:1844:1: (kw= '.' this_Identifier_2= ruleIdentifier )*
             loop36:
             do {
                 int alt36=2;
@@ -5279,9 +5279,9 @@ public final AntlrDatatypeRuleToken ruleDottedID() throws RecognitionException {
 
                 switch (alt36) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1845:2: kw= '.' this_Identifier_2= ruleIdentifier
+            	    // InternalScope.g:1845:2: kw= '.' this_Identifier_2= ruleIdentifier
             	    {
-            	    kw=(Token)match(input,45,FOLLOW_45_in_ruleDottedID4007); if (state.failed) return current;
+            	    kw=(Token)match(input,45,FOLLOW_3); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	              current.merge(kw);
@@ -5293,7 +5293,7 @@ public final AntlrDatatypeRuleToken ruleDottedID() throws RecognitionException {
             	              newCompositeNode(grammarAccess.getDottedIDAccess().getIdentifierParserRuleCall_1_1()); 
             	          
             	    }
-            	    pushFollow(FOLLOW_ruleIdentifier_in_ruleDottedID4029);
+            	    pushFollow(FOLLOW_43);
             	    this_Identifier_2=ruleIdentifier();
 
             	    state._fsp--;
@@ -5340,7 +5340,7 @@ public final AntlrDatatypeRuleToken ruleDottedID() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1869:1: entryRuleExpression returns [EObject current=null] : iv_ruleExpression= ruleExpression EOF ;
+    // InternalScope.g:1869:1: entryRuleExpression returns [EObject current=null] : iv_ruleExpression= ruleExpression EOF ;
     public final EObject entryRuleExpression() throws RecognitionException {
         EObject current = null;
 
@@ -5348,13 +5348,13 @@ public final EObject entryRuleExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1870:2: (iv_ruleExpression= ruleExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1871:2: iv_ruleExpression= ruleExpression EOF
+            // InternalScope.g:1870:2: (iv_ruleExpression= ruleExpression EOF )
+            // InternalScope.g:1871:2: iv_ruleExpression= ruleExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleExpression_in_entryRuleExpression4076);
+            pushFollow(FOLLOW_1);
             iv_ruleExpression=ruleExpression();
 
             state._fsp--;
@@ -5362,7 +5362,7 @@ public final EObject entryRuleExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleExpression4086); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -5380,7 +5380,7 @@ public final EObject entryRuleExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1878:1: ruleExpression returns [EObject current=null] : (this_LetExpression_0= ruleLetExpression | ( ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression ) | this_ChainExpression_2= ruleChainExpression ) ;
+    // InternalScope.g:1878:1: ruleExpression returns [EObject current=null] : (this_LetExpression_0= ruleLetExpression | ( ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression ) | this_ChainExpression_2= ruleChainExpression ) ;
     public final EObject ruleExpression() throws RecognitionException {
         EObject current = null;
 
@@ -5394,22 +5394,22 @@ public final EObject ruleExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1881:28: ( (this_LetExpression_0= ruleLetExpression | ( ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression ) | this_ChainExpression_2= ruleChainExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1882:1: (this_LetExpression_0= ruleLetExpression | ( ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression ) | this_ChainExpression_2= ruleChainExpression )
+            // InternalScope.g:1881:28: ( (this_LetExpression_0= ruleLetExpression | ( ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression ) | this_ChainExpression_2= ruleChainExpression ) )
+            // InternalScope.g:1882:1: (this_LetExpression_0= ruleLetExpression | ( ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression ) | this_ChainExpression_2= ruleChainExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1882:1: (this_LetExpression_0= ruleLetExpression | ( ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression ) | this_ChainExpression_2= ruleChainExpression )
+            // InternalScope.g:1882:1: (this_LetExpression_0= ruleLetExpression | ( ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression ) | this_ChainExpression_2= ruleChainExpression )
             int alt37=3;
             alt37 = dfa37.predict(input);
             switch (alt37) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1883:5: this_LetExpression_0= ruleLetExpression
+                    // InternalScope.g:1883:5: this_LetExpression_0= ruleLetExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getExpressionAccess().getLetExpressionParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleLetExpression_in_ruleExpression4133);
+                    pushFollow(FOLLOW_2);
                     this_LetExpression_0=ruleLetExpression();
 
                     state._fsp--;
@@ -5424,17 +5424,17 @@ public final EObject ruleExpression() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1892:6: ( ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression )
+                    // InternalScope.g:1892:6: ( ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1892:6: ( ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1892:7: ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression
+                    // InternalScope.g:1892:6: ( ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression )
+                    // InternalScope.g:1892:7: ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getExpressionAccess().getCastedExpressionParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleCastedExpression_in_ruleExpression4166);
+                    pushFollow(FOLLOW_2);
                     this_CastedExpression_1=ruleCastedExpression();
 
                     state._fsp--;
@@ -5452,14 +5452,14 @@ public final EObject ruleExpression() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1903:5: this_ChainExpression_2= ruleChainExpression
+                    // InternalScope.g:1903:5: this_ChainExpression_2= ruleChainExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getExpressionAccess().getChainExpressionParserRuleCall_2()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleChainExpression_in_ruleExpression4194);
+                    pushFollow(FOLLOW_2);
                     this_ChainExpression_2=ruleChainExpression();
 
                     state._fsp--;
@@ -5496,7 +5496,7 @@ public final EObject ruleExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleLetExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1921:1: entryRuleLetExpression returns [EObject current=null] : iv_ruleLetExpression= ruleLetExpression EOF ;
+    // InternalScope.g:1921:1: entryRuleLetExpression returns [EObject current=null] : iv_ruleLetExpression= ruleLetExpression EOF ;
     public final EObject entryRuleLetExpression() throws RecognitionException {
         EObject current = null;
 
@@ -5504,13 +5504,13 @@ public final EObject entryRuleLetExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1922:2: (iv_ruleLetExpression= ruleLetExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1923:2: iv_ruleLetExpression= ruleLetExpression EOF
+            // InternalScope.g:1922:2: (iv_ruleLetExpression= ruleLetExpression EOF )
+            // InternalScope.g:1923:2: iv_ruleLetExpression= ruleLetExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getLetExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleLetExpression_in_entryRuleLetExpression4231);
+            pushFollow(FOLLOW_1);
             iv_ruleLetExpression=ruleLetExpression();
 
             state._fsp--;
@@ -5518,7 +5518,7 @@ public final EObject entryRuleLetExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleLetExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleLetExpression4241); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -5536,7 +5536,7 @@ public final EObject entryRuleLetExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleLetExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1930:1: ruleLetExpression returns [EObject current=null] : (otherlv_0= 'let' ( (lv_identifier_1_0= ruleIdentifier ) ) otherlv_2= '=' ( (lv_varExpr_3_0= ruleExpression ) ) otherlv_4= ':' ( (lv_target_5_0= ruleExpression ) ) ) ;
+    // InternalScope.g:1930:1: ruleLetExpression returns [EObject current=null] : (otherlv_0= 'let' ( (lv_identifier_1_0= ruleIdentifier ) ) otherlv_2= '=' ( (lv_varExpr_3_0= ruleExpression ) ) otherlv_4= ':' ( (lv_target_5_0= ruleExpression ) ) ) ;
     public final EObject ruleLetExpression() throws RecognitionException {
         EObject current = null;
 
@@ -5553,30 +5553,30 @@ public final EObject ruleLetExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1933:28: ( (otherlv_0= 'let' ( (lv_identifier_1_0= ruleIdentifier ) ) otherlv_2= '=' ( (lv_varExpr_3_0= ruleExpression ) ) otherlv_4= ':' ( (lv_target_5_0= ruleExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1934:1: (otherlv_0= 'let' ( (lv_identifier_1_0= ruleIdentifier ) ) otherlv_2= '=' ( (lv_varExpr_3_0= ruleExpression ) ) otherlv_4= ':' ( (lv_target_5_0= ruleExpression ) ) )
+            // InternalScope.g:1933:28: ( (otherlv_0= 'let' ( (lv_identifier_1_0= ruleIdentifier ) ) otherlv_2= '=' ( (lv_varExpr_3_0= ruleExpression ) ) otherlv_4= ':' ( (lv_target_5_0= ruleExpression ) ) ) )
+            // InternalScope.g:1934:1: (otherlv_0= 'let' ( (lv_identifier_1_0= ruleIdentifier ) ) otherlv_2= '=' ( (lv_varExpr_3_0= ruleExpression ) ) otherlv_4= ':' ( (lv_target_5_0= ruleExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1934:1: (otherlv_0= 'let' ( (lv_identifier_1_0= ruleIdentifier ) ) otherlv_2= '=' ( (lv_varExpr_3_0= ruleExpression ) ) otherlv_4= ':' ( (lv_target_5_0= ruleExpression ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1934:3: otherlv_0= 'let' ( (lv_identifier_1_0= ruleIdentifier ) ) otherlv_2= '=' ( (lv_varExpr_3_0= ruleExpression ) ) otherlv_4= ':' ( (lv_target_5_0= ruleExpression ) )
+            // InternalScope.g:1934:1: (otherlv_0= 'let' ( (lv_identifier_1_0= ruleIdentifier ) ) otherlv_2= '=' ( (lv_varExpr_3_0= ruleExpression ) ) otherlv_4= ':' ( (lv_target_5_0= ruleExpression ) ) )
+            // InternalScope.g:1934:3: otherlv_0= 'let' ( (lv_identifier_1_0= ruleIdentifier ) ) otherlv_2= '=' ( (lv_varExpr_3_0= ruleExpression ) ) otherlv_4= ':' ( (lv_target_5_0= ruleExpression ) )
             {
-            otherlv_0=(Token)match(input,46,FOLLOW_46_in_ruleLetExpression4278); if (state.failed) return current;
+            otherlv_0=(Token)match(input,46,FOLLOW_3); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getLetExpressionAccess().getLetKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1938:1: ( (lv_identifier_1_0= ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1939:1: (lv_identifier_1_0= ruleIdentifier )
+            // InternalScope.g:1938:1: ( (lv_identifier_1_0= ruleIdentifier ) )
+            // InternalScope.g:1939:1: (lv_identifier_1_0= ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1939:1: (lv_identifier_1_0= ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1940:3: lv_identifier_1_0= ruleIdentifier
+            // InternalScope.g:1939:1: (lv_identifier_1_0= ruleIdentifier )
+            // InternalScope.g:1940:3: lv_identifier_1_0= ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getLetExpressionAccess().getIdentifierIdentifierParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_ruleLetExpression4299);
+            pushFollow(FOLLOW_16);
             lv_identifier_1_0=ruleIdentifier();
 
             state._fsp--;
@@ -5590,7 +5590,7 @@ public final EObject ruleLetExpression() throws RecognitionException {
                      			current, 
                      			"identifier",
                       		lv_identifier_1_0, 
-                      		"Identifier");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -5600,24 +5600,24 @@ public final EObject ruleLetExpression() throws RecognitionException {
 
             }
 
-            otherlv_2=(Token)match(input,22,FOLLOW_22_in_ruleLetExpression4311); if (state.failed) return current;
+            otherlv_2=(Token)match(input,22,FOLLOW_17); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getLetExpressionAccess().getEqualsSignKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1960:1: ( (lv_varExpr_3_0= ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1961:1: (lv_varExpr_3_0= ruleExpression )
+            // InternalScope.g:1960:1: ( (lv_varExpr_3_0= ruleExpression ) )
+            // InternalScope.g:1961:1: (lv_varExpr_3_0= ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1961:1: (lv_varExpr_3_0= ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1962:3: lv_varExpr_3_0= ruleExpression
+            // InternalScope.g:1961:1: (lv_varExpr_3_0= ruleExpression )
+            // InternalScope.g:1962:3: lv_varExpr_3_0= ruleExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getLetExpressionAccess().getVarExprExpressionParserRuleCall_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleExpression_in_ruleLetExpression4332);
+            pushFollow(FOLLOW_44);
             lv_varExpr_3_0=ruleExpression();
 
             state._fsp--;
@@ -5631,7 +5631,7 @@ public final EObject ruleLetExpression() throws RecognitionException {
                      			current, 
                      			"varExpr",
                       		lv_varExpr_3_0, 
-                      		"Expression");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -5641,24 +5641,24 @@ public final EObject ruleLetExpression() throws RecognitionException {
 
             }
 
-            otherlv_4=(Token)match(input,47,FOLLOW_47_in_ruleLetExpression4344); if (state.failed) return current;
+            otherlv_4=(Token)match(input,47,FOLLOW_17); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_4, grammarAccess.getLetExpressionAccess().getColonKeyword_4());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1982:1: ( (lv_target_5_0= ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1983:1: (lv_target_5_0= ruleExpression )
+            // InternalScope.g:1982:1: ( (lv_target_5_0= ruleExpression ) )
+            // InternalScope.g:1983:1: (lv_target_5_0= ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1983:1: (lv_target_5_0= ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1984:3: lv_target_5_0= ruleExpression
+            // InternalScope.g:1983:1: (lv_target_5_0= ruleExpression )
+            // InternalScope.g:1984:3: lv_target_5_0= ruleExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getLetExpressionAccess().getTargetExpressionParserRuleCall_5_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleExpression_in_ruleLetExpression4365);
+            pushFollow(FOLLOW_2);
             lv_target_5_0=ruleExpression();
 
             state._fsp--;
@@ -5672,7 +5672,7 @@ public final EObject ruleLetExpression() throws RecognitionException {
                      			current, 
                      			"target",
                       		lv_target_5_0, 
-                      		"Expression");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -5705,7 +5705,7 @@ public final EObject ruleLetExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleCastedExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2008:1: entryRuleCastedExpression returns [EObject current=null] : iv_ruleCastedExpression= ruleCastedExpression EOF ;
+    // InternalScope.g:2008:1: entryRuleCastedExpression returns [EObject current=null] : iv_ruleCastedExpression= ruleCastedExpression EOF ;
     public final EObject entryRuleCastedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -5713,13 +5713,13 @@ public final EObject entryRuleCastedExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2009:2: (iv_ruleCastedExpression= ruleCastedExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2010:2: iv_ruleCastedExpression= ruleCastedExpression EOF
+            // InternalScope.g:2009:2: (iv_ruleCastedExpression= ruleCastedExpression EOF )
+            // InternalScope.g:2010:2: iv_ruleCastedExpression= ruleCastedExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getCastedExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleCastedExpression_in_entryRuleCastedExpression4401);
+            pushFollow(FOLLOW_1);
             iv_ruleCastedExpression=ruleCastedExpression();
 
             state._fsp--;
@@ -5727,7 +5727,7 @@ public final EObject entryRuleCastedExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleCastedExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleCastedExpression4411); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -5745,7 +5745,7 @@ public final EObject entryRuleCastedExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleCastedExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2017:1: ruleCastedExpression returns [EObject current=null] : (otherlv_0= '(' ( (lv_type_1_0= ruleType ) ) otherlv_2= ')' ( (lv_target_3_0= ruleExpression ) ) ) ;
+    // InternalScope.g:2017:1: ruleCastedExpression returns [EObject current=null] : (otherlv_0= '(' ( (lv_type_1_0= ruleType ) ) otherlv_2= ')' ( (lv_target_3_0= ruleExpression ) ) ) ;
     public final EObject ruleCastedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -5759,30 +5759,30 @@ public final EObject ruleCastedExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2020:28: ( (otherlv_0= '(' ( (lv_type_1_0= ruleType ) ) otherlv_2= ')' ( (lv_target_3_0= ruleExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2021:1: (otherlv_0= '(' ( (lv_type_1_0= ruleType ) ) otherlv_2= ')' ( (lv_target_3_0= ruleExpression ) ) )
+            // InternalScope.g:2020:28: ( (otherlv_0= '(' ( (lv_type_1_0= ruleType ) ) otherlv_2= ')' ( (lv_target_3_0= ruleExpression ) ) ) )
+            // InternalScope.g:2021:1: (otherlv_0= '(' ( (lv_type_1_0= ruleType ) ) otherlv_2= ')' ( (lv_target_3_0= ruleExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2021:1: (otherlv_0= '(' ( (lv_type_1_0= ruleType ) ) otherlv_2= ')' ( (lv_target_3_0= ruleExpression ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2021:3: otherlv_0= '(' ( (lv_type_1_0= ruleType ) ) otherlv_2= ')' ( (lv_target_3_0= ruleExpression ) )
+            // InternalScope.g:2021:1: (otherlv_0= '(' ( (lv_type_1_0= ruleType ) ) otherlv_2= ')' ( (lv_target_3_0= ruleExpression ) ) )
+            // InternalScope.g:2021:3: otherlv_0= '(' ( (lv_type_1_0= ruleType ) ) otherlv_2= ')' ( (lv_target_3_0= ruleExpression ) )
             {
-            otherlv_0=(Token)match(input,25,FOLLOW_25_in_ruleCastedExpression4448); if (state.failed) return current;
+            otherlv_0=(Token)match(input,25,FOLLOW_45); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getCastedExpressionAccess().getLeftParenthesisKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2025:1: ( (lv_type_1_0= ruleType ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2026:1: (lv_type_1_0= ruleType )
+            // InternalScope.g:2025:1: ( (lv_type_1_0= ruleType ) )
+            // InternalScope.g:2026:1: (lv_type_1_0= ruleType )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2026:1: (lv_type_1_0= ruleType )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2027:3: lv_type_1_0= ruleType
+            // InternalScope.g:2026:1: (lv_type_1_0= ruleType )
+            // InternalScope.g:2027:3: lv_type_1_0= ruleType
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getCastedExpressionAccess().getTypeTypeParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleType_in_ruleCastedExpression4469);
+            pushFollow(FOLLOW_20);
             lv_type_1_0=ruleType();
 
             state._fsp--;
@@ -5796,7 +5796,7 @@ public final EObject ruleCastedExpression() throws RecognitionException {
                      			current, 
                      			"type",
                       		lv_type_1_0, 
-                      		"Type");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Type");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -5806,24 +5806,24 @@ public final EObject ruleCastedExpression() throws RecognitionException {
 
             }
 
-            otherlv_2=(Token)match(input,26,FOLLOW_26_in_ruleCastedExpression4481); if (state.failed) return current;
+            otherlv_2=(Token)match(input,26,FOLLOW_17); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getCastedExpressionAccess().getRightParenthesisKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2047:1: ( (lv_target_3_0= ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2048:1: (lv_target_3_0= ruleExpression )
+            // InternalScope.g:2047:1: ( (lv_target_3_0= ruleExpression ) )
+            // InternalScope.g:2048:1: (lv_target_3_0= ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2048:1: (lv_target_3_0= ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2049:3: lv_target_3_0= ruleExpression
+            // InternalScope.g:2048:1: (lv_target_3_0= ruleExpression )
+            // InternalScope.g:2049:3: lv_target_3_0= ruleExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getCastedExpressionAccess().getTargetExpressionParserRuleCall_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleExpression_in_ruleCastedExpression4502);
+            pushFollow(FOLLOW_2);
             lv_target_3_0=ruleExpression();
 
             state._fsp--;
@@ -5837,7 +5837,7 @@ public final EObject ruleCastedExpression() throws RecognitionException {
                      			current, 
                      			"target",
                       		lv_target_3_0, 
-                      		"Expression");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -5870,7 +5870,7 @@ public final EObject ruleCastedExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleChainExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2073:1: entryRuleChainExpression returns [EObject current=null] : iv_ruleChainExpression= ruleChainExpression EOF ;
+    // InternalScope.g:2073:1: entryRuleChainExpression returns [EObject current=null] : iv_ruleChainExpression= ruleChainExpression EOF ;
     public final EObject entryRuleChainExpression() throws RecognitionException {
         EObject current = null;
 
@@ -5878,13 +5878,13 @@ public final EObject entryRuleChainExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2074:2: (iv_ruleChainExpression= ruleChainExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2075:2: iv_ruleChainExpression= ruleChainExpression EOF
+            // InternalScope.g:2074:2: (iv_ruleChainExpression= ruleChainExpression EOF )
+            // InternalScope.g:2075:2: iv_ruleChainExpression= ruleChainExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getChainExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleChainExpression_in_entryRuleChainExpression4538);
+            pushFollow(FOLLOW_1);
             iv_ruleChainExpression=ruleChainExpression();
 
             state._fsp--;
@@ -5892,7 +5892,7 @@ public final EObject entryRuleChainExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleChainExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleChainExpression4548); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -5910,7 +5910,7 @@ public final EObject entryRuleChainExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleChainExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2082:1: ruleChainExpression returns [EObject current=null] : (this_ChainedExpression_0= ruleChainedExpression ( () otherlv_2= '->' ( (lv_next_3_0= ruleChainedExpression ) ) )* ) ;
+    // InternalScope.g:2082:1: ruleChainExpression returns [EObject current=null] : (this_ChainedExpression_0= ruleChainedExpression ( () otherlv_2= '->' ( (lv_next_3_0= ruleChainedExpression ) ) )* ) ;
     public final EObject ruleChainExpression() throws RecognitionException {
         EObject current = null;
 
@@ -5923,18 +5923,18 @@ public final EObject ruleChainExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2085:28: ( (this_ChainedExpression_0= ruleChainedExpression ( () otherlv_2= '->' ( (lv_next_3_0= ruleChainedExpression ) ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2086:1: (this_ChainedExpression_0= ruleChainedExpression ( () otherlv_2= '->' ( (lv_next_3_0= ruleChainedExpression ) ) )* )
+            // InternalScope.g:2085:28: ( (this_ChainedExpression_0= ruleChainedExpression ( () otherlv_2= '->' ( (lv_next_3_0= ruleChainedExpression ) ) )* ) )
+            // InternalScope.g:2086:1: (this_ChainedExpression_0= ruleChainedExpression ( () otherlv_2= '->' ( (lv_next_3_0= ruleChainedExpression ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2086:1: (this_ChainedExpression_0= ruleChainedExpression ( () otherlv_2= '->' ( (lv_next_3_0= ruleChainedExpression ) ) )* )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2087:5: this_ChainedExpression_0= ruleChainedExpression ( () otherlv_2= '->' ( (lv_next_3_0= ruleChainedExpression ) ) )*
+            // InternalScope.g:2086:1: (this_ChainedExpression_0= ruleChainedExpression ( () otherlv_2= '->' ( (lv_next_3_0= ruleChainedExpression ) ) )* )
+            // InternalScope.g:2087:5: this_ChainedExpression_0= ruleChainedExpression ( () otherlv_2= '->' ( (lv_next_3_0= ruleChainedExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getChainExpressionAccess().getChainedExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleChainedExpression_in_ruleChainExpression4595);
+            pushFollow(FOLLOW_46);
             this_ChainedExpression_0=ruleChainedExpression();
 
             state._fsp--;
@@ -5945,7 +5945,7 @@ public final EObject ruleChainExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2095:1: ( () otherlv_2= '->' ( (lv_next_3_0= ruleChainedExpression ) ) )*
+            // InternalScope.g:2095:1: ( () otherlv_2= '->' ( (lv_next_3_0= ruleChainedExpression ) ) )*
             loop38:
             do {
                 int alt38=2;
@@ -5958,10 +5958,10 @@ public final EObject ruleChainExpression() throws RecognitionException {
 
                 switch (alt38) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2095:2: () otherlv_2= '->' ( (lv_next_3_0= ruleChainedExpression ) )
+            	    // InternalScope.g:2095:2: () otherlv_2= '->' ( (lv_next_3_0= ruleChainedExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2095:2: ()
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2096:5: 
+            	    // InternalScope.g:2095:2: ()
+            	    // InternalScope.g:2096:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -5973,24 +5973,24 @@ public final EObject ruleChainExpression() throws RecognitionException {
 
             	    }
 
-            	    otherlv_2=(Token)match(input,48,FOLLOW_48_in_ruleChainExpression4616); if (state.failed) return current;
+            	    otherlv_2=(Token)match(input,48,FOLLOW_17); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_2, grammarAccess.getChainExpressionAccess().getHyphenMinusGreaterThanSignKeyword_1_1());
             	          
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2105:1: ( (lv_next_3_0= ruleChainedExpression ) )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2106:1: (lv_next_3_0= ruleChainedExpression )
+            	    // InternalScope.g:2105:1: ( (lv_next_3_0= ruleChainedExpression ) )
+            	    // InternalScope.g:2106:1: (lv_next_3_0= ruleChainedExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2106:1: (lv_next_3_0= ruleChainedExpression )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2107:3: lv_next_3_0= ruleChainedExpression
+            	    // InternalScope.g:2106:1: (lv_next_3_0= ruleChainedExpression )
+            	    // InternalScope.g:2107:3: lv_next_3_0= ruleChainedExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getChainExpressionAccess().getNextChainedExpressionParserRuleCall_1_2_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleChainedExpression_in_ruleChainExpression4637);
+            	    pushFollow(FOLLOW_46);
             	    lv_next_3_0=ruleChainedExpression();
 
             	    state._fsp--;
@@ -6004,7 +6004,7 @@ public final EObject ruleChainExpression() throws RecognitionException {
             	             			current, 
             	             			"next",
             	              		lv_next_3_0, 
-            	              		"ChainedExpression");
+            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.ChainedExpression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -6046,7 +6046,7 @@ public final EObject ruleChainExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleChainedExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2131:1: entryRuleChainedExpression returns [EObject current=null] : iv_ruleChainedExpression= ruleChainedExpression EOF ;
+    // InternalScope.g:2131:1: entryRuleChainedExpression returns [EObject current=null] : iv_ruleChainedExpression= ruleChainedExpression EOF ;
     public final EObject entryRuleChainedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -6054,13 +6054,13 @@ public final EObject entryRuleChainedExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2132:2: (iv_ruleChainedExpression= ruleChainedExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2133:2: iv_ruleChainedExpression= ruleChainedExpression EOF
+            // InternalScope.g:2132:2: (iv_ruleChainedExpression= ruleChainedExpression EOF )
+            // InternalScope.g:2133:2: iv_ruleChainedExpression= ruleChainedExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getChainedExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleChainedExpression_in_entryRuleChainedExpression4675);
+            pushFollow(FOLLOW_1);
             iv_ruleChainedExpression=ruleChainedExpression();
 
             state._fsp--;
@@ -6068,7 +6068,7 @@ public final EObject entryRuleChainedExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleChainedExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleChainedExpression4685); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -6086,7 +6086,7 @@ public final EObject entryRuleChainedExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleChainedExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2140:1: ruleChainedExpression returns [EObject current=null] : (this_IfExpressionKw_0= ruleIfExpressionKw | this_IfExpressionTri_1= ruleIfExpressionTri | this_SwitchExpression_2= ruleSwitchExpression ) ;
+    // InternalScope.g:2140:1: ruleChainedExpression returns [EObject current=null] : (this_IfExpressionKw_0= ruleIfExpressionKw | this_IfExpressionTri_1= ruleIfExpressionTri | this_SwitchExpression_2= ruleSwitchExpression ) ;
     public final EObject ruleChainedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -6100,10 +6100,10 @@ public final EObject ruleChainedExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2143:28: ( (this_IfExpressionKw_0= ruleIfExpressionKw | this_IfExpressionTri_1= ruleIfExpressionTri | this_SwitchExpression_2= ruleSwitchExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2144:1: (this_IfExpressionKw_0= ruleIfExpressionKw | this_IfExpressionTri_1= ruleIfExpressionTri | this_SwitchExpression_2= ruleSwitchExpression )
+            // InternalScope.g:2143:28: ( (this_IfExpressionKw_0= ruleIfExpressionKw | this_IfExpressionTri_1= ruleIfExpressionTri | this_SwitchExpression_2= ruleSwitchExpression ) )
+            // InternalScope.g:2144:1: (this_IfExpressionKw_0= ruleIfExpressionKw | this_IfExpressionTri_1= ruleIfExpressionTri | this_SwitchExpression_2= ruleSwitchExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2144:1: (this_IfExpressionKw_0= ruleIfExpressionKw | this_IfExpressionTri_1= ruleIfExpressionTri | this_SwitchExpression_2= ruleSwitchExpression )
+            // InternalScope.g:2144:1: (this_IfExpressionKw_0= ruleIfExpressionKw | this_IfExpressionTri_1= ruleIfExpressionTri | this_SwitchExpression_2= ruleSwitchExpression )
             int alt39=3;
             switch ( input.LA(1) ) {
             case 50:
@@ -6155,14 +6155,14 @@ public final EObject ruleChainedExpression() throws RecognitionException {
 
             switch (alt39) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2145:5: this_IfExpressionKw_0= ruleIfExpressionKw
+                    // InternalScope.g:2145:5: this_IfExpressionKw_0= ruleIfExpressionKw
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getChainedExpressionAccess().getIfExpressionKwParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleIfExpressionKw_in_ruleChainedExpression4732);
+                    pushFollow(FOLLOW_2);
                     this_IfExpressionKw_0=ruleIfExpressionKw();
 
                     state._fsp--;
@@ -6177,14 +6177,14 @@ public final EObject ruleChainedExpression() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2155:5: this_IfExpressionTri_1= ruleIfExpressionTri
+                    // InternalScope.g:2155:5: this_IfExpressionTri_1= ruleIfExpressionTri
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getChainedExpressionAccess().getIfExpressionTriParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleIfExpressionTri_in_ruleChainedExpression4759);
+                    pushFollow(FOLLOW_2);
                     this_IfExpressionTri_1=ruleIfExpressionTri();
 
                     state._fsp--;
@@ -6199,14 +6199,14 @@ public final EObject ruleChainedExpression() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2165:5: this_SwitchExpression_2= ruleSwitchExpression
+                    // InternalScope.g:2165:5: this_SwitchExpression_2= ruleSwitchExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getChainedExpressionAccess().getSwitchExpressionParserRuleCall_2()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleSwitchExpression_in_ruleChainedExpression4786);
+                    pushFollow(FOLLOW_2);
                     this_SwitchExpression_2=ruleSwitchExpression();
 
                     state._fsp--;
@@ -6243,7 +6243,7 @@ public final EObject ruleChainedExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleIfExpressionTri"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2181:1: entryRuleIfExpressionTri returns [EObject current=null] : iv_ruleIfExpressionTri= ruleIfExpressionTri EOF ;
+    // InternalScope.g:2181:1: entryRuleIfExpressionTri returns [EObject current=null] : iv_ruleIfExpressionTri= ruleIfExpressionTri EOF ;
     public final EObject entryRuleIfExpressionTri() throws RecognitionException {
         EObject current = null;
 
@@ -6251,13 +6251,13 @@ public final EObject entryRuleIfExpressionTri() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2182:2: (iv_ruleIfExpressionTri= ruleIfExpressionTri EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2183:2: iv_ruleIfExpressionTri= ruleIfExpressionTri EOF
+            // InternalScope.g:2182:2: (iv_ruleIfExpressionTri= ruleIfExpressionTri EOF )
+            // InternalScope.g:2183:2: iv_ruleIfExpressionTri= ruleIfExpressionTri EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getIfExpressionTriRule()); 
             }
-            pushFollow(FOLLOW_ruleIfExpressionTri_in_entryRuleIfExpressionTri4821);
+            pushFollow(FOLLOW_1);
             iv_ruleIfExpressionTri=ruleIfExpressionTri();
 
             state._fsp--;
@@ -6265,7 +6265,7 @@ public final EObject entryRuleIfExpressionTri() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleIfExpressionTri; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIfExpressionTri4831); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -6283,7 +6283,7 @@ public final EObject entryRuleIfExpressionTri() throws RecognitionException {
 
 
     // $ANTLR start "ruleIfExpressionTri"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2190:1: ruleIfExpressionTri returns [EObject current=null] : (this_OrExpression_0= ruleOrExpression ( () otherlv_2= '?' ( (lv_thenPart_3_0= ruleChainedExpression ) ) otherlv_4= ':' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )? ) ;
+    // InternalScope.g:2190:1: ruleIfExpressionTri returns [EObject current=null] : (this_OrExpression_0= ruleOrExpression ( () otherlv_2= '?' ( (lv_thenPart_3_0= ruleChainedExpression ) ) otherlv_4= ':' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )? ) ;
     public final EObject ruleIfExpressionTri() throws RecognitionException {
         EObject current = null;
 
@@ -6299,18 +6299,18 @@ public final EObject ruleIfExpressionTri() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2193:28: ( (this_OrExpression_0= ruleOrExpression ( () otherlv_2= '?' ( (lv_thenPart_3_0= ruleChainedExpression ) ) otherlv_4= ':' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )? ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2194:1: (this_OrExpression_0= ruleOrExpression ( () otherlv_2= '?' ( (lv_thenPart_3_0= ruleChainedExpression ) ) otherlv_4= ':' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )? )
+            // InternalScope.g:2193:28: ( (this_OrExpression_0= ruleOrExpression ( () otherlv_2= '?' ( (lv_thenPart_3_0= ruleChainedExpression ) ) otherlv_4= ':' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )? ) )
+            // InternalScope.g:2194:1: (this_OrExpression_0= ruleOrExpression ( () otherlv_2= '?' ( (lv_thenPart_3_0= ruleChainedExpression ) ) otherlv_4= ':' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2194:1: (this_OrExpression_0= ruleOrExpression ( () otherlv_2= '?' ( (lv_thenPart_3_0= ruleChainedExpression ) ) otherlv_4= ':' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )? )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2195:5: this_OrExpression_0= ruleOrExpression ( () otherlv_2= '?' ( (lv_thenPart_3_0= ruleChainedExpression ) ) otherlv_4= ':' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )?
+            // InternalScope.g:2194:1: (this_OrExpression_0= ruleOrExpression ( () otherlv_2= '?' ( (lv_thenPart_3_0= ruleChainedExpression ) ) otherlv_4= ':' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )? )
+            // InternalScope.g:2195:5: this_OrExpression_0= ruleOrExpression ( () otherlv_2= '?' ( (lv_thenPart_3_0= ruleChainedExpression ) ) otherlv_4= ':' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )?
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getIfExpressionTriAccess().getOrExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleOrExpression_in_ruleIfExpressionTri4878);
+            pushFollow(FOLLOW_47);
             this_OrExpression_0=ruleOrExpression();
 
             state._fsp--;
@@ -6321,7 +6321,7 @@ public final EObject ruleIfExpressionTri() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2203:1: ( () otherlv_2= '?' ( (lv_thenPart_3_0= ruleChainedExpression ) ) otherlv_4= ':' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )?
+            // InternalScope.g:2203:1: ( () otherlv_2= '?' ( (lv_thenPart_3_0= ruleChainedExpression ) ) otherlv_4= ':' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )?
             int alt40=2;
             int LA40_0 = input.LA(1);
 
@@ -6330,10 +6330,10 @@ public final EObject ruleIfExpressionTri() throws RecognitionException {
             }
             switch (alt40) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2203:2: () otherlv_2= '?' ( (lv_thenPart_3_0= ruleChainedExpression ) ) otherlv_4= ':' ( (lv_elsePart_5_0= ruleChainedExpression ) )
+                    // InternalScope.g:2203:2: () otherlv_2= '?' ( (lv_thenPart_3_0= ruleChainedExpression ) ) otherlv_4= ':' ( (lv_elsePart_5_0= ruleChainedExpression ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2203:2: ()
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2204:5: 
+                    // InternalScope.g:2203:2: ()
+                    // InternalScope.g:2204:5: 
                     {
                     if ( state.backtracking==0 ) {
 
@@ -6345,24 +6345,24 @@ public final EObject ruleIfExpressionTri() throws RecognitionException {
 
                     }
 
-                    otherlv_2=(Token)match(input,49,FOLLOW_49_in_ruleIfExpressionTri4899); if (state.failed) return current;
+                    otherlv_2=(Token)match(input,49,FOLLOW_17); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_2, grammarAccess.getIfExpressionTriAccess().getQuestionMarkKeyword_1_1());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2213:1: ( (lv_thenPart_3_0= ruleChainedExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2214:1: (lv_thenPart_3_0= ruleChainedExpression )
+                    // InternalScope.g:2213:1: ( (lv_thenPart_3_0= ruleChainedExpression ) )
+                    // InternalScope.g:2214:1: (lv_thenPart_3_0= ruleChainedExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2214:1: (lv_thenPart_3_0= ruleChainedExpression )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2215:3: lv_thenPart_3_0= ruleChainedExpression
+                    // InternalScope.g:2214:1: (lv_thenPart_3_0= ruleChainedExpression )
+                    // InternalScope.g:2215:3: lv_thenPart_3_0= ruleChainedExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getIfExpressionTriAccess().getThenPartChainedExpressionParserRuleCall_1_2_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleChainedExpression_in_ruleIfExpressionTri4920);
+                    pushFollow(FOLLOW_44);
                     lv_thenPart_3_0=ruleChainedExpression();
 
                     state._fsp--;
@@ -6376,7 +6376,7 @@ public final EObject ruleIfExpressionTri() throws RecognitionException {
                              			current, 
                              			"thenPart",
                               		lv_thenPart_3_0, 
-                              		"ChainedExpression");
+                              		"com.avaloq.tools.ddk.xtext.expression.Expression.ChainedExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -6386,24 +6386,24 @@ public final EObject ruleIfExpressionTri() throws RecognitionException {
 
                     }
 
-                    otherlv_4=(Token)match(input,47,FOLLOW_47_in_ruleIfExpressionTri4932); if (state.failed) return current;
+                    otherlv_4=(Token)match(input,47,FOLLOW_17); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_4, grammarAccess.getIfExpressionTriAccess().getColonKeyword_1_3());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2235:1: ( (lv_elsePart_5_0= ruleChainedExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2236:1: (lv_elsePart_5_0= ruleChainedExpression )
+                    // InternalScope.g:2235:1: ( (lv_elsePart_5_0= ruleChainedExpression ) )
+                    // InternalScope.g:2236:1: (lv_elsePart_5_0= ruleChainedExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2236:1: (lv_elsePart_5_0= ruleChainedExpression )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2237:3: lv_elsePart_5_0= ruleChainedExpression
+                    // InternalScope.g:2236:1: (lv_elsePart_5_0= ruleChainedExpression )
+                    // InternalScope.g:2237:3: lv_elsePart_5_0= ruleChainedExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getIfExpressionTriAccess().getElsePartChainedExpressionParserRuleCall_1_4_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleChainedExpression_in_ruleIfExpressionTri4953);
+                    pushFollow(FOLLOW_2);
                     lv_elsePart_5_0=ruleChainedExpression();
 
                     state._fsp--;
@@ -6417,7 +6417,7 @@ public final EObject ruleIfExpressionTri() throws RecognitionException {
                              			current, 
                              			"elsePart",
                               		lv_elsePart_5_0, 
-                              		"ChainedExpression");
+                              		"com.avaloq.tools.ddk.xtext.expression.Expression.ChainedExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -6456,7 +6456,7 @@ public final EObject ruleIfExpressionTri() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleIfExpressionKw"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2261:1: entryRuleIfExpressionKw returns [EObject current=null] : iv_ruleIfExpressionKw= ruleIfExpressionKw EOF ;
+    // InternalScope.g:2261:1: entryRuleIfExpressionKw returns [EObject current=null] : iv_ruleIfExpressionKw= ruleIfExpressionKw EOF ;
     public final EObject entryRuleIfExpressionKw() throws RecognitionException {
         EObject current = null;
 
@@ -6464,13 +6464,13 @@ public final EObject entryRuleIfExpressionKw() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2262:2: (iv_ruleIfExpressionKw= ruleIfExpressionKw EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2263:2: iv_ruleIfExpressionKw= ruleIfExpressionKw EOF
+            // InternalScope.g:2262:2: (iv_ruleIfExpressionKw= ruleIfExpressionKw EOF )
+            // InternalScope.g:2263:2: iv_ruleIfExpressionKw= ruleIfExpressionKw EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getIfExpressionKwRule()); 
             }
-            pushFollow(FOLLOW_ruleIfExpressionKw_in_entryRuleIfExpressionKw4991);
+            pushFollow(FOLLOW_1);
             iv_ruleIfExpressionKw=ruleIfExpressionKw();
 
             state._fsp--;
@@ -6478,7 +6478,7 @@ public final EObject entryRuleIfExpressionKw() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleIfExpressionKw; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIfExpressionKw5001); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -6496,7 +6496,7 @@ public final EObject entryRuleIfExpressionKw() throws RecognitionException {
 
 
     // $ANTLR start "ruleIfExpressionKw"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2270:1: ruleIfExpressionKw returns [EObject current=null] : (otherlv_0= 'if' ( (lv_condition_1_0= ruleChainedExpression ) ) otherlv_2= 'then' ( (lv_thenPart_3_0= ruleChainedExpression ) ) ( ( 'else' )=> (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) ) )? ) ;
+    // InternalScope.g:2270:1: ruleIfExpressionKw returns [EObject current=null] : (otherlv_0= 'if' ( (lv_condition_1_0= ruleChainedExpression ) ) otherlv_2= 'then' ( (lv_thenPart_3_0= ruleChainedExpression ) ) ( ( 'else' )=> (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) ) )? ) ;
     public final EObject ruleIfExpressionKw() throws RecognitionException {
         EObject current = null;
 
@@ -6513,30 +6513,30 @@ public final EObject ruleIfExpressionKw() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2273:28: ( (otherlv_0= 'if' ( (lv_condition_1_0= ruleChainedExpression ) ) otherlv_2= 'then' ( (lv_thenPart_3_0= ruleChainedExpression ) ) ( ( 'else' )=> (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) ) )? ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2274:1: (otherlv_0= 'if' ( (lv_condition_1_0= ruleChainedExpression ) ) otherlv_2= 'then' ( (lv_thenPart_3_0= ruleChainedExpression ) ) ( ( 'else' )=> (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) ) )? )
+            // InternalScope.g:2273:28: ( (otherlv_0= 'if' ( (lv_condition_1_0= ruleChainedExpression ) ) otherlv_2= 'then' ( (lv_thenPart_3_0= ruleChainedExpression ) ) ( ( 'else' )=> (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) ) )? ) )
+            // InternalScope.g:2274:1: (otherlv_0= 'if' ( (lv_condition_1_0= ruleChainedExpression ) ) otherlv_2= 'then' ( (lv_thenPart_3_0= ruleChainedExpression ) ) ( ( 'else' )=> (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) ) )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2274:1: (otherlv_0= 'if' ( (lv_condition_1_0= ruleChainedExpression ) ) otherlv_2= 'then' ( (lv_thenPart_3_0= ruleChainedExpression ) ) ( ( 'else' )=> (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) ) )? )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2274:3: otherlv_0= 'if' ( (lv_condition_1_0= ruleChainedExpression ) ) otherlv_2= 'then' ( (lv_thenPart_3_0= ruleChainedExpression ) ) ( ( 'else' )=> (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) ) )?
+            // InternalScope.g:2274:1: (otherlv_0= 'if' ( (lv_condition_1_0= ruleChainedExpression ) ) otherlv_2= 'then' ( (lv_thenPart_3_0= ruleChainedExpression ) ) ( ( 'else' )=> (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) ) )? )
+            // InternalScope.g:2274:3: otherlv_0= 'if' ( (lv_condition_1_0= ruleChainedExpression ) ) otherlv_2= 'then' ( (lv_thenPart_3_0= ruleChainedExpression ) ) ( ( 'else' )=> (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) ) )?
             {
-            otherlv_0=(Token)match(input,50,FOLLOW_50_in_ruleIfExpressionKw5038); if (state.failed) return current;
+            otherlv_0=(Token)match(input,50,FOLLOW_17); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getIfExpressionKwAccess().getIfKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2278:1: ( (lv_condition_1_0= ruleChainedExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2279:1: (lv_condition_1_0= ruleChainedExpression )
+            // InternalScope.g:2278:1: ( (lv_condition_1_0= ruleChainedExpression ) )
+            // InternalScope.g:2279:1: (lv_condition_1_0= ruleChainedExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2279:1: (lv_condition_1_0= ruleChainedExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2280:3: lv_condition_1_0= ruleChainedExpression
+            // InternalScope.g:2279:1: (lv_condition_1_0= ruleChainedExpression )
+            // InternalScope.g:2280:3: lv_condition_1_0= ruleChainedExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getIfExpressionKwAccess().getConditionChainedExpressionParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleChainedExpression_in_ruleIfExpressionKw5059);
+            pushFollow(FOLLOW_48);
             lv_condition_1_0=ruleChainedExpression();
 
             state._fsp--;
@@ -6550,7 +6550,7 @@ public final EObject ruleIfExpressionKw() throws RecognitionException {
                      			current, 
                      			"condition",
                       		lv_condition_1_0, 
-                      		"ChainedExpression");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.ChainedExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -6560,24 +6560,24 @@ public final EObject ruleIfExpressionKw() throws RecognitionException {
 
             }
 
-            otherlv_2=(Token)match(input,51,FOLLOW_51_in_ruleIfExpressionKw5071); if (state.failed) return current;
+            otherlv_2=(Token)match(input,51,FOLLOW_17); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getIfExpressionKwAccess().getThenKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2300:1: ( (lv_thenPart_3_0= ruleChainedExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2301:1: (lv_thenPart_3_0= ruleChainedExpression )
+            // InternalScope.g:2300:1: ( (lv_thenPart_3_0= ruleChainedExpression ) )
+            // InternalScope.g:2301:1: (lv_thenPart_3_0= ruleChainedExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2301:1: (lv_thenPart_3_0= ruleChainedExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2302:3: lv_thenPart_3_0= ruleChainedExpression
+            // InternalScope.g:2301:1: (lv_thenPart_3_0= ruleChainedExpression )
+            // InternalScope.g:2302:3: lv_thenPart_3_0= ruleChainedExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getIfExpressionKwAccess().getThenPartChainedExpressionParserRuleCall_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleChainedExpression_in_ruleIfExpressionKw5092);
+            pushFollow(FOLLOW_49);
             lv_thenPart_3_0=ruleChainedExpression();
 
             state._fsp--;
@@ -6591,7 +6591,7 @@ public final EObject ruleIfExpressionKw() throws RecognitionException {
                      			current, 
                      			"thenPart",
                       		lv_thenPart_3_0, 
-                      		"ChainedExpression");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.ChainedExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -6601,7 +6601,7 @@ public final EObject ruleIfExpressionKw() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2318:2: ( ( 'else' )=> (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) ) )?
+            // InternalScope.g:2318:2: ( ( 'else' )=> (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) ) )?
             int alt41=2;
             int LA41_0 = input.LA(1);
 
@@ -6614,29 +6614,29 @@ public final EObject ruleIfExpressionKw() throws RecognitionException {
             }
             switch (alt41) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2318:3: ( 'else' )=> (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )
+                    // InternalScope.g:2318:3: ( 'else' )=> (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2319:4: (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2319:6: otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) )
+                    // InternalScope.g:2319:4: (otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) ) )
+                    // InternalScope.g:2319:6: otherlv_4= 'else' ( (lv_elsePart_5_0= ruleChainedExpression ) )
                     {
-                    otherlv_4=(Token)match(input,52,FOLLOW_52_in_ruleIfExpressionKw5113); if (state.failed) return current;
+                    otherlv_4=(Token)match(input,52,FOLLOW_17); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_4, grammarAccess.getIfExpressionKwAccess().getElseKeyword_4_0_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2323:1: ( (lv_elsePart_5_0= ruleChainedExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2324:1: (lv_elsePart_5_0= ruleChainedExpression )
+                    // InternalScope.g:2323:1: ( (lv_elsePart_5_0= ruleChainedExpression ) )
+                    // InternalScope.g:2324:1: (lv_elsePart_5_0= ruleChainedExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2324:1: (lv_elsePart_5_0= ruleChainedExpression )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2325:3: lv_elsePart_5_0= ruleChainedExpression
+                    // InternalScope.g:2324:1: (lv_elsePart_5_0= ruleChainedExpression )
+                    // InternalScope.g:2325:3: lv_elsePart_5_0= ruleChainedExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getIfExpressionKwAccess().getElsePartChainedExpressionParserRuleCall_4_0_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleChainedExpression_in_ruleIfExpressionKw5134);
+                    pushFollow(FOLLOW_2);
                     lv_elsePart_5_0=ruleChainedExpression();
 
                     state._fsp--;
@@ -6650,7 +6650,7 @@ public final EObject ruleIfExpressionKw() throws RecognitionException {
                              			current, 
                              			"elsePart",
                               		lv_elsePart_5_0, 
-                              		"ChainedExpression");
+                              		"com.avaloq.tools.ddk.xtext.expression.Expression.ChainedExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -6692,7 +6692,7 @@ public final EObject ruleIfExpressionKw() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleSwitchExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2349:1: entryRuleSwitchExpression returns [EObject current=null] : iv_ruleSwitchExpression= ruleSwitchExpression EOF ;
+    // InternalScope.g:2349:1: entryRuleSwitchExpression returns [EObject current=null] : iv_ruleSwitchExpression= ruleSwitchExpression EOF ;
     public final EObject entryRuleSwitchExpression() throws RecognitionException {
         EObject current = null;
 
@@ -6700,13 +6700,13 @@ public final EObject entryRuleSwitchExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2350:2: (iv_ruleSwitchExpression= ruleSwitchExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2351:2: iv_ruleSwitchExpression= ruleSwitchExpression EOF
+            // InternalScope.g:2350:2: (iv_ruleSwitchExpression= ruleSwitchExpression EOF )
+            // InternalScope.g:2351:2: iv_ruleSwitchExpression= ruleSwitchExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getSwitchExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleSwitchExpression_in_entryRuleSwitchExpression5173);
+            pushFollow(FOLLOW_1);
             iv_ruleSwitchExpression=ruleSwitchExpression();
 
             state._fsp--;
@@ -6714,7 +6714,7 @@ public final EObject entryRuleSwitchExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleSwitchExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSwitchExpression5183); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -6732,7 +6732,7 @@ public final EObject entryRuleSwitchExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleSwitchExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2358:1: ruleSwitchExpression returns [EObject current=null] : (otherlv_0= 'switch' (otherlv_1= '(' ( (lv_switchExpr_2_0= ruleOrExpression ) ) otherlv_3= ')' )? otherlv_4= '{' ( (lv_case_5_0= ruleCase ) )* otherlv_6= 'default' otherlv_7= ':' ( (lv_defaultExpr_8_0= ruleOrExpression ) ) otherlv_9= '}' ) ;
+    // InternalScope.g:2358:1: ruleSwitchExpression returns [EObject current=null] : (otherlv_0= 'switch' (otherlv_1= '(' ( (lv_switchExpr_2_0= ruleOrExpression ) ) otherlv_3= ')' )? otherlv_4= '{' ( (lv_case_5_0= ruleCase ) )* otherlv_6= 'default' otherlv_7= ':' ( (lv_defaultExpr_8_0= ruleOrExpression ) ) otherlv_9= '}' ) ;
     public final EObject ruleSwitchExpression() throws RecognitionException {
         EObject current = null;
 
@@ -6753,19 +6753,19 @@ public final EObject ruleSwitchExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2361:28: ( (otherlv_0= 'switch' (otherlv_1= '(' ( (lv_switchExpr_2_0= ruleOrExpression ) ) otherlv_3= ')' )? otherlv_4= '{' ( (lv_case_5_0= ruleCase ) )* otherlv_6= 'default' otherlv_7= ':' ( (lv_defaultExpr_8_0= ruleOrExpression ) ) otherlv_9= '}' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2362:1: (otherlv_0= 'switch' (otherlv_1= '(' ( (lv_switchExpr_2_0= ruleOrExpression ) ) otherlv_3= ')' )? otherlv_4= '{' ( (lv_case_5_0= ruleCase ) )* otherlv_6= 'default' otherlv_7= ':' ( (lv_defaultExpr_8_0= ruleOrExpression ) ) otherlv_9= '}' )
+            // InternalScope.g:2361:28: ( (otherlv_0= 'switch' (otherlv_1= '(' ( (lv_switchExpr_2_0= ruleOrExpression ) ) otherlv_3= ')' )? otherlv_4= '{' ( (lv_case_5_0= ruleCase ) )* otherlv_6= 'default' otherlv_7= ':' ( (lv_defaultExpr_8_0= ruleOrExpression ) ) otherlv_9= '}' ) )
+            // InternalScope.g:2362:1: (otherlv_0= 'switch' (otherlv_1= '(' ( (lv_switchExpr_2_0= ruleOrExpression ) ) otherlv_3= ')' )? otherlv_4= '{' ( (lv_case_5_0= ruleCase ) )* otherlv_6= 'default' otherlv_7= ':' ( (lv_defaultExpr_8_0= ruleOrExpression ) ) otherlv_9= '}' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2362:1: (otherlv_0= 'switch' (otherlv_1= '(' ( (lv_switchExpr_2_0= ruleOrExpression ) ) otherlv_3= ')' )? otherlv_4= '{' ( (lv_case_5_0= ruleCase ) )* otherlv_6= 'default' otherlv_7= ':' ( (lv_defaultExpr_8_0= ruleOrExpression ) ) otherlv_9= '}' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2362:3: otherlv_0= 'switch' (otherlv_1= '(' ( (lv_switchExpr_2_0= ruleOrExpression ) ) otherlv_3= ')' )? otherlv_4= '{' ( (lv_case_5_0= ruleCase ) )* otherlv_6= 'default' otherlv_7= ':' ( (lv_defaultExpr_8_0= ruleOrExpression ) ) otherlv_9= '}'
+            // InternalScope.g:2362:1: (otherlv_0= 'switch' (otherlv_1= '(' ( (lv_switchExpr_2_0= ruleOrExpression ) ) otherlv_3= ')' )? otherlv_4= '{' ( (lv_case_5_0= ruleCase ) )* otherlv_6= 'default' otherlv_7= ':' ( (lv_defaultExpr_8_0= ruleOrExpression ) ) otherlv_9= '}' )
+            // InternalScope.g:2362:3: otherlv_0= 'switch' (otherlv_1= '(' ( (lv_switchExpr_2_0= ruleOrExpression ) ) otherlv_3= ')' )? otherlv_4= '{' ( (lv_case_5_0= ruleCase ) )* otherlv_6= 'default' otherlv_7= ':' ( (lv_defaultExpr_8_0= ruleOrExpression ) ) otherlv_9= '}'
             {
-            otherlv_0=(Token)match(input,53,FOLLOW_53_in_ruleSwitchExpression5220); if (state.failed) return current;
+            otherlv_0=(Token)match(input,53,FOLLOW_50); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getSwitchExpressionAccess().getSwitchKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2366:1: (otherlv_1= '(' ( (lv_switchExpr_2_0= ruleOrExpression ) ) otherlv_3= ')' )?
+            // InternalScope.g:2366:1: (otherlv_1= '(' ( (lv_switchExpr_2_0= ruleOrExpression ) ) otherlv_3= ')' )?
             int alt42=2;
             int LA42_0 = input.LA(1);
 
@@ -6774,26 +6774,26 @@ public final EObject ruleSwitchExpression() throws RecognitionException {
             }
             switch (alt42) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2366:3: otherlv_1= '(' ( (lv_switchExpr_2_0= ruleOrExpression ) ) otherlv_3= ')'
+                    // InternalScope.g:2366:3: otherlv_1= '(' ( (lv_switchExpr_2_0= ruleOrExpression ) ) otherlv_3= ')'
                     {
-                    otherlv_1=(Token)match(input,25,FOLLOW_25_in_ruleSwitchExpression5233); if (state.failed) return current;
+                    otherlv_1=(Token)match(input,25,FOLLOW_51); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_1, grammarAccess.getSwitchExpressionAccess().getLeftParenthesisKeyword_1_0());
                           
                     }
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2370:1: ( (lv_switchExpr_2_0= ruleOrExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2371:1: (lv_switchExpr_2_0= ruleOrExpression )
+                    // InternalScope.g:2370:1: ( (lv_switchExpr_2_0= ruleOrExpression ) )
+                    // InternalScope.g:2371:1: (lv_switchExpr_2_0= ruleOrExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2371:1: (lv_switchExpr_2_0= ruleOrExpression )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2372:3: lv_switchExpr_2_0= ruleOrExpression
+                    // InternalScope.g:2371:1: (lv_switchExpr_2_0= ruleOrExpression )
+                    // InternalScope.g:2372:3: lv_switchExpr_2_0= ruleOrExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getSwitchExpressionAccess().getSwitchExprOrExpressionParserRuleCall_1_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleOrExpression_in_ruleSwitchExpression5254);
+                    pushFollow(FOLLOW_20);
                     lv_switchExpr_2_0=ruleOrExpression();
 
                     state._fsp--;
@@ -6807,7 +6807,7 @@ public final EObject ruleSwitchExpression() throws RecognitionException {
                              			current, 
                              			"switchExpr",
                               		lv_switchExpr_2_0, 
-                              		"OrExpression");
+                              		"com.avaloq.tools.ddk.xtext.expression.Expression.OrExpression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -6817,7 +6817,7 @@ public final EObject ruleSwitchExpression() throws RecognitionException {
 
                     }
 
-                    otherlv_3=(Token)match(input,26,FOLLOW_26_in_ruleSwitchExpression5266); if (state.failed) return current;
+                    otherlv_3=(Token)match(input,26,FOLLOW_14); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_3, grammarAccess.getSwitchExpressionAccess().getRightParenthesisKeyword_1_2());
@@ -6829,13 +6829,13 @@ public final EObject ruleSwitchExpression() throws RecognitionException {
 
             }
 
-            otherlv_4=(Token)match(input,20,FOLLOW_20_in_ruleSwitchExpression5280); if (state.failed) return current;
+            otherlv_4=(Token)match(input,20,FOLLOW_52); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_4, grammarAccess.getSwitchExpressionAccess().getLeftCurlyBracketKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2396:1: ( (lv_case_5_0= ruleCase ) )*
+            // InternalScope.g:2396:1: ( (lv_case_5_0= ruleCase ) )*
             loop43:
             do {
                 int alt43=2;
@@ -6848,17 +6848,17 @@ public final EObject ruleSwitchExpression() throws RecognitionException {
 
                 switch (alt43) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2397:1: (lv_case_5_0= ruleCase )
+            	    // InternalScope.g:2397:1: (lv_case_5_0= ruleCase )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2397:1: (lv_case_5_0= ruleCase )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2398:3: lv_case_5_0= ruleCase
+            	    // InternalScope.g:2397:1: (lv_case_5_0= ruleCase )
+            	    // InternalScope.g:2398:3: lv_case_5_0= ruleCase
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getSwitchExpressionAccess().getCaseCaseParserRuleCall_3_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleCase_in_ruleSwitchExpression5301);
+            	    pushFollow(FOLLOW_52);
             	    lv_case_5_0=ruleCase();
 
             	    state._fsp--;
@@ -6872,7 +6872,7 @@ public final EObject ruleSwitchExpression() throws RecognitionException {
             	             			current, 
             	             			"case",
             	              		lv_case_5_0, 
-            	              		"Case");
+            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.Case");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -6888,30 +6888,30 @@ public final EObject ruleSwitchExpression() throws RecognitionException {
                 }
             } while (true);
 
-            otherlv_6=(Token)match(input,54,FOLLOW_54_in_ruleSwitchExpression5314); if (state.failed) return current;
+            otherlv_6=(Token)match(input,54,FOLLOW_44); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_6, grammarAccess.getSwitchExpressionAccess().getDefaultKeyword_4());
                   
             }
-            otherlv_7=(Token)match(input,47,FOLLOW_47_in_ruleSwitchExpression5326); if (state.failed) return current;
+            otherlv_7=(Token)match(input,47,FOLLOW_51); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_7, grammarAccess.getSwitchExpressionAccess().getColonKeyword_5());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2422:1: ( (lv_defaultExpr_8_0= ruleOrExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2423:1: (lv_defaultExpr_8_0= ruleOrExpression )
+            // InternalScope.g:2422:1: ( (lv_defaultExpr_8_0= ruleOrExpression ) )
+            // InternalScope.g:2423:1: (lv_defaultExpr_8_0= ruleOrExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2423:1: (lv_defaultExpr_8_0= ruleOrExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2424:3: lv_defaultExpr_8_0= ruleOrExpression
+            // InternalScope.g:2423:1: (lv_defaultExpr_8_0= ruleOrExpression )
+            // InternalScope.g:2424:3: lv_defaultExpr_8_0= ruleOrExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getSwitchExpressionAccess().getDefaultExprOrExpressionParserRuleCall_6_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleOrExpression_in_ruleSwitchExpression5347);
+            pushFollow(FOLLOW_53);
             lv_defaultExpr_8_0=ruleOrExpression();
 
             state._fsp--;
@@ -6925,7 +6925,7 @@ public final EObject ruleSwitchExpression() throws RecognitionException {
                      			current, 
                      			"defaultExpr",
                       		lv_defaultExpr_8_0, 
-                      		"OrExpression");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.OrExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -6935,7 +6935,7 @@ public final EObject ruleSwitchExpression() throws RecognitionException {
 
             }
 
-            otherlv_9=(Token)match(input,21,FOLLOW_21_in_ruleSwitchExpression5359); if (state.failed) return current;
+            otherlv_9=(Token)match(input,21,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_9, grammarAccess.getSwitchExpressionAccess().getRightCurlyBracketKeyword_7());
@@ -6964,7 +6964,7 @@ public final EObject ruleSwitchExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleCase"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2452:1: entryRuleCase returns [EObject current=null] : iv_ruleCase= ruleCase EOF ;
+    // InternalScope.g:2452:1: entryRuleCase returns [EObject current=null] : iv_ruleCase= ruleCase EOF ;
     public final EObject entryRuleCase() throws RecognitionException {
         EObject current = null;
 
@@ -6972,13 +6972,13 @@ public final EObject entryRuleCase() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2453:2: (iv_ruleCase= ruleCase EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2454:2: iv_ruleCase= ruleCase EOF
+            // InternalScope.g:2453:2: (iv_ruleCase= ruleCase EOF )
+            // InternalScope.g:2454:2: iv_ruleCase= ruleCase EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getCaseRule()); 
             }
-            pushFollow(FOLLOW_ruleCase_in_entryRuleCase5395);
+            pushFollow(FOLLOW_1);
             iv_ruleCase=ruleCase();
 
             state._fsp--;
@@ -6986,7 +6986,7 @@ public final EObject entryRuleCase() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleCase; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleCase5405); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -7004,7 +7004,7 @@ public final EObject entryRuleCase() throws RecognitionException {
 
 
     // $ANTLR start "ruleCase"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2461:1: ruleCase returns [EObject current=null] : (otherlv_0= 'case' ( (lv_condition_1_0= ruleOrExpression ) ) otherlv_2= ':' ( (lv_thenPar_3_0= ruleOrExpression ) ) ) ;
+    // InternalScope.g:2461:1: ruleCase returns [EObject current=null] : (otherlv_0= 'case' ( (lv_condition_1_0= ruleOrExpression ) ) otherlv_2= ':' ( (lv_thenPar_3_0= ruleOrExpression ) ) ) ;
     public final EObject ruleCase() throws RecognitionException {
         EObject current = null;
 
@@ -7018,30 +7018,30 @@ public final EObject ruleCase() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2464:28: ( (otherlv_0= 'case' ( (lv_condition_1_0= ruleOrExpression ) ) otherlv_2= ':' ( (lv_thenPar_3_0= ruleOrExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2465:1: (otherlv_0= 'case' ( (lv_condition_1_0= ruleOrExpression ) ) otherlv_2= ':' ( (lv_thenPar_3_0= ruleOrExpression ) ) )
+            // InternalScope.g:2464:28: ( (otherlv_0= 'case' ( (lv_condition_1_0= ruleOrExpression ) ) otherlv_2= ':' ( (lv_thenPar_3_0= ruleOrExpression ) ) ) )
+            // InternalScope.g:2465:1: (otherlv_0= 'case' ( (lv_condition_1_0= ruleOrExpression ) ) otherlv_2= ':' ( (lv_thenPar_3_0= ruleOrExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2465:1: (otherlv_0= 'case' ( (lv_condition_1_0= ruleOrExpression ) ) otherlv_2= ':' ( (lv_thenPar_3_0= ruleOrExpression ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2465:3: otherlv_0= 'case' ( (lv_condition_1_0= ruleOrExpression ) ) otherlv_2= ':' ( (lv_thenPar_3_0= ruleOrExpression ) )
+            // InternalScope.g:2465:1: (otherlv_0= 'case' ( (lv_condition_1_0= ruleOrExpression ) ) otherlv_2= ':' ( (lv_thenPar_3_0= ruleOrExpression ) ) )
+            // InternalScope.g:2465:3: otherlv_0= 'case' ( (lv_condition_1_0= ruleOrExpression ) ) otherlv_2= ':' ( (lv_thenPar_3_0= ruleOrExpression ) )
             {
-            otherlv_0=(Token)match(input,18,FOLLOW_18_in_ruleCase5442); if (state.failed) return current;
+            otherlv_0=(Token)match(input,18,FOLLOW_51); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getCaseAccess().getCaseKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2469:1: ( (lv_condition_1_0= ruleOrExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2470:1: (lv_condition_1_0= ruleOrExpression )
+            // InternalScope.g:2469:1: ( (lv_condition_1_0= ruleOrExpression ) )
+            // InternalScope.g:2470:1: (lv_condition_1_0= ruleOrExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2470:1: (lv_condition_1_0= ruleOrExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2471:3: lv_condition_1_0= ruleOrExpression
+            // InternalScope.g:2470:1: (lv_condition_1_0= ruleOrExpression )
+            // InternalScope.g:2471:3: lv_condition_1_0= ruleOrExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getCaseAccess().getConditionOrExpressionParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleOrExpression_in_ruleCase5463);
+            pushFollow(FOLLOW_44);
             lv_condition_1_0=ruleOrExpression();
 
             state._fsp--;
@@ -7055,7 +7055,7 @@ public final EObject ruleCase() throws RecognitionException {
                      			current, 
                      			"condition",
                       		lv_condition_1_0, 
-                      		"OrExpression");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.OrExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -7065,24 +7065,24 @@ public final EObject ruleCase() throws RecognitionException {
 
             }
 
-            otherlv_2=(Token)match(input,47,FOLLOW_47_in_ruleCase5475); if (state.failed) return current;
+            otherlv_2=(Token)match(input,47,FOLLOW_51); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getCaseAccess().getColonKeyword_2());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2491:1: ( (lv_thenPar_3_0= ruleOrExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2492:1: (lv_thenPar_3_0= ruleOrExpression )
+            // InternalScope.g:2491:1: ( (lv_thenPar_3_0= ruleOrExpression ) )
+            // InternalScope.g:2492:1: (lv_thenPar_3_0= ruleOrExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2492:1: (lv_thenPar_3_0= ruleOrExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2493:3: lv_thenPar_3_0= ruleOrExpression
+            // InternalScope.g:2492:1: (lv_thenPar_3_0= ruleOrExpression )
+            // InternalScope.g:2493:3: lv_thenPar_3_0= ruleOrExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getCaseAccess().getThenParOrExpressionParserRuleCall_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleOrExpression_in_ruleCase5496);
+            pushFollow(FOLLOW_2);
             lv_thenPar_3_0=ruleOrExpression();
 
             state._fsp--;
@@ -7096,7 +7096,7 @@ public final EObject ruleCase() throws RecognitionException {
                      			current, 
                      			"thenPar",
                       		lv_thenPar_3_0, 
-                      		"OrExpression");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.OrExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -7129,7 +7129,7 @@ public final EObject ruleCase() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleOrExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2517:1: entryRuleOrExpression returns [EObject current=null] : iv_ruleOrExpression= ruleOrExpression EOF ;
+    // InternalScope.g:2517:1: entryRuleOrExpression returns [EObject current=null] : iv_ruleOrExpression= ruleOrExpression EOF ;
     public final EObject entryRuleOrExpression() throws RecognitionException {
         EObject current = null;
 
@@ -7137,13 +7137,13 @@ public final EObject entryRuleOrExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2518:2: (iv_ruleOrExpression= ruleOrExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2519:2: iv_ruleOrExpression= ruleOrExpression EOF
+            // InternalScope.g:2518:2: (iv_ruleOrExpression= ruleOrExpression EOF )
+            // InternalScope.g:2519:2: iv_ruleOrExpression= ruleOrExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOrExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleOrExpression_in_entryRuleOrExpression5532);
+            pushFollow(FOLLOW_1);
             iv_ruleOrExpression=ruleOrExpression();
 
             state._fsp--;
@@ -7151,7 +7151,7 @@ public final EObject entryRuleOrExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOrExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOrExpression5542); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -7169,7 +7169,7 @@ public final EObject entryRuleOrExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleOrExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2526:1: ruleOrExpression returns [EObject current=null] : (this_AndExpression_0= ruleAndExpression ( () ( (lv_operator_2_0= '||' ) ) ( (lv_right_3_0= ruleAndExpression ) ) )* ) ;
+    // InternalScope.g:2526:1: ruleOrExpression returns [EObject current=null] : (this_AndExpression_0= ruleAndExpression ( () ( (lv_operator_2_0= '||' ) ) ( (lv_right_3_0= ruleAndExpression ) ) )* ) ;
     public final EObject ruleOrExpression() throws RecognitionException {
         EObject current = null;
 
@@ -7182,18 +7182,18 @@ public final EObject ruleOrExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2529:28: ( (this_AndExpression_0= ruleAndExpression ( () ( (lv_operator_2_0= '||' ) ) ( (lv_right_3_0= ruleAndExpression ) ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2530:1: (this_AndExpression_0= ruleAndExpression ( () ( (lv_operator_2_0= '||' ) ) ( (lv_right_3_0= ruleAndExpression ) ) )* )
+            // InternalScope.g:2529:28: ( (this_AndExpression_0= ruleAndExpression ( () ( (lv_operator_2_0= '||' ) ) ( (lv_right_3_0= ruleAndExpression ) ) )* ) )
+            // InternalScope.g:2530:1: (this_AndExpression_0= ruleAndExpression ( () ( (lv_operator_2_0= '||' ) ) ( (lv_right_3_0= ruleAndExpression ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2530:1: (this_AndExpression_0= ruleAndExpression ( () ( (lv_operator_2_0= '||' ) ) ( (lv_right_3_0= ruleAndExpression ) ) )* )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2531:5: this_AndExpression_0= ruleAndExpression ( () ( (lv_operator_2_0= '||' ) ) ( (lv_right_3_0= ruleAndExpression ) ) )*
+            // InternalScope.g:2530:1: (this_AndExpression_0= ruleAndExpression ( () ( (lv_operator_2_0= '||' ) ) ( (lv_right_3_0= ruleAndExpression ) ) )* )
+            // InternalScope.g:2531:5: this_AndExpression_0= ruleAndExpression ( () ( (lv_operator_2_0= '||' ) ) ( (lv_right_3_0= ruleAndExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getOrExpressionAccess().getAndExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleAndExpression_in_ruleOrExpression5589);
+            pushFollow(FOLLOW_54);
             this_AndExpression_0=ruleAndExpression();
 
             state._fsp--;
@@ -7204,7 +7204,7 @@ public final EObject ruleOrExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2539:1: ( () ( (lv_operator_2_0= '||' ) ) ( (lv_right_3_0= ruleAndExpression ) ) )*
+            // InternalScope.g:2539:1: ( () ( (lv_operator_2_0= '||' ) ) ( (lv_right_3_0= ruleAndExpression ) ) )*
             loop44:
             do {
                 int alt44=2;
@@ -7217,10 +7217,10 @@ public final EObject ruleOrExpression() throws RecognitionException {
 
                 switch (alt44) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2539:2: () ( (lv_operator_2_0= '||' ) ) ( (lv_right_3_0= ruleAndExpression ) )
+            	    // InternalScope.g:2539:2: () ( (lv_operator_2_0= '||' ) ) ( (lv_right_3_0= ruleAndExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2539:2: ()
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2540:5: 
+            	    // InternalScope.g:2539:2: ()
+            	    // InternalScope.g:2540:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -7232,13 +7232,13 @@ public final EObject ruleOrExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2545:2: ( (lv_operator_2_0= '||' ) )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2546:1: (lv_operator_2_0= '||' )
+            	    // InternalScope.g:2545:2: ( (lv_operator_2_0= '||' ) )
+            	    // InternalScope.g:2546:1: (lv_operator_2_0= '||' )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2546:1: (lv_operator_2_0= '||' )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2547:3: lv_operator_2_0= '||'
+            	    // InternalScope.g:2546:1: (lv_operator_2_0= '||' )
+            	    // InternalScope.g:2547:3: lv_operator_2_0= '||'
             	    {
-            	    lv_operator_2_0=(Token)match(input,55,FOLLOW_55_in_ruleOrExpression5616); if (state.failed) return current;
+            	    lv_operator_2_0=(Token)match(input,55,FOLLOW_51); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	              newLeafNode(lv_operator_2_0, grammarAccess.getOrExpressionAccess().getOperatorVerticalLineVerticalLineKeyword_1_1_0());
@@ -7258,18 +7258,18 @@ public final EObject ruleOrExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2560:2: ( (lv_right_3_0= ruleAndExpression ) )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2561:1: (lv_right_3_0= ruleAndExpression )
+            	    // InternalScope.g:2560:2: ( (lv_right_3_0= ruleAndExpression ) )
+            	    // InternalScope.g:2561:1: (lv_right_3_0= ruleAndExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2561:1: (lv_right_3_0= ruleAndExpression )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2562:3: lv_right_3_0= ruleAndExpression
+            	    // InternalScope.g:2561:1: (lv_right_3_0= ruleAndExpression )
+            	    // InternalScope.g:2562:3: lv_right_3_0= ruleAndExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getOrExpressionAccess().getRightAndExpressionParserRuleCall_1_2_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleAndExpression_in_ruleOrExpression5650);
+            	    pushFollow(FOLLOW_54);
             	    lv_right_3_0=ruleAndExpression();
 
             	    state._fsp--;
@@ -7283,7 +7283,7 @@ public final EObject ruleOrExpression() throws RecognitionException {
             	             			current, 
             	             			"right",
             	              		lv_right_3_0, 
-            	              		"AndExpression");
+            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.AndExpression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -7325,7 +7325,7 @@ public final EObject ruleOrExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleAndExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2586:1: entryRuleAndExpression returns [EObject current=null] : iv_ruleAndExpression= ruleAndExpression EOF ;
+    // InternalScope.g:2586:1: entryRuleAndExpression returns [EObject current=null] : iv_ruleAndExpression= ruleAndExpression EOF ;
     public final EObject entryRuleAndExpression() throws RecognitionException {
         EObject current = null;
 
@@ -7333,13 +7333,13 @@ public final EObject entryRuleAndExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2587:2: (iv_ruleAndExpression= ruleAndExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2588:2: iv_ruleAndExpression= ruleAndExpression EOF
+            // InternalScope.g:2587:2: (iv_ruleAndExpression= ruleAndExpression EOF )
+            // InternalScope.g:2588:2: iv_ruleAndExpression= ruleAndExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getAndExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleAndExpression_in_entryRuleAndExpression5688);
+            pushFollow(FOLLOW_1);
             iv_ruleAndExpression=ruleAndExpression();
 
             state._fsp--;
@@ -7347,7 +7347,7 @@ public final EObject entryRuleAndExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleAndExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAndExpression5698); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -7365,7 +7365,7 @@ public final EObject entryRuleAndExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleAndExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2595:1: ruleAndExpression returns [EObject current=null] : (this_ImpliesExpression_0= ruleImpliesExpression ( () ( (lv_operator_2_0= '&&' ) ) ( (lv_right_3_0= ruleImpliesExpression ) ) )* ) ;
+    // InternalScope.g:2595:1: ruleAndExpression returns [EObject current=null] : (this_ImpliesExpression_0= ruleImpliesExpression ( () ( (lv_operator_2_0= '&&' ) ) ( (lv_right_3_0= ruleImpliesExpression ) ) )* ) ;
     public final EObject ruleAndExpression() throws RecognitionException {
         EObject current = null;
 
@@ -7378,18 +7378,18 @@ public final EObject ruleAndExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2598:28: ( (this_ImpliesExpression_0= ruleImpliesExpression ( () ( (lv_operator_2_0= '&&' ) ) ( (lv_right_3_0= ruleImpliesExpression ) ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2599:1: (this_ImpliesExpression_0= ruleImpliesExpression ( () ( (lv_operator_2_0= '&&' ) ) ( (lv_right_3_0= ruleImpliesExpression ) ) )* )
+            // InternalScope.g:2598:28: ( (this_ImpliesExpression_0= ruleImpliesExpression ( () ( (lv_operator_2_0= '&&' ) ) ( (lv_right_3_0= ruleImpliesExpression ) ) )* ) )
+            // InternalScope.g:2599:1: (this_ImpliesExpression_0= ruleImpliesExpression ( () ( (lv_operator_2_0= '&&' ) ) ( (lv_right_3_0= ruleImpliesExpression ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2599:1: (this_ImpliesExpression_0= ruleImpliesExpression ( () ( (lv_operator_2_0= '&&' ) ) ( (lv_right_3_0= ruleImpliesExpression ) ) )* )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2600:5: this_ImpliesExpression_0= ruleImpliesExpression ( () ( (lv_operator_2_0= '&&' ) ) ( (lv_right_3_0= ruleImpliesExpression ) ) )*
+            // InternalScope.g:2599:1: (this_ImpliesExpression_0= ruleImpliesExpression ( () ( (lv_operator_2_0= '&&' ) ) ( (lv_right_3_0= ruleImpliesExpression ) ) )* )
+            // InternalScope.g:2600:5: this_ImpliesExpression_0= ruleImpliesExpression ( () ( (lv_operator_2_0= '&&' ) ) ( (lv_right_3_0= ruleImpliesExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getAndExpressionAccess().getImpliesExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleImpliesExpression_in_ruleAndExpression5745);
+            pushFollow(FOLLOW_55);
             this_ImpliesExpression_0=ruleImpliesExpression();
 
             state._fsp--;
@@ -7400,7 +7400,7 @@ public final EObject ruleAndExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2608:1: ( () ( (lv_operator_2_0= '&&' ) ) ( (lv_right_3_0= ruleImpliesExpression ) ) )*
+            // InternalScope.g:2608:1: ( () ( (lv_operator_2_0= '&&' ) ) ( (lv_right_3_0= ruleImpliesExpression ) ) )*
             loop45:
             do {
                 int alt45=2;
@@ -7413,10 +7413,10 @@ public final EObject ruleAndExpression() throws RecognitionException {
 
                 switch (alt45) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2608:2: () ( (lv_operator_2_0= '&&' ) ) ( (lv_right_3_0= ruleImpliesExpression ) )
+            	    // InternalScope.g:2608:2: () ( (lv_operator_2_0= '&&' ) ) ( (lv_right_3_0= ruleImpliesExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2608:2: ()
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2609:5: 
+            	    // InternalScope.g:2608:2: ()
+            	    // InternalScope.g:2609:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -7428,13 +7428,13 @@ public final EObject ruleAndExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2614:2: ( (lv_operator_2_0= '&&' ) )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2615:1: (lv_operator_2_0= '&&' )
+            	    // InternalScope.g:2614:2: ( (lv_operator_2_0= '&&' ) )
+            	    // InternalScope.g:2615:1: (lv_operator_2_0= '&&' )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2615:1: (lv_operator_2_0= '&&' )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2616:3: lv_operator_2_0= '&&'
+            	    // InternalScope.g:2615:1: (lv_operator_2_0= '&&' )
+            	    // InternalScope.g:2616:3: lv_operator_2_0= '&&'
             	    {
-            	    lv_operator_2_0=(Token)match(input,56,FOLLOW_56_in_ruleAndExpression5772); if (state.failed) return current;
+            	    lv_operator_2_0=(Token)match(input,56,FOLLOW_51); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	              newLeafNode(lv_operator_2_0, grammarAccess.getAndExpressionAccess().getOperatorAmpersandAmpersandKeyword_1_1_0());
@@ -7454,18 +7454,18 @@ public final EObject ruleAndExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2629:2: ( (lv_right_3_0= ruleImpliesExpression ) )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2630:1: (lv_right_3_0= ruleImpliesExpression )
+            	    // InternalScope.g:2629:2: ( (lv_right_3_0= ruleImpliesExpression ) )
+            	    // InternalScope.g:2630:1: (lv_right_3_0= ruleImpliesExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2630:1: (lv_right_3_0= ruleImpliesExpression )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2631:3: lv_right_3_0= ruleImpliesExpression
+            	    // InternalScope.g:2630:1: (lv_right_3_0= ruleImpliesExpression )
+            	    // InternalScope.g:2631:3: lv_right_3_0= ruleImpliesExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getAndExpressionAccess().getRightImpliesExpressionParserRuleCall_1_2_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleImpliesExpression_in_ruleAndExpression5806);
+            	    pushFollow(FOLLOW_55);
             	    lv_right_3_0=ruleImpliesExpression();
 
             	    state._fsp--;
@@ -7479,7 +7479,7 @@ public final EObject ruleAndExpression() throws RecognitionException {
             	             			current, 
             	             			"right",
             	              		lv_right_3_0, 
-            	              		"ImpliesExpression");
+            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.ImpliesExpression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -7521,7 +7521,7 @@ public final EObject ruleAndExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleImpliesExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2655:1: entryRuleImpliesExpression returns [EObject current=null] : iv_ruleImpliesExpression= ruleImpliesExpression EOF ;
+    // InternalScope.g:2655:1: entryRuleImpliesExpression returns [EObject current=null] : iv_ruleImpliesExpression= ruleImpliesExpression EOF ;
     public final EObject entryRuleImpliesExpression() throws RecognitionException {
         EObject current = null;
 
@@ -7529,13 +7529,13 @@ public final EObject entryRuleImpliesExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2656:2: (iv_ruleImpliesExpression= ruleImpliesExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2657:2: iv_ruleImpliesExpression= ruleImpliesExpression EOF
+            // InternalScope.g:2656:2: (iv_ruleImpliesExpression= ruleImpliesExpression EOF )
+            // InternalScope.g:2657:2: iv_ruleImpliesExpression= ruleImpliesExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getImpliesExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleImpliesExpression_in_entryRuleImpliesExpression5844);
+            pushFollow(FOLLOW_1);
             iv_ruleImpliesExpression=ruleImpliesExpression();
 
             state._fsp--;
@@ -7543,7 +7543,7 @@ public final EObject entryRuleImpliesExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleImpliesExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleImpliesExpression5854); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -7561,7 +7561,7 @@ public final EObject entryRuleImpliesExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleImpliesExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2664:1: ruleImpliesExpression returns [EObject current=null] : (this_RelationalExpression_0= ruleRelationalExpression ( () ( (lv_operator_2_0= 'implies' ) ) ( (lv_right_3_0= ruleRelationalExpression ) ) )* ) ;
+    // InternalScope.g:2664:1: ruleImpliesExpression returns [EObject current=null] : (this_RelationalExpression_0= ruleRelationalExpression ( () ( (lv_operator_2_0= 'implies' ) ) ( (lv_right_3_0= ruleRelationalExpression ) ) )* ) ;
     public final EObject ruleImpliesExpression() throws RecognitionException {
         EObject current = null;
 
@@ -7574,18 +7574,18 @@ public final EObject ruleImpliesExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2667:28: ( (this_RelationalExpression_0= ruleRelationalExpression ( () ( (lv_operator_2_0= 'implies' ) ) ( (lv_right_3_0= ruleRelationalExpression ) ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2668:1: (this_RelationalExpression_0= ruleRelationalExpression ( () ( (lv_operator_2_0= 'implies' ) ) ( (lv_right_3_0= ruleRelationalExpression ) ) )* )
+            // InternalScope.g:2667:28: ( (this_RelationalExpression_0= ruleRelationalExpression ( () ( (lv_operator_2_0= 'implies' ) ) ( (lv_right_3_0= ruleRelationalExpression ) ) )* ) )
+            // InternalScope.g:2668:1: (this_RelationalExpression_0= ruleRelationalExpression ( () ( (lv_operator_2_0= 'implies' ) ) ( (lv_right_3_0= ruleRelationalExpression ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2668:1: (this_RelationalExpression_0= ruleRelationalExpression ( () ( (lv_operator_2_0= 'implies' ) ) ( (lv_right_3_0= ruleRelationalExpression ) ) )* )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2669:5: this_RelationalExpression_0= ruleRelationalExpression ( () ( (lv_operator_2_0= 'implies' ) ) ( (lv_right_3_0= ruleRelationalExpression ) ) )*
+            // InternalScope.g:2668:1: (this_RelationalExpression_0= ruleRelationalExpression ( () ( (lv_operator_2_0= 'implies' ) ) ( (lv_right_3_0= ruleRelationalExpression ) ) )* )
+            // InternalScope.g:2669:5: this_RelationalExpression_0= ruleRelationalExpression ( () ( (lv_operator_2_0= 'implies' ) ) ( (lv_right_3_0= ruleRelationalExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getImpliesExpressionAccess().getRelationalExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleRelationalExpression_in_ruleImpliesExpression5901);
+            pushFollow(FOLLOW_56);
             this_RelationalExpression_0=ruleRelationalExpression();
 
             state._fsp--;
@@ -7596,7 +7596,7 @@ public final EObject ruleImpliesExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2677:1: ( () ( (lv_operator_2_0= 'implies' ) ) ( (lv_right_3_0= ruleRelationalExpression ) ) )*
+            // InternalScope.g:2677:1: ( () ( (lv_operator_2_0= 'implies' ) ) ( (lv_right_3_0= ruleRelationalExpression ) ) )*
             loop46:
             do {
                 int alt46=2;
@@ -7609,10 +7609,10 @@ public final EObject ruleImpliesExpression() throws RecognitionException {
 
                 switch (alt46) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2677:2: () ( (lv_operator_2_0= 'implies' ) ) ( (lv_right_3_0= ruleRelationalExpression ) )
+            	    // InternalScope.g:2677:2: () ( (lv_operator_2_0= 'implies' ) ) ( (lv_right_3_0= ruleRelationalExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2677:2: ()
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2678:5: 
+            	    // InternalScope.g:2677:2: ()
+            	    // InternalScope.g:2678:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -7624,13 +7624,13 @@ public final EObject ruleImpliesExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2683:2: ( (lv_operator_2_0= 'implies' ) )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2684:1: (lv_operator_2_0= 'implies' )
+            	    // InternalScope.g:2683:2: ( (lv_operator_2_0= 'implies' ) )
+            	    // InternalScope.g:2684:1: (lv_operator_2_0= 'implies' )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2684:1: (lv_operator_2_0= 'implies' )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2685:3: lv_operator_2_0= 'implies'
+            	    // InternalScope.g:2684:1: (lv_operator_2_0= 'implies' )
+            	    // InternalScope.g:2685:3: lv_operator_2_0= 'implies'
             	    {
-            	    lv_operator_2_0=(Token)match(input,57,FOLLOW_57_in_ruleImpliesExpression5928); if (state.failed) return current;
+            	    lv_operator_2_0=(Token)match(input,57,FOLLOW_51); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	              newLeafNode(lv_operator_2_0, grammarAccess.getImpliesExpressionAccess().getOperatorImpliesKeyword_1_1_0());
@@ -7650,18 +7650,18 @@ public final EObject ruleImpliesExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2698:2: ( (lv_right_3_0= ruleRelationalExpression ) )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2699:1: (lv_right_3_0= ruleRelationalExpression )
+            	    // InternalScope.g:2698:2: ( (lv_right_3_0= ruleRelationalExpression ) )
+            	    // InternalScope.g:2699:1: (lv_right_3_0= ruleRelationalExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2699:1: (lv_right_3_0= ruleRelationalExpression )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2700:3: lv_right_3_0= ruleRelationalExpression
+            	    // InternalScope.g:2699:1: (lv_right_3_0= ruleRelationalExpression )
+            	    // InternalScope.g:2700:3: lv_right_3_0= ruleRelationalExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getImpliesExpressionAccess().getRightRelationalExpressionParserRuleCall_1_2_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleRelationalExpression_in_ruleImpliesExpression5962);
+            	    pushFollow(FOLLOW_56);
             	    lv_right_3_0=ruleRelationalExpression();
 
             	    state._fsp--;
@@ -7675,7 +7675,7 @@ public final EObject ruleImpliesExpression() throws RecognitionException {
             	             			current, 
             	             			"right",
             	              		lv_right_3_0, 
-            	              		"RelationalExpression");
+            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.RelationalExpression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -7717,7 +7717,7 @@ public final EObject ruleImpliesExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleRelationalExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2724:1: entryRuleRelationalExpression returns [EObject current=null] : iv_ruleRelationalExpression= ruleRelationalExpression EOF ;
+    // InternalScope.g:2724:1: entryRuleRelationalExpression returns [EObject current=null] : iv_ruleRelationalExpression= ruleRelationalExpression EOF ;
     public final EObject entryRuleRelationalExpression() throws RecognitionException {
         EObject current = null;
 
@@ -7725,13 +7725,13 @@ public final EObject entryRuleRelationalExpression() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2725:2: (iv_ruleRelationalExpression= ruleRelationalExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2726:2: iv_ruleRelationalExpression= ruleRelationalExpression EOF
+            // InternalScope.g:2725:2: (iv_ruleRelationalExpression= ruleRelationalExpression EOF )
+            // InternalScope.g:2726:2: iv_ruleRelationalExpression= ruleRelationalExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getRelationalExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleRelationalExpression_in_entryRuleRelationalExpression6000);
+            pushFollow(FOLLOW_1);
             iv_ruleRelationalExpression=ruleRelationalExpression();
 
             state._fsp--;
@@ -7739,7 +7739,7 @@ public final EObject entryRuleRelationalExpression() throws RecognitionException
             if ( state.backtracking==0 ) {
                current =iv_ruleRelationalExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRelationalExpression6010); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -7757,7 +7757,7 @@ public final EObject entryRuleRelationalExpression() throws RecognitionException
 
 
     // $ANTLR start "ruleRelationalExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2733:1: ruleRelationalExpression returns [EObject current=null] : (this_AdditiveExpression_0= ruleAdditiveExpression ( () ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) ) ( (lv_right_3_0= ruleAdditiveExpression ) ) )* ) ;
+    // InternalScope.g:2733:1: ruleRelationalExpression returns [EObject current=null] : (this_AdditiveExpression_0= ruleAdditiveExpression ( () ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) ) ( (lv_right_3_0= ruleAdditiveExpression ) ) )* ) ;
     public final EObject ruleRelationalExpression() throws RecognitionException {
         EObject current = null;
 
@@ -7775,18 +7775,18 @@ public final EObject ruleRelationalExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2736:28: ( (this_AdditiveExpression_0= ruleAdditiveExpression ( () ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) ) ( (lv_right_3_0= ruleAdditiveExpression ) ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2737:1: (this_AdditiveExpression_0= ruleAdditiveExpression ( () ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) ) ( (lv_right_3_0= ruleAdditiveExpression ) ) )* )
+            // InternalScope.g:2736:28: ( (this_AdditiveExpression_0= ruleAdditiveExpression ( () ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) ) ( (lv_right_3_0= ruleAdditiveExpression ) ) )* ) )
+            // InternalScope.g:2737:1: (this_AdditiveExpression_0= ruleAdditiveExpression ( () ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) ) ( (lv_right_3_0= ruleAdditiveExpression ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2737:1: (this_AdditiveExpression_0= ruleAdditiveExpression ( () ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) ) ( (lv_right_3_0= ruleAdditiveExpression ) ) )* )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2738:5: this_AdditiveExpression_0= ruleAdditiveExpression ( () ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) ) ( (lv_right_3_0= ruleAdditiveExpression ) ) )*
+            // InternalScope.g:2737:1: (this_AdditiveExpression_0= ruleAdditiveExpression ( () ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) ) ( (lv_right_3_0= ruleAdditiveExpression ) ) )* )
+            // InternalScope.g:2738:5: this_AdditiveExpression_0= ruleAdditiveExpression ( () ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) ) ( (lv_right_3_0= ruleAdditiveExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getRelationalExpressionAccess().getAdditiveExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleAdditiveExpression_in_ruleRelationalExpression6057);
+            pushFollow(FOLLOW_57);
             this_AdditiveExpression_0=ruleAdditiveExpression();
 
             state._fsp--;
@@ -7797,7 +7797,7 @@ public final EObject ruleRelationalExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2746:1: ( () ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) ) ( (lv_right_3_0= ruleAdditiveExpression ) ) )*
+            // InternalScope.g:2746:1: ( () ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) ) ( (lv_right_3_0= ruleAdditiveExpression ) ) )*
             loop48:
             do {
                 int alt48=2;
@@ -7810,10 +7810,10 @@ public final EObject ruleRelationalExpression() throws RecognitionException {
 
                 switch (alt48) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2746:2: () ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) ) ( (lv_right_3_0= ruleAdditiveExpression ) )
+            	    // InternalScope.g:2746:2: () ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) ) ( (lv_right_3_0= ruleAdditiveExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2746:2: ()
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2747:5: 
+            	    // InternalScope.g:2746:2: ()
+            	    // InternalScope.g:2747:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -7825,13 +7825,13 @@ public final EObject ruleRelationalExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2752:2: ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2753:1: ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) )
+            	    // InternalScope.g:2752:2: ( ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) ) )
+            	    // InternalScope.g:2753:1: ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2753:1: ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2754:1: (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' )
+            	    // InternalScope.g:2753:1: ( (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' ) )
+            	    // InternalScope.g:2754:1: (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2754:1: (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' )
+            	    // InternalScope.g:2754:1: (lv_operator_2_1= '==' | lv_operator_2_2= '!=' | lv_operator_2_3= '>=' | lv_operator_2_4= '<=' | lv_operator_2_5= '>' | lv_operator_2_6= '<' )
             	    int alt47=6;
             	    switch ( input.LA(1) ) {
             	    case 58:
@@ -7874,9 +7874,9 @@ public final EObject ruleRelationalExpression() throws RecognitionException {
 
             	    switch (alt47) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2755:3: lv_operator_2_1= '=='
+            	            // InternalScope.g:2755:3: lv_operator_2_1= '=='
             	            {
-            	            lv_operator_2_1=(Token)match(input,58,FOLLOW_58_in_ruleRelationalExpression6086); if (state.failed) return current;
+            	            lv_operator_2_1=(Token)match(input,58,FOLLOW_51); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_operator_2_1, grammarAccess.getRelationalExpressionAccess().getOperatorEqualsSignEqualsSignKeyword_1_1_0_0());
@@ -7894,9 +7894,9 @@ public final EObject ruleRelationalExpression() throws RecognitionException {
             	            }
             	            break;
             	        case 2 :
-            	            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2767:8: lv_operator_2_2= '!='
+            	            // InternalScope.g:2767:8: lv_operator_2_2= '!='
             	            {
-            	            lv_operator_2_2=(Token)match(input,59,FOLLOW_59_in_ruleRelationalExpression6115); if (state.failed) return current;
+            	            lv_operator_2_2=(Token)match(input,59,FOLLOW_51); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_operator_2_2, grammarAccess.getRelationalExpressionAccess().getOperatorExclamationMarkEqualsSignKeyword_1_1_0_1());
@@ -7914,9 +7914,9 @@ public final EObject ruleRelationalExpression() throws RecognitionException {
             	            }
             	            break;
             	        case 3 :
-            	            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2779:8: lv_operator_2_3= '>='
+            	            // InternalScope.g:2779:8: lv_operator_2_3= '>='
             	            {
-            	            lv_operator_2_3=(Token)match(input,60,FOLLOW_60_in_ruleRelationalExpression6144); if (state.failed) return current;
+            	            lv_operator_2_3=(Token)match(input,60,FOLLOW_51); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_operator_2_3, grammarAccess.getRelationalExpressionAccess().getOperatorGreaterThanSignEqualsSignKeyword_1_1_0_2());
@@ -7934,9 +7934,9 @@ public final EObject ruleRelationalExpression() throws RecognitionException {
             	            }
             	            break;
             	        case 4 :
-            	            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2791:8: lv_operator_2_4= '<='
+            	            // InternalScope.g:2791:8: lv_operator_2_4= '<='
             	            {
-            	            lv_operator_2_4=(Token)match(input,61,FOLLOW_61_in_ruleRelationalExpression6173); if (state.failed) return current;
+            	            lv_operator_2_4=(Token)match(input,61,FOLLOW_51); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_operator_2_4, grammarAccess.getRelationalExpressionAccess().getOperatorLessThanSignEqualsSignKeyword_1_1_0_3());
@@ -7954,9 +7954,9 @@ public final EObject ruleRelationalExpression() throws RecognitionException {
             	            }
             	            break;
             	        case 5 :
-            	            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2803:8: lv_operator_2_5= '>'
+            	            // InternalScope.g:2803:8: lv_operator_2_5= '>'
             	            {
-            	            lv_operator_2_5=(Token)match(input,62,FOLLOW_62_in_ruleRelationalExpression6202); if (state.failed) return current;
+            	            lv_operator_2_5=(Token)match(input,62,FOLLOW_51); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_operator_2_5, grammarAccess.getRelationalExpressionAccess().getOperatorGreaterThanSignKeyword_1_1_0_4());
@@ -7974,9 +7974,9 @@ public final EObject ruleRelationalExpression() throws RecognitionException {
             	            }
             	            break;
             	        case 6 :
-            	            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2815:8: lv_operator_2_6= '<'
+            	            // InternalScope.g:2815:8: lv_operator_2_6= '<'
             	            {
-            	            lv_operator_2_6=(Token)match(input,63,FOLLOW_63_in_ruleRelationalExpression6231); if (state.failed) return current;
+            	            lv_operator_2_6=(Token)match(input,63,FOLLOW_51); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_operator_2_6, grammarAccess.getRelationalExpressionAccess().getOperatorLessThanSignKeyword_1_1_0_5());
@@ -8002,18 +8002,18 @@ public final EObject ruleRelationalExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2830:2: ( (lv_right_3_0= ruleAdditiveExpression ) )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2831:1: (lv_right_3_0= ruleAdditiveExpression )
+            	    // InternalScope.g:2830:2: ( (lv_right_3_0= ruleAdditiveExpression ) )
+            	    // InternalScope.g:2831:1: (lv_right_3_0= ruleAdditiveExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2831:1: (lv_right_3_0= ruleAdditiveExpression )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2832:3: lv_right_3_0= ruleAdditiveExpression
+            	    // InternalScope.g:2831:1: (lv_right_3_0= ruleAdditiveExpression )
+            	    // InternalScope.g:2832:3: lv_right_3_0= ruleAdditiveExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getRelationalExpressionAccess().getRightAdditiveExpressionParserRuleCall_1_2_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleAdditiveExpression_in_ruleRelationalExpression6268);
+            	    pushFollow(FOLLOW_57);
             	    lv_right_3_0=ruleAdditiveExpression();
 
             	    state._fsp--;
@@ -8027,7 +8027,7 @@ public final EObject ruleRelationalExpression() throws RecognitionException {
             	             			current, 
             	             			"right",
             	              		lv_right_3_0, 
-            	              		"AdditiveExpression");
+            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.AdditiveExpression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -8069,7 +8069,7 @@ public final EObject ruleRelationalExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleAdditiveExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2856:1: entryRuleAdditiveExpression returns [EObject current=null] : iv_ruleAdditiveExpression= ruleAdditiveExpression EOF ;
+    // InternalScope.g:2856:1: entryRuleAdditiveExpression returns [EObject current=null] : iv_ruleAdditiveExpression= ruleAdditiveExpression EOF ;
     public final EObject entryRuleAdditiveExpression() throws RecognitionException {
         EObject current = null;
 
@@ -8077,13 +8077,13 @@ public final EObject entryRuleAdditiveExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2857:2: (iv_ruleAdditiveExpression= ruleAdditiveExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2858:2: iv_ruleAdditiveExpression= ruleAdditiveExpression EOF
+            // InternalScope.g:2857:2: (iv_ruleAdditiveExpression= ruleAdditiveExpression EOF )
+            // InternalScope.g:2858:2: iv_ruleAdditiveExpression= ruleAdditiveExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getAdditiveExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleAdditiveExpression_in_entryRuleAdditiveExpression6306);
+            pushFollow(FOLLOW_1);
             iv_ruleAdditiveExpression=ruleAdditiveExpression();
 
             state._fsp--;
@@ -8091,7 +8091,7 @@ public final EObject entryRuleAdditiveExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleAdditiveExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAdditiveExpression6316); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -8109,7 +8109,7 @@ public final EObject entryRuleAdditiveExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleAdditiveExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2865:1: ruleAdditiveExpression returns [EObject current=null] : (this_MultiplicativeExpression_0= ruleMultiplicativeExpression ( () ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) ) ( (lv_params_3_0= ruleMultiplicativeExpression ) ) )* ) ;
+    // InternalScope.g:2865:1: ruleAdditiveExpression returns [EObject current=null] : (this_MultiplicativeExpression_0= ruleMultiplicativeExpression ( () ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) ) ( (lv_params_3_0= ruleMultiplicativeExpression ) ) )* ) ;
     public final EObject ruleAdditiveExpression() throws RecognitionException {
         EObject current = null;
 
@@ -8123,18 +8123,18 @@ public final EObject ruleAdditiveExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2868:28: ( (this_MultiplicativeExpression_0= ruleMultiplicativeExpression ( () ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) ) ( (lv_params_3_0= ruleMultiplicativeExpression ) ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2869:1: (this_MultiplicativeExpression_0= ruleMultiplicativeExpression ( () ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) ) ( (lv_params_3_0= ruleMultiplicativeExpression ) ) )* )
+            // InternalScope.g:2868:28: ( (this_MultiplicativeExpression_0= ruleMultiplicativeExpression ( () ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) ) ( (lv_params_3_0= ruleMultiplicativeExpression ) ) )* ) )
+            // InternalScope.g:2869:1: (this_MultiplicativeExpression_0= ruleMultiplicativeExpression ( () ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) ) ( (lv_params_3_0= ruleMultiplicativeExpression ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2869:1: (this_MultiplicativeExpression_0= ruleMultiplicativeExpression ( () ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) ) ( (lv_params_3_0= ruleMultiplicativeExpression ) ) )* )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2870:5: this_MultiplicativeExpression_0= ruleMultiplicativeExpression ( () ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) ) ( (lv_params_3_0= ruleMultiplicativeExpression ) ) )*
+            // InternalScope.g:2869:1: (this_MultiplicativeExpression_0= ruleMultiplicativeExpression ( () ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) ) ( (lv_params_3_0= ruleMultiplicativeExpression ) ) )* )
+            // InternalScope.g:2870:5: this_MultiplicativeExpression_0= ruleMultiplicativeExpression ( () ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) ) ( (lv_params_3_0= ruleMultiplicativeExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getAdditiveExpressionAccess().getMultiplicativeExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleMultiplicativeExpression_in_ruleAdditiveExpression6363);
+            pushFollow(FOLLOW_58);
             this_MultiplicativeExpression_0=ruleMultiplicativeExpression();
 
             state._fsp--;
@@ -8145,7 +8145,7 @@ public final EObject ruleAdditiveExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2878:1: ( () ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) ) ( (lv_params_3_0= ruleMultiplicativeExpression ) ) )*
+            // InternalScope.g:2878:1: ( () ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) ) ( (lv_params_3_0= ruleMultiplicativeExpression ) ) )*
             loop50:
             do {
                 int alt50=2;
@@ -8158,10 +8158,10 @@ public final EObject ruleAdditiveExpression() throws RecognitionException {
 
                 switch (alt50) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2878:2: () ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) ) ( (lv_params_3_0= ruleMultiplicativeExpression ) )
+            	    // InternalScope.g:2878:2: () ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) ) ( (lv_params_3_0= ruleMultiplicativeExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2878:2: ()
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2879:5: 
+            	    // InternalScope.g:2878:2: ()
+            	    // InternalScope.g:2879:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -8173,13 +8173,13 @@ public final EObject ruleAdditiveExpression() throws RecognitionException {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2884:2: ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2885:1: ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) )
+            	    // InternalScope.g:2884:2: ( ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) ) )
+            	    // InternalScope.g:2885:1: ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2885:1: ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2886:1: (lv_name_2_1= '+' | lv_name_2_2= '-' )
+            	    // InternalScope.g:2885:1: ( (lv_name_2_1= '+' | lv_name_2_2= '-' ) )
+            	    // InternalScope.g:2886:1: (lv_name_2_1= '+' | lv_name_2_2= '-' )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2886:1: (lv_name_2_1= '+' | lv_name_2_2= '-' )
+            	    // InternalScope.g:2886:1: (lv_name_2_1= '+' | lv_name_2_2= '-' )
             	    int alt49=2;
             	    int LA49_0 = input.LA(1);
 
@@ -8198,9 +8198,9 @@ else if ( (LA49_0==65) ) {
             	    }
             	    switch (alt49) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2887:3: lv_name_2_1= '+'
+            	            // InternalScope.g:2887:3: lv_name_2_1= '+'
             	            {
-            	            lv_name_2_1=(Token)match(input,64,FOLLOW_64_in_ruleAdditiveExpression6392); if (state.failed) return current;
+            	            lv_name_2_1=(Token)match(input,64,FOLLOW_51); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_name_2_1, grammarAccess.getAdditiveExpressionAccess().getNamePlusSignKeyword_1_1_0_0());
@@ -8218,9 +8218,9 @@ else if ( (LA49_0==65) ) {
             	            }
             	            break;
             	        case 2 :
-            	            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2899:8: lv_name_2_2= '-'
+            	            // InternalScope.g:2899:8: lv_name_2_2= '-'
             	            {
-            	            lv_name_2_2=(Token)match(input,65,FOLLOW_65_in_ruleAdditiveExpression6421); if (state.failed) return current;
+            	            lv_name_2_2=(Token)match(input,65,FOLLOW_51); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_name_2_2, grammarAccess.getAdditiveExpressionAccess().getNameHyphenMinusKeyword_1_1_0_1());
@@ -8246,18 +8246,18 @@ else if ( (LA49_0==65) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2914:2: ( (lv_params_3_0= ruleMultiplicativeExpression ) )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2915:1: (lv_params_3_0= ruleMultiplicativeExpression )
+            	    // InternalScope.g:2914:2: ( (lv_params_3_0= ruleMultiplicativeExpression ) )
+            	    // InternalScope.g:2915:1: (lv_params_3_0= ruleMultiplicativeExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2915:1: (lv_params_3_0= ruleMultiplicativeExpression )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2916:3: lv_params_3_0= ruleMultiplicativeExpression
+            	    // InternalScope.g:2915:1: (lv_params_3_0= ruleMultiplicativeExpression )
+            	    // InternalScope.g:2916:3: lv_params_3_0= ruleMultiplicativeExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getAdditiveExpressionAccess().getParamsMultiplicativeExpressionParserRuleCall_1_2_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleMultiplicativeExpression_in_ruleAdditiveExpression6458);
+            	    pushFollow(FOLLOW_58);
             	    lv_params_3_0=ruleMultiplicativeExpression();
 
             	    state._fsp--;
@@ -8271,7 +8271,7 @@ else if ( (LA49_0==65) ) {
             	             			current, 
             	             			"params",
             	              		lv_params_3_0, 
-            	              		"MultiplicativeExpression");
+            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.MultiplicativeExpression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -8313,7 +8313,7 @@ else if ( (LA49_0==65) ) {
 
 
     // $ANTLR start "entryRuleMultiplicativeExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2940:1: entryRuleMultiplicativeExpression returns [EObject current=null] : iv_ruleMultiplicativeExpression= ruleMultiplicativeExpression EOF ;
+    // InternalScope.g:2940:1: entryRuleMultiplicativeExpression returns [EObject current=null] : iv_ruleMultiplicativeExpression= ruleMultiplicativeExpression EOF ;
     public final EObject entryRuleMultiplicativeExpression() throws RecognitionException {
         EObject current = null;
 
@@ -8321,13 +8321,13 @@ public final EObject entryRuleMultiplicativeExpression() throws RecognitionExcep
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2941:2: (iv_ruleMultiplicativeExpression= ruleMultiplicativeExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2942:2: iv_ruleMultiplicativeExpression= ruleMultiplicativeExpression EOF
+            // InternalScope.g:2941:2: (iv_ruleMultiplicativeExpression= ruleMultiplicativeExpression EOF )
+            // InternalScope.g:2942:2: iv_ruleMultiplicativeExpression= ruleMultiplicativeExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getMultiplicativeExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleMultiplicativeExpression_in_entryRuleMultiplicativeExpression6496);
+            pushFollow(FOLLOW_1);
             iv_ruleMultiplicativeExpression=ruleMultiplicativeExpression();
 
             state._fsp--;
@@ -8335,7 +8335,7 @@ public final EObject entryRuleMultiplicativeExpression() throws RecognitionExcep
             if ( state.backtracking==0 ) {
                current =iv_ruleMultiplicativeExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleMultiplicativeExpression6506); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -8353,7 +8353,7 @@ public final EObject entryRuleMultiplicativeExpression() throws RecognitionExcep
 
 
     // $ANTLR start "ruleMultiplicativeExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2949:1: ruleMultiplicativeExpression returns [EObject current=null] : (this_UnaryOrInfixExpression_0= ruleUnaryOrInfixExpression ( () ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) ) ( (lv_params_3_0= ruleUnaryOrInfixExpression ) ) )* ) ;
+    // InternalScope.g:2949:1: ruleMultiplicativeExpression returns [EObject current=null] : (this_UnaryOrInfixExpression_0= ruleUnaryOrInfixExpression ( () ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) ) ( (lv_params_3_0= ruleUnaryOrInfixExpression ) ) )* ) ;
     public final EObject ruleMultiplicativeExpression() throws RecognitionException {
         EObject current = null;
 
@@ -8367,18 +8367,18 @@ public final EObject ruleMultiplicativeExpression() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2952:28: ( (this_UnaryOrInfixExpression_0= ruleUnaryOrInfixExpression ( () ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) ) ( (lv_params_3_0= ruleUnaryOrInfixExpression ) ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2953:1: (this_UnaryOrInfixExpression_0= ruleUnaryOrInfixExpression ( () ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) ) ( (lv_params_3_0= ruleUnaryOrInfixExpression ) ) )* )
+            // InternalScope.g:2952:28: ( (this_UnaryOrInfixExpression_0= ruleUnaryOrInfixExpression ( () ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) ) ( (lv_params_3_0= ruleUnaryOrInfixExpression ) ) )* ) )
+            // InternalScope.g:2953:1: (this_UnaryOrInfixExpression_0= ruleUnaryOrInfixExpression ( () ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) ) ( (lv_params_3_0= ruleUnaryOrInfixExpression ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2953:1: (this_UnaryOrInfixExpression_0= ruleUnaryOrInfixExpression ( () ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) ) ( (lv_params_3_0= ruleUnaryOrInfixExpression ) ) )* )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2954:5: this_UnaryOrInfixExpression_0= ruleUnaryOrInfixExpression ( () ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) ) ( (lv_params_3_0= ruleUnaryOrInfixExpression ) ) )*
+            // InternalScope.g:2953:1: (this_UnaryOrInfixExpression_0= ruleUnaryOrInfixExpression ( () ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) ) ( (lv_params_3_0= ruleUnaryOrInfixExpression ) ) )* )
+            // InternalScope.g:2954:5: this_UnaryOrInfixExpression_0= ruleUnaryOrInfixExpression ( () ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) ) ( (lv_params_3_0= ruleUnaryOrInfixExpression ) ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getMultiplicativeExpressionAccess().getUnaryOrInfixExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleUnaryOrInfixExpression_in_ruleMultiplicativeExpression6553);
+            pushFollow(FOLLOW_59);
             this_UnaryOrInfixExpression_0=ruleUnaryOrInfixExpression();
 
             state._fsp--;
@@ -8389,7 +8389,7 @@ public final EObject ruleMultiplicativeExpression() throws RecognitionException
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2962:1: ( () ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) ) ( (lv_params_3_0= ruleUnaryOrInfixExpression ) ) )*
+            // InternalScope.g:2962:1: ( () ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) ) ( (lv_params_3_0= ruleUnaryOrInfixExpression ) ) )*
             loop52:
             do {
                 int alt52=2;
@@ -8402,10 +8402,10 @@ public final EObject ruleMultiplicativeExpression() throws RecognitionException
 
                 switch (alt52) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2962:2: () ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) ) ( (lv_params_3_0= ruleUnaryOrInfixExpression ) )
+            	    // InternalScope.g:2962:2: () ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) ) ( (lv_params_3_0= ruleUnaryOrInfixExpression ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2962:2: ()
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2963:5: 
+            	    // InternalScope.g:2962:2: ()
+            	    // InternalScope.g:2963:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -8417,13 +8417,13 @@ public final EObject ruleMultiplicativeExpression() throws RecognitionException
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2968:2: ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2969:1: ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) )
+            	    // InternalScope.g:2968:2: ( ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) ) )
+            	    // InternalScope.g:2969:1: ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2969:1: ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2970:1: (lv_name_2_1= '*' | lv_name_2_2= '/' )
+            	    // InternalScope.g:2969:1: ( (lv_name_2_1= '*' | lv_name_2_2= '/' ) )
+            	    // InternalScope.g:2970:1: (lv_name_2_1= '*' | lv_name_2_2= '/' )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2970:1: (lv_name_2_1= '*' | lv_name_2_2= '/' )
+            	    // InternalScope.g:2970:1: (lv_name_2_1= '*' | lv_name_2_2= '/' )
             	    int alt51=2;
             	    int LA51_0 = input.LA(1);
 
@@ -8442,9 +8442,9 @@ else if ( (LA51_0==66) ) {
             	    }
             	    switch (alt51) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2971:3: lv_name_2_1= '*'
+            	            // InternalScope.g:2971:3: lv_name_2_1= '*'
             	            {
-            	            lv_name_2_1=(Token)match(input,30,FOLLOW_30_in_ruleMultiplicativeExpression6582); if (state.failed) return current;
+            	            lv_name_2_1=(Token)match(input,30,FOLLOW_51); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_name_2_1, grammarAccess.getMultiplicativeExpressionAccess().getNameAsteriskKeyword_1_1_0_0());
@@ -8462,9 +8462,9 @@ else if ( (LA51_0==66) ) {
             	            }
             	            break;
             	        case 2 :
-            	            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2983:8: lv_name_2_2= '/'
+            	            // InternalScope.g:2983:8: lv_name_2_2= '/'
             	            {
-            	            lv_name_2_2=(Token)match(input,66,FOLLOW_66_in_ruleMultiplicativeExpression6611); if (state.failed) return current;
+            	            lv_name_2_2=(Token)match(input,66,FOLLOW_51); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_name_2_2, grammarAccess.getMultiplicativeExpressionAccess().getNameSolidusKeyword_1_1_0_1());
@@ -8490,18 +8490,18 @@ else if ( (LA51_0==66) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2998:2: ( (lv_params_3_0= ruleUnaryOrInfixExpression ) )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2999:1: (lv_params_3_0= ruleUnaryOrInfixExpression )
+            	    // InternalScope.g:2998:2: ( (lv_params_3_0= ruleUnaryOrInfixExpression ) )
+            	    // InternalScope.g:2999:1: (lv_params_3_0= ruleUnaryOrInfixExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2999:1: (lv_params_3_0= ruleUnaryOrInfixExpression )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3000:3: lv_params_3_0= ruleUnaryOrInfixExpression
+            	    // InternalScope.g:2999:1: (lv_params_3_0= ruleUnaryOrInfixExpression )
+            	    // InternalScope.g:3000:3: lv_params_3_0= ruleUnaryOrInfixExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getMultiplicativeExpressionAccess().getParamsUnaryOrInfixExpressionParserRuleCall_1_2_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleUnaryOrInfixExpression_in_ruleMultiplicativeExpression6648);
+            	    pushFollow(FOLLOW_59);
             	    lv_params_3_0=ruleUnaryOrInfixExpression();
 
             	    state._fsp--;
@@ -8515,7 +8515,7 @@ else if ( (LA51_0==66) ) {
             	             			current, 
             	             			"params",
             	              		lv_params_3_0, 
-            	              		"UnaryOrInfixExpression");
+            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.UnaryOrInfixExpression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -8557,7 +8557,7 @@ else if ( (LA51_0==66) ) {
 
 
     // $ANTLR start "entryRuleUnaryOrInfixExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3024:1: entryRuleUnaryOrInfixExpression returns [EObject current=null] : iv_ruleUnaryOrInfixExpression= ruleUnaryOrInfixExpression EOF ;
+    // InternalScope.g:3024:1: entryRuleUnaryOrInfixExpression returns [EObject current=null] : iv_ruleUnaryOrInfixExpression= ruleUnaryOrInfixExpression EOF ;
     public final EObject entryRuleUnaryOrInfixExpression() throws RecognitionException {
         EObject current = null;
 
@@ -8565,13 +8565,13 @@ public final EObject entryRuleUnaryOrInfixExpression() throws RecognitionExcepti
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3025:2: (iv_ruleUnaryOrInfixExpression= ruleUnaryOrInfixExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3026:2: iv_ruleUnaryOrInfixExpression= ruleUnaryOrInfixExpression EOF
+            // InternalScope.g:3025:2: (iv_ruleUnaryOrInfixExpression= ruleUnaryOrInfixExpression EOF )
+            // InternalScope.g:3026:2: iv_ruleUnaryOrInfixExpression= ruleUnaryOrInfixExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getUnaryOrInfixExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleUnaryOrInfixExpression_in_entryRuleUnaryOrInfixExpression6686);
+            pushFollow(FOLLOW_1);
             iv_ruleUnaryOrInfixExpression=ruleUnaryOrInfixExpression();
 
             state._fsp--;
@@ -8579,7 +8579,7 @@ public final EObject entryRuleUnaryOrInfixExpression() throws RecognitionExcepti
             if ( state.backtracking==0 ) {
                current =iv_ruleUnaryOrInfixExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleUnaryOrInfixExpression6696); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -8597,7 +8597,7 @@ public final EObject entryRuleUnaryOrInfixExpression() throws RecognitionExcepti
 
 
     // $ANTLR start "ruleUnaryOrInfixExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3033:1: ruleUnaryOrInfixExpression returns [EObject current=null] : (this_UnaryExpression_0= ruleUnaryExpression | this_InfixExpression_1= ruleInfixExpression ) ;
+    // InternalScope.g:3033:1: ruleUnaryOrInfixExpression returns [EObject current=null] : (this_UnaryExpression_0= ruleUnaryExpression | this_InfixExpression_1= ruleInfixExpression ) ;
     public final EObject ruleUnaryOrInfixExpression() throws RecognitionException {
         EObject current = null;
 
@@ -8609,10 +8609,10 @@ public final EObject ruleUnaryOrInfixExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3036:28: ( (this_UnaryExpression_0= ruleUnaryExpression | this_InfixExpression_1= ruleInfixExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3037:1: (this_UnaryExpression_0= ruleUnaryExpression | this_InfixExpression_1= ruleInfixExpression )
+            // InternalScope.g:3036:28: ( (this_UnaryExpression_0= ruleUnaryExpression | this_InfixExpression_1= ruleInfixExpression ) )
+            // InternalScope.g:3037:1: (this_UnaryExpression_0= ruleUnaryExpression | this_InfixExpression_1= ruleInfixExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3037:1: (this_UnaryExpression_0= ruleUnaryExpression | this_InfixExpression_1= ruleInfixExpression )
+            // InternalScope.g:3037:1: (this_UnaryExpression_0= ruleUnaryExpression | this_InfixExpression_1= ruleInfixExpression )
             int alt53=2;
             int LA53_0 = input.LA(1);
 
@@ -8631,14 +8631,14 @@ else if ( ((LA53_0>=RULE_STRING && LA53_0<=RULE_ID)||LA53_0==20||LA53_0==25||(LA
             }
             switch (alt53) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3038:5: this_UnaryExpression_0= ruleUnaryExpression
+                    // InternalScope.g:3038:5: this_UnaryExpression_0= ruleUnaryExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getUnaryOrInfixExpressionAccess().getUnaryExpressionParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleUnaryExpression_in_ruleUnaryOrInfixExpression6743);
+                    pushFollow(FOLLOW_2);
                     this_UnaryExpression_0=ruleUnaryExpression();
 
                     state._fsp--;
@@ -8653,14 +8653,14 @@ else if ( ((LA53_0>=RULE_STRING && LA53_0<=RULE_ID)||LA53_0==20||LA53_0==25||(LA
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3048:5: this_InfixExpression_1= ruleInfixExpression
+                    // InternalScope.g:3048:5: this_InfixExpression_1= ruleInfixExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getUnaryOrInfixExpressionAccess().getInfixExpressionParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleInfixExpression_in_ruleUnaryOrInfixExpression6770);
+                    pushFollow(FOLLOW_2);
                     this_InfixExpression_1=ruleInfixExpression();
 
                     state._fsp--;
@@ -8697,7 +8697,7 @@ else if ( ((LA53_0>=RULE_STRING && LA53_0<=RULE_ID)||LA53_0==20||LA53_0==25||(LA
 
 
     // $ANTLR start "entryRuleUnaryExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3064:1: entryRuleUnaryExpression returns [EObject current=null] : iv_ruleUnaryExpression= ruleUnaryExpression EOF ;
+    // InternalScope.g:3064:1: entryRuleUnaryExpression returns [EObject current=null] : iv_ruleUnaryExpression= ruleUnaryExpression EOF ;
     public final EObject entryRuleUnaryExpression() throws RecognitionException {
         EObject current = null;
 
@@ -8705,13 +8705,13 @@ public final EObject entryRuleUnaryExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3065:2: (iv_ruleUnaryExpression= ruleUnaryExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3066:2: iv_ruleUnaryExpression= ruleUnaryExpression EOF
+            // InternalScope.g:3065:2: (iv_ruleUnaryExpression= ruleUnaryExpression EOF )
+            // InternalScope.g:3066:2: iv_ruleUnaryExpression= ruleUnaryExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getUnaryExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleUnaryExpression_in_entryRuleUnaryExpression6805);
+            pushFollow(FOLLOW_1);
             iv_ruleUnaryExpression=ruleUnaryExpression();
 
             state._fsp--;
@@ -8719,7 +8719,7 @@ public final EObject entryRuleUnaryExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleUnaryExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleUnaryExpression6815); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -8737,7 +8737,7 @@ public final EObject entryRuleUnaryExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleUnaryExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3073:1: ruleUnaryExpression returns [EObject current=null] : ( ( ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) ) ) ( (lv_params_1_0= ruleInfixExpression ) ) ) ;
+    // InternalScope.g:3073:1: ruleUnaryExpression returns [EObject current=null] : ( ( ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) ) ) ( (lv_params_1_0= ruleInfixExpression ) ) ) ;
     public final EObject ruleUnaryExpression() throws RecognitionException {
         EObject current = null;
 
@@ -8749,19 +8749,19 @@ public final EObject ruleUnaryExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3076:28: ( ( ( ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) ) ) ( (lv_params_1_0= ruleInfixExpression ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3077:1: ( ( ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) ) ) ( (lv_params_1_0= ruleInfixExpression ) ) )
+            // InternalScope.g:3076:28: ( ( ( ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) ) ) ( (lv_params_1_0= ruleInfixExpression ) ) ) )
+            // InternalScope.g:3077:1: ( ( ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) ) ) ( (lv_params_1_0= ruleInfixExpression ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3077:1: ( ( ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) ) ) ( (lv_params_1_0= ruleInfixExpression ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3077:2: ( ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) ) ) ( (lv_params_1_0= ruleInfixExpression ) )
+            // InternalScope.g:3077:1: ( ( ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) ) ) ( (lv_params_1_0= ruleInfixExpression ) ) )
+            // InternalScope.g:3077:2: ( ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) ) ) ( (lv_params_1_0= ruleInfixExpression ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3077:2: ( ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3078:1: ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) )
+            // InternalScope.g:3077:2: ( ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) ) )
+            // InternalScope.g:3078:1: ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3078:1: ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3079:1: (lv_name_0_1= '!' | lv_name_0_2= '-' )
+            // InternalScope.g:3078:1: ( (lv_name_0_1= '!' | lv_name_0_2= '-' ) )
+            // InternalScope.g:3079:1: (lv_name_0_1= '!' | lv_name_0_2= '-' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3079:1: (lv_name_0_1= '!' | lv_name_0_2= '-' )
+            // InternalScope.g:3079:1: (lv_name_0_1= '!' | lv_name_0_2= '-' )
             int alt54=2;
             int LA54_0 = input.LA(1);
 
@@ -8780,9 +8780,9 @@ else if ( (LA54_0==65) ) {
             }
             switch (alt54) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3080:3: lv_name_0_1= '!'
+                    // InternalScope.g:3080:3: lv_name_0_1= '!'
                     {
-                    lv_name_0_1=(Token)match(input,67,FOLLOW_67_in_ruleUnaryExpression6860); if (state.failed) return current;
+                    lv_name_0_1=(Token)match(input,67,FOLLOW_51); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_name_0_1, grammarAccess.getUnaryExpressionAccess().getNameExclamationMarkKeyword_0_0_0());
@@ -8800,9 +8800,9 @@ else if ( (LA54_0==65) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3092:8: lv_name_0_2= '-'
+                    // InternalScope.g:3092:8: lv_name_0_2= '-'
                     {
-                    lv_name_0_2=(Token)match(input,65,FOLLOW_65_in_ruleUnaryExpression6889); if (state.failed) return current;
+                    lv_name_0_2=(Token)match(input,65,FOLLOW_51); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_name_0_2, grammarAccess.getUnaryExpressionAccess().getNameHyphenMinusKeyword_0_0_1());
@@ -8828,18 +8828,18 @@ else if ( (LA54_0==65) ) {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3107:2: ( (lv_params_1_0= ruleInfixExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3108:1: (lv_params_1_0= ruleInfixExpression )
+            // InternalScope.g:3107:2: ( (lv_params_1_0= ruleInfixExpression ) )
+            // InternalScope.g:3108:1: (lv_params_1_0= ruleInfixExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3108:1: (lv_params_1_0= ruleInfixExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3109:3: lv_params_1_0= ruleInfixExpression
+            // InternalScope.g:3108:1: (lv_params_1_0= ruleInfixExpression )
+            // InternalScope.g:3109:3: lv_params_1_0= ruleInfixExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getUnaryExpressionAccess().getParamsInfixExpressionParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleInfixExpression_in_ruleUnaryExpression6926);
+            pushFollow(FOLLOW_2);
             lv_params_1_0=ruleInfixExpression();
 
             state._fsp--;
@@ -8853,7 +8853,7 @@ else if ( (LA54_0==65) ) {
                      			current, 
                      			"params",
                       		lv_params_1_0, 
-                      		"InfixExpression");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.InfixExpression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -8886,7 +8886,7 @@ else if ( (LA54_0==65) ) {
 
 
     // $ANTLR start "entryRuleInfixExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3133:1: entryRuleInfixExpression returns [EObject current=null] : iv_ruleInfixExpression= ruleInfixExpression EOF ;
+    // InternalScope.g:3133:1: entryRuleInfixExpression returns [EObject current=null] : iv_ruleInfixExpression= ruleInfixExpression EOF ;
     public final EObject entryRuleInfixExpression() throws RecognitionException {
         EObject current = null;
 
@@ -8894,13 +8894,13 @@ public final EObject entryRuleInfixExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3134:2: (iv_ruleInfixExpression= ruleInfixExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3135:2: iv_ruleInfixExpression= ruleInfixExpression EOF
+            // InternalScope.g:3134:2: (iv_ruleInfixExpression= ruleInfixExpression EOF )
+            // InternalScope.g:3135:2: iv_ruleInfixExpression= ruleInfixExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getInfixExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleInfixExpression_in_entryRuleInfixExpression6962);
+            pushFollow(FOLLOW_1);
             iv_ruleInfixExpression=ruleInfixExpression();
 
             state._fsp--;
@@ -8908,7 +8908,7 @@ public final EObject entryRuleInfixExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleInfixExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInfixExpression6972); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -8926,7 +8926,7 @@ public final EObject entryRuleInfixExpression() throws RecognitionException {
 
 
     // $ANTLR start "ruleInfixExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3142:1: ruleInfixExpression returns [EObject current=null] : (this_PrimaryExpression_0= rulePrimaryExpression ( ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' ) | ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) ) | ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' ) | ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' ) )* ) ;
+    // InternalScope.g:3142:1: ruleInfixExpression returns [EObject current=null] : (this_PrimaryExpression_0= rulePrimaryExpression ( ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' ) | ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) ) | ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' ) | ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' ) )* ) ;
     public final EObject ruleInfixExpression() throws RecognitionException {
         EObject current = null;
 
@@ -8971,18 +8971,18 @@ public final EObject ruleInfixExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3145:28: ( (this_PrimaryExpression_0= rulePrimaryExpression ( ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' ) | ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) ) | ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' ) | ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3146:1: (this_PrimaryExpression_0= rulePrimaryExpression ( ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' ) | ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) ) | ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' ) | ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' ) )* )
+            // InternalScope.g:3145:28: ( (this_PrimaryExpression_0= rulePrimaryExpression ( ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' ) | ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) ) | ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' ) | ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' ) )* ) )
+            // InternalScope.g:3146:1: (this_PrimaryExpression_0= rulePrimaryExpression ( ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' ) | ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) ) | ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' ) | ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3146:1: (this_PrimaryExpression_0= rulePrimaryExpression ( ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' ) | ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) ) | ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' ) | ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' ) )* )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3147:5: this_PrimaryExpression_0= rulePrimaryExpression ( ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' ) | ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) ) | ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' ) | ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' ) )*
+            // InternalScope.g:3146:1: (this_PrimaryExpression_0= rulePrimaryExpression ( ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' ) | ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) ) | ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' ) | ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' ) )* )
+            // InternalScope.g:3147:5: this_PrimaryExpression_0= rulePrimaryExpression ( ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' ) | ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) ) | ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' ) | ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' ) )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getInfixExpressionAccess().getPrimaryExpressionParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_rulePrimaryExpression_in_ruleInfixExpression7019);
+            pushFollow(FOLLOW_43);
             this_PrimaryExpression_0=rulePrimaryExpression();
 
             state._fsp--;
@@ -8993,7 +8993,7 @@ public final EObject ruleInfixExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3155:1: ( ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' ) | ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) ) | ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' ) | ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' ) )*
+            // InternalScope.g:3155:1: ( ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' ) | ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) ) | ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' ) | ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' ) )*
             loop59:
             do {
                 int alt59=5;
@@ -9047,13 +9047,13 @@ else if ( (LA59_4==25) ) {
 
                 switch (alt59) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3155:2: ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' )
+            	    // InternalScope.g:3155:2: ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3155:2: ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3155:3: () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')'
+            	    // InternalScope.g:3155:2: ( () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')' )
+            	    // InternalScope.g:3155:3: () otherlv_2= '.' ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )? otherlv_8= ')'
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3155:3: ()
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3156:5: 
+            	    // InternalScope.g:3155:3: ()
+            	    // InternalScope.g:3156:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -9065,24 +9065,24 @@ else if ( (LA59_4==25) ) {
 
             	    }
 
-            	    otherlv_2=(Token)match(input,45,FOLLOW_45_in_ruleInfixExpression7041); if (state.failed) return current;
+            	    otherlv_2=(Token)match(input,45,FOLLOW_3); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_2, grammarAccess.getInfixExpressionAccess().getFullStopKeyword_1_0_1());
             	          
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3165:1: ( (lv_name_3_0= ruleIdentifier ) )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3166:1: (lv_name_3_0= ruleIdentifier )
+            	    // InternalScope.g:3165:1: ( (lv_name_3_0= ruleIdentifier ) )
+            	    // InternalScope.g:3166:1: (lv_name_3_0= ruleIdentifier )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3166:1: (lv_name_3_0= ruleIdentifier )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3167:3: lv_name_3_0= ruleIdentifier
+            	    // InternalScope.g:3166:1: (lv_name_3_0= ruleIdentifier )
+            	    // InternalScope.g:3167:3: lv_name_3_0= ruleIdentifier
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getInfixExpressionAccess().getNameIdentifierParserRuleCall_1_0_2_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleIdentifier_in_ruleInfixExpression7062);
+            	    pushFollow(FOLLOW_30);
             	    lv_name_3_0=ruleIdentifier();
 
             	    state._fsp--;
@@ -9096,7 +9096,7 @@ else if ( (LA59_4==25) ) {
             	             			current, 
             	             			"name",
             	              		lv_name_3_0, 
-            	              		"Identifier");
+            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -9106,13 +9106,13 @@ else if ( (LA59_4==25) ) {
 
             	    }
 
-            	    otherlv_4=(Token)match(input,25,FOLLOW_25_in_ruleInfixExpression7074); if (state.failed) return current;
+            	    otherlv_4=(Token)match(input,25,FOLLOW_60); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_4, grammarAccess.getInfixExpressionAccess().getLeftParenthesisKeyword_1_0_3());
             	          
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3187:1: ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )?
+            	    // InternalScope.g:3187:1: ( ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )* )?
             	    int alt56=2;
             	    int LA56_0 = input.LA(1);
 
@@ -9121,20 +9121,20 @@ else if ( (LA59_4==25) ) {
             	    }
             	    switch (alt56) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3187:2: ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )*
+            	            // InternalScope.g:3187:2: ( (lv_params_5_0= ruleExpression ) ) (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )*
             	            {
-            	            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3187:2: ( (lv_params_5_0= ruleExpression ) )
-            	            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3188:1: (lv_params_5_0= ruleExpression )
+            	            // InternalScope.g:3187:2: ( (lv_params_5_0= ruleExpression ) )
+            	            // InternalScope.g:3188:1: (lv_params_5_0= ruleExpression )
             	            {
-            	            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3188:1: (lv_params_5_0= ruleExpression )
-            	            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3189:3: lv_params_5_0= ruleExpression
+            	            // InternalScope.g:3188:1: (lv_params_5_0= ruleExpression )
+            	            // InternalScope.g:3189:3: lv_params_5_0= ruleExpression
             	            {
             	            if ( state.backtracking==0 ) {
             	               
             	              	        newCompositeNode(grammarAccess.getInfixExpressionAccess().getParamsExpressionParserRuleCall_1_0_4_0_0()); 
             	              	    
             	            }
-            	            pushFollow(FOLLOW_ruleExpression_in_ruleInfixExpression7096);
+            	            pushFollow(FOLLOW_32);
             	            lv_params_5_0=ruleExpression();
 
             	            state._fsp--;
@@ -9148,7 +9148,7 @@ else if ( (LA59_4==25) ) {
             	                     			current, 
             	                     			"params",
             	                      		lv_params_5_0, 
-            	                      		"Expression");
+            	                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
             	              	        afterParserOrEnumRuleCall();
             	              	    
             	            }
@@ -9158,7 +9158,7 @@ else if ( (LA59_4==25) ) {
 
             	            }
 
-            	            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3205:2: (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )*
+            	            // InternalScope.g:3205:2: (otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) ) )*
             	            loop55:
             	            do {
             	                int alt55=2;
@@ -9171,26 +9171,26 @@ else if ( (LA59_4==25) ) {
 
             	                switch (alt55) {
             	            	case 1 :
-            	            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3205:4: otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) )
+            	            	    // InternalScope.g:3205:4: otherlv_6= ',' ( (lv_params_7_0= ruleExpression ) )
             	            	    {
-            	            	    otherlv_6=(Token)match(input,36,FOLLOW_36_in_ruleInfixExpression7109); if (state.failed) return current;
+            	            	    otherlv_6=(Token)match(input,36,FOLLOW_17); if (state.failed) return current;
             	            	    if ( state.backtracking==0 ) {
 
             	            	          	newLeafNode(otherlv_6, grammarAccess.getInfixExpressionAccess().getCommaKeyword_1_0_4_1_0());
             	            	          
             	            	    }
-            	            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3209:1: ( (lv_params_7_0= ruleExpression ) )
-            	            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3210:1: (lv_params_7_0= ruleExpression )
+            	            	    // InternalScope.g:3209:1: ( (lv_params_7_0= ruleExpression ) )
+            	            	    // InternalScope.g:3210:1: (lv_params_7_0= ruleExpression )
             	            	    {
-            	            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3210:1: (lv_params_7_0= ruleExpression )
-            	            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3211:3: lv_params_7_0= ruleExpression
+            	            	    // InternalScope.g:3210:1: (lv_params_7_0= ruleExpression )
+            	            	    // InternalScope.g:3211:3: lv_params_7_0= ruleExpression
             	            	    {
             	            	    if ( state.backtracking==0 ) {
             	            	       
             	            	      	        newCompositeNode(grammarAccess.getInfixExpressionAccess().getParamsExpressionParserRuleCall_1_0_4_1_1_0()); 
             	            	      	    
             	            	    }
-            	            	    pushFollow(FOLLOW_ruleExpression_in_ruleInfixExpression7130);
+            	            	    pushFollow(FOLLOW_32);
             	            	    lv_params_7_0=ruleExpression();
 
             	            	    state._fsp--;
@@ -9204,7 +9204,7 @@ else if ( (LA59_4==25) ) {
             	            	             			current, 
             	            	             			"params",
             	            	              		lv_params_7_0, 
-            	            	              		"Expression");
+            	            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
             	            	      	        afterParserOrEnumRuleCall();
             	            	      	    
             	            	    }
@@ -9229,7 +9229,7 @@ else if ( (LA59_4==25) ) {
 
             	    }
 
-            	    otherlv_8=(Token)match(input,26,FOLLOW_26_in_ruleInfixExpression7146); if (state.failed) return current;
+            	    otherlv_8=(Token)match(input,26,FOLLOW_43); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_8, grammarAccess.getInfixExpressionAccess().getRightParenthesisKeyword_1_0_5());
@@ -9242,13 +9242,13 @@ else if ( (LA59_4==25) ) {
             	    }
             	    break;
             	case 2 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3232:6: ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) )
+            	    // InternalScope.g:3232:6: ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3232:6: ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3232:7: () otherlv_10= '.' ( (lv_type_11_0= ruleType ) )
+            	    // InternalScope.g:3232:6: ( () otherlv_10= '.' ( (lv_type_11_0= ruleType ) ) )
+            	    // InternalScope.g:3232:7: () otherlv_10= '.' ( (lv_type_11_0= ruleType ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3232:7: ()
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3233:5: 
+            	    // InternalScope.g:3232:7: ()
+            	    // InternalScope.g:3233:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -9260,24 +9260,24 @@ else if ( (LA59_4==25) ) {
 
             	    }
 
-            	    otherlv_10=(Token)match(input,45,FOLLOW_45_in_ruleInfixExpression7175); if (state.failed) return current;
+            	    otherlv_10=(Token)match(input,45,FOLLOW_45); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_10, grammarAccess.getInfixExpressionAccess().getFullStopKeyword_1_1_1());
             	          
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3242:1: ( (lv_type_11_0= ruleType ) )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3243:1: (lv_type_11_0= ruleType )
+            	    // InternalScope.g:3242:1: ( (lv_type_11_0= ruleType ) )
+            	    // InternalScope.g:3243:1: (lv_type_11_0= ruleType )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3243:1: (lv_type_11_0= ruleType )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3244:3: lv_type_11_0= ruleType
+            	    // InternalScope.g:3243:1: (lv_type_11_0= ruleType )
+            	    // InternalScope.g:3244:3: lv_type_11_0= ruleType
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getInfixExpressionAccess().getTypeTypeParserRuleCall_1_1_2_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleType_in_ruleInfixExpression7196);
+            	    pushFollow(FOLLOW_43);
             	    lv_type_11_0=ruleType();
 
             	    state._fsp--;
@@ -9291,7 +9291,7 @@ else if ( (LA59_4==25) ) {
             	             			current, 
             	             			"type",
             	              		lv_type_11_0, 
-            	              		"Type");
+            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.Type");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -9308,13 +9308,13 @@ else if ( (LA59_4==25) ) {
             	    }
             	    break;
             	case 3 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3261:6: ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' )
+            	    // InternalScope.g:3261:6: ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3261:6: ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3261:7: () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')'
+            	    // InternalScope.g:3261:6: ( () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')' )
+            	    // InternalScope.g:3261:7: () otherlv_13= '.' ( (lv_name_14_0= 'typeSelect' ) ) otherlv_15= '(' ( (lv_type_16_0= ruleType ) ) otherlv_17= ')'
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3261:7: ()
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3262:5: 
+            	    // InternalScope.g:3261:7: ()
+            	    // InternalScope.g:3262:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -9326,19 +9326,19 @@ else if ( (LA59_4==25) ) {
 
             	    }
 
-            	    otherlv_13=(Token)match(input,45,FOLLOW_45_in_ruleInfixExpression7225); if (state.failed) return current;
+            	    otherlv_13=(Token)match(input,45,FOLLOW_61); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_13, grammarAccess.getInfixExpressionAccess().getFullStopKeyword_1_2_1());
             	          
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3271:1: ( (lv_name_14_0= 'typeSelect' ) )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3272:1: (lv_name_14_0= 'typeSelect' )
+            	    // InternalScope.g:3271:1: ( (lv_name_14_0= 'typeSelect' ) )
+            	    // InternalScope.g:3272:1: (lv_name_14_0= 'typeSelect' )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3272:1: (lv_name_14_0= 'typeSelect' )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3273:3: lv_name_14_0= 'typeSelect'
+            	    // InternalScope.g:3272:1: (lv_name_14_0= 'typeSelect' )
+            	    // InternalScope.g:3273:3: lv_name_14_0= 'typeSelect'
             	    {
-            	    lv_name_14_0=(Token)match(input,68,FOLLOW_68_in_ruleInfixExpression7243); if (state.failed) return current;
+            	    lv_name_14_0=(Token)match(input,68,FOLLOW_30); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	              newLeafNode(lv_name_14_0, grammarAccess.getInfixExpressionAccess().getNameTypeSelectKeyword_1_2_2_0());
@@ -9358,24 +9358,24 @@ else if ( (LA59_4==25) ) {
 
             	    }
 
-            	    otherlv_15=(Token)match(input,25,FOLLOW_25_in_ruleInfixExpression7268); if (state.failed) return current;
+            	    otherlv_15=(Token)match(input,25,FOLLOW_45); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_15, grammarAccess.getInfixExpressionAccess().getLeftParenthesisKeyword_1_2_3());
             	          
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3290:1: ( (lv_type_16_0= ruleType ) )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3291:1: (lv_type_16_0= ruleType )
+            	    // InternalScope.g:3290:1: ( (lv_type_16_0= ruleType ) )
+            	    // InternalScope.g:3291:1: (lv_type_16_0= ruleType )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3291:1: (lv_type_16_0= ruleType )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3292:3: lv_type_16_0= ruleType
+            	    // InternalScope.g:3291:1: (lv_type_16_0= ruleType )
+            	    // InternalScope.g:3292:3: lv_type_16_0= ruleType
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getInfixExpressionAccess().getTypeTypeParserRuleCall_1_2_4_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleType_in_ruleInfixExpression7289);
+            	    pushFollow(FOLLOW_20);
             	    lv_type_16_0=ruleType();
 
             	    state._fsp--;
@@ -9389,7 +9389,7 @@ else if ( (LA59_4==25) ) {
             	             			current, 
             	             			"type",
             	              		lv_type_16_0, 
-            	              		"Type");
+            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.Type");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -9399,7 +9399,7 @@ else if ( (LA59_4==25) ) {
 
             	    }
 
-            	    otherlv_17=(Token)match(input,26,FOLLOW_26_in_ruleInfixExpression7301); if (state.failed) return current;
+            	    otherlv_17=(Token)match(input,26,FOLLOW_43); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_17, grammarAccess.getInfixExpressionAccess().getRightParenthesisKeyword_1_2_5());
@@ -9412,13 +9412,13 @@ else if ( (LA59_4==25) ) {
             	    }
             	    break;
             	case 4 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3313:6: ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' )
+            	    // InternalScope.g:3313:6: ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3313:6: ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3313:7: () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')'
+            	    // InternalScope.g:3313:6: ( () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')' )
+            	    // InternalScope.g:3313:7: () otherlv_19= '.' ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) ) otherlv_21= '(' ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )? ( (lv_exp_24_0= ruleExpression ) ) otherlv_25= ')'
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3313:7: ()
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3314:5: 
+            	    // InternalScope.g:3313:7: ()
+            	    // InternalScope.g:3314:5: 
             	    {
             	    if ( state.backtracking==0 ) {
 
@@ -9430,19 +9430,19 @@ else if ( (LA59_4==25) ) {
 
             	    }
 
-            	    otherlv_19=(Token)match(input,45,FOLLOW_45_in_ruleInfixExpression7330); if (state.failed) return current;
+            	    otherlv_19=(Token)match(input,45,FOLLOW_62); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_19, grammarAccess.getInfixExpressionAccess().getFullStopKeyword_1_3_1());
             	          
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3323:1: ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3324:1: ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) )
+            	    // InternalScope.g:3323:1: ( ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) ) )
+            	    // InternalScope.g:3324:1: ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3324:1: ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3325:1: (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' )
+            	    // InternalScope.g:3324:1: ( (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' ) )
+            	    // InternalScope.g:3325:1: (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3325:1: (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' )
+            	    // InternalScope.g:3325:1: (lv_name_20_1= 'collect' | lv_name_20_2= 'select' | lv_name_20_3= 'selectFirst' | lv_name_20_4= 'reject' | lv_name_20_5= 'exists' | lv_name_20_6= 'notExists' | lv_name_20_7= 'sortBy' | lv_name_20_8= 'forAll' )
             	    int alt57=8;
             	    switch ( input.LA(1) ) {
             	    case 69:
@@ -9495,9 +9495,9 @@ else if ( (LA59_4==25) ) {
 
             	    switch (alt57) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3326:3: lv_name_20_1= 'collect'
+            	            // InternalScope.g:3326:3: lv_name_20_1= 'collect'
             	            {
-            	            lv_name_20_1=(Token)match(input,69,FOLLOW_69_in_ruleInfixExpression7350); if (state.failed) return current;
+            	            lv_name_20_1=(Token)match(input,69,FOLLOW_30); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_name_20_1, grammarAccess.getInfixExpressionAccess().getNameCollectKeyword_1_3_2_0_0());
@@ -9515,9 +9515,9 @@ else if ( (LA59_4==25) ) {
             	            }
             	            break;
             	        case 2 :
-            	            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3338:8: lv_name_20_2= 'select'
+            	            // InternalScope.g:3338:8: lv_name_20_2= 'select'
             	            {
-            	            lv_name_20_2=(Token)match(input,70,FOLLOW_70_in_ruleInfixExpression7379); if (state.failed) return current;
+            	            lv_name_20_2=(Token)match(input,70,FOLLOW_30); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_name_20_2, grammarAccess.getInfixExpressionAccess().getNameSelectKeyword_1_3_2_0_1());
@@ -9535,9 +9535,9 @@ else if ( (LA59_4==25) ) {
             	            }
             	            break;
             	        case 3 :
-            	            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3350:8: lv_name_20_3= 'selectFirst'
+            	            // InternalScope.g:3350:8: lv_name_20_3= 'selectFirst'
             	            {
-            	            lv_name_20_3=(Token)match(input,71,FOLLOW_71_in_ruleInfixExpression7408); if (state.failed) return current;
+            	            lv_name_20_3=(Token)match(input,71,FOLLOW_30); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_name_20_3, grammarAccess.getInfixExpressionAccess().getNameSelectFirstKeyword_1_3_2_0_2());
@@ -9555,9 +9555,9 @@ else if ( (LA59_4==25) ) {
             	            }
             	            break;
             	        case 4 :
-            	            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3362:8: lv_name_20_4= 'reject'
+            	            // InternalScope.g:3362:8: lv_name_20_4= 'reject'
             	            {
-            	            lv_name_20_4=(Token)match(input,72,FOLLOW_72_in_ruleInfixExpression7437); if (state.failed) return current;
+            	            lv_name_20_4=(Token)match(input,72,FOLLOW_30); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_name_20_4, grammarAccess.getInfixExpressionAccess().getNameRejectKeyword_1_3_2_0_3());
@@ -9575,9 +9575,9 @@ else if ( (LA59_4==25) ) {
             	            }
             	            break;
             	        case 5 :
-            	            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3374:8: lv_name_20_5= 'exists'
+            	            // InternalScope.g:3374:8: lv_name_20_5= 'exists'
             	            {
-            	            lv_name_20_5=(Token)match(input,73,FOLLOW_73_in_ruleInfixExpression7466); if (state.failed) return current;
+            	            lv_name_20_5=(Token)match(input,73,FOLLOW_30); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_name_20_5, grammarAccess.getInfixExpressionAccess().getNameExistsKeyword_1_3_2_0_4());
@@ -9595,9 +9595,9 @@ else if ( (LA59_4==25) ) {
             	            }
             	            break;
             	        case 6 :
-            	            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3386:8: lv_name_20_6= 'notExists'
+            	            // InternalScope.g:3386:8: lv_name_20_6= 'notExists'
             	            {
-            	            lv_name_20_6=(Token)match(input,74,FOLLOW_74_in_ruleInfixExpression7495); if (state.failed) return current;
+            	            lv_name_20_6=(Token)match(input,74,FOLLOW_30); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_name_20_6, grammarAccess.getInfixExpressionAccess().getNameNotExistsKeyword_1_3_2_0_5());
@@ -9615,9 +9615,9 @@ else if ( (LA59_4==25) ) {
             	            }
             	            break;
             	        case 7 :
-            	            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3398:8: lv_name_20_7= 'sortBy'
+            	            // InternalScope.g:3398:8: lv_name_20_7= 'sortBy'
             	            {
-            	            lv_name_20_7=(Token)match(input,75,FOLLOW_75_in_ruleInfixExpression7524); if (state.failed) return current;
+            	            lv_name_20_7=(Token)match(input,75,FOLLOW_30); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_name_20_7, grammarAccess.getInfixExpressionAccess().getNameSortByKeyword_1_3_2_0_6());
@@ -9635,9 +9635,9 @@ else if ( (LA59_4==25) ) {
             	            }
             	            break;
             	        case 8 :
-            	            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3410:8: lv_name_20_8= 'forAll'
+            	            // InternalScope.g:3410:8: lv_name_20_8= 'forAll'
             	            {
-            	            lv_name_20_8=(Token)match(input,76,FOLLOW_76_in_ruleInfixExpression7553); if (state.failed) return current;
+            	            lv_name_20_8=(Token)match(input,76,FOLLOW_30); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                      newLeafNode(lv_name_20_8, grammarAccess.getInfixExpressionAccess().getNameForAllKeyword_1_3_2_0_7());
@@ -9663,13 +9663,13 @@ else if ( (LA59_4==25) ) {
 
             	    }
 
-            	    otherlv_21=(Token)match(input,25,FOLLOW_25_in_ruleInfixExpression7581); if (state.failed) return current;
+            	    otherlv_21=(Token)match(input,25,FOLLOW_17); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_21, grammarAccess.getInfixExpressionAccess().getLeftParenthesisKeyword_1_3_3());
             	          
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3429:1: ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )?
+            	    // InternalScope.g:3429:1: ( ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|' )?
             	    int alt58=2;
             	    int LA58_0 = input.LA(1);
 
@@ -9682,20 +9682,20 @@ else if ( (LA59_4==25) ) {
             	    }
             	    switch (alt58) {
             	        case 1 :
-            	            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3429:2: ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|'
+            	            // InternalScope.g:3429:2: ( (lv_var_22_0= ruleIdentifier ) ) otherlv_23= '|'
             	            {
-            	            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3429:2: ( (lv_var_22_0= ruleIdentifier ) )
-            	            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3430:1: (lv_var_22_0= ruleIdentifier )
+            	            // InternalScope.g:3429:2: ( (lv_var_22_0= ruleIdentifier ) )
+            	            // InternalScope.g:3430:1: (lv_var_22_0= ruleIdentifier )
             	            {
-            	            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3430:1: (lv_var_22_0= ruleIdentifier )
-            	            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3431:3: lv_var_22_0= ruleIdentifier
+            	            // InternalScope.g:3430:1: (lv_var_22_0= ruleIdentifier )
+            	            // InternalScope.g:3431:3: lv_var_22_0= ruleIdentifier
             	            {
             	            if ( state.backtracking==0 ) {
             	               
             	              	        newCompositeNode(grammarAccess.getInfixExpressionAccess().getVarIdentifierParserRuleCall_1_3_4_0_0()); 
             	              	    
             	            }
-            	            pushFollow(FOLLOW_ruleIdentifier_in_ruleInfixExpression7603);
+            	            pushFollow(FOLLOW_41);
             	            lv_var_22_0=ruleIdentifier();
 
             	            state._fsp--;
@@ -9709,7 +9709,7 @@ else if ( (LA59_4==25) ) {
             	                     			current, 
             	                     			"var",
             	                      		lv_var_22_0, 
-            	                      		"Identifier");
+            	                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
             	              	        afterParserOrEnumRuleCall();
             	              	    
             	            }
@@ -9719,7 +9719,7 @@ else if ( (LA59_4==25) ) {
 
             	            }
 
-            	            otherlv_23=(Token)match(input,33,FOLLOW_33_in_ruleInfixExpression7615); if (state.failed) return current;
+            	            otherlv_23=(Token)match(input,33,FOLLOW_17); if (state.failed) return current;
             	            if ( state.backtracking==0 ) {
 
             	                  	newLeafNode(otherlv_23, grammarAccess.getInfixExpressionAccess().getVerticalLineKeyword_1_3_4_1());
@@ -9731,18 +9731,18 @@ else if ( (LA59_4==25) ) {
 
             	    }
 
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3451:3: ( (lv_exp_24_0= ruleExpression ) )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3452:1: (lv_exp_24_0= ruleExpression )
+            	    // InternalScope.g:3451:3: ( (lv_exp_24_0= ruleExpression ) )
+            	    // InternalScope.g:3452:1: (lv_exp_24_0= ruleExpression )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3452:1: (lv_exp_24_0= ruleExpression )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3453:3: lv_exp_24_0= ruleExpression
+            	    // InternalScope.g:3452:1: (lv_exp_24_0= ruleExpression )
+            	    // InternalScope.g:3453:3: lv_exp_24_0= ruleExpression
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getInfixExpressionAccess().getExpExpressionParserRuleCall_1_3_5_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleExpression_in_ruleInfixExpression7638);
+            	    pushFollow(FOLLOW_20);
             	    lv_exp_24_0=ruleExpression();
 
             	    state._fsp--;
@@ -9756,7 +9756,7 @@ else if ( (LA59_4==25) ) {
             	             			current, 
             	             			"exp",
             	              		lv_exp_24_0, 
-            	              		"Expression");
+            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -9766,7 +9766,7 @@ else if ( (LA59_4==25) ) {
 
             	    }
 
-            	    otherlv_25=(Token)match(input,26,FOLLOW_26_in_ruleInfixExpression7650); if (state.failed) return current;
+            	    otherlv_25=(Token)match(input,26,FOLLOW_43); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_25, grammarAccess.getInfixExpressionAccess().getRightParenthesisKeyword_1_3_6());
@@ -9807,7 +9807,7 @@ else if ( (LA59_4==25) ) {
 
 
     // $ANTLR start "entryRulePrimaryExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3481:1: entryRulePrimaryExpression returns [EObject current=null] : iv_rulePrimaryExpression= rulePrimaryExpression EOF ;
+    // InternalScope.g:3481:1: entryRulePrimaryExpression returns [EObject current=null] : iv_rulePrimaryExpression= rulePrimaryExpression EOF ;
     public final EObject entryRulePrimaryExpression() throws RecognitionException {
         EObject current = null;
 
@@ -9815,13 +9815,13 @@ public final EObject entryRulePrimaryExpression() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3482:2: (iv_rulePrimaryExpression= rulePrimaryExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3483:2: iv_rulePrimaryExpression= rulePrimaryExpression EOF
+            // InternalScope.g:3482:2: (iv_rulePrimaryExpression= rulePrimaryExpression EOF )
+            // InternalScope.g:3483:2: iv_rulePrimaryExpression= rulePrimaryExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getPrimaryExpressionRule()); 
             }
-            pushFollow(FOLLOW_rulePrimaryExpression_in_entryRulePrimaryExpression7689);
+            pushFollow(FOLLOW_1);
             iv_rulePrimaryExpression=rulePrimaryExpression();
 
             state._fsp--;
@@ -9829,7 +9829,7 @@ public final EObject entryRulePrimaryExpression() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_rulePrimaryExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRulePrimaryExpression7699); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -9847,7 +9847,7 @@ public final EObject entryRulePrimaryExpression() throws RecognitionException {
 
 
     // $ANTLR start "rulePrimaryExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3490:1: rulePrimaryExpression returns [EObject current=null] : (this_Literal_0= ruleLiteral | this_FeatureCall_1= ruleFeatureCall | this_ListLiteral_2= ruleListLiteral | this_ConstructorCallExpression_3= ruleConstructorCallExpression | this_GlobalVarExpression_4= ruleGlobalVarExpression | this_ParanthesizedExpression_5= ruleParanthesizedExpression ) ;
+    // InternalScope.g:3490:1: rulePrimaryExpression returns [EObject current=null] : (this_Literal_0= ruleLiteral | this_FeatureCall_1= ruleFeatureCall | this_ListLiteral_2= ruleListLiteral | this_ConstructorCallExpression_3= ruleConstructorCallExpression | this_GlobalVarExpression_4= ruleGlobalVarExpression | this_ParanthesizedExpression_5= ruleParanthesizedExpression ) ;
     public final EObject rulePrimaryExpression() throws RecognitionException {
         EObject current = null;
 
@@ -9867,10 +9867,10 @@ public final EObject rulePrimaryExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3493:28: ( (this_Literal_0= ruleLiteral | this_FeatureCall_1= ruleFeatureCall | this_ListLiteral_2= ruleListLiteral | this_ConstructorCallExpression_3= ruleConstructorCallExpression | this_GlobalVarExpression_4= ruleGlobalVarExpression | this_ParanthesizedExpression_5= ruleParanthesizedExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3494:1: (this_Literal_0= ruleLiteral | this_FeatureCall_1= ruleFeatureCall | this_ListLiteral_2= ruleListLiteral | this_ConstructorCallExpression_3= ruleConstructorCallExpression | this_GlobalVarExpression_4= ruleGlobalVarExpression | this_ParanthesizedExpression_5= ruleParanthesizedExpression )
+            // InternalScope.g:3493:28: ( (this_Literal_0= ruleLiteral | this_FeatureCall_1= ruleFeatureCall | this_ListLiteral_2= ruleListLiteral | this_ConstructorCallExpression_3= ruleConstructorCallExpression | this_GlobalVarExpression_4= ruleGlobalVarExpression | this_ParanthesizedExpression_5= ruleParanthesizedExpression ) )
+            // InternalScope.g:3494:1: (this_Literal_0= ruleLiteral | this_FeatureCall_1= ruleFeatureCall | this_ListLiteral_2= ruleListLiteral | this_ConstructorCallExpression_3= ruleConstructorCallExpression | this_GlobalVarExpression_4= ruleGlobalVarExpression | this_ParanthesizedExpression_5= ruleParanthesizedExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3494:1: (this_Literal_0= ruleLiteral | this_FeatureCall_1= ruleFeatureCall | this_ListLiteral_2= ruleListLiteral | this_ConstructorCallExpression_3= ruleConstructorCallExpression | this_GlobalVarExpression_4= ruleGlobalVarExpression | this_ParanthesizedExpression_5= ruleParanthesizedExpression )
+            // InternalScope.g:3494:1: (this_Literal_0= ruleLiteral | this_FeatureCall_1= ruleFeatureCall | this_ListLiteral_2= ruleListLiteral | this_ConstructorCallExpression_3= ruleConstructorCallExpression | this_GlobalVarExpression_4= ruleGlobalVarExpression | this_ParanthesizedExpression_5= ruleParanthesizedExpression )
             int alt60=6;
             switch ( input.LA(1) ) {
             case RULE_STRING:
@@ -9930,14 +9930,14 @@ public final EObject rulePrimaryExpression() throws RecognitionException {
 
             switch (alt60) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3495:5: this_Literal_0= ruleLiteral
+                    // InternalScope.g:3495:5: this_Literal_0= ruleLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getPrimaryExpressionAccess().getLiteralParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleLiteral_in_rulePrimaryExpression7746);
+                    pushFollow(FOLLOW_2);
                     this_Literal_0=ruleLiteral();
 
                     state._fsp--;
@@ -9952,14 +9952,14 @@ public final EObject rulePrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3505:5: this_FeatureCall_1= ruleFeatureCall
+                    // InternalScope.g:3505:5: this_FeatureCall_1= ruleFeatureCall
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getPrimaryExpressionAccess().getFeatureCallParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleFeatureCall_in_rulePrimaryExpression7773);
+                    pushFollow(FOLLOW_2);
                     this_FeatureCall_1=ruleFeatureCall();
 
                     state._fsp--;
@@ -9974,14 +9974,14 @@ public final EObject rulePrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3515:5: this_ListLiteral_2= ruleListLiteral
+                    // InternalScope.g:3515:5: this_ListLiteral_2= ruleListLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getPrimaryExpressionAccess().getListLiteralParserRuleCall_2()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleListLiteral_in_rulePrimaryExpression7800);
+                    pushFollow(FOLLOW_2);
                     this_ListLiteral_2=ruleListLiteral();
 
                     state._fsp--;
@@ -9996,14 +9996,14 @@ public final EObject rulePrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3525:5: this_ConstructorCallExpression_3= ruleConstructorCallExpression
+                    // InternalScope.g:3525:5: this_ConstructorCallExpression_3= ruleConstructorCallExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getPrimaryExpressionAccess().getConstructorCallExpressionParserRuleCall_3()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleConstructorCallExpression_in_rulePrimaryExpression7827);
+                    pushFollow(FOLLOW_2);
                     this_ConstructorCallExpression_3=ruleConstructorCallExpression();
 
                     state._fsp--;
@@ -10018,14 +10018,14 @@ public final EObject rulePrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3535:5: this_GlobalVarExpression_4= ruleGlobalVarExpression
+                    // InternalScope.g:3535:5: this_GlobalVarExpression_4= ruleGlobalVarExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getPrimaryExpressionAccess().getGlobalVarExpressionParserRuleCall_4()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleGlobalVarExpression_in_rulePrimaryExpression7854);
+                    pushFollow(FOLLOW_2);
                     this_GlobalVarExpression_4=ruleGlobalVarExpression();
 
                     state._fsp--;
@@ -10040,14 +10040,14 @@ public final EObject rulePrimaryExpression() throws RecognitionException {
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3545:5: this_ParanthesizedExpression_5= ruleParanthesizedExpression
+                    // InternalScope.g:3545:5: this_ParanthesizedExpression_5= ruleParanthesizedExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getPrimaryExpressionAccess().getParanthesizedExpressionParserRuleCall_5()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleParanthesizedExpression_in_rulePrimaryExpression7881);
+                    pushFollow(FOLLOW_2);
                     this_ParanthesizedExpression_5=ruleParanthesizedExpression();
 
                     state._fsp--;
@@ -10084,7 +10084,7 @@ public final EObject rulePrimaryExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleLiteral"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3561:1: entryRuleLiteral returns [EObject current=null] : iv_ruleLiteral= ruleLiteral EOF ;
+    // InternalScope.g:3561:1: entryRuleLiteral returns [EObject current=null] : iv_ruleLiteral= ruleLiteral EOF ;
     public final EObject entryRuleLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -10092,13 +10092,13 @@ public final EObject entryRuleLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3562:2: (iv_ruleLiteral= ruleLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3563:2: iv_ruleLiteral= ruleLiteral EOF
+            // InternalScope.g:3562:2: (iv_ruleLiteral= ruleLiteral EOF )
+            // InternalScope.g:3563:2: iv_ruleLiteral= ruleLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleLiteral_in_entryRuleLiteral7916);
+            pushFollow(FOLLOW_1);
             iv_ruleLiteral=ruleLiteral();
 
             state._fsp--;
@@ -10106,7 +10106,7 @@ public final EObject entryRuleLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleLiteral7926); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -10124,7 +10124,7 @@ public final EObject entryRuleLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleLiteral"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3570:1: ruleLiteral returns [EObject current=null] : (this_BooleanLiteral_0= ruleBooleanLiteral | this_IntegerLiteral_1= ruleIntegerLiteral | this_NullLiteral_2= ruleNullLiteral | this_RealLiteral_3= ruleRealLiteral | this_StringLiteral_4= ruleStringLiteral ) ;
+    // InternalScope.g:3570:1: ruleLiteral returns [EObject current=null] : (this_BooleanLiteral_0= ruleBooleanLiteral | this_IntegerLiteral_1= ruleIntegerLiteral | this_NullLiteral_2= ruleNullLiteral | this_RealLiteral_3= ruleRealLiteral | this_StringLiteral_4= ruleStringLiteral ) ;
     public final EObject ruleLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -10142,10 +10142,10 @@ public final EObject ruleLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3573:28: ( (this_BooleanLiteral_0= ruleBooleanLiteral | this_IntegerLiteral_1= ruleIntegerLiteral | this_NullLiteral_2= ruleNullLiteral | this_RealLiteral_3= ruleRealLiteral | this_StringLiteral_4= ruleStringLiteral ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3574:1: (this_BooleanLiteral_0= ruleBooleanLiteral | this_IntegerLiteral_1= ruleIntegerLiteral | this_NullLiteral_2= ruleNullLiteral | this_RealLiteral_3= ruleRealLiteral | this_StringLiteral_4= ruleStringLiteral )
+            // InternalScope.g:3573:28: ( (this_BooleanLiteral_0= ruleBooleanLiteral | this_IntegerLiteral_1= ruleIntegerLiteral | this_NullLiteral_2= ruleNullLiteral | this_RealLiteral_3= ruleRealLiteral | this_StringLiteral_4= ruleStringLiteral ) )
+            // InternalScope.g:3574:1: (this_BooleanLiteral_0= ruleBooleanLiteral | this_IntegerLiteral_1= ruleIntegerLiteral | this_NullLiteral_2= ruleNullLiteral | this_RealLiteral_3= ruleRealLiteral | this_StringLiteral_4= ruleStringLiteral )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3574:1: (this_BooleanLiteral_0= ruleBooleanLiteral | this_IntegerLiteral_1= ruleIntegerLiteral | this_NullLiteral_2= ruleNullLiteral | this_RealLiteral_3= ruleRealLiteral | this_StringLiteral_4= ruleStringLiteral )
+            // InternalScope.g:3574:1: (this_BooleanLiteral_0= ruleBooleanLiteral | this_IntegerLiteral_1= ruleIntegerLiteral | this_NullLiteral_2= ruleNullLiteral | this_RealLiteral_3= ruleRealLiteral | this_StringLiteral_4= ruleStringLiteral )
             int alt61=5;
             switch ( input.LA(1) ) {
             case 77:
@@ -10184,14 +10184,14 @@ public final EObject ruleLiteral() throws RecognitionException {
 
             switch (alt61) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3575:5: this_BooleanLiteral_0= ruleBooleanLiteral
+                    // InternalScope.g:3575:5: this_BooleanLiteral_0= ruleBooleanLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getLiteralAccess().getBooleanLiteralParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleBooleanLiteral_in_ruleLiteral7973);
+                    pushFollow(FOLLOW_2);
                     this_BooleanLiteral_0=ruleBooleanLiteral();
 
                     state._fsp--;
@@ -10206,14 +10206,14 @@ public final EObject ruleLiteral() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3585:5: this_IntegerLiteral_1= ruleIntegerLiteral
+                    // InternalScope.g:3585:5: this_IntegerLiteral_1= ruleIntegerLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getLiteralAccess().getIntegerLiteralParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleIntegerLiteral_in_ruleLiteral8000);
+                    pushFollow(FOLLOW_2);
                     this_IntegerLiteral_1=ruleIntegerLiteral();
 
                     state._fsp--;
@@ -10228,14 +10228,14 @@ public final EObject ruleLiteral() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3595:5: this_NullLiteral_2= ruleNullLiteral
+                    // InternalScope.g:3595:5: this_NullLiteral_2= ruleNullLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getLiteralAccess().getNullLiteralParserRuleCall_2()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleNullLiteral_in_ruleLiteral8027);
+                    pushFollow(FOLLOW_2);
                     this_NullLiteral_2=ruleNullLiteral();
 
                     state._fsp--;
@@ -10250,14 +10250,14 @@ public final EObject ruleLiteral() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3605:5: this_RealLiteral_3= ruleRealLiteral
+                    // InternalScope.g:3605:5: this_RealLiteral_3= ruleRealLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getLiteralAccess().getRealLiteralParserRuleCall_3()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleRealLiteral_in_ruleLiteral8054);
+                    pushFollow(FOLLOW_2);
                     this_RealLiteral_3=ruleRealLiteral();
 
                     state._fsp--;
@@ -10272,14 +10272,14 @@ public final EObject ruleLiteral() throws RecognitionException {
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3615:5: this_StringLiteral_4= ruleStringLiteral
+                    // InternalScope.g:3615:5: this_StringLiteral_4= ruleStringLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getLiteralAccess().getStringLiteralParserRuleCall_4()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleStringLiteral_in_ruleLiteral8081);
+                    pushFollow(FOLLOW_2);
                     this_StringLiteral_4=ruleStringLiteral();
 
                     state._fsp--;
@@ -10316,7 +10316,7 @@ public final EObject ruleLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleBooleanLiteral"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3631:1: entryRuleBooleanLiteral returns [EObject current=null] : iv_ruleBooleanLiteral= ruleBooleanLiteral EOF ;
+    // InternalScope.g:3631:1: entryRuleBooleanLiteral returns [EObject current=null] : iv_ruleBooleanLiteral= ruleBooleanLiteral EOF ;
     public final EObject entryRuleBooleanLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -10324,13 +10324,13 @@ public final EObject entryRuleBooleanLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3632:2: (iv_ruleBooleanLiteral= ruleBooleanLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3633:2: iv_ruleBooleanLiteral= ruleBooleanLiteral EOF
+            // InternalScope.g:3632:2: (iv_ruleBooleanLiteral= ruleBooleanLiteral EOF )
+            // InternalScope.g:3633:2: iv_ruleBooleanLiteral= ruleBooleanLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getBooleanLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleBooleanLiteral_in_entryRuleBooleanLiteral8116);
+            pushFollow(FOLLOW_1);
             iv_ruleBooleanLiteral=ruleBooleanLiteral();
 
             state._fsp--;
@@ -10338,7 +10338,7 @@ public final EObject entryRuleBooleanLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleBooleanLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleBooleanLiteral8126); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -10356,7 +10356,7 @@ public final EObject entryRuleBooleanLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleBooleanLiteral"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3640:1: ruleBooleanLiteral returns [EObject current=null] : ( ( (lv_val_0_1= 'true' | lv_val_0_2= 'false' ) ) ) ;
+    // InternalScope.g:3640:1: ruleBooleanLiteral returns [EObject current=null] : ( ( (lv_val_0_1= 'true' | lv_val_0_2= 'false' ) ) ) ;
     public final EObject ruleBooleanLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -10366,16 +10366,16 @@ public final EObject ruleBooleanLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3643:28: ( ( ( (lv_val_0_1= 'true' | lv_val_0_2= 'false' ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3644:1: ( ( (lv_val_0_1= 'true' | lv_val_0_2= 'false' ) ) )
+            // InternalScope.g:3643:28: ( ( ( (lv_val_0_1= 'true' | lv_val_0_2= 'false' ) ) ) )
+            // InternalScope.g:3644:1: ( ( (lv_val_0_1= 'true' | lv_val_0_2= 'false' ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3644:1: ( ( (lv_val_0_1= 'true' | lv_val_0_2= 'false' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3645:1: ( (lv_val_0_1= 'true' | lv_val_0_2= 'false' ) )
+            // InternalScope.g:3644:1: ( ( (lv_val_0_1= 'true' | lv_val_0_2= 'false' ) ) )
+            // InternalScope.g:3645:1: ( (lv_val_0_1= 'true' | lv_val_0_2= 'false' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3645:1: ( (lv_val_0_1= 'true' | lv_val_0_2= 'false' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3646:1: (lv_val_0_1= 'true' | lv_val_0_2= 'false' )
+            // InternalScope.g:3645:1: ( (lv_val_0_1= 'true' | lv_val_0_2= 'false' ) )
+            // InternalScope.g:3646:1: (lv_val_0_1= 'true' | lv_val_0_2= 'false' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3646:1: (lv_val_0_1= 'true' | lv_val_0_2= 'false' )
+            // InternalScope.g:3646:1: (lv_val_0_1= 'true' | lv_val_0_2= 'false' )
             int alt62=2;
             int LA62_0 = input.LA(1);
 
@@ -10394,9 +10394,9 @@ else if ( (LA62_0==78) ) {
             }
             switch (alt62) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3647:3: lv_val_0_1= 'true'
+                    // InternalScope.g:3647:3: lv_val_0_1= 'true'
                     {
-                    lv_val_0_1=(Token)match(input,77,FOLLOW_77_in_ruleBooleanLiteral8170); if (state.failed) return current;
+                    lv_val_0_1=(Token)match(input,77,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_val_0_1, grammarAccess.getBooleanLiteralAccess().getValTrueKeyword_0_0());
@@ -10414,9 +10414,9 @@ else if ( (LA62_0==78) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3659:8: lv_val_0_2= 'false'
+                    // InternalScope.g:3659:8: lv_val_0_2= 'false'
                     {
-                    lv_val_0_2=(Token)match(input,78,FOLLOW_78_in_ruleBooleanLiteral8199); if (state.failed) return current;
+                    lv_val_0_2=(Token)match(input,78,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_val_0_2, grammarAccess.getBooleanLiteralAccess().getValFalseKeyword_0_1());
@@ -10462,7 +10462,7 @@ else if ( (LA62_0==78) ) {
 
 
     // $ANTLR start "entryRuleIntegerLiteral"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3682:1: entryRuleIntegerLiteral returns [EObject current=null] : iv_ruleIntegerLiteral= ruleIntegerLiteral EOF ;
+    // InternalScope.g:3682:1: entryRuleIntegerLiteral returns [EObject current=null] : iv_ruleIntegerLiteral= ruleIntegerLiteral EOF ;
     public final EObject entryRuleIntegerLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -10470,13 +10470,13 @@ public final EObject entryRuleIntegerLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3683:2: (iv_ruleIntegerLiteral= ruleIntegerLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3684:2: iv_ruleIntegerLiteral= ruleIntegerLiteral EOF
+            // InternalScope.g:3683:2: (iv_ruleIntegerLiteral= ruleIntegerLiteral EOF )
+            // InternalScope.g:3684:2: iv_ruleIntegerLiteral= ruleIntegerLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getIntegerLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleIntegerLiteral_in_entryRuleIntegerLiteral8250);
+            pushFollow(FOLLOW_1);
             iv_ruleIntegerLiteral=ruleIntegerLiteral();
 
             state._fsp--;
@@ -10484,7 +10484,7 @@ public final EObject entryRuleIntegerLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleIntegerLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIntegerLiteral8260); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -10502,7 +10502,7 @@ public final EObject entryRuleIntegerLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleIntegerLiteral"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3691:1: ruleIntegerLiteral returns [EObject current=null] : ( (lv_val_0_0= RULE_INT ) ) ;
+    // InternalScope.g:3691:1: ruleIntegerLiteral returns [EObject current=null] : ( (lv_val_0_0= RULE_INT ) ) ;
     public final EObject ruleIntegerLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -10511,16 +10511,16 @@ public final EObject ruleIntegerLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3694:28: ( ( (lv_val_0_0= RULE_INT ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3695:1: ( (lv_val_0_0= RULE_INT ) )
+            // InternalScope.g:3694:28: ( ( (lv_val_0_0= RULE_INT ) ) )
+            // InternalScope.g:3695:1: ( (lv_val_0_0= RULE_INT ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3695:1: ( (lv_val_0_0= RULE_INT ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3696:1: (lv_val_0_0= RULE_INT )
+            // InternalScope.g:3695:1: ( (lv_val_0_0= RULE_INT ) )
+            // InternalScope.g:3696:1: (lv_val_0_0= RULE_INT )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3696:1: (lv_val_0_0= RULE_INT )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3697:3: lv_val_0_0= RULE_INT
+            // InternalScope.g:3696:1: (lv_val_0_0= RULE_INT )
+            // InternalScope.g:3697:3: lv_val_0_0= RULE_INT
             {
-            lv_val_0_0=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleIntegerLiteral8301); if (state.failed) return current;
+            lv_val_0_0=(Token)match(input,RULE_INT,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(lv_val_0_0, grammarAccess.getIntegerLiteralAccess().getValINTTerminalRuleCall_0()); 
@@ -10535,7 +10535,7 @@ public final EObject ruleIntegerLiteral() throws RecognitionException {
                      			current, 
                      			"val",
                       		lv_val_0_0, 
-                      		"INT");
+                      		"org.eclipse.xtext.common.Terminals.INT");
               	    
             }
 
@@ -10564,7 +10564,7 @@ public final EObject ruleIntegerLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleNullLiteral"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3721:1: entryRuleNullLiteral returns [EObject current=null] : iv_ruleNullLiteral= ruleNullLiteral EOF ;
+    // InternalScope.g:3721:1: entryRuleNullLiteral returns [EObject current=null] : iv_ruleNullLiteral= ruleNullLiteral EOF ;
     public final EObject entryRuleNullLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -10572,13 +10572,13 @@ public final EObject entryRuleNullLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3722:2: (iv_ruleNullLiteral= ruleNullLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3723:2: iv_ruleNullLiteral= ruleNullLiteral EOF
+            // InternalScope.g:3722:2: (iv_ruleNullLiteral= ruleNullLiteral EOF )
+            // InternalScope.g:3723:2: iv_ruleNullLiteral= ruleNullLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getNullLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleNullLiteral_in_entryRuleNullLiteral8341);
+            pushFollow(FOLLOW_1);
             iv_ruleNullLiteral=ruleNullLiteral();
 
             state._fsp--;
@@ -10586,7 +10586,7 @@ public final EObject entryRuleNullLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleNullLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNullLiteral8351); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -10604,7 +10604,7 @@ public final EObject entryRuleNullLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleNullLiteral"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3730:1: ruleNullLiteral returns [EObject current=null] : ( (lv_val_0_0= 'null' ) ) ;
+    // InternalScope.g:3730:1: ruleNullLiteral returns [EObject current=null] : ( (lv_val_0_0= 'null' ) ) ;
     public final EObject ruleNullLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -10613,16 +10613,16 @@ public final EObject ruleNullLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3733:28: ( ( (lv_val_0_0= 'null' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3734:1: ( (lv_val_0_0= 'null' ) )
+            // InternalScope.g:3733:28: ( ( (lv_val_0_0= 'null' ) ) )
+            // InternalScope.g:3734:1: ( (lv_val_0_0= 'null' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3734:1: ( (lv_val_0_0= 'null' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3735:1: (lv_val_0_0= 'null' )
+            // InternalScope.g:3734:1: ( (lv_val_0_0= 'null' ) )
+            // InternalScope.g:3735:1: (lv_val_0_0= 'null' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3735:1: (lv_val_0_0= 'null' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3736:3: lv_val_0_0= 'null'
+            // InternalScope.g:3735:1: (lv_val_0_0= 'null' )
+            // InternalScope.g:3736:3: lv_val_0_0= 'null'
             {
-            lv_val_0_0=(Token)match(input,79,FOLLOW_79_in_ruleNullLiteral8393); if (state.failed) return current;
+            lv_val_0_0=(Token)match(input,79,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                       newLeafNode(lv_val_0_0, grammarAccess.getNullLiteralAccess().getValNullKeyword_0());
@@ -10662,7 +10662,7 @@ public final EObject ruleNullLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleRealLiteral"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3757:1: entryRuleRealLiteral returns [EObject current=null] : iv_ruleRealLiteral= ruleRealLiteral EOF ;
+    // InternalScope.g:3757:1: entryRuleRealLiteral returns [EObject current=null] : iv_ruleRealLiteral= ruleRealLiteral EOF ;
     public final EObject entryRuleRealLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -10670,13 +10670,13 @@ public final EObject entryRuleRealLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3758:2: (iv_ruleRealLiteral= ruleRealLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3759:2: iv_ruleRealLiteral= ruleRealLiteral EOF
+            // InternalScope.g:3758:2: (iv_ruleRealLiteral= ruleRealLiteral EOF )
+            // InternalScope.g:3759:2: iv_ruleRealLiteral= ruleRealLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getRealLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleRealLiteral_in_entryRuleRealLiteral8441);
+            pushFollow(FOLLOW_1);
             iv_ruleRealLiteral=ruleRealLiteral();
 
             state._fsp--;
@@ -10684,7 +10684,7 @@ public final EObject entryRuleRealLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleRealLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRealLiteral8451); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -10702,7 +10702,7 @@ public final EObject entryRuleRealLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleRealLiteral"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3766:1: ruleRealLiteral returns [EObject current=null] : ( (lv_val_0_0= RULE_REAL ) ) ;
+    // InternalScope.g:3766:1: ruleRealLiteral returns [EObject current=null] : ( (lv_val_0_0= RULE_REAL ) ) ;
     public final EObject ruleRealLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -10711,16 +10711,16 @@ public final EObject ruleRealLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3769:28: ( ( (lv_val_0_0= RULE_REAL ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3770:1: ( (lv_val_0_0= RULE_REAL ) )
+            // InternalScope.g:3769:28: ( ( (lv_val_0_0= RULE_REAL ) ) )
+            // InternalScope.g:3770:1: ( (lv_val_0_0= RULE_REAL ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3770:1: ( (lv_val_0_0= RULE_REAL ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3771:1: (lv_val_0_0= RULE_REAL )
+            // InternalScope.g:3770:1: ( (lv_val_0_0= RULE_REAL ) )
+            // InternalScope.g:3771:1: (lv_val_0_0= RULE_REAL )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3771:1: (lv_val_0_0= RULE_REAL )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3772:3: lv_val_0_0= RULE_REAL
+            // InternalScope.g:3771:1: (lv_val_0_0= RULE_REAL )
+            // InternalScope.g:3772:3: lv_val_0_0= RULE_REAL
             {
-            lv_val_0_0=(Token)match(input,RULE_REAL,FOLLOW_RULE_REAL_in_ruleRealLiteral8492); if (state.failed) return current;
+            lv_val_0_0=(Token)match(input,RULE_REAL,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(lv_val_0_0, grammarAccess.getRealLiteralAccess().getValREALTerminalRuleCall_0()); 
@@ -10735,7 +10735,7 @@ public final EObject ruleRealLiteral() throws RecognitionException {
                      			current, 
                      			"val",
                       		lv_val_0_0, 
-                      		"REAL");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.REAL");
               	    
             }
 
@@ -10764,7 +10764,7 @@ public final EObject ruleRealLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleStringLiteral"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3796:1: entryRuleStringLiteral returns [EObject current=null] : iv_ruleStringLiteral= ruleStringLiteral EOF ;
+    // InternalScope.g:3796:1: entryRuleStringLiteral returns [EObject current=null] : iv_ruleStringLiteral= ruleStringLiteral EOF ;
     public final EObject entryRuleStringLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -10772,13 +10772,13 @@ public final EObject entryRuleStringLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3797:2: (iv_ruleStringLiteral= ruleStringLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3798:2: iv_ruleStringLiteral= ruleStringLiteral EOF
+            // InternalScope.g:3797:2: (iv_ruleStringLiteral= ruleStringLiteral EOF )
+            // InternalScope.g:3798:2: iv_ruleStringLiteral= ruleStringLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getStringLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral8532);
+            pushFollow(FOLLOW_1);
             iv_ruleStringLiteral=ruleStringLiteral();
 
             state._fsp--;
@@ -10786,7 +10786,7 @@ public final EObject entryRuleStringLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleStringLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleStringLiteral8542); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -10804,7 +10804,7 @@ public final EObject entryRuleStringLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleStringLiteral"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3805:1: ruleStringLiteral returns [EObject current=null] : ( (lv_val_0_0= RULE_STRING ) ) ;
+    // InternalScope.g:3805:1: ruleStringLiteral returns [EObject current=null] : ( (lv_val_0_0= RULE_STRING ) ) ;
     public final EObject ruleStringLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -10813,16 +10813,16 @@ public final EObject ruleStringLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3808:28: ( ( (lv_val_0_0= RULE_STRING ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3809:1: ( (lv_val_0_0= RULE_STRING ) )
+            // InternalScope.g:3808:28: ( ( (lv_val_0_0= RULE_STRING ) ) )
+            // InternalScope.g:3809:1: ( (lv_val_0_0= RULE_STRING ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3809:1: ( (lv_val_0_0= RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3810:1: (lv_val_0_0= RULE_STRING )
+            // InternalScope.g:3809:1: ( (lv_val_0_0= RULE_STRING ) )
+            // InternalScope.g:3810:1: (lv_val_0_0= RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3810:1: (lv_val_0_0= RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3811:3: lv_val_0_0= RULE_STRING
+            // InternalScope.g:3810:1: (lv_val_0_0= RULE_STRING )
+            // InternalScope.g:3811:3: lv_val_0_0= RULE_STRING
             {
-            lv_val_0_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleStringLiteral8583); if (state.failed) return current;
+            lv_val_0_0=(Token)match(input,RULE_STRING,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(lv_val_0_0, grammarAccess.getStringLiteralAccess().getValSTRINGTerminalRuleCall_0()); 
@@ -10837,7 +10837,7 @@ public final EObject ruleStringLiteral() throws RecognitionException {
                      			current, 
                      			"val",
                       		lv_val_0_0, 
-                      		"STRING");
+                      		"org.eclipse.xtext.common.Terminals.STRING");
               	    
             }
 
@@ -10866,7 +10866,7 @@ public final EObject ruleStringLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleParanthesizedExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3835:1: entryRuleParanthesizedExpression returns [EObject current=null] : iv_ruleParanthesizedExpression= ruleParanthesizedExpression EOF ;
+    // InternalScope.g:3835:1: entryRuleParanthesizedExpression returns [EObject current=null] : iv_ruleParanthesizedExpression= ruleParanthesizedExpression EOF ;
     public final EObject entryRuleParanthesizedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -10874,13 +10874,13 @@ public final EObject entryRuleParanthesizedExpression() throws RecognitionExcept
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3836:2: (iv_ruleParanthesizedExpression= ruleParanthesizedExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3837:2: iv_ruleParanthesizedExpression= ruleParanthesizedExpression EOF
+            // InternalScope.g:3836:2: (iv_ruleParanthesizedExpression= ruleParanthesizedExpression EOF )
+            // InternalScope.g:3837:2: iv_ruleParanthesizedExpression= ruleParanthesizedExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getParanthesizedExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleParanthesizedExpression_in_entryRuleParanthesizedExpression8623);
+            pushFollow(FOLLOW_1);
             iv_ruleParanthesizedExpression=ruleParanthesizedExpression();
 
             state._fsp--;
@@ -10888,7 +10888,7 @@ public final EObject entryRuleParanthesizedExpression() throws RecognitionExcept
             if ( state.backtracking==0 ) {
                current =iv_ruleParanthesizedExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleParanthesizedExpression8633); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -10906,7 +10906,7 @@ public final EObject entryRuleParanthesizedExpression() throws RecognitionExcept
 
 
     // $ANTLR start "ruleParanthesizedExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3844:1: ruleParanthesizedExpression returns [EObject current=null] : (otherlv_0= '(' this_Expression_1= ruleExpression otherlv_2= ')' ) ;
+    // InternalScope.g:3844:1: ruleParanthesizedExpression returns [EObject current=null] : (otherlv_0= '(' this_Expression_1= ruleExpression otherlv_2= ')' ) ;
     public final EObject ruleParanthesizedExpression() throws RecognitionException {
         EObject current = null;
 
@@ -10918,13 +10918,13 @@ public final EObject ruleParanthesizedExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3847:28: ( (otherlv_0= '(' this_Expression_1= ruleExpression otherlv_2= ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3848:1: (otherlv_0= '(' this_Expression_1= ruleExpression otherlv_2= ')' )
+            // InternalScope.g:3847:28: ( (otherlv_0= '(' this_Expression_1= ruleExpression otherlv_2= ')' ) )
+            // InternalScope.g:3848:1: (otherlv_0= '(' this_Expression_1= ruleExpression otherlv_2= ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3848:1: (otherlv_0= '(' this_Expression_1= ruleExpression otherlv_2= ')' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3848:3: otherlv_0= '(' this_Expression_1= ruleExpression otherlv_2= ')'
+            // InternalScope.g:3848:1: (otherlv_0= '(' this_Expression_1= ruleExpression otherlv_2= ')' )
+            // InternalScope.g:3848:3: otherlv_0= '(' this_Expression_1= ruleExpression otherlv_2= ')'
             {
-            otherlv_0=(Token)match(input,25,FOLLOW_25_in_ruleParanthesizedExpression8670); if (state.failed) return current;
+            otherlv_0=(Token)match(input,25,FOLLOW_17); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getParanthesizedExpressionAccess().getLeftParenthesisKeyword_0());
@@ -10935,7 +10935,7 @@ public final EObject ruleParanthesizedExpression() throws RecognitionException {
                       newCompositeNode(grammarAccess.getParanthesizedExpressionAccess().getExpressionParserRuleCall_1()); 
                   
             }
-            pushFollow(FOLLOW_ruleExpression_in_ruleParanthesizedExpression8692);
+            pushFollow(FOLLOW_20);
             this_Expression_1=ruleExpression();
 
             state._fsp--;
@@ -10946,7 +10946,7 @@ public final EObject ruleParanthesizedExpression() throws RecognitionException {
                       afterParserOrEnumRuleCall();
                   
             }
-            otherlv_2=(Token)match(input,26,FOLLOW_26_in_ruleParanthesizedExpression8703); if (state.failed) return current;
+            otherlv_2=(Token)match(input,26,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_2, grammarAccess.getParanthesizedExpressionAccess().getRightParenthesisKeyword_2());
@@ -10975,7 +10975,7 @@ public final EObject ruleParanthesizedExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleGlobalVarExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3873:1: entryRuleGlobalVarExpression returns [EObject current=null] : iv_ruleGlobalVarExpression= ruleGlobalVarExpression EOF ;
+    // InternalScope.g:3873:1: entryRuleGlobalVarExpression returns [EObject current=null] : iv_ruleGlobalVarExpression= ruleGlobalVarExpression EOF ;
     public final EObject entryRuleGlobalVarExpression() throws RecognitionException {
         EObject current = null;
 
@@ -10983,13 +10983,13 @@ public final EObject entryRuleGlobalVarExpression() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3874:2: (iv_ruleGlobalVarExpression= ruleGlobalVarExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3875:2: iv_ruleGlobalVarExpression= ruleGlobalVarExpression EOF
+            // InternalScope.g:3874:2: (iv_ruleGlobalVarExpression= ruleGlobalVarExpression EOF )
+            // InternalScope.g:3875:2: iv_ruleGlobalVarExpression= ruleGlobalVarExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getGlobalVarExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleGlobalVarExpression_in_entryRuleGlobalVarExpression8739);
+            pushFollow(FOLLOW_1);
             iv_ruleGlobalVarExpression=ruleGlobalVarExpression();
 
             state._fsp--;
@@ -10997,7 +10997,7 @@ public final EObject entryRuleGlobalVarExpression() throws RecognitionException
             if ( state.backtracking==0 ) {
                current =iv_ruleGlobalVarExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleGlobalVarExpression8749); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -11015,7 +11015,7 @@ public final EObject entryRuleGlobalVarExpression() throws RecognitionException
 
 
     // $ANTLR start "ruleGlobalVarExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3882:1: ruleGlobalVarExpression returns [EObject current=null] : (otherlv_0= 'GLOBALVAR' ( (lv_name_1_0= ruleIdentifier ) ) ) ;
+    // InternalScope.g:3882:1: ruleGlobalVarExpression returns [EObject current=null] : (otherlv_0= 'GLOBALVAR' ( (lv_name_1_0= ruleIdentifier ) ) ) ;
     public final EObject ruleGlobalVarExpression() throws RecognitionException {
         EObject current = null;
 
@@ -11026,30 +11026,30 @@ public final EObject ruleGlobalVarExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3885:28: ( (otherlv_0= 'GLOBALVAR' ( (lv_name_1_0= ruleIdentifier ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3886:1: (otherlv_0= 'GLOBALVAR' ( (lv_name_1_0= ruleIdentifier ) ) )
+            // InternalScope.g:3885:28: ( (otherlv_0= 'GLOBALVAR' ( (lv_name_1_0= ruleIdentifier ) ) ) )
+            // InternalScope.g:3886:1: (otherlv_0= 'GLOBALVAR' ( (lv_name_1_0= ruleIdentifier ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3886:1: (otherlv_0= 'GLOBALVAR' ( (lv_name_1_0= ruleIdentifier ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3886:3: otherlv_0= 'GLOBALVAR' ( (lv_name_1_0= ruleIdentifier ) )
+            // InternalScope.g:3886:1: (otherlv_0= 'GLOBALVAR' ( (lv_name_1_0= ruleIdentifier ) ) )
+            // InternalScope.g:3886:3: otherlv_0= 'GLOBALVAR' ( (lv_name_1_0= ruleIdentifier ) )
             {
-            otherlv_0=(Token)match(input,80,FOLLOW_80_in_ruleGlobalVarExpression8786); if (state.failed) return current;
+            otherlv_0=(Token)match(input,80,FOLLOW_3); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getGlobalVarExpressionAccess().getGLOBALVARKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3890:1: ( (lv_name_1_0= ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3891:1: (lv_name_1_0= ruleIdentifier )
+            // InternalScope.g:3890:1: ( (lv_name_1_0= ruleIdentifier ) )
+            // InternalScope.g:3891:1: (lv_name_1_0= ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3891:1: (lv_name_1_0= ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3892:3: lv_name_1_0= ruleIdentifier
+            // InternalScope.g:3891:1: (lv_name_1_0= ruleIdentifier )
+            // InternalScope.g:3892:3: lv_name_1_0= ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getGlobalVarExpressionAccess().getNameIdentifierParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_ruleGlobalVarExpression8807);
+            pushFollow(FOLLOW_2);
             lv_name_1_0=ruleIdentifier();
 
             state._fsp--;
@@ -11063,7 +11063,7 @@ public final EObject ruleGlobalVarExpression() throws RecognitionException {
                      			current, 
                      			"name",
                       		lv_name_1_0, 
-                      		"Identifier");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -11096,7 +11096,7 @@ public final EObject ruleGlobalVarExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleFeatureCall"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3916:1: entryRuleFeatureCall returns [EObject current=null] : iv_ruleFeatureCall= ruleFeatureCall EOF ;
+    // InternalScope.g:3916:1: entryRuleFeatureCall returns [EObject current=null] : iv_ruleFeatureCall= ruleFeatureCall EOF ;
     public final EObject entryRuleFeatureCall() throws RecognitionException {
         EObject current = null;
 
@@ -11104,13 +11104,13 @@ public final EObject entryRuleFeatureCall() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3917:2: (iv_ruleFeatureCall= ruleFeatureCall EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3918:2: iv_ruleFeatureCall= ruleFeatureCall EOF
+            // InternalScope.g:3917:2: (iv_ruleFeatureCall= ruleFeatureCall EOF )
+            // InternalScope.g:3918:2: iv_ruleFeatureCall= ruleFeatureCall EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getFeatureCallRule()); 
             }
-            pushFollow(FOLLOW_ruleFeatureCall_in_entryRuleFeatureCall8843);
+            pushFollow(FOLLOW_1);
             iv_ruleFeatureCall=ruleFeatureCall();
 
             state._fsp--;
@@ -11118,7 +11118,7 @@ public final EObject entryRuleFeatureCall() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleFeatureCall; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFeatureCall8853); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -11136,7 +11136,7 @@ public final EObject entryRuleFeatureCall() throws RecognitionException {
 
 
     // $ANTLR start "ruleFeatureCall"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3925:1: ruleFeatureCall returns [EObject current=null] : (this_OperationCall_0= ruleOperationCall | ( (lv_type_1_0= ruleType ) ) | this_CollectionExpression_2= ruleCollectionExpression | this_TypeSelectExpression_3= ruleTypeSelectExpression ) ;
+    // InternalScope.g:3925:1: ruleFeatureCall returns [EObject current=null] : (this_OperationCall_0= ruleOperationCall | ( (lv_type_1_0= ruleType ) ) | this_CollectionExpression_2= ruleCollectionExpression | this_TypeSelectExpression_3= ruleTypeSelectExpression ) ;
     public final EObject ruleFeatureCall() throws RecognitionException {
         EObject current = null;
 
@@ -11152,10 +11152,10 @@ public final EObject ruleFeatureCall() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3928:28: ( (this_OperationCall_0= ruleOperationCall | ( (lv_type_1_0= ruleType ) ) | this_CollectionExpression_2= ruleCollectionExpression | this_TypeSelectExpression_3= ruleTypeSelectExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3929:1: (this_OperationCall_0= ruleOperationCall | ( (lv_type_1_0= ruleType ) ) | this_CollectionExpression_2= ruleCollectionExpression | this_TypeSelectExpression_3= ruleTypeSelectExpression )
+            // InternalScope.g:3928:28: ( (this_OperationCall_0= ruleOperationCall | ( (lv_type_1_0= ruleType ) ) | this_CollectionExpression_2= ruleCollectionExpression | this_TypeSelectExpression_3= ruleTypeSelectExpression ) )
+            // InternalScope.g:3929:1: (this_OperationCall_0= ruleOperationCall | ( (lv_type_1_0= ruleType ) ) | this_CollectionExpression_2= ruleCollectionExpression | this_TypeSelectExpression_3= ruleTypeSelectExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3929:1: (this_OperationCall_0= ruleOperationCall | ( (lv_type_1_0= ruleType ) ) | this_CollectionExpression_2= ruleCollectionExpression | this_TypeSelectExpression_3= ruleTypeSelectExpression )
+            // InternalScope.g:3929:1: (this_OperationCall_0= ruleOperationCall | ( (lv_type_1_0= ruleType ) ) | this_CollectionExpression_2= ruleCollectionExpression | this_TypeSelectExpression_3= ruleTypeSelectExpression )
             int alt63=4;
             switch ( input.LA(1) ) {
             case RULE_ID:
@@ -11211,14 +11211,14 @@ else if ( (LA63_1==EOF||LA63_1==15||LA63_1==18||LA63_1==21||LA63_1==23||LA63_1==
 
             switch (alt63) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3930:5: this_OperationCall_0= ruleOperationCall
+                    // InternalScope.g:3930:5: this_OperationCall_0= ruleOperationCall
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getFeatureCallAccess().getOperationCallParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleOperationCall_in_ruleFeatureCall8900);
+                    pushFollow(FOLLOW_2);
                     this_OperationCall_0=ruleOperationCall();
 
                     state._fsp--;
@@ -11233,20 +11233,20 @@ else if ( (LA63_1==EOF||LA63_1==15||LA63_1==18||LA63_1==21||LA63_1==23||LA63_1==
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3939:6: ( (lv_type_1_0= ruleType ) )
+                    // InternalScope.g:3939:6: ( (lv_type_1_0= ruleType ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3939:6: ( (lv_type_1_0= ruleType ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3940:1: (lv_type_1_0= ruleType )
+                    // InternalScope.g:3939:6: ( (lv_type_1_0= ruleType ) )
+                    // InternalScope.g:3940:1: (lv_type_1_0= ruleType )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3940:1: (lv_type_1_0= ruleType )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3941:3: lv_type_1_0= ruleType
+                    // InternalScope.g:3940:1: (lv_type_1_0= ruleType )
+                    // InternalScope.g:3941:3: lv_type_1_0= ruleType
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getFeatureCallAccess().getTypeTypeParserRuleCall_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleType_in_ruleFeatureCall8926);
+                    pushFollow(FOLLOW_2);
                     lv_type_1_0=ruleType();
 
                     state._fsp--;
@@ -11260,7 +11260,7 @@ else if ( (LA63_1==EOF||LA63_1==15||LA63_1==18||LA63_1==21||LA63_1==23||LA63_1==
                              			current, 
                              			"type",
                               		lv_type_1_0, 
-                              		"Type");
+                              		"com.avaloq.tools.ddk.xtext.expression.Expression.Type");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -11274,14 +11274,14 @@ else if ( (LA63_1==EOF||LA63_1==15||LA63_1==18||LA63_1==21||LA63_1==23||LA63_1==
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3959:5: this_CollectionExpression_2= ruleCollectionExpression
+                    // InternalScope.g:3959:5: this_CollectionExpression_2= ruleCollectionExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getFeatureCallAccess().getCollectionExpressionParserRuleCall_2()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleCollectionExpression_in_ruleFeatureCall8954);
+                    pushFollow(FOLLOW_2);
                     this_CollectionExpression_2=ruleCollectionExpression();
 
                     state._fsp--;
@@ -11296,14 +11296,14 @@ else if ( (LA63_1==EOF||LA63_1==15||LA63_1==18||LA63_1==21||LA63_1==23||LA63_1==
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3969:5: this_TypeSelectExpression_3= ruleTypeSelectExpression
+                    // InternalScope.g:3969:5: this_TypeSelectExpression_3= ruleTypeSelectExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getFeatureCallAccess().getTypeSelectExpressionParserRuleCall_3()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleTypeSelectExpression_in_ruleFeatureCall8981);
+                    pushFollow(FOLLOW_2);
                     this_TypeSelectExpression_3=ruleTypeSelectExpression();
 
                     state._fsp--;
@@ -11340,7 +11340,7 @@ else if ( (LA63_1==EOF||LA63_1==15||LA63_1==18||LA63_1==21||LA63_1==23||LA63_1==
 
 
     // $ANTLR start "entryRuleOperationCall"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3985:1: entryRuleOperationCall returns [EObject current=null] : iv_ruleOperationCall= ruleOperationCall EOF ;
+    // InternalScope.g:3985:1: entryRuleOperationCall returns [EObject current=null] : iv_ruleOperationCall= ruleOperationCall EOF ;
     public final EObject entryRuleOperationCall() throws RecognitionException {
         EObject current = null;
 
@@ -11348,13 +11348,13 @@ public final EObject entryRuleOperationCall() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3986:2: (iv_ruleOperationCall= ruleOperationCall EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3987:2: iv_ruleOperationCall= ruleOperationCall EOF
+            // InternalScope.g:3986:2: (iv_ruleOperationCall= ruleOperationCall EOF )
+            // InternalScope.g:3987:2: iv_ruleOperationCall= ruleOperationCall EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getOperationCallRule()); 
             }
-            pushFollow(FOLLOW_ruleOperationCall_in_entryRuleOperationCall9016);
+            pushFollow(FOLLOW_1);
             iv_ruleOperationCall=ruleOperationCall();
 
             state._fsp--;
@@ -11362,7 +11362,7 @@ public final EObject entryRuleOperationCall() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleOperationCall; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOperationCall9026); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -11380,7 +11380,7 @@ public final EObject entryRuleOperationCall() throws RecognitionException {
 
 
     // $ANTLR start "ruleOperationCall"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3994:1: ruleOperationCall returns [EObject current=null] : ( ( (lv_name_0_0= ruleIdentifier ) ) otherlv_1= '(' ( ( (lv_params_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )* )? otherlv_5= ')' ) ;
+    // InternalScope.g:3994:1: ruleOperationCall returns [EObject current=null] : ( ( (lv_name_0_0= ruleIdentifier ) ) otherlv_1= '(' ( ( (lv_params_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )* )? otherlv_5= ')' ) ;
     public final EObject ruleOperationCall() throws RecognitionException {
         EObject current = null;
 
@@ -11397,24 +11397,24 @@ public final EObject ruleOperationCall() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3997:28: ( ( ( (lv_name_0_0= ruleIdentifier ) ) otherlv_1= '(' ( ( (lv_params_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )* )? otherlv_5= ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3998:1: ( ( (lv_name_0_0= ruleIdentifier ) ) otherlv_1= '(' ( ( (lv_params_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )* )? otherlv_5= ')' )
+            // InternalScope.g:3997:28: ( ( ( (lv_name_0_0= ruleIdentifier ) ) otherlv_1= '(' ( ( (lv_params_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )* )? otherlv_5= ')' ) )
+            // InternalScope.g:3998:1: ( ( (lv_name_0_0= ruleIdentifier ) ) otherlv_1= '(' ( ( (lv_params_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )* )? otherlv_5= ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3998:1: ( ( (lv_name_0_0= ruleIdentifier ) ) otherlv_1= '(' ( ( (lv_params_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )* )? otherlv_5= ')' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3998:2: ( (lv_name_0_0= ruleIdentifier ) ) otherlv_1= '(' ( ( (lv_params_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )* )? otherlv_5= ')'
+            // InternalScope.g:3998:1: ( ( (lv_name_0_0= ruleIdentifier ) ) otherlv_1= '(' ( ( (lv_params_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )* )? otherlv_5= ')' )
+            // InternalScope.g:3998:2: ( (lv_name_0_0= ruleIdentifier ) ) otherlv_1= '(' ( ( (lv_params_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )* )? otherlv_5= ')'
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3998:2: ( (lv_name_0_0= ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3999:1: (lv_name_0_0= ruleIdentifier )
+            // InternalScope.g:3998:2: ( (lv_name_0_0= ruleIdentifier ) )
+            // InternalScope.g:3999:1: (lv_name_0_0= ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:3999:1: (lv_name_0_0= ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4000:3: lv_name_0_0= ruleIdentifier
+            // InternalScope.g:3999:1: (lv_name_0_0= ruleIdentifier )
+            // InternalScope.g:4000:3: lv_name_0_0= ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getOperationCallAccess().getNameIdentifierParserRuleCall_0_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_ruleOperationCall9072);
+            pushFollow(FOLLOW_30);
             lv_name_0_0=ruleIdentifier();
 
             state._fsp--;
@@ -11428,7 +11428,7 @@ public final EObject ruleOperationCall() throws RecognitionException {
                      			current, 
                      			"name",
                       		lv_name_0_0, 
-                      		"Identifier");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -11438,13 +11438,13 @@ public final EObject ruleOperationCall() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,25,FOLLOW_25_in_ruleOperationCall9084); if (state.failed) return current;
+            otherlv_1=(Token)match(input,25,FOLLOW_60); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getOperationCallAccess().getLeftParenthesisKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4020:1: ( ( (lv_params_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )* )?
+            // InternalScope.g:4020:1: ( ( (lv_params_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )* )?
             int alt65=2;
             int LA65_0 = input.LA(1);
 
@@ -11453,20 +11453,20 @@ public final EObject ruleOperationCall() throws RecognitionException {
             }
             switch (alt65) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4020:2: ( (lv_params_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )*
+                    // InternalScope.g:4020:2: ( (lv_params_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )*
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4020:2: ( (lv_params_2_0= ruleExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4021:1: (lv_params_2_0= ruleExpression )
+                    // InternalScope.g:4020:2: ( (lv_params_2_0= ruleExpression ) )
+                    // InternalScope.g:4021:1: (lv_params_2_0= ruleExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4021:1: (lv_params_2_0= ruleExpression )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4022:3: lv_params_2_0= ruleExpression
+                    // InternalScope.g:4021:1: (lv_params_2_0= ruleExpression )
+                    // InternalScope.g:4022:3: lv_params_2_0= ruleExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getOperationCallAccess().getParamsExpressionParserRuleCall_2_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleExpression_in_ruleOperationCall9106);
+                    pushFollow(FOLLOW_32);
                     lv_params_2_0=ruleExpression();
 
                     state._fsp--;
@@ -11480,7 +11480,7 @@ public final EObject ruleOperationCall() throws RecognitionException {
                              			current, 
                              			"params",
                               		lv_params_2_0, 
-                              		"Expression");
+                              		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -11490,7 +11490,7 @@ public final EObject ruleOperationCall() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4038:2: (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )*
+                    // InternalScope.g:4038:2: (otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) ) )*
                     loop64:
                     do {
                         int alt64=2;
@@ -11503,26 +11503,26 @@ public final EObject ruleOperationCall() throws RecognitionException {
 
                         switch (alt64) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4038:4: otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) )
+                    	    // InternalScope.g:4038:4: otherlv_3= ',' ( (lv_params_4_0= ruleExpression ) )
                     	    {
-                    	    otherlv_3=(Token)match(input,36,FOLLOW_36_in_ruleOperationCall9119); if (state.failed) return current;
+                    	    otherlv_3=(Token)match(input,36,FOLLOW_17); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_3, grammarAccess.getOperationCallAccess().getCommaKeyword_2_1_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4042:1: ( (lv_params_4_0= ruleExpression ) )
-                    	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4043:1: (lv_params_4_0= ruleExpression )
+                    	    // InternalScope.g:4042:1: ( (lv_params_4_0= ruleExpression ) )
+                    	    // InternalScope.g:4043:1: (lv_params_4_0= ruleExpression )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4043:1: (lv_params_4_0= ruleExpression )
-                    	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4044:3: lv_params_4_0= ruleExpression
+                    	    // InternalScope.g:4043:1: (lv_params_4_0= ruleExpression )
+                    	    // InternalScope.g:4044:3: lv_params_4_0= ruleExpression
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getOperationCallAccess().getParamsExpressionParserRuleCall_2_1_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleExpression_in_ruleOperationCall9140);
+                    	    pushFollow(FOLLOW_32);
                     	    lv_params_4_0=ruleExpression();
 
                     	    state._fsp--;
@@ -11536,7 +11536,7 @@ public final EObject ruleOperationCall() throws RecognitionException {
                     	             			current, 
                     	             			"params",
                     	              		lv_params_4_0, 
-                    	              		"Expression");
+                    	              		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -11561,7 +11561,7 @@ public final EObject ruleOperationCall() throws RecognitionException {
 
             }
 
-            otherlv_5=(Token)match(input,26,FOLLOW_26_in_ruleOperationCall9156); if (state.failed) return current;
+            otherlv_5=(Token)match(input,26,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_5, grammarAccess.getOperationCallAccess().getRightParenthesisKeyword_3());
@@ -11590,7 +11590,7 @@ public final EObject ruleOperationCall() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleListLiteral"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4072:1: entryRuleListLiteral returns [EObject current=null] : iv_ruleListLiteral= ruleListLiteral EOF ;
+    // InternalScope.g:4072:1: entryRuleListLiteral returns [EObject current=null] : iv_ruleListLiteral= ruleListLiteral EOF ;
     public final EObject entryRuleListLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -11598,13 +11598,13 @@ public final EObject entryRuleListLiteral() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4073:2: (iv_ruleListLiteral= ruleListLiteral EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4074:2: iv_ruleListLiteral= ruleListLiteral EOF
+            // InternalScope.g:4073:2: (iv_ruleListLiteral= ruleListLiteral EOF )
+            // InternalScope.g:4074:2: iv_ruleListLiteral= ruleListLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getListLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleListLiteral_in_entryRuleListLiteral9192);
+            pushFollow(FOLLOW_1);
             iv_ruleListLiteral=ruleListLiteral();
 
             state._fsp--;
@@ -11612,7 +11612,7 @@ public final EObject entryRuleListLiteral() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleListLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleListLiteral9202); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -11630,7 +11630,7 @@ public final EObject entryRuleListLiteral() throws RecognitionException {
 
 
     // $ANTLR start "ruleListLiteral"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4081:1: ruleListLiteral returns [EObject current=null] : ( () otherlv_1= '{' ( ( (lv_elements_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )* )? otherlv_5= '}' ) ;
+    // InternalScope.g:4081:1: ruleListLiteral returns [EObject current=null] : ( () otherlv_1= '{' ( ( (lv_elements_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )* )? otherlv_5= '}' ) ;
     public final EObject ruleListLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -11645,14 +11645,14 @@ public final EObject ruleListLiteral() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4084:28: ( ( () otherlv_1= '{' ( ( (lv_elements_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )* )? otherlv_5= '}' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4085:1: ( () otherlv_1= '{' ( ( (lv_elements_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )* )? otherlv_5= '}' )
+            // InternalScope.g:4084:28: ( ( () otherlv_1= '{' ( ( (lv_elements_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )* )? otherlv_5= '}' ) )
+            // InternalScope.g:4085:1: ( () otherlv_1= '{' ( ( (lv_elements_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )* )? otherlv_5= '}' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4085:1: ( () otherlv_1= '{' ( ( (lv_elements_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )* )? otherlv_5= '}' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4085:2: () otherlv_1= '{' ( ( (lv_elements_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )* )? otherlv_5= '}'
+            // InternalScope.g:4085:1: ( () otherlv_1= '{' ( ( (lv_elements_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )* )? otherlv_5= '}' )
+            // InternalScope.g:4085:2: () otherlv_1= '{' ( ( (lv_elements_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )* )? otherlv_5= '}'
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4085:2: ()
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4086:5: 
+            // InternalScope.g:4085:2: ()
+            // InternalScope.g:4086:5: 
             {
             if ( state.backtracking==0 ) {
 
@@ -11664,13 +11664,13 @@ public final EObject ruleListLiteral() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,20,FOLLOW_20_in_ruleListLiteral9248); if (state.failed) return current;
+            otherlv_1=(Token)match(input,20,FOLLOW_63); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getListLiteralAccess().getLeftCurlyBracketKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4095:1: ( ( (lv_elements_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )* )?
+            // InternalScope.g:4095:1: ( ( (lv_elements_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )* )?
             int alt67=2;
             int LA67_0 = input.LA(1);
 
@@ -11679,20 +11679,20 @@ public final EObject ruleListLiteral() throws RecognitionException {
             }
             switch (alt67) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4095:2: ( (lv_elements_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )*
+                    // InternalScope.g:4095:2: ( (lv_elements_2_0= ruleExpression ) ) (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )*
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4095:2: ( (lv_elements_2_0= ruleExpression ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4096:1: (lv_elements_2_0= ruleExpression )
+                    // InternalScope.g:4095:2: ( (lv_elements_2_0= ruleExpression ) )
+                    // InternalScope.g:4096:1: (lv_elements_2_0= ruleExpression )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4096:1: (lv_elements_2_0= ruleExpression )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4097:3: lv_elements_2_0= ruleExpression
+                    // InternalScope.g:4096:1: (lv_elements_2_0= ruleExpression )
+                    // InternalScope.g:4097:3: lv_elements_2_0= ruleExpression
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getListLiteralAccess().getElementsExpressionParserRuleCall_2_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleExpression_in_ruleListLiteral9270);
+                    pushFollow(FOLLOW_64);
                     lv_elements_2_0=ruleExpression();
 
                     state._fsp--;
@@ -11706,7 +11706,7 @@ public final EObject ruleListLiteral() throws RecognitionException {
                              			current, 
                              			"elements",
                               		lv_elements_2_0, 
-                              		"Expression");
+                              		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -11716,7 +11716,7 @@ public final EObject ruleListLiteral() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4113:2: (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )*
+                    // InternalScope.g:4113:2: (otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) ) )*
                     loop66:
                     do {
                         int alt66=2;
@@ -11729,26 +11729,26 @@ public final EObject ruleListLiteral() throws RecognitionException {
 
                         switch (alt66) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4113:4: otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) )
+                    	    // InternalScope.g:4113:4: otherlv_3= ',' ( (lv_elements_4_0= ruleExpression ) )
                     	    {
-                    	    otherlv_3=(Token)match(input,36,FOLLOW_36_in_ruleListLiteral9283); if (state.failed) return current;
+                    	    otherlv_3=(Token)match(input,36,FOLLOW_17); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
                     	          	newLeafNode(otherlv_3, grammarAccess.getListLiteralAccess().getCommaKeyword_2_1_0());
                     	          
                     	    }
-                    	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4117:1: ( (lv_elements_4_0= ruleExpression ) )
-                    	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4118:1: (lv_elements_4_0= ruleExpression )
+                    	    // InternalScope.g:4117:1: ( (lv_elements_4_0= ruleExpression ) )
+                    	    // InternalScope.g:4118:1: (lv_elements_4_0= ruleExpression )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4118:1: (lv_elements_4_0= ruleExpression )
-                    	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4119:3: lv_elements_4_0= ruleExpression
+                    	    // InternalScope.g:4118:1: (lv_elements_4_0= ruleExpression )
+                    	    // InternalScope.g:4119:3: lv_elements_4_0= ruleExpression
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getListLiteralAccess().getElementsExpressionParserRuleCall_2_1_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleExpression_in_ruleListLiteral9304);
+                    	    pushFollow(FOLLOW_64);
                     	    lv_elements_4_0=ruleExpression();
 
                     	    state._fsp--;
@@ -11762,7 +11762,7 @@ public final EObject ruleListLiteral() throws RecognitionException {
                     	             			current, 
                     	             			"elements",
                     	              		lv_elements_4_0, 
-                    	              		"Expression");
+                    	              		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
                     	    }
@@ -11787,7 +11787,7 @@ public final EObject ruleListLiteral() throws RecognitionException {
 
             }
 
-            otherlv_5=(Token)match(input,21,FOLLOW_21_in_ruleListLiteral9320); if (state.failed) return current;
+            otherlv_5=(Token)match(input,21,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_5, grammarAccess.getListLiteralAccess().getRightCurlyBracketKeyword_3());
@@ -11816,7 +11816,7 @@ public final EObject ruleListLiteral() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleConstructorCallExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4147:1: entryRuleConstructorCallExpression returns [EObject current=null] : iv_ruleConstructorCallExpression= ruleConstructorCallExpression EOF ;
+    // InternalScope.g:4147:1: entryRuleConstructorCallExpression returns [EObject current=null] : iv_ruleConstructorCallExpression= ruleConstructorCallExpression EOF ;
     public final EObject entryRuleConstructorCallExpression() throws RecognitionException {
         EObject current = null;
 
@@ -11824,13 +11824,13 @@ public final EObject entryRuleConstructorCallExpression() throws RecognitionExce
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4148:2: (iv_ruleConstructorCallExpression= ruleConstructorCallExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4149:2: iv_ruleConstructorCallExpression= ruleConstructorCallExpression EOF
+            // InternalScope.g:4148:2: (iv_ruleConstructorCallExpression= ruleConstructorCallExpression EOF )
+            // InternalScope.g:4149:2: iv_ruleConstructorCallExpression= ruleConstructorCallExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getConstructorCallExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleConstructorCallExpression_in_entryRuleConstructorCallExpression9356);
+            pushFollow(FOLLOW_1);
             iv_ruleConstructorCallExpression=ruleConstructorCallExpression();
 
             state._fsp--;
@@ -11838,7 +11838,7 @@ public final EObject entryRuleConstructorCallExpression() throws RecognitionExce
             if ( state.backtracking==0 ) {
                current =iv_ruleConstructorCallExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleConstructorCallExpression9366); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -11856,7 +11856,7 @@ public final EObject entryRuleConstructorCallExpression() throws RecognitionExce
 
 
     // $ANTLR start "ruleConstructorCallExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4156:1: ruleConstructorCallExpression returns [EObject current=null] : (otherlv_0= 'new' ( (lv_type_1_0= ruleSimpleType ) ) ) ;
+    // InternalScope.g:4156:1: ruleConstructorCallExpression returns [EObject current=null] : (otherlv_0= 'new' ( (lv_type_1_0= ruleSimpleType ) ) ) ;
     public final EObject ruleConstructorCallExpression() throws RecognitionException {
         EObject current = null;
 
@@ -11867,30 +11867,30 @@ public final EObject ruleConstructorCallExpression() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4159:28: ( (otherlv_0= 'new' ( (lv_type_1_0= ruleSimpleType ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4160:1: (otherlv_0= 'new' ( (lv_type_1_0= ruleSimpleType ) ) )
+            // InternalScope.g:4159:28: ( (otherlv_0= 'new' ( (lv_type_1_0= ruleSimpleType ) ) ) )
+            // InternalScope.g:4160:1: (otherlv_0= 'new' ( (lv_type_1_0= ruleSimpleType ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4160:1: (otherlv_0= 'new' ( (lv_type_1_0= ruleSimpleType ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4160:3: otherlv_0= 'new' ( (lv_type_1_0= ruleSimpleType ) )
+            // InternalScope.g:4160:1: (otherlv_0= 'new' ( (lv_type_1_0= ruleSimpleType ) ) )
+            // InternalScope.g:4160:3: otherlv_0= 'new' ( (lv_type_1_0= ruleSimpleType ) )
             {
-            otherlv_0=(Token)match(input,81,FOLLOW_81_in_ruleConstructorCallExpression9403); if (state.failed) return current;
+            otherlv_0=(Token)match(input,81,FOLLOW_45); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_0, grammarAccess.getConstructorCallExpressionAccess().getNewKeyword_0());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4164:1: ( (lv_type_1_0= ruleSimpleType ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4165:1: (lv_type_1_0= ruleSimpleType )
+            // InternalScope.g:4164:1: ( (lv_type_1_0= ruleSimpleType ) )
+            // InternalScope.g:4165:1: (lv_type_1_0= ruleSimpleType )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4165:1: (lv_type_1_0= ruleSimpleType )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4166:3: lv_type_1_0= ruleSimpleType
+            // InternalScope.g:4165:1: (lv_type_1_0= ruleSimpleType )
+            // InternalScope.g:4166:3: lv_type_1_0= ruleSimpleType
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getConstructorCallExpressionAccess().getTypeSimpleTypeParserRuleCall_1_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleSimpleType_in_ruleConstructorCallExpression9424);
+            pushFollow(FOLLOW_2);
             lv_type_1_0=ruleSimpleType();
 
             state._fsp--;
@@ -11904,7 +11904,7 @@ public final EObject ruleConstructorCallExpression() throws RecognitionException
                      			current, 
                      			"type",
                       		lv_type_1_0, 
-                      		"SimpleType");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.SimpleType");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -11937,7 +11937,7 @@ public final EObject ruleConstructorCallExpression() throws RecognitionException
 
 
     // $ANTLR start "entryRuleTypeSelectExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4190:1: entryRuleTypeSelectExpression returns [EObject current=null] : iv_ruleTypeSelectExpression= ruleTypeSelectExpression EOF ;
+    // InternalScope.g:4190:1: entryRuleTypeSelectExpression returns [EObject current=null] : iv_ruleTypeSelectExpression= ruleTypeSelectExpression EOF ;
     public final EObject entryRuleTypeSelectExpression() throws RecognitionException {
         EObject current = null;
 
@@ -11945,13 +11945,13 @@ public final EObject entryRuleTypeSelectExpression() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4191:2: (iv_ruleTypeSelectExpression= ruleTypeSelectExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4192:2: iv_ruleTypeSelectExpression= ruleTypeSelectExpression EOF
+            // InternalScope.g:4191:2: (iv_ruleTypeSelectExpression= ruleTypeSelectExpression EOF )
+            // InternalScope.g:4192:2: iv_ruleTypeSelectExpression= ruleTypeSelectExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTypeSelectExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleTypeSelectExpression_in_entryRuleTypeSelectExpression9460);
+            pushFollow(FOLLOW_1);
             iv_ruleTypeSelectExpression=ruleTypeSelectExpression();
 
             state._fsp--;
@@ -11959,7 +11959,7 @@ public final EObject entryRuleTypeSelectExpression() throws RecognitionException
             if ( state.backtracking==0 ) {
                current =iv_ruleTypeSelectExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTypeSelectExpression9470); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -11977,7 +11977,7 @@ public final EObject entryRuleTypeSelectExpression() throws RecognitionException
 
 
     // $ANTLR start "ruleTypeSelectExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4199:1: ruleTypeSelectExpression returns [EObject current=null] : ( ( (lv_name_0_0= 'typeSelect' ) ) otherlv_1= '(' ( (lv_type_2_0= ruleType ) ) otherlv_3= ')' ) ;
+    // InternalScope.g:4199:1: ruleTypeSelectExpression returns [EObject current=null] : ( ( (lv_name_0_0= 'typeSelect' ) ) otherlv_1= '(' ( (lv_type_2_0= ruleType ) ) otherlv_3= ')' ) ;
     public final EObject ruleTypeSelectExpression() throws RecognitionException {
         EObject current = null;
 
@@ -11990,19 +11990,19 @@ public final EObject ruleTypeSelectExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4202:28: ( ( ( (lv_name_0_0= 'typeSelect' ) ) otherlv_1= '(' ( (lv_type_2_0= ruleType ) ) otherlv_3= ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4203:1: ( ( (lv_name_0_0= 'typeSelect' ) ) otherlv_1= '(' ( (lv_type_2_0= ruleType ) ) otherlv_3= ')' )
+            // InternalScope.g:4202:28: ( ( ( (lv_name_0_0= 'typeSelect' ) ) otherlv_1= '(' ( (lv_type_2_0= ruleType ) ) otherlv_3= ')' ) )
+            // InternalScope.g:4203:1: ( ( (lv_name_0_0= 'typeSelect' ) ) otherlv_1= '(' ( (lv_type_2_0= ruleType ) ) otherlv_3= ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4203:1: ( ( (lv_name_0_0= 'typeSelect' ) ) otherlv_1= '(' ( (lv_type_2_0= ruleType ) ) otherlv_3= ')' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4203:2: ( (lv_name_0_0= 'typeSelect' ) ) otherlv_1= '(' ( (lv_type_2_0= ruleType ) ) otherlv_3= ')'
+            // InternalScope.g:4203:1: ( ( (lv_name_0_0= 'typeSelect' ) ) otherlv_1= '(' ( (lv_type_2_0= ruleType ) ) otherlv_3= ')' )
+            // InternalScope.g:4203:2: ( (lv_name_0_0= 'typeSelect' ) ) otherlv_1= '(' ( (lv_type_2_0= ruleType ) ) otherlv_3= ')'
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4203:2: ( (lv_name_0_0= 'typeSelect' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4204:1: (lv_name_0_0= 'typeSelect' )
+            // InternalScope.g:4203:2: ( (lv_name_0_0= 'typeSelect' ) )
+            // InternalScope.g:4204:1: (lv_name_0_0= 'typeSelect' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4204:1: (lv_name_0_0= 'typeSelect' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4205:3: lv_name_0_0= 'typeSelect'
+            // InternalScope.g:4204:1: (lv_name_0_0= 'typeSelect' )
+            // InternalScope.g:4205:3: lv_name_0_0= 'typeSelect'
             {
-            lv_name_0_0=(Token)match(input,68,FOLLOW_68_in_ruleTypeSelectExpression9513); if (state.failed) return current;
+            lv_name_0_0=(Token)match(input,68,FOLLOW_30); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                       newLeafNode(lv_name_0_0, grammarAccess.getTypeSelectExpressionAccess().getNameTypeSelectKeyword_0_0());
@@ -12022,24 +12022,24 @@ public final EObject ruleTypeSelectExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,25,FOLLOW_25_in_ruleTypeSelectExpression9538); if (state.failed) return current;
+            otherlv_1=(Token)match(input,25,FOLLOW_45); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getTypeSelectExpressionAccess().getLeftParenthesisKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4222:1: ( (lv_type_2_0= ruleType ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4223:1: (lv_type_2_0= ruleType )
+            // InternalScope.g:4222:1: ( (lv_type_2_0= ruleType ) )
+            // InternalScope.g:4223:1: (lv_type_2_0= ruleType )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4223:1: (lv_type_2_0= ruleType )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4224:3: lv_type_2_0= ruleType
+            // InternalScope.g:4223:1: (lv_type_2_0= ruleType )
+            // InternalScope.g:4224:3: lv_type_2_0= ruleType
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getTypeSelectExpressionAccess().getTypeTypeParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleType_in_ruleTypeSelectExpression9559);
+            pushFollow(FOLLOW_20);
             lv_type_2_0=ruleType();
 
             state._fsp--;
@@ -12053,7 +12053,7 @@ public final EObject ruleTypeSelectExpression() throws RecognitionException {
                      			current, 
                      			"type",
                       		lv_type_2_0, 
-                      		"Type");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Type");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -12063,7 +12063,7 @@ public final EObject ruleTypeSelectExpression() throws RecognitionException {
 
             }
 
-            otherlv_3=(Token)match(input,26,FOLLOW_26_in_ruleTypeSelectExpression9571); if (state.failed) return current;
+            otherlv_3=(Token)match(input,26,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_3, grammarAccess.getTypeSelectExpressionAccess().getRightParenthesisKeyword_3());
@@ -12092,7 +12092,7 @@ public final EObject ruleTypeSelectExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleCollectionExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4252:1: entryRuleCollectionExpression returns [EObject current=null] : iv_ruleCollectionExpression= ruleCollectionExpression EOF ;
+    // InternalScope.g:4252:1: entryRuleCollectionExpression returns [EObject current=null] : iv_ruleCollectionExpression= ruleCollectionExpression EOF ;
     public final EObject entryRuleCollectionExpression() throws RecognitionException {
         EObject current = null;
 
@@ -12100,13 +12100,13 @@ public final EObject entryRuleCollectionExpression() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4253:2: (iv_ruleCollectionExpression= ruleCollectionExpression EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4254:2: iv_ruleCollectionExpression= ruleCollectionExpression EOF
+            // InternalScope.g:4253:2: (iv_ruleCollectionExpression= ruleCollectionExpression EOF )
+            // InternalScope.g:4254:2: iv_ruleCollectionExpression= ruleCollectionExpression EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getCollectionExpressionRule()); 
             }
-            pushFollow(FOLLOW_ruleCollectionExpression_in_entryRuleCollectionExpression9607);
+            pushFollow(FOLLOW_1);
             iv_ruleCollectionExpression=ruleCollectionExpression();
 
             state._fsp--;
@@ -12114,7 +12114,7 @@ public final EObject entryRuleCollectionExpression() throws RecognitionException
             if ( state.backtracking==0 ) {
                current =iv_ruleCollectionExpression; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleCollectionExpression9617); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -12132,7 +12132,7 @@ public final EObject entryRuleCollectionExpression() throws RecognitionException
 
 
     // $ANTLR start "ruleCollectionExpression"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4261:1: ruleCollectionExpression returns [EObject current=null] : ( ( ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) ) ) otherlv_1= '(' ( ( (lv_var_2_0= ruleIdentifier ) ) otherlv_3= '|' )? ( (lv_exp_4_0= ruleExpression ) ) otherlv_5= ')' ) ;
+    // InternalScope.g:4261:1: ruleCollectionExpression returns [EObject current=null] : ( ( ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) ) ) otherlv_1= '(' ( ( (lv_var_2_0= ruleIdentifier ) ) otherlv_3= '|' )? ( (lv_exp_4_0= ruleExpression ) ) otherlv_5= ')' ) ;
     public final EObject ruleCollectionExpression() throws RecognitionException {
         EObject current = null;
 
@@ -12155,19 +12155,19 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4264:28: ( ( ( ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) ) ) otherlv_1= '(' ( ( (lv_var_2_0= ruleIdentifier ) ) otherlv_3= '|' )? ( (lv_exp_4_0= ruleExpression ) ) otherlv_5= ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4265:1: ( ( ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) ) ) otherlv_1= '(' ( ( (lv_var_2_0= ruleIdentifier ) ) otherlv_3= '|' )? ( (lv_exp_4_0= ruleExpression ) ) otherlv_5= ')' )
+            // InternalScope.g:4264:28: ( ( ( ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) ) ) otherlv_1= '(' ( ( (lv_var_2_0= ruleIdentifier ) ) otherlv_3= '|' )? ( (lv_exp_4_0= ruleExpression ) ) otherlv_5= ')' ) )
+            // InternalScope.g:4265:1: ( ( ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) ) ) otherlv_1= '(' ( ( (lv_var_2_0= ruleIdentifier ) ) otherlv_3= '|' )? ( (lv_exp_4_0= ruleExpression ) ) otherlv_5= ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4265:1: ( ( ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) ) ) otherlv_1= '(' ( ( (lv_var_2_0= ruleIdentifier ) ) otherlv_3= '|' )? ( (lv_exp_4_0= ruleExpression ) ) otherlv_5= ')' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4265:2: ( ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) ) ) otherlv_1= '(' ( ( (lv_var_2_0= ruleIdentifier ) ) otherlv_3= '|' )? ( (lv_exp_4_0= ruleExpression ) ) otherlv_5= ')'
+            // InternalScope.g:4265:1: ( ( ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) ) ) otherlv_1= '(' ( ( (lv_var_2_0= ruleIdentifier ) ) otherlv_3= '|' )? ( (lv_exp_4_0= ruleExpression ) ) otherlv_5= ')' )
+            // InternalScope.g:4265:2: ( ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) ) ) otherlv_1= '(' ( ( (lv_var_2_0= ruleIdentifier ) ) otherlv_3= '|' )? ( (lv_exp_4_0= ruleExpression ) ) otherlv_5= ')'
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4265:2: ( ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4266:1: ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) )
+            // InternalScope.g:4265:2: ( ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) ) )
+            // InternalScope.g:4266:1: ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4266:1: ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4267:1: (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' )
+            // InternalScope.g:4266:1: ( (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' ) )
+            // InternalScope.g:4267:1: (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4267:1: (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' )
+            // InternalScope.g:4267:1: (lv_name_0_1= 'collect' | lv_name_0_2= 'select' | lv_name_0_3= 'selectFirst' | lv_name_0_4= 'reject' | lv_name_0_5= 'exists' | lv_name_0_6= 'notExists' | lv_name_0_7= 'sortBy' | lv_name_0_8= 'forAll' )
             int alt68=8;
             switch ( input.LA(1) ) {
             case 69:
@@ -12220,9 +12220,9 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
 
             switch (alt68) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4268:3: lv_name_0_1= 'collect'
+                    // InternalScope.g:4268:3: lv_name_0_1= 'collect'
                     {
-                    lv_name_0_1=(Token)match(input,69,FOLLOW_69_in_ruleCollectionExpression9662); if (state.failed) return current;
+                    lv_name_0_1=(Token)match(input,69,FOLLOW_30); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_name_0_1, grammarAccess.getCollectionExpressionAccess().getNameCollectKeyword_0_0_0());
@@ -12240,9 +12240,9 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4280:8: lv_name_0_2= 'select'
+                    // InternalScope.g:4280:8: lv_name_0_2= 'select'
                     {
-                    lv_name_0_2=(Token)match(input,70,FOLLOW_70_in_ruleCollectionExpression9691); if (state.failed) return current;
+                    lv_name_0_2=(Token)match(input,70,FOLLOW_30); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_name_0_2, grammarAccess.getCollectionExpressionAccess().getNameSelectKeyword_0_0_1());
@@ -12260,9 +12260,9 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4292:8: lv_name_0_3= 'selectFirst'
+                    // InternalScope.g:4292:8: lv_name_0_3= 'selectFirst'
                     {
-                    lv_name_0_3=(Token)match(input,71,FOLLOW_71_in_ruleCollectionExpression9720); if (state.failed) return current;
+                    lv_name_0_3=(Token)match(input,71,FOLLOW_30); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_name_0_3, grammarAccess.getCollectionExpressionAccess().getNameSelectFirstKeyword_0_0_2());
@@ -12280,9 +12280,9 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4304:8: lv_name_0_4= 'reject'
+                    // InternalScope.g:4304:8: lv_name_0_4= 'reject'
                     {
-                    lv_name_0_4=(Token)match(input,72,FOLLOW_72_in_ruleCollectionExpression9749); if (state.failed) return current;
+                    lv_name_0_4=(Token)match(input,72,FOLLOW_30); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_name_0_4, grammarAccess.getCollectionExpressionAccess().getNameRejectKeyword_0_0_3());
@@ -12300,9 +12300,9 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4316:8: lv_name_0_5= 'exists'
+                    // InternalScope.g:4316:8: lv_name_0_5= 'exists'
                     {
-                    lv_name_0_5=(Token)match(input,73,FOLLOW_73_in_ruleCollectionExpression9778); if (state.failed) return current;
+                    lv_name_0_5=(Token)match(input,73,FOLLOW_30); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_name_0_5, grammarAccess.getCollectionExpressionAccess().getNameExistsKeyword_0_0_4());
@@ -12320,9 +12320,9 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4328:8: lv_name_0_6= 'notExists'
+                    // InternalScope.g:4328:8: lv_name_0_6= 'notExists'
                     {
-                    lv_name_0_6=(Token)match(input,74,FOLLOW_74_in_ruleCollectionExpression9807); if (state.failed) return current;
+                    lv_name_0_6=(Token)match(input,74,FOLLOW_30); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_name_0_6, grammarAccess.getCollectionExpressionAccess().getNameNotExistsKeyword_0_0_5());
@@ -12340,9 +12340,9 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4340:8: lv_name_0_7= 'sortBy'
+                    // InternalScope.g:4340:8: lv_name_0_7= 'sortBy'
                     {
-                    lv_name_0_7=(Token)match(input,75,FOLLOW_75_in_ruleCollectionExpression9836); if (state.failed) return current;
+                    lv_name_0_7=(Token)match(input,75,FOLLOW_30); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_name_0_7, grammarAccess.getCollectionExpressionAccess().getNameSortByKeyword_0_0_6());
@@ -12360,9 +12360,9 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
                     }
                     break;
                 case 8 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4352:8: lv_name_0_8= 'forAll'
+                    // InternalScope.g:4352:8: lv_name_0_8= 'forAll'
                     {
-                    lv_name_0_8=(Token)match(input,76,FOLLOW_76_in_ruleCollectionExpression9865); if (state.failed) return current;
+                    lv_name_0_8=(Token)match(input,76,FOLLOW_30); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_name_0_8, grammarAccess.getCollectionExpressionAccess().getNameForAllKeyword_0_0_7());
@@ -12388,13 +12388,13 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,25,FOLLOW_25_in_ruleCollectionExpression9893); if (state.failed) return current;
+            otherlv_1=(Token)match(input,25,FOLLOW_17); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getCollectionExpressionAccess().getLeftParenthesisKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4371:1: ( ( (lv_var_2_0= ruleIdentifier ) ) otherlv_3= '|' )?
+            // InternalScope.g:4371:1: ( ( (lv_var_2_0= ruleIdentifier ) ) otherlv_3= '|' )?
             int alt69=2;
             int LA69_0 = input.LA(1);
 
@@ -12407,20 +12407,20 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
             }
             switch (alt69) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4371:2: ( (lv_var_2_0= ruleIdentifier ) ) otherlv_3= '|'
+                    // InternalScope.g:4371:2: ( (lv_var_2_0= ruleIdentifier ) ) otherlv_3= '|'
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4371:2: ( (lv_var_2_0= ruleIdentifier ) )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4372:1: (lv_var_2_0= ruleIdentifier )
+                    // InternalScope.g:4371:2: ( (lv_var_2_0= ruleIdentifier ) )
+                    // InternalScope.g:4372:1: (lv_var_2_0= ruleIdentifier )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4372:1: (lv_var_2_0= ruleIdentifier )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4373:3: lv_var_2_0= ruleIdentifier
+                    // InternalScope.g:4372:1: (lv_var_2_0= ruleIdentifier )
+                    // InternalScope.g:4373:3: lv_var_2_0= ruleIdentifier
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getCollectionExpressionAccess().getVarIdentifierParserRuleCall_2_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleIdentifier_in_ruleCollectionExpression9915);
+                    pushFollow(FOLLOW_41);
                     lv_var_2_0=ruleIdentifier();
 
                     state._fsp--;
@@ -12434,7 +12434,7 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
                              			current, 
                              			"var",
                               		lv_var_2_0, 
-                              		"Identifier");
+                              		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
                       	        afterParserOrEnumRuleCall();
                       	    
                     }
@@ -12444,7 +12444,7 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
 
                     }
 
-                    otherlv_3=(Token)match(input,33,FOLLOW_33_in_ruleCollectionExpression9927); if (state.failed) return current;
+                    otherlv_3=(Token)match(input,33,FOLLOW_17); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                           	newLeafNode(otherlv_3, grammarAccess.getCollectionExpressionAccess().getVerticalLineKeyword_2_1());
@@ -12456,18 +12456,18 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4393:3: ( (lv_exp_4_0= ruleExpression ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4394:1: (lv_exp_4_0= ruleExpression )
+            // InternalScope.g:4393:3: ( (lv_exp_4_0= ruleExpression ) )
+            // InternalScope.g:4394:1: (lv_exp_4_0= ruleExpression )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4394:1: (lv_exp_4_0= ruleExpression )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4395:3: lv_exp_4_0= ruleExpression
+            // InternalScope.g:4394:1: (lv_exp_4_0= ruleExpression )
+            // InternalScope.g:4395:3: lv_exp_4_0= ruleExpression
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getCollectionExpressionAccess().getExpExpressionParserRuleCall_3_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleExpression_in_ruleCollectionExpression9950);
+            pushFollow(FOLLOW_20);
             lv_exp_4_0=ruleExpression();
 
             state._fsp--;
@@ -12481,7 +12481,7 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
                      			current, 
                      			"exp",
                       		lv_exp_4_0, 
-                      		"Expression");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Expression");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -12491,7 +12491,7 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
 
             }
 
-            otherlv_5=(Token)match(input,26,FOLLOW_26_in_ruleCollectionExpression9962); if (state.failed) return current;
+            otherlv_5=(Token)match(input,26,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_5, grammarAccess.getCollectionExpressionAccess().getRightParenthesisKeyword_4());
@@ -12520,7 +12520,7 @@ public final EObject ruleCollectionExpression() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleType"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4423:1: entryRuleType returns [EObject current=null] : iv_ruleType= ruleType EOF ;
+    // InternalScope.g:4423:1: entryRuleType returns [EObject current=null] : iv_ruleType= ruleType EOF ;
     public final EObject entryRuleType() throws RecognitionException {
         EObject current = null;
 
@@ -12528,13 +12528,13 @@ public final EObject entryRuleType() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4424:2: (iv_ruleType= ruleType EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4425:2: iv_ruleType= ruleType EOF
+            // InternalScope.g:4424:2: (iv_ruleType= ruleType EOF )
+            // InternalScope.g:4425:2: iv_ruleType= ruleType EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getTypeRule()); 
             }
-            pushFollow(FOLLOW_ruleType_in_entryRuleType9998);
+            pushFollow(FOLLOW_1);
             iv_ruleType=ruleType();
 
             state._fsp--;
@@ -12542,7 +12542,7 @@ public final EObject entryRuleType() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleType; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleType10008); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -12560,7 +12560,7 @@ public final EObject entryRuleType() throws RecognitionException {
 
 
     // $ANTLR start "ruleType"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4432:1: ruleType returns [EObject current=null] : (this_CollectionType_0= ruleCollectionType | this_SimpleType_1= ruleSimpleType ) ;
+    // InternalScope.g:4432:1: ruleType returns [EObject current=null] : (this_CollectionType_0= ruleCollectionType | this_SimpleType_1= ruleSimpleType ) ;
     public final EObject ruleType() throws RecognitionException {
         EObject current = null;
 
@@ -12572,10 +12572,10 @@ public final EObject ruleType() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4435:28: ( (this_CollectionType_0= ruleCollectionType | this_SimpleType_1= ruleSimpleType ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4436:1: (this_CollectionType_0= ruleCollectionType | this_SimpleType_1= ruleSimpleType )
+            // InternalScope.g:4435:28: ( (this_CollectionType_0= ruleCollectionType | this_SimpleType_1= ruleSimpleType ) )
+            // InternalScope.g:4436:1: (this_CollectionType_0= ruleCollectionType | this_SimpleType_1= ruleSimpleType )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4436:1: (this_CollectionType_0= ruleCollectionType | this_SimpleType_1= ruleSimpleType )
+            // InternalScope.g:4436:1: (this_CollectionType_0= ruleCollectionType | this_SimpleType_1= ruleSimpleType )
             int alt70=2;
             int LA70_0 = input.LA(1);
 
@@ -12594,14 +12594,14 @@ else if ( (LA70_0==RULE_ID) ) {
             }
             switch (alt70) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4437:5: this_CollectionType_0= ruleCollectionType
+                    // InternalScope.g:4437:5: this_CollectionType_0= ruleCollectionType
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getTypeAccess().getCollectionTypeParserRuleCall_0()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleCollectionType_in_ruleType10055);
+                    pushFollow(FOLLOW_2);
                     this_CollectionType_0=ruleCollectionType();
 
                     state._fsp--;
@@ -12616,14 +12616,14 @@ else if ( (LA70_0==RULE_ID) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4447:5: this_SimpleType_1= ruleSimpleType
+                    // InternalScope.g:4447:5: this_SimpleType_1= ruleSimpleType
                     {
                     if ( state.backtracking==0 ) {
                        
                               newCompositeNode(grammarAccess.getTypeAccess().getSimpleTypeParserRuleCall_1()); 
                           
                     }
-                    pushFollow(FOLLOW_ruleSimpleType_in_ruleType10082);
+                    pushFollow(FOLLOW_2);
                     this_SimpleType_1=ruleSimpleType();
 
                     state._fsp--;
@@ -12660,7 +12660,7 @@ else if ( (LA70_0==RULE_ID) ) {
 
 
     // $ANTLR start "entryRuleCollectionType"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4463:1: entryRuleCollectionType returns [EObject current=null] : iv_ruleCollectionType= ruleCollectionType EOF ;
+    // InternalScope.g:4463:1: entryRuleCollectionType returns [EObject current=null] : iv_ruleCollectionType= ruleCollectionType EOF ;
     public final EObject entryRuleCollectionType() throws RecognitionException {
         EObject current = null;
 
@@ -12668,13 +12668,13 @@ public final EObject entryRuleCollectionType() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4464:2: (iv_ruleCollectionType= ruleCollectionType EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4465:2: iv_ruleCollectionType= ruleCollectionType EOF
+            // InternalScope.g:4464:2: (iv_ruleCollectionType= ruleCollectionType EOF )
+            // InternalScope.g:4465:2: iv_ruleCollectionType= ruleCollectionType EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getCollectionTypeRule()); 
             }
-            pushFollow(FOLLOW_ruleCollectionType_in_entryRuleCollectionType10117);
+            pushFollow(FOLLOW_1);
             iv_ruleCollectionType=ruleCollectionType();
 
             state._fsp--;
@@ -12682,7 +12682,7 @@ public final EObject entryRuleCollectionType() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleCollectionType; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleCollectionType10127); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -12700,7 +12700,7 @@ public final EObject entryRuleCollectionType() throws RecognitionException {
 
 
     // $ANTLR start "ruleCollectionType"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4472:1: ruleCollectionType returns [EObject current=null] : ( ( ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) ) ) otherlv_1= '[' ( (lv_id1_2_0= ruleSimpleType ) ) otherlv_3= ']' ) ;
+    // InternalScope.g:4472:1: ruleCollectionType returns [EObject current=null] : ( ( ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) ) ) otherlv_1= '[' ( (lv_id1_2_0= ruleSimpleType ) ) otherlv_3= ']' ) ;
     public final EObject ruleCollectionType() throws RecognitionException {
         EObject current = null;
 
@@ -12715,19 +12715,19 @@ public final EObject ruleCollectionType() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4475:28: ( ( ( ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) ) ) otherlv_1= '[' ( (lv_id1_2_0= ruleSimpleType ) ) otherlv_3= ']' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4476:1: ( ( ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) ) ) otherlv_1= '[' ( (lv_id1_2_0= ruleSimpleType ) ) otherlv_3= ']' )
+            // InternalScope.g:4475:28: ( ( ( ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) ) ) otherlv_1= '[' ( (lv_id1_2_0= ruleSimpleType ) ) otherlv_3= ']' ) )
+            // InternalScope.g:4476:1: ( ( ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) ) ) otherlv_1= '[' ( (lv_id1_2_0= ruleSimpleType ) ) otherlv_3= ']' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4476:1: ( ( ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) ) ) otherlv_1= '[' ( (lv_id1_2_0= ruleSimpleType ) ) otherlv_3= ']' )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4476:2: ( ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) ) ) otherlv_1= '[' ( (lv_id1_2_0= ruleSimpleType ) ) otherlv_3= ']'
+            // InternalScope.g:4476:1: ( ( ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) ) ) otherlv_1= '[' ( (lv_id1_2_0= ruleSimpleType ) ) otherlv_3= ']' )
+            // InternalScope.g:4476:2: ( ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) ) ) otherlv_1= '[' ( (lv_id1_2_0= ruleSimpleType ) ) otherlv_3= ']'
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4476:2: ( ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4477:1: ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) )
+            // InternalScope.g:4476:2: ( ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) ) )
+            // InternalScope.g:4477:1: ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4477:1: ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4478:1: (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' )
+            // InternalScope.g:4477:1: ( (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' ) )
+            // InternalScope.g:4478:1: (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4478:1: (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' )
+            // InternalScope.g:4478:1: (lv_cl_0_1= 'Collection' | lv_cl_0_2= 'List' | lv_cl_0_3= 'Set' )
             int alt71=3;
             switch ( input.LA(1) ) {
             case 82:
@@ -12755,9 +12755,9 @@ public final EObject ruleCollectionType() throws RecognitionException {
 
             switch (alt71) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4479:3: lv_cl_0_1= 'Collection'
+                    // InternalScope.g:4479:3: lv_cl_0_1= 'Collection'
                     {
-                    lv_cl_0_1=(Token)match(input,82,FOLLOW_82_in_ruleCollectionType10172); if (state.failed) return current;
+                    lv_cl_0_1=(Token)match(input,82,FOLLOW_65); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_cl_0_1, grammarAccess.getCollectionTypeAccess().getClCollectionKeyword_0_0_0());
@@ -12775,9 +12775,9 @@ public final EObject ruleCollectionType() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4491:8: lv_cl_0_2= 'List'
+                    // InternalScope.g:4491:8: lv_cl_0_2= 'List'
                     {
-                    lv_cl_0_2=(Token)match(input,83,FOLLOW_83_in_ruleCollectionType10201); if (state.failed) return current;
+                    lv_cl_0_2=(Token)match(input,83,FOLLOW_65); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_cl_0_2, grammarAccess.getCollectionTypeAccess().getClListKeyword_0_0_1());
@@ -12795,9 +12795,9 @@ public final EObject ruleCollectionType() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4503:8: lv_cl_0_3= 'Set'
+                    // InternalScope.g:4503:8: lv_cl_0_3= 'Set'
                     {
-                    lv_cl_0_3=(Token)match(input,84,FOLLOW_84_in_ruleCollectionType10230); if (state.failed) return current;
+                    lv_cl_0_3=(Token)match(input,84,FOLLOW_65); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               newLeafNode(lv_cl_0_3, grammarAccess.getCollectionTypeAccess().getClSetKeyword_0_0_2());
@@ -12823,24 +12823,24 @@ public final EObject ruleCollectionType() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,31,FOLLOW_31_in_ruleCollectionType10258); if (state.failed) return current;
+            otherlv_1=(Token)match(input,31,FOLLOW_45); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getCollectionTypeAccess().getLeftSquareBracketKeyword_1());
                   
             }
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4522:1: ( (lv_id1_2_0= ruleSimpleType ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4523:1: (lv_id1_2_0= ruleSimpleType )
+            // InternalScope.g:4522:1: ( (lv_id1_2_0= ruleSimpleType ) )
+            // InternalScope.g:4523:1: (lv_id1_2_0= ruleSimpleType )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4523:1: (lv_id1_2_0= ruleSimpleType )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4524:3: lv_id1_2_0= ruleSimpleType
+            // InternalScope.g:4523:1: (lv_id1_2_0= ruleSimpleType )
+            // InternalScope.g:4524:3: lv_id1_2_0= ruleSimpleType
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getCollectionTypeAccess().getId1SimpleTypeParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleSimpleType_in_ruleCollectionType10279);
+            pushFollow(FOLLOW_28);
             lv_id1_2_0=ruleSimpleType();
 
             state._fsp--;
@@ -12854,7 +12854,7 @@ public final EObject ruleCollectionType() throws RecognitionException {
                      			current, 
                      			"id1",
                       		lv_id1_2_0, 
-                      		"SimpleType");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.SimpleType");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -12864,7 +12864,7 @@ public final EObject ruleCollectionType() throws RecognitionException {
 
             }
 
-            otherlv_3=(Token)match(input,32,FOLLOW_32_in_ruleCollectionType10291); if (state.failed) return current;
+            otherlv_3=(Token)match(input,32,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_3, grammarAccess.getCollectionTypeAccess().getRightSquareBracketKeyword_3());
@@ -12893,7 +12893,7 @@ public final EObject ruleCollectionType() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleSimpleType"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4552:1: entryRuleSimpleType returns [EObject current=null] : iv_ruleSimpleType= ruleSimpleType EOF ;
+    // InternalScope.g:4552:1: entryRuleSimpleType returns [EObject current=null] : iv_ruleSimpleType= ruleSimpleType EOF ;
     public final EObject entryRuleSimpleType() throws RecognitionException {
         EObject current = null;
 
@@ -12901,13 +12901,13 @@ public final EObject entryRuleSimpleType() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4553:2: (iv_ruleSimpleType= ruleSimpleType EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4554:2: iv_ruleSimpleType= ruleSimpleType EOF
+            // InternalScope.g:4553:2: (iv_ruleSimpleType= ruleSimpleType EOF )
+            // InternalScope.g:4554:2: iv_ruleSimpleType= ruleSimpleType EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getSimpleTypeRule()); 
             }
-            pushFollow(FOLLOW_ruleSimpleType_in_entryRuleSimpleType10327);
+            pushFollow(FOLLOW_1);
             iv_ruleSimpleType=ruleSimpleType();
 
             state._fsp--;
@@ -12915,7 +12915,7 @@ public final EObject entryRuleSimpleType() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleSimpleType; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSimpleType10337); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -12933,7 +12933,7 @@ public final EObject entryRuleSimpleType() throws RecognitionException {
 
 
     // $ANTLR start "ruleSimpleType"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4561:1: ruleSimpleType returns [EObject current=null] : ( ( (lv_id_0_0= ruleIdentifier ) ) (otherlv_1= '::' ( (lv_id_2_0= ruleIdentifier ) ) )* ) ;
+    // InternalScope.g:4561:1: ruleSimpleType returns [EObject current=null] : ( ( (lv_id_0_0= ruleIdentifier ) ) (otherlv_1= '::' ( (lv_id_2_0= ruleIdentifier ) ) )* ) ;
     public final EObject ruleSimpleType() throws RecognitionException {
         EObject current = null;
 
@@ -12946,24 +12946,24 @@ public final EObject ruleSimpleType() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4564:28: ( ( ( (lv_id_0_0= ruleIdentifier ) ) (otherlv_1= '::' ( (lv_id_2_0= ruleIdentifier ) ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4565:1: ( ( (lv_id_0_0= ruleIdentifier ) ) (otherlv_1= '::' ( (lv_id_2_0= ruleIdentifier ) ) )* )
+            // InternalScope.g:4564:28: ( ( ( (lv_id_0_0= ruleIdentifier ) ) (otherlv_1= '::' ( (lv_id_2_0= ruleIdentifier ) ) )* ) )
+            // InternalScope.g:4565:1: ( ( (lv_id_0_0= ruleIdentifier ) ) (otherlv_1= '::' ( (lv_id_2_0= ruleIdentifier ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4565:1: ( ( (lv_id_0_0= ruleIdentifier ) ) (otherlv_1= '::' ( (lv_id_2_0= ruleIdentifier ) ) )* )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4565:2: ( (lv_id_0_0= ruleIdentifier ) ) (otherlv_1= '::' ( (lv_id_2_0= ruleIdentifier ) ) )*
+            // InternalScope.g:4565:1: ( ( (lv_id_0_0= ruleIdentifier ) ) (otherlv_1= '::' ( (lv_id_2_0= ruleIdentifier ) ) )* )
+            // InternalScope.g:4565:2: ( (lv_id_0_0= ruleIdentifier ) ) (otherlv_1= '::' ( (lv_id_2_0= ruleIdentifier ) ) )*
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4565:2: ( (lv_id_0_0= ruleIdentifier ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4566:1: (lv_id_0_0= ruleIdentifier )
+            // InternalScope.g:4565:2: ( (lv_id_0_0= ruleIdentifier ) )
+            // InternalScope.g:4566:1: (lv_id_0_0= ruleIdentifier )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4566:1: (lv_id_0_0= ruleIdentifier )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4567:3: lv_id_0_0= ruleIdentifier
+            // InternalScope.g:4566:1: (lv_id_0_0= ruleIdentifier )
+            // InternalScope.g:4567:3: lv_id_0_0= ruleIdentifier
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getSimpleTypeAccess().getIdIdentifierParserRuleCall_0_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_ruleSimpleType10383);
+            pushFollow(FOLLOW_42);
             lv_id_0_0=ruleIdentifier();
 
             state._fsp--;
@@ -12977,7 +12977,7 @@ public final EObject ruleSimpleType() throws RecognitionException {
                      			current, 
                      			"id",
                       		lv_id_0_0, 
-                      		"Identifier");
+                      		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
               	        afterParserOrEnumRuleCall();
               	    
             }
@@ -12987,7 +12987,7 @@ public final EObject ruleSimpleType() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4583:2: (otherlv_1= '::' ( (lv_id_2_0= ruleIdentifier ) ) )*
+            // InternalScope.g:4583:2: (otherlv_1= '::' ( (lv_id_2_0= ruleIdentifier ) ) )*
             loop72:
             do {
                 int alt72=2;
@@ -13000,26 +13000,26 @@ public final EObject ruleSimpleType() throws RecognitionException {
 
                 switch (alt72) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4583:4: otherlv_1= '::' ( (lv_id_2_0= ruleIdentifier ) )
+            	    // InternalScope.g:4583:4: otherlv_1= '::' ( (lv_id_2_0= ruleIdentifier ) )
             	    {
-            	    otherlv_1=(Token)match(input,44,FOLLOW_44_in_ruleSimpleType10396); if (state.failed) return current;
+            	    otherlv_1=(Token)match(input,44,FOLLOW_3); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	          	newLeafNode(otherlv_1, grammarAccess.getSimpleTypeAccess().getColonColonKeyword_1_0());
             	          
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4587:1: ( (lv_id_2_0= ruleIdentifier ) )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4588:1: (lv_id_2_0= ruleIdentifier )
+            	    // InternalScope.g:4587:1: ( (lv_id_2_0= ruleIdentifier ) )
+            	    // InternalScope.g:4588:1: (lv_id_2_0= ruleIdentifier )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4588:1: (lv_id_2_0= ruleIdentifier )
-            	    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4589:3: lv_id_2_0= ruleIdentifier
+            	    // InternalScope.g:4588:1: (lv_id_2_0= ruleIdentifier )
+            	    // InternalScope.g:4589:3: lv_id_2_0= ruleIdentifier
             	    {
             	    if ( state.backtracking==0 ) {
             	       
             	      	        newCompositeNode(grammarAccess.getSimpleTypeAccess().getIdIdentifierParserRuleCall_1_1_0()); 
             	      	    
             	    }
-            	    pushFollow(FOLLOW_ruleIdentifier_in_ruleSimpleType10417);
+            	    pushFollow(FOLLOW_42);
             	    lv_id_2_0=ruleIdentifier();
 
             	    state._fsp--;
@@ -13033,7 +13033,7 @@ public final EObject ruleSimpleType() throws RecognitionException {
             	             			current, 
             	             			"id",
             	              		lv_id_2_0, 
-            	              		"Identifier");
+            	              		"com.avaloq.tools.ddk.xtext.expression.Expression.Identifier");
             	      	        afterParserOrEnumRuleCall();
             	      	    
             	    }
@@ -13075,7 +13075,7 @@ public final EObject ruleSimpleType() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleIdentifier"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4613:1: entryRuleIdentifier returns [String current=null] : iv_ruleIdentifier= ruleIdentifier EOF ;
+    // InternalScope.g:4613:1: entryRuleIdentifier returns [String current=null] : iv_ruleIdentifier= ruleIdentifier EOF ;
     public final String entryRuleIdentifier() throws RecognitionException {
         String current = null;
 
@@ -13083,13 +13083,13 @@ public final String entryRuleIdentifier() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4614:2: (iv_ruleIdentifier= ruleIdentifier EOF )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4615:2: iv_ruleIdentifier= ruleIdentifier EOF
+            // InternalScope.g:4614:2: (iv_ruleIdentifier= ruleIdentifier EOF )
+            // InternalScope.g:4615:2: iv_ruleIdentifier= ruleIdentifier EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getIdentifierRule()); 
             }
-            pushFollow(FOLLOW_ruleIdentifier_in_entryRuleIdentifier10456);
+            pushFollow(FOLLOW_1);
             iv_ruleIdentifier=ruleIdentifier();
 
             state._fsp--;
@@ -13097,7 +13097,7 @@ public final String entryRuleIdentifier() throws RecognitionException {
             if ( state.backtracking==0 ) {
                current =iv_ruleIdentifier.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleIdentifier10467); if (state.failed) return current;
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
 
             }
 
@@ -13115,7 +13115,7 @@ public final String entryRuleIdentifier() throws RecognitionException {
 
 
     // $ANTLR start "ruleIdentifier"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4622:1: ruleIdentifier returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_ID_0= RULE_ID ;
+    // InternalScope.g:4622:1: ruleIdentifier returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_ID_0= RULE_ID ;
     public final AntlrDatatypeRuleToken ruleIdentifier() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -13124,10 +13124,10 @@ public final AntlrDatatypeRuleToken ruleIdentifier() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4625:28: (this_ID_0= RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4626:5: this_ID_0= RULE_ID
+            // InternalScope.g:4625:28: (this_ID_0= RULE_ID )
+            // InternalScope.g:4626:5: this_ID_0= RULE_ID
             {
-            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleIdentifier10506); if (state.failed) return current;
+            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_2); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               		current.merge(this_ID_0);
@@ -13158,7 +13158,7 @@ public final AntlrDatatypeRuleToken ruleIdentifier() throws RecognitionException
 
 
     // $ANTLR start "ruleCasing"
-    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4641:1: ruleCasing returns [Enumerator current=null] : ( (enumLiteral_0= 'sensitive' ) | (enumLiteral_1= 'insensitive' ) ) ;
+    // InternalScope.g:4641:1: ruleCasing returns [Enumerator current=null] : ( (enumLiteral_0= 'sensitive' ) | (enumLiteral_1= 'insensitive' ) ) ;
     public final Enumerator ruleCasing() throws RecognitionException {
         Enumerator current = null;
 
@@ -13167,10 +13167,10 @@ public final Enumerator ruleCasing() throws RecognitionException {
 
          enterRule(); 
         try {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4643:28: ( ( (enumLiteral_0= 'sensitive' ) | (enumLiteral_1= 'insensitive' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4644:1: ( (enumLiteral_0= 'sensitive' ) | (enumLiteral_1= 'insensitive' ) )
+            // InternalScope.g:4643:28: ( ( (enumLiteral_0= 'sensitive' ) | (enumLiteral_1= 'insensitive' ) ) )
+            // InternalScope.g:4644:1: ( (enumLiteral_0= 'sensitive' ) | (enumLiteral_1= 'insensitive' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4644:1: ( (enumLiteral_0= 'sensitive' ) | (enumLiteral_1= 'insensitive' ) )
+            // InternalScope.g:4644:1: ( (enumLiteral_0= 'sensitive' ) | (enumLiteral_1= 'insensitive' ) )
             int alt73=2;
             int LA73_0 = input.LA(1);
 
@@ -13189,12 +13189,12 @@ else if ( (LA73_0==86) ) {
             }
             switch (alt73) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4644:2: (enumLiteral_0= 'sensitive' )
+                    // InternalScope.g:4644:2: (enumLiteral_0= 'sensitive' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4644:2: (enumLiteral_0= 'sensitive' )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4644:4: enumLiteral_0= 'sensitive'
+                    // InternalScope.g:4644:2: (enumLiteral_0= 'sensitive' )
+                    // InternalScope.g:4644:4: enumLiteral_0= 'sensitive'
                     {
-                    enumLiteral_0=(Token)match(input,85,FOLLOW_85_in_ruleCasing10564); if (state.failed) return current;
+                    enumLiteral_0=(Token)match(input,85,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current = grammarAccess.getCasingAccess().getSENSITIVEEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
@@ -13208,12 +13208,12 @@ else if ( (LA73_0==86) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4650:6: (enumLiteral_1= 'insensitive' )
+                    // InternalScope.g:4650:6: (enumLiteral_1= 'insensitive' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4650:6: (enumLiteral_1= 'insensitive' )
-                    // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:4650:8: enumLiteral_1= 'insensitive'
+                    // InternalScope.g:4650:6: (enumLiteral_1= 'insensitive' )
+                    // InternalScope.g:4650:8: enumLiteral_1= 'insensitive'
                     {
-                    enumLiteral_1=(Token)match(input,86,FOLLOW_86_in_ruleCasing10581); if (state.failed) return current;
+                    enumLiteral_1=(Token)match(input,86,FOLLOW_2); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current = grammarAccess.getCasingAccess().getINSENSITIVEEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
@@ -13249,10 +13249,10 @@ else if ( (LA73_0==86) ) {
 
     // $ANTLR start synpred1_InternalScope
     public final void synpred1_InternalScope_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1625:3: ( '(' )
-        // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1625:5: '('
+        // InternalScope.g:1625:3: ( '(' )
+        // InternalScope.g:1625:5: '('
         {
-        match(input,25,FOLLOW_25_in_synpred1_InternalScope3476); if (state.failed) return ;
+        match(input,25,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -13260,10 +13260,10 @@ public final void synpred1_InternalScope_fragment() throws RecognitionException
 
     // $ANTLR start synpred2_InternalScope
     public final void synpred2_InternalScope_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1892:7: ( ruleCastedExpression )
-        // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:1892:9: ruleCastedExpression
+        // InternalScope.g:1892:7: ( ruleCastedExpression )
+        // InternalScope.g:1892:9: ruleCastedExpression
         {
-        pushFollow(FOLLOW_ruleCastedExpression_in_synpred2_InternalScope4150);
+        pushFollow(FOLLOW_2);
         ruleCastedExpression();
 
         state._fsp--;
@@ -13275,10 +13275,10 @@ public final void synpred2_InternalScope_fragment() throws RecognitionException
 
     // $ANTLR start synpred3_InternalScope
     public final void synpred3_InternalScope_fragment() throws RecognitionException {   
-        // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2318:3: ( 'else' )
-        // ../com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/parser/antlr/internal/InternalScope.g:2318:5: 'else'
+        // InternalScope.g:2318:3: ( 'else' )
+        // InternalScope.g:2318:5: 'else'
         {
-        match(input,52,FOLLOW_52_in_synpred3_InternalScope5104); if (state.failed) return ;
+        match(input,52,FOLLOW_2); if (state.failed) return ;
 
         }
     }
@@ -13333,19 +13333,12 @@ public final boolean synpred3_InternalScope() {
     protected DFA11 dfa11 = new DFA11(this);
     protected DFA32 dfa32 = new DFA32(this);
     protected DFA37 dfa37 = new DFA37(this);
-    static final String DFA11_eotS =
-        "\6\uffff";
-    static final String DFA11_eofS =
-        "\6\uffff";
-    static final String DFA11_minS =
-        "\1\7\1\24\1\7\2\uffff\1\24";
-    static final String DFA11_maxS =
-        "\1\7\1\54\1\7\2\uffff\1\54";
-    static final String DFA11_acceptS =
-        "\3\uffff\1\1\1\2\1\uffff";
-    static final String DFA11_specialS =
-        "\6\uffff}>";
-    static final String[] DFA11_transitionS = {
+    static final String dfa_1s = "\6\uffff";
+    static final String dfa_2s = "\1\7\1\24\1\7\2\uffff\1\24";
+    static final String dfa_3s = "\1\7\1\54\1\7\2\uffff\1\54";
+    static final String dfa_4s = "\3\uffff\1\1\1\2\1\uffff";
+    static final String dfa_5s = "\6\uffff}>";
+    static final String[] dfa_6s = {
             "\1\1",
             "\1\3\6\uffff\1\4\20\uffff\1\2",
             "\1\5",
@@ -13354,54 +13347,37 @@ public final boolean synpred3_InternalScope() {
             "\1\3\6\uffff\1\4\20\uffff\1\2"
     };
 
-    static final short[] DFA11_eot = DFA.unpackEncodedString(DFA11_eotS);
-    static final short[] DFA11_eof = DFA.unpackEncodedString(DFA11_eofS);
-    static final char[] DFA11_min = DFA.unpackEncodedStringToUnsignedChars(DFA11_minS);
-    static final char[] DFA11_max = DFA.unpackEncodedStringToUnsignedChars(DFA11_maxS);
-    static final short[] DFA11_accept = DFA.unpackEncodedString(DFA11_acceptS);
-    static final short[] DFA11_special = DFA.unpackEncodedString(DFA11_specialS);
-    static final short[][] DFA11_transition;
-
-    static {
-        int numStates = DFA11_transitionS.length;
-        DFA11_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA11_transition[i] = DFA.unpackEncodedString(DFA11_transitionS[i]);
-        }
-    }
+    static final short[] dfa_1 = DFA.unpackEncodedString(dfa_1s);
+    static final char[] dfa_2 = DFA.unpackEncodedStringToUnsignedChars(dfa_2s);
+    static final char[] dfa_3 = DFA.unpackEncodedStringToUnsignedChars(dfa_3s);
+    static final short[] dfa_4 = DFA.unpackEncodedString(dfa_4s);
+    static final short[] dfa_5 = DFA.unpackEncodedString(dfa_5s);
+    static final short[][] dfa_6 = unpackEncodedStringArray(dfa_6s);
 
     class DFA11 extends DFA {
 
         public DFA11(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 11;
-            this.eot = DFA11_eot;
-            this.eof = DFA11_eof;
-            this.min = DFA11_min;
-            this.max = DFA11_max;
-            this.accept = DFA11_accept;
-            this.special = DFA11_special;
-            this.transition = DFA11_transition;
+            this.eot = dfa_1;
+            this.eof = dfa_1;
+            this.min = dfa_2;
+            this.max = dfa_3;
+            this.accept = dfa_4;
+            this.special = dfa_5;
+            this.transition = dfa_6;
         }
         public String getDescription() {
             return "572:3: ( ( ( ruleQualifiedID ) ) | ( ( ( ruleQualifiedID ) ) otherlv_6= '#' ( ( ruleIdentifier ) ) ) )";
         }
     }
-    static final String DFA32_eotS =
-        "\40\uffff";
-    static final String DFA32_eofS =
-        "\40\uffff";
-    static final String DFA32_minS =
-        "\1\4\1\0\36\uffff";
-    static final String DFA32_maxS =
-        "\1\124\1\0\36\uffff";
-    static final String DFA32_acceptS =
-        "\2\uffff\1\2\34\uffff\1\1";
-    static final String DFA32_specialS =
-        "\1\uffff\1\0\36\uffff}>";
-    static final String[] DFA32_transitionS = {
-            "\4\2\14\uffff\1\2\4\uffff\1\1\10\uffff\1\2\10\uffff\1\2\2\uffff"+
-            "\1\2\3\uffff\1\2\2\uffff\1\2\13\uffff\1\2\1\uffff\22\2",
+    static final String dfa_7s = "\40\uffff";
+    static final String dfa_8s = "\1\4\1\0\36\uffff";
+    static final String dfa_9s = "\1\124\1\0\36\uffff";
+    static final String dfa_10s = "\2\uffff\1\2\34\uffff\1\1";
+    static final String dfa_11s = "\1\uffff\1\0\36\uffff}>";
+    static final String[] dfa_12s = {
+            "\4\2\14\uffff\1\2\4\uffff\1\1\10\uffff\1\2\10\uffff\1\2\2\uffff\1\2\3\uffff\1\2\2\uffff\1\2\13\uffff\1\2\1\uffff\22\2",
             "\1\uffff",
             "",
             "",
@@ -13435,34 +13411,25 @@ public String getDescription() {
             ""
     };
 
-    static final short[] DFA32_eot = DFA.unpackEncodedString(DFA32_eotS);
-    static final short[] DFA32_eof = DFA.unpackEncodedString(DFA32_eofS);
-    static final char[] DFA32_min = DFA.unpackEncodedStringToUnsignedChars(DFA32_minS);
-    static final char[] DFA32_max = DFA.unpackEncodedStringToUnsignedChars(DFA32_maxS);
-    static final short[] DFA32_accept = DFA.unpackEncodedString(DFA32_acceptS);
-    static final short[] DFA32_special = DFA.unpackEncodedString(DFA32_specialS);
-    static final short[][] DFA32_transition;
-
-    static {
-        int numStates = DFA32_transitionS.length;
-        DFA32_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA32_transition[i] = DFA.unpackEncodedString(DFA32_transitionS[i]);
-        }
-    }
+    static final short[] dfa_7 = DFA.unpackEncodedString(dfa_7s);
+    static final char[] dfa_8 = DFA.unpackEncodedStringToUnsignedChars(dfa_8s);
+    static final char[] dfa_9 = DFA.unpackEncodedStringToUnsignedChars(dfa_9s);
+    static final short[] dfa_10 = DFA.unpackEncodedString(dfa_10s);
+    static final short[] dfa_11 = DFA.unpackEncodedString(dfa_11s);
+    static final short[][] dfa_12 = unpackEncodedStringArray(dfa_12s);
 
     class DFA32 extends DFA {
 
         public DFA32(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 32;
-            this.eot = DFA32_eot;
-            this.eof = DFA32_eof;
-            this.min = DFA32_min;
-            this.max = DFA32_max;
-            this.accept = DFA32_accept;
-            this.special = DFA32_special;
-            this.transition = DFA32_transition;
+            this.eot = dfa_7;
+            this.eof = dfa_7;
+            this.min = dfa_8;
+            this.max = dfa_9;
+            this.accept = dfa_10;
+            this.special = dfa_11;
+            this.transition = dfa_12;
         }
         public String getDescription() {
             return "1625:1: ( ( ( '(' )=> (otherlv_0= '(' ( (lv_names_1_0= ruleNamingExpression ) ) (otherlv_2= ',' ( (lv_names_3_0= ruleNamingExpression ) ) )* otherlv_4= ')' ) ) | ( (lv_names_5_0= ruleNamingExpression ) ) )";
@@ -13494,21 +13461,13 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             throw nvae;
         }
     }
-    static final String DFA37_eotS =
-        "\36\uffff";
-    static final String DFA37_eofS =
-        "\36\uffff";
-    static final String DFA37_minS =
-        "\1\4\1\uffff\1\0\33\uffff";
-    static final String DFA37_maxS =
-        "\1\124\1\uffff\1\0\33\uffff";
-    static final String DFA37_acceptS =
-        "\1\uffff\1\1\1\uffff\1\3\31\uffff\1\2";
-    static final String DFA37_specialS =
-        "\2\uffff\1\0\33\uffff}>";
-    static final String[] DFA37_transitionS = {
-            "\4\3\14\uffff\1\3\4\uffff\1\2\24\uffff\1\1\3\uffff\1\3\2\uffff"+
-            "\1\3\13\uffff\1\3\1\uffff\22\3",
+    static final String dfa_13s = "\36\uffff";
+    static final String dfa_14s = "\1\4\1\uffff\1\0\33\uffff";
+    static final String dfa_15s = "\1\124\1\uffff\1\0\33\uffff";
+    static final String dfa_16s = "\1\uffff\1\1\1\uffff\1\3\31\uffff\1\2";
+    static final String dfa_17s = "\2\uffff\1\0\33\uffff}>";
+    static final String[] dfa_18s = {
+            "\4\3\14\uffff\1\3\4\uffff\1\2\24\uffff\1\1\3\uffff\1\3\2\uffff\1\3\13\uffff\1\3\1\uffff\22\3",
             "",
             "\1\uffff",
             "",
@@ -13540,34 +13499,25 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
             ""
     };
 
-    static final short[] DFA37_eot = DFA.unpackEncodedString(DFA37_eotS);
-    static final short[] DFA37_eof = DFA.unpackEncodedString(DFA37_eofS);
-    static final char[] DFA37_min = DFA.unpackEncodedStringToUnsignedChars(DFA37_minS);
-    static final char[] DFA37_max = DFA.unpackEncodedStringToUnsignedChars(DFA37_maxS);
-    static final short[] DFA37_accept = DFA.unpackEncodedString(DFA37_acceptS);
-    static final short[] DFA37_special = DFA.unpackEncodedString(DFA37_specialS);
-    static final short[][] DFA37_transition;
-
-    static {
-        int numStates = DFA37_transitionS.length;
-        DFA37_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA37_transition[i] = DFA.unpackEncodedString(DFA37_transitionS[i]);
-        }
-    }
+    static final short[] dfa_13 = DFA.unpackEncodedString(dfa_13s);
+    static final char[] dfa_14 = DFA.unpackEncodedStringToUnsignedChars(dfa_14s);
+    static final char[] dfa_15 = DFA.unpackEncodedStringToUnsignedChars(dfa_15s);
+    static final short[] dfa_16 = DFA.unpackEncodedString(dfa_16s);
+    static final short[] dfa_17 = DFA.unpackEncodedString(dfa_17s);
+    static final short[][] dfa_18 = unpackEncodedStringArray(dfa_18s);
 
     class DFA37 extends DFA {
 
         public DFA37(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 37;
-            this.eot = DFA37_eot;
-            this.eof = DFA37_eof;
-            this.min = DFA37_min;
-            this.max = DFA37_max;
-            this.accept = DFA37_accept;
-            this.special = DFA37_special;
-            this.transition = DFA37_transition;
+            this.eot = dfa_13;
+            this.eof = dfa_13;
+            this.min = dfa_14;
+            this.max = dfa_15;
+            this.accept = dfa_16;
+            this.special = dfa_17;
+            this.transition = dfa_18;
         }
         public String getDescription() {
             return "1882:1: (this_LetExpression_0= ruleLetExpression | ( ( ruleCastedExpression )=>this_CastedExpression_1= ruleCastedExpression ) | this_ChainExpression_2= ruleChainExpression )";
@@ -13601,428 +13551,70 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
     }
  
 
-    public static final BitSet FOLLOW_ruleScopeModel_in_entryRuleScopeModel75 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleScopeModel85 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_12_in_ruleScopeModel122 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_ruleDottedID_in_ruleScopeModel143 = new BitSet(new long[]{0x00000000010F6002L});
-    public static final BitSet FOLLOW_13_in_ruleScopeModel156 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_ruleDottedID_in_ruleScopeModel179 = new BitSet(new long[]{0x00000000010F4002L});
-    public static final BitSet FOLLOW_ruleImport_in_ruleScopeModel202 = new BitSet(new long[]{0x00000000010F4002L});
-    public static final BitSet FOLLOW_ruleExtension_in_ruleScopeModel224 = new BitSet(new long[]{0x00000000010F0002L});
-    public static final BitSet FOLLOW_ruleInjection_in_ruleScopeModel246 = new BitSet(new long[]{0x00000000010E0002L});
-    public static final BitSet FOLLOW_ruleNamingSection_in_ruleScopeModel268 = new BitSet(new long[]{0x0000000001000002L});
-    public static final BitSet FOLLOW_ruleScopeDefinition_in_ruleScopeModel290 = new BitSet(new long[]{0x0000000001000002L});
-    public static final BitSet FOLLOW_ruleImport_in_entryRuleImport327 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleImport337 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_14_in_ruleImport374 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleImport394 = new BitSet(new long[]{0x0000000000008002L});
-    public static final BitSet FOLLOW_15_in_ruleImport407 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleImport428 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExtension_in_entryRuleExtension466 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleExtension476 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_16_in_ruleExtension513 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_ruleQualifiedID_in_ruleExtension534 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInjection_in_entryRuleInjection570 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInjection580 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_17_in_ruleInjection617 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_ruleDottedID_in_ruleInjection638 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleInjection650 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleInjection671 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNamingSection_in_entryRuleNamingSection707 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNamingSection717 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_18_in_ruleNamingSection764 = new BitSet(new long[]{0x0000000000000000L,0x0000000000600000L});
-    public static final BitSet FOLLOW_ruleCasing_in_ruleNamingSection785 = new BitSet(new long[]{0x0000000000080000L});
-    public static final BitSet FOLLOW_19_in_ruleNamingSection799 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_20_in_ruleNamingSection811 = new BitSet(new long[]{0x0000000000200080L});
-    public static final BitSet FOLLOW_ruleNamingDefinition_in_ruleNamingSection832 = new BitSet(new long[]{0x0000000000200080L});
-    public static final BitSet FOLLOW_21_in_ruleNamingSection845 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNamingDefinition_in_entryRuleNamingDefinition881 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNamingDefinition891 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedID_in_ruleNamingDefinition939 = new BitSet(new long[]{0x0000000000400000L});
-    public static final BitSet FOLLOW_22_in_ruleNamingDefinition951 = new BitSet(new long[]{0x00244804021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleNaming_in_ruleNamingDefinition972 = new BitSet(new long[]{0x0000000000800000L});
-    public static final BitSet FOLLOW_23_in_ruleNamingDefinition984 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleScopeDefinition_in_entryRuleScopeDefinition1020 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleScopeDefinition1030 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_ruleScopeDefinition1067 = new BitSet(new long[]{0x0000000002000080L});
-    public static final BitSet FOLLOW_25_in_ruleScopeDefinition1080 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleScopeDefinition1101 = new BitSet(new long[]{0x0000000004000000L});
-    public static final BitSet FOLLOW_26_in_ruleScopeDefinition1113 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_ruleQualifiedID_in_ruleScopeDefinition1139 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_ruleQualifiedID_in_ruleScopeDefinition1169 = new BitSet(new long[]{0x0000000008000000L});
-    public static final BitSet FOLLOW_27_in_ruleScopeDefinition1181 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleScopeDefinition1204 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_20_in_ruleScopeDefinition1218 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_ruleScopeRule_in_ruleScopeDefinition1239 = new BitSet(new long[]{0x0000000010200000L});
-    public static final BitSet FOLLOW_21_in_ruleScopeDefinition1252 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleScopeRule_in_entryRuleScopeRule1288 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleScopeRule1298 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_ruleScopeRule1335 = new BitSet(new long[]{0x0000000040000080L});
-    public static final BitSet FOLLOW_ruleScopeContext_in_ruleScopeRule1356 = new BitSet(new long[]{0x0000000000400000L});
-    public static final BitSet FOLLOW_22_in_ruleScopeRule1368 = new BitSet(new long[]{0x0024482C021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleScopeExpression_in_ruleScopeRule1389 = new BitSet(new long[]{0x0000000020800000L});
-    public static final BitSet FOLLOW_29_in_ruleScopeRule1402 = new BitSet(new long[]{0x0024482C021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleScopeExpression_in_ruleScopeRule1423 = new BitSet(new long[]{0x0000000020800000L});
-    public static final BitSet FOLLOW_23_in_ruleScopeRule1437 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleScopeContext_in_entryRuleScopeContext1473 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleScopeContext1483 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_ruleScopeContext1527 = new BitSet(new long[]{0x0000000080000002L});
-    public static final BitSet FOLLOW_ruleQualifiedID_in_ruleScopeContext1569 = new BitSet(new long[]{0x0000000080000002L});
-    public static final BitSet FOLLOW_31_in_ruleScopeContext1583 = new BitSet(new long[]{0x00244804021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleScopeContext1604 = new BitSet(new long[]{0x0000000100000000L});
-    public static final BitSet FOLLOW_32_in_ruleScopeContext1616 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleScopeExpression_in_entryRuleScopeExpression1654 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleScopeExpression1664 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleScopeDelegation_in_ruleScopeExpression1712 = new BitSet(new long[]{0x0000000200000002L});
-    public static final BitSet FOLLOW_ruleFactoryExpression_in_ruleScopeExpression1739 = new BitSet(new long[]{0x0000000200000002L});
-    public static final BitSet FOLLOW_ruleNamedScopeExpression_in_ruleScopeExpression1766 = new BitSet(new long[]{0x0000000200000002L});
-    public static final BitSet FOLLOW_33_in_ruleScopeExpression1779 = new BitSet(new long[]{0x00244804021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleScopeExpression1800 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFactoryExpression_in_entryRuleFactoryExpression1838 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFactoryExpression1848 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_34_in_ruleFactoryExpression1885 = new BitSet(new long[]{0x00244804021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleFactoryExpression1906 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleScopeDelegation_in_entryRuleScopeDelegation1942 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleScopeDelegation1952 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_35_in_ruleScopeDelegation1989 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_ruleScopeDelegation2001 = new BitSet(new long[]{0x00244824021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleScopeDelegation2023 = new BitSet(new long[]{0x0000001004000000L});
-    public static final BitSet FOLLOW_ruleGlobalScopeExpression_in_ruleScopeDelegation2050 = new BitSet(new long[]{0x0000001004000000L});
-    public static final BitSet FOLLOW_36_in_ruleScopeDelegation2064 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleScopeDelegation2087 = new BitSet(new long[]{0x0000000004000000L});
-    public static final BitSet FOLLOW_26_in_ruleScopeDelegation2101 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNamedScopeExpression_in_entryRuleNamedScopeExpression2137 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNamedScopeExpression2147 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGlobalScopeExpression_in_ruleNamedScopeExpression2195 = new BitSet(new long[]{0x0000000000048002L});
-    public static final BitSet FOLLOW_ruleSimpleScopeExpression_in_ruleNamedScopeExpression2222 = new BitSet(new long[]{0x0000000000048002L});
-    public static final BitSet FOLLOW_18_in_ruleNamedScopeExpression2241 = new BitSet(new long[]{0x0000000000000000L,0x0000000000600000L});
-    public static final BitSet FOLLOW_ruleCasing_in_ruleNamedScopeExpression2275 = new BitSet(new long[]{0x0000000000008002L});
-    public static final BitSet FOLLOW_15_in_ruleNamedScopeExpression2290 = new BitSet(new long[]{0x00244804021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleNaming_in_ruleNamedScopeExpression2311 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGlobalScopeExpression_in_entryRuleGlobalScopeExpression2349 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleGlobalScopeExpression2359 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_37_in_ruleGlobalScopeExpression2396 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_ruleGlobalScopeExpression2408 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_ruleQualifiedID_in_ruleGlobalScopeExpression2431 = new BitSet(new long[]{0x0000001004000000L});
-    public static final BitSet FOLLOW_36_in_ruleGlobalScopeExpression2445 = new BitSet(new long[]{0x0000004000000000L});
-    public static final BitSet FOLLOW_38_in_ruleGlobalScopeExpression2457 = new BitSet(new long[]{0x0000000000400000L});
-    public static final BitSet FOLLOW_22_in_ruleGlobalScopeExpression2469 = new BitSet(new long[]{0x00244804021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleGlobalScopeExpression2490 = new BitSet(new long[]{0x0000001004000000L});
-    public static final BitSet FOLLOW_36_in_ruleGlobalScopeExpression2510 = new BitSet(new long[]{0x0000018000000000L});
-    public static final BitSet FOLLOW_39_in_ruleGlobalScopeExpression2528 = new BitSet(new long[]{0x0000010000000000L});
-    public static final BitSet FOLLOW_40_in_ruleGlobalScopeExpression2554 = new BitSet(new long[]{0x0000000000400000L});
-    public static final BitSet FOLLOW_22_in_ruleGlobalScopeExpression2566 = new BitSet(new long[]{0x00244804021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleGlobalScopeExpression2587 = new BitSet(new long[]{0x0000001004000000L});
-    public static final BitSet FOLLOW_36_in_ruleGlobalScopeExpression2603 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_41_in_ruleGlobalScopeExpression2615 = new BitSet(new long[]{0x0000000000400000L});
-    public static final BitSet FOLLOW_22_in_ruleGlobalScopeExpression2627 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_ruleGlobalScopeExpression2639 = new BitSet(new long[]{0x0000000080000080L});
-    public static final BitSet FOLLOW_ruleDataExpression_in_ruleGlobalScopeExpression2660 = new BitSet(new long[]{0x0000001004000000L});
-    public static final BitSet FOLLOW_36_in_ruleGlobalScopeExpression2673 = new BitSet(new long[]{0x0000000080000080L});
-    public static final BitSet FOLLOW_ruleDataExpression_in_ruleGlobalScopeExpression2694 = new BitSet(new long[]{0x0000001004000000L});
-    public static final BitSet FOLLOW_26_in_ruleGlobalScopeExpression2708 = new BitSet(new long[]{0x0000001004000000L});
-    public static final BitSet FOLLOW_36_in_ruleGlobalScopeExpression2723 = new BitSet(new long[]{0x0000040000000000L});
-    public static final BitSet FOLLOW_42_in_ruleGlobalScopeExpression2735 = new BitSet(new long[]{0x0000000000400000L});
-    public static final BitSet FOLLOW_22_in_ruleGlobalScopeExpression2747 = new BitSet(new long[]{0x0000000042000080L});
-    public static final BitSet FOLLOW_30_in_ruleGlobalScopeExpression2766 = new BitSet(new long[]{0x0000000004000000L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleGlobalScopeExpression2806 = new BitSet(new long[]{0x0000000004000000L});
-    public static final BitSet FOLLOW_25_in_ruleGlobalScopeExpression2825 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleGlobalScopeExpression2846 = new BitSet(new long[]{0x0000001004000000L});
-    public static final BitSet FOLLOW_36_in_ruleGlobalScopeExpression2859 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleGlobalScopeExpression2880 = new BitSet(new long[]{0x0000001004000000L});
-    public static final BitSet FOLLOW_26_in_ruleGlobalScopeExpression2894 = new BitSet(new long[]{0x0000000004000000L});
-    public static final BitSet FOLLOW_26_in_ruleGlobalScopeExpression2910 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDataExpression_in_entryRuleDataExpression2946 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDataExpression2956 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMatchDataExpression_in_ruleDataExpression3003 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLambdaDataExpression_in_ruleDataExpression3030 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMatchDataExpression_in_entryRuleMatchDataExpression3065 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleMatchDataExpression3075 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleMatchDataExpression3121 = new BitSet(new long[]{0x0000000000400000L});
-    public static final BitSet FOLLOW_22_in_ruleMatchDataExpression3133 = new BitSet(new long[]{0x00244804021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleMatchDataExpression3154 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLambdaDataExpression_in_entryRuleLambdaDataExpression3190 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleLambdaDataExpression3200 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_ruleLambdaDataExpression3237 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleLambdaDataExpression3258 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_33_in_ruleLambdaDataExpression3270 = new BitSet(new long[]{0x00244804021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleLambdaDataExpression3291 = new BitSet(new long[]{0x0000000100000000L});
-    public static final BitSet FOLLOW_32_in_ruleLambdaDataExpression3303 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleScopeExpression_in_entryRuleSimpleScopeExpression3339 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSimpleScopeExpression3349 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleSimpleScopeExpression3394 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNaming_in_entryRuleNaming3429 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNaming3439 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_25_in_ruleNaming3485 = new BitSet(new long[]{0x00244804021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleNamingExpression_in_ruleNaming3506 = new BitSet(new long[]{0x0000001004000000L});
-    public static final BitSet FOLLOW_36_in_ruleNaming3519 = new BitSet(new long[]{0x00244804021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleNamingExpression_in_ruleNaming3540 = new BitSet(new long[]{0x0000001004000000L});
-    public static final BitSet FOLLOW_26_in_ruleNaming3554 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNamingExpression_in_ruleNaming3583 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNamingExpression_in_entryRuleNamingExpression3619 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNamingExpression3629 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_ruleNamingExpression3672 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_34_in_ruleNamingExpression3710 = new BitSet(new long[]{0x00244804021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleNamingExpression3745 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedID_in_entryRuleQualifiedID3783 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedID3794 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleQualifiedID3841 = new BitSet(new long[]{0x0000100000000002L});
-    public static final BitSet FOLLOW_44_in_ruleQualifiedID3860 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleQualifiedID3882 = new BitSet(new long[]{0x0000100000000002L});
-    public static final BitSet FOLLOW_ruleDottedID_in_entryRuleDottedID3930 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDottedID3941 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleDottedID3988 = new BitSet(new long[]{0x0000200000000002L});
-    public static final BitSet FOLLOW_45_in_ruleDottedID4007 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleDottedID4029 = new BitSet(new long[]{0x0000200000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_entryRuleExpression4076 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleExpression4086 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLetExpression_in_ruleExpression4133 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCastedExpression_in_ruleExpression4166 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChainExpression_in_ruleExpression4194 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLetExpression_in_entryRuleLetExpression4231 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleLetExpression4241 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_ruleLetExpression4278 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleLetExpression4299 = new BitSet(new long[]{0x0000000000400000L});
-    public static final BitSet FOLLOW_22_in_ruleLetExpression4311 = new BitSet(new long[]{0x00244804021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleLetExpression4332 = new BitSet(new long[]{0x0000800000000000L});
-    public static final BitSet FOLLOW_47_in_ruleLetExpression4344 = new BitSet(new long[]{0x00244804021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleLetExpression4365 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCastedExpression_in_entryRuleCastedExpression4401 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleCastedExpression4411 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_25_in_ruleCastedExpression4448 = new BitSet(new long[]{0x0000000000000080L,0x00000000001C0000L});
-    public static final BitSet FOLLOW_ruleType_in_ruleCastedExpression4469 = new BitSet(new long[]{0x0000000004000000L});
-    public static final BitSet FOLLOW_26_in_ruleCastedExpression4481 = new BitSet(new long[]{0x00244804021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleCastedExpression4502 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChainExpression_in_entryRuleChainExpression4538 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleChainExpression4548 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_ruleChainExpression4595 = new BitSet(new long[]{0x0001000000000002L});
-    public static final BitSet FOLLOW_48_in_ruleChainExpression4616 = new BitSet(new long[]{0x00244804021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_ruleChainExpression4637 = new BitSet(new long[]{0x0001000000000002L});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_entryRuleChainedExpression4675 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleChainedExpression4685 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIfExpressionKw_in_ruleChainedExpression4732 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIfExpressionTri_in_ruleChainedExpression4759 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSwitchExpression_in_ruleChainedExpression4786 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIfExpressionTri_in_entryRuleIfExpressionTri4821 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIfExpressionTri4831 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOrExpression_in_ruleIfExpressionTri4878 = new BitSet(new long[]{0x0002000000000002L});
-    public static final BitSet FOLLOW_49_in_ruleIfExpressionTri4899 = new BitSet(new long[]{0x00244804021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_ruleIfExpressionTri4920 = new BitSet(new long[]{0x0000800000000000L});
-    public static final BitSet FOLLOW_47_in_ruleIfExpressionTri4932 = new BitSet(new long[]{0x00244804021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_ruleIfExpressionTri4953 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIfExpressionKw_in_entryRuleIfExpressionKw4991 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIfExpressionKw5001 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_50_in_ruleIfExpressionKw5038 = new BitSet(new long[]{0x00244804021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_ruleIfExpressionKw5059 = new BitSet(new long[]{0x0008000000000000L});
-    public static final BitSet FOLLOW_51_in_ruleIfExpressionKw5071 = new BitSet(new long[]{0x00244804021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_ruleIfExpressionKw5092 = new BitSet(new long[]{0x0010000000000002L});
-    public static final BitSet FOLLOW_52_in_ruleIfExpressionKw5113 = new BitSet(new long[]{0x00244804021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleChainedExpression_in_ruleIfExpressionKw5134 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSwitchExpression_in_entryRuleSwitchExpression5173 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSwitchExpression5183 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_53_in_ruleSwitchExpression5220 = new BitSet(new long[]{0x0000000002100000L});
-    public static final BitSet FOLLOW_25_in_ruleSwitchExpression5233 = new BitSet(new long[]{0x00000000021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleOrExpression_in_ruleSwitchExpression5254 = new BitSet(new long[]{0x0000000004000000L});
-    public static final BitSet FOLLOW_26_in_ruleSwitchExpression5266 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_20_in_ruleSwitchExpression5280 = new BitSet(new long[]{0x0040000000040000L});
-    public static final BitSet FOLLOW_ruleCase_in_ruleSwitchExpression5301 = new BitSet(new long[]{0x0040000000040000L});
-    public static final BitSet FOLLOW_54_in_ruleSwitchExpression5314 = new BitSet(new long[]{0x0000800000000000L});
-    public static final BitSet FOLLOW_47_in_ruleSwitchExpression5326 = new BitSet(new long[]{0x00000000021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleOrExpression_in_ruleSwitchExpression5347 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_21_in_ruleSwitchExpression5359 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCase_in_entryRuleCase5395 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleCase5405 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_18_in_ruleCase5442 = new BitSet(new long[]{0x00000000021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleOrExpression_in_ruleCase5463 = new BitSet(new long[]{0x0000800000000000L});
-    public static final BitSet FOLLOW_47_in_ruleCase5475 = new BitSet(new long[]{0x00000000021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleOrExpression_in_ruleCase5496 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOrExpression_in_entryRuleOrExpression5532 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOrExpression5542 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAndExpression_in_ruleOrExpression5589 = new BitSet(new long[]{0x0080000000000002L});
-    public static final BitSet FOLLOW_55_in_ruleOrExpression5616 = new BitSet(new long[]{0x00000000021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleAndExpression_in_ruleOrExpression5650 = new BitSet(new long[]{0x0080000000000002L});
-    public static final BitSet FOLLOW_ruleAndExpression_in_entryRuleAndExpression5688 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAndExpression5698 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImpliesExpression_in_ruleAndExpression5745 = new BitSet(new long[]{0x0100000000000002L});
-    public static final BitSet FOLLOW_56_in_ruleAndExpression5772 = new BitSet(new long[]{0x00000000021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleImpliesExpression_in_ruleAndExpression5806 = new BitSet(new long[]{0x0100000000000002L});
-    public static final BitSet FOLLOW_ruleImpliesExpression_in_entryRuleImpliesExpression5844 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleImpliesExpression5854 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRelationalExpression_in_ruleImpliesExpression5901 = new BitSet(new long[]{0x0200000000000002L});
-    public static final BitSet FOLLOW_57_in_ruleImpliesExpression5928 = new BitSet(new long[]{0x00000000021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleRelationalExpression_in_ruleImpliesExpression5962 = new BitSet(new long[]{0x0200000000000002L});
-    public static final BitSet FOLLOW_ruleRelationalExpression_in_entryRuleRelationalExpression6000 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRelationalExpression6010 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAdditiveExpression_in_ruleRelationalExpression6057 = new BitSet(new long[]{0xFC00000000000002L});
-    public static final BitSet FOLLOW_58_in_ruleRelationalExpression6086 = new BitSet(new long[]{0x00000000021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_59_in_ruleRelationalExpression6115 = new BitSet(new long[]{0x00000000021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_60_in_ruleRelationalExpression6144 = new BitSet(new long[]{0x00000000021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_61_in_ruleRelationalExpression6173 = new BitSet(new long[]{0x00000000021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_62_in_ruleRelationalExpression6202 = new BitSet(new long[]{0x00000000021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_63_in_ruleRelationalExpression6231 = new BitSet(new long[]{0x00000000021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleAdditiveExpression_in_ruleRelationalExpression6268 = new BitSet(new long[]{0xFC00000000000002L});
-    public static final BitSet FOLLOW_ruleAdditiveExpression_in_entryRuleAdditiveExpression6306 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAdditiveExpression6316 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMultiplicativeExpression_in_ruleAdditiveExpression6363 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000003L});
-    public static final BitSet FOLLOW_64_in_ruleAdditiveExpression6392 = new BitSet(new long[]{0x00000000021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_65_in_ruleAdditiveExpression6421 = new BitSet(new long[]{0x00000000021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleMultiplicativeExpression_in_ruleAdditiveExpression6458 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000003L});
-    public static final BitSet FOLLOW_ruleMultiplicativeExpression_in_entryRuleMultiplicativeExpression6496 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleMultiplicativeExpression6506 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleUnaryOrInfixExpression_in_ruleMultiplicativeExpression6553 = new BitSet(new long[]{0x0000000040000002L,0x0000000000000004L});
-    public static final BitSet FOLLOW_30_in_ruleMultiplicativeExpression6582 = new BitSet(new long[]{0x00000000021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_66_in_ruleMultiplicativeExpression6611 = new BitSet(new long[]{0x00000000021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleUnaryOrInfixExpression_in_ruleMultiplicativeExpression6648 = new BitSet(new long[]{0x0000000040000002L,0x0000000000000004L});
-    public static final BitSet FOLLOW_ruleUnaryOrInfixExpression_in_entryRuleUnaryOrInfixExpression6686 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleUnaryOrInfixExpression6696 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleUnaryExpression_in_ruleUnaryOrInfixExpression6743 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInfixExpression_in_ruleUnaryOrInfixExpression6770 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleUnaryExpression_in_entryRuleUnaryExpression6805 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleUnaryExpression6815 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_67_in_ruleUnaryExpression6860 = new BitSet(new long[]{0x00000000021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_65_in_ruleUnaryExpression6889 = new BitSet(new long[]{0x00000000021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleInfixExpression_in_ruleUnaryExpression6926 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInfixExpression_in_entryRuleInfixExpression6962 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInfixExpression6972 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePrimaryExpression_in_ruleInfixExpression7019 = new BitSet(new long[]{0x0000200000000002L});
-    public static final BitSet FOLLOW_45_in_ruleInfixExpression7041 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleInfixExpression7062 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_ruleInfixExpression7074 = new BitSet(new long[]{0x00244804061000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleInfixExpression7096 = new BitSet(new long[]{0x0000001004000000L});
-    public static final BitSet FOLLOW_36_in_ruleInfixExpression7109 = new BitSet(new long[]{0x00244804021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleInfixExpression7130 = new BitSet(new long[]{0x0000001004000000L});
-    public static final BitSet FOLLOW_26_in_ruleInfixExpression7146 = new BitSet(new long[]{0x0000200000000002L});
-    public static final BitSet FOLLOW_45_in_ruleInfixExpression7175 = new BitSet(new long[]{0x0000000000000080L,0x00000000001C0000L});
-    public static final BitSet FOLLOW_ruleType_in_ruleInfixExpression7196 = new BitSet(new long[]{0x0000200000000002L});
-    public static final BitSet FOLLOW_45_in_ruleInfixExpression7225 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
-    public static final BitSet FOLLOW_68_in_ruleInfixExpression7243 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_ruleInfixExpression7268 = new BitSet(new long[]{0x0000000000000080L,0x00000000001C0000L});
-    public static final BitSet FOLLOW_ruleType_in_ruleInfixExpression7289 = new BitSet(new long[]{0x0000000004000000L});
-    public static final BitSet FOLLOW_26_in_ruleInfixExpression7301 = new BitSet(new long[]{0x0000200000000002L});
-    public static final BitSet FOLLOW_45_in_ruleInfixExpression7330 = new BitSet(new long[]{0x0000000000000000L,0x0000000000001FE0L});
-    public static final BitSet FOLLOW_69_in_ruleInfixExpression7350 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_70_in_ruleInfixExpression7379 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_71_in_ruleInfixExpression7408 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_72_in_ruleInfixExpression7437 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_73_in_ruleInfixExpression7466 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_74_in_ruleInfixExpression7495 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_75_in_ruleInfixExpression7524 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_76_in_ruleInfixExpression7553 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_ruleInfixExpression7581 = new BitSet(new long[]{0x00244804021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleInfixExpression7603 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_33_in_ruleInfixExpression7615 = new BitSet(new long[]{0x00244804021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleInfixExpression7638 = new BitSet(new long[]{0x0000000004000000L});
-    public static final BitSet FOLLOW_26_in_ruleInfixExpression7650 = new BitSet(new long[]{0x0000200000000002L});
-    public static final BitSet FOLLOW_rulePrimaryExpression_in_entryRulePrimaryExpression7689 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRulePrimaryExpression7699 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteral_in_rulePrimaryExpression7746 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFeatureCall_in_rulePrimaryExpression7773 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleListLiteral_in_rulePrimaryExpression7800 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConstructorCallExpression_in_rulePrimaryExpression7827 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGlobalVarExpression_in_rulePrimaryExpression7854 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleParanthesizedExpression_in_rulePrimaryExpression7881 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLiteral_in_entryRuleLiteral7916 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleLiteral7926 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBooleanLiteral_in_ruleLiteral7973 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntegerLiteral_in_ruleLiteral8000 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNullLiteral_in_ruleLiteral8027 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRealLiteral_in_ruleLiteral8054 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStringLiteral_in_ruleLiteral8081 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleBooleanLiteral_in_entryRuleBooleanLiteral8116 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleBooleanLiteral8126 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_77_in_ruleBooleanLiteral8170 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_78_in_ruleBooleanLiteral8199 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIntegerLiteral_in_entryRuleIntegerLiteral8250 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIntegerLiteral8260 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleIntegerLiteral8301 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNullLiteral_in_entryRuleNullLiteral8341 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNullLiteral8351 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_79_in_ruleNullLiteral8393 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRealLiteral_in_entryRuleRealLiteral8441 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRealLiteral8451 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_REAL_in_ruleRealLiteral8492 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral8532 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleStringLiteral8542 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleStringLiteral8583 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleParanthesizedExpression_in_entryRuleParanthesizedExpression8623 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleParanthesizedExpression8633 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_25_in_ruleParanthesizedExpression8670 = new BitSet(new long[]{0x00244804021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleParanthesizedExpression8692 = new BitSet(new long[]{0x0000000004000000L});
-    public static final BitSet FOLLOW_26_in_ruleParanthesizedExpression8703 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGlobalVarExpression_in_entryRuleGlobalVarExpression8739 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleGlobalVarExpression8749 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_80_in_ruleGlobalVarExpression8786 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleGlobalVarExpression8807 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFeatureCall_in_entryRuleFeatureCall8843 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFeatureCall8853 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOperationCall_in_ruleFeatureCall8900 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleType_in_ruleFeatureCall8926 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCollectionExpression_in_ruleFeatureCall8954 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTypeSelectExpression_in_ruleFeatureCall8981 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOperationCall_in_entryRuleOperationCall9016 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOperationCall9026 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleOperationCall9072 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_ruleOperationCall9084 = new BitSet(new long[]{0x00244804061000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleOperationCall9106 = new BitSet(new long[]{0x0000001004000000L});
-    public static final BitSet FOLLOW_36_in_ruleOperationCall9119 = new BitSet(new long[]{0x00244804021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleOperationCall9140 = new BitSet(new long[]{0x0000001004000000L});
-    public static final BitSet FOLLOW_26_in_ruleOperationCall9156 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleListLiteral_in_entryRuleListLiteral9192 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleListLiteral9202 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_20_in_ruleListLiteral9248 = new BitSet(new long[]{0x00244804023000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleListLiteral9270 = new BitSet(new long[]{0x0000001000200000L});
-    public static final BitSet FOLLOW_36_in_ruleListLiteral9283 = new BitSet(new long[]{0x00244804021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleListLiteral9304 = new BitSet(new long[]{0x0000001000200000L});
-    public static final BitSet FOLLOW_21_in_ruleListLiteral9320 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleConstructorCallExpression_in_entryRuleConstructorCallExpression9356 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleConstructorCallExpression9366 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_81_in_ruleConstructorCallExpression9403 = new BitSet(new long[]{0x0000000000000080L,0x00000000001C0000L});
-    public static final BitSet FOLLOW_ruleSimpleType_in_ruleConstructorCallExpression9424 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTypeSelectExpression_in_entryRuleTypeSelectExpression9460 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTypeSelectExpression9470 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_68_in_ruleTypeSelectExpression9513 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_ruleTypeSelectExpression9538 = new BitSet(new long[]{0x0000000000000080L,0x00000000001C0000L});
-    public static final BitSet FOLLOW_ruleType_in_ruleTypeSelectExpression9559 = new BitSet(new long[]{0x0000000004000000L});
-    public static final BitSet FOLLOW_26_in_ruleTypeSelectExpression9571 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCollectionExpression_in_entryRuleCollectionExpression9607 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleCollectionExpression9617 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_69_in_ruleCollectionExpression9662 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_70_in_ruleCollectionExpression9691 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_71_in_ruleCollectionExpression9720 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_72_in_ruleCollectionExpression9749 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_73_in_ruleCollectionExpression9778 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_74_in_ruleCollectionExpression9807 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_75_in_ruleCollectionExpression9836 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_76_in_ruleCollectionExpression9865 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_ruleCollectionExpression9893 = new BitSet(new long[]{0x00244804021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleCollectionExpression9915 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_33_in_ruleCollectionExpression9927 = new BitSet(new long[]{0x00244804021000F0L,0x00000000001FFFFAL});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleCollectionExpression9950 = new BitSet(new long[]{0x0000000004000000L});
-    public static final BitSet FOLLOW_26_in_ruleCollectionExpression9962 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleType_in_entryRuleType9998 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleType10008 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCollectionType_in_ruleType10055 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleType_in_ruleType10082 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCollectionType_in_entryRuleCollectionType10117 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleCollectionType10127 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_82_in_ruleCollectionType10172 = new BitSet(new long[]{0x0000000080000000L});
-    public static final BitSet FOLLOW_83_in_ruleCollectionType10201 = new BitSet(new long[]{0x0000000080000000L});
-    public static final BitSet FOLLOW_84_in_ruleCollectionType10230 = new BitSet(new long[]{0x0000000080000000L});
-    public static final BitSet FOLLOW_31_in_ruleCollectionType10258 = new BitSet(new long[]{0x0000000000000080L,0x00000000001C0000L});
-    public static final BitSet FOLLOW_ruleSimpleType_in_ruleCollectionType10279 = new BitSet(new long[]{0x0000000100000000L});
-    public static final BitSet FOLLOW_32_in_ruleCollectionType10291 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleType_in_entryRuleSimpleType10327 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSimpleType10337 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleSimpleType10383 = new BitSet(new long[]{0x0000100000000002L});
-    public static final BitSet FOLLOW_44_in_ruleSimpleType10396 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_ruleSimpleType10417 = new BitSet(new long[]{0x0000100000000002L});
-    public static final BitSet FOLLOW_ruleIdentifier_in_entryRuleIdentifier10456 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleIdentifier10467 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleIdentifier10506 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_85_in_ruleCasing10564 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_86_in_ruleCasing10581 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_25_in_synpred1_InternalScope3476 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCastedExpression_in_synpred2_InternalScope4150 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_synpred3_InternalScope5104 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_1 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_2 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x0000000000000080L});
+    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x00000000010F6002L});
+    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x00000000010F4002L});
+    public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x00000000010F0002L});
+    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x00000000010E0002L});
+    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000000001000002L});
+    public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000000008002L});
+    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000000000008000L});
+    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000000000000L,0x0000000000600000L});
+    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000080000L});
+    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000000100000L});
+    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000000200080L});
+    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000000000400000L});
+    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x00244804021000F0L,0x00000000001FFFFAL});
+    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000000800000L});
+    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000002000080L});
+    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000000004000000L});
+    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000000008000000L});
+    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000000010000000L});
+    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000000010200000L});
+    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0000000040000080L});
+    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0024482C021000F0L,0x00000000001FFFFAL});
+    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0000000020800000L});
+    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0000000080000002L});
+    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0000000100000000L});
+    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000000200000002L});
+    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x00244824021000F0L,0x00000000001FFFFAL});
+    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0000001004000000L});
+    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0000000000048002L});
+    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0000004000000000L});
+    public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x0000018000000000L});
+    public static final BitSet FOLLOW_36 = new BitSet(new long[]{0x0000010000000000L});
+    public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x0000020000000000L});
+    public static final BitSet FOLLOW_38 = new BitSet(new long[]{0x0000000080000080L});
+    public static final BitSet FOLLOW_39 = new BitSet(new long[]{0x0000040000000000L});
+    public static final BitSet FOLLOW_40 = new BitSet(new long[]{0x0000000042000080L});
+    public static final BitSet FOLLOW_41 = new BitSet(new long[]{0x0000000200000000L});
+    public static final BitSet FOLLOW_42 = new BitSet(new long[]{0x0000100000000002L});
+    public static final BitSet FOLLOW_43 = new BitSet(new long[]{0x0000200000000002L});
+    public static final BitSet FOLLOW_44 = new BitSet(new long[]{0x0000800000000000L});
+    public static final BitSet FOLLOW_45 = new BitSet(new long[]{0x0000000000000080L,0x00000000001C0000L});
+    public static final BitSet FOLLOW_46 = new BitSet(new long[]{0x0001000000000002L});
+    public static final BitSet FOLLOW_47 = new BitSet(new long[]{0x0002000000000002L});
+    public static final BitSet FOLLOW_48 = new BitSet(new long[]{0x0008000000000000L});
+    public static final BitSet FOLLOW_49 = new BitSet(new long[]{0x0010000000000002L});
+    public static final BitSet FOLLOW_50 = new BitSet(new long[]{0x0000000002100000L});
+    public static final BitSet FOLLOW_51 = new BitSet(new long[]{0x00000000021000F0L,0x00000000001FFFFAL});
+    public static final BitSet FOLLOW_52 = new BitSet(new long[]{0x0040000000040000L});
+    public static final BitSet FOLLOW_53 = new BitSet(new long[]{0x0000000000200000L});
+    public static final BitSet FOLLOW_54 = new BitSet(new long[]{0x0080000000000002L});
+    public static final BitSet FOLLOW_55 = new BitSet(new long[]{0x0100000000000002L});
+    public static final BitSet FOLLOW_56 = new BitSet(new long[]{0x0200000000000002L});
+    public static final BitSet FOLLOW_57 = new BitSet(new long[]{0xFC00000000000002L});
+    public static final BitSet FOLLOW_58 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000003L});
+    public static final BitSet FOLLOW_59 = new BitSet(new long[]{0x0000000040000002L,0x0000000000000004L});
+    public static final BitSet FOLLOW_60 = new BitSet(new long[]{0x00244804061000F0L,0x00000000001FFFFAL});
+    public static final BitSet FOLLOW_61 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L});
+    public static final BitSet FOLLOW_62 = new BitSet(new long[]{0x0000000000000000L,0x0000000000001FE0L});
+    public static final BitSet FOLLOW_63 = new BitSet(new long[]{0x00244804023000F0L,0x00000000001FFFFAL});
+    public static final BitSet FOLLOW_64 = new BitSet(new long[]{0x0000001000200000L});
+    public static final BitSet FOLLOW_65 = new BitSet(new long[]{0x0000000080000000L});
 
 }
\ No newline at end of file
diff --git a/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/scope/impl/ScopePackageImpl.java b/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/scope/impl/ScopePackageImpl.java
index 672584773..b9cce8173 100644
--- a/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/scope/impl/ScopePackageImpl.java
+++ b/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/scope/impl/ScopePackageImpl.java
@@ -33,6 +33,7 @@
 import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EcorePackage;
 
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 
@@ -1094,6 +1095,7 @@ public void initializePackageContents()
     setNsURI(eNS_URI);
 
     // Obtain other dependent packages
+    EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
     ExpressionPackage theExpressionPackage = (ExpressionPackage)EPackage.Registry.INSTANCE.getEPackage(ExpressionPackage.eNS_URI);
 
     // Create type parameters
@@ -1111,7 +1113,7 @@ public void initializePackageContents()
 
     // Initialize classes and features; add operations and parameters
     initEClass(scopeModelEClass, ScopeModel.class, "ScopeModel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getScopeModel_Name(), ecorePackage.getEString(), "name", null, 0, 1, ScopeModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getScopeModel_Name(), theEcorePackage.getEString(), "name", null, 0, 1, ScopeModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getScopeModel_IncludedScopes(), this.getScopeModel(), null, "includedScopes", null, 0, -1, ScopeModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getScopeModel_Imports(), this.getImport(), null, "imports", null, 0, -1, ScopeModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getScopeModel_Extensions(), this.getExtension(), null, "extensions", null, 0, -1, ScopeModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -1120,29 +1122,29 @@ public void initializePackageContents()
     initEReference(getScopeModel_Scopes(), this.getScopeDefinition(), null, "scopes", null, 0, -1, ScopeModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(importEClass, Import.class, "Import", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getImport_Package(), ecorePackage.getEPackage(), null, "package", null, 0, 1, Import.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getImport_Name(), ecorePackage.getEString(), "name", null, 0, 1, Import.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getImport_Package(), theEcorePackage.getEPackage(), null, "package", null, 0, 1, Import.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getImport_Name(), theEcorePackage.getEString(), "name", null, 0, 1, Import.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(extensionEClass, Extension.class, "Extension", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getExtension_Extension(), ecorePackage.getEString(), "extension", null, 0, 1, Extension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getExtension_Extension(), theEcorePackage.getEString(), "extension", null, 0, 1, Extension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(injectionEClass, Injection.class, "Injection", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getInjection_Type(), ecorePackage.getEString(), "type", null, 0, 1, Injection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getInjection_Name(), ecorePackage.getEString(), "name", null, 0, 1, Injection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getInjection_Type(), theEcorePackage.getEString(), "type", null, 0, 1, Injection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getInjection_Name(), theEcorePackage.getEString(), "name", null, 0, 1, Injection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(namingSectionEClass, NamingSection.class, "NamingSection", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getNamingSection_Casing(), this.getCasing(), "casing", null, 0, 1, NamingSection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getNamingSection_Namings(), this.getNamingDefinition(), null, "namings", null, 0, -1, NamingSection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(namingDefinitionEClass, NamingDefinition.class, "NamingDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getNamingDefinition_Type(), ecorePackage.getEClass(), null, "type", null, 0, 1, NamingDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getNamingDefinition_Type(), theEcorePackage.getEClass(), null, "type", null, 0, 1, NamingDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getNamingDefinition_Naming(), this.getNaming(), null, "naming", null, 0, 1, NamingDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(scopeDefinitionEClass, ScopeDefinition.class, "ScopeDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getScopeDefinition_Name(), ecorePackage.getEString(), "name", null, 0, 1, ScopeDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getScopeDefinition_TargetType(), ecorePackage.getEClass(), null, "targetType", null, 0, 1, ScopeDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getScopeDefinition_ContextType(), ecorePackage.getEClass(), null, "contextType", null, 0, 1, ScopeDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getScopeDefinition_Reference(), ecorePackage.getEReference(), null, "reference", null, 0, 1, ScopeDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getScopeDefinition_Name(), theEcorePackage.getEString(), "name", null, 0, 1, ScopeDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getScopeDefinition_TargetType(), theEcorePackage.getEClass(), null, "targetType", null, 0, 1, ScopeDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getScopeDefinition_ContextType(), theEcorePackage.getEClass(), null, "contextType", null, 0, 1, ScopeDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getScopeDefinition_Reference(), theEcorePackage.getEReference(), null, "reference", null, 0, 1, ScopeDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getScopeDefinition_Rules(), this.getScopeRule(), null, "rules", null, 0, -1, ScopeDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(scopeRuleEClass, ScopeRule.class, "ScopeRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -1150,8 +1152,8 @@ public void initializePackageContents()
     initEReference(getScopeRule_Exprs(), this.getScopeExpression(), null, "exprs", null, 0, -1, ScopeRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(scopeContextEClass, ScopeContext.class, "ScopeContext", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getScopeContext_Global(), ecorePackage.getEBoolean(), "global", null, 0, 1, ScopeContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getScopeContext_ContextType(), ecorePackage.getEClass(), null, "contextType", null, 0, 1, ScopeContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getScopeContext_Global(), theEcorePackage.getEBoolean(), "global", null, 0, 1, ScopeContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getScopeContext_ContextType(), theEcorePackage.getEClass(), null, "contextType", null, 0, 1, ScopeContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getScopeContext_Guard(), theExpressionPackage.getExpression(), null, "guard", null, 0, 1, ScopeContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(scopeExpressionEClass, ScopeExpression.class, "ScopeExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -1166,26 +1168,26 @@ public void initializePackageContents()
     initEReference(getScopeDelegation_Scope(), this.getScopeDefinition(), null, "scope", null, 0, 1, ScopeDelegation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(namedScopeExpressionEClass, NamedScopeExpression.class, "NamedScopeExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getNamedScopeExpression_CaseDef(), ecorePackage.getEBoolean(), "caseDef", null, 0, 1, NamedScopeExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNamedScopeExpression_CaseDef(), theEcorePackage.getEBoolean(), "caseDef", null, 0, 1, NamedScopeExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getNamedScopeExpression_Casing(), this.getCasing(), "casing", null, 0, 1, NamedScopeExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getNamedScopeExpression_Naming(), this.getNaming(), null, "naming", null, 0, 1, NamedScopeExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(globalScopeExpressionEClass, GlobalScopeExpression.class, "GlobalScopeExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getGlobalScopeExpression_Type(), ecorePackage.getEClass(), null, "type", null, 0, 1, GlobalScopeExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getGlobalScopeExpression_Type(), theEcorePackage.getEClass(), null, "type", null, 0, 1, GlobalScopeExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getGlobalScopeExpression_Name(), theExpressionPackage.getExpression(), null, "name", null, 0, 1, GlobalScopeExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getGlobalScopeExpression_RecursivePrefix(), ecorePackage.getEBoolean(), "recursivePrefix", null, 0, 1, GlobalScopeExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getGlobalScopeExpression_RecursivePrefix(), theEcorePackage.getEBoolean(), "recursivePrefix", null, 0, 1, GlobalScopeExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getGlobalScopeExpression_Prefix(), theExpressionPackage.getExpression(), null, "prefix", null, 0, 1, GlobalScopeExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getGlobalScopeExpression_Data(), this.getDataExpression(), null, "data", null, 0, -1, GlobalScopeExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getGlobalScopeExpression_Domains(), ecorePackage.getEString(), "domains", null, 0, -1, GlobalScopeExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getGlobalScopeExpression_Domains(), theEcorePackage.getEString(), "domains", null, 0, -1, GlobalScopeExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(dataExpressionEClass, DataExpression.class, "DataExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEReference(getDataExpression_Value(), theExpressionPackage.getExpression(), null, "value", null, 0, 1, DataExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(matchDataExpressionEClass, MatchDataExpression.class, "MatchDataExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getMatchDataExpression_Key(), ecorePackage.getEString(), "key", null, 0, 1, MatchDataExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getMatchDataExpression_Key(), theEcorePackage.getEString(), "key", null, 0, 1, MatchDataExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(lambdaDataExpressionEClass, LambdaDataExpression.class, "LambdaDataExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getLambdaDataExpression_Desc(), ecorePackage.getEString(), "desc", null, 0, 1, LambdaDataExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getLambdaDataExpression_Desc(), theEcorePackage.getEString(), "desc", null, 0, 1, LambdaDataExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(simpleScopeExpressionEClass, SimpleScopeExpression.class, "SimpleScopeExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEReference(getSimpleScopeExpression_Expr(), theExpressionPackage.getExpression(), null, "expr", null, 0, 1, SimpleScopeExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -1194,8 +1196,8 @@ public void initializePackageContents()
     initEReference(getNaming_Names(), this.getNamingExpression(), null, "names", null, 0, -1, Naming.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(namingExpressionEClass, NamingExpression.class, "NamingExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getNamingExpression_Export(), ecorePackage.getEBoolean(), "export", null, 0, 1, NamingExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getNamingExpression_Factory(), ecorePackage.getEBoolean(), "factory", null, 0, 1, NamingExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNamingExpression_Export(), theEcorePackage.getEBoolean(), "export", null, 0, 1, NamingExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getNamingExpression_Factory(), theEcorePackage.getEBoolean(), "factory", null, 0, 1, NamingExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getNamingExpression_Expression(), theExpressionPackage.getExpression(), null, "expression", null, 0, 1, NamingExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     // Initialize enums and add enum literals
diff --git a/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/serializer/AbstractScopeSemanticSequencer.java b/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/serializer/AbstractScopeSemanticSequencer.java
index 19b5a8a30..2f744566f 100644
--- a/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/serializer/AbstractScopeSemanticSequencer.java
+++ b/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/serializer/AbstractScopeSemanticSequencer.java
@@ -45,16 +45,14 @@
 import com.avaloq.tools.ddk.xtext.scope.scope.SimpleScopeExpression;
 import com.avaloq.tools.ddk.xtext.scope.services.ScopeGrammarAccess;
 import com.google.inject.Inject;
-import com.google.inject.Provider;
+import java.util.Set;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.xtext.serializer.acceptor.ISemanticSequenceAcceptor;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.xtext.Action;
+import org.eclipse.xtext.Parameter;
+import org.eclipse.xtext.ParserRule;
+import org.eclipse.xtext.serializer.ISerializationContext;
 import org.eclipse.xtext.serializer.acceptor.SequenceFeeder;
-import org.eclipse.xtext.serializer.diagnostic.ISemanticSequencerDiagnosticProvider;
-import org.eclipse.xtext.serializer.diagnostic.ISerializationDiagnostic.Acceptor;
-import org.eclipse.xtext.serializer.sequencer.GenericSequencer;
-import org.eclipse.xtext.serializer.sequencer.ISemanticNodeProvider.INodesForEObjectProvider;
-import org.eclipse.xtext.serializer.sequencer.ISemanticSequencer;
-import org.eclipse.xtext.serializer.sequencer.ITransientValueService;
 import org.eclipse.xtext.serializer.sequencer.ITransientValueService.ValueTransient;
 
 @SuppressWarnings("all")
@@ -64,8 +62,13 @@ public abstract class AbstractScopeSemanticSequencer extends ExpressionSemanticS
 	private ScopeGrammarAccess grammarAccess;
 	
 	@Override
-	public void createSequence(EObject context, EObject semanticObject) {
-		if(semanticObject.eClass().getEPackage() == ExpressionPackage.eINSTANCE) switch(semanticObject.eClass().getClassifierID()) {
+	public void sequence(ISerializationContext context, EObject semanticObject) {
+		EPackage epackage = semanticObject.eClass().getEPackage();
+		ParserRule rule = context.getParserRule();
+		Action action = context.getAssignedAction();
+		Set<Parameter> parameters = context.getEnabledBooleanParameters();
+		if (epackage == ExpressionPackage.eINSTANCE)
+			switch (semanticObject.eClass().getClassifierID()) {
 			case ExpressionPackage.BOOLEAN_LITERAL:
 				sequence_BooleanLiteral(context, (BooleanLiteral) semanticObject); 
 				return; 
@@ -82,38 +85,38 @@ public void createSequence(EObject context, EObject semanticObject) {
 				sequence_ChainExpression(context, (ChainExpression) semanticObject); 
 				return; 
 			case ExpressionPackage.COLLECTION_EXPRESSION:
-				if(context == grammarAccess.getCollectionExpressionRule() ||
-				   context == grammarAccess.getFeatureCallRule()) {
+				if (rule == grammarAccess.getFeatureCallRule()
+						|| rule == grammarAccess.getCollectionExpressionRule()) {
 					sequence_CollectionExpression(context, (CollectionExpression) semanticObject); 
 					return; 
 				}
-				else if(context == grammarAccess.getAdditiveExpressionRule() ||
-				   context == grammarAccess.getAdditiveExpressionAccess().getOperationCallParamsAction_1_0() ||
-				   context == grammarAccess.getAndExpressionRule() ||
-				   context == grammarAccess.getAndExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-				   context == grammarAccess.getChainExpressionRule() ||
-				   context == grammarAccess.getChainExpressionAccess().getChainExpressionFirstAction_1_0() ||
-				   context == grammarAccess.getChainedExpressionRule() ||
-				   context == grammarAccess.getExpressionRule() ||
-				   context == grammarAccess.getIfExpressionTriRule() ||
-				   context == grammarAccess.getIfExpressionTriAccess().getIfExpressionConditionAction_1_0() ||
-				   context == grammarAccess.getImpliesExpressionRule() ||
-				   context == grammarAccess.getImpliesExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-				   context == grammarAccess.getInfixExpressionRule() ||
-				   context == grammarAccess.getInfixExpressionAccess().getCollectionExpressionTargetAction_1_3_0() ||
-				   context == grammarAccess.getInfixExpressionAccess().getFeatureCallTargetAction_1_1_0() ||
-				   context == grammarAccess.getInfixExpressionAccess().getOperationCallTargetAction_1_0_0() ||
-				   context == grammarAccess.getInfixExpressionAccess().getTypeSelectExpressionTargetAction_1_2_0() ||
-				   context == grammarAccess.getMultiplicativeExpressionRule() ||
-				   context == grammarAccess.getMultiplicativeExpressionAccess().getOperationCallParamsAction_1_0() ||
-				   context == grammarAccess.getOrExpressionRule() ||
-				   context == grammarAccess.getOrExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-				   context == grammarAccess.getParanthesizedExpressionRule() ||
-				   context == grammarAccess.getPrimaryExpressionRule() ||
-				   context == grammarAccess.getRelationalExpressionRule() ||
-				   context == grammarAccess.getRelationalExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-				   context == grammarAccess.getSyntaxElementRule() ||
-				   context == grammarAccess.getUnaryOrInfixExpressionRule()) {
+				else if (rule == grammarAccess.getExpressionRule()
+						|| rule == grammarAccess.getSyntaxElementRule()
+						|| rule == grammarAccess.getChainExpressionRule()
+						|| action == grammarAccess.getChainExpressionAccess().getChainExpressionFirstAction_1_0()
+						|| rule == grammarAccess.getChainedExpressionRule()
+						|| rule == grammarAccess.getIfExpressionTriRule()
+						|| action == grammarAccess.getIfExpressionTriAccess().getIfExpressionConditionAction_1_0()
+						|| rule == grammarAccess.getOrExpressionRule()
+						|| action == grammarAccess.getOrExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getAndExpressionRule()
+						|| action == grammarAccess.getAndExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getImpliesExpressionRule()
+						|| action == grammarAccess.getImpliesExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getRelationalExpressionRule()
+						|| action == grammarAccess.getRelationalExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getAdditiveExpressionRule()
+						|| action == grammarAccess.getAdditiveExpressionAccess().getOperationCallParamsAction_1_0()
+						|| rule == grammarAccess.getMultiplicativeExpressionRule()
+						|| action == grammarAccess.getMultiplicativeExpressionAccess().getOperationCallParamsAction_1_0()
+						|| rule == grammarAccess.getUnaryOrInfixExpressionRule()
+						|| rule == grammarAccess.getInfixExpressionRule()
+						|| action == grammarAccess.getInfixExpressionAccess().getOperationCallTargetAction_1_0_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getFeatureCallTargetAction_1_1_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getTypeSelectExpressionTargetAction_1_2_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getCollectionExpressionTargetAction_1_3_0()
+						|| rule == grammarAccess.getPrimaryExpressionRule()
+						|| rule == grammarAccess.getParanthesizedExpressionRule()) {
 					sequence_CollectionExpression_InfixExpression(context, (CollectionExpression) semanticObject); 
 					return; 
 				}
@@ -122,37 +125,37 @@ else if(context == grammarAccess.getAdditiveExpressionRule() ||
 				sequence_ConstructorCallExpression(context, (ConstructorCallExpression) semanticObject); 
 				return; 
 			case ExpressionPackage.FEATURE_CALL:
-				if(context == grammarAccess.getFeatureCallRule()) {
+				if (rule == grammarAccess.getFeatureCallRule()) {
 					sequence_FeatureCall(context, (FeatureCall) semanticObject); 
 					return; 
 				}
-				else if(context == grammarAccess.getAdditiveExpressionRule() ||
-				   context == grammarAccess.getAdditiveExpressionAccess().getOperationCallParamsAction_1_0() ||
-				   context == grammarAccess.getAndExpressionRule() ||
-				   context == grammarAccess.getAndExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-				   context == grammarAccess.getChainExpressionRule() ||
-				   context == grammarAccess.getChainExpressionAccess().getChainExpressionFirstAction_1_0() ||
-				   context == grammarAccess.getChainedExpressionRule() ||
-				   context == grammarAccess.getExpressionRule() ||
-				   context == grammarAccess.getIfExpressionTriRule() ||
-				   context == grammarAccess.getIfExpressionTriAccess().getIfExpressionConditionAction_1_0() ||
-				   context == grammarAccess.getImpliesExpressionRule() ||
-				   context == grammarAccess.getImpliesExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-				   context == grammarAccess.getInfixExpressionRule() ||
-				   context == grammarAccess.getInfixExpressionAccess().getCollectionExpressionTargetAction_1_3_0() ||
-				   context == grammarAccess.getInfixExpressionAccess().getFeatureCallTargetAction_1_1_0() ||
-				   context == grammarAccess.getInfixExpressionAccess().getOperationCallTargetAction_1_0_0() ||
-				   context == grammarAccess.getInfixExpressionAccess().getTypeSelectExpressionTargetAction_1_2_0() ||
-				   context == grammarAccess.getMultiplicativeExpressionRule() ||
-				   context == grammarAccess.getMultiplicativeExpressionAccess().getOperationCallParamsAction_1_0() ||
-				   context == grammarAccess.getOrExpressionRule() ||
-				   context == grammarAccess.getOrExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-				   context == grammarAccess.getParanthesizedExpressionRule() ||
-				   context == grammarAccess.getPrimaryExpressionRule() ||
-				   context == grammarAccess.getRelationalExpressionRule() ||
-				   context == grammarAccess.getRelationalExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-				   context == grammarAccess.getSyntaxElementRule() ||
-				   context == grammarAccess.getUnaryOrInfixExpressionRule()) {
+				else if (rule == grammarAccess.getExpressionRule()
+						|| rule == grammarAccess.getSyntaxElementRule()
+						|| rule == grammarAccess.getChainExpressionRule()
+						|| action == grammarAccess.getChainExpressionAccess().getChainExpressionFirstAction_1_0()
+						|| rule == grammarAccess.getChainedExpressionRule()
+						|| rule == grammarAccess.getIfExpressionTriRule()
+						|| action == grammarAccess.getIfExpressionTriAccess().getIfExpressionConditionAction_1_0()
+						|| rule == grammarAccess.getOrExpressionRule()
+						|| action == grammarAccess.getOrExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getAndExpressionRule()
+						|| action == grammarAccess.getAndExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getImpliesExpressionRule()
+						|| action == grammarAccess.getImpliesExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getRelationalExpressionRule()
+						|| action == grammarAccess.getRelationalExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getAdditiveExpressionRule()
+						|| action == grammarAccess.getAdditiveExpressionAccess().getOperationCallParamsAction_1_0()
+						|| rule == grammarAccess.getMultiplicativeExpressionRule()
+						|| action == grammarAccess.getMultiplicativeExpressionAccess().getOperationCallParamsAction_1_0()
+						|| rule == grammarAccess.getUnaryOrInfixExpressionRule()
+						|| rule == grammarAccess.getInfixExpressionRule()
+						|| action == grammarAccess.getInfixExpressionAccess().getOperationCallTargetAction_1_0_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getFeatureCallTargetAction_1_1_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getTypeSelectExpressionTargetAction_1_2_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getCollectionExpressionTargetAction_1_3_0()
+						|| rule == grammarAccess.getPrimaryExpressionRule()
+						|| rule == grammarAccess.getParanthesizedExpressionRule()) {
 					sequence_FeatureCall_InfixExpression(context, (FeatureCall) semanticObject); 
 					return; 
 				}
@@ -161,53 +164,53 @@ else if(context == grammarAccess.getAdditiveExpressionRule() ||
 				sequence_GlobalVarExpression(context, (GlobalVarExpression) semanticObject); 
 				return; 
 			case ExpressionPackage.IDENTIFIER:
-				if(context == grammarAccess.getCollectionTypeRule()) {
+				if (rule == grammarAccess.getCollectionTypeRule()) {
 					sequence_CollectionType(context, (Identifier) semanticObject); 
 					return; 
 				}
-				else if(context == grammarAccess.getSyntaxElementRule() ||
-				   context == grammarAccess.getTypeRule()) {
-					sequence_CollectionType_SimpleType_Type(context, (Identifier) semanticObject); 
+				else if (rule == grammarAccess.getSyntaxElementRule()
+						|| rule == grammarAccess.getTypeRule()) {
+					sequence_CollectionType_SimpleType(context, (Identifier) semanticObject); 
 					return; 
 				}
-				else if(context == grammarAccess.getSimpleTypeRule()) {
+				else if (rule == grammarAccess.getSimpleTypeRule()) {
 					sequence_SimpleType(context, (Identifier) semanticObject); 
 					return; 
 				}
 				else break;
 			case ExpressionPackage.IF_EXPRESSION:
-				if(context == grammarAccess.getAdditiveExpressionRule() ||
-				   context == grammarAccess.getAdditiveExpressionAccess().getOperationCallParamsAction_1_0() ||
-				   context == grammarAccess.getAndExpressionRule() ||
-				   context == grammarAccess.getAndExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-				   context == grammarAccess.getChainExpressionRule() ||
-				   context == grammarAccess.getChainExpressionAccess().getChainExpressionFirstAction_1_0() ||
-				   context == grammarAccess.getChainedExpressionRule() ||
-				   context == grammarAccess.getExpressionRule() ||
-				   context == grammarAccess.getIfExpressionTriRule() ||
-				   context == grammarAccess.getIfExpressionTriAccess().getIfExpressionConditionAction_1_0() ||
-				   context == grammarAccess.getImpliesExpressionRule() ||
-				   context == grammarAccess.getImpliesExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-				   context == grammarAccess.getInfixExpressionRule() ||
-				   context == grammarAccess.getInfixExpressionAccess().getCollectionExpressionTargetAction_1_3_0() ||
-				   context == grammarAccess.getInfixExpressionAccess().getFeatureCallTargetAction_1_1_0() ||
-				   context == grammarAccess.getInfixExpressionAccess().getOperationCallTargetAction_1_0_0() ||
-				   context == grammarAccess.getInfixExpressionAccess().getTypeSelectExpressionTargetAction_1_2_0() ||
-				   context == grammarAccess.getMultiplicativeExpressionRule() ||
-				   context == grammarAccess.getMultiplicativeExpressionAccess().getOperationCallParamsAction_1_0() ||
-				   context == grammarAccess.getOrExpressionRule() ||
-				   context == grammarAccess.getOrExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-				   context == grammarAccess.getParanthesizedExpressionRule() ||
-				   context == grammarAccess.getPrimaryExpressionRule() ||
-				   context == grammarAccess.getRelationalExpressionRule() ||
-				   context == grammarAccess.getRelationalExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-				   context == grammarAccess.getSyntaxElementRule() ||
-				   context == grammarAccess.getUnaryOrInfixExpressionRule()) {
-					sequence_ChainedExpression_IfExpressionKw_IfExpressionTri(context, (IfExpression) semanticObject); 
+				if (rule == grammarAccess.getIfExpressionKwRule()) {
+					sequence_IfExpressionKw(context, (IfExpression) semanticObject); 
 					return; 
 				}
-				else if(context == grammarAccess.getIfExpressionKwRule()) {
-					sequence_IfExpressionKw(context, (IfExpression) semanticObject); 
+				else if (rule == grammarAccess.getExpressionRule()
+						|| rule == grammarAccess.getSyntaxElementRule()
+						|| rule == grammarAccess.getChainExpressionRule()
+						|| action == grammarAccess.getChainExpressionAccess().getChainExpressionFirstAction_1_0()
+						|| rule == grammarAccess.getChainedExpressionRule()
+						|| rule == grammarAccess.getIfExpressionTriRule()
+						|| action == grammarAccess.getIfExpressionTriAccess().getIfExpressionConditionAction_1_0()
+						|| rule == grammarAccess.getOrExpressionRule()
+						|| action == grammarAccess.getOrExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getAndExpressionRule()
+						|| action == grammarAccess.getAndExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getImpliesExpressionRule()
+						|| action == grammarAccess.getImpliesExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getRelationalExpressionRule()
+						|| action == grammarAccess.getRelationalExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getAdditiveExpressionRule()
+						|| action == grammarAccess.getAdditiveExpressionAccess().getOperationCallParamsAction_1_0()
+						|| rule == grammarAccess.getMultiplicativeExpressionRule()
+						|| action == grammarAccess.getMultiplicativeExpressionAccess().getOperationCallParamsAction_1_0()
+						|| rule == grammarAccess.getUnaryOrInfixExpressionRule()
+						|| rule == grammarAccess.getInfixExpressionRule()
+						|| action == grammarAccess.getInfixExpressionAccess().getOperationCallTargetAction_1_0_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getFeatureCallTargetAction_1_1_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getTypeSelectExpressionTargetAction_1_2_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getCollectionExpressionTargetAction_1_3_0()
+						|| rule == grammarAccess.getPrimaryExpressionRule()
+						|| rule == grammarAccess.getParanthesizedExpressionRule()) {
+					sequence_IfExpressionKw_IfExpressionTri(context, (IfExpression) semanticObject); 
 					return; 
 				}
 				else break;
@@ -224,42 +227,42 @@ else if(context == grammarAccess.getIfExpressionKwRule()) {
 				sequence_NullLiteral(context, (NullLiteral) semanticObject); 
 				return; 
 			case ExpressionPackage.OPERATION_CALL:
-				if(context == grammarAccess.getAdditiveExpressionRule() ||
-				   context == grammarAccess.getAdditiveExpressionAccess().getOperationCallParamsAction_1_0() ||
-				   context == grammarAccess.getAndExpressionRule() ||
-				   context == grammarAccess.getAndExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-				   context == grammarAccess.getChainExpressionRule() ||
-				   context == grammarAccess.getChainExpressionAccess().getChainExpressionFirstAction_1_0() ||
-				   context == grammarAccess.getChainedExpressionRule() ||
-				   context == grammarAccess.getExpressionRule() ||
-				   context == grammarAccess.getIfExpressionTriRule() ||
-				   context == grammarAccess.getIfExpressionTriAccess().getIfExpressionConditionAction_1_0() ||
-				   context == grammarAccess.getImpliesExpressionRule() ||
-				   context == grammarAccess.getImpliesExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-				   context == grammarAccess.getInfixExpressionRule() ||
-				   context == grammarAccess.getInfixExpressionAccess().getCollectionExpressionTargetAction_1_3_0() ||
-				   context == grammarAccess.getInfixExpressionAccess().getFeatureCallTargetAction_1_1_0() ||
-				   context == grammarAccess.getInfixExpressionAccess().getOperationCallTargetAction_1_0_0() ||
-				   context == grammarAccess.getInfixExpressionAccess().getTypeSelectExpressionTargetAction_1_2_0() ||
-				   context == grammarAccess.getMultiplicativeExpressionRule() ||
-				   context == grammarAccess.getMultiplicativeExpressionAccess().getOperationCallParamsAction_1_0() ||
-				   context == grammarAccess.getOrExpressionRule() ||
-				   context == grammarAccess.getOrExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-				   context == grammarAccess.getParanthesizedExpressionRule() ||
-				   context == grammarAccess.getPrimaryExpressionRule() ||
-				   context == grammarAccess.getRelationalExpressionRule() ||
-				   context == grammarAccess.getRelationalExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-				   context == grammarAccess.getSyntaxElementRule() ||
-				   context == grammarAccess.getUnaryOrInfixExpressionRule()) {
-					sequence_AdditiveExpression_InfixExpression_MultiplicativeExpression_OperationCall_UnaryExpression_UnaryOrInfixExpression(context, (OperationCall) semanticObject); 
+				if (rule == grammarAccess.getExpressionRule()
+						|| rule == grammarAccess.getSyntaxElementRule()
+						|| rule == grammarAccess.getChainExpressionRule()
+						|| action == grammarAccess.getChainExpressionAccess().getChainExpressionFirstAction_1_0()
+						|| rule == grammarAccess.getChainedExpressionRule()
+						|| rule == grammarAccess.getIfExpressionTriRule()
+						|| action == grammarAccess.getIfExpressionTriAccess().getIfExpressionConditionAction_1_0()
+						|| rule == grammarAccess.getOrExpressionRule()
+						|| action == grammarAccess.getOrExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getAndExpressionRule()
+						|| action == grammarAccess.getAndExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getImpliesExpressionRule()
+						|| action == grammarAccess.getImpliesExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getRelationalExpressionRule()
+						|| action == grammarAccess.getRelationalExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getAdditiveExpressionRule()
+						|| action == grammarAccess.getAdditiveExpressionAccess().getOperationCallParamsAction_1_0()
+						|| rule == grammarAccess.getMultiplicativeExpressionRule()
+						|| action == grammarAccess.getMultiplicativeExpressionAccess().getOperationCallParamsAction_1_0()
+						|| rule == grammarAccess.getUnaryOrInfixExpressionRule()
+						|| rule == grammarAccess.getInfixExpressionRule()
+						|| action == grammarAccess.getInfixExpressionAccess().getOperationCallTargetAction_1_0_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getFeatureCallTargetAction_1_1_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getTypeSelectExpressionTargetAction_1_2_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getCollectionExpressionTargetAction_1_3_0()
+						|| rule == grammarAccess.getPrimaryExpressionRule()
+						|| rule == grammarAccess.getParanthesizedExpressionRule()) {
+					sequence_AdditiveExpression_InfixExpression_MultiplicativeExpression_OperationCall_UnaryExpression(context, (OperationCall) semanticObject); 
 					return; 
 				}
-				else if(context == grammarAccess.getFeatureCallRule() ||
-				   context == grammarAccess.getOperationCallRule()) {
+				else if (rule == grammarAccess.getFeatureCallRule()
+						|| rule == grammarAccess.getOperationCallRule()) {
 					sequence_OperationCall(context, (OperationCall) semanticObject); 
 					return; 
 				}
-				else if(context == grammarAccess.getUnaryExpressionRule()) {
+				else if (rule == grammarAccess.getUnaryExpressionRule()) {
 					sequence_UnaryExpression(context, (OperationCall) semanticObject); 
 					return; 
 				}
@@ -274,67 +277,68 @@ else if(context == grammarAccess.getUnaryExpressionRule()) {
 				sequence_SwitchExpression(context, (SwitchExpression) semanticObject); 
 				return; 
 			case ExpressionPackage.TYPE_SELECT_EXPRESSION:
-				if(context == grammarAccess.getAdditiveExpressionRule() ||
-				   context == grammarAccess.getAdditiveExpressionAccess().getOperationCallParamsAction_1_0() ||
-				   context == grammarAccess.getAndExpressionRule() ||
-				   context == grammarAccess.getAndExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-				   context == grammarAccess.getChainExpressionRule() ||
-				   context == grammarAccess.getChainExpressionAccess().getChainExpressionFirstAction_1_0() ||
-				   context == grammarAccess.getChainedExpressionRule() ||
-				   context == grammarAccess.getExpressionRule() ||
-				   context == grammarAccess.getIfExpressionTriRule() ||
-				   context == grammarAccess.getIfExpressionTriAccess().getIfExpressionConditionAction_1_0() ||
-				   context == grammarAccess.getImpliesExpressionRule() ||
-				   context == grammarAccess.getImpliesExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-				   context == grammarAccess.getInfixExpressionRule() ||
-				   context == grammarAccess.getInfixExpressionAccess().getCollectionExpressionTargetAction_1_3_0() ||
-				   context == grammarAccess.getInfixExpressionAccess().getFeatureCallTargetAction_1_1_0() ||
-				   context == grammarAccess.getInfixExpressionAccess().getOperationCallTargetAction_1_0_0() ||
-				   context == grammarAccess.getInfixExpressionAccess().getTypeSelectExpressionTargetAction_1_2_0() ||
-				   context == grammarAccess.getMultiplicativeExpressionRule() ||
-				   context == grammarAccess.getMultiplicativeExpressionAccess().getOperationCallParamsAction_1_0() ||
-				   context == grammarAccess.getOrExpressionRule() ||
-				   context == grammarAccess.getOrExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-				   context == grammarAccess.getParanthesizedExpressionRule() ||
-				   context == grammarAccess.getPrimaryExpressionRule() ||
-				   context == grammarAccess.getRelationalExpressionRule() ||
-				   context == grammarAccess.getRelationalExpressionAccess().getBooleanOperationLeftAction_1_0() ||
-				   context == grammarAccess.getSyntaxElementRule() ||
-				   context == grammarAccess.getUnaryOrInfixExpressionRule()) {
+				if (rule == grammarAccess.getExpressionRule()
+						|| rule == grammarAccess.getSyntaxElementRule()
+						|| rule == grammarAccess.getChainExpressionRule()
+						|| action == grammarAccess.getChainExpressionAccess().getChainExpressionFirstAction_1_0()
+						|| rule == grammarAccess.getChainedExpressionRule()
+						|| rule == grammarAccess.getIfExpressionTriRule()
+						|| action == grammarAccess.getIfExpressionTriAccess().getIfExpressionConditionAction_1_0()
+						|| rule == grammarAccess.getOrExpressionRule()
+						|| action == grammarAccess.getOrExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getAndExpressionRule()
+						|| action == grammarAccess.getAndExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getImpliesExpressionRule()
+						|| action == grammarAccess.getImpliesExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getRelationalExpressionRule()
+						|| action == grammarAccess.getRelationalExpressionAccess().getBooleanOperationLeftAction_1_0()
+						|| rule == grammarAccess.getAdditiveExpressionRule()
+						|| action == grammarAccess.getAdditiveExpressionAccess().getOperationCallParamsAction_1_0()
+						|| rule == grammarAccess.getMultiplicativeExpressionRule()
+						|| action == grammarAccess.getMultiplicativeExpressionAccess().getOperationCallParamsAction_1_0()
+						|| rule == grammarAccess.getUnaryOrInfixExpressionRule()
+						|| rule == grammarAccess.getInfixExpressionRule()
+						|| action == grammarAccess.getInfixExpressionAccess().getOperationCallTargetAction_1_0_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getFeatureCallTargetAction_1_1_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getTypeSelectExpressionTargetAction_1_2_0()
+						|| action == grammarAccess.getInfixExpressionAccess().getCollectionExpressionTargetAction_1_3_0()
+						|| rule == grammarAccess.getPrimaryExpressionRule()
+						|| rule == grammarAccess.getParanthesizedExpressionRule()) {
 					sequence_InfixExpression_TypeSelectExpression(context, (TypeSelectExpression) semanticObject); 
 					return; 
 				}
-				else if(context == grammarAccess.getFeatureCallRule() ||
-				   context == grammarAccess.getTypeSelectExpressionRule()) {
+				else if (rule == grammarAccess.getFeatureCallRule()
+						|| rule == grammarAccess.getTypeSelectExpressionRule()) {
 					sequence_TypeSelectExpression(context, (TypeSelectExpression) semanticObject); 
 					return; 
 				}
 				else break;
 			}
-		else if(semanticObject.eClass().getEPackage() == ScopePackage.eINSTANCE) switch(semanticObject.eClass().getClassifierID()) {
+		else if (epackage == ScopePackage.eINSTANCE)
+			switch (semanticObject.eClass().getClassifierID()) {
 			case ScopePackage.EXTENSION:
 				sequence_Extension(context, (Extension) semanticObject); 
 				return; 
 			case ScopePackage.FACTORY_EXPRESSION:
-				if(context == grammarAccess.getFactoryExpressionRule()) {
+				if (rule == grammarAccess.getFactoryExpressionRule()) {
 					sequence_FactoryExpression(context, (FactoryExpression) semanticObject); 
 					return; 
 				}
-				else if(context == grammarAccess.getScopeExpressionRule()) {
+				else if (rule == grammarAccess.getScopeExpressionRule()) {
 					sequence_FactoryExpression_ScopeExpression(context, (FactoryExpression) semanticObject); 
 					return; 
 				}
 				else break;
 			case ScopePackage.GLOBAL_SCOPE_EXPRESSION:
-				if(context == grammarAccess.getGlobalScopeExpressionRule()) {
+				if (rule == grammarAccess.getGlobalScopeExpressionRule()) {
 					sequence_GlobalScopeExpression(context, (GlobalScopeExpression) semanticObject); 
 					return; 
 				}
-				else if(context == grammarAccess.getNamedScopeExpressionRule()) {
+				else if (rule == grammarAccess.getNamedScopeExpressionRule()) {
 					sequence_GlobalScopeExpression_NamedScopeExpression(context, (GlobalScopeExpression) semanticObject); 
 					return; 
 				}
-				else if(context == grammarAccess.getScopeExpressionRule()) {
+				else if (rule == grammarAccess.getScopeExpressionRule()) {
 					sequence_GlobalScopeExpression_NamedScopeExpression_ScopeExpression(context, (GlobalScopeExpression) semanticObject); 
 					return; 
 				}
@@ -370,11 +374,11 @@ else if(context == grammarAccess.getScopeExpressionRule()) {
 				sequence_ScopeDefinition(context, (ScopeDefinition) semanticObject); 
 				return; 
 			case ScopePackage.SCOPE_DELEGATION:
-				if(context == grammarAccess.getScopeDelegationRule()) {
+				if (rule == grammarAccess.getScopeDelegationRule()) {
 					sequence_ScopeDelegation(context, (ScopeDelegation) semanticObject); 
 					return; 
 				}
-				else if(context == grammarAccess.getScopeExpressionRule()) {
+				else if (rule == grammarAccess.getScopeExpressionRule()) {
 					sequence_ScopeDelegation_ScopeExpression(context, (ScopeDelegation) semanticObject); 
 					return; 
 				}
@@ -386,58 +390,76 @@ else if(context == grammarAccess.getScopeExpressionRule()) {
 				sequence_ScopeRule(context, (ScopeRule) semanticObject); 
 				return; 
 			case ScopePackage.SIMPLE_SCOPE_EXPRESSION:
-				if(context == grammarAccess.getScopeExpressionRule()) {
+				if (rule == grammarAccess.getScopeExpressionRule()) {
 					sequence_NamedScopeExpression_ScopeExpression_SimpleScopeExpression(context, (SimpleScopeExpression) semanticObject); 
 					return; 
 				}
-				else if(context == grammarAccess.getNamedScopeExpressionRule()) {
+				else if (rule == grammarAccess.getNamedScopeExpressionRule()) {
 					sequence_NamedScopeExpression_SimpleScopeExpression(context, (SimpleScopeExpression) semanticObject); 
 					return; 
 				}
-				else if(context == grammarAccess.getSimpleScopeExpressionRule()) {
+				else if (rule == grammarAccess.getSimpleScopeExpressionRule()) {
 					sequence_SimpleScopeExpression(context, (SimpleScopeExpression) semanticObject); 
 					return; 
 				}
 				else break;
 			}
-		if (errorAcceptor != null) errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
+		if (errorAcceptor != null)
+			errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
 	}
 	
 	/**
+	 * Contexts:
+	 *     Extension returns Extension
+	 *
 	 * Constraint:
 	 *     extension=QualifiedID
 	 */
-	protected void sequence_Extension(EObject context, Extension semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, ScopePackage.Literals.EXTENSION__EXTENSION) == ValueTransient.YES)
+	protected void sequence_Extension(ISerializationContext context, Extension semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, ScopePackage.Literals.EXTENSION__EXTENSION) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ScopePackage.Literals.EXTENSION__EXTENSION));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getExtensionAccess().getExtensionQualifiedIDParserRuleCall_1_0(), semanticObject.getExtension());
 		feeder.finish();
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     FactoryExpression returns FactoryExpression
+	 *
 	 * Constraint:
 	 *     expr=Expression
 	 */
-	protected void sequence_FactoryExpression(EObject context, FactoryExpression semanticObject) {
-		genericSequencer.createSequence(context, semanticObject);
+	protected void sequence_FactoryExpression(ISerializationContext context, FactoryExpression semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, ScopePackage.Literals.FACTORY_EXPRESSION__EXPR) == ValueTransient.YES)
+				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ScopePackage.Literals.FACTORY_EXPRESSION__EXPR));
+		}
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
+		feeder.accept(grammarAccess.getFactoryExpressionAccess().getExprExpressionParserRuleCall_1_0(), semanticObject.getExpr());
+		feeder.finish();
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     ScopeExpression returns FactoryExpression
+	 *
 	 * Constraint:
 	 *     (expr=Expression prune=Expression?)
 	 */
-	protected void sequence_FactoryExpression_ScopeExpression(EObject context, FactoryExpression semanticObject) {
+	protected void sequence_FactoryExpression_ScopeExpression(ISerializationContext context, FactoryExpression semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     GlobalScopeExpression returns GlobalScopeExpression
+	 *
 	 * Constraint:
 	 *     (
 	 *         type=[EClass|QualifiedID] 
@@ -446,12 +468,15 @@ protected void sequence_FactoryExpression_ScopeExpression(EObject context, Facto
 	 *         (domains+='*' | domains+=Identifier | (domains+=Identifier domains+=Identifier*))?
 	 *     )
 	 */
-	protected void sequence_GlobalScopeExpression(EObject context, GlobalScopeExpression semanticObject) {
+	protected void sequence_GlobalScopeExpression(ISerializationContext context, GlobalScopeExpression semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     NamedScopeExpression returns GlobalScopeExpression
+	 *
 	 * Constraint:
 	 *     (
 	 *         type=[EClass|QualifiedID] 
@@ -462,12 +487,15 @@ protected void sequence_GlobalScopeExpression(EObject context, GlobalScopeExpres
 	 *         naming=Naming?
 	 *     )
 	 */
-	protected void sequence_GlobalScopeExpression_NamedScopeExpression(EObject context, GlobalScopeExpression semanticObject) {
+	protected void sequence_GlobalScopeExpression_NamedScopeExpression(ISerializationContext context, GlobalScopeExpression semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     ScopeExpression returns GlobalScopeExpression
+	 *
 	 * Constraint:
 	 *     (
 	 *         type=[EClass|QualifiedID] 
@@ -479,33 +507,38 @@ protected void sequence_GlobalScopeExpression_NamedScopeExpression(EObject conte
 	 *         prune=Expression?
 	 *     )
 	 */
-	protected void sequence_GlobalScopeExpression_NamedScopeExpression_ScopeExpression(EObject context, GlobalScopeExpression semanticObject) {
+	protected void sequence_GlobalScopeExpression_NamedScopeExpression_ScopeExpression(ISerializationContext context, GlobalScopeExpression semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Import returns Import
+	 *
 	 * Constraint:
 	 *     (package=[EPackage|STRING] name=Identifier?)
 	 */
-	protected void sequence_Import(EObject context, Import semanticObject) {
+	protected void sequence_Import(ISerializationContext context, Import semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Injection returns Injection
+	 *
 	 * Constraint:
 	 *     (type=DottedID name=Identifier)
 	 */
-	protected void sequence_Injection(EObject context, Injection semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, ScopePackage.Literals.INJECTION__TYPE) == ValueTransient.YES)
+	protected void sequence_Injection(ISerializationContext context, Injection semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, ScopePackage.Literals.INJECTION__TYPE) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ScopePackage.Literals.INJECTION__TYPE));
-			if(transientValues.isValueTransient(semanticObject, ScopePackage.Literals.INJECTION__NAME) == ValueTransient.YES)
+			if (transientValues.isValueTransient(semanticObject, ScopePackage.Literals.INJECTION__NAME) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ScopePackage.Literals.INJECTION__NAME));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getInjectionAccess().getTypeDottedIDParserRuleCall_1_0(), semanticObject.getType());
 		feeder.accept(grammarAccess.getInjectionAccess().getNameIdentifierParserRuleCall_3_0(), semanticObject.getName());
 		feeder.finish();
@@ -513,18 +546,21 @@ protected void sequence_Injection(EObject context, Injection semanticObject) {
 	
 	
 	/**
+	 * Contexts:
+	 *     DataExpression returns LambdaDataExpression
+	 *     LambdaDataExpression returns LambdaDataExpression
+	 *
 	 * Constraint:
 	 *     (desc=Identifier value=Expression)
 	 */
-	protected void sequence_LambdaDataExpression(EObject context, LambdaDataExpression semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, ScopePackage.Literals.DATA_EXPRESSION__VALUE) == ValueTransient.YES)
-				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ScopePackage.Literals.DATA_EXPRESSION__VALUE));
-			if(transientValues.isValueTransient(semanticObject, ScopePackage.Literals.LAMBDA_DATA_EXPRESSION__DESC) == ValueTransient.YES)
+	protected void sequence_LambdaDataExpression(ISerializationContext context, LambdaDataExpression semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, ScopePackage.Literals.LAMBDA_DATA_EXPRESSION__DESC) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ScopePackage.Literals.LAMBDA_DATA_EXPRESSION__DESC));
+			if (transientValues.isValueTransient(semanticObject, ScopePackage.Literals.DATA_EXPRESSION__VALUE) == ValueTransient.YES)
+				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ScopePackage.Literals.DATA_EXPRESSION__VALUE));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getLambdaDataExpressionAccess().getDescIdentifierParserRuleCall_1_0(), semanticObject.getDesc());
 		feeder.accept(grammarAccess.getLambdaDataExpressionAccess().getValueExpressionParserRuleCall_3_0(), semanticObject.getValue());
 		feeder.finish();
@@ -532,18 +568,21 @@ protected void sequence_LambdaDataExpression(EObject context, LambdaDataExpressi
 	
 	
 	/**
+	 * Contexts:
+	 *     DataExpression returns MatchDataExpression
+	 *     MatchDataExpression returns MatchDataExpression
+	 *
 	 * Constraint:
 	 *     (key=Identifier value=Expression)
 	 */
-	protected void sequence_MatchDataExpression(EObject context, MatchDataExpression semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, ScopePackage.Literals.DATA_EXPRESSION__VALUE) == ValueTransient.YES)
-				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ScopePackage.Literals.DATA_EXPRESSION__VALUE));
-			if(transientValues.isValueTransient(semanticObject, ScopePackage.Literals.MATCH_DATA_EXPRESSION__KEY) == ValueTransient.YES)
+	protected void sequence_MatchDataExpression(ISerializationContext context, MatchDataExpression semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, ScopePackage.Literals.MATCH_DATA_EXPRESSION__KEY) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ScopePackage.Literals.MATCH_DATA_EXPRESSION__KEY));
+			if (transientValues.isValueTransient(semanticObject, ScopePackage.Literals.DATA_EXPRESSION__VALUE) == ValueTransient.YES)
+				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ScopePackage.Literals.DATA_EXPRESSION__VALUE));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getMatchDataExpressionAccess().getKeyIdentifierParserRuleCall_0_0(), semanticObject.getKey());
 		feeder.accept(grammarAccess.getMatchDataExpressionAccess().getValueExpressionParserRuleCall_2_0(), semanticObject.getValue());
 		feeder.finish();
@@ -551,106 +590,138 @@ protected void sequence_MatchDataExpression(EObject context, MatchDataExpression
 	
 	
 	/**
+	 * Contexts:
+	 *     ScopeExpression returns SimpleScopeExpression
+	 *
 	 * Constraint:
 	 *     (expr=Expression (caseDef?='case' casing=Casing)? naming=Naming? prune=Expression?)
 	 */
-	protected void sequence_NamedScopeExpression_ScopeExpression_SimpleScopeExpression(EObject context, SimpleScopeExpression semanticObject) {
+	protected void sequence_NamedScopeExpression_ScopeExpression_SimpleScopeExpression(ISerializationContext context, SimpleScopeExpression semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     NamedScopeExpression returns SimpleScopeExpression
+	 *
 	 * Constraint:
 	 *     (expr=Expression (caseDef?='case' casing=Casing)? naming=Naming?)
 	 */
-	protected void sequence_NamedScopeExpression_SimpleScopeExpression(EObject context, SimpleScopeExpression semanticObject) {
+	protected void sequence_NamedScopeExpression_SimpleScopeExpression(ISerializationContext context, SimpleScopeExpression semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     NamingDefinition returns NamingDefinition
+	 *
 	 * Constraint:
 	 *     (type=[EClass|QualifiedID] naming=Naming)
 	 */
-	protected void sequence_NamingDefinition(EObject context, NamingDefinition semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, ScopePackage.Literals.NAMING_DEFINITION__TYPE) == ValueTransient.YES)
+	protected void sequence_NamingDefinition(ISerializationContext context, NamingDefinition semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, ScopePackage.Literals.NAMING_DEFINITION__TYPE) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ScopePackage.Literals.NAMING_DEFINITION__TYPE));
-			if(transientValues.isValueTransient(semanticObject, ScopePackage.Literals.NAMING_DEFINITION__NAMING) == ValueTransient.YES)
+			if (transientValues.isValueTransient(semanticObject, ScopePackage.Literals.NAMING_DEFINITION__NAMING) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ScopePackage.Literals.NAMING_DEFINITION__NAMING));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-		feeder.accept(grammarAccess.getNamingDefinitionAccess().getTypeEClassQualifiedIDParserRuleCall_0_0_1(), semanticObject.getType());
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
+		feeder.accept(grammarAccess.getNamingDefinitionAccess().getTypeEClassQualifiedIDParserRuleCall_0_0_1(), semanticObject.eGet(ScopePackage.Literals.NAMING_DEFINITION__TYPE, false));
 		feeder.accept(grammarAccess.getNamingDefinitionAccess().getNamingNamingParserRuleCall_2_0(), semanticObject.getNaming());
 		feeder.finish();
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     NamingExpression returns NamingExpression
+	 *
 	 * Constraint:
 	 *     (export?='export' | (factory?='factory'? expression=Expression))
 	 */
-	protected void sequence_NamingExpression(EObject context, NamingExpression semanticObject) {
+	protected void sequence_NamingExpression(ISerializationContext context, NamingExpression semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     NamingSection returns NamingSection
+	 *
 	 * Constraint:
 	 *     (casing=Casing? namings+=NamingDefinition*)
 	 */
-	protected void sequence_NamingSection(EObject context, NamingSection semanticObject) {
+	protected void sequence_NamingSection(ISerializationContext context, NamingSection semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Naming returns Naming
+	 *
 	 * Constraint:
 	 *     ((names+=NamingExpression names+=NamingExpression*) | names+=NamingExpression)
 	 */
-	protected void sequence_Naming(EObject context, Naming semanticObject) {
+	protected void sequence_Naming(ISerializationContext context, Naming semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     ScopeContext returns ScopeContext
+	 *
 	 * Constraint:
 	 *     ((global?='*' | contextType=[EClass|QualifiedID]) guard=Expression?)
 	 */
-	protected void sequence_ScopeContext(EObject context, ScopeContext semanticObject) {
+	protected void sequence_ScopeContext(ISerializationContext context, ScopeContext semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     ScopeDefinition returns ScopeDefinition
+	 *
 	 * Constraint:
 	 *     (name=Identifier? (targetType=[EClass|QualifiedID] | (contextType=[EClass|QualifiedID] reference=[EReference|Identifier])) rules+=ScopeRule+)
 	 */
-	protected void sequence_ScopeDefinition(EObject context, ScopeDefinition semanticObject) {
+	protected void sequence_ScopeDefinition(ISerializationContext context, ScopeDefinition semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     ScopeDelegation returns ScopeDelegation
+	 *
 	 * Constraint:
 	 *     ((delegate=Expression | external=GlobalScopeExpression) scope=[ScopeDefinition|Identifier]?)
 	 */
-	protected void sequence_ScopeDelegation(EObject context, ScopeDelegation semanticObject) {
+	protected void sequence_ScopeDelegation(ISerializationContext context, ScopeDelegation semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     ScopeExpression returns ScopeDelegation
+	 *
 	 * Constraint:
 	 *     ((delegate=Expression | external=GlobalScopeExpression) scope=[ScopeDefinition|Identifier]? prune=Expression?)
 	 */
-	protected void sequence_ScopeDelegation_ScopeExpression(EObject context, ScopeDelegation semanticObject) {
+	protected void sequence_ScopeDelegation_ScopeExpression(ISerializationContext context, ScopeDelegation semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     ScopeModel returns ScopeModel
+	 *
 	 * Constraint:
 	 *     (
 	 *         name=DottedID 
@@ -662,25 +733,39 @@ protected void sequence_ScopeDelegation_ScopeExpression(EObject context, ScopeDe
 	 *         scopes+=ScopeDefinition*
 	 *     )
 	 */
-	protected void sequence_ScopeModel(EObject context, ScopeModel semanticObject) {
+	protected void sequence_ScopeModel(ISerializationContext context, ScopeModel semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     ScopeRule returns ScopeRule
+	 *
 	 * Constraint:
 	 *     (context=ScopeContext exprs+=ScopeExpression exprs+=ScopeExpression*)
 	 */
-	protected void sequence_ScopeRule(EObject context, ScopeRule semanticObject) {
+	protected void sequence_ScopeRule(ISerializationContext context, ScopeRule semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     SimpleScopeExpression returns SimpleScopeExpression
+	 *
 	 * Constraint:
 	 *     expr=Expression
 	 */
-	protected void sequence_SimpleScopeExpression(EObject context, SimpleScopeExpression semanticObject) {
-		genericSequencer.createSequence(context, semanticObject);
+	protected void sequence_SimpleScopeExpression(ISerializationContext context, SimpleScopeExpression semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, ScopePackage.Literals.SIMPLE_SCOPE_EXPRESSION__EXPR) == ValueTransient.YES)
+				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ScopePackage.Literals.SIMPLE_SCOPE_EXPRESSION__EXPR));
+		}
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
+		feeder.accept(grammarAccess.getSimpleScopeExpressionAccess().getExprExpressionParserRuleCall_0(), semanticObject.getExpr());
+		feeder.finish();
 	}
+	
+	
 }
diff --git a/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/serializer/AbstractScopeSyntacticSequencer.java b/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/serializer/AbstractScopeSyntacticSequencer.java
index 2b14a2098..84d303d3d 100644
--- a/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/serializer/AbstractScopeSyntacticSequencer.java
+++ b/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/serializer/AbstractScopeSyntacticSequencer.java
@@ -42,9 +42,9 @@ protected void emitUnassignedTokens(EObject semanticObject, ISynTransition trans
 		List<INode> transitionNodes = collectNodes(fromNode, toNode);
 		for (AbstractElementAlias syntax : transition.getAmbiguousSyntaxes()) {
 			List<INode> syntaxNodes = getNodesFor(transitionNodes, syntax);
-			if(match_ParanthesizedExpression_LeftParenthesisKeyword_0_a.equals(syntax))
+			if (match_ParanthesizedExpression_LeftParenthesisKeyword_0_a.equals(syntax))
 				emit_ParanthesizedExpression_LeftParenthesisKeyword_0_a(semanticObject, getLastNavigableState(), syntaxNodes);
-			else if(match_ParanthesizedExpression_LeftParenthesisKeyword_0_p.equals(syntax))
+			else if (match_ParanthesizedExpression_LeftParenthesisKeyword_0_p.equals(syntax))
 				emit_ParanthesizedExpression_LeftParenthesisKeyword_0_p(semanticObject, getLastNavigableState(), syntaxNodes);
 			else acceptNodes(getLastNavigableState(), syntaxNodes);
 		}
diff --git a/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/services/ScopeGrammarAccess.java b/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/services/ScopeGrammarAccess.java
index f517bb1f8..61702f69d 100644
--- a/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/services/ScopeGrammarAccess.java
+++ b/com.avaloq.tools.ddk.xtext.scope/src-gen/com/avaloq/tools/ddk/xtext/scope/services/ScopeGrammarAccess.java
@@ -13,13 +13,14 @@
 import org.eclipse.xtext.service.AbstractElementFinder.*;
 
 import com.avaloq.tools.ddk.xtext.expression.services.ExpressionGrammarAccess;
+import org.eclipse.xtext.common.services.TerminalsGrammarAccess;
 
 @Singleton
 public class ScopeGrammarAccess extends AbstractGrammarElementFinder {
 	
 	
 	public class ScopeModelElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ScopeModel");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.scope.Scope.ScopeModel");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cScopingKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -41,15 +42,15 @@ public class ScopeModelElements extends AbstractParserRuleElementFinder {
 		private final RuleCall cScopesScopeDefinitionParserRuleCall_7_0 = (RuleCall)cScopesAssignment_7.eContents().get(0);
 		
 		//ScopeModel:
-		//	"scoping" name=DottedID ("with" includedScopes+=[ScopeModel|DottedID])? imports+=Import* extensions+=Extension*
+		//	'scoping' name=DottedID ('with' includedScopes+=[ScopeModel|DottedID])? imports+=Import* extensions+=Extension*
 		//	injections+=Injection* naming=NamingSection? scopes+=ScopeDefinition*;
 		@Override public ParserRule getRule() { return rule; }
 
-		//"scoping" name=DottedID ("with" includedScopes+=[ScopeModel|DottedID])? imports+=Import* extensions+=Extension*
+		//'scoping' name=DottedID ('with' includedScopes+=[ScopeModel|DottedID])? imports+=Import* extensions+=Extension*
 		//injections+=Injection* naming=NamingSection? scopes+=ScopeDefinition*
 		public Group getGroup() { return cGroup; }
 
-		//"scoping"
+		//'scoping'
 		public Keyword getScopingKeyword_0() { return cScopingKeyword_0; }
 
 		//name=DottedID
@@ -58,10 +59,10 @@ public class ScopeModelElements extends AbstractParserRuleElementFinder {
 		//DottedID
 		public RuleCall getNameDottedIDParserRuleCall_1_0() { return cNameDottedIDParserRuleCall_1_0; }
 
-		//("with" includedScopes+=[ScopeModel|DottedID])?
+		//('with' includedScopes+=[ScopeModel|DottedID])?
 		public Group getGroup_2() { return cGroup_2; }
 
-		//"with"
+		//'with'
 		public Keyword getWithKeyword_2_0() { return cWithKeyword_2_0; }
 
 		//includedScopes+=[ScopeModel|DottedID]
@@ -105,7 +106,7 @@ public class ScopeModelElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class ImportElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Import");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.scope.Scope.Import");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cImportKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cPackageAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -117,13 +118,13 @@ public class ImportElements extends AbstractParserRuleElementFinder {
 		private final RuleCall cNameIdentifierParserRuleCall_2_1_0 = (RuleCall)cNameAssignment_2_1.eContents().get(0);
 		
 		//Import:
-		//	"import" package=[ecore::EPackage|STRING] ("as" name=Identifier)?;
+		//	'import' package=[ecore::EPackage|STRING] ('as' name=Identifier)?;
 		@Override public ParserRule getRule() { return rule; }
 
-		//"import" package=[ecore::EPackage|STRING] ("as" name=Identifier)?
+		//'import' package=[ecore::EPackage|STRING] ('as' name=Identifier)?
 		public Group getGroup() { return cGroup; }
 
-		//"import"
+		//'import'
 		public Keyword getImportKeyword_0() { return cImportKeyword_0; }
 
 		//package=[ecore::EPackage|STRING]
@@ -135,10 +136,10 @@ public class ImportElements extends AbstractParserRuleElementFinder {
 		//STRING
 		public RuleCall getPackageEPackageSTRINGTerminalRuleCall_1_0_1() { return cPackageEPackageSTRINGTerminalRuleCall_1_0_1; }
 
-		//("as" name=Identifier)?
+		//('as' name=Identifier)?
 		public Group getGroup_2() { return cGroup_2; }
 
-		//"as"
+		//'as'
 		public Keyword getAsKeyword_2_0() { return cAsKeyword_2_0; }
 
 		//name=Identifier
@@ -149,20 +150,20 @@ public class ImportElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class ExtensionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Extension");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.scope.Scope.Extension");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cExtensionKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cExtensionAssignment_1 = (Assignment)cGroup.eContents().get(1);
 		private final RuleCall cExtensionQualifiedIDParserRuleCall_1_0 = (RuleCall)cExtensionAssignment_1.eContents().get(0);
 		
 		//Extension:
-		//	"extension" extension=QualifiedID;
+		//	'extension' extension=QualifiedID;
 		@Override public ParserRule getRule() { return rule; }
 
-		//"extension" extension=QualifiedID
+		//'extension' extension=QualifiedID
 		public Group getGroup() { return cGroup; }
 
-		//"extension"
+		//'extension'
 		public Keyword getExtensionKeyword_0() { return cExtensionKeyword_0; }
 
 		//extension=QualifiedID
@@ -173,7 +174,7 @@ public class ExtensionElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class InjectionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Injection");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.scope.Scope.Injection");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cInjectKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cTypeAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -183,13 +184,13 @@ public class InjectionElements extends AbstractParserRuleElementFinder {
 		private final RuleCall cNameIdentifierParserRuleCall_3_0 = (RuleCall)cNameAssignment_3.eContents().get(0);
 		
 		//Injection:
-		//	"inject" type=DottedID "as" name=Identifier;
+		//	'inject' type=DottedID 'as' name=Identifier;
 		@Override public ParserRule getRule() { return rule; }
 
-		//"inject" type=DottedID "as" name=Identifier
+		//'inject' type=DottedID 'as' name=Identifier
 		public Group getGroup() { return cGroup; }
 
-		//"inject"
+		//'inject'
 		public Keyword getInjectKeyword_0() { return cInjectKeyword_0; }
 
 		//type=DottedID
@@ -198,7 +199,7 @@ public class InjectionElements extends AbstractParserRuleElementFinder {
 		//DottedID
 		public RuleCall getTypeDottedIDParserRuleCall_1_0() { return cTypeDottedIDParserRuleCall_1_0; }
 
-		//"as"
+		//'as'
 		public Keyword getAsKeyword_2() { return cAsKeyword_2; }
 
 		//name=Identifier
@@ -209,7 +210,7 @@ public class InjectionElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class NamingSectionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "NamingSection");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.scope.Scope.NamingSection");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Action cNamingSectionAction_0 = (Action)cGroup.eContents().get(0);
 		private final Group cGroup_1 = (Group)cGroup.eContents().get(1);
@@ -223,19 +224,19 @@ public class NamingSectionElements extends AbstractParserRuleElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_5 = (Keyword)cGroup.eContents().get(5);
 		
 		//NamingSection:
-		//	{NamingSection} ("case" casing=Casing)? "naming" "{" namings+=NamingDefinition* "}";
+		//	{NamingSection} ('case' casing=Casing)? 'naming' '{' namings+=NamingDefinition* '}';
 		@Override public ParserRule getRule() { return rule; }
 
-		//{NamingSection} ("case" casing=Casing)? "naming" "{" namings+=NamingDefinition* "}"
+		//{NamingSection} ('case' casing=Casing)? 'naming' '{' namings+=NamingDefinition* '}'
 		public Group getGroup() { return cGroup; }
 
 		//{NamingSection}
 		public Action getNamingSectionAction_0() { return cNamingSectionAction_0; }
 
-		//("case" casing=Casing)?
+		//('case' casing=Casing)?
 		public Group getGroup_1() { return cGroup_1; }
 
-		//"case"
+		//'case'
 		public Keyword getCaseKeyword_1_0() { return cCaseKeyword_1_0; }
 
 		//casing=Casing
@@ -244,10 +245,10 @@ public class NamingSectionElements extends AbstractParserRuleElementFinder {
 		//Casing
 		public RuleCall getCasingCasingEnumRuleCall_1_1_0() { return cCasingCasingEnumRuleCall_1_1_0; }
 
-		//"naming"
+		//'naming'
 		public Keyword getNamingKeyword_2() { return cNamingKeyword_2; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_3() { return cLeftCurlyBracketKeyword_3; }
 
 		//namings+=NamingDefinition*
@@ -256,12 +257,12 @@ public class NamingSectionElements extends AbstractParserRuleElementFinder {
 		//NamingDefinition
 		public RuleCall getNamingsNamingDefinitionParserRuleCall_4_0() { return cNamingsNamingDefinitionParserRuleCall_4_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_5() { return cRightCurlyBracketKeyword_5; }
 	}
 
 	public class NamingDefinitionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "NamingDefinition");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.scope.Scope.NamingDefinition");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cTypeAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final CrossReference cTypeEClassCrossReference_0_0 = (CrossReference)cTypeAssignment_0.eContents().get(0);
@@ -272,10 +273,10 @@ public class NamingDefinitionElements extends AbstractParserRuleElementFinder {
 		private final Keyword cSemicolonKeyword_3 = (Keyword)cGroup.eContents().get(3);
 		
 		//NamingDefinition:
-		//	type=[ecore::EClass|QualifiedID] "=" naming=Naming ";";
+		//	type=[ecore::EClass|QualifiedID] '=' naming=Naming ';';
 		@Override public ParserRule getRule() { return rule; }
 
-		//type=[ecore::EClass|QualifiedID] "=" naming=Naming ";"
+		//type=[ecore::EClass|QualifiedID] '=' naming=Naming ';'
 		public Group getGroup() { return cGroup; }
 
 		//type=[ecore::EClass|QualifiedID]
@@ -287,7 +288,7 @@ public class NamingDefinitionElements extends AbstractParserRuleElementFinder {
 		//QualifiedID
 		public RuleCall getTypeEClassQualifiedIDParserRuleCall_0_0_1() { return cTypeEClassQualifiedIDParserRuleCall_0_0_1; }
 
-		//"="
+		//'='
 		public Keyword getEqualsSignKeyword_1() { return cEqualsSignKeyword_1; }
 
 		//naming=Naming
@@ -296,12 +297,12 @@ public class NamingDefinitionElements extends AbstractParserRuleElementFinder {
 		//Naming
 		public RuleCall getNamingNamingParserRuleCall_2_0() { return cNamingNamingParserRuleCall_2_0; }
 
-		//";"
+		//';'
 		public Keyword getSemicolonKeyword_3() { return cSemicolonKeyword_3; }
 	}
 
 	public class ScopeDefinitionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ScopeDefinition");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.scope.Scope.ScopeDefinition");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cScopeKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Group cGroup_1 = (Group)cGroup.eContents().get(1);
@@ -327,21 +328,21 @@ public class ScopeDefinitionElements extends AbstractParserRuleElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_5 = (Keyword)cGroup.eContents().get(5);
 		
 		//ScopeDefinition:
-		//	"scope" ("(" name=Identifier ")")? (targetType=[ecore::EClass|QualifiedID] | contextType=[ecore::EClass|QualifiedID]
-		//	"#" reference=[ecore::EReference|Identifier]) "{" rules+=ScopeRule+ "}";
+		//	'scope' ('(' name=Identifier ')')? (targetType=[ecore::EClass|QualifiedID] | contextType=[ecore::EClass|QualifiedID]
+		//	'#' reference=[ecore::EReference|Identifier]) '{' rules+=ScopeRule+ '}';
 		@Override public ParserRule getRule() { return rule; }
 
-		//"scope" ("(" name=Identifier ")")? (targetType=[ecore::EClass|QualifiedID] | contextType=[ecore::EClass|QualifiedID] "#"
-		//reference=[ecore::EReference|Identifier]) "{" rules+=ScopeRule+ "}"
+		//'scope' ('(' name=Identifier ')')? (targetType=[ecore::EClass|QualifiedID] | contextType=[ecore::EClass|QualifiedID] '#'
+		//reference=[ecore::EReference|Identifier]) '{' rules+=ScopeRule+ '}'
 		public Group getGroup() { return cGroup; }
 
-		//"scope"
+		//'scope'
 		public Keyword getScopeKeyword_0() { return cScopeKeyword_0; }
 
-		//("(" name=Identifier ")")?
+		//('(' name=Identifier ')')?
 		public Group getGroup_1() { return cGroup_1; }
 
-		//"("
+		//'('
 		public Keyword getLeftParenthesisKeyword_1_0() { return cLeftParenthesisKeyword_1_0; }
 
 		//name=Identifier
@@ -350,10 +351,10 @@ public class ScopeDefinitionElements extends AbstractParserRuleElementFinder {
 		//Identifier
 		public RuleCall getNameIdentifierParserRuleCall_1_1_0() { return cNameIdentifierParserRuleCall_1_1_0; }
 
-		//")"
+		//')'
 		public Keyword getRightParenthesisKeyword_1_2() { return cRightParenthesisKeyword_1_2; }
 
-		//targetType=[ecore::EClass|QualifiedID] | contextType=[ecore::EClass|QualifiedID] "#"
+		//targetType=[ecore::EClass|QualifiedID] | contextType=[ecore::EClass|QualifiedID] '#'
 		//reference=[ecore::EReference|Identifier]
 		public Alternatives getAlternatives_2() { return cAlternatives_2; }
 
@@ -366,7 +367,7 @@ public class ScopeDefinitionElements extends AbstractParserRuleElementFinder {
 		//QualifiedID
 		public RuleCall getTargetTypeEClassQualifiedIDParserRuleCall_2_0_0_1() { return cTargetTypeEClassQualifiedIDParserRuleCall_2_0_0_1; }
 
-		//contextType=[ecore::EClass|QualifiedID] "#" reference=[ecore::EReference|Identifier]
+		//contextType=[ecore::EClass|QualifiedID] '#' reference=[ecore::EReference|Identifier]
 		public Group getGroup_2_1() { return cGroup_2_1; }
 
 		//contextType=[ecore::EClass|QualifiedID]
@@ -378,7 +379,7 @@ public class ScopeDefinitionElements extends AbstractParserRuleElementFinder {
 		//QualifiedID
 		public RuleCall getContextTypeEClassQualifiedIDParserRuleCall_2_1_0_0_1() { return cContextTypeEClassQualifiedIDParserRuleCall_2_1_0_0_1; }
 
-		//"#"
+		//'#'
 		public Keyword getNumberSignKeyword_2_1_1() { return cNumberSignKeyword_2_1_1; }
 
 		//reference=[ecore::EReference|Identifier]
@@ -390,7 +391,7 @@ public class ScopeDefinitionElements extends AbstractParserRuleElementFinder {
 		//Identifier
 		public RuleCall getReferenceEReferenceIdentifierParserRuleCall_2_1_2_0_1() { return cReferenceEReferenceIdentifierParserRuleCall_2_1_2_0_1; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_3() { return cLeftCurlyBracketKeyword_3; }
 
 		//rules+=ScopeRule+
@@ -399,12 +400,12 @@ public class ScopeDefinitionElements extends AbstractParserRuleElementFinder {
 		//ScopeRule
 		public RuleCall getRulesScopeRuleParserRuleCall_4_0() { return cRulesScopeRuleParserRuleCall_4_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_5() { return cRightCurlyBracketKeyword_5; }
 	}
 
 	public class ScopeRuleElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ScopeRule");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.scope.Scope.ScopeRule");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cContextKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cContextAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -419,13 +420,13 @@ public class ScopeRuleElements extends AbstractParserRuleElementFinder {
 		private final Keyword cSemicolonKeyword_5 = (Keyword)cGroup.eContents().get(5);
 		
 		//ScopeRule:
-		//	"context" context=ScopeContext "=" exprs+=ScopeExpression (">>" exprs+=ScopeExpression)* ";";
+		//	'context' context=ScopeContext '=' exprs+=ScopeExpression ('>>' exprs+=ScopeExpression)* ';';
 		@Override public ParserRule getRule() { return rule; }
 
-		//"context" context=ScopeContext "=" exprs+=ScopeExpression (">>" exprs+=ScopeExpression)* ";"
+		//'context' context=ScopeContext '=' exprs+=ScopeExpression ('>>' exprs+=ScopeExpression)* ';'
 		public Group getGroup() { return cGroup; }
 
-		//"context"
+		//'context'
 		public Keyword getContextKeyword_0() { return cContextKeyword_0; }
 
 		//context=ScopeContext
@@ -434,7 +435,7 @@ public class ScopeRuleElements extends AbstractParserRuleElementFinder {
 		//ScopeContext
 		public RuleCall getContextScopeContextParserRuleCall_1_0() { return cContextScopeContextParserRuleCall_1_0; }
 
-		//"="
+		//'='
 		public Keyword getEqualsSignKeyword_2() { return cEqualsSignKeyword_2; }
 
 		//exprs+=ScopeExpression
@@ -443,10 +444,10 @@ public class ScopeRuleElements extends AbstractParserRuleElementFinder {
 		//ScopeExpression
 		public RuleCall getExprsScopeExpressionParserRuleCall_3_0() { return cExprsScopeExpressionParserRuleCall_3_0; }
 
-		//(">>" exprs+=ScopeExpression)*
+		//('>>' exprs+=ScopeExpression)*
 		public Group getGroup_4() { return cGroup_4; }
 
-		//">>"
+		//'>>'
 		public Keyword getGreaterThanSignGreaterThanSignKeyword_4_0() { return cGreaterThanSignGreaterThanSignKeyword_4_0; }
 
 		//exprs+=ScopeExpression
@@ -455,12 +456,12 @@ public class ScopeRuleElements extends AbstractParserRuleElementFinder {
 		//ScopeExpression
 		public RuleCall getExprsScopeExpressionParserRuleCall_4_1_0() { return cExprsScopeExpressionParserRuleCall_4_1_0; }
 
-		//";"
+		//';'
 		public Keyword getSemicolonKeyword_5() { return cSemicolonKeyword_5; }
 	}
 
 	public class ScopeContextElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ScopeContext");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.scope.Scope.ScopeContext");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Alternatives cAlternatives_0 = (Alternatives)cGroup.eContents().get(0);
 		private final Assignment cGlobalAssignment_0_0 = (Assignment)cAlternatives_0.eContents().get(0);
@@ -475,19 +476,19 @@ public class ScopeContextElements extends AbstractParserRuleElementFinder {
 		private final Keyword cRightSquareBracketKeyword_1_2 = (Keyword)cGroup_1.eContents().get(2);
 		
 		//ScopeContext:
-		//	(global?="*" | contextType=[ecore::EClass|QualifiedID]) ("[" guard=Expression "]")?;
+		//	(global?='*' | contextType=[ecore::EClass|QualifiedID]) ('[' guard=Expression ']')?;
 		@Override public ParserRule getRule() { return rule; }
 
-		//(global?="*" | contextType=[ecore::EClass|QualifiedID]) ("[" guard=Expression "]")?
+		//(global?='*' | contextType=[ecore::EClass|QualifiedID]) ('[' guard=Expression ']')?
 		public Group getGroup() { return cGroup; }
 
-		//global?="*" | contextType=[ecore::EClass|QualifiedID]
+		//global?='*' | contextType=[ecore::EClass|QualifiedID]
 		public Alternatives getAlternatives_0() { return cAlternatives_0; }
 
-		//global?="*"
+		//global?='*'
 		public Assignment getGlobalAssignment_0_0() { return cGlobalAssignment_0_0; }
 
-		//"*"
+		//'*'
 		public Keyword getGlobalAsteriskKeyword_0_0_0() { return cGlobalAsteriskKeyword_0_0_0; }
 
 		//contextType=[ecore::EClass|QualifiedID]
@@ -499,10 +500,10 @@ public class ScopeContextElements extends AbstractParserRuleElementFinder {
 		//QualifiedID
 		public RuleCall getContextTypeEClassQualifiedIDParserRuleCall_0_1_0_1() { return cContextTypeEClassQualifiedIDParserRuleCall_0_1_0_1; }
 
-		//("[" guard=Expression "]")?
+		//('[' guard=Expression ']')?
 		public Group getGroup_1() { return cGroup_1; }
 
-		//"["
+		//'['
 		public Keyword getLeftSquareBracketKeyword_1_0() { return cLeftSquareBracketKeyword_1_0; }
 
 		//guard=Expression
@@ -511,12 +512,12 @@ public class ScopeContextElements extends AbstractParserRuleElementFinder {
 		//Expression
 		public RuleCall getGuardExpressionParserRuleCall_1_1_0() { return cGuardExpressionParserRuleCall_1_1_0; }
 
-		//"]"
+		//']'
 		public Keyword getRightSquareBracketKeyword_1_2() { return cRightSquareBracketKeyword_1_2; }
 	}
 
 	public class ScopeExpressionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ScopeExpression");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.scope.Scope.ScopeExpression");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Alternatives cAlternatives_0 = (Alternatives)cGroup.eContents().get(0);
 		private final RuleCall cScopeDelegationParserRuleCall_0_0 = (RuleCall)cAlternatives_0.eContents().get(0);
@@ -528,10 +529,10 @@ public class ScopeExpressionElements extends AbstractParserRuleElementFinder {
 		private final RuleCall cPruneExpressionParserRuleCall_1_1_0 = (RuleCall)cPruneAssignment_1_1.eContents().get(0);
 		
 		//ScopeExpression:
-		//	(ScopeDelegation | FactoryExpression | NamedScopeExpression) ("|" prune=Expression)?;
+		//	(ScopeDelegation | FactoryExpression | NamedScopeExpression) ('|' prune=Expression)?;
 		@Override public ParserRule getRule() { return rule; }
 
-		//(ScopeDelegation | FactoryExpression | NamedScopeExpression) ("|" prune=Expression)?
+		//(ScopeDelegation | FactoryExpression | NamedScopeExpression) ('|' prune=Expression)?
 		public Group getGroup() { return cGroup; }
 
 		//ScopeDelegation | FactoryExpression | NamedScopeExpression
@@ -546,10 +547,10 @@ public class ScopeExpressionElements extends AbstractParserRuleElementFinder {
 		//NamedScopeExpression
 		public RuleCall getNamedScopeExpressionParserRuleCall_0_2() { return cNamedScopeExpressionParserRuleCall_0_2; }
 
-		//("|" prune=Expression)?
+		//('|' prune=Expression)?
 		public Group getGroup_1() { return cGroup_1; }
 
-		//"|"
+		//'|'
 		public Keyword getVerticalLineKeyword_1_0() { return cVerticalLineKeyword_1_0; }
 
 		//prune=Expression
@@ -560,20 +561,20 @@ public class ScopeExpressionElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class FactoryExpressionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "FactoryExpression");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.scope.Scope.FactoryExpression");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cFactoryKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cExprAssignment_1 = (Assignment)cGroup.eContents().get(1);
 		private final RuleCall cExprExpressionParserRuleCall_1_0 = (RuleCall)cExprAssignment_1.eContents().get(0);
 		
 		//FactoryExpression:
-		//	"factory" expr=Expression;
+		//	'factory' expr=Expression;
 		@Override public ParserRule getRule() { return rule; }
 
-		//"factory" expr=Expression
+		//'factory' expr=Expression
 		public Group getGroup() { return cGroup; }
 
-		//"factory"
+		//'factory'
 		public Keyword getFactoryKeyword_0() { return cFactoryKeyword_0; }
 
 		//expr=Expression
@@ -584,7 +585,7 @@ public class FactoryExpressionElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class ScopeDelegationElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ScopeDelegation");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.scope.Scope.ScopeDelegation");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cScopeofKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Keyword cLeftParenthesisKeyword_1 = (Keyword)cGroup.eContents().get(1);
@@ -601,16 +602,16 @@ public class ScopeDelegationElements extends AbstractParserRuleElementFinder {
 		private final Keyword cRightParenthesisKeyword_4 = (Keyword)cGroup.eContents().get(4);
 		
 		//ScopeDelegation:
-		//	"scopeof" "(" (delegate=Expression | external=GlobalScopeExpression) ("," scope=[ScopeDefinition|Identifier])? ")";
+		//	'scopeof' '(' (delegate=Expression | external=GlobalScopeExpression) (',' scope=[ScopeDefinition|Identifier])? ')';
 		@Override public ParserRule getRule() { return rule; }
 
-		//"scopeof" "(" (delegate=Expression | external=GlobalScopeExpression) ("," scope=[ScopeDefinition|Identifier])? ")"
+		//'scopeof' '(' (delegate=Expression | external=GlobalScopeExpression) (',' scope=[ScopeDefinition|Identifier])? ')'
 		public Group getGroup() { return cGroup; }
 
-		//"scopeof"
+		//'scopeof'
 		public Keyword getScopeofKeyword_0() { return cScopeofKeyword_0; }
 
-		//"("
+		//'('
 		public Keyword getLeftParenthesisKeyword_1() { return cLeftParenthesisKeyword_1; }
 
 		//delegate=Expression | external=GlobalScopeExpression
@@ -628,10 +629,10 @@ public class ScopeDelegationElements extends AbstractParserRuleElementFinder {
 		//GlobalScopeExpression
 		public RuleCall getExternalGlobalScopeExpressionParserRuleCall_2_1_0() { return cExternalGlobalScopeExpressionParserRuleCall_2_1_0; }
 
-		//("," scope=[ScopeDefinition|Identifier])?
+		//(',' scope=[ScopeDefinition|Identifier])?
 		public Group getGroup_3() { return cGroup_3; }
 
-		//","
+		//','
 		public Keyword getCommaKeyword_3_0() { return cCommaKeyword_3_0; }
 
 		//scope=[ScopeDefinition|Identifier]
@@ -643,12 +644,12 @@ public class ScopeDelegationElements extends AbstractParserRuleElementFinder {
 		//Identifier
 		public RuleCall getScopeScopeDefinitionIdentifierParserRuleCall_3_1_0_1() { return cScopeScopeDefinitionIdentifierParserRuleCall_3_1_0_1; }
 
-		//")"
+		//')'
 		public Keyword getRightParenthesisKeyword_4() { return cRightParenthesisKeyword_4; }
 	}
 
 	public class NamedScopeExpressionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "NamedScopeExpression");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.scope.Scope.NamedScopeExpression");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Alternatives cAlternatives_0 = (Alternatives)cGroup.eContents().get(0);
 		private final RuleCall cGlobalScopeExpressionParserRuleCall_0_0 = (RuleCall)cAlternatives_0.eContents().get(0);
@@ -664,10 +665,10 @@ public class NamedScopeExpressionElements extends AbstractParserRuleElementFinde
 		private final RuleCall cNamingNamingParserRuleCall_2_1_0 = (RuleCall)cNamingAssignment_2_1.eContents().get(0);
 		
 		//NamedScopeExpression:
-		//	(GlobalScopeExpression | SimpleScopeExpression) (caseDef?="case" casing=Casing)? ("as" naming=Naming)?;
+		//	(GlobalScopeExpression | SimpleScopeExpression) (caseDef?='case' casing=Casing)? ('as' naming=Naming)?;
 		@Override public ParserRule getRule() { return rule; }
 
-		//(GlobalScopeExpression | SimpleScopeExpression) (caseDef?="case" casing=Casing)? ("as" naming=Naming)?
+		//(GlobalScopeExpression | SimpleScopeExpression) (caseDef?='case' casing=Casing)? ('as' naming=Naming)?
 		public Group getGroup() { return cGroup; }
 
 		//GlobalScopeExpression | SimpleScopeExpression
@@ -679,13 +680,13 @@ public class NamedScopeExpressionElements extends AbstractParserRuleElementFinde
 		//SimpleScopeExpression
 		public RuleCall getSimpleScopeExpressionParserRuleCall_0_1() { return cSimpleScopeExpressionParserRuleCall_0_1; }
 
-		//(caseDef?="case" casing=Casing)?
+		//(caseDef?='case' casing=Casing)?
 		public Group getGroup_1() { return cGroup_1; }
 
-		//caseDef?="case"
+		//caseDef?='case'
 		public Assignment getCaseDefAssignment_1_0() { return cCaseDefAssignment_1_0; }
 
-		//"case"
+		//'case'
 		public Keyword getCaseDefCaseKeyword_1_0_0() { return cCaseDefCaseKeyword_1_0_0; }
 
 		//casing=Casing
@@ -694,10 +695,10 @@ public class NamedScopeExpressionElements extends AbstractParserRuleElementFinde
 		//Casing
 		public RuleCall getCasingCasingEnumRuleCall_1_1_0() { return cCasingCasingEnumRuleCall_1_1_0; }
 
-		//("as" naming=Naming)?
+		//('as' naming=Naming)?
 		public Group getGroup_2() { return cGroup_2; }
 
-		//"as"
+		//'as'
 		public Keyword getAsKeyword_2_0() { return cAsKeyword_2_0; }
 
 		//naming=Naming
@@ -708,7 +709,7 @@ public class NamedScopeExpressionElements extends AbstractParserRuleElementFinde
 	}
 
 	public class GlobalScopeExpressionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "GlobalScopeExpression");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.scope.Scope.GlobalScopeExpression");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cFindKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Keyword cLeftParenthesisKeyword_1 = (Keyword)cGroup.eContents().get(1);
@@ -763,20 +764,20 @@ public class GlobalScopeExpressionElements extends AbstractParserRuleElementFind
 		private final Keyword cRightParenthesisKeyword_6 = (Keyword)cGroup.eContents().get(6);
 		
 		//GlobalScopeExpression:
-		//	"find" "(" type=[ecore::EClass|QualifiedID] ("," "key" "=" name=Expression | "," recursivePrefix?="recursive"?
-		//	"prefix" "=" prefix=Expression)? ("," "data" "=" "(" data+=DataExpression ("," data+=DataExpression)* ")")? (","
-		//	"domains" "=" (domains+="*" | domains+=Identifier | "(" domains+=Identifier ("," domains+=Identifier)* ")"))? ")";
+		//	'find' '(' type=[ecore::EClass|QualifiedID] (',' 'key' '=' name=Expression | ',' recursivePrefix?='recursive'?
+		//	'prefix' '=' prefix=Expression)? (',' 'data' '=' '(' data+=DataExpression (',' data+=DataExpression)* ')')? (','
+		//	'domains' '=' (domains+='*' | domains+=Identifier | '(' domains+=Identifier (',' domains+=Identifier)* ')'))? ')';
 		@Override public ParserRule getRule() { return rule; }
 
-		//"find" "(" type=[ecore::EClass|QualifiedID] ("," "key" "=" name=Expression | "," recursivePrefix?="recursive"? "prefix"
-		//"=" prefix=Expression)? ("," "data" "=" "(" data+=DataExpression ("," data+=DataExpression)* ")")? ("," "domains" "="
-		//(domains+="*" | domains+=Identifier | "(" domains+=Identifier ("," domains+=Identifier)* ")"))? ")"
+		//'find' '(' type=[ecore::EClass|QualifiedID] (',' 'key' '=' name=Expression | ',' recursivePrefix?='recursive'? 'prefix'
+		//'=' prefix=Expression)? (',' 'data' '=' '(' data+=DataExpression (',' data+=DataExpression)* ')')? (',' 'domains' '='
+		//(domains+='*' | domains+=Identifier | '(' domains+=Identifier (',' domains+=Identifier)* ')'))? ')'
 		public Group getGroup() { return cGroup; }
 
-		//"find"
+		//'find'
 		public Keyword getFindKeyword_0() { return cFindKeyword_0; }
 
-		//"("
+		//'('
 		public Keyword getLeftParenthesisKeyword_1() { return cLeftParenthesisKeyword_1; }
 
 		//type=[ecore::EClass|QualifiedID]
@@ -788,19 +789,19 @@ public class GlobalScopeExpressionElements extends AbstractParserRuleElementFind
 		//QualifiedID
 		public RuleCall getTypeEClassQualifiedIDParserRuleCall_2_0_1() { return cTypeEClassQualifiedIDParserRuleCall_2_0_1; }
 
-		//("," "key" "=" name=Expression | "," recursivePrefix?="recursive"? "prefix" "=" prefix=Expression)?
+		//(',' 'key' '=' name=Expression | ',' recursivePrefix?='recursive'? 'prefix' '=' prefix=Expression)?
 		public Alternatives getAlternatives_3() { return cAlternatives_3; }
 
-		//"," "key" "=" name=Expression
+		//',' 'key' '=' name=Expression
 		public Group getGroup_3_0() { return cGroup_3_0; }
 
-		//","
+		//','
 		public Keyword getCommaKeyword_3_0_0() { return cCommaKeyword_3_0_0; }
 
-		//"key"
+		//'key'
 		public Keyword getKeyKeyword_3_0_1() { return cKeyKeyword_3_0_1; }
 
-		//"="
+		//'='
 		public Keyword getEqualsSignKeyword_3_0_2() { return cEqualsSignKeyword_3_0_2; }
 
 		//name=Expression
@@ -809,22 +810,22 @@ public class GlobalScopeExpressionElements extends AbstractParserRuleElementFind
 		//Expression
 		public RuleCall getNameExpressionParserRuleCall_3_0_3_0() { return cNameExpressionParserRuleCall_3_0_3_0; }
 
-		//"," recursivePrefix?="recursive"? "prefix" "=" prefix=Expression
+		//',' recursivePrefix?='recursive'? 'prefix' '=' prefix=Expression
 		public Group getGroup_3_1() { return cGroup_3_1; }
 
-		//","
+		//','
 		public Keyword getCommaKeyword_3_1_0() { return cCommaKeyword_3_1_0; }
 
-		//recursivePrefix?="recursive"?
+		//recursivePrefix?='recursive'?
 		public Assignment getRecursivePrefixAssignment_3_1_1() { return cRecursivePrefixAssignment_3_1_1; }
 
-		//"recursive"
+		//'recursive'
 		public Keyword getRecursivePrefixRecursiveKeyword_3_1_1_0() { return cRecursivePrefixRecursiveKeyword_3_1_1_0; }
 
-		//"prefix"
+		//'prefix'
 		public Keyword getPrefixKeyword_3_1_2() { return cPrefixKeyword_3_1_2; }
 
-		//"="
+		//'='
 		public Keyword getEqualsSignKeyword_3_1_3() { return cEqualsSignKeyword_3_1_3; }
 
 		//prefix=Expression
@@ -833,19 +834,19 @@ public class GlobalScopeExpressionElements extends AbstractParserRuleElementFind
 		//Expression
 		public RuleCall getPrefixExpressionParserRuleCall_3_1_4_0() { return cPrefixExpressionParserRuleCall_3_1_4_0; }
 
-		//("," "data" "=" "(" data+=DataExpression ("," data+=DataExpression)* ")")?
+		//(',' 'data' '=' '(' data+=DataExpression (',' data+=DataExpression)* ')')?
 		public Group getGroup_4() { return cGroup_4; }
 
-		//","
+		//','
 		public Keyword getCommaKeyword_4_0() { return cCommaKeyword_4_0; }
 
-		//"data"
+		//'data'
 		public Keyword getDataKeyword_4_1() { return cDataKeyword_4_1; }
 
-		//"="
+		//'='
 		public Keyword getEqualsSignKeyword_4_2() { return cEqualsSignKeyword_4_2; }
 
-		//"("
+		//'('
 		public Keyword getLeftParenthesisKeyword_4_3() { return cLeftParenthesisKeyword_4_3; }
 
 		//data+=DataExpression
@@ -854,10 +855,10 @@ public class GlobalScopeExpressionElements extends AbstractParserRuleElementFind
 		//DataExpression
 		public RuleCall getDataDataExpressionParserRuleCall_4_4_0() { return cDataDataExpressionParserRuleCall_4_4_0; }
 
-		//("," data+=DataExpression)*
+		//(',' data+=DataExpression)*
 		public Group getGroup_4_5() { return cGroup_4_5; }
 
-		//","
+		//','
 		public Keyword getCommaKeyword_4_5_0() { return cCommaKeyword_4_5_0; }
 
 		//data+=DataExpression
@@ -866,28 +867,28 @@ public class GlobalScopeExpressionElements extends AbstractParserRuleElementFind
 		//DataExpression
 		public RuleCall getDataDataExpressionParserRuleCall_4_5_1_0() { return cDataDataExpressionParserRuleCall_4_5_1_0; }
 
-		//")"
+		//')'
 		public Keyword getRightParenthesisKeyword_4_6() { return cRightParenthesisKeyword_4_6; }
 
-		//("," "domains" "=" (domains+="*" | domains+=Identifier | "(" domains+=Identifier ("," domains+=Identifier)* ")"))?
+		//(',' 'domains' '=' (domains+='*' | domains+=Identifier | '(' domains+=Identifier (',' domains+=Identifier)* ')'))?
 		public Group getGroup_5() { return cGroup_5; }
 
-		//","
+		//','
 		public Keyword getCommaKeyword_5_0() { return cCommaKeyword_5_0; }
 
-		//"domains"
+		//'domains'
 		public Keyword getDomainsKeyword_5_1() { return cDomainsKeyword_5_1; }
 
-		//"="
+		//'='
 		public Keyword getEqualsSignKeyword_5_2() { return cEqualsSignKeyword_5_2; }
 
-		//domains+="*" | domains+=Identifier | "(" domains+=Identifier ("," domains+=Identifier)* ")"
+		//domains+='*' | domains+=Identifier | '(' domains+=Identifier (',' domains+=Identifier)* ')'
 		public Alternatives getAlternatives_5_3() { return cAlternatives_5_3; }
 
-		//domains+="*"
+		//domains+='*'
 		public Assignment getDomainsAssignment_5_3_0() { return cDomainsAssignment_5_3_0; }
 
-		//"*"
+		//'*'
 		public Keyword getDomainsAsteriskKeyword_5_3_0_0() { return cDomainsAsteriskKeyword_5_3_0_0; }
 
 		//domains+=Identifier
@@ -896,10 +897,10 @@ public class GlobalScopeExpressionElements extends AbstractParserRuleElementFind
 		//Identifier
 		public RuleCall getDomainsIdentifierParserRuleCall_5_3_1_0() { return cDomainsIdentifierParserRuleCall_5_3_1_0; }
 
-		//"(" domains+=Identifier ("," domains+=Identifier)* ")"
+		//'(' domains+=Identifier (',' domains+=Identifier)* ')'
 		public Group getGroup_5_3_2() { return cGroup_5_3_2; }
 
-		//"("
+		//'('
 		public Keyword getLeftParenthesisKeyword_5_3_2_0() { return cLeftParenthesisKeyword_5_3_2_0; }
 
 		//domains+=Identifier
@@ -908,10 +909,10 @@ public class GlobalScopeExpressionElements extends AbstractParserRuleElementFind
 		//Identifier
 		public RuleCall getDomainsIdentifierParserRuleCall_5_3_2_1_0() { return cDomainsIdentifierParserRuleCall_5_3_2_1_0; }
 
-		//("," domains+=Identifier)*
+		//(',' domains+=Identifier)*
 		public Group getGroup_5_3_2_2() { return cGroup_5_3_2_2; }
 
-		//","
+		//','
 		public Keyword getCommaKeyword_5_3_2_2_0() { return cCommaKeyword_5_3_2_2_0; }
 
 		//domains+=Identifier
@@ -920,15 +921,15 @@ public class GlobalScopeExpressionElements extends AbstractParserRuleElementFind
 		//Identifier
 		public RuleCall getDomainsIdentifierParserRuleCall_5_3_2_2_1_0() { return cDomainsIdentifierParserRuleCall_5_3_2_2_1_0; }
 
-		//")"
+		//')'
 		public Keyword getRightParenthesisKeyword_5_3_2_3() { return cRightParenthesisKeyword_5_3_2_3; }
 
-		//")"
+		//')'
 		public Keyword getRightParenthesisKeyword_6() { return cRightParenthesisKeyword_6; }
 	}
 
 	public class DataExpressionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "DataExpression");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.scope.Scope.DataExpression");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cMatchDataExpressionParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cLambdaDataExpressionParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
@@ -948,7 +949,7 @@ public class DataExpressionElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class MatchDataExpressionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "MatchDataExpression");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.scope.Scope.MatchDataExpression");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cKeyAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final RuleCall cKeyIdentifierParserRuleCall_0_0 = (RuleCall)cKeyAssignment_0.eContents().get(0);
@@ -957,10 +958,10 @@ public class MatchDataExpressionElements extends AbstractParserRuleElementFinder
 		private final RuleCall cValueExpressionParserRuleCall_2_0 = (RuleCall)cValueAssignment_2.eContents().get(0);
 		
 		//MatchDataExpression:
-		//	key=Identifier "=" value=Expression;
+		//	key=Identifier '=' value=Expression;
 		@Override public ParserRule getRule() { return rule; }
 
-		//key=Identifier "=" value=Expression
+		//key=Identifier '=' value=Expression
 		public Group getGroup() { return cGroup; }
 
 		//key=Identifier
@@ -969,7 +970,7 @@ public class MatchDataExpressionElements extends AbstractParserRuleElementFinder
 		//Identifier
 		public RuleCall getKeyIdentifierParserRuleCall_0_0() { return cKeyIdentifierParserRuleCall_0_0; }
 
-		//"="
+		//'='
 		public Keyword getEqualsSignKeyword_1() { return cEqualsSignKeyword_1; }
 
 		//value=Expression
@@ -980,7 +981,7 @@ public class MatchDataExpressionElements extends AbstractParserRuleElementFinder
 	}
 
 	public class LambdaDataExpressionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "LambdaDataExpression");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.scope.Scope.LambdaDataExpression");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cLeftSquareBracketKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cDescAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -991,13 +992,13 @@ public class LambdaDataExpressionElements extends AbstractParserRuleElementFinde
 		private final Keyword cRightSquareBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);
 		
 		//LambdaDataExpression:
-		//	"[" desc=Identifier "|" value=Expression "]";
+		//	'[' desc=Identifier '|' value=Expression ']';
 		@Override public ParserRule getRule() { return rule; }
 
-		//"[" desc=Identifier "|" value=Expression "]"
+		//'[' desc=Identifier '|' value=Expression ']'
 		public Group getGroup() { return cGroup; }
 
-		//"["
+		//'['
 		public Keyword getLeftSquareBracketKeyword_0() { return cLeftSquareBracketKeyword_0; }
 
 		//desc=Identifier
@@ -1006,7 +1007,7 @@ public class LambdaDataExpressionElements extends AbstractParserRuleElementFinde
 		//Identifier
 		public RuleCall getDescIdentifierParserRuleCall_1_0() { return cDescIdentifierParserRuleCall_1_0; }
 
-		//"|"
+		//'|'
 		public Keyword getVerticalLineKeyword_2() { return cVerticalLineKeyword_2; }
 
 		//value=Expression
@@ -1015,12 +1016,12 @@ public class LambdaDataExpressionElements extends AbstractParserRuleElementFinde
 		//Expression
 		public RuleCall getValueExpressionParserRuleCall_3_0() { return cValueExpressionParserRuleCall_3_0; }
 
-		//"]"
+		//']'
 		public Keyword getRightSquareBracketKeyword_4() { return cRightSquareBracketKeyword_4; }
 	}
 
 	public class SimpleScopeExpressionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "SimpleScopeExpression");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.scope.Scope.SimpleScopeExpression");
 		private final Assignment cExprAssignment = (Assignment)rule.eContents().get(1);
 		private final RuleCall cExprExpressionParserRuleCall_0 = (RuleCall)cExprAssignment.eContents().get(0);
 		
@@ -1036,7 +1037,7 @@ public class SimpleScopeExpressionElements extends AbstractParserRuleElementFind
 	}
 
 	public class NamingElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Naming");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.scope.Scope.Naming");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final Group cGroup_0 = (Group)cAlternatives.eContents().get(0);
 		private final Group cGroup_0_0 = (Group)cGroup_0.eContents().get(0);
@@ -1052,19 +1053,19 @@ public class NamingElements extends AbstractParserRuleElementFinder {
 		private final RuleCall cNamesNamingExpressionParserRuleCall_1_0 = (RuleCall)cNamesAssignment_1.eContents().get(0);
 		
 		//Naming:
-		//	-> ("(" names+=NamingExpression ("," names+=NamingExpression)* ")") | names+=NamingExpression;
+		//	-> ('(' names+=NamingExpression (',' names+=NamingExpression)* ')') | names+=NamingExpression;
 		@Override public ParserRule getRule() { return rule; }
 
-		//-> ("(" names+=NamingExpression ("," names+=NamingExpression)* ")") | names+=NamingExpression
+		//-> ('(' names+=NamingExpression (',' names+=NamingExpression)* ')') | names+=NamingExpression
 		public Alternatives getAlternatives() { return cAlternatives; }
 
-		//-> ("(" names+=NamingExpression ("," names+=NamingExpression)* ")")
+		//-> ('(' names+=NamingExpression (',' names+=NamingExpression)* ')')
 		public Group getGroup_0() { return cGroup_0; }
 
-		//"(" names+=NamingExpression ("," names+=NamingExpression)* ")"
+		//'(' names+=NamingExpression (',' names+=NamingExpression)* ')'
 		public Group getGroup_0_0() { return cGroup_0_0; }
 
-		//"("
+		//'('
 		public Keyword getLeftParenthesisKeyword_0_0_0() { return cLeftParenthesisKeyword_0_0_0; }
 
 		//names+=NamingExpression
@@ -1073,10 +1074,10 @@ public class NamingElements extends AbstractParserRuleElementFinder {
 		//NamingExpression
 		public RuleCall getNamesNamingExpressionParserRuleCall_0_0_1_0() { return cNamesNamingExpressionParserRuleCall_0_0_1_0; }
 
-		//("," names+=NamingExpression)*
+		//(',' names+=NamingExpression)*
 		public Group getGroup_0_0_2() { return cGroup_0_0_2; }
 
-		//","
+		//','
 		public Keyword getCommaKeyword_0_0_2_0() { return cCommaKeyword_0_0_2_0; }
 
 		//names+=NamingExpression
@@ -1085,7 +1086,7 @@ public class NamingElements extends AbstractParserRuleElementFinder {
 		//NamingExpression
 		public RuleCall getNamesNamingExpressionParserRuleCall_0_0_2_1_0() { return cNamesNamingExpressionParserRuleCall_0_0_2_1_0; }
 
-		//")"
+		//')'
 		public Keyword getRightParenthesisKeyword_0_0_3() { return cRightParenthesisKeyword_0_0_3; }
 
 		//names+=NamingExpression
@@ -1096,7 +1097,7 @@ public class NamingElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class NamingExpressionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "NamingExpression");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.scope.Scope.NamingExpression");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final Assignment cExportAssignment_0 = (Assignment)cAlternatives.eContents().get(0);
 		private final Keyword cExportExportKeyword_0_0 = (Keyword)cExportAssignment_0.eContents().get(0);
@@ -1107,25 +1108,25 @@ public class NamingExpressionElements extends AbstractParserRuleElementFinder {
 		private final RuleCall cExpressionExpressionParserRuleCall_1_1_0 = (RuleCall)cExpressionAssignment_1_1.eContents().get(0);
 		
 		//NamingExpression:
-		//	export?="export" | factory?="factory"? expression=Expression;
+		//	export?='export' | factory?='factory'? expression=Expression;
 		@Override public ParserRule getRule() { return rule; }
 
-		//export?="export" | factory?="factory"? expression=Expression
+		//export?='export' | factory?='factory'? expression=Expression
 		public Alternatives getAlternatives() { return cAlternatives; }
 
-		//export?="export"
+		//export?='export'
 		public Assignment getExportAssignment_0() { return cExportAssignment_0; }
 
-		//"export"
+		//'export'
 		public Keyword getExportExportKeyword_0_0() { return cExportExportKeyword_0_0; }
 
-		//factory?="factory"? expression=Expression
+		//factory?='factory'? expression=Expression
 		public Group getGroup_1() { return cGroup_1; }
 
-		//factory?="factory"?
+		//factory?='factory'?
 		public Assignment getFactoryAssignment_1_0() { return cFactoryAssignment_1_0; }
 
-		//"factory"
+		//'factory'
 		public Keyword getFactoryFactoryKeyword_1_0_0() { return cFactoryFactoryKeyword_1_0_0; }
 
 		//expression=Expression
@@ -1136,27 +1137,27 @@ public class NamingExpressionElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class QualifiedIDElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "QualifiedID");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.scope.Scope.QualifiedID");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final RuleCall cIdentifierParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0);
 		private final Group cGroup_1 = (Group)cGroup.eContents().get(1);
 		private final Keyword cColonColonKeyword_1_0 = (Keyword)cGroup_1.eContents().get(0);
 		private final RuleCall cIdentifierParserRuleCall_1_1 = (RuleCall)cGroup_1.eContents().get(1);
 		
-		//QualifiedID returns ecore::EString:
-		//	Identifier ("::" Identifier)*;
+		//QualifiedID:
+		//	Identifier ('::' Identifier)*;
 		@Override public ParserRule getRule() { return rule; }
 
-		//Identifier ("::" Identifier)*
+		//Identifier ('::' Identifier)*
 		public Group getGroup() { return cGroup; }
 
 		//Identifier
 		public RuleCall getIdentifierParserRuleCall_0() { return cIdentifierParserRuleCall_0; }
 
-		//("::" Identifier)*
+		//('::' Identifier)*
 		public Group getGroup_1() { return cGroup_1; }
 
-		//"::"
+		//'::'
 		public Keyword getColonColonKeyword_1_0() { return cColonColonKeyword_1_0; }
 
 		//Identifier
@@ -1164,27 +1165,27 @@ public class QualifiedIDElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class DottedIDElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "DottedID");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.scope.Scope.DottedID");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final RuleCall cIdentifierParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0);
 		private final Group cGroup_1 = (Group)cGroup.eContents().get(1);
 		private final Keyword cFullStopKeyword_1_0 = (Keyword)cGroup_1.eContents().get(0);
 		private final RuleCall cIdentifierParserRuleCall_1_1 = (RuleCall)cGroup_1.eContents().get(1);
 		
-		//DottedID returns ecore::EString:
-		//	Identifier ("." Identifier)*;
+		//DottedID:
+		//	Identifier ('.' Identifier)*;
 		@Override public ParserRule getRule() { return rule; }
 
-		//Identifier ("." Identifier)*
+		//Identifier ('.' Identifier)*
 		public Group getGroup() { return cGroup; }
 
 		//Identifier
 		public RuleCall getIdentifierParserRuleCall_0() { return cIdentifierParserRuleCall_0; }
 
-		//("." Identifier)*
+		//('.' Identifier)*
 		public Group getGroup_1() { return cGroup_1; }
 
-		//"."
+		//'.'
 		public Keyword getFullStopKeyword_1_0() { return cFullStopKeyword_1_0; }
 
 		//Identifier
@@ -1193,7 +1194,7 @@ public class DottedIDElements extends AbstractParserRuleElementFinder {
 	
 	
 	public class CasingElements extends AbstractEnumRuleElementFinder {
-		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "Casing");
+		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.scope.Scope.Casing");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final EnumLiteralDeclaration cSENSITIVEEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0);
 		private final Keyword cSENSITIVESensitiveKeyword_0_0 = (Keyword)cSENSITIVEEnumLiteralDeclaration_0.eContents().get(0);
@@ -1201,22 +1202,22 @@ public class CasingElements extends AbstractEnumRuleElementFinder {
 		private final Keyword cINSENSITIVEInsensitiveKeyword_1_0 = (Keyword)cINSENSITIVEEnumLiteralDeclaration_1.eContents().get(0);
 		
 		//enum Casing:
-		//	SENSITIVE="sensitive" | INSENSITIVE="insensitive";
+		//	SENSITIVE='sensitive' | INSENSITIVE='insensitive';
 		public EnumRule getRule() { return rule; }
 
-		//SENSITIVE="sensitive" | INSENSITIVE="insensitive"
+		//SENSITIVE='sensitive' | INSENSITIVE='insensitive'
 		public Alternatives getAlternatives() { return cAlternatives; }
 
-		//SENSITIVE="sensitive"
+		//SENSITIVE='sensitive'
 		public EnumLiteralDeclaration getSENSITIVEEnumLiteralDeclaration_0() { return cSENSITIVEEnumLiteralDeclaration_0; }
 
-		//"sensitive"
+		//'sensitive'
 		public Keyword getSENSITIVESensitiveKeyword_0_0() { return cSENSITIVESensitiveKeyword_0_0; }
 
-		//INSENSITIVE="insensitive"
+		//INSENSITIVE='insensitive'
 		public EnumLiteralDeclaration getINSENSITIVEEnumLiteralDeclaration_1() { return cINSENSITIVEEnumLiteralDeclaration_1; }
 
-		//"insensitive"
+		//'insensitive'
 		public Keyword getINSENSITIVEInsensitiveKeyword_1_0() { return cINSENSITIVEInsensitiveKeyword_1_0; }
 	}
 	
@@ -1224,7 +1225,7 @@ public class CasingElements extends AbstractEnumRuleElementFinder {
 	private final ImportElements pImport;
 	private final ExtensionElements pExtension;
 	private final InjectionElements pInjection;
-	private final CasingElements unknownRuleCasing;
+	private final CasingElements eCasing;
 	private final NamingSectionElements pNamingSection;
 	private final NamingDefinitionElements pNamingDefinition;
 	private final ScopeDefinitionElements pScopeDefinition;
@@ -1248,16 +1249,20 @@ public class CasingElements extends AbstractEnumRuleElementFinder {
 
 	private final ExpressionGrammarAccess gaExpression;
 
+	private final TerminalsGrammarAccess gaTerminals;
+
 	@Inject
 	public ScopeGrammarAccess(GrammarProvider grammarProvider,
-		ExpressionGrammarAccess gaExpression) {
+		ExpressionGrammarAccess gaExpression,
+		TerminalsGrammarAccess gaTerminals) {
 		this.grammar = internalFindGrammar(grammarProvider);
 		this.gaExpression = gaExpression;
+		this.gaTerminals = gaTerminals;
 		this.pScopeModel = new ScopeModelElements();
 		this.pImport = new ImportElements();
 		this.pExtension = new ExtensionElements();
 		this.pInjection = new InjectionElements();
-		this.unknownRuleCasing = new CasingElements();
+		this.eCasing = new CasingElements();
 		this.pNamingSection = new NamingSectionElements();
 		this.pNamingDefinition = new NamingDefinitionElements();
 		this.pScopeDefinition = new ScopeDefinitionElements();
@@ -1304,9 +1309,13 @@ public ExpressionGrammarAccess getExpressionGrammarAccess() {
 		return gaExpression;
 	}
 
+	public TerminalsGrammarAccess getTerminalsGrammarAccess() {
+		return gaTerminals;
+	}
+
 	
 	//ScopeModel:
-	//	"scoping" name=DottedID ("with" includedScopes+=[ScopeModel|DottedID])? imports+=Import* extensions+=Extension*
+	//	'scoping' name=DottedID ('with' includedScopes+=[ScopeModel|DottedID])? imports+=Import* extensions+=Extension*
 	//	injections+=Injection* naming=NamingSection? scopes+=ScopeDefinition*;
 	public ScopeModelElements getScopeModelAccess() {
 		return pScopeModel;
@@ -1317,7 +1326,7 @@ public ParserRule getScopeModelRule() {
 	}
 
 	//Import:
-	//	"import" package=[ecore::EPackage|STRING] ("as" name=Identifier)?;
+	//	'import' package=[ecore::EPackage|STRING] ('as' name=Identifier)?;
 	public ImportElements getImportAccess() {
 		return pImport;
 	}
@@ -1327,7 +1336,7 @@ public ParserRule getImportRule() {
 	}
 
 	//Extension:
-	//	"extension" extension=QualifiedID;
+	//	'extension' extension=QualifiedID;
 	public ExtensionElements getExtensionAccess() {
 		return pExtension;
 	}
@@ -1337,7 +1346,7 @@ public ParserRule getExtensionRule() {
 	}
 
 	//Injection:
-	//	"inject" type=DottedID "as" name=Identifier;
+	//	'inject' type=DottedID 'as' name=Identifier;
 	public InjectionElements getInjectionAccess() {
 		return pInjection;
 	}
@@ -1347,9 +1356,9 @@ public ParserRule getInjectionRule() {
 	}
 
 	//enum Casing:
-	//	SENSITIVE="sensitive" | INSENSITIVE="insensitive";
+	//	SENSITIVE='sensitive' | INSENSITIVE='insensitive';
 	public CasingElements getCasingAccess() {
-		return unknownRuleCasing;
+		return eCasing;
 	}
 	
 	public EnumRule getCasingRule() {
@@ -1357,7 +1366,7 @@ public EnumRule getCasingRule() {
 	}
 
 	//NamingSection:
-	//	{NamingSection} ("case" casing=Casing)? "naming" "{" namings+=NamingDefinition* "}";
+	//	{NamingSection} ('case' casing=Casing)? 'naming' '{' namings+=NamingDefinition* '}';
 	public NamingSectionElements getNamingSectionAccess() {
 		return pNamingSection;
 	}
@@ -1367,7 +1376,7 @@ public ParserRule getNamingSectionRule() {
 	}
 
 	//NamingDefinition:
-	//	type=[ecore::EClass|QualifiedID] "=" naming=Naming ";";
+	//	type=[ecore::EClass|QualifiedID] '=' naming=Naming ';';
 	public NamingDefinitionElements getNamingDefinitionAccess() {
 		return pNamingDefinition;
 	}
@@ -1377,8 +1386,8 @@ public ParserRule getNamingDefinitionRule() {
 	}
 
 	//ScopeDefinition:
-	//	"scope" ("(" name=Identifier ")")? (targetType=[ecore::EClass|QualifiedID] | contextType=[ecore::EClass|QualifiedID]
-	//	"#" reference=[ecore::EReference|Identifier]) "{" rules+=ScopeRule+ "}";
+	//	'scope' ('(' name=Identifier ')')? (targetType=[ecore::EClass|QualifiedID] | contextType=[ecore::EClass|QualifiedID]
+	//	'#' reference=[ecore::EReference|Identifier]) '{' rules+=ScopeRule+ '}';
 	public ScopeDefinitionElements getScopeDefinitionAccess() {
 		return pScopeDefinition;
 	}
@@ -1388,7 +1397,7 @@ public ParserRule getScopeDefinitionRule() {
 	}
 
 	//ScopeRule:
-	//	"context" context=ScopeContext "=" exprs+=ScopeExpression (">>" exprs+=ScopeExpression)* ";";
+	//	'context' context=ScopeContext '=' exprs+=ScopeExpression ('>>' exprs+=ScopeExpression)* ';';
 	public ScopeRuleElements getScopeRuleAccess() {
 		return pScopeRule;
 	}
@@ -1398,7 +1407,7 @@ public ParserRule getScopeRuleRule() {
 	}
 
 	//ScopeContext:
-	//	(global?="*" | contextType=[ecore::EClass|QualifiedID]) ("[" guard=Expression "]")?;
+	//	(global?='*' | contextType=[ecore::EClass|QualifiedID]) ('[' guard=Expression ']')?;
 	public ScopeContextElements getScopeContextAccess() {
 		return pScopeContext;
 	}
@@ -1408,7 +1417,7 @@ public ParserRule getScopeContextRule() {
 	}
 
 	//ScopeExpression:
-	//	(ScopeDelegation | FactoryExpression | NamedScopeExpression) ("|" prune=Expression)?;
+	//	(ScopeDelegation | FactoryExpression | NamedScopeExpression) ('|' prune=Expression)?;
 	public ScopeExpressionElements getScopeExpressionAccess() {
 		return pScopeExpression;
 	}
@@ -1418,7 +1427,7 @@ public ParserRule getScopeExpressionRule() {
 	}
 
 	//FactoryExpression:
-	//	"factory" expr=Expression;
+	//	'factory' expr=Expression;
 	public FactoryExpressionElements getFactoryExpressionAccess() {
 		return pFactoryExpression;
 	}
@@ -1428,7 +1437,7 @@ public ParserRule getFactoryExpressionRule() {
 	}
 
 	//ScopeDelegation:
-	//	"scopeof" "(" (delegate=Expression | external=GlobalScopeExpression) ("," scope=[ScopeDefinition|Identifier])? ")";
+	//	'scopeof' '(' (delegate=Expression | external=GlobalScopeExpression) (',' scope=[ScopeDefinition|Identifier])? ')';
 	public ScopeDelegationElements getScopeDelegationAccess() {
 		return pScopeDelegation;
 	}
@@ -1438,7 +1447,7 @@ public ParserRule getScopeDelegationRule() {
 	}
 
 	//NamedScopeExpression:
-	//	(GlobalScopeExpression | SimpleScopeExpression) (caseDef?="case" casing=Casing)? ("as" naming=Naming)?;
+	//	(GlobalScopeExpression | SimpleScopeExpression) (caseDef?='case' casing=Casing)? ('as' naming=Naming)?;
 	public NamedScopeExpressionElements getNamedScopeExpressionAccess() {
 		return pNamedScopeExpression;
 	}
@@ -1448,9 +1457,9 @@ public ParserRule getNamedScopeExpressionRule() {
 	}
 
 	//GlobalScopeExpression:
-	//	"find" "(" type=[ecore::EClass|QualifiedID] ("," "key" "=" name=Expression | "," recursivePrefix?="recursive"?
-	//	"prefix" "=" prefix=Expression)? ("," "data" "=" "(" data+=DataExpression ("," data+=DataExpression)* ")")? (","
-	//	"domains" "=" (domains+="*" | domains+=Identifier | "(" domains+=Identifier ("," domains+=Identifier)* ")"))? ")";
+	//	'find' '(' type=[ecore::EClass|QualifiedID] (',' 'key' '=' name=Expression | ',' recursivePrefix?='recursive'?
+	//	'prefix' '=' prefix=Expression)? (',' 'data' '=' '(' data+=DataExpression (',' data+=DataExpression)* ')')? (','
+	//	'domains' '=' (domains+='*' | domains+=Identifier | '(' domains+=Identifier (',' domains+=Identifier)* ')'))? ')';
 	public GlobalScopeExpressionElements getGlobalScopeExpressionAccess() {
 		return pGlobalScopeExpression;
 	}
@@ -1470,7 +1479,7 @@ public ParserRule getDataExpressionRule() {
 	}
 
 	//MatchDataExpression:
-	//	key=Identifier "=" value=Expression;
+	//	key=Identifier '=' value=Expression;
 	public MatchDataExpressionElements getMatchDataExpressionAccess() {
 		return pMatchDataExpression;
 	}
@@ -1480,7 +1489,7 @@ public ParserRule getMatchDataExpressionRule() {
 	}
 
 	//LambdaDataExpression:
-	//	"[" desc=Identifier "|" value=Expression "]";
+	//	'[' desc=Identifier '|' value=Expression ']';
 	public LambdaDataExpressionElements getLambdaDataExpressionAccess() {
 		return pLambdaDataExpression;
 	}
@@ -1500,7 +1509,7 @@ public ParserRule getSimpleScopeExpressionRule() {
 	}
 
 	//Naming:
-	//	-> ("(" names+=NamingExpression ("," names+=NamingExpression)* ")") | names+=NamingExpression;
+	//	-> ('(' names+=NamingExpression (',' names+=NamingExpression)* ')') | names+=NamingExpression;
 	public NamingElements getNamingAccess() {
 		return pNaming;
 	}
@@ -1510,7 +1519,7 @@ public ParserRule getNamingRule() {
 	}
 
 	//NamingExpression:
-	//	export?="export" | factory?="factory"? expression=Expression;
+	//	export?='export' | factory?='factory'? expression=Expression;
 	public NamingExpressionElements getNamingExpressionAccess() {
 		return pNamingExpression;
 	}
@@ -1519,8 +1528,8 @@ public ParserRule getNamingExpressionRule() {
 		return getNamingExpressionAccess().getRule();
 	}
 
-	//QualifiedID returns ecore::EString:
-	//	Identifier ("::" Identifier)*;
+	//QualifiedID:
+	//	Identifier ('::' Identifier)*;
 	public QualifiedIDElements getQualifiedIDAccess() {
 		return pQualifiedID;
 	}
@@ -1529,8 +1538,8 @@ public ParserRule getQualifiedIDRule() {
 		return getQualifiedIDAccess().getRule();
 	}
 
-	//DottedID returns ecore::EString:
-	//	Identifier ("." Identifier)*;
+	//DottedID:
+	//	Identifier ('.' Identifier)*;
 	public DottedIDElements getDottedIDAccess() {
 		return pDottedID;
 	}
@@ -1572,7 +1581,7 @@ public ParserRule getSyntaxElementRule() {
 	////   {$e=factory.createLetExpression(v,varExpr,target);}
 	// //|  x=castedExpression {$e=x;};
 	// LetExpression:
-	//	"let" identifier=Identifier "=" varExpr=Expression ":" target=Expression;
+	//	'let' identifier=Identifier '=' varExpr=Expression ':' target=Expression;
 	public ExpressionGrammarAccess.LetExpressionElements getLetExpressionAccess() {
 		return gaExpression.getLetExpressionAccess();
 	}
@@ -1588,7 +1597,7 @@ public ParserRule getLetExpressionRule() {
 	// //	| x=chainExpression {$e=x;};
 	//
 	//CastedExpression:
-	//	"(" type=Type ")" target=Expression;
+	//	'(' type=Type ')' target=Expression;
 	public ExpressionGrammarAccess.CastedExpressionElements getCastedExpressionAccess() {
 		return gaExpression.getCastedExpressionAccess();
 	}
@@ -1601,8 +1610,8 @@ public ParserRule getCastedExpressionRule() {
 	//
 	////	x=ifExpression {$e=x;} ( '->' right=ifExpression {$e=factory.createChainExpression($e,right);})*;
 	// ChainExpression
-	//returns Expression:
-	//	ChainedExpression ({ChainExpression.first=current} "->" next=ChainedExpression)*;
+	//Expression:
+	//	ChainedExpression ({ChainExpression.first=current} '->' next=ChainedExpression)*;
 	public ExpressionGrammarAccess.ChainExpressionElements getChainExpressionAccess() {
 		return gaExpression.getChainExpressionAccess();
 	}
@@ -1611,7 +1620,7 @@ public ParserRule getChainExpressionRule() {
 		return getChainExpressionAccess().getRule();
 	}
 
-	//ChainedExpression returns Expression:
+	//ChainedExpression Expression:
 	//	IfExpressionKw | IfExpressionTri | SwitchExpression;
 	public ExpressionGrammarAccess.ChainedExpressionElements getChainedExpressionAccess() {
 		return gaExpression.getChainedExpressionAccess();
@@ -1627,8 +1636,8 @@ public ParserRule getChainedExpressionRule() {
 	//
 	////|	'if' condition=switchExpression 'then' thenPart=switchExpression ('else' elsePart=expression)? {$e=factory.createIf(condition,thenPart,elsePart);};
 	//
-	//IfExpressionTri returns Expression:
-	//	OrExpression ({IfExpression.condition=current} "?" thenPart=ChainedExpression ":" elsePart=ChainedExpression)?;
+	//IfExpressionTri Expression:
+	//	OrExpression ({IfExpression.condition=current} '?' thenPart=ChainedExpression ':' elsePart=ChainedExpression)?;
 	public ExpressionGrammarAccess.IfExpressionTriElements getIfExpressionTriAccess() {
 		return gaExpression.getIfExpressionTriAccess();
 	}
@@ -1637,8 +1646,8 @@ public ParserRule getIfExpressionTriRule() {
 		return getIfExpressionTriAccess().getRule();
 	}
 
-	//IfExpressionKw returns IfExpression:
-	//	"if" condition=ChainedExpression "then" thenPart=ChainedExpression -> ("else" elsePart=ChainedExpression)?;
+	//IfExpressionKw IfExpression:
+	//	'if' condition=ChainedExpression 'then' thenPart=ChainedExpression -> ('else' elsePart=ChainedExpression)?;
 	public ExpressionGrammarAccess.IfExpressionKwElements getIfExpressionKwAccess() {
 		return gaExpression.getIfExpressionKwAccess();
 	}
@@ -1662,7 +1671,7 @@ public ParserRule getIfExpressionKwRule() {
 	////   {$e = factory.createSwitchExpression(pred,cases,def);}
 	// //|  x=orExpression {$e=x;};
 	// SwitchExpression:
-	//	"switch" ("(" switchExpr=OrExpression ")")? "{" case+=Case* "default" ":" defaultExpr=OrExpression "}";
+	//	'switch' ('(' switchExpr=OrExpression ')')? '{' case+=Case* 'default' ':' defaultExpr=OrExpression '}';
 	public ExpressionGrammarAccess.SwitchExpressionElements getSwitchExpressionAccess() {
 		return gaExpression.getSwitchExpressionAccess();
 	}
@@ -1672,7 +1681,7 @@ public ParserRule getSwitchExpressionRule() {
 	}
 
 	//Case:
-	//	"case" condition=OrExpression ":" thenPar=OrExpression;
+	//	'case' condition=OrExpression ':' thenPar=OrExpression;
 	public ExpressionGrammarAccess.CaseElements getCaseAccess() {
 		return gaExpression.getCaseAccess();
 	}
@@ -1685,8 +1694,8 @@ public ParserRule getCaseRule() {
 	//
 	////  	x=andExpression {$e=x;} (name='||' r=andExpression 	{$e = factory.createBooleanOperation(id(name),$e,r);})*;
 	//
-	//OrExpression returns Expression:
-	//	AndExpression ({BooleanOperation.left=current} operator="||" right=AndExpression)*;
+	//OrExpression Expression:
+	//	AndExpression ({BooleanOperation.left=current} operator='||' right=AndExpression)*;
 	public ExpressionGrammarAccess.OrExpressionElements getOrExpressionAccess() {
 		return gaExpression.getOrExpressionAccess();
 	}
@@ -1699,8 +1708,8 @@ public ParserRule getOrExpressionRule() {
 	//
 	////	x=impliesExpression {$e=x;} (name='&&' r=impliesExpression 	{$e = factory.createBooleanOperation(id(name),$e,r);})*;
 	//
-	//AndExpression returns Expression:
-	//	ImpliesExpression ({BooleanOperation.left=current} operator="&&" right=ImpliesExpression)*;
+	//AndExpression Expression:
+	//	ImpliesExpression ({BooleanOperation.left=current} operator='&&' right=ImpliesExpression)*;
 	public ExpressionGrammarAccess.AndExpressionElements getAndExpressionAccess() {
 		return gaExpression.getAndExpressionAccess();
 	}
@@ -1713,8 +1722,8 @@ public ParserRule getAndExpressionRule() {
 	//
 	////	x=relationalExpression {$e=x;} (name='implies' r=relationalExpression 	{$e = factory.createBooleanOperation(id(name),$e,r);})*;
 	//
-	//ImpliesExpression returns Expression:
-	//	RelationalExpression ({BooleanOperation.left=current} operator="implies" right=RelationalExpression)*;
+	//ImpliesExpression Expression:
+	//	RelationalExpression ({BooleanOperation.left=current} operator='implies' right=RelationalExpression)*;
 	public ExpressionGrammarAccess.ImpliesExpressionElements getImpliesExpressionAccess() {
 		return gaExpression.getImpliesExpressionAccess();
 	}
@@ -1728,8 +1737,8 @@ public ParserRule getImpliesExpressionRule() {
 	//
 	////	(name=('==' | '!=' | '>=' | '<=' | '>' | '<') r=additiveExpression {$e = factory.createBinaryOperation(id(name),$e,r);})*;
 	//
-	//RelationalExpression returns Expression:
-	//	AdditiveExpression ({BooleanOperation.left=current} operator=("==" | "!=" | ">=" | "<=" | ">" | "<")
+	//RelationalExpression Expression:
+	//	AdditiveExpression ({BooleanOperation.left=current} operator=('==' | '!=' | '>=' | '<=' | '>' | '<')
 	//	right=AdditiveExpression)*;
 	public ExpressionGrammarAccess.RelationalExpressionElements getRelationalExpressionAccess() {
 		return gaExpression.getRelationalExpressionAccess();
@@ -1744,8 +1753,8 @@ public ParserRule getRelationalExpressionRule() {
 	//
 	////   (name=('+'| '-') r=multiplicativeExpression {$e = factory.createBinaryOperation(id(name),$e,r);})*;
 	//
-	//AdditiveExpression returns Expression:
-	//	MultiplicativeExpression ({OperationCall.params+=current} name=("+" | "-") params+=MultiplicativeExpression)*;
+	//AdditiveExpression Expression:
+	//	MultiplicativeExpression ({OperationCall.params+=current} name=('+' | '-') params+=MultiplicativeExpression)*;
 	public ExpressionGrammarAccess.AdditiveExpressionElements getAdditiveExpressionAccess() {
 		return gaExpression.getAdditiveExpressionAccess();
 	}
@@ -1759,8 +1768,8 @@ public ParserRule getAdditiveExpressionRule() {
 	//
 	////	(name=('*' | '/') r=unaryExpression {$e = factory.createBinaryOperation(id(name),$e,r);})*;
 	//
-	//MultiplicativeExpression returns Expression:
-	//	UnaryOrInfixExpression ({OperationCall.params+=current} name=("*" | "/") params+=UnaryOrInfixExpression)*;
+	//MultiplicativeExpression Expression:
+	//	UnaryOrInfixExpression ({OperationCall.params+=current} name=('*' | '/') params+=UnaryOrInfixExpression)*;
 	public ExpressionGrammarAccess.MultiplicativeExpressionElements getMultiplicativeExpressionAccess() {
 		return gaExpression.getMultiplicativeExpressionAccess();
 	}
@@ -1775,8 +1784,7 @@ public ParserRule getMultiplicativeExpressionRule() {
 	////|	name='!' x=infixExpression	{$e = factory.createOperationCall(id(name),x);}
 	//
 	////|	name='-' x=infixExpression	{$e = factory.createOperationCall(id(name),x);};
-	// UnaryOrInfixExpression returns
-	//Expression:
+	// UnaryOrInfixExpression Expression:
 	//	UnaryExpression | InfixExpression;
 	public ExpressionGrammarAccess.UnaryOrInfixExpressionElements getUnaryOrInfixExpressionAccess() {
 		return gaExpression.getUnaryOrInfixExpressionAccess();
@@ -1786,8 +1794,8 @@ public ParserRule getUnaryOrInfixExpressionRule() {
 		return getUnaryOrInfixExpressionAccess().getRule();
 	}
 
-	//UnaryExpression returns OperationCall:
-	//	name=("!" | "-") params+=InfixExpression;
+	//UnaryExpression OperationCall:
+	//	name=('!' | '-') params+=InfixExpression;
 	public ExpressionGrammarAccess.UnaryExpressionElements getUnaryExpressionAccess() {
 		return gaExpression.getUnaryExpressionAccess();
 	}
@@ -1801,12 +1809,12 @@ public ParserRule getUnaryExpressionRule() {
 	////	x=primaryExpression {$e=x;} ( '.' op=featureCall { if (op!=null) { op.setTarget($e);$e=op;}} )*;
 	//
 	//// having support for fragments could avoid the redundancy at this point
-	// InfixExpression returns Expression:
-	//	PrimaryExpression ({OperationCall.target=current} "." name=Identifier "(" (params+=Expression (","
-	//	params+=Expression)*)? ")" | {FeatureCall.target=current} "." type=Type | {TypeSelectExpression.target=current} "."
-	//	name="typeSelect" "(" type=Type ")" | {CollectionExpression.target=current} "." name=("collect" | "select" |
-	//	"selectFirst" | "reject" | "exists" | "notExists" | "sortBy" | "forAll") "(" (var=Identifier "|")? exp=Expression
-	//	")")*;
+	// InfixExpression Expression:
+	//	PrimaryExpression ({OperationCall.target=current} '.' name=Identifier '(' (params+=Expression (','
+	//	params+=Expression)*)? ')' | {FeatureCall.target=current} '.' type=Type | {TypeSelectExpression.target=current} '.'
+	//	name='typeSelect' '(' type=Type ')' | {CollectionExpression.target=current} '.' name=('collect' | 'select' |
+	//	'selectFirst' | 'reject' | 'exists' | 'notExists' | 'sortBy' | 'forAll') '(' (var=Identifier '|')? exp=Expression
+	//	')')*;
 	public ExpressionGrammarAccess.InfixExpressionElements getInfixExpressionAccess() {
 		return gaExpression.getInfixExpressionAccess();
 	}
@@ -1828,7 +1836,7 @@ public ParserRule getInfixExpressionRule() {
 	//
 	////|   x=globalVarExpression {$e=x;}
 	// //|   x=paranthesizedExpression {$e=x;};
-	// PrimaryExpression returns Expression:
+	// PrimaryExpression Expression:
 	//	Literal | FeatureCall | ListLiteral | ConstructorCallExpression | GlobalVarExpression | ParanthesizedExpression;
 	public ExpressionGrammarAccess.PrimaryExpressionElements getPrimaryExpressionAccess() {
 		return gaExpression.getPrimaryExpressionAccess();
@@ -1849,7 +1857,7 @@ public ParserRule getLiteralRule() {
 	}
 
 	//BooleanLiteral:
-	//	val=("true" | "false");
+	//	val=('true' | 'false');
 	public ExpressionGrammarAccess.BooleanLiteralElements getBooleanLiteralAccess() {
 		return gaExpression.getBooleanLiteralAccess();
 	}
@@ -1869,7 +1877,7 @@ public ParserRule getIntegerLiteralRule() {
 	}
 
 	//NullLiteral:
-	//	val="null";
+	//	val='null';
 	public ExpressionGrammarAccess.NullLiteralElements getNullLiteralAccess() {
 		return gaExpression.getNullLiteralAccess();
 	}
@@ -1899,7 +1907,7 @@ public ParserRule getStringLiteralRule() {
 	}
 
 	//terminal REAL:
-	//	"0".."9"* "." "0".."9"*;
+	//	'0'..'9'* '.' '0'..'9'*;
 	public TerminalRule getREALRule() {
 		return gaExpression.getREALRule();
 	} 
@@ -1907,9 +1915,8 @@ public TerminalRule getREALRule() {
 	////paranthesizedExpression returns [Expression e] :
 	//
 	////    '(' x=expression ')' {$e=factory.createParanthesizedExpression(x);};
-	// ParanthesizedExpression returns
-	//Expression:
-	//	"(" Expression ")";
+	// ParanthesizedExpression Expression:
+	//	'(' Expression ')';
 	public ExpressionGrammarAccess.ParanthesizedExpressionElements getParanthesizedExpressionAccess() {
 		return gaExpression.getParanthesizedExpressionAccess();
 	}
@@ -1922,7 +1929,7 @@ public ParserRule getParanthesizedExpressionRule() {
 	//
 	////    '(' x=expression ')' {$e=factory.createParanthesizedExpression(x);};
 	// GlobalVarExpression:
-	//	"GLOBALVAR" name=Identifier;
+	//	'GLOBALVAR' name=Identifier;
 	public ExpressionGrammarAccess.GlobalVarExpressionElements getGlobalVarExpressionAccess() {
 		return gaExpression.getGlobalVarExpressionAccess();
 	}
@@ -1948,7 +1955,7 @@ public ParserRule getFeatureCallRule() {
 	}
 
 	//OperationCall:
-	//	name=Identifier "(" (params+=Expression ("," params+=Expression)*)? ")";
+	//	name=Identifier '(' (params+=Expression (',' params+=Expression)*)? ')';
 	public ExpressionGrammarAccess.OperationCallElements getOperationCallAccess() {
 		return gaExpression.getOperationCallAccess();
 	}
@@ -1960,7 +1967,7 @@ public ParserRule getOperationCallRule() {
 	////listLiteral  returns [Expression e] :
 	// //	'{' (l=parameterList)? '}' {$e=factory.createListLiteral(l);};
 	// ListLiteral:
-	//	{ListLiteral} "{" (elements+=Expression ("," elements+=Expression)*)? "}";
+	//	{ListLiteral} '{' (elements+=Expression (',' elements+=Expression)*)? '}';
 	public ExpressionGrammarAccess.ListLiteralElements getListLiteralAccess() {
 		return gaExpression.getListLiteralAccess();
 	}
@@ -1974,7 +1981,7 @@ public ParserRule getListLiteralRule() {
 	//
 	////	{$e= factory.createConstructorCallExpression(t);};
 	// ConstructorCallExpression:
-	//	"new" type=SimpleType;
+	//	'new' type=SimpleType;
 	public ExpressionGrammarAccess.ConstructorCallExpressionElements getConstructorCallExpressionAccess() {
 		return gaExpression.getConstructorCallExpressionAccess();
 	}
@@ -2000,7 +2007,7 @@ public ParserRule getConstructorCallExpressionRule() {
 	//
 	//// { $e = factory.createCollectionExpression(id(name),var,x);};
 	// TypeSelectExpression:
-	//	name="typeSelect" "(" type=Type ")";
+	//	name='typeSelect' '(' type=Type ')';
 	public ExpressionGrammarAccess.TypeSelectExpressionElements getTypeSelectExpressionAccess() {
 		return gaExpression.getTypeSelectExpressionAccess();
 	}
@@ -2010,8 +2017,8 @@ public ParserRule getTypeSelectExpressionRule() {
 	}
 
 	//CollectionExpression:
-	//	name=("collect" | "select" | "selectFirst" | "reject" | "exists" | "notExists" | "sortBy" | "forAll") "("
-	//	(var=Identifier "|")? exp=Expression ")";
+	//	name=('collect' | 'select' | 'selectFirst' | 'reject' | 'exists' | 'notExists' | 'sortBy' | 'forAll') '('
+	//	(var=Identifier '|')? exp=Expression ')';
 	public ExpressionGrammarAccess.CollectionExpressionElements getCollectionExpressionAccess() {
 		return gaExpression.getCollectionExpressionAccess();
 	}
@@ -2023,7 +2030,7 @@ public ParserRule getCollectionExpressionRule() {
 	////type returns [Identifier id] :
 	// //	a = collectionType {$id=a;}|
 	// //	b = simpleType {$id=b;};
-	// Type returns Identifier:
+	// Type Identifier:
 	//	CollectionType | SimpleType;
 	public ExpressionGrammarAccess.TypeElements getTypeAccess() {
 		return gaExpression.getTypeAccess();
@@ -2037,9 +2044,8 @@ public ParserRule getTypeRule() {
 	// //  cl=( 'Collection' | 'List' | 'Set' ) {$id = id(cl);}
 	//
 	////  (b='[' id1=simpleType c=']' { $id.append(id(b));$id.append(id1);$id.append(id(c));})?;
-	// CollectionType returns
-	//Identifier:
-	//	cl=("Collection" | "List" | "Set") "[" id1=SimpleType "]";
+	// CollectionType Identifier:
+	//	cl=('Collection' | 'List' | 'Set') '[' id1=SimpleType ']';
 	public ExpressionGrammarAccess.CollectionTypeElements getCollectionTypeAccess() {
 		return gaExpression.getCollectionTypeAccess();
 	}
@@ -2052,8 +2058,8 @@ public ParserRule getCollectionTypeRule() {
 	// //	x=identifier {$id=x;}
 	//
 	////	(d='::' end=identifier  {$id.append(id(d)); $id.append(end);})*;
-	// SimpleType returns Identifier:
-	//	id+=Identifier ("::" id+=Identifier)*;
+	// SimpleType Identifier:
+	//	id+=Identifier ('::' id+=Identifier)*;
 	public ExpressionGrammarAccess.SimpleTypeElements getSimpleTypeAccess() {
 		return gaExpression.getSimpleTypeAccess();
 	}
@@ -2062,7 +2068,7 @@ public ParserRule getSimpleTypeRule() {
 		return getSimpleTypeAccess().getRule();
 	}
 
-	//Identifier returns ecore::EString:
+	//Identifier:
 	//	ID;
 	public ExpressionGrammarAccess.IdentifierElements getIdentifierAccess() {
 		return gaExpression.getIdentifierAccess();
@@ -2073,45 +2079,44 @@ public ParserRule getIdentifierRule() {
 	}
 
 	//terminal ID:
-	//	"^"? ("a".."z" | "A".."Z" | "_") ("a".."z" | "A".."Z" | "_" | "0".."9")*;
+	//	'^'? ('a'..'z' | 'A'..'Z' | '_') ('a'..'z' | 'A'..'Z' | '_' | '0'..'9')*;
 	public TerminalRule getIDRule() {
-		return gaExpression.getIDRule();
+		return gaTerminals.getIDRule();
 	} 
 
 	//terminal INT returns ecore::EInt:
-	//	"0".."9"+;
+	//	'0'..'9'+;
 	public TerminalRule getINTRule() {
-		return gaExpression.getINTRule();
+		return gaTerminals.getINTRule();
 	} 
 
 	//terminal STRING:
-	//	"\"" ("\\" . / * 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' * / | !("\\" | "\""))* "\"" | "\'" ("\\" .
-	//	/ * 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' * / | !("\\" | "\'"))* "\'";
+	//	'"' ('\\' . | !('\\' | '"'))* '"' | "'" ('\\' . | !('\\' | "'"))* "'";
 	public TerminalRule getSTRINGRule() {
-		return gaExpression.getSTRINGRule();
+		return gaTerminals.getSTRINGRule();
 	} 
 
 	//terminal ML_COMMENT:
-	//	"/ *"->"* /";
+	//	'/*'->'*/';
 	public TerminalRule getML_COMMENTRule() {
-		return gaExpression.getML_COMMENTRule();
+		return gaTerminals.getML_COMMENTRule();
 	} 
 
 	//terminal SL_COMMENT:
-	//	"//" !("\n" | "\r")* ("\r"? "\n")?;
+	//	'//' !('\n' | '\r')* ('\r'? '\n')?;
 	public TerminalRule getSL_COMMENTRule() {
-		return gaExpression.getSL_COMMENTRule();
+		return gaTerminals.getSL_COMMENTRule();
 	} 
 
 	//terminal WS:
-	//	(" " | "\t" | "\r" | "\n")+;
+	//	' ' | '\t' | '\r' | '\n'+;
 	public TerminalRule getWSRule() {
-		return gaExpression.getWSRule();
+		return gaTerminals.getWSRule();
 	} 
 
 	//terminal ANY_OTHER:
 	//	.;
 	public TerminalRule getANY_OTHERRule() {
-		return gaExpression.getANY_OTHERRule();
+		return gaTerminals.getANY_OTHERRule();
 	} 
 }
diff --git a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/ui/occurrences/AbstractOccurrencesTest.java b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/ui/occurrences/AbstractOccurrencesTest.java
index b08906fd0..6caaadb27 100644
--- a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/ui/occurrences/AbstractOccurrencesTest.java
+++ b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/ui/occurrences/AbstractOccurrencesTest.java
@@ -174,7 +174,7 @@ public void tearDownJobListener() {
   private final DefaultCondition occurenceJobCondition = new DefaultCondition() {
     @Override
     public boolean test() {
-      return jobChangeListener.isJobDone(Messages.OccurrenceMarker_MarkOccurenceJob_title);
+      return jobChangeListener.isJobDone(Messages.OccurrenceMarker_MarkOccurrenceJob_title);
     }
 
     @Override
@@ -198,7 +198,7 @@ public void testOccurrences() throws BadLocationException {
     OccurrencesToCheck occurrencesMap = (OccurrencesToCheck) getTestInformation().getTestObject(OccurrencesToCheck.class);
 
     IEditorPart editorPart = editorBot.getReference().getEditor(true);
-    ITextEditor editor = (ITextEditor) editorPart.getAdapter(ITextEditor.class);
+    ITextEditor editor = editorPart.getAdapter(ITextEditor.class);
     IDocumentProvider provider = editor.getDocumentProvider();
     IDocument document = provider.getDocument(editorPart.getEditorInput());
     int cursorLine = document.getLineOfOffset(occurrencesMap.cursorOffset);
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/FormatterTestLanguage.xtextbin b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/FormatterTestLanguage.xtextbin
index c8f0af9f8b44a8121af09421fa461d858da2efd7..5d6931e67043137b33bba60e59aa24666100fa5f 100644
GIT binary patch
delta 42
ycmcbjdPQ}EHm^9FNJ?s2W?pKsM`lV&YF<cwc4}TRBl~10-qnn3o8R$1V*vm^L=N5n

delta 42
ycmcbjdPQ}EHm^9VNJ?s2W?pKsM`lV&YF<cwc4}TRBim#r-qnn(o8R$1V*vm^5Dwb_

diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/FormatterTestLanguageStandaloneSetupGenerated.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/FormatterTestLanguageStandaloneSetupGenerated.java
index 4360ef726..a718ac88c 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/FormatterTestLanguageStandaloneSetupGenerated.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/FormatterTestLanguageStandaloneSetupGenerated.java
@@ -4,8 +4,8 @@
 package com.avaloq.tools.ddk.xtext.formatter;
 
 import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.xtext.ISetup;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.xtext.ISetup;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/Assign.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/Assign.java
index 35458ecb9..9e6f345f6 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/Assign.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/Assign.java
@@ -11,12 +11,12 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.Assign#getVar <em>Var</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.Assign#getOp <em>Op</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.Assign#getVal <em>Val</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.FormatterTestLanguagePackage#getAssign()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/Datatypes.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/Datatypes.java
index 77548fe3f..cce0bf7f5 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/Datatypes.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/Datatypes.java
@@ -10,12 +10,12 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.Datatypes#getVal1 <em>Val1</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.Datatypes#getVal2 <em>Val2</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.Datatypes#getVal3 <em>Val3</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.FormatterTestLanguagePackage#getDatatypes()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/Decl.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/Decl.java
index ac5fd280b..00e8570a2 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/Decl.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/Decl.java
@@ -11,11 +11,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.Decl#getType <em>Type</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.Decl#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.FormatterTestLanguagePackage#getDecl()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/Enum1.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/Enum1.java
index e07e17b0c..1a68624a7 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/Enum1.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/Enum1.java
@@ -120,6 +120,8 @@ public enum Enum1 implements Enumerator
    * Returns the '<em><b>Enum1</b></em>' literal with the specified literal value.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @param literal the literal.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static Enum1 get(String literal)
@@ -139,6 +141,8 @@ public static Enum1 get(String literal)
    * Returns the '<em><b>Enum1</b></em>' literal with the specified name.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @param name the name.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static Enum1 getByName(String name)
@@ -158,6 +162,8 @@ public static Enum1 getByName(String name)
    * Returns the '<em><b>Enum1</b></em>' literal with the specified integer value.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @param value the integer value.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static Enum1 get(int value)
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/Enumeration.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/Enumeration.java
index 1edab1828..10f4088d3 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/Enumeration.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/Enumeration.java
@@ -11,10 +11,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.Enumeration#getVal <em>Val</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.FormatterTestLanguagePackage#getEnumeration()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/FqnObj.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/FqnObj.java
index 506d9c6bb..81534f752 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/FqnObj.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/FqnObj.java
@@ -10,10 +10,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.FqnObj#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.FormatterTestLanguagePackage#getFqnObj()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/FqnRef.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/FqnRef.java
index fdf09fb03..22e780e4c 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/FqnRef.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/FqnRef.java
@@ -10,10 +10,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.FqnRef#getRef <em>Ref</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.FormatterTestLanguagePackage#getFqnRef()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/Meth.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/Meth.java
index 3ed1ed936..6b2801fe7 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/Meth.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/Meth.java
@@ -11,11 +11,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.Meth#getName <em>Name</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.Meth#getParam <em>Param</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.FormatterTestLanguagePackage#getMeth()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/Param.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/Param.java
index ad213e8e0..6ed90cab6 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/Param.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/Param.java
@@ -13,11 +13,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.Param#getName <em>Name</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.Param#getType <em>Type</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.FormatterTestLanguagePackage#getParam()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/Space.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/Space.java
index fd324d4a6..c9957d2d9 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/Space.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/Space.java
@@ -10,10 +10,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.Space#getVal <em>Val</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.FormatterTestLanguagePackage#getSpace()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/SuppressedHidden.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/SuppressedHidden.java
index 1edf57539..397e58106 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/SuppressedHidden.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/SuppressedHidden.java
@@ -11,10 +11,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.SuppressedHidden#getVals <em>Vals</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.FormatterTestLanguagePackage#getSuppressedHidden()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/SuppressedHiddenSub.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/SuppressedHiddenSub.java
index e08439859..e66dbc7e1 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/SuppressedHiddenSub.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/SuppressedHiddenSub.java
@@ -11,10 +11,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.SuppressedHiddenSub#getIdval <em>Idval</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.FormatterTestLanguagePackage#getSuppressedHiddenSub()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/TestColumn.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/TestColumn.java
index fcc1c7ccc..3237562b7 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/TestColumn.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/TestColumn.java
@@ -11,11 +11,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.TestColumn#getName <em>Name</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.TestColumn#getItems <em>Items</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.FormatterTestLanguagePackage#getTestColumn()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/TestIndentation.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/TestIndentation.java
index 33ff0c801..87095d4e3 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/TestIndentation.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/TestIndentation.java
@@ -11,12 +11,12 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.TestIndentation#getSub <em>Sub</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.TestIndentation#getItems <em>Items</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.TestIndentation#isSemi <em>Semi</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.FormatterTestLanguagePackage#getTestIndentation()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/TestLinewrap.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/TestLinewrap.java
index 2507db81b..ca92e82e7 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/TestLinewrap.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/TestLinewrap.java
@@ -11,10 +11,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.TestLinewrap#getItems <em>Items</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.FormatterTestLanguagePackage#getTestLinewrap()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/TestLinewrapMinMax.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/TestLinewrapMinMax.java
index 8dc58450f..b407f240d 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/TestLinewrapMinMax.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/TestLinewrapMinMax.java
@@ -11,10 +11,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.TestLinewrapMinMax#getItems <em>Items</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.FormatterTestLanguagePackage#getTestLinewrapMinMax()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/TestOffset.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/TestOffset.java
index 73f01228e..22a7594d3 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/TestOffset.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/TestOffset.java
@@ -10,12 +10,12 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.TestOffset#getValue <em>Value</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.TestOffset#getFirst <em>First</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.TestOffset#getSecond <em>Second</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.FormatterTestLanguagePackage#getTestOffset()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/TestRightPadding.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/TestRightPadding.java
index b719d6061..7726e4811 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/TestRightPadding.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/TestRightPadding.java
@@ -10,11 +10,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.TestRightPadding#getP1 <em>P1</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.TestRightPadding#getP2 <em>P2</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.FormatterTestLanguagePackage#getTestRightPadding()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/AssignImpl.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/AssignImpl.java
index fad60da98..0d14ae530 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/AssignImpl.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/AssignImpl.java
@@ -23,12 +23,12 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.impl.AssignImpl#getVar <em>Var</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.impl.AssignImpl#getOp <em>Op</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.impl.AssignImpl#getVal <em>Val</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/DatatypesImpl.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/DatatypesImpl.java
index 58b67ec44..0de3c19d4 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/DatatypesImpl.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/DatatypesImpl.java
@@ -17,12 +17,12 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.impl.DatatypesImpl#getVal1 <em>Val1</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.impl.DatatypesImpl#getVal2 <em>Val2</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.impl.DatatypesImpl#getVal3 <em>Val3</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/DeclImpl.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/DeclImpl.java
index c61b30769..d22ee5b18 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/DeclImpl.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/DeclImpl.java
@@ -19,11 +19,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.impl.DeclImpl#getType <em>Type</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.impl.DeclImpl#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/EnumerationImpl.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/EnumerationImpl.java
index 88d9caa67..cbf956abc 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/EnumerationImpl.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/EnumerationImpl.java
@@ -20,10 +20,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.impl.EnumerationImpl#getVal <em>Val</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/FqnObjImpl.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/FqnObjImpl.java
index b6205c9bc..f9a979a19 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/FqnObjImpl.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/FqnObjImpl.java
@@ -17,10 +17,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.impl.FqnObjImpl#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/FqnRefImpl.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/FqnRefImpl.java
index 4dff940f2..e272d376b 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/FqnRefImpl.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/FqnRefImpl.java
@@ -19,10 +19,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.impl.FqnRefImpl#getRef <em>Ref</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/LineImpl.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/LineImpl.java
index e57e7fe5f..f8f088176 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/LineImpl.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/LineImpl.java
@@ -13,8 +13,6 @@
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Line</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/MethImpl.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/MethImpl.java
index 85eb9126c..8c5732828 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/MethImpl.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/MethImpl.java
@@ -27,11 +27,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.impl.MethImpl#getName <em>Name</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.impl.MethImpl#getParam <em>Param</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/ParamImpl.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/ParamImpl.java
index 4823792e4..5568be72b 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/ParamImpl.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/ParamImpl.java
@@ -21,11 +21,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.impl.ParamImpl#getName <em>Name</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.impl.ParamImpl#getType <em>Type</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/RootImpl.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/RootImpl.java
index 857ec191b..a7d5a5bb2 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/RootImpl.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/RootImpl.java
@@ -13,8 +13,6 @@
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Root</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/SpaceImpl.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/SpaceImpl.java
index ecedcd964..302b1715b 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/SpaceImpl.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/SpaceImpl.java
@@ -17,10 +17,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.impl.SpaceImpl#getVal <em>Val</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/SuppressedHiddenImpl.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/SuppressedHiddenImpl.java
index 3cf5d269b..f23e9d78c 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/SuppressedHiddenImpl.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/SuppressedHiddenImpl.java
@@ -24,10 +24,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.impl.SuppressedHiddenImpl#getVals <em>Vals</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/SuppressedHiddenSubIDImpl.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/SuppressedHiddenSubIDImpl.java
index f252f6033..82a0b8f08 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/SuppressedHiddenSubIDImpl.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/SuppressedHiddenSubIDImpl.java
@@ -11,8 +11,6 @@
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Suppressed Hidden Sub ID</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/SuppressedHiddenSubImpl.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/SuppressedHiddenSubImpl.java
index 1446bddb1..856f10308 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/SuppressedHiddenSubImpl.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/SuppressedHiddenSubImpl.java
@@ -18,10 +18,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.impl.SuppressedHiddenSubImpl#getIdval <em>Idval</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/SuppressedHiddenSubSubImpl.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/SuppressedHiddenSubSubImpl.java
index ebf845088..e77a1d7f9 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/SuppressedHiddenSubSubImpl.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/SuppressedHiddenSubSubImpl.java
@@ -11,8 +11,6 @@
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Suppressed Hidden Sub Sub</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/TestColumnImpl.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/TestColumnImpl.java
index 04c1c3fef..255b2c3a4 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/TestColumnImpl.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/TestColumnImpl.java
@@ -27,11 +27,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.impl.TestColumnImpl#getName <em>Name</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.impl.TestColumnImpl#getItems <em>Items</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/TestIndentationImpl.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/TestIndentationImpl.java
index fb42d41c5..c24f06519 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/TestIndentationImpl.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/TestIndentationImpl.java
@@ -27,12 +27,12 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.impl.TestIndentationImpl#getSub <em>Sub</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.impl.TestIndentationImpl#getItems <em>Items</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.impl.TestIndentationImpl#isSemi <em>Semi</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/TestLinewrapImpl.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/TestLinewrapImpl.java
index db316cfe0..857932c48 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/TestLinewrapImpl.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/TestLinewrapImpl.java
@@ -24,10 +24,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.impl.TestLinewrapImpl#getItems <em>Items</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/TestLinewrapMinMaxImpl.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/TestLinewrapMinMaxImpl.java
index 94bed05a3..7e386e2a1 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/TestLinewrapMinMaxImpl.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/TestLinewrapMinMaxImpl.java
@@ -24,10 +24,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.impl.TestLinewrapMinMaxImpl#getItems <em>Items</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/TestOffsetImpl.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/TestOffsetImpl.java
index fb774eec6..5470dba85 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/TestOffsetImpl.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/TestOffsetImpl.java
@@ -17,12 +17,12 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.impl.TestOffsetImpl#getValue <em>Value</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.impl.TestOffsetImpl#getFirst <em>First</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.impl.TestOffsetImpl#getSecond <em>Second</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/TestRightPaddingImpl.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/TestRightPaddingImpl.java
index 23191491a..46b8e7fea 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/TestRightPaddingImpl.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/TestRightPaddingImpl.java
@@ -17,11 +17,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.impl.TestRightPaddingImpl#getP1 <em>P1</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.impl.TestRightPaddingImpl#getP2 <em>P2</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/util/FormatterTestLanguageSwitch.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/util/FormatterTestLanguageSwitch.java
index a818e4324..3db8751d9 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/util/FormatterTestLanguageSwitch.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/util/FormatterTestLanguageSwitch.java
@@ -50,7 +50,7 @@ public FormatterTestLanguageSwitch()
    * Checks whether this is a switch for the given package.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @parameter ePackage the package in question.
+   * @param ePackage the package in question.
    * @return whether this is a switch for the given package.
    * @generated
    */
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g
index cd5a6d333..a67499f82 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g
@@ -294,7 +294,7 @@ ruleDecl returns [EObject current=null]
        			$current, 
        			"type",
         		lv_type_0_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -312,7 +312,7 @@ ruleDecl returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -351,7 +351,7 @@ ruleAssign returns [EObject current=null]
        			$current, 
        			"var",
         		lv_var_0_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -403,7 +403,7 @@ ruleAssign returns [EObject current=null]
        			$current, 
        			"val",
         		lv_val_3_0, 
-        		"INT");
+        		"org.eclipse.xtext.common.Terminals.INT");
 	    }
 
 )
@@ -425,7 +425,7 @@ ruleAssign returns [EObject current=null]
        			$current, 
        			"val",
         		lv_val_5_0, 
-        		"INT");
+        		"org.eclipse.xtext.common.Terminals.INT");
 	    }
 
 )
@@ -472,7 +472,7 @@ ruleMeth returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -493,7 +493,7 @@ ruleMeth returns [EObject current=null]
        			$current, 
        			"param",
         		lv_param_3_0, 
-        		"Param");
+        		"com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.Param");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -515,7 +515,7 @@ ruleMeth returns [EObject current=null]
        			$current, 
        			"param",
         		lv_param_5_0, 
-        		"Param");
+        		"com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.Param");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -559,7 +559,7 @@ ruleParam returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_0_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -581,7 +581,7 @@ ruleParam returns [EObject current=null]
        			$current, 
        			"type",
         		lv_type_2_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -624,7 +624,7 @@ ruleSpace returns [EObject current=null]
        			$current, 
        			"val",
         		lv_val_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -672,7 +672,7 @@ ruleTestLinewrap returns [EObject current=null]
        			$current, 
        			"items",
         		lv_items_2_0, 
-        		"Line");
+        		"com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.Line");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -721,7 +721,7 @@ ruleTestLinewrapMinMax returns [EObject current=null]
        			$current, 
        			"items",
         		lv_items_2_0, 
-        		"Line");
+        		"com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.Line");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -774,7 +774,7 @@ ruleTestIndentation returns [EObject current=null]
        			$current, 
        			"sub",
         		lv_sub_3_0, 
-        		"TestIndentation");
+        		"com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.TestIndentation");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -793,7 +793,7 @@ ruleTestIndentation returns [EObject current=null]
        			$current, 
        			"items",
         		lv_items_4_0, 
-        		"Line");
+        		"com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.Line");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -862,7 +862,7 @@ ruleTestColumn returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_2_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -883,7 +883,7 @@ ruleTestColumn returns [EObject current=null]
        			$current, 
        			"items",
         		lv_items_4_0, 
-        		"Line");
+        		"com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.Line");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -937,7 +937,7 @@ ruleTestOffset returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_3_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -959,7 +959,7 @@ ruleTestOffset returns [EObject current=null]
        			$current, 
        			"first",
         		lv_first_5_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -977,7 +977,7 @@ ruleTestOffset returns [EObject current=null]
        			$current, 
        			"second",
         		lv_second_6_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -1020,7 +1020,7 @@ ruleTestRightPadding returns [EObject current=null]
        			$current, 
        			"p1",
         		lv_p1_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -1038,7 +1038,7 @@ ruleTestRightPadding returns [EObject current=null]
        			$current, 
        			"p2",
         		lv_p2_2_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -1084,7 +1084,7 @@ ruleFqnObj returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"FQN");
+        		"com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.FQN");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1208,7 +1208,7 @@ ruleEnumeration returns [EObject current=null]
        			$current, 
        			"val",
         		lv_val_1_0, 
-        		"Enum1");
+        		"com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.Enum1");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1230,7 +1230,7 @@ ruleEnumeration returns [EObject current=null]
        			$current, 
        			"val",
         		lv_val_3_0, 
-        		"Enum1");
+        		"com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.Enum1");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1286,7 +1286,7 @@ ruleSuppressedHidden returns [EObject current=null]
        			$current, 
        			"vals",
         		lv_vals_2_0, 
-        		"SuppressedHiddenSub");
+        		"com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.SuppressedHiddenSub");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1308,7 +1308,7 @@ ruleSuppressedHidden returns [EObject current=null]
        			$current, 
        			"vals",
         		lv_vals_4_0, 
-        		"SuppressedHiddenSub");
+        		"com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.SuppressedHiddenSub");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1406,7 +1406,7 @@ ruleSuppressedHiddenSubSub returns [EObject current=null]
        			$current, 
        			"idval",
         		lv_idval_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -1452,7 +1452,7 @@ ruleSuppressedHiddenSubID returns [EObject current=null]
        			$current, 
        			"idval",
         		lv_idval_0_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -1590,7 +1590,7 @@ ruleDatatypes returns [EObject current=null]
        			$current, 
        			"val1",
         		lv_val1_1_0, 
-        		"Datatype1");
+        		"com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.Datatype1");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1612,7 +1612,7 @@ ruleDatatypes returns [EObject current=null]
        			$current, 
        			"val2",
         		lv_val2_3_0, 
-        		"Datatype2");
+        		"com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.Datatype2");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1630,7 +1630,7 @@ ruleDatatypes returns [EObject current=null]
        			$current, 
        			"val3",
         		lv_val3_4_0, 
-        		"Datatype3");
+        		"com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.Datatype3");
 	        afterParserOrEnumRuleCall();
 	    }
 
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguageLexer.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguageLexer.java
index 5e6396b82..693fbfa08 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguageLexer.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguageLexer.java
@@ -70,15 +70,15 @@ public InternalFormatterTestLanguageLexer(CharStream input, RecognizerSharedStat
         super(input,state);
 
     }
-    public String getGrammarFileName() { return "../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g"; }
+    public String getGrammarFileName() { return "InternalFormatterTestLanguage.g"; }
 
     // $ANTLR start "T__11"
     public final void mT__11() throws RecognitionException {
         try {
             int _type = T__11;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:11:7: ( 'test' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:11:9: 'test'
+            // InternalFormatterTestLanguage.g:11:7: ( 'test' )
+            // InternalFormatterTestLanguage.g:11:9: 'test'
             {
             match("test"); 
 
@@ -98,8 +98,8 @@ public final void mT__12() throws RecognitionException {
         try {
             int _type = T__12;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:12:7: ( 'post' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:12:9: 'post'
+            // InternalFormatterTestLanguage.g:12:7: ( 'post' )
+            // InternalFormatterTestLanguage.g:12:9: 'post'
             {
             match("post"); 
 
@@ -119,8 +119,8 @@ public final void mT__13() throws RecognitionException {
         try {
             int _type = T__13;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:13:7: ( ';' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:13:9: ';'
+            // InternalFormatterTestLanguage.g:13:7: ( ';' )
+            // InternalFormatterTestLanguage.g:13:9: ';'
             {
             match(';'); 
 
@@ -139,8 +139,8 @@ public final void mT__14() throws RecognitionException {
         try {
             int _type = T__14;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:14:7: ( '=' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:14:9: '='
+            // InternalFormatterTestLanguage.g:14:7: ( '=' )
+            // InternalFormatterTestLanguage.g:14:9: '='
             {
             match('='); 
 
@@ -159,8 +159,8 @@ public final void mT__15() throws RecognitionException {
         try {
             int _type = T__15;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:15:7: ( '+=' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:15:9: '+='
+            // InternalFormatterTestLanguage.g:15:7: ( '+=' )
+            // InternalFormatterTestLanguage.g:15:9: '+='
             {
             match("+="); 
 
@@ -180,8 +180,8 @@ public final void mT__16() throws RecognitionException {
         try {
             int _type = T__16;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:16:7: ( '[' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:16:9: '['
+            // InternalFormatterTestLanguage.g:16:7: ( '[' )
+            // InternalFormatterTestLanguage.g:16:9: '['
             {
             match('['); 
 
@@ -200,8 +200,8 @@ public final void mT__17() throws RecognitionException {
         try {
             int _type = T__17;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:17:7: ( ',' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:17:9: ','
+            // InternalFormatterTestLanguage.g:17:7: ( ',' )
+            // InternalFormatterTestLanguage.g:17:9: ','
             {
             match(','); 
 
@@ -220,8 +220,8 @@ public final void mT__18() throws RecognitionException {
         try {
             int _type = T__18;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:18:7: ( ']' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:18:9: ']'
+            // InternalFormatterTestLanguage.g:18:7: ( ']' )
+            // InternalFormatterTestLanguage.g:18:9: ']'
             {
             match(']'); 
 
@@ -240,8 +240,8 @@ public final void mT__19() throws RecognitionException {
         try {
             int _type = T__19;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:19:7: ( 'void' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:19:9: 'void'
+            // InternalFormatterTestLanguage.g:19:7: ( 'void' )
+            // InternalFormatterTestLanguage.g:19:9: 'void'
             {
             match("void"); 
 
@@ -261,8 +261,8 @@ public final void mT__20() throws RecognitionException {
         try {
             int _type = T__20;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:20:7: ( '(' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:20:9: '('
+            // InternalFormatterTestLanguage.g:20:7: ( '(' )
+            // InternalFormatterTestLanguage.g:20:9: '('
             {
             match('('); 
 
@@ -281,8 +281,8 @@ public final void mT__21() throws RecognitionException {
         try {
             int _type = T__21;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:21:7: ( ')' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:21:9: ')'
+            // InternalFormatterTestLanguage.g:21:7: ( ')' )
+            // InternalFormatterTestLanguage.g:21:9: ')'
             {
             match(')'); 
 
@@ -301,8 +301,8 @@ public final void mT__22() throws RecognitionException {
         try {
             int _type = T__22;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:22:7: ( ':' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:22:9: ':'
+            // InternalFormatterTestLanguage.g:22:7: ( ':' )
+            // InternalFormatterTestLanguage.g:22:9: ':'
             {
             match(':'); 
 
@@ -321,8 +321,8 @@ public final void mT__23() throws RecognitionException {
         try {
             int _type = T__23;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:23:7: ( 'space' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:23:9: 'space'
+            // InternalFormatterTestLanguage.g:23:7: ( 'space' )
+            // InternalFormatterTestLanguage.g:23:9: 'space'
             {
             match("space"); 
 
@@ -342,8 +342,8 @@ public final void mT__24() throws RecognitionException {
         try {
             int _type = T__24;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:24:7: ( 'linewrap' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:24:9: 'linewrap'
+            // InternalFormatterTestLanguage.g:24:7: ( 'linewrap' )
+            // InternalFormatterTestLanguage.g:24:9: 'linewrap'
             {
             match("linewrap"); 
 
@@ -363,8 +363,8 @@ public final void mT__25() throws RecognitionException {
         try {
             int _type = T__25;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:25:7: ( 'wrapminmax' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:25:9: 'wrapminmax'
+            // InternalFormatterTestLanguage.g:25:7: ( 'wrapminmax' )
+            // InternalFormatterTestLanguage.g:25:9: 'wrapminmax'
             {
             match("wrapminmax"); 
 
@@ -384,8 +384,8 @@ public final void mT__26() throws RecognitionException {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:26:7: ( 'indentation' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:26:9: 'indentation'
+            // InternalFormatterTestLanguage.g:26:7: ( 'indentation' )
+            // InternalFormatterTestLanguage.g:26:9: 'indentation'
             {
             match("indentation"); 
 
@@ -405,8 +405,8 @@ public final void mT__27() throws RecognitionException {
         try {
             int _type = T__27;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:27:7: ( '{' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:27:9: '{'
+            // InternalFormatterTestLanguage.g:27:7: ( '{' )
+            // InternalFormatterTestLanguage.g:27:9: '{'
             {
             match('{'); 
 
@@ -425,8 +425,8 @@ public final void mT__28() throws RecognitionException {
         try {
             int _type = T__28;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:28:7: ( '}' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:28:9: '}'
+            // InternalFormatterTestLanguage.g:28:7: ( '}' )
+            // InternalFormatterTestLanguage.g:28:9: '}'
             {
             match('}'); 
 
@@ -445,8 +445,8 @@ public final void mT__29() throws RecognitionException {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:29:7: ( 'column' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:29:9: 'column'
+            // InternalFormatterTestLanguage.g:29:7: ( 'column' )
+            // InternalFormatterTestLanguage.g:29:9: 'column'
             {
             match("column"); 
 
@@ -466,8 +466,8 @@ public final void mT__30() throws RecognitionException {
         try {
             int _type = T__30;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:30:7: ( 'item' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:30:9: 'item'
+            // InternalFormatterTestLanguage.g:30:7: ( 'item' )
+            // InternalFormatterTestLanguage.g:30:9: 'item'
             {
             match("item"); 
 
@@ -487,8 +487,8 @@ public final void mT__31() throws RecognitionException {
         try {
             int _type = T__31;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:31:7: ( 'offset' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:31:9: 'offset'
+            // InternalFormatterTestLanguage.g:31:7: ( 'offset' )
+            // InternalFormatterTestLanguage.g:31:9: 'offset'
             {
             match("offset"); 
 
@@ -508,8 +508,8 @@ public final void mT__32() throws RecognitionException {
         try {
             int _type = T__32;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:32:7: ( 'value' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:32:9: 'value'
+            // InternalFormatterTestLanguage.g:32:7: ( 'value' )
+            // InternalFormatterTestLanguage.g:32:9: 'value'
             {
             match("value"); 
 
@@ -529,8 +529,8 @@ public final void mT__33() throws RecognitionException {
         try {
             int _type = T__33;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:33:7: ( 'pair' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:33:9: 'pair'
+            // InternalFormatterTestLanguage.g:33:7: ( 'pair' )
+            // InternalFormatterTestLanguage.g:33:9: 'pair'
             {
             match("pair"); 
 
@@ -550,8 +550,8 @@ public final void mT__34() throws RecognitionException {
         try {
             int _type = T__34;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:34:7: ( 'padding' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:34:9: 'padding'
+            // InternalFormatterTestLanguage.g:34:7: ( 'padding' )
+            // InternalFormatterTestLanguage.g:34:9: 'padding'
             {
             match("padding"); 
 
@@ -571,8 +571,8 @@ public final void mT__35() throws RecognitionException {
         try {
             int _type = T__35;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:35:7: ( 'fqn' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:35:9: 'fqn'
+            // InternalFormatterTestLanguage.g:35:7: ( 'fqn' )
+            // InternalFormatterTestLanguage.g:35:9: 'fqn'
             {
             match("fqn"); 
 
@@ -592,8 +592,8 @@ public final void mT__36() throws RecognitionException {
         try {
             int _type = T__36;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:36:7: ( '.' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:36:9: '.'
+            // InternalFormatterTestLanguage.g:36:7: ( '.' )
+            // InternalFormatterTestLanguage.g:36:9: '.'
             {
             match('.'); 
 
@@ -612,8 +612,8 @@ public final void mT__37() throws RecognitionException {
         try {
             int _type = T__37;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:37:7: ( 'fqnref' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:37:9: 'fqnref'
+            // InternalFormatterTestLanguage.g:37:7: ( 'fqnref' )
+            // InternalFormatterTestLanguage.g:37:9: 'fqnref'
             {
             match("fqnref"); 
 
@@ -633,8 +633,8 @@ public final void mT__38() throws RecognitionException {
         try {
             int _type = T__38;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:38:7: ( 'enum' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:38:9: 'enum'
+            // InternalFormatterTestLanguage.g:38:7: ( 'enum' )
+            // InternalFormatterTestLanguage.g:38:9: 'enum'
             {
             match("enum"); 
 
@@ -654,8 +654,8 @@ public final void mT__39() throws RecognitionException {
         try {
             int _type = T__39;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:39:7: ( '`' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:39:9: '`'
+            // InternalFormatterTestLanguage.g:39:7: ( '`' )
+            // InternalFormatterTestLanguage.g:39:9: '`'
             {
             match('`'); 
 
@@ -674,8 +674,8 @@ public final void mT__40() throws RecognitionException {
         try {
             int _type = T__40;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:40:7: ( '%' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:40:9: '%'
+            // InternalFormatterTestLanguage.g:40:7: ( '%' )
+            // InternalFormatterTestLanguage.g:40:9: '%'
             {
             match('%'); 
 
@@ -694,8 +694,8 @@ public final void mT__41() throws RecognitionException {
         try {
             int _type = T__41;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:41:7: ( '<' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:41:9: '<'
+            // InternalFormatterTestLanguage.g:41:7: ( '<' )
+            // InternalFormatterTestLanguage.g:41:9: '<'
             {
             match('<'); 
 
@@ -714,8 +714,8 @@ public final void mT__42() throws RecognitionException {
         try {
             int _type = T__42;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:42:7: ( '>' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:42:9: '>'
+            // InternalFormatterTestLanguage.g:42:7: ( '>' )
+            // InternalFormatterTestLanguage.g:42:9: '>'
             {
             match('>'); 
 
@@ -734,8 +734,8 @@ public final void mT__43() throws RecognitionException {
         try {
             int _type = T__43;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:43:7: ( 'datatypes' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:43:9: 'datatypes'
+            // InternalFormatterTestLanguage.g:43:7: ( 'datatypes' )
+            // InternalFormatterTestLanguage.g:43:9: 'datatypes'
             {
             match("datatypes"); 
 
@@ -755,8 +755,8 @@ public final void mT__44() throws RecognitionException {
         try {
             int _type = T__44;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:44:7: ( 'kw1' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:44:9: 'kw1'
+            // InternalFormatterTestLanguage.g:44:7: ( 'kw1' )
+            // InternalFormatterTestLanguage.g:44:9: 'kw1'
             {
             match("kw1"); 
 
@@ -776,8 +776,8 @@ public final void mT__45() throws RecognitionException {
         try {
             int _type = T__45;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:45:7: ( 'kw3' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:45:9: 'kw3'
+            // InternalFormatterTestLanguage.g:45:7: ( 'kw3' )
+            // InternalFormatterTestLanguage.g:45:9: 'kw3'
             {
             match("kw3"); 
 
@@ -797,8 +797,8 @@ public final void mT__46() throws RecognitionException {
         try {
             int _type = T__46;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:46:7: ( 'lit1' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:46:9: 'lit1'
+            // InternalFormatterTestLanguage.g:46:7: ( 'lit1' )
+            // InternalFormatterTestLanguage.g:46:9: 'lit1'
             {
             match("lit1"); 
 
@@ -818,8 +818,8 @@ public final void mT__47() throws RecognitionException {
         try {
             int _type = T__47;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:47:7: ( 'lit2' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:47:9: 'lit2'
+            // InternalFormatterTestLanguage.g:47:7: ( 'lit2' )
+            // InternalFormatterTestLanguage.g:47:9: 'lit2'
             {
             match("lit2"); 
 
@@ -839,8 +839,8 @@ public final void mT__48() throws RecognitionException {
         try {
             int _type = T__48;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:48:7: ( 'lit3' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:48:9: 'lit3'
+            // InternalFormatterTestLanguage.g:48:7: ( 'lit3' )
+            // InternalFormatterTestLanguage.g:48:9: 'lit3'
             {
             match("lit3"); 
 
@@ -860,10 +860,10 @@ public final void mRULE_ID() throws RecognitionException {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1674:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1674:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalFormatterTestLanguage.g:1674:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+            // InternalFormatterTestLanguage.g:1674:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1674:11: ( '^' )?
+            // InternalFormatterTestLanguage.g:1674:11: ( '^' )?
             int alt1=2;
             int LA1_0 = input.LA(1);
 
@@ -872,7 +872,7 @@ public final void mRULE_ID() throws RecognitionException {
             }
             switch (alt1) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1674:11: '^'
+                    // InternalFormatterTestLanguage.g:1674:11: '^'
                     {
                     match('^'); 
 
@@ -890,7 +890,7 @@ public final void mRULE_ID() throws RecognitionException {
                 recover(mse);
                 throw mse;}
 
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1674:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalFormatterTestLanguage.g:1674:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             loop2:
             do {
                 int alt2=2;
@@ -903,7 +903,7 @@ public final void mRULE_ID() throws RecognitionException {
 
                 switch (alt2) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:
+            	    // InternalFormatterTestLanguage.g:
             	    {
             	    if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
             	        input.consume();
@@ -939,10 +939,10 @@ public final void mRULE_INT() throws RecognitionException {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1676:10: ( ( '0' .. '9' )+ )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1676:12: ( '0' .. '9' )+
+            // InternalFormatterTestLanguage.g:1676:10: ( ( '0' .. '9' )+ )
+            // InternalFormatterTestLanguage.g:1676:12: ( '0' .. '9' )+
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1676:12: ( '0' .. '9' )+
+            // InternalFormatterTestLanguage.g:1676:12: ( '0' .. '9' )+
             int cnt3=0;
             loop3:
             do {
@@ -956,7 +956,7 @@ public final void mRULE_INT() throws RecognitionException {
 
                 switch (alt3) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1676:13: '0' .. '9'
+            	    // InternalFormatterTestLanguage.g:1676:13: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -988,10 +988,10 @@ public final void mRULE_STRING() throws RecognitionException {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1678:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1678:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalFormatterTestLanguage.g:1678:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+            // InternalFormatterTestLanguage.g:1678:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1678:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalFormatterTestLanguage.g:1678:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             int alt6=2;
             int LA6_0 = input.LA(1);
 
@@ -1009,10 +1009,10 @@ else if ( (LA6_0=='\'') ) {
             }
             switch (alt6) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1678:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+                    // InternalFormatterTestLanguage.g:1678:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
                     {
                     match('\"'); 
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1678:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // InternalFormatterTestLanguage.g:1678:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop4:
                     do {
                         int alt4=3;
@@ -1028,7 +1028,7 @@ else if ( ((LA4_0>='\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=
 
                         switch (alt4) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1678:21: '\\\\' .
+                    	    // InternalFormatterTestLanguage.g:1678:21: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -1036,7 +1036,7 @@ else if ( ((LA4_0>='\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1678:28: ~ ( ( '\\\\' | '\"' ) )
+                    	    // InternalFormatterTestLanguage.g:1678:28: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -1061,10 +1061,10 @@ else if ( ((LA4_0>='\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1678:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+                    // InternalFormatterTestLanguage.g:1678:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
                     {
                     match('\''); 
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1678:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // InternalFormatterTestLanguage.g:1678:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop5:
                     do {
                         int alt5=3;
@@ -1080,7 +1080,7 @@ else if ( ((LA5_0>='\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=
 
                         switch (alt5) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1678:54: '\\\\' .
+                    	    // InternalFormatterTestLanguage.g:1678:54: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -1088,7 +1088,7 @@ else if ( ((LA5_0>='\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1678:61: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // InternalFormatterTestLanguage.g:1678:61: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -1131,12 +1131,12 @@ public final void mRULE_ML_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1680:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1680:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalFormatterTestLanguage.g:1680:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalFormatterTestLanguage.g:1680:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1680:24: ( options {greedy=false; } : . )*
+            // InternalFormatterTestLanguage.g:1680:24: ( options {greedy=false; } : . )*
             loop7:
             do {
                 int alt7=2;
@@ -1161,7 +1161,7 @@ else if ( ((LA7_0>='\u0000' && LA7_0<=')')||(LA7_0>='+' && LA7_0<='\uFFFF')) ) {
 
                 switch (alt7) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1680:52: .
+            	    // InternalFormatterTestLanguage.g:1680:52: .
             	    {
             	    matchAny(); 
 
@@ -1191,12 +1191,12 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1682:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1682:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalFormatterTestLanguage.g:1682:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalFormatterTestLanguage.g:1682:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1682:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // InternalFormatterTestLanguage.g:1682:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop8:
             do {
                 int alt8=2;
@@ -1209,7 +1209,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
 
                 switch (alt8) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1682:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // InternalFormatterTestLanguage.g:1682:24: ~ ( ( '\\n' | '\\r' ) )
             	    {
             	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
             	        input.consume();
@@ -1229,7 +1229,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
                 }
             } while (true);
 
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1682:40: ( ( '\\r' )? '\\n' )?
+            // InternalFormatterTestLanguage.g:1682:40: ( ( '\\r' )? '\\n' )?
             int alt10=2;
             int LA10_0 = input.LA(1);
 
@@ -1238,9 +1238,9 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
             }
             switch (alt10) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1682:41: ( '\\r' )? '\\n'
+                    // InternalFormatterTestLanguage.g:1682:41: ( '\\r' )? '\\n'
                     {
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1682:41: ( '\\r' )?
+                    // InternalFormatterTestLanguage.g:1682:41: ( '\\r' )?
                     int alt9=2;
                     int LA9_0 = input.LA(1);
 
@@ -1249,7 +1249,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
                     }
                     switch (alt9) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1682:41: '\\r'
+                            // InternalFormatterTestLanguage.g:1682:41: '\\r'
                             {
                             match('\r'); 
 
@@ -1281,10 +1281,10 @@ public final void mRULE_WS() throws RecognitionException {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1684:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1684:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalFormatterTestLanguage.g:1684:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalFormatterTestLanguage.g:1684:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1684:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalFormatterTestLanguage.g:1684:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt11=0;
             loop11:
             do {
@@ -1298,7 +1298,7 @@ public final void mRULE_WS() throws RecognitionException {
 
                 switch (alt11) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:
+            	    // InternalFormatterTestLanguage.g:
             	    {
             	    if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
             	        input.consume();
@@ -1338,8 +1338,8 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1686:16: ( . )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1686:18: .
+            // InternalFormatterTestLanguage.g:1686:16: ( . )
+            // InternalFormatterTestLanguage.g:1686:18: .
             {
             matchAny(); 
 
@@ -1354,320 +1354,320 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:8: ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        // InternalFormatterTestLanguage.g:1:8: ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
         int alt12=45;
         alt12 = dfa12.predict(input);
         switch (alt12) {
             case 1 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:10: T__11
+                // InternalFormatterTestLanguage.g:1:10: T__11
                 {
                 mT__11(); 
 
                 }
                 break;
             case 2 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:16: T__12
+                // InternalFormatterTestLanguage.g:1:16: T__12
                 {
                 mT__12(); 
 
                 }
                 break;
             case 3 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:22: T__13
+                // InternalFormatterTestLanguage.g:1:22: T__13
                 {
                 mT__13(); 
 
                 }
                 break;
             case 4 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:28: T__14
+                // InternalFormatterTestLanguage.g:1:28: T__14
                 {
                 mT__14(); 
 
                 }
                 break;
             case 5 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:34: T__15
+                // InternalFormatterTestLanguage.g:1:34: T__15
                 {
                 mT__15(); 
 
                 }
                 break;
             case 6 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:40: T__16
+                // InternalFormatterTestLanguage.g:1:40: T__16
                 {
                 mT__16(); 
 
                 }
                 break;
             case 7 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:46: T__17
+                // InternalFormatterTestLanguage.g:1:46: T__17
                 {
                 mT__17(); 
 
                 }
                 break;
             case 8 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:52: T__18
+                // InternalFormatterTestLanguage.g:1:52: T__18
                 {
                 mT__18(); 
 
                 }
                 break;
             case 9 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:58: T__19
+                // InternalFormatterTestLanguage.g:1:58: T__19
                 {
                 mT__19(); 
 
                 }
                 break;
             case 10 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:64: T__20
+                // InternalFormatterTestLanguage.g:1:64: T__20
                 {
                 mT__20(); 
 
                 }
                 break;
             case 11 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:70: T__21
+                // InternalFormatterTestLanguage.g:1:70: T__21
                 {
                 mT__21(); 
 
                 }
                 break;
             case 12 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:76: T__22
+                // InternalFormatterTestLanguage.g:1:76: T__22
                 {
                 mT__22(); 
 
                 }
                 break;
             case 13 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:82: T__23
+                // InternalFormatterTestLanguage.g:1:82: T__23
                 {
                 mT__23(); 
 
                 }
                 break;
             case 14 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:88: T__24
+                // InternalFormatterTestLanguage.g:1:88: T__24
                 {
                 mT__24(); 
 
                 }
                 break;
             case 15 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:94: T__25
+                // InternalFormatterTestLanguage.g:1:94: T__25
                 {
                 mT__25(); 
 
                 }
                 break;
             case 16 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:100: T__26
+                // InternalFormatterTestLanguage.g:1:100: T__26
                 {
                 mT__26(); 
 
                 }
                 break;
             case 17 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:106: T__27
+                // InternalFormatterTestLanguage.g:1:106: T__27
                 {
                 mT__27(); 
 
                 }
                 break;
             case 18 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:112: T__28
+                // InternalFormatterTestLanguage.g:1:112: T__28
                 {
                 mT__28(); 
 
                 }
                 break;
             case 19 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:118: T__29
+                // InternalFormatterTestLanguage.g:1:118: T__29
                 {
                 mT__29(); 
 
                 }
                 break;
             case 20 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:124: T__30
+                // InternalFormatterTestLanguage.g:1:124: T__30
                 {
                 mT__30(); 
 
                 }
                 break;
             case 21 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:130: T__31
+                // InternalFormatterTestLanguage.g:1:130: T__31
                 {
                 mT__31(); 
 
                 }
                 break;
             case 22 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:136: T__32
+                // InternalFormatterTestLanguage.g:1:136: T__32
                 {
                 mT__32(); 
 
                 }
                 break;
             case 23 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:142: T__33
+                // InternalFormatterTestLanguage.g:1:142: T__33
                 {
                 mT__33(); 
 
                 }
                 break;
             case 24 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:148: T__34
+                // InternalFormatterTestLanguage.g:1:148: T__34
                 {
                 mT__34(); 
 
                 }
                 break;
             case 25 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:154: T__35
+                // InternalFormatterTestLanguage.g:1:154: T__35
                 {
                 mT__35(); 
 
                 }
                 break;
             case 26 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:160: T__36
+                // InternalFormatterTestLanguage.g:1:160: T__36
                 {
                 mT__36(); 
 
                 }
                 break;
             case 27 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:166: T__37
+                // InternalFormatterTestLanguage.g:1:166: T__37
                 {
                 mT__37(); 
 
                 }
                 break;
             case 28 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:172: T__38
+                // InternalFormatterTestLanguage.g:1:172: T__38
                 {
                 mT__38(); 
 
                 }
                 break;
             case 29 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:178: T__39
+                // InternalFormatterTestLanguage.g:1:178: T__39
                 {
                 mT__39(); 
 
                 }
                 break;
             case 30 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:184: T__40
+                // InternalFormatterTestLanguage.g:1:184: T__40
                 {
                 mT__40(); 
 
                 }
                 break;
             case 31 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:190: T__41
+                // InternalFormatterTestLanguage.g:1:190: T__41
                 {
                 mT__41(); 
 
                 }
                 break;
             case 32 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:196: T__42
+                // InternalFormatterTestLanguage.g:1:196: T__42
                 {
                 mT__42(); 
 
                 }
                 break;
             case 33 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:202: T__43
+                // InternalFormatterTestLanguage.g:1:202: T__43
                 {
                 mT__43(); 
 
                 }
                 break;
             case 34 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:208: T__44
+                // InternalFormatterTestLanguage.g:1:208: T__44
                 {
                 mT__44(); 
 
                 }
                 break;
             case 35 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:214: T__45
+                // InternalFormatterTestLanguage.g:1:214: T__45
                 {
                 mT__45(); 
 
                 }
                 break;
             case 36 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:220: T__46
+                // InternalFormatterTestLanguage.g:1:220: T__46
                 {
                 mT__46(); 
 
                 }
                 break;
             case 37 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:226: T__47
+                // InternalFormatterTestLanguage.g:1:226: T__47
                 {
                 mT__47(); 
 
                 }
                 break;
             case 38 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:232: T__48
+                // InternalFormatterTestLanguage.g:1:232: T__48
                 {
                 mT__48(); 
 
                 }
                 break;
             case 39 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:238: RULE_ID
+                // InternalFormatterTestLanguage.g:1:238: RULE_ID
                 {
                 mRULE_ID(); 
 
                 }
                 break;
             case 40 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:246: RULE_INT
+                // InternalFormatterTestLanguage.g:1:246: RULE_INT
                 {
                 mRULE_INT(); 
 
                 }
                 break;
             case 41 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:255: RULE_STRING
+                // InternalFormatterTestLanguage.g:1:255: RULE_STRING
                 {
                 mRULE_STRING(); 
 
                 }
                 break;
             case 42 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:267: RULE_ML_COMMENT
+                // InternalFormatterTestLanguage.g:1:267: RULE_ML_COMMENT
                 {
                 mRULE_ML_COMMENT(); 
 
                 }
                 break;
             case 43 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:283: RULE_SL_COMMENT
+                // InternalFormatterTestLanguage.g:1:283: RULE_SL_COMMENT
                 {
                 mRULE_SL_COMMENT(); 
 
                 }
                 break;
             case 44 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:299: RULE_WS
+                // InternalFormatterTestLanguage.g:1:299: RULE_WS
                 {
                 mRULE_WS(); 
 
                 }
                 break;
             case 45 :
-                // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1:307: RULE_ANY_OTHER
+                // InternalFormatterTestLanguage.g:1:307: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -1681,61 +1681,19 @@ public void mTokens() throws RecognitionException {
 
     protected DFA12 dfa12 = new DFA12(this);
     static final String DFA12_eotS =
-        "\1\uffff\2\47\2\uffff\1\45\3\uffff\1\47\3\uffff\4\47\2\uffff\3"+
-        "\47\1\uffff\1\47\4\uffff\2\47\1\45\2\uffff\3\45\2\uffff\1\47\1\uffff"+
-        "\2\47\6\uffff\2\47\3\uffff\5\47\2\uffff\3\47\1\uffff\1\47\4\uffff"+
-        "\2\47\5\uffff\16\47\1\160\2\47\1\163\1\164\1\165\1\166\1\167\1\47"+
-        "\1\171\3\47\1\175\1\176\1\177\2\47\1\u0082\3\47\1\uffff\1\u0086"+
-        "\1\47\5\uffff\1\47\1\uffff\1\u0089\1\u008a\1\47\3\uffff\2\47\1\uffff"+
-        "\3\47\1\uffff\2\47\2\uffff\3\47\1\u0096\1\u0097\1\u0098\1\47\1\u009a"+
-        "\3\47\3\uffff\1\47\1\uffff\1\u009f\3\47\1\uffff\2\47\1\u00a5\1\u00a6"+
-        "\1\47\2\uffff\1\u00a8\1\uffff";
+        "\1\uffff\2\47\2\uffff\1\45\3\uffff\1\47\3\uffff\4\47\2\uffff\3\47\1\uffff\1\47\4\uffff\2\47\1\45\2\uffff\3\45\2\uffff\1\47\1\uffff\2\47\6\uffff\2\47\3\uffff\5\47\2\uffff\3\47\1\uffff\1\47\4\uffff\2\47\5\uffff\16\47\1\160\2\47\1\163\1\164\1\165\1\166\1\167\1\47\1\171\3\47\1\175\1\176\1\177\2\47\1\u0082\3\47\1\uffff\1\u0086\1\47\5\uffff\1\47\1\uffff\1\u0089\1\u008a\1\47\3\uffff\2\47\1\uffff\3\47\1\uffff\2\47\2\uffff\3\47\1\u0096\1\u0097\1\u0098\1\47\1\u009a\3\47\3\uffff\1\47\1\uffff\1\u009f\3\47\1\uffff\2\47\1\u00a5\1\u00a6\1\47\2\uffff\1\u00a8\1\uffff";
     static final String DFA12_eofS =
         "\u00a9\uffff";
     static final String DFA12_minS =
-        "\1\0\1\145\1\141\2\uffff\1\75\3\uffff\1\141\3\uffff\1\160\1\151"+
-        "\1\162\1\156\2\uffff\1\157\1\146\1\161\1\uffff\1\156\4\uffff\1\141"+
-        "\1\167\1\101\2\uffff\2\0\1\52\2\uffff\1\163\1\uffff\1\163\1\144"+
-        "\6\uffff\1\151\1\154\3\uffff\1\141\1\156\1\141\1\144\1\145\2\uffff"+
-        "\1\154\1\146\1\156\1\uffff\1\165\4\uffff\1\164\1\61\5\uffff\2\164"+
-        "\1\162\2\144\1\165\1\143\1\145\1\61\1\160\1\145\1\155\1\165\1\163"+
-        "\1\60\1\155\1\141\5\60\1\151\1\60\2\145\1\167\3\60\1\155\1\156\1"+
-        "\60\1\155\2\145\1\uffff\1\60\1\164\5\uffff\1\156\1\uffff\2\60\1"+
-        "\162\3\uffff\1\151\1\164\1\uffff\1\156\1\164\1\146\1\uffff\1\171"+
-        "\1\147\2\uffff\1\141\1\156\1\141\3\60\1\160\1\60\1\160\1\155\1\164"+
-        "\3\uffff\1\145\1\uffff\1\60\1\141\1\151\1\163\1\uffff\1\170\1\157"+
-        "\2\60\1\156\2\uffff\1\60\1\uffff";
+        "\1\0\1\145\1\141\2\uffff\1\75\3\uffff\1\141\3\uffff\1\160\1\151\1\162\1\156\2\uffff\1\157\1\146\1\161\1\uffff\1\156\4\uffff\1\141\1\167\1\101\2\uffff\2\0\1\52\2\uffff\1\163\1\uffff\1\163\1\144\6\uffff\1\151\1\154\3\uffff\1\141\1\156\1\141\1\144\1\145\2\uffff\1\154\1\146\1\156\1\uffff\1\165\4\uffff\1\164\1\61\5\uffff\2\164\1\162\2\144\1\165\1\143\1\145\1\61\1\160\1\145\1\155\1\165\1\163\1\60\1\155\1\141\5\60\1\151\1\60\2\145\1\167\3\60\1\155\1\156\1\60\1\155\2\145\1\uffff\1\60\1\164\5\uffff\1\156\1\uffff\2\60\1\162\3\uffff\1\151\1\164\1\uffff\1\156\1\164\1\146\1\uffff\1\171\1\147\2\uffff\1\141\1\156\1\141\3\60\1\160\1\60\1\160\1\155\1\164\3\uffff\1\145\1\uffff\1\60\1\141\1\151\1\163\1\uffff\1\170\1\157\2\60\1\156\2\uffff\1\60\1\uffff";
     static final String DFA12_maxS =
-        "\1\uffff\1\145\1\157\2\uffff\1\75\3\uffff\1\157\3\uffff\1\160\1"+
-        "\151\1\162\1\164\2\uffff\1\157\1\146\1\161\1\uffff\1\156\4\uffff"+
-        "\1\141\1\167\1\172\2\uffff\2\uffff\1\57\2\uffff\1\163\1\uffff\1"+
-        "\163\1\151\6\uffff\1\151\1\154\3\uffff\1\141\1\164\1\141\1\144\1"+
-        "\145\2\uffff\1\154\1\146\1\156\1\uffff\1\165\4\uffff\1\164\1\63"+
-        "\5\uffff\2\164\1\162\2\144\1\165\1\143\1\145\1\63\1\160\1\145\1"+
-        "\155\1\165\1\163\1\172\1\155\1\141\5\172\1\151\1\172\2\145\1\167"+
-        "\3\172\1\155\1\156\1\172\1\155\2\145\1\uffff\1\172\1\164\5\uffff"+
-        "\1\156\1\uffff\2\172\1\162\3\uffff\1\151\1\164\1\uffff\1\156\1\164"+
-        "\1\146\1\uffff\1\171\1\147\2\uffff\1\141\1\156\1\141\3\172\1\160"+
-        "\1\172\1\160\1\155\1\164\3\uffff\1\145\1\uffff\1\172\1\141\1\151"+
-        "\1\163\1\uffff\1\170\1\157\2\172\1\156\2\uffff\1\172\1\uffff";
+        "\1\uffff\1\145\1\157\2\uffff\1\75\3\uffff\1\157\3\uffff\1\160\1\151\1\162\1\164\2\uffff\1\157\1\146\1\161\1\uffff\1\156\4\uffff\1\141\1\167\1\172\2\uffff\2\uffff\1\57\2\uffff\1\163\1\uffff\1\163\1\151\6\uffff\1\151\1\154\3\uffff\1\141\1\164\1\141\1\144\1\145\2\uffff\1\154\1\146\1\156\1\uffff\1\165\4\uffff\1\164\1\63\5\uffff\2\164\1\162\2\144\1\165\1\143\1\145\1\63\1\160\1\145\1\155\1\165\1\163\1\172\1\155\1\141\5\172\1\151\1\172\2\145\1\167\3\172\1\155\1\156\1\172\1\155\2\145\1\uffff\1\172\1\164\5\uffff\1\156\1\uffff\2\172\1\162\3\uffff\1\151\1\164\1\uffff\1\156\1\164\1\146\1\uffff\1\171\1\147\2\uffff\1\141\1\156\1\141\3\172\1\160\1\172\1\160\1\155\1\164\3\uffff\1\145\1\uffff\1\172\1\141\1\151\1\163\1\uffff\1\170\1\157\2\172\1\156\2\uffff\1\172\1\uffff";
     static final String DFA12_acceptS =
-        "\3\uffff\1\3\1\4\1\uffff\1\6\1\7\1\10\1\uffff\1\12\1\13\1\14\4"+
-        "\uffff\1\21\1\22\3\uffff\1\32\1\uffff\1\35\1\36\1\37\1\40\3\uffff"+
-        "\1\47\1\50\3\uffff\1\54\1\55\1\uffff\1\47\2\uffff\1\3\1\4\1\5\1"+
-        "\6\1\7\1\10\2\uffff\1\12\1\13\1\14\5\uffff\1\21\1\22\3\uffff\1\32"+
-        "\1\uffff\1\35\1\36\1\37\1\40\2\uffff\1\50\1\51\1\52\1\53\1\54\44"+
-        "\uffff\1\31\2\uffff\1\42\1\43\1\1\1\2\1\27\1\uffff\1\11\3\uffff"+
-        "\1\44\1\45\1\46\2\uffff\1\24\3\uffff\1\34\2\uffff\1\26\1\15\13\uffff"+
-        "\1\23\1\25\1\33\1\uffff\1\30\4\uffff\1\16\5\uffff\1\41\1\17\1\uffff"+
-        "\1\20";
+        "\3\uffff\1\3\1\4\1\uffff\1\6\1\7\1\10\1\uffff\1\12\1\13\1\14\4\uffff\1\21\1\22\3\uffff\1\32\1\uffff\1\35\1\36\1\37\1\40\3\uffff\1\47\1\50\3\uffff\1\54\1\55\1\uffff\1\47\2\uffff\1\3\1\4\1\5\1\6\1\7\1\10\2\uffff\1\12\1\13\1\14\5\uffff\1\21\1\22\3\uffff\1\32\1\uffff\1\35\1\36\1\37\1\40\2\uffff\1\50\1\51\1\52\1\53\1\54\44\uffff\1\31\2\uffff\1\42\1\43\1\1\1\2\1\27\1\uffff\1\11\3\uffff\1\44\1\45\1\46\2\uffff\1\24\3\uffff\1\34\2\uffff\1\26\1\15\13\uffff\1\23\1\25\1\33\1\uffff\1\30\4\uffff\1\16\5\uffff\1\41\1\17\1\uffff\1\20";
     static final String DFA12_specialS =
         "\1\1\40\uffff\1\2\1\0\u0086\uffff}>";
     static final String[] DFA12_transitionS = {
-            "\11\45\2\44\2\45\1\44\22\45\1\44\1\45\1\41\2\45\1\31\1\45\1"+
-            "\42\1\12\1\13\1\45\1\5\1\7\1\45\1\26\1\43\12\40\1\14\1\3\1\32"+
-            "\1\4\1\33\2\45\32\37\1\6\1\45\1\10\1\36\1\37\1\30\2\37\1\23"+
-            "\1\34\1\27\1\25\2\37\1\20\1\37\1\35\1\16\2\37\1\24\1\2\2\37"+
-            "\1\15\1\1\1\37\1\11\1\17\3\37\1\21\1\45\1\22\uff82\45",
+            "\11\45\2\44\2\45\1\44\22\45\1\44\1\45\1\41\2\45\1\31\1\45\1\42\1\12\1\13\1\45\1\5\1\7\1\45\1\26\1\43\12\40\1\14\1\3\1\32\1\4\1\33\2\45\32\37\1\6\1\45\1\10\1\36\1\37\1\30\2\37\1\23\1\34\1\27\1\25\2\37\1\20\1\37\1\35\1\16\2\37\1\24\1\2\2\37\1\15\1\1\1\37\1\11\1\17\3\37\1\21\1\45\1\22\uff82\45",
             "\1\46",
             "\1\51\15\uffff\1\50",
             "",
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguageParser.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguageParser.java
index deedb1de3..882788f63 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguageParser.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguageParser.java
@@ -85,7 +85,7 @@ public InternalFormatterTestLanguageParser(TokenStream input, RecognizerSharedSt
         
 
     public String[] getTokenNames() { return InternalFormatterTestLanguageParser.tokenNames; }
-    public String getGrammarFileName() { return "../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g"; }
+    public String getGrammarFileName() { return "InternalFormatterTestLanguage.g"; }
 
 
 
@@ -110,7 +110,7 @@ protected FormatterTestLanguageGrammarAccess getGrammarAccess() {
 
 
     // $ANTLR start "entryRuleRoot"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:68:1: entryRuleRoot returns [EObject current=null] : iv_ruleRoot= ruleRoot EOF ;
+    // InternalFormatterTestLanguage.g:68:1: entryRuleRoot returns [EObject current=null] : iv_ruleRoot= ruleRoot EOF ;
     public final EObject entryRuleRoot() throws RecognitionException {
         EObject current = null;
 
@@ -118,17 +118,17 @@ public final EObject entryRuleRoot() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:69:2: (iv_ruleRoot= ruleRoot EOF )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:70:2: iv_ruleRoot= ruleRoot EOF
+            // InternalFormatterTestLanguage.g:69:2: (iv_ruleRoot= ruleRoot EOF )
+            // InternalFormatterTestLanguage.g:70:2: iv_ruleRoot= ruleRoot EOF
             {
              newCompositeNode(grammarAccess.getRootRule()); 
-            pushFollow(FOLLOW_ruleRoot_in_entryRuleRoot75);
+            pushFollow(FOLLOW_1);
             iv_ruleRoot=ruleRoot();
 
             state._fsp--;
 
              current =iv_ruleRoot; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRoot85); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -146,7 +146,7 @@ public final EObject entryRuleRoot() throws RecognitionException {
 
 
     // $ANTLR start "ruleRoot"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:77:1: ruleRoot returns [EObject current=null] : (otherlv_0= 'test' (this_TestLinewrap_1= ruleTestLinewrap | this_TestIndentation_2= ruleTestIndentation | this_TestLinewrapMinMax_3= ruleTestLinewrapMinMax | this_TestColumn_4= ruleTestColumn | this_TestOffset_5= ruleTestOffset | this_TestRightPadding_6= ruleTestRightPadding ) ) ;
+    // InternalFormatterTestLanguage.g:77:1: ruleRoot returns [EObject current=null] : (otherlv_0= 'test' (this_TestLinewrap_1= ruleTestLinewrap | this_TestIndentation_2= ruleTestIndentation | this_TestLinewrapMinMax_3= ruleTestLinewrapMinMax | this_TestColumn_4= ruleTestColumn | this_TestOffset_5= ruleTestOffset | this_TestRightPadding_6= ruleTestRightPadding ) ) ;
     public final EObject ruleRoot() throws RecognitionException {
         EObject current = null;
 
@@ -167,17 +167,17 @@ public final EObject ruleRoot() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:80:28: ( (otherlv_0= 'test' (this_TestLinewrap_1= ruleTestLinewrap | this_TestIndentation_2= ruleTestIndentation | this_TestLinewrapMinMax_3= ruleTestLinewrapMinMax | this_TestColumn_4= ruleTestColumn | this_TestOffset_5= ruleTestOffset | this_TestRightPadding_6= ruleTestRightPadding ) ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:81:1: (otherlv_0= 'test' (this_TestLinewrap_1= ruleTestLinewrap | this_TestIndentation_2= ruleTestIndentation | this_TestLinewrapMinMax_3= ruleTestLinewrapMinMax | this_TestColumn_4= ruleTestColumn | this_TestOffset_5= ruleTestOffset | this_TestRightPadding_6= ruleTestRightPadding ) )
+            // InternalFormatterTestLanguage.g:80:28: ( (otherlv_0= 'test' (this_TestLinewrap_1= ruleTestLinewrap | this_TestIndentation_2= ruleTestIndentation | this_TestLinewrapMinMax_3= ruleTestLinewrapMinMax | this_TestColumn_4= ruleTestColumn | this_TestOffset_5= ruleTestOffset | this_TestRightPadding_6= ruleTestRightPadding ) ) )
+            // InternalFormatterTestLanguage.g:81:1: (otherlv_0= 'test' (this_TestLinewrap_1= ruleTestLinewrap | this_TestIndentation_2= ruleTestIndentation | this_TestLinewrapMinMax_3= ruleTestLinewrapMinMax | this_TestColumn_4= ruleTestColumn | this_TestOffset_5= ruleTestOffset | this_TestRightPadding_6= ruleTestRightPadding ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:81:1: (otherlv_0= 'test' (this_TestLinewrap_1= ruleTestLinewrap | this_TestIndentation_2= ruleTestIndentation | this_TestLinewrapMinMax_3= ruleTestLinewrapMinMax | this_TestColumn_4= ruleTestColumn | this_TestOffset_5= ruleTestOffset | this_TestRightPadding_6= ruleTestRightPadding ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:81:3: otherlv_0= 'test' (this_TestLinewrap_1= ruleTestLinewrap | this_TestIndentation_2= ruleTestIndentation | this_TestLinewrapMinMax_3= ruleTestLinewrapMinMax | this_TestColumn_4= ruleTestColumn | this_TestOffset_5= ruleTestOffset | this_TestRightPadding_6= ruleTestRightPadding )
+            // InternalFormatterTestLanguage.g:81:1: (otherlv_0= 'test' (this_TestLinewrap_1= ruleTestLinewrap | this_TestIndentation_2= ruleTestIndentation | this_TestLinewrapMinMax_3= ruleTestLinewrapMinMax | this_TestColumn_4= ruleTestColumn | this_TestOffset_5= ruleTestOffset | this_TestRightPadding_6= ruleTestRightPadding ) )
+            // InternalFormatterTestLanguage.g:81:3: otherlv_0= 'test' (this_TestLinewrap_1= ruleTestLinewrap | this_TestIndentation_2= ruleTestIndentation | this_TestLinewrapMinMax_3= ruleTestLinewrapMinMax | this_TestColumn_4= ruleTestColumn | this_TestOffset_5= ruleTestOffset | this_TestRightPadding_6= ruleTestRightPadding )
             {
-            otherlv_0=(Token)match(input,11,FOLLOW_11_in_ruleRoot122); 
+            otherlv_0=(Token)match(input,11,FOLLOW_3); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getRootAccess().getTestKeyword_0());
                 
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:85:1: (this_TestLinewrap_1= ruleTestLinewrap | this_TestIndentation_2= ruleTestIndentation | this_TestLinewrapMinMax_3= ruleTestLinewrapMinMax | this_TestColumn_4= ruleTestColumn | this_TestOffset_5= ruleTestOffset | this_TestRightPadding_6= ruleTestRightPadding )
+            // InternalFormatterTestLanguage.g:85:1: (this_TestLinewrap_1= ruleTestLinewrap | this_TestIndentation_2= ruleTestIndentation | this_TestLinewrapMinMax_3= ruleTestLinewrapMinMax | this_TestColumn_4= ruleTestColumn | this_TestOffset_5= ruleTestOffset | this_TestRightPadding_6= ruleTestRightPadding )
             int alt1=6;
             switch ( input.LA(1) ) {
             case 24:
@@ -219,12 +219,12 @@ public final EObject ruleRoot() throws RecognitionException {
 
             switch (alt1) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:86:5: this_TestLinewrap_1= ruleTestLinewrap
+                    // InternalFormatterTestLanguage.g:86:5: this_TestLinewrap_1= ruleTestLinewrap
                     {
                      
                             newCompositeNode(grammarAccess.getRootAccess().getTestLinewrapParserRuleCall_1_0()); 
                         
-                    pushFollow(FOLLOW_ruleTestLinewrap_in_ruleRoot145);
+                    pushFollow(FOLLOW_2);
                     this_TestLinewrap_1=ruleTestLinewrap();
 
                     state._fsp--;
@@ -237,12 +237,12 @@ public final EObject ruleRoot() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:96:5: this_TestIndentation_2= ruleTestIndentation
+                    // InternalFormatterTestLanguage.g:96:5: this_TestIndentation_2= ruleTestIndentation
                     {
                      
                             newCompositeNode(grammarAccess.getRootAccess().getTestIndentationParserRuleCall_1_1()); 
                         
-                    pushFollow(FOLLOW_ruleTestIndentation_in_ruleRoot172);
+                    pushFollow(FOLLOW_2);
                     this_TestIndentation_2=ruleTestIndentation();
 
                     state._fsp--;
@@ -255,12 +255,12 @@ public final EObject ruleRoot() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:106:5: this_TestLinewrapMinMax_3= ruleTestLinewrapMinMax
+                    // InternalFormatterTestLanguage.g:106:5: this_TestLinewrapMinMax_3= ruleTestLinewrapMinMax
                     {
                      
                             newCompositeNode(grammarAccess.getRootAccess().getTestLinewrapMinMaxParserRuleCall_1_2()); 
                         
-                    pushFollow(FOLLOW_ruleTestLinewrapMinMax_in_ruleRoot199);
+                    pushFollow(FOLLOW_2);
                     this_TestLinewrapMinMax_3=ruleTestLinewrapMinMax();
 
                     state._fsp--;
@@ -273,12 +273,12 @@ public final EObject ruleRoot() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:116:5: this_TestColumn_4= ruleTestColumn
+                    // InternalFormatterTestLanguage.g:116:5: this_TestColumn_4= ruleTestColumn
                     {
                      
                             newCompositeNode(grammarAccess.getRootAccess().getTestColumnParserRuleCall_1_3()); 
                         
-                    pushFollow(FOLLOW_ruleTestColumn_in_ruleRoot226);
+                    pushFollow(FOLLOW_2);
                     this_TestColumn_4=ruleTestColumn();
 
                     state._fsp--;
@@ -291,12 +291,12 @@ public final EObject ruleRoot() throws RecognitionException {
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:126:5: this_TestOffset_5= ruleTestOffset
+                    // InternalFormatterTestLanguage.g:126:5: this_TestOffset_5= ruleTestOffset
                     {
                      
                             newCompositeNode(grammarAccess.getRootAccess().getTestOffsetParserRuleCall_1_4()); 
                         
-                    pushFollow(FOLLOW_ruleTestOffset_in_ruleRoot253);
+                    pushFollow(FOLLOW_2);
                     this_TestOffset_5=ruleTestOffset();
 
                     state._fsp--;
@@ -309,12 +309,12 @@ public final EObject ruleRoot() throws RecognitionException {
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:136:5: this_TestRightPadding_6= ruleTestRightPadding
+                    // InternalFormatterTestLanguage.g:136:5: this_TestRightPadding_6= ruleTestRightPadding
                     {
                      
                             newCompositeNode(grammarAccess.getRootAccess().getTestRightPaddingParserRuleCall_1_5()); 
                         
-                    pushFollow(FOLLOW_ruleTestRightPadding_in_ruleRoot280);
+                    pushFollow(FOLLOW_2);
                     this_TestRightPadding_6=ruleTestRightPadding();
 
                     state._fsp--;
@@ -350,7 +350,7 @@ public final EObject ruleRoot() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleLine"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:152:1: entryRuleLine returns [EObject current=null] : iv_ruleLine= ruleLine EOF ;
+    // InternalFormatterTestLanguage.g:152:1: entryRuleLine returns [EObject current=null] : iv_ruleLine= ruleLine EOF ;
     public final EObject entryRuleLine() throws RecognitionException {
         EObject current = null;
 
@@ -358,17 +358,17 @@ public final EObject entryRuleLine() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:153:2: (iv_ruleLine= ruleLine EOF )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:154:2: iv_ruleLine= ruleLine EOF
+            // InternalFormatterTestLanguage.g:153:2: (iv_ruleLine= ruleLine EOF )
+            // InternalFormatterTestLanguage.g:154:2: iv_ruleLine= ruleLine EOF
             {
              newCompositeNode(grammarAccess.getLineRule()); 
-            pushFollow(FOLLOW_ruleLine_in_entryRuleLine316);
+            pushFollow(FOLLOW_1);
             iv_ruleLine=ruleLine();
 
             state._fsp--;
 
              current =iv_ruleLine; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleLine326); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -386,7 +386,7 @@ public final EObject entryRuleLine() throws RecognitionException {
 
 
     // $ANTLR start "ruleLine"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:161:1: ruleLine returns [EObject current=null] : ( (this_Decl_0= ruleDecl | this_Assign_1= ruleAssign | this_Meth_2= ruleMeth | this_FqnObj_3= ruleFqnObj | this_FqnRef_4= ruleFqnRef | this_Enumeration_5= ruleEnumeration | (this_SuppressedHidden_6= ruleSuppressedHidden otherlv_7= 'post' ) | this_Space_8= ruleSpace | this_Datatypes_9= ruleDatatypes ) otherlv_10= ';' ) ;
+    // InternalFormatterTestLanguage.g:161:1: ruleLine returns [EObject current=null] : ( (this_Decl_0= ruleDecl | this_Assign_1= ruleAssign | this_Meth_2= ruleMeth | this_FqnObj_3= ruleFqnObj | this_FqnRef_4= ruleFqnRef | this_Enumeration_5= ruleEnumeration | (this_SuppressedHidden_6= ruleSuppressedHidden otherlv_7= 'post' ) | this_Space_8= ruleSpace | this_Datatypes_9= ruleDatatypes ) otherlv_10= ';' ) ;
     public final EObject ruleLine() throws RecognitionException {
         EObject current = null;
 
@@ -414,23 +414,23 @@ public final EObject ruleLine() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:164:28: ( ( (this_Decl_0= ruleDecl | this_Assign_1= ruleAssign | this_Meth_2= ruleMeth | this_FqnObj_3= ruleFqnObj | this_FqnRef_4= ruleFqnRef | this_Enumeration_5= ruleEnumeration | (this_SuppressedHidden_6= ruleSuppressedHidden otherlv_7= 'post' ) | this_Space_8= ruleSpace | this_Datatypes_9= ruleDatatypes ) otherlv_10= ';' ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:165:1: ( (this_Decl_0= ruleDecl | this_Assign_1= ruleAssign | this_Meth_2= ruleMeth | this_FqnObj_3= ruleFqnObj | this_FqnRef_4= ruleFqnRef | this_Enumeration_5= ruleEnumeration | (this_SuppressedHidden_6= ruleSuppressedHidden otherlv_7= 'post' ) | this_Space_8= ruleSpace | this_Datatypes_9= ruleDatatypes ) otherlv_10= ';' )
+            // InternalFormatterTestLanguage.g:164:28: ( ( (this_Decl_0= ruleDecl | this_Assign_1= ruleAssign | this_Meth_2= ruleMeth | this_FqnObj_3= ruleFqnObj | this_FqnRef_4= ruleFqnRef | this_Enumeration_5= ruleEnumeration | (this_SuppressedHidden_6= ruleSuppressedHidden otherlv_7= 'post' ) | this_Space_8= ruleSpace | this_Datatypes_9= ruleDatatypes ) otherlv_10= ';' ) )
+            // InternalFormatterTestLanguage.g:165:1: ( (this_Decl_0= ruleDecl | this_Assign_1= ruleAssign | this_Meth_2= ruleMeth | this_FqnObj_3= ruleFqnObj | this_FqnRef_4= ruleFqnRef | this_Enumeration_5= ruleEnumeration | (this_SuppressedHidden_6= ruleSuppressedHidden otherlv_7= 'post' ) | this_Space_8= ruleSpace | this_Datatypes_9= ruleDatatypes ) otherlv_10= ';' )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:165:1: ( (this_Decl_0= ruleDecl | this_Assign_1= ruleAssign | this_Meth_2= ruleMeth | this_FqnObj_3= ruleFqnObj | this_FqnRef_4= ruleFqnRef | this_Enumeration_5= ruleEnumeration | (this_SuppressedHidden_6= ruleSuppressedHidden otherlv_7= 'post' ) | this_Space_8= ruleSpace | this_Datatypes_9= ruleDatatypes ) otherlv_10= ';' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:165:2: (this_Decl_0= ruleDecl | this_Assign_1= ruleAssign | this_Meth_2= ruleMeth | this_FqnObj_3= ruleFqnObj | this_FqnRef_4= ruleFqnRef | this_Enumeration_5= ruleEnumeration | (this_SuppressedHidden_6= ruleSuppressedHidden otherlv_7= 'post' ) | this_Space_8= ruleSpace | this_Datatypes_9= ruleDatatypes ) otherlv_10= ';'
+            // InternalFormatterTestLanguage.g:165:1: ( (this_Decl_0= ruleDecl | this_Assign_1= ruleAssign | this_Meth_2= ruleMeth | this_FqnObj_3= ruleFqnObj | this_FqnRef_4= ruleFqnRef | this_Enumeration_5= ruleEnumeration | (this_SuppressedHidden_6= ruleSuppressedHidden otherlv_7= 'post' ) | this_Space_8= ruleSpace | this_Datatypes_9= ruleDatatypes ) otherlv_10= ';' )
+            // InternalFormatterTestLanguage.g:165:2: (this_Decl_0= ruleDecl | this_Assign_1= ruleAssign | this_Meth_2= ruleMeth | this_FqnObj_3= ruleFqnObj | this_FqnRef_4= ruleFqnRef | this_Enumeration_5= ruleEnumeration | (this_SuppressedHidden_6= ruleSuppressedHidden otherlv_7= 'post' ) | this_Space_8= ruleSpace | this_Datatypes_9= ruleDatatypes ) otherlv_10= ';'
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:165:2: (this_Decl_0= ruleDecl | this_Assign_1= ruleAssign | this_Meth_2= ruleMeth | this_FqnObj_3= ruleFqnObj | this_FqnRef_4= ruleFqnRef | this_Enumeration_5= ruleEnumeration | (this_SuppressedHidden_6= ruleSuppressedHidden otherlv_7= 'post' ) | this_Space_8= ruleSpace | this_Datatypes_9= ruleDatatypes )
+            // InternalFormatterTestLanguage.g:165:2: (this_Decl_0= ruleDecl | this_Assign_1= ruleAssign | this_Meth_2= ruleMeth | this_FqnObj_3= ruleFqnObj | this_FqnRef_4= ruleFqnRef | this_Enumeration_5= ruleEnumeration | (this_SuppressedHidden_6= ruleSuppressedHidden otherlv_7= 'post' ) | this_Space_8= ruleSpace | this_Datatypes_9= ruleDatatypes )
             int alt2=9;
             alt2 = dfa2.predict(input);
             switch (alt2) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:166:5: this_Decl_0= ruleDecl
+                    // InternalFormatterTestLanguage.g:166:5: this_Decl_0= ruleDecl
                     {
                      
                             newCompositeNode(grammarAccess.getLineAccess().getDeclParserRuleCall_0_0()); 
                         
-                    pushFollow(FOLLOW_ruleDecl_in_ruleLine374);
+                    pushFollow(FOLLOW_4);
                     this_Decl_0=ruleDecl();
 
                     state._fsp--;
@@ -443,12 +443,12 @@ public final EObject ruleLine() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:176:5: this_Assign_1= ruleAssign
+                    // InternalFormatterTestLanguage.g:176:5: this_Assign_1= ruleAssign
                     {
                      
                             newCompositeNode(grammarAccess.getLineAccess().getAssignParserRuleCall_0_1()); 
                         
-                    pushFollow(FOLLOW_ruleAssign_in_ruleLine401);
+                    pushFollow(FOLLOW_4);
                     this_Assign_1=ruleAssign();
 
                     state._fsp--;
@@ -461,12 +461,12 @@ public final EObject ruleLine() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:186:5: this_Meth_2= ruleMeth
+                    // InternalFormatterTestLanguage.g:186:5: this_Meth_2= ruleMeth
                     {
                      
                             newCompositeNode(grammarAccess.getLineAccess().getMethParserRuleCall_0_2()); 
                         
-                    pushFollow(FOLLOW_ruleMeth_in_ruleLine428);
+                    pushFollow(FOLLOW_4);
                     this_Meth_2=ruleMeth();
 
                     state._fsp--;
@@ -479,12 +479,12 @@ public final EObject ruleLine() throws RecognitionException {
                     }
                     break;
                 case 4 :
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:196:5: this_FqnObj_3= ruleFqnObj
+                    // InternalFormatterTestLanguage.g:196:5: this_FqnObj_3= ruleFqnObj
                     {
                      
                             newCompositeNode(grammarAccess.getLineAccess().getFqnObjParserRuleCall_0_3()); 
                         
-                    pushFollow(FOLLOW_ruleFqnObj_in_ruleLine455);
+                    pushFollow(FOLLOW_4);
                     this_FqnObj_3=ruleFqnObj();
 
                     state._fsp--;
@@ -497,12 +497,12 @@ public final EObject ruleLine() throws RecognitionException {
                     }
                     break;
                 case 5 :
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:206:5: this_FqnRef_4= ruleFqnRef
+                    // InternalFormatterTestLanguage.g:206:5: this_FqnRef_4= ruleFqnRef
                     {
                      
                             newCompositeNode(grammarAccess.getLineAccess().getFqnRefParserRuleCall_0_4()); 
                         
-                    pushFollow(FOLLOW_ruleFqnRef_in_ruleLine482);
+                    pushFollow(FOLLOW_4);
                     this_FqnRef_4=ruleFqnRef();
 
                     state._fsp--;
@@ -515,12 +515,12 @@ public final EObject ruleLine() throws RecognitionException {
                     }
                     break;
                 case 6 :
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:216:5: this_Enumeration_5= ruleEnumeration
+                    // InternalFormatterTestLanguage.g:216:5: this_Enumeration_5= ruleEnumeration
                     {
                      
                             newCompositeNode(grammarAccess.getLineAccess().getEnumerationParserRuleCall_0_5()); 
                         
-                    pushFollow(FOLLOW_ruleEnumeration_in_ruleLine509);
+                    pushFollow(FOLLOW_4);
                     this_Enumeration_5=ruleEnumeration();
 
                     state._fsp--;
@@ -533,15 +533,15 @@ public final EObject ruleLine() throws RecognitionException {
                     }
                     break;
                 case 7 :
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:225:6: (this_SuppressedHidden_6= ruleSuppressedHidden otherlv_7= 'post' )
+                    // InternalFormatterTestLanguage.g:225:6: (this_SuppressedHidden_6= ruleSuppressedHidden otherlv_7= 'post' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:225:6: (this_SuppressedHidden_6= ruleSuppressedHidden otherlv_7= 'post' )
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:226:5: this_SuppressedHidden_6= ruleSuppressedHidden otherlv_7= 'post'
+                    // InternalFormatterTestLanguage.g:225:6: (this_SuppressedHidden_6= ruleSuppressedHidden otherlv_7= 'post' )
+                    // InternalFormatterTestLanguage.g:226:5: this_SuppressedHidden_6= ruleSuppressedHidden otherlv_7= 'post'
                     {
                      
                             newCompositeNode(grammarAccess.getLineAccess().getSuppressedHiddenParserRuleCall_0_6_0()); 
                         
-                    pushFollow(FOLLOW_ruleSuppressedHidden_in_ruleLine537);
+                    pushFollow(FOLLOW_5);
                     this_SuppressedHidden_6=ruleSuppressedHidden();
 
                     state._fsp--;
@@ -550,7 +550,7 @@ public final EObject ruleLine() throws RecognitionException {
                             current = this_SuppressedHidden_6; 
                             afterParserOrEnumRuleCall();
                         
-                    otherlv_7=(Token)match(input,12,FOLLOW_12_in_ruleLine548); 
+                    otherlv_7=(Token)match(input,12,FOLLOW_4); 
 
                         	newLeafNode(otherlv_7, grammarAccess.getLineAccess().getPostKeyword_0_6_1());
                         
@@ -561,12 +561,12 @@ public final EObject ruleLine() throws RecognitionException {
                     }
                     break;
                 case 8 :
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:240:5: this_Space_8= ruleSpace
+                    // InternalFormatterTestLanguage.g:240:5: this_Space_8= ruleSpace
                     {
                      
                             newCompositeNode(grammarAccess.getLineAccess().getSpaceParserRuleCall_0_7()); 
                         
-                    pushFollow(FOLLOW_ruleSpace_in_ruleLine577);
+                    pushFollow(FOLLOW_4);
                     this_Space_8=ruleSpace();
 
                     state._fsp--;
@@ -579,12 +579,12 @@ public final EObject ruleLine() throws RecognitionException {
                     }
                     break;
                 case 9 :
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:250:5: this_Datatypes_9= ruleDatatypes
+                    // InternalFormatterTestLanguage.g:250:5: this_Datatypes_9= ruleDatatypes
                     {
                      
                             newCompositeNode(grammarAccess.getLineAccess().getDatatypesParserRuleCall_0_8()); 
                         
-                    pushFollow(FOLLOW_ruleDatatypes_in_ruleLine604);
+                    pushFollow(FOLLOW_4);
                     this_Datatypes_9=ruleDatatypes();
 
                     state._fsp--;
@@ -599,7 +599,7 @@ public final EObject ruleLine() throws RecognitionException {
 
             }
 
-            otherlv_10=(Token)match(input,13,FOLLOW_13_in_ruleLine616); 
+            otherlv_10=(Token)match(input,13,FOLLOW_2); 
 
                 	newLeafNode(otherlv_10, grammarAccess.getLineAccess().getSemicolonKeyword_1());
                 
@@ -624,7 +624,7 @@ public final EObject ruleLine() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleDecl"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:270:1: entryRuleDecl returns [EObject current=null] : iv_ruleDecl= ruleDecl EOF ;
+    // InternalFormatterTestLanguage.g:270:1: entryRuleDecl returns [EObject current=null] : iv_ruleDecl= ruleDecl EOF ;
     public final EObject entryRuleDecl() throws RecognitionException {
         EObject current = null;
 
@@ -632,17 +632,17 @@ public final EObject entryRuleDecl() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:271:2: (iv_ruleDecl= ruleDecl EOF )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:272:2: iv_ruleDecl= ruleDecl EOF
+            // InternalFormatterTestLanguage.g:271:2: (iv_ruleDecl= ruleDecl EOF )
+            // InternalFormatterTestLanguage.g:272:2: iv_ruleDecl= ruleDecl EOF
             {
              newCompositeNode(grammarAccess.getDeclRule()); 
-            pushFollow(FOLLOW_ruleDecl_in_entryRuleDecl652);
+            pushFollow(FOLLOW_1);
             iv_ruleDecl=ruleDecl();
 
             state._fsp--;
 
              current =iv_ruleDecl; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDecl662); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -660,7 +660,7 @@ public final EObject entryRuleDecl() throws RecognitionException {
 
 
     // $ANTLR start "ruleDecl"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:279:1: ruleDecl returns [EObject current=null] : ( ( (lv_type_0_0= RULE_ID ) ) ( (lv_name_1_0= RULE_ID ) ) ) ;
+    // InternalFormatterTestLanguage.g:279:1: ruleDecl returns [EObject current=null] : ( ( (lv_type_0_0= RULE_ID ) ) ( (lv_name_1_0= RULE_ID ) ) ) ;
     public final EObject ruleDecl() throws RecognitionException {
         EObject current = null;
 
@@ -670,19 +670,19 @@ public final EObject ruleDecl() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:282:28: ( ( ( (lv_type_0_0= RULE_ID ) ) ( (lv_name_1_0= RULE_ID ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:283:1: ( ( (lv_type_0_0= RULE_ID ) ) ( (lv_name_1_0= RULE_ID ) ) )
+            // InternalFormatterTestLanguage.g:282:28: ( ( ( (lv_type_0_0= RULE_ID ) ) ( (lv_name_1_0= RULE_ID ) ) ) )
+            // InternalFormatterTestLanguage.g:283:1: ( ( (lv_type_0_0= RULE_ID ) ) ( (lv_name_1_0= RULE_ID ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:283:1: ( ( (lv_type_0_0= RULE_ID ) ) ( (lv_name_1_0= RULE_ID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:283:2: ( (lv_type_0_0= RULE_ID ) ) ( (lv_name_1_0= RULE_ID ) )
+            // InternalFormatterTestLanguage.g:283:1: ( ( (lv_type_0_0= RULE_ID ) ) ( (lv_name_1_0= RULE_ID ) ) )
+            // InternalFormatterTestLanguage.g:283:2: ( (lv_type_0_0= RULE_ID ) ) ( (lv_name_1_0= RULE_ID ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:283:2: ( (lv_type_0_0= RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:284:1: (lv_type_0_0= RULE_ID )
+            // InternalFormatterTestLanguage.g:283:2: ( (lv_type_0_0= RULE_ID ) )
+            // InternalFormatterTestLanguage.g:284:1: (lv_type_0_0= RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:284:1: (lv_type_0_0= RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:285:3: lv_type_0_0= RULE_ID
+            // InternalFormatterTestLanguage.g:284:1: (lv_type_0_0= RULE_ID )
+            // InternalFormatterTestLanguage.g:285:3: lv_type_0_0= RULE_ID
             {
-            lv_type_0_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleDecl704); 
+            lv_type_0_0=(Token)match(input,RULE_ID,FOLLOW_6); 
 
             			newLeafNode(lv_type_0_0, grammarAccess.getDeclAccess().getTypeIDTerminalRuleCall_0_0()); 
             		
@@ -694,7 +694,7 @@ public final EObject ruleDecl() throws RecognitionException {
                    			current, 
                    			"type",
                     		lv_type_0_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -702,13 +702,13 @@ public final EObject ruleDecl() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:301:2: ( (lv_name_1_0= RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:302:1: (lv_name_1_0= RULE_ID )
+            // InternalFormatterTestLanguage.g:301:2: ( (lv_name_1_0= RULE_ID ) )
+            // InternalFormatterTestLanguage.g:302:1: (lv_name_1_0= RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:302:1: (lv_name_1_0= RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:303:3: lv_name_1_0= RULE_ID
+            // InternalFormatterTestLanguage.g:302:1: (lv_name_1_0= RULE_ID )
+            // InternalFormatterTestLanguage.g:303:3: lv_name_1_0= RULE_ID
             {
-            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleDecl726); 
+            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_2); 
 
             			newLeafNode(lv_name_1_0, grammarAccess.getDeclAccess().getNameIDTerminalRuleCall_1_0()); 
             		
@@ -720,7 +720,7 @@ public final EObject ruleDecl() throws RecognitionException {
                    			current, 
                    			"name",
                     		lv_name_1_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -749,7 +749,7 @@ public final EObject ruleDecl() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleAssign"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:327:1: entryRuleAssign returns [EObject current=null] : iv_ruleAssign= ruleAssign EOF ;
+    // InternalFormatterTestLanguage.g:327:1: entryRuleAssign returns [EObject current=null] : iv_ruleAssign= ruleAssign EOF ;
     public final EObject entryRuleAssign() throws RecognitionException {
         EObject current = null;
 
@@ -757,17 +757,17 @@ public final EObject entryRuleAssign() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:328:2: (iv_ruleAssign= ruleAssign EOF )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:329:2: iv_ruleAssign= ruleAssign EOF
+            // InternalFormatterTestLanguage.g:328:2: (iv_ruleAssign= ruleAssign EOF )
+            // InternalFormatterTestLanguage.g:329:2: iv_ruleAssign= ruleAssign EOF
             {
              newCompositeNode(grammarAccess.getAssignRule()); 
-            pushFollow(FOLLOW_ruleAssign_in_entryRuleAssign767);
+            pushFollow(FOLLOW_1);
             iv_ruleAssign=ruleAssign();
 
             state._fsp--;
 
              current =iv_ruleAssign; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleAssign777); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -785,7 +785,7 @@ public final EObject entryRuleAssign() throws RecognitionException {
 
 
     // $ANTLR start "ruleAssign"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:336:1: ruleAssign returns [EObject current=null] : ( ( (lv_var_0_0= RULE_ID ) ) ( ( (lv_op_1_1= '=' | lv_op_1_2= '+=' ) ) ) otherlv_2= '[' ( ( (lv_val_3_0= RULE_INT ) ) (otherlv_4= ',' ( (lv_val_5_0= RULE_INT ) ) )* )? otherlv_6= ']' ) ;
+    // InternalFormatterTestLanguage.g:336:1: ruleAssign returns [EObject current=null] : ( ( (lv_var_0_0= RULE_ID ) ) ( ( (lv_op_1_1= '=' | lv_op_1_2= '+=' ) ) ) otherlv_2= '[' ( ( (lv_val_3_0= RULE_INT ) ) (otherlv_4= ',' ( (lv_val_5_0= RULE_INT ) ) )* )? otherlv_6= ']' ) ;
     public final EObject ruleAssign() throws RecognitionException {
         EObject current = null;
 
@@ -801,19 +801,19 @@ public final EObject ruleAssign() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:339:28: ( ( ( (lv_var_0_0= RULE_ID ) ) ( ( (lv_op_1_1= '=' | lv_op_1_2= '+=' ) ) ) otherlv_2= '[' ( ( (lv_val_3_0= RULE_INT ) ) (otherlv_4= ',' ( (lv_val_5_0= RULE_INT ) ) )* )? otherlv_6= ']' ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:340:1: ( ( (lv_var_0_0= RULE_ID ) ) ( ( (lv_op_1_1= '=' | lv_op_1_2= '+=' ) ) ) otherlv_2= '[' ( ( (lv_val_3_0= RULE_INT ) ) (otherlv_4= ',' ( (lv_val_5_0= RULE_INT ) ) )* )? otherlv_6= ']' )
+            // InternalFormatterTestLanguage.g:339:28: ( ( ( (lv_var_0_0= RULE_ID ) ) ( ( (lv_op_1_1= '=' | lv_op_1_2= '+=' ) ) ) otherlv_2= '[' ( ( (lv_val_3_0= RULE_INT ) ) (otherlv_4= ',' ( (lv_val_5_0= RULE_INT ) ) )* )? otherlv_6= ']' ) )
+            // InternalFormatterTestLanguage.g:340:1: ( ( (lv_var_0_0= RULE_ID ) ) ( ( (lv_op_1_1= '=' | lv_op_1_2= '+=' ) ) ) otherlv_2= '[' ( ( (lv_val_3_0= RULE_INT ) ) (otherlv_4= ',' ( (lv_val_5_0= RULE_INT ) ) )* )? otherlv_6= ']' )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:340:1: ( ( (lv_var_0_0= RULE_ID ) ) ( ( (lv_op_1_1= '=' | lv_op_1_2= '+=' ) ) ) otherlv_2= '[' ( ( (lv_val_3_0= RULE_INT ) ) (otherlv_4= ',' ( (lv_val_5_0= RULE_INT ) ) )* )? otherlv_6= ']' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:340:2: ( (lv_var_0_0= RULE_ID ) ) ( ( (lv_op_1_1= '=' | lv_op_1_2= '+=' ) ) ) otherlv_2= '[' ( ( (lv_val_3_0= RULE_INT ) ) (otherlv_4= ',' ( (lv_val_5_0= RULE_INT ) ) )* )? otherlv_6= ']'
+            // InternalFormatterTestLanguage.g:340:1: ( ( (lv_var_0_0= RULE_ID ) ) ( ( (lv_op_1_1= '=' | lv_op_1_2= '+=' ) ) ) otherlv_2= '[' ( ( (lv_val_3_0= RULE_INT ) ) (otherlv_4= ',' ( (lv_val_5_0= RULE_INT ) ) )* )? otherlv_6= ']' )
+            // InternalFormatterTestLanguage.g:340:2: ( (lv_var_0_0= RULE_ID ) ) ( ( (lv_op_1_1= '=' | lv_op_1_2= '+=' ) ) ) otherlv_2= '[' ( ( (lv_val_3_0= RULE_INT ) ) (otherlv_4= ',' ( (lv_val_5_0= RULE_INT ) ) )* )? otherlv_6= ']'
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:340:2: ( (lv_var_0_0= RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:341:1: (lv_var_0_0= RULE_ID )
+            // InternalFormatterTestLanguage.g:340:2: ( (lv_var_0_0= RULE_ID ) )
+            // InternalFormatterTestLanguage.g:341:1: (lv_var_0_0= RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:341:1: (lv_var_0_0= RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:342:3: lv_var_0_0= RULE_ID
+            // InternalFormatterTestLanguage.g:341:1: (lv_var_0_0= RULE_ID )
+            // InternalFormatterTestLanguage.g:342:3: lv_var_0_0= RULE_ID
             {
-            lv_var_0_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAssign819); 
+            lv_var_0_0=(Token)match(input,RULE_ID,FOLLOW_7); 
 
             			newLeafNode(lv_var_0_0, grammarAccess.getAssignAccess().getVarIDTerminalRuleCall_0_0()); 
             		
@@ -825,7 +825,7 @@ public final EObject ruleAssign() throws RecognitionException {
                    			current, 
                    			"var",
                     		lv_var_0_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -833,13 +833,13 @@ public final EObject ruleAssign() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:358:2: ( ( (lv_op_1_1= '=' | lv_op_1_2= '+=' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:359:1: ( (lv_op_1_1= '=' | lv_op_1_2= '+=' ) )
+            // InternalFormatterTestLanguage.g:358:2: ( ( (lv_op_1_1= '=' | lv_op_1_2= '+=' ) ) )
+            // InternalFormatterTestLanguage.g:359:1: ( (lv_op_1_1= '=' | lv_op_1_2= '+=' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:359:1: ( (lv_op_1_1= '=' | lv_op_1_2= '+=' ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:360:1: (lv_op_1_1= '=' | lv_op_1_2= '+=' )
+            // InternalFormatterTestLanguage.g:359:1: ( (lv_op_1_1= '=' | lv_op_1_2= '+=' ) )
+            // InternalFormatterTestLanguage.g:360:1: (lv_op_1_1= '=' | lv_op_1_2= '+=' )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:360:1: (lv_op_1_1= '=' | lv_op_1_2= '+=' )
+            // InternalFormatterTestLanguage.g:360:1: (lv_op_1_1= '=' | lv_op_1_2= '+=' )
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -857,9 +857,9 @@ else if ( (LA3_0==15) ) {
             }
             switch (alt3) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:361:3: lv_op_1_1= '='
+                    // InternalFormatterTestLanguage.g:361:3: lv_op_1_1= '='
                     {
-                    lv_op_1_1=(Token)match(input,14,FOLLOW_14_in_ruleAssign844); 
+                    lv_op_1_1=(Token)match(input,14,FOLLOW_8); 
 
                             newLeafNode(lv_op_1_1, grammarAccess.getAssignAccess().getOpEqualsSignKeyword_1_0_0());
                         
@@ -873,9 +873,9 @@ else if ( (LA3_0==15) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:373:8: lv_op_1_2= '+='
+                    // InternalFormatterTestLanguage.g:373:8: lv_op_1_2= '+='
                     {
-                    lv_op_1_2=(Token)match(input,15,FOLLOW_15_in_ruleAssign873); 
+                    lv_op_1_2=(Token)match(input,15,FOLLOW_8); 
 
                             newLeafNode(lv_op_1_2, grammarAccess.getAssignAccess().getOpPlusSignEqualsSignKeyword_1_0_1());
                         
@@ -897,11 +897,11 @@ else if ( (LA3_0==15) ) {
 
             }
 
-            otherlv_2=(Token)match(input,16,FOLLOW_16_in_ruleAssign901); 
+            otherlv_2=(Token)match(input,16,FOLLOW_9); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getAssignAccess().getLeftSquareBracketKeyword_2());
                 
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:392:1: ( ( (lv_val_3_0= RULE_INT ) ) (otherlv_4= ',' ( (lv_val_5_0= RULE_INT ) ) )* )?
+            // InternalFormatterTestLanguage.g:392:1: ( ( (lv_val_3_0= RULE_INT ) ) (otherlv_4= ',' ( (lv_val_5_0= RULE_INT ) ) )* )?
             int alt5=2;
             int LA5_0 = input.LA(1);
 
@@ -910,15 +910,15 @@ else if ( (LA3_0==15) ) {
             }
             switch (alt5) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:392:2: ( (lv_val_3_0= RULE_INT ) ) (otherlv_4= ',' ( (lv_val_5_0= RULE_INT ) ) )*
+                    // InternalFormatterTestLanguage.g:392:2: ( (lv_val_3_0= RULE_INT ) ) (otherlv_4= ',' ( (lv_val_5_0= RULE_INT ) ) )*
                     {
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:392:2: ( (lv_val_3_0= RULE_INT ) )
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:393:1: (lv_val_3_0= RULE_INT )
+                    // InternalFormatterTestLanguage.g:392:2: ( (lv_val_3_0= RULE_INT ) )
+                    // InternalFormatterTestLanguage.g:393:1: (lv_val_3_0= RULE_INT )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:393:1: (lv_val_3_0= RULE_INT )
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:394:3: lv_val_3_0= RULE_INT
+                    // InternalFormatterTestLanguage.g:393:1: (lv_val_3_0= RULE_INT )
+                    // InternalFormatterTestLanguage.g:394:3: lv_val_3_0= RULE_INT
                     {
-                    lv_val_3_0=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleAssign919); 
+                    lv_val_3_0=(Token)match(input,RULE_INT,FOLLOW_10); 
 
                     			newLeafNode(lv_val_3_0, grammarAccess.getAssignAccess().getValINTTerminalRuleCall_3_0_0()); 
                     		
@@ -930,7 +930,7 @@ else if ( (LA3_0==15) ) {
                            			current, 
                            			"val",
                             		lv_val_3_0, 
-                            		"INT");
+                            		"org.eclipse.xtext.common.Terminals.INT");
                     	    
 
                     }
@@ -938,7 +938,7 @@ else if ( (LA3_0==15) ) {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:410:2: (otherlv_4= ',' ( (lv_val_5_0= RULE_INT ) ) )*
+                    // InternalFormatterTestLanguage.g:410:2: (otherlv_4= ',' ( (lv_val_5_0= RULE_INT ) ) )*
                     loop4:
                     do {
                         int alt4=2;
@@ -951,19 +951,19 @@ else if ( (LA3_0==15) ) {
 
                         switch (alt4) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:410:4: otherlv_4= ',' ( (lv_val_5_0= RULE_INT ) )
+                    	    // InternalFormatterTestLanguage.g:410:4: otherlv_4= ',' ( (lv_val_5_0= RULE_INT ) )
                     	    {
-                    	    otherlv_4=(Token)match(input,17,FOLLOW_17_in_ruleAssign937); 
+                    	    otherlv_4=(Token)match(input,17,FOLLOW_11); 
 
                     	        	newLeafNode(otherlv_4, grammarAccess.getAssignAccess().getCommaKeyword_3_1_0());
                     	        
-                    	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:414:1: ( (lv_val_5_0= RULE_INT ) )
-                    	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:415:1: (lv_val_5_0= RULE_INT )
+                    	    // InternalFormatterTestLanguage.g:414:1: ( (lv_val_5_0= RULE_INT ) )
+                    	    // InternalFormatterTestLanguage.g:415:1: (lv_val_5_0= RULE_INT )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:415:1: (lv_val_5_0= RULE_INT )
-                    	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:416:3: lv_val_5_0= RULE_INT
+                    	    // InternalFormatterTestLanguage.g:415:1: (lv_val_5_0= RULE_INT )
+                    	    // InternalFormatterTestLanguage.g:416:3: lv_val_5_0= RULE_INT
                     	    {
-                    	    lv_val_5_0=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleAssign954); 
+                    	    lv_val_5_0=(Token)match(input,RULE_INT,FOLLOW_10); 
 
                     	    			newLeafNode(lv_val_5_0, grammarAccess.getAssignAccess().getValINTTerminalRuleCall_3_1_1_0()); 
                     	    		
@@ -975,7 +975,7 @@ else if ( (LA3_0==15) ) {
                     	           			current, 
                     	           			"val",
                     	            		lv_val_5_0, 
-                    	            		"INT");
+                    	            		"org.eclipse.xtext.common.Terminals.INT");
                     	    	    
 
                     	    }
@@ -998,7 +998,7 @@ else if ( (LA3_0==15) ) {
 
             }
 
-            otherlv_6=(Token)match(input,18,FOLLOW_18_in_ruleAssign975); 
+            otherlv_6=(Token)match(input,18,FOLLOW_2); 
 
                 	newLeafNode(otherlv_6, grammarAccess.getAssignAccess().getRightSquareBracketKeyword_4());
                 
@@ -1023,7 +1023,7 @@ else if ( (LA3_0==15) ) {
 
 
     // $ANTLR start "entryRuleMeth"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:444:1: entryRuleMeth returns [EObject current=null] : iv_ruleMeth= ruleMeth EOF ;
+    // InternalFormatterTestLanguage.g:444:1: entryRuleMeth returns [EObject current=null] : iv_ruleMeth= ruleMeth EOF ;
     public final EObject entryRuleMeth() throws RecognitionException {
         EObject current = null;
 
@@ -1031,17 +1031,17 @@ public final EObject entryRuleMeth() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:445:2: (iv_ruleMeth= ruleMeth EOF )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:446:2: iv_ruleMeth= ruleMeth EOF
+            // InternalFormatterTestLanguage.g:445:2: (iv_ruleMeth= ruleMeth EOF )
+            // InternalFormatterTestLanguage.g:446:2: iv_ruleMeth= ruleMeth EOF
             {
              newCompositeNode(grammarAccess.getMethRule()); 
-            pushFollow(FOLLOW_ruleMeth_in_entryRuleMeth1011);
+            pushFollow(FOLLOW_1);
             iv_ruleMeth=ruleMeth();
 
             state._fsp--;
 
              current =iv_ruleMeth; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleMeth1021); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1059,7 +1059,7 @@ public final EObject entryRuleMeth() throws RecognitionException {
 
 
     // $ANTLR start "ruleMeth"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:453:1: ruleMeth returns [EObject current=null] : (otherlv_0= 'void' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '(' ( ( (lv_param_3_0= ruleParam ) ) (otherlv_4= ',' ( (lv_param_5_0= ruleParam ) ) )* )? otherlv_6= ')' ) ;
+    // InternalFormatterTestLanguage.g:453:1: ruleMeth returns [EObject current=null] : (otherlv_0= 'void' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '(' ( ( (lv_param_3_0= ruleParam ) ) (otherlv_4= ',' ( (lv_param_5_0= ruleParam ) ) )* )? otherlv_6= ')' ) ;
     public final EObject ruleMeth() throws RecognitionException {
         EObject current = null;
 
@@ -1076,23 +1076,23 @@ public final EObject ruleMeth() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:456:28: ( (otherlv_0= 'void' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '(' ( ( (lv_param_3_0= ruleParam ) ) (otherlv_4= ',' ( (lv_param_5_0= ruleParam ) ) )* )? otherlv_6= ')' ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:457:1: (otherlv_0= 'void' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '(' ( ( (lv_param_3_0= ruleParam ) ) (otherlv_4= ',' ( (lv_param_5_0= ruleParam ) ) )* )? otherlv_6= ')' )
+            // InternalFormatterTestLanguage.g:456:28: ( (otherlv_0= 'void' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '(' ( ( (lv_param_3_0= ruleParam ) ) (otherlv_4= ',' ( (lv_param_5_0= ruleParam ) ) )* )? otherlv_6= ')' ) )
+            // InternalFormatterTestLanguage.g:457:1: (otherlv_0= 'void' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '(' ( ( (lv_param_3_0= ruleParam ) ) (otherlv_4= ',' ( (lv_param_5_0= ruleParam ) ) )* )? otherlv_6= ')' )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:457:1: (otherlv_0= 'void' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '(' ( ( (lv_param_3_0= ruleParam ) ) (otherlv_4= ',' ( (lv_param_5_0= ruleParam ) ) )* )? otherlv_6= ')' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:457:3: otherlv_0= 'void' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '(' ( ( (lv_param_3_0= ruleParam ) ) (otherlv_4= ',' ( (lv_param_5_0= ruleParam ) ) )* )? otherlv_6= ')'
+            // InternalFormatterTestLanguage.g:457:1: (otherlv_0= 'void' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '(' ( ( (lv_param_3_0= ruleParam ) ) (otherlv_4= ',' ( (lv_param_5_0= ruleParam ) ) )* )? otherlv_6= ')' )
+            // InternalFormatterTestLanguage.g:457:3: otherlv_0= 'void' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '(' ( ( (lv_param_3_0= ruleParam ) ) (otherlv_4= ',' ( (lv_param_5_0= ruleParam ) ) )* )? otherlv_6= ')'
             {
-            otherlv_0=(Token)match(input,19,FOLLOW_19_in_ruleMeth1058); 
+            otherlv_0=(Token)match(input,19,FOLLOW_6); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getMethAccess().getVoidKeyword_0());
                 
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:461:1: ( (lv_name_1_0= RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:462:1: (lv_name_1_0= RULE_ID )
+            // InternalFormatterTestLanguage.g:461:1: ( (lv_name_1_0= RULE_ID ) )
+            // InternalFormatterTestLanguage.g:462:1: (lv_name_1_0= RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:462:1: (lv_name_1_0= RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:463:3: lv_name_1_0= RULE_ID
+            // InternalFormatterTestLanguage.g:462:1: (lv_name_1_0= RULE_ID )
+            // InternalFormatterTestLanguage.g:463:3: lv_name_1_0= RULE_ID
             {
-            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleMeth1075); 
+            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_12); 
 
             			newLeafNode(lv_name_1_0, grammarAccess.getMethAccess().getNameIDTerminalRuleCall_1_0()); 
             		
@@ -1104,7 +1104,7 @@ public final EObject ruleMeth() throws RecognitionException {
                    			current, 
                    			"name",
                     		lv_name_1_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -1112,11 +1112,11 @@ public final EObject ruleMeth() throws RecognitionException {
 
             }
 
-            otherlv_2=(Token)match(input,20,FOLLOW_20_in_ruleMeth1092); 
+            otherlv_2=(Token)match(input,20,FOLLOW_13); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getMethAccess().getLeftParenthesisKeyword_2());
                 
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:483:1: ( ( (lv_param_3_0= ruleParam ) ) (otherlv_4= ',' ( (lv_param_5_0= ruleParam ) ) )* )?
+            // InternalFormatterTestLanguage.g:483:1: ( ( (lv_param_3_0= ruleParam ) ) (otherlv_4= ',' ( (lv_param_5_0= ruleParam ) ) )* )?
             int alt7=2;
             int LA7_0 = input.LA(1);
 
@@ -1125,18 +1125,18 @@ public final EObject ruleMeth() throws RecognitionException {
             }
             switch (alt7) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:483:2: ( (lv_param_3_0= ruleParam ) ) (otherlv_4= ',' ( (lv_param_5_0= ruleParam ) ) )*
+                    // InternalFormatterTestLanguage.g:483:2: ( (lv_param_3_0= ruleParam ) ) (otherlv_4= ',' ( (lv_param_5_0= ruleParam ) ) )*
                     {
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:483:2: ( (lv_param_3_0= ruleParam ) )
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:484:1: (lv_param_3_0= ruleParam )
+                    // InternalFormatterTestLanguage.g:483:2: ( (lv_param_3_0= ruleParam ) )
+                    // InternalFormatterTestLanguage.g:484:1: (lv_param_3_0= ruleParam )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:484:1: (lv_param_3_0= ruleParam )
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:485:3: lv_param_3_0= ruleParam
+                    // InternalFormatterTestLanguage.g:484:1: (lv_param_3_0= ruleParam )
+                    // InternalFormatterTestLanguage.g:485:3: lv_param_3_0= ruleParam
                     {
                      
                     	        newCompositeNode(grammarAccess.getMethAccess().getParamParamParserRuleCall_3_0_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleParam_in_ruleMeth1114);
+                    pushFollow(FOLLOW_14);
                     lv_param_3_0=ruleParam();
 
                     state._fsp--;
@@ -1149,7 +1149,7 @@ public final EObject ruleMeth() throws RecognitionException {
                            			current, 
                            			"param",
                             		lv_param_3_0, 
-                            		"Param");
+                            		"com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.Param");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -1158,7 +1158,7 @@ public final EObject ruleMeth() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:501:2: (otherlv_4= ',' ( (lv_param_5_0= ruleParam ) ) )*
+                    // InternalFormatterTestLanguage.g:501:2: (otherlv_4= ',' ( (lv_param_5_0= ruleParam ) ) )*
                     loop6:
                     do {
                         int alt6=2;
@@ -1171,22 +1171,22 @@ public final EObject ruleMeth() throws RecognitionException {
 
                         switch (alt6) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:501:4: otherlv_4= ',' ( (lv_param_5_0= ruleParam ) )
+                    	    // InternalFormatterTestLanguage.g:501:4: otherlv_4= ',' ( (lv_param_5_0= ruleParam ) )
                     	    {
-                    	    otherlv_4=(Token)match(input,17,FOLLOW_17_in_ruleMeth1127); 
+                    	    otherlv_4=(Token)match(input,17,FOLLOW_6); 
 
                     	        	newLeafNode(otherlv_4, grammarAccess.getMethAccess().getCommaKeyword_3_1_0());
                     	        
-                    	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:505:1: ( (lv_param_5_0= ruleParam ) )
-                    	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:506:1: (lv_param_5_0= ruleParam )
+                    	    // InternalFormatterTestLanguage.g:505:1: ( (lv_param_5_0= ruleParam ) )
+                    	    // InternalFormatterTestLanguage.g:506:1: (lv_param_5_0= ruleParam )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:506:1: (lv_param_5_0= ruleParam )
-                    	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:507:3: lv_param_5_0= ruleParam
+                    	    // InternalFormatterTestLanguage.g:506:1: (lv_param_5_0= ruleParam )
+                    	    // InternalFormatterTestLanguage.g:507:3: lv_param_5_0= ruleParam
                     	    {
                     	     
                     	    	        newCompositeNode(grammarAccess.getMethAccess().getParamParamParserRuleCall_3_1_1_0()); 
                     	    	    
-                    	    pushFollow(FOLLOW_ruleParam_in_ruleMeth1148);
+                    	    pushFollow(FOLLOW_14);
                     	    lv_param_5_0=ruleParam();
 
                     	    state._fsp--;
@@ -1199,7 +1199,7 @@ public final EObject ruleMeth() throws RecognitionException {
                     	           			current, 
                     	           			"param",
                     	            		lv_param_5_0, 
-                    	            		"Param");
+                    	            		"com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.Param");
                     	    	        afterParserOrEnumRuleCall();
                     	    	    
 
@@ -1223,7 +1223,7 @@ public final EObject ruleMeth() throws RecognitionException {
 
             }
 
-            otherlv_6=(Token)match(input,21,FOLLOW_21_in_ruleMeth1164); 
+            otherlv_6=(Token)match(input,21,FOLLOW_2); 
 
                 	newLeafNode(otherlv_6, grammarAccess.getMethAccess().getRightParenthesisKeyword_4());
                 
@@ -1248,7 +1248,7 @@ public final EObject ruleMeth() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleParam"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:535:1: entryRuleParam returns [EObject current=null] : iv_ruleParam= ruleParam EOF ;
+    // InternalFormatterTestLanguage.g:535:1: entryRuleParam returns [EObject current=null] : iv_ruleParam= ruleParam EOF ;
     public final EObject entryRuleParam() throws RecognitionException {
         EObject current = null;
 
@@ -1256,17 +1256,17 @@ public final EObject entryRuleParam() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:536:2: (iv_ruleParam= ruleParam EOF )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:537:2: iv_ruleParam= ruleParam EOF
+            // InternalFormatterTestLanguage.g:536:2: (iv_ruleParam= ruleParam EOF )
+            // InternalFormatterTestLanguage.g:537:2: iv_ruleParam= ruleParam EOF
             {
              newCompositeNode(grammarAccess.getParamRule()); 
-            pushFollow(FOLLOW_ruleParam_in_entryRuleParam1200);
+            pushFollow(FOLLOW_1);
             iv_ruleParam=ruleParam();
 
             state._fsp--;
 
              current =iv_ruleParam; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleParam1210); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1284,7 +1284,7 @@ public final EObject entryRuleParam() throws RecognitionException {
 
 
     // $ANTLR start "ruleParam"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:544:1: ruleParam returns [EObject current=null] : ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= ':' ( (lv_type_2_0= RULE_ID ) ) ) ;
+    // InternalFormatterTestLanguage.g:544:1: ruleParam returns [EObject current=null] : ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= ':' ( (lv_type_2_0= RULE_ID ) ) ) ;
     public final EObject ruleParam() throws RecognitionException {
         EObject current = null;
 
@@ -1295,19 +1295,19 @@ public final EObject ruleParam() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:547:28: ( ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= ':' ( (lv_type_2_0= RULE_ID ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:548:1: ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= ':' ( (lv_type_2_0= RULE_ID ) ) )
+            // InternalFormatterTestLanguage.g:547:28: ( ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= ':' ( (lv_type_2_0= RULE_ID ) ) ) )
+            // InternalFormatterTestLanguage.g:548:1: ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= ':' ( (lv_type_2_0= RULE_ID ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:548:1: ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= ':' ( (lv_type_2_0= RULE_ID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:548:2: ( (lv_name_0_0= RULE_ID ) ) otherlv_1= ':' ( (lv_type_2_0= RULE_ID ) )
+            // InternalFormatterTestLanguage.g:548:1: ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= ':' ( (lv_type_2_0= RULE_ID ) ) )
+            // InternalFormatterTestLanguage.g:548:2: ( (lv_name_0_0= RULE_ID ) ) otherlv_1= ':' ( (lv_type_2_0= RULE_ID ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:548:2: ( (lv_name_0_0= RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:549:1: (lv_name_0_0= RULE_ID )
+            // InternalFormatterTestLanguage.g:548:2: ( (lv_name_0_0= RULE_ID ) )
+            // InternalFormatterTestLanguage.g:549:1: (lv_name_0_0= RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:549:1: (lv_name_0_0= RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:550:3: lv_name_0_0= RULE_ID
+            // InternalFormatterTestLanguage.g:549:1: (lv_name_0_0= RULE_ID )
+            // InternalFormatterTestLanguage.g:550:3: lv_name_0_0= RULE_ID
             {
-            lv_name_0_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleParam1252); 
+            lv_name_0_0=(Token)match(input,RULE_ID,FOLLOW_15); 
 
             			newLeafNode(lv_name_0_0, grammarAccess.getParamAccess().getNameIDTerminalRuleCall_0_0()); 
             		
@@ -1319,7 +1319,7 @@ public final EObject ruleParam() throws RecognitionException {
                    			current, 
                    			"name",
                     		lv_name_0_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -1327,17 +1327,17 @@ public final EObject ruleParam() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,22,FOLLOW_22_in_ruleParam1269); 
+            otherlv_1=(Token)match(input,22,FOLLOW_6); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getParamAccess().getColonKeyword_1());
                 
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:570:1: ( (lv_type_2_0= RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:571:1: (lv_type_2_0= RULE_ID )
+            // InternalFormatterTestLanguage.g:570:1: ( (lv_type_2_0= RULE_ID ) )
+            // InternalFormatterTestLanguage.g:571:1: (lv_type_2_0= RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:571:1: (lv_type_2_0= RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:572:3: lv_type_2_0= RULE_ID
+            // InternalFormatterTestLanguage.g:571:1: (lv_type_2_0= RULE_ID )
+            // InternalFormatterTestLanguage.g:572:3: lv_type_2_0= RULE_ID
             {
-            lv_type_2_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleParam1286); 
+            lv_type_2_0=(Token)match(input,RULE_ID,FOLLOW_2); 
 
             			newLeafNode(lv_type_2_0, grammarAccess.getParamAccess().getTypeIDTerminalRuleCall_2_0()); 
             		
@@ -1349,7 +1349,7 @@ public final EObject ruleParam() throws RecognitionException {
                    			current, 
                    			"type",
                     		lv_type_2_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -1378,7 +1378,7 @@ public final EObject ruleParam() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleSpace"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:596:1: entryRuleSpace returns [EObject current=null] : iv_ruleSpace= ruleSpace EOF ;
+    // InternalFormatterTestLanguage.g:596:1: entryRuleSpace returns [EObject current=null] : iv_ruleSpace= ruleSpace EOF ;
     public final EObject entryRuleSpace() throws RecognitionException {
         EObject current = null;
 
@@ -1386,17 +1386,17 @@ public final EObject entryRuleSpace() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:597:2: (iv_ruleSpace= ruleSpace EOF )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:598:2: iv_ruleSpace= ruleSpace EOF
+            // InternalFormatterTestLanguage.g:597:2: (iv_ruleSpace= ruleSpace EOF )
+            // InternalFormatterTestLanguage.g:598:2: iv_ruleSpace= ruleSpace EOF
             {
              newCompositeNode(grammarAccess.getSpaceRule()); 
-            pushFollow(FOLLOW_ruleSpace_in_entryRuleSpace1327);
+            pushFollow(FOLLOW_1);
             iv_ruleSpace=ruleSpace();
 
             state._fsp--;
 
              current =iv_ruleSpace; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSpace1337); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1414,7 +1414,7 @@ public final EObject entryRuleSpace() throws RecognitionException {
 
 
     // $ANTLR start "ruleSpace"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:605:1: ruleSpace returns [EObject current=null] : (otherlv_0= 'space' ( (lv_val_1_0= RULE_ID ) ) ) ;
+    // InternalFormatterTestLanguage.g:605:1: ruleSpace returns [EObject current=null] : (otherlv_0= 'space' ( (lv_val_1_0= RULE_ID ) ) ) ;
     public final EObject ruleSpace() throws RecognitionException {
         EObject current = null;
 
@@ -1424,23 +1424,23 @@ public final EObject ruleSpace() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:608:28: ( (otherlv_0= 'space' ( (lv_val_1_0= RULE_ID ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:609:1: (otherlv_0= 'space' ( (lv_val_1_0= RULE_ID ) ) )
+            // InternalFormatterTestLanguage.g:608:28: ( (otherlv_0= 'space' ( (lv_val_1_0= RULE_ID ) ) ) )
+            // InternalFormatterTestLanguage.g:609:1: (otherlv_0= 'space' ( (lv_val_1_0= RULE_ID ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:609:1: (otherlv_0= 'space' ( (lv_val_1_0= RULE_ID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:609:3: otherlv_0= 'space' ( (lv_val_1_0= RULE_ID ) )
+            // InternalFormatterTestLanguage.g:609:1: (otherlv_0= 'space' ( (lv_val_1_0= RULE_ID ) ) )
+            // InternalFormatterTestLanguage.g:609:3: otherlv_0= 'space' ( (lv_val_1_0= RULE_ID ) )
             {
-            otherlv_0=(Token)match(input,23,FOLLOW_23_in_ruleSpace1374); 
+            otherlv_0=(Token)match(input,23,FOLLOW_6); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getSpaceAccess().getSpaceKeyword_0());
                 
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:613:1: ( (lv_val_1_0= RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:614:1: (lv_val_1_0= RULE_ID )
+            // InternalFormatterTestLanguage.g:613:1: ( (lv_val_1_0= RULE_ID ) )
+            // InternalFormatterTestLanguage.g:614:1: (lv_val_1_0= RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:614:1: (lv_val_1_0= RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:615:3: lv_val_1_0= RULE_ID
+            // InternalFormatterTestLanguage.g:614:1: (lv_val_1_0= RULE_ID )
+            // InternalFormatterTestLanguage.g:615:3: lv_val_1_0= RULE_ID
             {
-            lv_val_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSpace1391); 
+            lv_val_1_0=(Token)match(input,RULE_ID,FOLLOW_2); 
 
             			newLeafNode(lv_val_1_0, grammarAccess.getSpaceAccess().getValIDTerminalRuleCall_1_0()); 
             		
@@ -1452,7 +1452,7 @@ public final EObject ruleSpace() throws RecognitionException {
                    			current, 
                    			"val",
                     		lv_val_1_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -1481,7 +1481,7 @@ public final EObject ruleSpace() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleTestLinewrap"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:639:1: entryRuleTestLinewrap returns [EObject current=null] : iv_ruleTestLinewrap= ruleTestLinewrap EOF ;
+    // InternalFormatterTestLanguage.g:639:1: entryRuleTestLinewrap returns [EObject current=null] : iv_ruleTestLinewrap= ruleTestLinewrap EOF ;
     public final EObject entryRuleTestLinewrap() throws RecognitionException {
         EObject current = null;
 
@@ -1489,17 +1489,17 @@ public final EObject entryRuleTestLinewrap() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:640:2: (iv_ruleTestLinewrap= ruleTestLinewrap EOF )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:641:2: iv_ruleTestLinewrap= ruleTestLinewrap EOF
+            // InternalFormatterTestLanguage.g:640:2: (iv_ruleTestLinewrap= ruleTestLinewrap EOF )
+            // InternalFormatterTestLanguage.g:641:2: iv_ruleTestLinewrap= ruleTestLinewrap EOF
             {
              newCompositeNode(grammarAccess.getTestLinewrapRule()); 
-            pushFollow(FOLLOW_ruleTestLinewrap_in_entryRuleTestLinewrap1432);
+            pushFollow(FOLLOW_1);
             iv_ruleTestLinewrap=ruleTestLinewrap();
 
             state._fsp--;
 
              current =iv_ruleTestLinewrap; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTestLinewrap1442); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1517,7 +1517,7 @@ public final EObject entryRuleTestLinewrap() throws RecognitionException {
 
 
     // $ANTLR start "ruleTestLinewrap"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:648:1: ruleTestLinewrap returns [EObject current=null] : ( () otherlv_1= 'linewrap' ( (lv_items_2_0= ruleLine ) )* ) ;
+    // InternalFormatterTestLanguage.g:648:1: ruleTestLinewrap returns [EObject current=null] : ( () otherlv_1= 'linewrap' ( (lv_items_2_0= ruleLine ) )* ) ;
     public final EObject ruleTestLinewrap() throws RecognitionException {
         EObject current = null;
 
@@ -1528,14 +1528,14 @@ public final EObject ruleTestLinewrap() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:651:28: ( ( () otherlv_1= 'linewrap' ( (lv_items_2_0= ruleLine ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:652:1: ( () otherlv_1= 'linewrap' ( (lv_items_2_0= ruleLine ) )* )
+            // InternalFormatterTestLanguage.g:651:28: ( ( () otherlv_1= 'linewrap' ( (lv_items_2_0= ruleLine ) )* ) )
+            // InternalFormatterTestLanguage.g:652:1: ( () otherlv_1= 'linewrap' ( (lv_items_2_0= ruleLine ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:652:1: ( () otherlv_1= 'linewrap' ( (lv_items_2_0= ruleLine ) )* )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:652:2: () otherlv_1= 'linewrap' ( (lv_items_2_0= ruleLine ) )*
+            // InternalFormatterTestLanguage.g:652:1: ( () otherlv_1= 'linewrap' ( (lv_items_2_0= ruleLine ) )* )
+            // InternalFormatterTestLanguage.g:652:2: () otherlv_1= 'linewrap' ( (lv_items_2_0= ruleLine ) )*
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:652:2: ()
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:653:5: 
+            // InternalFormatterTestLanguage.g:652:2: ()
+            // InternalFormatterTestLanguage.g:653:5: 
             {
 
                     current = forceCreateModelElement(
@@ -1545,11 +1545,11 @@ public final EObject ruleTestLinewrap() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,24,FOLLOW_24_in_ruleTestLinewrap1488); 
+            otherlv_1=(Token)match(input,24,FOLLOW_16); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getTestLinewrapAccess().getLinewrapKeyword_1());
                 
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:662:1: ( (lv_items_2_0= ruleLine ) )*
+            // InternalFormatterTestLanguage.g:662:1: ( (lv_items_2_0= ruleLine ) )*
             loop8:
             do {
                 int alt8=2;
@@ -1562,15 +1562,15 @@ public final EObject ruleTestLinewrap() throws RecognitionException {
 
                 switch (alt8) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:663:1: (lv_items_2_0= ruleLine )
+            	    // InternalFormatterTestLanguage.g:663:1: (lv_items_2_0= ruleLine )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:663:1: (lv_items_2_0= ruleLine )
-            	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:664:3: lv_items_2_0= ruleLine
+            	    // InternalFormatterTestLanguage.g:663:1: (lv_items_2_0= ruleLine )
+            	    // InternalFormatterTestLanguage.g:664:3: lv_items_2_0= ruleLine
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getTestLinewrapAccess().getItemsLineParserRuleCall_2_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleLine_in_ruleTestLinewrap1509);
+            	    pushFollow(FOLLOW_16);
             	    lv_items_2_0=ruleLine();
 
             	    state._fsp--;
@@ -1583,7 +1583,7 @@ public final EObject ruleTestLinewrap() throws RecognitionException {
             	           			current, 
             	           			"items",
             	            		lv_items_2_0, 
-            	            		"Line");
+            	            		"com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.Line");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -1619,7 +1619,7 @@ public final EObject ruleTestLinewrap() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleTestLinewrapMinMax"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:688:1: entryRuleTestLinewrapMinMax returns [EObject current=null] : iv_ruleTestLinewrapMinMax= ruleTestLinewrapMinMax EOF ;
+    // InternalFormatterTestLanguage.g:688:1: entryRuleTestLinewrapMinMax returns [EObject current=null] : iv_ruleTestLinewrapMinMax= ruleTestLinewrapMinMax EOF ;
     public final EObject entryRuleTestLinewrapMinMax() throws RecognitionException {
         EObject current = null;
 
@@ -1627,17 +1627,17 @@ public final EObject entryRuleTestLinewrapMinMax() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:689:2: (iv_ruleTestLinewrapMinMax= ruleTestLinewrapMinMax EOF )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:690:2: iv_ruleTestLinewrapMinMax= ruleTestLinewrapMinMax EOF
+            // InternalFormatterTestLanguage.g:689:2: (iv_ruleTestLinewrapMinMax= ruleTestLinewrapMinMax EOF )
+            // InternalFormatterTestLanguage.g:690:2: iv_ruleTestLinewrapMinMax= ruleTestLinewrapMinMax EOF
             {
              newCompositeNode(grammarAccess.getTestLinewrapMinMaxRule()); 
-            pushFollow(FOLLOW_ruleTestLinewrapMinMax_in_entryRuleTestLinewrapMinMax1546);
+            pushFollow(FOLLOW_1);
             iv_ruleTestLinewrapMinMax=ruleTestLinewrapMinMax();
 
             state._fsp--;
 
              current =iv_ruleTestLinewrapMinMax; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTestLinewrapMinMax1556); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1655,7 +1655,7 @@ public final EObject entryRuleTestLinewrapMinMax() throws RecognitionException {
 
 
     // $ANTLR start "ruleTestLinewrapMinMax"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:697:1: ruleTestLinewrapMinMax returns [EObject current=null] : ( () otherlv_1= 'wrapminmax' ( (lv_items_2_0= ruleLine ) )* ) ;
+    // InternalFormatterTestLanguage.g:697:1: ruleTestLinewrapMinMax returns [EObject current=null] : ( () otherlv_1= 'wrapminmax' ( (lv_items_2_0= ruleLine ) )* ) ;
     public final EObject ruleTestLinewrapMinMax() throws RecognitionException {
         EObject current = null;
 
@@ -1666,14 +1666,14 @@ public final EObject ruleTestLinewrapMinMax() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:700:28: ( ( () otherlv_1= 'wrapminmax' ( (lv_items_2_0= ruleLine ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:701:1: ( () otherlv_1= 'wrapminmax' ( (lv_items_2_0= ruleLine ) )* )
+            // InternalFormatterTestLanguage.g:700:28: ( ( () otherlv_1= 'wrapminmax' ( (lv_items_2_0= ruleLine ) )* ) )
+            // InternalFormatterTestLanguage.g:701:1: ( () otherlv_1= 'wrapminmax' ( (lv_items_2_0= ruleLine ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:701:1: ( () otherlv_1= 'wrapminmax' ( (lv_items_2_0= ruleLine ) )* )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:701:2: () otherlv_1= 'wrapminmax' ( (lv_items_2_0= ruleLine ) )*
+            // InternalFormatterTestLanguage.g:701:1: ( () otherlv_1= 'wrapminmax' ( (lv_items_2_0= ruleLine ) )* )
+            // InternalFormatterTestLanguage.g:701:2: () otherlv_1= 'wrapminmax' ( (lv_items_2_0= ruleLine ) )*
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:701:2: ()
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:702:5: 
+            // InternalFormatterTestLanguage.g:701:2: ()
+            // InternalFormatterTestLanguage.g:702:5: 
             {
 
                     current = forceCreateModelElement(
@@ -1683,11 +1683,11 @@ public final EObject ruleTestLinewrapMinMax() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,25,FOLLOW_25_in_ruleTestLinewrapMinMax1602); 
+            otherlv_1=(Token)match(input,25,FOLLOW_16); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getTestLinewrapMinMaxAccess().getWrapminmaxKeyword_1());
                 
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:711:1: ( (lv_items_2_0= ruleLine ) )*
+            // InternalFormatterTestLanguage.g:711:1: ( (lv_items_2_0= ruleLine ) )*
             loop9:
             do {
                 int alt9=2;
@@ -1700,15 +1700,15 @@ public final EObject ruleTestLinewrapMinMax() throws RecognitionException {
 
                 switch (alt9) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:712:1: (lv_items_2_0= ruleLine )
+            	    // InternalFormatterTestLanguage.g:712:1: (lv_items_2_0= ruleLine )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:712:1: (lv_items_2_0= ruleLine )
-            	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:713:3: lv_items_2_0= ruleLine
+            	    // InternalFormatterTestLanguage.g:712:1: (lv_items_2_0= ruleLine )
+            	    // InternalFormatterTestLanguage.g:713:3: lv_items_2_0= ruleLine
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getTestLinewrapMinMaxAccess().getItemsLineParserRuleCall_2_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleLine_in_ruleTestLinewrapMinMax1623);
+            	    pushFollow(FOLLOW_16);
             	    lv_items_2_0=ruleLine();
 
             	    state._fsp--;
@@ -1721,7 +1721,7 @@ public final EObject ruleTestLinewrapMinMax() throws RecognitionException {
             	           			current, 
             	           			"items",
             	            		lv_items_2_0, 
-            	            		"Line");
+            	            		"com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.Line");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -1757,7 +1757,7 @@ public final EObject ruleTestLinewrapMinMax() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleTestIndentation"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:737:1: entryRuleTestIndentation returns [EObject current=null] : iv_ruleTestIndentation= ruleTestIndentation EOF ;
+    // InternalFormatterTestLanguage.g:737:1: entryRuleTestIndentation returns [EObject current=null] : iv_ruleTestIndentation= ruleTestIndentation EOF ;
     public final EObject entryRuleTestIndentation() throws RecognitionException {
         EObject current = null;
 
@@ -1765,17 +1765,17 @@ public final EObject entryRuleTestIndentation() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:738:2: (iv_ruleTestIndentation= ruleTestIndentation EOF )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:739:2: iv_ruleTestIndentation= ruleTestIndentation EOF
+            // InternalFormatterTestLanguage.g:738:2: (iv_ruleTestIndentation= ruleTestIndentation EOF )
+            // InternalFormatterTestLanguage.g:739:2: iv_ruleTestIndentation= ruleTestIndentation EOF
             {
              newCompositeNode(grammarAccess.getTestIndentationRule()); 
-            pushFollow(FOLLOW_ruleTestIndentation_in_entryRuleTestIndentation1660);
+            pushFollow(FOLLOW_1);
             iv_ruleTestIndentation=ruleTestIndentation();
 
             state._fsp--;
 
              current =iv_ruleTestIndentation; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTestIndentation1670); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1793,7 +1793,7 @@ public final EObject entryRuleTestIndentation() throws RecognitionException {
 
 
     // $ANTLR start "ruleTestIndentation"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:746:1: ruleTestIndentation returns [EObject current=null] : ( () otherlv_1= 'indentation' otherlv_2= '{' ( ( (lv_sub_3_0= ruleTestIndentation ) ) | ( (lv_items_4_0= ruleLine ) ) )* otherlv_5= '}' ( (lv_semi_6_0= ';' ) )? ) ;
+    // InternalFormatterTestLanguage.g:746:1: ruleTestIndentation returns [EObject current=null] : ( () otherlv_1= 'indentation' otherlv_2= '{' ( ( (lv_sub_3_0= ruleTestIndentation ) ) | ( (lv_items_4_0= ruleLine ) ) )* otherlv_5= '}' ( (lv_semi_6_0= ';' ) )? ) ;
     public final EObject ruleTestIndentation() throws RecognitionException {
         EObject current = null;
 
@@ -1809,14 +1809,14 @@ public final EObject ruleTestIndentation() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:749:28: ( ( () otherlv_1= 'indentation' otherlv_2= '{' ( ( (lv_sub_3_0= ruleTestIndentation ) ) | ( (lv_items_4_0= ruleLine ) ) )* otherlv_5= '}' ( (lv_semi_6_0= ';' ) )? ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:750:1: ( () otherlv_1= 'indentation' otherlv_2= '{' ( ( (lv_sub_3_0= ruleTestIndentation ) ) | ( (lv_items_4_0= ruleLine ) ) )* otherlv_5= '}' ( (lv_semi_6_0= ';' ) )? )
+            // InternalFormatterTestLanguage.g:749:28: ( ( () otherlv_1= 'indentation' otherlv_2= '{' ( ( (lv_sub_3_0= ruleTestIndentation ) ) | ( (lv_items_4_0= ruleLine ) ) )* otherlv_5= '}' ( (lv_semi_6_0= ';' ) )? ) )
+            // InternalFormatterTestLanguage.g:750:1: ( () otherlv_1= 'indentation' otherlv_2= '{' ( ( (lv_sub_3_0= ruleTestIndentation ) ) | ( (lv_items_4_0= ruleLine ) ) )* otherlv_5= '}' ( (lv_semi_6_0= ';' ) )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:750:1: ( () otherlv_1= 'indentation' otherlv_2= '{' ( ( (lv_sub_3_0= ruleTestIndentation ) ) | ( (lv_items_4_0= ruleLine ) ) )* otherlv_5= '}' ( (lv_semi_6_0= ';' ) )? )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:750:2: () otherlv_1= 'indentation' otherlv_2= '{' ( ( (lv_sub_3_0= ruleTestIndentation ) ) | ( (lv_items_4_0= ruleLine ) ) )* otherlv_5= '}' ( (lv_semi_6_0= ';' ) )?
+            // InternalFormatterTestLanguage.g:750:1: ( () otherlv_1= 'indentation' otherlv_2= '{' ( ( (lv_sub_3_0= ruleTestIndentation ) ) | ( (lv_items_4_0= ruleLine ) ) )* otherlv_5= '}' ( (lv_semi_6_0= ';' ) )? )
+            // InternalFormatterTestLanguage.g:750:2: () otherlv_1= 'indentation' otherlv_2= '{' ( ( (lv_sub_3_0= ruleTestIndentation ) ) | ( (lv_items_4_0= ruleLine ) ) )* otherlv_5= '}' ( (lv_semi_6_0= ';' ) )?
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:750:2: ()
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:751:5: 
+            // InternalFormatterTestLanguage.g:750:2: ()
+            // InternalFormatterTestLanguage.g:751:5: 
             {
 
                     current = forceCreateModelElement(
@@ -1826,15 +1826,15 @@ public final EObject ruleTestIndentation() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,26,FOLLOW_26_in_ruleTestIndentation1716); 
+            otherlv_1=(Token)match(input,26,FOLLOW_17); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getTestIndentationAccess().getIndentationKeyword_1());
                 
-            otherlv_2=(Token)match(input,27,FOLLOW_27_in_ruleTestIndentation1728); 
+            otherlv_2=(Token)match(input,27,FOLLOW_18); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getTestIndentationAccess().getLeftCurlyBracketKeyword_2());
                 
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:764:1: ( ( (lv_sub_3_0= ruleTestIndentation ) ) | ( (lv_items_4_0= ruleLine ) ) )*
+            // InternalFormatterTestLanguage.g:764:1: ( ( (lv_sub_3_0= ruleTestIndentation ) ) | ( (lv_items_4_0= ruleLine ) ) )*
             loop10:
             do {
                 int alt10=3;
@@ -1850,18 +1850,18 @@ else if ( (LA10_0==RULE_ID||LA10_0==19||LA10_0==23||LA10_0==35||(LA10_0>=37 && L
 
                 switch (alt10) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:764:2: ( (lv_sub_3_0= ruleTestIndentation ) )
+            	    // InternalFormatterTestLanguage.g:764:2: ( (lv_sub_3_0= ruleTestIndentation ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:764:2: ( (lv_sub_3_0= ruleTestIndentation ) )
-            	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:765:1: (lv_sub_3_0= ruleTestIndentation )
+            	    // InternalFormatterTestLanguage.g:764:2: ( (lv_sub_3_0= ruleTestIndentation ) )
+            	    // InternalFormatterTestLanguage.g:765:1: (lv_sub_3_0= ruleTestIndentation )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:765:1: (lv_sub_3_0= ruleTestIndentation )
-            	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:766:3: lv_sub_3_0= ruleTestIndentation
+            	    // InternalFormatterTestLanguage.g:765:1: (lv_sub_3_0= ruleTestIndentation )
+            	    // InternalFormatterTestLanguage.g:766:3: lv_sub_3_0= ruleTestIndentation
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getTestIndentationAccess().getSubTestIndentationParserRuleCall_3_0_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleTestIndentation_in_ruleTestIndentation1750);
+            	    pushFollow(FOLLOW_18);
             	    lv_sub_3_0=ruleTestIndentation();
 
             	    state._fsp--;
@@ -1874,7 +1874,7 @@ else if ( (LA10_0==RULE_ID||LA10_0==19||LA10_0==23||LA10_0==35||(LA10_0>=37 && L
             	           			current, 
             	           			"sub",
             	            		lv_sub_3_0, 
-            	            		"TestIndentation");
+            	            		"com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.TestIndentation");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -1887,18 +1887,18 @@ else if ( (LA10_0==RULE_ID||LA10_0==19||LA10_0==23||LA10_0==35||(LA10_0>=37 && L
             	    }
             	    break;
             	case 2 :
-            	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:783:6: ( (lv_items_4_0= ruleLine ) )
+            	    // InternalFormatterTestLanguage.g:783:6: ( (lv_items_4_0= ruleLine ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:783:6: ( (lv_items_4_0= ruleLine ) )
-            	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:784:1: (lv_items_4_0= ruleLine )
+            	    // InternalFormatterTestLanguage.g:783:6: ( (lv_items_4_0= ruleLine ) )
+            	    // InternalFormatterTestLanguage.g:784:1: (lv_items_4_0= ruleLine )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:784:1: (lv_items_4_0= ruleLine )
-            	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:785:3: lv_items_4_0= ruleLine
+            	    // InternalFormatterTestLanguage.g:784:1: (lv_items_4_0= ruleLine )
+            	    // InternalFormatterTestLanguage.g:785:3: lv_items_4_0= ruleLine
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getTestIndentationAccess().getItemsLineParserRuleCall_3_1_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleLine_in_ruleTestIndentation1777);
+            	    pushFollow(FOLLOW_18);
             	    lv_items_4_0=ruleLine();
 
             	    state._fsp--;
@@ -1911,7 +1911,7 @@ else if ( (LA10_0==RULE_ID||LA10_0==19||LA10_0==23||LA10_0==35||(LA10_0>=37 && L
             	           			current, 
             	           			"items",
             	            		lv_items_4_0, 
-            	            		"Line");
+            	            		"com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.Line");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -1929,11 +1929,11 @@ else if ( (LA10_0==RULE_ID||LA10_0==19||LA10_0==23||LA10_0==35||(LA10_0>=37 && L
                 }
             } while (true);
 
-            otherlv_5=(Token)match(input,28,FOLLOW_28_in_ruleTestIndentation1791); 
+            otherlv_5=(Token)match(input,28,FOLLOW_19); 
 
                 	newLeafNode(otherlv_5, grammarAccess.getTestIndentationAccess().getRightCurlyBracketKeyword_4());
                 
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:805:1: ( (lv_semi_6_0= ';' ) )?
+            // InternalFormatterTestLanguage.g:805:1: ( (lv_semi_6_0= ';' ) )?
             int alt11=2;
             int LA11_0 = input.LA(1);
 
@@ -1942,12 +1942,12 @@ else if ( (LA10_0==RULE_ID||LA10_0==19||LA10_0==23||LA10_0==35||(LA10_0>=37 && L
             }
             switch (alt11) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:806:1: (lv_semi_6_0= ';' )
+                    // InternalFormatterTestLanguage.g:806:1: (lv_semi_6_0= ';' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:806:1: (lv_semi_6_0= ';' )
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:807:3: lv_semi_6_0= ';'
+                    // InternalFormatterTestLanguage.g:806:1: (lv_semi_6_0= ';' )
+                    // InternalFormatterTestLanguage.g:807:3: lv_semi_6_0= ';'
                     {
-                    lv_semi_6_0=(Token)match(input,13,FOLLOW_13_in_ruleTestIndentation1809); 
+                    lv_semi_6_0=(Token)match(input,13,FOLLOW_2); 
 
                             newLeafNode(lv_semi_6_0, grammarAccess.getTestIndentationAccess().getSemiSemicolonKeyword_5_0());
                         
@@ -1987,7 +1987,7 @@ else if ( (LA10_0==RULE_ID||LA10_0==19||LA10_0==23||LA10_0==35||(LA10_0>=37 && L
 
 
     // $ANTLR start "entryRuleTestColumn"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:828:1: entryRuleTestColumn returns [EObject current=null] : iv_ruleTestColumn= ruleTestColumn EOF ;
+    // InternalFormatterTestLanguage.g:828:1: entryRuleTestColumn returns [EObject current=null] : iv_ruleTestColumn= ruleTestColumn EOF ;
     public final EObject entryRuleTestColumn() throws RecognitionException {
         EObject current = null;
 
@@ -1995,17 +1995,17 @@ public final EObject entryRuleTestColumn() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:829:2: (iv_ruleTestColumn= ruleTestColumn EOF )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:830:2: iv_ruleTestColumn= ruleTestColumn EOF
+            // InternalFormatterTestLanguage.g:829:2: (iv_ruleTestColumn= ruleTestColumn EOF )
+            // InternalFormatterTestLanguage.g:830:2: iv_ruleTestColumn= ruleTestColumn EOF
             {
              newCompositeNode(grammarAccess.getTestColumnRule()); 
-            pushFollow(FOLLOW_ruleTestColumn_in_entryRuleTestColumn1859);
+            pushFollow(FOLLOW_1);
             iv_ruleTestColumn=ruleTestColumn();
 
             state._fsp--;
 
              current =iv_ruleTestColumn; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTestColumn1869); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2023,7 +2023,7 @@ public final EObject entryRuleTestColumn() throws RecognitionException {
 
 
     // $ANTLR start "ruleTestColumn"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:837:1: ruleTestColumn returns [EObject current=null] : ( () otherlv_1= 'column' ( (lv_name_2_0= RULE_ID ) )? (otherlv_3= 'item' ( (lv_items_4_0= ruleLine ) ) )* ) ;
+    // InternalFormatterTestLanguage.g:837:1: ruleTestColumn returns [EObject current=null] : ( () otherlv_1= 'column' ( (lv_name_2_0= RULE_ID ) )? (otherlv_3= 'item' ( (lv_items_4_0= ruleLine ) ) )* ) ;
     public final EObject ruleTestColumn() throws RecognitionException {
         EObject current = null;
 
@@ -2036,14 +2036,14 @@ public final EObject ruleTestColumn() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:840:28: ( ( () otherlv_1= 'column' ( (lv_name_2_0= RULE_ID ) )? (otherlv_3= 'item' ( (lv_items_4_0= ruleLine ) ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:841:1: ( () otherlv_1= 'column' ( (lv_name_2_0= RULE_ID ) )? (otherlv_3= 'item' ( (lv_items_4_0= ruleLine ) ) )* )
+            // InternalFormatterTestLanguage.g:840:28: ( ( () otherlv_1= 'column' ( (lv_name_2_0= RULE_ID ) )? (otherlv_3= 'item' ( (lv_items_4_0= ruleLine ) ) )* ) )
+            // InternalFormatterTestLanguage.g:841:1: ( () otherlv_1= 'column' ( (lv_name_2_0= RULE_ID ) )? (otherlv_3= 'item' ( (lv_items_4_0= ruleLine ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:841:1: ( () otherlv_1= 'column' ( (lv_name_2_0= RULE_ID ) )? (otherlv_3= 'item' ( (lv_items_4_0= ruleLine ) ) )* )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:841:2: () otherlv_1= 'column' ( (lv_name_2_0= RULE_ID ) )? (otherlv_3= 'item' ( (lv_items_4_0= ruleLine ) ) )*
+            // InternalFormatterTestLanguage.g:841:1: ( () otherlv_1= 'column' ( (lv_name_2_0= RULE_ID ) )? (otherlv_3= 'item' ( (lv_items_4_0= ruleLine ) ) )* )
+            // InternalFormatterTestLanguage.g:841:2: () otherlv_1= 'column' ( (lv_name_2_0= RULE_ID ) )? (otherlv_3= 'item' ( (lv_items_4_0= ruleLine ) ) )*
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:841:2: ()
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:842:5: 
+            // InternalFormatterTestLanguage.g:841:2: ()
+            // InternalFormatterTestLanguage.g:842:5: 
             {
 
                     current = forceCreateModelElement(
@@ -2053,11 +2053,11 @@ public final EObject ruleTestColumn() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,29,FOLLOW_29_in_ruleTestColumn1915); 
+            otherlv_1=(Token)match(input,29,FOLLOW_20); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getTestColumnAccess().getColumnKeyword_1());
                 
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:851:1: ( (lv_name_2_0= RULE_ID ) )?
+            // InternalFormatterTestLanguage.g:851:1: ( (lv_name_2_0= RULE_ID ) )?
             int alt12=2;
             int LA12_0 = input.LA(1);
 
@@ -2066,12 +2066,12 @@ public final EObject ruleTestColumn() throws RecognitionException {
             }
             switch (alt12) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:852:1: (lv_name_2_0= RULE_ID )
+                    // InternalFormatterTestLanguage.g:852:1: (lv_name_2_0= RULE_ID )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:852:1: (lv_name_2_0= RULE_ID )
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:853:3: lv_name_2_0= RULE_ID
+                    // InternalFormatterTestLanguage.g:852:1: (lv_name_2_0= RULE_ID )
+                    // InternalFormatterTestLanguage.g:853:3: lv_name_2_0= RULE_ID
                     {
-                    lv_name_2_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTestColumn1932); 
+                    lv_name_2_0=(Token)match(input,RULE_ID,FOLLOW_21); 
 
                     			newLeafNode(lv_name_2_0, grammarAccess.getTestColumnAccess().getNameIDTerminalRuleCall_2_0()); 
                     		
@@ -2083,7 +2083,7 @@ public final EObject ruleTestColumn() throws RecognitionException {
                            			current, 
                            			"name",
                             		lv_name_2_0, 
-                            		"ID");
+                            		"org.eclipse.xtext.common.Terminals.ID");
                     	    
 
                     }
@@ -2094,7 +2094,7 @@ public final EObject ruleTestColumn() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:869:3: (otherlv_3= 'item' ( (lv_items_4_0= ruleLine ) ) )*
+            // InternalFormatterTestLanguage.g:869:3: (otherlv_3= 'item' ( (lv_items_4_0= ruleLine ) ) )*
             loop13:
             do {
                 int alt13=2;
@@ -2107,22 +2107,22 @@ public final EObject ruleTestColumn() throws RecognitionException {
 
                 switch (alt13) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:869:5: otherlv_3= 'item' ( (lv_items_4_0= ruleLine ) )
+            	    // InternalFormatterTestLanguage.g:869:5: otherlv_3= 'item' ( (lv_items_4_0= ruleLine ) )
             	    {
-            	    otherlv_3=(Token)match(input,30,FOLLOW_30_in_ruleTestColumn1951); 
+            	    otherlv_3=(Token)match(input,30,FOLLOW_22); 
 
             	        	newLeafNode(otherlv_3, grammarAccess.getTestColumnAccess().getItemKeyword_3_0());
             	        
-            	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:873:1: ( (lv_items_4_0= ruleLine ) )
-            	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:874:1: (lv_items_4_0= ruleLine )
+            	    // InternalFormatterTestLanguage.g:873:1: ( (lv_items_4_0= ruleLine ) )
+            	    // InternalFormatterTestLanguage.g:874:1: (lv_items_4_0= ruleLine )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:874:1: (lv_items_4_0= ruleLine )
-            	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:875:3: lv_items_4_0= ruleLine
+            	    // InternalFormatterTestLanguage.g:874:1: (lv_items_4_0= ruleLine )
+            	    // InternalFormatterTestLanguage.g:875:3: lv_items_4_0= ruleLine
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getTestColumnAccess().getItemsLineParserRuleCall_3_1_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleLine_in_ruleTestColumn1972);
+            	    pushFollow(FOLLOW_21);
             	    lv_items_4_0=ruleLine();
 
             	    state._fsp--;
@@ -2135,7 +2135,7 @@ public final EObject ruleTestColumn() throws RecognitionException {
             	           			current, 
             	           			"items",
             	            		lv_items_4_0, 
-            	            		"Line");
+            	            		"com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.Line");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -2174,7 +2174,7 @@ public final EObject ruleTestColumn() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleTestOffset"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:899:1: entryRuleTestOffset returns [EObject current=null] : iv_ruleTestOffset= ruleTestOffset EOF ;
+    // InternalFormatterTestLanguage.g:899:1: entryRuleTestOffset returns [EObject current=null] : iv_ruleTestOffset= ruleTestOffset EOF ;
     public final EObject entryRuleTestOffset() throws RecognitionException {
         EObject current = null;
 
@@ -2182,17 +2182,17 @@ public final EObject entryRuleTestOffset() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:900:2: (iv_ruleTestOffset= ruleTestOffset EOF )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:901:2: iv_ruleTestOffset= ruleTestOffset EOF
+            // InternalFormatterTestLanguage.g:900:2: (iv_ruleTestOffset= ruleTestOffset EOF )
+            // InternalFormatterTestLanguage.g:901:2: iv_ruleTestOffset= ruleTestOffset EOF
             {
              newCompositeNode(grammarAccess.getTestOffsetRule()); 
-            pushFollow(FOLLOW_ruleTestOffset_in_entryRuleTestOffset2010);
+            pushFollow(FOLLOW_1);
             iv_ruleTestOffset=ruleTestOffset();
 
             state._fsp--;
 
              current =iv_ruleTestOffset; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTestOffset2020); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2210,7 +2210,7 @@ public final EObject entryRuleTestOffset() throws RecognitionException {
 
 
     // $ANTLR start "ruleTestOffset"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:908:1: ruleTestOffset returns [EObject current=null] : ( () otherlv_1= 'offset' otherlv_2= 'value' ( (lv_value_3_0= RULE_ID ) ) otherlv_4= 'pair' ( (lv_first_5_0= RULE_ID ) ) ( (lv_second_6_0= RULE_ID ) ) ) ;
+    // InternalFormatterTestLanguage.g:908:1: ruleTestOffset returns [EObject current=null] : ( () otherlv_1= 'offset' otherlv_2= 'value' ( (lv_value_3_0= RULE_ID ) ) otherlv_4= 'pair' ( (lv_first_5_0= RULE_ID ) ) ( (lv_second_6_0= RULE_ID ) ) ) ;
     public final EObject ruleTestOffset() throws RecognitionException {
         EObject current = null;
 
@@ -2224,14 +2224,14 @@ public final EObject ruleTestOffset() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:911:28: ( ( () otherlv_1= 'offset' otherlv_2= 'value' ( (lv_value_3_0= RULE_ID ) ) otherlv_4= 'pair' ( (lv_first_5_0= RULE_ID ) ) ( (lv_second_6_0= RULE_ID ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:912:1: ( () otherlv_1= 'offset' otherlv_2= 'value' ( (lv_value_3_0= RULE_ID ) ) otherlv_4= 'pair' ( (lv_first_5_0= RULE_ID ) ) ( (lv_second_6_0= RULE_ID ) ) )
+            // InternalFormatterTestLanguage.g:911:28: ( ( () otherlv_1= 'offset' otherlv_2= 'value' ( (lv_value_3_0= RULE_ID ) ) otherlv_4= 'pair' ( (lv_first_5_0= RULE_ID ) ) ( (lv_second_6_0= RULE_ID ) ) ) )
+            // InternalFormatterTestLanguage.g:912:1: ( () otherlv_1= 'offset' otherlv_2= 'value' ( (lv_value_3_0= RULE_ID ) ) otherlv_4= 'pair' ( (lv_first_5_0= RULE_ID ) ) ( (lv_second_6_0= RULE_ID ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:912:1: ( () otherlv_1= 'offset' otherlv_2= 'value' ( (lv_value_3_0= RULE_ID ) ) otherlv_4= 'pair' ( (lv_first_5_0= RULE_ID ) ) ( (lv_second_6_0= RULE_ID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:912:2: () otherlv_1= 'offset' otherlv_2= 'value' ( (lv_value_3_0= RULE_ID ) ) otherlv_4= 'pair' ( (lv_first_5_0= RULE_ID ) ) ( (lv_second_6_0= RULE_ID ) )
+            // InternalFormatterTestLanguage.g:912:1: ( () otherlv_1= 'offset' otherlv_2= 'value' ( (lv_value_3_0= RULE_ID ) ) otherlv_4= 'pair' ( (lv_first_5_0= RULE_ID ) ) ( (lv_second_6_0= RULE_ID ) ) )
+            // InternalFormatterTestLanguage.g:912:2: () otherlv_1= 'offset' otherlv_2= 'value' ( (lv_value_3_0= RULE_ID ) ) otherlv_4= 'pair' ( (lv_first_5_0= RULE_ID ) ) ( (lv_second_6_0= RULE_ID ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:912:2: ()
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:913:5: 
+            // InternalFormatterTestLanguage.g:912:2: ()
+            // InternalFormatterTestLanguage.g:913:5: 
             {
 
                     current = forceCreateModelElement(
@@ -2241,21 +2241,21 @@ public final EObject ruleTestOffset() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,31,FOLLOW_31_in_ruleTestOffset2066); 
+            otherlv_1=(Token)match(input,31,FOLLOW_23); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getTestOffsetAccess().getOffsetKeyword_1());
                 
-            otherlv_2=(Token)match(input,32,FOLLOW_32_in_ruleTestOffset2078); 
+            otherlv_2=(Token)match(input,32,FOLLOW_6); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getTestOffsetAccess().getValueKeyword_2());
                 
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:926:1: ( (lv_value_3_0= RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:927:1: (lv_value_3_0= RULE_ID )
+            // InternalFormatterTestLanguage.g:926:1: ( (lv_value_3_0= RULE_ID ) )
+            // InternalFormatterTestLanguage.g:927:1: (lv_value_3_0= RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:927:1: (lv_value_3_0= RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:928:3: lv_value_3_0= RULE_ID
+            // InternalFormatterTestLanguage.g:927:1: (lv_value_3_0= RULE_ID )
+            // InternalFormatterTestLanguage.g:928:3: lv_value_3_0= RULE_ID
             {
-            lv_value_3_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTestOffset2095); 
+            lv_value_3_0=(Token)match(input,RULE_ID,FOLLOW_24); 
 
             			newLeafNode(lv_value_3_0, grammarAccess.getTestOffsetAccess().getValueIDTerminalRuleCall_3_0()); 
             		
@@ -2267,7 +2267,7 @@ public final EObject ruleTestOffset() throws RecognitionException {
                    			current, 
                    			"value",
                     		lv_value_3_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -2275,17 +2275,17 @@ public final EObject ruleTestOffset() throws RecognitionException {
 
             }
 
-            otherlv_4=(Token)match(input,33,FOLLOW_33_in_ruleTestOffset2112); 
+            otherlv_4=(Token)match(input,33,FOLLOW_6); 
 
                 	newLeafNode(otherlv_4, grammarAccess.getTestOffsetAccess().getPairKeyword_4());
                 
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:948:1: ( (lv_first_5_0= RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:949:1: (lv_first_5_0= RULE_ID )
+            // InternalFormatterTestLanguage.g:948:1: ( (lv_first_5_0= RULE_ID ) )
+            // InternalFormatterTestLanguage.g:949:1: (lv_first_5_0= RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:949:1: (lv_first_5_0= RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:950:3: lv_first_5_0= RULE_ID
+            // InternalFormatterTestLanguage.g:949:1: (lv_first_5_0= RULE_ID )
+            // InternalFormatterTestLanguage.g:950:3: lv_first_5_0= RULE_ID
             {
-            lv_first_5_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTestOffset2129); 
+            lv_first_5_0=(Token)match(input,RULE_ID,FOLLOW_6); 
 
             			newLeafNode(lv_first_5_0, grammarAccess.getTestOffsetAccess().getFirstIDTerminalRuleCall_5_0()); 
             		
@@ -2297,7 +2297,7 @@ public final EObject ruleTestOffset() throws RecognitionException {
                    			current, 
                    			"first",
                     		lv_first_5_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -2305,13 +2305,13 @@ public final EObject ruleTestOffset() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:966:2: ( (lv_second_6_0= RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:967:1: (lv_second_6_0= RULE_ID )
+            // InternalFormatterTestLanguage.g:966:2: ( (lv_second_6_0= RULE_ID ) )
+            // InternalFormatterTestLanguage.g:967:1: (lv_second_6_0= RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:967:1: (lv_second_6_0= RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:968:3: lv_second_6_0= RULE_ID
+            // InternalFormatterTestLanguage.g:967:1: (lv_second_6_0= RULE_ID )
+            // InternalFormatterTestLanguage.g:968:3: lv_second_6_0= RULE_ID
             {
-            lv_second_6_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTestOffset2151); 
+            lv_second_6_0=(Token)match(input,RULE_ID,FOLLOW_2); 
 
             			newLeafNode(lv_second_6_0, grammarAccess.getTestOffsetAccess().getSecondIDTerminalRuleCall_6_0()); 
             		
@@ -2323,7 +2323,7 @@ public final EObject ruleTestOffset() throws RecognitionException {
                    			current, 
                    			"second",
                     		lv_second_6_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -2352,7 +2352,7 @@ public final EObject ruleTestOffset() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleTestRightPadding"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:992:1: entryRuleTestRightPadding returns [EObject current=null] : iv_ruleTestRightPadding= ruleTestRightPadding EOF ;
+    // InternalFormatterTestLanguage.g:992:1: entryRuleTestRightPadding returns [EObject current=null] : iv_ruleTestRightPadding= ruleTestRightPadding EOF ;
     public final EObject entryRuleTestRightPadding() throws RecognitionException {
         EObject current = null;
 
@@ -2360,17 +2360,17 @@ public final EObject entryRuleTestRightPadding() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:993:2: (iv_ruleTestRightPadding= ruleTestRightPadding EOF )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:994:2: iv_ruleTestRightPadding= ruleTestRightPadding EOF
+            // InternalFormatterTestLanguage.g:993:2: (iv_ruleTestRightPadding= ruleTestRightPadding EOF )
+            // InternalFormatterTestLanguage.g:994:2: iv_ruleTestRightPadding= ruleTestRightPadding EOF
             {
              newCompositeNode(grammarAccess.getTestRightPaddingRule()); 
-            pushFollow(FOLLOW_ruleTestRightPadding_in_entryRuleTestRightPadding2192);
+            pushFollow(FOLLOW_1);
             iv_ruleTestRightPadding=ruleTestRightPadding();
 
             state._fsp--;
 
              current =iv_ruleTestRightPadding; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleTestRightPadding2202); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2388,7 +2388,7 @@ public final EObject entryRuleTestRightPadding() throws RecognitionException {
 
 
     // $ANTLR start "ruleTestRightPadding"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1001:1: ruleTestRightPadding returns [EObject current=null] : (otherlv_0= 'padding' ( (lv_p1_1_0= RULE_ID ) ) ( (lv_p2_2_0= RULE_ID ) ) otherlv_3= ';' ) ;
+    // InternalFormatterTestLanguage.g:1001:1: ruleTestRightPadding returns [EObject current=null] : (otherlv_0= 'padding' ( (lv_p1_1_0= RULE_ID ) ) ( (lv_p2_2_0= RULE_ID ) ) otherlv_3= ';' ) ;
     public final EObject ruleTestRightPadding() throws RecognitionException {
         EObject current = null;
 
@@ -2400,23 +2400,23 @@ public final EObject ruleTestRightPadding() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1004:28: ( (otherlv_0= 'padding' ( (lv_p1_1_0= RULE_ID ) ) ( (lv_p2_2_0= RULE_ID ) ) otherlv_3= ';' ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1005:1: (otherlv_0= 'padding' ( (lv_p1_1_0= RULE_ID ) ) ( (lv_p2_2_0= RULE_ID ) ) otherlv_3= ';' )
+            // InternalFormatterTestLanguage.g:1004:28: ( (otherlv_0= 'padding' ( (lv_p1_1_0= RULE_ID ) ) ( (lv_p2_2_0= RULE_ID ) ) otherlv_3= ';' ) )
+            // InternalFormatterTestLanguage.g:1005:1: (otherlv_0= 'padding' ( (lv_p1_1_0= RULE_ID ) ) ( (lv_p2_2_0= RULE_ID ) ) otherlv_3= ';' )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1005:1: (otherlv_0= 'padding' ( (lv_p1_1_0= RULE_ID ) ) ( (lv_p2_2_0= RULE_ID ) ) otherlv_3= ';' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1005:3: otherlv_0= 'padding' ( (lv_p1_1_0= RULE_ID ) ) ( (lv_p2_2_0= RULE_ID ) ) otherlv_3= ';'
+            // InternalFormatterTestLanguage.g:1005:1: (otherlv_0= 'padding' ( (lv_p1_1_0= RULE_ID ) ) ( (lv_p2_2_0= RULE_ID ) ) otherlv_3= ';' )
+            // InternalFormatterTestLanguage.g:1005:3: otherlv_0= 'padding' ( (lv_p1_1_0= RULE_ID ) ) ( (lv_p2_2_0= RULE_ID ) ) otherlv_3= ';'
             {
-            otherlv_0=(Token)match(input,34,FOLLOW_34_in_ruleTestRightPadding2239); 
+            otherlv_0=(Token)match(input,34,FOLLOW_6); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getTestRightPaddingAccess().getPaddingKeyword_0());
                 
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1009:1: ( (lv_p1_1_0= RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1010:1: (lv_p1_1_0= RULE_ID )
+            // InternalFormatterTestLanguage.g:1009:1: ( (lv_p1_1_0= RULE_ID ) )
+            // InternalFormatterTestLanguage.g:1010:1: (lv_p1_1_0= RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1010:1: (lv_p1_1_0= RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1011:3: lv_p1_1_0= RULE_ID
+            // InternalFormatterTestLanguage.g:1010:1: (lv_p1_1_0= RULE_ID )
+            // InternalFormatterTestLanguage.g:1011:3: lv_p1_1_0= RULE_ID
             {
-            lv_p1_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTestRightPadding2256); 
+            lv_p1_1_0=(Token)match(input,RULE_ID,FOLLOW_6); 
 
             			newLeafNode(lv_p1_1_0, grammarAccess.getTestRightPaddingAccess().getP1IDTerminalRuleCall_1_0()); 
             		
@@ -2428,7 +2428,7 @@ public final EObject ruleTestRightPadding() throws RecognitionException {
                    			current, 
                    			"p1",
                     		lv_p1_1_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -2436,13 +2436,13 @@ public final EObject ruleTestRightPadding() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1027:2: ( (lv_p2_2_0= RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1028:1: (lv_p2_2_0= RULE_ID )
+            // InternalFormatterTestLanguage.g:1027:2: ( (lv_p2_2_0= RULE_ID ) )
+            // InternalFormatterTestLanguage.g:1028:1: (lv_p2_2_0= RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1028:1: (lv_p2_2_0= RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1029:3: lv_p2_2_0= RULE_ID
+            // InternalFormatterTestLanguage.g:1028:1: (lv_p2_2_0= RULE_ID )
+            // InternalFormatterTestLanguage.g:1029:3: lv_p2_2_0= RULE_ID
             {
-            lv_p2_2_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTestRightPadding2278); 
+            lv_p2_2_0=(Token)match(input,RULE_ID,FOLLOW_4); 
 
             			newLeafNode(lv_p2_2_0, grammarAccess.getTestRightPaddingAccess().getP2IDTerminalRuleCall_2_0()); 
             		
@@ -2454,7 +2454,7 @@ public final EObject ruleTestRightPadding() throws RecognitionException {
                    			current, 
                    			"p2",
                     		lv_p2_2_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -2462,7 +2462,7 @@ public final EObject ruleTestRightPadding() throws RecognitionException {
 
             }
 
-            otherlv_3=(Token)match(input,13,FOLLOW_13_in_ruleTestRightPadding2295); 
+            otherlv_3=(Token)match(input,13,FOLLOW_2); 
 
                 	newLeafNode(otherlv_3, grammarAccess.getTestRightPaddingAccess().getSemicolonKeyword_3());
                 
@@ -2487,7 +2487,7 @@ public final EObject ruleTestRightPadding() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleFqnObj"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1057:1: entryRuleFqnObj returns [EObject current=null] : iv_ruleFqnObj= ruleFqnObj EOF ;
+    // InternalFormatterTestLanguage.g:1057:1: entryRuleFqnObj returns [EObject current=null] : iv_ruleFqnObj= ruleFqnObj EOF ;
     public final EObject entryRuleFqnObj() throws RecognitionException {
         EObject current = null;
 
@@ -2495,17 +2495,17 @@ public final EObject entryRuleFqnObj() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1058:2: (iv_ruleFqnObj= ruleFqnObj EOF )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1059:2: iv_ruleFqnObj= ruleFqnObj EOF
+            // InternalFormatterTestLanguage.g:1058:2: (iv_ruleFqnObj= ruleFqnObj EOF )
+            // InternalFormatterTestLanguage.g:1059:2: iv_ruleFqnObj= ruleFqnObj EOF
             {
              newCompositeNode(grammarAccess.getFqnObjRule()); 
-            pushFollow(FOLLOW_ruleFqnObj_in_entryRuleFqnObj2331);
+            pushFollow(FOLLOW_1);
             iv_ruleFqnObj=ruleFqnObj();
 
             state._fsp--;
 
              current =iv_ruleFqnObj; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFqnObj2341); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2523,7 +2523,7 @@ public final EObject entryRuleFqnObj() throws RecognitionException {
 
 
     // $ANTLR start "ruleFqnObj"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1066:1: ruleFqnObj returns [EObject current=null] : (otherlv_0= 'fqn' ( (lv_name_1_0= ruleFQN ) ) ) ;
+    // InternalFormatterTestLanguage.g:1066:1: ruleFqnObj returns [EObject current=null] : (otherlv_0= 'fqn' ( (lv_name_1_0= ruleFQN ) ) ) ;
     public final EObject ruleFqnObj() throws RecognitionException {
         EObject current = null;
 
@@ -2534,26 +2534,26 @@ public final EObject ruleFqnObj() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1069:28: ( (otherlv_0= 'fqn' ( (lv_name_1_0= ruleFQN ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1070:1: (otherlv_0= 'fqn' ( (lv_name_1_0= ruleFQN ) ) )
+            // InternalFormatterTestLanguage.g:1069:28: ( (otherlv_0= 'fqn' ( (lv_name_1_0= ruleFQN ) ) ) )
+            // InternalFormatterTestLanguage.g:1070:1: (otherlv_0= 'fqn' ( (lv_name_1_0= ruleFQN ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1070:1: (otherlv_0= 'fqn' ( (lv_name_1_0= ruleFQN ) ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1070:3: otherlv_0= 'fqn' ( (lv_name_1_0= ruleFQN ) )
+            // InternalFormatterTestLanguage.g:1070:1: (otherlv_0= 'fqn' ( (lv_name_1_0= ruleFQN ) ) )
+            // InternalFormatterTestLanguage.g:1070:3: otherlv_0= 'fqn' ( (lv_name_1_0= ruleFQN ) )
             {
-            otherlv_0=(Token)match(input,35,FOLLOW_35_in_ruleFqnObj2378); 
+            otherlv_0=(Token)match(input,35,FOLLOW_6); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getFqnObjAccess().getFqnKeyword_0());
                 
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1074:1: ( (lv_name_1_0= ruleFQN ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1075:1: (lv_name_1_0= ruleFQN )
+            // InternalFormatterTestLanguage.g:1074:1: ( (lv_name_1_0= ruleFQN ) )
+            // InternalFormatterTestLanguage.g:1075:1: (lv_name_1_0= ruleFQN )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1075:1: (lv_name_1_0= ruleFQN )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1076:3: lv_name_1_0= ruleFQN
+            // InternalFormatterTestLanguage.g:1075:1: (lv_name_1_0= ruleFQN )
+            // InternalFormatterTestLanguage.g:1076:3: lv_name_1_0= ruleFQN
             {
              
             	        newCompositeNode(grammarAccess.getFqnObjAccess().getNameFQNParserRuleCall_1_0()); 
             	    
-            pushFollow(FOLLOW_ruleFQN_in_ruleFqnObj2399);
+            pushFollow(FOLLOW_2);
             lv_name_1_0=ruleFQN();
 
             state._fsp--;
@@ -2566,7 +2566,7 @@ public final EObject ruleFqnObj() throws RecognitionException {
                    			current, 
                    			"name",
                     		lv_name_1_0, 
-                    		"FQN");
+                    		"com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.FQN");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -2596,7 +2596,7 @@ public final EObject ruleFqnObj() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleFQN"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1100:1: entryRuleFQN returns [String current=null] : iv_ruleFQN= ruleFQN EOF ;
+    // InternalFormatterTestLanguage.g:1100:1: entryRuleFQN returns [String current=null] : iv_ruleFQN= ruleFQN EOF ;
     public final String entryRuleFQN() throws RecognitionException {
         String current = null;
 
@@ -2604,17 +2604,17 @@ public final String entryRuleFQN() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1101:2: (iv_ruleFQN= ruleFQN EOF )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1102:2: iv_ruleFQN= ruleFQN EOF
+            // InternalFormatterTestLanguage.g:1101:2: (iv_ruleFQN= ruleFQN EOF )
+            // InternalFormatterTestLanguage.g:1102:2: iv_ruleFQN= ruleFQN EOF
             {
              newCompositeNode(grammarAccess.getFQNRule()); 
-            pushFollow(FOLLOW_ruleFQN_in_entryRuleFQN2436);
+            pushFollow(FOLLOW_1);
             iv_ruleFQN=ruleFQN();
 
             state._fsp--;
 
              current =iv_ruleFQN.getText(); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFQN2447); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2632,7 +2632,7 @@ public final String entryRuleFQN() throws RecognitionException {
 
 
     // $ANTLR start "ruleFQN"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1109:1: ruleFQN returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* ) ;
+    // InternalFormatterTestLanguage.g:1109:1: ruleFQN returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* ) ;
     public final AntlrDatatypeRuleToken ruleFQN() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -2643,20 +2643,20 @@ public final AntlrDatatypeRuleToken ruleFQN() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1112:28: ( (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1113:1: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* )
+            // InternalFormatterTestLanguage.g:1112:28: ( (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* ) )
+            // InternalFormatterTestLanguage.g:1113:1: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1113:1: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1113:6: this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )*
+            // InternalFormatterTestLanguage.g:1113:1: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* )
+            // InternalFormatterTestLanguage.g:1113:6: this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )*
             {
-            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFQN2487); 
+            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_25); 
 
             		current.merge(this_ID_0);
                 
              
                 newLeafNode(this_ID_0, grammarAccess.getFQNAccess().getIDTerminalRuleCall_0()); 
                 
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1120:1: (kw= '.' this_ID_2= RULE_ID )*
+            // InternalFormatterTestLanguage.g:1120:1: (kw= '.' this_ID_2= RULE_ID )*
             loop14:
             do {
                 int alt14=2;
@@ -2669,14 +2669,14 @@ public final AntlrDatatypeRuleToken ruleFQN() throws RecognitionException {
 
                 switch (alt14) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1121:2: kw= '.' this_ID_2= RULE_ID
+            	    // InternalFormatterTestLanguage.g:1121:2: kw= '.' this_ID_2= RULE_ID
             	    {
-            	    kw=(Token)match(input,36,FOLLOW_36_in_ruleFQN2506); 
+            	    kw=(Token)match(input,36,FOLLOW_6); 
 
             	            current.merge(kw);
             	            newLeafNode(kw, grammarAccess.getFQNAccess().getFullStopKeyword_1_0()); 
             	        
-            	    this_ID_2=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFQN2521); 
+            	    this_ID_2=(Token)match(input,RULE_ID,FOLLOW_25); 
 
             	    		current.merge(this_ID_2);
             	        
@@ -2713,7 +2713,7 @@ public final AntlrDatatypeRuleToken ruleFQN() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleFqnRef"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1141:1: entryRuleFqnRef returns [EObject current=null] : iv_ruleFqnRef= ruleFqnRef EOF ;
+    // InternalFormatterTestLanguage.g:1141:1: entryRuleFqnRef returns [EObject current=null] : iv_ruleFqnRef= ruleFqnRef EOF ;
     public final EObject entryRuleFqnRef() throws RecognitionException {
         EObject current = null;
 
@@ -2721,17 +2721,17 @@ public final EObject entryRuleFqnRef() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1142:2: (iv_ruleFqnRef= ruleFqnRef EOF )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1143:2: iv_ruleFqnRef= ruleFqnRef EOF
+            // InternalFormatterTestLanguage.g:1142:2: (iv_ruleFqnRef= ruleFqnRef EOF )
+            // InternalFormatterTestLanguage.g:1143:2: iv_ruleFqnRef= ruleFqnRef EOF
             {
              newCompositeNode(grammarAccess.getFqnRefRule()); 
-            pushFollow(FOLLOW_ruleFqnRef_in_entryRuleFqnRef2568);
+            pushFollow(FOLLOW_1);
             iv_ruleFqnRef=ruleFqnRef();
 
             state._fsp--;
 
              current =iv_ruleFqnRef; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFqnRef2578); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2749,7 +2749,7 @@ public final EObject entryRuleFqnRef() throws RecognitionException {
 
 
     // $ANTLR start "ruleFqnRef"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1150:1: ruleFqnRef returns [EObject current=null] : (otherlv_0= 'fqnref' ( ( ruleFQN ) ) ) ;
+    // InternalFormatterTestLanguage.g:1150:1: ruleFqnRef returns [EObject current=null] : (otherlv_0= 'fqnref' ( ( ruleFQN ) ) ) ;
     public final EObject ruleFqnRef() throws RecognitionException {
         EObject current = null;
 
@@ -2758,21 +2758,21 @@ public final EObject ruleFqnRef() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1153:28: ( (otherlv_0= 'fqnref' ( ( ruleFQN ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1154:1: (otherlv_0= 'fqnref' ( ( ruleFQN ) ) )
+            // InternalFormatterTestLanguage.g:1153:28: ( (otherlv_0= 'fqnref' ( ( ruleFQN ) ) ) )
+            // InternalFormatterTestLanguage.g:1154:1: (otherlv_0= 'fqnref' ( ( ruleFQN ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1154:1: (otherlv_0= 'fqnref' ( ( ruleFQN ) ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1154:3: otherlv_0= 'fqnref' ( ( ruleFQN ) )
+            // InternalFormatterTestLanguage.g:1154:1: (otherlv_0= 'fqnref' ( ( ruleFQN ) ) )
+            // InternalFormatterTestLanguage.g:1154:3: otherlv_0= 'fqnref' ( ( ruleFQN ) )
             {
-            otherlv_0=(Token)match(input,37,FOLLOW_37_in_ruleFqnRef2615); 
+            otherlv_0=(Token)match(input,37,FOLLOW_6); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getFqnRefAccess().getFqnrefKeyword_0());
                 
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1158:1: ( ( ruleFQN ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1159:1: ( ruleFQN )
+            // InternalFormatterTestLanguage.g:1158:1: ( ( ruleFQN ) )
+            // InternalFormatterTestLanguage.g:1159:1: ( ruleFQN )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1159:1: ( ruleFQN )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1160:3: ruleFQN
+            // InternalFormatterTestLanguage.g:1159:1: ( ruleFQN )
+            // InternalFormatterTestLanguage.g:1160:3: ruleFQN
             {
 
             			if (current==null) {
@@ -2782,7 +2782,7 @@ public final EObject ruleFqnRef() throws RecognitionException {
              
             	        newCompositeNode(grammarAccess.getFqnRefAccess().getRefFqnObjCrossReference_1_0()); 
             	    
-            pushFollow(FOLLOW_ruleFQN_in_ruleFqnRef2638);
+            pushFollow(FOLLOW_2);
             ruleFQN();
 
             state._fsp--;
@@ -2817,7 +2817,7 @@ public final EObject ruleFqnRef() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleEnumeration"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1181:1: entryRuleEnumeration returns [EObject current=null] : iv_ruleEnumeration= ruleEnumeration EOF ;
+    // InternalFormatterTestLanguage.g:1181:1: entryRuleEnumeration returns [EObject current=null] : iv_ruleEnumeration= ruleEnumeration EOF ;
     public final EObject entryRuleEnumeration() throws RecognitionException {
         EObject current = null;
 
@@ -2825,17 +2825,17 @@ public final EObject entryRuleEnumeration() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1182:2: (iv_ruleEnumeration= ruleEnumeration EOF )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1183:2: iv_ruleEnumeration= ruleEnumeration EOF
+            // InternalFormatterTestLanguage.g:1182:2: (iv_ruleEnumeration= ruleEnumeration EOF )
+            // InternalFormatterTestLanguage.g:1183:2: iv_ruleEnumeration= ruleEnumeration EOF
             {
              newCompositeNode(grammarAccess.getEnumerationRule()); 
-            pushFollow(FOLLOW_ruleEnumeration_in_entryRuleEnumeration2674);
+            pushFollow(FOLLOW_1);
             iv_ruleEnumeration=ruleEnumeration();
 
             state._fsp--;
 
              current =iv_ruleEnumeration; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleEnumeration2684); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2853,7 +2853,7 @@ public final EObject entryRuleEnumeration() throws RecognitionException {
 
 
     // $ANTLR start "ruleEnumeration"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1190:1: ruleEnumeration returns [EObject current=null] : (otherlv_0= 'enum' ( (lv_val_1_0= ruleEnum1 ) )+ (otherlv_2= ',' ( (lv_val_3_0= ruleEnum1 ) ) )* ) ;
+    // InternalFormatterTestLanguage.g:1190:1: ruleEnumeration returns [EObject current=null] : (otherlv_0= 'enum' ( (lv_val_1_0= ruleEnum1 ) )+ (otherlv_2= ',' ( (lv_val_3_0= ruleEnum1 ) ) )* ) ;
     public final EObject ruleEnumeration() throws RecognitionException {
         EObject current = null;
 
@@ -2867,17 +2867,17 @@ public final EObject ruleEnumeration() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1193:28: ( (otherlv_0= 'enum' ( (lv_val_1_0= ruleEnum1 ) )+ (otherlv_2= ',' ( (lv_val_3_0= ruleEnum1 ) ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1194:1: (otherlv_0= 'enum' ( (lv_val_1_0= ruleEnum1 ) )+ (otherlv_2= ',' ( (lv_val_3_0= ruleEnum1 ) ) )* )
+            // InternalFormatterTestLanguage.g:1193:28: ( (otherlv_0= 'enum' ( (lv_val_1_0= ruleEnum1 ) )+ (otherlv_2= ',' ( (lv_val_3_0= ruleEnum1 ) ) )* ) )
+            // InternalFormatterTestLanguage.g:1194:1: (otherlv_0= 'enum' ( (lv_val_1_0= ruleEnum1 ) )+ (otherlv_2= ',' ( (lv_val_3_0= ruleEnum1 ) ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1194:1: (otherlv_0= 'enum' ( (lv_val_1_0= ruleEnum1 ) )+ (otherlv_2= ',' ( (lv_val_3_0= ruleEnum1 ) ) )* )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1194:3: otherlv_0= 'enum' ( (lv_val_1_0= ruleEnum1 ) )+ (otherlv_2= ',' ( (lv_val_3_0= ruleEnum1 ) ) )*
+            // InternalFormatterTestLanguage.g:1194:1: (otherlv_0= 'enum' ( (lv_val_1_0= ruleEnum1 ) )+ (otherlv_2= ',' ( (lv_val_3_0= ruleEnum1 ) ) )* )
+            // InternalFormatterTestLanguage.g:1194:3: otherlv_0= 'enum' ( (lv_val_1_0= ruleEnum1 ) )+ (otherlv_2= ',' ( (lv_val_3_0= ruleEnum1 ) ) )*
             {
-            otherlv_0=(Token)match(input,38,FOLLOW_38_in_ruleEnumeration2721); 
+            otherlv_0=(Token)match(input,38,FOLLOW_26); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getEnumerationAccess().getEnumKeyword_0());
                 
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1198:1: ( (lv_val_1_0= ruleEnum1 ) )+
+            // InternalFormatterTestLanguage.g:1198:1: ( (lv_val_1_0= ruleEnum1 ) )+
             int cnt15=0;
             loop15:
             do {
@@ -2891,15 +2891,15 @@ public final EObject ruleEnumeration() throws RecognitionException {
 
                 switch (alt15) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1199:1: (lv_val_1_0= ruleEnum1 )
+            	    // InternalFormatterTestLanguage.g:1199:1: (lv_val_1_0= ruleEnum1 )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1199:1: (lv_val_1_0= ruleEnum1 )
-            	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1200:3: lv_val_1_0= ruleEnum1
+            	    // InternalFormatterTestLanguage.g:1199:1: (lv_val_1_0= ruleEnum1 )
+            	    // InternalFormatterTestLanguage.g:1200:3: lv_val_1_0= ruleEnum1
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getEnumerationAccess().getValEnum1EnumRuleCall_1_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleEnum1_in_ruleEnumeration2742);
+            	    pushFollow(FOLLOW_27);
             	    lv_val_1_0=ruleEnum1();
 
             	    state._fsp--;
@@ -2912,7 +2912,7 @@ public final EObject ruleEnumeration() throws RecognitionException {
             	           			current, 
             	           			"val",
             	            		lv_val_1_0, 
-            	            		"Enum1");
+            	            		"com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.Enum1");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -2931,7 +2931,7 @@ public final EObject ruleEnumeration() throws RecognitionException {
                 cnt15++;
             } while (true);
 
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1216:3: (otherlv_2= ',' ( (lv_val_3_0= ruleEnum1 ) ) )*
+            // InternalFormatterTestLanguage.g:1216:3: (otherlv_2= ',' ( (lv_val_3_0= ruleEnum1 ) ) )*
             loop16:
             do {
                 int alt16=2;
@@ -2944,22 +2944,22 @@ public final EObject ruleEnumeration() throws RecognitionException {
 
                 switch (alt16) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1216:5: otherlv_2= ',' ( (lv_val_3_0= ruleEnum1 ) )
+            	    // InternalFormatterTestLanguage.g:1216:5: otherlv_2= ',' ( (lv_val_3_0= ruleEnum1 ) )
             	    {
-            	    otherlv_2=(Token)match(input,17,FOLLOW_17_in_ruleEnumeration2756); 
+            	    otherlv_2=(Token)match(input,17,FOLLOW_26); 
 
             	        	newLeafNode(otherlv_2, grammarAccess.getEnumerationAccess().getCommaKeyword_2_0());
             	        
-            	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1220:1: ( (lv_val_3_0= ruleEnum1 ) )
-            	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1221:1: (lv_val_3_0= ruleEnum1 )
+            	    // InternalFormatterTestLanguage.g:1220:1: ( (lv_val_3_0= ruleEnum1 ) )
+            	    // InternalFormatterTestLanguage.g:1221:1: (lv_val_3_0= ruleEnum1 )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1221:1: (lv_val_3_0= ruleEnum1 )
-            	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1222:3: lv_val_3_0= ruleEnum1
+            	    // InternalFormatterTestLanguage.g:1221:1: (lv_val_3_0= ruleEnum1 )
+            	    // InternalFormatterTestLanguage.g:1222:3: lv_val_3_0= ruleEnum1
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getEnumerationAccess().getValEnum1EnumRuleCall_2_1_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleEnum1_in_ruleEnumeration2777);
+            	    pushFollow(FOLLOW_28);
             	    lv_val_3_0=ruleEnum1();
 
             	    state._fsp--;
@@ -2972,7 +2972,7 @@ public final EObject ruleEnumeration() throws RecognitionException {
             	           			current, 
             	           			"val",
             	            		lv_val_3_0, 
-            	            		"Enum1");
+            	            		"com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.Enum1");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -3011,7 +3011,7 @@ public final EObject ruleEnumeration() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleSuppressedHidden"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1246:1: entryRuleSuppressedHidden returns [EObject current=null] : iv_ruleSuppressedHidden= ruleSuppressedHidden EOF ;
+    // InternalFormatterTestLanguage.g:1246:1: entryRuleSuppressedHidden returns [EObject current=null] : iv_ruleSuppressedHidden= ruleSuppressedHidden EOF ;
     public final EObject entryRuleSuppressedHidden() throws RecognitionException {
         EObject current = null;
 
@@ -3022,17 +3022,17 @@ public final EObject entryRuleSuppressedHidden() throws RecognitionException {
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
         	
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1250:2: (iv_ruleSuppressedHidden= ruleSuppressedHidden EOF )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1251:2: iv_ruleSuppressedHidden= ruleSuppressedHidden EOF
+            // InternalFormatterTestLanguage.g:1250:2: (iv_ruleSuppressedHidden= ruleSuppressedHidden EOF )
+            // InternalFormatterTestLanguage.g:1251:2: iv_ruleSuppressedHidden= ruleSuppressedHidden EOF
             {
              newCompositeNode(grammarAccess.getSuppressedHiddenRule()); 
-            pushFollow(FOLLOW_ruleSuppressedHidden_in_entryRuleSuppressedHidden2821);
+            pushFollow(FOLLOW_1);
             iv_ruleSuppressedHidden=ruleSuppressedHidden();
 
             state._fsp--;
 
              current =iv_ruleSuppressedHidden; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSuppressedHidden2831); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3053,7 +3053,7 @@ public final EObject entryRuleSuppressedHidden() throws RecognitionException {
 
 
     // $ANTLR start "ruleSuppressedHidden"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1261:1: ruleSuppressedHidden returns [EObject current=null] : ( () otherlv_1= '`' ( ( (lv_vals_2_0= ruleSuppressedHiddenSub ) ) (otherlv_3= '%' ( (lv_vals_4_0= ruleSuppressedHiddenSub ) ) )* )? otherlv_5= '`' ) ;
+    // InternalFormatterTestLanguage.g:1261:1: ruleSuppressedHidden returns [EObject current=null] : ( () otherlv_1= '`' ( ( (lv_vals_2_0= ruleSuppressedHiddenSub ) ) (otherlv_3= '%' ( (lv_vals_4_0= ruleSuppressedHiddenSub ) ) )* )? otherlv_5= '`' ) ;
     public final EObject ruleSuppressedHidden() throws RecognitionException {
         EObject current = null;
 
@@ -3069,14 +3069,14 @@ public final EObject ruleSuppressedHidden() throws RecognitionException {
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1265:28: ( ( () otherlv_1= '`' ( ( (lv_vals_2_0= ruleSuppressedHiddenSub ) ) (otherlv_3= '%' ( (lv_vals_4_0= ruleSuppressedHiddenSub ) ) )* )? otherlv_5= '`' ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1266:1: ( () otherlv_1= '`' ( ( (lv_vals_2_0= ruleSuppressedHiddenSub ) ) (otherlv_3= '%' ( (lv_vals_4_0= ruleSuppressedHiddenSub ) ) )* )? otherlv_5= '`' )
+            // InternalFormatterTestLanguage.g:1265:28: ( ( () otherlv_1= '`' ( ( (lv_vals_2_0= ruleSuppressedHiddenSub ) ) (otherlv_3= '%' ( (lv_vals_4_0= ruleSuppressedHiddenSub ) ) )* )? otherlv_5= '`' ) )
+            // InternalFormatterTestLanguage.g:1266:1: ( () otherlv_1= '`' ( ( (lv_vals_2_0= ruleSuppressedHiddenSub ) ) (otherlv_3= '%' ( (lv_vals_4_0= ruleSuppressedHiddenSub ) ) )* )? otherlv_5= '`' )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1266:1: ( () otherlv_1= '`' ( ( (lv_vals_2_0= ruleSuppressedHiddenSub ) ) (otherlv_3= '%' ( (lv_vals_4_0= ruleSuppressedHiddenSub ) ) )* )? otherlv_5= '`' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1266:2: () otherlv_1= '`' ( ( (lv_vals_2_0= ruleSuppressedHiddenSub ) ) (otherlv_3= '%' ( (lv_vals_4_0= ruleSuppressedHiddenSub ) ) )* )? otherlv_5= '`'
+            // InternalFormatterTestLanguage.g:1266:1: ( () otherlv_1= '`' ( ( (lv_vals_2_0= ruleSuppressedHiddenSub ) ) (otherlv_3= '%' ( (lv_vals_4_0= ruleSuppressedHiddenSub ) ) )* )? otherlv_5= '`' )
+            // InternalFormatterTestLanguage.g:1266:2: () otherlv_1= '`' ( ( (lv_vals_2_0= ruleSuppressedHiddenSub ) ) (otherlv_3= '%' ( (lv_vals_4_0= ruleSuppressedHiddenSub ) ) )* )? otherlv_5= '`'
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1266:2: ()
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1267:5: 
+            // InternalFormatterTestLanguage.g:1266:2: ()
+            // InternalFormatterTestLanguage.g:1267:5: 
             {
 
                     current = forceCreateModelElement(
@@ -3086,11 +3086,11 @@ public final EObject ruleSuppressedHidden() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,39,FOLLOW_39_in_ruleSuppressedHidden2881); 
+            otherlv_1=(Token)match(input,39,FOLLOW_29); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getSuppressedHiddenAccess().getGraveAccentKeyword_1());
                 
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1276:1: ( ( (lv_vals_2_0= ruleSuppressedHiddenSub ) ) (otherlv_3= '%' ( (lv_vals_4_0= ruleSuppressedHiddenSub ) ) )* )?
+            // InternalFormatterTestLanguage.g:1276:1: ( ( (lv_vals_2_0= ruleSuppressedHiddenSub ) ) (otherlv_3= '%' ( (lv_vals_4_0= ruleSuppressedHiddenSub ) ) )* )?
             int alt18=2;
             int LA18_0 = input.LA(1);
 
@@ -3099,18 +3099,18 @@ public final EObject ruleSuppressedHidden() throws RecognitionException {
             }
             switch (alt18) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1276:2: ( (lv_vals_2_0= ruleSuppressedHiddenSub ) ) (otherlv_3= '%' ( (lv_vals_4_0= ruleSuppressedHiddenSub ) ) )*
+                    // InternalFormatterTestLanguage.g:1276:2: ( (lv_vals_2_0= ruleSuppressedHiddenSub ) ) (otherlv_3= '%' ( (lv_vals_4_0= ruleSuppressedHiddenSub ) ) )*
                     {
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1276:2: ( (lv_vals_2_0= ruleSuppressedHiddenSub ) )
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1277:1: (lv_vals_2_0= ruleSuppressedHiddenSub )
+                    // InternalFormatterTestLanguage.g:1276:2: ( (lv_vals_2_0= ruleSuppressedHiddenSub ) )
+                    // InternalFormatterTestLanguage.g:1277:1: (lv_vals_2_0= ruleSuppressedHiddenSub )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1277:1: (lv_vals_2_0= ruleSuppressedHiddenSub )
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1278:3: lv_vals_2_0= ruleSuppressedHiddenSub
+                    // InternalFormatterTestLanguage.g:1277:1: (lv_vals_2_0= ruleSuppressedHiddenSub )
+                    // InternalFormatterTestLanguage.g:1278:3: lv_vals_2_0= ruleSuppressedHiddenSub
                     {
                      
                     	        newCompositeNode(grammarAccess.getSuppressedHiddenAccess().getValsSuppressedHiddenSubParserRuleCall_2_0_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleSuppressedHiddenSub_in_ruleSuppressedHidden2903);
+                    pushFollow(FOLLOW_30);
                     lv_vals_2_0=ruleSuppressedHiddenSub();
 
                     state._fsp--;
@@ -3123,7 +3123,7 @@ public final EObject ruleSuppressedHidden() throws RecognitionException {
                            			current, 
                            			"vals",
                             		lv_vals_2_0, 
-                            		"SuppressedHiddenSub");
+                            		"com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.SuppressedHiddenSub");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -3132,7 +3132,7 @@ public final EObject ruleSuppressedHidden() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1294:2: (otherlv_3= '%' ( (lv_vals_4_0= ruleSuppressedHiddenSub ) ) )*
+                    // InternalFormatterTestLanguage.g:1294:2: (otherlv_3= '%' ( (lv_vals_4_0= ruleSuppressedHiddenSub ) ) )*
                     loop17:
                     do {
                         int alt17=2;
@@ -3145,22 +3145,22 @@ public final EObject ruleSuppressedHidden() throws RecognitionException {
 
                         switch (alt17) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1294:4: otherlv_3= '%' ( (lv_vals_4_0= ruleSuppressedHiddenSub ) )
+                    	    // InternalFormatterTestLanguage.g:1294:4: otherlv_3= '%' ( (lv_vals_4_0= ruleSuppressedHiddenSub ) )
                     	    {
-                    	    otherlv_3=(Token)match(input,40,FOLLOW_40_in_ruleSuppressedHidden2916); 
+                    	    otherlv_3=(Token)match(input,40,FOLLOW_31); 
 
                     	        	newLeafNode(otherlv_3, grammarAccess.getSuppressedHiddenAccess().getPercentSignKeyword_2_1_0());
                     	        
-                    	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1298:1: ( (lv_vals_4_0= ruleSuppressedHiddenSub ) )
-                    	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1299:1: (lv_vals_4_0= ruleSuppressedHiddenSub )
+                    	    // InternalFormatterTestLanguage.g:1298:1: ( (lv_vals_4_0= ruleSuppressedHiddenSub ) )
+                    	    // InternalFormatterTestLanguage.g:1299:1: (lv_vals_4_0= ruleSuppressedHiddenSub )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1299:1: (lv_vals_4_0= ruleSuppressedHiddenSub )
-                    	    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1300:3: lv_vals_4_0= ruleSuppressedHiddenSub
+                    	    // InternalFormatterTestLanguage.g:1299:1: (lv_vals_4_0= ruleSuppressedHiddenSub )
+                    	    // InternalFormatterTestLanguage.g:1300:3: lv_vals_4_0= ruleSuppressedHiddenSub
                     	    {
                     	     
                     	    	        newCompositeNode(grammarAccess.getSuppressedHiddenAccess().getValsSuppressedHiddenSubParserRuleCall_2_1_1_0()); 
                     	    	    
-                    	    pushFollow(FOLLOW_ruleSuppressedHiddenSub_in_ruleSuppressedHidden2937);
+                    	    pushFollow(FOLLOW_30);
                     	    lv_vals_4_0=ruleSuppressedHiddenSub();
 
                     	    state._fsp--;
@@ -3173,7 +3173,7 @@ public final EObject ruleSuppressedHidden() throws RecognitionException {
                     	           			current, 
                     	           			"vals",
                     	            		lv_vals_4_0, 
-                    	            		"SuppressedHiddenSub");
+                    	            		"com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.SuppressedHiddenSub");
                     	    	        afterParserOrEnumRuleCall();
                     	    	    
 
@@ -3197,7 +3197,7 @@ public final EObject ruleSuppressedHidden() throws RecognitionException {
 
             }
 
-            otherlv_5=(Token)match(input,39,FOLLOW_39_in_ruleSuppressedHidden2953); 
+            otherlv_5=(Token)match(input,39,FOLLOW_2); 
 
                 	newLeafNode(otherlv_5, grammarAccess.getSuppressedHiddenAccess().getGraveAccentKeyword_3());
                 
@@ -3225,7 +3225,7 @@ public final EObject ruleSuppressedHidden() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleSuppressedHiddenSub"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1331:1: entryRuleSuppressedHiddenSub returns [EObject current=null] : iv_ruleSuppressedHiddenSub= ruleSuppressedHiddenSub EOF ;
+    // InternalFormatterTestLanguage.g:1331:1: entryRuleSuppressedHiddenSub returns [EObject current=null] : iv_ruleSuppressedHiddenSub= ruleSuppressedHiddenSub EOF ;
     public final EObject entryRuleSuppressedHiddenSub() throws RecognitionException {
         EObject current = null;
 
@@ -3233,17 +3233,17 @@ public final EObject entryRuleSuppressedHiddenSub() throws RecognitionException
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1332:2: (iv_ruleSuppressedHiddenSub= ruleSuppressedHiddenSub EOF )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1333:2: iv_ruleSuppressedHiddenSub= ruleSuppressedHiddenSub EOF
+            // InternalFormatterTestLanguage.g:1332:2: (iv_ruleSuppressedHiddenSub= ruleSuppressedHiddenSub EOF )
+            // InternalFormatterTestLanguage.g:1333:2: iv_ruleSuppressedHiddenSub= ruleSuppressedHiddenSub EOF
             {
              newCompositeNode(grammarAccess.getSuppressedHiddenSubRule()); 
-            pushFollow(FOLLOW_ruleSuppressedHiddenSub_in_entryRuleSuppressedHiddenSub2993);
+            pushFollow(FOLLOW_1);
             iv_ruleSuppressedHiddenSub=ruleSuppressedHiddenSub();
 
             state._fsp--;
 
              current =iv_ruleSuppressedHiddenSub; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSuppressedHiddenSub3003); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3261,7 +3261,7 @@ public final EObject entryRuleSuppressedHiddenSub() throws RecognitionException
 
 
     // $ANTLR start "ruleSuppressedHiddenSub"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1340:1: ruleSuppressedHiddenSub returns [EObject current=null] : (this_SuppressedHiddenSubSub_0= ruleSuppressedHiddenSubSub | this_SuppressedHiddenSubID_1= ruleSuppressedHiddenSubID ) ;
+    // InternalFormatterTestLanguage.g:1340:1: ruleSuppressedHiddenSub returns [EObject current=null] : (this_SuppressedHiddenSubSub_0= ruleSuppressedHiddenSubSub | this_SuppressedHiddenSubID_1= ruleSuppressedHiddenSubID ) ;
     public final EObject ruleSuppressedHiddenSub() throws RecognitionException {
         EObject current = null;
 
@@ -3273,10 +3273,10 @@ public final EObject ruleSuppressedHiddenSub() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1343:28: ( (this_SuppressedHiddenSubSub_0= ruleSuppressedHiddenSubSub | this_SuppressedHiddenSubID_1= ruleSuppressedHiddenSubID ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1344:1: (this_SuppressedHiddenSubSub_0= ruleSuppressedHiddenSubSub | this_SuppressedHiddenSubID_1= ruleSuppressedHiddenSubID )
+            // InternalFormatterTestLanguage.g:1343:28: ( (this_SuppressedHiddenSubSub_0= ruleSuppressedHiddenSubSub | this_SuppressedHiddenSubID_1= ruleSuppressedHiddenSubID ) )
+            // InternalFormatterTestLanguage.g:1344:1: (this_SuppressedHiddenSubSub_0= ruleSuppressedHiddenSubSub | this_SuppressedHiddenSubID_1= ruleSuppressedHiddenSubID )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1344:1: (this_SuppressedHiddenSubSub_0= ruleSuppressedHiddenSubSub | this_SuppressedHiddenSubID_1= ruleSuppressedHiddenSubID )
+            // InternalFormatterTestLanguage.g:1344:1: (this_SuppressedHiddenSubSub_0= ruleSuppressedHiddenSubSub | this_SuppressedHiddenSubID_1= ruleSuppressedHiddenSubID )
             int alt19=2;
             int LA19_0 = input.LA(1);
 
@@ -3294,12 +3294,12 @@ else if ( (LA19_0==RULE_ID) ) {
             }
             switch (alt19) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1345:5: this_SuppressedHiddenSubSub_0= ruleSuppressedHiddenSubSub
+                    // InternalFormatterTestLanguage.g:1345:5: this_SuppressedHiddenSubSub_0= ruleSuppressedHiddenSubSub
                     {
                      
                             newCompositeNode(grammarAccess.getSuppressedHiddenSubAccess().getSuppressedHiddenSubSubParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleSuppressedHiddenSubSub_in_ruleSuppressedHiddenSub3050);
+                    pushFollow(FOLLOW_2);
                     this_SuppressedHiddenSubSub_0=ruleSuppressedHiddenSubSub();
 
                     state._fsp--;
@@ -3312,12 +3312,12 @@ else if ( (LA19_0==RULE_ID) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1355:5: this_SuppressedHiddenSubID_1= ruleSuppressedHiddenSubID
+                    // InternalFormatterTestLanguage.g:1355:5: this_SuppressedHiddenSubID_1= ruleSuppressedHiddenSubID
                     {
                      
                             newCompositeNode(grammarAccess.getSuppressedHiddenSubAccess().getSuppressedHiddenSubIDParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleSuppressedHiddenSubID_in_ruleSuppressedHiddenSub3077);
+                    pushFollow(FOLLOW_2);
                     this_SuppressedHiddenSubID_1=ruleSuppressedHiddenSubID();
 
                     state._fsp--;
@@ -3350,7 +3350,7 @@ else if ( (LA19_0==RULE_ID) ) {
 
 
     // $ANTLR start "entryRuleSuppressedHiddenSubSub"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1371:1: entryRuleSuppressedHiddenSubSub returns [EObject current=null] : iv_ruleSuppressedHiddenSubSub= ruleSuppressedHiddenSubSub EOF ;
+    // InternalFormatterTestLanguage.g:1371:1: entryRuleSuppressedHiddenSubSub returns [EObject current=null] : iv_ruleSuppressedHiddenSubSub= ruleSuppressedHiddenSubSub EOF ;
     public final EObject entryRuleSuppressedHiddenSubSub() throws RecognitionException {
         EObject current = null;
 
@@ -3361,17 +3361,17 @@ public final EObject entryRuleSuppressedHiddenSubSub() throws RecognitionExcepti
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens("RULE_WS");
         	
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1375:2: (iv_ruleSuppressedHiddenSubSub= ruleSuppressedHiddenSubSub EOF )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1376:2: iv_ruleSuppressedHiddenSubSub= ruleSuppressedHiddenSubSub EOF
+            // InternalFormatterTestLanguage.g:1375:2: (iv_ruleSuppressedHiddenSubSub= ruleSuppressedHiddenSubSub EOF )
+            // InternalFormatterTestLanguage.g:1376:2: iv_ruleSuppressedHiddenSubSub= ruleSuppressedHiddenSubSub EOF
             {
              newCompositeNode(grammarAccess.getSuppressedHiddenSubSubRule()); 
-            pushFollow(FOLLOW_ruleSuppressedHiddenSubSub_in_entryRuleSuppressedHiddenSubSub3118);
+            pushFollow(FOLLOW_1);
             iv_ruleSuppressedHiddenSubSub=ruleSuppressedHiddenSubSub();
 
             state._fsp--;
 
              current =iv_ruleSuppressedHiddenSubSub; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSuppressedHiddenSubSub3128); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3392,7 +3392,7 @@ public final EObject entryRuleSuppressedHiddenSubSub() throws RecognitionExcepti
 
 
     // $ANTLR start "ruleSuppressedHiddenSubSub"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1386:1: ruleSuppressedHiddenSubSub returns [EObject current=null] : (otherlv_0= '<' ( (lv_idval_1_0= RULE_ID ) ) otherlv_2= '>' ) ;
+    // InternalFormatterTestLanguage.g:1386:1: ruleSuppressedHiddenSubSub returns [EObject current=null] : (otherlv_0= '<' ( (lv_idval_1_0= RULE_ID ) ) otherlv_2= '>' ) ;
     public final EObject ruleSuppressedHiddenSubSub() throws RecognitionException {
         EObject current = null;
 
@@ -3404,23 +3404,23 @@ public final EObject ruleSuppressedHiddenSubSub() throws RecognitionException {
         		HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens("RULE_WS");
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1390:28: ( (otherlv_0= '<' ( (lv_idval_1_0= RULE_ID ) ) otherlv_2= '>' ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1391:1: (otherlv_0= '<' ( (lv_idval_1_0= RULE_ID ) ) otherlv_2= '>' )
+            // InternalFormatterTestLanguage.g:1390:28: ( (otherlv_0= '<' ( (lv_idval_1_0= RULE_ID ) ) otherlv_2= '>' ) )
+            // InternalFormatterTestLanguage.g:1391:1: (otherlv_0= '<' ( (lv_idval_1_0= RULE_ID ) ) otherlv_2= '>' )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1391:1: (otherlv_0= '<' ( (lv_idval_1_0= RULE_ID ) ) otherlv_2= '>' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1391:3: otherlv_0= '<' ( (lv_idval_1_0= RULE_ID ) ) otherlv_2= '>'
+            // InternalFormatterTestLanguage.g:1391:1: (otherlv_0= '<' ( (lv_idval_1_0= RULE_ID ) ) otherlv_2= '>' )
+            // InternalFormatterTestLanguage.g:1391:3: otherlv_0= '<' ( (lv_idval_1_0= RULE_ID ) ) otherlv_2= '>'
             {
-            otherlv_0=(Token)match(input,41,FOLLOW_41_in_ruleSuppressedHiddenSubSub3169); 
+            otherlv_0=(Token)match(input,41,FOLLOW_6); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getSuppressedHiddenSubSubAccess().getLessThanSignKeyword_0());
                 
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1395:1: ( (lv_idval_1_0= RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1396:1: (lv_idval_1_0= RULE_ID )
+            // InternalFormatterTestLanguage.g:1395:1: ( (lv_idval_1_0= RULE_ID ) )
+            // InternalFormatterTestLanguage.g:1396:1: (lv_idval_1_0= RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1396:1: (lv_idval_1_0= RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1397:3: lv_idval_1_0= RULE_ID
+            // InternalFormatterTestLanguage.g:1396:1: (lv_idval_1_0= RULE_ID )
+            // InternalFormatterTestLanguage.g:1397:3: lv_idval_1_0= RULE_ID
             {
-            lv_idval_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSuppressedHiddenSubSub3186); 
+            lv_idval_1_0=(Token)match(input,RULE_ID,FOLLOW_32); 
 
             			newLeafNode(lv_idval_1_0, grammarAccess.getSuppressedHiddenSubSubAccess().getIdvalIDTerminalRuleCall_1_0()); 
             		
@@ -3432,7 +3432,7 @@ public final EObject ruleSuppressedHiddenSubSub() throws RecognitionException {
                    			current, 
                    			"idval",
                     		lv_idval_1_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -3440,7 +3440,7 @@ public final EObject ruleSuppressedHiddenSubSub() throws RecognitionException {
 
             }
 
-            otherlv_2=(Token)match(input,42,FOLLOW_42_in_ruleSuppressedHiddenSubSub3203); 
+            otherlv_2=(Token)match(input,42,FOLLOW_2); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getSuppressedHiddenSubSubAccess().getGreaterThanSignKeyword_2());
                 
@@ -3468,7 +3468,7 @@ public final EObject ruleSuppressedHiddenSubSub() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleSuppressedHiddenSubID"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1428:1: entryRuleSuppressedHiddenSubID returns [EObject current=null] : iv_ruleSuppressedHiddenSubID= ruleSuppressedHiddenSubID EOF ;
+    // InternalFormatterTestLanguage.g:1428:1: entryRuleSuppressedHiddenSubID returns [EObject current=null] : iv_ruleSuppressedHiddenSubID= ruleSuppressedHiddenSubID EOF ;
     public final EObject entryRuleSuppressedHiddenSubID() throws RecognitionException {
         EObject current = null;
 
@@ -3476,17 +3476,17 @@ public final EObject entryRuleSuppressedHiddenSubID() throws RecognitionExceptio
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1429:2: (iv_ruleSuppressedHiddenSubID= ruleSuppressedHiddenSubID EOF )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1430:2: iv_ruleSuppressedHiddenSubID= ruleSuppressedHiddenSubID EOF
+            // InternalFormatterTestLanguage.g:1429:2: (iv_ruleSuppressedHiddenSubID= ruleSuppressedHiddenSubID EOF )
+            // InternalFormatterTestLanguage.g:1430:2: iv_ruleSuppressedHiddenSubID= ruleSuppressedHiddenSubID EOF
             {
              newCompositeNode(grammarAccess.getSuppressedHiddenSubIDRule()); 
-            pushFollow(FOLLOW_ruleSuppressedHiddenSubID_in_entryRuleSuppressedHiddenSubID3243);
+            pushFollow(FOLLOW_1);
             iv_ruleSuppressedHiddenSubID=ruleSuppressedHiddenSubID();
 
             state._fsp--;
 
              current =iv_ruleSuppressedHiddenSubID; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSuppressedHiddenSubID3253); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3504,7 +3504,7 @@ public final EObject entryRuleSuppressedHiddenSubID() throws RecognitionExceptio
 
 
     // $ANTLR start "ruleSuppressedHiddenSubID"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1437:1: ruleSuppressedHiddenSubID returns [EObject current=null] : ( (lv_idval_0_0= RULE_ID ) ) ;
+    // InternalFormatterTestLanguage.g:1437:1: ruleSuppressedHiddenSubID returns [EObject current=null] : ( (lv_idval_0_0= RULE_ID ) ) ;
     public final EObject ruleSuppressedHiddenSubID() throws RecognitionException {
         EObject current = null;
 
@@ -3513,16 +3513,16 @@ public final EObject ruleSuppressedHiddenSubID() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1440:28: ( ( (lv_idval_0_0= RULE_ID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1441:1: ( (lv_idval_0_0= RULE_ID ) )
+            // InternalFormatterTestLanguage.g:1440:28: ( ( (lv_idval_0_0= RULE_ID ) ) )
+            // InternalFormatterTestLanguage.g:1441:1: ( (lv_idval_0_0= RULE_ID ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1441:1: ( (lv_idval_0_0= RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1442:1: (lv_idval_0_0= RULE_ID )
+            // InternalFormatterTestLanguage.g:1441:1: ( (lv_idval_0_0= RULE_ID ) )
+            // InternalFormatterTestLanguage.g:1442:1: (lv_idval_0_0= RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1442:1: (lv_idval_0_0= RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1443:3: lv_idval_0_0= RULE_ID
+            // InternalFormatterTestLanguage.g:1442:1: (lv_idval_0_0= RULE_ID )
+            // InternalFormatterTestLanguage.g:1443:3: lv_idval_0_0= RULE_ID
             {
-            lv_idval_0_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSuppressedHiddenSubID3294); 
+            lv_idval_0_0=(Token)match(input,RULE_ID,FOLLOW_2); 
 
             			newLeafNode(lv_idval_0_0, grammarAccess.getSuppressedHiddenSubIDAccess().getIdvalIDTerminalRuleCall_0()); 
             		
@@ -3534,7 +3534,7 @@ public final EObject ruleSuppressedHiddenSubID() throws RecognitionException {
                    			current, 
                    			"idval",
                     		lv_idval_0_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -3560,7 +3560,7 @@ public final EObject ruleSuppressedHiddenSubID() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleDatatype1"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1467:1: entryRuleDatatype1 returns [String current=null] : iv_ruleDatatype1= ruleDatatype1 EOF ;
+    // InternalFormatterTestLanguage.g:1467:1: entryRuleDatatype1 returns [String current=null] : iv_ruleDatatype1= ruleDatatype1 EOF ;
     public final String entryRuleDatatype1() throws RecognitionException {
         String current = null;
 
@@ -3568,17 +3568,17 @@ public final String entryRuleDatatype1() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1468:2: (iv_ruleDatatype1= ruleDatatype1 EOF )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1469:2: iv_ruleDatatype1= ruleDatatype1 EOF
+            // InternalFormatterTestLanguage.g:1468:2: (iv_ruleDatatype1= ruleDatatype1 EOF )
+            // InternalFormatterTestLanguage.g:1469:2: iv_ruleDatatype1= ruleDatatype1 EOF
             {
              newCompositeNode(grammarAccess.getDatatype1Rule()); 
-            pushFollow(FOLLOW_ruleDatatype1_in_entryRuleDatatype13335);
+            pushFollow(FOLLOW_1);
             iv_ruleDatatype1=ruleDatatype1();
 
             state._fsp--;
 
              current =iv_ruleDatatype1.getText(); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDatatype13346); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3596,7 +3596,7 @@ public final String entryRuleDatatype1() throws RecognitionException {
 
 
     // $ANTLR start "ruleDatatype1"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1476:1: ruleDatatype1 returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_FQN_0= ruleFQN ;
+    // InternalFormatterTestLanguage.g:1476:1: ruleDatatype1 returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_FQN_0= ruleFQN ;
     public final AntlrDatatypeRuleToken ruleDatatype1() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -3606,13 +3606,13 @@ public final AntlrDatatypeRuleToken ruleDatatype1() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1479:28: (this_FQN_0= ruleFQN )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1481:5: this_FQN_0= ruleFQN
+            // InternalFormatterTestLanguage.g:1479:28: (this_FQN_0= ruleFQN )
+            // InternalFormatterTestLanguage.g:1481:5: this_FQN_0= ruleFQN
             {
              
                     newCompositeNode(grammarAccess.getDatatype1Access().getFQNParserRuleCall()); 
                 
-            pushFollow(FOLLOW_ruleFQN_in_ruleDatatype13392);
+            pushFollow(FOLLOW_2);
             this_FQN_0=ruleFQN();
 
             state._fsp--;
@@ -3641,7 +3641,7 @@ public final AntlrDatatypeRuleToken ruleDatatype1() throws RecognitionException
 
 
     // $ANTLR start "entryRuleDatatype2"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1499:1: entryRuleDatatype2 returns [String current=null] : iv_ruleDatatype2= ruleDatatype2 EOF ;
+    // InternalFormatterTestLanguage.g:1499:1: entryRuleDatatype2 returns [String current=null] : iv_ruleDatatype2= ruleDatatype2 EOF ;
     public final String entryRuleDatatype2() throws RecognitionException {
         String current = null;
 
@@ -3649,17 +3649,17 @@ public final String entryRuleDatatype2() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1500:2: (iv_ruleDatatype2= ruleDatatype2 EOF )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1501:2: iv_ruleDatatype2= ruleDatatype2 EOF
+            // InternalFormatterTestLanguage.g:1500:2: (iv_ruleDatatype2= ruleDatatype2 EOF )
+            // InternalFormatterTestLanguage.g:1501:2: iv_ruleDatatype2= ruleDatatype2 EOF
             {
              newCompositeNode(grammarAccess.getDatatype2Rule()); 
-            pushFollow(FOLLOW_ruleDatatype2_in_entryRuleDatatype23437);
+            pushFollow(FOLLOW_1);
             iv_ruleDatatype2=ruleDatatype2();
 
             state._fsp--;
 
              current =iv_ruleDatatype2.getText(); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDatatype23448); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3677,7 +3677,7 @@ public final String entryRuleDatatype2() throws RecognitionException {
 
 
     // $ANTLR start "ruleDatatype2"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1508:1: ruleDatatype2 returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_FQN_0= ruleFQN ;
+    // InternalFormatterTestLanguage.g:1508:1: ruleDatatype2 returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_FQN_0= ruleFQN ;
     public final AntlrDatatypeRuleToken ruleDatatype2() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -3687,13 +3687,13 @@ public final AntlrDatatypeRuleToken ruleDatatype2() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1511:28: (this_FQN_0= ruleFQN )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1513:5: this_FQN_0= ruleFQN
+            // InternalFormatterTestLanguage.g:1511:28: (this_FQN_0= ruleFQN )
+            // InternalFormatterTestLanguage.g:1513:5: this_FQN_0= ruleFQN
             {
              
                     newCompositeNode(grammarAccess.getDatatype2Access().getFQNParserRuleCall()); 
                 
-            pushFollow(FOLLOW_ruleFQN_in_ruleDatatype23494);
+            pushFollow(FOLLOW_2);
             this_FQN_0=ruleFQN();
 
             state._fsp--;
@@ -3722,7 +3722,7 @@ public final AntlrDatatypeRuleToken ruleDatatype2() throws RecognitionException
 
 
     // $ANTLR start "entryRuleDatatype3"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1531:1: entryRuleDatatype3 returns [String current=null] : iv_ruleDatatype3= ruleDatatype3 EOF ;
+    // InternalFormatterTestLanguage.g:1531:1: entryRuleDatatype3 returns [String current=null] : iv_ruleDatatype3= ruleDatatype3 EOF ;
     public final String entryRuleDatatype3() throws RecognitionException {
         String current = null;
 
@@ -3730,17 +3730,17 @@ public final String entryRuleDatatype3() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1532:2: (iv_ruleDatatype3= ruleDatatype3 EOF )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1533:2: iv_ruleDatatype3= ruleDatatype3 EOF
+            // InternalFormatterTestLanguage.g:1532:2: (iv_ruleDatatype3= ruleDatatype3 EOF )
+            // InternalFormatterTestLanguage.g:1533:2: iv_ruleDatatype3= ruleDatatype3 EOF
             {
              newCompositeNode(grammarAccess.getDatatype3Rule()); 
-            pushFollow(FOLLOW_ruleDatatype3_in_entryRuleDatatype33539);
+            pushFollow(FOLLOW_1);
             iv_ruleDatatype3=ruleDatatype3();
 
             state._fsp--;
 
              current =iv_ruleDatatype3.getText(); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDatatype33550); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3758,7 +3758,7 @@ public final String entryRuleDatatype3() throws RecognitionException {
 
 
     // $ANTLR start "ruleDatatype3"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1540:1: ruleDatatype3 returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_FQN_0= ruleFQN ;
+    // InternalFormatterTestLanguage.g:1540:1: ruleDatatype3 returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_FQN_0= ruleFQN ;
     public final AntlrDatatypeRuleToken ruleDatatype3() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -3768,13 +3768,13 @@ public final AntlrDatatypeRuleToken ruleDatatype3() throws RecognitionException
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1543:28: (this_FQN_0= ruleFQN )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1545:5: this_FQN_0= ruleFQN
+            // InternalFormatterTestLanguage.g:1543:28: (this_FQN_0= ruleFQN )
+            // InternalFormatterTestLanguage.g:1545:5: this_FQN_0= ruleFQN
             {
              
                     newCompositeNode(grammarAccess.getDatatype3Access().getFQNParserRuleCall()); 
                 
-            pushFollow(FOLLOW_ruleFQN_in_ruleDatatype33596);
+            pushFollow(FOLLOW_2);
             this_FQN_0=ruleFQN();
 
             state._fsp--;
@@ -3803,7 +3803,7 @@ public final AntlrDatatypeRuleToken ruleDatatype3() throws RecognitionException
 
 
     // $ANTLR start "entryRuleDatatypes"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1563:1: entryRuleDatatypes returns [EObject current=null] : iv_ruleDatatypes= ruleDatatypes EOF ;
+    // InternalFormatterTestLanguage.g:1563:1: entryRuleDatatypes returns [EObject current=null] : iv_ruleDatatypes= ruleDatatypes EOF ;
     public final EObject entryRuleDatatypes() throws RecognitionException {
         EObject current = null;
 
@@ -3811,17 +3811,17 @@ public final EObject entryRuleDatatypes() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1564:2: (iv_ruleDatatypes= ruleDatatypes EOF )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1565:2: iv_ruleDatatypes= ruleDatatypes EOF
+            // InternalFormatterTestLanguage.g:1564:2: (iv_ruleDatatypes= ruleDatatypes EOF )
+            // InternalFormatterTestLanguage.g:1565:2: iv_ruleDatatypes= ruleDatatypes EOF
             {
              newCompositeNode(grammarAccess.getDatatypesRule()); 
-            pushFollow(FOLLOW_ruleDatatypes_in_entryRuleDatatypes3640);
+            pushFollow(FOLLOW_1);
             iv_ruleDatatypes=ruleDatatypes();
 
             state._fsp--;
 
              current =iv_ruleDatatypes; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDatatypes3650); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3839,7 +3839,7 @@ public final EObject entryRuleDatatypes() throws RecognitionException {
 
 
     // $ANTLR start "ruleDatatypes"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1572:1: ruleDatatypes returns [EObject current=null] : (otherlv_0= 'datatypes' ( (lv_val1_1_0= ruleDatatype1 ) ) otherlv_2= 'kw1' ( (lv_val2_3_0= ruleDatatype2 ) ) ( (lv_val3_4_0= ruleDatatype3 ) ) otherlv_5= 'kw3' ) ;
+    // InternalFormatterTestLanguage.g:1572:1: ruleDatatypes returns [EObject current=null] : (otherlv_0= 'datatypes' ( (lv_val1_1_0= ruleDatatype1 ) ) otherlv_2= 'kw1' ( (lv_val2_3_0= ruleDatatype2 ) ) ( (lv_val3_4_0= ruleDatatype3 ) ) otherlv_5= 'kw3' ) ;
     public final EObject ruleDatatypes() throws RecognitionException {
         EObject current = null;
 
@@ -3856,26 +3856,26 @@ public final EObject ruleDatatypes() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1575:28: ( (otherlv_0= 'datatypes' ( (lv_val1_1_0= ruleDatatype1 ) ) otherlv_2= 'kw1' ( (lv_val2_3_0= ruleDatatype2 ) ) ( (lv_val3_4_0= ruleDatatype3 ) ) otherlv_5= 'kw3' ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1576:1: (otherlv_0= 'datatypes' ( (lv_val1_1_0= ruleDatatype1 ) ) otherlv_2= 'kw1' ( (lv_val2_3_0= ruleDatatype2 ) ) ( (lv_val3_4_0= ruleDatatype3 ) ) otherlv_5= 'kw3' )
+            // InternalFormatterTestLanguage.g:1575:28: ( (otherlv_0= 'datatypes' ( (lv_val1_1_0= ruleDatatype1 ) ) otherlv_2= 'kw1' ( (lv_val2_3_0= ruleDatatype2 ) ) ( (lv_val3_4_0= ruleDatatype3 ) ) otherlv_5= 'kw3' ) )
+            // InternalFormatterTestLanguage.g:1576:1: (otherlv_0= 'datatypes' ( (lv_val1_1_0= ruleDatatype1 ) ) otherlv_2= 'kw1' ( (lv_val2_3_0= ruleDatatype2 ) ) ( (lv_val3_4_0= ruleDatatype3 ) ) otherlv_5= 'kw3' )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1576:1: (otherlv_0= 'datatypes' ( (lv_val1_1_0= ruleDatatype1 ) ) otherlv_2= 'kw1' ( (lv_val2_3_0= ruleDatatype2 ) ) ( (lv_val3_4_0= ruleDatatype3 ) ) otherlv_5= 'kw3' )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1576:3: otherlv_0= 'datatypes' ( (lv_val1_1_0= ruleDatatype1 ) ) otherlv_2= 'kw1' ( (lv_val2_3_0= ruleDatatype2 ) ) ( (lv_val3_4_0= ruleDatatype3 ) ) otherlv_5= 'kw3'
+            // InternalFormatterTestLanguage.g:1576:1: (otherlv_0= 'datatypes' ( (lv_val1_1_0= ruleDatatype1 ) ) otherlv_2= 'kw1' ( (lv_val2_3_0= ruleDatatype2 ) ) ( (lv_val3_4_0= ruleDatatype3 ) ) otherlv_5= 'kw3' )
+            // InternalFormatterTestLanguage.g:1576:3: otherlv_0= 'datatypes' ( (lv_val1_1_0= ruleDatatype1 ) ) otherlv_2= 'kw1' ( (lv_val2_3_0= ruleDatatype2 ) ) ( (lv_val3_4_0= ruleDatatype3 ) ) otherlv_5= 'kw3'
             {
-            otherlv_0=(Token)match(input,43,FOLLOW_43_in_ruleDatatypes3687); 
+            otherlv_0=(Token)match(input,43,FOLLOW_6); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getDatatypesAccess().getDatatypesKeyword_0());
                 
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1580:1: ( (lv_val1_1_0= ruleDatatype1 ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1581:1: (lv_val1_1_0= ruleDatatype1 )
+            // InternalFormatterTestLanguage.g:1580:1: ( (lv_val1_1_0= ruleDatatype1 ) )
+            // InternalFormatterTestLanguage.g:1581:1: (lv_val1_1_0= ruleDatatype1 )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1581:1: (lv_val1_1_0= ruleDatatype1 )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1582:3: lv_val1_1_0= ruleDatatype1
+            // InternalFormatterTestLanguage.g:1581:1: (lv_val1_1_0= ruleDatatype1 )
+            // InternalFormatterTestLanguage.g:1582:3: lv_val1_1_0= ruleDatatype1
             {
              
             	        newCompositeNode(grammarAccess.getDatatypesAccess().getVal1Datatype1ParserRuleCall_1_0()); 
             	    
-            pushFollow(FOLLOW_ruleDatatype1_in_ruleDatatypes3708);
+            pushFollow(FOLLOW_33);
             lv_val1_1_0=ruleDatatype1();
 
             state._fsp--;
@@ -3888,7 +3888,7 @@ public final EObject ruleDatatypes() throws RecognitionException {
                    			current, 
                    			"val1",
                     		lv_val1_1_0, 
-                    		"Datatype1");
+                    		"com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.Datatype1");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -3897,20 +3897,20 @@ public final EObject ruleDatatypes() throws RecognitionException {
 
             }
 
-            otherlv_2=(Token)match(input,44,FOLLOW_44_in_ruleDatatypes3720); 
+            otherlv_2=(Token)match(input,44,FOLLOW_6); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getDatatypesAccess().getKw1Keyword_2());
                 
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1602:1: ( (lv_val2_3_0= ruleDatatype2 ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1603:1: (lv_val2_3_0= ruleDatatype2 )
+            // InternalFormatterTestLanguage.g:1602:1: ( (lv_val2_3_0= ruleDatatype2 ) )
+            // InternalFormatterTestLanguage.g:1603:1: (lv_val2_3_0= ruleDatatype2 )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1603:1: (lv_val2_3_0= ruleDatatype2 )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1604:3: lv_val2_3_0= ruleDatatype2
+            // InternalFormatterTestLanguage.g:1603:1: (lv_val2_3_0= ruleDatatype2 )
+            // InternalFormatterTestLanguage.g:1604:3: lv_val2_3_0= ruleDatatype2
             {
              
             	        newCompositeNode(grammarAccess.getDatatypesAccess().getVal2Datatype2ParserRuleCall_3_0()); 
             	    
-            pushFollow(FOLLOW_ruleDatatype2_in_ruleDatatypes3741);
+            pushFollow(FOLLOW_6);
             lv_val2_3_0=ruleDatatype2();
 
             state._fsp--;
@@ -3923,7 +3923,7 @@ public final EObject ruleDatatypes() throws RecognitionException {
                    			current, 
                    			"val2",
                     		lv_val2_3_0, 
-                    		"Datatype2");
+                    		"com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.Datatype2");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -3932,16 +3932,16 @@ public final EObject ruleDatatypes() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1620:2: ( (lv_val3_4_0= ruleDatatype3 ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1621:1: (lv_val3_4_0= ruleDatatype3 )
+            // InternalFormatterTestLanguage.g:1620:2: ( (lv_val3_4_0= ruleDatatype3 ) )
+            // InternalFormatterTestLanguage.g:1621:1: (lv_val3_4_0= ruleDatatype3 )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1621:1: (lv_val3_4_0= ruleDatatype3 )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1622:3: lv_val3_4_0= ruleDatatype3
+            // InternalFormatterTestLanguage.g:1621:1: (lv_val3_4_0= ruleDatatype3 )
+            // InternalFormatterTestLanguage.g:1622:3: lv_val3_4_0= ruleDatatype3
             {
              
             	        newCompositeNode(grammarAccess.getDatatypesAccess().getVal3Datatype3ParserRuleCall_4_0()); 
             	    
-            pushFollow(FOLLOW_ruleDatatype3_in_ruleDatatypes3762);
+            pushFollow(FOLLOW_34);
             lv_val3_4_0=ruleDatatype3();
 
             state._fsp--;
@@ -3954,7 +3954,7 @@ public final EObject ruleDatatypes() throws RecognitionException {
                    			current, 
                    			"val3",
                     		lv_val3_4_0, 
-                    		"Datatype3");
+                    		"com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.Datatype3");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -3963,7 +3963,7 @@ public final EObject ruleDatatypes() throws RecognitionException {
 
             }
 
-            otherlv_5=(Token)match(input,45,FOLLOW_45_in_ruleDatatypes3774); 
+            otherlv_5=(Token)match(input,45,FOLLOW_2); 
 
                 	newLeafNode(otherlv_5, grammarAccess.getDatatypesAccess().getKw3Keyword_5());
                 
@@ -3988,7 +3988,7 @@ public final EObject ruleDatatypes() throws RecognitionException {
 
 
     // $ANTLR start "ruleEnum1"
-    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1650:1: ruleEnum1 returns [Enumerator current=null] : ( (enumLiteral_0= 'lit1' ) | (enumLiteral_1= 'lit2' ) | (enumLiteral_2= 'lit3' ) ) ;
+    // InternalFormatterTestLanguage.g:1650:1: ruleEnum1 returns [Enumerator current=null] : ( (enumLiteral_0= 'lit1' ) | (enumLiteral_1= 'lit2' ) | (enumLiteral_2= 'lit3' ) ) ;
     public final Enumerator ruleEnum1() throws RecognitionException {
         Enumerator current = null;
 
@@ -3998,10 +3998,10 @@ public final Enumerator ruleEnum1() throws RecognitionException {
 
          enterRule(); 
         try {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1652:28: ( ( (enumLiteral_0= 'lit1' ) | (enumLiteral_1= 'lit2' ) | (enumLiteral_2= 'lit3' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1653:1: ( (enumLiteral_0= 'lit1' ) | (enumLiteral_1= 'lit2' ) | (enumLiteral_2= 'lit3' ) )
+            // InternalFormatterTestLanguage.g:1652:28: ( ( (enumLiteral_0= 'lit1' ) | (enumLiteral_1= 'lit2' ) | (enumLiteral_2= 'lit3' ) ) )
+            // InternalFormatterTestLanguage.g:1653:1: ( (enumLiteral_0= 'lit1' ) | (enumLiteral_1= 'lit2' ) | (enumLiteral_2= 'lit3' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1653:1: ( (enumLiteral_0= 'lit1' ) | (enumLiteral_1= 'lit2' ) | (enumLiteral_2= 'lit3' ) )
+            // InternalFormatterTestLanguage.g:1653:1: ( (enumLiteral_0= 'lit1' ) | (enumLiteral_1= 'lit2' ) | (enumLiteral_2= 'lit3' ) )
             int alt20=3;
             switch ( input.LA(1) ) {
             case 46:
@@ -4028,12 +4028,12 @@ public final Enumerator ruleEnum1() throws RecognitionException {
 
             switch (alt20) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1653:2: (enumLiteral_0= 'lit1' )
+                    // InternalFormatterTestLanguage.g:1653:2: (enumLiteral_0= 'lit1' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1653:2: (enumLiteral_0= 'lit1' )
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1653:4: enumLiteral_0= 'lit1'
+                    // InternalFormatterTestLanguage.g:1653:2: (enumLiteral_0= 'lit1' )
+                    // InternalFormatterTestLanguage.g:1653:4: enumLiteral_0= 'lit1'
                     {
-                    enumLiteral_0=(Token)match(input,46,FOLLOW_46_in_ruleEnum13824); 
+                    enumLiteral_0=(Token)match(input,46,FOLLOW_2); 
 
                             current = grammarAccess.getEnum1Access().getLit1EnumLiteralDeclaration_0().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_0, grammarAccess.getEnum1Access().getLit1EnumLiteralDeclaration_0()); 
@@ -4045,12 +4045,12 @@ public final Enumerator ruleEnum1() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1659:6: (enumLiteral_1= 'lit2' )
+                    // InternalFormatterTestLanguage.g:1659:6: (enumLiteral_1= 'lit2' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1659:6: (enumLiteral_1= 'lit2' )
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1659:8: enumLiteral_1= 'lit2'
+                    // InternalFormatterTestLanguage.g:1659:6: (enumLiteral_1= 'lit2' )
+                    // InternalFormatterTestLanguage.g:1659:8: enumLiteral_1= 'lit2'
                     {
-                    enumLiteral_1=(Token)match(input,47,FOLLOW_47_in_ruleEnum13841); 
+                    enumLiteral_1=(Token)match(input,47,FOLLOW_2); 
 
                             current = grammarAccess.getEnum1Access().getLit2EnumLiteralDeclaration_1().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_1, grammarAccess.getEnum1Access().getLit2EnumLiteralDeclaration_1()); 
@@ -4062,12 +4062,12 @@ public final Enumerator ruleEnum1() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1665:6: (enumLiteral_2= 'lit3' )
+                    // InternalFormatterTestLanguage.g:1665:6: (enumLiteral_2= 'lit3' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1665:6: (enumLiteral_2= 'lit3' )
-                    // ../com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/parser/antlr/internal/InternalFormatterTestLanguage.g:1665:8: enumLiteral_2= 'lit3'
+                    // InternalFormatterTestLanguage.g:1665:6: (enumLiteral_2= 'lit3' )
+                    // InternalFormatterTestLanguage.g:1665:8: enumLiteral_2= 'lit3'
                     {
-                    enumLiteral_2=(Token)match(input,48,FOLLOW_48_in_ruleEnum13858); 
+                    enumLiteral_2=(Token)match(input,48,FOLLOW_2); 
 
                             current = grammarAccess.getEnum1Access().getLit3EnumLiteralDeclaration_2().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_2, grammarAccess.getEnum1Access().getLit3EnumLiteralDeclaration_2()); 
@@ -4101,21 +4101,13 @@ public final Enumerator ruleEnum1() throws RecognitionException {
 
 
     protected DFA2 dfa2 = new DFA2(this);
-    static final String DFA2_eotS =
-        "\13\uffff";
-    static final String DFA2_eofS =
-        "\13\uffff";
-    static final String DFA2_minS =
-        "\2\4\11\uffff";
-    static final String DFA2_maxS =
-        "\1\53\1\17\11\uffff";
-    static final String DFA2_acceptS =
-        "\2\uffff\1\3\1\4\1\5\1\6\1\7\1\10\1\11\1\1\1\2";
-    static final String DFA2_specialS =
-        "\13\uffff}>";
-    static final String[] DFA2_transitionS = {
-            "\1\1\16\uffff\1\2\3\uffff\1\7\13\uffff\1\3\1\uffff\1\4\1\5"+
-            "\1\6\3\uffff\1\10",
+    static final String dfa_1s = "\13\uffff";
+    static final String dfa_2s = "\2\4\11\uffff";
+    static final String dfa_3s = "\1\53\1\17\11\uffff";
+    static final String dfa_4s = "\2\uffff\1\3\1\4\1\5\1\6\1\7\1\10\1\11\1\1\1\2";
+    static final String dfa_5s = "\13\uffff}>";
+    static final String[] dfa_6s = {
+            "\1\1\16\uffff\1\2\3\uffff\1\7\13\uffff\1\3\1\uffff\1\4\1\5\1\6\3\uffff\1\10",
             "\1\11\11\uffff\2\12",
             "",
             "",
@@ -4128,34 +4120,25 @@ public final Enumerator ruleEnum1() throws RecognitionException {
             ""
     };
 
-    static final short[] DFA2_eot = DFA.unpackEncodedString(DFA2_eotS);
-    static final short[] DFA2_eof = DFA.unpackEncodedString(DFA2_eofS);
-    static final char[] DFA2_min = DFA.unpackEncodedStringToUnsignedChars(DFA2_minS);
-    static final char[] DFA2_max = DFA.unpackEncodedStringToUnsignedChars(DFA2_maxS);
-    static final short[] DFA2_accept = DFA.unpackEncodedString(DFA2_acceptS);
-    static final short[] DFA2_special = DFA.unpackEncodedString(DFA2_specialS);
-    static final short[][] DFA2_transition;
-
-    static {
-        int numStates = DFA2_transitionS.length;
-        DFA2_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA2_transition[i] = DFA.unpackEncodedString(DFA2_transitionS[i]);
-        }
-    }
+    static final short[] dfa_1 = DFA.unpackEncodedString(dfa_1s);
+    static final char[] dfa_2 = DFA.unpackEncodedStringToUnsignedChars(dfa_2s);
+    static final char[] dfa_3 = DFA.unpackEncodedStringToUnsignedChars(dfa_3s);
+    static final short[] dfa_4 = DFA.unpackEncodedString(dfa_4s);
+    static final short[] dfa_5 = DFA.unpackEncodedString(dfa_5s);
+    static final short[][] dfa_6 = unpackEncodedStringArray(dfa_6s);
 
     class DFA2 extends DFA {
 
         public DFA2(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 2;
-            this.eot = DFA2_eot;
-            this.eof = DFA2_eof;
-            this.min = DFA2_min;
-            this.max = DFA2_max;
-            this.accept = DFA2_accept;
-            this.special = DFA2_special;
-            this.transition = DFA2_transition;
+            this.eot = dfa_1;
+            this.eof = dfa_1;
+            this.min = dfa_2;
+            this.max = dfa_3;
+            this.accept = dfa_4;
+            this.special = dfa_5;
+            this.transition = dfa_6;
         }
         public String getDescription() {
             return "165:2: (this_Decl_0= ruleDecl | this_Assign_1= ruleAssign | this_Meth_2= ruleMeth | this_FqnObj_3= ruleFqnObj | this_FqnRef_4= ruleFqnRef | this_Enumeration_5= ruleEnumeration | (this_SuppressedHidden_6= ruleSuppressedHidden otherlv_7= 'post' ) | this_Space_8= ruleSpace | this_Datatypes_9= ruleDatatypes )";
@@ -4163,153 +4146,39 @@ public String getDescription() {
     }
  
 
-    public static final BitSet FOLLOW_ruleRoot_in_entryRuleRoot75 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRoot85 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_11_in_ruleRoot122 = new BitSet(new long[]{0x00000004A7000000L});
-    public static final BitSet FOLLOW_ruleTestLinewrap_in_ruleRoot145 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTestIndentation_in_ruleRoot172 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTestLinewrapMinMax_in_ruleRoot199 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTestColumn_in_ruleRoot226 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTestOffset_in_ruleRoot253 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTestRightPadding_in_ruleRoot280 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLine_in_entryRuleLine316 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleLine326 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecl_in_ruleLine374 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleAssign_in_ruleLine401 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleMeth_in_ruleLine428 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleFqnObj_in_ruleLine455 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleFqnRef_in_ruleLine482 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleEnumeration_in_ruleLine509 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleSuppressedHidden_in_ruleLine537 = new BitSet(new long[]{0x0000000000001000L});
-    public static final BitSet FOLLOW_12_in_ruleLine548 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleSpace_in_ruleLine577 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ruleDatatypes_in_ruleLine604 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleLine616 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDecl_in_entryRuleDecl652 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDecl662 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleDecl704 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleDecl726 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAssign_in_entryRuleAssign767 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleAssign777 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleAssign819 = new BitSet(new long[]{0x000000000000C000L});
-    public static final BitSet FOLLOW_14_in_ruleAssign844 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_15_in_ruleAssign873 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_16_in_ruleAssign901 = new BitSet(new long[]{0x0000000000040020L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleAssign919 = new BitSet(new long[]{0x0000000000060000L});
-    public static final BitSet FOLLOW_17_in_ruleAssign937 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleAssign954 = new BitSet(new long[]{0x0000000000060000L});
-    public static final BitSet FOLLOW_18_in_ruleAssign975 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMeth_in_entryRuleMeth1011 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleMeth1021 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_ruleMeth1058 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleMeth1075 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_20_in_ruleMeth1092 = new BitSet(new long[]{0x0000000000200010L});
-    public static final BitSet FOLLOW_ruleParam_in_ruleMeth1114 = new BitSet(new long[]{0x0000000000220000L});
-    public static final BitSet FOLLOW_17_in_ruleMeth1127 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleParam_in_ruleMeth1148 = new BitSet(new long[]{0x0000000000220000L});
-    public static final BitSet FOLLOW_21_in_ruleMeth1164 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleParam_in_entryRuleParam1200 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleParam1210 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleParam1252 = new BitSet(new long[]{0x0000000000400000L});
-    public static final BitSet FOLLOW_22_in_ruleParam1269 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleParam1286 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSpace_in_entryRuleSpace1327 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSpace1337 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_ruleSpace1374 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleSpace1391 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTestLinewrap_in_entryRuleTestLinewrap1432 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTestLinewrap1442 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_ruleTestLinewrap1488 = new BitSet(new long[]{0x000008E800880012L});
-    public static final BitSet FOLLOW_ruleLine_in_ruleTestLinewrap1509 = new BitSet(new long[]{0x000008E800880012L});
-    public static final BitSet FOLLOW_ruleTestLinewrapMinMax_in_entryRuleTestLinewrapMinMax1546 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTestLinewrapMinMax1556 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_25_in_ruleTestLinewrapMinMax1602 = new BitSet(new long[]{0x000008E800880012L});
-    public static final BitSet FOLLOW_ruleLine_in_ruleTestLinewrapMinMax1623 = new BitSet(new long[]{0x000008E800880012L});
-    public static final BitSet FOLLOW_ruleTestIndentation_in_entryRuleTestIndentation1660 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTestIndentation1670 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_ruleTestIndentation1716 = new BitSet(new long[]{0x0000000008000000L});
-    public static final BitSet FOLLOW_27_in_ruleTestIndentation1728 = new BitSet(new long[]{0x000008E814880010L});
-    public static final BitSet FOLLOW_ruleTestIndentation_in_ruleTestIndentation1750 = new BitSet(new long[]{0x000008E814880010L});
-    public static final BitSet FOLLOW_ruleLine_in_ruleTestIndentation1777 = new BitSet(new long[]{0x000008E814880010L});
-    public static final BitSet FOLLOW_28_in_ruleTestIndentation1791 = new BitSet(new long[]{0x0000000000002002L});
-    public static final BitSet FOLLOW_13_in_ruleTestIndentation1809 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTestColumn_in_entryRuleTestColumn1859 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTestColumn1869 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_ruleTestColumn1915 = new BitSet(new long[]{0x0000000040000012L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleTestColumn1932 = new BitSet(new long[]{0x0000000040000002L});
-    public static final BitSet FOLLOW_30_in_ruleTestColumn1951 = new BitSet(new long[]{0x000008E800880010L});
-    public static final BitSet FOLLOW_ruleLine_in_ruleTestColumn1972 = new BitSet(new long[]{0x0000000040000002L});
-    public static final BitSet FOLLOW_ruleTestOffset_in_entryRuleTestOffset2010 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTestOffset2020 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_ruleTestOffset2066 = new BitSet(new long[]{0x0000000100000000L});
-    public static final BitSet FOLLOW_32_in_ruleTestOffset2078 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleTestOffset2095 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_33_in_ruleTestOffset2112 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleTestOffset2129 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleTestOffset2151 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleTestRightPadding_in_entryRuleTestRightPadding2192 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleTestRightPadding2202 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_34_in_ruleTestRightPadding2239 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleTestRightPadding2256 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleTestRightPadding2278 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleTestRightPadding2295 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFqnObj_in_entryRuleFqnObj2331 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFqnObj2341 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_35_in_ruleFqnObj2378 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleFQN_in_ruleFqnObj2399 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_entryRuleFQN2436 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFQN2447 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleFQN2487 = new BitSet(new long[]{0x0000001000000002L});
-    public static final BitSet FOLLOW_36_in_ruleFQN2506 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleFQN2521 = new BitSet(new long[]{0x0000001000000002L});
-    public static final BitSet FOLLOW_ruleFqnRef_in_entryRuleFqnRef2568 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFqnRef2578 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_37_in_ruleFqnRef2615 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleFQN_in_ruleFqnRef2638 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleEnumeration_in_entryRuleEnumeration2674 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleEnumeration2684 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_38_in_ruleEnumeration2721 = new BitSet(new long[]{0x0001C00000000000L});
-    public static final BitSet FOLLOW_ruleEnum1_in_ruleEnumeration2742 = new BitSet(new long[]{0x0001C00000020002L});
-    public static final BitSet FOLLOW_17_in_ruleEnumeration2756 = new BitSet(new long[]{0x0001C00000000000L});
-    public static final BitSet FOLLOW_ruleEnum1_in_ruleEnumeration2777 = new BitSet(new long[]{0x0000000000020002L});
-    public static final BitSet FOLLOW_ruleSuppressedHidden_in_entryRuleSuppressedHidden2821 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSuppressedHidden2831 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_39_in_ruleSuppressedHidden2881 = new BitSet(new long[]{0x0000028000000010L});
-    public static final BitSet FOLLOW_ruleSuppressedHiddenSub_in_ruleSuppressedHidden2903 = new BitSet(new long[]{0x0000018000000000L});
-    public static final BitSet FOLLOW_40_in_ruleSuppressedHidden2916 = new BitSet(new long[]{0x0000020000000010L});
-    public static final BitSet FOLLOW_ruleSuppressedHiddenSub_in_ruleSuppressedHidden2937 = new BitSet(new long[]{0x0000018000000000L});
-    public static final BitSet FOLLOW_39_in_ruleSuppressedHidden2953 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSuppressedHiddenSub_in_entryRuleSuppressedHiddenSub2993 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSuppressedHiddenSub3003 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSuppressedHiddenSubSub_in_ruleSuppressedHiddenSub3050 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSuppressedHiddenSubID_in_ruleSuppressedHiddenSub3077 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSuppressedHiddenSubSub_in_entryRuleSuppressedHiddenSubSub3118 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSuppressedHiddenSubSub3128 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_ruleSuppressedHiddenSubSub3169 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleSuppressedHiddenSubSub3186 = new BitSet(new long[]{0x0000040000000000L});
-    public static final BitSet FOLLOW_42_in_ruleSuppressedHiddenSubSub3203 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSuppressedHiddenSubID_in_entryRuleSuppressedHiddenSubID3243 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSuppressedHiddenSubID3253 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleSuppressedHiddenSubID3294 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDatatype1_in_entryRuleDatatype13335 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDatatype13346 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_ruleDatatype13392 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDatatype2_in_entryRuleDatatype23437 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDatatype23448 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_ruleDatatype23494 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDatatype3_in_entryRuleDatatype33539 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDatatype33550 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFQN_in_ruleDatatype33596 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDatatypes_in_entryRuleDatatypes3640 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDatatypes3650 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_ruleDatatypes3687 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleDatatype1_in_ruleDatatypes3708 = new BitSet(new long[]{0x0000100000000000L});
-    public static final BitSet FOLLOW_44_in_ruleDatatypes3720 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleDatatype2_in_ruleDatatypes3741 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleDatatype3_in_ruleDatatypes3762 = new BitSet(new long[]{0x0000200000000000L});
-    public static final BitSet FOLLOW_45_in_ruleDatatypes3774 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_46_in_ruleEnum13824 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_47_in_ruleEnum13841 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_48_in_ruleEnum13858 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_1 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_2 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x00000004A7000000L});
+    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000000000002000L});
+    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0000000000001000L});
+    public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x000000000000C000L});
+    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000000000010000L});
+    public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000000040020L});
+    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000000060000L});
+    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000000100000L});
+    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000200010L});
+    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000000220000L});
+    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000000400000L});
+    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x000008E800880012L});
+    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000008000000L});
+    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x000008E814880010L});
+    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000000002002L});
+    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000000040000012L});
+    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000000040000002L});
+    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x000008E800880010L});
+    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000000100000000L});
+    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0000000200000000L});
+    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000001000000002L});
+    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0001C00000000000L});
+    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0001C00000020002L});
+    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0000000000020002L});
+    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000028000000010L});
+    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000018000000000L});
+    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000020000000010L});
+    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0000040000000000L});
+    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0000100000000000L});
+    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0000200000000000L});
 
 }
\ No newline at end of file
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/serializer/AbstractFormatterTestLanguageSemanticSequencer.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/serializer/AbstractFormatterTestLanguageSemanticSequencer.java
index 8de798736..3959cb9af 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/serializer/AbstractFormatterTestLanguageSemanticSequencer.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/serializer/AbstractFormatterTestLanguageSemanticSequencer.java
@@ -24,17 +24,15 @@
 import com.avaloq.tools.ddk.xtext.formatter.formatterTestLanguage.TestRightPadding;
 import com.avaloq.tools.ddk.xtext.formatter.services.FormatterTestLanguageGrammarAccess;
 import com.google.inject.Inject;
-import com.google.inject.Provider;
+import java.util.Set;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.xtext.serializer.acceptor.ISemanticSequenceAcceptor;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.xtext.Action;
+import org.eclipse.xtext.Parameter;
+import org.eclipse.xtext.ParserRule;
+import org.eclipse.xtext.serializer.ISerializationContext;
 import org.eclipse.xtext.serializer.acceptor.SequenceFeeder;
-import org.eclipse.xtext.serializer.diagnostic.ISemanticSequencerDiagnosticProvider;
-import org.eclipse.xtext.serializer.diagnostic.ISerializationDiagnostic.Acceptor;
 import org.eclipse.xtext.serializer.sequencer.AbstractDelegatingSemanticSequencer;
-import org.eclipse.xtext.serializer.sequencer.GenericSequencer;
-import org.eclipse.xtext.serializer.sequencer.ISemanticNodeProvider.INodesForEObjectProvider;
-import org.eclipse.xtext.serializer.sequencer.ISemanticSequencer;
-import org.eclipse.xtext.serializer.sequencer.ITransientValueService;
 import org.eclipse.xtext.serializer.sequencer.ITransientValueService.ValueTransient;
 
 @SuppressWarnings("all")
@@ -44,8 +42,13 @@ public abstract class AbstractFormatterTestLanguageSemanticSequencer extends Abs
 	private FormatterTestLanguageGrammarAccess grammarAccess;
 	
 	@Override
-	public void createSequence(EObject context, EObject semanticObject) {
-		if(semanticObject.eClass().getEPackage() == FormatterTestLanguagePackage.eINSTANCE) switch(semanticObject.eClass().getClassifierID()) {
+	public void sequence(ISerializationContext context, EObject semanticObject) {
+		EPackage epackage = semanticObject.eClass().getEPackage();
+		ParserRule rule = context.getParserRule();
+		Action action = context.getAssignedAction();
+		Set<Parameter> parameters = context.getEnabledBooleanParameters();
+		if (epackage == FormatterTestLanguagePackage.eINSTANCE)
+			switch (semanticObject.eClass().getClassifierID()) {
 			case FormatterTestLanguagePackage.ASSIGN:
 				sequence_Assign(context, (Assign) semanticObject); 
 				return; 
@@ -101,33 +104,41 @@ public void createSequence(EObject context, EObject semanticObject) {
 				sequence_TestRightPadding(context, (TestRightPadding) semanticObject); 
 				return; 
 			}
-		if (errorAcceptor != null) errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
+		if (errorAcceptor != null)
+			errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
 	}
 	
 	/**
+	 * Contexts:
+	 *     Line returns Assign
+	 *     Assign returns Assign
+	 *
 	 * Constraint:
 	 *     (var=ID (op='=' | op='+=') (val+=INT val+=INT*)?)
 	 */
-	protected void sequence_Assign(EObject context, Assign semanticObject) {
+	protected void sequence_Assign(ISerializationContext context, Assign semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Line returns Datatypes
+	 *     Datatypes returns Datatypes
+	 *
 	 * Constraint:
 	 *     (val1=Datatype1 val2=Datatype2 val3=Datatype3)
 	 */
-	protected void sequence_Datatypes(EObject context, Datatypes semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, FormatterTestLanguagePackage.Literals.DATATYPES__VAL1) == ValueTransient.YES)
+	protected void sequence_Datatypes(ISerializationContext context, Datatypes semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, FormatterTestLanguagePackage.Literals.DATATYPES__VAL1) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, FormatterTestLanguagePackage.Literals.DATATYPES__VAL1));
-			if(transientValues.isValueTransient(semanticObject, FormatterTestLanguagePackage.Literals.DATATYPES__VAL2) == ValueTransient.YES)
+			if (transientValues.isValueTransient(semanticObject, FormatterTestLanguagePackage.Literals.DATATYPES__VAL2) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, FormatterTestLanguagePackage.Literals.DATATYPES__VAL2));
-			if(transientValues.isValueTransient(semanticObject, FormatterTestLanguagePackage.Literals.DATATYPES__VAL3) == ValueTransient.YES)
+			if (transientValues.isValueTransient(semanticObject, FormatterTestLanguagePackage.Literals.DATATYPES__VAL3) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, FormatterTestLanguagePackage.Literals.DATATYPES__VAL3));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getDatatypesAccess().getVal1Datatype1ParserRuleCall_1_0(), semanticObject.getVal1());
 		feeder.accept(grammarAccess.getDatatypesAccess().getVal2Datatype2ParserRuleCall_3_0(), semanticObject.getVal2());
 		feeder.accept(grammarAccess.getDatatypesAccess().getVal3Datatype3ParserRuleCall_4_0(), semanticObject.getVal3());
@@ -136,181 +147,234 @@ protected void sequence_Datatypes(EObject context, Datatypes semanticObject) {
 	
 	
 	/**
+	 * Contexts:
+	 *     Line returns Decl
+	 *     Decl returns Decl
+	 *
 	 * Constraint:
 	 *     (type+=ID name+=ID)
 	 */
-	protected void sequence_Decl(EObject context, Decl semanticObject) {
+	protected void sequence_Decl(ISerializationContext context, Decl semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Line returns Enumeration
+	 *     Enumeration returns Enumeration
+	 *
 	 * Constraint:
 	 *     (val+=Enum1+ val+=Enum1*)
 	 */
-	protected void sequence_Enumeration(EObject context, Enumeration semanticObject) {
+	protected void sequence_Enumeration(ISerializationContext context, Enumeration semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Line returns FqnObj
+	 *     FqnObj returns FqnObj
+	 *
 	 * Constraint:
 	 *     name=FQN
 	 */
-	protected void sequence_FqnObj(EObject context, FqnObj semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, FormatterTestLanguagePackage.Literals.FQN_OBJ__NAME) == ValueTransient.YES)
+	protected void sequence_FqnObj(ISerializationContext context, FqnObj semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, FormatterTestLanguagePackage.Literals.FQN_OBJ__NAME) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, FormatterTestLanguagePackage.Literals.FQN_OBJ__NAME));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getFqnObjAccess().getNameFQNParserRuleCall_1_0(), semanticObject.getName());
 		feeder.finish();
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Line returns FqnRef
+	 *     FqnRef returns FqnRef
+	 *
 	 * Constraint:
 	 *     ref=[FqnObj|FQN]
 	 */
-	protected void sequence_FqnRef(EObject context, FqnRef semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, FormatterTestLanguagePackage.Literals.FQN_REF__REF) == ValueTransient.YES)
+	protected void sequence_FqnRef(ISerializationContext context, FqnRef semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, FormatterTestLanguagePackage.Literals.FQN_REF__REF) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, FormatterTestLanguagePackage.Literals.FQN_REF__REF));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-		feeder.accept(grammarAccess.getFqnRefAccess().getRefFqnObjFQNParserRuleCall_1_0_1(), semanticObject.getRef());
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
+		feeder.accept(grammarAccess.getFqnRefAccess().getRefFqnObjFQNParserRuleCall_1_0_1(), semanticObject.eGet(FormatterTestLanguagePackage.Literals.FQN_REF__REF, false));
 		feeder.finish();
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Line returns Meth
+	 *     Meth returns Meth
+	 *
 	 * Constraint:
 	 *     (name=ID (param+=Param param+=Param*)?)
 	 */
-	protected void sequence_Meth(EObject context, Meth semanticObject) {
+	protected void sequence_Meth(ISerializationContext context, Meth semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Param returns Param
+	 *
 	 * Constraint:
 	 *     (name+=ID type+=ID)
 	 */
-	protected void sequence_Param(EObject context, Param semanticObject) {
+	protected void sequence_Param(ISerializationContext context, Param semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Line returns Space
+	 *     Space returns Space
+	 *
 	 * Constraint:
 	 *     val=ID
 	 */
-	protected void sequence_Space(EObject context, Space semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, FormatterTestLanguagePackage.Literals.SPACE__VAL) == ValueTransient.YES)
+	protected void sequence_Space(ISerializationContext context, Space semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, FormatterTestLanguagePackage.Literals.SPACE__VAL) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, FormatterTestLanguagePackage.Literals.SPACE__VAL));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getSpaceAccess().getValIDTerminalRuleCall_1_0(), semanticObject.getVal());
 		feeder.finish();
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     SuppressedHiddenSub returns SuppressedHiddenSubID
+	 *     SuppressedHiddenSubID returns SuppressedHiddenSubID
+	 *
 	 * Constraint:
 	 *     idval=ID
 	 */
-	protected void sequence_SuppressedHiddenSubID(EObject context, SuppressedHiddenSubID semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, FormatterTestLanguagePackage.Literals.SUPPRESSED_HIDDEN_SUB__IDVAL) == ValueTransient.YES)
+	protected void sequence_SuppressedHiddenSubID(ISerializationContext context, SuppressedHiddenSubID semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, FormatterTestLanguagePackage.Literals.SUPPRESSED_HIDDEN_SUB__IDVAL) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, FormatterTestLanguagePackage.Literals.SUPPRESSED_HIDDEN_SUB__IDVAL));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getSuppressedHiddenSubIDAccess().getIdvalIDTerminalRuleCall_0(), semanticObject.getIdval());
 		feeder.finish();
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     SuppressedHiddenSub returns SuppressedHiddenSubSub
+	 *     SuppressedHiddenSubSub returns SuppressedHiddenSubSub
+	 *
 	 * Constraint:
 	 *     idval=ID
 	 */
-	protected void sequence_SuppressedHiddenSubSub(EObject context, SuppressedHiddenSubSub semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, FormatterTestLanguagePackage.Literals.SUPPRESSED_HIDDEN_SUB__IDVAL) == ValueTransient.YES)
+	protected void sequence_SuppressedHiddenSubSub(ISerializationContext context, SuppressedHiddenSubSub semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, FormatterTestLanguagePackage.Literals.SUPPRESSED_HIDDEN_SUB__IDVAL) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, FormatterTestLanguagePackage.Literals.SUPPRESSED_HIDDEN_SUB__IDVAL));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getSuppressedHiddenSubSubAccess().getIdvalIDTerminalRuleCall_1_0(), semanticObject.getIdval());
 		feeder.finish();
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Line returns SuppressedHidden
+	 *     SuppressedHidden returns SuppressedHidden
+	 *
 	 * Constraint:
-	 *     ((vals+=SuppressedHiddenSub vals+=SuppressedHiddenSub*)?)
+	 *     (vals+=SuppressedHiddenSub vals+=SuppressedHiddenSub*)?
 	 */
-	protected void sequence_SuppressedHidden(EObject context, SuppressedHidden semanticObject) {
+	protected void sequence_SuppressedHidden(ISerializationContext context, SuppressedHidden semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Root returns TestColumn
+	 *     TestColumn returns TestColumn
+	 *
 	 * Constraint:
 	 *     (name=ID? items+=Line*)
 	 */
-	protected void sequence_TestColumn(EObject context, TestColumn semanticObject) {
+	protected void sequence_TestColumn(ISerializationContext context, TestColumn semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Root returns TestIndentation
+	 *     TestIndentation returns TestIndentation
+	 *
 	 * Constraint:
 	 *     ((sub+=TestIndentation | items+=Line)* semi?=';'?)
 	 */
-	protected void sequence_TestIndentation(EObject context, TestIndentation semanticObject) {
+	protected void sequence_TestIndentation(ISerializationContext context, TestIndentation semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Root returns TestLinewrapMinMax
+	 *     TestLinewrapMinMax returns TestLinewrapMinMax
+	 *
 	 * Constraint:
-	 *     (items+=Line*)
+	 *     items+=Line*
 	 */
-	protected void sequence_TestLinewrapMinMax(EObject context, TestLinewrapMinMax semanticObject) {
+	protected void sequence_TestLinewrapMinMax(ISerializationContext context, TestLinewrapMinMax semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Root returns TestLinewrap
+	 *     TestLinewrap returns TestLinewrap
+	 *
 	 * Constraint:
-	 *     (items+=Line*)
+	 *     items+=Line*
 	 */
-	protected void sequence_TestLinewrap(EObject context, TestLinewrap semanticObject) {
+	protected void sequence_TestLinewrap(ISerializationContext context, TestLinewrap semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Root returns TestOffset
+	 *     TestOffset returns TestOffset
+	 *
 	 * Constraint:
 	 *     (value=ID first=ID second=ID)
 	 */
-	protected void sequence_TestOffset(EObject context, TestOffset semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, FormatterTestLanguagePackage.Literals.TEST_OFFSET__VALUE) == ValueTransient.YES)
+	protected void sequence_TestOffset(ISerializationContext context, TestOffset semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, FormatterTestLanguagePackage.Literals.TEST_OFFSET__VALUE) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, FormatterTestLanguagePackage.Literals.TEST_OFFSET__VALUE));
-			if(transientValues.isValueTransient(semanticObject, FormatterTestLanguagePackage.Literals.TEST_OFFSET__FIRST) == ValueTransient.YES)
+			if (transientValues.isValueTransient(semanticObject, FormatterTestLanguagePackage.Literals.TEST_OFFSET__FIRST) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, FormatterTestLanguagePackage.Literals.TEST_OFFSET__FIRST));
-			if(transientValues.isValueTransient(semanticObject, FormatterTestLanguagePackage.Literals.TEST_OFFSET__SECOND) == ValueTransient.YES)
+			if (transientValues.isValueTransient(semanticObject, FormatterTestLanguagePackage.Literals.TEST_OFFSET__SECOND) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, FormatterTestLanguagePackage.Literals.TEST_OFFSET__SECOND));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getTestOffsetAccess().getValueIDTerminalRuleCall_3_0(), semanticObject.getValue());
 		feeder.accept(grammarAccess.getTestOffsetAccess().getFirstIDTerminalRuleCall_5_0(), semanticObject.getFirst());
 		feeder.accept(grammarAccess.getTestOffsetAccess().getSecondIDTerminalRuleCall_6_0(), semanticObject.getSecond());
@@ -319,20 +383,25 @@ protected void sequence_TestOffset(EObject context, TestOffset semanticObject) {
 	
 	
 	/**
+	 * Contexts:
+	 *     Root returns TestRightPadding
+	 *     TestRightPadding returns TestRightPadding
+	 *
 	 * Constraint:
 	 *     (p1=ID p2=ID)
 	 */
-	protected void sequence_TestRightPadding(EObject context, TestRightPadding semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, FormatterTestLanguagePackage.Literals.TEST_RIGHT_PADDING__P1) == ValueTransient.YES)
+	protected void sequence_TestRightPadding(ISerializationContext context, TestRightPadding semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, FormatterTestLanguagePackage.Literals.TEST_RIGHT_PADDING__P1) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, FormatterTestLanguagePackage.Literals.TEST_RIGHT_PADDING__P1));
-			if(transientValues.isValueTransient(semanticObject, FormatterTestLanguagePackage.Literals.TEST_RIGHT_PADDING__P2) == ValueTransient.YES)
+			if (transientValues.isValueTransient(semanticObject, FormatterTestLanguagePackage.Literals.TEST_RIGHT_PADDING__P2) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, FormatterTestLanguagePackage.Literals.TEST_RIGHT_PADDING__P2));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getTestRightPaddingAccess().getP1IDTerminalRuleCall_1_0(), semanticObject.getP1());
 		feeder.accept(grammarAccess.getTestRightPaddingAccess().getP2IDTerminalRuleCall_2_0(), semanticObject.getP2());
 		feeder.finish();
 	}
+	
+	
 }
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/services/FormatterTestLanguageGrammarAccess.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/services/FormatterTestLanguageGrammarAccess.java
index fdf05b836..9ea001053 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/services/FormatterTestLanguageGrammarAccess.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/services/FormatterTestLanguageGrammarAccess.java
@@ -19,7 +19,7 @@ public class FormatterTestLanguageGrammarAccess extends AbstractGrammarElementFi
 	
 	
 	public class RootElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Root");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.Root");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cTestKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Alternatives cAlternatives_1 = (Alternatives)cGroup.eContents().get(1);
@@ -63,7 +63,7 @@ public class RootElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class LineElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Line");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.Line");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Alternatives cAlternatives_0 = (Alternatives)cGroup.eContents().get(0);
 		private final RuleCall cDeclParserRuleCall_0_0 = (RuleCall)cAlternatives_0.eContents().get(0);
@@ -127,7 +127,7 @@ public class LineElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class DeclElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Decl");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.Decl");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cTypeAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final RuleCall cTypeIDTerminalRuleCall_0_0 = (RuleCall)cTypeAssignment_0.eContents().get(0);
@@ -155,7 +155,7 @@ public class DeclElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class AssignElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Assign");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.Assign");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cVarAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final RuleCall cVarIDTerminalRuleCall_0_0 = (RuleCall)cVarAssignment_0.eContents().get(0);
@@ -189,7 +189,7 @@ public class AssignElements extends AbstractParserRuleElementFinder {
 		//op=("=" | "+=")
 		public Assignment getOpAssignment_1() { return cOpAssignment_1; }
 
-		//"=" | "+="
+		//("=" | "+=")
 		public Alternatives getOpAlternatives_1_0() { return cOpAlternatives_1_0; }
 
 		//"="
@@ -227,7 +227,7 @@ public class AssignElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class MethElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Meth");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.Meth");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cVoidKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -287,7 +287,7 @@ public class MethElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class ParamElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Param");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.Param");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cNameAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final RuleCall cNameIDTerminalRuleCall_0_0 = (RuleCall)cNameAssignment_0.eContents().get(0);
@@ -319,7 +319,7 @@ public class ParamElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class SpaceElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Space");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.Space");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cSpaceKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cValAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -343,7 +343,7 @@ public class SpaceElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class TestLinewrapElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "TestLinewrap");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.TestLinewrap");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Action cTestLinewrapAction_0 = (Action)cGroup.eContents().get(0);
 		private final Keyword cLinewrapKeyword_1 = (Keyword)cGroup.eContents().get(1);
@@ -371,7 +371,7 @@ public class TestLinewrapElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class TestLinewrapMinMaxElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "TestLinewrapMinMax");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.TestLinewrapMinMax");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Action cTestLinewrapMinMaxAction_0 = (Action)cGroup.eContents().get(0);
 		private final Keyword cWrapminmaxKeyword_1 = (Keyword)cGroup.eContents().get(1);
@@ -399,7 +399,7 @@ public class TestLinewrapMinMaxElements extends AbstractParserRuleElementFinder
 	}
 
 	public class TestIndentationElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "TestIndentation");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.TestIndentation");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Action cTestIndentationAction_0 = (Action)cGroup.eContents().get(0);
 		private final Keyword cIndentationKeyword_1 = (Keyword)cGroup.eContents().get(1);
@@ -455,7 +455,7 @@ public class TestIndentationElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class TestColumnElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "TestColumn");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.TestColumn");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Action cTestColumnAction_0 = (Action)cGroup.eContents().get(0);
 		private final Keyword cColumnKeyword_1 = (Keyword)cGroup.eContents().get(1);
@@ -499,7 +499,7 @@ public class TestColumnElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class TestOffsetElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "TestOffset");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.TestOffset");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Action cTestOffsetAction_0 = (Action)cGroup.eContents().get(0);
 		private final Keyword cOffsetKeyword_1 = (Keyword)cGroup.eContents().get(1);
@@ -551,7 +551,7 @@ public class TestOffsetElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class TestRightPaddingElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "TestRightPadding");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.TestRightPadding");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cPaddingKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cP1Assignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -587,7 +587,7 @@ public class TestRightPaddingElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class FqnObjElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "FqnObj");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.FqnObj");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cFqnKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -611,7 +611,7 @@ public class FqnObjElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class FQNElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "FQN");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.FQN");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final RuleCall cIDTerminalRuleCall_0 = (RuleCall)cGroup.eContents().get(0);
 		private final Group cGroup_1 = (Group)cGroup.eContents().get(1);
@@ -639,7 +639,7 @@ public class FQNElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class FqnRefElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "FqnRef");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.FqnRef");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cFqnrefKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cRefAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -667,7 +667,7 @@ public class FqnRefElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class EnumerationElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Enumeration");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.Enumeration");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cEnumKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cValAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -678,10 +678,10 @@ public class EnumerationElements extends AbstractParserRuleElementFinder {
 		private final RuleCall cValEnum1EnumRuleCall_2_1_0 = (RuleCall)cValAssignment_2_1.eContents().get(0);
 		
 		//Enumeration:
-		//	"enum" val+=Enum1+ ("," val+=Enum1)*;
+		//	"enum" val+=Enum1+ (',' val+=Enum1)*;
 		@Override public ParserRule getRule() { return rule; }
 
-		//"enum" val+=Enum1+ ("," val+=Enum1)*
+		//"enum" val+=Enum1+ (',' val+=Enum1)*
 		public Group getGroup() { return cGroup; }
 
 		//"enum"
@@ -693,10 +693,10 @@ public class EnumerationElements extends AbstractParserRuleElementFinder {
 		//Enum1
 		public RuleCall getValEnum1EnumRuleCall_1_0() { return cValEnum1EnumRuleCall_1_0; }
 
-		//("," val+=Enum1)*
+		//(',' val+=Enum1)*
 		public Group getGroup_2() { return cGroup_2; }
 
-		//","
+		//','
 		public Keyword getCommaKeyword_2_0() { return cCommaKeyword_2_0; }
 
 		//val+=Enum1
@@ -707,7 +707,7 @@ public class EnumerationElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class SuppressedHiddenElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "SuppressedHidden");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.SuppressedHidden");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Action cSuppressedHiddenAction_0 = (Action)cGroup.eContents().get(0);
 		private final Keyword cGraveAccentKeyword_1 = (Keyword)cGroup.eContents().get(1);
@@ -721,10 +721,10 @@ public class SuppressedHiddenElements extends AbstractParserRuleElementFinder {
 		private final Keyword cGraveAccentKeyword_3 = (Keyword)cGroup.eContents().get(3);
 		
 		//SuppressedHidden hidden():
-		//	{SuppressedHidden} "`" (vals+=SuppressedHiddenSub ("%" vals+=SuppressedHiddenSub)*)? "`";
+		//	{SuppressedHidden} "`" (vals+=SuppressedHiddenSub ('%' vals+=SuppressedHiddenSub)*)? "`";
 		@Override public ParserRule getRule() { return rule; }
 
-		//{SuppressedHidden} "`" (vals+=SuppressedHiddenSub ("%" vals+=SuppressedHiddenSub)*)? "`"
+		//{SuppressedHidden} "`" (vals+=SuppressedHiddenSub ('%' vals+=SuppressedHiddenSub)*)? "`"
 		public Group getGroup() { return cGroup; }
 
 		//{SuppressedHidden}
@@ -733,7 +733,7 @@ public class SuppressedHiddenElements extends AbstractParserRuleElementFinder {
 		//"`"
 		public Keyword getGraveAccentKeyword_1() { return cGraveAccentKeyword_1; }
 
-		//(vals+=SuppressedHiddenSub ("%" vals+=SuppressedHiddenSub)*)?
+		//(vals+=SuppressedHiddenSub ('%' vals+=SuppressedHiddenSub)*)?
 		public Group getGroup_2() { return cGroup_2; }
 
 		//vals+=SuppressedHiddenSub
@@ -742,10 +742,10 @@ public class SuppressedHiddenElements extends AbstractParserRuleElementFinder {
 		//SuppressedHiddenSub
 		public RuleCall getValsSuppressedHiddenSubParserRuleCall_2_0_0() { return cValsSuppressedHiddenSubParserRuleCall_2_0_0; }
 
-		//("%" vals+=SuppressedHiddenSub)*
+		//('%' vals+=SuppressedHiddenSub)*
 		public Group getGroup_2_1() { return cGroup_2_1; }
 
-		//"%"
+		//'%'
 		public Keyword getPercentSignKeyword_2_1_0() { return cPercentSignKeyword_2_1_0; }
 
 		//vals+=SuppressedHiddenSub
@@ -759,7 +759,7 @@ public class SuppressedHiddenElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class SuppressedHiddenSubElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "SuppressedHiddenSub");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.SuppressedHiddenSub");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cSuppressedHiddenSubSubParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cSuppressedHiddenSubIDParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
@@ -779,7 +779,7 @@ public class SuppressedHiddenSubElements extends AbstractParserRuleElementFinder
 	}
 
 	public class SuppressedHiddenSubSubElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "SuppressedHiddenSubSub");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.SuppressedHiddenSubSub");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cLessThanSignKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cIdvalAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -787,13 +787,13 @@ public class SuppressedHiddenSubSubElements extends AbstractParserRuleElementFin
 		private final Keyword cGreaterThanSignKeyword_2 = (Keyword)cGroup.eContents().get(2);
 		
 		//SuppressedHiddenSubSub hidden(WS):
-		//	"<" idval=ID ">";
+		//	'<' idval=ID '>';
 		@Override public ParserRule getRule() { return rule; }
 
-		//"<" idval=ID ">"
+		//'<' idval=ID '>'
 		public Group getGroup() { return cGroup; }
 
-		//"<"
+		//'<'
 		public Keyword getLessThanSignKeyword_0() { return cLessThanSignKeyword_0; }
 
 		//idval=ID
@@ -802,12 +802,12 @@ public class SuppressedHiddenSubSubElements extends AbstractParserRuleElementFin
 		//ID
 		public RuleCall getIdvalIDTerminalRuleCall_1_0() { return cIdvalIDTerminalRuleCall_1_0; }
 
-		//">"
+		//'>'
 		public Keyword getGreaterThanSignKeyword_2() { return cGreaterThanSignKeyword_2; }
 	}
 
 	public class SuppressedHiddenSubIDElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "SuppressedHiddenSubID");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.SuppressedHiddenSubID");
 		private final Assignment cIdvalAssignment = (Assignment)rule.eContents().get(1);
 		private final RuleCall cIdvalIDTerminalRuleCall_0 = (RuleCall)cIdvalAssignment.eContents().get(0);
 		
@@ -823,7 +823,7 @@ public class SuppressedHiddenSubIDElements extends AbstractParserRuleElementFind
 	}
 
 	public class Datatype1Elements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Datatype1");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.Datatype1");
 		private final RuleCall cFQNParserRuleCall = (RuleCall)rule.eContents().get(1);
 		
 		//Datatype1:
@@ -835,7 +835,7 @@ public class Datatype1Elements extends AbstractParserRuleElementFinder {
 	}
 
 	public class Datatype2Elements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Datatype2");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.Datatype2");
 		private final RuleCall cFQNParserRuleCall = (RuleCall)rule.eContents().get(1);
 		
 		//Datatype2:
@@ -847,7 +847,7 @@ public class Datatype2Elements extends AbstractParserRuleElementFinder {
 	}
 
 	public class Datatype3Elements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Datatype3");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.Datatype3");
 		private final RuleCall cFQNParserRuleCall = (RuleCall)rule.eContents().get(1);
 		
 		//Datatype3:
@@ -859,7 +859,7 @@ public class Datatype3Elements extends AbstractParserRuleElementFinder {
 	}
 
 	public class DatatypesElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Datatypes");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.Datatypes");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cDatatypesKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cVal1Assignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -908,7 +908,7 @@ public class DatatypesElements extends AbstractParserRuleElementFinder {
 	
 	
 	public class Enum1Elements extends AbstractEnumRuleElementFinder {
-		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "Enum1");
+		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.formatter.FormatterTestLanguage.Enum1");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final EnumLiteralDeclaration cLit1EnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0);
 		private final Keyword cLit1Lit1Keyword_0_0 = (Keyword)cLit1EnumLiteralDeclaration_0.eContents().get(0);
@@ -960,7 +960,7 @@ public class Enum1Elements extends AbstractEnumRuleElementFinder {
 	private final FQNElements pFQN;
 	private final FqnRefElements pFqnRef;
 	private final EnumerationElements pEnumeration;
-	private final Enum1Elements unknownRuleEnum1;
+	private final Enum1Elements eEnum1;
 	private final SuppressedHiddenElements pSuppressedHidden;
 	private final SuppressedHiddenSubElements pSuppressedHiddenSub;
 	private final SuppressedHiddenSubSubElements pSuppressedHiddenSubSub;
@@ -996,7 +996,7 @@ public FormatterTestLanguageGrammarAccess(GrammarProvider grammarProvider,
 		this.pFQN = new FQNElements();
 		this.pFqnRef = new FqnRefElements();
 		this.pEnumeration = new EnumerationElements();
-		this.unknownRuleEnum1 = new Enum1Elements();
+		this.eEnum1 = new Enum1Elements();
 		this.pSuppressedHidden = new SuppressedHiddenElements();
 		this.pSuppressedHiddenSub = new SuppressedHiddenSubElements();
 		this.pSuppressedHiddenSubSub = new SuppressedHiddenSubSubElements();
@@ -1195,7 +1195,7 @@ public ParserRule getFqnRefRule() {
 	}
 
 	//Enumeration:
-	//	"enum" val+=Enum1+ ("," val+=Enum1)*;
+	//	"enum" val+=Enum1+ (',' val+=Enum1)*;
 	public EnumerationElements getEnumerationAccess() {
 		return pEnumeration;
 	}
@@ -1207,7 +1207,7 @@ public ParserRule getEnumerationRule() {
 	//enum Enum1:
 	//	lit1 | lit2 | lit3;
 	public Enum1Elements getEnum1Access() {
-		return unknownRuleEnum1;
+		return eEnum1;
 	}
 	
 	public EnumRule getEnum1Rule() {
@@ -1215,7 +1215,7 @@ public EnumRule getEnum1Rule() {
 	}
 
 	//SuppressedHidden hidden():
-	//	{SuppressedHidden} "`" (vals+=SuppressedHiddenSub ("%" vals+=SuppressedHiddenSub)*)? "`";
+	//	{SuppressedHidden} "`" (vals+=SuppressedHiddenSub ('%' vals+=SuppressedHiddenSub)*)? "`";
 	public SuppressedHiddenElements getSuppressedHiddenAccess() {
 		return pSuppressedHidden;
 	}
@@ -1235,7 +1235,7 @@ public ParserRule getSuppressedHiddenSubRule() {
 	}
 
 	//SuppressedHiddenSubSub hidden(WS):
-	//	"<" idval=ID ">";
+	//	'<' idval=ID '>';
 	public SuppressedHiddenSubSubElements getSuppressedHiddenSubSubAccess() {
 		return pSuppressedHiddenSubSub;
 	}
@@ -1295,38 +1295,37 @@ public ParserRule getDatatypesRule() {
 	}
 
 	//terminal ID:
-	//	"^"? ("a".."z" | "A".."Z" | "_") ("a".."z" | "A".."Z" | "_" | "0".."9")*;
+	//	'^'? ('a'..'z' | 'A'..'Z' | '_') ('a'..'z' | 'A'..'Z' | '_' | '0'..'9')*;
 	public TerminalRule getIDRule() {
 		return gaTerminals.getIDRule();
 	} 
 
 	//terminal INT returns ecore::EInt:
-	//	"0".."9"+;
+	//	'0'..'9'+;
 	public TerminalRule getINTRule() {
 		return gaTerminals.getINTRule();
 	} 
 
 	//terminal STRING:
-	//	"\"" ("\\" . / * 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' * / | !("\\" | "\""))* "\"" | "\'" ("\\" .
-	//	/ * 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' * / | !("\\" | "\'"))* "\'";
+	//	'"' ('\\' . | !('\\' | '"'))* '"' | "'" ('\\' . | !('\\' | "'"))* "'";
 	public TerminalRule getSTRINGRule() {
 		return gaTerminals.getSTRINGRule();
 	} 
 
 	//terminal ML_COMMENT:
-	//	"/ *"->"* /";
+	//	'/*'->'*/';
 	public TerminalRule getML_COMMENTRule() {
 		return gaTerminals.getML_COMMENTRule();
 	} 
 
 	//terminal SL_COMMENT:
-	//	"//" !("\n" | "\r")* ("\r"? "\n")?;
+	//	'//' !('\n' | '\r')* ('\r'? '\n')?;
 	public TerminalRule getSL_COMMENTRule() {
 		return gaTerminals.getSL_COMMENTRule();
 	} 
 
 	//terminal WS:
-	//	(" " | "\t" | "\r" | "\n")+;
+	//	' ' | '\t' | '\r' | '\n'+;
 	public TerminalRule getWSRule() {
 		return gaTerminals.getWSRule();
 	} 
diff --git a/com.avaloq.tools.ddk.xtext.valid.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.valid.ui/META-INF/MANIFEST.MF
index d457adc09..526c62bf5 100644
--- a/com.avaloq.tools.ddk.xtext.valid.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.valid.ui/META-INF/MANIFEST.MF
@@ -19,7 +19,8 @@ Require-Bundle: com.avaloq.tools.ddk.xtext.ui,
 Export-Package: com.avaloq.tools.ddk.xtext.valid.ui.contentassist.antlr,
  com.avaloq.tools.ddk.xtext.valid.ui.internal;x-friends:="com.avaloq.tools.ddk.xtext.valid.test",
  com.avaloq.tools.ddk.xtext.valid.ui.contentassist,
- com.avaloq.tools.ddk.xtext.valid.ui.quickfix
+ com.avaloq.tools.ddk.xtext.valid.ui.quickfix,
+ com.avaloq.tools.ddk.xtext.valid.ui.contentassist.antlr.internal
 Import-Package: org.apache.log4j
 Bundle-Activator: com.avaloq.tools.ddk.xtext.valid.ui.internal.ValidActivator
 Eclipse-ExtensibleAPI: true
diff --git a/com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/AbstractValidUiModule.java b/com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/AbstractValidUiModule.java
index ad2133ff1..b44c1d80f 100644
--- a/com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/AbstractValidUiModule.java
+++ b/com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/AbstractValidUiModule.java
@@ -122,5 +122,10 @@ public Class<? extends org.eclipse.compare.IViewerCreator> bindIViewerCreator()
 		return org.eclipse.xtext.ui.compare.DefaultViewerCreator.class;
 	}
 
+	// contributed by org.eclipse.xtext.ui.generator.compare.CompareFragment
+	public void configureCompareViewerTitle(com.google.inject.Binder binder) {
+		binder.bind(String.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.UIBindings.COMPARE_VIEWER_TITLE)).toInstance("Valid Compare");
+	}
+
 
 }
diff --git a/com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValidLexer.java b/com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValidLexer.java
index afc742d0a..4b702f4ed 100644
--- a/com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValidLexer.java
+++ b/com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValidLexer.java
@@ -59,15 +59,15 @@ public InternalValidLexer(CharStream input, RecognizerSharedState state) {
         super(input,state);
 
     }
-    public String getGrammarFileName() { return "../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g"; }
+    public String getGrammarFileName() { return "InternalValid.g"; }
 
     // $ANTLR start "T__11"
     public final void mT__11() throws RecognitionException {
         try {
             int _type = T__11;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:11:7: ( 'fast' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:11:9: 'fast'
+            // InternalValid.g:11:7: ( 'fast' )
+            // InternalValid.g:11:9: 'fast'
             {
             match("fast"); 
 
@@ -87,8 +87,8 @@ public final void mT__12() throws RecognitionException {
         try {
             int _type = T__12;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:12:7: ( 'normal' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:12:9: 'normal'
+            // InternalValid.g:12:7: ( 'normal' )
+            // InternalValid.g:12:9: 'normal'
             {
             match("normal"); 
 
@@ -108,8 +108,8 @@ public final void mT__13() throws RecognitionException {
         try {
             int _type = T__13;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:13:7: ( 'expensive' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:13:9: 'expensive'
+            // InternalValid.g:13:7: ( 'expensive' )
+            // InternalValid.g:13:9: 'expensive'
             {
             match("expensive"); 
 
@@ -129,8 +129,8 @@ public final void mT__14() throws RecognitionException {
         try {
             int _type = T__14;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:14:7: ( 'error' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:14:9: 'error'
+            // InternalValid.g:14:7: ( 'error' )
+            // InternalValid.g:14:9: 'error'
             {
             match("error"); 
 
@@ -150,8 +150,8 @@ public final void mT__15() throws RecognitionException {
         try {
             int _type = T__15;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:15:7: ( 'warning' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:15:9: 'warning'
+            // InternalValid.g:15:7: ( 'warning' )
+            // InternalValid.g:15:9: 'warning'
             {
             match("warning"); 
 
@@ -171,8 +171,8 @@ public final void mT__16() throws RecognitionException {
         try {
             int _type = T__16;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:16:7: ( 'semantic' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:16:9: 'semantic'
+            // InternalValid.g:16:7: ( 'semantic' )
+            // InternalValid.g:16:9: 'semantic'
             {
             match("semantic"); 
 
@@ -192,8 +192,8 @@ public final void mT__17() throws RecognitionException {
         try {
             int _type = T__17;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:17:7: ( 'textual' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:17:9: 'textual'
+            // InternalValid.g:17:7: ( 'textual' )
+            // InternalValid.g:17:9: 'textual'
             {
             match("textual"); 
 
@@ -213,8 +213,8 @@ public final void mT__18() throws RecognitionException {
         try {
             int _type = T__18;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:18:7: ( 'import' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:18:9: 'import'
+            // InternalValid.g:18:7: ( 'import' )
+            // InternalValid.g:18:9: 'import'
             {
             match("import"); 
 
@@ -234,8 +234,8 @@ public final void mT__19() throws RecognitionException {
         try {
             int _type = T__19;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:19:7: ( 'category' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:19:9: 'category'
+            // InternalValid.g:19:7: ( 'category' )
+            // InternalValid.g:19:9: 'category'
             {
             match("category"); 
 
@@ -255,8 +255,8 @@ public final void mT__20() throws RecognitionException {
         try {
             int _type = T__20;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:20:7: ( 'label' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:20:9: 'label'
+            // InternalValid.g:20:7: ( 'label' )
+            // InternalValid.g:20:9: 'label'
             {
             match("label"); 
 
@@ -276,8 +276,8 @@ public final void mT__21() throws RecognitionException {
         try {
             int _type = T__21;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:21:7: ( '{' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:21:9: '{'
+            // InternalValid.g:21:7: ( '{' )
+            // InternalValid.g:21:9: '{'
             {
             match('{'); 
 
@@ -296,8 +296,8 @@ public final void mT__22() throws RecognitionException {
         try {
             int _type = T__22;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:22:7: ( '}' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:22:9: '}'
+            // InternalValid.g:22:7: ( '}' )
+            // InternalValid.g:22:9: '}'
             {
             match('}'); 
 
@@ -316,8 +316,8 @@ public final void mT__23() throws RecognitionException {
         try {
             int _type = T__23;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:23:7: ( 'description' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:23:9: 'description'
+            // InternalValid.g:23:7: ( 'description' )
+            // InternalValid.g:23:9: 'description'
             {
             match("description"); 
 
@@ -337,8 +337,8 @@ public final void mT__24() throws RecognitionException {
         try {
             int _type = T__24;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:24:7: ( 'message' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:24:9: 'message'
+            // InternalValid.g:24:7: ( 'message' )
+            // InternalValid.g:24:9: 'message'
             {
             match("message"); 
 
@@ -358,8 +358,8 @@ public final void mT__25() throws RecognitionException {
         try {
             int _type = T__25;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:25:7: ( 'context' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:25:9: 'context'
+            // InternalValid.g:25:7: ( 'context' )
+            // InternalValid.g:25:9: 'context'
             {
             match("context"); 
 
@@ -379,8 +379,8 @@ public final void mT__26() throws RecognitionException {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:26:7: ( 'size' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:26:9: 'size'
+            // InternalValid.g:26:7: ( 'size' )
+            // InternalValid.g:26:9: 'size'
             {
             match("size"); 
 
@@ -400,8 +400,8 @@ public final void mT__27() throws RecognitionException {
         try {
             int _type = T__27;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:27:7: ( '..' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:27:9: '..'
+            // InternalValid.g:27:7: ( '..' )
+            // InternalValid.g:27:9: '..'
             {
             match(".."); 
 
@@ -421,8 +421,8 @@ public final void mT__28() throws RecognitionException {
         try {
             int _type = T__28;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:28:7: ( 'range' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:28:9: 'range'
+            // InternalValid.g:28:7: ( 'range' )
+            // InternalValid.g:28:9: 'range'
             {
             match("range"); 
 
@@ -442,8 +442,8 @@ public final void mT__29() throws RecognitionException {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:29:7: ( 'unique' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:29:9: 'unique'
+            // InternalValid.g:29:7: ( 'unique' )
+            // InternalValid.g:29:9: 'unique'
             {
             match("unique"); 
 
@@ -463,8 +463,8 @@ public final void mT__30() throws RecognitionException {
         try {
             int _type = T__30;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:30:7: ( ';' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:30:9: ';'
+            // InternalValid.g:30:7: ( ';' )
+            // InternalValid.g:30:9: ';'
             {
             match(';'); 
 
@@ -483,8 +483,8 @@ public final void mT__31() throws RecognitionException {
         try {
             int _type = T__31;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:31:7: ( '#' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:31:9: '#'
+            // InternalValid.g:31:7: ( '#' )
+            // InternalValid.g:31:9: '#'
             {
             match('#'); 
 
@@ -503,8 +503,8 @@ public final void mT__32() throws RecognitionException {
         try {
             int _type = T__32;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:32:7: ( 'marker' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:32:9: 'marker'
+            // InternalValid.g:32:7: ( 'marker' )
+            // InternalValid.g:32:9: 'marker'
             {
             match("marker"); 
 
@@ -524,8 +524,8 @@ public final void mT__33() throws RecognitionException {
         try {
             int _type = T__33;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:33:7: ( 'quickfixes' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:33:9: 'quickfixes'
+            // InternalValid.g:33:7: ( 'quickfixes' )
+            // InternalValid.g:33:9: 'quickfixes'
             {
             match("quickfixes"); 
 
@@ -545,8 +545,8 @@ public final void mT__34() throws RecognitionException {
         try {
             int _type = T__34;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:34:7: ( 'fix' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:34:9: 'fix'
+            // InternalValid.g:34:7: ( 'fix' )
+            // InternalValid.g:34:9: 'fix'
             {
             match("fix"); 
 
@@ -566,8 +566,8 @@ public final void mT__35() throws RecognitionException {
         try {
             int _type = T__35;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:35:7: ( '::' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:35:9: '::'
+            // InternalValid.g:35:7: ( '::' )
+            // InternalValid.g:35:9: '::'
             {
             match("::"); 
 
@@ -587,8 +587,8 @@ public final void mT__36() throws RecognitionException {
         try {
             int _type = T__36;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:36:7: ( 'optional' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:36:9: 'optional'
+            // InternalValid.g:36:7: ( 'optional' )
+            // InternalValid.g:36:9: 'optional'
             {
             match("optional"); 
 
@@ -608,8 +608,8 @@ public final void mT__37() throws RecognitionException {
         try {
             int _type = T__37;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:37:7: ( 'as' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:37:9: 'as'
+            // InternalValid.g:37:7: ( 'as' )
+            // InternalValid.g:37:9: 'as'
             {
             match("as"); 
 
@@ -629,10 +629,10 @@ public final void mRULE_ID() throws RecognitionException {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6189:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6189:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalValid.g:6189:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+            // InternalValid.g:6189:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6189:11: ( '^' )?
+            // InternalValid.g:6189:11: ( '^' )?
             int alt1=2;
             int LA1_0 = input.LA(1);
 
@@ -641,7 +641,7 @@ public final void mRULE_ID() throws RecognitionException {
             }
             switch (alt1) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6189:11: '^'
+                    // InternalValid.g:6189:11: '^'
                     {
                     match('^'); 
 
@@ -659,7 +659,7 @@ public final void mRULE_ID() throws RecognitionException {
                 recover(mse);
                 throw mse;}
 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6189:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalValid.g:6189:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             loop2:
             do {
                 int alt2=2;
@@ -672,7 +672,7 @@ public final void mRULE_ID() throws RecognitionException {
 
                 switch (alt2) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:
+            	    // InternalValid.g:
             	    {
             	    if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
             	        input.consume();
@@ -708,10 +708,10 @@ public final void mRULE_INT() throws RecognitionException {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6191:10: ( ( '0' .. '9' )+ )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6191:12: ( '0' .. '9' )+
+            // InternalValid.g:6191:10: ( ( '0' .. '9' )+ )
+            // InternalValid.g:6191:12: ( '0' .. '9' )+
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6191:12: ( '0' .. '9' )+
+            // InternalValid.g:6191:12: ( '0' .. '9' )+
             int cnt3=0;
             loop3:
             do {
@@ -725,7 +725,7 @@ public final void mRULE_INT() throws RecognitionException {
 
                 switch (alt3) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6191:13: '0' .. '9'
+            	    // InternalValid.g:6191:13: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -757,10 +757,10 @@ public final void mRULE_STRING() throws RecognitionException {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6193:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6193:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalValid.g:6193:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+            // InternalValid.g:6193:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6193:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalValid.g:6193:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             int alt6=2;
             int LA6_0 = input.LA(1);
 
@@ -778,10 +778,10 @@ else if ( (LA6_0=='\'') ) {
             }
             switch (alt6) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6193:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+                    // InternalValid.g:6193:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
                     {
                     match('\"'); 
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6193:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // InternalValid.g:6193:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop4:
                     do {
                         int alt4=3;
@@ -797,7 +797,7 @@ else if ( ((LA4_0>='\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=
 
                         switch (alt4) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6193:21: '\\\\' .
+                    	    // InternalValid.g:6193:21: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -805,7 +805,7 @@ else if ( ((LA4_0>='\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6193:28: ~ ( ( '\\\\' | '\"' ) )
+                    	    // InternalValid.g:6193:28: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -830,10 +830,10 @@ else if ( ((LA4_0>='\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6193:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+                    // InternalValid.g:6193:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
                     {
                     match('\''); 
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6193:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // InternalValid.g:6193:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop5:
                     do {
                         int alt5=3;
@@ -849,7 +849,7 @@ else if ( ((LA5_0>='\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=
 
                         switch (alt5) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6193:54: '\\\\' .
+                    	    // InternalValid.g:6193:54: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -857,7 +857,7 @@ else if ( ((LA5_0>='\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6193:61: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // InternalValid.g:6193:61: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -900,12 +900,12 @@ public final void mRULE_ML_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6195:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6195:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalValid.g:6195:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalValid.g:6195:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6195:24: ( options {greedy=false; } : . )*
+            // InternalValid.g:6195:24: ( options {greedy=false; } : . )*
             loop7:
             do {
                 int alt7=2;
@@ -930,7 +930,7 @@ else if ( ((LA7_0>='\u0000' && LA7_0<=')')||(LA7_0>='+' && LA7_0<='\uFFFF')) ) {
 
                 switch (alt7) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6195:52: .
+            	    // InternalValid.g:6195:52: .
             	    {
             	    matchAny(); 
 
@@ -960,12 +960,12 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6197:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6197:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalValid.g:6197:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalValid.g:6197:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6197:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // InternalValid.g:6197:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop8:
             do {
                 int alt8=2;
@@ -978,7 +978,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
 
                 switch (alt8) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6197:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // InternalValid.g:6197:24: ~ ( ( '\\n' | '\\r' ) )
             	    {
             	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
             	        input.consume();
@@ -998,7 +998,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
                 }
             } while (true);
 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6197:40: ( ( '\\r' )? '\\n' )?
+            // InternalValid.g:6197:40: ( ( '\\r' )? '\\n' )?
             int alt10=2;
             int LA10_0 = input.LA(1);
 
@@ -1007,9 +1007,9 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
             }
             switch (alt10) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6197:41: ( '\\r' )? '\\n'
+                    // InternalValid.g:6197:41: ( '\\r' )? '\\n'
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6197:41: ( '\\r' )?
+                    // InternalValid.g:6197:41: ( '\\r' )?
                     int alt9=2;
                     int LA9_0 = input.LA(1);
 
@@ -1018,7 +1018,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
                     }
                     switch (alt9) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6197:41: '\\r'
+                            // InternalValid.g:6197:41: '\\r'
                             {
                             match('\r'); 
 
@@ -1050,10 +1050,10 @@ public final void mRULE_WS() throws RecognitionException {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6199:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6199:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalValid.g:6199:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalValid.g:6199:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6199:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalValid.g:6199:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt11=0;
             loop11:
             do {
@@ -1067,7 +1067,7 @@ public final void mRULE_WS() throws RecognitionException {
 
                 switch (alt11) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:
+            	    // InternalValid.g:
             	    {
             	    if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
             	        input.consume();
@@ -1107,8 +1107,8 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6201:16: ( . )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6201:18: .
+            // InternalValid.g:6201:16: ( . )
+            // InternalValid.g:6201:18: .
             {
             matchAny(); 
 
@@ -1123,243 +1123,243 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1:8: ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        // InternalValid.g:1:8: ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
         int alt12=34;
         alt12 = dfa12.predict(input);
         switch (alt12) {
             case 1 :
-                // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1:10: T__11
+                // InternalValid.g:1:10: T__11
                 {
                 mT__11(); 
 
                 }
                 break;
             case 2 :
-                // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1:16: T__12
+                // InternalValid.g:1:16: T__12
                 {
                 mT__12(); 
 
                 }
                 break;
             case 3 :
-                // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1:22: T__13
+                // InternalValid.g:1:22: T__13
                 {
                 mT__13(); 
 
                 }
                 break;
             case 4 :
-                // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1:28: T__14
+                // InternalValid.g:1:28: T__14
                 {
                 mT__14(); 
 
                 }
                 break;
             case 5 :
-                // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1:34: T__15
+                // InternalValid.g:1:34: T__15
                 {
                 mT__15(); 
 
                 }
                 break;
             case 6 :
-                // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1:40: T__16
+                // InternalValid.g:1:40: T__16
                 {
                 mT__16(); 
 
                 }
                 break;
             case 7 :
-                // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1:46: T__17
+                // InternalValid.g:1:46: T__17
                 {
                 mT__17(); 
 
                 }
                 break;
             case 8 :
-                // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1:52: T__18
+                // InternalValid.g:1:52: T__18
                 {
                 mT__18(); 
 
                 }
                 break;
             case 9 :
-                // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1:58: T__19
+                // InternalValid.g:1:58: T__19
                 {
                 mT__19(); 
 
                 }
                 break;
             case 10 :
-                // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1:64: T__20
+                // InternalValid.g:1:64: T__20
                 {
                 mT__20(); 
 
                 }
                 break;
             case 11 :
-                // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1:70: T__21
+                // InternalValid.g:1:70: T__21
                 {
                 mT__21(); 
 
                 }
                 break;
             case 12 :
-                // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1:76: T__22
+                // InternalValid.g:1:76: T__22
                 {
                 mT__22(); 
 
                 }
                 break;
             case 13 :
-                // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1:82: T__23
+                // InternalValid.g:1:82: T__23
                 {
                 mT__23(); 
 
                 }
                 break;
             case 14 :
-                // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1:88: T__24
+                // InternalValid.g:1:88: T__24
                 {
                 mT__24(); 
 
                 }
                 break;
             case 15 :
-                // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1:94: T__25
+                // InternalValid.g:1:94: T__25
                 {
                 mT__25(); 
 
                 }
                 break;
             case 16 :
-                // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1:100: T__26
+                // InternalValid.g:1:100: T__26
                 {
                 mT__26(); 
 
                 }
                 break;
             case 17 :
-                // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1:106: T__27
+                // InternalValid.g:1:106: T__27
                 {
                 mT__27(); 
 
                 }
                 break;
             case 18 :
-                // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1:112: T__28
+                // InternalValid.g:1:112: T__28
                 {
                 mT__28(); 
 
                 }
                 break;
             case 19 :
-                // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1:118: T__29
+                // InternalValid.g:1:118: T__29
                 {
                 mT__29(); 
 
                 }
                 break;
             case 20 :
-                // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1:124: T__30
+                // InternalValid.g:1:124: T__30
                 {
                 mT__30(); 
 
                 }
                 break;
             case 21 :
-                // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1:130: T__31
+                // InternalValid.g:1:130: T__31
                 {
                 mT__31(); 
 
                 }
                 break;
             case 22 :
-                // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1:136: T__32
+                // InternalValid.g:1:136: T__32
                 {
                 mT__32(); 
 
                 }
                 break;
             case 23 :
-                // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1:142: T__33
+                // InternalValid.g:1:142: T__33
                 {
                 mT__33(); 
 
                 }
                 break;
             case 24 :
-                // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1:148: T__34
+                // InternalValid.g:1:148: T__34
                 {
                 mT__34(); 
 
                 }
                 break;
             case 25 :
-                // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1:154: T__35
+                // InternalValid.g:1:154: T__35
                 {
                 mT__35(); 
 
                 }
                 break;
             case 26 :
-                // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1:160: T__36
+                // InternalValid.g:1:160: T__36
                 {
                 mT__36(); 
 
                 }
                 break;
             case 27 :
-                // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1:166: T__37
+                // InternalValid.g:1:166: T__37
                 {
                 mT__37(); 
 
                 }
                 break;
             case 28 :
-                // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1:172: RULE_ID
+                // InternalValid.g:1:172: RULE_ID
                 {
                 mRULE_ID(); 
 
                 }
                 break;
             case 29 :
-                // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1:180: RULE_INT
+                // InternalValid.g:1:180: RULE_INT
                 {
                 mRULE_INT(); 
 
                 }
                 break;
             case 30 :
-                // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1:189: RULE_STRING
+                // InternalValid.g:1:189: RULE_STRING
                 {
                 mRULE_STRING(); 
 
                 }
                 break;
             case 31 :
-                // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1:201: RULE_ML_COMMENT
+                // InternalValid.g:1:201: RULE_ML_COMMENT
                 {
                 mRULE_ML_COMMENT(); 
 
                 }
                 break;
             case 32 :
-                // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1:217: RULE_SL_COMMENT
+                // InternalValid.g:1:217: RULE_SL_COMMENT
                 {
                 mRULE_SL_COMMENT(); 
 
                 }
                 break;
             case 33 :
-                // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1:233: RULE_WS
+                // InternalValid.g:1:233: RULE_WS
                 {
                 mRULE_WS(); 
 
                 }
                 break;
             case 34 :
-                // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1:241: RULE_ANY_OTHER
+                // InternalValid.g:1:241: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -1373,66 +1373,19 @@ public void mTokens() throws RecognitionException {
 
     protected DFA12 dfa12 = new DFA12(this);
     static final String DFA12_eotS =
-        "\1\uffff\11\41\2\uffff\2\41\1\36\2\41\2\uffff\1\41\1\36\2\41\1"+
-        "\36\2\uffff\3\36\2\uffff\2\41\1\uffff\13\41\2\uffff\3\41\1\uffff"+
-        "\2\41\2\uffff\1\41\1\uffff\1\41\1\124\5\uffff\1\41\1\126\22\41\1"+
-        "\uffff\1\151\1\uffff\5\41\1\157\14\41\1\uffff\2\41\1\176\2\41\1"+
-        "\uffff\4\41\1\u0085\3\41\1\u0089\3\41\1\u008d\1\41\1\uffff\3\41"+
-        "\1\u0092\2\41\1\uffff\2\41\1\u0097\1\uffff\1\u0098\2\41\1\uffff"+
-        "\1\41\1\u009c\1\41\1\u009e\1\uffff\1\41\1\u00a0\1\41\1\u00a2\2\uffff"+
-        "\3\41\1\uffff\1\u00a6\1\uffff\1\u00a7\1\uffff\1\41\1\uffff\1\41"+
-        "\1\u00aa\1\u00ab\2\uffff\2\41\2\uffff\1\41\1\u00af\1\u00b0\2\uffff";
+        "\1\uffff\11\41\2\uffff\2\41\1\36\2\41\2\uffff\1\41\1\36\2\41\1\36\2\uffff\3\36\2\uffff\2\41\1\uffff\13\41\2\uffff\3\41\1\uffff\2\41\2\uffff\1\41\1\uffff\1\41\1\124\5\uffff\1\41\1\126\22\41\1\uffff\1\151\1\uffff\5\41\1\157\14\41\1\uffff\2\41\1\176\2\41\1\uffff\4\41\1\u0085\3\41\1\u0089\3\41\1\u008d\1\41\1\uffff\3\41\1\u0092\2\41\1\uffff\2\41\1\u0097\1\uffff\1\u0098\2\41\1\uffff\1\41\1\u009c\1\41\1\u009e\1\uffff\1\41\1\u00a0\1\41\1\u00a2\2\uffff\3\41\1\uffff\1\u00a6\1\uffff\1\u00a7\1\uffff\1\41\1\uffff\1\41\1\u00aa\1\u00ab\2\uffff\2\41\2\uffff\1\41\1\u00af\1\u00b0\2\uffff";
     static final String DFA12_eofS =
         "\u00b1\uffff";
     static final String DFA12_minS =
-        "\1\0\1\141\1\157\1\162\1\141\2\145\1\155\2\141\2\uffff\1\145\1"+
-        "\141\1\56\1\141\1\156\2\uffff\1\165\1\72\1\160\1\163\1\101\2\uffff"+
-        "\2\0\1\52\2\uffff\1\163\1\170\1\uffff\1\162\1\160\2\162\1\155\1"+
-        "\172\1\170\1\160\1\164\1\156\1\142\2\uffff\2\163\1\162\1\uffff\1"+
-        "\156\1\151\2\uffff\1\151\1\uffff\1\164\1\60\5\uffff\1\164\1\60\1"+
-        "\155\1\145\1\157\1\156\1\141\1\145\1\164\1\157\1\145\1\164\1\145"+
-        "\1\143\1\163\1\153\1\147\1\161\1\143\1\151\1\uffff\1\60\1\uffff"+
-        "\1\141\1\156\1\162\1\151\1\156\1\60\1\165\1\162\1\147\1\145\1\154"+
-        "\1\162\1\141\2\145\1\165\1\153\1\157\1\uffff\1\154\1\163\1\60\1"+
-        "\156\1\164\1\uffff\1\141\1\164\1\157\1\170\1\60\1\151\1\147\1\162"+
-        "\1\60\1\145\1\146\1\156\1\60\1\151\1\uffff\1\147\1\151\1\154\1\60"+
-        "\1\162\1\164\1\uffff\1\160\1\145\1\60\1\uffff\1\60\1\151\1\141\1"+
-        "\uffff\1\166\1\60\1\143\1\60\1\uffff\1\171\1\60\1\164\1\60\2\uffff"+
-        "\1\170\1\154\1\145\1\uffff\1\60\1\uffff\1\60\1\uffff\1\151\1\uffff"+
-        "\1\145\2\60\2\uffff\1\157\1\163\2\uffff\1\156\2\60\2\uffff";
+        "\1\0\1\141\1\157\1\162\1\141\2\145\1\155\2\141\2\uffff\1\145\1\141\1\56\1\141\1\156\2\uffff\1\165\1\72\1\160\1\163\1\101\2\uffff\2\0\1\52\2\uffff\1\163\1\170\1\uffff\1\162\1\160\2\162\1\155\1\172\1\170\1\160\1\164\1\156\1\142\2\uffff\2\163\1\162\1\uffff\1\156\1\151\2\uffff\1\151\1\uffff\1\164\1\60\5\uffff\1\164\1\60\1\155\1\145\1\157\1\156\1\141\1\145\1\164\1\157\1\145\1\164\1\145\1\143\1\163\1\153\1\147\1\161\1\143\1\151\1\uffff\1\60\1\uffff\1\141\1\156\1\162\1\151\1\156\1\60\1\165\1\162\1\147\1\145\1\154\1\162\1\141\2\145\1\165\1\153\1\157\1\uffff\1\154\1\163\1\60\1\156\1\164\1\uffff\1\141\1\164\1\157\1\170\1\60\1\151\1\147\1\162\1\60\1\145\1\146\1\156\1\60\1\151\1\uffff\1\147\1\151\1\154\1\60\1\162\1\164\1\uffff\1\160\1\145\1\60\1\uffff\1\60\1\151\1\141\1\uffff\1\166\1\60\1\143\1\60\1\uffff\1\171\1\60\1\164\1\60\2\uffff\1\170\1\154\1\145\1\uffff\1\60\1\uffff\1\60\1\uffff\1\151\1\uffff\1\145\2\60\2\uffff\1\157\1\163\2\uffff\1\156\2\60\2\uffff";
     static final String DFA12_maxS =
-        "\1\uffff\1\151\1\157\1\170\1\141\1\151\1\145\1\155\1\157\1\141"+
-        "\2\uffff\2\145\1\56\1\141\1\156\2\uffff\1\165\1\72\1\160\1\163\1"+
-        "\172\2\uffff\2\uffff\1\57\2\uffff\1\163\1\170\1\uffff\1\162\1\160"+
-        "\2\162\1\155\1\172\1\170\1\160\1\164\1\156\1\142\2\uffff\2\163\1"+
-        "\162\1\uffff\1\156\1\151\2\uffff\1\151\1\uffff\1\164\1\172\5\uffff"+
-        "\1\164\1\172\1\155\1\145\1\157\1\156\1\141\1\145\1\164\1\157\1\145"+
-        "\1\164\1\145\1\143\1\163\1\153\1\147\1\161\1\143\1\151\1\uffff\1"+
-        "\172\1\uffff\1\141\1\156\1\162\1\151\1\156\1\172\1\165\1\162\1\147"+
-        "\1\145\1\154\1\162\1\141\2\145\1\165\1\153\1\157\1\uffff\1\154\1"+
-        "\163\1\172\1\156\1\164\1\uffff\1\141\1\164\1\157\1\170\1\172\1\151"+
-        "\1\147\1\162\1\172\1\145\1\146\1\156\1\172\1\151\1\uffff\1\147\1"+
-        "\151\1\154\1\172\1\162\1\164\1\uffff\1\160\1\145\1\172\1\uffff\1"+
-        "\172\1\151\1\141\1\uffff\1\166\1\172\1\143\1\172\1\uffff\1\171\1"+
-        "\172\1\164\1\172\2\uffff\1\170\1\154\1\145\1\uffff\1\172\1\uffff"+
-        "\1\172\1\uffff\1\151\1\uffff\1\145\2\172\2\uffff\1\157\1\163\2\uffff"+
-        "\1\156\2\172\2\uffff";
+        "\1\uffff\1\151\1\157\1\170\1\141\1\151\1\145\1\155\1\157\1\141\2\uffff\2\145\1\56\1\141\1\156\2\uffff\1\165\1\72\1\160\1\163\1\172\2\uffff\2\uffff\1\57\2\uffff\1\163\1\170\1\uffff\1\162\1\160\2\162\1\155\1\172\1\170\1\160\1\164\1\156\1\142\2\uffff\2\163\1\162\1\uffff\1\156\1\151\2\uffff\1\151\1\uffff\1\164\1\172\5\uffff\1\164\1\172\1\155\1\145\1\157\1\156\1\141\1\145\1\164\1\157\1\145\1\164\1\145\1\143\1\163\1\153\1\147\1\161\1\143\1\151\1\uffff\1\172\1\uffff\1\141\1\156\1\162\1\151\1\156\1\172\1\165\1\162\1\147\1\145\1\154\1\162\1\141\2\145\1\165\1\153\1\157\1\uffff\1\154\1\163\1\172\1\156\1\164\1\uffff\1\141\1\164\1\157\1\170\1\172\1\151\1\147\1\162\1\172\1\145\1\146\1\156\1\172\1\151\1\uffff\1\147\1\151\1\154\1\172\1\162\1\164\1\uffff\1\160\1\145\1\172\1\uffff\1\172\1\151\1\141\1\uffff\1\166\1\172\1\143\1\172\1\uffff\1\171\1\172\1\164\1\172\2\uffff\1\170\1\154\1\145\1\uffff\1\172\1\uffff\1\172\1\uffff\1\151\1\uffff\1\145\2\172\2\uffff\1\157\1\163\2\uffff\1\156\2\172\2\uffff";
     static final String DFA12_acceptS =
-        "\12\uffff\1\13\1\14\5\uffff\1\24\1\25\5\uffff\1\34\1\35\3\uffff"+
-        "\1\41\1\42\2\uffff\1\34\13\uffff\1\13\1\14\3\uffff\1\21\2\uffff"+
-        "\1\24\1\25\1\uffff\1\31\2\uffff\1\35\1\36\1\37\1\40\1\41\24\uffff"+
-        "\1\33\1\uffff\1\30\22\uffff\1\1\5\uffff\1\20\16\uffff\1\4\6\uffff"+
-        "\1\12\3\uffff\1\22\3\uffff\1\2\4\uffff\1\10\4\uffff\1\26\1\23\3"+
-        "\uffff\1\5\1\uffff\1\7\1\uffff\1\17\1\uffff\1\16\3\uffff\1\6\1\11"+
-        "\2\uffff\1\32\1\3\3\uffff\1\27\1\15";
+        "\12\uffff\1\13\1\14\5\uffff\1\24\1\25\5\uffff\1\34\1\35\3\uffff\1\41\1\42\2\uffff\1\34\13\uffff\1\13\1\14\3\uffff\1\21\2\uffff\1\24\1\25\1\uffff\1\31\2\uffff\1\35\1\36\1\37\1\40\1\41\24\uffff\1\33\1\uffff\1\30\22\uffff\1\1\5\uffff\1\20\16\uffff\1\4\6\uffff\1\12\3\uffff\1\22\3\uffff\1\2\4\uffff\1\10\4\uffff\1\26\1\23\3\uffff\1\5\1\uffff\1\7\1\uffff\1\17\1\uffff\1\16\3\uffff\1\6\1\11\2\uffff\1\32\1\3\3\uffff\1\27\1\15";
     static final String DFA12_specialS =
         "\1\1\31\uffff\1\0\1\2\u0095\uffff}>";
     static final String[] DFA12_transitionS = {
-            "\11\36\2\35\2\36\1\35\22\36\1\35\1\36\1\32\1\22\3\36\1\33\6"+
-            "\36\1\16\1\34\12\31\1\24\1\21\5\36\32\30\3\36\1\27\1\30\1\36"+
-            "\1\26\1\30\1\10\1\14\1\3\1\1\2\30\1\7\2\30\1\11\1\15\1\2\1\25"+
-            "\1\30\1\23\1\17\1\5\1\6\1\20\1\30\1\4\3\30\1\12\1\36\1\13\uff82"+
-            "\36",
+            "\11\36\2\35\2\36\1\35\22\36\1\35\1\36\1\32\1\22\3\36\1\33\6\36\1\16\1\34\12\31\1\24\1\21\5\36\32\30\3\36\1\27\1\30\1\36\1\26\1\30\1\10\1\14\1\3\1\1\2\30\1\7\2\30\1\11\1\15\1\2\1\25\1\30\1\23\1\17\1\5\1\6\1\20\1\30\1\4\3\30\1\12\1\36\1\13\uff82\36",
             "\1\37\7\uffff\1\40",
             "\1\42",
             "\1\44\5\uffff\1\43",
diff --git a/com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValidParser.java b/com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValidParser.java
index 674a90016..25a30bb76 100644
--- a/com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValidParser.java
+++ b/com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValidParser.java
@@ -74,7 +74,7 @@ public InternalValidParser(TokenStream input, RecognizerSharedState state) {
         
 
     public String[] getTokenNames() { return InternalValidParser.tokenNames; }
-    public String getGrammarFileName() { return "../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g"; }
+    public String getGrammarFileName() { return "InternalValid.g"; }
 
 
      
@@ -98,20 +98,20 @@ protected String getValueForTokenName(String tokenName) {
 
 
     // $ANTLR start "entryRuleValidModel"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:60:1: entryRuleValidModel : ruleValidModel EOF ;
+    // InternalValid.g:60:1: entryRuleValidModel : ruleValidModel EOF ;
     public final void entryRuleValidModel() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:61:1: ( ruleValidModel EOF )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:62:1: ruleValidModel EOF
+            // InternalValid.g:61:1: ( ruleValidModel EOF )
+            // InternalValid.g:62:1: ruleValidModel EOF
             {
              before(grammarAccess.getValidModelRule()); 
-            pushFollow(FOLLOW_ruleValidModel_in_entryRuleValidModel61);
+            pushFollow(FOLLOW_1);
             ruleValidModel();
 
             state._fsp--;
 
              after(grammarAccess.getValidModelRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleValidModel68); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -128,23 +128,23 @@ public final void entryRuleValidModel() throws RecognitionException {
 
 
     // $ANTLR start "ruleValidModel"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:69:1: ruleValidModel : ( ( rule__ValidModel__Group__0 ) ) ;
+    // InternalValid.g:69:1: ruleValidModel : ( ( rule__ValidModel__Group__0 ) ) ;
     public final void ruleValidModel() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:73:2: ( ( ( rule__ValidModel__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:74:1: ( ( rule__ValidModel__Group__0 ) )
+            // InternalValid.g:73:2: ( ( ( rule__ValidModel__Group__0 ) ) )
+            // InternalValid.g:74:1: ( ( rule__ValidModel__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:74:1: ( ( rule__ValidModel__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:75:1: ( rule__ValidModel__Group__0 )
+            // InternalValid.g:74:1: ( ( rule__ValidModel__Group__0 ) )
+            // InternalValid.g:75:1: ( rule__ValidModel__Group__0 )
             {
              before(grammarAccess.getValidModelAccess().getGroup()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:76:1: ( rule__ValidModel__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:76:2: rule__ValidModel__Group__0
+            // InternalValid.g:76:1: ( rule__ValidModel__Group__0 )
+            // InternalValid.g:76:2: rule__ValidModel__Group__0
             {
-            pushFollow(FOLLOW_rule__ValidModel__Group__0_in_ruleValidModel94);
+            pushFollow(FOLLOW_2);
             rule__ValidModel__Group__0();
 
             state._fsp--;
@@ -175,20 +175,20 @@ public final void ruleValidModel() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleImport"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:88:1: entryRuleImport : ruleImport EOF ;
+    // InternalValid.g:88:1: entryRuleImport : ruleImport EOF ;
     public final void entryRuleImport() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:89:1: ( ruleImport EOF )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:90:1: ruleImport EOF
+            // InternalValid.g:89:1: ( ruleImport EOF )
+            // InternalValid.g:90:1: ruleImport EOF
             {
              before(grammarAccess.getImportRule()); 
-            pushFollow(FOLLOW_ruleImport_in_entryRuleImport121);
+            pushFollow(FOLLOW_1);
             ruleImport();
 
             state._fsp--;
 
              after(grammarAccess.getImportRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleImport128); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -205,23 +205,23 @@ public final void entryRuleImport() throws RecognitionException {
 
 
     // $ANTLR start "ruleImport"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:97:1: ruleImport : ( ( rule__Import__Group__0 ) ) ;
+    // InternalValid.g:97:1: ruleImport : ( ( rule__Import__Group__0 ) ) ;
     public final void ruleImport() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:101:2: ( ( ( rule__Import__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:102:1: ( ( rule__Import__Group__0 ) )
+            // InternalValid.g:101:2: ( ( ( rule__Import__Group__0 ) ) )
+            // InternalValid.g:102:1: ( ( rule__Import__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:102:1: ( ( rule__Import__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:103:1: ( rule__Import__Group__0 )
+            // InternalValid.g:102:1: ( ( rule__Import__Group__0 ) )
+            // InternalValid.g:103:1: ( rule__Import__Group__0 )
             {
              before(grammarAccess.getImportAccess().getGroup()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:104:1: ( rule__Import__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:104:2: rule__Import__Group__0
+            // InternalValid.g:104:1: ( rule__Import__Group__0 )
+            // InternalValid.g:104:2: rule__Import__Group__0
             {
-            pushFollow(FOLLOW_rule__Import__Group__0_in_ruleImport154);
+            pushFollow(FOLLOW_2);
             rule__Import__Group__0();
 
             state._fsp--;
@@ -252,20 +252,20 @@ public final void ruleImport() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleCategory"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:116:1: entryRuleCategory : ruleCategory EOF ;
+    // InternalValid.g:116:1: entryRuleCategory : ruleCategory EOF ;
     public final void entryRuleCategory() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:117:1: ( ruleCategory EOF )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:118:1: ruleCategory EOF
+            // InternalValid.g:117:1: ( ruleCategory EOF )
+            // InternalValid.g:118:1: ruleCategory EOF
             {
              before(grammarAccess.getCategoryRule()); 
-            pushFollow(FOLLOW_ruleCategory_in_entryRuleCategory181);
+            pushFollow(FOLLOW_1);
             ruleCategory();
 
             state._fsp--;
 
              after(grammarAccess.getCategoryRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleCategory188); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -282,23 +282,23 @@ public final void entryRuleCategory() throws RecognitionException {
 
 
     // $ANTLR start "ruleCategory"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:125:1: ruleCategory : ( ( rule__Category__Group__0 ) ) ;
+    // InternalValid.g:125:1: ruleCategory : ( ( rule__Category__Group__0 ) ) ;
     public final void ruleCategory() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:129:2: ( ( ( rule__Category__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:130:1: ( ( rule__Category__Group__0 ) )
+            // InternalValid.g:129:2: ( ( ( rule__Category__Group__0 ) ) )
+            // InternalValid.g:130:1: ( ( rule__Category__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:130:1: ( ( rule__Category__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:131:1: ( rule__Category__Group__0 )
+            // InternalValid.g:130:1: ( ( rule__Category__Group__0 ) )
+            // InternalValid.g:131:1: ( rule__Category__Group__0 )
             {
              before(grammarAccess.getCategoryAccess().getGroup()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:132:1: ( rule__Category__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:132:2: rule__Category__Group__0
+            // InternalValid.g:132:1: ( rule__Category__Group__0 )
+            // InternalValid.g:132:2: rule__Category__Group__0
             {
-            pushFollow(FOLLOW_rule__Category__Group__0_in_ruleCategory214);
+            pushFollow(FOLLOW_2);
             rule__Category__Group__0();
 
             state._fsp--;
@@ -329,20 +329,20 @@ public final void ruleCategory() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleRule"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:144:1: entryRuleRule : ruleRule EOF ;
+    // InternalValid.g:144:1: entryRuleRule : ruleRule EOF ;
     public final void entryRuleRule() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:145:1: ( ruleRule EOF )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:146:1: ruleRule EOF
+            // InternalValid.g:145:1: ( ruleRule EOF )
+            // InternalValid.g:146:1: ruleRule EOF
             {
              before(grammarAccess.getRuleRule()); 
-            pushFollow(FOLLOW_ruleRule_in_entryRuleRule241);
+            pushFollow(FOLLOW_1);
             ruleRule();
 
             state._fsp--;
 
              after(grammarAccess.getRuleRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRule248); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -359,23 +359,23 @@ public final void entryRuleRule() throws RecognitionException {
 
 
     // $ANTLR start "ruleRule"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:153:1: ruleRule : ( ( rule__Rule__Alternatives ) ) ;
+    // InternalValid.g:153:1: ruleRule : ( ( rule__Rule__Alternatives ) ) ;
     public final void ruleRule() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:157:2: ( ( ( rule__Rule__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:158:1: ( ( rule__Rule__Alternatives ) )
+            // InternalValid.g:157:2: ( ( ( rule__Rule__Alternatives ) ) )
+            // InternalValid.g:158:1: ( ( rule__Rule__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:158:1: ( ( rule__Rule__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:159:1: ( rule__Rule__Alternatives )
+            // InternalValid.g:158:1: ( ( rule__Rule__Alternatives ) )
+            // InternalValid.g:159:1: ( rule__Rule__Alternatives )
             {
              before(grammarAccess.getRuleAccess().getAlternatives()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:160:1: ( rule__Rule__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:160:2: rule__Rule__Alternatives
+            // InternalValid.g:160:1: ( rule__Rule__Alternatives )
+            // InternalValid.g:160:2: rule__Rule__Alternatives
             {
-            pushFollow(FOLLOW_rule__Rule__Alternatives_in_ruleRule274);
+            pushFollow(FOLLOW_2);
             rule__Rule__Alternatives();
 
             state._fsp--;
@@ -406,20 +406,20 @@ public final void ruleRule() throws RecognitionException {
 
 
     // $ANTLR start "entryRulePredefinedRule"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:172:1: entryRulePredefinedRule : rulePredefinedRule EOF ;
+    // InternalValid.g:172:1: entryRulePredefinedRule : rulePredefinedRule EOF ;
     public final void entryRulePredefinedRule() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:173:1: ( rulePredefinedRule EOF )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:174:1: rulePredefinedRule EOF
+            // InternalValid.g:173:1: ( rulePredefinedRule EOF )
+            // InternalValid.g:174:1: rulePredefinedRule EOF
             {
              before(grammarAccess.getPredefinedRuleRule()); 
-            pushFollow(FOLLOW_rulePredefinedRule_in_entryRulePredefinedRule301);
+            pushFollow(FOLLOW_1);
             rulePredefinedRule();
 
             state._fsp--;
 
              after(grammarAccess.getPredefinedRuleRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRulePredefinedRule308); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -436,23 +436,23 @@ public final void entryRulePredefinedRule() throws RecognitionException {
 
 
     // $ANTLR start "rulePredefinedRule"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:181:1: rulePredefinedRule : ( ( rule__PredefinedRule__Alternatives ) ) ;
+    // InternalValid.g:181:1: rulePredefinedRule : ( ( rule__PredefinedRule__Alternatives ) ) ;
     public final void rulePredefinedRule() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:185:2: ( ( ( rule__PredefinedRule__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:186:1: ( ( rule__PredefinedRule__Alternatives ) )
+            // InternalValid.g:185:2: ( ( ( rule__PredefinedRule__Alternatives ) ) )
+            // InternalValid.g:186:1: ( ( rule__PredefinedRule__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:186:1: ( ( rule__PredefinedRule__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:187:1: ( rule__PredefinedRule__Alternatives )
+            // InternalValid.g:186:1: ( ( rule__PredefinedRule__Alternatives ) )
+            // InternalValid.g:187:1: ( rule__PredefinedRule__Alternatives )
             {
              before(grammarAccess.getPredefinedRuleAccess().getAlternatives()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:188:1: ( rule__PredefinedRule__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:188:2: rule__PredefinedRule__Alternatives
+            // InternalValid.g:188:1: ( rule__PredefinedRule__Alternatives )
+            // InternalValid.g:188:2: rule__PredefinedRule__Alternatives
             {
-            pushFollow(FOLLOW_rule__PredefinedRule__Alternatives_in_rulePredefinedRule334);
+            pushFollow(FOLLOW_2);
             rule__PredefinedRule__Alternatives();
 
             state._fsp--;
@@ -483,20 +483,20 @@ public final void rulePredefinedRule() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleNativeRule"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:200:1: entryRuleNativeRule : ruleNativeRule EOF ;
+    // InternalValid.g:200:1: entryRuleNativeRule : ruleNativeRule EOF ;
     public final void entryRuleNativeRule() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:201:1: ( ruleNativeRule EOF )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:202:1: ruleNativeRule EOF
+            // InternalValid.g:201:1: ( ruleNativeRule EOF )
+            // InternalValid.g:202:1: ruleNativeRule EOF
             {
              before(grammarAccess.getNativeRuleRule()); 
-            pushFollow(FOLLOW_ruleNativeRule_in_entryRuleNativeRule361);
+            pushFollow(FOLLOW_1);
             ruleNativeRule();
 
             state._fsp--;
 
              after(grammarAccess.getNativeRuleRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNativeRule368); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -513,23 +513,23 @@ public final void entryRuleNativeRule() throws RecognitionException {
 
 
     // $ANTLR start "ruleNativeRule"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:209:1: ruleNativeRule : ( ( rule__NativeRule__Group__0 ) ) ;
+    // InternalValid.g:209:1: ruleNativeRule : ( ( rule__NativeRule__Group__0 ) ) ;
     public final void ruleNativeRule() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:213:2: ( ( ( rule__NativeRule__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:214:1: ( ( rule__NativeRule__Group__0 ) )
+            // InternalValid.g:213:2: ( ( ( rule__NativeRule__Group__0 ) ) )
+            // InternalValid.g:214:1: ( ( rule__NativeRule__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:214:1: ( ( rule__NativeRule__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:215:1: ( rule__NativeRule__Group__0 )
+            // InternalValid.g:214:1: ( ( rule__NativeRule__Group__0 ) )
+            // InternalValid.g:215:1: ( rule__NativeRule__Group__0 )
             {
              before(grammarAccess.getNativeRuleAccess().getGroup()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:216:1: ( rule__NativeRule__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:216:2: rule__NativeRule__Group__0
+            // InternalValid.g:216:1: ( rule__NativeRule__Group__0 )
+            // InternalValid.g:216:2: rule__NativeRule__Group__0
             {
-            pushFollow(FOLLOW_rule__NativeRule__Group__0_in_ruleNativeRule394);
+            pushFollow(FOLLOW_2);
             rule__NativeRule__Group__0();
 
             state._fsp--;
@@ -560,20 +560,20 @@ public final void ruleNativeRule() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleSizeRule"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:228:1: entryRuleSizeRule : ruleSizeRule EOF ;
+    // InternalValid.g:228:1: entryRuleSizeRule : ruleSizeRule EOF ;
     public final void entryRuleSizeRule() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:229:1: ( ruleSizeRule EOF )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:230:1: ruleSizeRule EOF
+            // InternalValid.g:229:1: ( ruleSizeRule EOF )
+            // InternalValid.g:230:1: ruleSizeRule EOF
             {
              before(grammarAccess.getSizeRuleRule()); 
-            pushFollow(FOLLOW_ruleSizeRule_in_entryRuleSizeRule421);
+            pushFollow(FOLLOW_1);
             ruleSizeRule();
 
             state._fsp--;
 
              after(grammarAccess.getSizeRuleRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSizeRule428); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -590,23 +590,23 @@ public final void entryRuleSizeRule() throws RecognitionException {
 
 
     // $ANTLR start "ruleSizeRule"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:237:1: ruleSizeRule : ( ( rule__SizeRule__Group__0 ) ) ;
+    // InternalValid.g:237:1: ruleSizeRule : ( ( rule__SizeRule__Group__0 ) ) ;
     public final void ruleSizeRule() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:241:2: ( ( ( rule__SizeRule__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:242:1: ( ( rule__SizeRule__Group__0 ) )
+            // InternalValid.g:241:2: ( ( ( rule__SizeRule__Group__0 ) ) )
+            // InternalValid.g:242:1: ( ( rule__SizeRule__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:242:1: ( ( rule__SizeRule__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:243:1: ( rule__SizeRule__Group__0 )
+            // InternalValid.g:242:1: ( ( rule__SizeRule__Group__0 ) )
+            // InternalValid.g:243:1: ( rule__SizeRule__Group__0 )
             {
              before(grammarAccess.getSizeRuleAccess().getGroup()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:244:1: ( rule__SizeRule__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:244:2: rule__SizeRule__Group__0
+            // InternalValid.g:244:1: ( rule__SizeRule__Group__0 )
+            // InternalValid.g:244:2: rule__SizeRule__Group__0
             {
-            pushFollow(FOLLOW_rule__SizeRule__Group__0_in_ruleSizeRule454);
+            pushFollow(FOLLOW_2);
             rule__SizeRule__Group__0();
 
             state._fsp--;
@@ -637,20 +637,20 @@ public final void ruleSizeRule() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleRangeRule"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:256:1: entryRuleRangeRule : ruleRangeRule EOF ;
+    // InternalValid.g:256:1: entryRuleRangeRule : ruleRangeRule EOF ;
     public final void entryRuleRangeRule() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:257:1: ( ruleRangeRule EOF )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:258:1: ruleRangeRule EOF
+            // InternalValid.g:257:1: ( ruleRangeRule EOF )
+            // InternalValid.g:258:1: ruleRangeRule EOF
             {
              before(grammarAccess.getRangeRuleRule()); 
-            pushFollow(FOLLOW_ruleRangeRule_in_entryRuleRangeRule481);
+            pushFollow(FOLLOW_1);
             ruleRangeRule();
 
             state._fsp--;
 
              after(grammarAccess.getRangeRuleRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRangeRule488); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -667,23 +667,23 @@ public final void entryRuleRangeRule() throws RecognitionException {
 
 
     // $ANTLR start "ruleRangeRule"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:265:1: ruleRangeRule : ( ( rule__RangeRule__Group__0 ) ) ;
+    // InternalValid.g:265:1: ruleRangeRule : ( ( rule__RangeRule__Group__0 ) ) ;
     public final void ruleRangeRule() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:269:2: ( ( ( rule__RangeRule__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:270:1: ( ( rule__RangeRule__Group__0 ) )
+            // InternalValid.g:269:2: ( ( ( rule__RangeRule__Group__0 ) ) )
+            // InternalValid.g:270:1: ( ( rule__RangeRule__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:270:1: ( ( rule__RangeRule__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:271:1: ( rule__RangeRule__Group__0 )
+            // InternalValid.g:270:1: ( ( rule__RangeRule__Group__0 ) )
+            // InternalValid.g:271:1: ( rule__RangeRule__Group__0 )
             {
              before(grammarAccess.getRangeRuleAccess().getGroup()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:272:1: ( rule__RangeRule__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:272:2: rule__RangeRule__Group__0
+            // InternalValid.g:272:1: ( rule__RangeRule__Group__0 )
+            // InternalValid.g:272:2: rule__RangeRule__Group__0
             {
-            pushFollow(FOLLOW_rule__RangeRule__Group__0_in_ruleRangeRule514);
+            pushFollow(FOLLOW_2);
             rule__RangeRule__Group__0();
 
             state._fsp--;
@@ -714,20 +714,20 @@ public final void ruleRangeRule() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleUniqueRule"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:284:1: entryRuleUniqueRule : ruleUniqueRule EOF ;
+    // InternalValid.g:284:1: entryRuleUniqueRule : ruleUniqueRule EOF ;
     public final void entryRuleUniqueRule() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:285:1: ( ruleUniqueRule EOF )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:286:1: ruleUniqueRule EOF
+            // InternalValid.g:285:1: ( ruleUniqueRule EOF )
+            // InternalValid.g:286:1: ruleUniqueRule EOF
             {
              before(grammarAccess.getUniqueRuleRule()); 
-            pushFollow(FOLLOW_ruleUniqueRule_in_entryRuleUniqueRule541);
+            pushFollow(FOLLOW_1);
             ruleUniqueRule();
 
             state._fsp--;
 
              after(grammarAccess.getUniqueRuleRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleUniqueRule548); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -744,23 +744,23 @@ public final void entryRuleUniqueRule() throws RecognitionException {
 
 
     // $ANTLR start "ruleUniqueRule"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:293:1: ruleUniqueRule : ( ( rule__UniqueRule__Group__0 ) ) ;
+    // InternalValid.g:293:1: ruleUniqueRule : ( ( rule__UniqueRule__Group__0 ) ) ;
     public final void ruleUniqueRule() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:297:2: ( ( ( rule__UniqueRule__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:298:1: ( ( rule__UniqueRule__Group__0 ) )
+            // InternalValid.g:297:2: ( ( ( rule__UniqueRule__Group__0 ) ) )
+            // InternalValid.g:298:1: ( ( rule__UniqueRule__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:298:1: ( ( rule__UniqueRule__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:299:1: ( rule__UniqueRule__Group__0 )
+            // InternalValid.g:298:1: ( ( rule__UniqueRule__Group__0 ) )
+            // InternalValid.g:299:1: ( rule__UniqueRule__Group__0 )
             {
              before(grammarAccess.getUniqueRuleAccess().getGroup()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:300:1: ( rule__UniqueRule__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:300:2: rule__UniqueRule__Group__0
+            // InternalValid.g:300:1: ( rule__UniqueRule__Group__0 )
+            // InternalValid.g:300:2: rule__UniqueRule__Group__0
             {
-            pushFollow(FOLLOW_rule__UniqueRule__Group__0_in_ruleUniqueRule574);
+            pushFollow(FOLLOW_2);
             rule__UniqueRule__Group__0();
 
             state._fsp--;
@@ -791,20 +791,20 @@ public final void ruleUniqueRule() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleSimpleContext"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:314:1: entryRuleSimpleContext : ruleSimpleContext EOF ;
+    // InternalValid.g:314:1: entryRuleSimpleContext : ruleSimpleContext EOF ;
     public final void entryRuleSimpleContext() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:315:1: ( ruleSimpleContext EOF )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:316:1: ruleSimpleContext EOF
+            // InternalValid.g:315:1: ( ruleSimpleContext EOF )
+            // InternalValid.g:316:1: ruleSimpleContext EOF
             {
              before(grammarAccess.getSimpleContextRule()); 
-            pushFollow(FOLLOW_ruleSimpleContext_in_entryRuleSimpleContext603);
+            pushFollow(FOLLOW_1);
             ruleSimpleContext();
 
             state._fsp--;
 
              after(grammarAccess.getSimpleContextRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSimpleContext610); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -821,23 +821,23 @@ public final void entryRuleSimpleContext() throws RecognitionException {
 
 
     // $ANTLR start "ruleSimpleContext"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:323:1: ruleSimpleContext : ( ( rule__SimpleContext__Group__0 ) ) ;
+    // InternalValid.g:323:1: ruleSimpleContext : ( ( rule__SimpleContext__Group__0 ) ) ;
     public final void ruleSimpleContext() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:327:2: ( ( ( rule__SimpleContext__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:328:1: ( ( rule__SimpleContext__Group__0 ) )
+            // InternalValid.g:327:2: ( ( ( rule__SimpleContext__Group__0 ) ) )
+            // InternalValid.g:328:1: ( ( rule__SimpleContext__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:328:1: ( ( rule__SimpleContext__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:329:1: ( rule__SimpleContext__Group__0 )
+            // InternalValid.g:328:1: ( ( rule__SimpleContext__Group__0 ) )
+            // InternalValid.g:329:1: ( rule__SimpleContext__Group__0 )
             {
              before(grammarAccess.getSimpleContextAccess().getGroup()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:330:1: ( rule__SimpleContext__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:330:2: rule__SimpleContext__Group__0
+            // InternalValid.g:330:1: ( rule__SimpleContext__Group__0 )
+            // InternalValid.g:330:2: rule__SimpleContext__Group__0
             {
-            pushFollow(FOLLOW_rule__SimpleContext__Group__0_in_ruleSimpleContext636);
+            pushFollow(FOLLOW_2);
             rule__SimpleContext__Group__0();
 
             state._fsp--;
@@ -868,20 +868,20 @@ public final void ruleSimpleContext() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleDuplicateContext"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:342:1: entryRuleDuplicateContext : ruleDuplicateContext EOF ;
+    // InternalValid.g:342:1: entryRuleDuplicateContext : ruleDuplicateContext EOF ;
     public final void entryRuleDuplicateContext() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:343:1: ( ruleDuplicateContext EOF )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:344:1: ruleDuplicateContext EOF
+            // InternalValid.g:343:1: ( ruleDuplicateContext EOF )
+            // InternalValid.g:344:1: ruleDuplicateContext EOF
             {
              before(grammarAccess.getDuplicateContextRule()); 
-            pushFollow(FOLLOW_ruleDuplicateContext_in_entryRuleDuplicateContext663);
+            pushFollow(FOLLOW_1);
             ruleDuplicateContext();
 
             state._fsp--;
 
              after(grammarAccess.getDuplicateContextRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDuplicateContext670); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -898,23 +898,23 @@ public final void entryRuleDuplicateContext() throws RecognitionException {
 
 
     // $ANTLR start "ruleDuplicateContext"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:351:1: ruleDuplicateContext : ( ( rule__DuplicateContext__Group__0 ) ) ;
+    // InternalValid.g:351:1: ruleDuplicateContext : ( ( rule__DuplicateContext__Group__0 ) ) ;
     public final void ruleDuplicateContext() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:355:2: ( ( ( rule__DuplicateContext__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:356:1: ( ( rule__DuplicateContext__Group__0 ) )
+            // InternalValid.g:355:2: ( ( ( rule__DuplicateContext__Group__0 ) ) )
+            // InternalValid.g:356:1: ( ( rule__DuplicateContext__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:356:1: ( ( rule__DuplicateContext__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:357:1: ( rule__DuplicateContext__Group__0 )
+            // InternalValid.g:356:1: ( ( rule__DuplicateContext__Group__0 ) )
+            // InternalValid.g:357:1: ( rule__DuplicateContext__Group__0 )
             {
              before(grammarAccess.getDuplicateContextAccess().getGroup()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:358:1: ( rule__DuplicateContext__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:358:2: rule__DuplicateContext__Group__0
+            // InternalValid.g:358:1: ( rule__DuplicateContext__Group__0 )
+            // InternalValid.g:358:2: rule__DuplicateContext__Group__0
             {
-            pushFollow(FOLLOW_rule__DuplicateContext__Group__0_in_ruleDuplicateContext696);
+            pushFollow(FOLLOW_2);
             rule__DuplicateContext__Group__0();
 
             state._fsp--;
@@ -945,20 +945,20 @@ public final void ruleDuplicateContext() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleNativeContext"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:370:1: entryRuleNativeContext : ruleNativeContext EOF ;
+    // InternalValid.g:370:1: entryRuleNativeContext : ruleNativeContext EOF ;
     public final void entryRuleNativeContext() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:371:1: ( ruleNativeContext EOF )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:372:1: ruleNativeContext EOF
+            // InternalValid.g:371:1: ( ruleNativeContext EOF )
+            // InternalValid.g:372:1: ruleNativeContext EOF
             {
              before(grammarAccess.getNativeContextRule()); 
-            pushFollow(FOLLOW_ruleNativeContext_in_entryRuleNativeContext723);
+            pushFollow(FOLLOW_1);
             ruleNativeContext();
 
             state._fsp--;
 
              after(grammarAccess.getNativeContextRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNativeContext730); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -975,23 +975,23 @@ public final void entryRuleNativeContext() throws RecognitionException {
 
 
     // $ANTLR start "ruleNativeContext"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:379:1: ruleNativeContext : ( ( rule__NativeContext__Group__0 ) ) ;
+    // InternalValid.g:379:1: ruleNativeContext : ( ( rule__NativeContext__Group__0 ) ) ;
     public final void ruleNativeContext() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:383:2: ( ( ( rule__NativeContext__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:384:1: ( ( rule__NativeContext__Group__0 ) )
+            // InternalValid.g:383:2: ( ( ( rule__NativeContext__Group__0 ) ) )
+            // InternalValid.g:384:1: ( ( rule__NativeContext__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:384:1: ( ( rule__NativeContext__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:385:1: ( rule__NativeContext__Group__0 )
+            // InternalValid.g:384:1: ( ( rule__NativeContext__Group__0 ) )
+            // InternalValid.g:385:1: ( rule__NativeContext__Group__0 )
             {
              before(grammarAccess.getNativeContextAccess().getGroup()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:386:1: ( rule__NativeContext__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:386:2: rule__NativeContext__Group__0
+            // InternalValid.g:386:1: ( rule__NativeContext__Group__0 )
+            // InternalValid.g:386:2: rule__NativeContext__Group__0
             {
-            pushFollow(FOLLOW_rule__NativeContext__Group__0_in_ruleNativeContext756);
+            pushFollow(FOLLOW_2);
             rule__NativeContext__Group__0();
 
             state._fsp--;
@@ -1022,20 +1022,20 @@ public final void ruleNativeContext() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleQuickFix"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:398:1: entryRuleQuickFix : ruleQuickFix EOF ;
+    // InternalValid.g:398:1: entryRuleQuickFix : ruleQuickFix EOF ;
     public final void entryRuleQuickFix() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:399:1: ( ruleQuickFix EOF )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:400:1: ruleQuickFix EOF
+            // InternalValid.g:399:1: ( ruleQuickFix EOF )
+            // InternalValid.g:400:1: ruleQuickFix EOF
             {
              before(grammarAccess.getQuickFixRule()); 
-            pushFollow(FOLLOW_ruleQuickFix_in_entryRuleQuickFix783);
+            pushFollow(FOLLOW_1);
             ruleQuickFix();
 
             state._fsp--;
 
              after(grammarAccess.getQuickFixRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleQuickFix790); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1052,23 +1052,23 @@ public final void entryRuleQuickFix() throws RecognitionException {
 
 
     // $ANTLR start "ruleQuickFix"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:407:1: ruleQuickFix : ( ( rule__QuickFix__Group__0 ) ) ;
+    // InternalValid.g:407:1: ruleQuickFix : ( ( rule__QuickFix__Group__0 ) ) ;
     public final void ruleQuickFix() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:411:2: ( ( ( rule__QuickFix__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:412:1: ( ( rule__QuickFix__Group__0 ) )
+            // InternalValid.g:411:2: ( ( ( rule__QuickFix__Group__0 ) ) )
+            // InternalValid.g:412:1: ( ( rule__QuickFix__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:412:1: ( ( rule__QuickFix__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:413:1: ( rule__QuickFix__Group__0 )
+            // InternalValid.g:412:1: ( ( rule__QuickFix__Group__0 ) )
+            // InternalValid.g:413:1: ( rule__QuickFix__Group__0 )
             {
              before(grammarAccess.getQuickFixAccess().getGroup()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:414:1: ( rule__QuickFix__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:414:2: rule__QuickFix__Group__0
+            // InternalValid.g:414:1: ( rule__QuickFix__Group__0 )
+            // InternalValid.g:414:2: rule__QuickFix__Group__0
             {
-            pushFollow(FOLLOW_rule__QuickFix__Group__0_in_ruleQuickFix816);
+            pushFollow(FOLLOW_2);
             rule__QuickFix__Group__0();
 
             state._fsp--;
@@ -1099,20 +1099,20 @@ public final void ruleQuickFix() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleQualifiedID"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:426:1: entryRuleQualifiedID : ruleQualifiedID EOF ;
+    // InternalValid.g:426:1: entryRuleQualifiedID : ruleQualifiedID EOF ;
     public final void entryRuleQualifiedID() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:427:1: ( ruleQualifiedID EOF )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:428:1: ruleQualifiedID EOF
+            // InternalValid.g:427:1: ( ruleQualifiedID EOF )
+            // InternalValid.g:428:1: ruleQualifiedID EOF
             {
              before(grammarAccess.getQualifiedIDRule()); 
-            pushFollow(FOLLOW_ruleQualifiedID_in_entryRuleQualifiedID843);
+            pushFollow(FOLLOW_1);
             ruleQualifiedID();
 
             state._fsp--;
 
              after(grammarAccess.getQualifiedIDRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedID850); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1129,23 +1129,23 @@ public final void entryRuleQualifiedID() throws RecognitionException {
 
 
     // $ANTLR start "ruleQualifiedID"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:435:1: ruleQualifiedID : ( ( rule__QualifiedID__Group__0 ) ) ;
+    // InternalValid.g:435:1: ruleQualifiedID : ( ( rule__QualifiedID__Group__0 ) ) ;
     public final void ruleQualifiedID() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:439:2: ( ( ( rule__QualifiedID__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:440:1: ( ( rule__QualifiedID__Group__0 ) )
+            // InternalValid.g:439:2: ( ( ( rule__QualifiedID__Group__0 ) ) )
+            // InternalValid.g:440:1: ( ( rule__QualifiedID__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:440:1: ( ( rule__QualifiedID__Group__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:441:1: ( rule__QualifiedID__Group__0 )
+            // InternalValid.g:440:1: ( ( rule__QualifiedID__Group__0 ) )
+            // InternalValid.g:441:1: ( rule__QualifiedID__Group__0 )
             {
              before(grammarAccess.getQualifiedIDAccess().getGroup()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:442:1: ( rule__QualifiedID__Group__0 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:442:2: rule__QualifiedID__Group__0
+            // InternalValid.g:442:1: ( rule__QualifiedID__Group__0 )
+            // InternalValid.g:442:2: rule__QualifiedID__Group__0
             {
-            pushFollow(FOLLOW_rule__QualifiedID__Group__0_in_ruleQualifiedID876);
+            pushFollow(FOLLOW_2);
             rule__QualifiedID__Group__0();
 
             state._fsp--;
@@ -1176,23 +1176,23 @@ public final void ruleQualifiedID() throws RecognitionException {
 
 
     // $ANTLR start "ruleCheckKind"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:455:1: ruleCheckKind : ( ( rule__CheckKind__Alternatives ) ) ;
+    // InternalValid.g:455:1: ruleCheckKind : ( ( rule__CheckKind__Alternatives ) ) ;
     public final void ruleCheckKind() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:459:1: ( ( ( rule__CheckKind__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:460:1: ( ( rule__CheckKind__Alternatives ) )
+            // InternalValid.g:459:1: ( ( ( rule__CheckKind__Alternatives ) ) )
+            // InternalValid.g:460:1: ( ( rule__CheckKind__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:460:1: ( ( rule__CheckKind__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:461:1: ( rule__CheckKind__Alternatives )
+            // InternalValid.g:460:1: ( ( rule__CheckKind__Alternatives ) )
+            // InternalValid.g:461:1: ( rule__CheckKind__Alternatives )
             {
              before(grammarAccess.getCheckKindAccess().getAlternatives()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:462:1: ( rule__CheckKind__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:462:2: rule__CheckKind__Alternatives
+            // InternalValid.g:462:1: ( rule__CheckKind__Alternatives )
+            // InternalValid.g:462:2: rule__CheckKind__Alternatives
             {
-            pushFollow(FOLLOW_rule__CheckKind__Alternatives_in_ruleCheckKind913);
+            pushFollow(FOLLOW_2);
             rule__CheckKind__Alternatives();
 
             state._fsp--;
@@ -1223,23 +1223,23 @@ public final void ruleCheckKind() throws RecognitionException {
 
 
     // $ANTLR start "ruleSeverityKind"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:474:1: ruleSeverityKind : ( ( rule__SeverityKind__Alternatives ) ) ;
+    // InternalValid.g:474:1: ruleSeverityKind : ( ( rule__SeverityKind__Alternatives ) ) ;
     public final void ruleSeverityKind() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:478:1: ( ( ( rule__SeverityKind__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:479:1: ( ( rule__SeverityKind__Alternatives ) )
+            // InternalValid.g:478:1: ( ( ( rule__SeverityKind__Alternatives ) ) )
+            // InternalValid.g:479:1: ( ( rule__SeverityKind__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:479:1: ( ( rule__SeverityKind__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:480:1: ( rule__SeverityKind__Alternatives )
+            // InternalValid.g:479:1: ( ( rule__SeverityKind__Alternatives ) )
+            // InternalValid.g:480:1: ( rule__SeverityKind__Alternatives )
             {
              before(grammarAccess.getSeverityKindAccess().getAlternatives()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:481:1: ( rule__SeverityKind__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:481:2: rule__SeverityKind__Alternatives
+            // InternalValid.g:481:1: ( rule__SeverityKind__Alternatives )
+            // InternalValid.g:481:2: rule__SeverityKind__Alternatives
             {
-            pushFollow(FOLLOW_rule__SeverityKind__Alternatives_in_ruleSeverityKind949);
+            pushFollow(FOLLOW_2);
             rule__SeverityKind__Alternatives();
 
             state._fsp--;
@@ -1270,23 +1270,23 @@ public final void ruleSeverityKind() throws RecognitionException {
 
 
     // $ANTLR start "ruleQuickFixKind"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:493:1: ruleQuickFixKind : ( ( rule__QuickFixKind__Alternatives ) ) ;
+    // InternalValid.g:493:1: ruleQuickFixKind : ( ( rule__QuickFixKind__Alternatives ) ) ;
     public final void ruleQuickFixKind() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:497:1: ( ( ( rule__QuickFixKind__Alternatives ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:498:1: ( ( rule__QuickFixKind__Alternatives ) )
+            // InternalValid.g:497:1: ( ( ( rule__QuickFixKind__Alternatives ) ) )
+            // InternalValid.g:498:1: ( ( rule__QuickFixKind__Alternatives ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:498:1: ( ( rule__QuickFixKind__Alternatives ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:499:1: ( rule__QuickFixKind__Alternatives )
+            // InternalValid.g:498:1: ( ( rule__QuickFixKind__Alternatives ) )
+            // InternalValid.g:499:1: ( rule__QuickFixKind__Alternatives )
             {
              before(grammarAccess.getQuickFixKindAccess().getAlternatives()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:500:1: ( rule__QuickFixKind__Alternatives )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:500:2: rule__QuickFixKind__Alternatives
+            // InternalValid.g:500:1: ( rule__QuickFixKind__Alternatives )
+            // InternalValid.g:500:2: rule__QuickFixKind__Alternatives
             {
-            pushFollow(FOLLOW_rule__QuickFixKind__Alternatives_in_ruleQuickFixKind985);
+            pushFollow(FOLLOW_2);
             rule__QuickFixKind__Alternatives();
 
             state._fsp--;
@@ -1317,24 +1317,24 @@ public final void ruleQuickFixKind() throws RecognitionException {
 
 
     // $ANTLR start "rule__Rule__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:511:1: rule__Rule__Alternatives : ( ( ruleNativeRule ) | ( rulePredefinedRule ) );
+    // InternalValid.g:511:1: rule__Rule__Alternatives : ( ( ruleNativeRule ) | ( rulePredefinedRule ) );
     public final void rule__Rule__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:515:1: ( ( ruleNativeRule ) | ( rulePredefinedRule ) )
+            // InternalValid.g:515:1: ( ( ruleNativeRule ) | ( rulePredefinedRule ) )
             int alt1=2;
             alt1 = dfa1.predict(input);
             switch (alt1) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:516:1: ( ruleNativeRule )
+                    // InternalValid.g:516:1: ( ruleNativeRule )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:516:1: ( ruleNativeRule )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:517:1: ruleNativeRule
+                    // InternalValid.g:516:1: ( ruleNativeRule )
+                    // InternalValid.g:517:1: ruleNativeRule
                     {
                      before(grammarAccess.getRuleAccess().getNativeRuleParserRuleCall_0()); 
-                    pushFollow(FOLLOW_ruleNativeRule_in_rule__Rule__Alternatives1020);
+                    pushFollow(FOLLOW_2);
                     ruleNativeRule();
 
                     state._fsp--;
@@ -1347,13 +1347,13 @@ public final void rule__Rule__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:522:6: ( rulePredefinedRule )
+                    // InternalValid.g:522:6: ( rulePredefinedRule )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:522:6: ( rulePredefinedRule )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:523:1: rulePredefinedRule
+                    // InternalValid.g:522:6: ( rulePredefinedRule )
+                    // InternalValid.g:523:1: rulePredefinedRule
                     {
                      before(grammarAccess.getRuleAccess().getPredefinedRuleParserRuleCall_1()); 
-                    pushFollow(FOLLOW_rulePredefinedRule_in_rule__Rule__Alternatives1037);
+                    pushFollow(FOLLOW_2);
                     rulePredefinedRule();
 
                     state._fsp--;
@@ -1383,24 +1383,24 @@ public final void rule__Rule__Alternatives() throws RecognitionException {
 
 
     // $ANTLR start "rule__PredefinedRule__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:533:1: rule__PredefinedRule__Alternatives : ( ( ruleSizeRule ) | ( ruleRangeRule ) | ( ruleUniqueRule ) );
+    // InternalValid.g:533:1: rule__PredefinedRule__Alternatives : ( ( ruleSizeRule ) | ( ruleRangeRule ) | ( ruleUniqueRule ) );
     public final void rule__PredefinedRule__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:537:1: ( ( ruleSizeRule ) | ( ruleRangeRule ) | ( ruleUniqueRule ) )
+            // InternalValid.g:537:1: ( ( ruleSizeRule ) | ( ruleRangeRule ) | ( ruleUniqueRule ) )
             int alt2=3;
             alt2 = dfa2.predict(input);
             switch (alt2) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:538:1: ( ruleSizeRule )
+                    // InternalValid.g:538:1: ( ruleSizeRule )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:538:1: ( ruleSizeRule )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:539:1: ruleSizeRule
+                    // InternalValid.g:538:1: ( ruleSizeRule )
+                    // InternalValid.g:539:1: ruleSizeRule
                     {
                      before(grammarAccess.getPredefinedRuleAccess().getSizeRuleParserRuleCall_0()); 
-                    pushFollow(FOLLOW_ruleSizeRule_in_rule__PredefinedRule__Alternatives1069);
+                    pushFollow(FOLLOW_2);
                     ruleSizeRule();
 
                     state._fsp--;
@@ -1413,13 +1413,13 @@ public final void rule__PredefinedRule__Alternatives() throws RecognitionExcepti
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:544:6: ( ruleRangeRule )
+                    // InternalValid.g:544:6: ( ruleRangeRule )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:544:6: ( ruleRangeRule )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:545:1: ruleRangeRule
+                    // InternalValid.g:544:6: ( ruleRangeRule )
+                    // InternalValid.g:545:1: ruleRangeRule
                     {
                      before(grammarAccess.getPredefinedRuleAccess().getRangeRuleParserRuleCall_1()); 
-                    pushFollow(FOLLOW_ruleRangeRule_in_rule__PredefinedRule__Alternatives1086);
+                    pushFollow(FOLLOW_2);
                     ruleRangeRule();
 
                     state._fsp--;
@@ -1432,13 +1432,13 @@ public final void rule__PredefinedRule__Alternatives() throws RecognitionExcepti
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:550:6: ( ruleUniqueRule )
+                    // InternalValid.g:550:6: ( ruleUniqueRule )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:550:6: ( ruleUniqueRule )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:551:1: ruleUniqueRule
+                    // InternalValid.g:550:6: ( ruleUniqueRule )
+                    // InternalValid.g:551:1: ruleUniqueRule
                     {
                      before(grammarAccess.getPredefinedRuleAccess().getUniqueRuleParserRuleCall_2()); 
-                    pushFollow(FOLLOW_ruleUniqueRule_in_rule__PredefinedRule__Alternatives1103);
+                    pushFollow(FOLLOW_2);
                     ruleUniqueRule();
 
                     state._fsp--;
@@ -1468,13 +1468,13 @@ public final void rule__PredefinedRule__Alternatives() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__CheckKind__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:562:1: rule__CheckKind__Alternatives : ( ( ( 'fast' ) ) | ( ( 'normal' ) ) | ( ( 'expensive' ) ) );
+    // InternalValid.g:562:1: rule__CheckKind__Alternatives : ( ( ( 'fast' ) ) | ( ( 'normal' ) ) | ( ( 'expensive' ) ) );
     public final void rule__CheckKind__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:566:1: ( ( ( 'fast' ) ) | ( ( 'normal' ) ) | ( ( 'expensive' ) ) )
+            // InternalValid.g:566:1: ( ( ( 'fast' ) ) | ( ( 'normal' ) ) | ( ( 'expensive' ) ) )
             int alt3=3;
             switch ( input.LA(1) ) {
             case 11:
@@ -1501,16 +1501,16 @@ public final void rule__CheckKind__Alternatives() throws RecognitionException {
 
             switch (alt3) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:567:1: ( ( 'fast' ) )
+                    // InternalValid.g:567:1: ( ( 'fast' ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:567:1: ( ( 'fast' ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:568:1: ( 'fast' )
+                    // InternalValid.g:567:1: ( ( 'fast' ) )
+                    // InternalValid.g:568:1: ( 'fast' )
                     {
                      before(grammarAccess.getCheckKindAccess().getFastEnumLiteralDeclaration_0()); 
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:569:1: ( 'fast' )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:569:3: 'fast'
+                    // InternalValid.g:569:1: ( 'fast' )
+                    // InternalValid.g:569:3: 'fast'
                     {
-                    match(input,11,FOLLOW_11_in_rule__CheckKind__Alternatives1137); 
+                    match(input,11,FOLLOW_2); 
 
                     }
 
@@ -1522,16 +1522,16 @@ public final void rule__CheckKind__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:574:6: ( ( 'normal' ) )
+                    // InternalValid.g:574:6: ( ( 'normal' ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:574:6: ( ( 'normal' ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:575:1: ( 'normal' )
+                    // InternalValid.g:574:6: ( ( 'normal' ) )
+                    // InternalValid.g:575:1: ( 'normal' )
                     {
                      before(grammarAccess.getCheckKindAccess().getNormalEnumLiteralDeclaration_1()); 
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:576:1: ( 'normal' )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:576:3: 'normal'
+                    // InternalValid.g:576:1: ( 'normal' )
+                    // InternalValid.g:576:3: 'normal'
                     {
-                    match(input,12,FOLLOW_12_in_rule__CheckKind__Alternatives1158); 
+                    match(input,12,FOLLOW_2); 
 
                     }
 
@@ -1543,16 +1543,16 @@ public final void rule__CheckKind__Alternatives() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:581:6: ( ( 'expensive' ) )
+                    // InternalValid.g:581:6: ( ( 'expensive' ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:581:6: ( ( 'expensive' ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:582:1: ( 'expensive' )
+                    // InternalValid.g:581:6: ( ( 'expensive' ) )
+                    // InternalValid.g:582:1: ( 'expensive' )
                     {
                      before(grammarAccess.getCheckKindAccess().getExpensiveEnumLiteralDeclaration_2()); 
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:583:1: ( 'expensive' )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:583:3: 'expensive'
+                    // InternalValid.g:583:1: ( 'expensive' )
+                    // InternalValid.g:583:3: 'expensive'
                     {
-                    match(input,13,FOLLOW_13_in_rule__CheckKind__Alternatives1179); 
+                    match(input,13,FOLLOW_2); 
 
                     }
 
@@ -1581,13 +1581,13 @@ public final void rule__CheckKind__Alternatives() throws RecognitionException {
 
 
     // $ANTLR start "rule__SeverityKind__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:593:1: rule__SeverityKind__Alternatives : ( ( ( 'error' ) ) | ( ( 'warning' ) ) );
+    // InternalValid.g:593:1: rule__SeverityKind__Alternatives : ( ( ( 'error' ) ) | ( ( 'warning' ) ) );
     public final void rule__SeverityKind__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:597:1: ( ( ( 'error' ) ) | ( ( 'warning' ) ) )
+            // InternalValid.g:597:1: ( ( ( 'error' ) ) | ( ( 'warning' ) ) )
             int alt4=2;
             int LA4_0 = input.LA(1);
 
@@ -1605,16 +1605,16 @@ else if ( (LA4_0==15) ) {
             }
             switch (alt4) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:598:1: ( ( 'error' ) )
+                    // InternalValid.g:598:1: ( ( 'error' ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:598:1: ( ( 'error' ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:599:1: ( 'error' )
+                    // InternalValid.g:598:1: ( ( 'error' ) )
+                    // InternalValid.g:599:1: ( 'error' )
                     {
                      before(grammarAccess.getSeverityKindAccess().getErrorEnumLiteralDeclaration_0()); 
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:600:1: ( 'error' )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:600:3: 'error'
+                    // InternalValid.g:600:1: ( 'error' )
+                    // InternalValid.g:600:3: 'error'
                     {
-                    match(input,14,FOLLOW_14_in_rule__SeverityKind__Alternatives1215); 
+                    match(input,14,FOLLOW_2); 
 
                     }
 
@@ -1626,16 +1626,16 @@ else if ( (LA4_0==15) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:605:6: ( ( 'warning' ) )
+                    // InternalValid.g:605:6: ( ( 'warning' ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:605:6: ( ( 'warning' ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:606:1: ( 'warning' )
+                    // InternalValid.g:605:6: ( ( 'warning' ) )
+                    // InternalValid.g:606:1: ( 'warning' )
                     {
                      before(grammarAccess.getSeverityKindAccess().getWarningEnumLiteralDeclaration_1()); 
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:607:1: ( 'warning' )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:607:3: 'warning'
+                    // InternalValid.g:607:1: ( 'warning' )
+                    // InternalValid.g:607:3: 'warning'
                     {
-                    match(input,15,FOLLOW_15_in_rule__SeverityKind__Alternatives1236); 
+                    match(input,15,FOLLOW_2); 
 
                     }
 
@@ -1664,13 +1664,13 @@ else if ( (LA4_0==15) ) {
 
 
     // $ANTLR start "rule__QuickFixKind__Alternatives"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:617:1: rule__QuickFixKind__Alternatives : ( ( ( 'semantic' ) ) | ( ( 'textual' ) ) );
+    // InternalValid.g:617:1: rule__QuickFixKind__Alternatives : ( ( ( 'semantic' ) ) | ( ( 'textual' ) ) );
     public final void rule__QuickFixKind__Alternatives() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:621:1: ( ( ( 'semantic' ) ) | ( ( 'textual' ) ) )
+            // InternalValid.g:621:1: ( ( ( 'semantic' ) ) | ( ( 'textual' ) ) )
             int alt5=2;
             int LA5_0 = input.LA(1);
 
@@ -1688,16 +1688,16 @@ else if ( (LA5_0==17) ) {
             }
             switch (alt5) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:622:1: ( ( 'semantic' ) )
+                    // InternalValid.g:622:1: ( ( 'semantic' ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:622:1: ( ( 'semantic' ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:623:1: ( 'semantic' )
+                    // InternalValid.g:622:1: ( ( 'semantic' ) )
+                    // InternalValid.g:623:1: ( 'semantic' )
                     {
                      before(grammarAccess.getQuickFixKindAccess().getSemanticEnumLiteralDeclaration_0()); 
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:624:1: ( 'semantic' )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:624:3: 'semantic'
+                    // InternalValid.g:624:1: ( 'semantic' )
+                    // InternalValid.g:624:3: 'semantic'
                     {
-                    match(input,16,FOLLOW_16_in_rule__QuickFixKind__Alternatives1272); 
+                    match(input,16,FOLLOW_2); 
 
                     }
 
@@ -1709,16 +1709,16 @@ else if ( (LA5_0==17) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:629:6: ( ( 'textual' ) )
+                    // InternalValid.g:629:6: ( ( 'textual' ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:629:6: ( ( 'textual' ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:630:1: ( 'textual' )
+                    // InternalValid.g:629:6: ( ( 'textual' ) )
+                    // InternalValid.g:630:1: ( 'textual' )
                     {
                      before(grammarAccess.getQuickFixKindAccess().getTextualEnumLiteralDeclaration_1()); 
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:631:1: ( 'textual' )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:631:3: 'textual'
+                    // InternalValid.g:631:1: ( 'textual' )
+                    // InternalValid.g:631:3: 'textual'
                     {
-                    match(input,17,FOLLOW_17_in_rule__QuickFixKind__Alternatives1293); 
+                    match(input,17,FOLLOW_2); 
 
                     }
 
@@ -1747,21 +1747,21 @@ else if ( (LA5_0==17) ) {
 
 
     // $ANTLR start "rule__ValidModel__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:643:1: rule__ValidModel__Group__0 : rule__ValidModel__Group__0__Impl rule__ValidModel__Group__1 ;
+    // InternalValid.g:643:1: rule__ValidModel__Group__0 : rule__ValidModel__Group__0__Impl rule__ValidModel__Group__1 ;
     public final void rule__ValidModel__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:647:1: ( rule__ValidModel__Group__0__Impl rule__ValidModel__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:648:2: rule__ValidModel__Group__0__Impl rule__ValidModel__Group__1
+            // InternalValid.g:647:1: ( rule__ValidModel__Group__0__Impl rule__ValidModel__Group__1 )
+            // InternalValid.g:648:2: rule__ValidModel__Group__0__Impl rule__ValidModel__Group__1
             {
-            pushFollow(FOLLOW_rule__ValidModel__Group__0__Impl_in_rule__ValidModel__Group__01326);
+            pushFollow(FOLLOW_3);
             rule__ValidModel__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__ValidModel__Group__1_in_rule__ValidModel__Group__01329);
+            pushFollow(FOLLOW_2);
             rule__ValidModel__Group__1();
 
             state._fsp--;
@@ -1785,20 +1785,20 @@ public final void rule__ValidModel__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__ValidModel__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:655:1: rule__ValidModel__Group__0__Impl : ( ( rule__ValidModel__ImportsAssignment_0 )* ) ;
+    // InternalValid.g:655:1: rule__ValidModel__Group__0__Impl : ( ( rule__ValidModel__ImportsAssignment_0 )* ) ;
     public final void rule__ValidModel__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:659:1: ( ( ( rule__ValidModel__ImportsAssignment_0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:660:1: ( ( rule__ValidModel__ImportsAssignment_0 )* )
+            // InternalValid.g:659:1: ( ( ( rule__ValidModel__ImportsAssignment_0 )* ) )
+            // InternalValid.g:660:1: ( ( rule__ValidModel__ImportsAssignment_0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:660:1: ( ( rule__ValidModel__ImportsAssignment_0 )* )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:661:1: ( rule__ValidModel__ImportsAssignment_0 )*
+            // InternalValid.g:660:1: ( ( rule__ValidModel__ImportsAssignment_0 )* )
+            // InternalValid.g:661:1: ( rule__ValidModel__ImportsAssignment_0 )*
             {
              before(grammarAccess.getValidModelAccess().getImportsAssignment_0()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:662:1: ( rule__ValidModel__ImportsAssignment_0 )*
+            // InternalValid.g:662:1: ( rule__ValidModel__ImportsAssignment_0 )*
             loop6:
             do {
                 int alt6=2;
@@ -1811,9 +1811,9 @@ public final void rule__ValidModel__Group__0__Impl() throws RecognitionException
 
                 switch (alt6) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:662:2: rule__ValidModel__ImportsAssignment_0
+            	    // InternalValid.g:662:2: rule__ValidModel__ImportsAssignment_0
             	    {
-            	    pushFollow(FOLLOW_rule__ValidModel__ImportsAssignment_0_in_rule__ValidModel__Group__0__Impl1356);
+            	    pushFollow(FOLLOW_4);
             	    rule__ValidModel__ImportsAssignment_0();
 
             	    state._fsp--;
@@ -1850,16 +1850,16 @@ public final void rule__ValidModel__Group__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__ValidModel__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:672:1: rule__ValidModel__Group__1 : rule__ValidModel__Group__1__Impl ;
+    // InternalValid.g:672:1: rule__ValidModel__Group__1 : rule__ValidModel__Group__1__Impl ;
     public final void rule__ValidModel__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:676:1: ( rule__ValidModel__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:677:2: rule__ValidModel__Group__1__Impl
+            // InternalValid.g:676:1: ( rule__ValidModel__Group__1__Impl )
+            // InternalValid.g:677:2: rule__ValidModel__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__ValidModel__Group__1__Impl_in_rule__ValidModel__Group__11387);
+            pushFollow(FOLLOW_2);
             rule__ValidModel__Group__1__Impl();
 
             state._fsp--;
@@ -1883,20 +1883,20 @@ public final void rule__ValidModel__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__ValidModel__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:683:1: rule__ValidModel__Group__1__Impl : ( ( rule__ValidModel__CategoriesAssignment_1 )* ) ;
+    // InternalValid.g:683:1: rule__ValidModel__Group__1__Impl : ( ( rule__ValidModel__CategoriesAssignment_1 )* ) ;
     public final void rule__ValidModel__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:687:1: ( ( ( rule__ValidModel__CategoriesAssignment_1 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:688:1: ( ( rule__ValidModel__CategoriesAssignment_1 )* )
+            // InternalValid.g:687:1: ( ( ( rule__ValidModel__CategoriesAssignment_1 )* ) )
+            // InternalValid.g:688:1: ( ( rule__ValidModel__CategoriesAssignment_1 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:688:1: ( ( rule__ValidModel__CategoriesAssignment_1 )* )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:689:1: ( rule__ValidModel__CategoriesAssignment_1 )*
+            // InternalValid.g:688:1: ( ( rule__ValidModel__CategoriesAssignment_1 )* )
+            // InternalValid.g:689:1: ( rule__ValidModel__CategoriesAssignment_1 )*
             {
              before(grammarAccess.getValidModelAccess().getCategoriesAssignment_1()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:690:1: ( rule__ValidModel__CategoriesAssignment_1 )*
+            // InternalValid.g:690:1: ( rule__ValidModel__CategoriesAssignment_1 )*
             loop7:
             do {
                 int alt7=2;
@@ -1909,9 +1909,9 @@ public final void rule__ValidModel__Group__1__Impl() throws RecognitionException
 
                 switch (alt7) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:690:2: rule__ValidModel__CategoriesAssignment_1
+            	    // InternalValid.g:690:2: rule__ValidModel__CategoriesAssignment_1
             	    {
-            	    pushFollow(FOLLOW_rule__ValidModel__CategoriesAssignment_1_in_rule__ValidModel__Group__1__Impl1414);
+            	    pushFollow(FOLLOW_5);
             	    rule__ValidModel__CategoriesAssignment_1();
 
             	    state._fsp--;
@@ -1948,21 +1948,21 @@ public final void rule__ValidModel__Group__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__Import__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:704:1: rule__Import__Group__0 : rule__Import__Group__0__Impl rule__Import__Group__1 ;
+    // InternalValid.g:704:1: rule__Import__Group__0 : rule__Import__Group__0__Impl rule__Import__Group__1 ;
     public final void rule__Import__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:708:1: ( rule__Import__Group__0__Impl rule__Import__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:709:2: rule__Import__Group__0__Impl rule__Import__Group__1
+            // InternalValid.g:708:1: ( rule__Import__Group__0__Impl rule__Import__Group__1 )
+            // InternalValid.g:709:2: rule__Import__Group__0__Impl rule__Import__Group__1
             {
-            pushFollow(FOLLOW_rule__Import__Group__0__Impl_in_rule__Import__Group__01449);
+            pushFollow(FOLLOW_6);
             rule__Import__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Import__Group__1_in_rule__Import__Group__01452);
+            pushFollow(FOLLOW_2);
             rule__Import__Group__1();
 
             state._fsp--;
@@ -1986,20 +1986,20 @@ public final void rule__Import__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Import__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:716:1: rule__Import__Group__0__Impl : ( 'import' ) ;
+    // InternalValid.g:716:1: rule__Import__Group__0__Impl : ( 'import' ) ;
     public final void rule__Import__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:720:1: ( ( 'import' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:721:1: ( 'import' )
+            // InternalValid.g:720:1: ( ( 'import' ) )
+            // InternalValid.g:721:1: ( 'import' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:721:1: ( 'import' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:722:1: 'import'
+            // InternalValid.g:721:1: ( 'import' )
+            // InternalValid.g:722:1: 'import'
             {
              before(grammarAccess.getImportAccess().getImportKeyword_0()); 
-            match(input,18,FOLLOW_18_in_rule__Import__Group__0__Impl1480); 
+            match(input,18,FOLLOW_2); 
              after(grammarAccess.getImportAccess().getImportKeyword_0()); 
 
             }
@@ -2023,16 +2023,16 @@ public final void rule__Import__Group__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Import__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:735:1: rule__Import__Group__1 : rule__Import__Group__1__Impl ;
+    // InternalValid.g:735:1: rule__Import__Group__1 : rule__Import__Group__1__Impl ;
     public final void rule__Import__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:739:1: ( rule__Import__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:740:2: rule__Import__Group__1__Impl
+            // InternalValid.g:739:1: ( rule__Import__Group__1__Impl )
+            // InternalValid.g:740:2: rule__Import__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__Import__Group__1__Impl_in_rule__Import__Group__11511);
+            pushFollow(FOLLOW_2);
             rule__Import__Group__1__Impl();
 
             state._fsp--;
@@ -2056,23 +2056,23 @@ public final void rule__Import__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Import__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:746:1: rule__Import__Group__1__Impl : ( ( rule__Import__PackageAssignment_1 ) ) ;
+    // InternalValid.g:746:1: rule__Import__Group__1__Impl : ( ( rule__Import__PackageAssignment_1 ) ) ;
     public final void rule__Import__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:750:1: ( ( ( rule__Import__PackageAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:751:1: ( ( rule__Import__PackageAssignment_1 ) )
+            // InternalValid.g:750:1: ( ( ( rule__Import__PackageAssignment_1 ) ) )
+            // InternalValid.g:751:1: ( ( rule__Import__PackageAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:751:1: ( ( rule__Import__PackageAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:752:1: ( rule__Import__PackageAssignment_1 )
+            // InternalValid.g:751:1: ( ( rule__Import__PackageAssignment_1 ) )
+            // InternalValid.g:752:1: ( rule__Import__PackageAssignment_1 )
             {
              before(grammarAccess.getImportAccess().getPackageAssignment_1()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:753:1: ( rule__Import__PackageAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:753:2: rule__Import__PackageAssignment_1
+            // InternalValid.g:753:1: ( rule__Import__PackageAssignment_1 )
+            // InternalValid.g:753:2: rule__Import__PackageAssignment_1
             {
-            pushFollow(FOLLOW_rule__Import__PackageAssignment_1_in_rule__Import__Group__1__Impl1538);
+            pushFollow(FOLLOW_2);
             rule__Import__PackageAssignment_1();
 
             state._fsp--;
@@ -2103,21 +2103,21 @@ public final void rule__Import__Group__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:767:1: rule__Category__Group__0 : rule__Category__Group__0__Impl rule__Category__Group__1 ;
+    // InternalValid.g:767:1: rule__Category__Group__0 : rule__Category__Group__0__Impl rule__Category__Group__1 ;
     public final void rule__Category__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:771:1: ( rule__Category__Group__0__Impl rule__Category__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:772:2: rule__Category__Group__0__Impl rule__Category__Group__1
+            // InternalValid.g:771:1: ( rule__Category__Group__0__Impl rule__Category__Group__1 )
+            // InternalValid.g:772:2: rule__Category__Group__0__Impl rule__Category__Group__1
             {
-            pushFollow(FOLLOW_rule__Category__Group__0__Impl_in_rule__Category__Group__01572);
+            pushFollow(FOLLOW_7);
             rule__Category__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Category__Group__1_in_rule__Category__Group__01575);
+            pushFollow(FOLLOW_2);
             rule__Category__Group__1();
 
             state._fsp--;
@@ -2141,20 +2141,20 @@ public final void rule__Category__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:779:1: rule__Category__Group__0__Impl : ( 'category' ) ;
+    // InternalValid.g:779:1: rule__Category__Group__0__Impl : ( 'category' ) ;
     public final void rule__Category__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:783:1: ( ( 'category' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:784:1: ( 'category' )
+            // InternalValid.g:783:1: ( ( 'category' ) )
+            // InternalValid.g:784:1: ( 'category' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:784:1: ( 'category' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:785:1: 'category'
+            // InternalValid.g:784:1: ( 'category' )
+            // InternalValid.g:785:1: 'category'
             {
              before(grammarAccess.getCategoryAccess().getCategoryKeyword_0()); 
-            match(input,19,FOLLOW_19_in_rule__Category__Group__0__Impl1603); 
+            match(input,19,FOLLOW_2); 
              after(grammarAccess.getCategoryAccess().getCategoryKeyword_0()); 
 
             }
@@ -2178,21 +2178,21 @@ public final void rule__Category__Group__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:798:1: rule__Category__Group__1 : rule__Category__Group__1__Impl rule__Category__Group__2 ;
+    // InternalValid.g:798:1: rule__Category__Group__1 : rule__Category__Group__1__Impl rule__Category__Group__2 ;
     public final void rule__Category__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:802:1: ( rule__Category__Group__1__Impl rule__Category__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:803:2: rule__Category__Group__1__Impl rule__Category__Group__2
+            // InternalValid.g:802:1: ( rule__Category__Group__1__Impl rule__Category__Group__2 )
+            // InternalValid.g:803:2: rule__Category__Group__1__Impl rule__Category__Group__2
             {
-            pushFollow(FOLLOW_rule__Category__Group__1__Impl_in_rule__Category__Group__11634);
+            pushFollow(FOLLOW_8);
             rule__Category__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Category__Group__2_in_rule__Category__Group__11637);
+            pushFollow(FOLLOW_2);
             rule__Category__Group__2();
 
             state._fsp--;
@@ -2216,23 +2216,23 @@ public final void rule__Category__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:810:1: rule__Category__Group__1__Impl : ( ( rule__Category__NameAssignment_1 ) ) ;
+    // InternalValid.g:810:1: rule__Category__Group__1__Impl : ( ( rule__Category__NameAssignment_1 ) ) ;
     public final void rule__Category__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:814:1: ( ( ( rule__Category__NameAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:815:1: ( ( rule__Category__NameAssignment_1 ) )
+            // InternalValid.g:814:1: ( ( ( rule__Category__NameAssignment_1 ) ) )
+            // InternalValid.g:815:1: ( ( rule__Category__NameAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:815:1: ( ( rule__Category__NameAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:816:1: ( rule__Category__NameAssignment_1 )
+            // InternalValid.g:815:1: ( ( rule__Category__NameAssignment_1 ) )
+            // InternalValid.g:816:1: ( rule__Category__NameAssignment_1 )
             {
              before(grammarAccess.getCategoryAccess().getNameAssignment_1()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:817:1: ( rule__Category__NameAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:817:2: rule__Category__NameAssignment_1
+            // InternalValid.g:817:1: ( rule__Category__NameAssignment_1 )
+            // InternalValid.g:817:2: rule__Category__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__Category__NameAssignment_1_in_rule__Category__Group__1__Impl1664);
+            pushFollow(FOLLOW_2);
             rule__Category__NameAssignment_1();
 
             state._fsp--;
@@ -2263,21 +2263,21 @@ public final void rule__Category__Group__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:827:1: rule__Category__Group__2 : rule__Category__Group__2__Impl rule__Category__Group__3 ;
+    // InternalValid.g:827:1: rule__Category__Group__2 : rule__Category__Group__2__Impl rule__Category__Group__3 ;
     public final void rule__Category__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:831:1: ( rule__Category__Group__2__Impl rule__Category__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:832:2: rule__Category__Group__2__Impl rule__Category__Group__3
+            // InternalValid.g:831:1: ( rule__Category__Group__2__Impl rule__Category__Group__3 )
+            // InternalValid.g:832:2: rule__Category__Group__2__Impl rule__Category__Group__3
             {
-            pushFollow(FOLLOW_rule__Category__Group__2__Impl_in_rule__Category__Group__21694);
+            pushFollow(FOLLOW_6);
             rule__Category__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Category__Group__3_in_rule__Category__Group__21697);
+            pushFollow(FOLLOW_2);
             rule__Category__Group__3();
 
             state._fsp--;
@@ -2301,20 +2301,20 @@ public final void rule__Category__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:839:1: rule__Category__Group__2__Impl : ( 'label' ) ;
+    // InternalValid.g:839:1: rule__Category__Group__2__Impl : ( 'label' ) ;
     public final void rule__Category__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:843:1: ( ( 'label' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:844:1: ( 'label' )
+            // InternalValid.g:843:1: ( ( 'label' ) )
+            // InternalValid.g:844:1: ( 'label' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:844:1: ( 'label' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:845:1: 'label'
+            // InternalValid.g:844:1: ( 'label' )
+            // InternalValid.g:845:1: 'label'
             {
              before(grammarAccess.getCategoryAccess().getLabelKeyword_2()); 
-            match(input,20,FOLLOW_20_in_rule__Category__Group__2__Impl1725); 
+            match(input,20,FOLLOW_2); 
              after(grammarAccess.getCategoryAccess().getLabelKeyword_2()); 
 
             }
@@ -2338,21 +2338,21 @@ public final void rule__Category__Group__2__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:858:1: rule__Category__Group__3 : rule__Category__Group__3__Impl rule__Category__Group__4 ;
+    // InternalValid.g:858:1: rule__Category__Group__3 : rule__Category__Group__3__Impl rule__Category__Group__4 ;
     public final void rule__Category__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:862:1: ( rule__Category__Group__3__Impl rule__Category__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:863:2: rule__Category__Group__3__Impl rule__Category__Group__4
+            // InternalValid.g:862:1: ( rule__Category__Group__3__Impl rule__Category__Group__4 )
+            // InternalValid.g:863:2: rule__Category__Group__3__Impl rule__Category__Group__4
             {
-            pushFollow(FOLLOW_rule__Category__Group__3__Impl_in_rule__Category__Group__31756);
+            pushFollow(FOLLOW_9);
             rule__Category__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Category__Group__4_in_rule__Category__Group__31759);
+            pushFollow(FOLLOW_2);
             rule__Category__Group__4();
 
             state._fsp--;
@@ -2376,23 +2376,23 @@ public final void rule__Category__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:870:1: rule__Category__Group__3__Impl : ( ( rule__Category__LabelAssignment_3 ) ) ;
+    // InternalValid.g:870:1: rule__Category__Group__3__Impl : ( ( rule__Category__LabelAssignment_3 ) ) ;
     public final void rule__Category__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:874:1: ( ( ( rule__Category__LabelAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:875:1: ( ( rule__Category__LabelAssignment_3 ) )
+            // InternalValid.g:874:1: ( ( ( rule__Category__LabelAssignment_3 ) ) )
+            // InternalValid.g:875:1: ( ( rule__Category__LabelAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:875:1: ( ( rule__Category__LabelAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:876:1: ( rule__Category__LabelAssignment_3 )
+            // InternalValid.g:875:1: ( ( rule__Category__LabelAssignment_3 ) )
+            // InternalValid.g:876:1: ( rule__Category__LabelAssignment_3 )
             {
              before(grammarAccess.getCategoryAccess().getLabelAssignment_3()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:877:1: ( rule__Category__LabelAssignment_3 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:877:2: rule__Category__LabelAssignment_3
+            // InternalValid.g:877:1: ( rule__Category__LabelAssignment_3 )
+            // InternalValid.g:877:2: rule__Category__LabelAssignment_3
             {
-            pushFollow(FOLLOW_rule__Category__LabelAssignment_3_in_rule__Category__Group__3__Impl1786);
+            pushFollow(FOLLOW_2);
             rule__Category__LabelAssignment_3();
 
             state._fsp--;
@@ -2423,21 +2423,21 @@ public final void rule__Category__Group__3__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:887:1: rule__Category__Group__4 : rule__Category__Group__4__Impl rule__Category__Group__5 ;
+    // InternalValid.g:887:1: rule__Category__Group__4 : rule__Category__Group__4__Impl rule__Category__Group__5 ;
     public final void rule__Category__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:891:1: ( rule__Category__Group__4__Impl rule__Category__Group__5 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:892:2: rule__Category__Group__4__Impl rule__Category__Group__5
+            // InternalValid.g:891:1: ( rule__Category__Group__4__Impl rule__Category__Group__5 )
+            // InternalValid.g:892:2: rule__Category__Group__4__Impl rule__Category__Group__5
             {
-            pushFollow(FOLLOW_rule__Category__Group__4__Impl_in_rule__Category__Group__41816);
+            pushFollow(FOLLOW_9);
             rule__Category__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Category__Group__5_in_rule__Category__Group__41819);
+            pushFollow(FOLLOW_2);
             rule__Category__Group__5();
 
             state._fsp--;
@@ -2461,20 +2461,20 @@ public final void rule__Category__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:899:1: rule__Category__Group__4__Impl : ( ( rule__Category__Group_4__0 )? ) ;
+    // InternalValid.g:899:1: rule__Category__Group__4__Impl : ( ( rule__Category__Group_4__0 )? ) ;
     public final void rule__Category__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:903:1: ( ( ( rule__Category__Group_4__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:904:1: ( ( rule__Category__Group_4__0 )? )
+            // InternalValid.g:903:1: ( ( ( rule__Category__Group_4__0 )? ) )
+            // InternalValid.g:904:1: ( ( rule__Category__Group_4__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:904:1: ( ( rule__Category__Group_4__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:905:1: ( rule__Category__Group_4__0 )?
+            // InternalValid.g:904:1: ( ( rule__Category__Group_4__0 )? )
+            // InternalValid.g:905:1: ( rule__Category__Group_4__0 )?
             {
              before(grammarAccess.getCategoryAccess().getGroup_4()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:906:1: ( rule__Category__Group_4__0 )?
+            // InternalValid.g:906:1: ( rule__Category__Group_4__0 )?
             int alt8=2;
             int LA8_0 = input.LA(1);
 
@@ -2483,9 +2483,9 @@ public final void rule__Category__Group__4__Impl() throws RecognitionException {
             }
             switch (alt8) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:906:2: rule__Category__Group_4__0
+                    // InternalValid.g:906:2: rule__Category__Group_4__0
                     {
-                    pushFollow(FOLLOW_rule__Category__Group_4__0_in_rule__Category__Group__4__Impl1846);
+                    pushFollow(FOLLOW_2);
                     rule__Category__Group_4__0();
 
                     state._fsp--;
@@ -2519,21 +2519,21 @@ public final void rule__Category__Group__4__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__Group__5"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:916:1: rule__Category__Group__5 : rule__Category__Group__5__Impl rule__Category__Group__6 ;
+    // InternalValid.g:916:1: rule__Category__Group__5 : rule__Category__Group__5__Impl rule__Category__Group__6 ;
     public final void rule__Category__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:920:1: ( rule__Category__Group__5__Impl rule__Category__Group__6 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:921:2: rule__Category__Group__5__Impl rule__Category__Group__6
+            // InternalValid.g:920:1: ( rule__Category__Group__5__Impl rule__Category__Group__6 )
+            // InternalValid.g:921:2: rule__Category__Group__5__Impl rule__Category__Group__6
             {
-            pushFollow(FOLLOW_rule__Category__Group__5__Impl_in_rule__Category__Group__51877);
+            pushFollow(FOLLOW_10);
             rule__Category__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Category__Group__6_in_rule__Category__Group__51880);
+            pushFollow(FOLLOW_2);
             rule__Category__Group__6();
 
             state._fsp--;
@@ -2557,20 +2557,20 @@ public final void rule__Category__Group__5() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:928:1: rule__Category__Group__5__Impl : ( '{' ) ;
+    // InternalValid.g:928:1: rule__Category__Group__5__Impl : ( '{' ) ;
     public final void rule__Category__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:932:1: ( ( '{' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:933:1: ( '{' )
+            // InternalValid.g:932:1: ( ( '{' ) )
+            // InternalValid.g:933:1: ( '{' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:933:1: ( '{' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:934:1: '{'
+            // InternalValid.g:933:1: ( '{' )
+            // InternalValid.g:934:1: '{'
             {
              before(grammarAccess.getCategoryAccess().getLeftCurlyBracketKeyword_5()); 
-            match(input,21,FOLLOW_21_in_rule__Category__Group__5__Impl1908); 
+            match(input,21,FOLLOW_2); 
              after(grammarAccess.getCategoryAccess().getLeftCurlyBracketKeyword_5()); 
 
             }
@@ -2594,21 +2594,21 @@ public final void rule__Category__Group__5__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__Group__6"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:947:1: rule__Category__Group__6 : rule__Category__Group__6__Impl rule__Category__Group__7 ;
+    // InternalValid.g:947:1: rule__Category__Group__6 : rule__Category__Group__6__Impl rule__Category__Group__7 ;
     public final void rule__Category__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:951:1: ( rule__Category__Group__6__Impl rule__Category__Group__7 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:952:2: rule__Category__Group__6__Impl rule__Category__Group__7
+            // InternalValid.g:951:1: ( rule__Category__Group__6__Impl rule__Category__Group__7 )
+            // InternalValid.g:952:2: rule__Category__Group__6__Impl rule__Category__Group__7
             {
-            pushFollow(FOLLOW_rule__Category__Group__6__Impl_in_rule__Category__Group__61939);
+            pushFollow(FOLLOW_10);
             rule__Category__Group__6__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Category__Group__7_in_rule__Category__Group__61942);
+            pushFollow(FOLLOW_2);
             rule__Category__Group__7();
 
             state._fsp--;
@@ -2632,20 +2632,20 @@ public final void rule__Category__Group__6() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__Group__6__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:959:1: rule__Category__Group__6__Impl : ( ( rule__Category__RulesAssignment_6 )* ) ;
+    // InternalValid.g:959:1: rule__Category__Group__6__Impl : ( ( rule__Category__RulesAssignment_6 )* ) ;
     public final void rule__Category__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:963:1: ( ( ( rule__Category__RulesAssignment_6 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:964:1: ( ( rule__Category__RulesAssignment_6 )* )
+            // InternalValid.g:963:1: ( ( ( rule__Category__RulesAssignment_6 )* ) )
+            // InternalValid.g:964:1: ( ( rule__Category__RulesAssignment_6 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:964:1: ( ( rule__Category__RulesAssignment_6 )* )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:965:1: ( rule__Category__RulesAssignment_6 )*
+            // InternalValid.g:964:1: ( ( rule__Category__RulesAssignment_6 )* )
+            // InternalValid.g:965:1: ( rule__Category__RulesAssignment_6 )*
             {
              before(grammarAccess.getCategoryAccess().getRulesAssignment_6()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:966:1: ( rule__Category__RulesAssignment_6 )*
+            // InternalValid.g:966:1: ( rule__Category__RulesAssignment_6 )*
             loop9:
             do {
                 int alt9=2;
@@ -2658,9 +2658,9 @@ public final void rule__Category__Group__6__Impl() throws RecognitionException {
 
                 switch (alt9) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:966:2: rule__Category__RulesAssignment_6
+            	    // InternalValid.g:966:2: rule__Category__RulesAssignment_6
             	    {
-            	    pushFollow(FOLLOW_rule__Category__RulesAssignment_6_in_rule__Category__Group__6__Impl1969);
+            	    pushFollow(FOLLOW_11);
             	    rule__Category__RulesAssignment_6();
 
             	    state._fsp--;
@@ -2697,16 +2697,16 @@ public final void rule__Category__Group__6__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__Group__7"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:976:1: rule__Category__Group__7 : rule__Category__Group__7__Impl ;
+    // InternalValid.g:976:1: rule__Category__Group__7 : rule__Category__Group__7__Impl ;
     public final void rule__Category__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:980:1: ( rule__Category__Group__7__Impl )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:981:2: rule__Category__Group__7__Impl
+            // InternalValid.g:980:1: ( rule__Category__Group__7__Impl )
+            // InternalValid.g:981:2: rule__Category__Group__7__Impl
             {
-            pushFollow(FOLLOW_rule__Category__Group__7__Impl_in_rule__Category__Group__72000);
+            pushFollow(FOLLOW_2);
             rule__Category__Group__7__Impl();
 
             state._fsp--;
@@ -2730,20 +2730,20 @@ public final void rule__Category__Group__7() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__Group__7__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:987:1: rule__Category__Group__7__Impl : ( '}' ) ;
+    // InternalValid.g:987:1: rule__Category__Group__7__Impl : ( '}' ) ;
     public final void rule__Category__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:991:1: ( ( '}' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:992:1: ( '}' )
+            // InternalValid.g:991:1: ( ( '}' ) )
+            // InternalValid.g:992:1: ( '}' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:992:1: ( '}' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:993:1: '}'
+            // InternalValid.g:992:1: ( '}' )
+            // InternalValid.g:993:1: '}'
             {
              before(grammarAccess.getCategoryAccess().getRightCurlyBracketKeyword_7()); 
-            match(input,22,FOLLOW_22_in_rule__Category__Group__7__Impl2028); 
+            match(input,22,FOLLOW_2); 
              after(grammarAccess.getCategoryAccess().getRightCurlyBracketKeyword_7()); 
 
             }
@@ -2767,21 +2767,21 @@ public final void rule__Category__Group__7__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__Group_4__0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1022:1: rule__Category__Group_4__0 : rule__Category__Group_4__0__Impl rule__Category__Group_4__1 ;
+    // InternalValid.g:1022:1: rule__Category__Group_4__0 : rule__Category__Group_4__0__Impl rule__Category__Group_4__1 ;
     public final void rule__Category__Group_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1026:1: ( rule__Category__Group_4__0__Impl rule__Category__Group_4__1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1027:2: rule__Category__Group_4__0__Impl rule__Category__Group_4__1
+            // InternalValid.g:1026:1: ( rule__Category__Group_4__0__Impl rule__Category__Group_4__1 )
+            // InternalValid.g:1027:2: rule__Category__Group_4__0__Impl rule__Category__Group_4__1
             {
-            pushFollow(FOLLOW_rule__Category__Group_4__0__Impl_in_rule__Category__Group_4__02075);
+            pushFollow(FOLLOW_6);
             rule__Category__Group_4__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Category__Group_4__1_in_rule__Category__Group_4__02078);
+            pushFollow(FOLLOW_2);
             rule__Category__Group_4__1();
 
             state._fsp--;
@@ -2805,20 +2805,20 @@ public final void rule__Category__Group_4__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__Group_4__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1034:1: rule__Category__Group_4__0__Impl : ( 'description' ) ;
+    // InternalValid.g:1034:1: rule__Category__Group_4__0__Impl : ( 'description' ) ;
     public final void rule__Category__Group_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1038:1: ( ( 'description' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1039:1: ( 'description' )
+            // InternalValid.g:1038:1: ( ( 'description' ) )
+            // InternalValid.g:1039:1: ( 'description' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1039:1: ( 'description' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1040:1: 'description'
+            // InternalValid.g:1039:1: ( 'description' )
+            // InternalValid.g:1040:1: 'description'
             {
              before(grammarAccess.getCategoryAccess().getDescriptionKeyword_4_0()); 
-            match(input,23,FOLLOW_23_in_rule__Category__Group_4__0__Impl2106); 
+            match(input,23,FOLLOW_2); 
              after(grammarAccess.getCategoryAccess().getDescriptionKeyword_4_0()); 
 
             }
@@ -2842,16 +2842,16 @@ public final void rule__Category__Group_4__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__Category__Group_4__1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1053:1: rule__Category__Group_4__1 : rule__Category__Group_4__1__Impl ;
+    // InternalValid.g:1053:1: rule__Category__Group_4__1 : rule__Category__Group_4__1__Impl ;
     public final void rule__Category__Group_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1057:1: ( rule__Category__Group_4__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1058:2: rule__Category__Group_4__1__Impl
+            // InternalValid.g:1057:1: ( rule__Category__Group_4__1__Impl )
+            // InternalValid.g:1058:2: rule__Category__Group_4__1__Impl
             {
-            pushFollow(FOLLOW_rule__Category__Group_4__1__Impl_in_rule__Category__Group_4__12137);
+            pushFollow(FOLLOW_2);
             rule__Category__Group_4__1__Impl();
 
             state._fsp--;
@@ -2875,23 +2875,23 @@ public final void rule__Category__Group_4__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Category__Group_4__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1064:1: rule__Category__Group_4__1__Impl : ( ( rule__Category__DescriptionAssignment_4_1 ) ) ;
+    // InternalValid.g:1064:1: rule__Category__Group_4__1__Impl : ( ( rule__Category__DescriptionAssignment_4_1 ) ) ;
     public final void rule__Category__Group_4__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1068:1: ( ( ( rule__Category__DescriptionAssignment_4_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1069:1: ( ( rule__Category__DescriptionAssignment_4_1 ) )
+            // InternalValid.g:1068:1: ( ( ( rule__Category__DescriptionAssignment_4_1 ) ) )
+            // InternalValid.g:1069:1: ( ( rule__Category__DescriptionAssignment_4_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1069:1: ( ( rule__Category__DescriptionAssignment_4_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1070:1: ( rule__Category__DescriptionAssignment_4_1 )
+            // InternalValid.g:1069:1: ( ( rule__Category__DescriptionAssignment_4_1 ) )
+            // InternalValid.g:1070:1: ( rule__Category__DescriptionAssignment_4_1 )
             {
              before(grammarAccess.getCategoryAccess().getDescriptionAssignment_4_1()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1071:1: ( rule__Category__DescriptionAssignment_4_1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1071:2: rule__Category__DescriptionAssignment_4_1
+            // InternalValid.g:1071:1: ( rule__Category__DescriptionAssignment_4_1 )
+            // InternalValid.g:1071:2: rule__Category__DescriptionAssignment_4_1
             {
-            pushFollow(FOLLOW_rule__Category__DescriptionAssignment_4_1_in_rule__Category__Group_4__1__Impl2164);
+            pushFollow(FOLLOW_2);
             rule__Category__DescriptionAssignment_4_1();
 
             state._fsp--;
@@ -2922,21 +2922,21 @@ public final void rule__Category__Group_4__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__NativeRule__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1085:1: rule__NativeRule__Group__0 : rule__NativeRule__Group__0__Impl rule__NativeRule__Group__1 ;
+    // InternalValid.g:1085:1: rule__NativeRule__Group__0 : rule__NativeRule__Group__0__Impl rule__NativeRule__Group__1 ;
     public final void rule__NativeRule__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1089:1: ( rule__NativeRule__Group__0__Impl rule__NativeRule__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1090:2: rule__NativeRule__Group__0__Impl rule__NativeRule__Group__1
+            // InternalValid.g:1089:1: ( rule__NativeRule__Group__0__Impl rule__NativeRule__Group__1 )
+            // InternalValid.g:1090:2: rule__NativeRule__Group__0__Impl rule__NativeRule__Group__1
             {
-            pushFollow(FOLLOW_rule__NativeRule__Group__0__Impl_in_rule__NativeRule__Group__02198);
+            pushFollow(FOLLOW_12);
             rule__NativeRule__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__NativeRule__Group__1_in_rule__NativeRule__Group__02201);
+            pushFollow(FOLLOW_2);
             rule__NativeRule__Group__1();
 
             state._fsp--;
@@ -2960,23 +2960,23 @@ public final void rule__NativeRule__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__NativeRule__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1097:1: rule__NativeRule__Group__0__Impl : ( ( rule__NativeRule__UnorderedGroup_0 ) ) ;
+    // InternalValid.g:1097:1: rule__NativeRule__Group__0__Impl : ( ( rule__NativeRule__UnorderedGroup_0 ) ) ;
     public final void rule__NativeRule__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1101:1: ( ( ( rule__NativeRule__UnorderedGroup_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1102:1: ( ( rule__NativeRule__UnorderedGroup_0 ) )
+            // InternalValid.g:1101:1: ( ( ( rule__NativeRule__UnorderedGroup_0 ) ) )
+            // InternalValid.g:1102:1: ( ( rule__NativeRule__UnorderedGroup_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1102:1: ( ( rule__NativeRule__UnorderedGroup_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1103:1: ( rule__NativeRule__UnorderedGroup_0 )
+            // InternalValid.g:1102:1: ( ( rule__NativeRule__UnorderedGroup_0 ) )
+            // InternalValid.g:1103:1: ( rule__NativeRule__UnorderedGroup_0 )
             {
              before(grammarAccess.getNativeRuleAccess().getUnorderedGroup_0()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1104:1: ( rule__NativeRule__UnorderedGroup_0 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1104:2: rule__NativeRule__UnorderedGroup_0
+            // InternalValid.g:1104:1: ( rule__NativeRule__UnorderedGroup_0 )
+            // InternalValid.g:1104:2: rule__NativeRule__UnorderedGroup_0
             {
-            pushFollow(FOLLOW_rule__NativeRule__UnorderedGroup_0_in_rule__NativeRule__Group__0__Impl2228);
+            pushFollow(FOLLOW_2);
             rule__NativeRule__UnorderedGroup_0();
 
             state._fsp--;
@@ -3007,21 +3007,21 @@ public final void rule__NativeRule__Group__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__NativeRule__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1114:1: rule__NativeRule__Group__1 : rule__NativeRule__Group__1__Impl rule__NativeRule__Group__2 ;
+    // InternalValid.g:1114:1: rule__NativeRule__Group__1 : rule__NativeRule__Group__1__Impl rule__NativeRule__Group__2 ;
     public final void rule__NativeRule__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1118:1: ( rule__NativeRule__Group__1__Impl rule__NativeRule__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1119:2: rule__NativeRule__Group__1__Impl rule__NativeRule__Group__2
+            // InternalValid.g:1118:1: ( rule__NativeRule__Group__1__Impl rule__NativeRule__Group__2 )
+            // InternalValid.g:1119:2: rule__NativeRule__Group__1__Impl rule__NativeRule__Group__2
             {
-            pushFollow(FOLLOW_rule__NativeRule__Group__1__Impl_in_rule__NativeRule__Group__12258);
+            pushFollow(FOLLOW_7);
             rule__NativeRule__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__NativeRule__Group__2_in_rule__NativeRule__Group__12261);
+            pushFollow(FOLLOW_2);
             rule__NativeRule__Group__2();
 
             state._fsp--;
@@ -3045,23 +3045,23 @@ public final void rule__NativeRule__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__NativeRule__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1126:1: rule__NativeRule__Group__1__Impl : ( ( rule__NativeRule__SeverityAssignment_1 ) ) ;
+    // InternalValid.g:1126:1: rule__NativeRule__Group__1__Impl : ( ( rule__NativeRule__SeverityAssignment_1 ) ) ;
     public final void rule__NativeRule__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1130:1: ( ( ( rule__NativeRule__SeverityAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1131:1: ( ( rule__NativeRule__SeverityAssignment_1 ) )
+            // InternalValid.g:1130:1: ( ( ( rule__NativeRule__SeverityAssignment_1 ) ) )
+            // InternalValid.g:1131:1: ( ( rule__NativeRule__SeverityAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1131:1: ( ( rule__NativeRule__SeverityAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1132:1: ( rule__NativeRule__SeverityAssignment_1 )
+            // InternalValid.g:1131:1: ( ( rule__NativeRule__SeverityAssignment_1 ) )
+            // InternalValid.g:1132:1: ( rule__NativeRule__SeverityAssignment_1 )
             {
              before(grammarAccess.getNativeRuleAccess().getSeverityAssignment_1()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1133:1: ( rule__NativeRule__SeverityAssignment_1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1133:2: rule__NativeRule__SeverityAssignment_1
+            // InternalValid.g:1133:1: ( rule__NativeRule__SeverityAssignment_1 )
+            // InternalValid.g:1133:2: rule__NativeRule__SeverityAssignment_1
             {
-            pushFollow(FOLLOW_rule__NativeRule__SeverityAssignment_1_in_rule__NativeRule__Group__1__Impl2288);
+            pushFollow(FOLLOW_2);
             rule__NativeRule__SeverityAssignment_1();
 
             state._fsp--;
@@ -3092,21 +3092,21 @@ public final void rule__NativeRule__Group__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__NativeRule__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1143:1: rule__NativeRule__Group__2 : rule__NativeRule__Group__2__Impl rule__NativeRule__Group__3 ;
+    // InternalValid.g:1143:1: rule__NativeRule__Group__2 : rule__NativeRule__Group__2__Impl rule__NativeRule__Group__3 ;
     public final void rule__NativeRule__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1147:1: ( rule__NativeRule__Group__2__Impl rule__NativeRule__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1148:2: rule__NativeRule__Group__2__Impl rule__NativeRule__Group__3
+            // InternalValid.g:1147:1: ( rule__NativeRule__Group__2__Impl rule__NativeRule__Group__3 )
+            // InternalValid.g:1148:2: rule__NativeRule__Group__2__Impl rule__NativeRule__Group__3
             {
-            pushFollow(FOLLOW_rule__NativeRule__Group__2__Impl_in_rule__NativeRule__Group__22318);
+            pushFollow(FOLLOW_8);
             rule__NativeRule__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__NativeRule__Group__3_in_rule__NativeRule__Group__22321);
+            pushFollow(FOLLOW_2);
             rule__NativeRule__Group__3();
 
             state._fsp--;
@@ -3130,23 +3130,23 @@ public final void rule__NativeRule__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__NativeRule__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1155:1: rule__NativeRule__Group__2__Impl : ( ( rule__NativeRule__NameAssignment_2 ) ) ;
+    // InternalValid.g:1155:1: rule__NativeRule__Group__2__Impl : ( ( rule__NativeRule__NameAssignment_2 ) ) ;
     public final void rule__NativeRule__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1159:1: ( ( ( rule__NativeRule__NameAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1160:1: ( ( rule__NativeRule__NameAssignment_2 ) )
+            // InternalValid.g:1159:1: ( ( ( rule__NativeRule__NameAssignment_2 ) ) )
+            // InternalValid.g:1160:1: ( ( rule__NativeRule__NameAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1160:1: ( ( rule__NativeRule__NameAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1161:1: ( rule__NativeRule__NameAssignment_2 )
+            // InternalValid.g:1160:1: ( ( rule__NativeRule__NameAssignment_2 ) )
+            // InternalValid.g:1161:1: ( rule__NativeRule__NameAssignment_2 )
             {
              before(grammarAccess.getNativeRuleAccess().getNameAssignment_2()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1162:1: ( rule__NativeRule__NameAssignment_2 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1162:2: rule__NativeRule__NameAssignment_2
+            // InternalValid.g:1162:1: ( rule__NativeRule__NameAssignment_2 )
+            // InternalValid.g:1162:2: rule__NativeRule__NameAssignment_2
             {
-            pushFollow(FOLLOW_rule__NativeRule__NameAssignment_2_in_rule__NativeRule__Group__2__Impl2348);
+            pushFollow(FOLLOW_2);
             rule__NativeRule__NameAssignment_2();
 
             state._fsp--;
@@ -3177,21 +3177,21 @@ public final void rule__NativeRule__Group__2__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__NativeRule__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1172:1: rule__NativeRule__Group__3 : rule__NativeRule__Group__3__Impl rule__NativeRule__Group__4 ;
+    // InternalValid.g:1172:1: rule__NativeRule__Group__3 : rule__NativeRule__Group__3__Impl rule__NativeRule__Group__4 ;
     public final void rule__NativeRule__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1176:1: ( rule__NativeRule__Group__3__Impl rule__NativeRule__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1177:2: rule__NativeRule__Group__3__Impl rule__NativeRule__Group__4
+            // InternalValid.g:1176:1: ( rule__NativeRule__Group__3__Impl rule__NativeRule__Group__4 )
+            // InternalValid.g:1177:2: rule__NativeRule__Group__3__Impl rule__NativeRule__Group__4
             {
-            pushFollow(FOLLOW_rule__NativeRule__Group__3__Impl_in_rule__NativeRule__Group__32378);
+            pushFollow(FOLLOW_6);
             rule__NativeRule__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__NativeRule__Group__4_in_rule__NativeRule__Group__32381);
+            pushFollow(FOLLOW_2);
             rule__NativeRule__Group__4();
 
             state._fsp--;
@@ -3215,20 +3215,20 @@ public final void rule__NativeRule__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__NativeRule__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1184:1: rule__NativeRule__Group__3__Impl : ( 'label' ) ;
+    // InternalValid.g:1184:1: rule__NativeRule__Group__3__Impl : ( 'label' ) ;
     public final void rule__NativeRule__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1188:1: ( ( 'label' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1189:1: ( 'label' )
+            // InternalValid.g:1188:1: ( ( 'label' ) )
+            // InternalValid.g:1189:1: ( 'label' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1189:1: ( 'label' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1190:1: 'label'
+            // InternalValid.g:1189:1: ( 'label' )
+            // InternalValid.g:1190:1: 'label'
             {
              before(grammarAccess.getNativeRuleAccess().getLabelKeyword_3()); 
-            match(input,20,FOLLOW_20_in_rule__NativeRule__Group__3__Impl2409); 
+            match(input,20,FOLLOW_2); 
              after(grammarAccess.getNativeRuleAccess().getLabelKeyword_3()); 
 
             }
@@ -3252,21 +3252,21 @@ public final void rule__NativeRule__Group__3__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__NativeRule__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1203:1: rule__NativeRule__Group__4 : rule__NativeRule__Group__4__Impl rule__NativeRule__Group__5 ;
+    // InternalValid.g:1203:1: rule__NativeRule__Group__4 : rule__NativeRule__Group__4__Impl rule__NativeRule__Group__5 ;
     public final void rule__NativeRule__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1207:1: ( rule__NativeRule__Group__4__Impl rule__NativeRule__Group__5 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1208:2: rule__NativeRule__Group__4__Impl rule__NativeRule__Group__5
+            // InternalValid.g:1207:1: ( rule__NativeRule__Group__4__Impl rule__NativeRule__Group__5 )
+            // InternalValid.g:1208:2: rule__NativeRule__Group__4__Impl rule__NativeRule__Group__5
             {
-            pushFollow(FOLLOW_rule__NativeRule__Group__4__Impl_in_rule__NativeRule__Group__42440);
+            pushFollow(FOLLOW_13);
             rule__NativeRule__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__NativeRule__Group__5_in_rule__NativeRule__Group__42443);
+            pushFollow(FOLLOW_2);
             rule__NativeRule__Group__5();
 
             state._fsp--;
@@ -3290,23 +3290,23 @@ public final void rule__NativeRule__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__NativeRule__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1215:1: rule__NativeRule__Group__4__Impl : ( ( rule__NativeRule__LabelAssignment_4 ) ) ;
+    // InternalValid.g:1215:1: rule__NativeRule__Group__4__Impl : ( ( rule__NativeRule__LabelAssignment_4 ) ) ;
     public final void rule__NativeRule__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1219:1: ( ( ( rule__NativeRule__LabelAssignment_4 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1220:1: ( ( rule__NativeRule__LabelAssignment_4 ) )
+            // InternalValid.g:1219:1: ( ( ( rule__NativeRule__LabelAssignment_4 ) ) )
+            // InternalValid.g:1220:1: ( ( rule__NativeRule__LabelAssignment_4 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1220:1: ( ( rule__NativeRule__LabelAssignment_4 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1221:1: ( rule__NativeRule__LabelAssignment_4 )
+            // InternalValid.g:1220:1: ( ( rule__NativeRule__LabelAssignment_4 ) )
+            // InternalValid.g:1221:1: ( rule__NativeRule__LabelAssignment_4 )
             {
              before(grammarAccess.getNativeRuleAccess().getLabelAssignment_4()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1222:1: ( rule__NativeRule__LabelAssignment_4 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1222:2: rule__NativeRule__LabelAssignment_4
+            // InternalValid.g:1222:1: ( rule__NativeRule__LabelAssignment_4 )
+            // InternalValid.g:1222:2: rule__NativeRule__LabelAssignment_4
             {
-            pushFollow(FOLLOW_rule__NativeRule__LabelAssignment_4_in_rule__NativeRule__Group__4__Impl2470);
+            pushFollow(FOLLOW_2);
             rule__NativeRule__LabelAssignment_4();
 
             state._fsp--;
@@ -3337,21 +3337,21 @@ public final void rule__NativeRule__Group__4__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__NativeRule__Group__5"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1232:1: rule__NativeRule__Group__5 : rule__NativeRule__Group__5__Impl rule__NativeRule__Group__6 ;
+    // InternalValid.g:1232:1: rule__NativeRule__Group__5 : rule__NativeRule__Group__5__Impl rule__NativeRule__Group__6 ;
     public final void rule__NativeRule__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1236:1: ( rule__NativeRule__Group__5__Impl rule__NativeRule__Group__6 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1237:2: rule__NativeRule__Group__5__Impl rule__NativeRule__Group__6
+            // InternalValid.g:1236:1: ( rule__NativeRule__Group__5__Impl rule__NativeRule__Group__6 )
+            // InternalValid.g:1237:2: rule__NativeRule__Group__5__Impl rule__NativeRule__Group__6
             {
-            pushFollow(FOLLOW_rule__NativeRule__Group__5__Impl_in_rule__NativeRule__Group__52500);
+            pushFollow(FOLLOW_13);
             rule__NativeRule__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__NativeRule__Group__6_in_rule__NativeRule__Group__52503);
+            pushFollow(FOLLOW_2);
             rule__NativeRule__Group__6();
 
             state._fsp--;
@@ -3375,20 +3375,20 @@ public final void rule__NativeRule__Group__5() throws RecognitionException {
 
 
     // $ANTLR start "rule__NativeRule__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1244:1: rule__NativeRule__Group__5__Impl : ( ( rule__NativeRule__Group_5__0 )? ) ;
+    // InternalValid.g:1244:1: rule__NativeRule__Group__5__Impl : ( ( rule__NativeRule__Group_5__0 )? ) ;
     public final void rule__NativeRule__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1248:1: ( ( ( rule__NativeRule__Group_5__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1249:1: ( ( rule__NativeRule__Group_5__0 )? )
+            // InternalValid.g:1248:1: ( ( ( rule__NativeRule__Group_5__0 )? ) )
+            // InternalValid.g:1249:1: ( ( rule__NativeRule__Group_5__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1249:1: ( ( rule__NativeRule__Group_5__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1250:1: ( rule__NativeRule__Group_5__0 )?
+            // InternalValid.g:1249:1: ( ( rule__NativeRule__Group_5__0 )? )
+            // InternalValid.g:1250:1: ( rule__NativeRule__Group_5__0 )?
             {
              before(grammarAccess.getNativeRuleAccess().getGroup_5()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1251:1: ( rule__NativeRule__Group_5__0 )?
+            // InternalValid.g:1251:1: ( rule__NativeRule__Group_5__0 )?
             int alt10=2;
             int LA10_0 = input.LA(1);
 
@@ -3397,9 +3397,9 @@ public final void rule__NativeRule__Group__5__Impl() throws RecognitionException
             }
             switch (alt10) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1251:2: rule__NativeRule__Group_5__0
+                    // InternalValid.g:1251:2: rule__NativeRule__Group_5__0
                     {
-                    pushFollow(FOLLOW_rule__NativeRule__Group_5__0_in_rule__NativeRule__Group__5__Impl2530);
+                    pushFollow(FOLLOW_2);
                     rule__NativeRule__Group_5__0();
 
                     state._fsp--;
@@ -3433,21 +3433,21 @@ public final void rule__NativeRule__Group__5__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__NativeRule__Group__6"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1261:1: rule__NativeRule__Group__6 : rule__NativeRule__Group__6__Impl rule__NativeRule__Group__7 ;
+    // InternalValid.g:1261:1: rule__NativeRule__Group__6 : rule__NativeRule__Group__6__Impl rule__NativeRule__Group__7 ;
     public final void rule__NativeRule__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1265:1: ( rule__NativeRule__Group__6__Impl rule__NativeRule__Group__7 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1266:2: rule__NativeRule__Group__6__Impl rule__NativeRule__Group__7
+            // InternalValid.g:1265:1: ( rule__NativeRule__Group__6__Impl rule__NativeRule__Group__7 )
+            // InternalValid.g:1266:2: rule__NativeRule__Group__6__Impl rule__NativeRule__Group__7
             {
-            pushFollow(FOLLOW_rule__NativeRule__Group__6__Impl_in_rule__NativeRule__Group__62561);
+            pushFollow(FOLLOW_6);
             rule__NativeRule__Group__6__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__NativeRule__Group__7_in_rule__NativeRule__Group__62564);
+            pushFollow(FOLLOW_2);
             rule__NativeRule__Group__7();
 
             state._fsp--;
@@ -3471,20 +3471,20 @@ public final void rule__NativeRule__Group__6() throws RecognitionException {
 
 
     // $ANTLR start "rule__NativeRule__Group__6__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1273:1: rule__NativeRule__Group__6__Impl : ( 'message' ) ;
+    // InternalValid.g:1273:1: rule__NativeRule__Group__6__Impl : ( 'message' ) ;
     public final void rule__NativeRule__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1277:1: ( ( 'message' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1278:1: ( 'message' )
+            // InternalValid.g:1277:1: ( ( 'message' ) )
+            // InternalValid.g:1278:1: ( 'message' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1278:1: ( 'message' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1279:1: 'message'
+            // InternalValid.g:1278:1: ( 'message' )
+            // InternalValid.g:1279:1: 'message'
             {
              before(grammarAccess.getNativeRuleAccess().getMessageKeyword_6()); 
-            match(input,24,FOLLOW_24_in_rule__NativeRule__Group__6__Impl2592); 
+            match(input,24,FOLLOW_2); 
              after(grammarAccess.getNativeRuleAccess().getMessageKeyword_6()); 
 
             }
@@ -3508,21 +3508,21 @@ public final void rule__NativeRule__Group__6__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__NativeRule__Group__7"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1292:1: rule__NativeRule__Group__7 : rule__NativeRule__Group__7__Impl rule__NativeRule__Group__8 ;
+    // InternalValid.g:1292:1: rule__NativeRule__Group__7 : rule__NativeRule__Group__7__Impl rule__NativeRule__Group__8 ;
     public final void rule__NativeRule__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1296:1: ( rule__NativeRule__Group__7__Impl rule__NativeRule__Group__8 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1297:2: rule__NativeRule__Group__7__Impl rule__NativeRule__Group__8
+            // InternalValid.g:1296:1: ( rule__NativeRule__Group__7__Impl rule__NativeRule__Group__8 )
+            // InternalValid.g:1297:2: rule__NativeRule__Group__7__Impl rule__NativeRule__Group__8
             {
-            pushFollow(FOLLOW_rule__NativeRule__Group__7__Impl_in_rule__NativeRule__Group__72623);
+            pushFollow(FOLLOW_14);
             rule__NativeRule__Group__7__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__NativeRule__Group__8_in_rule__NativeRule__Group__72626);
+            pushFollow(FOLLOW_2);
             rule__NativeRule__Group__8();
 
             state._fsp--;
@@ -3546,23 +3546,23 @@ public final void rule__NativeRule__Group__7() throws RecognitionException {
 
 
     // $ANTLR start "rule__NativeRule__Group__7__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1304:1: rule__NativeRule__Group__7__Impl : ( ( rule__NativeRule__MessageAssignment_7 ) ) ;
+    // InternalValid.g:1304:1: rule__NativeRule__Group__7__Impl : ( ( rule__NativeRule__MessageAssignment_7 ) ) ;
     public final void rule__NativeRule__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1308:1: ( ( ( rule__NativeRule__MessageAssignment_7 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1309:1: ( ( rule__NativeRule__MessageAssignment_7 ) )
+            // InternalValid.g:1308:1: ( ( ( rule__NativeRule__MessageAssignment_7 ) ) )
+            // InternalValid.g:1309:1: ( ( rule__NativeRule__MessageAssignment_7 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1309:1: ( ( rule__NativeRule__MessageAssignment_7 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1310:1: ( rule__NativeRule__MessageAssignment_7 )
+            // InternalValid.g:1309:1: ( ( rule__NativeRule__MessageAssignment_7 ) )
+            // InternalValid.g:1310:1: ( rule__NativeRule__MessageAssignment_7 )
             {
              before(grammarAccess.getNativeRuleAccess().getMessageAssignment_7()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1311:1: ( rule__NativeRule__MessageAssignment_7 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1311:2: rule__NativeRule__MessageAssignment_7
+            // InternalValid.g:1311:1: ( rule__NativeRule__MessageAssignment_7 )
+            // InternalValid.g:1311:2: rule__NativeRule__MessageAssignment_7
             {
-            pushFollow(FOLLOW_rule__NativeRule__MessageAssignment_7_in_rule__NativeRule__Group__7__Impl2653);
+            pushFollow(FOLLOW_2);
             rule__NativeRule__MessageAssignment_7();
 
             state._fsp--;
@@ -3593,21 +3593,21 @@ public final void rule__NativeRule__Group__7__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__NativeRule__Group__8"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1321:1: rule__NativeRule__Group__8 : rule__NativeRule__Group__8__Impl rule__NativeRule__Group__9 ;
+    // InternalValid.g:1321:1: rule__NativeRule__Group__8 : rule__NativeRule__Group__8__Impl rule__NativeRule__Group__9 ;
     public final void rule__NativeRule__Group__8() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1325:1: ( rule__NativeRule__Group__8__Impl rule__NativeRule__Group__9 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1326:2: rule__NativeRule__Group__8__Impl rule__NativeRule__Group__9
+            // InternalValid.g:1325:1: ( rule__NativeRule__Group__8__Impl rule__NativeRule__Group__9 )
+            // InternalValid.g:1326:2: rule__NativeRule__Group__8__Impl rule__NativeRule__Group__9
             {
-            pushFollow(FOLLOW_rule__NativeRule__Group__8__Impl_in_rule__NativeRule__Group__82683);
+            pushFollow(FOLLOW_15);
             rule__NativeRule__Group__8__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__NativeRule__Group__9_in_rule__NativeRule__Group__82686);
+            pushFollow(FOLLOW_2);
             rule__NativeRule__Group__9();
 
             state._fsp--;
@@ -3631,20 +3631,20 @@ public final void rule__NativeRule__Group__8() throws RecognitionException {
 
 
     // $ANTLR start "rule__NativeRule__Group__8__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1333:1: rule__NativeRule__Group__8__Impl : ( 'context' ) ;
+    // InternalValid.g:1333:1: rule__NativeRule__Group__8__Impl : ( 'context' ) ;
     public final void rule__NativeRule__Group__8__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1337:1: ( ( 'context' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1338:1: ( 'context' )
+            // InternalValid.g:1337:1: ( ( 'context' ) )
+            // InternalValid.g:1338:1: ( 'context' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1338:1: ( 'context' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1339:1: 'context'
+            // InternalValid.g:1338:1: ( 'context' )
+            // InternalValid.g:1339:1: 'context'
             {
              before(grammarAccess.getNativeRuleAccess().getContextKeyword_8()); 
-            match(input,25,FOLLOW_25_in_rule__NativeRule__Group__8__Impl2714); 
+            match(input,25,FOLLOW_2); 
              after(grammarAccess.getNativeRuleAccess().getContextKeyword_8()); 
 
             }
@@ -3668,21 +3668,21 @@ public final void rule__NativeRule__Group__8__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__NativeRule__Group__9"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1352:1: rule__NativeRule__Group__9 : rule__NativeRule__Group__9__Impl rule__NativeRule__Group__10 ;
+    // InternalValid.g:1352:1: rule__NativeRule__Group__9 : rule__NativeRule__Group__9__Impl rule__NativeRule__Group__10 ;
     public final void rule__NativeRule__Group__9() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1356:1: ( rule__NativeRule__Group__9__Impl rule__NativeRule__Group__10 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1357:2: rule__NativeRule__Group__9__Impl rule__NativeRule__Group__10
+            // InternalValid.g:1356:1: ( rule__NativeRule__Group__9__Impl rule__NativeRule__Group__10 )
+            // InternalValid.g:1357:2: rule__NativeRule__Group__9__Impl rule__NativeRule__Group__10
             {
-            pushFollow(FOLLOW_rule__NativeRule__Group__9__Impl_in_rule__NativeRule__Group__92745);
+            pushFollow(FOLLOW_7);
             rule__NativeRule__Group__9__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__NativeRule__Group__10_in_rule__NativeRule__Group__92748);
+            pushFollow(FOLLOW_2);
             rule__NativeRule__Group__10();
 
             state._fsp--;
@@ -3706,20 +3706,20 @@ public final void rule__NativeRule__Group__9() throws RecognitionException {
 
 
     // $ANTLR start "rule__NativeRule__Group__9__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1364:1: rule__NativeRule__Group__9__Impl : ( '{' ) ;
+    // InternalValid.g:1364:1: rule__NativeRule__Group__9__Impl : ( '{' ) ;
     public final void rule__NativeRule__Group__9__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1368:1: ( ( '{' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1369:1: ( '{' )
+            // InternalValid.g:1368:1: ( ( '{' ) )
+            // InternalValid.g:1369:1: ( '{' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1369:1: ( '{' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1370:1: '{'
+            // InternalValid.g:1369:1: ( '{' )
+            // InternalValid.g:1370:1: '{'
             {
              before(grammarAccess.getNativeRuleAccess().getLeftCurlyBracketKeyword_9()); 
-            match(input,21,FOLLOW_21_in_rule__NativeRule__Group__9__Impl2776); 
+            match(input,21,FOLLOW_2); 
              after(grammarAccess.getNativeRuleAccess().getLeftCurlyBracketKeyword_9()); 
 
             }
@@ -3743,21 +3743,21 @@ public final void rule__NativeRule__Group__9__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__NativeRule__Group__10"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1383:1: rule__NativeRule__Group__10 : rule__NativeRule__Group__10__Impl rule__NativeRule__Group__11 ;
+    // InternalValid.g:1383:1: rule__NativeRule__Group__10 : rule__NativeRule__Group__10__Impl rule__NativeRule__Group__11 ;
     public final void rule__NativeRule__Group__10() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1387:1: ( rule__NativeRule__Group__10__Impl rule__NativeRule__Group__11 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1388:2: rule__NativeRule__Group__10__Impl rule__NativeRule__Group__11
+            // InternalValid.g:1387:1: ( rule__NativeRule__Group__10__Impl rule__NativeRule__Group__11 )
+            // InternalValid.g:1388:2: rule__NativeRule__Group__10__Impl rule__NativeRule__Group__11
             {
-            pushFollow(FOLLOW_rule__NativeRule__Group__10__Impl_in_rule__NativeRule__Group__102807);
+            pushFollow(FOLLOW_16);
             rule__NativeRule__Group__10__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__NativeRule__Group__11_in_rule__NativeRule__Group__102810);
+            pushFollow(FOLLOW_2);
             rule__NativeRule__Group__11();
 
             state._fsp--;
@@ -3781,26 +3781,26 @@ public final void rule__NativeRule__Group__10() throws RecognitionException {
 
 
     // $ANTLR start "rule__NativeRule__Group__10__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1395:1: rule__NativeRule__Group__10__Impl : ( ( ( rule__NativeRule__ContextsAssignment_10 ) ) ( ( rule__NativeRule__ContextsAssignment_10 )* ) ) ;
+    // InternalValid.g:1395:1: rule__NativeRule__Group__10__Impl : ( ( ( rule__NativeRule__ContextsAssignment_10 ) ) ( ( rule__NativeRule__ContextsAssignment_10 )* ) ) ;
     public final void rule__NativeRule__Group__10__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1399:1: ( ( ( ( rule__NativeRule__ContextsAssignment_10 ) ) ( ( rule__NativeRule__ContextsAssignment_10 )* ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1400:1: ( ( ( rule__NativeRule__ContextsAssignment_10 ) ) ( ( rule__NativeRule__ContextsAssignment_10 )* ) )
+            // InternalValid.g:1399:1: ( ( ( ( rule__NativeRule__ContextsAssignment_10 ) ) ( ( rule__NativeRule__ContextsAssignment_10 )* ) ) )
+            // InternalValid.g:1400:1: ( ( ( rule__NativeRule__ContextsAssignment_10 ) ) ( ( rule__NativeRule__ContextsAssignment_10 )* ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1400:1: ( ( ( rule__NativeRule__ContextsAssignment_10 ) ) ( ( rule__NativeRule__ContextsAssignment_10 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1401:1: ( ( rule__NativeRule__ContextsAssignment_10 ) ) ( ( rule__NativeRule__ContextsAssignment_10 )* )
+            // InternalValid.g:1400:1: ( ( ( rule__NativeRule__ContextsAssignment_10 ) ) ( ( rule__NativeRule__ContextsAssignment_10 )* ) )
+            // InternalValid.g:1401:1: ( ( rule__NativeRule__ContextsAssignment_10 ) ) ( ( rule__NativeRule__ContextsAssignment_10 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1401:1: ( ( rule__NativeRule__ContextsAssignment_10 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1402:1: ( rule__NativeRule__ContextsAssignment_10 )
+            // InternalValid.g:1401:1: ( ( rule__NativeRule__ContextsAssignment_10 ) )
+            // InternalValid.g:1402:1: ( rule__NativeRule__ContextsAssignment_10 )
             {
              before(grammarAccess.getNativeRuleAccess().getContextsAssignment_10()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1403:1: ( rule__NativeRule__ContextsAssignment_10 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1403:2: rule__NativeRule__ContextsAssignment_10
+            // InternalValid.g:1403:1: ( rule__NativeRule__ContextsAssignment_10 )
+            // InternalValid.g:1403:2: rule__NativeRule__ContextsAssignment_10
             {
-            pushFollow(FOLLOW_rule__NativeRule__ContextsAssignment_10_in_rule__NativeRule__Group__10__Impl2839);
+            pushFollow(FOLLOW_17);
             rule__NativeRule__ContextsAssignment_10();
 
             state._fsp--;
@@ -3812,11 +3812,11 @@ public final void rule__NativeRule__Group__10__Impl() throws RecognitionExceptio
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1406:1: ( ( rule__NativeRule__ContextsAssignment_10 )* )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1407:1: ( rule__NativeRule__ContextsAssignment_10 )*
+            // InternalValid.g:1406:1: ( ( rule__NativeRule__ContextsAssignment_10 )* )
+            // InternalValid.g:1407:1: ( rule__NativeRule__ContextsAssignment_10 )*
             {
              before(grammarAccess.getNativeRuleAccess().getContextsAssignment_10()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1408:1: ( rule__NativeRule__ContextsAssignment_10 )*
+            // InternalValid.g:1408:1: ( rule__NativeRule__ContextsAssignment_10 )*
             loop11:
             do {
                 int alt11=2;
@@ -3829,9 +3829,9 @@ public final void rule__NativeRule__Group__10__Impl() throws RecognitionExceptio
 
                 switch (alt11) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1408:2: rule__NativeRule__ContextsAssignment_10
+            	    // InternalValid.g:1408:2: rule__NativeRule__ContextsAssignment_10
             	    {
-            	    pushFollow(FOLLOW_rule__NativeRule__ContextsAssignment_10_in_rule__NativeRule__Group__10__Impl2851);
+            	    pushFollow(FOLLOW_17);
             	    rule__NativeRule__ContextsAssignment_10();
 
             	    state._fsp--;
@@ -3871,16 +3871,16 @@ public final void rule__NativeRule__Group__10__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__NativeRule__Group__11"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1419:1: rule__NativeRule__Group__11 : rule__NativeRule__Group__11__Impl ;
+    // InternalValid.g:1419:1: rule__NativeRule__Group__11 : rule__NativeRule__Group__11__Impl ;
     public final void rule__NativeRule__Group__11() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1423:1: ( rule__NativeRule__Group__11__Impl )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1424:2: rule__NativeRule__Group__11__Impl
+            // InternalValid.g:1423:1: ( rule__NativeRule__Group__11__Impl )
+            // InternalValid.g:1424:2: rule__NativeRule__Group__11__Impl
             {
-            pushFollow(FOLLOW_rule__NativeRule__Group__11__Impl_in_rule__NativeRule__Group__112884);
+            pushFollow(FOLLOW_2);
             rule__NativeRule__Group__11__Impl();
 
             state._fsp--;
@@ -3904,20 +3904,20 @@ public final void rule__NativeRule__Group__11() throws RecognitionException {
 
 
     // $ANTLR start "rule__NativeRule__Group__11__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1430:1: rule__NativeRule__Group__11__Impl : ( '}' ) ;
+    // InternalValid.g:1430:1: rule__NativeRule__Group__11__Impl : ( '}' ) ;
     public final void rule__NativeRule__Group__11__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1434:1: ( ( '}' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1435:1: ( '}' )
+            // InternalValid.g:1434:1: ( ( '}' ) )
+            // InternalValid.g:1435:1: ( '}' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1435:1: ( '}' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1436:1: '}'
+            // InternalValid.g:1435:1: ( '}' )
+            // InternalValid.g:1436:1: '}'
             {
              before(grammarAccess.getNativeRuleAccess().getRightCurlyBracketKeyword_11()); 
-            match(input,22,FOLLOW_22_in_rule__NativeRule__Group__11__Impl2912); 
+            match(input,22,FOLLOW_2); 
              after(grammarAccess.getNativeRuleAccess().getRightCurlyBracketKeyword_11()); 
 
             }
@@ -3941,21 +3941,21 @@ public final void rule__NativeRule__Group__11__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__NativeRule__Group_5__0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1473:1: rule__NativeRule__Group_5__0 : rule__NativeRule__Group_5__0__Impl rule__NativeRule__Group_5__1 ;
+    // InternalValid.g:1473:1: rule__NativeRule__Group_5__0 : rule__NativeRule__Group_5__0__Impl rule__NativeRule__Group_5__1 ;
     public final void rule__NativeRule__Group_5__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1477:1: ( rule__NativeRule__Group_5__0__Impl rule__NativeRule__Group_5__1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1478:2: rule__NativeRule__Group_5__0__Impl rule__NativeRule__Group_5__1
+            // InternalValid.g:1477:1: ( rule__NativeRule__Group_5__0__Impl rule__NativeRule__Group_5__1 )
+            // InternalValid.g:1478:2: rule__NativeRule__Group_5__0__Impl rule__NativeRule__Group_5__1
             {
-            pushFollow(FOLLOW_rule__NativeRule__Group_5__0__Impl_in_rule__NativeRule__Group_5__02967);
+            pushFollow(FOLLOW_6);
             rule__NativeRule__Group_5__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__NativeRule__Group_5__1_in_rule__NativeRule__Group_5__02970);
+            pushFollow(FOLLOW_2);
             rule__NativeRule__Group_5__1();
 
             state._fsp--;
@@ -3979,20 +3979,20 @@ public final void rule__NativeRule__Group_5__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__NativeRule__Group_5__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1485:1: rule__NativeRule__Group_5__0__Impl : ( 'description' ) ;
+    // InternalValid.g:1485:1: rule__NativeRule__Group_5__0__Impl : ( 'description' ) ;
     public final void rule__NativeRule__Group_5__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1489:1: ( ( 'description' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1490:1: ( 'description' )
+            // InternalValid.g:1489:1: ( ( 'description' ) )
+            // InternalValid.g:1490:1: ( 'description' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1490:1: ( 'description' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1491:1: 'description'
+            // InternalValid.g:1490:1: ( 'description' )
+            // InternalValid.g:1491:1: 'description'
             {
              before(grammarAccess.getNativeRuleAccess().getDescriptionKeyword_5_0()); 
-            match(input,23,FOLLOW_23_in_rule__NativeRule__Group_5__0__Impl2998); 
+            match(input,23,FOLLOW_2); 
              after(grammarAccess.getNativeRuleAccess().getDescriptionKeyword_5_0()); 
 
             }
@@ -4016,16 +4016,16 @@ public final void rule__NativeRule__Group_5__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__NativeRule__Group_5__1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1504:1: rule__NativeRule__Group_5__1 : rule__NativeRule__Group_5__1__Impl ;
+    // InternalValid.g:1504:1: rule__NativeRule__Group_5__1 : rule__NativeRule__Group_5__1__Impl ;
     public final void rule__NativeRule__Group_5__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1508:1: ( rule__NativeRule__Group_5__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1509:2: rule__NativeRule__Group_5__1__Impl
+            // InternalValid.g:1508:1: ( rule__NativeRule__Group_5__1__Impl )
+            // InternalValid.g:1509:2: rule__NativeRule__Group_5__1__Impl
             {
-            pushFollow(FOLLOW_rule__NativeRule__Group_5__1__Impl_in_rule__NativeRule__Group_5__13029);
+            pushFollow(FOLLOW_2);
             rule__NativeRule__Group_5__1__Impl();
 
             state._fsp--;
@@ -4049,23 +4049,23 @@ public final void rule__NativeRule__Group_5__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__NativeRule__Group_5__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1515:1: rule__NativeRule__Group_5__1__Impl : ( ( rule__NativeRule__DescriptionAssignment_5_1 ) ) ;
+    // InternalValid.g:1515:1: rule__NativeRule__Group_5__1__Impl : ( ( rule__NativeRule__DescriptionAssignment_5_1 ) ) ;
     public final void rule__NativeRule__Group_5__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1519:1: ( ( ( rule__NativeRule__DescriptionAssignment_5_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1520:1: ( ( rule__NativeRule__DescriptionAssignment_5_1 ) )
+            // InternalValid.g:1519:1: ( ( ( rule__NativeRule__DescriptionAssignment_5_1 ) ) )
+            // InternalValid.g:1520:1: ( ( rule__NativeRule__DescriptionAssignment_5_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1520:1: ( ( rule__NativeRule__DescriptionAssignment_5_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1521:1: ( rule__NativeRule__DescriptionAssignment_5_1 )
+            // InternalValid.g:1520:1: ( ( rule__NativeRule__DescriptionAssignment_5_1 ) )
+            // InternalValid.g:1521:1: ( rule__NativeRule__DescriptionAssignment_5_1 )
             {
              before(grammarAccess.getNativeRuleAccess().getDescriptionAssignment_5_1()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1522:1: ( rule__NativeRule__DescriptionAssignment_5_1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1522:2: rule__NativeRule__DescriptionAssignment_5_1
+            // InternalValid.g:1522:1: ( rule__NativeRule__DescriptionAssignment_5_1 )
+            // InternalValid.g:1522:2: rule__NativeRule__DescriptionAssignment_5_1
             {
-            pushFollow(FOLLOW_rule__NativeRule__DescriptionAssignment_5_1_in_rule__NativeRule__Group_5__1__Impl3056);
+            pushFollow(FOLLOW_2);
             rule__NativeRule__DescriptionAssignment_5_1();
 
             state._fsp--;
@@ -4096,21 +4096,21 @@ public final void rule__NativeRule__Group_5__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__SizeRule__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1536:1: rule__SizeRule__Group__0 : rule__SizeRule__Group__0__Impl rule__SizeRule__Group__1 ;
+    // InternalValid.g:1536:1: rule__SizeRule__Group__0 : rule__SizeRule__Group__0__Impl rule__SizeRule__Group__1 ;
     public final void rule__SizeRule__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1540:1: ( rule__SizeRule__Group__0__Impl rule__SizeRule__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1541:2: rule__SizeRule__Group__0__Impl rule__SizeRule__Group__1
+            // InternalValid.g:1540:1: ( rule__SizeRule__Group__0__Impl rule__SizeRule__Group__1 )
+            // InternalValid.g:1541:2: rule__SizeRule__Group__0__Impl rule__SizeRule__Group__1
             {
-            pushFollow(FOLLOW_rule__SizeRule__Group__0__Impl_in_rule__SizeRule__Group__03090);
+            pushFollow(FOLLOW_18);
             rule__SizeRule__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SizeRule__Group__1_in_rule__SizeRule__Group__03093);
+            pushFollow(FOLLOW_2);
             rule__SizeRule__Group__1();
 
             state._fsp--;
@@ -4134,23 +4134,23 @@ public final void rule__SizeRule__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__SizeRule__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1548:1: rule__SizeRule__Group__0__Impl : ( ( rule__SizeRule__UnorderedGroup_0 ) ) ;
+    // InternalValid.g:1548:1: rule__SizeRule__Group__0__Impl : ( ( rule__SizeRule__UnorderedGroup_0 ) ) ;
     public final void rule__SizeRule__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1552:1: ( ( ( rule__SizeRule__UnorderedGroup_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1553:1: ( ( rule__SizeRule__UnorderedGroup_0 ) )
+            // InternalValid.g:1552:1: ( ( ( rule__SizeRule__UnorderedGroup_0 ) ) )
+            // InternalValid.g:1553:1: ( ( rule__SizeRule__UnorderedGroup_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1553:1: ( ( rule__SizeRule__UnorderedGroup_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1554:1: ( rule__SizeRule__UnorderedGroup_0 )
+            // InternalValid.g:1553:1: ( ( rule__SizeRule__UnorderedGroup_0 ) )
+            // InternalValid.g:1554:1: ( rule__SizeRule__UnorderedGroup_0 )
             {
              before(grammarAccess.getSizeRuleAccess().getUnorderedGroup_0()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1555:1: ( rule__SizeRule__UnorderedGroup_0 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1555:2: rule__SizeRule__UnorderedGroup_0
+            // InternalValid.g:1555:1: ( rule__SizeRule__UnorderedGroup_0 )
+            // InternalValid.g:1555:2: rule__SizeRule__UnorderedGroup_0
             {
-            pushFollow(FOLLOW_rule__SizeRule__UnorderedGroup_0_in_rule__SizeRule__Group__0__Impl3120);
+            pushFollow(FOLLOW_2);
             rule__SizeRule__UnorderedGroup_0();
 
             state._fsp--;
@@ -4181,21 +4181,21 @@ public final void rule__SizeRule__Group__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__SizeRule__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1565:1: rule__SizeRule__Group__1 : rule__SizeRule__Group__1__Impl rule__SizeRule__Group__2 ;
+    // InternalValid.g:1565:1: rule__SizeRule__Group__1 : rule__SizeRule__Group__1__Impl rule__SizeRule__Group__2 ;
     public final void rule__SizeRule__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1569:1: ( rule__SizeRule__Group__1__Impl rule__SizeRule__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1570:2: rule__SizeRule__Group__1__Impl rule__SizeRule__Group__2
+            // InternalValid.g:1569:1: ( rule__SizeRule__Group__1__Impl rule__SizeRule__Group__2 )
+            // InternalValid.g:1570:2: rule__SizeRule__Group__1__Impl rule__SizeRule__Group__2
             {
-            pushFollow(FOLLOW_rule__SizeRule__Group__1__Impl_in_rule__SizeRule__Group__13150);
+            pushFollow(FOLLOW_12);
             rule__SizeRule__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SizeRule__Group__2_in_rule__SizeRule__Group__13153);
+            pushFollow(FOLLOW_2);
             rule__SizeRule__Group__2();
 
             state._fsp--;
@@ -4219,20 +4219,20 @@ public final void rule__SizeRule__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__SizeRule__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1577:1: rule__SizeRule__Group__1__Impl : ( 'size' ) ;
+    // InternalValid.g:1577:1: rule__SizeRule__Group__1__Impl : ( 'size' ) ;
     public final void rule__SizeRule__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1581:1: ( ( 'size' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1582:1: ( 'size' )
+            // InternalValid.g:1581:1: ( ( 'size' ) )
+            // InternalValid.g:1582:1: ( 'size' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1582:1: ( 'size' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1583:1: 'size'
+            // InternalValid.g:1582:1: ( 'size' )
+            // InternalValid.g:1583:1: 'size'
             {
              before(grammarAccess.getSizeRuleAccess().getSizeKeyword_1()); 
-            match(input,26,FOLLOW_26_in_rule__SizeRule__Group__1__Impl3181); 
+            match(input,26,FOLLOW_2); 
              after(grammarAccess.getSizeRuleAccess().getSizeKeyword_1()); 
 
             }
@@ -4256,21 +4256,21 @@ public final void rule__SizeRule__Group__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__SizeRule__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1596:1: rule__SizeRule__Group__2 : rule__SizeRule__Group__2__Impl rule__SizeRule__Group__3 ;
+    // InternalValid.g:1596:1: rule__SizeRule__Group__2 : rule__SizeRule__Group__2__Impl rule__SizeRule__Group__3 ;
     public final void rule__SizeRule__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1600:1: ( rule__SizeRule__Group__2__Impl rule__SizeRule__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1601:2: rule__SizeRule__Group__2__Impl rule__SizeRule__Group__3
+            // InternalValid.g:1600:1: ( rule__SizeRule__Group__2__Impl rule__SizeRule__Group__3 )
+            // InternalValid.g:1601:2: rule__SizeRule__Group__2__Impl rule__SizeRule__Group__3
             {
-            pushFollow(FOLLOW_rule__SizeRule__Group__2__Impl_in_rule__SizeRule__Group__23212);
+            pushFollow(FOLLOW_7);
             rule__SizeRule__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SizeRule__Group__3_in_rule__SizeRule__Group__23215);
+            pushFollow(FOLLOW_2);
             rule__SizeRule__Group__3();
 
             state._fsp--;
@@ -4294,23 +4294,23 @@ public final void rule__SizeRule__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__SizeRule__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1608:1: rule__SizeRule__Group__2__Impl : ( ( rule__SizeRule__SeverityAssignment_2 ) ) ;
+    // InternalValid.g:1608:1: rule__SizeRule__Group__2__Impl : ( ( rule__SizeRule__SeverityAssignment_2 ) ) ;
     public final void rule__SizeRule__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1612:1: ( ( ( rule__SizeRule__SeverityAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1613:1: ( ( rule__SizeRule__SeverityAssignment_2 ) )
+            // InternalValid.g:1612:1: ( ( ( rule__SizeRule__SeverityAssignment_2 ) ) )
+            // InternalValid.g:1613:1: ( ( rule__SizeRule__SeverityAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1613:1: ( ( rule__SizeRule__SeverityAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1614:1: ( rule__SizeRule__SeverityAssignment_2 )
+            // InternalValid.g:1613:1: ( ( rule__SizeRule__SeverityAssignment_2 ) )
+            // InternalValid.g:1614:1: ( rule__SizeRule__SeverityAssignment_2 )
             {
              before(grammarAccess.getSizeRuleAccess().getSeverityAssignment_2()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1615:1: ( rule__SizeRule__SeverityAssignment_2 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1615:2: rule__SizeRule__SeverityAssignment_2
+            // InternalValid.g:1615:1: ( rule__SizeRule__SeverityAssignment_2 )
+            // InternalValid.g:1615:2: rule__SizeRule__SeverityAssignment_2
             {
-            pushFollow(FOLLOW_rule__SizeRule__SeverityAssignment_2_in_rule__SizeRule__Group__2__Impl3242);
+            pushFollow(FOLLOW_2);
             rule__SizeRule__SeverityAssignment_2();
 
             state._fsp--;
@@ -4341,21 +4341,21 @@ public final void rule__SizeRule__Group__2__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__SizeRule__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1625:1: rule__SizeRule__Group__3 : rule__SizeRule__Group__3__Impl rule__SizeRule__Group__4 ;
+    // InternalValid.g:1625:1: rule__SizeRule__Group__3 : rule__SizeRule__Group__3__Impl rule__SizeRule__Group__4 ;
     public final void rule__SizeRule__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1629:1: ( rule__SizeRule__Group__3__Impl rule__SizeRule__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1630:2: rule__SizeRule__Group__3__Impl rule__SizeRule__Group__4
+            // InternalValid.g:1629:1: ( rule__SizeRule__Group__3__Impl rule__SizeRule__Group__4 )
+            // InternalValid.g:1630:2: rule__SizeRule__Group__3__Impl rule__SizeRule__Group__4
             {
-            pushFollow(FOLLOW_rule__SizeRule__Group__3__Impl_in_rule__SizeRule__Group__33272);
+            pushFollow(FOLLOW_8);
             rule__SizeRule__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SizeRule__Group__4_in_rule__SizeRule__Group__33275);
+            pushFollow(FOLLOW_2);
             rule__SizeRule__Group__4();
 
             state._fsp--;
@@ -4379,23 +4379,23 @@ public final void rule__SizeRule__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__SizeRule__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1637:1: rule__SizeRule__Group__3__Impl : ( ( rule__SizeRule__NameAssignment_3 ) ) ;
+    // InternalValid.g:1637:1: rule__SizeRule__Group__3__Impl : ( ( rule__SizeRule__NameAssignment_3 ) ) ;
     public final void rule__SizeRule__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1641:1: ( ( ( rule__SizeRule__NameAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1642:1: ( ( rule__SizeRule__NameAssignment_3 ) )
+            // InternalValid.g:1641:1: ( ( ( rule__SizeRule__NameAssignment_3 ) ) )
+            // InternalValid.g:1642:1: ( ( rule__SizeRule__NameAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1642:1: ( ( rule__SizeRule__NameAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1643:1: ( rule__SizeRule__NameAssignment_3 )
+            // InternalValid.g:1642:1: ( ( rule__SizeRule__NameAssignment_3 ) )
+            // InternalValid.g:1643:1: ( rule__SizeRule__NameAssignment_3 )
             {
              before(grammarAccess.getSizeRuleAccess().getNameAssignment_3()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1644:1: ( rule__SizeRule__NameAssignment_3 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1644:2: rule__SizeRule__NameAssignment_3
+            // InternalValid.g:1644:1: ( rule__SizeRule__NameAssignment_3 )
+            // InternalValid.g:1644:2: rule__SizeRule__NameAssignment_3
             {
-            pushFollow(FOLLOW_rule__SizeRule__NameAssignment_3_in_rule__SizeRule__Group__3__Impl3302);
+            pushFollow(FOLLOW_2);
             rule__SizeRule__NameAssignment_3();
 
             state._fsp--;
@@ -4426,21 +4426,21 @@ public final void rule__SizeRule__Group__3__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__SizeRule__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1654:1: rule__SizeRule__Group__4 : rule__SizeRule__Group__4__Impl rule__SizeRule__Group__5 ;
+    // InternalValid.g:1654:1: rule__SizeRule__Group__4 : rule__SizeRule__Group__4__Impl rule__SizeRule__Group__5 ;
     public final void rule__SizeRule__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1658:1: ( rule__SizeRule__Group__4__Impl rule__SizeRule__Group__5 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1659:2: rule__SizeRule__Group__4__Impl rule__SizeRule__Group__5
+            // InternalValid.g:1658:1: ( rule__SizeRule__Group__4__Impl rule__SizeRule__Group__5 )
+            // InternalValid.g:1659:2: rule__SizeRule__Group__4__Impl rule__SizeRule__Group__5
             {
-            pushFollow(FOLLOW_rule__SizeRule__Group__4__Impl_in_rule__SizeRule__Group__43332);
+            pushFollow(FOLLOW_6);
             rule__SizeRule__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SizeRule__Group__5_in_rule__SizeRule__Group__43335);
+            pushFollow(FOLLOW_2);
             rule__SizeRule__Group__5();
 
             state._fsp--;
@@ -4464,20 +4464,20 @@ public final void rule__SizeRule__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__SizeRule__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1666:1: rule__SizeRule__Group__4__Impl : ( 'label' ) ;
+    // InternalValid.g:1666:1: rule__SizeRule__Group__4__Impl : ( 'label' ) ;
     public final void rule__SizeRule__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1670:1: ( ( 'label' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1671:1: ( 'label' )
+            // InternalValid.g:1670:1: ( ( 'label' ) )
+            // InternalValid.g:1671:1: ( 'label' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1671:1: ( 'label' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1672:1: 'label'
+            // InternalValid.g:1671:1: ( 'label' )
+            // InternalValid.g:1672:1: 'label'
             {
              before(grammarAccess.getSizeRuleAccess().getLabelKeyword_4()); 
-            match(input,20,FOLLOW_20_in_rule__SizeRule__Group__4__Impl3363); 
+            match(input,20,FOLLOW_2); 
              after(grammarAccess.getSizeRuleAccess().getLabelKeyword_4()); 
 
             }
@@ -4501,21 +4501,21 @@ public final void rule__SizeRule__Group__4__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__SizeRule__Group__5"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1685:1: rule__SizeRule__Group__5 : rule__SizeRule__Group__5__Impl rule__SizeRule__Group__6 ;
+    // InternalValid.g:1685:1: rule__SizeRule__Group__5 : rule__SizeRule__Group__5__Impl rule__SizeRule__Group__6 ;
     public final void rule__SizeRule__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1689:1: ( rule__SizeRule__Group__5__Impl rule__SizeRule__Group__6 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1690:2: rule__SizeRule__Group__5__Impl rule__SizeRule__Group__6
+            // InternalValid.g:1689:1: ( rule__SizeRule__Group__5__Impl rule__SizeRule__Group__6 )
+            // InternalValid.g:1690:2: rule__SizeRule__Group__5__Impl rule__SizeRule__Group__6
             {
-            pushFollow(FOLLOW_rule__SizeRule__Group__5__Impl_in_rule__SizeRule__Group__53394);
+            pushFollow(FOLLOW_19);
             rule__SizeRule__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SizeRule__Group__6_in_rule__SizeRule__Group__53397);
+            pushFollow(FOLLOW_2);
             rule__SizeRule__Group__6();
 
             state._fsp--;
@@ -4539,23 +4539,23 @@ public final void rule__SizeRule__Group__5() throws RecognitionException {
 
 
     // $ANTLR start "rule__SizeRule__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1697:1: rule__SizeRule__Group__5__Impl : ( ( rule__SizeRule__LabelAssignment_5 ) ) ;
+    // InternalValid.g:1697:1: rule__SizeRule__Group__5__Impl : ( ( rule__SizeRule__LabelAssignment_5 ) ) ;
     public final void rule__SizeRule__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1701:1: ( ( ( rule__SizeRule__LabelAssignment_5 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1702:1: ( ( rule__SizeRule__LabelAssignment_5 ) )
+            // InternalValid.g:1701:1: ( ( ( rule__SizeRule__LabelAssignment_5 ) ) )
+            // InternalValid.g:1702:1: ( ( rule__SizeRule__LabelAssignment_5 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1702:1: ( ( rule__SizeRule__LabelAssignment_5 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1703:1: ( rule__SizeRule__LabelAssignment_5 )
+            // InternalValid.g:1702:1: ( ( rule__SizeRule__LabelAssignment_5 ) )
+            // InternalValid.g:1703:1: ( rule__SizeRule__LabelAssignment_5 )
             {
              before(grammarAccess.getSizeRuleAccess().getLabelAssignment_5()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1704:1: ( rule__SizeRule__LabelAssignment_5 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1704:2: rule__SizeRule__LabelAssignment_5
+            // InternalValid.g:1704:1: ( rule__SizeRule__LabelAssignment_5 )
+            // InternalValid.g:1704:2: rule__SizeRule__LabelAssignment_5
             {
-            pushFollow(FOLLOW_rule__SizeRule__LabelAssignment_5_in_rule__SizeRule__Group__5__Impl3424);
+            pushFollow(FOLLOW_2);
             rule__SizeRule__LabelAssignment_5();
 
             state._fsp--;
@@ -4586,21 +4586,21 @@ public final void rule__SizeRule__Group__5__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__SizeRule__Group__6"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1714:1: rule__SizeRule__Group__6 : rule__SizeRule__Group__6__Impl rule__SizeRule__Group__7 ;
+    // InternalValid.g:1714:1: rule__SizeRule__Group__6 : rule__SizeRule__Group__6__Impl rule__SizeRule__Group__7 ;
     public final void rule__SizeRule__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1718:1: ( rule__SizeRule__Group__6__Impl rule__SizeRule__Group__7 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1719:2: rule__SizeRule__Group__6__Impl rule__SizeRule__Group__7
+            // InternalValid.g:1718:1: ( rule__SizeRule__Group__6__Impl rule__SizeRule__Group__7 )
+            // InternalValid.g:1719:2: rule__SizeRule__Group__6__Impl rule__SizeRule__Group__7
             {
-            pushFollow(FOLLOW_rule__SizeRule__Group__6__Impl_in_rule__SizeRule__Group__63454);
+            pushFollow(FOLLOW_19);
             rule__SizeRule__Group__6__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SizeRule__Group__7_in_rule__SizeRule__Group__63457);
+            pushFollow(FOLLOW_2);
             rule__SizeRule__Group__7();
 
             state._fsp--;
@@ -4624,20 +4624,20 @@ public final void rule__SizeRule__Group__6() throws RecognitionException {
 
 
     // $ANTLR start "rule__SizeRule__Group__6__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1726:1: rule__SizeRule__Group__6__Impl : ( ( rule__SizeRule__Group_6__0 )? ) ;
+    // InternalValid.g:1726:1: rule__SizeRule__Group__6__Impl : ( ( rule__SizeRule__Group_6__0 )? ) ;
     public final void rule__SizeRule__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1730:1: ( ( ( rule__SizeRule__Group_6__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1731:1: ( ( rule__SizeRule__Group_6__0 )? )
+            // InternalValid.g:1730:1: ( ( ( rule__SizeRule__Group_6__0 )? ) )
+            // InternalValid.g:1731:1: ( ( rule__SizeRule__Group_6__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1731:1: ( ( rule__SizeRule__Group_6__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1732:1: ( rule__SizeRule__Group_6__0 )?
+            // InternalValid.g:1731:1: ( ( rule__SizeRule__Group_6__0 )? )
+            // InternalValid.g:1732:1: ( rule__SizeRule__Group_6__0 )?
             {
              before(grammarAccess.getSizeRuleAccess().getGroup_6()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1733:1: ( rule__SizeRule__Group_6__0 )?
+            // InternalValid.g:1733:1: ( rule__SizeRule__Group_6__0 )?
             int alt12=2;
             int LA12_0 = input.LA(1);
 
@@ -4646,9 +4646,9 @@ public final void rule__SizeRule__Group__6__Impl() throws RecognitionException {
             }
             switch (alt12) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1733:2: rule__SizeRule__Group_6__0
+                    // InternalValid.g:1733:2: rule__SizeRule__Group_6__0
                     {
-                    pushFollow(FOLLOW_rule__SizeRule__Group_6__0_in_rule__SizeRule__Group__6__Impl3484);
+                    pushFollow(FOLLOW_2);
                     rule__SizeRule__Group_6__0();
 
                     state._fsp--;
@@ -4682,21 +4682,21 @@ public final void rule__SizeRule__Group__6__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__SizeRule__Group__7"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1743:1: rule__SizeRule__Group__7 : rule__SizeRule__Group__7__Impl rule__SizeRule__Group__8 ;
+    // InternalValid.g:1743:1: rule__SizeRule__Group__7 : rule__SizeRule__Group__7__Impl rule__SizeRule__Group__8 ;
     public final void rule__SizeRule__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1747:1: ( rule__SizeRule__Group__7__Impl rule__SizeRule__Group__8 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1748:2: rule__SizeRule__Group__7__Impl rule__SizeRule__Group__8
+            // InternalValid.g:1747:1: ( rule__SizeRule__Group__7__Impl rule__SizeRule__Group__8 )
+            // InternalValid.g:1748:2: rule__SizeRule__Group__7__Impl rule__SizeRule__Group__8
             {
-            pushFollow(FOLLOW_rule__SizeRule__Group__7__Impl_in_rule__SizeRule__Group__73515);
+            pushFollow(FOLLOW_19);
             rule__SizeRule__Group__7__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SizeRule__Group__8_in_rule__SizeRule__Group__73518);
+            pushFollow(FOLLOW_2);
             rule__SizeRule__Group__8();
 
             state._fsp--;
@@ -4720,20 +4720,20 @@ public final void rule__SizeRule__Group__7() throws RecognitionException {
 
 
     // $ANTLR start "rule__SizeRule__Group__7__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1755:1: rule__SizeRule__Group__7__Impl : ( ( rule__SizeRule__Group_7__0 )? ) ;
+    // InternalValid.g:1755:1: rule__SizeRule__Group__7__Impl : ( ( rule__SizeRule__Group_7__0 )? ) ;
     public final void rule__SizeRule__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1759:1: ( ( ( rule__SizeRule__Group_7__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1760:1: ( ( rule__SizeRule__Group_7__0 )? )
+            // InternalValid.g:1759:1: ( ( ( rule__SizeRule__Group_7__0 )? ) )
+            // InternalValid.g:1760:1: ( ( rule__SizeRule__Group_7__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1760:1: ( ( rule__SizeRule__Group_7__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1761:1: ( rule__SizeRule__Group_7__0 )?
+            // InternalValid.g:1760:1: ( ( rule__SizeRule__Group_7__0 )? )
+            // InternalValid.g:1761:1: ( rule__SizeRule__Group_7__0 )?
             {
              before(grammarAccess.getSizeRuleAccess().getGroup_7()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1762:1: ( rule__SizeRule__Group_7__0 )?
+            // InternalValid.g:1762:1: ( rule__SizeRule__Group_7__0 )?
             int alt13=2;
             int LA13_0 = input.LA(1);
 
@@ -4742,9 +4742,9 @@ public final void rule__SizeRule__Group__7__Impl() throws RecognitionException {
             }
             switch (alt13) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1762:2: rule__SizeRule__Group_7__0
+                    // InternalValid.g:1762:2: rule__SizeRule__Group_7__0
                     {
-                    pushFollow(FOLLOW_rule__SizeRule__Group_7__0_in_rule__SizeRule__Group__7__Impl3545);
+                    pushFollow(FOLLOW_2);
                     rule__SizeRule__Group_7__0();
 
                     state._fsp--;
@@ -4778,21 +4778,21 @@ public final void rule__SizeRule__Group__7__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__SizeRule__Group__8"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1772:1: rule__SizeRule__Group__8 : rule__SizeRule__Group__8__Impl rule__SizeRule__Group__9 ;
+    // InternalValid.g:1772:1: rule__SizeRule__Group__8 : rule__SizeRule__Group__8__Impl rule__SizeRule__Group__9 ;
     public final void rule__SizeRule__Group__8() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1776:1: ( rule__SizeRule__Group__8__Impl rule__SizeRule__Group__9 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1777:2: rule__SizeRule__Group__8__Impl rule__SizeRule__Group__9
+            // InternalValid.g:1776:1: ( rule__SizeRule__Group__8__Impl rule__SizeRule__Group__9 )
+            // InternalValid.g:1777:2: rule__SizeRule__Group__8__Impl rule__SizeRule__Group__9
             {
-            pushFollow(FOLLOW_rule__SizeRule__Group__8__Impl_in_rule__SizeRule__Group__83576);
+            pushFollow(FOLLOW_20);
             rule__SizeRule__Group__8__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SizeRule__Group__9_in_rule__SizeRule__Group__83579);
+            pushFollow(FOLLOW_2);
             rule__SizeRule__Group__9();
 
             state._fsp--;
@@ -4816,20 +4816,20 @@ public final void rule__SizeRule__Group__8() throws RecognitionException {
 
 
     // $ANTLR start "rule__SizeRule__Group__8__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1784:1: rule__SizeRule__Group__8__Impl : ( 'size' ) ;
+    // InternalValid.g:1784:1: rule__SizeRule__Group__8__Impl : ( 'size' ) ;
     public final void rule__SizeRule__Group__8__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1788:1: ( ( 'size' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1789:1: ( 'size' )
+            // InternalValid.g:1788:1: ( ( 'size' ) )
+            // InternalValid.g:1789:1: ( 'size' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1789:1: ( 'size' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1790:1: 'size'
+            // InternalValid.g:1789:1: ( 'size' )
+            // InternalValid.g:1790:1: 'size'
             {
              before(grammarAccess.getSizeRuleAccess().getSizeKeyword_8()); 
-            match(input,26,FOLLOW_26_in_rule__SizeRule__Group__8__Impl3607); 
+            match(input,26,FOLLOW_2); 
              after(grammarAccess.getSizeRuleAccess().getSizeKeyword_8()); 
 
             }
@@ -4853,21 +4853,21 @@ public final void rule__SizeRule__Group__8__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__SizeRule__Group__9"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1803:1: rule__SizeRule__Group__9 : rule__SizeRule__Group__9__Impl rule__SizeRule__Group__10 ;
+    // InternalValid.g:1803:1: rule__SizeRule__Group__9 : rule__SizeRule__Group__9__Impl rule__SizeRule__Group__10 ;
     public final void rule__SizeRule__Group__9() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1807:1: ( rule__SizeRule__Group__9__Impl rule__SizeRule__Group__10 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1808:2: rule__SizeRule__Group__9__Impl rule__SizeRule__Group__10
+            // InternalValid.g:1807:1: ( rule__SizeRule__Group__9__Impl rule__SizeRule__Group__10 )
+            // InternalValid.g:1808:2: rule__SizeRule__Group__9__Impl rule__SizeRule__Group__10
             {
-            pushFollow(FOLLOW_rule__SizeRule__Group__9__Impl_in_rule__SizeRule__Group__93638);
+            pushFollow(FOLLOW_20);
             rule__SizeRule__Group__9__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SizeRule__Group__10_in_rule__SizeRule__Group__93641);
+            pushFollow(FOLLOW_2);
             rule__SizeRule__Group__10();
 
             state._fsp--;
@@ -4891,20 +4891,20 @@ public final void rule__SizeRule__Group__9() throws RecognitionException {
 
 
     // $ANTLR start "rule__SizeRule__Group__9__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1815:1: rule__SizeRule__Group__9__Impl : ( ( rule__SizeRule__Group_9__0 )? ) ;
+    // InternalValid.g:1815:1: rule__SizeRule__Group__9__Impl : ( ( rule__SizeRule__Group_9__0 )? ) ;
     public final void rule__SizeRule__Group__9__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1819:1: ( ( ( rule__SizeRule__Group_9__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1820:1: ( ( rule__SizeRule__Group_9__0 )? )
+            // InternalValid.g:1819:1: ( ( ( rule__SizeRule__Group_9__0 )? ) )
+            // InternalValid.g:1820:1: ( ( rule__SizeRule__Group_9__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1820:1: ( ( rule__SizeRule__Group_9__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1821:1: ( rule__SizeRule__Group_9__0 )?
+            // InternalValid.g:1820:1: ( ( rule__SizeRule__Group_9__0 )? )
+            // InternalValid.g:1821:1: ( rule__SizeRule__Group_9__0 )?
             {
              before(grammarAccess.getSizeRuleAccess().getGroup_9()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1822:1: ( rule__SizeRule__Group_9__0 )?
+            // InternalValid.g:1822:1: ( rule__SizeRule__Group_9__0 )?
             int alt14=2;
             int LA14_0 = input.LA(1);
 
@@ -4917,9 +4917,9 @@ public final void rule__SizeRule__Group__9__Impl() throws RecognitionException {
             }
             switch (alt14) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1822:2: rule__SizeRule__Group_9__0
+                    // InternalValid.g:1822:2: rule__SizeRule__Group_9__0
                     {
-                    pushFollow(FOLLOW_rule__SizeRule__Group_9__0_in_rule__SizeRule__Group__9__Impl3668);
+                    pushFollow(FOLLOW_2);
                     rule__SizeRule__Group_9__0();
 
                     state._fsp--;
@@ -4953,21 +4953,21 @@ public final void rule__SizeRule__Group__9__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__SizeRule__Group__10"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1832:1: rule__SizeRule__Group__10 : rule__SizeRule__Group__10__Impl rule__SizeRule__Group__11 ;
+    // InternalValid.g:1832:1: rule__SizeRule__Group__10 : rule__SizeRule__Group__10__Impl rule__SizeRule__Group__11 ;
     public final void rule__SizeRule__Group__10() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1836:1: ( rule__SizeRule__Group__10__Impl rule__SizeRule__Group__11 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1837:2: rule__SizeRule__Group__10__Impl rule__SizeRule__Group__11
+            // InternalValid.g:1836:1: ( rule__SizeRule__Group__10__Impl rule__SizeRule__Group__11 )
+            // InternalValid.g:1837:2: rule__SizeRule__Group__10__Impl rule__SizeRule__Group__11
             {
-            pushFollow(FOLLOW_rule__SizeRule__Group__10__Impl_in_rule__SizeRule__Group__103699);
+            pushFollow(FOLLOW_14);
             rule__SizeRule__Group__10__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SizeRule__Group__11_in_rule__SizeRule__Group__103702);
+            pushFollow(FOLLOW_2);
             rule__SizeRule__Group__11();
 
             state._fsp--;
@@ -4991,23 +4991,23 @@ public final void rule__SizeRule__Group__10() throws RecognitionException {
 
 
     // $ANTLR start "rule__SizeRule__Group__10__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1844:1: rule__SizeRule__Group__10__Impl : ( ( rule__SizeRule__MaxAssignment_10 ) ) ;
+    // InternalValid.g:1844:1: rule__SizeRule__Group__10__Impl : ( ( rule__SizeRule__MaxAssignment_10 ) ) ;
     public final void rule__SizeRule__Group__10__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1848:1: ( ( ( rule__SizeRule__MaxAssignment_10 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1849:1: ( ( rule__SizeRule__MaxAssignment_10 ) )
+            // InternalValid.g:1848:1: ( ( ( rule__SizeRule__MaxAssignment_10 ) ) )
+            // InternalValid.g:1849:1: ( ( rule__SizeRule__MaxAssignment_10 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1849:1: ( ( rule__SizeRule__MaxAssignment_10 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1850:1: ( rule__SizeRule__MaxAssignment_10 )
+            // InternalValid.g:1849:1: ( ( rule__SizeRule__MaxAssignment_10 ) )
+            // InternalValid.g:1850:1: ( rule__SizeRule__MaxAssignment_10 )
             {
              before(grammarAccess.getSizeRuleAccess().getMaxAssignment_10()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1851:1: ( rule__SizeRule__MaxAssignment_10 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1851:2: rule__SizeRule__MaxAssignment_10
+            // InternalValid.g:1851:1: ( rule__SizeRule__MaxAssignment_10 )
+            // InternalValid.g:1851:2: rule__SizeRule__MaxAssignment_10
             {
-            pushFollow(FOLLOW_rule__SizeRule__MaxAssignment_10_in_rule__SizeRule__Group__10__Impl3729);
+            pushFollow(FOLLOW_2);
             rule__SizeRule__MaxAssignment_10();
 
             state._fsp--;
@@ -5038,21 +5038,21 @@ public final void rule__SizeRule__Group__10__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__SizeRule__Group__11"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1861:1: rule__SizeRule__Group__11 : rule__SizeRule__Group__11__Impl rule__SizeRule__Group__12 ;
+    // InternalValid.g:1861:1: rule__SizeRule__Group__11 : rule__SizeRule__Group__11__Impl rule__SizeRule__Group__12 ;
     public final void rule__SizeRule__Group__11() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1865:1: ( rule__SizeRule__Group__11__Impl rule__SizeRule__Group__12 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1866:2: rule__SizeRule__Group__11__Impl rule__SizeRule__Group__12
+            // InternalValid.g:1865:1: ( rule__SizeRule__Group__11__Impl rule__SizeRule__Group__12 )
+            // InternalValid.g:1866:2: rule__SizeRule__Group__11__Impl rule__SizeRule__Group__12
             {
-            pushFollow(FOLLOW_rule__SizeRule__Group__11__Impl_in_rule__SizeRule__Group__113759);
+            pushFollow(FOLLOW_15);
             rule__SizeRule__Group__11__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SizeRule__Group__12_in_rule__SizeRule__Group__113762);
+            pushFollow(FOLLOW_2);
             rule__SizeRule__Group__12();
 
             state._fsp--;
@@ -5076,20 +5076,20 @@ public final void rule__SizeRule__Group__11() throws RecognitionException {
 
 
     // $ANTLR start "rule__SizeRule__Group__11__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1873:1: rule__SizeRule__Group__11__Impl : ( 'context' ) ;
+    // InternalValid.g:1873:1: rule__SizeRule__Group__11__Impl : ( 'context' ) ;
     public final void rule__SizeRule__Group__11__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1877:1: ( ( 'context' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1878:1: ( 'context' )
+            // InternalValid.g:1877:1: ( ( 'context' ) )
+            // InternalValid.g:1878:1: ( 'context' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1878:1: ( 'context' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1879:1: 'context'
+            // InternalValid.g:1878:1: ( 'context' )
+            // InternalValid.g:1879:1: 'context'
             {
              before(grammarAccess.getSizeRuleAccess().getContextKeyword_11()); 
-            match(input,25,FOLLOW_25_in_rule__SizeRule__Group__11__Impl3790); 
+            match(input,25,FOLLOW_2); 
              after(grammarAccess.getSizeRuleAccess().getContextKeyword_11()); 
 
             }
@@ -5113,21 +5113,21 @@ public final void rule__SizeRule__Group__11__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__SizeRule__Group__12"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1892:1: rule__SizeRule__Group__12 : rule__SizeRule__Group__12__Impl rule__SizeRule__Group__13 ;
+    // InternalValid.g:1892:1: rule__SizeRule__Group__12 : rule__SizeRule__Group__12__Impl rule__SizeRule__Group__13 ;
     public final void rule__SizeRule__Group__12() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1896:1: ( rule__SizeRule__Group__12__Impl rule__SizeRule__Group__13 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1897:2: rule__SizeRule__Group__12__Impl rule__SizeRule__Group__13
+            // InternalValid.g:1896:1: ( rule__SizeRule__Group__12__Impl rule__SizeRule__Group__13 )
+            // InternalValid.g:1897:2: rule__SizeRule__Group__12__Impl rule__SizeRule__Group__13
             {
-            pushFollow(FOLLOW_rule__SizeRule__Group__12__Impl_in_rule__SizeRule__Group__123821);
+            pushFollow(FOLLOW_7);
             rule__SizeRule__Group__12__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SizeRule__Group__13_in_rule__SizeRule__Group__123824);
+            pushFollow(FOLLOW_2);
             rule__SizeRule__Group__13();
 
             state._fsp--;
@@ -5151,20 +5151,20 @@ public final void rule__SizeRule__Group__12() throws RecognitionException {
 
 
     // $ANTLR start "rule__SizeRule__Group__12__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1904:1: rule__SizeRule__Group__12__Impl : ( '{' ) ;
+    // InternalValid.g:1904:1: rule__SizeRule__Group__12__Impl : ( '{' ) ;
     public final void rule__SizeRule__Group__12__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1908:1: ( ( '{' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1909:1: ( '{' )
+            // InternalValid.g:1908:1: ( ( '{' ) )
+            // InternalValid.g:1909:1: ( '{' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1909:1: ( '{' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1910:1: '{'
+            // InternalValid.g:1909:1: ( '{' )
+            // InternalValid.g:1910:1: '{'
             {
              before(grammarAccess.getSizeRuleAccess().getLeftCurlyBracketKeyword_12()); 
-            match(input,21,FOLLOW_21_in_rule__SizeRule__Group__12__Impl3852); 
+            match(input,21,FOLLOW_2); 
              after(grammarAccess.getSizeRuleAccess().getLeftCurlyBracketKeyword_12()); 
 
             }
@@ -5188,21 +5188,21 @@ public final void rule__SizeRule__Group__12__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__SizeRule__Group__13"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1923:1: rule__SizeRule__Group__13 : rule__SizeRule__Group__13__Impl rule__SizeRule__Group__14 ;
+    // InternalValid.g:1923:1: rule__SizeRule__Group__13 : rule__SizeRule__Group__13__Impl rule__SizeRule__Group__14 ;
     public final void rule__SizeRule__Group__13() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1927:1: ( rule__SizeRule__Group__13__Impl rule__SizeRule__Group__14 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1928:2: rule__SizeRule__Group__13__Impl rule__SizeRule__Group__14
+            // InternalValid.g:1927:1: ( rule__SizeRule__Group__13__Impl rule__SizeRule__Group__14 )
+            // InternalValid.g:1928:2: rule__SizeRule__Group__13__Impl rule__SizeRule__Group__14
             {
-            pushFollow(FOLLOW_rule__SizeRule__Group__13__Impl_in_rule__SizeRule__Group__133883);
+            pushFollow(FOLLOW_16);
             rule__SizeRule__Group__13__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SizeRule__Group__14_in_rule__SizeRule__Group__133886);
+            pushFollow(FOLLOW_2);
             rule__SizeRule__Group__14();
 
             state._fsp--;
@@ -5226,26 +5226,26 @@ public final void rule__SizeRule__Group__13() throws RecognitionException {
 
 
     // $ANTLR start "rule__SizeRule__Group__13__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1935:1: rule__SizeRule__Group__13__Impl : ( ( ( rule__SizeRule__ContextsAssignment_13 ) ) ( ( rule__SizeRule__ContextsAssignment_13 )* ) ) ;
+    // InternalValid.g:1935:1: rule__SizeRule__Group__13__Impl : ( ( ( rule__SizeRule__ContextsAssignment_13 ) ) ( ( rule__SizeRule__ContextsAssignment_13 )* ) ) ;
     public final void rule__SizeRule__Group__13__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1939:1: ( ( ( ( rule__SizeRule__ContextsAssignment_13 ) ) ( ( rule__SizeRule__ContextsAssignment_13 )* ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1940:1: ( ( ( rule__SizeRule__ContextsAssignment_13 ) ) ( ( rule__SizeRule__ContextsAssignment_13 )* ) )
+            // InternalValid.g:1939:1: ( ( ( ( rule__SizeRule__ContextsAssignment_13 ) ) ( ( rule__SizeRule__ContextsAssignment_13 )* ) ) )
+            // InternalValid.g:1940:1: ( ( ( rule__SizeRule__ContextsAssignment_13 ) ) ( ( rule__SizeRule__ContextsAssignment_13 )* ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1940:1: ( ( ( rule__SizeRule__ContextsAssignment_13 ) ) ( ( rule__SizeRule__ContextsAssignment_13 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1941:1: ( ( rule__SizeRule__ContextsAssignment_13 ) ) ( ( rule__SizeRule__ContextsAssignment_13 )* )
+            // InternalValid.g:1940:1: ( ( ( rule__SizeRule__ContextsAssignment_13 ) ) ( ( rule__SizeRule__ContextsAssignment_13 )* ) )
+            // InternalValid.g:1941:1: ( ( rule__SizeRule__ContextsAssignment_13 ) ) ( ( rule__SizeRule__ContextsAssignment_13 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1941:1: ( ( rule__SizeRule__ContextsAssignment_13 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1942:1: ( rule__SizeRule__ContextsAssignment_13 )
+            // InternalValid.g:1941:1: ( ( rule__SizeRule__ContextsAssignment_13 ) )
+            // InternalValid.g:1942:1: ( rule__SizeRule__ContextsAssignment_13 )
             {
              before(grammarAccess.getSizeRuleAccess().getContextsAssignment_13()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1943:1: ( rule__SizeRule__ContextsAssignment_13 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1943:2: rule__SizeRule__ContextsAssignment_13
+            // InternalValid.g:1943:1: ( rule__SizeRule__ContextsAssignment_13 )
+            // InternalValid.g:1943:2: rule__SizeRule__ContextsAssignment_13
             {
-            pushFollow(FOLLOW_rule__SizeRule__ContextsAssignment_13_in_rule__SizeRule__Group__13__Impl3915);
+            pushFollow(FOLLOW_17);
             rule__SizeRule__ContextsAssignment_13();
 
             state._fsp--;
@@ -5257,11 +5257,11 @@ public final void rule__SizeRule__Group__13__Impl() throws RecognitionException
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1946:1: ( ( rule__SizeRule__ContextsAssignment_13 )* )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1947:1: ( rule__SizeRule__ContextsAssignment_13 )*
+            // InternalValid.g:1946:1: ( ( rule__SizeRule__ContextsAssignment_13 )* )
+            // InternalValid.g:1947:1: ( rule__SizeRule__ContextsAssignment_13 )*
             {
              before(grammarAccess.getSizeRuleAccess().getContextsAssignment_13()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1948:1: ( rule__SizeRule__ContextsAssignment_13 )*
+            // InternalValid.g:1948:1: ( rule__SizeRule__ContextsAssignment_13 )*
             loop15:
             do {
                 int alt15=2;
@@ -5274,9 +5274,9 @@ public final void rule__SizeRule__Group__13__Impl() throws RecognitionException
 
                 switch (alt15) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1948:2: rule__SizeRule__ContextsAssignment_13
+            	    // InternalValid.g:1948:2: rule__SizeRule__ContextsAssignment_13
             	    {
-            	    pushFollow(FOLLOW_rule__SizeRule__ContextsAssignment_13_in_rule__SizeRule__Group__13__Impl3927);
+            	    pushFollow(FOLLOW_17);
             	    rule__SizeRule__ContextsAssignment_13();
 
             	    state._fsp--;
@@ -5316,16 +5316,16 @@ public final void rule__SizeRule__Group__13__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__SizeRule__Group__14"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1959:1: rule__SizeRule__Group__14 : rule__SizeRule__Group__14__Impl ;
+    // InternalValid.g:1959:1: rule__SizeRule__Group__14 : rule__SizeRule__Group__14__Impl ;
     public final void rule__SizeRule__Group__14() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1963:1: ( rule__SizeRule__Group__14__Impl )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1964:2: rule__SizeRule__Group__14__Impl
+            // InternalValid.g:1963:1: ( rule__SizeRule__Group__14__Impl )
+            // InternalValid.g:1964:2: rule__SizeRule__Group__14__Impl
             {
-            pushFollow(FOLLOW_rule__SizeRule__Group__14__Impl_in_rule__SizeRule__Group__143960);
+            pushFollow(FOLLOW_2);
             rule__SizeRule__Group__14__Impl();
 
             state._fsp--;
@@ -5349,20 +5349,20 @@ public final void rule__SizeRule__Group__14() throws RecognitionException {
 
 
     // $ANTLR start "rule__SizeRule__Group__14__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1970:1: rule__SizeRule__Group__14__Impl : ( '}' ) ;
+    // InternalValid.g:1970:1: rule__SizeRule__Group__14__Impl : ( '}' ) ;
     public final void rule__SizeRule__Group__14__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1974:1: ( ( '}' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1975:1: ( '}' )
+            // InternalValid.g:1974:1: ( ( '}' ) )
+            // InternalValid.g:1975:1: ( '}' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1975:1: ( '}' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:1976:1: '}'
+            // InternalValid.g:1975:1: ( '}' )
+            // InternalValid.g:1976:1: '}'
             {
              before(grammarAccess.getSizeRuleAccess().getRightCurlyBracketKeyword_14()); 
-            match(input,22,FOLLOW_22_in_rule__SizeRule__Group__14__Impl3988); 
+            match(input,22,FOLLOW_2); 
              after(grammarAccess.getSizeRuleAccess().getRightCurlyBracketKeyword_14()); 
 
             }
@@ -5386,21 +5386,21 @@ public final void rule__SizeRule__Group__14__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__SizeRule__Group_6__0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2019:1: rule__SizeRule__Group_6__0 : rule__SizeRule__Group_6__0__Impl rule__SizeRule__Group_6__1 ;
+    // InternalValid.g:2019:1: rule__SizeRule__Group_6__0 : rule__SizeRule__Group_6__0__Impl rule__SizeRule__Group_6__1 ;
     public final void rule__SizeRule__Group_6__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2023:1: ( rule__SizeRule__Group_6__0__Impl rule__SizeRule__Group_6__1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2024:2: rule__SizeRule__Group_6__0__Impl rule__SizeRule__Group_6__1
+            // InternalValid.g:2023:1: ( rule__SizeRule__Group_6__0__Impl rule__SizeRule__Group_6__1 )
+            // InternalValid.g:2024:2: rule__SizeRule__Group_6__0__Impl rule__SizeRule__Group_6__1
             {
-            pushFollow(FOLLOW_rule__SizeRule__Group_6__0__Impl_in_rule__SizeRule__Group_6__04049);
+            pushFollow(FOLLOW_6);
             rule__SizeRule__Group_6__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SizeRule__Group_6__1_in_rule__SizeRule__Group_6__04052);
+            pushFollow(FOLLOW_2);
             rule__SizeRule__Group_6__1();
 
             state._fsp--;
@@ -5424,20 +5424,20 @@ public final void rule__SizeRule__Group_6__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__SizeRule__Group_6__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2031:1: rule__SizeRule__Group_6__0__Impl : ( 'description' ) ;
+    // InternalValid.g:2031:1: rule__SizeRule__Group_6__0__Impl : ( 'description' ) ;
     public final void rule__SizeRule__Group_6__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2035:1: ( ( 'description' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2036:1: ( 'description' )
+            // InternalValid.g:2035:1: ( ( 'description' ) )
+            // InternalValid.g:2036:1: ( 'description' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2036:1: ( 'description' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2037:1: 'description'
+            // InternalValid.g:2036:1: ( 'description' )
+            // InternalValid.g:2037:1: 'description'
             {
              before(grammarAccess.getSizeRuleAccess().getDescriptionKeyword_6_0()); 
-            match(input,23,FOLLOW_23_in_rule__SizeRule__Group_6__0__Impl4080); 
+            match(input,23,FOLLOW_2); 
              after(grammarAccess.getSizeRuleAccess().getDescriptionKeyword_6_0()); 
 
             }
@@ -5461,16 +5461,16 @@ public final void rule__SizeRule__Group_6__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__SizeRule__Group_6__1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2050:1: rule__SizeRule__Group_6__1 : rule__SizeRule__Group_6__1__Impl ;
+    // InternalValid.g:2050:1: rule__SizeRule__Group_6__1 : rule__SizeRule__Group_6__1__Impl ;
     public final void rule__SizeRule__Group_6__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2054:1: ( rule__SizeRule__Group_6__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2055:2: rule__SizeRule__Group_6__1__Impl
+            // InternalValid.g:2054:1: ( rule__SizeRule__Group_6__1__Impl )
+            // InternalValid.g:2055:2: rule__SizeRule__Group_6__1__Impl
             {
-            pushFollow(FOLLOW_rule__SizeRule__Group_6__1__Impl_in_rule__SizeRule__Group_6__14111);
+            pushFollow(FOLLOW_2);
             rule__SizeRule__Group_6__1__Impl();
 
             state._fsp--;
@@ -5494,23 +5494,23 @@ public final void rule__SizeRule__Group_6__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__SizeRule__Group_6__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2061:1: rule__SizeRule__Group_6__1__Impl : ( ( rule__SizeRule__DescriptionAssignment_6_1 ) ) ;
+    // InternalValid.g:2061:1: rule__SizeRule__Group_6__1__Impl : ( ( rule__SizeRule__DescriptionAssignment_6_1 ) ) ;
     public final void rule__SizeRule__Group_6__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2065:1: ( ( ( rule__SizeRule__DescriptionAssignment_6_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2066:1: ( ( rule__SizeRule__DescriptionAssignment_6_1 ) )
+            // InternalValid.g:2065:1: ( ( ( rule__SizeRule__DescriptionAssignment_6_1 ) ) )
+            // InternalValid.g:2066:1: ( ( rule__SizeRule__DescriptionAssignment_6_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2066:1: ( ( rule__SizeRule__DescriptionAssignment_6_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2067:1: ( rule__SizeRule__DescriptionAssignment_6_1 )
+            // InternalValid.g:2066:1: ( ( rule__SizeRule__DescriptionAssignment_6_1 ) )
+            // InternalValid.g:2067:1: ( rule__SizeRule__DescriptionAssignment_6_1 )
             {
              before(grammarAccess.getSizeRuleAccess().getDescriptionAssignment_6_1()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2068:1: ( rule__SizeRule__DescriptionAssignment_6_1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2068:2: rule__SizeRule__DescriptionAssignment_6_1
+            // InternalValid.g:2068:1: ( rule__SizeRule__DescriptionAssignment_6_1 )
+            // InternalValid.g:2068:2: rule__SizeRule__DescriptionAssignment_6_1
             {
-            pushFollow(FOLLOW_rule__SizeRule__DescriptionAssignment_6_1_in_rule__SizeRule__Group_6__1__Impl4138);
+            pushFollow(FOLLOW_2);
             rule__SizeRule__DescriptionAssignment_6_1();
 
             state._fsp--;
@@ -5541,21 +5541,21 @@ public final void rule__SizeRule__Group_6__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__SizeRule__Group_7__0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2082:1: rule__SizeRule__Group_7__0 : rule__SizeRule__Group_7__0__Impl rule__SizeRule__Group_7__1 ;
+    // InternalValid.g:2082:1: rule__SizeRule__Group_7__0 : rule__SizeRule__Group_7__0__Impl rule__SizeRule__Group_7__1 ;
     public final void rule__SizeRule__Group_7__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2086:1: ( rule__SizeRule__Group_7__0__Impl rule__SizeRule__Group_7__1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2087:2: rule__SizeRule__Group_7__0__Impl rule__SizeRule__Group_7__1
+            // InternalValid.g:2086:1: ( rule__SizeRule__Group_7__0__Impl rule__SizeRule__Group_7__1 )
+            // InternalValid.g:2087:2: rule__SizeRule__Group_7__0__Impl rule__SizeRule__Group_7__1
             {
-            pushFollow(FOLLOW_rule__SizeRule__Group_7__0__Impl_in_rule__SizeRule__Group_7__04172);
+            pushFollow(FOLLOW_6);
             rule__SizeRule__Group_7__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SizeRule__Group_7__1_in_rule__SizeRule__Group_7__04175);
+            pushFollow(FOLLOW_2);
             rule__SizeRule__Group_7__1();
 
             state._fsp--;
@@ -5579,20 +5579,20 @@ public final void rule__SizeRule__Group_7__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__SizeRule__Group_7__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2094:1: rule__SizeRule__Group_7__0__Impl : ( 'message' ) ;
+    // InternalValid.g:2094:1: rule__SizeRule__Group_7__0__Impl : ( 'message' ) ;
     public final void rule__SizeRule__Group_7__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2098:1: ( ( 'message' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2099:1: ( 'message' )
+            // InternalValid.g:2098:1: ( ( 'message' ) )
+            // InternalValid.g:2099:1: ( 'message' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2099:1: ( 'message' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2100:1: 'message'
+            // InternalValid.g:2099:1: ( 'message' )
+            // InternalValid.g:2100:1: 'message'
             {
              before(grammarAccess.getSizeRuleAccess().getMessageKeyword_7_0()); 
-            match(input,24,FOLLOW_24_in_rule__SizeRule__Group_7__0__Impl4203); 
+            match(input,24,FOLLOW_2); 
              after(grammarAccess.getSizeRuleAccess().getMessageKeyword_7_0()); 
 
             }
@@ -5616,16 +5616,16 @@ public final void rule__SizeRule__Group_7__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__SizeRule__Group_7__1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2113:1: rule__SizeRule__Group_7__1 : rule__SizeRule__Group_7__1__Impl ;
+    // InternalValid.g:2113:1: rule__SizeRule__Group_7__1 : rule__SizeRule__Group_7__1__Impl ;
     public final void rule__SizeRule__Group_7__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2117:1: ( rule__SizeRule__Group_7__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2118:2: rule__SizeRule__Group_7__1__Impl
+            // InternalValid.g:2117:1: ( rule__SizeRule__Group_7__1__Impl )
+            // InternalValid.g:2118:2: rule__SizeRule__Group_7__1__Impl
             {
-            pushFollow(FOLLOW_rule__SizeRule__Group_7__1__Impl_in_rule__SizeRule__Group_7__14234);
+            pushFollow(FOLLOW_2);
             rule__SizeRule__Group_7__1__Impl();
 
             state._fsp--;
@@ -5649,23 +5649,23 @@ public final void rule__SizeRule__Group_7__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__SizeRule__Group_7__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2124:1: rule__SizeRule__Group_7__1__Impl : ( ( rule__SizeRule__MessageAssignment_7_1 ) ) ;
+    // InternalValid.g:2124:1: rule__SizeRule__Group_7__1__Impl : ( ( rule__SizeRule__MessageAssignment_7_1 ) ) ;
     public final void rule__SizeRule__Group_7__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2128:1: ( ( ( rule__SizeRule__MessageAssignment_7_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2129:1: ( ( rule__SizeRule__MessageAssignment_7_1 ) )
+            // InternalValid.g:2128:1: ( ( ( rule__SizeRule__MessageAssignment_7_1 ) ) )
+            // InternalValid.g:2129:1: ( ( rule__SizeRule__MessageAssignment_7_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2129:1: ( ( rule__SizeRule__MessageAssignment_7_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2130:1: ( rule__SizeRule__MessageAssignment_7_1 )
+            // InternalValid.g:2129:1: ( ( rule__SizeRule__MessageAssignment_7_1 ) )
+            // InternalValid.g:2130:1: ( rule__SizeRule__MessageAssignment_7_1 )
             {
              before(grammarAccess.getSizeRuleAccess().getMessageAssignment_7_1()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2131:1: ( rule__SizeRule__MessageAssignment_7_1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2131:2: rule__SizeRule__MessageAssignment_7_1
+            // InternalValid.g:2131:1: ( rule__SizeRule__MessageAssignment_7_1 )
+            // InternalValid.g:2131:2: rule__SizeRule__MessageAssignment_7_1
             {
-            pushFollow(FOLLOW_rule__SizeRule__MessageAssignment_7_1_in_rule__SizeRule__Group_7__1__Impl4261);
+            pushFollow(FOLLOW_2);
             rule__SizeRule__MessageAssignment_7_1();
 
             state._fsp--;
@@ -5696,21 +5696,21 @@ public final void rule__SizeRule__Group_7__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__SizeRule__Group_9__0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2145:1: rule__SizeRule__Group_9__0 : rule__SizeRule__Group_9__0__Impl rule__SizeRule__Group_9__1 ;
+    // InternalValid.g:2145:1: rule__SizeRule__Group_9__0 : rule__SizeRule__Group_9__0__Impl rule__SizeRule__Group_9__1 ;
     public final void rule__SizeRule__Group_9__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2149:1: ( rule__SizeRule__Group_9__0__Impl rule__SizeRule__Group_9__1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2150:2: rule__SizeRule__Group_9__0__Impl rule__SizeRule__Group_9__1
+            // InternalValid.g:2149:1: ( rule__SizeRule__Group_9__0__Impl rule__SizeRule__Group_9__1 )
+            // InternalValid.g:2150:2: rule__SizeRule__Group_9__0__Impl rule__SizeRule__Group_9__1
             {
-            pushFollow(FOLLOW_rule__SizeRule__Group_9__0__Impl_in_rule__SizeRule__Group_9__04295);
+            pushFollow(FOLLOW_21);
             rule__SizeRule__Group_9__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SizeRule__Group_9__1_in_rule__SizeRule__Group_9__04298);
+            pushFollow(FOLLOW_2);
             rule__SizeRule__Group_9__1();
 
             state._fsp--;
@@ -5734,23 +5734,23 @@ public final void rule__SizeRule__Group_9__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__SizeRule__Group_9__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2157:1: rule__SizeRule__Group_9__0__Impl : ( ( rule__SizeRule__MinAssignment_9_0 ) ) ;
+    // InternalValid.g:2157:1: rule__SizeRule__Group_9__0__Impl : ( ( rule__SizeRule__MinAssignment_9_0 ) ) ;
     public final void rule__SizeRule__Group_9__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2161:1: ( ( ( rule__SizeRule__MinAssignment_9_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2162:1: ( ( rule__SizeRule__MinAssignment_9_0 ) )
+            // InternalValid.g:2161:1: ( ( ( rule__SizeRule__MinAssignment_9_0 ) ) )
+            // InternalValid.g:2162:1: ( ( rule__SizeRule__MinAssignment_9_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2162:1: ( ( rule__SizeRule__MinAssignment_9_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2163:1: ( rule__SizeRule__MinAssignment_9_0 )
+            // InternalValid.g:2162:1: ( ( rule__SizeRule__MinAssignment_9_0 ) )
+            // InternalValid.g:2163:1: ( rule__SizeRule__MinAssignment_9_0 )
             {
              before(grammarAccess.getSizeRuleAccess().getMinAssignment_9_0()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2164:1: ( rule__SizeRule__MinAssignment_9_0 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2164:2: rule__SizeRule__MinAssignment_9_0
+            // InternalValid.g:2164:1: ( rule__SizeRule__MinAssignment_9_0 )
+            // InternalValid.g:2164:2: rule__SizeRule__MinAssignment_9_0
             {
-            pushFollow(FOLLOW_rule__SizeRule__MinAssignment_9_0_in_rule__SizeRule__Group_9__0__Impl4325);
+            pushFollow(FOLLOW_2);
             rule__SizeRule__MinAssignment_9_0();
 
             state._fsp--;
@@ -5781,16 +5781,16 @@ public final void rule__SizeRule__Group_9__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__SizeRule__Group_9__1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2174:1: rule__SizeRule__Group_9__1 : rule__SizeRule__Group_9__1__Impl ;
+    // InternalValid.g:2174:1: rule__SizeRule__Group_9__1 : rule__SizeRule__Group_9__1__Impl ;
     public final void rule__SizeRule__Group_9__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2178:1: ( rule__SizeRule__Group_9__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2179:2: rule__SizeRule__Group_9__1__Impl
+            // InternalValid.g:2178:1: ( rule__SizeRule__Group_9__1__Impl )
+            // InternalValid.g:2179:2: rule__SizeRule__Group_9__1__Impl
             {
-            pushFollow(FOLLOW_rule__SizeRule__Group_9__1__Impl_in_rule__SizeRule__Group_9__14355);
+            pushFollow(FOLLOW_2);
             rule__SizeRule__Group_9__1__Impl();
 
             state._fsp--;
@@ -5814,20 +5814,20 @@ public final void rule__SizeRule__Group_9__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__SizeRule__Group_9__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2185:1: rule__SizeRule__Group_9__1__Impl : ( '..' ) ;
+    // InternalValid.g:2185:1: rule__SizeRule__Group_9__1__Impl : ( '..' ) ;
     public final void rule__SizeRule__Group_9__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2189:1: ( ( '..' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2190:1: ( '..' )
+            // InternalValid.g:2189:1: ( ( '..' ) )
+            // InternalValid.g:2190:1: ( '..' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2190:1: ( '..' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2191:1: '..'
+            // InternalValid.g:2190:1: ( '..' )
+            // InternalValid.g:2191:1: '..'
             {
              before(grammarAccess.getSizeRuleAccess().getFullStopFullStopKeyword_9_1()); 
-            match(input,27,FOLLOW_27_in_rule__SizeRule__Group_9__1__Impl4383); 
+            match(input,27,FOLLOW_2); 
              after(grammarAccess.getSizeRuleAccess().getFullStopFullStopKeyword_9_1()); 
 
             }
@@ -5851,21 +5851,21 @@ public final void rule__SizeRule__Group_9__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__RangeRule__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2208:1: rule__RangeRule__Group__0 : rule__RangeRule__Group__0__Impl rule__RangeRule__Group__1 ;
+    // InternalValid.g:2208:1: rule__RangeRule__Group__0 : rule__RangeRule__Group__0__Impl rule__RangeRule__Group__1 ;
     public final void rule__RangeRule__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2212:1: ( rule__RangeRule__Group__0__Impl rule__RangeRule__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2213:2: rule__RangeRule__Group__0__Impl rule__RangeRule__Group__1
+            // InternalValid.g:2212:1: ( rule__RangeRule__Group__0__Impl rule__RangeRule__Group__1 )
+            // InternalValid.g:2213:2: rule__RangeRule__Group__0__Impl rule__RangeRule__Group__1
             {
-            pushFollow(FOLLOW_rule__RangeRule__Group__0__Impl_in_rule__RangeRule__Group__04418);
+            pushFollow(FOLLOW_22);
             rule__RangeRule__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RangeRule__Group__1_in_rule__RangeRule__Group__04421);
+            pushFollow(FOLLOW_2);
             rule__RangeRule__Group__1();
 
             state._fsp--;
@@ -5889,23 +5889,23 @@ public final void rule__RangeRule__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__RangeRule__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2220:1: rule__RangeRule__Group__0__Impl : ( ( rule__RangeRule__UnorderedGroup_0 ) ) ;
+    // InternalValid.g:2220:1: rule__RangeRule__Group__0__Impl : ( ( rule__RangeRule__UnorderedGroup_0 ) ) ;
     public final void rule__RangeRule__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2224:1: ( ( ( rule__RangeRule__UnorderedGroup_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2225:1: ( ( rule__RangeRule__UnorderedGroup_0 ) )
+            // InternalValid.g:2224:1: ( ( ( rule__RangeRule__UnorderedGroup_0 ) ) )
+            // InternalValid.g:2225:1: ( ( rule__RangeRule__UnorderedGroup_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2225:1: ( ( rule__RangeRule__UnorderedGroup_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2226:1: ( rule__RangeRule__UnorderedGroup_0 )
+            // InternalValid.g:2225:1: ( ( rule__RangeRule__UnorderedGroup_0 ) )
+            // InternalValid.g:2226:1: ( rule__RangeRule__UnorderedGroup_0 )
             {
              before(grammarAccess.getRangeRuleAccess().getUnorderedGroup_0()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2227:1: ( rule__RangeRule__UnorderedGroup_0 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2227:2: rule__RangeRule__UnorderedGroup_0
+            // InternalValid.g:2227:1: ( rule__RangeRule__UnorderedGroup_0 )
+            // InternalValid.g:2227:2: rule__RangeRule__UnorderedGroup_0
             {
-            pushFollow(FOLLOW_rule__RangeRule__UnorderedGroup_0_in_rule__RangeRule__Group__0__Impl4448);
+            pushFollow(FOLLOW_2);
             rule__RangeRule__UnorderedGroup_0();
 
             state._fsp--;
@@ -5936,21 +5936,21 @@ public final void rule__RangeRule__Group__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__RangeRule__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2237:1: rule__RangeRule__Group__1 : rule__RangeRule__Group__1__Impl rule__RangeRule__Group__2 ;
+    // InternalValid.g:2237:1: rule__RangeRule__Group__1 : rule__RangeRule__Group__1__Impl rule__RangeRule__Group__2 ;
     public final void rule__RangeRule__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2241:1: ( rule__RangeRule__Group__1__Impl rule__RangeRule__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2242:2: rule__RangeRule__Group__1__Impl rule__RangeRule__Group__2
+            // InternalValid.g:2241:1: ( rule__RangeRule__Group__1__Impl rule__RangeRule__Group__2 )
+            // InternalValid.g:2242:2: rule__RangeRule__Group__1__Impl rule__RangeRule__Group__2
             {
-            pushFollow(FOLLOW_rule__RangeRule__Group__1__Impl_in_rule__RangeRule__Group__14478);
+            pushFollow(FOLLOW_12);
             rule__RangeRule__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RangeRule__Group__2_in_rule__RangeRule__Group__14481);
+            pushFollow(FOLLOW_2);
             rule__RangeRule__Group__2();
 
             state._fsp--;
@@ -5974,20 +5974,20 @@ public final void rule__RangeRule__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__RangeRule__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2249:1: rule__RangeRule__Group__1__Impl : ( 'range' ) ;
+    // InternalValid.g:2249:1: rule__RangeRule__Group__1__Impl : ( 'range' ) ;
     public final void rule__RangeRule__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2253:1: ( ( 'range' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2254:1: ( 'range' )
+            // InternalValid.g:2253:1: ( ( 'range' ) )
+            // InternalValid.g:2254:1: ( 'range' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2254:1: ( 'range' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2255:1: 'range'
+            // InternalValid.g:2254:1: ( 'range' )
+            // InternalValid.g:2255:1: 'range'
             {
              before(grammarAccess.getRangeRuleAccess().getRangeKeyword_1()); 
-            match(input,28,FOLLOW_28_in_rule__RangeRule__Group__1__Impl4509); 
+            match(input,28,FOLLOW_2); 
              after(grammarAccess.getRangeRuleAccess().getRangeKeyword_1()); 
 
             }
@@ -6011,21 +6011,21 @@ public final void rule__RangeRule__Group__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__RangeRule__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2268:1: rule__RangeRule__Group__2 : rule__RangeRule__Group__2__Impl rule__RangeRule__Group__3 ;
+    // InternalValid.g:2268:1: rule__RangeRule__Group__2 : rule__RangeRule__Group__2__Impl rule__RangeRule__Group__3 ;
     public final void rule__RangeRule__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2272:1: ( rule__RangeRule__Group__2__Impl rule__RangeRule__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2273:2: rule__RangeRule__Group__2__Impl rule__RangeRule__Group__3
+            // InternalValid.g:2272:1: ( rule__RangeRule__Group__2__Impl rule__RangeRule__Group__3 )
+            // InternalValid.g:2273:2: rule__RangeRule__Group__2__Impl rule__RangeRule__Group__3
             {
-            pushFollow(FOLLOW_rule__RangeRule__Group__2__Impl_in_rule__RangeRule__Group__24540);
+            pushFollow(FOLLOW_7);
             rule__RangeRule__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RangeRule__Group__3_in_rule__RangeRule__Group__24543);
+            pushFollow(FOLLOW_2);
             rule__RangeRule__Group__3();
 
             state._fsp--;
@@ -6049,23 +6049,23 @@ public final void rule__RangeRule__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__RangeRule__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2280:1: rule__RangeRule__Group__2__Impl : ( ( rule__RangeRule__SeverityAssignment_2 ) ) ;
+    // InternalValid.g:2280:1: rule__RangeRule__Group__2__Impl : ( ( rule__RangeRule__SeverityAssignment_2 ) ) ;
     public final void rule__RangeRule__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2284:1: ( ( ( rule__RangeRule__SeverityAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2285:1: ( ( rule__RangeRule__SeverityAssignment_2 ) )
+            // InternalValid.g:2284:1: ( ( ( rule__RangeRule__SeverityAssignment_2 ) ) )
+            // InternalValid.g:2285:1: ( ( rule__RangeRule__SeverityAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2285:1: ( ( rule__RangeRule__SeverityAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2286:1: ( rule__RangeRule__SeverityAssignment_2 )
+            // InternalValid.g:2285:1: ( ( rule__RangeRule__SeverityAssignment_2 ) )
+            // InternalValid.g:2286:1: ( rule__RangeRule__SeverityAssignment_2 )
             {
              before(grammarAccess.getRangeRuleAccess().getSeverityAssignment_2()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2287:1: ( rule__RangeRule__SeverityAssignment_2 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2287:2: rule__RangeRule__SeverityAssignment_2
+            // InternalValid.g:2287:1: ( rule__RangeRule__SeverityAssignment_2 )
+            // InternalValid.g:2287:2: rule__RangeRule__SeverityAssignment_2
             {
-            pushFollow(FOLLOW_rule__RangeRule__SeverityAssignment_2_in_rule__RangeRule__Group__2__Impl4570);
+            pushFollow(FOLLOW_2);
             rule__RangeRule__SeverityAssignment_2();
 
             state._fsp--;
@@ -6096,21 +6096,21 @@ public final void rule__RangeRule__Group__2__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__RangeRule__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2297:1: rule__RangeRule__Group__3 : rule__RangeRule__Group__3__Impl rule__RangeRule__Group__4 ;
+    // InternalValid.g:2297:1: rule__RangeRule__Group__3 : rule__RangeRule__Group__3__Impl rule__RangeRule__Group__4 ;
     public final void rule__RangeRule__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2301:1: ( rule__RangeRule__Group__3__Impl rule__RangeRule__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2302:2: rule__RangeRule__Group__3__Impl rule__RangeRule__Group__4
+            // InternalValid.g:2301:1: ( rule__RangeRule__Group__3__Impl rule__RangeRule__Group__4 )
+            // InternalValid.g:2302:2: rule__RangeRule__Group__3__Impl rule__RangeRule__Group__4
             {
-            pushFollow(FOLLOW_rule__RangeRule__Group__3__Impl_in_rule__RangeRule__Group__34600);
+            pushFollow(FOLLOW_8);
             rule__RangeRule__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RangeRule__Group__4_in_rule__RangeRule__Group__34603);
+            pushFollow(FOLLOW_2);
             rule__RangeRule__Group__4();
 
             state._fsp--;
@@ -6134,23 +6134,23 @@ public final void rule__RangeRule__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__RangeRule__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2309:1: rule__RangeRule__Group__3__Impl : ( ( rule__RangeRule__NameAssignment_3 ) ) ;
+    // InternalValid.g:2309:1: rule__RangeRule__Group__3__Impl : ( ( rule__RangeRule__NameAssignment_3 ) ) ;
     public final void rule__RangeRule__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2313:1: ( ( ( rule__RangeRule__NameAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2314:1: ( ( rule__RangeRule__NameAssignment_3 ) )
+            // InternalValid.g:2313:1: ( ( ( rule__RangeRule__NameAssignment_3 ) ) )
+            // InternalValid.g:2314:1: ( ( rule__RangeRule__NameAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2314:1: ( ( rule__RangeRule__NameAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2315:1: ( rule__RangeRule__NameAssignment_3 )
+            // InternalValid.g:2314:1: ( ( rule__RangeRule__NameAssignment_3 ) )
+            // InternalValid.g:2315:1: ( rule__RangeRule__NameAssignment_3 )
             {
              before(grammarAccess.getRangeRuleAccess().getNameAssignment_3()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2316:1: ( rule__RangeRule__NameAssignment_3 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2316:2: rule__RangeRule__NameAssignment_3
+            // InternalValid.g:2316:1: ( rule__RangeRule__NameAssignment_3 )
+            // InternalValid.g:2316:2: rule__RangeRule__NameAssignment_3
             {
-            pushFollow(FOLLOW_rule__RangeRule__NameAssignment_3_in_rule__RangeRule__Group__3__Impl4630);
+            pushFollow(FOLLOW_2);
             rule__RangeRule__NameAssignment_3();
 
             state._fsp--;
@@ -6181,21 +6181,21 @@ public final void rule__RangeRule__Group__3__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__RangeRule__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2326:1: rule__RangeRule__Group__4 : rule__RangeRule__Group__4__Impl rule__RangeRule__Group__5 ;
+    // InternalValid.g:2326:1: rule__RangeRule__Group__4 : rule__RangeRule__Group__4__Impl rule__RangeRule__Group__5 ;
     public final void rule__RangeRule__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2330:1: ( rule__RangeRule__Group__4__Impl rule__RangeRule__Group__5 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2331:2: rule__RangeRule__Group__4__Impl rule__RangeRule__Group__5
+            // InternalValid.g:2330:1: ( rule__RangeRule__Group__4__Impl rule__RangeRule__Group__5 )
+            // InternalValid.g:2331:2: rule__RangeRule__Group__4__Impl rule__RangeRule__Group__5
             {
-            pushFollow(FOLLOW_rule__RangeRule__Group__4__Impl_in_rule__RangeRule__Group__44660);
+            pushFollow(FOLLOW_6);
             rule__RangeRule__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RangeRule__Group__5_in_rule__RangeRule__Group__44663);
+            pushFollow(FOLLOW_2);
             rule__RangeRule__Group__5();
 
             state._fsp--;
@@ -6219,20 +6219,20 @@ public final void rule__RangeRule__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__RangeRule__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2338:1: rule__RangeRule__Group__4__Impl : ( 'label' ) ;
+    // InternalValid.g:2338:1: rule__RangeRule__Group__4__Impl : ( 'label' ) ;
     public final void rule__RangeRule__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2342:1: ( ( 'label' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2343:1: ( 'label' )
+            // InternalValid.g:2342:1: ( ( 'label' ) )
+            // InternalValid.g:2343:1: ( 'label' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2343:1: ( 'label' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2344:1: 'label'
+            // InternalValid.g:2343:1: ( 'label' )
+            // InternalValid.g:2344:1: 'label'
             {
              before(grammarAccess.getRangeRuleAccess().getLabelKeyword_4()); 
-            match(input,20,FOLLOW_20_in_rule__RangeRule__Group__4__Impl4691); 
+            match(input,20,FOLLOW_2); 
              after(grammarAccess.getRangeRuleAccess().getLabelKeyword_4()); 
 
             }
@@ -6256,21 +6256,21 @@ public final void rule__RangeRule__Group__4__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__RangeRule__Group__5"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2357:1: rule__RangeRule__Group__5 : rule__RangeRule__Group__5__Impl rule__RangeRule__Group__6 ;
+    // InternalValid.g:2357:1: rule__RangeRule__Group__5 : rule__RangeRule__Group__5__Impl rule__RangeRule__Group__6 ;
     public final void rule__RangeRule__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2361:1: ( rule__RangeRule__Group__5__Impl rule__RangeRule__Group__6 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2362:2: rule__RangeRule__Group__5__Impl rule__RangeRule__Group__6
+            // InternalValid.g:2361:1: ( rule__RangeRule__Group__5__Impl rule__RangeRule__Group__6 )
+            // InternalValid.g:2362:2: rule__RangeRule__Group__5__Impl rule__RangeRule__Group__6
             {
-            pushFollow(FOLLOW_rule__RangeRule__Group__5__Impl_in_rule__RangeRule__Group__54722);
+            pushFollow(FOLLOW_23);
             rule__RangeRule__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RangeRule__Group__6_in_rule__RangeRule__Group__54725);
+            pushFollow(FOLLOW_2);
             rule__RangeRule__Group__6();
 
             state._fsp--;
@@ -6294,23 +6294,23 @@ public final void rule__RangeRule__Group__5() throws RecognitionException {
 
 
     // $ANTLR start "rule__RangeRule__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2369:1: rule__RangeRule__Group__5__Impl : ( ( rule__RangeRule__LabelAssignment_5 ) ) ;
+    // InternalValid.g:2369:1: rule__RangeRule__Group__5__Impl : ( ( rule__RangeRule__LabelAssignment_5 ) ) ;
     public final void rule__RangeRule__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2373:1: ( ( ( rule__RangeRule__LabelAssignment_5 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2374:1: ( ( rule__RangeRule__LabelAssignment_5 ) )
+            // InternalValid.g:2373:1: ( ( ( rule__RangeRule__LabelAssignment_5 ) ) )
+            // InternalValid.g:2374:1: ( ( rule__RangeRule__LabelAssignment_5 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2374:1: ( ( rule__RangeRule__LabelAssignment_5 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2375:1: ( rule__RangeRule__LabelAssignment_5 )
+            // InternalValid.g:2374:1: ( ( rule__RangeRule__LabelAssignment_5 ) )
+            // InternalValid.g:2375:1: ( rule__RangeRule__LabelAssignment_5 )
             {
              before(grammarAccess.getRangeRuleAccess().getLabelAssignment_5()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2376:1: ( rule__RangeRule__LabelAssignment_5 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2376:2: rule__RangeRule__LabelAssignment_5
+            // InternalValid.g:2376:1: ( rule__RangeRule__LabelAssignment_5 )
+            // InternalValid.g:2376:2: rule__RangeRule__LabelAssignment_5
             {
-            pushFollow(FOLLOW_rule__RangeRule__LabelAssignment_5_in_rule__RangeRule__Group__5__Impl4752);
+            pushFollow(FOLLOW_2);
             rule__RangeRule__LabelAssignment_5();
 
             state._fsp--;
@@ -6341,21 +6341,21 @@ public final void rule__RangeRule__Group__5__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__RangeRule__Group__6"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2386:1: rule__RangeRule__Group__6 : rule__RangeRule__Group__6__Impl rule__RangeRule__Group__7 ;
+    // InternalValid.g:2386:1: rule__RangeRule__Group__6 : rule__RangeRule__Group__6__Impl rule__RangeRule__Group__7 ;
     public final void rule__RangeRule__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2390:1: ( rule__RangeRule__Group__6__Impl rule__RangeRule__Group__7 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2391:2: rule__RangeRule__Group__6__Impl rule__RangeRule__Group__7
+            // InternalValid.g:2390:1: ( rule__RangeRule__Group__6__Impl rule__RangeRule__Group__7 )
+            // InternalValid.g:2391:2: rule__RangeRule__Group__6__Impl rule__RangeRule__Group__7
             {
-            pushFollow(FOLLOW_rule__RangeRule__Group__6__Impl_in_rule__RangeRule__Group__64782);
+            pushFollow(FOLLOW_23);
             rule__RangeRule__Group__6__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RangeRule__Group__7_in_rule__RangeRule__Group__64785);
+            pushFollow(FOLLOW_2);
             rule__RangeRule__Group__7();
 
             state._fsp--;
@@ -6379,20 +6379,20 @@ public final void rule__RangeRule__Group__6() throws RecognitionException {
 
 
     // $ANTLR start "rule__RangeRule__Group__6__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2398:1: rule__RangeRule__Group__6__Impl : ( ( rule__RangeRule__Group_6__0 )? ) ;
+    // InternalValid.g:2398:1: rule__RangeRule__Group__6__Impl : ( ( rule__RangeRule__Group_6__0 )? ) ;
     public final void rule__RangeRule__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2402:1: ( ( ( rule__RangeRule__Group_6__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2403:1: ( ( rule__RangeRule__Group_6__0 )? )
+            // InternalValid.g:2402:1: ( ( ( rule__RangeRule__Group_6__0 )? ) )
+            // InternalValid.g:2403:1: ( ( rule__RangeRule__Group_6__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2403:1: ( ( rule__RangeRule__Group_6__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2404:1: ( rule__RangeRule__Group_6__0 )?
+            // InternalValid.g:2403:1: ( ( rule__RangeRule__Group_6__0 )? )
+            // InternalValid.g:2404:1: ( rule__RangeRule__Group_6__0 )?
             {
              before(grammarAccess.getRangeRuleAccess().getGroup_6()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2405:1: ( rule__RangeRule__Group_6__0 )?
+            // InternalValid.g:2405:1: ( rule__RangeRule__Group_6__0 )?
             int alt16=2;
             int LA16_0 = input.LA(1);
 
@@ -6401,9 +6401,9 @@ public final void rule__RangeRule__Group__6__Impl() throws RecognitionException
             }
             switch (alt16) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2405:2: rule__RangeRule__Group_6__0
+                    // InternalValid.g:2405:2: rule__RangeRule__Group_6__0
                     {
-                    pushFollow(FOLLOW_rule__RangeRule__Group_6__0_in_rule__RangeRule__Group__6__Impl4812);
+                    pushFollow(FOLLOW_2);
                     rule__RangeRule__Group_6__0();
 
                     state._fsp--;
@@ -6437,21 +6437,21 @@ public final void rule__RangeRule__Group__6__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__RangeRule__Group__7"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2415:1: rule__RangeRule__Group__7 : rule__RangeRule__Group__7__Impl rule__RangeRule__Group__8 ;
+    // InternalValid.g:2415:1: rule__RangeRule__Group__7 : rule__RangeRule__Group__7__Impl rule__RangeRule__Group__8 ;
     public final void rule__RangeRule__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2419:1: ( rule__RangeRule__Group__7__Impl rule__RangeRule__Group__8 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2420:2: rule__RangeRule__Group__7__Impl rule__RangeRule__Group__8
+            // InternalValid.g:2419:1: ( rule__RangeRule__Group__7__Impl rule__RangeRule__Group__8 )
+            // InternalValid.g:2420:2: rule__RangeRule__Group__7__Impl rule__RangeRule__Group__8
             {
-            pushFollow(FOLLOW_rule__RangeRule__Group__7__Impl_in_rule__RangeRule__Group__74843);
+            pushFollow(FOLLOW_23);
             rule__RangeRule__Group__7__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RangeRule__Group__8_in_rule__RangeRule__Group__74846);
+            pushFollow(FOLLOW_2);
             rule__RangeRule__Group__8();
 
             state._fsp--;
@@ -6475,20 +6475,20 @@ public final void rule__RangeRule__Group__7() throws RecognitionException {
 
 
     // $ANTLR start "rule__RangeRule__Group__7__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2427:1: rule__RangeRule__Group__7__Impl : ( ( rule__RangeRule__Group_7__0 )? ) ;
+    // InternalValid.g:2427:1: rule__RangeRule__Group__7__Impl : ( ( rule__RangeRule__Group_7__0 )? ) ;
     public final void rule__RangeRule__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2431:1: ( ( ( rule__RangeRule__Group_7__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2432:1: ( ( rule__RangeRule__Group_7__0 )? )
+            // InternalValid.g:2431:1: ( ( ( rule__RangeRule__Group_7__0 )? ) )
+            // InternalValid.g:2432:1: ( ( rule__RangeRule__Group_7__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2432:1: ( ( rule__RangeRule__Group_7__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2433:1: ( rule__RangeRule__Group_7__0 )?
+            // InternalValid.g:2432:1: ( ( rule__RangeRule__Group_7__0 )? )
+            // InternalValid.g:2433:1: ( rule__RangeRule__Group_7__0 )?
             {
              before(grammarAccess.getRangeRuleAccess().getGroup_7()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2434:1: ( rule__RangeRule__Group_7__0 )?
+            // InternalValid.g:2434:1: ( rule__RangeRule__Group_7__0 )?
             int alt17=2;
             int LA17_0 = input.LA(1);
 
@@ -6497,9 +6497,9 @@ public final void rule__RangeRule__Group__7__Impl() throws RecognitionException
             }
             switch (alt17) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2434:2: rule__RangeRule__Group_7__0
+                    // InternalValid.g:2434:2: rule__RangeRule__Group_7__0
                     {
-                    pushFollow(FOLLOW_rule__RangeRule__Group_7__0_in_rule__RangeRule__Group__7__Impl4873);
+                    pushFollow(FOLLOW_2);
                     rule__RangeRule__Group_7__0();
 
                     state._fsp--;
@@ -6533,21 +6533,21 @@ public final void rule__RangeRule__Group__7__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__RangeRule__Group__8"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2444:1: rule__RangeRule__Group__8 : rule__RangeRule__Group__8__Impl rule__RangeRule__Group__9 ;
+    // InternalValid.g:2444:1: rule__RangeRule__Group__8 : rule__RangeRule__Group__8__Impl rule__RangeRule__Group__9 ;
     public final void rule__RangeRule__Group__8() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2448:1: ( rule__RangeRule__Group__8__Impl rule__RangeRule__Group__9 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2449:2: rule__RangeRule__Group__8__Impl rule__RangeRule__Group__9
+            // InternalValid.g:2448:1: ( rule__RangeRule__Group__8__Impl rule__RangeRule__Group__9 )
+            // InternalValid.g:2449:2: rule__RangeRule__Group__8__Impl rule__RangeRule__Group__9
             {
-            pushFollow(FOLLOW_rule__RangeRule__Group__8__Impl_in_rule__RangeRule__Group__84904);
+            pushFollow(FOLLOW_20);
             rule__RangeRule__Group__8__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RangeRule__Group__9_in_rule__RangeRule__Group__84907);
+            pushFollow(FOLLOW_2);
             rule__RangeRule__Group__9();
 
             state._fsp--;
@@ -6571,20 +6571,20 @@ public final void rule__RangeRule__Group__8() throws RecognitionException {
 
 
     // $ANTLR start "rule__RangeRule__Group__8__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2456:1: rule__RangeRule__Group__8__Impl : ( 'range' ) ;
+    // InternalValid.g:2456:1: rule__RangeRule__Group__8__Impl : ( 'range' ) ;
     public final void rule__RangeRule__Group__8__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2460:1: ( ( 'range' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2461:1: ( 'range' )
+            // InternalValid.g:2460:1: ( ( 'range' ) )
+            // InternalValid.g:2461:1: ( 'range' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2461:1: ( 'range' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2462:1: 'range'
+            // InternalValid.g:2461:1: ( 'range' )
+            // InternalValid.g:2462:1: 'range'
             {
              before(grammarAccess.getRangeRuleAccess().getRangeKeyword_8()); 
-            match(input,28,FOLLOW_28_in_rule__RangeRule__Group__8__Impl4935); 
+            match(input,28,FOLLOW_2); 
              after(grammarAccess.getRangeRuleAccess().getRangeKeyword_8()); 
 
             }
@@ -6608,21 +6608,21 @@ public final void rule__RangeRule__Group__8__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__RangeRule__Group__9"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2475:1: rule__RangeRule__Group__9 : rule__RangeRule__Group__9__Impl rule__RangeRule__Group__10 ;
+    // InternalValid.g:2475:1: rule__RangeRule__Group__9 : rule__RangeRule__Group__9__Impl rule__RangeRule__Group__10 ;
     public final void rule__RangeRule__Group__9() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2479:1: ( rule__RangeRule__Group__9__Impl rule__RangeRule__Group__10 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2480:2: rule__RangeRule__Group__9__Impl rule__RangeRule__Group__10
+            // InternalValid.g:2479:1: ( rule__RangeRule__Group__9__Impl rule__RangeRule__Group__10 )
+            // InternalValid.g:2480:2: rule__RangeRule__Group__9__Impl rule__RangeRule__Group__10
             {
-            pushFollow(FOLLOW_rule__RangeRule__Group__9__Impl_in_rule__RangeRule__Group__94966);
+            pushFollow(FOLLOW_20);
             rule__RangeRule__Group__9__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RangeRule__Group__10_in_rule__RangeRule__Group__94969);
+            pushFollow(FOLLOW_2);
             rule__RangeRule__Group__10();
 
             state._fsp--;
@@ -6646,20 +6646,20 @@ public final void rule__RangeRule__Group__9() throws RecognitionException {
 
 
     // $ANTLR start "rule__RangeRule__Group__9__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2487:1: rule__RangeRule__Group__9__Impl : ( ( rule__RangeRule__Group_9__0 )? ) ;
+    // InternalValid.g:2487:1: rule__RangeRule__Group__9__Impl : ( ( rule__RangeRule__Group_9__0 )? ) ;
     public final void rule__RangeRule__Group__9__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2491:1: ( ( ( rule__RangeRule__Group_9__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2492:1: ( ( rule__RangeRule__Group_9__0 )? )
+            // InternalValid.g:2491:1: ( ( ( rule__RangeRule__Group_9__0 )? ) )
+            // InternalValid.g:2492:1: ( ( rule__RangeRule__Group_9__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2492:1: ( ( rule__RangeRule__Group_9__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2493:1: ( rule__RangeRule__Group_9__0 )?
+            // InternalValid.g:2492:1: ( ( rule__RangeRule__Group_9__0 )? )
+            // InternalValid.g:2493:1: ( rule__RangeRule__Group_9__0 )?
             {
              before(grammarAccess.getRangeRuleAccess().getGroup_9()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2494:1: ( rule__RangeRule__Group_9__0 )?
+            // InternalValid.g:2494:1: ( rule__RangeRule__Group_9__0 )?
             int alt18=2;
             int LA18_0 = input.LA(1);
 
@@ -6672,9 +6672,9 @@ public final void rule__RangeRule__Group__9__Impl() throws RecognitionException
             }
             switch (alt18) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2494:2: rule__RangeRule__Group_9__0
+                    // InternalValid.g:2494:2: rule__RangeRule__Group_9__0
                     {
-                    pushFollow(FOLLOW_rule__RangeRule__Group_9__0_in_rule__RangeRule__Group__9__Impl4996);
+                    pushFollow(FOLLOW_2);
                     rule__RangeRule__Group_9__0();
 
                     state._fsp--;
@@ -6708,21 +6708,21 @@ public final void rule__RangeRule__Group__9__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__RangeRule__Group__10"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2504:1: rule__RangeRule__Group__10 : rule__RangeRule__Group__10__Impl rule__RangeRule__Group__11 ;
+    // InternalValid.g:2504:1: rule__RangeRule__Group__10 : rule__RangeRule__Group__10__Impl rule__RangeRule__Group__11 ;
     public final void rule__RangeRule__Group__10() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2508:1: ( rule__RangeRule__Group__10__Impl rule__RangeRule__Group__11 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2509:2: rule__RangeRule__Group__10__Impl rule__RangeRule__Group__11
+            // InternalValid.g:2508:1: ( rule__RangeRule__Group__10__Impl rule__RangeRule__Group__11 )
+            // InternalValid.g:2509:2: rule__RangeRule__Group__10__Impl rule__RangeRule__Group__11
             {
-            pushFollow(FOLLOW_rule__RangeRule__Group__10__Impl_in_rule__RangeRule__Group__105027);
+            pushFollow(FOLLOW_14);
             rule__RangeRule__Group__10__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RangeRule__Group__11_in_rule__RangeRule__Group__105030);
+            pushFollow(FOLLOW_2);
             rule__RangeRule__Group__11();
 
             state._fsp--;
@@ -6746,23 +6746,23 @@ public final void rule__RangeRule__Group__10() throws RecognitionException {
 
 
     // $ANTLR start "rule__RangeRule__Group__10__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2516:1: rule__RangeRule__Group__10__Impl : ( ( rule__RangeRule__MaxAssignment_10 ) ) ;
+    // InternalValid.g:2516:1: rule__RangeRule__Group__10__Impl : ( ( rule__RangeRule__MaxAssignment_10 ) ) ;
     public final void rule__RangeRule__Group__10__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2520:1: ( ( ( rule__RangeRule__MaxAssignment_10 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2521:1: ( ( rule__RangeRule__MaxAssignment_10 ) )
+            // InternalValid.g:2520:1: ( ( ( rule__RangeRule__MaxAssignment_10 ) ) )
+            // InternalValid.g:2521:1: ( ( rule__RangeRule__MaxAssignment_10 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2521:1: ( ( rule__RangeRule__MaxAssignment_10 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2522:1: ( rule__RangeRule__MaxAssignment_10 )
+            // InternalValid.g:2521:1: ( ( rule__RangeRule__MaxAssignment_10 ) )
+            // InternalValid.g:2522:1: ( rule__RangeRule__MaxAssignment_10 )
             {
              before(grammarAccess.getRangeRuleAccess().getMaxAssignment_10()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2523:1: ( rule__RangeRule__MaxAssignment_10 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2523:2: rule__RangeRule__MaxAssignment_10
+            // InternalValid.g:2523:1: ( rule__RangeRule__MaxAssignment_10 )
+            // InternalValid.g:2523:2: rule__RangeRule__MaxAssignment_10
             {
-            pushFollow(FOLLOW_rule__RangeRule__MaxAssignment_10_in_rule__RangeRule__Group__10__Impl5057);
+            pushFollow(FOLLOW_2);
             rule__RangeRule__MaxAssignment_10();
 
             state._fsp--;
@@ -6793,21 +6793,21 @@ public final void rule__RangeRule__Group__10__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__RangeRule__Group__11"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2533:1: rule__RangeRule__Group__11 : rule__RangeRule__Group__11__Impl rule__RangeRule__Group__12 ;
+    // InternalValid.g:2533:1: rule__RangeRule__Group__11 : rule__RangeRule__Group__11__Impl rule__RangeRule__Group__12 ;
     public final void rule__RangeRule__Group__11() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2537:1: ( rule__RangeRule__Group__11__Impl rule__RangeRule__Group__12 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2538:2: rule__RangeRule__Group__11__Impl rule__RangeRule__Group__12
+            // InternalValid.g:2537:1: ( rule__RangeRule__Group__11__Impl rule__RangeRule__Group__12 )
+            // InternalValid.g:2538:2: rule__RangeRule__Group__11__Impl rule__RangeRule__Group__12
             {
-            pushFollow(FOLLOW_rule__RangeRule__Group__11__Impl_in_rule__RangeRule__Group__115087);
+            pushFollow(FOLLOW_15);
             rule__RangeRule__Group__11__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RangeRule__Group__12_in_rule__RangeRule__Group__115090);
+            pushFollow(FOLLOW_2);
             rule__RangeRule__Group__12();
 
             state._fsp--;
@@ -6831,20 +6831,20 @@ public final void rule__RangeRule__Group__11() throws RecognitionException {
 
 
     // $ANTLR start "rule__RangeRule__Group__11__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2545:1: rule__RangeRule__Group__11__Impl : ( 'context' ) ;
+    // InternalValid.g:2545:1: rule__RangeRule__Group__11__Impl : ( 'context' ) ;
     public final void rule__RangeRule__Group__11__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2549:1: ( ( 'context' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2550:1: ( 'context' )
+            // InternalValid.g:2549:1: ( ( 'context' ) )
+            // InternalValid.g:2550:1: ( 'context' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2550:1: ( 'context' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2551:1: 'context'
+            // InternalValid.g:2550:1: ( 'context' )
+            // InternalValid.g:2551:1: 'context'
             {
              before(grammarAccess.getRangeRuleAccess().getContextKeyword_11()); 
-            match(input,25,FOLLOW_25_in_rule__RangeRule__Group__11__Impl5118); 
+            match(input,25,FOLLOW_2); 
              after(grammarAccess.getRangeRuleAccess().getContextKeyword_11()); 
 
             }
@@ -6868,21 +6868,21 @@ public final void rule__RangeRule__Group__11__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__RangeRule__Group__12"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2564:1: rule__RangeRule__Group__12 : rule__RangeRule__Group__12__Impl rule__RangeRule__Group__13 ;
+    // InternalValid.g:2564:1: rule__RangeRule__Group__12 : rule__RangeRule__Group__12__Impl rule__RangeRule__Group__13 ;
     public final void rule__RangeRule__Group__12() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2568:1: ( rule__RangeRule__Group__12__Impl rule__RangeRule__Group__13 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2569:2: rule__RangeRule__Group__12__Impl rule__RangeRule__Group__13
+            // InternalValid.g:2568:1: ( rule__RangeRule__Group__12__Impl rule__RangeRule__Group__13 )
+            // InternalValid.g:2569:2: rule__RangeRule__Group__12__Impl rule__RangeRule__Group__13
             {
-            pushFollow(FOLLOW_rule__RangeRule__Group__12__Impl_in_rule__RangeRule__Group__125149);
+            pushFollow(FOLLOW_7);
             rule__RangeRule__Group__12__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RangeRule__Group__13_in_rule__RangeRule__Group__125152);
+            pushFollow(FOLLOW_2);
             rule__RangeRule__Group__13();
 
             state._fsp--;
@@ -6906,20 +6906,20 @@ public final void rule__RangeRule__Group__12() throws RecognitionException {
 
 
     // $ANTLR start "rule__RangeRule__Group__12__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2576:1: rule__RangeRule__Group__12__Impl : ( '{' ) ;
+    // InternalValid.g:2576:1: rule__RangeRule__Group__12__Impl : ( '{' ) ;
     public final void rule__RangeRule__Group__12__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2580:1: ( ( '{' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2581:1: ( '{' )
+            // InternalValid.g:2580:1: ( ( '{' ) )
+            // InternalValid.g:2581:1: ( '{' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2581:1: ( '{' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2582:1: '{'
+            // InternalValid.g:2581:1: ( '{' )
+            // InternalValid.g:2582:1: '{'
             {
              before(grammarAccess.getRangeRuleAccess().getLeftCurlyBracketKeyword_12()); 
-            match(input,21,FOLLOW_21_in_rule__RangeRule__Group__12__Impl5180); 
+            match(input,21,FOLLOW_2); 
              after(grammarAccess.getRangeRuleAccess().getLeftCurlyBracketKeyword_12()); 
 
             }
@@ -6943,21 +6943,21 @@ public final void rule__RangeRule__Group__12__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__RangeRule__Group__13"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2595:1: rule__RangeRule__Group__13 : rule__RangeRule__Group__13__Impl rule__RangeRule__Group__14 ;
+    // InternalValid.g:2595:1: rule__RangeRule__Group__13 : rule__RangeRule__Group__13__Impl rule__RangeRule__Group__14 ;
     public final void rule__RangeRule__Group__13() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2599:1: ( rule__RangeRule__Group__13__Impl rule__RangeRule__Group__14 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2600:2: rule__RangeRule__Group__13__Impl rule__RangeRule__Group__14
+            // InternalValid.g:2599:1: ( rule__RangeRule__Group__13__Impl rule__RangeRule__Group__14 )
+            // InternalValid.g:2600:2: rule__RangeRule__Group__13__Impl rule__RangeRule__Group__14
             {
-            pushFollow(FOLLOW_rule__RangeRule__Group__13__Impl_in_rule__RangeRule__Group__135211);
+            pushFollow(FOLLOW_16);
             rule__RangeRule__Group__13__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RangeRule__Group__14_in_rule__RangeRule__Group__135214);
+            pushFollow(FOLLOW_2);
             rule__RangeRule__Group__14();
 
             state._fsp--;
@@ -6981,26 +6981,26 @@ public final void rule__RangeRule__Group__13() throws RecognitionException {
 
 
     // $ANTLR start "rule__RangeRule__Group__13__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2607:1: rule__RangeRule__Group__13__Impl : ( ( ( rule__RangeRule__ContextsAssignment_13 ) ) ( ( rule__RangeRule__ContextsAssignment_13 )* ) ) ;
+    // InternalValid.g:2607:1: rule__RangeRule__Group__13__Impl : ( ( ( rule__RangeRule__ContextsAssignment_13 ) ) ( ( rule__RangeRule__ContextsAssignment_13 )* ) ) ;
     public final void rule__RangeRule__Group__13__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2611:1: ( ( ( ( rule__RangeRule__ContextsAssignment_13 ) ) ( ( rule__RangeRule__ContextsAssignment_13 )* ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2612:1: ( ( ( rule__RangeRule__ContextsAssignment_13 ) ) ( ( rule__RangeRule__ContextsAssignment_13 )* ) )
+            // InternalValid.g:2611:1: ( ( ( ( rule__RangeRule__ContextsAssignment_13 ) ) ( ( rule__RangeRule__ContextsAssignment_13 )* ) ) )
+            // InternalValid.g:2612:1: ( ( ( rule__RangeRule__ContextsAssignment_13 ) ) ( ( rule__RangeRule__ContextsAssignment_13 )* ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2612:1: ( ( ( rule__RangeRule__ContextsAssignment_13 ) ) ( ( rule__RangeRule__ContextsAssignment_13 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2613:1: ( ( rule__RangeRule__ContextsAssignment_13 ) ) ( ( rule__RangeRule__ContextsAssignment_13 )* )
+            // InternalValid.g:2612:1: ( ( ( rule__RangeRule__ContextsAssignment_13 ) ) ( ( rule__RangeRule__ContextsAssignment_13 )* ) )
+            // InternalValid.g:2613:1: ( ( rule__RangeRule__ContextsAssignment_13 ) ) ( ( rule__RangeRule__ContextsAssignment_13 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2613:1: ( ( rule__RangeRule__ContextsAssignment_13 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2614:1: ( rule__RangeRule__ContextsAssignment_13 )
+            // InternalValid.g:2613:1: ( ( rule__RangeRule__ContextsAssignment_13 ) )
+            // InternalValid.g:2614:1: ( rule__RangeRule__ContextsAssignment_13 )
             {
              before(grammarAccess.getRangeRuleAccess().getContextsAssignment_13()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2615:1: ( rule__RangeRule__ContextsAssignment_13 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2615:2: rule__RangeRule__ContextsAssignment_13
+            // InternalValid.g:2615:1: ( rule__RangeRule__ContextsAssignment_13 )
+            // InternalValid.g:2615:2: rule__RangeRule__ContextsAssignment_13
             {
-            pushFollow(FOLLOW_rule__RangeRule__ContextsAssignment_13_in_rule__RangeRule__Group__13__Impl5243);
+            pushFollow(FOLLOW_17);
             rule__RangeRule__ContextsAssignment_13();
 
             state._fsp--;
@@ -7012,11 +7012,11 @@ public final void rule__RangeRule__Group__13__Impl() throws RecognitionException
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2618:1: ( ( rule__RangeRule__ContextsAssignment_13 )* )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2619:1: ( rule__RangeRule__ContextsAssignment_13 )*
+            // InternalValid.g:2618:1: ( ( rule__RangeRule__ContextsAssignment_13 )* )
+            // InternalValid.g:2619:1: ( rule__RangeRule__ContextsAssignment_13 )*
             {
              before(grammarAccess.getRangeRuleAccess().getContextsAssignment_13()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2620:1: ( rule__RangeRule__ContextsAssignment_13 )*
+            // InternalValid.g:2620:1: ( rule__RangeRule__ContextsAssignment_13 )*
             loop19:
             do {
                 int alt19=2;
@@ -7029,9 +7029,9 @@ public final void rule__RangeRule__Group__13__Impl() throws RecognitionException
 
                 switch (alt19) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2620:2: rule__RangeRule__ContextsAssignment_13
+            	    // InternalValid.g:2620:2: rule__RangeRule__ContextsAssignment_13
             	    {
-            	    pushFollow(FOLLOW_rule__RangeRule__ContextsAssignment_13_in_rule__RangeRule__Group__13__Impl5255);
+            	    pushFollow(FOLLOW_17);
             	    rule__RangeRule__ContextsAssignment_13();
 
             	    state._fsp--;
@@ -7071,16 +7071,16 @@ public final void rule__RangeRule__Group__13__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__RangeRule__Group__14"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2631:1: rule__RangeRule__Group__14 : rule__RangeRule__Group__14__Impl ;
+    // InternalValid.g:2631:1: rule__RangeRule__Group__14 : rule__RangeRule__Group__14__Impl ;
     public final void rule__RangeRule__Group__14() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2635:1: ( rule__RangeRule__Group__14__Impl )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2636:2: rule__RangeRule__Group__14__Impl
+            // InternalValid.g:2635:1: ( rule__RangeRule__Group__14__Impl )
+            // InternalValid.g:2636:2: rule__RangeRule__Group__14__Impl
             {
-            pushFollow(FOLLOW_rule__RangeRule__Group__14__Impl_in_rule__RangeRule__Group__145288);
+            pushFollow(FOLLOW_2);
             rule__RangeRule__Group__14__Impl();
 
             state._fsp--;
@@ -7104,20 +7104,20 @@ public final void rule__RangeRule__Group__14() throws RecognitionException {
 
 
     // $ANTLR start "rule__RangeRule__Group__14__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2642:1: rule__RangeRule__Group__14__Impl : ( '}' ) ;
+    // InternalValid.g:2642:1: rule__RangeRule__Group__14__Impl : ( '}' ) ;
     public final void rule__RangeRule__Group__14__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2646:1: ( ( '}' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2647:1: ( '}' )
+            // InternalValid.g:2646:1: ( ( '}' ) )
+            // InternalValid.g:2647:1: ( '}' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2647:1: ( '}' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2648:1: '}'
+            // InternalValid.g:2647:1: ( '}' )
+            // InternalValid.g:2648:1: '}'
             {
              before(grammarAccess.getRangeRuleAccess().getRightCurlyBracketKeyword_14()); 
-            match(input,22,FOLLOW_22_in_rule__RangeRule__Group__14__Impl5316); 
+            match(input,22,FOLLOW_2); 
              after(grammarAccess.getRangeRuleAccess().getRightCurlyBracketKeyword_14()); 
 
             }
@@ -7141,21 +7141,21 @@ public final void rule__RangeRule__Group__14__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__RangeRule__Group_6__0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2691:1: rule__RangeRule__Group_6__0 : rule__RangeRule__Group_6__0__Impl rule__RangeRule__Group_6__1 ;
+    // InternalValid.g:2691:1: rule__RangeRule__Group_6__0 : rule__RangeRule__Group_6__0__Impl rule__RangeRule__Group_6__1 ;
     public final void rule__RangeRule__Group_6__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2695:1: ( rule__RangeRule__Group_6__0__Impl rule__RangeRule__Group_6__1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2696:2: rule__RangeRule__Group_6__0__Impl rule__RangeRule__Group_6__1
+            // InternalValid.g:2695:1: ( rule__RangeRule__Group_6__0__Impl rule__RangeRule__Group_6__1 )
+            // InternalValid.g:2696:2: rule__RangeRule__Group_6__0__Impl rule__RangeRule__Group_6__1
             {
-            pushFollow(FOLLOW_rule__RangeRule__Group_6__0__Impl_in_rule__RangeRule__Group_6__05377);
+            pushFollow(FOLLOW_6);
             rule__RangeRule__Group_6__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RangeRule__Group_6__1_in_rule__RangeRule__Group_6__05380);
+            pushFollow(FOLLOW_2);
             rule__RangeRule__Group_6__1();
 
             state._fsp--;
@@ -7179,20 +7179,20 @@ public final void rule__RangeRule__Group_6__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__RangeRule__Group_6__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2703:1: rule__RangeRule__Group_6__0__Impl : ( 'description' ) ;
+    // InternalValid.g:2703:1: rule__RangeRule__Group_6__0__Impl : ( 'description' ) ;
     public final void rule__RangeRule__Group_6__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2707:1: ( ( 'description' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2708:1: ( 'description' )
+            // InternalValid.g:2707:1: ( ( 'description' ) )
+            // InternalValid.g:2708:1: ( 'description' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2708:1: ( 'description' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2709:1: 'description'
+            // InternalValid.g:2708:1: ( 'description' )
+            // InternalValid.g:2709:1: 'description'
             {
              before(grammarAccess.getRangeRuleAccess().getDescriptionKeyword_6_0()); 
-            match(input,23,FOLLOW_23_in_rule__RangeRule__Group_6__0__Impl5408); 
+            match(input,23,FOLLOW_2); 
              after(grammarAccess.getRangeRuleAccess().getDescriptionKeyword_6_0()); 
 
             }
@@ -7216,16 +7216,16 @@ public final void rule__RangeRule__Group_6__0__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__RangeRule__Group_6__1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2722:1: rule__RangeRule__Group_6__1 : rule__RangeRule__Group_6__1__Impl ;
+    // InternalValid.g:2722:1: rule__RangeRule__Group_6__1 : rule__RangeRule__Group_6__1__Impl ;
     public final void rule__RangeRule__Group_6__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2726:1: ( rule__RangeRule__Group_6__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2727:2: rule__RangeRule__Group_6__1__Impl
+            // InternalValid.g:2726:1: ( rule__RangeRule__Group_6__1__Impl )
+            // InternalValid.g:2727:2: rule__RangeRule__Group_6__1__Impl
             {
-            pushFollow(FOLLOW_rule__RangeRule__Group_6__1__Impl_in_rule__RangeRule__Group_6__15439);
+            pushFollow(FOLLOW_2);
             rule__RangeRule__Group_6__1__Impl();
 
             state._fsp--;
@@ -7249,23 +7249,23 @@ public final void rule__RangeRule__Group_6__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__RangeRule__Group_6__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2733:1: rule__RangeRule__Group_6__1__Impl : ( ( rule__RangeRule__DescriptionAssignment_6_1 ) ) ;
+    // InternalValid.g:2733:1: rule__RangeRule__Group_6__1__Impl : ( ( rule__RangeRule__DescriptionAssignment_6_1 ) ) ;
     public final void rule__RangeRule__Group_6__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2737:1: ( ( ( rule__RangeRule__DescriptionAssignment_6_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2738:1: ( ( rule__RangeRule__DescriptionAssignment_6_1 ) )
+            // InternalValid.g:2737:1: ( ( ( rule__RangeRule__DescriptionAssignment_6_1 ) ) )
+            // InternalValid.g:2738:1: ( ( rule__RangeRule__DescriptionAssignment_6_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2738:1: ( ( rule__RangeRule__DescriptionAssignment_6_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2739:1: ( rule__RangeRule__DescriptionAssignment_6_1 )
+            // InternalValid.g:2738:1: ( ( rule__RangeRule__DescriptionAssignment_6_1 ) )
+            // InternalValid.g:2739:1: ( rule__RangeRule__DescriptionAssignment_6_1 )
             {
              before(grammarAccess.getRangeRuleAccess().getDescriptionAssignment_6_1()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2740:1: ( rule__RangeRule__DescriptionAssignment_6_1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2740:2: rule__RangeRule__DescriptionAssignment_6_1
+            // InternalValid.g:2740:1: ( rule__RangeRule__DescriptionAssignment_6_1 )
+            // InternalValid.g:2740:2: rule__RangeRule__DescriptionAssignment_6_1
             {
-            pushFollow(FOLLOW_rule__RangeRule__DescriptionAssignment_6_1_in_rule__RangeRule__Group_6__1__Impl5466);
+            pushFollow(FOLLOW_2);
             rule__RangeRule__DescriptionAssignment_6_1();
 
             state._fsp--;
@@ -7296,21 +7296,21 @@ public final void rule__RangeRule__Group_6__1__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__RangeRule__Group_7__0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2754:1: rule__RangeRule__Group_7__0 : rule__RangeRule__Group_7__0__Impl rule__RangeRule__Group_7__1 ;
+    // InternalValid.g:2754:1: rule__RangeRule__Group_7__0 : rule__RangeRule__Group_7__0__Impl rule__RangeRule__Group_7__1 ;
     public final void rule__RangeRule__Group_7__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2758:1: ( rule__RangeRule__Group_7__0__Impl rule__RangeRule__Group_7__1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2759:2: rule__RangeRule__Group_7__0__Impl rule__RangeRule__Group_7__1
+            // InternalValid.g:2758:1: ( rule__RangeRule__Group_7__0__Impl rule__RangeRule__Group_7__1 )
+            // InternalValid.g:2759:2: rule__RangeRule__Group_7__0__Impl rule__RangeRule__Group_7__1
             {
-            pushFollow(FOLLOW_rule__RangeRule__Group_7__0__Impl_in_rule__RangeRule__Group_7__05500);
+            pushFollow(FOLLOW_6);
             rule__RangeRule__Group_7__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RangeRule__Group_7__1_in_rule__RangeRule__Group_7__05503);
+            pushFollow(FOLLOW_2);
             rule__RangeRule__Group_7__1();
 
             state._fsp--;
@@ -7334,20 +7334,20 @@ public final void rule__RangeRule__Group_7__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__RangeRule__Group_7__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2766:1: rule__RangeRule__Group_7__0__Impl : ( 'message' ) ;
+    // InternalValid.g:2766:1: rule__RangeRule__Group_7__0__Impl : ( 'message' ) ;
     public final void rule__RangeRule__Group_7__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2770:1: ( ( 'message' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2771:1: ( 'message' )
+            // InternalValid.g:2770:1: ( ( 'message' ) )
+            // InternalValid.g:2771:1: ( 'message' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2771:1: ( 'message' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2772:1: 'message'
+            // InternalValid.g:2771:1: ( 'message' )
+            // InternalValid.g:2772:1: 'message'
             {
              before(grammarAccess.getRangeRuleAccess().getMessageKeyword_7_0()); 
-            match(input,24,FOLLOW_24_in_rule__RangeRule__Group_7__0__Impl5531); 
+            match(input,24,FOLLOW_2); 
              after(grammarAccess.getRangeRuleAccess().getMessageKeyword_7_0()); 
 
             }
@@ -7371,16 +7371,16 @@ public final void rule__RangeRule__Group_7__0__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__RangeRule__Group_7__1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2785:1: rule__RangeRule__Group_7__1 : rule__RangeRule__Group_7__1__Impl ;
+    // InternalValid.g:2785:1: rule__RangeRule__Group_7__1 : rule__RangeRule__Group_7__1__Impl ;
     public final void rule__RangeRule__Group_7__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2789:1: ( rule__RangeRule__Group_7__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2790:2: rule__RangeRule__Group_7__1__Impl
+            // InternalValid.g:2789:1: ( rule__RangeRule__Group_7__1__Impl )
+            // InternalValid.g:2790:2: rule__RangeRule__Group_7__1__Impl
             {
-            pushFollow(FOLLOW_rule__RangeRule__Group_7__1__Impl_in_rule__RangeRule__Group_7__15562);
+            pushFollow(FOLLOW_2);
             rule__RangeRule__Group_7__1__Impl();
 
             state._fsp--;
@@ -7404,23 +7404,23 @@ public final void rule__RangeRule__Group_7__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__RangeRule__Group_7__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2796:1: rule__RangeRule__Group_7__1__Impl : ( ( rule__RangeRule__MessageAssignment_7_1 ) ) ;
+    // InternalValid.g:2796:1: rule__RangeRule__Group_7__1__Impl : ( ( rule__RangeRule__MessageAssignment_7_1 ) ) ;
     public final void rule__RangeRule__Group_7__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2800:1: ( ( ( rule__RangeRule__MessageAssignment_7_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2801:1: ( ( rule__RangeRule__MessageAssignment_7_1 ) )
+            // InternalValid.g:2800:1: ( ( ( rule__RangeRule__MessageAssignment_7_1 ) ) )
+            // InternalValid.g:2801:1: ( ( rule__RangeRule__MessageAssignment_7_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2801:1: ( ( rule__RangeRule__MessageAssignment_7_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2802:1: ( rule__RangeRule__MessageAssignment_7_1 )
+            // InternalValid.g:2801:1: ( ( rule__RangeRule__MessageAssignment_7_1 ) )
+            // InternalValid.g:2802:1: ( rule__RangeRule__MessageAssignment_7_1 )
             {
              before(grammarAccess.getRangeRuleAccess().getMessageAssignment_7_1()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2803:1: ( rule__RangeRule__MessageAssignment_7_1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2803:2: rule__RangeRule__MessageAssignment_7_1
+            // InternalValid.g:2803:1: ( rule__RangeRule__MessageAssignment_7_1 )
+            // InternalValid.g:2803:2: rule__RangeRule__MessageAssignment_7_1
             {
-            pushFollow(FOLLOW_rule__RangeRule__MessageAssignment_7_1_in_rule__RangeRule__Group_7__1__Impl5589);
+            pushFollow(FOLLOW_2);
             rule__RangeRule__MessageAssignment_7_1();
 
             state._fsp--;
@@ -7451,21 +7451,21 @@ public final void rule__RangeRule__Group_7__1__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__RangeRule__Group_9__0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2817:1: rule__RangeRule__Group_9__0 : rule__RangeRule__Group_9__0__Impl rule__RangeRule__Group_9__1 ;
+    // InternalValid.g:2817:1: rule__RangeRule__Group_9__0 : rule__RangeRule__Group_9__0__Impl rule__RangeRule__Group_9__1 ;
     public final void rule__RangeRule__Group_9__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2821:1: ( rule__RangeRule__Group_9__0__Impl rule__RangeRule__Group_9__1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2822:2: rule__RangeRule__Group_9__0__Impl rule__RangeRule__Group_9__1
+            // InternalValid.g:2821:1: ( rule__RangeRule__Group_9__0__Impl rule__RangeRule__Group_9__1 )
+            // InternalValid.g:2822:2: rule__RangeRule__Group_9__0__Impl rule__RangeRule__Group_9__1
             {
-            pushFollow(FOLLOW_rule__RangeRule__Group_9__0__Impl_in_rule__RangeRule__Group_9__05623);
+            pushFollow(FOLLOW_21);
             rule__RangeRule__Group_9__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__RangeRule__Group_9__1_in_rule__RangeRule__Group_9__05626);
+            pushFollow(FOLLOW_2);
             rule__RangeRule__Group_9__1();
 
             state._fsp--;
@@ -7489,23 +7489,23 @@ public final void rule__RangeRule__Group_9__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__RangeRule__Group_9__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2829:1: rule__RangeRule__Group_9__0__Impl : ( ( rule__RangeRule__MinAssignment_9_0 ) ) ;
+    // InternalValid.g:2829:1: rule__RangeRule__Group_9__0__Impl : ( ( rule__RangeRule__MinAssignment_9_0 ) ) ;
     public final void rule__RangeRule__Group_9__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2833:1: ( ( ( rule__RangeRule__MinAssignment_9_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2834:1: ( ( rule__RangeRule__MinAssignment_9_0 ) )
+            // InternalValid.g:2833:1: ( ( ( rule__RangeRule__MinAssignment_9_0 ) ) )
+            // InternalValid.g:2834:1: ( ( rule__RangeRule__MinAssignment_9_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2834:1: ( ( rule__RangeRule__MinAssignment_9_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2835:1: ( rule__RangeRule__MinAssignment_9_0 )
+            // InternalValid.g:2834:1: ( ( rule__RangeRule__MinAssignment_9_0 ) )
+            // InternalValid.g:2835:1: ( rule__RangeRule__MinAssignment_9_0 )
             {
              before(grammarAccess.getRangeRuleAccess().getMinAssignment_9_0()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2836:1: ( rule__RangeRule__MinAssignment_9_0 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2836:2: rule__RangeRule__MinAssignment_9_0
+            // InternalValid.g:2836:1: ( rule__RangeRule__MinAssignment_9_0 )
+            // InternalValid.g:2836:2: rule__RangeRule__MinAssignment_9_0
             {
-            pushFollow(FOLLOW_rule__RangeRule__MinAssignment_9_0_in_rule__RangeRule__Group_9__0__Impl5653);
+            pushFollow(FOLLOW_2);
             rule__RangeRule__MinAssignment_9_0();
 
             state._fsp--;
@@ -7536,16 +7536,16 @@ public final void rule__RangeRule__Group_9__0__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__RangeRule__Group_9__1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2846:1: rule__RangeRule__Group_9__1 : rule__RangeRule__Group_9__1__Impl ;
+    // InternalValid.g:2846:1: rule__RangeRule__Group_9__1 : rule__RangeRule__Group_9__1__Impl ;
     public final void rule__RangeRule__Group_9__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2850:1: ( rule__RangeRule__Group_9__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2851:2: rule__RangeRule__Group_9__1__Impl
+            // InternalValid.g:2850:1: ( rule__RangeRule__Group_9__1__Impl )
+            // InternalValid.g:2851:2: rule__RangeRule__Group_9__1__Impl
             {
-            pushFollow(FOLLOW_rule__RangeRule__Group_9__1__Impl_in_rule__RangeRule__Group_9__15683);
+            pushFollow(FOLLOW_2);
             rule__RangeRule__Group_9__1__Impl();
 
             state._fsp--;
@@ -7569,20 +7569,20 @@ public final void rule__RangeRule__Group_9__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__RangeRule__Group_9__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2857:1: rule__RangeRule__Group_9__1__Impl : ( '..' ) ;
+    // InternalValid.g:2857:1: rule__RangeRule__Group_9__1__Impl : ( '..' ) ;
     public final void rule__RangeRule__Group_9__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2861:1: ( ( '..' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2862:1: ( '..' )
+            // InternalValid.g:2861:1: ( ( '..' ) )
+            // InternalValid.g:2862:1: ( '..' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2862:1: ( '..' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2863:1: '..'
+            // InternalValid.g:2862:1: ( '..' )
+            // InternalValid.g:2863:1: '..'
             {
              before(grammarAccess.getRangeRuleAccess().getFullStopFullStopKeyword_9_1()); 
-            match(input,27,FOLLOW_27_in_rule__RangeRule__Group_9__1__Impl5711); 
+            match(input,27,FOLLOW_2); 
              after(grammarAccess.getRangeRuleAccess().getFullStopFullStopKeyword_9_1()); 
 
             }
@@ -7606,21 +7606,21 @@ public final void rule__RangeRule__Group_9__1__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__UniqueRule__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2880:1: rule__UniqueRule__Group__0 : rule__UniqueRule__Group__0__Impl rule__UniqueRule__Group__1 ;
+    // InternalValid.g:2880:1: rule__UniqueRule__Group__0 : rule__UniqueRule__Group__0__Impl rule__UniqueRule__Group__1 ;
     public final void rule__UniqueRule__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2884:1: ( rule__UniqueRule__Group__0__Impl rule__UniqueRule__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2885:2: rule__UniqueRule__Group__0__Impl rule__UniqueRule__Group__1
+            // InternalValid.g:2884:1: ( rule__UniqueRule__Group__0__Impl rule__UniqueRule__Group__1 )
+            // InternalValid.g:2885:2: rule__UniqueRule__Group__0__Impl rule__UniqueRule__Group__1
             {
-            pushFollow(FOLLOW_rule__UniqueRule__Group__0__Impl_in_rule__UniqueRule__Group__05746);
+            pushFollow(FOLLOW_24);
             rule__UniqueRule__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__UniqueRule__Group__1_in_rule__UniqueRule__Group__05749);
+            pushFollow(FOLLOW_2);
             rule__UniqueRule__Group__1();
 
             state._fsp--;
@@ -7644,23 +7644,23 @@ public final void rule__UniqueRule__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__UniqueRule__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2892:1: rule__UniqueRule__Group__0__Impl : ( ( rule__UniqueRule__UnorderedGroup_0 ) ) ;
+    // InternalValid.g:2892:1: rule__UniqueRule__Group__0__Impl : ( ( rule__UniqueRule__UnorderedGroup_0 ) ) ;
     public final void rule__UniqueRule__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2896:1: ( ( ( rule__UniqueRule__UnorderedGroup_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2897:1: ( ( rule__UniqueRule__UnorderedGroup_0 ) )
+            // InternalValid.g:2896:1: ( ( ( rule__UniqueRule__UnorderedGroup_0 ) ) )
+            // InternalValid.g:2897:1: ( ( rule__UniqueRule__UnorderedGroup_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2897:1: ( ( rule__UniqueRule__UnorderedGroup_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2898:1: ( rule__UniqueRule__UnorderedGroup_0 )
+            // InternalValid.g:2897:1: ( ( rule__UniqueRule__UnorderedGroup_0 ) )
+            // InternalValid.g:2898:1: ( rule__UniqueRule__UnorderedGroup_0 )
             {
              before(grammarAccess.getUniqueRuleAccess().getUnorderedGroup_0()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2899:1: ( rule__UniqueRule__UnorderedGroup_0 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2899:2: rule__UniqueRule__UnorderedGroup_0
+            // InternalValid.g:2899:1: ( rule__UniqueRule__UnorderedGroup_0 )
+            // InternalValid.g:2899:2: rule__UniqueRule__UnorderedGroup_0
             {
-            pushFollow(FOLLOW_rule__UniqueRule__UnorderedGroup_0_in_rule__UniqueRule__Group__0__Impl5776);
+            pushFollow(FOLLOW_2);
             rule__UniqueRule__UnorderedGroup_0();
 
             state._fsp--;
@@ -7691,21 +7691,21 @@ public final void rule__UniqueRule__Group__0__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__UniqueRule__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2909:1: rule__UniqueRule__Group__1 : rule__UniqueRule__Group__1__Impl rule__UniqueRule__Group__2 ;
+    // InternalValid.g:2909:1: rule__UniqueRule__Group__1 : rule__UniqueRule__Group__1__Impl rule__UniqueRule__Group__2 ;
     public final void rule__UniqueRule__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2913:1: ( rule__UniqueRule__Group__1__Impl rule__UniqueRule__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2914:2: rule__UniqueRule__Group__1__Impl rule__UniqueRule__Group__2
+            // InternalValid.g:2913:1: ( rule__UniqueRule__Group__1__Impl rule__UniqueRule__Group__2 )
+            // InternalValid.g:2914:2: rule__UniqueRule__Group__1__Impl rule__UniqueRule__Group__2
             {
-            pushFollow(FOLLOW_rule__UniqueRule__Group__1__Impl_in_rule__UniqueRule__Group__15806);
+            pushFollow(FOLLOW_12);
             rule__UniqueRule__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__UniqueRule__Group__2_in_rule__UniqueRule__Group__15809);
+            pushFollow(FOLLOW_2);
             rule__UniqueRule__Group__2();
 
             state._fsp--;
@@ -7729,20 +7729,20 @@ public final void rule__UniqueRule__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__UniqueRule__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2921:1: rule__UniqueRule__Group__1__Impl : ( 'unique' ) ;
+    // InternalValid.g:2921:1: rule__UniqueRule__Group__1__Impl : ( 'unique' ) ;
     public final void rule__UniqueRule__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2925:1: ( ( 'unique' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2926:1: ( 'unique' )
+            // InternalValid.g:2925:1: ( ( 'unique' ) )
+            // InternalValid.g:2926:1: ( 'unique' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2926:1: ( 'unique' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2927:1: 'unique'
+            // InternalValid.g:2926:1: ( 'unique' )
+            // InternalValid.g:2927:1: 'unique'
             {
              before(grammarAccess.getUniqueRuleAccess().getUniqueKeyword_1()); 
-            match(input,29,FOLLOW_29_in_rule__UniqueRule__Group__1__Impl5837); 
+            match(input,29,FOLLOW_2); 
              after(grammarAccess.getUniqueRuleAccess().getUniqueKeyword_1()); 
 
             }
@@ -7766,21 +7766,21 @@ public final void rule__UniqueRule__Group__1__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__UniqueRule__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2940:1: rule__UniqueRule__Group__2 : rule__UniqueRule__Group__2__Impl rule__UniqueRule__Group__3 ;
+    // InternalValid.g:2940:1: rule__UniqueRule__Group__2 : rule__UniqueRule__Group__2__Impl rule__UniqueRule__Group__3 ;
     public final void rule__UniqueRule__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2944:1: ( rule__UniqueRule__Group__2__Impl rule__UniqueRule__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2945:2: rule__UniqueRule__Group__2__Impl rule__UniqueRule__Group__3
+            // InternalValid.g:2944:1: ( rule__UniqueRule__Group__2__Impl rule__UniqueRule__Group__3 )
+            // InternalValid.g:2945:2: rule__UniqueRule__Group__2__Impl rule__UniqueRule__Group__3
             {
-            pushFollow(FOLLOW_rule__UniqueRule__Group__2__Impl_in_rule__UniqueRule__Group__25868);
+            pushFollow(FOLLOW_7);
             rule__UniqueRule__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__UniqueRule__Group__3_in_rule__UniqueRule__Group__25871);
+            pushFollow(FOLLOW_2);
             rule__UniqueRule__Group__3();
 
             state._fsp--;
@@ -7804,23 +7804,23 @@ public final void rule__UniqueRule__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__UniqueRule__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2952:1: rule__UniqueRule__Group__2__Impl : ( ( rule__UniqueRule__SeverityAssignment_2 ) ) ;
+    // InternalValid.g:2952:1: rule__UniqueRule__Group__2__Impl : ( ( rule__UniqueRule__SeverityAssignment_2 ) ) ;
     public final void rule__UniqueRule__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2956:1: ( ( ( rule__UniqueRule__SeverityAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2957:1: ( ( rule__UniqueRule__SeverityAssignment_2 ) )
+            // InternalValid.g:2956:1: ( ( ( rule__UniqueRule__SeverityAssignment_2 ) ) )
+            // InternalValid.g:2957:1: ( ( rule__UniqueRule__SeverityAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2957:1: ( ( rule__UniqueRule__SeverityAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2958:1: ( rule__UniqueRule__SeverityAssignment_2 )
+            // InternalValid.g:2957:1: ( ( rule__UniqueRule__SeverityAssignment_2 ) )
+            // InternalValid.g:2958:1: ( rule__UniqueRule__SeverityAssignment_2 )
             {
              before(grammarAccess.getUniqueRuleAccess().getSeverityAssignment_2()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2959:1: ( rule__UniqueRule__SeverityAssignment_2 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2959:2: rule__UniqueRule__SeverityAssignment_2
+            // InternalValid.g:2959:1: ( rule__UniqueRule__SeverityAssignment_2 )
+            // InternalValid.g:2959:2: rule__UniqueRule__SeverityAssignment_2
             {
-            pushFollow(FOLLOW_rule__UniqueRule__SeverityAssignment_2_in_rule__UniqueRule__Group__2__Impl5898);
+            pushFollow(FOLLOW_2);
             rule__UniqueRule__SeverityAssignment_2();
 
             state._fsp--;
@@ -7851,21 +7851,21 @@ public final void rule__UniqueRule__Group__2__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__UniqueRule__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2969:1: rule__UniqueRule__Group__3 : rule__UniqueRule__Group__3__Impl rule__UniqueRule__Group__4 ;
+    // InternalValid.g:2969:1: rule__UniqueRule__Group__3 : rule__UniqueRule__Group__3__Impl rule__UniqueRule__Group__4 ;
     public final void rule__UniqueRule__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2973:1: ( rule__UniqueRule__Group__3__Impl rule__UniqueRule__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2974:2: rule__UniqueRule__Group__3__Impl rule__UniqueRule__Group__4
+            // InternalValid.g:2973:1: ( rule__UniqueRule__Group__3__Impl rule__UniqueRule__Group__4 )
+            // InternalValid.g:2974:2: rule__UniqueRule__Group__3__Impl rule__UniqueRule__Group__4
             {
-            pushFollow(FOLLOW_rule__UniqueRule__Group__3__Impl_in_rule__UniqueRule__Group__35928);
+            pushFollow(FOLLOW_8);
             rule__UniqueRule__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__UniqueRule__Group__4_in_rule__UniqueRule__Group__35931);
+            pushFollow(FOLLOW_2);
             rule__UniqueRule__Group__4();
 
             state._fsp--;
@@ -7889,23 +7889,23 @@ public final void rule__UniqueRule__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__UniqueRule__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2981:1: rule__UniqueRule__Group__3__Impl : ( ( rule__UniqueRule__NameAssignment_3 ) ) ;
+    // InternalValid.g:2981:1: rule__UniqueRule__Group__3__Impl : ( ( rule__UniqueRule__NameAssignment_3 ) ) ;
     public final void rule__UniqueRule__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2985:1: ( ( ( rule__UniqueRule__NameAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2986:1: ( ( rule__UniqueRule__NameAssignment_3 ) )
+            // InternalValid.g:2985:1: ( ( ( rule__UniqueRule__NameAssignment_3 ) ) )
+            // InternalValid.g:2986:1: ( ( rule__UniqueRule__NameAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2986:1: ( ( rule__UniqueRule__NameAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2987:1: ( rule__UniqueRule__NameAssignment_3 )
+            // InternalValid.g:2986:1: ( ( rule__UniqueRule__NameAssignment_3 ) )
+            // InternalValid.g:2987:1: ( rule__UniqueRule__NameAssignment_3 )
             {
              before(grammarAccess.getUniqueRuleAccess().getNameAssignment_3()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2988:1: ( rule__UniqueRule__NameAssignment_3 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2988:2: rule__UniqueRule__NameAssignment_3
+            // InternalValid.g:2988:1: ( rule__UniqueRule__NameAssignment_3 )
+            // InternalValid.g:2988:2: rule__UniqueRule__NameAssignment_3
             {
-            pushFollow(FOLLOW_rule__UniqueRule__NameAssignment_3_in_rule__UniqueRule__Group__3__Impl5958);
+            pushFollow(FOLLOW_2);
             rule__UniqueRule__NameAssignment_3();
 
             state._fsp--;
@@ -7936,21 +7936,21 @@ public final void rule__UniqueRule__Group__3__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__UniqueRule__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:2998:1: rule__UniqueRule__Group__4 : rule__UniqueRule__Group__4__Impl rule__UniqueRule__Group__5 ;
+    // InternalValid.g:2998:1: rule__UniqueRule__Group__4 : rule__UniqueRule__Group__4__Impl rule__UniqueRule__Group__5 ;
     public final void rule__UniqueRule__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3002:1: ( rule__UniqueRule__Group__4__Impl rule__UniqueRule__Group__5 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3003:2: rule__UniqueRule__Group__4__Impl rule__UniqueRule__Group__5
+            // InternalValid.g:3002:1: ( rule__UniqueRule__Group__4__Impl rule__UniqueRule__Group__5 )
+            // InternalValid.g:3003:2: rule__UniqueRule__Group__4__Impl rule__UniqueRule__Group__5
             {
-            pushFollow(FOLLOW_rule__UniqueRule__Group__4__Impl_in_rule__UniqueRule__Group__45988);
+            pushFollow(FOLLOW_6);
             rule__UniqueRule__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__UniqueRule__Group__5_in_rule__UniqueRule__Group__45991);
+            pushFollow(FOLLOW_2);
             rule__UniqueRule__Group__5();
 
             state._fsp--;
@@ -7974,20 +7974,20 @@ public final void rule__UniqueRule__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__UniqueRule__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3010:1: rule__UniqueRule__Group__4__Impl : ( 'label' ) ;
+    // InternalValid.g:3010:1: rule__UniqueRule__Group__4__Impl : ( 'label' ) ;
     public final void rule__UniqueRule__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3014:1: ( ( 'label' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3015:1: ( 'label' )
+            // InternalValid.g:3014:1: ( ( 'label' ) )
+            // InternalValid.g:3015:1: ( 'label' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3015:1: ( 'label' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3016:1: 'label'
+            // InternalValid.g:3015:1: ( 'label' )
+            // InternalValid.g:3016:1: 'label'
             {
              before(grammarAccess.getUniqueRuleAccess().getLabelKeyword_4()); 
-            match(input,20,FOLLOW_20_in_rule__UniqueRule__Group__4__Impl6019); 
+            match(input,20,FOLLOW_2); 
              after(grammarAccess.getUniqueRuleAccess().getLabelKeyword_4()); 
 
             }
@@ -8011,21 +8011,21 @@ public final void rule__UniqueRule__Group__4__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__UniqueRule__Group__5"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3029:1: rule__UniqueRule__Group__5 : rule__UniqueRule__Group__5__Impl rule__UniqueRule__Group__6 ;
+    // InternalValid.g:3029:1: rule__UniqueRule__Group__5 : rule__UniqueRule__Group__5__Impl rule__UniqueRule__Group__6 ;
     public final void rule__UniqueRule__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3033:1: ( rule__UniqueRule__Group__5__Impl rule__UniqueRule__Group__6 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3034:2: rule__UniqueRule__Group__5__Impl rule__UniqueRule__Group__6
+            // InternalValid.g:3033:1: ( rule__UniqueRule__Group__5__Impl rule__UniqueRule__Group__6 )
+            // InternalValid.g:3034:2: rule__UniqueRule__Group__5__Impl rule__UniqueRule__Group__6
             {
-            pushFollow(FOLLOW_rule__UniqueRule__Group__5__Impl_in_rule__UniqueRule__Group__56050);
+            pushFollow(FOLLOW_25);
             rule__UniqueRule__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__UniqueRule__Group__6_in_rule__UniqueRule__Group__56053);
+            pushFollow(FOLLOW_2);
             rule__UniqueRule__Group__6();
 
             state._fsp--;
@@ -8049,23 +8049,23 @@ public final void rule__UniqueRule__Group__5() throws RecognitionException {
 
 
     // $ANTLR start "rule__UniqueRule__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3041:1: rule__UniqueRule__Group__5__Impl : ( ( rule__UniqueRule__LabelAssignment_5 ) ) ;
+    // InternalValid.g:3041:1: rule__UniqueRule__Group__5__Impl : ( ( rule__UniqueRule__LabelAssignment_5 ) ) ;
     public final void rule__UniqueRule__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3045:1: ( ( ( rule__UniqueRule__LabelAssignment_5 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3046:1: ( ( rule__UniqueRule__LabelAssignment_5 ) )
+            // InternalValid.g:3045:1: ( ( ( rule__UniqueRule__LabelAssignment_5 ) ) )
+            // InternalValid.g:3046:1: ( ( rule__UniqueRule__LabelAssignment_5 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3046:1: ( ( rule__UniqueRule__LabelAssignment_5 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3047:1: ( rule__UniqueRule__LabelAssignment_5 )
+            // InternalValid.g:3046:1: ( ( rule__UniqueRule__LabelAssignment_5 ) )
+            // InternalValid.g:3047:1: ( rule__UniqueRule__LabelAssignment_5 )
             {
              before(grammarAccess.getUniqueRuleAccess().getLabelAssignment_5()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3048:1: ( rule__UniqueRule__LabelAssignment_5 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3048:2: rule__UniqueRule__LabelAssignment_5
+            // InternalValid.g:3048:1: ( rule__UniqueRule__LabelAssignment_5 )
+            // InternalValid.g:3048:2: rule__UniqueRule__LabelAssignment_5
             {
-            pushFollow(FOLLOW_rule__UniqueRule__LabelAssignment_5_in_rule__UniqueRule__Group__5__Impl6080);
+            pushFollow(FOLLOW_2);
             rule__UniqueRule__LabelAssignment_5();
 
             state._fsp--;
@@ -8096,21 +8096,21 @@ public final void rule__UniqueRule__Group__5__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__UniqueRule__Group__6"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3058:1: rule__UniqueRule__Group__6 : rule__UniqueRule__Group__6__Impl rule__UniqueRule__Group__7 ;
+    // InternalValid.g:3058:1: rule__UniqueRule__Group__6 : rule__UniqueRule__Group__6__Impl rule__UniqueRule__Group__7 ;
     public final void rule__UniqueRule__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3062:1: ( rule__UniqueRule__Group__6__Impl rule__UniqueRule__Group__7 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3063:2: rule__UniqueRule__Group__6__Impl rule__UniqueRule__Group__7
+            // InternalValid.g:3062:1: ( rule__UniqueRule__Group__6__Impl rule__UniqueRule__Group__7 )
+            // InternalValid.g:3063:2: rule__UniqueRule__Group__6__Impl rule__UniqueRule__Group__7
             {
-            pushFollow(FOLLOW_rule__UniqueRule__Group__6__Impl_in_rule__UniqueRule__Group__66110);
+            pushFollow(FOLLOW_25);
             rule__UniqueRule__Group__6__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__UniqueRule__Group__7_in_rule__UniqueRule__Group__66113);
+            pushFollow(FOLLOW_2);
             rule__UniqueRule__Group__7();
 
             state._fsp--;
@@ -8134,20 +8134,20 @@ public final void rule__UniqueRule__Group__6() throws RecognitionException {
 
 
     // $ANTLR start "rule__UniqueRule__Group__6__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3070:1: rule__UniqueRule__Group__6__Impl : ( ( rule__UniqueRule__Group_6__0 )? ) ;
+    // InternalValid.g:3070:1: rule__UniqueRule__Group__6__Impl : ( ( rule__UniqueRule__Group_6__0 )? ) ;
     public final void rule__UniqueRule__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3074:1: ( ( ( rule__UniqueRule__Group_6__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3075:1: ( ( rule__UniqueRule__Group_6__0 )? )
+            // InternalValid.g:3074:1: ( ( ( rule__UniqueRule__Group_6__0 )? ) )
+            // InternalValid.g:3075:1: ( ( rule__UniqueRule__Group_6__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3075:1: ( ( rule__UniqueRule__Group_6__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3076:1: ( rule__UniqueRule__Group_6__0 )?
+            // InternalValid.g:3075:1: ( ( rule__UniqueRule__Group_6__0 )? )
+            // InternalValid.g:3076:1: ( rule__UniqueRule__Group_6__0 )?
             {
              before(grammarAccess.getUniqueRuleAccess().getGroup_6()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3077:1: ( rule__UniqueRule__Group_6__0 )?
+            // InternalValid.g:3077:1: ( rule__UniqueRule__Group_6__0 )?
             int alt20=2;
             int LA20_0 = input.LA(1);
 
@@ -8156,9 +8156,9 @@ public final void rule__UniqueRule__Group__6__Impl() throws RecognitionException
             }
             switch (alt20) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3077:2: rule__UniqueRule__Group_6__0
+                    // InternalValid.g:3077:2: rule__UniqueRule__Group_6__0
                     {
-                    pushFollow(FOLLOW_rule__UniqueRule__Group_6__0_in_rule__UniqueRule__Group__6__Impl6140);
+                    pushFollow(FOLLOW_2);
                     rule__UniqueRule__Group_6__0();
 
                     state._fsp--;
@@ -8192,21 +8192,21 @@ public final void rule__UniqueRule__Group__6__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__UniqueRule__Group__7"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3087:1: rule__UniqueRule__Group__7 : rule__UniqueRule__Group__7__Impl rule__UniqueRule__Group__8 ;
+    // InternalValid.g:3087:1: rule__UniqueRule__Group__7 : rule__UniqueRule__Group__7__Impl rule__UniqueRule__Group__8 ;
     public final void rule__UniqueRule__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3091:1: ( rule__UniqueRule__Group__7__Impl rule__UniqueRule__Group__8 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3092:2: rule__UniqueRule__Group__7__Impl rule__UniqueRule__Group__8
+            // InternalValid.g:3091:1: ( rule__UniqueRule__Group__7__Impl rule__UniqueRule__Group__8 )
+            // InternalValid.g:3092:2: rule__UniqueRule__Group__7__Impl rule__UniqueRule__Group__8
             {
-            pushFollow(FOLLOW_rule__UniqueRule__Group__7__Impl_in_rule__UniqueRule__Group__76171);
+            pushFollow(FOLLOW_25);
             rule__UniqueRule__Group__7__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__UniqueRule__Group__8_in_rule__UniqueRule__Group__76174);
+            pushFollow(FOLLOW_2);
             rule__UniqueRule__Group__8();
 
             state._fsp--;
@@ -8230,20 +8230,20 @@ public final void rule__UniqueRule__Group__7() throws RecognitionException {
 
 
     // $ANTLR start "rule__UniqueRule__Group__7__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3099:1: rule__UniqueRule__Group__7__Impl : ( ( rule__UniqueRule__Group_7__0 )? ) ;
+    // InternalValid.g:3099:1: rule__UniqueRule__Group__7__Impl : ( ( rule__UniqueRule__Group_7__0 )? ) ;
     public final void rule__UniqueRule__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3103:1: ( ( ( rule__UniqueRule__Group_7__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3104:1: ( ( rule__UniqueRule__Group_7__0 )? )
+            // InternalValid.g:3103:1: ( ( ( rule__UniqueRule__Group_7__0 )? ) )
+            // InternalValid.g:3104:1: ( ( rule__UniqueRule__Group_7__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3104:1: ( ( rule__UniqueRule__Group_7__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3105:1: ( rule__UniqueRule__Group_7__0 )?
+            // InternalValid.g:3104:1: ( ( rule__UniqueRule__Group_7__0 )? )
+            // InternalValid.g:3105:1: ( rule__UniqueRule__Group_7__0 )?
             {
              before(grammarAccess.getUniqueRuleAccess().getGroup_7()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3106:1: ( rule__UniqueRule__Group_7__0 )?
+            // InternalValid.g:3106:1: ( rule__UniqueRule__Group_7__0 )?
             int alt21=2;
             int LA21_0 = input.LA(1);
 
@@ -8252,9 +8252,9 @@ public final void rule__UniqueRule__Group__7__Impl() throws RecognitionException
             }
             switch (alt21) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3106:2: rule__UniqueRule__Group_7__0
+                    // InternalValid.g:3106:2: rule__UniqueRule__Group_7__0
                     {
-                    pushFollow(FOLLOW_rule__UniqueRule__Group_7__0_in_rule__UniqueRule__Group__7__Impl6201);
+                    pushFollow(FOLLOW_2);
                     rule__UniqueRule__Group_7__0();
 
                     state._fsp--;
@@ -8288,21 +8288,21 @@ public final void rule__UniqueRule__Group__7__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__UniqueRule__Group__8"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3116:1: rule__UniqueRule__Group__8 : rule__UniqueRule__Group__8__Impl rule__UniqueRule__Group__9 ;
+    // InternalValid.g:3116:1: rule__UniqueRule__Group__8 : rule__UniqueRule__Group__8__Impl rule__UniqueRule__Group__9 ;
     public final void rule__UniqueRule__Group__8() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3120:1: ( rule__UniqueRule__Group__8__Impl rule__UniqueRule__Group__9 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3121:2: rule__UniqueRule__Group__8__Impl rule__UniqueRule__Group__9
+            // InternalValid.g:3120:1: ( rule__UniqueRule__Group__8__Impl rule__UniqueRule__Group__9 )
+            // InternalValid.g:3121:2: rule__UniqueRule__Group__8__Impl rule__UniqueRule__Group__9
             {
-            pushFollow(FOLLOW_rule__UniqueRule__Group__8__Impl_in_rule__UniqueRule__Group__86232);
+            pushFollow(FOLLOW_15);
             rule__UniqueRule__Group__8__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__UniqueRule__Group__9_in_rule__UniqueRule__Group__86235);
+            pushFollow(FOLLOW_2);
             rule__UniqueRule__Group__9();
 
             state._fsp--;
@@ -8326,20 +8326,20 @@ public final void rule__UniqueRule__Group__8() throws RecognitionException {
 
 
     // $ANTLR start "rule__UniqueRule__Group__8__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3128:1: rule__UniqueRule__Group__8__Impl : ( 'context' ) ;
+    // InternalValid.g:3128:1: rule__UniqueRule__Group__8__Impl : ( 'context' ) ;
     public final void rule__UniqueRule__Group__8__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3132:1: ( ( 'context' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3133:1: ( 'context' )
+            // InternalValid.g:3132:1: ( ( 'context' ) )
+            // InternalValid.g:3133:1: ( 'context' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3133:1: ( 'context' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3134:1: 'context'
+            // InternalValid.g:3133:1: ( 'context' )
+            // InternalValid.g:3134:1: 'context'
             {
              before(grammarAccess.getUniqueRuleAccess().getContextKeyword_8()); 
-            match(input,25,FOLLOW_25_in_rule__UniqueRule__Group__8__Impl6263); 
+            match(input,25,FOLLOW_2); 
              after(grammarAccess.getUniqueRuleAccess().getContextKeyword_8()); 
 
             }
@@ -8363,21 +8363,21 @@ public final void rule__UniqueRule__Group__8__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__UniqueRule__Group__9"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3147:1: rule__UniqueRule__Group__9 : rule__UniqueRule__Group__9__Impl rule__UniqueRule__Group__10 ;
+    // InternalValid.g:3147:1: rule__UniqueRule__Group__9 : rule__UniqueRule__Group__9__Impl rule__UniqueRule__Group__10 ;
     public final void rule__UniqueRule__Group__9() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3151:1: ( rule__UniqueRule__Group__9__Impl rule__UniqueRule__Group__10 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3152:2: rule__UniqueRule__Group__9__Impl rule__UniqueRule__Group__10
+            // InternalValid.g:3151:1: ( rule__UniqueRule__Group__9__Impl rule__UniqueRule__Group__10 )
+            // InternalValid.g:3152:2: rule__UniqueRule__Group__9__Impl rule__UniqueRule__Group__10
             {
-            pushFollow(FOLLOW_rule__UniqueRule__Group__9__Impl_in_rule__UniqueRule__Group__96294);
+            pushFollow(FOLLOW_7);
             rule__UniqueRule__Group__9__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__UniqueRule__Group__10_in_rule__UniqueRule__Group__96297);
+            pushFollow(FOLLOW_2);
             rule__UniqueRule__Group__10();
 
             state._fsp--;
@@ -8401,20 +8401,20 @@ public final void rule__UniqueRule__Group__9() throws RecognitionException {
 
 
     // $ANTLR start "rule__UniqueRule__Group__9__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3159:1: rule__UniqueRule__Group__9__Impl : ( '{' ) ;
+    // InternalValid.g:3159:1: rule__UniqueRule__Group__9__Impl : ( '{' ) ;
     public final void rule__UniqueRule__Group__9__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3163:1: ( ( '{' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3164:1: ( '{' )
+            // InternalValid.g:3163:1: ( ( '{' ) )
+            // InternalValid.g:3164:1: ( '{' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3164:1: ( '{' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3165:1: '{'
+            // InternalValid.g:3164:1: ( '{' )
+            // InternalValid.g:3165:1: '{'
             {
              before(grammarAccess.getUniqueRuleAccess().getLeftCurlyBracketKeyword_9()); 
-            match(input,21,FOLLOW_21_in_rule__UniqueRule__Group__9__Impl6325); 
+            match(input,21,FOLLOW_2); 
              after(grammarAccess.getUniqueRuleAccess().getLeftCurlyBracketKeyword_9()); 
 
             }
@@ -8438,21 +8438,21 @@ public final void rule__UniqueRule__Group__9__Impl() throws RecognitionException
 
 
     // $ANTLR start "rule__UniqueRule__Group__10"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3178:1: rule__UniqueRule__Group__10 : rule__UniqueRule__Group__10__Impl rule__UniqueRule__Group__11 ;
+    // InternalValid.g:3178:1: rule__UniqueRule__Group__10 : rule__UniqueRule__Group__10__Impl rule__UniqueRule__Group__11 ;
     public final void rule__UniqueRule__Group__10() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3182:1: ( rule__UniqueRule__Group__10__Impl rule__UniqueRule__Group__11 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3183:2: rule__UniqueRule__Group__10__Impl rule__UniqueRule__Group__11
+            // InternalValid.g:3182:1: ( rule__UniqueRule__Group__10__Impl rule__UniqueRule__Group__11 )
+            // InternalValid.g:3183:2: rule__UniqueRule__Group__10__Impl rule__UniqueRule__Group__11
             {
-            pushFollow(FOLLOW_rule__UniqueRule__Group__10__Impl_in_rule__UniqueRule__Group__106356);
+            pushFollow(FOLLOW_16);
             rule__UniqueRule__Group__10__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__UniqueRule__Group__11_in_rule__UniqueRule__Group__106359);
+            pushFollow(FOLLOW_2);
             rule__UniqueRule__Group__11();
 
             state._fsp--;
@@ -8476,26 +8476,26 @@ public final void rule__UniqueRule__Group__10() throws RecognitionException {
 
 
     // $ANTLR start "rule__UniqueRule__Group__10__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3190:1: rule__UniqueRule__Group__10__Impl : ( ( ( rule__UniqueRule__ContextsAssignment_10 ) ) ( ( rule__UniqueRule__ContextsAssignment_10 )* ) ) ;
+    // InternalValid.g:3190:1: rule__UniqueRule__Group__10__Impl : ( ( ( rule__UniqueRule__ContextsAssignment_10 ) ) ( ( rule__UniqueRule__ContextsAssignment_10 )* ) ) ;
     public final void rule__UniqueRule__Group__10__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3194:1: ( ( ( ( rule__UniqueRule__ContextsAssignment_10 ) ) ( ( rule__UniqueRule__ContextsAssignment_10 )* ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3195:1: ( ( ( rule__UniqueRule__ContextsAssignment_10 ) ) ( ( rule__UniqueRule__ContextsAssignment_10 )* ) )
+            // InternalValid.g:3194:1: ( ( ( ( rule__UniqueRule__ContextsAssignment_10 ) ) ( ( rule__UniqueRule__ContextsAssignment_10 )* ) ) )
+            // InternalValid.g:3195:1: ( ( ( rule__UniqueRule__ContextsAssignment_10 ) ) ( ( rule__UniqueRule__ContextsAssignment_10 )* ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3195:1: ( ( ( rule__UniqueRule__ContextsAssignment_10 ) ) ( ( rule__UniqueRule__ContextsAssignment_10 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3196:1: ( ( rule__UniqueRule__ContextsAssignment_10 ) ) ( ( rule__UniqueRule__ContextsAssignment_10 )* )
+            // InternalValid.g:3195:1: ( ( ( rule__UniqueRule__ContextsAssignment_10 ) ) ( ( rule__UniqueRule__ContextsAssignment_10 )* ) )
+            // InternalValid.g:3196:1: ( ( rule__UniqueRule__ContextsAssignment_10 ) ) ( ( rule__UniqueRule__ContextsAssignment_10 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3196:1: ( ( rule__UniqueRule__ContextsAssignment_10 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3197:1: ( rule__UniqueRule__ContextsAssignment_10 )
+            // InternalValid.g:3196:1: ( ( rule__UniqueRule__ContextsAssignment_10 ) )
+            // InternalValid.g:3197:1: ( rule__UniqueRule__ContextsAssignment_10 )
             {
              before(grammarAccess.getUniqueRuleAccess().getContextsAssignment_10()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3198:1: ( rule__UniqueRule__ContextsAssignment_10 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3198:2: rule__UniqueRule__ContextsAssignment_10
+            // InternalValid.g:3198:1: ( rule__UniqueRule__ContextsAssignment_10 )
+            // InternalValid.g:3198:2: rule__UniqueRule__ContextsAssignment_10
             {
-            pushFollow(FOLLOW_rule__UniqueRule__ContextsAssignment_10_in_rule__UniqueRule__Group__10__Impl6388);
+            pushFollow(FOLLOW_17);
             rule__UniqueRule__ContextsAssignment_10();
 
             state._fsp--;
@@ -8507,11 +8507,11 @@ public final void rule__UniqueRule__Group__10__Impl() throws RecognitionExceptio
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3201:1: ( ( rule__UniqueRule__ContextsAssignment_10 )* )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3202:1: ( rule__UniqueRule__ContextsAssignment_10 )*
+            // InternalValid.g:3201:1: ( ( rule__UniqueRule__ContextsAssignment_10 )* )
+            // InternalValid.g:3202:1: ( rule__UniqueRule__ContextsAssignment_10 )*
             {
              before(grammarAccess.getUniqueRuleAccess().getContextsAssignment_10()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3203:1: ( rule__UniqueRule__ContextsAssignment_10 )*
+            // InternalValid.g:3203:1: ( rule__UniqueRule__ContextsAssignment_10 )*
             loop22:
             do {
                 int alt22=2;
@@ -8524,9 +8524,9 @@ public final void rule__UniqueRule__Group__10__Impl() throws RecognitionExceptio
 
                 switch (alt22) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3203:2: rule__UniqueRule__ContextsAssignment_10
+            	    // InternalValid.g:3203:2: rule__UniqueRule__ContextsAssignment_10
             	    {
-            	    pushFollow(FOLLOW_rule__UniqueRule__ContextsAssignment_10_in_rule__UniqueRule__Group__10__Impl6400);
+            	    pushFollow(FOLLOW_17);
             	    rule__UniqueRule__ContextsAssignment_10();
 
             	    state._fsp--;
@@ -8566,16 +8566,16 @@ public final void rule__UniqueRule__Group__10__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__UniqueRule__Group__11"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3214:1: rule__UniqueRule__Group__11 : rule__UniqueRule__Group__11__Impl ;
+    // InternalValid.g:3214:1: rule__UniqueRule__Group__11 : rule__UniqueRule__Group__11__Impl ;
     public final void rule__UniqueRule__Group__11() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3218:1: ( rule__UniqueRule__Group__11__Impl )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3219:2: rule__UniqueRule__Group__11__Impl
+            // InternalValid.g:3218:1: ( rule__UniqueRule__Group__11__Impl )
+            // InternalValid.g:3219:2: rule__UniqueRule__Group__11__Impl
             {
-            pushFollow(FOLLOW_rule__UniqueRule__Group__11__Impl_in_rule__UniqueRule__Group__116433);
+            pushFollow(FOLLOW_2);
             rule__UniqueRule__Group__11__Impl();
 
             state._fsp--;
@@ -8599,20 +8599,20 @@ public final void rule__UniqueRule__Group__11() throws RecognitionException {
 
 
     // $ANTLR start "rule__UniqueRule__Group__11__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3225:1: rule__UniqueRule__Group__11__Impl : ( '}' ) ;
+    // InternalValid.g:3225:1: rule__UniqueRule__Group__11__Impl : ( '}' ) ;
     public final void rule__UniqueRule__Group__11__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3229:1: ( ( '}' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3230:1: ( '}' )
+            // InternalValid.g:3229:1: ( ( '}' ) )
+            // InternalValid.g:3230:1: ( '}' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3230:1: ( '}' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3231:1: '}'
+            // InternalValid.g:3230:1: ( '}' )
+            // InternalValid.g:3231:1: '}'
             {
              before(grammarAccess.getUniqueRuleAccess().getRightCurlyBracketKeyword_11()); 
-            match(input,22,FOLLOW_22_in_rule__UniqueRule__Group__11__Impl6461); 
+            match(input,22,FOLLOW_2); 
              after(grammarAccess.getUniqueRuleAccess().getRightCurlyBracketKeyword_11()); 
 
             }
@@ -8636,21 +8636,21 @@ public final void rule__UniqueRule__Group__11__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__UniqueRule__Group_6__0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3268:1: rule__UniqueRule__Group_6__0 : rule__UniqueRule__Group_6__0__Impl rule__UniqueRule__Group_6__1 ;
+    // InternalValid.g:3268:1: rule__UniqueRule__Group_6__0 : rule__UniqueRule__Group_6__0__Impl rule__UniqueRule__Group_6__1 ;
     public final void rule__UniqueRule__Group_6__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3272:1: ( rule__UniqueRule__Group_6__0__Impl rule__UniqueRule__Group_6__1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3273:2: rule__UniqueRule__Group_6__0__Impl rule__UniqueRule__Group_6__1
+            // InternalValid.g:3272:1: ( rule__UniqueRule__Group_6__0__Impl rule__UniqueRule__Group_6__1 )
+            // InternalValid.g:3273:2: rule__UniqueRule__Group_6__0__Impl rule__UniqueRule__Group_6__1
             {
-            pushFollow(FOLLOW_rule__UniqueRule__Group_6__0__Impl_in_rule__UniqueRule__Group_6__06516);
+            pushFollow(FOLLOW_6);
             rule__UniqueRule__Group_6__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__UniqueRule__Group_6__1_in_rule__UniqueRule__Group_6__06519);
+            pushFollow(FOLLOW_2);
             rule__UniqueRule__Group_6__1();
 
             state._fsp--;
@@ -8674,20 +8674,20 @@ public final void rule__UniqueRule__Group_6__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__UniqueRule__Group_6__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3280:1: rule__UniqueRule__Group_6__0__Impl : ( 'description' ) ;
+    // InternalValid.g:3280:1: rule__UniqueRule__Group_6__0__Impl : ( 'description' ) ;
     public final void rule__UniqueRule__Group_6__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3284:1: ( ( 'description' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3285:1: ( 'description' )
+            // InternalValid.g:3284:1: ( ( 'description' ) )
+            // InternalValid.g:3285:1: ( 'description' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3285:1: ( 'description' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3286:1: 'description'
+            // InternalValid.g:3285:1: ( 'description' )
+            // InternalValid.g:3286:1: 'description'
             {
              before(grammarAccess.getUniqueRuleAccess().getDescriptionKeyword_6_0()); 
-            match(input,23,FOLLOW_23_in_rule__UniqueRule__Group_6__0__Impl6547); 
+            match(input,23,FOLLOW_2); 
              after(grammarAccess.getUniqueRuleAccess().getDescriptionKeyword_6_0()); 
 
             }
@@ -8711,16 +8711,16 @@ public final void rule__UniqueRule__Group_6__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__UniqueRule__Group_6__1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3299:1: rule__UniqueRule__Group_6__1 : rule__UniqueRule__Group_6__1__Impl ;
+    // InternalValid.g:3299:1: rule__UniqueRule__Group_6__1 : rule__UniqueRule__Group_6__1__Impl ;
     public final void rule__UniqueRule__Group_6__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3303:1: ( rule__UniqueRule__Group_6__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3304:2: rule__UniqueRule__Group_6__1__Impl
+            // InternalValid.g:3303:1: ( rule__UniqueRule__Group_6__1__Impl )
+            // InternalValid.g:3304:2: rule__UniqueRule__Group_6__1__Impl
             {
-            pushFollow(FOLLOW_rule__UniqueRule__Group_6__1__Impl_in_rule__UniqueRule__Group_6__16578);
+            pushFollow(FOLLOW_2);
             rule__UniqueRule__Group_6__1__Impl();
 
             state._fsp--;
@@ -8744,23 +8744,23 @@ public final void rule__UniqueRule__Group_6__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__UniqueRule__Group_6__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3310:1: rule__UniqueRule__Group_6__1__Impl : ( ( rule__UniqueRule__DescriptionAssignment_6_1 ) ) ;
+    // InternalValid.g:3310:1: rule__UniqueRule__Group_6__1__Impl : ( ( rule__UniqueRule__DescriptionAssignment_6_1 ) ) ;
     public final void rule__UniqueRule__Group_6__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3314:1: ( ( ( rule__UniqueRule__DescriptionAssignment_6_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3315:1: ( ( rule__UniqueRule__DescriptionAssignment_6_1 ) )
+            // InternalValid.g:3314:1: ( ( ( rule__UniqueRule__DescriptionAssignment_6_1 ) ) )
+            // InternalValid.g:3315:1: ( ( rule__UniqueRule__DescriptionAssignment_6_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3315:1: ( ( rule__UniqueRule__DescriptionAssignment_6_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3316:1: ( rule__UniqueRule__DescriptionAssignment_6_1 )
+            // InternalValid.g:3315:1: ( ( rule__UniqueRule__DescriptionAssignment_6_1 ) )
+            // InternalValid.g:3316:1: ( rule__UniqueRule__DescriptionAssignment_6_1 )
             {
              before(grammarAccess.getUniqueRuleAccess().getDescriptionAssignment_6_1()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3317:1: ( rule__UniqueRule__DescriptionAssignment_6_1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3317:2: rule__UniqueRule__DescriptionAssignment_6_1
+            // InternalValid.g:3317:1: ( rule__UniqueRule__DescriptionAssignment_6_1 )
+            // InternalValid.g:3317:2: rule__UniqueRule__DescriptionAssignment_6_1
             {
-            pushFollow(FOLLOW_rule__UniqueRule__DescriptionAssignment_6_1_in_rule__UniqueRule__Group_6__1__Impl6605);
+            pushFollow(FOLLOW_2);
             rule__UniqueRule__DescriptionAssignment_6_1();
 
             state._fsp--;
@@ -8791,21 +8791,21 @@ public final void rule__UniqueRule__Group_6__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__UniqueRule__Group_7__0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3331:1: rule__UniqueRule__Group_7__0 : rule__UniqueRule__Group_7__0__Impl rule__UniqueRule__Group_7__1 ;
+    // InternalValid.g:3331:1: rule__UniqueRule__Group_7__0 : rule__UniqueRule__Group_7__0__Impl rule__UniqueRule__Group_7__1 ;
     public final void rule__UniqueRule__Group_7__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3335:1: ( rule__UniqueRule__Group_7__0__Impl rule__UniqueRule__Group_7__1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3336:2: rule__UniqueRule__Group_7__0__Impl rule__UniqueRule__Group_7__1
+            // InternalValid.g:3335:1: ( rule__UniqueRule__Group_7__0__Impl rule__UniqueRule__Group_7__1 )
+            // InternalValid.g:3336:2: rule__UniqueRule__Group_7__0__Impl rule__UniqueRule__Group_7__1
             {
-            pushFollow(FOLLOW_rule__UniqueRule__Group_7__0__Impl_in_rule__UniqueRule__Group_7__06639);
+            pushFollow(FOLLOW_6);
             rule__UniqueRule__Group_7__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__UniqueRule__Group_7__1_in_rule__UniqueRule__Group_7__06642);
+            pushFollow(FOLLOW_2);
             rule__UniqueRule__Group_7__1();
 
             state._fsp--;
@@ -8829,20 +8829,20 @@ public final void rule__UniqueRule__Group_7__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__UniqueRule__Group_7__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3343:1: rule__UniqueRule__Group_7__0__Impl : ( 'message' ) ;
+    // InternalValid.g:3343:1: rule__UniqueRule__Group_7__0__Impl : ( 'message' ) ;
     public final void rule__UniqueRule__Group_7__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3347:1: ( ( 'message' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3348:1: ( 'message' )
+            // InternalValid.g:3347:1: ( ( 'message' ) )
+            // InternalValid.g:3348:1: ( 'message' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3348:1: ( 'message' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3349:1: 'message'
+            // InternalValid.g:3348:1: ( 'message' )
+            // InternalValid.g:3349:1: 'message'
             {
              before(grammarAccess.getUniqueRuleAccess().getMessageKeyword_7_0()); 
-            match(input,24,FOLLOW_24_in_rule__UniqueRule__Group_7__0__Impl6670); 
+            match(input,24,FOLLOW_2); 
              after(grammarAccess.getUniqueRuleAccess().getMessageKeyword_7_0()); 
 
             }
@@ -8866,16 +8866,16 @@ public final void rule__UniqueRule__Group_7__0__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__UniqueRule__Group_7__1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3362:1: rule__UniqueRule__Group_7__1 : rule__UniqueRule__Group_7__1__Impl ;
+    // InternalValid.g:3362:1: rule__UniqueRule__Group_7__1 : rule__UniqueRule__Group_7__1__Impl ;
     public final void rule__UniqueRule__Group_7__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3366:1: ( rule__UniqueRule__Group_7__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3367:2: rule__UniqueRule__Group_7__1__Impl
+            // InternalValid.g:3366:1: ( rule__UniqueRule__Group_7__1__Impl )
+            // InternalValid.g:3367:2: rule__UniqueRule__Group_7__1__Impl
             {
-            pushFollow(FOLLOW_rule__UniqueRule__Group_7__1__Impl_in_rule__UniqueRule__Group_7__16701);
+            pushFollow(FOLLOW_2);
             rule__UniqueRule__Group_7__1__Impl();
 
             state._fsp--;
@@ -8899,23 +8899,23 @@ public final void rule__UniqueRule__Group_7__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__UniqueRule__Group_7__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3373:1: rule__UniqueRule__Group_7__1__Impl : ( ( rule__UniqueRule__MessageAssignment_7_1 ) ) ;
+    // InternalValid.g:3373:1: rule__UniqueRule__Group_7__1__Impl : ( ( rule__UniqueRule__MessageAssignment_7_1 ) ) ;
     public final void rule__UniqueRule__Group_7__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3377:1: ( ( ( rule__UniqueRule__MessageAssignment_7_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3378:1: ( ( rule__UniqueRule__MessageAssignment_7_1 ) )
+            // InternalValid.g:3377:1: ( ( ( rule__UniqueRule__MessageAssignment_7_1 ) ) )
+            // InternalValid.g:3378:1: ( ( rule__UniqueRule__MessageAssignment_7_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3378:1: ( ( rule__UniqueRule__MessageAssignment_7_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3379:1: ( rule__UniqueRule__MessageAssignment_7_1 )
+            // InternalValid.g:3378:1: ( ( rule__UniqueRule__MessageAssignment_7_1 ) )
+            // InternalValid.g:3379:1: ( rule__UniqueRule__MessageAssignment_7_1 )
             {
              before(grammarAccess.getUniqueRuleAccess().getMessageAssignment_7_1()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3380:1: ( rule__UniqueRule__MessageAssignment_7_1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3380:2: rule__UniqueRule__MessageAssignment_7_1
+            // InternalValid.g:3380:1: ( rule__UniqueRule__MessageAssignment_7_1 )
+            // InternalValid.g:3380:2: rule__UniqueRule__MessageAssignment_7_1
             {
-            pushFollow(FOLLOW_rule__UniqueRule__MessageAssignment_7_1_in_rule__UniqueRule__Group_7__1__Impl6728);
+            pushFollow(FOLLOW_2);
             rule__UniqueRule__MessageAssignment_7_1();
 
             state._fsp--;
@@ -8946,21 +8946,21 @@ public final void rule__UniqueRule__Group_7__1__Impl() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__SimpleContext__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3394:1: rule__SimpleContext__Group__0 : rule__SimpleContext__Group__0__Impl rule__SimpleContext__Group__1 ;
+    // InternalValid.g:3394:1: rule__SimpleContext__Group__0 : rule__SimpleContext__Group__0__Impl rule__SimpleContext__Group__1 ;
     public final void rule__SimpleContext__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3398:1: ( rule__SimpleContext__Group__0__Impl rule__SimpleContext__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3399:2: rule__SimpleContext__Group__0__Impl rule__SimpleContext__Group__1
+            // InternalValid.g:3398:1: ( rule__SimpleContext__Group__0__Impl rule__SimpleContext__Group__1 )
+            // InternalValid.g:3399:2: rule__SimpleContext__Group__0__Impl rule__SimpleContext__Group__1
             {
-            pushFollow(FOLLOW_rule__SimpleContext__Group__0__Impl_in_rule__SimpleContext__Group__06762);
+            pushFollow(FOLLOW_26);
             rule__SimpleContext__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleContext__Group__1_in_rule__SimpleContext__Group__06765);
+            pushFollow(FOLLOW_2);
             rule__SimpleContext__Group__1();
 
             state._fsp--;
@@ -8984,23 +8984,23 @@ public final void rule__SimpleContext__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__SimpleContext__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3406:1: rule__SimpleContext__Group__0__Impl : ( ( rule__SimpleContext__ContextTypeAssignment_0 ) ) ;
+    // InternalValid.g:3406:1: rule__SimpleContext__Group__0__Impl : ( ( rule__SimpleContext__ContextTypeAssignment_0 ) ) ;
     public final void rule__SimpleContext__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3410:1: ( ( ( rule__SimpleContext__ContextTypeAssignment_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3411:1: ( ( rule__SimpleContext__ContextTypeAssignment_0 ) )
+            // InternalValid.g:3410:1: ( ( ( rule__SimpleContext__ContextTypeAssignment_0 ) ) )
+            // InternalValid.g:3411:1: ( ( rule__SimpleContext__ContextTypeAssignment_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3411:1: ( ( rule__SimpleContext__ContextTypeAssignment_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3412:1: ( rule__SimpleContext__ContextTypeAssignment_0 )
+            // InternalValid.g:3411:1: ( ( rule__SimpleContext__ContextTypeAssignment_0 ) )
+            // InternalValid.g:3412:1: ( rule__SimpleContext__ContextTypeAssignment_0 )
             {
              before(grammarAccess.getSimpleContextAccess().getContextTypeAssignment_0()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3413:1: ( rule__SimpleContext__ContextTypeAssignment_0 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3413:2: rule__SimpleContext__ContextTypeAssignment_0
+            // InternalValid.g:3413:1: ( rule__SimpleContext__ContextTypeAssignment_0 )
+            // InternalValid.g:3413:2: rule__SimpleContext__ContextTypeAssignment_0
             {
-            pushFollow(FOLLOW_rule__SimpleContext__ContextTypeAssignment_0_in_rule__SimpleContext__Group__0__Impl6792);
+            pushFollow(FOLLOW_2);
             rule__SimpleContext__ContextTypeAssignment_0();
 
             state._fsp--;
@@ -9031,21 +9031,21 @@ public final void rule__SimpleContext__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__SimpleContext__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3423:1: rule__SimpleContext__Group__1 : rule__SimpleContext__Group__1__Impl rule__SimpleContext__Group__2 ;
+    // InternalValid.g:3423:1: rule__SimpleContext__Group__1 : rule__SimpleContext__Group__1__Impl rule__SimpleContext__Group__2 ;
     public final void rule__SimpleContext__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3427:1: ( rule__SimpleContext__Group__1__Impl rule__SimpleContext__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3428:2: rule__SimpleContext__Group__1__Impl rule__SimpleContext__Group__2
+            // InternalValid.g:3427:1: ( rule__SimpleContext__Group__1__Impl rule__SimpleContext__Group__2 )
+            // InternalValid.g:3428:2: rule__SimpleContext__Group__1__Impl rule__SimpleContext__Group__2
             {
-            pushFollow(FOLLOW_rule__SimpleContext__Group__1__Impl_in_rule__SimpleContext__Group__16822);
+            pushFollow(FOLLOW_26);
             rule__SimpleContext__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleContext__Group__2_in_rule__SimpleContext__Group__16825);
+            pushFollow(FOLLOW_2);
             rule__SimpleContext__Group__2();
 
             state._fsp--;
@@ -9069,20 +9069,20 @@ public final void rule__SimpleContext__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__SimpleContext__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3435:1: rule__SimpleContext__Group__1__Impl : ( ( rule__SimpleContext__Group_1__0 )? ) ;
+    // InternalValid.g:3435:1: rule__SimpleContext__Group__1__Impl : ( ( rule__SimpleContext__Group_1__0 )? ) ;
     public final void rule__SimpleContext__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3439:1: ( ( ( rule__SimpleContext__Group_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3440:1: ( ( rule__SimpleContext__Group_1__0 )? )
+            // InternalValid.g:3439:1: ( ( ( rule__SimpleContext__Group_1__0 )? ) )
+            // InternalValid.g:3440:1: ( ( rule__SimpleContext__Group_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3440:1: ( ( rule__SimpleContext__Group_1__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3441:1: ( rule__SimpleContext__Group_1__0 )?
+            // InternalValid.g:3440:1: ( ( rule__SimpleContext__Group_1__0 )? )
+            // InternalValid.g:3441:1: ( rule__SimpleContext__Group_1__0 )?
             {
              before(grammarAccess.getSimpleContextAccess().getGroup_1()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3442:1: ( rule__SimpleContext__Group_1__0 )?
+            // InternalValid.g:3442:1: ( rule__SimpleContext__Group_1__0 )?
             int alt23=2;
             int LA23_0 = input.LA(1);
 
@@ -9091,9 +9091,9 @@ public final void rule__SimpleContext__Group__1__Impl() throws RecognitionExcept
             }
             switch (alt23) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3442:2: rule__SimpleContext__Group_1__0
+                    // InternalValid.g:3442:2: rule__SimpleContext__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__SimpleContext__Group_1__0_in_rule__SimpleContext__Group__1__Impl6852);
+                    pushFollow(FOLLOW_2);
                     rule__SimpleContext__Group_1__0();
 
                     state._fsp--;
@@ -9127,16 +9127,16 @@ public final void rule__SimpleContext__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__SimpleContext__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3452:1: rule__SimpleContext__Group__2 : rule__SimpleContext__Group__2__Impl ;
+    // InternalValid.g:3452:1: rule__SimpleContext__Group__2 : rule__SimpleContext__Group__2__Impl ;
     public final void rule__SimpleContext__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3456:1: ( rule__SimpleContext__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3457:2: rule__SimpleContext__Group__2__Impl
+            // InternalValid.g:3456:1: ( rule__SimpleContext__Group__2__Impl )
+            // InternalValid.g:3457:2: rule__SimpleContext__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__SimpleContext__Group__2__Impl_in_rule__SimpleContext__Group__26883);
+            pushFollow(FOLLOW_2);
             rule__SimpleContext__Group__2__Impl();
 
             state._fsp--;
@@ -9160,20 +9160,20 @@ public final void rule__SimpleContext__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__SimpleContext__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3463:1: rule__SimpleContext__Group__2__Impl : ( ';' ) ;
+    // InternalValid.g:3463:1: rule__SimpleContext__Group__2__Impl : ( ';' ) ;
     public final void rule__SimpleContext__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3467:1: ( ( ';' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3468:1: ( ';' )
+            // InternalValid.g:3467:1: ( ( ';' ) )
+            // InternalValid.g:3468:1: ( ';' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3468:1: ( ';' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3469:1: ';'
+            // InternalValid.g:3468:1: ( ';' )
+            // InternalValid.g:3469:1: ';'
             {
              before(grammarAccess.getSimpleContextAccess().getSemicolonKeyword_2()); 
-            match(input,30,FOLLOW_30_in_rule__SimpleContext__Group__2__Impl6911); 
+            match(input,30,FOLLOW_2); 
              after(grammarAccess.getSimpleContextAccess().getSemicolonKeyword_2()); 
 
             }
@@ -9197,21 +9197,21 @@ public final void rule__SimpleContext__Group__2__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__SimpleContext__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3488:1: rule__SimpleContext__Group_1__0 : rule__SimpleContext__Group_1__0__Impl rule__SimpleContext__Group_1__1 ;
+    // InternalValid.g:3488:1: rule__SimpleContext__Group_1__0 : rule__SimpleContext__Group_1__0__Impl rule__SimpleContext__Group_1__1 ;
     public final void rule__SimpleContext__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3492:1: ( rule__SimpleContext__Group_1__0__Impl rule__SimpleContext__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3493:2: rule__SimpleContext__Group_1__0__Impl rule__SimpleContext__Group_1__1
+            // InternalValid.g:3492:1: ( rule__SimpleContext__Group_1__0__Impl rule__SimpleContext__Group_1__1 )
+            // InternalValid.g:3493:2: rule__SimpleContext__Group_1__0__Impl rule__SimpleContext__Group_1__1
             {
-            pushFollow(FOLLOW_rule__SimpleContext__Group_1__0__Impl_in_rule__SimpleContext__Group_1__06948);
+            pushFollow(FOLLOW_7);
             rule__SimpleContext__Group_1__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__SimpleContext__Group_1__1_in_rule__SimpleContext__Group_1__06951);
+            pushFollow(FOLLOW_2);
             rule__SimpleContext__Group_1__1();
 
             state._fsp--;
@@ -9235,20 +9235,20 @@ public final void rule__SimpleContext__Group_1__0() throws RecognitionException
 
 
     // $ANTLR start "rule__SimpleContext__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3500:1: rule__SimpleContext__Group_1__0__Impl : ( '#' ) ;
+    // InternalValid.g:3500:1: rule__SimpleContext__Group_1__0__Impl : ( '#' ) ;
     public final void rule__SimpleContext__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3504:1: ( ( '#' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3505:1: ( '#' )
+            // InternalValid.g:3504:1: ( ( '#' ) )
+            // InternalValid.g:3505:1: ( '#' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3505:1: ( '#' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3506:1: '#'
+            // InternalValid.g:3505:1: ( '#' )
+            // InternalValid.g:3506:1: '#'
             {
              before(grammarAccess.getSimpleContextAccess().getNumberSignKeyword_1_0()); 
-            match(input,31,FOLLOW_31_in_rule__SimpleContext__Group_1__0__Impl6979); 
+            match(input,31,FOLLOW_2); 
              after(grammarAccess.getSimpleContextAccess().getNumberSignKeyword_1_0()); 
 
             }
@@ -9272,16 +9272,16 @@ public final void rule__SimpleContext__Group_1__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__SimpleContext__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3519:1: rule__SimpleContext__Group_1__1 : rule__SimpleContext__Group_1__1__Impl ;
+    // InternalValid.g:3519:1: rule__SimpleContext__Group_1__1 : rule__SimpleContext__Group_1__1__Impl ;
     public final void rule__SimpleContext__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3523:1: ( rule__SimpleContext__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3524:2: rule__SimpleContext__Group_1__1__Impl
+            // InternalValid.g:3523:1: ( rule__SimpleContext__Group_1__1__Impl )
+            // InternalValid.g:3524:2: rule__SimpleContext__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__SimpleContext__Group_1__1__Impl_in_rule__SimpleContext__Group_1__17010);
+            pushFollow(FOLLOW_2);
             rule__SimpleContext__Group_1__1__Impl();
 
             state._fsp--;
@@ -9305,23 +9305,23 @@ public final void rule__SimpleContext__Group_1__1() throws RecognitionException
 
 
     // $ANTLR start "rule__SimpleContext__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3530:1: rule__SimpleContext__Group_1__1__Impl : ( ( rule__SimpleContext__ContextFeatureAssignment_1_1 ) ) ;
+    // InternalValid.g:3530:1: rule__SimpleContext__Group_1__1__Impl : ( ( rule__SimpleContext__ContextFeatureAssignment_1_1 ) ) ;
     public final void rule__SimpleContext__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3534:1: ( ( ( rule__SimpleContext__ContextFeatureAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3535:1: ( ( rule__SimpleContext__ContextFeatureAssignment_1_1 ) )
+            // InternalValid.g:3534:1: ( ( ( rule__SimpleContext__ContextFeatureAssignment_1_1 ) ) )
+            // InternalValid.g:3535:1: ( ( rule__SimpleContext__ContextFeatureAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3535:1: ( ( rule__SimpleContext__ContextFeatureAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3536:1: ( rule__SimpleContext__ContextFeatureAssignment_1_1 )
+            // InternalValid.g:3535:1: ( ( rule__SimpleContext__ContextFeatureAssignment_1_1 ) )
+            // InternalValid.g:3536:1: ( rule__SimpleContext__ContextFeatureAssignment_1_1 )
             {
              before(grammarAccess.getSimpleContextAccess().getContextFeatureAssignment_1_1()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3537:1: ( rule__SimpleContext__ContextFeatureAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3537:2: rule__SimpleContext__ContextFeatureAssignment_1_1
+            // InternalValid.g:3537:1: ( rule__SimpleContext__ContextFeatureAssignment_1_1 )
+            // InternalValid.g:3537:2: rule__SimpleContext__ContextFeatureAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__SimpleContext__ContextFeatureAssignment_1_1_in_rule__SimpleContext__Group_1__1__Impl7037);
+            pushFollow(FOLLOW_2);
             rule__SimpleContext__ContextFeatureAssignment_1_1();
 
             state._fsp--;
@@ -9352,21 +9352,21 @@ public final void rule__SimpleContext__Group_1__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__DuplicateContext__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3551:1: rule__DuplicateContext__Group__0 : rule__DuplicateContext__Group__0__Impl rule__DuplicateContext__Group__1 ;
+    // InternalValid.g:3551:1: rule__DuplicateContext__Group__0 : rule__DuplicateContext__Group__0__Impl rule__DuplicateContext__Group__1 ;
     public final void rule__DuplicateContext__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3555:1: ( rule__DuplicateContext__Group__0__Impl rule__DuplicateContext__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3556:2: rule__DuplicateContext__Group__0__Impl rule__DuplicateContext__Group__1
+            // InternalValid.g:3555:1: ( rule__DuplicateContext__Group__0__Impl rule__DuplicateContext__Group__1 )
+            // InternalValid.g:3556:2: rule__DuplicateContext__Group__0__Impl rule__DuplicateContext__Group__1
             {
-            pushFollow(FOLLOW_rule__DuplicateContext__Group__0__Impl_in_rule__DuplicateContext__Group__07071);
+            pushFollow(FOLLOW_27);
             rule__DuplicateContext__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DuplicateContext__Group__1_in_rule__DuplicateContext__Group__07074);
+            pushFollow(FOLLOW_2);
             rule__DuplicateContext__Group__1();
 
             state._fsp--;
@@ -9390,23 +9390,23 @@ public final void rule__DuplicateContext__Group__0() throws RecognitionException
 
 
     // $ANTLR start "rule__DuplicateContext__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3563:1: rule__DuplicateContext__Group__0__Impl : ( ( rule__DuplicateContext__ContextTypeAssignment_0 ) ) ;
+    // InternalValid.g:3563:1: rule__DuplicateContext__Group__0__Impl : ( ( rule__DuplicateContext__ContextTypeAssignment_0 ) ) ;
     public final void rule__DuplicateContext__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3567:1: ( ( ( rule__DuplicateContext__ContextTypeAssignment_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3568:1: ( ( rule__DuplicateContext__ContextTypeAssignment_0 ) )
+            // InternalValid.g:3567:1: ( ( ( rule__DuplicateContext__ContextTypeAssignment_0 ) ) )
+            // InternalValid.g:3568:1: ( ( rule__DuplicateContext__ContextTypeAssignment_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3568:1: ( ( rule__DuplicateContext__ContextTypeAssignment_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3569:1: ( rule__DuplicateContext__ContextTypeAssignment_0 )
+            // InternalValid.g:3568:1: ( ( rule__DuplicateContext__ContextTypeAssignment_0 ) )
+            // InternalValid.g:3569:1: ( rule__DuplicateContext__ContextTypeAssignment_0 )
             {
              before(grammarAccess.getDuplicateContextAccess().getContextTypeAssignment_0()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3570:1: ( rule__DuplicateContext__ContextTypeAssignment_0 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3570:2: rule__DuplicateContext__ContextTypeAssignment_0
+            // InternalValid.g:3570:1: ( rule__DuplicateContext__ContextTypeAssignment_0 )
+            // InternalValid.g:3570:2: rule__DuplicateContext__ContextTypeAssignment_0
             {
-            pushFollow(FOLLOW_rule__DuplicateContext__ContextTypeAssignment_0_in_rule__DuplicateContext__Group__0__Impl7101);
+            pushFollow(FOLLOW_2);
             rule__DuplicateContext__ContextTypeAssignment_0();
 
             state._fsp--;
@@ -9437,21 +9437,21 @@ public final void rule__DuplicateContext__Group__0__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__DuplicateContext__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3580:1: rule__DuplicateContext__Group__1 : rule__DuplicateContext__Group__1__Impl rule__DuplicateContext__Group__2 ;
+    // InternalValid.g:3580:1: rule__DuplicateContext__Group__1 : rule__DuplicateContext__Group__1__Impl rule__DuplicateContext__Group__2 ;
     public final void rule__DuplicateContext__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3584:1: ( rule__DuplicateContext__Group__1__Impl rule__DuplicateContext__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3585:2: rule__DuplicateContext__Group__1__Impl rule__DuplicateContext__Group__2
+            // InternalValid.g:3584:1: ( rule__DuplicateContext__Group__1__Impl rule__DuplicateContext__Group__2 )
+            // InternalValid.g:3585:2: rule__DuplicateContext__Group__1__Impl rule__DuplicateContext__Group__2
             {
-            pushFollow(FOLLOW_rule__DuplicateContext__Group__1__Impl_in_rule__DuplicateContext__Group__17131);
+            pushFollow(FOLLOW_27);
             rule__DuplicateContext__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DuplicateContext__Group__2_in_rule__DuplicateContext__Group__17134);
+            pushFollow(FOLLOW_2);
             rule__DuplicateContext__Group__2();
 
             state._fsp--;
@@ -9475,20 +9475,20 @@ public final void rule__DuplicateContext__Group__1() throws RecognitionException
 
 
     // $ANTLR start "rule__DuplicateContext__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3592:1: rule__DuplicateContext__Group__1__Impl : ( ( rule__DuplicateContext__Group_1__0 )? ) ;
+    // InternalValid.g:3592:1: rule__DuplicateContext__Group__1__Impl : ( ( rule__DuplicateContext__Group_1__0 )? ) ;
     public final void rule__DuplicateContext__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3596:1: ( ( ( rule__DuplicateContext__Group_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3597:1: ( ( rule__DuplicateContext__Group_1__0 )? )
+            // InternalValid.g:3596:1: ( ( ( rule__DuplicateContext__Group_1__0 )? ) )
+            // InternalValid.g:3597:1: ( ( rule__DuplicateContext__Group_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3597:1: ( ( rule__DuplicateContext__Group_1__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3598:1: ( rule__DuplicateContext__Group_1__0 )?
+            // InternalValid.g:3597:1: ( ( rule__DuplicateContext__Group_1__0 )? )
+            // InternalValid.g:3598:1: ( rule__DuplicateContext__Group_1__0 )?
             {
              before(grammarAccess.getDuplicateContextAccess().getGroup_1()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3599:1: ( rule__DuplicateContext__Group_1__0 )?
+            // InternalValid.g:3599:1: ( rule__DuplicateContext__Group_1__0 )?
             int alt24=2;
             int LA24_0 = input.LA(1);
 
@@ -9497,9 +9497,9 @@ public final void rule__DuplicateContext__Group__1__Impl() throws RecognitionExc
             }
             switch (alt24) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3599:2: rule__DuplicateContext__Group_1__0
+                    // InternalValid.g:3599:2: rule__DuplicateContext__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__DuplicateContext__Group_1__0_in_rule__DuplicateContext__Group__1__Impl7161);
+                    pushFollow(FOLLOW_2);
                     rule__DuplicateContext__Group_1__0();
 
                     state._fsp--;
@@ -9533,21 +9533,21 @@ public final void rule__DuplicateContext__Group__1__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__DuplicateContext__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3609:1: rule__DuplicateContext__Group__2 : rule__DuplicateContext__Group__2__Impl rule__DuplicateContext__Group__3 ;
+    // InternalValid.g:3609:1: rule__DuplicateContext__Group__2 : rule__DuplicateContext__Group__2__Impl rule__DuplicateContext__Group__3 ;
     public final void rule__DuplicateContext__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3613:1: ( rule__DuplicateContext__Group__2__Impl rule__DuplicateContext__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3614:2: rule__DuplicateContext__Group__2__Impl rule__DuplicateContext__Group__3
+            // InternalValid.g:3613:1: ( rule__DuplicateContext__Group__2__Impl rule__DuplicateContext__Group__3 )
+            // InternalValid.g:3614:2: rule__DuplicateContext__Group__2__Impl rule__DuplicateContext__Group__3
             {
-            pushFollow(FOLLOW_rule__DuplicateContext__Group__2__Impl_in_rule__DuplicateContext__Group__27192);
+            pushFollow(FOLLOW_7);
             rule__DuplicateContext__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DuplicateContext__Group__3_in_rule__DuplicateContext__Group__27195);
+            pushFollow(FOLLOW_2);
             rule__DuplicateContext__Group__3();
 
             state._fsp--;
@@ -9571,20 +9571,20 @@ public final void rule__DuplicateContext__Group__2() throws RecognitionException
 
 
     // $ANTLR start "rule__DuplicateContext__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3621:1: rule__DuplicateContext__Group__2__Impl : ( 'marker' ) ;
+    // InternalValid.g:3621:1: rule__DuplicateContext__Group__2__Impl : ( 'marker' ) ;
     public final void rule__DuplicateContext__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3625:1: ( ( 'marker' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3626:1: ( 'marker' )
+            // InternalValid.g:3625:1: ( ( 'marker' ) )
+            // InternalValid.g:3626:1: ( 'marker' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3626:1: ( 'marker' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3627:1: 'marker'
+            // InternalValid.g:3626:1: ( 'marker' )
+            // InternalValid.g:3627:1: 'marker'
             {
              before(grammarAccess.getDuplicateContextAccess().getMarkerKeyword_2()); 
-            match(input,32,FOLLOW_32_in_rule__DuplicateContext__Group__2__Impl7223); 
+            match(input,32,FOLLOW_2); 
              after(grammarAccess.getDuplicateContextAccess().getMarkerKeyword_2()); 
 
             }
@@ -9608,21 +9608,21 @@ public final void rule__DuplicateContext__Group__2__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__DuplicateContext__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3640:1: rule__DuplicateContext__Group__3 : rule__DuplicateContext__Group__3__Impl rule__DuplicateContext__Group__4 ;
+    // InternalValid.g:3640:1: rule__DuplicateContext__Group__3 : rule__DuplicateContext__Group__3__Impl rule__DuplicateContext__Group__4 ;
     public final void rule__DuplicateContext__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3644:1: ( rule__DuplicateContext__Group__3__Impl rule__DuplicateContext__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3645:2: rule__DuplicateContext__Group__3__Impl rule__DuplicateContext__Group__4
+            // InternalValid.g:3644:1: ( rule__DuplicateContext__Group__3__Impl rule__DuplicateContext__Group__4 )
+            // InternalValid.g:3645:2: rule__DuplicateContext__Group__3__Impl rule__DuplicateContext__Group__4
             {
-            pushFollow(FOLLOW_rule__DuplicateContext__Group__3__Impl_in_rule__DuplicateContext__Group__37254);
+            pushFollow(FOLLOW_28);
             rule__DuplicateContext__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DuplicateContext__Group__4_in_rule__DuplicateContext__Group__37257);
+            pushFollow(FOLLOW_2);
             rule__DuplicateContext__Group__4();
 
             state._fsp--;
@@ -9646,23 +9646,23 @@ public final void rule__DuplicateContext__Group__3() throws RecognitionException
 
 
     // $ANTLR start "rule__DuplicateContext__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3652:1: rule__DuplicateContext__Group__3__Impl : ( ( rule__DuplicateContext__MarkerTypeAssignment_3 ) ) ;
+    // InternalValid.g:3652:1: rule__DuplicateContext__Group__3__Impl : ( ( rule__DuplicateContext__MarkerTypeAssignment_3 ) ) ;
     public final void rule__DuplicateContext__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3656:1: ( ( ( rule__DuplicateContext__MarkerTypeAssignment_3 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3657:1: ( ( rule__DuplicateContext__MarkerTypeAssignment_3 ) )
+            // InternalValid.g:3656:1: ( ( ( rule__DuplicateContext__MarkerTypeAssignment_3 ) ) )
+            // InternalValid.g:3657:1: ( ( rule__DuplicateContext__MarkerTypeAssignment_3 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3657:1: ( ( rule__DuplicateContext__MarkerTypeAssignment_3 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3658:1: ( rule__DuplicateContext__MarkerTypeAssignment_3 )
+            // InternalValid.g:3657:1: ( ( rule__DuplicateContext__MarkerTypeAssignment_3 ) )
+            // InternalValid.g:3658:1: ( rule__DuplicateContext__MarkerTypeAssignment_3 )
             {
              before(grammarAccess.getDuplicateContextAccess().getMarkerTypeAssignment_3()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3659:1: ( rule__DuplicateContext__MarkerTypeAssignment_3 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3659:2: rule__DuplicateContext__MarkerTypeAssignment_3
+            // InternalValid.g:3659:1: ( rule__DuplicateContext__MarkerTypeAssignment_3 )
+            // InternalValid.g:3659:2: rule__DuplicateContext__MarkerTypeAssignment_3
             {
-            pushFollow(FOLLOW_rule__DuplicateContext__MarkerTypeAssignment_3_in_rule__DuplicateContext__Group__3__Impl7284);
+            pushFollow(FOLLOW_2);
             rule__DuplicateContext__MarkerTypeAssignment_3();
 
             state._fsp--;
@@ -9693,21 +9693,21 @@ public final void rule__DuplicateContext__Group__3__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__DuplicateContext__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3669:1: rule__DuplicateContext__Group__4 : rule__DuplicateContext__Group__4__Impl rule__DuplicateContext__Group__5 ;
+    // InternalValid.g:3669:1: rule__DuplicateContext__Group__4 : rule__DuplicateContext__Group__4__Impl rule__DuplicateContext__Group__5 ;
     public final void rule__DuplicateContext__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3673:1: ( rule__DuplicateContext__Group__4__Impl rule__DuplicateContext__Group__5 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3674:2: rule__DuplicateContext__Group__4__Impl rule__DuplicateContext__Group__5
+            // InternalValid.g:3673:1: ( rule__DuplicateContext__Group__4__Impl rule__DuplicateContext__Group__5 )
+            // InternalValid.g:3674:2: rule__DuplicateContext__Group__4__Impl rule__DuplicateContext__Group__5
             {
-            pushFollow(FOLLOW_rule__DuplicateContext__Group__4__Impl_in_rule__DuplicateContext__Group__47314);
+            pushFollow(FOLLOW_29);
             rule__DuplicateContext__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DuplicateContext__Group__5_in_rule__DuplicateContext__Group__47317);
+            pushFollow(FOLLOW_2);
             rule__DuplicateContext__Group__5();
 
             state._fsp--;
@@ -9731,20 +9731,20 @@ public final void rule__DuplicateContext__Group__4() throws RecognitionException
 
 
     // $ANTLR start "rule__DuplicateContext__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3681:1: rule__DuplicateContext__Group__4__Impl : ( '#' ) ;
+    // InternalValid.g:3681:1: rule__DuplicateContext__Group__4__Impl : ( '#' ) ;
     public final void rule__DuplicateContext__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3685:1: ( ( '#' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3686:1: ( '#' )
+            // InternalValid.g:3685:1: ( ( '#' ) )
+            // InternalValid.g:3686:1: ( '#' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3686:1: ( '#' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3687:1: '#'
+            // InternalValid.g:3686:1: ( '#' )
+            // InternalValid.g:3687:1: '#'
             {
              before(grammarAccess.getDuplicateContextAccess().getNumberSignKeyword_4()); 
-            match(input,31,FOLLOW_31_in_rule__DuplicateContext__Group__4__Impl7345); 
+            match(input,31,FOLLOW_2); 
              after(grammarAccess.getDuplicateContextAccess().getNumberSignKeyword_4()); 
 
             }
@@ -9768,21 +9768,21 @@ public final void rule__DuplicateContext__Group__4__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__DuplicateContext__Group__5"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3700:1: rule__DuplicateContext__Group__5 : rule__DuplicateContext__Group__5__Impl rule__DuplicateContext__Group__6 ;
+    // InternalValid.g:3700:1: rule__DuplicateContext__Group__5 : rule__DuplicateContext__Group__5__Impl rule__DuplicateContext__Group__6 ;
     public final void rule__DuplicateContext__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3704:1: ( rule__DuplicateContext__Group__5__Impl rule__DuplicateContext__Group__6 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3705:2: rule__DuplicateContext__Group__5__Impl rule__DuplicateContext__Group__6
+            // InternalValid.g:3704:1: ( rule__DuplicateContext__Group__5__Impl rule__DuplicateContext__Group__6 )
+            // InternalValid.g:3705:2: rule__DuplicateContext__Group__5__Impl rule__DuplicateContext__Group__6
             {
-            pushFollow(FOLLOW_rule__DuplicateContext__Group__5__Impl_in_rule__DuplicateContext__Group__57376);
+            pushFollow(FOLLOW_29);
             rule__DuplicateContext__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DuplicateContext__Group__6_in_rule__DuplicateContext__Group__57379);
+            pushFollow(FOLLOW_2);
             rule__DuplicateContext__Group__6();
 
             state._fsp--;
@@ -9806,20 +9806,20 @@ public final void rule__DuplicateContext__Group__5() throws RecognitionException
 
 
     // $ANTLR start "rule__DuplicateContext__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3712:1: rule__DuplicateContext__Group__5__Impl : ( ( rule__DuplicateContext__MarkerFeatureAssignment_5 )? ) ;
+    // InternalValid.g:3712:1: rule__DuplicateContext__Group__5__Impl : ( ( rule__DuplicateContext__MarkerFeatureAssignment_5 )? ) ;
     public final void rule__DuplicateContext__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3716:1: ( ( ( rule__DuplicateContext__MarkerFeatureAssignment_5 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3717:1: ( ( rule__DuplicateContext__MarkerFeatureAssignment_5 )? )
+            // InternalValid.g:3716:1: ( ( ( rule__DuplicateContext__MarkerFeatureAssignment_5 )? ) )
+            // InternalValid.g:3717:1: ( ( rule__DuplicateContext__MarkerFeatureAssignment_5 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3717:1: ( ( rule__DuplicateContext__MarkerFeatureAssignment_5 )? )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3718:1: ( rule__DuplicateContext__MarkerFeatureAssignment_5 )?
+            // InternalValid.g:3717:1: ( ( rule__DuplicateContext__MarkerFeatureAssignment_5 )? )
+            // InternalValid.g:3718:1: ( rule__DuplicateContext__MarkerFeatureAssignment_5 )?
             {
              before(grammarAccess.getDuplicateContextAccess().getMarkerFeatureAssignment_5()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3719:1: ( rule__DuplicateContext__MarkerFeatureAssignment_5 )?
+            // InternalValid.g:3719:1: ( rule__DuplicateContext__MarkerFeatureAssignment_5 )?
             int alt25=2;
             int LA25_0 = input.LA(1);
 
@@ -9828,9 +9828,9 @@ public final void rule__DuplicateContext__Group__5__Impl() throws RecognitionExc
             }
             switch (alt25) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3719:2: rule__DuplicateContext__MarkerFeatureAssignment_5
+                    // InternalValid.g:3719:2: rule__DuplicateContext__MarkerFeatureAssignment_5
                     {
-                    pushFollow(FOLLOW_rule__DuplicateContext__MarkerFeatureAssignment_5_in_rule__DuplicateContext__Group__5__Impl7406);
+                    pushFollow(FOLLOW_2);
                     rule__DuplicateContext__MarkerFeatureAssignment_5();
 
                     state._fsp--;
@@ -9864,16 +9864,16 @@ public final void rule__DuplicateContext__Group__5__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__DuplicateContext__Group__6"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3729:1: rule__DuplicateContext__Group__6 : rule__DuplicateContext__Group__6__Impl ;
+    // InternalValid.g:3729:1: rule__DuplicateContext__Group__6 : rule__DuplicateContext__Group__6__Impl ;
     public final void rule__DuplicateContext__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3733:1: ( rule__DuplicateContext__Group__6__Impl )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3734:2: rule__DuplicateContext__Group__6__Impl
+            // InternalValid.g:3733:1: ( rule__DuplicateContext__Group__6__Impl )
+            // InternalValid.g:3734:2: rule__DuplicateContext__Group__6__Impl
             {
-            pushFollow(FOLLOW_rule__DuplicateContext__Group__6__Impl_in_rule__DuplicateContext__Group__67437);
+            pushFollow(FOLLOW_2);
             rule__DuplicateContext__Group__6__Impl();
 
             state._fsp--;
@@ -9897,20 +9897,20 @@ public final void rule__DuplicateContext__Group__6() throws RecognitionException
 
 
     // $ANTLR start "rule__DuplicateContext__Group__6__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3740:1: rule__DuplicateContext__Group__6__Impl : ( ';' ) ;
+    // InternalValid.g:3740:1: rule__DuplicateContext__Group__6__Impl : ( ';' ) ;
     public final void rule__DuplicateContext__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3744:1: ( ( ';' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3745:1: ( ';' )
+            // InternalValid.g:3744:1: ( ( ';' ) )
+            // InternalValid.g:3745:1: ( ';' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3745:1: ( ';' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3746:1: ';'
+            // InternalValid.g:3745:1: ( ';' )
+            // InternalValid.g:3746:1: ';'
             {
              before(grammarAccess.getDuplicateContextAccess().getSemicolonKeyword_6()); 
-            match(input,30,FOLLOW_30_in_rule__DuplicateContext__Group__6__Impl7465); 
+            match(input,30,FOLLOW_2); 
              after(grammarAccess.getDuplicateContextAccess().getSemicolonKeyword_6()); 
 
             }
@@ -9934,21 +9934,21 @@ public final void rule__DuplicateContext__Group__6__Impl() throws RecognitionExc
 
 
     // $ANTLR start "rule__DuplicateContext__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3773:1: rule__DuplicateContext__Group_1__0 : rule__DuplicateContext__Group_1__0__Impl rule__DuplicateContext__Group_1__1 ;
+    // InternalValid.g:3773:1: rule__DuplicateContext__Group_1__0 : rule__DuplicateContext__Group_1__0__Impl rule__DuplicateContext__Group_1__1 ;
     public final void rule__DuplicateContext__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3777:1: ( rule__DuplicateContext__Group_1__0__Impl rule__DuplicateContext__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3778:2: rule__DuplicateContext__Group_1__0__Impl rule__DuplicateContext__Group_1__1
+            // InternalValid.g:3777:1: ( rule__DuplicateContext__Group_1__0__Impl rule__DuplicateContext__Group_1__1 )
+            // InternalValid.g:3778:2: rule__DuplicateContext__Group_1__0__Impl rule__DuplicateContext__Group_1__1
             {
-            pushFollow(FOLLOW_rule__DuplicateContext__Group_1__0__Impl_in_rule__DuplicateContext__Group_1__07510);
+            pushFollow(FOLLOW_7);
             rule__DuplicateContext__Group_1__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__DuplicateContext__Group_1__1_in_rule__DuplicateContext__Group_1__07513);
+            pushFollow(FOLLOW_2);
             rule__DuplicateContext__Group_1__1();
 
             state._fsp--;
@@ -9972,20 +9972,20 @@ public final void rule__DuplicateContext__Group_1__0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__DuplicateContext__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3785:1: rule__DuplicateContext__Group_1__0__Impl : ( '#' ) ;
+    // InternalValid.g:3785:1: rule__DuplicateContext__Group_1__0__Impl : ( '#' ) ;
     public final void rule__DuplicateContext__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3789:1: ( ( '#' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3790:1: ( '#' )
+            // InternalValid.g:3789:1: ( ( '#' ) )
+            // InternalValid.g:3790:1: ( '#' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3790:1: ( '#' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3791:1: '#'
+            // InternalValid.g:3790:1: ( '#' )
+            // InternalValid.g:3791:1: '#'
             {
              before(grammarAccess.getDuplicateContextAccess().getNumberSignKeyword_1_0()); 
-            match(input,31,FOLLOW_31_in_rule__DuplicateContext__Group_1__0__Impl7541); 
+            match(input,31,FOLLOW_2); 
              after(grammarAccess.getDuplicateContextAccess().getNumberSignKeyword_1_0()); 
 
             }
@@ -10009,16 +10009,16 @@ public final void rule__DuplicateContext__Group_1__0__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__DuplicateContext__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3804:1: rule__DuplicateContext__Group_1__1 : rule__DuplicateContext__Group_1__1__Impl ;
+    // InternalValid.g:3804:1: rule__DuplicateContext__Group_1__1 : rule__DuplicateContext__Group_1__1__Impl ;
     public final void rule__DuplicateContext__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3808:1: ( rule__DuplicateContext__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3809:2: rule__DuplicateContext__Group_1__1__Impl
+            // InternalValid.g:3808:1: ( rule__DuplicateContext__Group_1__1__Impl )
+            // InternalValid.g:3809:2: rule__DuplicateContext__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__DuplicateContext__Group_1__1__Impl_in_rule__DuplicateContext__Group_1__17572);
+            pushFollow(FOLLOW_2);
             rule__DuplicateContext__Group_1__1__Impl();
 
             state._fsp--;
@@ -10042,23 +10042,23 @@ public final void rule__DuplicateContext__Group_1__1() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__DuplicateContext__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3815:1: rule__DuplicateContext__Group_1__1__Impl : ( ( rule__DuplicateContext__ContextFeatureAssignment_1_1 ) ) ;
+    // InternalValid.g:3815:1: rule__DuplicateContext__Group_1__1__Impl : ( ( rule__DuplicateContext__ContextFeatureAssignment_1_1 ) ) ;
     public final void rule__DuplicateContext__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3819:1: ( ( ( rule__DuplicateContext__ContextFeatureAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3820:1: ( ( rule__DuplicateContext__ContextFeatureAssignment_1_1 ) )
+            // InternalValid.g:3819:1: ( ( ( rule__DuplicateContext__ContextFeatureAssignment_1_1 ) ) )
+            // InternalValid.g:3820:1: ( ( rule__DuplicateContext__ContextFeatureAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3820:1: ( ( rule__DuplicateContext__ContextFeatureAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3821:1: ( rule__DuplicateContext__ContextFeatureAssignment_1_1 )
+            // InternalValid.g:3820:1: ( ( rule__DuplicateContext__ContextFeatureAssignment_1_1 ) )
+            // InternalValid.g:3821:1: ( rule__DuplicateContext__ContextFeatureAssignment_1_1 )
             {
              before(grammarAccess.getDuplicateContextAccess().getContextFeatureAssignment_1_1()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3822:1: ( rule__DuplicateContext__ContextFeatureAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3822:2: rule__DuplicateContext__ContextFeatureAssignment_1_1
+            // InternalValid.g:3822:1: ( rule__DuplicateContext__ContextFeatureAssignment_1_1 )
+            // InternalValid.g:3822:2: rule__DuplicateContext__ContextFeatureAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__DuplicateContext__ContextFeatureAssignment_1_1_in_rule__DuplicateContext__Group_1__1__Impl7599);
+            pushFollow(FOLLOW_2);
             rule__DuplicateContext__ContextFeatureAssignment_1_1();
 
             state._fsp--;
@@ -10089,21 +10089,21 @@ public final void rule__DuplicateContext__Group_1__1__Impl() throws RecognitionE
 
 
     // $ANTLR start "rule__NativeContext__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3836:1: rule__NativeContext__Group__0 : rule__NativeContext__Group__0__Impl rule__NativeContext__Group__1 ;
+    // InternalValid.g:3836:1: rule__NativeContext__Group__0 : rule__NativeContext__Group__0__Impl rule__NativeContext__Group__1 ;
     public final void rule__NativeContext__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3840:1: ( rule__NativeContext__Group__0__Impl rule__NativeContext__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3841:2: rule__NativeContext__Group__0__Impl rule__NativeContext__Group__1
+            // InternalValid.g:3840:1: ( rule__NativeContext__Group__0__Impl rule__NativeContext__Group__1 )
+            // InternalValid.g:3841:2: rule__NativeContext__Group__0__Impl rule__NativeContext__Group__1
             {
-            pushFollow(FOLLOW_rule__NativeContext__Group__0__Impl_in_rule__NativeContext__Group__07633);
+            pushFollow(FOLLOW_30);
             rule__NativeContext__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__NativeContext__Group__1_in_rule__NativeContext__Group__07636);
+            pushFollow(FOLLOW_2);
             rule__NativeContext__Group__1();
 
             state._fsp--;
@@ -10127,23 +10127,23 @@ public final void rule__NativeContext__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__NativeContext__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3848:1: rule__NativeContext__Group__0__Impl : ( ( rule__NativeContext__ContextTypeAssignment_0 ) ) ;
+    // InternalValid.g:3848:1: rule__NativeContext__Group__0__Impl : ( ( rule__NativeContext__ContextTypeAssignment_0 ) ) ;
     public final void rule__NativeContext__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3852:1: ( ( ( rule__NativeContext__ContextTypeAssignment_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3853:1: ( ( rule__NativeContext__ContextTypeAssignment_0 ) )
+            // InternalValid.g:3852:1: ( ( ( rule__NativeContext__ContextTypeAssignment_0 ) ) )
+            // InternalValid.g:3853:1: ( ( rule__NativeContext__ContextTypeAssignment_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3853:1: ( ( rule__NativeContext__ContextTypeAssignment_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3854:1: ( rule__NativeContext__ContextTypeAssignment_0 )
+            // InternalValid.g:3853:1: ( ( rule__NativeContext__ContextTypeAssignment_0 ) )
+            // InternalValid.g:3854:1: ( rule__NativeContext__ContextTypeAssignment_0 )
             {
              before(grammarAccess.getNativeContextAccess().getContextTypeAssignment_0()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3855:1: ( rule__NativeContext__ContextTypeAssignment_0 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3855:2: rule__NativeContext__ContextTypeAssignment_0
+            // InternalValid.g:3855:1: ( rule__NativeContext__ContextTypeAssignment_0 )
+            // InternalValid.g:3855:2: rule__NativeContext__ContextTypeAssignment_0
             {
-            pushFollow(FOLLOW_rule__NativeContext__ContextTypeAssignment_0_in_rule__NativeContext__Group__0__Impl7663);
+            pushFollow(FOLLOW_2);
             rule__NativeContext__ContextTypeAssignment_0();
 
             state._fsp--;
@@ -10174,21 +10174,21 @@ public final void rule__NativeContext__Group__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__NativeContext__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3865:1: rule__NativeContext__Group__1 : rule__NativeContext__Group__1__Impl rule__NativeContext__Group__2 ;
+    // InternalValid.g:3865:1: rule__NativeContext__Group__1 : rule__NativeContext__Group__1__Impl rule__NativeContext__Group__2 ;
     public final void rule__NativeContext__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3869:1: ( rule__NativeContext__Group__1__Impl rule__NativeContext__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3870:2: rule__NativeContext__Group__1__Impl rule__NativeContext__Group__2
+            // InternalValid.g:3869:1: ( rule__NativeContext__Group__1__Impl rule__NativeContext__Group__2 )
+            // InternalValid.g:3870:2: rule__NativeContext__Group__1__Impl rule__NativeContext__Group__2
             {
-            pushFollow(FOLLOW_rule__NativeContext__Group__1__Impl_in_rule__NativeContext__Group__17693);
+            pushFollow(FOLLOW_30);
             rule__NativeContext__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__NativeContext__Group__2_in_rule__NativeContext__Group__17696);
+            pushFollow(FOLLOW_2);
             rule__NativeContext__Group__2();
 
             state._fsp--;
@@ -10212,20 +10212,20 @@ public final void rule__NativeContext__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__NativeContext__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3877:1: rule__NativeContext__Group__1__Impl : ( ( rule__NativeContext__Group_1__0 )? ) ;
+    // InternalValid.g:3877:1: rule__NativeContext__Group__1__Impl : ( ( rule__NativeContext__Group_1__0 )? ) ;
     public final void rule__NativeContext__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3881:1: ( ( ( rule__NativeContext__Group_1__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3882:1: ( ( rule__NativeContext__Group_1__0 )? )
+            // InternalValid.g:3881:1: ( ( ( rule__NativeContext__Group_1__0 )? ) )
+            // InternalValid.g:3882:1: ( ( rule__NativeContext__Group_1__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3882:1: ( ( rule__NativeContext__Group_1__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3883:1: ( rule__NativeContext__Group_1__0 )?
+            // InternalValid.g:3882:1: ( ( rule__NativeContext__Group_1__0 )? )
+            // InternalValid.g:3883:1: ( rule__NativeContext__Group_1__0 )?
             {
              before(grammarAccess.getNativeContextAccess().getGroup_1()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3884:1: ( rule__NativeContext__Group_1__0 )?
+            // InternalValid.g:3884:1: ( rule__NativeContext__Group_1__0 )?
             int alt26=2;
             int LA26_0 = input.LA(1);
 
@@ -10234,9 +10234,9 @@ public final void rule__NativeContext__Group__1__Impl() throws RecognitionExcept
             }
             switch (alt26) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3884:2: rule__NativeContext__Group_1__0
+                    // InternalValid.g:3884:2: rule__NativeContext__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__NativeContext__Group_1__0_in_rule__NativeContext__Group__1__Impl7723);
+                    pushFollow(FOLLOW_2);
                     rule__NativeContext__Group_1__0();
 
                     state._fsp--;
@@ -10270,21 +10270,21 @@ public final void rule__NativeContext__Group__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__NativeContext__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3894:1: rule__NativeContext__Group__2 : rule__NativeContext__Group__2__Impl rule__NativeContext__Group__3 ;
+    // InternalValid.g:3894:1: rule__NativeContext__Group__2 : rule__NativeContext__Group__2__Impl rule__NativeContext__Group__3 ;
     public final void rule__NativeContext__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3898:1: ( rule__NativeContext__Group__2__Impl rule__NativeContext__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3899:2: rule__NativeContext__Group__2__Impl rule__NativeContext__Group__3
+            // InternalValid.g:3898:1: ( rule__NativeContext__Group__2__Impl rule__NativeContext__Group__3 )
+            // InternalValid.g:3899:2: rule__NativeContext__Group__2__Impl rule__NativeContext__Group__3
             {
-            pushFollow(FOLLOW_rule__NativeContext__Group__2__Impl_in_rule__NativeContext__Group__27754);
+            pushFollow(FOLLOW_30);
             rule__NativeContext__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__NativeContext__Group__3_in_rule__NativeContext__Group__27757);
+            pushFollow(FOLLOW_2);
             rule__NativeContext__Group__3();
 
             state._fsp--;
@@ -10308,20 +10308,20 @@ public final void rule__NativeContext__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__NativeContext__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3906:1: rule__NativeContext__Group__2__Impl : ( ( rule__NativeContext__Group_2__0 )? ) ;
+    // InternalValid.g:3906:1: rule__NativeContext__Group__2__Impl : ( ( rule__NativeContext__Group_2__0 )? ) ;
     public final void rule__NativeContext__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3910:1: ( ( ( rule__NativeContext__Group_2__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3911:1: ( ( rule__NativeContext__Group_2__0 )? )
+            // InternalValid.g:3910:1: ( ( ( rule__NativeContext__Group_2__0 )? ) )
+            // InternalValid.g:3911:1: ( ( rule__NativeContext__Group_2__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3911:1: ( ( rule__NativeContext__Group_2__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3912:1: ( rule__NativeContext__Group_2__0 )?
+            // InternalValid.g:3911:1: ( ( rule__NativeContext__Group_2__0 )? )
+            // InternalValid.g:3912:1: ( rule__NativeContext__Group_2__0 )?
             {
              before(grammarAccess.getNativeContextAccess().getGroup_2()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3913:1: ( rule__NativeContext__Group_2__0 )?
+            // InternalValid.g:3913:1: ( rule__NativeContext__Group_2__0 )?
             int alt27=2;
             int LA27_0 = input.LA(1);
 
@@ -10330,9 +10330,9 @@ public final void rule__NativeContext__Group__2__Impl() throws RecognitionExcept
             }
             switch (alt27) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3913:2: rule__NativeContext__Group_2__0
+                    // InternalValid.g:3913:2: rule__NativeContext__Group_2__0
                     {
-                    pushFollow(FOLLOW_rule__NativeContext__Group_2__0_in_rule__NativeContext__Group__2__Impl7784);
+                    pushFollow(FOLLOW_2);
                     rule__NativeContext__Group_2__0();
 
                     state._fsp--;
@@ -10366,21 +10366,21 @@ public final void rule__NativeContext__Group__2__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__NativeContext__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3923:1: rule__NativeContext__Group__3 : rule__NativeContext__Group__3__Impl rule__NativeContext__Group__4 ;
+    // InternalValid.g:3923:1: rule__NativeContext__Group__3 : rule__NativeContext__Group__3__Impl rule__NativeContext__Group__4 ;
     public final void rule__NativeContext__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3927:1: ( rule__NativeContext__Group__3__Impl rule__NativeContext__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3928:2: rule__NativeContext__Group__3__Impl rule__NativeContext__Group__4
+            // InternalValid.g:3927:1: ( rule__NativeContext__Group__3__Impl rule__NativeContext__Group__4 )
+            // InternalValid.g:3928:2: rule__NativeContext__Group__3__Impl rule__NativeContext__Group__4
             {
-            pushFollow(FOLLOW_rule__NativeContext__Group__3__Impl_in_rule__NativeContext__Group__37815);
+            pushFollow(FOLLOW_30);
             rule__NativeContext__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__NativeContext__Group__4_in_rule__NativeContext__Group__37818);
+            pushFollow(FOLLOW_2);
             rule__NativeContext__Group__4();
 
             state._fsp--;
@@ -10404,20 +10404,20 @@ public final void rule__NativeContext__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__NativeContext__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3935:1: rule__NativeContext__Group__3__Impl : ( ( rule__NativeContext__Group_3__0 )? ) ;
+    // InternalValid.g:3935:1: rule__NativeContext__Group__3__Impl : ( ( rule__NativeContext__Group_3__0 )? ) ;
     public final void rule__NativeContext__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3939:1: ( ( ( rule__NativeContext__Group_3__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3940:1: ( ( rule__NativeContext__Group_3__0 )? )
+            // InternalValid.g:3939:1: ( ( ( rule__NativeContext__Group_3__0 )? ) )
+            // InternalValid.g:3940:1: ( ( rule__NativeContext__Group_3__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3940:1: ( ( rule__NativeContext__Group_3__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3941:1: ( rule__NativeContext__Group_3__0 )?
+            // InternalValid.g:3940:1: ( ( rule__NativeContext__Group_3__0 )? )
+            // InternalValid.g:3941:1: ( rule__NativeContext__Group_3__0 )?
             {
              before(grammarAccess.getNativeContextAccess().getGroup_3()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3942:1: ( rule__NativeContext__Group_3__0 )?
+            // InternalValid.g:3942:1: ( rule__NativeContext__Group_3__0 )?
             int alt28=2;
             int LA28_0 = input.LA(1);
 
@@ -10426,9 +10426,9 @@ public final void rule__NativeContext__Group__3__Impl() throws RecognitionExcept
             }
             switch (alt28) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3942:2: rule__NativeContext__Group_3__0
+                    // InternalValid.g:3942:2: rule__NativeContext__Group_3__0
                     {
-                    pushFollow(FOLLOW_rule__NativeContext__Group_3__0_in_rule__NativeContext__Group__3__Impl7845);
+                    pushFollow(FOLLOW_2);
                     rule__NativeContext__Group_3__0();
 
                     state._fsp--;
@@ -10462,21 +10462,21 @@ public final void rule__NativeContext__Group__3__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__NativeContext__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3952:1: rule__NativeContext__Group__4 : rule__NativeContext__Group__4__Impl rule__NativeContext__Group__5 ;
+    // InternalValid.g:3952:1: rule__NativeContext__Group__4 : rule__NativeContext__Group__4__Impl rule__NativeContext__Group__5 ;
     public final void rule__NativeContext__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3956:1: ( rule__NativeContext__Group__4__Impl rule__NativeContext__Group__5 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3957:2: rule__NativeContext__Group__4__Impl rule__NativeContext__Group__5
+            // InternalValid.g:3956:1: ( rule__NativeContext__Group__4__Impl rule__NativeContext__Group__5 )
+            // InternalValid.g:3957:2: rule__NativeContext__Group__4__Impl rule__NativeContext__Group__5
             {
-            pushFollow(FOLLOW_rule__NativeContext__Group__4__Impl_in_rule__NativeContext__Group__47876);
+            pushFollow(FOLLOW_30);
             rule__NativeContext__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__NativeContext__Group__5_in_rule__NativeContext__Group__47879);
+            pushFollow(FOLLOW_2);
             rule__NativeContext__Group__5();
 
             state._fsp--;
@@ -10500,20 +10500,20 @@ public final void rule__NativeContext__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__NativeContext__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3964:1: rule__NativeContext__Group__4__Impl : ( ( rule__NativeContext__Group_4__0 )? ) ;
+    // InternalValid.g:3964:1: rule__NativeContext__Group__4__Impl : ( ( rule__NativeContext__Group_4__0 )? ) ;
     public final void rule__NativeContext__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3968:1: ( ( ( rule__NativeContext__Group_4__0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3969:1: ( ( rule__NativeContext__Group_4__0 )? )
+            // InternalValid.g:3968:1: ( ( ( rule__NativeContext__Group_4__0 )? ) )
+            // InternalValid.g:3969:1: ( ( rule__NativeContext__Group_4__0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3969:1: ( ( rule__NativeContext__Group_4__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3970:1: ( rule__NativeContext__Group_4__0 )?
+            // InternalValid.g:3969:1: ( ( rule__NativeContext__Group_4__0 )? )
+            // InternalValid.g:3970:1: ( rule__NativeContext__Group_4__0 )?
             {
              before(grammarAccess.getNativeContextAccess().getGroup_4()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3971:1: ( rule__NativeContext__Group_4__0 )?
+            // InternalValid.g:3971:1: ( rule__NativeContext__Group_4__0 )?
             int alt29=2;
             int LA29_0 = input.LA(1);
 
@@ -10522,9 +10522,9 @@ public final void rule__NativeContext__Group__4__Impl() throws RecognitionExcept
             }
             switch (alt29) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3971:2: rule__NativeContext__Group_4__0
+                    // InternalValid.g:3971:2: rule__NativeContext__Group_4__0
                     {
-                    pushFollow(FOLLOW_rule__NativeContext__Group_4__0_in_rule__NativeContext__Group__4__Impl7906);
+                    pushFollow(FOLLOW_2);
                     rule__NativeContext__Group_4__0();
 
                     state._fsp--;
@@ -10558,16 +10558,16 @@ public final void rule__NativeContext__Group__4__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__NativeContext__Group__5"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3981:1: rule__NativeContext__Group__5 : rule__NativeContext__Group__5__Impl ;
+    // InternalValid.g:3981:1: rule__NativeContext__Group__5 : rule__NativeContext__Group__5__Impl ;
     public final void rule__NativeContext__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3985:1: ( rule__NativeContext__Group__5__Impl )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3986:2: rule__NativeContext__Group__5__Impl
+            // InternalValid.g:3985:1: ( rule__NativeContext__Group__5__Impl )
+            // InternalValid.g:3986:2: rule__NativeContext__Group__5__Impl
             {
-            pushFollow(FOLLOW_rule__NativeContext__Group__5__Impl_in_rule__NativeContext__Group__57937);
+            pushFollow(FOLLOW_2);
             rule__NativeContext__Group__5__Impl();
 
             state._fsp--;
@@ -10591,20 +10591,20 @@ public final void rule__NativeContext__Group__5() throws RecognitionException {
 
 
     // $ANTLR start "rule__NativeContext__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3992:1: rule__NativeContext__Group__5__Impl : ( ';' ) ;
+    // InternalValid.g:3992:1: rule__NativeContext__Group__5__Impl : ( ';' ) ;
     public final void rule__NativeContext__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3996:1: ( ( ';' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3997:1: ( ';' )
+            // InternalValid.g:3996:1: ( ( ';' ) )
+            // InternalValid.g:3997:1: ( ';' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3997:1: ( ';' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:3998:1: ';'
+            // InternalValid.g:3997:1: ( ';' )
+            // InternalValid.g:3998:1: ';'
             {
              before(grammarAccess.getNativeContextAccess().getSemicolonKeyword_5()); 
-            match(input,30,FOLLOW_30_in_rule__NativeContext__Group__5__Impl7965); 
+            match(input,30,FOLLOW_2); 
              after(grammarAccess.getNativeContextAccess().getSemicolonKeyword_5()); 
 
             }
@@ -10628,21 +10628,21 @@ public final void rule__NativeContext__Group__5__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__NativeContext__Group_1__0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4023:1: rule__NativeContext__Group_1__0 : rule__NativeContext__Group_1__0__Impl rule__NativeContext__Group_1__1 ;
+    // InternalValid.g:4023:1: rule__NativeContext__Group_1__0 : rule__NativeContext__Group_1__0__Impl rule__NativeContext__Group_1__1 ;
     public final void rule__NativeContext__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4027:1: ( rule__NativeContext__Group_1__0__Impl rule__NativeContext__Group_1__1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4028:2: rule__NativeContext__Group_1__0__Impl rule__NativeContext__Group_1__1
+            // InternalValid.g:4027:1: ( rule__NativeContext__Group_1__0__Impl rule__NativeContext__Group_1__1 )
+            // InternalValid.g:4028:2: rule__NativeContext__Group_1__0__Impl rule__NativeContext__Group_1__1
             {
-            pushFollow(FOLLOW_rule__NativeContext__Group_1__0__Impl_in_rule__NativeContext__Group_1__08008);
+            pushFollow(FOLLOW_7);
             rule__NativeContext__Group_1__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__NativeContext__Group_1__1_in_rule__NativeContext__Group_1__08011);
+            pushFollow(FOLLOW_2);
             rule__NativeContext__Group_1__1();
 
             state._fsp--;
@@ -10666,20 +10666,20 @@ public final void rule__NativeContext__Group_1__0() throws RecognitionException
 
 
     // $ANTLR start "rule__NativeContext__Group_1__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4035:1: rule__NativeContext__Group_1__0__Impl : ( '#' ) ;
+    // InternalValid.g:4035:1: rule__NativeContext__Group_1__0__Impl : ( '#' ) ;
     public final void rule__NativeContext__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4039:1: ( ( '#' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4040:1: ( '#' )
+            // InternalValid.g:4039:1: ( ( '#' ) )
+            // InternalValid.g:4040:1: ( '#' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4040:1: ( '#' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4041:1: '#'
+            // InternalValid.g:4040:1: ( '#' )
+            // InternalValid.g:4041:1: '#'
             {
              before(grammarAccess.getNativeContextAccess().getNumberSignKeyword_1_0()); 
-            match(input,31,FOLLOW_31_in_rule__NativeContext__Group_1__0__Impl8039); 
+            match(input,31,FOLLOW_2); 
              after(grammarAccess.getNativeContextAccess().getNumberSignKeyword_1_0()); 
 
             }
@@ -10703,16 +10703,16 @@ public final void rule__NativeContext__Group_1__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__NativeContext__Group_1__1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4054:1: rule__NativeContext__Group_1__1 : rule__NativeContext__Group_1__1__Impl ;
+    // InternalValid.g:4054:1: rule__NativeContext__Group_1__1 : rule__NativeContext__Group_1__1__Impl ;
     public final void rule__NativeContext__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4058:1: ( rule__NativeContext__Group_1__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4059:2: rule__NativeContext__Group_1__1__Impl
+            // InternalValid.g:4058:1: ( rule__NativeContext__Group_1__1__Impl )
+            // InternalValid.g:4059:2: rule__NativeContext__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__NativeContext__Group_1__1__Impl_in_rule__NativeContext__Group_1__18070);
+            pushFollow(FOLLOW_2);
             rule__NativeContext__Group_1__1__Impl();
 
             state._fsp--;
@@ -10736,23 +10736,23 @@ public final void rule__NativeContext__Group_1__1() throws RecognitionException
 
 
     // $ANTLR start "rule__NativeContext__Group_1__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4065:1: rule__NativeContext__Group_1__1__Impl : ( ( rule__NativeContext__ContextFeatureAssignment_1_1 ) ) ;
+    // InternalValid.g:4065:1: rule__NativeContext__Group_1__1__Impl : ( ( rule__NativeContext__ContextFeatureAssignment_1_1 ) ) ;
     public final void rule__NativeContext__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4069:1: ( ( ( rule__NativeContext__ContextFeatureAssignment_1_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4070:1: ( ( rule__NativeContext__ContextFeatureAssignment_1_1 ) )
+            // InternalValid.g:4069:1: ( ( ( rule__NativeContext__ContextFeatureAssignment_1_1 ) ) )
+            // InternalValid.g:4070:1: ( ( rule__NativeContext__ContextFeatureAssignment_1_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4070:1: ( ( rule__NativeContext__ContextFeatureAssignment_1_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4071:1: ( rule__NativeContext__ContextFeatureAssignment_1_1 )
+            // InternalValid.g:4070:1: ( ( rule__NativeContext__ContextFeatureAssignment_1_1 ) )
+            // InternalValid.g:4071:1: ( rule__NativeContext__ContextFeatureAssignment_1_1 )
             {
              before(grammarAccess.getNativeContextAccess().getContextFeatureAssignment_1_1()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4072:1: ( rule__NativeContext__ContextFeatureAssignment_1_1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4072:2: rule__NativeContext__ContextFeatureAssignment_1_1
+            // InternalValid.g:4072:1: ( rule__NativeContext__ContextFeatureAssignment_1_1 )
+            // InternalValid.g:4072:2: rule__NativeContext__ContextFeatureAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__NativeContext__ContextFeatureAssignment_1_1_in_rule__NativeContext__Group_1__1__Impl8097);
+            pushFollow(FOLLOW_2);
             rule__NativeContext__ContextFeatureAssignment_1_1();
 
             state._fsp--;
@@ -10783,21 +10783,21 @@ public final void rule__NativeContext__Group_1__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__NativeContext__Group_2__0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4086:1: rule__NativeContext__Group_2__0 : rule__NativeContext__Group_2__0__Impl rule__NativeContext__Group_2__1 ;
+    // InternalValid.g:4086:1: rule__NativeContext__Group_2__0 : rule__NativeContext__Group_2__0__Impl rule__NativeContext__Group_2__1 ;
     public final void rule__NativeContext__Group_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4090:1: ( rule__NativeContext__Group_2__0__Impl rule__NativeContext__Group_2__1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4091:2: rule__NativeContext__Group_2__0__Impl rule__NativeContext__Group_2__1
+            // InternalValid.g:4090:1: ( rule__NativeContext__Group_2__0__Impl rule__NativeContext__Group_2__1 )
+            // InternalValid.g:4091:2: rule__NativeContext__Group_2__0__Impl rule__NativeContext__Group_2__1
             {
-            pushFollow(FOLLOW_rule__NativeContext__Group_2__0__Impl_in_rule__NativeContext__Group_2__08131);
+            pushFollow(FOLLOW_7);
             rule__NativeContext__Group_2__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__NativeContext__Group_2__1_in_rule__NativeContext__Group_2__08134);
+            pushFollow(FOLLOW_2);
             rule__NativeContext__Group_2__1();
 
             state._fsp--;
@@ -10821,23 +10821,23 @@ public final void rule__NativeContext__Group_2__0() throws RecognitionException
 
 
     // $ANTLR start "rule__NativeContext__Group_2__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4098:1: rule__NativeContext__Group_2__0__Impl : ( ( rule__NativeContext__NamedAssignment_2_0 ) ) ;
+    // InternalValid.g:4098:1: rule__NativeContext__Group_2__0__Impl : ( ( rule__NativeContext__NamedAssignment_2_0 ) ) ;
     public final void rule__NativeContext__Group_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4102:1: ( ( ( rule__NativeContext__NamedAssignment_2_0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4103:1: ( ( rule__NativeContext__NamedAssignment_2_0 ) )
+            // InternalValid.g:4102:1: ( ( ( rule__NativeContext__NamedAssignment_2_0 ) ) )
+            // InternalValid.g:4103:1: ( ( rule__NativeContext__NamedAssignment_2_0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4103:1: ( ( rule__NativeContext__NamedAssignment_2_0 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4104:1: ( rule__NativeContext__NamedAssignment_2_0 )
+            // InternalValid.g:4103:1: ( ( rule__NativeContext__NamedAssignment_2_0 ) )
+            // InternalValid.g:4104:1: ( rule__NativeContext__NamedAssignment_2_0 )
             {
              before(grammarAccess.getNativeContextAccess().getNamedAssignment_2_0()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4105:1: ( rule__NativeContext__NamedAssignment_2_0 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4105:2: rule__NativeContext__NamedAssignment_2_0
+            // InternalValid.g:4105:1: ( rule__NativeContext__NamedAssignment_2_0 )
+            // InternalValid.g:4105:2: rule__NativeContext__NamedAssignment_2_0
             {
-            pushFollow(FOLLOW_rule__NativeContext__NamedAssignment_2_0_in_rule__NativeContext__Group_2__0__Impl8161);
+            pushFollow(FOLLOW_2);
             rule__NativeContext__NamedAssignment_2_0();
 
             state._fsp--;
@@ -10868,16 +10868,16 @@ public final void rule__NativeContext__Group_2__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__NativeContext__Group_2__1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4115:1: rule__NativeContext__Group_2__1 : rule__NativeContext__Group_2__1__Impl ;
+    // InternalValid.g:4115:1: rule__NativeContext__Group_2__1 : rule__NativeContext__Group_2__1__Impl ;
     public final void rule__NativeContext__Group_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4119:1: ( rule__NativeContext__Group_2__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4120:2: rule__NativeContext__Group_2__1__Impl
+            // InternalValid.g:4119:1: ( rule__NativeContext__Group_2__1__Impl )
+            // InternalValid.g:4120:2: rule__NativeContext__Group_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__NativeContext__Group_2__1__Impl_in_rule__NativeContext__Group_2__18191);
+            pushFollow(FOLLOW_2);
             rule__NativeContext__Group_2__1__Impl();
 
             state._fsp--;
@@ -10901,23 +10901,23 @@ public final void rule__NativeContext__Group_2__1() throws RecognitionException
 
 
     // $ANTLR start "rule__NativeContext__Group_2__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4126:1: rule__NativeContext__Group_2__1__Impl : ( ( rule__NativeContext__GivenNameAssignment_2_1 ) ) ;
+    // InternalValid.g:4126:1: rule__NativeContext__Group_2__1__Impl : ( ( rule__NativeContext__GivenNameAssignment_2_1 ) ) ;
     public final void rule__NativeContext__Group_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4130:1: ( ( ( rule__NativeContext__GivenNameAssignment_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4131:1: ( ( rule__NativeContext__GivenNameAssignment_2_1 ) )
+            // InternalValid.g:4130:1: ( ( ( rule__NativeContext__GivenNameAssignment_2_1 ) ) )
+            // InternalValid.g:4131:1: ( ( rule__NativeContext__GivenNameAssignment_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4131:1: ( ( rule__NativeContext__GivenNameAssignment_2_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4132:1: ( rule__NativeContext__GivenNameAssignment_2_1 )
+            // InternalValid.g:4131:1: ( ( rule__NativeContext__GivenNameAssignment_2_1 ) )
+            // InternalValid.g:4132:1: ( rule__NativeContext__GivenNameAssignment_2_1 )
             {
              before(grammarAccess.getNativeContextAccess().getGivenNameAssignment_2_1()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4133:1: ( rule__NativeContext__GivenNameAssignment_2_1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4133:2: rule__NativeContext__GivenNameAssignment_2_1
+            // InternalValid.g:4133:1: ( rule__NativeContext__GivenNameAssignment_2_1 )
+            // InternalValid.g:4133:2: rule__NativeContext__GivenNameAssignment_2_1
             {
-            pushFollow(FOLLOW_rule__NativeContext__GivenNameAssignment_2_1_in_rule__NativeContext__Group_2__1__Impl8218);
+            pushFollow(FOLLOW_2);
             rule__NativeContext__GivenNameAssignment_2_1();
 
             state._fsp--;
@@ -10948,21 +10948,21 @@ public final void rule__NativeContext__Group_2__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__NativeContext__Group_3__0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4147:1: rule__NativeContext__Group_3__0 : rule__NativeContext__Group_3__0__Impl rule__NativeContext__Group_3__1 ;
+    // InternalValid.g:4147:1: rule__NativeContext__Group_3__0 : rule__NativeContext__Group_3__0__Impl rule__NativeContext__Group_3__1 ;
     public final void rule__NativeContext__Group_3__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4151:1: ( rule__NativeContext__Group_3__0__Impl rule__NativeContext__Group_3__1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4152:2: rule__NativeContext__Group_3__0__Impl rule__NativeContext__Group_3__1
+            // InternalValid.g:4151:1: ( rule__NativeContext__Group_3__0__Impl rule__NativeContext__Group_3__1 )
+            // InternalValid.g:4152:2: rule__NativeContext__Group_3__0__Impl rule__NativeContext__Group_3__1
             {
-            pushFollow(FOLLOW_rule__NativeContext__Group_3__0__Impl_in_rule__NativeContext__Group_3__08252);
+            pushFollow(FOLLOW_7);
             rule__NativeContext__Group_3__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__NativeContext__Group_3__1_in_rule__NativeContext__Group_3__08255);
+            pushFollow(FOLLOW_2);
             rule__NativeContext__Group_3__1();
 
             state._fsp--;
@@ -10986,20 +10986,20 @@ public final void rule__NativeContext__Group_3__0() throws RecognitionException
 
 
     // $ANTLR start "rule__NativeContext__Group_3__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4159:1: rule__NativeContext__Group_3__0__Impl : ( 'marker' ) ;
+    // InternalValid.g:4159:1: rule__NativeContext__Group_3__0__Impl : ( 'marker' ) ;
     public final void rule__NativeContext__Group_3__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4163:1: ( ( 'marker' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4164:1: ( 'marker' )
+            // InternalValid.g:4163:1: ( ( 'marker' ) )
+            // InternalValid.g:4164:1: ( 'marker' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4164:1: ( 'marker' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4165:1: 'marker'
+            // InternalValid.g:4164:1: ( 'marker' )
+            // InternalValid.g:4165:1: 'marker'
             {
              before(grammarAccess.getNativeContextAccess().getMarkerKeyword_3_0()); 
-            match(input,32,FOLLOW_32_in_rule__NativeContext__Group_3__0__Impl8283); 
+            match(input,32,FOLLOW_2); 
              after(grammarAccess.getNativeContextAccess().getMarkerKeyword_3_0()); 
 
             }
@@ -11023,21 +11023,21 @@ public final void rule__NativeContext__Group_3__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__NativeContext__Group_3__1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4178:1: rule__NativeContext__Group_3__1 : rule__NativeContext__Group_3__1__Impl rule__NativeContext__Group_3__2 ;
+    // InternalValid.g:4178:1: rule__NativeContext__Group_3__1 : rule__NativeContext__Group_3__1__Impl rule__NativeContext__Group_3__2 ;
     public final void rule__NativeContext__Group_3__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4182:1: ( rule__NativeContext__Group_3__1__Impl rule__NativeContext__Group_3__2 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4183:2: rule__NativeContext__Group_3__1__Impl rule__NativeContext__Group_3__2
+            // InternalValid.g:4182:1: ( rule__NativeContext__Group_3__1__Impl rule__NativeContext__Group_3__2 )
+            // InternalValid.g:4183:2: rule__NativeContext__Group_3__1__Impl rule__NativeContext__Group_3__2
             {
-            pushFollow(FOLLOW_rule__NativeContext__Group_3__1__Impl_in_rule__NativeContext__Group_3__18314);
+            pushFollow(FOLLOW_28);
             rule__NativeContext__Group_3__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__NativeContext__Group_3__2_in_rule__NativeContext__Group_3__18317);
+            pushFollow(FOLLOW_2);
             rule__NativeContext__Group_3__2();
 
             state._fsp--;
@@ -11061,23 +11061,23 @@ public final void rule__NativeContext__Group_3__1() throws RecognitionException
 
 
     // $ANTLR start "rule__NativeContext__Group_3__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4190:1: rule__NativeContext__Group_3__1__Impl : ( ( rule__NativeContext__MarkerTypeAssignment_3_1 ) ) ;
+    // InternalValid.g:4190:1: rule__NativeContext__Group_3__1__Impl : ( ( rule__NativeContext__MarkerTypeAssignment_3_1 ) ) ;
     public final void rule__NativeContext__Group_3__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4194:1: ( ( ( rule__NativeContext__MarkerTypeAssignment_3_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4195:1: ( ( rule__NativeContext__MarkerTypeAssignment_3_1 ) )
+            // InternalValid.g:4194:1: ( ( ( rule__NativeContext__MarkerTypeAssignment_3_1 ) ) )
+            // InternalValid.g:4195:1: ( ( rule__NativeContext__MarkerTypeAssignment_3_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4195:1: ( ( rule__NativeContext__MarkerTypeAssignment_3_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4196:1: ( rule__NativeContext__MarkerTypeAssignment_3_1 )
+            // InternalValid.g:4195:1: ( ( rule__NativeContext__MarkerTypeAssignment_3_1 ) )
+            // InternalValid.g:4196:1: ( rule__NativeContext__MarkerTypeAssignment_3_1 )
             {
              before(grammarAccess.getNativeContextAccess().getMarkerTypeAssignment_3_1()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4197:1: ( rule__NativeContext__MarkerTypeAssignment_3_1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4197:2: rule__NativeContext__MarkerTypeAssignment_3_1
+            // InternalValid.g:4197:1: ( rule__NativeContext__MarkerTypeAssignment_3_1 )
+            // InternalValid.g:4197:2: rule__NativeContext__MarkerTypeAssignment_3_1
             {
-            pushFollow(FOLLOW_rule__NativeContext__MarkerTypeAssignment_3_1_in_rule__NativeContext__Group_3__1__Impl8344);
+            pushFollow(FOLLOW_2);
             rule__NativeContext__MarkerTypeAssignment_3_1();
 
             state._fsp--;
@@ -11108,16 +11108,16 @@ public final void rule__NativeContext__Group_3__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__NativeContext__Group_3__2"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4207:1: rule__NativeContext__Group_3__2 : rule__NativeContext__Group_3__2__Impl ;
+    // InternalValid.g:4207:1: rule__NativeContext__Group_3__2 : rule__NativeContext__Group_3__2__Impl ;
     public final void rule__NativeContext__Group_3__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4211:1: ( rule__NativeContext__Group_3__2__Impl )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4212:2: rule__NativeContext__Group_3__2__Impl
+            // InternalValid.g:4211:1: ( rule__NativeContext__Group_3__2__Impl )
+            // InternalValid.g:4212:2: rule__NativeContext__Group_3__2__Impl
             {
-            pushFollow(FOLLOW_rule__NativeContext__Group_3__2__Impl_in_rule__NativeContext__Group_3__28374);
+            pushFollow(FOLLOW_2);
             rule__NativeContext__Group_3__2__Impl();
 
             state._fsp--;
@@ -11141,23 +11141,23 @@ public final void rule__NativeContext__Group_3__2() throws RecognitionException
 
 
     // $ANTLR start "rule__NativeContext__Group_3__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4218:1: rule__NativeContext__Group_3__2__Impl : ( ( rule__NativeContext__Group_3_2__0 ) ) ;
+    // InternalValid.g:4218:1: rule__NativeContext__Group_3__2__Impl : ( ( rule__NativeContext__Group_3_2__0 ) ) ;
     public final void rule__NativeContext__Group_3__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4222:1: ( ( ( rule__NativeContext__Group_3_2__0 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4223:1: ( ( rule__NativeContext__Group_3_2__0 ) )
+            // InternalValid.g:4222:1: ( ( ( rule__NativeContext__Group_3_2__0 ) ) )
+            // InternalValid.g:4223:1: ( ( rule__NativeContext__Group_3_2__0 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4223:1: ( ( rule__NativeContext__Group_3_2__0 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4224:1: ( rule__NativeContext__Group_3_2__0 )
+            // InternalValid.g:4223:1: ( ( rule__NativeContext__Group_3_2__0 ) )
+            // InternalValid.g:4224:1: ( rule__NativeContext__Group_3_2__0 )
             {
              before(grammarAccess.getNativeContextAccess().getGroup_3_2()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4225:1: ( rule__NativeContext__Group_3_2__0 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4225:2: rule__NativeContext__Group_3_2__0
+            // InternalValid.g:4225:1: ( rule__NativeContext__Group_3_2__0 )
+            // InternalValid.g:4225:2: rule__NativeContext__Group_3_2__0
             {
-            pushFollow(FOLLOW_rule__NativeContext__Group_3_2__0_in_rule__NativeContext__Group_3__2__Impl8401);
+            pushFollow(FOLLOW_2);
             rule__NativeContext__Group_3_2__0();
 
             state._fsp--;
@@ -11188,21 +11188,21 @@ public final void rule__NativeContext__Group_3__2__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__NativeContext__Group_3_2__0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4241:1: rule__NativeContext__Group_3_2__0 : rule__NativeContext__Group_3_2__0__Impl rule__NativeContext__Group_3_2__1 ;
+    // InternalValid.g:4241:1: rule__NativeContext__Group_3_2__0 : rule__NativeContext__Group_3_2__0__Impl rule__NativeContext__Group_3_2__1 ;
     public final void rule__NativeContext__Group_3_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4245:1: ( rule__NativeContext__Group_3_2__0__Impl rule__NativeContext__Group_3_2__1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4246:2: rule__NativeContext__Group_3_2__0__Impl rule__NativeContext__Group_3_2__1
+            // InternalValid.g:4245:1: ( rule__NativeContext__Group_3_2__0__Impl rule__NativeContext__Group_3_2__1 )
+            // InternalValid.g:4246:2: rule__NativeContext__Group_3_2__0__Impl rule__NativeContext__Group_3_2__1
             {
-            pushFollow(FOLLOW_rule__NativeContext__Group_3_2__0__Impl_in_rule__NativeContext__Group_3_2__08437);
+            pushFollow(FOLLOW_7);
             rule__NativeContext__Group_3_2__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__NativeContext__Group_3_2__1_in_rule__NativeContext__Group_3_2__08440);
+            pushFollow(FOLLOW_2);
             rule__NativeContext__Group_3_2__1();
 
             state._fsp--;
@@ -11226,20 +11226,20 @@ public final void rule__NativeContext__Group_3_2__0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__NativeContext__Group_3_2__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4253:1: rule__NativeContext__Group_3_2__0__Impl : ( '#' ) ;
+    // InternalValid.g:4253:1: rule__NativeContext__Group_3_2__0__Impl : ( '#' ) ;
     public final void rule__NativeContext__Group_3_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4257:1: ( ( '#' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4258:1: ( '#' )
+            // InternalValid.g:4257:1: ( ( '#' ) )
+            // InternalValid.g:4258:1: ( '#' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4258:1: ( '#' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4259:1: '#'
+            // InternalValid.g:4258:1: ( '#' )
+            // InternalValid.g:4259:1: '#'
             {
              before(grammarAccess.getNativeContextAccess().getNumberSignKeyword_3_2_0()); 
-            match(input,31,FOLLOW_31_in_rule__NativeContext__Group_3_2__0__Impl8468); 
+            match(input,31,FOLLOW_2); 
              after(grammarAccess.getNativeContextAccess().getNumberSignKeyword_3_2_0()); 
 
             }
@@ -11263,16 +11263,16 @@ public final void rule__NativeContext__Group_3_2__0__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__NativeContext__Group_3_2__1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4272:1: rule__NativeContext__Group_3_2__1 : rule__NativeContext__Group_3_2__1__Impl ;
+    // InternalValid.g:4272:1: rule__NativeContext__Group_3_2__1 : rule__NativeContext__Group_3_2__1__Impl ;
     public final void rule__NativeContext__Group_3_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4276:1: ( rule__NativeContext__Group_3_2__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4277:2: rule__NativeContext__Group_3_2__1__Impl
+            // InternalValid.g:4276:1: ( rule__NativeContext__Group_3_2__1__Impl )
+            // InternalValid.g:4277:2: rule__NativeContext__Group_3_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__NativeContext__Group_3_2__1__Impl_in_rule__NativeContext__Group_3_2__18499);
+            pushFollow(FOLLOW_2);
             rule__NativeContext__Group_3_2__1__Impl();
 
             state._fsp--;
@@ -11296,23 +11296,23 @@ public final void rule__NativeContext__Group_3_2__1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__NativeContext__Group_3_2__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4283:1: rule__NativeContext__Group_3_2__1__Impl : ( ( rule__NativeContext__MarkerFeatureAssignment_3_2_1 ) ) ;
+    // InternalValid.g:4283:1: rule__NativeContext__Group_3_2__1__Impl : ( ( rule__NativeContext__MarkerFeatureAssignment_3_2_1 ) ) ;
     public final void rule__NativeContext__Group_3_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4287:1: ( ( ( rule__NativeContext__MarkerFeatureAssignment_3_2_1 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4288:1: ( ( rule__NativeContext__MarkerFeatureAssignment_3_2_1 ) )
+            // InternalValid.g:4287:1: ( ( ( rule__NativeContext__MarkerFeatureAssignment_3_2_1 ) ) )
+            // InternalValid.g:4288:1: ( ( rule__NativeContext__MarkerFeatureAssignment_3_2_1 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4288:1: ( ( rule__NativeContext__MarkerFeatureAssignment_3_2_1 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4289:1: ( rule__NativeContext__MarkerFeatureAssignment_3_2_1 )
+            // InternalValid.g:4288:1: ( ( rule__NativeContext__MarkerFeatureAssignment_3_2_1 ) )
+            // InternalValid.g:4289:1: ( rule__NativeContext__MarkerFeatureAssignment_3_2_1 )
             {
              before(grammarAccess.getNativeContextAccess().getMarkerFeatureAssignment_3_2_1()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4290:1: ( rule__NativeContext__MarkerFeatureAssignment_3_2_1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4290:2: rule__NativeContext__MarkerFeatureAssignment_3_2_1
+            // InternalValid.g:4290:1: ( rule__NativeContext__MarkerFeatureAssignment_3_2_1 )
+            // InternalValid.g:4290:2: rule__NativeContext__MarkerFeatureAssignment_3_2_1
             {
-            pushFollow(FOLLOW_rule__NativeContext__MarkerFeatureAssignment_3_2_1_in_rule__NativeContext__Group_3_2__1__Impl8526);
+            pushFollow(FOLLOW_2);
             rule__NativeContext__MarkerFeatureAssignment_3_2_1();
 
             state._fsp--;
@@ -11343,21 +11343,21 @@ public final void rule__NativeContext__Group_3_2__1__Impl() throws RecognitionEx
 
 
     // $ANTLR start "rule__NativeContext__Group_4__0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4304:1: rule__NativeContext__Group_4__0 : rule__NativeContext__Group_4__0__Impl rule__NativeContext__Group_4__1 ;
+    // InternalValid.g:4304:1: rule__NativeContext__Group_4__0 : rule__NativeContext__Group_4__0__Impl rule__NativeContext__Group_4__1 ;
     public final void rule__NativeContext__Group_4__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4308:1: ( rule__NativeContext__Group_4__0__Impl rule__NativeContext__Group_4__1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4309:2: rule__NativeContext__Group_4__0__Impl rule__NativeContext__Group_4__1
+            // InternalValid.g:4308:1: ( rule__NativeContext__Group_4__0__Impl rule__NativeContext__Group_4__1 )
+            // InternalValid.g:4309:2: rule__NativeContext__Group_4__0__Impl rule__NativeContext__Group_4__1
             {
-            pushFollow(FOLLOW_rule__NativeContext__Group_4__0__Impl_in_rule__NativeContext__Group_4__08560);
+            pushFollow(FOLLOW_15);
             rule__NativeContext__Group_4__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__NativeContext__Group_4__1_in_rule__NativeContext__Group_4__08563);
+            pushFollow(FOLLOW_2);
             rule__NativeContext__Group_4__1();
 
             state._fsp--;
@@ -11381,20 +11381,20 @@ public final void rule__NativeContext__Group_4__0() throws RecognitionException
 
 
     // $ANTLR start "rule__NativeContext__Group_4__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4316:1: rule__NativeContext__Group_4__0__Impl : ( 'quickfixes' ) ;
+    // InternalValid.g:4316:1: rule__NativeContext__Group_4__0__Impl : ( 'quickfixes' ) ;
     public final void rule__NativeContext__Group_4__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4320:1: ( ( 'quickfixes' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4321:1: ( 'quickfixes' )
+            // InternalValid.g:4320:1: ( ( 'quickfixes' ) )
+            // InternalValid.g:4321:1: ( 'quickfixes' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4321:1: ( 'quickfixes' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4322:1: 'quickfixes'
+            // InternalValid.g:4321:1: ( 'quickfixes' )
+            // InternalValid.g:4322:1: 'quickfixes'
             {
              before(grammarAccess.getNativeContextAccess().getQuickfixesKeyword_4_0()); 
-            match(input,33,FOLLOW_33_in_rule__NativeContext__Group_4__0__Impl8591); 
+            match(input,33,FOLLOW_2); 
              after(grammarAccess.getNativeContextAccess().getQuickfixesKeyword_4_0()); 
 
             }
@@ -11418,21 +11418,21 @@ public final void rule__NativeContext__Group_4__0__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__NativeContext__Group_4__1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4335:1: rule__NativeContext__Group_4__1 : rule__NativeContext__Group_4__1__Impl rule__NativeContext__Group_4__2 ;
+    // InternalValid.g:4335:1: rule__NativeContext__Group_4__1 : rule__NativeContext__Group_4__1__Impl rule__NativeContext__Group_4__2 ;
     public final void rule__NativeContext__Group_4__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4339:1: ( rule__NativeContext__Group_4__1__Impl rule__NativeContext__Group_4__2 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4340:2: rule__NativeContext__Group_4__1__Impl rule__NativeContext__Group_4__2
+            // InternalValid.g:4339:1: ( rule__NativeContext__Group_4__1__Impl rule__NativeContext__Group_4__2 )
+            // InternalValid.g:4340:2: rule__NativeContext__Group_4__1__Impl rule__NativeContext__Group_4__2
             {
-            pushFollow(FOLLOW_rule__NativeContext__Group_4__1__Impl_in_rule__NativeContext__Group_4__18622);
+            pushFollow(FOLLOW_31);
             rule__NativeContext__Group_4__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__NativeContext__Group_4__2_in_rule__NativeContext__Group_4__18625);
+            pushFollow(FOLLOW_2);
             rule__NativeContext__Group_4__2();
 
             state._fsp--;
@@ -11456,20 +11456,20 @@ public final void rule__NativeContext__Group_4__1() throws RecognitionException
 
 
     // $ANTLR start "rule__NativeContext__Group_4__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4347:1: rule__NativeContext__Group_4__1__Impl : ( '{' ) ;
+    // InternalValid.g:4347:1: rule__NativeContext__Group_4__1__Impl : ( '{' ) ;
     public final void rule__NativeContext__Group_4__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4351:1: ( ( '{' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4352:1: ( '{' )
+            // InternalValid.g:4351:1: ( ( '{' ) )
+            // InternalValid.g:4352:1: ( '{' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4352:1: ( '{' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4353:1: '{'
+            // InternalValid.g:4352:1: ( '{' )
+            // InternalValid.g:4353:1: '{'
             {
              before(grammarAccess.getNativeContextAccess().getLeftCurlyBracketKeyword_4_1()); 
-            match(input,21,FOLLOW_21_in_rule__NativeContext__Group_4__1__Impl8653); 
+            match(input,21,FOLLOW_2); 
              after(grammarAccess.getNativeContextAccess().getLeftCurlyBracketKeyword_4_1()); 
 
             }
@@ -11493,21 +11493,21 @@ public final void rule__NativeContext__Group_4__1__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__NativeContext__Group_4__2"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4366:1: rule__NativeContext__Group_4__2 : rule__NativeContext__Group_4__2__Impl rule__NativeContext__Group_4__3 ;
+    // InternalValid.g:4366:1: rule__NativeContext__Group_4__2 : rule__NativeContext__Group_4__2__Impl rule__NativeContext__Group_4__3 ;
     public final void rule__NativeContext__Group_4__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4370:1: ( rule__NativeContext__Group_4__2__Impl rule__NativeContext__Group_4__3 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4371:2: rule__NativeContext__Group_4__2__Impl rule__NativeContext__Group_4__3
+            // InternalValid.g:4370:1: ( rule__NativeContext__Group_4__2__Impl rule__NativeContext__Group_4__3 )
+            // InternalValid.g:4371:2: rule__NativeContext__Group_4__2__Impl rule__NativeContext__Group_4__3
             {
-            pushFollow(FOLLOW_rule__NativeContext__Group_4__2__Impl_in_rule__NativeContext__Group_4__28684);
+            pushFollow(FOLLOW_16);
             rule__NativeContext__Group_4__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__NativeContext__Group_4__3_in_rule__NativeContext__Group_4__28687);
+            pushFollow(FOLLOW_2);
             rule__NativeContext__Group_4__3();
 
             state._fsp--;
@@ -11531,26 +11531,26 @@ public final void rule__NativeContext__Group_4__2() throws RecognitionException
 
 
     // $ANTLR start "rule__NativeContext__Group_4__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4378:1: rule__NativeContext__Group_4__2__Impl : ( ( ( rule__NativeContext__QuickFixesAssignment_4_2 ) ) ( ( rule__NativeContext__QuickFixesAssignment_4_2 )* ) ) ;
+    // InternalValid.g:4378:1: rule__NativeContext__Group_4__2__Impl : ( ( ( rule__NativeContext__QuickFixesAssignment_4_2 ) ) ( ( rule__NativeContext__QuickFixesAssignment_4_2 )* ) ) ;
     public final void rule__NativeContext__Group_4__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4382:1: ( ( ( ( rule__NativeContext__QuickFixesAssignment_4_2 ) ) ( ( rule__NativeContext__QuickFixesAssignment_4_2 )* ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4383:1: ( ( ( rule__NativeContext__QuickFixesAssignment_4_2 ) ) ( ( rule__NativeContext__QuickFixesAssignment_4_2 )* ) )
+            // InternalValid.g:4382:1: ( ( ( ( rule__NativeContext__QuickFixesAssignment_4_2 ) ) ( ( rule__NativeContext__QuickFixesAssignment_4_2 )* ) ) )
+            // InternalValid.g:4383:1: ( ( ( rule__NativeContext__QuickFixesAssignment_4_2 ) ) ( ( rule__NativeContext__QuickFixesAssignment_4_2 )* ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4383:1: ( ( ( rule__NativeContext__QuickFixesAssignment_4_2 ) ) ( ( rule__NativeContext__QuickFixesAssignment_4_2 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4384:1: ( ( rule__NativeContext__QuickFixesAssignment_4_2 ) ) ( ( rule__NativeContext__QuickFixesAssignment_4_2 )* )
+            // InternalValid.g:4383:1: ( ( ( rule__NativeContext__QuickFixesAssignment_4_2 ) ) ( ( rule__NativeContext__QuickFixesAssignment_4_2 )* ) )
+            // InternalValid.g:4384:1: ( ( rule__NativeContext__QuickFixesAssignment_4_2 ) ) ( ( rule__NativeContext__QuickFixesAssignment_4_2 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4384:1: ( ( rule__NativeContext__QuickFixesAssignment_4_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4385:1: ( rule__NativeContext__QuickFixesAssignment_4_2 )
+            // InternalValid.g:4384:1: ( ( rule__NativeContext__QuickFixesAssignment_4_2 ) )
+            // InternalValid.g:4385:1: ( rule__NativeContext__QuickFixesAssignment_4_2 )
             {
              before(grammarAccess.getNativeContextAccess().getQuickFixesAssignment_4_2()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4386:1: ( rule__NativeContext__QuickFixesAssignment_4_2 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4386:2: rule__NativeContext__QuickFixesAssignment_4_2
+            // InternalValid.g:4386:1: ( rule__NativeContext__QuickFixesAssignment_4_2 )
+            // InternalValid.g:4386:2: rule__NativeContext__QuickFixesAssignment_4_2
             {
-            pushFollow(FOLLOW_rule__NativeContext__QuickFixesAssignment_4_2_in_rule__NativeContext__Group_4__2__Impl8716);
+            pushFollow(FOLLOW_32);
             rule__NativeContext__QuickFixesAssignment_4_2();
 
             state._fsp--;
@@ -11562,11 +11562,11 @@ public final void rule__NativeContext__Group_4__2__Impl() throws RecognitionExce
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4389:1: ( ( rule__NativeContext__QuickFixesAssignment_4_2 )* )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4390:1: ( rule__NativeContext__QuickFixesAssignment_4_2 )*
+            // InternalValid.g:4389:1: ( ( rule__NativeContext__QuickFixesAssignment_4_2 )* )
+            // InternalValid.g:4390:1: ( rule__NativeContext__QuickFixesAssignment_4_2 )*
             {
              before(grammarAccess.getNativeContextAccess().getQuickFixesAssignment_4_2()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4391:1: ( rule__NativeContext__QuickFixesAssignment_4_2 )*
+            // InternalValid.g:4391:1: ( rule__NativeContext__QuickFixesAssignment_4_2 )*
             loop30:
             do {
                 int alt30=2;
@@ -11579,9 +11579,9 @@ public final void rule__NativeContext__Group_4__2__Impl() throws RecognitionExce
 
                 switch (alt30) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4391:2: rule__NativeContext__QuickFixesAssignment_4_2
+            	    // InternalValid.g:4391:2: rule__NativeContext__QuickFixesAssignment_4_2
             	    {
-            	    pushFollow(FOLLOW_rule__NativeContext__QuickFixesAssignment_4_2_in_rule__NativeContext__Group_4__2__Impl8728);
+            	    pushFollow(FOLLOW_32);
             	    rule__NativeContext__QuickFixesAssignment_4_2();
 
             	    state._fsp--;
@@ -11621,16 +11621,16 @@ public final void rule__NativeContext__Group_4__2__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__NativeContext__Group_4__3"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4402:1: rule__NativeContext__Group_4__3 : rule__NativeContext__Group_4__3__Impl ;
+    // InternalValid.g:4402:1: rule__NativeContext__Group_4__3 : rule__NativeContext__Group_4__3__Impl ;
     public final void rule__NativeContext__Group_4__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4406:1: ( rule__NativeContext__Group_4__3__Impl )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4407:2: rule__NativeContext__Group_4__3__Impl
+            // InternalValid.g:4406:1: ( rule__NativeContext__Group_4__3__Impl )
+            // InternalValid.g:4407:2: rule__NativeContext__Group_4__3__Impl
             {
-            pushFollow(FOLLOW_rule__NativeContext__Group_4__3__Impl_in_rule__NativeContext__Group_4__38761);
+            pushFollow(FOLLOW_2);
             rule__NativeContext__Group_4__3__Impl();
 
             state._fsp--;
@@ -11654,20 +11654,20 @@ public final void rule__NativeContext__Group_4__3() throws RecognitionException
 
 
     // $ANTLR start "rule__NativeContext__Group_4__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4413:1: rule__NativeContext__Group_4__3__Impl : ( '}' ) ;
+    // InternalValid.g:4413:1: rule__NativeContext__Group_4__3__Impl : ( '}' ) ;
     public final void rule__NativeContext__Group_4__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4417:1: ( ( '}' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4418:1: ( '}' )
+            // InternalValid.g:4417:1: ( ( '}' ) )
+            // InternalValid.g:4418:1: ( '}' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4418:1: ( '}' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4419:1: '}'
+            // InternalValid.g:4418:1: ( '}' )
+            // InternalValid.g:4419:1: '}'
             {
              before(grammarAccess.getNativeContextAccess().getRightCurlyBracketKeyword_4_3()); 
-            match(input,22,FOLLOW_22_in_rule__NativeContext__Group_4__3__Impl8789); 
+            match(input,22,FOLLOW_2); 
              after(grammarAccess.getNativeContextAccess().getRightCurlyBracketKeyword_4_3()); 
 
             }
@@ -11691,21 +11691,21 @@ public final void rule__NativeContext__Group_4__3__Impl() throws RecognitionExce
 
 
     // $ANTLR start "rule__QuickFix__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4440:1: rule__QuickFix__Group__0 : rule__QuickFix__Group__0__Impl rule__QuickFix__Group__1 ;
+    // InternalValid.g:4440:1: rule__QuickFix__Group__0 : rule__QuickFix__Group__0__Impl rule__QuickFix__Group__1 ;
     public final void rule__QuickFix__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4444:1: ( rule__QuickFix__Group__0__Impl rule__QuickFix__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4445:2: rule__QuickFix__Group__0__Impl rule__QuickFix__Group__1
+            // InternalValid.g:4444:1: ( rule__QuickFix__Group__0__Impl rule__QuickFix__Group__1 )
+            // InternalValid.g:4445:2: rule__QuickFix__Group__0__Impl rule__QuickFix__Group__1
             {
-            pushFollow(FOLLOW_rule__QuickFix__Group__0__Impl_in_rule__QuickFix__Group__08828);
+            pushFollow(FOLLOW_31);
             rule__QuickFix__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__QuickFix__Group__1_in_rule__QuickFix__Group__08831);
+            pushFollow(FOLLOW_2);
             rule__QuickFix__Group__1();
 
             state._fsp--;
@@ -11729,20 +11729,20 @@ public final void rule__QuickFix__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__QuickFix__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4452:1: rule__QuickFix__Group__0__Impl : ( ( rule__QuickFix__QuickFixKindAssignment_0 )? ) ;
+    // InternalValid.g:4452:1: rule__QuickFix__Group__0__Impl : ( ( rule__QuickFix__QuickFixKindAssignment_0 )? ) ;
     public final void rule__QuickFix__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4456:1: ( ( ( rule__QuickFix__QuickFixKindAssignment_0 )? ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4457:1: ( ( rule__QuickFix__QuickFixKindAssignment_0 )? )
+            // InternalValid.g:4456:1: ( ( ( rule__QuickFix__QuickFixKindAssignment_0 )? ) )
+            // InternalValid.g:4457:1: ( ( rule__QuickFix__QuickFixKindAssignment_0 )? )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4457:1: ( ( rule__QuickFix__QuickFixKindAssignment_0 )? )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4458:1: ( rule__QuickFix__QuickFixKindAssignment_0 )?
+            // InternalValid.g:4457:1: ( ( rule__QuickFix__QuickFixKindAssignment_0 )? )
+            // InternalValid.g:4458:1: ( rule__QuickFix__QuickFixKindAssignment_0 )?
             {
              before(grammarAccess.getQuickFixAccess().getQuickFixKindAssignment_0()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4459:1: ( rule__QuickFix__QuickFixKindAssignment_0 )?
+            // InternalValid.g:4459:1: ( rule__QuickFix__QuickFixKindAssignment_0 )?
             int alt31=2;
             int LA31_0 = input.LA(1);
 
@@ -11751,9 +11751,9 @@ public final void rule__QuickFix__Group__0__Impl() throws RecognitionException {
             }
             switch (alt31) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4459:2: rule__QuickFix__QuickFixKindAssignment_0
+                    // InternalValid.g:4459:2: rule__QuickFix__QuickFixKindAssignment_0
                     {
-                    pushFollow(FOLLOW_rule__QuickFix__QuickFixKindAssignment_0_in_rule__QuickFix__Group__0__Impl8858);
+                    pushFollow(FOLLOW_2);
                     rule__QuickFix__QuickFixKindAssignment_0();
 
                     state._fsp--;
@@ -11787,21 +11787,21 @@ public final void rule__QuickFix__Group__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__QuickFix__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4469:1: rule__QuickFix__Group__1 : rule__QuickFix__Group__1__Impl rule__QuickFix__Group__2 ;
+    // InternalValid.g:4469:1: rule__QuickFix__Group__1 : rule__QuickFix__Group__1__Impl rule__QuickFix__Group__2 ;
     public final void rule__QuickFix__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4473:1: ( rule__QuickFix__Group__1__Impl rule__QuickFix__Group__2 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4474:2: rule__QuickFix__Group__1__Impl rule__QuickFix__Group__2
+            // InternalValid.g:4473:1: ( rule__QuickFix__Group__1__Impl rule__QuickFix__Group__2 )
+            // InternalValid.g:4474:2: rule__QuickFix__Group__1__Impl rule__QuickFix__Group__2
             {
-            pushFollow(FOLLOW_rule__QuickFix__Group__1__Impl_in_rule__QuickFix__Group__18889);
+            pushFollow(FOLLOW_7);
             rule__QuickFix__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__QuickFix__Group__2_in_rule__QuickFix__Group__18892);
+            pushFollow(FOLLOW_2);
             rule__QuickFix__Group__2();
 
             state._fsp--;
@@ -11825,20 +11825,20 @@ public final void rule__QuickFix__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__QuickFix__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4481:1: rule__QuickFix__Group__1__Impl : ( 'fix' ) ;
+    // InternalValid.g:4481:1: rule__QuickFix__Group__1__Impl : ( 'fix' ) ;
     public final void rule__QuickFix__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4485:1: ( ( 'fix' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4486:1: ( 'fix' )
+            // InternalValid.g:4485:1: ( ( 'fix' ) )
+            // InternalValid.g:4486:1: ( 'fix' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4486:1: ( 'fix' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4487:1: 'fix'
+            // InternalValid.g:4486:1: ( 'fix' )
+            // InternalValid.g:4487:1: 'fix'
             {
              before(grammarAccess.getQuickFixAccess().getFixKeyword_1()); 
-            match(input,34,FOLLOW_34_in_rule__QuickFix__Group__1__Impl8920); 
+            match(input,34,FOLLOW_2); 
              after(grammarAccess.getQuickFixAccess().getFixKeyword_1()); 
 
             }
@@ -11862,21 +11862,21 @@ public final void rule__QuickFix__Group__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__QuickFix__Group__2"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4500:1: rule__QuickFix__Group__2 : rule__QuickFix__Group__2__Impl rule__QuickFix__Group__3 ;
+    // InternalValid.g:4500:1: rule__QuickFix__Group__2 : rule__QuickFix__Group__2__Impl rule__QuickFix__Group__3 ;
     public final void rule__QuickFix__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4504:1: ( rule__QuickFix__Group__2__Impl rule__QuickFix__Group__3 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4505:2: rule__QuickFix__Group__2__Impl rule__QuickFix__Group__3
+            // InternalValid.g:4504:1: ( rule__QuickFix__Group__2__Impl rule__QuickFix__Group__3 )
+            // InternalValid.g:4505:2: rule__QuickFix__Group__2__Impl rule__QuickFix__Group__3
             {
-            pushFollow(FOLLOW_rule__QuickFix__Group__2__Impl_in_rule__QuickFix__Group__28951);
+            pushFollow(FOLLOW_8);
             rule__QuickFix__Group__2__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__QuickFix__Group__3_in_rule__QuickFix__Group__28954);
+            pushFollow(FOLLOW_2);
             rule__QuickFix__Group__3();
 
             state._fsp--;
@@ -11900,23 +11900,23 @@ public final void rule__QuickFix__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__QuickFix__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4512:1: rule__QuickFix__Group__2__Impl : ( ( rule__QuickFix__NameAssignment_2 ) ) ;
+    // InternalValid.g:4512:1: rule__QuickFix__Group__2__Impl : ( ( rule__QuickFix__NameAssignment_2 ) ) ;
     public final void rule__QuickFix__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4516:1: ( ( ( rule__QuickFix__NameAssignment_2 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4517:1: ( ( rule__QuickFix__NameAssignment_2 ) )
+            // InternalValid.g:4516:1: ( ( ( rule__QuickFix__NameAssignment_2 ) ) )
+            // InternalValid.g:4517:1: ( ( rule__QuickFix__NameAssignment_2 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4517:1: ( ( rule__QuickFix__NameAssignment_2 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4518:1: ( rule__QuickFix__NameAssignment_2 )
+            // InternalValid.g:4517:1: ( ( rule__QuickFix__NameAssignment_2 ) )
+            // InternalValid.g:4518:1: ( rule__QuickFix__NameAssignment_2 )
             {
              before(grammarAccess.getQuickFixAccess().getNameAssignment_2()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4519:1: ( rule__QuickFix__NameAssignment_2 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4519:2: rule__QuickFix__NameAssignment_2
+            // InternalValid.g:4519:1: ( rule__QuickFix__NameAssignment_2 )
+            // InternalValid.g:4519:2: rule__QuickFix__NameAssignment_2
             {
-            pushFollow(FOLLOW_rule__QuickFix__NameAssignment_2_in_rule__QuickFix__Group__2__Impl8981);
+            pushFollow(FOLLOW_2);
             rule__QuickFix__NameAssignment_2();
 
             state._fsp--;
@@ -11947,21 +11947,21 @@ public final void rule__QuickFix__Group__2__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__QuickFix__Group__3"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4529:1: rule__QuickFix__Group__3 : rule__QuickFix__Group__3__Impl rule__QuickFix__Group__4 ;
+    // InternalValid.g:4529:1: rule__QuickFix__Group__3 : rule__QuickFix__Group__3__Impl rule__QuickFix__Group__4 ;
     public final void rule__QuickFix__Group__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4533:1: ( rule__QuickFix__Group__3__Impl rule__QuickFix__Group__4 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4534:2: rule__QuickFix__Group__3__Impl rule__QuickFix__Group__4
+            // InternalValid.g:4533:1: ( rule__QuickFix__Group__3__Impl rule__QuickFix__Group__4 )
+            // InternalValid.g:4534:2: rule__QuickFix__Group__3__Impl rule__QuickFix__Group__4
             {
-            pushFollow(FOLLOW_rule__QuickFix__Group__3__Impl_in_rule__QuickFix__Group__39011);
+            pushFollow(FOLLOW_6);
             rule__QuickFix__Group__3__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__QuickFix__Group__4_in_rule__QuickFix__Group__39014);
+            pushFollow(FOLLOW_2);
             rule__QuickFix__Group__4();
 
             state._fsp--;
@@ -11985,20 +11985,20 @@ public final void rule__QuickFix__Group__3() throws RecognitionException {
 
 
     // $ANTLR start "rule__QuickFix__Group__3__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4541:1: rule__QuickFix__Group__3__Impl : ( 'label' ) ;
+    // InternalValid.g:4541:1: rule__QuickFix__Group__3__Impl : ( 'label' ) ;
     public final void rule__QuickFix__Group__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4545:1: ( ( 'label' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4546:1: ( 'label' )
+            // InternalValid.g:4545:1: ( ( 'label' ) )
+            // InternalValid.g:4546:1: ( 'label' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4546:1: ( 'label' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4547:1: 'label'
+            // InternalValid.g:4546:1: ( 'label' )
+            // InternalValid.g:4547:1: 'label'
             {
              before(grammarAccess.getQuickFixAccess().getLabelKeyword_3()); 
-            match(input,20,FOLLOW_20_in_rule__QuickFix__Group__3__Impl9042); 
+            match(input,20,FOLLOW_2); 
              after(grammarAccess.getQuickFixAccess().getLabelKeyword_3()); 
 
             }
@@ -12022,21 +12022,21 @@ public final void rule__QuickFix__Group__3__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__QuickFix__Group__4"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4560:1: rule__QuickFix__Group__4 : rule__QuickFix__Group__4__Impl rule__QuickFix__Group__5 ;
+    // InternalValid.g:4560:1: rule__QuickFix__Group__4 : rule__QuickFix__Group__4__Impl rule__QuickFix__Group__5 ;
     public final void rule__QuickFix__Group__4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4564:1: ( rule__QuickFix__Group__4__Impl rule__QuickFix__Group__5 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4565:2: rule__QuickFix__Group__4__Impl rule__QuickFix__Group__5
+            // InternalValid.g:4564:1: ( rule__QuickFix__Group__4__Impl rule__QuickFix__Group__5 )
+            // InternalValid.g:4565:2: rule__QuickFix__Group__4__Impl rule__QuickFix__Group__5
             {
-            pushFollow(FOLLOW_rule__QuickFix__Group__4__Impl_in_rule__QuickFix__Group__49073);
+            pushFollow(FOLLOW_33);
             rule__QuickFix__Group__4__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__QuickFix__Group__5_in_rule__QuickFix__Group__49076);
+            pushFollow(FOLLOW_2);
             rule__QuickFix__Group__5();
 
             state._fsp--;
@@ -12060,23 +12060,23 @@ public final void rule__QuickFix__Group__4() throws RecognitionException {
 
 
     // $ANTLR start "rule__QuickFix__Group__4__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4572:1: rule__QuickFix__Group__4__Impl : ( ( rule__QuickFix__LabelAssignment_4 ) ) ;
+    // InternalValid.g:4572:1: rule__QuickFix__Group__4__Impl : ( ( rule__QuickFix__LabelAssignment_4 ) ) ;
     public final void rule__QuickFix__Group__4__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4576:1: ( ( ( rule__QuickFix__LabelAssignment_4 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4577:1: ( ( rule__QuickFix__LabelAssignment_4 ) )
+            // InternalValid.g:4576:1: ( ( ( rule__QuickFix__LabelAssignment_4 ) ) )
+            // InternalValid.g:4577:1: ( ( rule__QuickFix__LabelAssignment_4 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4577:1: ( ( rule__QuickFix__LabelAssignment_4 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4578:1: ( rule__QuickFix__LabelAssignment_4 )
+            // InternalValid.g:4577:1: ( ( rule__QuickFix__LabelAssignment_4 ) )
+            // InternalValid.g:4578:1: ( rule__QuickFix__LabelAssignment_4 )
             {
              before(grammarAccess.getQuickFixAccess().getLabelAssignment_4()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4579:1: ( rule__QuickFix__LabelAssignment_4 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4579:2: rule__QuickFix__LabelAssignment_4
+            // InternalValid.g:4579:1: ( rule__QuickFix__LabelAssignment_4 )
+            // InternalValid.g:4579:2: rule__QuickFix__LabelAssignment_4
             {
-            pushFollow(FOLLOW_rule__QuickFix__LabelAssignment_4_in_rule__QuickFix__Group__4__Impl9103);
+            pushFollow(FOLLOW_2);
             rule__QuickFix__LabelAssignment_4();
 
             state._fsp--;
@@ -12107,21 +12107,21 @@ public final void rule__QuickFix__Group__4__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__QuickFix__Group__5"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4589:1: rule__QuickFix__Group__5 : rule__QuickFix__Group__5__Impl rule__QuickFix__Group__6 ;
+    // InternalValid.g:4589:1: rule__QuickFix__Group__5 : rule__QuickFix__Group__5__Impl rule__QuickFix__Group__6 ;
     public final void rule__QuickFix__Group__5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4593:1: ( rule__QuickFix__Group__5__Impl rule__QuickFix__Group__6 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4594:2: rule__QuickFix__Group__5__Impl rule__QuickFix__Group__6
+            // InternalValid.g:4593:1: ( rule__QuickFix__Group__5__Impl rule__QuickFix__Group__6 )
+            // InternalValid.g:4594:2: rule__QuickFix__Group__5__Impl rule__QuickFix__Group__6
             {
-            pushFollow(FOLLOW_rule__QuickFix__Group__5__Impl_in_rule__QuickFix__Group__59133);
+            pushFollow(FOLLOW_6);
             rule__QuickFix__Group__5__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__QuickFix__Group__6_in_rule__QuickFix__Group__59136);
+            pushFollow(FOLLOW_2);
             rule__QuickFix__Group__6();
 
             state._fsp--;
@@ -12145,20 +12145,20 @@ public final void rule__QuickFix__Group__5() throws RecognitionException {
 
 
     // $ANTLR start "rule__QuickFix__Group__5__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4601:1: rule__QuickFix__Group__5__Impl : ( 'message' ) ;
+    // InternalValid.g:4601:1: rule__QuickFix__Group__5__Impl : ( 'message' ) ;
     public final void rule__QuickFix__Group__5__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4605:1: ( ( 'message' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4606:1: ( 'message' )
+            // InternalValid.g:4605:1: ( ( 'message' ) )
+            // InternalValid.g:4606:1: ( 'message' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4606:1: ( 'message' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4607:1: 'message'
+            // InternalValid.g:4606:1: ( 'message' )
+            // InternalValid.g:4607:1: 'message'
             {
              before(grammarAccess.getQuickFixAccess().getMessageKeyword_5()); 
-            match(input,24,FOLLOW_24_in_rule__QuickFix__Group__5__Impl9164); 
+            match(input,24,FOLLOW_2); 
              after(grammarAccess.getQuickFixAccess().getMessageKeyword_5()); 
 
             }
@@ -12182,21 +12182,21 @@ public final void rule__QuickFix__Group__5__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__QuickFix__Group__6"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4620:1: rule__QuickFix__Group__6 : rule__QuickFix__Group__6__Impl rule__QuickFix__Group__7 ;
+    // InternalValid.g:4620:1: rule__QuickFix__Group__6 : rule__QuickFix__Group__6__Impl rule__QuickFix__Group__7 ;
     public final void rule__QuickFix__Group__6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4624:1: ( rule__QuickFix__Group__6__Impl rule__QuickFix__Group__7 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4625:2: rule__QuickFix__Group__6__Impl rule__QuickFix__Group__7
+            // InternalValid.g:4624:1: ( rule__QuickFix__Group__6__Impl rule__QuickFix__Group__7 )
+            // InternalValid.g:4625:2: rule__QuickFix__Group__6__Impl rule__QuickFix__Group__7
             {
-            pushFollow(FOLLOW_rule__QuickFix__Group__6__Impl_in_rule__QuickFix__Group__69195);
+            pushFollow(FOLLOW_34);
             rule__QuickFix__Group__6__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__QuickFix__Group__7_in_rule__QuickFix__Group__69198);
+            pushFollow(FOLLOW_2);
             rule__QuickFix__Group__7();
 
             state._fsp--;
@@ -12220,23 +12220,23 @@ public final void rule__QuickFix__Group__6() throws RecognitionException {
 
 
     // $ANTLR start "rule__QuickFix__Group__6__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4632:1: rule__QuickFix__Group__6__Impl : ( ( rule__QuickFix__MessageAssignment_6 ) ) ;
+    // InternalValid.g:4632:1: rule__QuickFix__Group__6__Impl : ( ( rule__QuickFix__MessageAssignment_6 ) ) ;
     public final void rule__QuickFix__Group__6__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4636:1: ( ( ( rule__QuickFix__MessageAssignment_6 ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4637:1: ( ( rule__QuickFix__MessageAssignment_6 ) )
+            // InternalValid.g:4636:1: ( ( ( rule__QuickFix__MessageAssignment_6 ) ) )
+            // InternalValid.g:4637:1: ( ( rule__QuickFix__MessageAssignment_6 ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4637:1: ( ( rule__QuickFix__MessageAssignment_6 ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4638:1: ( rule__QuickFix__MessageAssignment_6 )
+            // InternalValid.g:4637:1: ( ( rule__QuickFix__MessageAssignment_6 ) )
+            // InternalValid.g:4638:1: ( rule__QuickFix__MessageAssignment_6 )
             {
              before(grammarAccess.getQuickFixAccess().getMessageAssignment_6()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4639:1: ( rule__QuickFix__MessageAssignment_6 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4639:2: rule__QuickFix__MessageAssignment_6
+            // InternalValid.g:4639:1: ( rule__QuickFix__MessageAssignment_6 )
+            // InternalValid.g:4639:2: rule__QuickFix__MessageAssignment_6
             {
-            pushFollow(FOLLOW_rule__QuickFix__MessageAssignment_6_in_rule__QuickFix__Group__6__Impl9225);
+            pushFollow(FOLLOW_2);
             rule__QuickFix__MessageAssignment_6();
 
             state._fsp--;
@@ -12267,16 +12267,16 @@ public final void rule__QuickFix__Group__6__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__QuickFix__Group__7"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4649:1: rule__QuickFix__Group__7 : rule__QuickFix__Group__7__Impl ;
+    // InternalValid.g:4649:1: rule__QuickFix__Group__7 : rule__QuickFix__Group__7__Impl ;
     public final void rule__QuickFix__Group__7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4653:1: ( rule__QuickFix__Group__7__Impl )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4654:2: rule__QuickFix__Group__7__Impl
+            // InternalValid.g:4653:1: ( rule__QuickFix__Group__7__Impl )
+            // InternalValid.g:4654:2: rule__QuickFix__Group__7__Impl
             {
-            pushFollow(FOLLOW_rule__QuickFix__Group__7__Impl_in_rule__QuickFix__Group__79255);
+            pushFollow(FOLLOW_2);
             rule__QuickFix__Group__7__Impl();
 
             state._fsp--;
@@ -12300,20 +12300,20 @@ public final void rule__QuickFix__Group__7() throws RecognitionException {
 
 
     // $ANTLR start "rule__QuickFix__Group__7__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4660:1: rule__QuickFix__Group__7__Impl : ( ';' ) ;
+    // InternalValid.g:4660:1: rule__QuickFix__Group__7__Impl : ( ';' ) ;
     public final void rule__QuickFix__Group__7__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4664:1: ( ( ';' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4665:1: ( ';' )
+            // InternalValid.g:4664:1: ( ( ';' ) )
+            // InternalValid.g:4665:1: ( ';' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4665:1: ( ';' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4666:1: ';'
+            // InternalValid.g:4665:1: ( ';' )
+            // InternalValid.g:4666:1: ';'
             {
              before(grammarAccess.getQuickFixAccess().getSemicolonKeyword_7()); 
-            match(input,30,FOLLOW_30_in_rule__QuickFix__Group__7__Impl9283); 
+            match(input,30,FOLLOW_2); 
              after(grammarAccess.getQuickFixAccess().getSemicolonKeyword_7()); 
 
             }
@@ -12337,21 +12337,21 @@ public final void rule__QuickFix__Group__7__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__QualifiedID__Group__0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4695:1: rule__QualifiedID__Group__0 : rule__QualifiedID__Group__0__Impl rule__QualifiedID__Group__1 ;
+    // InternalValid.g:4695:1: rule__QualifiedID__Group__0 : rule__QualifiedID__Group__0__Impl rule__QualifiedID__Group__1 ;
     public final void rule__QualifiedID__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4699:1: ( rule__QualifiedID__Group__0__Impl rule__QualifiedID__Group__1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4700:2: rule__QualifiedID__Group__0__Impl rule__QualifiedID__Group__1
+            // InternalValid.g:4699:1: ( rule__QualifiedID__Group__0__Impl rule__QualifiedID__Group__1 )
+            // InternalValid.g:4700:2: rule__QualifiedID__Group__0__Impl rule__QualifiedID__Group__1
             {
-            pushFollow(FOLLOW_rule__QualifiedID__Group__0__Impl_in_rule__QualifiedID__Group__09330);
+            pushFollow(FOLLOW_7);
             rule__QualifiedID__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__QualifiedID__Group__1_in_rule__QualifiedID__Group__09333);
+            pushFollow(FOLLOW_2);
             rule__QualifiedID__Group__1();
 
             state._fsp--;
@@ -12375,20 +12375,20 @@ public final void rule__QualifiedID__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__QualifiedID__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4707:1: rule__QualifiedID__Group__0__Impl : ( ( rule__QualifiedID__Group_0__0 )* ) ;
+    // InternalValid.g:4707:1: rule__QualifiedID__Group__0__Impl : ( ( rule__QualifiedID__Group_0__0 )* ) ;
     public final void rule__QualifiedID__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4711:1: ( ( ( rule__QualifiedID__Group_0__0 )* ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4712:1: ( ( rule__QualifiedID__Group_0__0 )* )
+            // InternalValid.g:4711:1: ( ( ( rule__QualifiedID__Group_0__0 )* ) )
+            // InternalValid.g:4712:1: ( ( rule__QualifiedID__Group_0__0 )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4712:1: ( ( rule__QualifiedID__Group_0__0 )* )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4713:1: ( rule__QualifiedID__Group_0__0 )*
+            // InternalValid.g:4712:1: ( ( rule__QualifiedID__Group_0__0 )* )
+            // InternalValid.g:4713:1: ( rule__QualifiedID__Group_0__0 )*
             {
              before(grammarAccess.getQualifiedIDAccess().getGroup_0()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4714:1: ( rule__QualifiedID__Group_0__0 )*
+            // InternalValid.g:4714:1: ( rule__QualifiedID__Group_0__0 )*
             loop32:
             do {
                 int alt32=2;
@@ -12407,9 +12407,9 @@ public final void rule__QualifiedID__Group__0__Impl() throws RecognitionExceptio
 
                 switch (alt32) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4714:2: rule__QualifiedID__Group_0__0
+            	    // InternalValid.g:4714:2: rule__QualifiedID__Group_0__0
             	    {
-            	    pushFollow(FOLLOW_rule__QualifiedID__Group_0__0_in_rule__QualifiedID__Group__0__Impl9360);
+            	    pushFollow(FOLLOW_17);
             	    rule__QualifiedID__Group_0__0();
 
             	    state._fsp--;
@@ -12446,16 +12446,16 @@ public final void rule__QualifiedID__Group__0__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__QualifiedID__Group__1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4724:1: rule__QualifiedID__Group__1 : rule__QualifiedID__Group__1__Impl ;
+    // InternalValid.g:4724:1: rule__QualifiedID__Group__1 : rule__QualifiedID__Group__1__Impl ;
     public final void rule__QualifiedID__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4728:1: ( rule__QualifiedID__Group__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4729:2: rule__QualifiedID__Group__1__Impl
+            // InternalValid.g:4728:1: ( rule__QualifiedID__Group__1__Impl )
+            // InternalValid.g:4729:2: rule__QualifiedID__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__QualifiedID__Group__1__Impl_in_rule__QualifiedID__Group__19391);
+            pushFollow(FOLLOW_2);
             rule__QualifiedID__Group__1__Impl();
 
             state._fsp--;
@@ -12479,20 +12479,20 @@ public final void rule__QualifiedID__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__QualifiedID__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4735:1: rule__QualifiedID__Group__1__Impl : ( RULE_ID ) ;
+    // InternalValid.g:4735:1: rule__QualifiedID__Group__1__Impl : ( RULE_ID ) ;
     public final void rule__QualifiedID__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4739:1: ( ( RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4740:1: ( RULE_ID )
+            // InternalValid.g:4739:1: ( ( RULE_ID ) )
+            // InternalValid.g:4740:1: ( RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4740:1: ( RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4741:1: RULE_ID
+            // InternalValid.g:4740:1: ( RULE_ID )
+            // InternalValid.g:4741:1: RULE_ID
             {
              before(grammarAccess.getQualifiedIDAccess().getIDTerminalRuleCall_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__QualifiedID__Group__1__Impl9418); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getQualifiedIDAccess().getIDTerminalRuleCall_1()); 
 
             }
@@ -12516,21 +12516,21 @@ public final void rule__QualifiedID__Group__1__Impl() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__QualifiedID__Group_0__0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4756:1: rule__QualifiedID__Group_0__0 : rule__QualifiedID__Group_0__0__Impl rule__QualifiedID__Group_0__1 ;
+    // InternalValid.g:4756:1: rule__QualifiedID__Group_0__0 : rule__QualifiedID__Group_0__0__Impl rule__QualifiedID__Group_0__1 ;
     public final void rule__QualifiedID__Group_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4760:1: ( rule__QualifiedID__Group_0__0__Impl rule__QualifiedID__Group_0__1 )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4761:2: rule__QualifiedID__Group_0__0__Impl rule__QualifiedID__Group_0__1
+            // InternalValid.g:4760:1: ( rule__QualifiedID__Group_0__0__Impl rule__QualifiedID__Group_0__1 )
+            // InternalValid.g:4761:2: rule__QualifiedID__Group_0__0__Impl rule__QualifiedID__Group_0__1
             {
-            pushFollow(FOLLOW_rule__QualifiedID__Group_0__0__Impl_in_rule__QualifiedID__Group_0__09451);
+            pushFollow(FOLLOW_35);
             rule__QualifiedID__Group_0__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__QualifiedID__Group_0__1_in_rule__QualifiedID__Group_0__09454);
+            pushFollow(FOLLOW_2);
             rule__QualifiedID__Group_0__1();
 
             state._fsp--;
@@ -12554,20 +12554,20 @@ public final void rule__QualifiedID__Group_0__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__QualifiedID__Group_0__0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4768:1: rule__QualifiedID__Group_0__0__Impl : ( RULE_ID ) ;
+    // InternalValid.g:4768:1: rule__QualifiedID__Group_0__0__Impl : ( RULE_ID ) ;
     public final void rule__QualifiedID__Group_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4772:1: ( ( RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4773:1: ( RULE_ID )
+            // InternalValid.g:4772:1: ( ( RULE_ID ) )
+            // InternalValid.g:4773:1: ( RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4773:1: ( RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4774:1: RULE_ID
+            // InternalValid.g:4773:1: ( RULE_ID )
+            // InternalValid.g:4774:1: RULE_ID
             {
              before(grammarAccess.getQualifiedIDAccess().getIDTerminalRuleCall_0_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__QualifiedID__Group_0__0__Impl9481); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getQualifiedIDAccess().getIDTerminalRuleCall_0_0()); 
 
             }
@@ -12591,16 +12591,16 @@ public final void rule__QualifiedID__Group_0__0__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__QualifiedID__Group_0__1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4785:1: rule__QualifiedID__Group_0__1 : rule__QualifiedID__Group_0__1__Impl ;
+    // InternalValid.g:4785:1: rule__QualifiedID__Group_0__1 : rule__QualifiedID__Group_0__1__Impl ;
     public final void rule__QualifiedID__Group_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4789:1: ( rule__QualifiedID__Group_0__1__Impl )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4790:2: rule__QualifiedID__Group_0__1__Impl
+            // InternalValid.g:4789:1: ( rule__QualifiedID__Group_0__1__Impl )
+            // InternalValid.g:4790:2: rule__QualifiedID__Group_0__1__Impl
             {
-            pushFollow(FOLLOW_rule__QualifiedID__Group_0__1__Impl_in_rule__QualifiedID__Group_0__19510);
+            pushFollow(FOLLOW_2);
             rule__QualifiedID__Group_0__1__Impl();
 
             state._fsp--;
@@ -12624,20 +12624,20 @@ public final void rule__QualifiedID__Group_0__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__QualifiedID__Group_0__1__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4796:1: rule__QualifiedID__Group_0__1__Impl : ( '::' ) ;
+    // InternalValid.g:4796:1: rule__QualifiedID__Group_0__1__Impl : ( '::' ) ;
     public final void rule__QualifiedID__Group_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4800:1: ( ( '::' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4801:1: ( '::' )
+            // InternalValid.g:4800:1: ( ( '::' ) )
+            // InternalValid.g:4801:1: ( '::' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4801:1: ( '::' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4802:1: '::'
+            // InternalValid.g:4801:1: ( '::' )
+            // InternalValid.g:4802:1: '::'
             {
              before(grammarAccess.getQualifiedIDAccess().getColonColonKeyword_0_1()); 
-            match(input,35,FOLLOW_35_in_rule__QualifiedID__Group_0__1__Impl9538); 
+            match(input,35,FOLLOW_2); 
              after(grammarAccess.getQualifiedIDAccess().getColonColonKeyword_0_1()); 
 
             }
@@ -12661,31 +12661,31 @@ public final void rule__QualifiedID__Group_0__1__Impl() throws RecognitionExcept
 
 
     // $ANTLR start "rule__NativeRule__UnorderedGroup_0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4820:1: rule__NativeRule__UnorderedGroup_0 : ( rule__NativeRule__UnorderedGroup_0__0 )? ;
+    // InternalValid.g:4820:1: rule__NativeRule__UnorderedGroup_0 : ( rule__NativeRule__UnorderedGroup_0__0 )? ;
     public final void rule__NativeRule__UnorderedGroup_0() throws RecognitionException {
 
             	int stackSize = keepStackSize();
         		getUnorderedGroupHelper().enter(grammarAccess.getNativeRuleAccess().getUnorderedGroup_0());
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4825:1: ( ( rule__NativeRule__UnorderedGroup_0__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4826:2: ( rule__NativeRule__UnorderedGroup_0__0 )?
+            // InternalValid.g:4825:1: ( ( rule__NativeRule__UnorderedGroup_0__0 )? )
+            // InternalValid.g:4826:2: ( rule__NativeRule__UnorderedGroup_0__0 )?
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4826:2: ( rule__NativeRule__UnorderedGroup_0__0 )?
+            // InternalValid.g:4826:2: ( rule__NativeRule__UnorderedGroup_0__0 )?
             int alt33=2;
             int LA33_0 = input.LA(1);
 
-            if ( LA33_0 ==36 && getUnorderedGroupHelper().canSelect(grammarAccess.getNativeRuleAccess().getUnorderedGroup_0(), 0) ) {
+            if ( LA33_0 == 36 && getUnorderedGroupHelper().canSelect(grammarAccess.getNativeRuleAccess().getUnorderedGroup_0(), 0) ) {
                 alt33=1;
             }
-            else if ( LA33_0 >=11 && LA33_0<=13 && getUnorderedGroupHelper().canSelect(grammarAccess.getNativeRuleAccess().getUnorderedGroup_0(), 1) ) {
+            else if ( LA33_0 >= 11 && LA33_0 <= 13 && getUnorderedGroupHelper().canSelect(grammarAccess.getNativeRuleAccess().getUnorderedGroup_0(), 1) ) {
                 alt33=1;
             }
             switch (alt33) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4826:2: rule__NativeRule__UnorderedGroup_0__0
+                    // InternalValid.g:4826:2: rule__NativeRule__UnorderedGroup_0__0
                     {
-                    pushFollow(FOLLOW_rule__NativeRule__UnorderedGroup_0__0_in_rule__NativeRule__UnorderedGroup_09574);
+                    pushFollow(FOLLOW_2);
                     rule__NativeRule__UnorderedGroup_0__0();
 
                     state._fsp--;
@@ -12716,24 +12716,24 @@ else if ( LA33_0 >=11 && LA33_0<=13 && getUnorderedGroupHelper().canSelect(gramm
 
 
     // $ANTLR start "rule__NativeRule__UnorderedGroup_0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4836:1: rule__NativeRule__UnorderedGroup_0__Impl : ( ({...}? => ( ( ( rule__NativeRule__OptionalAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__NativeRule__CheckKindAssignment_0_1 ) ) ) ) ) ;
+    // InternalValid.g:4836:1: rule__NativeRule__UnorderedGroup_0__Impl : ( ({...}? => ( ( ( rule__NativeRule__OptionalAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__NativeRule__CheckKindAssignment_0_1 ) ) ) ) ) ;
     public final void rule__NativeRule__UnorderedGroup_0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         		boolean selected = false;
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4841:1: ( ( ({...}? => ( ( ( rule__NativeRule__OptionalAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__NativeRule__CheckKindAssignment_0_1 ) ) ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4842:3: ( ({...}? => ( ( ( rule__NativeRule__OptionalAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__NativeRule__CheckKindAssignment_0_1 ) ) ) ) )
+            // InternalValid.g:4841:1: ( ( ({...}? => ( ( ( rule__NativeRule__OptionalAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__NativeRule__CheckKindAssignment_0_1 ) ) ) ) ) )
+            // InternalValid.g:4842:3: ( ({...}? => ( ( ( rule__NativeRule__OptionalAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__NativeRule__CheckKindAssignment_0_1 ) ) ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4842:3: ( ({...}? => ( ( ( rule__NativeRule__OptionalAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__NativeRule__CheckKindAssignment_0_1 ) ) ) ) )
+            // InternalValid.g:4842:3: ( ({...}? => ( ( ( rule__NativeRule__OptionalAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__NativeRule__CheckKindAssignment_0_1 ) ) ) ) )
             int alt34=2;
             int LA34_0 = input.LA(1);
 
-            if ( LA34_0 ==36 && getUnorderedGroupHelper().canSelect(grammarAccess.getNativeRuleAccess().getUnorderedGroup_0(), 0) ) {
+            if ( LA34_0 == 36 && getUnorderedGroupHelper().canSelect(grammarAccess.getNativeRuleAccess().getUnorderedGroup_0(), 0) ) {
                 alt34=1;
             }
-            else if ( LA34_0 >=11 && LA34_0<=13 && getUnorderedGroupHelper().canSelect(grammarAccess.getNativeRuleAccess().getUnorderedGroup_0(), 1) ) {
+            else if ( LA34_0 >= 11 && LA34_0 <= 13 && getUnorderedGroupHelper().canSelect(grammarAccess.getNativeRuleAccess().getUnorderedGroup_0(), 1) ) {
                 alt34=2;
             }
             else {
@@ -12744,16 +12744,16 @@ else if ( LA34_0 >=11 && LA34_0<=13 && getUnorderedGroupHelper().canSelect(gramm
             }
             switch (alt34) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4844:4: ({...}? => ( ( ( rule__NativeRule__OptionalAssignment_0_0 ) ) ) )
+                    // InternalValid.g:4844:4: ({...}? => ( ( ( rule__NativeRule__OptionalAssignment_0_0 ) ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4844:4: ({...}? => ( ( ( rule__NativeRule__OptionalAssignment_0_0 ) ) ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4845:5: {...}? => ( ( ( rule__NativeRule__OptionalAssignment_0_0 ) ) )
+                    // InternalValid.g:4844:4: ({...}? => ( ( ( rule__NativeRule__OptionalAssignment_0_0 ) ) ) )
+                    // InternalValid.g:4845:5: {...}? => ( ( ( rule__NativeRule__OptionalAssignment_0_0 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getNativeRuleAccess().getUnorderedGroup_0(), 0) ) {
                         throw new FailedPredicateException(input, "rule__NativeRule__UnorderedGroup_0__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getNativeRuleAccess().getUnorderedGroup_0(), 0)");
                     }
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4845:107: ( ( ( rule__NativeRule__OptionalAssignment_0_0 ) ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4846:6: ( ( rule__NativeRule__OptionalAssignment_0_0 ) )
+                    // InternalValid.g:4845:107: ( ( ( rule__NativeRule__OptionalAssignment_0_0 ) ) )
+                    // InternalValid.g:4846:6: ( ( rule__NativeRule__OptionalAssignment_0_0 ) )
                     {
                      
                     	 				  getUnorderedGroupHelper().select(grammarAccess.getNativeRuleAccess().getUnorderedGroup_0(), 0);
@@ -12761,14 +12761,14 @@ else if ( LA34_0 >=11 && LA34_0<=13 && getUnorderedGroupHelper().canSelect(gramm
 
                     	 				  selected = true;
                     	 				
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4852:6: ( ( rule__NativeRule__OptionalAssignment_0_0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4854:7: ( rule__NativeRule__OptionalAssignment_0_0 )
+                    // InternalValid.g:4852:6: ( ( rule__NativeRule__OptionalAssignment_0_0 ) )
+                    // InternalValid.g:4854:7: ( rule__NativeRule__OptionalAssignment_0_0 )
                     {
                      before(grammarAccess.getNativeRuleAccess().getOptionalAssignment_0_0()); 
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4855:7: ( rule__NativeRule__OptionalAssignment_0_0 )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4855:8: rule__NativeRule__OptionalAssignment_0_0
+                    // InternalValid.g:4855:7: ( rule__NativeRule__OptionalAssignment_0_0 )
+                    // InternalValid.g:4855:8: rule__NativeRule__OptionalAssignment_0_0
                     {
-                    pushFollow(FOLLOW_rule__NativeRule__OptionalAssignment_0_0_in_rule__NativeRule__UnorderedGroup_0__Impl9661);
+                    pushFollow(FOLLOW_2);
                     rule__NativeRule__OptionalAssignment_0_0();
 
                     state._fsp--;
@@ -12790,16 +12790,16 @@ else if ( LA34_0 >=11 && LA34_0<=13 && getUnorderedGroupHelper().canSelect(gramm
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4861:4: ({...}? => ( ( ( rule__NativeRule__CheckKindAssignment_0_1 ) ) ) )
+                    // InternalValid.g:4861:4: ({...}? => ( ( ( rule__NativeRule__CheckKindAssignment_0_1 ) ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4861:4: ({...}? => ( ( ( rule__NativeRule__CheckKindAssignment_0_1 ) ) ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4862:5: {...}? => ( ( ( rule__NativeRule__CheckKindAssignment_0_1 ) ) )
+                    // InternalValid.g:4861:4: ({...}? => ( ( ( rule__NativeRule__CheckKindAssignment_0_1 ) ) ) )
+                    // InternalValid.g:4862:5: {...}? => ( ( ( rule__NativeRule__CheckKindAssignment_0_1 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getNativeRuleAccess().getUnorderedGroup_0(), 1) ) {
                         throw new FailedPredicateException(input, "rule__NativeRule__UnorderedGroup_0__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getNativeRuleAccess().getUnorderedGroup_0(), 1)");
                     }
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4862:107: ( ( ( rule__NativeRule__CheckKindAssignment_0_1 ) ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4863:6: ( ( rule__NativeRule__CheckKindAssignment_0_1 ) )
+                    // InternalValid.g:4862:107: ( ( ( rule__NativeRule__CheckKindAssignment_0_1 ) ) )
+                    // InternalValid.g:4863:6: ( ( rule__NativeRule__CheckKindAssignment_0_1 ) )
                     {
                      
                     	 				  getUnorderedGroupHelper().select(grammarAccess.getNativeRuleAccess().getUnorderedGroup_0(), 1);
@@ -12807,14 +12807,14 @@ else if ( LA34_0 >=11 && LA34_0<=13 && getUnorderedGroupHelper().canSelect(gramm
 
                     	 				  selected = true;
                     	 				
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4869:6: ( ( rule__NativeRule__CheckKindAssignment_0_1 ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4871:7: ( rule__NativeRule__CheckKindAssignment_0_1 )
+                    // InternalValid.g:4869:6: ( ( rule__NativeRule__CheckKindAssignment_0_1 ) )
+                    // InternalValid.g:4871:7: ( rule__NativeRule__CheckKindAssignment_0_1 )
                     {
                      before(grammarAccess.getNativeRuleAccess().getCheckKindAssignment_0_1()); 
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4872:7: ( rule__NativeRule__CheckKindAssignment_0_1 )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4872:8: rule__NativeRule__CheckKindAssignment_0_1
+                    // InternalValid.g:4872:7: ( rule__NativeRule__CheckKindAssignment_0_1 )
+                    // InternalValid.g:4872:8: rule__NativeRule__CheckKindAssignment_0_1
                     {
-                    pushFollow(FOLLOW_rule__NativeRule__CheckKindAssignment_0_1_in_rule__NativeRule__UnorderedGroup_0__Impl9752);
+                    pushFollow(FOLLOW_2);
                     rule__NativeRule__CheckKindAssignment_0_1();
 
                     state._fsp--;
@@ -12859,35 +12859,35 @@ else if ( LA34_0 >=11 && LA34_0<=13 && getUnorderedGroupHelper().canSelect(gramm
 
 
     // $ANTLR start "rule__NativeRule__UnorderedGroup_0__0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4887:1: rule__NativeRule__UnorderedGroup_0__0 : rule__NativeRule__UnorderedGroup_0__Impl ( rule__NativeRule__UnorderedGroup_0__1 )? ;
+    // InternalValid.g:4887:1: rule__NativeRule__UnorderedGroup_0__0 : rule__NativeRule__UnorderedGroup_0__Impl ( rule__NativeRule__UnorderedGroup_0__1 )? ;
     public final void rule__NativeRule__UnorderedGroup_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4891:1: ( rule__NativeRule__UnorderedGroup_0__Impl ( rule__NativeRule__UnorderedGroup_0__1 )? )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4892:2: rule__NativeRule__UnorderedGroup_0__Impl ( rule__NativeRule__UnorderedGroup_0__1 )?
+            // InternalValid.g:4891:1: ( rule__NativeRule__UnorderedGroup_0__Impl ( rule__NativeRule__UnorderedGroup_0__1 )? )
+            // InternalValid.g:4892:2: rule__NativeRule__UnorderedGroup_0__Impl ( rule__NativeRule__UnorderedGroup_0__1 )?
             {
-            pushFollow(FOLLOW_rule__NativeRule__UnorderedGroup_0__Impl_in_rule__NativeRule__UnorderedGroup_0__09811);
+            pushFollow(FOLLOW_11);
             rule__NativeRule__UnorderedGroup_0__Impl();
 
             state._fsp--;
 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4893:2: ( rule__NativeRule__UnorderedGroup_0__1 )?
+            // InternalValid.g:4893:2: ( rule__NativeRule__UnorderedGroup_0__1 )?
             int alt35=2;
             int LA35_0 = input.LA(1);
 
-            if ( LA35_0 ==36 && getUnorderedGroupHelper().canSelect(grammarAccess.getNativeRuleAccess().getUnorderedGroup_0(), 0) ) {
+            if ( LA35_0 == 36 && getUnorderedGroupHelper().canSelect(grammarAccess.getNativeRuleAccess().getUnorderedGroup_0(), 0) ) {
                 alt35=1;
             }
-            else if ( LA35_0 >=11 && LA35_0<=13 && getUnorderedGroupHelper().canSelect(grammarAccess.getNativeRuleAccess().getUnorderedGroup_0(), 1) ) {
+            else if ( LA35_0 >= 11 && LA35_0 <= 13 && getUnorderedGroupHelper().canSelect(grammarAccess.getNativeRuleAccess().getUnorderedGroup_0(), 1) ) {
                 alt35=1;
             }
             switch (alt35) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4893:2: rule__NativeRule__UnorderedGroup_0__1
+                    // InternalValid.g:4893:2: rule__NativeRule__UnorderedGroup_0__1
                     {
-                    pushFollow(FOLLOW_rule__NativeRule__UnorderedGroup_0__1_in_rule__NativeRule__UnorderedGroup_0__09814);
+                    pushFollow(FOLLOW_2);
                     rule__NativeRule__UnorderedGroup_0__1();
 
                     state._fsp--;
@@ -12917,16 +12917,16 @@ else if ( LA35_0 >=11 && LA35_0<=13 && getUnorderedGroupHelper().canSelect(gramm
 
 
     // $ANTLR start "rule__NativeRule__UnorderedGroup_0__1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4900:1: rule__NativeRule__UnorderedGroup_0__1 : rule__NativeRule__UnorderedGroup_0__Impl ;
+    // InternalValid.g:4900:1: rule__NativeRule__UnorderedGroup_0__1 : rule__NativeRule__UnorderedGroup_0__Impl ;
     public final void rule__NativeRule__UnorderedGroup_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4904:1: ( rule__NativeRule__UnorderedGroup_0__Impl )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4905:2: rule__NativeRule__UnorderedGroup_0__Impl
+            // InternalValid.g:4904:1: ( rule__NativeRule__UnorderedGroup_0__Impl )
+            // InternalValid.g:4905:2: rule__NativeRule__UnorderedGroup_0__Impl
             {
-            pushFollow(FOLLOW_rule__NativeRule__UnorderedGroup_0__Impl_in_rule__NativeRule__UnorderedGroup_0__19839);
+            pushFollow(FOLLOW_2);
             rule__NativeRule__UnorderedGroup_0__Impl();
 
             state._fsp--;
@@ -12950,31 +12950,31 @@ public final void rule__NativeRule__UnorderedGroup_0__1() throws RecognitionExce
 
 
     // $ANTLR start "rule__SizeRule__UnorderedGroup_0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4916:1: rule__SizeRule__UnorderedGroup_0 : ( rule__SizeRule__UnorderedGroup_0__0 )? ;
+    // InternalValid.g:4916:1: rule__SizeRule__UnorderedGroup_0 : ( rule__SizeRule__UnorderedGroup_0__0 )? ;
     public final void rule__SizeRule__UnorderedGroup_0() throws RecognitionException {
 
             	int stackSize = keepStackSize();
         		getUnorderedGroupHelper().enter(grammarAccess.getSizeRuleAccess().getUnorderedGroup_0());
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4921:1: ( ( rule__SizeRule__UnorderedGroup_0__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4922:2: ( rule__SizeRule__UnorderedGroup_0__0 )?
+            // InternalValid.g:4921:1: ( ( rule__SizeRule__UnorderedGroup_0__0 )? )
+            // InternalValid.g:4922:2: ( rule__SizeRule__UnorderedGroup_0__0 )?
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4922:2: ( rule__SizeRule__UnorderedGroup_0__0 )?
+            // InternalValid.g:4922:2: ( rule__SizeRule__UnorderedGroup_0__0 )?
             int alt36=2;
             int LA36_0 = input.LA(1);
 
-            if ( LA36_0 ==36 && getUnorderedGroupHelper().canSelect(grammarAccess.getSizeRuleAccess().getUnorderedGroup_0(), 0) ) {
+            if ( LA36_0 == 36 && getUnorderedGroupHelper().canSelect(grammarAccess.getSizeRuleAccess().getUnorderedGroup_0(), 0) ) {
                 alt36=1;
             }
-            else if ( LA36_0 >=11 && LA36_0<=13 && getUnorderedGroupHelper().canSelect(grammarAccess.getSizeRuleAccess().getUnorderedGroup_0(), 1) ) {
+            else if ( LA36_0 >= 11 && LA36_0 <= 13 && getUnorderedGroupHelper().canSelect(grammarAccess.getSizeRuleAccess().getUnorderedGroup_0(), 1) ) {
                 alt36=1;
             }
             switch (alt36) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4922:2: rule__SizeRule__UnorderedGroup_0__0
+                    // InternalValid.g:4922:2: rule__SizeRule__UnorderedGroup_0__0
                     {
-                    pushFollow(FOLLOW_rule__SizeRule__UnorderedGroup_0__0_in_rule__SizeRule__UnorderedGroup_09867);
+                    pushFollow(FOLLOW_2);
                     rule__SizeRule__UnorderedGroup_0__0();
 
                     state._fsp--;
@@ -13005,24 +13005,24 @@ else if ( LA36_0 >=11 && LA36_0<=13 && getUnorderedGroupHelper().canSelect(gramm
 
 
     // $ANTLR start "rule__SizeRule__UnorderedGroup_0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4932:1: rule__SizeRule__UnorderedGroup_0__Impl : ( ({...}? => ( ( ( rule__SizeRule__OptionalAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__SizeRule__CheckKindAssignment_0_1 ) ) ) ) ) ;
+    // InternalValid.g:4932:1: rule__SizeRule__UnorderedGroup_0__Impl : ( ({...}? => ( ( ( rule__SizeRule__OptionalAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__SizeRule__CheckKindAssignment_0_1 ) ) ) ) ) ;
     public final void rule__SizeRule__UnorderedGroup_0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         		boolean selected = false;
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4937:1: ( ( ({...}? => ( ( ( rule__SizeRule__OptionalAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__SizeRule__CheckKindAssignment_0_1 ) ) ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4938:3: ( ({...}? => ( ( ( rule__SizeRule__OptionalAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__SizeRule__CheckKindAssignment_0_1 ) ) ) ) )
+            // InternalValid.g:4937:1: ( ( ({...}? => ( ( ( rule__SizeRule__OptionalAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__SizeRule__CheckKindAssignment_0_1 ) ) ) ) ) )
+            // InternalValid.g:4938:3: ( ({...}? => ( ( ( rule__SizeRule__OptionalAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__SizeRule__CheckKindAssignment_0_1 ) ) ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4938:3: ( ({...}? => ( ( ( rule__SizeRule__OptionalAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__SizeRule__CheckKindAssignment_0_1 ) ) ) ) )
+            // InternalValid.g:4938:3: ( ({...}? => ( ( ( rule__SizeRule__OptionalAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__SizeRule__CheckKindAssignment_0_1 ) ) ) ) )
             int alt37=2;
             int LA37_0 = input.LA(1);
 
-            if ( LA37_0 ==36 && getUnorderedGroupHelper().canSelect(grammarAccess.getSizeRuleAccess().getUnorderedGroup_0(), 0) ) {
+            if ( LA37_0 == 36 && getUnorderedGroupHelper().canSelect(grammarAccess.getSizeRuleAccess().getUnorderedGroup_0(), 0) ) {
                 alt37=1;
             }
-            else if ( LA37_0 >=11 && LA37_0<=13 && getUnorderedGroupHelper().canSelect(grammarAccess.getSizeRuleAccess().getUnorderedGroup_0(), 1) ) {
+            else if ( LA37_0 >= 11 && LA37_0 <= 13 && getUnorderedGroupHelper().canSelect(grammarAccess.getSizeRuleAccess().getUnorderedGroup_0(), 1) ) {
                 alt37=2;
             }
             else {
@@ -13033,16 +13033,16 @@ else if ( LA37_0 >=11 && LA37_0<=13 && getUnorderedGroupHelper().canSelect(gramm
             }
             switch (alt37) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4940:4: ({...}? => ( ( ( rule__SizeRule__OptionalAssignment_0_0 ) ) ) )
+                    // InternalValid.g:4940:4: ({...}? => ( ( ( rule__SizeRule__OptionalAssignment_0_0 ) ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4940:4: ({...}? => ( ( ( rule__SizeRule__OptionalAssignment_0_0 ) ) ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4941:5: {...}? => ( ( ( rule__SizeRule__OptionalAssignment_0_0 ) ) )
+                    // InternalValid.g:4940:4: ({...}? => ( ( ( rule__SizeRule__OptionalAssignment_0_0 ) ) ) )
+                    // InternalValid.g:4941:5: {...}? => ( ( ( rule__SizeRule__OptionalAssignment_0_0 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getSizeRuleAccess().getUnorderedGroup_0(), 0) ) {
                         throw new FailedPredicateException(input, "rule__SizeRule__UnorderedGroup_0__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getSizeRuleAccess().getUnorderedGroup_0(), 0)");
                     }
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4941:105: ( ( ( rule__SizeRule__OptionalAssignment_0_0 ) ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4942:6: ( ( rule__SizeRule__OptionalAssignment_0_0 ) )
+                    // InternalValid.g:4941:105: ( ( ( rule__SizeRule__OptionalAssignment_0_0 ) ) )
+                    // InternalValid.g:4942:6: ( ( rule__SizeRule__OptionalAssignment_0_0 ) )
                     {
                      
                     	 				  getUnorderedGroupHelper().select(grammarAccess.getSizeRuleAccess().getUnorderedGroup_0(), 0);
@@ -13050,14 +13050,14 @@ else if ( LA37_0 >=11 && LA37_0<=13 && getUnorderedGroupHelper().canSelect(gramm
 
                     	 				  selected = true;
                     	 				
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4948:6: ( ( rule__SizeRule__OptionalAssignment_0_0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4950:7: ( rule__SizeRule__OptionalAssignment_0_0 )
+                    // InternalValid.g:4948:6: ( ( rule__SizeRule__OptionalAssignment_0_0 ) )
+                    // InternalValid.g:4950:7: ( rule__SizeRule__OptionalAssignment_0_0 )
                     {
                      before(grammarAccess.getSizeRuleAccess().getOptionalAssignment_0_0()); 
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4951:7: ( rule__SizeRule__OptionalAssignment_0_0 )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4951:8: rule__SizeRule__OptionalAssignment_0_0
+                    // InternalValid.g:4951:7: ( rule__SizeRule__OptionalAssignment_0_0 )
+                    // InternalValid.g:4951:8: rule__SizeRule__OptionalAssignment_0_0
                     {
-                    pushFollow(FOLLOW_rule__SizeRule__OptionalAssignment_0_0_in_rule__SizeRule__UnorderedGroup_0__Impl9954);
+                    pushFollow(FOLLOW_2);
                     rule__SizeRule__OptionalAssignment_0_0();
 
                     state._fsp--;
@@ -13079,16 +13079,16 @@ else if ( LA37_0 >=11 && LA37_0<=13 && getUnorderedGroupHelper().canSelect(gramm
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4957:4: ({...}? => ( ( ( rule__SizeRule__CheckKindAssignment_0_1 ) ) ) )
+                    // InternalValid.g:4957:4: ({...}? => ( ( ( rule__SizeRule__CheckKindAssignment_0_1 ) ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4957:4: ({...}? => ( ( ( rule__SizeRule__CheckKindAssignment_0_1 ) ) ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4958:5: {...}? => ( ( ( rule__SizeRule__CheckKindAssignment_0_1 ) ) )
+                    // InternalValid.g:4957:4: ({...}? => ( ( ( rule__SizeRule__CheckKindAssignment_0_1 ) ) ) )
+                    // InternalValid.g:4958:5: {...}? => ( ( ( rule__SizeRule__CheckKindAssignment_0_1 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getSizeRuleAccess().getUnorderedGroup_0(), 1) ) {
                         throw new FailedPredicateException(input, "rule__SizeRule__UnorderedGroup_0__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getSizeRuleAccess().getUnorderedGroup_0(), 1)");
                     }
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4958:105: ( ( ( rule__SizeRule__CheckKindAssignment_0_1 ) ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4959:6: ( ( rule__SizeRule__CheckKindAssignment_0_1 ) )
+                    // InternalValid.g:4958:105: ( ( ( rule__SizeRule__CheckKindAssignment_0_1 ) ) )
+                    // InternalValid.g:4959:6: ( ( rule__SizeRule__CheckKindAssignment_0_1 ) )
                     {
                      
                     	 				  getUnorderedGroupHelper().select(grammarAccess.getSizeRuleAccess().getUnorderedGroup_0(), 1);
@@ -13096,14 +13096,14 @@ else if ( LA37_0 >=11 && LA37_0<=13 && getUnorderedGroupHelper().canSelect(gramm
 
                     	 				  selected = true;
                     	 				
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4965:6: ( ( rule__SizeRule__CheckKindAssignment_0_1 ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4967:7: ( rule__SizeRule__CheckKindAssignment_0_1 )
+                    // InternalValid.g:4965:6: ( ( rule__SizeRule__CheckKindAssignment_0_1 ) )
+                    // InternalValid.g:4967:7: ( rule__SizeRule__CheckKindAssignment_0_1 )
                     {
                      before(grammarAccess.getSizeRuleAccess().getCheckKindAssignment_0_1()); 
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4968:7: ( rule__SizeRule__CheckKindAssignment_0_1 )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4968:8: rule__SizeRule__CheckKindAssignment_0_1
+                    // InternalValid.g:4968:7: ( rule__SizeRule__CheckKindAssignment_0_1 )
+                    // InternalValid.g:4968:8: rule__SizeRule__CheckKindAssignment_0_1
                     {
-                    pushFollow(FOLLOW_rule__SizeRule__CheckKindAssignment_0_1_in_rule__SizeRule__UnorderedGroup_0__Impl10045);
+                    pushFollow(FOLLOW_2);
                     rule__SizeRule__CheckKindAssignment_0_1();
 
                     state._fsp--;
@@ -13148,35 +13148,35 @@ else if ( LA37_0 >=11 && LA37_0<=13 && getUnorderedGroupHelper().canSelect(gramm
 
 
     // $ANTLR start "rule__SizeRule__UnorderedGroup_0__0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4983:1: rule__SizeRule__UnorderedGroup_0__0 : rule__SizeRule__UnorderedGroup_0__Impl ( rule__SizeRule__UnorderedGroup_0__1 )? ;
+    // InternalValid.g:4983:1: rule__SizeRule__UnorderedGroup_0__0 : rule__SizeRule__UnorderedGroup_0__Impl ( rule__SizeRule__UnorderedGroup_0__1 )? ;
     public final void rule__SizeRule__UnorderedGroup_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4987:1: ( rule__SizeRule__UnorderedGroup_0__Impl ( rule__SizeRule__UnorderedGroup_0__1 )? )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4988:2: rule__SizeRule__UnorderedGroup_0__Impl ( rule__SizeRule__UnorderedGroup_0__1 )?
+            // InternalValid.g:4987:1: ( rule__SizeRule__UnorderedGroup_0__Impl ( rule__SizeRule__UnorderedGroup_0__1 )? )
+            // InternalValid.g:4988:2: rule__SizeRule__UnorderedGroup_0__Impl ( rule__SizeRule__UnorderedGroup_0__1 )?
             {
-            pushFollow(FOLLOW_rule__SizeRule__UnorderedGroup_0__Impl_in_rule__SizeRule__UnorderedGroup_0__010104);
+            pushFollow(FOLLOW_11);
             rule__SizeRule__UnorderedGroup_0__Impl();
 
             state._fsp--;
 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4989:2: ( rule__SizeRule__UnorderedGroup_0__1 )?
+            // InternalValid.g:4989:2: ( rule__SizeRule__UnorderedGroup_0__1 )?
             int alt38=2;
             int LA38_0 = input.LA(1);
 
-            if ( LA38_0 ==36 && getUnorderedGroupHelper().canSelect(grammarAccess.getSizeRuleAccess().getUnorderedGroup_0(), 0) ) {
+            if ( LA38_0 == 36 && getUnorderedGroupHelper().canSelect(grammarAccess.getSizeRuleAccess().getUnorderedGroup_0(), 0) ) {
                 alt38=1;
             }
-            else if ( LA38_0 >=11 && LA38_0<=13 && getUnorderedGroupHelper().canSelect(grammarAccess.getSizeRuleAccess().getUnorderedGroup_0(), 1) ) {
+            else if ( LA38_0 >= 11 && LA38_0 <= 13 && getUnorderedGroupHelper().canSelect(grammarAccess.getSizeRuleAccess().getUnorderedGroup_0(), 1) ) {
                 alt38=1;
             }
             switch (alt38) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4989:2: rule__SizeRule__UnorderedGroup_0__1
+                    // InternalValid.g:4989:2: rule__SizeRule__UnorderedGroup_0__1
                     {
-                    pushFollow(FOLLOW_rule__SizeRule__UnorderedGroup_0__1_in_rule__SizeRule__UnorderedGroup_0__010107);
+                    pushFollow(FOLLOW_2);
                     rule__SizeRule__UnorderedGroup_0__1();
 
                     state._fsp--;
@@ -13206,16 +13206,16 @@ else if ( LA38_0 >=11 && LA38_0<=13 && getUnorderedGroupHelper().canSelect(gramm
 
 
     // $ANTLR start "rule__SizeRule__UnorderedGroup_0__1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:4996:1: rule__SizeRule__UnorderedGroup_0__1 : rule__SizeRule__UnorderedGroup_0__Impl ;
+    // InternalValid.g:4996:1: rule__SizeRule__UnorderedGroup_0__1 : rule__SizeRule__UnorderedGroup_0__Impl ;
     public final void rule__SizeRule__UnorderedGroup_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5000:1: ( rule__SizeRule__UnorderedGroup_0__Impl )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5001:2: rule__SizeRule__UnorderedGroup_0__Impl
+            // InternalValid.g:5000:1: ( rule__SizeRule__UnorderedGroup_0__Impl )
+            // InternalValid.g:5001:2: rule__SizeRule__UnorderedGroup_0__Impl
             {
-            pushFollow(FOLLOW_rule__SizeRule__UnorderedGroup_0__Impl_in_rule__SizeRule__UnorderedGroup_0__110132);
+            pushFollow(FOLLOW_2);
             rule__SizeRule__UnorderedGroup_0__Impl();
 
             state._fsp--;
@@ -13239,31 +13239,31 @@ public final void rule__SizeRule__UnorderedGroup_0__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__RangeRule__UnorderedGroup_0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5012:1: rule__RangeRule__UnorderedGroup_0 : ( rule__RangeRule__UnorderedGroup_0__0 )? ;
+    // InternalValid.g:5012:1: rule__RangeRule__UnorderedGroup_0 : ( rule__RangeRule__UnorderedGroup_0__0 )? ;
     public final void rule__RangeRule__UnorderedGroup_0() throws RecognitionException {
 
             	int stackSize = keepStackSize();
         		getUnorderedGroupHelper().enter(grammarAccess.getRangeRuleAccess().getUnorderedGroup_0());
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5017:1: ( ( rule__RangeRule__UnorderedGroup_0__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5018:2: ( rule__RangeRule__UnorderedGroup_0__0 )?
+            // InternalValid.g:5017:1: ( ( rule__RangeRule__UnorderedGroup_0__0 )? )
+            // InternalValid.g:5018:2: ( rule__RangeRule__UnorderedGroup_0__0 )?
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5018:2: ( rule__RangeRule__UnorderedGroup_0__0 )?
+            // InternalValid.g:5018:2: ( rule__RangeRule__UnorderedGroup_0__0 )?
             int alt39=2;
             int LA39_0 = input.LA(1);
 
-            if ( LA39_0 ==36 && getUnorderedGroupHelper().canSelect(grammarAccess.getRangeRuleAccess().getUnorderedGroup_0(), 0) ) {
+            if ( LA39_0 == 36 && getUnorderedGroupHelper().canSelect(grammarAccess.getRangeRuleAccess().getUnorderedGroup_0(), 0) ) {
                 alt39=1;
             }
-            else if ( LA39_0 >=11 && LA39_0<=13 && getUnorderedGroupHelper().canSelect(grammarAccess.getRangeRuleAccess().getUnorderedGroup_0(), 1) ) {
+            else if ( LA39_0 >= 11 && LA39_0 <= 13 && getUnorderedGroupHelper().canSelect(grammarAccess.getRangeRuleAccess().getUnorderedGroup_0(), 1) ) {
                 alt39=1;
             }
             switch (alt39) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5018:2: rule__RangeRule__UnorderedGroup_0__0
+                    // InternalValid.g:5018:2: rule__RangeRule__UnorderedGroup_0__0
                     {
-                    pushFollow(FOLLOW_rule__RangeRule__UnorderedGroup_0__0_in_rule__RangeRule__UnorderedGroup_010160);
+                    pushFollow(FOLLOW_2);
                     rule__RangeRule__UnorderedGroup_0__0();
 
                     state._fsp--;
@@ -13294,24 +13294,24 @@ else if ( LA39_0 >=11 && LA39_0<=13 && getUnorderedGroupHelper().canSelect(gramm
 
 
     // $ANTLR start "rule__RangeRule__UnorderedGroup_0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5028:1: rule__RangeRule__UnorderedGroup_0__Impl : ( ({...}? => ( ( ( rule__RangeRule__OptionalAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__RangeRule__CheckKindAssignment_0_1 ) ) ) ) ) ;
+    // InternalValid.g:5028:1: rule__RangeRule__UnorderedGroup_0__Impl : ( ({...}? => ( ( ( rule__RangeRule__OptionalAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__RangeRule__CheckKindAssignment_0_1 ) ) ) ) ) ;
     public final void rule__RangeRule__UnorderedGroup_0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         		boolean selected = false;
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5033:1: ( ( ({...}? => ( ( ( rule__RangeRule__OptionalAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__RangeRule__CheckKindAssignment_0_1 ) ) ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5034:3: ( ({...}? => ( ( ( rule__RangeRule__OptionalAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__RangeRule__CheckKindAssignment_0_1 ) ) ) ) )
+            // InternalValid.g:5033:1: ( ( ({...}? => ( ( ( rule__RangeRule__OptionalAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__RangeRule__CheckKindAssignment_0_1 ) ) ) ) ) )
+            // InternalValid.g:5034:3: ( ({...}? => ( ( ( rule__RangeRule__OptionalAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__RangeRule__CheckKindAssignment_0_1 ) ) ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5034:3: ( ({...}? => ( ( ( rule__RangeRule__OptionalAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__RangeRule__CheckKindAssignment_0_1 ) ) ) ) )
+            // InternalValid.g:5034:3: ( ({...}? => ( ( ( rule__RangeRule__OptionalAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__RangeRule__CheckKindAssignment_0_1 ) ) ) ) )
             int alt40=2;
             int LA40_0 = input.LA(1);
 
-            if ( LA40_0 ==36 && getUnorderedGroupHelper().canSelect(grammarAccess.getRangeRuleAccess().getUnorderedGroup_0(), 0) ) {
+            if ( LA40_0 == 36 && getUnorderedGroupHelper().canSelect(grammarAccess.getRangeRuleAccess().getUnorderedGroup_0(), 0) ) {
                 alt40=1;
             }
-            else if ( LA40_0 >=11 && LA40_0<=13 && getUnorderedGroupHelper().canSelect(grammarAccess.getRangeRuleAccess().getUnorderedGroup_0(), 1) ) {
+            else if ( LA40_0 >= 11 && LA40_0 <= 13 && getUnorderedGroupHelper().canSelect(grammarAccess.getRangeRuleAccess().getUnorderedGroup_0(), 1) ) {
                 alt40=2;
             }
             else {
@@ -13322,16 +13322,16 @@ else if ( LA40_0 >=11 && LA40_0<=13 && getUnorderedGroupHelper().canSelect(gramm
             }
             switch (alt40) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5036:4: ({...}? => ( ( ( rule__RangeRule__OptionalAssignment_0_0 ) ) ) )
+                    // InternalValid.g:5036:4: ({...}? => ( ( ( rule__RangeRule__OptionalAssignment_0_0 ) ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5036:4: ({...}? => ( ( ( rule__RangeRule__OptionalAssignment_0_0 ) ) ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5037:5: {...}? => ( ( ( rule__RangeRule__OptionalAssignment_0_0 ) ) )
+                    // InternalValid.g:5036:4: ({...}? => ( ( ( rule__RangeRule__OptionalAssignment_0_0 ) ) ) )
+                    // InternalValid.g:5037:5: {...}? => ( ( ( rule__RangeRule__OptionalAssignment_0_0 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getRangeRuleAccess().getUnorderedGroup_0(), 0) ) {
                         throw new FailedPredicateException(input, "rule__RangeRule__UnorderedGroup_0__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getRangeRuleAccess().getUnorderedGroup_0(), 0)");
                     }
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5037:106: ( ( ( rule__RangeRule__OptionalAssignment_0_0 ) ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5038:6: ( ( rule__RangeRule__OptionalAssignment_0_0 ) )
+                    // InternalValid.g:5037:106: ( ( ( rule__RangeRule__OptionalAssignment_0_0 ) ) )
+                    // InternalValid.g:5038:6: ( ( rule__RangeRule__OptionalAssignment_0_0 ) )
                     {
                      
                     	 				  getUnorderedGroupHelper().select(grammarAccess.getRangeRuleAccess().getUnorderedGroup_0(), 0);
@@ -13339,14 +13339,14 @@ else if ( LA40_0 >=11 && LA40_0<=13 && getUnorderedGroupHelper().canSelect(gramm
 
                     	 				  selected = true;
                     	 				
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5044:6: ( ( rule__RangeRule__OptionalAssignment_0_0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5046:7: ( rule__RangeRule__OptionalAssignment_0_0 )
+                    // InternalValid.g:5044:6: ( ( rule__RangeRule__OptionalAssignment_0_0 ) )
+                    // InternalValid.g:5046:7: ( rule__RangeRule__OptionalAssignment_0_0 )
                     {
                      before(grammarAccess.getRangeRuleAccess().getOptionalAssignment_0_0()); 
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5047:7: ( rule__RangeRule__OptionalAssignment_0_0 )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5047:8: rule__RangeRule__OptionalAssignment_0_0
+                    // InternalValid.g:5047:7: ( rule__RangeRule__OptionalAssignment_0_0 )
+                    // InternalValid.g:5047:8: rule__RangeRule__OptionalAssignment_0_0
                     {
-                    pushFollow(FOLLOW_rule__RangeRule__OptionalAssignment_0_0_in_rule__RangeRule__UnorderedGroup_0__Impl10247);
+                    pushFollow(FOLLOW_2);
                     rule__RangeRule__OptionalAssignment_0_0();
 
                     state._fsp--;
@@ -13368,16 +13368,16 @@ else if ( LA40_0 >=11 && LA40_0<=13 && getUnorderedGroupHelper().canSelect(gramm
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5053:4: ({...}? => ( ( ( rule__RangeRule__CheckKindAssignment_0_1 ) ) ) )
+                    // InternalValid.g:5053:4: ({...}? => ( ( ( rule__RangeRule__CheckKindAssignment_0_1 ) ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5053:4: ({...}? => ( ( ( rule__RangeRule__CheckKindAssignment_0_1 ) ) ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5054:5: {...}? => ( ( ( rule__RangeRule__CheckKindAssignment_0_1 ) ) )
+                    // InternalValid.g:5053:4: ({...}? => ( ( ( rule__RangeRule__CheckKindAssignment_0_1 ) ) ) )
+                    // InternalValid.g:5054:5: {...}? => ( ( ( rule__RangeRule__CheckKindAssignment_0_1 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getRangeRuleAccess().getUnorderedGroup_0(), 1) ) {
                         throw new FailedPredicateException(input, "rule__RangeRule__UnorderedGroup_0__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getRangeRuleAccess().getUnorderedGroup_0(), 1)");
                     }
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5054:106: ( ( ( rule__RangeRule__CheckKindAssignment_0_1 ) ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5055:6: ( ( rule__RangeRule__CheckKindAssignment_0_1 ) )
+                    // InternalValid.g:5054:106: ( ( ( rule__RangeRule__CheckKindAssignment_0_1 ) ) )
+                    // InternalValid.g:5055:6: ( ( rule__RangeRule__CheckKindAssignment_0_1 ) )
                     {
                      
                     	 				  getUnorderedGroupHelper().select(grammarAccess.getRangeRuleAccess().getUnorderedGroup_0(), 1);
@@ -13385,14 +13385,14 @@ else if ( LA40_0 >=11 && LA40_0<=13 && getUnorderedGroupHelper().canSelect(gramm
 
                     	 				  selected = true;
                     	 				
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5061:6: ( ( rule__RangeRule__CheckKindAssignment_0_1 ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5063:7: ( rule__RangeRule__CheckKindAssignment_0_1 )
+                    // InternalValid.g:5061:6: ( ( rule__RangeRule__CheckKindAssignment_0_1 ) )
+                    // InternalValid.g:5063:7: ( rule__RangeRule__CheckKindAssignment_0_1 )
                     {
                      before(grammarAccess.getRangeRuleAccess().getCheckKindAssignment_0_1()); 
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5064:7: ( rule__RangeRule__CheckKindAssignment_0_1 )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5064:8: rule__RangeRule__CheckKindAssignment_0_1
+                    // InternalValid.g:5064:7: ( rule__RangeRule__CheckKindAssignment_0_1 )
+                    // InternalValid.g:5064:8: rule__RangeRule__CheckKindAssignment_0_1
                     {
-                    pushFollow(FOLLOW_rule__RangeRule__CheckKindAssignment_0_1_in_rule__RangeRule__UnorderedGroup_0__Impl10338);
+                    pushFollow(FOLLOW_2);
                     rule__RangeRule__CheckKindAssignment_0_1();
 
                     state._fsp--;
@@ -13437,35 +13437,35 @@ else if ( LA40_0 >=11 && LA40_0<=13 && getUnorderedGroupHelper().canSelect(gramm
 
 
     // $ANTLR start "rule__RangeRule__UnorderedGroup_0__0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5079:1: rule__RangeRule__UnorderedGroup_0__0 : rule__RangeRule__UnorderedGroup_0__Impl ( rule__RangeRule__UnorderedGroup_0__1 )? ;
+    // InternalValid.g:5079:1: rule__RangeRule__UnorderedGroup_0__0 : rule__RangeRule__UnorderedGroup_0__Impl ( rule__RangeRule__UnorderedGroup_0__1 )? ;
     public final void rule__RangeRule__UnorderedGroup_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5083:1: ( rule__RangeRule__UnorderedGroup_0__Impl ( rule__RangeRule__UnorderedGroup_0__1 )? )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5084:2: rule__RangeRule__UnorderedGroup_0__Impl ( rule__RangeRule__UnorderedGroup_0__1 )?
+            // InternalValid.g:5083:1: ( rule__RangeRule__UnorderedGroup_0__Impl ( rule__RangeRule__UnorderedGroup_0__1 )? )
+            // InternalValid.g:5084:2: rule__RangeRule__UnorderedGroup_0__Impl ( rule__RangeRule__UnorderedGroup_0__1 )?
             {
-            pushFollow(FOLLOW_rule__RangeRule__UnorderedGroup_0__Impl_in_rule__RangeRule__UnorderedGroup_0__010397);
+            pushFollow(FOLLOW_11);
             rule__RangeRule__UnorderedGroup_0__Impl();
 
             state._fsp--;
 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5085:2: ( rule__RangeRule__UnorderedGroup_0__1 )?
+            // InternalValid.g:5085:2: ( rule__RangeRule__UnorderedGroup_0__1 )?
             int alt41=2;
             int LA41_0 = input.LA(1);
 
-            if ( LA41_0 ==36 && getUnorderedGroupHelper().canSelect(grammarAccess.getRangeRuleAccess().getUnorderedGroup_0(), 0) ) {
+            if ( LA41_0 == 36 && getUnorderedGroupHelper().canSelect(grammarAccess.getRangeRuleAccess().getUnorderedGroup_0(), 0) ) {
                 alt41=1;
             }
-            else if ( LA41_0 >=11 && LA41_0<=13 && getUnorderedGroupHelper().canSelect(grammarAccess.getRangeRuleAccess().getUnorderedGroup_0(), 1) ) {
+            else if ( LA41_0 >= 11 && LA41_0 <= 13 && getUnorderedGroupHelper().canSelect(grammarAccess.getRangeRuleAccess().getUnorderedGroup_0(), 1) ) {
                 alt41=1;
             }
             switch (alt41) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5085:2: rule__RangeRule__UnorderedGroup_0__1
+                    // InternalValid.g:5085:2: rule__RangeRule__UnorderedGroup_0__1
                     {
-                    pushFollow(FOLLOW_rule__RangeRule__UnorderedGroup_0__1_in_rule__RangeRule__UnorderedGroup_0__010400);
+                    pushFollow(FOLLOW_2);
                     rule__RangeRule__UnorderedGroup_0__1();
 
                     state._fsp--;
@@ -13495,16 +13495,16 @@ else if ( LA41_0 >=11 && LA41_0<=13 && getUnorderedGroupHelper().canSelect(gramm
 
 
     // $ANTLR start "rule__RangeRule__UnorderedGroup_0__1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5092:1: rule__RangeRule__UnorderedGroup_0__1 : rule__RangeRule__UnorderedGroup_0__Impl ;
+    // InternalValid.g:5092:1: rule__RangeRule__UnorderedGroup_0__1 : rule__RangeRule__UnorderedGroup_0__Impl ;
     public final void rule__RangeRule__UnorderedGroup_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5096:1: ( rule__RangeRule__UnorderedGroup_0__Impl )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5097:2: rule__RangeRule__UnorderedGroup_0__Impl
+            // InternalValid.g:5096:1: ( rule__RangeRule__UnorderedGroup_0__Impl )
+            // InternalValid.g:5097:2: rule__RangeRule__UnorderedGroup_0__Impl
             {
-            pushFollow(FOLLOW_rule__RangeRule__UnorderedGroup_0__Impl_in_rule__RangeRule__UnorderedGroup_0__110425);
+            pushFollow(FOLLOW_2);
             rule__RangeRule__UnorderedGroup_0__Impl();
 
             state._fsp--;
@@ -13528,31 +13528,31 @@ public final void rule__RangeRule__UnorderedGroup_0__1() throws RecognitionExcep
 
 
     // $ANTLR start "rule__UniqueRule__UnorderedGroup_0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5108:1: rule__UniqueRule__UnorderedGroup_0 : ( rule__UniqueRule__UnorderedGroup_0__0 )? ;
+    // InternalValid.g:5108:1: rule__UniqueRule__UnorderedGroup_0 : ( rule__UniqueRule__UnorderedGroup_0__0 )? ;
     public final void rule__UniqueRule__UnorderedGroup_0() throws RecognitionException {
 
             	int stackSize = keepStackSize();
         		getUnorderedGroupHelper().enter(grammarAccess.getUniqueRuleAccess().getUnorderedGroup_0());
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5113:1: ( ( rule__UniqueRule__UnorderedGroup_0__0 )? )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5114:2: ( rule__UniqueRule__UnorderedGroup_0__0 )?
+            // InternalValid.g:5113:1: ( ( rule__UniqueRule__UnorderedGroup_0__0 )? )
+            // InternalValid.g:5114:2: ( rule__UniqueRule__UnorderedGroup_0__0 )?
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5114:2: ( rule__UniqueRule__UnorderedGroup_0__0 )?
+            // InternalValid.g:5114:2: ( rule__UniqueRule__UnorderedGroup_0__0 )?
             int alt42=2;
             int LA42_0 = input.LA(1);
 
-            if ( LA42_0 ==36 && getUnorderedGroupHelper().canSelect(grammarAccess.getUniqueRuleAccess().getUnorderedGroup_0(), 0) ) {
+            if ( LA42_0 == 36 && getUnorderedGroupHelper().canSelect(grammarAccess.getUniqueRuleAccess().getUnorderedGroup_0(), 0) ) {
                 alt42=1;
             }
-            else if ( LA42_0 >=11 && LA42_0<=13 && getUnorderedGroupHelper().canSelect(grammarAccess.getUniqueRuleAccess().getUnorderedGroup_0(), 1) ) {
+            else if ( LA42_0 >= 11 && LA42_0 <= 13 && getUnorderedGroupHelper().canSelect(grammarAccess.getUniqueRuleAccess().getUnorderedGroup_0(), 1) ) {
                 alt42=1;
             }
             switch (alt42) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5114:2: rule__UniqueRule__UnorderedGroup_0__0
+                    // InternalValid.g:5114:2: rule__UniqueRule__UnorderedGroup_0__0
                     {
-                    pushFollow(FOLLOW_rule__UniqueRule__UnorderedGroup_0__0_in_rule__UniqueRule__UnorderedGroup_010453);
+                    pushFollow(FOLLOW_2);
                     rule__UniqueRule__UnorderedGroup_0__0();
 
                     state._fsp--;
@@ -13583,24 +13583,24 @@ else if ( LA42_0 >=11 && LA42_0<=13 && getUnorderedGroupHelper().canSelect(gramm
 
 
     // $ANTLR start "rule__UniqueRule__UnorderedGroup_0__Impl"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5124:1: rule__UniqueRule__UnorderedGroup_0__Impl : ( ({...}? => ( ( ( rule__UniqueRule__OptionalAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__UniqueRule__CheckKindAssignment_0_1 ) ) ) ) ) ;
+    // InternalValid.g:5124:1: rule__UniqueRule__UnorderedGroup_0__Impl : ( ({...}? => ( ( ( rule__UniqueRule__OptionalAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__UniqueRule__CheckKindAssignment_0_1 ) ) ) ) ) ;
     public final void rule__UniqueRule__UnorderedGroup_0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
         		boolean selected = false;
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5129:1: ( ( ({...}? => ( ( ( rule__UniqueRule__OptionalAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__UniqueRule__CheckKindAssignment_0_1 ) ) ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5130:3: ( ({...}? => ( ( ( rule__UniqueRule__OptionalAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__UniqueRule__CheckKindAssignment_0_1 ) ) ) ) )
+            // InternalValid.g:5129:1: ( ( ({...}? => ( ( ( rule__UniqueRule__OptionalAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__UniqueRule__CheckKindAssignment_0_1 ) ) ) ) ) )
+            // InternalValid.g:5130:3: ( ({...}? => ( ( ( rule__UniqueRule__OptionalAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__UniqueRule__CheckKindAssignment_0_1 ) ) ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5130:3: ( ({...}? => ( ( ( rule__UniqueRule__OptionalAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__UniqueRule__CheckKindAssignment_0_1 ) ) ) ) )
+            // InternalValid.g:5130:3: ( ({...}? => ( ( ( rule__UniqueRule__OptionalAssignment_0_0 ) ) ) ) | ({...}? => ( ( ( rule__UniqueRule__CheckKindAssignment_0_1 ) ) ) ) )
             int alt43=2;
             int LA43_0 = input.LA(1);
 
-            if ( LA43_0 ==36 && getUnorderedGroupHelper().canSelect(grammarAccess.getUniqueRuleAccess().getUnorderedGroup_0(), 0) ) {
+            if ( LA43_0 == 36 && getUnorderedGroupHelper().canSelect(grammarAccess.getUniqueRuleAccess().getUnorderedGroup_0(), 0) ) {
                 alt43=1;
             }
-            else if ( LA43_0 >=11 && LA43_0<=13 && getUnorderedGroupHelper().canSelect(grammarAccess.getUniqueRuleAccess().getUnorderedGroup_0(), 1) ) {
+            else if ( LA43_0 >= 11 && LA43_0 <= 13 && getUnorderedGroupHelper().canSelect(grammarAccess.getUniqueRuleAccess().getUnorderedGroup_0(), 1) ) {
                 alt43=2;
             }
             else {
@@ -13611,16 +13611,16 @@ else if ( LA43_0 >=11 && LA43_0<=13 && getUnorderedGroupHelper().canSelect(gramm
             }
             switch (alt43) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5132:4: ({...}? => ( ( ( rule__UniqueRule__OptionalAssignment_0_0 ) ) ) )
+                    // InternalValid.g:5132:4: ({...}? => ( ( ( rule__UniqueRule__OptionalAssignment_0_0 ) ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5132:4: ({...}? => ( ( ( rule__UniqueRule__OptionalAssignment_0_0 ) ) ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5133:5: {...}? => ( ( ( rule__UniqueRule__OptionalAssignment_0_0 ) ) )
+                    // InternalValid.g:5132:4: ({...}? => ( ( ( rule__UniqueRule__OptionalAssignment_0_0 ) ) ) )
+                    // InternalValid.g:5133:5: {...}? => ( ( ( rule__UniqueRule__OptionalAssignment_0_0 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getUniqueRuleAccess().getUnorderedGroup_0(), 0) ) {
                         throw new FailedPredicateException(input, "rule__UniqueRule__UnorderedGroup_0__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getUniqueRuleAccess().getUnorderedGroup_0(), 0)");
                     }
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5133:107: ( ( ( rule__UniqueRule__OptionalAssignment_0_0 ) ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5134:6: ( ( rule__UniqueRule__OptionalAssignment_0_0 ) )
+                    // InternalValid.g:5133:107: ( ( ( rule__UniqueRule__OptionalAssignment_0_0 ) ) )
+                    // InternalValid.g:5134:6: ( ( rule__UniqueRule__OptionalAssignment_0_0 ) )
                     {
                      
                     	 				  getUnorderedGroupHelper().select(grammarAccess.getUniqueRuleAccess().getUnorderedGroup_0(), 0);
@@ -13628,14 +13628,14 @@ else if ( LA43_0 >=11 && LA43_0<=13 && getUnorderedGroupHelper().canSelect(gramm
 
                     	 				  selected = true;
                     	 				
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5140:6: ( ( rule__UniqueRule__OptionalAssignment_0_0 ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5142:7: ( rule__UniqueRule__OptionalAssignment_0_0 )
+                    // InternalValid.g:5140:6: ( ( rule__UniqueRule__OptionalAssignment_0_0 ) )
+                    // InternalValid.g:5142:7: ( rule__UniqueRule__OptionalAssignment_0_0 )
                     {
                      before(grammarAccess.getUniqueRuleAccess().getOptionalAssignment_0_0()); 
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5143:7: ( rule__UniqueRule__OptionalAssignment_0_0 )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5143:8: rule__UniqueRule__OptionalAssignment_0_0
+                    // InternalValid.g:5143:7: ( rule__UniqueRule__OptionalAssignment_0_0 )
+                    // InternalValid.g:5143:8: rule__UniqueRule__OptionalAssignment_0_0
                     {
-                    pushFollow(FOLLOW_rule__UniqueRule__OptionalAssignment_0_0_in_rule__UniqueRule__UnorderedGroup_0__Impl10540);
+                    pushFollow(FOLLOW_2);
                     rule__UniqueRule__OptionalAssignment_0_0();
 
                     state._fsp--;
@@ -13657,16 +13657,16 @@ else if ( LA43_0 >=11 && LA43_0<=13 && getUnorderedGroupHelper().canSelect(gramm
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5149:4: ({...}? => ( ( ( rule__UniqueRule__CheckKindAssignment_0_1 ) ) ) )
+                    // InternalValid.g:5149:4: ({...}? => ( ( ( rule__UniqueRule__CheckKindAssignment_0_1 ) ) ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5149:4: ({...}? => ( ( ( rule__UniqueRule__CheckKindAssignment_0_1 ) ) ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5150:5: {...}? => ( ( ( rule__UniqueRule__CheckKindAssignment_0_1 ) ) )
+                    // InternalValid.g:5149:4: ({...}? => ( ( ( rule__UniqueRule__CheckKindAssignment_0_1 ) ) ) )
+                    // InternalValid.g:5150:5: {...}? => ( ( ( rule__UniqueRule__CheckKindAssignment_0_1 ) ) )
                     {
                     if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getUniqueRuleAccess().getUnorderedGroup_0(), 1) ) {
                         throw new FailedPredicateException(input, "rule__UniqueRule__UnorderedGroup_0__Impl", "getUnorderedGroupHelper().canSelect(grammarAccess.getUniqueRuleAccess().getUnorderedGroup_0(), 1)");
                     }
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5150:107: ( ( ( rule__UniqueRule__CheckKindAssignment_0_1 ) ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5151:6: ( ( rule__UniqueRule__CheckKindAssignment_0_1 ) )
+                    // InternalValid.g:5150:107: ( ( ( rule__UniqueRule__CheckKindAssignment_0_1 ) ) )
+                    // InternalValid.g:5151:6: ( ( rule__UniqueRule__CheckKindAssignment_0_1 ) )
                     {
                      
                     	 				  getUnorderedGroupHelper().select(grammarAccess.getUniqueRuleAccess().getUnorderedGroup_0(), 1);
@@ -13674,14 +13674,14 @@ else if ( LA43_0 >=11 && LA43_0<=13 && getUnorderedGroupHelper().canSelect(gramm
 
                     	 				  selected = true;
                     	 				
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5157:6: ( ( rule__UniqueRule__CheckKindAssignment_0_1 ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5159:7: ( rule__UniqueRule__CheckKindAssignment_0_1 )
+                    // InternalValid.g:5157:6: ( ( rule__UniqueRule__CheckKindAssignment_0_1 ) )
+                    // InternalValid.g:5159:7: ( rule__UniqueRule__CheckKindAssignment_0_1 )
                     {
                      before(grammarAccess.getUniqueRuleAccess().getCheckKindAssignment_0_1()); 
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5160:7: ( rule__UniqueRule__CheckKindAssignment_0_1 )
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5160:8: rule__UniqueRule__CheckKindAssignment_0_1
+                    // InternalValid.g:5160:7: ( rule__UniqueRule__CheckKindAssignment_0_1 )
+                    // InternalValid.g:5160:8: rule__UniqueRule__CheckKindAssignment_0_1
                     {
-                    pushFollow(FOLLOW_rule__UniqueRule__CheckKindAssignment_0_1_in_rule__UniqueRule__UnorderedGroup_0__Impl10631);
+                    pushFollow(FOLLOW_2);
                     rule__UniqueRule__CheckKindAssignment_0_1();
 
                     state._fsp--;
@@ -13726,35 +13726,35 @@ else if ( LA43_0 >=11 && LA43_0<=13 && getUnorderedGroupHelper().canSelect(gramm
 
 
     // $ANTLR start "rule__UniqueRule__UnorderedGroup_0__0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5175:1: rule__UniqueRule__UnorderedGroup_0__0 : rule__UniqueRule__UnorderedGroup_0__Impl ( rule__UniqueRule__UnorderedGroup_0__1 )? ;
+    // InternalValid.g:5175:1: rule__UniqueRule__UnorderedGroup_0__0 : rule__UniqueRule__UnorderedGroup_0__Impl ( rule__UniqueRule__UnorderedGroup_0__1 )? ;
     public final void rule__UniqueRule__UnorderedGroup_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5179:1: ( rule__UniqueRule__UnorderedGroup_0__Impl ( rule__UniqueRule__UnorderedGroup_0__1 )? )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5180:2: rule__UniqueRule__UnorderedGroup_0__Impl ( rule__UniqueRule__UnorderedGroup_0__1 )?
+            // InternalValid.g:5179:1: ( rule__UniqueRule__UnorderedGroup_0__Impl ( rule__UniqueRule__UnorderedGroup_0__1 )? )
+            // InternalValid.g:5180:2: rule__UniqueRule__UnorderedGroup_0__Impl ( rule__UniqueRule__UnorderedGroup_0__1 )?
             {
-            pushFollow(FOLLOW_rule__UniqueRule__UnorderedGroup_0__Impl_in_rule__UniqueRule__UnorderedGroup_0__010690);
+            pushFollow(FOLLOW_11);
             rule__UniqueRule__UnorderedGroup_0__Impl();
 
             state._fsp--;
 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5181:2: ( rule__UniqueRule__UnorderedGroup_0__1 )?
+            // InternalValid.g:5181:2: ( rule__UniqueRule__UnorderedGroup_0__1 )?
             int alt44=2;
             int LA44_0 = input.LA(1);
 
-            if ( LA44_0 ==36 && getUnorderedGroupHelper().canSelect(grammarAccess.getUniqueRuleAccess().getUnorderedGroup_0(), 0) ) {
+            if ( LA44_0 == 36 && getUnorderedGroupHelper().canSelect(grammarAccess.getUniqueRuleAccess().getUnorderedGroup_0(), 0) ) {
                 alt44=1;
             }
-            else if ( LA44_0 >=11 && LA44_0<=13 && getUnorderedGroupHelper().canSelect(grammarAccess.getUniqueRuleAccess().getUnorderedGroup_0(), 1) ) {
+            else if ( LA44_0 >= 11 && LA44_0 <= 13 && getUnorderedGroupHelper().canSelect(grammarAccess.getUniqueRuleAccess().getUnorderedGroup_0(), 1) ) {
                 alt44=1;
             }
             switch (alt44) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5181:2: rule__UniqueRule__UnorderedGroup_0__1
+                    // InternalValid.g:5181:2: rule__UniqueRule__UnorderedGroup_0__1
                     {
-                    pushFollow(FOLLOW_rule__UniqueRule__UnorderedGroup_0__1_in_rule__UniqueRule__UnorderedGroup_0__010693);
+                    pushFollow(FOLLOW_2);
                     rule__UniqueRule__UnorderedGroup_0__1();
 
                     state._fsp--;
@@ -13784,16 +13784,16 @@ else if ( LA44_0 >=11 && LA44_0<=13 && getUnorderedGroupHelper().canSelect(gramm
 
 
     // $ANTLR start "rule__UniqueRule__UnorderedGroup_0__1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5188:1: rule__UniqueRule__UnorderedGroup_0__1 : rule__UniqueRule__UnorderedGroup_0__Impl ;
+    // InternalValid.g:5188:1: rule__UniqueRule__UnorderedGroup_0__1 : rule__UniqueRule__UnorderedGroup_0__Impl ;
     public final void rule__UniqueRule__UnorderedGroup_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5192:1: ( rule__UniqueRule__UnorderedGroup_0__Impl )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5193:2: rule__UniqueRule__UnorderedGroup_0__Impl
+            // InternalValid.g:5192:1: ( rule__UniqueRule__UnorderedGroup_0__Impl )
+            // InternalValid.g:5193:2: rule__UniqueRule__UnorderedGroup_0__Impl
             {
-            pushFollow(FOLLOW_rule__UniqueRule__UnorderedGroup_0__Impl_in_rule__UniqueRule__UnorderedGroup_0__110718);
+            pushFollow(FOLLOW_2);
             rule__UniqueRule__UnorderedGroup_0__Impl();
 
             state._fsp--;
@@ -13817,20 +13817,20 @@ public final void rule__UniqueRule__UnorderedGroup_0__1() throws RecognitionExce
 
 
     // $ANTLR start "rule__ValidModel__ImportsAssignment_0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5204:1: rule__ValidModel__ImportsAssignment_0 : ( ruleImport ) ;
+    // InternalValid.g:5204:1: rule__ValidModel__ImportsAssignment_0 : ( ruleImport ) ;
     public final void rule__ValidModel__ImportsAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5208:1: ( ( ruleImport ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5209:1: ( ruleImport )
+            // InternalValid.g:5208:1: ( ( ruleImport ) )
+            // InternalValid.g:5209:1: ( ruleImport )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5209:1: ( ruleImport )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5210:1: ruleImport
+            // InternalValid.g:5209:1: ( ruleImport )
+            // InternalValid.g:5210:1: ruleImport
             {
              before(grammarAccess.getValidModelAccess().getImportsImportParserRuleCall_0_0()); 
-            pushFollow(FOLLOW_ruleImport_in_rule__ValidModel__ImportsAssignment_010750);
+            pushFollow(FOLLOW_2);
             ruleImport();
 
             state._fsp--;
@@ -13858,20 +13858,20 @@ public final void rule__ValidModel__ImportsAssignment_0() throws RecognitionExce
 
 
     // $ANTLR start "rule__ValidModel__CategoriesAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5219:1: rule__ValidModel__CategoriesAssignment_1 : ( ruleCategory ) ;
+    // InternalValid.g:5219:1: rule__ValidModel__CategoriesAssignment_1 : ( ruleCategory ) ;
     public final void rule__ValidModel__CategoriesAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5223:1: ( ( ruleCategory ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5224:1: ( ruleCategory )
+            // InternalValid.g:5223:1: ( ( ruleCategory ) )
+            // InternalValid.g:5224:1: ( ruleCategory )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5224:1: ( ruleCategory )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5225:1: ruleCategory
+            // InternalValid.g:5224:1: ( ruleCategory )
+            // InternalValid.g:5225:1: ruleCategory
             {
              before(grammarAccess.getValidModelAccess().getCategoriesCategoryParserRuleCall_1_0()); 
-            pushFollow(FOLLOW_ruleCategory_in_rule__ValidModel__CategoriesAssignment_110781);
+            pushFollow(FOLLOW_2);
             ruleCategory();
 
             state._fsp--;
@@ -13899,24 +13899,24 @@ public final void rule__ValidModel__CategoriesAssignment_1() throws RecognitionE
 
 
     // $ANTLR start "rule__Import__PackageAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5234:1: rule__Import__PackageAssignment_1 : ( ( RULE_STRING ) ) ;
+    // InternalValid.g:5234:1: rule__Import__PackageAssignment_1 : ( ( RULE_STRING ) ) ;
     public final void rule__Import__PackageAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5238:1: ( ( ( RULE_STRING ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5239:1: ( ( RULE_STRING ) )
+            // InternalValid.g:5238:1: ( ( ( RULE_STRING ) ) )
+            // InternalValid.g:5239:1: ( ( RULE_STRING ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5239:1: ( ( RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5240:1: ( RULE_STRING )
+            // InternalValid.g:5239:1: ( ( RULE_STRING ) )
+            // InternalValid.g:5240:1: ( RULE_STRING )
             {
              before(grammarAccess.getImportAccess().getPackageEPackageCrossReference_1_0()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5241:1: ( RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5242:1: RULE_STRING
+            // InternalValid.g:5241:1: ( RULE_STRING )
+            // InternalValid.g:5242:1: RULE_STRING
             {
              before(grammarAccess.getImportAccess().getPackageEPackageSTRINGTerminalRuleCall_1_0_1()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__Import__PackageAssignment_110816); 
+            match(input,RULE_STRING,FOLLOW_2); 
              after(grammarAccess.getImportAccess().getPackageEPackageSTRINGTerminalRuleCall_1_0_1()); 
 
             }
@@ -13944,20 +13944,20 @@ public final void rule__Import__PackageAssignment_1() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__Category__NameAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5253:1: rule__Category__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalValid.g:5253:1: rule__Category__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__Category__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5257:1: ( ( RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5258:1: ( RULE_ID )
+            // InternalValid.g:5257:1: ( ( RULE_ID ) )
+            // InternalValid.g:5258:1: ( RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5258:1: ( RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5259:1: RULE_ID
+            // InternalValid.g:5258:1: ( RULE_ID )
+            // InternalValid.g:5259:1: RULE_ID
             {
              before(grammarAccess.getCategoryAccess().getNameIDTerminalRuleCall_1_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__Category__NameAssignment_110851); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getCategoryAccess().getNameIDTerminalRuleCall_1_0()); 
 
             }
@@ -13981,20 +13981,20 @@ public final void rule__Category__NameAssignment_1() throws RecognitionException
 
 
     // $ANTLR start "rule__Category__LabelAssignment_3"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5268:1: rule__Category__LabelAssignment_3 : ( RULE_STRING ) ;
+    // InternalValid.g:5268:1: rule__Category__LabelAssignment_3 : ( RULE_STRING ) ;
     public final void rule__Category__LabelAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5272:1: ( ( RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5273:1: ( RULE_STRING )
+            // InternalValid.g:5272:1: ( ( RULE_STRING ) )
+            // InternalValid.g:5273:1: ( RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5273:1: ( RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5274:1: RULE_STRING
+            // InternalValid.g:5273:1: ( RULE_STRING )
+            // InternalValid.g:5274:1: RULE_STRING
             {
              before(grammarAccess.getCategoryAccess().getLabelSTRINGTerminalRuleCall_3_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__Category__LabelAssignment_310882); 
+            match(input,RULE_STRING,FOLLOW_2); 
              after(grammarAccess.getCategoryAccess().getLabelSTRINGTerminalRuleCall_3_0()); 
 
             }
@@ -14018,20 +14018,20 @@ public final void rule__Category__LabelAssignment_3() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__Category__DescriptionAssignment_4_1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5283:1: rule__Category__DescriptionAssignment_4_1 : ( RULE_STRING ) ;
+    // InternalValid.g:5283:1: rule__Category__DescriptionAssignment_4_1 : ( RULE_STRING ) ;
     public final void rule__Category__DescriptionAssignment_4_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5287:1: ( ( RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5288:1: ( RULE_STRING )
+            // InternalValid.g:5287:1: ( ( RULE_STRING ) )
+            // InternalValid.g:5288:1: ( RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5288:1: ( RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5289:1: RULE_STRING
+            // InternalValid.g:5288:1: ( RULE_STRING )
+            // InternalValid.g:5289:1: RULE_STRING
             {
              before(grammarAccess.getCategoryAccess().getDescriptionSTRINGTerminalRuleCall_4_1_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__Category__DescriptionAssignment_4_110913); 
+            match(input,RULE_STRING,FOLLOW_2); 
              after(grammarAccess.getCategoryAccess().getDescriptionSTRINGTerminalRuleCall_4_1_0()); 
 
             }
@@ -14055,20 +14055,20 @@ public final void rule__Category__DescriptionAssignment_4_1() throws Recognition
 
 
     // $ANTLR start "rule__Category__RulesAssignment_6"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5298:1: rule__Category__RulesAssignment_6 : ( ruleRule ) ;
+    // InternalValid.g:5298:1: rule__Category__RulesAssignment_6 : ( ruleRule ) ;
     public final void rule__Category__RulesAssignment_6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5302:1: ( ( ruleRule ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5303:1: ( ruleRule )
+            // InternalValid.g:5302:1: ( ( ruleRule ) )
+            // InternalValid.g:5303:1: ( ruleRule )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5303:1: ( ruleRule )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5304:1: ruleRule
+            // InternalValid.g:5303:1: ( ruleRule )
+            // InternalValid.g:5304:1: ruleRule
             {
              before(grammarAccess.getCategoryAccess().getRulesRuleParserRuleCall_6_0()); 
-            pushFollow(FOLLOW_ruleRule_in_rule__Category__RulesAssignment_610944);
+            pushFollow(FOLLOW_2);
             ruleRule();
 
             state._fsp--;
@@ -14096,24 +14096,24 @@ public final void rule__Category__RulesAssignment_6() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__NativeRule__OptionalAssignment_0_0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5313:1: rule__NativeRule__OptionalAssignment_0_0 : ( ( 'optional' ) ) ;
+    // InternalValid.g:5313:1: rule__NativeRule__OptionalAssignment_0_0 : ( ( 'optional' ) ) ;
     public final void rule__NativeRule__OptionalAssignment_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5317:1: ( ( ( 'optional' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5318:1: ( ( 'optional' ) )
+            // InternalValid.g:5317:1: ( ( ( 'optional' ) ) )
+            // InternalValid.g:5318:1: ( ( 'optional' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5318:1: ( ( 'optional' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5319:1: ( 'optional' )
+            // InternalValid.g:5318:1: ( ( 'optional' ) )
+            // InternalValid.g:5319:1: ( 'optional' )
             {
              before(grammarAccess.getNativeRuleAccess().getOptionalOptionalKeyword_0_0_0()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5320:1: ( 'optional' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5321:1: 'optional'
+            // InternalValid.g:5320:1: ( 'optional' )
+            // InternalValid.g:5321:1: 'optional'
             {
              before(grammarAccess.getNativeRuleAccess().getOptionalOptionalKeyword_0_0_0()); 
-            match(input,36,FOLLOW_36_in_rule__NativeRule__OptionalAssignment_0_010980); 
+            match(input,36,FOLLOW_2); 
              after(grammarAccess.getNativeRuleAccess().getOptionalOptionalKeyword_0_0_0()); 
 
             }
@@ -14141,20 +14141,20 @@ public final void rule__NativeRule__OptionalAssignment_0_0() throws RecognitionE
 
 
     // $ANTLR start "rule__NativeRule__CheckKindAssignment_0_1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5336:1: rule__NativeRule__CheckKindAssignment_0_1 : ( ruleCheckKind ) ;
+    // InternalValid.g:5336:1: rule__NativeRule__CheckKindAssignment_0_1 : ( ruleCheckKind ) ;
     public final void rule__NativeRule__CheckKindAssignment_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5340:1: ( ( ruleCheckKind ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5341:1: ( ruleCheckKind )
+            // InternalValid.g:5340:1: ( ( ruleCheckKind ) )
+            // InternalValid.g:5341:1: ( ruleCheckKind )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5341:1: ( ruleCheckKind )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5342:1: ruleCheckKind
+            // InternalValid.g:5341:1: ( ruleCheckKind )
+            // InternalValid.g:5342:1: ruleCheckKind
             {
              before(grammarAccess.getNativeRuleAccess().getCheckKindCheckKindEnumRuleCall_0_1_0()); 
-            pushFollow(FOLLOW_ruleCheckKind_in_rule__NativeRule__CheckKindAssignment_0_111019);
+            pushFollow(FOLLOW_2);
             ruleCheckKind();
 
             state._fsp--;
@@ -14182,20 +14182,20 @@ public final void rule__NativeRule__CheckKindAssignment_0_1() throws Recognition
 
 
     // $ANTLR start "rule__NativeRule__SeverityAssignment_1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5351:1: rule__NativeRule__SeverityAssignment_1 : ( ruleSeverityKind ) ;
+    // InternalValid.g:5351:1: rule__NativeRule__SeverityAssignment_1 : ( ruleSeverityKind ) ;
     public final void rule__NativeRule__SeverityAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5355:1: ( ( ruleSeverityKind ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5356:1: ( ruleSeverityKind )
+            // InternalValid.g:5355:1: ( ( ruleSeverityKind ) )
+            // InternalValid.g:5356:1: ( ruleSeverityKind )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5356:1: ( ruleSeverityKind )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5357:1: ruleSeverityKind
+            // InternalValid.g:5356:1: ( ruleSeverityKind )
+            // InternalValid.g:5357:1: ruleSeverityKind
             {
              before(grammarAccess.getNativeRuleAccess().getSeveritySeverityKindEnumRuleCall_1_0()); 
-            pushFollow(FOLLOW_ruleSeverityKind_in_rule__NativeRule__SeverityAssignment_111050);
+            pushFollow(FOLLOW_2);
             ruleSeverityKind();
 
             state._fsp--;
@@ -14223,20 +14223,20 @@ public final void rule__NativeRule__SeverityAssignment_1() throws RecognitionExc
 
 
     // $ANTLR start "rule__NativeRule__NameAssignment_2"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5366:1: rule__NativeRule__NameAssignment_2 : ( RULE_ID ) ;
+    // InternalValid.g:5366:1: rule__NativeRule__NameAssignment_2 : ( RULE_ID ) ;
     public final void rule__NativeRule__NameAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5370:1: ( ( RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5371:1: ( RULE_ID )
+            // InternalValid.g:5370:1: ( ( RULE_ID ) )
+            // InternalValid.g:5371:1: ( RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5371:1: ( RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5372:1: RULE_ID
+            // InternalValid.g:5371:1: ( RULE_ID )
+            // InternalValid.g:5372:1: RULE_ID
             {
              before(grammarAccess.getNativeRuleAccess().getNameIDTerminalRuleCall_2_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__NativeRule__NameAssignment_211081); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getNativeRuleAccess().getNameIDTerminalRuleCall_2_0()); 
 
             }
@@ -14260,20 +14260,20 @@ public final void rule__NativeRule__NameAssignment_2() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__NativeRule__LabelAssignment_4"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5381:1: rule__NativeRule__LabelAssignment_4 : ( RULE_STRING ) ;
+    // InternalValid.g:5381:1: rule__NativeRule__LabelAssignment_4 : ( RULE_STRING ) ;
     public final void rule__NativeRule__LabelAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5385:1: ( ( RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5386:1: ( RULE_STRING )
+            // InternalValid.g:5385:1: ( ( RULE_STRING ) )
+            // InternalValid.g:5386:1: ( RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5386:1: ( RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5387:1: RULE_STRING
+            // InternalValid.g:5386:1: ( RULE_STRING )
+            // InternalValid.g:5387:1: RULE_STRING
             {
              before(grammarAccess.getNativeRuleAccess().getLabelSTRINGTerminalRuleCall_4_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__NativeRule__LabelAssignment_411112); 
+            match(input,RULE_STRING,FOLLOW_2); 
              after(grammarAccess.getNativeRuleAccess().getLabelSTRINGTerminalRuleCall_4_0()); 
 
             }
@@ -14297,20 +14297,20 @@ public final void rule__NativeRule__LabelAssignment_4() throws RecognitionExcept
 
 
     // $ANTLR start "rule__NativeRule__DescriptionAssignment_5_1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5396:1: rule__NativeRule__DescriptionAssignment_5_1 : ( RULE_STRING ) ;
+    // InternalValid.g:5396:1: rule__NativeRule__DescriptionAssignment_5_1 : ( RULE_STRING ) ;
     public final void rule__NativeRule__DescriptionAssignment_5_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5400:1: ( ( RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5401:1: ( RULE_STRING )
+            // InternalValid.g:5400:1: ( ( RULE_STRING ) )
+            // InternalValid.g:5401:1: ( RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5401:1: ( RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5402:1: RULE_STRING
+            // InternalValid.g:5401:1: ( RULE_STRING )
+            // InternalValid.g:5402:1: RULE_STRING
             {
              before(grammarAccess.getNativeRuleAccess().getDescriptionSTRINGTerminalRuleCall_5_1_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__NativeRule__DescriptionAssignment_5_111143); 
+            match(input,RULE_STRING,FOLLOW_2); 
              after(grammarAccess.getNativeRuleAccess().getDescriptionSTRINGTerminalRuleCall_5_1_0()); 
 
             }
@@ -14334,20 +14334,20 @@ public final void rule__NativeRule__DescriptionAssignment_5_1() throws Recogniti
 
 
     // $ANTLR start "rule__NativeRule__MessageAssignment_7"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5411:1: rule__NativeRule__MessageAssignment_7 : ( RULE_STRING ) ;
+    // InternalValid.g:5411:1: rule__NativeRule__MessageAssignment_7 : ( RULE_STRING ) ;
     public final void rule__NativeRule__MessageAssignment_7() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5415:1: ( ( RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5416:1: ( RULE_STRING )
+            // InternalValid.g:5415:1: ( ( RULE_STRING ) )
+            // InternalValid.g:5416:1: ( RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5416:1: ( RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5417:1: RULE_STRING
+            // InternalValid.g:5416:1: ( RULE_STRING )
+            // InternalValid.g:5417:1: RULE_STRING
             {
              before(grammarAccess.getNativeRuleAccess().getMessageSTRINGTerminalRuleCall_7_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__NativeRule__MessageAssignment_711174); 
+            match(input,RULE_STRING,FOLLOW_2); 
              after(grammarAccess.getNativeRuleAccess().getMessageSTRINGTerminalRuleCall_7_0()); 
 
             }
@@ -14371,20 +14371,20 @@ public final void rule__NativeRule__MessageAssignment_7() throws RecognitionExce
 
 
     // $ANTLR start "rule__NativeRule__ContextsAssignment_10"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5426:1: rule__NativeRule__ContextsAssignment_10 : ( ruleNativeContext ) ;
+    // InternalValid.g:5426:1: rule__NativeRule__ContextsAssignment_10 : ( ruleNativeContext ) ;
     public final void rule__NativeRule__ContextsAssignment_10() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5430:1: ( ( ruleNativeContext ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5431:1: ( ruleNativeContext )
+            // InternalValid.g:5430:1: ( ( ruleNativeContext ) )
+            // InternalValid.g:5431:1: ( ruleNativeContext )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5431:1: ( ruleNativeContext )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5432:1: ruleNativeContext
+            // InternalValid.g:5431:1: ( ruleNativeContext )
+            // InternalValid.g:5432:1: ruleNativeContext
             {
              before(grammarAccess.getNativeRuleAccess().getContextsNativeContextParserRuleCall_10_0()); 
-            pushFollow(FOLLOW_ruleNativeContext_in_rule__NativeRule__ContextsAssignment_1011205);
+            pushFollow(FOLLOW_2);
             ruleNativeContext();
 
             state._fsp--;
@@ -14412,24 +14412,24 @@ public final void rule__NativeRule__ContextsAssignment_10() throws RecognitionEx
 
 
     // $ANTLR start "rule__SizeRule__OptionalAssignment_0_0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5441:1: rule__SizeRule__OptionalAssignment_0_0 : ( ( 'optional' ) ) ;
+    // InternalValid.g:5441:1: rule__SizeRule__OptionalAssignment_0_0 : ( ( 'optional' ) ) ;
     public final void rule__SizeRule__OptionalAssignment_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5445:1: ( ( ( 'optional' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5446:1: ( ( 'optional' ) )
+            // InternalValid.g:5445:1: ( ( ( 'optional' ) ) )
+            // InternalValid.g:5446:1: ( ( 'optional' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5446:1: ( ( 'optional' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5447:1: ( 'optional' )
+            // InternalValid.g:5446:1: ( ( 'optional' ) )
+            // InternalValid.g:5447:1: ( 'optional' )
             {
              before(grammarAccess.getSizeRuleAccess().getOptionalOptionalKeyword_0_0_0()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5448:1: ( 'optional' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5449:1: 'optional'
+            // InternalValid.g:5448:1: ( 'optional' )
+            // InternalValid.g:5449:1: 'optional'
             {
              before(grammarAccess.getSizeRuleAccess().getOptionalOptionalKeyword_0_0_0()); 
-            match(input,36,FOLLOW_36_in_rule__SizeRule__OptionalAssignment_0_011241); 
+            match(input,36,FOLLOW_2); 
              after(grammarAccess.getSizeRuleAccess().getOptionalOptionalKeyword_0_0_0()); 
 
             }
@@ -14457,20 +14457,20 @@ public final void rule__SizeRule__OptionalAssignment_0_0() throws RecognitionExc
 
 
     // $ANTLR start "rule__SizeRule__CheckKindAssignment_0_1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5464:1: rule__SizeRule__CheckKindAssignment_0_1 : ( ruleCheckKind ) ;
+    // InternalValid.g:5464:1: rule__SizeRule__CheckKindAssignment_0_1 : ( ruleCheckKind ) ;
     public final void rule__SizeRule__CheckKindAssignment_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5468:1: ( ( ruleCheckKind ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5469:1: ( ruleCheckKind )
+            // InternalValid.g:5468:1: ( ( ruleCheckKind ) )
+            // InternalValid.g:5469:1: ( ruleCheckKind )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5469:1: ( ruleCheckKind )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5470:1: ruleCheckKind
+            // InternalValid.g:5469:1: ( ruleCheckKind )
+            // InternalValid.g:5470:1: ruleCheckKind
             {
              before(grammarAccess.getSizeRuleAccess().getCheckKindCheckKindEnumRuleCall_0_1_0()); 
-            pushFollow(FOLLOW_ruleCheckKind_in_rule__SizeRule__CheckKindAssignment_0_111280);
+            pushFollow(FOLLOW_2);
             ruleCheckKind();
 
             state._fsp--;
@@ -14498,20 +14498,20 @@ public final void rule__SizeRule__CheckKindAssignment_0_1() throws RecognitionEx
 
 
     // $ANTLR start "rule__SizeRule__SeverityAssignment_2"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5479:1: rule__SizeRule__SeverityAssignment_2 : ( ruleSeverityKind ) ;
+    // InternalValid.g:5479:1: rule__SizeRule__SeverityAssignment_2 : ( ruleSeverityKind ) ;
     public final void rule__SizeRule__SeverityAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5483:1: ( ( ruleSeverityKind ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5484:1: ( ruleSeverityKind )
+            // InternalValid.g:5483:1: ( ( ruleSeverityKind ) )
+            // InternalValid.g:5484:1: ( ruleSeverityKind )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5484:1: ( ruleSeverityKind )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5485:1: ruleSeverityKind
+            // InternalValid.g:5484:1: ( ruleSeverityKind )
+            // InternalValid.g:5485:1: ruleSeverityKind
             {
              before(grammarAccess.getSizeRuleAccess().getSeveritySeverityKindEnumRuleCall_2_0()); 
-            pushFollow(FOLLOW_ruleSeverityKind_in_rule__SizeRule__SeverityAssignment_211311);
+            pushFollow(FOLLOW_2);
             ruleSeverityKind();
 
             state._fsp--;
@@ -14539,20 +14539,20 @@ public final void rule__SizeRule__SeverityAssignment_2() throws RecognitionExcep
 
 
     // $ANTLR start "rule__SizeRule__NameAssignment_3"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5494:1: rule__SizeRule__NameAssignment_3 : ( RULE_ID ) ;
+    // InternalValid.g:5494:1: rule__SizeRule__NameAssignment_3 : ( RULE_ID ) ;
     public final void rule__SizeRule__NameAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5498:1: ( ( RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5499:1: ( RULE_ID )
+            // InternalValid.g:5498:1: ( ( RULE_ID ) )
+            // InternalValid.g:5499:1: ( RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5499:1: ( RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5500:1: RULE_ID
+            // InternalValid.g:5499:1: ( RULE_ID )
+            // InternalValid.g:5500:1: RULE_ID
             {
              before(grammarAccess.getSizeRuleAccess().getNameIDTerminalRuleCall_3_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__SizeRule__NameAssignment_311342); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getSizeRuleAccess().getNameIDTerminalRuleCall_3_0()); 
 
             }
@@ -14576,20 +14576,20 @@ public final void rule__SizeRule__NameAssignment_3() throws RecognitionException
 
 
     // $ANTLR start "rule__SizeRule__LabelAssignment_5"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5509:1: rule__SizeRule__LabelAssignment_5 : ( RULE_STRING ) ;
+    // InternalValid.g:5509:1: rule__SizeRule__LabelAssignment_5 : ( RULE_STRING ) ;
     public final void rule__SizeRule__LabelAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5513:1: ( ( RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5514:1: ( RULE_STRING )
+            // InternalValid.g:5513:1: ( ( RULE_STRING ) )
+            // InternalValid.g:5514:1: ( RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5514:1: ( RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5515:1: RULE_STRING
+            // InternalValid.g:5514:1: ( RULE_STRING )
+            // InternalValid.g:5515:1: RULE_STRING
             {
              before(grammarAccess.getSizeRuleAccess().getLabelSTRINGTerminalRuleCall_5_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__SizeRule__LabelAssignment_511373); 
+            match(input,RULE_STRING,FOLLOW_2); 
              after(grammarAccess.getSizeRuleAccess().getLabelSTRINGTerminalRuleCall_5_0()); 
 
             }
@@ -14613,20 +14613,20 @@ public final void rule__SizeRule__LabelAssignment_5() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__SizeRule__DescriptionAssignment_6_1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5524:1: rule__SizeRule__DescriptionAssignment_6_1 : ( RULE_STRING ) ;
+    // InternalValid.g:5524:1: rule__SizeRule__DescriptionAssignment_6_1 : ( RULE_STRING ) ;
     public final void rule__SizeRule__DescriptionAssignment_6_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5528:1: ( ( RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5529:1: ( RULE_STRING )
+            // InternalValid.g:5528:1: ( ( RULE_STRING ) )
+            // InternalValid.g:5529:1: ( RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5529:1: ( RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5530:1: RULE_STRING
+            // InternalValid.g:5529:1: ( RULE_STRING )
+            // InternalValid.g:5530:1: RULE_STRING
             {
              before(grammarAccess.getSizeRuleAccess().getDescriptionSTRINGTerminalRuleCall_6_1_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__SizeRule__DescriptionAssignment_6_111404); 
+            match(input,RULE_STRING,FOLLOW_2); 
              after(grammarAccess.getSizeRuleAccess().getDescriptionSTRINGTerminalRuleCall_6_1_0()); 
 
             }
@@ -14650,20 +14650,20 @@ public final void rule__SizeRule__DescriptionAssignment_6_1() throws Recognition
 
 
     // $ANTLR start "rule__SizeRule__MessageAssignment_7_1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5539:1: rule__SizeRule__MessageAssignment_7_1 : ( RULE_STRING ) ;
+    // InternalValid.g:5539:1: rule__SizeRule__MessageAssignment_7_1 : ( RULE_STRING ) ;
     public final void rule__SizeRule__MessageAssignment_7_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5543:1: ( ( RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5544:1: ( RULE_STRING )
+            // InternalValid.g:5543:1: ( ( RULE_STRING ) )
+            // InternalValid.g:5544:1: ( RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5544:1: ( RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5545:1: RULE_STRING
+            // InternalValid.g:5544:1: ( RULE_STRING )
+            // InternalValid.g:5545:1: RULE_STRING
             {
              before(grammarAccess.getSizeRuleAccess().getMessageSTRINGTerminalRuleCall_7_1_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__SizeRule__MessageAssignment_7_111435); 
+            match(input,RULE_STRING,FOLLOW_2); 
              after(grammarAccess.getSizeRuleAccess().getMessageSTRINGTerminalRuleCall_7_1_0()); 
 
             }
@@ -14687,20 +14687,20 @@ public final void rule__SizeRule__MessageAssignment_7_1() throws RecognitionExce
 
 
     // $ANTLR start "rule__SizeRule__MinAssignment_9_0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5554:1: rule__SizeRule__MinAssignment_9_0 : ( RULE_INT ) ;
+    // InternalValid.g:5554:1: rule__SizeRule__MinAssignment_9_0 : ( RULE_INT ) ;
     public final void rule__SizeRule__MinAssignment_9_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5558:1: ( ( RULE_INT ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5559:1: ( RULE_INT )
+            // InternalValid.g:5558:1: ( ( RULE_INT ) )
+            // InternalValid.g:5559:1: ( RULE_INT )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5559:1: ( RULE_INT )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5560:1: RULE_INT
+            // InternalValid.g:5559:1: ( RULE_INT )
+            // InternalValid.g:5560:1: RULE_INT
             {
              before(grammarAccess.getSizeRuleAccess().getMinINTTerminalRuleCall_9_0_0()); 
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__SizeRule__MinAssignment_9_011466); 
+            match(input,RULE_INT,FOLLOW_2); 
              after(grammarAccess.getSizeRuleAccess().getMinINTTerminalRuleCall_9_0_0()); 
 
             }
@@ -14724,20 +14724,20 @@ public final void rule__SizeRule__MinAssignment_9_0() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__SizeRule__MaxAssignment_10"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5569:1: rule__SizeRule__MaxAssignment_10 : ( RULE_INT ) ;
+    // InternalValid.g:5569:1: rule__SizeRule__MaxAssignment_10 : ( RULE_INT ) ;
     public final void rule__SizeRule__MaxAssignment_10() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5573:1: ( ( RULE_INT ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5574:1: ( RULE_INT )
+            // InternalValid.g:5573:1: ( ( RULE_INT ) )
+            // InternalValid.g:5574:1: ( RULE_INT )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5574:1: ( RULE_INT )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5575:1: RULE_INT
+            // InternalValid.g:5574:1: ( RULE_INT )
+            // InternalValid.g:5575:1: RULE_INT
             {
              before(grammarAccess.getSizeRuleAccess().getMaxINTTerminalRuleCall_10_0()); 
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__SizeRule__MaxAssignment_1011497); 
+            match(input,RULE_INT,FOLLOW_2); 
              after(grammarAccess.getSizeRuleAccess().getMaxINTTerminalRuleCall_10_0()); 
 
             }
@@ -14761,20 +14761,20 @@ public final void rule__SizeRule__MaxAssignment_10() throws RecognitionException
 
 
     // $ANTLR start "rule__SizeRule__ContextsAssignment_13"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5584:1: rule__SizeRule__ContextsAssignment_13 : ( ruleSimpleContext ) ;
+    // InternalValid.g:5584:1: rule__SizeRule__ContextsAssignment_13 : ( ruleSimpleContext ) ;
     public final void rule__SizeRule__ContextsAssignment_13() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5588:1: ( ( ruleSimpleContext ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5589:1: ( ruleSimpleContext )
+            // InternalValid.g:5588:1: ( ( ruleSimpleContext ) )
+            // InternalValid.g:5589:1: ( ruleSimpleContext )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5589:1: ( ruleSimpleContext )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5590:1: ruleSimpleContext
+            // InternalValid.g:5589:1: ( ruleSimpleContext )
+            // InternalValid.g:5590:1: ruleSimpleContext
             {
              before(grammarAccess.getSizeRuleAccess().getContextsSimpleContextParserRuleCall_13_0()); 
-            pushFollow(FOLLOW_ruleSimpleContext_in_rule__SizeRule__ContextsAssignment_1311528);
+            pushFollow(FOLLOW_2);
             ruleSimpleContext();
 
             state._fsp--;
@@ -14802,24 +14802,24 @@ public final void rule__SizeRule__ContextsAssignment_13() throws RecognitionExce
 
 
     // $ANTLR start "rule__RangeRule__OptionalAssignment_0_0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5599:1: rule__RangeRule__OptionalAssignment_0_0 : ( ( 'optional' ) ) ;
+    // InternalValid.g:5599:1: rule__RangeRule__OptionalAssignment_0_0 : ( ( 'optional' ) ) ;
     public final void rule__RangeRule__OptionalAssignment_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5603:1: ( ( ( 'optional' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5604:1: ( ( 'optional' ) )
+            // InternalValid.g:5603:1: ( ( ( 'optional' ) ) )
+            // InternalValid.g:5604:1: ( ( 'optional' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5604:1: ( ( 'optional' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5605:1: ( 'optional' )
+            // InternalValid.g:5604:1: ( ( 'optional' ) )
+            // InternalValid.g:5605:1: ( 'optional' )
             {
              before(grammarAccess.getRangeRuleAccess().getOptionalOptionalKeyword_0_0_0()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5606:1: ( 'optional' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5607:1: 'optional'
+            // InternalValid.g:5606:1: ( 'optional' )
+            // InternalValid.g:5607:1: 'optional'
             {
              before(grammarAccess.getRangeRuleAccess().getOptionalOptionalKeyword_0_0_0()); 
-            match(input,36,FOLLOW_36_in_rule__RangeRule__OptionalAssignment_0_011564); 
+            match(input,36,FOLLOW_2); 
              after(grammarAccess.getRangeRuleAccess().getOptionalOptionalKeyword_0_0_0()); 
 
             }
@@ -14847,20 +14847,20 @@ public final void rule__RangeRule__OptionalAssignment_0_0() throws RecognitionEx
 
 
     // $ANTLR start "rule__RangeRule__CheckKindAssignment_0_1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5622:1: rule__RangeRule__CheckKindAssignment_0_1 : ( ruleCheckKind ) ;
+    // InternalValid.g:5622:1: rule__RangeRule__CheckKindAssignment_0_1 : ( ruleCheckKind ) ;
     public final void rule__RangeRule__CheckKindAssignment_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5626:1: ( ( ruleCheckKind ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5627:1: ( ruleCheckKind )
+            // InternalValid.g:5626:1: ( ( ruleCheckKind ) )
+            // InternalValid.g:5627:1: ( ruleCheckKind )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5627:1: ( ruleCheckKind )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5628:1: ruleCheckKind
+            // InternalValid.g:5627:1: ( ruleCheckKind )
+            // InternalValid.g:5628:1: ruleCheckKind
             {
              before(grammarAccess.getRangeRuleAccess().getCheckKindCheckKindEnumRuleCall_0_1_0()); 
-            pushFollow(FOLLOW_ruleCheckKind_in_rule__RangeRule__CheckKindAssignment_0_111603);
+            pushFollow(FOLLOW_2);
             ruleCheckKind();
 
             state._fsp--;
@@ -14888,20 +14888,20 @@ public final void rule__RangeRule__CheckKindAssignment_0_1() throws RecognitionE
 
 
     // $ANTLR start "rule__RangeRule__SeverityAssignment_2"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5637:1: rule__RangeRule__SeverityAssignment_2 : ( ruleSeverityKind ) ;
+    // InternalValid.g:5637:1: rule__RangeRule__SeverityAssignment_2 : ( ruleSeverityKind ) ;
     public final void rule__RangeRule__SeverityAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5641:1: ( ( ruleSeverityKind ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5642:1: ( ruleSeverityKind )
+            // InternalValid.g:5641:1: ( ( ruleSeverityKind ) )
+            // InternalValid.g:5642:1: ( ruleSeverityKind )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5642:1: ( ruleSeverityKind )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5643:1: ruleSeverityKind
+            // InternalValid.g:5642:1: ( ruleSeverityKind )
+            // InternalValid.g:5643:1: ruleSeverityKind
             {
              before(grammarAccess.getRangeRuleAccess().getSeveritySeverityKindEnumRuleCall_2_0()); 
-            pushFollow(FOLLOW_ruleSeverityKind_in_rule__RangeRule__SeverityAssignment_211634);
+            pushFollow(FOLLOW_2);
             ruleSeverityKind();
 
             state._fsp--;
@@ -14929,20 +14929,20 @@ public final void rule__RangeRule__SeverityAssignment_2() throws RecognitionExce
 
 
     // $ANTLR start "rule__RangeRule__NameAssignment_3"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5652:1: rule__RangeRule__NameAssignment_3 : ( RULE_ID ) ;
+    // InternalValid.g:5652:1: rule__RangeRule__NameAssignment_3 : ( RULE_ID ) ;
     public final void rule__RangeRule__NameAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5656:1: ( ( RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5657:1: ( RULE_ID )
+            // InternalValid.g:5656:1: ( ( RULE_ID ) )
+            // InternalValid.g:5657:1: ( RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5657:1: ( RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5658:1: RULE_ID
+            // InternalValid.g:5657:1: ( RULE_ID )
+            // InternalValid.g:5658:1: RULE_ID
             {
              before(grammarAccess.getRangeRuleAccess().getNameIDTerminalRuleCall_3_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__RangeRule__NameAssignment_311665); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getRangeRuleAccess().getNameIDTerminalRuleCall_3_0()); 
 
             }
@@ -14966,20 +14966,20 @@ public final void rule__RangeRule__NameAssignment_3() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__RangeRule__LabelAssignment_5"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5667:1: rule__RangeRule__LabelAssignment_5 : ( RULE_STRING ) ;
+    // InternalValid.g:5667:1: rule__RangeRule__LabelAssignment_5 : ( RULE_STRING ) ;
     public final void rule__RangeRule__LabelAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5671:1: ( ( RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5672:1: ( RULE_STRING )
+            // InternalValid.g:5671:1: ( ( RULE_STRING ) )
+            // InternalValid.g:5672:1: ( RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5672:1: ( RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5673:1: RULE_STRING
+            // InternalValid.g:5672:1: ( RULE_STRING )
+            // InternalValid.g:5673:1: RULE_STRING
             {
              before(grammarAccess.getRangeRuleAccess().getLabelSTRINGTerminalRuleCall_5_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__RangeRule__LabelAssignment_511696); 
+            match(input,RULE_STRING,FOLLOW_2); 
              after(grammarAccess.getRangeRuleAccess().getLabelSTRINGTerminalRuleCall_5_0()); 
 
             }
@@ -15003,20 +15003,20 @@ public final void rule__RangeRule__LabelAssignment_5() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__RangeRule__DescriptionAssignment_6_1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5682:1: rule__RangeRule__DescriptionAssignment_6_1 : ( RULE_STRING ) ;
+    // InternalValid.g:5682:1: rule__RangeRule__DescriptionAssignment_6_1 : ( RULE_STRING ) ;
     public final void rule__RangeRule__DescriptionAssignment_6_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5686:1: ( ( RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5687:1: ( RULE_STRING )
+            // InternalValid.g:5686:1: ( ( RULE_STRING ) )
+            // InternalValid.g:5687:1: ( RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5687:1: ( RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5688:1: RULE_STRING
+            // InternalValid.g:5687:1: ( RULE_STRING )
+            // InternalValid.g:5688:1: RULE_STRING
             {
              before(grammarAccess.getRangeRuleAccess().getDescriptionSTRINGTerminalRuleCall_6_1_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__RangeRule__DescriptionAssignment_6_111727); 
+            match(input,RULE_STRING,FOLLOW_2); 
              after(grammarAccess.getRangeRuleAccess().getDescriptionSTRINGTerminalRuleCall_6_1_0()); 
 
             }
@@ -15040,20 +15040,20 @@ public final void rule__RangeRule__DescriptionAssignment_6_1() throws Recognitio
 
 
     // $ANTLR start "rule__RangeRule__MessageAssignment_7_1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5697:1: rule__RangeRule__MessageAssignment_7_1 : ( RULE_STRING ) ;
+    // InternalValid.g:5697:1: rule__RangeRule__MessageAssignment_7_1 : ( RULE_STRING ) ;
     public final void rule__RangeRule__MessageAssignment_7_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5701:1: ( ( RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5702:1: ( RULE_STRING )
+            // InternalValid.g:5701:1: ( ( RULE_STRING ) )
+            // InternalValid.g:5702:1: ( RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5702:1: ( RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5703:1: RULE_STRING
+            // InternalValid.g:5702:1: ( RULE_STRING )
+            // InternalValid.g:5703:1: RULE_STRING
             {
              before(grammarAccess.getRangeRuleAccess().getMessageSTRINGTerminalRuleCall_7_1_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__RangeRule__MessageAssignment_7_111758); 
+            match(input,RULE_STRING,FOLLOW_2); 
              after(grammarAccess.getRangeRuleAccess().getMessageSTRINGTerminalRuleCall_7_1_0()); 
 
             }
@@ -15077,20 +15077,20 @@ public final void rule__RangeRule__MessageAssignment_7_1() throws RecognitionExc
 
 
     // $ANTLR start "rule__RangeRule__MinAssignment_9_0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5712:1: rule__RangeRule__MinAssignment_9_0 : ( RULE_INT ) ;
+    // InternalValid.g:5712:1: rule__RangeRule__MinAssignment_9_0 : ( RULE_INT ) ;
     public final void rule__RangeRule__MinAssignment_9_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5716:1: ( ( RULE_INT ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5717:1: ( RULE_INT )
+            // InternalValid.g:5716:1: ( ( RULE_INT ) )
+            // InternalValid.g:5717:1: ( RULE_INT )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5717:1: ( RULE_INT )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5718:1: RULE_INT
+            // InternalValid.g:5717:1: ( RULE_INT )
+            // InternalValid.g:5718:1: RULE_INT
             {
              before(grammarAccess.getRangeRuleAccess().getMinINTTerminalRuleCall_9_0_0()); 
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__RangeRule__MinAssignment_9_011789); 
+            match(input,RULE_INT,FOLLOW_2); 
              after(grammarAccess.getRangeRuleAccess().getMinINTTerminalRuleCall_9_0_0()); 
 
             }
@@ -15114,20 +15114,20 @@ public final void rule__RangeRule__MinAssignment_9_0() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__RangeRule__MaxAssignment_10"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5727:1: rule__RangeRule__MaxAssignment_10 : ( RULE_INT ) ;
+    // InternalValid.g:5727:1: rule__RangeRule__MaxAssignment_10 : ( RULE_INT ) ;
     public final void rule__RangeRule__MaxAssignment_10() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5731:1: ( ( RULE_INT ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5732:1: ( RULE_INT )
+            // InternalValid.g:5731:1: ( ( RULE_INT ) )
+            // InternalValid.g:5732:1: ( RULE_INT )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5732:1: ( RULE_INT )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5733:1: RULE_INT
+            // InternalValid.g:5732:1: ( RULE_INT )
+            // InternalValid.g:5733:1: RULE_INT
             {
              before(grammarAccess.getRangeRuleAccess().getMaxINTTerminalRuleCall_10_0()); 
-            match(input,RULE_INT,FOLLOW_RULE_INT_in_rule__RangeRule__MaxAssignment_1011820); 
+            match(input,RULE_INT,FOLLOW_2); 
              after(grammarAccess.getRangeRuleAccess().getMaxINTTerminalRuleCall_10_0()); 
 
             }
@@ -15151,20 +15151,20 @@ public final void rule__RangeRule__MaxAssignment_10() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__RangeRule__ContextsAssignment_13"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5742:1: rule__RangeRule__ContextsAssignment_13 : ( ruleSimpleContext ) ;
+    // InternalValid.g:5742:1: rule__RangeRule__ContextsAssignment_13 : ( ruleSimpleContext ) ;
     public final void rule__RangeRule__ContextsAssignment_13() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5746:1: ( ( ruleSimpleContext ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5747:1: ( ruleSimpleContext )
+            // InternalValid.g:5746:1: ( ( ruleSimpleContext ) )
+            // InternalValid.g:5747:1: ( ruleSimpleContext )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5747:1: ( ruleSimpleContext )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5748:1: ruleSimpleContext
+            // InternalValid.g:5747:1: ( ruleSimpleContext )
+            // InternalValid.g:5748:1: ruleSimpleContext
             {
              before(grammarAccess.getRangeRuleAccess().getContextsSimpleContextParserRuleCall_13_0()); 
-            pushFollow(FOLLOW_ruleSimpleContext_in_rule__RangeRule__ContextsAssignment_1311851);
+            pushFollow(FOLLOW_2);
             ruleSimpleContext();
 
             state._fsp--;
@@ -15192,24 +15192,24 @@ public final void rule__RangeRule__ContextsAssignment_13() throws RecognitionExc
 
 
     // $ANTLR start "rule__UniqueRule__OptionalAssignment_0_0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5757:1: rule__UniqueRule__OptionalAssignment_0_0 : ( ( 'optional' ) ) ;
+    // InternalValid.g:5757:1: rule__UniqueRule__OptionalAssignment_0_0 : ( ( 'optional' ) ) ;
     public final void rule__UniqueRule__OptionalAssignment_0_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5761:1: ( ( ( 'optional' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5762:1: ( ( 'optional' ) )
+            // InternalValid.g:5761:1: ( ( ( 'optional' ) ) )
+            // InternalValid.g:5762:1: ( ( 'optional' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5762:1: ( ( 'optional' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5763:1: ( 'optional' )
+            // InternalValid.g:5762:1: ( ( 'optional' ) )
+            // InternalValid.g:5763:1: ( 'optional' )
             {
              before(grammarAccess.getUniqueRuleAccess().getOptionalOptionalKeyword_0_0_0()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5764:1: ( 'optional' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5765:1: 'optional'
+            // InternalValid.g:5764:1: ( 'optional' )
+            // InternalValid.g:5765:1: 'optional'
             {
              before(grammarAccess.getUniqueRuleAccess().getOptionalOptionalKeyword_0_0_0()); 
-            match(input,36,FOLLOW_36_in_rule__UniqueRule__OptionalAssignment_0_011887); 
+            match(input,36,FOLLOW_2); 
              after(grammarAccess.getUniqueRuleAccess().getOptionalOptionalKeyword_0_0_0()); 
 
             }
@@ -15237,20 +15237,20 @@ public final void rule__UniqueRule__OptionalAssignment_0_0() throws RecognitionE
 
 
     // $ANTLR start "rule__UniqueRule__CheckKindAssignment_0_1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5780:1: rule__UniqueRule__CheckKindAssignment_0_1 : ( ruleCheckKind ) ;
+    // InternalValid.g:5780:1: rule__UniqueRule__CheckKindAssignment_0_1 : ( ruleCheckKind ) ;
     public final void rule__UniqueRule__CheckKindAssignment_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5784:1: ( ( ruleCheckKind ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5785:1: ( ruleCheckKind )
+            // InternalValid.g:5784:1: ( ( ruleCheckKind ) )
+            // InternalValid.g:5785:1: ( ruleCheckKind )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5785:1: ( ruleCheckKind )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5786:1: ruleCheckKind
+            // InternalValid.g:5785:1: ( ruleCheckKind )
+            // InternalValid.g:5786:1: ruleCheckKind
             {
              before(grammarAccess.getUniqueRuleAccess().getCheckKindCheckKindEnumRuleCall_0_1_0()); 
-            pushFollow(FOLLOW_ruleCheckKind_in_rule__UniqueRule__CheckKindAssignment_0_111926);
+            pushFollow(FOLLOW_2);
             ruleCheckKind();
 
             state._fsp--;
@@ -15278,20 +15278,20 @@ public final void rule__UniqueRule__CheckKindAssignment_0_1() throws Recognition
 
 
     // $ANTLR start "rule__UniqueRule__SeverityAssignment_2"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5795:1: rule__UniqueRule__SeverityAssignment_2 : ( ruleSeverityKind ) ;
+    // InternalValid.g:5795:1: rule__UniqueRule__SeverityAssignment_2 : ( ruleSeverityKind ) ;
     public final void rule__UniqueRule__SeverityAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5799:1: ( ( ruleSeverityKind ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5800:1: ( ruleSeverityKind )
+            // InternalValid.g:5799:1: ( ( ruleSeverityKind ) )
+            // InternalValid.g:5800:1: ( ruleSeverityKind )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5800:1: ( ruleSeverityKind )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5801:1: ruleSeverityKind
+            // InternalValid.g:5800:1: ( ruleSeverityKind )
+            // InternalValid.g:5801:1: ruleSeverityKind
             {
              before(grammarAccess.getUniqueRuleAccess().getSeveritySeverityKindEnumRuleCall_2_0()); 
-            pushFollow(FOLLOW_ruleSeverityKind_in_rule__UniqueRule__SeverityAssignment_211957);
+            pushFollow(FOLLOW_2);
             ruleSeverityKind();
 
             state._fsp--;
@@ -15319,20 +15319,20 @@ public final void rule__UniqueRule__SeverityAssignment_2() throws RecognitionExc
 
 
     // $ANTLR start "rule__UniqueRule__NameAssignment_3"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5810:1: rule__UniqueRule__NameAssignment_3 : ( RULE_ID ) ;
+    // InternalValid.g:5810:1: rule__UniqueRule__NameAssignment_3 : ( RULE_ID ) ;
     public final void rule__UniqueRule__NameAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5814:1: ( ( RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5815:1: ( RULE_ID )
+            // InternalValid.g:5814:1: ( ( RULE_ID ) )
+            // InternalValid.g:5815:1: ( RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5815:1: ( RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5816:1: RULE_ID
+            // InternalValid.g:5815:1: ( RULE_ID )
+            // InternalValid.g:5816:1: RULE_ID
             {
              before(grammarAccess.getUniqueRuleAccess().getNameIDTerminalRuleCall_3_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__UniqueRule__NameAssignment_311988); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getUniqueRuleAccess().getNameIDTerminalRuleCall_3_0()); 
 
             }
@@ -15356,20 +15356,20 @@ public final void rule__UniqueRule__NameAssignment_3() throws RecognitionExcepti
 
 
     // $ANTLR start "rule__UniqueRule__LabelAssignment_5"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5825:1: rule__UniqueRule__LabelAssignment_5 : ( RULE_STRING ) ;
+    // InternalValid.g:5825:1: rule__UniqueRule__LabelAssignment_5 : ( RULE_STRING ) ;
     public final void rule__UniqueRule__LabelAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5829:1: ( ( RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5830:1: ( RULE_STRING )
+            // InternalValid.g:5829:1: ( ( RULE_STRING ) )
+            // InternalValid.g:5830:1: ( RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5830:1: ( RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5831:1: RULE_STRING
+            // InternalValid.g:5830:1: ( RULE_STRING )
+            // InternalValid.g:5831:1: RULE_STRING
             {
              before(grammarAccess.getUniqueRuleAccess().getLabelSTRINGTerminalRuleCall_5_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__UniqueRule__LabelAssignment_512019); 
+            match(input,RULE_STRING,FOLLOW_2); 
              after(grammarAccess.getUniqueRuleAccess().getLabelSTRINGTerminalRuleCall_5_0()); 
 
             }
@@ -15393,20 +15393,20 @@ public final void rule__UniqueRule__LabelAssignment_5() throws RecognitionExcept
 
 
     // $ANTLR start "rule__UniqueRule__DescriptionAssignment_6_1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5840:1: rule__UniqueRule__DescriptionAssignment_6_1 : ( RULE_STRING ) ;
+    // InternalValid.g:5840:1: rule__UniqueRule__DescriptionAssignment_6_1 : ( RULE_STRING ) ;
     public final void rule__UniqueRule__DescriptionAssignment_6_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5844:1: ( ( RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5845:1: ( RULE_STRING )
+            // InternalValid.g:5844:1: ( ( RULE_STRING ) )
+            // InternalValid.g:5845:1: ( RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5845:1: ( RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5846:1: RULE_STRING
+            // InternalValid.g:5845:1: ( RULE_STRING )
+            // InternalValid.g:5846:1: RULE_STRING
             {
              before(grammarAccess.getUniqueRuleAccess().getDescriptionSTRINGTerminalRuleCall_6_1_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__UniqueRule__DescriptionAssignment_6_112050); 
+            match(input,RULE_STRING,FOLLOW_2); 
              after(grammarAccess.getUniqueRuleAccess().getDescriptionSTRINGTerminalRuleCall_6_1_0()); 
 
             }
@@ -15430,20 +15430,20 @@ public final void rule__UniqueRule__DescriptionAssignment_6_1() throws Recogniti
 
 
     // $ANTLR start "rule__UniqueRule__MessageAssignment_7_1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5855:1: rule__UniqueRule__MessageAssignment_7_1 : ( RULE_STRING ) ;
+    // InternalValid.g:5855:1: rule__UniqueRule__MessageAssignment_7_1 : ( RULE_STRING ) ;
     public final void rule__UniqueRule__MessageAssignment_7_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5859:1: ( ( RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5860:1: ( RULE_STRING )
+            // InternalValid.g:5859:1: ( ( RULE_STRING ) )
+            // InternalValid.g:5860:1: ( RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5860:1: ( RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5861:1: RULE_STRING
+            // InternalValid.g:5860:1: ( RULE_STRING )
+            // InternalValid.g:5861:1: RULE_STRING
             {
              before(grammarAccess.getUniqueRuleAccess().getMessageSTRINGTerminalRuleCall_7_1_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__UniqueRule__MessageAssignment_7_112081); 
+            match(input,RULE_STRING,FOLLOW_2); 
              after(grammarAccess.getUniqueRuleAccess().getMessageSTRINGTerminalRuleCall_7_1_0()); 
 
             }
@@ -15467,20 +15467,20 @@ public final void rule__UniqueRule__MessageAssignment_7_1() throws RecognitionEx
 
 
     // $ANTLR start "rule__UniqueRule__ContextsAssignment_10"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5870:1: rule__UniqueRule__ContextsAssignment_10 : ( ruleDuplicateContext ) ;
+    // InternalValid.g:5870:1: rule__UniqueRule__ContextsAssignment_10 : ( ruleDuplicateContext ) ;
     public final void rule__UniqueRule__ContextsAssignment_10() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5874:1: ( ( ruleDuplicateContext ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5875:1: ( ruleDuplicateContext )
+            // InternalValid.g:5874:1: ( ( ruleDuplicateContext ) )
+            // InternalValid.g:5875:1: ( ruleDuplicateContext )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5875:1: ( ruleDuplicateContext )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5876:1: ruleDuplicateContext
+            // InternalValid.g:5875:1: ( ruleDuplicateContext )
+            // InternalValid.g:5876:1: ruleDuplicateContext
             {
              before(grammarAccess.getUniqueRuleAccess().getContextsDuplicateContextParserRuleCall_10_0()); 
-            pushFollow(FOLLOW_ruleDuplicateContext_in_rule__UniqueRule__ContextsAssignment_1012112);
+            pushFollow(FOLLOW_2);
             ruleDuplicateContext();
 
             state._fsp--;
@@ -15508,24 +15508,24 @@ public final void rule__UniqueRule__ContextsAssignment_10() throws RecognitionEx
 
 
     // $ANTLR start "rule__SimpleContext__ContextTypeAssignment_0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5885:1: rule__SimpleContext__ContextTypeAssignment_0 : ( ( ruleQualifiedID ) ) ;
+    // InternalValid.g:5885:1: rule__SimpleContext__ContextTypeAssignment_0 : ( ( ruleQualifiedID ) ) ;
     public final void rule__SimpleContext__ContextTypeAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5889:1: ( ( ( ruleQualifiedID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5890:1: ( ( ruleQualifiedID ) )
+            // InternalValid.g:5889:1: ( ( ( ruleQualifiedID ) ) )
+            // InternalValid.g:5890:1: ( ( ruleQualifiedID ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5890:1: ( ( ruleQualifiedID ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5891:1: ( ruleQualifiedID )
+            // InternalValid.g:5890:1: ( ( ruleQualifiedID ) )
+            // InternalValid.g:5891:1: ( ruleQualifiedID )
             {
              before(grammarAccess.getSimpleContextAccess().getContextTypeEClassCrossReference_0_0()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5892:1: ( ruleQualifiedID )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5893:1: ruleQualifiedID
+            // InternalValid.g:5892:1: ( ruleQualifiedID )
+            // InternalValid.g:5893:1: ruleQualifiedID
             {
              before(grammarAccess.getSimpleContextAccess().getContextTypeEClassQualifiedIDParserRuleCall_0_0_1()); 
-            pushFollow(FOLLOW_ruleQualifiedID_in_rule__SimpleContext__ContextTypeAssignment_012147);
+            pushFollow(FOLLOW_2);
             ruleQualifiedID();
 
             state._fsp--;
@@ -15557,24 +15557,24 @@ public final void rule__SimpleContext__ContextTypeAssignment_0() throws Recognit
 
 
     // $ANTLR start "rule__SimpleContext__ContextFeatureAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5904:1: rule__SimpleContext__ContextFeatureAssignment_1_1 : ( ( RULE_ID ) ) ;
+    // InternalValid.g:5904:1: rule__SimpleContext__ContextFeatureAssignment_1_1 : ( ( RULE_ID ) ) ;
     public final void rule__SimpleContext__ContextFeatureAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5908:1: ( ( ( RULE_ID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5909:1: ( ( RULE_ID ) )
+            // InternalValid.g:5908:1: ( ( ( RULE_ID ) ) )
+            // InternalValid.g:5909:1: ( ( RULE_ID ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5909:1: ( ( RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5910:1: ( RULE_ID )
+            // InternalValid.g:5909:1: ( ( RULE_ID ) )
+            // InternalValid.g:5910:1: ( RULE_ID )
             {
              before(grammarAccess.getSimpleContextAccess().getContextFeatureEStructuralFeatureCrossReference_1_1_0()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5911:1: ( RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5912:1: RULE_ID
+            // InternalValid.g:5911:1: ( RULE_ID )
+            // InternalValid.g:5912:1: RULE_ID
             {
              before(grammarAccess.getSimpleContextAccess().getContextFeatureEStructuralFeatureIDTerminalRuleCall_1_1_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__SimpleContext__ContextFeatureAssignment_1_112186); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getSimpleContextAccess().getContextFeatureEStructuralFeatureIDTerminalRuleCall_1_1_0_1()); 
 
             }
@@ -15602,24 +15602,24 @@ public final void rule__SimpleContext__ContextFeatureAssignment_1_1() throws Rec
 
 
     // $ANTLR start "rule__DuplicateContext__ContextTypeAssignment_0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5923:1: rule__DuplicateContext__ContextTypeAssignment_0 : ( ( ruleQualifiedID ) ) ;
+    // InternalValid.g:5923:1: rule__DuplicateContext__ContextTypeAssignment_0 : ( ( ruleQualifiedID ) ) ;
     public final void rule__DuplicateContext__ContextTypeAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5927:1: ( ( ( ruleQualifiedID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5928:1: ( ( ruleQualifiedID ) )
+            // InternalValid.g:5927:1: ( ( ( ruleQualifiedID ) ) )
+            // InternalValid.g:5928:1: ( ( ruleQualifiedID ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5928:1: ( ( ruleQualifiedID ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5929:1: ( ruleQualifiedID )
+            // InternalValid.g:5928:1: ( ( ruleQualifiedID ) )
+            // InternalValid.g:5929:1: ( ruleQualifiedID )
             {
              before(grammarAccess.getDuplicateContextAccess().getContextTypeEClassCrossReference_0_0()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5930:1: ( ruleQualifiedID )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5931:1: ruleQualifiedID
+            // InternalValid.g:5930:1: ( ruleQualifiedID )
+            // InternalValid.g:5931:1: ruleQualifiedID
             {
              before(grammarAccess.getDuplicateContextAccess().getContextTypeEClassQualifiedIDParserRuleCall_0_0_1()); 
-            pushFollow(FOLLOW_ruleQualifiedID_in_rule__DuplicateContext__ContextTypeAssignment_012225);
+            pushFollow(FOLLOW_2);
             ruleQualifiedID();
 
             state._fsp--;
@@ -15651,24 +15651,24 @@ public final void rule__DuplicateContext__ContextTypeAssignment_0() throws Recog
 
 
     // $ANTLR start "rule__DuplicateContext__ContextFeatureAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5942:1: rule__DuplicateContext__ContextFeatureAssignment_1_1 : ( ( RULE_ID ) ) ;
+    // InternalValid.g:5942:1: rule__DuplicateContext__ContextFeatureAssignment_1_1 : ( ( RULE_ID ) ) ;
     public final void rule__DuplicateContext__ContextFeatureAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5946:1: ( ( ( RULE_ID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5947:1: ( ( RULE_ID ) )
+            // InternalValid.g:5946:1: ( ( ( RULE_ID ) ) )
+            // InternalValid.g:5947:1: ( ( RULE_ID ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5947:1: ( ( RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5948:1: ( RULE_ID )
+            // InternalValid.g:5947:1: ( ( RULE_ID ) )
+            // InternalValid.g:5948:1: ( RULE_ID )
             {
              before(grammarAccess.getDuplicateContextAccess().getContextFeatureEStructuralFeatureCrossReference_1_1_0()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5949:1: ( RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5950:1: RULE_ID
+            // InternalValid.g:5949:1: ( RULE_ID )
+            // InternalValid.g:5950:1: RULE_ID
             {
              before(grammarAccess.getDuplicateContextAccess().getContextFeatureEStructuralFeatureIDTerminalRuleCall_1_1_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__DuplicateContext__ContextFeatureAssignment_1_112264); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getDuplicateContextAccess().getContextFeatureEStructuralFeatureIDTerminalRuleCall_1_1_0_1()); 
 
             }
@@ -15696,24 +15696,24 @@ public final void rule__DuplicateContext__ContextFeatureAssignment_1_1() throws
 
 
     // $ANTLR start "rule__DuplicateContext__MarkerTypeAssignment_3"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5961:1: rule__DuplicateContext__MarkerTypeAssignment_3 : ( ( ruleQualifiedID ) ) ;
+    // InternalValid.g:5961:1: rule__DuplicateContext__MarkerTypeAssignment_3 : ( ( ruleQualifiedID ) ) ;
     public final void rule__DuplicateContext__MarkerTypeAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5965:1: ( ( ( ruleQualifiedID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5966:1: ( ( ruleQualifiedID ) )
+            // InternalValid.g:5965:1: ( ( ( ruleQualifiedID ) ) )
+            // InternalValid.g:5966:1: ( ( ruleQualifiedID ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5966:1: ( ( ruleQualifiedID ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5967:1: ( ruleQualifiedID )
+            // InternalValid.g:5966:1: ( ( ruleQualifiedID ) )
+            // InternalValid.g:5967:1: ( ruleQualifiedID )
             {
              before(grammarAccess.getDuplicateContextAccess().getMarkerTypeEClassCrossReference_3_0()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5968:1: ( ruleQualifiedID )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5969:1: ruleQualifiedID
+            // InternalValid.g:5968:1: ( ruleQualifiedID )
+            // InternalValid.g:5969:1: ruleQualifiedID
             {
              before(grammarAccess.getDuplicateContextAccess().getMarkerTypeEClassQualifiedIDParserRuleCall_3_0_1()); 
-            pushFollow(FOLLOW_ruleQualifiedID_in_rule__DuplicateContext__MarkerTypeAssignment_312303);
+            pushFollow(FOLLOW_2);
             ruleQualifiedID();
 
             state._fsp--;
@@ -15745,24 +15745,24 @@ public final void rule__DuplicateContext__MarkerTypeAssignment_3() throws Recogn
 
 
     // $ANTLR start "rule__DuplicateContext__MarkerFeatureAssignment_5"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5980:1: rule__DuplicateContext__MarkerFeatureAssignment_5 : ( ( RULE_ID ) ) ;
+    // InternalValid.g:5980:1: rule__DuplicateContext__MarkerFeatureAssignment_5 : ( ( RULE_ID ) ) ;
     public final void rule__DuplicateContext__MarkerFeatureAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5984:1: ( ( ( RULE_ID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5985:1: ( ( RULE_ID ) )
+            // InternalValid.g:5984:1: ( ( ( RULE_ID ) ) )
+            // InternalValid.g:5985:1: ( ( RULE_ID ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5985:1: ( ( RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5986:1: ( RULE_ID )
+            // InternalValid.g:5985:1: ( ( RULE_ID ) )
+            // InternalValid.g:5986:1: ( RULE_ID )
             {
              before(grammarAccess.getDuplicateContextAccess().getMarkerFeatureEStructuralFeatureCrossReference_5_0()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5987:1: ( RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5988:1: RULE_ID
+            // InternalValid.g:5987:1: ( RULE_ID )
+            // InternalValid.g:5988:1: RULE_ID
             {
              before(grammarAccess.getDuplicateContextAccess().getMarkerFeatureEStructuralFeatureIDTerminalRuleCall_5_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__DuplicateContext__MarkerFeatureAssignment_512342); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getDuplicateContextAccess().getMarkerFeatureEStructuralFeatureIDTerminalRuleCall_5_0_1()); 
 
             }
@@ -15790,24 +15790,24 @@ public final void rule__DuplicateContext__MarkerFeatureAssignment_5() throws Rec
 
 
     // $ANTLR start "rule__NativeContext__ContextTypeAssignment_0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:5999:1: rule__NativeContext__ContextTypeAssignment_0 : ( ( ruleQualifiedID ) ) ;
+    // InternalValid.g:5999:1: rule__NativeContext__ContextTypeAssignment_0 : ( ( ruleQualifiedID ) ) ;
     public final void rule__NativeContext__ContextTypeAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6003:1: ( ( ( ruleQualifiedID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6004:1: ( ( ruleQualifiedID ) )
+            // InternalValid.g:6003:1: ( ( ( ruleQualifiedID ) ) )
+            // InternalValid.g:6004:1: ( ( ruleQualifiedID ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6004:1: ( ( ruleQualifiedID ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6005:1: ( ruleQualifiedID )
+            // InternalValid.g:6004:1: ( ( ruleQualifiedID ) )
+            // InternalValid.g:6005:1: ( ruleQualifiedID )
             {
              before(grammarAccess.getNativeContextAccess().getContextTypeEClassCrossReference_0_0()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6006:1: ( ruleQualifiedID )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6007:1: ruleQualifiedID
+            // InternalValid.g:6006:1: ( ruleQualifiedID )
+            // InternalValid.g:6007:1: ruleQualifiedID
             {
              before(grammarAccess.getNativeContextAccess().getContextTypeEClassQualifiedIDParserRuleCall_0_0_1()); 
-            pushFollow(FOLLOW_ruleQualifiedID_in_rule__NativeContext__ContextTypeAssignment_012381);
+            pushFollow(FOLLOW_2);
             ruleQualifiedID();
 
             state._fsp--;
@@ -15839,24 +15839,24 @@ public final void rule__NativeContext__ContextTypeAssignment_0() throws Recognit
 
 
     // $ANTLR start "rule__NativeContext__ContextFeatureAssignment_1_1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6018:1: rule__NativeContext__ContextFeatureAssignment_1_1 : ( ( RULE_ID ) ) ;
+    // InternalValid.g:6018:1: rule__NativeContext__ContextFeatureAssignment_1_1 : ( ( RULE_ID ) ) ;
     public final void rule__NativeContext__ContextFeatureAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6022:1: ( ( ( RULE_ID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6023:1: ( ( RULE_ID ) )
+            // InternalValid.g:6022:1: ( ( ( RULE_ID ) ) )
+            // InternalValid.g:6023:1: ( ( RULE_ID ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6023:1: ( ( RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6024:1: ( RULE_ID )
+            // InternalValid.g:6023:1: ( ( RULE_ID ) )
+            // InternalValid.g:6024:1: ( RULE_ID )
             {
              before(grammarAccess.getNativeContextAccess().getContextFeatureEStructuralFeatureCrossReference_1_1_0()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6025:1: ( RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6026:1: RULE_ID
+            // InternalValid.g:6025:1: ( RULE_ID )
+            // InternalValid.g:6026:1: RULE_ID
             {
              before(grammarAccess.getNativeContextAccess().getContextFeatureEStructuralFeatureIDTerminalRuleCall_1_1_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__NativeContext__ContextFeatureAssignment_1_112420); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getNativeContextAccess().getContextFeatureEStructuralFeatureIDTerminalRuleCall_1_1_0_1()); 
 
             }
@@ -15884,24 +15884,24 @@ public final void rule__NativeContext__ContextFeatureAssignment_1_1() throws Rec
 
 
     // $ANTLR start "rule__NativeContext__NamedAssignment_2_0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6037:1: rule__NativeContext__NamedAssignment_2_0 : ( ( 'as' ) ) ;
+    // InternalValid.g:6037:1: rule__NativeContext__NamedAssignment_2_0 : ( ( 'as' ) ) ;
     public final void rule__NativeContext__NamedAssignment_2_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6041:1: ( ( ( 'as' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6042:1: ( ( 'as' ) )
+            // InternalValid.g:6041:1: ( ( ( 'as' ) ) )
+            // InternalValid.g:6042:1: ( ( 'as' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6042:1: ( ( 'as' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6043:1: ( 'as' )
+            // InternalValid.g:6042:1: ( ( 'as' ) )
+            // InternalValid.g:6043:1: ( 'as' )
             {
              before(grammarAccess.getNativeContextAccess().getNamedAsKeyword_2_0_0()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6044:1: ( 'as' )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6045:1: 'as'
+            // InternalValid.g:6044:1: ( 'as' )
+            // InternalValid.g:6045:1: 'as'
             {
              before(grammarAccess.getNativeContextAccess().getNamedAsKeyword_2_0_0()); 
-            match(input,37,FOLLOW_37_in_rule__NativeContext__NamedAssignment_2_012460); 
+            match(input,37,FOLLOW_2); 
              after(grammarAccess.getNativeContextAccess().getNamedAsKeyword_2_0_0()); 
 
             }
@@ -15929,20 +15929,20 @@ public final void rule__NativeContext__NamedAssignment_2_0() throws RecognitionE
 
 
     // $ANTLR start "rule__NativeContext__GivenNameAssignment_2_1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6060:1: rule__NativeContext__GivenNameAssignment_2_1 : ( RULE_ID ) ;
+    // InternalValid.g:6060:1: rule__NativeContext__GivenNameAssignment_2_1 : ( RULE_ID ) ;
     public final void rule__NativeContext__GivenNameAssignment_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6064:1: ( ( RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6065:1: ( RULE_ID )
+            // InternalValid.g:6064:1: ( ( RULE_ID ) )
+            // InternalValid.g:6065:1: ( RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6065:1: ( RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6066:1: RULE_ID
+            // InternalValid.g:6065:1: ( RULE_ID )
+            // InternalValid.g:6066:1: RULE_ID
             {
              before(grammarAccess.getNativeContextAccess().getGivenNameIDTerminalRuleCall_2_1_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__NativeContext__GivenNameAssignment_2_112499); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getNativeContextAccess().getGivenNameIDTerminalRuleCall_2_1_0()); 
 
             }
@@ -15966,24 +15966,24 @@ public final void rule__NativeContext__GivenNameAssignment_2_1() throws Recognit
 
 
     // $ANTLR start "rule__NativeContext__MarkerTypeAssignment_3_1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6075:1: rule__NativeContext__MarkerTypeAssignment_3_1 : ( ( ruleQualifiedID ) ) ;
+    // InternalValid.g:6075:1: rule__NativeContext__MarkerTypeAssignment_3_1 : ( ( ruleQualifiedID ) ) ;
     public final void rule__NativeContext__MarkerTypeAssignment_3_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6079:1: ( ( ( ruleQualifiedID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6080:1: ( ( ruleQualifiedID ) )
+            // InternalValid.g:6079:1: ( ( ( ruleQualifiedID ) ) )
+            // InternalValid.g:6080:1: ( ( ruleQualifiedID ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6080:1: ( ( ruleQualifiedID ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6081:1: ( ruleQualifiedID )
+            // InternalValid.g:6080:1: ( ( ruleQualifiedID ) )
+            // InternalValid.g:6081:1: ( ruleQualifiedID )
             {
              before(grammarAccess.getNativeContextAccess().getMarkerTypeEClassCrossReference_3_1_0()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6082:1: ( ruleQualifiedID )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6083:1: ruleQualifiedID
+            // InternalValid.g:6082:1: ( ruleQualifiedID )
+            // InternalValid.g:6083:1: ruleQualifiedID
             {
              before(grammarAccess.getNativeContextAccess().getMarkerTypeEClassQualifiedIDParserRuleCall_3_1_0_1()); 
-            pushFollow(FOLLOW_ruleQualifiedID_in_rule__NativeContext__MarkerTypeAssignment_3_112534);
+            pushFollow(FOLLOW_2);
             ruleQualifiedID();
 
             state._fsp--;
@@ -16015,24 +16015,24 @@ public final void rule__NativeContext__MarkerTypeAssignment_3_1() throws Recogni
 
 
     // $ANTLR start "rule__NativeContext__MarkerFeatureAssignment_3_2_1"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6094:1: rule__NativeContext__MarkerFeatureAssignment_3_2_1 : ( ( RULE_ID ) ) ;
+    // InternalValid.g:6094:1: rule__NativeContext__MarkerFeatureAssignment_3_2_1 : ( ( RULE_ID ) ) ;
     public final void rule__NativeContext__MarkerFeatureAssignment_3_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6098:1: ( ( ( RULE_ID ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6099:1: ( ( RULE_ID ) )
+            // InternalValid.g:6098:1: ( ( ( RULE_ID ) ) )
+            // InternalValid.g:6099:1: ( ( RULE_ID ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6099:1: ( ( RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6100:1: ( RULE_ID )
+            // InternalValid.g:6099:1: ( ( RULE_ID ) )
+            // InternalValid.g:6100:1: ( RULE_ID )
             {
              before(grammarAccess.getNativeContextAccess().getMarkerFeatureEStructuralFeatureCrossReference_3_2_1_0()); 
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6101:1: ( RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6102:1: RULE_ID
+            // InternalValid.g:6101:1: ( RULE_ID )
+            // InternalValid.g:6102:1: RULE_ID
             {
              before(grammarAccess.getNativeContextAccess().getMarkerFeatureEStructuralFeatureIDTerminalRuleCall_3_2_1_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__NativeContext__MarkerFeatureAssignment_3_2_112573); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getNativeContextAccess().getMarkerFeatureEStructuralFeatureIDTerminalRuleCall_3_2_1_0_1()); 
 
             }
@@ -16060,20 +16060,20 @@ public final void rule__NativeContext__MarkerFeatureAssignment_3_2_1() throws Re
 
 
     // $ANTLR start "rule__NativeContext__QuickFixesAssignment_4_2"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6113:1: rule__NativeContext__QuickFixesAssignment_4_2 : ( ruleQuickFix ) ;
+    // InternalValid.g:6113:1: rule__NativeContext__QuickFixesAssignment_4_2 : ( ruleQuickFix ) ;
     public final void rule__NativeContext__QuickFixesAssignment_4_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6117:1: ( ( ruleQuickFix ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6118:1: ( ruleQuickFix )
+            // InternalValid.g:6117:1: ( ( ruleQuickFix ) )
+            // InternalValid.g:6118:1: ( ruleQuickFix )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6118:1: ( ruleQuickFix )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6119:1: ruleQuickFix
+            // InternalValid.g:6118:1: ( ruleQuickFix )
+            // InternalValid.g:6119:1: ruleQuickFix
             {
              before(grammarAccess.getNativeContextAccess().getQuickFixesQuickFixParserRuleCall_4_2_0()); 
-            pushFollow(FOLLOW_ruleQuickFix_in_rule__NativeContext__QuickFixesAssignment_4_212608);
+            pushFollow(FOLLOW_2);
             ruleQuickFix();
 
             state._fsp--;
@@ -16101,20 +16101,20 @@ public final void rule__NativeContext__QuickFixesAssignment_4_2() throws Recogni
 
 
     // $ANTLR start "rule__QuickFix__QuickFixKindAssignment_0"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6128:1: rule__QuickFix__QuickFixKindAssignment_0 : ( ruleQuickFixKind ) ;
+    // InternalValid.g:6128:1: rule__QuickFix__QuickFixKindAssignment_0 : ( ruleQuickFixKind ) ;
     public final void rule__QuickFix__QuickFixKindAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6132:1: ( ( ruleQuickFixKind ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6133:1: ( ruleQuickFixKind )
+            // InternalValid.g:6132:1: ( ( ruleQuickFixKind ) )
+            // InternalValid.g:6133:1: ( ruleQuickFixKind )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6133:1: ( ruleQuickFixKind )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6134:1: ruleQuickFixKind
+            // InternalValid.g:6133:1: ( ruleQuickFixKind )
+            // InternalValid.g:6134:1: ruleQuickFixKind
             {
              before(grammarAccess.getQuickFixAccess().getQuickFixKindQuickFixKindEnumRuleCall_0_0()); 
-            pushFollow(FOLLOW_ruleQuickFixKind_in_rule__QuickFix__QuickFixKindAssignment_012639);
+            pushFollow(FOLLOW_2);
             ruleQuickFixKind();
 
             state._fsp--;
@@ -16142,20 +16142,20 @@ public final void rule__QuickFix__QuickFixKindAssignment_0() throws RecognitionE
 
 
     // $ANTLR start "rule__QuickFix__NameAssignment_2"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6143:1: rule__QuickFix__NameAssignment_2 : ( RULE_ID ) ;
+    // InternalValid.g:6143:1: rule__QuickFix__NameAssignment_2 : ( RULE_ID ) ;
     public final void rule__QuickFix__NameAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6147:1: ( ( RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6148:1: ( RULE_ID )
+            // InternalValid.g:6147:1: ( ( RULE_ID ) )
+            // InternalValid.g:6148:1: ( RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6148:1: ( RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6149:1: RULE_ID
+            // InternalValid.g:6148:1: ( RULE_ID )
+            // InternalValid.g:6149:1: RULE_ID
             {
              before(grammarAccess.getQuickFixAccess().getNameIDTerminalRuleCall_2_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__QuickFix__NameAssignment_212670); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getQuickFixAccess().getNameIDTerminalRuleCall_2_0()); 
 
             }
@@ -16179,20 +16179,20 @@ public final void rule__QuickFix__NameAssignment_2() throws RecognitionException
 
 
     // $ANTLR start "rule__QuickFix__LabelAssignment_4"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6158:1: rule__QuickFix__LabelAssignment_4 : ( RULE_STRING ) ;
+    // InternalValid.g:6158:1: rule__QuickFix__LabelAssignment_4 : ( RULE_STRING ) ;
     public final void rule__QuickFix__LabelAssignment_4() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6162:1: ( ( RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6163:1: ( RULE_STRING )
+            // InternalValid.g:6162:1: ( ( RULE_STRING ) )
+            // InternalValid.g:6163:1: ( RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6163:1: ( RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6164:1: RULE_STRING
+            // InternalValid.g:6163:1: ( RULE_STRING )
+            // InternalValid.g:6164:1: RULE_STRING
             {
              before(grammarAccess.getQuickFixAccess().getLabelSTRINGTerminalRuleCall_4_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__QuickFix__LabelAssignment_412701); 
+            match(input,RULE_STRING,FOLLOW_2); 
              after(grammarAccess.getQuickFixAccess().getLabelSTRINGTerminalRuleCall_4_0()); 
 
             }
@@ -16216,20 +16216,20 @@ public final void rule__QuickFix__LabelAssignment_4() throws RecognitionExceptio
 
 
     // $ANTLR start "rule__QuickFix__MessageAssignment_6"
-    // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6173:1: rule__QuickFix__MessageAssignment_6 : ( RULE_STRING ) ;
+    // InternalValid.g:6173:1: rule__QuickFix__MessageAssignment_6 : ( RULE_STRING ) ;
     public final void rule__QuickFix__MessageAssignment_6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6177:1: ( ( RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6178:1: ( RULE_STRING )
+            // InternalValid.g:6177:1: ( ( RULE_STRING ) )
+            // InternalValid.g:6178:1: ( RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6178:1: ( RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.valid.ui/src-gen/com/avaloq/tools/ddk/xtext/valid/ui/contentassist/antlr/internal/InternalValid.g:6179:1: RULE_STRING
+            // InternalValid.g:6178:1: ( RULE_STRING )
+            // InternalValid.g:6179:1: RULE_STRING
             {
              before(grammarAccess.getQuickFixAccess().getMessageSTRINGTerminalRuleCall_6_0()); 
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__QuickFix__MessageAssignment_612732); 
+            match(input,RULE_STRING,FOLLOW_2); 
              after(grammarAccess.getQuickFixAccess().getMessageSTRINGTerminalRuleCall_6_0()); 
 
             }
@@ -16256,19 +16256,12 @@ public final void rule__QuickFix__MessageAssignment_6() throws RecognitionExcept
 
     protected DFA1 dfa1 = new DFA1(this);
     protected DFA2 dfa2 = new DFA2(this);
-    static final String DFA1_eotS =
-        "\13\uffff";
-    static final String DFA1_eofS =
-        "\13\uffff";
-    static final String DFA1_minS =
-        "\5\13\2\uffff\4\16";
-    static final String DFA1_maxS =
-        "\5\44\2\uffff\4\35";
-    static final String DFA1_acceptS =
-        "\5\uffff\1\1\1\2\4\uffff";
-    static final String DFA1_specialS =
-        "\13\uffff}>";
-    static final String[] DFA1_transitionS = {
+    static final String dfa_1s = "\13\uffff";
+    static final String dfa_2s = "\5\13\2\uffff\4\16";
+    static final String dfa_3s = "\5\44\2\uffff\4\35";
+    static final String dfa_4s = "\5\uffff\1\1\1\2\4\uffff";
+    static final String dfa_5s = "\13\uffff}>";
+    static final String[] dfa_6s = {
             "\1\2\1\3\1\4\2\5\12\uffff\1\6\1\uffff\2\6\6\uffff\1\1",
             "\1\10\1\11\1\12\2\5\12\uffff\1\6\1\uffff\2\6\6\uffff\1\7",
             "\1\10\1\11\1\12\2\5\12\uffff\1\6\1\uffff\2\6\6\uffff\1\7",
@@ -16282,52 +16275,36 @@ public final void rule__QuickFix__MessageAssignment_6() throws RecognitionExcept
             "\2\5\12\uffff\1\6\1\uffff\2\6"
     };
 
-    static final short[] DFA1_eot = DFA.unpackEncodedString(DFA1_eotS);
-    static final short[] DFA1_eof = DFA.unpackEncodedString(DFA1_eofS);
-    static final char[] DFA1_min = DFA.unpackEncodedStringToUnsignedChars(DFA1_minS);
-    static final char[] DFA1_max = DFA.unpackEncodedStringToUnsignedChars(DFA1_maxS);
-    static final short[] DFA1_accept = DFA.unpackEncodedString(DFA1_acceptS);
-    static final short[] DFA1_special = DFA.unpackEncodedString(DFA1_specialS);
-    static final short[][] DFA1_transition;
-
-    static {
-        int numStates = DFA1_transitionS.length;
-        DFA1_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA1_transition[i] = DFA.unpackEncodedString(DFA1_transitionS[i]);
-        }
-    }
+    static final short[] dfa_1 = DFA.unpackEncodedString(dfa_1s);
+    static final char[] dfa_2 = DFA.unpackEncodedStringToUnsignedChars(dfa_2s);
+    static final char[] dfa_3 = DFA.unpackEncodedStringToUnsignedChars(dfa_3s);
+    static final short[] dfa_4 = DFA.unpackEncodedString(dfa_4s);
+    static final short[] dfa_5 = DFA.unpackEncodedString(dfa_5s);
+    static final short[][] dfa_6 = unpackEncodedStringArray(dfa_6s);
 
     class DFA1 extends DFA {
 
         public DFA1(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 1;
-            this.eot = DFA1_eot;
-            this.eof = DFA1_eof;
-            this.min = DFA1_min;
-            this.max = DFA1_max;
-            this.accept = DFA1_accept;
-            this.special = DFA1_special;
-            this.transition = DFA1_transition;
+            this.eot = dfa_1;
+            this.eof = dfa_1;
+            this.min = dfa_2;
+            this.max = dfa_3;
+            this.accept = dfa_4;
+            this.special = dfa_5;
+            this.transition = dfa_6;
         }
         public String getDescription() {
             return "511:1: rule__Rule__Alternatives : ( ( ruleNativeRule ) | ( rulePredefinedRule ) );";
         }
     }
-    static final String DFA2_eotS =
-        "\14\uffff";
-    static final String DFA2_eofS =
-        "\14\uffff";
-    static final String DFA2_minS =
-        "\5\13\3\uffff\4\32";
-    static final String DFA2_maxS =
-        "\5\44\3\uffff\4\35";
-    static final String DFA2_acceptS =
-        "\5\uffff\1\1\1\2\1\3\4\uffff";
-    static final String DFA2_specialS =
-        "\14\uffff}>";
-    static final String[] DFA2_transitionS = {
+    static final String dfa_7s = "\14\uffff";
+    static final String dfa_8s = "\5\13\3\uffff\4\32";
+    static final String dfa_9s = "\5\44\3\uffff\4\35";
+    static final String dfa_10s = "\5\uffff\1\1\1\2\1\3\4\uffff";
+    static final String dfa_11s = "\14\uffff}>";
+    static final String[] dfa_12s = {
             "\1\2\1\3\1\4\14\uffff\1\5\1\uffff\1\6\1\7\6\uffff\1\1",
             "\1\11\1\12\1\13\14\uffff\1\5\1\uffff\1\6\1\7\6\uffff\1\10",
             "\1\11\1\12\1\13\14\uffff\1\5\1\uffff\1\6\1\7\6\uffff\1\10",
@@ -16342,34 +16319,25 @@ public String getDescription() {
             "\1\5\1\uffff\1\6\1\7"
     };
 
-    static final short[] DFA2_eot = DFA.unpackEncodedString(DFA2_eotS);
-    static final short[] DFA2_eof = DFA.unpackEncodedString(DFA2_eofS);
-    static final char[] DFA2_min = DFA.unpackEncodedStringToUnsignedChars(DFA2_minS);
-    static final char[] DFA2_max = DFA.unpackEncodedStringToUnsignedChars(DFA2_maxS);
-    static final short[] DFA2_accept = DFA.unpackEncodedString(DFA2_acceptS);
-    static final short[] DFA2_special = DFA.unpackEncodedString(DFA2_specialS);
-    static final short[][] DFA2_transition;
-
-    static {
-        int numStates = DFA2_transitionS.length;
-        DFA2_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA2_transition[i] = DFA.unpackEncodedString(DFA2_transitionS[i]);
-        }
-    }
+    static final short[] dfa_7 = DFA.unpackEncodedString(dfa_7s);
+    static final char[] dfa_8 = DFA.unpackEncodedStringToUnsignedChars(dfa_8s);
+    static final char[] dfa_9 = DFA.unpackEncodedStringToUnsignedChars(dfa_9s);
+    static final short[] dfa_10 = DFA.unpackEncodedString(dfa_10s);
+    static final short[] dfa_11 = DFA.unpackEncodedString(dfa_11s);
+    static final short[][] dfa_12 = unpackEncodedStringArray(dfa_12s);
 
     class DFA2 extends DFA {
 
         public DFA2(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 2;
-            this.eot = DFA2_eot;
-            this.eof = DFA2_eof;
-            this.min = DFA2_min;
-            this.max = DFA2_max;
-            this.accept = DFA2_accept;
-            this.special = DFA2_special;
-            this.transition = DFA2_transition;
+            this.eot = dfa_7;
+            this.eof = dfa_7;
+            this.min = dfa_8;
+            this.max = dfa_9;
+            this.accept = dfa_10;
+            this.special = dfa_11;
+            this.transition = dfa_12;
         }
         public String getDescription() {
             return "533:1: rule__PredefinedRule__Alternatives : ( ( ruleSizeRule ) | ( ruleRangeRule ) | ( ruleUniqueRule ) );";
@@ -16377,514 +16345,40 @@ public String getDescription() {
     }
  
 
-    public static final BitSet FOLLOW_ruleValidModel_in_entryRuleValidModel61 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleValidModel68 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ValidModel__Group__0_in_ruleValidModel94 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImport_in_entryRuleImport121 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleImport128 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group__0_in_ruleImport154 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCategory_in_entryRuleCategory181 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleCategory188 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Category__Group__0_in_ruleCategory214 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRule_in_entryRuleRule241 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRule248 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Rule__Alternatives_in_ruleRule274 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePredefinedRule_in_entryRulePredefinedRule301 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRulePredefinedRule308 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__PredefinedRule__Alternatives_in_rulePredefinedRule334 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNativeRule_in_entryRuleNativeRule361 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNativeRule368 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeRule__Group__0_in_ruleNativeRule394 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSizeRule_in_entryRuleSizeRule421 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSizeRule428 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SizeRule__Group__0_in_ruleSizeRule454 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRangeRule_in_entryRuleRangeRule481 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRangeRule488 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RangeRule__Group__0_in_ruleRangeRule514 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleUniqueRule_in_entryRuleUniqueRule541 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleUniqueRule548 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UniqueRule__Group__0_in_ruleUniqueRule574 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleContext_in_entryRuleSimpleContext603 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSimpleContext610 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleContext__Group__0_in_ruleSimpleContext636 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDuplicateContext_in_entryRuleDuplicateContext663 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDuplicateContext670 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DuplicateContext__Group__0_in_ruleDuplicateContext696 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNativeContext_in_entryRuleNativeContext723 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNativeContext730 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeContext__Group__0_in_ruleNativeContext756 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQuickFix_in_entryRuleQuickFix783 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleQuickFix790 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QuickFix__Group__0_in_ruleQuickFix816 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedID_in_entryRuleQualifiedID843 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedID850 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedID__Group__0_in_ruleQualifiedID876 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__CheckKind__Alternatives_in_ruleCheckKind913 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SeverityKind__Alternatives_in_ruleSeverityKind949 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QuickFixKind__Alternatives_in_ruleQuickFixKind985 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNativeRule_in_rule__Rule__Alternatives1020 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePredefinedRule_in_rule__Rule__Alternatives1037 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSizeRule_in_rule__PredefinedRule__Alternatives1069 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRangeRule_in_rule__PredefinedRule__Alternatives1086 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleUniqueRule_in_rule__PredefinedRule__Alternatives1103 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_11_in_rule__CheckKind__Alternatives1137 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_12_in_rule__CheckKind__Alternatives1158 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_13_in_rule__CheckKind__Alternatives1179 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_14_in_rule__SeverityKind__Alternatives1215 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_15_in_rule__SeverityKind__Alternatives1236 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_16_in_rule__QuickFixKind__Alternatives1272 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_17_in_rule__QuickFixKind__Alternatives1293 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ValidModel__Group__0__Impl_in_rule__ValidModel__Group__01326 = new BitSet(new long[]{0x0000000000080000L});
-    public static final BitSet FOLLOW_rule__ValidModel__Group__1_in_rule__ValidModel__Group__01329 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ValidModel__ImportsAssignment_0_in_rule__ValidModel__Group__0__Impl1356 = new BitSet(new long[]{0x0000000000040002L});
-    public static final BitSet FOLLOW_rule__ValidModel__Group__1__Impl_in_rule__ValidModel__Group__11387 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ValidModel__CategoriesAssignment_1_in_rule__ValidModel__Group__1__Impl1414 = new BitSet(new long[]{0x0000000000080002L});
-    public static final BitSet FOLLOW_rule__Import__Group__0__Impl_in_rule__Import__Group__01449 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_rule__Import__Group__1_in_rule__Import__Group__01452 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_18_in_rule__Import__Group__0__Impl1480 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__Group__1__Impl_in_rule__Import__Group__11511 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Import__PackageAssignment_1_in_rule__Import__Group__1__Impl1538 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Category__Group__0__Impl_in_rule__Category__Group__01572 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__Category__Group__1_in_rule__Category__Group__01575 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_rule__Category__Group__0__Impl1603 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Category__Group__1__Impl_in_rule__Category__Group__11634 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_rule__Category__Group__2_in_rule__Category__Group__11637 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Category__NameAssignment_1_in_rule__Category__Group__1__Impl1664 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Category__Group__2__Impl_in_rule__Category__Group__21694 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_rule__Category__Group__3_in_rule__Category__Group__21697 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_20_in_rule__Category__Group__2__Impl1725 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Category__Group__3__Impl_in_rule__Category__Group__31756 = new BitSet(new long[]{0x0000000000A00000L});
-    public static final BitSet FOLLOW_rule__Category__Group__4_in_rule__Category__Group__31759 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Category__LabelAssignment_3_in_rule__Category__Group__3__Impl1786 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Category__Group__4__Impl_in_rule__Category__Group__41816 = new BitSet(new long[]{0x0000000000A00000L});
-    public static final BitSet FOLLOW_rule__Category__Group__5_in_rule__Category__Group__41819 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Category__Group_4__0_in_rule__Category__Group__4__Impl1846 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Category__Group__5__Impl_in_rule__Category__Group__51877 = new BitSet(new long[]{0x0000001000403800L});
-    public static final BitSet FOLLOW_rule__Category__Group__6_in_rule__Category__Group__51880 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_21_in_rule__Category__Group__5__Impl1908 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Category__Group__6__Impl_in_rule__Category__Group__61939 = new BitSet(new long[]{0x0000001000403800L});
-    public static final BitSet FOLLOW_rule__Category__Group__7_in_rule__Category__Group__61942 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Category__RulesAssignment_6_in_rule__Category__Group__6__Impl1969 = new BitSet(new long[]{0x0000001000003802L});
-    public static final BitSet FOLLOW_rule__Category__Group__7__Impl_in_rule__Category__Group__72000 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_22_in_rule__Category__Group__7__Impl2028 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Category__Group_4__0__Impl_in_rule__Category__Group_4__02075 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_rule__Category__Group_4__1_in_rule__Category__Group_4__02078 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_rule__Category__Group_4__0__Impl2106 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Category__Group_4__1__Impl_in_rule__Category__Group_4__12137 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Category__DescriptionAssignment_4_1_in_rule__Category__Group_4__1__Impl2164 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeRule__Group__0__Impl_in_rule__NativeRule__Group__02198 = new BitSet(new long[]{0x000000000000C000L});
-    public static final BitSet FOLLOW_rule__NativeRule__Group__1_in_rule__NativeRule__Group__02201 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeRule__UnorderedGroup_0_in_rule__NativeRule__Group__0__Impl2228 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeRule__Group__1__Impl_in_rule__NativeRule__Group__12258 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__NativeRule__Group__2_in_rule__NativeRule__Group__12261 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeRule__SeverityAssignment_1_in_rule__NativeRule__Group__1__Impl2288 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeRule__Group__2__Impl_in_rule__NativeRule__Group__22318 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_rule__NativeRule__Group__3_in_rule__NativeRule__Group__22321 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeRule__NameAssignment_2_in_rule__NativeRule__Group__2__Impl2348 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeRule__Group__3__Impl_in_rule__NativeRule__Group__32378 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_rule__NativeRule__Group__4_in_rule__NativeRule__Group__32381 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_20_in_rule__NativeRule__Group__3__Impl2409 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeRule__Group__4__Impl_in_rule__NativeRule__Group__42440 = new BitSet(new long[]{0x0000000001800000L});
-    public static final BitSet FOLLOW_rule__NativeRule__Group__5_in_rule__NativeRule__Group__42443 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeRule__LabelAssignment_4_in_rule__NativeRule__Group__4__Impl2470 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeRule__Group__5__Impl_in_rule__NativeRule__Group__52500 = new BitSet(new long[]{0x0000000001800000L});
-    public static final BitSet FOLLOW_rule__NativeRule__Group__6_in_rule__NativeRule__Group__52503 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeRule__Group_5__0_in_rule__NativeRule__Group__5__Impl2530 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeRule__Group__6__Impl_in_rule__NativeRule__Group__62561 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_rule__NativeRule__Group__7_in_rule__NativeRule__Group__62564 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_rule__NativeRule__Group__6__Impl2592 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeRule__Group__7__Impl_in_rule__NativeRule__Group__72623 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_rule__NativeRule__Group__8_in_rule__NativeRule__Group__72626 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeRule__MessageAssignment_7_in_rule__NativeRule__Group__7__Impl2653 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeRule__Group__8__Impl_in_rule__NativeRule__Group__82683 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_rule__NativeRule__Group__9_in_rule__NativeRule__Group__82686 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_25_in_rule__NativeRule__Group__8__Impl2714 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeRule__Group__9__Impl_in_rule__NativeRule__Group__92745 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__NativeRule__Group__10_in_rule__NativeRule__Group__92748 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_21_in_rule__NativeRule__Group__9__Impl2776 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeRule__Group__10__Impl_in_rule__NativeRule__Group__102807 = new BitSet(new long[]{0x0000000000400000L});
-    public static final BitSet FOLLOW_rule__NativeRule__Group__11_in_rule__NativeRule__Group__102810 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeRule__ContextsAssignment_10_in_rule__NativeRule__Group__10__Impl2839 = new BitSet(new long[]{0x0000000000000012L});
-    public static final BitSet FOLLOW_rule__NativeRule__ContextsAssignment_10_in_rule__NativeRule__Group__10__Impl2851 = new BitSet(new long[]{0x0000000000000012L});
-    public static final BitSet FOLLOW_rule__NativeRule__Group__11__Impl_in_rule__NativeRule__Group__112884 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_22_in_rule__NativeRule__Group__11__Impl2912 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeRule__Group_5__0__Impl_in_rule__NativeRule__Group_5__02967 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_rule__NativeRule__Group_5__1_in_rule__NativeRule__Group_5__02970 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_rule__NativeRule__Group_5__0__Impl2998 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeRule__Group_5__1__Impl_in_rule__NativeRule__Group_5__13029 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeRule__DescriptionAssignment_5_1_in_rule__NativeRule__Group_5__1__Impl3056 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SizeRule__Group__0__Impl_in_rule__SizeRule__Group__03090 = new BitSet(new long[]{0x0000000004000000L});
-    public static final BitSet FOLLOW_rule__SizeRule__Group__1_in_rule__SizeRule__Group__03093 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SizeRule__UnorderedGroup_0_in_rule__SizeRule__Group__0__Impl3120 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SizeRule__Group__1__Impl_in_rule__SizeRule__Group__13150 = new BitSet(new long[]{0x000000000000C000L});
-    public static final BitSet FOLLOW_rule__SizeRule__Group__2_in_rule__SizeRule__Group__13153 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_rule__SizeRule__Group__1__Impl3181 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SizeRule__Group__2__Impl_in_rule__SizeRule__Group__23212 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__SizeRule__Group__3_in_rule__SizeRule__Group__23215 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SizeRule__SeverityAssignment_2_in_rule__SizeRule__Group__2__Impl3242 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SizeRule__Group__3__Impl_in_rule__SizeRule__Group__33272 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_rule__SizeRule__Group__4_in_rule__SizeRule__Group__33275 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SizeRule__NameAssignment_3_in_rule__SizeRule__Group__3__Impl3302 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SizeRule__Group__4__Impl_in_rule__SizeRule__Group__43332 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_rule__SizeRule__Group__5_in_rule__SizeRule__Group__43335 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_20_in_rule__SizeRule__Group__4__Impl3363 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SizeRule__Group__5__Impl_in_rule__SizeRule__Group__53394 = new BitSet(new long[]{0x0000000005800000L});
-    public static final BitSet FOLLOW_rule__SizeRule__Group__6_in_rule__SizeRule__Group__53397 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SizeRule__LabelAssignment_5_in_rule__SizeRule__Group__5__Impl3424 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SizeRule__Group__6__Impl_in_rule__SizeRule__Group__63454 = new BitSet(new long[]{0x0000000005800000L});
-    public static final BitSet FOLLOW_rule__SizeRule__Group__7_in_rule__SizeRule__Group__63457 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SizeRule__Group_6__0_in_rule__SizeRule__Group__6__Impl3484 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SizeRule__Group__7__Impl_in_rule__SizeRule__Group__73515 = new BitSet(new long[]{0x0000000005800000L});
-    public static final BitSet FOLLOW_rule__SizeRule__Group__8_in_rule__SizeRule__Group__73518 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SizeRule__Group_7__0_in_rule__SizeRule__Group__7__Impl3545 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SizeRule__Group__8__Impl_in_rule__SizeRule__Group__83576 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__SizeRule__Group__9_in_rule__SizeRule__Group__83579 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_rule__SizeRule__Group__8__Impl3607 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SizeRule__Group__9__Impl_in_rule__SizeRule__Group__93638 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__SizeRule__Group__10_in_rule__SizeRule__Group__93641 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SizeRule__Group_9__0_in_rule__SizeRule__Group__9__Impl3668 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SizeRule__Group__10__Impl_in_rule__SizeRule__Group__103699 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_rule__SizeRule__Group__11_in_rule__SizeRule__Group__103702 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SizeRule__MaxAssignment_10_in_rule__SizeRule__Group__10__Impl3729 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SizeRule__Group__11__Impl_in_rule__SizeRule__Group__113759 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_rule__SizeRule__Group__12_in_rule__SizeRule__Group__113762 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_25_in_rule__SizeRule__Group__11__Impl3790 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SizeRule__Group__12__Impl_in_rule__SizeRule__Group__123821 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__SizeRule__Group__13_in_rule__SizeRule__Group__123824 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_21_in_rule__SizeRule__Group__12__Impl3852 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SizeRule__Group__13__Impl_in_rule__SizeRule__Group__133883 = new BitSet(new long[]{0x0000000000400000L});
-    public static final BitSet FOLLOW_rule__SizeRule__Group__14_in_rule__SizeRule__Group__133886 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SizeRule__ContextsAssignment_13_in_rule__SizeRule__Group__13__Impl3915 = new BitSet(new long[]{0x0000000000000012L});
-    public static final BitSet FOLLOW_rule__SizeRule__ContextsAssignment_13_in_rule__SizeRule__Group__13__Impl3927 = new BitSet(new long[]{0x0000000000000012L});
-    public static final BitSet FOLLOW_rule__SizeRule__Group__14__Impl_in_rule__SizeRule__Group__143960 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_22_in_rule__SizeRule__Group__14__Impl3988 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SizeRule__Group_6__0__Impl_in_rule__SizeRule__Group_6__04049 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_rule__SizeRule__Group_6__1_in_rule__SizeRule__Group_6__04052 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_rule__SizeRule__Group_6__0__Impl4080 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SizeRule__Group_6__1__Impl_in_rule__SizeRule__Group_6__14111 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SizeRule__DescriptionAssignment_6_1_in_rule__SizeRule__Group_6__1__Impl4138 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SizeRule__Group_7__0__Impl_in_rule__SizeRule__Group_7__04172 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_rule__SizeRule__Group_7__1_in_rule__SizeRule__Group_7__04175 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_rule__SizeRule__Group_7__0__Impl4203 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SizeRule__Group_7__1__Impl_in_rule__SizeRule__Group_7__14234 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SizeRule__MessageAssignment_7_1_in_rule__SizeRule__Group_7__1__Impl4261 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SizeRule__Group_9__0__Impl_in_rule__SizeRule__Group_9__04295 = new BitSet(new long[]{0x0000000008000000L});
-    public static final BitSet FOLLOW_rule__SizeRule__Group_9__1_in_rule__SizeRule__Group_9__04298 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SizeRule__MinAssignment_9_0_in_rule__SizeRule__Group_9__0__Impl4325 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SizeRule__Group_9__1__Impl_in_rule__SizeRule__Group_9__14355 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__SizeRule__Group_9__1__Impl4383 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RangeRule__Group__0__Impl_in_rule__RangeRule__Group__04418 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_rule__RangeRule__Group__1_in_rule__RangeRule__Group__04421 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RangeRule__UnorderedGroup_0_in_rule__RangeRule__Group__0__Impl4448 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RangeRule__Group__1__Impl_in_rule__RangeRule__Group__14478 = new BitSet(new long[]{0x000000000000C000L});
-    public static final BitSet FOLLOW_rule__RangeRule__Group__2_in_rule__RangeRule__Group__14481 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__RangeRule__Group__1__Impl4509 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RangeRule__Group__2__Impl_in_rule__RangeRule__Group__24540 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__RangeRule__Group__3_in_rule__RangeRule__Group__24543 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RangeRule__SeverityAssignment_2_in_rule__RangeRule__Group__2__Impl4570 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RangeRule__Group__3__Impl_in_rule__RangeRule__Group__34600 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_rule__RangeRule__Group__4_in_rule__RangeRule__Group__34603 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RangeRule__NameAssignment_3_in_rule__RangeRule__Group__3__Impl4630 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RangeRule__Group__4__Impl_in_rule__RangeRule__Group__44660 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_rule__RangeRule__Group__5_in_rule__RangeRule__Group__44663 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_20_in_rule__RangeRule__Group__4__Impl4691 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RangeRule__Group__5__Impl_in_rule__RangeRule__Group__54722 = new BitSet(new long[]{0x0000000011800000L});
-    public static final BitSet FOLLOW_rule__RangeRule__Group__6_in_rule__RangeRule__Group__54725 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RangeRule__LabelAssignment_5_in_rule__RangeRule__Group__5__Impl4752 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RangeRule__Group__6__Impl_in_rule__RangeRule__Group__64782 = new BitSet(new long[]{0x0000000011800000L});
-    public static final BitSet FOLLOW_rule__RangeRule__Group__7_in_rule__RangeRule__Group__64785 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RangeRule__Group_6__0_in_rule__RangeRule__Group__6__Impl4812 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RangeRule__Group__7__Impl_in_rule__RangeRule__Group__74843 = new BitSet(new long[]{0x0000000011800000L});
-    public static final BitSet FOLLOW_rule__RangeRule__Group__8_in_rule__RangeRule__Group__74846 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RangeRule__Group_7__0_in_rule__RangeRule__Group__7__Impl4873 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RangeRule__Group__8__Impl_in_rule__RangeRule__Group__84904 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__RangeRule__Group__9_in_rule__RangeRule__Group__84907 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__RangeRule__Group__8__Impl4935 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RangeRule__Group__9__Impl_in_rule__RangeRule__Group__94966 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_rule__RangeRule__Group__10_in_rule__RangeRule__Group__94969 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RangeRule__Group_9__0_in_rule__RangeRule__Group__9__Impl4996 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RangeRule__Group__10__Impl_in_rule__RangeRule__Group__105027 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_rule__RangeRule__Group__11_in_rule__RangeRule__Group__105030 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RangeRule__MaxAssignment_10_in_rule__RangeRule__Group__10__Impl5057 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RangeRule__Group__11__Impl_in_rule__RangeRule__Group__115087 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_rule__RangeRule__Group__12_in_rule__RangeRule__Group__115090 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_25_in_rule__RangeRule__Group__11__Impl5118 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RangeRule__Group__12__Impl_in_rule__RangeRule__Group__125149 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__RangeRule__Group__13_in_rule__RangeRule__Group__125152 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_21_in_rule__RangeRule__Group__12__Impl5180 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RangeRule__Group__13__Impl_in_rule__RangeRule__Group__135211 = new BitSet(new long[]{0x0000000000400000L});
-    public static final BitSet FOLLOW_rule__RangeRule__Group__14_in_rule__RangeRule__Group__135214 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RangeRule__ContextsAssignment_13_in_rule__RangeRule__Group__13__Impl5243 = new BitSet(new long[]{0x0000000000000012L});
-    public static final BitSet FOLLOW_rule__RangeRule__ContextsAssignment_13_in_rule__RangeRule__Group__13__Impl5255 = new BitSet(new long[]{0x0000000000000012L});
-    public static final BitSet FOLLOW_rule__RangeRule__Group__14__Impl_in_rule__RangeRule__Group__145288 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_22_in_rule__RangeRule__Group__14__Impl5316 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RangeRule__Group_6__0__Impl_in_rule__RangeRule__Group_6__05377 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_rule__RangeRule__Group_6__1_in_rule__RangeRule__Group_6__05380 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_rule__RangeRule__Group_6__0__Impl5408 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RangeRule__Group_6__1__Impl_in_rule__RangeRule__Group_6__15439 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RangeRule__DescriptionAssignment_6_1_in_rule__RangeRule__Group_6__1__Impl5466 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RangeRule__Group_7__0__Impl_in_rule__RangeRule__Group_7__05500 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_rule__RangeRule__Group_7__1_in_rule__RangeRule__Group_7__05503 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_rule__RangeRule__Group_7__0__Impl5531 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RangeRule__Group_7__1__Impl_in_rule__RangeRule__Group_7__15562 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RangeRule__MessageAssignment_7_1_in_rule__RangeRule__Group_7__1__Impl5589 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RangeRule__Group_9__0__Impl_in_rule__RangeRule__Group_9__05623 = new BitSet(new long[]{0x0000000008000000L});
-    public static final BitSet FOLLOW_rule__RangeRule__Group_9__1_in_rule__RangeRule__Group_9__05626 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RangeRule__MinAssignment_9_0_in_rule__RangeRule__Group_9__0__Impl5653 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RangeRule__Group_9__1__Impl_in_rule__RangeRule__Group_9__15683 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__RangeRule__Group_9__1__Impl5711 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UniqueRule__Group__0__Impl_in_rule__UniqueRule__Group__05746 = new BitSet(new long[]{0x0000000020000000L});
-    public static final BitSet FOLLOW_rule__UniqueRule__Group__1_in_rule__UniqueRule__Group__05749 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UniqueRule__UnorderedGroup_0_in_rule__UniqueRule__Group__0__Impl5776 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UniqueRule__Group__1__Impl_in_rule__UniqueRule__Group__15806 = new BitSet(new long[]{0x000000000000C000L});
-    public static final BitSet FOLLOW_rule__UniqueRule__Group__2_in_rule__UniqueRule__Group__15809 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_rule__UniqueRule__Group__1__Impl5837 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UniqueRule__Group__2__Impl_in_rule__UniqueRule__Group__25868 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__UniqueRule__Group__3_in_rule__UniqueRule__Group__25871 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UniqueRule__SeverityAssignment_2_in_rule__UniqueRule__Group__2__Impl5898 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UniqueRule__Group__3__Impl_in_rule__UniqueRule__Group__35928 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_rule__UniqueRule__Group__4_in_rule__UniqueRule__Group__35931 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UniqueRule__NameAssignment_3_in_rule__UniqueRule__Group__3__Impl5958 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UniqueRule__Group__4__Impl_in_rule__UniqueRule__Group__45988 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_rule__UniqueRule__Group__5_in_rule__UniqueRule__Group__45991 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_20_in_rule__UniqueRule__Group__4__Impl6019 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UniqueRule__Group__5__Impl_in_rule__UniqueRule__Group__56050 = new BitSet(new long[]{0x0000000003800000L});
-    public static final BitSet FOLLOW_rule__UniqueRule__Group__6_in_rule__UniqueRule__Group__56053 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UniqueRule__LabelAssignment_5_in_rule__UniqueRule__Group__5__Impl6080 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UniqueRule__Group__6__Impl_in_rule__UniqueRule__Group__66110 = new BitSet(new long[]{0x0000000003800000L});
-    public static final BitSet FOLLOW_rule__UniqueRule__Group__7_in_rule__UniqueRule__Group__66113 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UniqueRule__Group_6__0_in_rule__UniqueRule__Group__6__Impl6140 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UniqueRule__Group__7__Impl_in_rule__UniqueRule__Group__76171 = new BitSet(new long[]{0x0000000003800000L});
-    public static final BitSet FOLLOW_rule__UniqueRule__Group__8_in_rule__UniqueRule__Group__76174 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UniqueRule__Group_7__0_in_rule__UniqueRule__Group__7__Impl6201 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UniqueRule__Group__8__Impl_in_rule__UniqueRule__Group__86232 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_rule__UniqueRule__Group__9_in_rule__UniqueRule__Group__86235 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_25_in_rule__UniqueRule__Group__8__Impl6263 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UniqueRule__Group__9__Impl_in_rule__UniqueRule__Group__96294 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__UniqueRule__Group__10_in_rule__UniqueRule__Group__96297 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_21_in_rule__UniqueRule__Group__9__Impl6325 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UniqueRule__Group__10__Impl_in_rule__UniqueRule__Group__106356 = new BitSet(new long[]{0x0000000000400000L});
-    public static final BitSet FOLLOW_rule__UniqueRule__Group__11_in_rule__UniqueRule__Group__106359 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UniqueRule__ContextsAssignment_10_in_rule__UniqueRule__Group__10__Impl6388 = new BitSet(new long[]{0x0000000000000012L});
-    public static final BitSet FOLLOW_rule__UniqueRule__ContextsAssignment_10_in_rule__UniqueRule__Group__10__Impl6400 = new BitSet(new long[]{0x0000000000000012L});
-    public static final BitSet FOLLOW_rule__UniqueRule__Group__11__Impl_in_rule__UniqueRule__Group__116433 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_22_in_rule__UniqueRule__Group__11__Impl6461 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UniqueRule__Group_6__0__Impl_in_rule__UniqueRule__Group_6__06516 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_rule__UniqueRule__Group_6__1_in_rule__UniqueRule__Group_6__06519 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_rule__UniqueRule__Group_6__0__Impl6547 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UniqueRule__Group_6__1__Impl_in_rule__UniqueRule__Group_6__16578 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UniqueRule__DescriptionAssignment_6_1_in_rule__UniqueRule__Group_6__1__Impl6605 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UniqueRule__Group_7__0__Impl_in_rule__UniqueRule__Group_7__06639 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_rule__UniqueRule__Group_7__1_in_rule__UniqueRule__Group_7__06642 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_rule__UniqueRule__Group_7__0__Impl6670 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UniqueRule__Group_7__1__Impl_in_rule__UniqueRule__Group_7__16701 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UniqueRule__MessageAssignment_7_1_in_rule__UniqueRule__Group_7__1__Impl6728 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleContext__Group__0__Impl_in_rule__SimpleContext__Group__06762 = new BitSet(new long[]{0x00000000C0000000L});
-    public static final BitSet FOLLOW_rule__SimpleContext__Group__1_in_rule__SimpleContext__Group__06765 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleContext__ContextTypeAssignment_0_in_rule__SimpleContext__Group__0__Impl6792 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleContext__Group__1__Impl_in_rule__SimpleContext__Group__16822 = new BitSet(new long[]{0x00000000C0000000L});
-    public static final BitSet FOLLOW_rule__SimpleContext__Group__2_in_rule__SimpleContext__Group__16825 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleContext__Group_1__0_in_rule__SimpleContext__Group__1__Impl6852 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleContext__Group__2__Impl_in_rule__SimpleContext__Group__26883 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_rule__SimpleContext__Group__2__Impl6911 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleContext__Group_1__0__Impl_in_rule__SimpleContext__Group_1__06948 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__SimpleContext__Group_1__1_in_rule__SimpleContext__Group_1__06951 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_rule__SimpleContext__Group_1__0__Impl6979 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleContext__Group_1__1__Impl_in_rule__SimpleContext__Group_1__17010 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SimpleContext__ContextFeatureAssignment_1_1_in_rule__SimpleContext__Group_1__1__Impl7037 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DuplicateContext__Group__0__Impl_in_rule__DuplicateContext__Group__07071 = new BitSet(new long[]{0x0000000180000000L});
-    public static final BitSet FOLLOW_rule__DuplicateContext__Group__1_in_rule__DuplicateContext__Group__07074 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DuplicateContext__ContextTypeAssignment_0_in_rule__DuplicateContext__Group__0__Impl7101 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DuplicateContext__Group__1__Impl_in_rule__DuplicateContext__Group__17131 = new BitSet(new long[]{0x0000000180000000L});
-    public static final BitSet FOLLOW_rule__DuplicateContext__Group__2_in_rule__DuplicateContext__Group__17134 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DuplicateContext__Group_1__0_in_rule__DuplicateContext__Group__1__Impl7161 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DuplicateContext__Group__2__Impl_in_rule__DuplicateContext__Group__27192 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__DuplicateContext__Group__3_in_rule__DuplicateContext__Group__27195 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_rule__DuplicateContext__Group__2__Impl7223 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DuplicateContext__Group__3__Impl_in_rule__DuplicateContext__Group__37254 = new BitSet(new long[]{0x0000000080000000L});
-    public static final BitSet FOLLOW_rule__DuplicateContext__Group__4_in_rule__DuplicateContext__Group__37257 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DuplicateContext__MarkerTypeAssignment_3_in_rule__DuplicateContext__Group__3__Impl7284 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DuplicateContext__Group__4__Impl_in_rule__DuplicateContext__Group__47314 = new BitSet(new long[]{0x0000000040000010L});
-    public static final BitSet FOLLOW_rule__DuplicateContext__Group__5_in_rule__DuplicateContext__Group__47317 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_rule__DuplicateContext__Group__4__Impl7345 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DuplicateContext__Group__5__Impl_in_rule__DuplicateContext__Group__57376 = new BitSet(new long[]{0x0000000040000010L});
-    public static final BitSet FOLLOW_rule__DuplicateContext__Group__6_in_rule__DuplicateContext__Group__57379 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DuplicateContext__MarkerFeatureAssignment_5_in_rule__DuplicateContext__Group__5__Impl7406 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DuplicateContext__Group__6__Impl_in_rule__DuplicateContext__Group__67437 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_rule__DuplicateContext__Group__6__Impl7465 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DuplicateContext__Group_1__0__Impl_in_rule__DuplicateContext__Group_1__07510 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__DuplicateContext__Group_1__1_in_rule__DuplicateContext__Group_1__07513 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_rule__DuplicateContext__Group_1__0__Impl7541 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DuplicateContext__Group_1__1__Impl_in_rule__DuplicateContext__Group_1__17572 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__DuplicateContext__ContextFeatureAssignment_1_1_in_rule__DuplicateContext__Group_1__1__Impl7599 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeContext__Group__0__Impl_in_rule__NativeContext__Group__07633 = new BitSet(new long[]{0x00000023C0000000L});
-    public static final BitSet FOLLOW_rule__NativeContext__Group__1_in_rule__NativeContext__Group__07636 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeContext__ContextTypeAssignment_0_in_rule__NativeContext__Group__0__Impl7663 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeContext__Group__1__Impl_in_rule__NativeContext__Group__17693 = new BitSet(new long[]{0x00000023C0000000L});
-    public static final BitSet FOLLOW_rule__NativeContext__Group__2_in_rule__NativeContext__Group__17696 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeContext__Group_1__0_in_rule__NativeContext__Group__1__Impl7723 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeContext__Group__2__Impl_in_rule__NativeContext__Group__27754 = new BitSet(new long[]{0x00000023C0000000L});
-    public static final BitSet FOLLOW_rule__NativeContext__Group__3_in_rule__NativeContext__Group__27757 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeContext__Group_2__0_in_rule__NativeContext__Group__2__Impl7784 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeContext__Group__3__Impl_in_rule__NativeContext__Group__37815 = new BitSet(new long[]{0x00000023C0000000L});
-    public static final BitSet FOLLOW_rule__NativeContext__Group__4_in_rule__NativeContext__Group__37818 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeContext__Group_3__0_in_rule__NativeContext__Group__3__Impl7845 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeContext__Group__4__Impl_in_rule__NativeContext__Group__47876 = new BitSet(new long[]{0x00000023C0000000L});
-    public static final BitSet FOLLOW_rule__NativeContext__Group__5_in_rule__NativeContext__Group__47879 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeContext__Group_4__0_in_rule__NativeContext__Group__4__Impl7906 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeContext__Group__5__Impl_in_rule__NativeContext__Group__57937 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_rule__NativeContext__Group__5__Impl7965 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeContext__Group_1__0__Impl_in_rule__NativeContext__Group_1__08008 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__NativeContext__Group_1__1_in_rule__NativeContext__Group_1__08011 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_rule__NativeContext__Group_1__0__Impl8039 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeContext__Group_1__1__Impl_in_rule__NativeContext__Group_1__18070 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeContext__ContextFeatureAssignment_1_1_in_rule__NativeContext__Group_1__1__Impl8097 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeContext__Group_2__0__Impl_in_rule__NativeContext__Group_2__08131 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__NativeContext__Group_2__1_in_rule__NativeContext__Group_2__08134 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeContext__NamedAssignment_2_0_in_rule__NativeContext__Group_2__0__Impl8161 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeContext__Group_2__1__Impl_in_rule__NativeContext__Group_2__18191 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeContext__GivenNameAssignment_2_1_in_rule__NativeContext__Group_2__1__Impl8218 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeContext__Group_3__0__Impl_in_rule__NativeContext__Group_3__08252 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__NativeContext__Group_3__1_in_rule__NativeContext__Group_3__08255 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_rule__NativeContext__Group_3__0__Impl8283 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeContext__Group_3__1__Impl_in_rule__NativeContext__Group_3__18314 = new BitSet(new long[]{0x0000000080000000L});
-    public static final BitSet FOLLOW_rule__NativeContext__Group_3__2_in_rule__NativeContext__Group_3__18317 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeContext__MarkerTypeAssignment_3_1_in_rule__NativeContext__Group_3__1__Impl8344 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeContext__Group_3__2__Impl_in_rule__NativeContext__Group_3__28374 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeContext__Group_3_2__0_in_rule__NativeContext__Group_3__2__Impl8401 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeContext__Group_3_2__0__Impl_in_rule__NativeContext__Group_3_2__08437 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__NativeContext__Group_3_2__1_in_rule__NativeContext__Group_3_2__08440 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_rule__NativeContext__Group_3_2__0__Impl8468 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeContext__Group_3_2__1__Impl_in_rule__NativeContext__Group_3_2__18499 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeContext__MarkerFeatureAssignment_3_2_1_in_rule__NativeContext__Group_3_2__1__Impl8526 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeContext__Group_4__0__Impl_in_rule__NativeContext__Group_4__08560 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_rule__NativeContext__Group_4__1_in_rule__NativeContext__Group_4__08563 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_rule__NativeContext__Group_4__0__Impl8591 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeContext__Group_4__1__Impl_in_rule__NativeContext__Group_4__18622 = new BitSet(new long[]{0x0000000400030000L});
-    public static final BitSet FOLLOW_rule__NativeContext__Group_4__2_in_rule__NativeContext__Group_4__18625 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_21_in_rule__NativeContext__Group_4__1__Impl8653 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeContext__Group_4__2__Impl_in_rule__NativeContext__Group_4__28684 = new BitSet(new long[]{0x0000000000400000L});
-    public static final BitSet FOLLOW_rule__NativeContext__Group_4__3_in_rule__NativeContext__Group_4__28687 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeContext__QuickFixesAssignment_4_2_in_rule__NativeContext__Group_4__2__Impl8716 = new BitSet(new long[]{0x0000000400030002L});
-    public static final BitSet FOLLOW_rule__NativeContext__QuickFixesAssignment_4_2_in_rule__NativeContext__Group_4__2__Impl8728 = new BitSet(new long[]{0x0000000400030002L});
-    public static final BitSet FOLLOW_rule__NativeContext__Group_4__3__Impl_in_rule__NativeContext__Group_4__38761 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_22_in_rule__NativeContext__Group_4__3__Impl8789 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QuickFix__Group__0__Impl_in_rule__QuickFix__Group__08828 = new BitSet(new long[]{0x0000000400030000L});
-    public static final BitSet FOLLOW_rule__QuickFix__Group__1_in_rule__QuickFix__Group__08831 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QuickFix__QuickFixKindAssignment_0_in_rule__QuickFix__Group__0__Impl8858 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QuickFix__Group__1__Impl_in_rule__QuickFix__Group__18889 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__QuickFix__Group__2_in_rule__QuickFix__Group__18892 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_34_in_rule__QuickFix__Group__1__Impl8920 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QuickFix__Group__2__Impl_in_rule__QuickFix__Group__28951 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_rule__QuickFix__Group__3_in_rule__QuickFix__Group__28954 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QuickFix__NameAssignment_2_in_rule__QuickFix__Group__2__Impl8981 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QuickFix__Group__3__Impl_in_rule__QuickFix__Group__39011 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_rule__QuickFix__Group__4_in_rule__QuickFix__Group__39014 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_20_in_rule__QuickFix__Group__3__Impl9042 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QuickFix__Group__4__Impl_in_rule__QuickFix__Group__49073 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_rule__QuickFix__Group__5_in_rule__QuickFix__Group__49076 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QuickFix__LabelAssignment_4_in_rule__QuickFix__Group__4__Impl9103 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QuickFix__Group__5__Impl_in_rule__QuickFix__Group__59133 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_rule__QuickFix__Group__6_in_rule__QuickFix__Group__59136 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_rule__QuickFix__Group__5__Impl9164 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QuickFix__Group__6__Impl_in_rule__QuickFix__Group__69195 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_rule__QuickFix__Group__7_in_rule__QuickFix__Group__69198 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QuickFix__MessageAssignment_6_in_rule__QuickFix__Group__6__Impl9225 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QuickFix__Group__7__Impl_in_rule__QuickFix__Group__79255 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_rule__QuickFix__Group__7__Impl9283 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedID__Group__0__Impl_in_rule__QualifiedID__Group__09330 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__QualifiedID__Group__1_in_rule__QualifiedID__Group__09333 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedID__Group_0__0_in_rule__QualifiedID__Group__0__Impl9360 = new BitSet(new long[]{0x0000000000000012L});
-    public static final BitSet FOLLOW_rule__QualifiedID__Group__1__Impl_in_rule__QualifiedID__Group__19391 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__QualifiedID__Group__1__Impl9418 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedID__Group_0__0__Impl_in_rule__QualifiedID__Group_0__09451 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_rule__QualifiedID__Group_0__1_in_rule__QualifiedID__Group_0__09454 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__QualifiedID__Group_0__0__Impl9481 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedID__Group_0__1__Impl_in_rule__QualifiedID__Group_0__19510 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_35_in_rule__QualifiedID__Group_0__1__Impl9538 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeRule__UnorderedGroup_0__0_in_rule__NativeRule__UnorderedGroup_09574 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeRule__OptionalAssignment_0_0_in_rule__NativeRule__UnorderedGroup_0__Impl9661 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeRule__CheckKindAssignment_0_1_in_rule__NativeRule__UnorderedGroup_0__Impl9752 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeRule__UnorderedGroup_0__Impl_in_rule__NativeRule__UnorderedGroup_0__09811 = new BitSet(new long[]{0x0000001000003802L});
-    public static final BitSet FOLLOW_rule__NativeRule__UnorderedGroup_0__1_in_rule__NativeRule__UnorderedGroup_0__09814 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NativeRule__UnorderedGroup_0__Impl_in_rule__NativeRule__UnorderedGroup_0__19839 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SizeRule__UnorderedGroup_0__0_in_rule__SizeRule__UnorderedGroup_09867 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SizeRule__OptionalAssignment_0_0_in_rule__SizeRule__UnorderedGroup_0__Impl9954 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SizeRule__CheckKindAssignment_0_1_in_rule__SizeRule__UnorderedGroup_0__Impl10045 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SizeRule__UnorderedGroup_0__Impl_in_rule__SizeRule__UnorderedGroup_0__010104 = new BitSet(new long[]{0x0000001000003802L});
-    public static final BitSet FOLLOW_rule__SizeRule__UnorderedGroup_0__1_in_rule__SizeRule__UnorderedGroup_0__010107 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__SizeRule__UnorderedGroup_0__Impl_in_rule__SizeRule__UnorderedGroup_0__110132 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RangeRule__UnorderedGroup_0__0_in_rule__RangeRule__UnorderedGroup_010160 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RangeRule__OptionalAssignment_0_0_in_rule__RangeRule__UnorderedGroup_0__Impl10247 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RangeRule__CheckKindAssignment_0_1_in_rule__RangeRule__UnorderedGroup_0__Impl10338 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RangeRule__UnorderedGroup_0__Impl_in_rule__RangeRule__UnorderedGroup_0__010397 = new BitSet(new long[]{0x0000001000003802L});
-    public static final BitSet FOLLOW_rule__RangeRule__UnorderedGroup_0__1_in_rule__RangeRule__UnorderedGroup_0__010400 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RangeRule__UnorderedGroup_0__Impl_in_rule__RangeRule__UnorderedGroup_0__110425 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UniqueRule__UnorderedGroup_0__0_in_rule__UniqueRule__UnorderedGroup_010453 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UniqueRule__OptionalAssignment_0_0_in_rule__UniqueRule__UnorderedGroup_0__Impl10540 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UniqueRule__CheckKindAssignment_0_1_in_rule__UniqueRule__UnorderedGroup_0__Impl10631 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UniqueRule__UnorderedGroup_0__Impl_in_rule__UniqueRule__UnorderedGroup_0__010690 = new BitSet(new long[]{0x0000001000003802L});
-    public static final BitSet FOLLOW_rule__UniqueRule__UnorderedGroup_0__1_in_rule__UniqueRule__UnorderedGroup_0__010693 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__UniqueRule__UnorderedGroup_0__Impl_in_rule__UniqueRule__UnorderedGroup_0__110718 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImport_in_rule__ValidModel__ImportsAssignment_010750 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCategory_in_rule__ValidModel__CategoriesAssignment_110781 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__Import__PackageAssignment_110816 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__Category__NameAssignment_110851 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__Category__LabelAssignment_310882 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__Category__DescriptionAssignment_4_110913 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRule_in_rule__Category__RulesAssignment_610944 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_rule__NativeRule__OptionalAssignment_0_010980 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCheckKind_in_rule__NativeRule__CheckKindAssignment_0_111019 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSeverityKind_in_rule__NativeRule__SeverityAssignment_111050 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__NativeRule__NameAssignment_211081 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__NativeRule__LabelAssignment_411112 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__NativeRule__DescriptionAssignment_5_111143 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__NativeRule__MessageAssignment_711174 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNativeContext_in_rule__NativeRule__ContextsAssignment_1011205 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_rule__SizeRule__OptionalAssignment_0_011241 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCheckKind_in_rule__SizeRule__CheckKindAssignment_0_111280 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSeverityKind_in_rule__SizeRule__SeverityAssignment_211311 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__SizeRule__NameAssignment_311342 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__SizeRule__LabelAssignment_511373 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__SizeRule__DescriptionAssignment_6_111404 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__SizeRule__MessageAssignment_7_111435 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__SizeRule__MinAssignment_9_011466 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__SizeRule__MaxAssignment_1011497 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleContext_in_rule__SizeRule__ContextsAssignment_1311528 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_rule__RangeRule__OptionalAssignment_0_011564 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCheckKind_in_rule__RangeRule__CheckKindAssignment_0_111603 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSeverityKind_in_rule__RangeRule__SeverityAssignment_211634 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__RangeRule__NameAssignment_311665 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__RangeRule__LabelAssignment_511696 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__RangeRule__DescriptionAssignment_6_111727 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__RangeRule__MessageAssignment_7_111758 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__RangeRule__MinAssignment_9_011789 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_INT_in_rule__RangeRule__MaxAssignment_1011820 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleContext_in_rule__RangeRule__ContextsAssignment_1311851 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_rule__UniqueRule__OptionalAssignment_0_011887 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCheckKind_in_rule__UniqueRule__CheckKindAssignment_0_111926 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSeverityKind_in_rule__UniqueRule__SeverityAssignment_211957 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__UniqueRule__NameAssignment_311988 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__UniqueRule__LabelAssignment_512019 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__UniqueRule__DescriptionAssignment_6_112050 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__UniqueRule__MessageAssignment_7_112081 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDuplicateContext_in_rule__UniqueRule__ContextsAssignment_1012112 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedID_in_rule__SimpleContext__ContextTypeAssignment_012147 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__SimpleContext__ContextFeatureAssignment_1_112186 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedID_in_rule__DuplicateContext__ContextTypeAssignment_012225 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__DuplicateContext__ContextFeatureAssignment_1_112264 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedID_in_rule__DuplicateContext__MarkerTypeAssignment_312303 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__DuplicateContext__MarkerFeatureAssignment_512342 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedID_in_rule__NativeContext__ContextTypeAssignment_012381 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__NativeContext__ContextFeatureAssignment_1_112420 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_37_in_rule__NativeContext__NamedAssignment_2_012460 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__NativeContext__GivenNameAssignment_2_112499 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedID_in_rule__NativeContext__MarkerTypeAssignment_3_112534 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__NativeContext__MarkerFeatureAssignment_3_2_112573 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQuickFix_in_rule__NativeContext__QuickFixesAssignment_4_212608 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQuickFixKind_in_rule__QuickFix__QuickFixKindAssignment_012639 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__QuickFix__NameAssignment_212670 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__QuickFix__LabelAssignment_412701 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__QuickFix__MessageAssignment_612732 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_1 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_2 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x0000000000080000L});
+    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000000000040002L});
+    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0000000000080002L});
+    public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000000000100000L});
+    public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000000A00000L});
+    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000001000403800L});
+    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000001000003802L});
+    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x000000000000C000L});
+    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000001800000L});
+    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000000200000L});
+    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000000000400000L});
+    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000000000012L});
+    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000004000000L});
+    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000005800000L});
+    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000000000000040L});
+    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000000008000000L});
+    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000000010000000L});
+    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000000011800000L});
+    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0000000020000000L});
+    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000000003800000L});
+    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x00000000C0000000L});
+    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0000000180000000L});
+    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0000000080000000L});
+    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000000040000010L});
+    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x00000023C0000000L});
+    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000000400030000L});
+    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0000000400030002L});
+    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0000000001000000L});
+    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0000000040000000L});
+    public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x0000000800000000L});
 
 }
diff --git a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/ValidStandaloneSetupGenerated.java b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/ValidStandaloneSetupGenerated.java
index 189d99446..f8e1e0895 100644
--- a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/ValidStandaloneSetupGenerated.java
+++ b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/ValidStandaloneSetupGenerated.java
@@ -4,8 +4,8 @@
 package com.avaloq.tools.ddk.xtext.valid;
 
 import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.xtext.ISetup;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.xtext.ISetup;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
diff --git a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g
index b1d6770fb..c6cf2d041 100644
--- a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g
+++ b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g
@@ -91,7 +91,7 @@ ruleValidModel returns [EObject current=null]
        			$current, 
        			"imports",
         		lv_imports_0_0, 
-        		"Import");
+        		"com.avaloq.tools.ddk.xtext.valid.Valid.Import");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -109,7 +109,7 @@ ruleValidModel returns [EObject current=null]
        			$current, 
        			"categories",
         		lv_categories_1_0, 
-        		"Category");
+        		"com.avaloq.tools.ddk.xtext.valid.Valid.Category");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -191,7 +191,7 @@ ruleCategory returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -213,7 +213,7 @@ ruleCategory returns [EObject current=null]
        			$current, 
        			"label",
         		lv_label_3_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -235,7 +235,7 @@ ruleCategory returns [EObject current=null]
        			$current, 
        			"description",
         		lv_description_5_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -256,7 +256,7 @@ ruleCategory returns [EObject current=null]
        			$current, 
        			"rules",
         		lv_rules_7_0, 
-        		"Rule");
+        		"com.avaloq.tools.ddk.xtext.valid.Valid.Rule");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -430,7 +430,7 @@ ruleNativeRule returns [EObject current=null]
        			$current, 
        			"checkKind",
         		lv_checkKind_2_0, 
-        		"CheckKind");
+        		"com.avaloq.tools.ddk.xtext.valid.Valid.CheckKind");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -462,7 +462,7 @@ ruleNativeRule returns [EObject current=null]
        			$current, 
        			"severity",
         		lv_severity_3_0, 
-        		"SeverityKind");
+        		"com.avaloq.tools.ddk.xtext.valid.Valid.SeverityKind");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -481,7 +481,7 @@ ruleNativeRule returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_4_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -503,7 +503,7 @@ ruleNativeRule returns [EObject current=null]
        			$current, 
        			"label",
         		lv_label_6_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -525,7 +525,7 @@ ruleNativeRule returns [EObject current=null]
        			$current, 
        			"description",
         		lv_description_8_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -547,7 +547,7 @@ ruleNativeRule returns [EObject current=null]
        			$current, 
        			"message",
         		lv_message_10_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -572,7 +572,7 @@ ruleNativeRule returns [EObject current=null]
        			$current, 
        			"contexts",
         		lv_contexts_13_0, 
-        		"NativeContext");
+        		"com.avaloq.tools.ddk.xtext.valid.Valid.NativeContext");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -656,7 +656,7 @@ ruleSizeRule returns [EObject current=null]
        			$current, 
        			"checkKind",
         		lv_checkKind_2_0, 
-        		"CheckKind");
+        		"com.avaloq.tools.ddk.xtext.valid.Valid.CheckKind");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -692,7 +692,7 @@ ruleSizeRule returns [EObject current=null]
        			$current, 
        			"severity",
         		lv_severity_4_0, 
-        		"SeverityKind");
+        		"com.avaloq.tools.ddk.xtext.valid.Valid.SeverityKind");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -711,7 +711,7 @@ ruleSizeRule returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_5_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -733,7 +733,7 @@ ruleSizeRule returns [EObject current=null]
        			$current, 
        			"label",
         		lv_label_7_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -755,7 +755,7 @@ ruleSizeRule returns [EObject current=null]
        			$current, 
        			"description",
         		lv_description_9_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -777,7 +777,7 @@ ruleSizeRule returns [EObject current=null]
        			$current, 
        			"message",
         		lv_message_11_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -799,7 +799,7 @@ ruleSizeRule returns [EObject current=null]
        			$current, 
        			"min",
         		lv_min_13_0, 
-        		"INT");
+        		"org.eclipse.xtext.common.Terminals.INT");
 	    }
 
 )
@@ -821,7 +821,7 @@ ruleSizeRule returns [EObject current=null]
        			$current, 
        			"max",
         		lv_max_15_0, 
-        		"INT");
+        		"org.eclipse.xtext.common.Terminals.INT");
 	    }
 
 )
@@ -846,7 +846,7 @@ ruleSizeRule returns [EObject current=null]
        			$current, 
        			"contexts",
         		lv_contexts_18_0, 
-        		"SimpleContext");
+        		"com.avaloq.tools.ddk.xtext.valid.Valid.SimpleContext");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -930,7 +930,7 @@ ruleRangeRule returns [EObject current=null]
        			$current, 
        			"checkKind",
         		lv_checkKind_2_0, 
-        		"CheckKind");
+        		"com.avaloq.tools.ddk.xtext.valid.Valid.CheckKind");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -966,7 +966,7 @@ ruleRangeRule returns [EObject current=null]
        			$current, 
        			"severity",
         		lv_severity_4_0, 
-        		"SeverityKind");
+        		"com.avaloq.tools.ddk.xtext.valid.Valid.SeverityKind");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -985,7 +985,7 @@ ruleRangeRule returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_5_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -1007,7 +1007,7 @@ ruleRangeRule returns [EObject current=null]
        			$current, 
        			"label",
         		lv_label_7_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -1029,7 +1029,7 @@ ruleRangeRule returns [EObject current=null]
        			$current, 
        			"description",
         		lv_description_9_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -1051,7 +1051,7 @@ ruleRangeRule returns [EObject current=null]
        			$current, 
        			"message",
         		lv_message_11_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -1073,7 +1073,7 @@ ruleRangeRule returns [EObject current=null]
        			$current, 
        			"min",
         		lv_min_13_0, 
-        		"INT");
+        		"org.eclipse.xtext.common.Terminals.INT");
 	    }
 
 )
@@ -1095,7 +1095,7 @@ ruleRangeRule returns [EObject current=null]
        			$current, 
        			"max",
         		lv_max_15_0, 
-        		"INT");
+        		"org.eclipse.xtext.common.Terminals.INT");
 	    }
 
 )
@@ -1120,7 +1120,7 @@ ruleRangeRule returns [EObject current=null]
        			$current, 
        			"contexts",
         		lv_contexts_18_0, 
-        		"SimpleContext");
+        		"com.avaloq.tools.ddk.xtext.valid.Valid.SimpleContext");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1204,7 +1204,7 @@ ruleUniqueRule returns [EObject current=null]
        			$current, 
        			"checkKind",
         		lv_checkKind_2_0, 
-        		"CheckKind");
+        		"com.avaloq.tools.ddk.xtext.valid.Valid.CheckKind");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1240,7 +1240,7 @@ ruleUniqueRule returns [EObject current=null]
        			$current, 
        			"severity",
         		lv_severity_4_0, 
-        		"SeverityKind");
+        		"com.avaloq.tools.ddk.xtext.valid.Valid.SeverityKind");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1259,7 +1259,7 @@ ruleUniqueRule returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_5_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -1281,7 +1281,7 @@ ruleUniqueRule returns [EObject current=null]
        			$current, 
        			"label",
         		lv_label_7_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -1303,7 +1303,7 @@ ruleUniqueRule returns [EObject current=null]
        			$current, 
        			"description",
         		lv_description_9_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -1325,7 +1325,7 @@ ruleUniqueRule returns [EObject current=null]
        			$current, 
        			"message",
         		lv_message_11_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -1350,7 +1350,7 @@ ruleUniqueRule returns [EObject current=null]
        			$current, 
        			"contexts",
         		lv_contexts_14_0, 
-        		"DuplicateContext");
+        		"com.avaloq.tools.ddk.xtext.valid.Valid.DuplicateContext");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1593,7 +1593,7 @@ ruleNativeContext returns [EObject current=null]
        			$current, 
        			"givenName",
         		lv_givenName_4_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -1654,7 +1654,7 @@ ruleNativeContext returns [EObject current=null]
        			$current, 
        			"quickFixes",
         		lv_quickFixes_11_0, 
-        		"QuickFix");
+        		"com.avaloq.tools.ddk.xtext.valid.Valid.QuickFix");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1701,7 +1701,7 @@ ruleQuickFix returns [EObject current=null]
        			$current, 
        			"quickFixKind",
         		lv_quickFixKind_0_0, 
-        		"QuickFixKind");
+        		"com.avaloq.tools.ddk.xtext.valid.Valid.QuickFixKind");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -1724,7 +1724,7 @@ ruleQuickFix returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_2_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
@@ -1746,7 +1746,7 @@ ruleQuickFix returns [EObject current=null]
        			$current, 
        			"label",
         		lv_label_4_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
@@ -1768,7 +1768,7 @@ ruleQuickFix returns [EObject current=null]
        			$current, 
        			"message",
         		lv_message_6_0, 
-        		"STRING");
+        		"org.eclipse.xtext.common.Terminals.STRING");
 	    }
 
 )
diff --git a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValidLexer.java b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValidLexer.java
index 50676283e..1000a6faf 100644
--- a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValidLexer.java
+++ b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValidLexer.java
@@ -59,15 +59,15 @@ public InternalValidLexer(CharStream input, RecognizerSharedState state) {
         super(input,state);
 
     }
-    public String getGrammarFileName() { return "../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g"; }
+    public String getGrammarFileName() { return "InternalValid.g"; }
 
     // $ANTLR start "T__11"
     public final void mT__11() throws RecognitionException {
         try {
             int _type = T__11;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:11:7: ( 'import' )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:11:9: 'import'
+            // InternalValid.g:11:7: ( 'import' )
+            // InternalValid.g:11:9: 'import'
             {
             match("import"); 
 
@@ -87,8 +87,8 @@ public final void mT__12() throws RecognitionException {
         try {
             int _type = T__12;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:12:7: ( 'category' )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:12:9: 'category'
+            // InternalValid.g:12:7: ( 'category' )
+            // InternalValid.g:12:9: 'category'
             {
             match("category"); 
 
@@ -108,8 +108,8 @@ public final void mT__13() throws RecognitionException {
         try {
             int _type = T__13;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:13:7: ( 'label' )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:13:9: 'label'
+            // InternalValid.g:13:7: ( 'label' )
+            // InternalValid.g:13:9: 'label'
             {
             match("label"); 
 
@@ -129,8 +129,8 @@ public final void mT__14() throws RecognitionException {
         try {
             int _type = T__14;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:14:7: ( 'description' )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:14:9: 'description'
+            // InternalValid.g:14:7: ( 'description' )
+            // InternalValid.g:14:9: 'description'
             {
             match("description"); 
 
@@ -150,8 +150,8 @@ public final void mT__15() throws RecognitionException {
         try {
             int _type = T__15;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:15:7: ( '{' )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:15:9: '{'
+            // InternalValid.g:15:7: ( '{' )
+            // InternalValid.g:15:9: '{'
             {
             match('{'); 
 
@@ -170,8 +170,8 @@ public final void mT__16() throws RecognitionException {
         try {
             int _type = T__16;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:16:7: ( '}' )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:16:9: '}'
+            // InternalValid.g:16:7: ( '}' )
+            // InternalValid.g:16:9: '}'
             {
             match('}'); 
 
@@ -190,8 +190,8 @@ public final void mT__17() throws RecognitionException {
         try {
             int _type = T__17;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:17:7: ( 'optional' )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:17:9: 'optional'
+            // InternalValid.g:17:7: ( 'optional' )
+            // InternalValid.g:17:9: 'optional'
             {
             match("optional"); 
 
@@ -211,8 +211,8 @@ public final void mT__18() throws RecognitionException {
         try {
             int _type = T__18;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:18:7: ( 'message' )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:18:9: 'message'
+            // InternalValid.g:18:7: ( 'message' )
+            // InternalValid.g:18:9: 'message'
             {
             match("message"); 
 
@@ -232,8 +232,8 @@ public final void mT__19() throws RecognitionException {
         try {
             int _type = T__19;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:19:7: ( 'context' )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:19:9: 'context'
+            // InternalValid.g:19:7: ( 'context' )
+            // InternalValid.g:19:9: 'context'
             {
             match("context"); 
 
@@ -253,8 +253,8 @@ public final void mT__20() throws RecognitionException {
         try {
             int _type = T__20;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:20:7: ( 'size' )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:20:9: 'size'
+            // InternalValid.g:20:7: ( 'size' )
+            // InternalValid.g:20:9: 'size'
             {
             match("size"); 
 
@@ -274,8 +274,8 @@ public final void mT__21() throws RecognitionException {
         try {
             int _type = T__21;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:21:7: ( '..' )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:21:9: '..'
+            // InternalValid.g:21:7: ( '..' )
+            // InternalValid.g:21:9: '..'
             {
             match(".."); 
 
@@ -295,8 +295,8 @@ public final void mT__22() throws RecognitionException {
         try {
             int _type = T__22;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:22:7: ( 'range' )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:22:9: 'range'
+            // InternalValid.g:22:7: ( 'range' )
+            // InternalValid.g:22:9: 'range'
             {
             match("range"); 
 
@@ -316,8 +316,8 @@ public final void mT__23() throws RecognitionException {
         try {
             int _type = T__23;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:23:7: ( 'unique' )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:23:9: 'unique'
+            // InternalValid.g:23:7: ( 'unique' )
+            // InternalValid.g:23:9: 'unique'
             {
             match("unique"); 
 
@@ -337,8 +337,8 @@ public final void mT__24() throws RecognitionException {
         try {
             int _type = T__24;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:24:7: ( '#' )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:24:9: '#'
+            // InternalValid.g:24:7: ( '#' )
+            // InternalValid.g:24:9: '#'
             {
             match('#'); 
 
@@ -357,8 +357,8 @@ public final void mT__25() throws RecognitionException {
         try {
             int _type = T__25;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:25:7: ( ';' )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:25:9: ';'
+            // InternalValid.g:25:7: ( ';' )
+            // InternalValid.g:25:9: ';'
             {
             match(';'); 
 
@@ -377,8 +377,8 @@ public final void mT__26() throws RecognitionException {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:26:7: ( 'marker' )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:26:9: 'marker'
+            // InternalValid.g:26:7: ( 'marker' )
+            // InternalValid.g:26:9: 'marker'
             {
             match("marker"); 
 
@@ -398,8 +398,8 @@ public final void mT__27() throws RecognitionException {
         try {
             int _type = T__27;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:27:7: ( 'as' )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:27:9: 'as'
+            // InternalValid.g:27:7: ( 'as' )
+            // InternalValid.g:27:9: 'as'
             {
             match("as"); 
 
@@ -419,8 +419,8 @@ public final void mT__28() throws RecognitionException {
         try {
             int _type = T__28;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:28:7: ( 'quickfixes' )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:28:9: 'quickfixes'
+            // InternalValid.g:28:7: ( 'quickfixes' )
+            // InternalValid.g:28:9: 'quickfixes'
             {
             match("quickfixes"); 
 
@@ -440,8 +440,8 @@ public final void mT__29() throws RecognitionException {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:29:7: ( 'fix' )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:29:9: 'fix'
+            // InternalValid.g:29:7: ( 'fix' )
+            // InternalValid.g:29:9: 'fix'
             {
             match("fix"); 
 
@@ -461,8 +461,8 @@ public final void mT__30() throws RecognitionException {
         try {
             int _type = T__30;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:30:7: ( '::' )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:30:9: '::'
+            // InternalValid.g:30:7: ( '::' )
+            // InternalValid.g:30:9: '::'
             {
             match("::"); 
 
@@ -482,8 +482,8 @@ public final void mT__31() throws RecognitionException {
         try {
             int _type = T__31;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:31:7: ( 'fast' )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:31:9: 'fast'
+            // InternalValid.g:31:7: ( 'fast' )
+            // InternalValid.g:31:9: 'fast'
             {
             match("fast"); 
 
@@ -503,8 +503,8 @@ public final void mT__32() throws RecognitionException {
         try {
             int _type = T__32;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:32:7: ( 'normal' )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:32:9: 'normal'
+            // InternalValid.g:32:7: ( 'normal' )
+            // InternalValid.g:32:9: 'normal'
             {
             match("normal"); 
 
@@ -524,8 +524,8 @@ public final void mT__33() throws RecognitionException {
         try {
             int _type = T__33;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:33:7: ( 'expensive' )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:33:9: 'expensive'
+            // InternalValid.g:33:7: ( 'expensive' )
+            // InternalValid.g:33:9: 'expensive'
             {
             match("expensive"); 
 
@@ -545,8 +545,8 @@ public final void mT__34() throws RecognitionException {
         try {
             int _type = T__34;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:34:7: ( 'error' )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:34:9: 'error'
+            // InternalValid.g:34:7: ( 'error' )
+            // InternalValid.g:34:9: 'error'
             {
             match("error"); 
 
@@ -566,8 +566,8 @@ public final void mT__35() throws RecognitionException {
         try {
             int _type = T__35;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:35:7: ( 'warning' )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:35:9: 'warning'
+            // InternalValid.g:35:7: ( 'warning' )
+            // InternalValid.g:35:9: 'warning'
             {
             match("warning"); 
 
@@ -587,8 +587,8 @@ public final void mT__36() throws RecognitionException {
         try {
             int _type = T__36;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:36:7: ( 'semantic' )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:36:9: 'semantic'
+            // InternalValid.g:36:7: ( 'semantic' )
+            // InternalValid.g:36:9: 'semantic'
             {
             match("semantic"); 
 
@@ -608,8 +608,8 @@ public final void mT__37() throws RecognitionException {
         try {
             int _type = T__37;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:37:7: ( 'textual' )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:37:9: 'textual'
+            // InternalValid.g:37:7: ( 'textual' )
+            // InternalValid.g:37:9: 'textual'
             {
             match("textual"); 
 
@@ -629,10 +629,10 @@ public final void mRULE_ID() throws RecognitionException {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1890:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1890:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalValid.g:1890:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+            // InternalValid.g:1890:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1890:11: ( '^' )?
+            // InternalValid.g:1890:11: ( '^' )?
             int alt1=2;
             int LA1_0 = input.LA(1);
 
@@ -641,7 +641,7 @@ public final void mRULE_ID() throws RecognitionException {
             }
             switch (alt1) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1890:11: '^'
+                    // InternalValid.g:1890:11: '^'
                     {
                     match('^'); 
 
@@ -659,7 +659,7 @@ public final void mRULE_ID() throws RecognitionException {
                 recover(mse);
                 throw mse;}
 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1890:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalValid.g:1890:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             loop2:
             do {
                 int alt2=2;
@@ -672,7 +672,7 @@ public final void mRULE_ID() throws RecognitionException {
 
                 switch (alt2) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:
+            	    // InternalValid.g:
             	    {
             	    if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
             	        input.consume();
@@ -708,10 +708,10 @@ public final void mRULE_INT() throws RecognitionException {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1892:10: ( ( '0' .. '9' )+ )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1892:12: ( '0' .. '9' )+
+            // InternalValid.g:1892:10: ( ( '0' .. '9' )+ )
+            // InternalValid.g:1892:12: ( '0' .. '9' )+
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1892:12: ( '0' .. '9' )+
+            // InternalValid.g:1892:12: ( '0' .. '9' )+
             int cnt3=0;
             loop3:
             do {
@@ -725,7 +725,7 @@ public final void mRULE_INT() throws RecognitionException {
 
                 switch (alt3) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1892:13: '0' .. '9'
+            	    // InternalValid.g:1892:13: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -757,10 +757,10 @@ public final void mRULE_STRING() throws RecognitionException {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1894:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1894:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalValid.g:1894:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+            // InternalValid.g:1894:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1894:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalValid.g:1894:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             int alt6=2;
             int LA6_0 = input.LA(1);
 
@@ -778,10 +778,10 @@ else if ( (LA6_0=='\'') ) {
             }
             switch (alt6) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1894:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+                    // InternalValid.g:1894:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
                     {
                     match('\"'); 
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1894:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // InternalValid.g:1894:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop4:
                     do {
                         int alt4=3;
@@ -797,7 +797,7 @@ else if ( ((LA4_0>='\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=
 
                         switch (alt4) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1894:21: '\\\\' .
+                    	    // InternalValid.g:1894:21: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -805,7 +805,7 @@ else if ( ((LA4_0>='\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1894:28: ~ ( ( '\\\\' | '\"' ) )
+                    	    // InternalValid.g:1894:28: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -830,10 +830,10 @@ else if ( ((LA4_0>='\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1894:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+                    // InternalValid.g:1894:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
                     {
                     match('\''); 
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1894:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // InternalValid.g:1894:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop5:
                     do {
                         int alt5=3;
@@ -849,7 +849,7 @@ else if ( ((LA5_0>='\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=
 
                         switch (alt5) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1894:54: '\\\\' .
+                    	    // InternalValid.g:1894:54: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -857,7 +857,7 @@ else if ( ((LA5_0>='\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1894:61: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // InternalValid.g:1894:61: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -900,12 +900,12 @@ public final void mRULE_ML_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1896:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1896:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalValid.g:1896:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalValid.g:1896:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1896:24: ( options {greedy=false; } : . )*
+            // InternalValid.g:1896:24: ( options {greedy=false; } : . )*
             loop7:
             do {
                 int alt7=2;
@@ -930,7 +930,7 @@ else if ( ((LA7_0>='\u0000' && LA7_0<=')')||(LA7_0>='+' && LA7_0<='\uFFFF')) ) {
 
                 switch (alt7) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1896:52: .
+            	    // InternalValid.g:1896:52: .
             	    {
             	    matchAny(); 
 
@@ -960,12 +960,12 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1898:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1898:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalValid.g:1898:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalValid.g:1898:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1898:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // InternalValid.g:1898:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop8:
             do {
                 int alt8=2;
@@ -978,7 +978,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
 
                 switch (alt8) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1898:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // InternalValid.g:1898:24: ~ ( ( '\\n' | '\\r' ) )
             	    {
             	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
             	        input.consume();
@@ -998,7 +998,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
                 }
             } while (true);
 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1898:40: ( ( '\\r' )? '\\n' )?
+            // InternalValid.g:1898:40: ( ( '\\r' )? '\\n' )?
             int alt10=2;
             int LA10_0 = input.LA(1);
 
@@ -1007,9 +1007,9 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
             }
             switch (alt10) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1898:41: ( '\\r' )? '\\n'
+                    // InternalValid.g:1898:41: ( '\\r' )? '\\n'
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1898:41: ( '\\r' )?
+                    // InternalValid.g:1898:41: ( '\\r' )?
                     int alt9=2;
                     int LA9_0 = input.LA(1);
 
@@ -1018,7 +1018,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
                     }
                     switch (alt9) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1898:41: '\\r'
+                            // InternalValid.g:1898:41: '\\r'
                             {
                             match('\r'); 
 
@@ -1050,10 +1050,10 @@ public final void mRULE_WS() throws RecognitionException {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1900:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1900:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalValid.g:1900:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalValid.g:1900:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1900:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalValid.g:1900:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt11=0;
             loop11:
             do {
@@ -1067,7 +1067,7 @@ public final void mRULE_WS() throws RecognitionException {
 
                 switch (alt11) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:
+            	    // InternalValid.g:
             	    {
             	    if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
             	        input.consume();
@@ -1107,8 +1107,8 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1902:16: ( . )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1902:18: .
+            // InternalValid.g:1902:16: ( . )
+            // InternalValid.g:1902:18: .
             {
             matchAny(); 
 
@@ -1123,243 +1123,243 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1:8: ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        // InternalValid.g:1:8: ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
         int alt12=34;
         alt12 = dfa12.predict(input);
         switch (alt12) {
             case 1 :
-                // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1:10: T__11
+                // InternalValid.g:1:10: T__11
                 {
                 mT__11(); 
 
                 }
                 break;
             case 2 :
-                // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1:16: T__12
+                // InternalValid.g:1:16: T__12
                 {
                 mT__12(); 
 
                 }
                 break;
             case 3 :
-                // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1:22: T__13
+                // InternalValid.g:1:22: T__13
                 {
                 mT__13(); 
 
                 }
                 break;
             case 4 :
-                // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1:28: T__14
+                // InternalValid.g:1:28: T__14
                 {
                 mT__14(); 
 
                 }
                 break;
             case 5 :
-                // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1:34: T__15
+                // InternalValid.g:1:34: T__15
                 {
                 mT__15(); 
 
                 }
                 break;
             case 6 :
-                // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1:40: T__16
+                // InternalValid.g:1:40: T__16
                 {
                 mT__16(); 
 
                 }
                 break;
             case 7 :
-                // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1:46: T__17
+                // InternalValid.g:1:46: T__17
                 {
                 mT__17(); 
 
                 }
                 break;
             case 8 :
-                // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1:52: T__18
+                // InternalValid.g:1:52: T__18
                 {
                 mT__18(); 
 
                 }
                 break;
             case 9 :
-                // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1:58: T__19
+                // InternalValid.g:1:58: T__19
                 {
                 mT__19(); 
 
                 }
                 break;
             case 10 :
-                // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1:64: T__20
+                // InternalValid.g:1:64: T__20
                 {
                 mT__20(); 
 
                 }
                 break;
             case 11 :
-                // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1:70: T__21
+                // InternalValid.g:1:70: T__21
                 {
                 mT__21(); 
 
                 }
                 break;
             case 12 :
-                // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1:76: T__22
+                // InternalValid.g:1:76: T__22
                 {
                 mT__22(); 
 
                 }
                 break;
             case 13 :
-                // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1:82: T__23
+                // InternalValid.g:1:82: T__23
                 {
                 mT__23(); 
 
                 }
                 break;
             case 14 :
-                // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1:88: T__24
+                // InternalValid.g:1:88: T__24
                 {
                 mT__24(); 
 
                 }
                 break;
             case 15 :
-                // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1:94: T__25
+                // InternalValid.g:1:94: T__25
                 {
                 mT__25(); 
 
                 }
                 break;
             case 16 :
-                // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1:100: T__26
+                // InternalValid.g:1:100: T__26
                 {
                 mT__26(); 
 
                 }
                 break;
             case 17 :
-                // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1:106: T__27
+                // InternalValid.g:1:106: T__27
                 {
                 mT__27(); 
 
                 }
                 break;
             case 18 :
-                // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1:112: T__28
+                // InternalValid.g:1:112: T__28
                 {
                 mT__28(); 
 
                 }
                 break;
             case 19 :
-                // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1:118: T__29
+                // InternalValid.g:1:118: T__29
                 {
                 mT__29(); 
 
                 }
                 break;
             case 20 :
-                // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1:124: T__30
+                // InternalValid.g:1:124: T__30
                 {
                 mT__30(); 
 
                 }
                 break;
             case 21 :
-                // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1:130: T__31
+                // InternalValid.g:1:130: T__31
                 {
                 mT__31(); 
 
                 }
                 break;
             case 22 :
-                // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1:136: T__32
+                // InternalValid.g:1:136: T__32
                 {
                 mT__32(); 
 
                 }
                 break;
             case 23 :
-                // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1:142: T__33
+                // InternalValid.g:1:142: T__33
                 {
                 mT__33(); 
 
                 }
                 break;
             case 24 :
-                // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1:148: T__34
+                // InternalValid.g:1:148: T__34
                 {
                 mT__34(); 
 
                 }
                 break;
             case 25 :
-                // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1:154: T__35
+                // InternalValid.g:1:154: T__35
                 {
                 mT__35(); 
 
                 }
                 break;
             case 26 :
-                // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1:160: T__36
+                // InternalValid.g:1:160: T__36
                 {
                 mT__36(); 
 
                 }
                 break;
             case 27 :
-                // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1:166: T__37
+                // InternalValid.g:1:166: T__37
                 {
                 mT__37(); 
 
                 }
                 break;
             case 28 :
-                // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1:172: RULE_ID
+                // InternalValid.g:1:172: RULE_ID
                 {
                 mRULE_ID(); 
 
                 }
                 break;
             case 29 :
-                // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1:180: RULE_INT
+                // InternalValid.g:1:180: RULE_INT
                 {
                 mRULE_INT(); 
 
                 }
                 break;
             case 30 :
-                // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1:189: RULE_STRING
+                // InternalValid.g:1:189: RULE_STRING
                 {
                 mRULE_STRING(); 
 
                 }
                 break;
             case 31 :
-                // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1:201: RULE_ML_COMMENT
+                // InternalValid.g:1:201: RULE_ML_COMMENT
                 {
                 mRULE_ML_COMMENT(); 
 
                 }
                 break;
             case 32 :
-                // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1:217: RULE_SL_COMMENT
+                // InternalValid.g:1:217: RULE_SL_COMMENT
                 {
                 mRULE_SL_COMMENT(); 
 
                 }
                 break;
             case 33 :
-                // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1:233: RULE_WS
+                // InternalValid.g:1:233: RULE_WS
                 {
                 mRULE_WS(); 
 
                 }
                 break;
             case 34 :
-                // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1:241: RULE_ANY_OTHER
+                // InternalValid.g:1:241: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -1373,68 +1373,19 @@ public void mTokens() throws RecognitionException {
 
     protected DFA12 dfa12 = new DFA12(this);
     static final String DFA12_eotS =
-        "\1\uffff\4\40\2\uffff\3\40\1\36\2\40\2\uffff\3\40\1\36\4\40\1\36"+
-        "\2\uffff\3\36\2\uffff\1\40\1\uffff\4\40\2\uffff\5\40\1\uffff\2\40"+
-        "\2\uffff\1\114\3\40\1\uffff\5\40\5\uffff\14\40\1\uffff\1\40\1\142"+
-        "\16\40\1\161\4\40\1\uffff\1\166\10\40\1\177\4\40\1\uffff\1\40\1"+
-        "\u0085\2\40\1\uffff\2\40\1\u008a\2\40\1\u008d\2\40\1\uffff\3\40"+
-        "\1\u0093\1\40\1\uffff\1\u0095\1\40\1\u0097\1\40\1\uffff\2\40\1\uffff"+
-        "\1\40\1\u009c\2\40\1\u009f\1\uffff\1\40\1\uffff\1\40\1\uffff\1\40"+
-        "\1\u00a3\1\u00a4\1\u00a5\1\uffff\1\40\1\u00a7\1\uffff\1\u00a8\2"+
-        "\40\3\uffff\1\40\2\uffff\1\40\1\u00ad\1\40\1\u00af\1\uffff\1\u00b0"+
-        "\2\uffff";
+        "\1\uffff\4\40\2\uffff\3\40\1\36\2\40\2\uffff\3\40\1\36\4\40\1\36\2\uffff\3\36\2\uffff\1\40\1\uffff\4\40\2\uffff\5\40\1\uffff\2\40\2\uffff\1\114\3\40\1\uffff\5\40\5\uffff\14\40\1\uffff\1\40\1\142\16\40\1\161\4\40\1\uffff\1\166\10\40\1\177\4\40\1\uffff\1\40\1\u0085\2\40\1\uffff\2\40\1\u008a\2\40\1\u008d\2\40\1\uffff\3\40\1\u0093\1\40\1\uffff\1\u0095\1\40\1\u0097\1\40\1\uffff\2\40\1\uffff\1\40\1\u009c\2\40\1\u009f\1\uffff\1\40\1\uffff\1\40\1\uffff\1\40\1\u00a3\1\u00a4\1\u00a5\1\uffff\1\40\1\u00a7\1\uffff\1\u00a8\2\40\3\uffff\1\40\2\uffff\1\40\1\u00ad\1\40\1\u00af\1\uffff\1\u00b0\2\uffff";
     static final String DFA12_eofS =
         "\u00b1\uffff";
     static final String DFA12_minS =
-        "\1\0\1\155\2\141\1\145\2\uffff\1\160\1\141\1\145\1\56\1\141\1\156"+
-        "\2\uffff\1\163\1\165\1\141\1\72\1\157\1\162\1\141\1\145\1\101\2"+
-        "\uffff\2\0\1\52\2\uffff\1\160\1\uffff\1\164\1\156\1\142\1\163\2"+
-        "\uffff\1\164\1\163\1\162\1\172\1\155\1\uffff\1\156\1\151\2\uffff"+
-        "\1\60\1\151\1\170\1\163\1\uffff\1\162\1\160\2\162\1\170\5\uffff"+
-        "\1\157\1\145\1\164\1\145\1\143\1\151\1\163\1\153\1\145\1\141\1\147"+
-        "\1\161\1\uffff\1\143\1\60\1\164\1\155\1\145\1\157\1\156\1\164\1"+
-        "\162\1\147\1\145\1\154\1\162\1\157\1\141\1\145\1\60\1\156\1\145"+
-        "\1\165\1\153\1\uffff\1\60\1\141\1\156\1\162\1\151\1\165\1\164\1"+
-        "\157\1\170\1\60\1\151\1\156\1\147\1\162\1\uffff\1\164\1\60\1\145"+
-        "\1\146\1\uffff\1\154\1\163\1\60\1\156\1\141\1\60\1\162\1\164\1\uffff"+
-        "\1\160\1\141\1\145\1\60\1\151\1\uffff\1\60\1\151\1\60\1\151\1\uffff"+
-        "\1\147\1\154\1\uffff\1\171\1\60\1\164\1\154\1\60\1\uffff\1\143\1"+
-        "\uffff\1\170\1\uffff\1\166\3\60\1\uffff\1\151\1\60\1\uffff\1\60"+
-        "\2\145\3\uffff\1\157\2\uffff\1\163\1\60\1\156\1\60\1\uffff\1\60"+
-        "\2\uffff";
+        "\1\0\1\155\2\141\1\145\2\uffff\1\160\1\141\1\145\1\56\1\141\1\156\2\uffff\1\163\1\165\1\141\1\72\1\157\1\162\1\141\1\145\1\101\2\uffff\2\0\1\52\2\uffff\1\160\1\uffff\1\164\1\156\1\142\1\163\2\uffff\1\164\1\163\1\162\1\172\1\155\1\uffff\1\156\1\151\2\uffff\1\60\1\151\1\170\1\163\1\uffff\1\162\1\160\2\162\1\170\5\uffff\1\157\1\145\1\164\1\145\1\143\1\151\1\163\1\153\1\145\1\141\1\147\1\161\1\uffff\1\143\1\60\1\164\1\155\1\145\1\157\1\156\1\164\1\162\1\147\1\145\1\154\1\162\1\157\1\141\1\145\1\60\1\156\1\145\1\165\1\153\1\uffff\1\60\1\141\1\156\1\162\1\151\1\165\1\164\1\157\1\170\1\60\1\151\1\156\1\147\1\162\1\uffff\1\164\1\60\1\145\1\146\1\uffff\1\154\1\163\1\60\1\156\1\141\1\60\1\162\1\164\1\uffff\1\160\1\141\1\145\1\60\1\151\1\uffff\1\60\1\151\1\60\1\151\1\uffff\1\147\1\154\1\uffff\1\171\1\60\1\164\1\154\1\60\1\uffff\1\143\1\uffff\1\170\1\uffff\1\166\3\60\1\uffff\1\151\1\60\1\uffff\1\60\2\145\3\uffff\1\157\2\uffff\1\163\1\60\1\156\1\60\1\uffff\1\60\2\uffff";
     static final String DFA12_maxS =
-        "\1\uffff\1\155\1\157\1\141\1\145\2\uffff\1\160\1\145\1\151\1\56"+
-        "\1\141\1\156\2\uffff\1\163\1\165\1\151\1\72\1\157\1\170\1\141\1"+
-        "\145\1\172\2\uffff\2\uffff\1\57\2\uffff\1\160\1\uffff\1\164\1\156"+
-        "\1\142\1\163\2\uffff\1\164\1\163\1\162\1\172\1\155\1\uffff\1\156"+
-        "\1\151\2\uffff\1\172\1\151\1\170\1\163\1\uffff\1\162\1\160\2\162"+
-        "\1\170\5\uffff\1\157\1\145\1\164\1\145\1\143\1\151\1\163\1\153\1"+
-        "\145\1\141\1\147\1\161\1\uffff\1\143\1\172\1\164\1\155\1\145\1\157"+
-        "\1\156\1\164\1\162\1\147\1\145\1\154\1\162\1\157\1\141\1\145\1\172"+
-        "\1\156\1\145\1\165\1\153\1\uffff\1\172\1\141\1\156\1\162\1\151\1"+
-        "\165\1\164\1\157\1\170\1\172\1\151\1\156\1\147\1\162\1\uffff\1\164"+
-        "\1\172\1\145\1\146\1\uffff\1\154\1\163\1\172\1\156\1\141\1\172\1"+
-        "\162\1\164\1\uffff\1\160\1\141\1\145\1\172\1\151\1\uffff\1\172\1"+
-        "\151\1\172\1\151\1\uffff\1\147\1\154\1\uffff\1\171\1\172\1\164\1"+
-        "\154\1\172\1\uffff\1\143\1\uffff\1\170\1\uffff\1\166\3\172\1\uffff"+
-        "\1\151\1\172\1\uffff\1\172\2\145\3\uffff\1\157\2\uffff\1\163\1\172"+
-        "\1\156\1\172\1\uffff\1\172\2\uffff";
+        "\1\uffff\1\155\1\157\1\141\1\145\2\uffff\1\160\1\145\1\151\1\56\1\141\1\156\2\uffff\1\163\1\165\1\151\1\72\1\157\1\170\1\141\1\145\1\172\2\uffff\2\uffff\1\57\2\uffff\1\160\1\uffff\1\164\1\156\1\142\1\163\2\uffff\1\164\1\163\1\162\1\172\1\155\1\uffff\1\156\1\151\2\uffff\1\172\1\151\1\170\1\163\1\uffff\1\162\1\160\2\162\1\170\5\uffff\1\157\1\145\1\164\1\145\1\143\1\151\1\163\1\153\1\145\1\141\1\147\1\161\1\uffff\1\143\1\172\1\164\1\155\1\145\1\157\1\156\1\164\1\162\1\147\1\145\1\154\1\162\1\157\1\141\1\145\1\172\1\156\1\145\1\165\1\153\1\uffff\1\172\1\141\1\156\1\162\1\151\1\165\1\164\1\157\1\170\1\172\1\151\1\156\1\147\1\162\1\uffff\1\164\1\172\1\145\1\146\1\uffff\1\154\1\163\1\172\1\156\1\141\1\172\1\162\1\164\1\uffff\1\160\1\141\1\145\1\172\1\151\1\uffff\1\172\1\151\1\172\1\151\1\uffff\1\147\1\154\1\uffff\1\171\1\172\1\164\1\154\1\172\1\uffff\1\143\1\uffff\1\170\1\uffff\1\166\3\172\1\uffff\1\151\1\172\1\uffff\1\172\2\145\3\uffff\1\157\2\uffff\1\163\1\172\1\156\1\172\1\uffff\1\172\2\uffff";
     static final String DFA12_acceptS =
-        "\5\uffff\1\5\1\6\6\uffff\1\16\1\17\11\uffff\1\34\1\35\3\uffff\1"+
-        "\41\1\42\1\uffff\1\34\4\uffff\1\5\1\6\5\uffff\1\13\2\uffff\1\16"+
-        "\1\17\4\uffff\1\24\5\uffff\1\35\1\36\1\37\1\40\1\41\14\uffff\1\21"+
-        "\25\uffff\1\23\16\uffff\1\12\4\uffff\1\25\10\uffff\1\3\5\uffff\1"+
-        "\14\4\uffff\1\30\2\uffff\1\1\5\uffff\1\20\1\uffff\1\15\1\uffff\1"+
-        "\26\4\uffff\1\11\2\uffff\1\10\3\uffff\1\31\1\33\1\2\1\uffff\1\7"+
-        "\1\32\4\uffff\1\27\1\uffff\1\22\1\4";
+        "\5\uffff\1\5\1\6\6\uffff\1\16\1\17\11\uffff\1\34\1\35\3\uffff\1\41\1\42\1\uffff\1\34\4\uffff\1\5\1\6\5\uffff\1\13\2\uffff\1\16\1\17\4\uffff\1\24\5\uffff\1\35\1\36\1\37\1\40\1\41\14\uffff\1\21\25\uffff\1\23\16\uffff\1\12\4\uffff\1\25\10\uffff\1\3\5\uffff\1\14\4\uffff\1\30\2\uffff\1\1\5\uffff\1\20\1\uffff\1\15\1\uffff\1\26\4\uffff\1\11\2\uffff\1\10\3\uffff\1\31\1\33\1\2\1\uffff\1\7\1\32\4\uffff\1\27\1\uffff\1\22\1\4";
     static final String DFA12_specialS =
         "\1\0\31\uffff\1\1\1\2\u0095\uffff}>";
     static final String[] DFA12_transitionS = {
-            "\11\36\2\35\2\36\1\35\22\36\1\35\1\36\1\32\1\15\3\36\1\33\6"+
-            "\36\1\12\1\34\12\31\1\22\1\16\5\36\32\30\3\36\1\27\1\30\1\36"+
-            "\1\17\1\30\1\2\1\4\1\24\1\21\2\30\1\1\2\30\1\3\1\10\1\23\1\7"+
-            "\1\30\1\20\1\13\1\11\1\26\1\14\1\30\1\25\3\30\1\5\1\36\1\6\uff82"+
-            "\36",
+            "\11\36\2\35\2\36\1\35\22\36\1\35\1\36\1\32\1\15\3\36\1\33\6\36\1\12\1\34\12\31\1\22\1\16\5\36\32\30\3\36\1\27\1\30\1\36\1\17\1\30\1\2\1\4\1\24\1\21\2\30\1\1\2\30\1\3\1\10\1\23\1\7\1\30\1\20\1\13\1\11\1\26\1\14\1\30\1\25\3\30\1\5\1\36\1\6\uff82\36",
             "\1\37",
             "\1\41\15\uffff\1\42",
             "\1\43",
diff --git a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValidParser.java b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValidParser.java
index 45919b3a9..98f94d3f0 100644
--- a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValidParser.java
+++ b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValidParser.java
@@ -74,7 +74,7 @@ public InternalValidParser(TokenStream input, RecognizerSharedState state) {
         
 
     public String[] getTokenNames() { return InternalValidParser.tokenNames; }
-    public String getGrammarFileName() { return "../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g"; }
+    public String getGrammarFileName() { return "InternalValid.g"; }
 
 
 
@@ -99,7 +99,7 @@ protected ValidGrammarAccess getGrammarAccess() {
 
 
     // $ANTLR start "entryRuleValidModel"
-    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:68:1: entryRuleValidModel returns [EObject current=null] : iv_ruleValidModel= ruleValidModel EOF ;
+    // InternalValid.g:68:1: entryRuleValidModel returns [EObject current=null] : iv_ruleValidModel= ruleValidModel EOF ;
     public final EObject entryRuleValidModel() throws RecognitionException {
         EObject current = null;
 
@@ -107,17 +107,17 @@ public final EObject entryRuleValidModel() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:69:2: (iv_ruleValidModel= ruleValidModel EOF )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:70:2: iv_ruleValidModel= ruleValidModel EOF
+            // InternalValid.g:69:2: (iv_ruleValidModel= ruleValidModel EOF )
+            // InternalValid.g:70:2: iv_ruleValidModel= ruleValidModel EOF
             {
              newCompositeNode(grammarAccess.getValidModelRule()); 
-            pushFollow(FOLLOW_ruleValidModel_in_entryRuleValidModel75);
+            pushFollow(FOLLOW_1);
             iv_ruleValidModel=ruleValidModel();
 
             state._fsp--;
 
              current =iv_ruleValidModel; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleValidModel85); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -135,7 +135,7 @@ public final EObject entryRuleValidModel() throws RecognitionException {
 
 
     // $ANTLR start "ruleValidModel"
-    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:77:1: ruleValidModel returns [EObject current=null] : ( ( (lv_imports_0_0= ruleImport ) )* ( (lv_categories_1_0= ruleCategory ) )* ) ;
+    // InternalValid.g:77:1: ruleValidModel returns [EObject current=null] : ( ( (lv_imports_0_0= ruleImport ) )* ( (lv_categories_1_0= ruleCategory ) )* ) ;
     public final EObject ruleValidModel() throws RecognitionException {
         EObject current = null;
 
@@ -147,13 +147,13 @@ public final EObject ruleValidModel() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:80:28: ( ( ( (lv_imports_0_0= ruleImport ) )* ( (lv_categories_1_0= ruleCategory ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:81:1: ( ( (lv_imports_0_0= ruleImport ) )* ( (lv_categories_1_0= ruleCategory ) )* )
+            // InternalValid.g:80:28: ( ( ( (lv_imports_0_0= ruleImport ) )* ( (lv_categories_1_0= ruleCategory ) )* ) )
+            // InternalValid.g:81:1: ( ( (lv_imports_0_0= ruleImport ) )* ( (lv_categories_1_0= ruleCategory ) )* )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:81:1: ( ( (lv_imports_0_0= ruleImport ) )* ( (lv_categories_1_0= ruleCategory ) )* )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:81:2: ( (lv_imports_0_0= ruleImport ) )* ( (lv_categories_1_0= ruleCategory ) )*
+            // InternalValid.g:81:1: ( ( (lv_imports_0_0= ruleImport ) )* ( (lv_categories_1_0= ruleCategory ) )* )
+            // InternalValid.g:81:2: ( (lv_imports_0_0= ruleImport ) )* ( (lv_categories_1_0= ruleCategory ) )*
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:81:2: ( (lv_imports_0_0= ruleImport ) )*
+            // InternalValid.g:81:2: ( (lv_imports_0_0= ruleImport ) )*
             loop1:
             do {
                 int alt1=2;
@@ -166,15 +166,15 @@ public final EObject ruleValidModel() throws RecognitionException {
 
                 switch (alt1) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:82:1: (lv_imports_0_0= ruleImport )
+            	    // InternalValid.g:82:1: (lv_imports_0_0= ruleImport )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:82:1: (lv_imports_0_0= ruleImport )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:83:3: lv_imports_0_0= ruleImport
+            	    // InternalValid.g:82:1: (lv_imports_0_0= ruleImport )
+            	    // InternalValid.g:83:3: lv_imports_0_0= ruleImport
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getValidModelAccess().getImportsImportParserRuleCall_0_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleImport_in_ruleValidModel131);
+            	    pushFollow(FOLLOW_3);
             	    lv_imports_0_0=ruleImport();
 
             	    state._fsp--;
@@ -187,7 +187,7 @@ public final EObject ruleValidModel() throws RecognitionException {
             	           			current, 
             	           			"imports",
             	            		lv_imports_0_0, 
-            	            		"Import");
+            	            		"com.avaloq.tools.ddk.xtext.valid.Valid.Import");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -202,7 +202,7 @@ public final EObject ruleValidModel() throws RecognitionException {
                 }
             } while (true);
 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:99:3: ( (lv_categories_1_0= ruleCategory ) )*
+            // InternalValid.g:99:3: ( (lv_categories_1_0= ruleCategory ) )*
             loop2:
             do {
                 int alt2=2;
@@ -215,15 +215,15 @@ public final EObject ruleValidModel() throws RecognitionException {
 
                 switch (alt2) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:100:1: (lv_categories_1_0= ruleCategory )
+            	    // InternalValid.g:100:1: (lv_categories_1_0= ruleCategory )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:100:1: (lv_categories_1_0= ruleCategory )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:101:3: lv_categories_1_0= ruleCategory
+            	    // InternalValid.g:100:1: (lv_categories_1_0= ruleCategory )
+            	    // InternalValid.g:101:3: lv_categories_1_0= ruleCategory
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getValidModelAccess().getCategoriesCategoryParserRuleCall_1_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleCategory_in_ruleValidModel153);
+            	    pushFollow(FOLLOW_4);
             	    lv_categories_1_0=ruleCategory();
 
             	    state._fsp--;
@@ -236,7 +236,7 @@ public final EObject ruleValidModel() throws RecognitionException {
             	           			current, 
             	           			"categories",
             	            		lv_categories_1_0, 
-            	            		"Category");
+            	            		"com.avaloq.tools.ddk.xtext.valid.Valid.Category");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -272,7 +272,7 @@ public final EObject ruleValidModel() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleImport"
-    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:125:1: entryRuleImport returns [EObject current=null] : iv_ruleImport= ruleImport EOF ;
+    // InternalValid.g:125:1: entryRuleImport returns [EObject current=null] : iv_ruleImport= ruleImport EOF ;
     public final EObject entryRuleImport() throws RecognitionException {
         EObject current = null;
 
@@ -280,17 +280,17 @@ public final EObject entryRuleImport() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:126:2: (iv_ruleImport= ruleImport EOF )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:127:2: iv_ruleImport= ruleImport EOF
+            // InternalValid.g:126:2: (iv_ruleImport= ruleImport EOF )
+            // InternalValid.g:127:2: iv_ruleImport= ruleImport EOF
             {
              newCompositeNode(grammarAccess.getImportRule()); 
-            pushFollow(FOLLOW_ruleImport_in_entryRuleImport190);
+            pushFollow(FOLLOW_1);
             iv_ruleImport=ruleImport();
 
             state._fsp--;
 
              current =iv_ruleImport; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleImport200); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -308,7 +308,7 @@ public final EObject entryRuleImport() throws RecognitionException {
 
 
     // $ANTLR start "ruleImport"
-    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:134:1: ruleImport returns [EObject current=null] : (otherlv_0= 'import' ( (otherlv_1= RULE_STRING ) ) ) ;
+    // InternalValid.g:134:1: ruleImport returns [EObject current=null] : (otherlv_0= 'import' ( (otherlv_1= RULE_STRING ) ) ) ;
     public final EObject ruleImport() throws RecognitionException {
         EObject current = null;
 
@@ -318,28 +318,28 @@ public final EObject ruleImport() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:137:28: ( (otherlv_0= 'import' ( (otherlv_1= RULE_STRING ) ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:138:1: (otherlv_0= 'import' ( (otherlv_1= RULE_STRING ) ) )
+            // InternalValid.g:137:28: ( (otherlv_0= 'import' ( (otherlv_1= RULE_STRING ) ) ) )
+            // InternalValid.g:138:1: (otherlv_0= 'import' ( (otherlv_1= RULE_STRING ) ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:138:1: (otherlv_0= 'import' ( (otherlv_1= RULE_STRING ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:138:3: otherlv_0= 'import' ( (otherlv_1= RULE_STRING ) )
+            // InternalValid.g:138:1: (otherlv_0= 'import' ( (otherlv_1= RULE_STRING ) ) )
+            // InternalValid.g:138:3: otherlv_0= 'import' ( (otherlv_1= RULE_STRING ) )
             {
-            otherlv_0=(Token)match(input,11,FOLLOW_11_in_ruleImport237); 
+            otherlv_0=(Token)match(input,11,FOLLOW_5); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getImportAccess().getImportKeyword_0());
                 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:142:1: ( (otherlv_1= RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:143:1: (otherlv_1= RULE_STRING )
+            // InternalValid.g:142:1: ( (otherlv_1= RULE_STRING ) )
+            // InternalValid.g:143:1: (otherlv_1= RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:143:1: (otherlv_1= RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:144:3: otherlv_1= RULE_STRING
+            // InternalValid.g:143:1: (otherlv_1= RULE_STRING )
+            // InternalValid.g:144:3: otherlv_1= RULE_STRING
             {
 
             			if (current==null) {
             	            current = createModelElement(grammarAccess.getImportRule());
             	        }
                     
-            otherlv_1=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleImport257); 
+            otherlv_1=(Token)match(input,RULE_STRING,FOLLOW_2); 
 
             		newLeafNode(otherlv_1, grammarAccess.getImportAccess().getPackageEPackageCrossReference_1_0()); 
             	
@@ -370,7 +370,7 @@ public final EObject ruleImport() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleCategory"
-    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:163:1: entryRuleCategory returns [EObject current=null] : iv_ruleCategory= ruleCategory EOF ;
+    // InternalValid.g:163:1: entryRuleCategory returns [EObject current=null] : iv_ruleCategory= ruleCategory EOF ;
     public final EObject entryRuleCategory() throws RecognitionException {
         EObject current = null;
 
@@ -378,17 +378,17 @@ public final EObject entryRuleCategory() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:164:2: (iv_ruleCategory= ruleCategory EOF )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:165:2: iv_ruleCategory= ruleCategory EOF
+            // InternalValid.g:164:2: (iv_ruleCategory= ruleCategory EOF )
+            // InternalValid.g:165:2: iv_ruleCategory= ruleCategory EOF
             {
              newCompositeNode(grammarAccess.getCategoryRule()); 
-            pushFollow(FOLLOW_ruleCategory_in_entryRuleCategory293);
+            pushFollow(FOLLOW_1);
             iv_ruleCategory=ruleCategory();
 
             state._fsp--;
 
              current =iv_ruleCategory; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleCategory303); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -406,7 +406,7 @@ public final EObject entryRuleCategory() throws RecognitionException {
 
 
     // $ANTLR start "ruleCategory"
-    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:172:1: ruleCategory returns [EObject current=null] : (otherlv_0= 'category' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= 'label' ( (lv_label_3_0= RULE_STRING ) ) (otherlv_4= 'description' ( (lv_description_5_0= RULE_STRING ) ) )? otherlv_6= '{' ( (lv_rules_7_0= ruleRule ) )* otherlv_8= '}' ) ;
+    // InternalValid.g:172:1: ruleCategory returns [EObject current=null] : (otherlv_0= 'category' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= 'label' ( (lv_label_3_0= RULE_STRING ) ) (otherlv_4= 'description' ( (lv_description_5_0= RULE_STRING ) ) )? otherlv_6= '{' ( (lv_rules_7_0= ruleRule ) )* otherlv_8= '}' ) ;
     public final EObject ruleCategory() throws RecognitionException {
         EObject current = null;
 
@@ -424,23 +424,23 @@ public final EObject ruleCategory() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:175:28: ( (otherlv_0= 'category' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= 'label' ( (lv_label_3_0= RULE_STRING ) ) (otherlv_4= 'description' ( (lv_description_5_0= RULE_STRING ) ) )? otherlv_6= '{' ( (lv_rules_7_0= ruleRule ) )* otherlv_8= '}' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:176:1: (otherlv_0= 'category' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= 'label' ( (lv_label_3_0= RULE_STRING ) ) (otherlv_4= 'description' ( (lv_description_5_0= RULE_STRING ) ) )? otherlv_6= '{' ( (lv_rules_7_0= ruleRule ) )* otherlv_8= '}' )
+            // InternalValid.g:175:28: ( (otherlv_0= 'category' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= 'label' ( (lv_label_3_0= RULE_STRING ) ) (otherlv_4= 'description' ( (lv_description_5_0= RULE_STRING ) ) )? otherlv_6= '{' ( (lv_rules_7_0= ruleRule ) )* otherlv_8= '}' ) )
+            // InternalValid.g:176:1: (otherlv_0= 'category' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= 'label' ( (lv_label_3_0= RULE_STRING ) ) (otherlv_4= 'description' ( (lv_description_5_0= RULE_STRING ) ) )? otherlv_6= '{' ( (lv_rules_7_0= ruleRule ) )* otherlv_8= '}' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:176:1: (otherlv_0= 'category' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= 'label' ( (lv_label_3_0= RULE_STRING ) ) (otherlv_4= 'description' ( (lv_description_5_0= RULE_STRING ) ) )? otherlv_6= '{' ( (lv_rules_7_0= ruleRule ) )* otherlv_8= '}' )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:176:3: otherlv_0= 'category' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= 'label' ( (lv_label_3_0= RULE_STRING ) ) (otherlv_4= 'description' ( (lv_description_5_0= RULE_STRING ) ) )? otherlv_6= '{' ( (lv_rules_7_0= ruleRule ) )* otherlv_8= '}'
+            // InternalValid.g:176:1: (otherlv_0= 'category' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= 'label' ( (lv_label_3_0= RULE_STRING ) ) (otherlv_4= 'description' ( (lv_description_5_0= RULE_STRING ) ) )? otherlv_6= '{' ( (lv_rules_7_0= ruleRule ) )* otherlv_8= '}' )
+            // InternalValid.g:176:3: otherlv_0= 'category' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= 'label' ( (lv_label_3_0= RULE_STRING ) ) (otherlv_4= 'description' ( (lv_description_5_0= RULE_STRING ) ) )? otherlv_6= '{' ( (lv_rules_7_0= ruleRule ) )* otherlv_8= '}'
             {
-            otherlv_0=(Token)match(input,12,FOLLOW_12_in_ruleCategory340); 
+            otherlv_0=(Token)match(input,12,FOLLOW_6); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getCategoryAccess().getCategoryKeyword_0());
                 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:180:1: ( (lv_name_1_0= RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:181:1: (lv_name_1_0= RULE_ID )
+            // InternalValid.g:180:1: ( (lv_name_1_0= RULE_ID ) )
+            // InternalValid.g:181:1: (lv_name_1_0= RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:181:1: (lv_name_1_0= RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:182:3: lv_name_1_0= RULE_ID
+            // InternalValid.g:181:1: (lv_name_1_0= RULE_ID )
+            // InternalValid.g:182:3: lv_name_1_0= RULE_ID
             {
-            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleCategory357); 
+            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_7); 
 
             			newLeafNode(lv_name_1_0, grammarAccess.getCategoryAccess().getNameIDTerminalRuleCall_1_0()); 
             		
@@ -452,7 +452,7 @@ public final EObject ruleCategory() throws RecognitionException {
                    			current, 
                    			"name",
                     		lv_name_1_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -460,17 +460,17 @@ public final EObject ruleCategory() throws RecognitionException {
 
             }
 
-            otherlv_2=(Token)match(input,13,FOLLOW_13_in_ruleCategory374); 
+            otherlv_2=(Token)match(input,13,FOLLOW_5); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getCategoryAccess().getLabelKeyword_2());
                 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:202:1: ( (lv_label_3_0= RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:203:1: (lv_label_3_0= RULE_STRING )
+            // InternalValid.g:202:1: ( (lv_label_3_0= RULE_STRING ) )
+            // InternalValid.g:203:1: (lv_label_3_0= RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:203:1: (lv_label_3_0= RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:204:3: lv_label_3_0= RULE_STRING
+            // InternalValid.g:203:1: (lv_label_3_0= RULE_STRING )
+            // InternalValid.g:204:3: lv_label_3_0= RULE_STRING
             {
-            lv_label_3_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleCategory391); 
+            lv_label_3_0=(Token)match(input,RULE_STRING,FOLLOW_8); 
 
             			newLeafNode(lv_label_3_0, grammarAccess.getCategoryAccess().getLabelSTRINGTerminalRuleCall_3_0()); 
             		
@@ -482,7 +482,7 @@ public final EObject ruleCategory() throws RecognitionException {
                    			current, 
                    			"label",
                     		lv_label_3_0, 
-                    		"STRING");
+                    		"org.eclipse.xtext.common.Terminals.STRING");
             	    
 
             }
@@ -490,7 +490,7 @@ public final EObject ruleCategory() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:220:2: (otherlv_4= 'description' ( (lv_description_5_0= RULE_STRING ) ) )?
+            // InternalValid.g:220:2: (otherlv_4= 'description' ( (lv_description_5_0= RULE_STRING ) ) )?
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -499,19 +499,19 @@ public final EObject ruleCategory() throws RecognitionException {
             }
             switch (alt3) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:220:4: otherlv_4= 'description' ( (lv_description_5_0= RULE_STRING ) )
+                    // InternalValid.g:220:4: otherlv_4= 'description' ( (lv_description_5_0= RULE_STRING ) )
                     {
-                    otherlv_4=(Token)match(input,14,FOLLOW_14_in_ruleCategory409); 
+                    otherlv_4=(Token)match(input,14,FOLLOW_5); 
 
                         	newLeafNode(otherlv_4, grammarAccess.getCategoryAccess().getDescriptionKeyword_4_0());
                         
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:224:1: ( (lv_description_5_0= RULE_STRING ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:225:1: (lv_description_5_0= RULE_STRING )
+                    // InternalValid.g:224:1: ( (lv_description_5_0= RULE_STRING ) )
+                    // InternalValid.g:225:1: (lv_description_5_0= RULE_STRING )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:225:1: (lv_description_5_0= RULE_STRING )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:226:3: lv_description_5_0= RULE_STRING
+                    // InternalValid.g:225:1: (lv_description_5_0= RULE_STRING )
+                    // InternalValid.g:226:3: lv_description_5_0= RULE_STRING
                     {
-                    lv_description_5_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleCategory426); 
+                    lv_description_5_0=(Token)match(input,RULE_STRING,FOLLOW_9); 
 
                     			newLeafNode(lv_description_5_0, grammarAccess.getCategoryAccess().getDescriptionSTRINGTerminalRuleCall_4_1_0()); 
                     		
@@ -523,7 +523,7 @@ public final EObject ruleCategory() throws RecognitionException {
                            			current, 
                            			"description",
                             		lv_description_5_0, 
-                            		"STRING");
+                            		"org.eclipse.xtext.common.Terminals.STRING");
                     	    
 
                     }
@@ -537,11 +537,11 @@ public final EObject ruleCategory() throws RecognitionException {
 
             }
 
-            otherlv_6=(Token)match(input,15,FOLLOW_15_in_ruleCategory445); 
+            otherlv_6=(Token)match(input,15,FOLLOW_10); 
 
                 	newLeafNode(otherlv_6, grammarAccess.getCategoryAccess().getLeftCurlyBracketKeyword_5());
                 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:246:1: ( (lv_rules_7_0= ruleRule ) )*
+            // InternalValid.g:246:1: ( (lv_rules_7_0= ruleRule ) )*
             loop4:
             do {
                 int alt4=2;
@@ -554,15 +554,15 @@ public final EObject ruleCategory() throws RecognitionException {
 
                 switch (alt4) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:247:1: (lv_rules_7_0= ruleRule )
+            	    // InternalValid.g:247:1: (lv_rules_7_0= ruleRule )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:247:1: (lv_rules_7_0= ruleRule )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:248:3: lv_rules_7_0= ruleRule
+            	    // InternalValid.g:247:1: (lv_rules_7_0= ruleRule )
+            	    // InternalValid.g:248:3: lv_rules_7_0= ruleRule
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getCategoryAccess().getRulesRuleParserRuleCall_6_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleRule_in_ruleCategory466);
+            	    pushFollow(FOLLOW_10);
             	    lv_rules_7_0=ruleRule();
 
             	    state._fsp--;
@@ -575,7 +575,7 @@ public final EObject ruleCategory() throws RecognitionException {
             	           			current, 
             	           			"rules",
             	            		lv_rules_7_0, 
-            	            		"Rule");
+            	            		"com.avaloq.tools.ddk.xtext.valid.Valid.Rule");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -590,7 +590,7 @@ public final EObject ruleCategory() throws RecognitionException {
                 }
             } while (true);
 
-            otherlv_8=(Token)match(input,16,FOLLOW_16_in_ruleCategory479); 
+            otherlv_8=(Token)match(input,16,FOLLOW_2); 
 
                 	newLeafNode(otherlv_8, grammarAccess.getCategoryAccess().getRightCurlyBracketKeyword_7());
                 
@@ -615,7 +615,7 @@ public final EObject ruleCategory() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleRule"
-    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:276:1: entryRuleRule returns [EObject current=null] : iv_ruleRule= ruleRule EOF ;
+    // InternalValid.g:276:1: entryRuleRule returns [EObject current=null] : iv_ruleRule= ruleRule EOF ;
     public final EObject entryRuleRule() throws RecognitionException {
         EObject current = null;
 
@@ -623,17 +623,17 @@ public final EObject entryRuleRule() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:277:2: (iv_ruleRule= ruleRule EOF )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:278:2: iv_ruleRule= ruleRule EOF
+            // InternalValid.g:277:2: (iv_ruleRule= ruleRule EOF )
+            // InternalValid.g:278:2: iv_ruleRule= ruleRule EOF
             {
              newCompositeNode(grammarAccess.getRuleRule()); 
-            pushFollow(FOLLOW_ruleRule_in_entryRuleRule515);
+            pushFollow(FOLLOW_1);
             iv_ruleRule=ruleRule();
 
             state._fsp--;
 
              current =iv_ruleRule; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRule525); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -651,7 +651,7 @@ public final EObject entryRuleRule() throws RecognitionException {
 
 
     // $ANTLR start "ruleRule"
-    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:285:1: ruleRule returns [EObject current=null] : (this_NativeRule_0= ruleNativeRule | this_PredefinedRule_1= rulePredefinedRule ) ;
+    // InternalValid.g:285:1: ruleRule returns [EObject current=null] : (this_NativeRule_0= ruleNativeRule | this_PredefinedRule_1= rulePredefinedRule ) ;
     public final EObject ruleRule() throws RecognitionException {
         EObject current = null;
 
@@ -663,20 +663,20 @@ public final EObject ruleRule() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:288:28: ( (this_NativeRule_0= ruleNativeRule | this_PredefinedRule_1= rulePredefinedRule ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:289:1: (this_NativeRule_0= ruleNativeRule | this_PredefinedRule_1= rulePredefinedRule )
+            // InternalValid.g:288:28: ( (this_NativeRule_0= ruleNativeRule | this_PredefinedRule_1= rulePredefinedRule ) )
+            // InternalValid.g:289:1: (this_NativeRule_0= ruleNativeRule | this_PredefinedRule_1= rulePredefinedRule )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:289:1: (this_NativeRule_0= ruleNativeRule | this_PredefinedRule_1= rulePredefinedRule )
+            // InternalValid.g:289:1: (this_NativeRule_0= ruleNativeRule | this_PredefinedRule_1= rulePredefinedRule )
             int alt5=2;
             alt5 = dfa5.predict(input);
             switch (alt5) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:290:5: this_NativeRule_0= ruleNativeRule
+                    // InternalValid.g:290:5: this_NativeRule_0= ruleNativeRule
                     {
                      
                             newCompositeNode(grammarAccess.getRuleAccess().getNativeRuleParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleNativeRule_in_ruleRule572);
+                    pushFollow(FOLLOW_2);
                     this_NativeRule_0=ruleNativeRule();
 
                     state._fsp--;
@@ -689,12 +689,12 @@ public final EObject ruleRule() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:300:5: this_PredefinedRule_1= rulePredefinedRule
+                    // InternalValid.g:300:5: this_PredefinedRule_1= rulePredefinedRule
                     {
                      
                             newCompositeNode(grammarAccess.getRuleAccess().getPredefinedRuleParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_rulePredefinedRule_in_ruleRule599);
+                    pushFollow(FOLLOW_2);
                     this_PredefinedRule_1=rulePredefinedRule();
 
                     state._fsp--;
@@ -727,7 +727,7 @@ public final EObject ruleRule() throws RecognitionException {
 
 
     // $ANTLR start "entryRulePredefinedRule"
-    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:316:1: entryRulePredefinedRule returns [EObject current=null] : iv_rulePredefinedRule= rulePredefinedRule EOF ;
+    // InternalValid.g:316:1: entryRulePredefinedRule returns [EObject current=null] : iv_rulePredefinedRule= rulePredefinedRule EOF ;
     public final EObject entryRulePredefinedRule() throws RecognitionException {
         EObject current = null;
 
@@ -735,17 +735,17 @@ public final EObject entryRulePredefinedRule() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:317:2: (iv_rulePredefinedRule= rulePredefinedRule EOF )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:318:2: iv_rulePredefinedRule= rulePredefinedRule EOF
+            // InternalValid.g:317:2: (iv_rulePredefinedRule= rulePredefinedRule EOF )
+            // InternalValid.g:318:2: iv_rulePredefinedRule= rulePredefinedRule EOF
             {
              newCompositeNode(grammarAccess.getPredefinedRuleRule()); 
-            pushFollow(FOLLOW_rulePredefinedRule_in_entryRulePredefinedRule634);
+            pushFollow(FOLLOW_1);
             iv_rulePredefinedRule=rulePredefinedRule();
 
             state._fsp--;
 
              current =iv_rulePredefinedRule; 
-            match(input,EOF,FOLLOW_EOF_in_entryRulePredefinedRule644); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -763,7 +763,7 @@ public final EObject entryRulePredefinedRule() throws RecognitionException {
 
 
     // $ANTLR start "rulePredefinedRule"
-    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:325:1: rulePredefinedRule returns [EObject current=null] : (this_SizeRule_0= ruleSizeRule | this_RangeRule_1= ruleRangeRule | this_UniqueRule_2= ruleUniqueRule ) ;
+    // InternalValid.g:325:1: rulePredefinedRule returns [EObject current=null] : (this_SizeRule_0= ruleSizeRule | this_RangeRule_1= ruleRangeRule | this_UniqueRule_2= ruleUniqueRule ) ;
     public final EObject rulePredefinedRule() throws RecognitionException {
         EObject current = null;
 
@@ -777,20 +777,20 @@ public final EObject rulePredefinedRule() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:328:28: ( (this_SizeRule_0= ruleSizeRule | this_RangeRule_1= ruleRangeRule | this_UniqueRule_2= ruleUniqueRule ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:329:1: (this_SizeRule_0= ruleSizeRule | this_RangeRule_1= ruleRangeRule | this_UniqueRule_2= ruleUniqueRule )
+            // InternalValid.g:328:28: ( (this_SizeRule_0= ruleSizeRule | this_RangeRule_1= ruleRangeRule | this_UniqueRule_2= ruleUniqueRule ) )
+            // InternalValid.g:329:1: (this_SizeRule_0= ruleSizeRule | this_RangeRule_1= ruleRangeRule | this_UniqueRule_2= ruleUniqueRule )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:329:1: (this_SizeRule_0= ruleSizeRule | this_RangeRule_1= ruleRangeRule | this_UniqueRule_2= ruleUniqueRule )
+            // InternalValid.g:329:1: (this_SizeRule_0= ruleSizeRule | this_RangeRule_1= ruleRangeRule | this_UniqueRule_2= ruleUniqueRule )
             int alt6=3;
             alt6 = dfa6.predict(input);
             switch (alt6) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:330:5: this_SizeRule_0= ruleSizeRule
+                    // InternalValid.g:330:5: this_SizeRule_0= ruleSizeRule
                     {
                      
                             newCompositeNode(grammarAccess.getPredefinedRuleAccess().getSizeRuleParserRuleCall_0()); 
                         
-                    pushFollow(FOLLOW_ruleSizeRule_in_rulePredefinedRule691);
+                    pushFollow(FOLLOW_2);
                     this_SizeRule_0=ruleSizeRule();
 
                     state._fsp--;
@@ -803,12 +803,12 @@ public final EObject rulePredefinedRule() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:340:5: this_RangeRule_1= ruleRangeRule
+                    // InternalValid.g:340:5: this_RangeRule_1= ruleRangeRule
                     {
                      
                             newCompositeNode(grammarAccess.getPredefinedRuleAccess().getRangeRuleParserRuleCall_1()); 
                         
-                    pushFollow(FOLLOW_ruleRangeRule_in_rulePredefinedRule718);
+                    pushFollow(FOLLOW_2);
                     this_RangeRule_1=ruleRangeRule();
 
                     state._fsp--;
@@ -821,12 +821,12 @@ public final EObject rulePredefinedRule() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:350:5: this_UniqueRule_2= ruleUniqueRule
+                    // InternalValid.g:350:5: this_UniqueRule_2= ruleUniqueRule
                     {
                      
                             newCompositeNode(grammarAccess.getPredefinedRuleAccess().getUniqueRuleParserRuleCall_2()); 
                         
-                    pushFollow(FOLLOW_ruleUniqueRule_in_rulePredefinedRule745);
+                    pushFollow(FOLLOW_2);
                     this_UniqueRule_2=ruleUniqueRule();
 
                     state._fsp--;
@@ -859,7 +859,7 @@ public final EObject rulePredefinedRule() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleNativeRule"
-    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:366:1: entryRuleNativeRule returns [EObject current=null] : iv_ruleNativeRule= ruleNativeRule EOF ;
+    // InternalValid.g:366:1: entryRuleNativeRule returns [EObject current=null] : iv_ruleNativeRule= ruleNativeRule EOF ;
     public final EObject entryRuleNativeRule() throws RecognitionException {
         EObject current = null;
 
@@ -867,17 +867,17 @@ public final EObject entryRuleNativeRule() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:367:2: (iv_ruleNativeRule= ruleNativeRule EOF )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:368:2: iv_ruleNativeRule= ruleNativeRule EOF
+            // InternalValid.g:367:2: (iv_ruleNativeRule= ruleNativeRule EOF )
+            // InternalValid.g:368:2: iv_ruleNativeRule= ruleNativeRule EOF
             {
              newCompositeNode(grammarAccess.getNativeRuleRule()); 
-            pushFollow(FOLLOW_ruleNativeRule_in_entryRuleNativeRule780);
+            pushFollow(FOLLOW_1);
             iv_ruleNativeRule=ruleNativeRule();
 
             state._fsp--;
 
              current =iv_ruleNativeRule; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNativeRule790); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -895,7 +895,7 @@ public final EObject entryRuleNativeRule() throws RecognitionException {
 
 
     // $ANTLR start "ruleNativeRule"
-    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:375:1: ruleNativeRule returns [EObject current=null] : ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) ) ( (lv_severity_3_0= ruleSeverityKind ) ) ( (lv_name_4_0= RULE_ID ) ) otherlv_5= 'label' ( (lv_label_6_0= RULE_STRING ) ) (otherlv_7= 'description' ( (lv_description_8_0= RULE_STRING ) ) )? otherlv_9= 'message' ( (lv_message_10_0= RULE_STRING ) ) otherlv_11= 'context' otherlv_12= '{' ( (lv_contexts_13_0= ruleNativeContext ) )+ otherlv_14= '}' ) ;
+    // InternalValid.g:375:1: ruleNativeRule returns [EObject current=null] : ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) ) ( (lv_severity_3_0= ruleSeverityKind ) ) ( (lv_name_4_0= RULE_ID ) ) otherlv_5= 'label' ( (lv_label_6_0= RULE_STRING ) ) (otherlv_7= 'description' ( (lv_description_8_0= RULE_STRING ) ) )? otherlv_9= 'message' ( (lv_message_10_0= RULE_STRING ) ) otherlv_11= 'context' otherlv_12= '{' ( (lv_contexts_13_0= ruleNativeContext ) )+ otherlv_14= '}' ) ;
     public final EObject ruleNativeRule() throws RecognitionException {
         EObject current = null;
 
@@ -920,67 +920,67 @@ public final EObject ruleNativeRule() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:378:28: ( ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) ) ( (lv_severity_3_0= ruleSeverityKind ) ) ( (lv_name_4_0= RULE_ID ) ) otherlv_5= 'label' ( (lv_label_6_0= RULE_STRING ) ) (otherlv_7= 'description' ( (lv_description_8_0= RULE_STRING ) ) )? otherlv_9= 'message' ( (lv_message_10_0= RULE_STRING ) ) otherlv_11= 'context' otherlv_12= '{' ( (lv_contexts_13_0= ruleNativeContext ) )+ otherlv_14= '}' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:379:1: ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) ) ( (lv_severity_3_0= ruleSeverityKind ) ) ( (lv_name_4_0= RULE_ID ) ) otherlv_5= 'label' ( (lv_label_6_0= RULE_STRING ) ) (otherlv_7= 'description' ( (lv_description_8_0= RULE_STRING ) ) )? otherlv_9= 'message' ( (lv_message_10_0= RULE_STRING ) ) otherlv_11= 'context' otherlv_12= '{' ( (lv_contexts_13_0= ruleNativeContext ) )+ otherlv_14= '}' )
+            // InternalValid.g:378:28: ( ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) ) ( (lv_severity_3_0= ruleSeverityKind ) ) ( (lv_name_4_0= RULE_ID ) ) otherlv_5= 'label' ( (lv_label_6_0= RULE_STRING ) ) (otherlv_7= 'description' ( (lv_description_8_0= RULE_STRING ) ) )? otherlv_9= 'message' ( (lv_message_10_0= RULE_STRING ) ) otherlv_11= 'context' otherlv_12= '{' ( (lv_contexts_13_0= ruleNativeContext ) )+ otherlv_14= '}' ) )
+            // InternalValid.g:379:1: ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) ) ( (lv_severity_3_0= ruleSeverityKind ) ) ( (lv_name_4_0= RULE_ID ) ) otherlv_5= 'label' ( (lv_label_6_0= RULE_STRING ) ) (otherlv_7= 'description' ( (lv_description_8_0= RULE_STRING ) ) )? otherlv_9= 'message' ( (lv_message_10_0= RULE_STRING ) ) otherlv_11= 'context' otherlv_12= '{' ( (lv_contexts_13_0= ruleNativeContext ) )+ otherlv_14= '}' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:379:1: ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) ) ( (lv_severity_3_0= ruleSeverityKind ) ) ( (lv_name_4_0= RULE_ID ) ) otherlv_5= 'label' ( (lv_label_6_0= RULE_STRING ) ) (otherlv_7= 'description' ( (lv_description_8_0= RULE_STRING ) ) )? otherlv_9= 'message' ( (lv_message_10_0= RULE_STRING ) ) otherlv_11= 'context' otherlv_12= '{' ( (lv_contexts_13_0= ruleNativeContext ) )+ otherlv_14= '}' )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:379:2: ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) ) ( (lv_severity_3_0= ruleSeverityKind ) ) ( (lv_name_4_0= RULE_ID ) ) otherlv_5= 'label' ( (lv_label_6_0= RULE_STRING ) ) (otherlv_7= 'description' ( (lv_description_8_0= RULE_STRING ) ) )? otherlv_9= 'message' ( (lv_message_10_0= RULE_STRING ) ) otherlv_11= 'context' otherlv_12= '{' ( (lv_contexts_13_0= ruleNativeContext ) )+ otherlv_14= '}'
+            // InternalValid.g:379:1: ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) ) ( (lv_severity_3_0= ruleSeverityKind ) ) ( (lv_name_4_0= RULE_ID ) ) otherlv_5= 'label' ( (lv_label_6_0= RULE_STRING ) ) (otherlv_7= 'description' ( (lv_description_8_0= RULE_STRING ) ) )? otherlv_9= 'message' ( (lv_message_10_0= RULE_STRING ) ) otherlv_11= 'context' otherlv_12= '{' ( (lv_contexts_13_0= ruleNativeContext ) )+ otherlv_14= '}' )
+            // InternalValid.g:379:2: ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) ) ( (lv_severity_3_0= ruleSeverityKind ) ) ( (lv_name_4_0= RULE_ID ) ) otherlv_5= 'label' ( (lv_label_6_0= RULE_STRING ) ) (otherlv_7= 'description' ( (lv_description_8_0= RULE_STRING ) ) )? otherlv_9= 'message' ( (lv_message_10_0= RULE_STRING ) ) otherlv_11= 'context' otherlv_12= '{' ( (lv_contexts_13_0= ruleNativeContext ) )+ otherlv_14= '}'
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:379:2: ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:381:1: ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) )
+            // InternalValid.g:379:2: ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) )
+            // InternalValid.g:381:1: ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:381:1: ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:382:2: ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* )
+            // InternalValid.g:381:1: ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) )
+            // InternalValid.g:382:2: ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* )
             {
              
             	  getUnorderedGroupHelper().enter(grammarAccess.getNativeRuleAccess().getUnorderedGroup_0());
             	
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:385:2: ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:386:3: ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )*
+            // InternalValid.g:385:2: ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* )
+            // InternalValid.g:386:3: ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )*
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:386:3: ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )*
+            // InternalValid.g:386:3: ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )*
             loop7:
             do {
                 int alt7=3;
                 int LA7_0 = input.LA(1);
 
-                if ( LA7_0 ==17 && getUnorderedGroupHelper().canSelect(grammarAccess.getNativeRuleAccess().getUnorderedGroup_0(), 0) ) {
+                if ( LA7_0 == 17 && getUnorderedGroupHelper().canSelect(grammarAccess.getNativeRuleAccess().getUnorderedGroup_0(), 0) ) {
                     alt7=1;
                 }
-                else if ( LA7_0 >=31 && LA7_0<=33 && getUnorderedGroupHelper().canSelect(grammarAccess.getNativeRuleAccess().getUnorderedGroup_0(), 1) ) {
+                else if ( LA7_0 >= 31 && LA7_0 <= 33 && getUnorderedGroupHelper().canSelect(grammarAccess.getNativeRuleAccess().getUnorderedGroup_0(), 1) ) {
                     alt7=2;
                 }
 
 
                 switch (alt7) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:388:4: ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) )
+            	    // InternalValid.g:388:4: ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:388:4: ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:389:5: {...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) )
+            	    // InternalValid.g:388:4: ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) )
+            	    // InternalValid.g:389:5: {...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getNativeRuleAccess().getUnorderedGroup_0(), 0) ) {
             	        throw new FailedPredicateException(input, "ruleNativeRule", "getUnorderedGroupHelper().canSelect(grammarAccess.getNativeRuleAccess().getUnorderedGroup_0(), 0)");
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:389:107: ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:390:6: ({...}? => ( (lv_optional_1_0= 'optional' ) ) )
+            	    // InternalValid.g:389:107: ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) )
+            	    // InternalValid.g:390:6: ({...}? => ( (lv_optional_1_0= 'optional' ) ) )
             	    {
             	     
             	    	 				  getUnorderedGroupHelper().select(grammarAccess.getNativeRuleAccess().getUnorderedGroup_0(), 0);
             	    	 				
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:393:6: ({...}? => ( (lv_optional_1_0= 'optional' ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:393:7: {...}? => ( (lv_optional_1_0= 'optional' ) )
+            	    // InternalValid.g:393:6: ({...}? => ( (lv_optional_1_0= 'optional' ) ) )
+            	    // InternalValid.g:393:7: {...}? => ( (lv_optional_1_0= 'optional' ) )
             	    {
             	    if ( !((true)) ) {
             	        throw new FailedPredicateException(input, "ruleNativeRule", "true");
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:393:16: ( (lv_optional_1_0= 'optional' ) )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:394:1: (lv_optional_1_0= 'optional' )
+            	    // InternalValid.g:393:16: ( (lv_optional_1_0= 'optional' ) )
+            	    // InternalValid.g:394:1: (lv_optional_1_0= 'optional' )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:394:1: (lv_optional_1_0= 'optional' )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:395:3: lv_optional_1_0= 'optional'
+            	    // InternalValid.g:394:1: (lv_optional_1_0= 'optional' )
+            	    // InternalValid.g:395:3: lv_optional_1_0= 'optional'
             	    {
-            	    lv_optional_1_0=(Token)match(input,17,FOLLOW_17_in_ruleNativeRule878); 
+            	    lv_optional_1_0=(Token)match(input,17,FOLLOW_11); 
 
             	            newLeafNode(lv_optional_1_0, grammarAccess.getNativeRuleAccess().getOptionalOptionalKeyword_0_0_0());
             	        
@@ -1012,36 +1012,36 @@ else if ( LA7_0 >=31 && LA7_0<=33 && getUnorderedGroupHelper().canSelect(grammar
             	    }
             	    break;
             	case 2 :
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:415:4: ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) )
+            	    // InternalValid.g:415:4: ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:415:4: ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:416:5: {...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) )
+            	    // InternalValid.g:415:4: ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) )
+            	    // InternalValid.g:416:5: {...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getNativeRuleAccess().getUnorderedGroup_0(), 1) ) {
             	        throw new FailedPredicateException(input, "ruleNativeRule", "getUnorderedGroupHelper().canSelect(grammarAccess.getNativeRuleAccess().getUnorderedGroup_0(), 1)");
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:416:107: ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:417:6: ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) )
+            	    // InternalValid.g:416:107: ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) )
+            	    // InternalValid.g:417:6: ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) )
             	    {
             	     
             	    	 				  getUnorderedGroupHelper().select(grammarAccess.getNativeRuleAccess().getUnorderedGroup_0(), 1);
             	    	 				
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:420:6: ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:420:7: {...}? => ( (lv_checkKind_2_0= ruleCheckKind ) )
+            	    // InternalValid.g:420:6: ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) )
+            	    // InternalValid.g:420:7: {...}? => ( (lv_checkKind_2_0= ruleCheckKind ) )
             	    {
             	    if ( !((true)) ) {
             	        throw new FailedPredicateException(input, "ruleNativeRule", "true");
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:420:16: ( (lv_checkKind_2_0= ruleCheckKind ) )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:421:1: (lv_checkKind_2_0= ruleCheckKind )
+            	    // InternalValid.g:420:16: ( (lv_checkKind_2_0= ruleCheckKind ) )
+            	    // InternalValid.g:421:1: (lv_checkKind_2_0= ruleCheckKind )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:421:1: (lv_checkKind_2_0= ruleCheckKind )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:422:3: lv_checkKind_2_0= ruleCheckKind
+            	    // InternalValid.g:421:1: (lv_checkKind_2_0= ruleCheckKind )
+            	    // InternalValid.g:422:3: lv_checkKind_2_0= ruleCheckKind
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getNativeRuleAccess().getCheckKindCheckKindEnumRuleCall_0_1_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleCheckKind_in_ruleNativeRule966);
+            	    pushFollow(FOLLOW_11);
             	    lv_checkKind_2_0=ruleCheckKind();
 
             	    state._fsp--;
@@ -1054,7 +1054,7 @@ else if ( LA7_0 >=31 && LA7_0<=33 && getUnorderedGroupHelper().canSelect(grammar
             	           			current, 
             	           			"checkKind",
             	            		lv_checkKind_2_0, 
-            	            		"CheckKind");
+            	            		"com.avaloq.tools.ddk.xtext.valid.Valid.CheckKind");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -1096,16 +1096,16 @@ else if ( LA7_0 >=31 && LA7_0<=33 && getUnorderedGroupHelper().canSelect(grammar
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:452:2: ( (lv_severity_3_0= ruleSeverityKind ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:453:1: (lv_severity_3_0= ruleSeverityKind )
+            // InternalValid.g:452:2: ( (lv_severity_3_0= ruleSeverityKind ) )
+            // InternalValid.g:453:1: (lv_severity_3_0= ruleSeverityKind )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:453:1: (lv_severity_3_0= ruleSeverityKind )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:454:3: lv_severity_3_0= ruleSeverityKind
+            // InternalValid.g:453:1: (lv_severity_3_0= ruleSeverityKind )
+            // InternalValid.g:454:3: lv_severity_3_0= ruleSeverityKind
             {
              
             	        newCompositeNode(grammarAccess.getNativeRuleAccess().getSeveritySeverityKindEnumRuleCall_1_0()); 
             	    
-            pushFollow(FOLLOW_ruleSeverityKind_in_ruleNativeRule1027);
+            pushFollow(FOLLOW_6);
             lv_severity_3_0=ruleSeverityKind();
 
             state._fsp--;
@@ -1118,7 +1118,7 @@ else if ( LA7_0 >=31 && LA7_0<=33 && getUnorderedGroupHelper().canSelect(grammar
                    			current, 
                    			"severity",
                     		lv_severity_3_0, 
-                    		"SeverityKind");
+                    		"com.avaloq.tools.ddk.xtext.valid.Valid.SeverityKind");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -1127,13 +1127,13 @@ else if ( LA7_0 >=31 && LA7_0<=33 && getUnorderedGroupHelper().canSelect(grammar
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:470:2: ( (lv_name_4_0= RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:471:1: (lv_name_4_0= RULE_ID )
+            // InternalValid.g:470:2: ( (lv_name_4_0= RULE_ID ) )
+            // InternalValid.g:471:1: (lv_name_4_0= RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:471:1: (lv_name_4_0= RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:472:3: lv_name_4_0= RULE_ID
+            // InternalValid.g:471:1: (lv_name_4_0= RULE_ID )
+            // InternalValid.g:472:3: lv_name_4_0= RULE_ID
             {
-            lv_name_4_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleNativeRule1044); 
+            lv_name_4_0=(Token)match(input,RULE_ID,FOLLOW_7); 
 
             			newLeafNode(lv_name_4_0, grammarAccess.getNativeRuleAccess().getNameIDTerminalRuleCall_2_0()); 
             		
@@ -1145,7 +1145,7 @@ else if ( LA7_0 >=31 && LA7_0<=33 && getUnorderedGroupHelper().canSelect(grammar
                    			current, 
                    			"name",
                     		lv_name_4_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -1153,17 +1153,17 @@ else if ( LA7_0 >=31 && LA7_0<=33 && getUnorderedGroupHelper().canSelect(grammar
 
             }
 
-            otherlv_5=(Token)match(input,13,FOLLOW_13_in_ruleNativeRule1061); 
+            otherlv_5=(Token)match(input,13,FOLLOW_5); 
 
                 	newLeafNode(otherlv_5, grammarAccess.getNativeRuleAccess().getLabelKeyword_3());
                 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:492:1: ( (lv_label_6_0= RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:493:1: (lv_label_6_0= RULE_STRING )
+            // InternalValid.g:492:1: ( (lv_label_6_0= RULE_STRING ) )
+            // InternalValid.g:493:1: (lv_label_6_0= RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:493:1: (lv_label_6_0= RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:494:3: lv_label_6_0= RULE_STRING
+            // InternalValid.g:493:1: (lv_label_6_0= RULE_STRING )
+            // InternalValid.g:494:3: lv_label_6_0= RULE_STRING
             {
-            lv_label_6_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleNativeRule1078); 
+            lv_label_6_0=(Token)match(input,RULE_STRING,FOLLOW_12); 
 
             			newLeafNode(lv_label_6_0, grammarAccess.getNativeRuleAccess().getLabelSTRINGTerminalRuleCall_4_0()); 
             		
@@ -1175,7 +1175,7 @@ else if ( LA7_0 >=31 && LA7_0<=33 && getUnorderedGroupHelper().canSelect(grammar
                    			current, 
                    			"label",
                     		lv_label_6_0, 
-                    		"STRING");
+                    		"org.eclipse.xtext.common.Terminals.STRING");
             	    
 
             }
@@ -1183,7 +1183,7 @@ else if ( LA7_0 >=31 && LA7_0<=33 && getUnorderedGroupHelper().canSelect(grammar
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:510:2: (otherlv_7= 'description' ( (lv_description_8_0= RULE_STRING ) ) )?
+            // InternalValid.g:510:2: (otherlv_7= 'description' ( (lv_description_8_0= RULE_STRING ) ) )?
             int alt8=2;
             int LA8_0 = input.LA(1);
 
@@ -1192,19 +1192,19 @@ else if ( LA7_0 >=31 && LA7_0<=33 && getUnorderedGroupHelper().canSelect(grammar
             }
             switch (alt8) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:510:4: otherlv_7= 'description' ( (lv_description_8_0= RULE_STRING ) )
+                    // InternalValid.g:510:4: otherlv_7= 'description' ( (lv_description_8_0= RULE_STRING ) )
                     {
-                    otherlv_7=(Token)match(input,14,FOLLOW_14_in_ruleNativeRule1096); 
+                    otherlv_7=(Token)match(input,14,FOLLOW_5); 
 
                         	newLeafNode(otherlv_7, grammarAccess.getNativeRuleAccess().getDescriptionKeyword_5_0());
                         
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:514:1: ( (lv_description_8_0= RULE_STRING ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:515:1: (lv_description_8_0= RULE_STRING )
+                    // InternalValid.g:514:1: ( (lv_description_8_0= RULE_STRING ) )
+                    // InternalValid.g:515:1: (lv_description_8_0= RULE_STRING )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:515:1: (lv_description_8_0= RULE_STRING )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:516:3: lv_description_8_0= RULE_STRING
+                    // InternalValid.g:515:1: (lv_description_8_0= RULE_STRING )
+                    // InternalValid.g:516:3: lv_description_8_0= RULE_STRING
                     {
-                    lv_description_8_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleNativeRule1113); 
+                    lv_description_8_0=(Token)match(input,RULE_STRING,FOLLOW_13); 
 
                     			newLeafNode(lv_description_8_0, grammarAccess.getNativeRuleAccess().getDescriptionSTRINGTerminalRuleCall_5_1_0()); 
                     		
@@ -1216,7 +1216,7 @@ else if ( LA7_0 >=31 && LA7_0<=33 && getUnorderedGroupHelper().canSelect(grammar
                            			current, 
                            			"description",
                             		lv_description_8_0, 
-                            		"STRING");
+                            		"org.eclipse.xtext.common.Terminals.STRING");
                     	    
 
                     }
@@ -1230,17 +1230,17 @@ else if ( LA7_0 >=31 && LA7_0<=33 && getUnorderedGroupHelper().canSelect(grammar
 
             }
 
-            otherlv_9=(Token)match(input,18,FOLLOW_18_in_ruleNativeRule1132); 
+            otherlv_9=(Token)match(input,18,FOLLOW_5); 
 
                 	newLeafNode(otherlv_9, grammarAccess.getNativeRuleAccess().getMessageKeyword_6());
                 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:536:1: ( (lv_message_10_0= RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:537:1: (lv_message_10_0= RULE_STRING )
+            // InternalValid.g:536:1: ( (lv_message_10_0= RULE_STRING ) )
+            // InternalValid.g:537:1: (lv_message_10_0= RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:537:1: (lv_message_10_0= RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:538:3: lv_message_10_0= RULE_STRING
+            // InternalValid.g:537:1: (lv_message_10_0= RULE_STRING )
+            // InternalValid.g:538:3: lv_message_10_0= RULE_STRING
             {
-            lv_message_10_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleNativeRule1149); 
+            lv_message_10_0=(Token)match(input,RULE_STRING,FOLLOW_14); 
 
             			newLeafNode(lv_message_10_0, grammarAccess.getNativeRuleAccess().getMessageSTRINGTerminalRuleCall_7_0()); 
             		
@@ -1252,7 +1252,7 @@ else if ( LA7_0 >=31 && LA7_0<=33 && getUnorderedGroupHelper().canSelect(grammar
                    			current, 
                    			"message",
                     		lv_message_10_0, 
-                    		"STRING");
+                    		"org.eclipse.xtext.common.Terminals.STRING");
             	    
 
             }
@@ -1260,15 +1260,15 @@ else if ( LA7_0 >=31 && LA7_0<=33 && getUnorderedGroupHelper().canSelect(grammar
 
             }
 
-            otherlv_11=(Token)match(input,19,FOLLOW_19_in_ruleNativeRule1166); 
+            otherlv_11=(Token)match(input,19,FOLLOW_9); 
 
                 	newLeafNode(otherlv_11, grammarAccess.getNativeRuleAccess().getContextKeyword_8());
                 
-            otherlv_12=(Token)match(input,15,FOLLOW_15_in_ruleNativeRule1178); 
+            otherlv_12=(Token)match(input,15,FOLLOW_6); 
 
                 	newLeafNode(otherlv_12, grammarAccess.getNativeRuleAccess().getLeftCurlyBracketKeyword_9());
                 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:562:1: ( (lv_contexts_13_0= ruleNativeContext ) )+
+            // InternalValid.g:562:1: ( (lv_contexts_13_0= ruleNativeContext ) )+
             int cnt9=0;
             loop9:
             do {
@@ -1282,15 +1282,15 @@ else if ( LA7_0 >=31 && LA7_0<=33 && getUnorderedGroupHelper().canSelect(grammar
 
                 switch (alt9) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:563:1: (lv_contexts_13_0= ruleNativeContext )
+            	    // InternalValid.g:563:1: (lv_contexts_13_0= ruleNativeContext )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:563:1: (lv_contexts_13_0= ruleNativeContext )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:564:3: lv_contexts_13_0= ruleNativeContext
+            	    // InternalValid.g:563:1: (lv_contexts_13_0= ruleNativeContext )
+            	    // InternalValid.g:564:3: lv_contexts_13_0= ruleNativeContext
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getNativeRuleAccess().getContextsNativeContextParserRuleCall_10_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleNativeContext_in_ruleNativeRule1199);
+            	    pushFollow(FOLLOW_15);
             	    lv_contexts_13_0=ruleNativeContext();
 
             	    state._fsp--;
@@ -1303,7 +1303,7 @@ else if ( LA7_0 >=31 && LA7_0<=33 && getUnorderedGroupHelper().canSelect(grammar
             	           			current, 
             	           			"contexts",
             	            		lv_contexts_13_0, 
-            	            		"NativeContext");
+            	            		"com.avaloq.tools.ddk.xtext.valid.Valid.NativeContext");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -1322,7 +1322,7 @@ else if ( LA7_0 >=31 && LA7_0<=33 && getUnorderedGroupHelper().canSelect(grammar
                 cnt9++;
             } while (true);
 
-            otherlv_14=(Token)match(input,16,FOLLOW_16_in_ruleNativeRule1212); 
+            otherlv_14=(Token)match(input,16,FOLLOW_2); 
 
                 	newLeafNode(otherlv_14, grammarAccess.getNativeRuleAccess().getRightCurlyBracketKeyword_11());
                 
@@ -1347,7 +1347,7 @@ else if ( LA7_0 >=31 && LA7_0<=33 && getUnorderedGroupHelper().canSelect(grammar
 
 
     // $ANTLR start "entryRuleSizeRule"
-    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:592:1: entryRuleSizeRule returns [EObject current=null] : iv_ruleSizeRule= ruleSizeRule EOF ;
+    // InternalValid.g:592:1: entryRuleSizeRule returns [EObject current=null] : iv_ruleSizeRule= ruleSizeRule EOF ;
     public final EObject entryRuleSizeRule() throws RecognitionException {
         EObject current = null;
 
@@ -1355,17 +1355,17 @@ public final EObject entryRuleSizeRule() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:593:2: (iv_ruleSizeRule= ruleSizeRule EOF )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:594:2: iv_ruleSizeRule= ruleSizeRule EOF
+            // InternalValid.g:593:2: (iv_ruleSizeRule= ruleSizeRule EOF )
+            // InternalValid.g:594:2: iv_ruleSizeRule= ruleSizeRule EOF
             {
              newCompositeNode(grammarAccess.getSizeRuleRule()); 
-            pushFollow(FOLLOW_ruleSizeRule_in_entryRuleSizeRule1248);
+            pushFollow(FOLLOW_1);
             iv_ruleSizeRule=ruleSizeRule();
 
             state._fsp--;
 
              current =iv_ruleSizeRule; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSizeRule1258); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1383,7 +1383,7 @@ public final EObject entryRuleSizeRule() throws RecognitionException {
 
 
     // $ANTLR start "ruleSizeRule"
-    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:601:1: ruleSizeRule returns [EObject current=null] : ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) ) otherlv_3= 'size' ( (lv_severity_4_0= ruleSeverityKind ) ) ( (lv_name_5_0= RULE_ID ) ) otherlv_6= 'label' ( (lv_label_7_0= RULE_STRING ) ) (otherlv_8= 'description' ( (lv_description_9_0= RULE_STRING ) ) )? (otherlv_10= 'message' ( (lv_message_11_0= RULE_STRING ) ) )? otherlv_12= 'size' ( ( (lv_min_13_0= RULE_INT ) ) otherlv_14= '..' )? ( (lv_max_15_0= RULE_INT ) ) otherlv_16= 'context' otherlv_17= '{' ( (lv_contexts_18_0= ruleSimpleContext ) )+ otherlv_19= '}' ) ;
+    // InternalValid.g:601:1: ruleSizeRule returns [EObject current=null] : ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) ) otherlv_3= 'size' ( (lv_severity_4_0= ruleSeverityKind ) ) ( (lv_name_5_0= RULE_ID ) ) otherlv_6= 'label' ( (lv_label_7_0= RULE_STRING ) ) (otherlv_8= 'description' ( (lv_description_9_0= RULE_STRING ) ) )? (otherlv_10= 'message' ( (lv_message_11_0= RULE_STRING ) ) )? otherlv_12= 'size' ( ( (lv_min_13_0= RULE_INT ) ) otherlv_14= '..' )? ( (lv_max_15_0= RULE_INT ) ) otherlv_16= 'context' otherlv_17= '{' ( (lv_contexts_18_0= ruleSimpleContext ) )+ otherlv_19= '}' ) ;
     public final EObject ruleSizeRule() throws RecognitionException {
         EObject current = null;
 
@@ -1413,67 +1413,67 @@ public final EObject ruleSizeRule() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:604:28: ( ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) ) otherlv_3= 'size' ( (lv_severity_4_0= ruleSeverityKind ) ) ( (lv_name_5_0= RULE_ID ) ) otherlv_6= 'label' ( (lv_label_7_0= RULE_STRING ) ) (otherlv_8= 'description' ( (lv_description_9_0= RULE_STRING ) ) )? (otherlv_10= 'message' ( (lv_message_11_0= RULE_STRING ) ) )? otherlv_12= 'size' ( ( (lv_min_13_0= RULE_INT ) ) otherlv_14= '..' )? ( (lv_max_15_0= RULE_INT ) ) otherlv_16= 'context' otherlv_17= '{' ( (lv_contexts_18_0= ruleSimpleContext ) )+ otherlv_19= '}' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:605:1: ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) ) otherlv_3= 'size' ( (lv_severity_4_0= ruleSeverityKind ) ) ( (lv_name_5_0= RULE_ID ) ) otherlv_6= 'label' ( (lv_label_7_0= RULE_STRING ) ) (otherlv_8= 'description' ( (lv_description_9_0= RULE_STRING ) ) )? (otherlv_10= 'message' ( (lv_message_11_0= RULE_STRING ) ) )? otherlv_12= 'size' ( ( (lv_min_13_0= RULE_INT ) ) otherlv_14= '..' )? ( (lv_max_15_0= RULE_INT ) ) otherlv_16= 'context' otherlv_17= '{' ( (lv_contexts_18_0= ruleSimpleContext ) )+ otherlv_19= '}' )
+            // InternalValid.g:604:28: ( ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) ) otherlv_3= 'size' ( (lv_severity_4_0= ruleSeverityKind ) ) ( (lv_name_5_0= RULE_ID ) ) otherlv_6= 'label' ( (lv_label_7_0= RULE_STRING ) ) (otherlv_8= 'description' ( (lv_description_9_0= RULE_STRING ) ) )? (otherlv_10= 'message' ( (lv_message_11_0= RULE_STRING ) ) )? otherlv_12= 'size' ( ( (lv_min_13_0= RULE_INT ) ) otherlv_14= '..' )? ( (lv_max_15_0= RULE_INT ) ) otherlv_16= 'context' otherlv_17= '{' ( (lv_contexts_18_0= ruleSimpleContext ) )+ otherlv_19= '}' ) )
+            // InternalValid.g:605:1: ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) ) otherlv_3= 'size' ( (lv_severity_4_0= ruleSeverityKind ) ) ( (lv_name_5_0= RULE_ID ) ) otherlv_6= 'label' ( (lv_label_7_0= RULE_STRING ) ) (otherlv_8= 'description' ( (lv_description_9_0= RULE_STRING ) ) )? (otherlv_10= 'message' ( (lv_message_11_0= RULE_STRING ) ) )? otherlv_12= 'size' ( ( (lv_min_13_0= RULE_INT ) ) otherlv_14= '..' )? ( (lv_max_15_0= RULE_INT ) ) otherlv_16= 'context' otherlv_17= '{' ( (lv_contexts_18_0= ruleSimpleContext ) )+ otherlv_19= '}' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:605:1: ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) ) otherlv_3= 'size' ( (lv_severity_4_0= ruleSeverityKind ) ) ( (lv_name_5_0= RULE_ID ) ) otherlv_6= 'label' ( (lv_label_7_0= RULE_STRING ) ) (otherlv_8= 'description' ( (lv_description_9_0= RULE_STRING ) ) )? (otherlv_10= 'message' ( (lv_message_11_0= RULE_STRING ) ) )? otherlv_12= 'size' ( ( (lv_min_13_0= RULE_INT ) ) otherlv_14= '..' )? ( (lv_max_15_0= RULE_INT ) ) otherlv_16= 'context' otherlv_17= '{' ( (lv_contexts_18_0= ruleSimpleContext ) )+ otherlv_19= '}' )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:605:2: ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) ) otherlv_3= 'size' ( (lv_severity_4_0= ruleSeverityKind ) ) ( (lv_name_5_0= RULE_ID ) ) otherlv_6= 'label' ( (lv_label_7_0= RULE_STRING ) ) (otherlv_8= 'description' ( (lv_description_9_0= RULE_STRING ) ) )? (otherlv_10= 'message' ( (lv_message_11_0= RULE_STRING ) ) )? otherlv_12= 'size' ( ( (lv_min_13_0= RULE_INT ) ) otherlv_14= '..' )? ( (lv_max_15_0= RULE_INT ) ) otherlv_16= 'context' otherlv_17= '{' ( (lv_contexts_18_0= ruleSimpleContext ) )+ otherlv_19= '}'
+            // InternalValid.g:605:1: ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) ) otherlv_3= 'size' ( (lv_severity_4_0= ruleSeverityKind ) ) ( (lv_name_5_0= RULE_ID ) ) otherlv_6= 'label' ( (lv_label_7_0= RULE_STRING ) ) (otherlv_8= 'description' ( (lv_description_9_0= RULE_STRING ) ) )? (otherlv_10= 'message' ( (lv_message_11_0= RULE_STRING ) ) )? otherlv_12= 'size' ( ( (lv_min_13_0= RULE_INT ) ) otherlv_14= '..' )? ( (lv_max_15_0= RULE_INT ) ) otherlv_16= 'context' otherlv_17= '{' ( (lv_contexts_18_0= ruleSimpleContext ) )+ otherlv_19= '}' )
+            // InternalValid.g:605:2: ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) ) otherlv_3= 'size' ( (lv_severity_4_0= ruleSeverityKind ) ) ( (lv_name_5_0= RULE_ID ) ) otherlv_6= 'label' ( (lv_label_7_0= RULE_STRING ) ) (otherlv_8= 'description' ( (lv_description_9_0= RULE_STRING ) ) )? (otherlv_10= 'message' ( (lv_message_11_0= RULE_STRING ) ) )? otherlv_12= 'size' ( ( (lv_min_13_0= RULE_INT ) ) otherlv_14= '..' )? ( (lv_max_15_0= RULE_INT ) ) otherlv_16= 'context' otherlv_17= '{' ( (lv_contexts_18_0= ruleSimpleContext ) )+ otherlv_19= '}'
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:605:2: ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:607:1: ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) )
+            // InternalValid.g:605:2: ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) )
+            // InternalValid.g:607:1: ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:607:1: ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:608:2: ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* )
+            // InternalValid.g:607:1: ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) )
+            // InternalValid.g:608:2: ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* )
             {
              
             	  getUnorderedGroupHelper().enter(grammarAccess.getSizeRuleAccess().getUnorderedGroup_0());
             	
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:611:2: ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:612:3: ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )*
+            // InternalValid.g:611:2: ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* )
+            // InternalValid.g:612:3: ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )*
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:612:3: ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )*
+            // InternalValid.g:612:3: ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )*
             loop10:
             do {
                 int alt10=3;
                 int LA10_0 = input.LA(1);
 
-                if ( LA10_0 ==17 && getUnorderedGroupHelper().canSelect(grammarAccess.getSizeRuleAccess().getUnorderedGroup_0(), 0) ) {
+                if ( LA10_0 == 17 && getUnorderedGroupHelper().canSelect(grammarAccess.getSizeRuleAccess().getUnorderedGroup_0(), 0) ) {
                     alt10=1;
                 }
-                else if ( LA10_0 >=31 && LA10_0<=33 && getUnorderedGroupHelper().canSelect(grammarAccess.getSizeRuleAccess().getUnorderedGroup_0(), 1) ) {
+                else if ( LA10_0 >= 31 && LA10_0 <= 33 && getUnorderedGroupHelper().canSelect(grammarAccess.getSizeRuleAccess().getUnorderedGroup_0(), 1) ) {
                     alt10=2;
                 }
 
 
                 switch (alt10) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:614:4: ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) )
+            	    // InternalValid.g:614:4: ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:614:4: ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:615:5: {...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) )
+            	    // InternalValid.g:614:4: ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) )
+            	    // InternalValid.g:615:5: {...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getSizeRuleAccess().getUnorderedGroup_0(), 0) ) {
             	        throw new FailedPredicateException(input, "ruleSizeRule", "getUnorderedGroupHelper().canSelect(grammarAccess.getSizeRuleAccess().getUnorderedGroup_0(), 0)");
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:615:105: ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:616:6: ({...}? => ( (lv_optional_1_0= 'optional' ) ) )
+            	    // InternalValid.g:615:105: ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) )
+            	    // InternalValid.g:616:6: ({...}? => ( (lv_optional_1_0= 'optional' ) ) )
             	    {
             	     
             	    	 				  getUnorderedGroupHelper().select(grammarAccess.getSizeRuleAccess().getUnorderedGroup_0(), 0);
             	    	 				
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:619:6: ({...}? => ( (lv_optional_1_0= 'optional' ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:619:7: {...}? => ( (lv_optional_1_0= 'optional' ) )
+            	    // InternalValid.g:619:6: ({...}? => ( (lv_optional_1_0= 'optional' ) ) )
+            	    // InternalValid.g:619:7: {...}? => ( (lv_optional_1_0= 'optional' ) )
             	    {
             	    if ( !((true)) ) {
             	        throw new FailedPredicateException(input, "ruleSizeRule", "true");
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:619:16: ( (lv_optional_1_0= 'optional' ) )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:620:1: (lv_optional_1_0= 'optional' )
+            	    // InternalValid.g:619:16: ( (lv_optional_1_0= 'optional' ) )
+            	    // InternalValid.g:620:1: (lv_optional_1_0= 'optional' )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:620:1: (lv_optional_1_0= 'optional' )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:621:3: lv_optional_1_0= 'optional'
+            	    // InternalValid.g:620:1: (lv_optional_1_0= 'optional' )
+            	    // InternalValid.g:621:3: lv_optional_1_0= 'optional'
             	    {
-            	    lv_optional_1_0=(Token)match(input,17,FOLLOW_17_in_ruleSizeRule1346); 
+            	    lv_optional_1_0=(Token)match(input,17,FOLLOW_16); 
 
             	            newLeafNode(lv_optional_1_0, grammarAccess.getSizeRuleAccess().getOptionalOptionalKeyword_0_0_0());
             	        
@@ -1505,36 +1505,36 @@ else if ( LA10_0 >=31 && LA10_0<=33 && getUnorderedGroupHelper().canSelect(gramm
             	    }
             	    break;
             	case 2 :
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:641:4: ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) )
+            	    // InternalValid.g:641:4: ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:641:4: ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:642:5: {...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) )
+            	    // InternalValid.g:641:4: ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) )
+            	    // InternalValid.g:642:5: {...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getSizeRuleAccess().getUnorderedGroup_0(), 1) ) {
             	        throw new FailedPredicateException(input, "ruleSizeRule", "getUnorderedGroupHelper().canSelect(grammarAccess.getSizeRuleAccess().getUnorderedGroup_0(), 1)");
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:642:105: ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:643:6: ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) )
+            	    // InternalValid.g:642:105: ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) )
+            	    // InternalValid.g:643:6: ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) )
             	    {
             	     
             	    	 				  getUnorderedGroupHelper().select(grammarAccess.getSizeRuleAccess().getUnorderedGroup_0(), 1);
             	    	 				
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:646:6: ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:646:7: {...}? => ( (lv_checkKind_2_0= ruleCheckKind ) )
+            	    // InternalValid.g:646:6: ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) )
+            	    // InternalValid.g:646:7: {...}? => ( (lv_checkKind_2_0= ruleCheckKind ) )
             	    {
             	    if ( !((true)) ) {
             	        throw new FailedPredicateException(input, "ruleSizeRule", "true");
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:646:16: ( (lv_checkKind_2_0= ruleCheckKind ) )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:647:1: (lv_checkKind_2_0= ruleCheckKind )
+            	    // InternalValid.g:646:16: ( (lv_checkKind_2_0= ruleCheckKind ) )
+            	    // InternalValid.g:647:1: (lv_checkKind_2_0= ruleCheckKind )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:647:1: (lv_checkKind_2_0= ruleCheckKind )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:648:3: lv_checkKind_2_0= ruleCheckKind
+            	    // InternalValid.g:647:1: (lv_checkKind_2_0= ruleCheckKind )
+            	    // InternalValid.g:648:3: lv_checkKind_2_0= ruleCheckKind
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getSizeRuleAccess().getCheckKindCheckKindEnumRuleCall_0_1_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleCheckKind_in_ruleSizeRule1434);
+            	    pushFollow(FOLLOW_16);
             	    lv_checkKind_2_0=ruleCheckKind();
 
             	    state._fsp--;
@@ -1547,7 +1547,7 @@ else if ( LA10_0 >=31 && LA10_0<=33 && getUnorderedGroupHelper().canSelect(gramm
             	           			current, 
             	           			"checkKind",
             	            		lv_checkKind_2_0, 
-            	            		"CheckKind");
+            	            		"com.avaloq.tools.ddk.xtext.valid.Valid.CheckKind");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -1589,20 +1589,20 @@ else if ( LA10_0 >=31 && LA10_0<=33 && getUnorderedGroupHelper().canSelect(gramm
 
             }
 
-            otherlv_3=(Token)match(input,20,FOLLOW_20_in_ruleSizeRule1486); 
+            otherlv_3=(Token)match(input,20,FOLLOW_11); 
 
                 	newLeafNode(otherlv_3, grammarAccess.getSizeRuleAccess().getSizeKeyword_1());
                 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:682:1: ( (lv_severity_4_0= ruleSeverityKind ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:683:1: (lv_severity_4_0= ruleSeverityKind )
+            // InternalValid.g:682:1: ( (lv_severity_4_0= ruleSeverityKind ) )
+            // InternalValid.g:683:1: (lv_severity_4_0= ruleSeverityKind )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:683:1: (lv_severity_4_0= ruleSeverityKind )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:684:3: lv_severity_4_0= ruleSeverityKind
+            // InternalValid.g:683:1: (lv_severity_4_0= ruleSeverityKind )
+            // InternalValid.g:684:3: lv_severity_4_0= ruleSeverityKind
             {
              
             	        newCompositeNode(grammarAccess.getSizeRuleAccess().getSeveritySeverityKindEnumRuleCall_2_0()); 
             	    
-            pushFollow(FOLLOW_ruleSeverityKind_in_ruleSizeRule1507);
+            pushFollow(FOLLOW_6);
             lv_severity_4_0=ruleSeverityKind();
 
             state._fsp--;
@@ -1615,7 +1615,7 @@ else if ( LA10_0 >=31 && LA10_0<=33 && getUnorderedGroupHelper().canSelect(gramm
                    			current, 
                    			"severity",
                     		lv_severity_4_0, 
-                    		"SeverityKind");
+                    		"com.avaloq.tools.ddk.xtext.valid.Valid.SeverityKind");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -1624,13 +1624,13 @@ else if ( LA10_0 >=31 && LA10_0<=33 && getUnorderedGroupHelper().canSelect(gramm
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:700:2: ( (lv_name_5_0= RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:701:1: (lv_name_5_0= RULE_ID )
+            // InternalValid.g:700:2: ( (lv_name_5_0= RULE_ID ) )
+            // InternalValid.g:701:1: (lv_name_5_0= RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:701:1: (lv_name_5_0= RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:702:3: lv_name_5_0= RULE_ID
+            // InternalValid.g:701:1: (lv_name_5_0= RULE_ID )
+            // InternalValid.g:702:3: lv_name_5_0= RULE_ID
             {
-            lv_name_5_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSizeRule1524); 
+            lv_name_5_0=(Token)match(input,RULE_ID,FOLLOW_7); 
 
             			newLeafNode(lv_name_5_0, grammarAccess.getSizeRuleAccess().getNameIDTerminalRuleCall_3_0()); 
             		
@@ -1642,7 +1642,7 @@ else if ( LA10_0 >=31 && LA10_0<=33 && getUnorderedGroupHelper().canSelect(gramm
                    			current, 
                    			"name",
                     		lv_name_5_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -1650,17 +1650,17 @@ else if ( LA10_0 >=31 && LA10_0<=33 && getUnorderedGroupHelper().canSelect(gramm
 
             }
 
-            otherlv_6=(Token)match(input,13,FOLLOW_13_in_ruleSizeRule1541); 
+            otherlv_6=(Token)match(input,13,FOLLOW_5); 
 
                 	newLeafNode(otherlv_6, grammarAccess.getSizeRuleAccess().getLabelKeyword_4());
                 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:722:1: ( (lv_label_7_0= RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:723:1: (lv_label_7_0= RULE_STRING )
+            // InternalValid.g:722:1: ( (lv_label_7_0= RULE_STRING ) )
+            // InternalValid.g:723:1: (lv_label_7_0= RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:723:1: (lv_label_7_0= RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:724:3: lv_label_7_0= RULE_STRING
+            // InternalValid.g:723:1: (lv_label_7_0= RULE_STRING )
+            // InternalValid.g:724:3: lv_label_7_0= RULE_STRING
             {
-            lv_label_7_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleSizeRule1558); 
+            lv_label_7_0=(Token)match(input,RULE_STRING,FOLLOW_17); 
 
             			newLeafNode(lv_label_7_0, grammarAccess.getSizeRuleAccess().getLabelSTRINGTerminalRuleCall_5_0()); 
             		
@@ -1672,7 +1672,7 @@ else if ( LA10_0 >=31 && LA10_0<=33 && getUnorderedGroupHelper().canSelect(gramm
                    			current, 
                    			"label",
                     		lv_label_7_0, 
-                    		"STRING");
+                    		"org.eclipse.xtext.common.Terminals.STRING");
             	    
 
             }
@@ -1680,7 +1680,7 @@ else if ( LA10_0 >=31 && LA10_0<=33 && getUnorderedGroupHelper().canSelect(gramm
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:740:2: (otherlv_8= 'description' ( (lv_description_9_0= RULE_STRING ) ) )?
+            // InternalValid.g:740:2: (otherlv_8= 'description' ( (lv_description_9_0= RULE_STRING ) ) )?
             int alt11=2;
             int LA11_0 = input.LA(1);
 
@@ -1689,19 +1689,19 @@ else if ( LA10_0 >=31 && LA10_0<=33 && getUnorderedGroupHelper().canSelect(gramm
             }
             switch (alt11) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:740:4: otherlv_8= 'description' ( (lv_description_9_0= RULE_STRING ) )
+                    // InternalValid.g:740:4: otherlv_8= 'description' ( (lv_description_9_0= RULE_STRING ) )
                     {
-                    otherlv_8=(Token)match(input,14,FOLLOW_14_in_ruleSizeRule1576); 
+                    otherlv_8=(Token)match(input,14,FOLLOW_5); 
 
                         	newLeafNode(otherlv_8, grammarAccess.getSizeRuleAccess().getDescriptionKeyword_6_0());
                         
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:744:1: ( (lv_description_9_0= RULE_STRING ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:745:1: (lv_description_9_0= RULE_STRING )
+                    // InternalValid.g:744:1: ( (lv_description_9_0= RULE_STRING ) )
+                    // InternalValid.g:745:1: (lv_description_9_0= RULE_STRING )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:745:1: (lv_description_9_0= RULE_STRING )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:746:3: lv_description_9_0= RULE_STRING
+                    // InternalValid.g:745:1: (lv_description_9_0= RULE_STRING )
+                    // InternalValid.g:746:3: lv_description_9_0= RULE_STRING
                     {
-                    lv_description_9_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleSizeRule1593); 
+                    lv_description_9_0=(Token)match(input,RULE_STRING,FOLLOW_18); 
 
                     			newLeafNode(lv_description_9_0, grammarAccess.getSizeRuleAccess().getDescriptionSTRINGTerminalRuleCall_6_1_0()); 
                     		
@@ -1713,7 +1713,7 @@ else if ( LA10_0 >=31 && LA10_0<=33 && getUnorderedGroupHelper().canSelect(gramm
                            			current, 
                            			"description",
                             		lv_description_9_0, 
-                            		"STRING");
+                            		"org.eclipse.xtext.common.Terminals.STRING");
                     	    
 
                     }
@@ -1727,7 +1727,7 @@ else if ( LA10_0 >=31 && LA10_0<=33 && getUnorderedGroupHelper().canSelect(gramm
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:762:4: (otherlv_10= 'message' ( (lv_message_11_0= RULE_STRING ) ) )?
+            // InternalValid.g:762:4: (otherlv_10= 'message' ( (lv_message_11_0= RULE_STRING ) ) )?
             int alt12=2;
             int LA12_0 = input.LA(1);
 
@@ -1736,19 +1736,19 @@ else if ( LA10_0 >=31 && LA10_0<=33 && getUnorderedGroupHelper().canSelect(gramm
             }
             switch (alt12) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:762:6: otherlv_10= 'message' ( (lv_message_11_0= RULE_STRING ) )
+                    // InternalValid.g:762:6: otherlv_10= 'message' ( (lv_message_11_0= RULE_STRING ) )
                     {
-                    otherlv_10=(Token)match(input,18,FOLLOW_18_in_ruleSizeRule1613); 
+                    otherlv_10=(Token)match(input,18,FOLLOW_5); 
 
                         	newLeafNode(otherlv_10, grammarAccess.getSizeRuleAccess().getMessageKeyword_7_0());
                         
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:766:1: ( (lv_message_11_0= RULE_STRING ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:767:1: (lv_message_11_0= RULE_STRING )
+                    // InternalValid.g:766:1: ( (lv_message_11_0= RULE_STRING ) )
+                    // InternalValid.g:767:1: (lv_message_11_0= RULE_STRING )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:767:1: (lv_message_11_0= RULE_STRING )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:768:3: lv_message_11_0= RULE_STRING
+                    // InternalValid.g:767:1: (lv_message_11_0= RULE_STRING )
+                    // InternalValid.g:768:3: lv_message_11_0= RULE_STRING
                     {
-                    lv_message_11_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleSizeRule1630); 
+                    lv_message_11_0=(Token)match(input,RULE_STRING,FOLLOW_19); 
 
                     			newLeafNode(lv_message_11_0, grammarAccess.getSizeRuleAccess().getMessageSTRINGTerminalRuleCall_7_1_0()); 
                     		
@@ -1760,7 +1760,7 @@ else if ( LA10_0 >=31 && LA10_0<=33 && getUnorderedGroupHelper().canSelect(gramm
                            			current, 
                            			"message",
                             		lv_message_11_0, 
-                            		"STRING");
+                            		"org.eclipse.xtext.common.Terminals.STRING");
                     	    
 
                     }
@@ -1774,11 +1774,11 @@ else if ( LA10_0 >=31 && LA10_0<=33 && getUnorderedGroupHelper().canSelect(gramm
 
             }
 
-            otherlv_12=(Token)match(input,20,FOLLOW_20_in_ruleSizeRule1649); 
+            otherlv_12=(Token)match(input,20,FOLLOW_20); 
 
                 	newLeafNode(otherlv_12, grammarAccess.getSizeRuleAccess().getSizeKeyword_8());
                 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:788:1: ( ( (lv_min_13_0= RULE_INT ) ) otherlv_14= '..' )?
+            // InternalValid.g:788:1: ( ( (lv_min_13_0= RULE_INT ) ) otherlv_14= '..' )?
             int alt13=2;
             int LA13_0 = input.LA(1);
 
@@ -1791,15 +1791,15 @@ else if ( LA10_0 >=31 && LA10_0<=33 && getUnorderedGroupHelper().canSelect(gramm
             }
             switch (alt13) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:788:2: ( (lv_min_13_0= RULE_INT ) ) otherlv_14= '..'
+                    // InternalValid.g:788:2: ( (lv_min_13_0= RULE_INT ) ) otherlv_14= '..'
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:788:2: ( (lv_min_13_0= RULE_INT ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:789:1: (lv_min_13_0= RULE_INT )
+                    // InternalValid.g:788:2: ( (lv_min_13_0= RULE_INT ) )
+                    // InternalValid.g:789:1: (lv_min_13_0= RULE_INT )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:789:1: (lv_min_13_0= RULE_INT )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:790:3: lv_min_13_0= RULE_INT
+                    // InternalValid.g:789:1: (lv_min_13_0= RULE_INT )
+                    // InternalValid.g:790:3: lv_min_13_0= RULE_INT
                     {
-                    lv_min_13_0=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleSizeRule1667); 
+                    lv_min_13_0=(Token)match(input,RULE_INT,FOLLOW_21); 
 
                     			newLeafNode(lv_min_13_0, grammarAccess.getSizeRuleAccess().getMinINTTerminalRuleCall_9_0_0()); 
                     		
@@ -1811,7 +1811,7 @@ else if ( LA10_0 >=31 && LA10_0<=33 && getUnorderedGroupHelper().canSelect(gramm
                            			current, 
                            			"min",
                             		lv_min_13_0, 
-                            		"INT");
+                            		"org.eclipse.xtext.common.Terminals.INT");
                     	    
 
                     }
@@ -1819,7 +1819,7 @@ else if ( LA10_0 >=31 && LA10_0<=33 && getUnorderedGroupHelper().canSelect(gramm
 
                     }
 
-                    otherlv_14=(Token)match(input,21,FOLLOW_21_in_ruleSizeRule1684); 
+                    otherlv_14=(Token)match(input,21,FOLLOW_20); 
 
                         	newLeafNode(otherlv_14, grammarAccess.getSizeRuleAccess().getFullStopFullStopKeyword_9_1());
                         
@@ -1829,13 +1829,13 @@ else if ( LA10_0 >=31 && LA10_0<=33 && getUnorderedGroupHelper().canSelect(gramm
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:810:3: ( (lv_max_15_0= RULE_INT ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:811:1: (lv_max_15_0= RULE_INT )
+            // InternalValid.g:810:3: ( (lv_max_15_0= RULE_INT ) )
+            // InternalValid.g:811:1: (lv_max_15_0= RULE_INT )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:811:1: (lv_max_15_0= RULE_INT )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:812:3: lv_max_15_0= RULE_INT
+            // InternalValid.g:811:1: (lv_max_15_0= RULE_INT )
+            // InternalValid.g:812:3: lv_max_15_0= RULE_INT
             {
-            lv_max_15_0=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleSizeRule1703); 
+            lv_max_15_0=(Token)match(input,RULE_INT,FOLLOW_14); 
 
             			newLeafNode(lv_max_15_0, grammarAccess.getSizeRuleAccess().getMaxINTTerminalRuleCall_10_0()); 
             		
@@ -1847,7 +1847,7 @@ else if ( LA10_0 >=31 && LA10_0<=33 && getUnorderedGroupHelper().canSelect(gramm
                    			current, 
                    			"max",
                     		lv_max_15_0, 
-                    		"INT");
+                    		"org.eclipse.xtext.common.Terminals.INT");
             	    
 
             }
@@ -1855,15 +1855,15 @@ else if ( LA10_0 >=31 && LA10_0<=33 && getUnorderedGroupHelper().canSelect(gramm
 
             }
 
-            otherlv_16=(Token)match(input,19,FOLLOW_19_in_ruleSizeRule1720); 
+            otherlv_16=(Token)match(input,19,FOLLOW_9); 
 
                 	newLeafNode(otherlv_16, grammarAccess.getSizeRuleAccess().getContextKeyword_11());
                 
-            otherlv_17=(Token)match(input,15,FOLLOW_15_in_ruleSizeRule1732); 
+            otherlv_17=(Token)match(input,15,FOLLOW_6); 
 
                 	newLeafNode(otherlv_17, grammarAccess.getSizeRuleAccess().getLeftCurlyBracketKeyword_12());
                 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:836:1: ( (lv_contexts_18_0= ruleSimpleContext ) )+
+            // InternalValid.g:836:1: ( (lv_contexts_18_0= ruleSimpleContext ) )+
             int cnt14=0;
             loop14:
             do {
@@ -1877,15 +1877,15 @@ else if ( LA10_0 >=31 && LA10_0<=33 && getUnorderedGroupHelper().canSelect(gramm
 
                 switch (alt14) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:837:1: (lv_contexts_18_0= ruleSimpleContext )
+            	    // InternalValid.g:837:1: (lv_contexts_18_0= ruleSimpleContext )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:837:1: (lv_contexts_18_0= ruleSimpleContext )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:838:3: lv_contexts_18_0= ruleSimpleContext
+            	    // InternalValid.g:837:1: (lv_contexts_18_0= ruleSimpleContext )
+            	    // InternalValid.g:838:3: lv_contexts_18_0= ruleSimpleContext
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getSizeRuleAccess().getContextsSimpleContextParserRuleCall_13_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleSimpleContext_in_ruleSizeRule1753);
+            	    pushFollow(FOLLOW_15);
             	    lv_contexts_18_0=ruleSimpleContext();
 
             	    state._fsp--;
@@ -1898,7 +1898,7 @@ else if ( LA10_0 >=31 && LA10_0<=33 && getUnorderedGroupHelper().canSelect(gramm
             	           			current, 
             	           			"contexts",
             	            		lv_contexts_18_0, 
-            	            		"SimpleContext");
+            	            		"com.avaloq.tools.ddk.xtext.valid.Valid.SimpleContext");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -1917,7 +1917,7 @@ else if ( LA10_0 >=31 && LA10_0<=33 && getUnorderedGroupHelper().canSelect(gramm
                 cnt14++;
             } while (true);
 
-            otherlv_19=(Token)match(input,16,FOLLOW_16_in_ruleSizeRule1766); 
+            otherlv_19=(Token)match(input,16,FOLLOW_2); 
 
                 	newLeafNode(otherlv_19, grammarAccess.getSizeRuleAccess().getRightCurlyBracketKeyword_14());
                 
@@ -1942,7 +1942,7 @@ else if ( LA10_0 >=31 && LA10_0<=33 && getUnorderedGroupHelper().canSelect(gramm
 
 
     // $ANTLR start "entryRuleRangeRule"
-    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:866:1: entryRuleRangeRule returns [EObject current=null] : iv_ruleRangeRule= ruleRangeRule EOF ;
+    // InternalValid.g:866:1: entryRuleRangeRule returns [EObject current=null] : iv_ruleRangeRule= ruleRangeRule EOF ;
     public final EObject entryRuleRangeRule() throws RecognitionException {
         EObject current = null;
 
@@ -1950,17 +1950,17 @@ public final EObject entryRuleRangeRule() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:867:2: (iv_ruleRangeRule= ruleRangeRule EOF )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:868:2: iv_ruleRangeRule= ruleRangeRule EOF
+            // InternalValid.g:867:2: (iv_ruleRangeRule= ruleRangeRule EOF )
+            // InternalValid.g:868:2: iv_ruleRangeRule= ruleRangeRule EOF
             {
              newCompositeNode(grammarAccess.getRangeRuleRule()); 
-            pushFollow(FOLLOW_ruleRangeRule_in_entryRuleRangeRule1802);
+            pushFollow(FOLLOW_1);
             iv_ruleRangeRule=ruleRangeRule();
 
             state._fsp--;
 
              current =iv_ruleRangeRule; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRangeRule1812); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -1978,7 +1978,7 @@ public final EObject entryRuleRangeRule() throws RecognitionException {
 
 
     // $ANTLR start "ruleRangeRule"
-    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:875:1: ruleRangeRule returns [EObject current=null] : ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) ) otherlv_3= 'range' ( (lv_severity_4_0= ruleSeverityKind ) ) ( (lv_name_5_0= RULE_ID ) ) otherlv_6= 'label' ( (lv_label_7_0= RULE_STRING ) ) (otherlv_8= 'description' ( (lv_description_9_0= RULE_STRING ) ) )? (otherlv_10= 'message' ( (lv_message_11_0= RULE_STRING ) ) )? otherlv_12= 'range' ( ( (lv_min_13_0= RULE_INT ) ) otherlv_14= '..' )? ( (lv_max_15_0= RULE_INT ) ) otherlv_16= 'context' otherlv_17= '{' ( (lv_contexts_18_0= ruleSimpleContext ) )+ otherlv_19= '}' ) ;
+    // InternalValid.g:875:1: ruleRangeRule returns [EObject current=null] : ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) ) otherlv_3= 'range' ( (lv_severity_4_0= ruleSeverityKind ) ) ( (lv_name_5_0= RULE_ID ) ) otherlv_6= 'label' ( (lv_label_7_0= RULE_STRING ) ) (otherlv_8= 'description' ( (lv_description_9_0= RULE_STRING ) ) )? (otherlv_10= 'message' ( (lv_message_11_0= RULE_STRING ) ) )? otherlv_12= 'range' ( ( (lv_min_13_0= RULE_INT ) ) otherlv_14= '..' )? ( (lv_max_15_0= RULE_INT ) ) otherlv_16= 'context' otherlv_17= '{' ( (lv_contexts_18_0= ruleSimpleContext ) )+ otherlv_19= '}' ) ;
     public final EObject ruleRangeRule() throws RecognitionException {
         EObject current = null;
 
@@ -2008,67 +2008,67 @@ public final EObject ruleRangeRule() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:878:28: ( ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) ) otherlv_3= 'range' ( (lv_severity_4_0= ruleSeverityKind ) ) ( (lv_name_5_0= RULE_ID ) ) otherlv_6= 'label' ( (lv_label_7_0= RULE_STRING ) ) (otherlv_8= 'description' ( (lv_description_9_0= RULE_STRING ) ) )? (otherlv_10= 'message' ( (lv_message_11_0= RULE_STRING ) ) )? otherlv_12= 'range' ( ( (lv_min_13_0= RULE_INT ) ) otherlv_14= '..' )? ( (lv_max_15_0= RULE_INT ) ) otherlv_16= 'context' otherlv_17= '{' ( (lv_contexts_18_0= ruleSimpleContext ) )+ otherlv_19= '}' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:879:1: ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) ) otherlv_3= 'range' ( (lv_severity_4_0= ruleSeverityKind ) ) ( (lv_name_5_0= RULE_ID ) ) otherlv_6= 'label' ( (lv_label_7_0= RULE_STRING ) ) (otherlv_8= 'description' ( (lv_description_9_0= RULE_STRING ) ) )? (otherlv_10= 'message' ( (lv_message_11_0= RULE_STRING ) ) )? otherlv_12= 'range' ( ( (lv_min_13_0= RULE_INT ) ) otherlv_14= '..' )? ( (lv_max_15_0= RULE_INT ) ) otherlv_16= 'context' otherlv_17= '{' ( (lv_contexts_18_0= ruleSimpleContext ) )+ otherlv_19= '}' )
+            // InternalValid.g:878:28: ( ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) ) otherlv_3= 'range' ( (lv_severity_4_0= ruleSeverityKind ) ) ( (lv_name_5_0= RULE_ID ) ) otherlv_6= 'label' ( (lv_label_7_0= RULE_STRING ) ) (otherlv_8= 'description' ( (lv_description_9_0= RULE_STRING ) ) )? (otherlv_10= 'message' ( (lv_message_11_0= RULE_STRING ) ) )? otherlv_12= 'range' ( ( (lv_min_13_0= RULE_INT ) ) otherlv_14= '..' )? ( (lv_max_15_0= RULE_INT ) ) otherlv_16= 'context' otherlv_17= '{' ( (lv_contexts_18_0= ruleSimpleContext ) )+ otherlv_19= '}' ) )
+            // InternalValid.g:879:1: ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) ) otherlv_3= 'range' ( (lv_severity_4_0= ruleSeverityKind ) ) ( (lv_name_5_0= RULE_ID ) ) otherlv_6= 'label' ( (lv_label_7_0= RULE_STRING ) ) (otherlv_8= 'description' ( (lv_description_9_0= RULE_STRING ) ) )? (otherlv_10= 'message' ( (lv_message_11_0= RULE_STRING ) ) )? otherlv_12= 'range' ( ( (lv_min_13_0= RULE_INT ) ) otherlv_14= '..' )? ( (lv_max_15_0= RULE_INT ) ) otherlv_16= 'context' otherlv_17= '{' ( (lv_contexts_18_0= ruleSimpleContext ) )+ otherlv_19= '}' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:879:1: ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) ) otherlv_3= 'range' ( (lv_severity_4_0= ruleSeverityKind ) ) ( (lv_name_5_0= RULE_ID ) ) otherlv_6= 'label' ( (lv_label_7_0= RULE_STRING ) ) (otherlv_8= 'description' ( (lv_description_9_0= RULE_STRING ) ) )? (otherlv_10= 'message' ( (lv_message_11_0= RULE_STRING ) ) )? otherlv_12= 'range' ( ( (lv_min_13_0= RULE_INT ) ) otherlv_14= '..' )? ( (lv_max_15_0= RULE_INT ) ) otherlv_16= 'context' otherlv_17= '{' ( (lv_contexts_18_0= ruleSimpleContext ) )+ otherlv_19= '}' )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:879:2: ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) ) otherlv_3= 'range' ( (lv_severity_4_0= ruleSeverityKind ) ) ( (lv_name_5_0= RULE_ID ) ) otherlv_6= 'label' ( (lv_label_7_0= RULE_STRING ) ) (otherlv_8= 'description' ( (lv_description_9_0= RULE_STRING ) ) )? (otherlv_10= 'message' ( (lv_message_11_0= RULE_STRING ) ) )? otherlv_12= 'range' ( ( (lv_min_13_0= RULE_INT ) ) otherlv_14= '..' )? ( (lv_max_15_0= RULE_INT ) ) otherlv_16= 'context' otherlv_17= '{' ( (lv_contexts_18_0= ruleSimpleContext ) )+ otherlv_19= '}'
+            // InternalValid.g:879:1: ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) ) otherlv_3= 'range' ( (lv_severity_4_0= ruleSeverityKind ) ) ( (lv_name_5_0= RULE_ID ) ) otherlv_6= 'label' ( (lv_label_7_0= RULE_STRING ) ) (otherlv_8= 'description' ( (lv_description_9_0= RULE_STRING ) ) )? (otherlv_10= 'message' ( (lv_message_11_0= RULE_STRING ) ) )? otherlv_12= 'range' ( ( (lv_min_13_0= RULE_INT ) ) otherlv_14= '..' )? ( (lv_max_15_0= RULE_INT ) ) otherlv_16= 'context' otherlv_17= '{' ( (lv_contexts_18_0= ruleSimpleContext ) )+ otherlv_19= '}' )
+            // InternalValid.g:879:2: ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) ) otherlv_3= 'range' ( (lv_severity_4_0= ruleSeverityKind ) ) ( (lv_name_5_0= RULE_ID ) ) otherlv_6= 'label' ( (lv_label_7_0= RULE_STRING ) ) (otherlv_8= 'description' ( (lv_description_9_0= RULE_STRING ) ) )? (otherlv_10= 'message' ( (lv_message_11_0= RULE_STRING ) ) )? otherlv_12= 'range' ( ( (lv_min_13_0= RULE_INT ) ) otherlv_14= '..' )? ( (lv_max_15_0= RULE_INT ) ) otherlv_16= 'context' otherlv_17= '{' ( (lv_contexts_18_0= ruleSimpleContext ) )+ otherlv_19= '}'
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:879:2: ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:881:1: ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) )
+            // InternalValid.g:879:2: ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) )
+            // InternalValid.g:881:1: ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:881:1: ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:882:2: ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* )
+            // InternalValid.g:881:1: ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) )
+            // InternalValid.g:882:2: ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* )
             {
              
             	  getUnorderedGroupHelper().enter(grammarAccess.getRangeRuleAccess().getUnorderedGroup_0());
             	
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:885:2: ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:886:3: ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )*
+            // InternalValid.g:885:2: ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* )
+            // InternalValid.g:886:3: ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )*
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:886:3: ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )*
+            // InternalValid.g:886:3: ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )*
             loop15:
             do {
                 int alt15=3;
                 int LA15_0 = input.LA(1);
 
-                if ( LA15_0 ==17 && getUnorderedGroupHelper().canSelect(grammarAccess.getRangeRuleAccess().getUnorderedGroup_0(), 0) ) {
+                if ( LA15_0 == 17 && getUnorderedGroupHelper().canSelect(grammarAccess.getRangeRuleAccess().getUnorderedGroup_0(), 0) ) {
                     alt15=1;
                 }
-                else if ( LA15_0 >=31 && LA15_0<=33 && getUnorderedGroupHelper().canSelect(grammarAccess.getRangeRuleAccess().getUnorderedGroup_0(), 1) ) {
+                else if ( LA15_0 >= 31 && LA15_0 <= 33 && getUnorderedGroupHelper().canSelect(grammarAccess.getRangeRuleAccess().getUnorderedGroup_0(), 1) ) {
                     alt15=2;
                 }
 
 
                 switch (alt15) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:888:4: ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) )
+            	    // InternalValid.g:888:4: ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:888:4: ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:889:5: {...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) )
+            	    // InternalValid.g:888:4: ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) )
+            	    // InternalValid.g:889:5: {...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getRangeRuleAccess().getUnorderedGroup_0(), 0) ) {
             	        throw new FailedPredicateException(input, "ruleRangeRule", "getUnorderedGroupHelper().canSelect(grammarAccess.getRangeRuleAccess().getUnorderedGroup_0(), 0)");
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:889:106: ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:890:6: ({...}? => ( (lv_optional_1_0= 'optional' ) ) )
+            	    // InternalValid.g:889:106: ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) )
+            	    // InternalValid.g:890:6: ({...}? => ( (lv_optional_1_0= 'optional' ) ) )
             	    {
             	     
             	    	 				  getUnorderedGroupHelper().select(grammarAccess.getRangeRuleAccess().getUnorderedGroup_0(), 0);
             	    	 				
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:893:6: ({...}? => ( (lv_optional_1_0= 'optional' ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:893:7: {...}? => ( (lv_optional_1_0= 'optional' ) )
+            	    // InternalValid.g:893:6: ({...}? => ( (lv_optional_1_0= 'optional' ) ) )
+            	    // InternalValid.g:893:7: {...}? => ( (lv_optional_1_0= 'optional' ) )
             	    {
             	    if ( !((true)) ) {
             	        throw new FailedPredicateException(input, "ruleRangeRule", "true");
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:893:16: ( (lv_optional_1_0= 'optional' ) )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:894:1: (lv_optional_1_0= 'optional' )
+            	    // InternalValid.g:893:16: ( (lv_optional_1_0= 'optional' ) )
+            	    // InternalValid.g:894:1: (lv_optional_1_0= 'optional' )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:894:1: (lv_optional_1_0= 'optional' )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:895:3: lv_optional_1_0= 'optional'
+            	    // InternalValid.g:894:1: (lv_optional_1_0= 'optional' )
+            	    // InternalValid.g:895:3: lv_optional_1_0= 'optional'
             	    {
-            	    lv_optional_1_0=(Token)match(input,17,FOLLOW_17_in_ruleRangeRule1900); 
+            	    lv_optional_1_0=(Token)match(input,17,FOLLOW_22); 
 
             	            newLeafNode(lv_optional_1_0, grammarAccess.getRangeRuleAccess().getOptionalOptionalKeyword_0_0_0());
             	        
@@ -2100,36 +2100,36 @@ else if ( LA15_0 >=31 && LA15_0<=33 && getUnorderedGroupHelper().canSelect(gramm
             	    }
             	    break;
             	case 2 :
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:915:4: ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) )
+            	    // InternalValid.g:915:4: ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:915:4: ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:916:5: {...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) )
+            	    // InternalValid.g:915:4: ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) )
+            	    // InternalValid.g:916:5: {...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getRangeRuleAccess().getUnorderedGroup_0(), 1) ) {
             	        throw new FailedPredicateException(input, "ruleRangeRule", "getUnorderedGroupHelper().canSelect(grammarAccess.getRangeRuleAccess().getUnorderedGroup_0(), 1)");
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:916:106: ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:917:6: ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) )
+            	    // InternalValid.g:916:106: ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) )
+            	    // InternalValid.g:917:6: ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) )
             	    {
             	     
             	    	 				  getUnorderedGroupHelper().select(grammarAccess.getRangeRuleAccess().getUnorderedGroup_0(), 1);
             	    	 				
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:920:6: ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:920:7: {...}? => ( (lv_checkKind_2_0= ruleCheckKind ) )
+            	    // InternalValid.g:920:6: ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) )
+            	    // InternalValid.g:920:7: {...}? => ( (lv_checkKind_2_0= ruleCheckKind ) )
             	    {
             	    if ( !((true)) ) {
             	        throw new FailedPredicateException(input, "ruleRangeRule", "true");
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:920:16: ( (lv_checkKind_2_0= ruleCheckKind ) )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:921:1: (lv_checkKind_2_0= ruleCheckKind )
+            	    // InternalValid.g:920:16: ( (lv_checkKind_2_0= ruleCheckKind ) )
+            	    // InternalValid.g:921:1: (lv_checkKind_2_0= ruleCheckKind )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:921:1: (lv_checkKind_2_0= ruleCheckKind )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:922:3: lv_checkKind_2_0= ruleCheckKind
+            	    // InternalValid.g:921:1: (lv_checkKind_2_0= ruleCheckKind )
+            	    // InternalValid.g:922:3: lv_checkKind_2_0= ruleCheckKind
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getRangeRuleAccess().getCheckKindCheckKindEnumRuleCall_0_1_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleCheckKind_in_ruleRangeRule1988);
+            	    pushFollow(FOLLOW_22);
             	    lv_checkKind_2_0=ruleCheckKind();
 
             	    state._fsp--;
@@ -2142,7 +2142,7 @@ else if ( LA15_0 >=31 && LA15_0<=33 && getUnorderedGroupHelper().canSelect(gramm
             	           			current, 
             	           			"checkKind",
             	            		lv_checkKind_2_0, 
-            	            		"CheckKind");
+            	            		"com.avaloq.tools.ddk.xtext.valid.Valid.CheckKind");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -2184,20 +2184,20 @@ else if ( LA15_0 >=31 && LA15_0<=33 && getUnorderedGroupHelper().canSelect(gramm
 
             }
 
-            otherlv_3=(Token)match(input,22,FOLLOW_22_in_ruleRangeRule2040); 
+            otherlv_3=(Token)match(input,22,FOLLOW_11); 
 
                 	newLeafNode(otherlv_3, grammarAccess.getRangeRuleAccess().getRangeKeyword_1());
                 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:956:1: ( (lv_severity_4_0= ruleSeverityKind ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:957:1: (lv_severity_4_0= ruleSeverityKind )
+            // InternalValid.g:956:1: ( (lv_severity_4_0= ruleSeverityKind ) )
+            // InternalValid.g:957:1: (lv_severity_4_0= ruleSeverityKind )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:957:1: (lv_severity_4_0= ruleSeverityKind )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:958:3: lv_severity_4_0= ruleSeverityKind
+            // InternalValid.g:957:1: (lv_severity_4_0= ruleSeverityKind )
+            // InternalValid.g:958:3: lv_severity_4_0= ruleSeverityKind
             {
              
             	        newCompositeNode(grammarAccess.getRangeRuleAccess().getSeveritySeverityKindEnumRuleCall_2_0()); 
             	    
-            pushFollow(FOLLOW_ruleSeverityKind_in_ruleRangeRule2061);
+            pushFollow(FOLLOW_6);
             lv_severity_4_0=ruleSeverityKind();
 
             state._fsp--;
@@ -2210,7 +2210,7 @@ else if ( LA15_0 >=31 && LA15_0<=33 && getUnorderedGroupHelper().canSelect(gramm
                    			current, 
                    			"severity",
                     		lv_severity_4_0, 
-                    		"SeverityKind");
+                    		"com.avaloq.tools.ddk.xtext.valid.Valid.SeverityKind");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -2219,13 +2219,13 @@ else if ( LA15_0 >=31 && LA15_0<=33 && getUnorderedGroupHelper().canSelect(gramm
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:974:2: ( (lv_name_5_0= RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:975:1: (lv_name_5_0= RULE_ID )
+            // InternalValid.g:974:2: ( (lv_name_5_0= RULE_ID ) )
+            // InternalValid.g:975:1: (lv_name_5_0= RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:975:1: (lv_name_5_0= RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:976:3: lv_name_5_0= RULE_ID
+            // InternalValid.g:975:1: (lv_name_5_0= RULE_ID )
+            // InternalValid.g:976:3: lv_name_5_0= RULE_ID
             {
-            lv_name_5_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleRangeRule2078); 
+            lv_name_5_0=(Token)match(input,RULE_ID,FOLLOW_7); 
 
             			newLeafNode(lv_name_5_0, grammarAccess.getRangeRuleAccess().getNameIDTerminalRuleCall_3_0()); 
             		
@@ -2237,7 +2237,7 @@ else if ( LA15_0 >=31 && LA15_0<=33 && getUnorderedGroupHelper().canSelect(gramm
                    			current, 
                    			"name",
                     		lv_name_5_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -2245,17 +2245,17 @@ else if ( LA15_0 >=31 && LA15_0<=33 && getUnorderedGroupHelper().canSelect(gramm
 
             }
 
-            otherlv_6=(Token)match(input,13,FOLLOW_13_in_ruleRangeRule2095); 
+            otherlv_6=(Token)match(input,13,FOLLOW_5); 
 
                 	newLeafNode(otherlv_6, grammarAccess.getRangeRuleAccess().getLabelKeyword_4());
                 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:996:1: ( (lv_label_7_0= RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:997:1: (lv_label_7_0= RULE_STRING )
+            // InternalValid.g:996:1: ( (lv_label_7_0= RULE_STRING ) )
+            // InternalValid.g:997:1: (lv_label_7_0= RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:997:1: (lv_label_7_0= RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:998:3: lv_label_7_0= RULE_STRING
+            // InternalValid.g:997:1: (lv_label_7_0= RULE_STRING )
+            // InternalValid.g:998:3: lv_label_7_0= RULE_STRING
             {
-            lv_label_7_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleRangeRule2112); 
+            lv_label_7_0=(Token)match(input,RULE_STRING,FOLLOW_23); 
 
             			newLeafNode(lv_label_7_0, grammarAccess.getRangeRuleAccess().getLabelSTRINGTerminalRuleCall_5_0()); 
             		
@@ -2267,7 +2267,7 @@ else if ( LA15_0 >=31 && LA15_0<=33 && getUnorderedGroupHelper().canSelect(gramm
                    			current, 
                    			"label",
                     		lv_label_7_0, 
-                    		"STRING");
+                    		"org.eclipse.xtext.common.Terminals.STRING");
             	    
 
             }
@@ -2275,7 +2275,7 @@ else if ( LA15_0 >=31 && LA15_0<=33 && getUnorderedGroupHelper().canSelect(gramm
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1014:2: (otherlv_8= 'description' ( (lv_description_9_0= RULE_STRING ) ) )?
+            // InternalValid.g:1014:2: (otherlv_8= 'description' ( (lv_description_9_0= RULE_STRING ) ) )?
             int alt16=2;
             int LA16_0 = input.LA(1);
 
@@ -2284,19 +2284,19 @@ else if ( LA15_0 >=31 && LA15_0<=33 && getUnorderedGroupHelper().canSelect(gramm
             }
             switch (alt16) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1014:4: otherlv_8= 'description' ( (lv_description_9_0= RULE_STRING ) )
+                    // InternalValid.g:1014:4: otherlv_8= 'description' ( (lv_description_9_0= RULE_STRING ) )
                     {
-                    otherlv_8=(Token)match(input,14,FOLLOW_14_in_ruleRangeRule2130); 
+                    otherlv_8=(Token)match(input,14,FOLLOW_5); 
 
                         	newLeafNode(otherlv_8, grammarAccess.getRangeRuleAccess().getDescriptionKeyword_6_0());
                         
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1018:1: ( (lv_description_9_0= RULE_STRING ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1019:1: (lv_description_9_0= RULE_STRING )
+                    // InternalValid.g:1018:1: ( (lv_description_9_0= RULE_STRING ) )
+                    // InternalValid.g:1019:1: (lv_description_9_0= RULE_STRING )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1019:1: (lv_description_9_0= RULE_STRING )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1020:3: lv_description_9_0= RULE_STRING
+                    // InternalValid.g:1019:1: (lv_description_9_0= RULE_STRING )
+                    // InternalValid.g:1020:3: lv_description_9_0= RULE_STRING
                     {
-                    lv_description_9_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleRangeRule2147); 
+                    lv_description_9_0=(Token)match(input,RULE_STRING,FOLLOW_24); 
 
                     			newLeafNode(lv_description_9_0, grammarAccess.getRangeRuleAccess().getDescriptionSTRINGTerminalRuleCall_6_1_0()); 
                     		
@@ -2308,7 +2308,7 @@ else if ( LA15_0 >=31 && LA15_0<=33 && getUnorderedGroupHelper().canSelect(gramm
                            			current, 
                            			"description",
                             		lv_description_9_0, 
-                            		"STRING");
+                            		"org.eclipse.xtext.common.Terminals.STRING");
                     	    
 
                     }
@@ -2322,7 +2322,7 @@ else if ( LA15_0 >=31 && LA15_0<=33 && getUnorderedGroupHelper().canSelect(gramm
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1036:4: (otherlv_10= 'message' ( (lv_message_11_0= RULE_STRING ) ) )?
+            // InternalValid.g:1036:4: (otherlv_10= 'message' ( (lv_message_11_0= RULE_STRING ) ) )?
             int alt17=2;
             int LA17_0 = input.LA(1);
 
@@ -2331,19 +2331,19 @@ else if ( LA15_0 >=31 && LA15_0<=33 && getUnorderedGroupHelper().canSelect(gramm
             }
             switch (alt17) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1036:6: otherlv_10= 'message' ( (lv_message_11_0= RULE_STRING ) )
+                    // InternalValid.g:1036:6: otherlv_10= 'message' ( (lv_message_11_0= RULE_STRING ) )
                     {
-                    otherlv_10=(Token)match(input,18,FOLLOW_18_in_ruleRangeRule2167); 
+                    otherlv_10=(Token)match(input,18,FOLLOW_5); 
 
                         	newLeafNode(otherlv_10, grammarAccess.getRangeRuleAccess().getMessageKeyword_7_0());
                         
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1040:1: ( (lv_message_11_0= RULE_STRING ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1041:1: (lv_message_11_0= RULE_STRING )
+                    // InternalValid.g:1040:1: ( (lv_message_11_0= RULE_STRING ) )
+                    // InternalValid.g:1041:1: (lv_message_11_0= RULE_STRING )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1041:1: (lv_message_11_0= RULE_STRING )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1042:3: lv_message_11_0= RULE_STRING
+                    // InternalValid.g:1041:1: (lv_message_11_0= RULE_STRING )
+                    // InternalValid.g:1042:3: lv_message_11_0= RULE_STRING
                     {
-                    lv_message_11_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleRangeRule2184); 
+                    lv_message_11_0=(Token)match(input,RULE_STRING,FOLLOW_25); 
 
                     			newLeafNode(lv_message_11_0, grammarAccess.getRangeRuleAccess().getMessageSTRINGTerminalRuleCall_7_1_0()); 
                     		
@@ -2355,7 +2355,7 @@ else if ( LA15_0 >=31 && LA15_0<=33 && getUnorderedGroupHelper().canSelect(gramm
                            			current, 
                            			"message",
                             		lv_message_11_0, 
-                            		"STRING");
+                            		"org.eclipse.xtext.common.Terminals.STRING");
                     	    
 
                     }
@@ -2369,11 +2369,11 @@ else if ( LA15_0 >=31 && LA15_0<=33 && getUnorderedGroupHelper().canSelect(gramm
 
             }
 
-            otherlv_12=(Token)match(input,22,FOLLOW_22_in_ruleRangeRule2203); 
+            otherlv_12=(Token)match(input,22,FOLLOW_20); 
 
                 	newLeafNode(otherlv_12, grammarAccess.getRangeRuleAccess().getRangeKeyword_8());
                 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1062:1: ( ( (lv_min_13_0= RULE_INT ) ) otherlv_14= '..' )?
+            // InternalValid.g:1062:1: ( ( (lv_min_13_0= RULE_INT ) ) otherlv_14= '..' )?
             int alt18=2;
             int LA18_0 = input.LA(1);
 
@@ -2386,15 +2386,15 @@ else if ( LA15_0 >=31 && LA15_0<=33 && getUnorderedGroupHelper().canSelect(gramm
             }
             switch (alt18) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1062:2: ( (lv_min_13_0= RULE_INT ) ) otherlv_14= '..'
+                    // InternalValid.g:1062:2: ( (lv_min_13_0= RULE_INT ) ) otherlv_14= '..'
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1062:2: ( (lv_min_13_0= RULE_INT ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1063:1: (lv_min_13_0= RULE_INT )
+                    // InternalValid.g:1062:2: ( (lv_min_13_0= RULE_INT ) )
+                    // InternalValid.g:1063:1: (lv_min_13_0= RULE_INT )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1063:1: (lv_min_13_0= RULE_INT )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1064:3: lv_min_13_0= RULE_INT
+                    // InternalValid.g:1063:1: (lv_min_13_0= RULE_INT )
+                    // InternalValid.g:1064:3: lv_min_13_0= RULE_INT
                     {
-                    lv_min_13_0=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleRangeRule2221); 
+                    lv_min_13_0=(Token)match(input,RULE_INT,FOLLOW_21); 
 
                     			newLeafNode(lv_min_13_0, grammarAccess.getRangeRuleAccess().getMinINTTerminalRuleCall_9_0_0()); 
                     		
@@ -2406,7 +2406,7 @@ else if ( LA15_0 >=31 && LA15_0<=33 && getUnorderedGroupHelper().canSelect(gramm
                            			current, 
                            			"min",
                             		lv_min_13_0, 
-                            		"INT");
+                            		"org.eclipse.xtext.common.Terminals.INT");
                     	    
 
                     }
@@ -2414,7 +2414,7 @@ else if ( LA15_0 >=31 && LA15_0<=33 && getUnorderedGroupHelper().canSelect(gramm
 
                     }
 
-                    otherlv_14=(Token)match(input,21,FOLLOW_21_in_ruleRangeRule2238); 
+                    otherlv_14=(Token)match(input,21,FOLLOW_20); 
 
                         	newLeafNode(otherlv_14, grammarAccess.getRangeRuleAccess().getFullStopFullStopKeyword_9_1());
                         
@@ -2424,13 +2424,13 @@ else if ( LA15_0 >=31 && LA15_0<=33 && getUnorderedGroupHelper().canSelect(gramm
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1084:3: ( (lv_max_15_0= RULE_INT ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1085:1: (lv_max_15_0= RULE_INT )
+            // InternalValid.g:1084:3: ( (lv_max_15_0= RULE_INT ) )
+            // InternalValid.g:1085:1: (lv_max_15_0= RULE_INT )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1085:1: (lv_max_15_0= RULE_INT )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1086:3: lv_max_15_0= RULE_INT
+            // InternalValid.g:1085:1: (lv_max_15_0= RULE_INT )
+            // InternalValid.g:1086:3: lv_max_15_0= RULE_INT
             {
-            lv_max_15_0=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleRangeRule2257); 
+            lv_max_15_0=(Token)match(input,RULE_INT,FOLLOW_14); 
 
             			newLeafNode(lv_max_15_0, grammarAccess.getRangeRuleAccess().getMaxINTTerminalRuleCall_10_0()); 
             		
@@ -2442,7 +2442,7 @@ else if ( LA15_0 >=31 && LA15_0<=33 && getUnorderedGroupHelper().canSelect(gramm
                    			current, 
                    			"max",
                     		lv_max_15_0, 
-                    		"INT");
+                    		"org.eclipse.xtext.common.Terminals.INT");
             	    
 
             }
@@ -2450,15 +2450,15 @@ else if ( LA15_0 >=31 && LA15_0<=33 && getUnorderedGroupHelper().canSelect(gramm
 
             }
 
-            otherlv_16=(Token)match(input,19,FOLLOW_19_in_ruleRangeRule2274); 
+            otherlv_16=(Token)match(input,19,FOLLOW_9); 
 
                 	newLeafNode(otherlv_16, grammarAccess.getRangeRuleAccess().getContextKeyword_11());
                 
-            otherlv_17=(Token)match(input,15,FOLLOW_15_in_ruleRangeRule2286); 
+            otherlv_17=(Token)match(input,15,FOLLOW_6); 
 
                 	newLeafNode(otherlv_17, grammarAccess.getRangeRuleAccess().getLeftCurlyBracketKeyword_12());
                 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1110:1: ( (lv_contexts_18_0= ruleSimpleContext ) )+
+            // InternalValid.g:1110:1: ( (lv_contexts_18_0= ruleSimpleContext ) )+
             int cnt19=0;
             loop19:
             do {
@@ -2472,15 +2472,15 @@ else if ( LA15_0 >=31 && LA15_0<=33 && getUnorderedGroupHelper().canSelect(gramm
 
                 switch (alt19) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1111:1: (lv_contexts_18_0= ruleSimpleContext )
+            	    // InternalValid.g:1111:1: (lv_contexts_18_0= ruleSimpleContext )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1111:1: (lv_contexts_18_0= ruleSimpleContext )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1112:3: lv_contexts_18_0= ruleSimpleContext
+            	    // InternalValid.g:1111:1: (lv_contexts_18_0= ruleSimpleContext )
+            	    // InternalValid.g:1112:3: lv_contexts_18_0= ruleSimpleContext
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getRangeRuleAccess().getContextsSimpleContextParserRuleCall_13_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleSimpleContext_in_ruleRangeRule2307);
+            	    pushFollow(FOLLOW_15);
             	    lv_contexts_18_0=ruleSimpleContext();
 
             	    state._fsp--;
@@ -2493,7 +2493,7 @@ else if ( LA15_0 >=31 && LA15_0<=33 && getUnorderedGroupHelper().canSelect(gramm
             	           			current, 
             	           			"contexts",
             	            		lv_contexts_18_0, 
-            	            		"SimpleContext");
+            	            		"com.avaloq.tools.ddk.xtext.valid.Valid.SimpleContext");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -2512,7 +2512,7 @@ else if ( LA15_0 >=31 && LA15_0<=33 && getUnorderedGroupHelper().canSelect(gramm
                 cnt19++;
             } while (true);
 
-            otherlv_19=(Token)match(input,16,FOLLOW_16_in_ruleRangeRule2320); 
+            otherlv_19=(Token)match(input,16,FOLLOW_2); 
 
                 	newLeafNode(otherlv_19, grammarAccess.getRangeRuleAccess().getRightCurlyBracketKeyword_14());
                 
@@ -2537,7 +2537,7 @@ else if ( LA15_0 >=31 && LA15_0<=33 && getUnorderedGroupHelper().canSelect(gramm
 
 
     // $ANTLR start "entryRuleUniqueRule"
-    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1140:1: entryRuleUniqueRule returns [EObject current=null] : iv_ruleUniqueRule= ruleUniqueRule EOF ;
+    // InternalValid.g:1140:1: entryRuleUniqueRule returns [EObject current=null] : iv_ruleUniqueRule= ruleUniqueRule EOF ;
     public final EObject entryRuleUniqueRule() throws RecognitionException {
         EObject current = null;
 
@@ -2545,17 +2545,17 @@ public final EObject entryRuleUniqueRule() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1141:2: (iv_ruleUniqueRule= ruleUniqueRule EOF )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1142:2: iv_ruleUniqueRule= ruleUniqueRule EOF
+            // InternalValid.g:1141:2: (iv_ruleUniqueRule= ruleUniqueRule EOF )
+            // InternalValid.g:1142:2: iv_ruleUniqueRule= ruleUniqueRule EOF
             {
              newCompositeNode(grammarAccess.getUniqueRuleRule()); 
-            pushFollow(FOLLOW_ruleUniqueRule_in_entryRuleUniqueRule2356);
+            pushFollow(FOLLOW_1);
             iv_ruleUniqueRule=ruleUniqueRule();
 
             state._fsp--;
 
              current =iv_ruleUniqueRule; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleUniqueRule2366); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -2573,7 +2573,7 @@ public final EObject entryRuleUniqueRule() throws RecognitionException {
 
 
     // $ANTLR start "ruleUniqueRule"
-    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1149:1: ruleUniqueRule returns [EObject current=null] : ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) ) otherlv_3= 'unique' ( (lv_severity_4_0= ruleSeverityKind ) ) ( (lv_name_5_0= RULE_ID ) ) otherlv_6= 'label' ( (lv_label_7_0= RULE_STRING ) ) (otherlv_8= 'description' ( (lv_description_9_0= RULE_STRING ) ) )? (otherlv_10= 'message' ( (lv_message_11_0= RULE_STRING ) ) )? otherlv_12= 'context' otherlv_13= '{' ( (lv_contexts_14_0= ruleDuplicateContext ) )+ otherlv_15= '}' ) ;
+    // InternalValid.g:1149:1: ruleUniqueRule returns [EObject current=null] : ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) ) otherlv_3= 'unique' ( (lv_severity_4_0= ruleSeverityKind ) ) ( (lv_name_5_0= RULE_ID ) ) otherlv_6= 'label' ( (lv_label_7_0= RULE_STRING ) ) (otherlv_8= 'description' ( (lv_description_9_0= RULE_STRING ) ) )? (otherlv_10= 'message' ( (lv_message_11_0= RULE_STRING ) ) )? otherlv_12= 'context' otherlv_13= '{' ( (lv_contexts_14_0= ruleDuplicateContext ) )+ otherlv_15= '}' ) ;
     public final EObject ruleUniqueRule() throws RecognitionException {
         EObject current = null;
 
@@ -2599,67 +2599,67 @@ public final EObject ruleUniqueRule() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1152:28: ( ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) ) otherlv_3= 'unique' ( (lv_severity_4_0= ruleSeverityKind ) ) ( (lv_name_5_0= RULE_ID ) ) otherlv_6= 'label' ( (lv_label_7_0= RULE_STRING ) ) (otherlv_8= 'description' ( (lv_description_9_0= RULE_STRING ) ) )? (otherlv_10= 'message' ( (lv_message_11_0= RULE_STRING ) ) )? otherlv_12= 'context' otherlv_13= '{' ( (lv_contexts_14_0= ruleDuplicateContext ) )+ otherlv_15= '}' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1153:1: ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) ) otherlv_3= 'unique' ( (lv_severity_4_0= ruleSeverityKind ) ) ( (lv_name_5_0= RULE_ID ) ) otherlv_6= 'label' ( (lv_label_7_0= RULE_STRING ) ) (otherlv_8= 'description' ( (lv_description_9_0= RULE_STRING ) ) )? (otherlv_10= 'message' ( (lv_message_11_0= RULE_STRING ) ) )? otherlv_12= 'context' otherlv_13= '{' ( (lv_contexts_14_0= ruleDuplicateContext ) )+ otherlv_15= '}' )
+            // InternalValid.g:1152:28: ( ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) ) otherlv_3= 'unique' ( (lv_severity_4_0= ruleSeverityKind ) ) ( (lv_name_5_0= RULE_ID ) ) otherlv_6= 'label' ( (lv_label_7_0= RULE_STRING ) ) (otherlv_8= 'description' ( (lv_description_9_0= RULE_STRING ) ) )? (otherlv_10= 'message' ( (lv_message_11_0= RULE_STRING ) ) )? otherlv_12= 'context' otherlv_13= '{' ( (lv_contexts_14_0= ruleDuplicateContext ) )+ otherlv_15= '}' ) )
+            // InternalValid.g:1153:1: ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) ) otherlv_3= 'unique' ( (lv_severity_4_0= ruleSeverityKind ) ) ( (lv_name_5_0= RULE_ID ) ) otherlv_6= 'label' ( (lv_label_7_0= RULE_STRING ) ) (otherlv_8= 'description' ( (lv_description_9_0= RULE_STRING ) ) )? (otherlv_10= 'message' ( (lv_message_11_0= RULE_STRING ) ) )? otherlv_12= 'context' otherlv_13= '{' ( (lv_contexts_14_0= ruleDuplicateContext ) )+ otherlv_15= '}' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1153:1: ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) ) otherlv_3= 'unique' ( (lv_severity_4_0= ruleSeverityKind ) ) ( (lv_name_5_0= RULE_ID ) ) otherlv_6= 'label' ( (lv_label_7_0= RULE_STRING ) ) (otherlv_8= 'description' ( (lv_description_9_0= RULE_STRING ) ) )? (otherlv_10= 'message' ( (lv_message_11_0= RULE_STRING ) ) )? otherlv_12= 'context' otherlv_13= '{' ( (lv_contexts_14_0= ruleDuplicateContext ) )+ otherlv_15= '}' )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1153:2: ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) ) otherlv_3= 'unique' ( (lv_severity_4_0= ruleSeverityKind ) ) ( (lv_name_5_0= RULE_ID ) ) otherlv_6= 'label' ( (lv_label_7_0= RULE_STRING ) ) (otherlv_8= 'description' ( (lv_description_9_0= RULE_STRING ) ) )? (otherlv_10= 'message' ( (lv_message_11_0= RULE_STRING ) ) )? otherlv_12= 'context' otherlv_13= '{' ( (lv_contexts_14_0= ruleDuplicateContext ) )+ otherlv_15= '}'
+            // InternalValid.g:1153:1: ( ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) ) otherlv_3= 'unique' ( (lv_severity_4_0= ruleSeverityKind ) ) ( (lv_name_5_0= RULE_ID ) ) otherlv_6= 'label' ( (lv_label_7_0= RULE_STRING ) ) (otherlv_8= 'description' ( (lv_description_9_0= RULE_STRING ) ) )? (otherlv_10= 'message' ( (lv_message_11_0= RULE_STRING ) ) )? otherlv_12= 'context' otherlv_13= '{' ( (lv_contexts_14_0= ruleDuplicateContext ) )+ otherlv_15= '}' )
+            // InternalValid.g:1153:2: ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) ) otherlv_3= 'unique' ( (lv_severity_4_0= ruleSeverityKind ) ) ( (lv_name_5_0= RULE_ID ) ) otherlv_6= 'label' ( (lv_label_7_0= RULE_STRING ) ) (otherlv_8= 'description' ( (lv_description_9_0= RULE_STRING ) ) )? (otherlv_10= 'message' ( (lv_message_11_0= RULE_STRING ) ) )? otherlv_12= 'context' otherlv_13= '{' ( (lv_contexts_14_0= ruleDuplicateContext ) )+ otherlv_15= '}'
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1153:2: ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1155:1: ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) )
+            // InternalValid.g:1153:2: ( ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) ) )
+            // InternalValid.g:1155:1: ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1155:1: ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1156:2: ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* )
+            // InternalValid.g:1155:1: ( ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* ) )
+            // InternalValid.g:1156:2: ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* )
             {
              
             	  getUnorderedGroupHelper().enter(grammarAccess.getUniqueRuleAccess().getUnorderedGroup_0());
             	
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1159:2: ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1160:3: ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )*
+            // InternalValid.g:1159:2: ( ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )* )
+            // InternalValid.g:1160:3: ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )*
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1160:3: ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )*
+            // InternalValid.g:1160:3: ( ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) ) )*
             loop20:
             do {
                 int alt20=3;
                 int LA20_0 = input.LA(1);
 
-                if ( LA20_0 ==17 && getUnorderedGroupHelper().canSelect(grammarAccess.getUniqueRuleAccess().getUnorderedGroup_0(), 0) ) {
+                if ( LA20_0 == 17 && getUnorderedGroupHelper().canSelect(grammarAccess.getUniqueRuleAccess().getUnorderedGroup_0(), 0) ) {
                     alt20=1;
                 }
-                else if ( LA20_0 >=31 && LA20_0<=33 && getUnorderedGroupHelper().canSelect(grammarAccess.getUniqueRuleAccess().getUnorderedGroup_0(), 1) ) {
+                else if ( LA20_0 >= 31 && LA20_0 <= 33 && getUnorderedGroupHelper().canSelect(grammarAccess.getUniqueRuleAccess().getUnorderedGroup_0(), 1) ) {
                     alt20=2;
                 }
 
 
                 switch (alt20) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1162:4: ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) )
+            	    // InternalValid.g:1162:4: ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1162:4: ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1163:5: {...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) )
+            	    // InternalValid.g:1162:4: ({...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) ) )
+            	    // InternalValid.g:1163:5: {...}? => ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getUniqueRuleAccess().getUnorderedGroup_0(), 0) ) {
             	        throw new FailedPredicateException(input, "ruleUniqueRule", "getUnorderedGroupHelper().canSelect(grammarAccess.getUniqueRuleAccess().getUnorderedGroup_0(), 0)");
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1163:107: ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1164:6: ({...}? => ( (lv_optional_1_0= 'optional' ) ) )
+            	    // InternalValid.g:1163:107: ( ({...}? => ( (lv_optional_1_0= 'optional' ) ) ) )
+            	    // InternalValid.g:1164:6: ({...}? => ( (lv_optional_1_0= 'optional' ) ) )
             	    {
             	     
             	    	 				  getUnorderedGroupHelper().select(grammarAccess.getUniqueRuleAccess().getUnorderedGroup_0(), 0);
             	    	 				
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1167:6: ({...}? => ( (lv_optional_1_0= 'optional' ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1167:7: {...}? => ( (lv_optional_1_0= 'optional' ) )
+            	    // InternalValid.g:1167:6: ({...}? => ( (lv_optional_1_0= 'optional' ) ) )
+            	    // InternalValid.g:1167:7: {...}? => ( (lv_optional_1_0= 'optional' ) )
             	    {
             	    if ( !((true)) ) {
             	        throw new FailedPredicateException(input, "ruleUniqueRule", "true");
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1167:16: ( (lv_optional_1_0= 'optional' ) )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1168:1: (lv_optional_1_0= 'optional' )
+            	    // InternalValid.g:1167:16: ( (lv_optional_1_0= 'optional' ) )
+            	    // InternalValid.g:1168:1: (lv_optional_1_0= 'optional' )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1168:1: (lv_optional_1_0= 'optional' )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1169:3: lv_optional_1_0= 'optional'
+            	    // InternalValid.g:1168:1: (lv_optional_1_0= 'optional' )
+            	    // InternalValid.g:1169:3: lv_optional_1_0= 'optional'
             	    {
-            	    lv_optional_1_0=(Token)match(input,17,FOLLOW_17_in_ruleUniqueRule2454); 
+            	    lv_optional_1_0=(Token)match(input,17,FOLLOW_26); 
 
             	            newLeafNode(lv_optional_1_0, grammarAccess.getUniqueRuleAccess().getOptionalOptionalKeyword_0_0_0());
             	        
@@ -2691,36 +2691,36 @@ else if ( LA20_0 >=31 && LA20_0<=33 && getUnorderedGroupHelper().canSelect(gramm
             	    }
             	    break;
             	case 2 :
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1189:4: ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) )
+            	    // InternalValid.g:1189:4: ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1189:4: ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1190:5: {...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) )
+            	    // InternalValid.g:1189:4: ({...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) ) )
+            	    // InternalValid.g:1190:5: {...}? => ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) )
             	    {
             	    if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getUniqueRuleAccess().getUnorderedGroup_0(), 1) ) {
             	        throw new FailedPredicateException(input, "ruleUniqueRule", "getUnorderedGroupHelper().canSelect(grammarAccess.getUniqueRuleAccess().getUnorderedGroup_0(), 1)");
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1190:107: ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1191:6: ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) )
+            	    // InternalValid.g:1190:107: ( ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) ) )
+            	    // InternalValid.g:1191:6: ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) )
             	    {
             	     
             	    	 				  getUnorderedGroupHelper().select(grammarAccess.getUniqueRuleAccess().getUnorderedGroup_0(), 1);
             	    	 				
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1194:6: ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1194:7: {...}? => ( (lv_checkKind_2_0= ruleCheckKind ) )
+            	    // InternalValid.g:1194:6: ({...}? => ( (lv_checkKind_2_0= ruleCheckKind ) ) )
+            	    // InternalValid.g:1194:7: {...}? => ( (lv_checkKind_2_0= ruleCheckKind ) )
             	    {
             	    if ( !((true)) ) {
             	        throw new FailedPredicateException(input, "ruleUniqueRule", "true");
             	    }
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1194:16: ( (lv_checkKind_2_0= ruleCheckKind ) )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1195:1: (lv_checkKind_2_0= ruleCheckKind )
+            	    // InternalValid.g:1194:16: ( (lv_checkKind_2_0= ruleCheckKind ) )
+            	    // InternalValid.g:1195:1: (lv_checkKind_2_0= ruleCheckKind )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1195:1: (lv_checkKind_2_0= ruleCheckKind )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1196:3: lv_checkKind_2_0= ruleCheckKind
+            	    // InternalValid.g:1195:1: (lv_checkKind_2_0= ruleCheckKind )
+            	    // InternalValid.g:1196:3: lv_checkKind_2_0= ruleCheckKind
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getUniqueRuleAccess().getCheckKindCheckKindEnumRuleCall_0_1_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleCheckKind_in_ruleUniqueRule2542);
+            	    pushFollow(FOLLOW_26);
             	    lv_checkKind_2_0=ruleCheckKind();
 
             	    state._fsp--;
@@ -2733,7 +2733,7 @@ else if ( LA20_0 >=31 && LA20_0<=33 && getUnorderedGroupHelper().canSelect(gramm
             	           			current, 
             	           			"checkKind",
             	            		lv_checkKind_2_0, 
-            	            		"CheckKind");
+            	            		"com.avaloq.tools.ddk.xtext.valid.Valid.CheckKind");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -2775,20 +2775,20 @@ else if ( LA20_0 >=31 && LA20_0<=33 && getUnorderedGroupHelper().canSelect(gramm
 
             }
 
-            otherlv_3=(Token)match(input,23,FOLLOW_23_in_ruleUniqueRule2594); 
+            otherlv_3=(Token)match(input,23,FOLLOW_11); 
 
                 	newLeafNode(otherlv_3, grammarAccess.getUniqueRuleAccess().getUniqueKeyword_1());
                 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1230:1: ( (lv_severity_4_0= ruleSeverityKind ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1231:1: (lv_severity_4_0= ruleSeverityKind )
+            // InternalValid.g:1230:1: ( (lv_severity_4_0= ruleSeverityKind ) )
+            // InternalValid.g:1231:1: (lv_severity_4_0= ruleSeverityKind )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1231:1: (lv_severity_4_0= ruleSeverityKind )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1232:3: lv_severity_4_0= ruleSeverityKind
+            // InternalValid.g:1231:1: (lv_severity_4_0= ruleSeverityKind )
+            // InternalValid.g:1232:3: lv_severity_4_0= ruleSeverityKind
             {
              
             	        newCompositeNode(grammarAccess.getUniqueRuleAccess().getSeveritySeverityKindEnumRuleCall_2_0()); 
             	    
-            pushFollow(FOLLOW_ruleSeverityKind_in_ruleUniqueRule2615);
+            pushFollow(FOLLOW_6);
             lv_severity_4_0=ruleSeverityKind();
 
             state._fsp--;
@@ -2801,7 +2801,7 @@ else if ( LA20_0 >=31 && LA20_0<=33 && getUnorderedGroupHelper().canSelect(gramm
                    			current, 
                    			"severity",
                     		lv_severity_4_0, 
-                    		"SeverityKind");
+                    		"com.avaloq.tools.ddk.xtext.valid.Valid.SeverityKind");
             	        afterParserOrEnumRuleCall();
             	    
 
@@ -2810,13 +2810,13 @@ else if ( LA20_0 >=31 && LA20_0<=33 && getUnorderedGroupHelper().canSelect(gramm
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1248:2: ( (lv_name_5_0= RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1249:1: (lv_name_5_0= RULE_ID )
+            // InternalValid.g:1248:2: ( (lv_name_5_0= RULE_ID ) )
+            // InternalValid.g:1249:1: (lv_name_5_0= RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1249:1: (lv_name_5_0= RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1250:3: lv_name_5_0= RULE_ID
+            // InternalValid.g:1249:1: (lv_name_5_0= RULE_ID )
+            // InternalValid.g:1250:3: lv_name_5_0= RULE_ID
             {
-            lv_name_5_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleUniqueRule2632); 
+            lv_name_5_0=(Token)match(input,RULE_ID,FOLLOW_7); 
 
             			newLeafNode(lv_name_5_0, grammarAccess.getUniqueRuleAccess().getNameIDTerminalRuleCall_3_0()); 
             		
@@ -2828,7 +2828,7 @@ else if ( LA20_0 >=31 && LA20_0<=33 && getUnorderedGroupHelper().canSelect(gramm
                    			current, 
                    			"name",
                     		lv_name_5_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -2836,17 +2836,17 @@ else if ( LA20_0 >=31 && LA20_0<=33 && getUnorderedGroupHelper().canSelect(gramm
 
             }
 
-            otherlv_6=(Token)match(input,13,FOLLOW_13_in_ruleUniqueRule2649); 
+            otherlv_6=(Token)match(input,13,FOLLOW_5); 
 
                 	newLeafNode(otherlv_6, grammarAccess.getUniqueRuleAccess().getLabelKeyword_4());
                 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1270:1: ( (lv_label_7_0= RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1271:1: (lv_label_7_0= RULE_STRING )
+            // InternalValid.g:1270:1: ( (lv_label_7_0= RULE_STRING ) )
+            // InternalValid.g:1271:1: (lv_label_7_0= RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1271:1: (lv_label_7_0= RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1272:3: lv_label_7_0= RULE_STRING
+            // InternalValid.g:1271:1: (lv_label_7_0= RULE_STRING )
+            // InternalValid.g:1272:3: lv_label_7_0= RULE_STRING
             {
-            lv_label_7_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleUniqueRule2666); 
+            lv_label_7_0=(Token)match(input,RULE_STRING,FOLLOW_27); 
 
             			newLeafNode(lv_label_7_0, grammarAccess.getUniqueRuleAccess().getLabelSTRINGTerminalRuleCall_5_0()); 
             		
@@ -2858,7 +2858,7 @@ else if ( LA20_0 >=31 && LA20_0<=33 && getUnorderedGroupHelper().canSelect(gramm
                    			current, 
                    			"label",
                     		lv_label_7_0, 
-                    		"STRING");
+                    		"org.eclipse.xtext.common.Terminals.STRING");
             	    
 
             }
@@ -2866,7 +2866,7 @@ else if ( LA20_0 >=31 && LA20_0<=33 && getUnorderedGroupHelper().canSelect(gramm
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1288:2: (otherlv_8= 'description' ( (lv_description_9_0= RULE_STRING ) ) )?
+            // InternalValid.g:1288:2: (otherlv_8= 'description' ( (lv_description_9_0= RULE_STRING ) ) )?
             int alt21=2;
             int LA21_0 = input.LA(1);
 
@@ -2875,19 +2875,19 @@ else if ( LA20_0 >=31 && LA20_0<=33 && getUnorderedGroupHelper().canSelect(gramm
             }
             switch (alt21) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1288:4: otherlv_8= 'description' ( (lv_description_9_0= RULE_STRING ) )
+                    // InternalValid.g:1288:4: otherlv_8= 'description' ( (lv_description_9_0= RULE_STRING ) )
                     {
-                    otherlv_8=(Token)match(input,14,FOLLOW_14_in_ruleUniqueRule2684); 
+                    otherlv_8=(Token)match(input,14,FOLLOW_5); 
 
                         	newLeafNode(otherlv_8, grammarAccess.getUniqueRuleAccess().getDescriptionKeyword_6_0());
                         
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1292:1: ( (lv_description_9_0= RULE_STRING ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1293:1: (lv_description_9_0= RULE_STRING )
+                    // InternalValid.g:1292:1: ( (lv_description_9_0= RULE_STRING ) )
+                    // InternalValid.g:1293:1: (lv_description_9_0= RULE_STRING )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1293:1: (lv_description_9_0= RULE_STRING )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1294:3: lv_description_9_0= RULE_STRING
+                    // InternalValid.g:1293:1: (lv_description_9_0= RULE_STRING )
+                    // InternalValid.g:1294:3: lv_description_9_0= RULE_STRING
                     {
-                    lv_description_9_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleUniqueRule2701); 
+                    lv_description_9_0=(Token)match(input,RULE_STRING,FOLLOW_28); 
 
                     			newLeafNode(lv_description_9_0, grammarAccess.getUniqueRuleAccess().getDescriptionSTRINGTerminalRuleCall_6_1_0()); 
                     		
@@ -2899,7 +2899,7 @@ else if ( LA20_0 >=31 && LA20_0<=33 && getUnorderedGroupHelper().canSelect(gramm
                            			current, 
                            			"description",
                             		lv_description_9_0, 
-                            		"STRING");
+                            		"org.eclipse.xtext.common.Terminals.STRING");
                     	    
 
                     }
@@ -2913,7 +2913,7 @@ else if ( LA20_0 >=31 && LA20_0<=33 && getUnorderedGroupHelper().canSelect(gramm
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1310:4: (otherlv_10= 'message' ( (lv_message_11_0= RULE_STRING ) ) )?
+            // InternalValid.g:1310:4: (otherlv_10= 'message' ( (lv_message_11_0= RULE_STRING ) ) )?
             int alt22=2;
             int LA22_0 = input.LA(1);
 
@@ -2922,19 +2922,19 @@ else if ( LA20_0 >=31 && LA20_0<=33 && getUnorderedGroupHelper().canSelect(gramm
             }
             switch (alt22) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1310:6: otherlv_10= 'message' ( (lv_message_11_0= RULE_STRING ) )
+                    // InternalValid.g:1310:6: otherlv_10= 'message' ( (lv_message_11_0= RULE_STRING ) )
                     {
-                    otherlv_10=(Token)match(input,18,FOLLOW_18_in_ruleUniqueRule2721); 
+                    otherlv_10=(Token)match(input,18,FOLLOW_5); 
 
                         	newLeafNode(otherlv_10, grammarAccess.getUniqueRuleAccess().getMessageKeyword_7_0());
                         
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1314:1: ( (lv_message_11_0= RULE_STRING ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1315:1: (lv_message_11_0= RULE_STRING )
+                    // InternalValid.g:1314:1: ( (lv_message_11_0= RULE_STRING ) )
+                    // InternalValid.g:1315:1: (lv_message_11_0= RULE_STRING )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1315:1: (lv_message_11_0= RULE_STRING )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1316:3: lv_message_11_0= RULE_STRING
+                    // InternalValid.g:1315:1: (lv_message_11_0= RULE_STRING )
+                    // InternalValid.g:1316:3: lv_message_11_0= RULE_STRING
                     {
-                    lv_message_11_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleUniqueRule2738); 
+                    lv_message_11_0=(Token)match(input,RULE_STRING,FOLLOW_14); 
 
                     			newLeafNode(lv_message_11_0, grammarAccess.getUniqueRuleAccess().getMessageSTRINGTerminalRuleCall_7_1_0()); 
                     		
@@ -2946,7 +2946,7 @@ else if ( LA20_0 >=31 && LA20_0<=33 && getUnorderedGroupHelper().canSelect(gramm
                            			current, 
                            			"message",
                             		lv_message_11_0, 
-                            		"STRING");
+                            		"org.eclipse.xtext.common.Terminals.STRING");
                     	    
 
                     }
@@ -2960,15 +2960,15 @@ else if ( LA20_0 >=31 && LA20_0<=33 && getUnorderedGroupHelper().canSelect(gramm
 
             }
 
-            otherlv_12=(Token)match(input,19,FOLLOW_19_in_ruleUniqueRule2757); 
+            otherlv_12=(Token)match(input,19,FOLLOW_9); 
 
                 	newLeafNode(otherlv_12, grammarAccess.getUniqueRuleAccess().getContextKeyword_8());
                 
-            otherlv_13=(Token)match(input,15,FOLLOW_15_in_ruleUniqueRule2769); 
+            otherlv_13=(Token)match(input,15,FOLLOW_6); 
 
                 	newLeafNode(otherlv_13, grammarAccess.getUniqueRuleAccess().getLeftCurlyBracketKeyword_9());
                 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1340:1: ( (lv_contexts_14_0= ruleDuplicateContext ) )+
+            // InternalValid.g:1340:1: ( (lv_contexts_14_0= ruleDuplicateContext ) )+
             int cnt23=0;
             loop23:
             do {
@@ -2982,15 +2982,15 @@ else if ( LA20_0 >=31 && LA20_0<=33 && getUnorderedGroupHelper().canSelect(gramm
 
                 switch (alt23) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1341:1: (lv_contexts_14_0= ruleDuplicateContext )
+            	    // InternalValid.g:1341:1: (lv_contexts_14_0= ruleDuplicateContext )
             	    {
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1341:1: (lv_contexts_14_0= ruleDuplicateContext )
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1342:3: lv_contexts_14_0= ruleDuplicateContext
+            	    // InternalValid.g:1341:1: (lv_contexts_14_0= ruleDuplicateContext )
+            	    // InternalValid.g:1342:3: lv_contexts_14_0= ruleDuplicateContext
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getUniqueRuleAccess().getContextsDuplicateContextParserRuleCall_10_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleDuplicateContext_in_ruleUniqueRule2790);
+            	    pushFollow(FOLLOW_15);
             	    lv_contexts_14_0=ruleDuplicateContext();
 
             	    state._fsp--;
@@ -3003,7 +3003,7 @@ else if ( LA20_0 >=31 && LA20_0<=33 && getUnorderedGroupHelper().canSelect(gramm
             	           			current, 
             	           			"contexts",
             	            		lv_contexts_14_0, 
-            	            		"DuplicateContext");
+            	            		"com.avaloq.tools.ddk.xtext.valid.Valid.DuplicateContext");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -3022,7 +3022,7 @@ else if ( LA20_0 >=31 && LA20_0<=33 && getUnorderedGroupHelper().canSelect(gramm
                 cnt23++;
             } while (true);
 
-            otherlv_15=(Token)match(input,16,FOLLOW_16_in_ruleUniqueRule2803); 
+            otherlv_15=(Token)match(input,16,FOLLOW_2); 
 
                 	newLeafNode(otherlv_15, grammarAccess.getUniqueRuleAccess().getRightCurlyBracketKeyword_11());
                 
@@ -3047,7 +3047,7 @@ else if ( LA20_0 >=31 && LA20_0<=33 && getUnorderedGroupHelper().canSelect(gramm
 
 
     // $ANTLR start "entryRuleSimpleContext"
-    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1372:1: entryRuleSimpleContext returns [EObject current=null] : iv_ruleSimpleContext= ruleSimpleContext EOF ;
+    // InternalValid.g:1372:1: entryRuleSimpleContext returns [EObject current=null] : iv_ruleSimpleContext= ruleSimpleContext EOF ;
     public final EObject entryRuleSimpleContext() throws RecognitionException {
         EObject current = null;
 
@@ -3055,17 +3055,17 @@ public final EObject entryRuleSimpleContext() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1373:2: (iv_ruleSimpleContext= ruleSimpleContext EOF )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1374:2: iv_ruleSimpleContext= ruleSimpleContext EOF
+            // InternalValid.g:1373:2: (iv_ruleSimpleContext= ruleSimpleContext EOF )
+            // InternalValid.g:1374:2: iv_ruleSimpleContext= ruleSimpleContext EOF
             {
              newCompositeNode(grammarAccess.getSimpleContextRule()); 
-            pushFollow(FOLLOW_ruleSimpleContext_in_entryRuleSimpleContext2841);
+            pushFollow(FOLLOW_1);
             iv_ruleSimpleContext=ruleSimpleContext();
 
             state._fsp--;
 
              current =iv_ruleSimpleContext; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleSimpleContext2851); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3083,7 +3083,7 @@ public final EObject entryRuleSimpleContext() throws RecognitionException {
 
 
     // $ANTLR start "ruleSimpleContext"
-    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1381:1: ruleSimpleContext returns [EObject current=null] : ( ( ( ruleQualifiedID ) ) (otherlv_1= '#' ( (otherlv_2= RULE_ID ) ) )? otherlv_3= ';' ) ;
+    // InternalValid.g:1381:1: ruleSimpleContext returns [EObject current=null] : ( ( ( ruleQualifiedID ) ) (otherlv_1= '#' ( (otherlv_2= RULE_ID ) ) )? otherlv_3= ';' ) ;
     public final EObject ruleSimpleContext() throws RecognitionException {
         EObject current = null;
 
@@ -3094,17 +3094,17 @@ public final EObject ruleSimpleContext() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1384:28: ( ( ( ( ruleQualifiedID ) ) (otherlv_1= '#' ( (otherlv_2= RULE_ID ) ) )? otherlv_3= ';' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1385:1: ( ( ( ruleQualifiedID ) ) (otherlv_1= '#' ( (otherlv_2= RULE_ID ) ) )? otherlv_3= ';' )
+            // InternalValid.g:1384:28: ( ( ( ( ruleQualifiedID ) ) (otherlv_1= '#' ( (otherlv_2= RULE_ID ) ) )? otherlv_3= ';' ) )
+            // InternalValid.g:1385:1: ( ( ( ruleQualifiedID ) ) (otherlv_1= '#' ( (otherlv_2= RULE_ID ) ) )? otherlv_3= ';' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1385:1: ( ( ( ruleQualifiedID ) ) (otherlv_1= '#' ( (otherlv_2= RULE_ID ) ) )? otherlv_3= ';' )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1385:2: ( ( ruleQualifiedID ) ) (otherlv_1= '#' ( (otherlv_2= RULE_ID ) ) )? otherlv_3= ';'
+            // InternalValid.g:1385:1: ( ( ( ruleQualifiedID ) ) (otherlv_1= '#' ( (otherlv_2= RULE_ID ) ) )? otherlv_3= ';' )
+            // InternalValid.g:1385:2: ( ( ruleQualifiedID ) ) (otherlv_1= '#' ( (otherlv_2= RULE_ID ) ) )? otherlv_3= ';'
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1385:2: ( ( ruleQualifiedID ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1386:1: ( ruleQualifiedID )
+            // InternalValid.g:1385:2: ( ( ruleQualifiedID ) )
+            // InternalValid.g:1386:1: ( ruleQualifiedID )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1386:1: ( ruleQualifiedID )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1387:3: ruleQualifiedID
+            // InternalValid.g:1386:1: ( ruleQualifiedID )
+            // InternalValid.g:1387:3: ruleQualifiedID
             {
 
             			if (current==null) {
@@ -3114,7 +3114,7 @@ public final EObject ruleSimpleContext() throws RecognitionException {
              
             	        newCompositeNode(grammarAccess.getSimpleContextAccess().getContextTypeEClassCrossReference_0_0()); 
             	    
-            pushFollow(FOLLOW_ruleQualifiedID_in_ruleSimpleContext2899);
+            pushFollow(FOLLOW_29);
             ruleQualifiedID();
 
             state._fsp--;
@@ -3128,7 +3128,7 @@ public final EObject ruleSimpleContext() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1400:2: (otherlv_1= '#' ( (otherlv_2= RULE_ID ) ) )?
+            // InternalValid.g:1400:2: (otherlv_1= '#' ( (otherlv_2= RULE_ID ) ) )?
             int alt24=2;
             int LA24_0 = input.LA(1);
 
@@ -3137,24 +3137,24 @@ public final EObject ruleSimpleContext() throws RecognitionException {
             }
             switch (alt24) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1400:4: otherlv_1= '#' ( (otherlv_2= RULE_ID ) )
+                    // InternalValid.g:1400:4: otherlv_1= '#' ( (otherlv_2= RULE_ID ) )
                     {
-                    otherlv_1=(Token)match(input,24,FOLLOW_24_in_ruleSimpleContext2912); 
+                    otherlv_1=(Token)match(input,24,FOLLOW_6); 
 
                         	newLeafNode(otherlv_1, grammarAccess.getSimpleContextAccess().getNumberSignKeyword_1_0());
                         
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1404:1: ( (otherlv_2= RULE_ID ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1405:1: (otherlv_2= RULE_ID )
+                    // InternalValid.g:1404:1: ( (otherlv_2= RULE_ID ) )
+                    // InternalValid.g:1405:1: (otherlv_2= RULE_ID )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1405:1: (otherlv_2= RULE_ID )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1406:3: otherlv_2= RULE_ID
+                    // InternalValid.g:1405:1: (otherlv_2= RULE_ID )
+                    // InternalValid.g:1406:3: otherlv_2= RULE_ID
                     {
 
                     			if (current==null) {
                     	            current = createModelElement(grammarAccess.getSimpleContextRule());
                     	        }
                             
-                    otherlv_2=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSimpleContext2932); 
+                    otherlv_2=(Token)match(input,RULE_ID,FOLLOW_30); 
 
                     		newLeafNode(otherlv_2, grammarAccess.getSimpleContextAccess().getContextFeatureEStructuralFeatureCrossReference_1_1_0()); 
                     	
@@ -3170,7 +3170,7 @@ public final EObject ruleSimpleContext() throws RecognitionException {
 
             }
 
-            otherlv_3=(Token)match(input,25,FOLLOW_25_in_ruleSimpleContext2946); 
+            otherlv_3=(Token)match(input,25,FOLLOW_2); 
 
                 	newLeafNode(otherlv_3, grammarAccess.getSimpleContextAccess().getSemicolonKeyword_2());
                 
@@ -3195,7 +3195,7 @@ public final EObject ruleSimpleContext() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleDuplicateContext"
-    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1429:1: entryRuleDuplicateContext returns [EObject current=null] : iv_ruleDuplicateContext= ruleDuplicateContext EOF ;
+    // InternalValid.g:1429:1: entryRuleDuplicateContext returns [EObject current=null] : iv_ruleDuplicateContext= ruleDuplicateContext EOF ;
     public final EObject entryRuleDuplicateContext() throws RecognitionException {
         EObject current = null;
 
@@ -3203,17 +3203,17 @@ public final EObject entryRuleDuplicateContext() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1430:2: (iv_ruleDuplicateContext= ruleDuplicateContext EOF )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1431:2: iv_ruleDuplicateContext= ruleDuplicateContext EOF
+            // InternalValid.g:1430:2: (iv_ruleDuplicateContext= ruleDuplicateContext EOF )
+            // InternalValid.g:1431:2: iv_ruleDuplicateContext= ruleDuplicateContext EOF
             {
              newCompositeNode(grammarAccess.getDuplicateContextRule()); 
-            pushFollow(FOLLOW_ruleDuplicateContext_in_entryRuleDuplicateContext2982);
+            pushFollow(FOLLOW_1);
             iv_ruleDuplicateContext=ruleDuplicateContext();
 
             state._fsp--;
 
              current =iv_ruleDuplicateContext; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleDuplicateContext2992); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3231,7 +3231,7 @@ public final EObject entryRuleDuplicateContext() throws RecognitionException {
 
 
     // $ANTLR start "ruleDuplicateContext"
-    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1438:1: ruleDuplicateContext returns [EObject current=null] : ( ( ( ruleQualifiedID ) ) (otherlv_1= '#' ( (otherlv_2= RULE_ID ) ) )? otherlv_3= 'marker' ( ( ruleQualifiedID ) ) otherlv_5= '#' ( (otherlv_6= RULE_ID ) )? otherlv_7= ';' ) ;
+    // InternalValid.g:1438:1: ruleDuplicateContext returns [EObject current=null] : ( ( ( ruleQualifiedID ) ) (otherlv_1= '#' ( (otherlv_2= RULE_ID ) ) )? otherlv_3= 'marker' ( ( ruleQualifiedID ) ) otherlv_5= '#' ( (otherlv_6= RULE_ID ) )? otherlv_7= ';' ) ;
     public final EObject ruleDuplicateContext() throws RecognitionException {
         EObject current = null;
 
@@ -3245,17 +3245,17 @@ public final EObject ruleDuplicateContext() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1441:28: ( ( ( ( ruleQualifiedID ) ) (otherlv_1= '#' ( (otherlv_2= RULE_ID ) ) )? otherlv_3= 'marker' ( ( ruleQualifiedID ) ) otherlv_5= '#' ( (otherlv_6= RULE_ID ) )? otherlv_7= ';' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1442:1: ( ( ( ruleQualifiedID ) ) (otherlv_1= '#' ( (otherlv_2= RULE_ID ) ) )? otherlv_3= 'marker' ( ( ruleQualifiedID ) ) otherlv_5= '#' ( (otherlv_6= RULE_ID ) )? otherlv_7= ';' )
+            // InternalValid.g:1441:28: ( ( ( ( ruleQualifiedID ) ) (otherlv_1= '#' ( (otherlv_2= RULE_ID ) ) )? otherlv_3= 'marker' ( ( ruleQualifiedID ) ) otherlv_5= '#' ( (otherlv_6= RULE_ID ) )? otherlv_7= ';' ) )
+            // InternalValid.g:1442:1: ( ( ( ruleQualifiedID ) ) (otherlv_1= '#' ( (otherlv_2= RULE_ID ) ) )? otherlv_3= 'marker' ( ( ruleQualifiedID ) ) otherlv_5= '#' ( (otherlv_6= RULE_ID ) )? otherlv_7= ';' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1442:1: ( ( ( ruleQualifiedID ) ) (otherlv_1= '#' ( (otherlv_2= RULE_ID ) ) )? otherlv_3= 'marker' ( ( ruleQualifiedID ) ) otherlv_5= '#' ( (otherlv_6= RULE_ID ) )? otherlv_7= ';' )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1442:2: ( ( ruleQualifiedID ) ) (otherlv_1= '#' ( (otherlv_2= RULE_ID ) ) )? otherlv_3= 'marker' ( ( ruleQualifiedID ) ) otherlv_5= '#' ( (otherlv_6= RULE_ID ) )? otherlv_7= ';'
+            // InternalValid.g:1442:1: ( ( ( ruleQualifiedID ) ) (otherlv_1= '#' ( (otherlv_2= RULE_ID ) ) )? otherlv_3= 'marker' ( ( ruleQualifiedID ) ) otherlv_5= '#' ( (otherlv_6= RULE_ID ) )? otherlv_7= ';' )
+            // InternalValid.g:1442:2: ( ( ruleQualifiedID ) ) (otherlv_1= '#' ( (otherlv_2= RULE_ID ) ) )? otherlv_3= 'marker' ( ( ruleQualifiedID ) ) otherlv_5= '#' ( (otherlv_6= RULE_ID ) )? otherlv_7= ';'
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1442:2: ( ( ruleQualifiedID ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1443:1: ( ruleQualifiedID )
+            // InternalValid.g:1442:2: ( ( ruleQualifiedID ) )
+            // InternalValid.g:1443:1: ( ruleQualifiedID )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1443:1: ( ruleQualifiedID )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1444:3: ruleQualifiedID
+            // InternalValid.g:1443:1: ( ruleQualifiedID )
+            // InternalValid.g:1444:3: ruleQualifiedID
             {
 
             			if (current==null) {
@@ -3265,7 +3265,7 @@ public final EObject ruleDuplicateContext() throws RecognitionException {
              
             	        newCompositeNode(grammarAccess.getDuplicateContextAccess().getContextTypeEClassCrossReference_0_0()); 
             	    
-            pushFollow(FOLLOW_ruleQualifiedID_in_ruleDuplicateContext3040);
+            pushFollow(FOLLOW_31);
             ruleQualifiedID();
 
             state._fsp--;
@@ -3279,7 +3279,7 @@ public final EObject ruleDuplicateContext() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1457:2: (otherlv_1= '#' ( (otherlv_2= RULE_ID ) ) )?
+            // InternalValid.g:1457:2: (otherlv_1= '#' ( (otherlv_2= RULE_ID ) ) )?
             int alt25=2;
             int LA25_0 = input.LA(1);
 
@@ -3288,24 +3288,24 @@ public final EObject ruleDuplicateContext() throws RecognitionException {
             }
             switch (alt25) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1457:4: otherlv_1= '#' ( (otherlv_2= RULE_ID ) )
+                    // InternalValid.g:1457:4: otherlv_1= '#' ( (otherlv_2= RULE_ID ) )
                     {
-                    otherlv_1=(Token)match(input,24,FOLLOW_24_in_ruleDuplicateContext3053); 
+                    otherlv_1=(Token)match(input,24,FOLLOW_6); 
 
                         	newLeafNode(otherlv_1, grammarAccess.getDuplicateContextAccess().getNumberSignKeyword_1_0());
                         
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1461:1: ( (otherlv_2= RULE_ID ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1462:1: (otherlv_2= RULE_ID )
+                    // InternalValid.g:1461:1: ( (otherlv_2= RULE_ID ) )
+                    // InternalValid.g:1462:1: (otherlv_2= RULE_ID )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1462:1: (otherlv_2= RULE_ID )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1463:3: otherlv_2= RULE_ID
+                    // InternalValid.g:1462:1: (otherlv_2= RULE_ID )
+                    // InternalValid.g:1463:3: otherlv_2= RULE_ID
                     {
 
                     			if (current==null) {
                     	            current = createModelElement(grammarAccess.getDuplicateContextRule());
                     	        }
                             
-                    otherlv_2=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleDuplicateContext3073); 
+                    otherlv_2=(Token)match(input,RULE_ID,FOLLOW_32); 
 
                     		newLeafNode(otherlv_2, grammarAccess.getDuplicateContextAccess().getContextFeatureEStructuralFeatureCrossReference_1_1_0()); 
                     	
@@ -3321,15 +3321,15 @@ public final EObject ruleDuplicateContext() throws RecognitionException {
 
             }
 
-            otherlv_3=(Token)match(input,26,FOLLOW_26_in_ruleDuplicateContext3087); 
+            otherlv_3=(Token)match(input,26,FOLLOW_6); 
 
                 	newLeafNode(otherlv_3, grammarAccess.getDuplicateContextAccess().getMarkerKeyword_2());
                 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1478:1: ( ( ruleQualifiedID ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1479:1: ( ruleQualifiedID )
+            // InternalValid.g:1478:1: ( ( ruleQualifiedID ) )
+            // InternalValid.g:1479:1: ( ruleQualifiedID )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1479:1: ( ruleQualifiedID )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1480:3: ruleQualifiedID
+            // InternalValid.g:1479:1: ( ruleQualifiedID )
+            // InternalValid.g:1480:3: ruleQualifiedID
             {
 
             			if (current==null) {
@@ -3339,7 +3339,7 @@ public final EObject ruleDuplicateContext() throws RecognitionException {
              
             	        newCompositeNode(grammarAccess.getDuplicateContextAccess().getMarkerTypeEClassCrossReference_3_0()); 
             	    
-            pushFollow(FOLLOW_ruleQualifiedID_in_ruleDuplicateContext3110);
+            pushFollow(FOLLOW_33);
             ruleQualifiedID();
 
             state._fsp--;
@@ -3353,11 +3353,11 @@ public final EObject ruleDuplicateContext() throws RecognitionException {
 
             }
 
-            otherlv_5=(Token)match(input,24,FOLLOW_24_in_ruleDuplicateContext3122); 
+            otherlv_5=(Token)match(input,24,FOLLOW_34); 
 
                 	newLeafNode(otherlv_5, grammarAccess.getDuplicateContextAccess().getNumberSignKeyword_4());
                 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1497:1: ( (otherlv_6= RULE_ID ) )?
+            // InternalValid.g:1497:1: ( (otherlv_6= RULE_ID ) )?
             int alt26=2;
             int LA26_0 = input.LA(1);
 
@@ -3366,17 +3366,17 @@ public final EObject ruleDuplicateContext() throws RecognitionException {
             }
             switch (alt26) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1498:1: (otherlv_6= RULE_ID )
+                    // InternalValid.g:1498:1: (otherlv_6= RULE_ID )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1498:1: (otherlv_6= RULE_ID )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1499:3: otherlv_6= RULE_ID
+                    // InternalValid.g:1498:1: (otherlv_6= RULE_ID )
+                    // InternalValid.g:1499:3: otherlv_6= RULE_ID
                     {
 
                     			if (current==null) {
                     	            current = createModelElement(grammarAccess.getDuplicateContextRule());
                     	        }
                             
-                    otherlv_6=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleDuplicateContext3142); 
+                    otherlv_6=(Token)match(input,RULE_ID,FOLLOW_30); 
 
                     		newLeafNode(otherlv_6, grammarAccess.getDuplicateContextAccess().getMarkerFeatureEStructuralFeatureCrossReference_5_0()); 
                     	
@@ -3389,7 +3389,7 @@ public final EObject ruleDuplicateContext() throws RecognitionException {
 
             }
 
-            otherlv_7=(Token)match(input,25,FOLLOW_25_in_ruleDuplicateContext3155); 
+            otherlv_7=(Token)match(input,25,FOLLOW_2); 
 
                 	newLeafNode(otherlv_7, grammarAccess.getDuplicateContextAccess().getSemicolonKeyword_6());
                 
@@ -3414,7 +3414,7 @@ public final EObject ruleDuplicateContext() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleNativeContext"
-    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1522:1: entryRuleNativeContext returns [EObject current=null] : iv_ruleNativeContext= ruleNativeContext EOF ;
+    // InternalValid.g:1522:1: entryRuleNativeContext returns [EObject current=null] : iv_ruleNativeContext= ruleNativeContext EOF ;
     public final EObject entryRuleNativeContext() throws RecognitionException {
         EObject current = null;
 
@@ -3422,17 +3422,17 @@ public final EObject entryRuleNativeContext() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1523:2: (iv_ruleNativeContext= ruleNativeContext EOF )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1524:2: iv_ruleNativeContext= ruleNativeContext EOF
+            // InternalValid.g:1523:2: (iv_ruleNativeContext= ruleNativeContext EOF )
+            // InternalValid.g:1524:2: iv_ruleNativeContext= ruleNativeContext EOF
             {
              newCompositeNode(grammarAccess.getNativeContextRule()); 
-            pushFollow(FOLLOW_ruleNativeContext_in_entryRuleNativeContext3191);
+            pushFollow(FOLLOW_1);
             iv_ruleNativeContext=ruleNativeContext();
 
             state._fsp--;
 
              current =iv_ruleNativeContext; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNativeContext3201); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3450,7 +3450,7 @@ public final EObject entryRuleNativeContext() throws RecognitionException {
 
 
     // $ANTLR start "ruleNativeContext"
-    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1531:1: ruleNativeContext returns [EObject current=null] : ( ( ( ruleQualifiedID ) ) (otherlv_1= '#' ( (otherlv_2= RULE_ID ) ) )? ( ( (lv_named_3_0= 'as' ) ) ( (lv_givenName_4_0= RULE_ID ) ) )? (otherlv_5= 'marker' ( ( ruleQualifiedID ) ) (otherlv_7= '#' ( (otherlv_8= RULE_ID ) ) ) )? (otherlv_9= 'quickfixes' otherlv_10= '{' ( (lv_quickFixes_11_0= ruleQuickFix ) )+ otherlv_12= '}' )? otherlv_13= ';' ) ;
+    // InternalValid.g:1531:1: ruleNativeContext returns [EObject current=null] : ( ( ( ruleQualifiedID ) ) (otherlv_1= '#' ( (otherlv_2= RULE_ID ) ) )? ( ( (lv_named_3_0= 'as' ) ) ( (lv_givenName_4_0= RULE_ID ) ) )? (otherlv_5= 'marker' ( ( ruleQualifiedID ) ) (otherlv_7= '#' ( (otherlv_8= RULE_ID ) ) ) )? (otherlv_9= 'quickfixes' otherlv_10= '{' ( (lv_quickFixes_11_0= ruleQuickFix ) )+ otherlv_12= '}' )? otherlv_13= ';' ) ;
     public final EObject ruleNativeContext() throws RecognitionException {
         EObject current = null;
 
@@ -3471,17 +3471,17 @@ public final EObject ruleNativeContext() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1534:28: ( ( ( ( ruleQualifiedID ) ) (otherlv_1= '#' ( (otherlv_2= RULE_ID ) ) )? ( ( (lv_named_3_0= 'as' ) ) ( (lv_givenName_4_0= RULE_ID ) ) )? (otherlv_5= 'marker' ( ( ruleQualifiedID ) ) (otherlv_7= '#' ( (otherlv_8= RULE_ID ) ) ) )? (otherlv_9= 'quickfixes' otherlv_10= '{' ( (lv_quickFixes_11_0= ruleQuickFix ) )+ otherlv_12= '}' )? otherlv_13= ';' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1535:1: ( ( ( ruleQualifiedID ) ) (otherlv_1= '#' ( (otherlv_2= RULE_ID ) ) )? ( ( (lv_named_3_0= 'as' ) ) ( (lv_givenName_4_0= RULE_ID ) ) )? (otherlv_5= 'marker' ( ( ruleQualifiedID ) ) (otherlv_7= '#' ( (otherlv_8= RULE_ID ) ) ) )? (otherlv_9= 'quickfixes' otherlv_10= '{' ( (lv_quickFixes_11_0= ruleQuickFix ) )+ otherlv_12= '}' )? otherlv_13= ';' )
+            // InternalValid.g:1534:28: ( ( ( ( ruleQualifiedID ) ) (otherlv_1= '#' ( (otherlv_2= RULE_ID ) ) )? ( ( (lv_named_3_0= 'as' ) ) ( (lv_givenName_4_0= RULE_ID ) ) )? (otherlv_5= 'marker' ( ( ruleQualifiedID ) ) (otherlv_7= '#' ( (otherlv_8= RULE_ID ) ) ) )? (otherlv_9= 'quickfixes' otherlv_10= '{' ( (lv_quickFixes_11_0= ruleQuickFix ) )+ otherlv_12= '}' )? otherlv_13= ';' ) )
+            // InternalValid.g:1535:1: ( ( ( ruleQualifiedID ) ) (otherlv_1= '#' ( (otherlv_2= RULE_ID ) ) )? ( ( (lv_named_3_0= 'as' ) ) ( (lv_givenName_4_0= RULE_ID ) ) )? (otherlv_5= 'marker' ( ( ruleQualifiedID ) ) (otherlv_7= '#' ( (otherlv_8= RULE_ID ) ) ) )? (otherlv_9= 'quickfixes' otherlv_10= '{' ( (lv_quickFixes_11_0= ruleQuickFix ) )+ otherlv_12= '}' )? otherlv_13= ';' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1535:1: ( ( ( ruleQualifiedID ) ) (otherlv_1= '#' ( (otherlv_2= RULE_ID ) ) )? ( ( (lv_named_3_0= 'as' ) ) ( (lv_givenName_4_0= RULE_ID ) ) )? (otherlv_5= 'marker' ( ( ruleQualifiedID ) ) (otherlv_7= '#' ( (otherlv_8= RULE_ID ) ) ) )? (otherlv_9= 'quickfixes' otherlv_10= '{' ( (lv_quickFixes_11_0= ruleQuickFix ) )+ otherlv_12= '}' )? otherlv_13= ';' )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1535:2: ( ( ruleQualifiedID ) ) (otherlv_1= '#' ( (otherlv_2= RULE_ID ) ) )? ( ( (lv_named_3_0= 'as' ) ) ( (lv_givenName_4_0= RULE_ID ) ) )? (otherlv_5= 'marker' ( ( ruleQualifiedID ) ) (otherlv_7= '#' ( (otherlv_8= RULE_ID ) ) ) )? (otherlv_9= 'quickfixes' otherlv_10= '{' ( (lv_quickFixes_11_0= ruleQuickFix ) )+ otherlv_12= '}' )? otherlv_13= ';'
+            // InternalValid.g:1535:1: ( ( ( ruleQualifiedID ) ) (otherlv_1= '#' ( (otherlv_2= RULE_ID ) ) )? ( ( (lv_named_3_0= 'as' ) ) ( (lv_givenName_4_0= RULE_ID ) ) )? (otherlv_5= 'marker' ( ( ruleQualifiedID ) ) (otherlv_7= '#' ( (otherlv_8= RULE_ID ) ) ) )? (otherlv_9= 'quickfixes' otherlv_10= '{' ( (lv_quickFixes_11_0= ruleQuickFix ) )+ otherlv_12= '}' )? otherlv_13= ';' )
+            // InternalValid.g:1535:2: ( ( ruleQualifiedID ) ) (otherlv_1= '#' ( (otherlv_2= RULE_ID ) ) )? ( ( (lv_named_3_0= 'as' ) ) ( (lv_givenName_4_0= RULE_ID ) ) )? (otherlv_5= 'marker' ( ( ruleQualifiedID ) ) (otherlv_7= '#' ( (otherlv_8= RULE_ID ) ) ) )? (otherlv_9= 'quickfixes' otherlv_10= '{' ( (lv_quickFixes_11_0= ruleQuickFix ) )+ otherlv_12= '}' )? otherlv_13= ';'
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1535:2: ( ( ruleQualifiedID ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1536:1: ( ruleQualifiedID )
+            // InternalValid.g:1535:2: ( ( ruleQualifiedID ) )
+            // InternalValid.g:1536:1: ( ruleQualifiedID )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1536:1: ( ruleQualifiedID )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1537:3: ruleQualifiedID
+            // InternalValid.g:1536:1: ( ruleQualifiedID )
+            // InternalValid.g:1537:3: ruleQualifiedID
             {
 
             			if (current==null) {
@@ -3491,7 +3491,7 @@ public final EObject ruleNativeContext() throws RecognitionException {
              
             	        newCompositeNode(grammarAccess.getNativeContextAccess().getContextTypeEClassCrossReference_0_0()); 
             	    
-            pushFollow(FOLLOW_ruleQualifiedID_in_ruleNativeContext3249);
+            pushFollow(FOLLOW_35);
             ruleQualifiedID();
 
             state._fsp--;
@@ -3505,7 +3505,7 @@ public final EObject ruleNativeContext() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1550:2: (otherlv_1= '#' ( (otherlv_2= RULE_ID ) ) )?
+            // InternalValid.g:1550:2: (otherlv_1= '#' ( (otherlv_2= RULE_ID ) ) )?
             int alt27=2;
             int LA27_0 = input.LA(1);
 
@@ -3514,24 +3514,24 @@ public final EObject ruleNativeContext() throws RecognitionException {
             }
             switch (alt27) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1550:4: otherlv_1= '#' ( (otherlv_2= RULE_ID ) )
+                    // InternalValid.g:1550:4: otherlv_1= '#' ( (otherlv_2= RULE_ID ) )
                     {
-                    otherlv_1=(Token)match(input,24,FOLLOW_24_in_ruleNativeContext3262); 
+                    otherlv_1=(Token)match(input,24,FOLLOW_6); 
 
                         	newLeafNode(otherlv_1, grammarAccess.getNativeContextAccess().getNumberSignKeyword_1_0());
                         
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1554:1: ( (otherlv_2= RULE_ID ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1555:1: (otherlv_2= RULE_ID )
+                    // InternalValid.g:1554:1: ( (otherlv_2= RULE_ID ) )
+                    // InternalValid.g:1555:1: (otherlv_2= RULE_ID )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1555:1: (otherlv_2= RULE_ID )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1556:3: otherlv_2= RULE_ID
+                    // InternalValid.g:1555:1: (otherlv_2= RULE_ID )
+                    // InternalValid.g:1556:3: otherlv_2= RULE_ID
                     {
 
                     			if (current==null) {
                     	            current = createModelElement(grammarAccess.getNativeContextRule());
                     	        }
                             
-                    otherlv_2=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleNativeContext3282); 
+                    otherlv_2=(Token)match(input,RULE_ID,FOLLOW_36); 
 
                     		newLeafNode(otherlv_2, grammarAccess.getNativeContextAccess().getContextFeatureEStructuralFeatureCrossReference_1_1_0()); 
                     	
@@ -3547,7 +3547,7 @@ public final EObject ruleNativeContext() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1567:4: ( ( (lv_named_3_0= 'as' ) ) ( (lv_givenName_4_0= RULE_ID ) ) )?
+            // InternalValid.g:1567:4: ( ( (lv_named_3_0= 'as' ) ) ( (lv_givenName_4_0= RULE_ID ) ) )?
             int alt28=2;
             int LA28_0 = input.LA(1);
 
@@ -3556,15 +3556,15 @@ public final EObject ruleNativeContext() throws RecognitionException {
             }
             switch (alt28) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1567:5: ( (lv_named_3_0= 'as' ) ) ( (lv_givenName_4_0= RULE_ID ) )
+                    // InternalValid.g:1567:5: ( (lv_named_3_0= 'as' ) ) ( (lv_givenName_4_0= RULE_ID ) )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1567:5: ( (lv_named_3_0= 'as' ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1568:1: (lv_named_3_0= 'as' )
+                    // InternalValid.g:1567:5: ( (lv_named_3_0= 'as' ) )
+                    // InternalValid.g:1568:1: (lv_named_3_0= 'as' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1568:1: (lv_named_3_0= 'as' )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1569:3: lv_named_3_0= 'as'
+                    // InternalValid.g:1568:1: (lv_named_3_0= 'as' )
+                    // InternalValid.g:1569:3: lv_named_3_0= 'as'
                     {
-                    lv_named_3_0=(Token)match(input,27,FOLLOW_27_in_ruleNativeContext3303); 
+                    lv_named_3_0=(Token)match(input,27,FOLLOW_6); 
 
                             newLeafNode(lv_named_3_0, grammarAccess.getNativeContextAccess().getNamedAsKeyword_2_0_0());
                         
@@ -3580,13 +3580,13 @@ public final EObject ruleNativeContext() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1582:2: ( (lv_givenName_4_0= RULE_ID ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1583:1: (lv_givenName_4_0= RULE_ID )
+                    // InternalValid.g:1582:2: ( (lv_givenName_4_0= RULE_ID ) )
+                    // InternalValid.g:1583:1: (lv_givenName_4_0= RULE_ID )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1583:1: (lv_givenName_4_0= RULE_ID )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1584:3: lv_givenName_4_0= RULE_ID
+                    // InternalValid.g:1583:1: (lv_givenName_4_0= RULE_ID )
+                    // InternalValid.g:1584:3: lv_givenName_4_0= RULE_ID
                     {
-                    lv_givenName_4_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleNativeContext3333); 
+                    lv_givenName_4_0=(Token)match(input,RULE_ID,FOLLOW_37); 
 
                     			newLeafNode(lv_givenName_4_0, grammarAccess.getNativeContextAccess().getGivenNameIDTerminalRuleCall_2_1_0()); 
                     		
@@ -3598,7 +3598,7 @@ public final EObject ruleNativeContext() throws RecognitionException {
                            			current, 
                            			"givenName",
                             		lv_givenName_4_0, 
-                            		"ID");
+                            		"org.eclipse.xtext.common.Terminals.ID");
                     	    
 
                     }
@@ -3612,7 +3612,7 @@ public final EObject ruleNativeContext() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1600:4: (otherlv_5= 'marker' ( ( ruleQualifiedID ) ) (otherlv_7= '#' ( (otherlv_8= RULE_ID ) ) ) )?
+            // InternalValid.g:1600:4: (otherlv_5= 'marker' ( ( ruleQualifiedID ) ) (otherlv_7= '#' ( (otherlv_8= RULE_ID ) ) ) )?
             int alt29=2;
             int LA29_0 = input.LA(1);
 
@@ -3621,17 +3621,17 @@ public final EObject ruleNativeContext() throws RecognitionException {
             }
             switch (alt29) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1600:6: otherlv_5= 'marker' ( ( ruleQualifiedID ) ) (otherlv_7= '#' ( (otherlv_8= RULE_ID ) ) )
+                    // InternalValid.g:1600:6: otherlv_5= 'marker' ( ( ruleQualifiedID ) ) (otherlv_7= '#' ( (otherlv_8= RULE_ID ) ) )
                     {
-                    otherlv_5=(Token)match(input,26,FOLLOW_26_in_ruleNativeContext3353); 
+                    otherlv_5=(Token)match(input,26,FOLLOW_6); 
 
                         	newLeafNode(otherlv_5, grammarAccess.getNativeContextAccess().getMarkerKeyword_3_0());
                         
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1604:1: ( ( ruleQualifiedID ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1605:1: ( ruleQualifiedID )
+                    // InternalValid.g:1604:1: ( ( ruleQualifiedID ) )
+                    // InternalValid.g:1605:1: ( ruleQualifiedID )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1605:1: ( ruleQualifiedID )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1606:3: ruleQualifiedID
+                    // InternalValid.g:1605:1: ( ruleQualifiedID )
+                    // InternalValid.g:1606:3: ruleQualifiedID
                     {
 
                     			if (current==null) {
@@ -3641,7 +3641,7 @@ public final EObject ruleNativeContext() throws RecognitionException {
                      
                     	        newCompositeNode(grammarAccess.getNativeContextAccess().getMarkerTypeEClassCrossReference_3_1_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleQualifiedID_in_ruleNativeContext3376);
+                    pushFollow(FOLLOW_33);
                     ruleQualifiedID();
 
                     state._fsp--;
@@ -3655,25 +3655,25 @@ public final EObject ruleNativeContext() throws RecognitionException {
 
                     }
 
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1619:2: (otherlv_7= '#' ( (otherlv_8= RULE_ID ) ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1619:4: otherlv_7= '#' ( (otherlv_8= RULE_ID ) )
+                    // InternalValid.g:1619:2: (otherlv_7= '#' ( (otherlv_8= RULE_ID ) ) )
+                    // InternalValid.g:1619:4: otherlv_7= '#' ( (otherlv_8= RULE_ID ) )
                     {
-                    otherlv_7=(Token)match(input,24,FOLLOW_24_in_ruleNativeContext3389); 
+                    otherlv_7=(Token)match(input,24,FOLLOW_6); 
 
                         	newLeafNode(otherlv_7, grammarAccess.getNativeContextAccess().getNumberSignKeyword_3_2_0());
                         
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1623:1: ( (otherlv_8= RULE_ID ) )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1624:1: (otherlv_8= RULE_ID )
+                    // InternalValid.g:1623:1: ( (otherlv_8= RULE_ID ) )
+                    // InternalValid.g:1624:1: (otherlv_8= RULE_ID )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1624:1: (otherlv_8= RULE_ID )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1625:3: otherlv_8= RULE_ID
+                    // InternalValid.g:1624:1: (otherlv_8= RULE_ID )
+                    // InternalValid.g:1625:3: otherlv_8= RULE_ID
                     {
 
                     			if (current==null) {
                     	            current = createModelElement(grammarAccess.getNativeContextRule());
                     	        }
                             
-                    otherlv_8=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleNativeContext3409); 
+                    otherlv_8=(Token)match(input,RULE_ID,FOLLOW_38); 
 
                     		newLeafNode(otherlv_8, grammarAccess.getNativeContextAccess().getMarkerFeatureEStructuralFeatureCrossReference_3_2_1_0()); 
                     	
@@ -3692,7 +3692,7 @@ public final EObject ruleNativeContext() throws RecognitionException {
 
             }
 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1636:5: (otherlv_9= 'quickfixes' otherlv_10= '{' ( (lv_quickFixes_11_0= ruleQuickFix ) )+ otherlv_12= '}' )?
+            // InternalValid.g:1636:5: (otherlv_9= 'quickfixes' otherlv_10= '{' ( (lv_quickFixes_11_0= ruleQuickFix ) )+ otherlv_12= '}' )?
             int alt31=2;
             int LA31_0 = input.LA(1);
 
@@ -3701,17 +3701,17 @@ public final EObject ruleNativeContext() throws RecognitionException {
             }
             switch (alt31) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1636:7: otherlv_9= 'quickfixes' otherlv_10= '{' ( (lv_quickFixes_11_0= ruleQuickFix ) )+ otherlv_12= '}'
+                    // InternalValid.g:1636:7: otherlv_9= 'quickfixes' otherlv_10= '{' ( (lv_quickFixes_11_0= ruleQuickFix ) )+ otherlv_12= '}'
                     {
-                    otherlv_9=(Token)match(input,28,FOLLOW_28_in_ruleNativeContext3425); 
+                    otherlv_9=(Token)match(input,28,FOLLOW_9); 
 
                         	newLeafNode(otherlv_9, grammarAccess.getNativeContextAccess().getQuickfixesKeyword_4_0());
                         
-                    otherlv_10=(Token)match(input,15,FOLLOW_15_in_ruleNativeContext3437); 
+                    otherlv_10=(Token)match(input,15,FOLLOW_39); 
 
                         	newLeafNode(otherlv_10, grammarAccess.getNativeContextAccess().getLeftCurlyBracketKeyword_4_1());
                         
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1644:1: ( (lv_quickFixes_11_0= ruleQuickFix ) )+
+                    // InternalValid.g:1644:1: ( (lv_quickFixes_11_0= ruleQuickFix ) )+
                     int cnt30=0;
                     loop30:
                     do {
@@ -3725,15 +3725,15 @@ public final EObject ruleNativeContext() throws RecognitionException {
 
                         switch (alt30) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1645:1: (lv_quickFixes_11_0= ruleQuickFix )
+                    	    // InternalValid.g:1645:1: (lv_quickFixes_11_0= ruleQuickFix )
                     	    {
-                    	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1645:1: (lv_quickFixes_11_0= ruleQuickFix )
-                    	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1646:3: lv_quickFixes_11_0= ruleQuickFix
+                    	    // InternalValid.g:1645:1: (lv_quickFixes_11_0= ruleQuickFix )
+                    	    // InternalValid.g:1646:3: lv_quickFixes_11_0= ruleQuickFix
                     	    {
                     	     
                     	    	        newCompositeNode(grammarAccess.getNativeContextAccess().getQuickFixesQuickFixParserRuleCall_4_2_0()); 
                     	    	    
-                    	    pushFollow(FOLLOW_ruleQuickFix_in_ruleNativeContext3458);
+                    	    pushFollow(FOLLOW_40);
                     	    lv_quickFixes_11_0=ruleQuickFix();
 
                     	    state._fsp--;
@@ -3746,7 +3746,7 @@ public final EObject ruleNativeContext() throws RecognitionException {
                     	           			current, 
                     	           			"quickFixes",
                     	            		lv_quickFixes_11_0, 
-                    	            		"QuickFix");
+                    	            		"com.avaloq.tools.ddk.xtext.valid.Valid.QuickFix");
                     	    	        afterParserOrEnumRuleCall();
                     	    	    
 
@@ -3765,7 +3765,7 @@ public final EObject ruleNativeContext() throws RecognitionException {
                         cnt30++;
                     } while (true);
 
-                    otherlv_12=(Token)match(input,16,FOLLOW_16_in_ruleNativeContext3471); 
+                    otherlv_12=(Token)match(input,16,FOLLOW_30); 
 
                         	newLeafNode(otherlv_12, grammarAccess.getNativeContextAccess().getRightCurlyBracketKeyword_4_3());
                         
@@ -3775,7 +3775,7 @@ public final EObject ruleNativeContext() throws RecognitionException {
 
             }
 
-            otherlv_13=(Token)match(input,25,FOLLOW_25_in_ruleNativeContext3485); 
+            otherlv_13=(Token)match(input,25,FOLLOW_2); 
 
                 	newLeafNode(otherlv_13, grammarAccess.getNativeContextAccess().getSemicolonKeyword_5());
                 
@@ -3800,7 +3800,7 @@ public final EObject ruleNativeContext() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleQuickFix"
-    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1678:1: entryRuleQuickFix returns [EObject current=null] : iv_ruleQuickFix= ruleQuickFix EOF ;
+    // InternalValid.g:1678:1: entryRuleQuickFix returns [EObject current=null] : iv_ruleQuickFix= ruleQuickFix EOF ;
     public final EObject entryRuleQuickFix() throws RecognitionException {
         EObject current = null;
 
@@ -3808,17 +3808,17 @@ public final EObject entryRuleQuickFix() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1679:2: (iv_ruleQuickFix= ruleQuickFix EOF )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1680:2: iv_ruleQuickFix= ruleQuickFix EOF
+            // InternalValid.g:1679:2: (iv_ruleQuickFix= ruleQuickFix EOF )
+            // InternalValid.g:1680:2: iv_ruleQuickFix= ruleQuickFix EOF
             {
              newCompositeNode(grammarAccess.getQuickFixRule()); 
-            pushFollow(FOLLOW_ruleQuickFix_in_entryRuleQuickFix3521);
+            pushFollow(FOLLOW_1);
             iv_ruleQuickFix=ruleQuickFix();
 
             state._fsp--;
 
              current =iv_ruleQuickFix; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleQuickFix3531); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -3836,7 +3836,7 @@ public final EObject entryRuleQuickFix() throws RecognitionException {
 
 
     // $ANTLR start "ruleQuickFix"
-    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1687:1: ruleQuickFix returns [EObject current=null] : ( ( (lv_quickFixKind_0_0= ruleQuickFixKind ) )? otherlv_1= 'fix' ( (lv_name_2_0= RULE_ID ) ) otherlv_3= 'label' ( (lv_label_4_0= RULE_STRING ) ) otherlv_5= 'message' ( (lv_message_6_0= RULE_STRING ) ) otherlv_7= ';' ) ;
+    // InternalValid.g:1687:1: ruleQuickFix returns [EObject current=null] : ( ( (lv_quickFixKind_0_0= ruleQuickFixKind ) )? otherlv_1= 'fix' ( (lv_name_2_0= RULE_ID ) ) otherlv_3= 'label' ( (lv_label_4_0= RULE_STRING ) ) otherlv_5= 'message' ( (lv_message_6_0= RULE_STRING ) ) otherlv_7= ';' ) ;
     public final EObject ruleQuickFix() throws RecognitionException {
         EObject current = null;
 
@@ -3853,13 +3853,13 @@ public final EObject ruleQuickFix() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1690:28: ( ( ( (lv_quickFixKind_0_0= ruleQuickFixKind ) )? otherlv_1= 'fix' ( (lv_name_2_0= RULE_ID ) ) otherlv_3= 'label' ( (lv_label_4_0= RULE_STRING ) ) otherlv_5= 'message' ( (lv_message_6_0= RULE_STRING ) ) otherlv_7= ';' ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1691:1: ( ( (lv_quickFixKind_0_0= ruleQuickFixKind ) )? otherlv_1= 'fix' ( (lv_name_2_0= RULE_ID ) ) otherlv_3= 'label' ( (lv_label_4_0= RULE_STRING ) ) otherlv_5= 'message' ( (lv_message_6_0= RULE_STRING ) ) otherlv_7= ';' )
+            // InternalValid.g:1690:28: ( ( ( (lv_quickFixKind_0_0= ruleQuickFixKind ) )? otherlv_1= 'fix' ( (lv_name_2_0= RULE_ID ) ) otherlv_3= 'label' ( (lv_label_4_0= RULE_STRING ) ) otherlv_5= 'message' ( (lv_message_6_0= RULE_STRING ) ) otherlv_7= ';' ) )
+            // InternalValid.g:1691:1: ( ( (lv_quickFixKind_0_0= ruleQuickFixKind ) )? otherlv_1= 'fix' ( (lv_name_2_0= RULE_ID ) ) otherlv_3= 'label' ( (lv_label_4_0= RULE_STRING ) ) otherlv_5= 'message' ( (lv_message_6_0= RULE_STRING ) ) otherlv_7= ';' )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1691:1: ( ( (lv_quickFixKind_0_0= ruleQuickFixKind ) )? otherlv_1= 'fix' ( (lv_name_2_0= RULE_ID ) ) otherlv_3= 'label' ( (lv_label_4_0= RULE_STRING ) ) otherlv_5= 'message' ( (lv_message_6_0= RULE_STRING ) ) otherlv_7= ';' )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1691:2: ( (lv_quickFixKind_0_0= ruleQuickFixKind ) )? otherlv_1= 'fix' ( (lv_name_2_0= RULE_ID ) ) otherlv_3= 'label' ( (lv_label_4_0= RULE_STRING ) ) otherlv_5= 'message' ( (lv_message_6_0= RULE_STRING ) ) otherlv_7= ';'
+            // InternalValid.g:1691:1: ( ( (lv_quickFixKind_0_0= ruleQuickFixKind ) )? otherlv_1= 'fix' ( (lv_name_2_0= RULE_ID ) ) otherlv_3= 'label' ( (lv_label_4_0= RULE_STRING ) ) otherlv_5= 'message' ( (lv_message_6_0= RULE_STRING ) ) otherlv_7= ';' )
+            // InternalValid.g:1691:2: ( (lv_quickFixKind_0_0= ruleQuickFixKind ) )? otherlv_1= 'fix' ( (lv_name_2_0= RULE_ID ) ) otherlv_3= 'label' ( (lv_label_4_0= RULE_STRING ) ) otherlv_5= 'message' ( (lv_message_6_0= RULE_STRING ) ) otherlv_7= ';'
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1691:2: ( (lv_quickFixKind_0_0= ruleQuickFixKind ) )?
+            // InternalValid.g:1691:2: ( (lv_quickFixKind_0_0= ruleQuickFixKind ) )?
             int alt32=2;
             int LA32_0 = input.LA(1);
 
@@ -3868,15 +3868,15 @@ public final EObject ruleQuickFix() throws RecognitionException {
             }
             switch (alt32) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1692:1: (lv_quickFixKind_0_0= ruleQuickFixKind )
+                    // InternalValid.g:1692:1: (lv_quickFixKind_0_0= ruleQuickFixKind )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1692:1: (lv_quickFixKind_0_0= ruleQuickFixKind )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1693:3: lv_quickFixKind_0_0= ruleQuickFixKind
+                    // InternalValid.g:1692:1: (lv_quickFixKind_0_0= ruleQuickFixKind )
+                    // InternalValid.g:1693:3: lv_quickFixKind_0_0= ruleQuickFixKind
                     {
                      
                     	        newCompositeNode(grammarAccess.getQuickFixAccess().getQuickFixKindQuickFixKindEnumRuleCall_0_0()); 
                     	    
-                    pushFollow(FOLLOW_ruleQuickFixKind_in_ruleQuickFix3577);
+                    pushFollow(FOLLOW_41);
                     lv_quickFixKind_0_0=ruleQuickFixKind();
 
                     state._fsp--;
@@ -3889,7 +3889,7 @@ public final EObject ruleQuickFix() throws RecognitionException {
                            			current, 
                            			"quickFixKind",
                             		lv_quickFixKind_0_0, 
-                            		"QuickFixKind");
+                            		"com.avaloq.tools.ddk.xtext.valid.Valid.QuickFixKind");
                     	        afterParserOrEnumRuleCall();
                     	    
 
@@ -3901,17 +3901,17 @@ public final EObject ruleQuickFix() throws RecognitionException {
 
             }
 
-            otherlv_1=(Token)match(input,29,FOLLOW_29_in_ruleQuickFix3590); 
+            otherlv_1=(Token)match(input,29,FOLLOW_6); 
 
                 	newLeafNode(otherlv_1, grammarAccess.getQuickFixAccess().getFixKeyword_1());
                 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1713:1: ( (lv_name_2_0= RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1714:1: (lv_name_2_0= RULE_ID )
+            // InternalValid.g:1713:1: ( (lv_name_2_0= RULE_ID ) )
+            // InternalValid.g:1714:1: (lv_name_2_0= RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1714:1: (lv_name_2_0= RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1715:3: lv_name_2_0= RULE_ID
+            // InternalValid.g:1714:1: (lv_name_2_0= RULE_ID )
+            // InternalValid.g:1715:3: lv_name_2_0= RULE_ID
             {
-            lv_name_2_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleQuickFix3607); 
+            lv_name_2_0=(Token)match(input,RULE_ID,FOLLOW_7); 
 
             			newLeafNode(lv_name_2_0, grammarAccess.getQuickFixAccess().getNameIDTerminalRuleCall_2_0()); 
             		
@@ -3923,7 +3923,7 @@ public final EObject ruleQuickFix() throws RecognitionException {
                    			current, 
                    			"name",
                     		lv_name_2_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -3931,17 +3931,17 @@ public final EObject ruleQuickFix() throws RecognitionException {
 
             }
 
-            otherlv_3=(Token)match(input,13,FOLLOW_13_in_ruleQuickFix3624); 
+            otherlv_3=(Token)match(input,13,FOLLOW_5); 
 
                 	newLeafNode(otherlv_3, grammarAccess.getQuickFixAccess().getLabelKeyword_3());
                 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1735:1: ( (lv_label_4_0= RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1736:1: (lv_label_4_0= RULE_STRING )
+            // InternalValid.g:1735:1: ( (lv_label_4_0= RULE_STRING ) )
+            // InternalValid.g:1736:1: (lv_label_4_0= RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1736:1: (lv_label_4_0= RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1737:3: lv_label_4_0= RULE_STRING
+            // InternalValid.g:1736:1: (lv_label_4_0= RULE_STRING )
+            // InternalValid.g:1737:3: lv_label_4_0= RULE_STRING
             {
-            lv_label_4_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleQuickFix3641); 
+            lv_label_4_0=(Token)match(input,RULE_STRING,FOLLOW_13); 
 
             			newLeafNode(lv_label_4_0, grammarAccess.getQuickFixAccess().getLabelSTRINGTerminalRuleCall_4_0()); 
             		
@@ -3953,7 +3953,7 @@ public final EObject ruleQuickFix() throws RecognitionException {
                    			current, 
                    			"label",
                     		lv_label_4_0, 
-                    		"STRING");
+                    		"org.eclipse.xtext.common.Terminals.STRING");
             	    
 
             }
@@ -3961,17 +3961,17 @@ public final EObject ruleQuickFix() throws RecognitionException {
 
             }
 
-            otherlv_5=(Token)match(input,18,FOLLOW_18_in_ruleQuickFix3658); 
+            otherlv_5=(Token)match(input,18,FOLLOW_5); 
 
                 	newLeafNode(otherlv_5, grammarAccess.getQuickFixAccess().getMessageKeyword_5());
                 
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1757:1: ( (lv_message_6_0= RULE_STRING ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1758:1: (lv_message_6_0= RULE_STRING )
+            // InternalValid.g:1757:1: ( (lv_message_6_0= RULE_STRING ) )
+            // InternalValid.g:1758:1: (lv_message_6_0= RULE_STRING )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1758:1: (lv_message_6_0= RULE_STRING )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1759:3: lv_message_6_0= RULE_STRING
+            // InternalValid.g:1758:1: (lv_message_6_0= RULE_STRING )
+            // InternalValid.g:1759:3: lv_message_6_0= RULE_STRING
             {
-            lv_message_6_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleQuickFix3675); 
+            lv_message_6_0=(Token)match(input,RULE_STRING,FOLLOW_30); 
 
             			newLeafNode(lv_message_6_0, grammarAccess.getQuickFixAccess().getMessageSTRINGTerminalRuleCall_6_0()); 
             		
@@ -3983,7 +3983,7 @@ public final EObject ruleQuickFix() throws RecognitionException {
                    			current, 
                    			"message",
                     		lv_message_6_0, 
-                    		"STRING");
+                    		"org.eclipse.xtext.common.Terminals.STRING");
             	    
 
             }
@@ -3991,7 +3991,7 @@ public final EObject ruleQuickFix() throws RecognitionException {
 
             }
 
-            otherlv_7=(Token)match(input,25,FOLLOW_25_in_ruleQuickFix3692); 
+            otherlv_7=(Token)match(input,25,FOLLOW_2); 
 
                 	newLeafNode(otherlv_7, grammarAccess.getQuickFixAccess().getSemicolonKeyword_7());
                 
@@ -4016,7 +4016,7 @@ public final EObject ruleQuickFix() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleQualifiedID"
-    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1787:1: entryRuleQualifiedID returns [String current=null] : iv_ruleQualifiedID= ruleQualifiedID EOF ;
+    // InternalValid.g:1787:1: entryRuleQualifiedID returns [String current=null] : iv_ruleQualifiedID= ruleQualifiedID EOF ;
     public final String entryRuleQualifiedID() throws RecognitionException {
         String current = null;
 
@@ -4024,17 +4024,17 @@ public final String entryRuleQualifiedID() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1788:2: (iv_ruleQualifiedID= ruleQualifiedID EOF )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1789:2: iv_ruleQualifiedID= ruleQualifiedID EOF
+            // InternalValid.g:1788:2: (iv_ruleQualifiedID= ruleQualifiedID EOF )
+            // InternalValid.g:1789:2: iv_ruleQualifiedID= ruleQualifiedID EOF
             {
              newCompositeNode(grammarAccess.getQualifiedIDRule()); 
-            pushFollow(FOLLOW_ruleQualifiedID_in_entryRuleQualifiedID3729);
+            pushFollow(FOLLOW_1);
             iv_ruleQualifiedID=ruleQualifiedID();
 
             state._fsp--;
 
              current =iv_ruleQualifiedID.getText(); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedID3740); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -4052,7 +4052,7 @@ public final String entryRuleQualifiedID() throws RecognitionException {
 
 
     // $ANTLR start "ruleQualifiedID"
-    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1796:1: ruleQualifiedID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (this_ID_0= RULE_ID kw= '::' )* this_ID_2= RULE_ID ) ;
+    // InternalValid.g:1796:1: ruleQualifiedID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (this_ID_0= RULE_ID kw= '::' )* this_ID_2= RULE_ID ) ;
     public final AntlrDatatypeRuleToken ruleQualifiedID() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -4063,13 +4063,13 @@ public final AntlrDatatypeRuleToken ruleQualifiedID() throws RecognitionExceptio
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1799:28: ( ( (this_ID_0= RULE_ID kw= '::' )* this_ID_2= RULE_ID ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1800:1: ( (this_ID_0= RULE_ID kw= '::' )* this_ID_2= RULE_ID )
+            // InternalValid.g:1799:28: ( ( (this_ID_0= RULE_ID kw= '::' )* this_ID_2= RULE_ID ) )
+            // InternalValid.g:1800:1: ( (this_ID_0= RULE_ID kw= '::' )* this_ID_2= RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1800:1: ( (this_ID_0= RULE_ID kw= '::' )* this_ID_2= RULE_ID )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1800:2: (this_ID_0= RULE_ID kw= '::' )* this_ID_2= RULE_ID
+            // InternalValid.g:1800:1: ( (this_ID_0= RULE_ID kw= '::' )* this_ID_2= RULE_ID )
+            // InternalValid.g:1800:2: (this_ID_0= RULE_ID kw= '::' )* this_ID_2= RULE_ID
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1800:2: (this_ID_0= RULE_ID kw= '::' )*
+            // InternalValid.g:1800:2: (this_ID_0= RULE_ID kw= '::' )*
             loop33:
             do {
                 int alt33=2;
@@ -4088,16 +4088,16 @@ public final AntlrDatatypeRuleToken ruleQualifiedID() throws RecognitionExceptio
 
                 switch (alt33) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1800:7: this_ID_0= RULE_ID kw= '::'
+            	    // InternalValid.g:1800:7: this_ID_0= RULE_ID kw= '::'
             	    {
-            	    this_ID_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleQualifiedID3781); 
+            	    this_ID_0=(Token)match(input,RULE_ID,FOLLOW_42); 
 
             	    		current.merge(this_ID_0);
             	        
             	     
             	        newLeafNode(this_ID_0, grammarAccess.getQualifiedIDAccess().getIDTerminalRuleCall_0_0()); 
             	        
-            	    kw=(Token)match(input,30,FOLLOW_30_in_ruleQualifiedID3799); 
+            	    kw=(Token)match(input,30,FOLLOW_6); 
 
             	            current.merge(kw);
             	            newLeafNode(kw, grammarAccess.getQualifiedIDAccess().getColonColonKeyword_0_1()); 
@@ -4111,7 +4111,7 @@ public final AntlrDatatypeRuleToken ruleQualifiedID() throws RecognitionExceptio
                 }
             } while (true);
 
-            this_ID_2=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleQualifiedID3816); 
+            this_ID_2=(Token)match(input,RULE_ID,FOLLOW_2); 
 
             		current.merge(this_ID_2);
                 
@@ -4139,7 +4139,7 @@ public final AntlrDatatypeRuleToken ruleQualifiedID() throws RecognitionExceptio
 
 
     // $ANTLR start "ruleCheckKind"
-    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1828:1: ruleCheckKind returns [Enumerator current=null] : ( (enumLiteral_0= 'fast' ) | (enumLiteral_1= 'normal' ) | (enumLiteral_2= 'expensive' ) ) ;
+    // InternalValid.g:1828:1: ruleCheckKind returns [Enumerator current=null] : ( (enumLiteral_0= 'fast' ) | (enumLiteral_1= 'normal' ) | (enumLiteral_2= 'expensive' ) ) ;
     public final Enumerator ruleCheckKind() throws RecognitionException {
         Enumerator current = null;
 
@@ -4149,10 +4149,10 @@ public final Enumerator ruleCheckKind() throws RecognitionException {
 
          enterRule(); 
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1830:28: ( ( (enumLiteral_0= 'fast' ) | (enumLiteral_1= 'normal' ) | (enumLiteral_2= 'expensive' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1831:1: ( (enumLiteral_0= 'fast' ) | (enumLiteral_1= 'normal' ) | (enumLiteral_2= 'expensive' ) )
+            // InternalValid.g:1830:28: ( ( (enumLiteral_0= 'fast' ) | (enumLiteral_1= 'normal' ) | (enumLiteral_2= 'expensive' ) ) )
+            // InternalValid.g:1831:1: ( (enumLiteral_0= 'fast' ) | (enumLiteral_1= 'normal' ) | (enumLiteral_2= 'expensive' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1831:1: ( (enumLiteral_0= 'fast' ) | (enumLiteral_1= 'normal' ) | (enumLiteral_2= 'expensive' ) )
+            // InternalValid.g:1831:1: ( (enumLiteral_0= 'fast' ) | (enumLiteral_1= 'normal' ) | (enumLiteral_2= 'expensive' ) )
             int alt34=3;
             switch ( input.LA(1) ) {
             case 31:
@@ -4179,12 +4179,12 @@ public final Enumerator ruleCheckKind() throws RecognitionException {
 
             switch (alt34) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1831:2: (enumLiteral_0= 'fast' )
+                    // InternalValid.g:1831:2: (enumLiteral_0= 'fast' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1831:2: (enumLiteral_0= 'fast' )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1831:4: enumLiteral_0= 'fast'
+                    // InternalValid.g:1831:2: (enumLiteral_0= 'fast' )
+                    // InternalValid.g:1831:4: enumLiteral_0= 'fast'
                     {
-                    enumLiteral_0=(Token)match(input,31,FOLLOW_31_in_ruleCheckKind3875); 
+                    enumLiteral_0=(Token)match(input,31,FOLLOW_2); 
 
                             current = grammarAccess.getCheckKindAccess().getFastEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_0, grammarAccess.getCheckKindAccess().getFastEnumLiteralDeclaration_0()); 
@@ -4196,12 +4196,12 @@ public final Enumerator ruleCheckKind() throws RecognitionException {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1837:6: (enumLiteral_1= 'normal' )
+                    // InternalValid.g:1837:6: (enumLiteral_1= 'normal' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1837:6: (enumLiteral_1= 'normal' )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1837:8: enumLiteral_1= 'normal'
+                    // InternalValid.g:1837:6: (enumLiteral_1= 'normal' )
+                    // InternalValid.g:1837:8: enumLiteral_1= 'normal'
                     {
-                    enumLiteral_1=(Token)match(input,32,FOLLOW_32_in_ruleCheckKind3892); 
+                    enumLiteral_1=(Token)match(input,32,FOLLOW_2); 
 
                             current = grammarAccess.getCheckKindAccess().getNormalEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_1, grammarAccess.getCheckKindAccess().getNormalEnumLiteralDeclaration_1()); 
@@ -4213,12 +4213,12 @@ public final Enumerator ruleCheckKind() throws RecognitionException {
                     }
                     break;
                 case 3 :
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1843:6: (enumLiteral_2= 'expensive' )
+                    // InternalValid.g:1843:6: (enumLiteral_2= 'expensive' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1843:6: (enumLiteral_2= 'expensive' )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1843:8: enumLiteral_2= 'expensive'
+                    // InternalValid.g:1843:6: (enumLiteral_2= 'expensive' )
+                    // InternalValid.g:1843:8: enumLiteral_2= 'expensive'
                     {
-                    enumLiteral_2=(Token)match(input,33,FOLLOW_33_in_ruleCheckKind3909); 
+                    enumLiteral_2=(Token)match(input,33,FOLLOW_2); 
 
                             current = grammarAccess.getCheckKindAccess().getExpensiveEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_2, grammarAccess.getCheckKindAccess().getExpensiveEnumLiteralDeclaration_2()); 
@@ -4250,7 +4250,7 @@ public final Enumerator ruleCheckKind() throws RecognitionException {
 
 
     // $ANTLR start "ruleSeverityKind"
-    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1853:1: ruleSeverityKind returns [Enumerator current=null] : ( (enumLiteral_0= 'error' ) | (enumLiteral_1= 'warning' ) ) ;
+    // InternalValid.g:1853:1: ruleSeverityKind returns [Enumerator current=null] : ( (enumLiteral_0= 'error' ) | (enumLiteral_1= 'warning' ) ) ;
     public final Enumerator ruleSeverityKind() throws RecognitionException {
         Enumerator current = null;
 
@@ -4259,10 +4259,10 @@ public final Enumerator ruleSeverityKind() throws RecognitionException {
 
          enterRule(); 
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1855:28: ( ( (enumLiteral_0= 'error' ) | (enumLiteral_1= 'warning' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1856:1: ( (enumLiteral_0= 'error' ) | (enumLiteral_1= 'warning' ) )
+            // InternalValid.g:1855:28: ( ( (enumLiteral_0= 'error' ) | (enumLiteral_1= 'warning' ) ) )
+            // InternalValid.g:1856:1: ( (enumLiteral_0= 'error' ) | (enumLiteral_1= 'warning' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1856:1: ( (enumLiteral_0= 'error' ) | (enumLiteral_1= 'warning' ) )
+            // InternalValid.g:1856:1: ( (enumLiteral_0= 'error' ) | (enumLiteral_1= 'warning' ) )
             int alt35=2;
             int LA35_0 = input.LA(1);
 
@@ -4280,12 +4280,12 @@ else if ( (LA35_0==35) ) {
             }
             switch (alt35) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1856:2: (enumLiteral_0= 'error' )
+                    // InternalValid.g:1856:2: (enumLiteral_0= 'error' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1856:2: (enumLiteral_0= 'error' )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1856:4: enumLiteral_0= 'error'
+                    // InternalValid.g:1856:2: (enumLiteral_0= 'error' )
+                    // InternalValid.g:1856:4: enumLiteral_0= 'error'
                     {
-                    enumLiteral_0=(Token)match(input,34,FOLLOW_34_in_ruleSeverityKind3954); 
+                    enumLiteral_0=(Token)match(input,34,FOLLOW_2); 
 
                             current = grammarAccess.getSeverityKindAccess().getErrorEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_0, grammarAccess.getSeverityKindAccess().getErrorEnumLiteralDeclaration_0()); 
@@ -4297,12 +4297,12 @@ else if ( (LA35_0==35) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1862:6: (enumLiteral_1= 'warning' )
+                    // InternalValid.g:1862:6: (enumLiteral_1= 'warning' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1862:6: (enumLiteral_1= 'warning' )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1862:8: enumLiteral_1= 'warning'
+                    // InternalValid.g:1862:6: (enumLiteral_1= 'warning' )
+                    // InternalValid.g:1862:8: enumLiteral_1= 'warning'
                     {
-                    enumLiteral_1=(Token)match(input,35,FOLLOW_35_in_ruleSeverityKind3971); 
+                    enumLiteral_1=(Token)match(input,35,FOLLOW_2); 
 
                             current = grammarAccess.getSeverityKindAccess().getWarningEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_1, grammarAccess.getSeverityKindAccess().getWarningEnumLiteralDeclaration_1()); 
@@ -4334,7 +4334,7 @@ else if ( (LA35_0==35) ) {
 
 
     // $ANTLR start "ruleQuickFixKind"
-    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1872:1: ruleQuickFixKind returns [Enumerator current=null] : ( (enumLiteral_0= 'semantic' ) | (enumLiteral_1= 'textual' ) ) ;
+    // InternalValid.g:1872:1: ruleQuickFixKind returns [Enumerator current=null] : ( (enumLiteral_0= 'semantic' ) | (enumLiteral_1= 'textual' ) ) ;
     public final Enumerator ruleQuickFixKind() throws RecognitionException {
         Enumerator current = null;
 
@@ -4343,10 +4343,10 @@ public final Enumerator ruleQuickFixKind() throws RecognitionException {
 
          enterRule(); 
         try {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1874:28: ( ( (enumLiteral_0= 'semantic' ) | (enumLiteral_1= 'textual' ) ) )
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1875:1: ( (enumLiteral_0= 'semantic' ) | (enumLiteral_1= 'textual' ) )
+            // InternalValid.g:1874:28: ( ( (enumLiteral_0= 'semantic' ) | (enumLiteral_1= 'textual' ) ) )
+            // InternalValid.g:1875:1: ( (enumLiteral_0= 'semantic' ) | (enumLiteral_1= 'textual' ) )
             {
-            // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1875:1: ( (enumLiteral_0= 'semantic' ) | (enumLiteral_1= 'textual' ) )
+            // InternalValid.g:1875:1: ( (enumLiteral_0= 'semantic' ) | (enumLiteral_1= 'textual' ) )
             int alt36=2;
             int LA36_0 = input.LA(1);
 
@@ -4364,12 +4364,12 @@ else if ( (LA36_0==37) ) {
             }
             switch (alt36) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1875:2: (enumLiteral_0= 'semantic' )
+                    // InternalValid.g:1875:2: (enumLiteral_0= 'semantic' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1875:2: (enumLiteral_0= 'semantic' )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1875:4: enumLiteral_0= 'semantic'
+                    // InternalValid.g:1875:2: (enumLiteral_0= 'semantic' )
+                    // InternalValid.g:1875:4: enumLiteral_0= 'semantic'
                     {
-                    enumLiteral_0=(Token)match(input,36,FOLLOW_36_in_ruleQuickFixKind4016); 
+                    enumLiteral_0=(Token)match(input,36,FOLLOW_2); 
 
                             current = grammarAccess.getQuickFixKindAccess().getSemanticEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_0, grammarAccess.getQuickFixKindAccess().getSemanticEnumLiteralDeclaration_0()); 
@@ -4381,12 +4381,12 @@ else if ( (LA36_0==37) ) {
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1881:6: (enumLiteral_1= 'textual' )
+                    // InternalValid.g:1881:6: (enumLiteral_1= 'textual' )
                     {
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1881:6: (enumLiteral_1= 'textual' )
-                    // ../com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/parser/antlr/internal/InternalValid.g:1881:8: enumLiteral_1= 'textual'
+                    // InternalValid.g:1881:6: (enumLiteral_1= 'textual' )
+                    // InternalValid.g:1881:8: enumLiteral_1= 'textual'
                     {
-                    enumLiteral_1=(Token)match(input,37,FOLLOW_37_in_ruleQuickFixKind4033); 
+                    enumLiteral_1=(Token)match(input,37,FOLLOW_2); 
 
                             current = grammarAccess.getQuickFixKindAccess().getTextualEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
                             newLeafNode(enumLiteral_1, grammarAccess.getQuickFixKindAccess().getTextualEnumLiteralDeclaration_1()); 
@@ -4421,19 +4421,12 @@ else if ( (LA36_0==37) ) {
 
     protected DFA5 dfa5 = new DFA5(this);
     protected DFA6 dfa6 = new DFA6(this);
-    static final String DFA5_eotS =
-        "\7\uffff";
-    static final String DFA5_eofS =
-        "\7\uffff";
-    static final String DFA5_minS =
-        "\5\21\2\uffff";
-    static final String DFA5_maxS =
-        "\5\43\2\uffff";
-    static final String DFA5_acceptS =
-        "\5\uffff\1\1\1\2";
-    static final String DFA5_specialS =
-        "\7\uffff}>";
-    static final String[] DFA5_transitionS = {
+    static final String dfa_1s = "\7\uffff";
+    static final String dfa_2s = "\5\21\2\uffff";
+    static final String dfa_3s = "\5\43\2\uffff";
+    static final String dfa_4s = "\5\uffff\1\1\1\2";
+    static final String dfa_5s = "\7\uffff}>";
+    static final String[] dfa_6s = {
             "\1\1\2\uffff\1\6\1\uffff\2\6\7\uffff\1\2\1\3\1\4\2\5",
             "\1\1\2\uffff\1\6\1\uffff\2\6\7\uffff\1\2\1\3\1\4\2\5",
             "\1\1\2\uffff\1\6\1\uffff\2\6\7\uffff\1\2\1\3\1\4\2\5",
@@ -4443,52 +4436,36 @@ else if ( (LA36_0==37) ) {
             ""
     };
 
-    static final short[] DFA5_eot = DFA.unpackEncodedString(DFA5_eotS);
-    static final short[] DFA5_eof = DFA.unpackEncodedString(DFA5_eofS);
-    static final char[] DFA5_min = DFA.unpackEncodedStringToUnsignedChars(DFA5_minS);
-    static final char[] DFA5_max = DFA.unpackEncodedStringToUnsignedChars(DFA5_maxS);
-    static final short[] DFA5_accept = DFA.unpackEncodedString(DFA5_acceptS);
-    static final short[] DFA5_special = DFA.unpackEncodedString(DFA5_specialS);
-    static final short[][] DFA5_transition;
-
-    static {
-        int numStates = DFA5_transitionS.length;
-        DFA5_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA5_transition[i] = DFA.unpackEncodedString(DFA5_transitionS[i]);
-        }
-    }
+    static final short[] dfa_1 = DFA.unpackEncodedString(dfa_1s);
+    static final char[] dfa_2 = DFA.unpackEncodedStringToUnsignedChars(dfa_2s);
+    static final char[] dfa_3 = DFA.unpackEncodedStringToUnsignedChars(dfa_3s);
+    static final short[] dfa_4 = DFA.unpackEncodedString(dfa_4s);
+    static final short[] dfa_5 = DFA.unpackEncodedString(dfa_5s);
+    static final short[][] dfa_6 = unpackEncodedStringArray(dfa_6s);
 
     class DFA5 extends DFA {
 
         public DFA5(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 5;
-            this.eot = DFA5_eot;
-            this.eof = DFA5_eof;
-            this.min = DFA5_min;
-            this.max = DFA5_max;
-            this.accept = DFA5_accept;
-            this.special = DFA5_special;
-            this.transition = DFA5_transition;
+            this.eot = dfa_1;
+            this.eof = dfa_1;
+            this.min = dfa_2;
+            this.max = dfa_3;
+            this.accept = dfa_4;
+            this.special = dfa_5;
+            this.transition = dfa_6;
         }
         public String getDescription() {
             return "289:1: (this_NativeRule_0= ruleNativeRule | this_PredefinedRule_1= rulePredefinedRule )";
         }
     }
-    static final String DFA6_eotS =
-        "\10\uffff";
-    static final String DFA6_eofS =
-        "\10\uffff";
-    static final String DFA6_minS =
-        "\5\21\3\uffff";
-    static final String DFA6_maxS =
-        "\5\41\3\uffff";
-    static final String DFA6_acceptS =
-        "\5\uffff\1\1\1\2\1\3";
-    static final String DFA6_specialS =
-        "\10\uffff}>";
-    static final String[] DFA6_transitionS = {
+    static final String dfa_7s = "\10\uffff";
+    static final String dfa_8s = "\5\21\3\uffff";
+    static final String dfa_9s = "\5\41\3\uffff";
+    static final String dfa_10s = "\5\uffff\1\1\1\2\1\3";
+    static final String dfa_11s = "\10\uffff}>";
+    static final String[] dfa_12s = {
             "\1\1\2\uffff\1\5\1\uffff\1\6\1\7\7\uffff\1\2\1\3\1\4",
             "\1\1\2\uffff\1\5\1\uffff\1\6\1\7\7\uffff\1\2\1\3\1\4",
             "\1\1\2\uffff\1\5\1\uffff\1\6\1\7\7\uffff\1\2\1\3\1\4",
@@ -4499,34 +4476,25 @@ public String getDescription() {
             ""
     };
 
-    static final short[] DFA6_eot = DFA.unpackEncodedString(DFA6_eotS);
-    static final short[] DFA6_eof = DFA.unpackEncodedString(DFA6_eofS);
-    static final char[] DFA6_min = DFA.unpackEncodedStringToUnsignedChars(DFA6_minS);
-    static final char[] DFA6_max = DFA.unpackEncodedStringToUnsignedChars(DFA6_maxS);
-    static final short[] DFA6_accept = DFA.unpackEncodedString(DFA6_acceptS);
-    static final short[] DFA6_special = DFA.unpackEncodedString(DFA6_specialS);
-    static final short[][] DFA6_transition;
-
-    static {
-        int numStates = DFA6_transitionS.length;
-        DFA6_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA6_transition[i] = DFA.unpackEncodedString(DFA6_transitionS[i]);
-        }
-    }
+    static final short[] dfa_7 = DFA.unpackEncodedString(dfa_7s);
+    static final char[] dfa_8 = DFA.unpackEncodedStringToUnsignedChars(dfa_8s);
+    static final char[] dfa_9 = DFA.unpackEncodedStringToUnsignedChars(dfa_9s);
+    static final short[] dfa_10 = DFA.unpackEncodedString(dfa_10s);
+    static final short[] dfa_11 = DFA.unpackEncodedString(dfa_11s);
+    static final short[][] dfa_12 = unpackEncodedStringArray(dfa_12s);
 
     class DFA6 extends DFA {
 
         public DFA6(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 6;
-            this.eot = DFA6_eot;
-            this.eof = DFA6_eof;
-            this.min = DFA6_min;
-            this.max = DFA6_max;
-            this.accept = DFA6_accept;
-            this.special = DFA6_special;
-            this.transition = DFA6_transition;
+            this.eot = dfa_7;
+            this.eof = dfa_7;
+            this.min = dfa_8;
+            this.max = dfa_9;
+            this.accept = dfa_10;
+            this.special = dfa_11;
+            this.transition = dfa_12;
         }
         public String getDescription() {
             return "329:1: (this_SizeRule_0= ruleSizeRule | this_RangeRule_1= ruleRangeRule | this_UniqueRule_2= ruleUniqueRule )";
@@ -4534,162 +4502,47 @@ public String getDescription() {
     }
  
 
-    public static final BitSet FOLLOW_ruleValidModel_in_entryRuleValidModel75 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleValidModel85 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImport_in_ruleValidModel131 = new BitSet(new long[]{0x0000000000001802L});
-    public static final BitSet FOLLOW_ruleCategory_in_ruleValidModel153 = new BitSet(new long[]{0x0000000000001002L});
-    public static final BitSet FOLLOW_ruleImport_in_entryRuleImport190 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleImport200 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_11_in_ruleImport237 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleImport257 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCategory_in_entryRuleCategory293 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleCategory303 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_12_in_ruleCategory340 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleCategory357 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleCategory374 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleCategory391 = new BitSet(new long[]{0x000000000000C000L});
-    public static final BitSet FOLLOW_14_in_ruleCategory409 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleCategory426 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleCategory445 = new BitSet(new long[]{0x0000000F80D30000L});
-    public static final BitSet FOLLOW_ruleRule_in_ruleCategory466 = new BitSet(new long[]{0x0000000F80D30000L});
-    public static final BitSet FOLLOW_16_in_ruleCategory479 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRule_in_entryRuleRule515 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRule525 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNativeRule_in_ruleRule572 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePredefinedRule_in_ruleRule599 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePredefinedRule_in_entryRulePredefinedRule634 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRulePredefinedRule644 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSizeRule_in_rulePredefinedRule691 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRangeRule_in_rulePredefinedRule718 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleUniqueRule_in_rulePredefinedRule745 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNativeRule_in_entryRuleNativeRule780 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNativeRule790 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_17_in_ruleNativeRule878 = new BitSet(new long[]{0x0000000F80020000L});
-    public static final BitSet FOLLOW_ruleCheckKind_in_ruleNativeRule966 = new BitSet(new long[]{0x0000000F80020000L});
-    public static final BitSet FOLLOW_ruleSeverityKind_in_ruleNativeRule1027 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleNativeRule1044 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleNativeRule1061 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleNativeRule1078 = new BitSet(new long[]{0x0000000000044000L});
-    public static final BitSet FOLLOW_14_in_ruleNativeRule1096 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleNativeRule1113 = new BitSet(new long[]{0x0000000000040000L});
-    public static final BitSet FOLLOW_18_in_ruleNativeRule1132 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleNativeRule1149 = new BitSet(new long[]{0x0000000000080000L});
-    public static final BitSet FOLLOW_19_in_ruleNativeRule1166 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleNativeRule1178 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_ruleNativeContext_in_ruleNativeRule1199 = new BitSet(new long[]{0x0000000000010020L});
-    public static final BitSet FOLLOW_16_in_ruleNativeRule1212 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSizeRule_in_entryRuleSizeRule1248 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSizeRule1258 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_17_in_ruleSizeRule1346 = new BitSet(new long[]{0x0000000380120000L});
-    public static final BitSet FOLLOW_ruleCheckKind_in_ruleSizeRule1434 = new BitSet(new long[]{0x0000000380120000L});
-    public static final BitSet FOLLOW_20_in_ruleSizeRule1486 = new BitSet(new long[]{0x0000000F80020000L});
-    public static final BitSet FOLLOW_ruleSeverityKind_in_ruleSizeRule1507 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleSizeRule1524 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleSizeRule1541 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleSizeRule1558 = new BitSet(new long[]{0x0000000000144000L});
-    public static final BitSet FOLLOW_14_in_ruleSizeRule1576 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleSizeRule1593 = new BitSet(new long[]{0x0000000000140000L});
-    public static final BitSet FOLLOW_18_in_ruleSizeRule1613 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleSizeRule1630 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_20_in_ruleSizeRule1649 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleSizeRule1667 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_21_in_ruleSizeRule1684 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleSizeRule1703 = new BitSet(new long[]{0x0000000000080000L});
-    public static final BitSet FOLLOW_19_in_ruleSizeRule1720 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleSizeRule1732 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_ruleSimpleContext_in_ruleSizeRule1753 = new BitSet(new long[]{0x0000000000010020L});
-    public static final BitSet FOLLOW_16_in_ruleSizeRule1766 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRangeRule_in_entryRuleRangeRule1802 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRangeRule1812 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_17_in_ruleRangeRule1900 = new BitSet(new long[]{0x0000000380420000L});
-    public static final BitSet FOLLOW_ruleCheckKind_in_ruleRangeRule1988 = new BitSet(new long[]{0x0000000380420000L});
-    public static final BitSet FOLLOW_22_in_ruleRangeRule2040 = new BitSet(new long[]{0x0000000F80020000L});
-    public static final BitSet FOLLOW_ruleSeverityKind_in_ruleRangeRule2061 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleRangeRule2078 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleRangeRule2095 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleRangeRule2112 = new BitSet(new long[]{0x0000000000444000L});
-    public static final BitSet FOLLOW_14_in_ruleRangeRule2130 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleRangeRule2147 = new BitSet(new long[]{0x0000000000440000L});
-    public static final BitSet FOLLOW_18_in_ruleRangeRule2167 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleRangeRule2184 = new BitSet(new long[]{0x0000000000400000L});
-    public static final BitSet FOLLOW_22_in_ruleRangeRule2203 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleRangeRule2221 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_21_in_ruleRangeRule2238 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_RULE_INT_in_ruleRangeRule2257 = new BitSet(new long[]{0x0000000000080000L});
-    public static final BitSet FOLLOW_19_in_ruleRangeRule2274 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleRangeRule2286 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_ruleSimpleContext_in_ruleRangeRule2307 = new BitSet(new long[]{0x0000000000010020L});
-    public static final BitSet FOLLOW_16_in_ruleRangeRule2320 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleUniqueRule_in_entryRuleUniqueRule2356 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleUniqueRule2366 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_17_in_ruleUniqueRule2454 = new BitSet(new long[]{0x0000000380820000L});
-    public static final BitSet FOLLOW_ruleCheckKind_in_ruleUniqueRule2542 = new BitSet(new long[]{0x0000000380820000L});
-    public static final BitSet FOLLOW_23_in_ruleUniqueRule2594 = new BitSet(new long[]{0x0000000F80020000L});
-    public static final BitSet FOLLOW_ruleSeverityKind_in_ruleUniqueRule2615 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleUniqueRule2632 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleUniqueRule2649 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleUniqueRule2666 = new BitSet(new long[]{0x00000000000C4000L});
-    public static final BitSet FOLLOW_14_in_ruleUniqueRule2684 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleUniqueRule2701 = new BitSet(new long[]{0x00000000000C0000L});
-    public static final BitSet FOLLOW_18_in_ruleUniqueRule2721 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleUniqueRule2738 = new BitSet(new long[]{0x0000000000080000L});
-    public static final BitSet FOLLOW_19_in_ruleUniqueRule2757 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleUniqueRule2769 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_ruleDuplicateContext_in_ruleUniqueRule2790 = new BitSet(new long[]{0x0000000000010020L});
-    public static final BitSet FOLLOW_16_in_ruleUniqueRule2803 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleSimpleContext_in_entryRuleSimpleContext2841 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleSimpleContext2851 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedID_in_ruleSimpleContext2899 = new BitSet(new long[]{0x0000000003000000L});
-    public static final BitSet FOLLOW_24_in_ruleSimpleContext2912 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleSimpleContext2932 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_ruleSimpleContext2946 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDuplicateContext_in_entryRuleDuplicateContext2982 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleDuplicateContext2992 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedID_in_ruleDuplicateContext3040 = new BitSet(new long[]{0x0000000005000000L});
-    public static final BitSet FOLLOW_24_in_ruleDuplicateContext3053 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleDuplicateContext3073 = new BitSet(new long[]{0x0000000004000000L});
-    public static final BitSet FOLLOW_26_in_ruleDuplicateContext3087 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_ruleQualifiedID_in_ruleDuplicateContext3110 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_24_in_ruleDuplicateContext3122 = new BitSet(new long[]{0x0000000002000020L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleDuplicateContext3142 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_ruleDuplicateContext3155 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNativeContext_in_entryRuleNativeContext3191 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNativeContext3201 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedID_in_ruleNativeContext3249 = new BitSet(new long[]{0x000000001F000000L});
-    public static final BitSet FOLLOW_24_in_ruleNativeContext3262 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleNativeContext3282 = new BitSet(new long[]{0x000000001E000000L});
-    public static final BitSet FOLLOW_27_in_ruleNativeContext3303 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleNativeContext3333 = new BitSet(new long[]{0x0000000016000000L});
-    public static final BitSet FOLLOW_26_in_ruleNativeContext3353 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_ruleQualifiedID_in_ruleNativeContext3376 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_24_in_ruleNativeContext3389 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleNativeContext3409 = new BitSet(new long[]{0x0000000012000000L});
-    public static final BitSet FOLLOW_28_in_ruleNativeContext3425 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_15_in_ruleNativeContext3437 = new BitSet(new long[]{0x0000003020000000L});
-    public static final BitSet FOLLOW_ruleQuickFix_in_ruleNativeContext3458 = new BitSet(new long[]{0x0000003020010000L});
-    public static final BitSet FOLLOW_16_in_ruleNativeContext3471 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_ruleNativeContext3485 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQuickFix_in_entryRuleQuickFix3521 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleQuickFix3531 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQuickFixKind_in_ruleQuickFix3577 = new BitSet(new long[]{0x0000000020000000L});
-    public static final BitSet FOLLOW_29_in_ruleQuickFix3590 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleQuickFix3607 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleQuickFix3624 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleQuickFix3641 = new BitSet(new long[]{0x0000000000040000L});
-    public static final BitSet FOLLOW_18_in_ruleQuickFix3658 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleQuickFix3675 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_ruleQuickFix3692 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedID_in_entryRuleQualifiedID3729 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedID3740 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleQualifiedID3781 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_30_in_ruleQualifiedID3799 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleQualifiedID3816 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_ruleCheckKind3875 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_ruleCheckKind3892 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_ruleCheckKind3909 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_34_in_ruleSeverityKind3954 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_35_in_ruleSeverityKind3971 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_ruleQuickFixKind4016 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_37_in_ruleQuickFixKind4033 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_1 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_2 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x0000000000001802L});
+    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000000000001002L});
+    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000000000002000L});
+    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x000000000000C000L});
+    public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000000008000L});
+    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000F80D30000L});
+    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000000F80020000L});
+    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000000044000L});
+    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000040000L});
+    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000000080000L});
+    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000000010020L});
+    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000000380120000L});
+    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000000144000L});
+    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000000140000L});
+    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000000100000L});
+    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000000000000040L});
+    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000000000200000L});
+    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000000380420000L});
+    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000000000444000L});
+    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0000000000440000L});
+    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000000000400000L});
+    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0000000380820000L});
+    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x00000000000C4000L});
+    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x00000000000C0000L});
+    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000000003000000L});
+    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000000005000000L});
+    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0000000004000000L});
+    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0000000001000000L});
+    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0000000002000020L});
+    public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x000000001F000000L});
+    public static final BitSet FOLLOW_36 = new BitSet(new long[]{0x000000001E000000L});
+    public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x0000000016000000L});
+    public static final BitSet FOLLOW_38 = new BitSet(new long[]{0x0000000012000000L});
+    public static final BitSet FOLLOW_39 = new BitSet(new long[]{0x0000003020000000L});
+    public static final BitSet FOLLOW_40 = new BitSet(new long[]{0x0000003020010000L});
+    public static final BitSet FOLLOW_41 = new BitSet(new long[]{0x0000000020000000L});
+    public static final BitSet FOLLOW_42 = new BitSet(new long[]{0x0000000040000000L});
 
 }
diff --git a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/serializer/AbstractValidSemanticSequencer.java b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/serializer/AbstractValidSemanticSequencer.java
index 7b9262ee5..41e144ca9 100644
--- a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/serializer/AbstractValidSemanticSequencer.java
+++ b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/serializer/AbstractValidSemanticSequencer.java
@@ -17,17 +17,15 @@
 import com.avaloq.tools.ddk.xtext.valid.valid.ValidModel;
 import com.avaloq.tools.ddk.xtext.valid.valid.ValidPackage;
 import com.google.inject.Inject;
-import com.google.inject.Provider;
+import java.util.Set;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.xtext.serializer.acceptor.ISemanticSequenceAcceptor;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.xtext.Action;
+import org.eclipse.xtext.Parameter;
+import org.eclipse.xtext.ParserRule;
+import org.eclipse.xtext.serializer.ISerializationContext;
 import org.eclipse.xtext.serializer.acceptor.SequenceFeeder;
-import org.eclipse.xtext.serializer.diagnostic.ISemanticSequencerDiagnosticProvider;
-import org.eclipse.xtext.serializer.diagnostic.ISerializationDiagnostic.Acceptor;
 import org.eclipse.xtext.serializer.sequencer.AbstractDelegatingSemanticSequencer;
-import org.eclipse.xtext.serializer.sequencer.GenericSequencer;
-import org.eclipse.xtext.serializer.sequencer.ISemanticNodeProvider.INodesForEObjectProvider;
-import org.eclipse.xtext.serializer.sequencer.ISemanticSequencer;
-import org.eclipse.xtext.serializer.sequencer.ITransientValueService;
 import org.eclipse.xtext.serializer.sequencer.ITransientValueService.ValueTransient;
 
 @SuppressWarnings("all")
@@ -37,8 +35,13 @@ public abstract class AbstractValidSemanticSequencer extends AbstractDelegatingS
 	private ValidGrammarAccess grammarAccess;
 	
 	@Override
-	public void createSequence(EObject context, EObject semanticObject) {
-		if(semanticObject.eClass().getEPackage() == ValidPackage.eINSTANCE) switch(semanticObject.eClass().getClassifierID()) {
+	public void sequence(ISerializationContext context, EObject semanticObject) {
+		EPackage epackage = semanticObject.eClass().getEPackage();
+		ParserRule rule = context.getParserRule();
+		Action action = context.getAssignedAction();
+		Set<Parameter> parameters = context.getEnabledBooleanParameters();
+		if (epackage == ValidPackage.eINSTANCE)
+			switch (semanticObject.eClass().getClassifierID()) {
 			case ValidPackage.CATEGORY:
 				sequence_Category(context, (Category) semanticObject); 
 				return; 
@@ -73,44 +76,58 @@ public void createSequence(EObject context, EObject semanticObject) {
 				sequence_ValidModel(context, (ValidModel) semanticObject); 
 				return; 
 			}
-		if (errorAcceptor != null) errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
+		if (errorAcceptor != null)
+			errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
 	}
 	
 	/**
+	 * Contexts:
+	 *     Category returns Category
+	 *
 	 * Constraint:
 	 *     (name=ID label=STRING description=STRING? rules+=Rule*)
 	 */
-	protected void sequence_Category(EObject context, Category semanticObject) {
+	protected void sequence_Category(ISerializationContext context, Category semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Context returns DuplicateContext
+	 *     DuplicateContext returns DuplicateContext
+	 *
 	 * Constraint:
 	 *     (contextType=[EClass|QualifiedID] contextFeature=[EStructuralFeature|ID]? markerType=[EClass|QualifiedID] markerFeature=[EStructuralFeature|ID]?)
 	 */
-	protected void sequence_DuplicateContext(EObject context, DuplicateContext semanticObject) {
+	protected void sequence_DuplicateContext(ISerializationContext context, DuplicateContext semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Import returns Import
+	 *
 	 * Constraint:
 	 *     package=[EPackage|STRING]
 	 */
-	protected void sequence_Import(EObject context, Import semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, ValidPackage.Literals.IMPORT__PACKAGE) == ValueTransient.YES)
+	protected void sequence_Import(ISerializationContext context, Import semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, ValidPackage.Literals.IMPORT__PACKAGE) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ValidPackage.Literals.IMPORT__PACKAGE));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-		feeder.accept(grammarAccess.getImportAccess().getPackageEPackageSTRINGTerminalRuleCall_1_0_1(), semanticObject.getPackage());
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
+		feeder.accept(grammarAccess.getImportAccess().getPackageEPackageSTRINGTerminalRuleCall_1_0_1(), semanticObject.eGet(ValidPackage.Literals.IMPORT__PACKAGE, false));
 		feeder.finish();
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Context returns NativeContext
+	 *     NativeContext returns NativeContext
+	 *
 	 * Constraint:
 	 *     (
 	 *         contextType=[EClass|QualifiedID] 
@@ -120,16 +137,19 @@ protected void sequence_Import(EObject context, Import semanticObject) {
 	 *         quickFixes+=QuickFix*
 	 *     )
 	 */
-	protected void sequence_NativeContext(EObject context, NativeContext semanticObject) {
+	protected void sequence_NativeContext(ISerializationContext context, NativeContext semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Rule returns NativeRule
+	 *     NativeRule returns NativeRule
+	 *
 	 * Constraint:
 	 *     (
-	 *         optional?='optional'? 
-	 *         checkKind=CheckKind? 
+	 *         (optional?='optional' | checkKind=CheckKind)* 
 	 *         severity=SeverityKind 
 	 *         name=ID 
 	 *         label=STRING 
@@ -138,25 +158,32 @@ protected void sequence_NativeContext(EObject context, NativeContext semanticObj
 	 *         contexts+=NativeContext+
 	 *     )
 	 */
-	protected void sequence_NativeRule(EObject context, NativeRule semanticObject) {
+	protected void sequence_NativeRule(ISerializationContext context, NativeRule semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     QuickFix returns QuickFix
+	 *
 	 * Constraint:
 	 *     (quickFixKind=QuickFixKind? name=ID label=STRING message=STRING)
 	 */
-	protected void sequence_QuickFix(EObject context, QuickFix semanticObject) {
+	protected void sequence_QuickFix(ISerializationContext context, QuickFix semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Rule returns RangeRule
+	 *     PredefinedRule returns RangeRule
+	 *     RangeRule returns RangeRule
+	 *
 	 * Constraint:
 	 *     (
-	 *         optional?='optional'? 
-	 *         checkKind=CheckKind? 
+	 *         (optional?='optional' | checkKind=CheckKind)* 
 	 *         severity=SeverityKind 
 	 *         name=ID 
 	 *         label=STRING 
@@ -167,25 +194,33 @@ protected void sequence_QuickFix(EObject context, QuickFix semanticObject) {
 	 *         contexts+=SimpleContext+
 	 *     )
 	 */
-	protected void sequence_RangeRule(EObject context, RangeRule semanticObject) {
+	protected void sequence_RangeRule(ISerializationContext context, RangeRule semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Context returns SimpleContext
+	 *     SimpleContext returns SimpleContext
+	 *
 	 * Constraint:
 	 *     (contextType=[EClass|QualifiedID] contextFeature=[EStructuralFeature|ID]?)
 	 */
-	protected void sequence_SimpleContext(EObject context, SimpleContext semanticObject) {
+	protected void sequence_SimpleContext(ISerializationContext context, SimpleContext semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Rule returns SizeRule
+	 *     PredefinedRule returns SizeRule
+	 *     SizeRule returns SizeRule
+	 *
 	 * Constraint:
 	 *     (
-	 *         optional?='optional'? 
-	 *         checkKind=CheckKind? 
+	 *         (optional?='optional' | checkKind=CheckKind)* 
 	 *         severity=SeverityKind 
 	 *         name=ID 
 	 *         label=STRING 
@@ -196,16 +231,20 @@ protected void sequence_SimpleContext(EObject context, SimpleContext semanticObj
 	 *         contexts+=SimpleContext+
 	 *     )
 	 */
-	protected void sequence_SizeRule(EObject context, SizeRule semanticObject) {
+	protected void sequence_SizeRule(ISerializationContext context, SizeRule semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Rule returns UniqueRule
+	 *     PredefinedRule returns UniqueRule
+	 *     UniqueRule returns UniqueRule
+	 *
 	 * Constraint:
 	 *     (
-	 *         optional?='optional'? 
-	 *         checkKind=CheckKind? 
+	 *         (optional?='optional' | checkKind=CheckKind)* 
 	 *         severity=SeverityKind 
 	 *         name=ID 
 	 *         label=STRING 
@@ -214,16 +253,21 @@ protected void sequence_SizeRule(EObject context, SizeRule semanticObject) {
 	 *         contexts+=DuplicateContext+
 	 *     )
 	 */
-	protected void sequence_UniqueRule(EObject context, UniqueRule semanticObject) {
+	protected void sequence_UniqueRule(ISerializationContext context, UniqueRule semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     ValidModel returns ValidModel
+	 *
 	 * Constraint:
-	 *     (imports+=Import* categories+=Category*)
+	 *     ((imports+=Import+ categories+=Category+) | categories+=Category+)?
 	 */
-	protected void sequence_ValidModel(EObject context, ValidModel semanticObject) {
+	protected void sequence_ValidModel(ISerializationContext context, ValidModel semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
+	
+	
 }
diff --git a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/services/ValidGrammarAccess.java b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/services/ValidGrammarAccess.java
index ffb4f6af0..206c60c42 100644
--- a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/services/ValidGrammarAccess.java
+++ b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/services/ValidGrammarAccess.java
@@ -19,7 +19,7 @@ public class ValidGrammarAccess extends AbstractGrammarElementFinder {
 	
 	
 	public class ValidModelElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ValidModel");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.valid.Valid.ValidModel");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cImportsAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final RuleCall cImportsImportParserRuleCall_0_0 = (RuleCall)cImportsAssignment_0.eContents().get(0);
@@ -27,7 +27,8 @@ public class ValidModelElements extends AbstractParserRuleElementFinder {
 		private final RuleCall cCategoriesCategoryParserRuleCall_1_0 = (RuleCall)cCategoriesAssignment_1.eContents().get(0);
 		
 		//ValidModel:
-		//	imports+=Import* categories+=Category*;
+		//	imports+=Import*
+		//	categories+=Category*;
 		@Override public ParserRule getRule() { return rule; }
 
 		//imports+=Import* categories+=Category*
@@ -47,7 +48,7 @@ public class ValidModelElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class ImportElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Import");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.valid.Valid.Import");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cImportKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cPackageAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -55,13 +56,13 @@ public class ImportElements extends AbstractParserRuleElementFinder {
 		private final RuleCall cPackageEPackageSTRINGTerminalRuleCall_1_0_1 = (RuleCall)cPackageEPackageCrossReference_1_0.eContents().get(1);
 		
 		//Import:
-		//	"import" package=[ecore::EPackage|STRING];
+		//	'import' package=[ecore::EPackage|STRING];
 		@Override public ParserRule getRule() { return rule; }
 
-		//"import" package=[ecore::EPackage|STRING]
+		//'import' package=[ecore::EPackage|STRING]
 		public Group getGroup() { return cGroup; }
 
-		//"import"
+		//'import'
 		public Keyword getImportKeyword_0() { return cImportKeyword_0; }
 
 		//package=[ecore::EPackage|STRING]
@@ -75,7 +76,7 @@ public class ImportElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class CategoryElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Category");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.valid.Valid.Category");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cCategoryKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -93,13 +94,13 @@ public class CategoryElements extends AbstractParserRuleElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_7 = (Keyword)cGroup.eContents().get(7);
 		
 		//Category:
-		//	"category" name=ID "label" label=STRING ("description" description=STRING)? "{" rules+=Rule* "}";
+		//	'category' name=ID 'label' label=STRING ('description' description=STRING)? '{' rules+=Rule* '}';
 		@Override public ParserRule getRule() { return rule; }
 
-		//"category" name=ID "label" label=STRING ("description" description=STRING)? "{" rules+=Rule* "}"
+		//'category' name=ID 'label' label=STRING ('description' description=STRING)? '{' rules+=Rule* '}'
 		public Group getGroup() { return cGroup; }
 
-		//"category"
+		//'category'
 		public Keyword getCategoryKeyword_0() { return cCategoryKeyword_0; }
 
 		//name=ID
@@ -108,7 +109,7 @@ public class CategoryElements extends AbstractParserRuleElementFinder {
 		//ID
 		public RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }
 
-		//"label"
+		//'label'
 		public Keyword getLabelKeyword_2() { return cLabelKeyword_2; }
 
 		//label=STRING
@@ -117,10 +118,10 @@ public class CategoryElements extends AbstractParserRuleElementFinder {
 		//STRING
 		public RuleCall getLabelSTRINGTerminalRuleCall_3_0() { return cLabelSTRINGTerminalRuleCall_3_0; }
 
-		//("description" description=STRING)?
+		//('description' description=STRING)?
 		public Group getGroup_4() { return cGroup_4; }
 
-		//"description"
+		//'description'
 		public Keyword getDescriptionKeyword_4_0() { return cDescriptionKeyword_4_0; }
 
 		//description=STRING
@@ -129,7 +130,7 @@ public class CategoryElements extends AbstractParserRuleElementFinder {
 		//STRING
 		public RuleCall getDescriptionSTRINGTerminalRuleCall_4_1_0() { return cDescriptionSTRINGTerminalRuleCall_4_1_0; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_5() { return cLeftCurlyBracketKeyword_5; }
 
 		//rules+=Rule*
@@ -138,12 +139,12 @@ public class CategoryElements extends AbstractParserRuleElementFinder {
 		//Rule
 		public RuleCall getRulesRuleParserRuleCall_6_0() { return cRulesRuleParserRuleCall_6_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_7() { return cRightCurlyBracketKeyword_7; }
 	}
 
 	public class RuleElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Rule");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.valid.Valid.Rule");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cNativeRuleParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cPredefinedRuleParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
@@ -163,19 +164,18 @@ public class RuleElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class PredefinedRuleElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "PredefinedRule");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.valid.Valid.PredefinedRule");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cSizeRuleParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cRangeRuleParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
 		private final RuleCall cUniqueRuleParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2);
 		
 		//PredefinedRule:
-		//	SizeRule | RangeRule | //TODO | CapitalizationRule
-		//	UniqueRule;
+		//	SizeRule | RangeRule | UniqueRule //TODO | CapitalizationRule
+		//;
 		@Override public ParserRule getRule() { return rule; }
 
-		//SizeRule | RangeRule | //TODO | CapitalizationRule
-		//UniqueRule
+		//SizeRule | RangeRule | UniqueRule
 		public Alternatives getAlternatives() { return cAlternatives; }
 
 		//SizeRule
@@ -184,13 +184,12 @@ public class PredefinedRuleElements extends AbstractParserRuleElementFinder {
 		//RangeRule
 		public RuleCall getRangeRuleParserRuleCall_1() { return cRangeRuleParserRuleCall_1; }
 
-		////TODO | CapitalizationRule
 		//UniqueRule
 		public RuleCall getUniqueRuleParserRuleCall_2() { return cUniqueRuleParserRuleCall_2; }
 	}
 
 	public class NativeRuleElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "NativeRule");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.valid.Valid.NativeRule");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final UnorderedGroup cUnorderedGroup_0 = (UnorderedGroup)cGroup.eContents().get(0);
 		private final Assignment cOptionalAssignment_0_0 = (Assignment)cUnorderedGroup_0.eContents().get(0);
@@ -218,21 +217,25 @@ public class NativeRuleElements extends AbstractParserRuleElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_11 = (Keyword)cGroup.eContents().get(11);
 		
 		//NativeRule:
-		//	(optional?="optional"? & checkKind=CheckKind?) severity=SeverityKind name=ID "label" label=STRING ("description"
-		//	description=STRING)? "message" message=STRING "context" "{" contexts+=NativeContext+ "}";
+		//	(optional?='optional'? & checkKind=CheckKind?) severity=SeverityKind name=ID
+		//	'label' label=STRING ('description' description=STRING)?
+		//	'message' message=STRING
+		//	'context' '{'
+		//	contexts+=NativeContext+
+		//	'}';
 		@Override public ParserRule getRule() { return rule; }
 
-		//(optional?="optional"? & checkKind=CheckKind?) severity=SeverityKind name=ID "label" label=STRING ("description"
-		//description=STRING)? "message" message=STRING "context" "{" contexts+=NativeContext+ "}"
+		//(optional?='optional'? & checkKind=CheckKind?) severity=SeverityKind name=ID 'label' label=STRING ('description'
+		//description=STRING)? 'message' message=STRING 'context' '{' contexts+=NativeContext+ '}'
 		public Group getGroup() { return cGroup; }
 
-		//optional?="optional"? & checkKind=CheckKind?
+		//optional?='optional'? & checkKind=CheckKind?
 		public UnorderedGroup getUnorderedGroup_0() { return cUnorderedGroup_0; }
 
-		//optional?="optional"?
+		//optional?='optional'?
 		public Assignment getOptionalAssignment_0_0() { return cOptionalAssignment_0_0; }
 
-		//"optional"
+		//'optional'
 		public Keyword getOptionalOptionalKeyword_0_0_0() { return cOptionalOptionalKeyword_0_0_0; }
 
 		//checkKind=CheckKind?
@@ -253,7 +256,7 @@ public class NativeRuleElements extends AbstractParserRuleElementFinder {
 		//ID
 		public RuleCall getNameIDTerminalRuleCall_2_0() { return cNameIDTerminalRuleCall_2_0; }
 
-		//"label"
+		//'label'
 		public Keyword getLabelKeyword_3() { return cLabelKeyword_3; }
 
 		//label=STRING
@@ -262,10 +265,10 @@ public class NativeRuleElements extends AbstractParserRuleElementFinder {
 		//STRING
 		public RuleCall getLabelSTRINGTerminalRuleCall_4_0() { return cLabelSTRINGTerminalRuleCall_4_0; }
 
-		//("description" description=STRING)?
+		//('description' description=STRING)?
 		public Group getGroup_5() { return cGroup_5; }
 
-		//"description"
+		//'description'
 		public Keyword getDescriptionKeyword_5_0() { return cDescriptionKeyword_5_0; }
 
 		//description=STRING
@@ -274,7 +277,7 @@ public class NativeRuleElements extends AbstractParserRuleElementFinder {
 		//STRING
 		public RuleCall getDescriptionSTRINGTerminalRuleCall_5_1_0() { return cDescriptionSTRINGTerminalRuleCall_5_1_0; }
 
-		//"message"
+		//'message'
 		public Keyword getMessageKeyword_6() { return cMessageKeyword_6; }
 
 		//message=STRING
@@ -283,10 +286,10 @@ public class NativeRuleElements extends AbstractParserRuleElementFinder {
 		//STRING
 		public RuleCall getMessageSTRINGTerminalRuleCall_7_0() { return cMessageSTRINGTerminalRuleCall_7_0; }
 
-		//"context"
+		//'context'
 		public Keyword getContextKeyword_8() { return cContextKeyword_8; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_9() { return cLeftCurlyBracketKeyword_9; }
 
 		//contexts+=NativeContext+
@@ -295,12 +298,12 @@ public class NativeRuleElements extends AbstractParserRuleElementFinder {
 		//NativeContext
 		public RuleCall getContextsNativeContextParserRuleCall_10_0() { return cContextsNativeContextParserRuleCall_10_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_11() { return cRightCurlyBracketKeyword_11; }
 	}
 
 	public class SizeRuleElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "SizeRule");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.valid.Valid.SizeRule");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final UnorderedGroup cUnorderedGroup_0 = (UnorderedGroup)cGroup.eContents().get(0);
 		private final Assignment cOptionalAssignment_0_0 = (Assignment)cUnorderedGroup_0.eContents().get(0);
@@ -337,23 +340,26 @@ public class SizeRuleElements extends AbstractParserRuleElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_14 = (Keyword)cGroup.eContents().get(14);
 		
 		//SizeRule:
-		//	(optional?="optional"? & checkKind=CheckKind?) "size" severity=SeverityKind name=ID "label" label=STRING
-		//	("description" description=STRING)? ("message" message=STRING)? "size" (min=INT "..")? max=INT "context" "{"
-		//	contexts+=SimpleContext+ "}";
+		//	(optional?='optional'? & checkKind=CheckKind?) 'size' severity=SeverityKind name=ID
+		//	'label' label=STRING ('description' description=STRING)? ('message' message=STRING)?
+		//	'size' (min=INT '..')? max=INT
+		//	'context' '{'
+		//	contexts+=SimpleContext+
+		//	'}';
 		@Override public ParserRule getRule() { return rule; }
 
-		//(optional?="optional"? & checkKind=CheckKind?) "size" severity=SeverityKind name=ID "label" label=STRING ("description"
-		//description=STRING)? ("message" message=STRING)? "size" (min=INT "..")? max=INT "context" "{" contexts+=SimpleContext+
-		//"}"
+		//(optional?='optional'? & checkKind=CheckKind?) 'size' severity=SeverityKind name=ID 'label' label=STRING ('description'
+		//description=STRING)? ('message' message=STRING)? 'size' (min=INT '..')? max=INT 'context' '{' contexts+=SimpleContext+
+		//'}'
 		public Group getGroup() { return cGroup; }
 
-		//optional?="optional"? & checkKind=CheckKind?
+		//optional?='optional'? & checkKind=CheckKind?
 		public UnorderedGroup getUnorderedGroup_0() { return cUnorderedGroup_0; }
 
-		//optional?="optional"?
+		//optional?='optional'?
 		public Assignment getOptionalAssignment_0_0() { return cOptionalAssignment_0_0; }
 
-		//"optional"
+		//'optional'
 		public Keyword getOptionalOptionalKeyword_0_0_0() { return cOptionalOptionalKeyword_0_0_0; }
 
 		//checkKind=CheckKind?
@@ -362,7 +368,7 @@ public class SizeRuleElements extends AbstractParserRuleElementFinder {
 		//CheckKind
 		public RuleCall getCheckKindCheckKindEnumRuleCall_0_1_0() { return cCheckKindCheckKindEnumRuleCall_0_1_0; }
 
-		//"size"
+		//'size'
 		public Keyword getSizeKeyword_1() { return cSizeKeyword_1; }
 
 		//severity=SeverityKind
@@ -377,7 +383,7 @@ public class SizeRuleElements extends AbstractParserRuleElementFinder {
 		//ID
 		public RuleCall getNameIDTerminalRuleCall_3_0() { return cNameIDTerminalRuleCall_3_0; }
 
-		//"label"
+		//'label'
 		public Keyword getLabelKeyword_4() { return cLabelKeyword_4; }
 
 		//label=STRING
@@ -386,10 +392,10 @@ public class SizeRuleElements extends AbstractParserRuleElementFinder {
 		//STRING
 		public RuleCall getLabelSTRINGTerminalRuleCall_5_0() { return cLabelSTRINGTerminalRuleCall_5_0; }
 
-		//("description" description=STRING)?
+		//('description' description=STRING)?
 		public Group getGroup_6() { return cGroup_6; }
 
-		//"description"
+		//'description'
 		public Keyword getDescriptionKeyword_6_0() { return cDescriptionKeyword_6_0; }
 
 		//description=STRING
@@ -398,10 +404,10 @@ public class SizeRuleElements extends AbstractParserRuleElementFinder {
 		//STRING
 		public RuleCall getDescriptionSTRINGTerminalRuleCall_6_1_0() { return cDescriptionSTRINGTerminalRuleCall_6_1_0; }
 
-		//("message" message=STRING)?
+		//('message' message=STRING)?
 		public Group getGroup_7() { return cGroup_7; }
 
-		//"message"
+		//'message'
 		public Keyword getMessageKeyword_7_0() { return cMessageKeyword_7_0; }
 
 		//message=STRING
@@ -410,10 +416,10 @@ public class SizeRuleElements extends AbstractParserRuleElementFinder {
 		//STRING
 		public RuleCall getMessageSTRINGTerminalRuleCall_7_1_0() { return cMessageSTRINGTerminalRuleCall_7_1_0; }
 
-		//"size"
+		//'size'
 		public Keyword getSizeKeyword_8() { return cSizeKeyword_8; }
 
-		//(min=INT "..")?
+		//(min=INT '..')?
 		public Group getGroup_9() { return cGroup_9; }
 
 		//min=INT
@@ -422,7 +428,7 @@ public class SizeRuleElements extends AbstractParserRuleElementFinder {
 		//INT
 		public RuleCall getMinINTTerminalRuleCall_9_0_0() { return cMinINTTerminalRuleCall_9_0_0; }
 
-		//".."
+		//'..'
 		public Keyword getFullStopFullStopKeyword_9_1() { return cFullStopFullStopKeyword_9_1; }
 
 		//max=INT
@@ -431,10 +437,10 @@ public class SizeRuleElements extends AbstractParserRuleElementFinder {
 		//INT
 		public RuleCall getMaxINTTerminalRuleCall_10_0() { return cMaxINTTerminalRuleCall_10_0; }
 
-		//"context"
+		//'context'
 		public Keyword getContextKeyword_11() { return cContextKeyword_11; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_12() { return cLeftCurlyBracketKeyword_12; }
 
 		//contexts+=SimpleContext+
@@ -443,12 +449,12 @@ public class SizeRuleElements extends AbstractParserRuleElementFinder {
 		//SimpleContext
 		public RuleCall getContextsSimpleContextParserRuleCall_13_0() { return cContextsSimpleContextParserRuleCall_13_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_14() { return cRightCurlyBracketKeyword_14; }
 	}
 
 	public class RangeRuleElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "RangeRule");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.valid.Valid.RangeRule");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final UnorderedGroup cUnorderedGroup_0 = (UnorderedGroup)cGroup.eContents().get(0);
 		private final Assignment cOptionalAssignment_0_0 = (Assignment)cUnorderedGroup_0.eContents().get(0);
@@ -485,23 +491,26 @@ public class RangeRuleElements extends AbstractParserRuleElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_14 = (Keyword)cGroup.eContents().get(14);
 		
 		//RangeRule:
-		//	(optional?="optional"? & checkKind=CheckKind?) "range" severity=SeverityKind name=ID "label" label=STRING
-		//	("description" description=STRING)? ("message" message=STRING)? "range" (min=INT "..")? max=INT "context" "{"
-		//	contexts+=SimpleContext+ "}";
+		//	(optional?='optional'? & checkKind=CheckKind?) 'range' severity=SeverityKind name=ID
+		//	'label' label=STRING ('description' description=STRING)? ('message' message=STRING)?
+		//	'range' (min=INT '..')? max=INT
+		//	'context' '{'
+		//	contexts+=SimpleContext+
+		//	'}';
 		@Override public ParserRule getRule() { return rule; }
 
-		//(optional?="optional"? & checkKind=CheckKind?) "range" severity=SeverityKind name=ID "label" label=STRING ("description"
-		//description=STRING)? ("message" message=STRING)? "range" (min=INT "..")? max=INT "context" "{"
-		//contexts+=SimpleContext+ "}"
+		//(optional?='optional'? & checkKind=CheckKind?) 'range' severity=SeverityKind name=ID 'label' label=STRING ('description'
+		//description=STRING)? ('message' message=STRING)? 'range' (min=INT '..')? max=INT 'context' '{'
+		//contexts+=SimpleContext+ '}'
 		public Group getGroup() { return cGroup; }
 
-		//optional?="optional"? & checkKind=CheckKind?
+		//optional?='optional'? & checkKind=CheckKind?
 		public UnorderedGroup getUnorderedGroup_0() { return cUnorderedGroup_0; }
 
-		//optional?="optional"?
+		//optional?='optional'?
 		public Assignment getOptionalAssignment_0_0() { return cOptionalAssignment_0_0; }
 
-		//"optional"
+		//'optional'
 		public Keyword getOptionalOptionalKeyword_0_0_0() { return cOptionalOptionalKeyword_0_0_0; }
 
 		//checkKind=CheckKind?
@@ -510,7 +519,7 @@ public class RangeRuleElements extends AbstractParserRuleElementFinder {
 		//CheckKind
 		public RuleCall getCheckKindCheckKindEnumRuleCall_0_1_0() { return cCheckKindCheckKindEnumRuleCall_0_1_0; }
 
-		//"range"
+		//'range'
 		public Keyword getRangeKeyword_1() { return cRangeKeyword_1; }
 
 		//severity=SeverityKind
@@ -525,7 +534,7 @@ public class RangeRuleElements extends AbstractParserRuleElementFinder {
 		//ID
 		public RuleCall getNameIDTerminalRuleCall_3_0() { return cNameIDTerminalRuleCall_3_0; }
 
-		//"label"
+		//'label'
 		public Keyword getLabelKeyword_4() { return cLabelKeyword_4; }
 
 		//label=STRING
@@ -534,10 +543,10 @@ public class RangeRuleElements extends AbstractParserRuleElementFinder {
 		//STRING
 		public RuleCall getLabelSTRINGTerminalRuleCall_5_0() { return cLabelSTRINGTerminalRuleCall_5_0; }
 
-		//("description" description=STRING)?
+		//('description' description=STRING)?
 		public Group getGroup_6() { return cGroup_6; }
 
-		//"description"
+		//'description'
 		public Keyword getDescriptionKeyword_6_0() { return cDescriptionKeyword_6_0; }
 
 		//description=STRING
@@ -546,10 +555,10 @@ public class RangeRuleElements extends AbstractParserRuleElementFinder {
 		//STRING
 		public RuleCall getDescriptionSTRINGTerminalRuleCall_6_1_0() { return cDescriptionSTRINGTerminalRuleCall_6_1_0; }
 
-		//("message" message=STRING)?
+		//('message' message=STRING)?
 		public Group getGroup_7() { return cGroup_7; }
 
-		//"message"
+		//'message'
 		public Keyword getMessageKeyword_7_0() { return cMessageKeyword_7_0; }
 
 		//message=STRING
@@ -558,10 +567,10 @@ public class RangeRuleElements extends AbstractParserRuleElementFinder {
 		//STRING
 		public RuleCall getMessageSTRINGTerminalRuleCall_7_1_0() { return cMessageSTRINGTerminalRuleCall_7_1_0; }
 
-		//"range"
+		//'range'
 		public Keyword getRangeKeyword_8() { return cRangeKeyword_8; }
 
-		//(min=INT "..")?
+		//(min=INT '..')?
 		public Group getGroup_9() { return cGroup_9; }
 
 		//min=INT
@@ -570,7 +579,7 @@ public class RangeRuleElements extends AbstractParserRuleElementFinder {
 		//INT
 		public RuleCall getMinINTTerminalRuleCall_9_0_0() { return cMinINTTerminalRuleCall_9_0_0; }
 
-		//".."
+		//'..'
 		public Keyword getFullStopFullStopKeyword_9_1() { return cFullStopFullStopKeyword_9_1; }
 
 		//max=INT
@@ -579,10 +588,10 @@ public class RangeRuleElements extends AbstractParserRuleElementFinder {
 		//INT
 		public RuleCall getMaxINTTerminalRuleCall_10_0() { return cMaxINTTerminalRuleCall_10_0; }
 
-		//"context"
+		//'context'
 		public Keyword getContextKeyword_11() { return cContextKeyword_11; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_12() { return cLeftCurlyBracketKeyword_12; }
 
 		//contexts+=SimpleContext+
@@ -591,12 +600,12 @@ public class RangeRuleElements extends AbstractParserRuleElementFinder {
 		//SimpleContext
 		public RuleCall getContextsSimpleContextParserRuleCall_13_0() { return cContextsSimpleContextParserRuleCall_13_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_14() { return cRightCurlyBracketKeyword_14; }
 	}
 
 	public class UniqueRuleElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "UniqueRule");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.valid.Valid.UniqueRule");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final UnorderedGroup cUnorderedGroup_0 = (UnorderedGroup)cGroup.eContents().get(0);
 		private final Assignment cOptionalAssignment_0_0 = (Assignment)cUnorderedGroup_0.eContents().get(0);
@@ -626,21 +635,24 @@ public class UniqueRuleElements extends AbstractParserRuleElementFinder {
 		private final Keyword cRightCurlyBracketKeyword_11 = (Keyword)cGroup.eContents().get(11);
 		
 		//UniqueRule:
-		//	(optional?="optional"? & checkKind=CheckKind?) "unique" severity=SeverityKind name=ID "label" label=STRING
-		//	("description" description=STRING)? ("message" message=STRING)? "context" "{" contexts+=DuplicateContext+ "}";
+		//	(optional?='optional'? & checkKind=CheckKind?) 'unique' severity=SeverityKind name=ID
+		//	'label' label=STRING ('description' description=STRING)? ('message' message=STRING)?
+		//	'context' '{'
+		//	contexts+=DuplicateContext+
+		//	'}';
 		@Override public ParserRule getRule() { return rule; }
 
-		//(optional?="optional"? & checkKind=CheckKind?) "unique" severity=SeverityKind name=ID "label" label=STRING
-		//("description" description=STRING)? ("message" message=STRING)? "context" "{" contexts+=DuplicateContext+ "}"
+		//(optional?='optional'? & checkKind=CheckKind?) 'unique' severity=SeverityKind name=ID 'label' label=STRING
+		//('description' description=STRING)? ('message' message=STRING)? 'context' '{' contexts+=DuplicateContext+ '}'
 		public Group getGroup() { return cGroup; }
 
-		//optional?="optional"? & checkKind=CheckKind?
+		//optional?='optional'? & checkKind=CheckKind?
 		public UnorderedGroup getUnorderedGroup_0() { return cUnorderedGroup_0; }
 
-		//optional?="optional"?
+		//optional?='optional'?
 		public Assignment getOptionalAssignment_0_0() { return cOptionalAssignment_0_0; }
 
-		//"optional"
+		//'optional'
 		public Keyword getOptionalOptionalKeyword_0_0_0() { return cOptionalOptionalKeyword_0_0_0; }
 
 		//checkKind=CheckKind?
@@ -649,7 +661,7 @@ public class UniqueRuleElements extends AbstractParserRuleElementFinder {
 		//CheckKind
 		public RuleCall getCheckKindCheckKindEnumRuleCall_0_1_0() { return cCheckKindCheckKindEnumRuleCall_0_1_0; }
 
-		//"unique"
+		//'unique'
 		public Keyword getUniqueKeyword_1() { return cUniqueKeyword_1; }
 
 		//severity=SeverityKind
@@ -664,7 +676,7 @@ public class UniqueRuleElements extends AbstractParserRuleElementFinder {
 		//ID
 		public RuleCall getNameIDTerminalRuleCall_3_0() { return cNameIDTerminalRuleCall_3_0; }
 
-		//"label"
+		//'label'
 		public Keyword getLabelKeyword_4() { return cLabelKeyword_4; }
 
 		//label=STRING
@@ -673,10 +685,10 @@ public class UniqueRuleElements extends AbstractParserRuleElementFinder {
 		//STRING
 		public RuleCall getLabelSTRINGTerminalRuleCall_5_0() { return cLabelSTRINGTerminalRuleCall_5_0; }
 
-		//("description" description=STRING)?
+		//('description' description=STRING)?
 		public Group getGroup_6() { return cGroup_6; }
 
-		//"description"
+		//'description'
 		public Keyword getDescriptionKeyword_6_0() { return cDescriptionKeyword_6_0; }
 
 		//description=STRING
@@ -685,10 +697,10 @@ public class UniqueRuleElements extends AbstractParserRuleElementFinder {
 		//STRING
 		public RuleCall getDescriptionSTRINGTerminalRuleCall_6_1_0() { return cDescriptionSTRINGTerminalRuleCall_6_1_0; }
 
-		//("message" message=STRING)?
+		//('message' message=STRING)?
 		public Group getGroup_7() { return cGroup_7; }
 
-		//"message"
+		//'message'
 		public Keyword getMessageKeyword_7_0() { return cMessageKeyword_7_0; }
 
 		//message=STRING
@@ -697,10 +709,10 @@ public class UniqueRuleElements extends AbstractParserRuleElementFinder {
 		//STRING
 		public RuleCall getMessageSTRINGTerminalRuleCall_7_1_0() { return cMessageSTRINGTerminalRuleCall_7_1_0; }
 
-		//"context"
+		//'context'
 		public Keyword getContextKeyword_8() { return cContextKeyword_8; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_9() { return cLeftCurlyBracketKeyword_9; }
 
 		//contexts+=DuplicateContext+
@@ -709,12 +721,12 @@ public class UniqueRuleElements extends AbstractParserRuleElementFinder {
 		//DuplicateContext
 		public RuleCall getContextsDuplicateContextParserRuleCall_10_0() { return cContextsDuplicateContextParserRuleCall_10_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_11() { return cRightCurlyBracketKeyword_11; }
 	}
 
 	public class ContextElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Context");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.valid.Valid.Context");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final RuleCall cNativeContextParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
 		private final RuleCall cDuplicateContextParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
@@ -738,7 +750,7 @@ public class ContextElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class SimpleContextElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "SimpleContext");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.valid.Valid.SimpleContext");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cContextTypeAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final CrossReference cContextTypeEClassCrossReference_0_0 = (CrossReference)cContextTypeAssignment_0.eContents().get(0);
@@ -751,10 +763,10 @@ public class SimpleContextElements extends AbstractParserRuleElementFinder {
 		private final Keyword cSemicolonKeyword_2 = (Keyword)cGroup.eContents().get(2);
 		
 		//SimpleContext:
-		//	contextType=[ecore::EClass|QualifiedID] ("#" contextFeature=[ecore::EStructuralFeature])? ";";
+		//	contextType=[ecore::EClass|QualifiedID] ('#' contextFeature=[ecore::EStructuralFeature])? ";";
 		@Override public ParserRule getRule() { return rule; }
 
-		//contextType=[ecore::EClass|QualifiedID] ("#" contextFeature=[ecore::EStructuralFeature])? ";"
+		//contextType=[ecore::EClass|QualifiedID] ('#' contextFeature=[ecore::EStructuralFeature])? ";"
 		public Group getGroup() { return cGroup; }
 
 		//contextType=[ecore::EClass|QualifiedID]
@@ -766,10 +778,10 @@ public class SimpleContextElements extends AbstractParserRuleElementFinder {
 		//QualifiedID
 		public RuleCall getContextTypeEClassQualifiedIDParserRuleCall_0_0_1() { return cContextTypeEClassQualifiedIDParserRuleCall_0_0_1; }
 
-		//("#" contextFeature=[ecore::EStructuralFeature])?
+		//('#' contextFeature=[ecore::EStructuralFeature])?
 		public Group getGroup_1() { return cGroup_1; }
 
-		//"#"
+		//'#'
 		public Keyword getNumberSignKeyword_1_0() { return cNumberSignKeyword_1_0; }
 
 		//contextFeature=[ecore::EStructuralFeature]
@@ -786,7 +798,7 @@ public class SimpleContextElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class DuplicateContextElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "DuplicateContext");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.valid.Valid.DuplicateContext");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cContextTypeAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final CrossReference cContextTypeEClassCrossReference_0_0 = (CrossReference)cContextTypeAssignment_0.eContents().get(0);
@@ -807,12 +819,12 @@ public class DuplicateContextElements extends AbstractParserRuleElementFinder {
 		private final Keyword cSemicolonKeyword_6 = (Keyword)cGroup.eContents().get(6);
 		
 		//DuplicateContext:
-		//	contextType=[ecore::EClass|QualifiedID] ("#" contextFeature=[ecore::EStructuralFeature])? "marker"
-		//	markerType=[ecore::EClass|QualifiedID] "#" markerFeature=[ecore::EStructuralFeature]? ";";
+		//	contextType=[ecore::EClass|QualifiedID] ('#' contextFeature=[ecore::EStructuralFeature])? 'marker'
+		//	markerType=[ecore::EClass|QualifiedID] '#' markerFeature=[ecore::EStructuralFeature]? ";";
 		@Override public ParserRule getRule() { return rule; }
 
-		//contextType=[ecore::EClass|QualifiedID] ("#" contextFeature=[ecore::EStructuralFeature])? "marker"
-		//markerType=[ecore::EClass|QualifiedID] "#" markerFeature=[ecore::EStructuralFeature]? ";"
+		//contextType=[ecore::EClass|QualifiedID] ('#' contextFeature=[ecore::EStructuralFeature])? 'marker'
+		//markerType=[ecore::EClass|QualifiedID] '#' markerFeature=[ecore::EStructuralFeature]? ";"
 		public Group getGroup() { return cGroup; }
 
 		//contextType=[ecore::EClass|QualifiedID]
@@ -824,10 +836,10 @@ public class DuplicateContextElements extends AbstractParserRuleElementFinder {
 		//QualifiedID
 		public RuleCall getContextTypeEClassQualifiedIDParserRuleCall_0_0_1() { return cContextTypeEClassQualifiedIDParserRuleCall_0_0_1; }
 
-		//("#" contextFeature=[ecore::EStructuralFeature])?
+		//('#' contextFeature=[ecore::EStructuralFeature])?
 		public Group getGroup_1() { return cGroup_1; }
 
-		//"#"
+		//'#'
 		public Keyword getNumberSignKeyword_1_0() { return cNumberSignKeyword_1_0; }
 
 		//contextFeature=[ecore::EStructuralFeature]
@@ -839,7 +851,7 @@ public class DuplicateContextElements extends AbstractParserRuleElementFinder {
 		//ID
 		public RuleCall getContextFeatureEStructuralFeatureIDTerminalRuleCall_1_1_0_1() { return cContextFeatureEStructuralFeatureIDTerminalRuleCall_1_1_0_1; }
 
-		//"marker"
+		//'marker'
 		public Keyword getMarkerKeyword_2() { return cMarkerKeyword_2; }
 
 		//markerType=[ecore::EClass|QualifiedID]
@@ -851,7 +863,7 @@ public class DuplicateContextElements extends AbstractParserRuleElementFinder {
 		//QualifiedID
 		public RuleCall getMarkerTypeEClassQualifiedIDParserRuleCall_3_0_1() { return cMarkerTypeEClassQualifiedIDParserRuleCall_3_0_1; }
 
-		//"#"
+		//'#'
 		public Keyword getNumberSignKeyword_4() { return cNumberSignKeyword_4; }
 
 		//markerFeature=[ecore::EStructuralFeature]?
@@ -868,7 +880,7 @@ public class DuplicateContextElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class NativeContextElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "NativeContext");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.valid.Valid.NativeContext");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cContextTypeAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final CrossReference cContextTypeEClassCrossReference_0_0 = (CrossReference)cContextTypeAssignment_0.eContents().get(0);
@@ -902,14 +914,16 @@ public class NativeContextElements extends AbstractParserRuleElementFinder {
 		private final Keyword cSemicolonKeyword_5 = (Keyword)cGroup.eContents().get(5);
 		
 		//NativeContext:
-		//	contextType=[ecore::EClass|QualifiedID] ("#" contextFeature=[ecore::EStructuralFeature])? (named?="as" givenName=ID)?
-		//	("marker" markerType=[ecore::EClass|QualifiedID] ("#" markerFeature=[ecore::EStructuralFeature]))? ("quickfixes" "{"
-		//	quickFixes+=QuickFix+ "}")? ";";
+		//	contextType=[ecore::EClass|QualifiedID] ('#' contextFeature=[ecore::EStructuralFeature])? (named?='as' givenName=ID)?
+		//	('marker' markerType=[ecore::EClass|QualifiedID] ('#' markerFeature=[ecore::EStructuralFeature]))? ('quickfixes' '{'
+		//	quickFixes+=QuickFix+
+		//	'}')?
+		//	";";
 		@Override public ParserRule getRule() { return rule; }
 
-		//contextType=[ecore::EClass|QualifiedID] ("#" contextFeature=[ecore::EStructuralFeature])? (named?="as" givenName=ID)?
-		//("marker" markerType=[ecore::EClass|QualifiedID] ("#" markerFeature=[ecore::EStructuralFeature]))? ("quickfixes" "{"
-		//quickFixes+=QuickFix+ "}")? ";"
+		//contextType=[ecore::EClass|QualifiedID] ('#' contextFeature=[ecore::EStructuralFeature])? (named?='as' givenName=ID)?
+		//('marker' markerType=[ecore::EClass|QualifiedID] ('#' markerFeature=[ecore::EStructuralFeature]))? ('quickfixes' '{'
+		//quickFixes+=QuickFix+ '}')? ";"
 		public Group getGroup() { return cGroup; }
 
 		//contextType=[ecore::EClass|QualifiedID]
@@ -921,10 +935,10 @@ public class NativeContextElements extends AbstractParserRuleElementFinder {
 		//QualifiedID
 		public RuleCall getContextTypeEClassQualifiedIDParserRuleCall_0_0_1() { return cContextTypeEClassQualifiedIDParserRuleCall_0_0_1; }
 
-		//("#" contextFeature=[ecore::EStructuralFeature])?
+		//('#' contextFeature=[ecore::EStructuralFeature])?
 		public Group getGroup_1() { return cGroup_1; }
 
-		//"#"
+		//'#'
 		public Keyword getNumberSignKeyword_1_0() { return cNumberSignKeyword_1_0; }
 
 		//contextFeature=[ecore::EStructuralFeature]
@@ -936,13 +950,13 @@ public class NativeContextElements extends AbstractParserRuleElementFinder {
 		//ID
 		public RuleCall getContextFeatureEStructuralFeatureIDTerminalRuleCall_1_1_0_1() { return cContextFeatureEStructuralFeatureIDTerminalRuleCall_1_1_0_1; }
 
-		//(named?="as" givenName=ID)?
+		//(named?='as' givenName=ID)?
 		public Group getGroup_2() { return cGroup_2; }
 
-		//named?="as"
+		//named?='as'
 		public Assignment getNamedAssignment_2_0() { return cNamedAssignment_2_0; }
 
-		//"as"
+		//'as'
 		public Keyword getNamedAsKeyword_2_0_0() { return cNamedAsKeyword_2_0_0; }
 
 		//givenName=ID
@@ -951,10 +965,10 @@ public class NativeContextElements extends AbstractParserRuleElementFinder {
 		//ID
 		public RuleCall getGivenNameIDTerminalRuleCall_2_1_0() { return cGivenNameIDTerminalRuleCall_2_1_0; }
 
-		//("marker" markerType=[ecore::EClass|QualifiedID] ("#" markerFeature=[ecore::EStructuralFeature]))?
+		//('marker' markerType=[ecore::EClass|QualifiedID] ('#' markerFeature=[ecore::EStructuralFeature]))?
 		public Group getGroup_3() { return cGroup_3; }
 
-		//"marker"
+		//'marker'
 		public Keyword getMarkerKeyword_3_0() { return cMarkerKeyword_3_0; }
 
 		//markerType=[ecore::EClass|QualifiedID]
@@ -966,10 +980,10 @@ public class NativeContextElements extends AbstractParserRuleElementFinder {
 		//QualifiedID
 		public RuleCall getMarkerTypeEClassQualifiedIDParserRuleCall_3_1_0_1() { return cMarkerTypeEClassQualifiedIDParserRuleCall_3_1_0_1; }
 
-		//"#" markerFeature=[ecore::EStructuralFeature]
+		//'#' markerFeature=[ecore::EStructuralFeature]
 		public Group getGroup_3_2() { return cGroup_3_2; }
 
-		//"#"
+		//'#'
 		public Keyword getNumberSignKeyword_3_2_0() { return cNumberSignKeyword_3_2_0; }
 
 		//markerFeature=[ecore::EStructuralFeature]
@@ -981,13 +995,13 @@ public class NativeContextElements extends AbstractParserRuleElementFinder {
 		//ID
 		public RuleCall getMarkerFeatureEStructuralFeatureIDTerminalRuleCall_3_2_1_0_1() { return cMarkerFeatureEStructuralFeatureIDTerminalRuleCall_3_2_1_0_1; }
 
-		//("quickfixes" "{" quickFixes+=QuickFix+ "}")?
+		//('quickfixes' '{' quickFixes+=QuickFix+ '}')?
 		public Group getGroup_4() { return cGroup_4; }
 
-		//"quickfixes"
+		//'quickfixes'
 		public Keyword getQuickfixesKeyword_4_0() { return cQuickfixesKeyword_4_0; }
 
-		//"{"
+		//'{'
 		public Keyword getLeftCurlyBracketKeyword_4_1() { return cLeftCurlyBracketKeyword_4_1; }
 
 		//quickFixes+=QuickFix+
@@ -996,7 +1010,7 @@ public class NativeContextElements extends AbstractParserRuleElementFinder {
 		//QuickFix
 		public RuleCall getQuickFixesQuickFixParserRuleCall_4_2_0() { return cQuickFixesQuickFixParserRuleCall_4_2_0; }
 
-		//"}"
+		//'}'
 		public Keyword getRightCurlyBracketKeyword_4_3() { return cRightCurlyBracketKeyword_4_3; }
 
 		//";"
@@ -1004,7 +1018,7 @@ public class NativeContextElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class QuickFixElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "QuickFix");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.valid.Valid.QuickFix");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Assignment cQuickFixKindAssignment_0 = (Assignment)cGroup.eContents().get(0);
 		private final RuleCall cQuickFixKindQuickFixKindEnumRuleCall_0_0 = (RuleCall)cQuickFixKindAssignment_0.eContents().get(0);
@@ -1020,10 +1034,10 @@ public class QuickFixElements extends AbstractParserRuleElementFinder {
 		private final Keyword cSemicolonKeyword_7 = (Keyword)cGroup.eContents().get(7);
 		
 		//QuickFix:
-		//	quickFixKind=QuickFixKind? "fix" name=ID "label" label=STRING "message" message=STRING ";";
+		//	quickFixKind=QuickFixKind? 'fix' name=ID 'label' label=STRING 'message' message=STRING ';';
 		@Override public ParserRule getRule() { return rule; }
 
-		//quickFixKind=QuickFixKind? "fix" name=ID "label" label=STRING "message" message=STRING ";"
+		//quickFixKind=QuickFixKind? 'fix' name=ID 'label' label=STRING 'message' message=STRING ';'
 		public Group getGroup() { return cGroup; }
 
 		//quickFixKind=QuickFixKind?
@@ -1032,7 +1046,7 @@ public class QuickFixElements extends AbstractParserRuleElementFinder {
 		//QuickFixKind
 		public RuleCall getQuickFixKindQuickFixKindEnumRuleCall_0_0() { return cQuickFixKindQuickFixKindEnumRuleCall_0_0; }
 
-		//"fix"
+		//'fix'
 		public Keyword getFixKeyword_1() { return cFixKeyword_1; }
 
 		//name=ID
@@ -1041,7 +1055,7 @@ public class QuickFixElements extends AbstractParserRuleElementFinder {
 		//ID
 		public RuleCall getNameIDTerminalRuleCall_2_0() { return cNameIDTerminalRuleCall_2_0; }
 
-		//"label"
+		//'label'
 		public Keyword getLabelKeyword_3() { return cLabelKeyword_3; }
 
 		//label=STRING
@@ -1050,7 +1064,7 @@ public class QuickFixElements extends AbstractParserRuleElementFinder {
 		//STRING
 		public RuleCall getLabelSTRINGTerminalRuleCall_4_0() { return cLabelSTRINGTerminalRuleCall_4_0; }
 
-		//"message"
+		//'message'
 		public Keyword getMessageKeyword_5() { return cMessageKeyword_5; }
 
 		//message=STRING
@@ -1059,32 +1073,32 @@ public class QuickFixElements extends AbstractParserRuleElementFinder {
 		//STRING
 		public RuleCall getMessageSTRINGTerminalRuleCall_6_0() { return cMessageSTRINGTerminalRuleCall_6_0; }
 
-		//";"
+		//';'
 		public Keyword getSemicolonKeyword_7() { return cSemicolonKeyword_7; }
 	}
 
 	public class QualifiedIDElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "QualifiedID");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.valid.Valid.QualifiedID");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Group cGroup_0 = (Group)cGroup.eContents().get(0);
 		private final RuleCall cIDTerminalRuleCall_0_0 = (RuleCall)cGroup_0.eContents().get(0);
 		private final Keyword cColonColonKeyword_0_1 = (Keyword)cGroup_0.eContents().get(1);
 		private final RuleCall cIDTerminalRuleCall_1 = (RuleCall)cGroup.eContents().get(1);
 		
-		//QualifiedID returns ecore::EString:
-		//	(ID "::")* ID;
+		//QualifiedID:
+		//	(ID '::')* ID;
 		@Override public ParserRule getRule() { return rule; }
 
-		//(ID "::")* ID
+		//(ID '::')* ID
 		public Group getGroup() { return cGroup; }
 
-		//(ID "::")*
+		//(ID '::')*
 		public Group getGroup_0() { return cGroup_0; }
 
 		//ID
 		public RuleCall getIDTerminalRuleCall_0_0() { return cIDTerminalRuleCall_0_0; }
 
-		//"::"
+		//'::'
 		public Keyword getColonColonKeyword_0_1() { return cColonColonKeyword_0_1; }
 
 		//ID
@@ -1093,7 +1107,7 @@ public class QualifiedIDElements extends AbstractParserRuleElementFinder {
 	
 	
 	public class CheckKindElements extends AbstractEnumRuleElementFinder {
-		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "CheckKind");
+		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.valid.Valid.CheckKind");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final EnumLiteralDeclaration cFastEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0);
 		private final Keyword cFastFastKeyword_0_0 = (Keyword)cFastEnumLiteralDeclaration_0.eContents().get(0);
@@ -1112,24 +1126,24 @@ public class CheckKindElements extends AbstractEnumRuleElementFinder {
 		//fast
 		public EnumLiteralDeclaration getFastEnumLiteralDeclaration_0() { return cFastEnumLiteralDeclaration_0; }
 
-		//"fast"
+		//'fast'
 		public Keyword getFastFastKeyword_0_0() { return cFastFastKeyword_0_0; }
 
 		//normal
 		public EnumLiteralDeclaration getNormalEnumLiteralDeclaration_1() { return cNormalEnumLiteralDeclaration_1; }
 
-		//"normal"
+		//'normal'
 		public Keyword getNormalNormalKeyword_1_0() { return cNormalNormalKeyword_1_0; }
 
 		//expensive
 		public EnumLiteralDeclaration getExpensiveEnumLiteralDeclaration_2() { return cExpensiveEnumLiteralDeclaration_2; }
 
-		//"expensive"
+		//'expensive'
 		public Keyword getExpensiveExpensiveKeyword_2_0() { return cExpensiveExpensiveKeyword_2_0; }
 	}
 
 	public class SeverityKindElements extends AbstractEnumRuleElementFinder {
-		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "SeverityKind");
+		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.valid.Valid.SeverityKind");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final EnumLiteralDeclaration cErrorEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0);
 		private final Keyword cErrorErrorKeyword_0_0 = (Keyword)cErrorEnumLiteralDeclaration_0.eContents().get(0);
@@ -1146,18 +1160,18 @@ public class SeverityKindElements extends AbstractEnumRuleElementFinder {
 		//error
 		public EnumLiteralDeclaration getErrorEnumLiteralDeclaration_0() { return cErrorEnumLiteralDeclaration_0; }
 
-		//"error"
+		//'error'
 		public Keyword getErrorErrorKeyword_0_0() { return cErrorErrorKeyword_0_0; }
 
 		//warning
 		public EnumLiteralDeclaration getWarningEnumLiteralDeclaration_1() { return cWarningEnumLiteralDeclaration_1; }
 
-		//"warning"
+		//'warning'
 		public Keyword getWarningWarningKeyword_1_0() { return cWarningWarningKeyword_1_0; }
 	}
 
 	public class QuickFixKindElements extends AbstractEnumRuleElementFinder {
-		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "QuickFixKind");
+		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.xtext.valid.Valid.QuickFixKind");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
 		private final EnumLiteralDeclaration cSemanticEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0);
 		private final Keyword cSemanticSemanticKeyword_0_0 = (Keyword)cSemanticEnumLiteralDeclaration_0.eContents().get(0);
@@ -1174,13 +1188,13 @@ public class QuickFixKindElements extends AbstractEnumRuleElementFinder {
 		//semantic
 		public EnumLiteralDeclaration getSemanticEnumLiteralDeclaration_0() { return cSemanticEnumLiteralDeclaration_0; }
 
-		//"semantic"
+		//'semantic'
 		public Keyword getSemanticSemanticKeyword_0_0() { return cSemanticSemanticKeyword_0_0; }
 
 		//textual
 		public EnumLiteralDeclaration getTextualEnumLiteralDeclaration_1() { return cTextualEnumLiteralDeclaration_1; }
 
-		//"textual"
+		//'textual'
 		public Keyword getTextualTextualKeyword_1_0() { return cTextualTextualKeyword_1_0; }
 	}
 	
@@ -1198,9 +1212,9 @@ public class QuickFixKindElements extends AbstractEnumRuleElementFinder {
 	private final DuplicateContextElements pDuplicateContext;
 	private final NativeContextElements pNativeContext;
 	private final QuickFixElements pQuickFix;
-	private final CheckKindElements unknownRuleCheckKind;
-	private final SeverityKindElements unknownRuleSeverityKind;
-	private final QuickFixKindElements unknownRuleQuickFixKind;
+	private final CheckKindElements eCheckKind;
+	private final SeverityKindElements eSeverityKind;
+	private final QuickFixKindElements eQuickFixKind;
 	private final QualifiedIDElements pQualifiedID;
 	
 	private final Grammar grammar;
@@ -1226,9 +1240,9 @@ public ValidGrammarAccess(GrammarProvider grammarProvider,
 		this.pDuplicateContext = new DuplicateContextElements();
 		this.pNativeContext = new NativeContextElements();
 		this.pQuickFix = new QuickFixElements();
-		this.unknownRuleCheckKind = new CheckKindElements();
-		this.unknownRuleSeverityKind = new SeverityKindElements();
-		this.unknownRuleQuickFixKind = new QuickFixKindElements();
+		this.eCheckKind = new CheckKindElements();
+		this.eSeverityKind = new SeverityKindElements();
+		this.eQuickFixKind = new QuickFixKindElements();
 		this.pQualifiedID = new QualifiedIDElements();
 	}
 	
@@ -1260,7 +1274,8 @@ public TerminalsGrammarAccess getTerminalsGrammarAccess() {
 
 	
 	//ValidModel:
-	//	imports+=Import* categories+=Category*;
+	//	imports+=Import*
+	//	categories+=Category*;
 	public ValidModelElements getValidModelAccess() {
 		return pValidModel;
 	}
@@ -1270,7 +1285,7 @@ public ParserRule getValidModelRule() {
 	}
 
 	//Import:
-	//	"import" package=[ecore::EPackage|STRING];
+	//	'import' package=[ecore::EPackage|STRING];
 	public ImportElements getImportAccess() {
 		return pImport;
 	}
@@ -1280,7 +1295,7 @@ public ParserRule getImportRule() {
 	}
 
 	//Category:
-	//	"category" name=ID "label" label=STRING ("description" description=STRING)? "{" rules+=Rule* "}";
+	//	'category' name=ID 'label' label=STRING ('description' description=STRING)? '{' rules+=Rule* '}';
 	public CategoryElements getCategoryAccess() {
 		return pCategory;
 	}
@@ -1300,8 +1315,8 @@ public ParserRule getRuleRule() {
 	}
 
 	//PredefinedRule:
-	//	SizeRule | RangeRule | //TODO | CapitalizationRule
-	//	UniqueRule;
+	//	SizeRule | RangeRule | UniqueRule //TODO | CapitalizationRule
+	//;
 	public PredefinedRuleElements getPredefinedRuleAccess() {
 		return pPredefinedRule;
 	}
@@ -1311,8 +1326,12 @@ public ParserRule getPredefinedRuleRule() {
 	}
 
 	//NativeRule:
-	//	(optional?="optional"? & checkKind=CheckKind?) severity=SeverityKind name=ID "label" label=STRING ("description"
-	//	description=STRING)? "message" message=STRING "context" "{" contexts+=NativeContext+ "}";
+	//	(optional?='optional'? & checkKind=CheckKind?) severity=SeverityKind name=ID
+	//	'label' label=STRING ('description' description=STRING)?
+	//	'message' message=STRING
+	//	'context' '{'
+	//	contexts+=NativeContext+
+	//	'}';
 	public NativeRuleElements getNativeRuleAccess() {
 		return pNativeRule;
 	}
@@ -1322,9 +1341,12 @@ public ParserRule getNativeRuleRule() {
 	}
 
 	//SizeRule:
-	//	(optional?="optional"? & checkKind=CheckKind?) "size" severity=SeverityKind name=ID "label" label=STRING
-	//	("description" description=STRING)? ("message" message=STRING)? "size" (min=INT "..")? max=INT "context" "{"
-	//	contexts+=SimpleContext+ "}";
+	//	(optional?='optional'? & checkKind=CheckKind?) 'size' severity=SeverityKind name=ID
+	//	'label' label=STRING ('description' description=STRING)? ('message' message=STRING)?
+	//	'size' (min=INT '..')? max=INT
+	//	'context' '{'
+	//	contexts+=SimpleContext+
+	//	'}';
 	public SizeRuleElements getSizeRuleAccess() {
 		return pSizeRule;
 	}
@@ -1334,9 +1356,12 @@ public ParserRule getSizeRuleRule() {
 	}
 
 	//RangeRule:
-	//	(optional?="optional"? & checkKind=CheckKind?) "range" severity=SeverityKind name=ID "label" label=STRING
-	//	("description" description=STRING)? ("message" message=STRING)? "range" (min=INT "..")? max=INT "context" "{"
-	//	contexts+=SimpleContext+ "}";
+	//	(optional?='optional'? & checkKind=CheckKind?) 'range' severity=SeverityKind name=ID
+	//	'label' label=STRING ('description' description=STRING)? ('message' message=STRING)?
+	//	'range' (min=INT '..')? max=INT
+	//	'context' '{'
+	//	contexts+=SimpleContext+
+	//	'}';
 	public RangeRuleElements getRangeRuleAccess() {
 		return pRangeRule;
 	}
@@ -1346,8 +1371,11 @@ public ParserRule getRangeRuleRule() {
 	}
 
 	//UniqueRule:
-	//	(optional?="optional"? & checkKind=CheckKind?) "unique" severity=SeverityKind name=ID "label" label=STRING
-	//	("description" description=STRING)? ("message" message=STRING)? "context" "{" contexts+=DuplicateContext+ "}";
+	//	(optional?='optional'? & checkKind=CheckKind?) 'unique' severity=SeverityKind name=ID
+	//	'label' label=STRING ('description' description=STRING)? ('message' message=STRING)?
+	//	'context' '{'
+	//	contexts+=DuplicateContext+
+	//	'}';
 	public UniqueRuleElements getUniqueRuleAccess() {
 		return pUniqueRule;
 	}
@@ -1367,7 +1395,7 @@ public ParserRule getContextRule() {
 	}
 
 	//SimpleContext:
-	//	contextType=[ecore::EClass|QualifiedID] ("#" contextFeature=[ecore::EStructuralFeature])? ";";
+	//	contextType=[ecore::EClass|QualifiedID] ('#' contextFeature=[ecore::EStructuralFeature])? ";";
 	public SimpleContextElements getSimpleContextAccess() {
 		return pSimpleContext;
 	}
@@ -1377,8 +1405,8 @@ public ParserRule getSimpleContextRule() {
 	}
 
 	//DuplicateContext:
-	//	contextType=[ecore::EClass|QualifiedID] ("#" contextFeature=[ecore::EStructuralFeature])? "marker"
-	//	markerType=[ecore::EClass|QualifiedID] "#" markerFeature=[ecore::EStructuralFeature]? ";";
+	//	contextType=[ecore::EClass|QualifiedID] ('#' contextFeature=[ecore::EStructuralFeature])? 'marker'
+	//	markerType=[ecore::EClass|QualifiedID] '#' markerFeature=[ecore::EStructuralFeature]? ";";
 	public DuplicateContextElements getDuplicateContextAccess() {
 		return pDuplicateContext;
 	}
@@ -1388,9 +1416,11 @@ public ParserRule getDuplicateContextRule() {
 	}
 
 	//NativeContext:
-	//	contextType=[ecore::EClass|QualifiedID] ("#" contextFeature=[ecore::EStructuralFeature])? (named?="as" givenName=ID)?
-	//	("marker" markerType=[ecore::EClass|QualifiedID] ("#" markerFeature=[ecore::EStructuralFeature]))? ("quickfixes" "{"
-	//	quickFixes+=QuickFix+ "}")? ";";
+	//	contextType=[ecore::EClass|QualifiedID] ('#' contextFeature=[ecore::EStructuralFeature])? (named?='as' givenName=ID)?
+	//	('marker' markerType=[ecore::EClass|QualifiedID] ('#' markerFeature=[ecore::EStructuralFeature]))? ('quickfixes' '{'
+	//	quickFixes+=QuickFix+
+	//	'}')?
+	//	";";
 	public NativeContextElements getNativeContextAccess() {
 		return pNativeContext;
 	}
@@ -1400,7 +1430,7 @@ public ParserRule getNativeContextRule() {
 	}
 
 	//QuickFix:
-	//	quickFixKind=QuickFixKind? "fix" name=ID "label" label=STRING "message" message=STRING ";";
+	//	quickFixKind=QuickFixKind? 'fix' name=ID 'label' label=STRING 'message' message=STRING ';';
 	public QuickFixElements getQuickFixAccess() {
 		return pQuickFix;
 	}
@@ -1412,7 +1442,7 @@ public ParserRule getQuickFixRule() {
 	//enum CheckKind:
 	//	fast | normal | expensive;
 	public CheckKindElements getCheckKindAccess() {
-		return unknownRuleCheckKind;
+		return eCheckKind;
 	}
 	
 	public EnumRule getCheckKindRule() {
@@ -1422,7 +1452,7 @@ public EnumRule getCheckKindRule() {
 	//enum SeverityKind:
 	//	error | warning;
 	public SeverityKindElements getSeverityKindAccess() {
-		return unknownRuleSeverityKind;
+		return eSeverityKind;
 	}
 	
 	public EnumRule getSeverityKindRule() {
@@ -1432,15 +1462,15 @@ public EnumRule getSeverityKindRule() {
 	//enum QuickFixKind:
 	//	semantic | textual;
 	public QuickFixKindElements getQuickFixKindAccess() {
-		return unknownRuleQuickFixKind;
+		return eQuickFixKind;
 	}
 	
 	public EnumRule getQuickFixKindRule() {
 		return getQuickFixKindAccess().getRule();
 	}
 
-	//QualifiedID returns ecore::EString:
-	//	(ID "::")* ID;
+	//QualifiedID:
+	//	(ID '::')* ID;
 	public QualifiedIDElements getQualifiedIDAccess() {
 		return pQualifiedID;
 	}
@@ -1450,38 +1480,37 @@ public ParserRule getQualifiedIDRule() {
 	}
 
 	//terminal ID:
-	//	"^"? ("a".."z" | "A".."Z" | "_") ("a".."z" | "A".."Z" | "_" | "0".."9")*;
+	//	'^'? ('a'..'z' | 'A'..'Z' | '_') ('a'..'z' | 'A'..'Z' | '_' | '0'..'9')*;
 	public TerminalRule getIDRule() {
 		return gaTerminals.getIDRule();
 	} 
 
 	//terminal INT returns ecore::EInt:
-	//	"0".."9"+;
+	//	'0'..'9'+;
 	public TerminalRule getINTRule() {
 		return gaTerminals.getINTRule();
 	} 
 
 	//terminal STRING:
-	//	"\"" ("\\" . / * 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' * / | !("\\" | "\""))* "\"" | "\'" ("\\" .
-	//	/ * 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' * / | !("\\" | "\'"))* "\'";
+	//	'"' ('\\' . | !('\\' | '"'))* '"' | "'" ('\\' . | !('\\' | "'"))* "'";
 	public TerminalRule getSTRINGRule() {
 		return gaTerminals.getSTRINGRule();
 	} 
 
 	//terminal ML_COMMENT:
-	//	"/ *"->"* /";
+	//	'/*'->'*/';
 	public TerminalRule getML_COMMENTRule() {
 		return gaTerminals.getML_COMMENTRule();
 	} 
 
 	//terminal SL_COMMENT:
-	//	"//" !("\n" | "\r")* ("\r"? "\n")?;
+	//	'//' !('\n' | '\r')* ('\r'? '\n')?;
 	public TerminalRule getSL_COMMENTRule() {
 		return gaTerminals.getSL_COMMENTRule();
 	} 
 
 	//terminal WS:
-	//	(" " | "\t" | "\r" | "\n")+;
+	//	' ' | '\t' | '\r' | '\n'+;
 	public TerminalRule getWSRule() {
 		return gaTerminals.getWSRule();
 	} 
diff --git a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/Category.java b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/Category.java
index e33603314..18a316c04 100644
--- a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/Category.java
+++ b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/Category.java
@@ -13,13 +13,13 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.Category#getName <em>Name</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.Category#getLabel <em>Label</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.Category#getDescription <em>Description</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.Category#getRules <em>Rules</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.valid.valid.ValidPackage#getCategory()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/CheckKind.java b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/CheckKind.java
index 35c9977fa..6ba9b67b3 100644
--- a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/CheckKind.java
+++ b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/CheckKind.java
@@ -120,6 +120,8 @@ public enum CheckKind implements Enumerator
    * Returns the '<em><b>Check Kind</b></em>' literal with the specified literal value.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @param literal the literal.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static CheckKind get(String literal)
@@ -139,6 +141,8 @@ public static CheckKind get(String literal)
    * Returns the '<em><b>Check Kind</b></em>' literal with the specified name.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @param name the name.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static CheckKind getByName(String name)
@@ -158,6 +162,8 @@ public static CheckKind getByName(String name)
    * Returns the '<em><b>Check Kind</b></em>' literal with the specified integer value.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @param value the integer value.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static CheckKind get(int value)
diff --git a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/Context.java b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/Context.java
index 8525ed529..a4baf5914 100644
--- a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/Context.java
+++ b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/Context.java
@@ -13,11 +13,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.Context#getContextType <em>Context Type</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.Context#getContextFeature <em>Context Feature</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.valid.valid.ValidPackage#getContext()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/DuplicateContext.java b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/DuplicateContext.java
index 01edf52d8..181919c53 100644
--- a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/DuplicateContext.java
+++ b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/DuplicateContext.java
@@ -12,11 +12,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.DuplicateContext#getMarkerType <em>Marker Type</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.DuplicateContext#getMarkerFeature <em>Marker Feature</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.valid.valid.ValidPackage#getDuplicateContext()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/Import.java b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/Import.java
index 197381a4a..36aefbd89 100644
--- a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/Import.java
+++ b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/Import.java
@@ -12,10 +12,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.Import#getPackage <em>Package</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.valid.valid.ValidPackage#getImport()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/NativeContext.java b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/NativeContext.java
index ed1d3cb6f..96cda1a8c 100644
--- a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/NativeContext.java
+++ b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/NativeContext.java
@@ -14,6 +14,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.NativeContext#isNamed <em>Named</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.NativeContext#getGivenName <em>Given Name</em>}</li>
@@ -21,7 +22,6 @@
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.NativeContext#getMarkerFeature <em>Marker Feature</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.NativeContext#getQuickFixes <em>Quick Fixes</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.valid.valid.ValidPackage#getNativeContext()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/NativeRule.java b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/NativeRule.java
index 2a205d4a1..527d6bc90 100644
--- a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/NativeRule.java
+++ b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/NativeRule.java
@@ -11,10 +11,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.NativeRule#getContexts <em>Contexts</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.valid.valid.ValidPackage#getNativeRule()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/QuickFix.java b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/QuickFix.java
index 374c8c055..9069bb6a4 100644
--- a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/QuickFix.java
+++ b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/QuickFix.java
@@ -11,13 +11,13 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.QuickFix#getQuickFixKind <em>Quick Fix Kind</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.QuickFix#getName <em>Name</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.QuickFix#getLabel <em>Label</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.QuickFix#getMessage <em>Message</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.valid.valid.ValidPackage#getQuickFix()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/QuickFixKind.java b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/QuickFixKind.java
index 5e3263893..d7fe445e5 100644
--- a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/QuickFixKind.java
+++ b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/QuickFixKind.java
@@ -94,6 +94,8 @@ public enum QuickFixKind implements Enumerator
    * Returns the '<em><b>Quick Fix Kind</b></em>' literal with the specified literal value.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @param literal the literal.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static QuickFixKind get(String literal)
@@ -113,6 +115,8 @@ public static QuickFixKind get(String literal)
    * Returns the '<em><b>Quick Fix Kind</b></em>' literal with the specified name.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @param name the name.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static QuickFixKind getByName(String name)
@@ -132,6 +136,8 @@ public static QuickFixKind getByName(String name)
    * Returns the '<em><b>Quick Fix Kind</b></em>' literal with the specified integer value.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @param value the integer value.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static QuickFixKind get(int value)
diff --git a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/RangeRule.java b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/RangeRule.java
index 40a2c4a3d..04144929a 100644
--- a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/RangeRule.java
+++ b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/RangeRule.java
@@ -11,12 +11,12 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.RangeRule#getMin <em>Min</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.RangeRule#getMax <em>Max</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.RangeRule#getContexts <em>Contexts</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.valid.valid.ValidPackage#getRangeRule()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/Rule.java b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/Rule.java
index 1041c41a5..9e76ab388 100644
--- a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/Rule.java
+++ b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/Rule.java
@@ -11,6 +11,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.Rule#isOptional <em>Optional</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.Rule#getCheckKind <em>Check Kind</em>}</li>
@@ -20,7 +21,6 @@
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.Rule#getDescription <em>Description</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.Rule#getMessage <em>Message</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.valid.valid.ValidPackage#getRule()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/SeverityKind.java b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/SeverityKind.java
index c38bb9ea4..cdf8a57b9 100644
--- a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/SeverityKind.java
+++ b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/SeverityKind.java
@@ -94,6 +94,8 @@ public enum SeverityKind implements Enumerator
    * Returns the '<em><b>Severity Kind</b></em>' literal with the specified literal value.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @param literal the literal.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static SeverityKind get(String literal)
@@ -113,6 +115,8 @@ public static SeverityKind get(String literal)
    * Returns the '<em><b>Severity Kind</b></em>' literal with the specified name.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @param name the name.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static SeverityKind getByName(String name)
@@ -132,6 +136,8 @@ public static SeverityKind getByName(String name)
    * Returns the '<em><b>Severity Kind</b></em>' literal with the specified integer value.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @param value the integer value.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static SeverityKind get(int value)
diff --git a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/SizeRule.java b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/SizeRule.java
index 623a9a5fd..4864011ce 100644
--- a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/SizeRule.java
+++ b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/SizeRule.java
@@ -11,12 +11,12 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.SizeRule#getMin <em>Min</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.SizeRule#getMax <em>Max</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.SizeRule#getContexts <em>Contexts</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.valid.valid.ValidPackage#getSizeRule()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/UniqueRule.java b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/UniqueRule.java
index 625b2ac5e..aa65bd148 100644
--- a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/UniqueRule.java
+++ b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/UniqueRule.java
@@ -11,10 +11,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.UniqueRule#getContexts <em>Contexts</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.valid.valid.ValidPackage#getUniqueRule()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/ValidModel.java b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/ValidModel.java
index 2e360a3a0..cc4985cfd 100644
--- a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/ValidModel.java
+++ b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/ValidModel.java
@@ -13,11 +13,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.ValidModel#getImports <em>Imports</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.ValidModel#getCategories <em>Categories</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.valid.valid.ValidPackage#getValidModel()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/CategoryImpl.java b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/CategoryImpl.java
index 84f68cbe3..e2e434ba8 100644
--- a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/CategoryImpl.java
+++ b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/CategoryImpl.java
@@ -28,13 +28,13 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.impl.CategoryImpl#getName <em>Name</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.impl.CategoryImpl#getLabel <em>Label</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.impl.CategoryImpl#getDescription <em>Description</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.impl.CategoryImpl#getRules <em>Rules</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/ContextImpl.java b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/ContextImpl.java
index 2fec23c7a..98e1b868a 100644
--- a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/ContextImpl.java
+++ b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/ContextImpl.java
@@ -20,11 +20,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.impl.ContextImpl#getContextType <em>Context Type</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.impl.ContextImpl#getContextFeature <em>Context Feature</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/DuplicateContextImpl.java b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/DuplicateContextImpl.java
index 151e62558..d81a62a2a 100644
--- a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/DuplicateContextImpl.java
+++ b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/DuplicateContextImpl.java
@@ -19,11 +19,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.impl.DuplicateContextImpl#getMarkerType <em>Marker Type</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.impl.DuplicateContextImpl#getMarkerFeature <em>Marker Feature</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/ImportImpl.java b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/ImportImpl.java
index c9ff4acce..f4801a371 100644
--- a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/ImportImpl.java
+++ b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/ImportImpl.java
@@ -20,10 +20,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.impl.ImportImpl#getPackage <em>Package</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/NativeContextImpl.java b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/NativeContextImpl.java
index ec6076377..ed5a4660a 100644
--- a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/NativeContextImpl.java
+++ b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/NativeContextImpl.java
@@ -28,6 +28,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.impl.NativeContextImpl#isNamed <em>Named</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.impl.NativeContextImpl#getGivenName <em>Given Name</em>}</li>
@@ -35,7 +36,6 @@
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.impl.NativeContextImpl#getMarkerFeature <em>Marker Feature</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.impl.NativeContextImpl#getQuickFixes <em>Quick Fixes</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/NativeRuleImpl.java b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/NativeRuleImpl.java
index bf7ae383b..bc5f13149 100644
--- a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/NativeRuleImpl.java
+++ b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/NativeRuleImpl.java
@@ -24,10 +24,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.impl.NativeRuleImpl#getContexts <em>Contexts</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/PredefinedRuleImpl.java b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/PredefinedRuleImpl.java
index 39fb7f1a0..a26f71d20 100644
--- a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/PredefinedRuleImpl.java
+++ b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/PredefinedRuleImpl.java
@@ -11,8 +11,6 @@
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Predefined Rule</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/QuickFixImpl.java b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/QuickFixImpl.java
index a382f7bfd..5043d384c 100644
--- a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/QuickFixImpl.java
+++ b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/QuickFixImpl.java
@@ -19,13 +19,13 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.impl.QuickFixImpl#getQuickFixKind <em>Quick Fix Kind</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.impl.QuickFixImpl#getName <em>Name</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.impl.QuickFixImpl#getLabel <em>Label</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.impl.QuickFixImpl#getMessage <em>Message</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/RangeRuleImpl.java b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/RangeRuleImpl.java
index 35e2e813d..4bbb27d96 100644
--- a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/RangeRuleImpl.java
+++ b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/RangeRuleImpl.java
@@ -27,12 +27,12 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.impl.RangeRuleImpl#getMin <em>Min</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.impl.RangeRuleImpl#getMax <em>Max</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.impl.RangeRuleImpl#getContexts <em>Contexts</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/RuleImpl.java b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/RuleImpl.java
index 81c5170fc..8a5ccf818 100644
--- a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/RuleImpl.java
+++ b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/RuleImpl.java
@@ -20,6 +20,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.impl.RuleImpl#isOptional <em>Optional</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.impl.RuleImpl#getCheckKind <em>Check Kind</em>}</li>
@@ -29,7 +30,6 @@
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.impl.RuleImpl#getDescription <em>Description</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.impl.RuleImpl#getMessage <em>Message</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/SimpleContextImpl.java b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/SimpleContextImpl.java
index 94b25014c..3b8a1b308 100644
--- a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/SimpleContextImpl.java
+++ b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/SimpleContextImpl.java
@@ -11,8 +11,6 @@
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Simple Context</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/SizeRuleImpl.java b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/SizeRuleImpl.java
index f7a265135..368ded2c0 100644
--- a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/SizeRuleImpl.java
+++ b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/SizeRuleImpl.java
@@ -27,12 +27,12 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.impl.SizeRuleImpl#getMin <em>Min</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.impl.SizeRuleImpl#getMax <em>Max</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.impl.SizeRuleImpl#getContexts <em>Contexts</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/UniqueRuleImpl.java b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/UniqueRuleImpl.java
index 2afb85d3e..ab569c139 100644
--- a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/UniqueRuleImpl.java
+++ b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/UniqueRuleImpl.java
@@ -24,10 +24,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.impl.UniqueRuleImpl#getContexts <em>Contexts</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/ValidModelImpl.java b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/ValidModelImpl.java
index 140aa5a64..32b83961c 100644
--- a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/ValidModelImpl.java
+++ b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/impl/ValidModelImpl.java
@@ -27,11 +27,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.impl.ValidModelImpl#getImports <em>Imports</em>}</li>
  *   <li>{@link com.avaloq.tools.ddk.xtext.valid.valid.impl.ValidModelImpl#getCategories <em>Categories</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/util/ValidSwitch.java b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/util/ValidSwitch.java
index f1782fc65..6324a53f5 100644
--- a/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/util/ValidSwitch.java
+++ b/com.avaloq.tools.ddk.xtext.valid/src-gen/com/avaloq/tools/ddk/xtext/valid/valid/util/ValidSwitch.java
@@ -50,7 +50,7 @@ public ValidSwitch()
    * Checks whether this is a switch for the given package.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @parameter ePackage the package in question.
+   * @param ePackage the package in question.
    * @return whether this is a switch for the given package.
    * @generated
    */
diff --git a/com.avaloq.tools.ddk.xtext/src-gen/com/avaloq/tools/ddk/xtext/modelinference/InferenceContainer.java b/com.avaloq.tools.ddk.xtext/src-gen/com/avaloq/tools/ddk/xtext/modelinference/InferenceContainer.java
index 65271f885..3cdadbb8b 100644
--- a/com.avaloq.tools.ddk.xtext/src-gen/com/avaloq/tools/ddk/xtext/modelinference/InferenceContainer.java
+++ b/com.avaloq.tools.ddk.xtext/src-gen/com/avaloq/tools/ddk/xtext/modelinference/InferenceContainer.java
@@ -13,10 +13,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.modelinference.InferenceContainer#getContents <em>Contents</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.xtext.modelinference.ModelInferencePackage#getInferenceContainer()
  * @model
diff --git a/com.avaloq.tools.ddk.xtext/src-gen/com/avaloq/tools/ddk/xtext/modelinference/impl/InferenceContainerImpl.java b/com.avaloq.tools.ddk.xtext/src-gen/com/avaloq/tools/ddk/xtext/modelinference/impl/InferenceContainerImpl.java
index bc6374e2c..8e18565b0 100644
--- a/com.avaloq.tools.ddk.xtext/src-gen/com/avaloq/tools/ddk/xtext/modelinference/impl/InferenceContainerImpl.java
+++ b/com.avaloq.tools.ddk.xtext/src-gen/com/avaloq/tools/ddk/xtext/modelinference/impl/InferenceContainerImpl.java
@@ -28,10 +28,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.xtext.modelinference.impl.InferenceContainerImpl#getContents <em>Contents</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.xtext/src-gen/com/avaloq/tools/ddk/xtext/modelinference/util/ModelInferenceSwitch.java b/com.avaloq.tools.ddk.xtext/src-gen/com/avaloq/tools/ddk/xtext/modelinference/util/ModelInferenceSwitch.java
index 9af0a4381..4bf3a3ead 100644
--- a/com.avaloq.tools.ddk.xtext/src-gen/com/avaloq/tools/ddk/xtext/modelinference/util/ModelInferenceSwitch.java
+++ b/com.avaloq.tools.ddk.xtext/src-gen/com/avaloq/tools/ddk/xtext/modelinference/util/ModelInferenceSwitch.java
@@ -50,7 +50,7 @@ public ModelInferenceSwitch()
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
+	 * @param ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
diff --git a/ddk-configuration/launches/Maven Clean.launch b/ddk-configuration/launches/Maven Clean.launch
new file mode 100644
index 000000000..a0896a4b0
--- /dev/null
+++ b/ddk-configuration/launches/Maven Clean.launch	
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
+<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
+<stringAttribute key="M2_GOALS" value="clean -f ddk-parent/pom.xml "/>
+<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
+<booleanAttribute key="M2_OFFLINE" value="false"/>
+<stringAttribute key="M2_PROFILES" value=""/>
+<listAttribute key="M2_PROPERTIES"/>
+<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
+<booleanAttribute key="M2_SKIP_TESTS" value="true"/>
+<intAttribute key="M2_THREADS" value="1"/>
+<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
+<stringAttribute key="M2_USER_SETTINGS" value=""/>
+<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
+<mapAttribute key="org.eclipse.debug.core.environmentVariables">
+<mapEntry key="workspace" value="${project_loc:ddk-parent}/../"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/ddk-parent}/../"/>
+</launchConfiguration>
diff --git a/ddk-target/ddk.target b/ddk-target/ddk.target
index 0a62e14b9..4902b84c0 100644
--- a/ddk-target/ddk.target
+++ b/ddk-target/ddk.target
@@ -24,9 +24,9 @@
 <repository location="http://download.eclipse.org/releases/neon/201705151400/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.xtend.sdk.feature.group" version="2.13.0.v20171020-0920"/>
-<unit id="org.eclipse.xtext.sdk.feature.group" version="2.13.0.v20171020-0920"/>
-<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.13.0/"/>
+<unit id="org.eclipse.xtend.sdk.feature.group" version="2.14.0.v20180523-0937"/>
+<unit id="org.eclipse.xtext.sdk.feature.group" version="2.14.0.v20180523-0937"/>
+<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.14.0/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.emf.codegen.ecore.ui.feature.group" version="2.10.0.v20150123-0452"/>

From 17cec683b865300e45c1d49cbde9e71f15e85d61 Mon Sep 17 00:00:00 2001
From: Jonathan Fuller <Jonathan.Fuller@avaloq.com>
Date: Wed, 30 May 2018 16:08:03 +0800
Subject: [PATCH 15/56] Allow custom post format action on the String value of
 ExtendedLineEntry that has preserve format.

---
 .../com/avaloq/tools/ddk/xtext/formatting/ExtendedLine.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/formatting/ExtendedLine.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/formatting/ExtendedLine.java
index ebcbe53f8..37dc4d67e 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/formatting/ExtendedLine.java
+++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/formatting/ExtendedLine.java
@@ -274,6 +274,10 @@ public String getValue() {
       }
 
     });
+    String postProcessedValue = getConfigBasedStream().getFormatter().executeCustomPostFormatAction(lineEntry, getEntries());
+    if (postProcessedValue != null) {
+      lineEntry.setValue(postProcessedValue);
+    }
     getEntries().add(lineEntry);
     return this;
   }

From d1ea56f797f5313883d1fcebc25ecbc8ffd390a3 Mon Sep 17 00:00:00 2001
From: Jenkins <hudson@avaloq.com>
Date: Mon, 4 Jun 2018 14:12:30 +0200
Subject: [PATCH 16/56] Release 1.4.0.v20180604-1412-REL

---
 com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.check.core.test/pom.xml              | 2 +-
 com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF      | 2 +-
 com.avaloq.tools.ddk.check.core/pom.xml                   | 2 +-
 com.avaloq.tools.ddk.check.generator/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.check.generator/pom.xml              | 2 +-
 com.avaloq.tools.ddk.check.lib/META-INF/MANIFEST.MF       | 2 +-
 com.avaloq.tools.ddk.check.lib/pom.xml                    | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.check.runtime.core.test/pom.xml      | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.check.runtime.core/pom.xml           | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.check.runtime.ui/pom.xml             | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.check.test.runtime.tests/pom.xml     | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.check.test.runtime.ui/pom.xml        | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.check.test.runtime/pom.xml           | 2 +-
 com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF   | 2 +-
 com.avaloq.tools.ddk.check.ui.test/pom.xml                | 2 +-
 com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF        | 2 +-
 com.avaloq.tools.ddk.check.ui/pom.xml                     | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.checkcfg.core.test/pom.xml           | 2 +-
 com.avaloq.tools.ddk.checkcfg.core/META-INF/MANIFEST.MF   | 2 +-
 com.avaloq.tools.ddk.checkcfg.core/pom.xml                | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.checkcfg.ui.test/pom.xml             | 2 +-
 com.avaloq.tools.ddk.checkcfg.ui/META-INF/MANIFEST.MF     | 2 +-
 com.avaloq.tools.ddk.checkcfg.ui/pom.xml                  | 2 +-
 com.avaloq.tools.ddk.feature/feature.xml                  | 2 +-
 com.avaloq.tools.ddk.feature/pom.xml                      | 2 +-
 com.avaloq.tools.ddk.runtime.feature/feature.xml          | 2 +-
 com.avaloq.tools.ddk.runtime.feature/pom.xml              | 2 +-
 com.avaloq.tools.ddk.runtime.source.feature/feature.xml   | 2 +-
 com.avaloq.tools.ddk.runtime.source.feature/pom.xml       | 2 +-
 com.avaloq.tools.ddk.source.feature/feature.xml           | 2 +-
 com.avaloq.tools.ddk.source.feature/pom.xml               | 2 +-
 com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF       | 2 +-
 com.avaloq.tools.ddk.test.core/pom.xml                    | 2 +-
 com.avaloq.tools.ddk.test.ui.test/META-INF/MANIFEST.MF    | 2 +-
 com.avaloq.tools.ddk.test.ui.test/pom.xml                 | 2 +-
 com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF         | 2 +-
 com.avaloq.tools.ddk.test.ui/pom.xml                      | 2 +-
 com.avaloq.tools.ddk.typesystem.test/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.typesystem.test/pom.xml              | 2 +-
 com.avaloq.tools.ddk.typesystem/META-INF/MANIFEST.MF      | 2 +-
 com.avaloq.tools.ddk.typesystem/pom.xml                   | 2 +-
 com.avaloq.tools.ddk.workflow/pom.xml                     | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.builder.ui/pom.xml             | 2 +-
 com.avaloq.tools.ddk.xtext.builder/META-INF/MANIFEST.MF   | 2 +-
 com.avaloq.tools.ddk.xtext.builder/pom.xml                | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.common.types.ui/pom.xml        | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.common.types/pom.xml           | 2 +-
 com.avaloq.tools.ddk.xtext.common.ui/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.xtext.common.ui/pom.xml              | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.export.generator/pom.xml       | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.export.test/pom.xml            | 2 +-
 com.avaloq.tools.ddk.xtext.export.ui/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.xtext.export.ui/pom.xml              | 2 +-
 com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF    | 2 +-
 com.avaloq.tools.ddk.xtext.export/pom.xml                 | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.expression.ui/pom.xml          | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.expression/pom.xml             | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.format.generator/pom.xml       | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.format.test/pom.xml            | 2 +-
 com.avaloq.tools.ddk.xtext.format.ui/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.xtext.format.ui/pom.xml              | 2 +-
 com.avaloq.tools.ddk.xtext.format/META-INF/MANIFEST.MF    | 2 +-
 com.avaloq.tools.ddk.xtext.format/pom.xml                 | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.generator.test/pom.xml         | 2 +-
 com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.xtext.generator/pom.xml              | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.scope.generator/pom.xml        | 2 +-
 com.avaloq.tools.ddk.xtext.scope.ui/META-INF/MANIFEST.MF  | 2 +-
 com.avaloq.tools.ddk.xtext.scope.ui/pom.xml               | 2 +-
 com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF     | 2 +-
 com.avaloq.tools.ddk.xtext.scope/pom.xml                  | 2 +-
 com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.xtext.test.core/pom.xml              | 2 +-
 com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF      | 2 +-
 com.avaloq.tools.ddk.xtext.test/pom.xml                   | 2 +-
 com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF   | 2 +-
 com.avaloq.tools.ddk.xtext.ui.test/pom.xml                | 2 +-
 com.avaloq.tools.ddk.xtext.ui/META-INF/MANIFEST.MF        | 2 +-
 com.avaloq.tools.ddk.xtext.ui/pom.xml                     | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.valid.generator/pom.xml        | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.valid.test/pom.xml             | 2 +-
 com.avaloq.tools.ddk.xtext.valid.ui/META-INF/MANIFEST.MF  | 2 +-
 com.avaloq.tools.ddk.xtext.valid.ui/pom.xml               | 2 +-
 com.avaloq.tools.ddk.xtext.valid/META-INF/MANIFEST.MF     | 2 +-
 com.avaloq.tools.ddk.xtext.valid/pom.xml                  | 2 +-
 com.avaloq.tools.ddk.xtext/META-INF/MANIFEST.MF           | 2 +-
 com.avaloq.tools.ddk.xtext/pom.xml                        | 2 +-
 com.avaloq.tools.ddk.xtextspy.test/META-INF/MANIFEST.MF   | 2 +-
 com.avaloq.tools.ddk.xtextspy.test/pom.xml                | 2 +-
 com.avaloq.tools.ddk.xtextspy/META-INF/MANIFEST.MF        | 2 +-
 com.avaloq.tools.ddk.xtextspy/pom.xml                     | 2 +-
 ddk-parent/pom.xml                                        | 2 +-
 ddk-repository/category.xml                               | 8 ++++----
 ddk-repository/pom.xml                                    | 2 +-
 ddk-target/pom.xml                                        | 2 +-
 117 files changed, 120 insertions(+), 120 deletions(-)

diff --git a/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF
index 93cbfface..272fe2d01 100644
--- a/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.core.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.core.test;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.check.core.test/pom.xml b/com.avaloq.tools.ddk.check.core.test/pom.xml
index d2359adc3..0303a0156 100644
--- a/com.avaloq.tools.ddk.check.core.test/pom.xml
+++ b/com.avaloq.tools.ddk.check.core.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF
index 726725c64..76a6a958e 100644
--- a/com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.core
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.core;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.check.core/pom.xml b/com.avaloq.tools.ddk.check.core/pom.xml
index cd2552b7e..916398c6d 100644
--- a/com.avaloq.tools.ddk.check.core/pom.xml
+++ b/com.avaloq.tools.ddk.check.core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.check.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.generator/META-INF/MANIFEST.MF
index f2fdd2c8c..73c73155f 100644
--- a/com.avaloq.tools.ddk.check.generator/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.generator
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.generator;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.check.generator/pom.xml b/com.avaloq.tools.ddk.check.generator/pom.xml
index 6e58e8b43..ce60413b6 100644
--- a/com.avaloq.tools.ddk.check.generator/pom.xml
+++ b/com.avaloq.tools.ddk.check.generator/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.check.lib/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.lib/META-INF/MANIFEST.MF
index 81df4b840..e8bf91707 100644
--- a/com.avaloq.tools.ddk.check.lib/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.lib/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.lib
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.lib
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Vendor: Avaloq Evolution AG
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.xtext,
diff --git a/com.avaloq.tools.ddk.check.lib/pom.xml b/com.avaloq.tools.ddk.check.lib/pom.xml
index ceda3e04a..0c8c476ed 100644
--- a/com.avaloq.tools.ddk.check.lib/pom.xml
+++ b/com.avaloq.tools.ddk.check.lib/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.check.runtime.core.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.runtime.core.test/META-INF/MANIFEST.MF
index 57483ec09..8d427aa77 100644
--- a/com.avaloq.tools.ddk.check.runtime.core.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.runtime.core.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.runtime.core.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.runtime.core.test;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui,
diff --git a/com.avaloq.tools.ddk.check.runtime.core.test/pom.xml b/com.avaloq.tools.ddk.check.runtime.core.test/pom.xml
index e2b5e3910..a47b2868a 100644
--- a/com.avaloq.tools.ddk.check.runtime.core.test/pom.xml
+++ b/com.avaloq.tools.ddk.check.runtime.core.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.check.runtime.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.runtime.core/META-INF/MANIFEST.MF
index 5aa3a4f09..eed6ec146 100644
--- a/com.avaloq.tools.ddk.check.runtime.core/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.runtime.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.runtime.core
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.runtime.core;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.resources,
diff --git a/com.avaloq.tools.ddk.check.runtime.core/pom.xml b/com.avaloq.tools.ddk.check.runtime.core/pom.xml
index 70ad85af9..fe05b95a4 100644
--- a/com.avaloq.tools.ddk.check.runtime.core/pom.xml
+++ b/com.avaloq.tools.ddk.check.runtime.core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.check.runtime.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.runtime.ui/META-INF/MANIFEST.MF
index 4e8505755..9a256b2e8 100644
--- a/com.avaloq.tools.ddk.check.runtime.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.runtime.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.runtime.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.runtime.ui;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Activator: com.avaloq.tools.ddk.check.runtime.ui.internal.Activator
 Bundle-Vendor: Avaloq Evolution AG
 Require-Bundle: org.eclipse.ui,
diff --git a/com.avaloq.tools.ddk.check.runtime.ui/pom.xml b/com.avaloq.tools.ddk.check.runtime.ui/pom.xml
index 27f9b5104..68eae6f48 100644
--- a/com.avaloq.tools.ddk.check.runtime.ui/pom.xml
+++ b/com.avaloq.tools.ddk.check.runtime.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF
index 435aa4cd6..a908442b2 100644
--- a/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.test.runtime.tests
 Bundle-Vendor: Avaloq Evolution AG
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.test.runtime.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.avaloq.tools.ddk.check.runtime.core,
diff --git a/com.avaloq.tools.ddk.check.test.runtime.tests/pom.xml b/com.avaloq.tools.ddk.check.test.runtime.tests/pom.xml
index d85d69c72..e360a7b67 100644
--- a/com.avaloq.tools.ddk.check.test.runtime.tests/pom.xml
+++ b/com.avaloq.tools.ddk.check.test.runtime.tests/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.check.test.runtime.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.test.runtime.ui/META-INF/MANIFEST.MF
index 16ebf7fb7..febbee95f 100644
--- a/com.avaloq.tools.ddk.check.test.runtime.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.test.runtime.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.test.runtime.ui
 Bundle-Vendor: Avaloq Evolution AG
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.test.runtime.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.avaloq.tools.ddk.check.test.runtime;visibility:=reexport,
diff --git a/com.avaloq.tools.ddk.check.test.runtime.ui/pom.xml b/com.avaloq.tools.ddk.check.test.runtime.ui/pom.xml
index 9c0e7acc1..0512088d7 100644
--- a/com.avaloq.tools.ddk.check.test.runtime.ui/pom.xml
+++ b/com.avaloq.tools.ddk.check.test.runtime.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.check.test.runtime/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.test.runtime/META-INF/MANIFEST.MF
index 7652ba5f1..e206837af 100644
--- a/com.avaloq.tools.ddk.check.test.runtime/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.test.runtime/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.test.runtime
 Bundle-Vendor: Avaloq Evolution AG
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.test.runtime;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.xtext;visibility:=reexport,
diff --git a/com.avaloq.tools.ddk.check.test.runtime/pom.xml b/com.avaloq.tools.ddk.check.test.runtime/pom.xml
index 5f942fc8f..8e6a66ec3 100644
--- a/com.avaloq.tools.ddk.check.test.runtime/pom.xml
+++ b/com.avaloq.tools.ddk.check.test.runtime/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF
index e2d992c2c..ae3923f03 100644
--- a/com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.ui.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.ui.test
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit,
diff --git a/com.avaloq.tools.ddk.check.ui.test/pom.xml b/com.avaloq.tools.ddk.check.ui.test/pom.xml
index f67d97bd1..25b4a31ad 100644
--- a/com.avaloq.tools.ddk.check.ui.test/pom.xml
+++ b/com.avaloq.tools.ddk.check.ui.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF
index 116678dcf..c906fb2a3 100644
--- a/com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.ui;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: com.avaloq.tools.ddk.check.ui.internal.Activator
diff --git a/com.avaloq.tools.ddk.check.ui/pom.xml b/com.avaloq.tools.ddk.check.ui/pom.xml
index 1440a788f..234e2cc72 100644
--- a/com.avaloq.tools.ddk.check.ui/pom.xml
+++ b/com.avaloq.tools.ddk.check.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.checkcfg.core.test/META-INF/MANIFEST.MF
index 72358fa7d..5429f751b 100644
--- a/com.avaloq.tools.ddk.checkcfg.core.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.checkcfg.core.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.checkcfg.core.test
 Bundle-Vendor: Avaloq Evolution AG
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-SymbolicName: com.avaloq.tools.ddk.checkcfg.core.test; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.avaloq.tools.ddk.test.core, 
diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/pom.xml b/com.avaloq.tools.ddk.checkcfg.core.test/pom.xml
index 81d7cddc9..a6e0eb33c 100644
--- a/com.avaloq.tools.ddk.checkcfg.core.test/pom.xml
+++ b/com.avaloq.tools.ddk.checkcfg.core.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.checkcfg.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.checkcfg.core/META-INF/MANIFEST.MF
index 2bb6daced..9985b5e63 100644
--- a/com.avaloq.tools.ddk.checkcfg.core/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.checkcfg.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.checkcfg.core
 Bundle-Vendor: Avaloq Evolution AG
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-SymbolicName: com.avaloq.tools.ddk.checkcfg.core; singleton:=true
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/com.avaloq.tools.ddk.checkcfg.core/pom.xml b/com.avaloq.tools.ddk.checkcfg.core/pom.xml
index 1ed2dd550..6225b1160 100644
--- a/com.avaloq.tools.ddk.checkcfg.core/pom.xml
+++ b/com.avaloq.tools.ddk.checkcfg.core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.checkcfg.ui.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.checkcfg.ui.test/META-INF/MANIFEST.MF
index a11c08905..e33e59f99 100644
--- a/com.avaloq.tools.ddk.checkcfg.ui.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.checkcfg.ui.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.checkcfg.ui.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.checkcfg.ui.test
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: com.avaloq.tools.ddk.checkcfg.ui.test
diff --git a/com.avaloq.tools.ddk.checkcfg.ui.test/pom.xml b/com.avaloq.tools.ddk.checkcfg.ui.test/pom.xml
index 8e62f76dd..c51124fc7 100644
--- a/com.avaloq.tools.ddk.checkcfg.ui.test/pom.xml
+++ b/com.avaloq.tools.ddk.checkcfg.ui.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.checkcfg.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.checkcfg.ui/META-INF/MANIFEST.MF
index 18d972f7a..6c63c3987 100644
--- a/com.avaloq.tools.ddk.checkcfg.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.checkcfg.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.checkcfg.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.checkcfg.ui;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: com.avaloq.tools.ddk.checkcfg.ui.internal.Activator
diff --git a/com.avaloq.tools.ddk.checkcfg.ui/pom.xml b/com.avaloq.tools.ddk.checkcfg.ui/pom.xml
index 05358994e..0a8fd0c98 100644
--- a/com.avaloq.tools.ddk.checkcfg.ui/pom.xml
+++ b/com.avaloq.tools.ddk.checkcfg.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.feature/feature.xml b/com.avaloq.tools.ddk.feature/feature.xml
index 2a75e0864..d46856422 100644
--- a/com.avaloq.tools.ddk.feature/feature.xml
+++ b/com.avaloq.tools.ddk.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.avaloq.tools.ddk.feature"
       label="com.avaloq.tools.ddk.feature"
-      version="1.4.0.qualifier"
+      version="1.4.0.v20180604-1412-REL"
       provider-name="Avaloq Evolution AG">
 
    <description>
diff --git a/com.avaloq.tools.ddk.feature/pom.xml b/com.avaloq.tools.ddk.feature/pom.xml
index 212070386..ae1f276e1 100644
--- a/com.avaloq.tools.ddk.feature/pom.xml
+++ b/com.avaloq.tools.ddk.feature/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.runtime.feature/feature.xml b/com.avaloq.tools.ddk.runtime.feature/feature.xml
index 8e5d19b8e..3b75df443 100644
--- a/com.avaloq.tools.ddk.runtime.feature/feature.xml
+++ b/com.avaloq.tools.ddk.runtime.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.avaloq.tools.ddk.runtime.feature"
       label="com.avaloq.tools.ddk.runtime.feature"
-      version="1.4.0.qualifier"
+      version="1.4.0.v20180604-1412-REL"
       provider-name="Avaloq Evolution AG">
 
    <description>
diff --git a/com.avaloq.tools.ddk.runtime.feature/pom.xml b/com.avaloq.tools.ddk.runtime.feature/pom.xml
index 86b35d57b..b3ad94cb1 100644
--- a/com.avaloq.tools.ddk.runtime.feature/pom.xml
+++ b/com.avaloq.tools.ddk.runtime.feature/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.runtime.source.feature/feature.xml b/com.avaloq.tools.ddk.runtime.source.feature/feature.xml
index 88a87c78f..33149dc1c 100644
--- a/com.avaloq.tools.ddk.runtime.source.feature/feature.xml
+++ b/com.avaloq.tools.ddk.runtime.source.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.avaloq.tools.ddk.runtime.source.feature"
       label="com.avaloq.tools.ddk.runtime.source.feature"
-      version="1.4.0.qualifier"
+      version="1.4.0.v20180604-1412-REL"
       provider-name="Avaloq Evolution AG">
 
    <plugin
diff --git a/com.avaloq.tools.ddk.runtime.source.feature/pom.xml b/com.avaloq.tools.ddk.runtime.source.feature/pom.xml
index 23f27d79a..e2b9c820d 100644
--- a/com.avaloq.tools.ddk.runtime.source.feature/pom.xml
+++ b/com.avaloq.tools.ddk.runtime.source.feature/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.source.feature/feature.xml b/com.avaloq.tools.ddk.source.feature/feature.xml
index a958688a9..ee5c9014a 100644
--- a/com.avaloq.tools.ddk.source.feature/feature.xml
+++ b/com.avaloq.tools.ddk.source.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.avaloq.tools.ddk.source.feature"
       label="com.avaloq.tools.ddk.source.feature"
-      version="1.4.0.qualifier"
+      version="1.4.0.v20180604-1412-REL"
       provider-name="Avaloq Evolution AG">
 
    <plugin
diff --git a/com.avaloq.tools.ddk.source.feature/pom.xml b/com.avaloq.tools.ddk.source.feature/pom.xml
index 2dafe8b9d..abaf8e0af 100644
--- a/com.avaloq.tools.ddk.source.feature/pom.xml
+++ b/com.avaloq.tools.ddk.source.feature/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF
index 4e2802b84..1fa833b81 100644
--- a/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.test.core
 Bundle-SymbolicName: com.avaloq.tools.ddk.test.core;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.test.core/pom.xml b/com.avaloq.tools.ddk.test.core/pom.xml
index d3e96571e..00938f9df 100644
--- a/com.avaloq.tools.ddk.test.core/pom.xml
+++ b/com.avaloq.tools.ddk.test.core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.test.ui.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.test.ui.test/META-INF/MANIFEST.MF
index 7e81dae50..498f3a6d2 100644
--- a/com.avaloq.tools.ddk.test.ui.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.test.ui.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.test.ui.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.test.ui.test;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/com.avaloq.tools.ddk.test.ui.test/pom.xml b/com.avaloq.tools.ddk.test.ui.test/pom.xml
index 4d2b1c49d..2e3f5952a 100644
--- a/com.avaloq.tools.ddk.test.ui.test/pom.xml
+++ b/com.avaloq.tools.ddk.test.ui.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF
index 94d979c95..80adb7365 100644
--- a/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.test.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.test.ui;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: com.avaloq.tools.ddk.test.ui.Activator
diff --git a/com.avaloq.tools.ddk.test.ui/pom.xml b/com.avaloq.tools.ddk.test.ui/pom.xml
index d1d91c7d5..84bce29fe 100644
--- a/com.avaloq.tools.ddk.test.ui/pom.xml
+++ b/com.avaloq.tools.ddk.test.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.typesystem.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.typesystem.test/META-INF/MANIFEST.MF
index e4e6b49b2..022507d53 100644
--- a/com.avaloq.tools.ddk.typesystem.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.typesystem.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.typesystem.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.typesystem.test;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.typesystem.test/pom.xml b/com.avaloq.tools.ddk.typesystem.test/pom.xml
index 40312f3c5..6d11fa4d5 100644
--- a/com.avaloq.tools.ddk.typesystem.test/pom.xml
+++ b/com.avaloq.tools.ddk.typesystem.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.typesystem/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.typesystem/META-INF/MANIFEST.MF
index 9e1b4bbbc..6fc516122 100644
--- a/com.avaloq.tools.ddk.typesystem/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.typesystem/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.typesystem
 Bundle-SymbolicName: com.avaloq.tools.ddk.typesystem;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.apache.log4j
diff --git a/com.avaloq.tools.ddk.typesystem/pom.xml b/com.avaloq.tools.ddk.typesystem/pom.xml
index bacea00de..809a7c470 100644
--- a/com.avaloq.tools.ddk.typesystem/pom.xml
+++ b/com.avaloq.tools.ddk.typesystem/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.workflow/pom.xml b/com.avaloq.tools.ddk.workflow/pom.xml
index 1fac6bd40..10b3a2989 100644
--- a/com.avaloq.tools.ddk.workflow/pom.xml
+++ b/com.avaloq.tools.ddk.workflow/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.builder.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.builder.ui/META-INF/MANIFEST.MF
index bee1035d1..65b78fd32 100644
--- a/com.avaloq.tools.ddk.xtext.builder.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.builder.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.builder.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.builder.ui;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Vendor: Avaloq Evolution AG
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.xtext,
diff --git a/com.avaloq.tools.ddk.xtext.builder.ui/pom.xml b/com.avaloq.tools.ddk.xtext.builder.ui/pom.xml
index 2648ced21..37b9cc979 100644
--- a/com.avaloq.tools.ddk.xtext.builder.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.builder.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.builder/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.builder/META-INF/MANIFEST.MF
index 43cf61368..341ce40b0 100644
--- a/com.avaloq.tools.ddk.xtext.builder/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.builder/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.builder
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.builder;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Vendor: Avaloq Evolution AG
 Require-Bundle: org.eclipse.xtext.builder,
  org.eclipse.xtext.ui,
diff --git a/com.avaloq.tools.ddk.xtext.builder/pom.xml b/com.avaloq.tools.ddk.xtext.builder/pom.xml
index 8fd5abc1f..8f0b95e62 100644
--- a/com.avaloq.tools.ddk.xtext.builder/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.builder/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.common.types.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.common.types.ui/META-INF/MANIFEST.MF
index 410581d78..6940611be 100644
--- a/com.avaloq.tools.ddk.xtext.common.types.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.common.types.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.common.types.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.common.types.ui;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.common.types.ui/pom.xml b/com.avaloq.tools.ddk.xtext.common.types.ui/pom.xml
index 563357316..f1eac1fb3 100644
--- a/com.avaloq.tools.ddk.xtext.common.types.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.common.types.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.common.types/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.common.types/META-INF/MANIFEST.MF
index 3fc2a21c0..25ec185a3 100644
--- a/com.avaloq.tools.ddk.xtext.common.types/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.common.types/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.common.types
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.common.types;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.common.types/pom.xml b/com.avaloq.tools.ddk.xtext.common.types/pom.xml
index ad2e279c2..4265a0e65 100644
--- a/com.avaloq.tools.ddk.xtext.common.types/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.common.types/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.common.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.common.ui/META-INF/MANIFEST.MF
index 940947ffd..ec53fea50 100644
--- a/com.avaloq.tools.ddk.xtext.common.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.common.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.common.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.common.ui;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: com.avaloq.tools.ddk.xtext.common.ui.contentassist
diff --git a/com.avaloq.tools.ddk.xtext.common.ui/pom.xml b/com.avaloq.tools.ddk.xtext.common.ui/pom.xml
index 216c89e9b..1b91eaaaa 100644
--- a/com.avaloq.tools.ddk.xtext.common.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.common.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.export.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.export.generator/META-INF/MANIFEST.MF
index 690b8ea4c..5250dfb75 100644
--- a/com.avaloq.tools.ddk.xtext.export.generator/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.export.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.export.generator
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.export.generator;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.xtext,
diff --git a/com.avaloq.tools.ddk.xtext.export.generator/pom.xml b/com.avaloq.tools.ddk.xtext.export.generator/pom.xml
index e3cf35304..05f446423 100644
--- a/com.avaloq.tools.ddk.xtext.export.generator/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.export.generator/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.export.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.export.test/META-INF/MANIFEST.MF
index 0b5cf5704..2be5ff692 100644
--- a/com.avaloq.tools.ddk.xtext.export.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.export.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.export.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.export.test;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.export.test/pom.xml b/com.avaloq.tools.ddk.xtext.export.test/pom.xml
index 6d2be57c8..8ac296e66 100644
--- a/com.avaloq.tools.ddk.xtext.export.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.export.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.export.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.export.ui/META-INF/MANIFEST.MF
index 2d261e1f0..4e68f0fd8 100644
--- a/com.avaloq.tools.ddk.xtext.export.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.export.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.export.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.export.ui;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: com.avaloq.tools.ddk.xtext.export.ui.internal.ExportActivator
diff --git a/com.avaloq.tools.ddk.xtext.export.ui/pom.xml b/com.avaloq.tools.ddk.xtext.export.ui/pom.xml
index 79a672212..bb1a7e25c 100644
--- a/com.avaloq.tools.ddk.xtext.export.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.export.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF
index 19de786b1..1cb36ef58 100644
--- a/com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.export
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.export;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.export/pom.xml b/com.avaloq.tools.ddk.xtext.export/pom.xml
index a70fc0a85..878a50411 100644
--- a/com.avaloq.tools.ddk.xtext.export/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.export/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.expression.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.expression.ui/META-INF/MANIFEST.MF
index 2bd53a6ca..8ddf2c5a9 100644
--- a/com.avaloq.tools.ddk.xtext.expression.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.expression.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.expression.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.expression.ui;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: com.avaloq.tools.ddk.xtext.expression.ui.internal.Activator
diff --git a/com.avaloq.tools.ddk.xtext.expression.ui/pom.xml b/com.avaloq.tools.ddk.xtext.expression.ui/pom.xml
index 57763003f..2f402bf0a 100644
--- a/com.avaloq.tools.ddk.xtext.expression.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.expression.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF
index ab6ce83cc..798fe3467 100644
--- a/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.expression
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.expression;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.xtext,
diff --git a/com.avaloq.tools.ddk.xtext.expression/pom.xml b/com.avaloq.tools.ddk.xtext.expression/pom.xml
index 13f3bfd1a..ce3e8d532 100644
--- a/com.avaloq.tools.ddk.xtext.expression/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.expression/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.format.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.format.generator/META-INF/MANIFEST.MF
index 919e93e1f..d0e4e7dd1 100644
--- a/com.avaloq.tools.ddk.xtext.format.generator/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.format.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.format.generator
 Bundle-Vendor: Avaloq Evolution AG
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.format.generator;singleton:=true
 Require-Bundle: com.avaloq.tools.ddk.xtext.format;visibility:=reexport,
  org.eclipse.xtext.generator,
diff --git a/com.avaloq.tools.ddk.xtext.format.generator/pom.xml b/com.avaloq.tools.ddk.xtext.format.generator/pom.xml
index 173d282ce..8ee700908 100644
--- a/com.avaloq.tools.ddk.xtext.format.generator/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.format.generator/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.format.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.format.test/META-INF/MANIFEST.MF
index 239b491ec..39e0769cd 100644
--- a/com.avaloq.tools.ddk.xtext.format.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.format.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.format.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.format.test;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.format.test/pom.xml b/com.avaloq.tools.ddk.xtext.format.test/pom.xml
index 05f3b9e0b..4893e270e 100644
--- a/com.avaloq.tools.ddk.xtext.format.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.format.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.format.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.format.ui/META-INF/MANIFEST.MF
index d541d2f7e..2abb16b63 100644
--- a/com.avaloq.tools.ddk.xtext.format.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.format.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.format.ui
 Bundle-Vendor: Avaloq Evolution AG
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.format.ui;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.avaloq.tools.ddk.xtext.format;visibility:=reexport,
diff --git a/com.avaloq.tools.ddk.xtext.format.ui/pom.xml b/com.avaloq.tools.ddk.xtext.format.ui/pom.xml
index e9fc2eafa..649224a64 100644
--- a/com.avaloq.tools.ddk.xtext.format.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.format.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.format/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.format/META-INF/MANIFEST.MF
index 221903c06..d072eb8d3 100644
--- a/com.avaloq.tools.ddk.xtext.format/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.format/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.format
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.format;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.format/pom.xml b/com.avaloq.tools.ddk.xtext.format/pom.xml
index 20394d1b0..0cd6b6bbd 100644
--- a/com.avaloq.tools.ddk.xtext.format/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.format/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.generator.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.generator.test/META-INF/MANIFEST.MF
index 0af4e772b..0b853cb4f 100644
--- a/com.avaloq.tools.ddk.xtext.generator.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.generator.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.generator.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.generator.test;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.generator.test/pom.xml b/com.avaloq.tools.ddk.xtext.generator.test/pom.xml
index 96109a38e..3bfd6366f 100644
--- a/com.avaloq.tools.ddk.xtext.generator.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.generator.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF
index d37c9759b..89e517fb2 100644
--- a/com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.generator
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.generator;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.jface,
diff --git a/com.avaloq.tools.ddk.xtext.generator/pom.xml b/com.avaloq.tools.ddk.xtext.generator/pom.xml
index 567109125..cdbd58dfa 100644
--- a/com.avaloq.tools.ddk.xtext.generator/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.generator/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.scope.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.scope.generator/META-INF/MANIFEST.MF
index e446f4319..ed91e52bf 100644
--- a/com.avaloq.tools.ddk.xtext.scope.generator/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.scope.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.scope.generator
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.scope.generator;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.avaloq.tools.ddk.xtext.scope;visibility:=reexport,
diff --git a/com.avaloq.tools.ddk.xtext.scope.generator/pom.xml b/com.avaloq.tools.ddk.xtext.scope.generator/pom.xml
index 29329ea86..91e75f88b 100644
--- a/com.avaloq.tools.ddk.xtext.scope.generator/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.scope.generator/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.scope.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.scope.ui/META-INF/MANIFEST.MF
index d2606f00f..eaa9426ae 100644
--- a/com.avaloq.tools.ddk.xtext.scope.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.scope.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.scope.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.scope.ui;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: com.avaloq.tools.ddk.xtext.scope.ui.internal.ScopeActivator
diff --git a/com.avaloq.tools.ddk.xtext.scope.ui/pom.xml b/com.avaloq.tools.ddk.xtext.scope.ui/pom.xml
index dfd1516f6..26c64ba84 100644
--- a/com.avaloq.tools.ddk.xtext.scope.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.scope.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF
index c056de596..0b0660456 100644
--- a/com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.scope
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.scope;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.xtext,
diff --git a/com.avaloq.tools.ddk.xtext.scope/pom.xml b/com.avaloq.tools.ddk.xtext.scope/pom.xml
index 627b66eb5..5c12e96e9 100644
--- a/com.avaloq.tools.ddk.xtext.scope/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.scope/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF
index c3600dd95..ef4fcb1af 100644
--- a/com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.test.core
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.test.core;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.avaloq.tools.ddk.xtext,
diff --git a/com.avaloq.tools.ddk.xtext.test.core/pom.xml b/com.avaloq.tools.ddk.xtext.test.core/pom.xml
index b086e9796..e20b0085c 100644
--- a/com.avaloq.tools.ddk.xtext.test.core/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.test.core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF
index 51c4ab2e7..653df6345 100644
--- a/com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.test;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.test/pom.xml b/com.avaloq.tools.ddk.xtext.test/pom.xml
index 1934e91ca..9b14bda2d 100644
--- a/com.avaloq.tools.ddk.xtext.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF
index 85d704928..06e9e178a 100644
--- a/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.ui.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.ui.test;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.xtext.ui,
diff --git a/com.avaloq.tools.ddk.xtext.ui.test/pom.xml b/com.avaloq.tools.ddk.xtext.ui.test/pom.xml
index 296b1b960..62c2411a0 100644
--- a/com.avaloq.tools.ddk.xtext.ui.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.ui.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.ui/META-INF/MANIFEST.MF
index 308ff6468..21b50a351 100644
--- a/com.avaloq.tools.ddk.xtext.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.ui;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.ui/pom.xml b/com.avaloq.tools.ddk.xtext.ui/pom.xml
index a835abd87..1c05ab504 100644
--- a/com.avaloq.tools.ddk.xtext.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.valid.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.valid.generator/META-INF/MANIFEST.MF
index 0311d2a1a..035251de5 100644
--- a/com.avaloq.tools.ddk.xtext.valid.generator/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.valid.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.valid.generator
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.valid.generator;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.avaloq.tools.ddk.xtext.valid;visibility:=reexport,
diff --git a/com.avaloq.tools.ddk.xtext.valid.generator/pom.xml b/com.avaloq.tools.ddk.xtext.valid.generator/pom.xml
index 4673556ac..76c6c92f0 100644
--- a/com.avaloq.tools.ddk.xtext.valid.generator/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.valid.generator/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.valid.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.valid.test/META-INF/MANIFEST.MF
index b637f3bac..0a90051d6 100644
--- a/com.avaloq.tools.ddk.xtext.valid.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.valid.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.valid.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.valid.test;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.valid.test/pom.xml b/com.avaloq.tools.ddk.xtext.valid.test/pom.xml
index fdf6760da..ac49fe8f5 100644
--- a/com.avaloq.tools.ddk.xtext.valid.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.valid.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.valid.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.valid.ui/META-INF/MANIFEST.MF
index d457adc09..a0e7affbe 100644
--- a/com.avaloq.tools.ddk.xtext.valid.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.valid.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.valid.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.valid.ui;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.valid.ui/pom.xml b/com.avaloq.tools.ddk.xtext.valid.ui/pom.xml
index 60272cc15..ee78264a8 100644
--- a/com.avaloq.tools.ddk.xtext.valid.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.valid.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.valid/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.valid/META-INF/MANIFEST.MF
index dd1f9a36b..615d29e3b 100644
--- a/com.avaloq.tools.ddk.xtext.valid/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.valid/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.valid
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.valid;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.valid/pom.xml b/com.avaloq.tools.ddk.xtext.valid/pom.xml
index e804edfcf..e9f1f6052 100644
--- a/com.avaloq.tools.ddk.xtext.valid/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.valid/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext/META-INF/MANIFEST.MF
index 0dffb2b1a..99d3c2463 100644
--- a/com.avaloq.tools.ddk.xtext/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext/pom.xml b/com.avaloq.tools.ddk.xtext/pom.xml
index 8008076cd..009e10e48 100644
--- a/com.avaloq.tools.ddk.xtext/pom.xml
+++ b/com.avaloq.tools.ddk.xtext/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtextspy.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtextspy.test/META-INF/MANIFEST.MF
index 1f50fae4a..a52af8c0f 100644
--- a/com.avaloq.tools.ddk.xtextspy.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtextspy.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtextspy.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtextspy.test;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtextspy.test/pom.xml b/com.avaloq.tools.ddk.xtextspy.test/pom.xml
index f61e57030..a749fd823 100644
--- a/com.avaloq.tools.ddk.xtextspy.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtextspy.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtextspy/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtextspy/META-INF/MANIFEST.MF
index c4e49bc30..81e3aead8 100644
--- a/com.avaloq.tools.ddk.xtextspy/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtextspy/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Eclipse-ExtensibleAPI: true
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtextspy
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtextspy; singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.0.v20180604-1412-REL
 Bundle-Activator: com.avaloq.tools.ddk.xtextspy.internal.Activator
 Bundle-Vendor: Avaloq Evolution AG
 Require-Bundle: org.eclipse.ui,
diff --git a/com.avaloq.tools.ddk.xtextspy/pom.xml b/com.avaloq.tools.ddk.xtextspy/pom.xml
index 33ec3c15c..8d15addab 100644
--- a/com.avaloq.tools.ddk.xtextspy/pom.xml
+++ b/com.avaloq.tools.ddk.xtextspy/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/ddk-parent/pom.xml b/ddk-parent/pom.xml
index f3a019748..0cbb82a4e 100644
--- a/ddk-parent/pom.xml
+++ b/ddk-parent/pom.xml
@@ -7,7 +7,7 @@
 
   <groupId>com.avaloq.tools.ddk</groupId>
   <artifactId>ddk-parent</artifactId>
-  <version>1.4.0-SNAPSHOT</version>
+  <version>1.4.0.v20180604-1412-REL</version>
   <packaging>pom</packaging>
 
   <properties>
diff --git a/ddk-repository/category.xml b/ddk-repository/category.xml
index 26f681bdf..da887eb64 100644
--- a/ddk-repository/category.xml
+++ b/ddk-repository/category.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/com.avaloq.tools.ddk.feature_1.4.0.qualifier.jar" id="com.avaloq.tools.ddk.feature" version="1.4.0.qualifier">
+   <feature url="features/com.avaloq.tools.ddk.feature_1.4.0.v20180604-1412-REL.jar" id="com.avaloq.tools.ddk.feature" version="1.4.0.v20180604-1412-REL">
       <category name="com.avaloq.tools.ddk.sdk"/>
    </feature>
-   <feature url="features/com.avaloq.tools.ddk.source.feature_1.4.0.qualifier.jar" id="com.avaloq.tools.ddk.source.feature" version="1.4.0.qualifier">
+   <feature url="features/com.avaloq.tools.ddk.source.feature_1.4.0.v20180604-1412-REL.jar" id="com.avaloq.tools.ddk.source.feature" version="1.4.0.v20180604-1412-REL">
       <category name="com.avaloq.tools.ddk.sdk"/>
    </feature>
-   <feature url="features/com.avaloq.tools.ddk.runtime.feature_1.4.0.qualifier.jar" id="com.avaloq.tools.ddk.runtime.feature" version="1.4.0.qualifier">
+   <feature url="features/com.avaloq.tools.ddk.runtime.feature_1.4.0.v20180604-1412-REL.jar" id="com.avaloq.tools.ddk.runtime.feature" version="1.4.0.v20180604-1412-REL">
       <category name="com.avaloq.tools.ddk.runtime"/>
    </feature>
-   <feature url="features/com.avaloq.tools.ddk.runtime.source.feature_1.4.0.qualifier.jar" id="com.avaloq.tools.ddk.runtime.source.feature" version="1.4.0.qualifier">
+   <feature url="features/com.avaloq.tools.ddk.runtime.source.feature_1.4.0.v20180604-1412-REL.jar" id="com.avaloq.tools.ddk.runtime.source.feature" version="1.4.0.v20180604-1412-REL">
       <category name="com.avaloq.tools.ddk.runtime"/>
    </feature>
    <category-def name="com.avaloq.tools.ddk.sdk" label="DSL Developer Kit"/>
diff --git a/ddk-repository/pom.xml b/ddk-repository/pom.xml
index 762ad8aeb..bc2e88a76 100644
--- a/ddk-repository/pom.xml
+++ b/ddk-repository/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/ddk-target/pom.xml b/ddk-target/pom.xml
index f77dc3769..cd3b79ebf 100644
--- a/ddk-target/pom.xml
+++ b/ddk-target/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0.v20180604-1412-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>

From f4ed78f793a00ab1326cf09dec433b2baca222d5 Mon Sep 17 00:00:00 2001
From: Jenkins <hudson@avaloq.com>
Date: Mon, 4 Jun 2018 14:12:31 +0200
Subject: [PATCH 17/56] Next development version: 1.5.0-SNAPSHOT

---
 com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.check.core.test/pom.xml              | 2 +-
 com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF      | 2 +-
 com.avaloq.tools.ddk.check.core/pom.xml                   | 2 +-
 com.avaloq.tools.ddk.check.generator/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.check.generator/pom.xml              | 2 +-
 com.avaloq.tools.ddk.check.lib/META-INF/MANIFEST.MF       | 2 +-
 com.avaloq.tools.ddk.check.lib/pom.xml                    | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.check.runtime.core.test/pom.xml      | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.check.runtime.core/pom.xml           | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.check.runtime.ui/pom.xml             | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.check.test.runtime.tests/pom.xml     | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.check.test.runtime.ui/pom.xml        | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.check.test.runtime/pom.xml           | 2 +-
 com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF   | 2 +-
 com.avaloq.tools.ddk.check.ui.test/pom.xml                | 2 +-
 com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF        | 2 +-
 com.avaloq.tools.ddk.check.ui/pom.xml                     | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.checkcfg.core.test/pom.xml           | 2 +-
 com.avaloq.tools.ddk.checkcfg.core/META-INF/MANIFEST.MF   | 2 +-
 com.avaloq.tools.ddk.checkcfg.core/pom.xml                | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.checkcfg.ui.test/pom.xml             | 2 +-
 com.avaloq.tools.ddk.checkcfg.ui/META-INF/MANIFEST.MF     | 2 +-
 com.avaloq.tools.ddk.checkcfg.ui/pom.xml                  | 2 +-
 com.avaloq.tools.ddk.feature/feature.xml                  | 2 +-
 com.avaloq.tools.ddk.feature/pom.xml                      | 2 +-
 com.avaloq.tools.ddk.runtime.feature/feature.xml          | 2 +-
 com.avaloq.tools.ddk.runtime.feature/pom.xml              | 2 +-
 com.avaloq.tools.ddk.runtime.source.feature/feature.xml   | 2 +-
 com.avaloq.tools.ddk.runtime.source.feature/pom.xml       | 2 +-
 com.avaloq.tools.ddk.source.feature/feature.xml           | 2 +-
 com.avaloq.tools.ddk.source.feature/pom.xml               | 2 +-
 com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF       | 2 +-
 com.avaloq.tools.ddk.test.core/pom.xml                    | 2 +-
 com.avaloq.tools.ddk.test.ui.test/META-INF/MANIFEST.MF    | 2 +-
 com.avaloq.tools.ddk.test.ui.test/pom.xml                 | 2 +-
 com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF         | 2 +-
 com.avaloq.tools.ddk.test.ui/pom.xml                      | 2 +-
 com.avaloq.tools.ddk.typesystem.test/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.typesystem.test/pom.xml              | 2 +-
 com.avaloq.tools.ddk.typesystem/META-INF/MANIFEST.MF      | 2 +-
 com.avaloq.tools.ddk.typesystem/pom.xml                   | 2 +-
 com.avaloq.tools.ddk.workflow/pom.xml                     | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.builder.ui/pom.xml             | 2 +-
 com.avaloq.tools.ddk.xtext.builder/META-INF/MANIFEST.MF   | 2 +-
 com.avaloq.tools.ddk.xtext.builder/pom.xml                | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.common.types.ui/pom.xml        | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.common.types/pom.xml           | 2 +-
 com.avaloq.tools.ddk.xtext.common.ui/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.xtext.common.ui/pom.xml              | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.export.generator/pom.xml       | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.export.test/pom.xml            | 2 +-
 com.avaloq.tools.ddk.xtext.export.ui/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.xtext.export.ui/pom.xml              | 2 +-
 com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF    | 2 +-
 com.avaloq.tools.ddk.xtext.export/pom.xml                 | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.expression.ui/pom.xml          | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.expression/pom.xml             | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.format.generator/pom.xml       | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.format.test/pom.xml            | 2 +-
 com.avaloq.tools.ddk.xtext.format.ui/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.xtext.format.ui/pom.xml              | 2 +-
 com.avaloq.tools.ddk.xtext.format/META-INF/MANIFEST.MF    | 2 +-
 com.avaloq.tools.ddk.xtext.format/pom.xml                 | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.generator.test/pom.xml         | 2 +-
 com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.xtext.generator/pom.xml              | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.scope.generator/pom.xml        | 2 +-
 com.avaloq.tools.ddk.xtext.scope.ui/META-INF/MANIFEST.MF  | 2 +-
 com.avaloq.tools.ddk.xtext.scope.ui/pom.xml               | 2 +-
 com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF     | 2 +-
 com.avaloq.tools.ddk.xtext.scope/pom.xml                  | 2 +-
 com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.xtext.test.core/pom.xml              | 2 +-
 com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF      | 2 +-
 com.avaloq.tools.ddk.xtext.test/pom.xml                   | 2 +-
 com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF   | 2 +-
 com.avaloq.tools.ddk.xtext.ui.test/pom.xml                | 2 +-
 com.avaloq.tools.ddk.xtext.ui/META-INF/MANIFEST.MF        | 2 +-
 com.avaloq.tools.ddk.xtext.ui/pom.xml                     | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.valid.generator/pom.xml        | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.valid.test/pom.xml             | 2 +-
 com.avaloq.tools.ddk.xtext.valid.ui/META-INF/MANIFEST.MF  | 2 +-
 com.avaloq.tools.ddk.xtext.valid.ui/pom.xml               | 2 +-
 com.avaloq.tools.ddk.xtext.valid/META-INF/MANIFEST.MF     | 2 +-
 com.avaloq.tools.ddk.xtext.valid/pom.xml                  | 2 +-
 com.avaloq.tools.ddk.xtext/META-INF/MANIFEST.MF           | 2 +-
 com.avaloq.tools.ddk.xtext/pom.xml                        | 2 +-
 com.avaloq.tools.ddk.xtextspy.test/META-INF/MANIFEST.MF   | 2 +-
 com.avaloq.tools.ddk.xtextspy.test/pom.xml                | 2 +-
 com.avaloq.tools.ddk.xtextspy/META-INF/MANIFEST.MF        | 2 +-
 com.avaloq.tools.ddk.xtextspy/pom.xml                     | 2 +-
 ddk-parent/pom.xml                                        | 2 +-
 ddk-repository/category.xml                               | 8 ++++----
 ddk-repository/pom.xml                                    | 2 +-
 ddk-target/pom.xml                                        | 2 +-
 117 files changed, 120 insertions(+), 120 deletions(-)

diff --git a/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF
index 272fe2d01..21656a800 100644
--- a/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.core.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.core.test;singleton:=true
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.check.core.test/pom.xml b/com.avaloq.tools.ddk.check.core.test/pom.xml
index 0303a0156..2ee824204 100644
--- a/com.avaloq.tools.ddk.check.core.test/pom.xml
+++ b/com.avaloq.tools.ddk.check.core.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF
index 76a6a958e..c8bc2e173 100644
--- a/com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.core
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.core;singleton:=true
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.check.core/pom.xml b/com.avaloq.tools.ddk.check.core/pom.xml
index 916398c6d..229207d47 100644
--- a/com.avaloq.tools.ddk.check.core/pom.xml
+++ b/com.avaloq.tools.ddk.check.core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.check.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.generator/META-INF/MANIFEST.MF
index 73c73155f..e14408cd9 100644
--- a/com.avaloq.tools.ddk.check.generator/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.generator
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.generator;singleton:=true
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.check.generator/pom.xml b/com.avaloq.tools.ddk.check.generator/pom.xml
index ce60413b6..7c84615f8 100644
--- a/com.avaloq.tools.ddk.check.generator/pom.xml
+++ b/com.avaloq.tools.ddk.check.generator/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.check.lib/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.lib/META-INF/MANIFEST.MF
index e8bf91707..e89580ea3 100644
--- a/com.avaloq.tools.ddk.check.lib/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.lib/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.lib
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.lib
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.xtext,
diff --git a/com.avaloq.tools.ddk.check.lib/pom.xml b/com.avaloq.tools.ddk.check.lib/pom.xml
index 0c8c476ed..06ef21a37 100644
--- a/com.avaloq.tools.ddk.check.lib/pom.xml
+++ b/com.avaloq.tools.ddk.check.lib/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.check.runtime.core.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.runtime.core.test/META-INF/MANIFEST.MF
index 8d427aa77..6e242af96 100644
--- a/com.avaloq.tools.ddk.check.runtime.core.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.runtime.core.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.runtime.core.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.runtime.core.test;singleton:=true
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui,
diff --git a/com.avaloq.tools.ddk.check.runtime.core.test/pom.xml b/com.avaloq.tools.ddk.check.runtime.core.test/pom.xml
index a47b2868a..6bffcfc7b 100644
--- a/com.avaloq.tools.ddk.check.runtime.core.test/pom.xml
+++ b/com.avaloq.tools.ddk.check.runtime.core.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.check.runtime.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.runtime.core/META-INF/MANIFEST.MF
index eed6ec146..4128b348c 100644
--- a/com.avaloq.tools.ddk.check.runtime.core/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.runtime.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.runtime.core
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.runtime.core;singleton:=true
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.resources,
diff --git a/com.avaloq.tools.ddk.check.runtime.core/pom.xml b/com.avaloq.tools.ddk.check.runtime.core/pom.xml
index fe05b95a4..24aa814f4 100644
--- a/com.avaloq.tools.ddk.check.runtime.core/pom.xml
+++ b/com.avaloq.tools.ddk.check.runtime.core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.check.runtime.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.runtime.ui/META-INF/MANIFEST.MF
index 9a256b2e8..658e29e9a 100644
--- a/com.avaloq.tools.ddk.check.runtime.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.runtime.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.runtime.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.runtime.ui;singleton:=true
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Activator: com.avaloq.tools.ddk.check.runtime.ui.internal.Activator
 Bundle-Vendor: Avaloq Evolution AG
 Require-Bundle: org.eclipse.ui,
diff --git a/com.avaloq.tools.ddk.check.runtime.ui/pom.xml b/com.avaloq.tools.ddk.check.runtime.ui/pom.xml
index 68eae6f48..437db310c 100644
--- a/com.avaloq.tools.ddk.check.runtime.ui/pom.xml
+++ b/com.avaloq.tools.ddk.check.runtime.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF
index a908442b2..0654a270a 100644
--- a/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.test.runtime.tests
 Bundle-Vendor: Avaloq Evolution AG
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.test.runtime.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.avaloq.tools.ddk.check.runtime.core,
diff --git a/com.avaloq.tools.ddk.check.test.runtime.tests/pom.xml b/com.avaloq.tools.ddk.check.test.runtime.tests/pom.xml
index e360a7b67..2623bf1d4 100644
--- a/com.avaloq.tools.ddk.check.test.runtime.tests/pom.xml
+++ b/com.avaloq.tools.ddk.check.test.runtime.tests/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.check.test.runtime.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.test.runtime.ui/META-INF/MANIFEST.MF
index febbee95f..1924fed39 100644
--- a/com.avaloq.tools.ddk.check.test.runtime.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.test.runtime.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.test.runtime.ui
 Bundle-Vendor: Avaloq Evolution AG
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.test.runtime.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.avaloq.tools.ddk.check.test.runtime;visibility:=reexport,
diff --git a/com.avaloq.tools.ddk.check.test.runtime.ui/pom.xml b/com.avaloq.tools.ddk.check.test.runtime.ui/pom.xml
index 0512088d7..27bdd5838 100644
--- a/com.avaloq.tools.ddk.check.test.runtime.ui/pom.xml
+++ b/com.avaloq.tools.ddk.check.test.runtime.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.check.test.runtime/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.test.runtime/META-INF/MANIFEST.MF
index e206837af..b5d7074ea 100644
--- a/com.avaloq.tools.ddk.check.test.runtime/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.test.runtime/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.test.runtime
 Bundle-Vendor: Avaloq Evolution AG
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.test.runtime;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.xtext;visibility:=reexport,
diff --git a/com.avaloq.tools.ddk.check.test.runtime/pom.xml b/com.avaloq.tools.ddk.check.test.runtime/pom.xml
index 8e6a66ec3..596357cad 100644
--- a/com.avaloq.tools.ddk.check.test.runtime/pom.xml
+++ b/com.avaloq.tools.ddk.check.test.runtime/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF
index ae3923f03..bae16a11f 100644
--- a/com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.ui.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.ui.test
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit,
diff --git a/com.avaloq.tools.ddk.check.ui.test/pom.xml b/com.avaloq.tools.ddk.check.ui.test/pom.xml
index 25b4a31ad..6ce7898e5 100644
--- a/com.avaloq.tools.ddk.check.ui.test/pom.xml
+++ b/com.avaloq.tools.ddk.check.ui.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF
index c906fb2a3..c19a40e1d 100644
--- a/com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.ui;singleton:=true
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: com.avaloq.tools.ddk.check.ui.internal.Activator
diff --git a/com.avaloq.tools.ddk.check.ui/pom.xml b/com.avaloq.tools.ddk.check.ui/pom.xml
index 234e2cc72..38cb7291b 100644
--- a/com.avaloq.tools.ddk.check.ui/pom.xml
+++ b/com.avaloq.tools.ddk.check.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.checkcfg.core.test/META-INF/MANIFEST.MF
index 5429f751b..6bb986e84 100644
--- a/com.avaloq.tools.ddk.checkcfg.core.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.checkcfg.core.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.checkcfg.core.test
 Bundle-Vendor: Avaloq Evolution AG
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-SymbolicName: com.avaloq.tools.ddk.checkcfg.core.test; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.avaloq.tools.ddk.test.core, 
diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/pom.xml b/com.avaloq.tools.ddk.checkcfg.core.test/pom.xml
index a6e0eb33c..965f958d8 100644
--- a/com.avaloq.tools.ddk.checkcfg.core.test/pom.xml
+++ b/com.avaloq.tools.ddk.checkcfg.core.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.checkcfg.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.checkcfg.core/META-INF/MANIFEST.MF
index 9985b5e63..3fdc4fd58 100644
--- a/com.avaloq.tools.ddk.checkcfg.core/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.checkcfg.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.checkcfg.core
 Bundle-Vendor: Avaloq Evolution AG
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-SymbolicName: com.avaloq.tools.ddk.checkcfg.core; singleton:=true
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/com.avaloq.tools.ddk.checkcfg.core/pom.xml b/com.avaloq.tools.ddk.checkcfg.core/pom.xml
index 6225b1160..bbd5055cf 100644
--- a/com.avaloq.tools.ddk.checkcfg.core/pom.xml
+++ b/com.avaloq.tools.ddk.checkcfg.core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.checkcfg.ui.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.checkcfg.ui.test/META-INF/MANIFEST.MF
index e33e59f99..626ed3c5b 100644
--- a/com.avaloq.tools.ddk.checkcfg.ui.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.checkcfg.ui.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.checkcfg.ui.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.checkcfg.ui.test
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: com.avaloq.tools.ddk.checkcfg.ui.test
diff --git a/com.avaloq.tools.ddk.checkcfg.ui.test/pom.xml b/com.avaloq.tools.ddk.checkcfg.ui.test/pom.xml
index c51124fc7..6b34c542f 100644
--- a/com.avaloq.tools.ddk.checkcfg.ui.test/pom.xml
+++ b/com.avaloq.tools.ddk.checkcfg.ui.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.checkcfg.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.checkcfg.ui/META-INF/MANIFEST.MF
index 6c63c3987..48348cf5c 100644
--- a/com.avaloq.tools.ddk.checkcfg.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.checkcfg.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.checkcfg.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.checkcfg.ui;singleton:=true
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: com.avaloq.tools.ddk.checkcfg.ui.internal.Activator
diff --git a/com.avaloq.tools.ddk.checkcfg.ui/pom.xml b/com.avaloq.tools.ddk.checkcfg.ui/pom.xml
index 0a8fd0c98..2b91e7655 100644
--- a/com.avaloq.tools.ddk.checkcfg.ui/pom.xml
+++ b/com.avaloq.tools.ddk.checkcfg.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.feature/feature.xml b/com.avaloq.tools.ddk.feature/feature.xml
index d46856422..38ceb52f4 100644
--- a/com.avaloq.tools.ddk.feature/feature.xml
+++ b/com.avaloq.tools.ddk.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.avaloq.tools.ddk.feature"
       label="com.avaloq.tools.ddk.feature"
-      version="1.4.0.v20180604-1412-REL"
+      version="1.5.0.qualifier"
       provider-name="Avaloq Evolution AG">
 
    <description>
diff --git a/com.avaloq.tools.ddk.feature/pom.xml b/com.avaloq.tools.ddk.feature/pom.xml
index ae1f276e1..43128985d 100644
--- a/com.avaloq.tools.ddk.feature/pom.xml
+++ b/com.avaloq.tools.ddk.feature/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.runtime.feature/feature.xml b/com.avaloq.tools.ddk.runtime.feature/feature.xml
index 3b75df443..f324c4f30 100644
--- a/com.avaloq.tools.ddk.runtime.feature/feature.xml
+++ b/com.avaloq.tools.ddk.runtime.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.avaloq.tools.ddk.runtime.feature"
       label="com.avaloq.tools.ddk.runtime.feature"
-      version="1.4.0.v20180604-1412-REL"
+      version="1.5.0.qualifier"
       provider-name="Avaloq Evolution AG">
 
    <description>
diff --git a/com.avaloq.tools.ddk.runtime.feature/pom.xml b/com.avaloq.tools.ddk.runtime.feature/pom.xml
index b3ad94cb1..c0a5ca239 100644
--- a/com.avaloq.tools.ddk.runtime.feature/pom.xml
+++ b/com.avaloq.tools.ddk.runtime.feature/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.runtime.source.feature/feature.xml b/com.avaloq.tools.ddk.runtime.source.feature/feature.xml
index 33149dc1c..31394f72a 100644
--- a/com.avaloq.tools.ddk.runtime.source.feature/feature.xml
+++ b/com.avaloq.tools.ddk.runtime.source.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.avaloq.tools.ddk.runtime.source.feature"
       label="com.avaloq.tools.ddk.runtime.source.feature"
-      version="1.4.0.v20180604-1412-REL"
+      version="1.5.0.qualifier"
       provider-name="Avaloq Evolution AG">
 
    <plugin
diff --git a/com.avaloq.tools.ddk.runtime.source.feature/pom.xml b/com.avaloq.tools.ddk.runtime.source.feature/pom.xml
index e2b9c820d..7f252ac25 100644
--- a/com.avaloq.tools.ddk.runtime.source.feature/pom.xml
+++ b/com.avaloq.tools.ddk.runtime.source.feature/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.source.feature/feature.xml b/com.avaloq.tools.ddk.source.feature/feature.xml
index ee5c9014a..330579be3 100644
--- a/com.avaloq.tools.ddk.source.feature/feature.xml
+++ b/com.avaloq.tools.ddk.source.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.avaloq.tools.ddk.source.feature"
       label="com.avaloq.tools.ddk.source.feature"
-      version="1.4.0.v20180604-1412-REL"
+      version="1.5.0.qualifier"
       provider-name="Avaloq Evolution AG">
 
    <plugin
diff --git a/com.avaloq.tools.ddk.source.feature/pom.xml b/com.avaloq.tools.ddk.source.feature/pom.xml
index abaf8e0af..371ca4816 100644
--- a/com.avaloq.tools.ddk.source.feature/pom.xml
+++ b/com.avaloq.tools.ddk.source.feature/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF
index 1fa833b81..8f2929fc0 100644
--- a/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.test.core
 Bundle-SymbolicName: com.avaloq.tools.ddk.test.core;singleton:=true
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.test.core/pom.xml b/com.avaloq.tools.ddk.test.core/pom.xml
index 00938f9df..c4023c0b0 100644
--- a/com.avaloq.tools.ddk.test.core/pom.xml
+++ b/com.avaloq.tools.ddk.test.core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.test.ui.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.test.ui.test/META-INF/MANIFEST.MF
index 498f3a6d2..bbedefa5c 100644
--- a/com.avaloq.tools.ddk.test.ui.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.test.ui.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.test.ui.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.test.ui.test;singleton:=true
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/com.avaloq.tools.ddk.test.ui.test/pom.xml b/com.avaloq.tools.ddk.test.ui.test/pom.xml
index 2e3f5952a..fd1a85e96 100644
--- a/com.avaloq.tools.ddk.test.ui.test/pom.xml
+++ b/com.avaloq.tools.ddk.test.ui.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF
index 80adb7365..7def034ca 100644
--- a/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.test.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.test.ui;singleton:=true
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: com.avaloq.tools.ddk.test.ui.Activator
diff --git a/com.avaloq.tools.ddk.test.ui/pom.xml b/com.avaloq.tools.ddk.test.ui/pom.xml
index 84bce29fe..3dcf41b1f 100644
--- a/com.avaloq.tools.ddk.test.ui/pom.xml
+++ b/com.avaloq.tools.ddk.test.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.typesystem.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.typesystem.test/META-INF/MANIFEST.MF
index 022507d53..93640fcd2 100644
--- a/com.avaloq.tools.ddk.typesystem.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.typesystem.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.typesystem.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.typesystem.test;singleton:=true
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.typesystem.test/pom.xml b/com.avaloq.tools.ddk.typesystem.test/pom.xml
index 6d11fa4d5..bd93d15e7 100644
--- a/com.avaloq.tools.ddk.typesystem.test/pom.xml
+++ b/com.avaloq.tools.ddk.typesystem.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.typesystem/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.typesystem/META-INF/MANIFEST.MF
index 6fc516122..79f0f5f27 100644
--- a/com.avaloq.tools.ddk.typesystem/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.typesystem/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.typesystem
 Bundle-SymbolicName: com.avaloq.tools.ddk.typesystem;singleton:=true
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.apache.log4j
diff --git a/com.avaloq.tools.ddk.typesystem/pom.xml b/com.avaloq.tools.ddk.typesystem/pom.xml
index 809a7c470..ecde24efd 100644
--- a/com.avaloq.tools.ddk.typesystem/pom.xml
+++ b/com.avaloq.tools.ddk.typesystem/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.workflow/pom.xml b/com.avaloq.tools.ddk.workflow/pom.xml
index 10b3a2989..98d41f753 100644
--- a/com.avaloq.tools.ddk.workflow/pom.xml
+++ b/com.avaloq.tools.ddk.workflow/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.builder.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.builder.ui/META-INF/MANIFEST.MF
index 65b78fd32..1b39e4d80 100644
--- a/com.avaloq.tools.ddk.xtext.builder.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.builder.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.builder.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.builder.ui;singleton:=true
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.xtext,
diff --git a/com.avaloq.tools.ddk.xtext.builder.ui/pom.xml b/com.avaloq.tools.ddk.xtext.builder.ui/pom.xml
index 37b9cc979..a5cf17ff4 100644
--- a/com.avaloq.tools.ddk.xtext.builder.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.builder.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.builder/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.builder/META-INF/MANIFEST.MF
index 341ce40b0..ed0917da9 100644
--- a/com.avaloq.tools.ddk.xtext.builder/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.builder/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.builder
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.builder;singleton:=true
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Require-Bundle: org.eclipse.xtext.builder,
  org.eclipse.xtext.ui,
diff --git a/com.avaloq.tools.ddk.xtext.builder/pom.xml b/com.avaloq.tools.ddk.xtext.builder/pom.xml
index 8f0b95e62..f75a742fd 100644
--- a/com.avaloq.tools.ddk.xtext.builder/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.builder/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.common.types.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.common.types.ui/META-INF/MANIFEST.MF
index 6940611be..f274088f3 100644
--- a/com.avaloq.tools.ddk.xtext.common.types.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.common.types.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.common.types.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.common.types.ui;singleton:=true
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.common.types.ui/pom.xml b/com.avaloq.tools.ddk.xtext.common.types.ui/pom.xml
index f1eac1fb3..52959ebd5 100644
--- a/com.avaloq.tools.ddk.xtext.common.types.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.common.types.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.common.types/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.common.types/META-INF/MANIFEST.MF
index 25ec185a3..789ad2249 100644
--- a/com.avaloq.tools.ddk.xtext.common.types/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.common.types/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.common.types
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.common.types;singleton:=true
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.common.types/pom.xml b/com.avaloq.tools.ddk.xtext.common.types/pom.xml
index 4265a0e65..697b6d768 100644
--- a/com.avaloq.tools.ddk.xtext.common.types/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.common.types/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.common.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.common.ui/META-INF/MANIFEST.MF
index ec53fea50..5512deef3 100644
--- a/com.avaloq.tools.ddk.xtext.common.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.common.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.common.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.common.ui;singleton:=true
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: com.avaloq.tools.ddk.xtext.common.ui.contentassist
diff --git a/com.avaloq.tools.ddk.xtext.common.ui/pom.xml b/com.avaloq.tools.ddk.xtext.common.ui/pom.xml
index 1b91eaaaa..3f4df44ab 100644
--- a/com.avaloq.tools.ddk.xtext.common.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.common.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.export.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.export.generator/META-INF/MANIFEST.MF
index 5250dfb75..e3828d39a 100644
--- a/com.avaloq.tools.ddk.xtext.export.generator/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.export.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.export.generator
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.export.generator;singleton:=true
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.xtext,
diff --git a/com.avaloq.tools.ddk.xtext.export.generator/pom.xml b/com.avaloq.tools.ddk.xtext.export.generator/pom.xml
index 05f446423..eb1b4389e 100644
--- a/com.avaloq.tools.ddk.xtext.export.generator/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.export.generator/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.export.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.export.test/META-INF/MANIFEST.MF
index 2be5ff692..bc0029c63 100644
--- a/com.avaloq.tools.ddk.xtext.export.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.export.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.export.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.export.test;singleton:=true
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.export.test/pom.xml b/com.avaloq.tools.ddk.xtext.export.test/pom.xml
index 8ac296e66..7bd33fec7 100644
--- a/com.avaloq.tools.ddk.xtext.export.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.export.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.export.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.export.ui/META-INF/MANIFEST.MF
index 4e68f0fd8..a5c42b4be 100644
--- a/com.avaloq.tools.ddk.xtext.export.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.export.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.export.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.export.ui;singleton:=true
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: com.avaloq.tools.ddk.xtext.export.ui.internal.ExportActivator
diff --git a/com.avaloq.tools.ddk.xtext.export.ui/pom.xml b/com.avaloq.tools.ddk.xtext.export.ui/pom.xml
index bb1a7e25c..fb6ded37c 100644
--- a/com.avaloq.tools.ddk.xtext.export.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.export.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF
index 1cb36ef58..3410d08e7 100644
--- a/com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.export
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.export;singleton:=true
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.export/pom.xml b/com.avaloq.tools.ddk.xtext.export/pom.xml
index 878a50411..dec146861 100644
--- a/com.avaloq.tools.ddk.xtext.export/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.export/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.expression.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.expression.ui/META-INF/MANIFEST.MF
index 8ddf2c5a9..a55040c9a 100644
--- a/com.avaloq.tools.ddk.xtext.expression.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.expression.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.expression.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.expression.ui;singleton:=true
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: com.avaloq.tools.ddk.xtext.expression.ui.internal.Activator
diff --git a/com.avaloq.tools.ddk.xtext.expression.ui/pom.xml b/com.avaloq.tools.ddk.xtext.expression.ui/pom.xml
index 2f402bf0a..f1731ab8c 100644
--- a/com.avaloq.tools.ddk.xtext.expression.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.expression.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF
index 798fe3467..ac2e474fb 100644
--- a/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.expression
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.expression;singleton:=true
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.xtext,
diff --git a/com.avaloq.tools.ddk.xtext.expression/pom.xml b/com.avaloq.tools.ddk.xtext.expression/pom.xml
index ce3e8d532..2da225091 100644
--- a/com.avaloq.tools.ddk.xtext.expression/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.expression/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.format.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.format.generator/META-INF/MANIFEST.MF
index d0e4e7dd1..0b9cce617 100644
--- a/com.avaloq.tools.ddk.xtext.format.generator/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.format.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.format.generator
 Bundle-Vendor: Avaloq Evolution AG
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.format.generator;singleton:=true
 Require-Bundle: com.avaloq.tools.ddk.xtext.format;visibility:=reexport,
  org.eclipse.xtext.generator,
diff --git a/com.avaloq.tools.ddk.xtext.format.generator/pom.xml b/com.avaloq.tools.ddk.xtext.format.generator/pom.xml
index 8ee700908..a8903e163 100644
--- a/com.avaloq.tools.ddk.xtext.format.generator/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.format.generator/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.format.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.format.test/META-INF/MANIFEST.MF
index 39e0769cd..f2910cff8 100644
--- a/com.avaloq.tools.ddk.xtext.format.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.format.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.format.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.format.test;singleton:=true
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.format.test/pom.xml b/com.avaloq.tools.ddk.xtext.format.test/pom.xml
index 4893e270e..dd19cee78 100644
--- a/com.avaloq.tools.ddk.xtext.format.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.format.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.format.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.format.ui/META-INF/MANIFEST.MF
index 2abb16b63..f1d53601a 100644
--- a/com.avaloq.tools.ddk.xtext.format.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.format.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.format.ui
 Bundle-Vendor: Avaloq Evolution AG
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.format.ui;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.avaloq.tools.ddk.xtext.format;visibility:=reexport,
diff --git a/com.avaloq.tools.ddk.xtext.format.ui/pom.xml b/com.avaloq.tools.ddk.xtext.format.ui/pom.xml
index 649224a64..dda04d118 100644
--- a/com.avaloq.tools.ddk.xtext.format.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.format.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.format/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.format/META-INF/MANIFEST.MF
index d072eb8d3..a9624a507 100644
--- a/com.avaloq.tools.ddk.xtext.format/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.format/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.format
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.format;singleton:=true
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.format/pom.xml b/com.avaloq.tools.ddk.xtext.format/pom.xml
index 0cd6b6bbd..24b31a5a1 100644
--- a/com.avaloq.tools.ddk.xtext.format/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.format/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.generator.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.generator.test/META-INF/MANIFEST.MF
index 0b853cb4f..9210dd43f 100644
--- a/com.avaloq.tools.ddk.xtext.generator.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.generator.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.generator.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.generator.test;singleton:=true
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.generator.test/pom.xml b/com.avaloq.tools.ddk.xtext.generator.test/pom.xml
index 3bfd6366f..d560ccacc 100644
--- a/com.avaloq.tools.ddk.xtext.generator.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.generator.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF
index 89e517fb2..4e9c21a8b 100644
--- a/com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.generator
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.generator;singleton:=true
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.jface,
diff --git a/com.avaloq.tools.ddk.xtext.generator/pom.xml b/com.avaloq.tools.ddk.xtext.generator/pom.xml
index cdbd58dfa..821c3280f 100644
--- a/com.avaloq.tools.ddk.xtext.generator/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.generator/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.scope.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.scope.generator/META-INF/MANIFEST.MF
index ed91e52bf..8fdbb6aab 100644
--- a/com.avaloq.tools.ddk.xtext.scope.generator/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.scope.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.scope.generator
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.scope.generator;singleton:=true
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.avaloq.tools.ddk.xtext.scope;visibility:=reexport,
diff --git a/com.avaloq.tools.ddk.xtext.scope.generator/pom.xml b/com.avaloq.tools.ddk.xtext.scope.generator/pom.xml
index 91e75f88b..44f5f74ce 100644
--- a/com.avaloq.tools.ddk.xtext.scope.generator/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.scope.generator/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.scope.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.scope.ui/META-INF/MANIFEST.MF
index eaa9426ae..71fe753fe 100644
--- a/com.avaloq.tools.ddk.xtext.scope.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.scope.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.scope.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.scope.ui;singleton:=true
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: com.avaloq.tools.ddk.xtext.scope.ui.internal.ScopeActivator
diff --git a/com.avaloq.tools.ddk.xtext.scope.ui/pom.xml b/com.avaloq.tools.ddk.xtext.scope.ui/pom.xml
index 26c64ba84..b76a881ef 100644
--- a/com.avaloq.tools.ddk.xtext.scope.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.scope.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF
index 0b0660456..7eae1d87f 100644
--- a/com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.scope
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.scope;singleton:=true
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.xtext,
diff --git a/com.avaloq.tools.ddk.xtext.scope/pom.xml b/com.avaloq.tools.ddk.xtext.scope/pom.xml
index 5c12e96e9..e643cc20c 100644
--- a/com.avaloq.tools.ddk.xtext.scope/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.scope/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF
index ef4fcb1af..a85b76627 100644
--- a/com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.test.core
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.test.core;singleton:=true
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.avaloq.tools.ddk.xtext,
diff --git a/com.avaloq.tools.ddk.xtext.test.core/pom.xml b/com.avaloq.tools.ddk.xtext.test.core/pom.xml
index e20b0085c..7cf0ee08b 100644
--- a/com.avaloq.tools.ddk.xtext.test.core/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.test.core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF
index 653df6345..30cef4055 100644
--- a/com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.test;singleton:=true
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.test/pom.xml b/com.avaloq.tools.ddk.xtext.test/pom.xml
index 9b14bda2d..dfc4b5241 100644
--- a/com.avaloq.tools.ddk.xtext.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF
index 06e9e178a..2100e19ad 100644
--- a/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.ui.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.ui.test;singleton:=true
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.xtext.ui,
diff --git a/com.avaloq.tools.ddk.xtext.ui.test/pom.xml b/com.avaloq.tools.ddk.xtext.ui.test/pom.xml
index 62c2411a0..86711ea74 100644
--- a/com.avaloq.tools.ddk.xtext.ui.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.ui.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.ui/META-INF/MANIFEST.MF
index 21b50a351..9963b8f15 100644
--- a/com.avaloq.tools.ddk.xtext.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.ui;singleton:=true
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.ui/pom.xml b/com.avaloq.tools.ddk.xtext.ui/pom.xml
index 1c05ab504..089c03b77 100644
--- a/com.avaloq.tools.ddk.xtext.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.valid.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.valid.generator/META-INF/MANIFEST.MF
index 035251de5..6e892816d 100644
--- a/com.avaloq.tools.ddk.xtext.valid.generator/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.valid.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.valid.generator
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.valid.generator;singleton:=true
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.avaloq.tools.ddk.xtext.valid;visibility:=reexport,
diff --git a/com.avaloq.tools.ddk.xtext.valid.generator/pom.xml b/com.avaloq.tools.ddk.xtext.valid.generator/pom.xml
index 76c6c92f0..4d24dca2d 100644
--- a/com.avaloq.tools.ddk.xtext.valid.generator/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.valid.generator/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.valid.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.valid.test/META-INF/MANIFEST.MF
index 0a90051d6..0bbcc9181 100644
--- a/com.avaloq.tools.ddk.xtext.valid.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.valid.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.valid.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.valid.test;singleton:=true
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.valid.test/pom.xml b/com.avaloq.tools.ddk.xtext.valid.test/pom.xml
index ac49fe8f5..3fdc9ca3e 100644
--- a/com.avaloq.tools.ddk.xtext.valid.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.valid.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.valid.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.valid.ui/META-INF/MANIFEST.MF
index a0e7affbe..10234f339 100644
--- a/com.avaloq.tools.ddk.xtext.valid.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.valid.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.valid.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.valid.ui;singleton:=true
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.valid.ui/pom.xml b/com.avaloq.tools.ddk.xtext.valid.ui/pom.xml
index ee78264a8..4c696f009 100644
--- a/com.avaloq.tools.ddk.xtext.valid.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.valid.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.valid/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.valid/META-INF/MANIFEST.MF
index 615d29e3b..d2339bf03 100644
--- a/com.avaloq.tools.ddk.xtext.valid/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.valid/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.valid
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.valid;singleton:=true
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.valid/pom.xml b/com.avaloq.tools.ddk.xtext.valid/pom.xml
index e9f1f6052..e559ff091 100644
--- a/com.avaloq.tools.ddk.xtext.valid/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.valid/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext/META-INF/MANIFEST.MF
index 99d3c2463..10304035e 100644
--- a/com.avaloq.tools.ddk.xtext/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext;singleton:=true
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext/pom.xml b/com.avaloq.tools.ddk.xtext/pom.xml
index 009e10e48..9786a3884 100644
--- a/com.avaloq.tools.ddk.xtext/pom.xml
+++ b/com.avaloq.tools.ddk.xtext/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtextspy.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtextspy.test/META-INF/MANIFEST.MF
index a52af8c0f..e8d00c5f2 100644
--- a/com.avaloq.tools.ddk.xtextspy.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtextspy.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtextspy.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtextspy.test;singleton:=true
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtextspy.test/pom.xml b/com.avaloq.tools.ddk.xtextspy.test/pom.xml
index a749fd823..e74819458 100644
--- a/com.avaloq.tools.ddk.xtextspy.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtextspy.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtextspy/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtextspy/META-INF/MANIFEST.MF
index 81e3aead8..5804e8c15 100644
--- a/com.avaloq.tools.ddk.xtextspy/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtextspy/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Eclipse-ExtensibleAPI: true
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtextspy
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtextspy; singleton:=true
-Bundle-Version: 1.4.0.v20180604-1412-REL
+Bundle-Version: 1.5.0.qualifier
 Bundle-Activator: com.avaloq.tools.ddk.xtextspy.internal.Activator
 Bundle-Vendor: Avaloq Evolution AG
 Require-Bundle: org.eclipse.ui,
diff --git a/com.avaloq.tools.ddk.xtextspy/pom.xml b/com.avaloq.tools.ddk.xtextspy/pom.xml
index 8d15addab..11e7ff070 100644
--- a/com.avaloq.tools.ddk.xtextspy/pom.xml
+++ b/com.avaloq.tools.ddk.xtextspy/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/ddk-parent/pom.xml b/ddk-parent/pom.xml
index 0cbb82a4e..f57a24d65 100644
--- a/ddk-parent/pom.xml
+++ b/ddk-parent/pom.xml
@@ -7,7 +7,7 @@
 
   <groupId>com.avaloq.tools.ddk</groupId>
   <artifactId>ddk-parent</artifactId>
-  <version>1.4.0.v20180604-1412-REL</version>
+  <version>1.5.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
diff --git a/ddk-repository/category.xml b/ddk-repository/category.xml
index da887eb64..f42bed345 100644
--- a/ddk-repository/category.xml
+++ b/ddk-repository/category.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/com.avaloq.tools.ddk.feature_1.4.0.v20180604-1412-REL.jar" id="com.avaloq.tools.ddk.feature" version="1.4.0.v20180604-1412-REL">
+   <feature url="features/com.avaloq.tools.ddk.feature_1.5.0.qualifier.jar" id="com.avaloq.tools.ddk.feature" version="1.5.0.qualifier">
       <category name="com.avaloq.tools.ddk.sdk"/>
    </feature>
-   <feature url="features/com.avaloq.tools.ddk.source.feature_1.4.0.v20180604-1412-REL.jar" id="com.avaloq.tools.ddk.source.feature" version="1.4.0.v20180604-1412-REL">
+   <feature url="features/com.avaloq.tools.ddk.source.feature_1.5.0.qualifier.jar" id="com.avaloq.tools.ddk.source.feature" version="1.5.0.qualifier">
       <category name="com.avaloq.tools.ddk.sdk"/>
    </feature>
-   <feature url="features/com.avaloq.tools.ddk.runtime.feature_1.4.0.v20180604-1412-REL.jar" id="com.avaloq.tools.ddk.runtime.feature" version="1.4.0.v20180604-1412-REL">
+   <feature url="features/com.avaloq.tools.ddk.runtime.feature_1.5.0.qualifier.jar" id="com.avaloq.tools.ddk.runtime.feature" version="1.5.0.qualifier">
       <category name="com.avaloq.tools.ddk.runtime"/>
    </feature>
-   <feature url="features/com.avaloq.tools.ddk.runtime.source.feature_1.4.0.v20180604-1412-REL.jar" id="com.avaloq.tools.ddk.runtime.source.feature" version="1.4.0.v20180604-1412-REL">
+   <feature url="features/com.avaloq.tools.ddk.runtime.source.feature_1.5.0.qualifier.jar" id="com.avaloq.tools.ddk.runtime.source.feature" version="1.5.0.qualifier">
       <category name="com.avaloq.tools.ddk.runtime"/>
    </feature>
    <category-def name="com.avaloq.tools.ddk.sdk" label="DSL Developer Kit"/>
diff --git a/ddk-repository/pom.xml b/ddk-repository/pom.xml
index bc2e88a76..6656dfec5 100644
--- a/ddk-repository/pom.xml
+++ b/ddk-repository/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/ddk-target/pom.xml b/ddk-target/pom.xml
index cd3b79ebf..fa3e8298b 100644
--- a/ddk-target/pom.xml
+++ b/ddk-target/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.4.0.v20180604-1412-REL</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>

From 54569fa4f709bc46cbfbb5bfd20cb751eb378e8f Mon Sep 17 00:00:00 2001
From: Dimo Petroff <dpetroff.github@gmail.com>
Date: Mon, 11 Jun 2018 11:38:49 +0100
Subject: [PATCH 18/56] Enhance EObjectUtil#eContainer to alternatively accept
 a predicate.

---
 .../tools/ddk/xtext/util/EObjectUtil.java     | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/util/EObjectUtil.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/util/EObjectUtil.java
index 0c8e2f76b..87d2aa5bb 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/util/EObjectUtil.java
+++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/util/EObjectUtil.java
@@ -32,13 +32,7 @@ public final class EObjectUtil {
   /**
    * Predicate to filter out null and EMF proxy objects. I.e. only non-null and non-proxy objects pass this predicate.
    */
-  private static final Predicate<EObject> PROXY_FILTER = new Predicate<EObject>() {
-    /** {@inheritDoc} */
-    @Override
-    public boolean apply(final EObject input) {
-      return input != null && !input.eIsProxy();
-    }
-  };
+  private static final Predicate<EObject> PROXY_FILTER = input -> input != null && !input.eIsProxy();
 
   /** Inhibit public instantiation. */
   private EObjectUtil() {
@@ -59,9 +53,23 @@ private EObjectUtil() {
    */
   @SuppressWarnings("unchecked")
   public static <T extends EObject> T eContainer(final EObject obj, final Class<T> type) {
+    return (T) eContainer(obj, e -> type.isInstance(e));
+  }
+
+  /**
+   * Find a direct or indirect container that satisfies a given predicate. If no such container exists, return null. If the
+   * object itself satisfies it, return the object.
+   *
+   * @param obj
+   *          the object
+   * @param predicate
+   *          the predicate
+   * @return The container, as described above.
+   */
+  public static EObject eContainer(final EObject obj, final Predicate<EObject> predicate) {
     for (EObject e = obj; e != null; e = e.eContainer()) {
-      if (type.isInstance(e)) {
-        return (T) e;
+      if (predicate.apply(e)) {
+        return e;
       }
     }
     return null;

From 807118c8d7a6ead38fc98ef2c1655069e533c91b Mon Sep 17 00:00:00 2001
From: Roman Mitin <roman.mitin@avaloq.com>
Date: Wed, 13 Jun 2018 17:39:18 +0200
Subject: [PATCH 19/56] Remove guava version constraint

---
 com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.xtext/META-INF/MANIFEST.MF           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF
index 4e8a7cd6f..21d1619d0 100644
--- a/com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.jface,
  com.avaloq.tools.ddk.xtext.expression,
  com.avaloq.tools.ddk.xtext.expression.ui,
  org.eclipse.xtend.util.stdlib,
- com.google.guava;bundle-version="[10.0.0,19.0.0)",
+ com.google.guava,
  com.avaloq.tools.ddk.xtext.ui,
  org.eclipse.xtend.lib,
  org.eclipse.jdt.core
diff --git a/com.avaloq.tools.ddk.xtext/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext/META-INF/MANIFEST.MF
index 0dffb2b1a..bb91c59c7 100644
--- a/com.avaloq.tools.ddk.xtext/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.4.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
-Require-Bundle: com.google.guava;bundle-version="[10.0.0,19.0.0)",
+Require-Bundle: com.google.guava,
  org.apache.commons.lang,
  org.eclipse.core.resources,
  org.eclipse.core.runtime,

From e800f373f3e00f7eb6fdf933a09c8e0b6a6c7295 Mon Sep 17 00:00:00 2001
From: Dimo Petroff <dpetroff.github@gmail.com>
Date: Mon, 18 Jun 2018 16:45:19 +0100
Subject: [PATCH 20/56] Provide convenience methods to conditionally expect
 markers in tests.

---
 .../validation/AbstractValidationTest.java    | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/validation/AbstractValidationTest.java b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/validation/AbstractValidationTest.java
index b1c0ce353..fde704804 100644
--- a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/validation/AbstractValidationTest.java
+++ b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/validation/AbstractValidationTest.java
@@ -556,6 +556,24 @@ protected String info(final String issueCode, final String message) {
     return addAssertion(new XtextDiagnosticAssertion(issueCode, true, Diagnostic.INFO, message));
   }
 
+  /**
+   * Register a new validation marker with the given issue code. Expects a warning if the condition is {@code true}, no diagnostic otherwise.
+   *
+   * @param condition
+   *          the condition when the marker is expected
+   * @param issueCode
+   *          issue code (usually found as static constant of the JavaValidator class of the DSL being tested)
+   * @return
+   *         unique marker that can be used in the input string to mark a position that should be validated
+   */
+  protected String warningIf(final boolean condition, final String issueCode) {
+    if (condition) {
+      return warning(issueCode);
+    } else {
+      return noDiagnostic(issueCode);
+    }
+  }
+
   /**
    * Register a new validation marker with the given issue code. Expects a warning.
    *
@@ -582,6 +600,24 @@ protected String warning(final String issueCode, final String message) {
     return addAssertion(new XtextDiagnosticAssertion(issueCode, true, Diagnostic.WARNING, message));
   }
 
+  /**
+   * Register a new validation marker with the given issue code. Expects an error if the condition is {@code true}, no diagnostic otherwise.
+   *
+   * @param condition
+   *          the condition when the marker is expected
+   * @param issueCode
+   *          issue code (usually found as static constant of the JavaValidator class of the DSL being tested)
+   * @return
+   *         unique marker that can be used in the input string to mark a position that should be validated
+   */
+  protected String errorIf(final boolean condition, final String issueCode) {
+    if (condition) {
+      return error(issueCode);
+    } else {
+      return noDiagnostic(issueCode);
+    }
+  }
+
   /**
    * Register a new validation marker with the given issue code. Expects an error.
    *

From 2cc2755a78fdabf2165784328ae6e129f1cec210 Mon Sep 17 00:00:00 2001
From: Knut Wannheden <knut.wannheden@avaloq.com>
Date: Wed, 20 Jun 2018 15:53:00 +0200
Subject: [PATCH 21/56] #117: Fix memory leak in AbstractTypeProvider

Making ComputationData static fixes the memory leak as the values then
no longer reference the ThreadLocal object (preventing the garbage
collection).

This commit also improves AbstractPolymorphicScopeProvider by not doing
unnecessary work in getVisibleContainers() which results in quite a lot
of String (and char[]) objects which need to be garbage collected.
---
 .../ddk/typesystem/AbstractTypeProvider.java  | 65 ++++++++-----------
 .../AbstractPolymorphicScopeProvider.java     |  9 +--
 2 files changed, 33 insertions(+), 41 deletions(-)

diff --git a/com.avaloq.tools.ddk.typesystem/src/com/avaloq/tools/ddk/typesystem/AbstractTypeProvider.java b/com.avaloq.tools.ddk.typesystem/src/com/avaloq/tools/ddk/typesystem/AbstractTypeProvider.java
index 6f3f8825b..a6e52babe 100644
--- a/com.avaloq.tools.ddk.typesystem/src/com/avaloq/tools/ddk/typesystem/AbstractTypeProvider.java
+++ b/com.avaloq.tools.ddk.typesystem/src/com/avaloq/tools/ddk/typesystem/AbstractTypeProvider.java
@@ -13,6 +13,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
+import java.util.function.Function;
 
 import org.apache.log4j.Logger;
 import org.eclipse.emf.ecore.EObject;
@@ -101,7 +102,22 @@ public int hashCode() {
    * @param <T>
    *          the type of the items we iterate over
    */
-  abstract class AbstractCyclicHandlingSupport<T> {
+  abstract static class AbstractCyclicHandlingSupport<T> {
+
+    /**
+     * A thread local that holds the ongoing type computations.
+     */
+    private final ThreadLocal<ComputationData<T>> ongoing = ThreadLocal.withInitial(ComputationData::new);
+
+    /**
+     * Gets the ongoing, thread-local computations.
+     *
+     * @return the ongoing, thread-local computations
+     */
+    protected ComputationData<T> getTypeComputations() {
+      ThreadLocal<ComputationData<T>> computations = ongoing;
+      return computations.get();
+    }
 
     private final OnChangeEvictingCache typeReferenceAwareCache = new OnChangeEvictingCache() {
 
@@ -144,8 +160,11 @@ public <E> E get(final Object key, final Resource resource, final Provider<E> pr
 
     /**
      * Holds the set of items being computed.
+     *
+     * @param <T>
+     *          the type of the items we iterate over
      */
-    protected class ComputationData {
+    protected static class ComputationData<T> {
       private final Set<T> computations = Sets.newHashSet();
       private ImmutableLinkedItem<T> queryState;
       private Resource resource;
@@ -156,13 +175,15 @@ protected class ComputationData {
        *
        * @param t
        *          the item to add
-       * @return true if {@code t} was added to the set, i.e., was not already present
+       * @param resourceMapper
+       *          function returning resource of primary object for {@code t}, must not be {@code null}
+       * @return {@code true} if {@code t} was added to the set, i.e., was not already present
        */
-      protected boolean add(final T t) {
+      protected boolean add(final T t, final Function<T, Resource> resourceMapper) {
         boolean result = computations.add(t);
         if (result) {
           if (queryState == null) {
-            resource = getPrimaryEObject(t).eResource();
+            resource = resourceMapper.apply(t);
           }
           queryState = new ImmutableLinkedItem<T>(t, queryState);
         }
@@ -202,26 +223,6 @@ protected int size() {
      */
     protected abstract EObject getPrimaryEObject(T t);
 
-    /**
-     * A thread local that holds the ongoing type computations.
-     */
-    private final ThreadLocal<ComputationData> ongoingComputations = new ThreadLocal<ComputationData>() {
-      @Override
-      protected ComputationData initialValue() {
-        return createComputationData();
-      }
-    };
-
-    /**
-     * Gets the ongoing, thread-local computations.
-     *
-     * @return the ongoing, thread-local computations
-     */
-    protected ComputationData getTypeComputations() {
-      ThreadLocal<ComputationData> computations = ongoingComputations;
-      return computations.get();
-    }
-
     /**
      * Gets the type for an item.
      *
@@ -237,8 +238,8 @@ public IType getType(final T t) {
       if (eObject == null || eObject.eIsProxy()) {
         return null;
       }
-      ComputationData computationData = getTypeComputations();
-      if (computationData.add(t)) {
+      ComputationData<T> computationData = getTypeComputations();
+      if (computationData.add(t, k -> getPrimaryEObject(k).eResource())) {
         try {
           if (computationData.resource == eObject.eResource() && !computationData.resourceLeftOrCyclic) {
             final boolean[] hit = new boolean[] {true};
@@ -302,15 +303,6 @@ protected int getOngoingComputationsSize() {
      * @return the type for {@code t}
      */
     protected abstract IType doHandleCyclicCall(T t);
-
-    /**
-     * Creates the initial computation data to get track of computations.
-     *
-     * @return the computation data
-     */
-    protected ComputationData createComputationData() {
-      return new ComputationData();
-    }
   }
 
   /**
@@ -632,4 +624,3 @@ protected ITypeProvider getTypeProviderFor(final EObject eObject) {
   }
 
 }
-
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/scoping/AbstractPolymorphicScopeProvider.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/scoping/AbstractPolymorphicScopeProvider.java
index a5e627c73..dfb386301 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/scoping/AbstractPolymorphicScopeProvider.java
+++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/scoping/AbstractPolymorphicScopeProvider.java
@@ -17,6 +17,7 @@
 import org.apache.log4j.Logger;
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.ENamedElement;
 import org.eclipse.emf.ecore.EObject;
@@ -319,11 +320,11 @@ protected List<IContainer> getVisibleContainers(final EObject context, final Res
     }
     final XtextResource rsc = (XtextResource) ctxRsc;
     // Cache these container lists, they're expensive to create
-    final String key = "CONTAINERCACHE&" + rsc.getURI().toString(); //$NON-NLS-1$
+    URI uri = rsc.getURI();
     List<IContainer> result = null;
-    final ResourceCache<String, List<IContainer>> cache = CacheManager.getInstance().getOrCreateResourceCache("AbstractPolymorphicScopeProvider#cache", rsc); //$NON-NLS-1$
+    final ResourceCache<URI, List<IContainer>> cache = CacheManager.getInstance().getOrCreateResourceCache("AbstractPolymorphicScopeProvider#visibleContainers", rsc); //$NON-NLS-1$
     if (cache != null) {
-      result = cache.get(key);
+      result = cache.get(uri);
       if (result != null) {
         return result;
       }
@@ -340,7 +341,7 @@ protected List<IContainer> getVisibleContainers(final EObject context, final Res
     final IResourceDescriptions resourceDescriptions = getResourceDescriptions(ctx.eResource());
     result = containerManager.getVisibleContainers(description, resourceDescriptions);
     if (cache != null) {
-      cache.set(key, result);
+      cache.set(uri, result);
     }
     return result;
   }

From bdab1c3d9d660e666c588231cf9038e3777841d4 Mon Sep 17 00:00:00 2001
From: Knut Wannheden <knut.wannheden@avaloq.com>
Date: Fri, 22 Jun 2018 13:32:35 +0200
Subject: [PATCH 22/56] Performance: Reduce memory footprint of index lookup
 AST

Reduces the footprint of the QualifiedNameSegmentTreeLookup by making
the SegmentNode class static, which reduces the padded object size from
32 bytes to 24 bytes.

This required adding a ValueSharingSegmentNode subclass (in order to be
able to remove the reference to the "shareValues" field and also making
the methods in ArrayUtils static.
---
 .../QualifiedNameSegmentTreeLookup.java       | 194 +++++++++++-------
 .../tools/ddk/xtext/naming/TreeSetLookup.java |  31 ++-
 .../tools/ddk/xtext/util/ArrayUtils.java      |  54 ++---
 3 files changed, 146 insertions(+), 133 deletions(-)

diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/naming/QualifiedNameSegmentTreeLookup.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/naming/QualifiedNameSegmentTreeLookup.java
index 3da2e5d9a..6bc8ece68 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/naming/QualifiedNameSegmentTreeLookup.java
+++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/naming/QualifiedNameSegmentTreeLookup.java
@@ -44,13 +44,14 @@ public class QualifiedNameSegmentTreeLookup<T> implements QualifiedNameLookup<T>
    */
   // CHECKSTYLE:CHECK-OFF ParameterAssignmentCheck
   // CHECKSTYLE:CHECK-OFF FinalParametersCheck
-  private class SegmentNode {
+  // CHECKSTYLE:CHECK-OFF VisibilityModifier
+  private static class SegmentNode {
 
-    private static final int DEFAULT_CHILD_CAPACITY = 4;
+    protected static final int DEFAULT_CHILD_CAPACITY = 4;
 
     private final String segment;
-    private T[] values;
-    private List<SegmentNode> children;
+    protected Object[] values;
+    protected List<SegmentNode> children;
 
     /**
      * Creates a new node for the given qualified name segment.
@@ -115,37 +116,20 @@ public SegmentNode find(final QualifiedName name, int segIdx, final boolean exac
      *          whether duplicate values should be excluded in the result
      * @return collection of all values mapped by the nodes in the given range, never {@code null}
      */
-    public Collection<T> matches(final QualifiedName lower, final int lowerIdx, final SegmentNode upper, final boolean recursive, final boolean excludeDuplicates) {
+    @SuppressWarnings("unchecked")
+    public <T> Collection<T> matches(final QualifiedName lower, final int lowerIdx, final SegmentNode upper, final boolean recursive, final boolean excludeDuplicates) {
       final Collection<T> result = excludeDuplicates ? Sets.<T> newHashSet() : Lists.<T> newArrayList();
-      if (shareValues) {
-        final Set<T[]> arrays = Sets.<T[]> newHashSet();
-        Visitor visitor = new Visitor() {
-          @Override
-          public void visit(final SegmentNode node) {
-            if (node.values != null) {
-              arrays.add(node.values);
+      Visitor visitor = new Visitor() {
+        @Override
+        public void visit(final SegmentNode node) {
+          if (node.values != null) {
+            for (Object value : node.values) {
+              result.add((T) value);
             }
           }
-        };
-        collectMatches(lower, lowerIdx, upper, recursive, visitor);
-        for (T[] array : arrays) {
-          for (T value : array) {
-            result.add(value);
-          }
         }
-      } else {
-        Visitor visitor = new Visitor() {
-          @Override
-          public void visit(final SegmentNode node) {
-            if (node.values != null) {
-              for (T value : node.values) {
-                result.add(value);
-              }
-            }
-          }
-        };
-        collectMatches(lower, lowerIdx, upper, recursive, visitor);
-      }
+      };
+      collectMatches(lower, lowerIdx, upper, recursive, visitor);
       return result;
     }
 
@@ -165,7 +149,7 @@ public void visit(final SegmentNode node) {
      * @return {@code false} if marker {@code upper} node was found and search should be stopped
      */
     @SuppressWarnings("PMD.CompareObjectsWithEquals")
-    private boolean collectMatches(final QualifiedName lower, int lowerIdx, final SegmentNode upper, final boolean recursive, final Visitor visitor) {
+    protected boolean collectMatches(final QualifiedName lower, int lowerIdx, final SegmentNode upper, final boolean recursive, final Visitor visitor) {
       if (children == null || this == upper) {
         return false;
       }
@@ -242,7 +226,7 @@ private boolean visitChildren(final Visitor visitor, final SegmentNode stopOn) {
      * @param newValues
      *          new values to associate qualified name with; if mappings already exist any missing mapping will be added
      */
-    public void merge(final QualifiedName name, int segIdx, final T[] newValues) { // NOPMD - varargs doesn't make sense here
+    public void merge(final QualifiedName name, int segIdx, final Object[] newValues) { // NOPMD - varargs doesn't make sense here
       if (children == null) {
         children = new ArrayList<SegmentNode>(DEFAULT_CHILD_CAPACITY);
       }
@@ -253,13 +237,13 @@ public void merge(final QualifiedName name, int segIdx, final T[] newValues) { /
         idx = -(idx + 1);
         children.add(idx, child);
         if (name.getSegmentCount() == segIdx) {
-          child.values = shareValues && Arrays.equals(values, newValues) ? values : newValues;
+          child.values = newValues;
           return;
         }
         child.merge(name, segIdx, newValues);
       } else if (name.getSegmentCount() == segIdx) {
-        T[] tmp = arrayUtils.addAll(children.get(idx).values, newValues);
-        children.get(idx).values = shareValues && Arrays.equals(values, tmp) ? values : tmp;
+        Object[] tmp = ArrayUtils.addAll(children.get(idx).values, newValues);
+        children.get(idx).values = tmp;
       } else {
         children.get(idx).merge(name, segIdx, newValues);
       }
@@ -280,12 +264,99 @@ public void accept(final Visitor visitor) {
       }
     }
 
+    /**
+     * Adopted from {@link java.util.Collections#binarySearch(List, Object)} which can't be used here because the element being searched has a different type.
+     *
+     * @param list
+     *          list of nodes to search
+     * @param key
+     *          key, corresponding to {@link SegmentNode#segment}, to search for
+     * @return index of found node or (-(insertion point) - 1)
+     */
+    protected int binarySearch(final List<SegmentNode> list, final String key) {
+      int low = 0;
+      int high = list.size() - 1;
+
+      while (low <= high) {
+        int mid = (low + high) >>> 1;
+        SegmentNode midVal = list.get(mid);
+        int cmp = midVal.segment.compareTo(key);
+
+        if (cmp < 0) {
+          low = mid + 1;
+        } else if (cmp > 0) {
+          high = mid - 1;
+        } else {
+          return mid; // key found
+        }
+      }
+      return -(low + 1); // key not found
+    }
+
     @Override
     public String toString() {
       return "Node(" + segment + ")"; //$NON-NLS-1$ //$NON-NLS-2$
     }
   }
 
+  /**
+   * Subclass which implements value sharing between nodes and child nodes to reduce the memory footprint.
+   */
+  private static class ValueSharingSegmentNode extends SegmentNode {
+
+    ValueSharingSegmentNode(final String segment) {
+      super(segment);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T> Collection<T> matches(final QualifiedName lower, final int lowerIdx, final SegmentNode upper, final boolean recursive, final boolean excludeDuplicates) {
+      final Collection<T> result = excludeDuplicates ? Sets.<T> newHashSet() : Lists.<T> newArrayList();
+      final Set<Object[]> arrays = Sets.newHashSet();
+      Visitor visitor = new Visitor() {
+        @Override
+        public void visit(final SegmentNode node) {
+          if (node.values != null) {
+            arrays.add(node.values);
+          }
+        }
+      };
+      collectMatches(lower, lowerIdx, upper, recursive, visitor);
+      for (Object[] array : arrays) {
+        for (Object value : array) {
+          result.add((T) value);
+        }
+      }
+      return result;
+    }
+
+    @Override
+    public void merge(final QualifiedName name, int segIdx, final Object[] newValues) { // NOPMD - varargs doesn't make sense here
+      if (children == null) {
+        children = new ArrayList<SegmentNode>(DEFAULT_CHILD_CAPACITY);
+      }
+      String seg = name.getSegment(segIdx++);
+      int idx = binarySearch(children, seg);
+      if (idx < 0) {
+        SegmentNode child = new ValueSharingSegmentNode(seg);
+        idx = -(idx + 1);
+        children.add(idx, child);
+        if (name.getSegmentCount() == segIdx) {
+          child.values = Arrays.equals(values, newValues) ? values : newValues;
+          return;
+        }
+        child.merge(name, segIdx, newValues);
+      } else if (name.getSegmentCount() == segIdx) {
+        Object[] tmp = ArrayUtils.addAll(children.get(idx).values, newValues);
+        children.get(idx).values = Arrays.equals(values, tmp) ? values : tmp;
+      } else {
+        children.get(idx).merge(name, segIdx, newValues);
+      }
+    }
+
+  }
+
+  // CHECKSTYLE:CHECK-ON VisibilityModifier
   // CHECKSTYLE:CHECK-ON ParameterAssignmentCheck
   // CHECKSTYLE:CHECK-ON FinalParametersCheck
 
@@ -293,7 +364,7 @@ public String toString() {
    * A visitor to visit the nodes of the tree in a {@link SegmentNode#accept(Visitor) depth-first order}.
    */
   // CHECKSTYLE:CHECK-OFF AbstractClassNameCheck
-  private abstract class Visitor {
+  private abstract static class Visitor {
     // CHECKSTYLE:CHECK-ON AbstractClassNameCheck
     /**
      * Visits the given tree node.
@@ -304,19 +375,14 @@ private abstract class Visitor {
     public abstract void visit(final SegmentNode node);
   }
 
-  private final ArrayUtils<T> arrayUtils;
   private final SegmentNode root;
-  private final boolean shareValues;
 
   private long size;
   private long hits;
   private long misses;
 
-  public QualifiedNameSegmentTreeLookup(final Class<T> elementType, final boolean shareValues) {
-    arrayUtils = ArrayUtils.of(elementType);
-    this.shareValues = shareValues;
-
-    root = new SegmentNode(""); //$NON-NLS-1$
+  public QualifiedNameSegmentTreeLookup(final Class<T> elementType, final boolean shareValues) { // NOPMD
+    root = shareValues ? new ValueSharingSegmentNode("") : new SegmentNode(""); //$NON-NLS-1$ //$NON-NLS-2$
     init();
   }
 
@@ -333,6 +399,7 @@ private void init() {
   }
 
   /** {@inheritDoc} */
+  @SuppressWarnings("unchecked")
   @Override
   public Collection<T> get(final QualifiedName name) {
     if (name.isEmpty()) {
@@ -341,7 +408,7 @@ public Collection<T> get(final QualifiedName name) {
     SegmentNode result = root.find(name, 0, true);
     if (result != null && result.values != null) {
       hits++;
-      return Arrays.asList(result.values);
+      return (Collection<T>) Arrays.asList(result.values);
     } else {
       misses++;
       return null;
@@ -354,7 +421,7 @@ public void removeMappings(final T value) {
     root.accept(new Visitor() {
       @Override
       public void visit(final SegmentNode node) {
-        T[] newValues = arrayUtils.remove(node.values, value);
+        Object[] newValues = ArrayUtils.remove(node.values, value);
         if (newValues != node.values) {
           node.values = newValues;
           size--;
@@ -369,35 +436,6 @@ public void clear() {
     init();
   }
 
-  /**
-   * Adopted from {@link java.util.Collections#binarySearch(List, Object)} which can't be used here because the element being searched has a different type.
-   *
-   * @param list
-   *          list of nodes to search
-   * @param key
-   *          key, corresponding to {@link SegmentNode#segment}, to search for
-   * @return index of found node or (-(insertion point) - 1)
-   */
-  private int binarySearch(final List<SegmentNode> list, final String key) {
-    int low = 0;
-    int high = list.size() - 1;
-
-    while (low <= high) {
-      int mid = (low + high) >>> 1;
-      SegmentNode midVal = list.get(mid);
-      int cmp = midVal.segment.compareTo(key);
-
-      if (cmp < 0) {
-        low = mid + 1;
-      } else if (cmp > 0) {
-        high = mid - 1;
-      } else {
-        return mid; // key found
-      }
-    }
-    return -(low + 1); // key not found
-  }
-
   /** {@inheritDoc} */
   @Override
   public Collection<T> get(final QualifiedNamePattern pattern, final boolean excludeDuplicates) {
@@ -407,7 +445,7 @@ public Collection<T> get(final QualifiedNamePattern pattern, final boolean exclu
   /** {@inheritDoc} */
   @Override
   public void put(final QualifiedName name, final T value) {
-    T[] values = arrayUtils.newArray(1);
+    Object[] values = ArrayUtils.newArray(1);
     values[0] = value;
     size++;
     root.merge(name, 0, values);
@@ -417,7 +455,7 @@ public void put(final QualifiedName name, final T value) {
   @Override
   public void putAll(final QualifiedName name, final Collection<T> values) {
     size += values.size();
-    root.merge(name, 0, values.toArray(arrayUtils.newArray(values.size())));
+    root.merge(name, 0, values.toArray(ArrayUtils.newArray(values.size())));
   }
 
   /** {@inheritDoc} */
@@ -425,7 +463,7 @@ public void putAll(final QualifiedName name, final Collection<T> values) {
   public void remove(final QualifiedName name, final T value) {
     SegmentNode node = root.find(name, 0, true);
     if (node != null) {
-      T[] newValues = arrayUtils.remove(node.values, value);
+      Object[] newValues = ArrayUtils.remove(node.values, value);
       if (newValues != node.values) {
         node.values = newValues;
         size--;
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/naming/TreeSetLookup.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/naming/TreeSetLookup.java
index b218bae12..1b84b0ee2 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/naming/TreeSetLookup.java
+++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/naming/TreeSetLookup.java
@@ -31,20 +31,15 @@
  */
 public class TreeSetLookup<T> implements QualifiedNameLookup<T> {
 
-  private final ArrayUtils<T> arrayUtils;
-  private final SortedMap<QualifiedName, T[]> lookupMap = Maps.newTreeMap(new QualifiedNamePattern.Comparator());
+  private final SortedMap<QualifiedName, Object[]> lookupMap = Maps.newTreeMap(new QualifiedNamePattern.Comparator());
 
   private long hits;
   private long misses;
 
-  public TreeSetLookup(final Class<T> elementType) {
-    arrayUtils = ArrayUtils.of(elementType);
-  }
-
   /** {@inheritDoc} */
   @Override
   public void putAll(final QualifiedName name, final Collection<T> values) {
-    lookupMap.put(name, arrayUtils.addAll(lookupMap.get(name), values.toArray(arrayUtils.newArray(values.size()))));
+    lookupMap.put(name, ArrayUtils.addAll(lookupMap.get(name), values.toArray(ArrayUtils.newArray(values.size()))));
   }
 
   /** {@inheritDoc} */
@@ -54,12 +49,13 @@ public void clear() {
   }
 
   /** {@inheritDoc} */
+  @SuppressWarnings("unchecked")
   @Override
   public Collection<T> get(final QualifiedName name) {
-    T[] values = lookupMap.get(name);
+    Object[] values = lookupMap.get(name);
     if (values != null) {
       hits++;
-      return Lists.newArrayList(values);
+      return (Collection<T>) Lists.newArrayList(values);
     } else {
       misses++;
       return null;
@@ -69,7 +65,8 @@ public Collection<T> get(final QualifiedName name) {
   /** {@inheritDoc} */
   @Override
   public Collection<T> get(final QualifiedNamePattern pattern, final boolean excludeDuplicates) {
-    Collection<T> result = pattern.findNestedArrayMatches(lookupMap, excludeDuplicates);
+    @SuppressWarnings("unchecked")
+    Collection<T> result = (Collection<T>) pattern.findNestedArrayMatches(lookupMap, excludeDuplicates);
     if (result.isEmpty()) {
       misses++;
     } else {
@@ -81,11 +78,11 @@ public Collection<T> get(final QualifiedNamePattern pattern, final boolean exclu
   /** {@inheritDoc} */
   @Override
   public void removeMappings(final T value) {
-    Iterator<Map.Entry<QualifiedName, T[]>> iter = lookupMap.entrySet().iterator();
+    Iterator<Map.Entry<QualifiedName, Object[]>> iter = lookupMap.entrySet().iterator();
     while (iter.hasNext()) {
-      Map.Entry<QualifiedName, T[]> entry = iter.next();
-      T[] values = entry.getValue();
-      T[] removed = arrayUtils.remove(values, value);
+      Map.Entry<QualifiedName, Object[]> entry = iter.next();
+      Object[] values = entry.getValue();
+      Object[] removed = ArrayUtils.remove(values, value);
       if (removed == null) {
         // No need to keep around names that don't occur anywhere.
         iter.remove();
@@ -102,15 +99,15 @@ public void removeMappings(final T value) {
   /** {@inheritDoc} */
   @Override
   public void put(final QualifiedName name, final T value) {
-    lookupMap.put(name, arrayUtils.add(lookupMap.get(name), value));
+    lookupMap.put(name, ArrayUtils.add(lookupMap.get(name), value));
   }
 
   /** {@inheritDoc} */
   @Override
   public void remove(final QualifiedName name, final T value) {
-    T[] values = lookupMap.get(name);
+    Object[] values = lookupMap.get(name);
     if (values != null) {
-      values = arrayUtils.remove(values, value);
+      values = ArrayUtils.remove(values, value);
       if (values != null) {
         lookupMap.put(name, values);
       } else {
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/util/ArrayUtils.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/util/ArrayUtils.java
index fd0b2260b..ee17f8cd7 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/util/ArrayUtils.java
+++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/util/ArrayUtils.java
@@ -10,35 +10,13 @@
  *******************************************************************************/
 package com.avaloq.tools.ddk.xtext.util;
 
-import com.google.common.collect.ObjectArrays;
-
-
 /**
  * Collects various utility operations on arrays.
- *
- * @param <T>
- *          generic element type
  */
-public final class ArrayUtils<T> {
+public final class ArrayUtils {
 
-  private final Class<T> componentType;
-
-  private ArrayUtils(final Class<T> componentType) {
-    this.componentType = componentType;
-  }
-
-  /**
-   * Creates a new instance of ArrayUtils for the given component type.
-   *
-   * @param <T>
-   *          generic element type
-   * @param componentType
-   *          component type, must not be {@code null}
-   * @return new ArrayUtils instance, never {@code null}
-   */
-  @SuppressWarnings("PMD.ShortMethodName")
-  public static <T> ArrayUtils<T> of(final Class<T> componentType) {
-    return new ArrayUtils<T>(componentType);
+  private ArrayUtils() {
+    // not instantiatable
   }
 
   /**
@@ -48,8 +26,8 @@ public static <T> ArrayUtils<T> of(final Class<T> componentType) {
    *          length of array to create
    * @return new array, never {@code null}
    */
-  public T[] newArray(final int length) {
-    return ObjectArrays.newArray(componentType, length);
+  public static Object[] newArray(final int length) {
+    return new Object[length];
   }
 
   /**
@@ -65,16 +43,16 @@ public T[] newArray(final int length) {
    *         If the array already contained the new value, the return value is == identical
    *         to the array passed in.
    */
-  public T[] add(final T[] array, final T value) {
+  public static Object[] add(final Object[] array, final Object value) {
     if (array == null || array.length == 0) {
-      T[] result = ObjectArrays.newArray(componentType, 1);
+      Object[] result = newArray(1);
       result[0] = value;
       return result;
     }
     int i = find(array, value);
     if (i < 0) {
       // Not found: add value
-      T[] newArray = ObjectArrays.newArray(componentType, array.length + 1);
+      Object[] newArray = newArray(array.length + 1);
       System.arraycopy(array, 0, newArray, 0, array.length);
       newArray[array.length] = value;
       return newArray;
@@ -95,17 +73,17 @@ public T[] add(final T[] array, final T value) {
    *         If the array already contained the new value, the return value is == identical
    *         to the array passed in.
    */
-  @SuppressWarnings(value="PMD.UseVarargs")
-  public T[] addAll(final T[] array, final T[] values) {
+  @SuppressWarnings(value = "PMD.UseVarargs")
+  public static Object[] addAll(final Object[] array, final Object[] values) {
     if (array == null || array.length == 0) {
       return values;
     }
-    T[] result = array;
-    for (T value : values) {
+    Object[] result = array;
+    for (Object value : values) {
       int i = find(array, value);
       if (i < 0) {
         // Not found: add value
-        T[] tmp = ObjectArrays.newArray(componentType, result.length + 1);
+        Object[] tmp = newArray(result.length + 1);
         System.arraycopy(result, 0, tmp, 0, result.length);
         tmp[result.length] = value;
         result = tmp;
@@ -126,7 +104,7 @@ public T[] addAll(final T[] array, final T[] values) {
    *         the original array. If the original array does not contain the given value, the returned
    *         array is == identical to the array passed in.
    */
-  public T[] remove(final T[] array, final T value) {
+  public static Object[] remove(final Object[] array, final Object value) {
     if (array == null) {
       return null;
     }
@@ -136,7 +114,7 @@ public T[] remove(final T[] array, final T value) {
     }
     if (i >= 0) {
       // Found it: remove value. i is guaranteed to be < array.length here.
-      T[] newArray = ObjectArrays.newArray(componentType, array.length - 1);
+      Object[] newArray = newArray(array.length - 1);
       if (i > 0) {
         System.arraycopy(array, 0, newArray, 0, i);
       }
@@ -157,7 +135,7 @@ public T[] remove(final T[] array, final T value) {
    *          to find; must not be {@code null}
    * @return the smallest index i; i >= 0 && i < array.length, such that value.equals(array[i]) == true, or -1 if there is no such value in the array.
    */
-  public int find(final T[] array, final T value) {
+  public static int find(final Object[] array, final Object value) {
     if (array == null) {
       return -1;
     }

From 418bc9789e6eefc3498687269c8431a26e5114ce Mon Sep 17 00:00:00 2001
From: Dimo Petroff <dpetroff.github@gmail.com>
Date: Tue, 26 Jun 2018 15:33:47 +0100
Subject: [PATCH 23/56] #120: Do not ignore the index of diagnostics in
 validation tests

AbstractValidationTest now considers the expected index in the multi-
value features when considering diagnostic position equality.
---
 .../test/validation/AbstractValidationTest.java      | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/validation/AbstractValidationTest.java b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/validation/AbstractValidationTest.java
index fde704804..61bbed078 100644
--- a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/validation/AbstractValidationTest.java
+++ b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/validation/AbstractValidationTest.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package com.avaloq.tools.ddk.xtext.test.validation;
 
+import static org.eclipse.xtext.validation.ValidationMessageAcceptor.INSIGNIFICANT_INDEX;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -245,10 +246,13 @@ private boolean diagnosticPositionEquals(final Integer pos, final AbstractValida
             return true;
           }
         } else {
-          for (INode node : nodes) {
-            INode firstNonHiddenLeafNode = getXtextTestUtil().findFirstNonHiddenLeafNode(node);
-            if (firstNonHiddenLeafNode.getTotalOffset() == pos) {
-              return true;
+          int avdIndex = ((FeatureBasedDiagnostic) avd).getIndex();
+          for (int i = 0; i < nodes.size(); i++) {
+            if (avdIndex == INSIGNIFICANT_INDEX || avdIndex == i) {
+              INode firstNonHiddenLeafNode = getXtextTestUtil().findFirstNonHiddenLeafNode(nodes.get(i));
+              if (firstNonHiddenLeafNode.getTotalOffset() == pos) {
+                return true;
+              }
             }
           }
         }

From a56e86a00f07e50c31e4da20b70fe6af061a904a Mon Sep 17 00:00:00 2001
From: Knut Wannheden <knut.wannheden@avaloq.com>
Date: Fri, 22 Jun 2018 12:02:32 +0200
Subject: [PATCH 24/56] Improve performance of fragment providers

Improves the URI fragment computation in AbstractFragmentProvider and
all AbstractSelectorFragmentProvider based implementations by allocating
less StringBuilders and Strings (and hence less char[] objects). This is
achieved by reusing the same three StringBuilder instances while
computing the URI fragment (see AbstractFragmentProvider#getFragment()).

To achieve this the abstract method getFragmentSegment(EObject) was
replaced with appendFragmentSegment(EObject, StringBuilder).

The Export DSL generator was adjusted accordingly.
---
 .../generator/FragmentProviderGenerator.xtend |  18 +--
 .../linking/AbstractFragmentProviderTest.java |  19 +--
 .../AbstractSelectorFragmentProviderTest.java |  32 +++--
 .../linking/AbstractFragmentProvider.java     | 117 +++++++++---------
 .../xtext/linking/ShortFragmentProvider.java  |  17 ++-
 .../AbstractExportFeatureExtension.java       |   4 +-
 .../AbstractSelectorFragmentProvider.java     |  56 +++++----
 .../DefaultExportFeatureExtensionService.java |  11 +-
 .../ddk/xtext/resource/IExportComputer.java   |   8 +-
 .../PatternAwareEObjectDescriptionLookUp.java |   7 +-
 10 files changed, 149 insertions(+), 140 deletions(-)

diff --git a/com.avaloq.tools.ddk.xtext.export/src/com/avaloq/tools/ddk/xtext/export/generator/FragmentProviderGenerator.xtend b/com.avaloq.tools.ddk.xtext.export/src/com/avaloq/tools/ddk/xtext/export/generator/FragmentProviderGenerator.xtend
index b3c84ee16..5bba61c4a 100644
--- a/com.avaloq.tools.ddk.xtext.export/src/com/avaloq/tools/ddk/xtext/export/generator/FragmentProviderGenerator.xtend
+++ b/com.avaloq.tools.ddk.xtext.export/src/com/avaloq/tools/ddk/xtext/export/generator/FragmentProviderGenerator.xtend
@@ -41,7 +41,7 @@ class FragmentProviderGenerator {
       public class «getFragmentProvider().toSimpleName()» extends AbstractSelectorFragmentProvider {
 
         @Override
-        public CharSequence getFragmentSegment(final EObject object) {
+        public boolean appendFragmentSegment(final EObject object, StringBuilder builder) {
           EClass eClass = object.eClass();
           EPackage ePackage = eClass.getEPackage();
           «val typeMap = fingerprintedExports.typeMap(grammar)»
@@ -54,28 +54,28 @@ class FragmentProviderGenerator {
                 «val e = typeMap.get(c)»
                 «javaContributorComment(e.location())»
                 case «c.classifierIdLiteral()»: {
-                  return getFragmentSegment((«c.instanceClassName()») object);
+                  return appendFragmentSegment((«c.instanceClassName()») object, builder);
                 }
               «ENDFOR»
               default:
-                return super.getFragmentSegment(object);
+                return super.appendFragmentSegment(object, builder);
               }
             }
           «ENDFOR»
-          return super.getFragmentSegment(object);
+          return super.appendFragmentSegment(object, builder);
         }
 
         «IF it.extension»
           @Override
-          protected CharSequence getFragmentSegmentFallback(final EObject object) {
-            // For export extension we must return null, so the logic will try other extensions
-            return null;
+          protected boolean appendFragmentSegmentFallback(final EObject object, StringBuilder builder) {
+            // For export extension we must return false, so the logic will try other extensions
+            return false;
           }
 
         «ENDIF»
         «FOR e : fingerprintedExports»
-          protected CharSequence getFragmentSegment(final «e.type.instanceClassName()» obj) {
-            return computeSelectorFragmentSegment(obj, «e.fragmentAttribute.literalIdentifier()», «e.fragmentUnique»);
+          protected boolean appendFragmentSegment(final «e.type.instanceClassName()» obj, StringBuilder builder) {
+            return computeSelectorFragmentSegment(obj, «e.fragmentAttribute.literalIdentifier()», «e.fragmentUnique», builder);
           }
 
         «ENDFOR»
diff --git a/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/linking/AbstractFragmentProviderTest.java b/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/linking/AbstractFragmentProviderTest.java
index 6959bb216..caffc10a0 100644
--- a/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/linking/AbstractFragmentProviderTest.java
+++ b/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/linking/AbstractFragmentProviderTest.java
@@ -14,8 +14,6 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.avaloq.tools.ddk.xtext.linking.AbstractFragmentProvider;
-
 
 /**
  * Tests for {@code AbstractFragmentProvider}.
@@ -27,8 +25,8 @@ public class AbstractFragmentProviderTest {
   private static class TestAbstractFragmentProvider extends AbstractFragmentProvider {
 
     @Override
-    public CharSequence getFragmentSegment(final EObject object) {
-      return null;
+    public boolean appendFragmentSegment(final EObject object, final StringBuilder builder) {
+      return false;
     }
 
     @Override
@@ -39,8 +37,8 @@ public EObject getEObjectFromSegment(final EObject container, final String segme
     @Override
     // make method public for testing
     @SuppressWarnings("PMD.UselessOverridingMethod")
-    public String escape(final String text) {
-      return super.escape(text);
+    public void appendEscaped(final String text, final StringBuilder builder) {
+      super.appendEscaped(text, builder);
     }
 
     @Override
@@ -55,7 +53,9 @@ public String unescape(final String text) {
 
   @Test
   public void testEscape() {
-    Assert.assertEquals("foo\\/bar#\\\\", fragmentProvider.escape("foo/bar#\\"));
+    StringBuilder builder = new StringBuilder();
+    fragmentProvider.appendEscaped("foo/bar#\\", builder);
+    Assert.assertEquals("foo\\/bar#\\\\", builder.toString());
   }
 
   @Test
@@ -66,9 +66,10 @@ public void testUnescape() {
   @Test
   public void testUnescapeEscape() {
     for (String text : SPECIAL_ESCAPE_CASES) {
-      Assert.assertEquals(text, fragmentProvider.unescape(fragmentProvider.escape(text)));
+      StringBuilder builder = new StringBuilder();
+      fragmentProvider.appendEscaped(text, builder);
+      Assert.assertEquals(text, fragmentProvider.unescape(builder.toString()));
     }
   }
 
 }
-
diff --git a/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/resource/AbstractSelectorFragmentProviderTest.java b/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/resource/AbstractSelectorFragmentProviderTest.java
index 458acabb0..6f7574055 100644
--- a/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/resource/AbstractSelectorFragmentProviderTest.java
+++ b/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/resource/AbstractSelectorFragmentProviderTest.java
@@ -27,7 +27,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.avaloq.tools.ddk.xtext.resource.AbstractSelectorFragmentProvider;
 import com.google.inject.AbstractModule;
 
 
@@ -93,47 +92,46 @@ private void assertFragmentMatchesAndResolves(final Resource res, final String e
   private static class TestSelectorFragmentProvider extends AbstractSelectorFragmentProvider {
 
     @Override
-    public CharSequence getFragmentSegment(final EObject object) {
+    public boolean appendFragmentSegment(final EObject object, final StringBuilder builder) {
       EClass eClass = object.eClass();
       EPackage ePackage = eClass.getEPackage();
       if (ePackage == XtextPackage.eINSTANCE) {
         int classifierID = eClass.getClassifierID();
         switch (classifierID) {
         case XtextPackage.GRAMMAR:
-          return getFragmentSegment((Grammar) object);
+          return appendFragmentSegment((Grammar) object, builder);
         case XtextPackage.ENUM_RULE:
         case XtextPackage.PARSER_RULE:
         case XtextPackage.TERMINAL_RULE:
-          return getFragmentSegment((AbstractRule) object);
+          return appendFragmentSegment((AbstractRule) object, builder);
         case XtextPackage.KEYWORD:
           if (((Keyword) object).getValue().equals("selectCardinality")) {
-            return getFragmentSegment((AbstractElement) object);
+            return appendFragmentSegment((AbstractElement) object, builder);
           } else {
-            return getFragmentSegment((Keyword) object);
+            return appendFragmentSegment((Keyword) object, builder);
           }
         default:
-          return super.getFragmentSegment(object);
+          return super.appendFragmentSegment(object, builder);
         }
       }
-      return super.getFragmentSegment(object);
+      return super.appendFragmentSegment(object, builder);
     }
 
-    protected CharSequence getFragmentSegment(final Grammar obj) {
-      return computeSelectorFragmentSegment(obj, XtextPackage.Literals.GRAMMAR__NAME, true);
+    protected boolean appendFragmentSegment(final Grammar obj, final StringBuilder builder) {
+      return computeSelectorFragmentSegment(obj, XtextPackage.Literals.GRAMMAR__NAME, true, builder);
     }
 
-    protected CharSequence getFragmentSegment(final AbstractRule obj) {
-      return computeSelectorFragmentSegment(obj, XtextPackage.Literals.ABSTRACT_RULE__NAME, false);
+    protected boolean appendFragmentSegment(final AbstractRule obj, final StringBuilder builder) {
+      return computeSelectorFragmentSegment(obj, XtextPackage.Literals.ABSTRACT_RULE__NAME, false, builder);
     }
 
-    protected CharSequence getFragmentSegment(final AbstractElement obj) {
-      return computeSelectorFragmentSegment(obj, XtextPackage.Literals.ABSTRACT_ELEMENT__CARDINALITY, false);
+    protected boolean appendFragmentSegment(final AbstractElement obj, final StringBuilder builder) {
+      return computeSelectorFragmentSegment(obj, XtextPackage.Literals.ABSTRACT_ELEMENT__CARDINALITY, false, builder);
     }
 
-    protected CharSequence getFragmentSegment(final Keyword obj) {
-      return computeSelectorFragmentSegment(obj, XtextPackage.Literals.KEYWORD__VALUE, false);
+    protected boolean appendFragmentSegment(final Keyword obj, final StringBuilder builder) {
+      return computeSelectorFragmentSegment(obj, XtextPackage.Literals.KEYWORD__VALUE, false, builder);
     }
 
   }
 }
-
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/linking/AbstractFragmentProvider.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/linking/AbstractFragmentProvider.java
index 1e9ca7816..0b299ee0a 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/linking/AbstractFragmentProvider.java
+++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/linking/AbstractFragmentProvider.java
@@ -10,8 +10,9 @@
  *******************************************************************************/
 package com.avaloq.tools.ddk.xtext.linking;
 
+import java.util.ArrayDeque;
+import java.util.Deque;
 import java.util.Iterator;
-import java.util.Stack;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
@@ -30,6 +31,7 @@ public abstract class AbstractFragmentProvider implements IFragmentProvider {
   public static final char REP_SEPARATOR = '*';
   public static final char LIST_SEPARATOR = '#';
 
+  private static final int FRAGMENT_BUFFER_CAPACITY = 8;
   private static final char ESCAPE_CHARACTER = '\\';
   private static final CharMatcher CHARACTERS_TO_ESCAPE = CharMatcher.anyOf(new String(new char[] {SEGMENT_SEPARATOR, ESCAPE_CHARACTER,
       REP_SEPARATOR})).precomputed();
@@ -82,7 +84,7 @@ public String next() { // NOPMD - this isn't actually complex, and I much prefer
       int idx = indexOfUnescapedChar(fragment, END_MATCHER, startIdx);
       int repIdx = idx < length && fragment.charAt(idx) == REP_SEPARATOR ? idx : -1;
       endIdx = repIdx == -1 ? idx : indexOfUnescapedChar(fragment, SEGMENT_SEPARATOR_MATCHER, repIdx);
-      reps = repIdx < startIdx ? 1 : Integer.parseInt(fragment.substring(repIdx + 1, endIdx));
+      reps = repIdx < startIdx ? 1 : Integer.parseUnsignedInt(fragment.substring(repIdx + 1, endIdx));
       return fragment.substring(startIdx, reps == 1 ? endIdx : repIdx);
     }
 
@@ -105,7 +107,7 @@ public void remove() {
   /** {@inheritDoc} */
   @Override
   public String getFragment(final EObject object, final Fallback fallback) {
-    final Stack<EObject> containingObjects = new Stack<EObject>();
+    final Deque<EObject> containingObjects = new ArrayDeque<>();
     EObject current = object;
     while (current != null) {
       containingObjects.push(current);
@@ -115,70 +117,73 @@ public String getFragment(final EObject object, final Fallback fallback) {
       // could happen while unloading objects
       return fallback.getFragment(object);
     }
-    final StringBuilder fragment = new StringBuilder(containingObjects.size() * 16);
-    CharSequence previousSegment = null;
-    CharSequence segment = internalGetFragmentSegment(containingObjects.pop());
+    final StringBuilder result = new StringBuilder(containingObjects.size() * FRAGMENT_BUFFER_CAPACITY);
+    StringBuilder previousSegment = new StringBuilder(FRAGMENT_BUFFER_CAPACITY);
+    StringBuilder segment = new StringBuilder(FRAGMENT_BUFFER_CAPACITY);
+    internalAppendFragmentSegment(containingObjects.pop(), segment);
     int reps = 1;
-    fragment.append(SEGMENT_SEPARATOR);
-    fragment.append(segment);
+    result.append(SEGMENT_SEPARATOR);
+    result.append(segment);
     while (!containingObjects.isEmpty()) {
+      StringBuilder temp = previousSegment;
       previousSegment = segment;
-      segment = internalGetFragmentSegment(containingObjects.pop());
+      segment = temp;
+      segment.setLength(0);
+      internalAppendFragmentSegment(containingObjects.pop(), segment);
       if (equal(previousSegment, segment)) {
         reps++;
       } else {
         if (reps == 2 && previousSegment.length() == 1) {
-          fragment.append(SEGMENT_SEPARATOR).append(previousSegment);
+          result.append(SEGMENT_SEPARATOR).append(previousSegment);
           reps = 1;
         } else if (reps > 1) {
-          fragment.append(REP_SEPARATOR).append(reps);
+          result.append(REP_SEPARATOR).append(reps);
           reps = 1;
         }
-        fragment.append(SEGMENT_SEPARATOR).append(segment);
+        result.append(SEGMENT_SEPARATOR).append(segment);
       }
     }
     if (reps == 2 && previousSegment.length() == 1) {
-      fragment.append(SEGMENT_SEPARATOR).append(previousSegment);
+      result.append(SEGMENT_SEPARATOR).append(previousSegment);
     } else if (reps > 1) {
-      fragment.append(REP_SEPARATOR).append(reps);
+      result.append(REP_SEPARATOR).append(reps);
     }
-    return fragment.toString();
+    return result.toString();
   }
 
   /**
    * Internal method which calls {@link InferenceContainer#getFragmentSegment(EObject)} if {@code object}'s container is an {@link InferenceContainer} and
-   * otherwise calls {@link #getFragmentSegment(EObject)}.
+   * otherwise calls {@link #appendFragmentSegment(EObject, StringBuilder)}.
    *
    * @param object
    *          the {@link EObject} for which to calculate the fragment segment, must not be {@code null}
-   * @return the calculated fragment segment for the given object, never {@code null} or empty
+   * @param builder
+   *          builder to append fragment segment to, must not be {@code null}
    */
-  private CharSequence internalGetFragmentSegment(final EObject object) {
+  private void internalAppendFragmentSegment(final EObject object, final StringBuilder builder) {
     if (object.eContainer() instanceof InferenceContainer) {
-      return ((InferenceContainer) object.eContainer()).getFragmentSegment(object);
+      builder.append(((InferenceContainer) object.eContainer()).getFragmentSegment(object));
+    } else {
+      appendFragmentSegment(object, builder);
     }
-    return getFragmentSegment(object);
   }
 
   /**
-   * Checks whether the two given CharSequence objects represent the same string value.
+   * Checks whether the two given {@link StringBuilder} objects represent the same string value.
    *
-   * @param seq1
-   *          first sequence, must not be {@code null}
-   * @param seq2
-   *          second sequence, must not be {@code null}
+   * @param builder1
+   *          first builder, must not be {@code null}
+   * @param builder2
+   *          second builder, must not be {@code null}
    * @return {@code true} if both represent the same string, {@code false} otherwise
    */
-  private boolean equal(final CharSequence seq1, final CharSequence seq2) {
-    if (seq1.equals(seq2)) {
-      return true;
-    }
-    int length = seq1.length();
-    if (seq2.length() != length) {
+  private boolean equal(final StringBuilder builder1, final StringBuilder builder2) {
+    int length = builder1.length();
+    if (builder2.length() != length) {
       return false;
     }
     for (int i = 0; i < length; i++) {
-      if (seq1.charAt(i) != seq2.charAt(i)) {
+      if (builder1.charAt(i) != builder2.charAt(i)) {
         return false;
       }
     }
@@ -186,13 +191,15 @@ private boolean equal(final CharSequence seq1, final CharSequence seq2) {
   }
 
   /**
-   * Calculates and returns the URI fragment segment for the given object, without segment separators.
+   * Calculates and append the URI fragment segment for the given object to the given {@link StringBuilder}, without segment separators.
    *
    * @param object
    *          the {@link EObject} for which to calculate the fragment segment, must not be {@code null}
-   * @return the calculated fragment segment for the given object, never {@code null} or empty
+   * @param builder
+   *          builder to append fragment segment to, must not be {@code null}
+   * @return {@code true} if a fragment segment was appended to {@code builder}
    */
-  public abstract CharSequence getFragmentSegment(final EObject object);
+  public abstract boolean appendFragmentSegment(final EObject object, StringBuilder builder);
 
   /** {@inheritDoc} */
   @Override
@@ -202,7 +209,7 @@ public EObject getEObject(final Resource resource, final String fragment, final
       String segment = iterator.next();
       int reps = iterator.repetitions();
 
-      final int contentsIndex = Integer.parseInt(segment);
+      final int contentsIndex = Integer.parseUnsignedInt(segment);
       EObject container = resource.getContents().get(contentsIndex);
 
       while (iterator.hasNext() || reps > 1) {
@@ -282,7 +289,7 @@ protected int indexOfUnescapedChar(final String str, final CharMatcher ch, final
   }
 
   /**
-   * Escapes the reserved characters contained in the given text.
+   * Escapes the reserved characters contained in the given text and appends it to the given {@link StringBuilder}.
    * <p>
    * Reserved characters for e.g. segment and list separation cannot be used by custom fragment providers unless escaped, i.e. prefixed with a '\'. Such URI
    * segments need to be escaped when forming the URI fragment, and consequently unescaped when reading the URI segments.
@@ -290,10 +297,11 @@ protected int indexOfUnescapedChar(final String str, final CharMatcher ch, final
    *
    * @param text
    *          the text to escape, must not be {@code null}
-   * @return the escaped text, never {@code null}
+   * @param builder
+   *          builder to append the escaped text to, must not be {@code null}
    */
-  protected String escape(final String text) {
-    return escape(text, CHARACTERS_TO_ESCAPE);
+  protected void appendEscaped(final String text, final StringBuilder builder) {
+    appendEscaped(text, builder, CHARACTERS_TO_ESCAPE);
   }
 
   /**
@@ -312,7 +320,7 @@ protected String unescape(final String text) {
   }
 
   /**
-   * Escapes the escape characters contained in the given text.
+   * Escapes the escape characters contained in the given text and appends the result to the given {@link StringBuilder}.
    * <p>
    * Reserved characters for e.g. segment and list separation cannot be used by custom fragment providers unless escaped, i.e. prefixed with a '\'. Such URI
    * segments need to be escaped when forming the URI fragment, and consequently unescaped when reading the URI segments.
@@ -320,28 +328,21 @@ protected String unescape(final String text) {
    *
    * @param text
    *          the text to escape, must not be {@code null}
+   * @param builder
+   *          builder to append the escaped text to, must not be {@code null}
    * @param charactersToEscape
    *          the characters to escape, must not be {@code null}
-   * @return the escaped text, never {@code null}
    */
-  protected String escape(final String text, final CharMatcher charactersToEscape) {
-    if (CharMatcher.NONE.equals(charactersToEscape)) {
-      return text;
-    }
-    final StringBuilder result = new StringBuilder(text.length());
+  protected void appendEscaped(final String text, final StringBuilder builder, final CharMatcher charactersToEscape) {
     int lastIndex = 0;
     for (int index = 0; index < text.length(); index++) {
       char character = text.charAt(index);
       if (charactersToEscape.matches(character)) {
-        result.append(text.substring(lastIndex, index)).append(ESCAPE_CHARACTER).append(character);
+        builder.append(text.substring(lastIndex, index)).append(ESCAPE_CHARACTER).append(character);
         lastIndex = index + 1;
       }
     }
-    if (result.length() == 0) {
-      return text;
-    }
-    result.append(text.substring(lastIndex));
-    return result.toString();
+    builder.append(text.substring(lastIndex));
   }
 
   /**
@@ -358,10 +359,7 @@ protected String escape(final String text, final CharMatcher charactersToEscape)
    * @return the unescaped text, never {@code null}
    */
   protected String unescape(final String text, final CharMatcher charactersToEscape) {
-    if (CharMatcher.NONE.equals(charactersToEscape)) {
-      return text;
-    }
-    final StringBuilder result = new StringBuilder(text.length());
+    StringBuilder result = null;
     int lastIndex = 0;
     boolean escaped = false;
     for (int index = 0; index < text.length(); index++) {
@@ -369,6 +367,9 @@ protected String unescape(final String text, final CharMatcher charactersToEscap
       if (escaped) {
         escaped = false;
         if (charactersToEscape.matches(character)) {
+          if (result == null) {
+            result = new StringBuilder(text.length());
+          }
           result.append(text.substring(lastIndex, index - 1)).append(character);
           lastIndex = index + 1;
         }
@@ -376,7 +377,7 @@ protected String unescape(final String text, final CharMatcher charactersToEscap
         escaped = true;
       }
     }
-    if (result.length() == 0) {
+    if (result == null) {
       return text;
     }
     result.append(text.substring(lastIndex));
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/linking/ShortFragmentProvider.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/linking/ShortFragmentProvider.java
index 2a7cb48ca..52a5c1813 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/linking/ShortFragmentProvider.java
+++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/linking/ShortFragmentProvider.java
@@ -25,20 +25,19 @@ public class ShortFragmentProvider extends AbstractFragmentProvider {
 
   /** {@inheritDoc} */
   @Override
-  public CharSequence getFragmentSegment(final EObject object) {
+  public boolean appendFragmentSegment(final EObject object, final StringBuilder builder) {
     final EReference containmentFeature = object.eContainmentFeature();
-    final StringBuilder result = new StringBuilder();
     if (containmentFeature == null) {
-      result.append(object.eResource().getContents().indexOf(object));
+      builder.append(object.eResource().getContents().indexOf(object));
     } else {
       final EObject container = object.eContainer();
-      result.append(container.eClass().getFeatureID(containmentFeature));
+      builder.append(container.eClass().getFeatureID(containmentFeature));
       if (containmentFeature.isMany()) {
         final List<?> list = (List<?>) container.eGet(containmentFeature, false);
-        result.append(LIST_SEPARATOR).append(list.indexOf(object));
+        builder.append(LIST_SEPARATOR).append(list.indexOf(object));
       }
     }
-    return result;
+    return true;
   }
 
   /** {@inheritDoc} */
@@ -47,9 +46,9 @@ public EObject getEObjectFromSegment(final EObject container, final String segme
     final int listSeparatorIndex = segment.indexOf(LIST_SEPARATOR);
     int featureId;
     if (listSeparatorIndex == -1) {
-      featureId = Integer.parseInt(segment);
+      featureId = Integer.parseUnsignedInt(segment);
     } else {
-      featureId = Integer.parseInt(segment.substring(0, listSeparatorIndex));
+      featureId = Integer.parseUnsignedInt(segment.substring(0, listSeparatorIndex));
     }
     final EReference reference = (EReference) container.eClass().getEStructuralFeature(featureId);
     if (reference.isMany()) {
@@ -59,7 +58,7 @@ public EObject getEObjectFromSegment(final EObject container, final String segme
         return null;
       }
       final List<?> list = (List<?>) container.eGet(reference, false);
-      final int listIndex = Integer.parseInt(segment.substring(listSeparatorIndex + 1));
+      final int listIndex = Integer.parseUnsignedInt(segment.substring(listSeparatorIndex + 1));
       // If the uri references an element outside of the list range return null (i.e. cannot find element)
       if (listIndex >= list.size()) {
         return null;
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/AbstractExportFeatureExtension.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/AbstractExportFeatureExtension.java
index da000259e..67f0391c7 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/AbstractExportFeatureExtension.java
+++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/AbstractExportFeatureExtension.java
@@ -44,8 +44,8 @@ public String computeFingerprint(final EObject object) {
   }
 
   @Override
-  public CharSequence getFragmentSegment(final EObject object) {
-    return getFragmentProvider().getFragmentSegment(object);
+  public boolean appendFragmentSegment(final EObject object, final StringBuilder builder) {
+    return getFragmentProvider().appendFragmentSegment(object, builder);
   }
 
   @Override
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/AbstractSelectorFragmentProvider.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/AbstractSelectorFragmentProvider.java
index adf9386c6..9f73be350 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/AbstractSelectorFragmentProvider.java
+++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/AbstractSelectorFragmentProvider.java
@@ -20,7 +20,7 @@
 
 
 /**
- * Fragment provider which understands fragments with selector path segments. E.g. <code>0.1.3(0=='foo').0</code>.
+ * Fragment provider which understands fragments with selector path segments. E.g. <code>0/1/3(0=='foo')/0</code>.
  * <p>
  * Implementation classes should override {@link #getFragment(EObject, org.eclipse.xtext.resource.IFragmentProvider.Fallback)} and call
  * {@link #computeSelectorFragment(EObject, EStructuralFeature, boolean, org.eclipse.xtext.resource.IFragmentProvider.Fallback)} as appropriate.
@@ -39,42 +39,45 @@ public abstract class AbstractSelectorFragmentProvider extends AbstractFragmentP
   private ShortFragmentProvider shortFragmentProvider;
 
   /**
-   * Returns a segment of the fragment with a selector for the given object.
+   * Computes a segment of the fragment with a selector for the given object and appends it to the given {@link StringBuilder}.
    *
    * @param obj
    *          object to compute fragment for
    * @param selectorFeature
    *          selector feature
    * @param unique
-   *          <code>true</code> the values for selectorFeature are unique within the object's containment feature setting
-   * @return computed selector fragment
+   *          {@code true} the values for selectorFeature are unique within the object's containment feature setting
+   * @param builder
+   *          builder to append fragment segment to, must not be {@code null}
+   * @return {@code true} if a fragment segment was appended to {@code builder}
    */
   @SuppressWarnings("unchecked")
-  protected CharSequence computeSelectorFragmentSegment(final EObject obj, final EStructuralFeature selectorFeature, final boolean unique) {
+  protected boolean computeSelectorFragmentSegment(final EObject obj, final EStructuralFeature selectorFeature, final boolean unique, final StringBuilder builder) {
     final EObject container = obj.eContainer();
     if (container == null) {
-      return shortFragmentProvider.getFragmentSegment(obj);
+      return shortFragmentProvider.appendFragmentSegment(obj, builder);
     }
-    final StringBuilder result = new StringBuilder();
     // containment feature
     final EStructuralFeature containmentFeature = obj.eContainmentFeature();
-    result.append(container.eClass().getFeatureID(containmentFeature));
+    builder.append(container.eClass().getFeatureID(containmentFeature));
     // selector
     final Object selectorValue = obj.eGet(selectorFeature);
-    result.append(SELECTOR_START).append(obj.eClass().getFeatureID(selectorFeature)).append(EQ_OP);
+    builder.append(SELECTOR_START).append(obj.eClass().getFeatureID(selectorFeature)).append(EQ_OP);
     if (selectorValue != null) {
-      result.append(VALUE_SEP).append(escape(selectorValue.toString())).append(VALUE_SEP);
+      builder.append(VALUE_SEP);
+      appendEscaped(selectorValue.toString(), builder);
+      builder.append(VALUE_SEP);
     } else {
-      result.append(NULL_VALUE);
+      builder.append(NULL_VALUE);
     }
     if (unique) {
-      result.append(UNIQUE);
+      builder.append(UNIQUE);
     }
-    result.append(SELECTOR_END);
+    builder.append(SELECTOR_END);
 
     // selector index
     if (!unique && containmentFeature.isMany()) {
-      result.append(ShortFragmentProvider.LIST_SEPARATOR);
+      builder.append(ShortFragmentProvider.LIST_SEPARATOR);
       final EList<? extends EObject> containmentList = (EList<? extends EObject>) container.eGet(containmentFeature);
       int selectorIndex = 0;
       final int objectIndex = containmentList.indexOf(obj);
@@ -84,10 +87,9 @@ protected CharSequence computeSelectorFragmentSegment(final EObject obj, final E
           selectorIndex++;
         }
       }
-      result.append(selectorIndex);
+      builder.append(selectorIndex);
     }
-
-    return result;
+    return true;
   }
 
   /**
@@ -95,23 +97,25 @@ protected CharSequence computeSelectorFragmentSegment(final EObject obj, final E
    *
    * @param object
    *          object to compute fragment for
-   * @return fragment, never {@code null}
+   * @param builder
+   *          builder to append fragment segment to, must not be {@code null}
+   * @return {@code true} if a fragment segment was appended to {@code builder}
    */
-  protected CharSequence getFragmentSegmentFallback(final EObject object) {
-    return shortFragmentProvider.getFragmentSegment(object);
+  protected boolean appendFragmentSegmentFallback(final EObject object, final StringBuilder builder) {
+    return shortFragmentProvider.appendFragmentSegment(object, builder);
   }
 
   /**
    * {@inheritDoc}
    * <p>
-   * By default, this method delegates to {@link ShortFragmentProvider#getFragmentSegment(EObject)}. Sub classes have to override this method in order to
+   * By default, this method delegates to {@link #appendFragmentSegmentFallback(EObject, StringBuilder)}. Sub classes have to override this method in order to
    * customize which EObject generates a selector segment.
    * </p>
    */
   // TODO DSL-348: change generator for fragment providers to implement getFragmentSegment instead of getFragment
   @Override
-  public CharSequence getFragmentSegment(final EObject object) {
-    return getFragmentSegmentFallback(object);
+  public boolean appendFragmentSegment(final EObject object, final StringBuilder builder) {
+    return appendFragmentSegmentFallback(object, builder);
   }
 
   /** {@inheritDoc} */
@@ -121,7 +125,7 @@ public EObject getEObjectFromSegment(final EObject container, final String segme
     final int selectorEndOffset = segment.lastIndexOf(SELECTOR_END);
     if (selectorEndOffset != -1) {
       final int selectorOffset = segment.indexOf(SELECTOR_START);
-      final int containmentFeatureId = Integer.parseInt(segment.substring(0, selectorOffset));
+      final int containmentFeatureId = Integer.parseUnsignedInt(segment.substring(0, selectorOffset));
       final EStructuralFeature containmentFeature = container.eClass().getEStructuralFeature(containmentFeatureId);
       if (containmentFeature == null) {
         return null;
@@ -130,9 +134,9 @@ public EObject getEObjectFromSegment(final EObject container, final String segme
         return (EObject) container.eGet(containmentFeature);
       }
       final int eqOffset = segment.indexOf(EQ_OP, selectorOffset);
-      final int selectorFeatureId = Integer.parseInt(segment.substring(selectorOffset + 1, eqOffset));
+      final int selectorFeatureId = Integer.parseUnsignedInt(segment.substring(selectorOffset + 1, eqOffset));
       boolean uniqueMatch = segment.charAt(selectorEndOffset - 1) == UNIQUE;
-      int matchedIndex = uniqueMatch ? 0 : Integer.parseInt(segment.substring(selectorEndOffset + 2));
+      int matchedIndex = uniqueMatch ? 0 : Integer.parseUnsignedInt(segment.substring(selectorEndOffset + 2));
       boolean isNull = segment.startsWith(NULL_VALUE, eqOffset + EQ_OP_LENGTH);
       String matchedValue = isNull ? null
           : unescape(segment.substring(eqOffset + EQ_OP_LENGTH + 1, uniqueMatch ? selectorEndOffset - 2 : selectorEndOffset - 1));
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/DefaultExportFeatureExtensionService.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/DefaultExportFeatureExtensionService.java
index f3fd9758b..ce6f69e8d 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/DefaultExportFeatureExtensionService.java
+++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/DefaultExportFeatureExtensionService.java
@@ -24,8 +24,8 @@
 import org.eclipse.xtext.resource.IEObjectDescription;
 import org.eclipse.xtext.util.IAcceptor;
 
-import com.avaloq.tools.ddk.xtext.extension.ILanguageExtensionsService;
 import com.avaloq.tools.ddk.xtext.extension.ILanguageExtensions;
+import com.avaloq.tools.ddk.xtext.extension.ILanguageExtensionsService;
 import com.google.common.collect.Lists;
 import com.google.inject.Inject;
 import com.google.inject.Injector;
@@ -61,8 +61,13 @@ public String computeFingerprint(final EObject object) {
   }
 
   @Override
-  public CharSequence getFragmentSegment(final EObject object) {
-    return returnFirst(c -> c.getFragmentSegment(object));
+  public boolean appendFragmentSegment(final EObject object, final StringBuilder builder) {
+    for (IExportFeatureExtension ext : exportFeatureExtensions) {
+      if (ext.appendFragmentSegment(object, builder)) {
+        return true;
+      }
+    }
+    return false;
   }
 
   @Override
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/IExportComputer.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/IExportComputer.java
index c5a0f3421..f7201ed5d 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/IExportComputer.java
+++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/IExportComputer.java
@@ -50,14 +50,16 @@ public interface IExportComputer {
   /**
    * Extension for fragment computation.
    * <p>
-   * Implementations must return {@code null} if this extension is not meant to handle the EClass of the given object.
+   * Implementations must return {@code false} if this extension is not meant to handle the EClass of the given object.
    * </p>
    *
    * @param object
    *          the object, must not be {@code null}
-   * @return the fragment segment for the object or {@code null} if this extension is not handling these objects
+   * @param builder
+   *          builder to append fragment segment to, must not be {@code null}
+   * @return {@code true} if a fragment segment was appended to {@code builder}
    */
-  CharSequence getFragmentSegment(final EObject object);
+  boolean appendFragmentSegment(final EObject object, StringBuilder builder);
 
   /**
    * Returns additional exported classes by this extension.
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/PatternAwareEObjectDescriptionLookUp.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/PatternAwareEObjectDescriptionLookUp.java
index b12f71bd6..ccdcbc95b 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/PatternAwareEObjectDescriptionLookUp.java
+++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/PatternAwareEObjectDescriptionLookUp.java
@@ -16,10 +16,8 @@
 import java.util.Map;
 import java.util.RandomAccess;
 
-import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.xtext.EcoreUtil2;
 import org.eclipse.xtext.naming.QualifiedName;
 import org.eclipse.xtext.resource.IEObjectDescription;
@@ -28,6 +26,7 @@
 import com.avaloq.tools.ddk.caching.CacheManager;
 import com.avaloq.tools.ddk.xtext.naming.QualifiedNameLookup;
 import com.avaloq.tools.ddk.xtext.naming.QualifiedNamePattern;
+import com.avaloq.tools.ddk.xtext.util.EObjectUtil;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Collections2;
 import com.google.common.collect.Iterables;
@@ -83,8 +82,8 @@ public boolean apply(final IEObjectDescription input) {
 
   @Override
   public Iterable<IEObjectDescription> getExportedObjectsByObject(final EObject object) {
-    final URI objectUri = EcoreUtil.getURI(object);
-    return Iterables.filter(getExportedObjects(), input -> objectUri.equals(input.getEObjectURI()));
+    final String fragment = EObjectUtil.getURIFragment(object);
+    return Iterables.filter(getExportedObjects(), input -> fragment.equals(input.getEObjectURI().fragment()));
   }
 
   @Override

From ad167f8a89cc54abc97479d7655e8aaf20af767b Mon Sep 17 00:00:00 2001
From: Dimo Petroff <dpetroff.github@gmail.com>
Date: Fri, 29 Jun 2018 17:09:48 +0100
Subject: [PATCH 25/56] #123: Fix testing different quickfixes for the same
 issue code

AbstractQuickFixTest#assertQuickfixSuccessful(issueCode, label) now uses
the label parameter as expected.
---
 .../test/ui/quickfix/AbstractQuickFixTest.java | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/ui/quickfix/AbstractQuickFixTest.java b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/ui/quickfix/AbstractQuickFixTest.java
index fbbffd2ee..10172e91f 100644
--- a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/ui/quickfix/AbstractQuickFixTest.java
+++ b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/ui/quickfix/AbstractQuickFixTest.java
@@ -184,18 +184,16 @@ protected void assertQuickFixSuccessful(final String issueCode) {
    *          the label of the quickfix, may be {@code null}
    */
   protected void assertQuickFixSuccessful(final String issueCode, final String quickfixLabel) {
-    for (final IssueResolution issueResolution : sortResolutionsByOffsetDecreasing(resolutionsFor(issueCode))) {
-      if (quickfixLabel == null || quickfixLabel.equals(issueResolution.getLabel())) {
-        UiThreadDispatcher.dispatchAndWait(new Runnable() {
-          @Override
-          public void run() {
-            issueResolution.apply();
-          }
-        });
-      }
+    for (final IssueResolution issueResolution : sortResolutionsByOffsetDecreasing(resolutionsFor(issueCode, quickfixLabel))) {
+      UiThreadDispatcher.dispatchAndWait(new Runnable() {
+        @Override
+        public void run() {
+          issueResolution.apply();
+        }
+      });
     }
     waitForValidation();
-    Assert.assertTrue(resolutionsFor(issueCode).isEmpty());
+    Assert.assertTrue(resolutionsFor(issueCode, quickfixLabel).isEmpty());
   }
 
   /**

From 2f96aef95d59c28b80dcb3ae32de075d88f97485 Mon Sep 17 00:00:00 2001
From: Jonathan Fuller <Jonathan.Fuller@avaloq.com>
Date: Tue, 3 Jul 2018 16:09:55 +0800
Subject: [PATCH 26/56] Assert for linking errors that has customized message
 in AbstractValidationTest

- Modifies the existing assert for linking errors to only check from the
list of XtextLinkingDiagnostic.
- Allows to assert linking errors with customized message.
---
 .../validation/AbstractValidationTest.java    | 37 ++++++++++++++++++-
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/validation/AbstractValidationTest.java b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/validation/AbstractValidationTest.java
index 61bbed078..4aac465fb 100644
--- a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/validation/AbstractValidationTest.java
+++ b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/validation/AbstractValidationTest.java
@@ -30,6 +30,7 @@
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.xtext.EcoreUtil2;
 import org.eclipse.xtext.diagnostics.AbstractDiagnostic;
+import org.eclipse.xtext.linking.impl.XtextLinkingDiagnostic;
 import org.eclipse.xtext.nodemodel.INode;
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
 import org.eclipse.xtext.resource.XtextResource;
@@ -966,7 +967,7 @@ public static void assertNoLinkingErrorsOnResource(final EObject object, final S
     for (int i = 0; i < referenceNames.length; i++) {
       messages[i] = NLS.bind(COULD_NOT_RESOLVE_REFERENCE_TO, referenceType, referenceNames[i]);
     }
-    assertNoErrorsOnResource(object, messages);
+    assertNoLinkingErrorsWithCustomMessageOnResource(object, messages);
   }
 
   /**
@@ -984,7 +985,39 @@ public static void assertLinkingErrorsOnResourceExist(final EObject object, fina
     for (int i = 0; i < referenceNames.length; i++) {
       messages[i] = NLS.bind(COULD_NOT_RESOLVE_REFERENCE_TO, referenceType, referenceNames[i]);
     }
-    assertErrorsOnResourceExist(object, messages);
+    assertLinkingErrorsWithCustomMessageOnResourceExist(object, messages);
+  }
+
+  /**
+   * Expect the given linking error messages on the resource of the given model.
+   *
+   * @param object
+   *          the object, must not be {@code null}
+   * @param errorStrings
+   *          the expected linking error error messages, must not be {@code null}
+   */
+  public static void assertLinkingErrorsWithCustomMessageOnResourceExist(final EObject object, final String... errorStrings) {
+    final List<Resource.Diagnostic> linkingErrors = object.eResource().getErrors().stream().filter(error -> error instanceof XtextLinkingDiagnostic).collect(Collectors.toList());
+    final List<String> errorMessages = Lists.transform(linkingErrors, Resource.Diagnostic::getMessage);
+    for (final String s : errorStrings) {
+      assertTrue(NLS.bind("Expected linking error \"{0}\" but could not find it", s), errorMessages.contains(s));
+    }
+  }
+
+  /**
+   * Assert no linking errors on resource with the given message exist.
+   *
+   * @param object
+   *          the object, must not be {@code null}
+   * @param messages
+   *          the linking error messages, must not be {@code null}
+   */
+  public static void assertNoLinkingErrorsWithCustomMessageOnResource(final EObject object, final String... messages) {
+    List<String> messageList = Arrays.asList(messages);
+    final List<Resource.Diagnostic> linkingErrors = object.eResource().getErrors().stream().filter(error -> error instanceof XtextLinkingDiagnostic).collect(Collectors.toList());
+    for (String errorMessage : Lists.transform(linkingErrors, Resource.Diagnostic::getMessage)) {
+      assertFalse(NLS.bind("Expecting no linking errors on resource with message \"{0}\".", errorMessage), messageList.contains(errorMessage));
+    }
   }
 
   /**

From 163a444d412eb76b7d379fefeed2f0e6ccdeb6b5 Mon Sep 17 00:00:00 2001
From: Knut Wannheden <knut.wannheden@avaloq.com>
Date: Tue, 3 Jul 2018 19:13:13 +0200
Subject: [PATCH 27/56] #125: Don't install derived state for resources loaded
 from storage

Resources loaded from binary storage already have derived state
installed and thus there is no need to invoke the derived state computer
again.
---
 .../avaloq/tools/ddk/xtext/linking/LazyLinkingResource2.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/linking/LazyLinkingResource2.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/linking/LazyLinkingResource2.java
index afe5fa19f..94493660d 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/linking/LazyLinkingResource2.java
+++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/linking/LazyLinkingResource2.java
@@ -319,7 +319,7 @@ public void discardDerivedState() {
 
   @Override
   public void installDerivedState(final boolean isPrelinkingPhase) {
-    if (derivedStateComputer != null && !fullyInitialized && !isInitializing) {
+    if (derivedStateComputer != null && !fullyInitialized && !isInitializing && !isLoadedFromStorage()) {
       try {
         traceSet.started(ResourceInferenceEvent.class, getURI());
         isInitializing = true;
@@ -350,7 +350,7 @@ public synchronized EList<EObject> getContents() {
 
   @Override
   public boolean isInitialized() {
-    return fullyInitialized || isInitializing;
+    return fullyInitialized || isInitializing || isLoadedFromStorage();
   }
 
   @Override

From 3f26bd15e3ad41449c9842f6d06f4783d427401e Mon Sep 17 00:00:00 2001
From: Dimo Petroff <dpetroff.github@gmail.com>
Date: Thu, 5 Jul 2018 16:00:56 +0100
Subject: [PATCH 28/56] Add convenience methods for linking and scoping tests

The testLinking method now can accept the source name and content
as a Pair with the source name and content being its key and value,
respectively.
---
 .../xtext/test/scoping/AbstractScopingTest.java    | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/scoping/AbstractScopingTest.java b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/scoping/AbstractScopingTest.java
index 5acf86ebf..347d01bda 100644
--- a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/scoping/AbstractScopingTest.java
+++ b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/scoping/AbstractScopingTest.java
@@ -53,6 +53,7 @@
 import org.eclipse.xtext.scoping.IScope;
 import org.eclipse.xtext.scoping.IScopeProvider;
 import org.eclipse.xtext.util.Triple;
+import org.eclipse.xtext.xbase.lib.Pair;
 
 import com.avaloq.tools.ddk.xtext.linking.AbstractFragmentProvider;
 import com.avaloq.tools.ddk.xtext.naming.QualifiedNames;
@@ -681,6 +682,19 @@ protected String link(final Supplier<EObject> getTargetObject) {
     return mark(sourceTag);
   }
 
+  /**
+   * Performs linking test. Checks expectations which were set in a source using {@link #link(int)} or {@link #link(Function, int).
+   *
+   * @see #link(int)
+   * @see #link(Supplier)
+   * @see #testLinking(int, EObject)
+   * @param sourceFileNameAndContent
+   *          the file name and content, given as the key and value of the pair, respectively, must not be {@code null}
+   */
+  protected void testLinking(final Pair<String, String> sourceFileNameAndContent) {
+    testLinking(sourceFileNameAndContent.getKey(), sourceFileNameAndContent.getValue());
+  }
+
   /**
    * Performs linking test. Checks expectations which were set in a source using {@link #link(int)} or {@link #link(Function, int).
    *

From 7862d197ed95cc5f96b9702f6a5ea4d86c812a22 Mon Sep 17 00:00:00 2001
From: Jenkins <hudson@avaloq.com>
Date: Tue, 10 Jul 2018 09:25:35 +0200
Subject: [PATCH 29/56] Release 1.5.0.v20180710-0925-REL

---
 com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.check.core.test/pom.xml              | 2 +-
 com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF      | 2 +-
 com.avaloq.tools.ddk.check.core/pom.xml                   | 2 +-
 com.avaloq.tools.ddk.check.generator/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.check.generator/pom.xml              | 2 +-
 com.avaloq.tools.ddk.check.lib/META-INF/MANIFEST.MF       | 2 +-
 com.avaloq.tools.ddk.check.lib/pom.xml                    | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.check.runtime.core.test/pom.xml      | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.check.runtime.core/pom.xml           | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.check.runtime.ui/pom.xml             | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.check.test.runtime.tests/pom.xml     | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.check.test.runtime.ui/pom.xml        | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.check.test.runtime/pom.xml           | 2 +-
 com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF   | 2 +-
 com.avaloq.tools.ddk.check.ui.test/pom.xml                | 2 +-
 com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF        | 2 +-
 com.avaloq.tools.ddk.check.ui/pom.xml                     | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.checkcfg.core.test/pom.xml           | 2 +-
 com.avaloq.tools.ddk.checkcfg.core/META-INF/MANIFEST.MF   | 2 +-
 com.avaloq.tools.ddk.checkcfg.core/pom.xml                | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.checkcfg.ui.test/pom.xml             | 2 +-
 com.avaloq.tools.ddk.checkcfg.ui/META-INF/MANIFEST.MF     | 2 +-
 com.avaloq.tools.ddk.checkcfg.ui/pom.xml                  | 2 +-
 com.avaloq.tools.ddk.feature/feature.xml                  | 2 +-
 com.avaloq.tools.ddk.feature/pom.xml                      | 2 +-
 com.avaloq.tools.ddk.runtime.feature/feature.xml          | 2 +-
 com.avaloq.tools.ddk.runtime.feature/pom.xml              | 2 +-
 com.avaloq.tools.ddk.runtime.source.feature/feature.xml   | 2 +-
 com.avaloq.tools.ddk.runtime.source.feature/pom.xml       | 2 +-
 com.avaloq.tools.ddk.source.feature/feature.xml           | 2 +-
 com.avaloq.tools.ddk.source.feature/pom.xml               | 2 +-
 com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF       | 2 +-
 com.avaloq.tools.ddk.test.core/pom.xml                    | 2 +-
 com.avaloq.tools.ddk.test.ui.test/META-INF/MANIFEST.MF    | 2 +-
 com.avaloq.tools.ddk.test.ui.test/pom.xml                 | 2 +-
 com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF         | 2 +-
 com.avaloq.tools.ddk.test.ui/pom.xml                      | 2 +-
 com.avaloq.tools.ddk.typesystem.test/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.typesystem.test/pom.xml              | 2 +-
 com.avaloq.tools.ddk.typesystem/META-INF/MANIFEST.MF      | 2 +-
 com.avaloq.tools.ddk.typesystem/pom.xml                   | 2 +-
 com.avaloq.tools.ddk.workflow/pom.xml                     | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.builder.ui/pom.xml             | 2 +-
 com.avaloq.tools.ddk.xtext.builder/META-INF/MANIFEST.MF   | 2 +-
 com.avaloq.tools.ddk.xtext.builder/pom.xml                | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.common.types.ui/pom.xml        | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.common.types/pom.xml           | 2 +-
 com.avaloq.tools.ddk.xtext.common.ui/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.xtext.common.ui/pom.xml              | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.export.generator/pom.xml       | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.export.test/pom.xml            | 2 +-
 com.avaloq.tools.ddk.xtext.export.ui/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.xtext.export.ui/pom.xml              | 2 +-
 com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF    | 2 +-
 com.avaloq.tools.ddk.xtext.export/pom.xml                 | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.expression.ui/pom.xml          | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.expression/pom.xml             | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.format.generator/pom.xml       | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.format.test/pom.xml            | 2 +-
 com.avaloq.tools.ddk.xtext.format.ui/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.xtext.format.ui/pom.xml              | 2 +-
 com.avaloq.tools.ddk.xtext.format/META-INF/MANIFEST.MF    | 2 +-
 com.avaloq.tools.ddk.xtext.format/pom.xml                 | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.generator.test/pom.xml         | 2 +-
 com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.xtext.generator/pom.xml              | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.scope.generator/pom.xml        | 2 +-
 com.avaloq.tools.ddk.xtext.scope.ui/META-INF/MANIFEST.MF  | 2 +-
 com.avaloq.tools.ddk.xtext.scope.ui/pom.xml               | 2 +-
 com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF     | 2 +-
 com.avaloq.tools.ddk.xtext.scope/pom.xml                  | 2 +-
 com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.xtext.test.core/pom.xml              | 2 +-
 com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF      | 2 +-
 com.avaloq.tools.ddk.xtext.test/pom.xml                   | 2 +-
 com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF   | 2 +-
 com.avaloq.tools.ddk.xtext.ui.test/pom.xml                | 2 +-
 com.avaloq.tools.ddk.xtext.ui/META-INF/MANIFEST.MF        | 2 +-
 com.avaloq.tools.ddk.xtext.ui/pom.xml                     | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.valid.generator/pom.xml        | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.valid.test/pom.xml             | 2 +-
 com.avaloq.tools.ddk.xtext.valid.ui/META-INF/MANIFEST.MF  | 2 +-
 com.avaloq.tools.ddk.xtext.valid.ui/pom.xml               | 2 +-
 com.avaloq.tools.ddk.xtext.valid/META-INF/MANIFEST.MF     | 2 +-
 com.avaloq.tools.ddk.xtext.valid/pom.xml                  | 2 +-
 com.avaloq.tools.ddk.xtext/META-INF/MANIFEST.MF           | 2 +-
 com.avaloq.tools.ddk.xtext/pom.xml                        | 2 +-
 com.avaloq.tools.ddk.xtextspy.test/META-INF/MANIFEST.MF   | 2 +-
 com.avaloq.tools.ddk.xtextspy.test/pom.xml                | 2 +-
 com.avaloq.tools.ddk.xtextspy/META-INF/MANIFEST.MF        | 2 +-
 com.avaloq.tools.ddk.xtextspy/pom.xml                     | 2 +-
 ddk-parent/pom.xml                                        | 2 +-
 ddk-repository/category.xml                               | 8 ++++----
 ddk-repository/pom.xml                                    | 2 +-
 ddk-target/pom.xml                                        | 2 +-
 117 files changed, 120 insertions(+), 120 deletions(-)

diff --git a/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF
index 21656a800..7d419c21a 100644
--- a/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.core.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.core.test;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.check.core.test/pom.xml b/com.avaloq.tools.ddk.check.core.test/pom.xml
index 2ee824204..1e246e9c7 100644
--- a/com.avaloq.tools.ddk.check.core.test/pom.xml
+++ b/com.avaloq.tools.ddk.check.core.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF
index c8bc2e173..3d6dc2699 100644
--- a/com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.core
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.core;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.check.core/pom.xml b/com.avaloq.tools.ddk.check.core/pom.xml
index 229207d47..a94ef67de 100644
--- a/com.avaloq.tools.ddk.check.core/pom.xml
+++ b/com.avaloq.tools.ddk.check.core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.check.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.generator/META-INF/MANIFEST.MF
index e14408cd9..39f784df3 100644
--- a/com.avaloq.tools.ddk.check.generator/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.generator
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.generator;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.check.generator/pom.xml b/com.avaloq.tools.ddk.check.generator/pom.xml
index 7c84615f8..816351516 100644
--- a/com.avaloq.tools.ddk.check.generator/pom.xml
+++ b/com.avaloq.tools.ddk.check.generator/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.check.lib/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.lib/META-INF/MANIFEST.MF
index e89580ea3..e7738122f 100644
--- a/com.avaloq.tools.ddk.check.lib/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.lib/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.lib
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.lib
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Vendor: Avaloq Evolution AG
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.xtext,
diff --git a/com.avaloq.tools.ddk.check.lib/pom.xml b/com.avaloq.tools.ddk.check.lib/pom.xml
index 06ef21a37..5311dfeb6 100644
--- a/com.avaloq.tools.ddk.check.lib/pom.xml
+++ b/com.avaloq.tools.ddk.check.lib/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.check.runtime.core.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.runtime.core.test/META-INF/MANIFEST.MF
index 6e242af96..3d886f182 100644
--- a/com.avaloq.tools.ddk.check.runtime.core.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.runtime.core.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.runtime.core.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.runtime.core.test;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui,
diff --git a/com.avaloq.tools.ddk.check.runtime.core.test/pom.xml b/com.avaloq.tools.ddk.check.runtime.core.test/pom.xml
index 6bffcfc7b..d1ee300c7 100644
--- a/com.avaloq.tools.ddk.check.runtime.core.test/pom.xml
+++ b/com.avaloq.tools.ddk.check.runtime.core.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.check.runtime.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.runtime.core/META-INF/MANIFEST.MF
index 4128b348c..98452a3ca 100644
--- a/com.avaloq.tools.ddk.check.runtime.core/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.runtime.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.runtime.core
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.runtime.core;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.resources,
diff --git a/com.avaloq.tools.ddk.check.runtime.core/pom.xml b/com.avaloq.tools.ddk.check.runtime.core/pom.xml
index 24aa814f4..9861b5317 100644
--- a/com.avaloq.tools.ddk.check.runtime.core/pom.xml
+++ b/com.avaloq.tools.ddk.check.runtime.core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.check.runtime.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.runtime.ui/META-INF/MANIFEST.MF
index 658e29e9a..fff4ad17b 100644
--- a/com.avaloq.tools.ddk.check.runtime.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.runtime.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.runtime.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.runtime.ui;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Activator: com.avaloq.tools.ddk.check.runtime.ui.internal.Activator
 Bundle-Vendor: Avaloq Evolution AG
 Require-Bundle: org.eclipse.ui,
diff --git a/com.avaloq.tools.ddk.check.runtime.ui/pom.xml b/com.avaloq.tools.ddk.check.runtime.ui/pom.xml
index 437db310c..859d6ee20 100644
--- a/com.avaloq.tools.ddk.check.runtime.ui/pom.xml
+++ b/com.avaloq.tools.ddk.check.runtime.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF
index 0654a270a..788928e60 100644
--- a/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.test.runtime.tests
 Bundle-Vendor: Avaloq Evolution AG
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.test.runtime.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.avaloq.tools.ddk.check.runtime.core,
diff --git a/com.avaloq.tools.ddk.check.test.runtime.tests/pom.xml b/com.avaloq.tools.ddk.check.test.runtime.tests/pom.xml
index 2623bf1d4..5db9497ad 100644
--- a/com.avaloq.tools.ddk.check.test.runtime.tests/pom.xml
+++ b/com.avaloq.tools.ddk.check.test.runtime.tests/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.check.test.runtime.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.test.runtime.ui/META-INF/MANIFEST.MF
index 1924fed39..3fb21f8a9 100644
--- a/com.avaloq.tools.ddk.check.test.runtime.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.test.runtime.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.test.runtime.ui
 Bundle-Vendor: Avaloq Evolution AG
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.test.runtime.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.avaloq.tools.ddk.check.test.runtime;visibility:=reexport,
diff --git a/com.avaloq.tools.ddk.check.test.runtime.ui/pom.xml b/com.avaloq.tools.ddk.check.test.runtime.ui/pom.xml
index 27bdd5838..5410eaa65 100644
--- a/com.avaloq.tools.ddk.check.test.runtime.ui/pom.xml
+++ b/com.avaloq.tools.ddk.check.test.runtime.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.check.test.runtime/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.test.runtime/META-INF/MANIFEST.MF
index b5d7074ea..3e86f180d 100644
--- a/com.avaloq.tools.ddk.check.test.runtime/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.test.runtime/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.test.runtime
 Bundle-Vendor: Avaloq Evolution AG
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.test.runtime;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.xtext;visibility:=reexport,
diff --git a/com.avaloq.tools.ddk.check.test.runtime/pom.xml b/com.avaloq.tools.ddk.check.test.runtime/pom.xml
index 596357cad..79adbcd04 100644
--- a/com.avaloq.tools.ddk.check.test.runtime/pom.xml
+++ b/com.avaloq.tools.ddk.check.test.runtime/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF
index bae16a11f..71c27b927 100644
--- a/com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.ui.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.ui.test
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit,
diff --git a/com.avaloq.tools.ddk.check.ui.test/pom.xml b/com.avaloq.tools.ddk.check.ui.test/pom.xml
index 6ce7898e5..8b2c6e5b0 100644
--- a/com.avaloq.tools.ddk.check.ui.test/pom.xml
+++ b/com.avaloq.tools.ddk.check.ui.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF
index c19a40e1d..48e07a11b 100644
--- a/com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.ui;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: com.avaloq.tools.ddk.check.ui.internal.Activator
diff --git a/com.avaloq.tools.ddk.check.ui/pom.xml b/com.avaloq.tools.ddk.check.ui/pom.xml
index 38cb7291b..ca58e6940 100644
--- a/com.avaloq.tools.ddk.check.ui/pom.xml
+++ b/com.avaloq.tools.ddk.check.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.checkcfg.core.test/META-INF/MANIFEST.MF
index 6bb986e84..1688601d3 100644
--- a/com.avaloq.tools.ddk.checkcfg.core.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.checkcfg.core.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.checkcfg.core.test
 Bundle-Vendor: Avaloq Evolution AG
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-SymbolicName: com.avaloq.tools.ddk.checkcfg.core.test; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.avaloq.tools.ddk.test.core, 
diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/pom.xml b/com.avaloq.tools.ddk.checkcfg.core.test/pom.xml
index 965f958d8..bc314c348 100644
--- a/com.avaloq.tools.ddk.checkcfg.core.test/pom.xml
+++ b/com.avaloq.tools.ddk.checkcfg.core.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.checkcfg.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.checkcfg.core/META-INF/MANIFEST.MF
index 3fdc4fd58..63e8e7a2d 100644
--- a/com.avaloq.tools.ddk.checkcfg.core/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.checkcfg.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.checkcfg.core
 Bundle-Vendor: Avaloq Evolution AG
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-SymbolicName: com.avaloq.tools.ddk.checkcfg.core; singleton:=true
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/com.avaloq.tools.ddk.checkcfg.core/pom.xml b/com.avaloq.tools.ddk.checkcfg.core/pom.xml
index bbd5055cf..fe2dc5ef2 100644
--- a/com.avaloq.tools.ddk.checkcfg.core/pom.xml
+++ b/com.avaloq.tools.ddk.checkcfg.core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.checkcfg.ui.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.checkcfg.ui.test/META-INF/MANIFEST.MF
index 626ed3c5b..e25188b32 100644
--- a/com.avaloq.tools.ddk.checkcfg.ui.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.checkcfg.ui.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.checkcfg.ui.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.checkcfg.ui.test
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: com.avaloq.tools.ddk.checkcfg.ui.test
diff --git a/com.avaloq.tools.ddk.checkcfg.ui.test/pom.xml b/com.avaloq.tools.ddk.checkcfg.ui.test/pom.xml
index 6b34c542f..0b56f53c7 100644
--- a/com.avaloq.tools.ddk.checkcfg.ui.test/pom.xml
+++ b/com.avaloq.tools.ddk.checkcfg.ui.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.checkcfg.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.checkcfg.ui/META-INF/MANIFEST.MF
index 48348cf5c..81c8b4931 100644
--- a/com.avaloq.tools.ddk.checkcfg.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.checkcfg.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.checkcfg.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.checkcfg.ui;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: com.avaloq.tools.ddk.checkcfg.ui.internal.Activator
diff --git a/com.avaloq.tools.ddk.checkcfg.ui/pom.xml b/com.avaloq.tools.ddk.checkcfg.ui/pom.xml
index 2b91e7655..1db1fb4db 100644
--- a/com.avaloq.tools.ddk.checkcfg.ui/pom.xml
+++ b/com.avaloq.tools.ddk.checkcfg.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.feature/feature.xml b/com.avaloq.tools.ddk.feature/feature.xml
index 38ceb52f4..8eb30011e 100644
--- a/com.avaloq.tools.ddk.feature/feature.xml
+++ b/com.avaloq.tools.ddk.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.avaloq.tools.ddk.feature"
       label="com.avaloq.tools.ddk.feature"
-      version="1.5.0.qualifier"
+      version="1.5.0.v20180710-0925-REL"
       provider-name="Avaloq Evolution AG">
 
    <description>
diff --git a/com.avaloq.tools.ddk.feature/pom.xml b/com.avaloq.tools.ddk.feature/pom.xml
index 43128985d..2dee7abda 100644
--- a/com.avaloq.tools.ddk.feature/pom.xml
+++ b/com.avaloq.tools.ddk.feature/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.runtime.feature/feature.xml b/com.avaloq.tools.ddk.runtime.feature/feature.xml
index f324c4f30..70c28e782 100644
--- a/com.avaloq.tools.ddk.runtime.feature/feature.xml
+++ b/com.avaloq.tools.ddk.runtime.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.avaloq.tools.ddk.runtime.feature"
       label="com.avaloq.tools.ddk.runtime.feature"
-      version="1.5.0.qualifier"
+      version="1.5.0.v20180710-0925-REL"
       provider-name="Avaloq Evolution AG">
 
    <description>
diff --git a/com.avaloq.tools.ddk.runtime.feature/pom.xml b/com.avaloq.tools.ddk.runtime.feature/pom.xml
index c0a5ca239..649fa9799 100644
--- a/com.avaloq.tools.ddk.runtime.feature/pom.xml
+++ b/com.avaloq.tools.ddk.runtime.feature/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.runtime.source.feature/feature.xml b/com.avaloq.tools.ddk.runtime.source.feature/feature.xml
index 31394f72a..eff822a31 100644
--- a/com.avaloq.tools.ddk.runtime.source.feature/feature.xml
+++ b/com.avaloq.tools.ddk.runtime.source.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.avaloq.tools.ddk.runtime.source.feature"
       label="com.avaloq.tools.ddk.runtime.source.feature"
-      version="1.5.0.qualifier"
+      version="1.5.0.v20180710-0925-REL"
       provider-name="Avaloq Evolution AG">
 
    <plugin
diff --git a/com.avaloq.tools.ddk.runtime.source.feature/pom.xml b/com.avaloq.tools.ddk.runtime.source.feature/pom.xml
index 7f252ac25..7e05df39c 100644
--- a/com.avaloq.tools.ddk.runtime.source.feature/pom.xml
+++ b/com.avaloq.tools.ddk.runtime.source.feature/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.source.feature/feature.xml b/com.avaloq.tools.ddk.source.feature/feature.xml
index 330579be3..b62f51da8 100644
--- a/com.avaloq.tools.ddk.source.feature/feature.xml
+++ b/com.avaloq.tools.ddk.source.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.avaloq.tools.ddk.source.feature"
       label="com.avaloq.tools.ddk.source.feature"
-      version="1.5.0.qualifier"
+      version="1.5.0.v20180710-0925-REL"
       provider-name="Avaloq Evolution AG">
 
    <plugin
diff --git a/com.avaloq.tools.ddk.source.feature/pom.xml b/com.avaloq.tools.ddk.source.feature/pom.xml
index 371ca4816..4adb3c4c5 100644
--- a/com.avaloq.tools.ddk.source.feature/pom.xml
+++ b/com.avaloq.tools.ddk.source.feature/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF
index 8f2929fc0..4e1df2d6e 100644
--- a/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.test.core
 Bundle-SymbolicName: com.avaloq.tools.ddk.test.core;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.test.core/pom.xml b/com.avaloq.tools.ddk.test.core/pom.xml
index c4023c0b0..238e09d6d 100644
--- a/com.avaloq.tools.ddk.test.core/pom.xml
+++ b/com.avaloq.tools.ddk.test.core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.test.ui.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.test.ui.test/META-INF/MANIFEST.MF
index bbedefa5c..f4f02f398 100644
--- a/com.avaloq.tools.ddk.test.ui.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.test.ui.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.test.ui.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.test.ui.test;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/com.avaloq.tools.ddk.test.ui.test/pom.xml b/com.avaloq.tools.ddk.test.ui.test/pom.xml
index fd1a85e96..9ecf97632 100644
--- a/com.avaloq.tools.ddk.test.ui.test/pom.xml
+++ b/com.avaloq.tools.ddk.test.ui.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF
index 7def034ca..410c98c51 100644
--- a/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.test.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.test.ui;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: com.avaloq.tools.ddk.test.ui.Activator
diff --git a/com.avaloq.tools.ddk.test.ui/pom.xml b/com.avaloq.tools.ddk.test.ui/pom.xml
index 3dcf41b1f..45edfc8b9 100644
--- a/com.avaloq.tools.ddk.test.ui/pom.xml
+++ b/com.avaloq.tools.ddk.test.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.typesystem.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.typesystem.test/META-INF/MANIFEST.MF
index 93640fcd2..e286ec4f2 100644
--- a/com.avaloq.tools.ddk.typesystem.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.typesystem.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.typesystem.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.typesystem.test;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.typesystem.test/pom.xml b/com.avaloq.tools.ddk.typesystem.test/pom.xml
index bd93d15e7..54f4b8062 100644
--- a/com.avaloq.tools.ddk.typesystem.test/pom.xml
+++ b/com.avaloq.tools.ddk.typesystem.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.typesystem/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.typesystem/META-INF/MANIFEST.MF
index 79f0f5f27..02d16be8a 100644
--- a/com.avaloq.tools.ddk.typesystem/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.typesystem/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.typesystem
 Bundle-SymbolicName: com.avaloq.tools.ddk.typesystem;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.apache.log4j
diff --git a/com.avaloq.tools.ddk.typesystem/pom.xml b/com.avaloq.tools.ddk.typesystem/pom.xml
index ecde24efd..2ec59e38b 100644
--- a/com.avaloq.tools.ddk.typesystem/pom.xml
+++ b/com.avaloq.tools.ddk.typesystem/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.workflow/pom.xml b/com.avaloq.tools.ddk.workflow/pom.xml
index 98d41f753..7bc8c44fe 100644
--- a/com.avaloq.tools.ddk.workflow/pom.xml
+++ b/com.avaloq.tools.ddk.workflow/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.builder.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.builder.ui/META-INF/MANIFEST.MF
index 1b39e4d80..5ebed4445 100644
--- a/com.avaloq.tools.ddk.xtext.builder.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.builder.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.builder.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.builder.ui;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Vendor: Avaloq Evolution AG
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.xtext,
diff --git a/com.avaloq.tools.ddk.xtext.builder.ui/pom.xml b/com.avaloq.tools.ddk.xtext.builder.ui/pom.xml
index a5cf17ff4..ac6972680 100644
--- a/com.avaloq.tools.ddk.xtext.builder.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.builder.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.builder/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.builder/META-INF/MANIFEST.MF
index ed0917da9..ec89ffbad 100644
--- a/com.avaloq.tools.ddk.xtext.builder/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.builder/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.builder
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.builder;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Vendor: Avaloq Evolution AG
 Require-Bundle: org.eclipse.xtext.builder,
  org.eclipse.xtext.ui,
diff --git a/com.avaloq.tools.ddk.xtext.builder/pom.xml b/com.avaloq.tools.ddk.xtext.builder/pom.xml
index f75a742fd..1be05e552 100644
--- a/com.avaloq.tools.ddk.xtext.builder/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.builder/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.common.types.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.common.types.ui/META-INF/MANIFEST.MF
index f274088f3..4fe2131ee 100644
--- a/com.avaloq.tools.ddk.xtext.common.types.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.common.types.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.common.types.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.common.types.ui;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.common.types.ui/pom.xml b/com.avaloq.tools.ddk.xtext.common.types.ui/pom.xml
index 52959ebd5..8cfd2566c 100644
--- a/com.avaloq.tools.ddk.xtext.common.types.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.common.types.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.common.types/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.common.types/META-INF/MANIFEST.MF
index 789ad2249..900454d47 100644
--- a/com.avaloq.tools.ddk.xtext.common.types/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.common.types/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.common.types
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.common.types;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.common.types/pom.xml b/com.avaloq.tools.ddk.xtext.common.types/pom.xml
index 697b6d768..273a38dac 100644
--- a/com.avaloq.tools.ddk.xtext.common.types/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.common.types/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.common.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.common.ui/META-INF/MANIFEST.MF
index 5512deef3..998ad0855 100644
--- a/com.avaloq.tools.ddk.xtext.common.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.common.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.common.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.common.ui;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: com.avaloq.tools.ddk.xtext.common.ui.contentassist
diff --git a/com.avaloq.tools.ddk.xtext.common.ui/pom.xml b/com.avaloq.tools.ddk.xtext.common.ui/pom.xml
index 3f4df44ab..9bfb68be4 100644
--- a/com.avaloq.tools.ddk.xtext.common.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.common.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.export.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.export.generator/META-INF/MANIFEST.MF
index e3828d39a..073037831 100644
--- a/com.avaloq.tools.ddk.xtext.export.generator/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.export.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.export.generator
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.export.generator;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.xtext,
diff --git a/com.avaloq.tools.ddk.xtext.export.generator/pom.xml b/com.avaloq.tools.ddk.xtext.export.generator/pom.xml
index eb1b4389e..aea5a8a3a 100644
--- a/com.avaloq.tools.ddk.xtext.export.generator/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.export.generator/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.export.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.export.test/META-INF/MANIFEST.MF
index bc0029c63..f7693477d 100644
--- a/com.avaloq.tools.ddk.xtext.export.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.export.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.export.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.export.test;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.export.test/pom.xml b/com.avaloq.tools.ddk.xtext.export.test/pom.xml
index 7bd33fec7..99d64c549 100644
--- a/com.avaloq.tools.ddk.xtext.export.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.export.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.export.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.export.ui/META-INF/MANIFEST.MF
index a5c42b4be..1491a074f 100644
--- a/com.avaloq.tools.ddk.xtext.export.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.export.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.export.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.export.ui;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: com.avaloq.tools.ddk.xtext.export.ui.internal.ExportActivator
diff --git a/com.avaloq.tools.ddk.xtext.export.ui/pom.xml b/com.avaloq.tools.ddk.xtext.export.ui/pom.xml
index fb6ded37c..25ab5fcd7 100644
--- a/com.avaloq.tools.ddk.xtext.export.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.export.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF
index 3410d08e7..8e247b291 100644
--- a/com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.export
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.export;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.export/pom.xml b/com.avaloq.tools.ddk.xtext.export/pom.xml
index dec146861..66f222847 100644
--- a/com.avaloq.tools.ddk.xtext.export/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.export/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.expression.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.expression.ui/META-INF/MANIFEST.MF
index a55040c9a..ee7ed4db2 100644
--- a/com.avaloq.tools.ddk.xtext.expression.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.expression.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.expression.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.expression.ui;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: com.avaloq.tools.ddk.xtext.expression.ui.internal.Activator
diff --git a/com.avaloq.tools.ddk.xtext.expression.ui/pom.xml b/com.avaloq.tools.ddk.xtext.expression.ui/pom.xml
index f1731ab8c..7aab8f90b 100644
--- a/com.avaloq.tools.ddk.xtext.expression.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.expression.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF
index ac2e474fb..882d8c764 100644
--- a/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.expression
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.expression;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.xtext,
diff --git a/com.avaloq.tools.ddk.xtext.expression/pom.xml b/com.avaloq.tools.ddk.xtext.expression/pom.xml
index 2da225091..aa28f8ee7 100644
--- a/com.avaloq.tools.ddk.xtext.expression/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.expression/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.format.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.format.generator/META-INF/MANIFEST.MF
index 0b9cce617..81b5316a4 100644
--- a/com.avaloq.tools.ddk.xtext.format.generator/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.format.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.format.generator
 Bundle-Vendor: Avaloq Evolution AG
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.format.generator;singleton:=true
 Require-Bundle: com.avaloq.tools.ddk.xtext.format;visibility:=reexport,
  org.eclipse.xtext.generator,
diff --git a/com.avaloq.tools.ddk.xtext.format.generator/pom.xml b/com.avaloq.tools.ddk.xtext.format.generator/pom.xml
index a8903e163..8fb7817f6 100644
--- a/com.avaloq.tools.ddk.xtext.format.generator/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.format.generator/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.format.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.format.test/META-INF/MANIFEST.MF
index f2910cff8..69a7dc2a3 100644
--- a/com.avaloq.tools.ddk.xtext.format.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.format.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.format.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.format.test;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.format.test/pom.xml b/com.avaloq.tools.ddk.xtext.format.test/pom.xml
index dd19cee78..e5d9472af 100644
--- a/com.avaloq.tools.ddk.xtext.format.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.format.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.format.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.format.ui/META-INF/MANIFEST.MF
index f1d53601a..35dffb82f 100644
--- a/com.avaloq.tools.ddk.xtext.format.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.format.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.format.ui
 Bundle-Vendor: Avaloq Evolution AG
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.format.ui;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.avaloq.tools.ddk.xtext.format;visibility:=reexport,
diff --git a/com.avaloq.tools.ddk.xtext.format.ui/pom.xml b/com.avaloq.tools.ddk.xtext.format.ui/pom.xml
index dda04d118..636f51bd2 100644
--- a/com.avaloq.tools.ddk.xtext.format.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.format.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.format/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.format/META-INF/MANIFEST.MF
index a9624a507..e831d4da8 100644
--- a/com.avaloq.tools.ddk.xtext.format/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.format/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.format
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.format;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.format/pom.xml b/com.avaloq.tools.ddk.xtext.format/pom.xml
index 24b31a5a1..652e89bca 100644
--- a/com.avaloq.tools.ddk.xtext.format/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.format/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.generator.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.generator.test/META-INF/MANIFEST.MF
index 9210dd43f..fb36ba494 100644
--- a/com.avaloq.tools.ddk.xtext.generator.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.generator.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.generator.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.generator.test;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.generator.test/pom.xml b/com.avaloq.tools.ddk.xtext.generator.test/pom.xml
index d560ccacc..c5bc97d5a 100644
--- a/com.avaloq.tools.ddk.xtext.generator.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.generator.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF
index 4e9c21a8b..e88ea685f 100644
--- a/com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.generator
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.generator;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.jface,
diff --git a/com.avaloq.tools.ddk.xtext.generator/pom.xml b/com.avaloq.tools.ddk.xtext.generator/pom.xml
index 821c3280f..b29c1f478 100644
--- a/com.avaloq.tools.ddk.xtext.generator/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.generator/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.scope.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.scope.generator/META-INF/MANIFEST.MF
index 8fdbb6aab..ae962575f 100644
--- a/com.avaloq.tools.ddk.xtext.scope.generator/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.scope.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.scope.generator
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.scope.generator;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.avaloq.tools.ddk.xtext.scope;visibility:=reexport,
diff --git a/com.avaloq.tools.ddk.xtext.scope.generator/pom.xml b/com.avaloq.tools.ddk.xtext.scope.generator/pom.xml
index 44f5f74ce..8076f5179 100644
--- a/com.avaloq.tools.ddk.xtext.scope.generator/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.scope.generator/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.scope.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.scope.ui/META-INF/MANIFEST.MF
index 71fe753fe..d017678e4 100644
--- a/com.avaloq.tools.ddk.xtext.scope.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.scope.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.scope.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.scope.ui;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: com.avaloq.tools.ddk.xtext.scope.ui.internal.ScopeActivator
diff --git a/com.avaloq.tools.ddk.xtext.scope.ui/pom.xml b/com.avaloq.tools.ddk.xtext.scope.ui/pom.xml
index b76a881ef..a4ebaa409 100644
--- a/com.avaloq.tools.ddk.xtext.scope.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.scope.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF
index 7eae1d87f..075304097 100644
--- a/com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.scope
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.scope;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.xtext,
diff --git a/com.avaloq.tools.ddk.xtext.scope/pom.xml b/com.avaloq.tools.ddk.xtext.scope/pom.xml
index e643cc20c..a456e19b7 100644
--- a/com.avaloq.tools.ddk.xtext.scope/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.scope/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF
index a85b76627..7fa6e236c 100644
--- a/com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.test.core
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.test.core;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.avaloq.tools.ddk.xtext,
diff --git a/com.avaloq.tools.ddk.xtext.test.core/pom.xml b/com.avaloq.tools.ddk.xtext.test.core/pom.xml
index 7cf0ee08b..1f82028ae 100644
--- a/com.avaloq.tools.ddk.xtext.test.core/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.test.core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF
index 30cef4055..d2ca99df9 100644
--- a/com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.test;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.test/pom.xml b/com.avaloq.tools.ddk.xtext.test/pom.xml
index dfc4b5241..25842717d 100644
--- a/com.avaloq.tools.ddk.xtext.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF
index 2100e19ad..fd77e01da 100644
--- a/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.ui.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.ui.test;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.xtext.ui,
diff --git a/com.avaloq.tools.ddk.xtext.ui.test/pom.xml b/com.avaloq.tools.ddk.xtext.ui.test/pom.xml
index 86711ea74..2b2ba5125 100644
--- a/com.avaloq.tools.ddk.xtext.ui.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.ui.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.ui/META-INF/MANIFEST.MF
index 9963b8f15..23c145e2a 100644
--- a/com.avaloq.tools.ddk.xtext.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.ui;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.ui/pom.xml b/com.avaloq.tools.ddk.xtext.ui/pom.xml
index 089c03b77..038bd21d3 100644
--- a/com.avaloq.tools.ddk.xtext.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.valid.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.valid.generator/META-INF/MANIFEST.MF
index 6e892816d..ed124e586 100644
--- a/com.avaloq.tools.ddk.xtext.valid.generator/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.valid.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.valid.generator
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.valid.generator;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.avaloq.tools.ddk.xtext.valid;visibility:=reexport,
diff --git a/com.avaloq.tools.ddk.xtext.valid.generator/pom.xml b/com.avaloq.tools.ddk.xtext.valid.generator/pom.xml
index 4d24dca2d..315f380af 100644
--- a/com.avaloq.tools.ddk.xtext.valid.generator/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.valid.generator/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.valid.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.valid.test/META-INF/MANIFEST.MF
index 0bbcc9181..68a2f75f7 100644
--- a/com.avaloq.tools.ddk.xtext.valid.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.valid.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.valid.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.valid.test;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.valid.test/pom.xml b/com.avaloq.tools.ddk.xtext.valid.test/pom.xml
index 3fdc9ca3e..9591332fd 100644
--- a/com.avaloq.tools.ddk.xtext.valid.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.valid.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.valid.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.valid.ui/META-INF/MANIFEST.MF
index 10234f339..ef4293f25 100644
--- a/com.avaloq.tools.ddk.xtext.valid.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.valid.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.valid.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.valid.ui;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.valid.ui/pom.xml b/com.avaloq.tools.ddk.xtext.valid.ui/pom.xml
index 4c696f009..6acbedc01 100644
--- a/com.avaloq.tools.ddk.xtext.valid.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.valid.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.valid/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.valid/META-INF/MANIFEST.MF
index d2339bf03..4855847ed 100644
--- a/com.avaloq.tools.ddk.xtext.valid/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.valid/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.valid
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.valid;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.valid/pom.xml b/com.avaloq.tools.ddk.xtext.valid/pom.xml
index e559ff091..2ae3f38ed 100644
--- a/com.avaloq.tools.ddk.xtext.valid/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.valid/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext/META-INF/MANIFEST.MF
index 10304035e..f4c4061e7 100644
--- a/com.avaloq.tools.ddk.xtext/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext/pom.xml b/com.avaloq.tools.ddk.xtext/pom.xml
index 9786a3884..38768e3d5 100644
--- a/com.avaloq.tools.ddk.xtext/pom.xml
+++ b/com.avaloq.tools.ddk.xtext/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtextspy.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtextspy.test/META-INF/MANIFEST.MF
index e8d00c5f2..17411f35a 100644
--- a/com.avaloq.tools.ddk.xtextspy.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtextspy.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtextspy.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtextspy.test;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtextspy.test/pom.xml b/com.avaloq.tools.ddk.xtextspy.test/pom.xml
index e74819458..c7659185d 100644
--- a/com.avaloq.tools.ddk.xtextspy.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtextspy.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtextspy/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtextspy/META-INF/MANIFEST.MF
index 5804e8c15..9e7d0cff8 100644
--- a/com.avaloq.tools.ddk.xtextspy/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtextspy/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Eclipse-ExtensibleAPI: true
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtextspy
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtextspy; singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.0.v20180710-0925-REL
 Bundle-Activator: com.avaloq.tools.ddk.xtextspy.internal.Activator
 Bundle-Vendor: Avaloq Evolution AG
 Require-Bundle: org.eclipse.ui,
diff --git a/com.avaloq.tools.ddk.xtextspy/pom.xml b/com.avaloq.tools.ddk.xtextspy/pom.xml
index 11e7ff070..06a7aa851 100644
--- a/com.avaloq.tools.ddk.xtextspy/pom.xml
+++ b/com.avaloq.tools.ddk.xtextspy/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/ddk-parent/pom.xml b/ddk-parent/pom.xml
index f57a24d65..a2d44f1eb 100644
--- a/ddk-parent/pom.xml
+++ b/ddk-parent/pom.xml
@@ -7,7 +7,7 @@
 
   <groupId>com.avaloq.tools.ddk</groupId>
   <artifactId>ddk-parent</artifactId>
-  <version>1.5.0-SNAPSHOT</version>
+  <version>1.5.0.v20180710-0925-REL</version>
   <packaging>pom</packaging>
 
   <properties>
diff --git a/ddk-repository/category.xml b/ddk-repository/category.xml
index f42bed345..85ea28c1b 100644
--- a/ddk-repository/category.xml
+++ b/ddk-repository/category.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/com.avaloq.tools.ddk.feature_1.5.0.qualifier.jar" id="com.avaloq.tools.ddk.feature" version="1.5.0.qualifier">
+   <feature url="features/com.avaloq.tools.ddk.feature_1.5.0.v20180710-0925-REL.jar" id="com.avaloq.tools.ddk.feature" version="1.5.0.v20180710-0925-REL">
       <category name="com.avaloq.tools.ddk.sdk"/>
    </feature>
-   <feature url="features/com.avaloq.tools.ddk.source.feature_1.5.0.qualifier.jar" id="com.avaloq.tools.ddk.source.feature" version="1.5.0.qualifier">
+   <feature url="features/com.avaloq.tools.ddk.source.feature_1.5.0.v20180710-0925-REL.jar" id="com.avaloq.tools.ddk.source.feature" version="1.5.0.v20180710-0925-REL">
       <category name="com.avaloq.tools.ddk.sdk"/>
    </feature>
-   <feature url="features/com.avaloq.tools.ddk.runtime.feature_1.5.0.qualifier.jar" id="com.avaloq.tools.ddk.runtime.feature" version="1.5.0.qualifier">
+   <feature url="features/com.avaloq.tools.ddk.runtime.feature_1.5.0.v20180710-0925-REL.jar" id="com.avaloq.tools.ddk.runtime.feature" version="1.5.0.v20180710-0925-REL">
       <category name="com.avaloq.tools.ddk.runtime"/>
    </feature>
-   <feature url="features/com.avaloq.tools.ddk.runtime.source.feature_1.5.0.qualifier.jar" id="com.avaloq.tools.ddk.runtime.source.feature" version="1.5.0.qualifier">
+   <feature url="features/com.avaloq.tools.ddk.runtime.source.feature_1.5.0.v20180710-0925-REL.jar" id="com.avaloq.tools.ddk.runtime.source.feature" version="1.5.0.v20180710-0925-REL">
       <category name="com.avaloq.tools.ddk.runtime"/>
    </feature>
    <category-def name="com.avaloq.tools.ddk.sdk" label="DSL Developer Kit"/>
diff --git a/ddk-repository/pom.xml b/ddk-repository/pom.xml
index 6656dfec5..5b43bb423 100644
--- a/ddk-repository/pom.xml
+++ b/ddk-repository/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/ddk-target/pom.xml b/ddk-target/pom.xml
index fa3e8298b..a3eb54eac 100644
--- a/ddk-target/pom.xml
+++ b/ddk-target/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0.v20180710-0925-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>

From b8c1aa90e3cce83eeb77336348a1f63b8ab18275 Mon Sep 17 00:00:00 2001
From: Jenkins <hudson@avaloq.com>
Date: Tue, 10 Jul 2018 09:25:36 +0200
Subject: [PATCH 30/56] Next development version: 2.0.0-SNAPSHOT

---
 com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.check.core.test/pom.xml              | 2 +-
 com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF      | 2 +-
 com.avaloq.tools.ddk.check.core/pom.xml                   | 2 +-
 com.avaloq.tools.ddk.check.generator/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.check.generator/pom.xml              | 2 +-
 com.avaloq.tools.ddk.check.lib/META-INF/MANIFEST.MF       | 2 +-
 com.avaloq.tools.ddk.check.lib/pom.xml                    | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.check.runtime.core.test/pom.xml      | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.check.runtime.core/pom.xml           | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.check.runtime.ui/pom.xml             | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.check.test.runtime.tests/pom.xml     | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.check.test.runtime.ui/pom.xml        | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.check.test.runtime/pom.xml           | 2 +-
 com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF   | 2 +-
 com.avaloq.tools.ddk.check.ui.test/pom.xml                | 2 +-
 com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF        | 2 +-
 com.avaloq.tools.ddk.check.ui/pom.xml                     | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.checkcfg.core.test/pom.xml           | 2 +-
 com.avaloq.tools.ddk.checkcfg.core/META-INF/MANIFEST.MF   | 2 +-
 com.avaloq.tools.ddk.checkcfg.core/pom.xml                | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.checkcfg.ui.test/pom.xml             | 2 +-
 com.avaloq.tools.ddk.checkcfg.ui/META-INF/MANIFEST.MF     | 2 +-
 com.avaloq.tools.ddk.checkcfg.ui/pom.xml                  | 2 +-
 com.avaloq.tools.ddk.feature/feature.xml                  | 2 +-
 com.avaloq.tools.ddk.feature/pom.xml                      | 2 +-
 com.avaloq.tools.ddk.runtime.feature/feature.xml          | 2 +-
 com.avaloq.tools.ddk.runtime.feature/pom.xml              | 2 +-
 com.avaloq.tools.ddk.runtime.source.feature/feature.xml   | 2 +-
 com.avaloq.tools.ddk.runtime.source.feature/pom.xml       | 2 +-
 com.avaloq.tools.ddk.source.feature/feature.xml           | 2 +-
 com.avaloq.tools.ddk.source.feature/pom.xml               | 2 +-
 com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF       | 2 +-
 com.avaloq.tools.ddk.test.core/pom.xml                    | 2 +-
 com.avaloq.tools.ddk.test.ui.test/META-INF/MANIFEST.MF    | 2 +-
 com.avaloq.tools.ddk.test.ui.test/pom.xml                 | 2 +-
 com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF         | 2 +-
 com.avaloq.tools.ddk.test.ui/pom.xml                      | 2 +-
 com.avaloq.tools.ddk.typesystem.test/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.typesystem.test/pom.xml              | 2 +-
 com.avaloq.tools.ddk.typesystem/META-INF/MANIFEST.MF      | 2 +-
 com.avaloq.tools.ddk.typesystem/pom.xml                   | 2 +-
 com.avaloq.tools.ddk.workflow/pom.xml                     | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.builder.ui/pom.xml             | 2 +-
 com.avaloq.tools.ddk.xtext.builder/META-INF/MANIFEST.MF   | 2 +-
 com.avaloq.tools.ddk.xtext.builder/pom.xml                | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.common.types.ui/pom.xml        | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.common.types/pom.xml           | 2 +-
 com.avaloq.tools.ddk.xtext.common.ui/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.xtext.common.ui/pom.xml              | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.export.generator/pom.xml       | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.export.test/pom.xml            | 2 +-
 com.avaloq.tools.ddk.xtext.export.ui/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.xtext.export.ui/pom.xml              | 2 +-
 com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF    | 2 +-
 com.avaloq.tools.ddk.xtext.export/pom.xml                 | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.expression.ui/pom.xml          | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.expression/pom.xml             | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.format.generator/pom.xml       | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.format.test/pom.xml            | 2 +-
 com.avaloq.tools.ddk.xtext.format.ui/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.xtext.format.ui/pom.xml              | 2 +-
 com.avaloq.tools.ddk.xtext.format/META-INF/MANIFEST.MF    | 2 +-
 com.avaloq.tools.ddk.xtext.format/pom.xml                 | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.generator.test/pom.xml         | 2 +-
 com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.xtext.generator/pom.xml              | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.scope.generator/pom.xml        | 2 +-
 com.avaloq.tools.ddk.xtext.scope.ui/META-INF/MANIFEST.MF  | 2 +-
 com.avaloq.tools.ddk.xtext.scope.ui/pom.xml               | 2 +-
 com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF     | 2 +-
 com.avaloq.tools.ddk.xtext.scope/pom.xml                  | 2 +-
 com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.xtext.test.core/pom.xml              | 2 +-
 com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF      | 2 +-
 com.avaloq.tools.ddk.xtext.test/pom.xml                   | 2 +-
 com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF   | 2 +-
 com.avaloq.tools.ddk.xtext.ui.test/pom.xml                | 2 +-
 com.avaloq.tools.ddk.xtext.ui/META-INF/MANIFEST.MF        | 2 +-
 com.avaloq.tools.ddk.xtext.ui/pom.xml                     | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.valid.generator/pom.xml        | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.valid.test/pom.xml             | 2 +-
 com.avaloq.tools.ddk.xtext.valid.ui/META-INF/MANIFEST.MF  | 2 +-
 com.avaloq.tools.ddk.xtext.valid.ui/pom.xml               | 2 +-
 com.avaloq.tools.ddk.xtext.valid/META-INF/MANIFEST.MF     | 2 +-
 com.avaloq.tools.ddk.xtext.valid/pom.xml                  | 2 +-
 com.avaloq.tools.ddk.xtext/META-INF/MANIFEST.MF           | 2 +-
 com.avaloq.tools.ddk.xtext/pom.xml                        | 2 +-
 com.avaloq.tools.ddk.xtextspy.test/META-INF/MANIFEST.MF   | 2 +-
 com.avaloq.tools.ddk.xtextspy.test/pom.xml                | 2 +-
 com.avaloq.tools.ddk.xtextspy/META-INF/MANIFEST.MF        | 2 +-
 com.avaloq.tools.ddk.xtextspy/pom.xml                     | 2 +-
 ddk-parent/pom.xml                                        | 2 +-
 ddk-repository/category.xml                               | 8 ++++----
 ddk-repository/pom.xml                                    | 2 +-
 ddk-target/pom.xml                                        | 2 +-
 117 files changed, 120 insertions(+), 120 deletions(-)

diff --git a/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF
index 7d419c21a..8c7def500 100644
--- a/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.core.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.core.test;singleton:=true
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.check.core.test/pom.xml b/com.avaloq.tools.ddk.check.core.test/pom.xml
index 1e246e9c7..9e1ce9254 100644
--- a/com.avaloq.tools.ddk.check.core.test/pom.xml
+++ b/com.avaloq.tools.ddk.check.core.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF
index 3d6dc2699..33c494fde 100644
--- a/com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.core
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.core;singleton:=true
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.check.core/pom.xml b/com.avaloq.tools.ddk.check.core/pom.xml
index a94ef67de..c7196019d 100644
--- a/com.avaloq.tools.ddk.check.core/pom.xml
+++ b/com.avaloq.tools.ddk.check.core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.check.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.generator/META-INF/MANIFEST.MF
index 39f784df3..0346b7ac3 100644
--- a/com.avaloq.tools.ddk.check.generator/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.generator
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.generator;singleton:=true
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.check.generator/pom.xml b/com.avaloq.tools.ddk.check.generator/pom.xml
index 816351516..e748d587e 100644
--- a/com.avaloq.tools.ddk.check.generator/pom.xml
+++ b/com.avaloq.tools.ddk.check.generator/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.check.lib/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.lib/META-INF/MANIFEST.MF
index e7738122f..c5dbd4903 100644
--- a/com.avaloq.tools.ddk.check.lib/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.lib/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.lib
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.lib
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.xtext,
diff --git a/com.avaloq.tools.ddk.check.lib/pom.xml b/com.avaloq.tools.ddk.check.lib/pom.xml
index 5311dfeb6..1209d3296 100644
--- a/com.avaloq.tools.ddk.check.lib/pom.xml
+++ b/com.avaloq.tools.ddk.check.lib/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.check.runtime.core.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.runtime.core.test/META-INF/MANIFEST.MF
index 3d886f182..f65f3a7d0 100644
--- a/com.avaloq.tools.ddk.check.runtime.core.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.runtime.core.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.runtime.core.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.runtime.core.test;singleton:=true
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui,
diff --git a/com.avaloq.tools.ddk.check.runtime.core.test/pom.xml b/com.avaloq.tools.ddk.check.runtime.core.test/pom.xml
index d1ee300c7..46c634faa 100644
--- a/com.avaloq.tools.ddk.check.runtime.core.test/pom.xml
+++ b/com.avaloq.tools.ddk.check.runtime.core.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.check.runtime.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.runtime.core/META-INF/MANIFEST.MF
index 98452a3ca..a87c57b25 100644
--- a/com.avaloq.tools.ddk.check.runtime.core/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.runtime.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.runtime.core
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.runtime.core;singleton:=true
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.resources,
diff --git a/com.avaloq.tools.ddk.check.runtime.core/pom.xml b/com.avaloq.tools.ddk.check.runtime.core/pom.xml
index 9861b5317..6876ba1ba 100644
--- a/com.avaloq.tools.ddk.check.runtime.core/pom.xml
+++ b/com.avaloq.tools.ddk.check.runtime.core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.check.runtime.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.runtime.ui/META-INF/MANIFEST.MF
index fff4ad17b..4069e5b8e 100644
--- a/com.avaloq.tools.ddk.check.runtime.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.runtime.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.runtime.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.runtime.ui;singleton:=true
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: com.avaloq.tools.ddk.check.runtime.ui.internal.Activator
 Bundle-Vendor: Avaloq Evolution AG
 Require-Bundle: org.eclipse.ui,
diff --git a/com.avaloq.tools.ddk.check.runtime.ui/pom.xml b/com.avaloq.tools.ddk.check.runtime.ui/pom.xml
index 859d6ee20..d79a5a869 100644
--- a/com.avaloq.tools.ddk.check.runtime.ui/pom.xml
+++ b/com.avaloq.tools.ddk.check.runtime.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF
index 788928e60..d909d8755 100644
--- a/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.test.runtime.tests
 Bundle-Vendor: Avaloq Evolution AG
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.test.runtime.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.avaloq.tools.ddk.check.runtime.core,
diff --git a/com.avaloq.tools.ddk.check.test.runtime.tests/pom.xml b/com.avaloq.tools.ddk.check.test.runtime.tests/pom.xml
index 5db9497ad..c217f956b 100644
--- a/com.avaloq.tools.ddk.check.test.runtime.tests/pom.xml
+++ b/com.avaloq.tools.ddk.check.test.runtime.tests/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.check.test.runtime.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.test.runtime.ui/META-INF/MANIFEST.MF
index 3fb21f8a9..9e799e5fb 100644
--- a/com.avaloq.tools.ddk.check.test.runtime.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.test.runtime.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.test.runtime.ui
 Bundle-Vendor: Avaloq Evolution AG
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.test.runtime.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.avaloq.tools.ddk.check.test.runtime;visibility:=reexport,
diff --git a/com.avaloq.tools.ddk.check.test.runtime.ui/pom.xml b/com.avaloq.tools.ddk.check.test.runtime.ui/pom.xml
index 5410eaa65..c677bd599 100644
--- a/com.avaloq.tools.ddk.check.test.runtime.ui/pom.xml
+++ b/com.avaloq.tools.ddk.check.test.runtime.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.check.test.runtime/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.test.runtime/META-INF/MANIFEST.MF
index 3e86f180d..d2a1c22df 100644
--- a/com.avaloq.tools.ddk.check.test.runtime/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.test.runtime/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.test.runtime
 Bundle-Vendor: Avaloq Evolution AG
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.test.runtime;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.xtext;visibility:=reexport,
diff --git a/com.avaloq.tools.ddk.check.test.runtime/pom.xml b/com.avaloq.tools.ddk.check.test.runtime/pom.xml
index 79adbcd04..75c7c1566 100644
--- a/com.avaloq.tools.ddk.check.test.runtime/pom.xml
+++ b/com.avaloq.tools.ddk.check.test.runtime/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF
index 71c27b927..dd72335ca 100644
--- a/com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.ui.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.ui.test
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit,
diff --git a/com.avaloq.tools.ddk.check.ui.test/pom.xml b/com.avaloq.tools.ddk.check.ui.test/pom.xml
index 8b2c6e5b0..b4f4c6030 100644
--- a/com.avaloq.tools.ddk.check.ui.test/pom.xml
+++ b/com.avaloq.tools.ddk.check.ui.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF
index 48e07a11b..bfa817d2d 100644
--- a/com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.ui;singleton:=true
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: com.avaloq.tools.ddk.check.ui.internal.Activator
diff --git a/com.avaloq.tools.ddk.check.ui/pom.xml b/com.avaloq.tools.ddk.check.ui/pom.xml
index ca58e6940..43d40b009 100644
--- a/com.avaloq.tools.ddk.check.ui/pom.xml
+++ b/com.avaloq.tools.ddk.check.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.checkcfg.core.test/META-INF/MANIFEST.MF
index 1688601d3..75c136ad9 100644
--- a/com.avaloq.tools.ddk.checkcfg.core.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.checkcfg.core.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.checkcfg.core.test
 Bundle-Vendor: Avaloq Evolution AG
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-SymbolicName: com.avaloq.tools.ddk.checkcfg.core.test; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.avaloq.tools.ddk.test.core, 
diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/pom.xml b/com.avaloq.tools.ddk.checkcfg.core.test/pom.xml
index bc314c348..2efdfc89b 100644
--- a/com.avaloq.tools.ddk.checkcfg.core.test/pom.xml
+++ b/com.avaloq.tools.ddk.checkcfg.core.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.checkcfg.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.checkcfg.core/META-INF/MANIFEST.MF
index 63e8e7a2d..f972ea832 100644
--- a/com.avaloq.tools.ddk.checkcfg.core/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.checkcfg.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.checkcfg.core
 Bundle-Vendor: Avaloq Evolution AG
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-SymbolicName: com.avaloq.tools.ddk.checkcfg.core; singleton:=true
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/com.avaloq.tools.ddk.checkcfg.core/pom.xml b/com.avaloq.tools.ddk.checkcfg.core/pom.xml
index fe2dc5ef2..e00468fc6 100644
--- a/com.avaloq.tools.ddk.checkcfg.core/pom.xml
+++ b/com.avaloq.tools.ddk.checkcfg.core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.checkcfg.ui.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.checkcfg.ui.test/META-INF/MANIFEST.MF
index e25188b32..aba0dc1ee 100644
--- a/com.avaloq.tools.ddk.checkcfg.ui.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.checkcfg.ui.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.checkcfg.ui.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.checkcfg.ui.test
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: com.avaloq.tools.ddk.checkcfg.ui.test
diff --git a/com.avaloq.tools.ddk.checkcfg.ui.test/pom.xml b/com.avaloq.tools.ddk.checkcfg.ui.test/pom.xml
index 0b56f53c7..c0fb925d3 100644
--- a/com.avaloq.tools.ddk.checkcfg.ui.test/pom.xml
+++ b/com.avaloq.tools.ddk.checkcfg.ui.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.checkcfg.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.checkcfg.ui/META-INF/MANIFEST.MF
index 81c8b4931..106cf7c60 100644
--- a/com.avaloq.tools.ddk.checkcfg.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.checkcfg.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.checkcfg.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.checkcfg.ui;singleton:=true
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: com.avaloq.tools.ddk.checkcfg.ui.internal.Activator
diff --git a/com.avaloq.tools.ddk.checkcfg.ui/pom.xml b/com.avaloq.tools.ddk.checkcfg.ui/pom.xml
index 1db1fb4db..06dfa5578 100644
--- a/com.avaloq.tools.ddk.checkcfg.ui/pom.xml
+++ b/com.avaloq.tools.ddk.checkcfg.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.feature/feature.xml b/com.avaloq.tools.ddk.feature/feature.xml
index 8eb30011e..131697175 100644
--- a/com.avaloq.tools.ddk.feature/feature.xml
+++ b/com.avaloq.tools.ddk.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.avaloq.tools.ddk.feature"
       label="com.avaloq.tools.ddk.feature"
-      version="1.5.0.v20180710-0925-REL"
+      version="2.0.0.qualifier"
       provider-name="Avaloq Evolution AG">
 
    <description>
diff --git a/com.avaloq.tools.ddk.feature/pom.xml b/com.avaloq.tools.ddk.feature/pom.xml
index 2dee7abda..51b546887 100644
--- a/com.avaloq.tools.ddk.feature/pom.xml
+++ b/com.avaloq.tools.ddk.feature/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.runtime.feature/feature.xml b/com.avaloq.tools.ddk.runtime.feature/feature.xml
index 70c28e782..80221fcf1 100644
--- a/com.avaloq.tools.ddk.runtime.feature/feature.xml
+++ b/com.avaloq.tools.ddk.runtime.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.avaloq.tools.ddk.runtime.feature"
       label="com.avaloq.tools.ddk.runtime.feature"
-      version="1.5.0.v20180710-0925-REL"
+      version="2.0.0.qualifier"
       provider-name="Avaloq Evolution AG">
 
    <description>
diff --git a/com.avaloq.tools.ddk.runtime.feature/pom.xml b/com.avaloq.tools.ddk.runtime.feature/pom.xml
index 649fa9799..5e5a81238 100644
--- a/com.avaloq.tools.ddk.runtime.feature/pom.xml
+++ b/com.avaloq.tools.ddk.runtime.feature/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.runtime.source.feature/feature.xml b/com.avaloq.tools.ddk.runtime.source.feature/feature.xml
index eff822a31..7c2d23ce8 100644
--- a/com.avaloq.tools.ddk.runtime.source.feature/feature.xml
+++ b/com.avaloq.tools.ddk.runtime.source.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.avaloq.tools.ddk.runtime.source.feature"
       label="com.avaloq.tools.ddk.runtime.source.feature"
-      version="1.5.0.v20180710-0925-REL"
+      version="2.0.0.qualifier"
       provider-name="Avaloq Evolution AG">
 
    <plugin
diff --git a/com.avaloq.tools.ddk.runtime.source.feature/pom.xml b/com.avaloq.tools.ddk.runtime.source.feature/pom.xml
index 7e05df39c..71c42a608 100644
--- a/com.avaloq.tools.ddk.runtime.source.feature/pom.xml
+++ b/com.avaloq.tools.ddk.runtime.source.feature/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.source.feature/feature.xml b/com.avaloq.tools.ddk.source.feature/feature.xml
index b62f51da8..62f808e39 100644
--- a/com.avaloq.tools.ddk.source.feature/feature.xml
+++ b/com.avaloq.tools.ddk.source.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.avaloq.tools.ddk.source.feature"
       label="com.avaloq.tools.ddk.source.feature"
-      version="1.5.0.v20180710-0925-REL"
+      version="2.0.0.qualifier"
       provider-name="Avaloq Evolution AG">
 
    <plugin
diff --git a/com.avaloq.tools.ddk.source.feature/pom.xml b/com.avaloq.tools.ddk.source.feature/pom.xml
index 4adb3c4c5..d1a408f4b 100644
--- a/com.avaloq.tools.ddk.source.feature/pom.xml
+++ b/com.avaloq.tools.ddk.source.feature/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF
index 4e1df2d6e..64f53ff4e 100644
--- a/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.test.core
 Bundle-SymbolicName: com.avaloq.tools.ddk.test.core;singleton:=true
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.test.core/pom.xml b/com.avaloq.tools.ddk.test.core/pom.xml
index 238e09d6d..f51022a4a 100644
--- a/com.avaloq.tools.ddk.test.core/pom.xml
+++ b/com.avaloq.tools.ddk.test.core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.test.ui.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.test.ui.test/META-INF/MANIFEST.MF
index f4f02f398..b043c2efe 100644
--- a/com.avaloq.tools.ddk.test.ui.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.test.ui.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.test.ui.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.test.ui.test;singleton:=true
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/com.avaloq.tools.ddk.test.ui.test/pom.xml b/com.avaloq.tools.ddk.test.ui.test/pom.xml
index 9ecf97632..a75681df9 100644
--- a/com.avaloq.tools.ddk.test.ui.test/pom.xml
+++ b/com.avaloq.tools.ddk.test.ui.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF
index 410c98c51..45f6d31f6 100644
--- a/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.test.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.test.ui;singleton:=true
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: com.avaloq.tools.ddk.test.ui.Activator
diff --git a/com.avaloq.tools.ddk.test.ui/pom.xml b/com.avaloq.tools.ddk.test.ui/pom.xml
index 45edfc8b9..de42bbb1a 100644
--- a/com.avaloq.tools.ddk.test.ui/pom.xml
+++ b/com.avaloq.tools.ddk.test.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.typesystem.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.typesystem.test/META-INF/MANIFEST.MF
index e286ec4f2..755f32487 100644
--- a/com.avaloq.tools.ddk.typesystem.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.typesystem.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.typesystem.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.typesystem.test;singleton:=true
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.typesystem.test/pom.xml b/com.avaloq.tools.ddk.typesystem.test/pom.xml
index 54f4b8062..5c3674f49 100644
--- a/com.avaloq.tools.ddk.typesystem.test/pom.xml
+++ b/com.avaloq.tools.ddk.typesystem.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.typesystem/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.typesystem/META-INF/MANIFEST.MF
index 02d16be8a..0ccffb21d 100644
--- a/com.avaloq.tools.ddk.typesystem/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.typesystem/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.typesystem
 Bundle-SymbolicName: com.avaloq.tools.ddk.typesystem;singleton:=true
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.apache.log4j
diff --git a/com.avaloq.tools.ddk.typesystem/pom.xml b/com.avaloq.tools.ddk.typesystem/pom.xml
index 2ec59e38b..3513403a1 100644
--- a/com.avaloq.tools.ddk.typesystem/pom.xml
+++ b/com.avaloq.tools.ddk.typesystem/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.workflow/pom.xml b/com.avaloq.tools.ddk.workflow/pom.xml
index 7bc8c44fe..50bbd249f 100644
--- a/com.avaloq.tools.ddk.workflow/pom.xml
+++ b/com.avaloq.tools.ddk.workflow/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.builder.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.builder.ui/META-INF/MANIFEST.MF
index 5ebed4445..69105cce8 100644
--- a/com.avaloq.tools.ddk.xtext.builder.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.builder.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.builder.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.builder.ui;singleton:=true
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.xtext,
diff --git a/com.avaloq.tools.ddk.xtext.builder.ui/pom.xml b/com.avaloq.tools.ddk.xtext.builder.ui/pom.xml
index ac6972680..053a4723a 100644
--- a/com.avaloq.tools.ddk.xtext.builder.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.builder.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.builder/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.builder/META-INF/MANIFEST.MF
index ec89ffbad..8a2ecf999 100644
--- a/com.avaloq.tools.ddk.xtext.builder/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.builder/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.builder
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.builder;singleton:=true
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Require-Bundle: org.eclipse.xtext.builder,
  org.eclipse.xtext.ui,
diff --git a/com.avaloq.tools.ddk.xtext.builder/pom.xml b/com.avaloq.tools.ddk.xtext.builder/pom.xml
index 1be05e552..ee0e7b43f 100644
--- a/com.avaloq.tools.ddk.xtext.builder/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.builder/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.common.types.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.common.types.ui/META-INF/MANIFEST.MF
index 4fe2131ee..403255dca 100644
--- a/com.avaloq.tools.ddk.xtext.common.types.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.common.types.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.common.types.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.common.types.ui;singleton:=true
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.common.types.ui/pom.xml b/com.avaloq.tools.ddk.xtext.common.types.ui/pom.xml
index 8cfd2566c..1de3a3ed6 100644
--- a/com.avaloq.tools.ddk.xtext.common.types.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.common.types.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.common.types/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.common.types/META-INF/MANIFEST.MF
index 900454d47..0eec461d6 100644
--- a/com.avaloq.tools.ddk.xtext.common.types/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.common.types/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.common.types
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.common.types;singleton:=true
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.common.types/pom.xml b/com.avaloq.tools.ddk.xtext.common.types/pom.xml
index 273a38dac..0d2b80969 100644
--- a/com.avaloq.tools.ddk.xtext.common.types/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.common.types/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.common.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.common.ui/META-INF/MANIFEST.MF
index 998ad0855..d89f39bde 100644
--- a/com.avaloq.tools.ddk.xtext.common.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.common.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.common.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.common.ui;singleton:=true
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: com.avaloq.tools.ddk.xtext.common.ui.contentassist
diff --git a/com.avaloq.tools.ddk.xtext.common.ui/pom.xml b/com.avaloq.tools.ddk.xtext.common.ui/pom.xml
index 9bfb68be4..a3155171f 100644
--- a/com.avaloq.tools.ddk.xtext.common.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.common.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.export.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.export.generator/META-INF/MANIFEST.MF
index 073037831..93ba92f99 100644
--- a/com.avaloq.tools.ddk.xtext.export.generator/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.export.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.export.generator
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.export.generator;singleton:=true
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.xtext,
diff --git a/com.avaloq.tools.ddk.xtext.export.generator/pom.xml b/com.avaloq.tools.ddk.xtext.export.generator/pom.xml
index aea5a8a3a..1dd7ef5c0 100644
--- a/com.avaloq.tools.ddk.xtext.export.generator/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.export.generator/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.export.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.export.test/META-INF/MANIFEST.MF
index f7693477d..620be6b85 100644
--- a/com.avaloq.tools.ddk.xtext.export.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.export.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.export.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.export.test;singleton:=true
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.export.test/pom.xml b/com.avaloq.tools.ddk.xtext.export.test/pom.xml
index 99d64c549..1a0f61a16 100644
--- a/com.avaloq.tools.ddk.xtext.export.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.export.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.export.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.export.ui/META-INF/MANIFEST.MF
index 1491a074f..285388c37 100644
--- a/com.avaloq.tools.ddk.xtext.export.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.export.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.export.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.export.ui;singleton:=true
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: com.avaloq.tools.ddk.xtext.export.ui.internal.ExportActivator
diff --git a/com.avaloq.tools.ddk.xtext.export.ui/pom.xml b/com.avaloq.tools.ddk.xtext.export.ui/pom.xml
index 25ab5fcd7..e1c04bd7f 100644
--- a/com.avaloq.tools.ddk.xtext.export.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.export.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF
index 8e247b291..561c97fdf 100644
--- a/com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.export
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.export;singleton:=true
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.export/pom.xml b/com.avaloq.tools.ddk.xtext.export/pom.xml
index 66f222847..99ed7f831 100644
--- a/com.avaloq.tools.ddk.xtext.export/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.export/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.expression.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.expression.ui/META-INF/MANIFEST.MF
index ee7ed4db2..eab0834e9 100644
--- a/com.avaloq.tools.ddk.xtext.expression.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.expression.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.expression.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.expression.ui;singleton:=true
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: com.avaloq.tools.ddk.xtext.expression.ui.internal.Activator
diff --git a/com.avaloq.tools.ddk.xtext.expression.ui/pom.xml b/com.avaloq.tools.ddk.xtext.expression.ui/pom.xml
index 7aab8f90b..c9d8f80a0 100644
--- a/com.avaloq.tools.ddk.xtext.expression.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.expression.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF
index 882d8c764..4cef5cfbf 100644
--- a/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.expression
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.expression;singleton:=true
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.xtext,
diff --git a/com.avaloq.tools.ddk.xtext.expression/pom.xml b/com.avaloq.tools.ddk.xtext.expression/pom.xml
index aa28f8ee7..50cf4b4d2 100644
--- a/com.avaloq.tools.ddk.xtext.expression/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.expression/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.format.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.format.generator/META-INF/MANIFEST.MF
index 81b5316a4..559f915a2 100644
--- a/com.avaloq.tools.ddk.xtext.format.generator/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.format.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.format.generator
 Bundle-Vendor: Avaloq Evolution AG
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.format.generator;singleton:=true
 Require-Bundle: com.avaloq.tools.ddk.xtext.format;visibility:=reexport,
  org.eclipse.xtext.generator,
diff --git a/com.avaloq.tools.ddk.xtext.format.generator/pom.xml b/com.avaloq.tools.ddk.xtext.format.generator/pom.xml
index 8fb7817f6..483c4f52b 100644
--- a/com.avaloq.tools.ddk.xtext.format.generator/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.format.generator/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.format.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.format.test/META-INF/MANIFEST.MF
index 69a7dc2a3..c4f2d2711 100644
--- a/com.avaloq.tools.ddk.xtext.format.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.format.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.format.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.format.test;singleton:=true
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.format.test/pom.xml b/com.avaloq.tools.ddk.xtext.format.test/pom.xml
index e5d9472af..15078fc90 100644
--- a/com.avaloq.tools.ddk.xtext.format.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.format.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.format.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.format.ui/META-INF/MANIFEST.MF
index 35dffb82f..76ef57cc9 100644
--- a/com.avaloq.tools.ddk.xtext.format.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.format.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.format.ui
 Bundle-Vendor: Avaloq Evolution AG
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.format.ui;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.avaloq.tools.ddk.xtext.format;visibility:=reexport,
diff --git a/com.avaloq.tools.ddk.xtext.format.ui/pom.xml b/com.avaloq.tools.ddk.xtext.format.ui/pom.xml
index 636f51bd2..862bce37c 100644
--- a/com.avaloq.tools.ddk.xtext.format.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.format.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.format/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.format/META-INF/MANIFEST.MF
index e831d4da8..18c660819 100644
--- a/com.avaloq.tools.ddk.xtext.format/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.format/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.format
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.format;singleton:=true
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.format/pom.xml b/com.avaloq.tools.ddk.xtext.format/pom.xml
index 652e89bca..0fbcf4b64 100644
--- a/com.avaloq.tools.ddk.xtext.format/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.format/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.generator.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.generator.test/META-INF/MANIFEST.MF
index fb36ba494..d66c168ea 100644
--- a/com.avaloq.tools.ddk.xtext.generator.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.generator.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.generator.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.generator.test;singleton:=true
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.generator.test/pom.xml b/com.avaloq.tools.ddk.xtext.generator.test/pom.xml
index c5bc97d5a..319679e54 100644
--- a/com.avaloq.tools.ddk.xtext.generator.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.generator.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF
index e88ea685f..0c54e5284 100644
--- a/com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.generator
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.generator;singleton:=true
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.jface,
diff --git a/com.avaloq.tools.ddk.xtext.generator/pom.xml b/com.avaloq.tools.ddk.xtext.generator/pom.xml
index b29c1f478..3d4f52f98 100644
--- a/com.avaloq.tools.ddk.xtext.generator/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.generator/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.scope.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.scope.generator/META-INF/MANIFEST.MF
index ae962575f..7c166e421 100644
--- a/com.avaloq.tools.ddk.xtext.scope.generator/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.scope.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.scope.generator
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.scope.generator;singleton:=true
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.avaloq.tools.ddk.xtext.scope;visibility:=reexport,
diff --git a/com.avaloq.tools.ddk.xtext.scope.generator/pom.xml b/com.avaloq.tools.ddk.xtext.scope.generator/pom.xml
index 8076f5179..0beb8e394 100644
--- a/com.avaloq.tools.ddk.xtext.scope.generator/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.scope.generator/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.scope.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.scope.ui/META-INF/MANIFEST.MF
index d017678e4..1498afd62 100644
--- a/com.avaloq.tools.ddk.xtext.scope.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.scope.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.scope.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.scope.ui;singleton:=true
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: com.avaloq.tools.ddk.xtext.scope.ui.internal.ScopeActivator
diff --git a/com.avaloq.tools.ddk.xtext.scope.ui/pom.xml b/com.avaloq.tools.ddk.xtext.scope.ui/pom.xml
index a4ebaa409..3ff81caf9 100644
--- a/com.avaloq.tools.ddk.xtext.scope.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.scope.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF
index 075304097..2d8594db1 100644
--- a/com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.scope
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.scope;singleton:=true
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.xtext,
diff --git a/com.avaloq.tools.ddk.xtext.scope/pom.xml b/com.avaloq.tools.ddk.xtext.scope/pom.xml
index a456e19b7..56ff67357 100644
--- a/com.avaloq.tools.ddk.xtext.scope/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.scope/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF
index 7fa6e236c..39085b07e 100644
--- a/com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.test.core
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.test.core;singleton:=true
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.avaloq.tools.ddk.xtext,
diff --git a/com.avaloq.tools.ddk.xtext.test.core/pom.xml b/com.avaloq.tools.ddk.xtext.test.core/pom.xml
index 1f82028ae..c1237c442 100644
--- a/com.avaloq.tools.ddk.xtext.test.core/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.test.core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF
index d2ca99df9..0b970e9ae 100644
--- a/com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.test;singleton:=true
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.test/pom.xml b/com.avaloq.tools.ddk.xtext.test/pom.xml
index 25842717d..22cee8ae4 100644
--- a/com.avaloq.tools.ddk.xtext.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF
index fd77e01da..5350b34ba 100644
--- a/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.ui.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.ui.test;singleton:=true
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.xtext.ui,
diff --git a/com.avaloq.tools.ddk.xtext.ui.test/pom.xml b/com.avaloq.tools.ddk.xtext.ui.test/pom.xml
index 2b2ba5125..b99cd50b3 100644
--- a/com.avaloq.tools.ddk.xtext.ui.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.ui.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.ui/META-INF/MANIFEST.MF
index 23c145e2a..d2a5b9575 100644
--- a/com.avaloq.tools.ddk.xtext.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.ui;singleton:=true
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.ui/pom.xml b/com.avaloq.tools.ddk.xtext.ui/pom.xml
index 038bd21d3..258fa52ed 100644
--- a/com.avaloq.tools.ddk.xtext.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.valid.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.valid.generator/META-INF/MANIFEST.MF
index ed124e586..7839891ad 100644
--- a/com.avaloq.tools.ddk.xtext.valid.generator/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.valid.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.valid.generator
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.valid.generator;singleton:=true
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.avaloq.tools.ddk.xtext.valid;visibility:=reexport,
diff --git a/com.avaloq.tools.ddk.xtext.valid.generator/pom.xml b/com.avaloq.tools.ddk.xtext.valid.generator/pom.xml
index 315f380af..247e2e055 100644
--- a/com.avaloq.tools.ddk.xtext.valid.generator/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.valid.generator/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.valid.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.valid.test/META-INF/MANIFEST.MF
index 68a2f75f7..4f63b7123 100644
--- a/com.avaloq.tools.ddk.xtext.valid.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.valid.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.valid.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.valid.test;singleton:=true
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.valid.test/pom.xml b/com.avaloq.tools.ddk.xtext.valid.test/pom.xml
index 9591332fd..e971101c2 100644
--- a/com.avaloq.tools.ddk.xtext.valid.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.valid.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.valid.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.valid.ui/META-INF/MANIFEST.MF
index ef4293f25..b004a869f 100644
--- a/com.avaloq.tools.ddk.xtext.valid.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.valid.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.valid.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.valid.ui;singleton:=true
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.valid.ui/pom.xml b/com.avaloq.tools.ddk.xtext.valid.ui/pom.xml
index 6acbedc01..7ee7444e1 100644
--- a/com.avaloq.tools.ddk.xtext.valid.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.valid.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.valid/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.valid/META-INF/MANIFEST.MF
index 4855847ed..9859aa880 100644
--- a/com.avaloq.tools.ddk.xtext.valid/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.valid/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.valid
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.valid;singleton:=true
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.valid/pom.xml b/com.avaloq.tools.ddk.xtext.valid/pom.xml
index 2ae3f38ed..f4d8fcf36 100644
--- a/com.avaloq.tools.ddk.xtext.valid/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.valid/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext/META-INF/MANIFEST.MF
index f4c4061e7..85e5f14c7 100644
--- a/com.avaloq.tools.ddk.xtext/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext;singleton:=true
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext/pom.xml b/com.avaloq.tools.ddk.xtext/pom.xml
index 38768e3d5..1a9ba2230 100644
--- a/com.avaloq.tools.ddk.xtext/pom.xml
+++ b/com.avaloq.tools.ddk.xtext/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtextspy.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtextspy.test/META-INF/MANIFEST.MF
index 17411f35a..c003ffaa9 100644
--- a/com.avaloq.tools.ddk.xtextspy.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtextspy.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtextspy.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtextspy.test;singleton:=true
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtextspy.test/pom.xml b/com.avaloq.tools.ddk.xtextspy.test/pom.xml
index c7659185d..bbf3216c1 100644
--- a/com.avaloq.tools.ddk.xtextspy.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtextspy.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtextspy/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtextspy/META-INF/MANIFEST.MF
index 9e7d0cff8..b5338c2f6 100644
--- a/com.avaloq.tools.ddk.xtextspy/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtextspy/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Eclipse-ExtensibleAPI: true
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtextspy
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtextspy; singleton:=true
-Bundle-Version: 1.5.0.v20180710-0925-REL
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: com.avaloq.tools.ddk.xtextspy.internal.Activator
 Bundle-Vendor: Avaloq Evolution AG
 Require-Bundle: org.eclipse.ui,
diff --git a/com.avaloq.tools.ddk.xtextspy/pom.xml b/com.avaloq.tools.ddk.xtextspy/pom.xml
index 06a7aa851..0eb6da3ed 100644
--- a/com.avaloq.tools.ddk.xtextspy/pom.xml
+++ b/com.avaloq.tools.ddk.xtextspy/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/ddk-parent/pom.xml b/ddk-parent/pom.xml
index a2d44f1eb..754dc7e0f 100644
--- a/ddk-parent/pom.xml
+++ b/ddk-parent/pom.xml
@@ -7,7 +7,7 @@
 
   <groupId>com.avaloq.tools.ddk</groupId>
   <artifactId>ddk-parent</artifactId>
-  <version>1.5.0.v20180710-0925-REL</version>
+  <version>2.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
diff --git a/ddk-repository/category.xml b/ddk-repository/category.xml
index 85ea28c1b..2818e0a1f 100644
--- a/ddk-repository/category.xml
+++ b/ddk-repository/category.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/com.avaloq.tools.ddk.feature_1.5.0.v20180710-0925-REL.jar" id="com.avaloq.tools.ddk.feature" version="1.5.0.v20180710-0925-REL">
+   <feature url="features/com.avaloq.tools.ddk.feature_2.0.0.qualifier.jar" id="com.avaloq.tools.ddk.feature" version="2.0.0.qualifier">
       <category name="com.avaloq.tools.ddk.sdk"/>
    </feature>
-   <feature url="features/com.avaloq.tools.ddk.source.feature_1.5.0.v20180710-0925-REL.jar" id="com.avaloq.tools.ddk.source.feature" version="1.5.0.v20180710-0925-REL">
+   <feature url="features/com.avaloq.tools.ddk.source.feature_2.0.0.qualifier.jar" id="com.avaloq.tools.ddk.source.feature" version="2.0.0.qualifier">
       <category name="com.avaloq.tools.ddk.sdk"/>
    </feature>
-   <feature url="features/com.avaloq.tools.ddk.runtime.feature_1.5.0.v20180710-0925-REL.jar" id="com.avaloq.tools.ddk.runtime.feature" version="1.5.0.v20180710-0925-REL">
+   <feature url="features/com.avaloq.tools.ddk.runtime.feature_2.0.0.qualifier.jar" id="com.avaloq.tools.ddk.runtime.feature" version="2.0.0.qualifier">
       <category name="com.avaloq.tools.ddk.runtime"/>
    </feature>
-   <feature url="features/com.avaloq.tools.ddk.runtime.source.feature_1.5.0.v20180710-0925-REL.jar" id="com.avaloq.tools.ddk.runtime.source.feature" version="1.5.0.v20180710-0925-REL">
+   <feature url="features/com.avaloq.tools.ddk.runtime.source.feature_2.0.0.qualifier.jar" id="com.avaloq.tools.ddk.runtime.source.feature" version="2.0.0.qualifier">
       <category name="com.avaloq.tools.ddk.runtime"/>
    </feature>
    <category-def name="com.avaloq.tools.ddk.sdk" label="DSL Developer Kit"/>
diff --git a/ddk-repository/pom.xml b/ddk-repository/pom.xml
index 5b43bb423..09c60a335 100644
--- a/ddk-repository/pom.xml
+++ b/ddk-repository/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/ddk-target/pom.xml b/ddk-target/pom.xml
index a3eb54eac..58494515b 100644
--- a/ddk-target/pom.xml
+++ b/ddk-target/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>1.5.0.v20180710-0925-REL</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>

From 453eee1b470ac5576dedefcd4ff9530844c8c9bd Mon Sep 17 00:00:00 2001
From: Knut Wannheden <knut.wannheden@avaloq.com>
Date: Tue, 17 Jul 2018 15:39:19 +0200
Subject: [PATCH 31/56] Fix generation for Xtend isInstance() operation

The serialization of Xtend isInstance() calls didn't work properly when
an EPackage was imported using an alias not corresponding to the
EPackage name.
---
 .../expression/generator/CodeGenerationX.xtend  |  4 ++--
 .../scope/generator/ScopingGeneratorUtil.java   | 17 ++++++++++++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/com.avaloq.tools.ddk.xtext.expression/src/com/avaloq/tools/ddk/xtext/expression/generator/CodeGenerationX.xtend b/com.avaloq.tools.ddk.xtext.expression/src/com/avaloq/tools/ddk/xtext/expression/generator/CodeGenerationX.xtend
index 075ea09dc..f369aa4bc 100644
--- a/com.avaloq.tools.ddk.xtext.expression/src/com/avaloq/tools/ddk/xtext/expression/generator/CodeGenerationX.xtend
+++ b/com.avaloq.tools.ddk.xtext.expression/src/com/avaloq/tools/ddk/xtext/expression/generator/CodeGenerationX.xtend
@@ -251,8 +251,8 @@ class CodeGenerationX {
       autoBracket(name + params.head.javaExpression(ctx), ctx)
     } else if ('first' == name && params.isEmpty && target != null) {
       target.javaExpression(ctx) + '.get(0)'
-    } else if ('isInstance' == name) {
-      autoBracket(params.head.javaExpression(ctx) + ' instanceof ' + ctx.javaType(target.serialize()), ctx)
+    } else if ('isInstance' == name && params.size == 1 && target instanceof FeatureCall && (target as FeatureCall).isType(ctx)) {
+      autoBracket(params.head.javaExpression(ctx) + ' instanceof ' + target.javaExpression(ctx), ctx)
     } else if ('eContainer' == name && params.isEmpty) {
       target.javaExpression(ctx) + '.eContainer()'
     } else if (ctx.isExtension(name)) {
diff --git a/com.avaloq.tools.ddk.xtext.scope/src/com/avaloq/tools/ddk/xtext/scope/generator/ScopingGeneratorUtil.java b/com.avaloq.tools.ddk.xtext.scope/src/com/avaloq/tools/ddk/xtext/scope/generator/ScopingGeneratorUtil.java
index 76d43ecaa..e74269bda 100644
--- a/com.avaloq.tools.ddk.xtext.scope/src/com/avaloq/tools/ddk/xtext/scope/generator/ScopingGeneratorUtil.java
+++ b/com.avaloq.tools.ddk.xtext.scope/src/com/avaloq/tools/ddk/xtext/scope/generator/ScopingGeneratorUtil.java
@@ -15,6 +15,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.eclipse.emf.ecore.ENamedElement;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.xtend.expression.ExecutionContextImpl;
@@ -27,6 +28,7 @@
 import com.avaloq.tools.ddk.xtext.expression.generator.EClassComparator;
 import com.avaloq.tools.ddk.xtext.expression.generator.GenModelUtilX;
 import com.avaloq.tools.ddk.xtext.scope.scope.Casing;
+import com.avaloq.tools.ddk.xtext.scope.scope.Import;
 import com.avaloq.tools.ddk.xtext.scope.scope.Injection;
 import com.avaloq.tools.ddk.xtext.scope.scope.NamedScopeExpression;
 import com.avaloq.tools.ddk.xtext.scope.scope.NamingSection;
@@ -76,7 +78,7 @@ public static CompilationContext getCompilationContext(final ScopeModel model, f
    */
   private static class ScopeExecutionContext extends ExecutionContextImpl {
 
-    private static final String VAR_ORIGINAL_RESOURCE = "originalResource";
+    private static final String VAR_ORIGINAL_RESOURCE = "originalResource"; //$NON-NLS-1$
 
     ScopeExecutionContext(final ScopeModel model) {
       super(new ResourceManagerDefaultImpl(), new ScopeResource(model), new TypeSystemImpl(), getVariables(model), null, null, null, null, null, null, null, null, null);
@@ -116,6 +118,19 @@ private void registerMetaModels(final ScopeModel model) {
         public EPackage[] allPackages() {
           return ePackages;
         }
+
+        @Override
+        protected String getElementName(final ENamedElement ele) {
+          if (ele instanceof EPackage) {
+            // use alias as name (if provided)
+            for (Import imp : model.getImports()) {
+              if (imp.getPackage() == ele) {
+                return imp.getName() != null ? imp.getName() : super.getElementName(ele);
+              }
+            }
+          }
+          return super.getElementName(ele);
+        }
       });
       // Finally, add the default meta models
       // registerMetaModel(new EmfRegistryMetaModel());

From 321c192e154147c775ac1cbffedee669282e35a5 Mon Sep 17 00:00:00 2001
From: Graham Pearson <Graham.Pearson@avaloq.com>
Date: Wed, 18 Jul 2018 12:33:18 +0100
Subject: [PATCH 32/56] ClassRunner now extends XtextRunner.

Tests no longer have to choose between running with ClassRunner, which
supports DDK annotations including @BugTest, and XtextRunner, which sets
up Guice injection.

Removed @Test annotation from all tests with the @BugTest annotation,
and modified them to run with ClassRunner. Using both annotations was a
workaround because @BugTest was previously ignored.
---
 .../check/ui/test/CheckCatalogWizardTest.java |  5 +--
 .../check/ui/test/CheckProjectWizardTest.java |  6 +--
 .../META-INF/MANIFEST.MF                      |  3 +-
 .../test/core/junit/runners/ClassRunner.java  |  6 +--
 .../META-INF/MANIFEST.MF                      |  3 +-
 .../test/ui/folding/AbstractFoldingTest.java  |  2 -
 .../AllTests DSLSDK.launch                    | 43 -------------------
 .../linking/ShortFragmentProviderTest.java    |  1 -
 .../naming/QualifiedNamePatternTest.java      |  4 +-
 .../META-INF/MANIFEST.MF                      |  3 +-
 10 files changed, 16 insertions(+), 60 deletions(-)
 delete mode 100644 com.avaloq.tools.ddk.xtext.test/AllTests DSLSDK.launch

diff --git a/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/CheckCatalogWizardTest.java b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/CheckCatalogWizardTest.java
index f2ae51d6d..c6fce0aa8 100644
--- a/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/CheckCatalogWizardTest.java
+++ b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/CheckCatalogWizardTest.java
@@ -31,7 +31,6 @@
 import org.eclipse.ui.actions.WorkspaceModifyOperation;
 import org.eclipse.xtext.Grammar;
 import org.eclipse.xtext.junit4.InjectWith;
-import org.eclipse.xtext.junit4.XtextRunner;
 import org.eclipse.xtext.ui.util.PluginProjectFactory;
 import org.junit.After;
 import org.junit.Before;
@@ -43,6 +42,7 @@
 import com.avaloq.tools.ddk.check.ui.util.CheckResourceUtil;
 import com.avaloq.tools.ddk.check.ui.wizard.Messages;
 import com.avaloq.tools.ddk.test.core.BugTest;
+import com.avaloq.tools.ddk.test.core.junit.runners.ClassRunner;
 import com.avaloq.tools.ddk.test.ui.swtbot.SwtWizardBot;
 import com.google.inject.Inject;
 import com.google.inject.Provider;
@@ -52,7 +52,7 @@
  * The CheckProjectWizardTestBackup tests the Check Project Wizard.
  */
 @InjectWith(CheckWizardUiTestInjectorProvider.class)
-@RunWith(XtextRunner.class)
+@RunWith(ClassRunner.class)
 public class CheckCatalogWizardTest {
 
   /** This is the name of the catalog wizard. It's the name SWTBot uses to look up the wizard. */
@@ -243,7 +243,6 @@ public void testCatalogName() {
   /**
    * Tests that initially no grammar is selected, so pressing finish is disabled if no grammar is chosen.
    */
-  @Test
   @BugTest("AIG-708")
   public void testInitiallyNoGrammarSelected() {
     selectProjectFolder(wizard, VALID_PACKAGE_NAME);
diff --git a/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/CheckProjectWizardTest.java b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/CheckProjectWizardTest.java
index 8faccfe43..015c40786 100644
--- a/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/CheckProjectWizardTest.java
+++ b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/CheckProjectWizardTest.java
@@ -16,7 +16,6 @@
 
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
 import org.eclipse.xtext.junit4.InjectWith;
-import org.eclipse.xtext.junit4.XtextRunner;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -26,6 +25,7 @@
 import com.avaloq.tools.ddk.check.ui.test.util.CheckWizardTestUtil;
 import com.avaloq.tools.ddk.check.ui.wizard.Messages;
 import com.avaloq.tools.ddk.test.core.BugTest;
+import com.avaloq.tools.ddk.test.core.junit.runners.ClassRunner;
 import com.avaloq.tools.ddk.test.ui.swtbot.SwtWizardBot;
 
 
@@ -33,7 +33,7 @@
  * The CheckProjectWizardTest tests the Check Project Wizard.
  */
 @InjectWith(CheckWizardUiTestInjectorProvider.class)
-@RunWith(XtextRunner.class)
+@RunWith(ClassRunner.class)
 public class CheckProjectWizardTest {
 
   /** This is the name of the project wizard. It's the name SWTBot uses to look up the wizard. */
@@ -78,7 +78,6 @@ public void testProjectNameInvalid() {
   /**
    * Tests that the 'finish' button is not enabled in the project page.
    */
-  @Test
   @BugTest("AIG-490")
   public void testFinishButtonDisabledInProjectPage() {
     CheckWizardTestUtil.projectName(wizard, "valid.project.name", CheckWizardTestUtil.NEXT_ENABLED, CheckWizardTestUtil.FINISH_DISABLED);
@@ -109,7 +108,6 @@ public void fieldValuesAfterPageChange() {
   /**
    * Tests that applying the next button changes the wizard page.
    */
-  @Test
   @BugTest("AIG-479")
   public void testNextButtonChangesPage() {
     wizard.writeToTextField(Messages.PROJECT_NAME_LABEL, "a.b");
diff --git a/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF
index 64f53ff4e..b2f966e40 100644
--- a/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF
@@ -13,7 +13,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.mockito,
  com.google.guava,
  org.apache.commons.lang,
- org.eclipse.emf.common
+ org.eclipse.emf.common,
+ org.eclipse.xtext.junit4
 Export-Package: com.avaloq.tools.ddk.test.core,
  com.avaloq.tools.ddk.test.core.data,
  com.avaloq.tools.ddk.test.core.junit.runners,
diff --git a/com.avaloq.tools.ddk.test.core/src/com/avaloq/tools/ddk/test/core/junit/runners/ClassRunner.java b/com.avaloq.tools.ddk.test.core/src/com/avaloq/tools/ddk/test/core/junit/runners/ClassRunner.java
index 320b6d6d9..6652aa2b0 100644
--- a/com.avaloq.tools.ddk.test.core/src/com/avaloq/tools/ddk/test/core/junit/runners/ClassRunner.java
+++ b/com.avaloq.tools.ddk.test.core/src/com/avaloq/tools/ddk/test/core/junit/runners/ClassRunner.java
@@ -18,6 +18,7 @@
 import java.util.List;
 
 import org.apache.log4j.Logger;
+import org.eclipse.xtext.junit4.XtextRunner;
 import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -30,7 +31,6 @@
 import org.junit.runner.manipulation.NoTestsRemainException;
 import org.junit.runner.manipulation.Sorter;
 import org.junit.runner.notification.RunNotifier;
-import org.junit.runners.BlockJUnit4ClassRunner;
 import org.junit.runners.ParentRunner;
 import org.junit.runners.model.FrameworkMethod;
 import org.junit.runners.model.InitializationError;
@@ -54,7 +54,7 @@
 
 
 /**
- * A JUnit runner extending the {@link BlockJUnit4ClassRunner} with support for @BeforeAll and @AfterAll annotated methods. These methods will be run once for a
+ * A JUnit runner extending the {@link XtextRunner} with support for @BeforeAll and @AfterAll annotated methods. These methods will be run once for a
  * given test class before the first test method and after the last test method respectively.
  * <p>
  * <h1>Test Methods</h1> Considered are all those methods of the test class that are annotated with one (or more) of the following test annotations:
@@ -90,7 +90,7 @@
  * </p>
  */
 @SuppressWarnings({"restriction", "deprecation"})
-public class ClassRunner extends BlockJUnit4ClassRunner {
+public class ClassRunner extends XtextRunner {
   /** The system property for the number of test runs. */
   public static final String PROPERTY_TEST_RUNS = "com.avaloq.test.runs"; //$NON-NLS-1$
   /** The system property for the number of times a failing test shall be retried. */
diff --git a/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF
index 45f6d31f6..9e9ca3014 100644
--- a/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF
@@ -23,7 +23,8 @@ Require-Bundle: com.avaloq.tools.ddk.test.core,
  org.mockito,
  com.google.guava,
  org.apache.commons.lang,
- org.eclipse.emf.common
+ org.eclipse.emf.common,
+ org.eclipse.xtext.junit4
 Export-Package: com.avaloq.tools.ddk.test.ui,
  com.avaloq.tools.ddk.test.ui.junit.runners,
  com.avaloq.tools.ddk.test.ui.swtbot,
diff --git a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/ui/folding/AbstractFoldingTest.java b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/ui/folding/AbstractFoldingTest.java
index e7f061085..7587b4736 100644
--- a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/ui/folding/AbstractFoldingTest.java
+++ b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/ui/folding/AbstractFoldingTest.java
@@ -24,7 +24,6 @@
 import org.eclipse.xtext.ui.editor.folding.FoldedPosition;
 import org.eclipse.xtext.ui.editor.folding.IFoldingRegionProvider;
 import org.junit.Assert;
-import org.junit.Test;
 
 import com.avaloq.tools.ddk.test.core.BugTest;
 import com.avaloq.tools.ddk.xtext.test.ui.AbstractXtextEditorTest;
@@ -89,7 +88,6 @@ public boolean apply(final Position p) {
    * Verifies that FoldedPositions are valid.
    * If the assertion fails that is probably due to an ITextRegion.EMPTY_REGION being provided for the object's significant text region.
    */
-  @Test
   @BugTest("ACF-2605")
   public void testFoldedPositions() {
     Collection<FoldedPosition> foldingRegions = getXtextTestUtil().get(IFoldingRegionProvider.class).getFoldingRegions(getDocument());
diff --git a/com.avaloq.tools.ddk.xtext.test/AllTests DSLSDK.launch b/com.avaloq.tools.ddk.xtext.test/AllTests DSLSDK.launch
deleted file mode 100644
index a420a330a..000000000
--- a/com.avaloq.tools.ddk.xtext.test/AllTests DSLSDK.launch	
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.swtbot.eclipse.ui.launcher.JunitLaunchConfig">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/AllTests.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.avaloq.tools.ddk.xtext.AllTests"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.avaloq.tools.ddk.xtext.test"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djava.util.logging.config.file=&quot;${workspace_loc:dslsdk-configuration/logging/jdbc-log.properties}&quot;&#13;&#10;-Dlogback.configurationFile=&quot;${workspace_loc:dslsdk-configuration/logging/logback-config.xml}&quot;&#13;&#10;-Xms256m&#13;&#10;-Xmx1536m&#13;&#10;-XX:+UseConcMarkSweepGC&#13;&#10;-ea"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<booleanAttribute key="run_in_ui_thread" value="true"/>
-<stringAttribute key="selected_target_plugins" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.avaloq.tools.extra-jre-packages@default:false,com.avaloq.tools.foundation.common@default:default,com.google.guava@default:default,com.google.inject@default:default,com.ibm.icu@default:default,com.jcraft.jsch@default:default,com.oracle.jdbc@default:default,com.oracle.ucp@default:default,com.sun.el@default:default,com.sun.jersey.jersey-client@default:default,com.sun.jersey.jersey-core@default:default,com.sun.xml.bind@default:default,edu.umd.cs.findbugs.annotations@default:default,edu.umd.cs.findbugs.jsr305@default:default,javax.activation@default:default,javax.annotation@default:default,javax.el@default:default,javax.inject@default:default,javax.mail@default:default,javax.persistence@default:default,javax.servlet-api@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.xml.stream@default:default,javax.xml@default:default,jaxb-api@default:default,jdepend@default:default,net.ffxml.swtforms@default:default,net.sourceforge.jwebunit@default:default,org.antlr.runtime@default:default,org.aopalliance@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.cli@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.digester@default:default,org.apache.commons.io@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.jasper.glassfish@default:default,org.apache.log4j@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.poi.ooxml.schemas@default:default,org.apache.poi.ooxml@default:default,org.apache.poi@default:default,org.apache.xmlbeans@default:default,org.dom4j@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare.win32@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources.win32.x86_64@default:false,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.draw2d.doc.isv@default:default,org.eclipse.draw2d@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.dialogs@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient4@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.emf.ant@default:default,org.eclipse.emf.cheatsheets@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen.ui@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.converter@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.doc@default:default,org.eclipse.emf.ecore.change.edit@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.example.installer@default:default,org.eclipse.emf.exporter@default:default,org.eclipse.emf.generic.editor@default:default,org.eclipse.emf.importer.ecore@default:default,org.eclipse.emf.importer.java@default:default,org.eclipse.emf.importer.rose@default:default,org.eclipse.emf.importer@default:default,org.eclipse.emf.mapping.ecore.editor@default:default,org.eclipse.emf.mapping.ecore2ecore.editor@default:default,org.eclipse.emf.mapping.ecore2ecore@default:default,org.eclipse.emf.mapping.ecore2xml.ui@default:default,org.eclipse.emf.mapping.ecore2xml@default:default,org.eclipse.emf.mapping.ecore@default:default,org.eclipse.emf.mapping.ui@default:default,org.eclipse.emf.mapping@default:default,org.eclipse.emf.mwe.activities@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.emf.mwe.doc@default:default,org.eclipse.emf.mwe.ui.simpleEditor@default:default,org.eclipse.emf.mwe.ui@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.emf.mwe2.language.ui@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.emf.mwe2.lib@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.emf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.launcher.win32.win32.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.p2.ui.importexport@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.gef.doc.isv@default:default,org.eclipse.gef.examples.flow@default:default,org.eclipse.gef.examples.logic@default:default,org.eclipse.gef.examples.shapes@default:default,org.eclipse.gef.examples.text@default:default,org.eclipse.gef.examples.ui.pde@default:default,org.eclipse.gef@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help.webapp@default:default,org.eclipse.help@default:default,org.eclipse.jdt.annotation*1.1.100.v20160418-1457@default:default,org.eclipse.jdt.annotation*2.1.0.v20160418-1457@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.doc.user@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.api.tools.annotations@default:default,org.eclipse.pde.api.tools.ui@default:default,org.eclipse.pde.api.tools@default:default,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.pde.ds.annotations@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.pde.ds.ui@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.pde.ua.ui@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde@default:default,org.eclipse.persistence.antlr@default:default,org.eclipse.persistence.asm@default:default,org.eclipse.persistence.core@default:default,org.eclipse.persistence.jpa.jpql@default:default,org.eclipse.persistence.jpa@default:default,org.eclipse.persistence.oracle@default:false,org.eclipse.platform.doc.user@default:default,org.eclipse.platform@default:default,org.eclipse.rcp@default:default,org.eclipse.search@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.swtbot.ant.junit@default:false,org.eclipse.swtbot.e4.finder@default:default,org.eclipse.swtbot.eclipse.core@default:default,org.eclipse.swtbot.eclipse.finder@default:default,org.eclipse.swtbot.eclipse.gef.finder@default:default,org.eclipse.swtbot.eclipse.junit.headless@default:default,org.eclipse.swtbot.eclipse.spy@default:default,org.eclipse.swtbot.eclipse.ui@default:default,org.eclipse.swtbot.forms.finder@default:default,org.eclipse.swtbot.generator.jdt@default:default,org.eclipse.swtbot.generator.rules.workbench@default:default,org.eclipse.swtbot.generator.ui@default:default,org.eclipse.swtbot.generator@default:default,org.eclipse.swtbot.go@default:default,org.eclipse.swtbot.junit4_x@default:default,org.eclipse.swtbot.swt.finder@default:default,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro.quicklinks@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.monitoring@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.net@default:default,org.eclipse.ui.themes@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.win32@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.uml2.codegen.ecore.ui@default:default,org.eclipse.uml2.codegen.ecore@default:default,org.eclipse.uml2.common.edit@default:default,org.eclipse.uml2.common@default:default,org.eclipse.uml2.doc@default:default,org.eclipse.uml2.examples.uml.ui@default:default,org.eclipse.uml2.examples@default:default,org.eclipse.uml2.types@default:default,org.eclipse.uml2.uml.ecore.exporter@default:default,org.eclipse.uml2.uml.ecore.importer@default:default,org.eclipse.uml2.uml.edit@default:default,org.eclipse.uml2.uml.editor@default:default,org.eclipse.uml2.uml.profile.l2@default:default,org.eclipse.uml2.uml.profile.l3@default:default,org.eclipse.uml2.uml.resources@default:default,org.eclipse.uml2.uml@default:default,org.eclipse.uml2@default:default,org.eclipse.update.configurator@3:true,org.eclipse.xpand.activities@default:default,org.eclipse.xpand.doc@default:default,org.eclipse.xpand.examples@default:default,org.eclipse.xpand.ui@default:default,org.eclipse.xpand@default:default,org.eclipse.xsd@default:default,org.eclipse.xtend.check.ui@default:default,org.eclipse.xtend.core@default:default,org.eclipse.xtend.doc@default:default,org.eclipse.xtend.examples@default:default,org.eclipse.xtend.ide.common@default:default,org.eclipse.xtend.ide@default:default,org.eclipse.xtend.lib.macro@default:default,org.eclipse.xtend.lib@default:default,org.eclipse.xtend.m2e@default:default,org.eclipse.xtend.profiler@default:default,org.eclipse.xtend.shared.ui@default:default,org.eclipse.xtend.standalone@default:default,org.eclipse.xtend.typesystem.emf.ui@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.xtend.typesystem.uml2.ui@default:default,org.eclipse.xtend.typesystem.uml2@default:default,org.eclipse.xtend.typesystem.xsd.ui@default:default,org.eclipse.xtend.typesystem.xsd@default:default,org.eclipse.xtend.ui@default:default,org.eclipse.xtend.util.stdlib@default:default,org.eclipse.xtend2.lib@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.activities@default:default,org.eclipse.xtext.builder.standalone@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.xtext.common.types.edit@default:default,org.eclipse.xtext.common.types.shared.jdt38@default:false,org.eclipse.xtext.common.types.shared@default:default,org.eclipse.xtext.common.types.ui@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.xtext.doc@default:default,org.eclipse.xtext.ecore@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.xtext.ide@default:default,org.eclipse.xtext.idea.generator@default:default,org.eclipse.xtext.junit4@default:default,org.eclipse.xtext.junit@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.xtext.m2e@default:default,org.eclipse.xtext.purexbase.ui@default:default,org.eclipse.xtext.purexbase@default:default,org.eclipse.xtext.smap@default:default,org.eclipse.xtext.ui.codetemplates.ui@default:default,org.eclipse.xtext.ui.codetemplates@default:default,org.eclipse.xtext.ui.ecore@default:default,org.eclipse.xtext.ui.junit@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.junit@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext.xbase.ui@default:default,org.eclipse.xtext.xbase@default:default,org.eclipse.xtext.xtext.ui.examples@default:default,org.eclipse.xtext.xtext.ui.graph@default:default,org.eclipse.xtext.xtext.ui@default:default,org.eclipse.xtext@default:default,org.eclipse.zest.core@default:default,org.eclipse.zest.doc.isv@default:default,org.eclipse.zest.layouts@default:default,org.glassfish.hk2.osgi-resource-locator@default:default,org.glassfish.main.core.glassfish-extra-jre-packages@default:false,org.glassfish.main.core.glassfish@default:default,org.glassfish.main.ejb.javax.ejb@default:default,org.glassfish.main.javaee-api.javax.annotation@default:default,org.glassfish.main.transaction.javax.transaction@default:false,org.hamcrest.core@default:default,org.hamcrest.integration@default:default,org.hamcrest.library@default:default,org.hamcrest.text@default:default,org.hamcrest@default:default,org.jboss.resteasy@default:default,org.junit4@default:default,org.junit@default:default,org.mockito.mockito-all@default:default,org.mockito@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.ext@default:default,org.slf4j.jcl@default:default,org.slf4j.jul@default:default,org.tukaani.xz@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="com.avaloq.tools.ddk.test.ui.test@default:false,com.avaloq.tools.ddk.test.core@default:default,com.avaloq.tools.ddk.test.ui@default:default,com.avaloq.tools.ddk.check.core.test@default:default,com.avaloq.tools.ddk.check.core@default:default,com.avaloq.tools.ddk.check.generator@default:default,com.avaloq.tools.ddk.check.lib@default:default,com.avaloq.tools.ddk.check.runtime.core.test@default:default,com.avaloq.tools.ddk.check.runtime.core@default:default,com.avaloq.tools.ddk.check.runtime.ui@default:default,com.avaloq.tools.ddk.check.test.runtime.tests@default:default,com.avaloq.tools.ddk.check.test.runtime.ui@default:default,com.avaloq.tools.ddk.check.test.runtime@default:default,com.avaloq.tools.ddk.check.ui.test@default:default,com.avaloq.tools.ddk.check.ui@default:default,com.avaloq.tools.ddk.checkcfg.core.test@default:default,com.avaloq.tools.ddk.checkcfg.core@default:default,com.avaloq.tools.ddk.checkcfg.ui.test@default:default,com.avaloq.tools.ddk.checkcfg.ui@default:default,com.avaloq.tools.ddk.typesystem.test@default:false,com.avaloq.tools.ddk.typesystem@default:default,com.avaloq.tools.ddk.workflow@default:default,com.avaloq.tools.ddk.xtext.builder.ui@default:default,com.avaloq.tools.ddk.xtext.builder@default:default,com.avaloq.tools.ddk.xtext.common.types.ui@default:default,com.avaloq.tools.ddk.xtext.common.types@default:default,com.avaloq.tools.ddk.xtext.common.ui@default:default,com.avaloq.tools.ddk.xtext.export.generator@default:default,com.avaloq.tools.ddk.xtext.export.test@default:false,com.avaloq.tools.ddk.xtext.export.ui@default:default,com.avaloq.tools.ddk.xtext.export@default:default,com.avaloq.tools.ddk.xtext.expression.ui@default:default,com.avaloq.tools.ddk.xtext.expression@default:default,com.avaloq.tools.ddk.xtext.format.generator@default:default,com.avaloq.tools.ddk.xtext.format.test@default:false,com.avaloq.tools.ddk.xtext.format.ui@default:default,com.avaloq.tools.ddk.xtext.format@default:default,com.avaloq.tools.ddk.xtext.generator.test@default:false,com.avaloq.tools.ddk.xtext.generator@default:default,com.avaloq.tools.ddk.xtext.scope.generator@default:default,com.avaloq.tools.ddk.xtext.scope.ui@default:default,com.avaloq.tools.ddk.xtext.scope@default:default,com.avaloq.tools.ddk.xtext.test.core@default:default,com.avaloq.tools.ddk.xtext.test@default:default,com.avaloq.tools.ddk.xtext.ui@default:default,com.avaloq.tools.ddk.xtext.valid.generator@default:default,com.avaloq.tools.ddk.xtext.valid.test@default:false,com.avaloq.tools.ddk.xtext.valid.ui@default:default,com.avaloq.tools.ddk.xtext.valid@default:default,com.avaloq.tools.ddk.xtext@default:default,com.avaloq.tools.ddk.xtextspy.test@default:false,com.avaloq.tools.ddk.xtextspy@default:default"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useProduct" value="true"/>
-</launchConfiguration>
diff --git a/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/linking/ShortFragmentProviderTest.java b/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/linking/ShortFragmentProviderTest.java
index fd4b31961..690defcc6 100644
--- a/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/linking/ShortFragmentProviderTest.java
+++ b/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/linking/ShortFragmentProviderTest.java
@@ -83,7 +83,6 @@ public void cleanup() {
     EPackage.Registry.INSTANCE.remove(testPackage.getNsURI());
   }
 
-  @Test
   @BugTest(value = "DSL-601")
   public void testLongFragment() {
     int reps = 100;
diff --git a/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/naming/QualifiedNamePatternTest.java b/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/naming/QualifiedNamePatternTest.java
index e4c4f59da..4abee20d6 100644
--- a/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/naming/QualifiedNamePatternTest.java
+++ b/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/naming/QualifiedNamePatternTest.java
@@ -18,10 +18,13 @@
 
 import org.eclipse.xtext.naming.QualifiedName;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import com.avaloq.tools.ddk.test.core.BugTest;
+import com.avaloq.tools.ddk.test.core.junit.runners.ClassRunner;
 
 
+@RunWith(ClassRunner.class)
 @SuppressWarnings("PMD.JUnitAssertionsShouldIncludeMessage")
 // CHECKSTYLE:CONSTANTS-OFF
 public class QualifiedNamePatternTest {
@@ -166,7 +169,6 @@ private void assertNoMatch(final QualifiedNamePattern pattern, final String... s
   }
 
   @BugTest("DSL-209")
-  @Test
   @SuppressWarnings("PMD.UseAssertSameInsteadOfAssertTrue")
   // The comparator structure of ==, > and < should be clear in the tests.
   public void testComparison() {
diff --git a/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF
index 5350b34ba..dd1c09300 100644
--- a/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF
@@ -5,7 +5,8 @@ Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.ui.test;singleton:=true
 Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.xtext.ui,
+Require-Bundle: org.eclipse.xtext.junit4,
+ org.eclipse.xtext.ui,
  org.eclipse.xtext.xbase.lib,
  org.junit,
  org.mockito,

From 35e8f43c31c93ff91a7aa46dd1adbf211a730623 Mon Sep 17 00:00:00 2001
From: Knut Wannheden <knut.wannheden@avaloq.com>
Date: Thu, 19 Jul 2018 14:51:39 +0200
Subject: [PATCH 33/56] Fix generation for Xtend isInstance() operation in
 Export DSL

Also fixes the generator in the Export DSL as already done in the Scope
DSL.

Note that this commit also implements the fix in a different way to
avoid problems with some more corner cases.
---
 .../export/generator/ExportGeneratorSupport.java | 16 ++++++++++++++++
 .../scope/generator/ScopingGeneratorUtil.java    | 16 +++++++++-------
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/com.avaloq.tools.ddk.xtext.export/src/com/avaloq/tools/ddk/xtext/export/generator/ExportGeneratorSupport.java b/com.avaloq.tools.ddk.xtext.export/src/com/avaloq/tools/ddk/xtext/export/generator/ExportGeneratorSupport.java
index b35d873b9..ed02f5d49 100644
--- a/com.avaloq.tools.ddk.xtext.export/src/com/avaloq/tools/ddk/xtext/export/generator/ExportGeneratorSupport.java
+++ b/com.avaloq.tools.ddk.xtext.export/src/com/avaloq/tools/ddk/xtext/export/generator/ExportGeneratorSupport.java
@@ -15,10 +15,12 @@
 
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.internal.xtend.expression.parser.SyntaxConstants;
 import org.eclipse.xtend.expression.ExecutionContextImpl;
 import org.eclipse.xtend.expression.ResourceManagerDefaultImpl;
 import org.eclipse.xtend.expression.TypeSystemImpl;
 import org.eclipse.xtend.expression.Variable;
+import org.eclipse.xtend.typesystem.Type;
 import org.eclipse.xtend.typesystem.emf.EmfRegistryMetaModel;
 import org.eclipse.xtext.resource.IEObjectDescription;
 
@@ -85,6 +87,20 @@ public EPackage apply(final IEObjectDescription from) {
         public EPackage[] allPackages() {
           return ePackages;
         }
+
+        @Override
+        public Type getTypeForName(final String name) {
+          final String[] frags = name.split(SyntaxConstants.NS_DELIM);
+          if (frags.length == 2) {
+            // convert references which use import alias
+            for (Import imp : model.getImports()) {
+              if (frags[0].equals(imp.getName()) && imp.getPackage() != null) {
+                return super.getTypeForName(imp.getPackage().getName() + SyntaxConstants.NS_DELIM + frags[1]);
+              }
+            }
+          }
+          return super.getTypeForName(name);
+        }
       });
       // Finally, add the default meta models
       // registerMetaModel(new EmfRegistryMetaModel());
diff --git a/com.avaloq.tools.ddk.xtext.scope/src/com/avaloq/tools/ddk/xtext/scope/generator/ScopingGeneratorUtil.java b/com.avaloq.tools.ddk.xtext.scope/src/com/avaloq/tools/ddk/xtext/scope/generator/ScopingGeneratorUtil.java
index e74269bda..64b017df7 100644
--- a/com.avaloq.tools.ddk.xtext.scope/src/com/avaloq/tools/ddk/xtext/scope/generator/ScopingGeneratorUtil.java
+++ b/com.avaloq.tools.ddk.xtext.scope/src/com/avaloq/tools/ddk/xtext/scope/generator/ScopingGeneratorUtil.java
@@ -15,13 +15,14 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.eclipse.emf.ecore.ENamedElement;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.internal.xtend.expression.parser.SyntaxConstants;
 import org.eclipse.xtend.expression.ExecutionContextImpl;
 import org.eclipse.xtend.expression.ResourceManagerDefaultImpl;
 import org.eclipse.xtend.expression.TypeSystemImpl;
 import org.eclipse.xtend.expression.Variable;
+import org.eclipse.xtend.typesystem.Type;
 import org.eclipse.xtend.typesystem.emf.EmfRegistryMetaModel;
 
 import com.avaloq.tools.ddk.xtext.expression.generator.CompilationContext;
@@ -120,16 +121,17 @@ public EPackage[] allPackages() {
         }
 
         @Override
-        protected String getElementName(final ENamedElement ele) {
-          if (ele instanceof EPackage) {
-            // use alias as name (if provided)
+        public Type getTypeForName(final String name) {
+          final String[] frags = name.split(SyntaxConstants.NS_DELIM);
+          if (frags.length == 2) {
+            // convert references which use import alias
             for (Import imp : model.getImports()) {
-              if (imp.getPackage() == ele) {
-                return imp.getName() != null ? imp.getName() : super.getElementName(ele);
+              if (frags[0].equals(imp.getName()) && imp.getPackage() != null) {
+                return super.getTypeForName(imp.getPackage().getName() + SyntaxConstants.NS_DELIM + frags[1]);
               }
             }
           }
-          return super.getElementName(ele);
+          return super.getTypeForName(name);
         }
       });
       // Finally, add the default meta models

From 0283e39951923889256e4f3fd41a60015e8d1602 Mon Sep 17 00:00:00 2001
From: Graham Pearson <Graham.Pearson@avaloq.com>
Date: Fri, 20 Jul 2018 17:10:01 +0100
Subject: [PATCH 34/56] com.avaloq.tools.ddk.test.core now re-exports
 org.eclipse.xtext.junit4

com.avaloq.tools.ddk.test.core now re-exports org.eclipse.xtext.junit4
so dependent projects do not have to require it directly.
---
 com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF     | 2 +-
 com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF       | 3 +--
 com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF
index b2f966e40..dc411fbd2 100644
--- a/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.runtime,
  com.google.guava,
  org.apache.commons.lang,
  org.eclipse.emf.common,
- org.eclipse.xtext.junit4
+ org.eclipse.xtext.junit4;visibility:=reexport
 Export-Package: com.avaloq.tools.ddk.test.core,
  com.avaloq.tools.ddk.test.core.data,
  com.avaloq.tools.ddk.test.core.junit.runners,
diff --git a/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF
index 9e9ca3014..45f6d31f6 100644
--- a/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF
@@ -23,8 +23,7 @@ Require-Bundle: com.avaloq.tools.ddk.test.core,
  org.mockito,
  com.google.guava,
  org.apache.commons.lang,
- org.eclipse.emf.common,
- org.eclipse.xtext.junit4
+ org.eclipse.emf.common
 Export-Package: com.avaloq.tools.ddk.test.ui,
  com.avaloq.tools.ddk.test.ui.junit.runners,
  com.avaloq.tools.ddk.test.ui.swtbot,
diff --git a/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF
index dd1c09300..5350b34ba 100644
--- a/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF
@@ -5,8 +5,7 @@ Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.ui.test;singleton:=true
 Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.xtext.junit4,
- org.eclipse.xtext.ui,
+Require-Bundle: org.eclipse.xtext.ui,
  org.eclipse.xtext.xbase.lib,
  org.junit,
  org.mockito,

From 93b287610de929c4ccb283f6f0be40febdfdd17e Mon Sep 17 00:00:00 2001
From: Andrew Lamb <Andrew.Lamb@avaloq.com>
Date: Mon, 23 Jul 2018 10:48:31 +0100
Subject: [PATCH 35/56] Add utility for combining trace configurations.

Utility method for combining trace configurations enables tracing for
trace events if the event type is enabled in any of the contributing
configurations.
---
 .../ddk/xtext/tracing/TraceConfiguration.java | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/TraceConfiguration.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/TraceConfiguration.java
index 726d99c0b..1d4374f85 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/TraceConfiguration.java
+++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/TraceConfiguration.java
@@ -80,4 +80,24 @@ static TraceConfiguration enableOnly(final Class<? extends TraceEvent>... includ
     }
     return includedTraceClassMap::containsKey;
   }
+
+  /**
+   * Creates a new trace configuration that is the combination of a list of other configurations.
+   * Tracing is enabled for event types that are enabled in any of the given configurations.
+   *
+   * @param configurations
+   *          the configurations to combine.
+   * @return trace configuration, never {@code null}
+   */
+  @SafeVarargs
+  static TraceConfiguration combine(final TraceConfiguration... configurations) {
+    return c -> {
+      for (TraceConfiguration config : configurations) {
+        if (config.isEnabled(c)) {
+          return true;
+        }
+      }
+      return false;
+    };
+  }
 }

From 80d217c3175df031940832e413e0fe15875273fa Mon Sep 17 00:00:00 2001
From: Knut Wannheden <knut.wannheden@avaloq.com>
Date: Thu, 2 Aug 2018 10:11:58 +0200
Subject: [PATCH 36/56] Fix bug in pattern matching of
 QualifiedNameSegmentTreeLookup

QualifiedNameSegmentTreeLookup#get(QualifiedNamePattern, boolean)
delivered unmatched results when given a name pattern where any of the
leading name segments (i.e. not the last segment with the prefix
pattern) didn't match any element in the lookup.

Internal issue: DSL-1964
---
 .../QualifiedNameSegmentTreeLookupTest.java   | 128 ++++++++----------
 .../QualifiedNameSegmentTreeLookup.java       |  13 +-
 2 files changed, 63 insertions(+), 78 deletions(-)

diff --git a/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/naming/QualifiedNameSegmentTreeLookupTest.java b/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/naming/QualifiedNameSegmentTreeLookupTest.java
index 0be981312..5afcf4aaf 100644
--- a/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/naming/QualifiedNameSegmentTreeLookupTest.java
+++ b/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/naming/QualifiedNameSegmentTreeLookupTest.java
@@ -20,13 +20,10 @@
 import org.eclipse.xtext.naming.QualifiedName;
 import org.junit.Test;
 
-import com.avaloq.tools.ddk.xtext.naming.QualifiedNamePattern;
-import com.avaloq.tools.ddk.xtext.naming.QualifiedNameSegmentTreeLookup;
-import com.avaloq.tools.ddk.xtext.naming.QualifiedNames;
 import com.google.common.collect.ImmutableSet;
 
 
-@SuppressWarnings("PMD.JUnitAssertionsShouldIncludeMessage")
+@SuppressWarnings({"nls", "unused", "PMD.JUnitAssertionsShouldIncludeMessage"})
 // CHECKSTYLE:CHECK-OFF MultipleStringLiteralsCheck
 public class QualifiedNameSegmentTreeLookupTest {
 
@@ -57,32 +54,20 @@ public void testExact() {
 
   @Test
   public void testTopLevelPatternWithoutWildcard() {
-    QualifiedName name1 = name("foo");
-    URI value1 = uri(name1);
-    lookup.put(name1, value1);
-    QualifiedName name2 = name("bar");
-    URI value2 = uri(name2);
-    lookup.put(name2, value2);
-    QualifiedName name3 = name("foo2");
-    URI value3 = uri(name3);
-    lookup.put(name3, value3);
-
-    assertContentEquals(ImmutableSet.of(value1), lookup.get(pattern(name1), false));
-    assertContentEquals(ImmutableSet.of(value2), lookup.get(pattern(name2), false));
-    assertContentEquals(ImmutableSet.of(value3), lookup.get(pattern(name3), false));
+    URI value1 = put("foo");
+    URI value2 = put("bar");
+    URI value3 = put("foo2");
+
+    assertContentEquals(ImmutableSet.of(value1), lookup.get(pattern("foo"), false));
+    assertContentEquals(ImmutableSet.of(value2), lookup.get(pattern("bar"), false));
+    assertContentEquals(ImmutableSet.of(value3), lookup.get(pattern("foo2"), false));
   }
 
   @Test
   public void testTopLevelPatternWithWildcard() {
-    QualifiedName name1 = name("foo");
-    URI value1 = uri(name1);
-    lookup.put(name1, value1);
-    QualifiedName name2 = name("foo2");
-    URI value2 = uri(name2);
-    lookup.put(name2, value2);
-    QualifiedName name3 = name("bar");
-    URI value3 = uri(name3);
-    lookup.put(name3, value3);
+    URI value1 = put("foo");
+    URI value2 = put("foo2");
+    URI value3 = put("bar");
 
     assertContentEquals(ImmutableSet.of(value1, value2), lookup.get(pattern("f*"), true));
     assertContentEquals(ImmutableSet.of(value1, value2), lookup.get(pattern("foo*"), true));
@@ -91,38 +76,22 @@ public void testTopLevelPatternWithWildcard() {
 
   @Test
   public void testNestedPatternMatchesWithoutWildcard() {
-    QualifiedName name1 = name("foo");
-    URI value1 = uri(name1);
-    lookup.put(name1, value1);
-    QualifiedName name2 = name("foo.bar");
-    URI value2 = uri(name2);
-    lookup.put(name2, value2);
-    QualifiedName name3 = name("foo2");
-    URI value3 = uri(name3);
-    lookup.put(name3, value3);
-
-    assertContentEquals(ImmutableSet.of(value1), lookup.get(pattern(name1), true));
-    assertContentEquals(ImmutableSet.of(value2), lookup.get(pattern(name2), true));
-    assertContentEquals(ImmutableSet.of(value3), lookup.get(pattern(name3), true));
+    URI value1 = put("foo");
+    URI value2 = put("foo.bar");
+    URI value3 = put("foo2");
+
+    assertContentEquals(ImmutableSet.of(value1), lookup.get(pattern("foo"), true));
+    assertContentEquals(ImmutableSet.of(value2), lookup.get(pattern("foo.bar"), true));
+    assertContentEquals(ImmutableSet.of(value3), lookup.get(pattern("foo2"), true));
   }
 
   @Test
   public void testNestedPatternMatchesWithWildcard() {
-    QualifiedName name1 = name("foo");
-    URI value1 = uri(name1);
-    lookup.put(name1, value1);
-    QualifiedName name2 = name("foo.bar");
-    URI value2 = uri(name2);
-    lookup.put(name2, value2);
-    QualifiedName name3 = name("foo.baz");
-    URI value3 = uri(name3);
-    lookup.put(name3, value3);
-    QualifiedName name4 = name("foo.baz.bazz");
-    URI value4 = uri(name4);
-    lookup.put(name4, value4);
-    QualifiedName name5 = name("foo2");
-    URI value5 = uri(name5);
-    lookup.put(name5, value5);
+    URI value1 = put("foo");
+    URI value2 = put("foo.bar");
+    URI value3 = put("foo.baz");
+    URI value4 = put("foo.baz.bazz");
+    URI value5 = put("foo2");
 
     assertContentEquals(ImmutableSet.of(value1, value5), lookup.get(pattern("f*"), true));
     assertContentEquals(ImmutableSet.of(value2, value3), lookup.get(pattern("foo.*"), true));
@@ -132,29 +101,36 @@ public void testNestedPatternMatchesWithWildcard() {
 
   @Test
   public void testNestedPatternMatchesWithRecursiveWildcard() {
-    QualifiedName name1 = name("foo");
-    URI value1 = uri(name1);
-    lookup.put(name1, value1);
-    QualifiedName name2 = name("foo.bar");
-    URI value2 = uri(name2);
-    lookup.put(name2, value2);
-    QualifiedName name3 = name("foo.bar.baz");
-    URI value3 = uri(name3);
-    lookup.put(name3, value3);
-    QualifiedName name4 = name("foo.bar.baz.quux");
-    URI value4 = uri(name4);
-    lookup.put(name4, value4);
-    QualifiedName name5 = name("foo.foo");
-    URI value5 = uri(name5);
-    lookup.put(name5, value5);
-    QualifiedName name6 = name("foo2");
-    URI value6 = uri(name6);
-    lookup.put(name6, value6);
+    URI value1 = put("foo");
+    URI value2 = put("foo.bar");
+    URI value3 = put("foo.bar.baz");
+    URI value4 = put("foo.bar.baz.quux");
+    URI value5 = put("foo.foo");
+    URI value6 = put("foo2");
 
     assertContentEquals(ImmutableSet.of(value2, value3, value4, value5), lookup.get(pattern("foo.**"), true));
     assertContentEquals(ImmutableSet.of(value2, value3, value4), lookup.get(pattern("foo.b**"), true));
   }
 
+  @Test
+  public void testUnmatchedNestedPattern() {
+    URI value1 = put("foo");
+    URI value2 = put("foo.bar");
+    URI value3 = put("foo.bar.baz");
+    URI value4 = put("foo.bar.baz.quux");
+    URI value5 = put("foo.foo");
+    URI value6 = put("foo2");
+
+    assertContentEquals(ImmutableSet.of(), lookup.get(pattern("e*"), true));
+    assertContentEquals(ImmutableSet.of(), lookup.get(pattern("g*"), true));
+    assertContentEquals(ImmutableSet.of(), lookup.get(pattern("foa.*"), true));
+    assertContentEquals(ImmutableSet.of(), lookup.get(pattern("fon.b*"), true));
+    assertContentEquals(ImmutableSet.of(), lookup.get(pattern("foo.c*"), true));
+    assertContentEquals(ImmutableSet.of(), lookup.get(pattern("foo.baq.b*"), true));
+    assertContentEquals(ImmutableSet.of(), lookup.get(pattern("foo.bar.a*"), true));
+    assertContentEquals(ImmutableSet.of(), lookup.get(pattern("foo.bar.bazz*"), true));
+  }
+
   @Test
   public void testOutOfOrderInsertion() {
     QualifiedName name1 = name("foo.bar");
@@ -184,8 +160,14 @@ public URI uri(final QualifiedName name) {
     return URI.createURI("scheme:/" + name);
   }
 
+  private URI put(final String name) {
+    QualifiedName qname = name(name);
+    URI value = uri(qname);
+    lookup.put(qname, value);
+    return value;
+  }
+
   public void assertContentEquals(final Collection<?> expected, final Collection<?> actual) {
     assertEquals(ImmutableSet.copyOf(expected), ImmutableSet.copyOf(actual));
   }
 }
-
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/naming/QualifiedNameSegmentTreeLookup.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/naming/QualifiedNameSegmentTreeLookup.java
index 6bc8ece68..2d126894c 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/naming/QualifiedNameSegmentTreeLookup.java
+++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/naming/QualifiedNameSegmentTreeLookup.java
@@ -81,9 +81,10 @@ public SegmentNode find(final QualifiedName name, int segIdx, final boolean exac
         return null;
       }
       String seg = name.getSegment(segIdx++);
+      boolean lastSeg = name.getSegmentCount() == segIdx;
       int idx = binarySearch(children, seg);
       if (idx < 0) {
-        if (exactMatch) {
+        if (exactMatch || !lastSeg) {
           return null;
         }
         idx = -(idx + 1);
@@ -91,7 +92,7 @@ public SegmentNode find(final QualifiedName name, int segIdx, final boolean exac
       if (idx == children.size()) {
         return null;
       }
-      if (name.getSegmentCount() == segIdx) {
+      if (lastSeg) {
         return children.get(idx);
       }
       SegmentNode result = children.get(idx++).find(name, segIdx, exactMatch);
@@ -148,15 +149,17 @@ public void visit(final SegmentNode node) {
      *          visitor to visit matching nodes with, must not be {@code null}
      * @return {@code false} if marker {@code upper} node was found and search should be stopped
      */
-    @SuppressWarnings("PMD.CompareObjectsWithEquals")
+    @SuppressWarnings({"PMD.CompareObjectsWithEquals", "PMD.NPathComplexity"})
     protected boolean collectMatches(final QualifiedName lower, int lowerIdx, final SegmentNode upper, final boolean recursive, final Visitor visitor) {
-      if (children == null || this == upper) {
+      if (children == null || this == upper || upper == null) {
         return false;
       }
       String seg = lower.getSegment(lowerIdx++);
       int idx = binarySearch(children, seg);
-      if (idx < 0) {
+      if (idx < 0 && lower.getSegmentCount() == lowerIdx) {
         idx = -(idx + 1);
+      } else if (idx < 0) {
+        return false;
       }
       if (idx == children.size()) {
         return true;

From 550d67c5ff15bb7c0d40f34b202fc6cb04235bf0 Mon Sep 17 00:00:00 2001
From: Roman Mitin <roman.mitin@avaloq.com>
Date: Mon, 6 Aug 2018 17:16:55 +0200
Subject: [PATCH 37/56] Add generator preference to Check for DSL-internal
 validations

There is a difference in how DSL-internal checks and external SCA checks
are registered and written. Also internal checks typically have no
useful documentation (i.e. compiler errors are self-explaining) when SCA
checks (coding conventions) do usually need a help page (explaining why
the rule is useful).

In this change we add a project preference so we can tell generator
whether it's now doing an SCA plugin or is generating a check for a DSL.
For internal checks docu generation is then disabled.
---
 .../META-INF/MANIFEST.MF                      |  7 ++-
 .../check/compiler/CheckGeneratorConfig.xtend | 25 ++++++++
 .../CheckGeneratorConfigProvider.java         | 29 +++++++++
 .../ICheckGeneratorConfigProvider.java        | 31 ++++++++++
 .../ddk/check/generator/CheckGenerator.xtend  | 12 +++-
 .../tools/ddk/check/ui/CheckUiModule.java     | 26 ++++++--
 .../CheckBuilderConfigurationBlock.java       | 30 +++++++++
 .../ui/builder/CheckBuilderParticipant.java   | 35 +++++++----
 .../builder/CheckBuilderPreferenceAccess.java | 62 +++++++++++++++++++
 .../CheckEclipseGeneratorConfigProvider.java  | 50 +++++++++++++++
 ...ractCheckDocumentationExtensionHelper.java | 23 ++++++-
 11 files changed, 304 insertions(+), 26 deletions(-)
 create mode 100644 com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/compiler/CheckGeneratorConfig.xtend
 create mode 100644 com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/compiler/CheckGeneratorConfigProvider.java
 create mode 100644 com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/compiler/ICheckGeneratorConfigProvider.java
 create mode 100644 com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/CheckBuilderConfigurationBlock.java
 create mode 100644 com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/CheckBuilderPreferenceAccess.java
 create mode 100644 com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/CheckEclipseGeneratorConfigProvider.java

diff --git a/com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF
index 33c494fde..f3374e8f9 100644
--- a/com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF
@@ -31,19 +31,20 @@ Export-Package: com.avaloq.tools.ddk.check,
  com.avaloq.tools.ddk.check.check,
  com.avaloq.tools.ddk.check.check.impl,
  com.avaloq.tools.ddk.check.check.util,
+ com.avaloq.tools.ddk.check.compiler,
  com.avaloq.tools.ddk.check.documentation,
  com.avaloq.tools.ddk.check.formatting,
  com.avaloq.tools.ddk.check.generator,
  com.avaloq.tools.ddk.check.imports,
+ com.avaloq.tools.ddk.check.jvmmodel,
  com.avaloq.tools.ddk.check.naming,
  com.avaloq.tools.ddk.check.parser.antlr,
  com.avaloq.tools.ddk.check.parser.antlr.internal,
  com.avaloq.tools.ddk.check.scoping,
+ com.avaloq.tools.ddk.check.serializer,
  com.avaloq.tools.ddk.check.services,
  com.avaloq.tools.ddk.check.typing,
  com.avaloq.tools.ddk.check.util,
- com.avaloq.tools.ddk.check.validation,
- com.avaloq.tools.ddk.check.jvmmodel,
- com.avaloq.tools.ddk.check.serializer
+ com.avaloq.tools.ddk.check.validation
 Import-Package: org.apache.log4j,
  org.eclipse.jdt.internal.ui.text
diff --git a/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/compiler/CheckGeneratorConfig.xtend b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/compiler/CheckGeneratorConfig.xtend
new file mode 100644
index 000000000..f1c339495
--- /dev/null
+++ b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/compiler/CheckGeneratorConfig.xtend
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Avaloq Evolution AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Avaloq Evolution AG - initial API and implementation
+ *******************************************************************************/
+
+package com.avaloq.tools.ddk.check.compiler
+
+import org.eclipse.xtext.xbase.compiler.GeneratorConfig
+import org.eclipse.xtend.lib.annotations.Accessors
+
+@Accessors
+class CheckGeneratorConfig extends GeneratorConfig {
+
+	/**
+	 * Whether generators should produce code for DSL-internal checks.
+	 */
+	boolean generateLanguageInternalChecks = false
+
+}
diff --git a/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/compiler/CheckGeneratorConfigProvider.java b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/compiler/CheckGeneratorConfigProvider.java
new file mode 100644
index 000000000..f4b0884f4
--- /dev/null
+++ b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/compiler/CheckGeneratorConfigProvider.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Avaloq Evolution AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Avaloq Evolution AG - initial API and implementation
+ *******************************************************************************/
+
+package com.avaloq.tools.ddk.check.compiler;
+
+import org.eclipse.emf.ecore.resource.Resource;
+
+
+/**
+ * Default dummy implementation of config provider.
+ */
+public class CheckGeneratorConfigProvider implements ICheckGeneratorConfigProvider {
+
+  private static final CheckGeneratorConfig CONFIG_INSTANCE = new CheckGeneratorConfig();
+
+  @Override
+  public CheckGeneratorConfig get(final Resource context) {
+    return CONFIG_INSTANCE;
+  }
+
+}
diff --git a/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/compiler/ICheckGeneratorConfigProvider.java b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/compiler/ICheckGeneratorConfigProvider.java
new file mode 100644
index 000000000..3e4216b24
--- /dev/null
+++ b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/compiler/ICheckGeneratorConfigProvider.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Avaloq Evolution AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Avaloq Evolution AG - initial API and implementation
+ *******************************************************************************/
+
+package com.avaloq.tools.ddk.check.compiler;
+
+import org.eclipse.emf.ecore.resource.Resource;
+
+
+/**
+ * Provides generator configurations specific to Check DSL.
+ */
+public interface ICheckGeneratorConfigProvider {
+
+  /**
+   * Gets the generator configuration.
+   *
+   * @param resource
+   *          the context resource to detect generator preferences
+   * @return the check generator configuration
+   */
+  CheckGeneratorConfig get(Resource resource);
+
+}
diff --git a/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/generator/CheckGenerator.xtend b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/generator/CheckGenerator.xtend
index 385840bf6..e42bc6802 100644
--- a/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/generator/CheckGenerator.xtend
+++ b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/generator/CheckGenerator.xtend
@@ -26,16 +26,20 @@ import org.eclipse.xtext.xbase.compiler.GeneratorConfig
 
 import static extension com.avaloq.tools.ddk.check.generator.CheckGeneratorExtensions.*
 import static extension com.avaloq.tools.ddk.check.generator.CheckGeneratorNaming.*
+import com.avaloq.tools.ddk.check.compiler.ICheckGeneratorConfigProvider
 
 class CheckGenerator extends JvmModelGenerator {
 
   @Inject extension CheckGeneratorExtensions generatorExtensions
   @Inject extension CheckGeneratorNaming
   @Inject CheckCompiler compiler
+  @Inject private ICheckGeneratorConfigProvider generatorConfigProvider;
 
   override void doGenerate(Resource resource, IFileSystemAccess fsa) {
     super.doGenerate(resource, fsa); // Generate validator, catalog, and preference initializer from inferred Jvm models.
+    val config = generatorConfigProvider.get(resource);
     for (catalog : toIterable(resource.allContents).filter(typeof(CheckCatalog))) {
+
       fsa.generateFile(catalog.issueCodesFilePath, catalog.compileIssueCodes)
       fsa.generateFile(catalog.standaloneSetupPath, catalog.compileStandaloneSetup)
 
@@ -45,9 +49,11 @@ class CheckGenerator extends JvmModelGenerator {
         CheckGeneratorConstants::CHECK_REGISTRY_OUTPUT,
         catalog.generateServiceRegistry(CheckUtil::serviceRegistryClassName, fsa)
       )
-
-      // change output path for html files to docs/
-      fsa.generateFile(catalog.docFileName, CheckGeneratorConstants::CHECK_DOC_OUTPUT, catalog.compileDoc)
+      // generate documentation for SCA-checks only
+	  if(!config.isGenerateLanguageInternalChecks){
+	      // change output path for html files to docs/
+    	  fsa.generateFile(catalog.docFileName, CheckGeneratorConstants::CHECK_DOC_OUTPUT, catalog.compileDoc)
+      }
     }
   }
 
diff --git a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/CheckUiModule.java b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/CheckUiModule.java
index e7ace1c8f..9fe672e5c 100644
--- a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/CheckUiModule.java
+++ b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/CheckUiModule.java
@@ -11,6 +11,8 @@
 package com.avaloq.tools.ddk.check.ui;
 
 import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.eclipse.xtext.builder.preferences.BuilderConfigurationBlock;
+import org.eclipse.xtext.builder.preferences.BuilderPreferenceAccess;
 import org.eclipse.xtext.common.types.access.jdt.JdtTypeProviderFactory;
 import org.eclipse.xtext.ui.LanguageSpecific;
 import org.eclipse.xtext.ui.editor.DirtyStateEditorSupport;
@@ -22,11 +24,13 @@
 import org.eclipse.xtext.ui.editor.templates.CrossReferenceTemplateVariableResolver;
 import org.eclipse.xtext.ui.editor.templates.XtextTemplateContextType;
 import org.eclipse.xtext.ui.wizard.IProjectCreator;
-import org.eclipse.xtext.xbase.compiler.GeneratorConfigProvider;
-import org.eclipse.xtext.xbase.compiler.IGeneratorConfigProvider;
 
+import com.avaloq.tools.ddk.check.compiler.ICheckGeneratorConfigProvider;
 import com.avaloq.tools.ddk.check.runtime.ui.editor.PlatformPluginAwareEditorOpener;
+import com.avaloq.tools.ddk.check.ui.builder.CheckBuilderConfigurationBlock;
 import com.avaloq.tools.ddk.check.ui.builder.CheckBuilderParticipant;
+import com.avaloq.tools.ddk.check.ui.builder.CheckBuilderPreferenceAccess;
+import com.avaloq.tools.ddk.check.ui.builder.CheckEclipseGeneratorConfigProvider;
 import com.avaloq.tools.ddk.check.ui.editor.handler.CheckValidateActionHandler;
 import com.avaloq.tools.ddk.check.ui.highlighting.CheckAntlrTokenToAttributeIdMapper;
 import com.avaloq.tools.ddk.check.ui.highlighting.CheckHighlightingCalculator;
@@ -46,6 +50,7 @@
 /**
  * Use this class to register components to be used within the IDE.
  */
+@SuppressWarnings("restriction")
 public class CheckUiModule extends com.avaloq.tools.ddk.check.ui.AbstractCheckUiModule {
   public CheckUiModule(final AbstractUIPlugin plugin) {
     super(plugin);
@@ -178,13 +183,22 @@ public Class<? extends ValidateActionHandler> bindValidateActionHandler() {
     return CheckValidateActionHandler.class;
   }
 
+  @Override
+  public Class<? extends BuilderConfigurationBlock> bindBuilderConfigurationBlock() {
+    return CheckBuilderConfigurationBlock.class;
+  }
+
   /**
-   * Fix for NPE in EclipseGeneratorConfigProvider.
+   * Bind check generator config provider.
    *
-   * @return GeneratorConfigProvider
+   * @return the class<? extends i check generator config provider>
    */
+  public Class<? extends ICheckGeneratorConfigProvider> bindICheckGeneratorConfigProvider() {
+    return CheckEclipseGeneratorConfigProvider.class;
+  }
+
   @Override
-  public Class<? extends IGeneratorConfigProvider> bindIGeneratorConfigProvider() {
-    return GeneratorConfigProvider.class;
+  public Class<? extends BuilderPreferenceAccess.Initializer> bindBuilderPreferenceAccess$Initializer() {
+    return CheckBuilderPreferenceAccess.Initializer.class;
   }
 }
diff --git a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/CheckBuilderConfigurationBlock.java b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/CheckBuilderConfigurationBlock.java
new file mode 100644
index 000000000..e922e5e1b
--- /dev/null
+++ b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/CheckBuilderConfigurationBlock.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Avaloq Evolution AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Avaloq Evolution AG - initial API and implementation
+ *******************************************************************************/
+
+package com.avaloq.tools.ddk.check.ui.builder;
+
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.xtext.xbase.ui.builder.XbaseBuilderConfigurationBlock;
+
+
+/**
+ * UI for configuring Check compiler.
+ */
+@SuppressWarnings("restriction")
+public class CheckBuilderConfigurationBlock extends XbaseBuilderConfigurationBlock {
+
+  @Override
+  protected void createGeneralSectionItems(final Composite composite) {
+    super.createGeneralSectionItems(composite);
+    addCheckBox(composite, "Generate as DSL internal checks (not SCA plugin)", CheckBuilderPreferenceAccess.PREF_GENERATE_LANGUAGE_INTERNAL_CHECKS, BOOLEAN_VALUES, 0); //$NON-NLS-1$
+  }
+
+}
diff --git a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/CheckBuilderParticipant.java b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/CheckBuilderParticipant.java
index eaf240837..fee955606 100644
--- a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/CheckBuilderParticipant.java
+++ b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/CheckBuilderParticipant.java
@@ -11,18 +11,20 @@
 package com.avaloq.tools.ddk.check.ui.builder;
 
 import org.apache.log4j.Logger;
-
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.builder.EclipseResourceFileSystemAccess2;
 import org.eclipse.xtext.resource.IResourceDescription.Delta;
 import org.eclipse.xtext.resource.IResourceServiceProvider;
 import org.eclipse.xtext.ui.resource.IStorage2UriMapper;
 
-import com.google.inject.Inject;
+import com.avaloq.tools.ddk.check.compiler.CheckGeneratorConfig;
+import com.avaloq.tools.ddk.check.compiler.ICheckGeneratorConfigProvider;
 import com.avaloq.tools.ddk.xtext.builder.ConditionalBuilderParticipant;
 import com.avaloq.tools.ddk.xtext.ui.util.RuntimeProjectUtil;
+import com.google.inject.Inject;
 
 
 /**
@@ -47,6 +49,9 @@ public class CheckBuilderParticipant extends ConditionalBuilderParticipant {
   @Inject
   private IStorage2UriMapper mapper;
 
+  @Inject
+  private ICheckGeneratorConfigProvider generatorConfigProvider;
+
   private IProgressMonitor progressMonitor;
 
   @Override
@@ -77,22 +82,27 @@ protected void handleChangedContents(final Delta delta, final IBuildContext cont
       } catch (CoreException e) {
         LOGGER.error(e.getMessage(), e);
       }
-      try {
-        tocGenerator.updateTocModel(delta.getUri(), context);
-      } catch (CoreException e) {
-        LOGGER.error(e.getMessage(), e);
-      }
-      try {
-        contextsGenerator.updateContextsFile(delta.getUri(), context);
-      } catch (CoreException e) {
-        LOGGER.error(e.getMessage(), e);
+      Resource resource = context.getResourceSet().getResource(delta.getUri(), true);
+      CheckGeneratorConfig config = generatorConfigProvider.get(resource);
+      // Generate docu-related files for SCA checks only
+      if (!config.isGenerateLanguageInternalChecks()) {
+        try {
+          tocGenerator.updateTocModel(delta.getUri(), context);
+        } catch (CoreException e) {
+          LOGGER.error(e.getMessage(), e);
+        }
+        try {
+          contextsGenerator.updateContextsFile(delta.getUri(), context);
+        } catch (CoreException e) {
+          LOGGER.error(e.getMessage(), e);
+        }
       }
     }
   }
 
   /**
    * Removes corresponding entries from plugin.xml.
-   * 
+   *
    * @param delta
    *          delta of deleted resource
    * @param context
@@ -119,4 +129,3 @@ protected void handleDeletion(final Delta delta, final IBuildContext context) {
   }
 
 }
-
diff --git a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/CheckBuilderPreferenceAccess.java b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/CheckBuilderPreferenceAccess.java
new file mode 100644
index 000000000..daef240e3
--- /dev/null
+++ b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/CheckBuilderPreferenceAccess.java
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Avaloq Evolution AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Avaloq Evolution AG - initial API and implementation
+ *******************************************************************************/
+
+package com.avaloq.tools.ddk.check.ui.builder;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.xtext.ui.editor.preferences.IPreferenceStoreAccess;
+import org.eclipse.xtext.xbase.ui.builder.XbaseBuilderPreferenceAccess;
+
+import com.avaloq.tools.ddk.check.compiler.CheckGeneratorConfig;
+import com.google.inject.Inject;
+
+
+/**
+ * Additional configurations for Check DSL.
+ */
+public class CheckBuilderPreferenceAccess extends XbaseBuilderPreferenceAccess {
+
+  /**
+   * Preference identifier for language internal checks.
+   */
+  public static final String PREF_GENERATE_LANGUAGE_INTERNAL_CHECKS = "generateLanguageInternalChecks"; //$NON-NLS-1$
+
+  /**
+   * Initializer for check-specific generator preferences.
+   */
+  public static class Initializer extends XbaseBuilderPreferenceAccess.Initializer {
+
+    @Override
+    protected void initializeBuilderPreferences(final IPreferenceStore store) {
+      super.initializeBuilderPreferences(store);
+      store.setDefault(PREF_GENERATE_LANGUAGE_INTERNAL_CHECKS, false);
+    }
+
+  }
+
+  @Inject
+  private IPreferenceStoreAccess preferenceStoreAccess;
+
+  /**
+   * Load builder preferences for check.
+   *
+   * @param generatorConfig
+   *          the generator config
+   * @param context
+   *          the context
+   */
+  public void loadBuilderPreferences(final CheckGeneratorConfig generatorConfig, final Object context) {
+    super.loadBuilderPreferences(generatorConfig, context);
+    IPreferenceStore preferenceStore = preferenceStoreAccess.getContextPreferenceStore(context);
+    generatorConfig.setGenerateLanguageInternalChecks(preferenceStore.getBoolean(PREF_GENERATE_LANGUAGE_INTERNAL_CHECKS));
+  }
+
+}
diff --git a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/CheckEclipseGeneratorConfigProvider.java b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/CheckEclipseGeneratorConfigProvider.java
new file mode 100644
index 000000000..9ba41c949
--- /dev/null
+++ b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/CheckEclipseGeneratorConfigProvider.java
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Avaloq Evolution AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Avaloq Evolution AG - initial API and implementation
+ *******************************************************************************/
+
+package com.avaloq.tools.ddk.check.ui.builder;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IStorage;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.xtext.ui.resource.IStorage2UriMapper;
+import org.eclipse.xtext.util.Pair;
+
+import com.avaloq.tools.ddk.check.compiler.CheckGeneratorConfig;
+import com.avaloq.tools.ddk.check.compiler.ICheckGeneratorConfigProvider;
+import com.google.common.collect.Iterables;
+import com.google.inject.Inject;
+
+
+/**
+ * Provides extended generator config with Check-specific properties.
+ */
+public class CheckEclipseGeneratorConfigProvider implements ICheckGeneratorConfigProvider {
+
+  @Inject
+  private IStorage2UriMapper storage2UriMapper;
+
+  @Inject
+  private CheckBuilderPreferenceAccess xbaseBuilderPreferenceAccess;
+
+  @Override
+  public CheckGeneratorConfig get(final Resource resource) {
+    CheckGeneratorConfig result = new CheckGeneratorConfig();
+    IProject project = null;
+    if (resource != null) {
+      Pair<IStorage, IProject> pair = Iterables.getFirst(storage2UriMapper.getStorages(resource.getURI()), null);
+      if (pair != null) {
+        project = pair.getSecond();
+      }
+    }
+    xbaseBuilderPreferenceAccess.loadBuilderPreferences(result, project);
+    return result;
+  }
+}
diff --git a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/util/AbstractCheckDocumentationExtensionHelper.java b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/util/AbstractCheckDocumentationExtensionHelper.java
index a12cb8259..6b114b45a 100644
--- a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/util/AbstractCheckDocumentationExtensionHelper.java
+++ b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/util/AbstractCheckDocumentationExtensionHelper.java
@@ -10,17 +10,38 @@
  *******************************************************************************/
 package com.avaloq.tools.ddk.check.ui.builder.util;
 
+import org.eclipse.pde.core.plugin.IPluginModelBase;
+
+import com.avaloq.tools.ddk.check.check.CheckCatalog;
+import com.avaloq.tools.ddk.check.compiler.CheckGeneratorConfig;
+import com.avaloq.tools.ddk.check.compiler.ICheckGeneratorConfigProvider;
+import com.google.inject.Inject;
+
+
 /**
  * Abstract class for documentation extension point utility classes.
  * Defines common elements of documentation extension point utility classes used by the Check builder participant.
  */
 public abstract class AbstractCheckDocumentationExtensionHelper extends AbstractCheckExtensionHelper {
 
-  public static final String GENERATE_DOCUMENTATION_EXTENSION_PREFERENCE = "generateDocumentationExtension";
+  public static final String GENERATE_DOCUMENTATION_EXTENSION_PREFERENCE = "generateDocumentationExtension"; //$NON-NLS-1$
+
+  @Inject
+  private ICheckGeneratorConfigProvider generatorConfigProvider;
 
   @Override
   protected String getExtensionEnablementPreferenceName() {
     return GENERATE_DOCUMENTATION_EXTENSION_PREFERENCE;
   }
 
+  @Override
+  protected boolean isExtensionEnabled(final IPluginModelBase base, final CheckCatalog catalog, final ExtensionType type, final String extensionId) {
+    if (!super.isExtensionEnabled(base, catalog, type, extensionId)) {
+      return false;
+    }
+    // Do not generate plugin.xml extensions for docu in a non SCA-plguin
+    CheckGeneratorConfig config = generatorConfigProvider.get(catalog.eResource());
+    return !config.isGenerateLanguageInternalChecks();
+  }
+
 }

From fd90a7a27909a9d17789cc920942dac59cd2b59b Mon Sep 17 00:00:00 2001
From: Roman Mitin <roman.mitin@avaloq.com>
Date: Mon, 6 Aug 2018 18:46:43 +0200
Subject: [PATCH 38/56] Suppress 2 PMD violations

---
 .../src/com/avaloq/tools/ddk/check/ui/CheckUiModule.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/CheckUiModule.java b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/CheckUiModule.java
index 9fe672e5c..98ce5d98d 100644
--- a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/CheckUiModule.java
+++ b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/CheckUiModule.java
@@ -50,7 +50,7 @@
 /**
  * Use this class to register components to be used within the IDE.
  */
-@SuppressWarnings("restriction")
+@SuppressWarnings({"restriction", "PMD.CouplingBetweenObjects"})
 public class CheckUiModule extends com.avaloq.tools.ddk.check.ui.AbstractCheckUiModule {
   public CheckUiModule(final AbstractUIPlugin plugin) {
     super(plugin);
@@ -198,6 +198,7 @@ public Class<? extends ICheckGeneratorConfigProvider> bindICheckGeneratorConfigP
   }
 
   @Override
+  @SuppressWarnings("PMD.AvoidDollarSigns") // that's how it's defined in Xtext
   public Class<? extends BuilderPreferenceAccess.Initializer> bindBuilderPreferenceAccess$Initializer() {
     return CheckBuilderPreferenceAccess.Initializer.class;
   }

From ed35a0f1038ba25006f47b361749b1fae5242f5c Mon Sep 17 00:00:00 2001
From: Roman Mitin <roman.mitin@avaloq.com>
Date: Tue, 7 Aug 2018 11:35:10 +0200
Subject: [PATCH 39/56] Add missing default binding for tests

---
 .../compiler/ICheckGeneratorConfigProvider.java  |  3 +++
 .../avaloq/tools/ddk/check/ui/CheckUiModule.java | 16 ++++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/compiler/ICheckGeneratorConfigProvider.java b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/compiler/ICheckGeneratorConfigProvider.java
index 3e4216b24..997101909 100644
--- a/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/compiler/ICheckGeneratorConfigProvider.java
+++ b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/compiler/ICheckGeneratorConfigProvider.java
@@ -13,10 +13,13 @@
 
 import org.eclipse.emf.ecore.resource.Resource;
 
+import com.google.inject.ImplementedBy;
+
 
 /**
  * Provides generator configurations specific to Check DSL.
  */
+@ImplementedBy(CheckGeneratorConfigProvider.class)
 public interface ICheckGeneratorConfigProvider {
 
   /**
diff --git a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/CheckUiModule.java b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/CheckUiModule.java
index 98ce5d98d..a38765865 100644
--- a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/CheckUiModule.java
+++ b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/CheckUiModule.java
@@ -24,6 +24,8 @@
 import org.eclipse.xtext.ui.editor.templates.CrossReferenceTemplateVariableResolver;
 import org.eclipse.xtext.ui.editor.templates.XtextTemplateContextType;
 import org.eclipse.xtext.ui.wizard.IProjectCreator;
+import org.eclipse.xtext.xbase.compiler.GeneratorConfigProvider;
+import org.eclipse.xtext.xbase.compiler.IGeneratorConfigProvider;
 
 import com.avaloq.tools.ddk.check.compiler.ICheckGeneratorConfigProvider;
 import com.avaloq.tools.ddk.check.runtime.ui.editor.PlatformPluginAwareEditorOpener;
@@ -183,15 +185,25 @@ public Class<? extends ValidateActionHandler> bindValidateActionHandler() {
     return CheckValidateActionHandler.class;
   }
 
+  /**
+   * Fix for NPE in EclipseGeneratorConfigProvider.
+   *
+   * @return GeneratorConfigProvider
+   */
+  @Override
+  public Class<? extends IGeneratorConfigProvider> bindIGeneratorConfigProvider() {
+    return GeneratorConfigProvider.class;
+  }
+
   @Override
   public Class<? extends BuilderConfigurationBlock> bindBuilderConfigurationBlock() {
     return CheckBuilderConfigurationBlock.class;
   }
 
   /**
-   * Bind check generator config provider.
+   * Bind check generator configuration provider.
    *
-   * @return the class<? extends i check generator config provider>
+   * @return the check specific configuration provider for Eclipse project
    */
   public Class<? extends ICheckGeneratorConfigProvider> bindICheckGeneratorConfigProvider() {
     return CheckEclipseGeneratorConfigProvider.class;

From e58e6f808947366e3cae88b5e18fc724d93ecc08 Mon Sep 17 00:00:00 2001
From: Roman Mitin <roman.mitin@avaloq.com>
Date: Wed, 8 Aug 2018 09:20:21 +0200
Subject: [PATCH 40/56] Fix whitespace and JavaDoc

---
 .../ddk/check/compiler/ICheckGeneratorConfigProvider.java   | 2 +-
 .../avaloq/tools/ddk/check/generator/CheckGenerator.xtend   | 6 +++---
 .../ddk/check/ui/builder/CheckBuilderPreferenceAccess.java  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/compiler/ICheckGeneratorConfigProvider.java b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/compiler/ICheckGeneratorConfigProvider.java
index 997101909..7f29e20d9 100644
--- a/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/compiler/ICheckGeneratorConfigProvider.java
+++ b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/compiler/ICheckGeneratorConfigProvider.java
@@ -26,7 +26,7 @@ public interface ICheckGeneratorConfigProvider {
    * Gets the generator configuration.
    *
    * @param resource
-   *          the context resource to detect generator preferences
+   *          the context resource to detect generator preferences, must not be {@code null}
    * @return the check generator configuration
    */
   CheckGeneratorConfig get(Resource resource);
diff --git a/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/generator/CheckGenerator.xtend b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/generator/CheckGenerator.xtend
index e42bc6802..4a2b27284 100644
--- a/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/generator/CheckGenerator.xtend
+++ b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/generator/CheckGenerator.xtend
@@ -50,9 +50,9 @@ class CheckGenerator extends JvmModelGenerator {
         catalog.generateServiceRegistry(CheckUtil::serviceRegistryClassName, fsa)
       )
       // generate documentation for SCA-checks only
-	  if(!config.isGenerateLanguageInternalChecks){
-	      // change output path for html files to docs/
-    	  fsa.generateFile(catalog.docFileName, CheckGeneratorConstants::CHECK_DOC_OUTPUT, catalog.compileDoc)
+      if(!config.isGenerateLanguageInternalChecks){
+        // change output path for html files to docs/
+        fsa.generateFile(catalog.docFileName, CheckGeneratorConstants::CHECK_DOC_OUTPUT, catalog.compileDoc)
       }
     }
   }
diff --git a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/CheckBuilderPreferenceAccess.java b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/CheckBuilderPreferenceAccess.java
index daef240e3..63372854e 100644
--- a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/CheckBuilderPreferenceAccess.java
+++ b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/CheckBuilderPreferenceAccess.java
@@ -49,9 +49,9 @@ protected void initializeBuilderPreferences(final IPreferenceStore store) {
    * Load builder preferences for check.
    *
    * @param generatorConfig
-   *          the generator config
+   *          the generator config, must not be {@code null}
    * @param context
-   *          the context
+   *          the context, must not be {@code null}
    */
   public void loadBuilderPreferences(final CheckGeneratorConfig generatorConfig, final Object context) {
     super.loadBuilderPreferences(generatorConfig, context);

From 236c9047de38bbe2a2e0b921b795ae81cb25d0e9 Mon Sep 17 00:00:00 2001
From: Greg Dyke <gregory.dyke@avaloq.com>
Date: Mon, 13 Aug 2018 17:19:03 +0100
Subject: [PATCH 41/56] Remove references to xtend/xpand

---
 .../export/validation/ExportJavaValidator.java    | 15 ++++++---------
 .../scope/validation/ScopeJavaValidator.java      | 15 ++++++---------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/com.avaloq.tools.ddk.xtext.export/src/com/avaloq/tools/ddk/xtext/export/validation/ExportJavaValidator.java b/com.avaloq.tools.ddk.xtext.export/src/com/avaloq/tools/ddk/xtext/export/validation/ExportJavaValidator.java
index dd084c513..97a36902b 100644
--- a/com.avaloq.tools.ddk.xtext.export/src/com/avaloq/tools/ddk/xtext/export/validation/ExportJavaValidator.java
+++ b/com.avaloq.tools.ddk.xtext.export/src/com/avaloq/tools/ddk/xtext/export/validation/ExportJavaValidator.java
@@ -13,8 +13,6 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
@@ -25,9 +23,6 @@
 import org.eclipse.xtend.expression.Resource;
 import org.eclipse.xtend.expression.ResourceManager;
 import org.eclipse.xtend.expression.ResourceManagerDefaultImpl;
-import org.eclipse.xtend.shared.ui.Activator;
-import org.eclipse.xtend.shared.ui.core.IXtendXpandProject;
-import org.eclipse.xtend.shared.ui.expression.XpandPluginExecutionContext;
 import org.eclipse.xtext.naming.QualifiedName;
 import org.eclipse.xtext.validation.Check;
 
@@ -65,10 +60,12 @@ public class ExportJavaValidator extends AbstractExportJavaValidator {
   public void checkExtensions(final ExportModel model) {
     ResourceManager resourceManager = null;
     if (Platform.isRunning()) {
-      IXtendXpandProject project = Activator.getExtXptModelManager().findProject(ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(model.eResource().getURI().toPlatformString(true))).getProject());
-      if (project != null) {
-        resourceManager = new XpandPluginExecutionContext(project).getResourceManager();
-      }
+      // FIXME: sort out xpand
+      // IXtendXpandProject project = Activator.getExtXptModelManager().findProject(ResourcesPlugin.getWorkspace().getRoot().getFile(new
+      // Path(model.eResource().getURI().toPlatformString(true))).getProject());
+      // if (project != null) {
+      // resourceManager = new XpandPluginExecutionContext(project).getResourceManager();
+      // }
     } else {
       resourceManager = new ResourceManagerDefaultImpl();
     }
diff --git a/com.avaloq.tools.ddk.xtext.scope/src/com/avaloq/tools/ddk/xtext/scope/validation/ScopeJavaValidator.java b/com.avaloq.tools.ddk.xtext.scope/src/com/avaloq/tools/ddk/xtext/scope/validation/ScopeJavaValidator.java
index ff2619a2f..26dc8cd44 100644
--- a/com.avaloq.tools.ddk.xtext.scope/src/com/avaloq/tools/ddk/xtext/scope/validation/ScopeJavaValidator.java
+++ b/com.avaloq.tools.ddk.xtext.scope/src/com/avaloq/tools/ddk/xtext/scope/validation/ScopeJavaValidator.java
@@ -13,8 +13,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
@@ -24,9 +22,6 @@
 import org.eclipse.xtend.expression.Resource;
 import org.eclipse.xtend.expression.ResourceManager;
 import org.eclipse.xtend.expression.ResourceManagerDefaultImpl;
-import org.eclipse.xtend.shared.ui.Activator;
-import org.eclipse.xtend.shared.ui.core.IXtendXpandProject;
-import org.eclipse.xtend.shared.ui.expression.XpandPluginExecutionContext;
 import org.eclipse.xtext.nodemodel.ICompositeNode;
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
 import org.eclipse.xtext.serializer.ISerializer;
@@ -72,10 +67,12 @@ public class ScopeJavaValidator extends AbstractScopeJavaValidator {
   public void checkExtensions(final ScopeModel model) {
     ResourceManager resourceManager = null;
     if (Platform.isRunning()) {
-      IXtendXpandProject project = Activator.getExtXptModelManager().findProject(ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(model.eResource().getURI().toPlatformString(true))).getProject());
-      if (project != null) {
-        resourceManager = new XpandPluginExecutionContext(project).getResourceManager();
-      }
+      // FIXME: xpand
+      // IXtendXpandProject project = Activator.getExtXptModelManager().findProject(ResourcesPlugin.getWorkspace().getRoot().getFile(new
+      // Path(model.eResource().getURI().toPlatformString(true))).getProject());
+      // if (project != null) {
+      // resourceManager = new XpandPluginExecutionContext(project).getResourceManager();
+      // }
     } else {
       resourceManager = new ResourceManagerDefaultImpl();
     }

From af89a4a97188e133ade53cf289f0a4d0320184c2 Mon Sep 17 00:00:00 2001
From: Jenkins <hudson@avaloq.com>
Date: Tue, 14 Aug 2018 07:19:13 +0200
Subject: [PATCH 42/56] Release 2.0.0.v20180814-0719-REL

---
 com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.check.core.test/pom.xml              | 2 +-
 com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF      | 2 +-
 com.avaloq.tools.ddk.check.core/pom.xml                   | 2 +-
 com.avaloq.tools.ddk.check.generator/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.check.generator/pom.xml              | 2 +-
 com.avaloq.tools.ddk.check.lib/META-INF/MANIFEST.MF       | 2 +-
 com.avaloq.tools.ddk.check.lib/pom.xml                    | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.check.runtime.core.test/pom.xml      | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.check.runtime.core/pom.xml           | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.check.runtime.ui/pom.xml             | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.check.test.runtime.tests/pom.xml     | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.check.test.runtime.ui/pom.xml        | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.check.test.runtime/pom.xml           | 2 +-
 com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF   | 2 +-
 com.avaloq.tools.ddk.check.ui.test/pom.xml                | 2 +-
 com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF        | 2 +-
 com.avaloq.tools.ddk.check.ui/pom.xml                     | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.checkcfg.core.test/pom.xml           | 2 +-
 com.avaloq.tools.ddk.checkcfg.core/META-INF/MANIFEST.MF   | 2 +-
 com.avaloq.tools.ddk.checkcfg.core/pom.xml                | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.checkcfg.ui.test/pom.xml             | 2 +-
 com.avaloq.tools.ddk.checkcfg.ui/META-INF/MANIFEST.MF     | 2 +-
 com.avaloq.tools.ddk.checkcfg.ui/pom.xml                  | 2 +-
 com.avaloq.tools.ddk.feature/feature.xml                  | 2 +-
 com.avaloq.tools.ddk.feature/pom.xml                      | 2 +-
 com.avaloq.tools.ddk.runtime.feature/feature.xml          | 2 +-
 com.avaloq.tools.ddk.runtime.feature/pom.xml              | 2 +-
 com.avaloq.tools.ddk.runtime.source.feature/feature.xml   | 2 +-
 com.avaloq.tools.ddk.runtime.source.feature/pom.xml       | 2 +-
 com.avaloq.tools.ddk.source.feature/feature.xml           | 2 +-
 com.avaloq.tools.ddk.source.feature/pom.xml               | 2 +-
 com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF       | 2 +-
 com.avaloq.tools.ddk.test.core/pom.xml                    | 2 +-
 com.avaloq.tools.ddk.test.ui.test/META-INF/MANIFEST.MF    | 2 +-
 com.avaloq.tools.ddk.test.ui.test/pom.xml                 | 2 +-
 com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF         | 2 +-
 com.avaloq.tools.ddk.test.ui/pom.xml                      | 2 +-
 com.avaloq.tools.ddk.typesystem.test/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.typesystem.test/pom.xml              | 2 +-
 com.avaloq.tools.ddk.typesystem/META-INF/MANIFEST.MF      | 2 +-
 com.avaloq.tools.ddk.typesystem/pom.xml                   | 2 +-
 com.avaloq.tools.ddk.workflow/pom.xml                     | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.builder.ui/pom.xml             | 2 +-
 com.avaloq.tools.ddk.xtext.builder/META-INF/MANIFEST.MF   | 2 +-
 com.avaloq.tools.ddk.xtext.builder/pom.xml                | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.common.types.ui/pom.xml        | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.common.types/pom.xml           | 2 +-
 com.avaloq.tools.ddk.xtext.common.ui/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.xtext.common.ui/pom.xml              | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.export.generator/pom.xml       | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.export.test/pom.xml            | 2 +-
 com.avaloq.tools.ddk.xtext.export.ui/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.xtext.export.ui/pom.xml              | 2 +-
 com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF    | 2 +-
 com.avaloq.tools.ddk.xtext.export/pom.xml                 | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.expression.ui/pom.xml          | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.expression/pom.xml             | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.format.generator/pom.xml       | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.format.test/pom.xml            | 2 +-
 com.avaloq.tools.ddk.xtext.format.ui/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.xtext.format.ui/pom.xml              | 2 +-
 com.avaloq.tools.ddk.xtext.format/META-INF/MANIFEST.MF    | 2 +-
 com.avaloq.tools.ddk.xtext.format/pom.xml                 | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.generator.test/pom.xml         | 2 +-
 com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.xtext.generator/pom.xml              | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.scope.generator/pom.xml        | 2 +-
 com.avaloq.tools.ddk.xtext.scope.ui/META-INF/MANIFEST.MF  | 2 +-
 com.avaloq.tools.ddk.xtext.scope.ui/pom.xml               | 2 +-
 com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF     | 2 +-
 com.avaloq.tools.ddk.xtext.scope/pom.xml                  | 2 +-
 com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.xtext.test.core/pom.xml              | 2 +-
 com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF      | 2 +-
 com.avaloq.tools.ddk.xtext.test/pom.xml                   | 2 +-
 com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF   | 2 +-
 com.avaloq.tools.ddk.xtext.ui.test/pom.xml                | 2 +-
 com.avaloq.tools.ddk.xtext.ui/META-INF/MANIFEST.MF        | 2 +-
 com.avaloq.tools.ddk.xtext.ui/pom.xml                     | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.valid.generator/pom.xml        | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.valid.test/pom.xml             | 2 +-
 com.avaloq.tools.ddk.xtext.valid.ui/META-INF/MANIFEST.MF  | 2 +-
 com.avaloq.tools.ddk.xtext.valid.ui/pom.xml               | 2 +-
 com.avaloq.tools.ddk.xtext.valid/META-INF/MANIFEST.MF     | 2 +-
 com.avaloq.tools.ddk.xtext.valid/pom.xml                  | 2 +-
 com.avaloq.tools.ddk.xtext/META-INF/MANIFEST.MF           | 2 +-
 com.avaloq.tools.ddk.xtext/pom.xml                        | 2 +-
 com.avaloq.tools.ddk.xtextspy.test/META-INF/MANIFEST.MF   | 2 +-
 com.avaloq.tools.ddk.xtextspy.test/pom.xml                | 2 +-
 com.avaloq.tools.ddk.xtextspy/META-INF/MANIFEST.MF        | 2 +-
 com.avaloq.tools.ddk.xtextspy/pom.xml                     | 2 +-
 ddk-parent/pom.xml                                        | 2 +-
 ddk-repository/category.xml                               | 8 ++++----
 ddk-repository/pom.xml                                    | 2 +-
 ddk-target/pom.xml                                        | 2 +-
 117 files changed, 120 insertions(+), 120 deletions(-)

diff --git a/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF
index 8c7def500..9e402764b 100644
--- a/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.core.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.core.test;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.check.core.test/pom.xml b/com.avaloq.tools.ddk.check.core.test/pom.xml
index 9e1ce9254..3d4873123 100644
--- a/com.avaloq.tools.ddk.check.core.test/pom.xml
+++ b/com.avaloq.tools.ddk.check.core.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF
index f3374e8f9..9ca5bfc66 100644
--- a/com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.core
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.core;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.check.core/pom.xml b/com.avaloq.tools.ddk.check.core/pom.xml
index c7196019d..447f10f8d 100644
--- a/com.avaloq.tools.ddk.check.core/pom.xml
+++ b/com.avaloq.tools.ddk.check.core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.check.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.generator/META-INF/MANIFEST.MF
index 0346b7ac3..0a6e0dec7 100644
--- a/com.avaloq.tools.ddk.check.generator/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.generator
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.generator;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.check.generator/pom.xml b/com.avaloq.tools.ddk.check.generator/pom.xml
index e748d587e..68f14627e 100644
--- a/com.avaloq.tools.ddk.check.generator/pom.xml
+++ b/com.avaloq.tools.ddk.check.generator/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.check.lib/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.lib/META-INF/MANIFEST.MF
index c5dbd4903..72bd8c797 100644
--- a/com.avaloq.tools.ddk.check.lib/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.lib/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.lib
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.lib
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Vendor: Avaloq Evolution AG
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.xtext,
diff --git a/com.avaloq.tools.ddk.check.lib/pom.xml b/com.avaloq.tools.ddk.check.lib/pom.xml
index 1209d3296..efb7e3641 100644
--- a/com.avaloq.tools.ddk.check.lib/pom.xml
+++ b/com.avaloq.tools.ddk.check.lib/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.check.runtime.core.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.runtime.core.test/META-INF/MANIFEST.MF
index f65f3a7d0..f393296dc 100644
--- a/com.avaloq.tools.ddk.check.runtime.core.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.runtime.core.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.runtime.core.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.runtime.core.test;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui,
diff --git a/com.avaloq.tools.ddk.check.runtime.core.test/pom.xml b/com.avaloq.tools.ddk.check.runtime.core.test/pom.xml
index 46c634faa..5367a1dab 100644
--- a/com.avaloq.tools.ddk.check.runtime.core.test/pom.xml
+++ b/com.avaloq.tools.ddk.check.runtime.core.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.check.runtime.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.runtime.core/META-INF/MANIFEST.MF
index a87c57b25..b0588eeb1 100644
--- a/com.avaloq.tools.ddk.check.runtime.core/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.runtime.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.runtime.core
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.runtime.core;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.resources,
diff --git a/com.avaloq.tools.ddk.check.runtime.core/pom.xml b/com.avaloq.tools.ddk.check.runtime.core/pom.xml
index 6876ba1ba..0f59b91f5 100644
--- a/com.avaloq.tools.ddk.check.runtime.core/pom.xml
+++ b/com.avaloq.tools.ddk.check.runtime.core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.check.runtime.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.runtime.ui/META-INF/MANIFEST.MF
index 4069e5b8e..1abda900a 100644
--- a/com.avaloq.tools.ddk.check.runtime.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.runtime.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.runtime.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.runtime.ui;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Activator: com.avaloq.tools.ddk.check.runtime.ui.internal.Activator
 Bundle-Vendor: Avaloq Evolution AG
 Require-Bundle: org.eclipse.ui,
diff --git a/com.avaloq.tools.ddk.check.runtime.ui/pom.xml b/com.avaloq.tools.ddk.check.runtime.ui/pom.xml
index d79a5a869..6bf325d9e 100644
--- a/com.avaloq.tools.ddk.check.runtime.ui/pom.xml
+++ b/com.avaloq.tools.ddk.check.runtime.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF
index d909d8755..f009d8505 100644
--- a/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.test.runtime.tests
 Bundle-Vendor: Avaloq Evolution AG
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.test.runtime.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.avaloq.tools.ddk.check.runtime.core,
diff --git a/com.avaloq.tools.ddk.check.test.runtime.tests/pom.xml b/com.avaloq.tools.ddk.check.test.runtime.tests/pom.xml
index c217f956b..79d41ebbd 100644
--- a/com.avaloq.tools.ddk.check.test.runtime.tests/pom.xml
+++ b/com.avaloq.tools.ddk.check.test.runtime.tests/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.check.test.runtime.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.test.runtime.ui/META-INF/MANIFEST.MF
index 9e799e5fb..58f026633 100644
--- a/com.avaloq.tools.ddk.check.test.runtime.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.test.runtime.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.test.runtime.ui
 Bundle-Vendor: Avaloq Evolution AG
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.test.runtime.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.avaloq.tools.ddk.check.test.runtime;visibility:=reexport,
diff --git a/com.avaloq.tools.ddk.check.test.runtime.ui/pom.xml b/com.avaloq.tools.ddk.check.test.runtime.ui/pom.xml
index c677bd599..a6158d685 100644
--- a/com.avaloq.tools.ddk.check.test.runtime.ui/pom.xml
+++ b/com.avaloq.tools.ddk.check.test.runtime.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.check.test.runtime/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.test.runtime/META-INF/MANIFEST.MF
index d2a1c22df..6855ac420 100644
--- a/com.avaloq.tools.ddk.check.test.runtime/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.test.runtime/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.test.runtime
 Bundle-Vendor: Avaloq Evolution AG
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.test.runtime;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.xtext;visibility:=reexport,
diff --git a/com.avaloq.tools.ddk.check.test.runtime/pom.xml b/com.avaloq.tools.ddk.check.test.runtime/pom.xml
index 75c7c1566..8a96e0ce6 100644
--- a/com.avaloq.tools.ddk.check.test.runtime/pom.xml
+++ b/com.avaloq.tools.ddk.check.test.runtime/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF
index dd72335ca..20e8cbbd5 100644
--- a/com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.ui.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.ui.test
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit,
diff --git a/com.avaloq.tools.ddk.check.ui.test/pom.xml b/com.avaloq.tools.ddk.check.ui.test/pom.xml
index b4f4c6030..0aac2c58f 100644
--- a/com.avaloq.tools.ddk.check.ui.test/pom.xml
+++ b/com.avaloq.tools.ddk.check.ui.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF
index bfa817d2d..5579f51d9 100644
--- a/com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.ui;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: com.avaloq.tools.ddk.check.ui.internal.Activator
diff --git a/com.avaloq.tools.ddk.check.ui/pom.xml b/com.avaloq.tools.ddk.check.ui/pom.xml
index 43d40b009..d94dc054b 100644
--- a/com.avaloq.tools.ddk.check.ui/pom.xml
+++ b/com.avaloq.tools.ddk.check.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.checkcfg.core.test/META-INF/MANIFEST.MF
index 75c136ad9..0e4a2bc03 100644
--- a/com.avaloq.tools.ddk.checkcfg.core.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.checkcfg.core.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.checkcfg.core.test
 Bundle-Vendor: Avaloq Evolution AG
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-SymbolicName: com.avaloq.tools.ddk.checkcfg.core.test; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.avaloq.tools.ddk.test.core, 
diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/pom.xml b/com.avaloq.tools.ddk.checkcfg.core.test/pom.xml
index 2efdfc89b..a4a075514 100644
--- a/com.avaloq.tools.ddk.checkcfg.core.test/pom.xml
+++ b/com.avaloq.tools.ddk.checkcfg.core.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.checkcfg.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.checkcfg.core/META-INF/MANIFEST.MF
index f972ea832..dda2e09cd 100644
--- a/com.avaloq.tools.ddk.checkcfg.core/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.checkcfg.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.checkcfg.core
 Bundle-Vendor: Avaloq Evolution AG
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-SymbolicName: com.avaloq.tools.ddk.checkcfg.core; singleton:=true
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/com.avaloq.tools.ddk.checkcfg.core/pom.xml b/com.avaloq.tools.ddk.checkcfg.core/pom.xml
index e00468fc6..2a7668204 100644
--- a/com.avaloq.tools.ddk.checkcfg.core/pom.xml
+++ b/com.avaloq.tools.ddk.checkcfg.core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.checkcfg.ui.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.checkcfg.ui.test/META-INF/MANIFEST.MF
index aba0dc1ee..8a3c955db 100644
--- a/com.avaloq.tools.ddk.checkcfg.ui.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.checkcfg.ui.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.checkcfg.ui.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.checkcfg.ui.test
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: com.avaloq.tools.ddk.checkcfg.ui.test
diff --git a/com.avaloq.tools.ddk.checkcfg.ui.test/pom.xml b/com.avaloq.tools.ddk.checkcfg.ui.test/pom.xml
index c0fb925d3..17cb7ce1d 100644
--- a/com.avaloq.tools.ddk.checkcfg.ui.test/pom.xml
+++ b/com.avaloq.tools.ddk.checkcfg.ui.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.checkcfg.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.checkcfg.ui/META-INF/MANIFEST.MF
index 106cf7c60..ca619a01e 100644
--- a/com.avaloq.tools.ddk.checkcfg.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.checkcfg.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.checkcfg.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.checkcfg.ui;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: com.avaloq.tools.ddk.checkcfg.ui.internal.Activator
diff --git a/com.avaloq.tools.ddk.checkcfg.ui/pom.xml b/com.avaloq.tools.ddk.checkcfg.ui/pom.xml
index 06dfa5578..f307071ba 100644
--- a/com.avaloq.tools.ddk.checkcfg.ui/pom.xml
+++ b/com.avaloq.tools.ddk.checkcfg.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.feature/feature.xml b/com.avaloq.tools.ddk.feature/feature.xml
index 131697175..49e84a889 100644
--- a/com.avaloq.tools.ddk.feature/feature.xml
+++ b/com.avaloq.tools.ddk.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.avaloq.tools.ddk.feature"
       label="com.avaloq.tools.ddk.feature"
-      version="2.0.0.qualifier"
+      version="2.0.0.v20180814-0719-REL"
       provider-name="Avaloq Evolution AG">
 
    <description>
diff --git a/com.avaloq.tools.ddk.feature/pom.xml b/com.avaloq.tools.ddk.feature/pom.xml
index 51b546887..bb35cc837 100644
--- a/com.avaloq.tools.ddk.feature/pom.xml
+++ b/com.avaloq.tools.ddk.feature/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.runtime.feature/feature.xml b/com.avaloq.tools.ddk.runtime.feature/feature.xml
index 80221fcf1..edf5547fc 100644
--- a/com.avaloq.tools.ddk.runtime.feature/feature.xml
+++ b/com.avaloq.tools.ddk.runtime.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.avaloq.tools.ddk.runtime.feature"
       label="com.avaloq.tools.ddk.runtime.feature"
-      version="2.0.0.qualifier"
+      version="2.0.0.v20180814-0719-REL"
       provider-name="Avaloq Evolution AG">
 
    <description>
diff --git a/com.avaloq.tools.ddk.runtime.feature/pom.xml b/com.avaloq.tools.ddk.runtime.feature/pom.xml
index 5e5a81238..f65cc0392 100644
--- a/com.avaloq.tools.ddk.runtime.feature/pom.xml
+++ b/com.avaloq.tools.ddk.runtime.feature/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.runtime.source.feature/feature.xml b/com.avaloq.tools.ddk.runtime.source.feature/feature.xml
index 7c2d23ce8..18b5c44ae 100644
--- a/com.avaloq.tools.ddk.runtime.source.feature/feature.xml
+++ b/com.avaloq.tools.ddk.runtime.source.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.avaloq.tools.ddk.runtime.source.feature"
       label="com.avaloq.tools.ddk.runtime.source.feature"
-      version="2.0.0.qualifier"
+      version="2.0.0.v20180814-0719-REL"
       provider-name="Avaloq Evolution AG">
 
    <plugin
diff --git a/com.avaloq.tools.ddk.runtime.source.feature/pom.xml b/com.avaloq.tools.ddk.runtime.source.feature/pom.xml
index 71c42a608..be83a1b97 100644
--- a/com.avaloq.tools.ddk.runtime.source.feature/pom.xml
+++ b/com.avaloq.tools.ddk.runtime.source.feature/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.source.feature/feature.xml b/com.avaloq.tools.ddk.source.feature/feature.xml
index 62f808e39..90780f63d 100644
--- a/com.avaloq.tools.ddk.source.feature/feature.xml
+++ b/com.avaloq.tools.ddk.source.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.avaloq.tools.ddk.source.feature"
       label="com.avaloq.tools.ddk.source.feature"
-      version="2.0.0.qualifier"
+      version="2.0.0.v20180814-0719-REL"
       provider-name="Avaloq Evolution AG">
 
    <plugin
diff --git a/com.avaloq.tools.ddk.source.feature/pom.xml b/com.avaloq.tools.ddk.source.feature/pom.xml
index d1a408f4b..b679a302f 100644
--- a/com.avaloq.tools.ddk.source.feature/pom.xml
+++ b/com.avaloq.tools.ddk.source.feature/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF
index dc411fbd2..c422fa1d7 100644
--- a/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.test.core
 Bundle-SymbolicName: com.avaloq.tools.ddk.test.core;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.test.core/pom.xml b/com.avaloq.tools.ddk.test.core/pom.xml
index f51022a4a..d5cca39cd 100644
--- a/com.avaloq.tools.ddk.test.core/pom.xml
+++ b/com.avaloq.tools.ddk.test.core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.test.ui.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.test.ui.test/META-INF/MANIFEST.MF
index b043c2efe..24051720e 100644
--- a/com.avaloq.tools.ddk.test.ui.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.test.ui.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.test.ui.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.test.ui.test;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/com.avaloq.tools.ddk.test.ui.test/pom.xml b/com.avaloq.tools.ddk.test.ui.test/pom.xml
index a75681df9..41c3b269e 100644
--- a/com.avaloq.tools.ddk.test.ui.test/pom.xml
+++ b/com.avaloq.tools.ddk.test.ui.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF
index 45f6d31f6..10d250c57 100644
--- a/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.test.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.test.ui;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: com.avaloq.tools.ddk.test.ui.Activator
diff --git a/com.avaloq.tools.ddk.test.ui/pom.xml b/com.avaloq.tools.ddk.test.ui/pom.xml
index de42bbb1a..3273189da 100644
--- a/com.avaloq.tools.ddk.test.ui/pom.xml
+++ b/com.avaloq.tools.ddk.test.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.typesystem.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.typesystem.test/META-INF/MANIFEST.MF
index 755f32487..f393c7ed7 100644
--- a/com.avaloq.tools.ddk.typesystem.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.typesystem.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.typesystem.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.typesystem.test;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.typesystem.test/pom.xml b/com.avaloq.tools.ddk.typesystem.test/pom.xml
index 5c3674f49..31a995afd 100644
--- a/com.avaloq.tools.ddk.typesystem.test/pom.xml
+++ b/com.avaloq.tools.ddk.typesystem.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.typesystem/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.typesystem/META-INF/MANIFEST.MF
index 0ccffb21d..2e2c7dbe7 100644
--- a/com.avaloq.tools.ddk.typesystem/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.typesystem/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.typesystem
 Bundle-SymbolicName: com.avaloq.tools.ddk.typesystem;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.apache.log4j
diff --git a/com.avaloq.tools.ddk.typesystem/pom.xml b/com.avaloq.tools.ddk.typesystem/pom.xml
index 3513403a1..34e91f484 100644
--- a/com.avaloq.tools.ddk.typesystem/pom.xml
+++ b/com.avaloq.tools.ddk.typesystem/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.workflow/pom.xml b/com.avaloq.tools.ddk.workflow/pom.xml
index 50bbd249f..311d47a0a 100644
--- a/com.avaloq.tools.ddk.workflow/pom.xml
+++ b/com.avaloq.tools.ddk.workflow/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.builder.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.builder.ui/META-INF/MANIFEST.MF
index 69105cce8..a105482ad 100644
--- a/com.avaloq.tools.ddk.xtext.builder.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.builder.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.builder.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.builder.ui;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Vendor: Avaloq Evolution AG
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.xtext,
diff --git a/com.avaloq.tools.ddk.xtext.builder.ui/pom.xml b/com.avaloq.tools.ddk.xtext.builder.ui/pom.xml
index 053a4723a..41034dac6 100644
--- a/com.avaloq.tools.ddk.xtext.builder.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.builder.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.builder/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.builder/META-INF/MANIFEST.MF
index 8a2ecf999..a8807f3e3 100644
--- a/com.avaloq.tools.ddk.xtext.builder/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.builder/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.builder
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.builder;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Vendor: Avaloq Evolution AG
 Require-Bundle: org.eclipse.xtext.builder,
  org.eclipse.xtext.ui,
diff --git a/com.avaloq.tools.ddk.xtext.builder/pom.xml b/com.avaloq.tools.ddk.xtext.builder/pom.xml
index ee0e7b43f..f3b82f680 100644
--- a/com.avaloq.tools.ddk.xtext.builder/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.builder/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.common.types.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.common.types.ui/META-INF/MANIFEST.MF
index 403255dca..8b34fec0f 100644
--- a/com.avaloq.tools.ddk.xtext.common.types.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.common.types.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.common.types.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.common.types.ui;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.common.types.ui/pom.xml b/com.avaloq.tools.ddk.xtext.common.types.ui/pom.xml
index 1de3a3ed6..08b85f29c 100644
--- a/com.avaloq.tools.ddk.xtext.common.types.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.common.types.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.common.types/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.common.types/META-INF/MANIFEST.MF
index 0eec461d6..534591e2f 100644
--- a/com.avaloq.tools.ddk.xtext.common.types/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.common.types/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.common.types
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.common.types;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.common.types/pom.xml b/com.avaloq.tools.ddk.xtext.common.types/pom.xml
index 0d2b80969..4339bdcbe 100644
--- a/com.avaloq.tools.ddk.xtext.common.types/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.common.types/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.common.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.common.ui/META-INF/MANIFEST.MF
index d89f39bde..f98660361 100644
--- a/com.avaloq.tools.ddk.xtext.common.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.common.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.common.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.common.ui;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: com.avaloq.tools.ddk.xtext.common.ui.contentassist
diff --git a/com.avaloq.tools.ddk.xtext.common.ui/pom.xml b/com.avaloq.tools.ddk.xtext.common.ui/pom.xml
index a3155171f..a2ed92a41 100644
--- a/com.avaloq.tools.ddk.xtext.common.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.common.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.export.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.export.generator/META-INF/MANIFEST.MF
index 93ba92f99..154b9710c 100644
--- a/com.avaloq.tools.ddk.xtext.export.generator/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.export.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.export.generator
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.export.generator;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.xtext,
diff --git a/com.avaloq.tools.ddk.xtext.export.generator/pom.xml b/com.avaloq.tools.ddk.xtext.export.generator/pom.xml
index 1dd7ef5c0..bd8d08d14 100644
--- a/com.avaloq.tools.ddk.xtext.export.generator/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.export.generator/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.export.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.export.test/META-INF/MANIFEST.MF
index 620be6b85..96a20821c 100644
--- a/com.avaloq.tools.ddk.xtext.export.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.export.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.export.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.export.test;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.export.test/pom.xml b/com.avaloq.tools.ddk.xtext.export.test/pom.xml
index 1a0f61a16..bf1573d9a 100644
--- a/com.avaloq.tools.ddk.xtext.export.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.export.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.export.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.export.ui/META-INF/MANIFEST.MF
index 285388c37..55b9ccb28 100644
--- a/com.avaloq.tools.ddk.xtext.export.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.export.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.export.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.export.ui;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: com.avaloq.tools.ddk.xtext.export.ui.internal.ExportActivator
diff --git a/com.avaloq.tools.ddk.xtext.export.ui/pom.xml b/com.avaloq.tools.ddk.xtext.export.ui/pom.xml
index e1c04bd7f..d1d7da8a2 100644
--- a/com.avaloq.tools.ddk.xtext.export.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.export.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF
index 561c97fdf..25e65e1ff 100644
--- a/com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.export
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.export;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.export/pom.xml b/com.avaloq.tools.ddk.xtext.export/pom.xml
index 99ed7f831..de9fc044a 100644
--- a/com.avaloq.tools.ddk.xtext.export/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.export/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.expression.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.expression.ui/META-INF/MANIFEST.MF
index eab0834e9..4df2c893b 100644
--- a/com.avaloq.tools.ddk.xtext.expression.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.expression.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.expression.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.expression.ui;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: com.avaloq.tools.ddk.xtext.expression.ui.internal.Activator
diff --git a/com.avaloq.tools.ddk.xtext.expression.ui/pom.xml b/com.avaloq.tools.ddk.xtext.expression.ui/pom.xml
index c9d8f80a0..02563f14b 100644
--- a/com.avaloq.tools.ddk.xtext.expression.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.expression.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF
index 4cef5cfbf..a9db0273e 100644
--- a/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.expression
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.expression;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.xtext,
diff --git a/com.avaloq.tools.ddk.xtext.expression/pom.xml b/com.avaloq.tools.ddk.xtext.expression/pom.xml
index 50cf4b4d2..dab266bfc 100644
--- a/com.avaloq.tools.ddk.xtext.expression/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.expression/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.format.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.format.generator/META-INF/MANIFEST.MF
index 559f915a2..87117edd2 100644
--- a/com.avaloq.tools.ddk.xtext.format.generator/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.format.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.format.generator
 Bundle-Vendor: Avaloq Evolution AG
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.format.generator;singleton:=true
 Require-Bundle: com.avaloq.tools.ddk.xtext.format;visibility:=reexport,
  org.eclipse.xtext.generator,
diff --git a/com.avaloq.tools.ddk.xtext.format.generator/pom.xml b/com.avaloq.tools.ddk.xtext.format.generator/pom.xml
index 483c4f52b..3f36c4077 100644
--- a/com.avaloq.tools.ddk.xtext.format.generator/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.format.generator/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.format.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.format.test/META-INF/MANIFEST.MF
index c4f2d2711..2e0d38d3f 100644
--- a/com.avaloq.tools.ddk.xtext.format.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.format.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.format.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.format.test;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.format.test/pom.xml b/com.avaloq.tools.ddk.xtext.format.test/pom.xml
index 15078fc90..0ac175ef7 100644
--- a/com.avaloq.tools.ddk.xtext.format.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.format.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.format.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.format.ui/META-INF/MANIFEST.MF
index 76ef57cc9..b708c0120 100644
--- a/com.avaloq.tools.ddk.xtext.format.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.format.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.format.ui
 Bundle-Vendor: Avaloq Evolution AG
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.format.ui;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.avaloq.tools.ddk.xtext.format;visibility:=reexport,
diff --git a/com.avaloq.tools.ddk.xtext.format.ui/pom.xml b/com.avaloq.tools.ddk.xtext.format.ui/pom.xml
index 862bce37c..bf00ab481 100644
--- a/com.avaloq.tools.ddk.xtext.format.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.format.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.format/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.format/META-INF/MANIFEST.MF
index 18c660819..4561d44cd 100644
--- a/com.avaloq.tools.ddk.xtext.format/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.format/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.format
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.format;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.format/pom.xml b/com.avaloq.tools.ddk.xtext.format/pom.xml
index 0fbcf4b64..0da7cfe52 100644
--- a/com.avaloq.tools.ddk.xtext.format/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.format/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.generator.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.generator.test/META-INF/MANIFEST.MF
index d66c168ea..89a56c527 100644
--- a/com.avaloq.tools.ddk.xtext.generator.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.generator.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.generator.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.generator.test;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.generator.test/pom.xml b/com.avaloq.tools.ddk.xtext.generator.test/pom.xml
index 319679e54..a93830477 100644
--- a/com.avaloq.tools.ddk.xtext.generator.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.generator.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF
index 0c54e5284..fb61d07e7 100644
--- a/com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.generator
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.generator;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.jface,
diff --git a/com.avaloq.tools.ddk.xtext.generator/pom.xml b/com.avaloq.tools.ddk.xtext.generator/pom.xml
index 3d4f52f98..8976db7bc 100644
--- a/com.avaloq.tools.ddk.xtext.generator/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.generator/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.scope.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.scope.generator/META-INF/MANIFEST.MF
index 7c166e421..effd50be0 100644
--- a/com.avaloq.tools.ddk.xtext.scope.generator/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.scope.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.scope.generator
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.scope.generator;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.avaloq.tools.ddk.xtext.scope;visibility:=reexport,
diff --git a/com.avaloq.tools.ddk.xtext.scope.generator/pom.xml b/com.avaloq.tools.ddk.xtext.scope.generator/pom.xml
index 0beb8e394..725cc53ea 100644
--- a/com.avaloq.tools.ddk.xtext.scope.generator/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.scope.generator/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.scope.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.scope.ui/META-INF/MANIFEST.MF
index 1498afd62..c310971d2 100644
--- a/com.avaloq.tools.ddk.xtext.scope.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.scope.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.scope.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.scope.ui;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: com.avaloq.tools.ddk.xtext.scope.ui.internal.ScopeActivator
diff --git a/com.avaloq.tools.ddk.xtext.scope.ui/pom.xml b/com.avaloq.tools.ddk.xtext.scope.ui/pom.xml
index 3ff81caf9..b6c6a7677 100644
--- a/com.avaloq.tools.ddk.xtext.scope.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.scope.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF
index 2d8594db1..725fd48ad 100644
--- a/com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.scope
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.scope;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.xtext,
diff --git a/com.avaloq.tools.ddk.xtext.scope/pom.xml b/com.avaloq.tools.ddk.xtext.scope/pom.xml
index 56ff67357..cc165254d 100644
--- a/com.avaloq.tools.ddk.xtext.scope/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.scope/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF
index 39085b07e..0dcfd0bc6 100644
--- a/com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.test.core
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.test.core;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.avaloq.tools.ddk.xtext,
diff --git a/com.avaloq.tools.ddk.xtext.test.core/pom.xml b/com.avaloq.tools.ddk.xtext.test.core/pom.xml
index c1237c442..347e0c848 100644
--- a/com.avaloq.tools.ddk.xtext.test.core/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.test.core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF
index 0b970e9ae..723de738e 100644
--- a/com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.test;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.test/pom.xml b/com.avaloq.tools.ddk.xtext.test/pom.xml
index 22cee8ae4..cdee8b05c 100644
--- a/com.avaloq.tools.ddk.xtext.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF
index 5350b34ba..9bacbc6ce 100644
--- a/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.ui.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.ui.test;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.xtext.ui,
diff --git a/com.avaloq.tools.ddk.xtext.ui.test/pom.xml b/com.avaloq.tools.ddk.xtext.ui.test/pom.xml
index b99cd50b3..942862f14 100644
--- a/com.avaloq.tools.ddk.xtext.ui.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.ui.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.ui/META-INF/MANIFEST.MF
index d2a5b9575..e9eeb5eef 100644
--- a/com.avaloq.tools.ddk.xtext.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.ui;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.ui/pom.xml b/com.avaloq.tools.ddk.xtext.ui/pom.xml
index 258fa52ed..9e20cc969 100644
--- a/com.avaloq.tools.ddk.xtext.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.valid.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.valid.generator/META-INF/MANIFEST.MF
index 7839891ad..8e020fee0 100644
--- a/com.avaloq.tools.ddk.xtext.valid.generator/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.valid.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.valid.generator
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.valid.generator;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.avaloq.tools.ddk.xtext.valid;visibility:=reexport,
diff --git a/com.avaloq.tools.ddk.xtext.valid.generator/pom.xml b/com.avaloq.tools.ddk.xtext.valid.generator/pom.xml
index 247e2e055..dea12e8a4 100644
--- a/com.avaloq.tools.ddk.xtext.valid.generator/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.valid.generator/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.valid.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.valid.test/META-INF/MANIFEST.MF
index 4f63b7123..081277f38 100644
--- a/com.avaloq.tools.ddk.xtext.valid.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.valid.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.valid.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.valid.test;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.valid.test/pom.xml b/com.avaloq.tools.ddk.xtext.valid.test/pom.xml
index e971101c2..6738e8d63 100644
--- a/com.avaloq.tools.ddk.xtext.valid.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.valid.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.valid.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.valid.ui/META-INF/MANIFEST.MF
index b004a869f..cf0292d82 100644
--- a/com.avaloq.tools.ddk.xtext.valid.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.valid.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.valid.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.valid.ui;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.valid.ui/pom.xml b/com.avaloq.tools.ddk.xtext.valid.ui/pom.xml
index 7ee7444e1..781e31929 100644
--- a/com.avaloq.tools.ddk.xtext.valid.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.valid.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.valid/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.valid/META-INF/MANIFEST.MF
index 9859aa880..249fc6667 100644
--- a/com.avaloq.tools.ddk.xtext.valid/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.valid/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.valid
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.valid;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.valid/pom.xml b/com.avaloq.tools.ddk.xtext.valid/pom.xml
index f4d8fcf36..3a7e82539 100644
--- a/com.avaloq.tools.ddk.xtext.valid/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.valid/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext/META-INF/MANIFEST.MF
index 85e5f14c7..1e3bf8852 100644
--- a/com.avaloq.tools.ddk.xtext/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext/pom.xml b/com.avaloq.tools.ddk.xtext/pom.xml
index 1a9ba2230..3e483fee0 100644
--- a/com.avaloq.tools.ddk.xtext/pom.xml
+++ b/com.avaloq.tools.ddk.xtext/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtextspy.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtextspy.test/META-INF/MANIFEST.MF
index c003ffaa9..80f271ca1 100644
--- a/com.avaloq.tools.ddk.xtextspy.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtextspy.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtextspy.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtextspy.test;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtextspy.test/pom.xml b/com.avaloq.tools.ddk.xtextspy.test/pom.xml
index bbf3216c1..06e464867 100644
--- a/com.avaloq.tools.ddk.xtextspy.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtextspy.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtextspy/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtextspy/META-INF/MANIFEST.MF
index b5338c2f6..b71293b4c 100644
--- a/com.avaloq.tools.ddk.xtextspy/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtextspy/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Eclipse-ExtensibleAPI: true
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtextspy
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtextspy; singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.v20180814-0719-REL
 Bundle-Activator: com.avaloq.tools.ddk.xtextspy.internal.Activator
 Bundle-Vendor: Avaloq Evolution AG
 Require-Bundle: org.eclipse.ui,
diff --git a/com.avaloq.tools.ddk.xtextspy/pom.xml b/com.avaloq.tools.ddk.xtextspy/pom.xml
index 0eb6da3ed..f57cfa2c0 100644
--- a/com.avaloq.tools.ddk.xtextspy/pom.xml
+++ b/com.avaloq.tools.ddk.xtextspy/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/ddk-parent/pom.xml b/ddk-parent/pom.xml
index 754dc7e0f..a86326506 100644
--- a/ddk-parent/pom.xml
+++ b/ddk-parent/pom.xml
@@ -7,7 +7,7 @@
 
   <groupId>com.avaloq.tools.ddk</groupId>
   <artifactId>ddk-parent</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
+  <version>2.0.0.v20180814-0719-REL</version>
   <packaging>pom</packaging>
 
   <properties>
diff --git a/ddk-repository/category.xml b/ddk-repository/category.xml
index 2818e0a1f..c02e7bf09 100644
--- a/ddk-repository/category.xml
+++ b/ddk-repository/category.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/com.avaloq.tools.ddk.feature_2.0.0.qualifier.jar" id="com.avaloq.tools.ddk.feature" version="2.0.0.qualifier">
+   <feature url="features/com.avaloq.tools.ddk.feature_2.0.0.v20180814-0719-REL.jar" id="com.avaloq.tools.ddk.feature" version="2.0.0.v20180814-0719-REL">
       <category name="com.avaloq.tools.ddk.sdk"/>
    </feature>
-   <feature url="features/com.avaloq.tools.ddk.source.feature_2.0.0.qualifier.jar" id="com.avaloq.tools.ddk.source.feature" version="2.0.0.qualifier">
+   <feature url="features/com.avaloq.tools.ddk.source.feature_2.0.0.v20180814-0719-REL.jar" id="com.avaloq.tools.ddk.source.feature" version="2.0.0.v20180814-0719-REL">
       <category name="com.avaloq.tools.ddk.sdk"/>
    </feature>
-   <feature url="features/com.avaloq.tools.ddk.runtime.feature_2.0.0.qualifier.jar" id="com.avaloq.tools.ddk.runtime.feature" version="2.0.0.qualifier">
+   <feature url="features/com.avaloq.tools.ddk.runtime.feature_2.0.0.v20180814-0719-REL.jar" id="com.avaloq.tools.ddk.runtime.feature" version="2.0.0.v20180814-0719-REL">
       <category name="com.avaloq.tools.ddk.runtime"/>
    </feature>
-   <feature url="features/com.avaloq.tools.ddk.runtime.source.feature_2.0.0.qualifier.jar" id="com.avaloq.tools.ddk.runtime.source.feature" version="2.0.0.qualifier">
+   <feature url="features/com.avaloq.tools.ddk.runtime.source.feature_2.0.0.v20180814-0719-REL.jar" id="com.avaloq.tools.ddk.runtime.source.feature" version="2.0.0.v20180814-0719-REL">
       <category name="com.avaloq.tools.ddk.runtime"/>
    </feature>
    <category-def name="com.avaloq.tools.ddk.sdk" label="DSL Developer Kit"/>
diff --git a/ddk-repository/pom.xml b/ddk-repository/pom.xml
index 09c60a335..16951ece4 100644
--- a/ddk-repository/pom.xml
+++ b/ddk-repository/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/ddk-target/pom.xml b/ddk-target/pom.xml
index 58494515b..01b678815 100644
--- a/ddk-target/pom.xml
+++ b/ddk-target/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0.v20180814-0719-REL</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>

From ffc08ce3fe205f30923c78d90f5b7c53d0840047 Mon Sep 17 00:00:00 2001
From: Jenkins <hudson@avaloq.com>
Date: Tue, 14 Aug 2018 07:19:14 +0200
Subject: [PATCH 43/56] Next development version: 2.1.0-SNAPSHOT

---
 com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.check.core.test/pom.xml              | 2 +-
 com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF      | 2 +-
 com.avaloq.tools.ddk.check.core/pom.xml                   | 2 +-
 com.avaloq.tools.ddk.check.generator/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.check.generator/pom.xml              | 2 +-
 com.avaloq.tools.ddk.check.lib/META-INF/MANIFEST.MF       | 2 +-
 com.avaloq.tools.ddk.check.lib/pom.xml                    | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.check.runtime.core.test/pom.xml      | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.check.runtime.core/pom.xml           | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.check.runtime.ui/pom.xml             | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.check.test.runtime.tests/pom.xml     | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.check.test.runtime.ui/pom.xml        | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.check.test.runtime/pom.xml           | 2 +-
 com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF   | 2 +-
 com.avaloq.tools.ddk.check.ui.test/pom.xml                | 2 +-
 com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF        | 2 +-
 com.avaloq.tools.ddk.check.ui/pom.xml                     | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.checkcfg.core.test/pom.xml           | 2 +-
 com.avaloq.tools.ddk.checkcfg.core/META-INF/MANIFEST.MF   | 2 +-
 com.avaloq.tools.ddk.checkcfg.core/pom.xml                | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.checkcfg.ui.test/pom.xml             | 2 +-
 com.avaloq.tools.ddk.checkcfg.ui/META-INF/MANIFEST.MF     | 2 +-
 com.avaloq.tools.ddk.checkcfg.ui/pom.xml                  | 2 +-
 com.avaloq.tools.ddk.feature/feature.xml                  | 2 +-
 com.avaloq.tools.ddk.feature/pom.xml                      | 2 +-
 com.avaloq.tools.ddk.runtime.feature/feature.xml          | 2 +-
 com.avaloq.tools.ddk.runtime.feature/pom.xml              | 2 +-
 com.avaloq.tools.ddk.runtime.source.feature/feature.xml   | 2 +-
 com.avaloq.tools.ddk.runtime.source.feature/pom.xml       | 2 +-
 com.avaloq.tools.ddk.source.feature/feature.xml           | 2 +-
 com.avaloq.tools.ddk.source.feature/pom.xml               | 2 +-
 com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF       | 2 +-
 com.avaloq.tools.ddk.test.core/pom.xml                    | 2 +-
 com.avaloq.tools.ddk.test.ui.test/META-INF/MANIFEST.MF    | 2 +-
 com.avaloq.tools.ddk.test.ui.test/pom.xml                 | 2 +-
 com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF         | 2 +-
 com.avaloq.tools.ddk.test.ui/pom.xml                      | 2 +-
 com.avaloq.tools.ddk.typesystem.test/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.typesystem.test/pom.xml              | 2 +-
 com.avaloq.tools.ddk.typesystem/META-INF/MANIFEST.MF      | 2 +-
 com.avaloq.tools.ddk.typesystem/pom.xml                   | 2 +-
 com.avaloq.tools.ddk.workflow/pom.xml                     | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.builder.ui/pom.xml             | 2 +-
 com.avaloq.tools.ddk.xtext.builder/META-INF/MANIFEST.MF   | 2 +-
 com.avaloq.tools.ddk.xtext.builder/pom.xml                | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.common.types.ui/pom.xml        | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.common.types/pom.xml           | 2 +-
 com.avaloq.tools.ddk.xtext.common.ui/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.xtext.common.ui/pom.xml              | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.export.generator/pom.xml       | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.export.test/pom.xml            | 2 +-
 com.avaloq.tools.ddk.xtext.export.ui/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.xtext.export.ui/pom.xml              | 2 +-
 com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF    | 2 +-
 com.avaloq.tools.ddk.xtext.export/pom.xml                 | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.expression.ui/pom.xml          | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.expression/pom.xml             | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.format.generator/pom.xml       | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.format.test/pom.xml            | 2 +-
 com.avaloq.tools.ddk.xtext.format.ui/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.xtext.format.ui/pom.xml              | 2 +-
 com.avaloq.tools.ddk.xtext.format/META-INF/MANIFEST.MF    | 2 +-
 com.avaloq.tools.ddk.xtext.format/pom.xml                 | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.generator.test/pom.xml         | 2 +-
 com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.xtext.generator/pom.xml              | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.scope.generator/pom.xml        | 2 +-
 com.avaloq.tools.ddk.xtext.scope.ui/META-INF/MANIFEST.MF  | 2 +-
 com.avaloq.tools.ddk.xtext.scope.ui/pom.xml               | 2 +-
 com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF     | 2 +-
 com.avaloq.tools.ddk.xtext.scope/pom.xml                  | 2 +-
 com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF | 2 +-
 com.avaloq.tools.ddk.xtext.test.core/pom.xml              | 2 +-
 com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF      | 2 +-
 com.avaloq.tools.ddk.xtext.test/pom.xml                   | 2 +-
 com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF   | 2 +-
 com.avaloq.tools.ddk.xtext.ui.test/pom.xml                | 2 +-
 com.avaloq.tools.ddk.xtext.ui/META-INF/MANIFEST.MF        | 2 +-
 com.avaloq.tools.ddk.xtext.ui/pom.xml                     | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.valid.generator/pom.xml        | 2 +-
 .../META-INF/MANIFEST.MF                                  | 2 +-
 com.avaloq.tools.ddk.xtext.valid.test/pom.xml             | 2 +-
 com.avaloq.tools.ddk.xtext.valid.ui/META-INF/MANIFEST.MF  | 2 +-
 com.avaloq.tools.ddk.xtext.valid.ui/pom.xml               | 2 +-
 com.avaloq.tools.ddk.xtext.valid/META-INF/MANIFEST.MF     | 2 +-
 com.avaloq.tools.ddk.xtext.valid/pom.xml                  | 2 +-
 com.avaloq.tools.ddk.xtext/META-INF/MANIFEST.MF           | 2 +-
 com.avaloq.tools.ddk.xtext/pom.xml                        | 2 +-
 com.avaloq.tools.ddk.xtextspy.test/META-INF/MANIFEST.MF   | 2 +-
 com.avaloq.tools.ddk.xtextspy.test/pom.xml                | 2 +-
 com.avaloq.tools.ddk.xtextspy/META-INF/MANIFEST.MF        | 2 +-
 com.avaloq.tools.ddk.xtextspy/pom.xml                     | 2 +-
 ddk-parent/pom.xml                                        | 2 +-
 ddk-repository/category.xml                               | 8 ++++----
 ddk-repository/pom.xml                                    | 2 +-
 ddk-target/pom.xml                                        | 2 +-
 117 files changed, 120 insertions(+), 120 deletions(-)

diff --git a/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF
index 9e402764b..3198d4d65 100644
--- a/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.core.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.core.test;singleton:=true
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.check.core.test/pom.xml b/com.avaloq.tools.ddk.check.core.test/pom.xml
index 3d4873123..e90783435 100644
--- a/com.avaloq.tools.ddk.check.core.test/pom.xml
+++ b/com.avaloq.tools.ddk.check.core.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF
index 9ca5bfc66..c716fc89f 100644
--- a/com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.core
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.core;singleton:=true
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.check.core/pom.xml b/com.avaloq.tools.ddk.check.core/pom.xml
index 447f10f8d..3d2f0a083 100644
--- a/com.avaloq.tools.ddk.check.core/pom.xml
+++ b/com.avaloq.tools.ddk.check.core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.check.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.generator/META-INF/MANIFEST.MF
index 0a6e0dec7..93f25d549 100644
--- a/com.avaloq.tools.ddk.check.generator/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.generator
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.generator;singleton:=true
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.check.generator/pom.xml b/com.avaloq.tools.ddk.check.generator/pom.xml
index 68f14627e..8b6ad4f7b 100644
--- a/com.avaloq.tools.ddk.check.generator/pom.xml
+++ b/com.avaloq.tools.ddk.check.generator/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.check.lib/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.lib/META-INF/MANIFEST.MF
index 72bd8c797..e96cc77a0 100644
--- a/com.avaloq.tools.ddk.check.lib/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.lib/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.lib
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.lib
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.xtext,
diff --git a/com.avaloq.tools.ddk.check.lib/pom.xml b/com.avaloq.tools.ddk.check.lib/pom.xml
index efb7e3641..d1ca75566 100644
--- a/com.avaloq.tools.ddk.check.lib/pom.xml
+++ b/com.avaloq.tools.ddk.check.lib/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.check.runtime.core.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.runtime.core.test/META-INF/MANIFEST.MF
index f393296dc..45dfe5994 100644
--- a/com.avaloq.tools.ddk.check.runtime.core.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.runtime.core.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.runtime.core.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.runtime.core.test;singleton:=true
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui,
diff --git a/com.avaloq.tools.ddk.check.runtime.core.test/pom.xml b/com.avaloq.tools.ddk.check.runtime.core.test/pom.xml
index 5367a1dab..3825e4f48 100644
--- a/com.avaloq.tools.ddk.check.runtime.core.test/pom.xml
+++ b/com.avaloq.tools.ddk.check.runtime.core.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.check.runtime.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.runtime.core/META-INF/MANIFEST.MF
index b0588eeb1..e2fae02ac 100644
--- a/com.avaloq.tools.ddk.check.runtime.core/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.runtime.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.runtime.core
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.runtime.core;singleton:=true
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.resources,
diff --git a/com.avaloq.tools.ddk.check.runtime.core/pom.xml b/com.avaloq.tools.ddk.check.runtime.core/pom.xml
index 0f59b91f5..54034bdfa 100644
--- a/com.avaloq.tools.ddk.check.runtime.core/pom.xml
+++ b/com.avaloq.tools.ddk.check.runtime.core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.check.runtime.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.runtime.ui/META-INF/MANIFEST.MF
index 1abda900a..2fab685ca 100644
--- a/com.avaloq.tools.ddk.check.runtime.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.runtime.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.runtime.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.runtime.ui;singleton:=true
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Activator: com.avaloq.tools.ddk.check.runtime.ui.internal.Activator
 Bundle-Vendor: Avaloq Evolution AG
 Require-Bundle: org.eclipse.ui,
diff --git a/com.avaloq.tools.ddk.check.runtime.ui/pom.xml b/com.avaloq.tools.ddk.check.runtime.ui/pom.xml
index 6bf325d9e..d8fa5e114 100644
--- a/com.avaloq.tools.ddk.check.runtime.ui/pom.xml
+++ b/com.avaloq.tools.ddk.check.runtime.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF
index f009d8505..1ed8ad8e7 100644
--- a/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.test.runtime.tests
 Bundle-Vendor: Avaloq Evolution AG
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.test.runtime.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.avaloq.tools.ddk.check.runtime.core,
diff --git a/com.avaloq.tools.ddk.check.test.runtime.tests/pom.xml b/com.avaloq.tools.ddk.check.test.runtime.tests/pom.xml
index 79d41ebbd..0f04b4ed6 100644
--- a/com.avaloq.tools.ddk.check.test.runtime.tests/pom.xml
+++ b/com.avaloq.tools.ddk.check.test.runtime.tests/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.check.test.runtime.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.test.runtime.ui/META-INF/MANIFEST.MF
index 58f026633..8cec610b9 100644
--- a/com.avaloq.tools.ddk.check.test.runtime.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.test.runtime.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.test.runtime.ui
 Bundle-Vendor: Avaloq Evolution AG
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.test.runtime.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.avaloq.tools.ddk.check.test.runtime;visibility:=reexport,
diff --git a/com.avaloq.tools.ddk.check.test.runtime.ui/pom.xml b/com.avaloq.tools.ddk.check.test.runtime.ui/pom.xml
index a6158d685..8cc2e40fd 100644
--- a/com.avaloq.tools.ddk.check.test.runtime.ui/pom.xml
+++ b/com.avaloq.tools.ddk.check.test.runtime.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.check.test.runtime/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.test.runtime/META-INF/MANIFEST.MF
index 6855ac420..8f07327f8 100644
--- a/com.avaloq.tools.ddk.check.test.runtime/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.test.runtime/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.test.runtime
 Bundle-Vendor: Avaloq Evolution AG
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.test.runtime;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.xtext;visibility:=reexport,
diff --git a/com.avaloq.tools.ddk.check.test.runtime/pom.xml b/com.avaloq.tools.ddk.check.test.runtime/pom.xml
index 8a96e0ce6..05c704b15 100644
--- a/com.avaloq.tools.ddk.check.test.runtime/pom.xml
+++ b/com.avaloq.tools.ddk.check.test.runtime/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF
index 20e8cbbd5..e1580225b 100644
--- a/com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.ui.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.ui.test
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit,
diff --git a/com.avaloq.tools.ddk.check.ui.test/pom.xml b/com.avaloq.tools.ddk.check.ui.test/pom.xml
index 0aac2c58f..c580ce514 100644
--- a/com.avaloq.tools.ddk.check.ui.test/pom.xml
+++ b/com.avaloq.tools.ddk.check.ui.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF
index 5579f51d9..81337b09e 100644
--- a/com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.ui;singleton:=true
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: com.avaloq.tools.ddk.check.ui.internal.Activator
diff --git a/com.avaloq.tools.ddk.check.ui/pom.xml b/com.avaloq.tools.ddk.check.ui/pom.xml
index d94dc054b..ec5baf840 100644
--- a/com.avaloq.tools.ddk.check.ui/pom.xml
+++ b/com.avaloq.tools.ddk.check.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.checkcfg.core.test/META-INF/MANIFEST.MF
index 0e4a2bc03..eb10d6663 100644
--- a/com.avaloq.tools.ddk.checkcfg.core.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.checkcfg.core.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.checkcfg.core.test
 Bundle-Vendor: Avaloq Evolution AG
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-SymbolicName: com.avaloq.tools.ddk.checkcfg.core.test; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.avaloq.tools.ddk.test.core, 
diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/pom.xml b/com.avaloq.tools.ddk.checkcfg.core.test/pom.xml
index a4a075514..dead65f55 100644
--- a/com.avaloq.tools.ddk.checkcfg.core.test/pom.xml
+++ b/com.avaloq.tools.ddk.checkcfg.core.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.checkcfg.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.checkcfg.core/META-INF/MANIFEST.MF
index dda2e09cd..0c7e58e11 100644
--- a/com.avaloq.tools.ddk.checkcfg.core/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.checkcfg.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.checkcfg.core
 Bundle-Vendor: Avaloq Evolution AG
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-SymbolicName: com.avaloq.tools.ddk.checkcfg.core; singleton:=true
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/com.avaloq.tools.ddk.checkcfg.core/pom.xml b/com.avaloq.tools.ddk.checkcfg.core/pom.xml
index 2a7668204..8899cc8b1 100644
--- a/com.avaloq.tools.ddk.checkcfg.core/pom.xml
+++ b/com.avaloq.tools.ddk.checkcfg.core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.checkcfg.ui.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.checkcfg.ui.test/META-INF/MANIFEST.MF
index 8a3c955db..4c4456c35 100644
--- a/com.avaloq.tools.ddk.checkcfg.ui.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.checkcfg.ui.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.checkcfg.ui.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.checkcfg.ui.test
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: com.avaloq.tools.ddk.checkcfg.ui.test
diff --git a/com.avaloq.tools.ddk.checkcfg.ui.test/pom.xml b/com.avaloq.tools.ddk.checkcfg.ui.test/pom.xml
index 17cb7ce1d..0a7e8eec5 100644
--- a/com.avaloq.tools.ddk.checkcfg.ui.test/pom.xml
+++ b/com.avaloq.tools.ddk.checkcfg.ui.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.checkcfg.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.checkcfg.ui/META-INF/MANIFEST.MF
index ca619a01e..96a2ce969 100644
--- a/com.avaloq.tools.ddk.checkcfg.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.checkcfg.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.checkcfg.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.checkcfg.ui;singleton:=true
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: com.avaloq.tools.ddk.checkcfg.ui.internal.Activator
diff --git a/com.avaloq.tools.ddk.checkcfg.ui/pom.xml b/com.avaloq.tools.ddk.checkcfg.ui/pom.xml
index f307071ba..47b5b878c 100644
--- a/com.avaloq.tools.ddk.checkcfg.ui/pom.xml
+++ b/com.avaloq.tools.ddk.checkcfg.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.feature/feature.xml b/com.avaloq.tools.ddk.feature/feature.xml
index 49e84a889..bf13b576f 100644
--- a/com.avaloq.tools.ddk.feature/feature.xml
+++ b/com.avaloq.tools.ddk.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.avaloq.tools.ddk.feature"
       label="com.avaloq.tools.ddk.feature"
-      version="2.0.0.v20180814-0719-REL"
+      version="2.1.0.qualifier"
       provider-name="Avaloq Evolution AG">
 
    <description>
diff --git a/com.avaloq.tools.ddk.feature/pom.xml b/com.avaloq.tools.ddk.feature/pom.xml
index bb35cc837..a7ca33f23 100644
--- a/com.avaloq.tools.ddk.feature/pom.xml
+++ b/com.avaloq.tools.ddk.feature/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.runtime.feature/feature.xml b/com.avaloq.tools.ddk.runtime.feature/feature.xml
index edf5547fc..327708b9b 100644
--- a/com.avaloq.tools.ddk.runtime.feature/feature.xml
+++ b/com.avaloq.tools.ddk.runtime.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.avaloq.tools.ddk.runtime.feature"
       label="com.avaloq.tools.ddk.runtime.feature"
-      version="2.0.0.v20180814-0719-REL"
+      version="2.1.0.qualifier"
       provider-name="Avaloq Evolution AG">
 
    <description>
diff --git a/com.avaloq.tools.ddk.runtime.feature/pom.xml b/com.avaloq.tools.ddk.runtime.feature/pom.xml
index f65cc0392..4763537fa 100644
--- a/com.avaloq.tools.ddk.runtime.feature/pom.xml
+++ b/com.avaloq.tools.ddk.runtime.feature/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.runtime.source.feature/feature.xml b/com.avaloq.tools.ddk.runtime.source.feature/feature.xml
index 18b5c44ae..5a1e54c2c 100644
--- a/com.avaloq.tools.ddk.runtime.source.feature/feature.xml
+++ b/com.avaloq.tools.ddk.runtime.source.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.avaloq.tools.ddk.runtime.source.feature"
       label="com.avaloq.tools.ddk.runtime.source.feature"
-      version="2.0.0.v20180814-0719-REL"
+      version="2.1.0.qualifier"
       provider-name="Avaloq Evolution AG">
 
    <plugin
diff --git a/com.avaloq.tools.ddk.runtime.source.feature/pom.xml b/com.avaloq.tools.ddk.runtime.source.feature/pom.xml
index be83a1b97..f63c1d5b5 100644
--- a/com.avaloq.tools.ddk.runtime.source.feature/pom.xml
+++ b/com.avaloq.tools.ddk.runtime.source.feature/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.source.feature/feature.xml b/com.avaloq.tools.ddk.source.feature/feature.xml
index 90780f63d..5b8d39d00 100644
--- a/com.avaloq.tools.ddk.source.feature/feature.xml
+++ b/com.avaloq.tools.ddk.source.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.avaloq.tools.ddk.source.feature"
       label="com.avaloq.tools.ddk.source.feature"
-      version="2.0.0.v20180814-0719-REL"
+      version="2.1.0.qualifier"
       provider-name="Avaloq Evolution AG">
 
    <plugin
diff --git a/com.avaloq.tools.ddk.source.feature/pom.xml b/com.avaloq.tools.ddk.source.feature/pom.xml
index b679a302f..ad3d3e5cc 100644
--- a/com.avaloq.tools.ddk.source.feature/pom.xml
+++ b/com.avaloq.tools.ddk.source.feature/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF
index c422fa1d7..12c0f6d24 100644
--- a/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.test.core
 Bundle-SymbolicName: com.avaloq.tools.ddk.test.core;singleton:=true
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.test.core/pom.xml b/com.avaloq.tools.ddk.test.core/pom.xml
index d5cca39cd..9559fdab3 100644
--- a/com.avaloq.tools.ddk.test.core/pom.xml
+++ b/com.avaloq.tools.ddk.test.core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.test.ui.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.test.ui.test/META-INF/MANIFEST.MF
index 24051720e..cfc36717f 100644
--- a/com.avaloq.tools.ddk.test.ui.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.test.ui.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.test.ui.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.test.ui.test;singleton:=true
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/com.avaloq.tools.ddk.test.ui.test/pom.xml b/com.avaloq.tools.ddk.test.ui.test/pom.xml
index 41c3b269e..eaf498836 100644
--- a/com.avaloq.tools.ddk.test.ui.test/pom.xml
+++ b/com.avaloq.tools.ddk.test.ui.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF
index 10d250c57..e1f61d845 100644
--- a/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.test.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.test.ui;singleton:=true
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: com.avaloq.tools.ddk.test.ui.Activator
diff --git a/com.avaloq.tools.ddk.test.ui/pom.xml b/com.avaloq.tools.ddk.test.ui/pom.xml
index 3273189da..e4641e3dd 100644
--- a/com.avaloq.tools.ddk.test.ui/pom.xml
+++ b/com.avaloq.tools.ddk.test.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.typesystem.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.typesystem.test/META-INF/MANIFEST.MF
index f393c7ed7..d10c877af 100644
--- a/com.avaloq.tools.ddk.typesystem.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.typesystem.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.typesystem.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.typesystem.test;singleton:=true
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.typesystem.test/pom.xml b/com.avaloq.tools.ddk.typesystem.test/pom.xml
index 31a995afd..646107e2f 100644
--- a/com.avaloq.tools.ddk.typesystem.test/pom.xml
+++ b/com.avaloq.tools.ddk.typesystem.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.typesystem/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.typesystem/META-INF/MANIFEST.MF
index 2e2c7dbe7..842c070e9 100644
--- a/com.avaloq.tools.ddk.typesystem/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.typesystem/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.typesystem
 Bundle-SymbolicName: com.avaloq.tools.ddk.typesystem;singleton:=true
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.apache.log4j
diff --git a/com.avaloq.tools.ddk.typesystem/pom.xml b/com.avaloq.tools.ddk.typesystem/pom.xml
index 34e91f484..9ccd52c4a 100644
--- a/com.avaloq.tools.ddk.typesystem/pom.xml
+++ b/com.avaloq.tools.ddk.typesystem/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.workflow/pom.xml b/com.avaloq.tools.ddk.workflow/pom.xml
index 311d47a0a..6df1a66e4 100644
--- a/com.avaloq.tools.ddk.workflow/pom.xml
+++ b/com.avaloq.tools.ddk.workflow/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.builder.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.builder.ui/META-INF/MANIFEST.MF
index a105482ad..2b3e18bb5 100644
--- a/com.avaloq.tools.ddk.xtext.builder.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.builder.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.builder.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.builder.ui;singleton:=true
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.xtext,
diff --git a/com.avaloq.tools.ddk.xtext.builder.ui/pom.xml b/com.avaloq.tools.ddk.xtext.builder.ui/pom.xml
index 41034dac6..a072c826b 100644
--- a/com.avaloq.tools.ddk.xtext.builder.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.builder.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.builder/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.builder/META-INF/MANIFEST.MF
index a8807f3e3..fa4ab31f8 100644
--- a/com.avaloq.tools.ddk.xtext.builder/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.builder/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.builder
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.builder;singleton:=true
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Require-Bundle: org.eclipse.xtext.builder,
  org.eclipse.xtext.ui,
diff --git a/com.avaloq.tools.ddk.xtext.builder/pom.xml b/com.avaloq.tools.ddk.xtext.builder/pom.xml
index f3b82f680..02b9bb902 100644
--- a/com.avaloq.tools.ddk.xtext.builder/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.builder/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.common.types.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.common.types.ui/META-INF/MANIFEST.MF
index 8b34fec0f..131fd7751 100644
--- a/com.avaloq.tools.ddk.xtext.common.types.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.common.types.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.common.types.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.common.types.ui;singleton:=true
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.common.types.ui/pom.xml b/com.avaloq.tools.ddk.xtext.common.types.ui/pom.xml
index 08b85f29c..b312c0055 100644
--- a/com.avaloq.tools.ddk.xtext.common.types.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.common.types.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.common.types/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.common.types/META-INF/MANIFEST.MF
index 534591e2f..793faeb0d 100644
--- a/com.avaloq.tools.ddk.xtext.common.types/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.common.types/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.common.types
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.common.types;singleton:=true
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.common.types/pom.xml b/com.avaloq.tools.ddk.xtext.common.types/pom.xml
index 4339bdcbe..608fffc47 100644
--- a/com.avaloq.tools.ddk.xtext.common.types/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.common.types/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.common.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.common.ui/META-INF/MANIFEST.MF
index f98660361..3552c542b 100644
--- a/com.avaloq.tools.ddk.xtext.common.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.common.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.common.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.common.ui;singleton:=true
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: com.avaloq.tools.ddk.xtext.common.ui.contentassist
diff --git a/com.avaloq.tools.ddk.xtext.common.ui/pom.xml b/com.avaloq.tools.ddk.xtext.common.ui/pom.xml
index a2ed92a41..21d875a1b 100644
--- a/com.avaloq.tools.ddk.xtext.common.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.common.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.export.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.export.generator/META-INF/MANIFEST.MF
index 154b9710c..4026992e8 100644
--- a/com.avaloq.tools.ddk.xtext.export.generator/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.export.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.export.generator
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.export.generator;singleton:=true
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.xtext,
diff --git a/com.avaloq.tools.ddk.xtext.export.generator/pom.xml b/com.avaloq.tools.ddk.xtext.export.generator/pom.xml
index bd8d08d14..68864d1a8 100644
--- a/com.avaloq.tools.ddk.xtext.export.generator/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.export.generator/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.export.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.export.test/META-INF/MANIFEST.MF
index 96a20821c..e121d22c0 100644
--- a/com.avaloq.tools.ddk.xtext.export.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.export.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.export.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.export.test;singleton:=true
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.export.test/pom.xml b/com.avaloq.tools.ddk.xtext.export.test/pom.xml
index bf1573d9a..bfbe4f339 100644
--- a/com.avaloq.tools.ddk.xtext.export.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.export.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.export.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.export.ui/META-INF/MANIFEST.MF
index 55b9ccb28..d96f9d159 100644
--- a/com.avaloq.tools.ddk.xtext.export.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.export.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.export.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.export.ui;singleton:=true
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: com.avaloq.tools.ddk.xtext.export.ui.internal.ExportActivator
diff --git a/com.avaloq.tools.ddk.xtext.export.ui/pom.xml b/com.avaloq.tools.ddk.xtext.export.ui/pom.xml
index d1d7da8a2..e9b366514 100644
--- a/com.avaloq.tools.ddk.xtext.export.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.export.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF
index 25e65e1ff..aec2e3b3b 100644
--- a/com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.export
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.export;singleton:=true
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.export/pom.xml b/com.avaloq.tools.ddk.xtext.export/pom.xml
index de9fc044a..3bbb948ed 100644
--- a/com.avaloq.tools.ddk.xtext.export/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.export/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.expression.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.expression.ui/META-INF/MANIFEST.MF
index 4df2c893b..f2731d59c 100644
--- a/com.avaloq.tools.ddk.xtext.expression.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.expression.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.expression.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.expression.ui;singleton:=true
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: com.avaloq.tools.ddk.xtext.expression.ui.internal.Activator
diff --git a/com.avaloq.tools.ddk.xtext.expression.ui/pom.xml b/com.avaloq.tools.ddk.xtext.expression.ui/pom.xml
index 02563f14b..ab72a5ce7 100644
--- a/com.avaloq.tools.ddk.xtext.expression.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.expression.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF
index a9db0273e..5b84c94fa 100644
--- a/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.expression
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.expression;singleton:=true
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.xtext,
diff --git a/com.avaloq.tools.ddk.xtext.expression/pom.xml b/com.avaloq.tools.ddk.xtext.expression/pom.xml
index dab266bfc..aa298a362 100644
--- a/com.avaloq.tools.ddk.xtext.expression/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.expression/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.format.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.format.generator/META-INF/MANIFEST.MF
index 87117edd2..65907d983 100644
--- a/com.avaloq.tools.ddk.xtext.format.generator/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.format.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.format.generator
 Bundle-Vendor: Avaloq Evolution AG
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.format.generator;singleton:=true
 Require-Bundle: com.avaloq.tools.ddk.xtext.format;visibility:=reexport,
  org.eclipse.xtext.generator,
diff --git a/com.avaloq.tools.ddk.xtext.format.generator/pom.xml b/com.avaloq.tools.ddk.xtext.format.generator/pom.xml
index 3f36c4077..b39bdcee1 100644
--- a/com.avaloq.tools.ddk.xtext.format.generator/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.format.generator/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.format.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.format.test/META-INF/MANIFEST.MF
index 2e0d38d3f..dbce500ef 100644
--- a/com.avaloq.tools.ddk.xtext.format.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.format.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.format.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.format.test;singleton:=true
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.format.test/pom.xml b/com.avaloq.tools.ddk.xtext.format.test/pom.xml
index 0ac175ef7..582a1e18d 100644
--- a/com.avaloq.tools.ddk.xtext.format.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.format.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.format.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.format.ui/META-INF/MANIFEST.MF
index b708c0120..d8f443bd4 100644
--- a/com.avaloq.tools.ddk.xtext.format.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.format.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.format.ui
 Bundle-Vendor: Avaloq Evolution AG
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.format.ui;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.avaloq.tools.ddk.xtext.format;visibility:=reexport,
diff --git a/com.avaloq.tools.ddk.xtext.format.ui/pom.xml b/com.avaloq.tools.ddk.xtext.format.ui/pom.xml
index bf00ab481..c10800616 100644
--- a/com.avaloq.tools.ddk.xtext.format.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.format.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.format/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.format/META-INF/MANIFEST.MF
index 4561d44cd..c57e949cb 100644
--- a/com.avaloq.tools.ddk.xtext.format/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.format/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.format
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.format;singleton:=true
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.format/pom.xml b/com.avaloq.tools.ddk.xtext.format/pom.xml
index 0da7cfe52..252b949e5 100644
--- a/com.avaloq.tools.ddk.xtext.format/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.format/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.generator.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.generator.test/META-INF/MANIFEST.MF
index 89a56c527..78dc018b5 100644
--- a/com.avaloq.tools.ddk.xtext.generator.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.generator.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.generator.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.generator.test;singleton:=true
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.generator.test/pom.xml b/com.avaloq.tools.ddk.xtext.generator.test/pom.xml
index a93830477..b0975534b 100644
--- a/com.avaloq.tools.ddk.xtext.generator.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.generator.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF
index fb61d07e7..be6d127d7 100644
--- a/com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.generator
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.generator;singleton:=true
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.jface,
diff --git a/com.avaloq.tools.ddk.xtext.generator/pom.xml b/com.avaloq.tools.ddk.xtext.generator/pom.xml
index 8976db7bc..ce9699e30 100644
--- a/com.avaloq.tools.ddk.xtext.generator/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.generator/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.scope.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.scope.generator/META-INF/MANIFEST.MF
index effd50be0..9bb4d655f 100644
--- a/com.avaloq.tools.ddk.xtext.scope.generator/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.scope.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.scope.generator
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.scope.generator;singleton:=true
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.avaloq.tools.ddk.xtext.scope;visibility:=reexport,
diff --git a/com.avaloq.tools.ddk.xtext.scope.generator/pom.xml b/com.avaloq.tools.ddk.xtext.scope.generator/pom.xml
index 725cc53ea..0974129c0 100644
--- a/com.avaloq.tools.ddk.xtext.scope.generator/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.scope.generator/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.scope.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.scope.ui/META-INF/MANIFEST.MF
index c310971d2..7a6b65b59 100644
--- a/com.avaloq.tools.ddk.xtext.scope.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.scope.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.scope.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.scope.ui;singleton:=true
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: com.avaloq.tools.ddk.xtext.scope.ui.internal.ScopeActivator
diff --git a/com.avaloq.tools.ddk.xtext.scope.ui/pom.xml b/com.avaloq.tools.ddk.xtext.scope.ui/pom.xml
index b6c6a7677..6895346d6 100644
--- a/com.avaloq.tools.ddk.xtext.scope.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.scope.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF
index 725fd48ad..fe66a0bcf 100644
--- a/com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.scope
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.scope;singleton:=true
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.xtext,
diff --git a/com.avaloq.tools.ddk.xtext.scope/pom.xml b/com.avaloq.tools.ddk.xtext.scope/pom.xml
index cc165254d..850d11c71 100644
--- a/com.avaloq.tools.ddk.xtext.scope/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.scope/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF
index 0dcfd0bc6..e9fa125ac 100644
--- a/com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.test.core
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.test.core;singleton:=true
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.avaloq.tools.ddk.xtext,
diff --git a/com.avaloq.tools.ddk.xtext.test.core/pom.xml b/com.avaloq.tools.ddk.xtext.test.core/pom.xml
index 347e0c848..76087c02f 100644
--- a/com.avaloq.tools.ddk.xtext.test.core/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.test.core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF
index 723de738e..24a04d8db 100644
--- a/com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.test;singleton:=true
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.test/pom.xml b/com.avaloq.tools.ddk.xtext.test/pom.xml
index cdee8b05c..0f283e730 100644
--- a/com.avaloq.tools.ddk.xtext.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF
index 9bacbc6ce..dc0505576 100644
--- a/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.ui.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.ui.test;singleton:=true
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.xtext.ui,
diff --git a/com.avaloq.tools.ddk.xtext.ui.test/pom.xml b/com.avaloq.tools.ddk.xtext.ui.test/pom.xml
index 942862f14..ef2cdd92b 100644
--- a/com.avaloq.tools.ddk.xtext.ui.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.ui.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.ui/META-INF/MANIFEST.MF
index e9eeb5eef..fcaaebe6a 100644
--- a/com.avaloq.tools.ddk.xtext.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.ui;singleton:=true
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.ui/pom.xml b/com.avaloq.tools.ddk.xtext.ui/pom.xml
index 9e20cc969..5b5966bfe 100644
--- a/com.avaloq.tools.ddk.xtext.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtext.valid.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.valid.generator/META-INF/MANIFEST.MF
index 8e020fee0..ebcc9560c 100644
--- a/com.avaloq.tools.ddk.xtext.valid.generator/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.valid.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.valid.generator
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.valid.generator;singleton:=true
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.avaloq.tools.ddk.xtext.valid;visibility:=reexport,
diff --git a/com.avaloq.tools.ddk.xtext.valid.generator/pom.xml b/com.avaloq.tools.ddk.xtext.valid.generator/pom.xml
index dea12e8a4..a58fc68d5 100644
--- a/com.avaloq.tools.ddk.xtext.valid.generator/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.valid.generator/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.valid.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.valid.test/META-INF/MANIFEST.MF
index 081277f38..9c506269e 100644
--- a/com.avaloq.tools.ddk.xtext.valid.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.valid.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.valid.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.valid.test;singleton:=true
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.valid.test/pom.xml b/com.avaloq.tools.ddk.xtext.valid.test/pom.xml
index 6738e8d63..2d5c7b9ce 100644
--- a/com.avaloq.tools.ddk.xtext.valid.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.valid.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.valid.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.valid.ui/META-INF/MANIFEST.MF
index cf0292d82..5920fb3b4 100644
--- a/com.avaloq.tools.ddk.xtext.valid.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.valid.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.valid.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.valid.ui;singleton:=true
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.valid.ui/pom.xml b/com.avaloq.tools.ddk.xtext.valid.ui/pom.xml
index 781e31929..6443d9f83 100644
--- a/com.avaloq.tools.ddk.xtext.valid.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.valid.ui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext.valid/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.valid/META-INF/MANIFEST.MF
index 249fc6667..863394cbc 100644
--- a/com.avaloq.tools.ddk.xtext.valid/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.valid/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.valid
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.valid;singleton:=true
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.valid/pom.xml b/com.avaloq.tools.ddk.xtext.valid/pom.xml
index 3a7e82539..4c20ffb94 100644
--- a/com.avaloq.tools.ddk.xtext.valid/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.valid/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtext/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext/META-INF/MANIFEST.MF
index 1e3bf8852..2d7bcdf85 100644
--- a/com.avaloq.tools.ddk.xtext/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext;singleton:=true
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext/pom.xml b/com.avaloq.tools.ddk.xtext/pom.xml
index 3e483fee0..5b693b71a 100644
--- a/com.avaloq.tools.ddk.xtext/pom.xml
+++ b/com.avaloq.tools.ddk.xtext/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>
diff --git a/com.avaloq.tools.ddk.xtextspy.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtextspy.test/META-INF/MANIFEST.MF
index 80f271ca1..a64b83723 100644
--- a/com.avaloq.tools.ddk.xtextspy.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtextspy.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtextspy.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtextspy.test;singleton:=true
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtextspy.test/pom.xml b/com.avaloq.tools.ddk.xtextspy.test/pom.xml
index 06e464867..ce2eb078c 100644
--- a/com.avaloq.tools.ddk.xtextspy.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtextspy.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/com.avaloq.tools.ddk.xtextspy/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtextspy/META-INF/MANIFEST.MF
index b71293b4c..739c1ebec 100644
--- a/com.avaloq.tools.ddk.xtextspy/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtextspy/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Eclipse-ExtensibleAPI: true
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtextspy
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtextspy; singleton:=true
-Bundle-Version: 2.0.0.v20180814-0719-REL
+Bundle-Version: 2.1.0.qualifier
 Bundle-Activator: com.avaloq.tools.ddk.xtextspy.internal.Activator
 Bundle-Vendor: Avaloq Evolution AG
 Require-Bundle: org.eclipse.ui,
diff --git a/com.avaloq.tools.ddk.xtextspy/pom.xml b/com.avaloq.tools.ddk.xtextspy/pom.xml
index f57cfa2c0..f46b1cd3a 100644
--- a/com.avaloq.tools.ddk.xtextspy/pom.xml
+++ b/com.avaloq.tools.ddk.xtextspy/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/ddk-parent/pom.xml b/ddk-parent/pom.xml
index a86326506..36376e4e1 100644
--- a/ddk-parent/pom.xml
+++ b/ddk-parent/pom.xml
@@ -7,7 +7,7 @@
 
   <groupId>com.avaloq.tools.ddk</groupId>
   <artifactId>ddk-parent</artifactId>
-  <version>2.0.0.v20180814-0719-REL</version>
+  <version>2.1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
diff --git a/ddk-repository/category.xml b/ddk-repository/category.xml
index c02e7bf09..8dfe10b47 100644
--- a/ddk-repository/category.xml
+++ b/ddk-repository/category.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/com.avaloq.tools.ddk.feature_2.0.0.v20180814-0719-REL.jar" id="com.avaloq.tools.ddk.feature" version="2.0.0.v20180814-0719-REL">
+   <feature url="features/com.avaloq.tools.ddk.feature_2.1.0.qualifier.jar" id="com.avaloq.tools.ddk.feature" version="2.1.0.qualifier">
       <category name="com.avaloq.tools.ddk.sdk"/>
    </feature>
-   <feature url="features/com.avaloq.tools.ddk.source.feature_2.0.0.v20180814-0719-REL.jar" id="com.avaloq.tools.ddk.source.feature" version="2.0.0.v20180814-0719-REL">
+   <feature url="features/com.avaloq.tools.ddk.source.feature_2.1.0.qualifier.jar" id="com.avaloq.tools.ddk.source.feature" version="2.1.0.qualifier">
       <category name="com.avaloq.tools.ddk.sdk"/>
    </feature>
-   <feature url="features/com.avaloq.tools.ddk.runtime.feature_2.0.0.v20180814-0719-REL.jar" id="com.avaloq.tools.ddk.runtime.feature" version="2.0.0.v20180814-0719-REL">
+   <feature url="features/com.avaloq.tools.ddk.runtime.feature_2.1.0.qualifier.jar" id="com.avaloq.tools.ddk.runtime.feature" version="2.1.0.qualifier">
       <category name="com.avaloq.tools.ddk.runtime"/>
    </feature>
-   <feature url="features/com.avaloq.tools.ddk.runtime.source.feature_2.0.0.v20180814-0719-REL.jar" id="com.avaloq.tools.ddk.runtime.source.feature" version="2.0.0.v20180814-0719-REL">
+   <feature url="features/com.avaloq.tools.ddk.runtime.source.feature_2.1.0.qualifier.jar" id="com.avaloq.tools.ddk.runtime.source.feature" version="2.1.0.qualifier">
       <category name="com.avaloq.tools.ddk.runtime"/>
    </feature>
    <category-def name="com.avaloq.tools.ddk.sdk" label="DSL Developer Kit"/>
diff --git a/ddk-repository/pom.xml b/ddk-repository/pom.xml
index 16951ece4..d02365b1c 100644
--- a/ddk-repository/pom.xml
+++ b/ddk-repository/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
 
diff --git a/ddk-target/pom.xml b/ddk-target/pom.xml
index 01b678815..5479aa0a1 100644
--- a/ddk-target/pom.xml
+++ b/ddk-target/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ddk-parent</artifactId>
     <groupId>com.avaloq.tools.ddk</groupId>
-    <version>2.0.0.v20180814-0719-REL</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
   <groupId>com.avaloq.tools.ddk</groupId>

From 842929c4f2e722cfab4b4d6a57c125de568f7cc2 Mon Sep 17 00:00:00 2001
From: Andrew Lamb <Andrew.Lamb@avaloq.com>
Date: Tue, 14 Aug 2018 09:55:54 +0100
Subject: [PATCH 44/56] Workaround for RuleNames adapter installation on
 grammars and rules.

---
 .../format/jvmmodel/FormatJvmModelInferrer.xtend     | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/com.avaloq.tools.ddk.xtext.format/src/com/avaloq/tools/ddk/xtext/format/jvmmodel/FormatJvmModelInferrer.xtend b/com.avaloq.tools.ddk.xtext.format/src/com/avaloq/tools/ddk/xtext/format/jvmmodel/FormatJvmModelInferrer.xtend
index 570874f5c..6e75680d9 100644
--- a/com.avaloq.tools.ddk.xtext.format/src/com/avaloq/tools/ddk/xtext/format/jvmmodel/FormatJvmModelInferrer.xtend
+++ b/com.avaloq.tools.ddk.xtext.format/src/com/avaloq/tools/ddk/xtext/format/jvmmodel/FormatJvmModelInferrer.xtend
@@ -73,6 +73,9 @@ import static org.eclipse.xtext.GrammarUtil.*
 import static extension com.avaloq.tools.ddk.xtext.format.generator.FormatGeneratorUtil.*
 import org.eclipse.emf.ecore.EClass
 import java.util.regex.Pattern
+import org.eclipse.xtext.xtext.RuleNames
+import org.eclipse.emf.ecore.util.EcoreUtil
+import org.eclipse.xtext.GrammarUtil
 
 /**
  * <p>Infers a JVM model from the source model.</p>
@@ -117,6 +120,15 @@ class FormatJvmModelInferrer extends AbstractModelInferrer {
    *      rely on linking using the index if isPreIndexingPhase is {@code true}.
    */
   def dispatch void infer(FormatConfiguration format, IJvmDeclaredTypeAcceptor acceptor, boolean isPreIndexingPhase) {
+   val context = format.targetGrammar
+    if (EcoreUtil.getAdapter(context.eAdapters(), typeof(RuleNames)) === null) {
+    	val allRules = GrammarUtil.allRules(context);
+    	for(AbstractRule rule: allRules) {
+    		val adpt =EcoreUtil.getAdapter(rule.eAdapters(), typeof(RuleNames));
+    		if(adpt!==null) rule.eAdapters().remove(adpt)
+    	}
+		RuleNames.getRuleNames(context, true);
+	}
     acceptor.accept(
       format.toClass(getFormatterName(format, "Abstract").toSimpleName), [
         inferClass(format, it)

From 4f69bee774860a32f66415025657cad71fb312c7 Mon Sep 17 00:00:00 2001
From: Andrew Lamb <Andrew.Lamb@avaloq.com>
Date: Wed, 15 Aug 2018 10:50:49 +0100
Subject: [PATCH 45/56] Fix for FormatQualifiedNameProvider.

---
 .../ddk/xtext/format/naming/FormatQualifiedNameProvider.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/com.avaloq.tools.ddk.xtext.format/src/com/avaloq/tools/ddk/xtext/format/naming/FormatQualifiedNameProvider.java b/com.avaloq.tools.ddk.xtext.format/src/com/avaloq/tools/ddk/xtext/format/naming/FormatQualifiedNameProvider.java
index 4a77e6120..0e2bbd4d0 100644
--- a/com.avaloq.tools.ddk.xtext.format/src/com/avaloq/tools/ddk/xtext/format/naming/FormatQualifiedNameProvider.java
+++ b/com.avaloq.tools.ddk.xtext.format/src/com/avaloq/tools/ddk/xtext/format/naming/FormatQualifiedNameProvider.java
@@ -10,10 +10,10 @@
  *******************************************************************************/
 package com.avaloq.tools.ddk.xtext.format.naming;
 
-import org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider;
 import org.eclipse.xtext.naming.QualifiedName;
 import org.eclipse.xtext.nodemodel.INode;
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
+import org.eclipse.xtext.xbase.scoping.XbaseQualifiedNameProvider;
 
 import com.avaloq.tools.ddk.xtext.format.format.FormatConfiguration;
 import com.avaloq.tools.ddk.xtext.format.format.FormatPackage;
@@ -22,7 +22,7 @@
 /**
  * QualifiedNameProvider for Format - currently only provides for FormatConfiguration elements.
  */
-public class FormatQualifiedNameProvider extends DefaultDeclarativeQualifiedNameProvider {
+public class FormatQualifiedNameProvider extends XbaseQualifiedNameProvider {
 
   /**
    * Qualified name for FormatConfiguration.

From 22d32c62a3f889196bc20799760fe2b38eb07c8a Mon Sep 17 00:00:00 2001
From: Roman Mitin <roman.mitin@avaloq.com>
Date: Thu, 16 Aug 2018 16:09:53 +0200
Subject: [PATCH 46/56] Workaround for format linking problems to models
 defined in the same plugin.
 .AbstractProjectAwareResourceDescriptionsProvider.getResourceDescriptions is
 filtering resource out of the same plugin, so they fail to link. If ecore
 grammar is defined in the same plugin as xtext and then format we do have a
 problem sometimes.

---
 .../ddk/xtext/format/ui/builder/FormatBuilderParticipant.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/com.avaloq.tools.ddk.xtext.format.ui/src/com/avaloq/tools/ddk/xtext/format/ui/builder/FormatBuilderParticipant.java b/com.avaloq.tools.ddk.xtext.format.ui/src/com/avaloq/tools/ddk/xtext/format/ui/builder/FormatBuilderParticipant.java
index ab9ba0e62..34c4c4b00 100644
--- a/com.avaloq.tools.ddk.xtext.format.ui/src/com/avaloq/tools/ddk/xtext/format/ui/builder/FormatBuilderParticipant.java
+++ b/com.avaloq.tools.ddk.xtext.format.ui/src/com/avaloq/tools/ddk/xtext/format/ui/builder/FormatBuilderParticipant.java
@@ -39,6 +39,7 @@ public void build(final IBuildContext context, final IProgressMonitor monitor) t
     if (!isEnabled(context)) {
       return;
     }
+    clearResourceSet(context.getResourceSet());
     super.build(context, monitor);
   }
 

From 703d93771bf18726524f42002d026d08487e5f4a Mon Sep 17 00:00:00 2001
From: Roman Mitin <roman.mitin@avaloq.com>
Date: Thu, 16 Aug 2018 20:56:25 +0200
Subject: [PATCH 47/56] Move from deprecated *.junit4 test classes to .testing
 classes which.

---
 .../META-INF/MANIFEST.MF                      |   2 +
 .../ddk/check/CheckInjectorProvider.java      |  76 ++++----
 .../ddk/check/CheckUiInjectorProvider.java    |  15 +-
 .../test/AbstractCheckGenerationTestCase.java |   2 +-
 .../core/test/AbstractCheckTestCase.java      |   2 +-
 .../ddk/check/core/test/BasicModelTest.xtend  |   6 +-
 .../tools/ddk/check/core/test/BugAig1314.java |   5 +-
 .../tools/ddk/check/core/test/BugAig830.xtend |   6 +-
 .../tools/ddk/check/core/test/BugDsl27.java   |   4 +-
 .../check/core/test/CheckScopingTest.xtend    |   6 +-
 .../IssueCodeToLabelMapGenerationTest.xtend   |   4 +-
 .../check/core/test/ProjectBasedTests.xtend   |   6 +-
 ...ckRewritableImportSectionFactoryTest.xtend |   2 +-
 .../CheckApiAccessValidationsTest.xtend       |   8 +-
 .../CheckJavaValidatorUtilTest.java           |   4 +-
 .../validation/CheckValidationTest.xtend      |   8 +-
 .../.classpath                                |  33 ++--
 .../META-INF/MANIFEST.MF                      |   6 +-
 .../build.properties                          |   1 -
 .../check/TestLanguageInjectorProvider.java   |  48 -----
 .../check/TestLanguageUiInjectorProvider.java |  17 --
 .../check/TestLanguageInjectorProvider.java   |  48 +++++
 .../check/TestLanguageUiInjectorProvider.java |  18 ++
 .../CheckConfigurationIsAppliedTest.xtend     |  10 +-
 ...CheckExecutionEnvironmentProjectTest.xtend |   8 +-
 .../TestLanguageUiInjectorProvider.java       |  18 ++
 .../META-INF/MANIFEST.MF                      |   6 +-
 .../ui/AbstractTestLanguageUiModule.java      |   5 +
 .../internal/InternalTestLanguageLexer.java   | 123 ++++++-------
 .../internal/InternalTestLanguageParser.java  | 167 ++++++++---------
 .../GenerateTestLanguage.mwe2.launch          |  34 ++--
 .../META-INF/MANIFEST.MF                      |   3 +-
 .../tools/ddk/check/TestLanguage.genmodel     |   2 +-
 .../TestLanguageStandaloneSetupGenerated.java |   2 +-
 .../antlr/internal/InternalTestLanguage.g     |   4 +-
 .../internal/InternalTestLanguageLexer.java   | 123 ++++++-------
 .../internal/InternalTestLanguageParser.java  |  79 ++++----
 ...AbstractTestLanguageSemanticSequencer.java |  47 +++--
 .../services/TestLanguageGrammarAccess.java   |  27 ++-
 .../ddk/check/testLanguage/Greeting.java      |   2 +-
 .../tools/ddk/check/testLanguage/Model.java   |   2 +-
 .../check/testLanguage/impl/GreetingImpl.java |   2 +-
 .../check/testLanguage/impl/ModelImpl.java    |   2 +-
 .../testLanguage/util/TestLanguageSwitch.java |   2 +-
 .../tools/ddk/check/GenerateTestLanguage.mwe2 |   3 -
 .../ddk/check/CheckUiInjectorProvider.java    |  17 --
 .../ddk/check/CheckInjectorProvider.java      |   0
 .../ddk/check/CheckUiInjectorProvider.java    |  18 ++
 .../check/ui/test/CheckCatalogWizardTest.java |   2 +-
 .../check/ui/test/CheckProjectWizardTest.java |   2 +-
 .../builder/CheckContextsExtensionTest.java   |  19 +-
 .../builder/CheckMarkerHelpExtensionTest.java |   6 +-
 .../test/builder/CheckTocExtensionTest.java   |   6 +-
 .../AbstractCheckContentAssistBugTest.java    |   4 +-
 .../CheckWizardUiTestInjectorProvider.java    |   2 +-
 .../META-INF/MANIFEST.MF                      |   1 +
 .../checkcfg/CheckCfgInjectorProvider.java    |   8 +-
 .../checkcfg/CheckCfgUiInjectorProvider.java  |   2 +-
 .../checkcfg/syntax/CheckCfgSyntaxTest.xtend  |   2 +-
 .../checkcfg/validation/CheckCfgTest.xtend    |   8 +-
 .../validation/CheckCfgValidationTest.java    |   8 +-
 .../META-INF/MANIFEST.MF                      |   1 +
 .../test/core/junit/runners/ClassRunner.java  |   2 +-
 .../META-INF/MANIFEST.MF                      |   1 +
 .../FixedXbaseGeneratorFragmentTest.xtend     |   2 +-
 .../META-INF/MANIFEST.MF                      |   2 +
 .../ddk/xtext/test/AbstractXtextTestUtil.java |   2 +-
 .../AcfContentAssistProcessorTestBuilder.java |   6 +-
 .../xtext/test/PluginTestProjectManager.java  |   5 +-
 .../xtext/test/XtextTestProjectManager.java   |   6 +-
 .../test/generator/AbstractGeneratorTest.java |  20 +-
 .../test/validation/ValidationHelper.java     |   2 +-
 .../formatter/FormatterTestLanguage.ecore     |  42 ++---
 .../formatter/FormatterTestLanguage.genmodel  |   2 +-
 .../FormatterTestLanguagePackageImpl.java     |  49 +++--
 .../xtext/builder/XtextBuildTriggerTest.java  |   1 -
 .../META-INF/MANIFEST.MF                      |   1 +
 .../xtext/valid/generator/ValidatorTests.xpt  | 172 +++++++++---------
 .../test/EClassTypeContentProviderTest.java   |   1 -
 79 files changed, 714 insertions(+), 706 deletions(-)
 delete mode 100644 com.avaloq.tools.ddk.check.test.runtime.tests/src-gen/com/avaloq/tools/ddk/check/TestLanguageInjectorProvider.java
 delete mode 100644 com.avaloq.tools.ddk.check.test.runtime.tests/src-gen/com/avaloq/tools/ddk/check/TestLanguageUiInjectorProvider.java
 create mode 100644 com.avaloq.tools.ddk.check.test.runtime.tests/src/com/avaloq/tools/ddk/check/TestLanguageInjectorProvider.java
 create mode 100644 com.avaloq.tools.ddk.check.test.runtime.tests/src/com/avaloq/tools/ddk/check/TestLanguageUiInjectorProvider.java
 create mode 100644 com.avaloq.tools.ddk.check.test.runtime.tests/src/com/avaloq/tools/ddk/check/test/runtime/TestLanguageUiInjectorProvider.java
 delete mode 100644 com.avaloq.tools.ddk.check.ui.test/src-gen/com/avaloq/tools/ddk/check/CheckUiInjectorProvider.java
 rename com.avaloq.tools.ddk.check.ui.test/{src-gen => src}/com/avaloq/tools/ddk/check/CheckInjectorProvider.java (100%)
 create mode 100644 com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/CheckUiInjectorProvider.java

diff --git a/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF
index 0d76ff952..10fbdfc5c 100644
--- a/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF
@@ -19,6 +19,8 @@ Require-Bundle: com.avaloq.tools.ddk.check.core,
  org.eclipse.core.runtime,
  org.eclipse.xtend.lib,
  org.eclipse.xtext.junit4,
+ org.eclipse.xtext.ui.testing,
+ org.eclipse.xtext.testing,
  org.junit,
  org.mockito,
  com.avaloq.tools.ddk.check.runtime.core,
diff --git a/com.avaloq.tools.ddk.check.core.test/src-gen/com/avaloq/tools/ddk/check/CheckInjectorProvider.java b/com.avaloq.tools.ddk.check.core.test/src-gen/com/avaloq/tools/ddk/check/CheckInjectorProvider.java
index f7723ce5b..1f9711fbe 100644
--- a/com.avaloq.tools.ddk.check.core.test/src-gen/com/avaloq/tools/ddk/check/CheckInjectorProvider.java
+++ b/com.avaloq.tools.ddk.check.core.test/src-gen/com/avaloq/tools/ddk/check/CheckInjectorProvider.java
@@ -3,46 +3,46 @@
  */
 package com.avaloq.tools.ddk.check;
 
-import org.eclipse.xtext.junit4.GlobalRegistries;
-import org.eclipse.xtext.junit4.GlobalRegistries.GlobalStateMemento;
-import org.eclipse.xtext.junit4.IInjectorProvider;
-import org.eclipse.xtext.junit4.IRegistryConfigurator;
+import org.eclipse.xtext.testing.GlobalRegistries;
+import org.eclipse.xtext.testing.GlobalRegistries.GlobalStateMemento;
+import org.eclipse.xtext.testing.IInjectorProvider;
+import org.eclipse.xtext.testing.IRegistryConfigurator;
 
 import com.google.inject.Injector;
 
+
 public class CheckInjectorProvider implements IInjectorProvider, IRegistryConfigurator {
-	
-    protected GlobalStateMemento stateBeforeInjectorCreation;
-	protected GlobalStateMemento stateAfterInjectorCreation;
-	protected Injector injector;
-
-	static {
-		GlobalRegistries.initializeDefaults();
-	}
-
-	@Override
-	public Injector getInjector()
-	{
-		if (injector == null) {
-			stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
-			this.injector = internalCreateInjector();
-			stateAfterInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
-		}
-		return injector;
-	}
-	
-	protected Injector internalCreateInjector() {
-	    return new CheckStandaloneSetup().createInjectorAndDoEMFRegistration();
-	}
-
-	@Override
-	public void restoreRegistry() {
-		stateBeforeInjectorCreation.restoreGlobalState();
-	}
-
-	@Override
-	public void setupRegistry() {
-		getInjector();
-		stateAfterInjectorCreation.restoreGlobalState();
-	}
+
+  protected GlobalStateMemento stateBeforeInjectorCreation;
+  protected GlobalStateMemento stateAfterInjectorCreation;
+  protected Injector injector;
+
+  static {
+    GlobalRegistries.initializeDefaults();
+  }
+
+  @Override
+  public Injector getInjector() {
+    if (injector == null) {
+      stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
+      this.injector = internalCreateInjector();
+      stateAfterInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
+    }
+    return injector;
+  }
+
+  protected Injector internalCreateInjector() {
+    return new CheckStandaloneSetup().createInjectorAndDoEMFRegistration();
+  }
+
+  @Override
+  public void restoreRegistry() {
+    stateBeforeInjectorCreation.restoreGlobalState();
+  }
+
+  @Override
+  public void setupRegistry() {
+    getInjector();
+    stateAfterInjectorCreation.restoreGlobalState();
+  }
 }
diff --git a/com.avaloq.tools.ddk.check.core.test/src-gen/com/avaloq/tools/ddk/check/CheckUiInjectorProvider.java b/com.avaloq.tools.ddk.check.core.test/src-gen/com/avaloq/tools/ddk/check/CheckUiInjectorProvider.java
index 60398c2e1..5a339bd3a 100644
--- a/com.avaloq.tools.ddk.check.core.test/src-gen/com/avaloq/tools/ddk/check/CheckUiInjectorProvider.java
+++ b/com.avaloq.tools.ddk.check.core.test/src-gen/com/avaloq/tools/ddk/check/CheckUiInjectorProvider.java
@@ -3,15 +3,16 @@
  */
 package com.avaloq.tools.ddk.check;
 
-import org.eclipse.xtext.junit4.IInjectorProvider;
+import org.eclipse.xtext.testing.IInjectorProvider;
 
 import com.google.inject.Injector;
 
+
 public class CheckUiInjectorProvider implements IInjectorProvider {
-	
-	@Override
-	public Injector getInjector() {
-		return com.avaloq.tools.ddk.check.ui.internal.CheckActivator.getInstance().getInjector("com.avaloq.tools.ddk.check.Check");
-	}
-	
+
+  @Override
+  public Injector getInjector() {
+    return com.avaloq.tools.ddk.check.ui.internal.CheckActivator.getInstance().getInjector("com.avaloq.tools.ddk.check.Check");
+  }
+
 }
diff --git a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/AbstractCheckGenerationTestCase.java b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/AbstractCheckGenerationTestCase.java
index c73b22830..1ddf59cc2 100644
--- a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/AbstractCheckGenerationTestCase.java
+++ b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/AbstractCheckGenerationTestCase.java
@@ -29,8 +29,8 @@
 import org.eclipse.xtext.generator.IOutputConfigurationProvider;
 import org.eclipse.xtext.generator.InMemoryFileSystemAccess;
 import org.eclipse.xtext.generator.OutputConfiguration;
-import org.eclipse.xtext.junit4.ui.util.IResourcesSetupUtil;
 import org.eclipse.xtext.resource.XtextResourceSet;
+import org.eclipse.xtext.ui.testing.util.IResourcesSetupUtil;
 import org.eclipse.xtext.xbase.compiler.OnTheFlyJavaCompiler.EclipseRuntimeDependentJavaCompiler;
 
 import com.avaloq.tools.ddk.check.check.CheckCatalog;
diff --git a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/AbstractCheckTestCase.java b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/AbstractCheckTestCase.java
index b43189529..26474b32f 100644
--- a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/AbstractCheckTestCase.java
+++ b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/AbstractCheckTestCase.java
@@ -37,9 +37,9 @@
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.xtext.junit4.ui.util.IResourcesSetupUtil;
 import org.eclipse.xtext.resource.FileExtensionProvider;
 import org.eclipse.xtext.resource.XtextResourceSet;
+import org.eclipse.xtext.ui.testing.util.IResourcesSetupUtil;
 import org.eclipse.xtext.util.StringInputStream;
 import org.junit.AfterClass;
 import org.junit.Before;
diff --git a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/BasicModelTest.xtend b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/BasicModelTest.xtend
index 3353a52a4..39ca9e881 100644
--- a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/BasicModelTest.xtend
+++ b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/BasicModelTest.xtend
@@ -17,10 +17,10 @@ import com.avaloq.tools.ddk.check.check.XIssueExpression
 import com.avaloq.tools.ddk.check.core.test.util.CheckModelUtil
 import com.avaloq.tools.ddk.check.core.test.util.CheckTestUtil
 import com.google.inject.Inject
-import org.eclipse.xtext.junit4.InjectWith
-import org.eclipse.xtext.junit4.XtextRunner
-import org.eclipse.xtext.junit4.util.ParseHelper
 import org.eclipse.xtext.resource.XtextResource
+import org.eclipse.xtext.testing.InjectWith
+import org.eclipse.xtext.testing.XtextRunner
+import org.eclipse.xtext.testing.util.ParseHelper
 import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/BugAig1314.java b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/BugAig1314.java
index d5587bfed..cbc972551 100644
--- a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/BugAig1314.java
+++ b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/BugAig1314.java
@@ -21,11 +21,11 @@
 
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.xtext.junit4.InjectWith;
-import org.eclipse.xtext.junit4.XtextRunner;
 import org.eclipse.xtext.resource.IEObjectDescription;
 import org.eclipse.xtext.resource.XtextResourceSet;
 import org.eclipse.xtext.scoping.IScope;
+import org.eclipse.xtext.testing.InjectWith;
+import org.eclipse.xtext.testing.XtextRunner;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -163,4 +163,3 @@ public void testDifferentScopeUseTwice() {
     assertResourceSet(rs, nofResourcesInSet, nofResourcesInMap);
   }
 }
-
diff --git a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/BugAig830.xtend b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/BugAig830.xtend
index d09845f2a..d73b23d61 100644
--- a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/BugAig830.xtend
+++ b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/BugAig830.xtend
@@ -15,9 +15,9 @@ import com.avaloq.tools.ddk.check.check.CheckCatalog
 import com.avaloq.tools.ddk.check.check.XIssueExpression
 import com.google.inject.Inject
 import org.eclipse.xtext.EcoreUtil2
-import org.eclipse.xtext.junit4.InjectWith
-import org.eclipse.xtext.junit4.XtextRunner
-import org.eclipse.xtext.junit4.util.ParseHelper
+import org.eclipse.xtext.testing.InjectWith
+import org.eclipse.xtext.testing.XtextRunner
+import org.eclipse.xtext.testing.util.ParseHelper
 import org.eclipse.xtext.xbase.XbasePackage
 import org.junit.Assert
 import org.junit.Test
diff --git a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/BugDsl27.java b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/BugDsl27.java
index 9c9402959..9e5e9e432 100644
--- a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/BugDsl27.java
+++ b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/BugDsl27.java
@@ -13,8 +13,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.eclipse.xtext.junit4.InjectWith;
-import org.eclipse.xtext.junit4.XtextRunner;
+import org.eclipse.xtext.testing.InjectWith;
+import org.eclipse.xtext.testing.XtextRunner;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
diff --git a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/CheckScopingTest.xtend b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/CheckScopingTest.xtend
index 2f541901d..2814223da 100644
--- a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/CheckScopingTest.xtend
+++ b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/CheckScopingTest.xtend
@@ -19,9 +19,9 @@ import com.avaloq.tools.ddk.check.core.test.util.CheckTestUtil
 import com.google.common.collect.Lists
 import com.google.inject.Inject
 import java.util.List
-import org.eclipse.xtext.junit4.InjectWith
-import org.eclipse.xtext.junit4.XtextRunner
-import org.eclipse.xtext.junit4.ui.util.IResourcesSetupUtil
+import org.eclipse.xtext.testing.InjectWith
+import org.eclipse.xtext.testing.XtextRunner
+import org.eclipse.xtext.ui.testing.util.IResourcesSetupUtil
 import org.junit.Test
 import org.junit.runner.RunWith
 
diff --git a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/IssueCodeToLabelMapGenerationTest.xtend b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/IssueCodeToLabelMapGenerationTest.xtend
index 2ca52d035..454a95c04 100644
--- a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/IssueCodeToLabelMapGenerationTest.xtend
+++ b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/IssueCodeToLabelMapGenerationTest.xtend
@@ -17,8 +17,8 @@ import com.google.common.collect.ImmutableMap
 import java.io.ByteArrayInputStream
 import java.util.Collections
 import java.util.Map
-import org.eclipse.xtext.junit4.InjectWith
-import org.eclipse.xtext.junit4.XtextRunner
+import org.eclipse.xtext.testing.InjectWith
+import org.eclipse.xtext.testing.XtextRunner
 import org.junit.Test
 import org.junit.runner.RunWith
 
diff --git a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/ProjectBasedTests.xtend b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/ProjectBasedTests.xtend
index a046e6f58..bc87290fa 100644
--- a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/ProjectBasedTests.xtend
+++ b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/ProjectBasedTests.xtend
@@ -18,11 +18,11 @@ import org.eclipse.core.resources.IFile
 import org.eclipse.core.resources.IMarker
 import org.eclipse.core.resources.IProject
 import org.eclipse.core.resources.IResource
-import org.eclipse.xtext.junit4.InjectWith
-import org.eclipse.xtext.junit4.XtextRunner
+import org.eclipse.xtext.testing.InjectWith
+import org.eclipse.xtext.testing.XtextRunner
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.eclipse.xtext.junit4.ui.util.IResourcesSetupUtil
+import org.eclipse.xtext.ui.testing.util.IResourcesSetupUtil
 
 @InjectWith(typeof(CheckUiInjectorProvider))
 @RunWith(typeof(XtextRunner))
diff --git a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/imports/test/CheckRewritableImportSectionFactoryTest.xtend b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/imports/test/CheckRewritableImportSectionFactoryTest.xtend
index 987655aa7..b0de23e77 100644
--- a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/imports/test/CheckRewritableImportSectionFactoryTest.xtend
+++ b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/imports/test/CheckRewritableImportSectionFactoryTest.xtend
@@ -17,7 +17,7 @@ import com.google.inject.Inject
 import org.eclipse.emf.common.util.BasicEList
 import org.eclipse.emf.common.util.URI
 import org.eclipse.emf.ecore.EObject
-import org.eclipse.xtext.junit4.XtextRunner
+import org.eclipse.xtext.testing.XtextRunner
 import org.eclipse.xtext.resource.XtextResource
 import org.eclipse.xtext.xbase.imports.RewritableImportSection
 import org.junit.Test
diff --git a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/validation/CheckApiAccessValidationsTest.xtend b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/validation/CheckApiAccessValidationsTest.xtend
index 9f6963e21..093120f27 100644
--- a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/validation/CheckApiAccessValidationsTest.xtend
+++ b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/validation/CheckApiAccessValidationsTest.xtend
@@ -9,15 +9,15 @@
  */
 package com.avaloq.tools.ddk.check.validation
 
-import org.eclipse.xtext.junit4.InjectWith
+import org.eclipse.xtext.testing.InjectWith
 import org.junit.runner.RunWith
-import org.eclipse.xtext.junit4.XtextRunner
+import org.eclipse.xtext.testing.XtextRunner
 import com.avaloq.tools.ddk.check.CheckUiInjectorProvider
 import org.junit.Test
 import com.google.inject.Inject
-import org.eclipse.xtext.junit4.util.ParseHelper
+import org.eclipse.xtext.testing.util.ParseHelper
 import com.avaloq.tools.ddk.check.check.CheckCatalog
-import org.eclipse.xtext.junit4.validation.ValidationTestHelper
+import org.eclipse.xtext.testing.validation.ValidationTestHelper
 import org.eclipse.xtext.xtype.XtypePackage
 
 @InjectWith(typeof(CheckUiInjectorProvider))
diff --git a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/validation/CheckJavaValidatorUtilTest.java b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/validation/CheckJavaValidatorUtilTest.java
index 2662d8945..9e4e7bcc2 100644
--- a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/validation/CheckJavaValidatorUtilTest.java
+++ b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/validation/CheckJavaValidatorUtilTest.java
@@ -11,8 +11,8 @@
 package com.avaloq.tools.ddk.check.validation;
 
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.xtext.junit4.InjectWith;
-import org.eclipse.xtext.junit4.XtextRunner;
+import org.eclipse.xtext.testing.InjectWith;
+import org.eclipse.xtext.testing.XtextRunner;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
diff --git a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/validation/CheckValidationTest.xtend b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/validation/CheckValidationTest.xtend
index ed7718363..dd087cc3d 100644
--- a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/validation/CheckValidationTest.xtend
+++ b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/validation/CheckValidationTest.xtend
@@ -15,10 +15,10 @@ import com.avaloq.tools.ddk.check.check.CheckCatalog
 import com.avaloq.tools.ddk.check.core.test.util.CheckModelUtil
 import com.google.common.collect.Lists
 import com.google.inject.Inject
-import org.eclipse.xtext.junit4.InjectWith
-import org.eclipse.xtext.junit4.XtextRunner
-import org.eclipse.xtext.junit4.util.ParseHelper
-import org.eclipse.xtext.junit4.validation.ValidationTestHelper
+import org.eclipse.xtext.testing.InjectWith
+import org.eclipse.xtext.testing.XtextRunner
+import org.eclipse.xtext.testing.util.ParseHelper
+import org.eclipse.xtext.testing.validation.ValidationTestHelper
 import org.eclipse.xtext.xbase.XbasePackage$Literals
 import org.junit.Ignore
 import org.junit.Test
diff --git a/com.avaloq.tools.ddk.check.test.runtime.tests/.classpath b/com.avaloq.tools.ddk.check.test.runtime.tests/.classpath
index 5d8a3351d..ba9710ef4 100644
--- a/com.avaloq.tools.ddk.check.test.runtime.tests/.classpath
+++ b/com.avaloq.tools.ddk.check.test.runtime.tests/.classpath
@@ -1,22 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-  <classpathentry kind="src" path="src"/>
-  <classpathentry kind="src" path="src-gen">
-    <attributes>
-      <attribute name="ignore_optional_problems" value="true"/>
-    </attributes>
-  </classpathentry>
-  <classpathentry kind="src" path="xtend-gen">
-    <attributes>
-      <attribute name="ignore_optional_problems" value="true"/>
-    </attributes>
-  </classpathentry>
-  <classpathentry kind="src" path="resource"/>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-  <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-    <accessrules>
-      <accessrule kind="accessible" pattern="org/eclipse/xtext/junit4/ui/util/**"/>
-    </accessrules>
-  </classpathentry>
-  <classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="xtend-gen">
+		<attributes>
+			<attribute name="ignore_optional_problems" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="resource"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
+		<accessrules>
+			<accessrule kind="accessible" pattern="org/eclipse/xtext/junit4/ui/util/**"/>
+		</accessrules>
+	</classpathentry>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF
index 7c91992c7..9aafd1ee0 100644
--- a/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF
@@ -13,18 +13,20 @@ Require-Bundle: com.avaloq.tools.ddk.check.runtime.core,
  org.eclipse.core.resources,
  org.eclipse.xtext,
  org.eclipse.xtext.junit4,
+ org.eclipse.xtext.testing,
  org.eclipse.xtext.ui.testing,
  org.junit,
  org.eclipse.ui.workbench;resolution:=optional,
  org.eclipse.xtend.lib,
- org.eclipse.xtext.xbase.lib, 
+ org.eclipse.xtext.xbase.lib,
  org.apache.log4j,
  org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional
 Import-Package: org.junit.runner;version="4.5.0",
  org.junit.runner.manipulation;version="4.5.0",
  org.junit.runner.notification;version="4.5.0",
  org.junit.runners;version="4.5.0",
- org.junit.runners.model;version="4.5.0"
+ org.junit.runners.model;version="4.5.0",
+ org.hamcrest.core
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: com.avaloq.tools.ddk.check.test.runtime,
  com.avaloq.tools.ddk.check.test.runtime.tests,
diff --git a/com.avaloq.tools.ddk.check.test.runtime.tests/build.properties b/com.avaloq.tools.ddk.check.test.runtime.tests/build.properties
index bd05cedb2..57a52eb79 100644
--- a/com.avaloq.tools.ddk.check.test.runtime.tests/build.properties
+++ b/com.avaloq.tools.ddk.check.test.runtime.tests/build.properties
@@ -1,5 +1,4 @@
 source.. = src/,\
-           src-gen/,\
            xtend-gen/,\
            resource/
 output.. = bin/
diff --git a/com.avaloq.tools.ddk.check.test.runtime.tests/src-gen/com/avaloq/tools/ddk/check/TestLanguageInjectorProvider.java b/com.avaloq.tools.ddk.check.test.runtime.tests/src-gen/com/avaloq/tools/ddk/check/TestLanguageInjectorProvider.java
deleted file mode 100644
index 58ade0dff..000000000
--- a/com.avaloq.tools.ddk.check.test.runtime.tests/src-gen/com/avaloq/tools/ddk/check/TestLanguageInjectorProvider.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * generated by Xtext
- */
-package com.avaloq.tools.ddk.check;
-
-import org.eclipse.xtext.junit4.GlobalRegistries;
-import org.eclipse.xtext.junit4.GlobalRegistries.GlobalStateMemento;
-import org.eclipse.xtext.junit4.IInjectorProvider;
-import org.eclipse.xtext.junit4.IRegistryConfigurator;
-
-import com.google.inject.Injector;
-
-public class TestLanguageInjectorProvider implements IInjectorProvider, IRegistryConfigurator {
-	
-    protected GlobalStateMemento stateBeforeInjectorCreation;
-	protected GlobalStateMemento stateAfterInjectorCreation;
-	protected Injector injector;
-
-	static {
-		GlobalRegistries.initializeDefaults();
-	}
-
-	@Override
-	public Injector getInjector()
-	{
-		if (injector == null) {
-			stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
-			this.injector = internalCreateInjector();
-			stateAfterInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
-		}
-		return injector;
-	}
-	
-	protected Injector internalCreateInjector() {
-	    return new TestLanguageStandaloneSetup().createInjectorAndDoEMFRegistration();
-	}
-
-	@Override
-	public void restoreRegistry() {
-		stateBeforeInjectorCreation.restoreGlobalState();
-	}
-
-	@Override
-	public void setupRegistry() {
-		getInjector();
-		stateAfterInjectorCreation.restoreGlobalState();
-	}
-}
diff --git a/com.avaloq.tools.ddk.check.test.runtime.tests/src-gen/com/avaloq/tools/ddk/check/TestLanguageUiInjectorProvider.java b/com.avaloq.tools.ddk.check.test.runtime.tests/src-gen/com/avaloq/tools/ddk/check/TestLanguageUiInjectorProvider.java
deleted file mode 100644
index f5a240b17..000000000
--- a/com.avaloq.tools.ddk.check.test.runtime.tests/src-gen/com/avaloq/tools/ddk/check/TestLanguageUiInjectorProvider.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * generated by Xtext
- */
-package com.avaloq.tools.ddk.check;
-
-import org.eclipse.xtext.junit4.IInjectorProvider;
-
-import com.google.inject.Injector;
-
-public class TestLanguageUiInjectorProvider implements IInjectorProvider {
-	
-	@Override
-	public Injector getInjector() {
-		return com.avaloq.tools.ddk.check.ui.internal.TestLanguageActivator.getInstance().getInjector("com.avaloq.tools.ddk.check.TestLanguage");
-	}
-	
-}
diff --git a/com.avaloq.tools.ddk.check.test.runtime.tests/src/com/avaloq/tools/ddk/check/TestLanguageInjectorProvider.java b/com.avaloq.tools.ddk.check.test.runtime.tests/src/com/avaloq/tools/ddk/check/TestLanguageInjectorProvider.java
new file mode 100644
index 000000000..d1823781a
--- /dev/null
+++ b/com.avaloq.tools.ddk.check.test.runtime.tests/src/com/avaloq/tools/ddk/check/TestLanguageInjectorProvider.java
@@ -0,0 +1,48 @@
+/*
+ * generated by Xtext
+ */
+package com.avaloq.tools.ddk.check;
+
+import org.eclipse.xtext.testing.GlobalRegistries;
+import org.eclipse.xtext.testing.GlobalRegistries.GlobalStateMemento;
+import org.eclipse.xtext.testing.IInjectorProvider;
+import org.eclipse.xtext.testing.IRegistryConfigurator;
+
+import com.google.inject.Injector;
+
+
+public class TestLanguageInjectorProvider implements IInjectorProvider, IRegistryConfigurator {
+
+  protected GlobalStateMemento stateBeforeInjectorCreation;
+  protected GlobalStateMemento stateAfterInjectorCreation;
+  protected Injector injector;
+
+  static {
+    GlobalRegistries.initializeDefaults();
+  }
+
+  @Override
+  public Injector getInjector() {
+    if (injector == null) {
+      stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
+      this.injector = internalCreateInjector();
+      stateAfterInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
+    }
+    return injector;
+  }
+
+  protected Injector internalCreateInjector() {
+    return new TestLanguageStandaloneSetup().createInjectorAndDoEMFRegistration();
+  }
+
+  @Override
+  public void restoreRegistry() {
+    stateBeforeInjectorCreation.restoreGlobalState();
+  }
+
+  @Override
+  public void setupRegistry() {
+    getInjector();
+    stateAfterInjectorCreation.restoreGlobalState();
+  }
+}
diff --git a/com.avaloq.tools.ddk.check.test.runtime.tests/src/com/avaloq/tools/ddk/check/TestLanguageUiInjectorProvider.java b/com.avaloq.tools.ddk.check.test.runtime.tests/src/com/avaloq/tools/ddk/check/TestLanguageUiInjectorProvider.java
new file mode 100644
index 000000000..2db505266
--- /dev/null
+++ b/com.avaloq.tools.ddk.check.test.runtime.tests/src/com/avaloq/tools/ddk/check/TestLanguageUiInjectorProvider.java
@@ -0,0 +1,18 @@
+/*
+ * generated by Xtext
+ */
+package com.avaloq.tools.ddk.check;
+
+import org.eclipse.xtext.testing.IInjectorProvider;
+
+import com.google.inject.Injector;
+
+
+public class TestLanguageUiInjectorProvider implements IInjectorProvider {
+
+  @Override
+  public Injector getInjector() {
+    return com.avaloq.tools.ddk.check.ui.internal.TestLanguageActivator.getInstance().getInjector("com.avaloq.tools.ddk.check.TestLanguage");
+  }
+
+}
diff --git a/com.avaloq.tools.ddk.check.test.runtime.tests/src/com/avaloq/tools/ddk/check/test/runtime/CheckConfigurationIsAppliedTest.xtend b/com.avaloq.tools.ddk.check.test.runtime.tests/src/com/avaloq/tools/ddk/check/test/runtime/CheckConfigurationIsAppliedTest.xtend
index 9a0f8ab69..18985232a 100644
--- a/com.avaloq.tools.ddk.check.test.runtime.tests/src/com/avaloq/tools/ddk/check/test/runtime/CheckConfigurationIsAppliedTest.xtend
+++ b/com.avaloq.tools.ddk.check.test.runtime.tests/src/com/avaloq/tools/ddk/check/test/runtime/CheckConfigurationIsAppliedTest.xtend
@@ -19,10 +19,10 @@ import com.avaloq.tools.ddk.check.validation.ExecutionEnvironmentIssueCodes
 import com.google.common.collect.Lists
 import com.google.inject.Inject
 import java.util.List
-import org.eclipse.xtext.junit4.InjectWith
-import org.eclipse.xtext.junit4.XtextRunner
-import org.eclipse.xtext.junit4.validation.ValidationTestHelper
-import org.eclipse.xtext.junit4.ui.util.IResourcesSetupUtil
+import org.eclipse.xtext.testing.InjectWith
+import org.eclipse.xtext.testing.XtextRunner
+import org.eclipse.xtext.testing.validation.ValidationTestHelper
+import org.eclipse.xtext.ui.testing.util.IResourcesSetupUtil
 import org.junit.Test
 import org.junit.runner.RunWith
 
@@ -56,7 +56,7 @@ class CheckConfigurationIsAppliedTest extends AbstractCheckTestCase {
     // sources are copied into the project and then built by the Xtext builder
     addSourcesToWorkspace(typeof(CheckConfigurationIsAppliedTest), requiredSourceFileNames)
     // wait for build to finish, otherwise included catalog may not be resolvable
-    IResourcesSetupUtil::waitForAutoBuild
+    IResourcesSetupUtil::reallyWaitForAutoBuild
     val model = getModel("Greetings") as Model
     helper.assertWarning(model.greetings.get(0), TestLanguagePackage$Literals::GREETING, ExecutionEnvironmentIssueCodes::FRANZNAME)
   }
diff --git a/com.avaloq.tools.ddk.check.test.runtime.tests/src/com/avaloq/tools/ddk/check/test/runtime/CheckExecutionEnvironmentProjectTest.xtend b/com.avaloq.tools.ddk.check.test.runtime.tests/src/com/avaloq/tools/ddk/check/test/runtime/CheckExecutionEnvironmentProjectTest.xtend
index ddb102eca..f3407c9cb 100644
--- a/com.avaloq.tools.ddk.check.test.runtime.tests/src/com/avaloq/tools/ddk/check/test/runtime/CheckExecutionEnvironmentProjectTest.xtend
+++ b/com.avaloq.tools.ddk.check.test.runtime.tests/src/com/avaloq/tools/ddk/check/test/runtime/CheckExecutionEnvironmentProjectTest.xtend
@@ -18,10 +18,10 @@ import com.avaloq.tools.ddk.check.ui.internal.TestLanguageActivator
 import com.avaloq.tools.ddk.check.validation.ExecutionEnvironmentIssueCodes
 import com.avaloq.tools.ddk.check.validation.LibraryChecksIssueCodes
 import com.google.inject.Inject
-import org.eclipse.xtext.junit4.InjectWith
-import org.eclipse.xtext.junit4.XtextRunner
-import org.eclipse.xtext.junit4.util.ParseHelper
-import org.eclipse.xtext.junit4.validation.ValidationTestHelper
+import org.eclipse.xtext.testing.InjectWith
+import org.eclipse.xtext.testing.XtextRunner
+import org.eclipse.xtext.testing.util.ParseHelper
+import org.eclipse.xtext.testing.validation.ValidationTestHelper
 import org.junit.Test
 import org.junit.runner.RunWith
 
diff --git a/com.avaloq.tools.ddk.check.test.runtime.tests/src/com/avaloq/tools/ddk/check/test/runtime/TestLanguageUiInjectorProvider.java b/com.avaloq.tools.ddk.check.test.runtime.tests/src/com/avaloq/tools/ddk/check/test/runtime/TestLanguageUiInjectorProvider.java
new file mode 100644
index 000000000..1806da05f
--- /dev/null
+++ b/com.avaloq.tools.ddk.check.test.runtime.tests/src/com/avaloq/tools/ddk/check/test/runtime/TestLanguageUiInjectorProvider.java
@@ -0,0 +1,18 @@
+/*
+ * generated by Xtext
+ */
+package com.avaloq.tools.ddk.check.test.runtime;
+
+import org.eclipse.xtext.testing.IInjectorProvider;
+
+import com.google.inject.Injector;
+
+
+public class TestLanguageUiInjectorProvider implements IInjectorProvider {
+
+  @Override
+  public Injector getInjector() {
+    return com.avaloq.tools.ddk.check.ui.internal.TestLanguageActivator.getInstance().getInjector("com.avaloq.tools.ddk.check.TestLanguage");
+  }
+
+}
diff --git a/com.avaloq.tools.ddk.check.test.runtime.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.test.runtime.ui/META-INF/MANIFEST.MF
index 8cec610b9..2c9abf05d 100644
--- a/com.avaloq.tools.ddk.check.test.runtime.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.test.runtime.ui/META-INF/MANIFEST.MF
@@ -18,10 +18,12 @@ Require-Bundle: com.avaloq.tools.ddk.check.test.runtime;visibility:=reexport,
  org.eclipse.compare,
  com.avaloq.tools.ddk.check.runtime.core,
  org.apache.log4j
-Import-Package: org.apache.commons.logging
+Import-Package: org.apache.commons.logging,
+ org.apache.log4j
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: com.avaloq.tools.ddk.check.ui.contentassist.antlr,
  com.avaloq.tools.ddk.check.ui.internal,
  com.avaloq.tools.ddk.check.ui.contentassist,
- com.avaloq.tools.ddk.check.ui.quickfix
+ com.avaloq.tools.ddk.check.ui.quickfix,
+ com.avaloq.tools.ddk.check.ui.contentassist.antlr.internal
 Bundle-Activator: com.avaloq.tools.ddk.check.ui.internal.TestLanguageActivator
diff --git a/com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/AbstractTestLanguageUiModule.java b/com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/AbstractTestLanguageUiModule.java
index 4c00fb07e..6f8571a82 100644
--- a/com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/AbstractTestLanguageUiModule.java
+++ b/com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/AbstractTestLanguageUiModule.java
@@ -192,5 +192,10 @@ public Class<? extends org.eclipse.compare.IViewerCreator> bindIViewerCreator()
 		return org.eclipse.xtext.ui.compare.DefaultViewerCreator.class;
 	}
 
+	// contributed by org.eclipse.xtext.ui.generator.compare.CompareFragment
+	public void configureCompareViewerTitle(com.google.inject.Binder binder) {
+		binder.bind(String.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.UIBindings.COMPARE_VIEWER_TITLE)).toInstance("TestLanguage Compare");
+	}
+
 
 }
diff --git a/com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguageLexer.java b/com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguageLexer.java
index 5461ff675..a13457d27 100644
--- a/com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguageLexer.java
+++ b/com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguageLexer.java
@@ -34,15 +34,15 @@ public InternalTestLanguageLexer(CharStream input, RecognizerSharedState state)
         super(input,state);
 
     }
-    public String getGrammarFileName() { return "../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g"; }
+    public String getGrammarFileName() { return "InternalTestLanguage.g"; }
 
     // $ANTLR start "T__11"
     public final void mT__11() throws RecognitionException {
         try {
             int _type = T__11;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:11:7: ( 'Hello' )
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:11:9: 'Hello'
+            // InternalTestLanguage.g:11:7: ( 'Hello' )
+            // InternalTestLanguage.g:11:9: 'Hello'
             {
             match("Hello"); 
 
@@ -62,8 +62,8 @@ public final void mT__12() throws RecognitionException {
         try {
             int _type = T__12;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:12:7: ( '!' )
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:12:9: '!'
+            // InternalTestLanguage.g:12:7: ( '!' )
+            // InternalTestLanguage.g:12:9: '!'
             {
             match('!'); 
 
@@ -82,10 +82,10 @@ public final void mRULE_ID() throws RecognitionException {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:246:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:246:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalTestLanguage.g:246:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+            // InternalTestLanguage.g:246:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             {
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:246:11: ( '^' )?
+            // InternalTestLanguage.g:246:11: ( '^' )?
             int alt1=2;
             int LA1_0 = input.LA(1);
 
@@ -94,7 +94,7 @@ public final void mRULE_ID() throws RecognitionException {
             }
             switch (alt1) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:246:11: '^'
+                    // InternalTestLanguage.g:246:11: '^'
                     {
                     match('^'); 
 
@@ -112,7 +112,7 @@ public final void mRULE_ID() throws RecognitionException {
                 recover(mse);
                 throw mse;}
 
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:246:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalTestLanguage.g:246:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             loop2:
             do {
                 int alt2=2;
@@ -125,7 +125,7 @@ public final void mRULE_ID() throws RecognitionException {
 
                 switch (alt2) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:
+            	    // InternalTestLanguage.g:
             	    {
             	    if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
             	        input.consume();
@@ -161,10 +161,10 @@ public final void mRULE_INT() throws RecognitionException {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:248:10: ( ( '0' .. '9' )+ )
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:248:12: ( '0' .. '9' )+
+            // InternalTestLanguage.g:248:10: ( ( '0' .. '9' )+ )
+            // InternalTestLanguage.g:248:12: ( '0' .. '9' )+
             {
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:248:12: ( '0' .. '9' )+
+            // InternalTestLanguage.g:248:12: ( '0' .. '9' )+
             int cnt3=0;
             loop3:
             do {
@@ -178,7 +178,7 @@ public final void mRULE_INT() throws RecognitionException {
 
                 switch (alt3) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:248:13: '0' .. '9'
+            	    // InternalTestLanguage.g:248:13: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -210,10 +210,10 @@ public final void mRULE_STRING() throws RecognitionException {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:250:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:250:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalTestLanguage.g:250:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+            // InternalTestLanguage.g:250:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             {
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:250:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalTestLanguage.g:250:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             int alt6=2;
             int LA6_0 = input.LA(1);
 
@@ -231,10 +231,10 @@ else if ( (LA6_0=='\'') ) {
             }
             switch (alt6) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:250:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+                    // InternalTestLanguage.g:250:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
                     {
                     match('\"'); 
-                    // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:250:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // InternalTestLanguage.g:250:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop4:
                     do {
                         int alt4=3;
@@ -250,7 +250,7 @@ else if ( ((LA4_0>='\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=
 
                         switch (alt4) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:250:21: '\\\\' .
+                    	    // InternalTestLanguage.g:250:21: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -258,7 +258,7 @@ else if ( ((LA4_0>='\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:250:28: ~ ( ( '\\\\' | '\"' ) )
+                    	    // InternalTestLanguage.g:250:28: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -283,10 +283,10 @@ else if ( ((LA4_0>='\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:250:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+                    // InternalTestLanguage.g:250:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
                     {
                     match('\''); 
-                    // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:250:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // InternalTestLanguage.g:250:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop5:
                     do {
                         int alt5=3;
@@ -302,7 +302,7 @@ else if ( ((LA5_0>='\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=
 
                         switch (alt5) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:250:54: '\\\\' .
+                    	    // InternalTestLanguage.g:250:54: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -310,7 +310,7 @@ else if ( ((LA5_0>='\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:250:61: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // InternalTestLanguage.g:250:61: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -353,12 +353,12 @@ public final void mRULE_ML_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:252:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:252:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalTestLanguage.g:252:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalTestLanguage.g:252:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:252:24: ( options {greedy=false; } : . )*
+            // InternalTestLanguage.g:252:24: ( options {greedy=false; } : . )*
             loop7:
             do {
                 int alt7=2;
@@ -383,7 +383,7 @@ else if ( ((LA7_0>='\u0000' && LA7_0<=')')||(LA7_0>='+' && LA7_0<='\uFFFF')) ) {
 
                 switch (alt7) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:252:52: .
+            	    // InternalTestLanguage.g:252:52: .
             	    {
             	    matchAny(); 
 
@@ -413,12 +413,12 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:254:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:254:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalTestLanguage.g:254:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalTestLanguage.g:254:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:254:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // InternalTestLanguage.g:254:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop8:
             do {
                 int alt8=2;
@@ -431,7 +431,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
 
                 switch (alt8) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:254:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // InternalTestLanguage.g:254:24: ~ ( ( '\\n' | '\\r' ) )
             	    {
             	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
             	        input.consume();
@@ -451,7 +451,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
                 }
             } while (true);
 
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:254:40: ( ( '\\r' )? '\\n' )?
+            // InternalTestLanguage.g:254:40: ( ( '\\r' )? '\\n' )?
             int alt10=2;
             int LA10_0 = input.LA(1);
 
@@ -460,9 +460,9 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
             }
             switch (alt10) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:254:41: ( '\\r' )? '\\n'
+                    // InternalTestLanguage.g:254:41: ( '\\r' )? '\\n'
                     {
-                    // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:254:41: ( '\\r' )?
+                    // InternalTestLanguage.g:254:41: ( '\\r' )?
                     int alt9=2;
                     int LA9_0 = input.LA(1);
 
@@ -471,7 +471,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
                     }
                     switch (alt9) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:254:41: '\\r'
+                            // InternalTestLanguage.g:254:41: '\\r'
                             {
                             match('\r'); 
 
@@ -503,10 +503,10 @@ public final void mRULE_WS() throws RecognitionException {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:256:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:256:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalTestLanguage.g:256:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalTestLanguage.g:256:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:256:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalTestLanguage.g:256:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt11=0;
             loop11:
             do {
@@ -520,7 +520,7 @@ public final void mRULE_WS() throws RecognitionException {
 
                 switch (alt11) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:
+            	    // InternalTestLanguage.g:
             	    {
             	    if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
             	        input.consume();
@@ -560,8 +560,8 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:258:16: ( . )
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:258:18: .
+            // InternalTestLanguage.g:258:16: ( . )
+            // InternalTestLanguage.g:258:18: .
             {
             matchAny(); 
 
@@ -576,68 +576,68 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:1:8: ( T__11 | T__12 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        // InternalTestLanguage.g:1:8: ( T__11 | T__12 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
         int alt12=9;
         alt12 = dfa12.predict(input);
         switch (alt12) {
             case 1 :
-                // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:1:10: T__11
+                // InternalTestLanguage.g:1:10: T__11
                 {
                 mT__11(); 
 
                 }
                 break;
             case 2 :
-                // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:1:16: T__12
+                // InternalTestLanguage.g:1:16: T__12
                 {
                 mT__12(); 
 
                 }
                 break;
             case 3 :
-                // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:1:22: RULE_ID
+                // InternalTestLanguage.g:1:22: RULE_ID
                 {
                 mRULE_ID(); 
 
                 }
                 break;
             case 4 :
-                // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:1:30: RULE_INT
+                // InternalTestLanguage.g:1:30: RULE_INT
                 {
                 mRULE_INT(); 
 
                 }
                 break;
             case 5 :
-                // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:1:39: RULE_STRING
+                // InternalTestLanguage.g:1:39: RULE_STRING
                 {
                 mRULE_STRING(); 
 
                 }
                 break;
             case 6 :
-                // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:1:51: RULE_ML_COMMENT
+                // InternalTestLanguage.g:1:51: RULE_ML_COMMENT
                 {
                 mRULE_ML_COMMENT(); 
 
                 }
                 break;
             case 7 :
-                // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:1:67: RULE_SL_COMMENT
+                // InternalTestLanguage.g:1:67: RULE_SL_COMMENT
                 {
                 mRULE_SL_COMMENT(); 
 
                 }
                 break;
             case 8 :
-                // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:1:83: RULE_WS
+                // InternalTestLanguage.g:1:83: RULE_WS
                 {
                 mRULE_WS(); 
 
                 }
                 break;
             case 9 :
-                // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:1:91: RULE_ANY_OTHER
+                // InternalTestLanguage.g:1:91: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -651,24 +651,19 @@ public void mTokens() throws RecognitionException {
 
     protected DFA12 dfa12 = new DFA12(this);
     static final String DFA12_eotS =
-        "\1\uffff\1\14\1\uffff\1\12\2\uffff\3\12\2\uffff\1\14\7\uffff\2"+
-        "\14\1\26\1\uffff";
+        "\1\uffff\1\14\1\uffff\1\12\2\uffff\3\12\2\uffff\1\14\7\uffff\2\14\1\26\1\uffff";
     static final String DFA12_eofS =
         "\27\uffff";
     static final String DFA12_minS =
-        "\1\0\1\145\1\uffff\1\101\2\uffff\2\0\1\52\2\uffff\1\154\7\uffff"+
-        "\1\154\1\157\1\60\1\uffff";
+        "\1\0\1\145\1\uffff\1\101\2\uffff\2\0\1\52\2\uffff\1\154\7\uffff\1\154\1\157\1\60\1\uffff";
     static final String DFA12_maxS =
-        "\1\uffff\1\145\1\uffff\1\172\2\uffff\2\uffff\1\57\2\uffff\1\154"+
-        "\7\uffff\1\154\1\157\1\172\1\uffff";
+        "\1\uffff\1\145\1\uffff\1\172\2\uffff\2\uffff\1\57\2\uffff\1\154\7\uffff\1\154\1\157\1\172\1\uffff";
     static final String DFA12_acceptS =
-        "\2\uffff\1\2\1\uffff\1\3\1\4\3\uffff\1\10\1\11\1\uffff\1\3\1\2"+
-        "\1\4\1\5\1\6\1\7\1\10\3\uffff\1\1";
+        "\2\uffff\1\2\1\uffff\1\3\1\4\3\uffff\1\10\1\11\1\uffff\1\3\1\2\1\4\1\5\1\6\1\7\1\10\3\uffff\1\1";
     static final String DFA12_specialS =
         "\1\2\5\uffff\1\0\1\1\17\uffff}>";
     static final String[] DFA12_transitionS = {
-            "\11\12\2\11\2\12\1\11\22\12\1\11\1\2\1\6\4\12\1\7\7\12\1\10"+
-            "\12\5\7\12\7\4\1\1\22\4\3\12\1\3\1\4\1\12\32\4\uff85\12",
+            "\11\12\2\11\2\12\1\11\22\12\1\11\1\2\1\6\4\12\1\7\7\12\1\10\12\5\7\12\7\4\1\1\22\4\3\12\1\3\1\4\1\12\32\4\uff85\12",
             "\1\13",
             "",
             "\32\14\4\uffff\1\14\1\uffff\32\14",
diff --git a/com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguageParser.java b/com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguageParser.java
index 728467355..49363096c 100644
--- a/com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguageParser.java
+++ b/com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguageParser.java
@@ -49,7 +49,7 @@ public InternalTestLanguageParser(TokenStream input, RecognizerSharedState state
         
 
     public String[] getTokenNames() { return InternalTestLanguageParser.tokenNames; }
-    public String getGrammarFileName() { return "../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g"; }
+    public String getGrammarFileName() { return "InternalTestLanguage.g"; }
 
 
      
@@ -73,20 +73,20 @@ protected String getValueForTokenName(String tokenName) {
 
 
     // $ANTLR start "entryRuleModel"
-    // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:60:1: entryRuleModel : ruleModel EOF ;
+    // InternalTestLanguage.g:60:1: entryRuleModel : ruleModel EOF ;
     public final void entryRuleModel() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:61:1: ( ruleModel EOF )
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:62:1: ruleModel EOF
+            // InternalTestLanguage.g:61:1: ( ruleModel EOF )
+            // InternalTestLanguage.g:62:1: ruleModel EOF
             {
              before(grammarAccess.getModelRule()); 
-            pushFollow(FOLLOW_ruleModel_in_entryRuleModel61);
+            pushFollow(FOLLOW_1);
             ruleModel();
 
             state._fsp--;
 
              after(grammarAccess.getModelRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleModel68); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -103,20 +103,20 @@ public final void entryRuleModel() throws RecognitionException {
 
 
     // $ANTLR start "ruleModel"
-    // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:69:1: ruleModel : ( ( rule__Model__GreetingsAssignment )* ) ;
+    // InternalTestLanguage.g:69:1: ruleModel : ( ( rule__Model__GreetingsAssignment )* ) ;
     public final void ruleModel() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:73:2: ( ( ( rule__Model__GreetingsAssignment )* ) )
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:74:1: ( ( rule__Model__GreetingsAssignment )* )
+            // InternalTestLanguage.g:73:2: ( ( ( rule__Model__GreetingsAssignment )* ) )
+            // InternalTestLanguage.g:74:1: ( ( rule__Model__GreetingsAssignment )* )
             {
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:74:1: ( ( rule__Model__GreetingsAssignment )* )
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:75:1: ( rule__Model__GreetingsAssignment )*
+            // InternalTestLanguage.g:74:1: ( ( rule__Model__GreetingsAssignment )* )
+            // InternalTestLanguage.g:75:1: ( rule__Model__GreetingsAssignment )*
             {
              before(grammarAccess.getModelAccess().getGreetingsAssignment()); 
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:76:1: ( rule__Model__GreetingsAssignment )*
+            // InternalTestLanguage.g:76:1: ( rule__Model__GreetingsAssignment )*
             loop1:
             do {
                 int alt1=2;
@@ -129,9 +129,9 @@ public final void ruleModel() throws RecognitionException {
 
                 switch (alt1) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:76:2: rule__Model__GreetingsAssignment
+            	    // InternalTestLanguage.g:76:2: rule__Model__GreetingsAssignment
             	    {
-            	    pushFollow(FOLLOW_rule__Model__GreetingsAssignment_in_ruleModel94);
+            	    pushFollow(FOLLOW_3);
             	    rule__Model__GreetingsAssignment();
 
             	    state._fsp--;
@@ -168,20 +168,20 @@ public final void ruleModel() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleGreeting"
-    // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:88:1: entryRuleGreeting : ruleGreeting EOF ;
+    // InternalTestLanguage.g:88:1: entryRuleGreeting : ruleGreeting EOF ;
     public final void entryRuleGreeting() throws RecognitionException {
         try {
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:89:1: ( ruleGreeting EOF )
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:90:1: ruleGreeting EOF
+            // InternalTestLanguage.g:89:1: ( ruleGreeting EOF )
+            // InternalTestLanguage.g:90:1: ruleGreeting EOF
             {
              before(grammarAccess.getGreetingRule()); 
-            pushFollow(FOLLOW_ruleGreeting_in_entryRuleGreeting122);
+            pushFollow(FOLLOW_1);
             ruleGreeting();
 
             state._fsp--;
 
              after(grammarAccess.getGreetingRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleGreeting129); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -198,23 +198,23 @@ public final void entryRuleGreeting() throws RecognitionException {
 
 
     // $ANTLR start "ruleGreeting"
-    // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:97:1: ruleGreeting : ( ( rule__Greeting__Group__0 ) ) ;
+    // InternalTestLanguage.g:97:1: ruleGreeting : ( ( rule__Greeting__Group__0 ) ) ;
     public final void ruleGreeting() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:101:2: ( ( ( rule__Greeting__Group__0 ) ) )
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:102:1: ( ( rule__Greeting__Group__0 ) )
+            // InternalTestLanguage.g:101:2: ( ( ( rule__Greeting__Group__0 ) ) )
+            // InternalTestLanguage.g:102:1: ( ( rule__Greeting__Group__0 ) )
             {
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:102:1: ( ( rule__Greeting__Group__0 ) )
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:103:1: ( rule__Greeting__Group__0 )
+            // InternalTestLanguage.g:102:1: ( ( rule__Greeting__Group__0 ) )
+            // InternalTestLanguage.g:103:1: ( rule__Greeting__Group__0 )
             {
              before(grammarAccess.getGreetingAccess().getGroup()); 
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:104:1: ( rule__Greeting__Group__0 )
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:104:2: rule__Greeting__Group__0
+            // InternalTestLanguage.g:104:1: ( rule__Greeting__Group__0 )
+            // InternalTestLanguage.g:104:2: rule__Greeting__Group__0
             {
-            pushFollow(FOLLOW_rule__Greeting__Group__0_in_ruleGreeting155);
+            pushFollow(FOLLOW_2);
             rule__Greeting__Group__0();
 
             state._fsp--;
@@ -245,21 +245,21 @@ public final void ruleGreeting() throws RecognitionException {
 
 
     // $ANTLR start "rule__Greeting__Group__0"
-    // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:118:1: rule__Greeting__Group__0 : rule__Greeting__Group__0__Impl rule__Greeting__Group__1 ;
+    // InternalTestLanguage.g:118:1: rule__Greeting__Group__0 : rule__Greeting__Group__0__Impl rule__Greeting__Group__1 ;
     public final void rule__Greeting__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:122:1: ( rule__Greeting__Group__0__Impl rule__Greeting__Group__1 )
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:123:2: rule__Greeting__Group__0__Impl rule__Greeting__Group__1
+            // InternalTestLanguage.g:122:1: ( rule__Greeting__Group__0__Impl rule__Greeting__Group__1 )
+            // InternalTestLanguage.g:123:2: rule__Greeting__Group__0__Impl rule__Greeting__Group__1
             {
-            pushFollow(FOLLOW_rule__Greeting__Group__0__Impl_in_rule__Greeting__Group__0189);
+            pushFollow(FOLLOW_4);
             rule__Greeting__Group__0__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Greeting__Group__1_in_rule__Greeting__Group__0192);
+            pushFollow(FOLLOW_2);
             rule__Greeting__Group__1();
 
             state._fsp--;
@@ -283,20 +283,20 @@ public final void rule__Greeting__Group__0() throws RecognitionException {
 
 
     // $ANTLR start "rule__Greeting__Group__0__Impl"
-    // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:130:1: rule__Greeting__Group__0__Impl : ( 'Hello' ) ;
+    // InternalTestLanguage.g:130:1: rule__Greeting__Group__0__Impl : ( 'Hello' ) ;
     public final void rule__Greeting__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:134:1: ( ( 'Hello' ) )
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:135:1: ( 'Hello' )
+            // InternalTestLanguage.g:134:1: ( ( 'Hello' ) )
+            // InternalTestLanguage.g:135:1: ( 'Hello' )
             {
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:135:1: ( 'Hello' )
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:136:1: 'Hello'
+            // InternalTestLanguage.g:135:1: ( 'Hello' )
+            // InternalTestLanguage.g:136:1: 'Hello'
             {
              before(grammarAccess.getGreetingAccess().getHelloKeyword_0()); 
-            match(input,11,FOLLOW_11_in_rule__Greeting__Group__0__Impl220); 
+            match(input,11,FOLLOW_2); 
              after(grammarAccess.getGreetingAccess().getHelloKeyword_0()); 
 
             }
@@ -320,21 +320,21 @@ public final void rule__Greeting__Group__0__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Greeting__Group__1"
-    // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:149:1: rule__Greeting__Group__1 : rule__Greeting__Group__1__Impl rule__Greeting__Group__2 ;
+    // InternalTestLanguage.g:149:1: rule__Greeting__Group__1 : rule__Greeting__Group__1__Impl rule__Greeting__Group__2 ;
     public final void rule__Greeting__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:153:1: ( rule__Greeting__Group__1__Impl rule__Greeting__Group__2 )
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:154:2: rule__Greeting__Group__1__Impl rule__Greeting__Group__2
+            // InternalTestLanguage.g:153:1: ( rule__Greeting__Group__1__Impl rule__Greeting__Group__2 )
+            // InternalTestLanguage.g:154:2: rule__Greeting__Group__1__Impl rule__Greeting__Group__2
             {
-            pushFollow(FOLLOW_rule__Greeting__Group__1__Impl_in_rule__Greeting__Group__1251);
+            pushFollow(FOLLOW_5);
             rule__Greeting__Group__1__Impl();
 
             state._fsp--;
 
-            pushFollow(FOLLOW_rule__Greeting__Group__2_in_rule__Greeting__Group__1254);
+            pushFollow(FOLLOW_2);
             rule__Greeting__Group__2();
 
             state._fsp--;
@@ -358,23 +358,23 @@ public final void rule__Greeting__Group__1() throws RecognitionException {
 
 
     // $ANTLR start "rule__Greeting__Group__1__Impl"
-    // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:161:1: rule__Greeting__Group__1__Impl : ( ( rule__Greeting__NameAssignment_1 ) ) ;
+    // InternalTestLanguage.g:161:1: rule__Greeting__Group__1__Impl : ( ( rule__Greeting__NameAssignment_1 ) ) ;
     public final void rule__Greeting__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:165:1: ( ( ( rule__Greeting__NameAssignment_1 ) ) )
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:166:1: ( ( rule__Greeting__NameAssignment_1 ) )
+            // InternalTestLanguage.g:165:1: ( ( ( rule__Greeting__NameAssignment_1 ) ) )
+            // InternalTestLanguage.g:166:1: ( ( rule__Greeting__NameAssignment_1 ) )
             {
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:166:1: ( ( rule__Greeting__NameAssignment_1 ) )
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:167:1: ( rule__Greeting__NameAssignment_1 )
+            // InternalTestLanguage.g:166:1: ( ( rule__Greeting__NameAssignment_1 ) )
+            // InternalTestLanguage.g:167:1: ( rule__Greeting__NameAssignment_1 )
             {
              before(grammarAccess.getGreetingAccess().getNameAssignment_1()); 
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:168:1: ( rule__Greeting__NameAssignment_1 )
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:168:2: rule__Greeting__NameAssignment_1
+            // InternalTestLanguage.g:168:1: ( rule__Greeting__NameAssignment_1 )
+            // InternalTestLanguage.g:168:2: rule__Greeting__NameAssignment_1
             {
-            pushFollow(FOLLOW_rule__Greeting__NameAssignment_1_in_rule__Greeting__Group__1__Impl281);
+            pushFollow(FOLLOW_2);
             rule__Greeting__NameAssignment_1();
 
             state._fsp--;
@@ -405,16 +405,16 @@ public final void rule__Greeting__Group__1__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Greeting__Group__2"
-    // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:178:1: rule__Greeting__Group__2 : rule__Greeting__Group__2__Impl ;
+    // InternalTestLanguage.g:178:1: rule__Greeting__Group__2 : rule__Greeting__Group__2__Impl ;
     public final void rule__Greeting__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:182:1: ( rule__Greeting__Group__2__Impl )
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:183:2: rule__Greeting__Group__2__Impl
+            // InternalTestLanguage.g:182:1: ( rule__Greeting__Group__2__Impl )
+            // InternalTestLanguage.g:183:2: rule__Greeting__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__Greeting__Group__2__Impl_in_rule__Greeting__Group__2311);
+            pushFollow(FOLLOW_2);
             rule__Greeting__Group__2__Impl();
 
             state._fsp--;
@@ -438,20 +438,20 @@ public final void rule__Greeting__Group__2() throws RecognitionException {
 
 
     // $ANTLR start "rule__Greeting__Group__2__Impl"
-    // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:189:1: rule__Greeting__Group__2__Impl : ( '!' ) ;
+    // InternalTestLanguage.g:189:1: rule__Greeting__Group__2__Impl : ( '!' ) ;
     public final void rule__Greeting__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:193:1: ( ( '!' ) )
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:194:1: ( '!' )
+            // InternalTestLanguage.g:193:1: ( ( '!' ) )
+            // InternalTestLanguage.g:194:1: ( '!' )
             {
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:194:1: ( '!' )
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:195:1: '!'
+            // InternalTestLanguage.g:194:1: ( '!' )
+            // InternalTestLanguage.g:195:1: '!'
             {
              before(grammarAccess.getGreetingAccess().getExclamationMarkKeyword_2()); 
-            match(input,12,FOLLOW_12_in_rule__Greeting__Group__2__Impl339); 
+            match(input,12,FOLLOW_2); 
              after(grammarAccess.getGreetingAccess().getExclamationMarkKeyword_2()); 
 
             }
@@ -475,20 +475,20 @@ public final void rule__Greeting__Group__2__Impl() throws RecognitionException {
 
 
     // $ANTLR start "rule__Model__GreetingsAssignment"
-    // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:215:1: rule__Model__GreetingsAssignment : ( ruleGreeting ) ;
+    // InternalTestLanguage.g:215:1: rule__Model__GreetingsAssignment : ( ruleGreeting ) ;
     public final void rule__Model__GreetingsAssignment() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:219:1: ( ( ruleGreeting ) )
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:220:1: ( ruleGreeting )
+            // InternalTestLanguage.g:219:1: ( ( ruleGreeting ) )
+            // InternalTestLanguage.g:220:1: ( ruleGreeting )
             {
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:220:1: ( ruleGreeting )
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:221:1: ruleGreeting
+            // InternalTestLanguage.g:220:1: ( ruleGreeting )
+            // InternalTestLanguage.g:221:1: ruleGreeting
             {
              before(grammarAccess.getModelAccess().getGreetingsGreetingParserRuleCall_0()); 
-            pushFollow(FOLLOW_ruleGreeting_in_rule__Model__GreetingsAssignment381);
+            pushFollow(FOLLOW_2);
             ruleGreeting();
 
             state._fsp--;
@@ -516,20 +516,20 @@ public final void rule__Model__GreetingsAssignment() throws RecognitionException
 
 
     // $ANTLR start "rule__Greeting__NameAssignment_1"
-    // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:230:1: rule__Greeting__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalTestLanguage.g:230:1: rule__Greeting__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__Greeting__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:234:1: ( ( RULE_ID ) )
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:235:1: ( RULE_ID )
+            // InternalTestLanguage.g:234:1: ( ( RULE_ID ) )
+            // InternalTestLanguage.g:235:1: ( RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:235:1: ( RULE_ID )
-            // ../com.avaloq.tools.ddk.check.test.runtime.ui/src-gen/com/avaloq/tools/ddk/check/ui/contentassist/antlr/internal/InternalTestLanguage.g:236:1: RULE_ID
+            // InternalTestLanguage.g:235:1: ( RULE_ID )
+            // InternalTestLanguage.g:236:1: RULE_ID
             {
              before(grammarAccess.getGreetingAccess().getNameIDTerminalRuleCall_1_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__Greeting__NameAssignment_1412); 
+            match(input,RULE_ID,FOLLOW_2); 
              after(grammarAccess.getGreetingAccess().getNameIDTerminalRuleCall_1_0()); 
 
             }
@@ -556,21 +556,10 @@ public final void rule__Greeting__NameAssignment_1() throws RecognitionException
 
  
 
-    public static final BitSet FOLLOW_ruleModel_in_entryRuleModel61 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleModel68 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Model__GreetingsAssignment_in_ruleModel94 = new BitSet(new long[]{0x0000000000000802L});
-    public static final BitSet FOLLOW_ruleGreeting_in_entryRuleGreeting122 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleGreeting129 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Greeting__Group__0_in_ruleGreeting155 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Greeting__Group__0__Impl_in_rule__Greeting__Group__0189 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__Greeting__Group__1_in_rule__Greeting__Group__0192 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_11_in_rule__Greeting__Group__0__Impl220 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Greeting__Group__1__Impl_in_rule__Greeting__Group__1251 = new BitSet(new long[]{0x0000000000001000L});
-    public static final BitSet FOLLOW_rule__Greeting__Group__2_in_rule__Greeting__Group__1254 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Greeting__NameAssignment_1_in_rule__Greeting__Group__1__Impl281 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Greeting__Group__2__Impl_in_rule__Greeting__Group__2311 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_12_in_rule__Greeting__Group__2__Impl339 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGreeting_in_rule__Model__GreetingsAssignment381 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__Greeting__NameAssignment_1412 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_1 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_2 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x0000000000000802L});
+    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0000000000001000L});
 
 }
\ No newline at end of file
diff --git a/com.avaloq.tools.ddk.check.test.runtime/GenerateTestLanguage.mwe2.launch b/com.avaloq.tools.ddk.check.test.runtime/GenerateTestLanguage.mwe2.launch
index 98af6dfe3..b7bb32bb4 100644
--- a/com.avaloq.tools.ddk.check.test.runtime/GenerateTestLanguage.mwe2.launch
+++ b/com.avaloq.tools.ddk.check.test.runtime/GenerateTestLanguage.mwe2.launch
@@ -1,14 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.emf.mwe2.launch.Mwe2LaunchConfigurationType">
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;launchConfigurationWorkingSet factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; id=&quot;1299248699643_13&quot; label=&quot;working set&quot; name=&quot;working set&quot;&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/com.avaloq.tools.ddk.check.test.runtime&quot; type=&quot;4&quot;/&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/com.avaloq.tools.ddk.check.test.runtime.generator&quot; type=&quot;4&quot;/&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/com.avaloq.tools.ddk.check.test.runtime.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/com.avaloq.tools.ddk.check.test.runtime.ui&quot; type=&quot;4&quot;/&gt;&#10;&lt;/launchConfigurationWorkingSet&gt;}"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/com.avaloq.tools.ddk.check.test.runtime"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="src/com/avaloq/tools/ddk/check/GenerateTestLanguage.mwe2"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.avaloq.tools.ddk.check.test.runtime"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.emf.mwe2.launch.Mwe2LaunchConfigurationType">
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;resources&gt;&#13;&#10;&lt;item path=&quot;/com.avaloq.tools.ddk.check.test.runtime&quot; type=&quot;4&quot;/&gt;&#13;&#10;&lt;item path=&quot;/com.avaloq.tools.ddk.check.test.runtime.generator&quot; type=&quot;4&quot;/&gt;&#13;&#10;&lt;item path=&quot;/com.avaloq.tools.ddk.check.test.runtime.tests&quot; type=&quot;4&quot;/&gt;&#13;&#10;&lt;item path=&quot;/com.avaloq.tools.ddk.check.test.runtime.ui&quot; type=&quot;4&quot;/&gt;&#13;&#10;&lt;/resources&gt;}"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/com.avaloq.tools.ddk.check.test.runtime"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8&quot; javaProject=&quot;com.avaloq.tools.ddk.check.test.runtime&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#13;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;com.avaloq.tools.ddk.check.test.runtime&quot;/&gt;&#13;&#10;&lt;/runtimeClasspathEntry&gt;&#13;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/com.avaloq.tools.ddk.workflow/antlr-generator-3.2.0-patch.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="src/com/avaloq/tools/ddk/check/GenerateTestLanguage.mwe2"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.avaloq.tools.ddk.check.test.runtime"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m"/>
+</launchConfiguration>
diff --git a/com.avaloq.tools.ddk.check.test.runtime/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.test.runtime/META-INF/MANIFEST.MF
index 8f07327f8..b28d42650 100644
--- a/com.avaloq.tools.ddk.check.test.runtime/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.test.runtime/META-INF/MANIFEST.MF
@@ -25,7 +25,8 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport,
  com.avaloq.tools.ddk.check.core,
  org.eclipse.xtext.xbase.lib,
  org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional
-Import-Package: org.eclipse.xtext.xbase.lib
+Import-Package: org.eclipse.xtext.xbase.lib,
+ org.apache.log4j
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: com.avaloq.tools.ddk.check,
  com.avaloq.tools.ddk.check.services,
diff --git a/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/TestLanguage.genmodel b/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/TestLanguage.genmodel
index 59e0057ba..c71fdddfe 100644
--- a/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/TestLanguage.genmodel
+++ b/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/TestLanguage.genmodel
@@ -5,7 +5,7 @@
     modelPluginID="com.avaloq.tools.ddk.check.test.runtime" forceOverwrite="true"
     modelName="TestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     complianceLevel="6.0" copyrightFields="false" editPluginID="com.avaloq.tools.ddk.check.test.runtime.edit"
-    editorPluginID="com.avaloq.tools.ddk.check.test.runtime.editor" runtimeVersion="2.10">
+    editorPluginID="com.avaloq.tools.ddk.check.test.runtime.editor" runtimeVersion="2.12">
   <genPackages prefix="TestLanguage" basePackage="com.avaloq.tools.ddk.check" disposableProviderFactory="true"
       ecorePackage="TestLanguage.ecore#/">
     <genClasses ecoreClass="TestLanguage.ecore#//Model">
diff --git a/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/TestLanguageStandaloneSetupGenerated.java b/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/TestLanguageStandaloneSetupGenerated.java
index 29a3ca4c3..7b8c57e60 100644
--- a/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/TestLanguageStandaloneSetupGenerated.java
+++ b/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/TestLanguageStandaloneSetupGenerated.java
@@ -4,8 +4,8 @@
 package com.avaloq.tools.ddk.check;
 
 import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.xtext.ISetup;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.xtext.ISetup;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
diff --git a/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g b/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g
index 46046b63e..5b3fd163f 100644
--- a/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g
+++ b/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g
@@ -90,7 +90,7 @@ ruleModel returns [EObject current=null]
        			$current, 
        			"greetings",
         		lv_greetings_0_0, 
-        		"Greeting");
+        		"com.avaloq.tools.ddk.check.TestLanguage.Greeting");
 	        afterParserOrEnumRuleCall();
 	    }
 
@@ -134,7 +134,7 @@ ruleGreeting returns [EObject current=null]
        			$current, 
        			"name",
         		lv_name_1_0, 
-        		"ID");
+        		"org.eclipse.xtext.common.Terminals.ID");
 	    }
 
 )
diff --git a/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguageLexer.java b/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguageLexer.java
index ee3bf2e15..5eb9e9e23 100644
--- a/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguageLexer.java
+++ b/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguageLexer.java
@@ -34,15 +34,15 @@ public InternalTestLanguageLexer(CharStream input, RecognizerSharedState state)
         super(input,state);
 
     }
-    public String getGrammarFileName() { return "../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g"; }
+    public String getGrammarFileName() { return "InternalTestLanguage.g"; }
 
     // $ANTLR start "T__11"
     public final void mT__11() throws RecognitionException {
         try {
             int _type = T__11;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:11:7: ( 'Hello' )
-            // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:11:9: 'Hello'
+            // InternalTestLanguage.g:11:7: ( 'Hello' )
+            // InternalTestLanguage.g:11:9: 'Hello'
             {
             match("Hello"); 
 
@@ -62,8 +62,8 @@ public final void mT__12() throws RecognitionException {
         try {
             int _type = T__12;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:12:7: ( '!' )
-            // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:12:9: '!'
+            // InternalTestLanguage.g:12:7: ( '!' )
+            // InternalTestLanguage.g:12:9: '!'
             {
             match('!'); 
 
@@ -82,10 +82,10 @@ public final void mRULE_ID() throws RecognitionException {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:152:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
-            // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:152:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalTestLanguage.g:152:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+            // InternalTestLanguage.g:152:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             {
-            // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:152:11: ( '^' )?
+            // InternalTestLanguage.g:152:11: ( '^' )?
             int alt1=2;
             int LA1_0 = input.LA(1);
 
@@ -94,7 +94,7 @@ public final void mRULE_ID() throws RecognitionException {
             }
             switch (alt1) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:152:11: '^'
+                    // InternalTestLanguage.g:152:11: '^'
                     {
                     match('^'); 
 
@@ -112,7 +112,7 @@ public final void mRULE_ID() throws RecognitionException {
                 recover(mse);
                 throw mse;}
 
-            // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:152:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalTestLanguage.g:152:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             loop2:
             do {
                 int alt2=2;
@@ -125,7 +125,7 @@ public final void mRULE_ID() throws RecognitionException {
 
                 switch (alt2) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:
+            	    // InternalTestLanguage.g:
             	    {
             	    if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
             	        input.consume();
@@ -161,10 +161,10 @@ public final void mRULE_INT() throws RecognitionException {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:154:10: ( ( '0' .. '9' )+ )
-            // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:154:12: ( '0' .. '9' )+
+            // InternalTestLanguage.g:154:10: ( ( '0' .. '9' )+ )
+            // InternalTestLanguage.g:154:12: ( '0' .. '9' )+
             {
-            // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:154:12: ( '0' .. '9' )+
+            // InternalTestLanguage.g:154:12: ( '0' .. '9' )+
             int cnt3=0;
             loop3:
             do {
@@ -178,7 +178,7 @@ public final void mRULE_INT() throws RecognitionException {
 
                 switch (alt3) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:154:13: '0' .. '9'
+            	    // InternalTestLanguage.g:154:13: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -210,10 +210,10 @@ public final void mRULE_STRING() throws RecognitionException {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:156:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
-            // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:156:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalTestLanguage.g:156:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+            // InternalTestLanguage.g:156:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             {
-            // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:156:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalTestLanguage.g:156:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             int alt6=2;
             int LA6_0 = input.LA(1);
 
@@ -231,10 +231,10 @@ else if ( (LA6_0=='\'') ) {
             }
             switch (alt6) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:156:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+                    // InternalTestLanguage.g:156:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
                     {
                     match('\"'); 
-                    // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:156:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // InternalTestLanguage.g:156:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop4:
                     do {
                         int alt4=3;
@@ -250,7 +250,7 @@ else if ( ((LA4_0>='\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=
 
                         switch (alt4) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:156:21: '\\\\' .
+                    	    // InternalTestLanguage.g:156:21: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -258,7 +258,7 @@ else if ( ((LA4_0>='\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:156:28: ~ ( ( '\\\\' | '\"' ) )
+                    	    // InternalTestLanguage.g:156:28: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -283,10 +283,10 @@ else if ( ((LA4_0>='\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=
                     }
                     break;
                 case 2 :
-                    // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:156:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+                    // InternalTestLanguage.g:156:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
                     {
                     match('\''); 
-                    // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:156:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // InternalTestLanguage.g:156:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop5:
                     do {
                         int alt5=3;
@@ -302,7 +302,7 @@ else if ( ((LA5_0>='\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=
 
                         switch (alt5) {
                     	case 1 :
-                    	    // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:156:54: '\\\\' .
+                    	    // InternalTestLanguage.g:156:54: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -310,7 +310,7 @@ else if ( ((LA5_0>='\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:156:61: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // InternalTestLanguage.g:156:61: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -353,12 +353,12 @@ public final void mRULE_ML_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:158:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:158:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalTestLanguage.g:158:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalTestLanguage.g:158:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:158:24: ( options {greedy=false; } : . )*
+            // InternalTestLanguage.g:158:24: ( options {greedy=false; } : . )*
             loop7:
             do {
                 int alt7=2;
@@ -383,7 +383,7 @@ else if ( ((LA7_0>='\u0000' && LA7_0<=')')||(LA7_0>='+' && LA7_0<='\uFFFF')) ) {
 
                 switch (alt7) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:158:52: .
+            	    // InternalTestLanguage.g:158:52: .
             	    {
             	    matchAny(); 
 
@@ -413,12 +413,12 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:160:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:160:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalTestLanguage.g:160:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalTestLanguage.g:160:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:160:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // InternalTestLanguage.g:160:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop8:
             do {
                 int alt8=2;
@@ -431,7 +431,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
 
                 switch (alt8) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:160:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // InternalTestLanguage.g:160:24: ~ ( ( '\\n' | '\\r' ) )
             	    {
             	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
             	        input.consume();
@@ -451,7 +451,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
                 }
             } while (true);
 
-            // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:160:40: ( ( '\\r' )? '\\n' )?
+            // InternalTestLanguage.g:160:40: ( ( '\\r' )? '\\n' )?
             int alt10=2;
             int LA10_0 = input.LA(1);
 
@@ -460,9 +460,9 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
             }
             switch (alt10) {
                 case 1 :
-                    // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:160:41: ( '\\r' )? '\\n'
+                    // InternalTestLanguage.g:160:41: ( '\\r' )? '\\n'
                     {
-                    // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:160:41: ( '\\r' )?
+                    // InternalTestLanguage.g:160:41: ( '\\r' )?
                     int alt9=2;
                     int LA9_0 = input.LA(1);
 
@@ -471,7 +471,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
                     }
                     switch (alt9) {
                         case 1 :
-                            // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:160:41: '\\r'
+                            // InternalTestLanguage.g:160:41: '\\r'
                             {
                             match('\r'); 
 
@@ -503,10 +503,10 @@ public final void mRULE_WS() throws RecognitionException {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:162:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:162:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalTestLanguage.g:162:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalTestLanguage.g:162:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:162:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalTestLanguage.g:162:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt11=0;
             loop11:
             do {
@@ -520,7 +520,7 @@ public final void mRULE_WS() throws RecognitionException {
 
                 switch (alt11) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:
+            	    // InternalTestLanguage.g:
             	    {
             	    if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
             	        input.consume();
@@ -560,8 +560,8 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:164:16: ( . )
-            // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:164:18: .
+            // InternalTestLanguage.g:164:16: ( . )
+            // InternalTestLanguage.g:164:18: .
             {
             matchAny(); 
 
@@ -576,68 +576,68 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:1:8: ( T__11 | T__12 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        // InternalTestLanguage.g:1:8: ( T__11 | T__12 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
         int alt12=9;
         alt12 = dfa12.predict(input);
         switch (alt12) {
             case 1 :
-                // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:1:10: T__11
+                // InternalTestLanguage.g:1:10: T__11
                 {
                 mT__11(); 
 
                 }
                 break;
             case 2 :
-                // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:1:16: T__12
+                // InternalTestLanguage.g:1:16: T__12
                 {
                 mT__12(); 
 
                 }
                 break;
             case 3 :
-                // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:1:22: RULE_ID
+                // InternalTestLanguage.g:1:22: RULE_ID
                 {
                 mRULE_ID(); 
 
                 }
                 break;
             case 4 :
-                // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:1:30: RULE_INT
+                // InternalTestLanguage.g:1:30: RULE_INT
                 {
                 mRULE_INT(); 
 
                 }
                 break;
             case 5 :
-                // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:1:39: RULE_STRING
+                // InternalTestLanguage.g:1:39: RULE_STRING
                 {
                 mRULE_STRING(); 
 
                 }
                 break;
             case 6 :
-                // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:1:51: RULE_ML_COMMENT
+                // InternalTestLanguage.g:1:51: RULE_ML_COMMENT
                 {
                 mRULE_ML_COMMENT(); 
 
                 }
                 break;
             case 7 :
-                // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:1:67: RULE_SL_COMMENT
+                // InternalTestLanguage.g:1:67: RULE_SL_COMMENT
                 {
                 mRULE_SL_COMMENT(); 
 
                 }
                 break;
             case 8 :
-                // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:1:83: RULE_WS
+                // InternalTestLanguage.g:1:83: RULE_WS
                 {
                 mRULE_WS(); 
 
                 }
                 break;
             case 9 :
-                // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:1:91: RULE_ANY_OTHER
+                // InternalTestLanguage.g:1:91: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -651,24 +651,19 @@ public void mTokens() throws RecognitionException {
 
     protected DFA12 dfa12 = new DFA12(this);
     static final String DFA12_eotS =
-        "\1\uffff\1\14\1\uffff\1\12\2\uffff\3\12\2\uffff\1\14\7\uffff\2"+
-        "\14\1\26\1\uffff";
+        "\1\uffff\1\14\1\uffff\1\12\2\uffff\3\12\2\uffff\1\14\7\uffff\2\14\1\26\1\uffff";
     static final String DFA12_eofS =
         "\27\uffff";
     static final String DFA12_minS =
-        "\1\0\1\145\1\uffff\1\101\2\uffff\2\0\1\52\2\uffff\1\154\7\uffff"+
-        "\1\154\1\157\1\60\1\uffff";
+        "\1\0\1\145\1\uffff\1\101\2\uffff\2\0\1\52\2\uffff\1\154\7\uffff\1\154\1\157\1\60\1\uffff";
     static final String DFA12_maxS =
-        "\1\uffff\1\145\1\uffff\1\172\2\uffff\2\uffff\1\57\2\uffff\1\154"+
-        "\7\uffff\1\154\1\157\1\172\1\uffff";
+        "\1\uffff\1\145\1\uffff\1\172\2\uffff\2\uffff\1\57\2\uffff\1\154\7\uffff\1\154\1\157\1\172\1\uffff";
     static final String DFA12_acceptS =
-        "\2\uffff\1\2\1\uffff\1\3\1\4\3\uffff\1\10\1\11\1\uffff\1\3\1\2"+
-        "\1\4\1\5\1\6\1\7\1\10\3\uffff\1\1";
+        "\2\uffff\1\2\1\uffff\1\3\1\4\3\uffff\1\10\1\11\1\uffff\1\3\1\2\1\4\1\5\1\6\1\7\1\10\3\uffff\1\1";
     static final String DFA12_specialS =
         "\1\2\5\uffff\1\0\1\1\17\uffff}>";
     static final String[] DFA12_transitionS = {
-            "\11\12\2\11\2\12\1\11\22\12\1\11\1\2\1\6\4\12\1\7\7\12\1\10"+
-            "\12\5\7\12\7\4\1\1\22\4\3\12\1\3\1\4\1\12\32\4\uff85\12",
+            "\11\12\2\11\2\12\1\11\22\12\1\11\1\2\1\6\4\12\1\7\7\12\1\10\12\5\7\12\7\4\1\1\22\4\3\12\1\3\1\4\1\12\32\4\uff85\12",
             "\1\13",
             "",
             "\32\14\4\uffff\1\14\1\uffff\32\14",
diff --git a/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguageParser.java b/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguageParser.java
index 13c12cd77..11f51e885 100644
--- a/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguageParser.java
+++ b/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguageParser.java
@@ -48,7 +48,7 @@ public InternalTestLanguageParser(TokenStream input, RecognizerSharedState state
         
 
     public String[] getTokenNames() { return InternalTestLanguageParser.tokenNames; }
-    public String getGrammarFileName() { return "../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g"; }
+    public String getGrammarFileName() { return "InternalTestLanguage.g"; }
 
 
 
@@ -73,7 +73,7 @@ protected TestLanguageGrammarAccess getGrammarAccess() {
 
 
     // $ANTLR start "entryRuleModel"
-    // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:67:1: entryRuleModel returns [EObject current=null] : iv_ruleModel= ruleModel EOF ;
+    // InternalTestLanguage.g:67:1: entryRuleModel returns [EObject current=null] : iv_ruleModel= ruleModel EOF ;
     public final EObject entryRuleModel() throws RecognitionException {
         EObject current = null;
 
@@ -81,17 +81,17 @@ public final EObject entryRuleModel() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:68:2: (iv_ruleModel= ruleModel EOF )
-            // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:69:2: iv_ruleModel= ruleModel EOF
+            // InternalTestLanguage.g:68:2: (iv_ruleModel= ruleModel EOF )
+            // InternalTestLanguage.g:69:2: iv_ruleModel= ruleModel EOF
             {
              newCompositeNode(grammarAccess.getModelRule()); 
-            pushFollow(FOLLOW_ruleModel_in_entryRuleModel75);
+            pushFollow(FOLLOW_1);
             iv_ruleModel=ruleModel();
 
             state._fsp--;
 
              current =iv_ruleModel; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleModel85); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -109,7 +109,7 @@ public final EObject entryRuleModel() throws RecognitionException {
 
 
     // $ANTLR start "ruleModel"
-    // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:76:1: ruleModel returns [EObject current=null] : ( (lv_greetings_0_0= ruleGreeting ) )* ;
+    // InternalTestLanguage.g:76:1: ruleModel returns [EObject current=null] : ( (lv_greetings_0_0= ruleGreeting ) )* ;
     public final EObject ruleModel() throws RecognitionException {
         EObject current = null;
 
@@ -119,10 +119,10 @@ public final EObject ruleModel() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:79:28: ( ( (lv_greetings_0_0= ruleGreeting ) )* )
-            // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:80:1: ( (lv_greetings_0_0= ruleGreeting ) )*
+            // InternalTestLanguage.g:79:28: ( ( (lv_greetings_0_0= ruleGreeting ) )* )
+            // InternalTestLanguage.g:80:1: ( (lv_greetings_0_0= ruleGreeting ) )*
             {
-            // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:80:1: ( (lv_greetings_0_0= ruleGreeting ) )*
+            // InternalTestLanguage.g:80:1: ( (lv_greetings_0_0= ruleGreeting ) )*
             loop1:
             do {
                 int alt1=2;
@@ -135,15 +135,15 @@ public final EObject ruleModel() throws RecognitionException {
 
                 switch (alt1) {
             	case 1 :
-            	    // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:81:1: (lv_greetings_0_0= ruleGreeting )
+            	    // InternalTestLanguage.g:81:1: (lv_greetings_0_0= ruleGreeting )
             	    {
-            	    // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:81:1: (lv_greetings_0_0= ruleGreeting )
-            	    // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:82:3: lv_greetings_0_0= ruleGreeting
+            	    // InternalTestLanguage.g:81:1: (lv_greetings_0_0= ruleGreeting )
+            	    // InternalTestLanguage.g:82:3: lv_greetings_0_0= ruleGreeting
             	    {
             	     
             	    	        newCompositeNode(grammarAccess.getModelAccess().getGreetingsGreetingParserRuleCall_0()); 
             	    	    
-            	    pushFollow(FOLLOW_ruleGreeting_in_ruleModel130);
+            	    pushFollow(FOLLOW_3);
             	    lv_greetings_0_0=ruleGreeting();
 
             	    state._fsp--;
@@ -156,7 +156,7 @@ public final EObject ruleModel() throws RecognitionException {
             	           			current, 
             	           			"greetings",
             	            		lv_greetings_0_0, 
-            	            		"Greeting");
+            	            		"com.avaloq.tools.ddk.check.TestLanguage.Greeting");
             	    	        afterParserOrEnumRuleCall();
             	    	    
 
@@ -189,7 +189,7 @@ public final EObject ruleModel() throws RecognitionException {
 
 
     // $ANTLR start "entryRuleGreeting"
-    // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:106:1: entryRuleGreeting returns [EObject current=null] : iv_ruleGreeting= ruleGreeting EOF ;
+    // InternalTestLanguage.g:106:1: entryRuleGreeting returns [EObject current=null] : iv_ruleGreeting= ruleGreeting EOF ;
     public final EObject entryRuleGreeting() throws RecognitionException {
         EObject current = null;
 
@@ -197,17 +197,17 @@ public final EObject entryRuleGreeting() throws RecognitionException {
 
 
         try {
-            // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:107:2: (iv_ruleGreeting= ruleGreeting EOF )
-            // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:108:2: iv_ruleGreeting= ruleGreeting EOF
+            // InternalTestLanguage.g:107:2: (iv_ruleGreeting= ruleGreeting EOF )
+            // InternalTestLanguage.g:108:2: iv_ruleGreeting= ruleGreeting EOF
             {
              newCompositeNode(grammarAccess.getGreetingRule()); 
-            pushFollow(FOLLOW_ruleGreeting_in_entryRuleGreeting166);
+            pushFollow(FOLLOW_1);
             iv_ruleGreeting=ruleGreeting();
 
             state._fsp--;
 
              current =iv_ruleGreeting; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleGreeting176); 
+            match(input,EOF,FOLLOW_2); 
 
             }
 
@@ -225,7 +225,7 @@ public final EObject entryRuleGreeting() throws RecognitionException {
 
 
     // $ANTLR start "ruleGreeting"
-    // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:115:1: ruleGreeting returns [EObject current=null] : (otherlv_0= 'Hello' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '!' ) ;
+    // InternalTestLanguage.g:115:1: ruleGreeting returns [EObject current=null] : (otherlv_0= 'Hello' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '!' ) ;
     public final EObject ruleGreeting() throws RecognitionException {
         EObject current = null;
 
@@ -236,23 +236,23 @@ public final EObject ruleGreeting() throws RecognitionException {
          enterRule(); 
             
         try {
-            // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:118:28: ( (otherlv_0= 'Hello' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '!' ) )
-            // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:119:1: (otherlv_0= 'Hello' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '!' )
+            // InternalTestLanguage.g:118:28: ( (otherlv_0= 'Hello' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '!' ) )
+            // InternalTestLanguage.g:119:1: (otherlv_0= 'Hello' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '!' )
             {
-            // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:119:1: (otherlv_0= 'Hello' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '!' )
-            // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:119:3: otherlv_0= 'Hello' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '!'
+            // InternalTestLanguage.g:119:1: (otherlv_0= 'Hello' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '!' )
+            // InternalTestLanguage.g:119:3: otherlv_0= 'Hello' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '!'
             {
-            otherlv_0=(Token)match(input,11,FOLLOW_11_in_ruleGreeting213); 
+            otherlv_0=(Token)match(input,11,FOLLOW_4); 
 
                 	newLeafNode(otherlv_0, grammarAccess.getGreetingAccess().getHelloKeyword_0());
                 
-            // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:123:1: ( (lv_name_1_0= RULE_ID ) )
-            // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:124:1: (lv_name_1_0= RULE_ID )
+            // InternalTestLanguage.g:123:1: ( (lv_name_1_0= RULE_ID ) )
+            // InternalTestLanguage.g:124:1: (lv_name_1_0= RULE_ID )
             {
-            // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:124:1: (lv_name_1_0= RULE_ID )
-            // ../com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/parser/antlr/internal/InternalTestLanguage.g:125:3: lv_name_1_0= RULE_ID
+            // InternalTestLanguage.g:124:1: (lv_name_1_0= RULE_ID )
+            // InternalTestLanguage.g:125:3: lv_name_1_0= RULE_ID
             {
-            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleGreeting230); 
+            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_5); 
 
             			newLeafNode(lv_name_1_0, grammarAccess.getGreetingAccess().getNameIDTerminalRuleCall_1_0()); 
             		
@@ -264,7 +264,7 @@ public final EObject ruleGreeting() throws RecognitionException {
                    			current, 
                    			"name",
                     		lv_name_1_0, 
-                    		"ID");
+                    		"org.eclipse.xtext.common.Terminals.ID");
             	    
 
             }
@@ -272,7 +272,7 @@ public final EObject ruleGreeting() throws RecognitionException {
 
             }
 
-            otherlv_2=(Token)match(input,12,FOLLOW_12_in_ruleGreeting247); 
+            otherlv_2=(Token)match(input,12,FOLLOW_2); 
 
                 	newLeafNode(otherlv_2, grammarAccess.getGreetingAccess().getExclamationMarkKeyword_2());
                 
@@ -300,13 +300,10 @@ public final EObject ruleGreeting() throws RecognitionException {
 
  
 
-    public static final BitSet FOLLOW_ruleModel_in_entryRuleModel75 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleModel85 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleGreeting_in_ruleModel130 = new BitSet(new long[]{0x0000000000000802L});
-    public static final BitSet FOLLOW_ruleGreeting_in_entryRuleGreeting166 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleGreeting176 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_11_in_ruleGreeting213 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleGreeting230 = new BitSet(new long[]{0x0000000000001000L});
-    public static final BitSet FOLLOW_12_in_ruleGreeting247 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_1 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_2 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x0000000000000802L});
+    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0000000000001000L});
 
 }
\ No newline at end of file
diff --git a/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/serializer/AbstractTestLanguageSemanticSequencer.java b/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/serializer/AbstractTestLanguageSemanticSequencer.java
index 321b688d7..1c6047fc1 100644
--- a/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/serializer/AbstractTestLanguageSemanticSequencer.java
+++ b/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/serializer/AbstractTestLanguageSemanticSequencer.java
@@ -8,17 +8,15 @@
 import com.avaloq.tools.ddk.check.testLanguage.Model;
 import com.avaloq.tools.ddk.check.testLanguage.TestLanguagePackage;
 import com.google.inject.Inject;
-import com.google.inject.Provider;
+import java.util.Set;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.xtext.serializer.acceptor.ISemanticSequenceAcceptor;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.xtext.Action;
+import org.eclipse.xtext.Parameter;
+import org.eclipse.xtext.ParserRule;
+import org.eclipse.xtext.serializer.ISerializationContext;
 import org.eclipse.xtext.serializer.acceptor.SequenceFeeder;
-import org.eclipse.xtext.serializer.diagnostic.ISemanticSequencerDiagnosticProvider;
-import org.eclipse.xtext.serializer.diagnostic.ISerializationDiagnostic.Acceptor;
 import org.eclipse.xtext.serializer.sequencer.AbstractDelegatingSemanticSequencer;
-import org.eclipse.xtext.serializer.sequencer.GenericSequencer;
-import org.eclipse.xtext.serializer.sequencer.ISemanticNodeProvider.INodesForEObjectProvider;
-import org.eclipse.xtext.serializer.sequencer.ISemanticSequencer;
-import org.eclipse.xtext.serializer.sequencer.ITransientValueService;
 import org.eclipse.xtext.serializer.sequencer.ITransientValueService.ValueTransient;
 
 @SuppressWarnings("all")
@@ -28,8 +26,13 @@ public abstract class AbstractTestLanguageSemanticSequencer extends AbstractDele
 	private TestLanguageGrammarAccess grammarAccess;
 	
 	@Override
-	public void createSequence(EObject context, EObject semanticObject) {
-		if(semanticObject.eClass().getEPackage() == TestLanguagePackage.eINSTANCE) switch(semanticObject.eClass().getClassifierID()) {
+	public void sequence(ISerializationContext context, EObject semanticObject) {
+		EPackage epackage = semanticObject.eClass().getEPackage();
+		ParserRule rule = context.getParserRule();
+		Action action = context.getAssignedAction();
+		Set<Parameter> parameters = context.getEnabledBooleanParameters();
+		if (epackage == TestLanguagePackage.eINSTANCE)
+			switch (semanticObject.eClass().getClassifierID()) {
 			case TestLanguagePackage.GREETING:
 				sequence_Greeting(context, (Greeting) semanticObject); 
 				return; 
@@ -37,30 +40,38 @@ public void createSequence(EObject context, EObject semanticObject) {
 				sequence_Model(context, (Model) semanticObject); 
 				return; 
 			}
-		if (errorAcceptor != null) errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
+		if (errorAcceptor != null)
+			errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
 	}
 	
 	/**
+	 * Contexts:
+	 *     Greeting returns Greeting
+	 *
 	 * Constraint:
 	 *     name=ID
 	 */
-	protected void sequence_Greeting(EObject context, Greeting semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, TestLanguagePackage.Literals.GREETING__NAME) == ValueTransient.YES)
+	protected void sequence_Greeting(ISerializationContext context, Greeting semanticObject) {
+		if (errorAcceptor != null) {
+			if (transientValues.isValueTransient(semanticObject, TestLanguagePackage.Literals.GREETING__NAME) == ValueTransient.YES)
 				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, TestLanguagePackage.Literals.GREETING__NAME));
 		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
+		SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
 		feeder.accept(grammarAccess.getGreetingAccess().getNameIDTerminalRuleCall_1_0(), semanticObject.getName());
 		feeder.finish();
 	}
 	
 	
 	/**
+	 * Contexts:
+	 *     Model returns Model
+	 *
 	 * Constraint:
-	 *     greetings+=Greeting*
+	 *     greetings+=Greeting+
 	 */
-	protected void sequence_Model(EObject context, Model semanticObject) {
+	protected void sequence_Model(ISerializationContext context, Model semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
+	
+	
 }
diff --git a/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/services/TestLanguageGrammarAccess.java b/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/services/TestLanguageGrammarAccess.java
index 447f0d84a..df1c12d94 100644
--- a/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/services/TestLanguageGrammarAccess.java
+++ b/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/services/TestLanguageGrammarAccess.java
@@ -19,7 +19,7 @@ public class TestLanguageGrammarAccess extends AbstractGrammarElementFinder {
 	
 	
 	public class ModelElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Model");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.check.TestLanguage.Model");
 		private final Assignment cGreetingsAssignment = (Assignment)rule.eContents().get(1);
 		private final RuleCall cGreetingsGreetingParserRuleCall_0 = (RuleCall)cGreetingsAssignment.eContents().get(0);
 		
@@ -35,7 +35,7 @@ public class ModelElements extends AbstractParserRuleElementFinder {
 	}
 
 	public class GreetingElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Greeting");
+		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "com.avaloq.tools.ddk.check.TestLanguage.Greeting");
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cHelloKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
@@ -43,13 +43,13 @@ public class GreetingElements extends AbstractParserRuleElementFinder {
 		private final Keyword cExclamationMarkKeyword_2 = (Keyword)cGroup.eContents().get(2);
 		
 		//Greeting:
-		//	"Hello" name=ID "!";
+		//	'Hello' name=ID '!';
 		@Override public ParserRule getRule() { return rule; }
 
-		//"Hello" name=ID "!"
+		//'Hello' name=ID '!'
 		public Group getGroup() { return cGroup; }
 
-		//"Hello"
+		//'Hello'
 		public Keyword getHelloKeyword_0() { return cHelloKeyword_0; }
 
 		//name=ID
@@ -58,7 +58,7 @@ public class GreetingElements extends AbstractParserRuleElementFinder {
 		//ID
 		public RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }
 
-		//"!"
+		//'!'
 		public Keyword getExclamationMarkKeyword_2() { return cExclamationMarkKeyword_2; }
 	}
 	
@@ -117,7 +117,7 @@ public ParserRule getModelRule() {
 	}
 
 	//Greeting:
-	//	"Hello" name=ID "!";
+	//	'Hello' name=ID '!';
 	public GreetingElements getGreetingAccess() {
 		return pGreeting;
 	}
@@ -127,38 +127,37 @@ public ParserRule getGreetingRule() {
 	}
 
 	//terminal ID:
-	//	"^"? ("a".."z" | "A".."Z" | "_") ("a".."z" | "A".."Z" | "_" | "0".."9")*;
+	//	'^'? ('a'..'z' | 'A'..'Z' | '_') ('a'..'z' | 'A'..'Z' | '_' | '0'..'9')*;
 	public TerminalRule getIDRule() {
 		return gaTerminals.getIDRule();
 	} 
 
 	//terminal INT returns ecore::EInt:
-	//	"0".."9"+;
+	//	'0'..'9'+;
 	public TerminalRule getINTRule() {
 		return gaTerminals.getINTRule();
 	} 
 
 	//terminal STRING:
-	//	"\"" ("\\" . / * 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' * / | !("\\" | "\""))* "\"" | "\'" ("\\" .
-	//	/ * 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' * / | !("\\" | "\'"))* "\'";
+	//	'"' ('\\' . | !('\\' | '"'))* '"' | "'" ('\\' . | !('\\' | "'"))* "'";
 	public TerminalRule getSTRINGRule() {
 		return gaTerminals.getSTRINGRule();
 	} 
 
 	//terminal ML_COMMENT:
-	//	"/ *"->"* /";
+	//	'/*'->'*/';
 	public TerminalRule getML_COMMENTRule() {
 		return gaTerminals.getML_COMMENTRule();
 	} 
 
 	//terminal SL_COMMENT:
-	//	"//" !("\n" | "\r")* ("\r"? "\n")?;
+	//	'//' !('\n' | '\r')* ('\r'? '\n')?;
 	public TerminalRule getSL_COMMENTRule() {
 		return gaTerminals.getSL_COMMENTRule();
 	} 
 
 	//terminal WS:
-	//	(" " | "\t" | "\r" | "\n")+;
+	//	' ' | '\t' | '\r' | '\n'+;
 	public TerminalRule getWSRule() {
 		return gaTerminals.getWSRule();
 	} 
diff --git a/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/testLanguage/Greeting.java b/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/testLanguage/Greeting.java
index d12085566..4344ce306 100644
--- a/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/testLanguage/Greeting.java
+++ b/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/testLanguage/Greeting.java
@@ -11,10 +11,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.check.testLanguage.Greeting#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.check.testLanguage.TestLanguagePackage#getGreeting()
  * @model
diff --git a/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/testLanguage/Model.java b/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/testLanguage/Model.java
index fa61082b4..5dd46a31f 100644
--- a/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/testLanguage/Model.java
+++ b/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/testLanguage/Model.java
@@ -13,10 +13,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.check.testLanguage.Model#getGreetings <em>Greetings</em>}</li>
  * </ul>
- * </p>
  *
  * @see com.avaloq.tools.ddk.check.testLanguage.TestLanguagePackage#getModel()
  * @model
diff --git a/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/testLanguage/impl/GreetingImpl.java b/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/testLanguage/impl/GreetingImpl.java
index 26acfd158..21bb5ea72 100644
--- a/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/testLanguage/impl/GreetingImpl.java
+++ b/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/testLanguage/impl/GreetingImpl.java
@@ -18,10 +18,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.check.testLanguage.impl.GreetingImpl#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/testLanguage/impl/ModelImpl.java b/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/testLanguage/impl/ModelImpl.java
index 88d00ee97..fe77454a8 100644
--- a/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/testLanguage/impl/ModelImpl.java
+++ b/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/testLanguage/impl/ModelImpl.java
@@ -26,10 +26,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link com.avaloq.tools.ddk.check.testLanguage.impl.ModelImpl#getGreetings <em>Greetings</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/testLanguage/util/TestLanguageSwitch.java b/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/testLanguage/util/TestLanguageSwitch.java
index 89223aeac..b09fb719b 100644
--- a/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/testLanguage/util/TestLanguageSwitch.java
+++ b/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/testLanguage/util/TestLanguageSwitch.java
@@ -50,7 +50,7 @@ public TestLanguageSwitch()
    * Checks whether this is a switch for the given package.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @parameter ePackage the package in question.
+   * @param ePackage the package in question.
    * @return whether this is a switch for the given package.
    * @generated
    */
diff --git a/com.avaloq.tools.ddk.check.test.runtime/src/com/avaloq/tools/ddk/check/GenerateTestLanguage.mwe2 b/com.avaloq.tools.ddk.check.test.runtime/src/com/avaloq/tools/ddk/check/GenerateTestLanguage.mwe2
index a2072e262..b381b4ea2 100644
--- a/com.avaloq.tools.ddk.check.test.runtime/src/com/avaloq/tools/ddk/check/GenerateTestLanguage.mwe2
+++ b/com.avaloq.tools.ddk.check.test.runtime/src/com/avaloq/tools/ddk/check/GenerateTestLanguage.mwe2
@@ -102,9 +102,6 @@ Workflow {
             // generates a more lightweight Antlr parser and lexer tailored for content assist
             fragment = parser.antlr.XtextAntlrUiGeneratorFragment {}
 
-            // generates junit test support classes into Generator#pathTestProject
-            fragment = junit.Junit4Fragment {}
-
             // project wizard (optional)
             // fragment = projectWizard.SimpleProjectWizardFragment {
             //      generatorProjectName = "${projectName}"
diff --git a/com.avaloq.tools.ddk.check.ui.test/src-gen/com/avaloq/tools/ddk/check/CheckUiInjectorProvider.java b/com.avaloq.tools.ddk.check.ui.test/src-gen/com/avaloq/tools/ddk/check/CheckUiInjectorProvider.java
deleted file mode 100644
index 67cbce916..000000000
--- a/com.avaloq.tools.ddk.check.ui.test/src-gen/com/avaloq/tools/ddk/check/CheckUiInjectorProvider.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * generated by Xtext
- */
-package com.avaloq.tools.ddk.check;
-
-import org.eclipse.xtext.junit4.IInjectorProvider;
-
-import com.google.inject.Injector;
-
-public class CheckUiInjectorProvider implements IInjectorProvider {
-
-	@Override
-	public Injector getInjector() {
-		return com.avaloq.tools.ddk.check.ui.internal.CheckActivator.getInstance().getInjector("com.avaloq.tools.ddk.check.Check");
-	}
-
-}
diff --git a/com.avaloq.tools.ddk.check.ui.test/src-gen/com/avaloq/tools/ddk/check/CheckInjectorProvider.java b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/CheckInjectorProvider.java
similarity index 100%
rename from com.avaloq.tools.ddk.check.ui.test/src-gen/com/avaloq/tools/ddk/check/CheckInjectorProvider.java
rename to com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/CheckInjectorProvider.java
diff --git a/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/CheckUiInjectorProvider.java b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/CheckUiInjectorProvider.java
new file mode 100644
index 000000000..5a339bd3a
--- /dev/null
+++ b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/CheckUiInjectorProvider.java
@@ -0,0 +1,18 @@
+/*
+ * generated by Xtext
+ */
+package com.avaloq.tools.ddk.check;
+
+import org.eclipse.xtext.testing.IInjectorProvider;
+
+import com.google.inject.Injector;
+
+
+public class CheckUiInjectorProvider implements IInjectorProvider {
+
+  @Override
+  public Injector getInjector() {
+    return com.avaloq.tools.ddk.check.ui.internal.CheckActivator.getInstance().getInjector("com.avaloq.tools.ddk.check.Check");
+  }
+
+}
diff --git a/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/CheckCatalogWizardTest.java b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/CheckCatalogWizardTest.java
index c6fce0aa8..b3da56258 100644
--- a/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/CheckCatalogWizardTest.java
+++ b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/CheckCatalogWizardTest.java
@@ -30,7 +30,7 @@
 import org.eclipse.swtbot.swt.finder.waits.Conditions;
 import org.eclipse.ui.actions.WorkspaceModifyOperation;
 import org.eclipse.xtext.Grammar;
-import org.eclipse.xtext.junit4.InjectWith;
+import org.eclipse.xtext.testing.InjectWith;
 import org.eclipse.xtext.ui.util.PluginProjectFactory;
 import org.junit.After;
 import org.junit.Before;
diff --git a/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/CheckProjectWizardTest.java b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/CheckProjectWizardTest.java
index 015c40786..d1807e325 100644
--- a/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/CheckProjectWizardTest.java
+++ b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/CheckProjectWizardTest.java
@@ -15,7 +15,7 @@
 import static org.junit.Assert.assertNotSame;
 
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
-import org.eclipse.xtext.junit4.InjectWith;
+import org.eclipse.xtext.testing.InjectWith;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/builder/CheckContextsExtensionTest.java b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/builder/CheckContextsExtensionTest.java
index a8e9d9414..d6a4d1437 100644
--- a/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/builder/CheckContextsExtensionTest.java
+++ b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/builder/CheckContextsExtensionTest.java
@@ -10,8 +10,6 @@
  *******************************************************************************/
 package com.avaloq.tools.ddk.check.ui.test.builder;
 
-import junit.framework.TestCase;
-
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.runtime.CoreException;
@@ -20,9 +18,9 @@
 import org.eclipse.pde.core.plugin.IPluginExtension;
 import org.eclipse.pde.core.plugin.IPluginModelBase;
 import org.eclipse.pde.internal.core.plugin.WorkspacePluginModel;
-import org.eclipse.xtext.junit4.InjectWith;
-import org.eclipse.xtext.junit4.XtextRunner;
-import org.eclipse.xtext.junit4.util.ParseHelper;
+import org.eclipse.xtext.testing.XtextRunner;
+import org.eclipse.xtext.testing.util.ParseHelper;
+import org.eclipse.xtext.testing.InjectWith;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -35,6 +33,8 @@
 import com.google.common.collect.Lists;
 import com.google.inject.Inject;
 
+import junit.framework.TestCase;
+
 
 /**
  * Tests CheckContextExtensionUtil.
@@ -66,7 +66,7 @@ public void setUp() throws Exception {
 
   /**
    * Tests if the contexts extension is correctly created.
-   * 
+   *
    * @throws CoreException
    *           core exception
    */
@@ -82,7 +82,7 @@ public void testCreateExtension() throws CoreException {
 
   /**
    * Test if isExtensionUpdateRequired is true, if the file path attribute is not as expected.
-   * 
+   *
    * @throws CoreException
    *           the core exception
    */
@@ -95,7 +95,7 @@ public void testIsExtensionUpdateRequiredTrue() throws CoreException {
 
   /**
    * Test if isExtensionUpdateRequired returns false if a correct extension already exists.
-   * 
+   *
    * @throws CoreException
    *           the core exception
    */
@@ -108,7 +108,7 @@ public void testIsExtensionUpdateRequiredFalse() throws CoreException {
 
   /**
    * Creates the extension with wrong file path.
-   * 
+   *
    * @return the i plugin extension
    * @throws CoreException
    *           the core exception
@@ -125,4 +125,3 @@ private IPluginExtension createErroneousExtension() throws CoreException {
     return extension;
   }
 }
-
diff --git a/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/builder/CheckMarkerHelpExtensionTest.java b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/builder/CheckMarkerHelpExtensionTest.java
index 2d6b9c637..2695efe85 100644
--- a/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/builder/CheckMarkerHelpExtensionTest.java
+++ b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/builder/CheckMarkerHelpExtensionTest.java
@@ -25,9 +25,9 @@
 import org.eclipse.pde.core.plugin.IPluginModelBase;
 import org.eclipse.pde.core.plugin.IPluginObject;
 import org.eclipse.pde.internal.core.plugin.WorkspacePluginModel;
-import org.eclipse.xtext.junit4.InjectWith;
-import org.eclipse.xtext.junit4.XtextRunner;
-import org.eclipse.xtext.junit4.util.ParseHelper;
+import org.eclipse.xtext.testing.InjectWith;
+import org.eclipse.xtext.testing.XtextRunner;
+import org.eclipse.xtext.testing.util.ParseHelper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
diff --git a/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/builder/CheckTocExtensionTest.java b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/builder/CheckTocExtensionTest.java
index 5117cac46..cf1f247fa 100644
--- a/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/builder/CheckTocExtensionTest.java
+++ b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/builder/CheckTocExtensionTest.java
@@ -20,9 +20,9 @@
 import org.eclipse.pde.core.plugin.IPluginExtension;
 import org.eclipse.pde.core.plugin.IPluginModelBase;
 import org.eclipse.pde.internal.core.plugin.WorkspacePluginModel;
-import org.eclipse.xtext.junit4.InjectWith;
-import org.eclipse.xtext.junit4.XtextRunner;
-import org.eclipse.xtext.junit4.util.ParseHelper;
+import org.eclipse.xtext.testing.InjectWith;
+import org.eclipse.xtext.testing.XtextRunner;
+import org.eclipse.xtext.testing.util.ParseHelper;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/contentassist/AbstractCheckContentAssistBugTest.java b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/contentassist/AbstractCheckContentAssistBugTest.java
index 9b2bc61f5..57cf4a2bc 100644
--- a/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/contentassist/AbstractCheckContentAssistBugTest.java
+++ b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/contentassist/AbstractCheckContentAssistBugTest.java
@@ -20,10 +20,10 @@
 import org.eclipse.xtext.common.types.access.IJvmTypeProvider;
 import org.eclipse.xtext.common.types.access.jdt.IJavaProjectProvider;
 import org.eclipse.xtext.common.types.access.jdt.JdtTypeProviderFactory;
-import org.eclipse.xtext.junit4.ui.ContentAssistProcessorTestBuilder;
-import org.eclipse.xtext.junit4.util.ResourceLoadHelper;
 import org.eclipse.xtext.resource.XtextResource;
 import org.eclipse.xtext.resource.XtextResourceSet;
+import org.eclipse.xtext.ui.testing.ContentAssistProcessorTestBuilder;
+import org.eclipse.xtext.ui.testing.util.ResourceLoadHelper;
 
 import com.avaloq.tools.ddk.check.core.test.AbstractCheckTestCase;
 import com.avaloq.tools.ddk.xtext.test.PluginTestProjectManager;
diff --git a/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/internal/CheckWizardUiTestInjectorProvider.java b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/internal/CheckWizardUiTestInjectorProvider.java
index 7addf9c40..bcf32a0b7 100644
--- a/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/internal/CheckWizardUiTestInjectorProvider.java
+++ b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/internal/CheckWizardUiTestInjectorProvider.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package com.avaloq.tools.ddk.check.ui.test.internal;
 
-import org.eclipse.xtext.junit4.IInjectorProvider;
+import org.eclipse.xtext.testing.IInjectorProvider;
 
 import com.google.inject.Injector;
 
diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.checkcfg.core.test/META-INF/MANIFEST.MF
index daeb7189b..0e2148a71 100644
--- a/com.avaloq.tools.ddk.checkcfg.core.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.checkcfg.core.test/META-INF/MANIFEST.MF
@@ -18,6 +18,7 @@ Require-Bundle: com.avaloq.tools.ddk.test.core,
  org.eclipse.core.runtime,
  org.eclipse.xtend.lib,
  org.eclipse.xtext.junit4,
+ org.eclipse.xtext.ui.testing,
  org.junit,
  org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional,
  org.eclipse.xtext.xbase.lib,
diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/src-gen/com/avaloq/tools/ddk/checkcfg/CheckCfgInjectorProvider.java b/com.avaloq.tools.ddk.checkcfg.core.test/src-gen/com/avaloq/tools/ddk/checkcfg/CheckCfgInjectorProvider.java
index cbb529ccf..fa1332cd0 100644
--- a/com.avaloq.tools.ddk.checkcfg.core.test/src-gen/com/avaloq/tools/ddk/checkcfg/CheckCfgInjectorProvider.java
+++ b/com.avaloq.tools.ddk.checkcfg.core.test/src-gen/com/avaloq/tools/ddk/checkcfg/CheckCfgInjectorProvider.java
@@ -5,10 +5,10 @@
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
-import org.eclipse.xtext.junit4.GlobalRegistries;
-import org.eclipse.xtext.junit4.GlobalRegistries.GlobalStateMemento;
-import org.eclipse.xtext.junit4.IInjectorProvider;
-import org.eclipse.xtext.junit4.IRegistryConfigurator;
+import org.eclipse.xtext.testing.GlobalRegistries;
+import org.eclipse.xtext.testing.GlobalRegistries.GlobalStateMemento;
+import org.eclipse.xtext.testing.IInjectorProvider;
+import org.eclipse.xtext.testing.IRegistryConfigurator;
 
 public class CheckCfgInjectorProvider implements IInjectorProvider, IRegistryConfigurator {
 
diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/src-gen/com/avaloq/tools/ddk/checkcfg/CheckCfgUiInjectorProvider.java b/com.avaloq.tools.ddk.checkcfg.core.test/src-gen/com/avaloq/tools/ddk/checkcfg/CheckCfgUiInjectorProvider.java
index 57eff466f..7d0b4c1e2 100644
--- a/com.avaloq.tools.ddk.checkcfg.core.test/src-gen/com/avaloq/tools/ddk/checkcfg/CheckCfgUiInjectorProvider.java
+++ b/com.avaloq.tools.ddk.checkcfg.core.test/src-gen/com/avaloq/tools/ddk/checkcfg/CheckCfgUiInjectorProvider.java
@@ -3,7 +3,7 @@
  */
 package com.avaloq.tools.ddk.checkcfg;
 
-import org.eclipse.xtext.junit4.IInjectorProvider;
+import org.eclipse.xtext.testing.IInjectorProvider;
 
 import com.google.inject.Injector;
 
diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/checkcfg/syntax/CheckCfgSyntaxTest.xtend b/com.avaloq.tools.ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/checkcfg/syntax/CheckCfgSyntaxTest.xtend
index 3afdb7002..f544b6c6f 100644
--- a/com.avaloq.tools.ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/checkcfg/syntax/CheckCfgSyntaxTest.xtend
+++ b/com.avaloq.tools.ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/checkcfg/syntax/CheckCfgSyntaxTest.xtend
@@ -14,7 +14,7 @@ package com.avaloq.tools.ddk.checkcfg.syntax
 import com.avaloq.tools.ddk.checkcfg.util.CheckCfgTestUtil
 import com.avaloq.tools.ddk.xtext.test.validation.AbstractValidationTest
 import java.util.LinkedList
-import org.eclipse.xtext.junit4.ui.util.IResourcesSetupUtil
+import org.eclipse.xtext.ui.testing.util.IResourcesSetupUtil
 import org.junit.Test
 
 class CheckCfgSyntaxTest extends AbstractValidationTest {
diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/checkcfg/validation/CheckCfgTest.xtend b/com.avaloq.tools.ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/checkcfg/validation/CheckCfgTest.xtend
index 4523765b3..1625b3572 100644
--- a/com.avaloq.tools.ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/checkcfg/validation/CheckCfgTest.xtend
+++ b/com.avaloq.tools.ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/checkcfg/validation/CheckCfgTest.xtend
@@ -15,10 +15,10 @@ import com.avaloq.tools.ddk.checkcfg.checkcfg.CheckConfiguration
 import com.avaloq.tools.ddk.checkcfg.checkcfg.CheckcfgPackage
 import com.google.inject.Inject
 import junit.framework.TestCase
-import org.eclipse.xtext.junit4.InjectWith
-import org.eclipse.xtext.junit4.XtextRunner
-import org.eclipse.xtext.junit4.util.ParseHelper
-import org.eclipse.xtext.junit4.validation.ValidationTestHelper
+import org.eclipse.xtext.testing.InjectWith
+import org.eclipse.xtext.testing.XtextRunner
+import org.eclipse.xtext.testing.util.ParseHelper
+import org.eclipse.xtext.testing.validation.ValidationTestHelper
 import org.junit.Test
 import org.junit.runner.RunWith
 
diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/checkcfg/validation/CheckCfgValidationTest.java b/com.avaloq.tools.ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/checkcfg/validation/CheckCfgValidationTest.java
index 65afea1d8..57ba3b359 100644
--- a/com.avaloq.tools.ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/checkcfg/validation/CheckCfgValidationTest.java
+++ b/com.avaloq.tools.ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/checkcfg/validation/CheckCfgValidationTest.java
@@ -10,10 +10,10 @@
  *******************************************************************************/
 package com.avaloq.tools.ddk.checkcfg.validation;
 
-import org.eclipse.xtext.junit4.InjectWith;
-import org.eclipse.xtext.junit4.XtextRunner;
-import org.eclipse.xtext.junit4.util.ParseHelper;
-import org.eclipse.xtext.junit4.validation.ValidationTestHelper;
+import org.eclipse.xtext.testing.InjectWith;
+import org.eclipse.xtext.testing.XtextRunner;
+import org.eclipse.xtext.testing.util.ParseHelper;
+import org.eclipse.xtext.testing.validation.ValidationTestHelper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
diff --git a/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF
index 12c0f6d24..53bd701fe 100644
--- a/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF
@@ -8,6 +8,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
+ org.eclipse.xtext.testing,
  org.hamcrest,
  org.junit,
  org.mockito,
diff --git a/com.avaloq.tools.ddk.test.core/src/com/avaloq/tools/ddk/test/core/junit/runners/ClassRunner.java b/com.avaloq.tools.ddk.test.core/src/com/avaloq/tools/ddk/test/core/junit/runners/ClassRunner.java
index 6652aa2b0..1a614b0b7 100644
--- a/com.avaloq.tools.ddk.test.core/src/com/avaloq/tools/ddk/test/core/junit/runners/ClassRunner.java
+++ b/com.avaloq.tools.ddk.test.core/src/com/avaloq/tools/ddk/test/core/junit/runners/ClassRunner.java
@@ -18,7 +18,7 @@
 import java.util.List;
 
 import org.apache.log4j.Logger;
-import org.eclipse.xtext.junit4.XtextRunner;
+import org.eclipse.xtext.testing.XtextRunner;
 import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
diff --git a/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF
index e1f61d845..dba1b76fc 100644
--- a/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF
@@ -17,6 +17,7 @@ Require-Bundle: com.avaloq.tools.ddk.test.core,
  org.eclipse.swtbot.junit4_x,
  org.eclipse.swtbot.swt.finder,
  org.eclipse.swtbot.eclipse.gef.finder,
+ org.eclipse.xtext.testing,
  org.eclipse.ui;visibility:=reexport,
  org.hamcrest,
  org.junit,
diff --git a/com.avaloq.tools.ddk.xtext.generator.test/src/com/avaloq/tools/ddk/xtext/generator/xbase/test/FixedXbaseGeneratorFragmentTest.xtend b/com.avaloq.tools.ddk.xtext.generator.test/src/com/avaloq/tools/ddk/xtext/generator/xbase/test/FixedXbaseGeneratorFragmentTest.xtend
index 05755bcce..038493e34 100644
--- a/com.avaloq.tools.ddk.xtext.generator.test/src/com/avaloq/tools/ddk/xtext/generator/xbase/test/FixedXbaseGeneratorFragmentTest.xtend
+++ b/com.avaloq.tools.ddk.xtext.generator.test/src/com/avaloq/tools/ddk/xtext/generator/xbase/test/FixedXbaseGeneratorFragmentTest.xtend
@@ -26,7 +26,7 @@ import org.eclipse.xtext.ParserRule
 import org.eclipse.xtext.RuleCall
 import org.eclipse.xtext.TypeRef
 import org.eclipse.xtext.XtextPackage
-import org.eclipse.xtext.junit4.XtextRunner
+import org.eclipse.xtext.testing.XtextRunner
 import org.junit.Test
 import org.junit.runner.RunWith
 
diff --git a/com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF
index e9fa125ac..fefbf6496 100644
--- a/com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF
@@ -17,6 +17,8 @@ Require-Bundle: com.avaloq.tools.ddk.xtext,
  org.eclipse.ui.ide,
  org.eclipse.xtend.lib,
  org.eclipse.xtext.junit4;visibility:=reexport,
+ org.eclipse.xtext.testing;visibility:=reexport,
+ org.eclipse.xtext.ui.testing;visibility:=reexport,
  org.eclipse.xtext.ui,
  org.eclipse.xtext.xbase,
  org.eclipse.xtext.xbase.lib;visibility:=reexport,
diff --git a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/AbstractXtextTestUtil.java b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/AbstractXtextTestUtil.java
index 2c9e8e4bc..0d8136ffc 100644
--- a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/AbstractXtextTestUtil.java
+++ b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/AbstractXtextTestUtil.java
@@ -31,7 +31,6 @@
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.intro.IIntroPart;
 import org.eclipse.xtext.diagnostics.AbstractDiagnostic;
-import org.eclipse.xtext.junit4.util.ResourceLoadHelper;
 import org.eclipse.xtext.nodemodel.ICompositeNode;
 import org.eclipse.xtext.nodemodel.ILeafNode;
 import org.eclipse.xtext.nodemodel.INode;
@@ -43,6 +42,7 @@
 import org.eclipse.xtext.ui.editor.GlobalURIEditorOpener;
 import org.eclipse.xtext.ui.editor.XtextEditor;
 import org.eclipse.xtext.ui.editor.model.IXtextDocument;
+import org.eclipse.xtext.ui.testing.util.ResourceLoadHelper;
 import org.eclipse.xtext.util.StringInputStream;
 import org.eclipse.xtext.validation.AbstractValidationDiagnostic;
 import org.eclipse.xtext.validation.FeatureBasedDiagnostic;
diff --git a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/AcfContentAssistProcessorTestBuilder.java b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/AcfContentAssistProcessorTestBuilder.java
index 436c37225..a2e2d9e28 100644
--- a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/AcfContentAssistProcessorTestBuilder.java
+++ b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/AcfContentAssistProcessorTestBuilder.java
@@ -22,14 +22,14 @@
 import org.eclipse.jface.text.contentassist.IContentAssistant;
 import org.eclipse.jface.text.source.ISourceViewer;
 import org.eclipse.swt.widgets.Shell;
-import org.eclipse.xtext.junit4.ui.ContentAssistProcessorTestBuilder;
-import org.eclipse.xtext.junit4.util.ResourceLoadHelper;
 import org.eclipse.xtext.resource.XtextResource;
 import org.eclipse.xtext.ui.editor.XtextSourceViewerConfiguration;
 import org.eclipse.xtext.ui.editor.contentassist.ConfigurableCompletionProposal;
 import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext;
 import org.eclipse.xtext.ui.editor.model.IXtextDocument;
 import org.eclipse.xtext.ui.editor.templates.XtextTemplateProposal;
+import org.eclipse.xtext.ui.testing.ContentAssistProcessorTestBuilder;
+import org.eclipse.xtext.ui.testing.util.ResourceLoadHelper;
 import org.eclipse.xtext.util.Pair;
 import org.eclipse.xtext.util.StringInputStream;
 import org.eclipse.xtext.util.Tuples;
@@ -48,7 +48,7 @@
  * {@link ConfigurableCompletionProposal}s.
  * </ul>
  */
-@SuppressWarnings({"PMD.SignatureDeclareThrowsException", "restriction"})
+@SuppressWarnings({"PMD.SignatureDeclareThrowsException"})
 public class AcfContentAssistProcessorTestBuilder extends ContentAssistProcessorTestBuilder {
   private final ResourceLoadHelper loadHelper;
 
diff --git a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/PluginTestProjectManager.java b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/PluginTestProjectManager.java
index 0eed738a3..73e631caa 100644
--- a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/PluginTestProjectManager.java
+++ b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/PluginTestProjectManager.java
@@ -26,9 +26,9 @@
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.xtext.junit4.ui.util.IResourcesSetupUtil;
-import org.eclipse.xtext.junit4.ui.util.JavaProjectSetupUtil;
 import org.eclipse.xtext.ui.XtextProjectHelper;
+import org.eclipse.xtext.ui.testing.util.IResourcesSetupUtil;
+import org.eclipse.xtext.ui.testing.util.JavaProjectSetupUtil;
 import org.eclipse.xtext.ui.util.IProjectFactoryContributor;
 import org.eclipse.xtext.ui.util.PluginProjectFactory;
 import org.junit.Assert;
@@ -39,7 +39,6 @@
 /**
  * The Test Project Manager for Plugins.
  */
-@SuppressWarnings("restriction")
 public class PluginTestProjectManager extends XtextTestProjectManager {
   private static final Logger LOGGER = Logger.getLogger(PluginTestProjectManager.class);
 
diff --git a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/XtextTestProjectManager.java b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/XtextTestProjectManager.java
index 547e8c6c3..85c2b7380 100644
--- a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/XtextTestProjectManager.java
+++ b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/XtextTestProjectManager.java
@@ -24,8 +24,8 @@
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.common.util.WrappedException;
 import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.xtext.junit4.ui.util.IResourcesSetupUtil;
 import org.eclipse.xtext.ui.XtextProjectHelper;
+import org.eclipse.xtext.ui.testing.util.IResourcesSetupUtil;
 
 import com.google.common.collect.Maps;
 
@@ -33,7 +33,6 @@
 /**
  * Simple Test project manager for SDK tests.
  */
-@SuppressWarnings("restriction")
 public class XtextTestProjectManager implements ITestProjectManager {
   protected static final String TEST_PROJECT_NAME = "TEST";
   private final Map<String, TestSource> testSources = Maps.newHashMap();
@@ -75,7 +74,7 @@ public void teardown() {
   /** {@inheritDoc} */
   @Override
   public void build() {
-    IResourcesSetupUtil.waitForAutoBuild();
+    IResourcesSetupUtil.reallyWaitForAutoBuild();
   }
 
   /** {@inheritDoc} */
@@ -161,4 +160,3 @@ public URI createPlatformUri(final String encodedFileName) {
   }
 
 }
-
diff --git a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/generator/AbstractGeneratorTest.java b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/generator/AbstractGeneratorTest.java
index e1da29813..d049fd40d 100644
--- a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/generator/AbstractGeneratorTest.java
+++ b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/generator/AbstractGeneratorTest.java
@@ -37,10 +37,10 @@
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.pde.core.project.IBundleProjectDescription;
 import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.xtext.junit4.ui.util.IResourcesSetupUtil;
-import org.eclipse.xtext.junit4.ui.util.JavaProjectSetupUtil;
 import org.eclipse.xtext.resource.FileExtensionProvider;
 import org.eclipse.xtext.ui.XtextProjectHelper;
+import org.eclipse.xtext.ui.testing.util.IResourcesSetupUtil;
+import org.eclipse.xtext.ui.testing.util.JavaProjectSetupUtil;
 import org.eclipse.xtext.ui.util.PluginProjectFactory;
 import org.junit.AfterClass;
 import org.junit.Assert;
@@ -72,14 +72,14 @@ public abstract class AbstractGeneratorTest {
 
   private final Set<IFile> files = newHashSet();
   protected static final List<String> REQUIRED_BUNDLES = newArrayList(//
-  "org.eclipse.xtext.xbase.lib", //$NON-NLS-1$
-  "org.eclipse.xtend.lib", // //$NON-NLS-1$
-  "org.eclipse.emf.ecore", //$NON-NLS-1$
-  "org.eclipse.xtext", // //$NON-NLS-1$
-  "org.eclipse.osgi", //$NON-NLS-1$
-  "org.eclipse.xtend", //$NON-NLS-1$
-  "org.eclipse.core.runtime", //$NON-NLS-1$
-  "org.eclipse.xtext.xbase" //$NON-NLS-1$
+      "org.eclipse.xtext.xbase.lib", //$NON-NLS-1$
+      "org.eclipse.xtend.lib", // //$NON-NLS-1$
+      "org.eclipse.emf.ecore", //$NON-NLS-1$
+      "org.eclipse.xtext", // //$NON-NLS-1$
+      "org.eclipse.osgi", //$NON-NLS-1$
+      "org.eclipse.xtend", //$NON-NLS-1$
+      "org.eclipse.core.runtime", //$NON-NLS-1$
+      "org.eclipse.xtext.xbase" //$NON-NLS-1$
   );
 
   @Inject
diff --git a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/validation/ValidationHelper.java b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/validation/ValidationHelper.java
index ebde6c52a..cd74470c7 100644
--- a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/validation/ValidationHelper.java
+++ b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/validation/ValidationHelper.java
@@ -13,7 +13,7 @@
 import java.util.List;
 
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.xtext.junit4.validation.ValidationTestHelper;
+import org.eclipse.xtext.testing.validation.ValidationTestHelper;
 import org.eclipse.xtext.ui.editor.model.IXtextDocument;
 import org.eclipse.xtext.validation.CheckMode;
 import org.eclipse.xtext.validation.Issue;
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/FormatterTestLanguage.ecore b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/FormatterTestLanguage.ecore
index 478f23ecf..aebef6539 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/FormatterTestLanguage.ecore
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/FormatterTestLanguage.ecore
@@ -6,29 +6,29 @@
   <eClassifiers xsi:type="ecore:EClass" name="Line"/>
   <eClassifiers xsi:type="ecore:EClass" name="Decl" eSuperTypes="#//Line">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" unique="false" upperBound="-1"
-        eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" unique="false" upperBound="-1"
-        eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Assign" eSuperTypes="#//Line">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="var" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="op" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="var" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="op" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="val" unique="false" upperBound="-1"
-        eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EInt"/>
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Meth" eSuperTypes="#//Line">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="param" upperBound="-1"
         eType="#//Param" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Param">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" unique="false" upperBound="-1"
-        eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" unique="false" upperBound="-1"
-        eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Space" eSuperTypes="#//Line">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="val" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="val" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="TestLinewrap" eSuperTypes="#//Root">
     <eStructuralFeatures xsi:type="ecore:EReference" name="items" upperBound="-1"
@@ -43,24 +43,24 @@
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="items" upperBound="-1"
         eType="#//Line" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="semi" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="semi" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="TestColumn" eSuperTypes="#//Root">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="items" upperBound="-1"
         eType="#//Line" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="TestOffset" eSuperTypes="#//Root">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="first" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="second" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="first" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="second" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="TestRightPadding" eSuperTypes="#//Root">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="p1" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="p2" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="p1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="p2" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="FqnObj" eSuperTypes="#//Line">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="FqnRef" eSuperTypes="#//Line">
     <eStructuralFeatures xsi:type="ecore:EReference" name="ref" eType="#//FqnObj"/>
@@ -79,13 +79,13 @@
         containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="SuppressedHiddenSub">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="idval" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="idval" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="SuppressedHiddenSubSub" eSuperTypes="#//SuppressedHiddenSub"/>
   <eClassifiers xsi:type="ecore:EClass" name="SuppressedHiddenSubID" eSuperTypes="#//SuppressedHiddenSub"/>
   <eClassifiers xsi:type="ecore:EClass" name="Datatypes" eSuperTypes="#//Line">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="val1" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="val2" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="val3" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="val1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="val2" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="val3" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
 </ecore:EPackage>
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/FormatterTestLanguage.genmodel b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/FormatterTestLanguage.genmodel
index 659f7372e..66c975bbd 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/FormatterTestLanguage.genmodel
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/FormatterTestLanguage.genmodel
@@ -5,7 +5,7 @@
     forceOverwrite="true" modelName="FormatterTestLanguage" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="6.0"
     copyrightFields="false" editPluginID="com.avaloq.tools.ddk.xtext.test.edit" editorPluginID="com.avaloq.tools.ddk.xtext.test.editor"
-    runtimeVersion="2.12" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+    runtimeVersion="2.12">
   <genPackages prefix="FormatterTestLanguage" basePackage="com.avaloq.tools.ddk.xtext.formatter"
       disposableProviderFactory="true" ecorePackage="FormatterTestLanguage.ecore#/">
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="FormatterTestLanguage.ecore#//Enum1">
diff --git a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/FormatterTestLanguagePackageImpl.java b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/FormatterTestLanguagePackageImpl.java
index d191856fd..fe2c03550 100644
--- a/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/FormatterTestLanguagePackageImpl.java
+++ b/com.avaloq.tools.ddk.xtext.test/src-gen/com/avaloq/tools/ddk/xtext/formatter/formatterTestLanguage/impl/FormatterTestLanguagePackageImpl.java
@@ -32,7 +32,6 @@
 import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
 
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 
@@ -246,9 +245,6 @@ public static FormatterTestLanguagePackage init()
 
     isInited = true;
 
-    // Initialize simple dependencies
-    EcorePackage.eINSTANCE.eClass();
-
     // Create package meta-data objects
     theFormatterTestLanguagePackage.createPackageContents();
 
@@ -914,9 +910,6 @@ public void initializePackageContents()
     setNsPrefix(eNS_PREFIX);
     setNsURI(eNS_URI);
 
-    // Obtain other dependent packages
-    EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-
     // Create type parameters
 
     // Set bounds for type parameters
@@ -946,24 +939,24 @@ public void initializePackageContents()
     initEClass(lineEClass, Line.class, "Line", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
     initEClass(declEClass, Decl.class, "Decl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getDecl_Type(), theEcorePackage.getEString(), "type", null, 0, -1, Decl.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getDecl_Name(), theEcorePackage.getEString(), "name", null, 0, -1, Decl.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getDecl_Type(), ecorePackage.getEString(), "type", null, 0, -1, Decl.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getDecl_Name(), ecorePackage.getEString(), "name", null, 0, -1, Decl.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(assignEClass, Assign.class, "Assign", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getAssign_Var(), theEcorePackage.getEString(), "var", null, 0, 1, Assign.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getAssign_Op(), theEcorePackage.getEString(), "op", null, 0, 1, Assign.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getAssign_Val(), theEcorePackage.getEInt(), "val", null, 0, -1, Assign.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getAssign_Var(), ecorePackage.getEString(), "var", null, 0, 1, Assign.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getAssign_Op(), ecorePackage.getEString(), "op", null, 0, 1, Assign.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getAssign_Val(), ecorePackage.getEInt(), "val", null, 0, -1, Assign.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(methEClass, Meth.class, "Meth", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getMeth_Name(), theEcorePackage.getEString(), "name", null, 0, 1, Meth.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getMeth_Name(), ecorePackage.getEString(), "name", null, 0, 1, Meth.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getMeth_Param(), this.getParam(), null, "param", null, 0, -1, Meth.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(paramEClass, Param.class, "Param", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getParam_Name(), theEcorePackage.getEString(), "name", null, 0, -1, Param.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getParam_Type(), theEcorePackage.getEString(), "type", null, 0, -1, Param.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getParam_Name(), ecorePackage.getEString(), "name", null, 0, -1, Param.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getParam_Type(), ecorePackage.getEString(), "type", null, 0, -1, Param.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(spaceEClass, Space.class, "Space", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getSpace_Val(), theEcorePackage.getEString(), "val", null, 0, 1, Space.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getSpace_Val(), ecorePackage.getEString(), "val", null, 0, 1, Space.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(testLinewrapEClass, TestLinewrap.class, "TestLinewrap", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEReference(getTestLinewrap_Items(), this.getLine(), null, "items", null, 0, -1, TestLinewrap.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -974,23 +967,23 @@ public void initializePackageContents()
     initEClass(testIndentationEClass, TestIndentation.class, "TestIndentation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEReference(getTestIndentation_Sub(), this.getTestIndentation(), null, "sub", null, 0, -1, TestIndentation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getTestIndentation_Items(), this.getLine(), null, "items", null, 0, -1, TestIndentation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getTestIndentation_Semi(), theEcorePackage.getEBoolean(), "semi", null, 0, 1, TestIndentation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getTestIndentation_Semi(), ecorePackage.getEBoolean(), "semi", null, 0, 1, TestIndentation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(testColumnEClass, TestColumn.class, "TestColumn", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getTestColumn_Name(), theEcorePackage.getEString(), "name", null, 0, 1, TestColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getTestColumn_Name(), ecorePackage.getEString(), "name", null, 0, 1, TestColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getTestColumn_Items(), this.getLine(), null, "items", null, 0, -1, TestColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(testOffsetEClass, TestOffset.class, "TestOffset", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getTestOffset_Value(), theEcorePackage.getEString(), "value", null, 0, 1, TestOffset.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getTestOffset_First(), theEcorePackage.getEString(), "first", null, 0, 1, TestOffset.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getTestOffset_Second(), theEcorePackage.getEString(), "second", null, 0, 1, TestOffset.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getTestOffset_Value(), ecorePackage.getEString(), "value", null, 0, 1, TestOffset.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getTestOffset_First(), ecorePackage.getEString(), "first", null, 0, 1, TestOffset.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getTestOffset_Second(), ecorePackage.getEString(), "second", null, 0, 1, TestOffset.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(testRightPaddingEClass, TestRightPadding.class, "TestRightPadding", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getTestRightPadding_P1(), theEcorePackage.getEString(), "p1", null, 0, 1, TestRightPadding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getTestRightPadding_P2(), theEcorePackage.getEString(), "p2", null, 0, 1, TestRightPadding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getTestRightPadding_P1(), ecorePackage.getEString(), "p1", null, 0, 1, TestRightPadding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getTestRightPadding_P2(), ecorePackage.getEString(), "p2", null, 0, 1, TestRightPadding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(fqnObjEClass, FqnObj.class, "FqnObj", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getFqnObj_Name(), theEcorePackage.getEString(), "name", null, 0, 1, FqnObj.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getFqnObj_Name(), ecorePackage.getEString(), "name", null, 0, 1, FqnObj.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(fqnRefEClass, FqnRef.class, "FqnRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEReference(getFqnRef_Ref(), this.getFqnObj(), null, "ref", null, 0, 1, FqnRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -1002,16 +995,16 @@ public void initializePackageContents()
     initEReference(getSuppressedHidden_Vals(), this.getSuppressedHiddenSub(), null, "vals", null, 0, -1, SuppressedHidden.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(suppressedHiddenSubEClass, SuppressedHiddenSub.class, "SuppressedHiddenSub", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getSuppressedHiddenSub_Idval(), theEcorePackage.getEString(), "idval", null, 0, 1, SuppressedHiddenSub.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getSuppressedHiddenSub_Idval(), ecorePackage.getEString(), "idval", null, 0, 1, SuppressedHiddenSub.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(suppressedHiddenSubSubEClass, SuppressedHiddenSubSub.class, "SuppressedHiddenSubSub", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
     initEClass(suppressedHiddenSubIDEClass, SuppressedHiddenSubID.class, "SuppressedHiddenSubID", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
     initEClass(datatypesEClass, Datatypes.class, "Datatypes", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getDatatypes_Val1(), theEcorePackage.getEString(), "val1", null, 0, 1, Datatypes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getDatatypes_Val2(), theEcorePackage.getEString(), "val2", null, 0, 1, Datatypes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getDatatypes_Val3(), theEcorePackage.getEString(), "val3", null, 0, 1, Datatypes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getDatatypes_Val1(), ecorePackage.getEString(), "val1", null, 0, 1, Datatypes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getDatatypes_Val2(), ecorePackage.getEString(), "val2", null, 0, 1, Datatypes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getDatatypes_Val3(), ecorePackage.getEString(), "val3", null, 0, 1, Datatypes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     // Initialize enums and add enum literals
     initEEnum(enum1EEnum, Enum1.class, "Enum1");
diff --git a/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/builder/XtextBuildTriggerTest.java b/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/builder/XtextBuildTriggerTest.java
index 67b9d6329..4659043d0 100644
--- a/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/builder/XtextBuildTriggerTest.java
+++ b/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/builder/XtextBuildTriggerTest.java
@@ -76,4 +76,3 @@ public void testTriggerRespectsAutoBuilding() {
     verify(scheduler).scheduleBuildIfNecessary(eq(Arrays.asList(projects)), Matchers.<IBuildFlag[]> anyVararg());
   }
 }
-
diff --git a/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF
index dc0505576..fbecf981b 100644
--- a/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF
@@ -7,6 +7,7 @@ Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.xtext.ui,
  org.eclipse.xtext.xbase.lib,
+ org.eclipse.xtext.testing,
  org.junit,
  org.mockito,
  com.avaloq.tools.ddk.xtext.ui,
diff --git a/com.avaloq.tools.ddk.xtext.valid.generator/src/com/avaloq/tools/ddk/xtext/valid/generator/ValidatorTests.xpt b/com.avaloq.tools.ddk.xtext.valid.generator/src/com/avaloq/tools/ddk/xtext/valid/generator/ValidatorTests.xpt
index 70bec18c8..b1ad61a3e 100644
--- a/com.avaloq.tools.ddk.xtext.valid.generator/src/com/avaloq/tools/ddk/xtext/valid/generator/ValidatorTests.xpt
+++ b/com.avaloq.tools.ddk.xtext.valid.generator/src/com/avaloq/tools/ddk/xtext/valid/generator/ValidatorTests.xpt
@@ -1,4 +1,4 @@
-«REM»
+�REM�
 /*******************************************************************************
  * Copyright (c) 2016 Avaloq Evolution AG and others.
  * All rights reserved. This program and the accompanying materials
@@ -9,174 +9,174 @@
  * Contributors:
  *     Avaloq Evolution AG - initial API and implementation
  *******************************************************************************/
-«ENDREM»
+�ENDREM�
 
-«IMPORT org::eclipse::xtext»
-«IMPORT org::eclipse::emf::ecore»
+�IMPORT org::eclipse::xtext�
+�IMPORT org::eclipse::emf::ecore�
 
-«IMPORT com::avaloq::tools::ddk::xtext::valid::valid»
+�IMPORT com::avaloq::tools::ddk::xtext::valid::valid�
 
-«EXTENSION org::eclipse::xtext::generator::Naming»
-«EXTENSION org::eclipse::xtext::GrammarUtil»
+�EXTENSION org::eclipse::xtext::generator::Naming�
+�EXTENSION org::eclipse::xtext::GrammarUtil�
 
-«EXTENSION com::avaloq::tools::ddk::xtext::valid::generator::ValidExtensions»
-«EXTENSION com::avaloq::tools::ddk::xtext::generator::util::GeneratorUtil»
+�EXTENSION com::avaloq::tools::ddk::xtext::valid::generator::ValidExtensions�
+�EXTENSION com::avaloq::tools::ddk::xtext::generator::util::GeneratorUtil�
 
-«DEFINE generate(ValidModel validModel) FOR Grammar»
-    «EXPAND generateTestValidator(validModel) FOR this»
-    «EXPAND generateUnitAbstractTestStubs(validModel) FOR this»
-    «EXPAND generateUnitTestStubs(validModel) FOR this»
-«ENDDEFINE»
+�DEFINE generate(ValidModel validModel) FOR Grammar�
+    �EXPAND generateTestValidator(validModel) FOR this�
+    �EXPAND generateUnitAbstractTestStubs(validModel) FOR this�
+    �EXPAND generateUnitTestStubs(validModel) FOR this�
+�ENDDEFINE�
 
-«DEFINE generateTestValidator(ValidModel validModel) FOR Grammar»
-«FILE (getValidationPackage(this)+".Abstract"+this.name.toSimpleName()+"ValidTest").asPath()+".java" SRC_GEN_TEST-»
+�DEFINE generateTestValidator(ValidModel validModel) FOR Grammar�
+�FILE (getValidationPackage(this)+".Abstract"+this.name.toSimpleName()+"ValidTest").asPath()+".java" SRC_GEN_TEST-�
 /*
  * Generated by com.avaloq.tools.ddk.xtext.valid.generator.ValidValidatorFragment
  */
-package «getJavaValidatorName("").toJavaPackage()»;
+package �getJavaValidatorName("").toJavaPackage()�;
 
-import org.eclipse.xtext.junit4.validation.ValidatorTester;
+import org.eclipse.xtext.testing.validation.ValidatorTester;
 
 import com.avaloq.tools.ddk.xtext.test.validation.AbstractValidValidationTest;
-import com.avaloq.tools.dsl.«this.name.toSimpleName().toLowerCase()».ui.test.internal.«this.name.toSimpleName()»TestUtil;
+import com.avaloq.tools.dsl.�this.name.toSimpleName().toLowerCase()�.ui.test.internal.�this.name.toSimpleName()�TestUtil;
 import com.google.inject.Injector;
 
 
 /**
- * The Class Abstract«this.name.toSimpleName()»ValidTest provides validate methods for «getJavaValidatorName("").toSimpleName()» testers.
+ * The Class Abstract�this.name.toSimpleName()�ValidTest provides validate methods for �getJavaValidatorName("").toSimpleName()� testers.
  */
-public class Abstract«this.name.toSimpleName()»ValidTest extends AbstractValidValidationTest {
+public class Abstract�this.name.toSimpleName()�ValidTest extends AbstractValidValidationTest {
 
   /** The tester. */
-  private ValidatorTester<«getJavaValidatorName("").toSimpleName()»> tester;
+  private ValidatorTester<�getJavaValidatorName("").toSimpleName()�> tester;
 
   @Override
   protected ValidatorTester<?> getTester() {
     if (tester == null) {
-      «this.name.toSimpleName()»TestUtil testUtil = getXtextTestUtil();
-      tester = new ValidatorTester<«getJavaValidatorName("").toSimpleName()»>(testUtil.get(«getJavaValidatorName("").toSimpleName()».class), testUtil.get(Injector.class));
+      �this.name.toSimpleName()�TestUtil testUtil = getXtextTestUtil();
+      tester = new ValidatorTester<�getJavaValidatorName("").toSimpleName()�>(testUtil.get(�getJavaValidatorName("").toSimpleName()�.class), testUtil.get(Injector.class));
     }
     return tester;
   }
 
   @Override
-  protected «this.name.toSimpleName()»TestUtil getXtextTestUtil() {
-    return «this.name.toSimpleName()»TestUtil.getInstance();
+  protected �this.name.toSimpleName()�TestUtil getXtextTestUtil() {
+    return �this.name.toSimpleName()�TestUtil.getInstance();
   }
 
 }
-«ENDFILE -»
+�ENDFILE -�
 
 
-«FILE (getValidationPackage(this)+"."+this.name.toSimpleName()+"ValidTest").asPath()+".java" SRC_TEST-»
+�FILE (getValidationPackage(this)+"."+this.name.toSimpleName()+"ValidTest").asPath()+".java" SRC_TEST-�
 /*
  * Generated by com.avaloq.tools.ddk.xtext.valid.generator.ValidValidatorFragment
  */
-package «getJavaValidatorName("").toJavaPackage()»;
+package �getJavaValidatorName("").toJavaPackage()�;
 
-import com.avaloq.tools.ddk.acf.«this.name.toSimpleName().toLowerCase()».«this.name.toSimpleName().toLowerCase()».«this.name.toSimpleName()»Source;
+import com.avaloq.tools.ddk.acf.�this.name.toSimpleName().toLowerCase()�.�this.name.toSimpleName().toLowerCase()�.�this.name.toSimpleName()�Source;
 
 
 /**
- * The Class «this.name.toSimpleName()»ValidTest can be used to program methods available for «getJavaValidatorName("").toSimpleName()» testers.
+ * The Class �this.name.toSimpleName()�ValidTest can be used to program methods available for �getJavaValidatorName("").toSimpleName()� testers.
  */
-public class «this.name.toSimpleName()»ValidTest extends Abstract«this.name.toSimpleName()»ValidTest {
+public class �this.name.toSimpleName()�ValidTest extends Abstract�this.name.toSimpleName()�ValidTest {
 
   /**
-   * Convenience method which assumes the main model to be of type «this.name.toSimpleName()»Source.
+   * Convenience method which assumes the main model to be of type �this.name.toSimpleName()�Source.
    * {@inheritDoc}
    */
   @Override
-  protected «this.name.toSimpleName()»Source getSemanticModel() {
-    return («this.name.toSimpleName()»Source) super.getSemanticModel();
+  protected �this.name.toSimpleName()�Source getSemanticModel() {
+    return (�this.name.toSimpleName()�Source) super.getSemanticModel();
   }
 }
-«ENDFILE -»
+�ENDFILE -�
 
-«ENDDEFINE»
+�ENDDEFINE�
 
 
-«DEFINE generateUnitAbstractTestStubs(ValidModel validModel) FOR Grammar»
-«FOREACH validModel.categories AS category -»
+�DEFINE generateUnitAbstractTestStubs(ValidModel validModel) FOR Grammar�
+�FOREACH validModel.categories AS category -�
 
-«FILE (getValidationPackage(this)+".Abstract"+category.name.toFirstUpper()+"ValidationTest").asPath()+".java" SRC_GEN_TEST-»
+�FILE (getValidationPackage(this)+".Abstract"+category.name.toFirstUpper()+"ValidationTest").asPath()+".java" SRC_GEN_TEST-�
 /*
  * Generated by com.avaloq.tools.ddk.xtext.valid.generator.ValidValidatorFragment
  */
-package «getJavaValidatorName("").toJavaPackage()»;
+package �getJavaValidatorName("").toJavaPackage()�;
 
 /**
- * The abstract class Abstract«category.name.toFirstUpper()»ValidationTest.
+ * The abstract class Abstract�category.name.toFirstUpper()�ValidationTest.
  */
-public abstract class Abstract«category.name.toFirstUpper()»ValidationTest extends «this.getName().toSimpleName()»ValidTest {
-«EXPAND generateAbstractRuleTest FOREACH category.rules.typeSelect(NativeRule) -»
+public abstract class Abstract�category.name.toFirstUpper()�ValidationTest extends �this.getName().toSimpleName()�ValidTest {
+�EXPAND generateAbstractRuleTest FOREACH category.rules.typeSelect(NativeRule) -�
 }
-«ENDFILE»
+�ENDFILE�
 
-«ENDFOREACH-»
-«ENDDEFINE»
+�ENDFOREACH-�
+�ENDDEFINE�
 
-«DEFINE generateRuleTest FOR Rule»
-    // Unknown rule type for «this.name»
-«ENDDEFINE»
+�DEFINE generateRuleTest FOR Rule�
+    // Unknown rule type for �this.name�
+�ENDDEFINE�
 
-«DEFINE generateAbstractRuleTest FOR NativeRule -»
-«FOREACH this.contexts AS context»
+�DEFINE generateAbstractRuleTest FOR NativeRule -�
+�FOREACH this.contexts AS context�
     /**
-     * Test method for native «context.name()».<BR>
-     * Label: «context.rule().label»<BR>
-     * Description: «context.rule().description»<BR>
-     * Non-localized error message: "«context.rule().message»"<BR>
+     * Test method for native �context.name()�.<BR>
+     * Label: �context.rule().label�<BR>
+     * Description: �context.rule().description�<BR>
+     * Non-localized error message: "�context.rule().message�"<BR>
      * Source:<BR>
-     *  rule: «context.rule().location()»<BR>
-     *  context: «context.location()»<BR>
-     *  contextType: «context.contextType.name.toSimpleName()»<BR>
+     *  rule: �context.rule().location()�<BR>
+     *  context: �context.location()�<BR>
+     *  contextType: �context.contextType.name.toSimpleName()�<BR>
      */
-    public abstract void test«context.nativeContextTestName()»();
-«ENDFOREACH-»
-«ENDDEFINE»
+    public abstract void test�context.nativeContextTestName()�();
+�ENDFOREACH-�
+�ENDDEFINE�
 
-«DEFINE generateUnitTestStubs(ValidModel validModel) FOR Grammar»
-«FOREACH validModel.categories AS category -»
+�DEFINE generateUnitTestStubs(ValidModel validModel) FOR Grammar�
+�FOREACH validModel.categories AS category -�
 
-«FILE (getValidationPackage(this)+ "." + category.name.toFirstUpper()+"ValidationTest").asPath()+".java" SRC_TEST-»
-package «getJavaValidatorName("").toJavaPackage()»;
+�FILE (getValidationPackage(this)+ "." + category.name.toFirstUpper()+"ValidationTest").asPath()+".java" SRC_TEST-�
+package �getJavaValidatorName("").toJavaPackage()�;
 
 import static org.junit.Assert.fail;
 
 import org.junit.Test;
 
 /**
- * Tests validation of «this.name.toSimpleName()» sources for category <em>«category.name.toFirstUpper()»</em>.
+ * Tests validation of �this.name.toSimpleName()� sources for category <em>�category.name.toFirstUpper()�</em>.
  */
-public class «category.name.toFirstUpper()»ValidationTest extends Abstract«category.name.toFirstUpper()»ValidationTest {
+public class �category.name.toFirstUpper()�ValidationTest extends Abstract�category.name.toFirstUpper()�ValidationTest {
 
   //TODO add additionally required sources by overriding getRequiredSourceFileNames()
 
-«EXPAND generateRuleTest FOREACH category.rules.typeSelect(NativeRule) -»
+�EXPAND generateRuleTest FOREACH category.rules.typeSelect(NativeRule) -�
 }
-«ENDFILE»
+�ENDFILE�
 
-«ENDFOREACH-»
-«ENDDEFINE»
+�ENDFOREACH-�
+�ENDDEFINE�
 
-«DEFINE generateRuleTest FOR NativeRule -»
-«FOREACH this.contexts AS context»
+�DEFINE generateRuleTest FOR NativeRule -�
+�FOREACH this.contexts AS context�
   /**
-   * Test method for native «context.name()».<BR>
-   * Label: «context.rule().label»<BR>
-   * Description: «context.rule().description»<BR>
-   * Non-localized error message: "«context.rule().message»"<BR>
+   * Test method for native �context.name()�.<BR>
+   * Label: �context.rule().label�<BR>
+   * Description: �context.rule().description�<BR>
+   * Non-localized error message: "�context.rule().message�"<BR>
    * Source:<BR>
-   *  rule: «context.rule().location()»<BR>
-   *  context: «context.location()»<BR>
-   *  contextType: «context.contextType.name.toSimpleName()»<BR>
+   *  rule: �context.rule().location()�<BR>
+   *  context: �context.location()�<BR>
+   *  contextType: �context.contextType.name.toSimpleName()�<BR>
    */
   @Override
   @Test
-  public void test«context.nativeContextTestName()»() {
-    // TODO: create test for «context.nativeContextTestName()»
-    fail("Test «context.nativeContextTestName()» not yet implemented");
+  public void test�context.nativeContextTestName()�() {
+    // TODO: create test for �context.nativeContextTestName()�
+    fail("Test �context.nativeContextTestName()� not yet implemented");
   }
-«ENDFOREACH-»
-«ENDDEFINE»
+�ENDFOREACH-�
+�ENDDEFINE�
diff --git a/com.avaloq.tools.ddk.xtextspy.test/src/com/avaloq/tools/ddk/xtextspy/test/EClassTypeContentProviderTest.java b/com.avaloq.tools.ddk.xtextspy.test/src/com/avaloq/tools/ddk/xtextspy/test/EClassTypeContentProviderTest.java
index c92f6560c..bc6d31d7a 100644
--- a/com.avaloq.tools.ddk.xtextspy.test/src/com/avaloq/tools/ddk/xtextspy/test/EClassTypeContentProviderTest.java
+++ b/com.avaloq.tools.ddk.xtextspy.test/src/com/avaloq/tools/ddk/xtextspy/test/EClassTypeContentProviderTest.java
@@ -102,4 +102,3 @@ public void getElements() {
   }
 
 }
-

From b67fd28e7ed187148198321a0925dd723fa663a9 Mon Sep 17 00:00:00 2001
From: Graham Pearson <Graham.Pearson@avaloq.com>
Date: Fri, 17 Aug 2018 16:21:54 +0100
Subject: [PATCH 48/56] Update sequence number of target. Also commit
 autogenerated changes to an autogenerated file.

---
 .../validation/LibraryChecksCheckImpl.java    | 35 +++++++------------
 ddk-target/ddk.target                         |  2 +-
 2 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/validation/LibraryChecksCheckImpl.java b/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/validation/LibraryChecksCheckImpl.java
index 9c50d3d74..10124d3af 100644
--- a/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/validation/LibraryChecksCheckImpl.java
+++ b/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/validation/LibraryChecksCheckImpl.java
@@ -79,14 +79,7 @@ public void cacheDoesntWorkGreeting(final Greeting it) {
       Boolean _boolean = new Boolean(true);
       LibraryChecksCheckImpl.this.cache.<Boolean>put(it, key, _boolean);
       final Boolean value = LibraryChecksCheckImpl.this.cache.<Boolean>get(it, key);
-      boolean _or = false;
-      boolean _equals = Objects.equal(value, null);
-      if (_equals) {
-        _or = true;
-      } else {
-        _or = (!(value).booleanValue());
-      }
-      if (_or) {
+      if ((Objects.equal(value, null) || (!(value).booleanValue()))) {
         // Issue diagnostic
         libraryChecksCatalog.accept(getMessageAcceptor(), //
           it, // context EObject
@@ -172,16 +165,14 @@ public void runGreeting(final Greeting it) {
       } else {
         while ((i < names.size())) {
           {
-            String _get = expectedNames.get(i);
-            String _get_1 = names.get(i);
-            boolean _equals_1 = _get.equals(_get_1);
+            boolean _equals_1 = expectedNames.get(i).equals(names.get(i));
             boolean _not_1 = (!_equals_1);
             if (_not_1) {
-              String _get_2 = expectedNames.get(i);
-              String _plus_1 = ("String mismatch in list, expected \"" + _get_2);
+              String _get = expectedNames.get(i);
+              String _plus_1 = ("String mismatch in list, expected \"" + _get);
               String _plus_2 = (_plus_1 + "\" but got \"");
-              String _get_3 = names.get(i);
-              String _plus_3 = (_plus_2 + _get_3);
+              String _get_1 = names.get(i);
+              String _plus_3 = (_plus_2 + _get_1);
               String _plus_4 = (_plus_3 + "\"");
               // Issue diagnostic
               libraryChecksCatalog.accept(getMessageAcceptor(), //
@@ -217,17 +208,15 @@ public void runGreeting(final Greeting it) {
       i = 0;
       while ((i < INTS.size())) {
         {
-          Integer _get = expectedInts.get(i);
-          int _intValue = _get.intValue();
-          Integer _get_1 = INTS.get(i);
-          int _intValue_1 = _get_1.intValue();
+          int _intValue = expectedInts.get(i).intValue();
+          int _intValue_1 = INTS.get(i).intValue();
           boolean _notEquals_2 = (_intValue != _intValue_1);
           if (_notEquals_2) {
-            Integer _get_2 = expectedInts.get(i);
-            String _plus_2 = ((("Integer mismatch at index " + Integer.valueOf(i)) + ":") + _get_2);
+            Integer _get = expectedInts.get(i);
+            String _plus_2 = ((("Integer mismatch at index " + Integer.valueOf(i)) + ":") + _get);
             String _plus_3 = (_plus_2 + " != ");
-            Integer _get_3 = INTS.get(i);
-            String _plus_4 = (_plus_3 + _get_3);
+            Integer _get_1 = INTS.get(i);
+            String _plus_4 = (_plus_3 + _get_1);
             // Issue diagnostic
             libraryChecksCatalog.accept(getMessageAcceptor(), //
               it, // context EObject
diff --git a/ddk-target/ddk.target b/ddk-target/ddk.target
index 4902b84c0..7ccd6098f 100644
--- a/ddk-target/ddk.target
+++ b/ddk-target/ddk.target
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="DDK Target" sequenceNumber="8">
+<?pde version="3.8"?><target name="DDK Target" sequenceNumber="9">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>

From 45be0edb65da947fe37c02e67d9757a52cac4a13 Mon Sep 17 00:00:00 2001
From: Graham Pearson <Graham.Pearson@avaloq.com>
Date: Fri, 17 Aug 2018 17:30:49 +0100
Subject: [PATCH 49/56] Fix Checkstyle violations.

---
 .../check/TestLanguageInjectorProvider.java   |   6 +-
 .../ddk/check/CheckInjectorProvider.java      | 105 ++++++++++--------
 .../ddk/check/CheckUiInjectorProvider.java    |   3 +
 3 files changed, 65 insertions(+), 49 deletions(-)

diff --git a/com.avaloq.tools.ddk.check.test.runtime.tests/src/com/avaloq/tools/ddk/check/TestLanguageInjectorProvider.java b/com.avaloq.tools.ddk.check.test.runtime.tests/src/com/avaloq/tools/ddk/check/TestLanguageInjectorProvider.java
index d1823781a..acc7908f9 100644
--- a/com.avaloq.tools.ddk.check.test.runtime.tests/src/com/avaloq/tools/ddk/check/TestLanguageInjectorProvider.java
+++ b/com.avaloq.tools.ddk.check.test.runtime.tests/src/com/avaloq/tools/ddk/check/TestLanguageInjectorProvider.java
@@ -13,9 +13,9 @@
 
 public class TestLanguageInjectorProvider implements IInjectorProvider, IRegistryConfigurator {
 
-  protected GlobalStateMemento stateBeforeInjectorCreation;
-  protected GlobalStateMemento stateAfterInjectorCreation;
-  protected Injector injector;
+  private GlobalStateMemento stateBeforeInjectorCreation;
+  private GlobalStateMemento stateAfterInjectorCreation;
+  private Injector injector;
 
   static {
     GlobalRegistries.initializeDefaults();
diff --git a/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/CheckInjectorProvider.java b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/CheckInjectorProvider.java
index 6710c027a..05454ecc3 100644
--- a/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/CheckInjectorProvider.java
+++ b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/CheckInjectorProvider.java
@@ -3,63 +3,76 @@
  */
 package com.avaloq.tools.ddk.check;
 
-import com.google.inject.Guice;
-import com.google.inject.Injector;
 import org.eclipse.xtext.junit4.GlobalRegistries;
 import org.eclipse.xtext.junit4.GlobalRegistries.GlobalStateMemento;
 import org.eclipse.xtext.junit4.IInjectorProvider;
 import org.eclipse.xtext.junit4.IRegistryConfigurator;
 
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+
+
+/**
+ * Producer strategy for {@link Injector Injectors}.
+ */
 public class CheckInjectorProvider implements IInjectorProvider, IRegistryConfigurator {
 
-	protected GlobalStateMemento stateBeforeInjectorCreation;
-	protected GlobalStateMemento stateAfterInjectorCreation;
-	protected Injector injector;
+  private GlobalStateMemento stateBeforeInjectorCreation;
+  private GlobalStateMemento stateAfterInjectorCreation;
+  private Injector injector;
 
-	static {
-		GlobalRegistries.initializeDefaults();
-	}
+  static {
+    GlobalRegistries.initializeDefaults();
+  }
 
-	@Override
-	public Injector getInjector()
-	{
-		if (injector == null) {
-			stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
-			this.injector = internalCreateInjector();
-			stateAfterInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
-		}
-		return injector;
-	}
+  @Override
+  public Injector getInjector() {
+    if (injector == null) {
+      stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
+      this.injector = internalCreateInjector();
+      stateAfterInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
+    }
+    return injector;
+  }
 
-	protected Injector internalCreateInjector() {
-		return new CheckStandaloneSetup() {
-			@Override
-			public Injector createInjector() {
-				return Guice.createInjector(createRuntimeModule());
-			}
-		}.createInjectorAndDoEMFRegistration();
-	}
+  /**
+   * Create an {@link Injector}.
+   * 
+   * @return the {@link Injector}
+   */
+  protected Injector internalCreateInjector() {
+    return new CheckStandaloneSetup() {
+      @Override
+      public Injector createInjector() {
+        return Guice.createInjector(createRuntimeModule());
+      }
+    }.createInjectorAndDoEMFRegistration();
+  }
 
-	protected CheckRuntimeModule createRuntimeModule() {
-		// make it work also with Maven/Tycho and OSGI
-		// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=493672
-		return new CheckRuntimeModule() {
-			@Override
-			public ClassLoader bindClassLoaderToInstance() {
-				return CheckInjectorProvider.class
-						.getClassLoader();
-			}
-		};
-	}
+  /**
+   * Create a {@link CheckRuntimeModule}.
+   * 
+   * @return the {@link CheckRuntimeModule}
+   */
+  protected CheckRuntimeModule createRuntimeModule() {
+    // make it work also with Maven/Tycho and OSGI
+    // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=493672
+    return new CheckRuntimeModule() {
+      @Override
+      public ClassLoader bindClassLoaderToInstance() {
+        return CheckInjectorProvider.class.getClassLoader();
+      }
+    };
+  }
 
-	@Override
-	public void restoreRegistry() {
-		stateBeforeInjectorCreation.restoreGlobalState();
-	}
+  @Override
+  public void restoreRegistry() {
+    stateBeforeInjectorCreation.restoreGlobalState();
+  }
 
-	@Override
-	public void setupRegistry() {
-		getInjector();
-		stateAfterInjectorCreation.restoreGlobalState();
-	}
+  @Override
+  public void setupRegistry() {
+    getInjector();
+    stateAfterInjectorCreation.restoreGlobalState();
+  }
 }
diff --git a/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/CheckUiInjectorProvider.java b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/CheckUiInjectorProvider.java
index 5a339bd3a..16fda6ea5 100644
--- a/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/CheckUiInjectorProvider.java
+++ b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/CheckUiInjectorProvider.java
@@ -8,6 +8,9 @@
 import com.google.inject.Injector;
 
 
+/**
+ * Producer strategy for {@link Injector Injectors}.
+ */
 public class CheckUiInjectorProvider implements IInjectorProvider {
 
   @Override

From 00ce2688db52d6af33913b43ee402b3597f33353 Mon Sep 17 00:00:00 2001
From: Andrew Lamb <Andrew.Lamb@avaloq.com>
Date: Fri, 17 Aug 2018 17:53:29 +0100
Subject: [PATCH 50/56] Added try-catch to partial parsing helper so that we
 can fall back to fully reparse on errors.

---
 .../parser/FixedPartialParsingHelper.java     | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/parser/FixedPartialParsingHelper.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/parser/FixedPartialParsingHelper.java
index 352cecb5a..9f6e117ea 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/parser/FixedPartialParsingHelper.java
+++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/parser/FixedPartialParsingHelper.java
@@ -179,14 +179,19 @@ public IParseResult reparse(final IParser parser, final IParseResult previousPar
     } else {
       unloadSemanticObject(oldSemanticElement);
     }
-    if (oldCompositeNode != oldRootNode) {
-      nodeModelBuilder.replaceAndTransferLookAhead(oldCompositeNode, newParseResult.getRootNode());
-      ((ParseResult) newParseResult).setRootNode(oldRootNode);
-      StringBuilder builder = new StringBuilder(oldRootNode.getText());
-      replaceRegion.applyTo(builder);
-      nodeModelBuilder.setCompleteContent(oldRootNode, builder.toString());
-    }
-    return newParseResult;
+    try {
+      if (oldCompositeNode != oldRootNode) {
+        nodeModelBuilder.replaceAndTransferLookAhead(oldCompositeNode, newParseResult.getRootNode());
+        ((ParseResult) newParseResult).setRootNode(oldRootNode);
+        StringBuilder builder = new StringBuilder(oldRootNode.getText());
+        replaceRegion.applyTo(builder);
+        nodeModelBuilder.setCompleteContent(oldRootNode, builder.toString());
+      }
+      return newParseResult;
+    } catch (Exception exception) {
+      // on error fully reparse
+      return fullyReparse(parser, previousParseResult, replaceRegion);
+    }
   }
 
   private boolean isRangePartOfExceedingLookAhead(final CompositeNode node, final ReplaceRegion replaceRegion) {

From d8b9e97e8276f9a9ed0428b1deea991bee2200df Mon Sep 17 00:00:00 2001
From: Graham Pearson <Graham.Pearson@avaloq.com>
Date: Sat, 18 Aug 2018 00:20:22 +0100
Subject: [PATCH 51/56] Re-export org.eclipse.xtext.testing instead of .junit4

---
 com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF
index 53bd701fe..5ba90fc53 100644
--- a/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.core.runtime,
  com.google.guava,
  org.apache.commons.lang,
  org.eclipse.emf.common,
- org.eclipse.xtext.junit4;visibility:=reexport
+ org.eclipse.xtext.testing;visibility:=reexport
 Export-Package: com.avaloq.tools.ddk.test.core,
  com.avaloq.tools.ddk.test.core.data,
  com.avaloq.tools.ddk.test.core.junit.runners,

From f7386b956d3cf92ed3672d62ae3d80c370c3525d Mon Sep 17 00:00:00 2001
From: Graham Pearson <Graham.Pearson@avaloq.com>
Date: Sat, 18 Aug 2018 18:58:15 +0100
Subject: [PATCH 52/56] Fix lots of deprecation warnings.

---
 .../test/AbstractCheckGenerationTestCase.java |  2 +-
 .../check/core/test/ProjectBasedTests.xtend   |  6 +--
 ...ckRewritableImportSectionFactoryTest.xtend |  1 -
 .../AbstractCheckJavaValidator.java           | 25 +++++-----
 .../ddk/check/typing/CheckTypeComputer.xtend  | 10 ++--
 .../ddk/check/CheckInjectorProvider.java      | 12 ++---
 .../AbstractCheckContentAssistBugTest.java    |  4 +-
 .../tools/ddk/check/ui/CheckUiModule.java     |  3 +-
 .../CheckHighlightingCalculator.java          |  7 ++-
 .../AbstractCheckCfgJavaValidator.java        | 24 ++++-----
 .../generator/CheckCfgGenerator.xtend         |  8 +--
 .../SemanticHighlightingCalculator.java       | 12 +++--
 .../export/generator/ExportFragment.java      |  4 +-
 .../ExportedNamesProviderGenerator.xtend      |  7 ++-
 .../AbstractFormatJavaValidator.java          | 26 +++++-----
 .../format/generator/FormatGeneratorUtil.java |  2 +-
 .../naming/FormatScopeNameProvider.java       |  2 +-
 .../LanguageConstantsFragment.java            | 10 ++--
 .../scope/generator/ScopingFragment.java      | 14 +++---
 .../xtext/test/PluginTestProjectManager.java  | 34 ++++++-------
 .../test/generator/AbstractGeneratorTest.java |  2 +-
 .../WorkbenchMarkerResolutionGenerator.java   |  3 +-
 .../FixedHighlightingReconciler.java          | 49 +++++++++++++------
 .../generator/ValidValidatorFragment.java     | 35 +++++++------
 .../xtext/serializer/IndentingSerializer.java | 18 ++-----
 .../ReorderingHiddenTokenSequencer.java       |  2 +
 26 files changed, 169 insertions(+), 153 deletions(-)

diff --git a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/AbstractCheckGenerationTestCase.java b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/AbstractCheckGenerationTestCase.java
index 1ddf59cc2..94081d94b 100644
--- a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/AbstractCheckGenerationTestCase.java
+++ b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/AbstractCheckGenerationTestCase.java
@@ -119,7 +119,7 @@ public Map<String, Class<?>> generateAndCompile(final InputStream sourceStream)
       // own class loader, let eclipse do the work: create our test project and then get the resolved classpath entries from
       // that.
       IProject project = getOrCreatePluginProject();
-      IResourcesSetupUtil.waitForAutoBuild();
+      IResourcesSetupUtil.reallyWaitForAutoBuild();
       // enumerateContents(project);
       IJavaProject javaProject = JavaCore.create(project);
       javaCompiler.clearClassPath();
diff --git a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/ProjectBasedTests.xtend b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/ProjectBasedTests.xtend
index bc87290fa..deefbcb2e 100644
--- a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/ProjectBasedTests.xtend
+++ b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/ProjectBasedTests.xtend
@@ -28,7 +28,7 @@ import org.eclipse.xtext.ui.testing.util.IResourcesSetupUtil
 @RunWith(typeof(XtextRunner))
 class ProjectBasedTests extends AbstractCheckTestCase {
 
-  private boolean initialized;
+  boolean initialized;
 
   def List<String> getRequiredSourceFileNames() {
     // No file extension to prevent code generation in development workbench. Will get .check extension when copied into
@@ -36,7 +36,7 @@ class ProjectBasedTests extends AbstractCheckTestCase {
     Lists::newArrayList("bugdsl27/BugDsl27", "bugdsl281/BugDsl281")
   }
 
-  override def getFullFileName(String fileName) {
+  override getFullFileName(String fileName) {
     // Make sure it is put into the src folder even if the name contains a dash!
     return getSourceFolderPath() + getFileName(fileName);
   }
@@ -48,7 +48,7 @@ class ProjectBasedTests extends AbstractCheckTestCase {
       addSourcesToWorkspace(typeof(ProjectBasedTests), requiredSourceFileNames)
 
       // wait for build to finish, otherwise included catalog may not be resolvable
-      IResourcesSetupUtil::waitForAutoBuild
+      IResourcesSetupUtil.reallyWaitForAutoBuild
     }
   }
 
diff --git a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/imports/test/CheckRewritableImportSectionFactoryTest.xtend b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/imports/test/CheckRewritableImportSectionFactoryTest.xtend
index b0de23e77..79c707926 100644
--- a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/imports/test/CheckRewritableImportSectionFactoryTest.xtend
+++ b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/imports/test/CheckRewritableImportSectionFactoryTest.xtend
@@ -57,7 +57,6 @@ class CheckRewritableImportSectionFactoryTest extends AbstractCheckTestCase {
 
     // ASSERT
     assertNotNull("parse() should return an object", rewritableImportSection)
-    assertTrue("parse() should return a RewritableImportSection", rewritableImportSection instanceof RewritableImportSection)
     assertTrue("parse() should return a RewritableImportSection with sort=true", rewritableImportSection.sort)
   }
 
diff --git a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/validation/AbstractCheckJavaValidator.java b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/validation/AbstractCheckJavaValidator.java
index cbea866b7..76387b0b8 100644
--- a/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/validation/AbstractCheckJavaValidator.java
+++ b/com.avaloq.tools.ddk.check.core/src-gen/com/avaloq/tools/ddk/check/validation/AbstractCheckJavaValidator.java
@@ -2,23 +2,24 @@
  * generated by Xtext
  */
 package com.avaloq.tools.ddk.check.validation;
- 
+
 import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.emf.ecore.EPackage;
 
-public class AbstractCheckJavaValidator extends org.eclipse.xtext.xbase.annotations.validation.XbaseWithAnnotationsJavaValidator {
 
-	@Override
-	protected List<EPackage> getEPackages() {
-	    List<EPackage> result = new ArrayList<EPackage>();
-	    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.avaloq.com/tools/ddk/check/Check"));
-	    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/xtext/xbase/Xtype"));
-	    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/xtext/xbase/Xbase"));
-	    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/Xtext/Xbase/XAnnotations"));
-	    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/xtext/common/JavaVMTypes"));
-		return result;
-	}
+public class AbstractCheckJavaValidator extends org.eclipse.xtext.xbase.annotations.validation.XbaseWithAnnotationsValidator {
+
+  @Override
+  protected List<EPackage> getEPackages() {
+    List<EPackage> result = new ArrayList<EPackage>();
+    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.avaloq.com/tools/ddk/check/Check"));
+    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/xtext/xbase/Xtype"));
+    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/xtext/xbase/Xbase"));
+    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/Xtext/Xbase/XAnnotations"));
+    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/xtext/common/JavaVMTypes"));
+    return result;
+  }
 
 }
diff --git a/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/typing/CheckTypeComputer.xtend b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/typing/CheckTypeComputer.xtend
index 0f624c1db..0deb6d444 100644
--- a/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/typing/CheckTypeComputer.xtend
+++ b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/typing/CheckTypeComputer.xtend
@@ -23,9 +23,9 @@ class CheckTypeComputer extends XbaseWithAnnotationsTypeComputer {
 
   override computeTypes(XExpression expression, ITypeComputationState state) {
     if (expression instanceof XIssueExpression) {
-      _computeTypes(expression as XIssueExpression, state);
+      _computeTypes(expression, state);
     } else if (expression instanceof XGuardExpression) {
-      _computeTypes(expression as XGuardExpression, state);
+      _computeTypes(expression, state);
     } else if (expression.eContainer instanceof FormalParameter && expression instanceof XListLiteral && (expression as XListLiteral).elements.empty) {
       super.computeTypes(expression, state.withExpectation(state.referenceOwner.toLightweightTypeReference((expression.eContainer as FormalParameter).type)));
     } else {
@@ -34,13 +34,13 @@ class CheckTypeComputer extends XbaseWithAnnotationsTypeComputer {
   }
 
   protected def _computeTypes(XIssueExpression expression, ITypeComputationState state) {
-    if (expression.markerObject != null) {
+    if (expression.markerObject !== null) {
       state.withExpectation(getTypeForName(typeof(EObject), state)).computeTypes(expression.markerObject);
     }
-    if (expression.markerIndex != null) {
+    if (expression.markerIndex !== null) {
       state.withExpectation(getTypeForName(typeof(Integer), state)).computeTypes(expression.markerIndex);
     }
-    if (expression.message != null) {
+    if (expression.message !== null) {
       state.withExpectation(getTypeForName(typeof(String), state)).computeTypes(expression.message);
     }
     for (p : expression.messageParameters) {
diff --git a/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/CheckInjectorProvider.java b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/CheckInjectorProvider.java
index 05454ecc3..830f6c77f 100644
--- a/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/CheckInjectorProvider.java
+++ b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/CheckInjectorProvider.java
@@ -3,10 +3,10 @@
  */
 package com.avaloq.tools.ddk.check;
 
-import org.eclipse.xtext.junit4.GlobalRegistries;
-import org.eclipse.xtext.junit4.GlobalRegistries.GlobalStateMemento;
-import org.eclipse.xtext.junit4.IInjectorProvider;
-import org.eclipse.xtext.junit4.IRegistryConfigurator;
+import org.eclipse.xtext.testing.GlobalRegistries;
+import org.eclipse.xtext.testing.GlobalRegistries.GlobalStateMemento;
+import org.eclipse.xtext.testing.IInjectorProvider;
+import org.eclipse.xtext.testing.IRegistryConfigurator;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
@@ -37,7 +37,7 @@ public Injector getInjector() {
 
   /**
    * Create an {@link Injector}.
-   * 
+   *
    * @return the {@link Injector}
    */
   protected Injector internalCreateInjector() {
@@ -51,7 +51,7 @@ public Injector createInjector() {
 
   /**
    * Create a {@link CheckRuntimeModule}.
-   * 
+   *
    * @return the {@link CheckRuntimeModule}
    */
   protected CheckRuntimeModule createRuntimeModule() {
diff --git a/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/contentassist/AbstractCheckContentAssistBugTest.java b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/contentassist/AbstractCheckContentAssistBugTest.java
index 57cf4a2bc..da6535e42 100644
--- a/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/contentassist/AbstractCheckContentAssistBugTest.java
+++ b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/contentassist/AbstractCheckContentAssistBugTest.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package com.avaloq.tools.ddk.check.ui.test.contentassist;
 
-import static org.eclipse.xtext.junit4.ui.util.JavaProjectSetupUtil.findJavaProject;
+import static org.eclipse.xtext.ui.testing.util.JavaProjectSetupUtil.findJavaProject;
 
 import java.io.InputStream;
 
@@ -50,7 +50,7 @@ public IJavaProject getJavaProject(final ResourceSet resourceSet) {
   public XtextResource getResourceFor(final InputStream stream) {
     try {
       XtextResourceSet set = get(XtextResourceSet.class);
-      XtextResource resource = (XtextResource) set.createResource(URI.createURI("Test." + getFileExtension()));
+      XtextResource resource = (XtextResource) set.createResource(URI.createURI("Test." + getFileExtension())); //$NON-NLS-1$
       resource.load(stream, null);
       initializeTypeProvider(set);
       return resource;
diff --git a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/CheckUiModule.java b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/CheckUiModule.java
index a38765865..84723d9d9 100644
--- a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/CheckUiModule.java
+++ b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/CheckUiModule.java
@@ -14,6 +14,7 @@
 import org.eclipse.xtext.builder.preferences.BuilderConfigurationBlock;
 import org.eclipse.xtext.builder.preferences.BuilderPreferenceAccess;
 import org.eclipse.xtext.common.types.access.jdt.JdtTypeProviderFactory;
+import org.eclipse.xtext.ide.editor.syntaxcoloring.ISemanticHighlightingCalculator;
 import org.eclipse.xtext.ui.LanguageSpecific;
 import org.eclipse.xtext.ui.editor.DirtyStateEditorSupport;
 import org.eclipse.xtext.ui.editor.IURIEditorOpener;
@@ -116,7 +117,7 @@ public Class<? extends org.eclipse.xtext.ui.editor.hover.IEObjectHoverProvider>
   }
 
   @Override
-  public Class<? extends org.eclipse.xtext.ui.editor.syntaxcoloring.ISemanticHighlightingCalculator> bindISemanticHighlightingCalculator() {
+  public Class<? extends ISemanticHighlightingCalculator> bindIdeSemanticHighlightingCalculator() {
     return CheckHighlightingCalculator.class;
   }
 
diff --git a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/highlighting/CheckHighlightingCalculator.java b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/highlighting/CheckHighlightingCalculator.java
index 22bad060f..acbe28a73 100644
--- a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/highlighting/CheckHighlightingCalculator.java
+++ b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/highlighting/CheckHighlightingCalculator.java
@@ -14,11 +14,11 @@
 import org.eclipse.xtext.Keyword;
 import org.eclipse.xtext.ParserRule;
 import org.eclipse.xtext.TerminalRule;
+import org.eclipse.xtext.ide.editor.syntaxcoloring.IHighlightedPositionAcceptor;
 import org.eclipse.xtext.nodemodel.ICompositeNode;
 import org.eclipse.xtext.nodemodel.ILeafNode;
 import org.eclipse.xtext.ui.editor.syntaxcoloring.DefaultHighlightingConfiguration;
-import org.eclipse.xtext.ui.editor.syntaxcoloring.IHighlightedPositionAcceptor;
-import org.eclipse.xtext.xbase.ui.highlighting.XbaseHighlightingCalculator;
+import org.eclipse.xtext.xbase.ide.highlighting.XbaseHighlightingCalculator;
 
 import com.avaloq.tools.ddk.check.documentation.JavaDocCommentDocumentationProvider;
 import com.avaloq.tools.ddk.check.services.CheckGrammarAccess;
@@ -30,7 +30,7 @@
  */
 public class CheckHighlightingCalculator extends XbaseHighlightingCalculator {
 
-  private static final String FEATURE_CALL_ID_RULE_NAME = "FeatureCallID";
+  private static final String FEATURE_CALL_ID_RULE_NAME = "FeatureCallID"; //$NON-NLS-1$
 
   @Inject
   private JavaDocCommentDocumentationProvider commentProvider;
@@ -61,4 +61,3 @@ protected void highlightSpecialIdentifiers(final IHighlightedPositionAcceptor ac
   }
 
 }
-
diff --git a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/validation/AbstractCheckCfgJavaValidator.java b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/validation/AbstractCheckCfgJavaValidator.java
index d8b9b132f..7b2529771 100644
--- a/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/validation/AbstractCheckCfgJavaValidator.java
+++ b/com.avaloq.tools.ddk.checkcfg.core/src-gen/com/avaloq/tools/ddk/checkcfg/validation/AbstractCheckCfgJavaValidator.java
@@ -2,22 +2,24 @@
  * generated by Xtext
  */
 package com.avaloq.tools.ddk.checkcfg.validation;
- 
+
 import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.xtext.xbase.validation.XbaseValidator;
+
 
-public class AbstractCheckCfgJavaValidator extends org.eclipse.xtext.xbase.validation.XbaseJavaValidator {
+public class AbstractCheckCfgJavaValidator extends XbaseValidator {
 
-	@Override
-	protected List<EPackage> getEPackages() {
-	    List<EPackage> result = new ArrayList<EPackage>();
-	    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.avaloq.com/tools/ddk/checkcfg/CheckCfg"));
-	    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/xtext/xbase/Xbase"));
-	    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/xtext/common/JavaVMTypes"));
-	    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/xtext/xbase/Xtype"));
-		return result;
-	}
+  @Override
+  protected List<EPackage> getEPackages() {
+    List<EPackage> result = new ArrayList<EPackage>();
+    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.avaloq.com/tools/ddk/checkcfg/CheckCfg"));
+    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/xtext/xbase/Xbase"));
+    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/xtext/common/JavaVMTypes"));
+    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/xtext/xbase/Xtype"));
+    return result;
+  }
 
 }
diff --git a/com.avaloq.tools.ddk.checkcfg.core/src/com/avaloq/tools/ddk/checkcfg/generator/CheckCfgGenerator.xtend b/com.avaloq.tools.ddk.checkcfg.core/src/com/avaloq/tools/ddk/checkcfg/generator/CheckCfgGenerator.xtend
index 4b4faee13..ff337ab0a 100644
--- a/com.avaloq.tools.ddk.checkcfg.core/src/com/avaloq/tools/ddk/checkcfg/generator/CheckCfgGenerator.xtend
+++ b/com.avaloq.tools.ddk.checkcfg.core/src/com/avaloq/tools/ddk/checkcfg/generator/CheckCfgGenerator.xtend
@@ -10,15 +10,15 @@
  *******************************************************************************/
 package com.avaloq.tools.ddk.checkcfg.generator
 
+import com.avaloq.tools.ddk.check.runtime.configuration.ICheckConfigurationStoreService
 import com.avaloq.tools.ddk.checkcfg.checkcfg.CheckConfiguration
+import com.google.inject.Inject
 import org.eclipse.emf.ecore.resource.Resource
 import org.eclipse.xtext.generator.AbstractFileSystemAccess
 import org.eclipse.xtext.generator.IFileSystemAccess
 import org.eclipse.xtext.generator.IGenerator
 
-import static extension org.eclipse.xtext.xbase.lib.IteratorExtensions.*
-import com.avaloq.tools.ddk.check.runtime.configuration.ICheckConfigurationStoreService
-import com.google.inject.Inject
+import static org.eclipse.xtext.xbase.lib.IteratorExtensions.*
 
 class CheckCfgGenerator implements IGenerator {
 
@@ -35,7 +35,7 @@ class CheckCfgGenerator implements IGenerator {
 
   override void doGenerate(Resource resource, IFileSystemAccess fsa) {
     if (fsa instanceof AbstractFileSystemAccess) {
-      (fsa as AbstractFileSystemAccess).setOutputPath(outputPath)
+      fsa.setOutputPath(outputPath)
     }
     for (configuration:toIterable(resource.allContents).filter(typeof(CheckConfiguration))) {
       fsa.generateFile(configuration.fileName, configuration.compile)
diff --git a/com.avaloq.tools.ddk.checkcfg.ui/src/com/avaloq/tools/ddk/checkcfg/ui/syntaxcoloring/SemanticHighlightingCalculator.java b/com.avaloq.tools.ddk.checkcfg.ui/src/com/avaloq/tools/ddk/checkcfg/ui/syntaxcoloring/SemanticHighlightingCalculator.java
index ae0f4144b..d5b2d706e 100644
--- a/com.avaloq.tools.ddk.checkcfg.ui/src/com/avaloq/tools/ddk/checkcfg/ui/syntaxcoloring/SemanticHighlightingCalculator.java
+++ b/com.avaloq.tools.ddk.checkcfg.ui/src/com/avaloq/tools/ddk/checkcfg/ui/syntaxcoloring/SemanticHighlightingCalculator.java
@@ -16,12 +16,13 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.xtext.ide.editor.syntaxcoloring.IHighlightedPositionAcceptor;
+import org.eclipse.xtext.ide.editor.syntaxcoloring.ISemanticHighlightingCalculator;
 import org.eclipse.xtext.nodemodel.ILeafNode;
 import org.eclipse.xtext.nodemodel.INode;
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
 import org.eclipse.xtext.resource.XtextResource;
-import org.eclipse.xtext.ui.editor.syntaxcoloring.IHighlightedPositionAcceptor;
-import org.eclipse.xtext.ui.editor.syntaxcoloring.ISemanticHighlightingCalculator;
+import org.eclipse.xtext.util.CancelIndicator;
 
 import com.avaloq.tools.ddk.checkcfg.checkcfg.CheckcfgPackage;
 import com.avaloq.tools.ddk.checkcfg.checkcfg.ConfiguredCheck;
@@ -37,7 +38,8 @@ public class SemanticHighlightingCalculator implements ISemanticHighlightingCalc
   // NOTE: will never be called, is currently disabled (see UI module)
 
   /** {@inheritDoc} */
-  public void provideHighlightingFor(final XtextResource resource, final IHighlightedPositionAcceptor acceptor) {
+  @Override
+  public void provideHighlightingFor(final XtextResource resource, final IHighlightedPositionAcceptor acceptor, final CancelIndicator cancelIndicator) {
     if (resource == null) {
       return;
     }
@@ -54,7 +56,7 @@ public void provideHighlightingFor(final XtextResource resource, final IHighligh
 
   /**
    * Highlights a given parse tree node.
-   * 
+   *
    * @param node
    *          the node from the parse tree
    * @param id
@@ -79,7 +81,7 @@ private void highlightNode(final INode node, final String id, final IHighlighted
 
   /**
    * Gets the first node from the parse tree for given semantic object and structural feature.
-   * 
+   *
    * @param semanticElement
    *          the semantic element
    * @param feature
diff --git a/com.avaloq.tools.ddk.xtext.export.generator/src/com/avaloq/tools/ddk/xtext/export/generator/ExportFragment.java b/com.avaloq.tools.ddk.xtext.export.generator/src/com/avaloq/tools/ddk/xtext/export/generator/ExportFragment.java
index 6fde430f3..a6c3edaeb 100644
--- a/com.avaloq.tools.ddk.xtext.export.generator/src/com/avaloq/tools/ddk/xtext/export/generator/ExportFragment.java
+++ b/com.avaloq.tools.ddk.xtext.export.generator/src/com/avaloq/tools/ddk/xtext/export/generator/ExportFragment.java
@@ -152,8 +152,8 @@ public void generate(final Grammar grammar, final XpandExecutionContext ctx) {
   @Override
   public Set<Binding> getGuiceBindingsRt(final Grammar grammar) {
     final BindFactory bindFactory = new BindFactory();
-    final String namingPrefix = GrammarUtil.getNamespace(grammar) + ".naming." + GrammarUtil.getName(grammar); //$NON-NLS-1$
-    final String resourcePrefix = GrammarUtil.getNamespace(grammar) + ".resource." + GrammarUtil.getName(grammar); //$NON-NLS-1$
+    final String namingPrefix = GrammarUtil.getNamespace(grammar) + ".naming." + GrammarUtil.getSimpleName(grammar); //$NON-NLS-1$
+    final String resourcePrefix = GrammarUtil.getNamespace(grammar) + ".resource." + GrammarUtil.getSimpleName(grammar); //$NON-NLS-1$
 
     ExportModel m = getModel(grammar);
     if (m != null) {
diff --git a/com.avaloq.tools.ddk.xtext.export/src/com/avaloq/tools/ddk/xtext/export/generator/ExportedNamesProviderGenerator.xtend b/com.avaloq.tools.ddk.xtext.export/src/com/avaloq/tools/ddk/xtext/export/generator/ExportedNamesProviderGenerator.xtend
index 3de227809..bb175604a 100644
--- a/com.avaloq.tools.ddk.xtext.export/src/com/avaloq/tools/ddk/xtext/export/generator/ExportedNamesProviderGenerator.xtend
+++ b/com.avaloq.tools.ddk.xtext.export/src/com/avaloq/tools/ddk/xtext/export/generator/ExportedNamesProviderGenerator.xtend
@@ -19,7 +19,6 @@ import com.avaloq.tools.ddk.xtext.expression.generator.GeneratorUtilX
 import com.avaloq.tools.ddk.xtext.expression.generator.Naming
 import com.google.inject.Inject
 import org.eclipse.emf.ecore.EClass
-import org.eclipse.emf.ecore.EPackage
 
 class ExportedNamesProviderGenerator {
 
@@ -54,11 +53,11 @@ class ExportedNamesProviderGenerator {
             EPackage ePackage = eClass.getEPackage();
             «val exportedEClasses = types.map[type].toSet()»
             «val exportsMap = types.sortedExportsByEPackage()»
-            «FOR p : exportsMap.keySet().sortBy(p|(p as EPackage).nsURI)»
-              if (ePackage == «(p as EPackage).qualifiedPackageInterfaceName()».eINSTANCE) {
+            «FOR p : exportsMap.keySet().sortBy[nsURI]»
+              if (ePackage == «p.qualifiedPackageInterfaceName()».eINSTANCE) {
                 int classifierID = eClass.getClassifierID();
                 switch (classifierID) {
-                «FOR c : (p as EPackage).EClassifiers.filter(EClass).filter(c|exportedEClasses.exists(e|e.isSuperTypeOf(c)))»
+                «FOR c : p.EClassifiers.filter(EClass).filter(c|exportedEClasses.exists(e|e.isSuperTypeOf(c)))»
                   case «c.classifierIdLiteral()»: {
                     return qualifiedName((«c.instanceClassName()») object);
                   }
diff --git a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/validation/AbstractFormatJavaValidator.java b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/validation/AbstractFormatJavaValidator.java
index b30fac881..d22af4fa0 100644
--- a/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/validation/AbstractFormatJavaValidator.java
+++ b/com.avaloq.tools.ddk.xtext.format/src-gen/com/avaloq/tools/ddk/xtext/format/validation/AbstractFormatJavaValidator.java
@@ -2,23 +2,25 @@
  * generated by Xtext
  */
 package com.avaloq.tools.ddk.xtext.format.validation;
- 
+
 import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.xtext.xbase.annotations.validation.XbaseWithAnnotationsValidator;
+
 
-public class AbstractFormatJavaValidator extends org.eclipse.xtext.xbase.annotations.validation.XbaseWithAnnotationsJavaValidator {
+public class AbstractFormatJavaValidator extends XbaseWithAnnotationsValidator {
 
-	@Override
-	protected List<EPackage> getEPackages() {
-	    List<EPackage> result = new ArrayList<EPackage>();
-	    result.add(com.avaloq.tools.ddk.xtext.format.format.FormatPackage.eINSTANCE);
-	    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/Xtext/Xbase/XAnnotations"));
-	    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/xtext/xbase/Xbase"));
-	    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/xtext/common/JavaVMTypes"));
-	    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/xtext/xbase/Xtype"));
-		return result;
-	}
+  @Override
+  protected List<EPackage> getEPackages() {
+    List<EPackage> result = new ArrayList<EPackage>();
+    result.add(com.avaloq.tools.ddk.xtext.format.format.FormatPackage.eINSTANCE);
+    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/Xtext/Xbase/XAnnotations"));
+    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/xtext/xbase/Xbase"));
+    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/xtext/common/JavaVMTypes"));
+    result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/xtext/xbase/Xtype"));
+    return result;
+  }
 
 }
diff --git a/com.avaloq.tools.ddk.xtext.format/src/com/avaloq/tools/ddk/xtext/format/generator/FormatGeneratorUtil.java b/com.avaloq.tools.ddk.xtext.format/src/com/avaloq/tools/ddk/xtext/format/generator/FormatGeneratorUtil.java
index 30be82fbb..5643d21a8 100644
--- a/com.avaloq.tools.ddk.xtext.format/src/com/avaloq/tools/ddk/xtext/format/generator/FormatGeneratorUtil.java
+++ b/com.avaloq.tools.ddk.xtext.format/src/com/avaloq/tools/ddk/xtext/format/generator/FormatGeneratorUtil.java
@@ -82,7 +82,7 @@ public static String getFormatterName(final FormatConfiguration format, final St
    * @return String fully qualified name of the formatter class
    */
   public static String getFormatterName(final Grammar grammar, final String classNamePrefix) {
-    return GrammarUtil.getNamespace(grammar) + ".formatting." + (classNamePrefix == null ? "" : classNamePrefix) + GrammarUtil.getName(grammar) + "Formatter";
+    return GrammarUtil.getNamespace(grammar) + ".formatting." + (classNamePrefix == null ? "" : classNamePrefix) + GrammarUtil.getSimpleName(grammar) + "Formatter";
   }
 
   /**
diff --git a/com.avaloq.tools.ddk.xtext.format/src/com/avaloq/tools/ddk/xtext/format/naming/FormatScopeNameProvider.java b/com.avaloq.tools.ddk.xtext.format/src/com/avaloq/tools/ddk/xtext/format/naming/FormatScopeNameProvider.java
index 8307259f0..36d3dd588 100644
--- a/com.avaloq.tools.ddk.xtext.format/src/com/avaloq/tools/ddk/xtext/format/naming/FormatScopeNameProvider.java
+++ b/com.avaloq.tools.ddk.xtext.format/src/com/avaloq/tools/ddk/xtext/format/naming/FormatScopeNameProvider.java
@@ -36,7 +36,7 @@ public class FormatScopeNameProvider {
 
       @Override
       public String caseGrammar(final org.eclipse.xtext.Grammar object) {
-        return GrammarUtil.getName(object);
+        return GrammarUtil.getSimpleName(object);
       };
 
       @Override
diff --git a/com.avaloq.tools.ddk.xtext.generator/src/com/avaloq/tools/ddk/xtext/generator/languageconstants/LanguageConstantsFragment.java b/com.avaloq.tools.ddk.xtext.generator/src/com/avaloq/tools/ddk/xtext/generator/languageconstants/LanguageConstantsFragment.java
index 5e4425c74..8cee36afe 100644
--- a/com.avaloq.tools.ddk.xtext.generator/src/com/avaloq/tools/ddk/xtext/generator/languageconstants/LanguageConstantsFragment.java
+++ b/com.avaloq.tools.ddk.xtext.generator/src/com/avaloq/tools/ddk/xtext/generator/languageconstants/LanguageConstantsFragment.java
@@ -50,7 +50,7 @@ public class LanguageConstantsFragment extends AbstractGeneratorFragment {
   @Override
   public void generate(final Grammar grammar, final XpandExecutionContext ctx) {
     if (LOGGER.isInfoEnabled()) {
-      LOGGER.info(NLS.bind("executing generate for {0}", getClass().getName()));
+      LOGGER.info(NLS.bind("executing generate for {0}", getClass().getName())); //$NON-NLS-1$
     }
     addMetamodelSrcGenOutlet(grammar, ctx);
     super.generate(grammar, ctx);
@@ -68,7 +68,7 @@ public void generate(final Grammar grammar, final XpandExecutionContext ctx) {
    * @return the qualified name
    */
   public static String getQualifiedName(final Grammar grammar, final String prefix, final Naming naming) {
-    return naming.basePackageRuntime(grammar) + "." + prefix + GrammarUtil.getName(grammar) + "Constants"; //$NON-NLS-1$
+    return naming.basePackageRuntime(grammar) + "." + prefix + GrammarUtil.getSimpleName(grammar) + "Constants"; //$NON-NLS-1$ //$NON-NLS-2$
   }
 
   @Override
@@ -84,11 +84,11 @@ protected List<Object> getParameters(final Grammar grammar) {
    */
 
   public void setFileExtensions(final String fileExtensions) {
-    if ("".equals(fileExtensions.trim())) {
+    if ("".equals(fileExtensions.trim())) { //$NON-NLS-1$
       return;
     }
     this.fileExtensions = new ArrayList<String>();
-    String[] split = fileExtensions.split("\\s*,\\s*");
+    String[] split = fileExtensions.split("\\s*,\\s*"); //$NON-NLS-1$
     for (String string : split) {
       this.fileExtensions.add(string);
     }
@@ -135,7 +135,7 @@ public String getPreferredFileExtension(final Grammar grammar) {
     } else if (!getFileExtensions(grammar).isEmpty()) {
       return getFileExtensions(grammar).get(0);
     } else {
-      return GrammarUtil.getName(grammar).toLowerCase();
+      return GrammarUtil.getSimpleName(grammar).toLowerCase();
     }
   }
 
diff --git a/com.avaloq.tools.ddk.xtext.scope.generator/src/com/avaloq/tools/ddk/xtext/scope/generator/ScopingFragment.java b/com.avaloq.tools.ddk.xtext.scope.generator/src/com/avaloq/tools/ddk/xtext/scope/generator/ScopingFragment.java
index 32516b0cd..070c0cafa 100644
--- a/com.avaloq.tools.ddk.xtext.scope.generator/src/com/avaloq/tools/ddk/xtext/scope/generator/ScopingFragment.java
+++ b/com.avaloq.tools.ddk.xtext.scope.generator/src/com/avaloq/tools/ddk/xtext/scope/generator/ScopingFragment.java
@@ -28,17 +28,17 @@
  */
 public class ScopingFragment extends AbstractGeneratorFragment {
 
-  private static final String RUNTIME_PLUGIN = "com.avaloq.tools.ddk.xtext";
+  private static final String RUNTIME_PLUGIN = "com.avaloq.tools.ddk.xtext"; //$NON-NLS-1$
 
   /** {@inheritDoc} */
   @Override
   public Set<Binding> getGuiceBindingsRt(final Grammar grammar) {
     final BindFactory bindFactory = new BindFactory();
-    final String prefix = GrammarUtil.getNamespace(grammar) + ".scoping." + GrammarUtil.getName(grammar);
+    final String prefix = GrammarUtil.getNamespace(grammar) + ".scoping." + GrammarUtil.getSimpleName(grammar); //$NON-NLS-1$
 
-    bindFactory.addTypeToType(IScopeProvider.class.getName(), prefix + "ScopeProvider");
-    bindFactory.addTypeToType(IScopeNameProvider.class.getName(), prefix + "ScopeNameProvider");
-    bindFactory.addTypeToType(ILinkingService.class.getName(), "com.avaloq.tools.ddk.xtext.linking.LinkingService");
+    bindFactory.addTypeToType(IScopeProvider.class.getName(), prefix + "ScopeProvider"); //$NON-NLS-1$
+    bindFactory.addTypeToType(IScopeNameProvider.class.getName(), prefix + "ScopeNameProvider"); //$NON-NLS-1$
+    bindFactory.addTypeToType(ILinkingService.class.getName(), "com.avaloq.tools.ddk.xtext.linking.LinkingService"); //$NON-NLS-1$
 
     return bindFactory.getBindings();
   }
@@ -46,7 +46,7 @@ public Set<Binding> getGuiceBindingsRt(final Grammar grammar) {
   /** {@inheritDoc} */
   @Override
   public String[] getRequiredBundlesRt(final Grammar grammar) {
-    return new String[] {"org.eclipse.emf.ecore", RUNTIME_PLUGIN};
+    return new String[] {"org.eclipse.emf.ecore", RUNTIME_PLUGIN}; //$NON-NLS-1$
   }
 
   /** {@inheritDoc} */
@@ -58,7 +58,7 @@ public String[] getRequiredBundlesUi(final Grammar grammar) {
   /** {@inheritDoc} */
   @Override
   public String[] getExportedPackagesRt(final Grammar grammar) {
-    return new String[] {GrammarUtil.getNamespace(grammar) + ".scoping"};
+    return new String[] {GrammarUtil.getNamespace(grammar) + ".scoping"}; //$NON-NLS-1$
   }
 
 }
diff --git a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/PluginTestProjectManager.java b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/PluginTestProjectManager.java
index 73e631caa..83217e1db 100644
--- a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/PluginTestProjectManager.java
+++ b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/PluginTestProjectManager.java
@@ -42,15 +42,15 @@
 public class PluginTestProjectManager extends XtextTestProjectManager {
   private static final Logger LOGGER = Logger.getLogger(PluginTestProjectManager.class);
 
-  public static final String DEFAULT_SOURCE_FOLDER = "src";
-  public static final String DEFAULT_SOURCE_GEN_FOLDER = "src-gen";
-  public static final String TEST_PROJECT_NAME = "test.project";
+  public static final String DEFAULT_SOURCE_FOLDER = "src"; //$NON-NLS-1$
+  public static final String DEFAULT_SOURCE_GEN_FOLDER = "src-gen"; //$NON-NLS-1$
+  public static final String TEST_PROJECT_NAME = "test.project"; //$NON-NLS-1$
 
   // org.eclipse.osgi needed for NLS
   // org.apache.log4j needed for logging in generated StandaloneSetup
-  private static final List<String> REQUIRED_BUNDLES = newArrayList("org.eclipse.xtext.xbase.lib", "org.eclipse.xtend.lib", //
-      "org.eclipse.emf.ecore", "com.avaloq.tools.ddk.check.core", "com.avaloq.tools.ddk.check.runtime.core", "com.avaloq.tools.ddk.check.lib", //
-      "org.eclipse.xtext", "org.eclipse.osgi", "org.eclipse.xtend", "org.eclipse.core.runtime", "org.eclipse.xtext.xbase", "org.apache.log4j");
+  private static final List<String> REQUIRED_BUNDLES = newArrayList("org.eclipse.xtext.xbase.lib", "org.eclipse.xtend.lib", // //$NON-NLS-1$ //$NON-NLS-2$
+      "org.eclipse.emf.ecore", "com.avaloq.tools.ddk.check.core", "com.avaloq.tools.ddk.check.runtime.core", "com.avaloq.tools.ddk.check.lib", // //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+      "org.eclipse.xtext", "org.eclipse.osgi", "org.eclipse.xtend", "org.eclipse.core.runtime", "org.eclipse.xtext.xbase", "org.apache.log4j"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
 
   private final Injector injector;
 
@@ -73,14 +73,14 @@ public static IProject createPluginProject(final Injector injector, final String
     final PluginProjectFactory projectFactory = injector.getInstance(PluginProjectFactory.class);
     projectFactory.setProjectName(name);
     projectFactory.addFolders(newArrayList(DEFAULT_SOURCE_FOLDER, DEFAULT_SOURCE_GEN_FOLDER));
-    projectFactory.addBuilderIds(JavaCore.BUILDER_ID, "org.eclipse.pde.ManifestBuilder", "org.eclipse.pde.SchemaBuilder", XtextProjectHelper.BUILDER_ID);
-    projectFactory.addProjectNatures(JavaCore.NATURE_ID, "org.eclipse.pde.PluginNature", XtextProjectHelper.NATURE_ID);
+    projectFactory.addBuilderIds(JavaCore.BUILDER_ID, "org.eclipse.pde.ManifestBuilder", "org.eclipse.pde.SchemaBuilder", XtextProjectHelper.BUILDER_ID); //$NON-NLS-1$ //$NON-NLS-2$
+    projectFactory.addProjectNatures(JavaCore.NATURE_ID, "org.eclipse.pde.PluginNature", XtextProjectHelper.NATURE_ID); //$NON-NLS-1$
     projectFactory.addRequiredBundles(REQUIRED_BUNDLES);
     projectFactory.addContributor(new IProjectFactoryContributor() {
       @Override
       public void contributeFiles(final IProject project, final IFileCreator fileWriter) {
         // Generate a plugin.xml file
-        fileWriter.writeToFile("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<?eclipse version=\"3.4\"?>\n<plugin>\n</plugin>\n", "plugin.xml");
+        fileWriter.writeToFile("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<?eclipse version=\"3.4\"?>\n<plugin>\n</plugin>\n", "plugin.xml"); //$NON-NLS-1$ //$NON-NLS-2$
       }
     });
     final IProject[] result = new IProject[1];
@@ -92,7 +92,7 @@ protected void execute(final IProgressMonitor monitor) throws CoreException, Inv
         if (javaProject != null) {
           JavaProjectSetupUtil.addJreClasspathEntry(javaProject);
         } else {
-          LOGGER.warn("Could not create a new Check project, attempting to reuse the existing project.");
+          LOGGER.warn("Could not create a new Check project, attempting to reuse the existing project."); //$NON-NLS-1$
         }
       }
     };
@@ -110,17 +110,17 @@ protected void execute(final IProgressMonitor monitor) throws CoreException, Inv
   @Override
   public void setup(final Iterable<? extends TestSource> initialSources) {
     try {
-      IResourcesSetupUtil.waitForAutoBuild();
+      IResourcesSetupUtil.reallyWaitForAutoBuild();
       createPluginProject(injector, TEST_PROJECT_NAME);
     } catch (CoreException e) {
-      throw new IllegalStateException("Failed to create plugin project");
+      throw new IllegalStateException("Failed to create plugin project"); //$NON-NLS-1$
     }
   }
 
   /** {@inheritDoc} */
   @Override
   public void teardown() {
-    IResourcesSetupUtil.waitForAutoBuild();
+    IResourcesSetupUtil.reallyWaitForAutoBuild();
     // Remove natures from our project first, otherwise PDE's PluginModelManager will try to update the classpath when we
     // delete things.
     WorkspaceModifyOperation removeAllNatures = new WorkspaceModifyOperation() {
@@ -142,19 +142,19 @@ protected void execute(final IProgressMonitor monitor) throws CoreException {
     };
     try {
       removeAllNatures.run(new NullProgressMonitor());
-      IResourcesSetupUtil.waitForAutoBuild();
+      IResourcesSetupUtil.reallyWaitForAutoBuild();
       cleanProjects.run(new NullProgressMonitor());
-      IResourcesSetupUtil.waitForAutoBuild();
+      IResourcesSetupUtil.reallyWaitForAutoBuild();
     } catch (InvocationTargetException e) {
       LOGGER.error(e.getCause().getMessage());
     } catch (InterruptedException e) {
-      Assert.fail("Interrupted");
+      Assert.fail("Interrupted"); //$NON-NLS-1$
     }
   }
 
   /** {@inheritDoc} */
   @Override
   public URI createPlatformUri(final String encodedFileName) {
-    return URI.createPlatformResourceURI('/' + TEST_PROJECT_NAME + "/" + DEFAULT_SOURCE_FOLDER + "/" + encodedFileName, true);
+    return URI.createPlatformResourceURI('/' + TEST_PROJECT_NAME + "/" + DEFAULT_SOURCE_FOLDER + "/" + encodedFileName, true); //$NON-NLS-1$ //$NON-NLS-2$
   }
 }
diff --git a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/generator/AbstractGeneratorTest.java b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/generator/AbstractGeneratorTest.java
index d049fd40d..6faaa8ff4 100644
--- a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/generator/AbstractGeneratorTest.java
+++ b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/generator/AbstractGeneratorTest.java
@@ -140,7 +140,7 @@ public void initializeProject(final String projectName, final List<String> folde
     addSourcesToWorkspace(projectName, sourceFileNames);
 
     // wait for build to finish, otherwise included catalog may not be resolvable
-    IResourcesSetupUtil.waitForAutoBuild();
+    IResourcesSetupUtil.reallyWaitForAutoBuild();
   }
 
   /**
diff --git a/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/quickfix/WorkbenchMarkerResolutionGenerator.java b/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/quickfix/WorkbenchMarkerResolutionGenerator.java
index 1622d32ba..fd0dcd99e 100644
--- a/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/quickfix/WorkbenchMarkerResolutionGenerator.java
+++ b/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/quickfix/WorkbenchMarkerResolutionGenerator.java
@@ -84,7 +84,7 @@ public IMarkerResolution[] getResolutions(final IMarker marker) {
       }
     }
 
-    final Iterable<IssueResolution> resolutions = getResolutions(getIssueUtil().createIssue(marker), null);
+    final Iterable<IssueResolution> resolutions = getResolutionProvider().getResolutions(getIssueUtil().createIssue(marker));
     if (editor != null && editor.isEditorInputReadOnly()) {
       editor.close(false);
     }
@@ -103,6 +103,7 @@ public void setIssueUtil(final IssueUtil issueUtil) {
   }
 
   @Override
+  @Deprecated
   public XtextEditor getEditor(final IResource resource) {
     if (Display.getCurrent() != null) {
       return super.getEditor(resource);
diff --git a/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/syntaxcoloring/FixedHighlightingReconciler.java b/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/syntaxcoloring/FixedHighlightingReconciler.java
index 062a77477..ad31a0501 100644
--- a/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/syntaxcoloring/FixedHighlightingReconciler.java
+++ b/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/syntaxcoloring/FixedHighlightingReconciler.java
@@ -25,6 +25,8 @@
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IWorkbenchPartSite;
+import org.eclipse.xtext.ide.editor.syntaxcoloring.ISemanticHighlightingCalculator;
+import org.eclipse.xtext.ide.editor.syntaxcoloring.MergingHighlightedPositionAcceptor;
 import org.eclipse.xtext.resource.DerivedStateAwareResource;
 import org.eclipse.xtext.resource.IBatchLinkableResource;
 import org.eclipse.xtext.resource.XtextResource;
@@ -36,9 +38,7 @@
 import org.eclipse.xtext.ui.editor.syntaxcoloring.AttributedPosition;
 import org.eclipse.xtext.ui.editor.syntaxcoloring.HighlightingPresenter;
 import org.eclipse.xtext.ui.editor.syntaxcoloring.HighlightingReconciler;
-import org.eclipse.xtext.ui.editor.syntaxcoloring.ISemanticHighlightingCalculator;
 import org.eclipse.xtext.ui.editor.syntaxcoloring.ITextAttributeProvider;
-import org.eclipse.xtext.ui.editor.syntaxcoloring.MergingHighlightedPositionAcceptor;
 import org.eclipse.xtext.util.CancelIndicator;
 import org.eclipse.xtext.util.concurrent.CancelableUnitOfWork;
 
@@ -59,7 +59,11 @@
 public class FixedHighlightingReconciler extends HighlightingReconciler {
 
   @Inject(optional = true)
-  private ISemanticHighlightingCalculator calculator;
+  @SuppressWarnings("deprecation")
+  private org.eclipse.xtext.ui.editor.syntaxcoloring.ISemanticHighlightingCalculator oldCalculator;
+
+  @Inject(optional = true)
+  private ISemanticHighlightingCalculator newCalculator;
 
   @Inject
   private ITextAttributeProvider attributeProvider;
@@ -152,12 +156,27 @@ private void startReconcilingPositions() {
    *
    * @param resource
    *          XtextResource
+   * @param cancelIndicator
+   *          an indicator that should be asked in order to cancel an operation early in case there are new pending changes.
    */
-  private void reconcilePositions(final XtextResource resource) {
+  @SuppressWarnings("deprecation")
+  private void reconcilePositions(final XtextResource resource, final CancelIndicator cancelIndicator) {
     // for (int i= 0, n= subtrees.length; i < n; i++)
     // subtrees[i].accept(fCollector);
-    MergingHighlightedPositionAcceptor acceptor = new MergingHighlightedPositionAcceptor(calculator);
-    acceptor.provideHighlightingFor(resource, this);
+
+    // A default binding was registered from ISemanticHighlightingCalculator to DefaultHighlightingCalculator
+    // thus clienst may have bound DefaultHighlightingCalculator to their custom impl
+    // use the custom impl if available, otherwise go for the new impl
+    if (oldCalculator != null && !org.eclipse.xtext.ui.editor.syntaxcoloring.DefaultSemanticHighlightingCalculator.class.equals(oldCalculator.getClass())) {
+      org.eclipse.xtext.ui.editor.syntaxcoloring.MergingHighlightedPositionAcceptor acceptor = new org.eclipse.xtext.ui.editor.syntaxcoloring.MergingHighlightedPositionAcceptor(oldCalculator);
+      acceptor.provideHighlightingFor(resource, this);
+    } else if (newCalculator != null) {
+      MergingHighlightedPositionAcceptor acceptor = new MergingHighlightedPositionAcceptor(newCalculator);
+      acceptor.provideHighlightingFor(resource, this, cancelIndicator);
+    } else {
+      throw new IllegalStateException("No semantic highlighting calculator bound."); //$NON-NLS-1$
+    }
+
     // calculator.provideHighlightingFor(resource, this);
     List<AttributedPosition> oldPositions = removedPositions;
     List<AttributedPosition> newPositions = new ArrayList<AttributedPosition>(removedPositionCount);
@@ -290,7 +309,7 @@ public void install(final XtextEditor editor, final XtextSourceViewer sourceView
     this.presenter = presenter;
     this.editor = editor;
     this.sourceViewer = sourceViewer;
-    if (calculator != null) {
+    if (oldCalculator != null || newCalculator != null) {
       if (editor == null) {
         ((IXtextDocument) sourceViewer.getDocument()).addModelListener(this);
       } else if (editor.getDocument() != null) {
@@ -312,7 +331,7 @@ public void uninstall() {
     }
 
     if (sourceViewer.getDocument() != null) {
-      if (calculator != null) {
+      if (oldCalculator != null || newCalculator != null) {
         XtextDocument document = (XtextDocument) sourceViewer.getDocument();
         document.removeModelListener(this);
         sourceViewer.removeTextInputListener(this);
@@ -349,7 +368,7 @@ public void inputDocumentChanged(final IDocument oldInput, final IDocument newIn
    */
   @Override
   public void refresh() {
-    if (calculator != null) {
+    if (oldCalculator != null || newCalculator != null) {
       IDocument document = editor != null ? editor.getDocument() : sourceViewer.getDocument();
       if (document instanceof IXtextDocument) {
         Job job = new Job("Calculating highlighting") { //$NON-NLS-1$
@@ -428,7 +447,7 @@ public void modelChanged(final XtextResource resource, final CancelIndicator can
         return;
       }
       checkCanceled(cancelIndicator);
-      reconcilePositions(resource);
+      reconcilePositions(resource, cancelIndicator);
 
       if (highlightingPresenter.isCanceled()) {
         return;
@@ -470,12 +489,14 @@ protected void checkCanceled(final CancelIndicator cancelIndicator) {
   }
 
   @Override
-  public void setCalculator(final ISemanticHighlightingCalculator calculator) {
-    this.calculator = calculator;
+  @Deprecated
+  public void setCalculator(final org.eclipse.xtext.ui.editor.syntaxcoloring.ISemanticHighlightingCalculator calculator) {
+    this.oldCalculator = calculator;
   }
 
   @Override
-  public ISemanticHighlightingCalculator getCalculator() {
-    return calculator;
+  @Deprecated
+  public org.eclipse.xtext.ui.editor.syntaxcoloring.ISemanticHighlightingCalculator getCalculator() {
+    return oldCalculator;
   }
 }
diff --git a/com.avaloq.tools.ddk.xtext.valid.generator/src/com/avaloq/tools/ddk/xtext/valid/generator/ValidValidatorFragment.java b/com.avaloq.tools.ddk.xtext.valid.generator/src/com/avaloq/tools/ddk/xtext/valid/generator/ValidValidatorFragment.java
index a6b420b1c..bee60b1fa 100644
--- a/com.avaloq.tools.ddk.xtext.valid.generator/src/com/avaloq/tools/ddk/xtext/valid/generator/ValidValidatorFragment.java
+++ b/com.avaloq.tools.ddk.xtext.valid.generator/src/com/avaloq/tools/ddk/xtext/valid/generator/ValidValidatorFragment.java
@@ -36,15 +36,15 @@
 import org.eclipse.xtext.validation.CompositeEValidator;
 import org.eclipse.xtext.validation.Issue;
 
+import com.avaloq.tools.ddk.xtext.generator.util.ModelValidator;
+import com.avaloq.tools.ddk.xtext.ui.validation.preferences.ValidPreferenceConstants;
+import com.avaloq.tools.ddk.xtext.util.EmfResourceUtil;
 import com.avaloq.tools.ddk.xtext.valid.ValidStandaloneSetup;
 import com.avaloq.tools.ddk.xtext.valid.valid.Category;
 import com.avaloq.tools.ddk.xtext.valid.valid.NativeContext;
 import com.avaloq.tools.ddk.xtext.valid.valid.NativeRule;
 import com.avaloq.tools.ddk.xtext.valid.valid.Rule;
 import com.avaloq.tools.ddk.xtext.valid.valid.ValidModel;
-import com.avaloq.tools.ddk.xtext.generator.util.ModelValidator;
-import com.avaloq.tools.ddk.xtext.ui.validation.preferences.ValidPreferenceConstants;
-import com.avaloq.tools.ddk.xtext.util.EmfResourceUtil;
 import com.avaloq.tools.ddk.xtext.validation.ValidCompositeEValidator;
 import com.google.common.base.Preconditions;
 
@@ -133,7 +133,7 @@ private ValidModel getValidModel(final Grammar grammar) {
     }
 
     Resource resource = null;
-    final String name = GrammarUtil.getName(grammar) + '.' + XTEXT_EXTENSION;
+    final String name = GrammarUtil.getSimpleName(grammar) + '.' + XTEXT_EXTENSION;
     URI uri;
     for (final Resource res : grammar.eResource().getResourceSet().getResources()) {
       if (res.getURI() != null && name.equals(EmfResourceUtil.getFileName(res.getURI()))) {
@@ -176,19 +176,19 @@ public void generate(final Grammar grammar, final XpandExecutionContext ctx) {
     // profile for generator is:
     // <<DEFINE generate(List[String] packageQNames, List[String] composedChecks, ValidModel validModel) FOR Grammar>>
     XpandFacade.create(ctx).evaluate(getTemplate() + "::generate", // template //$NON-NLS-1$
-    grammar, // this (the grammar)
-    getParameters(grammar).get(0), // package Qualified Names (first parameter of the argument list is the 'list of
-                                   // packages')
-    this.composedChecks, // composed checks
-    validModel); // validModel
+        grammar, // this (the grammar)
+        getParameters(grammar).get(0), // package Qualified Names (first parameter of the argument list is the 'list of
+                                       // packages')
+        this.composedChecks, // composed checks
+        validModel); // validModel
 
     if (generateTests) {
       XpandFacade.create(ctx).evaluate("com::avaloq::tools::ddk::xtext::valid::generator::ValidatorTests::generate", // template //$NON-NLS-1$
-      grammar, // this (the grammar)
-      validModel); // validModel
+          grammar, // this (the grammar)
+          validModel); // validModel
       XpandFacade.create(ctx).evaluate("com::avaloq::tools::ddk::xtext::valid::generator::QuickfixTests::generate", // template //$NON-NLS-1$
-      grammar, // this (the grammar)
-      validModel); // validModel
+          grammar, // this (the grammar)
+          validModel); // validModel
     }
   }
 
@@ -208,7 +208,7 @@ public void addToPluginXmlUi(final Grammar grammar, final XpandExecutionContext
    * @return the java validator name
    */
   public static String getJavaValidatorName(final Grammar grammar, final String prefix) {
-    return GrammarUtil.getNamespace(grammar) + ".validation." + prefix + GrammarUtil.getName(grammar) + "JavaValidator"; //$NON-NLS-1$ //$NON-NLS-2$
+    return GrammarUtil.getNamespace(grammar) + ".validation." + prefix + GrammarUtil.getSimpleName(grammar) + "JavaValidator"; //$NON-NLS-1$ //$NON-NLS-2$
   }
 
   /**
@@ -234,7 +234,7 @@ public static String getPreferencePackage(final Grammar grammar, final Naming na
    * @return the java validator name
    */
   public static String getPreferencePageName(final Grammar grammar, final Naming naming) {
-    return getPreferencePackage(grammar, naming) + "." + GrammarUtil.getName(grammar) + "ValidPreferencePage"; //$NON-NLS-1$ //$NON-NLS-2$
+    return getPreferencePackage(grammar, naming) + "." + GrammarUtil.getSimpleName(grammar) + "ValidPreferencePage"; //$NON-NLS-1$ //$NON-NLS-2$
   }
 
   /**
@@ -260,7 +260,7 @@ public static String getQuickfixPackage(final Grammar grammar, final Naming nami
    * @return the quickfix provider name
    */
   public static String getQuickfixProviderName(final Grammar grammar, final Naming naming) {
-    return getQuickfixPackage(grammar, naming) + "." + GrammarUtil.getName(grammar) + "QuickfixProvider"; //$NON-NLS-1$//$NON-NLS-2$
+    return getQuickfixPackage(grammar, naming) + "." + GrammarUtil.getSimpleName(grammar) + "QuickfixProvider"; //$NON-NLS-1$//$NON-NLS-2$
   }
 
   /**
@@ -273,7 +273,7 @@ public static String getQuickfixProviderName(final Grammar grammar, final Naming
    * @return the check validator name
    */
   public static String getCheckValidatorName(final Grammar grammar, final Naming naming) {
-    return naming.basePackageRuntime(grammar) + ".validation." + GrammarUtil.getName(grammar) + "CheckValidator"; //$NON-NLS-1$//$NON-NLS-2$
+    return naming.basePackageRuntime(grammar) + ".validation." + GrammarUtil.getSimpleName(grammar) + "CheckValidator"; //$NON-NLS-1$//$NON-NLS-2$
   }
 
   /**
@@ -400,4 +400,3 @@ protected boolean isClassExists(final String className) {
   }
 
 }
-
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/serializer/IndentingSerializer.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/serializer/IndentingSerializer.java
index 2cc28353e..9e41cf80c 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/serializer/IndentingSerializer.java
+++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/serializer/IndentingSerializer.java
@@ -11,21 +11,17 @@
 package com.avaloq.tools.ddk.xtext.serializer;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
 
-import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.formatting.IFormatterExtension;
 import org.eclipse.xtext.parsetree.reconstr.ITokenStream;
 import org.eclipse.xtext.parsetree.reconstr.impl.TokenStringBuffer;
 import org.eclipse.xtext.resource.SaveOptions;
+import org.eclipse.xtext.serializer.ISerializationContext;
 import org.eclipse.xtext.serializer.acceptor.ISequenceAcceptor;
 import org.eclipse.xtext.serializer.acceptor.TokenStreamSequenceAdapter;
 import org.eclipse.xtext.serializer.diagnostic.ISerializationDiagnostic;
 import org.eclipse.xtext.serializer.impl.Serializer;
-import org.eclipse.xtext.validation.IConcreteSyntaxValidator;
 
 
 /**
@@ -56,14 +52,6 @@ public void serialize(final EObject obj, final ITokenStream tokenStream, final S
    *           Signals that an I/O exception has occurred.
    */
   protected void serialize(final EObject obj, final ITokenStream tokenStream, final SaveOptions options, final String initialIndentation) throws IOException {
-    if (options.isValidating()) {
-      List<Diagnostic> diagnostics = new ArrayList<Diagnostic>();
-      validator.validateRecursive(obj, new IConcreteSyntaxValidator.DiagnosticListAcceptor(diagnostics), new HashMap<Object, Object>());
-      if (!diagnostics.isEmpty()) {
-        throw new IConcreteSyntaxValidator.InvalidConcreteSyntaxException("These errors need to be fixed before the model can be serialized.", diagnostics); //$NON-NLS-1$
-      }
-    }
-
     ISerializationDiagnostic.Acceptor errors = ISerializationDiagnostic.EXCEPTION_THROWING_ACCEPTOR;
     ITokenStream formatterTokenStream;
     if (formatter instanceof IFormatterExtension) {
@@ -71,9 +59,9 @@ protected void serialize(final EObject obj, final ITokenStream tokenStream, fina
     } else {
       formatterTokenStream = formatter.createFormatterStream(initialIndentation, tokenStream, !options.isFormatting());
     }
-    EObject context = getContext(obj);
+    ISerializationContext context = getIContext(obj);
     ISequenceAcceptor acceptor = new TokenStreamSequenceAdapter(formatterTokenStream, grammar.getGrammar(), errors);
-    serialize(obj, context, acceptor, errors);
+    serialize(context, obj, acceptor, errors);
     formatterTokenStream.flush();
   }
 
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/serializer/sequencer/ReorderingHiddenTokenSequencer.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/serializer/sequencer/ReorderingHiddenTokenSequencer.java
index ab0aa6c32..ac7fdfafe 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/serializer/sequencer/ReorderingHiddenTokenSequencer.java
+++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/serializer/sequencer/ReorderingHiddenTokenSequencer.java
@@ -211,6 +211,7 @@ public boolean enterAssignedParserRuleCall(final RuleCall ruleCall, final EObjec
   }
 
   @Override
+  @Deprecated
   public void enterUnassignedParserRuleCall(final RuleCall ruleCall) {
     delegate.enterUnassignedParserRuleCall(ruleCall);
   }
@@ -226,6 +227,7 @@ public void leaveAssignedParserRuleCall(final RuleCall ruleCall, final EObject s
   }
 
   @Override
+  @Deprecated
   public void leaveUnssignedParserRuleCall(final RuleCall ruleCall) {
     delegate.leaveUnssignedParserRuleCall(ruleCall);
   }

From 932c0cf9aa54991477bf581fc942760b3fc33940 Mon Sep 17 00:00:00 2001
From: Graham Pearson <Graham.Pearson@avaloq.com>
Date: Sat, 18 Aug 2018 19:34:34 +0100
Subject: [PATCH 53/56] Fix more deprecation warnings.

---
 .../avaloq/tools/ddk/check/core/test/CheckScopingTest.xtend    | 2 +-
 .../imports/test/CheckRewritableImportSectionFactoryTest.xtend | 3 +--
 .../avaloq/tools/ddk/checkcfg/syntax/CheckCfgSyntaxTest.xtend  | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/CheckScopingTest.xtend b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/CheckScopingTest.xtend
index 2814223da..131659254 100644
--- a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/CheckScopingTest.xtend
+++ b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/CheckScopingTest.xtend
@@ -46,7 +46,7 @@ class CheckScopingTest extends AbstractCheckTestCase {
     addSourcesToWorkspace(typeof(CheckScopingTest), requiredSourceFileNames)
 
     // wait for build to finish, otherwise included catalog may not be resolvable
-    IResourcesSetupUtil::waitForAutoBuild
+    IResourcesSetupUtil.reallyWaitForAutoBuild
   }
 
   /*
diff --git a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/imports/test/CheckRewritableImportSectionFactoryTest.xtend b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/imports/test/CheckRewritableImportSectionFactoryTest.xtend
index 79c707926..a15b4a6e7 100644
--- a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/imports/test/CheckRewritableImportSectionFactoryTest.xtend
+++ b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/imports/test/CheckRewritableImportSectionFactoryTest.xtend
@@ -17,9 +17,8 @@ import com.google.inject.Inject
 import org.eclipse.emf.common.util.BasicEList
 import org.eclipse.emf.common.util.URI
 import org.eclipse.emf.ecore.EObject
-import org.eclipse.xtext.testing.XtextRunner
 import org.eclipse.xtext.resource.XtextResource
-import org.eclipse.xtext.xbase.imports.RewritableImportSection
+import org.eclipse.xtext.testing.XtextRunner
 import org.junit.Test
 import org.junit.runner.RunWith
 
diff --git a/com.avaloq.tools.ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/checkcfg/syntax/CheckCfgSyntaxTest.xtend b/com.avaloq.tools.ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/checkcfg/syntax/CheckCfgSyntaxTest.xtend
index f544b6c6f..e194ba511 100644
--- a/com.avaloq.tools.ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/checkcfg/syntax/CheckCfgSyntaxTest.xtend
+++ b/com.avaloq.tools.ddk.checkcfg.core.test/src/com/avaloq/tools/ddk/checkcfg/syntax/CheckCfgSyntaxTest.xtend
@@ -48,7 +48,7 @@ class CheckCfgSyntaxTest extends AbstractValidationTest {
       }
     '''
     addCustomerSourceToWorkspace("customer$sca_testchecks.check", checkSource)
-    IResourcesSetupUtil::waitForAutoBuild
+    IResourcesSetupUtil.reallyWaitForAutoBuild
 
     val checkcfgSource = '''
       check configuration checkconfiguration {

From 52000d8ca38c8564e25e6ffdca7cafb4ac9c4513 Mon Sep 17 00:00:00 2001
From: Graham Pearson <Graham.Pearson@avaloq.com>
Date: Sat, 18 Aug 2018 20:06:53 +0100
Subject: [PATCH 54/56] Commit an autogenerated change.

---
 .../ddk/check/validation/ExecutionEnvironmentCheckImpl.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/validation/ExecutionEnvironmentCheckImpl.java b/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/validation/ExecutionEnvironmentCheckImpl.java
index 8d6c250ae..360eae67f 100644
--- a/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/validation/ExecutionEnvironmentCheckImpl.java
+++ b/com.avaloq.tools.ddk.check.test.runtime/src-gen/com/avaloq/tools/ddk/check/validation/ExecutionEnvironmentCheckImpl.java
@@ -28,8 +28,7 @@ public final ImmutableMap<String, String> getIssueCodeToLabelMap() {
   private class GreetingNameLengthClass {
     
     public void runGreeting(final Greeting g) {
-      String _name = g.getName();
-      int _length = _name.length();
+      int _length = g.getName().length();
       boolean _greaterThan = (_length > 5);
       if (_greaterThan) {
         
@@ -43,8 +42,7 @@ public void runGreeting(final Greeting g) {
           ExecutionEnvironmentIssueCodes.NAMELENGTH, null // Issue code & data
         );
       } else {
-        String _name_1 = g.getName();
-        boolean _equals = _name_1.equals(executionEnvironmentCatalog.getGreetingNameLength_DefaultName(g));
+        boolean _equals = g.getName().equals(executionEnvironmentCatalog.getGreetingNameLength_DefaultName(g));
         if (_equals) {
           
           // Issue diagnostic

From 25c333240249bf7b185c088932b227da274482c4 Mon Sep 17 00:00:00 2001
From: Andrew Lamb <Andrew.Lamb@avaloq.com>
Date: Mon, 20 Aug 2018 14:12:44 +0100
Subject: [PATCH 55/56] Update link diagnostic message to check for in
 validation tests.

---
 .../validation/AbstractValidationTest.java    | 32 ++++++++++++++++---
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/validation/AbstractValidationTest.java b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/validation/AbstractValidationTest.java
index 4aac465fb..cf8f0c8fe 100644
--- a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/validation/AbstractValidationTest.java
+++ b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/validation/AbstractValidationTest.java
@@ -60,7 +60,7 @@ public abstract class AbstractValidationTest extends AbstractXtextMarkerBasedTes
 
   static final String NO_ERRORS_FOUND_ON_RESOURCE_MESSAGE = "Expecting no errors on resource";
 
-  private static final String COULD_NOT_RESOLVE_REFERENCE_TO = "Couldn''t resolve reference to {0} ''{1}''.";
+  private static final String METHOD_OR_FIELD_UNDEFINED = "The method or field {1} is undefined";
 
   private static final int SEVERITY_UNDEFINED = -1;
   private static final Map<Integer, String> CODE_TO_NAME = ImmutableMap.of(Diagnostic.INFO, "INFO", Diagnostic.WARNING, "WARNING", Diagnostic.ERROR, "ERROR");
@@ -965,9 +965,20 @@ public static void assertNoErrorsOnResource(final EObject object, final String..
   public static void assertNoLinkingErrorsOnResource(final EObject object, final String referenceType, final String... referenceNames) {
     String[] messages = new String[referenceNames.length];
     for (int i = 0; i < referenceNames.length; i++) {
-      messages[i] = NLS.bind(COULD_NOT_RESOLVE_REFERENCE_TO, referenceType, referenceNames[i]);
+      messages[i] = NLS.bind(METHOD_OR_FIELD_UNDEFINED, referenceType, referenceNames[i]);
+    }
+    final List<Resource.Diagnostic> linkingErrors = object.eResource().getErrors().stream().filter(error -> error instanceof XtextLinkingDiagnostic).collect(Collectors.toList());
+    final List<String> errorMessages = Lists.transform(linkingErrors, Resource.Diagnostic::getMessage);
+    for (final String msg : messages) {
+      boolean found = false;
+      for (final String errMessage : errorMessages) {
+        if (errMessage.startsWith(msg)) {
+          found = true;
+          break;
+        }
+      }
+      assertFalse(NLS.bind("Expecting no linking errors on resource with message \"{0}\".", msg), found);
     }
-    assertNoLinkingErrorsWithCustomMessageOnResource(object, messages);
   }
 
   /**
@@ -983,9 +994,20 @@ public static void assertNoLinkingErrorsOnResource(final EObject object, final S
   public static void assertLinkingErrorsOnResourceExist(final EObject object, final String referenceType, final String... referenceNames) {
     String[] messages = new String[referenceNames.length];
     for (int i = 0; i < referenceNames.length; i++) {
-      messages[i] = NLS.bind(COULD_NOT_RESOLVE_REFERENCE_TO, referenceType, referenceNames[i]);
+      messages[i] = NLS.bind(METHOD_OR_FIELD_UNDEFINED, referenceType, referenceNames[i]);
+    }
+    final List<Resource.Diagnostic> linkingErrors = object.eResource().getErrors().stream().filter(error -> error instanceof XtextLinkingDiagnostic).collect(Collectors.toList());
+    final List<String> errorMessages = Lists.transform(linkingErrors, Resource.Diagnostic::getMessage);
+    for (final String msg : messages) {
+      boolean found = false;
+      for (final String errMessage : errorMessages) {
+        if (errMessage.startsWith(msg)) {
+          found = true;
+          break;
+        }
+      }
+      assertTrue(NLS.bind("Expected linking error \"{0}\" but could not find it", msg), found);
     }
-    assertLinkingErrorsWithCustomMessageOnResourceExist(object, messages);
   }
 
   /**

From 49b7ec555d24ea4d51e14f5c1246438fb35a8e43 Mon Sep 17 00:00:00 2001
From: Andrew Lamb <Andrew.Lamb@avaloq.com>
Date: Wed, 22 Aug 2018 14:13:33 +0100
Subject: [PATCH 56/56] Fix for test utility method.

Update utility method for detecting linking diagnostics to work under
multiple diagnostic message providers.
---
 .../validation/AbstractValidationTest.java    | 22 +++++--------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/validation/AbstractValidationTest.java b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/validation/AbstractValidationTest.java
index cf8f0c8fe..ceba5e367 100644
--- a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/validation/AbstractValidationTest.java
+++ b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/validation/AbstractValidationTest.java
@@ -60,8 +60,6 @@ public abstract class AbstractValidationTest extends AbstractXtextMarkerBasedTes
 
   static final String NO_ERRORS_FOUND_ON_RESOURCE_MESSAGE = "Expecting no errors on resource";
 
-  private static final String METHOD_OR_FIELD_UNDEFINED = "The method or field {1} is undefined";
-
   private static final int SEVERITY_UNDEFINED = -1;
   private static final Map<Integer, String> CODE_TO_NAME = ImmutableMap.of(Diagnostic.INFO, "INFO", Diagnostic.WARNING, "WARNING", Diagnostic.ERROR, "ERROR");
 
@@ -963,21 +961,17 @@ public static void assertNoErrorsOnResource(final EObject object, final String..
    *          the names of the referenced elements
    */
   public static void assertNoLinkingErrorsOnResource(final EObject object, final String referenceType, final String... referenceNames) {
-    String[] messages = new String[referenceNames.length];
-    for (int i = 0; i < referenceNames.length; i++) {
-      messages[i] = NLS.bind(METHOD_OR_FIELD_UNDEFINED, referenceType, referenceNames[i]);
-    }
     final List<Resource.Diagnostic> linkingErrors = object.eResource().getErrors().stream().filter(error -> error instanceof XtextLinkingDiagnostic).collect(Collectors.toList());
     final List<String> errorMessages = Lists.transform(linkingErrors, Resource.Diagnostic::getMessage);
-    for (final String msg : messages) {
+    for (final String referenceName : referenceNames) {
       boolean found = false;
       for (final String errMessage : errorMessages) {
-        if (errMessage.startsWith(msg)) {
+        if (errMessage.startsWith(referenceName)) {
           found = true;
           break;
         }
       }
-      assertFalse(NLS.bind("Expecting no linking errors on resource with message \"{0}\".", msg), found);
+      assertFalse(NLS.bind("Expecting no linking errors on resource for \"{0}\".", referenceName), found);
     }
   }
 
@@ -992,21 +986,17 @@ public static void assertNoLinkingErrorsOnResource(final EObject object, final S
    *          the names of the referenced elements
    */
   public static void assertLinkingErrorsOnResourceExist(final EObject object, final String referenceType, final String... referenceNames) {
-    String[] messages = new String[referenceNames.length];
-    for (int i = 0; i < referenceNames.length; i++) {
-      messages[i] = NLS.bind(METHOD_OR_FIELD_UNDEFINED, referenceType, referenceNames[i]);
-    }
     final List<Resource.Diagnostic> linkingErrors = object.eResource().getErrors().stream().filter(error -> error instanceof XtextLinkingDiagnostic).collect(Collectors.toList());
     final List<String> errorMessages = Lists.transform(linkingErrors, Resource.Diagnostic::getMessage);
-    for (final String msg : messages) {
+    for (final String referenceName : referenceNames) {
       boolean found = false;
       for (final String errMessage : errorMessages) {
-        if (errMessage.startsWith(msg)) {
+        if (errMessage.contains(referenceName)) {
           found = true;
           break;
         }
       }
-      assertTrue(NLS.bind("Expected linking error \"{0}\" but could not find it", msg), found);
+      assertTrue(NLS.bind("Expected linking error on \"{0}\" but could not find it", referenceName), found);
     }
   }